diff --git a/Alignment/APEEstimation/interface/EventVariables.h b/Alignment/APEEstimation/interface/EventVariables.h
index b64541724c7c1..2079f89fa8371 100644
--- a/Alignment/APEEstimation/interface/EventVariables.h
+++ b/Alignment/APEEstimation/interface/EventVariables.h
@@ -3,49 +3,73 @@
 
 #include <vector>
 
-struct TrackStruct{
-  
-  TrackStruct(){}
-  
-  enum HitState{notInTracker, notAssignedToSectors, invalid, negativeError, ok};
-  
-  struct HitParameterStruct{
-    
-    HitParameterStruct(): hitState(ok),
-                 isPixelHit(false),
-		 goodXMeasurement(false),
-		 goodYMeasurement(false),
-		 widthX(0),
-		 baryStripX(-999.F),
-		 widthY(0),
-		 baryStripY(-999.F),
-		 chargePixel(-999.F),
-		 clusterProbabilityXY(-999.F), clusterProbabilityQ(-999.F),
-		 clusterProbabilityXYQ(-999.F), logClusterProbability(-999.F),
-		 isOnEdge(false), hasBadPixels(false), spansTwoRoc(false),
-		 qBin(-1),
-		 isModuleUsable(true),
-		 chargeStrip(0),
-		 maxStrip(0), maxStripInv(0), maxCharge(0), maxIndex(0),
-		 chargeOnEdges(-999.F), chargeAsymmetry(-999.F), 
-		 chargeLRplus(-999.F), chargeLRminus(-999.F),
-		 sOverN(-999.F),
-		 projWidth(-999.F),
-		 resX(-999.F), norResX(-999.F), xHit(-999.F), xTrk(-999.F),
-                 errXHit(-999.F), errXTrk(-999.F), errX(-999.F), errX2(-999.F),
-		 errXHitWoApe(-999.F), errXWoApe(-999.F),
-		 probX(-999.F),
-		 resY(-999.F), norResY(-999.F), yHit(-999.F), yTrk(-999.F),
-                 errYHit(-999.F), errYTrk(-999.F), errY(-999.F), errY2(-999.F),
-		 errYHitWoApe(-999.F), errYWoApe(-999.F),
-		 probY(-999.F),
-		 phiSens(-999.F), phiSensX(-999.F), phiSensY(-999.F){}
-    
+struct TrackStruct {
+  TrackStruct() {}
+
+  enum HitState { notInTracker, notAssignedToSectors, invalid, negativeError, ok };
+
+  struct HitParameterStruct {
+    HitParameterStruct()
+        : hitState(ok),
+          isPixelHit(false),
+          goodXMeasurement(false),
+          goodYMeasurement(false),
+          widthX(0),
+          baryStripX(-999.F),
+          widthY(0),
+          baryStripY(-999.F),
+          chargePixel(-999.F),
+          clusterProbabilityXY(-999.F),
+          clusterProbabilityQ(-999.F),
+          clusterProbabilityXYQ(-999.F),
+          logClusterProbability(-999.F),
+          isOnEdge(false),
+          hasBadPixels(false),
+          spansTwoRoc(false),
+          qBin(-1),
+          isModuleUsable(true),
+          chargeStrip(0),
+          maxStrip(0),
+          maxStripInv(0),
+          maxCharge(0),
+          maxIndex(0),
+          chargeOnEdges(-999.F),
+          chargeAsymmetry(-999.F),
+          chargeLRplus(-999.F),
+          chargeLRminus(-999.F),
+          sOverN(-999.F),
+          projWidth(-999.F),
+          resX(-999.F),
+          norResX(-999.F),
+          xHit(-999.F),
+          xTrk(-999.F),
+          errXHit(-999.F),
+          errXTrk(-999.F),
+          errX(-999.F),
+          errX2(-999.F),
+          errXHitWoApe(-999.F),
+          errXWoApe(-999.F),
+          probX(-999.F),
+          resY(-999.F),
+          norResY(-999.F),
+          yHit(-999.F),
+          yTrk(-999.F),
+          errYHit(-999.F),
+          errYTrk(-999.F),
+          errY(-999.F),
+          errY2(-999.F),
+          errYHitWoApe(-999.F),
+          errYWoApe(-999.F),
+          probY(-999.F),
+          phiSens(-999.F),
+          phiSensX(-999.F),
+          phiSensY(-999.F) {}
+
     HitState hitState;
     bool isPixelHit;
     bool goodXMeasurement, goodYMeasurement;
     std::vector<unsigned int> v_sector;
-    
+
     // Cluster parameters
     // pixel+strip
     unsigned int widthX;
@@ -54,58 +78,58 @@ struct TrackStruct{
     unsigned int widthY;
     float baryStripY;
     float chargePixel;
-    float clusterProbabilityXY, clusterProbabilityQ,
-          clusterProbabilityXYQ, logClusterProbability;
+    float clusterProbabilityXY, clusterProbabilityQ, clusterProbabilityXYQ, logClusterProbability;
     bool isOnEdge, hasBadPixels, spansTwoRoc;
     int qBin;
     // strip only
     bool isModuleUsable;
     unsigned int chargeStrip;
     unsigned int maxStrip, maxStripInv, maxCharge, maxIndex;
-    float chargeOnEdges, chargeAsymmetry,
-          chargeLRplus, chargeLRminus;
+    float chargeOnEdges, chargeAsymmetry, chargeLRplus, chargeLRminus;
     float sOverN;
     float projWidth;
-    
+
     // trackFit results
-    float resX, norResX, xHit, xTrk,
-          errXHit, errXTrk, errX, errX2,
-	  errXHitWoApe, errXWoApe,
-	  probX;
-    float resY, norResY, yHit, yTrk,
-          errYHit, errYTrk, errY, errY2,
-	  errYHitWoApe, errYWoApe,
-	  probY;
+    float resX, norResX, xHit, xTrk, errXHit, errXTrk, errX, errX2, errXHitWoApe, errXWoApe, probX;
+    float resY, norResY, yHit, yTrk, errYHit, errYTrk, errY, errY2, errYHitWoApe, errYWoApe, probY;
     float phiSens, phiSensX, phiSensY;
   };
-  
-  struct TrackParameterStruct{
-    
-    TrackParameterStruct(): hitsSize(-999), hitsValid(-999), hitsInvalid(-999),
-		   hits2D(-999), layersMissed(-999),
-		   hitsPixel(-999), hitsStrip(-999),
-		   charge(-999),
-		   chi2(-999.F), ndof(-999.F), norChi2(-999.F), prob(-999.F),
-                   eta(-999.F), etaErr(-999.F), theta(-999.F),
-		   phi(-999.F), phiErr(-999.F),
-		   d0(-999.F), d0Beamspot(-999.F), d0BeamspotErr(-999.F),
-		   dz(-999.F), dzErr(-999.F), dzBeamspot(-999.F),
-                   p(-999.F), pt(-999.F), ptErr(-999.F),
-		   meanPhiSensToNorm(-999.F){}
-    
-    int hitsSize, hitsValid, hitsInvalid,
-        hits2D, layersMissed,
-	hitsPixel, hitsStrip,
-	charge;
-    float chi2, ndof, norChi2, prob,
-          eta, etaErr, theta,
-	  phi, phiErr,
-	  d0, d0Beamspot, d0BeamspotErr,
-	  dz, dzErr, dzBeamspot,
-	  p, pt, ptErr,
-	  meanPhiSensToNorm;
+
+  struct TrackParameterStruct {
+    TrackParameterStruct()
+        : hitsSize(-999),
+          hitsValid(-999),
+          hitsInvalid(-999),
+          hits2D(-999),
+          layersMissed(-999),
+          hitsPixel(-999),
+          hitsStrip(-999),
+          charge(-999),
+          chi2(-999.F),
+          ndof(-999.F),
+          norChi2(-999.F),
+          prob(-999.F),
+          eta(-999.F),
+          etaErr(-999.F),
+          theta(-999.F),
+          phi(-999.F),
+          phiErr(-999.F),
+          d0(-999.F),
+          d0Beamspot(-999.F),
+          d0BeamspotErr(-999.F),
+          dz(-999.F),
+          dzErr(-999.F),
+          dzBeamspot(-999.F),
+          p(-999.F),
+          pt(-999.F),
+          ptErr(-999.F),
+          meanPhiSensToNorm(-999.F) {}
+
+    int hitsSize, hitsValid, hitsInvalid, hits2D, layersMissed, hitsPixel, hitsStrip, charge;
+    float chi2, ndof, norChi2, prob, eta, etaErr, theta, phi, phiErr, d0, d0Beamspot, d0BeamspotErr, dz, dzErr,
+        dzBeamspot, p, pt, ptErr, meanPhiSensToNorm;
   };
-  
+
   TrackParameterStruct trkParams;
   std::vector<HitParameterStruct> v_hitParams;
 };
diff --git a/Alignment/APEEstimation/interface/ReducedTrackerTreeVariables.h b/Alignment/APEEstimation/interface/ReducedTrackerTreeVariables.h
index 0e0c1632289f9..c42174edb336b 100644
--- a/Alignment/APEEstimation/interface/ReducedTrackerTreeVariables.h
+++ b/Alignment/APEEstimation/interface/ReducedTrackerTreeVariables.h
@@ -1,28 +1,21 @@
 #ifndef ReducedTrackerTreeVariables_h
 #define ReducedTrackerTreeVariables_h
 
-
 // For ROOT types with '_t':
 #include <Rtypes.h>
 
-
-
 // container to hold those static module parameters needed for correct xPrime-Residual calculation (and others), determined with ideal geometry
-struct ReducedTrackerTreeVariables{
-  
-  ReducedTrackerTreeVariables(){this->clear();}
-  
-  void clear(){
+struct ReducedTrackerTreeVariables {
+  ReducedTrackerTreeVariables() { this->clear(); }
+
+  void clear() {
     subdetId = 0;
     nStrips = 0;
     uDirection = vDirection = wDirection = 0;
   }
-  
-  UInt_t subdetId,
-         nStrips;
+
+  UInt_t subdetId, nStrips;
   Int_t uDirection, vDirection, wDirection;
 };
 
-
-
 #endif
diff --git a/Alignment/APEEstimation/interface/TrackerDetectorStruct.h b/Alignment/APEEstimation/interface/TrackerDetectorStruct.h
index b057b69df70a3..eaf43af046a52 100644
--- a/Alignment/APEEstimation/interface/TrackerDetectorStruct.h
+++ b/Alignment/APEEstimation/interface/TrackerDetectorStruct.h
@@ -1,57 +1,71 @@
 #ifndef Alignment_APEEstimation_TrackerDetectorStruct_h
 #define Alignment_APEEstimation_TrackerDetectorStruct_h
 
-
 #include "TH1.h"
 #include "TH2.h"
 #include "TProfile.h"
 
-struct TrackerDetectorStruct{
-  
-  TrackerDetectorStruct(): TrkSize(nullptr), TrkSizeGood(nullptr),
-                           HitsSize(nullptr), HitsValid(nullptr), HitsInvalid(nullptr), Hits2D(nullptr),
-			   HitsGood(nullptr), LayersMissed(nullptr),
-			   HitsPixel(nullptr), HitsStrip(nullptr),
-			   Charge(nullptr),
-			   Chi2(nullptr), Ndof(nullptr), NorChi2(nullptr), Prob(nullptr),
-			   Eta(nullptr), EtaErr(nullptr), EtaSig(nullptr), Theta(nullptr),
-			   Phi(nullptr), PhiErr(nullptr), PhiSig(nullptr),
-			   D0Beamspot(nullptr), D0BeamspotErr(nullptr), D0BeamspotSig(nullptr),
-			   Dz(nullptr), DzErr(nullptr), DzSig(nullptr),
-			   P(nullptr), Pt(nullptr), PtErr(nullptr), PtSig(nullptr),
-			   MeanAngle(nullptr),
-			   HitsGoodVsHitsValid(nullptr), MeanAngleVsHits(nullptr),
-			   HitsPixelVsEta(nullptr), HitsPixelVsTheta(nullptr),
-			   HitsStripVsEta(nullptr), HitsStripVsTheta(nullptr),
-			   PtVsEta(nullptr), PtVsTheta(nullptr),
-			   PHitsGoodVsHitsValid(nullptr), PMeanAngleVsHits(nullptr),
-			   PHitsPixelVsEta(nullptr), PHitsPixelVsTheta(nullptr),
-			   PHitsStripVsEta(nullptr), PHitsStripVsTheta(nullptr),
-			   PPtVsEta(nullptr), PPtVsTheta(nullptr){}
-  
-  TH1 *TrkSize, *TrkSizeGood,
-      *HitsSize, *HitsValid, *HitsInvalid, *Hits2D,
-      *HitsGood, *LayersMissed,
-      *HitsPixel, *HitsStrip,
-      *Charge,
-      *Chi2, *Ndof, *NorChi2, *Prob,
-      *Eta, *EtaErr, *EtaSig, *Theta,
-      *Phi,*PhiErr, *PhiSig,
-      *D0Beamspot, *D0BeamspotErr, *D0BeamspotSig,
-      *Dz, *DzErr, *DzSig,
-      *P, *Pt, *PtErr, *PtSig,
-      *MeanAngle;
-  
-  TH2 *HitsGoodVsHitsValid, *MeanAngleVsHits,
-      *HitsPixelVsEta, *HitsPixelVsTheta,
-      *HitsStripVsEta, *HitsStripVsTheta,
+struct TrackerDetectorStruct {
+  TrackerDetectorStruct()
+      : TrkSize(nullptr),
+        TrkSizeGood(nullptr),
+        HitsSize(nullptr),
+        HitsValid(nullptr),
+        HitsInvalid(nullptr),
+        Hits2D(nullptr),
+        HitsGood(nullptr),
+        LayersMissed(nullptr),
+        HitsPixel(nullptr),
+        HitsStrip(nullptr),
+        Charge(nullptr),
+        Chi2(nullptr),
+        Ndof(nullptr),
+        NorChi2(nullptr),
+        Prob(nullptr),
+        Eta(nullptr),
+        EtaErr(nullptr),
+        EtaSig(nullptr),
+        Theta(nullptr),
+        Phi(nullptr),
+        PhiErr(nullptr),
+        PhiSig(nullptr),
+        D0Beamspot(nullptr),
+        D0BeamspotErr(nullptr),
+        D0BeamspotSig(nullptr),
+        Dz(nullptr),
+        DzErr(nullptr),
+        DzSig(nullptr),
+        P(nullptr),
+        Pt(nullptr),
+        PtErr(nullptr),
+        PtSig(nullptr),
+        MeanAngle(nullptr),
+        HitsGoodVsHitsValid(nullptr),
+        MeanAngleVsHits(nullptr),
+        HitsPixelVsEta(nullptr),
+        HitsPixelVsTheta(nullptr),
+        HitsStripVsEta(nullptr),
+        HitsStripVsTheta(nullptr),
+        PtVsEta(nullptr),
+        PtVsTheta(nullptr),
+        PHitsGoodVsHitsValid(nullptr),
+        PMeanAngleVsHits(nullptr),
+        PHitsPixelVsEta(nullptr),
+        PHitsPixelVsTheta(nullptr),
+        PHitsStripVsEta(nullptr),
+        PHitsStripVsTheta(nullptr),
+        PPtVsEta(nullptr),
+        PPtVsTheta(nullptr) {}
+
+  TH1 *TrkSize, *TrkSizeGood, *HitsSize, *HitsValid, *HitsInvalid, *Hits2D, *HitsGood, *LayersMissed, *HitsPixel,
+      *HitsStrip, *Charge, *Chi2, *Ndof, *NorChi2, *Prob, *Eta, *EtaErr, *EtaSig, *Theta, *Phi, *PhiErr, *PhiSig,
+      *D0Beamspot, *D0BeamspotErr, *D0BeamspotSig, *Dz, *DzErr, *DzSig, *P, *Pt, *PtErr, *PtSig, *MeanAngle;
+
+  TH2 *HitsGoodVsHitsValid, *MeanAngleVsHits, *HitsPixelVsEta, *HitsPixelVsTheta, *HitsStripVsEta, *HitsStripVsTheta,
       *PtVsEta, *PtVsTheta;
-  
-  TProfile *PHitsGoodVsHitsValid, *PMeanAngleVsHits,
-           *PHitsPixelVsEta, *PHitsPixelVsTheta,
-           *PHitsStripVsEta, *PHitsStripVsTheta,
-           *PPtVsEta, *PPtVsTheta;
-  
+
+  TProfile *PHitsGoodVsHitsValid, *PMeanAngleVsHits, *PHitsPixelVsEta, *PHitsPixelVsTheta, *PHitsStripVsEta,
+      *PHitsStripVsTheta, *PPtVsEta, *PPtVsTheta;
 };
 
 #endif
diff --git a/Alignment/APEEstimation/interface/TrackerSectorStruct.h b/Alignment/APEEstimation/interface/TrackerSectorStruct.h
index 81c718d4cc14d..eeab8005ebf1b 100644
--- a/Alignment/APEEstimation/interface/TrackerSectorStruct.h
+++ b/Alignment/APEEstimation/interface/TrackerSectorStruct.h
@@ -1,7 +1,6 @@
 #ifndef Alignment_APEEstimation_TrackerSectorStruct_h
 #define Alignment_APEEstimation_TrackerSectorStruct_h
 
-
 #include <vector>
 #include <map>
 #include "TH1F.h"
@@ -12,7 +11,6 @@
 
 #include "Alignment/APEEstimation/interface/EventVariables.h"
 
-
 #include "TH1.h"
 #include "TH2.h"
 #include "TTree.h"
@@ -24,323 +22,492 @@
 //class TString;
 //class TFileDirectory;
 
+class TrackerSectorStruct {
+public:
+  inline TrackerSectorStruct();
 
+  inline ~TrackerSectorStruct();
 
+  struct CorrelationHists {
+    CorrelationHists()
+        : Variable(nullptr),
+          NorResXVsVar(nullptr),
+          ProbXVsVar(nullptr),
+          SigmaXHitVsVar(nullptr),
+          SigmaXTrkVsVar(nullptr),
+          SigmaXVsVar(nullptr),
+          PNorResXVsVar(nullptr),
+          PProbXVsVar(nullptr),
+          PSigmaXHitVsVar(nullptr),
+          PSigmaXTrkVsVar(nullptr),
+          PSigmaXVsVar(nullptr){};
+
+    inline void fillCorrHists(const TString,
+                              const TrackStruct::HitParameterStruct &hitParameterStruct,
+                              double variable);
+    inline void fillCorrHistsX(const TrackStruct::HitParameterStruct &hitParameterStruct, double variable);
+    inline void fillCorrHistsY(const TrackStruct::HitParameterStruct &hitParameterStruct, double variable);
 
-
-
-
-
-
-class TrackerSectorStruct{
-  public:
-  
-  inline TrackerSectorStruct();
-  
-  inline ~TrackerSectorStruct();
-  
-  
-  
-  struct CorrelationHists{
-    CorrelationHists():Variable(nullptr),
-                       NorResXVsVar(nullptr), ProbXVsVar(nullptr),
-	               SigmaXHitVsVar(nullptr), SigmaXTrkVsVar(nullptr), SigmaXVsVar(nullptr),
-		       PNorResXVsVar(nullptr), PProbXVsVar(nullptr),
-		       PSigmaXHitVsVar(nullptr), PSigmaXTrkVsVar(nullptr), PSigmaXVsVar(nullptr){};
-    
-    inline void fillCorrHists(const TString, const TrackStruct::HitParameterStruct& hitParameterStruct, double variable);
-    inline void fillCorrHistsX(const TrackStruct::HitParameterStruct& hitParameterStruct, double variable);
-    inline void fillCorrHistsY(const TrackStruct::HitParameterStruct& hitParameterStruct, double variable);
-    
     TH1F *Variable;
-    TH2F *NorResXVsVar, *ProbXVsVar,
-         *SigmaXHitVsVar, *SigmaXTrkVsVar, *SigmaXVsVar;
-    TProfile *PNorResXVsVar, *PProbXVsVar,
-             *PSigmaXHitVsVar, *PSigmaXTrkVsVar, *PSigmaXVsVar;
+    TH2F *NorResXVsVar, *ProbXVsVar, *SigmaXHitVsVar, *SigmaXTrkVsVar, *SigmaXVsVar;
+    TProfile *PNorResXVsVar, *PProbXVsVar, *PSigmaXHitVsVar, *PSigmaXTrkVsVar, *PSigmaXVsVar;
   };
-  
-  
-  inline void setCorrHistParams(TFileDirectory*, double, double, double);
-  inline CorrelationHists bookCorrHists(TString, TString, TString, TString, TString, int, int, double, double, std::string ="nphtr");
-  inline CorrelationHists bookCorrHistsX(TString, TString, TString, TString, int, int, double, double, std::string ="nphtr");
-  inline CorrelationHists bookCorrHistsY(TString, TString, TString, TString, int, int, double, double, std::string ="nphtr");
-  /// same, but without booking 1D histo 
-  inline CorrelationHists bookCorrHists(TString, TString ,TString ,TString, int, double, double, std::string ="nphtr");
-  inline CorrelationHists bookCorrHistsX(TString ,TString ,TString, int, double, double, std::string ="nphtr");
-  inline CorrelationHists bookCorrHistsY(TString ,TString ,TString, int, double, double, std::string ="nphtr");
-  
-  
-  
-  
+
+  inline void setCorrHistParams(TFileDirectory *, double, double, double);
+  inline CorrelationHists bookCorrHists(
+      TString, TString, TString, TString, TString, int, int, double, double, std::string = "nphtr");
+  inline CorrelationHists bookCorrHistsX(
+      TString, TString, TString, TString, int, int, double, double, std::string = "nphtr");
+  inline CorrelationHists bookCorrHistsY(
+      TString, TString, TString, TString, int, int, double, double, std::string = "nphtr");
+  /// same, but without booking 1D histo
+  inline CorrelationHists bookCorrHists(TString, TString, TString, TString, int, double, double, std::string = "nphtr");
+  inline CorrelationHists bookCorrHistsX(TString, TString, TString, int, double, double, std::string = "nphtr");
+  inline CorrelationHists bookCorrHistsY(TString, TString, TString, int, double, double, std::string = "nphtr");
+
   TFileDirectory *directory_;
-  double norResXMax_, sigmaXHitMax_, sigmaXMax_;   // Used for x and y
-  std::map<std::string,CorrelationHists> m_correlationHistsX;
-  std::map<std::string,CorrelationHists> m_correlationHistsY;
-  
-  
+  double norResXMax_, sigmaXHitMax_, sigmaXMax_;  // Used for x and y
+  std::map<std::string, CorrelationHists> m_correlationHistsX;
+  std::map<std::string, CorrelationHists> m_correlationHistsY;
+
   // Name of sector as string and as title of a histogram
   std::string name;
   TH1 *Name;
-  
+
   // Module IDs of modules in sector
   std::vector<unsigned int> v_rawId;
-  
-  
-  TH1 *ResX, *NorResX, *XHit, *XTrk,
-      *SigmaX2, *ProbX;
-  TH2 *WidthVsPhiSensX, *WidthVsWidthProjected, *WidthDiffVsMaxStrip, *WidthDiffVsSigmaXHit,
-      *PhiSensXVsBarycentreX;
+
+  TH1 *ResX, *NorResX, *XHit, *XTrk, *SigmaX2, *ProbX;
+  TH2 *WidthVsPhiSensX, *WidthVsWidthProjected, *WidthDiffVsMaxStrip, *WidthDiffVsSigmaXHit, *PhiSensXVsBarycentreX;
   TProfile *PWidthVsPhiSensX, *PWidthVsWidthProjected, *PWidthDiffVsMaxStrip, *PWidthDiffVsSigmaXHit,
       *PPhiSensXVsBarycentreX;
-  std::map<std::string,std::vector<TH1*> > m_sigmaX;
-  
-  TH1 *ResY, *NorResY, *YHit, *YTrk,
-      *SigmaY2, *ProbY;
+  std::map<std::string, std::vector<TH1 *> > m_sigmaX;
+
+  TH1 *ResY, *NorResY, *YHit, *YTrk, *SigmaY2, *ProbY;
   TH2 *PhiSensYVsBarycentreY;
-  TProfile *PPhiSensYVsBarycentreY; 
-  std::map<std::string,std::vector<TH1*> > m_sigmaY;
-  
-  
+  TProfile *PPhiSensYVsBarycentreY;
+  std::map<std::string, std::vector<TH1 *> > m_sigmaY;
+
   //for every bin in sigmaX or sigmaY the needful histos to calculate the APE
-  std::map<unsigned int, std::map<std::string,TH1*> > m_binnedHists;
-  
-  
+  std::map<unsigned int, std::map<std::string, TH1 *> > m_binnedHists;
+
   //for presenting results
   TTree *RawId;
   TH1 *EntriesX;
-  TH1 *WeightX, *MeanX, *RmsX, *FitMeanX1, *ResidualWidthX1, *CorrectionX1,
-      *FitMeanX2, *ResidualWidthX2, *CorrectionX2;
+  TH1 *WeightX, *MeanX, *RmsX, *FitMeanX1, *ResidualWidthX1, *CorrectionX1, *FitMeanX2, *ResidualWidthX2, *CorrectionX2;
   TH1 *EntriesY;
-  TH1 *WeightY, *MeanY, *RmsY, *FitMeanY1, *ResidualWidthY1, *CorrectionY1,
-      *FitMeanY2, *ResidualWidthY2, *CorrectionY2;
-  
+  TH1 *WeightY, *MeanY, *RmsY, *FitMeanY1, *ResidualWidthY1, *CorrectionY1, *FitMeanY2, *ResidualWidthY2, *CorrectionY2;
+
   // To book pixel-specific or strip-specific histos only
   bool isPixel;
 };
 
-
-
-
-
-
-
-
-
-TrackerSectorStruct::TrackerSectorStruct(): directory_(nullptr),
-                         norResXMax_(999.), sigmaXHitMax_(999.), sigmaXMax_(999.),
-			 name("default"), Name(nullptr),
-			 ResX(nullptr), NorResX(nullptr), XHit(nullptr), XTrk(nullptr),
-			 SigmaX2(nullptr), ProbX(nullptr),
-			 WidthVsPhiSensX(nullptr), WidthVsWidthProjected(nullptr), WidthDiffVsMaxStrip(nullptr), WidthDiffVsSigmaXHit(nullptr),
-			 PhiSensXVsBarycentreX(nullptr),
-			 PWidthVsPhiSensX(nullptr), PWidthVsWidthProjected(nullptr), PWidthDiffVsMaxStrip(nullptr), PWidthDiffVsSigmaXHit(nullptr),
-			 PPhiSensXVsBarycentreX(nullptr),
-			 ResY(nullptr), NorResY(nullptr), YHit(nullptr), YTrk(nullptr),
-			 SigmaY2(nullptr), ProbY(nullptr),
-			 PhiSensYVsBarycentreY(nullptr),
-			 PPhiSensYVsBarycentreY(nullptr),
-			 RawId(nullptr),
-			 EntriesX(nullptr),
-			 MeanX(nullptr), RmsX(nullptr), FitMeanX1(nullptr), ResidualWidthX1(nullptr), CorrectionX1(nullptr),
-			 FitMeanX2(nullptr), ResidualWidthX2(nullptr), CorrectionX2(nullptr),
-			 EntriesY(nullptr),
-			 MeanY(nullptr), RmsY(nullptr), FitMeanY1(nullptr), ResidualWidthY1(nullptr), CorrectionY1(nullptr),
-			 FitMeanY2(nullptr), ResidualWidthY2(nullptr), CorrectionY2(nullptr),
-			 isPixel(false){}
-
-
-
-TrackerSectorStruct::~TrackerSectorStruct(){}
-
-
-
-void
-TrackerSectorStruct::setCorrHistParams(TFileDirectory *directory, double norResXMax, double sigmaXHitMax, double sigmaXMax){
+TrackerSectorStruct::TrackerSectorStruct()
+    : directory_(nullptr),
+      norResXMax_(999.),
+      sigmaXHitMax_(999.),
+      sigmaXMax_(999.),
+      name("default"),
+      Name(nullptr),
+      ResX(nullptr),
+      NorResX(nullptr),
+      XHit(nullptr),
+      XTrk(nullptr),
+      SigmaX2(nullptr),
+      ProbX(nullptr),
+      WidthVsPhiSensX(nullptr),
+      WidthVsWidthProjected(nullptr),
+      WidthDiffVsMaxStrip(nullptr),
+      WidthDiffVsSigmaXHit(nullptr),
+      PhiSensXVsBarycentreX(nullptr),
+      PWidthVsPhiSensX(nullptr),
+      PWidthVsWidthProjected(nullptr),
+      PWidthDiffVsMaxStrip(nullptr),
+      PWidthDiffVsSigmaXHit(nullptr),
+      PPhiSensXVsBarycentreX(nullptr),
+      ResY(nullptr),
+      NorResY(nullptr),
+      YHit(nullptr),
+      YTrk(nullptr),
+      SigmaY2(nullptr),
+      ProbY(nullptr),
+      PhiSensYVsBarycentreY(nullptr),
+      PPhiSensYVsBarycentreY(nullptr),
+      RawId(nullptr),
+      EntriesX(nullptr),
+      MeanX(nullptr),
+      RmsX(nullptr),
+      FitMeanX1(nullptr),
+      ResidualWidthX1(nullptr),
+      CorrectionX1(nullptr),
+      FitMeanX2(nullptr),
+      ResidualWidthX2(nullptr),
+      CorrectionX2(nullptr),
+      EntriesY(nullptr),
+      MeanY(nullptr),
+      RmsY(nullptr),
+      FitMeanY1(nullptr),
+      ResidualWidthY1(nullptr),
+      CorrectionY1(nullptr),
+      FitMeanY2(nullptr),
+      ResidualWidthY2(nullptr),
+      CorrectionY2(nullptr),
+      isPixel(false) {}
+
+TrackerSectorStruct::~TrackerSectorStruct() {}
+
+void TrackerSectorStruct::setCorrHistParams(TFileDirectory *directory,
+                                            double norResXMax,
+                                            double sigmaXHitMax,
+                                            double sigmaXMax) {
   directory_ = directory;
   norResXMax_ = norResXMax;
   sigmaXHitMax_ = sigmaXHitMax;
   sigmaXMax_ = sigmaXMax;
 }
 
-
-
-TrackerSectorStruct::CorrelationHists
-TrackerSectorStruct::bookCorrHistsX(TString varName,TString varTitle,TString labelX,TString unitX,int nBinX1D,int nBinX2D,double minBinX,double maxBinX,std::string options){
+TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHistsX(TString varName,
+                                                                          TString varTitle,
+                                                                          TString labelX,
+                                                                          TString unitX,
+                                                                          int nBinX1D,
+                                                                          int nBinX2D,
+                                                                          double minBinX,
+                                                                          double maxBinX,
+                                                                          std::string options) {
   return bookCorrHists("X", varName, varTitle, labelX, unitX, nBinX1D, nBinX2D, minBinX, maxBinX, options);
 }
-TrackerSectorStruct::CorrelationHists
-TrackerSectorStruct::bookCorrHistsY(TString varName,TString varTitle,TString labelX,TString unitX,int nBinX1D,int nBinX2D,double minBinX,double maxBinX,std::string options){
+TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHistsY(TString varName,
+                                                                          TString varTitle,
+                                                                          TString labelX,
+                                                                          TString unitX,
+                                                                          int nBinX1D,
+                                                                          int nBinX2D,
+                                                                          double minBinX,
+                                                                          double maxBinX,
+                                                                          std::string options) {
   return bookCorrHists("Y", varName, varTitle, labelX, unitX, nBinX1D, nBinX2D, minBinX, maxBinX, options);
 }
-TrackerSectorStruct::CorrelationHists
-TrackerSectorStruct::bookCorrHists(TString xY,TString varName,TString varTitle,TString labelX,TString unitX,int nBinX1D,int nBinX2D,double minBinX,double maxBinX,std::string options){
+TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHists(TString xY,
+                                                                         TString varName,
+                                                                         TString varTitle,
+                                                                         TString labelX,
+                                                                         TString unitX,
+                                                                         int nBinX1D,
+                                                                         int nBinX2D,
+                                                                         double minBinX,
+                                                                         double maxBinX,
+                                                                         std::string options) {
   TString xy;
   TString suffix;
-  if(xY=="X"){
+  if (xY == "X") {
     xy = "x";
     suffix = "";
   }
-  if(xY=="Y"){
+  if (xY == "Y") {
     xy = "y";
     suffix = "_y";
   }
-  
-  const std::string& o(options);
+
+  const std::string &o(options);
   CorrelationHists correlationHists;
-  
-  if(!(o.find("n") != std::string::npos || o.find("p") != std::string::npos || o.find("h") != std::string::npos || 
-       o.find("t") != std::string::npos || o.find("r") != std::string::npos))return correlationHists;
-  
+
+  if (!(o.find("n") != std::string::npos || o.find("p") != std::string::npos || o.find("h") != std::string::npos ||
+        o.find("t") != std::string::npos || o.find("r") != std::string::npos))
+    return correlationHists;
+
   TFileDirectory *directory(directory_);
   double norResXMax(norResXMax_), sigmaXHitMax(sigmaXHitMax_), sigmaXMax(sigmaXMax_);
-  
-  if(!directory)return correlationHists;
-  
-  
-  correlationHists.Variable = directory->make<TH1F>("h_"+varName+suffix,varTitle+" "+labelX+";"+labelX+"  "+unitX+";# hits",nBinX1D,minBinX,maxBinX);
-  
-  if(options.find("n") != std::string::npos)
-  correlationHists.NorResXVsVar = directory->make<TH2F>("h2_norRes"+xY+"Vs"+varName,"r_{"+xy+"}/#sigma_{r,"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";("+xy+"_{trk}-"+xy+"_{hit})/#sigma_{r,"+xy+"}",nBinX2D,minBinX,maxBinX,25,-norResXMax,norResXMax);
-  if(options.find("p") != std::string::npos)
-  correlationHists.ProbXVsVar = directory->make<TH2F>("h2_prob"+xY+"Vs"+varName,"prob_{"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";prob_{"+xy+"}",nBinX2D,minBinX,maxBinX,60,-0.1,1.1);
-  if(options.find("h") != std::string::npos)
-  correlationHists.SigmaXHitVsVar = directory->make<TH2F>("h2_sigma"+xY+"HitVs"+varName,"#sigma_{hit,"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";#sigma_{hit,"+xy+"}  [#mum]",nBinX2D,minBinX,maxBinX,50,0*10000.,sigmaXHitMax*10000.);
-  if(options.find("t") != std::string::npos)
-  correlationHists.SigmaXTrkVsVar = directory->make<TH2F>("h2_sigma"+xY+"TrkVs"+varName,"#sigma_{trk,"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";#sigma_{trk,"+xy+"}  [#mum]",nBinX2D,minBinX,maxBinX,50,0*10000.,sigmaXMax*10000.);
-  if(options.find("r") != std::string::npos)
-  correlationHists.SigmaXVsVar = directory->make<TH2F>("h2_sigma"+xY+"Vs"+varName,"#sigma_{r,"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";#sigma_{r,"+xy+"}  [#mum]",nBinX2D,minBinX,maxBinX,50,0*10000.,sigmaXMax*10000.);
-    
-  if(options.find("n") != std::string::npos)
-  correlationHists.PNorResXVsVar = directory->make<TProfile>("p_norRes"+xY+"Vs"+varName,"r_{"+xy+"}/#sigma_{r,"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";("+xy+"_{trk}-"+xy+"_{hit})/#sigma_{r,"+xy+"}",nBinX2D,minBinX,maxBinX,"s");
-  if(options.find("p") != std::string::npos)
-  correlationHists.PProbXVsVar = directory->make<TProfile>("p_prob"+xY+"Vs"+varName,"prob_{"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";prob_{"+xy+"}",nBinX2D,minBinX,maxBinX,"s");
-  if(options.find("h") != std::string::npos)
-  correlationHists.PSigmaXHitVsVar = directory->make<TProfile>("p_sigma"+xY+"HitVs"+varName,"#sigma_{hit,"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";#sigma_{hit,"+xy+"}  [#mum]",nBinX2D,minBinX,maxBinX);
-  if(options.find("t") != std::string::npos)
-  correlationHists.PSigmaXTrkVsVar = directory->make<TProfile>("p_sigma"+xY+"TrkVs"+varName,"#sigma_{trk,"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";#sigma_{trk,"+xy+"}  [#mum]",nBinX2D,minBinX,maxBinX);
-  if(options.find("r") != std::string::npos)
-  correlationHists.PSigmaXVsVar = directory->make<TProfile>("p_sigma"+xY+"Vs"+varName,"#sigma_{r,"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";#sigma_{r,"+xy+"}  [#mum]",nBinX2D,minBinX,maxBinX);
-  
-  return correlationHists;
-}
 
+  if (!directory)
+    return correlationHists;
+
+  correlationHists.Variable = directory->make<TH1F>("h_" + varName + suffix,
+                                                    varTitle + " " + labelX + ";" + labelX + "  " + unitX + ";# hits",
+                                                    nBinX1D,
+                                                    minBinX,
+                                                    maxBinX);
+
+  if (options.find("n") != std::string::npos)
+    correlationHists.NorResXVsVar =
+        directory->make<TH2F>("h2_norRes" + xY + "Vs" + varName,
+                              "r_{" + xy + "}/#sigma_{r," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX +
+                                  ";(" + xy + "_{trk}-" + xy + "_{hit})/#sigma_{r," + xy + "}",
+                              nBinX2D,
+                              minBinX,
+                              maxBinX,
+                              25,
+                              -norResXMax,
+                              norResXMax);
+  if (options.find("p") != std::string::npos)
+    correlationHists.ProbXVsVar =
+        directory->make<TH2F>("h2_prob" + xY + "Vs" + varName,
+                              "prob_{" + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";prob_{" + xy + "}",
+                              nBinX2D,
+                              minBinX,
+                              maxBinX,
+                              60,
+                              -0.1,
+                              1.1);
+  if (options.find("h") != std::string::npos)
+    correlationHists.SigmaXHitVsVar = directory->make<TH2F>(
+        "h2_sigma" + xY + "HitVs" + varName,
+        "#sigma_{hit," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{hit," + xy + "}  [#mum]",
+        nBinX2D,
+        minBinX,
+        maxBinX,
+        50,
+        0 * 10000.,
+        sigmaXHitMax * 10000.);
+  if (options.find("t") != std::string::npos)
+    correlationHists.SigmaXTrkVsVar = directory->make<TH2F>(
+        "h2_sigma" + xY + "TrkVs" + varName,
+        "#sigma_{trk," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{trk," + xy + "}  [#mum]",
+        nBinX2D,
+        minBinX,
+        maxBinX,
+        50,
+        0 * 10000.,
+        sigmaXMax * 10000.);
+  if (options.find("r") != std::string::npos)
+    correlationHists.SigmaXVsVar = directory->make<TH2F>(
+        "h2_sigma" + xY + "Vs" + varName,
+        "#sigma_{r," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{r," + xy + "}  [#mum]",
+        nBinX2D,
+        minBinX,
+        maxBinX,
+        50,
+        0 * 10000.,
+        sigmaXMax * 10000.);
+
+  if (options.find("n") != std::string::npos)
+    correlationHists.PNorResXVsVar =
+        directory->make<TProfile>("p_norRes" + xY + "Vs" + varName,
+                                  "r_{" + xy + "}/#sigma_{r," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX +
+                                      ";(" + xy + "_{trk}-" + xy + "_{hit})/#sigma_{r," + xy + "}",
+                                  nBinX2D,
+                                  minBinX,
+                                  maxBinX,
+                                  "s");
+  if (options.find("p") != std::string::npos)
+    correlationHists.PProbXVsVar = directory->make<TProfile>(
+        "p_prob" + xY + "Vs" + varName,
+        "prob_{" + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";prob_{" + xy + "}",
+        nBinX2D,
+        minBinX,
+        maxBinX,
+        "s");
+  if (options.find("h") != std::string::npos)
+    correlationHists.PSigmaXHitVsVar = directory->make<TProfile>(
+        "p_sigma" + xY + "HitVs" + varName,
+        "#sigma_{hit," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{hit," + xy + "}  [#mum]",
+        nBinX2D,
+        minBinX,
+        maxBinX);
+  if (options.find("t") != std::string::npos)
+    correlationHists.PSigmaXTrkVsVar = directory->make<TProfile>(
+        "p_sigma" + xY + "TrkVs" + varName,
+        "#sigma_{trk," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{trk," + xy + "}  [#mum]",
+        nBinX2D,
+        minBinX,
+        maxBinX);
+  if (options.find("r") != std::string::npos)
+    correlationHists.PSigmaXVsVar = directory->make<TProfile>(
+        "p_sigma" + xY + "Vs" + varName,
+        "#sigma_{r," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{r," + xy + "}  [#mum]",
+        nBinX2D,
+        minBinX,
+        maxBinX);
 
+  return correlationHists;
+}
 
-TrackerSectorStruct::CorrelationHists
-TrackerSectorStruct::bookCorrHistsX(TString varName,TString labelX,TString unitX,int nBinX,double minBinX,double maxBinX,std::string options){
+TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHistsX(
+    TString varName, TString labelX, TString unitX, int nBinX, double minBinX, double maxBinX, std::string options) {
   return bookCorrHists("X", varName, labelX, unitX, nBinX, minBinX, maxBinX, options);
 }
-TrackerSectorStruct::CorrelationHists
-TrackerSectorStruct::bookCorrHistsY(TString varName,TString labelX,TString unitX,int nBinX,double minBinX,double maxBinX,std::string options){
+TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHistsY(
+    TString varName, TString labelX, TString unitX, int nBinX, double minBinX, double maxBinX, std::string options) {
   return bookCorrHists("Y", varName, labelX, unitX, nBinX, minBinX, maxBinX, options);
 }
-TrackerSectorStruct::CorrelationHists
-TrackerSectorStruct::bookCorrHists(TString xY,TString varName,TString labelX,TString unitX,int nBinX,double minBinX,double maxBinX,std::string options){
+TrackerSectorStruct::CorrelationHists TrackerSectorStruct::bookCorrHists(TString xY,
+                                                                         TString varName,
+                                                                         TString labelX,
+                                                                         TString unitX,
+                                                                         int nBinX,
+                                                                         double minBinX,
+                                                                         double maxBinX,
+                                                                         std::string options) {
   TString xy;
-  if(xY=="X"){
+  if (xY == "X") {
     xy = "x";
   }
-  if(xY=="Y"){
+  if (xY == "Y") {
     xy = "y";
   }
-  
-  const std::string& o(options);
+
+  const std::string &o(options);
   CorrelationHists correlationHists;
-  
-  if(!(o.find("n") != std::string::npos || o.find("p") != std::string::npos || o.find("h") != std::string::npos || 
-       o.find("t") != std::string::npos || o.find("r") != std::string::npos))return correlationHists;
-  
+
+  if (!(o.find("n") != std::string::npos || o.find("p") != std::string::npos || o.find("h") != std::string::npos ||
+        o.find("t") != std::string::npos || o.find("r") != std::string::npos))
+    return correlationHists;
+
   TFileDirectory *directory(directory_);
   double norResXMax(norResXMax_), sigmaXHitMax(sigmaXHitMax_), sigmaXMax(sigmaXMax_);
-  
-  if(!directory)return correlationHists;
-  
-  
-  if(options.find("n") != std::string::npos)
-  correlationHists.NorResXVsVar = directory->make<TH2F>("h2_norRes"+xY+"Vs"+varName,"r_{"+xy+"}/#sigma_{r,"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";("+xy+"_{trk}-"+xy+"_{hit})/#sigma_{r,"+xy+"}",nBinX,minBinX,maxBinX,25,-norResXMax,norResXMax);
-  if(options.find("p") != std::string::npos)
-  correlationHists.ProbXVsVar = directory->make<TH2F>("h2_prob"+xY+"Vs"+varName,"prob_{"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";prob_{"+xy+"}",nBinX,minBinX,maxBinX,60,-0.1,1.1);
-  if(options.find("h") != std::string::npos)
-  correlationHists.SigmaXHitVsVar = directory->make<TH2F>("h2_sigma"+xY+"HitVs"+varName,"#sigma_{hit,"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";#sigma_{hit,"+xy+"}  [#mum]",nBinX,minBinX,maxBinX,50,0*10000.,sigmaXHitMax*10000.);
-  if(options.find("t") != std::string::npos)
-  correlationHists.SigmaXTrkVsVar = directory->make<TH2F>("h2_sigma"+xY+"TrkVs"+varName,"#sigma_{trk,"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";#sigma_{trk,"+xy+"}  [#mum]",nBinX,minBinX,maxBinX,50,0*10000.,sigmaXMax*10000.);
-  if(options.find("r") != std::string::npos)
-  correlationHists.SigmaXVsVar = directory->make<TH2F>("h2_sigma"+xY+"Vs"+varName,"#sigma_{r,"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";#sigma_{r,"+xy+"}  [#mum]",nBinX,minBinX,maxBinX,50,0*10000.,sigmaXMax*10000.);
-    
-  if(options.find("n") != std::string::npos)
-  correlationHists.PNorResXVsVar = directory->make<TProfile>("p_norRes"+xY+"Vs"+varName,"r_{"+xy+"}/#sigma_{r,"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";("+xy+"_{trk}-"+xy+"_{hit})/#sigma_{r,"+xy+"}",nBinX,minBinX,maxBinX,"s");
-  if(options.find("p") != std::string::npos)
-  correlationHists.PProbXVsVar = directory->make<TProfile>("p_prob"+xY+"Vs"+varName,"prob_{"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";prob_{"+xy+"}",nBinX,minBinX,maxBinX,"s");
-  if(options.find("h") != std::string::npos)
-  correlationHists.PSigmaXHitVsVar = directory->make<TProfile>("p_sigma"+xY+"HitVs"+varName,"#sigma_{hit,"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";#sigma_{hit,"+xy+"}  [#mum]",nBinX,minBinX,maxBinX);
-  if(options.find("t") != std::string::npos)
-  correlationHists.PSigmaXTrkVsVar = directory->make<TProfile>("p_sigma"+xY+"TrkVs"+varName,"#sigma_{trk,"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";#sigma_{trk,"+xy+"}  [#mum]",nBinX,minBinX,maxBinX);
-  if(options.find("r") != std::string::npos)
-  correlationHists.PSigmaXVsVar = directory->make<TProfile>("p_sigma"+xY+"Vs"+varName,"#sigma_{r,"+xy+"} vs. "+labelX+";"+labelX+"  "+unitX+";#sigma_{r,"+xy+"}  [#mum]",nBinX,minBinX,maxBinX);
-  
-  return correlationHists;
-}
-
 
+  if (!directory)
+    return correlationHists;
+
+  if (options.find("n") != std::string::npos)
+    correlationHists.NorResXVsVar =
+        directory->make<TH2F>("h2_norRes" + xY + "Vs" + varName,
+                              "r_{" + xy + "}/#sigma_{r," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX +
+                                  ";(" + xy + "_{trk}-" + xy + "_{hit})/#sigma_{r," + xy + "}",
+                              nBinX,
+                              minBinX,
+                              maxBinX,
+                              25,
+                              -norResXMax,
+                              norResXMax);
+  if (options.find("p") != std::string::npos)
+    correlationHists.ProbXVsVar =
+        directory->make<TH2F>("h2_prob" + xY + "Vs" + varName,
+                              "prob_{" + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";prob_{" + xy + "}",
+                              nBinX,
+                              minBinX,
+                              maxBinX,
+                              60,
+                              -0.1,
+                              1.1);
+  if (options.find("h") != std::string::npos)
+    correlationHists.SigmaXHitVsVar = directory->make<TH2F>(
+        "h2_sigma" + xY + "HitVs" + varName,
+        "#sigma_{hit," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{hit," + xy + "}  [#mum]",
+        nBinX,
+        minBinX,
+        maxBinX,
+        50,
+        0 * 10000.,
+        sigmaXHitMax * 10000.);
+  if (options.find("t") != std::string::npos)
+    correlationHists.SigmaXTrkVsVar = directory->make<TH2F>(
+        "h2_sigma" + xY + "TrkVs" + varName,
+        "#sigma_{trk," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{trk," + xy + "}  [#mum]",
+        nBinX,
+        minBinX,
+        maxBinX,
+        50,
+        0 * 10000.,
+        sigmaXMax * 10000.);
+  if (options.find("r") != std::string::npos)
+    correlationHists.SigmaXVsVar = directory->make<TH2F>(
+        "h2_sigma" + xY + "Vs" + varName,
+        "#sigma_{r," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{r," + xy + "}  [#mum]",
+        nBinX,
+        minBinX,
+        maxBinX,
+        50,
+        0 * 10000.,
+        sigmaXMax * 10000.);
+
+  if (options.find("n") != std::string::npos)
+    correlationHists.PNorResXVsVar =
+        directory->make<TProfile>("p_norRes" + xY + "Vs" + varName,
+                                  "r_{" + xy + "}/#sigma_{r," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX +
+                                      ";(" + xy + "_{trk}-" + xy + "_{hit})/#sigma_{r," + xy + "}",
+                                  nBinX,
+                                  minBinX,
+                                  maxBinX,
+                                  "s");
+  if (options.find("p") != std::string::npos)
+    correlationHists.PProbXVsVar = directory->make<TProfile>(
+        "p_prob" + xY + "Vs" + varName,
+        "prob_{" + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";prob_{" + xy + "}",
+        nBinX,
+        minBinX,
+        maxBinX,
+        "s");
+  if (options.find("h") != std::string::npos)
+    correlationHists.PSigmaXHitVsVar = directory->make<TProfile>(
+        "p_sigma" + xY + "HitVs" + varName,
+        "#sigma_{hit," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{hit," + xy + "}  [#mum]",
+        nBinX,
+        minBinX,
+        maxBinX);
+  if (options.find("t") != std::string::npos)
+    correlationHists.PSigmaXTrkVsVar = directory->make<TProfile>(
+        "p_sigma" + xY + "TrkVs" + varName,
+        "#sigma_{trk," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{trk," + xy + "}  [#mum]",
+        nBinX,
+        minBinX,
+        maxBinX);
+  if (options.find("r") != std::string::npos)
+    correlationHists.PSigmaXVsVar = directory->make<TProfile>(
+        "p_sigma" + xY + "Vs" + varName,
+        "#sigma_{r," + xy + "} vs. " + labelX + ";" + labelX + "  " + unitX + ";#sigma_{r," + xy + "}  [#mum]",
+        nBinX,
+        minBinX,
+        maxBinX);
 
+  return correlationHists;
+}
 
-void
-TrackerSectorStruct::CorrelationHists::fillCorrHistsX(const TrackStruct::HitParameterStruct& hitParameterStruct, double variable){
+void TrackerSectorStruct::CorrelationHists::fillCorrHistsX(const TrackStruct::HitParameterStruct &hitParameterStruct,
+                                                           double variable) {
   return fillCorrHists("X", hitParameterStruct, variable);
 }
-void
-TrackerSectorStruct::CorrelationHists::fillCorrHistsY(const TrackStruct::HitParameterStruct& hitParameterStruct, double variable){
+void TrackerSectorStruct::CorrelationHists::fillCorrHistsY(const TrackStruct::HitParameterStruct &hitParameterStruct,
+                                                           double variable) {
   return fillCorrHists("Y", hitParameterStruct, variable);
 }
-void
-TrackerSectorStruct::CorrelationHists::fillCorrHists(const TString xY, const TrackStruct::HitParameterStruct& hitParameterStruct, double variable){
+void TrackerSectorStruct::CorrelationHists::fillCorrHists(const TString xY,
+                                                          const TrackStruct::HitParameterStruct &hitParameterStruct,
+                                                          double variable) {
   float norRes(999.);
   float prob(999.);
   float errHit(999.);
   float errTrk(999.);
   float err(999.);
-  if(xY=="X"){
+  if (xY == "X") {
     norRes = hitParameterStruct.norResX;
     prob = hitParameterStruct.probX;
     errHit = hitParameterStruct.errXHit;
     errTrk = hitParameterStruct.errXTrk;
     err = hitParameterStruct.errX;
   }
-  if(xY=="Y"){
+  if (xY == "Y") {
     norRes = hitParameterStruct.norResY;
     prob = hitParameterStruct.probY;
     errHit = hitParameterStruct.errYHit;
     errTrk = hitParameterStruct.errYTrk;
     err = hitParameterStruct.errY;
   }
-  
-  if(Variable){Variable->Fill(variable);}
-  
-  if(NorResXVsVar){
-    NorResXVsVar->Fill(variable,norRes);
-    PNorResXVsVar->Fill(variable,norRes);
+
+  if (Variable) {
+    Variable->Fill(variable);
+  }
+
+  if (NorResXVsVar) {
+    NorResXVsVar->Fill(variable, norRes);
+    PNorResXVsVar->Fill(variable, norRes);
   }
-  if(ProbXVsVar){
-    ProbXVsVar->Fill(variable,prob);
-    PProbXVsVar->Fill(variable,prob);
+  if (ProbXVsVar) {
+    ProbXVsVar->Fill(variable, prob);
+    PProbXVsVar->Fill(variable, prob);
   }
-  if(SigmaXHitVsVar){
-    SigmaXHitVsVar->Fill(variable,errHit*10000.);
-    PSigmaXHitVsVar->Fill(variable,errHit*10000.);
+  if (SigmaXHitVsVar) {
+    SigmaXHitVsVar->Fill(variable, errHit * 10000.);
+    PSigmaXHitVsVar->Fill(variable, errHit * 10000.);
   }
-  if(SigmaXTrkVsVar){
-    SigmaXTrkVsVar->Fill(variable,errTrk*10000.);
-    PSigmaXTrkVsVar->Fill(variable,errTrk*10000.);
+  if (SigmaXTrkVsVar) {
+    SigmaXTrkVsVar->Fill(variable, errTrk * 10000.);
+    PSigmaXTrkVsVar->Fill(variable, errTrk * 10000.);
   }
-  if(SigmaXVsVar){
-    SigmaXVsVar->Fill(variable,err*10000.);
-    PSigmaXVsVar->Fill(variable,err*10000.);
+  if (SigmaXVsVar) {
+    SigmaXVsVar->Fill(variable, err * 10000.);
+    PSigmaXVsVar->Fill(variable, err * 10000.);
   }
-  
 }
 
-
-
-
-
 #endif
diff --git a/Alignment/APEEstimation/plugins/ApeEstimator.cc b/Alignment/APEEstimation/plugins/ApeEstimator.cc
index 732b1063922e0..a11e67355186f 100644
--- a/Alignment/APEEstimation/plugins/ApeEstimator.cc
+++ b/Alignment/APEEstimation/plugins/ApeEstimator.cc
@@ -2,7 +2,7 @@
 //
 // Package:    ApeEstimator
 // Class:      ApeEstimator
-// 
+//
 /**\class ApeEstimator ApeEstimator.cc Alignment/APEEstimation/src/ApeEstimator.cc
 
  Description: <one line class summary>
@@ -18,7 +18,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <sstream>
@@ -92,7 +91,6 @@
 #include "Alignment/APEEstimation/interface/EventVariables.h"
 #include "Alignment/APEEstimation/interface/ReducedTrackerTreeVariables.h"
 
-
 #include "TH1.h"
 #include "TH2.h"
 #include "TProfile.h"
@@ -102,7 +100,6 @@
 #include "TString.h"
 #include "TMath.h"
 
-
 #include "RecoLocalTracker/SiStripRecHitConverter/interface/StripCPE.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 
@@ -127,89 +124,86 @@
 //
 
 class ApeEstimator : public edm::one::EDAnalyzer<> {
-   public:
-      explicit ApeEstimator(const edm::ParameterSet&);
-      ~ApeEstimator() override;
-
-
-   private:
-      struct PositionAndError2{
-        PositionAndError2(): posX(-999.F), posY(-999.F), errX2(-999.F), errY2(-999.F) {};
-        PositionAndError2(float x, float y, float eX, float eY): posX(x), posY(y), errX2(eX), errY2(eY) {};
-        float posX;
-        float posY;
-        float errX2;
-        float errY2;
-      };
-      typedef std::pair<TrackStruct::HitState,PositionAndError2> StatePositionAndError2;
-      
-      void beginJob() override ;
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      void endJob() override;
-      
-      bool isHit2D(const TrackingRecHit&)const;
-      
-      void sectorBuilder();
-      bool checkIntervalsForSectors(const unsigned int sectorCounter, const std::vector<double>&)const;
-      bool checkModuleIds(const unsigned int, const std::vector<unsigned int>&)const;
-      bool checkModuleBools(const bool, const std::vector<unsigned int>&)const;
-      bool checkModuleDirections(const int, const std::vector<int>&)const;
-      bool checkModulePositions(const float, const std::vector<double>&)const;
-      void statistics(const TrackerSectorStruct&, const int)const;
-      
-      void residualErrorBinning();
-      
-      void bookSectorHistsForAnalyzerMode();
-      void bookSectorHistsForApeCalculation();
-      void bookTrackHists();
-      
-      TrackStruct::TrackParameterStruct fillTrackVariables(const reco::Track&, const Trajectory&, const reco::BeamSpot&);
-      TrackStruct::HitParameterStruct fillHitVariables(const TrajectoryMeasurement&, const edm::EventSetup&);
-
-      StatePositionAndError2 positionAndError2(const LocalPoint&, const LocalError&, const TransientTrackingRecHit&);
-      PositionAndError2 rectangularPositionAndError2(const LocalPoint&, const LocalError&);
-      PositionAndError2 radialPositionAndError2(const LocalPoint&, const LocalError&, const RadialStripTopology&);
-      
-      void hitSelection();
-      void setHitSelectionMap(const std::string&);
-      void setHitSelectionMapUInt(const std::string&);
-      bool hitSelected(TrackStruct::HitParameterStruct&)const;
-      bool inDoubleInterval(const std::vector<double>&, const float)const;
-      bool inUintInterval(const std::vector<unsigned int>&, const unsigned int, const unsigned int =999)const;
-      
-      void fillHistsForAnalyzerMode(const TrackStruct&);
-      void fillHitHistsXForAnalyzerMode(const TrackStruct::HitParameterStruct&, TrackerSectorStruct&);
-      void fillHitHistsYForAnalyzerMode(const TrackStruct::HitParameterStruct&, TrackerSectorStruct&);
-      void fillHistsForApeCalculation(const TrackStruct&);
-      
-      void calculateAPE();
-      
-      // ----------member data ---------------------------
-      const edm::ParameterSet parameterSet_;
-      std::map<unsigned int, TrackerSectorStruct> m_tkSector_;
-      TrackerDetectorStruct tkDetector_;
-      
-      edm::EDGetTokenT<TrajTrackAssociationCollection> tjTagToken_;
-      edm::EDGetTokenT<reco::BeamSpot> offlinebeamSpot_;
-      
-      
-      std::map<unsigned int, std::pair<double,double> > m_resErrBins_;
-      std::map<unsigned int, ReducedTrackerTreeVariables> m_tkTreeVar_;
-      
-      std::map<std::string,std::vector<double> > m_hitSelection_;
-      std::map<std::string,std::vector<unsigned int> > m_hitSelectionUInt_;
-      
-      bool trackCut_;
-      
-      const unsigned int maxTracksPerEvent_;
-      const unsigned int minGoodHitsPerTrack_;
-      
-      const bool analyzerMode_;
-      
-      const bool calculateApe_;
-      
-      unsigned int counter1, counter2, counter3, counter4, counter5, counter6;
- 
+public:
+  explicit ApeEstimator(const edm::ParameterSet&);
+  ~ApeEstimator() override;
+
+private:
+  struct PositionAndError2 {
+    PositionAndError2() : posX(-999.F), posY(-999.F), errX2(-999.F), errY2(-999.F){};
+    PositionAndError2(float x, float y, float eX, float eY) : posX(x), posY(y), errX2(eX), errY2(eY){};
+    float posX;
+    float posY;
+    float errX2;
+    float errY2;
+  };
+  typedef std::pair<TrackStruct::HitState, PositionAndError2> StatePositionAndError2;
+
+  void beginJob() override;
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void endJob() override;
+
+  bool isHit2D(const TrackingRecHit&) const;
+
+  void sectorBuilder();
+  bool checkIntervalsForSectors(const unsigned int sectorCounter, const std::vector<double>&) const;
+  bool checkModuleIds(const unsigned int, const std::vector<unsigned int>&) const;
+  bool checkModuleBools(const bool, const std::vector<unsigned int>&) const;
+  bool checkModuleDirections(const int, const std::vector<int>&) const;
+  bool checkModulePositions(const float, const std::vector<double>&) const;
+  void statistics(const TrackerSectorStruct&, const int) const;
+
+  void residualErrorBinning();
+
+  void bookSectorHistsForAnalyzerMode();
+  void bookSectorHistsForApeCalculation();
+  void bookTrackHists();
+
+  TrackStruct::TrackParameterStruct fillTrackVariables(const reco::Track&, const Trajectory&, const reco::BeamSpot&);
+  TrackStruct::HitParameterStruct fillHitVariables(const TrajectoryMeasurement&, const edm::EventSetup&);
+
+  StatePositionAndError2 positionAndError2(const LocalPoint&, const LocalError&, const TransientTrackingRecHit&);
+  PositionAndError2 rectangularPositionAndError2(const LocalPoint&, const LocalError&);
+  PositionAndError2 radialPositionAndError2(const LocalPoint&, const LocalError&, const RadialStripTopology&);
+
+  void hitSelection();
+  void setHitSelectionMap(const std::string&);
+  void setHitSelectionMapUInt(const std::string&);
+  bool hitSelected(TrackStruct::HitParameterStruct&) const;
+  bool inDoubleInterval(const std::vector<double>&, const float) const;
+  bool inUintInterval(const std::vector<unsigned int>&, const unsigned int, const unsigned int = 999) const;
+
+  void fillHistsForAnalyzerMode(const TrackStruct&);
+  void fillHitHistsXForAnalyzerMode(const TrackStruct::HitParameterStruct&, TrackerSectorStruct&);
+  void fillHitHistsYForAnalyzerMode(const TrackStruct::HitParameterStruct&, TrackerSectorStruct&);
+  void fillHistsForApeCalculation(const TrackStruct&);
+
+  void calculateAPE();
+
+  // ----------member data ---------------------------
+  const edm::ParameterSet parameterSet_;
+  std::map<unsigned int, TrackerSectorStruct> m_tkSector_;
+  TrackerDetectorStruct tkDetector_;
+
+  edm::EDGetTokenT<TrajTrackAssociationCollection> tjTagToken_;
+  edm::EDGetTokenT<reco::BeamSpot> offlinebeamSpot_;
+
+  std::map<unsigned int, std::pair<double, double> > m_resErrBins_;
+  std::map<unsigned int, ReducedTrackerTreeVariables> m_tkTreeVar_;
+
+  std::map<std::string, std::vector<double> > m_hitSelection_;
+  std::map<std::string, std::vector<unsigned int> > m_hitSelectionUInt_;
+
+  bool trackCut_;
+
+  const unsigned int maxTracksPerEvent_;
+  const unsigned int minGoodHitsPerTrack_;
+
+  const bool analyzerMode_;
+
+  const bool calculateApe_;
+
+  unsigned int counter1, counter2, counter3, counter4, counter5, counter6;
 };
 
 //
@@ -223,23 +217,20 @@ class ApeEstimator : public edm::one::EDAnalyzer<> {
 //
 // constructors and destructor
 //
-ApeEstimator::ApeEstimator(const edm::ParameterSet& iConfig):
-  parameterSet_(iConfig),
-  tjTagToken_(consumes<TrajTrackAssociationCollection>(parameterSet_.getParameter<edm::InputTag>("tjTkAssociationMapTag"))),
-  offlinebeamSpot_(consumes<reco::BeamSpot>(edm::InputTag("offlineBeamSpot"))),
-  trackCut_(false), maxTracksPerEvent_(parameterSet_.getParameter<unsigned int>("maxTracksPerEvent")),
-  minGoodHitsPerTrack_(parameterSet_.getParameter<unsigned int>("minGoodHitsPerTrack")),
-  analyzerMode_(parameterSet_.getParameter<bool>("analyzerMode")),
-  calculateApe_(parameterSet_.getParameter<bool>("calculateApe"))
-{
-   counter1 = counter2 = counter3 = counter4 = counter5 = counter6 = 0;
-}
-
-
-ApeEstimator::~ApeEstimator()
-{
+ApeEstimator::ApeEstimator(const edm::ParameterSet& iConfig)
+    : parameterSet_(iConfig),
+      tjTagToken_(
+          consumes<TrajTrackAssociationCollection>(parameterSet_.getParameter<edm::InputTag>("tjTkAssociationMapTag"))),
+      offlinebeamSpot_(consumes<reco::BeamSpot>(edm::InputTag("offlineBeamSpot"))),
+      trackCut_(false),
+      maxTracksPerEvent_(parameterSet_.getParameter<unsigned int>("maxTracksPerEvent")),
+      minGoodHitsPerTrack_(parameterSet_.getParameter<unsigned int>("minGoodHitsPerTrack")),
+      analyzerMode_(parameterSet_.getParameter<bool>("analyzerMode")),
+      calculateApe_(parameterSet_.getParameter<bool>("calculateApe")) {
+  counter1 = counter2 = counter3 = counter4 = counter5 = counter6 = 0;
 }
 
+ApeEstimator::~ApeEstimator() {}
 
 //
 // member functions
@@ -247,30 +238,28 @@ ApeEstimator::~ApeEstimator()
 
 // -----------------------------------------------------------------------------------------------------------
 
-void
-ApeEstimator::sectorBuilder(){
-  
+void ApeEstimator::sectorBuilder() {
   TFile* tkTreeFile(TFile::Open((parameterSet_.getParameter<std::string>("TrackerTreeFile")).c_str()));
-  if(tkTreeFile){
-      edm::LogInfo("SectorBuilder")<<"TrackerTreeFile OK";
-  }else{
-      edm::LogError("SectorBuilder")<<"TrackerTreeFile not found";
-      return;
+  if (tkTreeFile) {
+    edm::LogInfo("SectorBuilder") << "TrackerTreeFile OK";
+  } else {
+    edm::LogError("SectorBuilder") << "TrackerTreeFile not found";
+    return;
   }
   TTree* tkTree(nullptr);
-  tkTreeFile->GetObject("TrackerTreeGenerator/TrackerTree/TrackerTree",tkTree);
-  if(tkTree){
-      edm::LogInfo("SectorBuilder")<<"TrackerTree OK";
-  }else{
-      edm::LogError("SectorBuilder")<<"TrackerTree not found in file";
-      return;
+  tkTreeFile->GetObject("TrackerTreeGenerator/TrackerTree/TrackerTree", tkTree);
+  if (tkTree) {
+    edm::LogInfo("SectorBuilder") << "TrackerTree OK";
+  } else {
+    edm::LogError("SectorBuilder") << "TrackerTree not found in file";
+    return;
   }
-  unsigned int rawId(999), subdetId(999), layer(999), side(999), half(999), rod(999), ring(999), petal(999),
-         blade(999), panel(999), outerInner(999), module(999), nStrips(999);
+  unsigned int rawId(999), subdetId(999), layer(999), side(999), half(999), rod(999), ring(999), petal(999), blade(999),
+      panel(999), outerInner(999), module(999), nStrips(999);
   bool isDoubleSide(false), isRPhi(false), isStereo(false);
   int uDirection(999), vDirection(999), wDirection(999);
-  float posR(999.F), posPhi(999.F), posEta(999.F), posX(999.F), posY(999.F), posZ(999.F); 
-  
+  float posR(999.F), posPhi(999.F), posEta(999.F), posX(999.F), posY(999.F), posZ(999.F);
+
   tkTree->SetBranchAddress("RawId", &rawId);
   tkTree->SetBranchAddress("SubdetId", &subdetId);
   tkTree->SetBranchAddress("Layer", &layer);
@@ -296,265 +285,296 @@ ApeEstimator::sectorBuilder(){
   tkTree->SetBranchAddress("PosX", &posX);
   tkTree->SetBranchAddress("PosY", &posY);
   tkTree->SetBranchAddress("PosZ", &posZ);
-  
+
   int nModules(tkTree->GetEntries());
   TrackerSectorStruct allSectors;
-  
+
   //Loop over all Sectors
   unsigned int sectorCounter(0);
   std::vector<edm::ParameterSet> v_sectorDef(parameterSet_.getParameter<std::vector<edm::ParameterSet> >("Sectors"));
-  edm::LogInfo("SectorBuilder")<<"There are "<<v_sectorDef.size()<<" Sectors definded";
-  for(auto const & parSet : v_sectorDef){
-      ++sectorCounter;
-      const std::string& sectorName(parSet.getParameter<std::string>("name"));
-      std::vector<unsigned int> v_rawId(parSet.getParameter<std::vector<unsigned int> >("rawId")),
-                                v_subdetId(parSet.getParameter<std::vector<unsigned int> >("subdetId")),
-                                v_layer(parSet.getParameter<std::vector<unsigned int> >("layer")),
-                                v_side(parSet.getParameter<std::vector<unsigned int> >("side")),
-                                v_half(parSet.getParameter<std::vector<unsigned int> >("half")),
-                                v_rod(parSet.getParameter<std::vector<unsigned int> >("rod")),
-                                v_ring(parSet.getParameter<std::vector<unsigned int> >("ring")),
-                                v_petal(parSet.getParameter<std::vector<unsigned int> >("petal")),
-                                v_blade(parSet.getParameter<std::vector<unsigned int> >("blade")),
-                                v_panel(parSet.getParameter<std::vector<unsigned int> >("panel")),
-                                v_outerInner(parSet.getParameter<std::vector<unsigned int> >("outerInner")),
-                                v_module(parSet.getParameter<std::vector<unsigned int> >("module")),
-                                v_nStrips(parSet.getParameter<std::vector<unsigned int> >("nStrips")),
-                                v_isDoubleSide(parSet.getParameter<std::vector<unsigned int> >("isDoubleSide")),
-                                v_isRPhi(parSet.getParameter<std::vector<unsigned int> >("isRPhi")),
-                                v_isStereo(parSet.getParameter<std::vector<unsigned int> >("isStereo"));
-      std::vector<int>  v_uDirection(parSet.getParameter<std::vector<int> >("uDirection")),
-                        v_vDirection(parSet.getParameter<std::vector<int> >("vDirection")),
-                        v_wDirection(parSet.getParameter<std::vector<int> >("wDirection"));
-      std::vector<double> v_posR(parSet.getParameter<std::vector<double> >("posR")),
-                          v_posPhi(parSet.getParameter<std::vector<double> >("posPhi")),
-                          v_posEta(parSet.getParameter<std::vector<double> >("posEta")),
-                          v_posX(parSet.getParameter<std::vector<double> >("posX")),
-                          v_posY(parSet.getParameter<std::vector<double> >("posY")),
-                          v_posZ(parSet.getParameter<std::vector<double> >("posZ"));
-    
-      if(!this->checkIntervalsForSectors(sectorCounter,v_posR) || !this->checkIntervalsForSectors(sectorCounter,v_posPhi) ||
-        !this->checkIntervalsForSectors(sectorCounter,v_posEta) || !this->checkIntervalsForSectors(sectorCounter,v_posX) ||
-        !this->checkIntervalsForSectors(sectorCounter,v_posY)   || !this->checkIntervalsForSectors(sectorCounter,v_posZ))continue;
-    
-    
-      TrackerSectorStruct tkSector;
-      tkSector.name = sectorName;
-      
-      ReducedTrackerTreeVariables tkTreeVar;
-    
-      //Loop over all Modules
-      for(int module = 0; module < nModules; ++module){
-          tkTree->GetEntry(module);
-          
-          if(sectorCounter==1){
-            tkTreeVar.subdetId = subdetId;
-            tkTreeVar.nStrips = nStrips;
-            tkTreeVar.uDirection = uDirection;
-            tkTreeVar.vDirection = vDirection;
-            tkTreeVar.wDirection = wDirection;
-            m_tkTreeVar_[rawId] = tkTreeVar;
-          }
-      
-          if(!this->checkModuleIds(rawId,v_rawId))continue;
-          if(!this->checkModuleIds(subdetId,v_subdetId))continue;
-          if(!this->checkModuleIds(layer,v_layer))continue;
-          if(!this->checkModuleIds(side,v_side))continue;
-          if(!this->checkModuleIds(half,v_half))continue;
-          if(!this->checkModuleIds(rod,v_rod))continue;
-          if(!this->checkModuleIds(ring,v_ring))continue;
-          if(!this->checkModuleIds(petal,v_petal))continue;
-          if(!this->checkModuleIds(blade,v_blade))continue;
-          if(!this->checkModuleIds(panel,v_panel))continue;
-          if(!this->checkModuleIds(outerInner,v_outerInner))continue;
-          if(!this->checkModuleIds(module,v_module))continue;
-          if(!this->checkModuleIds(nStrips,v_nStrips))continue;
-          if(!this->checkModuleBools(isDoubleSide,v_isDoubleSide))continue;
-          if(!this->checkModuleBools(isRPhi,v_isRPhi))continue;
-          if(!this->checkModuleBools(isStereo,v_isStereo))continue;
-          if(!this->checkModuleDirections(uDirection,v_uDirection))continue;
-          if(!this->checkModuleDirections(vDirection,v_vDirection))continue;
-          if(!this->checkModuleDirections(wDirection,v_wDirection))continue;
-          if(!this->checkModulePositions(posR,v_posR))continue;
-          if(!this->checkModulePositions(posPhi,v_posPhi))continue;
-          if(!this->checkModulePositions(posEta,v_posEta))continue;
-          if(!this->checkModulePositions(posX,v_posX))continue;
-          if(!this->checkModulePositions(posY,v_posY))continue;
-          if(!this->checkModulePositions(posZ,v_posZ))continue;
-          
-          tkSector.v_rawId.push_back(rawId);
-          bool moduleSelected(false);
-          for(auto const & i_rawId : allSectors.v_rawId){
-            if(rawId == i_rawId)moduleSelected = true;
-          }
-          if(!moduleSelected)allSectors.v_rawId.push_back(rawId);
-      }
-    
-      bool isPixel(false);
-      bool isStrip(false);
-      for(auto const & i_rawId : tkSector.v_rawId){
-        switch (m_tkTreeVar_[i_rawId].subdetId) {
-          case PixelSubdetector::PixelBarrel:
-          case PixelSubdetector::PixelEndcap:
-            isPixel = true;
-            break;
-          case StripSubdetector::TIB:
-          case StripSubdetector::TOB:
-          case StripSubdetector::TID:
-          case StripSubdetector::TEC:
-            isStrip = true;
-            break;
-        }
+  edm::LogInfo("SectorBuilder") << "There are " << v_sectorDef.size() << " Sectors definded";
+  for (auto const& parSet : v_sectorDef) {
+    ++sectorCounter;
+    const std::string& sectorName(parSet.getParameter<std::string>("name"));
+    std::vector<unsigned int> v_rawId(parSet.getParameter<std::vector<unsigned int> >("rawId")),
+        v_subdetId(parSet.getParameter<std::vector<unsigned int> >("subdetId")),
+        v_layer(parSet.getParameter<std::vector<unsigned int> >("layer")),
+        v_side(parSet.getParameter<std::vector<unsigned int> >("side")),
+        v_half(parSet.getParameter<std::vector<unsigned int> >("half")),
+        v_rod(parSet.getParameter<std::vector<unsigned int> >("rod")),
+        v_ring(parSet.getParameter<std::vector<unsigned int> >("ring")),
+        v_petal(parSet.getParameter<std::vector<unsigned int> >("petal")),
+        v_blade(parSet.getParameter<std::vector<unsigned int> >("blade")),
+        v_panel(parSet.getParameter<std::vector<unsigned int> >("panel")),
+        v_outerInner(parSet.getParameter<std::vector<unsigned int> >("outerInner")),
+        v_module(parSet.getParameter<std::vector<unsigned int> >("module")),
+        v_nStrips(parSet.getParameter<std::vector<unsigned int> >("nStrips")),
+        v_isDoubleSide(parSet.getParameter<std::vector<unsigned int> >("isDoubleSide")),
+        v_isRPhi(parSet.getParameter<std::vector<unsigned int> >("isRPhi")),
+        v_isStereo(parSet.getParameter<std::vector<unsigned int> >("isStereo"));
+    std::vector<int> v_uDirection(parSet.getParameter<std::vector<int> >("uDirection")),
+        v_vDirection(parSet.getParameter<std::vector<int> >("vDirection")),
+        v_wDirection(parSet.getParameter<std::vector<int> >("wDirection"));
+    std::vector<double> v_posR(parSet.getParameter<std::vector<double> >("posR")),
+        v_posPhi(parSet.getParameter<std::vector<double> >("posPhi")),
+        v_posEta(parSet.getParameter<std::vector<double> >("posEta")),
+        v_posX(parSet.getParameter<std::vector<double> >("posX")),
+        v_posY(parSet.getParameter<std::vector<double> >("posY")),
+        v_posZ(parSet.getParameter<std::vector<double> >("posZ"));
+
+    if (!this->checkIntervalsForSectors(sectorCounter, v_posR) ||
+        !this->checkIntervalsForSectors(sectorCounter, v_posPhi) ||
+        !this->checkIntervalsForSectors(sectorCounter, v_posEta) ||
+        !this->checkIntervalsForSectors(sectorCounter, v_posX) ||
+        !this->checkIntervalsForSectors(sectorCounter, v_posY) ||
+        !this->checkIntervalsForSectors(sectorCounter, v_posZ))
+      continue;
+
+    TrackerSectorStruct tkSector;
+    tkSector.name = sectorName;
+
+    ReducedTrackerTreeVariables tkTreeVar;
+
+    //Loop over all Modules
+    for (int module = 0; module < nModules; ++module) {
+      tkTree->GetEntry(module);
+
+      if (sectorCounter == 1) {
+        tkTreeVar.subdetId = subdetId;
+        tkTreeVar.nStrips = nStrips;
+        tkTreeVar.uDirection = uDirection;
+        tkTreeVar.vDirection = vDirection;
+        tkTreeVar.wDirection = wDirection;
+        m_tkTreeVar_[rawId] = tkTreeVar;
       }
 
-      if(isPixel && isStrip){
-        edm::LogError("SectorBuilder")<<"Incorrect Sector Definition: there are pixel and strip modules within one sector"
-                                     <<"\n... sector selection is not applied, sector "<<sectorCounter<<" is not built";
+      if (!this->checkModuleIds(rawId, v_rawId))
+        continue;
+      if (!this->checkModuleIds(subdetId, v_subdetId))
+        continue;
+      if (!this->checkModuleIds(layer, v_layer))
         continue;
+      if (!this->checkModuleIds(side, v_side))
+        continue;
+      if (!this->checkModuleIds(half, v_half))
+        continue;
+      if (!this->checkModuleIds(rod, v_rod))
+        continue;
+      if (!this->checkModuleIds(ring, v_ring))
+        continue;
+      if (!this->checkModuleIds(petal, v_petal))
+        continue;
+      if (!this->checkModuleIds(blade, v_blade))
+        continue;
+      if (!this->checkModuleIds(panel, v_panel))
+        continue;
+      if (!this->checkModuleIds(outerInner, v_outerInner))
+        continue;
+      if (!this->checkModuleIds(module, v_module))
+        continue;
+      if (!this->checkModuleIds(nStrips, v_nStrips))
+        continue;
+      if (!this->checkModuleBools(isDoubleSide, v_isDoubleSide))
+        continue;
+      if (!this->checkModuleBools(isRPhi, v_isRPhi))
+        continue;
+      if (!this->checkModuleBools(isStereo, v_isStereo))
+        continue;
+      if (!this->checkModuleDirections(uDirection, v_uDirection))
+        continue;
+      if (!this->checkModuleDirections(vDirection, v_vDirection))
+        continue;
+      if (!this->checkModuleDirections(wDirection, v_wDirection))
+        continue;
+      if (!this->checkModulePositions(posR, v_posR))
+        continue;
+      if (!this->checkModulePositions(posPhi, v_posPhi))
+        continue;
+      if (!this->checkModulePositions(posEta, v_posEta))
+        continue;
+      if (!this->checkModulePositions(posX, v_posX))
+        continue;
+      if (!this->checkModulePositions(posY, v_posY))
+        continue;
+      if (!this->checkModulePositions(posZ, v_posZ))
+        continue;
+
+      tkSector.v_rawId.push_back(rawId);
+      bool moduleSelected(false);
+      for (auto const& i_rawId : allSectors.v_rawId) {
+        if (rawId == i_rawId)
+          moduleSelected = true;
       }
-      tkSector.isPixel = isPixel;
-    
-      m_tkSector_[sectorCounter] = tkSector;
-      edm::LogInfo("SectorBuilder")<<"There are "<<tkSector.v_rawId.size()<<" Modules in Sector "<<sectorCounter;
+      if (!moduleSelected)
+        allSectors.v_rawId.push_back(rawId);
+    }
+
+    bool isPixel(false);
+    bool isStrip(false);
+    for (auto const& i_rawId : tkSector.v_rawId) {
+      switch (m_tkTreeVar_[i_rawId].subdetId) {
+        case PixelSubdetector::PixelBarrel:
+        case PixelSubdetector::PixelEndcap:
+          isPixel = true;
+          break;
+        case StripSubdetector::TIB:
+        case StripSubdetector::TOB:
+        case StripSubdetector::TID:
+        case StripSubdetector::TEC:
+          isStrip = true;
+          break;
+      }
+    }
+
+    if (isPixel && isStrip) {
+      edm::LogError("SectorBuilder")
+          << "Incorrect Sector Definition: there are pixel and strip modules within one sector"
+          << "\n... sector selection is not applied, sector " << sectorCounter << " is not built";
+      continue;
+    }
+    tkSector.isPixel = isPixel;
+
+    m_tkSector_[sectorCounter] = tkSector;
+    edm::LogInfo("SectorBuilder") << "There are " << tkSector.v_rawId.size() << " Modules in Sector " << sectorCounter;
   }
   this->statistics(allSectors, nModules);
   return;
 }
 
-
-
 // -----------------------------------------------------------------------------------------------------------
 
-
-bool
-ApeEstimator::checkIntervalsForSectors(const unsigned int sectorCounter, const std::vector<double>& v_id)const
-{
-    
-  if(v_id.empty())return true;
-  if(v_id.size()%2==1){
-    edm::LogError("SectorBuilder")<<"Incorrect Sector Definition: Position Vectors need even number of arguments (Intervals)"
-                                     <<"\n... sector selection is not applied, sector "<<sectorCounter<<" is not built";
+bool ApeEstimator::checkIntervalsForSectors(const unsigned int sectorCounter, const std::vector<double>& v_id) const {
+  if (v_id.empty())
+    return true;
+  if (v_id.size() % 2 == 1) {
+    edm::LogError("SectorBuilder")
+        << "Incorrect Sector Definition: Position Vectors need even number of arguments (Intervals)"
+        << "\n... sector selection is not applied, sector " << sectorCounter << " is not built";
     return false;
   }
-  int entry(0); double intervalBegin(999.);
-  for(auto const & i_id : v_id){
+  int entry(0);
+  double intervalBegin(999.);
+  for (auto const& i_id : v_id) {
     ++entry;
-    if(entry%2==1) intervalBegin = i_id;
-    if(entry%2==0 && intervalBegin > i_id){
-      edm::LogError("SectorBuilder")<<"Incorrect Sector Definition (Position Vector Intervals): \t"
-                                    <<intervalBegin<<" is bigger than "<<i_id<<" but is expected to be smaller"
-                                    <<"\n... sector selection is not applied, sector "<<sectorCounter<<" is not built";
+    if (entry % 2 == 1)
+      intervalBegin = i_id;
+    if (entry % 2 == 0 && intervalBegin > i_id) {
+      edm::LogError("SectorBuilder") << "Incorrect Sector Definition (Position Vector Intervals): \t" << intervalBegin
+                                     << " is bigger than " << i_id << " but is expected to be smaller"
+                                     << "\n... sector selection is not applied, sector " << sectorCounter
+                                     << " is not built";
       return false;
     }
   }
   return true;
 }
 
-bool
-ApeEstimator::checkModuleIds(const unsigned int id, const std::vector<unsigned int>& v_id)const
-{
-    
-  if(v_id.empty())return true;
-  for(auto const & i_id : v_id){
-    if(id==i_id)return true;
+bool ApeEstimator::checkModuleIds(const unsigned int id, const std::vector<unsigned int>& v_id) const {
+  if (v_id.empty())
+    return true;
+  for (auto const& i_id : v_id) {
+    if (id == i_id)
+      return true;
   }
   return false;
 }
 
-bool
-ApeEstimator::checkModuleBools(const bool id, const std::vector<unsigned int>& v_id)const
-{
-    
-  if(v_id.empty())return true;
-  for(auto const & i_id : v_id){
-    if(1==i_id && id)return true;
-    if(2==i_id && !id)return true;
+bool ApeEstimator::checkModuleBools(const bool id, const std::vector<unsigned int>& v_id) const {
+  if (v_id.empty())
+    return true;
+  for (auto const& i_id : v_id) {
+    if (1 == i_id && id)
+      return true;
+    if (2 == i_id && !id)
+      return true;
   }
   return false;
 }
 
-bool
-ApeEstimator::checkModuleDirections(const int id, const std::vector<int>& v_id)const
-{
-    
-  if(v_id.empty())return true;
-  for(auto const & i_id : v_id){
-    if(id==i_id)return true;
+bool ApeEstimator::checkModuleDirections(const int id, const std::vector<int>& v_id) const {
+  if (v_id.empty())
+    return true;
+  for (auto const& i_id : v_id) {
+    if (id == i_id)
+      return true;
   }
   return false;
 }
 
-bool
-ApeEstimator::checkModulePositions(const float id, const std::vector<double>& v_id)const
-{
-    
-  if(v_id.empty())return true;
-  int entry(0); double intervalBegin(999.);
-  for(auto const & i_id : v_id){
+bool ApeEstimator::checkModulePositions(const float id, const std::vector<double>& v_id) const {
+  if (v_id.empty())
+    return true;
+  int entry(0);
+  double intervalBegin(999.);
+  for (auto const& i_id : v_id) {
     ++entry;
-    if(entry%2==1)intervalBegin = i_id;
-    if(entry%2==0 && id>=intervalBegin && id<i_id)return true;
+    if (entry % 2 == 1)
+      intervalBegin = i_id;
+    if (entry % 2 == 0 && id >= intervalBegin && id < i_id)
+      return true;
   }
   return false;
 }
 
-void
-ApeEstimator::statistics(const TrackerSectorStruct& allSectors, const int nModules)const{
+void ApeEstimator::statistics(const TrackerSectorStruct& allSectors, const int nModules) const {
   bool commonModules(false);
-  for(std::map<unsigned int,TrackerSectorStruct>::const_iterator i_sector = m_tkSector_.begin(); i_sector != m_tkSector_.end(); ++i_sector){
-    std::map<unsigned int,TrackerSectorStruct>::const_iterator i_sector2(i_sector);
-    for(++i_sector2; i_sector2 != m_tkSector_.end(); ++i_sector2){
+  for (std::map<unsigned int, TrackerSectorStruct>::const_iterator i_sector = m_tkSector_.begin();
+       i_sector != m_tkSector_.end();
+       ++i_sector) {
+    std::map<unsigned int, TrackerSectorStruct>::const_iterator i_sector2(i_sector);
+    for (++i_sector2; i_sector2 != m_tkSector_.end(); ++i_sector2) {
       unsigned int nCommonModules(0);
-      for(auto const & i_module : (*i_sector).second.v_rawId){
-        for(auto const & i_module2 : (*i_sector2).second.v_rawId){
-          if(i_module2 == i_module) ++nCommonModules;
+      for (auto const& i_module : (*i_sector).second.v_rawId) {
+        for (auto const& i_module2 : (*i_sector2).second.v_rawId) {
+          if (i_module2 == i_module)
+            ++nCommonModules;
         }
       }
-      if(nCommonModules==0)
-        ;//edm::LogInfo("SectorBuilder")<<"Sector "<<(*i_sector).first<<" and Sector "<<(*i_sector2).first<< " have ZERO Modules in common";
-      else{
-        edm::LogError("SectorBuilder")<<"Sector "<<(*i_sector).first<<" and Sector "<<(*i_sector2).first<< " have "<<nCommonModules<<" Modules in common";
+      if (nCommonModules == 0)
+        ;  //edm::LogInfo("SectorBuilder")<<"Sector "<<(*i_sector).first<<" and Sector "<<(*i_sector2).first<< " have ZERO Modules in common";
+      else {
+        edm::LogError("SectorBuilder") << "Sector " << (*i_sector).first << " and Sector " << (*i_sector2).first
+                                       << " have " << nCommonModules << " Modules in common";
         commonModules = true;
       }
     }
   }
-  if(static_cast<int>(allSectors.v_rawId.size())==nModules)
-    edm::LogInfo("SectorBuilder")<<"ALL Tracker Modules are contained in the Sectors";
+  if (static_cast<int>(allSectors.v_rawId.size()) == nModules)
+    edm::LogInfo("SectorBuilder") << "ALL Tracker Modules are contained in the Sectors";
   else
-    edm::LogWarning("SectorBuilder")<<"There are "<<allSectors.v_rawId.size()<<" Modules in all Sectors"
-                               <<" out of "<<nModules<<" Tracker Modules";
-  if(!commonModules)
-    edm::LogInfo("SectorBuilder")<<"There are ZERO modules associated to different sectors, no ambiguities exist";
+    edm::LogWarning("SectorBuilder") << "There are " << allSectors.v_rawId.size() << " Modules in all Sectors"
+                                     << " out of " << nModules << " Tracker Modules";
+  if (!commonModules)
+    edm::LogInfo("SectorBuilder") << "There are ZERO modules associated to different sectors, no ambiguities exist";
   else
-  edm::LogError("SectorBuilder")<<"There are modules associated to different sectors, APE value cannot be assigned reasonably";
+    edm::LogError("SectorBuilder")
+        << "There are modules associated to different sectors, APE value cannot be assigned reasonably";
 }
 
-
 // -----------------------------------------------------------------------------------------------------------
 
-
-void
-ApeEstimator::residualErrorBinning(){
+void ApeEstimator::residualErrorBinning() {
   std::vector<double> v_residualErrorBinning(parameterSet_.getParameter<std::vector<double> >("residualErrorBinning"));
-  if(v_residualErrorBinning.size()==1){
-    edm::LogError("ResidualErrorBinning")<<"Incorrect selection of Residual Error Bins (used for APE calculation): \t"
-                                        <<"Only one argument passed, so no interval is specified"
-          <<"\n... delete whole bin selection";    //m_resErrBins_ remains empty
+  if (v_residualErrorBinning.size() == 1) {
+    edm::LogError("ResidualErrorBinning") << "Incorrect selection of Residual Error Bins (used for APE calculation): \t"
+                                          << "Only one argument passed, so no interval is specified"
+                                          << "\n... delete whole bin selection";  //m_resErrBins_ remains empty
     return;
   }
   double xMin(0.), xMax(0.);
   unsigned int binCounter(-1);
-  for(auto const & i_binning : v_residualErrorBinning){
+  for (auto const& i_binning : v_residualErrorBinning) {
     ++binCounter;
-    if(binCounter == 0){
-        xMin = i_binning;
-        continue;
+    if (binCounter == 0) {
+      xMin = i_binning;
+      continue;
     }
     xMax = i_binning;
-    if(xMax<=xMin){
-      edm::LogError("ResidualErrorBinning")<<"Incorrect selection of Residual Error Bins (used for APE calculation): \t"
-                                            <<xMin<<" is bigger than "<<xMax<<" but is expected to be smaller"
-              <<"\n... delete whole bin selection";
+    if (xMax <= xMin) {
+      edm::LogError("ResidualErrorBinning")
+          << "Incorrect selection of Residual Error Bins (used for APE calculation): \t" << xMin << " is bigger than "
+          << xMax << " but is expected to be smaller"
+          << "\n... delete whole bin selection";
       m_resErrBins_.clear();
       return;
     }
@@ -562,576 +582,880 @@ ApeEstimator::residualErrorBinning(){
     m_resErrBins_[binCounter].second = xMax;
     xMin = xMax;
   }
-  edm::LogInfo("ResidualErrorBinning")<<m_resErrBins_.size()<<" Intervals of residual errors used for separate APE calculation sucessfully set";
+  edm::LogInfo("ResidualErrorBinning")
+      << m_resErrBins_.size() << " Intervals of residual errors used for separate APE calculation sucessfully set";
 }
 
-
-
 // -----------------------------------------------------------------------------------------------------------
 
-
-
-void
-ApeEstimator::bookSectorHistsForAnalyzerMode(){
+void ApeEstimator::bookSectorHistsForAnalyzerMode() {
   std::vector<unsigned int> v_errHists(parameterSet_.getParameter<std::vector<unsigned int> >("vErrHists"));
-  for(std::vector<unsigned int>::iterator i_errHists = v_errHists.begin(); i_errHists != v_errHists.end(); ++i_errHists){
-    for(std::vector<unsigned int>::iterator i_errHists2 = i_errHists; i_errHists2 != v_errHists.end();){
+  for (std::vector<unsigned int>::iterator i_errHists = v_errHists.begin(); i_errHists != v_errHists.end();
+       ++i_errHists) {
+    for (std::vector<unsigned int>::iterator i_errHists2 = i_errHists; i_errHists2 != v_errHists.end();) {
       ++i_errHists2;
-      if(*i_errHists==*i_errHists2){
-        edm::LogError("BookSectorHists")<<"Value of vErrHists in config exists twice: "<<*i_errHists<<"\n... delete one of both";
+      if (*i_errHists == *i_errHists2) {
+        edm::LogError("BookSectorHists") << "Value of vErrHists in config exists twice: " << *i_errHists
+                                         << "\n... delete one of both";
         v_errHists.erase(i_errHists2);
       }
     }
   }
-  
-  
-  for(auto & i_sector : m_tkSector_){
+
+  for (auto& i_sector : m_tkSector_) {
     bool zoomHists(parameterSet_.getParameter<bool>("zoomHists"));
-    
+
     double widthMax = zoomHists ? 20. : 200.;
     double chargePixelMax = zoomHists ? 200000. : 2000000.;
     double chargeStripMax = zoomHists ? 1000. : 10000.;
     double sOverNMax = zoomHists ? 200. : 2000.;
     double logClusterProbMin = zoomHists ? -5. : -15.;
-    
+
     double resXAbsMax = zoomHists ? 0.5 : 5.;
     double norResXAbsMax = zoomHists ? 10. : 50.;
-    double probXMin = zoomHists ? -0.01 :  -0.1;
-    double probXMax = zoomHists ? 0.11 :  1.1;
+    double probXMin = zoomHists ? -0.01 : -0.1;
+    double probXMax = zoomHists ? 0.11 : 1.1;
     double sigmaXMin = zoomHists ? 0. : -0.05;
     double sigmaXMax = zoomHists ? 0.02 : 1.;
-    double sigmaX2Max = sigmaXMax*sigmaXMax;
+    double sigmaX2Max = sigmaXMax * sigmaXMax;
     double sigmaXHitMax = zoomHists ? 0.02 : 1.;
     double phiSensXMax = zoomHists ? 31. : 93.;
-    
+
     double norChi2Max = zoomHists ? 5. : 1000.;
     double d0Max = zoomHists ? 0.02 : 40.;  // cosmics: 100.|100.
     double dzMax = zoomHists ? 15. : 100.;  // cosmics: 200.|600.
     double pMax = zoomHists ? 200. : 2000.;
-    double invPMax = zoomHists ? 0.05 : 10.;   //begins at 20GeV, 0.1GeV
-    
-    
+    double invPMax = zoomHists ? 0.05 : 10.;  //begins at 20GeV, 0.1GeV
+
     edm::Service<TFileService> fileService;
-    if(!fileService){
-      throw edm::Exception( edm::errors::Configuration,
-                            "TFileService is not registered in cfg file" );
+    if (!fileService) {
+      throw edm::Exception(edm::errors::Configuration, "TFileService is not registered in cfg file");
     }
-    
-    std::stringstream sector; sector << "Sector_" << i_sector.first;
+
+    std::stringstream sector;
+    sector << "Sector_" << i_sector.first;
     TFileDirectory secDir = fileService->mkdir(sector.str());
-    
+
     // Dummy histo containing the sector name as title
-    i_sector.second.Name = secDir.make<TH1F>("z_name",i_sector.second.name.c_str(),1,0,1);
-    
+    i_sector.second.Name = secDir.make<TH1F>("z_name", i_sector.second.name.c_str(), 1, 0, 1);
+
     // Do not book histos for empty sectors
-    if(i_sector.second.v_rawId.empty()){
+    if (i_sector.second.v_rawId.empty()) {
       continue;
     }
     // Set parameters for correlationHists
-    i_sector.second.setCorrHistParams(&secDir,norResXAbsMax,sigmaXHitMax,sigmaXMax);
-    
-    
+    i_sector.second.setCorrHistParams(&secDir, norResXAbsMax, sigmaXHitMax, sigmaXMax);
+
     // Book pixel or strip specific hists
     const bool pixelSector(i_sector.second.isPixel);
-    
-    
+
     // Cluster Parameters
-    i_sector.second.m_correlationHistsX["WidthX"] = i_sector.second.bookCorrHistsX("WidthX","cluster width","w_{cl,x}","[# channels]",static_cast<int>(widthMax),static_cast<int>(widthMax),0.,widthMax,"nph");
-    i_sector.second.m_correlationHistsX["BaryStripX"] = i_sector.second.bookCorrHistsX("BaryStripX","barycenter of cluster charge","b_{cl,x}","[# channels]",800,100,-10.,790.,"nph");
-    
-    if(pixelSector){
-      i_sector.second.m_correlationHistsY["WidthY"] = i_sector.second.bookCorrHistsY("WidthY","cluster width","w_{cl,y}","[# channels]",static_cast<int>(widthMax),static_cast<int>(widthMax),0.,widthMax,"nph");
-      i_sector.second.m_correlationHistsY["BaryStripY"] = i_sector.second.bookCorrHistsY("BaryStripY","barycenter of cluster charge","b_{cl,y}","[# channels]",800,100,-10.,790.,"nph");
-      
-      i_sector.second.m_correlationHistsX["ChargePixel"] = i_sector.second.bookCorrHistsX("ChargePixel","cluster charge","c_{cl}","[e]",100,50,0.,chargePixelMax,"nph");
-      i_sector.second.m_correlationHistsX["ClusterProbXY"] = i_sector.second.bookCorrHistsX("ClusterProbXY","cluster probability xy","prob_{cl,xy}","",100,50,0.,1.,"nph");
-      i_sector.second.m_correlationHistsX["ClusterProbQ"] = i_sector.second.bookCorrHistsX("ClusterProbQ","cluster probability q","prob_{cl,q}","",100,50,0.,1.,"nph");
-      i_sector.second.m_correlationHistsX["ClusterProbXYQ"] = i_sector.second.bookCorrHistsX("ClusterProbXYQ","cluster probability xyq","prob_{cl,xyq}","",100,50,0.,1.,"nph");
-      i_sector.second.m_correlationHistsX["LogClusterProb"] = i_sector.second.bookCorrHistsX("LogClusterProb","cluster probability xy","log(prob_{cl,xy})","",60,30,logClusterProbMin,0.,"nph");
-      i_sector.second.m_correlationHistsX["IsOnEdge"] = i_sector.second.bookCorrHistsX("IsOnEdge","IsOnEdge","isOnEdge","",2,2,0,2,"nph");
-      i_sector.second.m_correlationHistsX["HasBadPixels"] = i_sector.second.bookCorrHistsX("HasBadPixels","HasBadPixels","hasBadPixels","",2,2,0,2,"nph");
-      i_sector.second.m_correlationHistsX["SpansTwoRoc"] = i_sector.second.bookCorrHistsX("SpansTwoRoc","SpansTwoRoc","spansTwoRoc","",2,2,0,2,"nph");
-      i_sector.second.m_correlationHistsX["QBin"] = i_sector.second.bookCorrHistsX("QBin","q bin","q bin","",8,8,0,8,"nph");
-      
-      i_sector.second.m_correlationHistsY["ChargePixel"] = i_sector.second.bookCorrHistsY("ChargePixel","cluster charge","c_{cl}","[e]",100,50,0.,chargePixelMax,"nph");
-      i_sector.second.m_correlationHistsY["ClusterProbXY"] = i_sector.second.bookCorrHistsY("ClusterProbXY","cluster probability xy","prob_{cl,xy}","",100,50,0.,1.,"nph");
-      i_sector.second.m_correlationHistsY["ClusterProbQ"] = i_sector.second.bookCorrHistsY("ClusterProbQ","cluster probability q","prob_{cl,q}","",100,50,0.,1.,"nph");
-      i_sector.second.m_correlationHistsY["ClusterProbXYQ"] = i_sector.second.bookCorrHistsY("ClusterProbXYQ","cluster probability xyq","prob_{cl,xyq}","",100,50,0.,1.,"nph");
-      i_sector.second.m_correlationHistsY["LogClusterProb"] = i_sector.second.bookCorrHistsY("LogClusterProb","cluster probability xy","log(prob_{cl,xy})","",60,30,logClusterProbMin,0.,"nph");
-      i_sector.second.m_correlationHistsY["IsOnEdge"] = i_sector.second.bookCorrHistsY("IsOnEdge","IsOnEdge","isOnEdge","",2,2,0,2,"nph");
-      i_sector.second.m_correlationHistsY["HasBadPixels"] = i_sector.second.bookCorrHistsY("HasBadPixels","HasBadPixels","hasBadPixels","",2,2,0,2,"nph");
-      i_sector.second.m_correlationHistsY["SpansTwoRoc"] = i_sector.second.bookCorrHistsY("SpansTwoRoc","SpansTwoRoc","spansTwoRoc","",2,2,0,2,"nph");
-      i_sector.second.m_correlationHistsY["QBin"] = i_sector.second.bookCorrHistsY("QBin","q bin","q bin","",8,8,0,8,"nph");
+    i_sector.second.m_correlationHistsX["WidthX"] = i_sector.second.bookCorrHistsX("WidthX",
+                                                                                   "cluster width",
+                                                                                   "w_{cl,x}",
+                                                                                   "[# channels]",
+                                                                                   static_cast<int>(widthMax),
+                                                                                   static_cast<int>(widthMax),
+                                                                                   0.,
+                                                                                   widthMax,
+                                                                                   "nph");
+    i_sector.second.m_correlationHistsX["BaryStripX"] = i_sector.second.bookCorrHistsX(
+        "BaryStripX", "barycenter of cluster charge", "b_{cl,x}", "[# channels]", 800, 100, -10., 790., "nph");
+
+    if (pixelSector) {
+      i_sector.second.m_correlationHistsY["WidthY"] = i_sector.second.bookCorrHistsY("WidthY",
+                                                                                     "cluster width",
+                                                                                     "w_{cl,y}",
+                                                                                     "[# channels]",
+                                                                                     static_cast<int>(widthMax),
+                                                                                     static_cast<int>(widthMax),
+                                                                                     0.,
+                                                                                     widthMax,
+                                                                                     "nph");
+      i_sector.second.m_correlationHistsY["BaryStripY"] = i_sector.second.bookCorrHistsY(
+          "BaryStripY", "barycenter of cluster charge", "b_{cl,y}", "[# channels]", 800, 100, -10., 790., "nph");
+
+      i_sector.second.m_correlationHistsX["ChargePixel"] = i_sector.second.bookCorrHistsX(
+          "ChargePixel", "cluster charge", "c_{cl}", "[e]", 100, 50, 0., chargePixelMax, "nph");
+      i_sector.second.m_correlationHistsX["ClusterProbXY"] = i_sector.second.bookCorrHistsX(
+          "ClusterProbXY", "cluster probability xy", "prob_{cl,xy}", "", 100, 50, 0., 1., "nph");
+      i_sector.second.m_correlationHistsX["ClusterProbQ"] = i_sector.second.bookCorrHistsX(
+          "ClusterProbQ", "cluster probability q", "prob_{cl,q}", "", 100, 50, 0., 1., "nph");
+      i_sector.second.m_correlationHistsX["ClusterProbXYQ"] = i_sector.second.bookCorrHistsX(
+          "ClusterProbXYQ", "cluster probability xyq", "prob_{cl,xyq}", "", 100, 50, 0., 1., "nph");
+      i_sector.second.m_correlationHistsX["LogClusterProb"] = i_sector.second.bookCorrHistsX(
+          "LogClusterProb", "cluster probability xy", "log(prob_{cl,xy})", "", 60, 30, logClusterProbMin, 0., "nph");
+      i_sector.second.m_correlationHistsX["IsOnEdge"] =
+          i_sector.second.bookCorrHistsX("IsOnEdge", "IsOnEdge", "isOnEdge", "", 2, 2, 0, 2, "nph");
+      i_sector.second.m_correlationHistsX["HasBadPixels"] =
+          i_sector.second.bookCorrHistsX("HasBadPixels", "HasBadPixels", "hasBadPixels", "", 2, 2, 0, 2, "nph");
+      i_sector.second.m_correlationHistsX["SpansTwoRoc"] =
+          i_sector.second.bookCorrHistsX("SpansTwoRoc", "SpansTwoRoc", "spansTwoRoc", "", 2, 2, 0, 2, "nph");
+      i_sector.second.m_correlationHistsX["QBin"] =
+          i_sector.second.bookCorrHistsX("QBin", "q bin", "q bin", "", 8, 8, 0, 8, "nph");
+
+      i_sector.second.m_correlationHistsY["ChargePixel"] = i_sector.second.bookCorrHistsY(
+          "ChargePixel", "cluster charge", "c_{cl}", "[e]", 100, 50, 0., chargePixelMax, "nph");
+      i_sector.second.m_correlationHistsY["ClusterProbXY"] = i_sector.second.bookCorrHistsY(
+          "ClusterProbXY", "cluster probability xy", "prob_{cl,xy}", "", 100, 50, 0., 1., "nph");
+      i_sector.second.m_correlationHistsY["ClusterProbQ"] = i_sector.second.bookCorrHistsY(
+          "ClusterProbQ", "cluster probability q", "prob_{cl,q}", "", 100, 50, 0., 1., "nph");
+      i_sector.second.m_correlationHistsY["ClusterProbXYQ"] = i_sector.second.bookCorrHistsY(
+          "ClusterProbXYQ", "cluster probability xyq", "prob_{cl,xyq}", "", 100, 50, 0., 1., "nph");
+      i_sector.second.m_correlationHistsY["LogClusterProb"] = i_sector.second.bookCorrHistsY(
+          "LogClusterProb", "cluster probability xy", "log(prob_{cl,xy})", "", 60, 30, logClusterProbMin, 0., "nph");
+      i_sector.second.m_correlationHistsY["IsOnEdge"] =
+          i_sector.second.bookCorrHistsY("IsOnEdge", "IsOnEdge", "isOnEdge", "", 2, 2, 0, 2, "nph");
+      i_sector.second.m_correlationHistsY["HasBadPixels"] =
+          i_sector.second.bookCorrHistsY("HasBadPixels", "HasBadPixels", "hasBadPixels", "", 2, 2, 0, 2, "nph");
+      i_sector.second.m_correlationHistsY["SpansTwoRoc"] =
+          i_sector.second.bookCorrHistsY("SpansTwoRoc", "SpansTwoRoc", "spansTwoRoc", "", 2, 2, 0, 2, "nph");
+      i_sector.second.m_correlationHistsY["QBin"] =
+          i_sector.second.bookCorrHistsY("QBin", "q bin", "q bin", "", 8, 8, 0, 8, "nph");
     }
-    
-    else{
-      i_sector.second.m_correlationHistsX["ChargeStrip"] = i_sector.second.bookCorrHistsX("ChargeStrip","cluster charge","c_{cl}","[APV counts]",100,50,0.,chargeStripMax,"nph");
-      i_sector.second.m_correlationHistsX["MaxStrip"] = i_sector.second.bookCorrHistsX("MaxStrip","strip with max. charge","n_{cl,max}","[# strips]",800,800,-10.,790.,"npht");
-      i_sector.second.m_correlationHistsX["MaxCharge"] = i_sector.second.bookCorrHistsX("MaxCharge","charge of strip with max. charge","c_{cl,max}","[APV counts]",300,75,-10.,290.,"nph");
-      i_sector.second.m_correlationHistsX["MaxIndex"] = i_sector.second.bookCorrHistsX("MaxIndex","cluster-index of strip with max. charge","i_{cl,max}","[# strips]",10,10,0.,10.,"nph");
-      i_sector.second.m_correlationHistsX["ChargeOnEdges"] = i_sector.second.bookCorrHistsX("ChargeOnEdges","fraction of charge on edge strips","(c_{st,L}+c_{st,R})/c_{cl}","",60,60,-0.1,1.1,"nph");
-      i_sector.second.m_correlationHistsX["ChargeAsymmetry"] = i_sector.second.bookCorrHistsX("ChargeAsymmetry","asymmetry of charge on edge strips","(c_{st,L}-c_{st,R})/c_{cl}","",110,55,-1.1,1.1,"nph");
-      i_sector.second.m_correlationHistsX["ChargeLRplus"] = i_sector.second.bookCorrHistsX("ChargeLRplus","fraction of charge not on maxStrip","(c_{cl,L}+c_{cl,R})/c_{cl}","",60,60,-0.1,1.1,"nph");
-      i_sector.second.m_correlationHistsX["ChargeLRminus"] = i_sector.second.bookCorrHistsX("ChargeLRminus","asymmetry of charge L and R of maxStrip","(c_{cl,L}-c_{cl,R})/c_{cl}","",110,55,-1.1,1.1,"nph");
-      i_sector.second.m_correlationHistsX["SOverN"] = i_sector.second.bookCorrHistsX("SOverN","signal over noise","s/N","",100,50,0,sOverNMax,"nph");
-      i_sector.second.m_correlationHistsX["WidthProj"] = i_sector.second.bookCorrHistsX("WidthProj","projected width","w_{p}","[# strips]",200,20,0.,widthMax,"nph");
-      i_sector.second.m_correlationHistsX["WidthDiff"] = i_sector.second.bookCorrHistsX("WidthDiff","width difference","w_{p} - w_{cl}","[# strips]",200,20,-widthMax/2.,widthMax/2.,"nph");
-      
-      i_sector.second.WidthVsWidthProjected = secDir.make<TH2F>("h2_widthVsWidthProj","w_{cl} vs. w_{p};w_{p}  [# strips];w_{cl}  [# strips]",static_cast<int>(widthMax),0,widthMax,static_cast<int>(widthMax),0,widthMax);
-      i_sector.second.PWidthVsWidthProjected = secDir.make<TProfile>("p_widthVsWidthProj","w_{cl} vs. w_{p};w_{p}  [# strips];w_{cl}  [# strips]",static_cast<int>(widthMax),0,widthMax);
-      
-      i_sector.second.WidthDiffVsMaxStrip = secDir.make<TH2F>("h2_widthDiffVsMaxStrip","(w_{p} - w_{cl}) vs. n_{cl,max};n_{cl,max};w_{p} - w_{cl}  [# strips]",800,-10.,790.,static_cast<int>(widthMax),-widthMax/2.,widthMax/2.);
-      i_sector.second.PWidthDiffVsMaxStrip = secDir.make<TProfile>("p_widthDiffVsMaxStrip","(w_{p} - w_{cl}) vs. n_{cl,max};n_{cl,max};w_{p} - w_{cl}  [# strips]",800,-10.,790.);
-      
-      i_sector.second.WidthDiffVsSigmaXHit = secDir.make<TH2F>("h2_widthDiffVsSigmaXHit","(w_{p} - w_{cl}) vs. #sigma_{hit,x};#sigma_{hit,x}  [cm];w_{p} - w_{cl}  [# strips]",100,0.,sigmaXMax,100,-10.,10.);
-      i_sector.second.PWidthDiffVsSigmaXHit = secDir.make<TProfile>("p_widthDiffVsSigmaXHit","(w_{p} - w_{cl}) vs. #sigma_{hit,x};#sigma_{hit,x}  [cm];w_{p} - w_{cl}  [# strips]",100,0.,sigmaXMax);
-      
-      i_sector.second.WidthVsPhiSensX = secDir.make<TH2F>("h2_widthVsPhiSensX","w_{cl} vs. #phi_{module,x};#phi_{module,x}  [ ^{o}];w_{cl}  [# strips]",93,-93,93,static_cast<int>(widthMax),0,widthMax);
-      i_sector.second.PWidthVsPhiSensX = secDir.make<TProfile>("p_widthVsPhiSensX","w_{cl} vs. #phi_{module,x};#phi_{module,x}  [ ^{o}];w_{cl}  [# strips]",93,-93,93);
+
+    else {
+      i_sector.second.m_correlationHistsX["ChargeStrip"] = i_sector.second.bookCorrHistsX(
+          "ChargeStrip", "cluster charge", "c_{cl}", "[APV counts]", 100, 50, 0., chargeStripMax, "nph");
+      i_sector.second.m_correlationHistsX["MaxStrip"] = i_sector.second.bookCorrHistsX(
+          "MaxStrip", "strip with max. charge", "n_{cl,max}", "[# strips]", 800, 800, -10., 790., "npht");
+      i_sector.second.m_correlationHistsX["MaxCharge"] = i_sector.second.bookCorrHistsX(
+          "MaxCharge", "charge of strip with max. charge", "c_{cl,max}", "[APV counts]", 300, 75, -10., 290., "nph");
+      i_sector.second.m_correlationHistsX["MaxIndex"] = i_sector.second.bookCorrHistsX(
+          "MaxIndex", "cluster-index of strip with max. charge", "i_{cl,max}", "[# strips]", 10, 10, 0., 10., "nph");
+      i_sector.second.m_correlationHistsX["ChargeOnEdges"] =
+          i_sector.second.bookCorrHistsX("ChargeOnEdges",
+                                         "fraction of charge on edge strips",
+                                         "(c_{st,L}+c_{st,R})/c_{cl}",
+                                         "",
+                                         60,
+                                         60,
+                                         -0.1,
+                                         1.1,
+                                         "nph");
+      i_sector.second.m_correlationHistsX["ChargeAsymmetry"] =
+          i_sector.second.bookCorrHistsX("ChargeAsymmetry",
+                                         "asymmetry of charge on edge strips",
+                                         "(c_{st,L}-c_{st,R})/c_{cl}",
+                                         "",
+                                         110,
+                                         55,
+                                         -1.1,
+                                         1.1,
+                                         "nph");
+      i_sector.second.m_correlationHistsX["ChargeLRplus"] =
+          i_sector.second.bookCorrHistsX("ChargeLRplus",
+                                         "fraction of charge not on maxStrip",
+                                         "(c_{cl,L}+c_{cl,R})/c_{cl}",
+                                         "",
+                                         60,
+                                         60,
+                                         -0.1,
+                                         1.1,
+                                         "nph");
+      i_sector.second.m_correlationHistsX["ChargeLRminus"] =
+          i_sector.second.bookCorrHistsX("ChargeLRminus",
+                                         "asymmetry of charge L and R of maxStrip",
+                                         "(c_{cl,L}-c_{cl,R})/c_{cl}",
+                                         "",
+                                         110,
+                                         55,
+                                         -1.1,
+                                         1.1,
+                                         "nph");
+      i_sector.second.m_correlationHistsX["SOverN"] =
+          i_sector.second.bookCorrHistsX("SOverN", "signal over noise", "s/N", "", 100, 50, 0, sOverNMax, "nph");
+      i_sector.second.m_correlationHistsX["WidthProj"] = i_sector.second.bookCorrHistsX(
+          "WidthProj", "projected width", "w_{p}", "[# strips]", 200, 20, 0., widthMax, "nph");
+      i_sector.second.m_correlationHistsX["WidthDiff"] = i_sector.second.bookCorrHistsX("WidthDiff",
+                                                                                        "width difference",
+                                                                                        "w_{p} - w_{cl}",
+                                                                                        "[# strips]",
+                                                                                        200,
+                                                                                        20,
+                                                                                        -widthMax / 2.,
+                                                                                        widthMax / 2.,
+                                                                                        "nph");
+
+      i_sector.second.WidthVsWidthProjected = secDir.make<TH2F>("h2_widthVsWidthProj",
+                                                                "w_{cl} vs. w_{p};w_{p}  [# strips];w_{cl}  [# strips]",
+                                                                static_cast<int>(widthMax),
+                                                                0,
+                                                                widthMax,
+                                                                static_cast<int>(widthMax),
+                                                                0,
+                                                                widthMax);
+      i_sector.second.PWidthVsWidthProjected =
+          secDir.make<TProfile>("p_widthVsWidthProj",
+                                "w_{cl} vs. w_{p};w_{p}  [# strips];w_{cl}  [# strips]",
+                                static_cast<int>(widthMax),
+                                0,
+                                widthMax);
+
+      i_sector.second.WidthDiffVsMaxStrip =
+          secDir.make<TH2F>("h2_widthDiffVsMaxStrip",
+                            "(w_{p} - w_{cl}) vs. n_{cl,max};n_{cl,max};w_{p} - w_{cl}  [# strips]",
+                            800,
+                            -10.,
+                            790.,
+                            static_cast<int>(widthMax),
+                            -widthMax / 2.,
+                            widthMax / 2.);
+      i_sector.second.PWidthDiffVsMaxStrip =
+          secDir.make<TProfile>("p_widthDiffVsMaxStrip",
+                                "(w_{p} - w_{cl}) vs. n_{cl,max};n_{cl,max};w_{p} - w_{cl}  [# strips]",
+                                800,
+                                -10.,
+                                790.);
+
+      i_sector.second.WidthDiffVsSigmaXHit =
+          secDir.make<TH2F>("h2_widthDiffVsSigmaXHit",
+                            "(w_{p} - w_{cl}) vs. #sigma_{hit,x};#sigma_{hit,x}  [cm];w_{p} - w_{cl}  [# strips]",
+                            100,
+                            0.,
+                            sigmaXMax,
+                            100,
+                            -10.,
+                            10.);
+      i_sector.second.PWidthDiffVsSigmaXHit =
+          secDir.make<TProfile>("p_widthDiffVsSigmaXHit",
+                                "(w_{p} - w_{cl}) vs. #sigma_{hit,x};#sigma_{hit,x}  [cm];w_{p} - w_{cl}  [# strips]",
+                                100,
+                                0.,
+                                sigmaXMax);
+
+      i_sector.second.WidthVsPhiSensX =
+          secDir.make<TH2F>("h2_widthVsPhiSensX",
+                            "w_{cl} vs. #phi_{module,x};#phi_{module,x}  [ ^{o}];w_{cl}  [# strips]",
+                            93,
+                            -93,
+                            93,
+                            static_cast<int>(widthMax),
+                            0,
+                            widthMax);
+      i_sector.second.PWidthVsPhiSensX = secDir.make<TProfile>(
+          "p_widthVsPhiSensX", "w_{cl} vs. #phi_{module,x};#phi_{module,x}  [ ^{o}];w_{cl}  [# strips]", 93, -93, 93);
     }
-    
-    
+
     // Hit Parameters (transform errors and residuals from [cm] in [mum])
-    i_sector.second.m_correlationHistsX["SigmaXHit"] = i_sector.second.bookCorrHistsX("SigmaXHit","hit error","#sigma_{hit,x}","[#mum]",105,20,sigmaXMin*10000.,sigmaXMax*10000.,"np");
-    i_sector.second.m_correlationHistsX["SigmaXTrk"] = i_sector.second.bookCorrHistsX("SigmaXTrk","track error","#sigma_{trk,x}","[#mum]",105,20,sigmaXMin*10000.,sigmaXMax*10000.,"np");
-    i_sector.second.m_correlationHistsX["SigmaX"]    = i_sector.second.bookCorrHistsX("SigmaX","residual error","#sigma_{r,x}","[#mum]",105,20,sigmaXMin*10000.,sigmaXMax*10000.,"np");
-    i_sector.second.m_correlationHistsX["PhiSens"]   = i_sector.second.bookCorrHistsX("PhiSens","track angle on sensor","#phi_{module}","[ ^{o}]",96,48,-3,93,"nphtr");
-    i_sector.second.m_correlationHistsX["PhiSensX"]  = i_sector.second.bookCorrHistsX("PhiSensX","track angle on sensor","#phi_{module,x}","[ ^{o}]",186,93,-phiSensXMax,phiSensXMax,"nphtr");
-    i_sector.second.m_correlationHistsX["PhiSensY"]  = i_sector.second.bookCorrHistsX("PhiSensY","track angle on sensor","#phi_{module,y}","[ ^{o}]",186,93,-93,93,"nphtr");
-    
-    i_sector.second.XHit    = secDir.make<TH1F>("h_XHit"," hit measurement x_{hit};x_{hit}  [cm];# hits",100,-20,20);
-    i_sector.second.XTrk    = secDir.make<TH1F>("h_XTrk","track prediction x_{trk};x_{trk}  [cm];# hits",100,-20,20);
-    i_sector.second.SigmaX2 = secDir.make<TH1F>("h_SigmaX2","squared residual error #sigma_{r,x}^{2};#sigma_{r,x}^{2}  [#mum^{2}];# hits",105,sigmaXMin*10000.,sigmaX2Max*10000.*10000.); //no mistake !
-    i_sector.second.ResX    = secDir.make<TH1F>("h_ResX","residual r_{x};x_{trk}-x_{hit}  [#mum];# hits",100,-resXAbsMax*10000.,resXAbsMax*10000.);
-    i_sector.second.NorResX = secDir.make<TH1F>("h_NorResX","normalized residual r_{x}/#sigma_{r,x};(x_{trk}-x_{hit})/#sigma_{r,x};# hits",100,-norResXAbsMax,norResXAbsMax);
-    i_sector.second.ProbX   = secDir.make<TH1F>("h_ProbX","residual probability;prob(r_{x}^{2}/#sigma_{r,x}^{2},1);# hits",60,probXMin,probXMax);
-    
-    i_sector.second.PhiSensXVsBarycentreX = secDir.make<TH2F>("h2_phiSensXVsBarycentreX","#phi_{module,x} vs. b_{cl,x};b_{cl,x}  [# channels];#phi_{module,x}  [ ^{o}]",200,-10.,790.,93,-93,93);
-    i_sector.second.PPhiSensXVsBarycentreX = secDir.make<TProfile>("p_phiSensXVsBarycentreX","#phi_{module,x} vs. b_{cl,x};b_{cl,x}  [# channels];#phi_{module,x}  [ ^{o}]",200,-10.,790.);
-    
-    if(pixelSector){
-      i_sector.second.m_correlationHistsY["SigmaYHit"] = i_sector.second.bookCorrHistsY("SigmaYHit","hit error","#sigma_{hit,y}","[#mum]",105,20,sigmaXMin*10000.,sigmaXMax*10000.,"np");
-      i_sector.second.m_correlationHistsY["SigmaYTrk"] = i_sector.second.bookCorrHistsY("SigmaYTrk","track error","#sigma_{trk,y}","[#mum]",105,20,sigmaXMin*10000.,sigmaXMax*10000.,"np");
-      i_sector.second.m_correlationHistsY["SigmaY"]    = i_sector.second.bookCorrHistsY("SigmaY","residual error","#sigma_{r,y}","[#mum]",105,20,sigmaXMin*10000.,sigmaXMax*10000.,"np");
-      i_sector.second.m_correlationHistsY["PhiSens"]   = i_sector.second.bookCorrHistsY("PhiSens","track angle on sensor","#phi_{module}","[ ^{o}]",96,48,-3,93,"nphtr");
-      i_sector.second.m_correlationHistsY["PhiSensX"]  = i_sector.second.bookCorrHistsY("PhiSensX","track angle on sensor","#phi_{module,x}","[ ^{o}]",186,93,-phiSensXMax,phiSensXMax,"nphtr");
-      i_sector.second.m_correlationHistsY["PhiSensY"]  = i_sector.second.bookCorrHistsY("PhiSensY","track angle on sensor","#phi_{module,y}","[ ^{o}]",186,93,-93,93,"nphtr");
-      
-      i_sector.second.YHit    = secDir.make<TH1F>("h_YHit"," hit measurement y_{hit};y_{hit}  [cm];# hits",100,-20,20);
-      i_sector.second.YTrk    = secDir.make<TH1F>("h_YTrk","track prediction y_{trk};y_{trk}  [cm];# hits",100,-20,20);
-      i_sector.second.SigmaY2 = secDir.make<TH1F>("h_SigmaY2","squared residual error #sigma_{r,y}^{2};#sigma_{r,y}^{2}  [#mum^{2}];# hits",105,sigmaXMin*10000.,sigmaX2Max*10000.*10000.); //no mistake !
-      i_sector.second.ResY    = secDir.make<TH1F>("h_ResY","residual r_{y};y_{trk}-y_{hit}  [#mum];# hits",100,-resXAbsMax*10000.,resXAbsMax*10000.);
-      i_sector.second.NorResY = secDir.make<TH1F>("h_NorResY","normalized residual r_{y}/#sigma_{r,y};(y_{trk}-y_{hit})/#sigma_{r,y};# hits",100,-norResXAbsMax,norResXAbsMax);
-      i_sector.second.ProbY   = secDir.make<TH1F>("h_ProbY","residual probability;prob(r_{y}^{2}/#sigma_{r,y}^{2},1);# hits",60,probXMin,probXMax);
-      
-      i_sector.second.PhiSensYVsBarycentreY = secDir.make<TH2F>("h2_phiSensYVsBarycentreY","#phi_{module,y} vs. b_{cl,y};b_{cl,y}  [# channels];#phi_{module,y}  [ ^{o}]",200,-10.,790.,93,-93,93);
-      i_sector.second.PPhiSensYVsBarycentreY = secDir.make<TProfile>("p_phiSensYVsBarycentreY","#phi_{module,y} vs. b_{cl,y};b_{cl,y}  [# channels];#phi_{module,y}  [ ^{o}]",200,-10.,790.);
+    i_sector.second.m_correlationHistsX["SigmaXHit"] = i_sector.second.bookCorrHistsX(
+        "SigmaXHit", "hit error", "#sigma_{hit,x}", "[#mum]", 105, 20, sigmaXMin * 10000., sigmaXMax * 10000., "np");
+    i_sector.second.m_correlationHistsX["SigmaXTrk"] = i_sector.second.bookCorrHistsX(
+        "SigmaXTrk", "track error", "#sigma_{trk,x}", "[#mum]", 105, 20, sigmaXMin * 10000., sigmaXMax * 10000., "np");
+    i_sector.second.m_correlationHistsX["SigmaX"] = i_sector.second.bookCorrHistsX(
+        "SigmaX", "residual error", "#sigma_{r,x}", "[#mum]", 105, 20, sigmaXMin * 10000., sigmaXMax * 10000., "np");
+    i_sector.second.m_correlationHistsX["PhiSens"] = i_sector.second.bookCorrHistsX(
+        "PhiSens", "track angle on sensor", "#phi_{module}", "[ ^{o}]", 96, 48, -3, 93, "nphtr");
+    i_sector.second.m_correlationHistsX["PhiSensX"] = i_sector.second.bookCorrHistsX(
+        "PhiSensX", "track angle on sensor", "#phi_{module,x}", "[ ^{o}]", 186, 93, -phiSensXMax, phiSensXMax, "nphtr");
+    i_sector.second.m_correlationHistsX["PhiSensY"] = i_sector.second.bookCorrHistsX(
+        "PhiSensY", "track angle on sensor", "#phi_{module,y}", "[ ^{o}]", 186, 93, -93, 93, "nphtr");
+
+    i_sector.second.XHit = secDir.make<TH1F>("h_XHit", " hit measurement x_{hit};x_{hit}  [cm];# hits", 100, -20, 20);
+    i_sector.second.XTrk = secDir.make<TH1F>("h_XTrk", "track prediction x_{trk};x_{trk}  [cm];# hits", 100, -20, 20);
+    i_sector.second.SigmaX2 =
+        secDir.make<TH1F>("h_SigmaX2",
+                          "squared residual error #sigma_{r,x}^{2};#sigma_{r,x}^{2}  [#mum^{2}];# hits",
+                          105,
+                          sigmaXMin * 10000.,
+                          sigmaX2Max * 10000. * 10000.);  //no mistake !
+    i_sector.second.ResX = secDir.make<TH1F>(
+        "h_ResX", "residual r_{x};x_{trk}-x_{hit}  [#mum];# hits", 100, -resXAbsMax * 10000., resXAbsMax * 10000.);
+    i_sector.second.NorResX =
+        secDir.make<TH1F>("h_NorResX",
+                          "normalized residual r_{x}/#sigma_{r,x};(x_{trk}-x_{hit})/#sigma_{r,x};# hits",
+                          100,
+                          -norResXAbsMax,
+                          norResXAbsMax);
+    i_sector.second.ProbX = secDir.make<TH1F>(
+        "h_ProbX", "residual probability;prob(r_{x}^{2}/#sigma_{r,x}^{2},1);# hits", 60, probXMin, probXMax);
+
+    i_sector.second.PhiSensXVsBarycentreX =
+        secDir.make<TH2F>("h2_phiSensXVsBarycentreX",
+                          "#phi_{module,x} vs. b_{cl,x};b_{cl,x}  [# channels];#phi_{module,x}  [ ^{o}]",
+                          200,
+                          -10.,
+                          790.,
+                          93,
+                          -93,
+                          93);
+    i_sector.second.PPhiSensXVsBarycentreX =
+        secDir.make<TProfile>("p_phiSensXVsBarycentreX",
+                              "#phi_{module,x} vs. b_{cl,x};b_{cl,x}  [# channels];#phi_{module,x}  [ ^{o}]",
+                              200,
+                              -10.,
+                              790.);
+
+    if (pixelSector) {
+      i_sector.second.m_correlationHistsY["SigmaYHit"] = i_sector.second.bookCorrHistsY(
+          "SigmaYHit", "hit error", "#sigma_{hit,y}", "[#mum]", 105, 20, sigmaXMin * 10000., sigmaXMax * 10000., "np");
+      i_sector.second.m_correlationHistsY["SigmaYTrk"] = i_sector.second.bookCorrHistsY(
+          "SigmaYTrk", "track error", "#sigma_{trk,y}", "[#mum]", 105, 20, sigmaXMin * 10000., sigmaXMax * 10000., "np");
+      i_sector.second.m_correlationHistsY["SigmaY"] = i_sector.second.bookCorrHistsY(
+          "SigmaY", "residual error", "#sigma_{r,y}", "[#mum]", 105, 20, sigmaXMin * 10000., sigmaXMax * 10000., "np");
+      i_sector.second.m_correlationHistsY["PhiSens"] = i_sector.second.bookCorrHistsY(
+          "PhiSens", "track angle on sensor", "#phi_{module}", "[ ^{o}]", 96, 48, -3, 93, "nphtr");
+      i_sector.second.m_correlationHistsY["PhiSensX"] = i_sector.second.bookCorrHistsY("PhiSensX",
+                                                                                       "track angle on sensor",
+                                                                                       "#phi_{module,x}",
+                                                                                       "[ ^{o}]",
+                                                                                       186,
+                                                                                       93,
+                                                                                       -phiSensXMax,
+                                                                                       phiSensXMax,
+                                                                                       "nphtr");
+      i_sector.second.m_correlationHistsY["PhiSensY"] = i_sector.second.bookCorrHistsY(
+          "PhiSensY", "track angle on sensor", "#phi_{module,y}", "[ ^{o}]", 186, 93, -93, 93, "nphtr");
+
+      i_sector.second.YHit = secDir.make<TH1F>("h_YHit", " hit measurement y_{hit};y_{hit}  [cm];# hits", 100, -20, 20);
+      i_sector.second.YTrk = secDir.make<TH1F>("h_YTrk", "track prediction y_{trk};y_{trk}  [cm];# hits", 100, -20, 20);
+      i_sector.second.SigmaY2 =
+          secDir.make<TH1F>("h_SigmaY2",
+                            "squared residual error #sigma_{r,y}^{2};#sigma_{r,y}^{2}  [#mum^{2}];# hits",
+                            105,
+                            sigmaXMin * 10000.,
+                            sigmaX2Max * 10000. * 10000.);  //no mistake !
+      i_sector.second.ResY = secDir.make<TH1F>(
+          "h_ResY", "residual r_{y};y_{trk}-y_{hit}  [#mum];# hits", 100, -resXAbsMax * 10000., resXAbsMax * 10000.);
+      i_sector.second.NorResY =
+          secDir.make<TH1F>("h_NorResY",
+                            "normalized residual r_{y}/#sigma_{r,y};(y_{trk}-y_{hit})/#sigma_{r,y};# hits",
+                            100,
+                            -norResXAbsMax,
+                            norResXAbsMax);
+      i_sector.second.ProbY = secDir.make<TH1F>(
+          "h_ProbY", "residual probability;prob(r_{y}^{2}/#sigma_{r,y}^{2},1);# hits", 60, probXMin, probXMax);
+
+      i_sector.second.PhiSensYVsBarycentreY =
+          secDir.make<TH2F>("h2_phiSensYVsBarycentreY",
+                            "#phi_{module,y} vs. b_{cl,y};b_{cl,y}  [# channels];#phi_{module,y}  [ ^{o}]",
+                            200,
+                            -10.,
+                            790.,
+                            93,
+                            -93,
+                            93);
+      i_sector.second.PPhiSensYVsBarycentreY =
+          secDir.make<TProfile>("p_phiSensYVsBarycentreY",
+                                "#phi_{module,y} vs. b_{cl,y};b_{cl,y}  [# channels];#phi_{module,y}  [ ^{o}]",
+                                200,
+                                -10.,
+                                790.);
     }
-    
-    
+
     // Track Parameters
-    i_sector.second.m_correlationHistsX["HitsValid"] = i_sector.second.bookCorrHistsX("HitsValid","# hits","[valid]",50,0,50,"npt");
-    i_sector.second.m_correlationHistsX["HitsInvalid"] = i_sector.second.bookCorrHistsX("HitsInvalid","# hits","[invalid]",20,0,20,"npt");
-    i_sector.second.m_correlationHistsX["Hits2D"] = i_sector.second.bookCorrHistsX("Hits2D","# hits","[2D]",20,0,20,"npt");
-    i_sector.second.m_correlationHistsX["LayersMissed"] = i_sector.second.bookCorrHistsX("LayersMissed","# layers","[missed]",10,0,10,"npt");
-    i_sector.second.m_correlationHistsX["HitsPixel"] = i_sector.second.bookCorrHistsX("HitsPixel","# hits","[pixel]",10,0,10,"npt");
-    i_sector.second.m_correlationHistsX["HitsStrip"] = i_sector.second.bookCorrHistsX("HitsStrip","# hits","[strip]",40,0,40,"npt");
-    i_sector.second.m_correlationHistsX["HitsGood"] = i_sector.second.bookCorrHistsX("HitsGood","# hits","[good]",50,0,50,"npt");
-    i_sector.second.m_correlationHistsX["NorChi2"] = i_sector.second.bookCorrHistsX("NorChi2","#chi^{2}/f","",50,0,norChi2Max,"npr");
-    i_sector.second.m_correlationHistsX["Theta"] = i_sector.second.bookCorrHistsX("Theta","#theta","[ ^{o}]",40,-10,190,"npt");
-    i_sector.second.m_correlationHistsX["Phi"] = i_sector.second.bookCorrHistsX("Phi","#phi","[ ^{o}]",76,-190,190,"npt");
-    i_sector.second.m_correlationHistsX["D0Beamspot"] = i_sector.second.bookCorrHistsX("D0Beamspot","d_{0, BS}","[cm]",40,-d0Max,d0Max,"npt");
-    i_sector.second.m_correlationHistsX["Dz"] = i_sector.second.bookCorrHistsX("Dz","d_{z}","[cm]",40,-dzMax,dzMax,"npt");
-    i_sector.second.m_correlationHistsX["Pt"] = i_sector.second.bookCorrHistsX("Pt","p_{t}","[GeV]",50,0,pMax,"npt");
-    i_sector.second.m_correlationHistsX["P"] = i_sector.second.bookCorrHistsX("P","|p|","[GeV]",50,0,pMax,"npt");
-    i_sector.second.m_correlationHistsX["InvP"] = i_sector.second.bookCorrHistsX("InvP","1/|p|","[GeV^{-1}]",25,0,invPMax,"t");
-    i_sector.second.m_correlationHistsX["MeanAngle"] = i_sector.second.bookCorrHistsX("MeanAngle","<#phi_{module}>","[ ^{o}]",25,-5,95,"npt");
+    i_sector.second.m_correlationHistsX["HitsValid"] =
+        i_sector.second.bookCorrHistsX("HitsValid", "# hits", "[valid]", 50, 0, 50, "npt");
+    i_sector.second.m_correlationHistsX["HitsInvalid"] =
+        i_sector.second.bookCorrHistsX("HitsInvalid", "# hits", "[invalid]", 20, 0, 20, "npt");
+    i_sector.second.m_correlationHistsX["Hits2D"] =
+        i_sector.second.bookCorrHistsX("Hits2D", "# hits", "[2D]", 20, 0, 20, "npt");
+    i_sector.second.m_correlationHistsX["LayersMissed"] =
+        i_sector.second.bookCorrHistsX("LayersMissed", "# layers", "[missed]", 10, 0, 10, "npt");
+    i_sector.second.m_correlationHistsX["HitsPixel"] =
+        i_sector.second.bookCorrHistsX("HitsPixel", "# hits", "[pixel]", 10, 0, 10, "npt");
+    i_sector.second.m_correlationHistsX["HitsStrip"] =
+        i_sector.second.bookCorrHistsX("HitsStrip", "# hits", "[strip]", 40, 0, 40, "npt");
+    i_sector.second.m_correlationHistsX["HitsGood"] =
+        i_sector.second.bookCorrHistsX("HitsGood", "# hits", "[good]", 50, 0, 50, "npt");
+    i_sector.second.m_correlationHistsX["NorChi2"] =
+        i_sector.second.bookCorrHistsX("NorChi2", "#chi^{2}/f", "", 50, 0, norChi2Max, "npr");
+    i_sector.second.m_correlationHistsX["Theta"] =
+        i_sector.second.bookCorrHistsX("Theta", "#theta", "[ ^{o}]", 40, -10, 190, "npt");
+    i_sector.second.m_correlationHistsX["Phi"] =
+        i_sector.second.bookCorrHistsX("Phi", "#phi", "[ ^{o}]", 76, -190, 190, "npt");
+    i_sector.second.m_correlationHistsX["D0Beamspot"] =
+        i_sector.second.bookCorrHistsX("D0Beamspot", "d_{0, BS}", "[cm]", 40, -d0Max, d0Max, "npt");
+    i_sector.second.m_correlationHistsX["Dz"] =
+        i_sector.second.bookCorrHistsX("Dz", "d_{z}", "[cm]", 40, -dzMax, dzMax, "npt");
+    i_sector.second.m_correlationHistsX["Pt"] =
+        i_sector.second.bookCorrHistsX("Pt", "p_{t}", "[GeV]", 50, 0, pMax, "npt");
+    i_sector.second.m_correlationHistsX["P"] = i_sector.second.bookCorrHistsX("P", "|p|", "[GeV]", 50, 0, pMax, "npt");
+    i_sector.second.m_correlationHistsX["InvP"] =
+        i_sector.second.bookCorrHistsX("InvP", "1/|p|", "[GeV^{-1}]", 25, 0, invPMax, "t");
+    i_sector.second.m_correlationHistsX["MeanAngle"] =
+        i_sector.second.bookCorrHistsX("MeanAngle", "<#phi_{module}>", "[ ^{o}]", 25, -5, 95, "npt");
     //i_sector.second.m_correlationHistsX[""] = i_sector.second.bookCorrHistsX("","","",,,,"nphtr");
-    
-    if(pixelSector){
-      i_sector.second.m_correlationHistsY["HitsValid"] = i_sector.second.bookCorrHistsY("HitsValid","# hits","[valid]",50,0,50,"npt");
-      i_sector.second.m_correlationHistsY["HitsInvalid"] = i_sector.second.bookCorrHistsY("HitsInvalid","# hits","[invalid]",20,0,20,"npt");
-      i_sector.second.m_correlationHistsY["Hits2D"] = i_sector.second.bookCorrHistsY("Hits2D","# hits","[2D]",20,0,20,"npt");
-      i_sector.second.m_correlationHistsY["LayersMissed"] = i_sector.second.bookCorrHistsY("LayersMissed","# layers","[missed]",10,0,10,"npt");
-      i_sector.second.m_correlationHistsY["HitsPixel"] = i_sector.second.bookCorrHistsY("HitsPixel","# hits","[pixel]",10,0,10,"npt");
-      i_sector.second.m_correlationHistsY["HitsStrip"] = i_sector.second.bookCorrHistsY("HitsStrip","# hits","[strip]",40,0,40,"npt");
-      i_sector.second.m_correlationHistsY["HitsGood"] = i_sector.second.bookCorrHistsY("HitsGood","# hits","[good]",50,0,50,"npt");
-      i_sector.second.m_correlationHistsY["NorChi2"] = i_sector.second.bookCorrHistsY("NorChi2","#chi^{2}/f","",50,0,norChi2Max,"npr");
-      i_sector.second.m_correlationHistsY["Theta"] = i_sector.second.bookCorrHistsY("Theta","#theta","[ ^{o}]",40,-10,190,"npt");
-      i_sector.second.m_correlationHistsY["Phi"] = i_sector.second.bookCorrHistsY("Phi","#phi","[ ^{o}]",76,-190,190,"npt");
-      i_sector.second.m_correlationHistsY["D0Beamspot"] = i_sector.second.bookCorrHistsY("D0Beamspot","d_{0, BS}","[cm]",40,-d0Max,d0Max,"npt");
-      i_sector.second.m_correlationHistsY["Dz"] = i_sector.second.bookCorrHistsY("Dz","d_{z}","[cm]",40,-dzMax,dzMax,"npt");
-      i_sector.second.m_correlationHistsY["Pt"] = i_sector.second.bookCorrHistsY("Pt","p_{t}","[GeV]",50,0,pMax,"npt");
-      i_sector.second.m_correlationHistsY["P"] = i_sector.second.bookCorrHistsY("P","|p|","[GeV]",50,0,pMax,"npt");
-      i_sector.second.m_correlationHistsY["InvP"] = i_sector.second.bookCorrHistsY("InvP","1/|p|","[GeV^{-1}]",25,0,invPMax,"t");
-      i_sector.second.m_correlationHistsY["MeanAngle"] = i_sector.second.bookCorrHistsY("MeanAngle","<#phi_{module}>","[ ^{o}]",25,-5,95,"npt");
+
+    if (pixelSector) {
+      i_sector.second.m_correlationHistsY["HitsValid"] =
+          i_sector.second.bookCorrHistsY("HitsValid", "# hits", "[valid]", 50, 0, 50, "npt");
+      i_sector.second.m_correlationHistsY["HitsInvalid"] =
+          i_sector.second.bookCorrHistsY("HitsInvalid", "# hits", "[invalid]", 20, 0, 20, "npt");
+      i_sector.second.m_correlationHistsY["Hits2D"] =
+          i_sector.second.bookCorrHistsY("Hits2D", "# hits", "[2D]", 20, 0, 20, "npt");
+      i_sector.second.m_correlationHistsY["LayersMissed"] =
+          i_sector.second.bookCorrHistsY("LayersMissed", "# layers", "[missed]", 10, 0, 10, "npt");
+      i_sector.second.m_correlationHistsY["HitsPixel"] =
+          i_sector.second.bookCorrHistsY("HitsPixel", "# hits", "[pixel]", 10, 0, 10, "npt");
+      i_sector.second.m_correlationHistsY["HitsStrip"] =
+          i_sector.second.bookCorrHistsY("HitsStrip", "# hits", "[strip]", 40, 0, 40, "npt");
+      i_sector.second.m_correlationHistsY["HitsGood"] =
+          i_sector.second.bookCorrHistsY("HitsGood", "# hits", "[good]", 50, 0, 50, "npt");
+      i_sector.second.m_correlationHistsY["NorChi2"] =
+          i_sector.second.bookCorrHistsY("NorChi2", "#chi^{2}/f", "", 50, 0, norChi2Max, "npr");
+      i_sector.second.m_correlationHistsY["Theta"] =
+          i_sector.second.bookCorrHistsY("Theta", "#theta", "[ ^{o}]", 40, -10, 190, "npt");
+      i_sector.second.m_correlationHistsY["Phi"] =
+          i_sector.second.bookCorrHistsY("Phi", "#phi", "[ ^{o}]", 76, -190, 190, "npt");
+      i_sector.second.m_correlationHistsY["D0Beamspot"] =
+          i_sector.second.bookCorrHistsY("D0Beamspot", "d_{0, BS}", "[cm]", 40, -d0Max, d0Max, "npt");
+      i_sector.second.m_correlationHistsY["Dz"] =
+          i_sector.second.bookCorrHistsY("Dz", "d_{z}", "[cm]", 40, -dzMax, dzMax, "npt");
+      i_sector.second.m_correlationHistsY["Pt"] =
+          i_sector.second.bookCorrHistsY("Pt", "p_{t}", "[GeV]", 50, 0, pMax, "npt");
+      i_sector.second.m_correlationHistsY["P"] =
+          i_sector.second.bookCorrHistsY("P", "|p|", "[GeV]", 50, 0, pMax, "npt");
+      i_sector.second.m_correlationHistsY["InvP"] =
+          i_sector.second.bookCorrHistsY("InvP", "1/|p|", "[GeV^{-1}]", 25, 0, invPMax, "t");
+      i_sector.second.m_correlationHistsY["MeanAngle"] =
+          i_sector.second.bookCorrHistsY("MeanAngle", "<#phi_{module}>", "[ ^{o}]", 25, -5, 95, "npt");
     }
-    
-    
+
     // (transform errors and residuals from [cm] in [mum])
-    for(auto const & i_errHists : v_errHists){
-      double xMin(0.01*(i_errHists-1)), xMax(0.01*(i_errHists));
+    for (auto const& i_errHists : v_errHists) {
+      double xMin(0.01 * (i_errHists - 1)), xMax(0.01 * (i_errHists));
       std::stringstream sigmaXHit, sigmaXTrk, sigmaX;
       sigmaXHit << "h_sigmaXHit_" << i_errHists;
       sigmaXTrk << "h_sigmaXTrk_" << i_errHists;
-      sigmaX    << "h_sigmaX_"    << i_errHists;
-      i_sector.second.m_sigmaX["sigmaXHit"].push_back(secDir.make<TH1F>(sigmaXHit.str().c_str(),"hit error #sigma_{hit,x};#sigma_{hit,x}  [#mum];# hits",100,xMin*10000.,xMax*10000.));
-      i_sector.second.m_sigmaX["sigmaXTrk"].push_back(secDir.make<TH1F>(sigmaXTrk.str().c_str(),"track error #sigma_{trk,x};#sigma_{trk,x}  [#mum];# hits",100,xMin*10000.,xMax*10000.));
-      i_sector.second.m_sigmaX["sigmaX"   ].push_back(secDir.make<TH1F>(sigmaX.str().c_str(),"residual error #sigma_{r,x};#sigma_{r,x}  [#mum];# hits",100,xMin*10000.,xMax*10000.));
-      if(pixelSector){
+      sigmaX << "h_sigmaX_" << i_errHists;
+      i_sector.second.m_sigmaX["sigmaXHit"].push_back(
+          secDir.make<TH1F>(sigmaXHit.str().c_str(),
+                            "hit error #sigma_{hit,x};#sigma_{hit,x}  [#mum];# hits",
+                            100,
+                            xMin * 10000.,
+                            xMax * 10000.));
+      i_sector.second.m_sigmaX["sigmaXTrk"].push_back(
+          secDir.make<TH1F>(sigmaXTrk.str().c_str(),
+                            "track error #sigma_{trk,x};#sigma_{trk,x}  [#mum];# hits",
+                            100,
+                            xMin * 10000.,
+                            xMax * 10000.));
+      i_sector.second.m_sigmaX["sigmaX"].push_back(
+          secDir.make<TH1F>(sigmaX.str().c_str(),
+                            "residual error #sigma_{r,x};#sigma_{r,x}  [#mum];# hits",
+                            100,
+                            xMin * 10000.,
+                            xMax * 10000.));
+      if (pixelSector) {
         std::stringstream sigmaYHit, sigmaYTrk, sigmaY;
         sigmaYHit << "h_sigmaYHit_" << i_errHists;
         sigmaYTrk << "h_sigmaYTrk_" << i_errHists;
-        sigmaY    << "h_sigmaY_"    << i_errHists;
-        i_sector.second.m_sigmaY["sigmaYHit"].push_back(secDir.make<TH1F>(sigmaYHit.str().c_str(),"hit error #sigma_{hit,y};#sigma_{hit,y}  [#mum];# hits",100,xMin*10000.,xMax*10000.));
-        i_sector.second.m_sigmaY["sigmaYTrk"].push_back(secDir.make<TH1F>(sigmaYTrk.str().c_str(),"track error #sigma_{trk,y};#sigma_{trk,y}  [#mum];# hits",100,xMin*10000.,xMax*10000.));
-        i_sector.second.m_sigmaY["sigmaY"   ].push_back(secDir.make<TH1F>(sigmaY.str().c_str(),"residual error #sigma_{r,y};#sigma_{r,y}  [#mum];# hits",100,xMin*10000.,xMax*10000.));
+        sigmaY << "h_sigmaY_" << i_errHists;
+        i_sector.second.m_sigmaY["sigmaYHit"].push_back(
+            secDir.make<TH1F>(sigmaYHit.str().c_str(),
+                              "hit error #sigma_{hit,y};#sigma_{hit,y}  [#mum];# hits",
+                              100,
+                              xMin * 10000.,
+                              xMax * 10000.));
+        i_sector.second.m_sigmaY["sigmaYTrk"].push_back(
+            secDir.make<TH1F>(sigmaYTrk.str().c_str(),
+                              "track error #sigma_{trk,y};#sigma_{trk,y}  [#mum];# hits",
+                              100,
+                              xMin * 10000.,
+                              xMax * 10000.));
+        i_sector.second.m_sigmaY["sigmaY"].push_back(
+            secDir.make<TH1F>(sigmaY.str().c_str(),
+                              "residual error #sigma_{r,y};#sigma_{r,y}  [#mum];# hits",
+                              100,
+                              xMin * 10000.,
+                              xMax * 10000.));
       }
     }
-    
   }
 }
 
-
-
-void
-ApeEstimator::bookSectorHistsForApeCalculation(){
+void ApeEstimator::bookSectorHistsForApeCalculation() {
   std::vector<unsigned int> v_errHists(parameterSet_.getParameter<std::vector<unsigned int> >("vErrHists"));
-  for(std::vector<unsigned int>::iterator i_errHists = v_errHists.begin(); i_errHists != v_errHists.end(); ++i_errHists){
-    for(std::vector<unsigned int>::iterator i_errHists2 = i_errHists; i_errHists2 != v_errHists.end();){
+  for (std::vector<unsigned int>::iterator i_errHists = v_errHists.begin(); i_errHists != v_errHists.end();
+       ++i_errHists) {
+    for (std::vector<unsigned int>::iterator i_errHists2 = i_errHists; i_errHists2 != v_errHists.end();) {
       ++i_errHists2;
-      if(*i_errHists==*i_errHists2){
-        edm::LogError("BookSectorHists")<<"Value of vErrHists in config exists twice: "<<*i_errHists<<"\n... delete one of both";
+      if (*i_errHists == *i_errHists2) {
+        edm::LogError("BookSectorHists") << "Value of vErrHists in config exists twice: " << *i_errHists
+                                         << "\n... delete one of both";
         v_errHists.erase(i_errHists2);
       }
     }
   }
-  
-  for(auto &i_sector : m_tkSector_){
+
+  for (auto& i_sector : m_tkSector_) {
     edm::Service<TFileService> fileService;
-    if(!fileService){
-      throw edm::Exception( edm::errors::Configuration,
-                            "TFileService is not registered in cfg file" );
+    if (!fileService) {
+      throw edm::Exception(edm::errors::Configuration, "TFileService is not registered in cfg file");
     }
-    
-    std::stringstream sector; sector << "Sector_" << i_sector.first;
+
+    std::stringstream sector;
+    sector << "Sector_" << i_sector.first;
     TFileDirectory secDir = fileService->mkdir(sector.str());
-    
+
     // Dummy histo containing the sector name as title
-    i_sector.second.Name = secDir.make<TH1F>("z_name",i_sector.second.name.c_str(),1,0,1);
-    
+    i_sector.second.Name = secDir.make<TH1F>("z_name", i_sector.second.name.c_str(), 1, 0, 1);
+
     // Do not book histos for empty sectors
-    if(i_sector.second.v_rawId.empty()){
+    if (i_sector.second.v_rawId.empty()) {
       continue;
     }
-    
-    
+
     // Distributions in each interval (stay in [cm], to have all calculations in [cm])
-    if(m_resErrBins_.empty()){ // default if no selection taken into account: calculate APE with one bin with residual error 0-100um
+    if (m_resErrBins_
+            .empty()) {  // default if no selection taken into account: calculate APE with one bin with residual error 0-100um
       m_resErrBins_[1].first = 0.;
       m_resErrBins_[1].second = 0.01;
-    } 
-    for(auto const & i_errBins : m_resErrBins_){
-      std::stringstream interval; interval << "Interval_" << i_errBins.first;
+    }
+    for (auto const& i_errBins : m_resErrBins_) {
+      std::stringstream interval;
+      interval << "Interval_" << i_errBins.first;
       TFileDirectory intDir = secDir.mkdir(interval.str());
-      i_sector.second.m_binnedHists[i_errBins.first]["sigmaX"]  = intDir.make<TH1F>("h_sigmaX","residual resolution #sigma_{x};#sigma_{x}  [cm];# hits",100,0.,0.01);
-      i_sector.second.m_binnedHists[i_errBins.first]["norResX"] = intDir.make<TH1F>("h_norResX","normalized residual r_{x}/#sigma_{r,x};(x_{trk}-x_{hit})/#sigma_{r,x};# hits",100,-10,10);
-      if(i_sector.second.isPixel){
-        i_sector.second.m_binnedHists[i_errBins.first]["sigmaY"]  = intDir.make<TH1F>("h_sigmaY","residual resolution #sigma_{y};#sigma_{y}  [cm];# hits",100,0.,0.01);
-        i_sector.second.m_binnedHists[i_errBins.first]["norResY"] = intDir.make<TH1F>("h_norResY","normalized residual r_{y}/#sigma_{r,y};(y_{trk}-y_{hit})/#sigma_{r,y};# hits",100,-10,10);
+      i_sector.second.m_binnedHists[i_errBins.first]["sigmaX"] =
+          intDir.make<TH1F>("h_sigmaX", "residual resolution #sigma_{x};#sigma_{x}  [cm];# hits", 100, 0., 0.01);
+      i_sector.second.m_binnedHists[i_errBins.first]["norResX"] = intDir.make<TH1F>(
+          "h_norResX", "normalized residual r_{x}/#sigma_{r,x};(x_{trk}-x_{hit})/#sigma_{r,x};# hits", 100, -10, 10);
+      if (i_sector.second.isPixel) {
+        i_sector.second.m_binnedHists[i_errBins.first]["sigmaY"] =
+            intDir.make<TH1F>("h_sigmaY", "residual resolution #sigma_{y};#sigma_{y}  [cm];# hits", 100, 0., 0.01);
+        i_sector.second.m_binnedHists[i_errBins.first]["norResY"] = intDir.make<TH1F>(
+            "h_norResY", "normalized residual r_{y}/#sigma_{r,y};(y_{trk}-y_{hit})/#sigma_{r,y};# hits", 100, -10, 10);
       }
     }
-    
-    
+
     TFileDirectory resDir = secDir.mkdir("Results");
-    
+
     // TTree containing rawIds of all modules in sector
     unsigned int rawId(0);
-    i_sector.second.RawId = resDir.make<TTree>("rawIdTree","Tree containing rawIds of all modules in sector");
+    i_sector.second.RawId = resDir.make<TTree>("rawIdTree", "Tree containing rawIds of all modules in sector");
     i_sector.second.RawId->Branch("RawId", &rawId, "RawId/i");
-    for(auto const & i_rawId : i_sector.second.v_rawId){
+    for (auto const& i_rawId : i_sector.second.v_rawId) {
       rawId = i_rawId;
       i_sector.second.RawId->Fill();
     }
-    
+
     // Result plots (one hist per sector containing one bin per interval)
     // (transform errors and residuals from [cm] in [mum])
     std::vector<double> v_binX(parameterSet_.getParameter<std::vector<double> >("residualErrorBinning"));
-    for(auto & i_binX : v_binX){
+    for (auto& i_binX : v_binX) {
       i_binX *= 10000.;
     }
-    i_sector.second.EntriesX = resDir.make<TH1F>("h_entriesX","# hits used;#sigma_{x}  [#mum];# hits",v_binX.size()-1,&(v_binX[0]));
-    if(i_sector.second.isPixel){
-      i_sector.second.EntriesY = resDir.make<TH1F>("h_entriesY","# hits used;#sigma_{y}  [#mum];# hits",v_binX.size()-1,&(v_binX[0]));
+    i_sector.second.EntriesX =
+        resDir.make<TH1F>("h_entriesX", "# hits used;#sigma_{x}  [#mum];# hits", v_binX.size() - 1, &(v_binX[0]));
+    if (i_sector.second.isPixel) {
+      i_sector.second.EntriesY =
+          resDir.make<TH1F>("h_entriesY", "# hits used;#sigma_{y}  [#mum];# hits", v_binX.size() - 1, &(v_binX[0]));
     }
-    
+
     // In fact these are un-needed Analyzer plots, but I want to have them always for every sector visible
     // (transform errors and residuals from [cm] in [mum])
-    i_sector.second.ResX    = resDir.make<TH1F>("h_ResX","residual r_{x};x_{trk}-x_{hit}  [#mum];# hits",100,-0.03*10000.,0.03*10000.);
-    i_sector.second.NorResX = resDir.make<TH1F>("h_NorResX","normalized residual r_{x}/#sigma_{r,x};(x_{trk}-x_{hit})/#sigma_{r,x};# hits",100,-5.,5.);
-    if(i_sector.second.isPixel){
-      i_sector.second.ResY    = resDir.make<TH1F>("h_ResY","residual r_{y};y_{trk}-y_{hit}  [#mum];# hits",100,-0.03*10000.,0.03*10000.);
-      i_sector.second.NorResY = resDir.make<TH1F>("h_NorResY","normalized residual r_{y}/#sigma_{r,y};(y_{trk}-y_{hit})/#sigma_{r,y};# hits",100,-5.,5.);
+    i_sector.second.ResX = resDir.make<TH1F>(
+        "h_ResX", "residual r_{x};x_{trk}-x_{hit}  [#mum];# hits", 100, -0.03 * 10000., 0.03 * 10000.);
+    i_sector.second.NorResX = resDir.make<TH1F>(
+        "h_NorResX", "normalized residual r_{x}/#sigma_{r,x};(x_{trk}-x_{hit})/#sigma_{r,x};# hits", 100, -5., 5.);
+    if (i_sector.second.isPixel) {
+      i_sector.second.ResY = resDir.make<TH1F>(
+          "h_ResY", "residual r_{y};y_{trk}-y_{hit}  [#mum];# hits", 100, -0.03 * 10000., 0.03 * 10000.);
+      i_sector.second.NorResY = resDir.make<TH1F>(
+          "h_NorResY", "normalized residual r_{y}/#sigma_{r,y};(y_{trk}-y_{hit})/#sigma_{r,y};# hits", 100, -5., 5.);
     }
   }
 }
 
-
 // -----------------------------------------------------------------------------------------------------------
 
-void
-ApeEstimator::bookTrackHists(){
+void ApeEstimator::bookTrackHists() {
   bool zoomHists(parameterSet_.getParameter<bool>("zoomHists"));
-  
+
   int trackSizeBins = zoomHists ? 6 : 201;
-  double trackSizeMax = trackSizeBins -1;
-  
+  double trackSizeMax = trackSizeBins - 1;
+
   double chi2Max = zoomHists ? 100. : 2000.;
   double norChi2Max = zoomHists ? 5. : 1000.;
   double d0max = zoomHists ? 0.02 : 40.;  // cosmics: 100.|100.
   double dzmax = zoomHists ? 15. : 100.;  // cosmics: 200.|600.
   double pMax = zoomHists ? 200. : 2000.;
-  
+
   edm::Service<TFileService> fileService;
   TFileDirectory evtDir = fileService->mkdir("EventVariables");
-  tkDetector_.TrkSize     = evtDir.make<TH1F>("h_trackSize","# tracks  [all];# tracks;# events",trackSizeBins,-1,trackSizeMax);
-  tkDetector_.TrkSizeGood = evtDir.make<TH1F>("h_trackSizeGood","# tracks  [good];# tracks;# events",trackSizeBins,-1,trackSizeMax);
+  tkDetector_.TrkSize =
+      evtDir.make<TH1F>("h_trackSize", "# tracks  [all];# tracks;# events", trackSizeBins, -1, trackSizeMax);
+  tkDetector_.TrkSizeGood =
+      evtDir.make<TH1F>("h_trackSizeGood", "# tracks  [good];# tracks;# events", trackSizeBins, -1, trackSizeMax);
   TFileDirectory trkDir = fileService->mkdir("TrackVariables");
-  tkDetector_.HitsSize      = trkDir.make<TH1F>("h_hitsSize","# hits;# hits;# tracks",51,-1,50);
-  tkDetector_.HitsValid     = trkDir.make<TH1F>("h_hitsValid","# hits  [valid];# hits  [valid];# tracks",51,-1,50);
-  tkDetector_.HitsInvalid   = trkDir.make<TH1F>("h_hitsInvalid","# hits  [invalid];# hits  [invalid];# tracks",21,-1,20);
-  tkDetector_.Hits2D        = trkDir.make<TH1F>("h_hits2D","# hits  [2D];# hits  [2D];# tracks",21,-1,20);
-  tkDetector_.LayersMissed  = trkDir.make<TH1F>("h_layersMissed","# layers  [missed];# layers  [missed];# tracks",11,-1,10);
-  tkDetector_.HitsPixel     = trkDir.make<TH1F>("h_hitsPixel","# hits  [pixel];# hits  [pixel];# tracks",11,-1,10);
-  tkDetector_.HitsStrip     = trkDir.make<TH1F>("h_hitsStrip","# hits  [strip];# hits  [strip];# tracks",41,-1,40);
-  tkDetector_.Charge        = trkDir.make<TH1F>("h_charge","charge q;q  [e];# tracks",5,-2,3);
-  tkDetector_.Chi2          = trkDir.make<TH1F>("h_chi2"," #chi^{2};#chi^{2};# tracks",100,0,chi2Max);
-  tkDetector_.Ndof          = trkDir.make<TH1F>("h_ndof","# degrees of freedom f;f;# tracks",101,-1,100);
-  tkDetector_.NorChi2       = trkDir.make<TH1F>("h_norChi2","normalized #chi^{2};#chi^{2}/f;# tracks",200,0,norChi2Max);
-  tkDetector_.Prob          = trkDir.make<TH1F>("h_prob"," #chi^{2} probability;prob(#chi^{2},f);# tracks",50,0,1);
-  tkDetector_.Eta           = trkDir.make<TH1F>("h_eta","pseudorapidity #eta;#eta;# tracks",100,-5,5);
-  tkDetector_.EtaErr        = trkDir.make<TH1F>("h_etaErr","Error of #eta;#sigma(#eta);# tracks",100,0,0.001);
-  tkDetector_.EtaSig        = trkDir.make<TH1F>("h_etaSig","Significance of #eta;#eta/#sigma(#eta);# tracks",100,-20000,20000);
-  tkDetector_.Theta         = trkDir.make<TH1F>("h_theta","polar angle #theta;#theta  [ ^{o}];# tracks",100,-10,190);
-  tkDetector_.Phi           = trkDir.make<TH1F>("h_phi","azimuth angle #phi;#phi  [ ^{o}];# tracks",190,-190,190);
-  tkDetector_.PhiErr        = trkDir.make<TH1F>("h_phiErr","Error of #phi;#sigma(#phi)  [ ^{o}];# tracks",100,0,0.04);
-  tkDetector_.PhiSig        = trkDir.make<TH1F>("h_phiSig","Significance of #phi;#phi/#sigma(#phi)  [ ^{o}];# tracks",100,-50000,50000);
-  tkDetector_.D0Beamspot    = trkDir.make<TH1F>("h_d0Beamspot","Closest approach d_{0} wrt. beamspot;d_{0, BS}  [cm];# tracks",200,-d0max,d0max);
-  tkDetector_.D0BeamspotErr = trkDir.make<TH1F>("h_d0BeamspotErr","Error of d_{0, BS};#sigma(d_{0, BS})  [cm];# tracks",200,0,0.01);
-  tkDetector_.D0BeamspotSig = trkDir.make<TH1F>("h_d0BeamspotSig","Significance of d_{0, BS};d_{0, BS}/#sigma(d_{0, BS});# tracks",100,-5,5);
-  tkDetector_.Dz            = trkDir.make<TH1F>("h_dz","Closest approach d_{z};d_{z}  [cm];# tracks",200,-dzmax,dzmax);
-  tkDetector_.DzErr         = trkDir.make<TH1F>("h_dzErr","Error of d_{z};#sigma(d_{z})  [cm];# tracks",200,0,0.01);
-  tkDetector_.DzSig         = trkDir.make<TH1F>("h_dzSig","Significance of d_{z};d_{z}/#sigma(d_{z});# tracks",100,-10000,10000);
-  tkDetector_.Pt      = trkDir.make<TH1F>("h_pt","transverse momentum p_{t};p_{t}  [GeV];# tracks",100,0,pMax);
-  tkDetector_.PtErr         = trkDir.make<TH1F>("h_ptErr","Error of p_{t};#sigma(p_{t})  [GeV];# tracks",100,0,1.6);
-  tkDetector_.PtSig         = trkDir.make<TH1F>("h_ptSig","Significance of p_{t};p_{t}/#sigma(p_{t});# tracks",100,0,200);
-  tkDetector_.P             = trkDir.make<TH1F>("h_p","momentum magnitude |p|;|p|  [GeV];# tracks",100,0,pMax);
-  tkDetector_.MeanAngle     = trkDir.make<TH1F>("h_meanAngle","mean angle on module <#phi_{module}>;<#phi_{module}>  [ ^{o}];# tracks",100,-5,95);
-  tkDetector_.HitsGood      = trkDir.make<TH1F>("h_hitsGood","# hits  [good];# hits  [good];# tracks",51,-1,50);
-  
-  tkDetector_.MeanAngleVsHits     = trkDir.make<TH2F>("h2_meanAngleVsHits","<#phi_{module}> vs. # hits;# hits;<#phi_{module}>  [ ^{o}]",51,-1,50,50,-5,95);
-  tkDetector_.HitsGoodVsHitsValid = trkDir.make<TH2F>("h2_hitsGoodVsHitsValid","# hits  [good] vs. # hits  [valid];# hits  [valid];# hits  [good]",51,-1,50,51,-1,50);
-  tkDetector_.HitsPixelVsEta      = trkDir.make<TH2F>("h2_hitsPixelVsEta","# hits  [pixel] vs. #eta;#eta;# hits  [pixel]",60,-3,3,11,-1,10);
-  tkDetector_.HitsPixelVsTheta    = trkDir.make<TH2F>("h2_hitsPixelVsTheta","# hits  [pixel] vs. #theta;#theta;# hits  [pixel]",100,-10,190,11,-1,10);
-  tkDetector_.HitsStripVsEta      = trkDir.make<TH2F>("h2_hitsStripVsEta","# hits  [strip] vs. #eta;#eta;# hits  [strip]",60,-3,3,31,-1,40);
-  tkDetector_.HitsStripVsTheta    = trkDir.make<TH2F>("h2_hitsStripVsTheta","# hits  [strip] vs. #theta;#theta;# hits  [strip]",100,-10,190,31,-1,40);
-  tkDetector_.PtVsEta             = trkDir.make<TH2F>("h2_ptVsEta","p_{t} vs. #eta;#eta;p_{t}  [GeV]",60,-3,3,100,0,pMax);
-  tkDetector_.PtVsTheta           = trkDir.make<TH2F>("h2_ptVsTheta","p_{t} vs. #theta;#theta;p_{t}  [GeV]",100,-10,190,100,0,pMax);
-  
-  tkDetector_.PMeanAngleVsHits     = trkDir.make<TProfile>("p_meanAngleVsHits","<#phi_{module}> vs. # hits;# hits;<#phi_{module}>  [ ^{o}]",51,-1,50);
-  tkDetector_.PHitsGoodVsHitsValid = trkDir.make<TProfile>("p_hitsGoodVsHitsValid","# hits  [good] vs. # hits  [valid];# hits  [valid];# hits  [good]",51,-1,50);
-  tkDetector_.PHitsPixelVsEta      = trkDir.make<TProfile>("p_hitsPixelVsEta","# hits  [pixel] vs. #eta;#eta;# hits  [pixel]",60,-3,3);
-  tkDetector_.PHitsPixelVsTheta    = trkDir.make<TProfile>("p_hitsPixelVsTheta","# hits  [pixel] vs. #theta;#theta;# hits  [pixel]",100,-10,190);
-  tkDetector_.PHitsStripVsEta      = trkDir.make<TProfile>("p_hitsStripVsEta","# hits  [strip] vs. #eta;#eta;# hits  [strip]",60,-3,3);
-  tkDetector_.PHitsStripVsTheta    = trkDir.make<TProfile>("p_hitsStripVsTheta","# hits  [strip] vs. #theta;#theta;# hits  [strip]",100,-10,190);
-  tkDetector_.PPtVsEta             = trkDir.make<TProfile>("p_ptVsEta","p_{t} vs. #eta;#eta;p_{t}  [GeV]",60,-3,3);
-  tkDetector_.PPtVsTheta           = trkDir.make<TProfile>("p_ptVsTheta","p_{t} vs. #theta;#theta;p_{t}  [GeV]",100,-10,190);
+  tkDetector_.HitsSize = trkDir.make<TH1F>("h_hitsSize", "# hits;# hits;# tracks", 51, -1, 50);
+  tkDetector_.HitsValid = trkDir.make<TH1F>("h_hitsValid", "# hits  [valid];# hits  [valid];# tracks", 51, -1, 50);
+  tkDetector_.HitsInvalid =
+      trkDir.make<TH1F>("h_hitsInvalid", "# hits  [invalid];# hits  [invalid];# tracks", 21, -1, 20);
+  tkDetector_.Hits2D = trkDir.make<TH1F>("h_hits2D", "# hits  [2D];# hits  [2D];# tracks", 21, -1, 20);
+  tkDetector_.LayersMissed =
+      trkDir.make<TH1F>("h_layersMissed", "# layers  [missed];# layers  [missed];# tracks", 11, -1, 10);
+  tkDetector_.HitsPixel = trkDir.make<TH1F>("h_hitsPixel", "# hits  [pixel];# hits  [pixel];# tracks", 11, -1, 10);
+  tkDetector_.HitsStrip = trkDir.make<TH1F>("h_hitsStrip", "# hits  [strip];# hits  [strip];# tracks", 41, -1, 40);
+  tkDetector_.Charge = trkDir.make<TH1F>("h_charge", "charge q;q  [e];# tracks", 5, -2, 3);
+  tkDetector_.Chi2 = trkDir.make<TH1F>("h_chi2", " #chi^{2};#chi^{2};# tracks", 100, 0, chi2Max);
+  tkDetector_.Ndof = trkDir.make<TH1F>("h_ndof", "# degrees of freedom f;f;# tracks", 101, -1, 100);
+  tkDetector_.NorChi2 = trkDir.make<TH1F>("h_norChi2", "normalized #chi^{2};#chi^{2}/f;# tracks", 200, 0, norChi2Max);
+  tkDetector_.Prob = trkDir.make<TH1F>("h_prob", " #chi^{2} probability;prob(#chi^{2},f);# tracks", 50, 0, 1);
+  tkDetector_.Eta = trkDir.make<TH1F>("h_eta", "pseudorapidity #eta;#eta;# tracks", 100, -5, 5);
+  tkDetector_.EtaErr = trkDir.make<TH1F>("h_etaErr", "Error of #eta;#sigma(#eta);# tracks", 100, 0, 0.001);
+  tkDetector_.EtaSig =
+      trkDir.make<TH1F>("h_etaSig", "Significance of #eta;#eta/#sigma(#eta);# tracks", 100, -20000, 20000);
+  tkDetector_.Theta = trkDir.make<TH1F>("h_theta", "polar angle #theta;#theta  [ ^{o}];# tracks", 100, -10, 190);
+  tkDetector_.Phi = trkDir.make<TH1F>("h_phi", "azimuth angle #phi;#phi  [ ^{o}];# tracks", 190, -190, 190);
+  tkDetector_.PhiErr = trkDir.make<TH1F>("h_phiErr", "Error of #phi;#sigma(#phi)  [ ^{o}];# tracks", 100, 0, 0.04);
+  tkDetector_.PhiSig =
+      trkDir.make<TH1F>("h_phiSig", "Significance of #phi;#phi/#sigma(#phi)  [ ^{o}];# tracks", 100, -50000, 50000);
+  tkDetector_.D0Beamspot = trkDir.make<TH1F>(
+      "h_d0Beamspot", "Closest approach d_{0} wrt. beamspot;d_{0, BS}  [cm];# tracks", 200, -d0max, d0max);
+  tkDetector_.D0BeamspotErr =
+      trkDir.make<TH1F>("h_d0BeamspotErr", "Error of d_{0, BS};#sigma(d_{0, BS})  [cm];# tracks", 200, 0, 0.01);
+  tkDetector_.D0BeamspotSig = trkDir.make<TH1F>(
+      "h_d0BeamspotSig", "Significance of d_{0, BS};d_{0, BS}/#sigma(d_{0, BS});# tracks", 100, -5, 5);
+  tkDetector_.Dz = trkDir.make<TH1F>("h_dz", "Closest approach d_{z};d_{z}  [cm];# tracks", 200, -dzmax, dzmax);
+  tkDetector_.DzErr = trkDir.make<TH1F>("h_dzErr", "Error of d_{z};#sigma(d_{z})  [cm];# tracks", 200, 0, 0.01);
+  tkDetector_.DzSig =
+      trkDir.make<TH1F>("h_dzSig", "Significance of d_{z};d_{z}/#sigma(d_{z});# tracks", 100, -10000, 10000);
+  tkDetector_.Pt = trkDir.make<TH1F>("h_pt", "transverse momentum p_{t};p_{t}  [GeV];# tracks", 100, 0, pMax);
+  tkDetector_.PtErr = trkDir.make<TH1F>("h_ptErr", "Error of p_{t};#sigma(p_{t})  [GeV];# tracks", 100, 0, 1.6);
+  tkDetector_.PtSig = trkDir.make<TH1F>("h_ptSig", "Significance of p_{t};p_{t}/#sigma(p_{t});# tracks", 100, 0, 200);
+  tkDetector_.P = trkDir.make<TH1F>("h_p", "momentum magnitude |p|;|p|  [GeV];# tracks", 100, 0, pMax);
+  tkDetector_.MeanAngle = trkDir.make<TH1F>(
+      "h_meanAngle", "mean angle on module <#phi_{module}>;<#phi_{module}>  [ ^{o}];# tracks", 100, -5, 95);
+  tkDetector_.HitsGood = trkDir.make<TH1F>("h_hitsGood", "# hits  [good];# hits  [good];# tracks", 51, -1, 50);
+
+  tkDetector_.MeanAngleVsHits = trkDir.make<TH2F>(
+      "h2_meanAngleVsHits", "<#phi_{module}> vs. # hits;# hits;<#phi_{module}>  [ ^{o}]", 51, -1, 50, 50, -5, 95);
+  tkDetector_.HitsGoodVsHitsValid =
+      trkDir.make<TH2F>("h2_hitsGoodVsHitsValid",
+                        "# hits  [good] vs. # hits  [valid];# hits  [valid];# hits  [good]",
+                        51,
+                        -1,
+                        50,
+                        51,
+                        -1,
+                        50);
+  tkDetector_.HitsPixelVsEta =
+      trkDir.make<TH2F>("h2_hitsPixelVsEta", "# hits  [pixel] vs. #eta;#eta;# hits  [pixel]", 60, -3, 3, 11, -1, 10);
+  tkDetector_.HitsPixelVsTheta = trkDir.make<TH2F>(
+      "h2_hitsPixelVsTheta", "# hits  [pixel] vs. #theta;#theta;# hits  [pixel]", 100, -10, 190, 11, -1, 10);
+  tkDetector_.HitsStripVsEta =
+      trkDir.make<TH2F>("h2_hitsStripVsEta", "# hits  [strip] vs. #eta;#eta;# hits  [strip]", 60, -3, 3, 31, -1, 40);
+  tkDetector_.HitsStripVsTheta = trkDir.make<TH2F>(
+      "h2_hitsStripVsTheta", "# hits  [strip] vs. #theta;#theta;# hits  [strip]", 100, -10, 190, 31, -1, 40);
+  tkDetector_.PtVsEta = trkDir.make<TH2F>("h2_ptVsEta", "p_{t} vs. #eta;#eta;p_{t}  [GeV]", 60, -3, 3, 100, 0, pMax);
+  tkDetector_.PtVsTheta =
+      trkDir.make<TH2F>("h2_ptVsTheta", "p_{t} vs. #theta;#theta;p_{t}  [GeV]", 100, -10, 190, 100, 0, pMax);
+
+  tkDetector_.PMeanAngleVsHits = trkDir.make<TProfile>(
+      "p_meanAngleVsHits", "<#phi_{module}> vs. # hits;# hits;<#phi_{module}>  [ ^{o}]", 51, -1, 50);
+  tkDetector_.PHitsGoodVsHitsValid = trkDir.make<TProfile>(
+      "p_hitsGoodVsHitsValid", "# hits  [good] vs. # hits  [valid];# hits  [valid];# hits  [good]", 51, -1, 50);
+  tkDetector_.PHitsPixelVsEta =
+      trkDir.make<TProfile>("p_hitsPixelVsEta", "# hits  [pixel] vs. #eta;#eta;# hits  [pixel]", 60, -3, 3);
+  tkDetector_.PHitsPixelVsTheta =
+      trkDir.make<TProfile>("p_hitsPixelVsTheta", "# hits  [pixel] vs. #theta;#theta;# hits  [pixel]", 100, -10, 190);
+  tkDetector_.PHitsStripVsEta =
+      trkDir.make<TProfile>("p_hitsStripVsEta", "# hits  [strip] vs. #eta;#eta;# hits  [strip]", 60, -3, 3);
+  tkDetector_.PHitsStripVsTheta =
+      trkDir.make<TProfile>("p_hitsStripVsTheta", "# hits  [strip] vs. #theta;#theta;# hits  [strip]", 100, -10, 190);
+  tkDetector_.PPtVsEta = trkDir.make<TProfile>("p_ptVsEta", "p_{t} vs. #eta;#eta;p_{t}  [GeV]", 60, -3, 3);
+  tkDetector_.PPtVsTheta = trkDir.make<TProfile>("p_ptVsTheta", "p_{t} vs. #theta;#theta;p_{t}  [GeV]", 100, -10, 190);
 }
 
-
-
 // -----------------------------------------------------------------------------------------------------------
 
+TrackStruct::TrackParameterStruct ApeEstimator::fillTrackVariables(const reco::Track& track,
+                                                                   const Trajectory& traj,
+                                                                   const reco::BeamSpot& beamSpot) {
+  const math::XYZPoint beamPoint(beamSpot.x0(), beamSpot.y0(), beamSpot.z0());
+  double d0BeamspotErr =
+      std::sqrt(track.d0Error() * track.d0Error() + 0.5 * beamSpot.BeamWidthX() * beamSpot.BeamWidthX() +
+                0.5 * beamSpot.BeamWidthY() * beamSpot.BeamWidthY());
 
-TrackStruct::TrackParameterStruct
-ApeEstimator::fillTrackVariables(const reco::Track& track, const Trajectory& traj, const reco::BeamSpot& beamSpot){
-  const math::XYZPoint beamPoint(beamSpot.x0(),beamSpot.y0(), beamSpot.z0());
-  double d0BeamspotErr = std::sqrt( track.d0Error()*track.d0Error() + 0.5*beamSpot.BeamWidthX()*beamSpot.BeamWidthX() + 0.5*beamSpot.BeamWidthY()*beamSpot.BeamWidthY() );
-  
   const static TrajectoryStateCombiner tsoscomb;
-  
+
   const reco::HitPattern& hitPattern(track.hitPattern());
-  
+
   TrackStruct::TrackParameterStruct trkParams;
-  
-  trkParams.hitsSize      = track.recHitsSize();
-  trkParams.hitsValid     = track.found(); // invalid is every hit from every single module that expects a hit
-  trkParams.hitsInvalid   = trkParams.hitsSize-trkParams.hitsValid;
-  trkParams.layersMissed  = track.lost();  // lost hit means, that a crossed layer doesn't contain a hit (can be more than one invalid hit)
-  trkParams.hitsPixel     = hitPattern.numberOfValidPixelHits();
-  trkParams.hitsStrip     = hitPattern.numberOfValidStripHits();
-  trkParams.charge        = track.charge();
-  trkParams.chi2          = track.chi2();
-  trkParams.ndof          = track.ndof();
-  trkParams.norChi2       = trkParams.chi2/trkParams.ndof;
-  trkParams.prob          = TMath::Prob(trkParams.chi2,trkParams.ndof);
-  trkParams.eta           = track.eta();
-  trkParams.etaErr        = track.etaError();
-  trkParams.theta         = track.theta();
-  trkParams.phi           = track.phi();
-  trkParams.phiErr        = track.phiError();
-  trkParams.d0            = track.d0();
-  trkParams.d0Beamspot    = -1.*track.dxy(beamPoint);
+
+  trkParams.hitsSize = track.recHitsSize();
+  trkParams.hitsValid = track.found();  // invalid is every hit from every single module that expects a hit
+  trkParams.hitsInvalid = trkParams.hitsSize - trkParams.hitsValid;
+  trkParams.layersMissed =
+      track.lost();  // lost hit means, that a crossed layer doesn't contain a hit (can be more than one invalid hit)
+  trkParams.hitsPixel = hitPattern.numberOfValidPixelHits();
+  trkParams.hitsStrip = hitPattern.numberOfValidStripHits();
+  trkParams.charge = track.charge();
+  trkParams.chi2 = track.chi2();
+  trkParams.ndof = track.ndof();
+  trkParams.norChi2 = trkParams.chi2 / trkParams.ndof;
+  trkParams.prob = TMath::Prob(trkParams.chi2, trkParams.ndof);
+  trkParams.eta = track.eta();
+  trkParams.etaErr = track.etaError();
+  trkParams.theta = track.theta();
+  trkParams.phi = track.phi();
+  trkParams.phiErr = track.phiError();
+  trkParams.d0 = track.d0();
+  trkParams.d0Beamspot = -1. * track.dxy(beamPoint);
   trkParams.d0BeamspotErr = d0BeamspotErr;
-  trkParams.dz            = track.dz();
-  trkParams.dzErr         = track.dzError();
-  trkParams.dzBeamspot    = track.dz(beamPoint);
-  trkParams.p             = track.p();
-  trkParams.pt            = track.pt();
-  trkParams.ptErr         = track.ptError();
-  
+  trkParams.dz = track.dz();
+  trkParams.dzErr = track.dzError();
+  trkParams.dzBeamspot = track.dz(beamPoint);
+  trkParams.p = track.p();
+  trkParams.pt = track.pt();
+  trkParams.ptErr = track.ptError();
+
   const std::vector<TrajectoryMeasurement>& v_meas = traj.measurements();
-     
-  int count2D(0); float meanPhiSensToNorm(0.F);
-  for(auto const & i_meas : v_meas){     
+
+  int count2D(0);
+  float meanPhiSensToNorm(0.F);
+  for (auto const& i_meas : v_meas) {
     const TrajectoryMeasurement& meas = i_meas;
     const TransientTrackingRecHit& hit = *meas.recHit();
     const TrackingRecHit& recHit = *hit.hit();
-    if(this->isHit2D(recHit)) ++count2D;
-    
-    TrajectoryStateOnSurface tsos = tsoscomb(meas.forwardPredictedState(),meas.backwardPredictedState());
+    if (this->isHit2D(recHit))
+      ++count2D;
+
+    TrajectoryStateOnSurface tsos = tsoscomb(meas.forwardPredictedState(), meas.backwardPredictedState());
     const align::LocalVector mom(tsos.localDirection());
-    meanPhiSensToNorm += atan(fabs(sqrt(mom.x()*mom.x()+mom.y()*mom.y())/mom.z()));
+    meanPhiSensToNorm += atan(fabs(sqrt(mom.x() * mom.x() + mom.y() * mom.y()) / mom.z()));
   }
-  meanPhiSensToNorm *= (1./static_cast<float>(trkParams.hitsSize));
-  
-  trkParams.hits2D            = count2D;
+  meanPhiSensToNorm *= (1. / static_cast<float>(trkParams.hitsSize));
+
+  trkParams.hits2D = count2D;
   trkParams.meanPhiSensToNorm = meanPhiSensToNorm;
-  
-  if(parameterSet_.getParameter<bool>("applyTrackCuts")){
+
+  if (parameterSet_.getParameter<bool>("applyTrackCuts")) {
     trackCut_ = false;
-    if(trkParams.hitsStrip<11 || trkParams.hits2D<2 || trkParams.hitsPixel<2 || //trkParams.hitsInvalid>2 ||
-       trkParams.hitsStrip>35 || trkParams.hitsPixel>7 ||
-       trkParams.norChi2>5. ||
-       trkParams.pt<25. || trkParams.pt>150. || 
-       std::abs(trkParams.d0Beamspot)>0.02 || std::abs(trkParams.dz)>15.)trackCut_ = true;
-  }
-  else{
+    if (trkParams.hitsStrip < 11 || trkParams.hits2D < 2 || trkParams.hitsPixel < 2 ||  //trkParams.hitsInvalid>2 ||
+        trkParams.hitsStrip > 35 || trkParams.hitsPixel > 7 || trkParams.norChi2 > 5. || trkParams.pt < 25. ||
+        trkParams.pt > 150. || std::abs(trkParams.d0Beamspot) > 0.02 || std::abs(trkParams.dz) > 15.)
+      trackCut_ = true;
+  } else {
     trackCut_ = false;
   }
-  
+
   return trkParams;
 }
 
-
-
-TrackStruct::HitParameterStruct
-ApeEstimator::fillHitVariables(const TrajectoryMeasurement& i_meas, const edm::EventSetup& iSetup){
+TrackStruct::HitParameterStruct ApeEstimator::fillHitVariables(const TrajectoryMeasurement& i_meas,
+                                                               const edm::EventSetup& iSetup) {
   TrackStruct::HitParameterStruct hitParams;
-  
+
   const static TrajectoryStateCombiner tsoscomb;
-  
+
   const TrajectoryMeasurement& meas = i_meas;
   const TransientTrackingRecHit& hit = *meas.recHit();
   const TrackingRecHit& recHit = *hit.hit();
-  const TrajectoryStateOnSurface& tsos = tsoscomb(meas.forwardPredictedState(),meas.backwardPredictedState());
-  
+  const TrajectoryStateOnSurface& tsos = tsoscomb(meas.forwardPredictedState(), meas.backwardPredictedState());
+
   const DetId& detId(hit.geographicalId());
-  const DetId::Detector& detector = detId.det(); if(detector != DetId::Tracker){hitParams.hitState = TrackStruct::notInTracker; return hitParams;}
+  const DetId::Detector& detector = detId.det();
+  if (detector != DetId::Tracker) {
+    hitParams.hitState = TrackStruct::notInTracker;
+    return hitParams;
+  }
   const uint32_t rawId(detId.rawId());
-  
-  for(auto & i_sector : m_tkSector_){
-    for(auto const & i_rawId : i_sector.second.v_rawId){
-      if(rawId==i_rawId){hitParams.v_sector.push_back(i_sector.first); break;}
+
+  for (auto& i_sector : m_tkSector_) {
+    for (auto const& i_rawId : i_sector.second.v_rawId) {
+      if (rawId == i_rawId) {
+        hitParams.v_sector.push_back(i_sector.first);
+        break;
+      }
     }
   }
- 
+
   const align::LocalVector& mom(tsos.localDirection());
   int xMomentum(0), yMomentum(0), zMomentum(0);
-  xMomentum = mom.x()>0. ? 1 : -1;
-  yMomentum = mom.y()>0. ? 1 : -1;
-  zMomentum = mom.z()>0. ? 1 : -1;
-  float phiSensX = std::atan(std::fabs(mom.x()/mom.z()))*static_cast<float>(m_tkTreeVar_[rawId].vDirection);  // check for orientation of E- and B- Field (thoughts for barrel)
-  float phiSensY = std::atan(std::fabs(mom.y()/mom.z()))*static_cast<float>(m_tkTreeVar_[rawId].vDirection);
-  hitParams.phiSens  = std::atan(std::fabs(std::sqrt(mom.x()*mom.x()+mom.y()*mom.y())/mom.z()));
-  hitParams.phiSensX = (xMomentum==zMomentum ? phiSensX : -phiSensX );
-  hitParams.phiSensY = (yMomentum==zMomentum ? phiSensY : -phiSensY );
-  
-  if(!hit.isValid()){
-    hitParams.hitState = TrackStruct::invalid; 
+  xMomentum = mom.x() > 0. ? 1 : -1;
+  yMomentum = mom.y() > 0. ? 1 : -1;
+  zMomentum = mom.z() > 0. ? 1 : -1;
+  float phiSensX =
+      std::atan(std::fabs(mom.x() / mom.z())) *
+      static_cast<float>(
+          m_tkTreeVar_[rawId].vDirection);  // check for orientation of E- and B- Field (thoughts for barrel)
+  float phiSensY = std::atan(std::fabs(mom.y() / mom.z())) * static_cast<float>(m_tkTreeVar_[rawId].vDirection);
+  hitParams.phiSens = std::atan(std::fabs(std::sqrt(mom.x() * mom.x() + mom.y() * mom.y()) / mom.z()));
+  hitParams.phiSensX = (xMomentum == zMomentum ? phiSensX : -phiSensX);
+  hitParams.phiSensY = (yMomentum == zMomentum ? phiSensY : -phiSensY);
+
+  if (!hit.isValid()) {
+    hitParams.hitState = TrackStruct::invalid;
     return hitParams;
   }
-  
+
   // Get local positions and errors of hit and track
   const LocalPoint& lPHit = hit.localPosition();
   const LocalPoint& lPTrk = tsos.localPosition();
-  
+
   // use APE also for the hit error, while APE is automatically included in tsos error
   //
   //  no need to add  APE to hitError anymore by Ajay 27 Oct 2014
   const LocalError& errHitApe = hit.localPositionError();  // now sum of CPE+APE as said by MARCO?
   LocalError errorWithoutAPE;
-  
+
   bool Pixel(false);
   bool Strip(false);
 
-  if(       m_tkTreeVar_[rawId].subdetId==PixelSubdetector::PixelBarrel || m_tkTreeVar_[rawId].subdetId==PixelSubdetector::PixelEndcap){
+  if (m_tkTreeVar_[rawId].subdetId == PixelSubdetector::PixelBarrel ||
+      m_tkTreeVar_[rawId].subdetId == PixelSubdetector::PixelEndcap) {
     Pixel = true;
-  }else if( m_tkTreeVar_[rawId].subdetId==StripSubdetector::TIB || m_tkTreeVar_[rawId].subdetId==StripSubdetector::TOB ||
-            m_tkTreeVar_[rawId].subdetId==StripSubdetector::TID || m_tkTreeVar_[rawId].subdetId==StripSubdetector::TEC){
+  } else if (m_tkTreeVar_[rawId].subdetId == StripSubdetector::TIB ||
+             m_tkTreeVar_[rawId].subdetId == StripSubdetector::TOB ||
+             m_tkTreeVar_[rawId].subdetId == StripSubdetector::TID ||
+             m_tkTreeVar_[rawId].subdetId == StripSubdetector::TEC) {
     Strip = true;
-  }else{ 
-    edm::LogWarning("FillHitVariables")<<"cant identify wether hit is from pixel or strip";
-    hitParams.hitState = TrackStruct::invalid; return hitParams;
+  } else {
+    edm::LogWarning("FillHitVariables") << "cant identify wether hit is from pixel or strip";
+    hitParams.hitState = TrackStruct::invalid;
+    return hitParams;
   }
 
-  if(!hit.detUnit()){
-    hitParams.hitState = TrackStruct::invalid; 
+  if (!hit.detUnit()) {
+    hitParams.hitState = TrackStruct::invalid;
     return hitParams;
-  } // is it a single physical module?
+  }  // is it a single physical module?
   const GeomDetUnit& detUnit = *hit.detUnit();
 
-  if(Pixel){
-    if(!dynamic_cast<const PixelTopology*>(&detUnit.type().topology())){
-      hitParams.hitState = TrackStruct::invalid; 
+  if (Pixel) {
+    if (!dynamic_cast<const PixelTopology*>(&detUnit.type().topology())) {
+      hitParams.hitState = TrackStruct::invalid;
       return hitParams;
     }
-    const PixelGeomDetUnit * pixelDet = (const PixelGeomDetUnit*)(&detUnit);
+    const PixelGeomDetUnit* pixelDet = (const PixelGeomDetUnit*)(&detUnit);
     const LocalError& lape = pixelDet->localAlignmentError();
-    if (lape.valid()){ 
-      errorWithoutAPE = LocalError(errHitApe.xx() -lape.xx(), errHitApe.xy()- lape.xy(), errHitApe.yy()-lape.yy());
+    if (lape.valid()) {
+      errorWithoutAPE = LocalError(errHitApe.xx() - lape.xx(), errHitApe.xy() - lape.xy(), errHitApe.yy() - lape.yy());
     }
   }
-  if(Strip){
-    if(!dynamic_cast<const StripTopology*>(&detUnit.type().topology())){
-      hitParams.hitState = TrackStruct::invalid; 
+  if (Strip) {
+    if (!dynamic_cast<const StripTopology*>(&detUnit.type().topology())) {
+      hitParams.hitState = TrackStruct::invalid;
       return hitParams;
     }
-    const StripGeomDetUnit * stripDet = (const StripGeomDetUnit*)(&detUnit);
+    const StripGeomDetUnit* stripDet = (const StripGeomDetUnit*)(&detUnit);
     const LocalError& lape = stripDet->localAlignmentError();
-    if (lape.valid())
-              { errorWithoutAPE = LocalError(errHitApe.xx() -lape.xx(), errHitApe.xy()- lape.xy(), errHitApe.yy()-lape.yy());
+    if (lape.valid()) {
+      errorWithoutAPE = LocalError(errHitApe.xx() - lape.xx(), errHitApe.xy() - lape.xy(), errHitApe.yy() - lape.yy());
     }
   }
 
-
   const LocalError& errHitWoApe = errorWithoutAPE;
   const LocalError& errTrk = tsos.localError().positionError();
-  
+
   const StatePositionAndError2 positionAndError2Hit = this->positionAndError2(lPHit, errHitApe, hit);
   const StatePositionAndError2 positionAndError2HitWoApe = this->positionAndError2(lPHit, errHitWoApe, hit);
-  edm::LogInfo("CalculateAPE")<<"errHitWoApe  "<<errHitWoApe<<"errHitApe  "<<errHitApe;
+  edm::LogInfo("CalculateAPE") << "errHitWoApe  " << errHitWoApe << "errHitApe  " << errHitApe;
 
   const StatePositionAndError2 positionAndError2Trk = this->positionAndError2(lPTrk, errTrk, hit);
-  
+
   const TrackStruct::HitState& stateHit(positionAndError2Hit.first);
   const TrackStruct::HitState& stateHitWoApe(positionAndError2HitWoApe.first);
   const TrackStruct::HitState& stateTrk(positionAndError2Trk.first);
-  
-  if(stateHit==TrackStruct::invalid || stateHitWoApe==TrackStruct::invalid || stateTrk==TrackStruct::invalid){
+
+  if (stateHit == TrackStruct::invalid || stateHitWoApe == TrackStruct::invalid || stateTrk == TrackStruct::invalid) {
     hitParams.hitState = TrackStruct::invalid;
     return hitParams;
-  }else if(stateHit==TrackStruct::negativeError || stateHitWoApe==TrackStruct::negativeError || stateTrk==TrackStruct::negativeError){
+  } else if (stateHit == TrackStruct::negativeError || stateHitWoApe == TrackStruct::negativeError ||
+             stateTrk == TrackStruct::negativeError) {
     ++counter1;
     // Do not print error message by default
     //std::stringstream ss_error;
@@ -1143,265 +1467,271 @@ ApeEstimator::fillHitVariables(const TrajectoryMeasurement& i_meas, const edm::E
     hitParams.hitState = TrackStruct::negativeError;
     return hitParams;
   }
-  
-  
+
   // Calculate residuals
-  
+
   const float xHit = positionAndError2Hit.second.posX;
   const float xTrk = positionAndError2Trk.second.posX;
   const float yHit = positionAndError2Hit.second.posY;
   const float yTrk = positionAndError2Trk.second.posY;
-  
+
   const float errXHit2(positionAndError2Hit.second.errX2);
   const float errXHitWoApe2(positionAndError2HitWoApe.second.errX2);
   const float errXTrk2(positionAndError2Trk.second.errX2);
   const float errYHit2(positionAndError2Hit.second.errY2);
   const float errYHitWoApe2(positionAndError2HitWoApe.second.errY2);
   const float errYTrk2(positionAndError2Trk.second.errY2);
-  
+
   const float errXHit = std::sqrt(positionAndError2Hit.second.errX2);
   const float errXHitWoApe = std::sqrt(positionAndError2HitWoApe.second.errX2);
   const float errXTrk = std::sqrt(positionAndError2Trk.second.errX2);
   const float errYHit = std::sqrt(positionAndError2Hit.second.errY2);
   const float errYHitWoApe = std::sqrt(positionAndError2HitWoApe.second.errY2);
   const float errYTrk = std::sqrt(positionAndError2Trk.second.errY2);
-  
+
   const float resX = xTrk - xHit;
   const float resY = yTrk - yHit;
-  
+
   const float errX = std::sqrt(errXHit2 + errXTrk2);
   const float errXWoApe2 = errXHitWoApe2 + errXTrk2;
   const float errXWoApe = std::sqrt(errXWoApe2);
   const float errY = std::sqrt(errYHit2 + errYTrk2);
   const float errYWoApe2 = errYHitWoApe2 + errYTrk2;
   const float errYWoApe = std::sqrt(errYWoApe2);
-  
-  const float norResX = resX/errX;
-  const float norResY = resY/errY;
-  
-    
+
+  const float norResX = resX / errX;
+  const float norResY = resY / errY;
+
   // Take global orientation into account for residuals (sign is not important for errors)
-  
+
   float resXprime(999.F), resYprime(999.F), norResXprime(999.F), norResYprime(999.F);
-  if(m_tkTreeVar_[rawId].uDirection == 1){
-    resXprime = resX; 
+  if (m_tkTreeVar_[rawId].uDirection == 1) {
+    resXprime = resX;
     norResXprime = norResX;
-  }else if(m_tkTreeVar_[rawId].uDirection == -1){
-    resXprime = -resX; 
+  } else if (m_tkTreeVar_[rawId].uDirection == -1) {
+    resXprime = -resX;
     norResXprime = -norResX;
-  }else{
-    edm::LogError("FillHitVariables")<<"Incorrect value of uDirection, which gives global module orientation"; 
-    hitParams.hitState = TrackStruct::invalid; 
+  } else {
+    edm::LogError("FillHitVariables") << "Incorrect value of uDirection, which gives global module orientation";
+    hitParams.hitState = TrackStruct::invalid;
     return hitParams;
   }
-  if(m_tkTreeVar_[rawId].vDirection == 1){
-    resYprime = resY; 
+  if (m_tkTreeVar_[rawId].vDirection == 1) {
+    resYprime = resY;
     norResYprime = norResY;
-  }else if(m_tkTreeVar_[rawId].vDirection == -1){
-    resYprime = -resY; 
+  } else if (m_tkTreeVar_[rawId].vDirection == -1) {
+    resYprime = -resY;
     norResYprime = -norResY;
-  }else{
-    edm::LogError("FillHitVariables")<<"Incorrect value of vDirection, which gives global module orientation"; 
-    hitParams.hitState = TrackStruct::invalid; 
+  } else {
+    edm::LogError("FillHitVariables") << "Incorrect value of vDirection, which gives global module orientation";
+    hitParams.hitState = TrackStruct::invalid;
     return hitParams;
   }
-  
+
   hitParams.xHit = xHit;
   hitParams.xTrk = xTrk;
-  
+
   hitParams.errXHit = errXHit;
   hitParams.errXHitWoApe = errXHitWoApe;
   hitParams.errXTrk = errXTrk;
-  
-  hitParams.errX2 = errX*errX;
+
+  hitParams.errX2 = errX * errX;
   hitParams.errX = errX;
   hitParams.errXWoApe = errXWoApe;
 
   hitParams.resX = resXprime;
   hitParams.norResX = norResXprime;
-  
-  const float norResX2(norResXprime*norResXprime);
-  hitParams.probX = TMath::Prob(norResX2,1);
-  
-  
+
+  const float norResX2(norResXprime * norResXprime);
+  hitParams.probX = TMath::Prob(norResX2, 1);
+
   hitParams.yHit = yHit;
   hitParams.yTrk = yTrk;
-  
+
   hitParams.errYHit = errYHit;
   hitParams.errYHitWoApe = errYHitWoApe;
   hitParams.errYTrk = errYTrk;
-  
-  hitParams.errY2 = errY*errY;
+
+  hitParams.errY2 = errY * errY;
   hitParams.errY = errY;
   hitParams.errYWoApe = errYWoApe;
 
   hitParams.resY = resYprime;
   hitParams.norResY = norResYprime;
-  
-  const float norResY2(norResYprime*norResYprime);
-  hitParams.probY = TMath::Prob(norResY2,1);
-  
-  
+
+  const float norResY2(norResYprime * norResYprime);
+  hitParams.probY = TMath::Prob(norResY2, 1);
+
   // Cluster parameters
-  
-  if(m_tkTreeVar_[rawId].subdetId==PixelSubdetector::PixelBarrel || m_tkTreeVar_[rawId].subdetId==PixelSubdetector::PixelEndcap){
+
+  if (m_tkTreeVar_[rawId].subdetId == PixelSubdetector::PixelBarrel ||
+      m_tkTreeVar_[rawId].subdetId == PixelSubdetector::PixelEndcap) {
     const SiPixelRecHit& pixelHit = dynamic_cast<const SiPixelRecHit&>(recHit);
     const SiPixelCluster& pixelCluster = *pixelHit.cluster();
-    
+
     hitParams.chargePixel = pixelCluster.charge();
     hitParams.widthX = pixelCluster.sizeX();
     hitParams.baryStripX = pixelCluster.x();
     hitParams.widthY = pixelCluster.sizeY();
     hitParams.baryStripY = pixelCluster.y();
-    
+
     hitParams.clusterProbabilityXY = pixelHit.clusterProbability(0);
     hitParams.clusterProbabilityQ = pixelHit.clusterProbability(2);
     hitParams.clusterProbabilityXYQ = pixelHit.clusterProbability(1);
     hitParams.logClusterProbability = std::log10(hitParams.clusterProbabilityXY);
-    
+
     hitParams.isOnEdge = pixelHit.isOnEdge();
     hitParams.hasBadPixels = pixelHit.hasBadPixels();
     hitParams.spansTwoRoc = pixelHit.spansTwoROCs();
     hitParams.qBin = pixelHit.qBin();
-    
+
     hitParams.isPixelHit = true;
-  }else if( m_tkTreeVar_[rawId].subdetId==StripSubdetector::TIB || m_tkTreeVar_[rawId].subdetId==StripSubdetector::TOB ||
-            m_tkTreeVar_[rawId].subdetId==StripSubdetector::TID || m_tkTreeVar_[rawId].subdetId==StripSubdetector::TEC){
-    if(!(dynamic_cast<const SiStripRecHit2D*>(&recHit) || dynamic_cast<const SiStripRecHit1D*>(&recHit))){
-      edm::LogError("FillHitVariables")<<"RecHit in Strip is 'Matched' or 'Projected', but here all should be monohits per module";
-      hitParams.hitState = TrackStruct::invalid; return hitParams;
+  } else if (m_tkTreeVar_[rawId].subdetId == StripSubdetector::TIB ||
+             m_tkTreeVar_[rawId].subdetId == StripSubdetector::TOB ||
+             m_tkTreeVar_[rawId].subdetId == StripSubdetector::TID ||
+             m_tkTreeVar_[rawId].subdetId == StripSubdetector::TEC) {
+    if (!(dynamic_cast<const SiStripRecHit2D*>(&recHit) || dynamic_cast<const SiStripRecHit1D*>(&recHit))) {
+      edm::LogError("FillHitVariables")
+          << "RecHit in Strip is 'Matched' or 'Projected', but here all should be monohits per module";
+      hitParams.hitState = TrackStruct::invalid;
+      return hitParams;
     }
     const SiStripCluster* clusterPtr(nullptr);
-    if( m_tkTreeVar_[rawId].subdetId==StripSubdetector::TIB || m_tkTreeVar_[rawId].subdetId==StripSubdetector::TOB){
-      if(dynamic_cast<const SiStripRecHit1D*>(&recHit)){
+    if (m_tkTreeVar_[rawId].subdetId == StripSubdetector::TIB ||
+        m_tkTreeVar_[rawId].subdetId == StripSubdetector::TOB) {
+      if (dynamic_cast<const SiStripRecHit1D*>(&recHit)) {
         const SiStripRecHit1D& stripHit = dynamic_cast<const SiStripRecHit1D&>(recHit);
         clusterPtr = &(*stripHit.cluster());
-      }else if(dynamic_cast<const SiStripRecHit2D*>(&recHit)){
-        edm::LogWarning("FillHitVariables")<<"Data has TIB/TOB hits as SiStripRecHit2D and not 1D. Probably data is processed with CMSSW<34X. Nevertheless everything should work fine";
+      } else if (dynamic_cast<const SiStripRecHit2D*>(&recHit)) {
+        edm::LogWarning("FillHitVariables") << "Data has TIB/TOB hits as SiStripRecHit2D and not 1D. Probably data is "
+                                               "processed with CMSSW<34X. Nevertheless everything should work fine";
         const SiStripRecHit2D& stripHit = dynamic_cast<const SiStripRecHit2D&>(recHit);
         clusterPtr = &(*stripHit.cluster());
       }
-    }else if( m_tkTreeVar_[rawId].subdetId==StripSubdetector::TID || m_tkTreeVar_[rawId].subdetId==StripSubdetector::TEC){
-       const SiStripRecHit2D& stripHit = dynamic_cast<const SiStripRecHit2D&>(recHit);
-       clusterPtr = &(*stripHit.cluster());
+    } else if (m_tkTreeVar_[rawId].subdetId == StripSubdetector::TID ||
+               m_tkTreeVar_[rawId].subdetId == StripSubdetector::TEC) {
+      const SiStripRecHit2D& stripHit = dynamic_cast<const SiStripRecHit2D&>(recHit);
+      clusterPtr = &(*stripHit.cluster());
     }
-    if(!clusterPtr){
-      edm::LogError("FillHitVariables")<<"Pointer to cluster not valid!!! This should never happen...";
-      hitParams.hitState = TrackStruct::invalid; return hitParams;
+    if (!clusterPtr) {
+      edm::LogError("FillHitVariables") << "Pointer to cluster not valid!!! This should never happen...";
+      hitParams.hitState = TrackStruct::invalid;
+      return hitParams;
     }
     const SiStripCluster& stripCluster(*clusterPtr);
-    
-    const SiStripClusterInfo clusterInfo =SiStripClusterInfo(stripCluster,iSetup,rawId,std::string(""));
+
+    const SiStripClusterInfo clusterInfo = SiStripClusterInfo(stripCluster, iSetup, rawId, std::string(""));
 
     const std::vector<uint8_t>::const_iterator stripChargeL(clusterInfo.stripCharges().begin());
     const std::vector<uint8_t>::const_iterator stripChargeR(--(clusterInfo.stripCharges().end()));
-    const std::pair<uint16_t, uint16_t> stripChargeLR = std::make_pair(*stripChargeL,*stripChargeR);
-    
-    hitParams.chargeStrip      = clusterInfo.charge();
-    hitParams.widthX           = clusterInfo.width();
-    hitParams.baryStripX       = clusterInfo.baryStrip() +1.;
-    hitParams.isModuleUsable   = clusterInfo.IsModuleUsable();
-    hitParams.maxStrip         = clusterInfo.maxStrip() +1;
-    hitParams.maxStripInv      = m_tkTreeVar_[rawId].nStrips - hitParams.maxStrip +1;
-    hitParams.maxCharge        = clusterInfo.maxCharge();
-    hitParams.maxIndex         = clusterInfo.maxIndex();
-    hitParams.chargeOnEdges    = static_cast<float>(stripChargeLR.first + stripChargeLR.second)/static_cast<float>(hitParams.chargeStrip);
-    hitParams.chargeAsymmetry  = static_cast<float>(stripChargeLR.first - stripChargeLR.second)/static_cast<float>(stripChargeLR.first + stripChargeLR.second);
-    hitParams.chargeLRplus     = static_cast<float>(clusterInfo.chargeLR().first + clusterInfo.chargeLR().second)/static_cast<float>(hitParams.chargeStrip);
-    hitParams.chargeLRminus    = static_cast<float>(clusterInfo.chargeLR().first - clusterInfo.chargeLR().second)/static_cast<float>(hitParams.chargeStrip);
-    hitParams.sOverN          = clusterInfo.signalOverNoise();
-
+    const std::pair<uint16_t, uint16_t> stripChargeLR = std::make_pair(*stripChargeL, *stripChargeR);
+
+    hitParams.chargeStrip = clusterInfo.charge();
+    hitParams.widthX = clusterInfo.width();
+    hitParams.baryStripX = clusterInfo.baryStrip() + 1.;
+    hitParams.isModuleUsable = clusterInfo.IsModuleUsable();
+    hitParams.maxStrip = clusterInfo.maxStrip() + 1;
+    hitParams.maxStripInv = m_tkTreeVar_[rawId].nStrips - hitParams.maxStrip + 1;
+    hitParams.maxCharge = clusterInfo.maxCharge();
+    hitParams.maxIndex = clusterInfo.maxIndex();
+    hitParams.chargeOnEdges =
+        static_cast<float>(stripChargeLR.first + stripChargeLR.second) / static_cast<float>(hitParams.chargeStrip);
+    hitParams.chargeAsymmetry = static_cast<float>(stripChargeLR.first - stripChargeLR.second) /
+                                static_cast<float>(stripChargeLR.first + stripChargeLR.second);
+    hitParams.chargeLRplus = static_cast<float>(clusterInfo.chargeLR().first + clusterInfo.chargeLR().second) /
+                             static_cast<float>(hitParams.chargeStrip);
+    hitParams.chargeLRminus = static_cast<float>(clusterInfo.chargeLR().first - clusterInfo.chargeLR().second) /
+                              static_cast<float>(hitParams.chargeStrip);
+    hitParams.sOverN = clusterInfo.signalOverNoise();
 
     // Calculate projection length corrected by drift
-    if(!hit.detUnit()){
-      hitParams.hitState = TrackStruct::invalid; 
+    if (!hit.detUnit()) {
+      hitParams.hitState = TrackStruct::invalid;
       return hitParams;
-    } // is it a single physical module?
+    }  // is it a single physical module?
     const GeomDetUnit& detUnit = *hit.detUnit();
-    if(!dynamic_cast<const StripTopology*>(&detUnit.type().topology())){
-      hitParams.hitState = TrackStruct::invalid; 
+    if (!dynamic_cast<const StripTopology*>(&detUnit.type().topology())) {
+      hitParams.hitState = TrackStruct::invalid;
       return hitParams;
     }
-    
-    
+
     edm::ESHandle<MagneticField> magFieldHandle;
     iSetup.get<IdealMagneticFieldRecord>().get(magFieldHandle);
-   
+
     edm::ESHandle<SiStripLorentzAngle> lorentzAngleHandle;
     iSetup.get<SiStripLorentzAngleDepRcd>().get(lorentzAngleHandle);  //MODIFIED BY LOIC QUERTENMONT
 
-
-    const StripGeomDetUnit * stripDet = (const StripGeomDetUnit*)(&detUnit);
-    const MagneticField * magField(magFieldHandle.product());
+    const StripGeomDetUnit* stripDet = (const StripGeomDetUnit*)(&detUnit);
+    const MagneticField* magField(magFieldHandle.product());
     LocalVector bField = (stripDet->surface()).toLocal(magField->inTesla(stripDet->surface().position()));
-    const SiStripLorentzAngle * lorentzAngle(lorentzAngleHandle.product());
+    const SiStripLorentzAngle* lorentzAngle(lorentzAngleHandle.product());
     float tanLorentzAnglePerTesla = lorentzAngle->getLorentzAngle(stripDet->geographicalId().rawId());
 
     float dirX = -tanLorentzAnglePerTesla * bField.y();
     float dirY = tanLorentzAnglePerTesla * bField.x();
-    float dirZ = 1.; // E field always in z direction
-    LocalVector driftDirection(dirX,dirY,dirZ);
-    
-    
+    float dirZ = 1.;  // E field always in z direction
+    LocalVector driftDirection(dirX, dirY, dirZ);
+
     const Bounds& bounds = stripDet->specificSurface().bounds();
-    float maxLength = std::sqrt(std::pow(bounds.length(),2)+std::pow(bounds.width(),2));
+    float maxLength = std::sqrt(std::pow(bounds.length(), 2) + std::pow(bounds.width(), 2));
     float thickness = bounds.thickness();
-    
-    
-    
+
     const StripTopology& topol = dynamic_cast<const StripTopology&>(detUnit.type().topology());
     LocalVector momentumDir(tsos.localDirection());
     LocalPoint momentumPos(tsos.localPosition());
     LocalVector scaledMomentumDir(momentumDir);
-    if(momentumDir.z() > 0.)scaledMomentumDir *= std::fabs(thickness/momentumDir.z());
-    else if(momentumDir.z() < 0.)scaledMomentumDir *= -std::fabs(thickness/momentumDir.z());
-    else scaledMomentumDir *= maxLength/momentumDir.mag();
-    
-    float projEdge1 = topol.measurementPosition(momentumPos - 0.5*scaledMomentumDir).x();
-    if(projEdge1 < 0.)projEdge1 = 0.;
-    else if(projEdge1 > m_tkTreeVar_[rawId].nStrips)projEdge1 = m_tkTreeVar_[rawId].nStrips;
-    float projEdge2 = topol.measurementPosition(momentumPos + 0.5*scaledMomentumDir).x();
-    if(projEdge2 < 0.)projEdge1 = 0.;
-    else if(projEdge2 > m_tkTreeVar_[rawId].nStrips)projEdge1 = m_tkTreeVar_[rawId].nStrips;
-    
-    
+    if (momentumDir.z() > 0.)
+      scaledMomentumDir *= std::fabs(thickness / momentumDir.z());
+    else if (momentumDir.z() < 0.)
+      scaledMomentumDir *= -std::fabs(thickness / momentumDir.z());
+    else
+      scaledMomentumDir *= maxLength / momentumDir.mag();
+
+    float projEdge1 = topol.measurementPosition(momentumPos - 0.5 * scaledMomentumDir).x();
+    if (projEdge1 < 0.)
+      projEdge1 = 0.;
+    else if (projEdge1 > m_tkTreeVar_[rawId].nStrips)
+      projEdge1 = m_tkTreeVar_[rawId].nStrips;
+    float projEdge2 = topol.measurementPosition(momentumPos + 0.5 * scaledMomentumDir).x();
+    if (projEdge2 < 0.)
+      projEdge1 = 0.;
+    else if (projEdge2 > m_tkTreeVar_[rawId].nStrips)
+      projEdge1 = m_tkTreeVar_[rawId].nStrips;
+
     float coveredStrips = std::fabs(projEdge2 - projEdge1);
-    
+
     hitParams.projWidth = coveredStrips;
-      
-    
-  }
-  else{
-    edm::LogError("FillHitVariables")<<"Incorrect subdetector ID, hit not associated to tracker";
-    hitParams.hitState = TrackStruct::notInTracker; return hitParams;
+
+  } else {
+    edm::LogError("FillHitVariables") << "Incorrect subdetector ID, hit not associated to tracker";
+    hitParams.hitState = TrackStruct::notInTracker;
+    return hitParams;
   }
-  
-  
-  if(!hitParams.isModuleUsable){
-    hitParams.hitState = TrackStruct::invalid; 
+
+  if (!hitParams.isModuleUsable) {
+    hitParams.hitState = TrackStruct::invalid;
     return hitParams;
   }
-  
-  if(hitParams.v_sector.empty()){
-    hitParams.hitState = TrackStruct::notAssignedToSectors; 
+
+  if (hitParams.v_sector.empty()) {
+    hitParams.hitState = TrackStruct::notAssignedToSectors;
     return hitParams;
   }
-  
+
   return hitParams;
-//}  
+  //}
 }
 
+ApeEstimator::StatePositionAndError2 ApeEstimator::positionAndError2(const LocalPoint& localPoint,
+                                                                     const LocalError& localError,
+                                                                     const TransientTrackingRecHit& hit) {
+  StatePositionAndError2 vPE2 = std::make_pair(TrackStruct::invalid, PositionAndError2());
 
-
-ApeEstimator::StatePositionAndError2
-ApeEstimator::positionAndError2(const LocalPoint& localPoint, const LocalError& localError, const TransientTrackingRecHit& hit){
-  StatePositionAndError2 vPE2 = std::make_pair(TrackStruct::invalid,PositionAndError2());
-  
   const DetId& detId(hit.geographicalId());
   const uint32_t& rawId(detId.rawId());
   const unsigned int& subdetId(m_tkTreeVar_[rawId].subdetId);
-  
-  if(localError.xx()<0. || localError.yy()<0.){
+
+  if (localError.xx() < 0. || localError.yy() < 0.) {
     // Do not print error message by default
     //edm::LogError("Negative error Value")<<"@SUB=ApeEstimator::fillHitVariables"
     //                                     <<"One of the squared error methods gives negative result\n"
@@ -1410,22 +1740,23 @@ ApeEstimator::positionAndError2(const LocalPoint& localPoint, const LocalError&
     vPE2.first = TrackStruct::negativeError;
     return vPE2;
   }
-  
-  if(subdetId==PixelSubdetector::PixelBarrel || subdetId==PixelSubdetector::PixelEndcap ||
-     subdetId==StripSubdetector::TIB || subdetId==StripSubdetector::TOB){
+
+  if (subdetId == PixelSubdetector::PixelBarrel || subdetId == PixelSubdetector::PixelEndcap ||
+      subdetId == StripSubdetector::TIB || subdetId == StripSubdetector::TOB) {
     // Cartesian coordinates
     vPE2 = std::make_pair(TrackStruct::ok, this->rectangularPositionAndError2(localPoint, localError));
-  }
-  else if(subdetId==StripSubdetector::TID || subdetId==StripSubdetector::TEC){
+  } else if (subdetId == StripSubdetector::TID || subdetId == StripSubdetector::TEC) {
     // Local x in radial coordinates
-    if(!hit.detUnit())return vPE2; // is it a single physical module?
+    if (!hit.detUnit())
+      return vPE2;  // is it a single physical module?
     const GeomDetUnit& detUnit = *hit.detUnit();
-    
-    if(!dynamic_cast<const RadialStripTopology*>(&detUnit.type().topology()))return vPE2;
+
+    if (!dynamic_cast<const RadialStripTopology*>(&detUnit.type().topology()))
+      return vPE2;
     const RadialStripTopology& topol = dynamic_cast<const RadialStripTopology&>(detUnit.type().topology());
-    
-    MeasurementError measError = topol.measurementError(localPoint,localError);
-    if(measError.uu()<0. || measError.vv()<0.){
+
+    MeasurementError measError = topol.measurementError(localPoint, localError);
+    if (measError.uu() < 0. || measError.vv() < 0.) {
       // Do not print error message by default
       //edm::LogError("Negative error Value")<<"@SUB=ApeEstimator::fillHitVariables"
       //                                     <<"One of the squared error methods gives negative result\n"
@@ -1439,67 +1770,58 @@ ApeEstimator::positionAndError2(const LocalPoint& localPoint, const LocalError&
       return vPE2;
     }
     vPE2 = std::make_pair(TrackStruct::ok, this->radialPositionAndError2(localPoint, localError, topol));
-  }else{
-    edm::LogError("FillHitVariables")<<"Incorrect subdetector ID, hit not associated to tracker";
+  } else {
+    edm::LogError("FillHitVariables") << "Incorrect subdetector ID, hit not associated to tracker";
   }
-  
+
   return vPE2;
 }
 
-
-
-ApeEstimator::PositionAndError2
-ApeEstimator::rectangularPositionAndError2(const LocalPoint& lP, const LocalError& lE){
+ApeEstimator::PositionAndError2 ApeEstimator::rectangularPositionAndError2(const LocalPoint& lP, const LocalError& lE) {
   const float x(lP.x());
   const float y(lP.y());
   const float errX2(lE.xx());
   const float errY2(lE.yy());
-  
+
   return PositionAndError2(x, y, errX2, errY2);
 }
 
-
-
-ApeEstimator::PositionAndError2
-ApeEstimator::radialPositionAndError2(const LocalPoint& lP, const LocalError& lE, const RadialStripTopology& topol){
+ApeEstimator::PositionAndError2 ApeEstimator::radialPositionAndError2(const LocalPoint& lP,
+                                                                      const LocalError& lE,
+                                                                      const RadialStripTopology& topol) {
   MeasurementPoint measPos = topol.measurementPosition(lP);
-  MeasurementError measErr = topol.measurementError(lP,lE);
-  
+  MeasurementError measErr = topol.measurementError(lP, lE);
+
   const float r_0 = topol.originToIntersection();
   const float stripLength = topol.localStripLength(lP);
   const float phi = topol.stripAngle(measPos.x());
-  
+
   float x(-999.F);
   float y(-999.F);
   float errX2(-999.F);
   float errY2(-999.F);
-  
-  x = phi*r_0;
+
+  x = phi * r_0;
   // Radial y (not symmetric around 0; radial distance with minimum at middle strip at lower edge [0, yMax])
-  const float l_0 = r_0 - topol.detHeight()/2;
+  const float l_0 = r_0 - topol.detHeight() / 2;
   const float cosPhi(std::cos(phi));
-  y = measPos.y()*stripLength - 0.5*stripLength + l_0*(1./cosPhi - 1.);
-  
-  const float angularWidth2(topol.angularWidth()*topol.angularWidth());
-  const float errPhi2(measErr.uu()*angularWidth2);
-  
-  errX2 = errPhi2*r_0*r_0;
+  y = measPos.y() * stripLength - 0.5 * stripLength + l_0 * (1. / cosPhi - 1.);
+
+  const float angularWidth2(topol.angularWidth() * topol.angularWidth());
+  const float errPhi2(measErr.uu() * angularWidth2);
+
+  errX2 = errPhi2 * r_0 * r_0;
   // Radial y (not symmetric around 0, real radial distance from intersection point)
-  const float cosPhi4(std::pow(cosPhi,4)), sinPhi2(std::sin(phi)*std::sin(phi));
-  const float helpSummand = l_0*l_0*(sinPhi2/cosPhi4*errPhi2);
-  errY2 = measErr.vv()*stripLength*stripLength + helpSummand;
+  const float cosPhi4(std::pow(cosPhi, 4)), sinPhi2(std::sin(phi) * std::sin(phi));
+  const float helpSummand = l_0 * l_0 * (sinPhi2 / cosPhi4 * errPhi2);
+  errY2 = measErr.vv() * stripLength * stripLength + helpSummand;
 
   return PositionAndError2(x, y, errX2, errY2);
 }
 
-
-
-
-
 // -----------------------------------------------------------------------------------------------------------
 
-void
-ApeEstimator::hitSelection(){
+void ApeEstimator::hitSelection() {
   this->setHitSelectionMapUInt("width");
   this->setHitSelectionMap("widthProj");
   this->setHitSelectionMap("widthDiff");
@@ -1512,11 +1834,11 @@ ApeEstimator::hitSelection(){
   this->setHitSelectionMap("chargeLRplus");
   this->setHitSelectionMap("chargeLRminus");
   this->setHitSelectionMap("sOverN");
-  
+
   this->setHitSelectionMap("chargePixel");
   this->setHitSelectionMapUInt("widthX");
   this->setHitSelectionMapUInt("widthY");
-  
+
   this->setHitSelectionMap("baryStripX");
   this->setHitSelectionMap("baryStripY");
   this->setHitSelectionMap("clusterProbabilityXY");
@@ -1527,7 +1849,7 @@ ApeEstimator::hitSelection(){
   this->setHitSelectionMapUInt("hasBadPixels");
   this->setHitSelectionMapUInt("spansTwoRoc");
   this->setHitSelectionMapUInt("qBin");
-  
+
   this->setHitSelectionMap("phiSens");
   this->setHitSelectionMap("phiSensX");
   this->setHitSelectionMap("phiSensY");
@@ -1538,7 +1860,7 @@ ApeEstimator::hitSelection(){
   this->setHitSelectionMap("errXTrk");
   this->setHitSelectionMap("errX");
   this->setHitSelectionMap("errX2");
-  
+
   this->setHitSelectionMap("resY");
   this->setHitSelectionMap("norResY");
   this->setHitSelectionMap("probY");
@@ -1546,71 +1868,83 @@ ApeEstimator::hitSelection(){
   this->setHitSelectionMap("errYTrk");
   this->setHitSelectionMap("errY");
   this->setHitSelectionMap("errY2");
-  
-  edm::LogInfo("HitSelector")<<"applying hit cuts ...";
+
+  edm::LogInfo("HitSelector") << "applying hit cuts ...";
   bool emptyMap(true);
-  for(auto & i_hitSelection : m_hitSelection_){
-    if(!i_hitSelection.second.empty()){
-      int entry(1); double intervalBegin(999.);
-      for(std::vector<double>::iterator i_hitInterval = i_hitSelection.second.begin(); i_hitInterval != i_hitSelection.second.end(); ++entry){
-        if(entry%2==1){
-          intervalBegin = *i_hitInterval; ++i_hitInterval;
-        }else{
-          if(intervalBegin > *i_hitInterval){
-            edm::LogError("HitSelector")<<"INVALID Interval selected for  "<<i_hitSelection.first<<":\t"<<intervalBegin<<" > "<<(*i_hitInterval)
-                                  <<"\n ... delete Selection for "<<i_hitSelection.first;
-            i_hitSelection.second.clear(); i_hitInterval = i_hitSelection.second.begin(); //emptyMap = true; i_hitSelection = m_hitSelection_.begin();
-          }else{
-            edm::LogInfo("HitSelector")<<"Interval selected for  "<<i_hitSelection.first<<":\t"<<intervalBegin<<", "<<(*i_hitInterval);
+  for (auto& i_hitSelection : m_hitSelection_) {
+    if (!i_hitSelection.second.empty()) {
+      int entry(1);
+      double intervalBegin(999.);
+      for (std::vector<double>::iterator i_hitInterval = i_hitSelection.second.begin();
+           i_hitInterval != i_hitSelection.second.end();
+           ++entry) {
+        if (entry % 2 == 1) {
+          intervalBegin = *i_hitInterval;
+          ++i_hitInterval;
+        } else {
+          if (intervalBegin > *i_hitInterval) {
+            edm::LogError("HitSelector") << "INVALID Interval selected for  " << i_hitSelection.first << ":\t"
+                                         << intervalBegin << " > " << (*i_hitInterval) << "\n ... delete Selection for "
+                                         << i_hitSelection.first;
+            i_hitSelection.second.clear();
+            i_hitInterval = i_hitSelection.second.begin();  //emptyMap = true; i_hitSelection = m_hitSelection_.begin();
+          } else {
+            edm::LogInfo("HitSelector") << "Interval selected for  " << i_hitSelection.first << ":\t" << intervalBegin
+                                        << ", " << (*i_hitInterval);
             ++i_hitInterval;
           }
         }
       }
-      if(!i_hitSelection.second.empty())emptyMap = false;
+      if (!i_hitSelection.second.empty())
+        emptyMap = false;
     }
   }
-  
-  
+
   bool emptyMapUInt(true);
-  for(auto & i_hitSelection : m_hitSelectionUInt_){
-    if(!i_hitSelection.second.empty()){
-      int entry(1); unsigned int intervalBegin(999);
-      for(std::vector<unsigned int>::iterator i_hitInterval = i_hitSelection.second.begin(); i_hitInterval != i_hitSelection.second.end(); ++entry){
-        if(entry%2==1){
-          intervalBegin = *i_hitInterval; 
+  for (auto& i_hitSelection : m_hitSelectionUInt_) {
+    if (!i_hitSelection.second.empty()) {
+      int entry(1);
+      unsigned int intervalBegin(999);
+      for (std::vector<unsigned int>::iterator i_hitInterval = i_hitSelection.second.begin();
+           i_hitInterval != i_hitSelection.second.end();
+           ++entry) {
+        if (entry % 2 == 1) {
+          intervalBegin = *i_hitInterval;
           ++i_hitInterval;
-        }else{
-          if(intervalBegin > *i_hitInterval){
-            edm::LogError("HitSelector")<<"INVALID Interval selected for  "<<i_hitSelection.first<<":\t"<<intervalBegin<<" > "<<(*i_hitInterval)
-                                  <<"\n ... delete Selection for "<<i_hitSelection.first;
-            i_hitSelection.second.clear(); i_hitInterval = i_hitSelection.second.begin(); //emptyMap = true; i_hitSelection = m_hitSelection_.begin();
-          }else{
-            edm::LogInfo("HitSelector")<<"Interval selected for  "<<i_hitSelection.first<<":\t"<<intervalBegin<<", "<<(*i_hitInterval);
+        } else {
+          if (intervalBegin > *i_hitInterval) {
+            edm::LogError("HitSelector") << "INVALID Interval selected for  " << i_hitSelection.first << ":\t"
+                                         << intervalBegin << " > " << (*i_hitInterval) << "\n ... delete Selection for "
+                                         << i_hitSelection.first;
+            i_hitSelection.second.clear();
+            i_hitInterval = i_hitSelection.second.begin();  //emptyMap = true; i_hitSelection = m_hitSelection_.begin();
+          } else {
+            edm::LogInfo("HitSelector") << "Interval selected for  " << i_hitSelection.first << ":\t" << intervalBegin
+                                        << ", " << (*i_hitInterval);
             ++i_hitInterval;
           }
         }
       }
-      if(!i_hitSelection.second.empty())emptyMapUInt = false;
+      if (!i_hitSelection.second.empty())
+        emptyMapUInt = false;
     }
   }
-  
-  if(emptyMap && emptyMapUInt){
+
+  if (emptyMap && emptyMapUInt) {
     m_hitSelection_.clear();
     m_hitSelectionUInt_.clear();
-    edm::LogInfo("HitSelector")<<"NO hit cuts applied";
+    edm::LogInfo("HitSelector") << "NO hit cuts applied";
   }
   return;
 }
 
-
-
-void
-ApeEstimator::setHitSelectionMap(const std::string& cutVariable){
+void ApeEstimator::setHitSelectionMap(const std::string& cutVariable) {
   edm::ParameterSet parSet(parameterSet_.getParameter<edm::ParameterSet>("HitSelector"));
   std::vector<double> v_cutVariable(parSet.getParameter<std::vector<double> >(cutVariable));
-  if(v_cutVariable.size()%2==1){
-    edm::LogError("HitSelector")<<"Invalid Hit Selection for "<<cutVariable<<": need even number of arguments (intervals)"
-                                <<"\n ... delete Selection for "<<cutVariable;
+  if (v_cutVariable.size() % 2 == 1) {
+    edm::LogError("HitSelector") << "Invalid Hit Selection for " << cutVariable
+                                 << ": need even number of arguments (intervals)"
+                                 << "\n ... delete Selection for " << cutVariable;
     v_cutVariable.clear();
     m_hitSelection_[cutVariable] = v_cutVariable;
     return;
@@ -1619,14 +1953,13 @@ ApeEstimator::setHitSelectionMap(const std::string& cutVariable){
   return;
 }
 
-
-void
-ApeEstimator::setHitSelectionMapUInt(const std::string& cutVariable){
+void ApeEstimator::setHitSelectionMapUInt(const std::string& cutVariable) {
   edm::ParameterSet parSet(parameterSet_.getParameter<edm::ParameterSet>("HitSelector"));
   std::vector<unsigned int> v_cutVariable(parSet.getParameter<std::vector<unsigned int> >(cutVariable));
-  if(v_cutVariable.size()%2==1){
-    edm::LogError("HitSelector")<<"Invalid Hit Selection for "<<cutVariable<<": need even number of arguments (intervals)"
-                                <<"\n ... delete Selection for "<<cutVariable;
+  if (v_cutVariable.size() % 2 == 1) {
+    edm::LogError("HitSelector") << "Invalid Hit Selection for " << cutVariable
+                                 << ": need even number of arguments (intervals)"
+                                 << "\n ... delete Selection for " << cutVariable;
     v_cutVariable.clear();
     m_hitSelectionUInt_[cutVariable] = v_cutVariable;
     return;
@@ -1635,294 +1968,396 @@ ApeEstimator::setHitSelectionMapUInt(const std::string& cutVariable){
   return;
 }
 
-
-
 // -----------------------------------------------------------------------------------------------------------
 
-bool
-ApeEstimator::hitSelected(TrackStruct::HitParameterStruct& hitParams)const{
-  if(hitParams.hitState == TrackStruct::notInTracker)return false;
-  if(hitParams.hitState == TrackStruct::invalid || hitParams.hitState == TrackStruct::negativeError)return false;
-  
+bool ApeEstimator::hitSelected(TrackStruct::HitParameterStruct& hitParams) const {
+  if (hitParams.hitState == TrackStruct::notInTracker)
+    return false;
+  if (hitParams.hitState == TrackStruct::invalid || hitParams.hitState == TrackStruct::negativeError)
+    return false;
+
   bool isGoodHit(true);
   bool isGoodHitX(true);
   bool isGoodHitY(true);
-  
-  for(auto & i_hitSelection : m_hitSelection_){
+
+  for (auto& i_hitSelection : m_hitSelection_) {
     const std::string& hitSelection(i_hitSelection.first);
     const std::vector<double>& v_hitSelection(i_hitSelection.second);
-    if(v_hitSelection.empty())continue;
-    
+    if (v_hitSelection.empty())
+      continue;
+
     // For pixel and strip sectors in common
-    if     (hitSelection == "phiSens")        {if(!this->inDoubleInterval(v_hitSelection, hitParams.phiSens))isGoodHit = false;}
-    else if(hitSelection == "phiSensX")       {if(!this->inDoubleInterval(v_hitSelection, hitParams.phiSensX))isGoodHit = false;}
-    else if(hitSelection == "phiSensY")       {if(!this->inDoubleInterval(v_hitSelection, hitParams.phiSensY))isGoodHit = false;}
-    
-    else if(hitSelection == "resX")           {if(!this->inDoubleInterval(v_hitSelection, hitParams.resX))isGoodHitX = false;}
-    else if(hitSelection == "norResX")        {if(!this->inDoubleInterval(v_hitSelection, hitParams.norResX))isGoodHitX = false;}
-    else if(hitSelection == "probX")          {if(!this->inDoubleInterval(v_hitSelection, hitParams.probX))isGoodHitX = false;}
-    else if(hitSelection == "errXHit")        {if(!this->inDoubleInterval(v_hitSelection, hitParams.errXHit))isGoodHitX = false;}
-    else if(hitSelection == "errXTrk")        {if(!this->inDoubleInterval(v_hitSelection, hitParams.errXTrk))isGoodHitX = false;}
-    else if(hitSelection == "errX")           {if(!this->inDoubleInterval(v_hitSelection, hitParams.errX))isGoodHitX = false;}
-    else if(hitSelection == "errX2")          {if(!this->inDoubleInterval(v_hitSelection, hitParams.errX2))isGoodHitX = false;}
-    
+    if (hitSelection == "phiSens") {
+      if (!this->inDoubleInterval(v_hitSelection, hitParams.phiSens))
+        isGoodHit = false;
+    } else if (hitSelection == "phiSensX") {
+      if (!this->inDoubleInterval(v_hitSelection, hitParams.phiSensX))
+        isGoodHit = false;
+    } else if (hitSelection == "phiSensY") {
+      if (!this->inDoubleInterval(v_hitSelection, hitParams.phiSensY))
+        isGoodHit = false;
+    }
+
+    else if (hitSelection == "resX") {
+      if (!this->inDoubleInterval(v_hitSelection, hitParams.resX))
+        isGoodHitX = false;
+    } else if (hitSelection == "norResX") {
+      if (!this->inDoubleInterval(v_hitSelection, hitParams.norResX))
+        isGoodHitX = false;
+    } else if (hitSelection == "probX") {
+      if (!this->inDoubleInterval(v_hitSelection, hitParams.probX))
+        isGoodHitX = false;
+    } else if (hitSelection == "errXHit") {
+      if (!this->inDoubleInterval(v_hitSelection, hitParams.errXHit))
+        isGoodHitX = false;
+    } else if (hitSelection == "errXTrk") {
+      if (!this->inDoubleInterval(v_hitSelection, hitParams.errXTrk))
+        isGoodHitX = false;
+    } else if (hitSelection == "errX") {
+      if (!this->inDoubleInterval(v_hitSelection, hitParams.errX))
+        isGoodHitX = false;
+    } else if (hitSelection == "errX2") {
+      if (!this->inDoubleInterval(v_hitSelection, hitParams.errX2))
+        isGoodHitX = false;
+    }
+
     // For pixel only
-    if(hitParams.isPixelHit){
-      if     (hitSelection == "chargePixel")          {if(!this->inDoubleInterval(v_hitSelection, hitParams.chargePixel))isGoodHit = false;}
-      else if(hitSelection == "clusterProbabilityXY") {if(!this->inDoubleInterval(v_hitSelection, hitParams.clusterProbabilityXY))isGoodHit = false;}
-      else if(hitSelection == "clusterProbabilityQ")  {if(!this->inDoubleInterval(v_hitSelection, hitParams.clusterProbabilityQ))isGoodHit = false;}
-      else if(hitSelection == "clusterProbabilityXYQ"){if(!this->inDoubleInterval(v_hitSelection, hitParams.clusterProbabilityXYQ))isGoodHit = false;}
-      else if(hitSelection == "logClusterProbability"){if(!this->inDoubleInterval(v_hitSelection, hitParams.logClusterProbability))isGoodHit = false;}
-      
-      else if(hitSelection == "baryStripX")           {if(!this->inDoubleInterval(v_hitSelection, hitParams.baryStripX))isGoodHitX = false;}
-      else if(hitSelection == "baryStripY")           {if(!this->inDoubleInterval(v_hitSelection, hitParams.baryStripY))isGoodHitY = false;}
-      
-      
-      
-      else if(hitSelection == "resY")           {if(!this->inDoubleInterval(v_hitSelection, hitParams.resY))isGoodHitY = false;}
-      else if(hitSelection == "norResY")        {if(!this->inDoubleInterval(v_hitSelection, hitParams.norResY))isGoodHitY = false;}
-      else if(hitSelection == "probY")          {if(!this->inDoubleInterval(v_hitSelection, hitParams.probY))isGoodHitY = false;}
-      else if(hitSelection == "errYHit")        {if(!this->inDoubleInterval(v_hitSelection, hitParams.errYHit))isGoodHitY = false;}
-      else if(hitSelection == "errYTrk")        {if(!this->inDoubleInterval(v_hitSelection, hitParams.errYTrk))isGoodHitY = false;}
-      else if(hitSelection == "errY")           {if(!this->inDoubleInterval(v_hitSelection, hitParams.errY))isGoodHitY = false;}
-      else if(hitSelection == "errY2")          {if(!this->inDoubleInterval(v_hitSelection, hitParams.errY2))isGoodHitY = false;}
-    }else{ // For strip only
-      if     (hitSelection == "widthProj")      {if(!this->inDoubleInterval(v_hitSelection, hitParams.projWidth))isGoodHit = false;}
-      else if(hitSelection == "widthDiff")      {if(!this->inDoubleInterval(v_hitSelection, hitParams.projWidth-static_cast<float>(hitParams.widthX)))isGoodHit = false;}
-      else if(hitSelection == "charge")         {if(!this->inDoubleInterval(v_hitSelection, hitParams.chargeStrip))isGoodHit = false;}
-      else if(hitSelection == "maxCharge")      {if(!this->inDoubleInterval(v_hitSelection, hitParams.maxCharge))isGoodHit = false;}
-      else if(hitSelection == "chargeOnEdges")  {if(!this->inDoubleInterval(v_hitSelection, hitParams.chargeOnEdges))isGoodHit = false;}
-      else if(hitSelection == "chargeAsymmetry"){if(!this->inDoubleInterval(v_hitSelection, hitParams.chargeAsymmetry))isGoodHit = false;}
-      else if(hitSelection == "chargeLRplus")   {if(!this->inDoubleInterval(v_hitSelection, hitParams.chargeLRplus))isGoodHit = false;}
-      else if(hitSelection == "chargeLRminus")  {if(!this->inDoubleInterval(v_hitSelection, hitParams.chargeLRminus))isGoodHit = false;}
-      else if(hitSelection == "sOverN")         {if(!this->inDoubleInterval(v_hitSelection, hitParams.sOverN))isGoodHit = false;}
+    if (hitParams.isPixelHit) {
+      if (hitSelection == "chargePixel") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.chargePixel))
+          isGoodHit = false;
+      } else if (hitSelection == "clusterProbabilityXY") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.clusterProbabilityXY))
+          isGoodHit = false;
+      } else if (hitSelection == "clusterProbabilityQ") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.clusterProbabilityQ))
+          isGoodHit = false;
+      } else if (hitSelection == "clusterProbabilityXYQ") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.clusterProbabilityXYQ))
+          isGoodHit = false;
+      } else if (hitSelection == "logClusterProbability") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.logClusterProbability))
+          isGoodHit = false;
+      }
+
+      else if (hitSelection == "baryStripX") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.baryStripX))
+          isGoodHitX = false;
+      } else if (hitSelection == "baryStripY") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.baryStripY))
+          isGoodHitY = false;
+      }
+
+      else if (hitSelection == "resY") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.resY))
+          isGoodHitY = false;
+      } else if (hitSelection == "norResY") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.norResY))
+          isGoodHitY = false;
+      } else if (hitSelection == "probY") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.probY))
+          isGoodHitY = false;
+      } else if (hitSelection == "errYHit") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.errYHit))
+          isGoodHitY = false;
+      } else if (hitSelection == "errYTrk") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.errYTrk))
+          isGoodHitY = false;
+      } else if (hitSelection == "errY") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.errY))
+          isGoodHitY = false;
+      } else if (hitSelection == "errY2") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.errY2))
+          isGoodHitY = false;
+      }
+    } else {  // For strip only
+      if (hitSelection == "widthProj") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.projWidth))
+          isGoodHit = false;
+      } else if (hitSelection == "widthDiff") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.projWidth - static_cast<float>(hitParams.widthX)))
+          isGoodHit = false;
+      } else if (hitSelection == "charge") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.chargeStrip))
+          isGoodHit = false;
+      } else if (hitSelection == "maxCharge") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.maxCharge))
+          isGoodHit = false;
+      } else if (hitSelection == "chargeOnEdges") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.chargeOnEdges))
+          isGoodHit = false;
+      } else if (hitSelection == "chargeAsymmetry") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.chargeAsymmetry))
+          isGoodHit = false;
+      } else if (hitSelection == "chargeLRplus") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.chargeLRplus))
+          isGoodHit = false;
+      } else if (hitSelection == "chargeLRminus") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.chargeLRminus))
+          isGoodHit = false;
+      } else if (hitSelection == "sOverN") {
+        if (!this->inDoubleInterval(v_hitSelection, hitParams.sOverN))
+          isGoodHit = false;
+      }
     }
   }
-  
-  for(auto & i_hitSelection : m_hitSelectionUInt_){
+
+  for (auto& i_hitSelection : m_hitSelectionUInt_) {
     const std::string& hitSelection(i_hitSelection.first);
     const std::vector<unsigned int>& v_hitSelection(i_hitSelection.second);
-    if(v_hitSelection.empty())continue;
-    
+    if (v_hitSelection.empty())
+      continue;
+
     // For pixel and strip sectors in common
-    
+
     // For pixel only
-    if(hitParams.isPixelHit){
-      if(hitSelection == "isOnEdge")          {if(!this->inUintInterval(v_hitSelection, hitParams.isOnEdge))isGoodHit = false;}
-      else if(hitSelection == "hasBadPixels") {if(!this->inUintInterval(v_hitSelection, hitParams.hasBadPixels))isGoodHit = false;}
-      else if(hitSelection == "spansTwoRoc")  {if(!this->inUintInterval(v_hitSelection, hitParams.spansTwoRoc))isGoodHit = false;}
-      else if(hitSelection == "qBin")         {if(!this->inUintInterval(v_hitSelection, hitParams.qBin))isGoodHit = false;}
-      
-      else if(hitSelection == "widthX")       {if(!this->inUintInterval(v_hitSelection, hitParams.widthX))isGoodHitX = false;}
-      else if(hitSelection == "widthY")       {if(!this->inUintInterval(v_hitSelection, hitParams.widthY))isGoodHitY = false;}
-    }else{ // For strip only
-      if     (hitSelection == "width")     {if(!this->inUintInterval(v_hitSelection, hitParams.widthX))isGoodHit = false;}
-      else if(hitSelection == "edgeStrips"){if(!this->inUintInterval(v_hitSelection, hitParams.maxStrip, hitParams.maxStripInv))isGoodHit = false;}
-      else if(hitSelection == "maxIndex")  {if(!this->inUintInterval(v_hitSelection, hitParams.maxIndex))isGoodHit = false;}
+    if (hitParams.isPixelHit) {
+      if (hitSelection == "isOnEdge") {
+        if (!this->inUintInterval(v_hitSelection, hitParams.isOnEdge))
+          isGoodHit = false;
+      } else if (hitSelection == "hasBadPixels") {
+        if (!this->inUintInterval(v_hitSelection, hitParams.hasBadPixels))
+          isGoodHit = false;
+      } else if (hitSelection == "spansTwoRoc") {
+        if (!this->inUintInterval(v_hitSelection, hitParams.spansTwoRoc))
+          isGoodHit = false;
+      } else if (hitSelection == "qBin") {
+        if (!this->inUintInterval(v_hitSelection, hitParams.qBin))
+          isGoodHit = false;
+      }
+
+      else if (hitSelection == "widthX") {
+        if (!this->inUintInterval(v_hitSelection, hitParams.widthX))
+          isGoodHitX = false;
+      } else if (hitSelection == "widthY") {
+        if (!this->inUintInterval(v_hitSelection, hitParams.widthY))
+          isGoodHitY = false;
+      }
+    } else {  // For strip only
+      if (hitSelection == "width") {
+        if (!this->inUintInterval(v_hitSelection, hitParams.widthX))
+          isGoodHit = false;
+      } else if (hitSelection == "edgeStrips") {
+        if (!this->inUintInterval(v_hitSelection, hitParams.maxStrip, hitParams.maxStripInv))
+          isGoodHit = false;
+      } else if (hitSelection == "maxIndex") {
+        if (!this->inUintInterval(v_hitSelection, hitParams.maxIndex))
+          isGoodHit = false;
+      }
     }
   }
-  
-  if(hitParams.isPixelHit){
+
+  if (hitParams.isPixelHit) {
     hitParams.goodXMeasurement = isGoodHit && isGoodHitX;
     hitParams.goodYMeasurement = isGoodHit && isGoodHitY;
-  }else{
+  } else {
     hitParams.goodXMeasurement = isGoodHit && isGoodHitX;
     hitParams.goodYMeasurement = false;
   }
-  
-  if(!hitParams.goodXMeasurement && !hitParams.goodYMeasurement)return false;
-  else return true;
-}
 
+  if (!hitParams.goodXMeasurement && !hitParams.goodYMeasurement)
+    return false;
+  else
+    return true;
+}
 
-bool
-ApeEstimator::inDoubleInterval(const std::vector<double>& v_hitSelection, const float variable)const{
-  int entry(0); double intervalBegin(999.);
+bool ApeEstimator::inDoubleInterval(const std::vector<double>& v_hitSelection, const float variable) const {
+  int entry(0);
+  double intervalBegin(999.);
   bool isSelected(false);
-  for(auto const & i_hitInterval : v_hitSelection){
+  for (auto const& i_hitInterval : v_hitSelection) {
     ++entry;
-    if(entry%2==1)intervalBegin = i_hitInterval;
-    else if(variable>=intervalBegin && variable<i_hitInterval)isSelected = true;
+    if (entry % 2 == 1)
+      intervalBegin = i_hitInterval;
+    else if (variable >= intervalBegin && variable < i_hitInterval)
+      isSelected = true;
   }
   return isSelected;
 }
 
-
-bool
-ApeEstimator::inUintInterval(const std::vector<unsigned int>& v_hitSelection, const unsigned int variable, const unsigned int variable2)const{
-  int entry(0); unsigned int intervalBegin(999);
+bool ApeEstimator::inUintInterval(const std::vector<unsigned int>& v_hitSelection,
+                                  const unsigned int variable,
+                                  const unsigned int variable2) const {
+  int entry(0);
+  unsigned int intervalBegin(999);
   bool isSelected(false);
-  for(auto i_hitInterval : v_hitSelection ){
+  for (auto i_hitInterval : v_hitSelection) {
     ++entry;
-    if(entry%2==1)intervalBegin = i_hitInterval;
-    else if(variable>=intervalBegin && variable<=i_hitInterval){
-      if(variable2==999 || (variable2>=intervalBegin && variable2<=i_hitInterval))isSelected = true;
+    if (entry % 2 == 1)
+      intervalBegin = i_hitInterval;
+    else if (variable >= intervalBegin && variable <= i_hitInterval) {
+      if (variable2 == 999 || (variable2 >= intervalBegin && variable2 <= i_hitInterval))
+        isSelected = true;
     }
   }
   return isSelected;
 }
 
-
-
 // -----------------------------------------------------------------------------------------------------------
 
-
-void
-ApeEstimator::fillHistsForAnalyzerMode(const TrackStruct& trackStruct){ 
+void ApeEstimator::fillHistsForAnalyzerMode(const TrackStruct& trackStruct) {
   unsigned int goodHitsPerTrack(trackStruct.v_hitParams.size());
   tkDetector_.HitsGood->Fill(goodHitsPerTrack);
-  tkDetector_.HitsGoodVsHitsValid->Fill(trackStruct.trkParams.hitsValid,goodHitsPerTrack);
-  tkDetector_.PHitsGoodVsHitsValid->Fill(trackStruct.trkParams.hitsValid,goodHitsPerTrack);
-  
-  if(parameterSet_.getParameter<bool>("applyTrackCuts")){
+  tkDetector_.HitsGoodVsHitsValid->Fill(trackStruct.trkParams.hitsValid, goodHitsPerTrack);
+  tkDetector_.PHitsGoodVsHitsValid->Fill(trackStruct.trkParams.hitsValid, goodHitsPerTrack);
+
+  if (parameterSet_.getParameter<bool>("applyTrackCuts")) {
     // which tracks to take? need min. nr. of selected hits?
-    if(goodHitsPerTrack < minGoodHitsPerTrack_)return;
+    if (goodHitsPerTrack < minGoodHitsPerTrack_)
+      return;
   }
-  
-  tkDetector_.HitsSize     ->Fill(trackStruct.trkParams.hitsSize);
-  tkDetector_.HitsValid    ->Fill(trackStruct.trkParams.hitsValid);
-  tkDetector_.HitsInvalid  ->Fill(trackStruct.trkParams.hitsInvalid);
-  tkDetector_.Hits2D       ->Fill(trackStruct.trkParams.hits2D);
-  tkDetector_.LayersMissed ->Fill(trackStruct.trkParams.layersMissed);
-  tkDetector_.HitsPixel    ->Fill(trackStruct.trkParams.hitsPixel);
-  tkDetector_.HitsStrip    ->Fill(trackStruct.trkParams.hitsStrip);
-  tkDetector_.Charge       ->Fill(trackStruct.trkParams.charge);
-  tkDetector_.Chi2         ->Fill(trackStruct.trkParams.chi2);
-  tkDetector_.Ndof         ->Fill(trackStruct.trkParams.ndof);
-  tkDetector_.NorChi2      ->Fill(trackStruct.trkParams.norChi2);
-  tkDetector_.Prob         ->Fill(trackStruct.trkParams.prob);
-  tkDetector_.Eta          ->Fill(trackStruct.trkParams.eta);
-  tkDetector_.EtaErr       ->Fill(trackStruct.trkParams.etaErr);
-  tkDetector_.EtaSig       ->Fill(trackStruct.trkParams.eta/trackStruct.trkParams.etaErr);
-  tkDetector_.Theta        ->Fill(trackStruct.trkParams.theta*180./M_PI);
-  tkDetector_.Phi          ->Fill(trackStruct.trkParams.phi*180./M_PI);
-  tkDetector_.PhiErr       ->Fill(trackStruct.trkParams.phiErr*180./M_PI);
-  tkDetector_.PhiSig       ->Fill(trackStruct.trkParams.phi/trackStruct.trkParams.phiErr);
-  tkDetector_.D0Beamspot   ->Fill(trackStruct.trkParams.d0Beamspot);
+
+  tkDetector_.HitsSize->Fill(trackStruct.trkParams.hitsSize);
+  tkDetector_.HitsValid->Fill(trackStruct.trkParams.hitsValid);
+  tkDetector_.HitsInvalid->Fill(trackStruct.trkParams.hitsInvalid);
+  tkDetector_.Hits2D->Fill(trackStruct.trkParams.hits2D);
+  tkDetector_.LayersMissed->Fill(trackStruct.trkParams.layersMissed);
+  tkDetector_.HitsPixel->Fill(trackStruct.trkParams.hitsPixel);
+  tkDetector_.HitsStrip->Fill(trackStruct.trkParams.hitsStrip);
+  tkDetector_.Charge->Fill(trackStruct.trkParams.charge);
+  tkDetector_.Chi2->Fill(trackStruct.trkParams.chi2);
+  tkDetector_.Ndof->Fill(trackStruct.trkParams.ndof);
+  tkDetector_.NorChi2->Fill(trackStruct.trkParams.norChi2);
+  tkDetector_.Prob->Fill(trackStruct.trkParams.prob);
+  tkDetector_.Eta->Fill(trackStruct.trkParams.eta);
+  tkDetector_.EtaErr->Fill(trackStruct.trkParams.etaErr);
+  tkDetector_.EtaSig->Fill(trackStruct.trkParams.eta / trackStruct.trkParams.etaErr);
+  tkDetector_.Theta->Fill(trackStruct.trkParams.theta * 180. / M_PI);
+  tkDetector_.Phi->Fill(trackStruct.trkParams.phi * 180. / M_PI);
+  tkDetector_.PhiErr->Fill(trackStruct.trkParams.phiErr * 180. / M_PI);
+  tkDetector_.PhiSig->Fill(trackStruct.trkParams.phi / trackStruct.trkParams.phiErr);
+  tkDetector_.D0Beamspot->Fill(trackStruct.trkParams.d0Beamspot);
   tkDetector_.D0BeamspotErr->Fill(trackStruct.trkParams.d0BeamspotErr);
-  tkDetector_.D0BeamspotSig->Fill(trackStruct.trkParams.d0Beamspot/trackStruct.trkParams.d0BeamspotErr);
-  tkDetector_.Dz           ->Fill(trackStruct.trkParams.dz);
-  tkDetector_.DzErr        ->Fill(trackStruct.trkParams.dzErr);
-  tkDetector_.DzSig        ->Fill(trackStruct.trkParams.dz/trackStruct.trkParams.dzErr);
-  tkDetector_.P            ->Fill(trackStruct.trkParams.p);
-  tkDetector_.Pt           ->Fill(trackStruct.trkParams.pt);
-  tkDetector_.PtErr        ->Fill(trackStruct.trkParams.ptErr);
-  tkDetector_.PtSig        ->Fill(trackStruct.trkParams.pt/trackStruct.trkParams.ptErr);
-  tkDetector_.MeanAngle    ->Fill(trackStruct.trkParams.meanPhiSensToNorm*180./M_PI);
-  
-  tkDetector_.MeanAngleVsHits ->Fill(trackStruct.trkParams.hitsSize,trackStruct.trkParams.meanPhiSensToNorm*180./M_PI);
-  tkDetector_.HitsPixelVsEta  ->Fill(trackStruct.trkParams.eta,trackStruct.trkParams.hitsPixel);
-  tkDetector_.HitsPixelVsTheta->Fill(trackStruct.trkParams.theta*180./M_PI,trackStruct.trkParams.hitsPixel);
-  tkDetector_.HitsStripVsEta  ->Fill(trackStruct.trkParams.eta,trackStruct.trkParams.hitsStrip);
-  tkDetector_.HitsStripVsTheta->Fill(trackStruct.trkParams.theta*180./M_PI,trackStruct.trkParams.hitsStrip);
-  tkDetector_.PtVsEta       ->Fill(trackStruct.trkParams.eta,trackStruct.trkParams.pt);
-  tkDetector_.PtVsTheta       ->Fill(trackStruct.trkParams.theta*180./M_PI,trackStruct.trkParams.pt);
-  
-  tkDetector_.PMeanAngleVsHits ->Fill(trackStruct.trkParams.hitsSize,trackStruct.trkParams.meanPhiSensToNorm*180./M_PI);
-  tkDetector_.PHitsPixelVsEta  ->Fill(trackStruct.trkParams.eta,trackStruct.trkParams.hitsPixel);
-  tkDetector_.PHitsPixelVsTheta->Fill(trackStruct.trkParams.theta*180./M_PI,trackStruct.trkParams.hitsPixel);
-  tkDetector_.PHitsStripVsEta  ->Fill(trackStruct.trkParams.eta,trackStruct.trkParams.hitsStrip);
-  tkDetector_.PHitsStripVsTheta->Fill(trackStruct.trkParams.theta*180./M_PI,trackStruct.trkParams.hitsStrip);
-  tkDetector_.PPtVsEta         ->Fill(trackStruct.trkParams.eta,trackStruct.trkParams.pt);
-  tkDetector_.PPtVsTheta       ->Fill(trackStruct.trkParams.theta*180./M_PI,trackStruct.trkParams.pt);
-  
-  
-  for(auto & i_hit : trackStruct.v_hitParams){
+  tkDetector_.D0BeamspotSig->Fill(trackStruct.trkParams.d0Beamspot / trackStruct.trkParams.d0BeamspotErr);
+  tkDetector_.Dz->Fill(trackStruct.trkParams.dz);
+  tkDetector_.DzErr->Fill(trackStruct.trkParams.dzErr);
+  tkDetector_.DzSig->Fill(trackStruct.trkParams.dz / trackStruct.trkParams.dzErr);
+  tkDetector_.P->Fill(trackStruct.trkParams.p);
+  tkDetector_.Pt->Fill(trackStruct.trkParams.pt);
+  tkDetector_.PtErr->Fill(trackStruct.trkParams.ptErr);
+  tkDetector_.PtSig->Fill(trackStruct.trkParams.pt / trackStruct.trkParams.ptErr);
+  tkDetector_.MeanAngle->Fill(trackStruct.trkParams.meanPhiSensToNorm * 180. / M_PI);
+
+  tkDetector_.MeanAngleVsHits->Fill(trackStruct.trkParams.hitsSize,
+                                    trackStruct.trkParams.meanPhiSensToNorm * 180. / M_PI);
+  tkDetector_.HitsPixelVsEta->Fill(trackStruct.trkParams.eta, trackStruct.trkParams.hitsPixel);
+  tkDetector_.HitsPixelVsTheta->Fill(trackStruct.trkParams.theta * 180. / M_PI, trackStruct.trkParams.hitsPixel);
+  tkDetector_.HitsStripVsEta->Fill(trackStruct.trkParams.eta, trackStruct.trkParams.hitsStrip);
+  tkDetector_.HitsStripVsTheta->Fill(trackStruct.trkParams.theta * 180. / M_PI, trackStruct.trkParams.hitsStrip);
+  tkDetector_.PtVsEta->Fill(trackStruct.trkParams.eta, trackStruct.trkParams.pt);
+  tkDetector_.PtVsTheta->Fill(trackStruct.trkParams.theta * 180. / M_PI, trackStruct.trkParams.pt);
+
+  tkDetector_.PMeanAngleVsHits->Fill(trackStruct.trkParams.hitsSize,
+                                     trackStruct.trkParams.meanPhiSensToNorm * 180. / M_PI);
+  tkDetector_.PHitsPixelVsEta->Fill(trackStruct.trkParams.eta, trackStruct.trkParams.hitsPixel);
+  tkDetector_.PHitsPixelVsTheta->Fill(trackStruct.trkParams.theta * 180. / M_PI, trackStruct.trkParams.hitsPixel);
+  tkDetector_.PHitsStripVsEta->Fill(trackStruct.trkParams.eta, trackStruct.trkParams.hitsStrip);
+  tkDetector_.PHitsStripVsTheta->Fill(trackStruct.trkParams.theta * 180. / M_PI, trackStruct.trkParams.hitsStrip);
+  tkDetector_.PPtVsEta->Fill(trackStruct.trkParams.eta, trackStruct.trkParams.pt);
+  tkDetector_.PPtVsTheta->Fill(trackStruct.trkParams.theta * 180. / M_PI, trackStruct.trkParams.pt);
+
+  for (auto& i_hit : trackStruct.v_hitParams) {
     const TrackStruct::HitParameterStruct& hit(i_hit);
     //Put here from earlier method
-    if(hit.hitState == TrackStruct::notAssignedToSectors)continue;
-    
-    for(auto & i_sector : m_tkSector_){
+    if (hit.hitState == TrackStruct::notAssignedToSectors)
+      continue;
+
+    for (auto& i_sector : m_tkSector_) {
       bool moduleInSector(false);
-      for(auto const & i_hitSector : hit.v_sector){
-        if(i_sector.first == i_hitSector){
-          moduleInSector = true; 
+      for (auto const& i_hitSector : hit.v_sector) {
+        if (i_sector.first == i_hitSector) {
+          moduleInSector = true;
           break;
         }
       }
-      if(!moduleInSector)continue;
+      if (!moduleInSector)
+        continue;
       TrackerSectorStruct& sector(i_sector.second);
-      
-      if(hit.goodXMeasurement){
-        std::map<std::string,TrackerSectorStruct::CorrelationHists>& m_corrHists(sector.m_correlationHistsX);
-  
+
+      if (hit.goodXMeasurement) {
+        std::map<std::string, TrackerSectorStruct::CorrelationHists>& m_corrHists(sector.m_correlationHistsX);
+
         // Cluster and Hit Parameters
         this->fillHitHistsXForAnalyzerMode(hit, sector);
-        
+
         // Track Parameters
-        m_corrHists["HitsValid"].fillCorrHistsX(hit,trackStruct.trkParams.hitsValid);
-        m_corrHists["HitsGood"].fillCorrHistsX(hit,goodHitsPerTrack);
-        m_corrHists["HitsInvalid"].fillCorrHistsX(hit,trackStruct.trkParams.hitsInvalid);
-        m_corrHists["Hits2D"].fillCorrHistsX(hit,trackStruct.trkParams.hits2D);
-        m_corrHists["LayersMissed"].fillCorrHistsX(hit,trackStruct.trkParams.layersMissed);
-        m_corrHists["HitsPixel"].fillCorrHistsX(hit,trackStruct.trkParams.hitsPixel);
-        m_corrHists["HitsStrip"].fillCorrHistsX(hit,trackStruct.trkParams.hitsStrip);
-        m_corrHists["NorChi2"].fillCorrHistsX(hit,trackStruct.trkParams.norChi2);
-        m_corrHists["Theta"].fillCorrHistsX(hit,trackStruct.trkParams.theta*180./M_PI);
-        m_corrHists["Phi"].fillCorrHistsX(hit,trackStruct.trkParams.phi*180./M_PI);
-        m_corrHists["D0Beamspot"].fillCorrHistsX(hit,trackStruct.trkParams.d0Beamspot);
-        m_corrHists["Dz"].fillCorrHistsX(hit,trackStruct.trkParams.dz);
-        m_corrHists["Pt"].fillCorrHistsX(hit,trackStruct.trkParams.pt);
-        m_corrHists["P"].fillCorrHistsX(hit,trackStruct.trkParams.p);
-        m_corrHists["InvP"].fillCorrHistsX(hit,1./trackStruct.trkParams.p);
-        m_corrHists["MeanAngle"].fillCorrHistsX(hit,trackStruct.trkParams.meanPhiSensToNorm*180./M_PI);
+        m_corrHists["HitsValid"].fillCorrHistsX(hit, trackStruct.trkParams.hitsValid);
+        m_corrHists["HitsGood"].fillCorrHistsX(hit, goodHitsPerTrack);
+        m_corrHists["HitsInvalid"].fillCorrHistsX(hit, trackStruct.trkParams.hitsInvalid);
+        m_corrHists["Hits2D"].fillCorrHistsX(hit, trackStruct.trkParams.hits2D);
+        m_corrHists["LayersMissed"].fillCorrHistsX(hit, trackStruct.trkParams.layersMissed);
+        m_corrHists["HitsPixel"].fillCorrHistsX(hit, trackStruct.trkParams.hitsPixel);
+        m_corrHists["HitsStrip"].fillCorrHistsX(hit, trackStruct.trkParams.hitsStrip);
+        m_corrHists["NorChi2"].fillCorrHistsX(hit, trackStruct.trkParams.norChi2);
+        m_corrHists["Theta"].fillCorrHistsX(hit, trackStruct.trkParams.theta * 180. / M_PI);
+        m_corrHists["Phi"].fillCorrHistsX(hit, trackStruct.trkParams.phi * 180. / M_PI);
+        m_corrHists["D0Beamspot"].fillCorrHistsX(hit, trackStruct.trkParams.d0Beamspot);
+        m_corrHists["Dz"].fillCorrHistsX(hit, trackStruct.trkParams.dz);
+        m_corrHists["Pt"].fillCorrHistsX(hit, trackStruct.trkParams.pt);
+        m_corrHists["P"].fillCorrHistsX(hit, trackStruct.trkParams.p);
+        m_corrHists["InvP"].fillCorrHistsX(hit, 1. / trackStruct.trkParams.p);
+        m_corrHists["MeanAngle"].fillCorrHistsX(hit, trackStruct.trkParams.meanPhiSensToNorm * 180. / M_PI);
       }
-            
-      if(hit.goodYMeasurement){
-        std::map<std::string,TrackerSectorStruct::CorrelationHists>& m_corrHists(sector.m_correlationHistsY);
-  
+
+      if (hit.goodYMeasurement) {
+        std::map<std::string, TrackerSectorStruct::CorrelationHists>& m_corrHists(sector.m_correlationHistsY);
+
         // Cluster and Hit Parameters
         this->fillHitHistsYForAnalyzerMode(hit, sector);
-  
+
         // Track Parameters
-        m_corrHists["HitsValid"].fillCorrHistsY(hit,trackStruct.trkParams.hitsValid);
-        m_corrHists["HitsGood"].fillCorrHistsY(hit,goodHitsPerTrack);
-        m_corrHists["HitsInvalid"].fillCorrHistsY(hit,trackStruct.trkParams.hitsInvalid);
-        m_corrHists["Hits2D"].fillCorrHistsY(hit,trackStruct.trkParams.hits2D);
-        m_corrHists["LayersMissed"].fillCorrHistsY(hit,trackStruct.trkParams.layersMissed);
-        m_corrHists["HitsPixel"].fillCorrHistsY(hit,trackStruct.trkParams.hitsPixel);
-        m_corrHists["HitsStrip"].fillCorrHistsY(hit,trackStruct.trkParams.hitsStrip);
-        m_corrHists["NorChi2"].fillCorrHistsY(hit,trackStruct.trkParams.norChi2);
-        m_corrHists["Theta"].fillCorrHistsY(hit,trackStruct.trkParams.theta*180./M_PI);
-        m_corrHists["Phi"].fillCorrHistsY(hit,trackStruct.trkParams.phi*180./M_PI);
-        m_corrHists["D0Beamspot"].fillCorrHistsY(hit,trackStruct.trkParams.d0Beamspot);
-        m_corrHists["Dz"].fillCorrHistsY(hit,trackStruct.trkParams.dz);
-        m_corrHists["Pt"].fillCorrHistsY(hit,trackStruct.trkParams.pt);
-        m_corrHists["P"].fillCorrHistsY(hit,trackStruct.trkParams.p);
-        m_corrHists["InvP"].fillCorrHistsY(hit,1./trackStruct.trkParams.p);
-        m_corrHists["MeanAngle"].fillCorrHistsY(hit,trackStruct.trkParams.meanPhiSensToNorm*180./M_PI);
+        m_corrHists["HitsValid"].fillCorrHistsY(hit, trackStruct.trkParams.hitsValid);
+        m_corrHists["HitsGood"].fillCorrHistsY(hit, goodHitsPerTrack);
+        m_corrHists["HitsInvalid"].fillCorrHistsY(hit, trackStruct.trkParams.hitsInvalid);
+        m_corrHists["Hits2D"].fillCorrHistsY(hit, trackStruct.trkParams.hits2D);
+        m_corrHists["LayersMissed"].fillCorrHistsY(hit, trackStruct.trkParams.layersMissed);
+        m_corrHists["HitsPixel"].fillCorrHistsY(hit, trackStruct.trkParams.hitsPixel);
+        m_corrHists["HitsStrip"].fillCorrHistsY(hit, trackStruct.trkParams.hitsStrip);
+        m_corrHists["NorChi2"].fillCorrHistsY(hit, trackStruct.trkParams.norChi2);
+        m_corrHists["Theta"].fillCorrHistsY(hit, trackStruct.trkParams.theta * 180. / M_PI);
+        m_corrHists["Phi"].fillCorrHistsY(hit, trackStruct.trkParams.phi * 180. / M_PI);
+        m_corrHists["D0Beamspot"].fillCorrHistsY(hit, trackStruct.trkParams.d0Beamspot);
+        m_corrHists["Dz"].fillCorrHistsY(hit, trackStruct.trkParams.dz);
+        m_corrHists["Pt"].fillCorrHistsY(hit, trackStruct.trkParams.pt);
+        m_corrHists["P"].fillCorrHistsY(hit, trackStruct.trkParams.p);
+        m_corrHists["InvP"].fillCorrHistsY(hit, 1. / trackStruct.trkParams.p);
+        m_corrHists["MeanAngle"].fillCorrHistsY(hit, trackStruct.trkParams.meanPhiSensToNorm * 180. / M_PI);
       }
-      
-      // Special Histograms 
-      for(auto & i_sigmaX : sector.m_sigmaX){
-        for(auto & iHist : i_sigmaX.second){
-          if     (i_sigmaX.first=="sigmaXHit") iHist->Fill(hit.errXHit*10000.);
-          else if(i_sigmaX.first=="sigmaXTrk") iHist->Fill(hit.errXTrk*10000.);
-          else if(i_sigmaX.first=="sigmaX")    iHist->Fill(hit.errX*10000.);
+
+      // Special Histograms
+      for (auto& i_sigmaX : sector.m_sigmaX) {
+        for (auto& iHist : i_sigmaX.second) {
+          if (i_sigmaX.first == "sigmaXHit")
+            iHist->Fill(hit.errXHit * 10000.);
+          else if (i_sigmaX.first == "sigmaXTrk")
+            iHist->Fill(hit.errXTrk * 10000.);
+          else if (i_sigmaX.first == "sigmaX")
+            iHist->Fill(hit.errX * 10000.);
         }
       }
-      for(auto & i_sigmaY : sector.m_sigmaY){
-        for(auto & iHist : i_sigmaY.second){
-          if     (i_sigmaY.first=="sigmaYHit") iHist->Fill(hit.errYHit*10000.);
-          else if(i_sigmaY.first=="sigmaYTrk") iHist->Fill(hit.errYTrk*10000.);
-          else if(i_sigmaY.first=="sigmaY")    iHist->Fill(hit.errY*10000.);
+      for (auto& i_sigmaY : sector.m_sigmaY) {
+        for (auto& iHist : i_sigmaY.second) {
+          if (i_sigmaY.first == "sigmaYHit")
+            iHist->Fill(hit.errYHit * 10000.);
+          else if (i_sigmaY.first == "sigmaYTrk")
+            iHist->Fill(hit.errYTrk * 10000.);
+          else if (i_sigmaY.first == "sigmaY")
+            iHist->Fill(hit.errY * 10000.);
         }
       }
     }
   }
 }
 
-
-
-void
-ApeEstimator::fillHitHistsXForAnalyzerMode(const TrackStruct::HitParameterStruct& hit, TrackerSectorStruct& sector){
+void ApeEstimator::fillHitHistsXForAnalyzerMode(const TrackStruct::HitParameterStruct& hit,
+                                                TrackerSectorStruct& sector) {
   std::map<std::string, TrackerSectorStruct::CorrelationHists>& m_corrHists(sector.m_correlationHistsX);
-  
+
   // Cluster Parameters
   m_corrHists["WidthX"].fillCorrHistsX(hit, hit.widthX);
   m_corrHists["BaryStripX"].fillCorrHistsX(hit, hit.baryStripX);
-  
-  if(hit.isPixelHit){
+
+  if (hit.isPixelHit) {
     m_corrHists["ChargePixel"].fillCorrHistsX(hit, hit.chargePixel);
     m_corrHists["ClusterProbXY"].fillCorrHistsX(hit, hit.clusterProbabilityXY);
     m_corrHists["ClusterProbQ"].fillCorrHistsX(hit, hit.clusterProbabilityQ);
@@ -1932,8 +2367,8 @@ ApeEstimator::fillHitHistsXForAnalyzerMode(const TrackStruct::HitParameterStruct
     m_corrHists["HasBadPixels"].fillCorrHistsX(hit, hit.hasBadPixels);
     m_corrHists["SpansTwoRoc"].fillCorrHistsX(hit, hit.spansTwoRoc);
     m_corrHists["QBin"].fillCorrHistsX(hit, hit.qBin);
-    
-  }else{
+
+  } else {
     m_corrHists["ChargeStrip"].fillCorrHistsX(hit, hit.chargeStrip);
     m_corrHists["MaxStrip"].fillCorrHistsX(hit, hit.maxStrip);
     m_corrHists["MaxCharge"].fillCorrHistsX(hit, hit.maxCharge);
@@ -1944,55 +2379,54 @@ ApeEstimator::fillHitHistsXForAnalyzerMode(const TrackStruct::HitParameterStruct
     m_corrHists["ChargeLRminus"].fillCorrHistsX(hit, hit.chargeLRminus);
     m_corrHists["SOverN"].fillCorrHistsX(hit, hit.sOverN);
     m_corrHists["WidthProj"].fillCorrHistsX(hit, hit.projWidth);
-    m_corrHists["WidthDiff"].fillCorrHistsX(hit, hit.projWidth-static_cast<float>( hit.widthX));
-    
-    sector.WidthVsWidthProjected->Fill( hit.projWidth, hit.widthX);
-    sector.PWidthVsWidthProjected->Fill( hit.projWidth, hit.widthX);
-    
-    sector.WidthDiffVsMaxStrip->Fill( hit.maxStrip, hit.projWidth-static_cast<float>( hit.widthX));
-    sector.PWidthDiffVsMaxStrip->Fill( hit.maxStrip, hit.projWidth-static_cast<float>( hit.widthX));
-    
-    sector.WidthDiffVsSigmaXHit->Fill( hit.errXHit, hit.projWidth-static_cast<float>( hit.widthX));
-    sector.PWidthDiffVsSigmaXHit->Fill( hit.errXHit, hit.projWidth-static_cast<float>( hit.widthX));
-    
-    sector.WidthVsPhiSensX->Fill( hit.phiSensX*180./M_PI, hit.widthX);
-    sector.PWidthVsPhiSensX->Fill( hit.phiSensX*180./M_PI, hit.widthX);
+    m_corrHists["WidthDiff"].fillCorrHistsX(hit, hit.projWidth - static_cast<float>(hit.widthX));
+
+    sector.WidthVsWidthProjected->Fill(hit.projWidth, hit.widthX);
+    sector.PWidthVsWidthProjected->Fill(hit.projWidth, hit.widthX);
+
+    sector.WidthDiffVsMaxStrip->Fill(hit.maxStrip, hit.projWidth - static_cast<float>(hit.widthX));
+    sector.PWidthDiffVsMaxStrip->Fill(hit.maxStrip, hit.projWidth - static_cast<float>(hit.widthX));
+
+    sector.WidthDiffVsSigmaXHit->Fill(hit.errXHit, hit.projWidth - static_cast<float>(hit.widthX));
+    sector.PWidthDiffVsSigmaXHit->Fill(hit.errXHit, hit.projWidth - static_cast<float>(hit.widthX));
+
+    sector.WidthVsPhiSensX->Fill(hit.phiSensX * 180. / M_PI, hit.widthX);
+    sector.PWidthVsPhiSensX->Fill(hit.phiSensX * 180. / M_PI, hit.widthX);
   }
-  
+
   // Hit Parameters
-  m_corrHists["SigmaXHit"].fillCorrHistsX(hit, hit.errXHit*10000.);
-  m_corrHists["SigmaXTrk"].fillCorrHistsX(hit, hit.errXTrk*10000.);
-  m_corrHists["SigmaX"].fillCorrHistsX(hit, hit.errX*10000.);
-  
-  m_corrHists["PhiSens"].fillCorrHistsX(hit, hit.phiSens*180./M_PI);
-  m_corrHists["PhiSensX"].fillCorrHistsX(hit, hit.phiSensX*180./M_PI);
-  m_corrHists["PhiSensY"].fillCorrHistsX(hit, hit.phiSensY*180./M_PI);
-  
-  sector.XHit ->Fill(hit.xHit);
-  sector.XTrk ->Fill(hit.xTrk);
-  sector.SigmaX2->Fill(hit.errX2*10000.*10000.);
-  
-  sector.ResX ->Fill(hit.resX*10000.);
+  m_corrHists["SigmaXHit"].fillCorrHistsX(hit, hit.errXHit * 10000.);
+  m_corrHists["SigmaXTrk"].fillCorrHistsX(hit, hit.errXTrk * 10000.);
+  m_corrHists["SigmaX"].fillCorrHistsX(hit, hit.errX * 10000.);
+
+  m_corrHists["PhiSens"].fillCorrHistsX(hit, hit.phiSens * 180. / M_PI);
+  m_corrHists["PhiSensX"].fillCorrHistsX(hit, hit.phiSensX * 180. / M_PI);
+  m_corrHists["PhiSensY"].fillCorrHistsX(hit, hit.phiSensY * 180. / M_PI);
+
+  sector.XHit->Fill(hit.xHit);
+  sector.XTrk->Fill(hit.xTrk);
+  sector.SigmaX2->Fill(hit.errX2 * 10000. * 10000.);
+
+  sector.ResX->Fill(hit.resX * 10000.);
   sector.NorResX->Fill(hit.norResX);
-  
-  sector.ProbX->Fill(hit.probX);
-  
-  sector.PhiSensXVsBarycentreX->Fill(hit.baryStripX, hit.phiSensX*180./M_PI);
-  sector.PPhiSensXVsBarycentreX->Fill(hit.baryStripX, hit.phiSensX*180./M_PI);
-}
 
+  sector.ProbX->Fill(hit.probX);
 
+  sector.PhiSensXVsBarycentreX->Fill(hit.baryStripX, hit.phiSensX * 180. / M_PI);
+  sector.PPhiSensXVsBarycentreX->Fill(hit.baryStripX, hit.phiSensX * 180. / M_PI);
+}
 
-void
-ApeEstimator::fillHitHistsYForAnalyzerMode(const TrackStruct::HitParameterStruct& hit, TrackerSectorStruct& sector){
+void ApeEstimator::fillHitHistsYForAnalyzerMode(const TrackStruct::HitParameterStruct& hit,
+                                                TrackerSectorStruct& sector) {
   std::map<std::string, TrackerSectorStruct::CorrelationHists>& m_corrHists(sector.m_correlationHistsY);
   // Do not fill anything for strip
-  if(!hit.isPixelHit)return;
-  
+  if (!hit.isPixelHit)
+    return;
+
   // Cluster Parameters
-  m_corrHists["WidthY"].fillCorrHistsY(hit,hit.widthY);
-  m_corrHists["BaryStripY"].fillCorrHistsY(hit,hit.baryStripY);
-  
+  m_corrHists["WidthY"].fillCorrHistsY(hit, hit.widthY);
+  m_corrHists["BaryStripY"].fillCorrHistsY(hit, hit.baryStripY);
+
   m_corrHists["ChargePixel"].fillCorrHistsY(hit, hit.chargePixel);
   m_corrHists["ClusterProbXY"].fillCorrHistsY(hit, hit.clusterProbabilityXY);
   m_corrHists["ClusterProbQ"].fillCorrHistsY(hit, hit.clusterProbabilityQ);
@@ -2002,113 +2436,106 @@ ApeEstimator::fillHitHistsYForAnalyzerMode(const TrackStruct::HitParameterStruct
   m_corrHists["HasBadPixels"].fillCorrHistsY(hit, hit.hasBadPixels);
   m_corrHists["SpansTwoRoc"].fillCorrHistsY(hit, hit.spansTwoRoc);
   m_corrHists["QBin"].fillCorrHistsY(hit, hit.qBin);
-  
+
   // Hit Parameters
-  m_corrHists["SigmaYHit"].fillCorrHistsY(hit, hit.errYHit*10000.);
-  m_corrHists["SigmaYTrk"].fillCorrHistsY(hit, hit.errYTrk*10000.);
-  m_corrHists["SigmaY"].fillCorrHistsY(hit, hit.errY*10000.);
-  
-  m_corrHists["PhiSens"].fillCorrHistsY(hit, hit.phiSens*180./M_PI);
-  m_corrHists["PhiSensX"].fillCorrHistsY(hit, hit.phiSensX*180./M_PI);
-  m_corrHists["PhiSensY"].fillCorrHistsY(hit, hit.phiSensY*180./M_PI);
-  
-  sector.YHit ->Fill(hit.yHit);
-  sector.YTrk ->Fill(hit.yTrk);
-  sector.SigmaY2->Fill(hit.errY2*10000.*10000.);
-  
-  sector.ResY ->Fill(hit.resY*10000.);
+  m_corrHists["SigmaYHit"].fillCorrHistsY(hit, hit.errYHit * 10000.);
+  m_corrHists["SigmaYTrk"].fillCorrHistsY(hit, hit.errYTrk * 10000.);
+  m_corrHists["SigmaY"].fillCorrHistsY(hit, hit.errY * 10000.);
+
+  m_corrHists["PhiSens"].fillCorrHistsY(hit, hit.phiSens * 180. / M_PI);
+  m_corrHists["PhiSensX"].fillCorrHistsY(hit, hit.phiSensX * 180. / M_PI);
+  m_corrHists["PhiSensY"].fillCorrHistsY(hit, hit.phiSensY * 180. / M_PI);
+
+  sector.YHit->Fill(hit.yHit);
+  sector.YTrk->Fill(hit.yTrk);
+  sector.SigmaY2->Fill(hit.errY2 * 10000. * 10000.);
+
+  sector.ResY->Fill(hit.resY * 10000.);
   sector.NorResY->Fill(hit.norResY);
-  
-  sector.ProbY->Fill(hit.probY);
-  
-  sector.PhiSensYVsBarycentreY->Fill(hit.baryStripY, hit.phiSensY*180./M_PI);
-  sector.PPhiSensYVsBarycentreY->Fill(hit.baryStripY, hit.phiSensY*180./M_PI);
-}
 
+  sector.ProbY->Fill(hit.probY);
 
+  sector.PhiSensYVsBarycentreY->Fill(hit.baryStripY, hit.phiSensY * 180. / M_PI);
+  sector.PPhiSensYVsBarycentreY->Fill(hit.baryStripY, hit.phiSensY * 180. / M_PI);
+}
 
-void
-ApeEstimator::fillHistsForApeCalculation(const TrackStruct& trackStruct){
+void ApeEstimator::fillHistsForApeCalculation(const TrackStruct& trackStruct) {
   unsigned int goodHitsPerTrack(trackStruct.v_hitParams.size());
-  
-  if(parameterSet_.getParameter<bool>("applyTrackCuts")){
+
+  if (parameterSet_.getParameter<bool>("applyTrackCuts")) {
     // which tracks to take? need min. nr. of selected hits?
-    if(goodHitsPerTrack < minGoodHitsPerTrack_)return;
+    if (goodHitsPerTrack < minGoodHitsPerTrack_)
+      return;
   }
-  
-  for(auto const & i_hit : trackStruct.v_hitParams){
+
+  for (auto const& i_hit : trackStruct.v_hitParams) {
     // Put here from earlier method
-    if(i_hit.hitState == TrackStruct::notAssignedToSectors)continue;
-    
-    for(auto & i_sector : m_tkSector_){
-      
+    if (i_hit.hitState == TrackStruct::notAssignedToSectors)
+      continue;
+
+    for (auto& i_sector : m_tkSector_) {
       bool moduleInSector(false);
-      for(auto const & i_hitSector : i_hit.v_sector){
-        if(i_sector.first == i_hitSector){
-          moduleInSector = true; 
+      for (auto const& i_hitSector : i_hit.v_sector) {
+        if (i_sector.first == i_hitSector) {
+          moduleInSector = true;
           break;
         }
       }
-      if(!moduleInSector)continue;      
-      
-      if(!calculateApe_)continue;
-      
-      if(i_hit.goodXMeasurement){
-        for(auto const & i_errBins : m_resErrBins_){
+      if (!moduleInSector)
+        continue;
+
+      if (!calculateApe_)
+        continue;
+
+      if (i_hit.goodXMeasurement) {
+        for (auto const& i_errBins : m_resErrBins_) {
           // Separate the bins for residual resolution w/o APE, to be consistent within iterations where APE will change (have same hit always in same bin)
           // So also fill this value in the histogram sigmaX
           // But of course use the normalized residual regarding the APE to have its influence in its width
-          if(i_hit.errXWoApe < i_errBins.second.first || i_hit.errXWoApe >= i_errBins.second.second){
+          if (i_hit.errXWoApe < i_errBins.second.first || i_hit.errXWoApe >= i_errBins.second.second) {
             continue;
           }
-          i_sector.second.m_binnedHists[i_errBins.first]["sigmaX"] ->Fill(i_hit.errXWoApe);
+          i_sector.second.m_binnedHists[i_errBins.first]["sigmaX"]->Fill(i_hit.errXWoApe);
           i_sector.second.m_binnedHists[i_errBins.first]["norResX"]->Fill(i_hit.norResX);
           break;
         }
-        i_sector.second.ResX->Fill(i_hit.resX*10000.);
+        i_sector.second.ResX->Fill(i_hit.resX * 10000.);
         i_sector.second.NorResX->Fill(i_hit.norResX);
       }
-      
-      if(i_hit.goodYMeasurement){
-        for(auto const & i_errBins : m_resErrBins_){
-            // Separate the bins for residual resolution w/o APE, to be consistent within iterations where APE will change (have same hit always in same bin)
-            // So also fill this value in the histogram sigmaY
-            // But of course use the normalized residual regarding the APE to have its influence in its width
-            if(i_hit.errYWoApe < i_errBins.second.first || i_hit.errYWoApe >= i_errBins.second.second){
-              continue;
-            }
-            i_sector.second.m_binnedHists[i_errBins.first]["sigmaY"] ->Fill(i_hit.errYWoApe);
-            i_sector.second.m_binnedHists[i_errBins.first]["norResY"]->Fill(i_hit.norResY);
-            break;
+
+      if (i_hit.goodYMeasurement) {
+        for (auto const& i_errBins : m_resErrBins_) {
+          // Separate the bins for residual resolution w/o APE, to be consistent within iterations where APE will change (have same hit always in same bin)
+          // So also fill this value in the histogram sigmaY
+          // But of course use the normalized residual regarding the APE to have its influence in its width
+          if (i_hit.errYWoApe < i_errBins.second.first || i_hit.errYWoApe >= i_errBins.second.second) {
+            continue;
+          }
+          i_sector.second.m_binnedHists[i_errBins.first]["sigmaY"]->Fill(i_hit.errYWoApe);
+          i_sector.second.m_binnedHists[i_errBins.first]["norResY"]->Fill(i_hit.norResY);
+          break;
         }
-        i_sector.second.ResY->Fill(i_hit.resY*10000.);
+        i_sector.second.ResY->Fill(i_hit.resY * 10000.);
         i_sector.second.NorResY->Fill(i_hit.norResY);
       }
     }
   }
 }
 
-
-
-
 // -----------------------------------------------------------------------------------------------------------
 
-
-
-void
-ApeEstimator::calculateAPE(){
+void ApeEstimator::calculateAPE() {
   // Loop over sectors for calculating APE
-  for(auto & i_sector : m_tkSector_){    
-     
-     // Loop over residual error bins to calculate APE for every bin
-    for(auto const & i_errBins : i_sector.second.m_binnedHists){
-      std::map<std::string,TH1*> m_Hists = i_errBins.second;
-       
-       // Fitting Parameters
+  for (auto& i_sector : m_tkSector_) {
+    // Loop over residual error bins to calculate APE for every bin
+    for (auto const& i_errBins : i_sector.second.m_binnedHists) {
+      std::map<std::string, TH1*> m_Hists = i_errBins.second;
+
+      // Fitting Parameters
       double integralX = m_Hists["norResX"]->Integral();
       i_sector.second.EntriesX->SetBinContent(i_errBins.first, integralX);
-      
-      if(i_sector.second.isPixel){
+
+      if (i_sector.second.isPixel) {
         double integralY = m_Hists["norResY"]->Integral();
         i_sector.second.EntriesY->SetBinContent(i_errBins.first, integralY);
       }
@@ -2116,142 +2543,140 @@ ApeEstimator::calculateAPE(){
   }
 }
 
-
-
-
 // -----------------------------------------------------------------------------------------------------------
 
-
-bool
-ApeEstimator::isHit2D(const TrackingRecHit &hit) const
-{
+bool ApeEstimator::isHit2D(const TrackingRecHit& hit) const {
   // we count SiStrip stereo modules as 2D if selected via countStereoHitAs2D_
   // (since they provide theta information)
   // --- NO, here it is always set to true ---
-  if(!hit.isValid() || (hit.dimension() < 2 && !dynamic_cast<const SiStripRecHit1D*>(&hit))){
-    return false; // real RecHit1D - but SiStripRecHit1D depends on countStereoHitAs2D_
-  }else{
+  if (!hit.isValid() || (hit.dimension() < 2 && !dynamic_cast<const SiStripRecHit1D*>(&hit))) {
+    return false;  // real RecHit1D - but SiStripRecHit1D depends on countStereoHitAs2D_
+  } else {
     const DetId detId(hit.geographicalId());
-    if(detId.det() == DetId::Tracker) {
-      if(detId.subdetId() == PixelSubdetector::PixelBarrel || detId.subdetId() == PixelSubdetector::PixelEndcap) {
-        return true; // pixel is always 2D
-      }else{ // should be SiStrip now
+    if (detId.det() == DetId::Tracker) {
+      if (detId.subdetId() == PixelSubdetector::PixelBarrel || detId.subdetId() == PixelSubdetector::PixelEndcap) {
+        return true;  // pixel is always 2D
+      } else {        // should be SiStrip now
         const SiStripDetId stripId(detId);
-        if (stripId.stereo()) return true; // stereo modules
-        else if (dynamic_cast<const SiStripRecHit1D*>(&hit) || dynamic_cast<const SiStripRecHit2D*>(&hit)) return false; // rphi modules hit
-        //the following two are not used any more since ages... 
-        else if (dynamic_cast<const SiStripMatchedRecHit2D*>(&hit)) return true; // matched is 2D
+        if (stripId.stereo())
+          return true;  // stereo modules
+        else if (dynamic_cast<const SiStripRecHit1D*>(&hit) || dynamic_cast<const SiStripRecHit2D*>(&hit))
+          return false;  // rphi modules hit
+        //the following two are not used any more since ages...
+        else if (dynamic_cast<const SiStripMatchedRecHit2D*>(&hit))
+          return true;  // matched is 2D
         else if (dynamic_cast<const ProjectedSiStripRecHit2D*>(&hit)) {
           const ProjectedSiStripRecHit2D* pH = static_cast<const ProjectedSiStripRecHit2D*>(&hit);
-          return (this->isHit2D(pH->originalHit())); // depends on original...
-        }else{
+          return (this->isHit2D(pH->originalHit()));  // depends on original...
+        } else {
           edm::LogError("UnkownType") << "@SUB=AlignmentTrackSelector::isHit2D"
                                       << "Tracker hit not in pixel, neither SiStripRecHit[12]D nor "
                                       << "SiStripMatchedRecHit2D nor ProjectedSiStripRecHit2D.";
           return false;
         }
       }
-    }else{ // not tracker??
+    } else {  // not tracker??
       edm::LogWarning("DetectorMismatch") << "@SUB=AlignmentTrackSelector::isHit2D"
                                           << "Hit not in tracker with 'official' dimension >=2.";
-      return true; // dimension() >= 2 so accept that...
+      return true;  // dimension() >= 2 so accept that...
     }
   }
   // never reached...
 }
 
-
-
 // -----------------------------------------------------------------------------------------------------------
 
 // ------------ method called to for each event  ------------
-void
-ApeEstimator::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   reco::BeamSpot beamSpot;
-   edm::Handle<reco::BeamSpot> beamSpotHandle;
-   iEvent.getByToken(offlinebeamSpot_, beamSpotHandle);
-   
-   if (beamSpotHandle.isValid()){
-     beamSpot = *beamSpotHandle;
-   }else{
-     edm::LogError("ApeEstimator")<<"No beam spot available from EventSetup"
-                                  <<"\n...skip event";
-     return;
-   }
-      
-   edm::Handle<TrajTrackAssociationCollection> m_TrajTracksMap;
-   iEvent.getByToken(tjTagToken_, m_TrajTracksMap);
-   
-   if(analyzerMode_)tkDetector_.TrkSize->Fill(m_TrajTracksMap->size());
-   
-   if(maxTracksPerEvent_!=0 && m_TrajTracksMap->size()>maxTracksPerEvent_)return;
-   
-   //Creation of (traj,track)
-   typedef std::pair<const Trajectory*, const reco::Track*> ConstTrajTrackPair;
-   typedef std::vector<ConstTrajTrackPair> ConstTrajTrackPairCollection;
-   ConstTrajTrackPairCollection trajTracks;
-   
-   TrajTrackAssociationCollection::const_iterator i_trajTrack;
-   for(i_trajTrack = m_TrajTracksMap->begin();i_trajTrack != m_TrajTracksMap->end();++i_trajTrack){
-     trajTracks.push_back(ConstTrajTrackPair(&(*(*i_trajTrack).key), &(*(*i_trajTrack).val)));
-   }
-   
-   
-   //Loop over Tracks & Hits
-   unsigned int trackSizeGood(0);
-   ConstTrajTrackPairCollection::const_iterator iTrack;
-   for(iTrack = trajTracks.begin(); iTrack != trajTracks.end();++iTrack){
-     
-     const Trajectory *traj = (*iTrack).first;
-     const reco::Track *track = (*iTrack).second;
-     
-     TrackStruct trackStruct;
-     trackStruct.trkParams = this->fillTrackVariables(*track, *traj, beamSpot);
-     
-     if(trackCut_)continue;
-     
-     const std::vector<TrajectoryMeasurement> v_meas = (*traj).measurements();
-     
-     //Loop over Hits
-     for(std::vector<TrajectoryMeasurement>::const_iterator i_meas = v_meas.begin(); i_meas != v_meas.end(); ++i_meas){
-       TrackStruct::HitParameterStruct hitParams = this->fillHitVariables(*i_meas, iSetup);
-       if(this->hitSelected(hitParams))trackStruct.v_hitParams.push_back(hitParams);
-     }
-     
-     if(analyzerMode_)this->fillHistsForAnalyzerMode(trackStruct);
-     if(calculateApe_)this->fillHistsForApeCalculation(trackStruct);
-     
-     if(!trackStruct.v_hitParams.empty())++trackSizeGood;
-   }
-   if(analyzerMode_ && trackSizeGood>0)tkDetector_.TrkSizeGood->Fill(trackSizeGood);
-}
+void ApeEstimator::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
+  reco::BeamSpot beamSpot;
+  edm::Handle<reco::BeamSpot> beamSpotHandle;
+  iEvent.getByToken(offlinebeamSpot_, beamSpotHandle);
+
+  if (beamSpotHandle.isValid()) {
+    beamSpot = *beamSpotHandle;
+  } else {
+    edm::LogError("ApeEstimator") << "No beam spot available from EventSetup"
+                                  << "\n...skip event";
+    return;
+  }
+
+  edm::Handle<TrajTrackAssociationCollection> m_TrajTracksMap;
+  iEvent.getByToken(tjTagToken_, m_TrajTracksMap);
 
+  if (analyzerMode_)
+    tkDetector_.TrkSize->Fill(m_TrajTracksMap->size());
+
+  if (maxTracksPerEvent_ != 0 && m_TrajTracksMap->size() > maxTracksPerEvent_)
+    return;
+
+  //Creation of (traj,track)
+  typedef std::pair<const Trajectory*, const reco::Track*> ConstTrajTrackPair;
+  typedef std::vector<ConstTrajTrackPair> ConstTrajTrackPairCollection;
+  ConstTrajTrackPairCollection trajTracks;
+
+  TrajTrackAssociationCollection::const_iterator i_trajTrack;
+  for (i_trajTrack = m_TrajTracksMap->begin(); i_trajTrack != m_TrajTracksMap->end(); ++i_trajTrack) {
+    trajTracks.push_back(ConstTrajTrackPair(&(*(*i_trajTrack).key), &(*(*i_trajTrack).val)));
+  }
+
+  //Loop over Tracks & Hits
+  unsigned int trackSizeGood(0);
+  ConstTrajTrackPairCollection::const_iterator iTrack;
+  for (iTrack = trajTracks.begin(); iTrack != trajTracks.end(); ++iTrack) {
+    const Trajectory* traj = (*iTrack).first;
+    const reco::Track* track = (*iTrack).second;
+
+    TrackStruct trackStruct;
+    trackStruct.trkParams = this->fillTrackVariables(*track, *traj, beamSpot);
+
+    if (trackCut_)
+      continue;
+
+    const std::vector<TrajectoryMeasurement> v_meas = (*traj).measurements();
+
+    //Loop over Hits
+    for (std::vector<TrajectoryMeasurement>::const_iterator i_meas = v_meas.begin(); i_meas != v_meas.end(); ++i_meas) {
+      TrackStruct::HitParameterStruct hitParams = this->fillHitVariables(*i_meas, iSetup);
+      if (this->hitSelected(hitParams))
+        trackStruct.v_hitParams.push_back(hitParams);
+    }
+
+    if (analyzerMode_)
+      this->fillHistsForAnalyzerMode(trackStruct);
+    if (calculateApe_)
+      this->fillHistsForApeCalculation(trackStruct);
+
+    if (!trackStruct.v_hitParams.empty())
+      ++trackSizeGood;
+  }
+  if (analyzerMode_ && trackSizeGood > 0)
+    tkDetector_.TrkSizeGood->Fill(trackSizeGood);
+}
 
 // ------------ method called once each job just before starting event loop  ------------
-void 
-ApeEstimator::beginJob(){
-   this->hitSelection();
-   
-   this->sectorBuilder();
-   
-   this->residualErrorBinning();
-   
-   if(analyzerMode_)this->bookSectorHistsForAnalyzerMode();
-   
-   if(calculateApe_)this->bookSectorHistsForApeCalculation();
-   
-   if(analyzerMode_)this->bookTrackHists();
-   
-   
+void ApeEstimator::beginJob() {
+  this->hitSelection();
+
+  this->sectorBuilder();
+
+  this->residualErrorBinning();
+
+  if (analyzerMode_)
+    this->bookSectorHistsForAnalyzerMode();
+
+  if (calculateApe_)
+    this->bookSectorHistsForApeCalculation();
+
+  if (analyzerMode_)
+    this->bookTrackHists();
 }
 
 // ------------ method called once each job just after ending the event loop  ------------
-void 
-ApeEstimator::endJob() {
-   if(calculateApe_)this->calculateAPE();
-   
-   edm::LogInfo("HitSelector")<<"\nThere are "<<counter1<< " negative Errors calculated\n";
+void ApeEstimator::endJob() {
+  if (calculateApe_)
+    this->calculateAPE();
+
+  edm::LogInfo("HitSelector") << "\nThere are " << counter1 << " negative Errors calculated\n";
 }
 
 //define this as a plug-in
diff --git a/Alignment/APEEstimation/plugins/ApeEstimatorSummary.cc b/Alignment/APEEstimation/plugins/ApeEstimatorSummary.cc
index 593a85c2dc369..81ef71063d6e5 100644
--- a/Alignment/APEEstimation/plugins/ApeEstimatorSummary.cc
+++ b/Alignment/APEEstimation/plugins/ApeEstimatorSummary.cc
@@ -2,7 +2,7 @@
 //
 // Package:    ApeEstimatorSummary
 // Class:      ApeEstimatorSummary
-// 
+//
 /**\class ApeEstimatorSummary ApeEstimatorSummary.cc Alignment/APEEstimation/src/ApeEstimatorSummary.cc
 
  Description: [one line class summary]
@@ -18,7 +18,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <fstream>
@@ -39,7 +38,6 @@
 
 #include "CLHEP/Matrix/SymMatrix.h"
 
-
 //#include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h"
 #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h"
 #include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
@@ -47,7 +45,6 @@
 //...............
 #include "Alignment/APEEstimation/interface/TrackerSectorStruct.h"
 
-
 #include "TH1.h"
 #include "TString.h"
 #include "TFile.h"
@@ -60,36 +57,34 @@
 //
 
 class ApeEstimatorSummary : public edm::one::EDAnalyzer<> {
-   public:
-      explicit ApeEstimatorSummary(const edm::ParameterSet&);
-      ~ApeEstimatorSummary() override;
-
-
-   private:
-      void beginJob() override ;
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      void endJob() override ;
-      
-      void openInputFile();
-      void getTrackerSectorStructs();
-      void bookHists();
-      std::vector<double> residualErrorBinning();
-      void writeHists();
-      
-      void calculateApe();
-      
-      enum ApeWeight{wInvalid, wUnity, wEntries, wEntriesOverSigmaX2};
-      
-      // ----------member data ---------------------------
-      const edm::ParameterSet parameterSet_;
-      
-      bool firstEvent=true;
-      
-      
-      TFile* inputFile_;
-      
-      std::map<unsigned int, TrackerSectorStruct> m_tkSector_;
-      unsigned int noSectors_;
+public:
+  explicit ApeEstimatorSummary(const edm::ParameterSet&);
+  ~ApeEstimatorSummary() override;
+
+private:
+  void beginJob() override;
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void endJob() override;
+
+  void openInputFile();
+  void getTrackerSectorStructs();
+  void bookHists();
+  std::vector<double> residualErrorBinning();
+  void writeHists();
+
+  void calculateApe();
+
+  enum ApeWeight { wInvalid, wUnity, wEntries, wEntriesOverSigmaX2 };
+
+  // ----------member data ---------------------------
+  const edm::ParameterSet parameterSet_;
+
+  bool firstEvent = true;
+
+  TFile* inputFile_;
+
+  std::map<unsigned int, TrackerSectorStruct> m_tkSector_;
+  unsigned int noSectors_;
 };
 
 //
@@ -103,192 +98,220 @@ class ApeEstimatorSummary : public edm::one::EDAnalyzer<> {
 //
 // constructors and destructor
 //
-ApeEstimatorSummary::ApeEstimatorSummary(const edm::ParameterSet& iConfig):
-  parameterSet_(iConfig),
-  inputFile_(nullptr)
-{
-}
-
-
-ApeEstimatorSummary::~ApeEstimatorSummary()
-{
-}
+ApeEstimatorSummary::ApeEstimatorSummary(const edm::ParameterSet& iConfig)
+    : parameterSet_(iConfig), inputFile_(nullptr) {}
 
+ApeEstimatorSummary::~ApeEstimatorSummary() {}
 
 //
 // member functions
 //
 
-
-void
-ApeEstimatorSummary::openInputFile(){
+void ApeEstimatorSummary::openInputFile() {
   const std::string inputFileName(parameterSet_.getParameter<std::string>("InputFile"));
   std::ifstream inputFileStream;
   // Check if baseline file exists
   inputFileStream.open(inputFileName.c_str());
-  if(inputFileStream.is_open()){
-    inputFile_ = new TFile(inputFileName.c_str(),"READ");
-  }
-  if(inputFile_){
-    edm::LogInfo("CalculateAPE")<<"Input file from loop over tracks and corresponding hits sucessfully opened";
+  if (inputFileStream.is_open()) {
+    inputFile_ = new TFile(inputFileName.c_str(), "READ");
   }
-  else{
-    edm::LogError("CalculateAPE")<<"There is NO input file\n"
-       <<"...APE calculation stopped. Please check path of input file name in config:\n"
-       <<"\t"<<inputFileName;
-    throw edm::Exception( edm::errors::Configuration, "Bad input file name");
+  if (inputFile_) {
+    edm::LogInfo("CalculateAPE") << "Input file from loop over tracks and corresponding hits sucessfully opened";
+  } else {
+    edm::LogError("CalculateAPE") << "There is NO input file\n"
+                                  << "...APE calculation stopped. Please check path of input file name in config:\n"
+                                  << "\t" << inputFileName;
+    throw edm::Exception(edm::errors::Configuration, "Bad input file name");
   }
 }
 
-
-
-void
-ApeEstimatorSummary::getTrackerSectorStructs(){
+void ApeEstimatorSummary::getTrackerSectorStructs() {
   // At present first of the plugins registered in TFileService needs to be the one containing the normalized residual histos per sector per error bin
   TString pluginName(inputFile_->GetListOfKeys()->At(0)->GetName());
-  
+
   pluginName += "/";
   TDirectory *sectorDir(nullptr), *intervalDir(nullptr);
   bool sectorBool(true);
   unsigned int iSector(1);
-  for(;sectorBool;++iSector){
+  for (; sectorBool; ++iSector) {
     std::stringstream sectorName, fullSectorName;
     sectorName << "Sector_" << iSector << "/";
     fullSectorName << pluginName << sectorName.str();
     TString fullName(fullSectorName.str().c_str());
     inputFile_->cd();
     sectorDir = (TDirectory*)inputFile_->TDirectory::GetDirectory(fullName);
-    if(sectorDir){
+    if (sectorDir) {
       TrackerSectorStruct tkSector;
       sectorDir->GetObject("z_name;1", tkSector.Name);
       tkSector.name = tkSector.Name->GetTitle();
       bool intervalBool(true);
-      for(unsigned int iInterval(1);intervalBool;++iInterval){
+      for (unsigned int iInterval(1); intervalBool; ++iInterval) {
         std::stringstream intervalName, fullIntervalName;
-        intervalName << "Interval_" << iInterval <<"/";
+        intervalName << "Interval_" << iInterval << "/";
         fullIntervalName << fullSectorName.str() << intervalName.str();
         fullName = fullIntervalName.str().c_str();
         intervalDir = (TDirectory*)inputFile_->TDirectory::GetDirectory(fullName);
-        if(intervalDir){
+        if (intervalDir) {
           intervalDir->GetObject("h_sigmaX;1", tkSector.m_binnedHists[iInterval]["sigmaX"]);
           intervalDir->GetObject("h_norResX;1", tkSector.m_binnedHists[iInterval]["norResX"]);
           intervalDir->GetObject("h_sigmaY;1", tkSector.m_binnedHists[iInterval]["sigmaY"]);
           intervalDir->GetObject("h_norResY;1", tkSector.m_binnedHists[iInterval]["norResY"]);
-          if(tkSector.m_binnedHists[iInterval]["sigmaY"] && tkSector.m_binnedHists[iInterval]["norResY"]){
+          if (tkSector.m_binnedHists[iInterval]["sigmaY"] && tkSector.m_binnedHists[iInterval]["norResY"]) {
             tkSector.isPixel = true;
           }
-        }else{
+        } else {
           intervalBool = false;
-          if(iSector==1)edm::LogInfo("CalculateAPE")<<"There are "<<iInterval-1<<" intervals per sector defined in input file";
+          if (iSector == 1)
+            edm::LogInfo("CalculateAPE") << "There are " << iInterval - 1
+                                         << " intervals per sector defined in input file";
         }
       }
-      TDirectory *resultsDir(nullptr);
+      TDirectory* resultsDir(nullptr);
       std::stringstream fullResultName;
       fullResultName << fullSectorName.str() << "Results/";
       fullName = fullResultName.str().c_str();
       resultsDir = (TDirectory*)inputFile_->TDirectory::GetDirectory(fullName);
-      if(resultsDir){
+      if (resultsDir) {
         resultsDir->GetObject("h_entriesX;1", tkSector.EntriesX);
-        if(tkSector.isPixel)resultsDir->GetObject("h_entriesY;1", tkSector.EntriesY);
+        if (tkSector.isPixel)
+          resultsDir->GetObject("h_entriesY;1", tkSector.EntriesY);
         TTree* rawIdTree(nullptr);
         resultsDir->GetObject("rawIdTree", rawIdTree);
         unsigned int rawId(0);
         rawIdTree->SetBranchAddress("RawId", &rawId);
-        for(int entry=0; entry<rawIdTree->GetEntries(); ++entry){
+        for (int entry = 0; entry < rawIdTree->GetEntries(); ++entry) {
           rawIdTree->GetEntry(entry);
           // command "hadd" adds entries in TTree, so rawId are existing as often as number of files are added
           bool alreadyAdded(false);
-          for(auto const & i_rawId : tkSector.v_rawId){
-            if(rawId==i_rawId)alreadyAdded = true;
+          for (auto const& i_rawId : tkSector.v_rawId) {
+            if (rawId == i_rawId)
+              alreadyAdded = true;
           }
-          if(alreadyAdded)break;
+          if (alreadyAdded)
+            break;
           tkSector.v_rawId.push_back(rawId);
         }
       }
       m_tkSector_[iSector] = tkSector;
-    }else{
+    } else {
       sectorBool = false;
-      edm::LogInfo("CalculateAPE")<<"There are "<<iSector-1<<" sectors defined in input file";
+      edm::LogInfo("CalculateAPE") << "There are " << iSector - 1 << " sectors defined in input file";
     }
   }
-  noSectors_ = iSector+1;
-  
-  
+  noSectors_ = iSector + 1;
 }
 
-
-
-void
-ApeEstimatorSummary::bookHists(){
+void ApeEstimatorSummary::bookHists() {
   const std::vector<double> v_binX(this->residualErrorBinning());
-  for(auto & i_sector : m_tkSector_){
-    i_sector.second.WeightX         = new TH1F("h_weightX","relative weight w_{x}/w_{tot,x};#sigma_{x}  [#mum];w_{x}/w_{tot,x}",v_binX.size()-1,&(v_binX[0]));
-    i_sector.second.MeanX           = new TH1F("h_meanX","residual mean <r_{x}/#sigma_{r,x}>;#sigma_{x}  [#mum];<r_{x}/#sigma_{r,x}>",v_binX.size()-1,&(v_binX[0]));
-    i_sector.second.RmsX            = new TH1F("h_rmsX","residual rms RMS(r_{x}/#sigma_{r,x});#sigma_{x}  [#mum];RMS(r_{x}/#sigma_{r,x})",v_binX.size()-1,&(v_binX[0]));
-    i_sector.second.FitMeanX1       = new TH1F("h_fitMeanX1","fitted residual mean #mu_{x};#sigma_{x}  [#mum];#mu_{x}",v_binX.size()-1,&(v_binX[0]));
-    i_sector.second.ResidualWidthX1 = new TH1F("h_residualWidthX1","residual width #Delta_{x};#sigma_{x}  [#mum];#Delta_{x}",v_binX.size()-1,&(v_binX[0]));
-    i_sector.second.CorrectionX1    = new TH1F("h_correctionX1","correction to APE_{x};#sigma_{x}  [#mum];#Delta#sigma_{align,x}  [#mum]",v_binX.size()-1,&(v_binX[0]));
-    i_sector.second.FitMeanX2       = new TH1F("h_fitMeanX2","fitted residual mean #mu_{x};#sigma_{x}  [#mum];#mu_{x}",v_binX.size()-1,&(v_binX[0]));
-    i_sector.second.ResidualWidthX2 = new TH1F("h_residualWidthX2","residual width #Delta_{x};#sigma_{x}  [#mum];#Delta_{x}",v_binX.size()-1,&(v_binX[0]));
-    i_sector.second.CorrectionX2    = new TH1F("h_correctionX2","correction to APE_{x};#sigma_{x}  [#mum];#Delta#sigma_{align,x}  [#mum]",v_binX.size()-1,&(v_binX[0]));
-  
-    if(i_sector.second.isPixel){
-      i_sector.second.WeightY         = new TH1F("h_weightY","relative weight w_{y}/w_{tot,y};#sigma_{y}  [#mum];w_{y}/w_{tot,y}",v_binX.size()-1,&(v_binX[0]));
-      i_sector.second.MeanY           = new TH1F("h_meanY","residual mean <r_{y}/#sigma_{r,y}>;#sigma_{y}  [#mum];<r_{y}/#sigma_{r,y}>",v_binX.size()-1,&(v_binX[0]));
-      i_sector.second.RmsY            = new TH1F("h_rmsY","residual rms RMS(r_{y}/#sigma_{r,y});#sigma_{y}  [#mum];RMS(r_{y}/#sigma_{r,y})",v_binX.size()-1,&(v_binX[0]));
-      i_sector.second.FitMeanY1       = new TH1F("h_fitMeanY1","fitted residual mean #mu_{y};#sigma_{y}  [#mum];#mu_{y}",v_binX.size()-1,&(v_binX[0]));
-      i_sector.second.ResidualWidthY1 = new TH1F("h_residualWidthY1","residual width #Delta_{y};#sigma_{y}  [#mum];#Delta_{y}",v_binX.size()-1,&(v_binX[0]));
-      i_sector.second.CorrectionY1    = new TH1F("h_correctionY1","correction to APE_{y};#sigma_{y}  [#mum];#Delta#sigma_{align,y}  [#mum]",v_binX.size()-1,&(v_binX[0]));
-      i_sector.second.FitMeanY2       = new TH1F("h_fitMeanY2","fitted residual mean #mu_{y};#sigma_{y}  [#mum];#mu_{y}",v_binX.size()-1,&(v_binX[0]));
-      i_sector.second.ResidualWidthY2 = new TH1F("h_residualWidthY2","residual width #Delta_{y};#sigma_{y}  [#mum];#Delta_{y}",v_binX.size()-1,&(v_binX[0]));
-      i_sector.second.CorrectionY2    = new TH1F("h_correctionY2","correction to APE_{y};#sigma_{y}  [#mum];#Delta#sigma_{align,y}  [#mum]",v_binX.size()-1,&(v_binX[0]));
+  for (auto& i_sector : m_tkSector_) {
+    i_sector.second.WeightX = new TH1F("h_weightX",
+                                       "relative weight w_{x}/w_{tot,x};#sigma_{x}  [#mum];w_{x}/w_{tot,x}",
+                                       v_binX.size() - 1,
+                                       &(v_binX[0]));
+    i_sector.second.MeanX = new TH1F("h_meanX",
+                                     "residual mean <r_{x}/#sigma_{r,x}>;#sigma_{x}  [#mum];<r_{x}/#sigma_{r,x}>",
+                                     v_binX.size() - 1,
+                                     &(v_binX[0]));
+    i_sector.second.RmsX = new TH1F("h_rmsX",
+                                    "residual rms RMS(r_{x}/#sigma_{r,x});#sigma_{x}  [#mum];RMS(r_{x}/#sigma_{r,x})",
+                                    v_binX.size() - 1,
+                                    &(v_binX[0]));
+    i_sector.second.FitMeanX1 = new TH1F(
+        "h_fitMeanX1", "fitted residual mean #mu_{x};#sigma_{x}  [#mum];#mu_{x}", v_binX.size() - 1, &(v_binX[0]));
+    i_sector.second.ResidualWidthX1 = new TH1F("h_residualWidthX1",
+                                               "residual width #Delta_{x};#sigma_{x}  [#mum];#Delta_{x}",
+                                               v_binX.size() - 1,
+                                               &(v_binX[0]));
+    i_sector.second.CorrectionX1 = new TH1F("h_correctionX1",
+                                            "correction to APE_{x};#sigma_{x}  [#mum];#Delta#sigma_{align,x}  [#mum]",
+                                            v_binX.size() - 1,
+                                            &(v_binX[0]));
+    i_sector.second.FitMeanX2 = new TH1F(
+        "h_fitMeanX2", "fitted residual mean #mu_{x};#sigma_{x}  [#mum];#mu_{x}", v_binX.size() - 1, &(v_binX[0]));
+    i_sector.second.ResidualWidthX2 = new TH1F("h_residualWidthX2",
+                                               "residual width #Delta_{x};#sigma_{x}  [#mum];#Delta_{x}",
+                                               v_binX.size() - 1,
+                                               &(v_binX[0]));
+    i_sector.second.CorrectionX2 = new TH1F("h_correctionX2",
+                                            "correction to APE_{x};#sigma_{x}  [#mum];#Delta#sigma_{align,x}  [#mum]",
+                                            v_binX.size() - 1,
+                                            &(v_binX[0]));
+
+    if (i_sector.second.isPixel) {
+      i_sector.second.WeightY = new TH1F("h_weightY",
+                                         "relative weight w_{y}/w_{tot,y};#sigma_{y}  [#mum];w_{y}/w_{tot,y}",
+                                         v_binX.size() - 1,
+                                         &(v_binX[0]));
+      i_sector.second.MeanY = new TH1F("h_meanY",
+                                       "residual mean <r_{y}/#sigma_{r,y}>;#sigma_{y}  [#mum];<r_{y}/#sigma_{r,y}>",
+                                       v_binX.size() - 1,
+                                       &(v_binX[0]));
+      i_sector.second.RmsY = new TH1F("h_rmsY",
+                                      "residual rms RMS(r_{y}/#sigma_{r,y});#sigma_{y}  [#mum];RMS(r_{y}/#sigma_{r,y})",
+                                      v_binX.size() - 1,
+                                      &(v_binX[0]));
+      i_sector.second.FitMeanY1 = new TH1F(
+          "h_fitMeanY1", "fitted residual mean #mu_{y};#sigma_{y}  [#mum];#mu_{y}", v_binX.size() - 1, &(v_binX[0]));
+      i_sector.second.ResidualWidthY1 = new TH1F("h_residualWidthY1",
+                                                 "residual width #Delta_{y};#sigma_{y}  [#mum];#Delta_{y}",
+                                                 v_binX.size() - 1,
+                                                 &(v_binX[0]));
+      i_sector.second.CorrectionY1 = new TH1F("h_correctionY1",
+                                              "correction to APE_{y};#sigma_{y}  [#mum];#Delta#sigma_{align,y}  [#mum]",
+                                              v_binX.size() - 1,
+                                              &(v_binX[0]));
+      i_sector.second.FitMeanY2 = new TH1F(
+          "h_fitMeanY2", "fitted residual mean #mu_{y};#sigma_{y}  [#mum];#mu_{y}", v_binX.size() - 1, &(v_binX[0]));
+      i_sector.second.ResidualWidthY2 = new TH1F("h_residualWidthY2",
+                                                 "residual width #Delta_{y};#sigma_{y}  [#mum];#Delta_{y}",
+                                                 v_binX.size() - 1,
+                                                 &(v_binX[0]));
+      i_sector.second.CorrectionY2 = new TH1F("h_correctionY2",
+                                              "correction to APE_{y};#sigma_{y}  [#mum];#Delta#sigma_{align,y}  [#mum]",
+                                              v_binX.size() - 1,
+                                              &(v_binX[0]));
     }
   }
 }
 
-
-
-std::vector<double>
-ApeEstimatorSummary::residualErrorBinning(){
+std::vector<double> ApeEstimatorSummary::residualErrorBinning() {
   std::vector<double> v_binX;
   TH1* EntriesX(m_tkSector_[1].EntriesX);
-  for(int iBin=1; iBin<=EntriesX->GetNbinsX()+1; ++iBin){
+  for (int iBin = 1; iBin <= EntriesX->GetNbinsX() + 1; ++iBin) {
     v_binX.push_back(EntriesX->GetBinLowEdge(iBin));
   }
   return v_binX;
 }
 
-
-void
-ApeEstimatorSummary::writeHists(){
+void ApeEstimatorSummary::writeHists() {
   TFile* resultsFile = new TFile(parameterSet_.getParameter<std::string>("ResultsFile").c_str(), "RECREATE");
   TDirectory* baseDir = resultsFile->mkdir("ApeEstimatorSummary");
-  for(auto const & i_sector : m_tkSector_){
+  for (auto const& i_sector : m_tkSector_) {
     std::stringstream dirName;
-    dirName<<"Sector_" << i_sector.first;
+    dirName << "Sector_" << i_sector.first;
     TDirectory* dir = baseDir->mkdir(dirName.str().c_str());
     dir->cd();
-    
+
     i_sector.second.Name->Write();
-    
+
     i_sector.second.WeightX->Write();
     i_sector.second.MeanX->Write();
-    i_sector.second.RmsX->Write();        
-    i_sector.second.FitMeanX1->Write();          
-    i_sector.second.ResidualWidthX1 ->Write();
-    i_sector.second.CorrectionX1->Write();   
-    i_sector.second.FitMeanX2->Write();          
+    i_sector.second.RmsX->Write();
+    i_sector.second.FitMeanX1->Write();
+    i_sector.second.ResidualWidthX1->Write();
+    i_sector.second.CorrectionX1->Write();
+    i_sector.second.FitMeanX2->Write();
     i_sector.second.ResidualWidthX2->Write();
     i_sector.second.CorrectionX2->Write();
-    
-    if(i_sector.second.isPixel){
+
+    if (i_sector.second.isPixel) {
       i_sector.second.WeightY->Write();
       i_sector.second.MeanY->Write();
-      i_sector.second.RmsY->Write();      
-      i_sector.second.FitMeanY1->Write();        
-      i_sector.second.ResidualWidthY1 ->Write();
-      i_sector.second.CorrectionY1->Write();   
-      i_sector.second.FitMeanY2->Write();        
+      i_sector.second.RmsY->Write();
+      i_sector.second.FitMeanY1->Write();
+      i_sector.second.ResidualWidthY1->Write();
+      i_sector.second.CorrectionY1->Write();
+      i_sector.second.FitMeanY2->Write();
       i_sector.second.ResidualWidthY2->Write();
       i_sector.second.CorrectionY2->Write();
     }
@@ -296,13 +319,10 @@ ApeEstimatorSummary::writeHists(){
   resultsFile->Close();
 }
 
-
-
-void
-ApeEstimatorSummary::calculateApe(){
+void ApeEstimatorSummary::calculateApe() {
   // Set baseline or calculate APE value?
   const bool setBaseline(parameterSet_.getParameter<bool>("setBaseline"));
-      
+
   // Read in baseline file for calculation of APE value (if not setting baseline)
   // Has same format as iterationFile
   const std::string baselineFileName(parameterSet_.getParameter<std::string>("BaselineFile"));
@@ -310,164 +330,170 @@ ApeEstimatorSummary::calculateApe(){
   TTree* baselineTreeX(nullptr);
   TTree* baselineTreeY(nullptr);
   TTree* sectorNameBaselineTree(nullptr);
-  if(!setBaseline){
+  if (!setBaseline) {
     std::ifstream baselineFileStream;
     // Check if baseline file exists
     baselineFileStream.open(baselineFileName.c_str());
-    if(baselineFileStream.is_open()){
+    if (baselineFileStream.is_open()) {
       baselineFileStream.close();
-      baselineFile = new TFile(baselineFileName.c_str(),"READ");
+      baselineFile = new TFile(baselineFileName.c_str(), "READ");
     }
-    if(baselineFile){
-      edm::LogInfo("CalculateAPE")<<"Baseline file for APE values sucessfully opened";
-      baselineFile->GetObject("iterTreeX;1",baselineTreeX);
-      baselineFile->GetObject("iterTreeY;1",baselineTreeY);
-      baselineFile->GetObject("nameTree;1",sectorNameBaselineTree);
-    }else{
-      edm::LogWarning("CalculateAPE")<<"There is NO baseline file for APE values, so normalized residual width =1 for ideal conditions is assumed";
+    if (baselineFile) {
+      edm::LogInfo("CalculateAPE") << "Baseline file for APE values sucessfully opened";
+      baselineFile->GetObject("iterTreeX;1", baselineTreeX);
+      baselineFile->GetObject("iterTreeY;1", baselineTreeY);
+      baselineFile->GetObject("nameTree;1", sectorNameBaselineTree);
+    } else {
+      edm::LogWarning("CalculateAPE") << "There is NO baseline file for APE values, so normalized residual width =1 "
+                                         "for ideal conditions is assumed";
     }
   }
-   
+
   // Set up root file for iterations on APE value (or for setting baseline in setBaseline mode)
-  const std::string iterationFileName(setBaseline ? baselineFileName : parameterSet_.getParameter<std::string>("IterationFile"));
+  const std::string iterationFileName(setBaseline ? baselineFileName
+                                                  : parameterSet_.getParameter<std::string>("IterationFile"));
   // For iterations, updates are needed to not overwrite the iterations before
-  TFile* iterationFile = new TFile(iterationFileName.c_str(),setBaseline ? "RECREATE" : "UPDATE");
-   
-   
+  TFile* iterationFile = new TFile(iterationFileName.c_str(), setBaseline ? "RECREATE" : "UPDATE");
+
   // Set up TTree for iterative APE values on first pass (first iteration) or read from file (further iterations)
   TTree* iterationTreeX(nullptr);
   TTree* iterationTreeY(nullptr);
-  iterationFile->GetObject("iterTreeX;1",iterationTreeX);
-  iterationFile->GetObject("iterTreeY;1",iterationTreeY);
+  iterationFile->GetObject("iterTreeX;1", iterationTreeX);
+  iterationFile->GetObject("iterTreeY;1", iterationTreeY);
   // The same for TTree containing the names of the sectors (no additional check, since always handled exactly as iterationTree)
   TTree* sectorNameTree(nullptr);
-  iterationFile->GetObject("nameTree;1",sectorNameTree);
-   
+  iterationFile->GetObject("nameTree;1", sectorNameTree);
+
   bool firstIter(false);
-  if(!iterationTreeX){ // should be always true in setBaseline mode, since file is recreated
+  if (!iterationTreeX) {  // should be always true in setBaseline mode, since file is recreated
     firstIter = true;
-    if(!setBaseline){
-      iterationTreeX = new TTree("iterTreeX","Tree for APE x values of all iterations");
-      iterationTreeY = new TTree("iterTreeY","Tree for APE y values of all iterations");
-      edm::LogInfo("CalculateAPE")<<"First APE iteration (number 0.), create iteration file with TTree";
-      sectorNameTree = new TTree("nameTree","Tree with names of sectors");
-    }else{
-      iterationTreeX = new TTree("iterTreeX","Tree for baseline x values of normalized residual width");
-      iterationTreeY = new TTree("iterTreeY","Tree for baseline y values of normalized residual width");
-      edm::LogInfo("CalculateAPE")<<"Set baseline, create baseline file with TTree";
-      sectorNameTree = new TTree("nameTree","Tree with names of sectors");
+    if (!setBaseline) {
+      iterationTreeX = new TTree("iterTreeX", "Tree for APE x values of all iterations");
+      iterationTreeY = new TTree("iterTreeY", "Tree for APE y values of all iterations");
+      edm::LogInfo("CalculateAPE") << "First APE iteration (number 0.), create iteration file with TTree";
+      sectorNameTree = new TTree("nameTree", "Tree with names of sectors");
+    } else {
+      iterationTreeX = new TTree("iterTreeX", "Tree for baseline x values of normalized residual width");
+      iterationTreeY = new TTree("iterTreeY", "Tree for baseline y values of normalized residual width");
+      edm::LogInfo("CalculateAPE") << "Set baseline, create baseline file with TTree";
+      sectorNameTree = new TTree("nameTree", "Tree with names of sectors");
     }
-  }else{
+  } else {
     const unsigned int iteration(iterationTreeX->GetEntries());
-    edm::LogWarning("CalculateAPE")<<"NOT the first APE iteration (number 0.) but the "<<iteration<<". one, is this wanted or forgot to delete old iteration file with TTree?";
+    edm::LogWarning("CalculateAPE") << "NOT the first APE iteration (number 0.) but the " << iteration
+                                    << ". one, is this wanted or forgot to delete old iteration file with TTree?";
   }
-   
-   
+
   // Assign the information stored in the trees to arrays
   double a_apeSectorX[noSectors_];
   double a_apeSectorY[noSectors_];
   double a_baselineSectorX[noSectors_];
   double a_baselineSectorY[noSectors_];
-  
+
   std::string* a_sectorName[noSectors_];
   std::string* a_sectorBaselineName[noSectors_];
-  for(auto const & i_sector : m_tkSector_){
+  for (auto const& i_sector : m_tkSector_) {
     const unsigned int iSector(i_sector.first);
     const bool pixelSector(i_sector.second.isPixel);
     a_apeSectorX[iSector] = 99.;
     a_apeSectorY[iSector] = 99.;
     a_baselineSectorX[iSector] = -99.;
     a_baselineSectorY[iSector] = -99.;
-    
+
     a_sectorName[iSector] = nullptr;
     a_sectorBaselineName[iSector] = nullptr;
     std::stringstream ss_sector, ss_sectorSuffixed;
     ss_sector << "Ape_Sector_" << iSector;
-    if(!setBaseline && baselineTreeX){
+    if (!setBaseline && baselineTreeX) {
       baselineTreeX->SetBranchAddress(ss_sector.str().c_str(), &a_baselineSectorX[iSector]);
       baselineTreeX->GetEntry(0);
-      if(pixelSector){
+      if (pixelSector) {
         baselineTreeY->SetBranchAddress(ss_sector.str().c_str(), &a_baselineSectorY[iSector]);
         baselineTreeY->GetEntry(0);
       }
       sectorNameBaselineTree->SetBranchAddress(ss_sector.str().c_str(), &a_sectorBaselineName[iSector]);
       sectorNameBaselineTree->GetEntry(0);
-    }else{
+    } else {
       // Set default ideal normalized residual width to 1
       a_baselineSectorX[iSector] = 1.;
       a_baselineSectorY[iSector] = 1.;
     }
-    if(firstIter){ // should be always true in setBaseline mode, since file is recreated  
+    if (firstIter) {  // should be always true in setBaseline mode, since file is recreated
       ss_sectorSuffixed << ss_sector.str() << "/D";
       iterationTreeX->Branch(ss_sector.str().c_str(), &a_apeSectorX[iSector], ss_sectorSuffixed.str().c_str());
-      if(pixelSector){
+      if (pixelSector) {
         iterationTreeY->Branch(ss_sector.str().c_str(), &a_apeSectorY[iSector], ss_sectorSuffixed.str().c_str());
       }
       sectorNameTree->Branch(ss_sector.str().c_str(), &a_sectorName[iSector], 32000, 00);
-    }else{
+    } else {
       iterationTreeX->SetBranchAddress(ss_sector.str().c_str(), &a_apeSectorX[iSector]);
-      iterationTreeX->GetEntry(iterationTreeX->GetEntries()-1);
-      if(pixelSector){
+      iterationTreeX->GetEntry(iterationTreeX->GetEntries() - 1);
+      if (pixelSector) {
         iterationTreeY->SetBranchAddress(ss_sector.str().c_str(), &a_apeSectorY[iSector]);
-        iterationTreeY->GetEntry(iterationTreeY->GetEntries()-1);
+        iterationTreeY->GetEntry(iterationTreeY->GetEntries() - 1);
       }
       sectorNameTree->SetBranchAddress(ss_sector.str().c_str(), &a_sectorName[iSector]);
       sectorNameTree->GetEntry(0);
     }
   }
-   
-   
+
   // Check whether sector definitions are identical with the ones of previous iterations and with the ones in baseline file
-  for(auto & i_sector : m_tkSector_){
+  for (auto& i_sector : m_tkSector_) {
     const std::string& name(i_sector.second.name);
-    if(!firstIter){
+    if (!firstIter) {
       const std::string& nameLastIter(*a_sectorName[i_sector.first]);
-      if(name!=nameLastIter){
-        edm::LogError("CalculateAPE")<<"Inconsistent sector definition in iterationFile for sector "<<i_sector.first<<",\n"
-                                    <<"Recent iteration has name \""<<name<<"\", while previous had \""<<nameLastIter<<"\"\n"
-                                <<"...APE calculation stopped. Please check sector definitions in config!\n";
+      if (name != nameLastIter) {
+        edm::LogError("CalculateAPE") << "Inconsistent sector definition in iterationFile for sector " << i_sector.first
+                                      << ",\n"
+                                      << "Recent iteration has name \"" << name << "\", while previous had \""
+                                      << nameLastIter << "\"\n"
+                                      << "...APE calculation stopped. Please check sector definitions in config!\n";
         return;
       }
-    }else{ 
+    } else {
       a_sectorName[i_sector.first] = new std::string(name);
     }
-    if(!setBaseline && baselineFile){
+    if (!setBaseline && baselineFile) {
       const std::string& nameBaseline(*a_sectorBaselineName[i_sector.first]);
-      if(name!=nameBaseline){
-        edm::LogError("CalculateAPE")<<"Inconsistent sector definition in baselineFile for sector "<<i_sector.first<<",\n"
-                                    <<"Recent iteration has name \""<<name<<"\", while baseline had \""<<nameBaseline<<"\"\n"
-                                <<"...APE calculation stopped. Please check sector definitions in config!\n";
+      if (name != nameBaseline) {
+        edm::LogError("CalculateAPE") << "Inconsistent sector definition in baselineFile for sector " << i_sector.first
+                                      << ",\n"
+                                      << "Recent iteration has name \"" << name << "\", while baseline had \""
+                                      << nameBaseline << "\"\n"
+                                      << "...APE calculation stopped. Please check sector definitions in config!\n";
         return;
       }
     }
   }
-   
-   
+
   // Set up text file for writing out APE values per module
   std::ofstream apeOutputFile;
-  if(!setBaseline){
+  if (!setBaseline) {
     const std::string apeOutputFileName(parameterSet_.getParameter<std::string>("ApeOutputFile"));
     apeOutputFile.open(apeOutputFileName.c_str());
-    if(apeOutputFile.is_open()){
-      edm::LogInfo("CalculateAPE")<<"Text file for writing APE values successfully opened";
-    }else{
-      edm::LogError("CalculateAPE")<<"Text file for writing APE values NOT opened,\n"
-                                  <<"...APE calculation stopped. Please check path of text file name in config:\n"
-                                  <<"\t"<<apeOutputFileName;
+    if (apeOutputFile.is_open()) {
+      edm::LogInfo("CalculateAPE") << "Text file for writing APE values successfully opened";
+    } else {
+      edm::LogError("CalculateAPE") << "Text file for writing APE values NOT opened,\n"
+                                    << "...APE calculation stopped. Please check path of text file name in config:\n"
+                                    << "\t" << apeOutputFileName;
       return;
     }
   }
-   
+
   // Loop over sectors for calculating APE
   const std::string apeWeightName(parameterSet_.getParameter<std::string>("apeWeight"));
   ApeWeight apeWeight(wInvalid);
-  if(apeWeightName=="unity") apeWeight = wUnity;
-  else if(apeWeightName=="entries")apeWeight = wEntries;
-  else if(apeWeightName=="entriesOverSigmaX2")apeWeight = wEntriesOverSigmaX2;
-  if(apeWeight==wInvalid){
-    edm::LogError("CalculateAPE")<<"Invalid parameter 'apeWeight' in cfg file: \""<<apeWeightName
-                                <<"\"\nimplemented apeWeights are \"unity\", \"entries\", \"entriesOverSigmaX2\""
-                            <<"\n...APE calculation stopped.";
+  if (apeWeightName == "unity")
+    apeWeight = wUnity;
+  else if (apeWeightName == "entries")
+    apeWeight = wEntries;
+  else if (apeWeightName == "entriesOverSigmaX2")
+    apeWeight = wEntriesOverSigmaX2;
+  if (apeWeight == wInvalid) {
+    edm::LogError("CalculateAPE") << "Invalid parameter 'apeWeight' in cfg file: \"" << apeWeightName
+                                  << "\"\nimplemented apeWeights are \"unity\", \"entries\", \"entriesOverSigmaX2\""
+                                  << "\n...APE calculation stopped.";
     return;
   }
   const double minHitsPerInterval(parameterSet_.getParameter<double>("minHitsPerInterval"));
@@ -475,78 +501,81 @@ ApeEstimatorSummary::calculateApe(){
   const double correctionScaling(parameterSet_.getParameter<double>("correctionScaling"));
   const bool smoothIteration(parameterSet_.getParameter<bool>("smoothIteration"));
   const double smoothFraction(parameterSet_.getParameter<double>("smoothFraction"));
-  if(smoothFraction<=0. || smoothFraction>1.){
-    edm::LogError("CalculateAPE")<<"Incorrect parameter in cfg file,"
-                                <<"\nsmoothFraction has to be in [0,1], but is "<<smoothFraction
-                            <<"\n...APE calculation stopped.";
+  if (smoothFraction <= 0. || smoothFraction > 1.) {
+    edm::LogError("CalculateAPE") << "Incorrect parameter in cfg file,"
+                                  << "\nsmoothFraction has to be in [0,1], but is " << smoothFraction
+                                  << "\n...APE calculation stopped.";
     return;
   }
-  for(auto & i_sector : m_tkSector_){
-    typedef std::pair<double,double> Error2AndResidualWidth2PerBin;
-    typedef std::pair<double,Error2AndResidualWidth2PerBin> WeightAndResultsPerBin;
+  for (auto& i_sector : m_tkSector_) {
+    typedef std::pair<double, double> Error2AndResidualWidth2PerBin;
+    typedef std::pair<double, Error2AndResidualWidth2PerBin> WeightAndResultsPerBin;
     std::vector<WeightAndResultsPerBin> v_weightAndResultsPerBinX;
     std::vector<WeightAndResultsPerBin> v_weightAndResultsPerBinY;
-    
+
     double baselineWidthX2(a_baselineSectorX[i_sector.first]);
     double baselineWidthY2(a_baselineSectorY[i_sector.first]);
-    
+
     // Loop over residual error bins to calculate APE for every bin
-    for(auto const & i_errBins : i_sector.second.m_binnedHists){
-      std::map<std::string,TH1*> mHists = i_errBins.second;
-      
+    for (auto const& i_errBins : i_sector.second.m_binnedHists) {
+      std::map<std::string, TH1*> mHists = i_errBins.second;
+
       double entriesX = mHists["sigmaX"]->GetEntries();
-      double meanSigmaX = mHists["sigmaX"]->GetMean(); 
-      
+      double meanSigmaX = mHists["sigmaX"]->GetMean();
+
       // Fitting Parameters
-      double xMin      = mHists["norResX"]->GetXaxis()->GetXmin();
-      double xMax      = mHists["norResX"]->GetXaxis()->GetXmax();
+      double xMin = mHists["norResX"]->GetXaxis()->GetXmin();
+      double xMax = mHists["norResX"]->GetXaxis()->GetXmax();
       double integralX = mHists["norResX"]->Integral();
-      double meanX     = mHists["norResX"]->GetMean();
-      double rmsX      = mHists["norResX"]->GetRMS();
-      double maximumX  = mHists["norResX"]->GetBinContent(mHists["norResX"]->GetMaximumBin());
-      
+      double meanX = mHists["norResX"]->GetMean();
+      double rmsX = mHists["norResX"]->GetRMS();
+      double maximumX = mHists["norResX"]->GetBinContent(mHists["norResX"]->GetMaximumBin());
+
       // First Gaus Fit
       TF1 funcX_1("mygausX", "gaus", xMin, xMax);
       funcX_1.SetParameters(maximumX, meanX, rmsX);
-      TString fitOpt("ILERQ"); //TString fitOpt("IMR"); ("IRLL"); ("IRQ");
-      if(integralX>minHitsPerInterval){
-        if(mHists["norResX"]->Fit(&funcX_1, fitOpt)){
-          edm::LogWarning("CalculateAPE")<<"Fit1 did not work: "<<mHists["norResX"]->Fit(&funcX_1, fitOpt);
+      TString fitOpt("ILERQ");  //TString fitOpt("IMR"); ("IRLL"); ("IRQ");
+      if (integralX > minHitsPerInterval) {
+        if (mHists["norResX"]->Fit(&funcX_1, fitOpt)) {
+          edm::LogWarning("CalculateAPE") << "Fit1 did not work: " << mHists["norResX"]->Fit(&funcX_1, fitOpt);
           continue;
         }
-        LogDebug("CalculateAPE")<<"FitResultX1\t"<<mHists["norResX"]->Fit(&funcX_1, fitOpt)<<"\n";
+        LogDebug("CalculateAPE") << "FitResultX1\t" << mHists["norResX"]->Fit(&funcX_1, fitOpt) << "\n";
       }
-      double meanX_1  = funcX_1.GetParameter(1);
+      double meanX_1 = funcX_1.GetParameter(1);
       double sigmaX_1 = funcX_1.GetParameter(2);
-      
+
       // Second gaus fit
-      TF1 funcX_2("mygausX2","gaus",meanX_1 - sigmaFactorFit*TMath::Abs(sigmaX_1), meanX_1 + sigmaFactorFit*TMath::Abs(sigmaX_1));
-      funcX_2.SetParameters(funcX_1.GetParameter(0),meanX_1,sigmaX_1);
-      if(integralX>minHitsPerInterval){
-        if(mHists["norResX"]->Fit(&funcX_2, fitOpt)){
-          edm::LogWarning("CalculateAPE")<<"Fit2 did not work for x : "<<mHists["norResX"]->Fit(&funcX_2, fitOpt);
+      TF1 funcX_2("mygausX2",
+                  "gaus",
+                  meanX_1 - sigmaFactorFit * TMath::Abs(sigmaX_1),
+                  meanX_1 + sigmaFactorFit * TMath::Abs(sigmaX_1));
+      funcX_2.SetParameters(funcX_1.GetParameter(0), meanX_1, sigmaX_1);
+      if (integralX > minHitsPerInterval) {
+        if (mHists["norResX"]->Fit(&funcX_2, fitOpt)) {
+          edm::LogWarning("CalculateAPE") << "Fit2 did not work for x : " << mHists["norResX"]->Fit(&funcX_2, fitOpt);
           continue;
         }
-        LogDebug("CalculateAPE")<<"FitResultX2\t"<<mHists["norResX"]->Fit(&funcX_2, fitOpt)<<"\n";
+        LogDebug("CalculateAPE") << "FitResultX2\t" << mHists["norResX"]->Fit(&funcX_2, fitOpt) << "\n";
       }
-      double meanX_2  = funcX_2.GetParameter(1);
+      double meanX_2 = funcX_2.GetParameter(1);
       double sigmaX_2 = funcX_2.GetParameter(2);
-  
+
       // Now the same for y coordinate
       double entriesY(0.);
       double meanSigmaY(0.);
-      if(i_sector.second.isPixel){
+      if (i_sector.second.isPixel) {
         entriesY = mHists["sigmaY"]->GetEntries();
         meanSigmaY = mHists["sigmaY"]->GetMean();
       }
-      
+
       double meanY_1(0.);
       double sigmaY_1(0.);
       double meanY_2(0.);
       double sigmaY_2(0.);
       double meanY(0.);
       double rmsY(0.);
-      if(i_sector.second.isPixel){
+      if (i_sector.second.isPixel) {
         // Fitting Parameters
         double yMin = mHists["norResY"]->GetXaxis()->GetXmin();
         double yMax = mHists["norResY"]->GetXaxis()->GetXmax();
@@ -554,375 +583,400 @@ ApeEstimatorSummary::calculateApe(){
         meanY = mHists["norResY"]->GetMean();
         rmsY = mHists["norResY"]->GetRMS();
         double maximumY = mHists["norResY"]->GetBinContent(mHists["norResY"]->GetMaximumBin());
-      
+
         // First Gaus Fit
         TF1 funcY_1("mygausY", "gaus", yMin, yMax);
         funcY_1.SetParameters(maximumY, meanY, rmsY);
-        if(integralY>minHitsPerInterval){
-          if(mHists["norResY"]->Fit(&funcY_1, fitOpt)){
-            edm::LogWarning("CalculateAPE")<<"Fit1 did not work: "<<mHists["norResY"]->Fit(&funcY_1, fitOpt);
+        if (integralY > minHitsPerInterval) {
+          if (mHists["norResY"]->Fit(&funcY_1, fitOpt)) {
+            edm::LogWarning("CalculateAPE") << "Fit1 did not work: " << mHists["norResY"]->Fit(&funcY_1, fitOpt);
             continue;
           }
-          LogDebug("CalculateAPE")<<"FitResultY1\t"<<mHists["norResY"]->Fit(&funcY_1, fitOpt)<<"\n";
+          LogDebug("CalculateAPE") << "FitResultY1\t" << mHists["norResY"]->Fit(&funcY_1, fitOpt) << "\n";
         }
-        meanY_1  = funcY_1.GetParameter(1);
+        meanY_1 = funcY_1.GetParameter(1);
         sigmaY_1 = funcY_1.GetParameter(2);
-      
+
         // Second gaus fit
-        TF1 funcY_2("mygausY2","gaus",meanY_1 - sigmaFactorFit*TMath::Abs(sigmaY_1), meanY_1 + sigmaFactorFit*TMath::Abs(sigmaY_1));
-        funcY_2.SetParameters(funcY_1.GetParameter(0),meanY_1,sigmaY_1);
-        if(integralY>minHitsPerInterval){
-          if(mHists["norResY"]->Fit(&funcY_2, fitOpt)){
-            edm::LogWarning("CalculateAPE")<<"Fit2 did not work for y : "<<mHists["norResY"]->Fit(&funcY_2, fitOpt);
+        TF1 funcY_2("mygausY2",
+                    "gaus",
+                    meanY_1 - sigmaFactorFit * TMath::Abs(sigmaY_1),
+                    meanY_1 + sigmaFactorFit * TMath::Abs(sigmaY_1));
+        funcY_2.SetParameters(funcY_1.GetParameter(0), meanY_1, sigmaY_1);
+        if (integralY > minHitsPerInterval) {
+          if (mHists["norResY"]->Fit(&funcY_2, fitOpt)) {
+            edm::LogWarning("CalculateAPE") << "Fit2 did not work for y : " << mHists["norResY"]->Fit(&funcY_2, fitOpt);
             continue;
           }
-          LogDebug("CalculateAPE")<<"FitResultY2\t"<<mHists["norResY"]->Fit(&funcY_2, fitOpt)<<"\n";
+          LogDebug("CalculateAPE") << "FitResultY2\t" << mHists["norResY"]->Fit(&funcY_2, fitOpt) << "\n";
         }
-        meanY_2  = funcY_2.GetParameter(1);
+        meanY_2 = funcY_2.GetParameter(1);
         sigmaY_2 = funcY_2.GetParameter(2);
       }
-      
+
       // Fill histograms
       double fitMeanX_1(meanX_1), fitMeanX_2(meanX_2);
       double residualWidthX_1(sigmaX_1), residualWidthX_2(sigmaX_2);
       double fitMeanY_1(meanY_1), fitMeanY_2(meanY_2);
       double residualWidthY_1(sigmaY_1), residualWidthY_2(sigmaY_2);
-      
+
       double correctionX2_1(-0.0010), correctionX2_2(-0.0010);
       double correctionY2_1(-0.0010), correctionY2_2(-0.0010);
-      correctionX2_1 = meanSigmaX*meanSigmaX*(residualWidthX_1*residualWidthX_1 -baselineWidthX2);
-      correctionX2_2 = meanSigmaX*meanSigmaX*(residualWidthX_2*residualWidthX_2 -baselineWidthX2);
-      if(i_sector.second.isPixel){
-        correctionY2_1 = meanSigmaY*meanSigmaY*(residualWidthY_1*residualWidthY_1 -baselineWidthY2);
-        correctionY2_2 = meanSigmaY*meanSigmaY*(residualWidthY_2*residualWidthY_2 -baselineWidthY2);
-      }
-      
-      double correctionX_1 = correctionX2_1>=0. ? std::sqrt(correctionX2_1) : -std::sqrt(-correctionX2_1);
-      double correctionX_2 = correctionX2_2>=0. ? std::sqrt(correctionX2_2) : -std::sqrt(-correctionX2_2);
-      double correctionY_1 = correctionY2_1>=0. ? std::sqrt(correctionY2_1) : -std::sqrt(-correctionY2_1);
-      double correctionY_2 = correctionY2_2>=0. ? std::sqrt(correctionY2_2) : -std::sqrt(-correctionY2_2);
+      correctionX2_1 = meanSigmaX * meanSigmaX * (residualWidthX_1 * residualWidthX_1 - baselineWidthX2);
+      correctionX2_2 = meanSigmaX * meanSigmaX * (residualWidthX_2 * residualWidthX_2 - baselineWidthX2);
+      if (i_sector.second.isPixel) {
+        correctionY2_1 = meanSigmaY * meanSigmaY * (residualWidthY_1 * residualWidthY_1 - baselineWidthY2);
+        correctionY2_2 = meanSigmaY * meanSigmaY * (residualWidthY_2 * residualWidthY_2 - baselineWidthY2);
+      }
+
+      double correctionX_1 = correctionX2_1 >= 0. ? std::sqrt(correctionX2_1) : -std::sqrt(-correctionX2_1);
+      double correctionX_2 = correctionX2_2 >= 0. ? std::sqrt(correctionX2_2) : -std::sqrt(-correctionX2_2);
+      double correctionY_1 = correctionY2_1 >= 0. ? std::sqrt(correctionY2_1) : -std::sqrt(-correctionY2_1);
+      double correctionY_2 = correctionY2_2 >= 0. ? std::sqrt(correctionY2_2) : -std::sqrt(-correctionY2_2);
       // Meanwhile, this got very bad default values, or? (negative corrections allowed)
-      if(isnan(correctionX_1))correctionX_1 = -0.0010;
-      if(isnan(correctionX_2))correctionX_2 = -0.0010;
-      if(isnan(correctionY_1))correctionY_1 = -0.0010;
-      if(isnan(correctionY_2))correctionY_2 = -0.0010;
-      
-      if(entriesX<minHitsPerInterval){
-        meanX = 0.; rmsX = -0.0010;
-        fitMeanX_1 = 0.; correctionX_1 = residualWidthX_1 = -0.0010;
-        fitMeanX_2 = 0.; correctionX_2 = residualWidthX_2 = -0.0010;
-      }
-      
-      if(entriesY<minHitsPerInterval){
-        meanY = 0.; rmsY = -0.0010;
-        fitMeanY_1 = 0.; correctionY_1 = residualWidthY_1 = -0.0010;
-        fitMeanY_2 = 0.; correctionY_2 = residualWidthY_2 = -0.0010;
-      }
-      
-      i_sector.second.MeanX         ->SetBinContent(i_errBins.first,meanX);
-      i_sector.second.RmsX          ->SetBinContent(i_errBins.first,rmsX);
-      
-      i_sector.second.FitMeanX1      ->SetBinContent(i_errBins.first,fitMeanX_1);
-      i_sector.second.ResidualWidthX1->SetBinContent(i_errBins.first,residualWidthX_1);
-      i_sector.second.CorrectionX1   ->SetBinContent(i_errBins.first,correctionX_1*10000.);
-      
-      i_sector.second.FitMeanX2      ->SetBinContent(i_errBins.first,fitMeanX_2);
-      i_sector.second.ResidualWidthX2->SetBinContent(i_errBins.first,residualWidthX_2);
-      i_sector.second.CorrectionX2   ->SetBinContent(i_errBins.first,correctionX_2*10000.);
-      
-      if(i_sector.second.isPixel){
-        i_sector.second.MeanY         ->SetBinContent(i_errBins.first,meanY);
-        i_sector.second.RmsY          ->SetBinContent(i_errBins.first,rmsY);
-        
-        i_sector.second.FitMeanY1      ->SetBinContent(i_errBins.first,fitMeanY_1);
-        i_sector.second.ResidualWidthY1->SetBinContent(i_errBins.first,residualWidthY_1);
-        i_sector.second.CorrectionY1   ->SetBinContent(i_errBins.first,correctionY_1*10000.);
-        
-        i_sector.second.FitMeanY2      ->SetBinContent(i_errBins.first,fitMeanY_2);
-        i_sector.second.ResidualWidthY2->SetBinContent(i_errBins.first,residualWidthY_2);
-        i_sector.second.CorrectionY2   ->SetBinContent(i_errBins.first,correctionY_2*10000.);
-      }
-      
-      
+      if (isnan(correctionX_1))
+        correctionX_1 = -0.0010;
+      if (isnan(correctionX_2))
+        correctionX_2 = -0.0010;
+      if (isnan(correctionY_1))
+        correctionY_1 = -0.0010;
+      if (isnan(correctionY_2))
+        correctionY_2 = -0.0010;
+
+      if (entriesX < minHitsPerInterval) {
+        meanX = 0.;
+        rmsX = -0.0010;
+        fitMeanX_1 = 0.;
+        correctionX_1 = residualWidthX_1 = -0.0010;
+        fitMeanX_2 = 0.;
+        correctionX_2 = residualWidthX_2 = -0.0010;
+      }
+
+      if (entriesY < minHitsPerInterval) {
+        meanY = 0.;
+        rmsY = -0.0010;
+        fitMeanY_1 = 0.;
+        correctionY_1 = residualWidthY_1 = -0.0010;
+        fitMeanY_2 = 0.;
+        correctionY_2 = residualWidthY_2 = -0.0010;
+      }
+
+      i_sector.second.MeanX->SetBinContent(i_errBins.first, meanX);
+      i_sector.second.RmsX->SetBinContent(i_errBins.first, rmsX);
+
+      i_sector.second.FitMeanX1->SetBinContent(i_errBins.first, fitMeanX_1);
+      i_sector.second.ResidualWidthX1->SetBinContent(i_errBins.first, residualWidthX_1);
+      i_sector.second.CorrectionX1->SetBinContent(i_errBins.first, correctionX_1 * 10000.);
+
+      i_sector.second.FitMeanX2->SetBinContent(i_errBins.first, fitMeanX_2);
+      i_sector.second.ResidualWidthX2->SetBinContent(i_errBins.first, residualWidthX_2);
+      i_sector.second.CorrectionX2->SetBinContent(i_errBins.first, correctionX_2 * 10000.);
+
+      if (i_sector.second.isPixel) {
+        i_sector.second.MeanY->SetBinContent(i_errBins.first, meanY);
+        i_sector.second.RmsY->SetBinContent(i_errBins.first, rmsY);
+
+        i_sector.second.FitMeanY1->SetBinContent(i_errBins.first, fitMeanY_1);
+        i_sector.second.ResidualWidthY1->SetBinContent(i_errBins.first, residualWidthY_1);
+        i_sector.second.CorrectionY1->SetBinContent(i_errBins.first, correctionY_1 * 10000.);
+
+        i_sector.second.FitMeanY2->SetBinContent(i_errBins.first, fitMeanY_2);
+        i_sector.second.ResidualWidthY2->SetBinContent(i_errBins.first, residualWidthY_2);
+        i_sector.second.CorrectionY2->SetBinContent(i_errBins.first, correctionY_2 * 10000.);
+      }
+
       // Use result for bin only when entries>=minHitsPerInterval
-      if(entriesX<minHitsPerInterval && entriesY<minHitsPerInterval)continue;
-      
+      if (entriesX < minHitsPerInterval && entriesY < minHitsPerInterval)
+        continue;
+
       double weightX(0.);
       double weightY(0.);
-      if(apeWeight==wUnity){
+      if (apeWeight == wUnity) {
         weightX = 1.;
         weightY = 1.;
-      }else if(apeWeight==wEntries){
+      } else if (apeWeight == wEntries) {
         weightX = entriesX;
         weightY = entriesY;
-      }else if(apeWeight==wEntriesOverSigmaX2){
-        weightX = entriesX/(meanSigmaX*meanSigmaX);
-        weightY = entriesY/(meanSigmaY*meanSigmaY);
+      } else if (apeWeight == wEntriesOverSigmaX2) {
+        weightX = entriesX / (meanSigmaX * meanSigmaX);
+        weightY = entriesY / (meanSigmaY * meanSigmaY);
       }
-      
-      const Error2AndResidualWidth2PerBin error2AndResidualWidth2PerBinX(meanSigmaX*meanSigmaX, residualWidthX_1*residualWidthX_1);
+
+      const Error2AndResidualWidth2PerBin error2AndResidualWidth2PerBinX(meanSigmaX * meanSigmaX,
+                                                                         residualWidthX_1 * residualWidthX_1);
       const WeightAndResultsPerBin weightAndResultsPerBinX(weightX, error2AndResidualWidth2PerBinX);
-      if(!(entriesX<minHitsPerInterval)){
+      if (!(entriesX < minHitsPerInterval)) {
         //Fill absolute weights
-        i_sector.second.WeightX->SetBinContent(i_errBins.first,weightX);
+        i_sector.second.WeightX->SetBinContent(i_errBins.first, weightX);
         v_weightAndResultsPerBinX.push_back(weightAndResultsPerBinX);
       }
-      
-      const Error2AndResidualWidth2PerBin error2AndResidualWidth2PerBinY(meanSigmaY*meanSigmaY, residualWidthY_1*residualWidthY_1);
+
+      const Error2AndResidualWidth2PerBin error2AndResidualWidth2PerBinY(meanSigmaY * meanSigmaY,
+                                                                         residualWidthY_1 * residualWidthY_1);
       const WeightAndResultsPerBin weightAndResultsPerBinY(weightY, error2AndResidualWidth2PerBinY);
-      if(!(entriesY<minHitsPerInterval)){
+      if (!(entriesY < minHitsPerInterval)) {
         //Fill absolute weights
-        i_sector.second.WeightY->SetBinContent(i_errBins.first,weightY);
+        i_sector.second.WeightY->SetBinContent(i_errBins.first, weightY);
         v_weightAndResultsPerBinY.push_back(weightAndResultsPerBinY);
       }
     }
-    
-    
+
     // Do the final calculations
-    
-    if(v_weightAndResultsPerBinX.empty()){
-      edm::LogError("CalculateAPE")<<"NO error interval of sector "<<i_sector.first<<" has a valid x APE calculated,\n...so cannot set APE";
+
+    if (v_weightAndResultsPerBinX.empty()) {
+      edm::LogError("CalculateAPE") << "NO error interval of sector " << i_sector.first
+                                    << " has a valid x APE calculated,\n...so cannot set APE";
       continue;
     }
-    
-    if(i_sector.second.isPixel && v_weightAndResultsPerBinY.empty()){
-      edm::LogError("CalculateAPE")<<"NO error interval of sector "<<i_sector.first<<" has a valid y APE calculated,\n...so cannot set APE";
+
+    if (i_sector.second.isPixel && v_weightAndResultsPerBinY.empty()) {
+      edm::LogError("CalculateAPE") << "NO error interval of sector " << i_sector.first
+                                    << " has a valid y APE calculated,\n...so cannot set APE";
       continue;
     }
-    
+
     double correctionX2(999.);
     double correctionY2(999.);
-    
+
     // Get sum of all weights
     double weightSumX(0.);
-    for(auto const & i_apeBin : v_weightAndResultsPerBinX){
+    for (auto const& i_apeBin : v_weightAndResultsPerBinX) {
       weightSumX += i_apeBin.first;
     }
-    i_sector.second.WeightX->Scale(1/weightSumX);
+    i_sector.second.WeightX->Scale(1 / weightSumX);
     double weightSumY(0.);
-    if(i_sector.second.isPixel){
-      for(auto const & i_apeBin : v_weightAndResultsPerBinY){
+    if (i_sector.second.isPixel) {
+      for (auto const& i_apeBin : v_weightAndResultsPerBinY) {
         weightSumY += i_apeBin.first;
       }
-      i_sector.second.WeightY->Scale(1/weightSumY);
+      i_sector.second.WeightY->Scale(1 / weightSumY);
     }
-    
-    if(!setBaseline){
+
+    if (!setBaseline) {
       // Calculate weighted mean
       bool firstIntervalX(true);
-      for(auto const & i_apeBin : v_weightAndResultsPerBinX){
-        if(firstIntervalX){
-          correctionX2 = i_apeBin.first*i_apeBin.second.first*(i_apeBin.second.second - baselineWidthX2);
+      for (auto const& i_apeBin : v_weightAndResultsPerBinX) {
+        if (firstIntervalX) {
+          correctionX2 = i_apeBin.first * i_apeBin.second.first * (i_apeBin.second.second - baselineWidthX2);
           firstIntervalX = false;
-        }else{
-          correctionX2 += i_apeBin.first*i_apeBin.second.first*(i_apeBin.second.second - baselineWidthX2);
+        } else {
+          correctionX2 += i_apeBin.first * i_apeBin.second.first * (i_apeBin.second.second - baselineWidthX2);
         }
       }
-      correctionX2 = correctionX2/weightSumX;
-    }else{
+      correctionX2 = correctionX2 / weightSumX;
+    } else {
       double numeratorX(0.), denominatorX(0.);
-      for(auto const & i_apeBin : v_weightAndResultsPerBinX){
-        numeratorX += i_apeBin.first*i_apeBin.second.first*i_apeBin.second.second;
-        denominatorX += i_apeBin.first*i_apeBin.second.first;
+      for (auto const& i_apeBin : v_weightAndResultsPerBinX) {
+        numeratorX += i_apeBin.first * i_apeBin.second.first * i_apeBin.second.second;
+        denominatorX += i_apeBin.first * i_apeBin.second.first;
       }
-      correctionX2 = numeratorX/denominatorX;
+      correctionX2 = numeratorX / denominatorX;
     }
-    
-    if(i_sector.second.isPixel){
-      if(!setBaseline){
+
+    if (i_sector.second.isPixel) {
+      if (!setBaseline) {
         // Calculate weighted mean
         bool firstIntervalY(true);
-        for(auto const & i_apeBin : v_weightAndResultsPerBinY){
-          if(firstIntervalY){
-            correctionY2 = i_apeBin.first*i_apeBin.second.first*(i_apeBin.second.second - baselineWidthY2);
+        for (auto const& i_apeBin : v_weightAndResultsPerBinY) {
+          if (firstIntervalY) {
+            correctionY2 = i_apeBin.first * i_apeBin.second.first * (i_apeBin.second.second - baselineWidthY2);
             firstIntervalY = false;
-          }else{
-            correctionY2 += i_apeBin.first*i_apeBin.second.first*(i_apeBin.second.second - baselineWidthY2);
+          } else {
+            correctionY2 += i_apeBin.first * i_apeBin.second.first * (i_apeBin.second.second - baselineWidthY2);
           }
         }
-        correctionY2 = correctionY2/weightSumY;
-      }else{
+        correctionY2 = correctionY2 / weightSumY;
+      } else {
         double numeratorY(0.), denominatorY(0.);
-        for(auto const & i_apeBin : v_weightAndResultsPerBinY){
-          numeratorY += i_apeBin.first*i_apeBin.second.first*i_apeBin.second.second;
-          denominatorY += i_apeBin.first*i_apeBin.second.first;
+        for (auto const& i_apeBin : v_weightAndResultsPerBinY) {
+          numeratorY += i_apeBin.first * i_apeBin.second.first * i_apeBin.second.second;
+          denominatorY += i_apeBin.first * i_apeBin.second.first;
         }
-        correctionY2 = numeratorY/denominatorY;
+        correctionY2 = numeratorY / denominatorY;
       }
     }
-    
-    if(!setBaseline){
+
+    if (!setBaseline) {
       // Calculate updated squared APE of current iteration
       double apeX2(999.);
       double apeY2(999.);
-      
+
       // old APE value from last iteration
-      if(firstIter){
+      if (firstIter) {
         apeX2 = 0.;
         apeY2 = 0.;
-      }
-      else{
+      } else {
         apeX2 = a_apeSectorX[i_sector.first];
         apeY2 = a_apeSectorY[i_sector.first];
       }
       const double apeX2old = apeX2;
       const double apeY2old = apeY2;
-      
+
       // scale APE Correction with value given in cfg (not if smoothed iteration is used)
-      edm::LogInfo("CalculateAPE")<<"Unscaled correction x for sector "<<i_sector.first<<" is "<<(correctionX2>0. ? +1. : -1.)*std::sqrt(std::fabs(correctionX2));
-      if(!smoothIteration || firstIter)correctionX2 = correctionX2*correctionScaling*correctionScaling;
-      if(i_sector.second.isPixel){
-        edm::LogInfo("CalculateAPE")<<"Unscaled correction y for sector "<<i_sector.first<<" is "<<(correctionY2>0. ? +1. : -1.)*std::sqrt(std::fabs(correctionY2));
-        if(!smoothIteration || firstIter)correctionY2 = correctionY2*correctionScaling*correctionScaling;
+      edm::LogInfo("CalculateAPE") << "Unscaled correction x for sector " << i_sector.first << " is "
+                                   << (correctionX2 > 0. ? +1. : -1.) * std::sqrt(std::fabs(correctionX2));
+      if (!smoothIteration || firstIter)
+        correctionX2 = correctionX2 * correctionScaling * correctionScaling;
+      if (i_sector.second.isPixel) {
+        edm::LogInfo("CalculateAPE") << "Unscaled correction y for sector " << i_sector.first << " is "
+                                     << (correctionY2 > 0. ? +1. : -1.) * std::sqrt(std::fabs(correctionY2));
+        if (!smoothIteration || firstIter)
+          correctionY2 = correctionY2 * correctionScaling * correctionScaling;
       }
-      
+
       // new APE value
       // smooth iteration or not?
-      if(apeX2 + correctionX2 < 0.) correctionX2 = -apeX2;
-      if(apeY2 + correctionY2 < 0.) correctionY2 = -apeY2;
+      if (apeX2 + correctionX2 < 0.)
+        correctionX2 = -apeX2;
+      if (apeY2 + correctionY2 < 0.)
+        correctionY2 = -apeY2;
       const double apeX2new(apeX2old + correctionX2);
       const double apeY2new(apeY2old + correctionY2);
-      if(!smoothIteration || firstIter){
+      if (!smoothIteration || firstIter) {
         apeX2 = apeX2new;
         apeY2 = apeY2new;
-      }else{
-        const double apeXtmp = smoothFraction*std::sqrt(apeX2new) + (1-smoothFraction)*std::sqrt(apeX2old);
-        const double apeYtmp = smoothFraction*std::sqrt(apeY2new) + (1-smoothFraction)*std::sqrt(apeY2old);
-        apeX2 = apeXtmp*apeXtmp;
-        apeY2 = apeYtmp*apeYtmp;
+      } else {
+        const double apeXtmp = smoothFraction * std::sqrt(apeX2new) + (1 - smoothFraction) * std::sqrt(apeX2old);
+        const double apeYtmp = smoothFraction * std::sqrt(apeY2new) + (1 - smoothFraction) * std::sqrt(apeY2old);
+        apeX2 = apeXtmp * apeXtmp;
+        apeY2 = apeYtmp * apeYtmp;
       }
-      if(apeX2<0. || apeY2<0.)edm::LogError("CalculateAPE")<<"\n\n\tBad APE, but why???\n\n\n";
+      if (apeX2 < 0. || apeY2 < 0.)
+        edm::LogError("CalculateAPE") << "\n\n\tBad APE, but why???\n\n\n";
       a_apeSectorX[i_sector.first] = apeX2;
       a_apeSectorY[i_sector.first] = apeY2;
-      
+
       // Set the calculated APE spherical for all modules of strip sectors
       const double apeX(std::sqrt(apeX2));
       const double apeY(std::sqrt(apeY2));
-      const double apeZ(std::sqrt(0.5*(apeX2+apeY2)));
-      for(auto const & i_rawId : i_sector.second.v_rawId){
-        if(i_sector.second.isPixel){
-          apeOutputFile<<i_rawId<<" "<<std::fixed<<std::setprecision(5)<<apeX<<" "<<apeY<<" "<<apeZ<<"\n";
-        }else{
-          apeOutputFile<<i_rawId<<" "<<std::fixed<<std::setprecision(5)<<apeX<<" "<<apeX<<" "<<apeX<<"\n";
+      const double apeZ(std::sqrt(0.5 * (apeX2 + apeY2)));
+      for (auto const& i_rawId : i_sector.second.v_rawId) {
+        if (i_sector.second.isPixel) {
+          apeOutputFile << i_rawId << " " << std::fixed << std::setprecision(5) << apeX << " " << apeY << " " << apeZ
+                        << "\n";
+        } else {
+          apeOutputFile << i_rawId << " " << std::fixed << std::setprecision(5) << apeX << " " << apeX << " " << apeX
+                        << "\n";
         }
       }
-    }else{ // In setBaseline mode, just fill estimated mean value of residual width
+    } else {  // In setBaseline mode, just fill estimated mean value of residual width
       a_apeSectorX[i_sector.first] = correctionX2;
       a_apeSectorY[i_sector.first] = correctionY2;
     }
   }
-  if(!setBaseline)apeOutputFile.close();
-   
+  if (!setBaseline)
+    apeOutputFile.close();
+
   iterationTreeX->Fill();
-  iterationTreeX->Write("iterTreeX", TObject::kOverwrite);  // TObject::kOverwrite needed to not produce another iterTreeX;2
+  iterationTreeX->Write("iterTreeX",
+                        TObject::kOverwrite);  // TObject::kOverwrite needed to not produce another iterTreeX;2
   iterationTreeY->Fill();
-  iterationTreeY->Write("iterTreeY", TObject::kOverwrite);  // TObject::kOverwrite needed to not produce another iterTreeY;2
-  if(firstIter){
+  iterationTreeY->Write("iterTreeY",
+                        TObject::kOverwrite);  // TObject::kOverwrite needed to not produce another iterTreeY;2
+  if (firstIter) {
     sectorNameTree->Fill();
     sectorNameTree->Write("nameTree");
   }
   iterationFile->Close();
   delete iterationFile;
-  
-  if(baselineFile){
+
+  if (baselineFile) {
     baselineFile->Close();
     delete baselineFile;
-  }  
+  }
 }
 
-
-
 // ------------ method called to for each event  ------------
-void
-ApeEstimatorSummary::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void ApeEstimatorSummary::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   // Load APEs from the GT and write them to root files similar to the ones from calculateAPE()
-  
-  if(firstEvent){
+
+  if (firstEvent) {
     // Set baseline or calculate APE value?
     const bool setBaseline(parameterSet_.getParameter<bool>("setBaseline"));
-    
+
     edm::ESHandle<AlignmentErrorsExtended> alignmentErrors;
     iSetup.get<TrackerAlignmentErrorExtendedRcd>().get(alignmentErrors);
-    
+
     // Read in baseline file for calculation of APE value (if not setting baseline)
     // Has same format as iterationFile
     const std::string baselineFileName(parameterSet_.getParameter<std::string>("BaselineFile"));
     TFile* baselineFile(nullptr);
     TTree* sectorNameBaselineTree(nullptr);
-    if(!setBaseline){
+    if (!setBaseline) {
       std::ifstream baselineFileStream;
       // Check if baseline file exists
       baselineFileStream.open(baselineFileName.c_str());
-      if(baselineFileStream.is_open()){
+      if (baselineFileStream.is_open()) {
         baselineFileStream.close();
-        baselineFile = new TFile(baselineFileName.c_str(),"READ");
+        baselineFile = new TFile(baselineFileName.c_str(), "READ");
       }
-      if(baselineFile){
-        edm::LogInfo("CalculateAPE")<<"Baseline file for APE values sucessfully opened";
-        baselineFile->GetObject("nameTree;1",sectorNameBaselineTree);
-      }else{
-        edm::LogWarning("CalculateAPE")<<"There is NO baseline file for APE values, so normalized residual width =1 for ideal conditions is assumed";
+      if (baselineFile) {
+        edm::LogInfo("CalculateAPE") << "Baseline file for APE values sucessfully opened";
+        baselineFile->GetObject("nameTree;1", sectorNameBaselineTree);
+      } else {
+        edm::LogWarning("CalculateAPE") << "There is NO baseline file for APE values, so normalized residual width =1 "
+                                           "for ideal conditions is assumed";
       }
     }
-    
+
     // Set up root file for default APE values
     const std::string defaultFileName(parameterSet_.getParameter<std::string>("DefaultFile"));
-    TFile* defaultFile = new TFile(defaultFileName.c_str(),"RECREATE");
-    
+    TFile* defaultFile = new TFile(defaultFileName.c_str(), "RECREATE");
+
     // Naming in the root files has to be iterTreeX to be consistent for the plotting tool
     TTree* defaultTreeX(nullptr);
     TTree* defaultTreeY(nullptr);
-    defaultFile->GetObject("iterTreeX;1",defaultTreeX);
-    defaultFile->GetObject("iterTreeY;1",defaultTreeY);
+    defaultFile->GetObject("iterTreeX;1", defaultTreeX);
+    defaultFile->GetObject("iterTreeY;1", defaultTreeY);
     // The same for TTree containing the names of the sectors (no additional check, since always handled exactly as defaultTree)
     TTree* sectorNameTree(nullptr);
-    defaultFile->GetObject("nameTree;1",sectorNameTree);
-    
+    defaultFile->GetObject("nameTree;1", sectorNameTree);
+
     bool firstIter(false);
-    if(!defaultTreeX){ // should be always true in setBaseline mode, since file is recreated
+    if (!defaultTreeX) {  // should be always true in setBaseline mode, since file is recreated
       firstIter = true;
-      defaultTreeX = new TTree("iterTreeX","Tree for default APE x values from GT");
-      defaultTreeY = new TTree("iterTreeY","Tree for default APE y values from GT");
-      edm::LogInfo("CalculateAPE")<<"First APE iteration (number 0.), create default file with TTree";
-      sectorNameTree = new TTree("nameTree","Tree with names of sectors");
-    }else{
-      edm::LogWarning("CalculateAPE")<<"NOT the first APE iteration (number 0.), is this wanted or forgot to delete old iteration file with TTree?";
+      defaultTreeX = new TTree("iterTreeX", "Tree for default APE x values from GT");
+      defaultTreeY = new TTree("iterTreeY", "Tree for default APE y values from GT");
+      edm::LogInfo("CalculateAPE") << "First APE iteration (number 0.), create default file with TTree";
+      sectorNameTree = new TTree("nameTree", "Tree with names of sectors");
+    } else {
+      edm::LogWarning("CalculateAPE") << "NOT the first APE iteration (number 0.), is this wanted or forgot to delete "
+                                         "old iteration file with TTree?";
     }
-      
+
     // Assign the information stored in the trees to arrays
     double a_defaultSectorX[noSectors_];
     double a_defaultSectorY[noSectors_];
-    
+
     std::string* a_sectorName[noSectors_];
     std::string* a_sectorBaselineName[noSectors_];
-    for(auto const & i_sector : m_tkSector_){
+    for (auto const& i_sector : m_tkSector_) {
       const unsigned int iSector(i_sector.first);
       const bool pixelSector(i_sector.second.isPixel);
-      
+
       a_defaultSectorX[iSector] = -99.;
       a_defaultSectorY[iSector] = -99.;
-      
+
       a_sectorName[iSector] = nullptr;
       a_sectorBaselineName[iSector] = nullptr;
       std::stringstream ss_sector, ss_sectorSuffixed;
       ss_sector << "Ape_Sector_" << iSector;
-      if(!setBaseline && sectorNameBaselineTree){
+      if (!setBaseline && sectorNameBaselineTree) {
         sectorNameBaselineTree->SetBranchAddress(ss_sector.str().c_str(), &a_sectorBaselineName[iSector]);
         sectorNameBaselineTree->GetEntry(0);
       }
-    
-      if(firstIter){ // should be always true in setBaseline mode, since file is recreated  
+
+      if (firstIter) {  // should be always true in setBaseline mode, since file is recreated
         ss_sectorSuffixed << ss_sector.str() << "/D";
         defaultTreeX->Branch(ss_sector.str().c_str(), &a_defaultSectorX[iSector], ss_sectorSuffixed.str().c_str());
-        if(pixelSector){
+        if (pixelSector) {
           defaultTreeY->Branch(ss_sector.str().c_str(), &a_defaultSectorY[iSector], ss_sectorSuffixed.str().c_str());
         }
         sectorNameTree->Branch(ss_sector.str().c_str(), &a_sectorName[iSector], 32000, 00);
-      }else{
+      } else {
         defaultTreeX->SetBranchAddress(ss_sector.str().c_str(), &a_defaultSectorX[iSector]);
         defaultTreeX->GetEntry(0);
-        if(pixelSector){
+        if (pixelSector) {
           defaultTreeY->SetBranchAddress(ss_sector.str().c_str(), &a_defaultSectorY[iSector]);
           defaultTreeY->GetEntry(0);
         }
@@ -930,41 +984,46 @@ ApeEstimatorSummary::analyze(const edm::Event& iEvent, const edm::EventSetup& iS
         sectorNameTree->GetEntry(0);
       }
     }
-    
-    
+
     // Check whether sector definitions are identical with the ones of previous iterations and with the ones in baseline file
-    for(auto & i_sector : m_tkSector_){
+    for (auto& i_sector : m_tkSector_) {
       const std::string& name(i_sector.second.name);
-      if(!firstIter){
+      if (!firstIter) {
         const std::string& nameLastIter(*a_sectorName[i_sector.first]);
-        if(name!=nameLastIter){
-          edm::LogError("CalculateAPE")<<"Inconsistent sector definition in iterationFile for sector "<<i_sector.first<<",\n"
-                                        <<"Recent iteration has name \""<<name<<"\", while previous had \""<<nameLastIter<<"\"\n"
-                                    <<"...APE calculation stopped. Please check sector definitions in config!\n";
+        if (name != nameLastIter) {
+          edm::LogError("CalculateAPE") << "Inconsistent sector definition in iterationFile for sector "
+                                        << i_sector.first << ",\n"
+                                        << "Recent iteration has name \"" << name << "\", while previous had \""
+                                        << nameLastIter << "\"\n"
+                                        << "...APE calculation stopped. Please check sector definitions in config!\n";
           return;
         }
-      }
-      else a_sectorName[i_sector.first] = new std::string(name);
-      if(!setBaseline && baselineFile){
+      } else
+        a_sectorName[i_sector.first] = new std::string(name);
+      if (!setBaseline && baselineFile) {
         const std::string& nameBaseline(*a_sectorBaselineName[i_sector.first]);
-        if(name!=nameBaseline){
-          edm::LogError("CalculateAPE")<<"Inconsistent sector definition in baselineFile for sector "<<i_sector.first<<",\n"
-                                        <<"Recent iteration has name \""<<name<<"\", while baseline had \""<<nameBaseline<<"\"\n"
-                                    <<"...APE calculation stopped. Please check sector definitions in config!\n";
+        if (name != nameBaseline) {
+          edm::LogError("CalculateAPE") << "Inconsistent sector definition in baselineFile for sector "
+                                        << i_sector.first << ",\n"
+                                        << "Recent iteration has name \"" << name << "\", while baseline had \""
+                                        << nameBaseline << "\"\n"
+                                        << "...APE calculation stopped. Please check sector definitions in config!\n";
           return;
         }
       }
     }
-    
+
     // Loop over sectors for calculating getting default APE
-    for(auto & i_sector : m_tkSector_){
+    for (auto& i_sector : m_tkSector_) {
       double defaultApeX(0.);
       double defaultApeY(0.);
       unsigned int nModules(0);
-      for(auto const & i_rawId : i_sector.second.v_rawId){
+      for (auto const& i_rawId : i_sector.second.v_rawId) {
         std::vector<AlignTransformErrorExtended> alignErrors = alignmentErrors->m_alignError;
-        for(std::vector<AlignTransformErrorExtended>::const_iterator i_alignError = alignErrors.begin(); i_alignError != alignErrors.end(); ++i_alignError){
-          if(i_rawId ==  i_alignError->rawId()){
+        for (std::vector<AlignTransformErrorExtended>::const_iterator i_alignError = alignErrors.begin();
+             i_alignError != alignErrors.end();
+             ++i_alignError) {
+          if (i_rawId == i_alignError->rawId()) {
             CLHEP::HepSymMatrix errMatrix = i_alignError->matrix();
             defaultApeX += errMatrix[0][0];
             defaultApeY += errMatrix[1][1];
@@ -972,8 +1031,8 @@ ApeEstimatorSummary::analyze(const edm::Event& iEvent, const edm::EventSetup& iS
           }
         }
       }
-      a_defaultSectorX[i_sector.first] = defaultApeX/nModules;
-      a_defaultSectorY[i_sector.first] = defaultApeY/nModules;
+      a_defaultSectorX[i_sector.first] = defaultApeX / nModules;
+      a_defaultSectorY[i_sector.first] = defaultApeY / nModules;
     }
     sectorNameTree->Fill();
     sectorNameTree->Write("nameTree");
@@ -981,40 +1040,33 @@ ApeEstimatorSummary::analyze(const edm::Event& iEvent, const edm::EventSetup& iS
     defaultTreeX->Write("iterTreeX");
     defaultTreeY->Fill();
     defaultTreeY->Write("iterTreeY");
-    
+
     defaultFile->Close();
     delete defaultFile;
-    
-    if(baselineFile){
+
+    if (baselineFile) {
       baselineFile->Close();
       delete baselineFile;
     }
-    
-    firstEvent = false;   
+
+    firstEvent = false;
   }
 }
 
-
 // ------------ method called once each job just before starting event loop  ------------
-void 
-ApeEstimatorSummary::beginJob()
-{
+void ApeEstimatorSummary::beginJob() {
   this->openInputFile();
-  
+
   this->getTrackerSectorStructs();
-  
+
   this->bookHists();
 }
 
 // ------------ method called once each job just after ending the event loop  ------------
-void 
-ApeEstimatorSummary::endJob() {
-  
+void ApeEstimatorSummary::endJob() {
   this->calculateApe();
-  
+
   this->writeHists();
-  
-  
 }
 
 //define this as a plug-in
diff --git a/Alignment/APEEstimation/plugins/ApeTreeCreateDefault.cc b/Alignment/APEEstimation/plugins/ApeTreeCreateDefault.cc
index 13735f842281d..2bd45de515edf 100644
--- a/Alignment/APEEstimation/plugins/ApeTreeCreateDefault.cc
+++ b/Alignment/APEEstimation/plugins/ApeTreeCreateDefault.cc
@@ -3,7 +3,7 @@
 //
 // Package:    DefaultApeTree
 // Class:      DefaultApeTree
-// 
+//
 /**\class ApeTreeCreateDefault ApeTreeCreateDefault.cc Alignment/APEEstimation/src/ApeTreeCreateDefault.cc
 
  Description: [one line class summary]
@@ -18,7 +18,6 @@
 //
 //
 
-
 // system include files
 #include <fstream>
 #include <sstream>
@@ -53,7 +52,6 @@
 #include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
 #include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
 
-
 #include "TString.h"
 #include "TFile.h"
 #include "TDirectory.h"
@@ -64,33 +62,33 @@
 //
 
 class ApeTreeCreateDefault : public edm::one::EDAnalyzer<> {
-  public:
-    explicit ApeTreeCreateDefault(const edm::ParameterSet&);
-    ~ApeTreeCreateDefault() override;
-    
-    static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
-  
-  private:
-    void beginJob() override ;
-    void analyze(const edm::Event&, const edm::EventSetup&) override;
-    void endJob() override ;
-    
-    void sectorBuilder();
-    bool checkIntervalsForSectors(const unsigned int sectorCounter, const std::vector<double>&)const;
-    bool checkModuleIds(const unsigned int, const std::vector<unsigned int>&)const;
-    bool checkModuleBools(const bool, const std::vector<unsigned int>&)const;
-    bool checkModuleDirections(const int, const std::vector<int>&)const;
-    bool checkModulePositions(const float, const std::vector<double>&)const;
-    
-    // ----------member data ---------------------------
-    const std::string resultFile_;
-    const std::string trackerTreeFile_;
-    const std::vector<edm::ParameterSet> sectors_;
-    
-    std::map<unsigned int, TrackerSectorStruct> m_tkSector_;
-    std::map<unsigned int, ReducedTrackerTreeVariables> m_tkTreeVar_;
-    unsigned int noSectors;
-};              
+public:
+  explicit ApeTreeCreateDefault(const edm::ParameterSet&);
+  ~ApeTreeCreateDefault() override;
+
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
+private:
+  void beginJob() override;
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void endJob() override;
+
+  void sectorBuilder();
+  bool checkIntervalsForSectors(const unsigned int sectorCounter, const std::vector<double>&) const;
+  bool checkModuleIds(const unsigned int, const std::vector<unsigned int>&) const;
+  bool checkModuleBools(const bool, const std::vector<unsigned int>&) const;
+  bool checkModuleDirections(const int, const std::vector<int>&) const;
+  bool checkModulePositions(const float, const std::vector<double>&) const;
+
+  // ----------member data ---------------------------
+  const std::string resultFile_;
+  const std::string trackerTreeFile_;
+  const std::vector<edm::ParameterSet> sectors_;
+
+  std::map<unsigned int, TrackerSectorStruct> m_tkSector_;
+  std::map<unsigned int, ReducedTrackerTreeVariables> m_tkTreeVar_;
+  unsigned int noSectors;
+};
 
 //
 // constants, enums and typedefs
@@ -103,48 +101,40 @@ class ApeTreeCreateDefault : public edm::one::EDAnalyzer<> {
 //
 // constructors and destructor
 //
-ApeTreeCreateDefault::ApeTreeCreateDefault(const edm::ParameterSet& iConfig):
-  resultFile_(iConfig.getParameter<std::string>("resultFile")),
-  trackerTreeFile_(iConfig.getParameter<std::string>("trackerTreeFile")),
-  sectors_(iConfig.getParameter<std::vector<edm::ParameterSet> >("sectors"))
-{
-}
-
-
-ApeTreeCreateDefault::~ApeTreeCreateDefault()
-{
-}
+ApeTreeCreateDefault::ApeTreeCreateDefault(const edm::ParameterSet& iConfig)
+    : resultFile_(iConfig.getParameter<std::string>("resultFile")),
+      trackerTreeFile_(iConfig.getParameter<std::string>("trackerTreeFile")),
+      sectors_(iConfig.getParameter<std::vector<edm::ParameterSet>>("sectors")) {}
 
+ApeTreeCreateDefault::~ApeTreeCreateDefault() {}
 
 //
 // member functions
 //
-void
-ApeTreeCreateDefault::sectorBuilder()
-{
+void ApeTreeCreateDefault::sectorBuilder() {
   // Same procedure as in ApeEstimator.cc
   TFile* tkTreeFile(TFile::Open(trackerTreeFile_.c_str()));
-  if(tkTreeFile){
-    edm::LogInfo("SectorBuilder")<<"TrackerTreeFile OK";
-  }else{
-    edm::LogError("SectorBuilder")<<"TrackerTreeFile not found";
+  if (tkTreeFile) {
+    edm::LogInfo("SectorBuilder") << "TrackerTreeFile OK";
+  } else {
+    edm::LogError("SectorBuilder") << "TrackerTreeFile not found";
     return;
   }
   TTree* tkTree(nullptr);
-  tkTreeFile->GetObject("TrackerTreeGenerator/TrackerTree/TrackerTree",tkTree);
-  if(tkTree){
-    edm::LogInfo("SectorBuilder")<<"TrackerTree OK";
-  }else{
-    edm::LogError("SectorBuilder")<<"TrackerTree not found in file";
+  tkTreeFile->GetObject("TrackerTreeGenerator/TrackerTree/TrackerTree", tkTree);
+  if (tkTree) {
+    edm::LogInfo("SectorBuilder") << "TrackerTree OK";
+  } else {
+    edm::LogError("SectorBuilder") << "TrackerTree not found in file";
     return;
   }
-  
-  unsigned int rawId(999), subdetId(999), layer(999), side(999), half(999), rod(999), ring(999), petal(999),
-         blade(999), panel(999), outerInner(999), module(999), nStrips(999);
+
+  unsigned int rawId(999), subdetId(999), layer(999), side(999), half(999), rod(999), ring(999), petal(999), blade(999),
+      panel(999), outerInner(999), module(999), nStrips(999);
   bool isDoubleSide(false), isRPhi(false), isStereo(false);
   int uDirection(999), vDirection(999), wDirection(999);
-  float posR(999.F), posPhi(999.F), posEta(999.F), posX(999.F), posY(999.F), posZ(999.F); 
-  
+  float posR(999.F), posPhi(999.F), posEta(999.F), posX(999.F), posY(999.F), posZ(999.F);
+
   tkTree->SetBranchAddress("RawId", &rawId);
   tkTree->SetBranchAddress("SubdetId", &subdetId);
   tkTree->SetBranchAddress("Layer", &layer);
@@ -170,60 +160,63 @@ ApeTreeCreateDefault::sectorBuilder()
   tkTree->SetBranchAddress("PosX", &posX);
   tkTree->SetBranchAddress("PosY", &posY);
   tkTree->SetBranchAddress("PosZ", &posZ);
-  
+
   int nModules(tkTree->GetEntries());
   TrackerSectorStruct allSectors;
-  
+
   //Loop over all Sectors
   unsigned int sectorCounter(0);
   std::vector<edm::ParameterSet> v_sectorDef(sectors_);
-  edm::LogInfo("SectorBuilder")<<"There are "<<v_sectorDef.size()<<" Sectors defined";
+  edm::LogInfo("SectorBuilder") << "There are " << v_sectorDef.size() << " Sectors defined";
 
-  for(auto const & parSet : v_sectorDef){
+  for (auto const& parSet : v_sectorDef) {
     ++sectorCounter;
     const std::string& sectorName(parSet.getParameter<std::string>("name"));
-    std::vector<unsigned int> v_rawId(parSet.getParameter<std::vector<unsigned int> >("rawId")),
-                              v_subdetId(parSet.getParameter<std::vector<unsigned int> >("subdetId")),
-                              v_layer(parSet.getParameter<std::vector<unsigned int> >("layer")),
-                              v_side(parSet.getParameter<std::vector<unsigned int> >("side")),
-                              v_half(parSet.getParameter<std::vector<unsigned int> >("half")),
-                              v_rod(parSet.getParameter<std::vector<unsigned int> >("rod")),
-                              v_ring(parSet.getParameter<std::vector<unsigned int> >("ring")),
-                              v_petal(parSet.getParameter<std::vector<unsigned int> >("petal")),
-                              v_blade(parSet.getParameter<std::vector<unsigned int> >("blade")),
-                              v_panel(parSet.getParameter<std::vector<unsigned int> >("panel")),
-                              v_outerInner(parSet.getParameter<std::vector<unsigned int> >("outerInner")),
-                              v_module(parSet.getParameter<std::vector<unsigned int> >("module")),
-                              v_nStrips(parSet.getParameter<std::vector<unsigned int> >("nStrips")),
-                              v_isDoubleSide(parSet.getParameter<std::vector<unsigned int> >("isDoubleSide")),
-                              v_isRPhi(parSet.getParameter<std::vector<unsigned int> >("isRPhi")),
-                              v_isStereo(parSet.getParameter<std::vector<unsigned int> >("isStereo"));
-    std::vector<int>  v_uDirection(parSet.getParameter<std::vector<int> >("uDirection")),
-                      v_vDirection(parSet.getParameter<std::vector<int> >("vDirection")),
-                      v_wDirection(parSet.getParameter<std::vector<int> >("wDirection"));
-    std::vector<double> v_posR(parSet.getParameter<std::vector<double> >("posR")),
-                        v_posPhi(parSet.getParameter<std::vector<double> >("posPhi")),
-                        v_posEta(parSet.getParameter<std::vector<double> >("posEta")),
-                        v_posX(parSet.getParameter<std::vector<double> >("posX")),
-                        v_posY(parSet.getParameter<std::vector<double> >("posY")),
-                        v_posZ(parSet.getParameter<std::vector<double> >("posZ"));
-    
-    if(!this->checkIntervalsForSectors(sectorCounter,v_posR) || !this->checkIntervalsForSectors(sectorCounter,v_posPhi) ||
-       !this->checkIntervalsForSectors(sectorCounter,v_posEta) || !this->checkIntervalsForSectors(sectorCounter,v_posX) ||
-       !this->checkIntervalsForSectors(sectorCounter,v_posY)   || !this->checkIntervalsForSectors(sectorCounter,v_posZ)){
+    std::vector<unsigned int> v_rawId(parSet.getParameter<std::vector<unsigned int>>("rawId")),
+        v_subdetId(parSet.getParameter<std::vector<unsigned int>>("subdetId")),
+        v_layer(parSet.getParameter<std::vector<unsigned int>>("layer")),
+        v_side(parSet.getParameter<std::vector<unsigned int>>("side")),
+        v_half(parSet.getParameter<std::vector<unsigned int>>("half")),
+        v_rod(parSet.getParameter<std::vector<unsigned int>>("rod")),
+        v_ring(parSet.getParameter<std::vector<unsigned int>>("ring")),
+        v_petal(parSet.getParameter<std::vector<unsigned int>>("petal")),
+        v_blade(parSet.getParameter<std::vector<unsigned int>>("blade")),
+        v_panel(parSet.getParameter<std::vector<unsigned int>>("panel")),
+        v_outerInner(parSet.getParameter<std::vector<unsigned int>>("outerInner")),
+        v_module(parSet.getParameter<std::vector<unsigned int>>("module")),
+        v_nStrips(parSet.getParameter<std::vector<unsigned int>>("nStrips")),
+        v_isDoubleSide(parSet.getParameter<std::vector<unsigned int>>("isDoubleSide")),
+        v_isRPhi(parSet.getParameter<std::vector<unsigned int>>("isRPhi")),
+        v_isStereo(parSet.getParameter<std::vector<unsigned int>>("isStereo"));
+    std::vector<int> v_uDirection(parSet.getParameter<std::vector<int>>("uDirection")),
+        v_vDirection(parSet.getParameter<std::vector<int>>("vDirection")),
+        v_wDirection(parSet.getParameter<std::vector<int>>("wDirection"));
+    std::vector<double> v_posR(parSet.getParameter<std::vector<double>>("posR")),
+        v_posPhi(parSet.getParameter<std::vector<double>>("posPhi")),
+        v_posEta(parSet.getParameter<std::vector<double>>("posEta")),
+        v_posX(parSet.getParameter<std::vector<double>>("posX")),
+        v_posY(parSet.getParameter<std::vector<double>>("posY")),
+        v_posZ(parSet.getParameter<std::vector<double>>("posZ"));
+
+    if (!this->checkIntervalsForSectors(sectorCounter, v_posR) ||
+        !this->checkIntervalsForSectors(sectorCounter, v_posPhi) ||
+        !this->checkIntervalsForSectors(sectorCounter, v_posEta) ||
+        !this->checkIntervalsForSectors(sectorCounter, v_posX) ||
+        !this->checkIntervalsForSectors(sectorCounter, v_posY) ||
+        !this->checkIntervalsForSectors(sectorCounter, v_posZ)) {
       continue;
     }
-    
+
     TrackerSectorStruct tkSector;
     tkSector.name = sectorName;
-    
+
     ReducedTrackerTreeVariables tkTreeVar;
-    
+
     //Loop over all Modules
-    for(int module = 0; module < nModules; ++module){
+    for (int module = 0; module < nModules; ++module) {
       tkTree->GetEntry(module);
-      
-      if(sectorCounter==1){
+
+      if (sectorCounter == 1) {
         tkTreeVar.subdetId = subdetId;
         tkTreeVar.nStrips = nStrips;
         tkTreeVar.uDirection = uDirection;
@@ -232,44 +225,71 @@ ApeTreeCreateDefault::sectorBuilder()
         m_tkTreeVar_[rawId] = tkTreeVar;
       }
       //Check if modules from Sector builder equal those from TrackerTree
-      if(!this->checkModuleIds(rawId,v_rawId))continue;
-      if(!this->checkModuleIds(subdetId,v_subdetId))continue;
-      if(!this->checkModuleIds(layer,v_layer))continue;
-      if(!this->checkModuleIds(side,v_side))continue;
-      if(!this->checkModuleIds(half,v_half))continue;
-      if(!this->checkModuleIds(rod,v_rod))continue;
-      if(!this->checkModuleIds(ring,v_ring))continue;
-      if(!this->checkModuleIds(petal,v_petal))continue;
-      if(!this->checkModuleIds(blade,v_blade))continue;
-      if(!this->checkModuleIds(panel,v_panel))continue;
-      if(!this->checkModuleIds(outerInner,v_outerInner))continue;
-      if(!this->checkModuleIds(module,v_module))continue;
-      if(!this->checkModuleIds(nStrips,v_nStrips))continue;
-      if(!this->checkModuleBools(isDoubleSide,v_isDoubleSide))continue;
-      if(!this->checkModuleBools(isRPhi,v_isRPhi))continue;
-      if(!this->checkModuleBools(isStereo,v_isStereo))continue;
-      if(!this->checkModuleDirections(uDirection,v_uDirection))continue;
-      if(!this->checkModuleDirections(vDirection,v_vDirection))continue;
-      if(!this->checkModuleDirections(wDirection,v_wDirection))continue;
-      if(!this->checkModulePositions(posR,v_posR))continue;
-      if(!this->checkModulePositions(posPhi,v_posPhi))continue;
-      if(!this->checkModulePositions(posEta,v_posEta))continue;
-      if(!this->checkModulePositions(posX,v_posX))continue;
-      if(!this->checkModulePositions(posY,v_posY))continue;
-      if(!this->checkModulePositions(posZ,v_posZ))continue;
-      
+      if (!this->checkModuleIds(rawId, v_rawId))
+        continue;
+      if (!this->checkModuleIds(subdetId, v_subdetId))
+        continue;
+      if (!this->checkModuleIds(layer, v_layer))
+        continue;
+      if (!this->checkModuleIds(side, v_side))
+        continue;
+      if (!this->checkModuleIds(half, v_half))
+        continue;
+      if (!this->checkModuleIds(rod, v_rod))
+        continue;
+      if (!this->checkModuleIds(ring, v_ring))
+        continue;
+      if (!this->checkModuleIds(petal, v_petal))
+        continue;
+      if (!this->checkModuleIds(blade, v_blade))
+        continue;
+      if (!this->checkModuleIds(panel, v_panel))
+        continue;
+      if (!this->checkModuleIds(outerInner, v_outerInner))
+        continue;
+      if (!this->checkModuleIds(module, v_module))
+        continue;
+      if (!this->checkModuleIds(nStrips, v_nStrips))
+        continue;
+      if (!this->checkModuleBools(isDoubleSide, v_isDoubleSide))
+        continue;
+      if (!this->checkModuleBools(isRPhi, v_isRPhi))
+        continue;
+      if (!this->checkModuleBools(isStereo, v_isStereo))
+        continue;
+      if (!this->checkModuleDirections(uDirection, v_uDirection))
+        continue;
+      if (!this->checkModuleDirections(vDirection, v_vDirection))
+        continue;
+      if (!this->checkModuleDirections(wDirection, v_wDirection))
+        continue;
+      if (!this->checkModulePositions(posR, v_posR))
+        continue;
+      if (!this->checkModulePositions(posPhi, v_posPhi))
+        continue;
+      if (!this->checkModulePositions(posEta, v_posEta))
+        continue;
+      if (!this->checkModulePositions(posX, v_posX))
+        continue;
+      if (!this->checkModulePositions(posY, v_posY))
+        continue;
+      if (!this->checkModulePositions(posZ, v_posZ))
+        continue;
+
       tkSector.v_rawId.push_back(rawId);
       bool moduleSelected(false);
-      for(auto const & i_rawId : allSectors.v_rawId){
-        if(rawId == i_rawId)moduleSelected = true;
+      for (auto const& i_rawId : allSectors.v_rawId) {
+        if (rawId == i_rawId)
+          moduleSelected = true;
       }
-      if(!moduleSelected)allSectors.v_rawId.push_back(rawId);
+      if (!moduleSelected)
+        allSectors.v_rawId.push_back(rawId);
     }
-    
+
     // Stops you from combining pixel and strip detector into one sector
     bool isPixel(false);
     bool isStrip(false);
-    for(auto const & i_rawId : tkSector.v_rawId){
+    for (auto const& i_rawId : tkSector.v_rawId) {
       switch (m_tkTreeVar_[i_rawId].subdetId) {
         case PixelSubdetector::PixelBarrel:
         case PixelSubdetector::PixelEndcap:
@@ -284,213 +304,195 @@ ApeTreeCreateDefault::sectorBuilder()
       }
     }
 
-    if(isPixel && isStrip){
-      edm::LogError("SectorBuilder")<<"Incorrect Sector Definition: there are pixel and strip modules within one sector"
-                                     <<"\n... sector selection is not applied, sector "<<sectorCounter<<" is not built";
+    if (isPixel && isStrip) {
+      edm::LogError("SectorBuilder")
+          << "Incorrect Sector Definition: there are pixel and strip modules within one sector"
+          << "\n... sector selection is not applied, sector " << sectorCounter << " is not built";
       continue;
     }
     tkSector.isPixel = isPixel;
-    
+
     m_tkSector_[sectorCounter] = tkSector;
-    edm::LogInfo("SectorBuilder")<<"There are "<<tkSector.v_rawId.size()<<" Modules in Sector "<<sectorCounter;
+    edm::LogInfo("SectorBuilder") << "There are " << tkSector.v_rawId.size() << " Modules in Sector " << sectorCounter;
   }
   noSectors = sectorCounter;
   return;
 }
 
-
 // Checking methods copied from ApeEstimator.cc
-bool
-ApeTreeCreateDefault::checkIntervalsForSectors(const unsigned int sectorCounter, const std::vector<double>& v_id)const
-{
-    
-  if(v_id.empty())return true;
-  if(v_id.size()%2==1){
-    edm::LogError("SectorBuilder")<<"Incorrect Sector Definition: Position Vectors need even number of arguments (Intervals)"
-                                     <<"\n... sector selection is not applied, sector "<<sectorCounter<<" is not built";
+bool ApeTreeCreateDefault::checkIntervalsForSectors(const unsigned int sectorCounter,
+                                                    const std::vector<double>& v_id) const {
+  if (v_id.empty())
+    return true;
+  if (v_id.size() % 2 == 1) {
+    edm::LogError("SectorBuilder")
+        << "Incorrect Sector Definition: Position Vectors need even number of arguments (Intervals)"
+        << "\n... sector selection is not applied, sector " << sectorCounter << " is not built";
     return false;
   }
-  int entry(0); double intervalBegin(999.);
-  for(auto const & i_id : v_id){
+  int entry(0);
+  double intervalBegin(999.);
+  for (auto const& i_id : v_id) {
     ++entry;
-    if(entry%2==1) intervalBegin = i_id;
-    if(entry%2==0 && intervalBegin > i_id){
-      edm::LogError("SectorBuilder")<<"Incorrect Sector Definition (Position Vector Intervals): \t"
-                                    <<intervalBegin<<" is bigger than "<<i_id<<" but is expected to be smaller"
-                                    <<"\n... sector selection is not applied, sector "<<sectorCounter<<" is not built";
+    if (entry % 2 == 1)
+      intervalBegin = i_id;
+    if (entry % 2 == 0 && intervalBegin > i_id) {
+      edm::LogError("SectorBuilder") << "Incorrect Sector Definition (Position Vector Intervals): \t" << intervalBegin
+                                     << " is bigger than " << i_id << " but is expected to be smaller"
+                                     << "\n... sector selection is not applied, sector " << sectorCounter
+                                     << " is not built";
       return false;
     }
   }
   return true;
 }
 
-bool
-ApeTreeCreateDefault::checkModuleIds(const unsigned int id, const std::vector<unsigned int>& v_id)const
-{
-    
-  if(v_id.empty())return true;
-  for(auto const & i_id : v_id){
-    if(id==i_id)return true;
+bool ApeTreeCreateDefault::checkModuleIds(const unsigned int id, const std::vector<unsigned int>& v_id) const {
+  if (v_id.empty())
+    return true;
+  for (auto const& i_id : v_id) {
+    if (id == i_id)
+      return true;
   }
   return false;
 }
 
-bool
-ApeTreeCreateDefault::checkModuleBools(const bool id, const std::vector<unsigned int>& v_id)const
-{
-    
-  if(v_id.empty())return true;
-  for(auto const & i_id : v_id){
-    if(1==i_id && id)return true;
-    if(2==i_id && !id)return true;
+bool ApeTreeCreateDefault::checkModuleBools(const bool id, const std::vector<unsigned int>& v_id) const {
+  if (v_id.empty())
+    return true;
+  for (auto const& i_id : v_id) {
+    if (1 == i_id && id)
+      return true;
+    if (2 == i_id && !id)
+      return true;
   }
   return false;
 }
 
-bool
-ApeTreeCreateDefault::checkModuleDirections(const int id, const std::vector<int>& v_id)const
-{
-    
-  if(v_id.empty())return true;
-  for(auto const & i_id : v_id){
-    if(id==i_id)return true;
+bool ApeTreeCreateDefault::checkModuleDirections(const int id, const std::vector<int>& v_id) const {
+  if (v_id.empty())
+    return true;
+  for (auto const& i_id : v_id) {
+    if (id == i_id)
+      return true;
   }
   return false;
 }
 
-bool
-ApeTreeCreateDefault::checkModulePositions(const float id, const std::vector<double>& v_id)const
-{
-    
-  if(v_id.empty())return true;
-  int entry(0); double intervalBegin(999.);
-  for(auto const & i_id : v_id){
+bool ApeTreeCreateDefault::checkModulePositions(const float id, const std::vector<double>& v_id) const {
+  if (v_id.empty())
+    return true;
+  int entry(0);
+  double intervalBegin(999.);
+  for (auto const& i_id : v_id) {
     ++entry;
-    if(entry%2==1)intervalBegin = i_id;
-    if(entry%2==0 && id>=intervalBegin && id<i_id)return true;
+    if (entry % 2 == 1)
+      intervalBegin = i_id;
+    if (entry % 2 == 0 && id >= intervalBegin && id < i_id)
+      return true;
   }
   return false;
 }
 
-
-
 // ------------ method called to for each event  ------------
-void
-ApeTreeCreateDefault::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void ApeTreeCreateDefault::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   // Same procedure as in ApeEstimatorSummary.cc minus reading of baseline tree
-  
+
   // Load APEs from the GT and write them to root files similar to the ones from calculateAPE()
   edm::ESHandle<AlignmentErrorsExtended> alignmentErrors;
-  iSetup.get<TrackerAlignmentErrorExtendedRcd>().get(alignmentErrors);  
-  
+  iSetup.get<TrackerAlignmentErrorExtendedRcd>().get(alignmentErrors);
+
   // Set up root file for default APE values
   const std::string defaultFileName(resultFile_);
-  TFile* defaultFile = new TFile(defaultFileName.c_str(),"RECREATE");
-  
+  TFile* defaultFile = new TFile(defaultFileName.c_str(), "RECREATE");
+
   // Naming in the root files has to be iterTreeX to be consistent for the plotting tool
   TTree* defaultTreeX(nullptr);
   TTree* defaultTreeY(nullptr);
-  defaultFile->GetObject("iterTreeX;1",defaultTreeX);
-  defaultFile->GetObject("iterTreeY;1",defaultTreeY);
+  defaultFile->GetObject("iterTreeX;1", defaultTreeX);
+  defaultFile->GetObject("iterTreeY;1", defaultTreeY);
   // The same for TTree containing the names of the sectors (no additional check, since always handled exactly as defaultTree)
   TTree* sectorNameTree(nullptr);
-  defaultFile->GetObject("nameTree;1",sectorNameTree);
-  
-  edm::LogInfo("DefaultAPETree")<<"APE Tree is being created";
-  defaultTreeX = new TTree("iterTreeX","Tree for default APE x values from GT");
-  defaultTreeY = new TTree("iterTreeY","Tree for default APE y values from GT");     
-  sectorNameTree = new TTree("nameTree","Tree with names of sectors");
-  
-    
+  defaultFile->GetObject("nameTree;1", sectorNameTree);
+
+  edm::LogInfo("DefaultAPETree") << "APE Tree is being created";
+  defaultTreeX = new TTree("iterTreeX", "Tree for default APE x values from GT");
+  defaultTreeY = new TTree("iterTreeY", "Tree for default APE y values from GT");
+  sectorNameTree = new TTree("nameTree", "Tree with names of sectors");
+
   // Assign the information stored in the trees to arrays
   std::vector<double*> a_defaultSectorX;
   std::vector<double*> a_defaultSectorY;
-  
+
   std::vector<std::string*> a_sectorName;
-  for(auto const & i_sector : m_tkSector_){
+  for (auto const& i_sector : m_tkSector_) {
     const unsigned int iSector(i_sector.first);
     const bool pixelSector(i_sector.second.isPixel);
-    
+
     a_defaultSectorX.push_back(new double(-99.));
     a_defaultSectorY.push_back(new double(-99.));
     a_sectorName.push_back(new std::string(i_sector.second.name));
-    
+
     std::stringstream ss_sector;
     std::stringstream ss_sectorSuffixed;
     ss_sector << "Ape_Sector_" << iSector;
-  
+
     ss_sectorSuffixed << ss_sector.str() << "/D";
-    defaultTreeX->Branch(ss_sector.str().c_str(), &(*a_defaultSectorX[iSector-1]), ss_sectorSuffixed.str().c_str());
-    
-    if(pixelSector){
-      defaultTreeY->Branch(ss_sector.str().c_str(), &(*a_defaultSectorY[iSector-1]), ss_sectorSuffixed.str().c_str());
+    defaultTreeX->Branch(ss_sector.str().c_str(), &(*a_defaultSectorX[iSector - 1]), ss_sectorSuffixed.str().c_str());
+
+    if (pixelSector) {
+      defaultTreeY->Branch(ss_sector.str().c_str(), &(*a_defaultSectorY[iSector - 1]), ss_sectorSuffixed.str().c_str());
     }
-    sectorNameTree->Branch(ss_sector.str().c_str(), &(*a_sectorName[iSector-1]), 32000, 00);  
+    sectorNameTree->Branch(ss_sector.str().c_str(), &(*a_sectorName[iSector - 1]), 32000, 00);
   }
 
-  
   // Loop over sectors for getting default APE
-  
-  for(auto & i_sector : m_tkSector_){
-    
+
+  for (auto& i_sector : m_tkSector_) {
     double defaultApeX(0.);
     double defaultApeY(0.);
     unsigned int nModules(0);
-    for(auto const & i_rawId : i_sector.second.v_rawId){
+    for (auto const& i_rawId : i_sector.second.v_rawId) {
       std::vector<AlignTransformErrorExtended> alignErrors = alignmentErrors->m_alignError;
-      for(auto const & i_alignError : alignErrors){
-        if(i_rawId ==  i_alignError.rawId()){
+      for (auto const& i_alignError : alignErrors) {
+        if (i_rawId == i_alignError.rawId()) {
           CLHEP::HepSymMatrix errMatrix = i_alignError.matrix();
           defaultApeX += errMatrix[0][0];
           defaultApeY += errMatrix[1][1];
           nModules++;
         }
       }
+    }
+    *a_defaultSectorX[i_sector.first - 1] = defaultApeX / nModules;
+    *a_defaultSectorY[i_sector.first - 1] = defaultApeY / nModules;
   }
-  *a_defaultSectorX[i_sector.first-1] = defaultApeX/nModules;
-  *a_defaultSectorY[i_sector.first-1] = defaultApeY/nModules;
-  }
-  
-  
+
   sectorNameTree->Fill();
   sectorNameTree->Write("nameTree");
   defaultTreeX->Fill();
   defaultTreeX->Write("iterTreeX");
   defaultTreeY->Fill();
   defaultTreeY->Write("iterTreeY");
-  
-  defaultFile->Close(); 
+
+  defaultFile->Close();
   delete defaultFile;
-  for(unsigned int i = 0; i < a_defaultSectorX.size(); i++){
+  for (unsigned int i = 0; i < a_defaultSectorX.size(); i++) {
     delete a_defaultSectorX[i];
     delete a_defaultSectorY[i];
     delete a_sectorName[i];
   }
 }
-  
-
-
 
 // ------------ method called once each job just before starting event loop  ------------
-void 
-ApeTreeCreateDefault::beginJob()
-{  
-  this->sectorBuilder();
-}
+void ApeTreeCreateDefault::beginJob() { this->sectorBuilder(); }
 
 // ------------ method called once each job just after ending the event loop  ------------
-void 
-ApeTreeCreateDefault::endJob() 
-{   
-}
+void ApeTreeCreateDefault::endJob() {}
 
-void
-ApeTreeCreateDefault::fillDescriptions(edm::ConfigurationDescriptions & descriptions)
-{
+void ApeTreeCreateDefault::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
   edm::ParameterSetDescription sector;
-  
+
   std::vector<unsigned> emptyUnsignedIntVector;
   std::vector<int> emptyIntVector;
   std::vector<double> emptyDoubleVector;
@@ -524,7 +526,7 @@ ApeTreeCreateDefault::fillDescriptions(edm::ConfigurationDescriptions & descript
   desc.add<std::string>("resultFile", "defaultAPE.root");
   desc.add<std::string>("trackerTreeFile");
   desc.addVPSet("sectors", sector);
- 
+
   descriptions.add("apeTreeCreateDefault", desc);
 }
 
diff --git a/Alignment/CocoaApplication/bin/cocoa.cpp b/Alignment/CocoaApplication/bin/cocoa.cpp
index 8d27084c63acf..ee55865ab6a7d 100644
--- a/Alignment/CocoaApplication/bin/cocoa.cpp
+++ b/Alignment/CocoaApplication/bin/cocoa.cpp
@@ -1,43 +1,48 @@
 
-#include "Alignment/CocoaUtilities/interface/ALIUtils.h"
-#include <assert.h>
-#include "Alignment/CocoaModel/interface/Model.h"
 #include "Alignment/CocoaFit/interface/Fit.h"
+#include "Alignment/CocoaModel/interface/Model.h"
 #include "Alignment/CocoaUtilities/interface/ALIFileOut.h"
+#include "Alignment/CocoaUtilities/interface/ALIUtils.h"
+#include <cassert>
 //#include "Analysis/FittedEntriesRoot/interface/FERootDump.h"
 #include "Alignment/CocoaToDDL/interface/CocoaToDDLMgr.h"
 #include "Alignment/CocoaUtilities/interface/GlobalOptionMgr.h"
 
-#include <time.h>
+#include <ctime>
 
-int main( int argc, char** argv ) 
-{
-  char* nam = getenv("COCOA_SDF_FILENAME"); 
-  if(nam != 0) Model::setSDFName( nam );
-  nam = getenv("COCOA_REPORT_FILENAME"); 
-  if(nam != 0) Model::setReportFName( nam );
-  nam = getenv("COCOA_MATRICES_FILENAME"); 
-  if(nam != 0) Model::setMatricesFName( nam );
+int main(int argc, char** argv) {
+  char* nam = getenv("COCOA_SDF_FILENAME");
+  if (nam != nullptr)
+    Model::setSDFName(nam);
+  nam = getenv("COCOA_REPORT_FILENAME");
+  if (nam != nullptr)
+    Model::setReportFName(nam);
+  nam = getenv("COCOA_MATRICES_FILENAME");
+  if (nam != nullptr)
+    Model::setMatricesFName(nam);
 
   ALIstring COCOA_ver = "COCOA_3_2_4";
   //---------- Read the input arguments to set file names
-  switch( argc ){
-  case 1:
-    break;
-  case 4:
-    if( ALIstring(argv[3]) != "!" ) Model::setMatricesFName( argv[3] );
-  case 3:
-    if( ALIstring(argv[2]) != "!" ) Model::setReportFName( argv[2] );
-  case 2:
-    if( ALIstring(argv[1]) != "!" ) Model::setSDFName( argv[1] );
-    if( ALIstring(argv[1]) == "-v" ) {
-      std::cerr << "COCOA version = " << COCOA_ver << std::endl;
-      exit(0);
-    }
-    break;
-  default:
-    std::cerr << "WARNING: more than two arguments, from third on will not be taken into account " << std::endl;
-    break;
+  switch (argc) {
+    case 1:
+      break;
+    case 4:
+      if (ALIstring(argv[3]) != "!")
+        Model::setMatricesFName(argv[3]);
+    case 3:
+      if (ALIstring(argv[2]) != "!")
+        Model::setReportFName(argv[2]);
+    case 2:
+      if (ALIstring(argv[1]) != "!")
+        Model::setSDFName(argv[1]);
+      if (ALIstring(argv[1]) == "-v") {
+        std::cerr << "COCOA version = " << COCOA_ver << std::endl;
+        exit(0);
+      }
+      break;
+    default:
+      std::cerr << "WARNING: more than two arguments, from third on will not be taken into account " << std::endl;
+      break;
   }
 
   //---------- Build the Model out of the system description text file
@@ -48,22 +53,26 @@ int main( int argc, char** argv )
   time_t now, time_start;
   now = clock();
   time_start = now;
-  if(ALIUtils::debug >= 0) std::cout << "TIME:START_READING  : " << now << " " << difftime(now, ALIUtils::time_now())/1.E6  << "   " << ALIUtils::debug <<std::endl;
-  ALIUtils::set_time_now(now); 
+  if (ALIUtils::debug >= 0)
+    std::cout << "TIME:START_READING  : " << now << " " << difftime(now, ALIUtils::time_now()) / 1.E6 << "   "
+              << ALIUtils::debug << std::endl;
+  ALIUtils::set_time_now(now);
 
   Model::readSystemDescription();
   now = clock();
-  if(ALIUtils::debug >= 0) std::cout << "TIME:ENDED_READING  : " << now << " " << difftime(now, ALIUtils::time_now())/1.E6  << "   " << ALIUtils::debug << std::endl;
-  ALIUtils::set_time_now(now); 
+  if (ALIUtils::debug >= 0)
+    std::cout << "TIME:ENDED_READING  : " << now << " " << difftime(now, ALIUtils::time_now()) / 1.E6 << "   "
+              << ALIUtils::debug << std::endl;
+  ALIUtils::set_time_now(now);
 
   ALIdouble go;
   GlobalOptionMgr* gomgr = GlobalOptionMgr::getInstance();
-  gomgr->getGlobalOptionValue("writeXML", go );
+  gomgr->getGlobalOptionValue("writeXML", go);
 
-  if( ALIint(go) == 1 ){
+  if (ALIint(go) == 1) {
     ALIstring xmlfname = Model::SDFName();
     xmlfname += ALIstring(".xml");
-    CocoaToDDLMgr::getInstance()->writeDDDFile( xmlfname );
+    CocoaToDDLMgr::getInstance()->writeDDDFile(xmlfname);
   }
 
   Fit::getInstance();
@@ -76,18 +85,21 @@ int main( int argc, char** argv )
 
   //analysis code
 
-//  FERootDump fehistos;
-//  std::cout << " call  fehistos.MakeHistos " << std::endl;
-//  fehistos.MakeHistos();
+  //  FERootDump fehistos;
+  //  std::cout << " call  fehistos.MakeHistos " << std::endl;
+  //  fehistos.MakeHistos();
 
-  if(ALIUtils::debug >= 0) std::cout << "............ program ended OK" << std::endl;
-  if( ALIUtils::report >=1 ) {
-    ALIFileOut& fileout = ALIFileOut::getInstance( Model::ReportFName() );
+  if (ALIUtils::debug >= 0)
+    std::cout << "............ program ended OK" << std::endl;
+  if (ALIUtils::report >= 1) {
+    ALIFileOut& fileout = ALIFileOut::getInstance(Model::ReportFName());
     fileout << "............ program ended OK" << std::endl;
   }
   now = clock();
-  if(ALIUtils::debug >= 0) std::cout << "TIME:PROGRAM ENDED  : "<< now << " " << difftime(now, ALIUtils::time_now())/1.E6  << std::endl;
-  if(ALIUtils::debug >= 0) std::cout << "TIME:TOTAL PROGRAM  : "<< now << " " << difftime(now, time_start)/1.E6  << std::endl;
+  if (ALIUtils::debug >= 0)
+    std::cout << "TIME:PROGRAM ENDED  : " << now << " " << difftime(now, ALIUtils::time_now()) / 1.E6 << std::endl;
+  if (ALIUtils::debug >= 0)
+    std::cout << "TIME:TOTAL PROGRAM  : " << now << " " << difftime(now, time_start) / 1.E6 << std::endl;
 
   exit(0);
 }
diff --git a/Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h b/Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h
index c265e5f539648..4d60f99c228b5 100644
--- a/Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h
+++ b/Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h
@@ -1,8 +1,9 @@
 //   COCOA class header file
-//Id:  CocoaMaterialElementary.h
-//CAT: Model
+// Id:  CocoaMaterialElementary.h
+// CAT: Model
 //
-//   Class to manage the sets of fitted entries (one set per each measurement data set)
+//   Class to manage the sets of fitted entries (one set per each measurement
+//   data set)
 //
 //   History: v1.0
 //   Pedro Arce
@@ -12,37 +13,26 @@
 
 #include "Alignment/CocoaUtilities/interface/CocoaGlobals.h"
 
-
-class CocoaMaterialElementary
-{
-
+class CocoaMaterialElementary {
 public:
   //---------- Constructors / Destructor
-  CocoaMaterialElementary( ALIstring name, float density, ALIstring symbol, float A, ALIint Z );
-  ~CocoaMaterialElementary(){ };
+  CocoaMaterialElementary(ALIstring name, float density, ALIstring symbol, float A, ALIint Z);
+  ~CocoaMaterialElementary(){};
 
-  ALIstring getName() const {
-    return theName; }
-  float getDensity() const {
-    return theDensity; }
-  ALIstring getSymbol() const {
-    return theSymbol; }
-  float getA() const {
-    return theA; }
-  ALIint getZ() const {
-    return theZ; }
+  ALIstring getName() const { return theName; }
+  float getDensity() const { return theDensity; }
+  ALIstring getSymbol() const { return theSymbol; }
+  float getA() const { return theA; }
+  ALIint getZ() const { return theZ; }
 
-  ALIbool operator==(const CocoaMaterialElementary& mate ) const;
+  ALIbool operator==(const CocoaMaterialElementary &mate) const;
 
 private:
-
   ALIstring theName;
   float theDensity;
   ALIstring theSymbol;
   float theA;
   ALIint theZ;
-
 };
 
 #endif
-
diff --git a/Alignment/CocoaDDLObjects/interface/CocoaSolidShape.h b/Alignment/CocoaDDLObjects/interface/CocoaSolidShape.h
index afdf7d61437c1..942bde75b3bbb 100644
--- a/Alignment/CocoaDDLObjects/interface/CocoaSolidShape.h
+++ b/Alignment/CocoaDDLObjects/interface/CocoaSolidShape.h
@@ -1,10 +1,11 @@
 //   COCOA class header file
-//Id:  CocoaSolidShape.h
-//CAT: Model
+// Id:  CocoaSolidShape.h
+// CAT: Model
 //
-//   Class to manage the sets of fitted entries (one set per each measurement data set)
-// 
-//   History: v1.0 
+//   Class to manage the sets of fitted entries (one set per each measurement
+//   data set)
+//
+//   History: v1.0
 //   Pedro Arce
 
 #ifndef _CocoaSolidShape_HH
@@ -12,25 +13,18 @@
 
 #include "Alignment/CocoaUtilities/interface/CocoaGlobals.h"
 
-
-class CocoaSolidShape
-{
-
+class CocoaSolidShape {
 public:
   //---------- Constructors / Destructor
-  CocoaSolidShape( ALIstring type );
-  virtual ~CocoaSolidShape(){ };
+  CocoaSolidShape(ALIstring type);
+  virtual ~CocoaSolidShape(){};
 
-  ALIstring getType() const {
-    return theType; }
+  ALIstring getType() const { return theType; }
 
   //  ALIbool operator==(const CocoaSolidShape& mate );
 
 private:
-
   ALIstring theType;
-
 };
 
 #endif
-
diff --git a/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeBox.h b/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeBox.h
index 6c2a7b8ef6c15..25182e7d7f15d 100644
--- a/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeBox.h
+++ b/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeBox.h
@@ -1,7 +1,7 @@
 //   COCOA class header file
-//Id:  CocoaSolidShapeBox.h
+// Id:  CocoaSolidShapeBox.h
 //
-//   History: v1.0 
+//   History: v1.0
 //   Pedro Arce
 
 #ifndef _CocoaSolidShapeBox_HH
@@ -10,28 +10,20 @@
 #include "Alignment/CocoaDDLObjects/interface/CocoaSolidShape.h"
 #include "Alignment/CocoaUtilities/interface/CocoaGlobals.h"
 
-
-class CocoaSolidShapeBox : public CocoaSolidShape
-{
-
+class CocoaSolidShapeBox : public CocoaSolidShape {
 public:
   //---------- Constructors / Destructor
-  CocoaSolidShapeBox( ALIstring type, ALIfloat xdim, ALIfloat ydim, ALIfloat zdim );
-  ~CocoaSolidShapeBox() override{ };
+  CocoaSolidShapeBox(ALIstring type, ALIfloat xdim, ALIfloat ydim, ALIfloat zdim);
+  ~CocoaSolidShapeBox() override{};
 
-  ALIfloat getXHalfLength() const {
-    return theXHalfLength; }
-  ALIfloat getYHalfLength() const {
-    return theYHalfLength; }
-  ALIfloat getZHalfLength() const {
-    return theZHalfLength; }
+  ALIfloat getXHalfLength() const { return theXHalfLength; }
+  ALIfloat getYHalfLength() const { return theYHalfLength; }
+  ALIfloat getZHalfLength() const { return theZHalfLength; }
 
 private:
-
   ALIfloat theXHalfLength;
   ALIfloat theYHalfLength;
   ALIfloat theZHalfLength;
 };
 
 #endif
-
diff --git a/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h b/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h
index 7fdb1686c4a2d..a58750af2345e 100644
--- a/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h
+++ b/Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h
@@ -1,7 +1,7 @@
 //   COCOA class header file
-//Id:  CocoaSolidShapeTubs.h
+// Id:  CocoaSolidShapeTubs.h
 //
-//   History: v1.0 
+//   History: v1.0
 //   Pedro Arce
 
 #ifndef _CocoaSolidShapeTubs_HH
@@ -11,33 +11,28 @@
 #include "Alignment/CocoaUtilities/interface/CocoaGlobals.h"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 
-class CocoaSolidShapeTubs : public CocoaSolidShape
-{
-
+class CocoaSolidShapeTubs : public CocoaSolidShape {
 public:
   //---------- Constructors / Destructor
-  CocoaSolidShapeTubs( const ALIstring pType, ALIfloat pRMin, ALIfloat pRMax, ALIfloat pDz, ALIfloat pSPhi = 0.*deg, ALIfloat pDPhi = 360.*deg );
-  ~CocoaSolidShapeTubs() override{ };
-  ALIfloat getInnerRadius() const {
-    return theInnerRadius; }
-  ALIfloat getOuterRadius() const {
-    return theOuterRadius ; }
-  ALIfloat getZHalfLength() const {
-    return theZHalfLength ; }
-  ALIfloat getStartPhiAngle() const {
-    return theStartPhiAngle ; }
-  ALIfloat getDeltaPhiAngle() const {
-    return theDeltaPhiAngle ; }
+  CocoaSolidShapeTubs(const ALIstring pType,
+                      ALIfloat pRMin,
+                      ALIfloat pRMax,
+                      ALIfloat pDz,
+                      ALIfloat pSPhi = 0. * deg,
+                      ALIfloat pDPhi = 360. * deg);
+  ~CocoaSolidShapeTubs() override{};
+  ALIfloat getInnerRadius() const { return theInnerRadius; }
+  ALIfloat getOuterRadius() const { return theOuterRadius; }
+  ALIfloat getZHalfLength() const { return theZHalfLength; }
+  ALIfloat getStartPhiAngle() const { return theStartPhiAngle; }
+  ALIfloat getDeltaPhiAngle() const { return theDeltaPhiAngle; }
 
 private:
-
   ALIfloat theInnerRadius;
   ALIfloat theOuterRadius;
   ALIfloat theZHalfLength;
   ALIfloat theStartPhiAngle;
   ALIfloat theDeltaPhiAngle;
-
 };
 
 #endif
-
diff --git a/Alignment/CocoaDDLObjects/src/CocoaMaterialElementary.cc b/Alignment/CocoaDDLObjects/src/CocoaMaterialElementary.cc
index 0da0aa10be743..b843f34cf9932 100644
--- a/Alignment/CocoaDDLObjects/src/CocoaMaterialElementary.cc
+++ b/Alignment/CocoaDDLObjects/src/CocoaMaterialElementary.cc
@@ -1,34 +1,23 @@
 //   COCOA class implementation file
-//Id:  CocoaMaterialElementary.cc
-//CAT: Model
+// Id:  CocoaMaterialElementary.cc
+// CAT: Model
 //
 //   History: v1.0
 //   Pedro Arce
-#include <map>
+#include <cmath>  // include floating-point std::abs functions
 #include <fstream>
-#include <cmath>		// include floating-point std::abs functions
+#include <map>
 
 #include "Alignment/CocoaDDLObjects/interface/CocoaMaterialElementary.h"
 
+CocoaMaterialElementary::CocoaMaterialElementary(ALIstring name, float density, ALIstring symbol, float A, ALIint Z)
+    : theName(name), theDensity(density), theSymbol(symbol), theA(A), theZ(Z) {}
 
-CocoaMaterialElementary::CocoaMaterialElementary( ALIstring name, float density, ALIstring symbol, float A, ALIint Z ) :
-  theName(name),
-  theDensity(density),
-  theSymbol(symbol),
-  theA(A),
-  theZ(Z)
-{
-}
-
-
-ALIbool CocoaMaterialElementary::operator==(const CocoaMaterialElementary& mate ) const
-{
+ALIbool CocoaMaterialElementary::operator==(const CocoaMaterialElementary &mate) const {
   // GM: Using numeric_limits<float>::epsilon() might be better instead of a
   //     magic number 'kTolerance'. Not changing this to not break code
   //     potentially relying on this number.
   const float kTolerance = 1.E-9;
-  return ( std::abs(mate.getDensity() - theDensity) < kTolerance
-	   && mate.getSymbol() == theSymbol
-	   && std::abs(mate.getA() - theA) < kTolerance
-	   && mate.getZ() == theZ );
+  return (std::abs(mate.getDensity() - theDensity) < kTolerance && mate.getSymbol() == theSymbol &&
+          std::abs(mate.getA() - theA) < kTolerance && mate.getZ() == theZ);
 }
diff --git a/Alignment/CocoaDDLObjects/src/CocoaSolidShape.cc b/Alignment/CocoaDDLObjects/src/CocoaSolidShape.cc
index 69699a12aca4a..60d0bdba7b5bb 100644
--- a/Alignment/CocoaDDLObjects/src/CocoaSolidShape.cc
+++ b/Alignment/CocoaDDLObjects/src/CocoaSolidShape.cc
@@ -1,17 +1,12 @@
 //   COCOA class implementation file
-//Id:  CocoaSolidShape.cc
-//CAT: Model
+// Id:  CocoaSolidShape.cc
+// CAT: Model
 //
-//   History: v1.0 
+//   History: v1.0
 //   Pedro Arce
-#include <map>
 #include <fstream>
+#include <map>
 
 #include "Alignment/CocoaDDLObjects/interface/CocoaSolidShape.h"
 
-
-CocoaSolidShape::CocoaSolidShape( ALIstring type )
-{ 
-
-  theType = type;
-}
+CocoaSolidShape::CocoaSolidShape(ALIstring type) { theType = type; }
diff --git a/Alignment/CocoaDDLObjects/src/CocoaSolidShapeBox.cc b/Alignment/CocoaDDLObjects/src/CocoaSolidShapeBox.cc
index 6d3c5ed402eb3..c48c992d44d44 100644
--- a/Alignment/CocoaDDLObjects/src/CocoaSolidShapeBox.cc
+++ b/Alignment/CocoaDDLObjects/src/CocoaSolidShapeBox.cc
@@ -1,20 +1,17 @@
 //   COCOA class implementation file
-//Id:  CocoaSolidShapeBox.cc
-//CAT: Model
+// Id:  CocoaSolidShapeBox.cc
+// CAT: Model
 //
-//   History: v1.0 
+//   History: v1.0
 //   Pedro Arce
-#include <map>
 #include <fstream>
+#include <map>
 
 #include "Alignment/CocoaDDLObjects/interface/CocoaSolidShapeBox.h"
 
-
-CocoaSolidShapeBox::CocoaSolidShapeBox( ALIstring type, ALIfloat xdim, ALIfloat ydim, ALIfloat zdim ): CocoaSolidShape( type )
-{ 
-
+CocoaSolidShapeBox::CocoaSolidShapeBox(ALIstring type, ALIfloat xdim, ALIfloat ydim, ALIfloat zdim)
+    : CocoaSolidShape(type) {
   theXHalfLength = xdim;
   theYHalfLength = ydim;
   theZHalfLength = zdim;
 }
-
diff --git a/Alignment/CocoaDDLObjects/src/CocoaSolidShapeTubs.cc b/Alignment/CocoaDDLObjects/src/CocoaSolidShapeTubs.cc
index 5f4c8854bb78d..c2e282268c211 100644
--- a/Alignment/CocoaDDLObjects/src/CocoaSolidShapeTubs.cc
+++ b/Alignment/CocoaDDLObjects/src/CocoaSolidShapeTubs.cc
@@ -1,21 +1,20 @@
 //   COCOA class implementation file
-//Id:  CocoaSolidShapeTubs.cc
-//CAT: Model
+// Id:  CocoaSolidShapeTubs.cc
+// CAT: Model
 //
-//   History: v1.0 
+//   History: v1.0
 //   Pedro Arce
-#include <map>
 #include <fstream>
+#include <map>
 
 #include "Alignment/CocoaDDLObjects/interface/CocoaSolidShapeTubs.h"
 
-CocoaSolidShapeTubs::CocoaSolidShapeTubs( const ALIstring type, ALIfloat pRMin, ALIfloat pRMax, ALIfloat pDz, ALIfloat pSPhi, ALIfloat pDPhi ) : CocoaSolidShape( type )
-{ 
-
+CocoaSolidShapeTubs::CocoaSolidShapeTubs(
+    const ALIstring type, ALIfloat pRMin, ALIfloat pRMax, ALIfloat pDz, ALIfloat pSPhi, ALIfloat pDPhi)
+    : CocoaSolidShape(type) {
   theInnerRadius = pRMin;
   theOuterRadius = pRMax;
   theZHalfLength = pDz;
   theStartPhiAngle = pSPhi;
   theDeltaPhiAngle = pDPhi;
 }
-
diff --git a/Alignment/CocoaModel/src/ALILine.cc b/Alignment/CocoaModel/src/ALILine.cc
index af250367facf4..f7cc96e3457df 100644
--- a/Alignment/CocoaModel/src/ALILine.cc
+++ b/Alignment/CocoaModel/src/ALILine.cc
@@ -65,20 +65,20 @@ CLHEP::Hep3Vector ALILine::intersect( const ALILine& l2, bool notParallel )
   } else {
 
 
- //	****************************************************************	//
- //	****************************************************************	//
- //	****************************************************************	//
- //  			     Determination of Fact				//
- //										//
- //	Problem :  3D quantity was determined by doing calculation with		//
- //		   the 2D projections of the std::vectors.  It is possible 		//
- //	   	   for projection in a particular plane to be 0 		//
- //										//
- //	Solution : Test for problem and redo calculation if necessary by	//
- //		   projecting into a different plane				//
- //	****************************************************************	//
- //	****************************************************************	//
- //	****************************************************************	//
+ //	****************************************************************        //
+ //	****************************************************************        //
+ //	****************************************************************        //
+ //  			     Determination of Fact			        //
+ //									        //
+ //	Problem :  3D quantity was determined by doing calculation with	        //
+ //		   the 2D projections of the std::vectors.  It is possible      //
+ //	   	   for projection in a particular plane to be 0                 //
+ //                                                                             //
+ //	Solution : Test for problem and redo calculation if necessary by        //
+ //		   projecting into a different plane                            //
+ //	****************************************************************        //
+ //	****************************************************************        //
+ //	****************************************************************        //
 
 
 
diff --git a/Alignment/CocoaModel/src/EntryAngleAffAngles.cc b/Alignment/CocoaModel/src/EntryAngleAffAngles.cc
index 6620451028e05..4b9908ada96fa 100644
--- a/Alignment/CocoaModel/src/EntryAngleAffAngles.cc
+++ b/Alignment/CocoaModel/src/EntryAngleAffAngles.cc
@@ -119,8 +119,8 @@ ALIdouble EntryAngleAffAngles::valueDisplaced() const
 
   /*
   CLHEP::HepRotation rmLocalOrig = OptOCurrent()->parent()->rmGlobOriginal().inverse() *  OptOCurrent()->rmGlobOriginal();
-  
-  CLHEP::HepRotation rmLocal = OptOCurrent()->parent()->rmGlob().inverse() *  OptOCurrent()->rmGlob();
+
+  CLHEP::HepRotation rmLocal = OptOCurrent()->parent()->rmGlob().inverse() * OptOCurrent()->rmGlob();
   std::vector<double> localrot = OptOCurrent()->getRotationAnglesFromMatrix(  rmLocal, OptOCurrent()->CoordinateEntryList() );
 
   std::cout << " localrot " << localrot[0] << " " << localrot[1] << " " << localrot[2] << std::endl;
@@ -139,7 +139,7 @@ ALIdouble EntryAngleAffAngles::valueDisplaced() const
     Yaxis = OptOCurrent()->parent()->rmGlob() * Yaxis;
     CLHEP::Hep3Vector YaxisOrig(0.,1.,0.);
     YaxisOrig = OptOCurrent()->parent()->rmGlobOriginal() * YaxisOrig;
-    
+
     diff = fabs( checkDiff( Yaxis, YaxisOrig, localrot, localrotorig ) );
   }
 
diff --git a/Alignment/CocoaModel/src/OptOTiltmeter.cc b/Alignment/CocoaModel/src/OptOTiltmeter.cc
index 0e9a25b84d101..cdb40d5b7a46b 100644
--- a/Alignment/CocoaModel/src/OptOTiltmeter.cc
+++ b/Alignment/CocoaModel/src/OptOTiltmeter.cc
@@ -74,7 +74,7 @@ void OptOTiltmeter::makeMeasurement( LightRay& lightray, Measurement& meas )
   CLHEP::Hep3Vector ZAxism(0.,0.,1.);
   CLHEP::Hep3Vector ZAxism_ori = ZAxism;
   ZAxism_ori *= rmtori;
-      
+
   //---------- Measure rotation with respect to original position, around the X axis defined by the original position, in the original YZ plane
   CLHEP::Hep3Vector ZAxism_rot = ZAxism;
   CLHEP::HepRotation rmt = rmGlob();
@@ -94,7 +94,7 @@ void OptOTiltmeter::makeMeasurement( LightRay& lightray, Measurement& meas )
   ALIdouble measValue =  acos( ZAxism.dot(ZAxism_proj)/ZAxism_proj.mag() );
   if( ZAxism_proj.x() < 0) measValue *= -1.;
   meas.setValueSimulated(0 , measValue );
-  
+
   if (ALIUtils::debug >= 3) {
     std::cout << " OptOTiltmeter: Original Z axis " << ZAxism_ori << std::endl;
     ALIUtils::dumprm(rmt," tiltmeter original rotation matrix");
diff --git a/Alignment/CocoaToDDL/src/CocoaToDDLMgr.cc b/Alignment/CocoaToDDL/src/CocoaToDDLMgr.cc
index 15fbcbc5a7537..3eb909c434dea 100644
--- a/Alignment/CocoaToDDL/src/CocoaToDDLMgr.cc
+++ b/Alignment/CocoaToDDL/src/CocoaToDDLMgr.cc
@@ -333,7 +333,7 @@ std::string solidType = so->getType();
       file_ << " <Polycone name=\"" << name<< "\"";
       bool isOpen = pc->IsOpen();
       G4int numRZCorner = (dynamic_cast < G4Polycone * > (so))->getNumRZCorner();
-      
+
       file_ << " startPhi=\"" << UC(pc->getStartPhi(),"Angle") << "\""
 	    //<< " deltaPhi=\"" << UC(fabs((pc->getEndPhi()/deg - pc->getStartPhi()/deg))*deg,"Angle")   << "\"" 
 	    //<< " deltaPhi=\"" << UC(pc->getEndPhi(),"Angle")   << "\"" 
@@ -342,7 +342,7 @@ std::string solidType = so->getType();
 	    << " >" << std::endl;
 
       G4PolyconeSideRZ rz;
-      
+
       //liendl: FIXME put a switch which decides whether RZ or Rmin,Rmax,Z types should
       //              by generated ....
       //outPolyZSections(rz, (dynamic_cast < G4Polycone * > (so)), numRZCorner);
@@ -362,7 +362,7 @@ std::string solidType = so->getType();
       //      bool isOpen = (dynamic_cast < G4Polyhedra * > (so))->IsOpen();
       G4Polyhedra * ph = (dynamic_cast < G4Polyhedra * > (so));
       G4int numRZCorner = ph->getNumRZCorner();
- 
+
       file_ << " <Polyhedra name=\"" << name<< "\""
             << " numSide=\"" << ph->getNumSide() << "\""
             << " startPhi=\"" << UC(ph->getStartPhi(),"Angle") << "\""
diff --git a/Alignment/CocoaUtilities/interface/ALIUtils.h b/Alignment/CocoaUtilities/interface/ALIUtils.h
index 991ba668bf00d..3f9c561602315 100644
--- a/Alignment/CocoaUtilities/interface/ALIUtils.h
+++ b/Alignment/CocoaUtilities/interface/ALIUtils.h
@@ -138,12 +138,10 @@ class ALIUtils
 template<class T>
 ALIuint FindItemInVector( const T* item, const std::vector<T*>& item_vector )
 {
- 
   std::vector<T*>::const_iterator vtcite;
   ALIuint vfound = 1;
   for( vtcite = item_vector.begin(); vtcite != item_vector.end(); vtcite++) {
     if( (*vtcite) == item ) {
-      
     }
   }
 
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignableData.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignableData.h
index 6ec036d0de5f3..be6bd6fd1dc67 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignableData.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignableData.h
@@ -10,29 +10,26 @@
 ///            also surface deformation parameters are foreseen;
 ///  can be used for both absolute and relative positions/rotations
 
-template<class T> class AlignableData 
-{
-
+template <class T>
+class AlignableData {
 public:
-
   /// constructor
   /// deformationParameters can be given if detUnit
   AlignableData(const T& pos,
-		const align::RotationType& rot, 
-		align::ID id, align::StructureType objid,
-		const std::vector<double> &deformationParameters = std::vector<double>()) :
-    thePos(pos), theRot(rot), theObjId(objid), theId(id),
-    theDeformationParameters(deformationParameters) {}
+                const align::RotationType& rot,
+                align::ID id,
+                align::StructureType objid,
+                const std::vector<double>& deformationParameters = std::vector<double>())
+      : thePos(pos), theRot(rot), theObjId(objid), theId(id), theDeformationParameters(deformationParameters) {}
 
   /// accessors
   const T& pos() const { return thePos; }
   const align::RotationType& rot() const { return theRot; }
   align::StructureType objId() const { return theObjId; }
   align::ID id() const { return theId; }
-  const std::vector<double> deformationParameters() const { return theDeformationParameters;}
+  const std::vector<double> deformationParameters() const { return theDeformationParameters; }
 
 private:
-
   // data members
 
   T thePos;
@@ -40,16 +37,14 @@ template<class T> class AlignableData
   align::StructureType theObjId;
   align::ID theId;
   std::vector<double> theDeformationParameters;
-
 };
 
-/// Absolute position/rotation 
-typedef AlignableData<align::GlobalPoint>  AlignableAbsData;
-/// relative position/rotation 
+/// Absolute position/rotation
+typedef AlignableData<align::GlobalPoint> AlignableAbsData;
+/// relative position/rotation
 typedef AlignableData<align::GlobalVector> AlignableRelData;
 
 typedef std::vector<AlignableAbsData> AlignablePositions;
 typedef std::vector<AlignableRelData> AlignableShifts;
 
 #endif
-
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIO.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIO.h
index 60d79c3b246cf..c7a243bb856a5 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIO.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIO.h
@@ -7,80 +7,74 @@
 class Alignable;
 
 /// Abstract base class for IO of alignable positions/shifts.
-/// Derived concrete class must implement raw read/write methods 
-
-class AlignableDataIO
-{
-
-  protected:
+/// Derived concrete class must implement raw read/write methods
 
+class AlignableDataIO {
+protected:
   enum PosType { Abs, Org, Rel };
 
-  /// Constructor 
-  AlignableDataIO(PosType p) : thePosType(p) {}; 
+  /// Constructor
+  AlignableDataIO(PosType p) : thePosType(p){};
 
-  /// Destructor 
+  /// Destructor
   virtual ~AlignableDataIO(){};
 
   /// Open IO handle
-  virtual int open( const char* filename, int iteration, bool writemode ) = 0;
+  virtual int open(const char* filename, int iteration, bool writemode) = 0;
 
   /// Close IO handle
   virtual int close(void) = 0;
 
-  /// Write absolute positions of one Alignable 
+  /// Write absolute positions of one Alignable
   int writeAbsPos(Alignable* ali, bool validCheck);
 
-  /// Write absolute positions of many Alignables 
+  /// Write absolute positions of many Alignables
   int writeAbsPos(const align::Alignables& alivec, bool validCheck);
 
-  /// Read absolute positions of one Alignable 
+  /// Read absolute positions of one Alignable
   AlignableAbsData readAbsPos(Alignable* ali, int& ierr);
 
-  /// Read absolute positions of many Alignables 
+  /// Read absolute positions of many Alignables
   AlignablePositions readAbsPos(const align::Alignables& alivec, int& ierr);
 
-
-  /// Write original positions of one Alignable 
+  /// Write original positions of one Alignable
   int writeOrgPos(Alignable* ali, bool validCheck);
 
-  /// Write original positions of many Alignables 
+  /// Write original positions of many Alignables
   int writeOrgPos(const align::Alignables& alivec, bool validCheck);
 
-  /// Read original positions of one Alignable 
+  /// Read original positions of one Alignable
   AlignableAbsData readOrgPos(Alignable* ali, int& ierr);
 
-  /// Read original positions of many Alignables 
+  /// Read original positions of many Alignables
   AlignablePositions readOrgPos(const align::Alignables& alivec, int& ierr);
 
-
-  /// Write relative positions of one Alignable 
+  /// Write relative positions of one Alignable
   int writeRelPos(Alignable* ali, bool validCheck);
 
-  /// Write relative positions of many Alignables 
+  /// Write relative positions of many Alignables
   int writeRelPos(const align::Alignables& alivec, bool validCheck);
 
-  /// Read relative positions of one Alignable 
+  /// Read relative positions of one Alignable
   AlignableRelData readRelPos(Alignable* ali, int& ierr);
 
-  /// Read relative positions of many Alignables 
+  /// Read relative positions of many Alignables
   AlignableShifts readRelPos(const align::Alignables& alivec, int& ierr);
 
   // 'raw' read/write methods
   // must be provided by concrete derived class
 
-  /// Write absolute positions 
-  virtual int writeAbsRaw(const AlignableAbsData &ad) =0;
-  /// Read absolute positions 
-  virtual AlignableAbsData readAbsRaw(Alignable* ali,int& ierr) =0;
-  /// Write relative positions 
-  virtual int writeRelRaw(const AlignableRelData &ad) =0;
-  /// Read relative positions 
-  virtual AlignableRelData readRelRaw(Alignable* ali,int& ierr) =0;
+  /// Write absolute positions
+  virtual int writeAbsRaw(const AlignableAbsData& ad) = 0;
+  /// Read absolute positions
+  virtual AlignableAbsData readAbsRaw(Alignable* ali, int& ierr) = 0;
+  /// Write relative positions
+  virtual int writeRelRaw(const AlignableRelData& ad) = 0;
+  /// Read relative positions
+  virtual AlignableRelData readRelRaw(Alignable* ali, int& ierr) = 0;
 
   // Data members
-  PosType thePosType; // Defines whether absolute/orig/relative pos. are used
-
+  PosType thePosType;  // Defines whether absolute/orig/relative pos. are used
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIORoot.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIORoot.h
index 347ab94bdd0ef..d128aba0bcfc3 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIORoot.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIORoot.h
@@ -9,32 +9,32 @@
 
 class Alignable;
 
-/// concrete class for ROOT based IO of Alignable positions 
-
-class AlignableDataIORoot : public AlignmentIORootBase, public AlignableDataIO
-{
+/// concrete class for ROOT based IO of Alignable positions
 
+class AlignableDataIORoot : public AlignmentIORootBase, public AlignableDataIO {
   friend class AlignmentIORoot;
 
-  private:
-  /// constructor 
-  AlignableDataIORoot(PosType p); 
+private:
+  /// constructor
+  AlignableDataIORoot(PosType p);
 
-  /// open IO 
-  int open(const char* filename, int iteration, bool writemode) override
-  { newopen=true; return openRoot(filename,iteration,writemode); }
+  /// open IO
+  int open(const char* filename, int iteration, bool writemode) override {
+    newopen = true;
+    return openRoot(filename, iteration, writemode);
+  }
 
-  /// close IO 
-  int close(void) override{ return closeRoot(); }
+  /// close IO
+  int close(void) override { return closeRoot(); }
 
-  /// write absolute positions 
-  int writeAbsRaw(const AlignableAbsData &ad) override;
-  /// read absolute positions 
-  AlignableAbsData readAbsRaw(Alignable* ali,int& ierr) override;
-  /// write relative positions 
-  int writeRelRaw(const AlignableRelData &ad) override;
-  /// read relative positions 
-  AlignableRelData readRelRaw(Alignable* ali,int& ierr) override;
+  /// write absolute positions
+  int writeAbsRaw(const AlignableAbsData& ad) override;
+  /// read absolute positions
+  AlignableAbsData readAbsRaw(Alignable* ali, int& ierr) override;
+  /// write relative positions
+  int writeRelRaw(const AlignableRelData& ad) override;
+  /// read relative positions
+  AlignableRelData readRelRaw(Alignable* ali, int& ierr) override;
 
   int findEntry(align::ID, align::StructureType);
   void createBranches(void) override;
@@ -42,22 +42,19 @@ class AlignableDataIORoot : public AlignmentIORootBase, public AlignableDataIO
 
   // data members
 
-  /// root tree contents 
+  /// root tree contents
   align::StructureType ObjId;
   //unsigned int Id;
   align::ID Id;
   Double_t Pos[3];
   Double_t Rot[9];
   UInt_t numDeformationValues_;
-  enum {kMaxNumPar = 20}; // slighly above 'two bowed surfaces' limit
+  enum { kMaxNumPar = 20 };  // slighly above 'two bowed surfaces' limit
   Float_t deformationValues_[kMaxNumPar];
 
   bool newopen;
-  typedef std::map< std::pair<align::ID, align::StructureType>, int > treemaptype;
+  typedef std::map<std::pair<align::ID, align::StructureType>, int> treemaptype;
   treemaptype treemap;
-
 };
 
-
-
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h
index bc8e1ace77ef3..51d482e1eb969 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h
@@ -16,8 +16,6 @@
  *            algorithm has to be derived from this class
  */
 
-
-
 #include <vector>
 #include <utility>
 
@@ -39,90 +37,94 @@ class Trajectory;
 #include "DataFormats/Alignment/interface/AliClusterValueMapFwd.h"
 #include "FWCore/Framework/interface/Event.h"
 
-namespace edm { class EventSetup; class ParameterSet; }
-namespace reco { class Track; class BeamSpot; }
+namespace edm {
+  class EventSetup;
+  class ParameterSet;
+}  // namespace edm
+namespace reco {
+  class Track;
+  class BeamSpot;
+}  // namespace reco
 
 /*** Global typedefs part I (see EOF for part II) ***/
-typedef std::pair<const Trajectory*, const reco::Track*> ConstTrajTrackPair;
-typedef std::vector< ConstTrajTrackPair >                ConstTrajTrackPairs;
-
-typedef std::vector<IntegratedCalibrationBase*> Calibrations;
-
-
+typedef std::pair<const Trajectory *, const reco::Track *> ConstTrajTrackPair;
+typedef std::vector<ConstTrajTrackPair> ConstTrajTrackPairs;
 
-class AlignmentAlgorithmBase
-{
+typedef std::vector<IntegratedCalibrationBase *> Calibrations;
 
+class AlignmentAlgorithmBase {
 public:
   // TODO: DEPRECATED: For not breaking the interface, used in serveral files.
   //                   If possible use the global typedefs above.
   // With global typedefs one does not have to typedef again like
   // 'typedef AlignmentAlgorithmBase::ConstTrajTrackPair ConstTrajTrackPair;'
   // in other files.
-  typedef std::pair<const Trajectory*, const reco::Track*> ConstTrajTrackPair; 
-  typedef std::vector< ConstTrajTrackPair >  ConstTrajTrackPairCollection;
+  typedef std::pair<const Trajectory *, const reco::Track *> ConstTrajTrackPair;
+  typedef std::vector<ConstTrajTrackPair> ConstTrajTrackPairCollection;
   using RunNumber = align::RunNumber;
   using RunRange = align::RunRange;
 
   /// define event information passed to algorithms
   class EventInfo {
   public:
-    EventInfo(const edm::EventID &theEventId, 
-	      const ConstTrajTrackPairCollection &theTrajTrackPairs,
-	      const reco::BeamSpot &theBeamSpot,
-	      const AliClusterValueMap *theClusterValueMap) 
-      : eventId_(theEventId), trajTrackPairs_(theTrajTrackPairs), beamSpot_(theBeamSpot), clusterValueMap_(theClusterValueMap) {}
+    EventInfo(const edm::EventID &theEventId,
+              const ConstTrajTrackPairCollection &theTrajTrackPairs,
+              const reco::BeamSpot &theBeamSpot,
+              const AliClusterValueMap *theClusterValueMap)
+        : eventId_(theEventId),
+          trajTrackPairs_(theTrajTrackPairs),
+          beamSpot_(theBeamSpot),
+          clusterValueMap_(theClusterValueMap) {}
 
     const edm::EventID eventId() const { return eventId_; }
-    const ConstTrajTrackPairCollection& trajTrackPairs() const { return trajTrackPairs_; }
-    const reco::BeamSpot& beamSpot() const { return beamSpot_; }
-    const AliClusterValueMap* clusterValueMap() const { return clusterValueMap_; }///might be null!
-    
+    const ConstTrajTrackPairCollection &trajTrackPairs() const { return trajTrackPairs_; }
+    const reco::BeamSpot &beamSpot() const { return beamSpot_; }
+    const AliClusterValueMap *clusterValueMap() const { return clusterValueMap_; }  ///might be null!
 
   private:
-    const edm::EventID                 eventId_;
+    const edm::EventID eventId_;
     const ConstTrajTrackPairCollection &trajTrackPairs_;
-    const reco::BeamSpot               &beamSpot_;
-    const AliClusterValueMap           *clusterValueMap_;///might be null!
+    const reco::BeamSpot &beamSpot_;
+    const AliClusterValueMap *clusterValueMap_;  ///might be null!
   };
-  
+
   /// define run information passed to algorithms (in endRun)
   class EndRunInfo {
   public:
-    EndRunInfo(const edm::RunID &theRunId, const TkFittedLasBeamCollection *theTkLasBeams,
-	       const TsosVectorCollection *theTkLasBeamTsoses)
-      : runId_(theRunId), tkLasBeams_(theTkLasBeams), tkLasBeamTsoses_(theTkLasBeamTsoses) {}
+    EndRunInfo(const edm::RunID &theRunId,
+               const TkFittedLasBeamCollection *theTkLasBeams,
+               const TsosVectorCollection *theTkLasBeamTsoses)
+        : runId_(theRunId), tkLasBeams_(theTkLasBeams), tkLasBeamTsoses_(theTkLasBeamTsoses) {}
 
     const edm::RunID runId() const { return runId_; }
-    const TkFittedLasBeamCollection* tkLasBeams() const { return tkLasBeams_; } /// might be null!
-    const TsosVectorCollection* tkLasBeamTsoses() const { return tkLasBeamTsoses_; } /// might be null!
-
+    const TkFittedLasBeamCollection *tkLasBeams() const { return tkLasBeams_; }       /// might be null!
+    const TsosVectorCollection *tkLasBeamTsoses() const { return tkLasBeamTsoses_; }  /// might be null!
 
   private:
     const edm::RunID runId_;
-    const TkFittedLasBeamCollection *tkLasBeams_; /// might be null!
-    const TsosVectorCollection *tkLasBeamTsoses_; /// might be null!
+    const TkFittedLasBeamCollection *tkLasBeams_;  /// might be null!
+    const TsosVectorCollection *tkLasBeamTsoses_;  /// might be null!
   };
-  
+
   /// Constructor
-  AlignmentAlgorithmBase(const edm::ParameterSet&) {};
-  
+  AlignmentAlgorithmBase(const edm::ParameterSet &){};
+
   /// Destructor
-  virtual ~AlignmentAlgorithmBase() {};
+  virtual ~AlignmentAlgorithmBase(){};
 
   /// Call at beginning of job (must be implemented in derived class)
-  virtual void initialize( const edm::EventSetup& setup, 
-                           AlignableTracker* tracker,
-                           AlignableMuon* muon,
-                           AlignableExtras* extras,
-                           AlignmentParameterStore* store ) = 0;
+  virtual void initialize(const edm::EventSetup &setup,
+                          AlignableTracker *tracker,
+                          AlignableMuon *muon,
+                          AlignableExtras *extras,
+                          AlignmentParameterStore *store) = 0;
 
   /// Returns whether calibrations is supported by algorithm,
   /// default implementation returns false.
   virtual bool supportsCalibrations() { return false; }
   /// Pass integrated calibrations to algorithm, to be called after initialize()
   /// Calibrations' ownership is NOT passed to algorithm
-  virtual bool addCalibrations(const Calibrations&) { return false; }
+  virtual bool addCalibrations(const Calibrations &) { return false; }
 
   /// Returns whether algorithm proccesses events in current configuration
   virtual bool processesEvents() { return true; }
@@ -137,32 +139,32 @@ class AlignmentAlgorithmBase
   virtual void startNewLoop() {}
 
   /// Call at end of each loop (must be implemented in derived class)
-  virtual void terminate(const edm::EventSetup& iSetup) = 0;
+  virtual void terminate(const edm::EventSetup &iSetup) = 0;
   /// Called at end of job (must be implemented in derived class)
   virtual void terminate() {}
 
   /// Run the algorithm (must be implemented in derived class)
-  virtual void run( const edm::EventSetup &setup, const EventInfo &eventInfo) = 0;
+  virtual void run(const edm::EventSetup &setup, const EventInfo &eventInfo) = 0;
 
   /// called at begin of run
-  virtual void beginRun(const edm::Run&, const edm::EventSetup&, bool changed) {};
+  virtual void beginRun(const edm::Run &, const edm::EventSetup &, bool changed){};
 
   /// called at end of run - order of arguments like in EDProducer etc.
-  virtual void endRun(const EndRunInfo &runInfo, const edm::EventSetup &setup) {};
+  virtual void endRun(const EndRunInfo &runInfo, const edm::EventSetup &setup){};
 
   /// called at begin of luminosity block (no lumi block info passed yet)
-  virtual void beginLuminosityBlock(const edm::EventSetup &setup) {};
+  virtual void beginLuminosityBlock(const edm::EventSetup &setup){};
 
   /// called at end of luminosity block (no lumi block info passed yet)
-  virtual void endLuminosityBlock(const edm::EventSetup &setup) {};
+  virtual void endLuminosityBlock(const edm::EventSetup &setup){};
 
   /// called in order to pass parameters to alignables for a specific run
   /// range in case the algorithm supports run range dependent alignment.
-  virtual bool setParametersForRunRange(const RunRange& rr) { return false; };
+  virtual bool setParametersForRunRange(const RunRange &rr) { return false; };
 };
 
 /*** Global typedefs part II ***/
-typedef AlignmentAlgorithmBase::EventInfo  EventInfo;
+typedef AlignmentAlgorithmBase::EventInfo EventInfo;
 typedef AlignmentAlgorithmBase::EndRunInfo EndRunInfo;
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmPluginFactory.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmPluginFactory.h
index de93b72901465..c49c2f06a67ef 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmPluginFactory.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmPluginFactory.h
@@ -10,6 +10,6 @@
 #include "FWCore/PluginManager/interface/PluginFactory.h"
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h"
 
-typedef edmplugin::PluginFactory<AlignmentAlgorithmBase* (const edm::ParameterSet&)> AlignmentAlgorithmPluginFactory;
+typedef edmplugin::PluginFactory<AlignmentAlgorithmBase*(const edm::ParameterSet&)> AlignmentAlgorithmPluginFactory;
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentCorrelationsIO.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentCorrelationsIO.h
index 09ea12db136cf..82467dc16a0ff 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentCorrelationsIO.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentCorrelationsIO.h
@@ -3,28 +3,24 @@
 
 #include "Alignment/CommonAlignment/interface/Utilities.h"
 
-/// Abstract base class for IO of Correlations 
+/// Abstract base class for IO of Correlations
 
-class AlignmentCorrelationsIO 
-{
+class AlignmentCorrelationsIO {
+protected:
+  /// destructor
+  virtual ~AlignmentCorrelationsIO() {}
 
-  protected:
-
-  /// destructor 
-  virtual ~AlignmentCorrelationsIO(){}
-
-  /// open IO 
+  /// open IO
   virtual int open(const char* filename, int iteration, bool writemode) = 0;
 
-  /// close IO 
+  /// close IO
   virtual int close(void) = 0;
 
-  /// write correlations 
+  /// write correlations
   virtual int write(const align::Correlations& cor, bool validCheck) = 0;
 
-  /// read correlations 
+  /// read correlations
   virtual align::Correlations read(const align::Alignables& alivec, int& ierr) = 0;
-
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentCorrelationsIORoot.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentCorrelationsIORoot.h
index 58376cb0aa466..889885a70e659 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentCorrelationsIORoot.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentCorrelationsIORoot.h
@@ -5,29 +5,27 @@
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentIORootBase.h"
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentCorrelationsIO.h"
 
-/// Concrete class for ROOT based IO of Correlations 
+/// Concrete class for ROOT based IO of Correlations
 
-class AlignmentCorrelationsIORoot : public AlignmentIORootBase, public AlignmentCorrelationsIO
-{
+class AlignmentCorrelationsIORoot : public AlignmentIORootBase, public AlignmentCorrelationsIO {
   friend class AlignmentIORoot;
 
-  private:
-
-  /// constructor 
+private:
+  /// constructor
   AlignmentCorrelationsIORoot();
 
-  /// open IO 
+  /// open IO
   int open(const char* filename, int iteration, bool writemode) override {
-    return openRoot(filename,iteration,writemode);
+    return openRoot(filename, iteration, writemode);
   };
 
-  /// close IO 
-  int close(void) override{ return closeRoot(); };
+  /// close IO
+  int close(void) override { return closeRoot(); };
 
-  /// write correlations 
+  /// write correlations
   int write(const align::Correlations& cor, bool validCheck) override;
 
-  /// read correlations 
+  /// read correlations
   align::Correlations read(const align::Alignables& alivec, int& ierr) override;
 
   void createBranches(void) override;
@@ -35,12 +33,11 @@ class AlignmentCorrelationsIORoot : public AlignmentIORootBase, public Alignment
 
   // data members
 
-  /// correlation tree 
-  align::ID Ali1Id,Ali2Id;
-  align::StructureType Ali1ObjId,Ali2ObjId;
+  /// correlation tree
+  align::ID Ali1Id, Ali2Id;
+  align::StructureType Ali1ObjId, Ali2ObjId;
   int corSize;
-  double CorMatrix[nParMax*nParMax];
-
+  double CorMatrix[nParMax * nParMax];
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentCorrelationsStore.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentCorrelationsStore.h
index 8f796f3ec4cc0..96bd5a2fafdb0 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentCorrelationsStore.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentCorrelationsStore.h
@@ -13,59 +13,57 @@
 
 class Alignable;
 
-class AlignmentCorrelationsStore
-{
-
+class AlignmentCorrelationsStore {
 public:
+  typedef std::map<Alignable*, AlgebraicMatrix> CorrelationsTable;
+  typedef std::map<Alignable*, CorrelationsTable*> Correlations;
 
-  typedef std::map< Alignable*, AlgebraicMatrix > CorrelationsTable;
-  typedef std::map< Alignable*, CorrelationsTable* > Correlations;
-
-  AlignmentCorrelationsStore( void );
+  AlignmentCorrelationsStore(void);
 
-  virtual ~AlignmentCorrelationsStore( void ) {}
+  virtual ~AlignmentCorrelationsStore(void) {}
 
   /// Write correlations directly to the covariance matrix starting at the
   /// given position. Indices are assumed to start from 0.
-  virtual void correlations( Alignable* ap1, Alignable* ap2,
-			     AlgebraicSymMatrix& cov, int row, int col ) const;
+  virtual void correlations(Alignable* ap1, Alignable* ap2, AlgebraicSymMatrix& cov, int row, int col) const;
 
   /// Get correlations directly from the given position of the covariance
   /// matrix and store them. Indices are assumed to start from 0.
-  virtual void setCorrelations( Alignable* ap1, Alignable* ap2,
-				const AlgebraicSymMatrix& cov, int row, int col );
+  virtual void setCorrelations(Alignable* ap1, Alignable* ap2, const AlgebraicSymMatrix& cov, int row, int col);
 
   /// Set correlations.
-  virtual void setCorrelations( Alignable* ap1, Alignable* ap2,	AlgebraicMatrix& mat );
+  virtual void setCorrelations(Alignable* ap1, Alignable* ap2, AlgebraicMatrix& mat);
 
   /// Check whether correlations are stored for a given pair of alignables.
-  virtual bool correlationsAvailable( Alignable* ap1, Alignable* ap2 ) const;
+  virtual bool correlationsAvailable(Alignable* ap1, Alignable* ap2) const;
 
   /// Reset correlations.
-  virtual void resetCorrelations( void );
+  virtual void resetCorrelations(void);
 
   /// Get number of stored correlations.
-  virtual unsigned int size( void ) const;
+  virtual unsigned int size(void) const;
 
 private:
+  void fillCorrelationsTable(Alignable* ap1,
+                             Alignable* ap2,
+                             CorrelationsTable* table,
+                             const AlgebraicSymMatrix& cov,
+                             int row,
+                             int col,
+                             bool transpose);
 
-  void fillCorrelationsTable( Alignable* ap1, Alignable* ap2, CorrelationsTable* table,
-                              const AlgebraicSymMatrix& cov, int row, int col, bool transpose );
+  void fillCovariance(
+      Alignable* ap1, Alignable* ap2, const AlgebraicMatrix& entry, AlgebraicSymMatrix& cov, int row, int col) const;
 
-  void fillCovariance( Alignable* ap1, Alignable* ap2, const AlgebraicMatrix& entry,
-                       AlgebraicSymMatrix& cov, int row, int col ) const;
+  void fillCovarianceT(
+      Alignable* ap1, Alignable* ap2, const AlgebraicMatrix& entry, AlgebraicSymMatrix& cov, int row, int col) const;
 
-  void fillCovarianceT( Alignable* ap1, Alignable* ap2, const AlgebraicMatrix& entry,
-                        AlgebraicSymMatrix& cov, int row, int col ) const;
+  void readFromCovariance(
+      Alignable* ap1, Alignable* ap2, AlgebraicMatrix& entry, const AlgebraicSymMatrix& cov, int row, int col);
 
-  void readFromCovariance( Alignable* ap1, Alignable* ap2, AlgebraicMatrix& entry,
-                           const AlgebraicSymMatrix& cov, int row, int col );
-
-  void readFromCovarianceT( Alignable* ap1, Alignable* ap2, AlgebraicMatrix& entry,
-                            const AlgebraicSymMatrix& cov, int row, int col );
+  void readFromCovarianceT(
+      Alignable* ap1, Alignable* ap2, AlgebraicMatrix& entry, const AlgebraicSymMatrix& cov, int row, int col);
 
   Correlations theCorrelations;
-
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentExtendedCorrelationsEntry.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentExtendedCorrelationsEntry.h
index 2a6769092ab4a..d32c8939edbee 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentExtendedCorrelationsEntry.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentExtendedCorrelationsEntry.h
@@ -4,68 +4,63 @@
 #include <vector>
 #include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
 
-
 /// Data container for a correlations matrix (represented by a vector of floats), with
 /// basic access functions. NOTE: This class is designed specifically for the use within
 /// AlignmentExtendedCorrelationsStore, and is not intended to be used elsewhere.
 
-
-class AlignmentExtendedCorrelationsEntry
-{
-
+class AlignmentExtendedCorrelationsEntry {
 public:
-
   /// Default constructor.
-  AlignmentExtendedCorrelationsEntry( void );
+  AlignmentExtendedCorrelationsEntry(void);
 
   /// Constructor. Leaves the correlations matrix uninitialized.
-  explicit AlignmentExtendedCorrelationsEntry( short unsigned int nRows, short unsigned int nCols );
+  explicit AlignmentExtendedCorrelationsEntry(short unsigned int nRows, short unsigned int nCols);
 
   /// Constructor. Initializes all elements of the correlations matrix to the given value.
-  explicit AlignmentExtendedCorrelationsEntry( short unsigned int nRows, short unsigned int nCols, const float init );
+  explicit AlignmentExtendedCorrelationsEntry(short unsigned int nRows, short unsigned int nCols, const float init);
 
   /// Constructor from CLHEP matrix.
-  explicit AlignmentExtendedCorrelationsEntry( const AlgebraicMatrix& mat );
+  explicit AlignmentExtendedCorrelationsEntry(const AlgebraicMatrix& mat);
 
   /// Destructor.
-  ~AlignmentExtendedCorrelationsEntry( void ) {}
+  ~AlignmentExtendedCorrelationsEntry(void) {}
 
   /// Read or write an element of the correlations matrix. NOTE: Indexing starts from [0,0].
-  inline float& operator()( short unsigned int iRow, short unsigned int jCol ) { return theData[iRow*theNCols+jCol]; }
+  inline float& operator()(short unsigned int iRow, short unsigned int jCol) { return theData[iRow * theNCols + jCol]; }
 
   /// Read or write an element of the correlations matrix. NOTE: Indexing starts from [0,0].
-  inline const float operator()( short unsigned int iRow, short unsigned int jCol ) const { return theData[iRow*theNCols+jCol]; }
+  inline const float operator()(short unsigned int iRow, short unsigned int jCol) const {
+    return theData[iRow * theNCols + jCol];
+  }
 
   /// Get the number of rows of the correlation matrix.
-  inline const short unsigned int numRow( void ) const { return theNRows; }
+  inline const short unsigned int numRow(void) const { return theNRows; }
 
   /// Get the number of columns of the correlation matrix.
-  inline const short unsigned int numCol( void ) const { return theNCols; }
+  inline const short unsigned int numCol(void) const { return theNCols; }
 
   /// Multiply all elements of the correlations matrix with a given number.
-  void operator*=( const float multiply );
+  void operator*=(const float multiply);
 
   /// Retrieve the correlation matrix in a CLHEP matrix representation;
-  AlgebraicMatrix matrix( void ) const;
+  AlgebraicMatrix matrix(void) const;
 
-//   /// Get the counter's value.
-//   inline const int counter( void ) const { return theCounter; }
+  //   /// Get the counter's value.
+  //   inline const int counter( void ) const { return theCounter; }
 
-//   /// Increase the counter's value by 1.
-//   inline void incrementCounter( void ) { ++theCounter; }
+  //   /// Increase the counter's value by 1.
+  //   inline void incrementCounter( void ) { ++theCounter; }
 
-//   /// Decrease the counter's value by 1.
-//   inline void decrementCounter( void ) { --theCounter; }
+  //   /// Decrease the counter's value by 1.
+  //   inline void decrementCounter( void ) { --theCounter; }
 
 private:
-
-//   int theCounter;
+  //   int theCounter;
 
   short unsigned int theNRows;
   short unsigned int theNCols;
 
-  std::vector< float > theData;
-
+  std::vector<float> theData;
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentExtendedCorrelationsStore.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentExtendedCorrelationsStore.h
index 5f68e5e5c7878..ac1f74d615257 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentExtendedCorrelationsStore.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentExtendedCorrelationsStore.h
@@ -9,78 +9,91 @@
 /// If a correlation exceeds a certain value (especially corrupted correlations with
 /// an absolute value bigger than 1) it is downweighted.
 
-
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentCorrelationsStore.h"
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentExtendedCorrelationsEntry.h"
 
-namespace edm { class ParameterSet; }
-
-class AlignmentExtendedCorrelationsStore : public AlignmentCorrelationsStore
-{
+namespace edm {
+  class ParameterSet;
+}
 
+class AlignmentExtendedCorrelationsStore : public AlignmentCorrelationsStore {
 public:
-
   typedef AlignmentExtendedCorrelationsEntry ExtendedCorrelationsEntry;
-  typedef std::map< Alignable*, ExtendedCorrelationsEntry > ExtendedCorrelationsTable;
-  typedef std::map< Alignable*, ExtendedCorrelationsTable* > ExtendedCorrelations;
+  typedef std::map<Alignable*, ExtendedCorrelationsEntry> ExtendedCorrelationsTable;
+  typedef std::map<Alignable*, ExtendedCorrelationsTable*> ExtendedCorrelations;
 
-  AlignmentExtendedCorrelationsStore( const edm::ParameterSet& config );
+  AlignmentExtendedCorrelationsStore(const edm::ParameterSet& config);
 
-  ~AlignmentExtendedCorrelationsStore( void ) override {}
+  ~AlignmentExtendedCorrelationsStore(void) override {}
 
   /// Write correlations directly to the covariance matrix starting at the
   /// given position. Indices are assumed to start from 0.
-  void correlations( Alignable* ap1, Alignable* ap2,
-			     AlgebraicSymMatrix& cov, int row, int col ) const override;
+  void correlations(Alignable* ap1, Alignable* ap2, AlgebraicSymMatrix& cov, int row, int col) const override;
 
   /// Get correlations directly from the given position of the covariance
   /// matrix and store them. Indices are assumed to start from 0.
-  void setCorrelations( Alignable* ap1, Alignable* ap2,
-				const AlgebraicSymMatrix& cov, int row, int col ) override;
+  void setCorrelations(Alignable* ap1, Alignable* ap2, const AlgebraicSymMatrix& cov, int row, int col) override;
 
   /// Set correlations without checking whether the maximum
   /// number of updates has already been reached.
-  void setCorrelations( Alignable* ap1, Alignable* ap2,	AlgebraicMatrix& mat ) override;
+  void setCorrelations(Alignable* ap1, Alignable* ap2, AlgebraicMatrix& mat) override;
 
   /// Get correlations.
-  virtual void getCorrelations( Alignable* ap1, Alignable* ap2,	AlgebraicMatrix& mat ) const;
+  virtual void getCorrelations(Alignable* ap1, Alignable* ap2, AlgebraicMatrix& mat) const;
 
   /// Check whether correlations are stored for a given pair of alignables.
-  bool correlationsAvailable( Alignable* ap1, Alignable* ap2 ) const override;
+  bool correlationsAvailable(Alignable* ap1, Alignable* ap2) const override;
 
   /// Reset correlations.
-  void resetCorrelations( void ) override;
+  void resetCorrelations(void) override;
 
   /// Get number of stored correlations.
-  unsigned int size( void ) const override;
+  unsigned int size(void) const override;
 
 private:
-
-  void fillCorrelationsTable( Alignable* ap1, Alignable* ap2,
-                              ExtendedCorrelationsTable* table,
-                              const AlgebraicSymMatrix& cov,
-                              int row, int col, bool transpose );
-
-  void fillCovariance( Alignable* ap1, Alignable* ap2, const ExtendedCorrelationsEntry& entry,
-                       AlgebraicSymMatrix& cov, int row, int col ) const;
-
-  void fillCovarianceT( Alignable* ap1, Alignable* ap2, const ExtendedCorrelationsEntry& entry,
-                        AlgebraicSymMatrix& cov, int row, int col ) const;
-
-  void readFromCovariance( Alignable* ap1, Alignable* ap2, ExtendedCorrelationsEntry& entry,
-                           const AlgebraicSymMatrix& cov, int row, int col );
-
-  void readFromCovarianceT( Alignable* ap1, Alignable* ap2, ExtendedCorrelationsEntry& entry,
-                            const AlgebraicSymMatrix& cov, int row, int col );
-
-  void resizeCorruptCorrelations( ExtendedCorrelationsEntry& entry, double maxCorr );
+  void fillCorrelationsTable(Alignable* ap1,
+                             Alignable* ap2,
+                             ExtendedCorrelationsTable* table,
+                             const AlgebraicSymMatrix& cov,
+                             int row,
+                             int col,
+                             bool transpose);
+
+  void fillCovariance(Alignable* ap1,
+                      Alignable* ap2,
+                      const ExtendedCorrelationsEntry& entry,
+                      AlgebraicSymMatrix& cov,
+                      int row,
+                      int col) const;
+
+  void fillCovarianceT(Alignable* ap1,
+                       Alignable* ap2,
+                       const ExtendedCorrelationsEntry& entry,
+                       AlgebraicSymMatrix& cov,
+                       int row,
+                       int col) const;
+
+  void readFromCovariance(Alignable* ap1,
+                          Alignable* ap2,
+                          ExtendedCorrelationsEntry& entry,
+                          const AlgebraicSymMatrix& cov,
+                          int row,
+                          int col);
+
+  void readFromCovarianceT(Alignable* ap1,
+                           Alignable* ap2,
+                           ExtendedCorrelationsEntry& entry,
+                           const AlgebraicSymMatrix& cov,
+                           int row,
+                           int col);
+
+  void resizeCorruptCorrelations(ExtendedCorrelationsEntry& entry, double maxCorr);
 
   ExtendedCorrelations theCorrelations;
 
   int theMaxUpdates;
   double theCut;
   double theWeight;
-
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentIO.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentIO.h
index 9601989094048..418205ef65829 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentIO.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentIO.h
@@ -11,60 +11,65 @@
 ///  $Revision: 1.3 $
 /// (last update by $Author: flucke $)
 
-
 #include "Alignment/CommonAlignment/interface/Utilities.h"
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignableData.h"
 
-
-class AlignmentIO
-{
-
-  public:
+class AlignmentIO {
+public:
   virtual ~AlignmentIO() = default;
-  /// write AlignmentParameters 
-  virtual void writeAlignmentParameters (const align::Alignables& alivec, 
-    const char* filename, int iter, bool validCheck, int& ierr) = 0;
+  /// write AlignmentParameters
+  virtual void writeAlignmentParameters(
+      const align::Alignables& alivec, const char* filename, int iter, bool validCheck, int& ierr) = 0;
 
-  /// read AlignmentParameters 
-  virtual align::Parameters readAlignmentParameters (const align::Alignables& alivec, 
-    const char* filename, int iter, int& ierr) = 0;
+  /// read AlignmentParameters
+  virtual align::Parameters readAlignmentParameters(const align::Alignables& alivec,
+                                                    const char* filename,
+                                                    int iter,
+                                                    int& ierr) = 0;
 
   /// write RigidBodyAlignmentParameters as applied on top of original positions
-  virtual void writeOrigRigidBodyAlignmentParameters (const align::Alignables& alivec, 
-    const char* filename, int iter, bool validCheck, int& ierr) = 0;
-
-  /// write Correlations 
-  virtual void writeCorrelations (const align::Correlations& cormap, 
-    const char* filename, int iter, bool validCheck, int& ierr) = 0;
-
-  /// read Correlations 
-  virtual align::Correlations readCorrelations (const align::Alignables& alivec, 
-    const char* filename, int iter, int& ierr) = 0;
-
-  /// write Alignable current absolute positions 
-  virtual void writeAlignableAbsolutePositions (const align::Alignables& alivec, 
-    const char* filename, int iter, bool validCheck, int& ierr) = 0;
-
-  /// read Alignable current absolute positions 
-  virtual AlignablePositions readAlignableAbsolutePositions (const align::Alignables&
-    alivec, const char* filename, int iter, int& ierr) = 0;
-
-  /// write Alignable original (before misalignment) absolute positions 
-  virtual void writeAlignableOriginalPositions (const align::Alignables& alivec, 
-    const char* filename, int iter, bool validCheck, int& ierr) = 0;
-
-  /// read Alignable original (before misalignment) absolute positions 
-  virtual AlignablePositions readAlignableOriginalPositions (const align::Alignables&
-    alivec, const char* filename, int iter, int& ierr) = 0;
-
-  /// write Alignable relative positions (shift,rotation) 
-  virtual  void writeAlignableRelativePositions (const align::Alignables& alivec, 
-    const char* filename, int iter, bool validCheck, int& ierr) = 0;
-
-  /// read Alignable relative positions (shift,rotation) 
-  virtual AlignableShifts readAlignableRelativePositions (const align::Alignables&
-    alivec, const char* filename, int iter, int& ierr) = 0;
-
+  virtual void writeOrigRigidBodyAlignmentParameters(
+      const align::Alignables& alivec, const char* filename, int iter, bool validCheck, int& ierr) = 0;
+
+  /// write Correlations
+  virtual void writeCorrelations(
+      const align::Correlations& cormap, const char* filename, int iter, bool validCheck, int& ierr) = 0;
+
+  /// read Correlations
+  virtual align::Correlations readCorrelations(const align::Alignables& alivec,
+                                               const char* filename,
+                                               int iter,
+                                               int& ierr) = 0;
+
+  /// write Alignable current absolute positions
+  virtual void writeAlignableAbsolutePositions(
+      const align::Alignables& alivec, const char* filename, int iter, bool validCheck, int& ierr) = 0;
+
+  /// read Alignable current absolute positions
+  virtual AlignablePositions readAlignableAbsolutePositions(const align::Alignables& alivec,
+                                                            const char* filename,
+                                                            int iter,
+                                                            int& ierr) = 0;
+
+  /// write Alignable original (before misalignment) absolute positions
+  virtual void writeAlignableOriginalPositions(
+      const align::Alignables& alivec, const char* filename, int iter, bool validCheck, int& ierr) = 0;
+
+  /// read Alignable original (before misalignment) absolute positions
+  virtual AlignablePositions readAlignableOriginalPositions(const align::Alignables& alivec,
+                                                            const char* filename,
+                                                            int iter,
+                                                            int& ierr) = 0;
+
+  /// write Alignable relative positions (shift,rotation)
+  virtual void writeAlignableRelativePositions(
+      const align::Alignables& alivec, const char* filename, int iter, bool validCheck, int& ierr) = 0;
+
+  /// read Alignable relative positions (shift,rotation)
+  virtual AlignableShifts readAlignableRelativePositions(const align::Alignables& alivec,
+                                                         const char* filename,
+                                                         int iter,
+                                                         int& ierr) = 0;
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentIORoot.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentIORoot.h
index b02a35844d41d..de6695e3cbf28 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentIORoot.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentIORoot.h
@@ -3,7 +3,7 @@
 
 /// \class AlignmentIORoot
 ///
-/// concrete class for ROOT-based I/O of Alignment parameters, correlations 
+/// concrete class for ROOT-based I/O of Alignment parameters, correlations
 ///  and Alignable positions. Derived from AlignmentIO
 ///
 ///  $Date: 2006/11/30 09:56:03 $
@@ -12,56 +12,62 @@
 
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentIO.h"
 
-
-class AlignmentIORoot : public AlignmentIO
-{
-
-  public:
+class AlignmentIORoot : public AlignmentIO {
+public:
   ~AlignmentIORoot() override = default;
-  /// write AlignmentParameters 
-  void writeAlignmentParameters (const align::Alignables& alivec, 
-				 const char* filename, int iter, bool validCheck, int& ierr ) override;
+  /// write AlignmentParameters
+  void writeAlignmentParameters(
+      const align::Alignables& alivec, const char* filename, int iter, bool validCheck, int& ierr) override;
 
-  /// read AlignmentParameters 
-  align::Parameters readAlignmentParameters (const align::Alignables& alivec, 
-				      const char* filename, int iter, int& ierr) override;
+  /// read AlignmentParameters
+  align::Parameters readAlignmentParameters(const align::Alignables& alivec,
+                                            const char* filename,
+                                            int iter,
+                                            int& ierr) override;
 
   /// write RigidBodyAlignmentParameters as applied on top of original positions
-  void writeOrigRigidBodyAlignmentParameters (const align::Alignables& alivec, const char* filename,
-					      int iter, bool validCheck, int& ierr) override;
+  void writeOrigRigidBodyAlignmentParameters(
+      const align::Alignables& alivec, const char* filename, int iter, bool validCheck, int& ierr) override;
+
+  /// write Correlations
+  void writeCorrelations(
+      const align::Correlations& cormap, const char* filename, int iter, bool validCheck, int& ierr) override;
+
+  /// read Correlations
+  align::Correlations readCorrelations(const align::Alignables& alivec,
+                                       const char* filename,
+                                       int iter,
+                                       int& ierr) override;
+
+  /// write Alignable current absolute positions
+  void writeAlignableAbsolutePositions(
+      const align::Alignables& alivec, const char* filename, int iter, bool validCheck, int& ierr) override;
+
+  /// read Alignable current absolute positions
+  AlignablePositions readAlignableAbsolutePositions(const align::Alignables& alivec,
+                                                    const char* filename,
+                                                    int iter,
+                                                    int& ierr) override;
+
+  /// write Alignable original (before misalignment) absolute positions
+  void writeAlignableOriginalPositions(
+      const align::Alignables& alivec, const char* filename, int iter, bool validCheck, int& ierr) override;
 
-  /// write Correlations 
-  void writeCorrelations (const align::Correlations& cormap, 
-			  const char* filename, int iter, bool validCheck, int& ierr) override;
+  /// read Alignable original (before misalignment) absolute positions
+  AlignablePositions readAlignableOriginalPositions(const align::Alignables& alivec,
+                                                    const char* filename,
+                                                    int iter,
+                                                    int& ierr) override;
 
-  /// read Correlations 
-  align::Correlations readCorrelations (const align::Alignables& alivec, 
-				 const char* filename, int iter, int& ierr) override;
-  
-  /// write Alignable current absolute positions 
-  void writeAlignableAbsolutePositions (const align::Alignables& alivec, 
-					const char* filename, int iter, bool validCheck, int& ierr) override;
-  
-  /// read Alignable current absolute positions 
-  AlignablePositions readAlignableAbsolutePositions (const align::Alignables& alivec,
-						     const char* filename, int iter, int& ierr) override;
-  
-  /// write Alignable original (before misalignment) absolute positions 
-  void writeAlignableOriginalPositions (const align::Alignables& alivec, 
-					const char* filename, int iter, bool validCheck, int& ierr) override;
-  
-  /// read Alignable original (before misalignment) absolute positions 
-  AlignablePositions readAlignableOriginalPositions (const align::Alignables& alivec,
-						     const char* filename, int iter, int& ierr) override;
-  
-  /// write Alignable relative positions (shift,rotation) 
-  void writeAlignableRelativePositions (const align::Alignables& alivec, 
-					const char* filename, int iter, bool validCheck, int& ierr) override;
-  
-  /// read Alignable relative positions (shift,rotation) 
-  AlignableShifts readAlignableRelativePositions (const align::Alignables& alivec,
-						  const char* filename, int iter, int& ierr) override;
+  /// write Alignable relative positions (shift,rotation)
+  void writeAlignableRelativePositions(
+      const align::Alignables& alivec, const char* filename, int iter, bool validCheck, int& ierr) override;
 
+  /// read Alignable relative positions (shift,rotation)
+  AlignableShifts readAlignableRelativePositions(const align::Alignables& alivec,
+                                                 const char* filename,
+                                                 int iter,
+                                                 int& ierr) override;
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentIORootBase.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentIORootBase.h
index bae943e33dbb2..687bf0b010faa 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentIORootBase.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentIORootBase.h
@@ -6,47 +6,45 @@
 class TFile;
 class TTree;
 
-/// Base class for ROOT-based I/O of Alignment parameters etc. 
+/// Base class for ROOT-based I/O of Alignment parameters etc.
 
-class AlignmentIORootBase 
-{
-
-  protected:
+class AlignmentIORootBase {
+protected:
   /// constructor
   AlignmentIORootBase() : tree(nullptr), myFile(nullptr) {}
-  /// destructor 
+  /// destructor
   virtual ~AlignmentIORootBase();
 
-  /// open IO 
+  /// open IO
   int openRoot(const char* filename, int iteration, bool writemode);
 
-  /// close IO 
+  /// close IO
   int closeRoot(void);
 
-  /// create root branches 
+  /// create root branches
   virtual void createBranches(void) = 0;
 
-  /// set root branches 
+  /// set root branches
   virtual void setBranchAddresses(void) = 0;
 
-  /// test if file is existing and if so, what the highest iteration is 
-  int testFile(const char* filename, const TString &tname);
+  /// test if file is existing and if so, what the highest iteration is
+  int testFile(const char* filename, const TString& tname);
 
-  /// compose tree name 
-  TString treeName(int iter, const TString &tname);
+  /// compose tree name
+  TString treeName(int iter, const TString& tname);
 
   // data members
 
-  TTree* tree; // root tree
-  TString treename; // tree identifier name
-  TString treetxt;  // tree text
-  bool bWrite; // if true we are writing, else reading
+  TTree* tree;       // root tree
+  TString treename;  // tree identifier name
+  TString treetxt;   // tree text
+  bool bWrite;       // if true we are writing, else reading
 
-  const static int nParMax = 20;   // maximal number of Parameters
-  const static int itermax = 1000; // max iteration to test for
+  const static int nParMax = 20;    // maximal number of Parameters
+  const static int itermax = 1000;  // max iteration to test for
 
- private:
-  TFile* myFile; // root file
+private:
+  TFile* myFile;  // root file
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterBuilder.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterBuilder.h
index 6f4f8121b0752..fd52e6e3b2db3 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterBuilder.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterBuilder.h
@@ -22,32 +22,31 @@ class AlignableMuon;
 class AlignmentParameters;
 class TrackerTopology;
 
-class AlignmentParameterBuilder 
-{
+class AlignmentParameterBuilder {
 public:
   /// Constructor from tracker only
-  explicit AlignmentParameterBuilder( AlignableTracker *alignableTracker,
-				      AlignableExtras *alignableExtras );
+  explicit AlignmentParameterBuilder(AlignableTracker *alignableTracker, AlignableExtras *alignableExtras);
 
   /// Constructor from tracker and muon
-  AlignmentParameterBuilder( AlignableTracker *alignableTracker, AlignableMuon *alignableMuon,
-			     AlignableExtras *alignableExtras );
+  AlignmentParameterBuilder(AlignableTracker *alignableTracker,
+                            AlignableMuon *alignableMuon,
+                            AlignableExtras *alignableExtras);
 
   /// Constructor adding selections by passing the ParameterSet named 'AlignmentParameterSelector'
   /// (expected in pSet) to addSelections(..)
-  AlignmentParameterBuilder( AlignableTracker *alignableTracker,
-			     AlignableExtras *alignableExtras,
-			     const edm::ParameterSet &pSet );
+  AlignmentParameterBuilder(AlignableTracker *alignableTracker,
+                            AlignableExtras *alignableExtras,
+                            const edm::ParameterSet &pSet);
 
   /// Constructor from tracker and muon, plus selection
-  AlignmentParameterBuilder( AlignableTracker *alignableTracker, AlignableMuon *alignableMuon,
-			     AlignableExtras *alignableExtras,
-                             const edm::ParameterSet &pSet);
-
-
-  /// destructor 
-  virtual ~AlignmentParameterBuilder() {};
-  /// master initialisation method, PSet must have form as constructor wants it 
+  AlignmentParameterBuilder(AlignableTracker *alignableTracker,
+                            AlignableMuon *alignableMuon,
+                            AlignableExtras *alignableExtras,
+                            const edm::ParameterSet &pSet);
+
+  /// destructor
+  virtual ~AlignmentParameterBuilder(){};
+  /// master initialisation method, PSet must have form as constructor wants it
   void addAllSelections(const edm::ParameterSet &pSet);
 
   /// Add selections of Alignables, using AlignmenParameterSelector::addSelections.
@@ -55,48 +54,46 @@ class AlignmentParameterBuilder
   /// using the selection of active parameters done in AlignmenParameterSelector,
   /// e.g. for RigidBody a selection string '11100' selects the degrees of freedom in
   /// (x,y,z), but not (alpha,beta,gamma).
-  /// Returns number of added selections 
-  unsigned int addSelections(const edm::ParameterSet &pset,
-			     AlignmentParametersFactory::ParametersType parType);
+  /// Returns number of added selections
+  unsigned int addSelections(const edm::ParameterSet &pset, AlignmentParametersFactory::ParametersType parType);
 
   /// Add arbitrary selection of Alignables, return number of higher level Alignables
   unsigned int add(const align::Alignables &alignables,
-		   AlignmentParametersFactory::ParametersType parType,
-		   const std::vector<bool> &sel);
-  /// Add a single Alignable, true if it is higher level, false if it is an AlignableDet 
-  bool add(Alignable *alignable, AlignmentParametersFactory::ParametersType parType,
-	   const std::vector<bool> &sel);
+                   AlignmentParametersFactory::ParametersType parType,
+                   const std::vector<bool> &sel);
+  /// Add a single Alignable, true if it is higher level, false if it is an AlignableDet
+  bool add(Alignable *alignable, AlignmentParametersFactory::ParametersType parType, const std::vector<bool> &sel);
 
-  /// Get list of alignables for which AlignmentParameters are built 
-  const align::Alignables& alignables() const { return theAlignables; };
+  /// Get list of alignables for which AlignmentParameters are built
+  const align::Alignables &alignables() const { return theAlignables; };
 
-  /// Remove n Alignables from list 
-  void fixAlignables( int n );
+  /// Remove n Alignables from list
+  void fixAlignables(int n);
 
-  /// Alignable tracker   
-  const AlignableTracker* alignableTracker() const;
+  /// Alignable tracker
+  const AlignableTracker *alignableTracker() const;
 
 private:
   /// First remove all spaces (' ') from char selection 'paramSelChar' (coming
   /// from ParameterSelector) and then convert the selection to bool (for AlignmentParameters).
   /// True if (after removal of spaces) anything else than 0 and 1 is found in vector<char>.
   bool decodeParamSel(std::vector<char> &paramSelChar, std::vector<bool> &result) const;
-  /// add SelectionUserVariables corresponding to fullSel 
+  /// add SelectionUserVariables corresponding to fullSel
   bool addFullParamSel(AlignmentParameters *aliPar, const std::vector<char> &fullSel) const;
 
   // data members
 
-  /// Vector of alignables 
+  /// Vector of alignables
   align::Alignables theAlignables;
 
-  /// Alignable tracker   
-  AlignableTracker* theAlignableTracker;
+  /// Alignable tracker
+  AlignableTracker *theAlignableTracker;
 
   /// Alignable muon
-  AlignableMuon* theAlignableMuon;
-  
+  AlignableMuon *theAlignableMuon;
+
   /// extra Alignables
-  AlignableExtras* theAlignableExtras;
+  AlignableExtras *theAlignableExtras;
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterSelector.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterSelector.h
index e93f3355fe922..fc7be5bf8ad7c 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterSelector.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterSelector.h
@@ -24,18 +24,19 @@ namespace edm {
 }
 
 class AlignmentParameterSelector {
- public:
+public:
   /// Constructor from tracker only or from tracker and muon
-  explicit AlignmentParameterSelector(AlignableTracker *aliTracker, AlignableMuon *aliMuon = nullptr,
-				      AlignableExtras *aliExtras = nullptr);
+  explicit AlignmentParameterSelector(AlignableTracker *aliTracker,
+                                      AlignableMuon *aliMuon = nullptr,
+                                      AlignableExtras *aliExtras = nullptr);
 
   /// Destructor
   virtual ~AlignmentParameterSelector() {}
 
   /// vector of alignables selected so far
-  const align::Alignables& selectedAlignables() const { return theSelectedAlignables; }
+  const align::Alignables &selectedAlignables() const { return theSelectedAlignables; }
   /// vector of selection 'strings' for alignables, parallel to selectedAlignables()
-  const std::vector<std::vector<char> >& selectedParameters() const { return theSelectedParameters; }
+  const std::vector<std::vector<char> > &selectedParameters() const { return theSelectedParameters; }
   /// remove all selected Alignables and geometrical restrictions
   void clear();
   /// remove all geometrical restrictions
@@ -58,11 +59,10 @@ class AlignmentParameterSelector {
   /// as defined in setSpecials, returns number of added alignables
   unsigned int addSelection(const std::string &name, const std::vector<char> &paramSel);
   /// as addSelection with one argument, but overwriting geometrical restrictions
-  unsigned int addSelection(const std::string &name, const std::vector<char> &paramSel, 
-			    const edm::ParameterSet &pSet);
+  unsigned int addSelection(const std::string &name, const std::vector<char> &paramSel, const edm::ParameterSet &pSet);
   /// true if layer is deselected via "Layers<N><M>" or "DS/SS"
   bool layerDeselected(const Alignable *alignable) const;
-  /// true if alignable is DetUnit deselected by Unit<Rphi/Stereo> selection 
+  /// true if alignable is DetUnit deselected by Unit<Rphi/Stereo> selection
   bool detUnitDeselected(const Alignable *alignable) const;
   /// true if geometrical restrictions in eta, phi, r, x, y, z not satisfied
   bool outsideGeometricalRanges(const Alignable *alignable) const;
@@ -72,8 +72,8 @@ class AlignmentParameterSelector {
   /// ( => false if ranges.empty() == true), if(isPhi==true) takes into account phi periodicity
   /// for the integer specialized method, true is returned for ranges[i] <= value <= ranges[i+1]
   /// and isPhi is ignored
-  template<typename T> bool insideRanges(T value, const std::vector<T> &ranges,
-					 bool isPhi = false) const;
+  template <typename T>
+  bool insideRanges(T value, const std::vector<T> &ranges, bool isPhi = false) const;
   /// true if value is member of vector of values
   bool isMemberOfVector(int value, const std::vector<int> &values) const;
   /// Decomposing input string 's' into parts separated by 'delimiter'
@@ -81,8 +81,8 @@ class AlignmentParameterSelector {
   /// Converting std::string into std::vector<char>
   std::vector<char> convertParamSel(const std::string &selString) const;
 
- protected:
-  /// adding alignables which fulfil geometrical restrictions and special switches 
+protected:
+  /// adding alignables which fulfil geometrical restrictions and special switches
   unsigned int add(const align::Alignables &alignables, const std::vector<char> &paramSel);
   /// some helper methods
   unsigned int addAllDets(const std::vector<char> &paramSel);
@@ -97,12 +97,12 @@ class AlignmentParameterSelector {
   void setTOBDetIdCuts(const edm::ParameterSet &pSet);
   void setTECDetIdCuts(const edm::ParameterSet &pSet);
 
-  const AlignableTracker* alignableTracker() const;
-  
- private:
-  AlignableTracker* theTracker;
-  AlignableMuon*    theMuon;
-  AlignableExtras*  theExtras;
+  const AlignableTracker *alignableTracker() const;
+
+private:
+  AlignableTracker *theTracker;
+  AlignableMuon *theMuon;
+  AlignableExtras *theExtras;
   align::Alignables theSelectedAlignables;
   std::vector<std::vector<char> > theSelectedParameters;
 
@@ -115,81 +115,92 @@ class AlignmentParameterSelector {
   std::vector<double> theRangesZ;
 
   /// DetId restrictions in eta, phi, r, x, y, z to be applied for next addSelection
-  std::vector<int>    theDetIds;
-  std::vector<int>    theDetIdRanges;
-  std::vector<int>    theExcludedDetIds;
-  std::vector<int>    theExcludedDetIdRanges;
+  std::vector<int> theDetIds;
+  std::vector<int> theDetIdRanges;
+  std::vector<int> theExcludedDetIds;
+  std::vector<int> theExcludedDetIdRanges;
   struct PXBDetIdRanges {
-    std::vector<int>    theLadderRanges;
-    std::vector<int>    theLayerRanges;
-    std::vector<int>    theModuleRanges;
+    std::vector<int> theLadderRanges;
+    std::vector<int> theLayerRanges;
+    std::vector<int> theModuleRanges;
     void clear() {
-      theLadderRanges.clear(); theLayerRanges.clear();
+      theLadderRanges.clear();
+      theLayerRanges.clear();
       theModuleRanges.clear();
     }
-  }                   thePXBDetIdRanges;
+  } thePXBDetIdRanges;
   struct PXFDetIdRanges {
-    std::vector<int>    theBladeRanges;
-    std::vector<int>    theDiskRanges;
-    std::vector<int>    theModuleRanges;
-    std::vector<int>    thePanelRanges;
-    std::vector<int>    theSideRanges;
-    void clear() { 
-      theBladeRanges.clear(); theDiskRanges.clear();
-      theModuleRanges.clear(); thePanelRanges.clear();
+    std::vector<int> theBladeRanges;
+    std::vector<int> theDiskRanges;
+    std::vector<int> theModuleRanges;
+    std::vector<int> thePanelRanges;
+    std::vector<int> theSideRanges;
+    void clear() {
+      theBladeRanges.clear();
+      theDiskRanges.clear();
+      theModuleRanges.clear();
+      thePanelRanges.clear();
       theSideRanges.clear();
     }
-  }                   thePXFDetIdRanges;
+  } thePXFDetIdRanges;
   struct TIBDetIdRanges {
-    std::vector<int>    theLayerRanges;
-    std::vector<int>    theModuleRanges;
-    std::vector<int>    theStringRanges;
-    std::vector<int>    theSideRanges;
-    void clear() { 
-      theLayerRanges.clear(); theModuleRanges.clear();
-      theSideRanges.clear(); theStringRanges.clear();
+    std::vector<int> theLayerRanges;
+    std::vector<int> theModuleRanges;
+    std::vector<int> theStringRanges;
+    std::vector<int> theSideRanges;
+    void clear() {
+      theLayerRanges.clear();
+      theModuleRanges.clear();
+      theSideRanges.clear();
+      theStringRanges.clear();
     }
-  }                   theTIBDetIdRanges;
+  } theTIBDetIdRanges;
   struct TIDDetIdRanges {
-    std::vector<int>    theDiskRanges; 
-    std::vector<int>    theModuleRanges;
-    std::vector<int>    theRingRanges;
-    std::vector<int>    theSideRanges;  
-    void clear() { 
-      theDiskRanges.clear(); theModuleRanges.clear();
-      theRingRanges.clear(); theSideRanges.clear();
+    std::vector<int> theDiskRanges;
+    std::vector<int> theModuleRanges;
+    std::vector<int> theRingRanges;
+    std::vector<int> theSideRanges;
+    void clear() {
+      theDiskRanges.clear();
+      theModuleRanges.clear();
+      theRingRanges.clear();
+      theSideRanges.clear();
     }
-  }                   theTIDDetIdRanges;
+  } theTIDDetIdRanges;
   struct TOBDetIdRanges {
-    std::vector<int>    theLayerRanges; 
-    std::vector<int>    theModuleRanges;
-    std::vector<int>    theRodRanges;  
-    std::vector<int>    theSideRanges;
-    void clear() { 
-      theLayerRanges.clear(); theModuleRanges.clear();
-      theRodRanges.clear(); theSideRanges.clear();
+    std::vector<int> theLayerRanges;
+    std::vector<int> theModuleRanges;
+    std::vector<int> theRodRanges;
+    std::vector<int> theSideRanges;
+    void clear() {
+      theLayerRanges.clear();
+      theModuleRanges.clear();
+      theRodRanges.clear();
+      theSideRanges.clear();
     }
-  }                   theTOBDetIdRanges;  
+  } theTOBDetIdRanges;
   struct TECDetIdRanges {
-    std::vector<int>    theWheelRanges; 
-    std::vector<int>    thePetalRanges; 
-    std::vector<int>    theModuleRanges;
-    std::vector<int>    theRingRanges;
-    std::vector<int>    theSideRanges;  
-    void clear() { 
-      theWheelRanges.clear(); thePetalRanges.clear();
-      theModuleRanges.clear(); theRingRanges.clear();
+    std::vector<int> theWheelRanges;
+    std::vector<int> thePetalRanges;
+    std::vector<int> theModuleRanges;
+    std::vector<int> theRingRanges;
+    std::vector<int> theSideRanges;
+    void clear() {
+      theWheelRanges.clear();
+      thePetalRanges.clear();
+      theModuleRanges.clear();
+      theRingRanges.clear();
       theSideRanges.clear();
     }
-  }                   theTECDetIdRanges;
-    
+  } theTECDetIdRanges;
+
   // further switches used in add(...)
   bool theOnlyDS;
   bool theOnlySS;
   bool theSelLayers;
-  int  theMinLayer;
-  int  theMaxLayer;
-  enum RphiOrStereoDetUnit { Stereo, Both, Rphi};
+  int theMinLayer;
+  int theMaxLayer;
+  enum RphiOrStereoDetUnit { Stereo, Both, Rphi };
   RphiOrStereoDetUnit theRphiOrStereoDetUnit;
   /// Setting the special switches and returning input string, but after removing the 'special
   /// indicators' from it. Known specials are:
@@ -199,11 +210,9 @@ class AlignmentParameterSelector {
   /// "UnitStereo" and "UnitRphi" anywhere in name:
   ///      for a DetUnit in strip select only if stereo or rphi module (keep 'Unit' in name!)
   std::string setSpecials(const std::string &name);
-
 };
 
-template<> bool
-AlignmentParameterSelector::insideRanges<int>(int value, const std::vector<int> &ranges,
-					      bool isPhi) const;
+template <>
+bool AlignmentParameterSelector::insideRanges<int>(int value, const std::vector<int> &ranges, bool isPhi) const;
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterStore.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterStore.h
index cf062caa0d0ff..073c07adda950 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterStore.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParameterStore.h
@@ -6,80 +6,77 @@
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentCorrelationsStore.h"
 #include "Alignment/CommonAlignmentParametrization/interface/CompositeAlignmentParameters.h"
 
-/// \class AlignmentParameterStore 
+/// \class AlignmentParameterStore
 ///
-/// Basic class for management of alignment parameters and correlations 
+/// Basic class for management of alignment parameters and correlations
 ///
 ///  $Date: 2011/05/23 20:50:31 $
 ///  $Revision: 1.19 $
 /// (last update by $Author: mussgill $)
 
-namespace edm { class ParameterSet; }
+namespace edm {
+  class ParameterSet;
+}
 class AlignmentUserVariables;
 class TrackerTopology;
 
-class AlignmentParameterStore 
-{
-
+class AlignmentParameterStore {
 public:
-
   typedef std::vector<AlignmentParameters*> Parameters;
-  typedef std::map< std::pair<Alignable*,Alignable*>,AlgebraicMatrix > Correlations;
+  typedef std::map<std::pair<Alignable*, Alignable*>, AlgebraicMatrix> Correlations;
   typedef std::vector<unsigned int> DetIds;
 
-  /// constructor 
-  AlignmentParameterStore( const align::Alignables &alis, const edm::ParameterSet& config );
+  /// constructor
+  AlignmentParameterStore(const align::Alignables& alis, const edm::ParameterSet& config);
 
-  /// destructor 
+  /// destructor
   virtual ~AlignmentParameterStore();
 
   /// select parameters
   /// (for backward compatibility, use with vector<AlignableDetOrUnitPtr> as argument instead)
-  CompositeAlignmentParameters
-    selectParameters( const std::vector <AlignableDet*>& alignabledets ) const;
-  /// select parameters 
-  CompositeAlignmentParameters
-    selectParameters( const std::vector <AlignableDetOrUnitPtr>& alignabledets ) const;
-  /// select parameters 
+  CompositeAlignmentParameters selectParameters(const std::vector<AlignableDet*>& alignabledets) const;
+  /// select parameters
+  CompositeAlignmentParameters selectParameters(const std::vector<AlignableDetOrUnitPtr>& alignabledets) const;
+  /// select parameters
   CompositeAlignmentParameters selectParameters(const align::Alignables&) const;
 
-  /// update parameters 
+  /// update parameters
   void updateParameters(const CompositeAlignmentParameters& aap, bool updateCorrelations = true);
 
-  /// get all alignables 
+  /// get all alignables
   const align::Alignables& alignables(void) const { return theAlignables; }
 
-  /// get all alignables with valid parameters 
+  /// get all alignables with valid parameters
   align::Alignables validAlignables(void) const;
 
-  /// returns number of alignables 
+  /// returns number of alignables
   int numObjects(void) const { return theAlignables.size(); }
 
-  /// get full correlation map 
-  AlignmentCorrelationsStore* correlationsStore( void ) const { return theCorrelationsStore; }
+  /// get full correlation map
+  AlignmentCorrelationsStore* correlationsStore(void) const { return theCorrelationsStore; }
 
-  /// get number of correlations between alignables 
-  const unsigned int numCorrelations( void ) const { return theCorrelationsStore->size(); }
+  /// get number of correlations between alignables
+  const unsigned int numCorrelations(void) const { return theCorrelationsStore->size(); }
 
   /// Obsolete: Use AlignableNavigator::alignableDetFromGeomDet and alignableFromAlignableDet
-/*   Alignable* alignableFromGeomDet( const GeomDet* geomDet ) const; */
+  /*   Alignable* alignableFromGeomDet( const GeomDet* geomDet ) const; */
 
   /// get Alignable corresponding to given AlignableDet (non-const ref. argument since might be returned)
-  Alignable* alignableFromAlignableDet( const AlignableDetOrUnitPtr& alignableDet ) const;
+  Alignable* alignableFromAlignableDet(const AlignableDetOrUnitPtr& alignableDet) const;
 
   /// Obsolete: Use AlignableNavigator::alignableDetFromDetId and alignableFromAlignableDet
-/*   Alignable* alignableFromDetId(const unsigned int& detId) const; */
+  /*   Alignable* alignableFromDetId(const unsigned int& detId) const; */
 
-  /// apply all valid parameters to their alignables 
+  /// apply all valid parameters to their alignables
   void applyParameters(void);
 
-  /// apply parameters of a given alignable 
+  /// apply parameters of a given alignable
   void applyParameters(Alignable* alignable);
 
-  /// reset parameters, correlations, user variables 
+  /// reset parameters, correlations, user variables
   void resetParameters(void);
 
-  /// reset parameters of a given alignable 
+  /// reset parameters of a given alignable
   void resetParameters(Alignable* ali);
 
   /// cache the current position, rotation and other parameters
@@ -94,40 +91,38 @@ class AlignmentParameterStore
   /// restore for the given run the previously cached position, rotation and other parameters
   void restoreCachedTransformations(const align::RunNumber&);
 
-  /// acquire shifts/rotations from alignables of the store and copy into 
-  ///  alignment parameters (local frame) 
+  /// acquire shifts/rotations from alignables of the store and copy into
+  ///  alignment parameters (local frame)
   void acquireRelativeParameters(void);
 
-  /// apply absolute positions to alignables 
-  void applyAlignableAbsolutePositions( const align::Alignables& alis, 
-                                        const AlignablePositions& newpos, int& ierr );
+  /// apply absolute positions to alignables
+  void applyAlignableAbsolutePositions(const align::Alignables& alis, const AlignablePositions& newpos, int& ierr);
 
-  /// apply relative shifts to alignables 
-  void applyAlignableRelativePositions( const align::Alignables& alivec, 
-                                        const AlignableShifts& shifts, int& ierr );
+  /// apply relative shifts to alignables
+  void applyAlignableRelativePositions(const align::Alignables& alivec, const AlignableShifts& shifts, int& ierr);
 
-  /// Attach alignment parameters to given alignables 
-  void attachAlignmentParameters( const align::Alignables& alivec, const Parameters& parvec, int& ierr );
+  /// Attach alignment parameters to given alignables
+  void attachAlignmentParameters(const align::Alignables& alivec, const Parameters& parvec, int& ierr);
 
   /// Attach alignment parameters to alignables
   void attachAlignmentParameters(const Parameters& parvec, int& ierr);
 
-  /// Attach correlations to given alignables 
-  void attachCorrelations( const align::Alignables& alivec, const Correlations& cormap, 
-                           bool overwrite, int& ierr );
+  /// Attach correlations to given alignables
+  void attachCorrelations(const align::Alignables& alivec, const Correlations& cormap, bool overwrite, int& ierr);
 
   /// Attach correlations to alignables
-  void attachCorrelations( const Correlations& cormap, bool overwrite, int& ierr );
+  void attachCorrelations(const Correlations& cormap, bool overwrite, int& ierr);
 
-  /// Attach User Variables to given alignables 
-  void attachUserVariables( const align::Alignables& alivec,
-                            const std::vector<AlignmentUserVariables*>& uvarvec, int& ierr);
+  /// Attach User Variables to given alignables
+  void attachUserVariables(const align::Alignables& alivec,
+                           const std::vector<AlignmentUserVariables*>& uvarvec,
+                           int& ierr);
 
-  /// Set Alignment position error 
-  void setAlignmentPositionError( const align::Alignables& alivec, double valshift, double valrot );
+  /// Set Alignment position error
+  void setAlignmentPositionError(const align::Alignables& alivec, double valshift, double valrot);
 
-  /// Obtain type and layer from Alignable 
-  std::pair<int,int> typeAndLayer( const Alignable* ali, const TrackerTopology* tTopo ) const;
+  /// Obtain type and layer from Alignable
+  std::pair<int, int> typeAndLayer(const Alignable* ali, const TrackerTopology* tTopo) const;
 
   /// a single alignable parameter of an Alignable
   typedef std::pair<Alignable*, unsigned int> ParameterId;
@@ -146,13 +141,14 @@ class AlignmentParameterStore
   /// parameter of aliMaster, but in principle these can be empty...
   /// Note that not all combinations of AlignmentParameters classes ar supported.
   /// If not there will be an exception (and false returned...)
-  bool hierarchyConstraints(const Alignable *aliMaster, const align::Alignables &aliComps,
-			    std::vector<std::vector<ParameterId> > &paramIdsVecOut,
-			    std::vector<std::vector<double> > &factorsVecOut,
-			    bool all, double epsilon) const;
+  bool hierarchyConstraints(const Alignable* aliMaster,
+                            const align::Alignables& aliComps,
+                            std::vector<std::vector<ParameterId> >& paramIdsVecOut,
+                            std::vector<std::vector<double> >& factorsVecOut,
+                            bool all,
+                            double epsilon) const;
 
 protected:
-
   // storage for correlations
   AlignmentCorrelationsStore* theCorrelationsStore;
 
@@ -161,11 +157,11 @@ class AlignmentParameterStore
 
   // data members
 
-  /// alignables 
+  /// alignables
   align::Alignables theAlignables;
 
   /// type of constraints
-  TypeOfConstraints theTypeOfConstraints;  
+  TypeOfConstraints theTypeOfConstraints;
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIO.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIO.h
index 86175b5bb2296..0732a12a3a3f0 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIO.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIO.h
@@ -5,43 +5,39 @@
 
 /// \class AlignmentParametersIO
 ///
-/// abstract base class for I/O of AlignmentParameters 
+/// abstract base class for I/O of AlignmentParameters
 ///
 ///  $Date: 2007/01/23 16:07:08 $
 ///  $Revision: 1.4 $
 /// (last update by $Author: fronga $)
 
-class AlignmentParametersIO 
-{
+class AlignmentParametersIO {
+protected:
+  virtual ~AlignmentParametersIO(){};
 
-  protected:
+  /// open IO
+  virtual int open(const char* filename, int iteration, bool writemode) = 0;
 
-  virtual  ~AlignmentParametersIO(){};
+  /// close IO
+  virtual int close(void) = 0;
 
-  /// open IO 
-  virtual int open(const char* filename, int iteration, bool writemode) =0;
-
-  /// close IO 
-  virtual int close(void) =0;
-
-  /// write AlignmentParameters of one Alignable 
+  /// write AlignmentParameters of one Alignable
   virtual int writeOne(Alignable* ali) = 0;
 
   /// write original RigidBodyAlignmentParameters (i.e. 3 shifts and 3 rotation)
   virtual int writeOneOrigRigidBody(Alignable* ali);
 
-  /// read AlignmentParameters of one Alignable 
+  /// read AlignmentParameters of one Alignable
   virtual AlignmentParameters* readOne(Alignable* ali, int& ierr) = 0;
 
-  /// write AlignmentParameters of many Alignables 
+  /// write AlignmentParameters of many Alignables
   int write(const align::Alignables& alivec, bool validCheck);
 
-  /// write original RigidBodyAlignmentParameters of many Alignables 
+  /// write original RigidBodyAlignmentParameters of many Alignables
   int writeOrigRigidBody(const align::Alignables& alivec, bool validCheck);
 
-  /// read AlignmentParameters of many Alignables 
+  /// read AlignmentParameters of many Alignables
   align::Parameters read(const align::Alignables& alivec, int& ierr);
-
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIORoot.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIORoot.h
index ea72c84f5678e..3a84070b539d1 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIORoot.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIORoot.h
@@ -3,7 +3,7 @@
 
 /// \class AlignmentParametersIORoot
 ///
-/// Concrete class for ROOT-based I/O of AlignmentParameters 
+/// Concrete class for ROOT-based I/O of AlignmentParameters
 ///
 ///  $Date: 2008/09/02 15:31:23 $
 ///  $Revision: 1.6 $
@@ -13,26 +13,25 @@
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentIORootBase.h"
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIO.h"
 
-class AlignmentParametersIORoot : public AlignmentIORootBase, public AlignmentParametersIO
-{
+class AlignmentParametersIORoot : public AlignmentIORootBase, public AlignmentParametersIO {
   friend class AlignmentIORoot;
 
-  private:
+private:
+  /// Constructor
+  AlignmentParametersIORoot();
 
-  /// Constructor 
-  AlignmentParametersIORoot(); 
-
-  /// Write AlignmentParameters of one Alignable 
+  /// Write AlignmentParameters of one Alignable
   int writeOne(Alignable* ali) override;
 
-  /// Read AlignmentParameters of one Alignable 
+  /// Read AlignmentParameters of one Alignable
   AlignmentParameters* readOne(Alignable* ali, int& ierr) override;
 
-  /// Open IO 
-  int open(const char* filename, int iteration, bool writemode) override
-    {return openRoot(filename,iteration,writemode);};
+  /// Open IO
+  int open(const char* filename, int iteration, bool writemode) override {
+    return openRoot(filename, iteration, writemode);
+  };
 
-  /// Close IO 
+  /// Close IO
   int close(void) override;
 
   // helper functions
@@ -47,13 +46,12 @@ class AlignmentParametersIORoot : public AlignmentIORootBase, public AlignmentPa
   /// Set branch adresses
   void setBranchAddresses(void) override;
 
-  // Alignment parameter tree 
+  // Alignment parameter tree
   int theCovRang, theCovarRang, theHieraLevel, theParamType;
   align::ID theId;
   align::StructureType theObjId;
 
-  double thePar[nParMax],theCov[nParMax*(nParMax+1)/2];
-
+  double thePar[nParMax], theCov[nParMax * (nParMax + 1) / 2];
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentUserVariablesIO.h b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentUserVariablesIO.h
index ca0c1ea79acc0..822e8a7fb61bd 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/AlignmentUserVariablesIO.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/AlignmentUserVariablesIO.h
@@ -14,32 +14,28 @@
 
 class AlignmentUserVariables;
 
-class AlignmentUserVariablesIO 
-{
-
-  protected:
-
+class AlignmentUserVariablesIO {
+protected:
   virtual ~AlignmentUserVariablesIO() {}
 
   /** open IO */
-  virtual int open(const char* filename, int iteration, bool writemode) =0;
+  virtual int open(const char* filename, int iteration, bool writemode) = 0;
 
   /** close IO */
-  virtual int close(void) =0;
+  virtual int close(void) = 0;
 
   /** write AlignmentUserVariables of one Alignable */
-  virtual int writeOne(Alignable* ali) =0;
+  virtual int writeOne(Alignable* ali) = 0;
 
   /** read AlignmentUserVariables of one Alignable,
       object should be created and has to be deleted */
-  virtual AlignmentUserVariables* readOne(Alignable* ali, int& ierr) =0;
+  virtual AlignmentUserVariables* readOne(Alignable* ali, int& ierr) = 0;
 
   /** write AlignmentUserVariables of many Alignables */
   int write(const align::Alignables& alivec, bool validCheck);
 
   /** read AlignmentUserVariables of many Alignables (using readOne, so take care of memory!) */
   std::vector<AlignmentUserVariables*> read(const align::Alignables& alivec, int& ierr);
-
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationBase.h b/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationBase.h
index 83c4add89e01b..20b8a61ab0700 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationBase.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationBase.h
@@ -19,7 +19,6 @@
  *     EventSetup and AlignmentAlgorithmBase::EventInfo.
  */
 
-
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h"
 
 #include <vector>
@@ -33,21 +32,22 @@ class AlignableExtras;
 class TrajectoryStateOnSurface;
 class TrackingRecHit;
 
-namespace edm { class EventSetup; class ParameterSet; } 
+namespace edm {
+  class EventSetup;
+  class ParameterSet;
+}  // namespace edm
 
-class IntegratedCalibrationBase
-{
+class IntegratedCalibrationBase {
 public:
-
   typedef AlignmentAlgorithmBase::EventInfo EventInfo;
-  typedef std::pair<double,double> Values; /// x- and y-values
-  typedef std::pair<Values, unsigned int> ValuesIndexPair; /// Values and their parameter index
+  typedef std::pair<double, double> Values;                 /// x- and y-values
+  typedef std::pair<Values, unsigned int> ValuesIndexPair;  /// Values and their parameter index
 
   /// Constructor
   explicit IntegratedCalibrationBase(const edm::ParameterSet &cfg);
-  
+
   /// Destructor
-  virtual ~IntegratedCalibrationBase() {};
+  virtual ~IntegratedCalibrationBase(){};
 
   /// How many parameters does this calibration define?
   virtual unsigned int numParameters() const = 0;
@@ -56,19 +56,19 @@ class IntegratedCalibrationBase
   /// default implementation uses other derivatives(..) method,
   /// but can be overwritten in derived class for efficiency.
   virtual std::vector<Values> derivatives(const TrackingRecHit &hit,
-					  const TrajectoryStateOnSurface &tsos,
-					  const edm::EventSetup &setup,
-					  const EventInfo &eventInfo) const;
+                                          const TrajectoryStateOnSurface &tsos,
+                                          const edm::EventSetup &setup,
+                                          const EventInfo &eventInfo) const;
 
   /// Return non-zero derivatives for x- (ValuesIndexPair.first.first)
   /// and y-measurement (ValuesIndexPair.first.second) with their
   /// indices (ValuesIndexPair.second) by reference.
   /// Return value is their number.
   virtual unsigned int derivatives(std::vector<ValuesIndexPair> &outDerivInds,
-				   const TrackingRecHit &hit,
-				   const TrajectoryStateOnSurface &tsos,
-				   const edm::EventSetup &setup,
-				   const EventInfo &eventInfo) const = 0;
+                                   const TrackingRecHit &hit,
+                                   const TrajectoryStateOnSurface &tsos,
+                                   const edm::EventSetup &setup,
+                                   const EventInfo &eventInfo) const = 0;
 
   /// Setting the determined parameter identified by index,
   /// should return false if out-of-bounds, true otherwise.
@@ -88,23 +88,21 @@ class IntegratedCalibrationBase
 
   /// Call at beginning of job:
   /// default implementation is dummy, to be overwritten in derived class if useful.
-  virtual void beginOfJob(AlignableTracker *tracker,
-			  AlignableMuon *muon,
-			  AlignableExtras *extras) {};
+  virtual void beginOfJob(AlignableTracker *tracker, AlignableMuon *muon, AlignableExtras *extras){};
 
   /// Call at beginning of run:
   /// default implementation is dummy, to be overwritten in derived class if useful.
-  virtual void beginRun(const edm::Run&, const edm::EventSetup&) {};
+  virtual void beginRun(const edm::Run &, const edm::EventSetup &){};
 
   /// Called at beginning of a loop of the AlignmentProducer,
   /// to be used for iterative algorithms, default does nothing.
   /// FIXME: move call to algorithm?
-  virtual void startNewLoop() {};
+  virtual void startNewLoop(){};
 
   /// Called at end of a loop of the AlignmentProducer,
   /// to be used for iterative algorithms, default does nothing.
   /// FIXME: move call to algorithm?
-  virtual void endOfLoop() {};
+  virtual void endOfLoop(){};
 
   /// Called at end of a the job of the AlignmentProducer.
   /// Do here the necessary stuff with the results that should have been passed
@@ -125,10 +123,10 @@ class IntegratedCalibrationBase
   /* virtual void endLuminosityBlock(const edm::EventSetup &setup) {}; */
 
   /// name of this calibration
-  const std::string& name() const { return name_;} // non-virtual since refering to private member
+  const std::string &name() const { return name_; }  // non-virtual since refering to private member
 
- private:
-  const std::string name_; /// name of this calibration (i.e. defining plugin)
+private:
+  const std::string name_;  /// name of this calibration (i.e. defining plugin)
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationPluginFactory.h b/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationPluginFactory.h
index babfc740cfd1a..a1b34c9fc732c 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationPluginFactory.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationPluginFactory.h
@@ -13,7 +13,7 @@
 #include "FWCore/PluginManager/interface/PluginFactory.h"
 #include "Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationBase.h"
 
-typedef edmplugin::PluginFactory<IntegratedCalibrationBase* (const edm::ParameterSet&)>
-		  IntegratedCalibrationPluginFactory;
+typedef edmplugin::PluginFactory<IntegratedCalibrationBase*(const edm::ParameterSet&)>
+    IntegratedCalibrationPluginFactory;
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/SelectionUserVariables.h b/Alignment/CommonAlignmentAlgorithm/interface/SelectionUserVariables.h
index c351fffe94e9e..61f3f1a112dc2 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/SelectionUserVariables.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/SelectionUserVariables.h
@@ -19,17 +19,16 @@
 
 #include <vector>
 
-class SelectionUserVariables : public AlignmentUserVariables 
-{
- public:
-  explicit SelectionUserVariables(const std::vector<char> &sel) : myFullSelection(sel) {}
+class SelectionUserVariables : public AlignmentUserVariables {
+public:
+  explicit SelectionUserVariables(const std::vector<char>& sel) : myFullSelection(sel) {}
   ~SelectionUserVariables() override {}
-  SelectionUserVariables* clone() const override { return new SelectionUserVariables(*this);}
+  SelectionUserVariables* clone() const override { return new SelectionUserVariables(*this); }
 
-  const std::vector<char>& fullSelection() const {return myFullSelection;}
+  const std::vector<char>& fullSelection() const { return myFullSelection; }
 
- private:
-  std::vector<char>  myFullSelection;
+private:
+  std::vector<char> myFullSelection;
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/interface/TkModuleGroupSelector.h b/Alignment/CommonAlignmentAlgorithm/interface/TkModuleGroupSelector.h
index ab5b71e71ca0b..cb955a6e410fb 100644
--- a/Alignment/CommonAlignmentAlgorithm/interface/TkModuleGroupSelector.h
+++ b/Alignment/CommonAlignmentAlgorithm/interface/TkModuleGroupSelector.h
@@ -23,23 +23,24 @@
 #include <map>
 #include <list>
 
-
 class AlignableTracker;
 class AlignableMuon;
 class AlignableExtras;
 
-namespace edm { class EventSetup; class ParameterSet; } 
+namespace edm {
+  class EventSetup;
+  class ParameterSet;
+}  // namespace edm
 
-class TkModuleGroupSelector
-{
+class TkModuleGroupSelector {
 public:
   /// Constructor
   explicit TkModuleGroupSelector(AlignableTracker *aliTracker,
                                  const edm::ParameterSet &cfg,
                                  const std::vector<int> &sdets);
-  
+
   /// Destructor
-  virtual ~TkModuleGroupSelector() {};
+  virtual ~TkModuleGroupSelector(){};
 
   // Returns the number of parameters.
   unsigned int getNumberOfParameters() const;
@@ -53,28 +54,27 @@ class TkModuleGroupSelector
   /// Index of parameter for given detId (detId not treated => < 0)
   /// and the given run.
   int getParameterIndexFromDetId(unsigned int detId, edm::RunNumber_t run) const;
-  
- private:
+
+private:
   // Constructs the run-dependent module groups from configuration parameters.
   void createModuleGroups(AlignableTracker *aliTracker,
                           const edm::VParameterSet &granularityConfig,
                           const std::vector<edm::RunNumber_t> &defaultRunRange,
                           edm::RunNumber_t defaultReferenceRun);
-                    
+
   // Method used to test the provided configuration for unknown parameters
   void verifyParameterNames(const edm::ParameterSet &pset, unsigned int psetnr) const;
-  
+
   // Method to test whether the split option has been turned on
   const bool testSplitOption(const edm::ParameterSet &pset) const;
 
   // Add modules to a specific group which is also created in this function.
-  bool createGroup(
-                   unsigned int &Id, //id of the first run
-                   const std::vector<edm::RunNumber_t> &range, //run range
-                   const std::list<Alignable*> &selected_alis, //list of alignables for which a group is created
-                   const edm::RunNumber_t refrun //reference run number
-                   );
-  
+  bool createGroup(unsigned int &Id,                             //id of the first run
+                   const std::vector<edm::RunNumber_t> &range,   //run range
+                   const std::list<Alignable *> &selected_alis,  //list of alignables for which a group is created
+                   const edm::RunNumber_t refrun                 //reference run number
+  );
+
   // Fill the container which is a map between the det id and the id of the group
   // to which the module belongs.
   void fillDetIdMap(const unsigned int detid, const unsigned int groupid);
@@ -100,7 +100,6 @@ class TkModuleGroupSelector
 
   // Reference run per module group
   std::vector<edm::RunNumber_t> referenceRun_;
-  
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/ApeSettingAlgorithm.cc b/Alignment/CommonAlignmentAlgorithm/plugins/ApeSettingAlgorithm.cc
index 6a2970951c3ad..bc389013223ba 100644
--- a/Alignment/CommonAlignmentAlgorithm/plugins/ApeSettingAlgorithm.cc
+++ b/Alignment/CommonAlignmentAlgorithm/plugins/ApeSettingAlgorithm.cc
@@ -1,4 +1,4 @@
- /**
+/**
  * \file MillePedeAlignmentAlgorithm.cc
  *
  *  \author    : Gero Flucke/Ivan Reid
@@ -33,7 +33,7 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h" 
+#include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
 #include "DataFormats/GeometrySurface/interface/GloballyPositioned.h"
 #include "CLHEP/Matrix/SymMatrix.h"
 
@@ -57,9 +57,8 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-class ApeSettingAlgorithm : public AlignmentAlgorithmBase
-{
- public:
+class ApeSettingAlgorithm : public AlignmentAlgorithmBase {
+public:
   /// Constructor
   ApeSettingAlgorithm(const edm::ParameterSet &cfg);
 
@@ -67,23 +66,25 @@ class ApeSettingAlgorithm : public AlignmentAlgorithmBase
   ~ApeSettingAlgorithm() override;
 
   /// Call at beginning of job
-  void initialize(const edm::EventSetup &setup, 
-			  AlignableTracker *tracker, AlignableMuon *muon, AlignableExtras *extras,
-			  AlignmentParameterStore *store) override;
+  void initialize(const edm::EventSetup &setup,
+                  AlignableTracker *tracker,
+                  AlignableMuon *muon,
+                  AlignableExtras *extras,
+                  AlignmentParameterStore *store) override;
 
   /// Call at end of job
-  void terminate(const edm::EventSetup& iSetup) override;
+  void terminate(const edm::EventSetup &iSetup) override;
 
   /// Run the algorithm
   void run(const edm::EventSetup &setup, const EventInfo &eventInfo) override;
 
- private:
-  edm::ParameterSet         theConfig;
-  AlignableNavigator       *theAlignableNavigator;
-  AlignableTracker         *theTracker;
-  bool                     saveApeToAscii_,readApeFromAscii_,readFullLocalMatrix_;
-  bool                     readLocalNotGlobal_,saveLocalNotGlobal_;
-  bool                     setComposites_,saveComposites_;
+private:
+  edm::ParameterSet theConfig;
+  AlignableNavigator *theAlignableNavigator;
+  AlignableTracker *theTracker;
+  bool saveApeToAscii_, readApeFromAscii_, readFullLocalMatrix_;
+  bool readLocalNotGlobal_, saveLocalNotGlobal_;
+  bool setComposites_, saveComposites_;
 };
 
 //____________________________________________________
@@ -91,14 +92,12 @@ class ApeSettingAlgorithm : public AlignmentAlgorithmBase
 //____________________________________________________
 //____________________________________________________
 
-
 // Constructor ----------------------------------------------------------------
 //____________________________________________________
-ApeSettingAlgorithm::ApeSettingAlgorithm(const edm::ParameterSet &cfg) :
-  AlignmentAlgorithmBase(cfg), theConfig(cfg),
-  theAlignableNavigator(nullptr)
-{
-  edm::LogInfo("Alignment") << "@SUB=ApeSettingAlgorithm" << "Start.";
+ApeSettingAlgorithm::ApeSettingAlgorithm(const edm::ParameterSet &cfg)
+    : AlignmentAlgorithmBase(cfg), theConfig(cfg), theAlignableNavigator(nullptr) {
+  edm::LogInfo("Alignment") << "@SUB=ApeSettingAlgorithm"
+                            << "Start.";
   saveApeToAscii_ = theConfig.getUntrackedParameter<bool>("saveApeToASCII");
   saveComposites_ = theConfig.getUntrackedParameter<bool>("saveComposites");
   saveLocalNotGlobal_ = theConfig.getUntrackedParameter<bool>("saveLocalNotGlobal");
@@ -106,121 +105,145 @@ ApeSettingAlgorithm::ApeSettingAlgorithm(const edm::ParameterSet &cfg) :
   readLocalNotGlobal_ = theConfig.getParameter<bool>("readLocalNotGlobal");
   readFullLocalMatrix_ = theConfig.getParameter<bool>("readFullLocalMatrix");
   setComposites_ = theConfig.getParameter<bool>("setComposites");
-  
 }
 
 // Destructor ----------------------------------------------------------------
 //____________________________________________________
-ApeSettingAlgorithm::~ApeSettingAlgorithm()
-{
-  delete theAlignableNavigator;
-}
+ApeSettingAlgorithm::~ApeSettingAlgorithm() { delete theAlignableNavigator; }
 
 // Call at beginning of job ---------------------------------------------------
 //____________________________________________________
-void ApeSettingAlgorithm::initialize(const edm::EventSetup &setup, 
-				     AlignableTracker *tracker, AlignableMuon *muon, AlignableExtras *extras,
-				     AlignmentParameterStore *store)
-{
- theAlignableNavigator = new AlignableNavigator(tracker, muon);
- theTracker = tracker;
- 
- if (readApeFromAscii_)
-   { std::ifstream apeReadFile(theConfig.getParameter<edm::FileInPath>("apeASCIIReadFile").fullPath().c_str()); //requires <fstream>
-   if (!apeReadFile.good())
-     { edm::LogInfo("Alignment") << "@SUB=initialize" <<"Problem opening APE file: skipping"
-				 << theConfig.getParameter<edm::FileInPath>("apeASCIIReadFile").fullPath();
-     return;
-     }
-   std::set<int> apeList; //To avoid duplicates
-   while (!apeReadFile.eof())
-     { int apeId=0; double x11,x21,x22,x31,x32,x33,ignore;
-     if (!readLocalNotGlobal_ || readFullLocalMatrix_) 
-       { apeReadFile>>apeId>>x11>>x21>>x22>>x31>>x32>>x33>>ignore>>ignore>>ignore>>ignore>>ignore>>ignore>>ignore>>ignore>>ignore>>ignore>>ignore>>ignore>>ignore>>ignore>>ignore>>std::ws;}
-     else
-       { apeReadFile>>apeId>>x11>>x22>>x33>>std::ws;}
-     //idr What sanity checks do we need to put here?
-     if (apeId != 0) //read appears valid?
-       { if (apeList.find(apeId) == apeList.end()) //Not previously done
-	 {  DetId id(apeId);
-	 AlignableDetOrUnitPtr alidet(theAlignableNavigator->alignableFromDetId(id)); //NULL if none
-	 if (alidet)
-	   { if ((alidet->components().empty()) || setComposites_) //the problem with glued dets...
-	     { GlobalErrorExtended globErr;
-	     if (readLocalNotGlobal_)
-	       { AlgebraicSymMatrix33 as; 
-	       if (readFullLocalMatrix_)
-		 { as[0][0]=x11; as[1][0]=x21; as[1][1]=x22;
-		 as[2][0]=x31; as[2][1]=x32; as[2][2]=x33;
-		 }
-	       else
-	         { as[0][0]=x11*x11; as[1][1]=x22*x22; as[2][2]=x33*x33;} //local cov.
-	       align::RotationType rt=alidet->globalRotation();
-	       AlgebraicMatrix33 am;
-	       am[0][0]=rt.xx(); am[0][1]=rt.xy(); am[0][2]=rt.xz();
-	       am[1][0]=rt.yx(); am[1][1]=rt.yy(); am[1][2]=rt.yz();
-	       am[2][0]=rt.zx(); am[2][1]=rt.zy(); am[2][2]=rt.zz();
-	       globErr = GlobalErrorExtended(ROOT::Math::SimilarityT(am,as));
-	       }
-	     else
-	       {
-                 if (readFullLocalMatrix_)
-		    globErr = GlobalErrorExtended(x11,x21,x31,0,0,0,x22,x32,0,0,0,x33,0,0,0,0,0,0,0,0,0);
-                 else {
-                    globErr = GlobalErrorExtended(x11*x11,0,0,0,0,0,x22*x22,0,0,0,0,x33*x33,0,0,0,0,0,0,0,0,0);
-                  }
-	       }
-	     alidet->setAlignmentPositionError(globErr, false); // do not propagate down!
-	     apeList.insert(apeId); //Flag it's been set
-	     }
-	   else
-	     { edm::LogInfo("Alignment") << "@SUB=initialize" << "Not Setting APE for Composite DetId "<<apeId;
-	     }
-	   }
-	 }
-       else
-	 { edm::LogInfo("Alignment") << "@SUB=initialize" << "Skipping duplicate APE for DetId "<<apeId;
-	 }
-       }
-     }
-   apeReadFile.close();
-   edm::LogInfo("Alignment") << "@SUB=initialize" << "Set "<<apeList.size()<<" APE values.";
-   }
+void ApeSettingAlgorithm::initialize(const edm::EventSetup &setup,
+                                     AlignableTracker *tracker,
+                                     AlignableMuon *muon,
+                                     AlignableExtras *extras,
+                                     AlignmentParameterStore *store) {
+  theAlignableNavigator = new AlignableNavigator(tracker, muon);
+  theTracker = tracker;
+
+  if (readApeFromAscii_) {
+    std::ifstream apeReadFile(
+        theConfig.getParameter<edm::FileInPath>("apeASCIIReadFile").fullPath().c_str());  //requires <fstream>
+    if (!apeReadFile.good()) {
+      edm::LogInfo("Alignment") << "@SUB=initialize"
+                                << "Problem opening APE file: skipping"
+                                << theConfig.getParameter<edm::FileInPath>("apeASCIIReadFile").fullPath();
+      return;
+    }
+    std::set<int> apeList;  //To avoid duplicates
+    while (!apeReadFile.eof()) {
+      int apeId = 0;
+      double x11, x21, x22, x31, x32, x33, ignore;
+      if (!readLocalNotGlobal_ || readFullLocalMatrix_) {
+        apeReadFile >> apeId >> x11 >> x21 >> x22 >> x31 >> x32 >> x33 >> ignore >> ignore >> ignore >> ignore >>
+            ignore >> ignore >> ignore >> ignore >> ignore >> ignore >> ignore >> ignore >> ignore >> ignore >>
+            ignore >> std::ws;
+      } else {
+        apeReadFile >> apeId >> x11 >> x22 >> x33 >> std::ws;
+      }
+      //idr What sanity checks do we need to put here?
+      if (apeId != 0)  //read appears valid?
+      {
+        if (apeList.find(apeId) == apeList.end())  //Not previously done
+        {
+          DetId id(apeId);
+          AlignableDetOrUnitPtr alidet(theAlignableNavigator->alignableFromDetId(id));  //NULL if none
+          if (alidet) {
+            if ((alidet->components().empty()) || setComposites_)  //the problem with glued dets...
+            {
+              GlobalErrorExtended globErr;
+              if (readLocalNotGlobal_) {
+                AlgebraicSymMatrix33 as;
+                if (readFullLocalMatrix_) {
+                  as[0][0] = x11;
+                  as[1][0] = x21;
+                  as[1][1] = x22;
+                  as[2][0] = x31;
+                  as[2][1] = x32;
+                  as[2][2] = x33;
+                } else {
+                  as[0][0] = x11 * x11;
+                  as[1][1] = x22 * x22;
+                  as[2][2] = x33 * x33;
+                }  //local cov.
+                align::RotationType rt = alidet->globalRotation();
+                AlgebraicMatrix33 am;
+                am[0][0] = rt.xx();
+                am[0][1] = rt.xy();
+                am[0][2] = rt.xz();
+                am[1][0] = rt.yx();
+                am[1][1] = rt.yy();
+                am[1][2] = rt.yz();
+                am[2][0] = rt.zx();
+                am[2][1] = rt.zy();
+                am[2][2] = rt.zz();
+                globErr = GlobalErrorExtended(ROOT::Math::SimilarityT(am, as));
+              } else {
+                if (readFullLocalMatrix_)
+                  globErr =
+                      GlobalErrorExtended(x11, x21, x31, 0, 0, 0, x22, x32, 0, 0, 0, x33, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+                else {
+                  globErr = GlobalErrorExtended(
+                      x11 * x11, 0, 0, 0, 0, 0, x22 * x22, 0, 0, 0, 0, x33 * x33, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+                }
+              }
+              alidet->setAlignmentPositionError(globErr, false);  // do not propagate down!
+              apeList.insert(apeId);                              //Flag it's been set
+            } else {
+              edm::LogInfo("Alignment") << "@SUB=initialize"
+                                        << "Not Setting APE for Composite DetId " << apeId;
+            }
+          }
+        } else {
+          edm::LogInfo("Alignment") << "@SUB=initialize"
+                                    << "Skipping duplicate APE for DetId " << apeId;
+        }
+      }
+    }
+    apeReadFile.close();
+    edm::LogInfo("Alignment") << "@SUB=initialize"
+                              << "Set " << apeList.size() << " APE values.";
+  }
 }
- 
 
 // Call at end of job ---------------------------------------------------------
 //____________________________________________________
-void ApeSettingAlgorithm::terminate(const edm::EventSetup& iSetup)
-{
-  if (saveApeToAscii_)
-    { AlignmentErrorsExtended* aliErr=theTracker->alignmentErrors();
-    int theSize=aliErr->m_alignError.size();
-    std::ofstream apeSaveFile(theConfig.getUntrackedParameter<std::string>("apeASCIISaveFile").c_str()); //requires <fstream>
-    for (int i=0; i < theSize; ++i)
-      { int id=	aliErr->m_alignError[i].rawId();
-      AlignableDetOrUnitPtr alidet(theAlignableNavigator->alignableFromDetId(DetId(id))); //NULL if none
-      if (alidet && ((alidet->components().empty()) || saveComposites_))
-	{ apeSaveFile<<id;
-	CLHEP::HepSymMatrix sm = aliErr->m_alignError[i].matrix();
-	if (saveLocalNotGlobal_)
-	  { align::RotationType rt=alidet->globalRotation();
-	  AlgebraicMatrix am(3,3);
-	  am[0][0]=rt.xx(); am[0][1]=rt.xy(); am[0][2]=rt.xz();
-	  am[1][0]=rt.yx(); am[1][1]=rt.yy(); am[1][2]=rt.yz();
-	  am[2][0]=rt.zx(); am[2][1]=rt.zy(); am[2][2]=rt.zz();
-	  sm=sm.similarity(am); //symmetric matrix
-	  } //transform to local
-	for (int j=0; j < sm.num_row(); ++j)
-	  for (int k=0; k <= j; ++k)
-	    apeSaveFile<<"  "<<sm[j][k]; //always write full matrix
-	
-	apeSaveFile<<std::endl;
-	}
+void ApeSettingAlgorithm::terminate(const edm::EventSetup &iSetup) {
+  if (saveApeToAscii_) {
+    AlignmentErrorsExtended *aliErr = theTracker->alignmentErrors();
+    int theSize = aliErr->m_alignError.size();
+    std::ofstream apeSaveFile(
+        theConfig.getUntrackedParameter<std::string>("apeASCIISaveFile").c_str());  //requires <fstream>
+    for (int i = 0; i < theSize; ++i) {
+      int id = aliErr->m_alignError[i].rawId();
+      AlignableDetOrUnitPtr alidet(theAlignableNavigator->alignableFromDetId(DetId(id)));  //NULL if none
+      if (alidet && ((alidet->components().empty()) || saveComposites_)) {
+        apeSaveFile << id;
+        CLHEP::HepSymMatrix sm = aliErr->m_alignError[i].matrix();
+        if (saveLocalNotGlobal_) {
+          align::RotationType rt = alidet->globalRotation();
+          AlgebraicMatrix am(3, 3);
+          am[0][0] = rt.xx();
+          am[0][1] = rt.xy();
+          am[0][2] = rt.xz();
+          am[1][0] = rt.yx();
+          am[1][1] = rt.yy();
+          am[1][2] = rt.yz();
+          am[2][0] = rt.zx();
+          am[2][1] = rt.zy();
+          am[2][2] = rt.zz();
+          sm = sm.similarity(am);  //symmetric matrix
+        }                          //transform to local
+        for (int j = 0; j < sm.num_row(); ++j)
+          for (int k = 0; k <= j; ++k)
+            apeSaveFile << "  " << sm[j][k];  //always write full matrix
+
+        apeSaveFile << std::endl;
       }
+    }
     delete aliErr;
     apeSaveFile.close();
-    }
+  }
   // clean up at end:  // FIXME: should we delete here or in destructor?
   delete theAlignableNavigator;
   theAlignableNavigator = nullptr;
@@ -228,11 +251,9 @@ void ApeSettingAlgorithm::terminate(const edm::EventSetup& iSetup)
 
 // Run the algorithm on trajectories and tracks -------------------------------
 //____________________________________________________
-void ApeSettingAlgorithm::run(const edm::EventSetup &setup, const EventInfo &eventInfo)
-{
+void ApeSettingAlgorithm::run(const edm::EventSetup &setup, const EventInfo &eventInfo) {
   // nothing to do here?
 }
 
 // Plugin definition for the algorithm
-DEFINE_EDM_PLUGIN(AlignmentAlgorithmPluginFactory,
-		   ApeSettingAlgorithm, "ApeSettingAlgorithm");
+DEFINE_EDM_PLUGIN(AlignmentAlgorithmPluginFactory, ApeSettingAlgorithm, "ApeSettingAlgorithm");
diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/SiPixelLorentzAngleCalibration.cc b/Alignment/CommonAlignmentAlgorithm/plugins/SiPixelLorentzAngleCalibration.cc
index a978ff71d11c8..2b42e4ef29db2 100644
--- a/Alignment/CommonAlignmentAlgorithm/plugins/SiPixelLorentzAngleCalibration.cc
+++ b/Alignment/CommonAlignmentAlgorithm/plugins/SiPixelLorentzAngleCalibration.cc
@@ -51,8 +51,7 @@
 #include <memory>
 #include <functional>
 
-class SiPixelLorentzAngleCalibration : public IntegratedCalibrationBase
-{
+class SiPixelLorentzAngleCalibration : public IntegratedCalibrationBase {
 public:
   /// Constructor
   explicit SiPixelLorentzAngleCalibration(const edm::ParameterSet &cfg);
@@ -88,12 +87,10 @@ class SiPixelLorentzAngleCalibration : public IntegratedCalibrationBase
   double getParameterError(unsigned int index) const override;
 
   /// Call at beginning of job:
-  void beginOfJob(AlignableTracker *tracker,
-                  AlignableMuon *muon,
-                  AlignableExtras *extras) override;
+  void beginOfJob(AlignableTracker *tracker, AlignableMuon *muon, AlignableExtras *extras) override;
 
   /// Call at beginning of run:
-  void beginRun(const edm::Run&, const edm::EventSetup&) override;
+  void beginRun(const edm::Run &, const edm::EventSetup &) override;
 
   /// Called at end of a the job of the AlignmentProducer.
   /// Write out determined parameters.
@@ -103,14 +100,14 @@ class SiPixelLorentzAngleCalibration : public IntegratedCalibrationBase
   /// Input LorentzAngle values:
   /// - either from EventSetup of first call to derivatives(..)
   /// - or created from files of passed by configuration (i.e. from parallel processing)
-  const SiPixelLorentzAngle* getLorentzAnglesInput(const align::RunNumber& = 0);
+  const SiPixelLorentzAngle *getLorentzAnglesInput(const align::RunNumber & = 0);
 
   /// Determined parameter value for this detId (detId not treated => 0.)
   /// and the given run.
   double getParameterForDetId(unsigned int detId, edm::RunNumber_t run) const;
 
   void writeTree(const SiPixelLorentzAngle *lorentzAngle,
-                 const std::map<unsigned int,TreeStruct>& treeInfo,
+                 const std::map<unsigned int, TreeStruct> &treeInfo,
                  const char *treeName) const;
   SiPixelLorentzAngle createFromTree(const char *fileName, const char *treeName) const;
 
@@ -124,7 +121,7 @@ class SiPixelLorentzAngleCalibration : public IntegratedCalibrationBase
 
   // const AlignableTracker *alignableTracker_;
   std::map<align::RunNumber, SiPixelLorentzAngle> cachedLorentzAngleInputs_;
-  SiPixelLorentzAngle* siPixelLorentzAngleInput_{nullptr};
+  SiPixelLorentzAngle *siPixelLorentzAngleInput_{nullptr};
   align::RunNumber currentIOV_{0};
   std::vector<double> parameters_;
   std::vector<double> paramUncertainties_;
@@ -138,37 +135,29 @@ class SiPixelLorentzAngleCalibration : public IntegratedCalibrationBase
 //======================================================================
 
 SiPixelLorentzAngleCalibration::SiPixelLorentzAngleCalibration(const edm::ParameterSet &cfg)
-  : IntegratedCalibrationBase(cfg),
-    saveToDB_(cfg.getParameter<bool>("saveToDB")),
-    recordNameDBwrite_(cfg.getParameter<std::string>("recordNameDBwrite")),
-    outFileName_(cfg.getParameter<std::string>("treeFile")),
-    mergeFileNames_(cfg.getParameter<std::vector<std::string> >("mergeTreeFiles")),
-    lorentzAngleLabel_(cfg.getParameter<std::string>("lorentzAngleLabel")),
-    moduleGroupSelCfg_(cfg.getParameter<edm::ParameterSet>("LorentzAngleModuleGroups"))
-{
-
-}
+    : IntegratedCalibrationBase(cfg),
+      saveToDB_(cfg.getParameter<bool>("saveToDB")),
+      recordNameDBwrite_(cfg.getParameter<std::string>("recordNameDBwrite")),
+      outFileName_(cfg.getParameter<std::string>("treeFile")),
+      mergeFileNames_(cfg.getParameter<std::vector<std::string> >("mergeTreeFiles")),
+      lorentzAngleLabel_(cfg.getParameter<std::string>("lorentzAngleLabel")),
+      moduleGroupSelCfg_(cfg.getParameter<edm::ParameterSet>("LorentzAngleModuleGroups")) {}
 
 //======================================================================
-unsigned int SiPixelLorentzAngleCalibration::numParameters() const
-{
-  return parameters_.size();
-}
+unsigned int SiPixelLorentzAngleCalibration::numParameters() const { return parameters_.size(); }
 
 //======================================================================
-void
-SiPixelLorentzAngleCalibration::beginRun(const edm::Run& run,
-                                         const edm::EventSetup& setup) {
-
+void SiPixelLorentzAngleCalibration::beginRun(const edm::Run &run, const edm::EventSetup &setup) {
   // no action needed if the LA record didn't change
-  if (!(watchLorentzAngleRcd_.check(setup))) return;
+  if (!(watchLorentzAngleRcd_.check(setup)))
+    return;
 
   const auto runNumber = run.run();
   auto firstRun = cond::timeTypeSpecs[cond::runnumber].beginValue;
 
   // avoid infinite loop due to wrap-around of unsigned variable 'i' including
   // arrow from i to zero and a nice smiley ;)
-  for (unsigned int i = moduleGroupSelector_->numIovs(); i-->0 ;) {
+  for (unsigned int i = moduleGroupSelector_->numIovs(); i-- > 0;) {
     const auto firstRunOfIOV = moduleGroupSelector_->firstRunOfIOV(i);
     if (runNumber >= firstRunOfIOV) {
       firstRun = firstRunOfIOV;
@@ -177,24 +166,22 @@ SiPixelLorentzAngleCalibration::beginRun(const edm::Run& run,
   }
 
   edm::ESHandle<SiPixelLorentzAngle> lorentzAngleHandle;
-  const auto& lorentzAngleRcd = setup.get<SiPixelLorentzAngleRcd>();
+  const auto &lorentzAngleRcd = setup.get<SiPixelLorentzAngleRcd>();
   lorentzAngleRcd.get(lorentzAngleLabel_, lorentzAngleHandle);
   if (cachedLorentzAngleInputs_.find(firstRun) == cachedLorentzAngleInputs_.end()) {
     cachedLorentzAngleInputs_.emplace(firstRun, SiPixelLorentzAngle(*lorentzAngleHandle));
   } else {
     if (lorentzAngleRcd.validityInterval().first().eventID().run() > firstRun &&
-        lorentzAngleHandle->getLorentzAngles()  // only bad if non-identical values
-        != cachedLorentzAngleInputs_[firstRun].getLorentzAngles()) { // (comparing maps)
+        lorentzAngleHandle->getLorentzAngles()                            // only bad if non-identical values
+            != cachedLorentzAngleInputs_[firstRun].getLorentzAngles()) {  // (comparing maps)
       // Maps are containers sorted by key, but comparison problems may arise from
       // 'floating point comparison' problems (FIXME?)
-      throw cms::Exception("BadInput")
-        << "Trying to cache SiPixelLorentzAngle payload for a run (" << runNumber
-        << ") in an IOV (" << firstRun << ") that was already cached.\n"
-        << "The following record in your input database tag has an IOV "
-        << "boundary that does not match your IOV definition:\n"
-        << " - SiPixelLorentzAngleRcd '" << lorentzAngleRcd.key().name()
-        << "' (since "
-        << lorentzAngleRcd.validityInterval().first().eventID().run() << ")\n";
+      throw cms::Exception("BadInput") << "Trying to cache SiPixelLorentzAngle payload for a run (" << runNumber
+                                       << ") in an IOV (" << firstRun << ") that was already cached.\n"
+                                       << "The following record in your input database tag has an IOV "
+                                       << "boundary that does not match your IOV definition:\n"
+                                       << " - SiPixelLorentzAngleRcd '" << lorentzAngleRcd.key().name() << "' (since "
+                                       << lorentzAngleRcd.validityInterval().first().eventID().run() << ")\n";
     }
   }
 
@@ -203,31 +190,29 @@ SiPixelLorentzAngleCalibration::beginRun(const edm::Run& run,
 }
 
 //======================================================================
-unsigned int
-SiPixelLorentzAngleCalibration::derivatives(std::vector<ValuesIndexPair> &outDerivInds,
-                                            const TransientTrackingRecHit &hit,
-                                            const TrajectoryStateOnSurface &tsos,
-                                            const edm::EventSetup &setup,
-                                            const EventInfo &eventInfo) const
-{
+unsigned int SiPixelLorentzAngleCalibration::derivatives(std::vector<ValuesIndexPair> &outDerivInds,
+                                                         const TransientTrackingRecHit &hit,
+                                                         const TrajectoryStateOnSurface &tsos,
+                                                         const edm::EventSetup &setup,
+                                                         const EventInfo &eventInfo) const {
   outDerivInds.clear();
 
-  if (hit.det()) { // otherwise 'constraint hit' or whatever
+  if (hit.det()) {  // otherwise 'constraint hit' or whatever
 
-    const int index = moduleGroupSelector_->getParameterIndexFromDetId(hit.det()->geographicalId(),
-                                                                       eventInfo.eventId().run());
-    if (index >= 0) { // otherwise not treated
+    const int index =
+        moduleGroupSelector_->getParameterIndexFromDetId(hit.det()->geographicalId(), eventInfo.eventId().run());
+    if (index >= 0) {  // otherwise not treated
       edm::ESHandle<MagneticField> magneticField;
       setup.get<IdealMagneticFieldRecord>().get(magneticField);
       const GlobalVector bField(magneticField->inTesla(hit.det()->surface().position()));
       const LocalVector bFieldLocal(hit.det()->surface().toLocal(bField));
-      const double dZ = hit.det()->surface().bounds().thickness(); // it is a float only...
+      const double dZ = hit.det()->surface().bounds().thickness();  // it is a float only...
       // shift due to LA: dx = tan(LA) * dz/2 = mobility * B_y * dz/2,
       // shift due to LA: dy = - mobility * B_x * dz/2,
       // '-' since we have derivative of the residual r = trk -hit
-      const double xDerivative = bFieldLocal.y() * dZ * -0.5; // parameter is mobility!
-      const double yDerivative = bFieldLocal.x() * dZ * 0.5; // parameter is mobility!
-      if (xDerivative || yDerivative) { // If field is zero, this is zero: do not return it
+      const double xDerivative = bFieldLocal.y() * dZ * -0.5;  // parameter is mobility!
+      const double yDerivative = bFieldLocal.x() * dZ * 0.5;   // parameter is mobility!
+      if (xDerivative || yDerivative) {                        // If field is zero, this is zero: do not return it
         const Values derivs{xDerivative, yDerivative};
         outDerivInds.push_back(ValuesIndexPair(derivs, index));
       }
@@ -241,8 +226,7 @@ SiPixelLorentzAngleCalibration::derivatives(std::vector<ValuesIndexPair> &outDer
 }
 
 //======================================================================
-bool SiPixelLorentzAngleCalibration::setParameter(unsigned int index, double value)
-{
+bool SiPixelLorentzAngleCalibration::setParameter(unsigned int index, double value) {
   if (index >= parameters_.size()) {
     return false;
   } else {
@@ -252,8 +236,7 @@ bool SiPixelLorentzAngleCalibration::setParameter(unsigned int index, double val
 }
 
 //======================================================================
-bool SiPixelLorentzAngleCalibration::setParameterError(unsigned int index, double error)
-{
+bool SiPixelLorentzAngleCalibration::setParameterError(unsigned int index, double error) {
   if (index >= paramUncertainties_.size()) {
     return false;
   } else {
@@ -263,38 +246,31 @@ bool SiPixelLorentzAngleCalibration::setParameterError(unsigned int index, doubl
 }
 
 //======================================================================
-double SiPixelLorentzAngleCalibration::getParameter(unsigned int index) const
-{
+double SiPixelLorentzAngleCalibration::getParameter(unsigned int index) const {
   return (index >= parameters_.size() ? 0. : parameters_[index]);
 }
 
 //======================================================================
-double SiPixelLorentzAngleCalibration::getParameterError(unsigned int index) const
-{
+double SiPixelLorentzAngleCalibration::getParameterError(unsigned int index) const {
   return (index >= paramUncertainties_.size() ? 0. : paramUncertainties_[index]);
 }
 
-
-
-
 //======================================================================
 void SiPixelLorentzAngleCalibration::beginOfJob(AlignableTracker *aliTracker,
                                                 AlignableMuon * /*aliMuon*/,
-                                                AlignableExtras * /*aliExtras*/)
-{
+                                                AlignableExtras * /*aliExtras*/) {
   //specify the sub-detectors for which the LA is determined
   const std::vector<int> sdets = {PixelSubdetector::PixelBarrel, PixelSubdetector::PixelEndcap};
 
-  moduleGroupSelector_ =
-    std::make_unique<TkModuleGroupSelector>(aliTracker, moduleGroupSelCfg_, sdets);
+  moduleGroupSelector_ = std::make_unique<TkModuleGroupSelector>(aliTracker, moduleGroupSelCfg_, sdets);
 
   parameters_.resize(moduleGroupSelector_->getNumberOfParameters(), 0.);
   paramUncertainties_.resize(moduleGroupSelector_->getNumberOfParameters(), 0.);
 
-  edm::LogInfo("Alignment") << "@SUB=SiPixelLorentzAngleCalibration" << "Created with name "
-                            << this->name() << "',\n" << this->numParameters() << " parameters to be determined,"
-                            << "\n saveToDB = " << saveToDB_
-                            << "\n outFileName = " << outFileName_
+  edm::LogInfo("Alignment") << "@SUB=SiPixelLorentzAngleCalibration"
+                            << "Created with name " << this->name() << "',\n"
+                            << this->numParameters() << " parameters to be determined,"
+                            << "\n saveToDB = " << saveToDB_ << "\n outFileName = " << outFileName_
                             << "\n N(merge files) = " << mergeFileNames_.size()
                             << "\n number of IOVs = " << moduleGroupSelector_->numIovs();
 
@@ -304,10 +280,8 @@ void SiPixelLorentzAngleCalibration::beginOfJob(AlignableTracker *aliTracker,
   }
 }
 
-
 //======================================================================
-void SiPixelLorentzAngleCalibration::endOfJob()
-{
+void SiPixelLorentzAngleCalibration::endOfJob() {
   // loginfo output
   std::ostringstream out;
   out << "Parameter results\n";
@@ -316,17 +290,18 @@ void SiPixelLorentzAngleCalibration::endOfJob()
   }
   edm::LogInfo("Alignment") << "@SUB=SiPixelLorentzAngleCalibration::endOfJob" << out.str();
 
-  std::map<unsigned int, TreeStruct> treeInfo; // map of TreeStruct for each detId
+  std::map<unsigned int, TreeStruct> treeInfo;  // map of TreeStruct for each detId
 
   // now write 'input' tree(s)
   const std::string treeName{this->name() + '_'};
-  std::vector<const SiPixelLorentzAngle*> inputs{};
+  std::vector<const SiPixelLorentzAngle *> inputs{};
   inputs.reserve(moduleGroupSelector_->numIovs());
   for (unsigned int iIOV = 0; iIOV < moduleGroupSelector_->numIovs(); ++iIOV) {
     const auto firstRunOfIOV = moduleGroupSelector_->firstRunOfIOV(iIOV);
-    inputs.push_back(this->getLorentzAnglesInput(firstRunOfIOV)); // never NULL
-    this->writeTree(inputs.back(), treeInfo,
-                    (treeName + "input_" + std::to_string(firstRunOfIOV)).c_str()); // empty treeInfo for input...
+    inputs.push_back(this->getLorentzAnglesInput(firstRunOfIOV));  // never NULL
+    this->writeTree(inputs.back(),
+                    treeInfo,
+                    (treeName + "input_" + std::to_string(firstRunOfIOV)).c_str());  // empty treeInfo for input...
 
     if (inputs.back()->getLorentzAngles().empty()) {
       edm::LogError("Alignment") << "@SUB=SiPixelLorentzAngleCalibration::endOfJob"
@@ -335,32 +310,31 @@ void SiPixelLorentzAngleCalibration::endOfJob()
     }
   }
 
-  const unsigned int nonZeroParamsOrErrors =   // Any determined value?
-    count_if (parameters_.begin(), parameters_.end(), [] (auto c) { return c != 0.;})
-    + count_if(paramUncertainties_.begin(), paramUncertainties_.end(),
-               [](auto c) { return c != 0.;});
+  const unsigned int nonZeroParamsOrErrors =  // Any determined value?
+      count_if(parameters_.begin(), parameters_.end(), [](auto c) { return c != 0.; }) +
+      count_if(paramUncertainties_.begin(), paramUncertainties_.end(), [](auto c) { return c != 0.; });
 
   for (unsigned int iIOV = 0; iIOV < moduleGroupSelector_->numIovs(); ++iIOV) {
     auto firstRunOfIOV = static_cast<cond::Time_t>(moduleGroupSelector_->firstRunOfIOV(iIOV));
     SiPixelLorentzAngle output{};
     // Loop on map of values from input and add (possible) parameter results
-    for (const auto& iterIdValue: inputs[iIOV]->getLorentzAngles()) {
+    for (const auto &iterIdValue : inputs[iIOV]->getLorentzAngles()) {
       // type of 'iterIdValue' is pair<unsigned int, float>
-      const auto detId = iterIdValue.first; // key of map is DetId
+      const auto detId = iterIdValue.first;  // key of map is DetId
       const auto param = this->getParameterForDetId(detId, firstRunOfIOV);
       // put result in output, i.e. sum of input and determined parameter, but the nasty
       // putLorentzAngle(..) takes float by reference - not even const reference:
       auto value = iterIdValue.second + static_cast<float>(param);
       output.putLorentzAngle(detId, value);
-      const int paramIndex = moduleGroupSelector_->getParameterIndexFromDetId(detId,firstRunOfIOV);
+      const int paramIndex = moduleGroupSelector_->getParameterIndexFromDetId(detId, firstRunOfIOV);
       treeInfo[detId] = TreeStruct(param, this->getParameterError(paramIndex), paramIndex);
     }
 
-    if (saveToDB_ || nonZeroParamsOrErrors != 0) { // Skip writing mille jobs...
+    if (saveToDB_ || nonZeroParamsOrErrors != 0) {  // Skip writing mille jobs...
       this->writeTree(&output, treeInfo, (treeName + Form("result_%lld", firstRunOfIOV)).c_str());
     }
 
-    if (saveToDB_) { // If requested, write out to DB
+    if (saveToDB_) {  // If requested, write out to DB
       edm::Service<cond::service::PoolDBOutputService> dbService;
       if (dbService.isAvailable()) {
         dbService->writeOne(&output, firstRunOfIOV, recordNameDBwrite_);
@@ -369,21 +343,18 @@ void SiPixelLorentzAngleCalibration::endOfJob()
                                    << "No PoolDBOutputService available, but saveToDB true!";
       }
     }
-  } // end loop on IOVs
-
+  }  // end loop on IOVs
 }
 
 //======================================================================
-const SiPixelLorentzAngle*
-SiPixelLorentzAngleCalibration::getLorentzAnglesInput(const align::RunNumber& run)
-{
-  const auto& resolvedRun = run > 0 ? run : currentIOV_;
+const SiPixelLorentzAngle *SiPixelLorentzAngleCalibration::getLorentzAnglesInput(const align::RunNumber &run) {
+  const auto &resolvedRun = run > 0 ? run : currentIOV_;
   // For parallel processing in Millepede II, create SiPixelLorentzAngle
   // from info stored in files of parallel jobs and check that they are identical.
   // If this job has run on data, still check that LA is identical to the ones
   // from mergeFileNames_.
-  const std::string treeName{this->name()+"_input_"+std::to_string(resolvedRun)};
-  for (const auto& iFile: mergeFileNames_) {
+  const std::string treeName{this->name() + "_input_" + std::to_string(resolvedRun)};
+  for (const auto &iFile : mergeFileNames_) {
     auto la = this->createFromTree(iFile.c_str(), treeName.c_str());
     // siPixelLorentzAngleInput_ could be non-null from previous file of this loop
     // or from checkLorentzAngleInput(..) when running on data in this job as well
@@ -393,18 +364,16 @@ SiPixelLorentzAngleCalibration::getLorentzAnglesInput(const align::RunNumber& ru
       currentIOV_ = resolvedRun;
     } else {
       // FIXME: about comparison of maps see comments in checkLorentzAngleInput
-      if (!la.getLorentzAngles().empty() && // single job might not have got events
+      if (!la.getLorentzAngles().empty() &&  // single job might not have got events
           la.getLorentzAngles() != siPixelLorentzAngleInput_->getLorentzAngles()) {
         // Throw exception instead of error?
         edm::LogError("NoInput") << "@SUB=SiPixelLorentzAngleCalibration::getLorentzAnglesInput"
-                                 << "Different input values from tree " << treeName
-                                 << " in file " << iFile << ".";
-
+                                 << "Different input values from tree " << treeName << " in file " << iFile << ".";
       }
     }
   }
 
-  if (!siPixelLorentzAngleInput_) { // no files nor ran on events
+  if (!siPixelLorentzAngleInput_) {  // no files nor ran on events
     // [] operator default-constructs an empty SiPixelLorentzAngle object in place:
     siPixelLorentzAngleInput_ = &(cachedLorentzAngleInputs_[resolvedRun]);
     currentIOV_ = resolvedRun;
@@ -419,21 +388,19 @@ SiPixelLorentzAngleCalibration::getLorentzAnglesInput(const align::RunNumber& ru
 }
 
 //======================================================================
-double SiPixelLorentzAngleCalibration::getParameterForDetId(unsigned int detId,
-                                                            edm::RunNumber_t run) const
-{
+double SiPixelLorentzAngleCalibration::getParameterForDetId(unsigned int detId, edm::RunNumber_t run) const {
   const int index = moduleGroupSelector_->getParameterIndexFromDetId(detId, run);
   return (index < 0 ? 0. : parameters_[index]);
 }
 
 //======================================================================
 void SiPixelLorentzAngleCalibration::writeTree(const SiPixelLorentzAngle *lorentzAngle,
-                                               const std::map<unsigned int,TreeStruct> &treeInfo,
-                                               const char *treeName) const
-{
-  if (!lorentzAngle) return;
+                                               const std::map<unsigned int, TreeStruct> &treeInfo,
+                                               const char *treeName) const {
+  if (!lorentzAngle)
+    return;
 
-  TFile* file = TFile::Open(outFileName_.c_str(), "UPDATE");
+  TFile *file = TFile::Open(outFileName_.c_str(), "UPDATE");
   if (!file) {
     edm::LogError("BadConfig") << "@SUB=SiPixelLorentzAngleCalibration::writeTree"
                                << "Could not open file '" << outFileName_ << "'.";
@@ -449,15 +416,16 @@ void SiPixelLorentzAngleCalibration::writeTree(const SiPixelLorentzAngle *lorent
   tree->Branch("treeStruct", &treeStruct, TreeStruct::LeafList());
 
   for (auto iterIdValue = lorentzAngle->getLorentzAngles().begin();
-       iterIdValue != lorentzAngle->getLorentzAngles().end(); ++iterIdValue) {
+       iterIdValue != lorentzAngle->getLorentzAngles().end();
+       ++iterIdValue) {
     // type of (*iterIdValue) is pair<unsigned int, float>
-    id = iterIdValue->first; // key of map is DetId
+    id = iterIdValue->first;  // key of map is DetId
     value = iterIdValue->second;
     // type of (*treeStructIter) is pair<unsigned int, TreeStruct>
-    auto treeStructIter = treeInfo.find(id); // find info for this id
+    auto treeStructIter = treeInfo.find(id);  // find info for this id
     if (treeStructIter != treeInfo.end()) {
-      treeStruct = treeStructIter->second; // info from input map
-    } else { // if none found, fill at least parameter index (using 1st IOV...)
+      treeStruct = treeStructIter->second;  // info from input map
+    } else {                                // if none found, fill at least parameter index (using 1st IOV...)
       const cond::Time_t run1of1stIov = moduleGroupSelector_->firstRunOfIOV(0);
       const int ind = moduleGroupSelector_->getParameterIndexFromDetId(id, run1of1stIov);
       treeStruct = TreeStruct(ind);
@@ -465,25 +433,23 @@ void SiPixelLorentzAngleCalibration::writeTree(const SiPixelLorentzAngle *lorent
     tree->Fill();
   }
   tree->Write();
-  delete file; // tree vanishes with the file... (?)
-
+  delete file;  // tree vanishes with the file... (?)
 }
 
 //======================================================================
-SiPixelLorentzAngle
-SiPixelLorentzAngleCalibration::createFromTree(const char *fileName, const char *treeName) const
-{
+SiPixelLorentzAngle SiPixelLorentzAngleCalibration::createFromTree(const char *fileName, const char *treeName) const {
   // Check for file existence on your own to work around
   // https://hypernews.cern.ch/HyperNews/CMS/get/swDevelopment/2715.html:
-  TFile* file = nullptr;
-  FILE* testFile = fopen(fileName,"r");
+  TFile *file = nullptr;
+  FILE *testFile = fopen(fileName, "r");
   if (testFile) {
     fclose(testFile);
     file = TFile::Open(fileName, "READ");
-  } // else not existing, see error below
+  }  // else not existing, see error below
 
   TTree *tree = nullptr;
-  if (file) file->GetObject(treeName, tree);
+  if (file)
+    file->GetObject(treeName, tree);
 
   SiPixelLorentzAngle result{};
   if (tree) {
@@ -497,22 +463,20 @@ SiPixelLorentzAngleCalibration::createFromTree(const char *fileName, const char
       tree->GetEntry(iEntry);
       result.putLorentzAngle(id, value);
     }
-  } else { // Warning only since could be parallel job on no events.
+  } else {  // Warning only since could be parallel job on no events.
     edm::LogWarning("Alignment") << "@SUB=SiPixelLorentzAngleCalibration::createFromTree"
-                                 << "Could not get TTree '" << treeName << "' from file '"
-                                 << fileName << (file ? "'." : "' (file does not exist).");
+                                 << "Could not get TTree '" << treeName << "' from file '" << fileName
+                                 << (file ? "'." : "' (file does not exist).");
   }
 
-  delete file; // tree will vanish with file
+  delete file;  // tree will vanish with file
   return result;
 }
 
-
 //======================================================================
 //======================================================================
 // Plugin definition
 
 #include "Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationPluginFactory.h"
 
-DEFINE_EDM_PLUGIN(IntegratedCalibrationPluginFactory,
-                  SiPixelLorentzAngleCalibration, "SiPixelLorentzAngleCalibration");
+DEFINE_EDM_PLUGIN(IntegratedCalibrationPluginFactory, SiPixelLorentzAngleCalibration, "SiPixelLorentzAngleCalibration");
diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/SiStripBackplaneCalibration.cc b/Alignment/CommonAlignmentAlgorithm/plugins/SiStripBackplaneCalibration.cc
index 36c2a75c9b47f..4057ad2d608b7 100644
--- a/Alignment/CommonAlignmentAlgorithm/plugins/SiStripBackplaneCalibration.cc
+++ b/Alignment/CommonAlignmentAlgorithm/plugins/SiStripBackplaneCalibration.cc
@@ -52,12 +52,11 @@
 #include <cstdio>
 #include <functional>
 
-class SiStripBackplaneCalibration : public IntegratedCalibrationBase
-{
+class SiStripBackplaneCalibration : public IntegratedCalibrationBase {
 public:
   /// Constructor
   explicit SiStripBackplaneCalibration(const edm::ParameterSet &cfg);
-  
+
   /// Destructor
   ~SiStripBackplaneCalibration() override;
 
@@ -75,10 +74,10 @@ class SiStripBackplaneCalibration : public IntegratedCalibrationBase
   /// Return non-zero derivatives for x- and y-measurements with their indices by reference.
   /// Return value is their number.
   unsigned int derivatives(std::vector<ValuesIndexPair> &outDerivInds,
-				   const TransientTrackingRecHit &hit,
-				   const TrajectoryStateOnSurface &tsos,
-				   const edm::EventSetup &setup,
-				   const EventInfo &eventInfo) const override;
+                           const TransientTrackingRecHit &hit,
+                           const TrajectoryStateOnSurface &tsos,
+                           const edm::EventSetup &setup,
+                           const EventInfo &eventInfo) const override;
 
   /// Setting the determined parameter identified by index,
   /// returns false if out-of-bounds, true otherwise.
@@ -97,9 +96,7 @@ class SiStripBackplaneCalibration : public IntegratedCalibrationBase
   double getParameterError(unsigned int index) const override;
 
   // /// Call at beginning of job:
-  void beginOfJob(AlignableTracker *tracker,
-  			  AlignableMuon *muon,
-  			  AlignableExtras *extras) override;
+  void beginOfJob(AlignableTracker *tracker, AlignableMuon *muon, AlignableExtras *extras) override;
 
   /// Called at end of a the job of the AlignmentProducer.
   /// Write out determined parameters.
@@ -112,15 +109,16 @@ class SiStripBackplaneCalibration : public IntegratedCalibrationBase
   /// Input BackPlaneCorrection values:
   /// - either from EventSetup of first call to derivatives(..)
   /// - or created from files of passed by configuration (i.e. from parallel processing)
-  const SiStripBackPlaneCorrection* getBackPlaneCorrectionInput();
+  const SiStripBackPlaneCorrection *getBackPlaneCorrectionInput();
 
   /// Determined parameter value for this detId (detId not treated => 0.)
   /// and the given run.
   double getParameterForDetId(unsigned int detId, edm::RunNumber_t run) const;
 
   void writeTree(const SiStripBackPlaneCorrection *backPlaneCorr,
-		 const std::map<unsigned int,TreeStruct> &treeInfo, const char *treeName) const;
-  SiStripBackPlaneCorrection* createFromTree(const char *fileName, const char *treeName) const;
+                 const std::map<unsigned int, TreeStruct> &treeInfo,
+                 const char *treeName) const;
+  SiStripBackPlaneCorrection *createFromTree(const char *fileName, const char *treeName) const;
 
   const std::string readoutModeName_;
   int16_t readoutMode_;
@@ -138,7 +136,6 @@ class SiStripBackplaneCalibration : public IntegratedCalibrationBase
 
   TkModuleGroupSelector *moduleGroupSelector_;
   const edm::ParameterSet moduleGroupSelCfg_;
-
 };
 
 //======================================================================
@@ -146,17 +143,15 @@ class SiStripBackplaneCalibration : public IntegratedCalibrationBase
 //======================================================================
 
 SiStripBackplaneCalibration::SiStripBackplaneCalibration(const edm::ParameterSet &cfg)
-  : IntegratedCalibrationBase(cfg),
-    readoutModeName_(cfg.getParameter<std::string>("readoutMode")),
-    saveToDB_(cfg.getParameter<bool>("saveToDB")),
-    recordNameDBwrite_(cfg.getParameter<std::string>("recordNameDBwrite")),
-    outFileName_(cfg.getParameter<std::string>("treeFile")),
-    mergeFileNames_(cfg.getParameter<std::vector<std::string> >("mergeTreeFiles")),
-    siStripBackPlaneCorrInput_(nullptr),
-    moduleGroupSelector_(nullptr),
-    moduleGroupSelCfg_(cfg.getParameter<edm::ParameterSet>("BackplaneModuleGroups"))
-{
-
+    : IntegratedCalibrationBase(cfg),
+      readoutModeName_(cfg.getParameter<std::string>("readoutMode")),
+      saveToDB_(cfg.getParameter<bool>("saveToDB")),
+      recordNameDBwrite_(cfg.getParameter<std::string>("recordNameDBwrite")),
+      outFileName_(cfg.getParameter<std::string>("treeFile")),
+      mergeFileNames_(cfg.getParameter<std::vector<std::string> >("mergeTreeFiles")),
+      siStripBackPlaneCorrInput_(nullptr),
+      moduleGroupSelector_(nullptr),
+      moduleGroupSelCfg_(cfg.getParameter<edm::ParameterSet>("BackplaneModuleGroups")) {
   // SiStripLatency::singleReadOutMode() returns
   // 1: all in peak, 0: all in deco, -1: mixed state
   // (in principle one could treat even mixed state APV by APV...)
@@ -165,101 +160,93 @@ SiStripBackplaneCalibration::SiStripBackplaneCalibration(const edm::ParameterSet
   } else if (readoutModeName_ == "deconvolution") {
     readoutMode_ = kDeconvolutionMode;
   } else {
-    throw cms::Exception("BadConfig")
-	  << "SiStripBackplaneCalibration:\n" << "Unknown mode '" 
-	  << readoutModeName_ << "', should be 'peak' or 'deconvolution' .\n";
+    throw cms::Exception("BadConfig") << "SiStripBackplaneCalibration:\n"
+                                      << "Unknown mode '" << readoutModeName_
+                                      << "', should be 'peak' or 'deconvolution' .\n";
   }
-
 }
-  
+
 //======================================================================
-SiStripBackplaneCalibration::~SiStripBackplaneCalibration()
-{
+SiStripBackplaneCalibration::~SiStripBackplaneCalibration() {
   delete moduleGroupSelector_;
   //  std::cout << "Destroy SiStripBackplaneCalibration named " << this->name() << std::endl;
   delete siStripBackPlaneCorrInput_;
 }
 
 //======================================================================
-unsigned int SiStripBackplaneCalibration::numParameters() const
-{
-  return parameters_.size();
-}
+unsigned int SiStripBackplaneCalibration::numParameters() const { return parameters_.size(); }
 
 //======================================================================
-unsigned int
-SiStripBackplaneCalibration::derivatives(std::vector<ValuesIndexPair> &outDerivInds,
-					 const TransientTrackingRecHit &hit,
-					 const TrajectoryStateOnSurface &tsos,
-					 const edm::EventSetup &setup,
-					 const EventInfo &eventInfo) const
-{
+unsigned int SiStripBackplaneCalibration::derivatives(std::vector<ValuesIndexPair> &outDerivInds,
+                                                      const TransientTrackingRecHit &hit,
+                                                      const TrajectoryStateOnSurface &tsos,
+                                                      const edm::EventSetup &setup,
+                                                      const EventInfo &eventInfo) const {
   // ugly const-cast:
   // But it is either only first initialisation or throwing an exception...
-  const_cast<SiStripBackplaneCalibration*>(this)->checkBackPlaneCorrectionInput(setup, eventInfo);
+  const_cast<SiStripBackplaneCalibration *>(this)->checkBackPlaneCorrectionInput(setup, eventInfo);
 
   outDerivInds.clear();
 
-  edm::ESHandle<SiStripLatency> latency;  
+  edm::ESHandle<SiStripLatency> latency;
   setup.get<SiStripLatencyRcd>().get(latency);
   const int16_t mode = latency->singleReadOutMode();
 
-  if(mode == readoutMode_) {
-    if (hit.det()) { // otherwise 'constraint hit' or whatever
-      
-      const int index = moduleGroupSelector_->getParameterIndexFromDetId(hit.det()->geographicalId(),
-									 eventInfo.eventId().run());
-      if (index >= 0) { // otherwise not treated
+  if (mode == readoutMode_) {
+    if (hit.det()) {  // otherwise 'constraint hit' or whatever
+
+      const int index =
+          moduleGroupSelector_->getParameterIndexFromDetId(hit.det()->geographicalId(), eventInfo.eventId().run());
+      if (index >= 0) {  // otherwise not treated
         edm::ESHandle<MagneticField> magneticField;
         setup.get<IdealMagneticFieldRecord>().get(magneticField);
         const GlobalVector bField(magneticField->inTesla(hit.det()->surface().position()));
         const LocalVector bFieldLocal(hit.det()->surface().toLocal(bField));
         //std::cout << "SiStripBackplaneCalibration derivatives " << readoutModeName_ << std::endl;
-        const double dZ = hit.det()->surface().bounds().thickness(); // it's a float only...
-	const double tanPsi = tsos.localParameters().mixedFormatVector()[1]; //float...
+        const double dZ = hit.det()->surface().bounds().thickness();          // it's a float only...
+        const double tanPsi = tsos.localParameters().mixedFormatVector()[1];  //float...
 
-	edm::ESHandle<SiStripLorentzAngle> lorentzAngleHandle;
-	setup.get<SiStripLorentzAngleRcd>().get(readoutModeName_, lorentzAngleHandle);
-	// Yes, mobility (= LA/By) stored in object called LA...
-	const double mobility = lorentzAngleHandle->getLorentzAngle(hit.det()->geographicalId());
+        edm::ESHandle<SiStripLorentzAngle> lorentzAngleHandle;
+        setup.get<SiStripLorentzAngleRcd>().get(readoutModeName_, lorentzAngleHandle);
+        // Yes, mobility (= LA/By) stored in object called LA...
+        const double mobility = lorentzAngleHandle->getLorentzAngle(hit.det()->geographicalId());
         // shift due to dead back plane has two parts:
-	// 1) Lorentz Angle correction formula gets reduced thickness dz*(1-bp)
-	// 2) 'Direct' effect is shift of effective module position in local z by bp*dz/2
-	//   (see GF's presentation in alignment meeting 25.10.2012,
-	//    https://indico.cern.ch/conferenceDisplay.py?confId=174266#2012-10-25)
+        // 1) Lorentz Angle correction formula gets reduced thickness dz*(1-bp)
+        // 2) 'Direct' effect is shift of effective module position in local z by bp*dz/2
+        //   (see GF's presentation in alignment meeting 25.10.2012,
+        //    https://indico.cern.ch/conferenceDisplay.py?confId=174266#2012-10-25)
         //        const double xDerivative = 0.5 * dZ * (mobility * bFieldLocal.y() - tanPsi);
-        //FIXME: +tanPsi? At least that fits the sign of the dr/dw residual 
+        //FIXME: +tanPsi? At least that fits the sign of the dr/dw residual
         //       in KarimakiDerivatives...
         const double xDerivative = 0.5 * dZ * (mobility * bFieldLocal.y() + tanPsi);
-	// std::cout << "derivative is " << xDerivative << " for index " << index 
-	// 	  << std::endl;
-//         if (index >= 10) {
-//           std::cout << "mobility * y-field " << mobility * bFieldLocal.y()
-//                     << ", \n tanPsi " << tanPsi /*<< ", dZ " << dZ */ << std::endl;
-//           std::cout << "|tanPsi| - |mobility * y-field| "
-//                     << fabs(tanPsi) - fabs(mobility * bFieldLocal.y())
-//                     << std::endl;
-//         }
-	const Values derivs(xDerivative, 0.); // yDerivative = 0.
-	outDerivInds.push_back(ValuesIndexPair(derivs, index));
+        // std::cout << "derivative is " << xDerivative << " for index " << index
+        // 	  << std::endl;
+        //         if (index >= 10) {
+        //           std::cout << "mobility * y-field " << mobility * bFieldLocal.y()
+        //                     << ", \n tanPsi " << tanPsi /*<< ", dZ " << dZ */ << std::endl;
+        //           std::cout << "|tanPsi| - |mobility * y-field| "
+        //                     << fabs(tanPsi) - fabs(mobility * bFieldLocal.y())
+        //                     << std::endl;
+        //         }
+        const Values derivs(xDerivative, 0.);  // yDerivative = 0.
+        outDerivInds.push_back(ValuesIndexPair(derivs, index));
       }
     } else {
       edm::LogWarning("Alignment") << "@SUB=SiStripBackplaneCalibration::derivatives1"
                                    << "Hit without GeomDet, skip!";
     }
   } else if (mode != kDeconvolutionMode && mode != kPeakMode) {
-    // warn only if unknown/mixed mode  
+    // warn only if unknown/mixed mode
     edm::LogWarning("Alignment") << "@SUB=SiStripBackplaneCalibration::derivatives2"
-                                 << "Readout mode is " << mode << ", but looking for "
-                                 << readoutMode_ << " (" << readoutModeName_ << ").";
+                                 << "Readout mode is " << mode << ", but looking for " << readoutMode_ << " ("
+                                 << readoutModeName_ << ").";
   }
-  
+
   return outDerivInds.size();
 }
 
 //======================================================================
-bool SiStripBackplaneCalibration::setParameter(unsigned int index, double value)
-{
+bool SiStripBackplaneCalibration::setParameter(unsigned int index, double value) {
   if (index >= parameters_.size()) {
     return false;
   } else {
@@ -269,8 +256,7 @@ bool SiStripBackplaneCalibration::setParameter(unsigned int index, double value)
 }
 
 //======================================================================
-bool SiStripBackplaneCalibration::setParameterError(unsigned int index, double error)
-{
+bool SiStripBackplaneCalibration::setParameterError(unsigned int index, double error) {
   if (index >= paramUncertainties_.size()) {
     return false;
   } else {
@@ -280,50 +266,44 @@ bool SiStripBackplaneCalibration::setParameterError(unsigned int index, double e
 }
 
 //======================================================================
-double SiStripBackplaneCalibration::getParameter(unsigned int index) const
-{
+double SiStripBackplaneCalibration::getParameter(unsigned int index) const {
   return (index >= parameters_.size() ? 0. : parameters_[index]);
 }
 
 //======================================================================
-double SiStripBackplaneCalibration::getParameterError(unsigned int index) const
-{
+double SiStripBackplaneCalibration::getParameterError(unsigned int index) const {
   return (index >= paramUncertainties_.size() ? 0. : paramUncertainties_[index]);
 }
 
 //======================================================================
 void SiStripBackplaneCalibration::beginOfJob(AlignableTracker *aliTracker,
                                              AlignableMuon * /*aliMuon*/,
-                                             AlignableExtras */*aliExtras*/)
-{
+                                             AlignableExtras * /*aliExtras*/) {
   //specify the sub-detectors for which the back plane correction is determined: all strips
-  const std::vector<int> sdets = boost::assign::list_of(SiStripDetId::TIB)(SiStripDetId::TID)
-    (SiStripDetId::TOB)(SiStripDetId::TEC);
-  
+  const std::vector<int> sdets =
+      boost::assign::list_of(SiStripDetId::TIB)(SiStripDetId::TID)(SiStripDetId::TOB)(SiStripDetId::TEC);
+
   moduleGroupSelector_ = new TkModuleGroupSelector(aliTracker, moduleGroupSelCfg_, sdets);
-  
+
   parameters_.resize(moduleGroupSelector_->getNumberOfParameters(), 0.);
   paramUncertainties_.resize(moduleGroupSelector_->getNumberOfParameters(), 0.);
 
-  edm::LogInfo("Alignment") << "@SUB=SiStripBackplaneCalibration" << "Created with name "
-                            << this->name() << " for readout mode '" << readoutModeName_
-			    << "',\n" << this->numParameters() << " parameters to be determined."
-                            << "\nsaveToDB = " << saveToDB_
-                            << "\n outFileName = " << outFileName_
+  edm::LogInfo("Alignment") << "@SUB=SiStripBackplaneCalibration"
+                            << "Created with name " << this->name() << " for readout mode '" << readoutModeName_
+                            << "',\n"
+                            << this->numParameters() << " parameters to be determined."
+                            << "\nsaveToDB = " << saveToDB_ << "\n outFileName = " << outFileName_
                             << "\n N(merge files) = " << mergeFileNames_.size()
                             << "\n number of IOVs = " << moduleGroupSelector_->numIovs();
-  
+
   if (!mergeFileNames_.empty()) {
     edm::LogInfo("Alignment") << "@SUB=SiStripBackplaneCalibration"
                               << "First file to merge: " << mergeFileNames_[0];
   }
-  
 }
 
-
 //======================================================================
-void SiStripBackplaneCalibration::endOfJob()
-{
+void SiStripBackplaneCalibration::endOfJob() {
   // loginfo output
   std::ostringstream out;
   out << "Parameter results for readout mode '" << readoutModeName_ << "'\n";
@@ -332,33 +312,33 @@ void SiStripBackplaneCalibration::endOfJob()
   }
   edm::LogInfo("Alignment") << "@SUB=SiStripBackplaneCalibration::endOfJob" << out.str();
 
-  std::map<unsigned int, TreeStruct> treeInfo; // map of TreeStruct for each detId
+  std::map<unsigned int, TreeStruct> treeInfo;  // map of TreeStruct for each detId
 
   // now write 'input' tree
-  const SiStripBackPlaneCorrection *input = this->getBackPlaneCorrectionInput(); // never NULL
+  const SiStripBackPlaneCorrection *input = this->getBackPlaneCorrectionInput();  // never NULL
   const std::string treeName(this->name() + '_' + readoutModeName_ + '_');
-  this->writeTree(input, treeInfo, (treeName + "input").c_str()); // empty treeInfo for input...
+  this->writeTree(input, treeInfo, (treeName + "input").c_str());  // empty treeInfo for input...
 
   if (input->getBackPlaneCorrections().empty()) {
     edm::LogError("Alignment") << "@SUB=SiStripBackplaneCalibration::endOfJob"
-			       << "Input back plane correction map is empty ('"
-			       << readoutModeName_ << "' mode), skip writing output!";
+                               << "Input back plane correction map is empty ('" << readoutModeName_
+                               << "' mode), skip writing output!";
     return;
   }
 
-  const unsigned int nonZeroParamsOrErrors =   // Any determined value?
-    count_if (parameters_.begin(), parameters_.end(),[](auto c){return c != 0.;})
-    + count_if(paramUncertainties_.begin(), paramUncertainties_.end(),
-              [](auto c){return c!= 0.;});
+  const unsigned int nonZeroParamsOrErrors =  // Any determined value?
+      count_if(parameters_.begin(), parameters_.end(), [](auto c) { return c != 0.; }) +
+      count_if(paramUncertainties_.begin(), paramUncertainties_.end(), [](auto c) { return c != 0.; });
 
   for (unsigned int iIOV = 0; iIOV < moduleGroupSelector_->numIovs(); ++iIOV) {
     cond::Time_t firstRunOfIOV = moduleGroupSelector_->firstRunOfIOV(iIOV);
     SiStripBackPlaneCorrection *output = new SiStripBackPlaneCorrection;
     // Loop on map of values from input and add (possible) parameter results
     for (auto iterIdValue = input->getBackPlaneCorrections().begin();
-	 iterIdValue != input->getBackPlaneCorrections().end(); ++iterIdValue) {
+         iterIdValue != input->getBackPlaneCorrections().end();
+         ++iterIdValue) {
       // type of (*iterIdValue) is pair<unsigned int, float>
-      const unsigned int detId = iterIdValue->first; // key of map is DetId
+      const unsigned int detId = iterIdValue->first;  // key of map is DetId
       // Some code one could use to miscalibrate wrt input:
       // double param = 0.;
       // const DetId id(detId);
@@ -388,34 +368,33 @@ void SiStripBackplaneCalibration::endOfJob()
       const double param = this->getParameterForDetId(detId, firstRunOfIOV);
       // put result in output, i.e. sum of input and determined parameter:
       output->putBackPlaneCorrection(detId, iterIdValue->second + param);
-      const int paramIndex = moduleGroupSelector_->getParameterIndexFromDetId(detId,firstRunOfIOV);
+      const int paramIndex = moduleGroupSelector_->getParameterIndexFromDetId(detId, firstRunOfIOV);
       treeInfo[detId] = TreeStruct(param, this->getParameterError(paramIndex), paramIndex);
     }
 
-    if (saveToDB_ || nonZeroParamsOrErrors != 0) { // Skip writing mille jobs...
+    if (saveToDB_ || nonZeroParamsOrErrors != 0) {  // Skip writing mille jobs...
       this->writeTree(output, treeInfo, (treeName + Form("result_%lld", firstRunOfIOV)).c_str());
     }
 
-    if (saveToDB_) { // If requested, write out to DB 
+    if (saveToDB_) {  // If requested, write out to DB
       edm::Service<cond::service::PoolDBOutputService> dbService;
       if (dbService.isAvailable()) {
-	dbService->writeOne(output, firstRunOfIOV, recordNameDBwrite_);
-	// no 'delete output;': writeOne(..) took over ownership
+        dbService->writeOne(output, firstRunOfIOV, recordNameDBwrite_);
+        // no 'delete output;': writeOne(..) took over ownership
       } else {
-	delete output;
-	edm::LogError("BadConfig") << "@SUB=SiStripBackplaneCalibration::endOfJob"
-				   << "No PoolDBOutputService available, but saveToDB true!";
+        delete output;
+        edm::LogError("BadConfig") << "@SUB=SiStripBackplaneCalibration::endOfJob"
+                                   << "No PoolDBOutputService available, but saveToDB true!";
       }
     } else {
       delete output;
     }
-  } // end loop on IOVs
+  }  // end loop on IOVs
 }
 
 //======================================================================
 bool SiStripBackplaneCalibration::checkBackPlaneCorrectionInput(const edm::EventSetup &setup,
-								const EventInfo &eventInfo)
-{
+                                                                const EventInfo &eventInfo) {
   edm::ESHandle<SiStripBackPlaneCorrection> backPlaneCorrHandle;
   if (!siStripBackPlaneCorrInput_) {
     setup.get<SiStripBackPlaneCorrectionRcd>().get(readoutModeName_, backPlaneCorrHandle);
@@ -424,69 +403,63 @@ bool SiStripBackplaneCalibration::checkBackPlaneCorrectionInput(const edm::Event
     //        Otherwise could be that next check has to check via following 'else', though
     //        no new IOV has started... (to be checked)
   } else {
-    if (watchBackPlaneCorrRcd_.check(setup)) { // new IOV of input - but how to check peak vs deco?
+    if (watchBackPlaneCorrRcd_.check(setup)) {  // new IOV of input - but how to check peak vs deco?
       setup.get<SiStripBackPlaneCorrectionRcd>().get(readoutModeName_, backPlaneCorrHandle);
-      if (backPlaneCorrHandle->getBackPlaneCorrections() // but only bad if non-identical values
-	  != siStripBackPlaneCorrInput_->getBackPlaneCorrections()) { // (comparing maps)
-	// Maps are containers sorted by key, but comparison problems may arise from
-	// 'floating point comparison' problems (FIXME?)
-	throw cms::Exception("BadInput")
-	  << "SiStripBackplaneCalibration::checkBackPlaneCorrectionInput:\n"
-	  << "Content of SiStripBackPlaneCorrection changed at run " << eventInfo.eventId().run()
-	  << ", but algorithm expects constant input!\n";
-	return false; // not reached...
+      if (backPlaneCorrHandle->getBackPlaneCorrections()               // but only bad if non-identical values
+          != siStripBackPlaneCorrInput_->getBackPlaneCorrections()) {  // (comparing maps)
+        // Maps are containers sorted by key, but comparison problems may arise from
+        // 'floating point comparison' problems (FIXME?)
+        throw cms::Exception("BadInput") << "SiStripBackplaneCalibration::checkBackPlaneCorrectionInput:\n"
+                                         << "Content of SiStripBackPlaneCorrection changed at run "
+                                         << eventInfo.eventId().run() << ", but algorithm expects constant input!\n";
+        return false;  // not reached...
       }
     }
   }
-  
+
   return true;
 }
 
 //======================================================================
-const SiStripBackPlaneCorrection* SiStripBackplaneCalibration::getBackPlaneCorrectionInput()
-{
+const SiStripBackPlaneCorrection *SiStripBackplaneCalibration::getBackPlaneCorrectionInput() {
   // For parallel processing in Millepede II, create SiStripBackPlaneCorrection
   // from info stored in files of parallel jobs and check that they are identical.
   // If this job has run on events, still check that back plane corrections are
   // identical to the ones from mergeFileNames_.
   const std::string treeName(((this->name() + '_') += readoutModeName_) += "_input");
   for (auto iFile = mergeFileNames_.begin(); iFile != mergeFileNames_.end(); ++iFile) {
-    SiStripBackPlaneCorrection* bpCorr = this->createFromTree(iFile->c_str(), treeName.c_str());
+    SiStripBackPlaneCorrection *bpCorr = this->createFromTree(iFile->c_str(), treeName.c_str());
     // siStripBackPlaneCorrInput_ could be non-null from previous file of this loop
     // or from checkBackPlaneCorrectionInput(..) when running on data in this job as well
     if (!siStripBackPlaneCorrInput_ || siStripBackPlaneCorrInput_->getBackPlaneCorrections().empty()) {
-      delete siStripBackPlaneCorrInput_; // NULL or empty
+      delete siStripBackPlaneCorrInput_;  // NULL or empty
       siStripBackPlaneCorrInput_ = bpCorr;
     } else {
       // about comparison of maps see comments in checkBackPlaneCorrectionInput
-      if (bpCorr && !bpCorr->getBackPlaneCorrections().empty() && // single job might not have got events
+      if (bpCorr && !bpCorr->getBackPlaneCorrections().empty() &&  // single job might not have got events
           bpCorr->getBackPlaneCorrections() != siStripBackPlaneCorrInput_->getBackPlaneCorrections()) {
         // Throw exception instead of error?
         edm::LogError("NoInput") << "@SUB=SiStripBackplaneCalibration::getBackPlaneCorrectionInput"
-                                 << "Different input values from tree " << treeName
-                                 << " in file " << *iFile << ".";
-        
+                                 << "Different input values from tree " << treeName << " in file " << *iFile << ".";
       }
       delete bpCorr;
     }
   }
 
-  if (!siStripBackPlaneCorrInput_) { // no files nor ran on events
+  if (!siStripBackPlaneCorrInput_) {  // no files nor ran on events
     siStripBackPlaneCorrInput_ = new SiStripBackPlaneCorrection;
     edm::LogError("NoInput") << "@SUB=SiStripBackplaneCalibration::getBackPlaneCorrectionInput"
-			     << "No input, create an empty one ('" << readoutModeName_ << "' mode)!";
+                             << "No input, create an empty one ('" << readoutModeName_ << "' mode)!";
   } else if (siStripBackPlaneCorrInput_->getBackPlaneCorrections().empty()) {
     edm::LogError("NoInput") << "@SUB=SiStripBackplaneCalibration::getBackPlaneCorrectionInput"
-			     << "Empty result ('" << readoutModeName_ << "' mode)!";
+                             << "Empty result ('" << readoutModeName_ << "' mode)!";
   }
 
   return siStripBackPlaneCorrInput_;
 }
 
 //======================================================================
-double SiStripBackplaneCalibration::getParameterForDetId(unsigned int detId,
-							 edm::RunNumber_t run) const
-{
+double SiStripBackplaneCalibration::getParameterForDetId(unsigned int detId, edm::RunNumber_t run) const {
   const int index = moduleGroupSelector_->getParameterIndexFromDetId(detId, run);
 
   return (index < 0 ? 0. : parameters_[index]);
@@ -495,14 +468,14 @@ double SiStripBackplaneCalibration::getParameterForDetId(unsigned int detId,
 //======================================================================
 void SiStripBackplaneCalibration::writeTree(const SiStripBackPlaneCorrection *backPlaneCorrection,
                                             const std::map<unsigned int, TreeStruct> &treeInfo,
-					    const char *treeName) const
-{
-  if (!backPlaneCorrection) return;
+                                            const char *treeName) const {
+  if (!backPlaneCorrection)
+    return;
 
-  TFile* file = TFile::Open(outFileName_.c_str(), "UPDATE");
+  TFile *file = TFile::Open(outFileName_.c_str(), "UPDATE");
   if (!file) {
     edm::LogError("BadConfig") << "@SUB=SiStripBackplaneCalibration::writeTree"
-			       << "Could not open file '" << outFileName_ << "'.";
+                               << "Could not open file '" << outFileName_ << "'.";
     return;
   }
 
@@ -515,15 +488,16 @@ void SiStripBackplaneCalibration::writeTree(const SiStripBackPlaneCorrection *ba
   tree->Branch("treeStruct", &treeStruct, TreeStruct::LeafList());
 
   for (auto iterIdValue = backPlaneCorrection->getBackPlaneCorrections().begin();
-       iterIdValue != backPlaneCorrection->getBackPlaneCorrections().end(); ++iterIdValue) {
+       iterIdValue != backPlaneCorrection->getBackPlaneCorrections().end();
+       ++iterIdValue) {
     // type of (*iterIdValue) is pair<unsigned int, float>
-    id = iterIdValue->first; // key of map is DetId
+    id = iterIdValue->first;  // key of map is DetId
     value = iterIdValue->second;
     // type of (*treeStructIter) is pair<unsigned int, TreeStruct>
-    auto treeStructIter = treeInfo.find(id); // find info for this id
+    auto treeStructIter = treeInfo.find(id);  // find info for this id
     if (treeStructIter != treeInfo.end()) {
-      treeStruct = treeStructIter->second; // info from input map
-    } else { // if none found, fill at least parameter index (using 1st IOV...)
+      treeStruct = treeStructIter->second;  // info from input map
+    } else {                                // if none found, fill at least parameter index (using 1st IOV...)
       const cond::Time_t run1of1stIov = moduleGroupSelector_->firstRunOfIOV(0);
       const int ind = moduleGroupSelector_->getParameterIndexFromDetId(id, run1of1stIov);
       treeStruct = TreeStruct(ind);
@@ -531,25 +505,24 @@ void SiStripBackplaneCalibration::writeTree(const SiStripBackPlaneCorrection *ba
     tree->Fill();
   }
   tree->Write();
-  delete file; // tree vanishes with the file...
-
+  delete file;  // tree vanishes with the file...
 }
 
 //======================================================================
-SiStripBackPlaneCorrection* 
-SiStripBackplaneCalibration::createFromTree(const char *fileName, const char *treeName) const
-{
+SiStripBackPlaneCorrection *SiStripBackplaneCalibration::createFromTree(const char *fileName,
+                                                                        const char *treeName) const {
   // Check for file existence on your own to work around
   // https://hypernews.cern.ch/HyperNews/CMS/get/swDevelopment/2715.html:
-  TFile* file = nullptr;
-  FILE* testFile = fopen(fileName,"r");
+  TFile *file = nullptr;
+  FILE *testFile = fopen(fileName, "r");
   if (testFile) {
     fclose(testFile);
     file = TFile::Open(fileName, "READ");
-  } // else not existing, see error below
+  }  // else not existing, see error below
 
   TTree *tree = nullptr;
-  if (file) file->GetObject(treeName, tree);
+  if (file)
+    file->GetObject(treeName, tree);
 
   SiStripBackPlaneCorrection *result = nullptr;
   if (tree) {
@@ -564,22 +537,20 @@ SiStripBackplaneCalibration::createFromTree(const char *fileName, const char *tr
       tree->GetEntry(iEntry);
       result->putBackPlaneCorrection(id, value);
     }
-  } else { // Warning only since could be parallel job on no events.
+  } else {  // Warning only since could be parallel job on no events.
     edm::LogWarning("Alignment") << "@SUB=SiStripBackplaneCalibration::createFromTree"
-                                 << "Could not get TTree '" << treeName << "' from file '"
-                                 << fileName << (file ? "'." : "' (file does not exist).");
+                                 << "Could not get TTree '" << treeName << "' from file '" << fileName
+                                 << (file ? "'." : "' (file does not exist).");
   }
 
-  delete file; // tree will vanish with file
+  delete file;  // tree will vanish with file
   return result;
 }
 
-
 //======================================================================
 //======================================================================
 // Plugin definition
 
 #include "Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationPluginFactory.h"
 
-DEFINE_EDM_PLUGIN(IntegratedCalibrationPluginFactory,
-		   SiStripBackplaneCalibration, "SiStripBackplaneCalibration");
+DEFINE_EDM_PLUGIN(IntegratedCalibrationPluginFactory, SiStripBackplaneCalibration, "SiStripBackplaneCalibration");
diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/SiStripLorentzAngleCalibration.cc b/Alignment/CommonAlignmentAlgorithm/plugins/SiStripLorentzAngleCalibration.cc
index 7957d822be5d8..b910f6f965f0e 100644
--- a/Alignment/CommonAlignmentAlgorithm/plugins/SiStripLorentzAngleCalibration.cc
+++ b/Alignment/CommonAlignmentAlgorithm/plugins/SiStripLorentzAngleCalibration.cc
@@ -50,8 +50,7 @@
 #include <memory>
 #include <functional>
 
-class SiStripLorentzAngleCalibration : public IntegratedCalibrationBase
-{
+class SiStripLorentzAngleCalibration : public IntegratedCalibrationBase {
 public:
   /// Constructor
   explicit SiStripLorentzAngleCalibration(const edm::ParameterSet &cfg);
@@ -87,12 +86,10 @@ class SiStripLorentzAngleCalibration : public IntegratedCalibrationBase
   double getParameterError(unsigned int index) const override;
 
   // /// Call at beginning of job:
-  void beginOfJob(AlignableTracker *tracker,
-                  AlignableMuon *muon,
-                  AlignableExtras *extras) override;
+  void beginOfJob(AlignableTracker *tracker, AlignableMuon *muon, AlignableExtras *extras) override;
 
   /// Call at beginning of run:
-  void beginRun(const edm::Run&, const edm::EventSetup&) override;
+  void beginRun(const edm::Run &, const edm::EventSetup &) override;
 
   /// Called at end of a the job of the AlignmentProducer.
   /// Write out determined parameters.
@@ -102,7 +99,7 @@ class SiStripLorentzAngleCalibration : public IntegratedCalibrationBase
   /// Input LorentzAngle values:
   /// - either from EventSetup of first call to derivatives(..)
   /// - or created from files of passed by configuration (i.e. from parallel processing)
-  const SiStripLorentzAngle* getLorentzAnglesInput(const align::RunNumber& = 0);
+  const SiStripLorentzAngle *getLorentzAnglesInput(const align::RunNumber & = 0);
   /// in non-peak mode the effective thickness is reduced...
   double effectiveThickness(const GeomDet *det, int16_t mode, const edm::EventSetup &setup) const;
 
@@ -111,7 +108,8 @@ class SiStripLorentzAngleCalibration : public IntegratedCalibrationBase
   double getParameterForDetId(unsigned int detId, edm::RunNumber_t run) const;
 
   void writeTree(const SiStripLorentzAngle *lorentzAngle,
-                 const std::map<unsigned int,TreeStruct> &treeInfo, const char *treeName) const;
+                 const std::map<unsigned int, TreeStruct> &treeInfo,
+                 const char *treeName) const;
   SiStripLorentzAngle createFromTree(const char *fileName, const char *treeName) const;
 
   const std::string readoutModeName_;
@@ -124,7 +122,7 @@ class SiStripLorentzAngleCalibration : public IntegratedCalibrationBase
   edm::ESWatcher<SiStripLorentzAngleRcd> watchLorentzAngleRcd_;
 
   std::map<align::RunNumber, SiStripLorentzAngle> cachedLorentzAngleInputs_;
-  SiStripLorentzAngle* siStripLorentzAngleInput_{nullptr};
+  SiStripLorentzAngle *siStripLorentzAngleInput_{nullptr};
   align::RunNumber currentIOV_{0};
 
   std::vector<double> parameters_;
@@ -139,15 +137,13 @@ class SiStripLorentzAngleCalibration : public IntegratedCalibrationBase
 //======================================================================
 
 SiStripLorentzAngleCalibration::SiStripLorentzAngleCalibration(const edm::ParameterSet &cfg)
-  : IntegratedCalibrationBase(cfg),
-    readoutModeName_(cfg.getParameter<std::string>("readoutMode")),
-    saveToDB_(cfg.getParameter<bool>("saveToDB")),
-    recordNameDBwrite_(cfg.getParameter<std::string>("recordNameDBwrite")),
-    outFileName_(cfg.getParameter<std::string>("treeFile")),
-    mergeFileNames_(cfg.getParameter<std::vector<std::string> >("mergeTreeFiles")),
-    moduleGroupSelCfg_(cfg.getParameter<edm::ParameterSet>("LorentzAngleModuleGroups"))
-{
-
+    : IntegratedCalibrationBase(cfg),
+      readoutModeName_(cfg.getParameter<std::string>("readoutMode")),
+      saveToDB_(cfg.getParameter<bool>("saveToDB")),
+      recordNameDBwrite_(cfg.getParameter<std::string>("recordNameDBwrite")),
+      outFileName_(cfg.getParameter<std::string>("treeFile")),
+      mergeFileNames_(cfg.getParameter<std::vector<std::string> >("mergeTreeFiles")),
+      moduleGroupSelCfg_(cfg.getParameter<edm::ParameterSet>("LorentzAngleModuleGroups")) {
   // SiStripLatency::singleReadOutMode() returns
   // 1: all in peak, 0: all in deco, -1: mixed state
   // (in principle one could treat even mixed state APV by APV...)
@@ -156,33 +152,27 @@ SiStripLorentzAngleCalibration::SiStripLorentzAngleCalibration(const edm::Parame
   } else if (readoutModeName_ == "deconvolution") {
     readoutMode_ = kDeconvolutionMode;
   } else {
-    throw cms::Exception("BadConfig")
-      << "SiStripLorentzAngleCalibration:\n" << "Unknown mode '"
-      << readoutModeName_ << "', should be 'peak' or 'deconvolution' .\n";
+    throw cms::Exception("BadConfig") << "SiStripLorentzAngleCalibration:\n"
+                                      << "Unknown mode '" << readoutModeName_
+                                      << "', should be 'peak' or 'deconvolution' .\n";
   }
-
 }
 
 //======================================================================
-unsigned int SiStripLorentzAngleCalibration::numParameters() const
-{
-  return parameters_.size();
-}
+unsigned int SiStripLorentzAngleCalibration::numParameters() const { return parameters_.size(); }
 
 //======================================================================
-void
-SiStripLorentzAngleCalibration::beginRun(const edm::Run& run,
-                                         const edm::EventSetup& setup) {
-
+void SiStripLorentzAngleCalibration::beginRun(const edm::Run &run, const edm::EventSetup &setup) {
   // no action needed if the LA record didn't change
-  if (!(watchLorentzAngleRcd_.check(setup))) return;
+  if (!(watchLorentzAngleRcd_.check(setup)))
+    return;
 
   const auto runNumber = run.run();
   auto firstRun = cond::timeTypeSpecs[cond::runnumber].beginValue;
 
   // avoid infinite loop due to wrap-around of unsigned variable 'i' including
   // arrow from i to zero and a nice smiley ;)
-  for (unsigned int i = moduleGroupSelector_->numIovs(); i-->0 ;) {
+  for (unsigned int i = moduleGroupSelector_->numIovs(); i-- > 0;) {
     const auto firstRunOfIOV = moduleGroupSelector_->firstRunOfIOV(i);
     if (runNumber >= firstRunOfIOV) {
       firstRun = firstRunOfIOV;
@@ -191,24 +181,22 @@ SiStripLorentzAngleCalibration::beginRun(const edm::Run& run,
   }
 
   edm::ESHandle<SiStripLorentzAngle> lorentzAngleHandle;
-  const auto& lorentzAngleRcd = setup.get<SiStripLorentzAngleRcd>();
+  const auto &lorentzAngleRcd = setup.get<SiStripLorentzAngleRcd>();
   lorentzAngleRcd.get(readoutModeName_, lorentzAngleHandle);
   if (cachedLorentzAngleInputs_.find(firstRun) == cachedLorentzAngleInputs_.end()) {
     cachedLorentzAngleInputs_.emplace(firstRun, SiStripLorentzAngle(*lorentzAngleHandle));
   } else {
     if (lorentzAngleRcd.validityInterval().first().eventID().run() > firstRun &&
-        lorentzAngleHandle->getLorentzAngles()  // only bad if non-identical values
-        != cachedLorentzAngleInputs_[firstRun].getLorentzAngles()) { // (comparing maps)
+        lorentzAngleHandle->getLorentzAngles()                            // only bad if non-identical values
+            != cachedLorentzAngleInputs_[firstRun].getLorentzAngles()) {  // (comparing maps)
       // Maps are containers sorted by key, but comparison problems may arise from
       // 'floating point comparison' problems (FIXME?)
-      throw cms::Exception("BadInput")
-        << "Trying to cache SiStripLorentzAngle payload for a run (" << runNumber
-        << ") in an IOV (" << firstRun << ") that was already cached.\n"
-        << "The following record in your input database tag has an IOV "
-        << "boundary that does not match your IOV definition:\n"
-        << " - SiStripLorentzAngleRcd '" << lorentzAngleRcd.key().name()
-        << "' (since "
-        << lorentzAngleRcd.validityInterval().first().eventID().run() << ")\n";
+      throw cms::Exception("BadInput") << "Trying to cache SiStripLorentzAngle payload for a run (" << runNumber
+                                       << ") in an IOV (" << firstRun << ") that was already cached.\n"
+                                       << "The following record in your input database tag has an IOV "
+                                       << "boundary that does not match your IOV definition:\n"
+                                       << " - SiStripLorentzAngleRcd '" << lorentzAngleRcd.key().name() << "' (since "
+                                       << lorentzAngleRcd.validityInterval().first().eventID().run() << ")\n";
     }
   }
 
@@ -217,24 +205,22 @@ SiStripLorentzAngleCalibration::beginRun(const edm::Run& run,
 }
 
 //======================================================================
-unsigned int
-SiStripLorentzAngleCalibration::derivatives(std::vector<ValuesIndexPair> &outDerivInds,
-                                            const TransientTrackingRecHit &hit,
-                                            const TrajectoryStateOnSurface &tsos,
-                                            const edm::EventSetup &setup,
-                                            const EventInfo &eventInfo) const
-{
+unsigned int SiStripLorentzAngleCalibration::derivatives(std::vector<ValuesIndexPair> &outDerivInds,
+                                                         const TransientTrackingRecHit &hit,
+                                                         const TrajectoryStateOnSurface &tsos,
+                                                         const edm::EventSetup &setup,
+                                                         const EventInfo &eventInfo) const {
   outDerivInds.clear();
 
   edm::ESHandle<SiStripLatency> latency;
   setup.get<SiStripLatencyRcd>().get(latency);
   const int16_t mode = latency->singleReadOutMode();
   if (mode == readoutMode_) {
-    if (hit.det()) { // otherwise 'constraint hit' or whatever
+    if (hit.det()) {  // otherwise 'constraint hit' or whatever
 
-      const int index = moduleGroupSelector_->getParameterIndexFromDetId(hit.det()->geographicalId(),
-                                                                         eventInfo.eventId().run());
-      if (index >= 0) { // otherwise not treated
+      const int index =
+          moduleGroupSelector_->getParameterIndexFromDetId(hit.det()->geographicalId(), eventInfo.eventId().run());
+      if (index >= 0) {  // otherwise not treated
         edm::ESHandle<MagneticField> magneticField;
         setup.get<IdealMagneticFieldRecord>().get(magneticField);
         const GlobalVector bField(magneticField->inTesla(hit.det()->surface().position()));
@@ -249,10 +235,10 @@ SiStripLorentzAngleCalibration::derivatives(std::vector<ValuesIndexPair> &outDer
         //      drift.x = -mobility * by * thickness (full drift from backside)
         //      So '-' already comes from that, not from mobility being part of
         //      track model...
-	// GM: sign convention is the same as for pixel LA, i.e. adopt it here, too
-        const double xDerivative = bFieldLocal.y() * dZ * -0.5; // parameter is mobility!
-        const double yDerivative = bFieldLocal.x() * dZ * 0.5; // parameter is mobility!
-        if (xDerivative || yDerivative) { // If field is zero, this is zero: do not return it
+        // GM: sign convention is the same as for pixel LA, i.e. adopt it here, too
+        const double xDerivative = bFieldLocal.y() * dZ * -0.5;  // parameter is mobility!
+        const double yDerivative = bFieldLocal.x() * dZ * 0.5;   // parameter is mobility!
+        if (xDerivative || yDerivative) {                        // If field is zero, this is zero: do not return it
           const Values derivs{xDerivative, yDerivative};
           outDerivInds.push_back(ValuesIndexPair(derivs, index));
         }
@@ -264,16 +250,15 @@ SiStripLorentzAngleCalibration::derivatives(std::vector<ValuesIndexPair> &outDer
   } else if (mode != kDeconvolutionMode && mode != kPeakMode) {
     // warn only if unknown/mixed mode
     edm::LogWarning("Alignment") << "@SUB=SiStripLorentzAngleCalibration::derivatives2"
-                                 << "Readout mode is " << mode << ", but looking for "
-                                 << readoutMode_ << " (" << readoutModeName_ << ").";
+                                 << "Readout mode is " << mode << ", but looking for " << readoutMode_ << " ("
+                                 << readoutModeName_ << ").";
   }
 
   return outDerivInds.size();
 }
 
 //======================================================================
-bool SiStripLorentzAngleCalibration::setParameter(unsigned int index, double value)
-{
+bool SiStripLorentzAngleCalibration::setParameter(unsigned int index, double value) {
   if (index >= parameters_.size()) {
     return false;
   } else {
@@ -283,8 +268,7 @@ bool SiStripLorentzAngleCalibration::setParameter(unsigned int index, double val
 }
 
 //======================================================================
-bool SiStripLorentzAngleCalibration::setParameterError(unsigned int index, double error)
-{
+bool SiStripLorentzAngleCalibration::setParameterError(unsigned int index, double error) {
   if (index >= paramUncertainties_.size()) {
     return false;
   } else {
@@ -294,36 +278,31 @@ bool SiStripLorentzAngleCalibration::setParameterError(unsigned int index, doubl
 }
 
 //======================================================================
-double SiStripLorentzAngleCalibration::getParameter(unsigned int index) const
-{
+double SiStripLorentzAngleCalibration::getParameter(unsigned int index) const {
   return (index >= parameters_.size() ? 0. : parameters_[index]);
 }
 
 //======================================================================
-double SiStripLorentzAngleCalibration::getParameterError(unsigned int index) const
-{
+double SiStripLorentzAngleCalibration::getParameterError(unsigned int index) const {
   return (index >= paramUncertainties_.size() ? 0. : paramUncertainties_[index]);
 }
 
 //======================================================================
 void SiStripLorentzAngleCalibration::beginOfJob(AlignableTracker *aliTracker,
                                                 AlignableMuon * /*aliMuon*/,
-                                                AlignableExtras * /*aliExtras*/)
-{
+                                                AlignableExtras * /*aliExtras*/) {
   //specify the sub-detectors for which the LA is determined
-  const std::vector<int> sdets = {SiStripDetId::TIB, SiStripDetId::TOB,
-                                  SiStripDetId::TID, SiStripDetId::TEC};
-  moduleGroupSelector_ =
-    std::make_unique<TkModuleGroupSelector>(aliTracker, moduleGroupSelCfg_, sdets);
+  const std::vector<int> sdets = {SiStripDetId::TIB, SiStripDetId::TOB, SiStripDetId::TID, SiStripDetId::TEC};
+  moduleGroupSelector_ = std::make_unique<TkModuleGroupSelector>(aliTracker, moduleGroupSelCfg_, sdets);
 
   parameters_.resize(moduleGroupSelector_->getNumberOfParameters(), 0.);
   paramUncertainties_.resize(moduleGroupSelector_->getNumberOfParameters(), 0.);
 
-  edm::LogInfo("Alignment") << "@SUB=SiStripLorentzAngleCalibration" << "Created with name "
-                            << this->name() << " for readout mode '" << readoutModeName_
-                            << "',\n" << this->numParameters() << " parameters to be determined."
-                            << "\nsaveToDB = " << saveToDB_
-                            << "\n outFileName = " << outFileName_
+  edm::LogInfo("Alignment") << "@SUB=SiStripLorentzAngleCalibration"
+                            << "Created with name " << this->name() << " for readout mode '" << readoutModeName_
+                            << "',\n"
+                            << this->numParameters() << " parameters to be determined."
+                            << "\nsaveToDB = " << saveToDB_ << "\n outFileName = " << outFileName_
                             << "\n N(merge files) = " << mergeFileNames_.size()
                             << "\n number of IOVs = " << moduleGroupSelector_->numIovs();
 
@@ -333,10 +312,8 @@ void SiStripLorentzAngleCalibration::beginOfJob(AlignableTracker *aliTracker,
   }
 }
 
-
 //======================================================================
-void SiStripLorentzAngleCalibration::endOfJob()
-{
+void SiStripLorentzAngleCalibration::endOfJob() {
   // loginfo output
   std::ostringstream out;
   out << "Parameter results for readout mode '" << readoutModeName_ << "'\n";
@@ -345,38 +322,38 @@ void SiStripLorentzAngleCalibration::endOfJob()
   }
   edm::LogInfo("Alignment") << "@SUB=SiStripLorentzAngleCalibration::endOfJob" << out.str();
 
-  std::map<unsigned int, TreeStruct> treeInfo; // map of TreeStruct for each detId
+  std::map<unsigned int, TreeStruct> treeInfo;  // map of TreeStruct for each detId
 
   // now write 'input' tree
   const std::string treeName{this->name() + '_' + readoutModeName_ + '_'};
-  std::vector<const SiStripLorentzAngle*> inputs{};
+  std::vector<const SiStripLorentzAngle *> inputs{};
   inputs.reserve(moduleGroupSelector_->numIovs());
   for (unsigned int iIOV = 0; iIOV < moduleGroupSelector_->numIovs(); ++iIOV) {
     const auto firstRunOfIOV = moduleGroupSelector_->firstRunOfIOV(iIOV);
-    inputs.push_back(this->getLorentzAnglesInput(firstRunOfIOV)); // never NULL
-    this->writeTree(inputs.back(), treeInfo,
-                    (treeName + "input_" + std::to_string(firstRunOfIOV)).c_str()); // empty treeInfo for input...
+    inputs.push_back(this->getLorentzAnglesInput(firstRunOfIOV));  // never NULL
+    this->writeTree(inputs.back(),
+                    treeInfo,
+                    (treeName + "input_" + std::to_string(firstRunOfIOV)).c_str());  // empty treeInfo for input...
 
     if (inputs.back()->getLorentzAngles().empty()) {
       edm::LogError("Alignment") << "@SUB=SiStripLorentzAngleCalibration::endOfJob"
-                                 << "Input Lorentz angle map is empty ('"
-                                 << readoutModeName_ << "' mode), skip writing output!";
+                                 << "Input Lorentz angle map is empty ('" << readoutModeName_
+                                 << "' mode), skip writing output!";
       return;
     }
   }
 
-  const unsigned int nonZeroParamsOrErrors =   // Any determined value?
-    count_if (parameters_.begin(), parameters_.end(), [](auto c){return c!=0.;})
-    + count_if(paramUncertainties_.begin(), paramUncertainties_.end(),
-               [](auto c){return c!=0.;});
+  const unsigned int nonZeroParamsOrErrors =  // Any determined value?
+      count_if(parameters_.begin(), parameters_.end(), [](auto c) { return c != 0.; }) +
+      count_if(paramUncertainties_.begin(), paramUncertainties_.end(), [](auto c) { return c != 0.; });
 
   for (unsigned int iIOV = 0; iIOV < moduleGroupSelector_->numIovs(); ++iIOV) {
     auto firstRunOfIOV = static_cast<cond::Time_t>(moduleGroupSelector_->firstRunOfIOV(iIOV));
     SiStripLorentzAngle output{};
     // Loop on map of values from input and add (possible) parameter results
-    for (const auto& iterIdValue: inputs[iIOV]->getLorentzAngles()) {
+    for (const auto &iterIdValue : inputs[iIOV]->getLorentzAngles()) {
       // type of 'iterIdValue' is pair<unsigned int, float>
-      const auto detId = iterIdValue.first; // key of map is DetId
+      const auto detId = iterIdValue.first;  // key of map is DetId
       // Some code one could use to miscalibrate wrt input:
       // double param = 0.;
       // const DetId id(detId);
@@ -389,15 +366,15 @@ void SiStripLorentzAngleCalibration::endOfJob()
       // put result in output, i.e. sum of input and determined parameter:
       auto value = iterIdValue.second + static_cast<float>(param);
       output.putLorentzAngle(detId, value);
-      const int paramIndex = moduleGroupSelector_->getParameterIndexFromDetId(detId,firstRunOfIOV);
+      const int paramIndex = moduleGroupSelector_->getParameterIndexFromDetId(detId, firstRunOfIOV);
       treeInfo[detId] = TreeStruct(param, this->getParameterError(paramIndex), paramIndex);
     }
 
-    if (saveToDB_ || nonZeroParamsOrErrors != 0) { // Skip writing mille jobs...
+    if (saveToDB_ || nonZeroParamsOrErrors != 0) {  // Skip writing mille jobs...
       this->writeTree(&output, treeInfo, (treeName + Form("result_%lld", firstRunOfIOV)).c_str());
     }
 
-    if (saveToDB_) { // If requested, write out to DB
+    if (saveToDB_) {  // If requested, write out to DB
       edm::Service<cond::service::PoolDBOutputService> dbService;
       if (dbService.isAvailable()) {
         dbService->writeOne(&output, firstRunOfIOV, recordNameDBwrite_);
@@ -406,22 +383,22 @@ void SiStripLorentzAngleCalibration::endOfJob()
                                    << "No PoolDBOutputService available, but saveToDB true!";
       }
     }
-  } // end loop on IOVs
+  }  // end loop on IOVs
 }
 
 //======================================================================
 double SiStripLorentzAngleCalibration::effectiveThickness(const GeomDet *det,
                                                           int16_t mode,
-                                                          const edm::EventSetup &setup) const
-{
-  if (!det) return 0.;
-  double dZ = det->surface().bounds().thickness(); // it is a float only...
+                                                          const edm::EventSetup &setup) const {
+  if (!det)
+    return 0.;
+  double dZ = det->surface().bounds().thickness();  // it is a float only...
   const SiStripDetId id(det->geographicalId());
   edm::ESHandle<SiStripBackPlaneCorrection> backPlaneHandle;
   // FIXME: which one? DepRcd->get(handle) or Rcd->get(readoutModeName_, handle)??
   // setup.get<SiStripBackPlaneCorrectionDepRcd>().get(backPlaneHandle); // get correct mode
   setup.get<SiStripBackPlaneCorrectionRcd>().get(readoutModeName_, backPlaneHandle);
-  const double bpCor = backPlaneHandle->getBackPlaneCorrection(id); // it's a float...
+  const double bpCor = backPlaneHandle->getBackPlaneCorrection(id);  // it's a float...
   //  std::cout << "bpCor " << bpCor << " in subdet " << id.subdetId() << std::endl;
   dZ *= (1. - bpCor);
 
@@ -429,17 +406,14 @@ double SiStripLorentzAngleCalibration::effectiveThickness(const GeomDet *det,
 }
 
 //======================================================================
-const SiStripLorentzAngle*
-SiStripLorentzAngleCalibration::getLorentzAnglesInput(const align::RunNumber& run)
-{
-  const auto& resolvedRun = run > 0 ? run : currentIOV_;
+const SiStripLorentzAngle *SiStripLorentzAngleCalibration::getLorentzAnglesInput(const align::RunNumber &run) {
+  const auto &resolvedRun = run > 0 ? run : currentIOV_;
   // For parallel processing in Millepede II, create SiStripLorentzAngle
   // from info stored in files of parallel jobs and check that they are identical.
   // If this job has run on events, still check that LA is identical to the ones
   // from mergeFileNames_.
-  const std::string treeName{this->name()+"_"+readoutModeName_+"_input_"+
-                             std::to_string(resolvedRun)};
-  for (const auto& iFile: mergeFileNames_) {
+  const std::string treeName{this->name() + "_" + readoutModeName_ + "_input_" + std::to_string(resolvedRun)};
+  for (const auto &iFile : mergeFileNames_) {
     auto la = this->createFromTree(iFile.c_str(), treeName.c_str());
     // siStripLorentzAngleInput_ could be non-null from previous file of this loop
     // or from checkLorentzAngleInput(..) when running on data in this job as well
@@ -449,18 +423,16 @@ SiStripLorentzAngleCalibration::getLorentzAnglesInput(const align::RunNumber& ru
       currentIOV_ = resolvedRun;
     } else {
       // FIXME: about comparison of maps see comments in checkLorentzAngleInput
-      if (!la.getLorentzAngles().empty() && // single job might not have got events
+      if (!la.getLorentzAngles().empty() &&  // single job might not have got events
           la.getLorentzAngles() != siStripLorentzAngleInput_->getLorentzAngles()) {
         // Throw exception instead of error?
         edm::LogError("NoInput") << "@SUB=SiStripLorentzAngleCalibration::getLorentzAnglesInput"
-                                 << "Different input values from tree " << treeName
-                                 << " in file " << iFile << ".";
-
+                                 << "Different input values from tree " << treeName << " in file " << iFile << ".";
       }
     }
   }
 
-  if (!siStripLorentzAngleInput_) { // no files nor ran on events
+  if (!siStripLorentzAngleInput_) {  // no files nor ran on events
     // [] operator default-constructs an empty SiStripLorentzAngle object in place:
     siStripLorentzAngleInput_ = &(cachedLorentzAngleInputs_[resolvedRun]);
     currentIOV_ = resolvedRun;
@@ -475,9 +447,7 @@ SiStripLorentzAngleCalibration::getLorentzAnglesInput(const align::RunNumber& ru
 }
 
 //======================================================================
-double SiStripLorentzAngleCalibration::getParameterForDetId(unsigned int detId,
-                                                            edm::RunNumber_t run) const
-{
+double SiStripLorentzAngleCalibration::getParameterForDetId(unsigned int detId, edm::RunNumber_t run) const {
   const int index = moduleGroupSelector_->getParameterIndexFromDetId(detId, run);
 
   return (index < 0 ? 0. : parameters_[index]);
@@ -486,11 +456,11 @@ double SiStripLorentzAngleCalibration::getParameterForDetId(unsigned int detId,
 //======================================================================
 void SiStripLorentzAngleCalibration::writeTree(const SiStripLorentzAngle *lorentzAngle,
                                                const std::map<unsigned int, TreeStruct> &treeInfo,
-                                               const char *treeName) const
-{
-  if (!lorentzAngle) return;
+                                               const char *treeName) const {
+  if (!lorentzAngle)
+    return;
 
-  TFile* file = TFile::Open(outFileName_.c_str(), "UPDATE");
+  TFile *file = TFile::Open(outFileName_.c_str(), "UPDATE");
   if (!file) {
     edm::LogError("BadConfig") << "@SUB=SiStripLorentzAngleCalibration::writeTree"
                                << "Could not open file '" << outFileName_ << "'.";
@@ -506,15 +476,16 @@ void SiStripLorentzAngleCalibration::writeTree(const SiStripLorentzAngle *lorent
   tree->Branch("treeStruct", &treeStruct, TreeStruct::LeafList());
 
   for (auto iterIdValue = lorentzAngle->getLorentzAngles().begin();
-       iterIdValue != lorentzAngle->getLorentzAngles().end(); ++iterIdValue) {
+       iterIdValue != lorentzAngle->getLorentzAngles().end();
+       ++iterIdValue) {
     // type of (*iterIdValue) is pair<unsigned int, float>
-    id = iterIdValue->first; // key of map is DetId
+    id = iterIdValue->first;  // key of map is DetId
     value = iterIdValue->second;
     // type of (*treeStructIter) is pair<unsigned int, TreeStruct>
-    auto treeStructIter = treeInfo.find(id); // find info for this id
+    auto treeStructIter = treeInfo.find(id);  // find info for this id
     if (treeStructIter != treeInfo.end()) {
-      treeStruct = treeStructIter->second; // info from input map
-    } else { // if none found, fill at least parameter index (using 1st IOV...)
+      treeStruct = treeStructIter->second;  // info from input map
+    } else {                                // if none found, fill at least parameter index (using 1st IOV...)
       const cond::Time_t run1of1stIov = moduleGroupSelector_->firstRunOfIOV(0);
       const int ind = moduleGroupSelector_->getParameterIndexFromDetId(id, run1of1stIov);
       treeStruct = TreeStruct(ind);
@@ -522,24 +493,23 @@ void SiStripLorentzAngleCalibration::writeTree(const SiStripLorentzAngle *lorent
     tree->Fill();
   }
   tree->Write();
-  delete file; // tree vanishes with the file...
+  delete file;  // tree vanishes with the file...
 }
 
 //======================================================================
-SiStripLorentzAngle
-SiStripLorentzAngleCalibration::createFromTree(const char *fileName, const char *treeName) const
-{
+SiStripLorentzAngle SiStripLorentzAngleCalibration::createFromTree(const char *fileName, const char *treeName) const {
   // Check for file existence on your own to work around
   // https://hypernews.cern.ch/HyperNews/CMS/get/swDevelopment/2715.html:
-  TFile* file = nullptr;
-  FILE* testFile = fopen(fileName,"r");
+  TFile *file = nullptr;
+  FILE *testFile = fopen(fileName, "r");
   if (testFile) {
     fclose(testFile);
     file = TFile::Open(fileName, "READ");
-  } // else not existing, see error below
+  }  // else not existing, see error below
 
   TTree *tree = nullptr;
-  if (file) file->GetObject(treeName, tree);
+  if (file)
+    file->GetObject(treeName, tree);
 
   SiStripLorentzAngle result{};
   if (tree) {
@@ -553,22 +523,20 @@ SiStripLorentzAngleCalibration::createFromTree(const char *fileName, const char
       tree->GetEntry(iEntry);
       result.putLorentzAngle(id, value);
     }
-  } else { // Warning only since could be parallel job on no events.
+  } else {  // Warning only since could be parallel job on no events.
     edm::LogWarning("Alignment") << "@SUB=SiStripLorentzAngleCalibration::createFromTree"
-                                 << "Could not get TTree '" << treeName << "' from file '"
-                                 << fileName << (file ? "'." : "' (file does not exist).");
+                                 << "Could not get TTree '" << treeName << "' from file '" << fileName
+                                 << (file ? "'." : "' (file does not exist).");
   }
 
-  delete file; // tree will vanish with file
+  delete file;  // tree will vanish with file
   return result;
 }
 
-
 //======================================================================
 //======================================================================
 // Plugin definition
 
 #include "Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationPluginFactory.h"
 
-DEFINE_EDM_PLUGIN(IntegratedCalibrationPluginFactory,
-                  SiStripLorentzAngleCalibration, "SiStripLorentzAngleCalibration");
+DEFINE_EDM_PLUGIN(IntegratedCalibrationPluginFactory, SiStripLorentzAngleCalibration, "SiStripLorentzAngleCalibration");
diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/SiStripReadoutModeEnums.h b/Alignment/CommonAlignmentAlgorithm/plugins/SiStripReadoutModeEnums.h
index 5930b2a85a402..735b156899ba7 100644
--- a/Alignment/CommonAlignmentAlgorithm/plugins/SiStripReadoutModeEnums.h
+++ b/Alignment/CommonAlignmentAlgorithm/plugins/SiStripReadoutModeEnums.h
@@ -3,6 +3,6 @@
 
 // SiStripLatency::singleReadOutMode() returns
 // 1: all in peak, 0: all in deco, -1: mixed state
-enum {kDeconvolutionMode = 0, kPeakMode = 1};
+enum { kDeconvolutionMode = 0, kPeakMode = 1 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/plugins/TreeStruct.h b/Alignment/CommonAlignmentAlgorithm/plugins/TreeStruct.h
index 59887f05b1b1b..f99d6aac4ca15 100644
--- a/Alignment/CommonAlignmentAlgorithm/plugins/TreeStruct.h
+++ b/Alignment/CommonAlignmentAlgorithm/plugins/TreeStruct.h
@@ -3,18 +3,17 @@
 
 /// structure to store algorithm results in a TTree
 
-struct TreeStruct 
-{
+struct TreeStruct {
   TreeStruct() : delta(0.f), error(0.f), paramIndex(0) {}
   TreeStruct(int ind) : delta(0.f), error(0.f), paramIndex(ind) {}
   TreeStruct(float del, float err, int ind) : delta(del), error(err), paramIndex(ind) {}
-  
+
   float delta;     /// parameter from alignment algorithm (change wrt. start)
   float error;     /// error from alignment algorithm
-  int   paramIndex;/// internal param. index (same index => same delta)
+  int paramIndex;  /// internal param. index (same index => same delta)
   /// List of leaves to pass as 3rd argument to TTree::Branch(...) if 2nd argument
   /// is a pointer to TreeStruct - keep in synch with data members above!
-  static const char* LeafList() {return "delta/F:error/F:paramIndex/I";}
+  static const char* LeafList() { return "delta/F:error/F:paramIndex/I"; }
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentAlgorithm/src/AlignableDataIO.cc b/Alignment/CommonAlignmentAlgorithm/src/AlignableDataIO.cc
index 35939ede97e90..75501cbb3d439 100644
--- a/Alignment/CommonAlignmentAlgorithm/src/AlignableDataIO.cc
+++ b/Alignment/CommonAlignmentAlgorithm/src/AlignableDataIO.cc
@@ -7,213 +7,150 @@
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignableDataIO.h"
 
 // ----------------------------------------------------------------------------
-AlignableAbsData AlignableDataIO::readAbsPos(Alignable* ali, int& ierr)
-{ 
-  return readAbsRaw(ali,ierr);
-}
-
+AlignableAbsData AlignableDataIO::readAbsPos(Alignable* ali, int& ierr) { return readAbsRaw(ali, ierr); }
 
 // ----------------------------------------------------------------------------
-AlignableAbsData AlignableDataIO::readOrgPos(Alignable* ali, int& ierr)
-{ 
-  return readAbsRaw(ali,ierr);
-}
-
+AlignableAbsData AlignableDataIO::readOrgPos(Alignable* ali, int& ierr) { return readAbsRaw(ali, ierr); }
 
 // ----------------------------------------------------------------------------
-AlignableRelData AlignableDataIO::readRelPos(Alignable* ali, int& ierr)
-{ 
-  return readRelRaw(ali,ierr);
-}
-
+AlignableRelData AlignableDataIO::readRelPos(Alignable* ali, int& ierr) { return readRelRaw(ali, ierr); }
 
 // ----------------------------------------------------------------------------
-int AlignableDataIO::writeAbsPos(Alignable* ali, bool validCheck)
-{
-  
-  if ( !(validCheck) || ali->alignmentParameters()->isValid() ) 
-    {
-      // position in global frame
-      align::PositionType pos = ali->surface().position();
-      // global rotation
-      align::RotationType rot = ali->surface().rotation();
-      // if a unit: store surface deformation (little kind of hack)...
-      std::vector<double> pars;
-      if (ali->alignableObjectId() == align::AlignableDetUnit) { // only detunits have them
-        std::vector<std::pair<int,SurfaceDeformation*> > result;
-        if (1 == ali->surfaceDeformationIdPairs(result)) { // might not have any...
-          pars = result[0].second->parameters();
-        }
+int AlignableDataIO::writeAbsPos(Alignable* ali, bool validCheck) {
+  if (!(validCheck) || ali->alignmentParameters()->isValid()) {
+    // position in global frame
+    align::PositionType pos = ali->surface().position();
+    // global rotation
+    align::RotationType rot = ali->surface().rotation();
+    // if a unit: store surface deformation (little kind of hack)...
+    std::vector<double> pars;
+    if (ali->alignableObjectId() == align::AlignableDetUnit) {  // only detunits have them
+      std::vector<std::pair<int, SurfaceDeformation*> > result;
+      if (1 == ali->surfaceDeformationIdPairs(result)) {  // might not have any...
+        pars = result[0].second->parameters();
       }
-
-      // write
-      return writeAbsRaw( 
-			 AlignableAbsData( pos,rot,
-					   ali->id(),
-					   ali->alignableObjectId(),
-                                           pars)
-			 );
     }
 
+    // write
+    return writeAbsRaw(AlignableAbsData(pos, rot, ali->id(), ali->alignableObjectId(), pars));
+  }
+
   return 1;
 }
 
-
 // ----------------------------------------------------------------------------
-int AlignableDataIO::writeRelPos(Alignable* ali, bool validCheck)
-{
-  if ( !(validCheck) || ali->alignmentParameters()->isValid() ) 
-    {
-      // rel. shift in global frame
-      const align::GlobalVector& pos = ali->displacement();
-      // rel. rotation in global frame
-      align::RotationType rot = ali->rotation();
-      // FIXME: should add something to store changes of surface deformations...
-      std::vector<double> pars;
-      // write
-      return writeRelRaw(AlignableRelData(pos,rot,ali->id(),
-					  ali->alignableObjectId(), pars));
-    }
+int AlignableDataIO::writeRelPos(Alignable* ali, bool validCheck) {
+  if (!(validCheck) || ali->alignmentParameters()->isValid()) {
+    // rel. shift in global frame
+    const align::GlobalVector& pos = ali->displacement();
+    // rel. rotation in global frame
+    align::RotationType rot = ali->rotation();
+    // FIXME: should add something to store changes of surface deformations...
+    std::vector<double> pars;
+    // write
+    return writeRelRaw(AlignableRelData(pos, rot, ali->id(), ali->alignableObjectId(), pars));
+  }
 
   return 1;
 }
 
-
 // ----------------------------------------------------------------------------
-int AlignableDataIO::writeOrgPos(Alignable* ali, bool validCheck)
-{
-  if ( !(validCheck) || ali->alignmentParameters()->isValid() ) 
-    {
-      // orig position
-      align::PositionType pos = ali->globalPosition() - ali->displacement();
-      // orig rotation
-      align::RotationType rot = ali->globalRotation() * ali->rotation().transposed();
-      // FIXME: should add something to store changes of surface deformations...
-      std::vector<double> pars;
-      // write
-      return writeAbsRaw(AlignableAbsData(pos,rot,ali->id(),
-					  ali->alignableObjectId(), pars));
-    }
+int AlignableDataIO::writeOrgPos(Alignable* ali, bool validCheck) {
+  if (!(validCheck) || ali->alignmentParameters()->isValid()) {
+    // orig position
+    align::PositionType pos = ali->globalPosition() - ali->displacement();
+    // orig rotation
+    align::RotationType rot = ali->globalRotation() * ali->rotation().transposed();
+    // FIXME: should add something to store changes of surface deformations...
+    std::vector<double> pars;
+    // write
+    return writeAbsRaw(AlignableAbsData(pos, rot, ali->id(), ali->alignableObjectId(), pars));
+  }
 
   return 1;
 }
 
-
 // ----------------------------------------------------------------------------
-int AlignableDataIO::writeAbsPos(const align::Alignables& alivec, 
-				 bool validCheck)
-{
-
-  int icount=0;
-  for( align::Alignables::const_iterator it=alivec.begin();
-       it!=alivec.end(); ++it ) 
-    {
-      int iret = writeAbsPos(*it,validCheck);
-      if (iret==0) icount++;
-    }
-  LogDebug("WriteAbsPos") << "all,written: " << alivec.size() <<","<< icount;
+int AlignableDataIO::writeAbsPos(const align::Alignables& alivec, bool validCheck) {
+  int icount = 0;
+  for (align::Alignables::const_iterator it = alivec.begin(); it != alivec.end(); ++it) {
+    int iret = writeAbsPos(*it, validCheck);
+    if (iret == 0)
+      icount++;
+  }
+  LogDebug("WriteAbsPos") << "all,written: " << alivec.size() << "," << icount;
 
   return 0;
-
 }
 
-
 // ----------------------------------------------------------------------------
-AlignablePositions 
-AlignableDataIO::readAbsPos(const align::Alignables& alivec, int& ierr) 
-{
- 
+AlignablePositions AlignableDataIO::readAbsPos(const align::Alignables& alivec, int& ierr) {
   AlignablePositions retvec;
-  int ierr2=0;
-  ierr=0;
-  for( align::Alignables::const_iterator it=alivec.begin();
-       it!=alivec.end(); ++it ) 
-    {
-      AlignableAbsData ad=readAbsPos(*it, ierr2);
-      if (ierr2==0) retvec.push_back(ad);
-    }
-  
-  LogDebug("ReadAbsPos") << "all,written: " << alivec.size() <<"," << retvec.size();
+  int ierr2 = 0;
+  ierr = 0;
+  for (align::Alignables::const_iterator it = alivec.begin(); it != alivec.end(); ++it) {
+    AlignableAbsData ad = readAbsPos(*it, ierr2);
+    if (ierr2 == 0)
+      retvec.push_back(ad);
+  }
 
-  return retvec;
+  LogDebug("ReadAbsPos") << "all,written: " << alivec.size() << "," << retvec.size();
 
+  return retvec;
 }
 
-
 // ----------------------------------------------------------------------------
-int AlignableDataIO::writeOrgPos( const align::Alignables& alivec, 
-				  bool validCheck )
-{
-
-  int icount=0;
-  for( align::Alignables::const_iterator it=alivec.begin();
-       it!=alivec.end(); ++it ) 
-    {
-      int iret=writeOrgPos(*it,validCheck);
-      if (iret==0) icount++;
-    }
-  
-  LogDebug("WriteOrgPos") << "all,written: " << alivec.size() <<"," << icount;
-  return 0;
+int AlignableDataIO::writeOrgPos(const align::Alignables& alivec, bool validCheck) {
+  int icount = 0;
+  for (align::Alignables::const_iterator it = alivec.begin(); it != alivec.end(); ++it) {
+    int iret = writeOrgPos(*it, validCheck);
+    if (iret == 0)
+      icount++;
+  }
 
+  LogDebug("WriteOrgPos") << "all,written: " << alivec.size() << "," << icount;
+  return 0;
 }
 
-
 // ----------------------------------------------------------------------------
-AlignablePositions 
-AlignableDataIO::readOrgPos(const align::Alignables& alivec, int& ierr) 
-{
-
+AlignablePositions AlignableDataIO::readOrgPos(const align::Alignables& alivec, int& ierr) {
   AlignablePositions retvec;
-  int ierr2=0;
-  ierr=0;
-  for( align::Alignables::const_iterator it=alivec.begin();
-       it!=alivec.end(); ++it ) 
-    {
-      AlignableAbsData ad=readOrgPos(*it, ierr2);
-      if (ierr2==0) retvec.push_back(ad);
-    }
+  int ierr2 = 0;
+  ierr = 0;
+  for (align::Alignables::const_iterator it = alivec.begin(); it != alivec.end(); ++it) {
+    AlignableAbsData ad = readOrgPos(*it, ierr2);
+    if (ierr2 == 0)
+      retvec.push_back(ad);
+  }
 
-  LogDebug("ReadOrgPos") << "all,read: " << alivec.size() <<", "<< retvec.size();
+  LogDebug("ReadOrgPos") << "all,read: " << alivec.size() << ", " << retvec.size();
 
   return retvec;
-
 }
 
-
 // ----------------------------------------------------------------------------
-int AlignableDataIO::writeRelPos(const align::Alignables& alivec, 
-				 bool validCheck )
-{
-
-  int icount=0;
-  for( align::Alignables::const_iterator it=alivec.begin();
-       it!=alivec.end(); ++it ) {
-    int iret=writeRelPos(*it,validCheck);
-    if (iret==0) icount++;
+int AlignableDataIO::writeRelPos(const align::Alignables& alivec, bool validCheck) {
+  int icount = 0;
+  for (align::Alignables::const_iterator it = alivec.begin(); it != alivec.end(); ++it) {
+    int iret = writeRelPos(*it, validCheck);
+    if (iret == 0)
+      icount++;
   }
-  LogDebug("WriteRelPos") << "all,written: " << alivec.size() <<", "<< icount;
+  LogDebug("WriteRelPos") << "all,written: " << alivec.size() << ", " << icount;
   return 0;
-
 }
 
-
 // ----------------------------------------------------------------------------
-AlignableShifts 
-AlignableDataIO::readRelPos(const align::Alignables& alivec, int& ierr) 
-{
-
+AlignableShifts AlignableDataIO::readRelPos(const align::Alignables& alivec, int& ierr) {
   AlignableShifts retvec;
-  int ierr2=0;
-  ierr=0;
-  for( align::Alignables::const_iterator it=alivec.begin();
-       it!=alivec.end(); ++it ) 
-    {
-      AlignableRelData ad=readRelPos(*it, ierr2);
-      if (ierr2==0) retvec.push_back(ad);
-    }
-  LogDebug("ReadRelPos") << "all,read: " << alivec.size() <<", "<< retvec.size();
+  int ierr2 = 0;
+  ierr = 0;
+  for (align::Alignables::const_iterator it = alivec.begin(); it != alivec.end(); ++it) {
+    AlignableRelData ad = readRelPos(*it, ierr2);
+    if (ierr2 == 0)
+      retvec.push_back(ad);
+  }
+  LogDebug("ReadRelPos") << "all,read: " << alivec.size() << ", " << retvec.size();
 
   return retvec;
-
 }
diff --git a/Alignment/CommonAlignmentAlgorithm/src/AlignableDataIORoot.cc b/Alignment/CommonAlignmentAlgorithm/src/AlignableDataIORoot.cc
index aa309e295be29..11237e42bb6e0 100644
--- a/Alignment/CommonAlignmentAlgorithm/src/AlignableDataIORoot.cc
+++ b/Alignment/CommonAlignmentAlgorithm/src/AlignableDataIORoot.cc
@@ -7,18 +7,14 @@
 
 // ----------------------------------------------------------------------------
 // constructor
-AlignableDataIORoot::AlignableDataIORoot(PosType p) : 
-  AlignableDataIO(p)
-{
+AlignableDataIORoot::AlignableDataIORoot(PosType p) : AlignableDataIO(p) {
   if (thePosType == Abs) {
     treename = "AlignablesAbsPos";
     treetxt = "Alignables abs.Pos";
-  }
-  else if (thePosType == Org) {
+  } else if (thePosType == Org) {
     treename = "AlignablesOrgPos";
     treetxt = "Alignables org.Pos";
-  }
-  else if (thePosType == Rel) {
+  } else if (thePosType == Rel) {
     treename = "AlignablesRelPos";
     treetxt = "Alignables rel.Pos";
   }
@@ -27,68 +23,72 @@ AlignableDataIORoot::AlignableDataIORoot(PosType p) :
 // ----------------------------------------------------------------------------
 // create root tree branches (for writing)
 
-void AlignableDataIORoot::createBranches(void) 
-{
-  tree->Branch("Id",    &Id,    "Id/i");
+void AlignableDataIORoot::createBranches(void) {
+  tree->Branch("Id", &Id, "Id/i");
   tree->Branch("ObjId", &ObjId, "ObjId/I");
-  tree->Branch("Pos",   &Pos,   "Pos[3]/D");
-  tree->Branch("Rot",   &Rot,   "Rot[9]/D");
+  tree->Branch("Pos", &Pos, "Pos[3]/D");
+  tree->Branch("Rot", &Rot, "Rot[9]/D");
 
-  tree->Branch("NumDeform",   &numDeformationValues_, "NumDeform/i");
-  tree->Branch("DeformValues", deformationValues_,    "DeformValues[NumDeform]/F");
+  tree->Branch("NumDeform", &numDeformationValues_, "NumDeform/i");
+  tree->Branch("DeformValues", deformationValues_, "DeformValues[NumDeform]/F");
 }
 
 // ----------------------------------------------------------------------------
 // set root tree branch addresses (for reading)
 
-void AlignableDataIORoot::setBranchAddresses(void) 
-{
-  tree->SetBranchAddress("Id",    &Id);
+void AlignableDataIORoot::setBranchAddresses(void) {
+  tree->SetBranchAddress("Id", &Id);
   tree->SetBranchAddress("ObjId", &ObjId);
-  tree->SetBranchAddress("Pos",   &Pos);
-  tree->SetBranchAddress("Rot",   &Rot);
+  tree->SetBranchAddress("Pos", &Pos);
+  tree->SetBranchAddress("Rot", &Rot);
 
-  tree->SetBranchAddress("NumDeform",   &numDeformationValues_);
+  tree->SetBranchAddress("NumDeform", &numDeformationValues_);
   tree->SetBranchAddress("DeformValues", deformationValues_);
 }
 
 // ----------------------------------------------------------------------------
 // find root tree entry based on IDs
 
-int AlignableDataIORoot::findEntry(align::ID id, align::StructureType comp)
-{
-  if (newopen) { // we're here first time
+int AlignableDataIORoot::findEntry(align::ID id, align::StructureType comp) {
+  if (newopen) {  // we're here first time
     edm::LogInfo("Alignment") << "@SUB=AlignableDataIORoot::findEntry"
                               << "Filling map ...";
-    treemap.erase(treemap.begin(),treemap.end());
-    for (int ev = 0;ev<tree->GetEntries();ev++) {
-      tree->GetEntry(ev); 
-      treemap[ std::make_pair(Id,ObjId) ] = ev;
+    treemap.erase(treemap.begin(), treemap.end());
+    for (int ev = 0; ev < tree->GetEntries(); ev++) {
+      tree->GetEntry(ev);
+      treemap[std::make_pair(Id, ObjId)] = ev;
     }
-    newopen=false;
+    newopen = false;
   }
-  
+
   // now we have filled the map
-  treemaptype::iterator imap = treemap.find( std::make_pair(id,comp) );
-  int result=-1;
-  if (imap != treemap.end()) result=(*imap).second;
+  treemaptype::iterator imap = treemap.find(std::make_pair(id, comp));
+  int result = -1;
+  if (imap != treemap.end())
+    result = (*imap).second;
   return result;
-
 }
 
 // ----------------------------------------------------------------------------
-int AlignableDataIORoot::writeAbsRaw(const AlignableAbsData &ad)
-{
+int AlignableDataIORoot::writeAbsRaw(const AlignableAbsData& ad) {
   const align::GlobalPoint& pos = ad.pos();
   align::RotationType rot = ad.rot();
   Id = ad.id();
   ObjId = ad.objId();
-  Pos[0]=pos.x(); Pos[1]=pos.y(); Pos[2]=pos.z();
-  Rot[0]=rot.xx(); Rot[1]=rot.xy(); Rot[2]=rot.xz();
-  Rot[3]=rot.yx(); Rot[4]=rot.yy(); Rot[5]=rot.yz();
-  Rot[6]=rot.zx(); Rot[7]=rot.zy(); Rot[8]=rot.zz();
-
-  const std::vector<double> &deformPars = ad.deformationParameters();
+  Pos[0] = pos.x();
+  Pos[1] = pos.y();
+  Pos[2] = pos.z();
+  Rot[0] = rot.xx();
+  Rot[1] = rot.xy();
+  Rot[2] = rot.xz();
+  Rot[3] = rot.yx();
+  Rot[4] = rot.yy();
+  Rot[5] = rot.yz();
+  Rot[6] = rot.zx();
+  Rot[7] = rot.zy();
+  Rot[8] = rot.zz();
+
+  const std::vector<double>& deformPars = ad.deformationParameters();
   numDeformationValues_ = (deformPars.size() > kMaxNumPar ? kMaxNumPar : deformPars.size());
   for (unsigned int i = 0; i < numDeformationValues_; ++i) {
     deformationValues_[i] = deformPars[i];
@@ -99,18 +99,25 @@ int AlignableDataIORoot::writeAbsRaw(const AlignableAbsData &ad)
 }
 
 // ----------------------------------------------------------------------------
-int AlignableDataIORoot::writeRelRaw(const AlignableRelData &ad)
-{
+int AlignableDataIORoot::writeRelRaw(const AlignableRelData& ad) {
   const align::GlobalVector& pos = ad.pos();
   align::RotationType rot = ad.rot();
   Id = ad.id();
   ObjId = ad.objId();
-  Pos[0]=pos.x(); Pos[1]=pos.y(); Pos[2]=pos.z();
-  Rot[0]=rot.xx(); Rot[1]=rot.xy(); Rot[2]=rot.xz();
-  Rot[3]=rot.yx(); Rot[4]=rot.yy(); Rot[5]=rot.yz();
-  Rot[6]=rot.zx(); Rot[7]=rot.zy(); Rot[8]=rot.zz();
-
-  const std::vector<double> &deformPars = ad.deformationParameters();
+  Pos[0] = pos.x();
+  Pos[1] = pos.y();
+  Pos[2] = pos.z();
+  Rot[0] = rot.xx();
+  Rot[1] = rot.xy();
+  Rot[2] = rot.xz();
+  Rot[3] = rot.yx();
+  Rot[4] = rot.yy();
+  Rot[5] = rot.yz();
+  Rot[6] = rot.zx();
+  Rot[7] = rot.zy();
+  Rot[8] = rot.zz();
+
+  const std::vector<double>& deformPars = ad.deformationParameters();
   numDeformationValues_ = (deformPars.size() > kMaxNumPar ? kMaxNumPar : deformPars.size());
   for (unsigned int i = 0; i < numDeformationValues_; ++i) {
     deformationValues_[i] = deformPars[i];
@@ -121,62 +128,58 @@ int AlignableDataIORoot::writeRelRaw(const AlignableRelData &ad)
 }
 
 // ----------------------------------------------------------------------------
-AlignableAbsData AlignableDataIORoot::readAbsRaw(Alignable* ali,int& ierr)
-{
+AlignableAbsData AlignableDataIORoot::readAbsRaw(Alignable* ali, int& ierr) {
   align::GlobalPoint pos;
   align::RotationType rot;
 
   align::StructureType typeId = ali->alignableObjectId();
   align::ID id = ali->id();
-  std::vector<double> deformPars; deformPars.reserve(numDeformationValues_);
-  int entry = findEntry(id,typeId);
-  if(entry!=-1) {
+  std::vector<double> deformPars;
+  deformPars.reserve(numDeformationValues_);
+  int entry = findEntry(id, typeId);
+  if (entry != -1) {
     tree->GetEntry(entry);
-    align::GlobalPoint pos2(Pos[0],Pos[1],Pos[2]);
-    align::RotationType rot2(Rot[0],Rot[1],Rot[2],
-			     Rot[3],Rot[4],Rot[5],
-			     Rot[6],Rot[7],Rot[8]);
-    pos=pos2;
-    rot=rot2;
+    align::GlobalPoint pos2(Pos[0], Pos[1], Pos[2]);
+    align::RotationType rot2(Rot[0], Rot[1], Rot[2], Rot[3], Rot[4], Rot[5], Rot[6], Rot[7], Rot[8]);
+    pos = pos2;
+    rot = rot2;
 
     for (unsigned int i = 0; i < numDeformationValues_; ++i) {
       deformPars.push_back((double)deformationValues_[i]);
     }
 
-    ierr=0;
-  }
-  else ierr=-1;
+    ierr = 0;
+  } else
+    ierr = -1;
 
-  return AlignableAbsData(pos,rot,id,typeId,deformPars);
+  return AlignableAbsData(pos, rot, id, typeId, deformPars);
 }
 
 // ----------------------------------------------------------------------------
 
-AlignableRelData AlignableDataIORoot::readRelRaw(Alignable* ali,int& ierr)
-{
+AlignableRelData AlignableDataIORoot::readRelRaw(Alignable* ali, int& ierr) {
   align::GlobalVector pos;
   align::RotationType rot;
 
   align::StructureType typeId = ali->alignableObjectId();
   align::ID id = ali->id();
-  std::vector<double> deformPars; deformPars.reserve(numDeformationValues_);
-  int entry = findEntry(id,typeId);
-  if(entry!=-1) {
+  std::vector<double> deformPars;
+  deformPars.reserve(numDeformationValues_);
+  int entry = findEntry(id, typeId);
+  if (entry != -1) {
     tree->GetEntry(entry);
-    align::GlobalVector pos2(Pos[0],Pos[1],Pos[2]);
-    align::RotationType rot2(Rot[0],Rot[1],Rot[2],
-			     Rot[3],Rot[4],Rot[5],
-			     Rot[6],Rot[7],Rot[8]);
-    pos=pos2;
-    rot=rot2;
+    align::GlobalVector pos2(Pos[0], Pos[1], Pos[2]);
+    align::RotationType rot2(Rot[0], Rot[1], Rot[2], Rot[3], Rot[4], Rot[5], Rot[6], Rot[7], Rot[8]);
+    pos = pos2;
+    rot = rot2;
 
     for (unsigned int i = 0; i < numDeformationValues_; ++i) {
       deformPars.push_back((double)deformationValues_[i]);
     }
 
-    ierr=0;
-  }
-  else ierr=-1;
+    ierr = 0;
+  } else
+    ierr = -1;
 
-  return AlignableRelData(pos,rot,id,typeId,deformPars);
+  return AlignableRelData(pos, rot, id, typeId, deformPars);
 }
diff --git a/Alignment/CommonAlignmentAlgorithm/src/AlignmentAlgorithmPluginFactory.cc b/Alignment/CommonAlignmentAlgorithm/src/AlignmentAlgorithmPluginFactory.cc
index a1e9ce05c34eb..d0f27df02dded 100644
--- a/Alignment/CommonAlignmentAlgorithm/src/AlignmentAlgorithmPluginFactory.cc
+++ b/Alignment/CommonAlignmentAlgorithm/src/AlignmentAlgorithmPluginFactory.cc
@@ -3,11 +3,7 @@
 ///  \author F. Ronga - CERN
 ///
 
-
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmPluginFactory.h"
 // #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-EDM_REGISTER_PLUGINFACTORY( AlignmentAlgorithmPluginFactory, 
-                            "AlignmentAlgorithmPluginFactory" );
-
-
+EDM_REGISTER_PLUGINFACTORY(AlignmentAlgorithmPluginFactory, "AlignmentAlgorithmPluginFactory");
diff --git a/Alignment/CommonAlignmentAlgorithm/src/AlignmentCorrelationsIORoot.cc b/Alignment/CommonAlignmentAlgorithm/src/AlignmentCorrelationsIORoot.cc
index f155e1e5d7ed7..5360d20f1b060 100644
--- a/Alignment/CommonAlignmentAlgorithm/src/AlignmentCorrelationsIORoot.cc
+++ b/Alignment/CommonAlignmentAlgorithm/src/AlignmentCorrelationsIORoot.cc
@@ -10,112 +10,99 @@
 // ----------------------------------------------------------------------------
 // constructor
 
-AlignmentCorrelationsIORoot::AlignmentCorrelationsIORoot()
-{
+AlignmentCorrelationsIORoot::AlignmentCorrelationsIORoot() {
   treename = "AlignmentCorrelations";
   treetxt = "Correlations";
 }
 
 // ----------------------------------------------------------------------------
 
-void AlignmentCorrelationsIORoot::createBranches(void) 
-{
-  tree->Branch("Ali1Id",    &Ali1Id,    "Ali1Id/i");
-  tree->Branch("Ali2Id",    &Ali2Id,    "Ali2Id/i");
+void AlignmentCorrelationsIORoot::createBranches(void) {
+  tree->Branch("Ali1Id", &Ali1Id, "Ali1Id/i");
+  tree->Branch("Ali2Id", &Ali2Id, "Ali2Id/i");
   tree->Branch("Ali1ObjId", &Ali1ObjId, "Ali1ObjId/I");
   tree->Branch("Ali2ObjId", &Ali2ObjId, "Ali2ObjId/I");
-  tree->Branch("corSize",   &corSize,   "corSize/I");
+  tree->Branch("corSize", &corSize, "corSize/I");
   tree->Branch("CorMatrix", &CorMatrix, "CorMatrix[corSize]/D");
 }
 
 // ----------------------------------------------------------------------------
 
-void AlignmentCorrelationsIORoot::setBranchAddresses(void) 
-{
-  tree->SetBranchAddress("corSize",   &corSize);
-  tree->SetBranchAddress("Ali1Id",    &Ali1Id);
-  tree->SetBranchAddress("Ali2Id",    &Ali2Id);
+void AlignmentCorrelationsIORoot::setBranchAddresses(void) {
+  tree->SetBranchAddress("corSize", &corSize);
+  tree->SetBranchAddress("Ali1Id", &Ali1Id);
+  tree->SetBranchAddress("Ali2Id", &Ali2Id);
   tree->SetBranchAddress("Ali1ObjId", &Ali1ObjId);
-  tree->SetBranchAddress("Ali2ObjId", &Ali2ObjId);	 
+  tree->SetBranchAddress("Ali2ObjId", &Ali2ObjId);
   tree->SetBranchAddress("CorMatrix", &CorMatrix);
 }
 
 // ----------------------------------------------------------------------------
 
-int AlignmentCorrelationsIORoot::write(const align::Correlations& cor, bool validCheck)
-{
-  int icount=0;
+int AlignmentCorrelationsIORoot::write(const align::Correlations& cor, bool validCheck) {
+  int icount = 0;
 
-  for(align::Correlations::const_iterator it=cor.begin();
-    it!=cor.end();++it) {
-    AlgebraicMatrix mat=(*it).second;
-	std::pair<Alignable*,Alignable*> Pair = (*it).first;
+  for (align::Correlations::const_iterator it = cor.begin(); it != cor.end(); ++it) {
+    AlgebraicMatrix mat = (*it).second;
+    std::pair<Alignable*, Alignable*> Pair = (*it).first;
     Alignable* ali1 = Pair.first;
     Alignable* ali2 = Pair.second;
-    if( (ali1->alignmentParameters()->isValid()
-	 && ali2->alignmentParameters()->isValid()) || !(validCheck)) {
-      Ali1ObjId = ali1->alignableObjectId(); 
-      Ali2ObjId = ali2->alignableObjectId(); 
+    if ((ali1->alignmentParameters()->isValid() && ali2->alignmentParameters()->isValid()) || !(validCheck)) {
+      Ali1ObjId = ali1->alignableObjectId();
+      Ali2ObjId = ali2->alignableObjectId();
       Ali1Id = ali1->id();
       Ali2Id = ali2->id();
       int maxColumn = mat.num_row();
-      corSize = maxColumn*maxColumn;
-      for(int row = 0;row<maxColumn;row++)	  
-		for(int col = 0;col<maxColumn;col++)
-		  CorMatrix[row+col*maxColumn] =mat[row][col]; 
+      corSize = maxColumn * maxColumn;
+      for (int row = 0; row < maxColumn; row++)
+        for (int col = 0; col < maxColumn; col++)
+          CorMatrix[row + col * maxColumn] = mat[row][col];
       tree->Fill();
       icount++;
     }
   }
-  edm::LogInfo("AlignmentCorrelationsIORoot") << "Writing correlations: all,written: " 
-                                              << cor.size() << "," << icount;
+  edm::LogInfo("AlignmentCorrelationsIORoot") << "Writing correlations: all,written: " << cor.size() << "," << icount;
   return 0;
 }
 
 // ----------------------------------------------------------------------------
 // read correlations for those alignables in vector given as argument
 
-align::Correlations 
-AlignmentCorrelationsIORoot::read(const align::Alignables& alivec, int& ierr)
-{
+align::Correlations AlignmentCorrelationsIORoot::read(const align::Alignables& alivec, int& ierr) {
   align::Correlations theMap;
 
   // create ID map for all Alignables in alivec
   align::Alignables::const_iterator it1;
-  std::map< std::pair<unsigned int,int>, Alignable* > idAlis;
-  for( it1=alivec.begin();it1!=alivec.end();++it1 )
-    idAlis[std::make_pair((*it1)->id(),(*it1)->alignableObjectId())] = (*it1);
+  std::map<std::pair<unsigned int, int>, Alignable*> idAlis;
+  for (it1 = alivec.begin(); it1 != alivec.end(); ++it1)
+    idAlis[std::make_pair((*it1)->id(), (*it1)->alignableObjectId())] = (*it1);
 
-  std::map<std::pair<unsigned int,int>,Alignable*>::const_iterator aliSearch1;  
-  std::map<std::pair<unsigned int,int>,Alignable*>::const_iterator aliSearch2;  
-  int nfound=0;
+  std::map<std::pair<unsigned int, int>, Alignable*>::const_iterator aliSearch1;
+  std::map<std::pair<unsigned int, int>, Alignable*>::const_iterator aliSearch2;
+  int nfound = 0;
   double maxEntry = tree->GetEntries();
-  for( int entry = 0;entry<maxEntry;entry++ ) 
-	{
-	  tree->GetEntry(entry);
-	  aliSearch1 = idAlis.find(std::make_pair(Ali1Id,Ali1ObjId));
-	  aliSearch2 = idAlis.find(std::make_pair(Ali2Id,Ali2ObjId));
-	  if (aliSearch1!=idAlis.end()
-		  && aliSearch2!=idAlis.end()) 
-		{
-		  // Alignables for this pair found
-		  nfound++;
-		  Alignable* myAli1 = (*aliSearch1).second;
-		  Alignable* myAli2 = (*aliSearch2).second;
-		  // FIXME: instead of nParMax in the next few lines one should probably
-		  //        use something like sqrt(corSize) - but take care of rounding!
-		  //        I have no time to test... :-( GF
-		  AlgebraicMatrix  mat(nParMax,nParMax);
-		  for(int row = 0;row<nParMax;row++) 
-			for(int col = 0;col<nParMax;col++) 
-			  mat[row][col] = CorMatrix[row+col*nParMax];
-		  theMap[ std::make_pair(myAli1,myAli2) ] = mat;
-		}
-	}
-
-  edm::LogInfo("AlignmentCorrelationsIORoot") << "Read correlations: all,read: " 
-                                              << alivec.size() << "," << nfound;
-
-  ierr=0;
+  for (int entry = 0; entry < maxEntry; entry++) {
+    tree->GetEntry(entry);
+    aliSearch1 = idAlis.find(std::make_pair(Ali1Id, Ali1ObjId));
+    aliSearch2 = idAlis.find(std::make_pair(Ali2Id, Ali2ObjId));
+    if (aliSearch1 != idAlis.end() && aliSearch2 != idAlis.end()) {
+      // Alignables for this pair found
+      nfound++;
+      Alignable* myAli1 = (*aliSearch1).second;
+      Alignable* myAli2 = (*aliSearch2).second;
+      // FIXME: instead of nParMax in the next few lines one should probably
+      //        use something like sqrt(corSize) - but take care of rounding!
+      //        I have no time to test... :-( GF
+      AlgebraicMatrix mat(nParMax, nParMax);
+      for (int row = 0; row < nParMax; row++)
+        for (int col = 0; col < nParMax; col++)
+          mat[row][col] = CorMatrix[row + col * nParMax];
+      theMap[std::make_pair(myAli1, myAli2)] = mat;
+    }
+  }
+
+  edm::LogInfo("AlignmentCorrelationsIORoot") << "Read correlations: all,read: " << alivec.size() << "," << nfound;
+
+  ierr = 0;
   return theMap;
 }
diff --git a/Alignment/CommonAlignmentAlgorithm/src/AlignmentCorrelationsStore.cc b/Alignment/CommonAlignmentAlgorithm/src/AlignmentCorrelationsStore.cc
index 303d0b2ea3b00..5c597a75e37bf 100644
--- a/Alignment/CommonAlignmentAlgorithm/src/AlignmentCorrelationsStore.cc
+++ b/Alignment/CommonAlignmentAlgorithm/src/AlignmentCorrelationsStore.cc
@@ -4,50 +4,42 @@
 #include "Alignment/CommonAlignment/interface/AlignmentParameters.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-
-AlignmentCorrelationsStore::AlignmentCorrelationsStore( void )
-{
+AlignmentCorrelationsStore::AlignmentCorrelationsStore(void) {
   edm::LogInfo("Alignment") << "@SUB=AlignmentCorrelationsStore::AlignmentCorrelationsStore "
                             << "\nCreated.";
 }
 
-
-void AlignmentCorrelationsStore::correlations( Alignable* ap1, Alignable* ap2,
-					       AlgebraicSymMatrix& cov, int row, int col ) const
-{
+void AlignmentCorrelationsStore::correlations(
+    Alignable* ap1, Alignable* ap2, AlgebraicSymMatrix& cov, int row, int col) const {
   static Alignable* previousAlignable = nullptr;
   static CorrelationsTable* previousCorrelations;
 
   // Needed by 'resetCorrelations()' to reset the static pointer:
-  if ( ap1 == nullptr ) { previousAlignable = nullptr; return; }
-
-  bool transpose = ( ap2 > ap1 );
-  if ( transpose ) std::swap( ap1, ap2 ); 
-
-  if ( ap1 == previousAlignable )
-  {
-    CorrelationsTable::const_iterator itC2 = previousCorrelations->find( ap2 );
-    if ( itC2 != previousCorrelations->end() )
-    {
-      transpose ?
-	fillCovarianceT( ap1, ap2, (*itC2).second, cov, row, col ) :
-	fillCovariance( ap1, ap2, (*itC2).second, cov, row, col );
-    }
+  if (ap1 == nullptr) {
+    previousAlignable = nullptr;
+    return;
   }
-  else
-  {
-    Correlations::const_iterator itC1 = theCorrelations.find( ap1 );
-    if ( itC1 != theCorrelations.end() )
-    {
+
+  bool transpose = (ap2 > ap1);
+  if (transpose)
+    std::swap(ap1, ap2);
+
+  if (ap1 == previousAlignable) {
+    CorrelationsTable::const_iterator itC2 = previousCorrelations->find(ap2);
+    if (itC2 != previousCorrelations->end()) {
+      transpose ? fillCovarianceT(ap1, ap2, (*itC2).second, cov, row, col)
+                : fillCovariance(ap1, ap2, (*itC2).second, cov, row, col);
+    }
+  } else {
+    Correlations::const_iterator itC1 = theCorrelations.find(ap1);
+    if (itC1 != theCorrelations.end()) {
       previousAlignable = ap1;
       previousCorrelations = (*itC1).second;
 
-      CorrelationsTable::const_iterator itC2 = (*itC1).second->find( ap2 );
-      if ( itC2 != (*itC1).second->end() )
-      {
-	transpose ?
-	  fillCovarianceT( ap1, ap2, (*itC2).second, cov, row, col ) :
-	  fillCovariance( ap1, ap2, (*itC2).second, cov, row, col );
+      CorrelationsTable::const_iterator itC2 = (*itC1).second->find(ap2);
+      if (itC2 != (*itC1).second->end()) {
+        transpose ? fillCovarianceT(ap1, ap2, (*itC2).second, cov, row, col)
+                  : fillCovariance(ap1, ap2, (*itC2).second, cov, row, col);
       }
     }
   }
@@ -56,36 +48,32 @@ void AlignmentCorrelationsStore::correlations( Alignable* ap1, Alignable* ap2,
   return;
 }
 
-
-void AlignmentCorrelationsStore::setCorrelations( Alignable* ap1, Alignable* ap2,
-						  const AlgebraicSymMatrix& cov, int row, int col )
-{
+void AlignmentCorrelationsStore::setCorrelations(
+    Alignable* ap1, Alignable* ap2, const AlgebraicSymMatrix& cov, int row, int col) {
   static Alignable* previousAlignable = nullptr;
   static CorrelationsTable* previousCorrelations;
 
   // Needed by 'resetCorrelations()' to reset the static pointer:
-  if ( ap1 == nullptr ) { previousAlignable = nullptr; return; }
+  if (ap1 == nullptr) {
+    previousAlignable = nullptr;
+    return;
+  }
 
-  bool transpose = ( ap2 > ap1 );
-  if ( transpose ) std::swap( ap1, ap2 );
+  bool transpose = (ap2 > ap1);
+  if (transpose)
+    std::swap(ap1, ap2);
 
-  if ( ap1 == previousAlignable )
-  {
-    fillCorrelationsTable( ap1, ap2, previousCorrelations, cov, row, col, transpose );
-  }
-  else
-  {
-    Correlations::iterator itC = theCorrelations.find( ap1 );
-    if ( itC != theCorrelations.end() )
-    {
-      fillCorrelationsTable( ap1, ap2, itC->second, cov, row, col, transpose );
+  if (ap1 == previousAlignable) {
+    fillCorrelationsTable(ap1, ap2, previousCorrelations, cov, row, col, transpose);
+  } else {
+    Correlations::iterator itC = theCorrelations.find(ap1);
+    if (itC != theCorrelations.end()) {
+      fillCorrelationsTable(ap1, ap2, itC->second, cov, row, col, transpose);
       previousAlignable = ap1;
       previousCorrelations = itC->second;
-    }
-    else
-    {
+    } else {
       CorrelationsTable* newTable = new CorrelationsTable;
-      fillCorrelationsTable( ap1, ap2, newTable, cov, row, col, transpose );
+      fillCorrelationsTable(ap1, ap2, newTable, cov, row, col, transpose);
 
       theCorrelations[ap1] = newTable;
       previousAlignable = ap1;
@@ -94,139 +82,116 @@ void AlignmentCorrelationsStore::setCorrelations( Alignable* ap1, Alignable* ap2
   }
 }
 
+void AlignmentCorrelationsStore::setCorrelations(Alignable* ap1, Alignable* ap2, AlgebraicMatrix& mat) {
+  bool transpose = (ap2 > ap1);
+  if (transpose)
+    std::swap(ap1, ap2);
 
-void AlignmentCorrelationsStore::setCorrelations( Alignable* ap1, Alignable* ap2, AlgebraicMatrix& mat )
-{
-  bool transpose = ( ap2 > ap1 );
-  if ( transpose ) std::swap( ap1, ap2 );
-
-  Correlations::iterator itC1 = theCorrelations.find( ap1 );
-  if ( itC1 != theCorrelations.end() )
-  {
+  Correlations::iterator itC1 = theCorrelations.find(ap1);
+  if (itC1 != theCorrelations.end()) {
     (*itC1->second)[ap2] = transpose ? mat.T() : mat;
-  }
-  else
-  {
+  } else {
     CorrelationsTable* newTable = new CorrelationsTable;
     (*newTable)[ap2] = transpose ? mat.T() : mat;
     theCorrelations[ap1] = newTable;
   }
 }
 
+bool AlignmentCorrelationsStore::correlationsAvailable(Alignable* ap1, Alignable* ap2) const {
+  bool transpose = (ap2 > ap1);
+  if (transpose)
+    std::swap(ap1, ap2);
 
-bool AlignmentCorrelationsStore::correlationsAvailable( Alignable* ap1, Alignable* ap2 ) const
-{
-  bool transpose = ( ap2 > ap1 );
-  if ( transpose ) std::swap( ap1, ap2 );
-
-  Correlations::const_iterator itC1 = theCorrelations.find( ap1 );
-  if ( itC1 != theCorrelations.end() )
-  {
-    CorrelationsTable::const_iterator itC2 = itC1->second->find( ap2 );
-    if ( itC2 != itC1->second->end() ) return true;
+  Correlations::const_iterator itC1 = theCorrelations.find(ap1);
+  if (itC1 != theCorrelations.end()) {
+    CorrelationsTable::const_iterator itC2 = itC1->second->find(ap2);
+    if (itC2 != itC1->second->end())
+      return true;
   }
   return false;
 }
 
-
-void AlignmentCorrelationsStore::resetCorrelations( void )
-{
+void AlignmentCorrelationsStore::resetCorrelations(void) {
   Correlations::iterator itC;
-  for ( itC = theCorrelations.begin(); itC != theCorrelations.end(); ++itC ) delete (*itC).second;
-  theCorrelations.erase( theCorrelations.begin(), theCorrelations.end() );
+  for (itC = theCorrelations.begin(); itC != theCorrelations.end(); ++itC)
+    delete (*itC).second;
+  theCorrelations.erase(theCorrelations.begin(), theCorrelations.end());
 
   // Reset the static pointers to the 'previous alignables'
   AlgebraicSymMatrix dummy;
-  correlations( nullptr, nullptr, dummy, 0, 0 );
-  setCorrelations( nullptr, nullptr, dummy, 0, 0 );
+  correlations(nullptr, nullptr, dummy, 0, 0);
+  setCorrelations(nullptr, nullptr, dummy, 0, 0);
 }
 
-
-unsigned int AlignmentCorrelationsStore::size( void ) const
-{
+unsigned int AlignmentCorrelationsStore::size(void) const {
   unsigned int size = 0;
   Correlations::const_iterator itC;
-  for ( itC = theCorrelations.begin(); itC != theCorrelations.end(); ++itC )
+  for (itC = theCorrelations.begin(); itC != theCorrelations.end(); ++itC)
     size += itC->second->size();
 
   return size;
 }
 
-
-void
-AlignmentCorrelationsStore::fillCorrelationsTable( Alignable* ap1, Alignable* ap2, CorrelationsTable* table,
-						   const AlgebraicSymMatrix& cov, int row, int col, bool transpose )
-{
-  CorrelationsTable::iterator itC = table->find( ap2 );
-
-  if ( itC != table->end() )
-  {
-    transpose ?
-      readFromCovarianceT( ap1, ap2, itC->second, cov, row, col ) :
-      readFromCovariance( ap1, ap2, itC->second, cov, row, col );
-  }
-  else
-  {
+void AlignmentCorrelationsStore::fillCorrelationsTable(Alignable* ap1,
+                                                       Alignable* ap2,
+                                                       CorrelationsTable* table,
+                                                       const AlgebraicSymMatrix& cov,
+                                                       int row,
+                                                       int col,
+                                                       bool transpose) {
+  CorrelationsTable::iterator itC = table->find(ap2);
+
+  if (itC != table->end()) {
+    transpose ? readFromCovarianceT(ap1, ap2, itC->second, cov, row, col)
+              : readFromCovariance(ap1, ap2, itC->second, cov, row, col);
+  } else {
     int nRow = ap1->alignmentParameters()->numSelected();
     int nCol = ap2->alignmentParameters()->numSelected();
-    AlgebraicMatrix newEntry( nRow, nCol );
+    AlgebraicMatrix newEntry(nRow, nCol);
 
-    transpose ?
-      readFromCovarianceT( ap1, ap2, newEntry, cov, row, col ) :
-      readFromCovariance( ap1, ap2, newEntry, cov, row, col );
+    transpose ? readFromCovarianceT(ap1, ap2, newEntry, cov, row, col)
+              : readFromCovariance(ap1, ap2, newEntry, cov, row, col);
 
     (*table)[ap2] = newEntry;
   }
 }
 
-
-void
-AlignmentCorrelationsStore::fillCovariance( Alignable* ap1, Alignable* ap2, const AlgebraicMatrix& entry,
-					    AlgebraicSymMatrix& cov, int row, int col ) const
-{
+void AlignmentCorrelationsStore::fillCovariance(
+    Alignable* ap1, Alignable* ap2, const AlgebraicMatrix& entry, AlgebraicSymMatrix& cov, int row, int col) const {
   int nRow = entry.num_row();
   int nCol = entry.num_col();
 
-  for ( int iRow = 0; iRow < nRow; ++iRow )
-    for ( int jCol = 0; jCol < nCol; ++jCol )
-      cov[row+iRow][col+jCol] = entry[iRow][jCol];
+  for (int iRow = 0; iRow < nRow; ++iRow)
+    for (int jCol = 0; jCol < nCol; ++jCol)
+      cov[row + iRow][col + jCol] = entry[iRow][jCol];
 }
 
-
-void
-AlignmentCorrelationsStore::fillCovarianceT( Alignable* ap1, Alignable* ap2, const AlgebraicMatrix& entry,
-					     AlgebraicSymMatrix& cov, int row, int col ) const
-{
+void AlignmentCorrelationsStore::fillCovarianceT(
+    Alignable* ap1, Alignable* ap2, const AlgebraicMatrix& entry, AlgebraicSymMatrix& cov, int row, int col) const {
   int nRow = entry.num_row();
   int nCol = entry.num_col();
 
-  for ( int iRow = 0; iRow < nRow; ++iRow )
-    for ( int jCol = 0; jCol < nCol; ++jCol )
-      cov[row+jCol][col+iRow] = entry[iRow][jCol];
+  for (int iRow = 0; iRow < nRow; ++iRow)
+    for (int jCol = 0; jCol < nCol; ++jCol)
+      cov[row + jCol][col + iRow] = entry[iRow][jCol];
 }
 
-
-void
-AlignmentCorrelationsStore::readFromCovariance( Alignable* ap1, Alignable* ap2, AlgebraicMatrix& entry,
-						const AlgebraicSymMatrix& cov, int row, int col )
-{
+void AlignmentCorrelationsStore::readFromCovariance(
+    Alignable* ap1, Alignable* ap2, AlgebraicMatrix& entry, const AlgebraicSymMatrix& cov, int row, int col) {
   int nRow = entry.num_row();
   int nCol = entry.num_col();
 
-  for ( int iRow = 0; iRow < nRow; ++iRow )
-    for ( int jCol = 0; jCol < nCol; ++jCol )
-      entry[iRow][jCol] = cov[row+iRow][col+jCol];
+  for (int iRow = 0; iRow < nRow; ++iRow)
+    for (int jCol = 0; jCol < nCol; ++jCol)
+      entry[iRow][jCol] = cov[row + iRow][col + jCol];
 }
 
-
-void
-AlignmentCorrelationsStore::readFromCovarianceT( Alignable* ap1, Alignable* ap2, AlgebraicMatrix& entry,
-						 const AlgebraicSymMatrix& cov, int row, int col )
-{
+void AlignmentCorrelationsStore::readFromCovarianceT(
+    Alignable* ap1, Alignable* ap2, AlgebraicMatrix& entry, const AlgebraicSymMatrix& cov, int row, int col) {
   int nRow = entry.num_row();
   int nCol = entry.num_col();
 
-  for ( int iRow = 0; iRow < nRow; ++iRow )
-    for ( int jCol = 0; jCol < nCol; ++jCol )
-      entry[iRow][jCol] = cov[row+jCol][col+iRow];
+  for (int iRow = 0; iRow < nRow; ++iRow)
+    for (int jCol = 0; jCol < nCol; ++jCol)
+      entry[iRow][jCol] = cov[row + jCol][col + iRow];
 }
diff --git a/Alignment/CommonAlignmentAlgorithm/src/AlignmentExtendedCorrelationsEntry.cc b/Alignment/CommonAlignmentAlgorithm/src/AlignmentExtendedCorrelationsEntry.cc
index ab1d9eaa2772d..7c2196f9b836b 100644
--- a/Alignment/CommonAlignmentAlgorithm/src/AlignmentExtendedCorrelationsEntry.cc
+++ b/Alignment/CommonAlignmentAlgorithm/src/AlignmentExtendedCorrelationsEntry.cc
@@ -1,64 +1,49 @@
 
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentExtendedCorrelationsEntry.h"
 
-
-AlignmentExtendedCorrelationsEntry::AlignmentExtendedCorrelationsEntry( void ) :
-//   theCounter( 0 ),
-  theNRows( 0 ),
-  theNCols( 0 )
-{}
-
-
-AlignmentExtendedCorrelationsEntry::AlignmentExtendedCorrelationsEntry( short unsigned int nRows,
-									short unsigned int nCols ) :
-//   theCounter( 0 ),
-  theNRows( nRows ),
-  theNCols( nCols ),
-  theData( nRows*nCols )
-{}
-
-
-AlignmentExtendedCorrelationsEntry::AlignmentExtendedCorrelationsEntry( short unsigned int nRows,
-						      short unsigned int nCols,
-						      const float init ) :
-//   theCounter( 0 ),
-  theNRows( nRows ),
-  theNCols( nCols ),
-  theData( nRows*nCols, init )
-{}
-
-
-AlignmentExtendedCorrelationsEntry::AlignmentExtendedCorrelationsEntry( const AlgebraicMatrix& mat ) :
-//   theCounter( 0 ),
-  theNRows( mat.num_row() ),
-  theNCols( mat.num_col() ),
-  theData( mat.num_row()*mat.num_col() )
-{
-  for ( int i = 0; i < mat.num_row(); ++i )
-  {
-    for ( int j = 0; j < mat.num_col(); ++j )
-    {
-      theData[i*theNCols+j] = mat[i][j];
+AlignmentExtendedCorrelationsEntry::AlignmentExtendedCorrelationsEntry(void)
+    :  //   theCounter( 0 ),
+      theNRows(0),
+      theNCols(0) {}
+
+AlignmentExtendedCorrelationsEntry::AlignmentExtendedCorrelationsEntry(short unsigned int nRows,
+                                                                       short unsigned int nCols)
+    :  //   theCounter( 0 ),
+      theNRows(nRows),
+      theNCols(nCols),
+      theData(nRows * nCols) {}
+
+AlignmentExtendedCorrelationsEntry::AlignmentExtendedCorrelationsEntry(short unsigned int nRows,
+                                                                       short unsigned int nCols,
+                                                                       const float init)
+    :  //   theCounter( 0 ),
+      theNRows(nRows),
+      theNCols(nCols),
+      theData(nRows * nCols, init) {}
+
+AlignmentExtendedCorrelationsEntry::AlignmentExtendedCorrelationsEntry(const AlgebraicMatrix& mat)
+    :  //   theCounter( 0 ),
+      theNRows(mat.num_row()),
+      theNCols(mat.num_col()),
+      theData(mat.num_row() * mat.num_col()) {
+  for (int i = 0; i < mat.num_row(); ++i) {
+    for (int j = 0; j < mat.num_col(); ++j) {
+      theData[i * theNCols + j] = mat[i][j];
     }
   }
 }
 
-
-void AlignmentExtendedCorrelationsEntry::operator*=( const float multiply )
-{
-  for ( std::vector< float >::iterator it = theData.begin(); it != theData.end(); ++it ) (*it) *= multiply;
+void AlignmentExtendedCorrelationsEntry::operator*=(const float multiply) {
+  for (std::vector<float>::iterator it = theData.begin(); it != theData.end(); ++it)
+    (*it) *= multiply;
 }
 
+AlgebraicMatrix AlignmentExtendedCorrelationsEntry::matrix(void) const {
+  AlgebraicMatrix result(theNRows, theNCols);
 
-AlgebraicMatrix AlignmentExtendedCorrelationsEntry::matrix( void ) const
-{
-  AlgebraicMatrix result( theNRows, theNCols );
-
-  for ( int i = 0; i < theNRows; ++i )
-  {
-    for ( int j = 0; j < theNCols; ++j )
-    {
-      result[i][j] = theData[i*theNCols+j];
+  for (int i = 0; i < theNRows; ++i) {
+    for (int j = 0; j < theNCols; ++j) {
+      result[i][j] = theData[i * theNCols + j];
     }
   }
 
diff --git a/Alignment/CommonAlignmentAlgorithm/src/AlignmentExtendedCorrelationsStore.cc b/Alignment/CommonAlignmentAlgorithm/src/AlignmentExtendedCorrelationsStore.cc
index d1f5d65742e8c..265d1f29b8adf 100644
--- a/Alignment/CommonAlignmentAlgorithm/src/AlignmentExtendedCorrelationsStore.cc
+++ b/Alignment/CommonAlignmentAlgorithm/src/AlignmentExtendedCorrelationsStore.cc
@@ -8,54 +8,46 @@
 #include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/Utilities/interface/isFinite.h"
 
-
-AlignmentExtendedCorrelationsStore::AlignmentExtendedCorrelationsStore( const edm::ParameterSet& config )
-{
-  theMaxUpdates = config.getParameter<int>( "MaxUpdates" );
-  theCut = config.getParameter<double>( "CutValue" );
-  theWeight = config.getParameter<double>( "Weight" );
+AlignmentExtendedCorrelationsStore::AlignmentExtendedCorrelationsStore(const edm::ParameterSet& config) {
+  theMaxUpdates = config.getParameter<int>("MaxUpdates");
+  theCut = config.getParameter<double>("CutValue");
+  theWeight = config.getParameter<double>("Weight");
 
   edm::LogInfo("Alignment") << "@SUB=AlignmentExtendedCorrelationsStore::AlignmentExtendedCorrelationsStore"
                             << "Created.";
 }
 
-
-void AlignmentExtendedCorrelationsStore::correlations( Alignable* ap1, Alignable* ap2,
-						       AlgebraicSymMatrix& cov, int row, int col ) const
-{
+void AlignmentExtendedCorrelationsStore::correlations(
+    Alignable* ap1, Alignable* ap2, AlgebraicSymMatrix& cov, int row, int col) const {
   static Alignable* previousAlignable = nullptr;
   static ExtendedCorrelationsTable* previousCorrelations;
 
   // Needed by 'resetCorrelations()' to reset the static pointer:
-  if ( ap1 == nullptr ) { previousAlignable = nullptr; return; }
-
-  bool transpose = ( ap2 > ap1 );
-  if ( transpose ) std::swap( ap1, ap2 ); 
-
-  if ( ap1 == previousAlignable )
-  {
-    ExtendedCorrelationsTable::const_iterator itC2 = previousCorrelations->find( ap2 );
-    if ( itC2 != previousCorrelations->end() )
-    {
-      transpose ?
-	fillCovarianceT( ap1, ap2, (*itC2).second, cov, row, col ) :
-	fillCovariance( ap1, ap2, (*itC2).second, cov, row, col );
-    }
+  if (ap1 == nullptr) {
+    previousAlignable = nullptr;
+    return;
   }
-  else
-  {
-    ExtendedCorrelations::const_iterator itC1 = theCorrelations.find( ap1 );
-    if ( itC1 != theCorrelations.end() )
-    {
+
+  bool transpose = (ap2 > ap1);
+  if (transpose)
+    std::swap(ap1, ap2);
+
+  if (ap1 == previousAlignable) {
+    ExtendedCorrelationsTable::const_iterator itC2 = previousCorrelations->find(ap2);
+    if (itC2 != previousCorrelations->end()) {
+      transpose ? fillCovarianceT(ap1, ap2, (*itC2).second, cov, row, col)
+                : fillCovariance(ap1, ap2, (*itC2).second, cov, row, col);
+    }
+  } else {
+    ExtendedCorrelations::const_iterator itC1 = theCorrelations.find(ap1);
+    if (itC1 != theCorrelations.end()) {
       previousAlignable = ap1;
       previousCorrelations = (*itC1).second;
 
-      ExtendedCorrelationsTable::const_iterator itC2 = (*itC1).second->find( ap2 );
-      if ( itC2 != (*itC1).second->end() )
-      {
-	transpose ?
-	  fillCovarianceT( ap1, ap2, (*itC2).second, cov, row, col ) :
-	  fillCovariance( ap1, ap2, (*itC2).second, cov, row, col );
+      ExtendedCorrelationsTable::const_iterator itC2 = (*itC1).second->find(ap2);
+      if (itC2 != (*itC1).second->end()) {
+        transpose ? fillCovarianceT(ap1, ap2, (*itC2).second, cov, row, col)
+                  : fillCovariance(ap1, ap2, (*itC2).second, cov, row, col);
       }
     }
   }
@@ -64,37 +56,33 @@ void AlignmentExtendedCorrelationsStore::correlations( Alignable* ap1, Alignable
   return;
 }
 
-
-void AlignmentExtendedCorrelationsStore::setCorrelations( Alignable* ap1, Alignable* ap2,
-							  const AlgebraicSymMatrix& cov, int row, int col )
-{
+void AlignmentExtendedCorrelationsStore::setCorrelations(
+    Alignable* ap1, Alignable* ap2, const AlgebraicSymMatrix& cov, int row, int col) {
   static Alignable* previousAlignable = nullptr;
   static ExtendedCorrelationsTable* previousCorrelations;
 
   // Needed by 'resetCorrelations()' to reset the static pointer:
-  if ( ap1 == nullptr ) { previousAlignable = nullptr; return; }
+  if (ap1 == nullptr) {
+    previousAlignable = nullptr;
+    return;
+  }
 
-  bool transpose = ( ap2 > ap1 );
-  if ( transpose ) std::swap( ap1, ap2 );
+  bool transpose = (ap2 > ap1);
+  if (transpose)
+    std::swap(ap1, ap2);
 
-  if ( ap1 == previousAlignable )
-  {
-    fillCorrelationsTable( ap1, ap2, previousCorrelations, cov, row, col, transpose );
-  }
-  else
-  {
-    ExtendedCorrelations::iterator itC = theCorrelations.find( ap1 );
-    if ( itC != theCorrelations.end() )
-    {
-      fillCorrelationsTable( ap1, ap2, itC->second, cov, row, col, transpose );
+  if (ap1 == previousAlignable) {
+    fillCorrelationsTable(ap1, ap2, previousCorrelations, cov, row, col, transpose);
+  } else {
+    ExtendedCorrelations::iterator itC = theCorrelations.find(ap1);
+    if (itC != theCorrelations.end()) {
+      fillCorrelationsTable(ap1, ap2, itC->second, cov, row, col, transpose);
       previousAlignable = ap1;
       previousCorrelations = itC->second;
-    }
-    else
-    {
+    } else {
       // make new entry
       ExtendedCorrelationsTable* newTable = new ExtendedCorrelationsTable;
-      fillCorrelationsTable( ap1, ap2, newTable, cov, row, col, transpose );
+      fillCorrelationsTable(ap1, ap2, newTable, cov, row, col, transpose);
 
       theCorrelations[ap1] = newTable;
 
@@ -104,45 +92,35 @@ void AlignmentExtendedCorrelationsStore::setCorrelations( Alignable* ap1, Aligna
   }
 }
 
-
-void AlignmentExtendedCorrelationsStore::setCorrelations( Alignable* ap1, Alignable* ap2, AlgebraicMatrix& mat )
-{
-  bool transpose = ( ap2 > ap1 );
-  if ( transpose ) std::swap( ap1, ap2 );
-
-  ExtendedCorrelations::iterator itC1 = theCorrelations.find( ap1 );
-  if ( itC1 != theCorrelations.end() )
-  { 
-    ExtendedCorrelationsTable::iterator itC2 = itC1->second->find( ap1 );
-    if ( itC2 != itC1->second->end() )
-    {
-      itC2->second = transpose ? ExtendedCorrelationsEntry( mat.T() ) : ExtendedCorrelationsEntry( mat );
-    }
-    else
-    {
-      (*itC1->second)[ap2] = transpose ? ExtendedCorrelationsEntry( mat.T() ) : ExtendedCorrelationsEntry( mat );
+void AlignmentExtendedCorrelationsStore::setCorrelations(Alignable* ap1, Alignable* ap2, AlgebraicMatrix& mat) {
+  bool transpose = (ap2 > ap1);
+  if (transpose)
+    std::swap(ap1, ap2);
+
+  ExtendedCorrelations::iterator itC1 = theCorrelations.find(ap1);
+  if (itC1 != theCorrelations.end()) {
+    ExtendedCorrelationsTable::iterator itC2 = itC1->second->find(ap1);
+    if (itC2 != itC1->second->end()) {
+      itC2->second = transpose ? ExtendedCorrelationsEntry(mat.T()) : ExtendedCorrelationsEntry(mat);
+    } else {
+      (*itC1->second)[ap2] = transpose ? ExtendedCorrelationsEntry(mat.T()) : ExtendedCorrelationsEntry(mat);
     }
-  }
-  else
-  {
+  } else {
     ExtendedCorrelationsTable* newTable = new ExtendedCorrelationsTable;
-    (*newTable)[ap2] = transpose ? ExtendedCorrelationsEntry( mat.T() ) : ExtendedCorrelationsEntry( mat );
+    (*newTable)[ap2] = transpose ? ExtendedCorrelationsEntry(mat.T()) : ExtendedCorrelationsEntry(mat);
     theCorrelations[ap1] = newTable;
   }
 }
 
+void AlignmentExtendedCorrelationsStore::getCorrelations(Alignable* ap1, Alignable* ap2, AlgebraicMatrix& mat) const {
+  bool transpose = (ap2 > ap1);
+  if (transpose)
+    std::swap(ap1, ap2);
 
-void AlignmentExtendedCorrelationsStore::getCorrelations( Alignable* ap1, Alignable* ap2, AlgebraicMatrix& mat ) const
-{
-  bool transpose = ( ap2 > ap1 );
-  if ( transpose ) std::swap( ap1, ap2 );
-
-  ExtendedCorrelations::const_iterator itC1 = theCorrelations.find( ap1 );
-  if ( itC1 != theCorrelations.end() )
-  {
-    ExtendedCorrelationsTable::const_iterator itC2 = itC1->second->find( ap2 );
-    if ( itC2 != itC1->second->end() )
-    {
+  ExtendedCorrelations::const_iterator itC1 = theCorrelations.find(ap1);
+  if (itC1 != theCorrelations.end()) {
+    ExtendedCorrelationsTable::const_iterator itC2 = itC1->second->find(ap2);
+    if (itC2 != itC1->second->end()) {
       mat = transpose ? itC2->second.matrix().T() : itC2->second.matrix();
       return;
     }
@@ -151,206 +129,181 @@ void AlignmentExtendedCorrelationsStore::getCorrelations( Alignable* ap1, Aligna
   mat = AlgebraicMatrix();
 }
 
+bool AlignmentExtendedCorrelationsStore::correlationsAvailable(Alignable* ap1, Alignable* ap2) const {
+  bool transpose = (ap2 > ap1);
+  if (transpose)
+    std::swap(ap1, ap2);
 
-bool AlignmentExtendedCorrelationsStore::correlationsAvailable( Alignable* ap1, Alignable* ap2 ) const
-{
-  bool transpose = ( ap2 > ap1 );
-  if ( transpose ) std::swap( ap1, ap2 );
-
-  ExtendedCorrelations::const_iterator itC1 = theCorrelations.find( ap1 );
-  if ( itC1 != theCorrelations.end() )
-  {
-    ExtendedCorrelationsTable::const_iterator itC2 = itC1->second->find( ap2 );
-    if ( itC2 != itC1->second->end() ) return true;
+  ExtendedCorrelations::const_iterator itC1 = theCorrelations.find(ap1);
+  if (itC1 != theCorrelations.end()) {
+    ExtendedCorrelationsTable::const_iterator itC2 = itC1->second->find(ap2);
+    if (itC2 != itC1->second->end())
+      return true;
   }
   return false;
 }
 
-
-void AlignmentExtendedCorrelationsStore::resetCorrelations( void )
-{
+void AlignmentExtendedCorrelationsStore::resetCorrelations(void) {
   ExtendedCorrelations::iterator itC;
-  for ( itC = theCorrelations.begin(); itC != theCorrelations.end(); ++itC ) delete (*itC).second;
-  theCorrelations.erase( theCorrelations.begin(), theCorrelations.end() );
+  for (itC = theCorrelations.begin(); itC != theCorrelations.end(); ++itC)
+    delete (*itC).second;
+  theCorrelations.erase(theCorrelations.begin(), theCorrelations.end());
 
   // Reset the static pointers to the 'previous alignables'
   AlgebraicSymMatrix dummy;
-  correlations( nullptr, nullptr, dummy, 0, 0 );
-  setCorrelations( nullptr, nullptr, dummy, 0, 0 );
+  correlations(nullptr, nullptr, dummy, 0, 0);
+  setCorrelations(nullptr, nullptr, dummy, 0, 0);
 }
 
-
-unsigned int AlignmentExtendedCorrelationsStore::size( void ) const
-{
+unsigned int AlignmentExtendedCorrelationsStore::size(void) const {
   unsigned int size = 0;
   ExtendedCorrelations::const_iterator itC;
-  for ( itC = theCorrelations.begin(); itC != theCorrelations.end(); ++itC )
+  for (itC = theCorrelations.begin(); itC != theCorrelations.end(); ++itC)
     size += itC->second->size();
 
   return size;
 }
 
+void AlignmentExtendedCorrelationsStore::fillCorrelationsTable(Alignable* ap1,
+                                                               Alignable* ap2,
+                                                               ExtendedCorrelationsTable* table,
+                                                               const AlgebraicSymMatrix& cov,
+                                                               int row,
+                                                               int col,
+                                                               bool transpose) {
+  ExtendedCorrelationsTable::iterator itC = table->find(ap2);
 
-void
-AlignmentExtendedCorrelationsStore::fillCorrelationsTable( Alignable* ap1, Alignable* ap2,
-							   ExtendedCorrelationsTable* table,
-							   const AlgebraicSymMatrix& cov,
-							   int row, int col, bool transpose )
-{
-  ExtendedCorrelationsTable::iterator itC = table->find( ap2 );
-
-  if ( itC != table->end() )
-  {
+  if (itC != table->end()) {
     //if ( itC->second.counter() > theMaxUpdates ) return;
 
-    transpose ?
-      readFromCovarianceT( ap1, ap2, itC->second, cov, row, col ) :
-      readFromCovariance( ap1, ap2, itC->second, cov, row, col );
+    transpose ? readFromCovarianceT(ap1, ap2, itC->second, cov, row, col)
+              : readFromCovariance(ap1, ap2, itC->second, cov, row, col);
 
     //itC->second.incrementCounter();
-  }
-  else
-  {
+  } else {
     int nRow = ap1->alignmentParameters()->numSelected();
     int nCol = ap2->alignmentParameters()->numSelected();
-    ExtendedCorrelationsEntry newEntry( nRow, nCol );
+    ExtendedCorrelationsEntry newEntry(nRow, nCol);
 
-    transpose ?
-      readFromCovarianceT( ap1, ap2, newEntry, cov, row, col ) :
-      readFromCovariance( ap1, ap2, newEntry, cov, row, col );
+    transpose ? readFromCovarianceT(ap1, ap2, newEntry, cov, row, col)
+              : readFromCovariance(ap1, ap2, newEntry, cov, row, col);
 
     (*table)[ap2] = newEntry;
   }
 }
 
-
-void
-AlignmentExtendedCorrelationsStore::fillCovariance( Alignable* ap1, Alignable* ap2,  const ExtendedCorrelationsEntry& entry,
-						    AlgebraicSymMatrix& cov, int row, int col ) const
-{
+void AlignmentExtendedCorrelationsStore::fillCovariance(Alignable* ap1,
+                                                        Alignable* ap2,
+                                                        const ExtendedCorrelationsEntry& entry,
+                                                        AlgebraicSymMatrix& cov,
+                                                        int row,
+                                                        int col) const {
   int nRow = entry.numRow();
   int nCol = entry.numCol();
 
-  for ( int iRow = 0; iRow < nRow; ++iRow )
-  {
-    double factor = sqrt(cov[row+iRow][row+iRow]);
-    if ( edm::isNotFinite(factor) ) throw cms::Exception("LogicError") << "[AlignmentExtendedCorrelationsStore::fillCovariance] "
-							    << "NaN-factor: sqrt(" << cov[row+iRow][row+iRow] << ")";
+  for (int iRow = 0; iRow < nRow; ++iRow) {
+    double factor = sqrt(cov[row + iRow][row + iRow]);
+    if (edm::isNotFinite(factor))
+      throw cms::Exception("LogicError") << "[AlignmentExtendedCorrelationsStore::fillCovariance] "
+                                         << "NaN-factor: sqrt(" << cov[row + iRow][row + iRow] << ")";
 
-    for ( int jCol = 0; jCol < nCol; ++jCol )
-      cov[row+iRow][col+jCol] = entry( iRow, jCol )*factor;
+    for (int jCol = 0; jCol < nCol; ++jCol)
+      cov[row + iRow][col + jCol] = entry(iRow, jCol) * factor;
   }
 
-  for ( int jCol = 0; jCol < nCol; ++jCol )
-  {
-    double factor = sqrt(cov[col+jCol][col+jCol]);
-    if ( edm::isNotFinite(factor) ) throw cms::Exception("LogicError") << "[AlignmentExtendedCorrelationsStore::fillCovariance] "
-							    << "NaN-factor: sqrt(" << cov[col+jCol][col+jCol] << ")";
+  for (int jCol = 0; jCol < nCol; ++jCol) {
+    double factor = sqrt(cov[col + jCol][col + jCol]);
+    if (edm::isNotFinite(factor))
+      throw cms::Exception("LogicError") << "[AlignmentExtendedCorrelationsStore::fillCovariance] "
+                                         << "NaN-factor: sqrt(" << cov[col + jCol][col + jCol] << ")";
 
-    for ( int iRow = 0; iRow < nRow; ++iRow )
-      cov[row+iRow][col+jCol] *= factor;
+    for (int iRow = 0; iRow < nRow; ++iRow)
+      cov[row + iRow][col + jCol] *= factor;
   }
 }
 
-
-void
-AlignmentExtendedCorrelationsStore::fillCovarianceT( Alignable* ap1, Alignable* ap2, const ExtendedCorrelationsEntry& entry,
-					     AlgebraicSymMatrix& cov, int row, int col ) const
-{
+void AlignmentExtendedCorrelationsStore::fillCovarianceT(Alignable* ap1,
+                                                         Alignable* ap2,
+                                                         const ExtendedCorrelationsEntry& entry,
+                                                         AlgebraicSymMatrix& cov,
+                                                         int row,
+                                                         int col) const {
   int nRow = entry.numRow();
   int nCol = entry.numCol();
 
-  for ( int iRow = 0; iRow < nRow; ++iRow )
-  {
-    double factor = sqrt(cov[col+iRow][col+iRow]);
-    if ( edm::isNotFinite(factor) ) throw cms::Exception("LogicError") << "[AlignmentExtendedCorrelationsStore::fillCovarianceT] "
-							    << "NaN-factor: sqrt(" << cov[col+iRow][col+iRow] << ")";
-    for ( int jCol = 0; jCol < nCol; ++jCol )
-      cov[row+jCol][col+iRow] = entry( iRow, jCol )*factor;
+  for (int iRow = 0; iRow < nRow; ++iRow) {
+    double factor = sqrt(cov[col + iRow][col + iRow]);
+    if (edm::isNotFinite(factor))
+      throw cms::Exception("LogicError") << "[AlignmentExtendedCorrelationsStore::fillCovarianceT] "
+                                         << "NaN-factor: sqrt(" << cov[col + iRow][col + iRow] << ")";
+    for (int jCol = 0; jCol < nCol; ++jCol)
+      cov[row + jCol][col + iRow] = entry(iRow, jCol) * factor;
   }
 
-  for ( int jCol = 0; jCol < nCol; ++jCol )
-  {
-    double factor = sqrt(cov[row+jCol][row+jCol]);
-    if ( edm::isNotFinite(factor) ) throw cms::Exception("LogicError") << "[AlignmentExtendedCorrelationsStore::fillCovarianceT] "
-							    << "NaN-factor: sqrt(" << cov[row+jCol][row+jCol] << ")";
-    for ( int iRow = 0; iRow < nRow; ++iRow )
-      cov[row+jCol][col+iRow] *= factor;
+  for (int jCol = 0; jCol < nCol; ++jCol) {
+    double factor = sqrt(cov[row + jCol][row + jCol]);
+    if (edm::isNotFinite(factor))
+      throw cms::Exception("LogicError") << "[AlignmentExtendedCorrelationsStore::fillCovarianceT] "
+                                         << "NaN-factor: sqrt(" << cov[row + jCol][row + jCol] << ")";
+    for (int iRow = 0; iRow < nRow; ++iRow)
+      cov[row + jCol][col + iRow] *= factor;
   }
-
 }
 
-
-void
-AlignmentExtendedCorrelationsStore::readFromCovariance( Alignable* ap1, Alignable* ap2, ExtendedCorrelationsEntry& entry,
-							const AlgebraicSymMatrix& cov, int row, int col )
-{
+void AlignmentExtendedCorrelationsStore::readFromCovariance(
+    Alignable* ap1, Alignable* ap2, ExtendedCorrelationsEntry& entry, const AlgebraicSymMatrix& cov, int row, int col) {
   int nRow = entry.numRow();
   int nCol = entry.numCol();
 
-  for ( int iRow = 0; iRow < nRow; ++iRow )
-  {
-    double factor = sqrt(cov[row+iRow][row+iRow]);
-    for ( int jCol = 0; jCol < nCol; ++jCol )
-      entry( iRow, jCol ) = cov[row+iRow][col+jCol]/factor;
+  for (int iRow = 0; iRow < nRow; ++iRow) {
+    double factor = sqrt(cov[row + iRow][row + iRow]);
+    for (int jCol = 0; jCol < nCol; ++jCol)
+      entry(iRow, jCol) = cov[row + iRow][col + jCol] / factor;
   }
 
   double maxCorr = 0;
 
-  for ( int jCol = 0; jCol < nCol; ++jCol )
-  {
-    double factor = sqrt(cov[col+jCol][col+jCol]);
-    for ( int iRow = 0; iRow < nRow; ++iRow )
-    {
-      entry( iRow, jCol ) /= factor;
-      if ( fabs( entry( iRow, jCol ) ) > maxCorr ) maxCorr = fabs( entry( iRow, jCol ) );
+  for (int jCol = 0; jCol < nCol; ++jCol) {
+    double factor = sqrt(cov[col + jCol][col + jCol]);
+    for (int iRow = 0; iRow < nRow; ++iRow) {
+      entry(iRow, jCol) /= factor;
+      if (fabs(entry(iRow, jCol)) > maxCorr)
+        maxCorr = fabs(entry(iRow, jCol));
     }
   }
 
-  resizeCorruptCorrelations( entry, maxCorr );
+  resizeCorruptCorrelations(entry, maxCorr);
 }
 
-
-void
-AlignmentExtendedCorrelationsStore::readFromCovarianceT( Alignable* ap1, Alignable* ap2, ExtendedCorrelationsEntry& entry,
-							 const AlgebraicSymMatrix& cov, int row, int col )
-{
+void AlignmentExtendedCorrelationsStore::readFromCovarianceT(
+    Alignable* ap1, Alignable* ap2, ExtendedCorrelationsEntry& entry, const AlgebraicSymMatrix& cov, int row, int col) {
   int nRow = entry.numRow();
   int nCol = entry.numCol();
 
-  for ( int iRow = 0; iRow < nRow; ++iRow )
-  {
-    double factor = sqrt(cov[col+iRow][col+iRow]);
-    for ( int jCol = 0; jCol < nCol; ++jCol )
-      entry( iRow, jCol ) = cov[row+jCol][col+iRow]/factor;
+  for (int iRow = 0; iRow < nRow; ++iRow) {
+    double factor = sqrt(cov[col + iRow][col + iRow]);
+    for (int jCol = 0; jCol < nCol; ++jCol)
+      entry(iRow, jCol) = cov[row + jCol][col + iRow] / factor;
   }
 
   double maxCorr = 0;
 
-  for ( int jCol = 0; jCol < nCol; ++jCol )
-  {
-    double factor = sqrt(cov[row+jCol][row+jCol]);
-    for ( int iRow = 0; iRow < nRow; ++iRow )
-    {
-      entry( iRow, jCol ) /= factor;
-      if ( fabs( entry( iRow, jCol ) ) > maxCorr ) maxCorr = fabs( entry( iRow, jCol ) );
+  for (int jCol = 0; jCol < nCol; ++jCol) {
+    double factor = sqrt(cov[row + jCol][row + jCol]);
+    for (int iRow = 0; iRow < nRow; ++iRow) {
+      entry(iRow, jCol) /= factor;
+      if (fabs(entry(iRow, jCol)) > maxCorr)
+        maxCorr = fabs(entry(iRow, jCol));
     }
   }
 
-  resizeCorruptCorrelations( entry, maxCorr );
+  resizeCorruptCorrelations(entry, maxCorr);
 }
 
-
-void
-AlignmentExtendedCorrelationsStore::resizeCorruptCorrelations( ExtendedCorrelationsEntry& entry,
-							       double maxCorr )
-{
-  if ( maxCorr > 1. )
-  {
-    entry *= theWeight/maxCorr;
-  }
-  else if ( maxCorr > theCut )
-  {
-    entry *= 1. - ( maxCorr - theCut )/( 1. - theCut )*( 1. - theWeight );
+void AlignmentExtendedCorrelationsStore::resizeCorruptCorrelations(ExtendedCorrelationsEntry& entry, double maxCorr) {
+  if (maxCorr > 1.) {
+    entry *= theWeight / maxCorr;
+  } else if (maxCorr > theCut) {
+    entry *= 1. - (maxCorr - theCut) / (1. - theCut) * (1. - theWeight);
   }
 }
diff --git a/Alignment/CommonAlignmentAlgorithm/src/AlignmentIORoot.cc b/Alignment/CommonAlignmentAlgorithm/src/AlignmentIORoot.cc
index 1aae40d5bfc72..5765a56e48d03 100644
--- a/Alignment/CommonAlignmentAlgorithm/src/AlignmentIORoot.cc
+++ b/Alignment/CommonAlignmentAlgorithm/src/AlignmentIORoot.cc
@@ -6,139 +6,191 @@
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentIORoot.h"
 
 // ----------------------------------------------------------------------------
-// write alignment parameters 
+// write alignment parameters
 
-void 
-AlignmentIORoot::writeAlignmentParameters(const align::Alignables& alivec, 
-                                          const char* filename, int iter, 
-                                          bool validCheck, int& ierr)
-{
+void AlignmentIORoot::writeAlignmentParameters(
+    const align::Alignables& alivec, const char* filename, int iter, bool validCheck, int& ierr) {
   AlignmentParametersIORoot theIO;
-  ierr=0;
+  ierr = 0;
   int iret;
-  iret = theIO.open(filename,iter,true);
-  if (iret!=0) { ierr=-1; return;}
-  iret = theIO.write(alivec,validCheck);
-  if (iret!=0) { ierr=-2; return;}
+  iret = theIO.open(filename, iter, true);
+  if (iret != 0) {
+    ierr = -1;
+    return;
+  }
+  iret = theIO.write(alivec, validCheck);
+  if (iret != 0) {
+    ierr = -2;
+    return;
+  }
   iret = theIO.close();
-  if (iret!=0) { ierr=-3; return;}
+  if (iret != 0) {
+    ierr = -3;
+    return;
+  }
 }
 
 // ----------------------------------------------------------------------------
-// read alignment parameters 
-align::Parameters 
-AlignmentIORoot::readAlignmentParameters(const align::Alignables& alivec, 
-                                         const char* filename, int iter, int& ierr)
-{
+// read alignment parameters
+align::Parameters AlignmentIORoot::readAlignmentParameters(const align::Alignables& alivec,
+                                                           const char* filename,
+                                                           int iter,
+                                                           int& ierr) {
   align::Parameters result;
 
   AlignmentParametersIORoot theIO;
-  ierr=0;
+  ierr = 0;
   int iret;
-  iret = theIO.open(filename,iter,false);
-  if (iret!=0) { ierr=-1; return result;}
-  result = theIO.read(alivec,iret);
-  if (iret!=0) { ierr=-2; return result;}
+  iret = theIO.open(filename, iter, false);
+  if (iret != 0) {
+    ierr = -1;
+    return result;
+  }
+  result = theIO.read(alivec, iret);
+  if (iret != 0) {
+    ierr = -2;
+    return result;
+  }
   iret = theIO.close();
-  if (iret!=0) { ierr=-3; return result;}
+  if (iret != 0) {
+    ierr = -3;
+    return result;
+  }
 
   return result;
 }
 
 // ----------------------------------------------------------------------------
-// write alignment parameters 
-void
-AlignmentIORoot::writeOrigRigidBodyAlignmentParameters
-(const align::Alignables& alivec, const char* filename, int iter, bool validCheck, int& ierr)
-{
+// write alignment parameters
+void AlignmentIORoot::writeOrigRigidBodyAlignmentParameters(
+    const align::Alignables& alivec, const char* filename, int iter, bool validCheck, int& ierr) {
   AlignmentParametersIORoot theIO;
   ierr = 0;
   int iret = theIO.open(filename, iter, true);
-  if (iret != 0) { ierr = -1; return;}
+  if (iret != 0) {
+    ierr = -1;
+    return;
+  }
   iret = theIO.writeOrigRigidBody(alivec, validCheck);
-  if (iret != 0) { ierr = -2; return;}
+  if (iret != 0) {
+    ierr = -2;
+    return;
+  }
   iret = theIO.close();
-  if (iret != 0) { ierr = -3; return;}
+  if (iret != 0) {
+    ierr = -3;
+    return;
+  }
 }
 
-
 // ----------------------------------------------------------------------------
 // write correlations
 
-void 
-AlignmentIORoot::writeCorrelations (const align::Correlations& cormap, 
-                                    const char* filename, int iter, bool validCheck, int& ierr)
-{
+void AlignmentIORoot::writeCorrelations(
+    const align::Correlations& cormap, const char* filename, int iter, bool validCheck, int& ierr) {
   AlignmentCorrelationsIORoot theIO;
-  ierr=0;
+  ierr = 0;
   int iret;
-  iret = theIO.open(filename,iter,true);
-  if (iret!=0) { ierr=-1; return;}
-  iret = theIO.write(cormap,validCheck);
-  if (iret!=0) { ierr=-2; return;}
+  iret = theIO.open(filename, iter, true);
+  if (iret != 0) {
+    ierr = -1;
+    return;
+  }
+  iret = theIO.write(cormap, validCheck);
+  if (iret != 0) {
+    ierr = -2;
+    return;
+  }
   iret = theIO.close();
-  if (iret!=0) { ierr=-3; return;}
+  if (iret != 0) {
+    ierr = -3;
+    return;
+  }
 }
 
 // ----------------------------------------------------------------------------
 // read correlations
 
-align::Correlations 
-AlignmentIORoot::readCorrelations (const align::Alignables& alivec, const char* filename, 
-                                   int iter, int& ierr)
-{   
+align::Correlations AlignmentIORoot::readCorrelations(const align::Alignables& alivec,
+                                                      const char* filename,
+                                                      int iter,
+                                                      int& ierr) {
   align::Correlations result;
 
   AlignmentCorrelationsIORoot theIO;
-  ierr=0;
+  ierr = 0;
   int iret;
-  iret = theIO.open(filename,iter,false);
-  if (iret!=0) { ierr=-1; return result;}
-  result = theIO.read(alivec,iret);
-  if (iret!=0) { ierr=-2; return result;}
+  iret = theIO.open(filename, iter, false);
+  if (iret != 0) {
+    ierr = -1;
+    return result;
+  }
+  result = theIO.read(alivec, iret);
+  if (iret != 0) {
+    ierr = -2;
+    return result;
+  }
   iret = theIO.close();
-  if (iret!=0) { ierr=-3; return result;}
+  if (iret != 0) {
+    ierr = -3;
+    return result;
+  }
 
   return result;
 }
 
-
 // ----------------------------------------------------------------------------
 // write absolute position of alignable
 
-void AlignmentIORoot::writeAlignableAbsolutePositions ( const align::Alignables& alivec, 
-                                                        const char* filename, int iter, 
-                                                        bool validCheck, int& ierr)
-{
+void AlignmentIORoot::writeAlignableAbsolutePositions(
+    const align::Alignables& alivec, const char* filename, int iter, bool validCheck, int& ierr) {
   AlignableDataIORoot theIO(AlignableDataIORoot::Abs);
-  ierr=0;
+  ierr = 0;
   int iret;
-  iret = theIO.open(filename,iter,true);
-  if (iret!=0) { ierr=-1; return;}
-  iret = theIO.writeAbsPos(alivec,validCheck);
-  if (iret!=0) { ierr=-2; return;}
+  iret = theIO.open(filename, iter, true);
+  if (iret != 0) {
+    ierr = -1;
+    return;
+  }
+  iret = theIO.writeAbsPos(alivec, validCheck);
+  if (iret != 0) {
+    ierr = -2;
+    return;
+  }
   iret = theIO.close();
-  if (iret!=0) { ierr=-3; return;}
+  if (iret != 0) {
+    ierr = -3;
+    return;
+  }
 }
 
 // ----------------------------------------------------------------------------
 // read absolute position of alignable
 
-AlignablePositions 
-AlignmentIORoot::readAlignableAbsolutePositions (const align::Alignables& alivec, 
-                                                 const char* filename, int iter, int& ierr)
-{
+AlignablePositions AlignmentIORoot::readAlignableAbsolutePositions(const align::Alignables& alivec,
+                                                                   const char* filename,
+                                                                   int iter,
+                                                                   int& ierr) {
   AlignablePositions result;
 
   AlignableDataIORoot theIO(AlignableDataIORoot::Abs);
-  ierr=0;
+  ierr = 0;
   int iret;
-  iret = theIO.open(filename,iter,false);
-  if (iret!=0) { ierr=-1; return result;}
-  result = theIO.readAbsPos(alivec,iret);
-  if (iret!=0) { ierr=-2; return result;}
+  iret = theIO.open(filename, iter, false);
+  if (iret != 0) {
+    ierr = -1;
+    return result;
+  }
+  result = theIO.readAbsPos(alivec, iret);
+  if (iret != 0) {
+    ierr = -2;
+    return result;
+  }
   iret = theIO.close();
-  if (iret!=0) { ierr=-3; return result;}
+  if (iret != 0) {
+    ierr = -3;
+    return result;
+  }
 
   return result;
 }
@@ -146,39 +198,55 @@ AlignmentIORoot::readAlignableAbsolutePositions (const align::Alignables& alivec
 // ----------------------------------------------------------------------------
 // write original position of alignable
 
-void AlignmentIORoot::writeAlignableOriginalPositions ( const align::Alignables& alivec, 
-                                                        const char* filename, int iter, 
-                                                        bool validCheck, int& ierr)
-{
+void AlignmentIORoot::writeAlignableOriginalPositions(
+    const align::Alignables& alivec, const char* filename, int iter, bool validCheck, int& ierr) {
   AlignableDataIORoot theIO(AlignableDataIORoot::Org);
-  ierr=0;
+  ierr = 0;
   int iret;
-  iret = theIO.open(filename,iter,true);
-  if (iret!=0) { ierr=-1; return;}
-  iret = theIO.writeOrgPos(alivec,validCheck);
-  if (iret!=0) { ierr=-2; return;}
+  iret = theIO.open(filename, iter, true);
+  if (iret != 0) {
+    ierr = -1;
+    return;
+  }
+  iret = theIO.writeOrgPos(alivec, validCheck);
+  if (iret != 0) {
+    ierr = -2;
+    return;
+  }
   iret = theIO.close();
-  if (iret!=0) { ierr=-3; return;}
+  if (iret != 0) {
+    ierr = -3;
+    return;
+  }
 }
 
 // ----------------------------------------------------------------------------
 // read original position of alignable
 
-AlignablePositions 
-AlignmentIORoot::readAlignableOriginalPositions (const align::Alignables& alivec, 
-                                                 const char* filename, int iter, int& ierr)
-{
+AlignablePositions AlignmentIORoot::readAlignableOriginalPositions(const align::Alignables& alivec,
+                                                                   const char* filename,
+                                                                   int iter,
+                                                                   int& ierr) {
   AlignablePositions result;
 
   AlignableDataIORoot theIO(AlignableDataIORoot::Org);
-  ierr=0;
+  ierr = 0;
   int iret;
-  iret = theIO.open(filename,iter,false);
-  if (iret!=0) { ierr=-1; return result;}
-  result = theIO.readOrgPos(alivec,iret);
-  if (iret!=0) { ierr=-2; return result;}
+  iret = theIO.open(filename, iter, false);
+  if (iret != 0) {
+    ierr = -1;
+    return result;
+  }
+  result = theIO.readOrgPos(alivec, iret);
+  if (iret != 0) {
+    ierr = -2;
+    return result;
+  }
   iret = theIO.close();
-  if (iret!=0) { ierr=-3; return result;}
+  if (iret != 0) {
+    ierr = -3;
+    return result;
+  }
 
   return result;
 }
@@ -186,45 +254,55 @@ AlignmentIORoot::readAlignableOriginalPositions (const align::Alignables& alivec
 // ----------------------------------------------------------------------------
 // write relative position of alignable
 
-void AlignmentIORoot::writeAlignableRelativePositions( const align::Alignables& alivec,
-                                                       const char* filename,
-                                                       int iter, bool validCheck, int& ierr)
-{
+void AlignmentIORoot::writeAlignableRelativePositions(
+    const align::Alignables& alivec, const char* filename, int iter, bool validCheck, int& ierr) {
   AlignableDataIORoot theIO(AlignableDataIORoot::Rel);
-  ierr=0;
+  ierr = 0;
   int iret;
-  iret = theIO.open(filename,iter,true);
-  if (iret!=0) { ierr=-1; return;}
-  iret = theIO.writeRelPos(alivec,validCheck);
-  if (iret!=0) { ierr=-2; return;}
+  iret = theIO.open(filename, iter, true);
+  if (iret != 0) {
+    ierr = -1;
+    return;
+  }
+  iret = theIO.writeRelPos(alivec, validCheck);
+  if (iret != 0) {
+    ierr = -2;
+    return;
+  }
   iret = theIO.close();
-  if (iret!=0) { ierr=-3; return;}
+  if (iret != 0) {
+    ierr = -3;
+    return;
+  }
 }
 
 // ----------------------------------------------------------------------------
 // read relative position of alignable
 
-AlignableShifts 
-AlignmentIORoot::readAlignableRelativePositions (const align::Alignables& alivec, 
-                                                 const char* filename, int iter, int& ierr)
-{
+AlignableShifts AlignmentIORoot::readAlignableRelativePositions(const align::Alignables& alivec,
+                                                                const char* filename,
+                                                                int iter,
+                                                                int& ierr) {
   AlignableShifts result;
 
   AlignableDataIORoot theIO(AlignableDataIORoot::Rel);
-  ierr=0;
+  ierr = 0;
   int iret;
-  iret = theIO.open(filename,iter,false);
-  if (iret!=0) { ierr=-1; return result;}
-  result = theIO.readRelPos(alivec,iret);
-  if (iret!=0) { ierr=-2; return result;}
+  iret = theIO.open(filename, iter, false);
+  if (iret != 0) {
+    ierr = -1;
+    return result;
+  }
+  result = theIO.readRelPos(alivec, iret);
+  if (iret != 0) {
+    ierr = -2;
+    return result;
+  }
   iret = theIO.close();
-  if (iret!=0) { ierr=-3; return result;}
+  if (iret != 0) {
+    ierr = -3;
+    return result;
+  }
 
   return result;
 }
-
-
-
-
-
-
diff --git a/Alignment/CommonAlignmentAlgorithm/src/AlignmentIORootBase.cc b/Alignment/CommonAlignmentAlgorithm/src/AlignmentIORootBase.cc
index 6f0e36a735ee5..b3d928b2b6d47 100644
--- a/Alignment/CommonAlignmentAlgorithm/src/AlignmentIORootBase.cc
+++ b/Alignment/CommonAlignmentAlgorithm/src/AlignmentIORootBase.cc
@@ -6,85 +6,78 @@
 #include "TFile.h"
 #include "TTree.h"
 
-AlignmentIORootBase::~AlignmentIORootBase()
-{
-  delete myFile; // tree is deleted automatically with file
+AlignmentIORootBase::~AlignmentIORootBase() {
+  delete myFile;  // tree is deleted automatically with file
 }
 
 // ----------------------------------------------------------------------------
 // open file/trees for write
 
-int AlignmentIORootBase::openRoot(const char* filename, int iteration, bool write)
-{
-  bWrite=write;
+int AlignmentIORootBase::openRoot(const char* filename, int iteration, bool write) {
+  bWrite = write;
   int iter;
 
-  edm::LogInfo("AlignmentIORootBase") << "File: " << filename ;
+  edm::LogInfo("AlignmentIORootBase") << "File: " << filename;
 
-  if (bWrite) { // writing
+  if (bWrite) {  // writing
 
-    int iterfile = testFile(filename,treename);
+    int iterfile = testFile(filename, treename);
     if (iterfile == -1) {
-      iter=iteration;
-	  edm::LogInfo("AlignmentIORootBase") << "Write to new file; first iteration: " << iter ;
-	  myFile = TFile::Open(filename,"recreate");
+      iter = iteration;
+      edm::LogInfo("AlignmentIORootBase") << "Write to new file; first iteration: " << iter;
+      myFile = TFile::Open(filename, "recreate");
     } else {
       if (iteration == -1) {
-        iter=iterfile+1;
-		edm::LogInfo("AlignmentIORootBase") 
-		  << "Write to existing file; highest iteration: " << iter;
+        iter = iterfile + 1;
+        edm::LogInfo("AlignmentIORootBase") << "Write to existing file; highest iteration: " << iter;
       } else {
-        if (iteration<=iterfile) {
-          edm::LogError("AlignmentIORootBase") 
-            << "Iteration " << iteration 
-            <<" invalid or already exists for tree " << treename;
-		  return -1;
+        if (iteration <= iterfile) {
+          edm::LogError("AlignmentIORootBase")
+              << "Iteration " << iteration << " invalid or already exists for tree " << treename;
+          return -1;
         }
         iter = iteration;
-        edm::LogInfo("AlignmentIORootBase")  << "Write to new iteration: " << iter;
+        edm::LogInfo("AlignmentIORootBase") << "Write to new iteration: " << iter;
       }
-      myFile = TFile::Open(filename,"update");
-	  
+      myFile = TFile::Open(filename, "update");
     }
 
     // create tree
     myFile->cd();
-    edm::LogInfo("AlignmentIORootBase") << "Tree: " << treeName(iter,treename);
-    tree = new TTree(treeName(iter,treename),treetxt);
+    edm::LogInfo("AlignmentIORootBase") << "Tree: " << treeName(iter, treename);
+    tree = new TTree(treeName(iter, treename), treetxt);
     createBranches();
 
-  } else { // reading
+  } else {  // reading
 
-    int iterfile = testFile(filename,treename);
-    if ( iterfile == -1 ) {
+    int iterfile = testFile(filename, treename);
+    if (iterfile == -1) {
       edm::LogError("AlignmentIORootBase") << "File does not exist!";
       return -1;
-    } else if ( iterfile == -2 ) {
-      edm::LogError("AlignmentIORootBase") << "Tree " << treename 
-                                           << " does not exist in file " << filename;
+    } else if (iterfile == -2) {
+      edm::LogError("AlignmentIORootBase") << "Tree " << treename << " does not exist in file " << filename;
       return -1;
     } else {
       if (iteration == -1) {
-        iter=iterfile;
+        iter = iterfile;
         edm::LogInfo("AlignmentIORootBase") << "Read from highest iteration: " << iter;
       } else {
-        if (iteration>iterfile) {
-        edm::LogError("AlignmentIORootBase")
-          << "Iteration " << iteration << " does not exist for tree " << treename;
-	return -1;
+        if (iteration > iterfile) {
+          edm::LogError("AlignmentIORootBase") << "Iteration " << iteration << " does not exist for tree " << treename;
+          return -1;
         }
         iter = iteration;
-        edm::LogInfo("AlignmentIORootBase")  << "Read from specified iteration: " << iter;
+        edm::LogInfo("AlignmentIORootBase") << "Read from specified iteration: " << iter;
       }
       myFile = TFile::Open(filename, "read");
     }
 
     myFile->cd();
     // set trees
-    edm::LogInfo("AlignmentIORootBase") <<" Tree: " <<treeName(iter,treename);
-    tree = (TTree*)myFile->Get(treeName(iter,treename));
-    if (tree==nullptr) {
-      edm::LogError("AlignmentIORootBase") <<"Tree does not exist in file!";
+    edm::LogInfo("AlignmentIORootBase") << " Tree: " << treeName(iter, treename);
+    tree = (TTree*)myFile->Get(treeName(iter, treename));
+    if (tree == nullptr) {
+      edm::LogError("AlignmentIORootBase") << "Tree does not exist in file!";
       return -1;
     }
     setBranchAddresses();
@@ -96,15 +89,14 @@ int AlignmentIORootBase::openRoot(const char* filename, int iteration, bool writ
 // ----------------------------------------------------------------------------
 // write tree and close file
 
-int AlignmentIORootBase::closeRoot(void)
-{
-  if (bWrite) { //writing
+int AlignmentIORootBase::closeRoot(void) {
+  if (bWrite) {  //writing
     tree->Write();
   }
 
   delete myFile;
   myFile = nullptr;
-  tree = nullptr; // deleted with file
+  tree = nullptr;  // deleted with file
 
   return 0;
 }
@@ -113,19 +105,18 @@ int AlignmentIORootBase::closeRoot(void)
 // returns highest existing iteration in file
 // if file does not exist: return -1
 
-int AlignmentIORootBase::testFile(const char* filename, const TString &tname)
-{
+int AlignmentIORootBase::testFile(const char* filename, const TString& tname) {
   FILE* testFILE;
-  testFILE = fopen(filename,"r");
+  testFILE = fopen(filename, "r");
   if (testFILE == nullptr) {
     return -1;
   } else {
     fclose(testFILE);
-    int ihighest=-2;
-    TFile *aFile = TFile::Open(filename,"read");
-    for (int iter=0; iter<itermax; iter++) {
-      if ((nullptr != (TTree*)aFile->Get(treeName(iter,tname))) 
-	  && (iter>ihighest)) ihighest=iter; 
+    int ihighest = -2;
+    TFile* aFile = TFile::Open(filename, "read");
+    for (int iter = 0; iter < itermax; iter++) {
+      if ((nullptr != (TTree*)aFile->Get(treeName(iter, tname))) && (iter > ihighest))
+        ihighest = iter;
     }
     delete aFile;
     return ihighest;
@@ -135,7 +126,4 @@ int AlignmentIORootBase::testFile(const char* filename, const TString &tname)
 // ----------------------------------------------------------------------------
 // create tree name from stub+iteration
 
-TString AlignmentIORootBase::treeName(int iter, const TString &tname)
-{
-  return TString(tname + Form("_%i",iter));
-}
+TString AlignmentIORootBase::treeName(int iter, const TString& tname) { return TString(tname + Form("_%i", iter)); }
diff --git a/Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterBuilder.cc b/Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterBuilder.cc
index 9c307198b895c..b0ed1596eb198 100644
--- a/Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterBuilder.cc
+++ b/Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterBuilder.cc
@@ -25,83 +25,69 @@
 using namespace AlignmentParametersFactory;
 
 //__________________________________________________________________________________________________
-AlignmentParameterBuilder::AlignmentParameterBuilder(AlignableTracker* alignableTracker,
-						     AlignableExtras* alignableExtras) :
-  theAlignables(),
-  theAlignableTracker(alignableTracker),
-  theAlignableMuon(nullptr),
-  theAlignableExtras(alignableExtras)
-{
-}
+AlignmentParameterBuilder::AlignmentParameterBuilder(AlignableTracker *alignableTracker,
+                                                     AlignableExtras *alignableExtras)
+    : theAlignables(),
+      theAlignableTracker(alignableTracker),
+      theAlignableMuon(nullptr),
+      theAlignableExtras(alignableExtras) {}
 
 //__________________________________________________________________________________________________
-AlignmentParameterBuilder::AlignmentParameterBuilder(AlignableTracker* alignableTracker, 
-                                                     AlignableMuon* alignableMuon,
-						     AlignableExtras* alignableExtras) :
-  theAlignables(), 
-  theAlignableTracker(alignableTracker),
-  theAlignableMuon(alignableMuon),
-  theAlignableExtras(alignableExtras)
-{
-}
-
+AlignmentParameterBuilder::AlignmentParameterBuilder(AlignableTracker *alignableTracker,
+                                                     AlignableMuon *alignableMuon,
+                                                     AlignableExtras *alignableExtras)
+    : theAlignables(),
+      theAlignableTracker(alignableTracker),
+      theAlignableMuon(alignableMuon),
+      theAlignableExtras(alignableExtras) {}
 
 //__________________________________________________________________________________________________
-AlignmentParameterBuilder::AlignmentParameterBuilder(AlignableTracker* alignableTracker,
-						     AlignableExtras* alignableExtras,
-                                                     const edm::ParameterSet &pSet) :
-  theAlignables(), 
-  theAlignableTracker(alignableTracker),
-  theAlignableMuon(nullptr),
-  theAlignableExtras(alignableExtras)
-{
+AlignmentParameterBuilder::AlignmentParameterBuilder(AlignableTracker *alignableTracker,
+                                                     AlignableExtras *alignableExtras,
+                                                     const edm::ParameterSet &pSet)
+    : theAlignables(),
+      theAlignableTracker(alignableTracker),
+      theAlignableMuon(nullptr),
+      theAlignableExtras(alignableExtras) {
   this->addAllSelections(pSet);
 }
 
 //__________________________________________________________________________________________________
-AlignmentParameterBuilder::AlignmentParameterBuilder(AlignableTracker* alignableTracker,
-                                                     AlignableMuon* alignableMuon,
-						     AlignableExtras* alignableExtras,
-                                                     const edm::ParameterSet &pSet) :
-  theAlignables(), 
-  theAlignableTracker(alignableTracker),
-  theAlignableMuon(alignableMuon),
-  theAlignableExtras(alignableExtras)
-{
+AlignmentParameterBuilder::AlignmentParameterBuilder(AlignableTracker *alignableTracker,
+                                                     AlignableMuon *alignableMuon,
+                                                     AlignableExtras *alignableExtras,
+                                                     const edm::ParameterSet &pSet)
+    : theAlignables(),
+      theAlignableTracker(alignableTracker),
+      theAlignableMuon(alignableMuon),
+      theAlignableExtras(alignableExtras) {
   this->addAllSelections(pSet);
 }
 
-const AlignableTracker* AlignmentParameterBuilder::alignableTracker() const
-{
-  return theAlignableTracker;
-}
+const AlignableTracker *AlignmentParameterBuilder::alignableTracker() const { return theAlignableTracker; }
 
 //__________________________________________________________________________________________________
-void AlignmentParameterBuilder::addAllSelections(const edm::ParameterSet &pSet)
-{
+void AlignmentParameterBuilder::addAllSelections(const edm::ParameterSet &pSet) {
   AlignmentParameterSelector selector(nullptr);
   std::vector<std::string> selsTypes(pSet.getParameter<std::vector<std::string> >("parameterTypes"));
-  
+
   for (unsigned int i = 0; i < selsTypes.size(); ++i) {
     std::vector<std::string> selSetType(selector.decompose(selsTypes[i], ','));
     if (selSetType.size() != 2) {
       throw cms::Exception("BadConfig") << "AlignmentParameterBuilder"
-					<< "parameterTypes should contain 2 comma separated strings"
-					<< ", but found '" << selsTypes[i] << "'.";
+                                        << "parameterTypes should contain 2 comma separated strings"
+                                        << ", but found '" << selsTypes[i] << "'.";
     }
     this->addSelections(pSet.getParameter<edm::ParameterSet>(selSetType[0]),
-			AlignmentParametersFactory::parametersType(selSetType[1]));
+                        AlignmentParametersFactory::parametersType(selSetType[1]));
   }
 }
 
 //__________________________________________________________________________________________________
-unsigned int AlignmentParameterBuilder::addSelections(const edm::ParameterSet &pSet,
-						      ParametersType parType)
-{
-
+unsigned int AlignmentParameterBuilder::addSelections(const edm::ParameterSet &pSet, ParametersType parType) {
   const unsigned int oldAliSize = theAlignables.size();
 
-  AlignmentParameterSelector selector( theAlignableTracker, theAlignableMuon, theAlignableExtras );
+  AlignmentParameterSelector selector(theAlignableTracker, theAlignableMuon, theAlignableExtras);
   const unsigned int addedSets = selector.addSelections(pSet);
 
   const align::Alignables &alignables = selector.selectedAlignables();
@@ -113,10 +99,12 @@ unsigned int AlignmentParameterBuilder::addSelections(const edm::ParameterSet &p
 
   while (iAli != alignables.end() && iParamSel != paramSels.end()) {
     std::vector<bool> boolParSel;
-    std::vector<char> parSel(*iParamSel); // copy, since decodeParamSel may manipulate
+    std::vector<char> parSel(*iParamSel);  // copy, since decodeParamSel may manipulate
     bool charSelIsGeneral = this->decodeParamSel(parSel, boolParSel);
-    if (this->add(*iAli, parType, boolParSel)) ++nHigherLevel;
-    if (charSelIsGeneral) this->addFullParamSel((*iAli)->alignmentParameters(), parSel);
+    if (this->add(*iAli, parType, boolParSel))
+      ++nHigherLevel;
+    if (charSelIsGeneral)
+      this->addFullParamSel((*iAli)->alignmentParameters(), parSel);
 
     ++iAli;
     ++iParamSel;
@@ -126,97 +114,82 @@ unsigned int AlignmentParameterBuilder::addSelections(const edm::ParameterSet &p
                             << " Added " << addedSets << " set(s) of alignables with "
                             << theAlignables.size() - oldAliSize << " alignables in total,"
                             << " of which " << nHigherLevel << " are higher level "
-			    << "(using " << parametersTypeName(parType) << "AlignmentParameters).";
-   
+                            << "(using " << parametersTypeName(parType) << "AlignmentParameters).";
+
   return addedSets;
 }
 
 //__________________________________________________________________________________________________
-bool AlignmentParameterBuilder::add(Alignable *alignable,
-				    ParametersType parType,
-				    const std::vector<bool> &sel)
-{ 
+bool AlignmentParameterBuilder::add(Alignable *alignable, ParametersType parType, const std::vector<bool> &sel) {
   AlignmentParameters *paras = AlignmentParametersFactory::createParameters(alignable, parType, sel);
   alignable->setAlignmentParameters(paras);
   theAlignables.push_back(alignable);
 
   const int aliTypeId = alignable->alignableObjectId();
-  const bool isHigherLevel = (aliTypeId != align::AlignableDet
-			      && aliTypeId != align::AlignableDetUnit);
+  const bool isHigherLevel = (aliTypeId != align::AlignableDet && aliTypeId != align::AlignableDetUnit);
   return isHigherLevel;
 }
 
-
 //__________________________________________________________________________________________________
 unsigned int AlignmentParameterBuilder::add(const align::Alignables &alignables,
-					    ParametersType parType, const std::vector<bool> &sel)
-{
-
+                                            ParametersType parType,
+                                            const std::vector<bool> &sel) {
   unsigned int nHigherLevel = 0;
 
-  for (align::Alignables::const_iterator iAli = alignables.begin();
-       iAli != alignables.end(); ++iAli) {
-    if (this->add(*iAli, parType, sel)) ++nHigherLevel;
+  for (align::Alignables::const_iterator iAli = alignables.begin(); iAli != alignables.end(); ++iAli) {
+    if (this->add(*iAli, parType, sel))
+      ++nHigherLevel;
   }
 
   return nHigherLevel;
 }
 
-
 //__________________________________________________________________________________________________
-void AlignmentParameterBuilder::fixAlignables(int n)
-{
-
-  if (n<1 || n>3) {
+void AlignmentParameterBuilder::fixAlignables(int n) {
+  if (n < 1 || n > 3) {
     edm::LogError("BadArgument") << " n = " << n << " is not in [1,3]";
     return;
   }
 
   align::Alignables theNewAlignables;
-  int i=0;
+  int i = 0;
   int imax = theAlignables.size();
-  for ( align::Alignables::const_iterator ia=theAlignables.begin();
-        ia!=theAlignables.end();  ++ia ) 
-	{
-	  i++;
-	  if ( n==1 && i>1 ) 
-		theNewAlignables.push_back(*ia);
-	  else if ( n==2 && i>1 && i<imax ) 
-		theNewAlignables.push_back(*ia);
-	  else if ( n==3 && i>2 && i<imax) 
-		theNewAlignables.push_back(*ia);
-	}
+  for (align::Alignables::const_iterator ia = theAlignables.begin(); ia != theAlignables.end(); ++ia) {
+    i++;
+    if (n == 1 && i > 1)
+      theNewAlignables.push_back(*ia);
+    else if (n == 2 && i > 1 && i < imax)
+      theNewAlignables.push_back(*ia);
+    else if (n == 3 && i > 2 && i < imax)
+      theNewAlignables.push_back(*ia);
+  }
 
   theAlignables = theNewAlignables;
 
   edm::LogInfo("Alignment") << "@SUB=AlignmentParameterBuilder::fixAlignables"
-                            << "removing " << n << " alignables, so that " 
-                            << theAlignables.size() << " alignables left";
+                            << "removing " << n << " alignables, so that " << theAlignables.size()
+                            << " alignables left";
 }
 
 //__________________________________________________________________________________________________
-bool AlignmentParameterBuilder::decodeParamSel(std::vector<char> &paramSelChar,
-                                               std::vector<bool> &result) const
-{
+bool AlignmentParameterBuilder::decodeParamSel(std::vector<char> &paramSelChar, std::vector<bool> &result) const {
   result.clear();
   // remove all spaces from paramSelChar - useful to group the parameters if they are many
-  paramSelChar.erase(std::remove(paramSelChar.begin(), paramSelChar.end(), ' '),
-		     paramSelChar.end());
+  paramSelChar.erase(std::remove(paramSelChar.begin(), paramSelChar.end(), ' '), paramSelChar.end());
 
   bool anyNon01 = false;
 
   for (unsigned int pos = 0; pos < paramSelChar.size(); ++pos) {
-
     switch (paramSelChar[pos]) {
-    default:
-      anyNon01 = true;
-      // no break;
-    case '1':
-      result.push_back(true);
-      break;
-    case '0':
-      result.push_back(false);
-      break;
+      default:
+        anyNon01 = true;
+        // no break;
+      case '1':
+        result.push_back(true);
+        break;
+      case '0':
+        result.push_back(false);
+        break;
     }
   }
 
@@ -225,9 +198,9 @@ bool AlignmentParameterBuilder::decodeParamSel(std::vector<char> &paramSelChar,
 
 //__________________________________________________________________________________________________
 bool AlignmentParameterBuilder::addFullParamSel(AlignmentParameters *aliParams,
-                                                const std::vector<char> &fullSel) const
-{
-  if (!aliParams) return false;
+                                                const std::vector<char> &fullSel) const {
+  if (!aliParams)
+    return false;
 
   aliParams->setUserVariables(new SelectionUserVariables(fullSel));
 
diff --git a/Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterSelector.cc b/Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterSelector.cc
index 4ff1cf2f7dce0..3f57ac6f70dc4 100644
--- a/Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterSelector.cc
+++ b/Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterSelector.cc
@@ -21,25 +21,31 @@
 #include "FWCore/Utilities/interface/Exception.h"
 
 //________________________________________________________________________________
-AlignmentParameterSelector::AlignmentParameterSelector(AlignableTracker *aliTracker, AlignableMuon* aliMuon,
-						       AlignableExtras *aliExtras) :
-  theTracker(aliTracker), theMuon(aliMuon), theExtras(aliExtras), theSelectedAlignables(), 
-  theRangesEta(), theRangesPhi(), theRangesR(), theRangesX(), theRangesY(), theRangesZ()
-{
-  this->setSpecials(""); // init theOnlyDS, theOnlySS, theSelLayers, theMinLayer, theMaxLayer, theRphiOrStereoDetUnit
+AlignmentParameterSelector::AlignmentParameterSelector(AlignableTracker *aliTracker,
+                                                       AlignableMuon *aliMuon,
+                                                       AlignableExtras *aliExtras)
+    : theTracker(aliTracker),
+      theMuon(aliMuon),
+      theExtras(aliExtras),
+      theSelectedAlignables(),
+      theRangesEta(),
+      theRangesPhi(),
+      theRangesR(),
+      theRangesX(),
+      theRangesY(),
+      theRangesZ() {
+  this->setSpecials("");  // init theOnlyDS, theOnlySS, theSelLayers, theMinLayer, theMaxLayer, theRphiOrStereoDetUnit
 }
 
 //________________________________________________________________________________
-void AlignmentParameterSelector::clear()
-{
+void AlignmentParameterSelector::clear() {
   theSelectedAlignables.clear();
   theSelectedParameters.clear();
   this->clearGeometryCuts();
 }
 
 //________________________________________________________________________________
-void AlignmentParameterSelector::clearGeometryCuts()
-{
+void AlignmentParameterSelector::clearGeometryCuts() {
   theRangesEta.clear();
   theRangesPhi.clear();
   theRangesR.clear();
@@ -55,27 +61,22 @@ void AlignmentParameterSelector::clearGeometryCuts()
   theTECDetIdRanges.clear();
 }
 
-const AlignableTracker* AlignmentParameterSelector::alignableTracker() const
-{
-  return theTracker;
-}
+const AlignableTracker *AlignmentParameterSelector::alignableTracker() const { return theTracker; }
 
 //__________________________________________________________________________________________________
-unsigned int AlignmentParameterSelector::addSelections(const edm::ParameterSet &pSet)
-{
+unsigned int AlignmentParameterSelector::addSelections(const edm::ParameterSet &pSet) {
+  const std::vector<std::string> selections = pSet.getParameter<std::vector<std::string> >("alignParams");
 
-  const std::vector<std::string> selections
-    = pSet.getParameter<std::vector<std::string> >("alignParams");
-  
   unsigned int addedSets = 0;
 
   for (unsigned int iSel = 0; iSel < selections.size(); ++iSel) {
     std::vector<std::string> decompSel(this->decompose(selections[iSel], ','));
-    if (decompSel.empty()) continue; // edm::LogError or even cms::Exception??
+    if (decompSel.empty())
+      continue;  // edm::LogError or even cms::Exception??
 
     if (decompSel.size() < 2) {
-      throw cms::Exception("BadConfig") << "@SUB=AlignmentParameterSelector::addSelections"
-                                        << selections[iSel]<<" from alignableParamSelector: "
+      throw cms::Exception("BadConfig") << "@SUB=AlignmentParameterSelector::addSelections" << selections[iSel]
+                                        << " from alignableParamSelector: "
                                         << " should have at least 2 ','-separated parts";
     } else if (decompSel.size() > 2) {
       const edm::ParameterSet geoSel(pSet.getParameter<edm::ParameterSet>(decompSel[2].c_str()));
@@ -84,7 +85,7 @@ unsigned int AlignmentParameterSelector::addSelections(const edm::ParameterSet &
       this->clearGeometryCuts();
       this->addSelection(decompSel[0], this->convertParamSel(decompSel[1]));
     }
-    
+
     ++addedSets;
   }
 
@@ -92,16 +93,15 @@ unsigned int AlignmentParameterSelector::addSelections(const edm::ParameterSet &
 }
 
 //________________________________________________________________________________
-void AlignmentParameterSelector::setGeometryCuts(const edm::ParameterSet &pSet)
-{
+void AlignmentParameterSelector::setGeometryCuts(const edm::ParameterSet &pSet) {
   // Allow non-specified arrays to be interpreted as empty (i.e. no selection),
-  // but take care that nothing unknown is configured (to fetch typos!). 
+  // but take care that nothing unknown is configured (to fetch typos!).
 
   this->clearGeometryCuts();
   const std::vector<std::string> parameterNames(pSet.getParameterNames());
-  for (std::vector<std::string>::const_iterator iParam = parameterNames.begin(),
-	 iEnd = parameterNames.end(); iParam != iEnd; ++iParam) {
-
+  for (std::vector<std::string>::const_iterator iParam = parameterNames.begin(), iEnd = parameterNames.end();
+       iParam != iEnd;
+       ++iParam) {
     // Calling swap is more efficient than assignment:
     if (*iParam == "etaRanges") {
       pSet.getParameter<std::vector<double> >(*iParam).swap(theRangesEta);
@@ -124,40 +124,39 @@ void AlignmentParameterSelector::setGeometryCuts(const edm::ParameterSet &pSet)
     } else if (*iParam == "excludedDetIdRanges") {
       pSet.getParameter<std::vector<int> >(*iParam).swap(theExcludedDetIdRanges);
     } else if (*iParam == "pxbDetId") {
-      const edm::ParameterSet & pxbDetIdPSet = pSet.getParameterSet(*iParam);
+      const edm::ParameterSet &pxbDetIdPSet = pSet.getParameterSet(*iParam);
       this->setPXBDetIdCuts(pxbDetIdPSet);
     } else if (*iParam == "pxfDetId") {
-      const edm::ParameterSet & pxfDetIdPSet = pSet.getParameterSet(*iParam);
+      const edm::ParameterSet &pxfDetIdPSet = pSet.getParameterSet(*iParam);
       this->setPXFDetIdCuts(pxfDetIdPSet);
     } else if (*iParam == "tibDetId") {
-      const edm::ParameterSet & tibDetIdPSet = pSet.getParameterSet(*iParam);
+      const edm::ParameterSet &tibDetIdPSet = pSet.getParameterSet(*iParam);
       this->setTIBDetIdCuts(tibDetIdPSet);
     } else if (*iParam == "tidDetId") {
-      const edm::ParameterSet & tidDetIdPSet = pSet.getParameterSet(*iParam);
+      const edm::ParameterSet &tidDetIdPSet = pSet.getParameterSet(*iParam);
       this->setTIDDetIdCuts(tidDetIdPSet);
     } else if (*iParam == "tobDetId") {
-      const edm::ParameterSet & tobDetIdPSet = pSet.getParameterSet(*iParam);
+      const edm::ParameterSet &tobDetIdPSet = pSet.getParameterSet(*iParam);
       this->setTOBDetIdCuts(tobDetIdPSet);
     } else if (*iParam == "tecDetId") {
-      const edm::ParameterSet & tecDetIdPSet = pSet.getParameterSet(*iParam);
+      const edm::ParameterSet &tecDetIdPSet = pSet.getParameterSet(*iParam);
       this->setTECDetIdCuts(tecDetIdPSet);
     } else {
       throw cms::Exception("BadConfig") << "[AlignmentParameterSelector::setGeometryCuts] "
-					<< "Unknown parameter '" << *iParam << "'.\n";
+                                        << "Unknown parameter '" << *iParam << "'.\n";
     }
   }
 }
 
 //________________________________________________________________________________
-void AlignmentParameterSelector::setPXBDetIdCuts(const edm::ParameterSet &pSet)
-{
+void AlignmentParameterSelector::setPXBDetIdCuts(const edm::ParameterSet &pSet) {
   // Allow non-specified arrays to be interpreted as empty (i.e. no selection),
-  // but take care that nothing unknown is configured (to fetch typos!). 
+  // but take care that nothing unknown is configured (to fetch typos!).
 
   const std::vector<std::string> parameterNames(pSet.getParameterNames());
-  for (std::vector<std::string>::const_iterator iParam = parameterNames.begin(),
-	 iEnd = parameterNames.end(); iParam != iEnd; ++iParam) {
-
+  for (std::vector<std::string>::const_iterator iParam = parameterNames.begin(), iEnd = parameterNames.end();
+       iParam != iEnd;
+       ++iParam) {
     // Calling swap is more efficient than assignment:
     if (*iParam == "ladderRanges") {
       pSet.getParameter<std::vector<int> >(*iParam).swap(thePXBDetIdRanges.theLadderRanges);
@@ -167,21 +166,20 @@ void AlignmentParameterSelector::setPXBDetIdCuts(const edm::ParameterSet &pSet)
       pSet.getParameter<std::vector<int> >(*iParam).swap(thePXBDetIdRanges.theModuleRanges);
     } else {
       throw cms::Exception("BadConfig") << "[AlignmentParameterSelector::setPXBDetIdCuts] "
-					<< "Unknown parameter '" << *iParam << "'.\n";
+                                        << "Unknown parameter '" << *iParam << "'.\n";
     }
   }
 }
 
 //________________________________________________________________________________
-void AlignmentParameterSelector::setPXFDetIdCuts(const edm::ParameterSet &pSet)
-{
+void AlignmentParameterSelector::setPXFDetIdCuts(const edm::ParameterSet &pSet) {
   // Allow non-specified arrays to be interpreted as empty (i.e. no selection),
-  // but take care that nothing unknown is configured (to fetch typos!). 
+  // but take care that nothing unknown is configured (to fetch typos!).
 
   const std::vector<std::string> parameterNames(pSet.getParameterNames());
-  for (std::vector<std::string>::const_iterator iParam = parameterNames.begin(),
-	 iEnd = parameterNames.end(); iParam != iEnd; ++iParam) {
-
+  for (std::vector<std::string>::const_iterator iParam = parameterNames.begin(), iEnd = parameterNames.end();
+       iParam != iEnd;
+       ++iParam) {
     // Calling swap is more efficient than assignment:
     if (*iParam == "bladeRanges") {
       pSet.getParameter<std::vector<int> >(*iParam).swap(thePXFDetIdRanges.theBladeRanges);
@@ -195,21 +193,20 @@ void AlignmentParameterSelector::setPXFDetIdCuts(const edm::ParameterSet &pSet)
       pSet.getParameter<std::vector<int> >(*iParam).swap(thePXFDetIdRanges.theSideRanges);
     } else {
       throw cms::Exception("BadConfig") << "[AlignmentParameterSelector::setPXFDetIdCuts] "
-					<< "Unknown parameter '" << *iParam << "'.\n";
+                                        << "Unknown parameter '" << *iParam << "'.\n";
     }
   }
 }
 
 //________________________________________________________________________________
-void AlignmentParameterSelector::setTIBDetIdCuts(const edm::ParameterSet &pSet)
-{
+void AlignmentParameterSelector::setTIBDetIdCuts(const edm::ParameterSet &pSet) {
   // Allow non-specified arrays to be interpreted as empty (i.e. no selection),
-  // but take care that nothing unknown is configured (to fetch typos!). 
+  // but take care that nothing unknown is configured (to fetch typos!).
 
   const std::vector<std::string> parameterNames(pSet.getParameterNames());
-  for (std::vector<std::string>::const_iterator iParam = parameterNames.begin(),
-	 iEnd = parameterNames.end(); iParam != iEnd; ++iParam) {
-
+  for (std::vector<std::string>::const_iterator iParam = parameterNames.begin(), iEnd = parameterNames.end();
+       iParam != iEnd;
+       ++iParam) {
     // Calling swap is more efficient than assignment:
     if (*iParam == "layerRanges") {
       pSet.getParameter<std::vector<int> >(*iParam).swap(theTIBDetIdRanges.theLayerRanges);
@@ -221,21 +218,20 @@ void AlignmentParameterSelector::setTIBDetIdCuts(const edm::ParameterSet &pSet)
       pSet.getParameter<std::vector<int> >(*iParam).swap(theTIBDetIdRanges.theSideRanges);
     } else {
       throw cms::Exception("BadConfig") << "[AlignmentParameterSelector::setTIBDetIdCuts] "
-					<< "Unknown parameter '" << *iParam << "'.\n";
+                                        << "Unknown parameter '" << *iParam << "'.\n";
     }
   }
 }
 
 //________________________________________________________________________________
-void AlignmentParameterSelector::setTIDDetIdCuts(const edm::ParameterSet &pSet)
-{
+void AlignmentParameterSelector::setTIDDetIdCuts(const edm::ParameterSet &pSet) {
   // Allow non-specified arrays to be interpreted as empty (i.e. no selection),
-  // but take care that nothing unknown is configured (to fetch typos!). 
+  // but take care that nothing unknown is configured (to fetch typos!).
 
   const std::vector<std::string> parameterNames(pSet.getParameterNames());
-  for (std::vector<std::string>::const_iterator iParam = parameterNames.begin(),
-	 iEnd = parameterNames.end(); iParam != iEnd; ++iParam) {
-
+  for (std::vector<std::string>::const_iterator iParam = parameterNames.begin(), iEnd = parameterNames.end();
+       iParam != iEnd;
+       ++iParam) {
     // Calling swap is more efficient than assignment:
     if (*iParam == "diskRanges") {
       pSet.getParameter<std::vector<int> >(*iParam).swap(theTIDDetIdRanges.theDiskRanges);
@@ -247,21 +243,20 @@ void AlignmentParameterSelector::setTIDDetIdCuts(const edm::ParameterSet &pSet)
       pSet.getParameter<std::vector<int> >(*iParam).swap(theTIDDetIdRanges.theSideRanges);
     } else {
       throw cms::Exception("BadConfig") << "[AlignmentParameterSelector::setTIDDetIdCuts] "
-					<< "Unknown parameter '" << *iParam << "'.\n";
+                                        << "Unknown parameter '" << *iParam << "'.\n";
     }
   }
 }
 
 //________________________________________________________________________________
-void AlignmentParameterSelector::setTOBDetIdCuts(const edm::ParameterSet &pSet)
-{
+void AlignmentParameterSelector::setTOBDetIdCuts(const edm::ParameterSet &pSet) {
   // Allow non-specified arrays to be interpreted as empty (i.e. no selection),
-  // but take care that nothing unknown is configured (to fetch typos!). 
+  // but take care that nothing unknown is configured (to fetch typos!).
 
   const std::vector<std::string> parameterNames(pSet.getParameterNames());
-  for (std::vector<std::string>::const_iterator iParam = parameterNames.begin(),
-	 iEnd = parameterNames.end(); iParam != iEnd; ++iParam) {
-
+  for (std::vector<std::string>::const_iterator iParam = parameterNames.begin(), iEnd = parameterNames.end();
+       iParam != iEnd;
+       ++iParam) {
     // Calling swap is more efficient than assignment:
     if (*iParam == "layerRanges") {
       pSet.getParameter<std::vector<int> >(*iParam).swap(theTOBDetIdRanges.theLayerRanges);
@@ -273,21 +268,20 @@ void AlignmentParameterSelector::setTOBDetIdCuts(const edm::ParameterSet &pSet)
       pSet.getParameter<std::vector<int> >(*iParam).swap(theTOBDetIdRanges.theRodRanges);
     } else {
       throw cms::Exception("BadConfig") << "[AlignmentParameterSelector::setTOBDetIdCuts] "
-					<< "Unknown parameter '" << *iParam << "'.\n";
+                                        << "Unknown parameter '" << *iParam << "'.\n";
     }
   }
 }
 
 //________________________________________________________________________________
-void AlignmentParameterSelector::setTECDetIdCuts(const edm::ParameterSet &pSet)
-{
+void AlignmentParameterSelector::setTECDetIdCuts(const edm::ParameterSet &pSet) {
   // Allow non-specified arrays to be interpreted as empty (i.e. no selection),
-  // but take care that nothing unknown is configured (to fetch typos!). 
+  // but take care that nothing unknown is configured (to fetch typos!).
 
   const std::vector<std::string> parameterNames(pSet.getParameterNames());
-  for (std::vector<std::string>::const_iterator iParam = parameterNames.begin(),
-	 iEnd = parameterNames.end(); iParam != iEnd; ++iParam) {
-
+  for (std::vector<std::string>::const_iterator iParam = parameterNames.begin(), iEnd = parameterNames.end();
+       iParam != iEnd;
+       ++iParam) {
     // Calling swap is more efficient than assignment:
     if (*iParam == "wheelRanges") {
       pSet.getParameter<std::vector<int> >(*iParam).swap(theTECDetIdRanges.theWheelRanges);
@@ -301,7 +295,7 @@ void AlignmentParameterSelector::setTECDetIdCuts(const edm::ParameterSet &pSet)
       pSet.getParameter<std::vector<int> >(*iParam).swap(theTECDetIdRanges.theSideRanges);
     } else {
       throw cms::Exception("BadConfig") << "[AlignmentParameterSelector::setTECDetIdCuts] "
-					<< "Unknown parameter '" << *iParam << "'.\n";
+                                        << "Unknown parameter '" << *iParam << "'.\n";
     }
   }
 }
@@ -309,54 +303,67 @@ void AlignmentParameterSelector::setTECDetIdCuts(const edm::ParameterSet &pSet)
 //________________________________________________________________________________
 unsigned int AlignmentParameterSelector::addSelection(const std::string &name,
                                                       const std::vector<char> &paramSel,
-                                                      const edm::ParameterSet &pSet)
-{
+                                                      const edm::ParameterSet &pSet) {
   this->setGeometryCuts(pSet);
   return this->addSelection(name, paramSel);
 }
 
 //________________________________________________________________________________
-unsigned int AlignmentParameterSelector::addSelection(const std::string &nameInput, 
-                                                      const std::vector<char> &paramSel)
-{
-  const std::string name(this->setSpecials(nameInput)); // possibly changing name
+unsigned int AlignmentParameterSelector::addSelection(const std::string &nameInput, const std::vector<char> &paramSel) {
+  const std::string name(this->setSpecials(nameInput));  // possibly changing name
 
   unsigned int numAli = 0;
 
   ////////////////////////////////////
   // Generic Tracker Section
   ////////////////////////////////////
-  if (name.find("Tracker") == 0) { // string starts with "Tracker"
+  if (name.find("Tracker") == 0) {  // string starts with "Tracker"
     if (!theTracker) {
       throw cms::Exception("BadConfig") << "[AlignmentParameterSelector::addSelection] "
-					<< "Configuration requires access to AlignableTracker"
-					<< " (for " << name << ") that is not initialized";
+                                        << "Configuration requires access to AlignableTracker"
+                                        << " (for " << name << ") that is not initialized";
     }
-    const std::string substructName(name, 7); // erase "Tracker" at the beginning
+    const std::string substructName(name, 7);  // erase "Tracker" at the beginning
     numAli += this->add(theTracker->subStructures(substructName), paramSel);
   }
   ////////////////////////////////////
   // Old hardcoded, but geometry-independent tracker section (NOTE: no check on theTracker != 0)
   ////////////////////////////////////
-  else if (name == "AllDets")       numAli += this->addAllDets(paramSel);
-  else if (name == "AllRods")       numAli += this->addAllRods(paramSel);
-  else if (name == "AllLayers")     numAli += this->addAllLayers(paramSel);
-  else if (name == "AllComponents") numAli += this->add(theTracker->components(), paramSel);
-  else if (name == "AllAlignables") numAli += this->addAllAlignables(paramSel);
+  else if (name == "AllDets")
+    numAli += this->addAllDets(paramSel);
+  else if (name == "AllRods")
+    numAli += this->addAllRods(paramSel);
+  else if (name == "AllLayers")
+    numAli += this->addAllLayers(paramSel);
+  else if (name == "AllComponents")
+    numAli += this->add(theTracker->components(), paramSel);
+  else if (name == "AllAlignables")
+    numAli += this->addAllAlignables(paramSel);
   //
   // TIB+TOB
   //
-  else if (name == "BarrelRods")   numAli += this->add(theTracker->barrelRods(), paramSel);
-  else if (name == "BarrelDets")   numAli += this->add(theTracker->barrelGeomDets(), paramSel);
-  else if (name == "BarrelLayers") numAli += this->add(theTracker->barrelLayers(), paramSel);
-  else if (name == "TOBDets")      numAli += this->add(theTracker->outerBarrelGeomDets(), paramSel);
-  else if (name == "TOBRods")      numAli += this->add(theTracker->outerBarrelRods(), paramSel);
-  else if (name == "TOBLayers")    numAli += this->add(theTracker->outerBarrelLayers(), paramSel);
-  else if (name == "TOBHalfBarrels") numAli += this->add(theTracker->outerHalfBarrels(), paramSel);
-  else if (name == "TIBDets")      numAli += this->add(theTracker->innerBarrelGeomDets(), paramSel);
-  else if (name == "TIBRods")      numAli += this->add(theTracker->innerBarrelRods(), paramSel);
-  else if (name == "TIBLayers")    numAli += this->add(theTracker->innerBarrelLayers(), paramSel);
-  else if (name == "TIBHalfBarrels") numAli += this->add(theTracker->innerHalfBarrels(), paramSel);
+  else if (name == "BarrelRods")
+    numAli += this->add(theTracker->barrelRods(), paramSel);
+  else if (name == "BarrelDets")
+    numAli += this->add(theTracker->barrelGeomDets(), paramSel);
+  else if (name == "BarrelLayers")
+    numAli += this->add(theTracker->barrelLayers(), paramSel);
+  else if (name == "TOBDets")
+    numAli += this->add(theTracker->outerBarrelGeomDets(), paramSel);
+  else if (name == "TOBRods")
+    numAli += this->add(theTracker->outerBarrelRods(), paramSel);
+  else if (name == "TOBLayers")
+    numAli += this->add(theTracker->outerBarrelLayers(), paramSel);
+  else if (name == "TOBHalfBarrels")
+    numAli += this->add(theTracker->outerHalfBarrels(), paramSel);
+  else if (name == "TIBDets")
+    numAli += this->add(theTracker->innerBarrelGeomDets(), paramSel);
+  else if (name == "TIBRods")
+    numAli += this->add(theTracker->innerBarrelRods(), paramSel);
+  else if (name == "TIBLayers")
+    numAli += this->add(theTracker->innerBarrelLayers(), paramSel);
+  else if (name == "TIBHalfBarrels")
+    numAli += this->add(theTracker->innerHalfBarrels(), paramSel);
   //
   // PXBarrel
   //
@@ -372,11 +379,16 @@ unsigned int AlignmentParameterSelector::addSelection(const std::string &nameInp
   //
   // PXEndcap
   //
-  else if (name == "PXECDets") numAli += this->add(theTracker->pixelEndcapGeomDets(), paramSel);
-  else if (name == "PXECPetals") numAli += this->add(theTracker->pixelEndcapPetals(), paramSel);
-  else if (name == "PXECLayers") numAli += this->add(theTracker->pixelEndcapLayers(), paramSel);
-  else if (name == "PXECHalfCylinders") numAli += this->add(theTracker->pixelEndcapHalfCylinders(), paramSel);
-  else if (name == "PXEndCaps") numAli += this->add(theTracker->pixelEndCaps(), paramSel);
+  else if (name == "PXECDets")
+    numAli += this->add(theTracker->pixelEndcapGeomDets(), paramSel);
+  else if (name == "PXECPetals")
+    numAli += this->add(theTracker->pixelEndcapPetals(), paramSel);
+  else if (name == "PXECLayers")
+    numAli += this->add(theTracker->pixelEndcapLayers(), paramSel);
+  else if (name == "PXECHalfCylinders")
+    numAli += this->add(theTracker->pixelEndcapHalfCylinders(), paramSel);
+  else if (name == "PXEndCaps")
+    numAli += this->add(theTracker->pixelEndCaps(), paramSel);
   //
   // Pixel Barrel+endcap
   //
@@ -393,23 +405,31 @@ unsigned int AlignmentParameterSelector::addSelection(const std::string &nameInp
   //
   // TID
   //
-  else if (name == "TIDs")          numAli += this->add(theTracker->TIDs(), paramSel);
-  else if (name == "TIDLayers")     numAli += this->add(theTracker->TIDLayers(), paramSel);
-  else if (name == "TIDRings")      numAli += this->add(theTracker->TIDRings(), paramSel);
-  else if (name == "TIDDets")       numAli += this->add(theTracker->TIDGeomDets(), paramSel);
+  else if (name == "TIDs")
+    numAli += this->add(theTracker->TIDs(), paramSel);
+  else if (name == "TIDLayers")
+    numAli += this->add(theTracker->TIDLayers(), paramSel);
+  else if (name == "TIDRings")
+    numAli += this->add(theTracker->TIDRings(), paramSel);
+  else if (name == "TIDDets")
+    numAli += this->add(theTracker->TIDGeomDets(), paramSel);
   //
   // TEC
   //
-  else if (name == "TECDets")       numAli += this->add(theTracker->endcapGeomDets(), paramSel);
-  else if (name == "TECPetals")     numAli += this->add(theTracker->endcapPetals(), paramSel);
-  else if (name == "TECLayers")     numAli += this->add(theTracker->endcapLayers(), paramSel);
-  else if (name == "TECs")          numAli += this->add(theTracker->endCaps(), paramSel);
+  else if (name == "TECDets")
+    numAli += this->add(theTracker->endcapGeomDets(), paramSel);
+  else if (name == "TECPetals")
+    numAli += this->add(theTracker->endcapPetals(), paramSel);
+  else if (name == "TECLayers")
+    numAli += this->add(theTracker->endcapLayers(), paramSel);
+  else if (name == "TECs")
+    numAli += this->add(theTracker->endCaps(), paramSel);
   //
   // StripEndcap (TID+TEC)
   //
   else if (name == "EndcapDets") {
     numAli += this->add(theTracker->TIDGeomDets(), paramSel);
-    numAli += this->add(theTracker->endcapGeomDets(), paramSel); 
+    numAli += this->add(theTracker->endcapGeomDets(), paramSel);
   } else if (name == "EndcapPetals") {
     numAli += this->add(theTracker->TIDRings(), paramSel);
     numAli += this->add(theTracker->endcapPetals(), paramSel);
@@ -423,7 +443,7 @@ unsigned int AlignmentParameterSelector::addSelection(const std::string &nameInp
   else if (name == "StripDets") {
     numAli += this->add(theTracker->barrelGeomDets(), paramSel);
     numAli += this->add(theTracker->TIDGeomDets(), paramSel);
-    numAli += this->add(theTracker->endcapGeomDets(), paramSel); 
+    numAli += this->add(theTracker->endcapGeomDets(), paramSel);
   } else if (name == "StripRods") {
     numAli += this->add(theTracker->barrelRods(), paramSel);
     numAli += this->add(theTracker->TIDRings(), paramSel);
@@ -438,70 +458,76 @@ unsigned int AlignmentParameterSelector::addSelection(const std::string &nameInp
   ////////////////////////////////////
   // Check if name contains muon and react if alignable muon not initialized
   else if (name.find("Muon") != std::string::npos) {
-    if  (!theMuon) {
+    if (!theMuon) {
       throw cms::Exception("BadConfig") << "[AlignmentParameterSelector::addSelection] "
-					<< "Configuration requires access to AlignableMuon"
-					<< " which is not initialized";
-    }
-    else if (name == "MuonDTLayers")             add(theMuon->DTLayers(), paramSel);
-    else if (name == "MuonDTSuperLayers")        add(theMuon->DTSuperLayers(), paramSel);
-    else if (name == "MuonDTChambers")  	 add(theMuon->DTChambers(), paramSel);
-    else if (name == "MuonDTStations")  	 add(theMuon->DTStations(), paramSel);
-    else if (name == "MuonDTWheels")    	 add(theMuon->DTWheels(), paramSel);
-    else if (name == "MuonBarrel")      	 add(theMuon->DTBarrel(), paramSel);
-    else if (name == "MuonCSCLayers")   	 add(theMuon->CSCLayers(), paramSel);
-    else if (name == "MuonCSCRings")             add(theMuon->CSCRings(), paramSel);
-    else if (name == "MuonCSCChambers") 	 add(theMuon->CSCChambers(), paramSel);
-    else if (name == "MuonCSCStations") 	 add(theMuon->CSCStations(), paramSel);
-    else if (name == "MuonEndcaps")     	 add(theMuon->CSCEndcaps(), paramSel);
+                                        << "Configuration requires access to AlignableMuon"
+                                        << " which is not initialized";
+    } else if (name == "MuonDTLayers")
+      add(theMuon->DTLayers(), paramSel);
+    else if (name == "MuonDTSuperLayers")
+      add(theMuon->DTSuperLayers(), paramSel);
+    else if (name == "MuonDTChambers")
+      add(theMuon->DTChambers(), paramSel);
+    else if (name == "MuonDTStations")
+      add(theMuon->DTStations(), paramSel);
+    else if (name == "MuonDTWheels")
+      add(theMuon->DTWheels(), paramSel);
+    else if (name == "MuonBarrel")
+      add(theMuon->DTBarrel(), paramSel);
+    else if (name == "MuonCSCLayers")
+      add(theMuon->CSCLayers(), paramSel);
+    else if (name == "MuonCSCRings")
+      add(theMuon->CSCRings(), paramSel);
+    else if (name == "MuonCSCChambers")
+      add(theMuon->CSCChambers(), paramSel);
+    else if (name == "MuonCSCStations")
+      add(theMuon->CSCStations(), paramSel);
+    else if (name == "MuonEndcaps")
+      add(theMuon->CSCEndcaps(), paramSel);
 
     ////////////////////////////////////
     // not found, but Muon
     ////////////////////////////////////
     else {
-      throw cms::Exception("BadConfig") <<"[AlignmentParameterSelector::addSelection]"
-					<< ": Selection '" << name << "' invalid!";
+      throw cms::Exception("BadConfig") << "[AlignmentParameterSelector::addSelection]"
+                                        << ": Selection '" << name << "' invalid!";
     }
   }
 
   ////////////////////////////////////
   // Generic Extra Alignable Section
   ////////////////////////////////////
-  else if (name.find("Extras") == 0) { // string starts with "Extras"
+  else if (name.find("Extras") == 0) {  // string starts with "Extras"
     if (!theExtras) {
       throw cms::Exception("BadConfig") << "[AlignmentParameterSelector::addSelection] "
-					<< "Configuration requires access to AlignableExtras"
-					<< " (for " << name << ") that is not initialized";
+                                        << "Configuration requires access to AlignableExtras"
+                                        << " (for " << name << ") that is not initialized";
     }
-    const std::string substructName(name, 6); // erase "Extras" at the beginning
+    const std::string substructName(name, 6);  // erase "Extras" at the beginning
     numAli += this->add(theExtras->subStructures(substructName), paramSel);
   }
   // end of "name.find("Extras") != std::string::npos"
 
   else {
-    throw cms::Exception("BadConfig") <<"[AlignmentParameterSelector::addSelection]"
-				      << ": Selection '" << name << "' invalid!";
+    throw cms::Exception("BadConfig") << "[AlignmentParameterSelector::addSelection]"
+                                      << ": Selection '" << name << "' invalid!";
   }
-  
-  this->setSpecials(""); // reset
+
+  this->setSpecials("");  // reset
 
   return numAli;
 }
 
 //________________________________________________________________________________
-unsigned int AlignmentParameterSelector::add(const align::Alignables &alignables,
-                                             const std::vector<char> &paramSel)
-{
+unsigned int AlignmentParameterSelector::add(const align::Alignables &alignables, const std::vector<char> &paramSel) {
   unsigned int numAli = 0;
 
   // loop on Alignable objects
-  for (align::Alignables::const_iterator iAli = alignables.begin();
-       iAli != alignables.end(); ++iAli) {
-
-    if (!this->layerDeselected(*iAli)             // check layers
-	&& !this->detUnitDeselected(*iAli)        // check detunit selection
-	&& !this->outsideGeometricalRanges(*iAli) // check geometrical ranges
-	&& !this->outsideDetIdRanges(*iAli)) {    // check DetId ranges
+  for (align::Alignables::const_iterator iAli = alignables.begin(); iAli != alignables.end(); ++iAli) {
+    if (!this->layerDeselected(*iAli)              // check layers
+        && !this->detUnitDeselected(*iAli)         // check detunit selection
+        && !this->outsideGeometricalRanges(*iAli)  // check geometrical ranges
+        && !this->outsideDetIdRanges(*iAli)) {     // check DetId ranges
       // all fine, so add to output arrays
       theSelectedAlignables.push_back(*iAli);
       theSelectedParameters.push_back(paramSel);
@@ -513,248 +539,260 @@ unsigned int AlignmentParameterSelector::add(const align::Alignables &alignables
 }
 
 //_________________________________________________________________________
-bool AlignmentParameterSelector::layerDeselected(const Alignable *ali) const
-{
+bool AlignmentParameterSelector::layerDeselected(const Alignable *ali) const {
   if (theOnlySS || theOnlyDS || theSelLayers) {
     TrackerAlignableId idProvider;
-    std::pair<int,int> typeLayer = idProvider.typeAndLayerFromDetId(ali->id(), alignableTracker()->trackerTopology());
-    int type  = typeLayer.first;
+    std::pair<int, int> typeLayer = idProvider.typeAndLayerFromDetId(ali->id(), alignableTracker()->trackerTopology());
+    int type = typeLayer.first;
     int layer = typeLayer.second;
-    
+
     // select on single/double sided barrel layers in TIB/TOB
-    if (theOnlySS // only single sided
-	&& (std::abs(type) == SiStripDetId::TIB || std::abs(type) == SiStripDetId::TOB)
-	&& layer <= 2) {
+    if (theOnlySS  // only single sided
+        && (std::abs(type) == SiStripDetId::TIB || std::abs(type) == SiStripDetId::TOB) && layer <= 2) {
       return true;
     }
-    if (theOnlyDS // only double sided
-	&& (std::abs(type) == SiStripDetId::TIB || std::abs(type) == SiStripDetId::TOB)
-	&& layer > 2) {
+    if (theOnlyDS  // only double sided
+        && (std::abs(type) == SiStripDetId::TIB || std::abs(type) == SiStripDetId::TOB) && layer > 2) {
       return true;
     }
-    
+
     // reject layers
     if (theSelLayers && (layer < theMinLayer || layer > theMaxLayer)) {
       return true;
     }
   }
-  
-  return false; // do not deselect...
+
+  return false;  // do not deselect...
 }
 
 //_________________________________________________________________________
-bool AlignmentParameterSelector::detUnitDeselected(const Alignable *ali) const
-{
-
+bool AlignmentParameterSelector::detUnitDeselected(const Alignable *ali) const {
   if (theRphiOrStereoDetUnit != Both && ali->alignableObjectId() == align::AlignableDetUnit) {
-    const SiStripDetId detId(ali->geomDetId()); // do not know yet whether right type...
-    if (detId.det() == DetId::Tracker 
-	&& (detId.subdetId() == SiStripDetId::TIB || detId.subdetId() == SiStripDetId::TID ||
-	    detId.subdetId() == SiStripDetId::TOB || detId.subdetId() == SiStripDetId::TEC)) {
+    const SiStripDetId detId(ali->geomDetId());  // do not know yet whether right type...
+    if (detId.det() == DetId::Tracker &&
+        (detId.subdetId() == SiStripDetId::TIB || detId.subdetId() == SiStripDetId::TID ||
+         detId.subdetId() == SiStripDetId::TOB || detId.subdetId() == SiStripDetId::TEC)) {
       // We have a DetUnit in strip, so check for a selection of stereo/rphi (DetUnits in 1D layers are rphi):
-      if ((theRphiOrStereoDetUnit == Stereo && !detId.stereo())
-	  || (theRphiOrStereoDetUnit == Rphi   &&  detId.stereo())) {
-	return true;
+      if ((theRphiOrStereoDetUnit == Stereo && !detId.stereo()) || (theRphiOrStereoDetUnit == Rphi && detId.stereo())) {
+        return true;
       }
     }
   }
 
-  return false; // do not deselect...
+  return false;  // do not deselect...
 }
 
 //_________________________________________________________________________
-bool AlignmentParameterSelector::outsideGeometricalRanges(const Alignable *alignable) const
-{
-  const align::PositionType& position(alignable->globalPosition());
-
-  if (!theRangesEta.empty() && !this->insideRanges<double>((position.eta()),  theRangesEta)) return true;
-  if (!theRangesPhi.empty() && !this->insideRanges<double>((position.phi()),  theRangesPhi, true))return true;
-  if (!theRangesR.empty()   && !this->insideRanges<double>((position.perp()), theRangesR)) return true;
-  if (!theRangesX.empty()   && !this->insideRanges<double>((position.x()),    theRangesX)) return true;
-  if (!theRangesY.empty()   && !this->insideRanges<double>((position.y()),    theRangesY)) return true;
-  if (!theRangesZ.empty()   && !this->insideRanges<double>((position.z()),    theRangesZ)) return true;
-  
+bool AlignmentParameterSelector::outsideGeometricalRanges(const Alignable *alignable) const {
+  const align::PositionType &position(alignable->globalPosition());
+
+  if (!theRangesEta.empty() && !this->insideRanges<double>((position.eta()), theRangesEta))
+    return true;
+  if (!theRangesPhi.empty() && !this->insideRanges<double>((position.phi()), theRangesPhi, true))
+    return true;
+  if (!theRangesR.empty() && !this->insideRanges<double>((position.perp()), theRangesR))
+    return true;
+  if (!theRangesX.empty() && !this->insideRanges<double>((position.x()), theRangesX))
+    return true;
+  if (!theRangesY.empty() && !this->insideRanges<double>((position.y()), theRangesY))
+    return true;
+  if (!theRangesZ.empty() && !this->insideRanges<double>((position.z()), theRangesZ))
+    return true;
+
   return false;
 }
 
 //_________________________________________________________________________
-bool AlignmentParameterSelector::outsideDetIdRanges(const Alignable *alignable) const
-{
+bool AlignmentParameterSelector::outsideDetIdRanges(const Alignable *alignable) const {
   //const DetId detId(alignable->geomDetId());
   const DetId detId(alignable->id());
   const int subdetId = detId.subdetId();
-  
+
   if (alignableTracker()) {
+    const TrackerTopology *tTopo = alignableTracker()->trackerTopology();
 
-  const TrackerTopology* tTopo = alignableTracker()->trackerTopology();
-
-  if (!theDetIds.empty() &&
-      !this->isMemberOfVector((detId.rawId()), theDetIds)) return true;
-  if (!theDetIdRanges.empty() &&
-      !this->insideRanges<int>((detId.rawId()), theDetIdRanges)) return true;
-  if (!theExcludedDetIds.empty() &&
-      this->isMemberOfVector((detId.rawId()), theExcludedDetIds)) return true;
-  if (!theExcludedDetIdRanges.empty() &&
-      this->insideRanges<int>((detId.rawId()), theExcludedDetIdRanges)) return true;
-
-  if (detId.det()==DetId::Tracker) {
-    
-    if (subdetId==static_cast<int>(PixelSubdetector::PixelBarrel)) {
-      if (!thePXBDetIdRanges.theLadderRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->pxbLadder(detId), thePXBDetIdRanges.theLadderRanges)) return true;
-      if (!thePXBDetIdRanges.theLayerRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->pxbLayer(detId), thePXBDetIdRanges.theLayerRanges)) return true;
-      if (!thePXBDetIdRanges.theModuleRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->pxbModule(detId), thePXBDetIdRanges.theModuleRanges)) return true;
-    }
-    
-    if (subdetId==static_cast<int>(PixelSubdetector::PixelEndcap)) {
-      if (!thePXFDetIdRanges.theBladeRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->pxfBlade(detId), thePXFDetIdRanges.theBladeRanges)) return true;
-      if (!thePXFDetIdRanges.theDiskRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->pxfDisk(detId), thePXFDetIdRanges.theDiskRanges)) return true;
-      if (!thePXFDetIdRanges.theModuleRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->pxfModule(detId), thePXFDetIdRanges.theModuleRanges)) return true;
-      if (!thePXFDetIdRanges.thePanelRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->pxfPanel(detId), thePXFDetIdRanges.thePanelRanges)) return true;
-      if (!thePXFDetIdRanges.theSideRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->pxfSide(detId), thePXFDetIdRanges.theSideRanges)) return true;
-    }
-    
-    if (subdetId==static_cast<int>(SiStripDetId::TIB)) {
-      if (!theTIBDetIdRanges.theLayerRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->tibLayer(detId), theTIBDetIdRanges.theLayerRanges)) return true;
-      if (!theTIBDetIdRanges.theModuleRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->tibModule(detId), theTIBDetIdRanges.theModuleRanges)) return true;
-      if (!theTIBDetIdRanges.theSideRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->tibSide(detId), theTIBDetIdRanges.theSideRanges)) return true;
-      if (!theTIBDetIdRanges.theStringRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->tibString(detId), theTIBDetIdRanges.theStringRanges)) return true;
-    }
-    
-    if (subdetId==static_cast<int>(SiStripDetId::TID)) {
-      if (!theTIDDetIdRanges.theDiskRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->tidWheel(detId), theTIDDetIdRanges.theDiskRanges)) return true;
-      if (!theTIDDetIdRanges.theModuleRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->tidModule(detId), theTIDDetIdRanges.theModuleRanges)) return true;
-      if (!theTIDDetIdRanges.theRingRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->tidRing(detId), theTIDDetIdRanges.theRingRanges)) return true;
-      if (!theTIDDetIdRanges.theSideRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->tidSide(detId), theTIDDetIdRanges.theSideRanges)) return true;
-    }
-    
-    if (subdetId==static_cast<int>(SiStripDetId::TOB)) {
-      if (!theTOBDetIdRanges.theLayerRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->tobLayer(detId), theTOBDetIdRanges.theLayerRanges)) return true;
-      if (!theTOBDetIdRanges.theModuleRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->tobModule(detId), theTOBDetIdRanges.theModuleRanges)) return true;
-      if (!theTOBDetIdRanges.theRodRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->tobRod(detId), theTOBDetIdRanges.theRodRanges)) return true;
-      if (!theTOBDetIdRanges.theSideRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->tobSide(detId), theTOBDetIdRanges.theSideRanges)) return true;
-    }
+    if (!theDetIds.empty() && !this->isMemberOfVector((detId.rawId()), theDetIds))
+      return true;
+    if (!theDetIdRanges.empty() && !this->insideRanges<int>((detId.rawId()), theDetIdRanges))
+      return true;
+    if (!theExcludedDetIds.empty() && this->isMemberOfVector((detId.rawId()), theExcludedDetIds))
+      return true;
+    if (!theExcludedDetIdRanges.empty() && this->insideRanges<int>((detId.rawId()), theExcludedDetIdRanges))
+      return true;
+
+    if (detId.det() == DetId::Tracker) {
+      if (subdetId == static_cast<int>(PixelSubdetector::PixelBarrel)) {
+        if (!thePXBDetIdRanges.theLadderRanges.empty() &&
+            !this->insideRanges<int>(tTopo->pxbLadder(detId), thePXBDetIdRanges.theLadderRanges))
+          return true;
+        if (!thePXBDetIdRanges.theLayerRanges.empty() &&
+            !this->insideRanges<int>(tTopo->pxbLayer(detId), thePXBDetIdRanges.theLayerRanges))
+          return true;
+        if (!thePXBDetIdRanges.theModuleRanges.empty() &&
+            !this->insideRanges<int>(tTopo->pxbModule(detId), thePXBDetIdRanges.theModuleRanges))
+          return true;
+      }
+
+      if (subdetId == static_cast<int>(PixelSubdetector::PixelEndcap)) {
+        if (!thePXFDetIdRanges.theBladeRanges.empty() &&
+            !this->insideRanges<int>(tTopo->pxfBlade(detId), thePXFDetIdRanges.theBladeRanges))
+          return true;
+        if (!thePXFDetIdRanges.theDiskRanges.empty() &&
+            !this->insideRanges<int>(tTopo->pxfDisk(detId), thePXFDetIdRanges.theDiskRanges))
+          return true;
+        if (!thePXFDetIdRanges.theModuleRanges.empty() &&
+            !this->insideRanges<int>(tTopo->pxfModule(detId), thePXFDetIdRanges.theModuleRanges))
+          return true;
+        if (!thePXFDetIdRanges.thePanelRanges.empty() &&
+            !this->insideRanges<int>(tTopo->pxfPanel(detId), thePXFDetIdRanges.thePanelRanges))
+          return true;
+        if (!thePXFDetIdRanges.theSideRanges.empty() &&
+            !this->insideRanges<int>(tTopo->pxfSide(detId), thePXFDetIdRanges.theSideRanges))
+          return true;
+      }
+
+      if (subdetId == static_cast<int>(SiStripDetId::TIB)) {
+        if (!theTIBDetIdRanges.theLayerRanges.empty() &&
+            !this->insideRanges<int>(tTopo->tibLayer(detId), theTIBDetIdRanges.theLayerRanges))
+          return true;
+        if (!theTIBDetIdRanges.theModuleRanges.empty() &&
+            !this->insideRanges<int>(tTopo->tibModule(detId), theTIBDetIdRanges.theModuleRanges))
+          return true;
+        if (!theTIBDetIdRanges.theSideRanges.empty() &&
+            !this->insideRanges<int>(tTopo->tibSide(detId), theTIBDetIdRanges.theSideRanges))
+          return true;
+        if (!theTIBDetIdRanges.theStringRanges.empty() &&
+            !this->insideRanges<int>(tTopo->tibString(detId), theTIBDetIdRanges.theStringRanges))
+          return true;
+      }
 
-    if (subdetId==static_cast<int>(SiStripDetId::TEC)) {
-      if (!theTECDetIdRanges.theWheelRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->tecWheel(detId), theTECDetIdRanges.theWheelRanges)) return true;
-      if (!theTECDetIdRanges.thePetalRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->tecPetalNumber(detId), theTECDetIdRanges.thePetalRanges)) return true;
-      if (!theTECDetIdRanges.theModuleRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->tecModule(detId), theTECDetIdRanges.theModuleRanges)) return true;
-      if (!theTECDetIdRanges.theRingRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->tecRing(detId), theTECDetIdRanges.theRingRanges)) return true;
-      if (!theTECDetIdRanges.theSideRanges.empty() && 
-	  !this->insideRanges<int>(tTopo->tecSide(detId), theTECDetIdRanges.theSideRanges)) return true;
+      if (subdetId == static_cast<int>(SiStripDetId::TID)) {
+        if (!theTIDDetIdRanges.theDiskRanges.empty() &&
+            !this->insideRanges<int>(tTopo->tidWheel(detId), theTIDDetIdRanges.theDiskRanges))
+          return true;
+        if (!theTIDDetIdRanges.theModuleRanges.empty() &&
+            !this->insideRanges<int>(tTopo->tidModule(detId), theTIDDetIdRanges.theModuleRanges))
+          return true;
+        if (!theTIDDetIdRanges.theRingRanges.empty() &&
+            !this->insideRanges<int>(tTopo->tidRing(detId), theTIDDetIdRanges.theRingRanges))
+          return true;
+        if (!theTIDDetIdRanges.theSideRanges.empty() &&
+            !this->insideRanges<int>(tTopo->tidSide(detId), theTIDDetIdRanges.theSideRanges))
+          return true;
+      }
+
+      if (subdetId == static_cast<int>(SiStripDetId::TOB)) {
+        if (!theTOBDetIdRanges.theLayerRanges.empty() &&
+            !this->insideRanges<int>(tTopo->tobLayer(detId), theTOBDetIdRanges.theLayerRanges))
+          return true;
+        if (!theTOBDetIdRanges.theModuleRanges.empty() &&
+            !this->insideRanges<int>(tTopo->tobModule(detId), theTOBDetIdRanges.theModuleRanges))
+          return true;
+        if (!theTOBDetIdRanges.theRodRanges.empty() &&
+            !this->insideRanges<int>(tTopo->tobRod(detId), theTOBDetIdRanges.theRodRanges))
+          return true;
+        if (!theTOBDetIdRanges.theSideRanges.empty() &&
+            !this->insideRanges<int>(tTopo->tobSide(detId), theTOBDetIdRanges.theSideRanges))
+          return true;
+      }
+
+      if (subdetId == static_cast<int>(SiStripDetId::TEC)) {
+        if (!theTECDetIdRanges.theWheelRanges.empty() &&
+            !this->insideRanges<int>(tTopo->tecWheel(detId), theTECDetIdRanges.theWheelRanges))
+          return true;
+        if (!theTECDetIdRanges.thePetalRanges.empty() &&
+            !this->insideRanges<int>(tTopo->tecPetalNumber(detId), theTECDetIdRanges.thePetalRanges))
+          return true;
+        if (!theTECDetIdRanges.theModuleRanges.empty() &&
+            !this->insideRanges<int>(tTopo->tecModule(detId), theTECDetIdRanges.theModuleRanges))
+          return true;
+        if (!theTECDetIdRanges.theRingRanges.empty() &&
+            !this->insideRanges<int>(tTopo->tecRing(detId), theTECDetIdRanges.theRingRanges))
+          return true;
+        if (!theTECDetIdRanges.theSideRanges.empty() &&
+            !this->insideRanges<int>(tTopo->tecSide(detId), theTECDetIdRanges.theSideRanges))
+          return true;
+      }
     }
   }
-  }
-  
+
   return false;
 }
 
 //_________________________________________________________________________
-template<typename T> bool AlignmentParameterSelector::insideRanges(T value,
-								   const std::vector<T> &ranges,
-								   bool isPhi) const
-{
+template <typename T>
+bool AlignmentParameterSelector::insideRanges(T value, const std::vector<T> &ranges, bool isPhi) const {
   // might become templated on <double> ?
 
-  if (ranges.size()%2 != 0) {
-    cms::Exception("BadConfig") << "@SUB=AlignmentParameterSelector::insideRanges" 
-                                << " need even number of entries in ranges instead of "
-                                << ranges.size();
+  if (ranges.size() % 2 != 0) {
+    cms::Exception("BadConfig") << "@SUB=AlignmentParameterSelector::insideRanges"
+                                << " need even number of entries in ranges instead of " << ranges.size();
     return false;
   }
 
   for (unsigned int i = 0; i < ranges.size(); i += 2) {
-    if (isPhi) { // mapping into (-pi,+pi] and checking for range including sign flip area
+    if (isPhi) {  // mapping into (-pi,+pi] and checking for range including sign flip area
       Geom::Phi<double> rangePhi1(ranges[i]);
-      Geom::Phi<double> rangePhi2(ranges[i+1]);
+      Geom::Phi<double> rangePhi2(ranges[i + 1]);
       Geom::Phi<double> valuePhi(value);
-      if (rangePhi1 <= valuePhi && valuePhi < rangePhi2) { // 'normal'
+      if (rangePhi1 <= valuePhi && valuePhi < rangePhi2) {  // 'normal'
         return true;
       }
-      if (rangePhi2  < rangePhi1 && (rangePhi1 <= valuePhi || valuePhi < rangePhi2)) {// 'sign flip'
+      if (rangePhi2 < rangePhi1 && (rangePhi1 <= valuePhi || valuePhi < rangePhi2)) {  // 'sign flip'
         return true;
       }
-    } else if (ranges[i] <= value && value < ranges[i+1]) {
+    } else if (ranges[i] <= value && value < ranges[i + 1]) {
       return true;
     }
   }
-  
+
   return false;
 }
 
 //_________________________________________________________________________
-template<> bool AlignmentParameterSelector::insideRanges<int>(int value,
-							      const std::vector<int> &ranges,
-							      bool /*isPhi*/) const
-{
-  if (ranges.size()%2 != 0) {
-    cms::Exception("BadConfig") << "@SUB=AlignmentParameterSelector::insideRanges" 
-                                << " need even number of entries in ranges instead of "
-                                << ranges.size();
+template <>
+bool AlignmentParameterSelector::insideRanges<int>(int value, const std::vector<int> &ranges, bool /*isPhi*/) const {
+  if (ranges.size() % 2 != 0) {
+    cms::Exception("BadConfig") << "@SUB=AlignmentParameterSelector::insideRanges"
+                                << " need even number of entries in ranges instead of " << ranges.size();
     return false;
   }
 
   for (unsigned int i = 0; i < ranges.size(); i += 2) {
-    if (ranges[i] <= value && value <= ranges[i+1]) return true;
+    if (ranges[i] <= value && value <= ranges[i + 1])
+      return true;
   }
-  
+
   return false;
 }
 
-bool AlignmentParameterSelector::isMemberOfVector(int value, const std::vector<int> &values) const
-{
-  if (std::find(values.begin(), values.end(), value)!=values.end()) return true;
+bool AlignmentParameterSelector::isMemberOfVector(int value, const std::vector<int> &values) const {
+  if (std::find(values.begin(), values.end(), value) != values.end())
+    return true;
   return false;
 }
 
 //__________________________________________________________________________________________________
-std::vector<std::string> 
-AlignmentParameterSelector::decompose(const std::string &s, std::string::value_type delimiter) const
-{
-
+std::vector<std::string> AlignmentParameterSelector::decompose(const std::string &s,
+                                                               std::string::value_type delimiter) const {
   std::vector<std::string> result;
 
   std::string::size_type previousPos = 0;
   while (true) {
     const std::string::size_type delimiterPos = s.find(delimiter, previousPos);
     if (delimiterPos == std::string::npos) {
-      result.push_back(s.substr(previousPos)); // until end
+      result.push_back(s.substr(previousPos));  // until end
       break;
     }
     result.push_back(s.substr(previousPos, delimiterPos - previousPos));
-    previousPos = delimiterPos + 1; // +1: skip delimiter
+    previousPos = delimiterPos + 1;  // +1: skip delimiter
   }
 
   return result;
 }
 
 //__________________________________________________________________________________________________
-std::vector<char> AlignmentParameterSelector::convertParamSel(const std::string &selString) const
-{
-
+std::vector<char> AlignmentParameterSelector::convertParamSel(const std::string &selString) const {
   // Convert selString into vector<char> of same length.
   // Note: Old implementation in AlignmentParameterBuilder was rigid in length,
   // expecting RigidBodyAlignmentParameters::N_PARAM.
@@ -769,17 +807,15 @@ std::vector<char> AlignmentParameterSelector::convertParamSel(const std::string
   return result;
 }
 
-
 //________________________________________________________________________________
-std::string AlignmentParameterSelector::setSpecials(const std::string &name)
-{
+std::string AlignmentParameterSelector::setSpecials(const std::string &name) {
   // Use new string only, although direct erasing of found indicator causes problems for 'DSS',
   // but 'DSS' makes absolutely no sense!
-  std::string newName(name); 
+  std::string newName(name);
 
   const std::string::size_type ss = newName.rfind("SS");
   if (ss != std::string::npos) {
-    newName.erase(ss, 2); // 2: length of 'SS'
+    newName.erase(ss, 2);  // 2: length of 'SS'
     theOnlySS = true;
   } else {
     theOnlySS = false;
@@ -787,19 +823,19 @@ std::string AlignmentParameterSelector::setSpecials(const std::string &name)
 
   const std::string::size_type ds = newName.rfind("DS");
   if (ds != std::string::npos) {
-    newName.erase(ds, 2); // 2: length of 'DS'
+    newName.erase(ds, 2);  // 2: length of 'DS'
     theOnlyDS = true;
   } else {
     theOnlyDS = false;
   }
-  
+
   const std::string::size_type size = newName.size();
   const std::string::size_type layers = newName.rfind("Layers");
-  if (layers != std::string::npos && size - layers - 2 == 6 // 2 digits, 6: length of 'Layers'
-      && isdigit(newName[size-1]) && isdigit(newName[size-2])) {
+  if (layers != std::string::npos && size - layers - 2 == 6  // 2 digits, 6: length of 'Layers'
+      && isdigit(newName[size - 1]) && isdigit(newName[size - 2])) {
     theSelLayers = true;
-    theMinLayer = newName[size-2] - '0';
-    theMaxLayer = newName[size-1] - '0';
+    theMinLayer = newName[size - 2] - '0';
+    theMaxLayer = newName[size - 1] - '0';
     newName.erase(layers);
   } else {
     theSelLayers = false;
@@ -811,72 +847,67 @@ std::string AlignmentParameterSelector::setSpecials(const std::string &name)
   if (newName.rfind("Unit") != std::string::npos) {
     const std::string::size_type uRph = newName.rfind("UnitRphi");
     if (uRph != std::string::npos) {
-      newName.erase(uRph + 4, 4); // keep 'Unit' (4) and erase 'Rphi' (4)
+      newName.erase(uRph + 4, 4);  // keep 'Unit' (4) and erase 'Rphi' (4)
       theRphiOrStereoDetUnit = Rphi;
     }
     const std::string::size_type uSte = newName.rfind("UnitStereo");
     if (uSte != std::string::npos) {
-      newName.erase(uSte + 4, 6); // keep 'Unit' (4) and erase 'Stereo' (6)
+      newName.erase(uSte + 4, 6);  // keep 'Unit' (4) and erase 'Stereo' (6)
       theRphiOrStereoDetUnit = Stereo;
     }
   }
 
   if (newName != name) {
-    LogDebug("Alignment") << "@SUB=AlignmentParameterSelector::setSpecials"
-                          << name << " becomes " << newName << ", makes theOnlySS " << theOnlySS
-                          << ", theOnlyDS " << theOnlyDS << ", theSelLayers " << theSelLayers
-                          << ", theMinLayer " << theMinLayer << ", theMaxLayer " << theMaxLayer
-			  << ", theRphiOrStereoDetUnit " << theRphiOrStereoDetUnit;
+    LogDebug("Alignment") << "@SUB=AlignmentParameterSelector::setSpecials" << name << " becomes " << newName
+                          << ", makes theOnlySS " << theOnlySS << ", theOnlyDS " << theOnlyDS << ", theSelLayers "
+                          << theSelLayers << ", theMinLayer " << theMinLayer << ", theMaxLayer " << theMaxLayer
+                          << ", theRphiOrStereoDetUnit " << theRphiOrStereoDetUnit;
   }
 
   return newName;
 }
 
 //________________________________________________________________________________
-unsigned int AlignmentParameterSelector::addAllDets(const std::vector<char> &paramSel)
-{
+unsigned int AlignmentParameterSelector::addAllDets(const std::vector<char> &paramSel) {
   unsigned int numAli = 0;
 
-  numAli += this->add(theTracker->barrelGeomDets(), paramSel);          // TIB+TOB
-  numAli += this->add(theTracker->endcapGeomDets(), paramSel);          // TEC
-  numAli += this->add(theTracker->TIDGeomDets(), paramSel);             // TID
-  numAli += this->add(theTracker->pixelHalfBarrelGeomDets(), paramSel); // PixelBarrel
-  numAli += this->add(theTracker->pixelEndcapGeomDets(), paramSel);     // PixelEndcap
+  numAli += this->add(theTracker->barrelGeomDets(), paramSel);           // TIB+TOB
+  numAli += this->add(theTracker->endcapGeomDets(), paramSel);           // TEC
+  numAli += this->add(theTracker->TIDGeomDets(), paramSel);              // TID
+  numAli += this->add(theTracker->pixelHalfBarrelGeomDets(), paramSel);  // PixelBarrel
+  numAli += this->add(theTracker->pixelEndcapGeomDets(), paramSel);      // PixelEndcap
 
   return numAli;
 }
 
 //________________________________________________________________________________
-unsigned int AlignmentParameterSelector::addAllRods(const std::vector<char> &paramSel)
-{
+unsigned int AlignmentParameterSelector::addAllRods(const std::vector<char> &paramSel) {
   unsigned int numAli = 0;
 
-  numAli += this->add(theTracker->barrelRods(), paramSel);             // TIB+TOB    
-  numAli += this->add(theTracker->pixelHalfBarrelLadders(), paramSel); // PixelBarrel
-  numAli += this->add(theTracker->endcapPetals(), paramSel);           // TEC        
-  numAli += this->add(theTracker->TIDRings(), paramSel);               // TID        
-  numAli += this->add(theTracker->pixelEndcapPetals(), paramSel);      // PixelEndcap
+  numAli += this->add(theTracker->barrelRods(), paramSel);              // TIB+TOB
+  numAli += this->add(theTracker->pixelHalfBarrelLadders(), paramSel);  // PixelBarrel
+  numAli += this->add(theTracker->endcapPetals(), paramSel);            // TEC
+  numAli += this->add(theTracker->TIDRings(), paramSel);                // TID
+  numAli += this->add(theTracker->pixelEndcapPetals(), paramSel);       // PixelEndcap
 
   return numAli;
 }
 
 //________________________________________________________________________________
-unsigned int AlignmentParameterSelector::addAllLayers(const std::vector<char> &paramSel)
-{
+unsigned int AlignmentParameterSelector::addAllLayers(const std::vector<char> &paramSel) {
   unsigned int numAli = 0;
 
-  numAli += this->add(theTracker->barrelLayers(), paramSel);          // TIB+TOB    
-  numAli += this->add(theTracker->pixelHalfBarrelLayers(), paramSel); // PixelBarrel
-  numAli += this->add(theTracker->endcapLayers(), paramSel);          // TEC
-  numAli += this->add(theTracker->TIDLayers(), paramSel);             // TID
-  numAli += this->add(theTracker->pixelEndcapLayers(), paramSel);     // PixelEndcap
+  numAli += this->add(theTracker->barrelLayers(), paramSel);           // TIB+TOB
+  numAli += this->add(theTracker->pixelHalfBarrelLayers(), paramSel);  // PixelBarrel
+  numAli += this->add(theTracker->endcapLayers(), paramSel);           // TEC
+  numAli += this->add(theTracker->TIDLayers(), paramSel);              // TID
+  numAli += this->add(theTracker->pixelEndcapLayers(), paramSel);      // PixelEndcap
 
   return numAli;
 }
 
 //________________________________________________________________________________
-unsigned int AlignmentParameterSelector::addAllAlignables(const std::vector<char> &paramSel)
-{
+unsigned int AlignmentParameterSelector::addAllAlignables(const std::vector<char> &paramSel) {
   unsigned int numAli = 0;
 
   numAli += this->addAllDets(paramSel);
diff --git a/Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterStore.cc b/Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterStore.cc
index 1204248e9089a..fb6c77d4b94f9 100644
--- a/Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterStore.cc
+++ b/Alignment/CommonAlignmentAlgorithm/src/AlignmentParameterStore.cc
@@ -26,13 +26,11 @@
 #include "Geometry/CommonTopologies/interface/SurfaceDeformationFactory.h"
 
 //__________________________________________________________________________________________________
-AlignmentParameterStore::AlignmentParameterStore( const align::Alignables &alis,
-						  const edm::ParameterSet& config ) :
-  theAlignables(alis)
-{
+AlignmentParameterStore::AlignmentParameterStore(const align::Alignables& alis, const edm::ParameterSet& config)
+    : theAlignables(alis) {
   if (config.getUntrackedParameter<bool>("UseExtendedCorrelations")) {
-    theCorrelationsStore = new AlignmentExtendedCorrelationsStore
-      (config.getParameter<edm::ParameterSet>("ExtendedCorrelationsConfig"));
+    theCorrelationsStore =
+        new AlignmentExtendedCorrelationsStore(config.getParameter<edm::ParameterSet>("ExtendedCorrelationsConfig"));
   } else {
     theCorrelationsStore = new AlignmentCorrelationsStore();
   }
@@ -43,240 +41,210 @@ AlignmentParameterStore::AlignmentParameterStore( const align::Alignables &alis,
   // set hierarchy vs averaging constraints
   theTypeOfConstraints = NONE;
   const std::string cfgStrTypeOfConstraints(config.getParameter<std::string>("TypeOfConstraints"));
-  if( cfgStrTypeOfConstraints == "hierarchy" ) {
+  if (cfgStrTypeOfConstraints == "hierarchy") {
     theTypeOfConstraints = HIERARCHY_CONSTRAINTS;
-  } else if( cfgStrTypeOfConstraints == "approximate_averaging" ) {
+  } else if (cfgStrTypeOfConstraints == "approximate_averaging") {
     theTypeOfConstraints = APPROX_AVERAGING_CONSTRAINTS;
-    edm::LogWarning("Alignment") << "@SUB=AlignmentParameterStore"
-				 << "\n\n\n******* WARNING ******************************************\n"
-				 << "Using approximate implementation of averaging constraints."
-				 << "This is not recommended."
-				 << "Consider to use 'hierarchy' constraints:"
-				 << "  AlignmentProducer.ParameterStore.TypeOfConstraints = cms.string('hierarchy')\n\n\n";
+    edm::LogWarning("Alignment")
+        << "@SUB=AlignmentParameterStore"
+        << "\n\n\n******* WARNING ******************************************\n"
+        << "Using approximate implementation of averaging constraints."
+        << "This is not recommended."
+        << "Consider to use 'hierarchy' constraints:"
+        << "  AlignmentProducer.ParameterStore.TypeOfConstraints = cms.string('hierarchy')\n\n\n";
   } else {
     edm::LogError("BadArgument") << "@SUB=AlignmentParameterStore"
-				 << "Unknown type of hierarchy constraints '" << cfgStrTypeOfConstraints << "'"; 
+                                 << "Unknown type of hierarchy constraints '" << cfgStrTypeOfConstraints << "'";
   }
 }
 
 //__________________________________________________________________________________________________
-AlignmentParameterStore::~AlignmentParameterStore()
-{
-  delete theCorrelationsStore;
-}
+AlignmentParameterStore::~AlignmentParameterStore() { delete theCorrelationsStore; }
 
 //__________________________________________________________________________________________________
-CompositeAlignmentParameters
-AlignmentParameterStore::selectParameters( const std::vector<AlignableDet*>& alignabledets ) const
-{
+CompositeAlignmentParameters AlignmentParameterStore::selectParameters(
+    const std::vector<AlignableDet*>& alignabledets) const {
   std::vector<AlignableDetOrUnitPtr> detOrUnits;
   detOrUnits.reserve(alignabledets.size());
 
   std::vector<AlignableDet*>::const_iterator it, iEnd;
-  for ( it = alignabledets.begin(), iEnd = alignabledets.end(); it != iEnd; ++it)
+  for (it = alignabledets.begin(), iEnd = alignabledets.end(); it != iEnd; ++it)
     detOrUnits.push_back(AlignableDetOrUnitPtr(*it));
 
   return this->selectParameters(detOrUnits);
 }
 
 //__________________________________________________________________________________________________
-CompositeAlignmentParameters
-AlignmentParameterStore::selectParameters( const std::vector<AlignableDetOrUnitPtr>& alignabledets ) const
-{
-
+CompositeAlignmentParameters AlignmentParameterStore::selectParameters(
+    const std::vector<AlignableDetOrUnitPtr>& alignabledets) const {
   align::Alignables alignables;
-  std::map <AlignableDetOrUnitPtr,Alignable*> alidettoalimap;
-  std::map <Alignable*,int> aliposmap;
-  std::map <Alignable*,int> alilenmap;
-  int nparam=0;
+  std::map<AlignableDetOrUnitPtr, Alignable*> alidettoalimap;
+  std::map<Alignable*, int> aliposmap;
+  std::map<Alignable*, int> alilenmap;
+  int nparam = 0;
 
   // iterate over AlignableDet's
-  for( std::vector<AlignableDetOrUnitPtr>::const_iterator iad = alignabledets.begin();
-       iad != alignabledets.end(); ++iad ) 
-  {
-    Alignable* ali = alignableFromAlignableDet( *iad );
-    if ( ali ) 
-    {
-      alidettoalimap[ *iad ] = ali; // Add to map
+  for (std::vector<AlignableDetOrUnitPtr>::const_iterator iad = alignabledets.begin(); iad != alignabledets.end();
+       ++iad) {
+    Alignable* ali = alignableFromAlignableDet(*iad);
+    if (ali) {
+      alidettoalimap[*iad] = ali;  // Add to map
       // Check if Alignable already there, insert into vector if not
-      if ( find(alignables.begin(),alignables.end(),ali) == alignables.end() ) 
-      {
-	alignables.push_back(ali);
-	AlignmentParameters* ap = ali->alignmentParameters();
-	nparam += ap->numSelected();
+      if (find(alignables.begin(), alignables.end(), ali) == alignables.end()) {
+        alignables.push_back(ali);
+        AlignmentParameters* ap = ali->alignmentParameters();
+        nparam += ap->numSelected();
       }
     }
   }
 
-  AlgebraicVector* selpar = new AlgebraicVector( nparam, 0 );
-  AlgebraicSymMatrix* selcov = new AlgebraicSymMatrix( nparam, 0 );
+  AlgebraicVector* selpar = new AlgebraicVector(nparam, 0);
+  AlgebraicSymMatrix* selcov = new AlgebraicSymMatrix(nparam, 0);
 
   // Fill in parameters and corresponding covariance matricess
-  int ipos = 1; // NOTE: .sub indices start from 1
+  int ipos = 1;  // NOTE: .sub indices start from 1
   align::Alignables::const_iterator it1;
-  for( it1 = alignables.begin(); it1 != alignables.end(); ++it1 ) 
-  {
+  for (it1 = alignables.begin(); it1 != alignables.end(); ++it1) {
     AlignmentParameters* ap = (*it1)->alignmentParameters();
-    selpar->sub( ipos, ap->selectedParameters() );
-    selcov->sub( ipos, ap->selectedCovariance() );
+    selpar->sub(ipos, ap->selectedParameters());
+    selcov->sub(ipos, ap->selectedCovariance());
     int npar = ap->numSelected();
-    aliposmap[*it1]=ipos;
-    alilenmap[*it1]=npar;
-    ipos +=npar;
+    aliposmap[*it1] = ipos;
+    alilenmap[*it1] = npar;
+    ipos += npar;
   }
 
   // Fill in the correlations. Has to be an extra loop, because the
   // AlignmentExtendedCorrelationsStore (if used) needs the
   // alignables' covariance matrices already present.
   ipos = 1;
-  for( it1 = alignables.begin(); it1 != alignables.end(); ++it1 ) 
-  {
-    int jpos=1;
+  for (it1 = alignables.begin(); it1 != alignables.end(); ++it1) {
+    int jpos = 1;
 
     // Look for correlations between alignables
     align::Alignables::const_iterator it2;
-    for( it2 = alignables.begin(); it2 != it1; ++it2 ) 
-    {
-      theCorrelationsStore->correlations( *it1, *it2, *selcov, ipos-1, jpos-1 );
+    for (it2 = alignables.begin(); it2 != it1; ++it2) {
+      theCorrelationsStore->correlations(*it1, *it2, *selcov, ipos - 1, jpos - 1);
       jpos += (*it2)->alignmentParameters()->numSelected();
     }
 
     ipos += (*it1)->alignmentParameters()->numSelected();
   }
 
-  AlignmentParametersData::DataContainer data( new AlignmentParametersData( selpar, selcov ) );
-  CompositeAlignmentParameters aap( data, alignables, alidettoalimap, aliposmap, alilenmap );
+  AlignmentParametersData::DataContainer data(new AlignmentParametersData(selpar, selcov));
+  CompositeAlignmentParameters aap(data, alignables, alidettoalimap, aliposmap, alilenmap);
 
   return aap;
 }
 
-
 //__________________________________________________________________________________________________
-CompositeAlignmentParameters
-AlignmentParameterStore::selectParameters( const align::Alignables& alignables ) const
-{
-
+CompositeAlignmentParameters AlignmentParameterStore::selectParameters(const align::Alignables& alignables) const {
   align::Alignables selectedAlignables;
-  std::map <AlignableDetOrUnitPtr,Alignable*> alidettoalimap; // This map won't be filled!!!
-  std::map <Alignable*,int> aliposmap;
-  std::map <Alignable*,int> alilenmap;
-  int nparam=0;
+  std::map<AlignableDetOrUnitPtr, Alignable*> alidettoalimap;  // This map won't be filled!!!
+  std::map<Alignable*, int> aliposmap;
+  std::map<Alignable*, int> alilenmap;
+  int nparam = 0;
 
   // iterate over Alignable's
   align::Alignables::const_iterator ita;
-  for ( ita = alignables.begin(); ita != alignables.end(); ++ita ) 
-  {
+  for (ita = alignables.begin(); ita != alignables.end(); ++ita) {
     // Check if Alignable already there, insert into vector if not
-    if ( find(selectedAlignables.begin(), selectedAlignables.end(), *ita) == selectedAlignables.end() ) 
-    {
-      selectedAlignables.push_back( *ita );
+    if (find(selectedAlignables.begin(), selectedAlignables.end(), *ita) == selectedAlignables.end()) {
+      selectedAlignables.push_back(*ita);
       AlignmentParameters* ap = (*ita)->alignmentParameters();
       nparam += ap->numSelected();
     }
   }
 
-  AlgebraicVector* selpar = new AlgebraicVector( nparam, 0 );
-  AlgebraicSymMatrix* selcov = new AlgebraicSymMatrix( nparam, 0 );
+  AlgebraicVector* selpar = new AlgebraicVector(nparam, 0);
+  AlgebraicSymMatrix* selcov = new AlgebraicSymMatrix(nparam, 0);
 
   // Fill in parameters and corresponding covariance matrices
-  int ipos = 1; // NOTE: .sub indices start from 1
+  int ipos = 1;  // NOTE: .sub indices start from 1
   align::Alignables::const_iterator it1;
-  for( it1 = selectedAlignables.begin(); it1 != selectedAlignables.end(); ++it1 ) 
-  {
+  for (it1 = selectedAlignables.begin(); it1 != selectedAlignables.end(); ++it1) {
     AlignmentParameters* ap = (*it1)->alignmentParameters();
-    selpar->sub( ipos, ap->selectedParameters() );
-    selcov->sub( ipos, ap->selectedCovariance() );
+    selpar->sub(ipos, ap->selectedParameters());
+    selcov->sub(ipos, ap->selectedCovariance());
     int npar = ap->numSelected();
-    aliposmap[*it1]=ipos;
-    alilenmap[*it1]=npar;
-    ipos +=npar;
+    aliposmap[*it1] = ipos;
+    alilenmap[*it1] = npar;
+    ipos += npar;
   }
 
   // Fill in the correlations. Has to be an extra loop, because the
   // AlignmentExtendedCorrelationsStore (if used) needs the
   // alignables' covariance matrices already present.
   ipos = 1;
-  for( it1 = selectedAlignables.begin(); it1 != selectedAlignables.end(); ++it1 ) 
-  {
-    int jpos=1;
+  for (it1 = selectedAlignables.begin(); it1 != selectedAlignables.end(); ++it1) {
+    int jpos = 1;
 
     // Look for correlations between alignables
     align::Alignables::const_iterator it2;
-    for( it2 = selectedAlignables.begin(); it2 != it1; ++it2 ) 
-    {
-      theCorrelationsStore->correlations( *it1, *it2, *selcov, ipos-1, jpos-1 );
+    for (it2 = selectedAlignables.begin(); it2 != it1; ++it2) {
+      theCorrelationsStore->correlations(*it1, *it2, *selcov, ipos - 1, jpos - 1);
       jpos += (*it2)->alignmentParameters()->numSelected();
     }
 
     ipos += (*it1)->alignmentParameters()->numSelected();
   }
 
-  AlignmentParametersData::DataContainer data( new AlignmentParametersData( selpar, selcov ) );
-  CompositeAlignmentParameters aap( data, selectedAlignables, alidettoalimap, aliposmap, alilenmap );
+  AlignmentParametersData::DataContainer data(new AlignmentParametersData(selpar, selcov));
+  CompositeAlignmentParameters aap(data, selectedAlignables, alidettoalimap, aliposmap, alilenmap);
 
   return aap;
 }
 
-
 //__________________________________________________________________________________________________
-void AlignmentParameterStore::updateParameters( const CompositeAlignmentParameters& aap, bool updateCorrelations )
-{
-
+void AlignmentParameterStore::updateParameters(const CompositeAlignmentParameters& aap, bool updateCorrelations) {
   align::Alignables alignables = aap.components();
   const AlgebraicVector& parameters = aap.parameters();
   const AlgebraicSymMatrix& covariance = aap.covariance();
 
-  int ipos = 1; // NOTE: .sub indices start from 1
+  int ipos = 1;  // NOTE: .sub indices start from 1
 
   // Loop over alignables
-  for( align::Alignables::const_iterator it=alignables.begin(); it != alignables.end(); ++it ) 
-  {
-    // Update parameters and local covariance   
+  for (align::Alignables::const_iterator it = alignables.begin(); it != alignables.end(); ++it) {
+    // Update parameters and local covariance
     AlignmentParameters* ap = (*it)->alignmentParameters();
     int nsel = ap->numSelected();
-    AlgebraicVector subvec = parameters.sub( ipos, ipos+nsel-1 );
-    AlgebraicSymMatrix subcov = covariance.sub( ipos, ipos+nsel-1 );
-    AlignmentParameters* apnew = ap->cloneFromSelected( subvec, subcov );
-    (*it)->setAlignmentParameters( apnew );
-	  
+    AlgebraicVector subvec = parameters.sub(ipos, ipos + nsel - 1);
+    AlgebraicSymMatrix subcov = covariance.sub(ipos, ipos + nsel - 1);
+    AlignmentParameters* apnew = ap->cloneFromSelected(subvec, subcov);
+    (*it)->setAlignmentParameters(apnew);
+
     // Now update correlations between detectors
-    if ( updateCorrelations )
-    {
+    if (updateCorrelations) {
       int jpos = 1;
-      for( align::Alignables::const_iterator it2 = alignables.begin(); it2 != it; ++it2 ) 
-      {
-	theCorrelationsStore->setCorrelations( *it, *it2, covariance, ipos-1, jpos-1 );
-	jpos += (*it2)->alignmentParameters()->numSelected();
+      for (align::Alignables::const_iterator it2 = alignables.begin(); it2 != it; ++it2) {
+        theCorrelationsStore->setCorrelations(*it, *it2, covariance, ipos - 1, jpos - 1);
+        jpos += (*it2)->alignmentParameters()->numSelected();
       }
     }
 
-    ipos+=nsel;
+    ipos += nsel;
   }
-
 }
 
-
 //__________________________________________________________________________________________________
-align::Alignables AlignmentParameterStore::validAlignables(void) const
-{ 
+align::Alignables AlignmentParameterStore::validAlignables(void) const {
   align::Alignables result;
-  for (align::Alignables::const_iterator iali = theAlignables.begin();
-       iali != theAlignables.end(); ++iali)
-    if ( (*iali)->alignmentParameters()->isValid() ) result.push_back(*iali);
+  for (align::Alignables::const_iterator iali = theAlignables.begin(); iali != theAlignables.end(); ++iali)
+    if ((*iali)->alignmentParameters()->isValid())
+      result.push_back(*iali);
 
   LogDebug("Alignment") << "@SUB=AlignmentParameterStore::validAlignables"
-                        << "Valid alignables: " << result.size()
-                        << "out of " << theAlignables.size();
+                        << "Valid alignables: " << result.size() << "out of " << theAlignables.size();
   return result;
 }
 
 //__________________________________________________________________________________________________
-Alignable* AlignmentParameterStore::alignableFromAlignableDet( const AlignableDetOrUnitPtr& _alignableDet ) const
-{
+Alignable* AlignmentParameterStore::alignableFromAlignableDet(const AlignableDetOrUnitPtr& _alignableDet) const {
   AlignableDetOrUnitPtr alignableDet = _alignableDet;
-  Alignable *mother = alignableDet;
+  Alignable* mother = alignableDet;
   while (mother) {
-    if (mother->alignmentParameters()) return mother;
+    if (mother->alignmentParameters())
+      return mother;
     mother = mother->mother();
   }
 
@@ -284,157 +252,129 @@ Alignable* AlignmentParameterStore::alignableFromAlignableDet( const AlignableDe
 }
 
 //__________________________________________________________________________________________________
-void AlignmentParameterStore::applyParameters(void)
-{
+void AlignmentParameterStore::applyParameters(void) {
   align::Alignables::const_iterator iali;
-  for ( iali = theAlignables.begin(); iali != theAlignables.end(); ++iali) 
-    applyParameters( *iali );
+  for (iali = theAlignables.begin(); iali != theAlignables.end(); ++iali)
+    applyParameters(*iali);
 }
 
-
 //__________________________________________________________________________________________________
-void AlignmentParameterStore::applyParameters(Alignable* alignable)
-{
-
-  AlignmentParameters *pars = (alignable ? alignable->alignmentParameters() : nullptr);
+void AlignmentParameterStore::applyParameters(Alignable* alignable) {
+  AlignmentParameters* pars = (alignable ? alignable->alignmentParameters() : nullptr);
   if (!pars) {
-    throw cms::Exception("BadAlignable") 
-      << "applyParameters: provided alignable does not have alignment parameters";
+    throw cms::Exception("BadAlignable") << "applyParameters: provided alignable does not have alignment parameters";
   }
   pars->apply();
 }
 
-
 //__________________________________________________________________________________________________
-void AlignmentParameterStore::resetParameters(void)
-{
+void AlignmentParameterStore::resetParameters(void) {
   // Erase contents of correlation map
   theCorrelationsStore->resetCorrelations();
 
   // Iterate over alignables in the store and reset parameters
   align::Alignables::const_iterator iali;
-  for ( iali = theAlignables.begin(); iali != theAlignables.end(); ++iali )
-    resetParameters( *iali );
+  for (iali = theAlignables.begin(); iali != theAlignables.end(); ++iali)
+    resetParameters(*iali);
 }
 
-
 //__________________________________________________________________________________________________
-void AlignmentParameterStore::resetParameters( Alignable* ali )
-{
-  if ( ali ) 
-  {
+void AlignmentParameterStore::resetParameters(Alignable* ali) {
+  if (ali) {
     // Get alignment parameters for this alignable
     AlignmentParameters* ap = ali->alignmentParameters();
-    if ( ap ) 
-    {
-      int npar=ap->numSelected();
-          
-      AlgebraicVector par(npar,0);
-      AlgebraicSymMatrix cov(npar,0);
-      AlignmentParameters* apnew = ap->cloneFromSelected(par,cov);
+    if (ap) {
+      int npar = ap->numSelected();
+
+      AlgebraicVector par(npar, 0);
+      AlgebraicSymMatrix cov(npar, 0);
+      AlignmentParameters* apnew = ap->cloneFromSelected(par, cov);
       ali->setAlignmentParameters(apnew);
       apnew->setValid(false);
-    }
-    else 
+    } else
       edm::LogError("BadArgument") << "@SUB=AlignmentParameterStore::resetParameters"
-				   << "alignable has no alignment parameter";
-  }
-  else
+                                   << "alignable has no alignment parameter";
+  } else
     edm::LogError("BadArgument") << "@SUB=AlignmentParameterStore::resetParameters"
                                  << "argument is NULL";
 }
 
-
 //__________________________________________________________________________________________________
-void AlignmentParameterStore::cacheTransformations(void)
-{
+void AlignmentParameterStore::cacheTransformations(void) {
   align::Alignables::const_iterator iali;
-  for ( iali = theAlignables.begin(); iali != theAlignables.end(); ++iali) 
+  for (iali = theAlignables.begin(); iali != theAlignables.end(); ++iali)
     (*iali)->cacheTransformation();
 }
 
-
 //__________________________________________________________________________________________________
-void AlignmentParameterStore::cacheTransformations(const align::RunNumber& run)
-{
-  for (const auto& iali: theAlignables) iali->cacheTransformation(run);
+void AlignmentParameterStore::cacheTransformations(const align::RunNumber& run) {
+  for (const auto& iali : theAlignables)
+    iali->cacheTransformation(run);
 }
 
-
 //__________________________________________________________________________________________________
-void AlignmentParameterStore::restoreCachedTransformations(void)
-{
+void AlignmentParameterStore::restoreCachedTransformations(void) {
   align::Alignables::const_iterator iali;
-  for ( iali = theAlignables.begin(); iali != theAlignables.end(); ++iali) 
+  for (iali = theAlignables.begin(); iali != theAlignables.end(); ++iali)
     (*iali)->restoreCachedTransformation();
 }
 
-
 //__________________________________________________________________________________________________
-void AlignmentParameterStore::restoreCachedTransformations(const align::RunNumber& run)
-{
-  for (const auto& iali: theAlignables) iali->restoreCachedTransformation(run);
+void AlignmentParameterStore::restoreCachedTransformations(const align::RunNumber& run) {
+  for (const auto& iali : theAlignables)
+    iali->restoreCachedTransformation(run);
 }
 
-
 //__________________________________________________________________________________________________
-void AlignmentParameterStore::acquireRelativeParameters(void)
-{
-
+void AlignmentParameterStore::acquireRelativeParameters(void) {
   unsigned int nAlignables = theAlignables.size();
 
-  for (unsigned int i = 0; i < nAlignables; ++i)
-  {
+  for (unsigned int i = 0; i < nAlignables; ++i) {
     Alignable* ali = theAlignables[i];
 
-    RigidBodyAlignmentParameters* ap = 
-      dynamic_cast<RigidBodyAlignmentParameters*>( ali->alignmentParameters() );
+    RigidBodyAlignmentParameters* ap = dynamic_cast<RigidBodyAlignmentParameters*>(ali->alignmentParameters());
 
-    if ( !ap )
-      throw cms::Exception("BadAlignable") 
-	<< "acquireRelativeParameters: "
-	<< "provided alignable does not have rigid body alignment parameters";
+    if (!ap)
+      throw cms::Exception("BadAlignable") << "acquireRelativeParameters: "
+                                           << "provided alignable does not have rigid body alignment parameters";
+
+    AlgebraicVector par(ap->size(), 0);
+    AlgebraicSymMatrix cov(ap->size(), 0);
 
-    AlgebraicVector par( ap->size(),0 );
-    AlgebraicSymMatrix cov( ap->size(), 0 );
-	  
     // Get displacement and transform global->local
-    align::LocalVector dloc = ali->surface().toLocal( ali->displacement() );
-    par[0]=dloc.x();
-    par[1]=dloc.y();
-    par[2]=dloc.z();
+    align::LocalVector dloc = ali->surface().toLocal(ali->displacement());
+    par[0] = dloc.x();
+    par[1] = dloc.y();
+    par[2] = dloc.z();
 
     // Transform to local euler angles
-    align::EulerAngles euloc = align::toAngles( ali->surface().toLocal( ali->rotation() ) );
-    par[3]=euloc(1);
-    par[4]=euloc(2);
-    par[5]=euloc(3);
-	  
+    align::EulerAngles euloc = align::toAngles(ali->surface().toLocal(ali->rotation()));
+    par[3] = euloc(1);
+    par[4] = euloc(2);
+    par[5] = euloc(3);
+
     // Clone parameters
-    RigidBodyAlignmentParameters* apnew = ap->clone(par,cov);
-	  
+    RigidBodyAlignmentParameters* apnew = ap->clone(par, cov);
+
     ali->setAlignmentParameters(apnew);
   }
 }
 
-
 //__________________________________________________________________________________________________
 // Get type/layer from Alignable
 // type: -6   -5   -4   -3   -2    -1     1     2    3    4    5    6
 //      TEC- TOB- TID- TIB- PxEC- PxBR- PxBr+ PxEC+ TIB+ TID+ TOB+ TEC+
 // Layers start from zero
-std::pair<int,int> AlignmentParameterStore::typeAndLayer(const Alignable* ali, const TrackerTopology* tTopo) const
-{
-  return TrackerAlignableId().typeAndLayerFromDetId( ali->id(), tTopo );
+std::pair<int, int> AlignmentParameterStore::typeAndLayer(const Alignable* ali, const TrackerTopology* tTopo) const {
+  return TrackerAlignableId().typeAndLayerFromDetId(ali->id(), tTopo);
 }
 
-
 //__________________________________________________________________________________________________
-void AlignmentParameterStore::
-applyAlignableAbsolutePositions(const align::Alignables& alivec, const AlignablePositions& newpos, int& ierr)
-{
-  unsigned int nappl=0;
-  ierr=0;
+void AlignmentParameterStore::applyAlignableAbsolutePositions(const align::Alignables& alivec,
+                                                              const AlignablePositions& newpos,
+                                                              int& ierr) {
+  unsigned int nappl = 0;
+  ierr = 0;
 
   // Iterate over list of alignables
   for (align::Alignables::const_iterator iali = alivec.begin(); iali != alivec.end(); ++iali) {
@@ -443,14 +383,12 @@ applyAlignableAbsolutePositions(const align::Alignables& alivec, const Alignable
     align::StructureType typeId = ali->alignableObjectId();
 
     // Find corresponding entry in AlignablePositions
-    bool found=false;
+    bool found = false;
     for (AlignablePositions::const_iterator ipos = newpos.begin(); ipos != newpos.end(); ++ipos) {
       if (id == ipos->id() && typeId == ipos->objId()) {
         if (found) {
-          edm::LogError("DuplicatePosition")
-            << "New positions for alignable found more than once!";
-        }
-        else {
+          edm::LogError("DuplicatePosition") << "New positions for alignable found more than once!";
+        } else {
           // New position/rotation
           const align::PositionType& pnew = ipos->pos();
           const align::RotationType& rnew = ipos->rot();
@@ -460,10 +398,10 @@ applyAlignableAbsolutePositions(const align::Alignables& alivec, const Alignable
           const align::RotationType& rold = ali->globalRotation();
           // Current surf. deformation
           std::vector<std::pair<int, SurfaceDeformation*> > dold_id_pairs;
-          SurfaceDeformation* dold_obj=nullptr;
+          SurfaceDeformation* dold_obj = nullptr;
           SurfaceDeformationFactory::Type dtype = SurfaceDeformationFactory::kNoDeformations;
           std::vector<double> dold;
-          if (1 == ali->surfaceDeformationIdPairs(dold_id_pairs)){ // might not have any...
+          if (1 == ali->surfaceDeformationIdPairs(dold_id_pairs)) {  // might not have any...
             dold_obj = dold_id_pairs[0].second;
             dold = dold_obj->parameters();
             dtype = (SurfaceDeformationFactory::Type)dold_obj->type();
@@ -472,7 +410,7 @@ applyAlignableAbsolutePositions(const align::Alignables& alivec, const Alignable
           // shift needed to move from current to new position
           align::GlobalVector posDiff = pnew - pold;
           align::RotationType rotDiff = rold.multiplyInverse(rnew);
-          align::rectify(rotDiff); // correct for rounding errors 
+          align::rectify(rotDiff);  // correct for rounding errors
           ali->move(posDiff);
           ali->rotateInGlobalFrame(rotDiff);
           LogDebug("NewPosition") << "moving by:" << posDiff;
@@ -480,25 +418,31 @@ applyAlignableAbsolutePositions(const align::Alignables& alivec, const Alignable
 
           // add the surface deformations
           // If an old surface deformation record exists, ensure that the added deformation has the same type and size.
-          if (!dold.empty() && dtype != SurfaceDeformationFactory::kNoDeformations && dnew.size()==dold.size()){
-            std::vector<double> defDiff; defDiff.reserve(dold.size());
-            for (unsigned int i = 0; i < dold.size(); i++) defDiff.push_back(dnew[i] - dold[i]);
+          if (!dold.empty() && dtype != SurfaceDeformationFactory::kNoDeformations && dnew.size() == dold.size()) {
+            std::vector<double> defDiff;
+            defDiff.reserve(dold.size());
+            for (unsigned int i = 0; i < dold.size(); i++)
+              defDiff.push_back(dnew[i] - dold[i]);
             auto deform = SurfaceDeformationFactory::create(dtype, defDiff);
             edm::LogInfo("Alignment") << "@SUB=AlignmentParameterStore::applyAlignableAbsolutePositions"
-              << "Adding surface deformation of type " << SurfaceDeformationFactory::surfaceDeformationTypeName((SurfaceDeformationFactory::Type)deform->type())
-              << ", size " << defDiff.size() << " and first element " << defDiff.at(0)
-              << " to alignable with id / type: " << id << " / " << typeId;
+                                      << "Adding surface deformation of type "
+                                      << SurfaceDeformationFactory::surfaceDeformationTypeName(
+                                             (SurfaceDeformationFactory::Type)deform->type())
+                                      << ", size " << defDiff.size() << " and first element " << defDiff.at(0)
+                                      << " to alignable with id / type: " << id << " / " << typeId;
             ali->addSurfaceDeformation(deform, true);
             delete deform;
           }
           // In case no old surface deformation record exists, only ensure that the new surface deformation record has size>0. Size check is done elsewhere.
-          else if (!dnew.empty()){
+          else if (!dnew.empty()) {
             auto deform = SurfaceDeformationFactory::create(dnew);
             edm::LogInfo("Alignment") << "@SUB=AlignmentParameterStore::applyAlignableAbsolutePositions"
-              << "Setting surface deformation of type " << SurfaceDeformationFactory::surfaceDeformationTypeName((SurfaceDeformationFactory::Type)deform->type())
-              << ", size " << dnew.size() << " and first element " << dnew.at(0)
-              << " to alignable with id / type: " << id << " / " << typeId;
-            ali->addSurfaceDeformation(deform, true); // Equivalent to setSurfaceDeformation in this case
+                                      << "Setting surface deformation of type "
+                                      << SurfaceDeformationFactory::surfaceDeformationTypeName(
+                                             (SurfaceDeformationFactory::Type)deform->type())
+                                      << ", size " << dnew.size() << " and first element " << dnew.at(0)
+                                      << " to alignable with id / type: " << id << " / " << typeId;
+            ali->addSurfaceDeformation(deform, true);  // Equivalent to setSurfaceDeformation in this case
             delete deform;
           }
           // If there is no new surface deformation record, do nothing.
@@ -508,29 +452,26 @@ applyAlignableAbsolutePositions(const align::Alignables& alivec, const Alignable
           // (*iali)->addAlignmentPositionError(ape);
           // (*iali)->addAlignmentPositionErrorFromRotation(rot);
 
-          found=true;
+          found = true;
           ++nappl;
         }
       }
     }
   }
 
-  if (nappl< newpos.size())
+  if (nappl < newpos.size())
     edm::LogError("Mismatch") << "Applied only " << nappl << " new positions"
-    << " out of " << newpos.size();
-
-  LogDebug("NewPositions") << "Applied new positions for " << nappl
-    << " out of " << alivec.size() <<" alignables.";
+                              << " out of " << newpos.size();
 
+  LogDebug("NewPositions") << "Applied new positions for " << nappl << " out of " << alivec.size() << " alignables.";
 }
 
-
 //__________________________________________________________________________________________________
-void AlignmentParameterStore::
-applyAlignableRelativePositions(const align::Alignables& alivec, const AlignableShifts& shifts, int& ierr)
-{
-  ierr=0;
-  unsigned int nappl=0;
+void AlignmentParameterStore::applyAlignableRelativePositions(const align::Alignables& alivec,
+                                                              const AlignableShifts& shifts,
+                                                              int& ierr) {
+  ierr = 0;
+  unsigned int nappl = 0;
   unsigned int nAlignables = alivec.size();
 
   for (unsigned int i = 0; i < nAlignables; ++i) {
@@ -544,16 +485,14 @@ applyAlignableRelativePositions(const align::Alignables& alivec, const Alignable
     for (AlignableShifts::const_iterator ipos = shifts.begin(); ipos != shifts.end(); ++ipos) {
       if (id == ipos->id() && typeId == ipos->objId()) {
         if (found) {
-          edm::LogError("DuplicatePosition")
-            << "New positions for alignable found more than once!";
-        }
-        else {
+          edm::LogError("DuplicatePosition") << "New positions for alignable found more than once!";
+        } else {
           // Current surf. deformation
           std::vector<std::pair<int, SurfaceDeformation*> > dold_id_pairs;
-          SurfaceDeformation* dold_obj=nullptr;
+          SurfaceDeformation* dold_obj = nullptr;
           SurfaceDeformationFactory::Type dtype = SurfaceDeformationFactory::kNoDeformations;
           std::vector<double> dold;
-          if (1 == ali->surfaceDeformationIdPairs(dold_id_pairs)){ // might not have any...
+          if (1 == ali->surfaceDeformationIdPairs(dold_id_pairs)) {  // might not have any...
             dold_obj = dold_id_pairs[0].second;
             dold = dold_obj->parameters();
             dtype = (SurfaceDeformationFactory::Type)dold_obj->type();
@@ -564,23 +503,27 @@ applyAlignableRelativePositions(const align::Alignables& alivec, const Alignable
 
           const std::vector<double>& defDiff = ipos->deformationParameters();
           // If an old surface deformation record exists, ensure that the added deformation has the same type and size.
-          if (!dold.empty() && dtype != SurfaceDeformationFactory::kNoDeformations && defDiff.size()==dold.size()){
+          if (!dold.empty() && dtype != SurfaceDeformationFactory::kNoDeformations && defDiff.size() == dold.size()) {
             auto deform = SurfaceDeformationFactory::create(dtype, defDiff);
             edm::LogInfo("Alignment") << "@SUB=AlignmentParameterStore::applyAlignableRelativePositions"
-              << "Adding surface deformation of type " << SurfaceDeformationFactory::surfaceDeformationTypeName((SurfaceDeformationFactory::Type)deform->type())
-              << ", size " << defDiff.size() << " and first element " << defDiff.at(0)
-              << " to alignable with id / type: " << id << " / " << typeId;
+                                      << "Adding surface deformation of type "
+                                      << SurfaceDeformationFactory::surfaceDeformationTypeName(
+                                             (SurfaceDeformationFactory::Type)deform->type())
+                                      << ", size " << defDiff.size() << " and first element " << defDiff.at(0)
+                                      << " to alignable with id / type: " << id << " / " << typeId;
             ali->addSurfaceDeformation(deform, true);
             delete deform;
           }
           // In case no old surface deformation record exists, only ensure that the new surface deformation record has size>0. Size check is done elsewhere.
-          else if (!defDiff.empty()){
+          else if (!defDiff.empty()) {
             auto deform = SurfaceDeformationFactory::create(defDiff);
             edm::LogInfo("Alignment") << "@SUB=AlignmentParameterStore::applyAlignableRelativePositions"
-              << "Setting surface deformation of type " << SurfaceDeformationFactory::surfaceDeformationTypeName((SurfaceDeformationFactory::Type)deform->type())
-              << ", size " << defDiff.size() << " and first element " << defDiff.at(0)
-              << " to alignable with id / type: " << id << " / " << typeId;
-            ali->addSurfaceDeformation(deform, true); // Equivalent to setSurfaceDeformation in this case
+                                      << "Setting surface deformation of type "
+                                      << SurfaceDeformationFactory::surfaceDeformationTypeName(
+                                             (SurfaceDeformationFactory::Type)deform->type())
+                                      << ", size " << defDiff.size() << " and first element " << defDiff.at(0)
+                                      << " to alignable with id / type: " << id << " / " << typeId;
+            ali->addSurfaceDeformation(deform, true);  // Equivalent to setSurfaceDeformation in this case
             delete deform;
           }
           // If there is no new surface deformation record, do nothing.
@@ -590,7 +533,7 @@ applyAlignableRelativePositions(const align::Alignables& alivec, const Alignable
           //ali->addAlignmentPositionError(ape);
           //ali->addAlignmentPositionErrorFromRotation(rnew);
 
-          found=true;
+          found = true;
           ++nappl;
         }
       }
@@ -599,215 +542,197 @@ applyAlignableRelativePositions(const align::Alignables& alivec, const Alignable
 
   if (nappl < shifts.size())
     edm::LogError("Mismatch") << "Applied only " << nappl << " new positions"
-    << " out of " << shifts.size();
+                              << " out of " << shifts.size();
 
   LogDebug("NewPositions") << "Applied new positions for " << nappl << " alignables.";
 }
 
-
-
 //__________________________________________________________________________________________________
-void AlignmentParameterStore::attachAlignmentParameters( const Parameters& parvec, int& ierr )
-{
-  attachAlignmentParameters( theAlignables, parvec, ierr);
+void AlignmentParameterStore::attachAlignmentParameters(const Parameters& parvec, int& ierr) {
+  attachAlignmentParameters(theAlignables, parvec, ierr);
 }
 
-
-
 //__________________________________________________________________________________________________
-void AlignmentParameterStore::attachAlignmentParameters( const align::Alignables& alivec, 
-                                                         const Parameters& parvec, int& ierr )
-{
+void AlignmentParameterStore::attachAlignmentParameters(const align::Alignables& alivec,
+                                                        const Parameters& parvec,
+                                                        int& ierr) {
   int ipass = 0;
   int ifail = 0;
   ierr = 0;
 
   // Iterate over alignables
-  for ( align::Alignables::const_iterator iali = alivec.begin(); iali != alivec.end(); ++iali ) 
-  {
+  for (align::Alignables::const_iterator iali = alivec.begin(); iali != alivec.end(); ++iali) {
     // Iterate over Parameters
-    bool found=false;
-    for ( Parameters::const_iterator ipar = parvec.begin(); ipar != parvec.end(); ++ipar) 
-    {
+    bool found = false;
+    for (Parameters::const_iterator ipar = parvec.begin(); ipar != parvec.end(); ++ipar) {
       // Get new alignment parameters
-      AlignmentParameters* ap = *ipar; 
+      AlignmentParameters* ap = *ipar;
 
-      // Check if parameters belong to alignable 
-      if ( ap->alignable() == (*iali) )
-      {
-	if (!found) 
-	{
+      // Check if parameters belong to alignable
+      if (ap->alignable() == (*iali)) {
+        if (!found) {
           (*iali)->setAlignmentParameters(ap);
           ++ipass;
-          found=true;
-        } 
-        else edm::LogError("Alignment") << "@SUB=AlignmentParameterStore::attachAlignmentParameters" 
-					<< "More than one parameters for Alignable.";
+          found = true;
+        } else
+          edm::LogError("Alignment") << "@SUB=AlignmentParameterStore::attachAlignmentParameters"
+                                     << "More than one parameters for Alignable.";
       }
     }
-    if (!found) ++ifail;
+    if (!found)
+      ++ifail;
   }
-  if (ifail>0) ierr=-1;
-  
-  LogDebug("attachAlignmentParameters") << " Parameters, Alignables: " << parvec.size() << ","
-                                        << alivec.size() << "\n pass,fail: " << ipass << ","<< ifail;
-}
+  if (ifail > 0)
+    ierr = -1;
 
+  LogDebug("attachAlignmentParameters") << " Parameters, Alignables: " << parvec.size() << "," << alivec.size()
+                                        << "\n pass,fail: " << ipass << "," << ifail;
+}
 
 //__________________________________________________________________________________________________
-void AlignmentParameterStore::attachCorrelations( const Correlations& cormap, 
-                                                  bool overwrite, int& ierr )
-{
-  attachCorrelations( theAlignables, cormap, overwrite, ierr );
+void AlignmentParameterStore::attachCorrelations(const Correlations& cormap, bool overwrite, int& ierr) {
+  attachCorrelations(theAlignables, cormap, overwrite, ierr);
 }
 
-
 //__________________________________________________________________________________________________
-void AlignmentParameterStore::attachCorrelations( const align::Alignables& alivec, 
-                                                  const Correlations& cormap, 
-                                                  bool overwrite, int& ierr )
-{
-  ierr=0;
-  int icount=0;
+void AlignmentParameterStore::attachCorrelations(const align::Alignables& alivec,
+                                                 const Correlations& cormap,
+                                                 bool overwrite,
+                                                 int& ierr) {
+  ierr = 0;
+  int icount = 0;
 
   // Iterate over correlations
-  for ( Correlations::const_iterator icor = cormap.begin(); icor!=cormap.end(); ++icor ) 
-  {
-    AlgebraicMatrix mat=(*icor).second;
+  for (Correlations::const_iterator icor = cormap.begin(); icor != cormap.end(); ++icor) {
+    AlgebraicMatrix mat = (*icor).second;
     Alignable* ali1 = (*icor).first.first;
     Alignable* ali2 = (*icor).first.second;
 
     // Check if alignables exist
-    if ( find( alivec.begin(), alivec.end(), ali1 ) != alivec.end() && 
-         find( alivec.begin(), alivec.end(), ali2 ) != alivec.end() )
-    {
+    if (find(alivec.begin(), alivec.end(), ali1) != alivec.end() &&
+        find(alivec.begin(), alivec.end(), ali2) != alivec.end()) {
       // Check if correlations already existing between these alignables
-      if ( !theCorrelationsStore->correlationsAvailable(ali1,ali2) || (overwrite) ) 
-       {
-         theCorrelationsStore->setCorrelations(ali1,ali2,mat);
-         ++icount;
-       }
-      else edm::LogInfo("AlreadyExists") << "Correlation existing and not overwritten";
-    }
-    else edm::LogInfo("IgnoreCorrelation") << "Ignoring correlation with no alignables!";
+      if (!theCorrelationsStore->correlationsAvailable(ali1, ali2) || (overwrite)) {
+        theCorrelationsStore->setCorrelations(ali1, ali2, mat);
+        ++icount;
+      } else
+        edm::LogInfo("AlreadyExists") << "Correlation existing and not overwritten";
+    } else
+      edm::LogInfo("IgnoreCorrelation") << "Ignoring correlation with no alignables!";
   }
 
-  LogDebug( "attachCorrelations" ) << " Alignables,Correlations: " << alivec.size() <<","<< cormap.size() 
-                                   << "\n applied: " << icount ;
-
+  LogDebug("attachCorrelations") << " Alignables,Correlations: " << alivec.size() << "," << cormap.size()
+                                 << "\n applied: " << icount;
 }
 
-
 //__________________________________________________________________________________________________
-void AlignmentParameterStore::
-attachUserVariables( const align::Alignables& alivec,
-                     const std::vector<AlignmentUserVariables*>& uvarvec, int& ierr )
-{
-  ierr=0;
+void AlignmentParameterStore::attachUserVariables(const align::Alignables& alivec,
+                                                  const std::vector<AlignmentUserVariables*>& uvarvec,
+                                                  int& ierr) {
+  ierr = 0;
 
-  LogDebug("DumpArguments") << "size of alivec:   "  << alivec.size()
-                            << "\nsize of uvarvec: " << uvarvec.size();
+  LogDebug("DumpArguments") << "size of alivec:   " << alivec.size() << "\nsize of uvarvec: " << uvarvec.size();
 
-  std::vector<AlignmentUserVariables*>::const_iterator iuvar=uvarvec.begin();
+  std::vector<AlignmentUserVariables*>::const_iterator iuvar = uvarvec.begin();
 
-  for ( align::Alignables::const_iterator iali=alivec.begin(); iali!=alivec.end(); ++iali, ++iuvar ) 
-  {
+  for (align::Alignables::const_iterator iali = alivec.begin(); iali != alivec.end(); ++iali, ++iuvar) {
     AlignmentParameters* ap = (*iali)->alignmentParameters();
     AlignmentUserVariables* uvarnew = (*iuvar);
     ap->setUserVariables(uvarnew);
   }
 }
 
-
 //__________________________________________________________________________________________________
-void AlignmentParameterStore::setAlignmentPositionError( const align::Alignables& alivec, 
-                                                         double valshift, double valrot )
-{
+void AlignmentParameterStore::setAlignmentPositionError(const align::Alignables& alivec,
+                                                        double valshift,
+                                                        double valrot) {
   unsigned int nAlignables = alivec.size();
 
-  for (unsigned int i = 0; i < nAlignables; ++i)
-  {
+  for (unsigned int i = 0; i < nAlignables; ++i) {
     Alignable* ali = alivec[i];
 
-    // First reset APE	 
-    AlignmentPositionError nulApe(0,0,0);	 
+    // First reset APE
+    AlignmentPositionError nulApe(0, 0, 0);
     ali->setAlignmentPositionError(nulApe, true);
 
     // Set APE from displacement
-    AlignmentPositionError ape(valshift,valshift,valshift);
-    if ( valshift > 0. ) ali->addAlignmentPositionError(ape, true);
-    else ali->setAlignmentPositionError(ape, true);
-    // GF: Resetting and setting as above does not really make sense to me, 
-    //     and adding to zero or setting is the same! I'd just do 
+    AlignmentPositionError ape(valshift, valshift, valshift);
+    if (valshift > 0.)
+      ali->addAlignmentPositionError(ape, true);
+    else
+      ali->setAlignmentPositionError(ape, true);
+    // GF: Resetting and setting as above does not really make sense to me,
+    //     and adding to zero or setting is the same! I'd just do
     //ali->setAlignmentPositionError(AlignmentPositionError ape(valshift,valshift,valshift),true);
 
     // Set APE from rotation
     align::EulerAngles r(3);
-    r(1)=valrot; r(2)=valrot; r(3)=valrot;
+    r(1) = valrot;
+    r(2) = valrot;
+    r(3) = valrot;
     ali->addAlignmentPositionErrorFromRotation(align::toMatrix(r), true);
   }
 
-  LogDebug("StoreAPE") << "Store APE from shift: " << valshift
-		       << "\nStore APE from rotation: " << valrot;
+  LogDebug("StoreAPE") << "Store APE from shift: " << valshift << "\nStore APE from rotation: " << valrot;
 }
 
 //__________________________________________________________________________________________________
-bool AlignmentParameterStore
-::hierarchyConstraints(const Alignable *ali, const align::Alignables &aliComps,
-		       std::vector<std::vector<ParameterId> > &paramIdsVecOut,
-		       std::vector<std::vector<double> > &factorsVecOut,
-		       bool all, double epsilon) const
-{
+bool AlignmentParameterStore ::hierarchyConstraints(const Alignable* ali,
+                                                    const align::Alignables& aliComps,
+                                                    std::vector<std::vector<ParameterId> >& paramIdsVecOut,
+                                                    std::vector<std::vector<double> >& factorsVecOut,
+                                                    bool all,
+                                                    double epsilon) const {
   // Weak point if all = false:
   // Ignores constraints between non-subsequent levels in case the parameter is not considered in
   // the intermediate level, e.g. global z for dets and layers is aligned, but not for rods!
-  if (!ali || !ali->alignmentParameters()) return false;
+  if (!ali || !ali->alignmentParameters())
+    return false;
 
-  const std::vector<bool> &aliSel= ali->alignmentParameters()->selector();
+  const std::vector<bool>& aliSel = ali->alignmentParameters()->selector();
   paramIdsVecOut.clear();
   factorsVecOut.clear();
 
   bool firstComp = true;
-  for (align::Alignables::const_iterator iComp = aliComps.begin(), iCompE = aliComps.end();
-       iComp != iCompE; ++iComp) {
-
+  for (align::Alignables::const_iterator iComp = aliComps.begin(), iCompE = aliComps.end(); iComp != iCompE; ++iComp) {
     const ParametersToParametersDerivatives p2pDerivs(**iComp, *ali);
     if (!p2pDerivs.isOK()) {
       // std::cerr << (*iComp)->alignmentParameters()->type() << " "
       // 		<< ali->alignmentParameters()->type() << std::endl;
-      throw cms::Exception("BadConfig")
-	<< "AlignmentParameterStore::hierarchyConstraints"
-	<< " Bad match of types of AlignmentParameters classes.\n";
+      throw cms::Exception("BadConfig") << "AlignmentParameterStore::hierarchyConstraints"
+                                        << " Bad match of types of AlignmentParameters classes.\n";
       return false;
     }
-    const std::vector<bool> &aliCompSel = (*iComp)->alignmentParameters()->selector();
+    const std::vector<bool>& aliCompSel = (*iComp)->alignmentParameters()->selector();
     for (unsigned int iParMast = 0, iParMastUsed = 0; iParMast < aliSel.size(); ++iParMast) {
-      if (!all && !aliSel[iParMast]) continue;// no higher level parameter & constraint deselected
-      if (firstComp) { // fill output with empty arrays 
-	paramIdsVecOut.push_back(std::vector<ParameterId>());
-	factorsVecOut.push_back(std::vector<double>());
+      if (!all && !aliSel[iParMast])
+        continue;       // no higher level parameter & constraint deselected
+      if (firstComp) {  // fill output with empty arrays
+        paramIdsVecOut.push_back(std::vector<ParameterId>());
+        factorsVecOut.push_back(std::vector<double>());
       }
       for (unsigned int iParComp = 0; iParComp < aliCompSel.size(); ++iParComp) {
-	if (aliCompSel[iParComp]) {
-	  double factor = 0.;
-	  if( theTypeOfConstraints == HIERARCHY_CONSTRAINTS ) {
-	    // hierachy constraints
-	    factor = p2pDerivs(iParMast, iParComp);
-	  } else if( theTypeOfConstraints == APPROX_AVERAGING_CONSTRAINTS ) {
-	    // CHK poor mans averaging constraints
-	    factor = p2pDerivs(iParMast, iParComp);
-	    if (iParMast < 3 && (iParComp % 9) >= 3) factor = 0.;
-	  }
-	  if (fabs(factor) > epsilon) {
-	    paramIdsVecOut[iParMastUsed].push_back(ParameterId(*iComp, iParComp));
-	    factorsVecOut[iParMastUsed].push_back(factor);
-	  }
-	}
+        if (aliCompSel[iParComp]) {
+          double factor = 0.;
+          if (theTypeOfConstraints == HIERARCHY_CONSTRAINTS) {
+            // hierachy constraints
+            factor = p2pDerivs(iParMast, iParComp);
+          } else if (theTypeOfConstraints == APPROX_AVERAGING_CONSTRAINTS) {
+            // CHK poor mans averaging constraints
+            factor = p2pDerivs(iParMast, iParComp);
+            if (iParMast < 3 && (iParComp % 9) >= 3)
+              factor = 0.;
+          }
+          if (fabs(factor) > epsilon) {
+            paramIdsVecOut[iParMastUsed].push_back(ParameterId(*iComp, iParComp));
+            factorsVecOut[iParMastUsed].push_back(factor);
+          }
+        }
       }
       ++iParMastUsed;
     }
     firstComp = false;
-  } // end loop on components
+  }  // end loop on components
 
   return true;
 }
diff --git a/Alignment/CommonAlignmentAlgorithm/src/AlignmentParametersIO.cc b/Alignment/CommonAlignmentAlgorithm/src/AlignmentParametersIO.cc
index 9b1b0ce0e1ad4..7c6afe3dd09c3 100644
--- a/Alignment/CommonAlignmentAlgorithm/src/AlignmentParametersIO.cc
+++ b/Alignment/CommonAlignmentAlgorithm/src/AlignmentParametersIO.cc
@@ -8,34 +8,28 @@
 
 //--------------------------------------------------------------------------------------------------
 // write one set of original parameters
-int AlignmentParametersIO::writeOneOrigRigidBody(Alignable *ali)
-{
-
-  AlignmentParameters *par = ali->alignmentParameters();
-  AlignmentParameters *parBack = (par ? par->clone(par->parameters(), par->covariance()) : nullptr);
+int AlignmentParametersIO::writeOneOrigRigidBody(Alignable* ali) {
+  AlignmentParameters* par = ali->alignmentParameters();
+  AlignmentParameters* parBack = (par ? par->clone(par->parameters(), par->covariance()) : nullptr);
 
   ali->setAlignmentParameters(new RigidBodyAlignmentParameters(ali, true));
   int iret = this->writeOne(ali);
 
-  ali->setAlignmentParameters(parBack); // deletes the above created RigidBodyAlignmentParameters
+  ali->setAlignmentParameters(parBack);  // deletes the above created RigidBodyAlignmentParameters
 
   return iret;
 }
 
-
 //-----------------------------------------------------------------------------
 // write many parameters
-int 
-AlignmentParametersIO::write(const align::Alignables& alivec, 
-                             bool validCheck) 
-{
-  int icount=0;
-  for(align::Alignables::const_iterator it=alivec.begin();
-	  it!=alivec.end(); ++it) {
+int AlignmentParametersIO::write(const align::Alignables& alivec, bool validCheck) {
+  int icount = 0;
+  for (align::Alignables::const_iterator it = alivec.begin(); it != alivec.end(); ++it) {
     if ((*it)->alignmentParameters()->isValid() || !(validCheck)) {
       icount++;
-      int iret=writeOne(*it);
-      if (iret!=0) return iret;
+      int iret = writeOne(*it);
+      if (iret != 0)
+        return iret;
     }
   }
   edm::LogInfo("Alignment") << "@SUB=AlignmentParametersIO::write"
@@ -43,39 +37,36 @@ AlignmentParametersIO::write(const align::Alignables& alivec,
   return 0;
 }
 
-
 //-----------------------------------------------------------------------------
 // write many original parameters
-int 
-AlignmentParametersIO::writeOrigRigidBody(const align::Alignables& alivec, bool validCheck)
-{
+int AlignmentParametersIO::writeOrigRigidBody(const align::Alignables& alivec, bool validCheck) {
   int icount = 0;
-  for(align::Alignables::const_iterator it = alivec.begin(); it != alivec.end(); ++it) {
+  for (align::Alignables::const_iterator it = alivec.begin(); it != alivec.end(); ++it) {
     if (!validCheck || (*it)->alignmentParameters()->isValid()) {
       ++icount;
       int iret = this->writeOneOrigRigidBody(*it);
-      if (iret != 0) return iret;
+      if (iret != 0)
+        return iret;
     }
   }
   edm::LogInfo("Alignment") << "@SUB=AlignmentParametersIO::writeOrigRigidBody"
-                            << "Wrote " << icount << " out of " << alivec.size()
-                            << " original parameters.";
+                            << "Wrote " << icount << " out of " << alivec.size() << " original parameters.";
   return 0;
 }
 
 //-----------------------------------------------------------------------------
 // read many parameters
 
-align::Parameters 
-AlignmentParametersIO::read(const align::Alignables& alivec, int& ierr) 
-{
+align::Parameters AlignmentParametersIO::read(const align::Alignables& alivec, int& ierr) {
   align::Parameters retvec;
   int ierr2;
-  int icount=0;
-  for(align::Alignables::const_iterator it=alivec.begin();
-    it!=alivec.end(); ++it) {
-    AlignmentParameters* ad=readOne(*it, ierr2);
-    if (ad!=nullptr && ierr2==0) { retvec.push_back(ad); icount++; }
+  int icount = 0;
+  for (align::Alignables::const_iterator it = alivec.begin(); it != alivec.end(); ++it) {
+    AlignmentParameters* ad = readOne(*it, ierr2);
+    if (ad != nullptr && ierr2 == 0) {
+      retvec.push_back(ad);
+      icount++;
+    }
   }
   edm::LogInfo("Alignment") << "@SUB-AlignmentParametersIO::write"
                             << "Read " << icount << " out of " << alivec.size() << " parameters";
diff --git a/Alignment/CommonAlignmentAlgorithm/src/AlignmentParametersIORoot.cc b/Alignment/CommonAlignmentAlgorithm/src/AlignmentParametersIORoot.cc
index cbc4176e6e2d8..a36a57c71e838 100644
--- a/Alignment/CommonAlignmentAlgorithm/src/AlignmentParametersIORoot.cc
+++ b/Alignment/CommonAlignmentAlgorithm/src/AlignmentParametersIORoot.cc
@@ -1,7 +1,7 @@
 // this class's header
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentParametersIORoot.h"
 
-#include "Alignment/CommonAlignment/interface/Alignable.h" 
+#include "Alignment/CommonAlignment/interface/Alignable.h"
 #include "Alignment/CommonAlignment/interface/AlignmentParameters.h"
 #include "Alignment/CommonAlignmentParametrization/interface/AlignmentParametersFactory.h"
 
@@ -9,58 +9,53 @@
 
 #include "TTree.h"
 
-
 // ----------------------------------------------------------------------------
 // constructor
-AlignmentParametersIORoot::AlignmentParametersIORoot()
-{
+AlignmentParametersIORoot::AlignmentParametersIORoot() {
   treename = "AlignmentParameters";
   treetxt = "Alignment Parameters";
 }
 
-
 // ----------------------------------------------------------------------------
-void AlignmentParametersIORoot::createBranches(void) 
-{
-  tree->Branch("parSize",   &theCovRang,   "CovRang/I");
-  tree->Branch("Id",        &theId,        "Id/i");
+void AlignmentParametersIORoot::createBranches(void) {
+  tree->Branch("parSize", &theCovRang, "CovRang/I");
+  tree->Branch("Id", &theId, "Id/i");
   tree->Branch("paramType", &theParamType, "paramType/I");
-  tree->Branch("Par",       &thePar,       "Par[CovRang]/D");
+  tree->Branch("Par", &thePar, "Par[CovRang]/D");
   tree->Branch("covarSize", &theCovarRang, "CovarRang/I");
-  tree->Branch("Cov",       &theCov,       "Cov[CovarRang]/D");
-  tree->Branch("ObjId",     &theObjId,     "ObjId/I");
-  tree->Branch("HieraLevel",&theHieraLevel,"HieraLevel/I");
+  tree->Branch("Cov", &theCov, "Cov[CovarRang]/D");
+  tree->Branch("ObjId", &theObjId, "ObjId/I");
+  tree->Branch("HieraLevel", &theHieraLevel, "HieraLevel/I");
 }
 
-
 // ----------------------------------------------------------------------------
-void AlignmentParametersIORoot::setBranchAddresses(void) 
-{
-  tree->SetBranchAddress("parSize",   &theCovRang);
+void AlignmentParametersIORoot::setBranchAddresses(void) {
+  tree->SetBranchAddress("parSize", &theCovRang);
   tree->SetBranchAddress("covarSize", &theCovarRang);
-  tree->SetBranchAddress("Id",        &theId);
-  tree->SetBranchAddress("Par",       &thePar);
+  tree->SetBranchAddress("Id", &theId);
+  tree->SetBranchAddress("Par", &thePar);
   tree->SetBranchAddress("paramType", &theParamType);
-  tree->SetBranchAddress("Cov",       &theCov);
-  tree->SetBranchAddress("ObjId",     &theObjId);
-  tree->SetBranchAddress("HieraLevel",&theHieraLevel);
+  tree->SetBranchAddress("Cov", &theCov);
+  tree->SetBranchAddress("ObjId", &theObjId);
+  tree->SetBranchAddress("HieraLevel", &theHieraLevel);
 }
 
-
 // ----------------------------------------------------------------------------
-int AlignmentParametersIORoot::writeOne(Alignable* ali)
-{
-  const AlignmentParameters* ap =ali->alignmentParameters();
+int AlignmentParametersIORoot::writeOne(Alignable* ali) {
+  const AlignmentParameters* ap = ali->alignmentParameters();
   const AlgebraicVector& params = ap->parameters();
   const AlgebraicSymMatrix& cov = ap->covariance();
 
-  theCovRang   = params.num_row();
-  theCovarRang = theCovRang*(theCovRang+1)/2;
-  int count=0;
-  for(int row=0;row<theCovRang;row++){
-    thePar[row]=params[row];
-    for(int col=0;col<theCovRang;col++){
-      if(row-1<col) { theCov[count] = cov[row][col]; count++; }
+  theCovRang = params.num_row();
+  theCovarRang = theCovRang * (theCovRang + 1) / 2;
+  int count = 0;
+  for (int row = 0; row < theCovRang; row++) {
+    thePar[row] = params[row];
+    for (int col = 0; col < theCovRang; col++) {
+      if (row - 1 < col) {
+        theCov[count] = cov[row][col];
+        count++;
+      }
     }
   }
 
@@ -73,55 +68,49 @@ int AlignmentParametersIORoot::writeOne(Alignable* ali)
   return 0;
 }
 
-
 // ----------------------------------------------------------------------------
-AlignmentParameters* AlignmentParametersIORoot::readOne( Alignable* ali, int& ierr )
-{
-  
-  if( tree->GetEntryWithIndex( ali->id(), ali->alignableObjectId() ) > 0 ) 
-  {
+AlignmentParameters* AlignmentParametersIORoot::readOne(Alignable* ali, int& ierr) {
+  if (tree->GetEntryWithIndex(ali->id(), ali->alignableObjectId()) > 0) {
     int covsize = theCovRang;
-    int count=0;
+    int count = 0;
     AlgebraicVector par(covsize, 0);
     AlgebraicSymMatrix cov(covsize, 0);
-    for(int row=0;row<covsize;row++) 
-    {
-      par[row]=thePar[row];
-      for(int col=0; col < covsize;col++) {
-	if(row-1<col) {cov[row][col]=theCov[count];count++;}
+    for (int row = 0; row < covsize; row++) {
+      par[row] = thePar[row];
+      for (int col = 0; col < covsize; col++) {
+        if (row - 1 < col) {
+          cov[row][col] = theCov[count];
+          count++;
+        }
       }
     }
 
     using namespace AlignmentParametersFactory;
     ParametersType parType = parametersType(theParamType);
-    AlignmentParameters* alipar1; 
-    if ( ali->alignmentParameters() )
-    {
+    AlignmentParameters* alipar1;
+    if (ali->alignmentParameters()) {
       const std::vector<bool>& sel = ali->alignmentParameters()->selector();
-      alipar1 = createParameters(ali, parType, sel); 
+      alipar1 = createParameters(ali, parType, sel);
     } else {
-      const std::vector<bool> sel( theCovRang, true );
-      alipar1 = createParameters(ali, parType, sel); 
+      const std::vector<bool> sel(theCovRang, true);
+      alipar1 = createParameters(ali, parType, sel);
     }
-    AlignmentParameters* alipar = alipar1->clone(par,cov);
-    alipar->setValid(true); 
-    ierr=0;
+    AlignmentParameters* alipar = alipar1->clone(par, cov);
+    alipar->setValid(true);
+    ierr = 0;
     delete alipar1;
     return alipar;
   }
 
-  ierr=-1;
-  return(nullptr);
+  ierr = -1;
+  return (nullptr);
 }
 
-
-int AlignmentParametersIORoot::close()
-{
-  if ( bWrite )
-  {
-    int nIndices = tree->BuildIndex( "Id", "ObjId" );
-    edm::LogInfo( "Alignment" ) << "@SUB=AlignmentParametersIORoot::setBranchAddresses"
-				<< "number of indexed entries: " << nIndices;
+int AlignmentParametersIORoot::close() {
+  if (bWrite) {
+    int nIndices = tree->BuildIndex("Id", "ObjId");
+    edm::LogInfo("Alignment") << "@SUB=AlignmentParametersIORoot::setBranchAddresses"
+                              << "number of indexed entries: " << nIndices;
   }
 
   return closeRoot();
diff --git a/Alignment/CommonAlignmentAlgorithm/src/AlignmentUserVariablesIO.cc b/Alignment/CommonAlignmentAlgorithm/src/AlignmentUserVariablesIO.cc
index 9111a832403aa..dbff77685b602 100644
--- a/Alignment/CommonAlignmentAlgorithm/src/AlignmentUserVariablesIO.cc
+++ b/Alignment/CommonAlignmentAlgorithm/src/AlignmentUserVariablesIO.cc
@@ -16,45 +16,40 @@
 //-----------------------------------------------------------------------------
 // write many user variables
 
-int 
-AlignmentUserVariablesIO::write(const align::Alignables& alivec, 
-  bool validCheck) 
-{
-  int icount=0;
-  for(align::Alignables::const_iterator it=alivec.begin();
-    it!=alivec.end(); ++it) {
+int AlignmentUserVariablesIO::write(const align::Alignables& alivec, bool validCheck) {
+  int icount = 0;
+  for (align::Alignables::const_iterator it = alivec.begin(); it != alivec.end(); ++it) {
     if ((*it)->alignmentParameters()->isValid() || !(validCheck)) {
       icount++;
-      int iret=writeOne(*it);
-      if (iret!=0) return iret;
+      int iret = writeOne(*it);
+      if (iret != 0)
+        return iret;
     }
   }
   edm::LogInfo("Alignment") << "@SUB=AlignmentUserVariablesIO::write"
-                            << "Write variables all,written: " << alivec.size() <<","<< icount;
+                            << "Write variables all,written: " << alivec.size() << "," << icount;
   return 0;
 }
 
 //-----------------------------------------------------------------------------
 // read many user variables
 
-std::vector<AlignmentUserVariables*> 
-AlignmentUserVariablesIO::read(const align::Alignables& alivec, int& ierr) 
-{
+std::vector<AlignmentUserVariables*> AlignmentUserVariablesIO::read(const align::Alignables& alivec, int& ierr) {
   std::vector<AlignmentUserVariables*> retvec;
-  ierr=0;
+  ierr = 0;
   int ierr2;
-  int icount=0;
-  int icount2=0;
-  for(align::Alignables::const_iterator it=alivec.begin();
-    it!=alivec.end(); ++it) {
-    AlignmentUserVariables* ad=readOne(*it, ierr2); // should create with new!
-    if (ierr2==0) { 
-      retvec.push_back(ad); icount++; 
-      if (ad!=nullptr) icount2++;
+  int icount = 0;
+  int icount2 = 0;
+  for (align::Alignables::const_iterator it = alivec.begin(); it != alivec.end(); ++it) {
+    AlignmentUserVariables* ad = readOne(*it, ierr2);  // should create with new!
+    if (ierr2 == 0) {
+      retvec.push_back(ad);
+      icount++;
+      if (ad != nullptr)
+        icount2++;
     }
   }
   edm::LogInfo("Alignment") << "@SUB=AlignmentUserVariablesIO::read"
-                            << "Read variables all,read,valid: " << alivec.size() <<","
-                            << icount <<","<< icount2;
+                            << "Read variables all,read,valid: " << alivec.size() << "," << icount << "," << icount2;
   return retvec;
 }
diff --git a/Alignment/CommonAlignmentAlgorithm/src/IntegratedCalibrationBase.cc b/Alignment/CommonAlignmentAlgorithm/src/IntegratedCalibrationBase.cc
index 819b0c7e8b91e..95b5de9ebaf48 100644
--- a/Alignment/CommonAlignmentAlgorithm/src/IntegratedCalibrationBase.cc
+++ b/Alignment/CommonAlignmentAlgorithm/src/IntegratedCalibrationBase.cc
@@ -16,26 +16,21 @@
 //#include <utility>
 
 //============================================================================
-IntegratedCalibrationBase::IntegratedCalibrationBase(const edm::ParameterSet &cfg) 
-  : name_(cfg.getParameter<std::string>("calibrationName"))
-{
-}
-  
+IntegratedCalibrationBase::IntegratedCalibrationBase(const edm::ParameterSet &cfg)
+    : name_(cfg.getParameter<std::string>("calibrationName")) {}
+
 //============================================================================
-std::vector<IntegratedCalibrationBase::Values>
-IntegratedCalibrationBase::derivatives(const TrackingRecHit &hit,
-				       const TrajectoryStateOnSurface &tsos,
-				       const edm::EventSetup &setup,
-				       const EventInfo &eventInfo) const
-{
+std::vector<IntegratedCalibrationBase::Values> IntegratedCalibrationBase::derivatives(
+    const TrackingRecHit &hit,
+    const TrajectoryStateOnSurface &tsos,
+    const edm::EventSetup &setup,
+    const EventInfo &eventInfo) const {
   // Prepare result vector, initialised all with 0.:
-  std::vector<Values> result(this->numParameters(), Values(0.,0.));
+  std::vector<Values> result(this->numParameters(), Values(0., 0.));
 
   // Get non-zero derivatives and their index:
   std::vector<ValuesIndexPair> derivsIndexPairs;
-  const unsigned int numNonZero = this->derivatives(derivsIndexPairs,
-						    hit, tsos, setup,
-						    eventInfo);
+  const unsigned int numNonZero = this->derivatives(derivsIndexPairs, hit, tsos, setup, eventInfo);
 
   // Put non-zero values into result:
   for (unsigned int i = 0; i < numNonZero; ++i) {
diff --git a/Alignment/CommonAlignmentAlgorithm/src/IntegratedCalibrationPluginFactory.cc b/Alignment/CommonAlignmentAlgorithm/src/IntegratedCalibrationPluginFactory.cc
index b66cb0b29c216..e9d8d0543cbb6 100644
--- a/Alignment/CommonAlignmentAlgorithm/src/IntegratedCalibrationPluginFactory.cc
+++ b/Alignment/CommonAlignmentAlgorithm/src/IntegratedCalibrationPluginFactory.cc
@@ -7,10 +7,6 @@
 ///  (last update by $Author: mussgill $)
 ///
 
-
 #include "Alignment/CommonAlignmentAlgorithm/interface/IntegratedCalibrationPluginFactory.h"
 
-EDM_REGISTER_PLUGINFACTORY(IntegratedCalibrationPluginFactory,
-			   "IntegratedCalibrationPluginFactory");
-
-
+EDM_REGISTER_PLUGINFACTORY(IntegratedCalibrationPluginFactory, "IntegratedCalibrationPluginFactory");
diff --git a/Alignment/CommonAlignmentAlgorithm/src/TkModuleGroupSelector.cc b/Alignment/CommonAlignmentAlgorithm/src/TkModuleGroupSelector.cc
index e96383f179a09..cacad8c4c3251 100644
--- a/Alignment/CommonAlignmentAlgorithm/src/TkModuleGroupSelector.cc
+++ b/Alignment/CommonAlignmentAlgorithm/src/TkModuleGroupSelector.cc
@@ -21,229 +21,193 @@
 //============================================================================
 TkModuleGroupSelector::TkModuleGroupSelector(AlignableTracker *aliTracker,
                                              const edm::ParameterSet &cfg,
-                                             const std::vector<int> &sdets
-                                             ) : nparameters_(0),
-                                                 subdetids_(sdets)
-{
+                                             const std::vector<int> &sdets)
+    : nparameters_(0), subdetids_(sdets) {
   //verify that all provided options are known
   std::vector<std::string> parameterNames = cfg.getParameterNames();
-  for ( std::vector<std::string>::const_iterator iParam = parameterNames.begin(); 
-        iParam != parameterNames.end(); ++iParam) {
+  for (std::vector<std::string>::const_iterator iParam = parameterNames.begin(); iParam != parameterNames.end();
+       ++iParam) {
     const std::string name = (*iParam);
-    if(
-       name != "RunRange" && name != "ReferenceRun" && name != "Granularity"
-       ) {
-      throw cms::Exception("BadConfig")
-        << "@SUB=TkModuleGroupSelector::TkModuleGroupSelector:"
-        << " Unknown parameter name '" << name << "' in PSet. Maybe a typo?";
+    if (name != "RunRange" && name != "ReferenceRun" && name != "Granularity") {
+      throw cms::Exception("BadConfig") << "@SUB=TkModuleGroupSelector::TkModuleGroupSelector:"
+                                        << " Unknown parameter name '" << name << "' in PSet. Maybe a typo?";
     }
   }
-  
 
   //extract the reference run range if defined
-  const edm::RunNumber_t defaultReferenceRun
-    = (cfg.exists("ReferenceRun") ? cfg.getParameter<edm::RunNumber_t>("ReferenceRun") : 0);
+  const edm::RunNumber_t defaultReferenceRun =
+      (cfg.exists("ReferenceRun") ? cfg.getParameter<edm::RunNumber_t>("ReferenceRun") : 0);
 
   //extract run range to be used for all module groups (if not locally overwritten)
-  const std::vector<edm::RunNumber_t> defaultRunRange
-    = (cfg.exists("RunRange") ? cfg.getParameter<std::vector<edm::RunNumber_t> >("RunRange")
-       : std::vector<edm::RunNumber_t>());
+  const std::vector<edm::RunNumber_t> defaultRunRange =
+      (cfg.exists("RunRange") ? cfg.getParameter<std::vector<edm::RunNumber_t> >("RunRange")
+                              : std::vector<edm::RunNumber_t>());
 
   // finally create everything from configuration
-  this->createModuleGroups(aliTracker, cfg.getParameter<edm::VParameterSet>("Granularity"),
-                           defaultRunRange, defaultReferenceRun);
+  this->createModuleGroups(
+      aliTracker, cfg.getParameter<edm::VParameterSet>("Granularity"), defaultRunRange, defaultReferenceRun);
 }
 
 //============================================================================
-void TkModuleGroupSelector::fillDetIdMap(const unsigned int detid, const unsigned int groupid)
-{
-  //only add new entries 
-  if(mapDetIdGroupId_.find(detid) == mapDetIdGroupId_.end()) {
+void TkModuleGroupSelector::fillDetIdMap(const unsigned int detid, const unsigned int groupid) {
+  //only add new entries
+  if (mapDetIdGroupId_.find(detid) == mapDetIdGroupId_.end()) {
     mapDetIdGroupId_.insert(std::pair<unsigned int, unsigned int>(detid, groupid));
   } else {
-    throw cms::Exception("BadConfig")
-      << "@SUB=TkModuleGroupSelector:fillDetIdMap:"
-      << " Module with det ID " << detid << " configured in group " << groupid
-      << " but it was already selected"
-      << " in group " << mapDetIdGroupId_[detid] << ".";
+    throw cms::Exception("BadConfig") << "@SUB=TkModuleGroupSelector:fillDetIdMap:"
+                                      << " Module with det ID " << detid << " configured in group " << groupid
+                                      << " but it was already selected"
+                                      << " in group " << mapDetIdGroupId_[detid] << ".";
   }
 }
 
 //============================================================================
-const bool TkModuleGroupSelector::testSplitOption(const edm::ParameterSet &pset) const
-{
+const bool TkModuleGroupSelector::testSplitOption(const edm::ParameterSet &pset) const {
   bool split = false;
-  if(pset.exists("split")) {
+  if (pset.exists("split")) {
     split = pset.getParameter<bool>("split");
   }
   return split;
 }
 
 //============================================================================
-bool TkModuleGroupSelector::createGroup(
-                                        unsigned int &Id, 
-                                        const std::vector<edm::RunNumber_t> &range, 
-                                        const std::list<Alignable*> &selected_alis,
-                                        const edm::RunNumber_t refrun
-                                        )
-{
+bool TkModuleGroupSelector::createGroup(unsigned int &Id,
+                                        const std::vector<edm::RunNumber_t> &range,
+                                        const std::list<Alignable *> &selected_alis,
+                                        const edm::RunNumber_t refrun) {
   bool modules_selected = false;
 
   referenceRun_.push_back(refrun);
   firstId_.push_back(Id);
   runRange_.push_back(range);
-  for(std::list<Alignable*>::const_iterator it = selected_alis.begin();
-      it != selected_alis.end(); ++it) {
-    this->fillDetIdMap((*it)->id(), firstId_.size()-1);
+  for (std::list<Alignable *>::const_iterator it = selected_alis.begin(); it != selected_alis.end(); ++it) {
+    this->fillDetIdMap((*it)->id(), firstId_.size() - 1);
     modules_selected = true;
   }
-  if(refrun > 0 && !range.empty()) { //FIXME: last condition not really needed?
+  if (refrun > 0 && !range.empty()) {  //FIXME: last condition not really needed?
     Id += range.size() - 1;
     nparameters_ += range.size() - 1;
   } else {
     Id += range.size();
-    nparameters_ += range.size();  
+    nparameters_ += range.size();
   }
 
-  if(refrun > 0 && range.front() > refrun) { //range.size() > 0 checked before
-    throw cms::Exception("BadConfig")
-      << "@SUB=TkModuleGroupSelector::createGroup:\n"
-      << "Invalid combination of reference run number and specified run dependence"
-      << "\n in module group " << firstId_.size() << "."
-      << "\n Reference run number (" << refrun << ") is smaller than starting run "
-      << "\n number (" << range.front() << ") of first IOV.";
+  if (refrun > 0 && range.front() > refrun) {  //range.size() > 0 checked before
+    throw cms::Exception("BadConfig") << "@SUB=TkModuleGroupSelector::createGroup:\n"
+                                      << "Invalid combination of reference run number and specified run dependence"
+                                      << "\n in module group " << firstId_.size() << "."
+                                      << "\n Reference run number (" << refrun << ") is smaller than starting run "
+                                      << "\n number (" << range.front() << ") of first IOV.";
   }
   return modules_selected;
 }
 
 //============================================================================
-void TkModuleGroupSelector::verifyParameterNames(const edm::ParameterSet &pset, unsigned int psetnr) const
-{
+void TkModuleGroupSelector::verifyParameterNames(const edm::ParameterSet &pset, unsigned int psetnr) const {
   std::vector<std::string> parameterNames = pset.getParameterNames();
-  for ( std::vector<std::string>::const_iterator iParam = parameterNames.begin(); 
-        iParam != parameterNames.end(); ++iParam) {
+  for (std::vector<std::string>::const_iterator iParam = parameterNames.begin(); iParam != parameterNames.end();
+       ++iParam) {
     const std::string name = (*iParam);
-    if(
-       name != "levels" && name != "RunRange"
-       && name != "split" && name != "ReferenceRun"
-       ) {
-      throw cms::Exception("BadConfig")
-        << "@SUB=TkModuleGroupSelector::verifyParameterNames:"
-        << " Unknown parameter name '" << name << "' in PSet number " << psetnr << ". Maybe a typo?";
+    if (name != "levels" && name != "RunRange" && name != "split" && name != "ReferenceRun") {
+      throw cms::Exception("BadConfig") << "@SUB=TkModuleGroupSelector::verifyParameterNames:"
+                                        << " Unknown parameter name '" << name << "' in PSet number " << psetnr
+                                        << ". Maybe a typo?";
     }
   }
 }
 
-
 //============================================================================
 void TkModuleGroupSelector::createModuleGroups(AlignableTracker *aliTracker,
                                                const edm::VParameterSet &granularityConfig,
                                                const std::vector<edm::RunNumber_t> &defaultRunRange,
-                                               edm::RunNumber_t defaultReferenceRun)
-{
+                                               edm::RunNumber_t defaultReferenceRun) {
   std::set<edm::RunNumber_t> localRunRange;
   nparameters_ = 0;
   unsigned int Id = 0;
   unsigned int psetnr = 0;
   //loop over all LA groups
-  for(edm::VParameterSet::const_iterator pset = granularityConfig.begin();
-      pset != granularityConfig.end();
-      ++pset) {
-
+  for (edm::VParameterSet::const_iterator pset = granularityConfig.begin(); pset != granularityConfig.end(); ++pset) {
     //test for unknown parameters
-    this->verifyParameterNames((*pset),psetnr);
+    this->verifyParameterNames((*pset), psetnr);
     psetnr++;
 
-    bool modules_selected = false; //track whether at all a module has been selected in this group
+    bool modules_selected = false;  //track whether at all a module has been selected in this group
     const std::vector<edm::RunNumber_t> range =
-      ((*pset).exists("RunRange") ? pset->getParameter<std::vector<edm::RunNumber_t> >("RunRange")
-       : defaultRunRange);
-    if(range.empty()) {
-      throw cms::Exception("BadConfig")
-        << "@SUB=TkModuleGroupSelector::createModuleGroups:\n"
-        << "Run range array empty!";
+        ((*pset).exists("RunRange") ? pset->getParameter<std::vector<edm::RunNumber_t> >("RunRange") : defaultRunRange);
+    if (range.empty()) {
+      throw cms::Exception("BadConfig") << "@SUB=TkModuleGroupSelector::createModuleGroups:\n"
+                                        << "Run range array empty!";
     }
     const bool split = this->testSplitOption((*pset));
 
     edm::RunNumber_t refrun = 0;
-    if((*pset).exists("ReferenceRun")) {
+    if ((*pset).exists("ReferenceRun")) {
       refrun = (*pset).getParameter<edm::RunNumber_t>("ReferenceRun");
     } else {
       refrun = defaultReferenceRun;
     }
-    
+
     AlignmentParameterSelector selector(aliTracker);
     selector.clear();
-    selector.addSelections((*pset).getParameter<edm::ParameterSet> ("levels"));
-
-    const auto& alis = selector.selectedAlignables();
-    std::list<Alignable*> selected_alis;
-    for(const auto& it: alis) {
-      const auto& aliDaughts = it->deepComponents();
-      for (const auto& iD: aliDaughts) {
-        if(iD->alignableObjectId() == align::AlignableDetUnit || iD->alignableObjectId() == align::AlignableDet) {
-          if(split) {
-            modules_selected = this->createGroup(Id, range, std::list<Alignable*>(1,iD), refrun);
+    selector.addSelections((*pset).getParameter<edm::ParameterSet>("levels"));
+
+    const auto &alis = selector.selectedAlignables();
+    std::list<Alignable *> selected_alis;
+    for (const auto &it : alis) {
+      const auto &aliDaughts = it->deepComponents();
+      for (const auto &iD : aliDaughts) {
+        if (iD->alignableObjectId() == align::AlignableDetUnit || iD->alignableObjectId() == align::AlignableDet) {
+          if (split) {
+            modules_selected = this->createGroup(Id, range, std::list<Alignable *>(1, iD), refrun);
           } else {
             selected_alis.push_back(iD);
           }
         }
       }
     }
-    
-    if(!split) {
+
+    if (!split) {
       modules_selected = this->createGroup(Id, range, selected_alis, refrun);
     }
-        
-    edm::RunNumber_t firstRun = 0; 
-    for(std::vector<edm::RunNumber_t>::const_iterator iRun = range.begin(); 
-        iRun != range.end(); ++iRun)  {
+
+    edm::RunNumber_t firstRun = 0;
+    for (std::vector<edm::RunNumber_t>::const_iterator iRun = range.begin(); iRun != range.end(); ++iRun) {
       localRunRange.insert((*iRun));
-      if((*iRun) > firstRun) {
+      if ((*iRun) > firstRun) {
         firstRun = (*iRun);
       } else {
-        throw cms::Exception("BadConfig")
-          << "@SUB=TkModuleGroupSelector::createModuleGroups:"
-          << " Run range not sorted.";
+        throw cms::Exception("BadConfig") << "@SUB=TkModuleGroupSelector::createModuleGroups:"
+                                          << " Run range not sorted.";
       }
     }
 
-    if(!modules_selected) {
-      throw cms::Exception("BadConfig") 
-        << "@SUB=TkModuleGroupSelector:createModuleGroups:"
-        << " No module was selected in the module group selector in group " << (firstId_.size()-1)<< ".";
+    if (!modules_selected) {
+      throw cms::Exception("BadConfig") << "@SUB=TkModuleGroupSelector:createModuleGroups:"
+                                        << " No module was selected in the module group selector in group "
+                                        << (firstId_.size() - 1) << ".";
     }
   }
 
   //copy local set into the global vector of run boundaries
-  for(std::set<edm::RunNumber_t>::const_iterator itRun = localRunRange.begin();
-      itRun != localRunRange.end(); ++itRun) {
+  for (std::set<edm::RunNumber_t>::const_iterator itRun = localRunRange.begin(); itRun != localRunRange.end();
+       ++itRun) {
     globalRunRange_.push_back((*itRun));
   }
 }
 
 //============================================================================
-unsigned int TkModuleGroupSelector::getNumberOfParameters() const
-{
-  return nparameters_;
-}
+unsigned int TkModuleGroupSelector::getNumberOfParameters() const { return nparameters_; }
 
 //============================================================================
-unsigned int TkModuleGroupSelector::numIovs() const
-{
-  return globalRunRange_.size();
-}
+unsigned int TkModuleGroupSelector::numIovs() const { return globalRunRange_.size(); }
 
 //============================================================================
-edm::RunNumber_t TkModuleGroupSelector::firstRunOfIOV(unsigned int iovNum) const
-{
+edm::RunNumber_t TkModuleGroupSelector::firstRunOfIOV(unsigned int iovNum) const {
   return iovNum < this->numIovs() ? globalRunRange_.at(iovNum) : 0;
 }
 
 //======================================================================
-int TkModuleGroupSelector::getParameterIndexFromDetId(unsigned int detId,
-                                                      edm::RunNumber_t run) const
-{
+int TkModuleGroupSelector::getParameterIndexFromDetId(unsigned int detId, edm::RunNumber_t run) const {
   // Return the index of the parameter that is used for this DetId.
   // If this DetId is not treated, return values < 0.
 
@@ -252,48 +216,47 @@ int TkModuleGroupSelector::getParameterIndexFromDetId(unsigned int detId,
   int index = -1;
 
   bool sel = false;
-  for(std::vector<int>::const_iterator itSubDets = subdetids_.begin();
-      itSubDets != subdetids_.end();
-      ++itSubDets) {
+  for (std::vector<int>::const_iterator itSubDets = subdetids_.begin(); itSubDets != subdetids_.end(); ++itSubDets) {
     if (temp_id.det() == DetId::Tracker && temp_id.subdetId() == (*itSubDets)) {
       sel = true;
       break;
     }
   }
 
-  if (temp_id.det() != DetId::Tracker || !sel) return -1;
-  
+  if (temp_id.det() != DetId::Tracker || !sel)
+    return -1;
+
   std::map<unsigned int, unsigned int>::const_iterator it = mapDetIdGroupId_.find(detId);
-  if(it != mapDetIdGroupId_.end()) {
+  if (it != mapDetIdGroupId_.end()) {
     const unsigned int iAlignableGroup = (*it).second;
     const std::vector<edm::RunNumber_t> &runs = runRange_.at(iAlignableGroup);
     const unsigned int id0 = firstId_.at(iAlignableGroup);
     const edm::RunNumber_t refrun = referenceRun_.at(iAlignableGroup);
 
-
     unsigned int iovNum = 0;
-    for ( ; iovNum < runs.size(); ++iovNum) {
-      if (runs[iovNum] > run) break;
+    for (; iovNum < runs.size(); ++iovNum) {
+      if (runs[iovNum] > run)
+        break;
     }
     if (iovNum == 0) {
       throw cms::Exception("BadConfig") << "@SUB=TkModuleGroupSelector::getParameterIndexFromDetId:\n"
-                                        << "Run " << run << " not foreseen for detid '"<< detId <<"'"
-                                        << " in module group " << iAlignableGroup << ".";        
+                                        << "Run " << run << " not foreseen for detid '" << detId << "'"
+                                        << " in module group " << iAlignableGroup << ".";
     } else {
       --iovNum;
     }
 
     //test whether the iov contains the reference run
-    if(refrun > 0) { //if > 0 a reference run number has been provided
-      if(iovNum+1 == runs.size()) {
-        if(refrun >= runs[iovNum])
+    if (refrun > 0) {  //if > 0 a reference run number has been provided
+      if (iovNum + 1 == runs.size()) {
+        if (refrun >= runs[iovNum])
           return -1;
-      } else if( (iovNum+1) < runs.size()) {
-        if(refrun >= runs[iovNum] && refrun < runs[iovNum+1]) {
+      } else if ((iovNum + 1) < runs.size()) {
+        if (refrun >= runs[iovNum] && refrun < runs[iovNum + 1]) {
           return -1;
         }
-      } 
-      if(run > refrun) {
+      }
+      if (run > refrun) {
         //iovNum > 0 due to checks in createGroup(...) and createModuleGroups(...)
         //remove IOV in which the reference run can be found
         iovNum -= 1;
diff --git a/Alignment/CommonAlignmentParametrization/interface/AlignmentParametersFactory.h b/Alignment/CommonAlignmentParametrization/interface/AlignmentParametersFactory.h
index b94e54b3d7179..b72c6d83ecb07 100644
--- a/Alignment/CommonAlignmentParametrization/interface/AlignmentParametersFactory.h
+++ b/Alignment/CommonAlignmentParametrization/interface/AlignmentParametersFactory.h
@@ -1,8 +1,8 @@
-#ifndef Alignment_CommonAlignmentParametrization_AlignmentParametersFactory_h 
-#define Alignment_CommonAlignmentParametrization_AlignmentParametersFactory_h 
+#ifndef Alignment_CommonAlignmentParametrization_AlignmentParametersFactory_h
+#define Alignment_CommonAlignmentParametrization_AlignmentParametersFactory_h
 
 /// \namespace AlignmentParametersFactory
-///  
+///
 /// Factory interface to create AlignmentParameters for the known types,
 /// defined by the enum AlignmentParametersFactory::ParametersType.
 ///
@@ -10,8 +10,8 @@
 ///  $Revision: 1.4 $
 /// (last update by $Author: mussgill $)
 
-#include <vector>
 #include <string>
+#include <vector>
 
 class Alignable;
 class AlignmentParameters;
@@ -19,25 +19,27 @@ class AlignmentParameters;
 namespace AlignmentParametersFactory {
   /// enums for all available AlignmentParameters
   enum ParametersType {
-    kRigidBody = 0, // RigidBodyAlignmentParameters
-    kSurvey,  // SurveyParameters GF: do not belong here, so remove in the long term...
-    kRigidBody4D, // RigidBodyAlignmentParameters4D
-    kBeamSpot, // BeamSpotAlignmentParameters
-    kBowedSurface, // BowedSurfaceAlignmentParameters
-    kTwoBowedSurfaces // TwoBowedSurfacesAlignmentParameters
+    kRigidBody = 0,    // RigidBodyAlignmentParameters
+    kSurvey,           // SurveyParameters GF: do not belong here, so remove in the long
+                       // term...
+    kRigidBody4D,      // RigidBodyAlignmentParameters4D
+    kBeamSpot,         // BeamSpotAlignmentParameters
+    kBowedSurface,     // BowedSurfaceAlignmentParameters
+    kTwoBowedSurfaces  // TwoBowedSurfacesAlignmentParameters
   };
 
   /// convert string to ParametersType - exception if not known
   ParametersType parametersType(const std::string &typeString);
-  /// convert int to ParametersType (if same value) - exception if no corresponding type
+  /// convert int to ParametersType (if same value) - exception if no
+  /// corresponding type
   ParametersType parametersType(int typeInt);
-  /// convert ParametersType to string understood by parametersType(string &typeString)
+  /// convert ParametersType to string understood by parametersType(string
+  /// &typeString)
   std::string parametersTypeName(ParametersType parType);
 
-  /// create AlignmentParameters of type 'parType' for Alignable 'ali' with selection
-  /// 'sel' for active parameters
-  AlignmentParameters* createParameters(Alignable *ali, ParametersType parType,
-					const std::vector<bool> &sel);
-}
+  /// create AlignmentParameters of type 'parType' for Alignable 'ali' with
+  /// selection 'sel' for active parameters
+  AlignmentParameters *createParameters(Alignable *ali, ParametersType parType, const std::vector<bool> &sel);
+}  // namespace AlignmentParametersFactory
 
 #endif
diff --git a/Alignment/CommonAlignmentParametrization/interface/BeamSpotAlignmentDerivatives.h b/Alignment/CommonAlignmentParametrization/interface/BeamSpotAlignmentDerivatives.h
index 89962f82baa51..5fc44988bffe2 100644
--- a/Alignment/CommonAlignmentParametrization/interface/BeamSpotAlignmentDerivatives.h
+++ b/Alignment/CommonAlignmentParametrization/interface/BeamSpotAlignmentDerivatives.h
@@ -13,14 +13,10 @@
 
 class TrajectoryStateOnSurface;
 
-class BeamSpotAlignmentDerivatives
-{
+class BeamSpotAlignmentDerivatives {
 public:
-  
   /// Returns 4x2 jacobian matrix
   AlgebraicMatrix operator()(const TrajectoryStateOnSurface &tsos) const;
-  
 };
 
 #endif
-
diff --git a/Alignment/CommonAlignmentParametrization/interface/BeamSpotAlignmentParameters.h b/Alignment/CommonAlignmentParametrization/interface/BeamSpotAlignmentParameters.h
index d19b8327457ef..c8faaf0d4933f 100644
--- a/Alignment/CommonAlignmentParametrization/interface/BeamSpotAlignmentParameters.h
+++ b/Alignment/CommonAlignmentParametrization/interface/BeamSpotAlignmentParameters.h
@@ -6,7 +6,7 @@
 
 /// \class BeamSpotAlignmentParameters
 ///
-/// Concrete class for alignment parameters and associated quantities 
+/// Concrete class for alignment parameters and associated quantities
 /// [derived from AlignmentParameters]. The number of parameters
 /// N_PARAM is fixed to 4 (2 translations in x & y, and 2 slopes)
 ///
@@ -18,53 +18,46 @@ class Alignable;
 class AlignableDetOrUnitPtr;
 class TrajectoryStateOnSurface;
 
-class BeamSpotAlignmentParameters : public AlignmentParameters 
-{
-
+class BeamSpotAlignmentParameters : public AlignmentParameters {
 public:
-
   /// Give parameters a name
-  enum AlignmentParameterName 
-	{
-	  dx = 0, dy,
-	  dxslope, dyslope,
-	  N_PARAM
-	};
-  
-  /// Constructor with empty parameters/covariance (if calcMis = false) or with parameters
-  /// (no covariance) created from current (mis-)placement of alignable (if calcMis = true).
-  BeamSpotAlignmentParameters( Alignable* alignable, bool calcMis );
+  enum AlignmentParameterName { dx = 0, dy, dxslope, dyslope, N_PARAM };
+
+  /// Constructor with empty parameters/covariance (if calcMis = false) or with
+  /// parameters (no covariance) created from current (mis-)placement of
+  /// alignable (if calcMis = true).
+  BeamSpotAlignmentParameters(Alignable *alignable, bool calcMis);
 
   /// Constructor for full set of parameters
-  BeamSpotAlignmentParameters( Alignable* alignable, 
-			       const AlgebraicVector& parameters, 
-			       const AlgebraicSymMatrix& covMatrix );
+  BeamSpotAlignmentParameters(Alignable *alignable,
+                              const AlgebraicVector &parameters,
+                              const AlgebraicSymMatrix &covMatrix);
 
-  /// Constructor for selection 
-  BeamSpotAlignmentParameters( Alignable* alignable, const AlgebraicVector& parameters, 
-			       const AlgebraicSymMatrix& covMatrix, 
-			       const std::vector<bool>& selection );
+  /// Constructor for selection
+  BeamSpotAlignmentParameters(Alignable *alignable,
+                              const AlgebraicVector &parameters,
+                              const AlgebraicSymMatrix &covMatrix,
+                              const std::vector<bool> &selection);
 
-  /// Destructor 
+  /// Destructor
   ~BeamSpotAlignmentParameters() override;
   void apply() override;
   int type() const override;
 
   /// Clone all parameters (for update of parameters)
-  BeamSpotAlignmentParameters* clone( const AlgebraicVector& parameters, 
-					      const AlgebraicSymMatrix& covMatrix ) const override;
- 
+  BeamSpotAlignmentParameters *clone(const AlgebraicVector &parameters,
+                                     const AlgebraicSymMatrix &covMatrix) const override;
+
   /// Clone selected parameters (for update of parameters)
-  BeamSpotAlignmentParameters*
-    cloneFromSelected(const AlgebraicVector& parameters, const AlgebraicSymMatrix& covMatrix) const override;
-  
-  /// Get all derivatives 
-  AlgebraicMatrix derivatives( const TrajectoryStateOnSurface& tsos,
-				       const AlignableDetOrUnitPtr & ) const override;
+  BeamSpotAlignmentParameters *cloneFromSelected(const AlgebraicVector &parameters,
+                                                 const AlgebraicSymMatrix &covMatrix) const override;
+
+  /// Get all derivatives
+  AlgebraicMatrix derivatives(const TrajectoryStateOnSurface &tsos, const AlignableDetOrUnitPtr &) const override;
 
   /// Get selected derivatives
-  AlgebraicMatrix selectedDerivatives( const TrajectoryStateOnSurface& tsos, 
-					       const AlignableDetOrUnitPtr & ) const override;
+  AlgebraicMatrix selectedDerivatives(const TrajectoryStateOnSurface &tsos,
+                                      const AlignableDetOrUnitPtr &) const override;
 
   /// Get translation parameters
   AlgebraicVector translation(void) const;
@@ -72,15 +65,15 @@ class BeamSpotAlignmentParameters : public AlignmentParameters
   /// Get rotation parameters
   AlgebraicVector rotation(void) const;
 
-  /// calculate and return parameters in global frame 
+  /// calculate and return parameters in global frame
   AlgebraicVector globalParameters(void) const;
 
-  /// print parameters to screen 
+  /// print parameters to screen
   void print(void) const;
 
-  /// Calculate parameter vector of misplacements (shift+rotation) from alignable.
-  /// (If ali=0, return empty AlgebraicVector of proper length.)
-  static AlgebraicVector displacementFromAlignable(const Alignable* ali);
+  /// Calculate parameter vector of misplacements (shift+rotation) from
+  /// alignable. (If ali=0, return empty AlgebraicVector of proper length.)
+  static AlgebraicVector displacementFromAlignable(const Alignable *ali);
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentDerivatives.h b/Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentDerivatives.h
index f6627d03df436..ea7cb00277caa 100644
--- a/Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentDerivatives.h
+++ b/Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentDerivatives.h
@@ -22,26 +22,30 @@
 
 class TrajectoryStateOnSurface;
 
-class BowedSurfaceAlignmentDerivatives 
-{
+class BowedSurfaceAlignmentDerivatives {
 public:
-  
   enum AlignmentParameterName {
-    dx = 0, dy, dz,
-    dslopeX, // NOTE: slope(u) -> k*tan(beta), 
-    dslopeY, //       slope(v) -> k*tan(alpha)
-    drotZ,   // rotation around w axis, scaled by gammaScale
-    dsagittaX, dsagittaXY, dsagittaY,
+    dx = 0,
+    dy,
+    dz,
+    dslopeX,  // NOTE: slope(u) -> k*tan(beta),
+    dslopeY,  //       slope(v) -> k*tan(alpha)
+    drotZ,    // rotation around w axis, scaled by gammaScale
+    dsagittaX,
+    dsagittaXY,
+    dsagittaY,
     N_PARAM
   };
 
   /// Returns 9x2 jacobian matrix
   AlgebraicMatrix operator()(const TrajectoryStateOnSurface &tsos,
-			     double uWidth, double vLength,
-			     bool doSplit = false, double ySplit = 0.) const;
+                             double uWidth,
+                             double vLength,
+                             bool doSplit = false,
+                             double ySplit = 0.) const;
 
   /// scale to apply to convert drotZ to karimaki-gamma,
-  /// depending on module width and length (the latter after splitting!)  
+  /// depending on module width and length (the latter after splitting!)
   static double gammaScale(double width, double splitLength);
 };
 
diff --git a/Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentParameters.h b/Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentParameters.h
index 5a215828c68e4..d7009029e4376 100644
--- a/Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentParameters.h
+++ b/Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentParameters.h
@@ -2,15 +2,15 @@
 #define Alignment_CommonAlignment_BowedSurfaceAlignmentParameters_h
 
 #include "Alignment/CommonAlignment/interface/AlignmentParameters.h"
-#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
 #include "CondFormats/Alignment/interface/Definitions.h"
+#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
 
 #include "Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentDerivatives.h"
 
 /// \class BowedSurfaceAlignmentParameters
 ///
-/// Concrete class for alignment parameters and associated quantities 
-/// [derived from AlignmentParameters]. 
+/// Concrete class for alignment parameters and associated quantities
+/// [derived from AlignmentParameters].
 /// The number of parameters N_PARAM is 9
 ///  - 3 translations
 ///  - 3 rotations/slopes
@@ -24,8 +24,7 @@ class Alignable;
 class AlignableDetOrUnitPtr;
 class TrajectoryStateOnSurface;
 
-class BowedSurfaceAlignmentParameters : public AlignmentParameters 
-{
+class BowedSurfaceAlignmentParameters : public AlignmentParameters {
 public:
   /// Give parameters a name
   typedef BowedSurfaceAlignmentDerivatives BowedDerivs;
@@ -33,9 +32,9 @@ class BowedSurfaceAlignmentParameters : public AlignmentParameters
     dx = BowedDerivs::dx,
     dy = BowedDerivs::dy,
     dz = BowedDerivs::dz,
-    dslopeX = BowedDerivs::dslopeX, // NOTE: slope(u) -> k*tan(beta),
-    dslopeY = BowedDerivs::dslopeY, //       slope(v) -> l*tan(alpha)
-    drotZ   = BowedDerivs::drotZ,   //       rot(w)   -> m*gamma
+    dslopeX = BowedDerivs::dslopeX,  // NOTE: slope(u) -> k*tan(beta),
+    dslopeY = BowedDerivs::dslopeY,  //       slope(v) -> l*tan(alpha)
+    drotZ = BowedDerivs::drotZ,      //       rot(w)   -> m*gamma
     dsagittaX = BowedDerivs::dsagittaX,
     dsagittaXY = BowedDerivs::dsagittaXY,
     dsagittaY = BowedDerivs::dsagittaY,
@@ -46,42 +45,40 @@ class BowedSurfaceAlignmentParameters : public AlignmentParameters
   BowedSurfaceAlignmentParameters(Alignable *alignable);
 
   /// Constructor for full set of parameters
-  BowedSurfaceAlignmentParameters(Alignable *alignable, 
-			       const AlgebraicVector &parameters, 
-			       const AlgebraicSymMatrix &covMatrix);
+  BowedSurfaceAlignmentParameters(Alignable *alignable,
+                                  const AlgebraicVector &parameters,
+                                  const AlgebraicSymMatrix &covMatrix);
 
-  /// Constructor for selection 
-  BowedSurfaceAlignmentParameters(Alignable *alignable, const AlgebraicVector &parameters, 
-			       const AlgebraicSymMatrix &covMatrix, 
-			       const std::vector<bool> &selection);
+  /// Constructor for selection
+  BowedSurfaceAlignmentParameters(Alignable *alignable,
+                                  const AlgebraicVector &parameters,
+                                  const AlgebraicSymMatrix &covMatrix,
+                                  const std::vector<bool> &selection);
 
-  /// Destructor 
-  ~BowedSurfaceAlignmentParameters() override {};
+  /// Destructor
+  ~BowedSurfaceAlignmentParameters() override{};
   void apply() override;
   int type() const override;
 
   /// Clone all parameters (for update of parameters)
-  BowedSurfaceAlignmentParameters* clone(const AlgebraicVector &parameters, 
-						 const AlgebraicSymMatrix &covMatrix) const override;
- 
+  BowedSurfaceAlignmentParameters *clone(const AlgebraicVector &parameters,
+                                         const AlgebraicSymMatrix &covMatrix) const override;
+
   /// Clone selected parameters (for update of parameters)
-  BowedSurfaceAlignmentParameters*
-    cloneFromSelected(const AlgebraicVector &parameters,
-		      const AlgebraicSymMatrix &covMatrix) const override;
-  
-  /// Get all derivatives 
-  AlgebraicMatrix derivatives(const TrajectoryStateOnSurface &tsos,
-				      const AlignableDetOrUnitPtr &aliDet) const override;
+  BowedSurfaceAlignmentParameters *cloneFromSelected(const AlgebraicVector &parameters,
+                                                     const AlgebraicSymMatrix &covMatrix) const override;
+
+  /// Get all derivatives
+  AlgebraicMatrix derivatives(const TrajectoryStateOnSurface &tsos, const AlignableDetOrUnitPtr &aliDet) const override;
 
   /// Get translation parameters in double precision
   align::LocalVector translation() const;
 
-  /// Get rotation parameters 
+  /// Get rotation parameters
   align::EulerAngles rotation() const;
 
-  /// print parameters to screen 
+  /// print parameters to screen
   void print() const;
 };
 
 #endif
-
diff --git a/Alignment/CommonAlignmentParametrization/interface/CompositeAlignmentDerivativesExtractor.h b/Alignment/CommonAlignmentParametrization/interface/CompositeAlignmentDerivativesExtractor.h
index 8e3c10a1ad8da..b2ace06ddadb7 100644
--- a/Alignment/CommonAlignmentParametrization/interface/CompositeAlignmentDerivativesExtractor.h
+++ b/Alignment/CommonAlignmentParametrization/interface/CompositeAlignmentDerivativesExtractor.h
@@ -1,8 +1,8 @@
 #ifndef Alignment_CommonAlignmentParametrization_CompositeAlignmentDerivativesExtractor_H
 #define Alignment_CommonAlignmentParametrization_CompositeAlignmentDerivativesExtractor_H
 
-#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
 #include "Alignment/CommonAlignment/interface/Utilities.h"
+#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
 
 /// \class CompositeAlignmentDerivativesExtractor
 ///
@@ -17,42 +17,38 @@ class AlignableDet;
 class AlignableDetOrUnitPtr;
 class TrajectoryStateOnSurface;
 
-class CompositeAlignmentDerivativesExtractor
-{
-
+class CompositeAlignmentDerivativesExtractor {
 public:
-  
-  /// deprecated  constructor for backward compatibility (use mor general AlignableDetOrUnitPtr)
-  CompositeAlignmentDerivativesExtractor( const align::Alignables & alignables,
-					  const std::vector< AlignableDet* > & alignableDets,
-					  const std::vector< TrajectoryStateOnSurface > & tsos );
+  /// deprecated  constructor for backward compatibility (use mor general
+  /// AlignableDetOrUnitPtr)
+  CompositeAlignmentDerivativesExtractor(const align::Alignables &alignables,
+                                         const std::vector<AlignableDet *> &alignableDets,
+                                         const std::vector<TrajectoryStateOnSurface> &tsos);
   /// constructor
-  CompositeAlignmentDerivativesExtractor( const align::Alignables & alignables,
-					  const std::vector< AlignableDetOrUnitPtr > & alignableDets,
-					  const std::vector< TrajectoryStateOnSurface > & tsos );
+  CompositeAlignmentDerivativesExtractor(const align::Alignables &alignables,
+                                         const std::vector<AlignableDetOrUnitPtr> &alignableDets,
+                                         const std::vector<TrajectoryStateOnSurface> &tsos);
 
   /// destructor
-  ~CompositeAlignmentDerivativesExtractor( void ) {};
+  ~CompositeAlignmentDerivativesExtractor(void){};
+
+  const AlgebraicMatrix &derivatives(void) const { return theDerivatives; }
+  const AlgebraicVector &correctionTerm(void) const { return theCorrectionTerm; }
 
-  const AlgebraicMatrix & derivatives( void ) const { return theDerivatives; }
-  const AlgebraicVector & correctionTerm( void ) const { return theCorrectionTerm; }
-  
 private:
-  
-  void extractCurrentAlignment( const align::Alignables & alignables,
-				const std::vector< AlignableDetOrUnitPtr > & alignableDets,
-				const std::vector< TrajectoryStateOnSurface > & tsos );
-  
-  void extractWithoutMultipleHits( const std::vector< AlgebraicVector > & subCorrectionTerm,
-				   const std::vector< AlgebraicMatrix > & subDerivatives );
-  
-  void extractWithMultipleHits( const std::vector< AlgebraicVector > & subCorrectionTerm,
-				const std::vector< AlgebraicMatrix > & subDerivatives,
-				const align::Alignables & alignables );
-  
+  void extractCurrentAlignment(const align::Alignables &alignables,
+                               const std::vector<AlignableDetOrUnitPtr> &alignableDets,
+                               const std::vector<TrajectoryStateOnSurface> &tsos);
+
+  void extractWithoutMultipleHits(const std::vector<AlgebraicVector> &subCorrectionTerm,
+                                  const std::vector<AlgebraicMatrix> &subDerivatives);
+
+  void extractWithMultipleHits(const std::vector<AlgebraicVector> &subCorrectionTerm,
+                               const std::vector<AlgebraicMatrix> &subDerivatives,
+                               const align::Alignables &alignables);
+
   AlgebraicMatrix theDerivatives;
   AlgebraicVector theCorrectionTerm;
-  
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentParametrization/interface/CompositeAlignmentParameters.h b/Alignment/CommonAlignmentParametrization/interface/CompositeAlignmentParameters.h
index a5687f6d7fe56..dc9d247304248 100644
--- a/Alignment/CommonAlignmentParametrization/interface/CompositeAlignmentParameters.h
+++ b/Alignment/CommonAlignmentParametrization/interface/CompositeAlignmentParameters.h
@@ -1,9 +1,8 @@
 #ifndef Alignment_CommonAlignmentParametrization_CompositeAlignmentParameters_h
 #define Alignment_CommonAlignmentParametrization_CompositeAlignmentParameters_h
 
-
-#include "Alignment/CommonAlignment/interface/AlignmentParametersData.h"
 #include "Alignment/CommonAlignment/interface/AlignableDetOrUnitPtr.h"
+#include "Alignment/CommonAlignment/interface/AlignmentParametersData.h"
 #include "Alignment/CommonAlignment/interface/Utilities.h"
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 
@@ -14,9 +13,9 @@
 ///
 /// Class for 'concatenated' alignment parameters and associated
 /// Quantities for a set of Alignables. Provided by AlignmentParameterStore.
-/// It does not inherit from AligmentParameters since it does not need to be attached
-/// to an Alignable, so it does not need to have implementations of the apply(..) method.
-/// It neither needs AlignmentUservariables attached. 
+/// It does not inherit from AligmentParameters since it does not need to be
+/// attached to an Alignable, so it does not need to have implementations of the
+/// apply(..) method. It neither needs AlignmentUservariables attached.
 ///
 ///  $Date: 2007/10/08 15:56:00 $
 ///  $Revision: 1.12 $
@@ -25,132 +24,129 @@
 class AlignableDet;
 class Alignable;
 
-class CompositeAlignmentParameters
-{
-
+class CompositeAlignmentParameters {
 public:
-
-  /// vector of alignable components 
+  /// vector of alignable components
   typedef align::Alignables Components;
 
-  typedef std::map<AlignableDetOrUnitPtr,Alignable*> AlignableDetToAlignableMap;
-  typedef std::map<Alignable*,int> Aliposmap;
-  typedef std::map<Alignable*,int> Alilenmap;
+  typedef std::map<AlignableDetOrUnitPtr, Alignable *> AlignableDetToAlignableMap;
+  typedef std::map<Alignable *, int> Aliposmap;
+  typedef std::map<Alignable *, int> Alilenmap;
 
   typedef AlignmentParametersData::DataContainer DataContainer;
 
-  /// constructors 
+  /// constructors
 
-  CompositeAlignmentParameters(const AlgebraicVector& par, const AlgebraicSymMatrix& cov,
-			       const Components& comp);
+  CompositeAlignmentParameters(const AlgebraicVector &par, const AlgebraicSymMatrix &cov, const Components &comp);
 
-  CompositeAlignmentParameters(const AlgebraicVector& par, const AlgebraicSymMatrix& cov,
-			       const Components& comp, const AlignableDetToAlignableMap& alimap,
-			       const Aliposmap& aliposmap, const Alilenmap& alilenmap);
+  CompositeAlignmentParameters(const AlgebraicVector &par,
+                               const AlgebraicSymMatrix &cov,
+                               const Components &comp,
+                               const AlignableDetToAlignableMap &alimap,
+                               const Aliposmap &aliposmap,
+                               const Alilenmap &alilenmap);
 
-  CompositeAlignmentParameters( const DataContainer& data,
-				const Components& comp, const AlignableDetToAlignableMap& alimap,
-				const Aliposmap& aliposmap, const Alilenmap& alilenmap);
+  CompositeAlignmentParameters(const DataContainer &data,
+                               const Components &comp,
+                               const AlignableDetToAlignableMap &alimap,
+                               const Aliposmap &aliposmap,
+                               const Alilenmap &alilenmap);
 
-  /// destructor 
+  /// destructor
   virtual ~CompositeAlignmentParameters();
 
   /// Get alignment parameters
-  const AlgebraicVector& parameters() const { return theData->parameters();}
+  const AlgebraicVector &parameters() const { return theData->parameters(); }
 
   /// Get parameter covariance matrix
-  const AlgebraicSymMatrix& covariance() const { return theData->covariance();}
+  const AlgebraicSymMatrix &covariance() const { return theData->covariance(); }
 
   /// Clone parameters
-  CompositeAlignmentParameters* clone( const AlgebraicVector& par,
-				       const AlgebraicSymMatrix& cov) const;
+  CompositeAlignmentParameters *clone(const AlgebraicVector &par, const AlgebraicSymMatrix &cov) const;
 
   /// Clone parameters
-  CompositeAlignmentParameters* clone( const AlgebraicVector& par, const AlgebraicSymMatrix& cov,
-				       const AlignableDetToAlignableMap& alimap,
-				       const Aliposmap& aliposmap,
-				       const Alilenmap& alilenmap) const;
+  CompositeAlignmentParameters *clone(const AlgebraicVector &par,
+                                      const AlgebraicSymMatrix &cov,
+                                      const AlignableDetToAlignableMap &alimap,
+                                      const Aliposmap &aliposmap,
+                                      const Alilenmap &alilenmap) const;
 
-  /// Get vector of alignable components 
+  /// Get vector of alignable components
   Components components() const;
 
-  /// Get derivatives 
-  AlgebraicMatrix derivatives( const TrajectoryStateOnSurface& tsos, const AlignableDetOrUnitPtr &alidet ) const;
+  /// Get derivatives
+  AlgebraicMatrix derivatives(const TrajectoryStateOnSurface &tsos, const AlignableDetOrUnitPtr &alidet) const;
   /// Get derivatives for selected alignables
-  AlgebraicMatrix selectedDerivatives( const TrajectoryStateOnSurface& tsos, 
-				       const AlignableDetOrUnitPtr &alidet ) const;
+  AlgebraicMatrix selectedDerivatives(const TrajectoryStateOnSurface &tsos, const AlignableDetOrUnitPtr &alidet) const;
   /// for backward compatibility, use std::vector<AlignableDetOrUnitPtr>
-  AlgebraicMatrix derivatives( const std::vector<TrajectoryStateOnSurface>& tsosvec, 
-			       const std::vector<AlignableDet*>& alidetvec ) const;
-  AlgebraicMatrix derivatives( const std::vector<TrajectoryStateOnSurface>& tsosvec,
-			       const std::vector<AlignableDetOrUnitPtr>& alidetvec ) const;
+  AlgebraicMatrix derivatives(const std::vector<TrajectoryStateOnSurface> &tsosvec,
+                              const std::vector<AlignableDet *> &alidetvec) const;
+  AlgebraicMatrix derivatives(const std::vector<TrajectoryStateOnSurface> &tsosvec,
+                              const std::vector<AlignableDetOrUnitPtr> &alidetvec) const;
   /// for backward compatibility, use std::vector<AlignableDetOrUnitPtr>
-  AlgebraicMatrix selectedDerivatives( const std::vector<TrajectoryStateOnSurface> &tsosvec,
-				       const std::vector<AlignableDet*> &alidetvec ) const;
-  AlgebraicMatrix selectedDerivatives( const std::vector<TrajectoryStateOnSurface> &tsosvec,
- 				       const std::vector<AlignableDetOrUnitPtr> &alidetvec ) const;
+  AlgebraicMatrix selectedDerivatives(const std::vector<TrajectoryStateOnSurface> &tsosvec,
+                                      const std::vector<AlignableDet *> &alidetvec) const;
+  AlgebraicMatrix selectedDerivatives(const std::vector<TrajectoryStateOnSurface> &tsosvec,
+                                      const std::vector<AlignableDetOrUnitPtr> &alidetvec) const;
 
   /// for backward compatibility, use std::vector<AlignableDetOrUnitPtr>
-  AlgebraicVector correctionTerm( const std::vector<TrajectoryStateOnSurface>& tsosvec,
-				  const std::vector<AlignableDet*>& alidetvec ) const;
-  AlgebraicVector correctionTerm( const std::vector<TrajectoryStateOnSurface>& tsosvec,
- 				  const std::vector<AlignableDetOrUnitPtr>& alidetvec ) const;
-  /// deprecated due to 'AlignableDet*' interface (legacy code should not be needed anymore)
-  AlgebraicMatrix derivativesLegacy ( const TrajectoryStateOnSurface& tsos, 
-				      AlignableDet* alidet ) const;
-  /// deprecated due to 'AlignableDet*' interface (legacy code should not be needed anymore)
-  AlgebraicMatrix selectedDerivativesLegacy( const TrajectoryStateOnSurface& tsos, 
-					     AlignableDet* alidet ) const;
-  /// deprecated due to 'AlignableDet*' interface (legacy code should not be needed anymore)
-  AlgebraicMatrix derivativesLegacy( const std::vector<TrajectoryStateOnSurface>& tsosvec,
-				     const std::vector<AlignableDet*>& alidetvec ) const;
-  /// deprecated due to 'AlignableDet*' interface (legacy code should not be needed anymore)
-  AlgebraicMatrix selectedDerivativesLegacy( const std::vector<TrajectoryStateOnSurface>& tsosvec, 
-					     const std::vector<AlignableDet*>& alidetvec ) const;
-
-  /// Get relevant Alignable from AlignableDet 
-  Alignable* alignableFromAlignableDet( const AlignableDetOrUnitPtr& adet ) const;
-
+  AlgebraicVector correctionTerm(const std::vector<TrajectoryStateOnSurface> &tsosvec,
+                                 const std::vector<AlignableDet *> &alidetvec) const;
+  AlgebraicVector correctionTerm(const std::vector<TrajectoryStateOnSurface> &tsosvec,
+                                 const std::vector<AlignableDetOrUnitPtr> &alidetvec) const;
+  /// deprecated due to 'AlignableDet*' interface (legacy code should not be
+  /// needed anymore)
+  AlgebraicMatrix derivativesLegacy(const TrajectoryStateOnSurface &tsos, AlignableDet *alidet) const;
+  /// deprecated due to 'AlignableDet*' interface (legacy code should not be
+  /// needed anymore)
+  AlgebraicMatrix selectedDerivativesLegacy(const TrajectoryStateOnSurface &tsos, AlignableDet *alidet) const;
+  /// deprecated due to 'AlignableDet*' interface (legacy code should not be
+  /// needed anymore)
+  AlgebraicMatrix derivativesLegacy(const std::vector<TrajectoryStateOnSurface> &tsosvec,
+                                    const std::vector<AlignableDet *> &alidetvec) const;
+  /// deprecated due to 'AlignableDet*' interface (legacy code should not be
+  /// needed anymore)
+  AlgebraicMatrix selectedDerivativesLegacy(const std::vector<TrajectoryStateOnSurface> &tsosvec,
+                                            const std::vector<AlignableDet *> &alidetvec) const;
+
+  /// Get relevant Alignable from AlignableDet
+  Alignable *alignableFromAlignableDet(const AlignableDetOrUnitPtr &adet) const;
 
   /// Extract parameters for subset of alignables
-  AlgebraicVector parameterSubset (const align::Alignables&) const;
+  AlgebraicVector parameterSubset(const align::Alignables &) const;
 
   /// Extract covariance matrix for subset of alignables
-  AlgebraicSymMatrix covarianceSubset(const align::Alignables&) const;
+  AlgebraicSymMatrix covarianceSubset(const align::Alignables &) const;
 
   /// Extract covariance matrix elements between two subsets of alignables
-  AlgebraicMatrix covarianceSubset (const align::Alignables&,
-                                    const align::Alignables&) const;
+  AlgebraicMatrix covarianceSubset(const align::Alignables &, const align::Alignables &) const;
 
 protected:
   DataContainer theData;
 
 private:
-
   /// Extract position and length of parameters for a subset of Alignables.
-  bool extractPositionAndLength( const align::Alignables& alignables,
-				 std::vector<int>& posvec,
-				 std::vector<int>& lenvec,
-				 int& length ) const;
+  bool extractPositionAndLength(const align::Alignables &alignables,
+                                std::vector<int> &posvec,
+                                std::vector<int> &lenvec,
+                                int &length) const;
 
   /// Return vector of alignables without multiple occurences.
-  align::Alignables extractAlignables(const align::Alignables&) const;
+  align::Alignables extractAlignables(const align::Alignables &) const;
 
-  /// backward compatibility method to convert vectors from specific AlignableDet
-  /// to more general AlignableDetOrUnitPtr
-  void convert(const std::vector<AlignableDet*> &input,
-	       std::vector<AlignableDetOrUnitPtr> &output) const;
+  /// backward compatibility method to convert vectors from specific
+  /// AlignableDet to more general AlignableDetOrUnitPtr
+  void convert(const std::vector<AlignableDet *> &input, std::vector<AlignableDetOrUnitPtr> &output) const;
 
-  /// Vector of alignable components 
+  /// Vector of alignable components
   Components theComponents;
 
-  /// Relate Alignable's and AlignableDet's 
+  /// Relate Alignable's and AlignableDet's
   AlignableDetToAlignableMap theAlignableDetToAlignableMap;
 
-  /// Maps to find parameters/covariance elements for given alignable 
+  /// Maps to find parameters/covariance elements for given alignable
   Aliposmap theAliposmap;
   Alilenmap theAlilenmap;
-
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentParametrization/interface/FrameToFrameDerivative.h b/Alignment/CommonAlignmentParametrization/interface/FrameToFrameDerivative.h
index be6df6ef60c67..07a76dde3d1ac 100644
--- a/Alignment/CommonAlignmentParametrization/interface/FrameToFrameDerivative.h
+++ b/Alignment/CommonAlignmentParametrization/interface/FrameToFrameDerivative.h
@@ -17,10 +17,8 @@
 
 class Alignable;
 
-class FrameToFrameDerivative
-{
-  public:
-
+class FrameToFrameDerivative {
+public:
   /// Return the derivative DeltaFrame(object)/DeltaFrame(composedObject),
   /// i.e. a 6x6 matrix:
   ///
@@ -34,56 +32,57 @@ class FrameToFrameDerivative
   /// where u, v, w, a, b, g are shifts and rotations of the object
   /// and u_c, v_c, w_c, a_c, b_c, g_c those of the composed object.
 
-  AlgebraicMatrix frameToFrameDerivative(const Alignable* object,
-					 const Alignable* composedObject) const;
+  AlgebraicMatrix frameToFrameDerivative(const Alignable *object, const Alignable *composedObject) const;
 
-  /// Calculates derivatives DeltaFrame(object)/DeltaFrame(composedobject) 
-  /// using their positions and orientations, see method frameToFrameDerivative(..)
-  /// for definition.
-  /// As a new method it gets a new interface avoiding CLHEP that should anyway be
-  /// replaced by SMatrix at some point...
+  /// Calculates derivatives DeltaFrame(object)/DeltaFrame(composedobject)
+  /// using their positions and orientations, see method
+  /// frameToFrameDerivative(..) for definition. As a new method it gets a new
+  /// interface avoiding CLHEP that should anyway be replaced by SMatrix at some
+  /// point...
   AlgebraicMatrix66 getDerivative(const align::RotationType &objectRot,
-				  const align::RotationType &composeRot,
-				  const align::GlobalPoint &objectPos,
-				  const align::GlobalPoint &composePos) const;
+                                  const align::RotationType &composeRot,
+                                  const align::GlobalPoint &objectPos,
+                                  const align::GlobalPoint &composePos) const;
 
-  private:
+private:
   /// Helper to transform from RotationType to AlgebraicMatrix
-  inline static AlgebraicMatrix transform(const align::RotationType&);
+  inline static AlgebraicMatrix transform(const align::RotationType &);
 
-  /// Calculates derivatives using the orientation Matrixes and the origin difference vector
+  /// Calculates derivatives using the orientation Matrixes and the origin
+  /// difference vector
   AlgebraicMatrix getDerivative(const align::RotationType &objectRot,
-				const align::RotationType &composeRot,
-				const align::GlobalVector &posVec) const;
-  
-  /// Gets linear approximated euler Angles 
+                                const align::RotationType &composeRot,
+                                const align::GlobalVector &posVec) const;
+
+  /// Gets linear approximated euler Angles
   AlgebraicVector linearEulerAngles(const AlgebraicMatrix &rotDelta) const;
- 
-  /// Calculates the derivative DPos/DPos 
-  AlgebraicMatrix derivativePosPos(const AlgebraicMatrix &RotDet,
-				   const AlgebraicMatrix &RotRot) const;
 
-  /// Calculates the derivative DPos/DRot 
-  AlgebraicMatrix derivativePosRot(const AlgebraicMatrix &RotDet,
-				   const AlgebraicMatrix &RotRot,
-				   const AlgebraicVector &S) const;
+  /// Calculates the derivative DPos/DPos
+  AlgebraicMatrix derivativePosPos(const AlgebraicMatrix &RotDet, const AlgebraicMatrix &RotRot) const;
 
-  /// Calculates the derivative DRot/DRot 
-  AlgebraicMatrix derivativeRotRot(const AlgebraicMatrix &RotDet,
-				   const AlgebraicMatrix &RotRot) const;
+  /// Calculates the derivative DPos/DRot
+  AlgebraicMatrix derivativePosRot(const AlgebraicMatrix &RotDet,
+                                   const AlgebraicMatrix &RotRot,
+                                   const AlgebraicVector &S) const;
 
+  /// Calculates the derivative DRot/DRot
+  AlgebraicMatrix derivativeRotRot(const AlgebraicMatrix &RotDet, const AlgebraicMatrix &RotRot) const;
 };
 
-AlgebraicMatrix FrameToFrameDerivative::transform(const align::RotationType& rot)
-{
+AlgebraicMatrix FrameToFrameDerivative::transform(const align::RotationType &rot) {
   AlgebraicMatrix R(3, 3);
 
-  R(1, 1) = rot.xx(); R(1, 2) = rot.xy(); R(1, 3) = rot.xz();
-  R(2, 1) = rot.yx(); R(2, 2) = rot.yy(); R(2, 3) = rot.yz();
-  R(3, 1) = rot.zx(); R(3, 2) = rot.zy(); R(3, 3) = rot.zz();
+  R(1, 1) = rot.xx();
+  R(1, 2) = rot.xy();
+  R(1, 3) = rot.xz();
+  R(2, 1) = rot.yx();
+  R(2, 2) = rot.yy();
+  R(2, 3) = rot.yz();
+  R(3, 1) = rot.zx();
+  R(3, 2) = rot.zy();
+  R(3, 3) = rot.zz();
 
   return R;
 }
 
 #endif
-
diff --git a/Alignment/CommonAlignmentParametrization/interface/KarimakiAlignmentDerivatives.h b/Alignment/CommonAlignmentParametrization/interface/KarimakiAlignmentDerivatives.h
index bfd42102f33ec..14c052666f812 100644
--- a/Alignment/CommonAlignmentParametrization/interface/KarimakiAlignmentDerivatives.h
+++ b/Alignment/CommonAlignmentParametrization/interface/KarimakiAlignmentDerivatives.h
@@ -13,10 +13,8 @@
 
 class TrajectoryStateOnSurface;
 
-class KarimakiAlignmentDerivatives 
-{
+class KarimakiAlignmentDerivatives {
 public:
-  
   /// Returns 6x2 jacobian matrix of derivatives of residuals in x and y
   /// with respect to rigid body aligment parameters:
   ///
@@ -27,8 +25,6 @@ class KarimakiAlignmentDerivatives
   /// | dr_x/db  dr_y/db |
   /// \ dr_x/dg  dr_y/dg /
   AlgebraicMatrix operator()(const TrajectoryStateOnSurface &tsos) const;
-  
 };
 
 #endif
-
diff --git a/Alignment/CommonAlignmentParametrization/interface/ParametersToParametersDerivatives.h b/Alignment/CommonAlignmentParametrization/interface/ParametersToParametersDerivatives.h
index b9efe19ba35cd..3dbe6fb373d97 100644
--- a/Alignment/CommonAlignmentParametrization/interface/ParametersToParametersDerivatives.h
+++ b/Alignment/CommonAlignmentParametrization/interface/ParametersToParametersDerivatives.h
@@ -18,13 +18,13 @@
 /// |      .           .                 .      |
 /// \ dpm_l/dpm_i dpm_l/dpm_i  ...  dpm_l/dpn_i /
 ///
-/// where 
+/// where
 /// p1_l, p2_l, ..., pn_l are the n parameters of the composite 'mother' object
 /// and
 /// p1_i, p2_i, ..., pm_i are the m parameters of its component.
 ///
 /// Note that not all combinations of parameters are supported:
-/// Please check method isOK() before accessing the derivatives via 
+/// Please check method isOK() before accessing the derivatives via
 /// operator(unsigned int indParMother, unsigned int indParComp).
 ///
 /// Currently these parameters are supported:
@@ -40,43 +40,42 @@
 
 class Alignable;
 
-class ParametersToParametersDerivatives
-{
-  public:
+class ParametersToParametersDerivatives {
+public:
   ParametersToParametersDerivatives(const Alignable &component, const Alignable &mother);
 
   /// Indicate whether able to provide the derivatives.
-  bool isOK() const { return isOK_;}
+  bool isOK() const { return isOK_; }
 
   /// Return the derivative DeltaParam(mother)/DeltaParam(component).
   /// Indices start with 0 - but check isOK() first!
   /// See class description about matrix.
-  double operator() (unsigned int indParMother, unsigned int indParComp) const; 
+  double operator()(unsigned int indParMother, unsigned int indParComp) const;
 
   // Not this - would make the internals public:
   //  const TMatrixD& matrix() const { return derivatives_;}
 
-  private:
-  /// init by choosing the correct detailed init method depending on parameter types
-  bool init(const Alignable &component, int typeComponent,
-	    const Alignable &mother,    int typeMother);
+private:
+  /// init by choosing the correct detailed init method depending on parameter
+  /// types
+  bool init(const Alignable &component, int typeComponent, const Alignable &mother, int typeMother);
   /// init for component and mother both with RigidBody parameters
   bool initRigidRigid(const Alignable &component, const Alignable &mother);
   /// init for component with BowedSurface and mother with RigidBody parameters
   bool initBowedRigid(const Alignable &component, const Alignable &mother);
-  /// init for component with TwoBowedSurfaces and mother with RigidBody parameters
+  /// init for component with TwoBowedSurfaces and mother with RigidBody
+  /// parameters
   bool init2BowedRigid(const Alignable &component, const Alignable &mother);
 
-  typedef ROOT::Math::SMatrix<double,6,9,ROOT::Math::MatRepStd<double,6,9> > AlgebraicMatrix69;
-  /// from d(rigid_mother)/d(rigid_component) to d(rigid_mother)/d(bowed_component)
-  /// for bad input (length or width zero), set object to invalid: isOK_ = false
-  AlgebraicMatrix69 dRigid_dBowed(const AlgebraicMatrix66 &dRigidM2dRigidC,
-				  double halfWidth, double halfLength);
+  typedef ROOT::Math::SMatrix<double, 6, 9, ROOT::Math::MatRepStd<double, 6, 9>> AlgebraicMatrix69;
+  /// from d(rigid_mother)/d(rigid_component) to
+  /// d(rigid_mother)/d(bowed_component) for bad input (length or width zero),
+  /// set object to invalid: isOK_ = false
+  AlgebraicMatrix69 dRigid_dBowed(const AlgebraicMatrix66 &dRigidM2dRigidC, double halfWidth, double halfLength);
 
   /// data members
-  bool            isOK_; /// can we provide the desired?
-  TMatrixD derivatives_; /// matrix of derivatives
+  bool isOK_;             /// can we provide the desired?
+  TMatrixD derivatives_;  /// matrix of derivatives
 };
 
 #endif
-
diff --git a/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters.h b/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters.h
index 86bdf790896f0..32bb452429cd8 100644
--- a/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters.h
+++ b/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters.h
@@ -6,7 +6,7 @@
 
 /// \class RigidBodyAlignmentParameters
 ///
-/// Concrete class for alignment parameters and associated quantities 
+/// Concrete class for alignment parameters and associated quantities
 /// [derived from AlignmentParameters]. The number of parameters
 /// N_PARAM is fixed to 6 (3 translations + 3 rotations)
 ///
@@ -18,53 +18,46 @@ class Alignable;
 class AlignableDetOrUnitPtr;
 class TrajectoryStateOnSurface;
 
-class RigidBodyAlignmentParameters : public AlignmentParameters 
-{
-
+class RigidBodyAlignmentParameters : public AlignmentParameters {
 public:
-
   /// Give parameters a name
-  enum AlignmentParameterName 
-	{
-	  dx = 0, dy, dz,
-	  dalpha, dbeta, dgamma,
-	  N_PARAM
-	};
+  enum AlignmentParameterName { dx = 0, dy, dz, dalpha, dbeta, dgamma, N_PARAM };
 
-  /// Constructor with empty parameters/covariance (if calcMis = false) or with parameters
-  /// (no covariance) created from current (mis-)placement of alignable (if calcMis = true).
-  RigidBodyAlignmentParameters(Alignable* alignable, bool calcMis);
+  /// Constructor with empty parameters/covariance (if calcMis = false) or with
+  /// parameters (no covariance) created from current (mis-)placement of
+  /// alignable (if calcMis = true).
+  RigidBodyAlignmentParameters(Alignable *alignable, bool calcMis);
 
   /// Constructor for full set of parameters
-  RigidBodyAlignmentParameters( Alignable* alignable, 
-				const AlgebraicVector& parameters, 
-				const AlgebraicSymMatrix& covMatrix );
-
-  /// Constructor for selection 
-  RigidBodyAlignmentParameters( Alignable* alignable, const AlgebraicVector& parameters, 
-				const AlgebraicSymMatrix& covMatrix, 
-				const std::vector<bool>& selection );
-
-  /// Destructor 
-  ~RigidBodyAlignmentParameters() override {};
+  RigidBodyAlignmentParameters(Alignable *alignable,
+                               const AlgebraicVector &parameters,
+                               const AlgebraicSymMatrix &covMatrix);
+
+  /// Constructor for selection
+  RigidBodyAlignmentParameters(Alignable *alignable,
+                               const AlgebraicVector &parameters,
+                               const AlgebraicSymMatrix &covMatrix,
+                               const std::vector<bool> &selection);
+
+  /// Destructor
+  ~RigidBodyAlignmentParameters() override{};
   void apply() override;
   int type() const override;
 
   /// Clone all parameters (for update of parameters)
-  RigidBodyAlignmentParameters* clone( const AlgebraicVector& parameters, 
-					       const AlgebraicSymMatrix& covMatrix ) const override;
- 
+  RigidBodyAlignmentParameters *clone(const AlgebraicVector &parameters,
+                                      const AlgebraicSymMatrix &covMatrix) const override;
+
   /// Clone selected parameters (for update of parameters)
-  RigidBodyAlignmentParameters*
-    cloneFromSelected(const AlgebraicVector& parameters, const AlgebraicSymMatrix& covMatrix) const override;
-  
-  /// Get all derivatives 
-  AlgebraicMatrix derivatives( const TrajectoryStateOnSurface& tsos,
-				       const AlignableDetOrUnitPtr & ) const override;
+  RigidBodyAlignmentParameters *cloneFromSelected(const AlgebraicVector &parameters,
+                                                  const AlgebraicSymMatrix &covMatrix) const override;
+
+  /// Get all derivatives
+  AlgebraicMatrix derivatives(const TrajectoryStateOnSurface &tsos, const AlignableDetOrUnitPtr &) const override;
 
   /// Get selected derivatives
-  AlgebraicMatrix selectedDerivatives( const TrajectoryStateOnSurface& tsos, 
-					       const AlignableDetOrUnitPtr & ) const override;
+  AlgebraicMatrix selectedDerivatives(const TrajectoryStateOnSurface &tsos,
+                                      const AlignableDetOrUnitPtr &) const override;
 
   /// Get translation parameters
   AlgebraicVector translation(void) const;
@@ -72,17 +65,15 @@ class RigidBodyAlignmentParameters : public AlignmentParameters
   /// Get rotation parameters
   AlgebraicVector rotation(void) const;
 
-  /// calculate and return parameters in global frame 
+  /// calculate and return parameters in global frame
   AlgebraicVector globalParameters(void) const;
 
-  /// print parameters to screen 
+  /// print parameters to screen
   void print(void) const;
 
-  /// Calculate parameter vector of misplacements (shift+rotation) from alignable.
-  /// (If ali=0, return empty AlgebraicVector of proper length.)
-  static AlgebraicVector displacementFromAlignable(const Alignable* ali);
-
+  /// Calculate parameter vector of misplacements (shift+rotation) from
+  /// alignable. (If ali=0, return empty AlgebraicVector of proper length.)
+  static AlgebraicVector displacementFromAlignable(const Alignable *ali);
 };
 
 #endif
-
diff --git a/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters4D.h b/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters4D.h
index fd492faf76458..a3a6303936036 100644
--- a/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters4D.h
+++ b/Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters4D.h
@@ -7,7 +7,7 @@
 
 /// \class RigidBodyAlignmentParameters
 ///
-/// Concrete class for alignment parameters and associated quantities 
+/// Concrete class for alignment parameters and associated quantities
 /// [derived from AlignmentParameters]. The number of parameters
 /// N_PARAM is fixed to 6 (3 translations + 3 rotations)
 ///
@@ -19,48 +19,42 @@ class Alignable;
 class AlignableDetOrUnitPtr;
 class TrajectoryStateOnSurface;
 
-class RigidBodyAlignmentParameters4D : public RigidBodyAlignmentParameters 
-{
-
+class RigidBodyAlignmentParameters4D : public RigidBodyAlignmentParameters {
 public:
-
-  /// Constructor with empty parameters/covariance (if calcMis = false) or with parameters
-  /// (no covariance) created from current (mis-)placement of alignable (if calcMis = true).
-  RigidBodyAlignmentParameters4D(Alignable* alignable, bool calcMis):
-                                 RigidBodyAlignmentParameters(alignable, calcMis){};
-                        
+  /// Constructor with empty parameters/covariance (if calcMis = false) or with
+  /// parameters (no covariance) created from current (mis-)placement of
+  /// alignable (if calcMis = true).
+  RigidBodyAlignmentParameters4D(Alignable *alignable, bool calcMis)
+      : RigidBodyAlignmentParameters(alignable, calcMis){};
 
   /// Constructor for full set of parameters
-  RigidBodyAlignmentParameters4D( Alignable* alignable, 
-				 const AlgebraicVector& parameters, 
-				 const AlgebraicSymMatrix& covMatrix ):
-                                 RigidBodyAlignmentParameters(alignable, parameters, covMatrix){};
+  RigidBodyAlignmentParameters4D(Alignable *alignable,
+                                 const AlgebraicVector &parameters,
+                                 const AlgebraicSymMatrix &covMatrix)
+      : RigidBodyAlignmentParameters(alignable, parameters, covMatrix){};
+
+  /// Constructor for selection
+  RigidBodyAlignmentParameters4D(Alignable *alignable,
+                                 const AlgebraicVector &parameters,
+                                 const AlgebraicSymMatrix &covMatrix,
+                                 const std::vector<bool> &selection)
+      : RigidBodyAlignmentParameters(alignable, parameters, covMatrix, selection){};
 
-  /// Constructor for selection 
-  RigidBodyAlignmentParameters4D( Alignable* alignable, const AlgebraicVector& parameters, 
-				 const AlgebraicSymMatrix& covMatrix, 
-				 const std::vector<bool>& selection ):
-                                 RigidBodyAlignmentParameters(alignable, parameters, covMatrix, selection){};
+  /// Destructor
+  ~RigidBodyAlignmentParameters4D() override{};
 
-  /// Destructor 
-  ~RigidBodyAlignmentParameters4D() override {};
-  
   int type() const override;
 
-  /// Get all derivatives 
-  AlgebraicMatrix derivatives( const TrajectoryStateOnSurface& tsos,
-				       const AlignableDetOrUnitPtr & ) const override;
+  /// Get all derivatives
+  AlgebraicMatrix derivatives(const TrajectoryStateOnSurface &tsos, const AlignableDetOrUnitPtr &) const override;
 
   /// Clone all parameters (for update of parameters)
-  RigidBodyAlignmentParameters4D* clone( const AlgebraicVector& parameters,
-                                               const AlgebraicSymMatrix& covMatrix ) const override;
+  RigidBodyAlignmentParameters4D *clone(const AlgebraicVector &parameters,
+                                        const AlgebraicSymMatrix &covMatrix) const override;
 
   /// Clone selected parameters (for update of parameters)
-  RigidBodyAlignmentParameters4D*
-    cloneFromSelected(const AlgebraicVector& parameters, const AlgebraicSymMatrix& covMatrix) const override;
-
-
+  RigidBodyAlignmentParameters4D *cloneFromSelected(const AlgebraicVector &parameters,
+                                                    const AlgebraicSymMatrix &covMatrix) const override;
 };
 
 #endif
-
diff --git a/Alignment/CommonAlignmentParametrization/interface/SegmentAlignmentDerivatives4D.h b/Alignment/CommonAlignmentParametrization/interface/SegmentAlignmentDerivatives4D.h
index dce16ea54610c..0d3b76cb1e84e 100644
--- a/Alignment/CommonAlignmentParametrization/interface/SegmentAlignmentDerivatives4D.h
+++ b/Alignment/CommonAlignmentParametrization/interface/SegmentAlignmentDerivatives4D.h
@@ -13,14 +13,10 @@
 
 class TrajectoryStateOnSurface;
 
-class SegmentAlignmentDerivatives4D 
-{
+class SegmentAlignmentDerivatives4D {
 public:
-  
   /// Returns 6x4 jacobian matrix
   AlgebraicMatrix operator()(const TrajectoryStateOnSurface &tsos) const;
-  
 };
 
 #endif
-
diff --git a/Alignment/CommonAlignmentParametrization/interface/TwoBowedSurfacesAlignmentParameters.h b/Alignment/CommonAlignmentParametrization/interface/TwoBowedSurfacesAlignmentParameters.h
index a4ef7eeff0ca0..7859141491bf9 100644
--- a/Alignment/CommonAlignmentParametrization/interface/TwoBowedSurfacesAlignmentParameters.h
+++ b/Alignment/CommonAlignmentParametrization/interface/TwoBowedSurfacesAlignmentParameters.h
@@ -2,16 +2,16 @@
 #define Alignment_CommonAlignment_TwoBowedSurfacesAlignmentParameters_h
 
 #include "Alignment/CommonAlignment/interface/AlignmentParameters.h"
-#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
 #include "CondFormats/Alignment/interface/Definitions.h"
+#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
 
 #include "Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentDerivatives.h"
 
 /// \class TwoBowedSurfacesAlignmentParameters
 ///
-/// Concrete class for alignment parameters and associated quantities 
-/// [derived from AlignmentParameters]. 
-/// The alignable is assumed to have in fact two surfaces devided at 
+/// Concrete class for alignment parameters and associated quantities
+/// [derived from AlignmentParameters].
+/// The alignable is assumed to have in fact two surfaces devided at
 /// a specific local ySplit.
 /// The number of parameters N_PARAM is 2x9, i.e. one set of
 ///  - 3 translations
@@ -19,12 +19,15 @@
 ///  - 3 bows/sagittas (u, v and mixed term)
 /// for the two surfaces (similar as in BowedSurfaceAlignmentParameters).
 /// Storage is done differently:
-/// The movements and translations are averaged and applied to the 
+/// The movements and translations are averaged and applied to the
 /// alignable in the 'classical' way.
 /// In SurfaceDeformation we store:
-/// - the half differences of the movements and rotations, to be taken into account,
-///   with positive/negative sign, for corrections for the surface at lower/higher y,
-/// - the mean values 'm' and half differences 'hd' of the bows/sagittas of each surface,
+/// - the half differences of the movements and rotations, to be taken into
+/// account,
+///   with positive/negative sign, for corrections for the surface at
+///   lower/higher y,
+/// - the mean values 'm' and half differences 'hd' of the bows/sagittas of each
+/// surface,
 ///   where these corrections have to be applied as m+hd for the one and m-hd
 ///   for the other sensor
 ///
@@ -37,9 +40,8 @@ class Alignable;
 class AlignableDetOrUnitPtr;
 class TrajectoryStateOnSurface;
 
-class TwoBowedSurfacesAlignmentParameters : public AlignmentParameters 
-{
- public:
+class TwoBowedSurfacesAlignmentParameters : public AlignmentParameters {
+public:
   /// Give parameters a name (do not change order, see derivatives(..)!)
   typedef BowedSurfaceAlignmentDerivatives BowedDerivs;
   enum AlignmentParameterName {
@@ -47,22 +49,22 @@ class TwoBowedSurfacesAlignmentParameters : public AlignmentParameters
     dx1 = BowedDerivs::dx,
     dy1 = BowedDerivs::dy,
     dz1 = BowedDerivs::dz,
-    dslopeX1 = BowedDerivs::dslopeX, // NOTE: slope(u) -> halfWidth*tan(beta),
-    dslopeY1 = BowedDerivs::dslopeY, //       slope(v) -> halfLength*tan(alpha)
-    drotZ1   = BowedDerivs::drotZ,   //       rot(w)   -> g-scale*gamma
-    dsagittaX1  = BowedDerivs::dsagittaX,
+    dslopeX1 = BowedDerivs::dslopeX,  // NOTE: slope(u) -> halfWidth*tan(beta),
+    dslopeY1 = BowedDerivs::dslopeY,  //       slope(v) -> halfLength*tan(alpha)
+    drotZ1 = BowedDerivs::drotZ,      //       rot(w)   -> g-scale*gamma
+    dsagittaX1 = BowedDerivs::dsagittaX,
     dsagittaXY1 = BowedDerivs::dsagittaXY,
-    dsagittaY1  = BowedDerivs::dsagittaY,
+    dsagittaY1 = BowedDerivs::dsagittaY,
     // 2nd surface
     dx2 = BowedDerivs::dx + BowedDerivs::N_PARAM,
     dy2 = BowedDerivs::dy + BowedDerivs::N_PARAM,
     dz2 = BowedDerivs::dz + BowedDerivs::N_PARAM,
-    dslopeX2 = BowedDerivs::dslopeX + BowedDerivs::N_PARAM, // NOTE: slope(u) -> k*tan(beta),
-    dslopeY2 = BowedDerivs::dslopeY + BowedDerivs::N_PARAM, //       slope(v) -> k*tan(alpha)
-    drotZ2   = BowedDerivs::drotZ   + BowedDerivs::N_PARAM, //       rot(w)   -> m*gamma
-    dsagittaX2  = BowedDerivs::dsagittaX  + BowedDerivs::N_PARAM,
+    dslopeX2 = BowedDerivs::dslopeX + BowedDerivs::N_PARAM,  // NOTE: slope(u) -> k*tan(beta),
+    dslopeY2 = BowedDerivs::dslopeY + BowedDerivs::N_PARAM,  //       slope(v) -> k*tan(alpha)
+    drotZ2 = BowedDerivs::drotZ + BowedDerivs::N_PARAM,      //       rot(w)   -> m*gamma
+    dsagittaX2 = BowedDerivs::dsagittaX + BowedDerivs::N_PARAM,
     dsagittaXY2 = BowedDerivs::dsagittaXY + BowedDerivs::N_PARAM,
-    dsagittaY2  = BowedDerivs::dsagittaY  + BowedDerivs::N_PARAM,
+    dsagittaY2 = BowedDerivs::dsagittaY + BowedDerivs::N_PARAM,
     // number of parameters
     N_PARAM = BowedDerivs::N_PARAM + BowedDerivs::N_PARAM
   };
@@ -71,43 +73,41 @@ class TwoBowedSurfacesAlignmentParameters : public AlignmentParameters
   TwoBowedSurfacesAlignmentParameters(Alignable *alignable);
 
   /// Constructor for full set of parameters
-  TwoBowedSurfacesAlignmentParameters(Alignable *alignable, 
-			       const AlgebraicVector &parameters, 
-			       const AlgebraicSymMatrix &covMatrix);
-
-  /// Constructor for selection 
-  TwoBowedSurfacesAlignmentParameters(Alignable *alignable, const AlgebraicVector &parameters, 
-			       const AlgebraicSymMatrix &covMatrix, 
-			       const std::vector<bool> &selection);
-
-  /// Destructor 
-  ~TwoBowedSurfacesAlignmentParameters() override {};
+  TwoBowedSurfacesAlignmentParameters(Alignable *alignable,
+                                      const AlgebraicVector &parameters,
+                                      const AlgebraicSymMatrix &covMatrix);
+
+  /// Constructor for selection
+  TwoBowedSurfacesAlignmentParameters(Alignable *alignable,
+                                      const AlgebraicVector &parameters,
+                                      const AlgebraicSymMatrix &covMatrix,
+                                      const std::vector<bool> &selection);
+
+  /// Destructor
+  ~TwoBowedSurfacesAlignmentParameters() override{};
   void apply() override;
   int type() const override;
 
   /// Clone all parameters (for update of parameters)
-  TwoBowedSurfacesAlignmentParameters* clone(const AlgebraicVector &parameters, 
-						     const AlgebraicSymMatrix &covMatrix) const override;
- 
+  TwoBowedSurfacesAlignmentParameters *clone(const AlgebraicVector &parameters,
+                                             const AlgebraicSymMatrix &covMatrix) const override;
+
   /// Clone selected parameters (for update of parameters)
-  TwoBowedSurfacesAlignmentParameters*
-    cloneFromSelected(const AlgebraicVector &parameters,
-		      const AlgebraicSymMatrix &covMatrix) const override;
-  
-  /// Get all derivatives 
-  AlgebraicMatrix derivatives(const TrajectoryStateOnSurface &tsos,
-				      const AlignableDetOrUnitPtr &aliDet) const override;
-
-  /// print parameters to screen 
+  TwoBowedSurfacesAlignmentParameters *cloneFromSelected(const AlgebraicVector &parameters,
+                                                         const AlgebraicSymMatrix &covMatrix) const override;
+
+  /// Get all derivatives
+  AlgebraicMatrix derivatives(const TrajectoryStateOnSurface &tsos, const AlignableDetOrUnitPtr &aliDet) const override;
+
+  /// print parameters to screen
   virtual void print() const;
 
-  double ySplit() const { return ySplit_;}
+  double ySplit() const { return ySplit_; }
 
- private:
+private:
   double ySplitFromAlignable(const Alignable *ali) const;
 
   double ySplit_;
 };
 
 #endif
-
diff --git a/Alignment/CommonAlignmentParametrization/src/AlignmentParametersFactory.cc b/Alignment/CommonAlignmentParametrization/src/AlignmentParametersFactory.cc
index 2cdaad6ac0cd5..b58baa07405fd 100644
--- a/Alignment/CommonAlignmentParametrization/src/AlignmentParametersFactory.cc
+++ b/Alignment/CommonAlignmentParametrization/src/AlignmentParametersFactory.cc
@@ -3,124 +3,122 @@
 /// (last update by $Author: mussgill $)
 
 #include "Alignment/CommonAlignmentParametrization/interface/AlignmentParametersFactory.h"
-#include "Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters.h"
-#include "Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters4D.h"
 #include "Alignment/CommonAlignmentParametrization/interface/BeamSpotAlignmentParameters.h"
 #include "Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentParameters.h"
+#include "Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters.h"
+#include "Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters4D.h"
 #include "Alignment/CommonAlignmentParametrization/interface/TwoBowedSurfacesAlignmentParameters.h"
 //#include "Alignment/SurveyAnalysis/interface/SurveyParameters.h"
 #include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
-#include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
-
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace AlignmentParametersFactory {
-  
+
   //_______________________________________________________________________________________
-  ParametersType parametersType(const std::string &typeString)
-  {
-    if (typeString == "RigidBody") return kRigidBody;
-    else if (typeString == "Survey") return kSurvey; //GF: do not belong here, so remove in the long term...
-    else if (typeString == "RigidBody4D") return kRigidBody4D;    
-    else if (typeString == "BeamSpot") return kBeamSpot;
-    else if (typeString == "BowedSurface") return kBowedSurface;
-    else if (typeString == "TwoBowedSurfaces") return kTwoBowedSurfaces;
-    throw cms::Exception("BadConfig") 
-      << "AlignmentParametersFactory" << " No AlignmentParameters with name '" << typeString << "'.";
-    
-    return kRigidBody; // to please compiler...
+  ParametersType parametersType(const std::string &typeString) {
+    if (typeString == "RigidBody")
+      return kRigidBody;
+    else if (typeString == "Survey")
+      return kSurvey;  // GF: do not belong here, so remove in the long term...
+    else if (typeString == "RigidBody4D")
+      return kRigidBody4D;
+    else if (typeString == "BeamSpot")
+      return kBeamSpot;
+    else if (typeString == "BowedSurface")
+      return kBowedSurface;
+    else if (typeString == "TwoBowedSurfaces")
+      return kTwoBowedSurfaces;
+    throw cms::Exception("BadConfig") << "AlignmentParametersFactory"
+                                      << " No AlignmentParameters with name '" << typeString << "'.";
+
+    return kRigidBody;  // to please compiler...
   }
 
   //_______________________________________________________________________________________
-  ParametersType parametersType(int typeInt)
-  {
-    if (typeInt == kRigidBody) return kRigidBody;
-    if (typeInt == kSurvey) return kSurvey; //GF: do not belong here, so remove in the long term...
-    if (typeInt == kRigidBody4D) return kRigidBody4D;
-    if (typeInt == kBeamSpot) return kBeamSpot;
-    if (typeInt == kBowedSurface) return kBowedSurface;
-    if (typeInt == kTwoBowedSurfaces) return kTwoBowedSurfaces;
-    
-    throw cms::Exception("BadConfig") 
-      << "AlignmentParametersFactory" << " No AlignmentParameters with number " << typeInt << ".";
-    
-    return kRigidBody; // to please compiler...
+  ParametersType parametersType(int typeInt) {
+    if (typeInt == kRigidBody)
+      return kRigidBody;
+    if (typeInt == kSurvey)
+      return kSurvey;  // GF: do not belong here, so remove in the long term...
+    if (typeInt == kRigidBody4D)
+      return kRigidBody4D;
+    if (typeInt == kBeamSpot)
+      return kBeamSpot;
+    if (typeInt == kBowedSurface)
+      return kBowedSurface;
+    if (typeInt == kTwoBowedSurfaces)
+      return kTwoBowedSurfaces;
+
+    throw cms::Exception("BadConfig") << "AlignmentParametersFactory"
+                                      << " No AlignmentParameters with number " << typeInt << ".";
+
+    return kRigidBody;  // to please compiler...
   }
 
   //_______________________________________________________________________________________
-  std::string parametersTypeName(ParametersType parType)
-  {
-    switch(parType) {
-    case kRigidBody:
-      return "RigiBody";
-    case kSurvey: //GF: do not belong here, so remove in the long term...
-      return "Survey";
-    case kRigidBody4D:
-      return "RigiBody4D"; 
-    case kBeamSpot:
-      return "BeamSpot"; 
-    case kBowedSurface:
-      return "BowedSurface"; 
-    case kTwoBowedSurfaces:
-      return "TwoBowedSurfaces"; 
+  std::string parametersTypeName(ParametersType parType) {
+    switch (parType) {
+      case kRigidBody:
+        return "RigiBody";
+      case kSurvey:  // GF: do not belong here, so remove in the long term...
+        return "Survey";
+      case kRigidBody4D:
+        return "RigiBody4D";
+      case kBeamSpot:
+        return "BeamSpot";
+      case kBowedSurface:
+        return "BowedSurface";
+      case kTwoBowedSurfaces:
+        return "TwoBowedSurfaces";
     }
 
-    return "unknown_should_never_reach"; // to please the compiler
+    return "unknown_should_never_reach";  // to please the compiler
   }
 
   //_______________________________________________________________________________________
-  AlignmentParameters* createParameters(Alignable *ali, ParametersType parType,
-					const std::vector<bool> &sel)
-  {
+  AlignmentParameters *createParameters(Alignable *ali, ParametersType parType, const std::vector<bool> &sel) {
     switch (parType) {
-    case kRigidBody:
-      {
-	const AlgebraicVector par(RigidBodyAlignmentParameters::N_PARAM, 0);
-	const AlgebraicSymMatrix cov(RigidBodyAlignmentParameters::N_PARAM, 0);
-	return new RigidBodyAlignmentParameters(ali, par, cov, sel);
-      }
-      break;
-    case kSurvey:
-// creates some unwanted dependencies - and does not fit into AlignmentParameters anyway!
-      throw cms::Exception("BadConfig") 
-	<< "AlignmentParametersFactory cannot create SurveyParameters.";
-//       edm::LogWarning("Alignment") << "@SUB=createParameters"
-// 				   << "Creating SurveyParameters of length 0!";
-//       return new SurveyParameters(ali, AlgebraicVector(), AlgebraicSymMatrix());
-      break;
-    case kRigidBody4D:
-      {
-	const AlgebraicVector par(RigidBodyAlignmentParameters4D::N_PARAM, 0);
-	const AlgebraicSymMatrix cov(RigidBodyAlignmentParameters4D::N_PARAM, 0);
-	return new RigidBodyAlignmentParameters4D(ali, par, cov, sel);
-      }
-      break;
-    case kBeamSpot:
-      {
-	const AlgebraicVector par(BeamSpotAlignmentParameters::N_PARAM, 0);
-	const AlgebraicSymMatrix cov(BeamSpotAlignmentParameters::N_PARAM, 0);
-	return new BeamSpotAlignmentParameters(ali, par, cov, sel);
-      }
-      break;
-    case kBowedSurface:
-      {
-	const AlgebraicVector par(BowedSurfaceAlignmentParameters::N_PARAM, 0);
-	const AlgebraicSymMatrix cov(BowedSurfaceAlignmentParameters::N_PARAM, 0);
-	return new BowedSurfaceAlignmentParameters(ali, par, cov, sel);
-      }
-      break;
-    case kTwoBowedSurfaces:
-      {
-	const AlgebraicVector par(TwoBowedSurfacesAlignmentParameters::N_PARAM, 0);
-	const AlgebraicSymMatrix cov(TwoBowedSurfacesAlignmentParameters::N_PARAM, 0);
-	return new TwoBowedSurfacesAlignmentParameters(ali, par, cov, sel);
-      }
-      break;
+      case kRigidBody: {
+        const AlgebraicVector par(RigidBodyAlignmentParameters::N_PARAM, 0);
+        const AlgebraicSymMatrix cov(RigidBodyAlignmentParameters::N_PARAM, 0);
+        return new RigidBodyAlignmentParameters(ali, par, cov, sel);
+      } break;
+      case kSurvey:
+        // creates some unwanted dependencies - and does not fit into
+        // AlignmentParameters anyway!
+        throw cms::Exception("BadConfig") << "AlignmentParametersFactory cannot create SurveyParameters.";
+        //       edm::LogWarning("Alignment") << "@SUB=createParameters"
+        // 				   << "Creating SurveyParameters of length 0!";
+        //       return new SurveyParameters(ali, AlgebraicVector(),
+        //       AlgebraicSymMatrix());
+        break;
+      case kRigidBody4D: {
+        const AlgebraicVector par(RigidBodyAlignmentParameters4D::N_PARAM, 0);
+        const AlgebraicSymMatrix cov(RigidBodyAlignmentParameters4D::N_PARAM, 0);
+        return new RigidBodyAlignmentParameters4D(ali, par, cov, sel);
+      } break;
+      case kBeamSpot: {
+        const AlgebraicVector par(BeamSpotAlignmentParameters::N_PARAM, 0);
+        const AlgebraicSymMatrix cov(BeamSpotAlignmentParameters::N_PARAM, 0);
+        return new BeamSpotAlignmentParameters(ali, par, cov, sel);
+      } break;
+      case kBowedSurface: {
+        const AlgebraicVector par(BowedSurfaceAlignmentParameters::N_PARAM, 0);
+        const AlgebraicSymMatrix cov(BowedSurfaceAlignmentParameters::N_PARAM, 0);
+        return new BowedSurfaceAlignmentParameters(ali, par, cov, sel);
+      } break;
+      case kTwoBowedSurfaces: {
+        const AlgebraicVector par(TwoBowedSurfacesAlignmentParameters::N_PARAM, 0);
+        const AlgebraicSymMatrix cov(TwoBowedSurfacesAlignmentParameters::N_PARAM, 0);
+        return new TwoBowedSurfacesAlignmentParameters(ali, par, cov, sel);
+      } break;
     }
-   
-    return nullptr; // unreached (all ParametersType appear in switch), to please the compiler
+
+    return nullptr;  // unreached (all ParametersType appear in switch), to please
+                     // the compiler
   }
-}
+}  // namespace AlignmentParametersFactory
diff --git a/Alignment/CommonAlignmentParametrization/src/BeamSpotAlignmentDerivatives.cc b/Alignment/CommonAlignmentParametrization/src/BeamSpotAlignmentDerivatives.cc
index f51639cecbf4d..acbb978b16b9a 100644
--- a/Alignment/CommonAlignmentParametrization/src/BeamSpotAlignmentDerivatives.cc
+++ b/Alignment/CommonAlignmentParametrization/src/BeamSpotAlignmentDerivatives.cc
@@ -9,17 +9,16 @@
 
 #include "TrackingTools/PatternTools/interface/TwoTrackMinimumDistance.h"
 
-#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 #include "TrackingTools/TrajectoryState/interface/PerigeeConversions.h"
+#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 
 #include "Alignment/CommonAlignmentParametrization/interface/BeamSpotAlignmentDerivatives.h"
 
-AlgebraicMatrix 
-BeamSpotAlignmentDerivatives::operator()( const TrajectoryStateOnSurface &tsos ) const
-{ 
-  AlgebraicMatrix aliderivs(4,2);
+AlgebraicMatrix BeamSpotAlignmentDerivatives::operator()(const TrajectoryStateOnSurface &tsos) const {
+  AlgebraicMatrix aliderivs(4, 2);
 
-  if (!tsos.isValid()) return aliderivs;
+  if (!tsos.isValid())
+    return aliderivs;
 
   // lp.x = transverse impact parameter
   // lp.y = longitudinal impact parameter
@@ -29,14 +28,14 @@ BeamSpotAlignmentDerivatives::operator()( const TrajectoryStateOnSurface &tsos )
   double sinphi = sin(phi);
   double cosphi = cos(phi);
 
-  aliderivs[0][0]=  sinphi;
-  aliderivs[0][1]=  0.0;
-  aliderivs[1][0]= -cosphi;
-  aliderivs[1][1]=  0.0;
-  aliderivs[2][0]=  sinphi*dz;
-  aliderivs[2][1]=  0.0;
-  aliderivs[3][0]= -cosphi*dz;
-  aliderivs[3][1]=  0.0;
-  
-  return(aliderivs);
+  aliderivs[0][0] = sinphi;
+  aliderivs[0][1] = 0.0;
+  aliderivs[1][0] = -cosphi;
+  aliderivs[1][1] = 0.0;
+  aliderivs[2][0] = sinphi * dz;
+  aliderivs[2][1] = 0.0;
+  aliderivs[3][0] = -cosphi * dz;
+  aliderivs[3][1] = 0.0;
+
+  return (aliderivs);
 }
diff --git a/Alignment/CommonAlignmentParametrization/src/BeamSpotAlignmentParameters.cc b/Alignment/CommonAlignmentParametrization/src/BeamSpotAlignmentParameters.cc
index df00c84a1d0a4..db6272a176000 100644
--- a/Alignment/CommonAlignmentParametrization/src/BeamSpotAlignmentParameters.cc
+++ b/Alignment/CommonAlignmentParametrization/src/BeamSpotAlignmentParameters.cc
@@ -7,120 +7,103 @@
 
 #include "FWCore/Utilities/interface/Exception.h"
 
-#include "Alignment/CommonAlignment/interface/Utilities.h"
 #include "Alignment/CommonAlignment/interface/Alignable.h"
 #include "Alignment/CommonAlignment/interface/AlignableDetOrUnitPtr.h"
-#include "Alignment/CommonAlignmentParametrization/interface/BeamSpotAlignmentDerivatives.h"
+#include "Alignment/CommonAlignment/interface/Utilities.h"
 #include "Alignment/CommonAlignmentParametrization/interface/AlignmentParametersFactory.h"
+#include "Alignment/CommonAlignmentParametrization/interface/BeamSpotAlignmentDerivatives.h"
 #include "CondFormats/Alignment/interface/Definitions.h"
 
-// This class's header 
+// This class's header
 #include "Alignment/CommonAlignmentParametrization/interface/BeamSpotAlignmentParameters.h"
 
 //__________________________________________________________________________________________________
-BeamSpotAlignmentParameters::BeamSpotAlignmentParameters(Alignable* ali, bool calcMis) :
-  AlignmentParameters(ali, displacementFromAlignable(calcMis ? ali : nullptr),
-		      AlgebraicSymMatrix(N_PARAM, 0))
-{
-
-}
+BeamSpotAlignmentParameters::BeamSpotAlignmentParameters(Alignable *ali, bool calcMis)
+    : AlignmentParameters(ali, displacementFromAlignable(calcMis ? ali : nullptr), AlgebraicSymMatrix(N_PARAM, 0)) {}
 
 //__________________________________________________________________________________________________
-BeamSpotAlignmentParameters::BeamSpotAlignmentParameters(Alignable* alignable, 
-							 const AlgebraicVector& parameters, 
-							 const AlgebraicSymMatrix& covMatrix) :
-  AlignmentParameters( alignable, parameters, covMatrix )
-{  
+BeamSpotAlignmentParameters::BeamSpotAlignmentParameters(Alignable *alignable,
+                                                         const AlgebraicVector &parameters,
+                                                         const AlgebraicSymMatrix &covMatrix)
+    : AlignmentParameters(alignable, parameters, covMatrix) {
   if (parameters.num_row() != N_PARAM) {
-    throw cms::Exception("BadParameters") << "in BeamSpotAlignmentParameters(): "
-                                          << parameters.num_row() << " instead of " << N_PARAM 
-                                          << " parameters.";
+    throw cms::Exception("BadParameters")
+        << "in BeamSpotAlignmentParameters(): " << parameters.num_row() << " instead of " << N_PARAM << " parameters.";
   }
 }
 
 //__________________________________________________________________________________________________
-BeamSpotAlignmentParameters::BeamSpotAlignmentParameters(Alignable* alignable, 
-							 const AlgebraicVector& parameters, 
-							 const AlgebraicSymMatrix& covMatrix,
-							 const std::vector<bool>& selection ) :
-  AlignmentParameters( alignable, parameters, covMatrix, selection )
-{  
+BeamSpotAlignmentParameters::BeamSpotAlignmentParameters(Alignable *alignable,
+                                                         const AlgebraicVector &parameters,
+                                                         const AlgebraicSymMatrix &covMatrix,
+                                                         const std::vector<bool> &selection)
+    : AlignmentParameters(alignable, parameters, covMatrix, selection) {
   if (parameters.num_row() != N_PARAM) {
-    throw cms::Exception("BadParameters") << "in BeamSpotAlignmentParameters(): "
-                                          << parameters.num_row() << " instead of " << N_PARAM 
-                                          << " parameters.";
+    throw cms::Exception("BadParameters")
+        << "in BeamSpotAlignmentParameters(): " << parameters.num_row() << " instead of " << N_PARAM << " parameters.";
   }
 }
 
 //__________________________________________________________________________________________________
-BeamSpotAlignmentParameters::~BeamSpotAlignmentParameters()
-{
-
-} 
+BeamSpotAlignmentParameters::~BeamSpotAlignmentParameters() {}
 
 //__________________________________________________________________________________________________
-BeamSpotAlignmentParameters* 
-BeamSpotAlignmentParameters::clone( const AlgebraicVector& parameters, 
-				    const AlgebraicSymMatrix& covMatrix ) const 
-{
-  BeamSpotAlignmentParameters* rbap = 
-    new BeamSpotAlignmentParameters( alignable(), parameters, covMatrix, selector());
-
-  if (userVariables()) rbap->setUserVariables(userVariables()->clone());
+BeamSpotAlignmentParameters *BeamSpotAlignmentParameters::clone(const AlgebraicVector &parameters,
+                                                                const AlgebraicSymMatrix &covMatrix) const {
+  BeamSpotAlignmentParameters *rbap = new BeamSpotAlignmentParameters(alignable(), parameters, covMatrix, selector());
+
+  if (userVariables())
+    rbap->setUserVariables(userVariables()->clone());
   rbap->setValid(isValid());
 
   return rbap;
 }
 
 //__________________________________________________________________________________________________
-BeamSpotAlignmentParameters* 
-BeamSpotAlignmentParameters::cloneFromSelected( const AlgebraicVector& parameters,
-						const AlgebraicSymMatrix& covMatrix ) const
-{
-  BeamSpotAlignmentParameters* rbap = 
-    new BeamSpotAlignmentParameters(alignable(), expandVector( parameters, selector()),
-				    expandSymMatrix(covMatrix, selector()), selector());
-
-  if ( userVariables() ) rbap->setUserVariables(userVariables()->clone());
+BeamSpotAlignmentParameters *BeamSpotAlignmentParameters::cloneFromSelected(const AlgebraicVector &parameters,
+                                                                            const AlgebraicSymMatrix &covMatrix) const {
+  BeamSpotAlignmentParameters *rbap = new BeamSpotAlignmentParameters(
+      alignable(), expandVector(parameters, selector()), expandSymMatrix(covMatrix, selector()), selector());
+
+  if (userVariables())
+    rbap->setUserVariables(userVariables()->clone());
   rbap->setValid(isValid());
-  
+
   return rbap;
 }
 
 //__________________________________________________________________________________________________
-AlgebraicMatrix 
-BeamSpotAlignmentParameters::derivatives( const TrajectoryStateOnSurface &tsos,
-					  const AlignableDetOrUnitPtr &alidet ) const
-{
-  const Alignable *ali = this->alignable(); // Alignable of these parameters
+AlgebraicMatrix BeamSpotAlignmentParameters::derivatives(const TrajectoryStateOnSurface &tsos,
+                                                         const AlignableDetOrUnitPtr &alidet) const {
+  const Alignable *ali = this->alignable();  // Alignable of these parameters
 
-  if (ali == alidet) { // same alignable => same frame
+  if (ali == alidet) {  // same alignable => same frame
     return BeamSpotAlignmentDerivatives()(tsos);
   } else {
-    throw cms::Exception("MisMatch")
-      << "BeamSpotAlignmentParameters::derivatives: The hit alignable must match the "
-      << "aligned one, i.e. these parameters make only sense for AlignableBeamSpot.\n";
-    return AlgebraicMatrix(N_PARAM, 2); // please compiler
+    throw cms::Exception("MisMatch") << "BeamSpotAlignmentParameters::derivatives: The hit alignable must "
+                                        "match the "
+                                     << "aligned one, i.e. these parameters make only sense for "
+                                        "AlignableBeamSpot.\n";
+    return AlgebraicMatrix(N_PARAM, 2);  // please compiler
   }
 }
 
 //__________________________________________________________________________________________________
-AlgebraicMatrix 
-BeamSpotAlignmentParameters::selectedDerivatives( const TrajectoryStateOnSurface& tsos, 
-						  const AlignableDetOrUnitPtr &alignableDet ) const
-{
-  const AlgebraicMatrix dev = this->derivatives( tsos, alignableDet );
+AlgebraicMatrix BeamSpotAlignmentParameters::selectedDerivatives(const TrajectoryStateOnSurface &tsos,
+                                                                 const AlignableDetOrUnitPtr &alignableDet) const {
+  const AlgebraicMatrix dev = this->derivatives(tsos, alignableDet);
 
-  int ncols  = dev.num_col();
-  int nrows  = dev.num_row();
-  int nsel   = numSelected();
+  int ncols = dev.num_col();
+  int nrows = dev.num_row();
+  int nsel = numSelected();
 
-  AlgebraicMatrix seldev( nsel, ncols );
+  AlgebraicMatrix seldev(nsel, ncols);
 
-  int ir2=0;
-  for ( int irow=0; irow<nrows; ++irow ) {
+  int ir2 = 0;
+  for (int irow = 0; irow < nrows; ++irow) {
     if (selector()[irow]) {
-      for ( int icol=0; icol<ncols; ++icol ) seldev[ir2][icol] = dev[irow][icol];
+      for (int icol = 0; icol < ncols; ++icol)
+        seldev[ir2][icol] = dev[irow][icol];
       ++ir2;
     }
   }
@@ -129,32 +112,27 @@ BeamSpotAlignmentParameters::selectedDerivatives( const TrajectoryStateOnSurface
 }
 
 //__________________________________________________________________________________________________
-AlgebraicVector BeamSpotAlignmentParameters::translation(void) const
-{ 
+AlgebraicVector BeamSpotAlignmentParameters::translation(void) const {
   AlgebraicVector shift(3);
-  for ( int i=0;i<2;++i ) shift[i] = theData->parameters()[i];
+  for (int i = 0; i < 2; ++i)
+    shift[i] = theData->parameters()[i];
   shift[2] = 0.0;
 
   return shift;
 }
 
 //__________________________________________________________________________________________________
-AlgebraicVector BeamSpotAlignmentParameters::rotation(void) const
-{
+AlgebraicVector BeamSpotAlignmentParameters::rotation(void) const {
   AlgebraicVector rot(3);
 
-  double dxdz = theData->parameters()[2];  
-  double dydz = theData->parameters()[3];  
+  double dxdz = theData->parameters()[2];
+  double dydz = theData->parameters()[3];
   double angleY = std::atan(dxdz);
   double angleX = -std::atan(dydz);
 
-  align::RotationType rotY( std::cos(angleY),  0., -std::sin(angleY), 
-			    0.,                1.,  0.,
-			    std::sin(angleY),  0.,  std::cos(angleY) );
+  align::RotationType rotY(std::cos(angleY), 0., -std::sin(angleY), 0., 1., 0., std::sin(angleY), 0., std::cos(angleY));
 
-  align::RotationType rotX( 1.,  0.,                0.,
-			    0.,  std::cos(angleX),  std::sin(angleX),
-			    0., -std::sin(angleX),  std::cos(angleX) );
+  align::RotationType rotX(1., 0., 0., 0., std::cos(angleX), std::sin(angleX), 0., -std::sin(angleX), std::cos(angleX));
 
   align::EulerAngles angles = align::toAngles(rotY * rotX);
 
@@ -166,88 +144,77 @@ AlgebraicVector BeamSpotAlignmentParameters::rotation(void) const
 }
 
 //__________________________________________________________________________________________________
-void BeamSpotAlignmentParameters::apply()
-{
+void BeamSpotAlignmentParameters::apply() {
   Alignable *alignable = this->alignable();
   if (!alignable) {
-    throw cms::Exception("BadParameters") 
-      << "BeamSpotAlignmentParameters::apply: parameters without alignable";
+    throw cms::Exception("BadParameters") << "BeamSpotAlignmentParameters::apply: parameters without alignable";
   }
-  
+
   // Translation in local frame
-  AlgebraicVector shift = this->translation(); // fixme: should be LocalVector
-  
+  AlgebraicVector shift = this->translation();  // fixme: should be LocalVector
+
   // Translation local->global
   align::GlobalVector gv(shift[0], shift[1], shift[2]);
-  alignable->move( gv );
+  alignable->move(gv);
 
   // Rotation in local frame
   align::EulerAngles angles = this->rotation();
   // original code:
   //  alignable->rotateInLocalFrame( align::toMatrix(angles) );
   // correct for rounding errors:
-  align::RotationType rot = alignable->surface().toGlobal( align::toMatrix(angles) );
+  align::RotationType rot = alignable->surface().toGlobal(align::toMatrix(angles));
   align::rectify(rot);
   alignable->rotateInGlobalFrame(rot);
 }
 
 //__________________________________________________________________________________________________
-int BeamSpotAlignmentParameters::type() const
-{
-  return AlignmentParametersFactory::kBeamSpot;
-}
+int BeamSpotAlignmentParameters::type() const { return AlignmentParametersFactory::kBeamSpot; }
 
 //__________________________________________________________________________________________________
-AlgebraicVector BeamSpotAlignmentParameters::globalParameters(void) const
-{
+AlgebraicVector BeamSpotAlignmentParameters::globalParameters(void) const {
   AlgebraicVector m_GlobalParameters(N_PARAM, 0);
 
-  const AlgebraicVector shift = translation(); // fixme: should return LocalVector
+  const AlgebraicVector shift = translation();  // fixme: should return LocalVector
 
   const align::GlobalVector dg(shift[0], shift[1], 0);
-  
+
   m_GlobalParameters[0] = dg.x();
   m_GlobalParameters[1] = dg.y();
-  
+
   align::LocalVector lv(0.0, 0.0, 1.0);
   align::GlobalVector gv = theAlignable->surface().toGlobal(lv);
-  
-  double dxdz = gv.x()/gv.z();
-  double dydz = gv.x()/gv.z();
-  
+
+  double dxdz = gv.x() / gv.z();
+  double dydz = gv.x() / gv.z();
+
   m_GlobalParameters[2] = dxdz;
   m_GlobalParameters[3] = dydz;
-  
+
   return m_GlobalParameters;
 }
 
 //__________________________________________________________________________________________________
-void BeamSpotAlignmentParameters::print(void) const
-{
-
+void BeamSpotAlignmentParameters::print(void) const {
   std::cout << "Contents of BeamSpotAlignmentParameters:"
-            << "\nParameters: " << theData->parameters()
-            << "\nCovariance: " << theData->covariance() << std::endl;
+            << "\nParameters: " << theData->parameters() << "\nCovariance: " << theData->covariance() << std::endl;
 }
 
 //__________________________________________________________________________________________________
-AlgebraicVector BeamSpotAlignmentParameters::displacementFromAlignable(const Alignable* ali)
-{
+AlgebraicVector BeamSpotAlignmentParameters::displacementFromAlignable(const Alignable *ali) {
   AlgebraicVector displacement(N_PARAM);
 
   if (ali) {
-    const align::RotationType& dR = ali->rotation();
-    
-    const align::LocalVector shifts( ali->globalRotation() * 
-				     ( dR.transposed() * ali->displacement().basicVector() ) );
-    
+    const align::RotationType &dR = ali->rotation();
+
+    const align::LocalVector shifts(ali->globalRotation() * (dR.transposed() * ali->displacement().basicVector()));
+
     align::GlobalVector gv(0.0, 0.0, 1.0);
     align::LocalVector lv(dR.transposed() * gv.basicVector());
-    
+
     displacement[0] = shifts.x();
     displacement[1] = shifts.y();
-    displacement[2] = lv.x()/lv.z();
-    displacement[3] = lv.y()/lv.z();
+    displacement[2] = lv.x() / lv.z();
+    displacement[3] = lv.y() / lv.z();
   }
 
   return displacement;
diff --git a/Alignment/CommonAlignmentParametrization/src/BowedSurfaceAlignmentDerivatives.cc b/Alignment/CommonAlignmentParametrization/src/BowedSurfaceAlignmentDerivatives.cc
index afc2d75fc5e9e..ccb2adafbf845 100644
--- a/Alignment/CommonAlignmentParametrization/src/BowedSurfaceAlignmentDerivatives.cc
+++ b/Alignment/CommonAlignmentParametrization/src/BowedSurfaceAlignmentDerivatives.cc
@@ -6,16 +6,12 @@
 
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 
-#include "Alignment/CommonAlignmentParametrization/interface/KarimakiAlignmentDerivatives.h"
 #include "Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentDerivatives.h"
+#include "Alignment/CommonAlignmentParametrization/interface/KarimakiAlignmentDerivatives.h"
 #include <cmath>
 
-AlgebraicMatrix 
-BowedSurfaceAlignmentDerivatives::operator()(const TrajectoryStateOnSurface &tsos,
-					     double uWidth, double vLength,
-					     bool doSplit, double ySplit) const
-{ 
-
+AlgebraicMatrix BowedSurfaceAlignmentDerivatives::operator()(
+    const TrajectoryStateOnSurface &tsos, double uWidth, double vLength, bool doSplit, double ySplit) const {
   AlgebraicMatrix result(N_PARAM, 2);
 
   // track parameters on surface:
@@ -26,15 +22,17 @@ BowedSurfaceAlignmentDerivatives::operator()(const TrajectoryStateOnSurface &tso
   // [4] y    : local y-coordinate
   double myY = tsosPar[4];
   double myLengthV = vLength;
-  if (doSplit) { // re-'calibrate' y length and transform myY to be w.r.t. surface middle
-    // Some signs depend on whether we are in surface part below or above ySplit:
-    const double sign = (tsosPar[4] < ySplit ? +1. : -1.); 
-    const double yMiddle = ySplit * 0.5 - sign * vLength * .25; // middle of surface
+  if (doSplit) {  // re-'calibrate' y length and transform myY to be w.r.t.
+                  // surface middle
+    // Some signs depend on whether we are in surface part below or above
+    // ySplit:
+    const double sign = (tsosPar[4] < ySplit ? +1. : -1.);
+    const double yMiddle = ySplit * 0.5 - sign * vLength * .25;  // middle of surface
     myY = tsosPar[4] - yMiddle;
     myLengthV = vLength * 0.5 + sign * ySplit;
   }
 
-  const AlgebraicMatrix karimaki(KarimakiAlignmentDerivatives()(tsos)); // it's just 6x2...
+  const AlgebraicMatrix karimaki(KarimakiAlignmentDerivatives()(tsos));  // it's just 6x2...
   // copy u, v, w from Karimaki - they are independent of splitting
   result[dx][0] = karimaki[0][0];
   result[dx][1] = karimaki[0][1];
@@ -43,45 +41,52 @@ BowedSurfaceAlignmentDerivatives::operator()(const TrajectoryStateOnSurface &tso
   result[dz][0] = karimaki[2][0];
   result[dz][1] = karimaki[2][1];
   const double aScale = gammaScale(uWidth, myLengthV);
-  result[drotZ][0] = myY / aScale; // Since karimaki[5][0] == vx;
+  result[drotZ][0] = myY / aScale;  // Since karimaki[5][0] == vx;
   result[drotZ][1] = karimaki[5][1] / aScale;
 
   double uRel = 2. * tsosPar[3] / uWidth;  // relative u (-1 .. +1)
-  double vRel = 2. * myY / myLengthV;       // relative v (-1 .. +1)
+  double vRel = 2. * myY / myLengthV;      // relative v (-1 .. +1)
   // 'range check':
   const double cutOff = 1.5;
-  if (uRel < -cutOff) { uRel = -cutOff; } else if (uRel > cutOff) { uRel = cutOff; }
-  if (vRel < -cutOff) { vRel = -cutOff; } else if (vRel > cutOff) { vRel = cutOff; }
+  if (uRel < -cutOff) {
+    uRel = -cutOff;
+  } else if (uRel > cutOff) {
+    uRel = cutOff;
+  }
+  if (vRel < -cutOff) {
+    vRel = -cutOff;
+  } else if (vRel > cutOff) {
+    vRel = cutOff;
+  }
 
   // Legendre polynomials renormalized to LPn(1)-LPn(0)=1 (n>0)
   const double uLP0 = 1.0;
   const double uLP1 = uRel;
-  const double uLP2 = uRel * uRel - 1./3.;
+  const double uLP2 = uRel * uRel - 1. / 3.;
   const double vLP0 = 1.0;
   const double vLP1 = vRel;
-  const double vLP2 = vRel * vRel - 1./3.;
+  const double vLP2 = vRel * vRel - 1. / 3.;
 
   // 1st order (slopes, replacing angles beta, alpha)
   result[dslopeX][0] = tsosPar[1] * uLP1 * vLP0;
   result[dslopeX][1] = tsosPar[2] * uLP1 * vLP0;
   result[dslopeY][0] = tsosPar[1] * uLP0 * vLP1;
   result[dslopeY][1] = tsosPar[2] * uLP0 * vLP1;
-  
+
   // 2nd order (sagitta)
-  result[dsagittaX ][0] = tsosPar[1] * uLP2 * vLP0;
-  result[dsagittaX ][1] = tsosPar[2] * uLP2 * vLP0;
+  result[dsagittaX][0] = tsosPar[1] * uLP2 * vLP0;
+  result[dsagittaX][1] = tsosPar[2] * uLP2 * vLP0;
   result[dsagittaXY][0] = tsosPar[1] * uLP1 * vLP1;
   result[dsagittaXY][1] = tsosPar[2] * uLP1 * vLP1;
-  result[dsagittaY ][0] = tsosPar[1] * uLP0 * vLP2;
-  result[dsagittaY ][1] = tsosPar[2] * uLP0 * vLP2;
-   
+  result[dsagittaY][0] = tsosPar[1] * uLP0 * vLP2;
+  result[dsagittaY][1] = tsosPar[2] * uLP0 * vLP2;
+
   return result;
 }
 
 //------------------------------------------------------------------------------
-double BowedSurfaceAlignmentDerivatives::gammaScale(double width, double splitLength)
-{
-//   return 0.5 * std::sqrt(width*width + splitLength*splitLength);
-//   return 0.5 * (std::fabs(width) + std::fabs(splitLength));
+double BowedSurfaceAlignmentDerivatives::gammaScale(double width, double splitLength) {
+  //   return 0.5 * std::sqrt(width*width + splitLength*splitLength);
+  //   return 0.5 * (std::fabs(width) + std::fabs(splitLength));
   return 0.5 * (width + splitLength);
 }
diff --git a/Alignment/CommonAlignmentParametrization/src/BowedSurfaceAlignmentParameters.cc b/Alignment/CommonAlignmentParametrization/src/BowedSurfaceAlignmentParameters.cc
index 4034970b144ce..5e07e9e76c859 100644
--- a/Alignment/CommonAlignmentParametrization/src/BowedSurfaceAlignmentParameters.cc
+++ b/Alignment/CommonAlignmentParametrization/src/BowedSurfaceAlignmentParameters.cc
@@ -5,119 +5,101 @@
  *  by         : $Author: flucke $
  */
 
-#include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 
 #include "Alignment/CommonAlignment/interface/Alignable.h"
 #include "Alignment/CommonAlignment/interface/AlignableDetOrUnitPtr.h"
-#include "Alignment/CommonAlignmentParametrization/interface/KarimakiAlignmentDerivatives.h"
 #include "Alignment/CommonAlignmentParametrization/interface/AlignmentParametersFactory.h"
+#include "Alignment/CommonAlignmentParametrization/interface/KarimakiAlignmentDerivatives.h"
 #include "CondFormats/Alignment/interface/Definitions.h"
 #include "Geometry/CommonTopologies/interface/BowedSurfaceDeformation.h"
 
-
-// This class's header 
+// This class's header
 #include "Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentParameters.h"
 
 #include <iostream>
 //_________________________________________________________________________________________________
-BowedSurfaceAlignmentParameters::BowedSurfaceAlignmentParameters(Alignable *ali) :
-  AlignmentParameters(ali, AlgebraicVector(N_PARAM), AlgebraicSymMatrix(N_PARAM, 0))
-{
-}
+BowedSurfaceAlignmentParameters::BowedSurfaceAlignmentParameters(Alignable *ali)
+    : AlignmentParameters(ali, AlgebraicVector(N_PARAM), AlgebraicSymMatrix(N_PARAM, 0)) {}
 
 //_________________________________________________________________________________________________
-BowedSurfaceAlignmentParameters
-::BowedSurfaceAlignmentParameters(Alignable *alignable, 
-				  const AlgebraicVector &parameters, 
-				  const AlgebraicSymMatrix &covMatrix) :
-  AlignmentParameters(alignable, parameters, covMatrix)
-{
+BowedSurfaceAlignmentParameters ::BowedSurfaceAlignmentParameters(Alignable *alignable,
+                                                                  const AlgebraicVector &parameters,
+                                                                  const AlgebraicSymMatrix &covMatrix)
+    : AlignmentParameters(alignable, parameters, covMatrix) {
   if (parameters.num_row() != N_PARAM) {
-    throw cms::Exception("BadParameters") << "in BowedSurfaceAlignmentParameters(): "
-                                          << parameters.num_row() << " instead of " << N_PARAM 
-                                          << " parameters.";
+    throw cms::Exception("BadParameters") << "in BowedSurfaceAlignmentParameters(): " << parameters.num_row()
+                                          << " instead of " << N_PARAM << " parameters.";
   }
 }
 
 //_________________________________________________________________________________________________
-BowedSurfaceAlignmentParameters
-::BowedSurfaceAlignmentParameters(Alignable *alignable, 
-				  const AlgebraicVector &parameters, 
-				  const AlgebraicSymMatrix &covMatrix,
-				  const std::vector<bool> &selection) :
-  AlignmentParameters(alignable, parameters, covMatrix, selection)
-{  
+BowedSurfaceAlignmentParameters ::BowedSurfaceAlignmentParameters(Alignable *alignable,
+                                                                  const AlgebraicVector &parameters,
+                                                                  const AlgebraicSymMatrix &covMatrix,
+                                                                  const std::vector<bool> &selection)
+    : AlignmentParameters(alignable, parameters, covMatrix, selection) {
   if (parameters.num_row() != N_PARAM) {
-    throw cms::Exception("BadParameters") << "in BowedSurfaceAlignmentParameters(): "
-                                          << parameters.num_row() << " instead of " << N_PARAM 
-                                          << " parameters.";
+    throw cms::Exception("BadParameters") << "in BowedSurfaceAlignmentParameters(): " << parameters.num_row()
+                                          << " instead of " << N_PARAM << " parameters.";
   }
 }
 
 //_________________________________________________________________________________________________
-BowedSurfaceAlignmentParameters* 
-BowedSurfaceAlignmentParameters::clone(const AlgebraicVector &parameters, 
-				       const AlgebraicSymMatrix &covMatrix) const 
-{
-  BowedSurfaceAlignmentParameters* rbap = 
-    new BowedSurfaceAlignmentParameters(this->alignable(), parameters, covMatrix, selector());
-
-  if (this->userVariables()) rbap->setUserVariables(this->userVariables()->clone());
+BowedSurfaceAlignmentParameters *BowedSurfaceAlignmentParameters::clone(const AlgebraicVector &parameters,
+                                                                        const AlgebraicSymMatrix &covMatrix) const {
+  BowedSurfaceAlignmentParameters *rbap =
+      new BowedSurfaceAlignmentParameters(this->alignable(), parameters, covMatrix, selector());
+
+  if (this->userVariables())
+    rbap->setUserVariables(this->userVariables()->clone());
   rbap->setValid(this->isValid());
 
   return rbap;
 }
 
 //_________________________________________________________________________________________________
-BowedSurfaceAlignmentParameters* 
-BowedSurfaceAlignmentParameters::cloneFromSelected(const AlgebraicVector &parameters,
-						   const AlgebraicSymMatrix &covMatrix) const
-{
+BowedSurfaceAlignmentParameters *BowedSurfaceAlignmentParameters::cloneFromSelected(
+    const AlgebraicVector &parameters, const AlgebraicSymMatrix &covMatrix) const {
   return this->clone(this->expandVector(parameters, this->selector()),
-		     this->expandSymMatrix(covMatrix, this->selector()));
-
+                     this->expandSymMatrix(covMatrix, this->selector()));
 }
 
 //_________________________________________________________________________________________________
-AlgebraicMatrix 
-BowedSurfaceAlignmentParameters::derivatives(const TrajectoryStateOnSurface &tsos,
-					     const AlignableDetOrUnitPtr &alidet) const
-{
-  const Alignable *ali = this->alignable(); // Alignable of these parameters
+AlgebraicMatrix BowedSurfaceAlignmentParameters::derivatives(const TrajectoryStateOnSurface &tsos,
+                                                             const AlignableDetOrUnitPtr &alidet) const {
+  const Alignable *ali = this->alignable();  // Alignable of these parameters
 
   if (ali == alidet) {
     const AlignableSurface &surf = ali->surface();
     return BowedDerivs()(tsos, surf.width(), surf.length());
   } else {
-    // We could give this a meaning by applying frame-to-frame derivatives 
+    // We could give this a meaning by applying frame-to-frame derivatives
     // to the first six parameters (be careful that alpha and beta changed
     // their scale and switched their place compared to RigidBody!) and
     // keep the remaining three untouched in local meaning.
     // In this way we could do higher level alignment and determine 'average'
     // surface structures for the components.
-    throw cms::Exception("MisMatch")
-      << "BowedSurfaceAlignmentParameters::derivatives: The hit alignable must match the "
-      << "aligned one (i.e. bowed surface parameters cannot be used for composed alignables)\n";
-    return AlgebraicMatrix(N_PARAM, 2); // please compiler
+    throw cms::Exception("MisMatch") << "BowedSurfaceAlignmentParameters::derivatives: The hit alignable "
+                                        "must match the "
+                                     << "aligned one (i.e. bowed surface parameters cannot be used for "
+                                        "composed alignables)\n";
+    return AlgebraicMatrix(N_PARAM, 2);  // please compiler
   }
-
 }
 
 //_________________________________________________________________________________________________
-align::LocalVector BowedSurfaceAlignmentParameters::translation() const
-{ 
+align::LocalVector BowedSurfaceAlignmentParameters::translation() const {
   // align::LocalVector uses double while LocalVector uses float only!
   const AlgebraicVector &params = theData->parameters();
   return align::LocalVector(params[dx], params[dy], params[dz]);
 }
 
-
 //_________________________________________________________________________________________________
-align::EulerAngles BowedSurfaceAlignmentParameters::rotation() const
-{
+align::EulerAngles BowedSurfaceAlignmentParameters::rotation() const {
   const AlgebraicVector &params = theData->parameters();
   const Alignable *alignable = this->alignable();
   const AlignableSurface &surface = alignable->surface();
@@ -125,23 +107,22 @@ align::EulerAngles BowedSurfaceAlignmentParameters::rotation() const
   align::EulerAngles eulerAngles(3);
   // Note that dslopeX <-> -beta and dslopeY <-> alpha:
   // Should we use atan of these values? Anyway it is small...
-  eulerAngles[0] =  params[dslopeY] * 2. / surface.length();
+  eulerAngles[0] = params[dslopeY] * 2. / surface.length();
   eulerAngles[1] = -params[dslopeX] * 2. / surface.width();
   const double aScale = BowedDerivs::gammaScale(surface.width(), surface.length());
-  eulerAngles[2] =  params[drotZ] / aScale;
+  eulerAngles[2] = params[drotZ] / aScale;
 
   return eulerAngles;
 }
 
 //_________________________________________________________________________________________________
-void BowedSurfaceAlignmentParameters::apply()
-{
+void BowedSurfaceAlignmentParameters::apply() {
   Alignable *alignable = this->alignable();
   if (!alignable) {
-    throw cms::Exception("BadParameters") 
-      << "BowedSurfaceAlignmentParameters::apply: parameters without alignable";
+    throw cms::Exception("BadParameters") << "BowedSurfaceAlignmentParameters::apply: parameters without "
+                                             "alignable";
   }
-  
+
   // Get translation in local frame, transform to global and apply:
   alignable->move(alignable->surface().toGlobal(this->translation()));
 
@@ -156,7 +137,7 @@ void BowedSurfaceAlignmentParameters::apply()
 
   // only update the surface deformations if they were selected for alignment
   if (selector()[dsagittaX] || selector()[dsagittaXY] || selector()[dsagittaY]) {
-    const auto& params = theData->parameters();
+    const auto &params = theData->parameters();
     const BowedSurfaceDeformation deform{params[dsagittaX], params[dsagittaXY], params[dsagittaY]};
 
     // FIXME: true to propagate down?
@@ -167,15 +148,10 @@ void BowedSurfaceAlignmentParameters::apply()
 }
 
 //_________________________________________________________________________________________________
-int BowedSurfaceAlignmentParameters::type() const
-{
-  return AlignmentParametersFactory::kBowedSurface;
-}
+int BowedSurfaceAlignmentParameters::type() const { return AlignmentParametersFactory::kBowedSurface; }
 
 //_________________________________________________________________________________________________
-void BowedSurfaceAlignmentParameters::print() const
-{
+void BowedSurfaceAlignmentParameters::print() const {
   std::cout << "Contents of BowedSurfaceAlignmentParameters:"
-            << "\nParameters: " << theData->parameters()
-            << "\nCovariance: " << theData->covariance() << std::endl;
+            << "\nParameters: " << theData->parameters() << "\nCovariance: " << theData->covariance() << std::endl;
 }
diff --git a/Alignment/CommonAlignmentParametrization/src/CompositeAlignmentDerivativesExtractor.cc b/Alignment/CommonAlignmentParametrization/src/CompositeAlignmentDerivativesExtractor.cc
index a5d263601c2b5..184b14a5cbab8 100644
--- a/Alignment/CommonAlignmentParametrization/src/CompositeAlignmentDerivativesExtractor.cc
+++ b/Alignment/CommonAlignmentParametrization/src/CompositeAlignmentDerivativesExtractor.cc
@@ -8,86 +8,77 @@
 #include "Alignment/CommonAlignmentParametrization/interface/CompositeAlignmentDerivativesExtractor.h"
 
 //--------------------------------------------------------------------------------------
-CompositeAlignmentDerivativesExtractor::
-CompositeAlignmentDerivativesExtractor( const align::Alignables & alignables,
-                                        const std::vector< AlignableDet* > & alignableDets,
-                                        const std::vector< TrajectoryStateOnSurface > & tsos )
-{
+CompositeAlignmentDerivativesExtractor::CompositeAlignmentDerivativesExtractor(
+    const align::Alignables &alignables,
+    const std::vector<AlignableDet *> &alignableDets,
+    const std::vector<TrajectoryStateOnSurface> &tsos) {
   std::vector<AlignableDetOrUnitPtr> detOrUnits;
   detOrUnits.reserve(alignableDets.size());
 
-  std::vector<AlignableDet*>::const_iterator it, itEnd;
+  std::vector<AlignableDet *>::const_iterator it, itEnd;
   for (it = alignableDets.begin(), itEnd = alignableDets.end(); it != itEnd; ++it)
     detOrUnits.push_back(AlignableDetOrUnitPtr(*it));
 
-  extractCurrentAlignment( alignables, detOrUnits, tsos );
+  extractCurrentAlignment(alignables, detOrUnits, tsos);
 }
 
 //--------------------------------------------------------------------------------------
-CompositeAlignmentDerivativesExtractor::
-CompositeAlignmentDerivativesExtractor( const align::Alignables & alignables,
-                                        const std::vector< AlignableDetOrUnitPtr > & alignableDets,
-                                        const std::vector< TrajectoryStateOnSurface > & tsos )
-{
-  extractCurrentAlignment( alignables, alignableDets, tsos );
+CompositeAlignmentDerivativesExtractor::CompositeAlignmentDerivativesExtractor(
+    const align::Alignables &alignables,
+    const std::vector<AlignableDetOrUnitPtr> &alignableDets,
+    const std::vector<TrajectoryStateOnSurface> &tsos) {
+  extractCurrentAlignment(alignables, alignableDets, tsos);
 }
 
 //--------------------------------------------------------------------------------------
 
-void CompositeAlignmentDerivativesExtractor::
-extractCurrentAlignment( const align::Alignables & alignables,
-                         const std::vector< AlignableDetOrUnitPtr > & alignableDets,
-                         const std::vector< TrajectoryStateOnSurface > & tsos )
-{
-
+void CompositeAlignmentDerivativesExtractor::extractCurrentAlignment(
+    const align::Alignables &alignables,
+    const std::vector<AlignableDetOrUnitPtr> &alignableDets,
+    const std::vector<TrajectoryStateOnSurface> &tsos) {
   // sanity check
-  if ( alignables.size() != alignableDets.size() )
-  {
-	edm::LogError("CompositeAlignmentDerivativesExtractor") 
-	  << "Inconsistent length of arguments: alignables=" << alignables.size() 
-	  << ", alignableDets=" << alignableDets.size();
+  if (alignables.size() != alignableDets.size()) {
+    edm::LogError("CompositeAlignmentDerivativesExtractor")
+        << "Inconsistent length of arguments: alignables=" << alignables.size()
+        << ", alignableDets=" << alignableDets.size();
     return;
   }
 
-  if ( alignables.size() != tsos.size() )
-	{
-	  edm::LogError("CompositeAlignmentDerivativesExtractor") 
-		<< "Inconsistent length of arguments: alignables=" << alignables.size()
-		<< ", tsos=" << tsos.size();
-	  return;
-	}
+  if (alignables.size() != tsos.size()) {
+    edm::LogError("CompositeAlignmentDerivativesExtractor")
+        << "Inconsistent length of arguments: alignables=" << alignables.size() << ", tsos=" << tsos.size();
+    return;
+  }
 
   align::Alignables::const_iterator itAlignable = alignables.begin();
-  std::vector< AlignableDetOrUnitPtr >::const_iterator itAlignableDet = alignableDets.begin();
-  std::vector< TrajectoryStateOnSurface >::const_iterator itTsos = tsos.begin();
+  std::vector<AlignableDetOrUnitPtr>::const_iterator itAlignableDet = alignableDets.begin();
+  std::vector<TrajectoryStateOnSurface>::const_iterator itTsos = tsos.begin();
 
   int nRow = 0;
   int nCollumn = 0;
   unsigned int nAlignables = 0;
 
-  std::vector< AlgebraicMatrix > subDerivatives;
-  std::vector< AlgebraicVector > subCorrectionTerm;
+  std::vector<AlgebraicMatrix> subDerivatives;
+  std::vector<AlgebraicVector> subCorrectionTerm;
 
-
-  // get the individual derivatives and correction term and determine the dimension
-  while ( itAlignable != alignables.end() )
-  {
+  // get the individual derivatives and correction term and determine the
+  // dimension
+  while (itAlignable != alignables.end()) {
     // Get the current estimate on the alignment parameters
-    AlgebraicVector subAlignmentParameters = 
-	  ( *itAlignable )->alignmentParameters()->selectedParameters();
+    AlgebraicVector subAlignmentParameters = (*itAlignable)->alignmentParameters()->selectedParameters();
 
-    // Get the derivatives or the local coordinates w.r.t. the corresponding alignment parameters
+    // Get the derivatives or the local coordinates w.r.t. the corresponding
+    // alignment parameters
     AlgebraicMatrix subAlignmentDerivatives =
-      ( *itAlignable )->alignmentParameters()->selectedDerivatives( *itTsos, *itAlignableDet );
+        (*itAlignable)->alignmentParameters()->selectedDerivatives(*itTsos, *itAlignableDet);
 
-    subDerivatives.push_back( subAlignmentDerivatives.T() );
-    subCorrectionTerm.push_back( subAlignmentDerivatives.T()*subAlignmentParameters );
+    subDerivatives.push_back(subAlignmentDerivatives.T());
+    subCorrectionTerm.push_back(subAlignmentDerivatives.T() * subAlignmentParameters);
 
     nRow += 2;
     // check if it is the first occurrence of this Alignable
-    if ( count( alignables.begin(), itAlignable, *itAlignable ) == 0 )
-    {
-	  // matrix is transposed -> num_row() instead of num_col()
+    if (count(alignables.begin(), itAlignable, *itAlignable) == 0) {
+      // matrix is transposed -> num_row() instead of num_col()
       nCollumn += subAlignmentDerivatives.num_row();
       nAlignables++;
     }
@@ -98,40 +89,36 @@ extractCurrentAlignment( const align::Alignables & alignables,
   }
 
   // construct derivatives and correction term with the right dimension
-  theDerivatives = AlgebraicMatrix( nRow, nCollumn, 0 );
-  theCorrectionTerm = AlgebraicVector( nRow, 0 );
+  theDerivatives = AlgebraicMatrix(nRow, nCollumn, 0);
+  theCorrectionTerm = AlgebraicVector(nRow, 0);
 
-  if ( alignables.size() == nAlignables )
+  if (alignables.size() == nAlignables)
     // One hit per alignable
-    extractWithoutMultipleHits( subCorrectionTerm, subDerivatives );
+    extractWithoutMultipleHits(subCorrectionTerm, subDerivatives);
   else
     // At least one alignable has two hits
-    extractWithMultipleHits( subCorrectionTerm, subDerivatives, alignables );
+    extractWithMultipleHits(subCorrectionTerm, subDerivatives, alignables);
 
   return;
-
 }
 
 //--------------------------------------------------------------------------------------
 
-void CompositeAlignmentDerivativesExtractor::
-extractWithoutMultipleHits( const std::vector< AlgebraicVector > & subCorrectionTerm,
-							const std::vector< AlgebraicMatrix > & subDerivatives )
-{
-  std::vector< AlgebraicVector >::const_iterator itSubCorrectionTerm = subCorrectionTerm.begin();
-  std::vector< AlgebraicMatrix >::const_iterator itSubDerivatives = subDerivatives.begin();
+void CompositeAlignmentDerivativesExtractor::extractWithoutMultipleHits(
+    const std::vector<AlgebraicVector> &subCorrectionTerm, const std::vector<AlgebraicMatrix> &subDerivatives) {
+  std::vector<AlgebraicVector>::const_iterator itSubCorrectionTerm = subCorrectionTerm.begin();
+  std::vector<AlgebraicMatrix>::const_iterator itSubDerivatives = subDerivatives.begin();
 
   int iRow = 1;
   int iCollumn = 1;
 
   // Fill in the individual terms
-  while ( itSubCorrectionTerm != subCorrectionTerm.end() )
-  {
-    theCorrectionTerm.sub( iRow, *itSubCorrectionTerm );
-    theDerivatives.sub( iRow, iCollumn, *itSubDerivatives );
+  while (itSubCorrectionTerm != subCorrectionTerm.end()) {
+    theCorrectionTerm.sub(iRow, *itSubCorrectionTerm);
+    theDerivatives.sub(iRow, iCollumn, *itSubDerivatives);
 
     iRow += 2;
-    iCollumn += ( *itSubDerivatives ).num_col();
+    iCollumn += (*itSubDerivatives).num_col();
 
     ++itSubCorrectionTerm;
     ++itSubDerivatives;
@@ -142,14 +129,12 @@ extractWithoutMultipleHits( const std::vector< AlgebraicVector > & subCorrection
 
 //--------------------------------------------------------------------------------------
 
-void CompositeAlignmentDerivativesExtractor::
-extractWithMultipleHits(const std::vector<AlgebraicVector>& subCorrectionTerm,
-                        const std::vector<AlgebraicMatrix>& subDerivatives,
-                        const align::Alignables& alignables)
-{
-
-  std::vector< AlgebraicVector >::const_iterator itSubCorrectionTerm = subCorrectionTerm.begin();
-  std::vector< AlgebraicMatrix >::const_iterator itSubDerivatives = subDerivatives.begin();
+void CompositeAlignmentDerivativesExtractor::extractWithMultipleHits(
+    const std::vector<AlgebraicVector> &subCorrectionTerm,
+    const std::vector<AlgebraicMatrix> &subDerivatives,
+    const align::Alignables &alignables) {
+  std::vector<AlgebraicVector>::const_iterator itSubCorrectionTerm = subCorrectionTerm.begin();
+  std::vector<AlgebraicMatrix>::const_iterator itSubDerivatives = subDerivatives.begin();
   align::Alignables::const_iterator itAlignables = alignables.begin();
   align::Alignables::const_iterator itPosition;
   align::Alignables::const_iterator itLastPosition;
@@ -157,26 +142,24 @@ extractWithMultipleHits(const std::vector<AlgebraicVector>& subCorrectionTerm,
   int iRow = 1;
 
   // Fill in the individual terms
-  while ( itAlignables != alignables.end() )
-  {
-    theCorrectionTerm.sub( iRow, *itSubCorrectionTerm );
+  while (itAlignables != alignables.end()) {
+    theCorrectionTerm.sub(iRow, *itSubCorrectionTerm);
 
     int iCollumn = 1;
     int iAlignable = 0;
 
-    itLastPosition = find( alignables.begin(), itAlignables, *itAlignables );
+    itLastPosition = find(alignables.begin(), itAlignables, *itAlignables);
 
-    for ( itPosition = alignables.begin(); itPosition != itLastPosition; ++itPosition )
-	  {
-		if ( count( alignables.begin(), itPosition, *itPosition ) == 0 )
-		  iCollumn += subDerivatives[iAlignable].num_col();
-		iAlignable++;
-	  }
+    for (itPosition = alignables.begin(); itPosition != itLastPosition; ++itPosition) {
+      if (count(alignables.begin(), itPosition, *itPosition) == 0)
+        iCollumn += subDerivatives[iAlignable].num_col();
+      iAlignable++;
+    }
 
-    theDerivatives.sub( iRow, iCollumn, *itSubDerivatives );
+    theDerivatives.sub(iRow, iCollumn, *itSubDerivatives);
 
     iRow += 2;
-	
+
     ++itAlignables;
     ++itSubCorrectionTerm;
     ++itSubDerivatives;
@@ -184,4 +167,3 @@ extractWithMultipleHits(const std::vector<AlgebraicVector>& subCorrectionTerm,
 
   return;
 }
-
diff --git a/Alignment/CommonAlignmentParametrization/src/CompositeAlignmentParameters.cc b/Alignment/CommonAlignmentParametrization/src/CompositeAlignmentParameters.cc
index 7a5836450d8f9..a68a5eced429b 100644
--- a/Alignment/CommonAlignmentParametrization/src/CompositeAlignmentParameters.cc
+++ b/Alignment/CommonAlignmentParametrization/src/CompositeAlignmentParameters.cc
@@ -13,109 +13,86 @@
 
 #include "Alignment/CommonAlignment/interface/AlignmentParameters.h"
 
-
 //__________________________________________________________________________________________________
-CompositeAlignmentParameters::
-CompositeAlignmentParameters(const AlgebraicVector& par, const AlgebraicSymMatrix& cov,
-			     const Components& comp) :
-  theData(DataContainer(new AlignmentParametersData(par, cov))),
-  theComponents(comp) 
-{}
-
+CompositeAlignmentParameters::CompositeAlignmentParameters(const AlgebraicVector &par,
+                                                           const AlgebraicSymMatrix &cov,
+                                                           const Components &comp)
+    : theData(DataContainer(new AlignmentParametersData(par, cov))), theComponents(comp) {}
 
 //__________________________________________________________________________________________________
-CompositeAlignmentParameters::
-CompositeAlignmentParameters(const AlgebraicVector& par, const AlgebraicSymMatrix& cov,
-			     const Components& comp, const AlignableDetToAlignableMap& alimap,
-			     const Aliposmap& aliposmap, const Alilenmap& alilenmap) :
-  theData(DataContainer(new AlignmentParametersData(par, cov))),
-  theComponents(comp) ,
-  theAlignableDetToAlignableMap(alimap),
-  theAliposmap(aliposmap),
-  theAlilenmap(alilenmap)
-{}
-
+CompositeAlignmentParameters::CompositeAlignmentParameters(const AlgebraicVector &par,
+                                                           const AlgebraicSymMatrix &cov,
+                                                           const Components &comp,
+                                                           const AlignableDetToAlignableMap &alimap,
+                                                           const Aliposmap &aliposmap,
+                                                           const Alilenmap &alilenmap)
+    : theData(DataContainer(new AlignmentParametersData(par, cov))),
+      theComponents(comp),
+      theAlignableDetToAlignableMap(alimap),
+      theAliposmap(aliposmap),
+      theAlilenmap(alilenmap) {}
 
 //__________________________________________________________________________________________________
-CompositeAlignmentParameters::
-CompositeAlignmentParameters(const DataContainer& data,
-			     const Components& comp, const AlignableDetToAlignableMap& alimap,
-			     const Aliposmap& aliposmap, const Alilenmap& alilenmap) :
-  theData(data),
-  theComponents(comp) ,
-  theAlignableDetToAlignableMap(alimap),
-  theAliposmap(aliposmap),
-  theAlilenmap(alilenmap)
-{}
-
+CompositeAlignmentParameters::CompositeAlignmentParameters(const DataContainer &data,
+                                                           const Components &comp,
+                                                           const AlignableDetToAlignableMap &alimap,
+                                                           const Aliposmap &aliposmap,
+                                                           const Alilenmap &alilenmap)
+    : theData(data),
+      theComponents(comp),
+      theAlignableDetToAlignableMap(alimap),
+      theAliposmap(aliposmap),
+      theAlilenmap(alilenmap) {}
 
 //__________________________________________________________________________________________________
-CompositeAlignmentParameters::~CompositeAlignmentParameters() 
-{}
-
+CompositeAlignmentParameters::~CompositeAlignmentParameters() {}
 
 //__________________________________________________________________________________________________
-CompositeAlignmentParameters* 
-CompositeAlignmentParameters::clone( const AlgebraicVector& par, 
-				     const AlgebraicSymMatrix& cov) const
-{
-  CompositeAlignmentParameters* cap = 
-    new CompositeAlignmentParameters(par,cov,components());
+CompositeAlignmentParameters *CompositeAlignmentParameters::clone(const AlgebraicVector &par,
+                                                                  const AlgebraicSymMatrix &cov) const {
+  CompositeAlignmentParameters *cap = new CompositeAlignmentParameters(par, cov, components());
 
   return cap;
 }
 
 //__________________________________________________________________________________________________
-CompositeAlignmentParameters* 
-CompositeAlignmentParameters::clone( const AlgebraicVector& par, 
-				     const AlgebraicSymMatrix& cov,
-				     const AlignableDetToAlignableMap& alimap, 
-				     const Aliposmap& aliposmap,
-				     const Alilenmap& alilenmap ) const
-{
-  CompositeAlignmentParameters* cap = 
-    new CompositeAlignmentParameters(par,cov,components(),alimap,aliposmap,alilenmap);
+CompositeAlignmentParameters *CompositeAlignmentParameters::clone(const AlgebraicVector &par,
+                                                                  const AlgebraicSymMatrix &cov,
+                                                                  const AlignableDetToAlignableMap &alimap,
+                                                                  const Aliposmap &aliposmap,
+                                                                  const Alilenmap &alilenmap) const {
+  CompositeAlignmentParameters *cap =
+      new CompositeAlignmentParameters(par, cov, components(), alimap, aliposmap, alilenmap);
 
   return cap;
 }
 
 //__________________________________________________________________________________________________
-CompositeAlignmentParameters::Components 
-CompositeAlignmentParameters::components() const
-{ 
-  return theComponents;
-}
-
+CompositeAlignmentParameters::Components CompositeAlignmentParameters::components() const { return theComponents; }
 
 //__________________________________________________________________________________________________
 // full derivatives for a composed object
-AlgebraicMatrix
-CompositeAlignmentParameters::derivatives( const std::vector<TrajectoryStateOnSurface>& tsosvec,
-					   const std::vector<AlignableDet*>& alidetvec ) const
-{
+AlgebraicMatrix CompositeAlignmentParameters::derivatives(const std::vector<TrajectoryStateOnSurface> &tsosvec,
+                                                          const std::vector<AlignableDet *> &alidetvec) const {
   std::vector<AlignableDetOrUnitPtr> detOrUnits;
   this->convert(alidetvec, detOrUnits);
 
   return this->derivatives(tsosvec, detOrUnits);
 }
 
-AlgebraicMatrix
-CompositeAlignmentParameters::derivatives( const std::vector<TrajectoryStateOnSurface>& tsosvec,
-					   const std::vector<AlignableDetOrUnitPtr>& alidetvec ) const
-{
+AlgebraicMatrix CompositeAlignmentParameters::derivatives(const std::vector<TrajectoryStateOnSurface> &tsosvec,
+                                                          const std::vector<AlignableDetOrUnitPtr> &alidetvec) const {
   align::Alignables alivec;
-  for (std::vector<AlignableDetOrUnitPtr>::const_iterator it=alidetvec.begin(); it!=alidetvec.end(); ++it)
+  for (std::vector<AlignableDetOrUnitPtr>::const_iterator it = alidetvec.begin(); it != alidetvec.end(); ++it)
     alivec.push_back(alignableFromAlignableDet(*it));
-  
-  CompositeAlignmentDerivativesExtractor extractor(alivec,alidetvec,tsosvec);
+
+  CompositeAlignmentDerivativesExtractor extractor(alivec, alidetvec, tsosvec);
   return extractor.derivatives();
 }
 
 //__________________________________________________________________________________________________
-AlgebraicVector 
-CompositeAlignmentParameters::correctionTerm( const std::vector<TrajectoryStateOnSurface>& tsosvec,
-					      const std::vector<AlignableDet*>& alidetvec) const
-{
+AlgebraicVector CompositeAlignmentParameters::correctionTerm(const std::vector<TrajectoryStateOnSurface> &tsosvec,
+                                                             const std::vector<AlignableDet *> &alidetvec) const {
   std::vector<AlignableDetOrUnitPtr> detOrUnits;
   this->convert(alidetvec, detOrUnits);
 
@@ -123,157 +100,122 @@ CompositeAlignmentParameters::correctionTerm( const std::vector<TrajectoryStateO
 }
 
 //__________________________________________________________________________________________________
-AlgebraicVector 
-CompositeAlignmentParameters::correctionTerm( const std::vector<TrajectoryStateOnSurface>& tsosvec,
-					      const std::vector<AlignableDetOrUnitPtr>& alidetvec) const
-{
+AlgebraicVector CompositeAlignmentParameters::correctionTerm(
+    const std::vector<TrajectoryStateOnSurface> &tsosvec, const std::vector<AlignableDetOrUnitPtr> &alidetvec) const {
   align::Alignables alivec;
-  for (std::vector<AlignableDetOrUnitPtr>::const_iterator it=alidetvec.begin(); it!=alidetvec.end(); ++it )
+  for (std::vector<AlignableDetOrUnitPtr>::const_iterator it = alidetvec.begin(); it != alidetvec.end(); ++it)
     alivec.push_back(alignableFromAlignableDet(*it));
-  
-  CompositeAlignmentDerivativesExtractor extractor(alivec,alidetvec,tsosvec);
+
+  CompositeAlignmentDerivativesExtractor extractor(alivec, alidetvec, tsosvec);
   return extractor.correctionTerm();
 }
- 	 
-//__________________________________________________________________________________________________ 	 
+
+//__________________________________________________________________________________________________
 // assume all are selected
-AlgebraicMatrix
-CompositeAlignmentParameters::selectedDerivatives( const std::vector<TrajectoryStateOnSurface>& tsosvec,
-						   const std::vector<AlignableDet*>& alidetvec) const
-{ 
-  return derivatives(tsosvec,alidetvec);
+AlgebraicMatrix CompositeAlignmentParameters::selectedDerivatives(const std::vector<TrajectoryStateOnSurface> &tsosvec,
+                                                                  const std::vector<AlignableDet *> &alidetvec) const {
+  return derivatives(tsosvec, alidetvec);
 }
-//__________________________________________________________________________________________________ 	 
+//__________________________________________________________________________________________________
 // assume all are selected
-AlgebraicMatrix
-CompositeAlignmentParameters::selectedDerivatives( const std::vector<TrajectoryStateOnSurface>& tsosvec,
-						   const std::vector<AlignableDetOrUnitPtr>& alidetvec) const
-{ 
-  return derivatives(tsosvec,alidetvec);
+AlgebraicMatrix CompositeAlignmentParameters::selectedDerivatives(
+    const std::vector<TrajectoryStateOnSurface> &tsosvec, const std::vector<AlignableDetOrUnitPtr> &alidetvec) const {
+  return derivatives(tsosvec, alidetvec);
 }
 
-//__________________________________________________________________________________________________ 	 
+//__________________________________________________________________________________________________
 // only one (tsos,AlignableDet) as argument [for compatibility with base class]
-AlgebraicMatrix 
-CompositeAlignmentParameters::derivatives( const TrajectoryStateOnSurface &tsos, 
-					   const AlignableDetOrUnitPtr &alidet) const
-{
+AlgebraicMatrix CompositeAlignmentParameters::derivatives(const TrajectoryStateOnSurface &tsos,
+                                                          const AlignableDetOrUnitPtr &alidet) const {
   std::vector<TrajectoryStateOnSurface> tsosvec;
   std::vector<AlignableDetOrUnitPtr> alidetvec;
   tsosvec.push_back(tsos);
   alidetvec.push_back(alidet);
-  return derivatives(tsosvec,alidetvec);
+  return derivatives(tsosvec, alidetvec);
 }
- 	
-//__________________________________________________________________________________________________ 
+
+//__________________________________________________________________________________________________
 // assume all are selected
-AlgebraicMatrix 
-CompositeAlignmentParameters::selectedDerivatives( const TrajectoryStateOnSurface &tsos, 
-						   const AlignableDetOrUnitPtr &alidet ) const
-{ 
-  return derivatives(tsos,alidet);
+AlgebraicMatrix CompositeAlignmentParameters::selectedDerivatives(const TrajectoryStateOnSurface &tsos,
+                                                                  const AlignableDetOrUnitPtr &alidet) const {
+  return derivatives(tsos, alidet);
 }
- 	 
 
 // Derivatives ----------------------------------------------------------------
 // legacy methods
 // full derivatives for a composed object
-AlgebraicMatrix
-CompositeAlignmentParameters::derivativesLegacy( const std::vector<TrajectoryStateOnSurface> &tsosvec, 
-						 const std::vector<AlignableDet*>& alidetvec ) const
-{
+AlgebraicMatrix CompositeAlignmentParameters::derivativesLegacy(const std::vector<TrajectoryStateOnSurface> &tsosvec,
+                                                                const std::vector<AlignableDet *> &alidetvec) const {
   // sanity check: length of parameter argument vectors must be equal
-  if (alidetvec.size() != tsosvec.size())
-  {
+  if (alidetvec.size() != tsosvec.size()) {
     edm::LogError("BadArgument") << " Inconsistent length of argument vectors! ";
-    AlgebraicMatrix selderiv(1,0);
+    AlgebraicMatrix selderiv(1, 0);
     return selderiv;
   }
 
   std::vector<AlgebraicMatrix> vecderiv;
-  int nparam=0;
-
-  std::vector<TrajectoryStateOnSurface>::const_iterator itsos=tsosvec.begin();
-  for( std::vector<AlignableDet*>::const_iterator it=alidetvec.begin(); 
-       it!=alidetvec.end(); ++it, ++itsos ) 
-  {
-    AlignableDet* ad = (*it);
-    Alignable* ali = alignableFromAlignableDet(ad);
-    AlignmentParameters* ap = ali->alignmentParameters();
-    AlgebraicMatrix thisselderiv = ap->selectedDerivatives(*itsos,ad);
+  int nparam = 0;
+
+  std::vector<TrajectoryStateOnSurface>::const_iterator itsos = tsosvec.begin();
+  for (std::vector<AlignableDet *>::const_iterator it = alidetvec.begin(); it != alidetvec.end(); ++it, ++itsos) {
+    AlignableDet *ad = (*it);
+    Alignable *ali = alignableFromAlignableDet(ad);
+    AlignmentParameters *ap = ali->alignmentParameters();
+    AlgebraicMatrix thisselderiv = ap->selectedDerivatives(*itsos, ad);
     vecderiv.push_back(thisselderiv);
     nparam += thisselderiv.num_row();
   }
 
-  int ipos=1;
-  AlgebraicMatrix selderiv(nparam,2);
-  for ( std::vector<AlgebraicMatrix>::const_iterator imat=vecderiv.begin();
-	imat!=vecderiv.end(); ++imat ) 
-  {
-    AlgebraicMatrix thisselderiv=(*imat);
-    int npar=thisselderiv.num_row();
-    selderiv.sub(ipos,1,thisselderiv);
+  int ipos = 1;
+  AlgebraicMatrix selderiv(nparam, 2);
+  for (std::vector<AlgebraicMatrix>::const_iterator imat = vecderiv.begin(); imat != vecderiv.end(); ++imat) {
+    AlgebraicMatrix thisselderiv = (*imat);
+    int npar = thisselderiv.num_row();
+    selderiv.sub(ipos, 1, thisselderiv);
     ipos += npar;
   }
 
   return selderiv;
 }
 
-
 //__________________________________________________________________________________________________
 // assume all are selected
-AlgebraicMatrix
-CompositeAlignmentParameters::selectedDerivativesLegacy( const std::vector<TrajectoryStateOnSurface> &tsosvec, 
-							 const std::vector<AlignableDet*>& alidetvec ) const
-{ 
-  return derivativesLegacy(tsosvec,alidetvec);
+AlgebraicMatrix CompositeAlignmentParameters::selectedDerivativesLegacy(
+    const std::vector<TrajectoryStateOnSurface> &tsosvec, const std::vector<AlignableDet *> &alidetvec) const {
+  return derivativesLegacy(tsosvec, alidetvec);
 }
 
-
 //__________________________________________________________________________________________________
 // only one (tsos,AlignableDet) as argument [for compatibility with base class]
-AlgebraicMatrix 
-CompositeAlignmentParameters::derivativesLegacy( const TrajectoryStateOnSurface& tsos, 
-						 AlignableDet* alidet ) const
-{
+AlgebraicMatrix CompositeAlignmentParameters::derivativesLegacy(const TrajectoryStateOnSurface &tsos,
+                                                                AlignableDet *alidet) const {
   std::vector<TrajectoryStateOnSurface> tsosvec;
-  std::vector<AlignableDet*> alidetvec;
+  std::vector<AlignableDet *> alidetvec;
   tsosvec.push_back(tsos);
   alidetvec.push_back(alidet);
-  return derivativesLegacy(tsosvec,alidetvec);
-
+  return derivativesLegacy(tsosvec, alidetvec);
 }
 
-
 //__________________________________________________________________________________________________
 // assume all are selected
-AlgebraicMatrix 
-CompositeAlignmentParameters::selectedDerivativesLegacy( const TrajectoryStateOnSurface& tsos, 
-							 AlignableDet* alidet ) const
-{ 
-  return derivativesLegacy(tsos,alidet);
+AlgebraicMatrix CompositeAlignmentParameters::selectedDerivativesLegacy(const TrajectoryStateOnSurface &tsos,
+                                                                        AlignableDet *alidet) const {
+  return derivativesLegacy(tsos, alidet);
 }
 
-
 //__________________________________________________________________________________________________
 // finds Alignable corresponding to AlignableDet
-Alignable* 
-CompositeAlignmentParameters::alignableFromAlignableDet(const AlignableDetOrUnitPtr& adet) const
-{
-
-  AlignableDetToAlignableMap::const_iterator iali =
-    theAlignableDetToAlignableMap.find(adet);
-  if ( iali!=theAlignableDetToAlignableMap.end() ) return (*iali).second;
-  else return nullptr;
-
+Alignable *CompositeAlignmentParameters::alignableFromAlignableDet(const AlignableDetOrUnitPtr &adet) const {
+  AlignableDetToAlignableMap::const_iterator iali = theAlignableDetToAlignableMap.find(adet);
+  if (iali != theAlignableDetToAlignableMap.end())
+    return (*iali).second;
+  else
+    return nullptr;
 }
 
-
 //__________________________________________________________________________________________________
-AlgebraicVector
-CompositeAlignmentParameters::parameterSubset( const align::Alignables& vec ) const
-{
-  const auto& sel = extractAlignables(vec);
+AlgebraicVector CompositeAlignmentParameters::parameterSubset(const align::Alignables &vec) const {
+  const auto &sel = extractAlignables(vec);
 
   const unsigned int nali = sel.size();
   int ndim = 0;
@@ -281,23 +223,23 @@ CompositeAlignmentParameters::parameterSubset( const align::Alignables& vec ) co
   std::vector<int> posvec;
   std::vector<int> lenvec;
 
-  posvec.reserve( nali );
-  lenvec.reserve( nali );
+  posvec.reserve(nali);
+  lenvec.reserve(nali);
 
   // iterate over input vector of alignables to determine size of result vector
-  if ( !extractPositionAndLength( sel, posvec, lenvec, ndim ) ) return AlgebraicVector();
+  if (!extractPositionAndLength(sel, posvec, lenvec, ndim))
+    return AlgebraicVector();
 
   // OK, let's do the real work now
-  AlgebraicVector result( ndim );
+  AlgebraicVector result(ndim);
 
   int resi = 0;
-  for ( unsigned int iali = 0; iali < nali; ++iali )
-  {
+  for (unsigned int iali = 0; iali < nali; ++iali) {
     int posi = posvec[iali];
     int leni = lenvec[iali];
 
-    for ( int ir = 0; ir < leni; ++ir )
-      result[resi+ir] = theData->parameters()[posi-1+ir];
+    for (int ir = 0; ir < leni; ++ir)
+      result[resi + ir] = theData->parameters()[posi - 1 + ir];
 
     resi += leni;
   }
@@ -305,13 +247,10 @@ CompositeAlignmentParameters::parameterSubset( const align::Alignables& vec ) co
   return result;
 }
 
-
 //__________________________________________________________________________________________________
 // extract covariance matrix for a subset of alignables
-AlgebraicSymMatrix 
-CompositeAlignmentParameters::covarianceSubset( const align::Alignables& vec ) const
-{
-  const auto& sel = extractAlignables(vec);
+AlgebraicSymMatrix CompositeAlignmentParameters::covarianceSubset(const align::Alignables &vec) const {
+  const auto &sel = extractAlignables(vec);
 
   const unsigned int nali = sel.size();
   int ndim = 0;
@@ -319,31 +258,30 @@ CompositeAlignmentParameters::covarianceSubset( const align::Alignables& vec ) c
   std::vector<int> posvec;
   std::vector<int> lenvec;
 
-  posvec.reserve( nali );
-  lenvec.reserve( nali );
+  posvec.reserve(nali);
+  lenvec.reserve(nali);
 
   // iterate over input vectors of alignables
   // to determine dimensions of result matrix
-  if ( !extractPositionAndLength( sel, posvec, lenvec, ndim ) ) return AlgebraicSymMatrix();
+  if (!extractPositionAndLength(sel, posvec, lenvec, ndim))
+    return AlgebraicSymMatrix();
 
   // OK, let's do the real work now
-  AlgebraicSymMatrix result( ndim );
+  AlgebraicSymMatrix result(ndim);
 
   int resi = 0;
-  for ( unsigned int iali = 0; iali < nali; ++iali )
-  {
+  for (unsigned int iali = 0; iali < nali; ++iali) {
     int posi = posvec[iali];
     int leni = lenvec[iali];
 
     int resj = 0;
-    for ( unsigned int jali = 0; jali <= iali; ++jali )
-    {   
+    for (unsigned int jali = 0; jali <= iali; ++jali) {
       int posj = posvec[jali];
       int lenj = lenvec[jali];
 
-      for ( int ir = 0; ir < leni; ++ir )
-	for ( int ic = 0; ic < lenj; ++ic )
-	  result[resi+ir][resj+ic] = theData->covariance()[posi-1+ir][posj-1+ic];
+      for (int ir = 0; ir < leni; ++ir)
+        for (int ic = 0; ic < lenj; ++ic)
+          result[resi + ir][resj + ic] = theData->covariance()[posi - 1 + ir][posj - 1 + ic];
 
       resj += lenj;
     }
@@ -353,53 +291,50 @@ CompositeAlignmentParameters::covarianceSubset( const align::Alignables& vec ) c
   return result;
 }
 
-
 //__________________________________________________________________________________________________
 // extract covariance matrix elements between two subsets of alignables
-AlgebraicMatrix 
-CompositeAlignmentParameters::covarianceSubset( const align::Alignables& veci, 
-						const align::Alignables& vecj ) const
-{
-  const auto& seli = extractAlignables( veci );
-  const auto& selj = extractAlignables( vecj );
+AlgebraicMatrix CompositeAlignmentParameters::covarianceSubset(const align::Alignables &veci,
+                                                               const align::Alignables &vecj) const {
+  const auto &seli = extractAlignables(veci);
+  const auto &selj = extractAlignables(vecj);
 
-  int ndimi=0;
-  int ndimj=0;
+  int ndimi = 0;
+  int ndimj = 0;
 
   std::vector<int> posveci;
   std::vector<int> lenveci;
   std::vector<int> posvecj;
   std::vector<int> lenvecj;
 
-  posveci.reserve( seli.size() );
-  lenveci.reserve( seli.size() );
-  posvecj.reserve( selj.size() );
-  lenvecj.reserve( selj.size() );
+  posveci.reserve(seli.size());
+  lenveci.reserve(seli.size());
+  posvecj.reserve(selj.size());
+  lenvecj.reserve(selj.size());
 
   // iterate over input vectors of alignables
   // to determine dimensions of result matrix
-  if ( !extractPositionAndLength( seli, posveci, lenveci, ndimi ) ) return AlgebraicSymMatrix();
+  if (!extractPositionAndLength(seli, posveci, lenveci, ndimi))
+    return AlgebraicSymMatrix();
   // vector vecj
-  if ( !extractPositionAndLength( selj, posvecj, lenvecj, ndimj ) ) return AlgebraicSymMatrix();
+  if (!extractPositionAndLength(selj, posvecj, lenvecj, ndimj))
+    return AlgebraicSymMatrix();
 
   // OK, let's do the real work now
-  AlgebraicMatrix result( ndimi, ndimj );
+  AlgebraicMatrix result(ndimi, ndimj);
 
   int resi = 0;
-  for ( unsigned int iali = 0; iali < seli.size(); ++iali )
-  {
+  for (unsigned int iali = 0; iali < seli.size(); ++iali) {
     int posi = posveci[iali];
     int leni = lenveci[iali];
 
     int resj = 0;
-    for ( unsigned int jali = 0; jali < selj.size(); ++jali )
-    {   
+    for (unsigned int jali = 0; jali < selj.size(); ++jali) {
       int posj = posvecj[jali];
       int lenj = lenvecj[jali];
 
-      for ( int ir = 0; ir < leni; ++ir )
-	for ( int ic = 0; ic < lenj; ++ic )
-	  result[resi+ir][resj+ic] = theData->covariance()[posi-1+ir][posj-1+ic];
+      for (int ir = 0; ir < leni; ++ir)
+        for (int ic = 0; ic < lenj; ++ic)
+          result[resi + ir][resj + ic] = theData->covariance()[posi - 1 + ir][posj - 1 + ic];
 
       resj += lenj;
     }
@@ -409,66 +344,57 @@ CompositeAlignmentParameters::covarianceSubset( const align::Alignables& veci,
   return result;
 }
 
-
 //__________________________________________________________________________________________________
 // Extract position and length of parameters for a subset of Alignables.
-bool
-CompositeAlignmentParameters::extractPositionAndLength( const align::Alignables& alignables,
-							std::vector<int>& posvec,
-							std::vector<int>& lenvec,
-							int& length ) const
-{
+bool CompositeAlignmentParameters::extractPositionAndLength(const align::Alignables &alignables,
+                                                            std::vector<int> &posvec,
+                                                            std::vector<int> &lenvec,
+                                                            int &length) const {
   length = 0;
 
-  for (const auto& it: alignables) {
-    // check if in components 
-    if ( std::find( theComponents.begin(), theComponents.end(), it ) == theComponents.end() ) 
-    {
-      edm::LogError( "NotFound" ) << "@SUB=CompositeAlignmentParameters::extractPositionAndLength"
-				  << "Alignable not found in components!";
+  for (const auto &it : alignables) {
+    // check if in components
+    if (std::find(theComponents.begin(), theComponents.end(), it) == theComponents.end()) {
+      edm::LogError("NotFound") << "@SUB=CompositeAlignmentParameters::extractPositionAndLength"
+                                << "Alignable not found in components!";
       return false;
     }
 
     // get pos/length
     Aliposmap::const_iterator iposmap = theAliposmap.find(it);
     Alilenmap::const_iterator ilenmap = theAlilenmap.find(it);
-    if ( iposmap == theAliposmap.end() || ilenmap == theAlilenmap.end() ) 
-    {
-      edm::LogError( "NotFound" ) << "@SUB=CompositeAlignmentParameters::extractPositionAndLength"
-				  << "position/length not found for Alignable in maps!";
+    if (iposmap == theAliposmap.end() || ilenmap == theAlilenmap.end()) {
+      edm::LogError("NotFound") << "@SUB=CompositeAlignmentParameters::extractPositionAndLength"
+                                << "position/length not found for Alignable in maps!";
       return false;
     }
-    posvec.push_back( iposmap->second );
-    lenvec.push_back( ilenmap->second );
+    posvec.push_back(iposmap->second);
+    lenvec.push_back(ilenmap->second);
     length += ilenmap->second;
   }
 
   return true;
 }
 
-
 //__________________________________________________________________________________________________
-align::Alignables
-CompositeAlignmentParameters::extractAlignables(const align::Alignables& alignables) const
-{
+align::Alignables CompositeAlignmentParameters::extractAlignables(const align::Alignables &alignables) const {
   align::Alignables result;
 
-  for (const auto& itA: alignables) {
-    if (std::find( result.begin(), result.end(), itA ) == result.end()) result.push_back(itA);
+  for (const auto &itA : alignables) {
+    if (std::find(result.begin(), result.end(), itA) == result.end())
+      result.push_back(itA);
   }
 
   return result;
 }
 
-
 //__________________________________________________________________________________________________
-void CompositeAlignmentParameters::convert(const std::vector<AlignableDet*> &input,
-					   std::vector<AlignableDetOrUnitPtr> &output) const
-{
+void CompositeAlignmentParameters::convert(const std::vector<AlignableDet *> &input,
+                                           std::vector<AlignableDetOrUnitPtr> &output) const {
   output.clear();
   output.reserve(input.size());
 
-  std::vector<AlignableDet*>::const_iterator it, itEnd;
+  std::vector<AlignableDet *>::const_iterator it, itEnd;
   for (it = input.begin(), itEnd = input.end(); it != itEnd; ++it)
     output.push_back(AlignableDetOrUnitPtr(*it));
 }
diff --git a/Alignment/CommonAlignmentParametrization/src/FrameToFrameDerivative.cc b/Alignment/CommonAlignmentParametrization/src/FrameToFrameDerivative.cc
index 284b21eb50390..f4374a38c4d2d 100644
--- a/Alignment/CommonAlignmentParametrization/src/FrameToFrameDerivative.cc
+++ b/Alignment/CommonAlignmentParametrization/src/FrameToFrameDerivative.cc
@@ -8,39 +8,31 @@
 
 #include "Alignment/CommonAlignment/interface/Alignable.h"
 
-// already in header: #include "DataFormats/Math/interface/AlgebraicROOTObjects.h"
+// already in header: #include
+// "DataFormats/Math/interface/AlgebraicROOTObjects.h"
 #include "DataFormats/CLHEP/interface/Migration.h"
 
 //__________________________________________________________________________________________________
-AlgebraicMatrix 
-FrameToFrameDerivative::frameToFrameDerivative(const Alignable* object,
-					       const Alignable* composedObject) const
-{
-
-  return getDerivative( object->globalRotation(),
-			composedObject->globalRotation(),
-			composedObject->globalPosition() - object->globalPosition() );
-
+AlgebraicMatrix FrameToFrameDerivative::frameToFrameDerivative(const Alignable *object,
+                                                               const Alignable *composedObject) const {
+  return getDerivative(object->globalRotation(),
+                       composedObject->globalRotation(),
+                       composedObject->globalPosition() - object->globalPosition());
 }
 
 //__________________________________________________________________________________________________
-AlgebraicMatrix66 
-FrameToFrameDerivative::getDerivative(const align::RotationType &objectRot,
-                                      const align::RotationType &composeRot,
-				      const align::GlobalPoint &objectPos,
-				      const align::GlobalPoint &composePos) const
-{
-  return asSMatrix<6,6>(this->getDerivative(objectRot, composeRot, composePos - objectPos));
+AlgebraicMatrix66 FrameToFrameDerivative::getDerivative(const align::RotationType &objectRot,
+                                                        const align::RotationType &composeRot,
+                                                        const align::GlobalPoint &objectPos,
+                                                        const align::GlobalPoint &composePos) const {
+  return asSMatrix<6, 6>(this->getDerivative(objectRot, composeRot, composePos - objectPos));
 }
 
 //__________________________________________________________________________________________________
-AlgebraicMatrix 
-FrameToFrameDerivative::getDerivative(const align::RotationType &objectRot,
-				      const align::RotationType &composeRot,
-				      const align::GlobalVector &posVec) const
-{
-
-  AlgebraicMatrix rotDet   = transform(objectRot);
+AlgebraicMatrix FrameToFrameDerivative::getDerivative(const align::RotationType &objectRot,
+                                                      const align::RotationType &composeRot,
+                                                      const align::GlobalVector &posVec) const {
+  AlgebraicMatrix rotDet = transform(objectRot);
   AlgebraicMatrix rotCompO = transform(composeRot);
 
   AlgebraicVector diffVec(3);
@@ -49,32 +41,32 @@ FrameToFrameDerivative::getDerivative(const align::RotationType &objectRot,
   diffVec(2) = posVec.y();
   diffVec(3) = posVec.z();
 
-  AlgebraicMatrix derivative(6,6);
+  AlgebraicMatrix derivative(6, 6);
+
+  AlgebraicMatrix derivAA(3, 3);
+  AlgebraicMatrix derivAB(3, 3);
+  AlgebraicMatrix derivBB(3, 3);
 
-  AlgebraicMatrix derivAA(3,3);
-  AlgebraicMatrix derivAB(3,3);
-  AlgebraicMatrix derivBB(3,3);
-  
-  derivAA = derivativePosPos( rotDet, rotCompO );
-  derivAB = derivativePosRot( rotDet, rotCompO, diffVec );
-  derivBB = derivativeRotRot( rotDet, rotCompO );
+  derivAA = derivativePosPos(rotDet, rotCompO);
+  derivAB = derivativePosRot(rotDet, rotCompO, diffVec);
+  derivBB = derivativeRotRot(rotDet, rotCompO);
 
   derivative[0][0] = derivAA[0][0];
   derivative[0][1] = derivAA[0][1];
   derivative[0][2] = derivAA[0][2];
-  derivative[0][3] = derivAB[0][0];                                
-  derivative[0][4] = derivAB[0][1];                               
-  derivative[0][5] = derivAB[0][2];                             
+  derivative[0][3] = derivAB[0][0];
+  derivative[0][4] = derivAB[0][1];
+  derivative[0][5] = derivAB[0][2];
   derivative[1][0] = derivAA[1][0];
   derivative[1][1] = derivAA[1][1];
   derivative[1][2] = derivAA[1][2];
-  derivative[1][3] = derivAB[1][0];                                 
-  derivative[1][4] = derivAB[1][1];                             
-  derivative[1][5] = derivAB[1][2];                           
+  derivative[1][3] = derivAB[1][0];
+  derivative[1][4] = derivAB[1][1];
+  derivative[1][5] = derivAB[1][2];
   derivative[2][0] = derivAA[2][0];
   derivative[2][1] = derivAA[2][1];
   derivative[2][2] = derivAA[2][2];
-  derivative[2][3] = derivAB[2][0];            
+  derivative[2][3] = derivAB[2][0];
   derivative[2][4] = derivAB[2][1];
   derivative[2][5] = derivAB[2][2];
   derivative[3][0] = 0;
@@ -95,118 +87,102 @@ FrameToFrameDerivative::getDerivative(const align::RotationType &objectRot,
   derivative[5][3] = derivBB[2][0];
   derivative[5][4] = derivBB[2][1];
   derivative[5][5] = derivBB[2][2];
-  
+
   return derivative;
 }
 
-
 //__________________________________________________________________________________________________
-AlgebraicMatrix 
-FrameToFrameDerivative::derivativePosPos(const AlgebraicMatrix &RotDet,
-					 const AlgebraicMatrix &RotRot) const
-{
-
+AlgebraicMatrix FrameToFrameDerivative::derivativePosPos(const AlgebraicMatrix &RotDet,
+                                                         const AlgebraicMatrix &RotRot) const {
   return RotDet * RotRot.T();
-
 }
 
-
 //__________________________________________________________________________________________________
-AlgebraicMatrix 
-FrameToFrameDerivative::derivativePosRot(const AlgebraicMatrix &RotDet,
-					 const AlgebraicMatrix &RotRot,
-					 const AlgebraicVector &S) const
-{
-
- AlgebraicVector dEulerA(3);
- AlgebraicVector dEulerB(3);
- AlgebraicVector dEulerC(3);
- AlgebraicMatrix RotDa(3,3);
- AlgebraicMatrix RotDb(3,3);
- AlgebraicMatrix RotDc(3,3);
- 
- RotDa[1][2] =  1; RotDa[2][1] = -1;
- RotDb[0][2] = -1; RotDb[2][0] =  1; // New beta sign
- RotDc[0][1] =  1; RotDc[1][0] = -1;
- 
- dEulerA = RotDet*( RotRot.T()*RotDa*RotRot*S );
- dEulerB = RotDet*( RotRot.T()*RotDb*RotRot*S );
- dEulerC = RotDet*( RotRot.T()*RotDc*RotRot*S );
-
- AlgebraicMatrix eulerDeriv(3,3);
- eulerDeriv[0][0] = dEulerA[0];
- eulerDeriv[1][0] = dEulerA[1];
- eulerDeriv[2][0] = dEulerA[2];
- eulerDeriv[0][1] = dEulerB[0];
- eulerDeriv[1][1] = dEulerB[1];
- eulerDeriv[2][1] = dEulerB[2];
- eulerDeriv[0][2] = dEulerC[0];
- eulerDeriv[1][2] = dEulerC[1];
- eulerDeriv[2][2] = dEulerC[2];
-
- return eulerDeriv;
-
+AlgebraicMatrix FrameToFrameDerivative::derivativePosRot(const AlgebraicMatrix &RotDet,
+                                                         const AlgebraicMatrix &RotRot,
+                                                         const AlgebraicVector &S) const {
+  AlgebraicVector dEulerA(3);
+  AlgebraicVector dEulerB(3);
+  AlgebraicVector dEulerC(3);
+  AlgebraicMatrix RotDa(3, 3);
+  AlgebraicMatrix RotDb(3, 3);
+  AlgebraicMatrix RotDc(3, 3);
+
+  RotDa[1][2] = 1;
+  RotDa[2][1] = -1;
+  RotDb[0][2] = -1;
+  RotDb[2][0] = 1;  // New beta sign
+  RotDc[0][1] = 1;
+  RotDc[1][0] = -1;
+
+  dEulerA = RotDet * (RotRot.T() * RotDa * RotRot * S);
+  dEulerB = RotDet * (RotRot.T() * RotDb * RotRot * S);
+  dEulerC = RotDet * (RotRot.T() * RotDc * RotRot * S);
+
+  AlgebraicMatrix eulerDeriv(3, 3);
+  eulerDeriv[0][0] = dEulerA[0];
+  eulerDeriv[1][0] = dEulerA[1];
+  eulerDeriv[2][0] = dEulerA[2];
+  eulerDeriv[0][1] = dEulerB[0];
+  eulerDeriv[1][1] = dEulerB[1];
+  eulerDeriv[2][1] = dEulerB[2];
+  eulerDeriv[0][2] = dEulerC[0];
+  eulerDeriv[1][2] = dEulerC[1];
+  eulerDeriv[2][2] = dEulerC[2];
+
+  return eulerDeriv;
 }
 
-
 //__________________________________________________________________________________________________
-AlgebraicMatrix 
-FrameToFrameDerivative::derivativeRotRot(const AlgebraicMatrix &RotDet,
-					 const AlgebraicMatrix &RotRot) const
-{
-
- AlgebraicVector dEulerA(3);
- AlgebraicVector dEulerB(3);
- AlgebraicVector dEulerC(3);
- AlgebraicMatrix RotDa(3,3);
- AlgebraicMatrix RotDb(3,3);
- AlgebraicMatrix RotDc(3,3);
-
- RotDa[1][2] =  1; RotDa[2][1] = -1;
- RotDb[0][2] = -1; RotDb[2][0] =  1; // New beta sign
- RotDc[0][1] =  1; RotDc[1][0] = -1;
-
- dEulerA = linearEulerAngles( RotDet*RotRot.T()*RotDa*RotRot*RotDet.T() );
- dEulerB = linearEulerAngles( RotDet*RotRot.T()*RotDb*RotRot*RotDet.T() );
- dEulerC = linearEulerAngles( RotDet*RotRot.T()*RotDc*RotRot*RotDet.T() );
-
- AlgebraicMatrix eulerDeriv(3,3);
-
- eulerDeriv[0][0] = dEulerA[0];
- eulerDeriv[1][0] = dEulerA[1];
- eulerDeriv[2][0] = dEulerA[2];
- eulerDeriv[0][1] = dEulerB[0];
- eulerDeriv[1][1] = dEulerB[1];
- eulerDeriv[2][1] = dEulerB[2];
- eulerDeriv[0][2] = dEulerC[0];
- eulerDeriv[1][2] = dEulerC[1];
- eulerDeriv[2][2] = dEulerC[2];
-
- return eulerDeriv;
-
+AlgebraicMatrix FrameToFrameDerivative::derivativeRotRot(const AlgebraicMatrix &RotDet,
+                                                         const AlgebraicMatrix &RotRot) const {
+  AlgebraicVector dEulerA(3);
+  AlgebraicVector dEulerB(3);
+  AlgebraicVector dEulerC(3);
+  AlgebraicMatrix RotDa(3, 3);
+  AlgebraicMatrix RotDb(3, 3);
+  AlgebraicMatrix RotDc(3, 3);
+
+  RotDa[1][2] = 1;
+  RotDa[2][1] = -1;
+  RotDb[0][2] = -1;
+  RotDb[2][0] = 1;  // New beta sign
+  RotDc[0][1] = 1;
+  RotDc[1][0] = -1;
+
+  dEulerA = linearEulerAngles(RotDet * RotRot.T() * RotDa * RotRot * RotDet.T());
+  dEulerB = linearEulerAngles(RotDet * RotRot.T() * RotDb * RotRot * RotDet.T());
+  dEulerC = linearEulerAngles(RotDet * RotRot.T() * RotDc * RotRot * RotDet.T());
+
+  AlgebraicMatrix eulerDeriv(3, 3);
+
+  eulerDeriv[0][0] = dEulerA[0];
+  eulerDeriv[1][0] = dEulerA[1];
+  eulerDeriv[2][0] = dEulerA[2];
+  eulerDeriv[0][1] = dEulerB[0];
+  eulerDeriv[1][1] = dEulerB[1];
+  eulerDeriv[2][1] = dEulerB[2];
+  eulerDeriv[0][2] = dEulerC[0];
+  eulerDeriv[1][2] = dEulerC[1];
+  eulerDeriv[2][2] = dEulerC[2];
+
+  return eulerDeriv;
 }
 
-
-
 //__________________________________________________________________________________________________
-AlgebraicVector 
-FrameToFrameDerivative::linearEulerAngles(const AlgebraicMatrix &rotDelta ) const
-{
-  
-  AlgebraicMatrix eulerAB(3,3);
+AlgebraicVector FrameToFrameDerivative::linearEulerAngles(const AlgebraicMatrix &rotDelta) const {
+  AlgebraicMatrix eulerAB(3, 3);
   AlgebraicVector aB(3);
-  eulerAB[0][1] =  1; 
-  eulerAB[1][0] = -1; // New beta sign
+  eulerAB[0][1] = 1;
+  eulerAB[1][0] = -1;  // New beta sign
   aB[2] = 1;
 
-  AlgebraicMatrix eulerC(3,3);
+  AlgebraicMatrix eulerC(3, 3);
   AlgebraicVector C(3);
   eulerC[2][0] = 1;
   C[1] = 1;
 
   AlgebraicVector eulerAngles(3);
-  eulerAngles = eulerAB*rotDelta*aB + eulerC*rotDelta*C;
+  eulerAngles = eulerAB * rotDelta * aB + eulerC * rotDelta * C;
   return eulerAngles;
-
 }
-
diff --git a/Alignment/CommonAlignmentParametrization/src/KarimakiAlignmentDerivatives.cc b/Alignment/CommonAlignmentParametrization/src/KarimakiAlignmentDerivatives.cc
index 99676d73f809f..ff17cf79e362c 100644
--- a/Alignment/CommonAlignmentParametrization/src/KarimakiAlignmentDerivatives.cc
+++ b/Alignment/CommonAlignmentParametrization/src/KarimakiAlignmentDerivatives.cc
@@ -8,11 +8,7 @@
 
 #include "Alignment/CommonAlignmentParametrization/interface/KarimakiAlignmentDerivatives.h"
 
-
-AlgebraicMatrix 
-KarimakiAlignmentDerivatives::operator()( const TrajectoryStateOnSurface &tsos ) const
-{ 
-
+AlgebraicMatrix KarimakiAlignmentDerivatives::operator()(const TrajectoryStateOnSurface &tsos) const {
   // Get track parameters on surface
   AlgebraicVector5 alivec = tsos.localParameters().mixedFormatVector();
 
@@ -23,26 +19,25 @@ KarimakiAlignmentDerivatives::operator()( const TrajectoryStateOnSurface &tsos )
   // [3] x    : local x-coordinate
   // [4] y    : local y-coordinate
 
-  double tanpsi   = alivec[1];
+  double tanpsi = alivec[1];
   double tantheta = alivec[2];
-  double ux       = alivec[3];
-  double vx       = alivec[4];
-
-  AlgebraicMatrix aliderivs(6,2);
-
-  aliderivs[0][0]= -1.0;
-  aliderivs[0][1]=  0.0;
-  aliderivs[1][0]=  0.0;
-  aliderivs[1][1]= -1.0;
-  aliderivs[2][0]=  tanpsi;
-  aliderivs[2][1]=  tantheta;
-  aliderivs[3][0]=  vx*tanpsi;
-  aliderivs[3][1]=  vx*tantheta;
-  aliderivs[4][0]= -ux*tanpsi;   // New beta sign convention
-  aliderivs[4][1]= -ux*tantheta; // New beta sign convention
-  aliderivs[5][0]=  vx;
-  aliderivs[5][1]= -ux;
-   
-  return(aliderivs);
-
+  double ux = alivec[3];
+  double vx = alivec[4];
+
+  AlgebraicMatrix aliderivs(6, 2);
+
+  aliderivs[0][0] = -1.0;
+  aliderivs[0][1] = 0.0;
+  aliderivs[1][0] = 0.0;
+  aliderivs[1][1] = -1.0;
+  aliderivs[2][0] = tanpsi;
+  aliderivs[2][1] = tantheta;
+  aliderivs[3][0] = vx * tanpsi;
+  aliderivs[3][1] = vx * tantheta;
+  aliderivs[4][0] = -ux * tanpsi;    // New beta sign convention
+  aliderivs[4][1] = -ux * tantheta;  // New beta sign convention
+  aliderivs[5][0] = vx;
+  aliderivs[5][1] = -ux;
+
+  return (aliderivs);
 }
diff --git a/Alignment/CommonAlignmentParametrization/src/ParametersToParametersDerivatives.cc b/Alignment/CommonAlignmentParametrization/src/ParametersToParametersDerivatives.cc
index e0b125ff68615..6d6a15378fe16 100644
--- a/Alignment/CommonAlignmentParametrization/src/ParametersToParametersDerivatives.cc
+++ b/Alignment/CommonAlignmentParametrization/src/ParametersToParametersDerivatives.cc
@@ -6,13 +6,13 @@
 
 #include "Alignment/CommonAlignmentParametrization/interface/ParametersToParametersDerivatives.h"
 
-#include "CondFormats/Alignment/interface/Definitions.h"
 #include "Alignment/CommonAlignment/interface/Alignable.h"
 #include "Alignment/CommonAlignment/interface/AlignmentParameters.h"
-#include "Alignment/CommonAlignmentParametrization/interface/FrameToFrameDerivative.h"
 #include "Alignment/CommonAlignmentParametrization/interface/AlignmentParametersFactory.h"
 #include "Alignment/CommonAlignmentParametrization/interface/BowedSurfaceAlignmentDerivatives.h"
+#include "Alignment/CommonAlignmentParametrization/interface/FrameToFrameDerivative.h"
 #include "Alignment/CommonAlignmentParametrization/interface/TwoBowedSurfacesAlignmentParameters.h"
+#include "CondFormats/Alignment/interface/Definitions.h"
 
 #include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -20,57 +20,53 @@
 // #include "DataFormats/Math/interface/AlgebraicROOTObjects.h"
 
 //_________________________________________________________________________________________________
-ParametersToParametersDerivatives
-::ParametersToParametersDerivatives(const Alignable &component, const Alignable &mother)
-  : isOK_(component.alignmentParameters() && mother.alignmentParameters())
-{
+ParametersToParametersDerivatives ::ParametersToParametersDerivatives(const Alignable &component,
+                                                                      const Alignable &mother)
+    : isOK_(component.alignmentParameters() && mother.alignmentParameters()) {
   if (isOK_) {
-    isOK_ = this->init(component, component.alignmentParameters()->type(),
-		       mother,    mother   .alignmentParameters()->type());
+    isOK_ =
+        this->init(component, component.alignmentParameters()->type(), mother, mother.alignmentParameters()->type());
   }
 }
 
 //_________________________________________________________________________________________________
-bool ParametersToParametersDerivatives::init(const Alignable &component, int typeComponent,
-					     const Alignable &mother, int typeMother)
-{
-  using namespace AlignmentParametersFactory; // for kRigidBody etc.
-  if ((typeMother    == kRigidBody || typeMother    == kRigidBody4D) &&
+bool ParametersToParametersDerivatives::init(const Alignable &component,
+                                             int typeComponent,
+                                             const Alignable &mother,
+                                             int typeMother) {
+  using namespace AlignmentParametersFactory;  // for kRigidBody etc.
+  if ((typeMother == kRigidBody || typeMother == kRigidBody4D) &&
       (typeComponent == kRigidBody || typeComponent == kRigidBody4D)) {
     return this->initRigidRigid(component, mother);
-  } else if ((typeMother == kRigidBody || typeMother == kRigidBody4D) &&
-	     typeComponent == kBowedSurface) {
+  } else if ((typeMother == kRigidBody || typeMother == kRigidBody4D) && typeComponent == kBowedSurface) {
     return this->initBowedRigid(component, mother);
-  } else if ((typeMother == kRigidBody || typeMother == kRigidBody4D) &&
-	     typeComponent == kTwoBowedSurfaces) {
+  } else if ((typeMother == kRigidBody || typeMother == kRigidBody4D) && typeComponent == kTwoBowedSurfaces) {
     return this->init2BowedRigid(component, mother);
   } else {
-    // missing: mother with bows and component without, i.e. having 'common' bow parameters
+    // missing: mother with bows and component without, i.e. having 'common' bow
+    // parameters
     edm::LogError("Alignment") << "@SUB=ParametersToParametersDerivatives::init"
-			       << "Mother " << parametersTypeName(parametersType(typeMother))
-			       << ", component " << parametersTypeName(parametersType(typeComponent))
-			       << ": not supported.";
+                               << "Mother " << parametersTypeName(parametersType(typeMother)) << ", component "
+                               << parametersTypeName(parametersType(typeComponent)) << ": not supported.";
     return false;
   }
-
 }
 
 //_________________________________________________________________________________________________
-bool ParametersToParametersDerivatives::initRigidRigid(const Alignable &component,
-						       const Alignable &mother)
-{
+bool ParametersToParametersDerivatives::initRigidRigid(const Alignable &component, const Alignable &mother) {
   // See G. Flucke's presentation from  20 Feb 2007
   // https://indico.cern.ch/contributionDisplay.py?contribId=15&sessionId=1&confId=10930
   // and C. Kleinwort's one from 14 Feb 2013
   // https://indico.cern.ch/contributionDisplay.py?contribId=14&sessionId=1&confId=224472
 
   FrameToFrameDerivative f2f;
-  // frame2frame returns dcomponent/dmother for both being rigid body, so we have to invert
-  AlgebraicMatrix66 m(asSMatrix<6,6>(f2f.frameToFrameDerivative(&component, &mother)));
-  
-  if (m.Invert()) { // now matrix is d(rigid_mother)/d(rigid_component)
+  // frame2frame returns dcomponent/dmother for both being rigid body, so we
+  // have to invert
+  AlgebraicMatrix66 m(asSMatrix<6, 6>(f2f.frameToFrameDerivative(&component, &mother)));
+
+  if (m.Invert()) {  // now matrix is d(rigid_mother)/d(rigid_component)
     // copy to TMatrix
-    derivatives_.ResizeTo(6,6);
+    derivatives_.ResizeTo(6, 6);
     derivatives_.SetMatrixArray(m.begin());
     return true;
   } else {
@@ -79,22 +75,21 @@ bool ParametersToParametersDerivatives::initRigidRigid(const Alignable &componen
 }
 
 //_________________________________________________________________________________________________
-bool ParametersToParametersDerivatives::initBowedRigid(const Alignable &component,
-						       const Alignable &mother)
-{
+bool ParametersToParametersDerivatives::initBowedRigid(const Alignable &component, const Alignable &mother) {
   // component is bowed surface, mother rigid body
   FrameToFrameDerivative f2f;
-  // frame2frame returns dcomponent/dmother for both being rigid body, so we have to invert
-  AlgebraicMatrix66 rigM2rigC(asSMatrix<6,6>(f2f.frameToFrameDerivative(&component,&mother)));
-  if (rigM2rigC.Invert()) { // now matrix is d(rigid_mother)/d(rigid_component)
-    const double halfWidth  = 0.5 * component.surface().width();
+  // frame2frame returns dcomponent/dmother for both being rigid body, so we
+  // have to invert
+  AlgebraicMatrix66 rigM2rigC(asSMatrix<6, 6>(f2f.frameToFrameDerivative(&component, &mother)));
+  if (rigM2rigC.Invert()) {  // now matrix is d(rigid_mother)/d(rigid_component)
+    const double halfWidth = 0.5 * component.surface().width();
     const double halfLength = 0.5 * component.surface().length();
     const AlgebraicMatrix69 m(this->dRigid_dBowed(rigM2rigC, halfWidth, halfLength));
 
     // copy to TMatrix
-    derivatives_.ResizeTo(6,9);
+    derivatives_.ResizeTo(6, 9);
     derivatives_.SetMatrixArray(m.begin());
-    
+
     return true;
   } else {
     return false;
@@ -102,54 +97,51 @@ bool ParametersToParametersDerivatives::initBowedRigid(const Alignable &componen
 }
 
 //_________________________________________________________________________________________________
-bool ParametersToParametersDerivatives::init2BowedRigid(const Alignable &component,
-							const Alignable &mother)
-{
+bool ParametersToParametersDerivatives::init2BowedRigid(const Alignable &component, const Alignable &mother) {
   // component is two bowed surfaces, mother rigid body
-  const TwoBowedSurfacesAlignmentParameters *aliPar = 
-    dynamic_cast<TwoBowedSurfacesAlignmentParameters*>(component.alignmentParameters());
+  const TwoBowedSurfacesAlignmentParameters *aliPar =
+      dynamic_cast<TwoBowedSurfacesAlignmentParameters *>(component.alignmentParameters());
 
   if (!aliPar) {
     edm::LogError("Alignment") << "@SUB=ParametersToParametersDerivatives::init2BowedRigid"
-			       << "dynamic_cast to TwoBowedSurfacesAlignmentParameters failed.";
+                               << "dynamic_cast to TwoBowedSurfacesAlignmentParameters failed.";
     return false;
   }
 
   // We treat the two surfaces as independent objects, i.e.
   // 1) get the global position of each surface, depending on the ySplit value,
   const double ySplit = aliPar->ySplit();
-  const double halfWidth   = 0.5 * component.surface().width();
-  const double halfLength  = 0.5 * component.surface().length();
+  const double halfWidth = 0.5 * component.surface().width();
+  const double halfLength = 0.5 * component.surface().length();
   const double halfLength1 = 0.5 * (halfLength + ySplit);
   const double halfLength2 = 0.5 * (halfLength - ySplit);
-  const double yM1 = 0.5 * (ySplit - halfLength); // y_mean of surface 1
-  const double yM2 = yM1 + halfLength;            // y_mean of surface 2
+  const double yM1 = 0.5 * (ySplit - halfLength);  // y_mean of surface 1
+  const double yM2 = yM1 + halfLength;             // y_mean of surface 2
   // The sensor positions and orientations could be adjusted using
   // TwoBowedSurfacesDeformation attached to the component,
   // but that should be 2nd order effect.
-  const align::GlobalPoint posSurf1(component.surface().toGlobal(align::LocalPoint(0.,yM1,0.)));
-  const align::GlobalPoint posSurf2(component.surface().toGlobal(align::LocalPoint(0.,yM2,0.)));
+  const align::GlobalPoint posSurf1(component.surface().toGlobal(align::LocalPoint(0., yM1, 0.)));
+  const align::GlobalPoint posSurf2(component.surface().toGlobal(align::LocalPoint(0., yM2, 0.)));
 
   // 2) get derivatives for both,
   // getDerivative(..) returns dcomponent/dmother for both being rigid body
   FrameToFrameDerivative f2fMaker;
-  AlgebraicMatrix66 f2fSurf1(f2fMaker.getDerivative(component.globalRotation(),
-                                                    mother.globalRotation(),
-                                                    posSurf1, mother.globalPosition()));
-  AlgebraicMatrix66 f2fSurf2(f2fMaker.getDerivative(component.globalRotation(),
-                                                    mother.globalRotation(),
-                                                    posSurf2, mother.globalPosition()));
+  AlgebraicMatrix66 f2fSurf1(
+      f2fMaker.getDerivative(component.globalRotation(), mother.globalRotation(), posSurf1, mother.globalPosition()));
+  AlgebraicMatrix66 f2fSurf2(
+      f2fMaker.getDerivative(component.globalRotation(), mother.globalRotation(), posSurf2, mother.globalPosition()));
   // We have to invert matrices to get d(rigid_mother)/d(rigid_component):
-  if (!f2fSurf1.Invert() || !f2fSurf2.Invert()) return false; // bail out if bad inversion
+  if (!f2fSurf1.Invert() || !f2fSurf2.Invert())
+    return false;  // bail out if bad inversion
   // Now get d(rigid_mother)/d(bowed_component):
   const AlgebraicMatrix69 derivs1(this->dRigid_dBowed(f2fSurf1, halfWidth, halfLength1));
   const AlgebraicMatrix69 derivs2(this->dRigid_dBowed(f2fSurf2, halfWidth, halfLength2));
 
   // 3) fill the common matrix by merging the two.
-  typedef ROOT::Math::SMatrix<double,6,18,ROOT::Math::MatRepStd<double,6,18> > AlgebraicMatrix6_18;
+  typedef ROOT::Math::SMatrix<double, 6, 18, ROOT::Math::MatRepStd<double, 6, 18>> AlgebraicMatrix6_18;
   AlgebraicMatrix6_18 derivs;
-  derivs.Place_at(derivs1, 0, 0); // left half
-  derivs.Place_at(derivs2, 0, 9); // right half
+  derivs.Place_at(derivs1, 0, 0);  // left half
+  derivs.Place_at(derivs2, 0, 9);  // right half
 
   // copy to TMatrix
   derivatives_.ResizeTo(6, 18);
@@ -159,22 +151,20 @@ bool ParametersToParametersDerivatives::init2BowedRigid(const Alignable &compone
 }
 
 //_________________________________________________________________________________________________
-ParametersToParametersDerivatives::AlgebraicMatrix69
-ParametersToParametersDerivatives::dRigid_dBowed(const AlgebraicMatrix66 &dRigidM2dRigidC,
-						 double halfWidth, double halfLength)
-{
+ParametersToParametersDerivatives::AlgebraicMatrix69 ParametersToParametersDerivatives::dRigid_dBowed(
+    const AlgebraicMatrix66 &dRigidM2dRigidC, double halfWidth, double halfLength) {
   typedef BowedSurfaceAlignmentDerivatives BowedDerivs;
-  const double gammaScale = BowedDerivs::gammaScale(2.*halfWidth, 2.*halfLength);
+  const double gammaScale = BowedDerivs::gammaScale(2. * halfWidth, 2. * halfLength);
 
   // 'dRigidM2dRigidC' is dmother/dcomponent for both being rigid body
-  // final matrix will be dmother/dcomponent for mother as rigid body, component with bows
-  // 1st index (row) is parameter of the mother (0..5),
-  // 2nd index (column) that of component (0..8):
+  // final matrix will be dmother/dcomponent for mother as rigid body, component
+  // with bows 1st index (row) is parameter of the mother (0..5), 2nd index
+  // (column) that of component (0..8):
   AlgebraicMatrix69 derivs;
   if (0. == gammaScale || 0. == halfWidth || 0. == halfLength) {
-    isOK_ = false; // bad input - we would have to devide by that in the following!
+    isOK_ = false;  // bad input - we would have to devide by that in the following!
     edm::LogError("Alignment") << "@SUB=ParametersToParametersDerivatives::dRigid_dBowed"
-			       << "Some zero length as input.";
+                               << "Some zero length as input.";
     return derivs;
   }
 
@@ -182,25 +172,28 @@ ParametersToParametersDerivatives::dRigid_dBowed(const AlgebraicMatrix66 &dRigid
     // loop on 6 rigid body parameters of mother
     // First copy the common rigid body part, e.g.:
     // (0,0): du_moth/du_comp, (0,1): dv_moth/du_comp, (1,2): dw_moth/dv_comp
-    for (unsigned int iCol = 0; iCol < 3; ++iCol) { // 3 movements of component
-      derivs(iRow, iCol) = dRigidM2dRigidC(iRow, iCol);  
+    for (unsigned int iCol = 0; iCol < 3; ++iCol) {  // 3 movements of component
+      derivs(iRow, iCol) = dRigidM2dRigidC(iRow, iCol);
     }
 
-    // Now we have to take care of order, signs and scales for rotation-like parameters,
-    // see CMS AN-2011/531:
-    // slopeX = w10 = -halfWidth * beta
-    // => dpar_m/dslopeX_comp = dpar_m/d(-hw * beta_comp) = -(dpar_m/dbeta_comp)/hw
-    derivs(iRow, 3) = -dRigidM2dRigidC(iRow, 4)/halfWidth; 
+    // Now we have to take care of order, signs and scales for rotation-like
+    // parameters, see CMS AN-2011/531: slopeX = w10 = -halfWidth * beta
+    // => dpar_m/dslopeX_comp = dpar_m/d(-hw * beta_comp) =
+    // -(dpar_m/dbeta_comp)/hw
+    derivs(iRow, 3) = -dRigidM2dRigidC(iRow, 4) / halfWidth;
     // slopeY = w10 = +halfLength * alpha
-    // => dpar_m/dslopeY_comp = dpar_m/d(+hl * alpha_comp) = (dpar_m/dalpha_comp)/hl
-    derivs(iRow, 4) = dRigidM2dRigidC(iRow, 3)/halfLength;
+    // => dpar_m/dslopeY_comp = dpar_m/d(+hl * alpha_comp) =
+    // (dpar_m/dalpha_comp)/hl
+    derivs(iRow, 4) = dRigidM2dRigidC(iRow, 3) / halfLength;
     // rotZ = gammaScale * gamma
-    // => dpar_m/drotZ_comp = dpar_m/d(gamma_comp * gscale) = (dpar_m/dgamma)/gscale
-    derivs(iRow, 5) = dRigidM2dRigidC(iRow, 5)/gammaScale;
+    // => dpar_m/drotZ_comp = dpar_m/d(gamma_comp * gscale) =
+    // (dpar_m/dgamma)/gscale
+    derivs(iRow, 5) = dRigidM2dRigidC(iRow, 5) / gammaScale;
 
-    // Finally, sensor internals like their curvatures have no influence on mother:
+    // Finally, sensor internals like their curvatures have no influence on
+    // mother:
     for (unsigned int iCol = 6; iCol < AlgebraicMatrix69::kCols; ++iCol) {
-      derivs(iRow, iCol) = 0.; // 3 sagittae of component
+      derivs(iRow, iCol) = 0.;  // 3 sagittae of component
     }
   }
 
@@ -208,9 +201,7 @@ ParametersToParametersDerivatives::dRigid_dBowed(const AlgebraicMatrix66 &dRigid
 }
 
 //_________________________________________________________________________________________________
-double ParametersToParametersDerivatives::operator() (unsigned int indParMother,
-						      unsigned int indParComp) const
-{
+double ParametersToParametersDerivatives::operator()(unsigned int indParMother, unsigned int indParComp) const {
   // Do range checks?
   return derivatives_(indParMother, indParComp);
-} 
+}
diff --git a/Alignment/CommonAlignmentParametrization/src/RigidBodyAlignmentParameters.cc b/Alignment/CommonAlignmentParametrization/src/RigidBodyAlignmentParameters.cc
index fffe5ef0f6255..40af0888ad813 100644
--- a/Alignment/CommonAlignmentParametrization/src/RigidBodyAlignmentParameters.cc
+++ b/Alignment/CommonAlignmentParametrization/src/RigidBodyAlignmentParameters.cc
@@ -9,112 +9,96 @@
 
 #include "Alignment/CommonAlignment/interface/Alignable.h"
 #include "Alignment/CommonAlignment/interface/AlignableDetOrUnitPtr.h"
+#include "Alignment/CommonAlignmentParametrization/interface/AlignmentParametersFactory.h"
 #include "Alignment/CommonAlignmentParametrization/interface/FrameToFrameDerivative.h"
 #include "Alignment/CommonAlignmentParametrization/interface/KarimakiAlignmentDerivatives.h"
-#include "Alignment/CommonAlignmentParametrization/interface/AlignmentParametersFactory.h"
 #include "CondFormats/Alignment/interface/Definitions.h"
 
-// This class's header 
+// This class's header
 #include "Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters.h"
 
 //__________________________________________________________________________________________________
-RigidBodyAlignmentParameters::RigidBodyAlignmentParameters(Alignable* ali, bool calcMis) :
-  AlignmentParameters(ali, displacementFromAlignable(calcMis ? ali : nullptr),
-		      AlgebraicSymMatrix(N_PARAM, 0))
-{
-}
+RigidBodyAlignmentParameters::RigidBodyAlignmentParameters(Alignable *ali, bool calcMis)
+    : AlignmentParameters(ali, displacementFromAlignable(calcMis ? ali : nullptr), AlgebraicSymMatrix(N_PARAM, 0)) {}
 
 //__________________________________________________________________________________________________
-RigidBodyAlignmentParameters::RigidBodyAlignmentParameters(Alignable* alignable, 
-							   const AlgebraicVector& parameters, 
-							   const AlgebraicSymMatrix& covMatrix) :
-  AlignmentParameters( alignable, parameters, covMatrix )
-{
- 
+RigidBodyAlignmentParameters::RigidBodyAlignmentParameters(Alignable *alignable,
+                                                           const AlgebraicVector &parameters,
+                                                           const AlgebraicSymMatrix &covMatrix)
+    : AlignmentParameters(alignable, parameters, covMatrix) {
   if (parameters.num_row() != N_PARAM) {
-    throw cms::Exception("BadParameters") << "in RigidBodyAlignmentParameters(): "
-                                          << parameters.num_row() << " instead of " << N_PARAM 
-                                          << " parameters.";
+    throw cms::Exception("BadParameters")
+        << "in RigidBodyAlignmentParameters(): " << parameters.num_row() << " instead of " << N_PARAM << " parameters.";
   }
 }
 
 //__________________________________________________________________________________________________
-RigidBodyAlignmentParameters::RigidBodyAlignmentParameters(Alignable* alignable, 
-                                                           const AlgebraicVector& parameters, 
-                                                           const AlgebraicSymMatrix& covMatrix,
-                                                           const std::vector<bool>& selection ) :
-  AlignmentParameters( alignable, parameters, covMatrix, selection )
-{  
+RigidBodyAlignmentParameters::RigidBodyAlignmentParameters(Alignable *alignable,
+                                                           const AlgebraicVector &parameters,
+                                                           const AlgebraicSymMatrix &covMatrix,
+                                                           const std::vector<bool> &selection)
+    : AlignmentParameters(alignable, parameters, covMatrix, selection) {
   if (parameters.num_row() != N_PARAM) {
-    throw cms::Exception("BadParameters") << "in RigidBodyAlignmentParameters(): "
-                                          << parameters.num_row() << " instead of " << N_PARAM 
-                                          << " parameters.";
+    throw cms::Exception("BadParameters")
+        << "in RigidBodyAlignmentParameters(): " << parameters.num_row() << " instead of " << N_PARAM << " parameters.";
   }
 }
 
 //__________________________________________________________________________________________________
-RigidBodyAlignmentParameters* 
-RigidBodyAlignmentParameters::clone( const AlgebraicVector& parameters, 
-				     const AlgebraicSymMatrix& covMatrix ) const 
-{
-  RigidBodyAlignmentParameters* rbap = 
-    new RigidBodyAlignmentParameters( alignable(), parameters, covMatrix, selector());
-
-  if (userVariables()) rbap->setUserVariables(userVariables()->clone());
+RigidBodyAlignmentParameters *RigidBodyAlignmentParameters::clone(const AlgebraicVector &parameters,
+                                                                  const AlgebraicSymMatrix &covMatrix) const {
+  RigidBodyAlignmentParameters *rbap = new RigidBodyAlignmentParameters(alignable(), parameters, covMatrix, selector());
+
+  if (userVariables())
+    rbap->setUserVariables(userVariables()->clone());
   rbap->setValid(isValid());
 
   return rbap;
 }
 
 //__________________________________________________________________________________________________
-RigidBodyAlignmentParameters* 
-RigidBodyAlignmentParameters::cloneFromSelected( const AlgebraicVector& parameters,
-						 const AlgebraicSymMatrix& covMatrix ) const
-{
-  RigidBodyAlignmentParameters* rbap = 
-    new RigidBodyAlignmentParameters(alignable(), expandVector( parameters, selector()),
-                                     expandSymMatrix(covMatrix, selector()), selector());
-
-  if ( userVariables() ) rbap->setUserVariables(userVariables()->clone());
+RigidBodyAlignmentParameters *RigidBodyAlignmentParameters::cloneFromSelected(
+    const AlgebraicVector &parameters, const AlgebraicSymMatrix &covMatrix) const {
+  RigidBodyAlignmentParameters *rbap = new RigidBodyAlignmentParameters(
+      alignable(), expandVector(parameters, selector()), expandSymMatrix(covMatrix, selector()), selector());
+
+  if (userVariables())
+    rbap->setUserVariables(userVariables()->clone());
   rbap->setValid(isValid());
 
   return rbap;
 }
 
 //__________________________________________________________________________________________________
-AlgebraicMatrix 
-RigidBodyAlignmentParameters::derivatives( const TrajectoryStateOnSurface &tsos,
-					   const AlignableDetOrUnitPtr &alidet ) const
-{
-  const Alignable *ali = this->alignable(); // Alignable of these parameters
+AlgebraicMatrix RigidBodyAlignmentParameters::derivatives(const TrajectoryStateOnSurface &tsos,
+                                                          const AlignableDetOrUnitPtr &alidet) const {
+  const Alignable *ali = this->alignable();  // Alignable of these parameters
 
-  if (ali == alidet) { // same alignable => same frame
+  if (ali == alidet) {  // same alignable => same frame
     return KarimakiAlignmentDerivatives()(tsos);
-  } else { // different alignable => transform into correct frame
+  } else {  // different alignable => transform into correct frame
     const AlgebraicMatrix deriv = KarimakiAlignmentDerivatives()(tsos);
     FrameToFrameDerivative ftfd;
     return ftfd.frameToFrameDerivative(alidet, ali).T() * deriv;
   }
 }
 
-
 //__________________________________________________________________________________________________
-AlgebraicMatrix 
-RigidBodyAlignmentParameters::selectedDerivatives( const TrajectoryStateOnSurface& tsos, 
-						   const AlignableDetOrUnitPtr &alignableDet ) const
-{
-  const AlgebraicMatrix dev = this->derivatives( tsos, alignableDet );
+AlgebraicMatrix RigidBodyAlignmentParameters::selectedDerivatives(const TrajectoryStateOnSurface &tsos,
+                                                                  const AlignableDetOrUnitPtr &alignableDet) const {
+  const AlgebraicMatrix dev = this->derivatives(tsos, alignableDet);
 
-  int ncols  = dev.num_col();
-  int nrows  = dev.num_row();
-  int nsel   = numSelected();
+  int ncols = dev.num_col();
+  int nrows = dev.num_row();
+  int nsel = numSelected();
 
-  AlgebraicMatrix seldev( nsel, ncols );
+  AlgebraicMatrix seldev(nsel, ncols);
 
-  int ir2=0;
-  for ( int irow=0; irow<nrows; ++irow ) {
+  int ir2 = 0;
+  for (int irow = 0; irow < nrows; ++irow) {
     if (selector()[irow]) {
-      for ( int icol=0; icol<ncols; ++icol ) seldev[ir2][icol] = dev[irow][icol];
+      for (int icol = 0; icol < ncols; ++icol)
+        seldev[ir2][icol] = dev[irow][icol];
       ++ir2;
     }
   }
@@ -122,64 +106,56 @@ RigidBodyAlignmentParameters::selectedDerivatives( const TrajectoryStateOnSurfac
   return seldev;
 }
 
-
 //__________________________________________________________________________________________________
-AlgebraicVector RigidBodyAlignmentParameters::translation(void) const
-{ 
+AlgebraicVector RigidBodyAlignmentParameters::translation(void) const {
   AlgebraicVector shift(3);
-  for ( int i=0;i<3;++i ) shift[i]=theData->parameters()[i];
+  for (int i = 0; i < 3; ++i)
+    shift[i] = theData->parameters()[i];
 
   return shift;
 }
 
-
 //__________________________________________________________________________________________________
-AlgebraicVector RigidBodyAlignmentParameters::rotation(void) const
-{
+AlgebraicVector RigidBodyAlignmentParameters::rotation(void) const {
   AlgebraicVector rot(3);
-  for (int i=0;i<3;++i) rot[i] = theData->parameters()[i+3];
+  for (int i = 0; i < 3; ++i)
+    rot[i] = theData->parameters()[i + 3];
 
   return rot;
 }
 
 //__________________________________________________________________________________________________
-void RigidBodyAlignmentParameters::apply()
-{
+void RigidBodyAlignmentParameters::apply() {
   Alignable *alignable = this->alignable();
   if (!alignable) {
-    throw cms::Exception("BadParameters") 
-      << "RigidBodyAlignmentParameters::apply: parameters without alignable";
+    throw cms::Exception("BadParameters") << "RigidBodyAlignmentParameters::apply: parameters without alignable";
   }
-  
+
   // Translation in local frame
-  AlgebraicVector shift = this->translation(); // fixme: should be LocalVector
+  AlgebraicVector shift = this->translation();  // fixme: should be LocalVector
 
   // Translation local->global
   align::LocalVector lv(shift[0], shift[1], shift[2]);
-  alignable->move( alignable->surface().toGlobal(lv) );
+  alignable->move(alignable->surface().toGlobal(lv));
 
   // Rotation in local frame
   align::EulerAngles angles = this->rotation();
   // original code:
   //  alignable->rotateInLocalFrame( align::toMatrix(angles) );
   // correct for rounding errors:
-  align::RotationType rot = alignable->surface().toGlobal( align::toMatrix(angles) );
+  align::RotationType rot = alignable->surface().toGlobal(align::toMatrix(angles));
   align::rectify(rot);
   alignable->rotateInGlobalFrame(rot);
 }
 
 //__________________________________________________________________________________________________
-int RigidBodyAlignmentParameters::type() const
-{
-  return AlignmentParametersFactory::kRigidBody;
-}
+int RigidBodyAlignmentParameters::type() const { return AlignmentParametersFactory::kRigidBody; }
 
 //__________________________________________________________________________________________________
-AlgebraicVector RigidBodyAlignmentParameters::globalParameters(void) const
-{
+AlgebraicVector RigidBodyAlignmentParameters::globalParameters(void) const {
   AlgebraicVector m_GlobalParameters(N_PARAM, 0);
 
-  const AlgebraicVector shift = translation(); // fixme: should return LocalVector
+  const AlgebraicVector shift = translation();  // fixme: should return LocalVector
 
   const align::LocalVector lv(shift[0], shift[1], shift[2]);
   const align::GlobalVector dg = theAlignable->surface().toGlobal(lv);
@@ -188,38 +164,31 @@ AlgebraicVector RigidBodyAlignmentParameters::globalParameters(void) const
   m_GlobalParameters[1] = dg.y();
   m_GlobalParameters[2] = dg.z();
 
-  const align::EulerAngles eulerglob = theAlignable->surface().toGlobal( rotation() );
+  const align::EulerAngles eulerglob = theAlignable->surface().toGlobal(rotation());
 
-  m_GlobalParameters[3]=eulerglob(1);
-  m_GlobalParameters[4]=eulerglob(2);
-  m_GlobalParameters[5]=eulerglob(3);
+  m_GlobalParameters[3] = eulerglob(1);
+  m_GlobalParameters[4] = eulerglob(2);
+  m_GlobalParameters[5] = eulerglob(3);
 
   return m_GlobalParameters;
 }
 
-
 //__________________________________________________________________________________________________
-void RigidBodyAlignmentParameters::print(void) const
-{
-
+void RigidBodyAlignmentParameters::print(void) const {
   std::cout << "Contents of RigidBodyAlignmentParameters:"
-            << "\nParameters: " << theData->parameters()
-            << "\nCovariance: " << theData->covariance() << std::endl;
+            << "\nParameters: " << theData->parameters() << "\nCovariance: " << theData->covariance() << std::endl;
 }
 
-
 //__________________________________________________________________________________________________
-AlgebraicVector RigidBodyAlignmentParameters::displacementFromAlignable(const Alignable* ali)
-{
+AlgebraicVector RigidBodyAlignmentParameters::displacementFromAlignable(const Alignable *ali) {
   AlgebraicVector displacement(N_PARAM);
 
   if (ali) {
-    const align::RotationType& dR = ali->rotation();
-    
-    const align::LocalVector shifts( ali->globalRotation() * 
-				     ( dR.transposed() * ali->displacement().basicVector() ) );
+    const align::RotationType &dR = ali->rotation();
+
+    const align::LocalVector shifts(ali->globalRotation() * (dR.transposed() * ali->displacement().basicVector()));
 
-    const align::EulerAngles angles = align::toAngles( ali->surface().toLocal(dR) );
+    const align::EulerAngles angles = align::toAngles(ali->surface().toLocal(dR));
 
     displacement[0] = shifts.x();
     displacement[1] = shifts.y();
diff --git a/Alignment/CommonAlignmentParametrization/src/RigidBodyAlignmentParameters4D.cc b/Alignment/CommonAlignmentParametrization/src/RigidBodyAlignmentParameters4D.cc
index 95e25dbda8a71..83eda266bafc8 100644
--- a/Alignment/CommonAlignmentParametrization/src/RigidBodyAlignmentParameters4D.cc
+++ b/Alignment/CommonAlignmentParametrization/src/RigidBodyAlignmentParameters4D.cc
@@ -9,24 +9,22 @@
 
 #include "Alignment/CommonAlignment/interface/Alignable.h"
 #include "Alignment/CommonAlignment/interface/AlignableDetOrUnitPtr.h"
+#include "Alignment/CommonAlignmentParametrization/interface/AlignmentParametersFactory.h"
 #include "Alignment/CommonAlignmentParametrization/interface/FrameToFrameDerivative.h"
 #include "Alignment/CommonAlignmentParametrization/interface/SegmentAlignmentDerivatives4D.h"
-#include "Alignment/CommonAlignmentParametrization/interface/AlignmentParametersFactory.h"
 #include "CondFormats/Alignment/interface/Definitions.h"
 
-// This class's header 
+// This class's header
 #include "Alignment/CommonAlignmentParametrization/interface/RigidBodyAlignmentParameters4D.h"
 
 //__________________________________________________________________________________________________
-AlgebraicMatrix 
-RigidBodyAlignmentParameters4D::derivatives( const TrajectoryStateOnSurface &tsos,
-					   const AlignableDetOrUnitPtr &alidet ) const
-{
-  const Alignable *ali = this->alignable(); // Alignable of these parameters
+AlgebraicMatrix RigidBodyAlignmentParameters4D::derivatives(const TrajectoryStateOnSurface &tsos,
+                                                            const AlignableDetOrUnitPtr &alidet) const {
+  const Alignable *ali = this->alignable();  // Alignable of these parameters
 
-  if (ali == alidet) { // same alignable => same frame
+  if (ali == alidet) {  // same alignable => same frame
     return SegmentAlignmentDerivatives4D()(tsos);
-  } else { // different alignable => transform into correct frame
+  } else {  // different alignable => transform into correct frame
     const AlgebraicMatrix deriv = SegmentAlignmentDerivatives4D()(tsos);
     FrameToFrameDerivative ftfd;
     return ftfd.frameToFrameDerivative(alidet, ali).T() * deriv;
@@ -34,39 +32,30 @@ RigidBodyAlignmentParameters4D::derivatives( const TrajectoryStateOnSurface &tso
 }
 
 //__________________________________________________________________________________________________
-RigidBodyAlignmentParameters4D*
-RigidBodyAlignmentParameters4D::clone( const AlgebraicVector& parameters,
-                                     const AlgebraicSymMatrix& covMatrix ) const
-{
-  RigidBodyAlignmentParameters4D* rbap =
-    new RigidBodyAlignmentParameters4D( alignable(), parameters, covMatrix, selector());
+RigidBodyAlignmentParameters4D *RigidBodyAlignmentParameters4D::clone(const AlgebraicVector &parameters,
+                                                                      const AlgebraicSymMatrix &covMatrix) const {
+  RigidBodyAlignmentParameters4D *rbap =
+      new RigidBodyAlignmentParameters4D(alignable(), parameters, covMatrix, selector());
 
-  if (userVariables()) rbap->setUserVariables(userVariables()->clone());
+  if (userVariables())
+    rbap->setUserVariables(userVariables()->clone());
   rbap->setValid(isValid());
 
   return rbap;
 }
 
 //__________________________________________________________________________________________________
-RigidBodyAlignmentParameters4D*
-RigidBodyAlignmentParameters4D::cloneFromSelected( const AlgebraicVector& parameters,
-                                                 const AlgebraicSymMatrix& covMatrix ) const
-{
-  RigidBodyAlignmentParameters4D* rbap =
-    new RigidBodyAlignmentParameters4D(alignable(), expandVector( parameters, selector()),
-                                     expandSymMatrix(covMatrix, selector()), selector());
+RigidBodyAlignmentParameters4D *RigidBodyAlignmentParameters4D::cloneFromSelected(
+    const AlgebraicVector &parameters, const AlgebraicSymMatrix &covMatrix) const {
+  RigidBodyAlignmentParameters4D *rbap = new RigidBodyAlignmentParameters4D(
+      alignable(), expandVector(parameters, selector()), expandSymMatrix(covMatrix, selector()), selector());
 
-  if ( userVariables() ) rbap->setUserVariables(userVariables()->clone());
+  if (userVariables())
+    rbap->setUserVariables(userVariables()->clone());
   rbap->setValid(isValid());
 
   return rbap;
 }
 
-
-
 //__________________________________________________________________________________________________
-int RigidBodyAlignmentParameters4D::type() const
-{
-  return AlignmentParametersFactory::kRigidBody4D;
-}
-
+int RigidBodyAlignmentParameters4D::type() const { return AlignmentParametersFactory::kRigidBody4D; }
diff --git a/Alignment/CommonAlignmentParametrization/src/SegmentAlignmentDerivatives4D.cc b/Alignment/CommonAlignmentParametrization/src/SegmentAlignmentDerivatives4D.cc
index 11dffdabaf89c..6307eaf7eda4e 100644
--- a/Alignment/CommonAlignmentParametrization/src/SegmentAlignmentDerivatives4D.cc
+++ b/Alignment/CommonAlignmentParametrization/src/SegmentAlignmentDerivatives4D.cc
@@ -8,11 +8,7 @@
 
 #include "Alignment/CommonAlignmentParametrization/interface/SegmentAlignmentDerivatives4D.h"
 
-
-AlgebraicMatrix 
-SegmentAlignmentDerivatives4D::operator()( const TrajectoryStateOnSurface &tsos ) const
-{ 
-
+AlgebraicMatrix SegmentAlignmentDerivatives4D::operator()(const TrajectoryStateOnSurface &tsos) const {
   // Get track parameters on surface
   AlgebraicVector5 alivec = tsos.localParameters().mixedFormatVector();
 
@@ -23,44 +19,43 @@ SegmentAlignmentDerivatives4D::operator()( const TrajectoryStateOnSurface &tsos
   // [3] x    : local x-coordinate
   // [4] y    : local y-coordinate
 
-  double tanpsi   = alivec[1];
+  double tanpsi = alivec[1];
   double tantheta = alivec[2];
-  double ux       = alivec[3];
-  double vx       = alivec[4];
-
-  AlgebraicMatrix aliderivs(6,4);
-
-  //delta_x
-  aliderivs[0][0]= -1.0;
-  aliderivs[0][1]=  0.0;
-  aliderivs[0][2]=  0.0;
-  aliderivs[0][3]=  0.0;
-  //delta_y
-  aliderivs[1][0]=  0.0;
-  aliderivs[1][1]= -1.0;
-  aliderivs[1][2]=  0.0;
-  aliderivs[1][3]=  0.0;
-  //delta_z
-  aliderivs[2][0]=  tanpsi;
-  aliderivs[2][1]=  tantheta;
-  aliderivs[2][2]=  tanpsi;
-  aliderivs[2][3]=  tantheta;
-  //alpha
-  aliderivs[3][0]=  vx*tanpsi;
-  aliderivs[3][1]=  vx*tantheta;
-  aliderivs[3][2]=  0;
-  aliderivs[3][3]=  1.0;
-  //beta
-  aliderivs[4][0]= -ux*tanpsi;   // New beta sign convention
-  aliderivs[4][1]= -ux*tantheta; // New beta sign convention
-  aliderivs[4][2]= -1.0;  
-  aliderivs[4][3]= 0.0; 
-  //gamma 
-  aliderivs[5][0]=  vx;
-  aliderivs[5][1]= -ux;
-  aliderivs[5][2]=  tantheta;
-  aliderivs[5][3]= -tanpsi;
-   
-  return(aliderivs);
-
+  double ux = alivec[3];
+  double vx = alivec[4];
+
+  AlgebraicMatrix aliderivs(6, 4);
+
+  // delta_x
+  aliderivs[0][0] = -1.0;
+  aliderivs[0][1] = 0.0;
+  aliderivs[0][2] = 0.0;
+  aliderivs[0][3] = 0.0;
+  // delta_y
+  aliderivs[1][0] = 0.0;
+  aliderivs[1][1] = -1.0;
+  aliderivs[1][2] = 0.0;
+  aliderivs[1][3] = 0.0;
+  // delta_z
+  aliderivs[2][0] = tanpsi;
+  aliderivs[2][1] = tantheta;
+  aliderivs[2][2] = tanpsi;
+  aliderivs[2][3] = tantheta;
+  // alpha
+  aliderivs[3][0] = vx * tanpsi;
+  aliderivs[3][1] = vx * tantheta;
+  aliderivs[3][2] = 0;
+  aliderivs[3][3] = 1.0;
+  // beta
+  aliderivs[4][0] = -ux * tanpsi;    // New beta sign convention
+  aliderivs[4][1] = -ux * tantheta;  // New beta sign convention
+  aliderivs[4][2] = -1.0;
+  aliderivs[4][3] = 0.0;
+  // gamma
+  aliderivs[5][0] = vx;
+  aliderivs[5][1] = -ux;
+  aliderivs[5][2] = tantheta;
+  aliderivs[5][3] = -tanpsi;
+
+  return (aliderivs);
 }
diff --git a/Alignment/CommonAlignmentParametrization/src/TwoBowedSurfacesAlignmentParameters.cc b/Alignment/CommonAlignmentParametrization/src/TwoBowedSurfacesAlignmentParameters.cc
index c3ab90d1429ce..6cf88198a959e 100644
--- a/Alignment/CommonAlignmentParametrization/src/TwoBowedSurfacesAlignmentParameters.cc
+++ b/Alignment/CommonAlignmentParametrization/src/TwoBowedSurfacesAlignmentParameters.cc
@@ -5,99 +5,83 @@
  *  by         : $Author: flucke $
  */
 
-#include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 
 #include "Alignment/CommonAlignment/interface/Alignable.h"
 #include "Alignment/CommonAlignment/interface/AlignableDetOrUnitPtr.h"
-#include "Alignment/CommonAlignmentParametrization/interface/KarimakiAlignmentDerivatives.h"
 #include "Alignment/CommonAlignmentParametrization/interface/AlignmentParametersFactory.h"
+#include "Alignment/CommonAlignmentParametrization/interface/KarimakiAlignmentDerivatives.h"
 #include "CondFormats/Alignment/interface/Definitions.h"
 //#include "DataFormats/Alignment/interface/SurfaceDeformation.h"
 #include "Geometry/CommonTopologies/interface/TwoBowedSurfacesDeformation.h"
 
-// This class's header 
+// This class's header
 #include "Alignment/CommonAlignmentParametrization/interface/TwoBowedSurfacesAlignmentParameters.h"
 
 #include <cmath>
 #include <iostream>
 //_________________________________________________________________________________________________
-TwoBowedSurfacesAlignmentParameters::TwoBowedSurfacesAlignmentParameters(Alignable *ali) :
-  AlignmentParameters(ali, AlgebraicVector(N_PARAM), AlgebraicSymMatrix(N_PARAM, 0)),
-  ySplit_(this->ySplitFromAlignable(ali))
-{
-}
+TwoBowedSurfacesAlignmentParameters::TwoBowedSurfacesAlignmentParameters(Alignable *ali)
+    : AlignmentParameters(ali, AlgebraicVector(N_PARAM), AlgebraicSymMatrix(N_PARAM, 0)),
+      ySplit_(this->ySplitFromAlignable(ali)) {}
 
 //_________________________________________________________________________________________________
-TwoBowedSurfacesAlignmentParameters
-::TwoBowedSurfacesAlignmentParameters(Alignable *alignable, 
-				      const AlgebraicVector &parameters, 
-				      const AlgebraicSymMatrix &covMatrix) :
-  AlignmentParameters(alignable, parameters, covMatrix),
-  ySplit_(this->ySplitFromAlignable(alignable))
-{
+TwoBowedSurfacesAlignmentParameters ::TwoBowedSurfacesAlignmentParameters(Alignable *alignable,
+                                                                          const AlgebraicVector &parameters,
+                                                                          const AlgebraicSymMatrix &covMatrix)
+    : AlignmentParameters(alignable, parameters, covMatrix), ySplit_(this->ySplitFromAlignable(alignable)) {
   if (parameters.num_row() != N_PARAM) {
-    throw cms::Exception("BadParameters") << "in TwoBowedSurfacesAlignmentParameters(): "
-                                          << parameters.num_row() << " instead of " << N_PARAM 
-                                          << " parameters.";
+    throw cms::Exception("BadParameters") << "in TwoBowedSurfacesAlignmentParameters(): " << parameters.num_row()
+                                          << " instead of " << N_PARAM << " parameters.";
   }
 }
 
 //_________________________________________________________________________________________________
-TwoBowedSurfacesAlignmentParameters
-::TwoBowedSurfacesAlignmentParameters(Alignable *alignable, 
-				      const AlgebraicVector &parameters, 
-				      const AlgebraicSymMatrix &covMatrix,
-				      const std::vector<bool> &selection) :
-  AlignmentParameters(alignable, parameters, covMatrix, selection),
-  ySplit_(this->ySplitFromAlignable(alignable))
-{
+TwoBowedSurfacesAlignmentParameters ::TwoBowedSurfacesAlignmentParameters(Alignable *alignable,
+                                                                          const AlgebraicVector &parameters,
+                                                                          const AlgebraicSymMatrix &covMatrix,
+                                                                          const std::vector<bool> &selection)
+    : AlignmentParameters(alignable, parameters, covMatrix, selection), ySplit_(this->ySplitFromAlignable(alignable)) {
   if (parameters.num_row() != N_PARAM) {
-    throw cms::Exception("BadParameters") << "in TwoBowedSurfacesAlignmentParameters(): "
-                                          << parameters.num_row() << " instead of " << N_PARAM 
-                                          << " parameters.";
+    throw cms::Exception("BadParameters") << "in TwoBowedSurfacesAlignmentParameters(): " << parameters.num_row()
+                                          << " instead of " << N_PARAM << " parameters.";
   }
 }
 
 //_________________________________________________________________________________________________
-TwoBowedSurfacesAlignmentParameters* 
-TwoBowedSurfacesAlignmentParameters::clone(const AlgebraicVector &parameters, 
-					   const AlgebraicSymMatrix &covMatrix) const 
-{
-  TwoBowedSurfacesAlignmentParameters* rbap = 
-    new TwoBowedSurfacesAlignmentParameters(this->alignable(), parameters, covMatrix, selector());
+TwoBowedSurfacesAlignmentParameters *TwoBowedSurfacesAlignmentParameters::clone(
+    const AlgebraicVector &parameters, const AlgebraicSymMatrix &covMatrix) const {
+  TwoBowedSurfacesAlignmentParameters *rbap =
+      new TwoBowedSurfacesAlignmentParameters(this->alignable(), parameters, covMatrix, selector());
 
-  if (this->userVariables()) rbap->setUserVariables(this->userVariables()->clone());
+  if (this->userVariables())
+    rbap->setUserVariables(this->userVariables()->clone());
   rbap->setValid(this->isValid());
 
   return rbap;
 }
 
 //_________________________________________________________________________________________________
-TwoBowedSurfacesAlignmentParameters* 
-TwoBowedSurfacesAlignmentParameters::cloneFromSelected(const AlgebraicVector &parameters,
-						       const AlgebraicSymMatrix &covMatrix) const
-{
+TwoBowedSurfacesAlignmentParameters *TwoBowedSurfacesAlignmentParameters::cloneFromSelected(
+    const AlgebraicVector &parameters, const AlgebraicSymMatrix &covMatrix) const {
   return this->clone(this->expandVector(parameters, this->selector()),
-		     this->expandSymMatrix(covMatrix, this->selector()));
+                     this->expandSymMatrix(covMatrix, this->selector()));
 }
 
 //_________________________________________________________________________________________________
-AlgebraicMatrix 
-TwoBowedSurfacesAlignmentParameters::derivatives(const TrajectoryStateOnSurface &tsos,
-						 const AlignableDetOrUnitPtr &alidet) const
-{
-  const Alignable *ali = this->alignable(); // Alignable of these parameters
-  AlgebraicMatrix result(N_PARAM, 2); // initialised with zeros
+AlgebraicMatrix TwoBowedSurfacesAlignmentParameters::derivatives(const TrajectoryStateOnSurface &tsos,
+                                                                 const AlignableDetOrUnitPtr &alidet) const {
+  const Alignable *ali = this->alignable();  // Alignable of these parameters
+  AlgebraicMatrix result(N_PARAM, 2);        // initialised with zeros
 
   if (ali == alidet) {
     const AlignableSurface &surf = ali->surface();
- 
-    // matrix of dimension BowedDerivs::N_PARAM x 2 
-    const AlgebraicMatrix derivs(BowedDerivs()(tsos, surf.width(), surf.length(),
-					       true, ySplit_)); // split at ySplit_!
+
+    // matrix of dimension BowedDerivs::N_PARAM x 2
+    const AlgebraicMatrix derivs(BowedDerivs()(tsos, surf.width(), surf.length(), true, ySplit_));  // split at ySplit_!
 
     // Parameters belong to surface part with y < ySplit_ or y >= ySplit_?
     const double localY = tsos.localParameters().mixedFormatVector()[4];
@@ -106,82 +90,83 @@ TwoBowedSurfacesAlignmentParameters::derivatives(const TrajectoryStateOnSurface
     for (unsigned int i = BowedDerivs::dx; i < BowedDerivs::N_PARAM; ++i) {
       result[indexOffset + i][0] = derivs[i][0];
       result[indexOffset + i][1] = derivs[i][1];
-    } 
+    }
   } else {
-    // The following is even more difficult for TwoBowedSurfacesAlignmentParameters
-    // than for BowedSurfaceAlignmentParameters where this text comes from:
+    // The following is even more difficult for
+    // TwoBowedSurfacesAlignmentParameters than for
+    // BowedSurfaceAlignmentParameters where this text comes from:
     //
-    // We could give this a meaning by applying frame-to-frame derivatives 
-    // to the rigid body part of the parameters (be careful that alpha ~= dslopeY
-    // and beta ~= -dslopeX, but with changed scale!)
-    // and keep the surface structure parameters untouched in local meaning.
-    // In this way we could do higher level alignment and determine 'average'
-    // surface structures for the components.
-    throw cms::Exception("MisMatch")
-      << "TwoBowedSurfacesAlignmentParameters::derivatives: The hit alignable must match the "
-      << "aligned one (i.e. bowed surface parameters cannot be used for composed alignables)\n";
+    // We could give this a meaning by applying frame-to-frame derivatives
+    // to the rigid body part of the parameters (be careful that alpha ~=
+    // dslopeY and beta ~= -dslopeX, but with changed scale!) and keep the
+    // surface structure parameters untouched in local meaning. In this way we
+    // could do higher level alignment and determine 'average' surface
+    // structures for the components.
+    throw cms::Exception("MisMatch") << "TwoBowedSurfacesAlignmentParameters::derivatives: The hit "
+                                        "alignable must match the "
+                                     << "aligned one (i.e. bowed surface parameters cannot be used for "
+                                        "composed alignables)\n";
   }
 
   return result;
 }
 
 //_________________________________________________________________________________________________
-void TwoBowedSurfacesAlignmentParameters::apply()
-{
+void TwoBowedSurfacesAlignmentParameters::apply() {
   Alignable *alignable = this->alignable();
   if (!alignable) {
-    throw cms::Exception("BadParameters") 
-      << "TwoBowedSurfacesAlignmentParameters::apply: parameters without alignable";
+    throw cms::Exception("BadParameters") << "TwoBowedSurfacesAlignmentParameters::apply: parameters without "
+                                             "alignable";
   }
-  
+
   // Some repeatedly needed variables
   const AlignableSurface &surface = alignable->surface();
-  const double halfLength  = surface.length() * 0.5; // full module
-  const double halfLength1 = (halfLength + ySplit_) * 0.5;        // low-y surface
-  const double halfLength2 = (halfLength - ySplit_) * 0.5;        // high-y surface
+  const double halfLength = surface.length() * 0.5;         // full module
+  const double halfLength1 = (halfLength + ySplit_) * 0.5;  // low-y surface
+  const double halfLength2 = (halfLength - ySplit_) * 0.5;  // high-y surface
 
   // first copy the parameters into separate parts for the two surfaces
   const AlgebraicVector &params = theData->parameters();
-  std::vector<double> rigidBowPar1(BowedDerivs::N_PARAM); // 1st surface (y <  ySplit_)
-  std::vector<double> rigidBowPar2(BowedDerivs::N_PARAM); // 2nd surface (y >= ySplit_)
+  std::vector<double> rigidBowPar1(BowedDerivs::N_PARAM);  // 1st surface (y <  ySplit_)
+  std::vector<double> rigidBowPar2(BowedDerivs::N_PARAM);  // 2nd surface (y >= ySplit_)
   for (unsigned int i = 0; i < BowedDerivs::N_PARAM; ++i) {
     rigidBowPar1[i] = params[i];
     rigidBowPar2[i] = params[i + BowedDerivs::N_PARAM];
   }
-  // Now adjust slopes to angles, note that dslopeX <-> -beta & dslopeY <-> alpha,
-  // see BowedSurfaceAlignmentParameters::rotation(): FIXME: use atan?
-  rigidBowPar1[3] =  params[dslopeY1] / halfLength1; // alpha1
-  rigidBowPar2[3] =  params[dslopeY2] / halfLength2; // alpha2 
-  rigidBowPar1[4] = -params[dslopeX1] / (surface.width() * 0.5); // beta1
-  rigidBowPar2[4] = -params[dslopeX2] / (surface.width() * 0.5); // beta2
+  // Now adjust slopes to angles, note that dslopeX <-> -beta & dslopeY <->
+  // alpha, see BowedSurfaceAlignmentParameters::rotation(): FIXME: use atan?
+  rigidBowPar1[3] = params[dslopeY1] / halfLength1;               // alpha1
+  rigidBowPar2[3] = params[dslopeY2] / halfLength2;               // alpha2
+  rigidBowPar1[4] = -params[dslopeX1] / (surface.width() * 0.5);  // beta1
+  rigidBowPar2[4] = -params[dslopeX2] / (surface.width() * 0.5);  // beta2
   // gamma is simply scaled
-  const double gammaScale1 = BowedDerivs::gammaScale(surface.width(), 2.0*halfLength1);
+  const double gammaScale1 = BowedDerivs::gammaScale(surface.width(), 2.0 * halfLength1);
   rigidBowPar1[5] = params[drotZ1] / gammaScale1;
-//   const double gammaScale2 = std::sqrt(halfLength2 * halfLength2
-// 				       + surface.width() * surface.width()/4.);
-  const double gammaScale2 = BowedDerivs::gammaScale(surface.width(), 2.0*halfLength2);
+  //   const double gammaScale2 = std::sqrt(halfLength2 * halfLength2
+  // 				       + surface.width() * surface.width()/4.);
+  const double gammaScale2 = BowedDerivs::gammaScale(surface.width(), 2.0 * halfLength2);
   rigidBowPar2[5] = params[drotZ2] / gammaScale2;
 
   // Get rigid body rotations of full module as mean of the two surfaces:
-  align::EulerAngles angles(3); // to become 'common' rotation in local frame
+  align::EulerAngles angles(3);  // to become 'common' rotation in local frame
   for (unsigned int i = 0; i < 3; ++i) {
-    angles[i] = (rigidBowPar1[i+3] + rigidBowPar2[i+3]) * 0.5;
+    angles[i] = (rigidBowPar1[i + 3] + rigidBowPar2[i + 3]) * 0.5;
   }
   // Module rotations are around other axes than the one we determined,
   // so we have to correct that the surfaces are shifted by the rotation around
   // the module axis - in linear approximation just an additional shift:
-  const double yMean1 = -halfLength + halfLength1;// y of alpha1 rotation axis in module frame
-  const double yMean2 =  halfLength - halfLength2;// y of alpha2 rotation axis in module frame
-  rigidBowPar1[dz1] -= angles[0] * yMean1; // correct w1 for alpha
-  rigidBowPar2[dz1] -= angles[0] * yMean2; // correct w2 for alpha
+  const double yMean1 = -halfLength + halfLength1;  // y of alpha1 rotation axis in module frame
+  const double yMean2 = halfLength - halfLength2;   // y of alpha2 rotation axis in module frame
+  rigidBowPar1[dz1] -= angles[0] * yMean1;          // correct w1 for alpha
+  rigidBowPar2[dz1] -= angles[0] * yMean2;          // correct w2 for alpha
   // Nothing for beta1/2 since anyway both around the y-axis of the module.
-  rigidBowPar1[dx1] += angles[2] * yMean1; // correct x1 for gamma
-  rigidBowPar2[dx1] += angles[2] * yMean2; // correct x1 for gamma
+  rigidBowPar1[dx1] += angles[2] * yMean1;  // correct x1 for gamma
+  rigidBowPar2[dx1] += angles[2] * yMean2;  // correct x1 for gamma
 
   // Get rigid body shifts of full module as mean of the two surfaces:
-  const align::LocalVector shift((rigidBowPar1[dx1] + rigidBowPar2[dx1]) * 0.5, // dx1!
-				 (rigidBowPar1[dy1] + rigidBowPar2[dy1]) * 0.5, // dy1!
-				 (rigidBowPar1[dz1] + rigidBowPar2[dz1]) * 0.5);// dz1!
+  const align::LocalVector shift((rigidBowPar1[dx1] + rigidBowPar2[dx1]) * 0.5,   // dx1!
+                                 (rigidBowPar1[dy1] + rigidBowPar2[dy1]) * 0.5,   // dy1!
+                                 (rigidBowPar1[dz1] + rigidBowPar2[dz1]) * 0.5);  // dz1!
   // Apply module shift and rotation:
   alignable->move(surface.toGlobal(shift));
   // original code:
@@ -192,14 +177,16 @@ void TwoBowedSurfacesAlignmentParameters::apply()
   alignable->rotateInGlobalFrame(rot);
 
   // only update the surface deformations if they were selected for alignment
-  if (selector()[dsagittaX1] || selector()[dsagittaXY1] || selector()[dsagittaY1] ||
-      selector()[dsagittaX2] || selector()[dsagittaXY2] || selector()[dsagittaY2]) {
-    // Fill surface structures with mean bows and half differences for all parameters:
-    std::vector<align::Scalar> deformations; deformations.reserve(13);
+  if (selector()[dsagittaX1] || selector()[dsagittaXY1] || selector()[dsagittaY1] || selector()[dsagittaX2] ||
+      selector()[dsagittaXY2] || selector()[dsagittaY2]) {
+    // Fill surface structures with mean bows and half differences for all
+    // parameters:
+    std::vector<align::Scalar> deformations;
+    deformations.reserve(13);
     // first part: average bows
-    deformations.push_back((params[dsagittaX1 ] + params[dsagittaX2 ]) * 0.5);
+    deformations.push_back((params[dsagittaX1] + params[dsagittaX2]) * 0.5);
     deformations.push_back((params[dsagittaXY1] + params[dsagittaXY2]) * 0.5);
-    deformations.push_back((params[dsagittaY1 ] + params[dsagittaY2 ]) * 0.5);
+    deformations.push_back((params[dsagittaY1] + params[dsagittaY2]) * 0.5);
     // second part: half difference of all corrections
     for (unsigned int i = 0; i < BowedDerivs::N_PARAM; ++i) {
       // sign means that we have to apply e.g.
@@ -210,7 +197,7 @@ void TwoBowedSurfacesAlignmentParameters::apply()
       deformations.push_back((rigidBowPar1[i] - rigidBowPar2[i]) * 0.5);
     }
     // finally: keep track of where we have split the module
-    deformations.push_back(ySplit_); // index is 12
+    deformations.push_back(ySplit_);  // index is 12
 
     const TwoBowedSurfacesDeformation deform{deformations};
 
@@ -222,59 +209,54 @@ void TwoBowedSurfacesAlignmentParameters::apply()
 }
 
 //_________________________________________________________________________________________________
-int TwoBowedSurfacesAlignmentParameters::type() const
-{
-  return AlignmentParametersFactory::kTwoBowedSurfaces;
-}
+int TwoBowedSurfacesAlignmentParameters::type() const { return AlignmentParametersFactory::kTwoBowedSurfaces; }
 
 //_________________________________________________________________________________________________
-void TwoBowedSurfacesAlignmentParameters::print() const
-{
-
+void TwoBowedSurfacesAlignmentParameters::print() const {
   std::cout << "Contents of TwoBowedSurfacesAlignmentParameters:"
-            << "\nParameters: " << theData->parameters()
-            << "\nCovariance: " << theData->covariance() << std::endl;
+            << "\nParameters: " << theData->parameters() << "\nCovariance: " << theData->covariance() << std::endl;
 }
 
 //_________________________________________________________________________________________________
-double TwoBowedSurfacesAlignmentParameters::ySplitFromAlignable(const Alignable *ali) const
-{
-  if (!ali) return 0.;
+double TwoBowedSurfacesAlignmentParameters::ySplitFromAlignable(const Alignable *ali) const {
+  if (!ali)
+    return 0.;
 
-  const align::PositionType pos(ali->globalPosition());  
+  const align::PositionType pos(ali->globalPosition());
   const double r = pos.perp();
 
   // The returned numbers for TEC are calculated as stated below from
   // what is found in CMS-NOTE 2003/20.
   // Note that at that time it was planned to use ST sensors for the outer TEC
-  // while in the end there are only a few of them in the tracker - the others are HPK.
-  // No idea whether there are subtle changes in geometry.
-  // The numbers have been cross checked with y-residuals in data, see 
+  // while in the end there are only a few of them in the tracker - the others
+  // are HPK. No idea whether there are subtle changes in geometry. The numbers
+  // have been cross checked with y-residuals in data, see
   // https://hypernews.cern.ch/HyperNews/CMS/get/recoTracking/1018/1/1/2/1/1/1/2/1.html.
 
-  if (r < 58.) { // Pixel, TIB, TID or TEC ring 1-4
+  if (r < 58.) {  // Pixel, TIB, TID or TEC ring 1-4
     edm::LogError("Alignment") << "@SUB=TwoBowedSurfacesAlignmentParameters::ySplitFromAlignable"
-			       << "There are no split modules for radii < 58, but r = " << r;
+                               << "There are no split modules for radii < 58, but r = " << r;
     return 0.;
-  } else if (fabs(pos.z()) < 118.) { // TOB
+  } else if (fabs(pos.z()) < 118.) {  // TOB
     return 0.;
-  } else if (r > 90.) { // TEC ring 7
+  } else if (r > 90.) {  // TEC ring 7
     // W7a Height active= 106.900mm (Tab. 2) (but 106.926 mm p. 40!?)
     // W7a R min active = 888.400mm (Paragraph 5.5.7)
-    // W7a R max active = W7a R min active + W7a Height active = 
+    // W7a R max active = W7a R min active + W7a Height active =
     //                  = 888.400mm + 106.900mm = 995.300mm
     // W7b Height active=  94.900mm (Tab. 2)  (but 94.876 mm p. 41!?)
     // W7b R min active = 998.252mm (Paragraph 5.5.8)
     // W7b R max active = 998.252mm + 94.900mm = 1093.152mm
     // mean radius module = 0.5*(1093.152mm + 888.400mm) = 990.776mm
     // mean radius gap = 0.5*(998.252mm + 995.300mm) = 996.776mm
-    // ySplit = (mean radius gap - mean radius module) // local y and r have same directions!
+    // ySplit = (mean radius gap - mean radius module) // local y and r have
+    // same directions!
     //        = 996.776mm - 990.776mm = 6mm
     return 0.6;
-  } else if (r > 75.) { // TEC ring 6
+  } else if (r > 75.) {  // TEC ring 6
     // W6a Height active= 96.100mm (Tab. 2) (but 96.136 mm p. 38!?)
     // W6a R min active = 727.000mm (Paragraph 5.5.5)
-    // W6a R max active = W6a R min active + W6a Height active = 
+    // W6a R max active = W6a R min active + W6a Height active =
     //                  = 727.000mm + 96.100mm = 823.100mm
     // W6b Height active= 84.900mm (Tab. 2) (but 84.936 mm p. 39!?)
     // W6b R min active = 826.060mm (Paragraph 5.5.6)
@@ -285,10 +267,10 @@ double TwoBowedSurfacesAlignmentParameters::ySplitFromAlignable(const Alignable
     // ySplit = -1*(mean radius gap - mean radius module)
     //        = -1*(824.580mm - 818.980mm) = -5.6mm
     return -0.56;
-  } else {              // TEC ring 5 - smaller radii alreay excluded before
+  } else {  // TEC ring 5 - smaller radii alreay excluded before
     // W5a Height active= 81.200mm (Tab. 2) (but 81.169 mm p. 36!?)
     // W5a R min active = 603.200mm (Paragraph 5.5.3)
-    // W5a R max active = W5a R min active + W5a Height active = 
+    // W5a R max active = W5a R min active + W5a Height active =
     //                  = 603.200mm + 81.200mm = 684.400mm
     // W5b Height active= 63.200mm (Tab. 2) (63.198 mm on p. 37)
     // W5b R min active = 687.293mm (Abschnitt 5.5.4 der note)
diff --git a/Alignment/CommonAlignmentProducer/interface/AlignmentCSCBeamHaloSelector.h b/Alignment/CommonAlignmentProducer/interface/AlignmentCSCBeamHaloSelector.h
index f22bb1c588534..0b002a29081c4 100644
--- a/Alignment/CommonAlignmentProducer/interface/AlignmentCSCBeamHaloSelector.h
+++ b/Alignment/CommonAlignmentProducer/interface/AlignmentCSCBeamHaloSelector.h
@@ -6,28 +6,28 @@
 #include "DataFormats/TrackReco/interface/Track.h"
 
 namespace edm {
-   class Event;
-   class ParameterSet;
-}
+  class Event;
+  class ParameterSet;
+}  // namespace edm
 
 class TrackingRecHit;
 
 class AlignmentCSCBeamHaloSelector {
-   public:
-      typedef std::vector<const reco::Track*> Tracks;
+public:
+  typedef std::vector<const reco::Track *> Tracks;
 
-      /// constructor
-      AlignmentCSCBeamHaloSelector(const edm::ParameterSet &iConfig, edm::ConsumesCollector & iC);
+  /// constructor
+  AlignmentCSCBeamHaloSelector(const edm::ParameterSet &iConfig, edm::ConsumesCollector &iC);
 
-      /// destructor
-      ~AlignmentCSCBeamHaloSelector();
+  /// destructor
+  ~AlignmentCSCBeamHaloSelector();
 
-      /// select tracks
-      Tracks select(const Tracks &tracks, const edm::Event &iEvent) const;
+  /// select tracks
+  Tracks select(const Tracks &tracks, const edm::Event &iEvent) const;
 
-   private:
-      unsigned int m_minStations;
-      unsigned int m_minHitsPerStation;
+private:
+  unsigned int m_minStations;
+  unsigned int m_minHitsPerStation;
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentProducer/interface/AlignmentCSCOverlapSelector.h b/Alignment/CommonAlignmentProducer/interface/AlignmentCSCOverlapSelector.h
index a5dbd8f4f53ae..1b6365f8f297f 100644
--- a/Alignment/CommonAlignmentProducer/interface/AlignmentCSCOverlapSelector.h
+++ b/Alignment/CommonAlignmentProducer/interface/AlignmentCSCOverlapSelector.h
@@ -5,28 +5,28 @@
 #include "DataFormats/TrackReco/interface/Track.h"
 
 namespace edm {
-   class Event;
-   class ParameterSet;
-}
+  class Event;
+  class ParameterSet;
+}  // namespace edm
 
 class TrackingRecHit;
 
 class AlignmentCSCOverlapSelector {
-   public:
-      typedef std::vector<const reco::Track*> Tracks; 
+public:
+  typedef std::vector<const reco::Track *> Tracks;
 
-      /// constructor
-      AlignmentCSCOverlapSelector(const edm::ParameterSet &iConfig);
+  /// constructor
+  AlignmentCSCOverlapSelector(const edm::ParameterSet &iConfig);
 
-      /// destructor
-      ~AlignmentCSCOverlapSelector();
+  /// destructor
+  ~AlignmentCSCOverlapSelector();
 
-      /// select tracks
-      Tracks select(const Tracks &tracks, const edm::Event &iEvent) const;
+  /// select tracks
+  Tracks select(const Tracks &tracks, const edm::Event &iEvent) const;
 
-   private:
-      int m_station;
-      unsigned int m_minHitsPerChamber;
+private:
+  int m_station;
+  unsigned int m_minHitsPerChamber;
 };
 
 #endif
diff --git a/Alignment/CommonAlignmentProducer/interface/AlignmentCSCTrackSelector.h b/Alignment/CommonAlignmentProducer/interface/AlignmentCSCTrackSelector.h
index da9dd8e5f2e50..2ad53a5caf7c3 100644
--- a/Alignment/CommonAlignmentProducer/interface/AlignmentCSCTrackSelector.h
+++ b/Alignment/CommonAlignmentProducer/interface/AlignmentCSCTrackSelector.h
@@ -8,19 +8,16 @@
 namespace edm {
   class Event;
   class ParameterSet;
-}
+}  // namespace edm
 
 class TrackingRecHit;
 
-class AlignmentCSCTrackSelector
-{
-
- public:
-
-  typedef std::vector<const reco::Track*> Tracks; 
+class AlignmentCSCTrackSelector {
+public:
+  typedef std::vector<const reco::Track*> Tracks;
 
   /// constructor
-  AlignmentCSCTrackSelector(const edm::ParameterSet & cfg);
+  AlignmentCSCTrackSelector(const edm::ParameterSet& cfg);
 
   /// destructor
   ~AlignmentCSCTrackSelector();
@@ -28,12 +25,9 @@ class AlignmentCSCTrackSelector
   /// select tracks
   Tracks select(const Tracks& tracks, const edm::Event& evt) const;
 
- private:
-
+private:
   edm::InputTag m_src;
   int m_stationA, m_stationB, m_minHitsDT, m_minHitsPerStation, m_maxHitsPerStation;
-
 };
 
 #endif
-
diff --git a/Alignment/CommonAlignmentProducer/interface/AlignmentGlobalTrackSelector.h b/Alignment/CommonAlignmentProducer/interface/AlignmentGlobalTrackSelector.h
index 617198699835d..a544668e644a1 100644
--- a/Alignment/CommonAlignmentProducer/interface/AlignmentGlobalTrackSelector.h
+++ b/Alignment/CommonAlignmentProducer/interface/AlignmentGlobalTrackSelector.h
@@ -11,18 +11,20 @@
 //STL
 #include <vector>
 
-namespace reco {class Track;}
-namespace edm {class Event; class EventSetup;}
-
-class AlignmentGlobalTrackSelector
-{
-
- public:
-
-  typedef std::vector<const reco::Track*> Tracks; 
+namespace reco {
+  class Track;
+}
+namespace edm {
+  class Event;
+  class EventSetup;
+}  // namespace edm
+
+class AlignmentGlobalTrackSelector {
+public:
+  typedef std::vector<const reco::Track*> Tracks;
 
   /// constructor
-  AlignmentGlobalTrackSelector(const edm::ParameterSet & cfg, edm::ConsumesCollector& iC);
+  AlignmentGlobalTrackSelector(const edm::ParameterSet& cfg, edm::ConsumesCollector& iC);
 
   /// destructor
   ~AlignmentGlobalTrackSelector();
@@ -31,15 +33,14 @@ class AlignmentGlobalTrackSelector
   Tracks select(const Tracks& tracks, const edm::Event& iEvent, const edm::EventSetup& eSetup);
   ///returns if any of the Filters is used.
   bool useThisFilter();
- 
- private:
-  
+
+private:
   ///returns [tracks] if there are less than theMaxCount Jets with theMinJetPt and an empty set if not
-  Tracks checkJetCount(const Tracks& cands,const edm::Event& iEvent)const;
+  Tracks checkJetCount(const Tracks& cands, const edm::Event& iEvent) const;
   ///returns only isolated tracks in [cands]
-  Tracks checkIsolation(const Tracks& cands,const edm::Event& iEvent)const;
+  Tracks checkIsolation(const Tracks& cands, const edm::Event& iEvent) const;
   ///filter for Tracks that match the Track of a global Muon
-  Tracks findMuons(const Tracks& tracks,const edm::Event& iEvent)const;
+  Tracks findMuons(const Tracks& tracks, const edm::Event& iEvent) const;
 
   /// private data members
   edm::ParameterSet theConf;
@@ -75,4 +76,3 @@ class AlignmentGlobalTrackSelector
 };
 
 #endif
-
diff --git a/Alignment/CommonAlignmentProducer/interface/AlignmentMuonSelector.h b/Alignment/CommonAlignmentProducer/interface/AlignmentMuonSelector.h
index 41ab55d9a67e9..db3379bebf0b4 100644
--- a/Alignment/CommonAlignmentProducer/interface/AlignmentMuonSelector.h
+++ b/Alignment/CommonAlignmentProducer/interface/AlignmentMuonSelector.h
@@ -19,17 +19,16 @@
 #include "CommonTools/RecoAlgos/interface/MuonSelector.h"
 #include <vector>
 
-namespace edm { class Event; }
+namespace edm {
+  class Event;
+}
 
-class AlignmentMuonSelector 
-{
-
- public:
-
-  typedef std::vector<const reco::Muon*> Muons; 
+class AlignmentMuonSelector {
+public:
+  typedef std::vector<const reco::Muon*> Muons;
 
   /// constructor
-  AlignmentMuonSelector(const edm::ParameterSet & cfg);
+  AlignmentMuonSelector(const edm::ParameterSet& cfg);
 
   /// destructor
   ~AlignmentMuonSelector();
@@ -37,35 +36,30 @@ class AlignmentMuonSelector
   /// select muons
   Muons select(const Muons& muons, const edm::Event& evt) const;
 
- private:
-
+private:
   /// apply basic cuts on pt,eta,phi,nhit
   Muons basicCuts(const Muons& muons) const;
 
   /// filter the n highest pt muons
   Muons theNHighestPtMuons(const Muons& muons) const;
-  
+
   /// filter only those muons giving best mass pair combination
   Muons theBestMassPairCombinationMuons(const Muons& muons) const;
-  
+
   /// compare two muons in pt (used by theNHighestPtMuons)
   struct ComparePt {
-    bool operator()( const reco::Muon* t1, const reco::Muon* t2 ) const {
-      return t1->pt()> t2->pt();
-    }
+    bool operator()(const reco::Muon* t1, const reco::Muon* t2) const { return t1->pt() > t2->pt(); }
   };
   ComparePt ptComparator;
 
   /// private data members
-  bool applyBasicCuts,applyNHighestPt,applyMultiplicityFilter,applyMassPairFilter;
-  int nHighestPt,minMultiplicity;
-  double pMin,pMax,ptMin,ptMax,etaMin,etaMax,phiMin,phiMax;
-  double nHitMinSA,nHitMaxSA,chi2nMaxSA;
-  double nHitMinGB,nHitMaxGB,chi2nMaxGB;
-  double nHitMinTO,nHitMaxTO,chi2nMaxTO;
-  double minMassPair,maxMassPair;
-
+  bool applyBasicCuts, applyNHighestPt, applyMultiplicityFilter, applyMassPairFilter;
+  int nHighestPt, minMultiplicity;
+  double pMin, pMax, ptMin, ptMax, etaMin, etaMax, phiMin, phiMax;
+  double nHitMinSA, nHitMaxSA, chi2nMaxSA;
+  double nHitMinGB, nHitMaxGB, chi2nMaxGB;
+  double nHitMinTO, nHitMaxTO, chi2nMaxTO;
+  double minMassPair, maxMassPair;
 };
 
 #endif
-
diff --git a/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h b/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h
index 9758e9fd43393..25e07cc8c30ca 100644
--- a/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h
+++ b/Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h
@@ -57,7 +57,6 @@
 
 #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
 
-
 class AlignTransform;
 class Alignments;
 class AlignmentErrorsExtended;
@@ -67,9 +66,7 @@ struct SurveyErrors;
 class TrackerTopology;
 class TrackerDigiGeometryRecord;
 
-
-class AlignmentProducerBase
-{
+class AlignmentProducerBase {
 protected:
   AlignmentProducerBase(const edm::ParameterSet&);
 
@@ -108,15 +105,11 @@ class AlignmentProducerBase
   /// @alignmentAlgo_
   bool finish();
 
-  virtual bool getTrajTrackAssociationCollection(const edm::Event&,
-                                                 edm::Handle<TrajTrackAssociationCollection>&) = 0;
+  virtual bool getTrajTrackAssociationCollection(const edm::Event&, edm::Handle<TrajTrackAssociationCollection>&) = 0;
   virtual bool getBeamSpot(const edm::Event&, edm::Handle<reco::BeamSpot>&) = 0;
-  virtual bool getTkFittedLasBeamCollection(const edm::Run&,
-                                            edm::Handle<TkFittedLasBeamCollection>&) = 0;
-  virtual bool getTsosVectorCollection(const edm::Run&,
-                                       edm::Handle<TsosVectorCollection>&) = 0;
-  virtual bool getAliClusterValueMap(const edm::Event&,
-                                     edm::Handle<AliClusterValueMap>&) = 0;
+  virtual bool getTkFittedLasBeamCollection(const edm::Run&, edm::Handle<TkFittedLasBeamCollection>&) = 0;
+  virtual bool getTsosVectorCollection(const edm::Run&, edm::Handle<TsosVectorCollection>&) = 0;
+  virtual bool getAliClusterValueMap(const edm::Event&, edm::Handle<AliClusterValueMap>&) = 0;
 
   std::shared_ptr<TrackerGeometry> trackerGeometry_;
   std::shared_ptr<DTGeometry> muonDTGeometry_;
@@ -136,7 +129,6 @@ class AlignmentProducerBase
   const edm::InputTag clusterValueMapTag_;
 
 private:
-
   /// Creates the choosen alignment algorithm
   void createAlignmentAlgorithm();
 
@@ -170,8 +162,7 @@ class AlignmentProducerBase
   void applyMisalignment();
 
   /// Applies misalignment scenario to @alignableTracker_
-  void simpleMisalignment(const align::Alignables&, const std::string&,
-                          float, float, bool);
+  void simpleMisalignment(const align::Alignables&, const std::string&, float, float, bool);
 
   /// Applies Alignments, AlignmentErrors and SurfaceDeformations to
   /// @trackerGeometry_
@@ -179,11 +170,11 @@ class AlignmentProducerBase
 
   /// Applies DB constants belonging to (Err)Rcd to Geometry, taking into
   /// account 'globalPosition' correction.
-  template<class G, class Rcd, class ErrRcd>
+  template <class G, class Rcd, class ErrRcd>
   void applyDB(G*, const edm::EventSetup&, const AlignTransform&) const;
 
   /// Applies DB constants for SurfaceDeformations
-  template<class G, class DeformationRcd>
+  template <class G, class DeformationRcd>
   void applyDB(G*, const edm::EventSetup&) const;
 
   /// Reads in survey records
@@ -202,19 +193,20 @@ class AlignmentProducerBase
   /// Writes Alignments and/or AlignmentErrors to DB for record names
   /// (removes *globalCoordinates before writing if non-null...).
   /// Takes over ownership of Alignments and AlignmentErrors.
-  void writeDB(Alignments*, const std::string&, AlignmentErrorsExtended*,
-               const std::string&, const AlignTransform*, cond::Time_t) const;
+  void writeDB(Alignments*,
+               const std::string&,
+               AlignmentErrorsExtended*,
+               const std::string&,
+               const AlignTransform*,
+               cond::Time_t) const;
 
   /// Writes SurfaceDeformations (bows & kinks) to DB for given record name
   /// Takes over ownership of AlignmentSurfaceDeformations.
-  void writeDB(AlignmentSurfaceDeformations*,
-               const std::string&, cond::Time_t) const;
+  void writeDB(AlignmentSurfaceDeformations*, const std::string&, cond::Time_t) const;
 
-  template<typename T>
+  template <typename T>
   bool hasParameter(const edm::ParameterSet&, const std::string& name);
 
-
-
   //========================== PRIVATE DATA ====================================
   //============================================================================
 
@@ -237,7 +229,6 @@ class AlignmentProducerBase
   int nevent_{0};
   bool runAtPCL_{false};
 
-
   /*** Parameters from config-file ***/
 
   edm::ParameterSet config_;
@@ -250,7 +241,6 @@ class AlignmentProducerBase
   const bool useSurvey_;
   const bool enableAlignableUpdates_;
 
-
   /*** ESWatcher ***/
 
   edm::ESWatcher<IdealGeometryRecord> watchIdealGeometryRcd_;
@@ -261,7 +251,7 @@ class AlignmentProducerBase
   edm::ESWatcher<TrackerSurfaceDeformationRcd> watchTrackerSurDeRcd_;
 
   edm::ESWatcher<DTAlignmentRcd> watchDTAlRcd_;
-  edm::ESWatcher<DTAlignmentErrorExtendedRcd>  watchDTAlErrExtRcd_;
+  edm::ESWatcher<DTAlignmentErrorExtendedRcd> watchDTAlErrExtRcd_;
   edm::ESWatcher<CSCAlignmentRcd> watchCSCAlRcd_;
   edm::ESWatcher<CSCAlignmentErrorExtendedRcd> watchCSCAlErrExtRcd_;
 
@@ -272,49 +262,39 @@ class AlignmentProducerBase
   edm::ESWatcher<CSCSurveyRcd> watchCSCSurveyRcd_;
   edm::ESWatcher<CSCSurveyErrorExtendedRcd> watchCSCSurveyErrExtRcd_;
 
-
   /*** Survey stuff ***/
 
   size_t surveyIndex_{0};
   const Alignments* surveyValues_{nullptr};
   const SurveyErrors* surveyErrors_{nullptr};
 
-
   /*** Status flags ***/
   bool isAlgoInitialized_{false};
-  bool isDuringLoop_{false};    // -> needed to ensure correct behaviour in
-                                //    both, EDLooper and standard framework
-                                //    modules
+  bool isDuringLoop_{false};  // -> needed to ensure correct behaviour in
+                              //    both, EDLooper and standard framework
+                              //    modules
   cond::Time_t firstRun_{cond::timeTypeSpecs[cond::runnumber].endValue};
-
 };
 
-
-
-template<class G, class Rcd, class ErrRcd>
-void
-AlignmentProducerBase::applyDB(G* geometry, const edm::EventSetup& iSetup,
-                               const AlignTransform& globalCoordinates) const
-{
+template <class G, class Rcd, class ErrRcd>
+void AlignmentProducerBase::applyDB(G* geometry,
+                                    const edm::EventSetup& iSetup,
+                                    const AlignTransform& globalCoordinates) const {
   // 'G' is the geometry class for that DB should be applied,
   // 'Rcd' is the record class for its Alignments
   // 'ErrRcd' is the record class for its AlignmentErrorsExtended
   // 'globalCoordinates' are global transformation for this geometry
 
-  const Rcd & record = iSetup.get<Rcd>();
+  const Rcd& record = iSetup.get<Rcd>();
   if (checkDbAlignmentValidity_) {
-    const edm::ValidityInterval & validity = record.validityInterval();
+    const edm::ValidityInterval& validity = record.validityInterval();
     const edm::IOVSyncValue first = validity.first();
     const edm::IOVSyncValue last = validity.last();
-    if (first!=edm::IOVSyncValue::beginOfTime() ||
-        last!=edm::IOVSyncValue::endOfTime()) {
+    if (first != edm::IOVSyncValue::beginOfTime() || last != edm::IOVSyncValue::endOfTime()) {
       throw cms::Exception("DatabaseError")
-        << "@SUB=AlignmentProducerBase::applyDB"
-        << "\nTrying to apply "
-        << record.key().name()
-        << " with multiple IOVs in tag.\n"
-        << "Validity range is "
-        << first.eventID().run() << " - " << last.eventID().run();
+          << "@SUB=AlignmentProducerBase::applyDB"
+          << "\nTrying to apply " << record.key().name() << " with multiple IOVs in tag.\n"
+          << "Validity range is " << first.eventID().run() << " - " << last.eventID().run();
     }
   }
 
@@ -325,32 +305,24 @@ AlignmentProducerBase::applyDB(G* geometry, const edm::EventSetup& iSetup,
   iSetup.get<ErrRcd>().get(alignmentErrors);
 
   GeometryAligner aligner;
-  aligner.applyAlignments<G>(geometry, &(*alignments), &(*alignmentErrors),
-                             globalCoordinates);
+  aligner.applyAlignments<G>(geometry, &(*alignments), &(*alignmentErrors), globalCoordinates);
 }
 
-
-template<class G, class DeformationRcd>
-void
-AlignmentProducerBase::applyDB(G* geometry, const edm::EventSetup& iSetup) const
-{
+template <class G, class DeformationRcd>
+void AlignmentProducerBase::applyDB(G* geometry, const edm::EventSetup& iSetup) const {
   // 'G' is the geometry class for that DB should be applied,
   // 'DeformationRcd' is the record class for its surface deformations
 
-  const DeformationRcd & record = iSetup.get<DeformationRcd>();
+  const DeformationRcd& record = iSetup.get<DeformationRcd>();
   if (checkDbAlignmentValidity_) {
-    const edm::ValidityInterval & validity = record.validityInterval();
+    const edm::ValidityInterval& validity = record.validityInterval();
     const edm::IOVSyncValue first = validity.first();
     const edm::IOVSyncValue last = validity.last();
-    if (first!=edm::IOVSyncValue::beginOfTime() ||
-        last!=edm::IOVSyncValue::endOfTime()) {
+    if (first != edm::IOVSyncValue::beginOfTime() || last != edm::IOVSyncValue::endOfTime()) {
       throw cms::Exception("DatabaseError")
-        << "@SUB=AlignmentProducerBase::applyDB"
-        << "\nTrying to apply "
-        << record.key().name()
-        << " with multiple IOVs in tag.\n"
-        << "Validity range is "
-        << first.eventID().run() << " - " << last.eventID().run();
+          << "@SUB=AlignmentProducerBase::applyDB"
+          << "\nTrying to apply " << record.key().name() << " with multiple IOVs in tag.\n"
+          << "Validity range is " << first.eventID().run() << " - " << last.eventID().run();
     }
   }
   edm::ESHandle<AlignmentSurfaceDeformations> surfaceDeformations;
@@ -360,5 +332,4 @@ AlignmentProducerBase::applyDB(G* geometry, const edm::EventSetup& iSetup) const
   aligner.attachSurfaceDeformations<G>(geometry, &(*surfaceDeformations));
 }
 
-
 #endif /* Alignment_CommonAlignmentProducer_AlignmentProducerBase_h */
diff --git a/Alignment/CommonAlignmentProducer/interface/AlignmentSeedSelector.h b/Alignment/CommonAlignmentProducer/interface/AlignmentSeedSelector.h
index cb2bba5ac5779..0fd51f7f623d9 100644
--- a/Alignment/CommonAlignmentProducer/interface/AlignmentSeedSelector.h
+++ b/Alignment/CommonAlignmentProducer/interface/AlignmentSeedSelector.h
@@ -5,17 +5,16 @@
 #include "DataFormats/TrajectorySeed/interface/TrajectorySeed.h"
 #include <vector>
 
-namespace edm { class Event; }
+namespace edm {
+  class Event;
+}
 
-class AlignmentSeedSelector
-{
-
- public:
-
-  typedef std::vector<const TrajectorySeed*> Seeds; 
+class AlignmentSeedSelector {
+public:
+  typedef std::vector<const TrajectorySeed*> Seeds;
 
   /// constructor
-  AlignmentSeedSelector(const edm::ParameterSet & cfg);
+  AlignmentSeedSelector(const edm::ParameterSet& cfg);
 
   /// destructor
   ~AlignmentSeedSelector();
@@ -23,13 +22,10 @@ class AlignmentSeedSelector
   /// select tracks
   Seeds select(const Seeds& seeds, const edm::Event& evt) const;
 
- private:
- 
+private:
   /// private data members
   bool applySeedNumber;
-  int minNSeeds,maxNSeeds;
-
+  int minNSeeds, maxNSeeds;
 };
 
 #endif
-
diff --git a/Alignment/CommonAlignmentProducer/interface/AlignmentTrackSelector.h b/Alignment/CommonAlignmentProducer/interface/AlignmentTrackSelector.h
index 043d8d426c498..1b215eb534cdd 100644
--- a/Alignment/CommonAlignmentProducer/interface/AlignmentTrackSelector.h
+++ b/Alignment/CommonAlignmentProducer/interface/AlignmentTrackSelector.h
@@ -14,21 +14,18 @@ namespace edm {
   class Event;
   class EventSetup;
   class ParameterSet;
-}
+}  // namespace edm
 
 class TrackingRecHit;
 class SiStripRecHit1D;
 class SiStripRecHit2D;
 
-class AlignmentTrackSelector
-{
-
- public:
-
-  typedef std::vector<const reco::Track*> Tracks; 
+class AlignmentTrackSelector {
+public:
+  typedef std::vector<const reco::Track*> Tracks;
 
   /// constructor
-  AlignmentTrackSelector(const edm::ParameterSet & cfg, edm::ConsumesCollector& iC);
+  AlignmentTrackSelector(const edm::ParameterSet& cfg, edm::ConsumesCollector& iC);
 
   /// destructor
   ~AlignmentTrackSelector();
@@ -38,18 +35,16 @@ class AlignmentTrackSelector
   ///returns if any of the Filters is used.
   bool useThisFilter();
 
-
- private:
-
+private:
   /// apply basic cuts on pt,eta,phi,nhit
   Tracks basicCuts(const Tracks& tracks, const edm::Event& evt, const edm::EventSetup& eSetup) const;
   /// checking hit requirements beyond simple number of valid hits
   bool detailedHitsCheck(const reco::Track* track, const edm::Event& evt, const edm::EventSetup& eSetup) const;
-  bool isHit2D(const TrackingRecHit &hit) const;
-  /// if valid, check for minimum charge (currently only in strip), if invalid give true 
+  bool isHit2D(const TrackingRecHit& hit) const;
+  /// if valid, check for minimum charge (currently only in strip), if invalid give true
   bool isOkCharge(const TrackingRecHit* therechit) const;
-  bool isOkChargeStripHit(const SiStripRecHit1D &siStripRecHit1D) const;
-  bool isOkChargeStripHit(const SiStripRecHit2D &siStripRecHit2D) const;
+  bool isOkChargeStripHit(const SiStripRecHit1D& siStripRecHit1D) const;
+  bool isOkChargeStripHit(const SiStripRecHit2D& siStripRecHit2D) const;
   bool isIsolated(const TrackingRecHit* therechit, const edm::Event& evt) const;
   bool isOkTrkQuality(const reco::Track* track) const;
 
@@ -61,9 +56,7 @@ class AlignmentTrackSelector
 
   /// compare two tracks in pt (used by theNHighestPtTracks)
   struct ComparePt {
-    bool operator()( const reco::Track* t1, const reco::Track* t2 ) const {
-      return t1->pt()> t2->pt();
-    }
+    bool operator()(const reco::Track* t1, const reco::Track* t2) const { return t1->pt() > t2->pt(); }
   };
   ComparePt ptComparator;
 
@@ -71,14 +64,14 @@ class AlignmentTrackSelector
   const int seedOnlyFromAbove_;
   const bool applyIsolation_, chargeCheck_;
   const int nHighestPt_, minMultiplicity_, maxMultiplicity_;
-  const bool multiplicityOnInput_; /// if true, cut min/maxMultiplicity on input instead of on final result
-  const double ptMin_,ptMax_,pMin_,pMax_,etaMin_,etaMax_,phiMin_,phiMax_;
-  const double nHitMin_,nHitMax_,chi2nMax_, d0Min_,d0Max_,dzMin_,dzMax_;
+  const bool multiplicityOnInput_;  /// if true, cut min/maxMultiplicity on input instead of on final result
+  const double ptMin_, ptMax_, pMin_, pMax_, etaMin_, etaMax_, phiMin_, phiMax_;
+  const double nHitMin_, nHitMax_, chi2nMax_, d0Min_, d0Max_, dzMin_, dzMax_;
   const int theCharge_;
   const double minHitChargeStrip_, minHitIsolation_;
   edm::EDGetTokenT<SiStripRecHit2DCollection> rphirecHitsToken_;
   edm::EDGetTokenT<SiStripMatchedRecHit2DCollection> matchedrecHitsToken_;
-  const bool countStereoHitAs2D_; // count hits on stereo components of GluedDet for nHitMin2D_?
+  const bool countStereoHitAs2D_;  // count hits on stereo components of GluedDet for nHitMin2D_?
   const unsigned int nHitMin2D_;
   const int minHitsinTIB_, minHitsinTOB_, minHitsinTID_, minHitsinTEC_;
   const int minHitsinBPIX_, minHitsinFPIX_, minHitsinPIX_;
@@ -92,7 +85,7 @@ class AlignmentTrackSelector
   std::vector<double> RorZofLastHitMin_;
   std::vector<double> RorZofLastHitMax_;
 
-  const edm::InputTag clusterValueMapTag_;  // ValueMap containing association cluster - flag
+  const edm::InputTag clusterValueMapTag_;                     // ValueMap containing association cluster - flag
   edm::EDGetTokenT<AliClusterValueMap> clusterValueMapToken_;  // ValueMap containing association cluster - flag
   const int minPrescaledHits_;
   const bool applyPrescaledHitsFilter_;
@@ -105,4 +98,3 @@ class AlignmentTrackSelector
 };
 
 #endif
-
diff --git a/Alignment/CommonAlignmentProducer/interface/AlignmentTwoBodyDecayTrackSelector.h b/Alignment/CommonAlignmentProducer/interface/AlignmentTwoBodyDecayTrackSelector.h
index 990b626d66730..5473fe4db9c12 100644
--- a/Alignment/CommonAlignmentProducer/interface/AlignmentTwoBodyDecayTrackSelector.h
+++ b/Alignment/CommonAlignmentProducer/interface/AlignmentTwoBodyDecayTrackSelector.h
@@ -12,16 +12,17 @@
 #include <DataFormats/TrackReco/interface/TrackFwd.h>
 #include <DataFormats/METReco/interface/CaloMETFwd.h>
 
-namespace edm { class Event; class EventSetup; }
+namespace edm {
+  class Event;
+  class EventSetup;
+}  // namespace edm
 
-class AlignmentTwoBodyDecayTrackSelector
-{
- public:
-
-  typedef std::vector<const reco::Track*> Tracks; 
+class AlignmentTwoBodyDecayTrackSelector {
+public:
+  typedef std::vector<const reco::Track*> Tracks;
 
   /// constructor
-  AlignmentTwoBodyDecayTrackSelector(const edm::ParameterSet & cfg, edm::ConsumesCollector& iC);
+  AlignmentTwoBodyDecayTrackSelector(const edm::ParameterSet& cfg, edm::ConsumesCollector& iC);
 
   /// destructor
   ~AlignmentTwoBodyDecayTrackSelector();
@@ -30,17 +31,18 @@ class AlignmentTwoBodyDecayTrackSelector
   Tracks select(const Tracks& tracks, const edm::Event& iEvent, const edm::EventSetup& iSetup);
 
   bool useThisFilter();
- private:
+
+private:
   ///checks if the mass of the mother is in the mass region
-  Tracks checkMass(const Tracks& cands)const;
+  Tracks checkMass(const Tracks& cands) const;
   ///checks if the mass of the mother is in the mass region adding missing E_T
-  Tracks checkMETMass(const Tracks& cands,const edm::Event& iEvent)const;
+  Tracks checkMETMass(const Tracks& cands, const edm::Event& iEvent) const;
   ///checks if the mother has charge = [theCharge]
-  bool checkCharge(const reco::Track* trk1,const reco::Track* trk2 = nullptr)const;
+  bool checkCharge(const reco::Track* trk1, const reco::Track* trk2 = nullptr) const;
   ///checks if the [cands] are acoplanar (returns empty set if not)
-  bool checkAcoplanarity(const reco::Track* trk1,const reco::Track* trk2)const;
+  bool checkAcoplanarity(const reco::Track* trk1, const reco::Track* trk2) const;
   ///checks if [cands] contains a acoplanar track w.r.t missing ET (returns empty set if not)
-  bool checkMETAcoplanarity(const reco::Track* trk,const reco::CaloMET* met)const; 
+  bool checkMETAcoplanarity(const reco::Track* trk, const reco::CaloMET* met) const;
 
   /// private data members
 
@@ -55,8 +57,8 @@ class AlignmentTwoBodyDecayTrackSelector
   double theDaughterMass;
   unsigned int theCandNumber;
   bool secThrBool;
-  double thesecThr ;
-   //charge filter
+  double thesecThr;
+  //charge filter
   int theCharge;
   bool theUnsignedSwitch;
   //missing ET Filter
@@ -69,4 +71,3 @@ class AlignmentTwoBodyDecayTrackSelector
 };
 
 #endif
-
diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentCSCBeamHaloSelectorModule.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentCSCBeamHaloSelectorModule.cc
index 663d12998accf..e0d6620a1fa45 100644
--- a/Alignment/CommonAlignmentProducer/plugins/AlignmentCSCBeamHaloSelectorModule.cc
+++ b/Alignment/CommonAlignmentProducer/plugins/AlignmentCSCBeamHaloSelectorModule.cc
@@ -11,37 +11,32 @@
 #include "CommonTools/RecoAlgos/interface/TrackSelector.h"
 
 struct CSCBeamHaloConfigSelector {
-
-  typedef std::vector<const reco::Track*> container;
+  typedef std::vector<const reco::Track *> container;
   typedef container::const_iterator const_iterator;
   typedef reco::TrackCollection collection;
 
-  CSCBeamHaloConfigSelector( const edm::ParameterSet & cfg, edm::ConsumesCollector && iC ) :
-    CSCBeamHaloConfigSelector(cfg, iC) {}
-  CSCBeamHaloConfigSelector( const edm::ParameterSet & cfg, edm::ConsumesCollector & iC ) :
-    theSelector(cfg, iC) {}
+  CSCBeamHaloConfigSelector(const edm::ParameterSet &cfg, edm::ConsumesCollector &&iC)
+      : CSCBeamHaloConfigSelector(cfg, iC) {}
+  CSCBeamHaloConfigSelector(const edm::ParameterSet &cfg, edm::ConsumesCollector &iC) : theSelector(cfg, iC) {}
 
   const_iterator begin() const { return selected_.begin(); }
   const_iterator end() const { return selected_.end(); }
   size_t size() const { return selected_.size(); }
 
-  void select( const edm::Handle<reco::TrackCollection> & c,  const edm::Event & evt,
-               const edm::EventSetup &/*dummy*/)
-  {
+  void select(const edm::Handle<reco::TrackCollection> &c, const edm::Event &evt, const edm::EventSetup & /*dummy*/) {
     all_.clear();
     selected_.clear();
-    for (collection::const_iterator i = c.product()->begin(), iE = c.product()->end();
-         i != iE; ++i){
-      all_.push_back(& * i );
+    for (collection::const_iterator i = c.product()->begin(), iE = c.product()->end(); i != iE; ++i) {
+      all_.push_back(&*i);
     }
-    selected_ = theSelector.select(all_, evt); // might add dummy...
+    selected_ = theSelector.select(all_, evt);  // might add dummy...
   }
 
 private:
-  container all_,selected_;
+  container all_, selected_;
   AlignmentCSCBeamHaloSelector theSelector;
 };
 
-typedef ObjectSelectorStream<CSCBeamHaloConfigSelector>  AlignmentCSCBeamHaloSelectorModule;
+typedef ObjectSelectorStream<CSCBeamHaloConfigSelector> AlignmentCSCBeamHaloSelectorModule;
 
-DEFINE_FWK_MODULE( AlignmentCSCBeamHaloSelectorModule );
+DEFINE_FWK_MODULE(AlignmentCSCBeamHaloSelectorModule);
diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentCSCOverlapSelectorModule.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentCSCOverlapSelectorModule.cc
index d106b9a32a471..f58f48af954e7 100644
--- a/Alignment/CommonAlignmentProducer/plugins/AlignmentCSCOverlapSelectorModule.cc
+++ b/Alignment/CommonAlignmentProducer/plugins/AlignmentCSCOverlapSelectorModule.cc
@@ -11,35 +11,30 @@
 #include "CommonTools/RecoAlgos/interface/TrackSelector.h"
 
 struct CSCOverlapConfigSelector {
-
-  typedef std::vector<const reco::Track*> container;
+  typedef std::vector<const reco::Track *> container;
   typedef container::const_iterator const_iterator;
   typedef reco::TrackCollection collection;
 
-  CSCOverlapConfigSelector( const edm::ParameterSet & cfg, edm::ConsumesCollector && iC ) :
-    theSelector(cfg) {}
+  CSCOverlapConfigSelector(const edm::ParameterSet &cfg, edm::ConsumesCollector &&iC) : theSelector(cfg) {}
 
   const_iterator begin() const { return selected_.begin(); }
   const_iterator end() const { return selected_.end(); }
   size_t size() const { return selected_.size(); }
 
-  void select( const edm::Handle<reco::TrackCollection> & c,  const edm::Event & evt,
-               const edm::EventSetup &/*dummy*/)
-  {
+  void select(const edm::Handle<reco::TrackCollection> &c, const edm::Event &evt, const edm::EventSetup & /*dummy*/) {
     all_.clear();
     selected_.clear();
-    for (collection::const_iterator i = c.product()->begin(), iE = c.product()->end();
-         i != iE; ++i){
-      all_.push_back(& * i );
+    for (collection::const_iterator i = c.product()->begin(), iE = c.product()->end(); i != iE; ++i) {
+      all_.push_back(&*i);
     }
-    selected_ = theSelector.select(all_, evt); // might add dummy...
+    selected_ = theSelector.select(all_, evt);  // might add dummy...
   }
 
 private:
-  container all_,selected_;
+  container all_, selected_;
   AlignmentCSCOverlapSelector theSelector;
 };
 
-typedef ObjectSelectorStream<CSCOverlapConfigSelector>  AlignmentCSCOverlapSelectorModule;
+typedef ObjectSelectorStream<CSCOverlapConfigSelector> AlignmentCSCOverlapSelectorModule;
 
-DEFINE_FWK_MODULE( AlignmentCSCOverlapSelectorModule );
+DEFINE_FWK_MODULE(AlignmentCSCOverlapSelectorModule);
diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentCSCTrackSelectorModule.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentCSCTrackSelectorModule.cc
index 8cc3555a59e7d..d03ae59a79453 100644
--- a/Alignment/CommonAlignmentProducer/plugins/AlignmentCSCTrackSelectorModule.cc
+++ b/Alignment/CommonAlignmentProducer/plugins/AlignmentCSCTrackSelectorModule.cc
@@ -15,32 +15,30 @@
 #include "CommonTools/RecoAlgos/interface/TrackSelector.h"
 
 struct CSCTrackConfigSelector {
+  typedef std::vector<const reco::Track *> container;
+  typedef container::const_iterator const_iterator;
+  typedef reco::TrackCollection collection;
 
-      typedef std::vector<const reco::Track*> container;
-      typedef container::const_iterator const_iterator;
-      typedef reco::TrackCollection collection;
+  CSCTrackConfigSelector(const edm::ParameterSet &cfg, edm::ConsumesCollector &&iC) : theBaseSelector(cfg) {}
 
-      CSCTrackConfigSelector( const edm::ParameterSet & cfg, edm::ConsumesCollector && iC ) : theBaseSelector(cfg) {}
+  const_iterator begin() const { return theSelectedTracks.begin(); }
+  const_iterator end() const { return theSelectedTracks.end(); }
+  size_t size() const { return theSelectedTracks.size(); }
 
-      const_iterator begin() const { return theSelectedTracks.begin(); }
-      const_iterator end() const { return theSelectedTracks.end(); }
-      size_t size() const { return theSelectedTracks.size(); }
+  void select(const edm::Handle<reco::TrackCollection> &c, const edm::Event &evt, const edm::EventSetup & /*dummy*/) {
+    container all;
+    for (reco::TrackCollection::const_iterator i = c.product()->begin(); i != c.product()->end(); ++i) {
+      all.push_back(&*i);
+    }
+    theSelectedTracks = theBaseSelector.select(all, evt);  // might add dummy
+  }
 
-      void select( const edm::Handle<reco::TrackCollection> & c,  const edm::Event & evt, const edm::EventSetup &/*dummy*/)
-      {
-	 container all;
-	 for( reco::TrackCollection::const_iterator i=c.product()->begin();i!=c.product()->end();++i){
-	    all.push_back(& * i );
-	 }
-	 theSelectedTracks = theBaseSelector.select(all, evt); // might add dummy
-      }
+private:
+  container theSelectedTracks;
 
-   private:
-      container theSelectedTracks;
-
-      AlignmentCSCTrackSelector theBaseSelector;
+  AlignmentCSCTrackSelector theBaseSelector;
 };
 
-typedef ObjectSelectorStream<CSCTrackConfigSelector>  AlignmentCSCTrackSelectorModule;
+typedef ObjectSelectorStream<CSCTrackConfigSelector> AlignmentCSCTrackSelectorModule;
 
-DEFINE_FWK_MODULE( AlignmentCSCTrackSelectorModule );
+DEFINE_FWK_MODULE(AlignmentCSCTrackSelectorModule);
diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentMuonHIPTrajectorySelector.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentMuonHIPTrajectorySelector.cc
index 43b783e8e2383..417ed047241a4 100644
--- a/Alignment/CommonAlignmentProducer/plugins/AlignmentMuonHIPTrajectorySelector.cc
+++ b/Alignment/CommonAlignmentProducer/plugins/AlignmentMuonHIPTrajectorySelector.cc
@@ -2,7 +2,7 @@
 //
 // Package:    AlignmentMuonHIPTrajectorySelector
 // Class:      AlignmentMuonHIPTrajectorySelector
-// 
+//
 /**\class AlignmentMuonHIPTrajectorySelector AlignmentMuonHIPTrajectorySelector.cc Alignment/CommonAlignmentProducer/plugins/AlignmentMuonHIPTrajectorySelector.cc
 
  Description: <one line class summary>
@@ -17,7 +17,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <map>
@@ -53,30 +52,29 @@
 //
 
 class AlignmentMuonHIPTrajectorySelector : public edm::EDProducer {
-   public:
-      explicit AlignmentMuonHIPTrajectorySelector(const edm::ParameterSet&);
-      ~AlignmentMuonHIPTrajectorySelector() override;
-
-   private:
-      void produce(edm::Event&, const edm::EventSetup&) override;
-      
-      // ---------- member data --------------------------------
-      edm::InputTag m_input;
-      double m_minPt;
-      double m_maxTrackerForwardRedChi2;
-      int m_minTrackerDOF;
-      double m_maxMuonResidual;
-
-      bool m_hists;
-      TH1F *m_pt, *m_tracker_forwardredchi2, *m_tracker_dof;
-      TH1F *m_resid_before, *m_resid_after;
+public:
+  explicit AlignmentMuonHIPTrajectorySelector(const edm::ParameterSet&);
+  ~AlignmentMuonHIPTrajectorySelector() override;
+
+private:
+  void produce(edm::Event&, const edm::EventSetup&) override;
+
+  // ---------- member data --------------------------------
+  edm::InputTag m_input;
+  double m_minPt;
+  double m_maxTrackerForwardRedChi2;
+  int m_minTrackerDOF;
+  double m_maxMuonResidual;
+
+  bool m_hists;
+  TH1F *m_pt, *m_tracker_forwardredchi2, *m_tracker_dof;
+  TH1F *m_resid_before, *m_resid_after;
 };
 
 //
 // constants, enums and typedefs
 //
 
-
 //
 // static data member definitions
 //
@@ -85,125 +83,133 @@ class AlignmentMuonHIPTrajectorySelector : public edm::EDProducer {
 // constructors and destructor
 //
 AlignmentMuonHIPTrajectorySelector::AlignmentMuonHIPTrajectorySelector(const edm::ParameterSet& iConfig)
-   : m_input(iConfig.getParameter<edm::InputTag>("input"))
-   , m_minPt(iConfig.getParameter<double>("minPt"))
-   , m_maxTrackerForwardRedChi2(iConfig.getParameter<double>("maxTrackerForwardRedChi2"))
-   , m_minTrackerDOF(iConfig.getParameter<int>("minTrackerDOF"))
-   , m_maxMuonResidual(iConfig.getParameter<double>("maxMuonResidual"))
-   , m_hists(iConfig.getParameter<bool>("hists"))
-   , m_pt(nullptr), m_tracker_forwardredchi2(nullptr), m_tracker_dof(nullptr)
-{
-   produces<TrajTrackAssociationCollection>();
-
-   if (m_hists) {
-      edm::Service<TFileService> fs;
-      m_pt = fs->make<TH1F>("pt", "Transverse momentum (GeV)", 100, 0., 100.);
-      m_tracker_forwardredchi2 = fs->make<TH1F>("trackerForwardRedChi2", "forward-biased reduced chi2 in tracker", 100, 0., 5.);
-      m_tracker_dof = fs->make<TH1F>("trackerDOF", "DOF in tracker", 61, -0.5, 60.5);
-      m_resid_before = fs->make<TH1F>("residBefore", "muon residuals before cut (cm)", 100, -20, 20);
-      m_resid_after = fs->make<TH1F>("residAfter", "muon residuals after cut (cm)", 100, -20, 20);
-   }
+    : m_input(iConfig.getParameter<edm::InputTag>("input")),
+      m_minPt(iConfig.getParameter<double>("minPt")),
+      m_maxTrackerForwardRedChi2(iConfig.getParameter<double>("maxTrackerForwardRedChi2")),
+      m_minTrackerDOF(iConfig.getParameter<int>("minTrackerDOF")),
+      m_maxMuonResidual(iConfig.getParameter<double>("maxMuonResidual")),
+      m_hists(iConfig.getParameter<bool>("hists")),
+      m_pt(nullptr),
+      m_tracker_forwardredchi2(nullptr),
+      m_tracker_dof(nullptr) {
+  produces<TrajTrackAssociationCollection>();
+
+  if (m_hists) {
+    edm::Service<TFileService> fs;
+    m_pt = fs->make<TH1F>("pt", "Transverse momentum (GeV)", 100, 0., 100.);
+    m_tracker_forwardredchi2 =
+        fs->make<TH1F>("trackerForwardRedChi2", "forward-biased reduced chi2 in tracker", 100, 0., 5.);
+    m_tracker_dof = fs->make<TH1F>("trackerDOF", "DOF in tracker", 61, -0.5, 60.5);
+    m_resid_before = fs->make<TH1F>("residBefore", "muon residuals before cut (cm)", 100, -20, 20);
+    m_resid_after = fs->make<TH1F>("residAfter", "muon residuals after cut (cm)", 100, -20, 20);
+  }
 }
 
-
 AlignmentMuonHIPTrajectorySelector::~AlignmentMuonHIPTrajectorySelector() {}
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-AlignmentMuonHIPTrajectorySelector::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   // input
-   edm::Handle<TrajTrackAssociationCollection> originalTrajTrackMap;
-   iEvent.getByLabel(m_input, originalTrajTrackMap);
-
-   // output
-   auto newTrajTrackMap = std::make_unique<TrajTrackAssociationCollection>();
-
-   TrajectoryStateCombiner tsoscomb;
-
-   for (TrajTrackAssociationCollection::const_iterator iPair = originalTrajTrackMap->begin();  iPair != originalTrajTrackMap->end();  ++iPair) {
-      if (m_hists) {
-	 m_pt->Fill((*(*iPair).val).pt());
+void AlignmentMuonHIPTrajectorySelector::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
+  // input
+  edm::Handle<TrajTrackAssociationCollection> originalTrajTrackMap;
+  iEvent.getByLabel(m_input, originalTrajTrackMap);
+
+  // output
+  auto newTrajTrackMap = std::make_unique<TrajTrackAssociationCollection>();
+
+  TrajectoryStateCombiner tsoscomb;
+
+  for (TrajTrackAssociationCollection::const_iterator iPair = originalTrajTrackMap->begin();
+       iPair != originalTrajTrackMap->end();
+       ++iPair) {
+    if (m_hists) {
+      m_pt->Fill((*(*iPair).val).pt());
+    }
+
+    if ((*(*iPair).val).pt() > m_minPt) {
+      std::vector<TrajectoryMeasurement> measurements = (*(*iPair).key).measurements();
+
+      bool has_bad_residual = false;
+
+      double tracker_forwardchi2 = 0.;
+      double tracker_dof = 0.;
+      for (std::vector<TrajectoryMeasurement>::const_iterator im = measurements.begin(); im != measurements.end();
+           ++im) {
+        const TrajectoryMeasurement meas = *im;
+        auto hit = &(*meas.recHit());
+        const DetId id = hit->geographicalId();
+
+        if (hit->isValid() && id.det() == DetId::Tracker) {
+          if (hit->dimension() == 1) {
+            double residual = meas.forwardPredictedState().localPosition().x() - hit->localPosition().x();
+            double error2 =
+                meas.forwardPredictedState().localError().positionError().xx() + hit->localPositionError().xx();
+
+            tracker_forwardchi2 += residual * residual / error2;
+            tracker_dof += 1.;
+          } else if (hit->dimension() == 2) {
+            double residualx = meas.forwardPredictedState().localPosition().x() - hit->localPosition().x();
+            double residualy = meas.forwardPredictedState().localPosition().y() - hit->localPosition().y();
+            double errorxx2 =
+                meas.forwardPredictedState().localError().positionError().xx() + hit->localPositionError().xx();
+            double errorxy2 =
+                meas.forwardPredictedState().localError().positionError().xy() + hit->localPositionError().xy();
+            double erroryy2 =
+                meas.forwardPredictedState().localError().positionError().yy() + hit->localPositionError().yy();
+
+            tracker_forwardchi2 +=
+                (residualx * residualx + residualy * residualy) / (errorxx2 + 2. * errorxy2 + erroryy2);
+            tracker_dof += 2.;
+          }
+        }  // end if a tracker hit
+
+        if (hit->isValid() && id.det() == DetId::Muon &&
+            (id.subdetId() == MuonSubdetId::DT || id.subdetId() == MuonSubdetId::CSC)) {
+          TrajectoryStateOnSurface tsosc =
+              tsoscomb.combine(meas.forwardPredictedState(), meas.backwardPredictedState());
+          double residual = tsosc.localPosition().x() - hit->localPosition().x();
+          m_resid_before->Fill(residual);
+          if (fabs(residual) > m_maxMuonResidual) {
+            has_bad_residual = true;
+          }
+        }  // end if a muon hit
       }
+      tracker_dof -= 5.;
+      double tracker_forwardredchi2 = tracker_forwardchi2 / tracker_dof;
 
-      if ((*(*iPair).val).pt() > m_minPt) {
-
-	 std::vector<TrajectoryMeasurement> measurements = (*(*iPair).key).measurements();
-
-	 bool has_bad_residual = false;
-
-	 double tracker_forwardchi2 = 0.;
-	 double tracker_dof = 0.;
-	 for (std::vector<TrajectoryMeasurement>::const_iterator im = measurements.begin();  im != measurements.end();  ++im) {
-	    const TrajectoryMeasurement meas = *im;
-	    auto hit = &(*meas.recHit());
-	    const DetId id = hit->geographicalId();
-
-	    if (hit->isValid()  &&  id.det() == DetId::Tracker) {
-	       if (hit->dimension() == 1) {
-		  double residual = meas.forwardPredictedState().localPosition().x() - hit->localPosition().x();
-		  double error2 = meas.forwardPredictedState().localError().positionError().xx() + hit->localPositionError().xx();
-
-		  tracker_forwardchi2 += residual * residual / error2;
-		  tracker_dof += 1.;
-	       }
-	       else if (hit->dimension() == 2) {
-		  double residualx = meas.forwardPredictedState().localPosition().x() - hit->localPosition().x();
-		  double residualy = meas.forwardPredictedState().localPosition().y() - hit->localPosition().y();
-		  double errorxx2 = meas.forwardPredictedState().localError().positionError().xx() + hit->localPositionError().xx();
-		  double errorxy2 = meas.forwardPredictedState().localError().positionError().xy() + hit->localPositionError().xy();
-		  double erroryy2 = meas.forwardPredictedState().localError().positionError().yy() + hit->localPositionError().yy();
-
-		  tracker_forwardchi2 += (residualx * residualx + residualy * residualy) / (errorxx2 + 2.*errorxy2 + erroryy2);
-		  tracker_dof += 2.;
-	       }
-	    } // end if a tracker hit
-
-	    if (hit->isValid()  &&  id.det() == DetId::Muon  &&  (id.subdetId() == MuonSubdetId::DT  ||  id.subdetId() == MuonSubdetId::CSC)) {
-	       TrajectoryStateOnSurface tsosc = tsoscomb.combine(meas.forwardPredictedState(), meas.backwardPredictedState());
-	       double residual = tsosc.localPosition().x() - hit->localPosition().x();
-	       m_resid_before->Fill(residual);
-	       if (fabs(residual) > m_maxMuonResidual) {
-		  has_bad_residual = true;
-	       }
-	    } // end if a muon hit
-
-	 }
-	 tracker_dof -= 5.;
-	 double tracker_forwardredchi2 = tracker_forwardchi2 / tracker_dof;
-
-	 if (m_hists) {
-	    m_tracker_forwardredchi2->Fill(tracker_forwardredchi2);
-	    m_tracker_dof->Fill(tracker_dof);
-
-	    for (std::vector<TrajectoryMeasurement>::const_iterator im = measurements.begin();  im != measurements.end();  ++im) {
-	       const TrajectoryMeasurement meas = *im;
-	       auto hit = &(*meas.recHit());
-	       const DetId id = hit->geographicalId();
-
-	       if (!has_bad_residual) {
-		  if (hit->isValid()  &&  id.det() == DetId::Muon  &&  (id.subdetId() == MuonSubdetId::DT  ||  id.subdetId() == MuonSubdetId::CSC)) {
-		     TrajectoryStateOnSurface tsosc = tsoscomb.combine(meas.forwardPredictedState(), meas.backwardPredictedState());
-		     double residual = tsosc.localPosition().x() - hit->localPosition().x();
-		     m_resid_after->Fill(residual);
-		  }
-	       } // end if residuals pass cut
-	    } // end second loop over hits
-	 } // end if filling histograms
-
-	 if (tracker_forwardredchi2 < m_maxTrackerForwardRedChi2  &&  tracker_dof >= m_minTrackerDOF  &&  !has_bad_residual) {
-	    newTrajTrackMap->insert((*iPair).key, (*iPair).val);
-	 } // end if passes tracker cuts
-      } // end if passes pT cut
-   } // end loop over original trajTrackMap
-
-   // put it in the Event
-   iEvent.put(std::move(newTrajTrackMap));
+      if (m_hists) {
+        m_tracker_forwardredchi2->Fill(tracker_forwardredchi2);
+        m_tracker_dof->Fill(tracker_dof);
+
+        for (std::vector<TrajectoryMeasurement>::const_iterator im = measurements.begin(); im != measurements.end();
+             ++im) {
+          const TrajectoryMeasurement meas = *im;
+          auto hit = &(*meas.recHit());
+          const DetId id = hit->geographicalId();
+
+          if (!has_bad_residual) {
+            if (hit->isValid() && id.det() == DetId::Muon &&
+                (id.subdetId() == MuonSubdetId::DT || id.subdetId() == MuonSubdetId::CSC)) {
+              TrajectoryStateOnSurface tsosc =
+                  tsoscomb.combine(meas.forwardPredictedState(), meas.backwardPredictedState());
+              double residual = tsosc.localPosition().x() - hit->localPosition().x();
+              m_resid_after->Fill(residual);
+            }
+          }  // end if residuals pass cut
+        }    // end second loop over hits
+      }      // end if filling histograms
+
+      if (tracker_forwardredchi2 < m_maxTrackerForwardRedChi2 && tracker_dof >= m_minTrackerDOF && !has_bad_residual) {
+        newTrajTrackMap->insert((*iPair).key, (*iPair).val);
+      }  // end if passes tracker cuts
+    }    // end if passes pT cut
+  }      // end loop over original trajTrackMap
+
+  // put it in the Event
+  iEvent.put(std::move(newTrajTrackMap));
 }
 
 //define this as a plug-in
diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentMuonSelectorModule.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentMuonSelectorModule.cc
index 97c0cbdbe1fc6..a808e285e263a 100644
--- a/Alignment/CommonAlignmentProducer/plugins/AlignmentMuonSelectorModule.cc
+++ b/Alignment/CommonAlignmentProducer/plugins/AlignmentMuonSelectorModule.cc
@@ -24,35 +24,30 @@
 // tracks have only the recoMuons branch!
 
 struct MuonConfigSelector {
-
-  typedef std::vector<const reco::Muon*> container;
+  typedef std::vector<const reco::Muon *> container;
   typedef container::const_iterator const_iterator;
   typedef reco::MuonCollection collection;
 
-  MuonConfigSelector( const edm::ParameterSet & cfg, edm::ConsumesCollector && iC ) :
-    theSelector(cfg) {}
+  MuonConfigSelector(const edm::ParameterSet &cfg, edm::ConsumesCollector &&iC) : theSelector(cfg) {}
 
   const_iterator begin() const { return selected_.begin(); }
   const_iterator end() const { return selected_.end(); }
   size_t size() const { return selected_.size(); }
 
-  void select( const edm::Handle<reco::MuonCollection> & c,  const edm::Event & evt, const edm::EventSetup &/* dummy*/)
-  {
+  void select(const edm::Handle<reco::MuonCollection> &c, const edm::Event &evt, const edm::EventSetup & /* dummy*/) {
     all_.clear();
     selected_.clear();
-    for (collection::const_iterator i = c.product()->begin(), iE = c.product()->end();
-         i != iE; ++i){
-      all_.push_back(& * i );
+    for (collection::const_iterator i = c.product()->begin(), iE = c.product()->end(); i != iE; ++i) {
+      all_.push_back(&*i);
     }
-    selected_ = theSelector.select(all_, evt); // might add dummy
+    selected_ = theSelector.select(all_, evt);  // might add dummy
   }
 
 private:
-  container all_,selected_;
+  container all_, selected_;
   AlignmentMuonSelector theSelector;
 };
 
-typedef ObjectSelector<MuonConfigSelector>  AlignmentMuonSelectorModule;
-
-DEFINE_FWK_MODULE( AlignmentMuonSelectorModule );
+typedef ObjectSelector<MuonConfigSelector> AlignmentMuonSelectorModule;
 
+DEFINE_FWK_MODULE(AlignmentMuonSelectorModule);
diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentProducer.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentProducer.cc
index 10cbb7c777339..1000476eef3e3 100644
--- a/Alignment/CommonAlignmentProducer/plugins/AlignmentProducer.cc
+++ b/Alignment/CommonAlignmentProducer/plugins/AlignmentProducer.cc
@@ -2,7 +2,6 @@
 ///
 ///  \author    : Frederic Ronga
 
-
 #include "AlignmentProducer.h"
 
 #include "FWCore/Framework/interface/LooperFactory.h"
@@ -10,12 +9,9 @@
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 
-
 //------------------------------------------------------------------------------
-AlignmentProducer::AlignmentProducer(const edm::ParameterSet& config) :
-  AlignmentProducerBase{config},
-  maxLoops_{config.getUntrackedParameter<unsigned int>("maxLoops")}
-{
+AlignmentProducer::AlignmentProducer(const edm::ParameterSet &config)
+    : AlignmentProducerBase{config}, maxLoops_{config.getUntrackedParameter<unsigned int>("maxLoops")} {
   edm::LogInfo("Alignment") << "@SUB=AlignmentProducer::AlignmentProducer";
 
   // Tell the framework what data is being produced
@@ -28,130 +24,93 @@ AlignmentProducer::AlignmentProducer(const edm::ParameterSet& config) :
   }
 }
 
-
 //------------------------------------------------------------------------------
-std::shared_ptr<TrackerGeometry>
-AlignmentProducer::produceTracker(const TrackerDigiGeometryRecord&)
-{
+std::shared_ptr<TrackerGeometry> AlignmentProducer::produceTracker(const TrackerDigiGeometryRecord &) {
   edm::LogInfo("Alignment") << "@SUB=AlignmentProducer::produceTracker";
   return trackerGeometry_;
 }
 
-
 //------------------------------------------------------------------------------
-std::shared_ptr<DTGeometry>
-AlignmentProducer::produceDT(const MuonGeometryRecord&)
-{
+std::shared_ptr<DTGeometry> AlignmentProducer::produceDT(const MuonGeometryRecord &) {
   edm::LogInfo("Alignment") << "@SUB=AlignmentProducer::produceDT";
   return muonDTGeometry_;
 }
 
-
 //------------------------------------------------------------------------------
-std::shared_ptr<CSCGeometry>
-AlignmentProducer::produceCSC(const MuonGeometryRecord&)
-{
+std::shared_ptr<CSCGeometry> AlignmentProducer::produceCSC(const MuonGeometryRecord &) {
   edm::LogInfo("Alignment") << "@SUB=AlignmentProducer::produceCSC";
   return muonCSCGeometry_;
 }
 
-
 //------------------------------------------------------------------------------
-void AlignmentProducer::beginOfJob(const edm::EventSetup& iSetup)
-{
+void AlignmentProducer::beginOfJob(const edm::EventSetup &iSetup) {
   edm::LogInfo("Alignment") << "@SUB=AlignmentProducer::beginOfJob";
   initAlignmentAlgorithm(iSetup);
 }
 
-
 //------------------------------------------------------------------------------
-void AlignmentProducer::endOfJob()
-{
+void AlignmentProducer::endOfJob() {
   edm::LogInfo("Alignment") << "@SUB=AlignmentProducer::endOfJob";
 
   if (!finish()) {
-    edm::LogError("Alignment")
-      << "@SUB=AlignmentProducer::endOfJob"
-      << "Did not process any events in last loop, do not dare to store to DB.";
+    edm::LogError("Alignment") << "@SUB=AlignmentProducer::endOfJob"
+                               << "Did not process any events in last loop, do not dare to store to DB.";
   }
 }
 
-
 //------------------------------------------------------------------------------
-void AlignmentProducer::startingNewLoop(unsigned int iLoop)
-{
+void AlignmentProducer::startingNewLoop(unsigned int iLoop) {
   edm::LogInfo("Alignment") << "@SUB=AlignmentProducer::startingNewLoop"
                             << "Starting loop number " << iLoop;
   startProcessing();
 }
 
-
 //------------------------------------------------------------------------------
-edm::EDLooper::Status
-AlignmentProducer::endOfLoop(const edm::EventSetup& iSetup, unsigned int iLoop)
-{
-
+edm::EDLooper::Status AlignmentProducer::endOfLoop(const edm::EventSetup &iSetup, unsigned int iLoop) {
   if (0 == nEvent()) {
     // beginOfJob is usually called by the framework in the first event of the first loop
     // (a hack: beginOfJob needs the EventSetup that is not well defined without an event)
     // and the algorithms rely on the initialisations done in beginOfJob. We cannot call
     // this->beginOfJob(iSetup); here either since that will access the EventSetup to get
     // some geometry information that is not defined either without having seen an event.
-    edm::LogError("Alignment")
-      << "@SUB=AlignmentProducer::endOfLoop"
-      << "Did not process any events in loop " << iLoop
-      << ", stop processing without terminating algorithm.";
+    edm::LogError("Alignment") << "@SUB=AlignmentProducer::endOfLoop"
+                               << "Did not process any events in loop " << iLoop
+                               << ", stop processing without terminating algorithm.";
     return kStop;
   }
 
-  edm::LogInfo("Alignment")
-    << "@SUB=AlignmentProducer::endOfLoop"
-    << "Ending loop " << iLoop << ", terminating algorithm.";
+  edm::LogInfo("Alignment") << "@SUB=AlignmentProducer::endOfLoop"
+                            << "Ending loop " << iLoop << ", terminating algorithm.";
   terminateProcessing(&iSetup);
 
-  if ( iLoop == maxLoops_-1 || iLoop >= maxLoops_ ) return kStop;
-  else return kContinue;
+  if (iLoop == maxLoops_ - 1 || iLoop >= maxLoops_)
+    return kStop;
+  else
+    return kContinue;
 }
 
-
 //------------------------------------------------------------------------------
-edm::EDLooper::Status
-AlignmentProducer::duringLoop(const edm::Event& event,
-                              const edm::EventSetup& setup)
-{
-  if (processEvent(event, setup)) return kContinue;
-  else return kStop;
+edm::EDLooper::Status AlignmentProducer::duringLoop(const edm::Event &event, const edm::EventSetup &setup) {
+  if (processEvent(event, setup))
+    return kContinue;
+  else
+    return kStop;
 }
 
-
 //------------------------------------------------------------------------------
-void AlignmentProducer::beginRun(const edm::Run &run, const edm::EventSetup &setup)
-{
-  beginRunImpl(run, setup);
-}
-
+void AlignmentProducer::beginRun(const edm::Run &run, const edm::EventSetup &setup) { beginRunImpl(run, setup); }
 
 //------------------------------------------------------------------------------
-void AlignmentProducer::endRun(const edm::Run &run, const edm::EventSetup &setup)
-{
-  endRunImpl(run, setup);
-}
-
+void AlignmentProducer::endRun(const edm::Run &run, const edm::EventSetup &setup) { endRunImpl(run, setup); }
 
 //------------------------------------------------------------------------------
-void AlignmentProducer::beginLuminosityBlock(const edm::LuminosityBlock &lumiBlock,
-                                             const edm::EventSetup &setup)
-{
+void AlignmentProducer::beginLuminosityBlock(const edm::LuminosityBlock &lumiBlock, const edm::EventSetup &setup) {
   beginLuminosityBlockImpl(lumiBlock, setup);
 }
 
-
 //------------------------------------------------------------------------------
-void AlignmentProducer::endLuminosityBlock(const edm::LuminosityBlock &lumiBlock,
-                                           const edm::EventSetup &setup)
-{
+void AlignmentProducer::endLuminosityBlock(const edm::LuminosityBlock &lumiBlock, const edm::EventSetup &setup) {
   endLuminosityBlockImpl(lumiBlock, setup);
 }
 
-
 DEFINE_FWK_LOOPER(AlignmentProducer);
diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentProducer.h b/Alignment/CommonAlignmentProducer/plugins/AlignmentProducer.h
index 95e27b8b6bc13..65f1d6e7d577a 100644
--- a/Alignment/CommonAlignmentProducer/plugins/AlignmentProducer.h
+++ b/Alignment/CommonAlignmentProducer/plugins/AlignmentProducer.h
@@ -8,17 +8,12 @@
 ///
 ///  \author    : Frederic Ronga
 
-
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h"
 #include "FWCore/Framework/interface/ESProducerLooper.h"
 #include "FWCore/Framework/interface/Run.h"
 
-
-class AlignmentProducer : public AlignmentProducerBase, public edm::ESProducerLooper
-{
-
+class AlignmentProducer : public AlignmentProducerBase, public edm::ESProducerLooper {
 public:
-
   /// Constructor
   AlignmentProducer(const edm::ParameterSet&);
 
@@ -53,73 +48,48 @@ class AlignmentProducer : public AlignmentProducerBase, public edm::ESProducerLo
   void endRun(const edm::Run&, const edm::EventSetup&) override;
 
   /// Called at lumi block start, calling algorithm's beginLuminosityBlock
-  void beginLuminosityBlock(const edm::LuminosityBlock&,
-                                    const edm::EventSetup&) override;
+  void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override;
 
   /// Called at lumi block end, calling algorithm's endLuminosityBlock
-  void endLuminosityBlock(const edm::LuminosityBlock&,
-                                  const edm::EventSetup&) override;
+  void endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override;
 
   /// Called at each event
   Status duringLoop(const edm::Event&, const edm::EventSetup&) override;
 
 private:
-  bool getTrajTrackAssociationCollection(const edm::Event&,
-                                                 edm::Handle<TrajTrackAssociationCollection>&) override;
+  bool getTrajTrackAssociationCollection(const edm::Event&, edm::Handle<TrajTrackAssociationCollection>&) override;
   bool getBeamSpot(const edm::Event&, edm::Handle<reco::BeamSpot>&) override;
-  bool getTkFittedLasBeamCollection(const edm::Run&,
-                                            edm::Handle<TkFittedLasBeamCollection>&) override;
-  bool getTsosVectorCollection(const edm::Run&,
-                                       edm::Handle<TsosVectorCollection>&) override;
-  bool getAliClusterValueMap(const edm::Event&,
-                                     edm::Handle<AliClusterValueMap>&) override;
-
-  const unsigned int maxLoops_;     /// Number of loops to loop
+  bool getTkFittedLasBeamCollection(const edm::Run&, edm::Handle<TkFittedLasBeamCollection>&) override;
+  bool getTsosVectorCollection(const edm::Run&, edm::Handle<TsosVectorCollection>&) override;
+  bool getAliClusterValueMap(const edm::Event&, edm::Handle<AliClusterValueMap>&) override;
 
+  const unsigned int maxLoops_;  /// Number of loops to loop
 };
 
-
 //------------------------------------------------------------------------------
-inline
-bool
-AlignmentProducer::getTrajTrackAssociationCollection(const edm::Event& event,
-                                                     edm::Handle<TrajTrackAssociationCollection>& result) {
+inline bool AlignmentProducer::getTrajTrackAssociationCollection(const edm::Event& event,
+                                                                 edm::Handle<TrajTrackAssociationCollection>& result) {
   return event.getByLabel(tjTkAssociationMapTag_, result);
 }
 
-
 //------------------------------------------------------------------------------
-inline
-bool
-AlignmentProducer::getBeamSpot(const edm::Event& event,
-                               edm::Handle<reco::BeamSpot>& result) {
+inline bool AlignmentProducer::getBeamSpot(const edm::Event& event, edm::Handle<reco::BeamSpot>& result) {
   return event.getByLabel(beamSpotTag_, result);
 }
 
-
 //------------------------------------------------------------------------------
-inline
-bool
-AlignmentProducer::getTkFittedLasBeamCollection(const edm::Run& run,
-                                                edm::Handle<TkFittedLasBeamCollection>& result) {
+inline bool AlignmentProducer::getTkFittedLasBeamCollection(const edm::Run& run,
+                                                            edm::Handle<TkFittedLasBeamCollection>& result) {
   return run.getByLabel(tkLasBeamTag_, result);
 }
 
-
 //------------------------------------------------------------------------------
-inline
-bool
-AlignmentProducer::getTsosVectorCollection(const edm::Run& run,
-                                           edm::Handle<TsosVectorCollection>& result) {
+inline bool AlignmentProducer::getTsosVectorCollection(const edm::Run& run, edm::Handle<TsosVectorCollection>& result) {
   return run.getByLabel(tkLasBeamTag_, result);
 }
 
-
 //------------------------------------------------------------------------------
-inline
-bool
-AlignmentProducer::getAliClusterValueMap(const edm::Event& event,
-                                         edm::Handle<AliClusterValueMap>& result) {
+inline bool AlignmentProducer::getAliClusterValueMap(const edm::Event& event, edm::Handle<AliClusterValueMap>& result) {
   return event.getByLabel(clusterValueMapTag_, result);
 }
 
diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentProducerAsAnalyzer.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentProducerAsAnalyzer.cc
index b59737f9afa0c..e9b6ee10c0071 100644
--- a/Alignment/CommonAlignmentProducer/plugins/AlignmentProducerAsAnalyzer.cc
+++ b/Alignment/CommonAlignmentProducer/plugins/AlignmentProducerAsAnalyzer.cc
@@ -6,20 +6,15 @@
  * @date      2015/07/16
  */
 
-
-
 /*** Header file ***/
 #include "AlignmentProducerAsAnalyzer.h"
 
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-
-
 //------------------------------------------------------------------------------
-AlignmentProducerAsAnalyzer::AlignmentProducerAsAnalyzer(const edm::ParameterSet& config) :
-  AlignmentProducerBase{config}
-{
+AlignmentProducerAsAnalyzer::AlignmentProducerAsAnalyzer(const edm::ParameterSet& config)
+    : AlignmentProducerBase{config} {
   usesResource(TFileService::kSharedResource);
 
   tjTkAssociationMapToken_ = consumes<TrajTrackAssociationCollection>(tjTkAssociationMapTag_);
@@ -29,72 +24,45 @@ AlignmentProducerAsAnalyzer::AlignmentProducerAsAnalyzer(const edm::ParameterSet
   clusterValueMapToken_ = consumes<AliClusterValueMap>(clusterValueMapTag_);
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerAsAnalyzer::beginJob()
-{
-}
-
+void AlignmentProducerAsAnalyzer::beginJob() {}
 
 //------------------------------------------------------------------------------
-void
-AlignmentProducerAsAnalyzer::endJob()
-{
+void AlignmentProducerAsAnalyzer::endJob() {
   terminateProcessing();
   if (!finish()) {
-    edm::LogError("Alignment")
-      << "@SUB=AlignmentProducerAsAnalyzer::endJob"
-      << "Did not process any events, do not dare to store to DB.";
+    edm::LogError("Alignment") << "@SUB=AlignmentProducerAsAnalyzer::endJob"
+                               << "Did not process any events, do not dare to store to DB.";
   }
 
   // message is used by the MillePede log parser to check the end of the job
-  edm::LogInfo("Alignment")
-    << "@SUB=AlignmentProducerAsAnalyzer::endJob"
-    << "Finished alignment producer job.";
+  edm::LogInfo("Alignment") << "@SUB=AlignmentProducerAsAnalyzer::endJob"
+                            << "Finished alignment producer job.";
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerAsAnalyzer::beginRun(const edm::Run& run, const edm::EventSetup& setup)
-{
+void AlignmentProducerAsAnalyzer::beginRun(const edm::Run& run, const edm::EventSetup& setup) {
   beginRunImpl(run, setup);
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerAsAnalyzer::endRun(const edm::Run& run, const edm::EventSetup& setup)
-{
-  endRunImpl(run, setup);
-}
-
+void AlignmentProducerAsAnalyzer::endRun(const edm::Run& run, const edm::EventSetup& setup) { endRunImpl(run, setup); }
 
 //------------------------------------------------------------------------------
-void
-AlignmentProducerAsAnalyzer::beginLuminosityBlock(const edm::LuminosityBlock& lumiBlock,
-                                           const edm::EventSetup& setup)
-{
+void AlignmentProducerAsAnalyzer::beginLuminosityBlock(const edm::LuminosityBlock& lumiBlock,
+                                                       const edm::EventSetup& setup) {
   beginLuminosityBlockImpl(lumiBlock, setup);
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerAsAnalyzer::endLuminosityBlock(const edm::LuminosityBlock& lumiBlock,
-                                         const edm::EventSetup& setup)
-{
+void AlignmentProducerAsAnalyzer::endLuminosityBlock(const edm::LuminosityBlock& lumiBlock,
+                                                     const edm::EventSetup& setup) {
   endLuminosityBlockImpl(lumiBlock, setup);
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerAsAnalyzer::analyze(const edm::Event& event, const edm::EventSetup& setup)
-{
+void AlignmentProducerAsAnalyzer::analyze(const edm::Event& event, const edm::EventSetup& setup) {
   processEvent(event, setup);
 }
 
-
 DEFINE_FWK_MODULE(AlignmentProducerAsAnalyzer);
diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentProducerAsAnalyzer.h b/Alignment/CommonAlignmentProducer/plugins/AlignmentProducerAsAnalyzer.h
index 1e1b44b653ff3..31392dd2d66ba 100644
--- a/Alignment/CommonAlignmentProducer/plugins/AlignmentProducerAsAnalyzer.h
+++ b/Alignment/CommonAlignmentProducer/plugins/AlignmentProducerAsAnalyzer.h
@@ -19,21 +19,15 @@
  *
  */
 
-
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentProducerBase.h"
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Run.h"
 
-
-class AlignmentProducerAsAnalyzer :
-  public AlignmentProducerBase,
-  public edm::one::EDAnalyzer<edm::one::WatchRuns,
-                              edm::one::WatchLuminosityBlocks,
-                              edm::one::SharedResources>
-{
+class AlignmentProducerAsAnalyzer
+    : public AlignmentProducerBase,
+      public edm::one::EDAnalyzer<edm::one::WatchRuns, edm::one::WatchLuminosityBlocks, edm::one::SharedResources> {
   //========================== PUBLIC METHODS ==================================
-public: //====================================================================
-
+public:  //====================================================================
   /// Constructor
   AlignmentProducerAsAnalyzer(const edm::ParameterSet&);
 
@@ -49,74 +43,51 @@ class AlignmentProducerAsAnalyzer :
   void beginRun(const edm::Run&, const edm::EventSetup&) override;
   void endRun(const edm::Run&, const edm::EventSetup&) override;
 
-  void beginLuminosityBlock(const edm::LuminosityBlock&,
-                                    const edm::EventSetup&) override;
-  void endLuminosityBlock(const edm::LuminosityBlock&,
-                                  const edm::EventSetup&) override;
+  void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override;
+  void endLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override;
 
   void analyze(const edm::Event&, const edm::EventSetup&) override;
 
 private:
-  bool getTrajTrackAssociationCollection(const edm::Event&,
-                                                 edm::Handle<TrajTrackAssociationCollection>&) override;
+  bool getTrajTrackAssociationCollection(const edm::Event&, edm::Handle<TrajTrackAssociationCollection>&) override;
   bool getBeamSpot(const edm::Event&, edm::Handle<reco::BeamSpot>&) override;
-  bool getTkFittedLasBeamCollection(const edm::Run&,
-                                            edm::Handle<TkFittedLasBeamCollection>&) override;
-  bool getTsosVectorCollection(const edm::Run&,
-                                       edm::Handle<TsosVectorCollection>&) override;
-  bool getAliClusterValueMap(const edm::Event&,
-                                     edm::Handle<AliClusterValueMap>&) override;
+  bool getTkFittedLasBeamCollection(const edm::Run&, edm::Handle<TkFittedLasBeamCollection>&) override;
+  bool getTsosVectorCollection(const edm::Run&, edm::Handle<TsosVectorCollection>&) override;
+  bool getAliClusterValueMap(const edm::Event&, edm::Handle<AliClusterValueMap>&) override;
 
   edm::EDGetTokenT<TrajTrackAssociationCollection> tjTkAssociationMapToken_;
   edm::EDGetTokenT<reco::BeamSpot> beamSpotToken_;
   edm::EDGetTokenT<TkFittedLasBeamCollection> tkLasBeamToken_;
   edm::EDGetTokenT<TsosVectorCollection> tsosVectorToken_;
   edm::EDGetTokenT<AliClusterValueMap> clusterValueMapToken_;
-
 };
 
-
 //------------------------------------------------------------------------------
-inline
-bool
-AlignmentProducerAsAnalyzer::getTrajTrackAssociationCollection(const edm::Event& event,
-                                                               edm::Handle<TrajTrackAssociationCollection>& result) {
+inline bool AlignmentProducerAsAnalyzer::getTrajTrackAssociationCollection(
+    const edm::Event& event, edm::Handle<TrajTrackAssociationCollection>& result) {
   return event.getByToken(tjTkAssociationMapToken_, result);
 }
 
-
 //------------------------------------------------------------------------------
-inline
-bool
-AlignmentProducerAsAnalyzer::getBeamSpot(const edm::Event& event,
-                                         edm::Handle<reco::BeamSpot>& result) {
+inline bool AlignmentProducerAsAnalyzer::getBeamSpot(const edm::Event& event, edm::Handle<reco::BeamSpot>& result) {
   return event.getByToken(beamSpotToken_, result);
 }
 
-
 //------------------------------------------------------------------------------
-inline
-bool
-AlignmentProducerAsAnalyzer::getTkFittedLasBeamCollection(const edm::Run& run,
-                                                          edm::Handle<TkFittedLasBeamCollection>& result) {
+inline bool AlignmentProducerAsAnalyzer::getTkFittedLasBeamCollection(const edm::Run& run,
+                                                                      edm::Handle<TkFittedLasBeamCollection>& result) {
   return run.getByToken(tkLasBeamToken_, result);
 }
 
-
 //------------------------------------------------------------------------------
-inline
-bool
-AlignmentProducerAsAnalyzer::getTsosVectorCollection(const edm::Run& run,
-                                                     edm::Handle<TsosVectorCollection>& result) {
+inline bool AlignmentProducerAsAnalyzer::getTsosVectorCollection(const edm::Run& run,
+                                                                 edm::Handle<TsosVectorCollection>& result) {
   return run.getByToken(tsosVectorToken_, result);
 }
 
-
 //------------------------------------------------------------------------------
-inline
-bool
-AlignmentProducerAsAnalyzer::getAliClusterValueMap(const edm::Event& event,
-                                                   edm::Handle<AliClusterValueMap>& result) {
+inline bool AlignmentProducerAsAnalyzer::getAliClusterValueMap(const edm::Event& event,
+                                                               edm::Handle<AliClusterValueMap>& result) {
   return event.getByToken(clusterValueMapToken_, result);
 }
 
diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentSeedSelectorModule.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentSeedSelectorModule.cc
index 41408a0882220..08c7685129406 100644
--- a/Alignment/CommonAlignmentProducer/plugins/AlignmentSeedSelectorModule.cc
+++ b/Alignment/CommonAlignmentProducer/plugins/AlignmentSeedSelectorModule.cc
@@ -6,35 +6,30 @@
 #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
 
 struct SeedConfigSelector {
-
-  typedef std::vector<const TrajectorySeed*> container;
+  typedef std::vector<const TrajectorySeed *> container;
   typedef container::const_iterator const_iterator;
   typedef TrajectorySeedCollection collection;
 
-  SeedConfigSelector( const edm::ParameterSet & cfg, edm::ConsumesCollector && iC ) :
-    theSelector(cfg) {}
+  SeedConfigSelector(const edm::ParameterSet &cfg, edm::ConsumesCollector &&iC) : theSelector(cfg) {}
 
   const_iterator begin() const { return selected_.begin(); }
   const_iterator end() const { return selected_.end(); }
   size_t size() const { return selected_.size(); }
 
-  void select( const edm::Handle<TrajectorySeedCollection> c,  const edm::Event & evt,
-               const edm::EventSetup &/*dummy*/)
-  {
+  void select(const edm::Handle<TrajectorySeedCollection> c, const edm::Event &evt, const edm::EventSetup & /*dummy*/) {
     all_.clear();
     selected_.clear();
-    for (collection::const_iterator i = c.product()->begin(), iE = c.product()->end();
-         i != iE; ++i) {
-      all_.push_back( & * i );
+    for (collection::const_iterator i = c.product()->begin(), iE = c.product()->end(); i != iE; ++i) {
+      all_.push_back(&*i);
     }
-    selected_ = theSelector.select(all_, evt); // might add dummy...
+    selected_ = theSelector.select(all_, evt);  // might add dummy...
   }
 
 private:
-  container all_,selected_;
+  container all_, selected_;
   AlignmentSeedSelector theSelector;
 };
 
-typedef ObjectSelector<SeedConfigSelector>  AlignmentSeedSelectorModule;
+typedef ObjectSelector<SeedConfigSelector> AlignmentSeedSelectorModule;
 
-DEFINE_FWK_MODULE( AlignmentSeedSelectorModule );
+DEFINE_FWK_MODULE(AlignmentSeedSelectorModule);
diff --git a/Alignment/CommonAlignmentProducer/plugins/AlignmentTrackSelectorModule.cc b/Alignment/CommonAlignmentProducer/plugins/AlignmentTrackSelectorModule.cc
index 090b7f09eb006..8500dad60bcee 100644
--- a/Alignment/CommonAlignmentProducer/plugins/AlignmentTrackSelectorModule.cc
+++ b/Alignment/CommonAlignmentProducer/plugins/AlignmentTrackSelectorModule.cc
@@ -17,20 +17,18 @@
 #include "CommonTools/RecoAlgos/interface/TrackSelector.h"
 
 struct TrackConfigSelector {
-
   typedef std::vector<const reco::Track*> container;
   typedef container::const_iterator const_iterator;
   typedef reco::TrackCollection collection;
 
- TrackConfigSelector( const edm::ParameterSet & cfg, edm::ConsumesCollector && iC ) :
-   theBaseSelector(cfg, iC),
-   theGlobalSelector(cfg.getParameter<edm::ParameterSet>("GlobalSelector"), iC),
-   theTwoBodyDecaySelector(cfg.getParameter<edm::ParameterSet>("TwoBodyDecaySelector"), iC)
-  {
+  TrackConfigSelector(const edm::ParameterSet& cfg, edm::ConsumesCollector&& iC)
+      : theBaseSelector(cfg, iC),
+        theGlobalSelector(cfg.getParameter<edm::ParameterSet>("GlobalSelector"), iC),
+        theTwoBodyDecaySelector(cfg.getParameter<edm::ParameterSet>("TwoBodyDecaySelector"), iC) {
     //TODO Wrap the BaseSelector into its own PSet
     theBaseSwitch = theBaseSelector.useThisFilter();
 
-    theGlobalSwitch =  theGlobalSelector.useThisFilter();
+    theGlobalSwitch = theGlobalSelector.useThisFilter();
 
     theTwoBodyDecaySwitch = theTwoBodyDecaySelector.useThisFilter();
   }
@@ -39,20 +37,18 @@ struct TrackConfigSelector {
   const_iterator end() const { return theSelectedTracks.end(); }
   size_t size() const { return theSelectedTracks.size(); }
 
-  void select( const edm::Handle<reco::TrackCollection> & c,  const edm::Event & evt,
-               const edm::EventSetup& eSetup)
-  {
+  void select(const edm::Handle<reco::TrackCollection>& c, const edm::Event& evt, const edm::EventSetup& eSetup) {
     theSelectedTracks.clear();
-    for( reco::TrackCollection::const_iterator i=c.product()->begin();i!=c.product()->end();++i){
-      theSelectedTracks.push_back(& * i );
+    for (reco::TrackCollection::const_iterator i = c.product()->begin(); i != c.product()->end(); ++i) {
+      theSelectedTracks.push_back(&*i);
     }
     // might add EvetSetup to the select(...) method of the Selectors
-    if(theBaseSwitch)
-      theSelectedTracks=theBaseSelector.select(theSelectedTracks,evt,eSetup);
-    if(theGlobalSwitch)
-      theSelectedTracks=theGlobalSelector.select(theSelectedTracks,evt,eSetup);
-    if(theTwoBodyDecaySwitch)
-      theSelectedTracks=theTwoBodyDecaySelector.select(theSelectedTracks,evt,eSetup);
+    if (theBaseSwitch)
+      theSelectedTracks = theBaseSelector.select(theSelectedTracks, evt, eSetup);
+    if (theGlobalSwitch)
+      theSelectedTracks = theGlobalSelector.select(theSelectedTracks, evt, eSetup);
+    if (theTwoBodyDecaySwitch)
+      theSelectedTracks = theTwoBodyDecaySelector.select(theSelectedTracks, evt, eSetup);
   }
 
 private:
@@ -62,9 +58,8 @@ struct TrackConfigSelector {
   AlignmentTrackSelector theBaseSelector;
   AlignmentGlobalTrackSelector theGlobalSelector;
   AlignmentTwoBodyDecayTrackSelector theTwoBodyDecaySelector;
-
 };
 
-typedef ObjectSelectorStream<TrackConfigSelector>  AlignmentTrackSelectorModule;
+typedef ObjectSelectorStream<TrackConfigSelector> AlignmentTrackSelectorModule;
 
-DEFINE_FWK_MODULE( AlignmentTrackSelectorModule );
+DEFINE_FWK_MODULE(AlignmentTrackSelectorModule);
diff --git a/Alignment/CommonAlignmentProducer/plugins/FakeAlignmentProducer.cc b/Alignment/CommonAlignmentProducer/plugins/FakeAlignmentProducer.cc
index 9240daca69348..70f668fb99731 100644
--- a/Alignment/CommonAlignmentProducer/plugins/FakeAlignmentProducer.cc
+++ b/Alignment/CommonAlignmentProducer/plugins/FakeAlignmentProducer.cc
@@ -2,7 +2,7 @@
 //
 // Package:    FakeAlignmentProducer
 // Class:      FakeAlignmentProducer
-// 
+//
 /**\class FakeAlignmentProducer FakeAlignmentProducer.h Alignment/FakeAlignmentProducer/interface/FakeAlignmentProducer.h
 
 Description: Producer of fake alignment data for all geometries (currently: Tracker, DT and CSC)
@@ -19,7 +19,6 @@ reconstruction Geometry should notice that and not pass to GeometryAligner.
 //
 //
 
-
 // System
 #include <memory>
 
@@ -28,8 +27,6 @@ reconstruction Geometry should notice that and not pass to GeometryAligner.
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-
-
 // Alignment
 #include "CondFormats/Alignment/interface/Alignments.h"
 #include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
@@ -46,14 +43,10 @@ class FakeAlignmentProducer : public edm::ESProducer {
   FakeAlignmentProducer(const edm::ParameterSet&);
   ~FakeAlignmentProducer() override {}
 
-  std::unique_ptr<Alignments>
-  produceTkAli(const TrackerAlignmentRcd&) { return std::make_unique<Alignments>();}
-  std::unique_ptr<Alignments> 
-  produceDTAli(const DTAlignmentRcd&) { return std::make_unique<Alignments>();}
-  std::unique_ptr<Alignments>
-  produceCSCAli(const CSCAlignmentRcd&)  { return std::make_unique<Alignments>();}
-  std::unique_ptr<Alignments>
-  produceGlobals(const GlobalPositionRcd&) {return std::make_unique<Alignments>();}
+  std::unique_ptr<Alignments> produceTkAli(const TrackerAlignmentRcd&) { return std::make_unique<Alignments>(); }
+  std::unique_ptr<Alignments> produceDTAli(const DTAlignmentRcd&) { return std::make_unique<Alignments>(); }
+  std::unique_ptr<Alignments> produceCSCAli(const CSCAlignmentRcd&) { return std::make_unique<Alignments>(); }
+  std::unique_ptr<Alignments> produceGlobals(const GlobalPositionRcd&) { return std::make_unique<Alignments>(); }
 
   std::unique_ptr<AlignmentErrorsExtended> produceTkAliErr(const TrackerAlignmentErrorExtendedRcd&) {
     return std::make_unique<AlignmentErrorsExtended>();
@@ -64,28 +57,24 @@ class FakeAlignmentProducer : public edm::ESProducer {
   std::unique_ptr<AlignmentErrorsExtended> produceCSCAliErr(const CSCAlignmentErrorExtendedRcd&) {
     return std::make_unique<AlignmentErrorsExtended>();
   }
-
 };
 
-FakeAlignmentProducer::FakeAlignmentProducer(const edm::ParameterSet& iConfig) 
-{
+FakeAlignmentProducer::FakeAlignmentProducer(const edm::ParameterSet& iConfig) {
   // This 'appendToDataLabel' is used by the framework to distinguish providers
   // with different settings and to request a special one by e.g.
   // iSetup.get<TrackerDigiGeometryRecord>().get("theLabel", tkGeomHandle);
-  edm::LogInfo("Alignments") 
-    << "@SUB=FakeAlignmentProducer" << "Providing data with label '" 
-    << iConfig.getParameter<std::string>("appendToDataLabel") << "'.";
-
-  setWhatProduced( this, &FakeAlignmentProducer::produceTkAli );
-  setWhatProduced( this, &FakeAlignmentProducer::produceTkAliErr );
-  setWhatProduced( this, &FakeAlignmentProducer::produceDTAli );
-  setWhatProduced( this, &FakeAlignmentProducer::produceDTAliErr );
-  setWhatProduced( this, &FakeAlignmentProducer::produceCSCAli );
-  setWhatProduced( this, &FakeAlignmentProducer::produceCSCAliErr );
-  setWhatProduced( this, &FakeAlignmentProducer::produceGlobals );
-
+  edm::LogInfo("Alignments") << "@SUB=FakeAlignmentProducer"
+                             << "Providing data with label '" << iConfig.getParameter<std::string>("appendToDataLabel")
+                             << "'.";
+
+  setWhatProduced(this, &FakeAlignmentProducer::produceTkAli);
+  setWhatProduced(this, &FakeAlignmentProducer::produceTkAliErr);
+  setWhatProduced(this, &FakeAlignmentProducer::produceDTAli);
+  setWhatProduced(this, &FakeAlignmentProducer::produceDTAliErr);
+  setWhatProduced(this, &FakeAlignmentProducer::produceCSCAli);
+  setWhatProduced(this, &FakeAlignmentProducer::produceCSCAliErr);
+  setWhatProduced(this, &FakeAlignmentProducer::produceGlobals);
 }
 
-
 //define this as a plug-in
 DEFINE_FWK_EVENTSETUP_MODULE(FakeAlignmentProducer);
diff --git a/Alignment/CommonAlignmentProducer/plugins/FakeAlignmentSource.cc b/Alignment/CommonAlignmentProducer/plugins/FakeAlignmentSource.cc
index 3b89e581e126e..fb4de86e236ea 100644
--- a/Alignment/CommonAlignmentProducer/plugins/FakeAlignmentSource.cc
+++ b/Alignment/CommonAlignmentProducer/plugins/FakeAlignmentSource.cc
@@ -2,7 +2,7 @@
 //
 // Package:    FakeAlignmentSource
 // Class:      FakeAlignmentSource
-// 
+//
 /**\class FakeAlignmentSource FakeAlignmentSource.cc Alignment/FakeAlignmentProducer/plugins/FakeAlignmentSource.cc
 
 Description: Producer of fake alignment data for all geometries (currently: Tracker, DT and CSC)
@@ -19,7 +19,6 @@ reconstruction Geometry should notice that and not pass to GeometryAligner.
 //
 //
 
-
 // System
 #include <memory>
 #include <string>
@@ -44,53 +43,44 @@ reconstruction Geometry should notice that and not pass to GeometryAligner.
 #include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h"
 #include "CondFormats/AlignmentRecord/interface/TrackerSurfaceDeformationRcd.h"
 
-class FakeAlignmentSource : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
+class FakeAlignmentSource : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
 public:
   FakeAlignmentSource(const edm::ParameterSet&);
   ~FakeAlignmentSource() override {}
 
   /// Tracker and its APE
-  std::unique_ptr<Alignments> produceTkAli(const TrackerAlignmentRcd&) {
-    return std::make_unique<Alignments>();
-  }
-  std::unique_ptr<AlignmentErrorsExtended> produceTkAliErr(const TrackerAlignmentErrorExtendedRcd&) { 
+  std::unique_ptr<Alignments> produceTkAli(const TrackerAlignmentRcd&) { return std::make_unique<Alignments>(); }
+  std::unique_ptr<AlignmentErrorsExtended> produceTkAliErr(const TrackerAlignmentErrorExtendedRcd&) {
     return std::make_unique<AlignmentErrorsExtended>();
   }
 
   /// DT and its APE
-  std::unique_ptr<Alignments> produceDTAli(const DTAlignmentRcd&) {
-    return std::make_unique<Alignments>();
-  }
+  std::unique_ptr<Alignments> produceDTAli(const DTAlignmentRcd&) { return std::make_unique<Alignments>(); }
   std::unique_ptr<AlignmentErrorsExtended> produceDTAliErr(const DTAlignmentErrorExtendedRcd&) {
     return std::make_unique<AlignmentErrorsExtended>();
   }
 
   /// CSC and its APE
-  std::unique_ptr<Alignments> produceCSCAli(const CSCAlignmentRcd&) {
-    return std::make_unique<Alignments>();
-  }
+  std::unique_ptr<Alignments> produceCSCAli(const CSCAlignmentRcd&) { return std::make_unique<Alignments>(); }
   std::unique_ptr<AlignmentErrorsExtended> produceCSCAliErr(const CSCAlignmentErrorExtendedRcd&) {
     return std::make_unique<AlignmentErrorsExtended>();
   }
 
   /// GlobalPositions
-  std::unique_ptr<Alignments> produceGlobals(const GlobalPositionRcd&) {
-    return std::make_unique<Alignments>();
-  }
+  std::unique_ptr<Alignments> produceGlobals(const GlobalPositionRcd&) { return std::make_unique<Alignments>(); }
 
   /// Tracker surface deformations
-  std::unique_ptr<AlignmentSurfaceDeformations>
-  produceTrackerSurfaceDeformation(const TrackerSurfaceDeformationRcd&) {
+  std::unique_ptr<AlignmentSurfaceDeformations> produceTrackerSurfaceDeformation(const TrackerSurfaceDeformationRcd&) {
     return std::make_unique<AlignmentSurfaceDeformations>();
   }
 
- protected:
+protected:
   /// provide (dummy) IOV
-  void setIntervalFor( const edm::eventsetup::EventSetupRecordKey& /*dummy*/,
-			       const edm::IOVSyncValue& ioSyncVal, edm::ValidityInterval& iov) override;
-
- private:
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey& /*dummy*/,
+                      const edm::IOVSyncValue& ioSyncVal,
+                      edm::ValidityInterval& iov) override;
 
+private:
   bool produceTracker_;
   bool produceDT_;
   bool produceCSC_;
@@ -103,20 +93,19 @@ class FakeAlignmentSource : public edm::ESProducer, public edm::EventSetupRecord
 //________________________________________________________________________________________
 
 FakeAlignmentSource::FakeAlignmentSource(const edm::ParameterSet& iConfig)
-  :produceTracker_(iConfig.getParameter<bool>("produceTracker")),
-   produceDT_(iConfig.getParameter<bool>("produceDT")),
-   produceCSC_(iConfig.getParameter<bool>("produceCSC")),
-   produceGlobalPosition_(iConfig.getParameter<bool>("produceGlobalPosition")),
-   produceTrackerSurfaceDeformation_(iConfig.getParameter<bool>("produceTrackerSurfaceDeformation"))
-{
+    : produceTracker_(iConfig.getParameter<bool>("produceTracker")),
+      produceDT_(iConfig.getParameter<bool>("produceDT")),
+      produceCSC_(iConfig.getParameter<bool>("produceCSC")),
+      produceGlobalPosition_(iConfig.getParameter<bool>("produceGlobalPosition")),
+      produceTrackerSurfaceDeformation_(iConfig.getParameter<bool>("produceTrackerSurfaceDeformation")) {
   // This 'appendToDataLabel' is used by the framework to distinguish providers
   // with different settings and to request a special one by e.g.
   // iSetup.get<TrackerDigiGeometryRecord>().get("theLabel", tkGeomHandle);
-  
-  edm::LogInfo("Alignments") 
-    << "@SUB=FakeAlignmentSource" << "Providing data with label '" 
-    << iConfig.getParameter<std::string>("appendToDataLabel") << "'.";
-  
+
+  edm::LogInfo("Alignments") << "@SUB=FakeAlignmentSource"
+                             << "Providing data with label '" << iConfig.getParameter<std::string>("appendToDataLabel")
+                             << "'.";
+
   // Tell framework what data is produced by which method:
   if (produceTracker_) {
     this->setWhatProduced(this, &FakeAlignmentSource::produceTkAli);
@@ -158,10 +147,9 @@ FakeAlignmentSource::FakeAlignmentSource(const edm::ParameterSet& iConfig)
   }
 }
 
-void FakeAlignmentSource::setIntervalFor( const edm::eventsetup::EventSetupRecordKey& /*dummy*/, 
-					    const edm::IOVSyncValue& ioSyncVal, 
-					    edm::ValidityInterval& outValidity )
-{
+void FakeAlignmentSource::setIntervalFor(const edm::eventsetup::EventSetupRecordKey& /*dummy*/,
+                                         const edm::IOVSyncValue& ioSyncVal,
+                                         edm::ValidityInterval& outValidity) {
   // Implementation copied from SiStripGainFakeESSource: unlimited IOV
   outValidity = edm::ValidityInterval(ioSyncVal.beginOfTime(), ioSyncVal.endOfTime());
 }
diff --git a/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc b/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc
index 1fbec7ec4b0fb..b72d7b31cd1c7 100644
--- a/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc
+++ b/Alignment/CommonAlignmentProducer/plugins/GlobalTrackerMuonAlignment.cc
@@ -2,7 +2,7 @@
 //
 // Package:    GlobalTrackerMuonAlignment
 // Class:      GlobalTrackerMuonAlignment
-// 
+//
 /**\class GlobalTrackerMuonAlignment GlobalTrackerMuonAlignment.cc Alignment/GlobalTrackerMuonAlignment/src/GlobalTrackerMuonAlignment.cc
 
  Description: Producer of relative tracker and muon system alignment
@@ -63,7 +63,7 @@
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
 #include "TrackingTools/GeomPropagators/interface/Propagator.h"
 #include "TrackingTools/GeomPropagators/interface/SmartPropagator.h"
-#include "TrackingTools/GeomPropagators/interface/PropagationDirectionChooser.h" 
+#include "TrackingTools/GeomPropagators/interface/PropagationDirectionChooser.h"
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
 #include "TrackPropagation/SteppingHelixPropagator/interface/SteppingHelixPropagator.h"
 #include "TrackPropagation/RungeKutta/interface/defaultRKPropagator.h"
@@ -92,13 +92,13 @@
 #include <TH2.h>
 #include <TFile.h>
 
-#include<iostream>
-#include<cmath>
-#include<cassert>
-#include<fstream>
-#include<iomanip>
+#include <iostream>
+#include <cmath>
+#include <cassert>
+#include <fstream>
+#include <iomanip>
 
-using namespace edm; 
+using namespace edm;
 using namespace std;
 using namespace reco;
 
@@ -107,7 +107,7 @@ using namespace reco;
 //
 
 class GlobalTrackerMuonAlignment : public edm::EDAnalyzer {
- public:
+public:
   explicit GlobalTrackerMuonAlignment(const edm::ParameterSet&);
   ~GlobalTrackerMuonAlignment() override;
 
@@ -115,57 +115,62 @@ class GlobalTrackerMuonAlignment : public edm::EDAnalyzer {
   void analyzeTrackTrajectory(const edm::Event&, const edm::EventSetup&);
   void bookHist();
   void fitHist();
-  void trackFitter(reco::TrackRef, reco::TransientTrack&, PropagationDirection, 
-		  TrajectoryStateOnSurface&);
-  void muonFitter(reco::TrackRef, reco::TransientTrack&, PropagationDirection, 
-		  TrajectoryStateOnSurface&);
+  void trackFitter(reco::TrackRef, reco::TransientTrack&, PropagationDirection, TrajectoryStateOnSurface&);
+  void muonFitter(reco::TrackRef, reco::TransientTrack&, PropagationDirection, TrajectoryStateOnSurface&);
   void debugTrackHit(const std::string, reco::TrackRef);
   void debugTrackHit(const std::string, reco::TransientTrack&);
   void debugTrajectorySOS(const std::string, TrajectoryStateOnSurface&);
   void debugTrajectorySOSv(const std::string, TrajectoryStateOnSurface);
   void debugTrajectory(const std::string, Trajectory&);
 
-  void gradientGlobal(GlobalVector&, GlobalVector&, GlobalVector&, GlobalVector&, 
-		      GlobalVector&, AlgebraicSymMatrix66&);
-  void gradientLocal(GlobalVector&, GlobalVector&, GlobalVector&, GlobalVector&, 
-		     GlobalVector&, CLHEP::HepSymMatrix&, CLHEP::HepMatrix&, 
-		     CLHEP::HepVector&, AlgebraicVector4&);
-  void gradientGlobalAlg(GlobalVector&, GlobalVector&, GlobalVector&, GlobalVector&,  
-  			 AlgebraicSymMatrix66&);
-  void misalignMuon(GlobalVector&, GlobalVector&, GlobalVector&, GlobalVector&, 
-		    GlobalVector&, GlobalVector&);
-  void misalignMuonL(GlobalVector&, GlobalVector&, GlobalVector&, GlobalVector&, 
-		     GlobalVector&, GlobalVector&, AlgebraicVector4&, 
-		     TrajectoryStateOnSurface&, TrajectoryStateOnSurface&);
-  void writeGlPosRcd(CLHEP::HepVector& d3); 
-  inline double CLHEP_dot(const CLHEP::HepVector& a, const CLHEP::HepVector& b)
-  {
-    return a(1)*b(1)+a(2)*b(2)+a(3)*b(3);
+  void gradientGlobal(GlobalVector&, GlobalVector&, GlobalVector&, GlobalVector&, GlobalVector&, AlgebraicSymMatrix66&);
+  void gradientLocal(GlobalVector&,
+                     GlobalVector&,
+                     GlobalVector&,
+                     GlobalVector&,
+                     GlobalVector&,
+                     CLHEP::HepSymMatrix&,
+                     CLHEP::HepMatrix&,
+                     CLHEP::HepVector&,
+                     AlgebraicVector4&);
+  void gradientGlobalAlg(GlobalVector&, GlobalVector&, GlobalVector&, GlobalVector&, AlgebraicSymMatrix66&);
+  void misalignMuon(GlobalVector&, GlobalVector&, GlobalVector&, GlobalVector&, GlobalVector&, GlobalVector&);
+  void misalignMuonL(GlobalVector&,
+                     GlobalVector&,
+                     GlobalVector&,
+                     GlobalVector&,
+                     GlobalVector&,
+                     GlobalVector&,
+                     AlgebraicVector4&,
+                     TrajectoryStateOnSurface&,
+                     TrajectoryStateOnSurface&);
+  void writeGlPosRcd(CLHEP::HepVector& d3);
+  inline double CLHEP_dot(const CLHEP::HepVector& a, const CLHEP::HepVector& b) {
+    return a(1) * b(1) + a(2) * b(2) + a(3) * b(3);
   }
 
- private:
-
-  void beginJob() override ;
+private:
+  void beginJob() override;
   void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void endJob() override ;
-  
+  void endJob() override;
+
   // ----------member data ---------------------------
 
-  edm::InputTag trackTags_;     // used to select what tracks to read from configuration file
-  edm::InputTag muonTags_;      // used to select what standalone muons
-  edm::InputTag gmuonTags_;     // used to select what global muons
-  edm::InputTag smuonTags_;     // used to select what selected muons
-  string propagator_;           // name of the propagator
-  bool cosmicMuonMode_;   
+  edm::InputTag trackTags_;  // used to select what tracks to read from configuration file
+  edm::InputTag muonTags_;   // used to select what standalone muons
+  edm::InputTag gmuonTags_;  // used to select what global muons
+  edm::InputTag smuonTags_;  // used to select what selected muons
+  string propagator_;        // name of the propagator
+  bool cosmicMuonMode_;
   bool isolatedMuonMode_;
-  bool collectionCosmic;        // if true, read muon collection expected for CosmicMu
-  bool collectionIsolated;      //                                            IsolateMu
-  bool refitMuon_;              // if true, refit stand alone muon track
-  bool refitTrack_;             //                tracker track
+  bool collectionCosmic;    // if true, read muon collection expected for CosmicMu
+  bool collectionIsolated;  //                                            IsolateMu
+  bool refitMuon_;          // if true, refit stand alone muon track
+  bool refitTrack_;         //                tracker track
   string rootOutFile_;
   string txtOutFile_;
-  bool writeDB_;                // write results to DB
-  bool debug_;                  // run in debugging mode
+  bool writeDB_;  // write results to DB
+  bool debug_;    // run in debugging mode
 
   edm::ESWatcher<GlobalTrackingGeometryRecord> watchTrackingGeometry_;
   edm::ESHandle<GlobalTrackingGeometry> theTrackingGeometry;
@@ -187,80 +192,76 @@ class GlobalTrackerMuonAlignment : public edm::EDAnalyzer {
   MuonTransientTrackingRecHitBuilder* MuRHBuilder;
   const TransientTrackingRecHitBuilder* TTRHBuilder;
 
-  //                            // LSF for global d(3):    Inf * d = Gfr 
-  AlgebraicVector3 Gfr;         // free terms 
-  AlgebraicSymMatrix33 Inf;     // information matrix 
-  //                            // LSF for global d(6):    Hess * d = Grad 
-  CLHEP::HepVector Grad;        // gradient of the objective function in global parameters
-  CLHEP::HepMatrix Hess;        // Hessian                  -- // ---     
+  //                            // LSF for global d(3):    Inf * d = Gfr
+  AlgebraicVector3 Gfr;      // free terms
+  AlgebraicSymMatrix33 Inf;  // information matrix
+  //                            // LSF for global d(6):    Hess * d = Grad
+  CLHEP::HepVector Grad;  // gradient of the objective function in global parameters
+  CLHEP::HepMatrix Hess;  // Hessian                  -- // ---
 
-  CLHEP::HepVector GradL;       // gradient of the objective function in local parameters
-  CLHEP::HepMatrix HessL;       // Hessian                  -- // ---     
+  CLHEP::HepVector GradL;  // gradient of the objective function in local parameters
+  CLHEP::HepMatrix HessL;  // Hessian                  -- // ---
 
-  int N_event;                  // processed events
-  int N_track;                  // selected tracks
+  int N_event;  // processed events
+  int N_track;  // selected tracks
 
-  std::vector<AlignTransform>::const_iterator 
-  iteratorTrackerRcd;           // location of Tracker in container globalPositionRcd_->m_aligm
-  std::vector<AlignTransform>::const_iterator 
-  iteratorMuonRcd;              //              Muon
-  std::vector<AlignTransform>::const_iterator
-  iteratorEcalRcd;              //              Ecal
   std::vector<AlignTransform>::const_iterator
-  iteratorHcalRcd;              //              Hcal
-
-  CLHEP::HepVector MuGlShift;   // evaluated global muon shifts  
-  CLHEP::HepVector MuGlAngle;   // evaluated global muon angles  
-
-  std::string MuSelect;         // what part of muon system is selected for 1st hit 
-
-  ofstream OutGlobalTxt;        // output the vector of global alignment as text     
-
-  TFile * file;
-  TH1F * histo;
-  TH1F * histo2; // outerP
-  TH1F * histo3; // outerLambda = PI/2-outerTheta
-  TH1F * histo4; // phi
-  TH1F * histo5; // outerR
-  TH1F * histo6; // outerZ
-  TH1F * histo7; // s
-  TH1F * histo8; // chi^2 of muon-track
-
-  TH1F * histo11; // |Rm-Rt| 
-  TH1F * histo12; // Xm-Xt 
-  TH1F * histo13; // Ym-Yt 
-  TH1F * histo14; // Zm-Zt 
-  TH1F * histo15; // Nxm-Nxt 
-  TH1F * histo16; // Nym-Nyt 
-  TH1F * histo17; // Nzm-Nzt 
-  TH1F * histo18; // Error X of inner track  
-  TH1F * histo19; // Error X of muon 
-  TH1F * histo20; // Error of Xm-Xt 
-  TH1F * histo21; // pull(Xm-Xt) 
-  TH1F * histo22; // pull(Ym-Yt) 
-  TH1F * histo23; // pull(Zm-Zt) 
-  TH1F * histo24; // pull(PXm-PXt) 
-  TH1F * histo25; // pull(PYm-Pyt) 
-  TH1F * histo26; // pull(PZm-PZt) 
-  TH1F * histo27; // Nx of tangent plane  
-  TH1F * histo28; // Ny of tangent plane  
-  TH1F * histo29; // lenght of inner track  
-  TH1F * histo30; // lenght of muon track  
-  TH1F * histo31; // chi2 local  
-  TH1F * histo32; // pull(Pxm/Pzm - Pxt/Pzt) local  
-  TH1F * histo33; // pull(Pym/Pzm - Pyt/Pzt) local
-  TH1F * histo34; // pull(Xm - Xt) local
-  TH1F * histo35; // pull(Ym - Yt) local
-
-  TH2F * histo101; // Rtrack/muon vs Ztrack/muon
-  TH2F * histo102; // Ytrack/muon vs Xtrack/muon
+      iteratorTrackerRcd;  // location of Tracker in container globalPositionRcd_->m_aligm
+  std::vector<AlignTransform>::const_iterator iteratorMuonRcd;  //              Muon
+  std::vector<AlignTransform>::const_iterator iteratorEcalRcd;  //              Ecal
+  std::vector<AlignTransform>::const_iterator iteratorHcalRcd;  //              Hcal
+
+  CLHEP::HepVector MuGlShift;  // evaluated global muon shifts
+  CLHEP::HepVector MuGlAngle;  // evaluated global muon angles
+
+  std::string MuSelect;  // what part of muon system is selected for 1st hit
+
+  ofstream OutGlobalTxt;  // output the vector of global alignment as text
+
+  TFile* file;
+  TH1F* histo;
+  TH1F* histo2;  // outerP
+  TH1F* histo3;  // outerLambda = PI/2-outerTheta
+  TH1F* histo4;  // phi
+  TH1F* histo5;  // outerR
+  TH1F* histo6;  // outerZ
+  TH1F* histo7;  // s
+  TH1F* histo8;  // chi^2 of muon-track
+
+  TH1F* histo11;  // |Rm-Rt|
+  TH1F* histo12;  // Xm-Xt
+  TH1F* histo13;  // Ym-Yt
+  TH1F* histo14;  // Zm-Zt
+  TH1F* histo15;  // Nxm-Nxt
+  TH1F* histo16;  // Nym-Nyt
+  TH1F* histo17;  // Nzm-Nzt
+  TH1F* histo18;  // Error X of inner track
+  TH1F* histo19;  // Error X of muon
+  TH1F* histo20;  // Error of Xm-Xt
+  TH1F* histo21;  // pull(Xm-Xt)
+  TH1F* histo22;  // pull(Ym-Yt)
+  TH1F* histo23;  // pull(Zm-Zt)
+  TH1F* histo24;  // pull(PXm-PXt)
+  TH1F* histo25;  // pull(PYm-Pyt)
+  TH1F* histo26;  // pull(PZm-PZt)
+  TH1F* histo27;  // Nx of tangent plane
+  TH1F* histo28;  // Ny of tangent plane
+  TH1F* histo29;  // lenght of inner track
+  TH1F* histo30;  // lenght of muon track
+  TH1F* histo31;  // chi2 local
+  TH1F* histo32;  // pull(Pxm/Pzm - Pxt/Pzt) local
+  TH1F* histo33;  // pull(Pym/Pzm - Pyt/Pzt) local
+  TH1F* histo34;  // pull(Xm - Xt) local
+  TH1F* histo35;  // pull(Ym - Yt) local
+
+  TH2F* histo101;  // Rtrack/muon vs Ztrack/muon
+  TH2F* histo102;  // Ytrack/muon vs Xtrack/muon
 };
 
 //
 // constants, enums and typedefs
 //
 
-
 //
 // static data member definitions
 //
@@ -269,42 +270,38 @@ class GlobalTrackerMuonAlignment : public edm::EDAnalyzer {
 // constructors and destructor
 //
 GlobalTrackerMuonAlignment::GlobalTrackerMuonAlignment(const edm::ParameterSet& iConfig)
-  :trackTags_(iConfig.getParameter<edm::InputTag>("tracks")),
-   muonTags_(iConfig.getParameter<edm::InputTag>("muons")),
-   gmuonTags_(iConfig.getParameter<edm::InputTag>("gmuons")),
-   smuonTags_(iConfig.getParameter<edm::InputTag>("smuons")),
-   propagator_(iConfig.getParameter<string>("Propagator")),
-
-   cosmicMuonMode_(iConfig.getParameter<bool>("cosmics")),
-   isolatedMuonMode_(iConfig.getParameter<bool>("isolated")),
-
-   refitMuon_(iConfig.getParameter<bool>("refitmuon")),
-   refitTrack_(iConfig.getParameter<bool>("refittrack")),
-
-   rootOutFile_(iConfig.getUntrackedParameter<string>("rootOutFile")),
-   txtOutFile_(iConfig.getUntrackedParameter<string>("txtOutFile")),
-   writeDB_(iConfig.getUntrackedParameter<bool>("writeDB")),
-   debug_(iConfig.getUntrackedParameter<bool>("debug")),
-   defineFitter(true)
-{
-#ifdef NO_FALSE_FALSE_MODE 
-  if (cosmicMuonMode_==false && isolatedMuonMode_==false) {
+    : trackTags_(iConfig.getParameter<edm::InputTag>("tracks")),
+      muonTags_(iConfig.getParameter<edm::InputTag>("muons")),
+      gmuonTags_(iConfig.getParameter<edm::InputTag>("gmuons")),
+      smuonTags_(iConfig.getParameter<edm::InputTag>("smuons")),
+      propagator_(iConfig.getParameter<string>("Propagator")),
+
+      cosmicMuonMode_(iConfig.getParameter<bool>("cosmics")),
+      isolatedMuonMode_(iConfig.getParameter<bool>("isolated")),
+
+      refitMuon_(iConfig.getParameter<bool>("refitmuon")),
+      refitTrack_(iConfig.getParameter<bool>("refittrack")),
+
+      rootOutFile_(iConfig.getUntrackedParameter<string>("rootOutFile")),
+      txtOutFile_(iConfig.getUntrackedParameter<string>("txtOutFile")),
+      writeDB_(iConfig.getUntrackedParameter<bool>("writeDB")),
+      debug_(iConfig.getUntrackedParameter<bool>("debug")),
+      defineFitter(true) {
+#ifdef NO_FALSE_FALSE_MODE
+  if (cosmicMuonMode_ == false && isolatedMuonMode_ == false) {
     throw cms::Exception("BadConfig") << "Muon collection not set! "
-				      << "Use from GlobalTrackerMuonAlignment_test_cfg.py.";
+                                      << "Use from GlobalTrackerMuonAlignment_test_cfg.py.";
   }
-#endif  
-  if (cosmicMuonMode_==true && isolatedMuonMode_==true) {
+#endif
+  if (cosmicMuonMode_ == true && isolatedMuonMode_ == true) {
     throw cms::Exception("BadConfig") << "Muon collection can be either cosmic or isolated! "
-				      << "Please set only one to true.";
+                                      << "Please set only one to true.";
   }
 }
 
-GlobalTrackerMuonAlignment::~GlobalTrackerMuonAlignment()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+GlobalTrackerMuonAlignment::~GlobalTrackerMuonAlignment() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
 //
@@ -312,43 +309,45 @@ GlobalTrackerMuonAlignment::~GlobalTrackerMuonAlignment()
 //
 
 // ------------ method called to for each event  ------------
-void
-GlobalTrackerMuonAlignment::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{  
-  //GlobalTrackerMuonAlignment::analyzeTrackTrack(iEvent, iSetup);  
-  GlobalTrackerMuonAlignment::analyzeTrackTrajectory(iEvent, iSetup);  
+void GlobalTrackerMuonAlignment::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
+  //GlobalTrackerMuonAlignment::analyzeTrackTrack(iEvent, iSetup);
+  GlobalTrackerMuonAlignment::analyzeTrackTrajectory(iEvent, iSetup);
 }
 
 // ------------ method called once for job just before starting event loop  ------------
-void GlobalTrackerMuonAlignment::beginJob()
-{
+void GlobalTrackerMuonAlignment::beginJob() {
   N_event = 0;
   N_track = 0;
-  
-  if (cosmicMuonMode_==true && isolatedMuonMode_==false) {
-    collectionCosmic = true; collectionIsolated = false;}
-  else if (cosmicMuonMode_==false && isolatedMuonMode_==true) {
-    collectionCosmic = false; collectionIsolated = true;}
-  else {
-    collectionCosmic = false; collectionIsolated = false;}
 
-  for(int i=0; i<=2; i++){
+  if (cosmicMuonMode_ == true && isolatedMuonMode_ == false) {
+    collectionCosmic = true;
+    collectionIsolated = false;
+  } else if (cosmicMuonMode_ == false && isolatedMuonMode_ == true) {
+    collectionCosmic = false;
+    collectionIsolated = true;
+  } else {
+    collectionCosmic = false;
+    collectionIsolated = false;
+  }
+
+  for (int i = 0; i <= 2; i++) {
     Gfr(i) = 0.;
-    for(int j=0; j<=2; j++){
-      Inf(i,j) = 0.;
-    }}
+    for (int j = 0; j <= 2; j++) {
+      Inf(i, j) = 0.;
+    }
+  }
 
-  Grad =  CLHEP::HepVector(6,0);
-  Hess =  CLHEP::HepSymMatrix(6,0);
+  Grad = CLHEP::HepVector(6, 0);
+  Hess = CLHEP::HepSymMatrix(6, 0);
 
-  GradL =  CLHEP::HepVector(6,0);
-  HessL =  CLHEP::HepSymMatrix(6,0);
+  GradL = CLHEP::HepVector(6, 0);
+  HessL = CLHEP::HepSymMatrix(6, 0);
 
   // histograms
-  TDirectory * dirsave = gDirectory;
+  TDirectory* dirsave = gDirectory;
 
-  file = new TFile(rootOutFile_.c_str(), "recreate"); 
-  const bool oldAddDir = TH1::AddDirectoryStatus(); 
+  file = new TFile(rootOutFile_.c_str(), "recreate");
+  const bool oldAddDir = TH1::AddDirectoryStatus();
 
   TH1::AddDirectory(true);
 
@@ -364,225 +363,235 @@ void GlobalTrackerMuonAlignment::endJob() {
 
   this->fitHist();
 
-  AlgebraicVector3 d(0., 0., 0.);   // ------------  alignmnet  Global Algebraic
+  AlgebraicVector3 d(0., 0., 0.);  // ------------  alignmnet  Global Algebraic
 
-  AlgebraicSymMatrix33 InfI;   // inverse it   
-  for(int i=0; i<=2; i++) 
-    for(int j=0; j<=2; j++){
-      if(j < i) continue;
-      InfI(i,j) += Inf(i,j);}
+  AlgebraicSymMatrix33 InfI;  // inverse it
+  for (int i = 0; i <= 2; i++)
+    for (int j = 0; j <= 2; j++) {
+      if (j < i)
+        continue;
+      InfI(i, j) += Inf(i, j);
+    }
   bool ierr = !InfI.Invert();
-  if( ierr ) { if(alarm)
-      std::cout<<" Error inverse  Inf matrix !!!!!!!!!!!"<<std::endl;}
-  
-  for(int i=0; i<=2; i++) 
-    for(int k=0; k<=2; k++) d(i) -= InfI(i,k)*Gfr(k);
+  if (ierr) {
+    if (alarm)
+      std::cout << " Error inverse  Inf matrix !!!!!!!!!!!" << std::endl;
+  }
+
+  for (int i = 0; i <= 2; i++)
+    for (int k = 0; k <= 2; k++)
+      d(i) -= InfI(i, k) * Gfr(k);
   // end of Global Algebraic
-        
+
   //                                ---------------  alignment Global CLHEP
   CLHEP::HepVector d3 = CLHEP::solve(Hess, -Grad);
   int iEr3;
   CLHEP::HepMatrix Errd3 = Hess.inverse(iEr3);
-  if( iEr3 != 0) { if(alarm)
-    std::cout<<" endJob Error inverse Hess matrix !!!!!!!!!!!"<<std::endl;
+  if (iEr3 != 0) {
+    if (alarm)
+      std::cout << " endJob Error inverse Hess matrix !!!!!!!!!!!" << std::endl;
   }
   // end of Global CLHEP
-  
+
   //                                ----------------- alignment Local CLHEP
   CLHEP::HepVector dLI = CLHEP::solve(HessL, -GradL);
   int iErI;
   CLHEP::HepMatrix ErrdLI = HessL.inverse(iErI);
-  if( iErI != 0) { if(alarm)
-      std::cout<<" endJob Error inverse HessL matrix !!!!!!!!!!!"<<std::endl;
+  if (iErI != 0) {
+    if (alarm)
+      std::cout << " endJob Error inverse HessL matrix !!!!!!!!!!!" << std::endl;
   }
   // end of Local CLHEP
 
   // printout of final parameters
-  std::cout<<" ---- "<<N_event<<" event "<<N_track<<" tracks "
-	   <<MuSelect<<" ---- "<<std::endl;
-  if (collectionIsolated) std::cout<<" ALCARECOMuAlCalIsolatedMu "<<std::endl;
-  else if (collectionCosmic) std::cout<<"  ALCARECOMuAlGlobalCosmics "<<std::endl; 
-  else std::cout<<smuonTags_<<std::endl;
-  std::cout<<" Similated shifts[cm] "
-	   <<MuGlShift(1)<<" "<<MuGlShift(2)<<" "<<MuGlShift(3)<<" "
-	   <<" angles[rad] "<<MuGlAngle(1)<<" "<<MuGlAngle(2)<<" "<<MuGlAngle(3)<<" "
-	   <<std::endl;
-  std::cout<<" d    "<<-d<<std::endl;;
-  std::cout<<" +-   "<<sqrt(InfI(0,0))<<" "<<sqrt(InfI(1,1))<<" "<<sqrt(InfI(2,2))
-	   <<std::endl;
-  std::cout<<" dG   "<<d3(1)<<" "<<d3(2)<<" "<<d3(3)<<" "<<d3(4)<<" "
-	   <<d3(5)<<" "<<d3(6)<<std::endl;;
-  std::cout<<" +-   "<<sqrt(Errd3(1,1))<<" "<<sqrt(Errd3(2,2))<<" "<<sqrt(Errd3(3,3))
-	   <<" "<<sqrt(Errd3(4,4))<<" "<<sqrt(Errd3(5,5))<<" "<<sqrt(Errd3(6,6))
-	   <<std::endl;
-  std::cout<<" dL   "<<dLI(1)<<" "<<dLI(2)<<" "<<dLI(3)<<" "<<dLI(4)<<" "
-	   <<dLI(5)<<" "<<dLI(6)<<std::endl;;
-  std::cout<<" +-   "<<sqrt(ErrdLI(1,1))<<" "<<sqrt(ErrdLI(2,2))<<" "<<sqrt(ErrdLI(3,3))
-	   <<" "<<sqrt(ErrdLI(4,4))<<" "<<sqrt(ErrdLI(5,5))<<" "<<sqrt(ErrdLI(6,6))
-	   <<std::endl;
+  std::cout << " ---- " << N_event << " event " << N_track << " tracks " << MuSelect << " ---- " << std::endl;
+  if (collectionIsolated)
+    std::cout << " ALCARECOMuAlCalIsolatedMu " << std::endl;
+  else if (collectionCosmic)
+    std::cout << "  ALCARECOMuAlGlobalCosmics " << std::endl;
+  else
+    std::cout << smuonTags_ << std::endl;
+  std::cout << " Similated shifts[cm] " << MuGlShift(1) << " " << MuGlShift(2) << " " << MuGlShift(3) << " "
+            << " angles[rad] " << MuGlAngle(1) << " " << MuGlAngle(2) << " " << MuGlAngle(3) << " " << std::endl;
+  std::cout << " d    " << -d << std::endl;
+  ;
+  std::cout << " +-   " << sqrt(InfI(0, 0)) << " " << sqrt(InfI(1, 1)) << " " << sqrt(InfI(2, 2)) << std::endl;
+  std::cout << " dG   " << d3(1) << " " << d3(2) << " " << d3(3) << " " << d3(4) << " " << d3(5) << " " << d3(6)
+            << std::endl;
+  ;
+  std::cout << " +-   " << sqrt(Errd3(1, 1)) << " " << sqrt(Errd3(2, 2)) << " " << sqrt(Errd3(3, 3)) << " "
+            << sqrt(Errd3(4, 4)) << " " << sqrt(Errd3(5, 5)) << " " << sqrt(Errd3(6, 6)) << std::endl;
+  std::cout << " dL   " << dLI(1) << " " << dLI(2) << " " << dLI(3) << " " << dLI(4) << " " << dLI(5) << " " << dLI(6)
+            << std::endl;
+  ;
+  std::cout << " +-   " << sqrt(ErrdLI(1, 1)) << " " << sqrt(ErrdLI(2, 2)) << " " << sqrt(ErrdLI(3, 3)) << " "
+            << sqrt(ErrdLI(4, 4)) << " " << sqrt(ErrdLI(5, 5)) << " " << sqrt(ErrdLI(6, 6)) << std::endl;
 
   // what do we write to DB
-  CLHEP::HepVector vectorToDb(6,0), vectorErrToDb(6,0);
+  CLHEP::HepVector vectorToDb(6, 0), vectorErrToDb(6, 0);
   //vectorToDb = d3;
   //for(unsigned int i=1; i<=6; i++) vectorErrToDb(i) = sqrt(Errd3(i,i));
   vectorToDb = -dLI;
-  for(unsigned int i=1; i<=6; i++) vectorErrToDb(i) = sqrt(ErrdLI(i,i));
+  for (unsigned int i = 1; i <= 6; i++)
+    vectorErrToDb(i) = sqrt(ErrdLI(i, i));
 
   // write histograms to root file
-  file->Write(); 
-  file->Close(); 
+  file->Write();
+  file->Close();
 
-  // write global parameters to text file 
+  // write global parameters to text file
   OutGlobalTxt.open(txtOutFile_.c_str(), ios::out);
-  if(!OutGlobalTxt.is_open()) std::cout<<" outglobal.txt is not open !!!!!"<<std::endl;
-  else{
-    OutGlobalTxt<<vectorToDb(1)<<" "<<vectorToDb(2)<<" "<<vectorToDb(3)<<" "<<vectorToDb(4)<<" "
-		<<vectorToDb(5)<<" "<<vectorToDb(6)<<" muon Global.\n";
-    OutGlobalTxt<<vectorErrToDb(1)<<" "<<vectorErrToDb(1)<<" "<<vectorErrToDb(1)<<" "
-		<<vectorErrToDb(1)<<" "<<vectorErrToDb(1)<<" "<<vectorErrToDb(1)<<" errors.\n";
-    OutGlobalTxt<<N_event<<" events are processed.\n";
-
-    if (collectionIsolated) OutGlobalTxt<<"ALCARECOMuAlCalIsolatedMu.\n";
-    else if (collectionCosmic) OutGlobalTxt<<"  ALCARECOMuAlGlobalCosmics.\n"; 
-    else OutGlobalTxt<<smuonTags_<<".\n";
+  if (!OutGlobalTxt.is_open())
+    std::cout << " outglobal.txt is not open !!!!!" << std::endl;
+  else {
+    OutGlobalTxt << vectorToDb(1) << " " << vectorToDb(2) << " " << vectorToDb(3) << " " << vectorToDb(4) << " "
+                 << vectorToDb(5) << " " << vectorToDb(6) << " muon Global.\n";
+    OutGlobalTxt << vectorErrToDb(1) << " " << vectorErrToDb(1) << " " << vectorErrToDb(1) << " " << vectorErrToDb(1)
+                 << " " << vectorErrToDb(1) << " " << vectorErrToDb(1) << " errors.\n";
+    OutGlobalTxt << N_event << " events are processed.\n";
+
+    if (collectionIsolated)
+      OutGlobalTxt << "ALCARECOMuAlCalIsolatedMu.\n";
+    else if (collectionCosmic)
+      OutGlobalTxt << "  ALCARECOMuAlGlobalCosmics.\n";
+    else
+      OutGlobalTxt << smuonTags_ << ".\n";
     OutGlobalTxt.close();
-    std::cout<<" Write to the file outglobal.txt done  "<<std::endl;
+    std::cout << " Write to the file outglobal.txt done  " << std::endl;
   }
 
   // write new GlobalPositionRcd to DB
-  if(debug_)
-    std::cout<<" writeBD_ "<<writeDB_<<std::endl;
-  if (writeDB_) 
+  if (debug_)
+    std::cout << " writeBD_ " << writeDB_ << std::endl;
+  if (writeDB_)
     GlobalTrackerMuonAlignment::writeGlPosRcd(vectorToDb);
 }
 
 // ------------ book histogram  ------------
-void GlobalTrackerMuonAlignment::bookHist()
-{
+void GlobalTrackerMuonAlignment::bookHist() {
   double PI = 3.1415927;
-  histo = new TH1F("Pt","pt",1000,0,100); 
-  histo2 = new TH1F("P","P [GeV/c]",400,0.,400.);       
+  histo = new TH1F("Pt", "pt", 1000, 0, 100);
+  histo2 = new TH1F("P", "P [GeV/c]", 400, 0., 400.);
   histo2->GetXaxis()->SetTitle("momentum [GeV/c]");
-  histo3 = new TH1F("outerLambda","#lambda outer",100,-PI/2.,PI/2.);    
+  histo3 = new TH1F("outerLambda", "#lambda outer", 100, -PI / 2., PI / 2.);
   histo3->GetXaxis()->SetTitle("#lambda outer");
-  histo4 = new TH1F("phi","#phi [rad]",100,-PI,PI);       
+  histo4 = new TH1F("phi", "#phi [rad]", 100, -PI, PI);
   histo4->GetXaxis()->SetTitle("#phi [rad]");
-  histo5 = new TH1F("Rmuon","inner muon hit R [cm]",100,0.,800.);       
+  histo5 = new TH1F("Rmuon", "inner muon hit R [cm]", 100, 0., 800.);
   histo5->GetXaxis()->SetTitle("R of muon [cm]");
-  histo6 = new TH1F("Zmuon","inner muon hit Z[cm]",100,-1000.,1000.);       
+  histo6 = new TH1F("Zmuon", "inner muon hit Z[cm]", 100, -1000., 1000.);
   histo6->GetXaxis()->SetTitle("Z of muon [cm]");
-  histo7 = new TH1F("(Pm-Pt)/Pt"," (Pmuon-Ptrack)/Ptrack", 100,-2.,2.);       
+  histo7 = new TH1F("(Pm-Pt)/Pt", " (Pmuon-Ptrack)/Ptrack", 100, -2., 2.);
   histo7->GetXaxis()->SetTitle("(Pmuon-Ptrack)/Ptrack");
-  histo8 = new TH1F("chi muon-track","#chi^{2}(muon-track)", 1000,0.,1000.);       
+  histo8 = new TH1F("chi muon-track", "#chi^{2}(muon-track)", 1000, 0., 1000.);
   histo8->GetXaxis()->SetTitle("#chi^{2} of muon w.r.t. propagated track");
-  histo11 = new TH1F("distance muon-track","distance muon w.r.t track [cm]",100,0.,30.);
+  histo11 = new TH1F("distance muon-track", "distance muon w.r.t track [cm]", 100, 0., 30.);
   histo11->GetXaxis()->SetTitle("distance of muon w.r.t. track [cm]");
-  histo12 = new TH1F("Xmuon-Xtrack","Xmuon-Xtrack [cm]",200,-20.,20.);
-  histo12->GetXaxis()->SetTitle("Xmuon - Xtrack [cm]"); 
-  histo13 = new TH1F("Ymuon-Ytrack","Ymuon-Ytrack [cm]",200,-20.,20.);
+  histo12 = new TH1F("Xmuon-Xtrack", "Xmuon-Xtrack [cm]", 200, -20., 20.);
+  histo12->GetXaxis()->SetTitle("Xmuon - Xtrack [cm]");
+  histo13 = new TH1F("Ymuon-Ytrack", "Ymuon-Ytrack [cm]", 200, -20., 20.);
   histo13->GetXaxis()->SetTitle("Ymuon - Ytrack [cm]");
-  histo14 = new TH1F("Zmuon-Ztrack","Zmuon-Ztrack [cm]",200,-20.,20.);       
+  histo14 = new TH1F("Zmuon-Ztrack", "Zmuon-Ztrack [cm]", 200, -20., 20.);
   histo14->GetXaxis()->SetTitle("Zmuon-Ztrack [cm]");
-  histo15 = new TH1F("NXmuon-NXtrack","NXmuon-NXtrack [rad]",200,-.1,.1);       
+  histo15 = new TH1F("NXmuon-NXtrack", "NXmuon-NXtrack [rad]", 200, -.1, .1);
   histo15->GetXaxis()->SetTitle("N_{X}(muon)-N_{X}(track) [rad]");
-  histo16 = new TH1F("NYmuon-NYtrack","NYmuon-NYtrack [rad]",200,-.1,.1);       
+  histo16 = new TH1F("NYmuon-NYtrack", "NYmuon-NYtrack [rad]", 200, -.1, .1);
   histo16->GetXaxis()->SetTitle("N_{Y}(muon)-N_{Y}(track) [rad]");
-  histo17 = new TH1F("NZmuon-NZtrack","NZmuon-NZtrack [rad]",200,-.1,.1);       
+  histo17 = new TH1F("NZmuon-NZtrack", "NZmuon-NZtrack [rad]", 200, -.1, .1);
   histo17->GetXaxis()->SetTitle("N_{Z}(muon)-N_{Z}(track) [rad]");
-  histo18 = new TH1F("expected error of Xinner","outer hit of inner tracker",100,0,.01);
+  histo18 = new TH1F("expected error of Xinner", "outer hit of inner tracker", 100, 0, .01);
   histo18->GetXaxis()->SetTitle("expected error of Xinner [cm]");
-  histo19 = new TH1F("expected error of Xmuon","inner hit of muon",100,0,.1);       
+  histo19 = new TH1F("expected error of Xmuon", "inner hit of muon", 100, 0, .1);
   histo19->GetXaxis()->SetTitle("expected error of Xmuon [cm]");
-  histo20 = new TH1F("expected error of Xmuon-Xtrack","muon w.r.t. propagated track",100,0.,10.);
+  histo20 = new TH1F("expected error of Xmuon-Xtrack", "muon w.r.t. propagated track", 100, 0., 10.);
   histo20->GetXaxis()->SetTitle("expected error of Xmuon-Xtrack [cm]");
-  histo21 = new TH1F("pull of Xmuon-Xtrack","pull of Xmuon-Xtrack",100,-10.,10.);
+  histo21 = new TH1F("pull of Xmuon-Xtrack", "pull of Xmuon-Xtrack", 100, -10., 10.);
   histo21->GetXaxis()->SetTitle("(Xmuon-Xtrack)/expected error");
-  histo22 = new TH1F("pull of Ymuon-Ytrack","pull of Ymuon-Ytrack",100,-10.,10.);       
+  histo22 = new TH1F("pull of Ymuon-Ytrack", "pull of Ymuon-Ytrack", 100, -10., 10.);
   histo22->GetXaxis()->SetTitle("(Ymuon-Ytrack)/expected error");
-  histo23 = new TH1F("pull of Zmuon-Ztrack","pull of Zmuon-Ztrack",100,-10.,10.);       
+  histo23 = new TH1F("pull of Zmuon-Ztrack", "pull of Zmuon-Ztrack", 100, -10., 10.);
   histo23->GetXaxis()->SetTitle("(Zmuon-Ztrack)/expected error");
-  histo24 = new TH1F("pull of PXmuon-PXtrack","pull of PXmuon-PXtrack",100,-10.,10.);       
+  histo24 = new TH1F("pull of PXmuon-PXtrack", "pull of PXmuon-PXtrack", 100, -10., 10.);
   histo24->GetXaxis()->SetTitle("(P_{X}(muon)-P_{X}(track))/expected error");
-  histo25 = new TH1F("pull of PYmuon-PYtrack","pull of PYmuon-PYtrack",100,-10.,10.);       
+  histo25 = new TH1F("pull of PYmuon-PYtrack", "pull of PYmuon-PYtrack", 100, -10., 10.);
   histo25->GetXaxis()->SetTitle("(P_{Y}(muon)-P_{Y}(track))/expected error");
-  histo26 = new TH1F("pull of PZmuon-PZtrack","pull of PZmuon-PZtrack",100,-10.,10.);       
+  histo26 = new TH1F("pull of PZmuon-PZtrack", "pull of PZmuon-PZtrack", 100, -10., 10.);
   histo26->GetXaxis()->SetTitle("(P_{Z}(muon)-P_{Z}(track))/expected error");
-  histo27 = new TH1F("N_x","Nx of tangent plane",120,-1.1,1.1); 
+  histo27 = new TH1F("N_x", "Nx of tangent plane", 120, -1.1, 1.1);
   histo27->GetXaxis()->SetTitle("normal vector projection N_{X}");
-  histo28 = new TH1F("N_y","Ny of tangent plane",120,-1.1,1.1); 
+  histo28 = new TH1F("N_y", "Ny of tangent plane", 120, -1.1, 1.1);
   histo28->GetXaxis()->SetTitle("normal vector projection N_{Y}");
-  histo29 = new TH1F("lenght of track","lenght of track",200,0.,400); 
+  histo29 = new TH1F("lenght of track", "lenght of track", 200, 0., 400);
   histo29->GetXaxis()->SetTitle("lenght of track [cm]");
-  histo30 = new TH1F("lenght of muon","lenght of muon",200,0.,800); 
+  histo30 = new TH1F("lenght of muon", "lenght of muon", 200, 0., 800);
   histo30->GetXaxis()->SetTitle("lenght of muon [cm]");
 
-  histo31 = new TH1F("local chi muon-track","#local chi^{2}(muon-track)", 1000,0.,1000.);       
+  histo31 = new TH1F("local chi muon-track", "#local chi^{2}(muon-track)", 1000, 0., 1000.);
   histo31->GetXaxis()->SetTitle("#local chi^{2} of muon w.r.t. propagated track");
-  histo32 = new TH1F("pull of Px/Pz local","pull of Px/Pz local",100,-10.,10.);
+  histo32 = new TH1F("pull of Px/Pz local", "pull of Px/Pz local", 100, -10., 10.);
   histo32->GetXaxis()->SetTitle("local (Px/Pz(muon) - Px/Pz(track))/expected error");
-  histo33 = new TH1F("pull of Py/Pz local","pull of Py/Pz local",100,-10.,10.);
+  histo33 = new TH1F("pull of Py/Pz local", "pull of Py/Pz local", 100, -10., 10.);
   histo33->GetXaxis()->SetTitle("local (Py/Pz(muon) - Py/Pz(track))/expected error");
-  histo34 = new TH1F("pull of X local","pull of X local",100,-10.,10.);
+  histo34 = new TH1F("pull of X local", "pull of X local", 100, -10., 10.);
   histo34->GetXaxis()->SetTitle("local (Xmuon - Xtrack)/expected error");
-  histo35 = new TH1F("pull of Y local","pull of Y local",100,-10.,10.);
+  histo35 = new TH1F("pull of Y local", "pull of Y local", 100, -10., 10.);
   histo35->GetXaxis()->SetTitle("local (Ymuon - Ytrack)/expected error");
 
-  histo101 = new TH2F("Rtr/mu vs Ztr/mu","hit of track/muon",100,-800.,800.,100,0.,600.);
+  histo101 = new TH2F("Rtr/mu vs Ztr/mu", "hit of track/muon", 100, -800., 800., 100, 0., 600.);
   histo101->GetXaxis()->SetTitle("Z of track/muon [cm]");
   histo101->GetYaxis()->SetTitle("R of track/muon [cm]");
-  histo102 = new TH2F("Ytr/mu vs Xtr/mu","hit of track/muon",100,-600.,600.,100,-600.,600.);
+  histo102 = new TH2F("Ytr/mu vs Xtr/mu", "hit of track/muon", 100, -600., 600., 100, -600., 600.);
   histo102->GetXaxis()->SetTitle("X of track/muon [cm]");
   histo102->GetYaxis()->SetTitle("Y of track/muon [cm]");
 }
 
 // ------------ fit histogram  ------------
 void GlobalTrackerMuonAlignment::fitHist() {
-
-  histo7->Fit("gaus","Q");
-
-  histo12->Fit("gaus","Q");
-  histo13->Fit("gaus","Q");
-  histo14->Fit("gaus","Q");
-  histo15->Fit("gaus","Q");
-  histo16->Fit("gaus","Q");
-  histo17->Fit("gaus","Q");
-
-  histo21->Fit("gaus","Q");
-  histo22->Fit("gaus","Q");
-  histo23->Fit("gaus","Q");
-  histo24->Fit("gaus","Q");
-  histo25->Fit("gaus","Q");
-  histo26->Fit("gaus","Q");
-
-  histo32->Fit("gaus","Q");
-  histo33->Fit("gaus","Q");
-  histo34->Fit("gaus","Q");
-  histo35->Fit("gaus","Q");
+  histo7->Fit("gaus", "Q");
+
+  histo12->Fit("gaus", "Q");
+  histo13->Fit("gaus", "Q");
+  histo14->Fit("gaus", "Q");
+  histo15->Fit("gaus", "Q");
+  histo16->Fit("gaus", "Q");
+  histo17->Fit("gaus", "Q");
+
+  histo21->Fit("gaus", "Q");
+  histo22->Fit("gaus", "Q");
+  histo23->Fit("gaus", "Q");
+  histo24->Fit("gaus", "Q");
+  histo25->Fit("gaus", "Q");
+  histo26->Fit("gaus", "Q");
+
+  histo32->Fit("gaus", "Q");
+  histo33->Fit("gaus", "Q");
+  histo34->Fit("gaus", "Q");
+  histo35->Fit("gaus", "Q");
 }
 
 // ------------ method to analyze recoTrack & recoMuon of Global Muon  ------------
-void GlobalTrackerMuonAlignment::analyzeTrackTrack
-(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void GlobalTrackerMuonAlignment::analyzeTrackTrack(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   using namespace edm;
-  using namespace reco;  
+  using namespace reco;
   //debug_ = true;
   bool info = false;
   bool alarm = false;
   //bool alarm = true;
   double PI = 3.1415927;
- 
-  cosmicMuonMode_ = true; // true: both Cosmic and IsolatedMuon are treated with 1,2 tracks
-  isolatedMuonMode_ = !cosmicMuonMode_; //true: only IsolatedMuon are treated with 1 track
- 
+
+  cosmicMuonMode_ = true;                // true: both Cosmic and IsolatedMuon are treated with 1,2 tracks
+  isolatedMuonMode_ = !cosmicMuonMode_;  //true: only IsolatedMuon are treated with 1 track
+
   //if(N_event == 1)
   //GlobalPositionRcdRead1::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup);
 
   N_event++;
   if (info || debug_) {
-    std::cout << "----- event " << N_event << " -- tracks "<<N_track<<" ---";
-    if (cosmicMuonMode_) std::cout << " treated as CosmicMu ";
-    if (isolatedMuonMode_) std::cout <<" treated as IsolatedMu ";
+    std::cout << "----- event " << N_event << " -- tracks " << N_track << " ---";
+    if (cosmicMuonMode_)
+      std::cout << " treated as CosmicMu ";
+    if (isolatedMuonMode_)
+      std::cout << " treated as IsolatedMu ";
     std::cout << std::endl;
   }
 
@@ -591,52 +600,55 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrack
   Handle<reco::TrackCollection> gmuons;
   Handle<reco::MuonCollection> smuons;
 
-  if (collectionIsolated){
-    iEvent.getByLabel("ALCARECOMuAlCalIsolatedMu", "TrackerOnly",  tracks);
-    iEvent.getByLabel("ALCARECOMuAlCalIsolatedMu", "StandAlone",  muons);
-    iEvent.getByLabel("ALCARECOMuAlCalIsolatedMu", "GlobalMuon",  gmuons);
-    iEvent.getByLabel("ALCARECOMuAlCalIsolatedMu", "SelectedMuons",  smuons);
-  }
-  else if (collectionCosmic){
-    iEvent.getByLabel("ALCARECOMuAlGlobalCosmics", "TrackerOnly",  tracks);
-    iEvent.getByLabel("ALCARECOMuAlGlobalCosmics", "StandAlone",  muons);
-    iEvent.getByLabel("ALCARECOMuAlGlobalCosmics", "GlobalMuon",  gmuons);
-    iEvent.getByLabel("ALCARECOMuAlGlobalCosmics", "SelectedMuons",  smuons);
+  if (collectionIsolated) {
+    iEvent.getByLabel("ALCARECOMuAlCalIsolatedMu", "TrackerOnly", tracks);
+    iEvent.getByLabel("ALCARECOMuAlCalIsolatedMu", "StandAlone", muons);
+    iEvent.getByLabel("ALCARECOMuAlCalIsolatedMu", "GlobalMuon", gmuons);
+    iEvent.getByLabel("ALCARECOMuAlCalIsolatedMu", "SelectedMuons", smuons);
+  } else if (collectionCosmic) {
+    iEvent.getByLabel("ALCARECOMuAlGlobalCosmics", "TrackerOnly", tracks);
+    iEvent.getByLabel("ALCARECOMuAlGlobalCosmics", "StandAlone", muons);
+    iEvent.getByLabel("ALCARECOMuAlGlobalCosmics", "GlobalMuon", gmuons);
+    iEvent.getByLabel("ALCARECOMuAlGlobalCosmics", "SelectedMuons", smuons);
+  } else {
+    iEvent.getByLabel(trackTags_, tracks);
+    iEvent.getByLabel(muonTags_, muons);
+    iEvent.getByLabel(gmuonTags_, gmuons);
+    iEvent.getByLabel(smuonTags_, smuons);
   }
-  else{
-    iEvent.getByLabel(trackTags_,tracks);
-    iEvent.getByLabel(muonTags_,muons);
-    iEvent.getByLabel(gmuonTags_,gmuons);
-    iEvent.getByLabel(smuonTags_,smuons);
-  }  
 
   if (debug_) {
-    std::cout << " ievBunch " << iEvent.bunchCrossing()
-	      << " runN " << (int)iEvent.run() <<std::endl;
-    std::cout << " N tracks s/amu gmu selmu "<<tracks->size() << " " <<muons->size()
-              << " "<<gmuons->size() << " " << smuons->size() << std::endl;
-    for (MuonCollection::const_iterator itMuon = smuons->begin();
-	itMuon != smuons->end();
-	 ++itMuon) {
-      std::cout << " is isolatValid Matches " << itMuon->isIsolationValid()
-		<< " " <<itMuon->isMatchesValid() << std::endl;
+    std::cout << " ievBunch " << iEvent.bunchCrossing() << " runN " << (int)iEvent.run() << std::endl;
+    std::cout << " N tracks s/amu gmu selmu " << tracks->size() << " " << muons->size() << " " << gmuons->size() << " "
+              << smuons->size() << std::endl;
+    for (MuonCollection::const_iterator itMuon = smuons->begin(); itMuon != smuons->end(); ++itMuon) {
+      std::cout << " is isolatValid Matches " << itMuon->isIsolationValid() << " " << itMuon->isMatchesValid()
+                << std::endl;
     }
   }
 
-  if (isolatedMuonMode_) {                // ---- Only 1 Isolated Muon --------
-    if (tracks->size() != 1) return;  
-    if (muons->size()  != 1) return;  
-    if (gmuons->size() != 1) return; 
-    if (smuons->size() != 1) return; 
+  if (isolatedMuonMode_) {  // ---- Only 1 Isolated Muon --------
+    if (tracks->size() != 1)
+      return;
+    if (muons->size() != 1)
+      return;
+    if (gmuons->size() != 1)
+      return;
+    if (smuons->size() != 1)
+      return;
   }
-  
-  if (cosmicMuonMode_){                // ---- 1,2 Cosmic Muon --------
-    if (smuons->size() > 2) return; 
-    if (tracks->size() != smuons->size()) return;  
-    if (muons->size() != smuons->size()) return;  
-    if (gmuons->size() != smuons->size()) return;  
+
+  if (cosmicMuonMode_) {  // ---- 1,2 Cosmic Muon --------
+    if (smuons->size() > 2)
+      return;
+    if (tracks->size() != smuons->size())
+      return;
+    if (muons->size() != smuons->size())
+      return;
+    if (gmuons->size() != smuons->size())
+      return;
   }
-  
+
   // ok mc_isolated_mu
   //edm::ESHandle<TrackerGeometry> trackerGeometry;
   //iSetup.get<TrackerDigiGeometryRecord>().get(trackerGeometry);
@@ -646,13 +658,13 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrack
   // don't work
   //edm::ESHandle<CSCGeometry> cscGeometry;
   //iSetup.get<MuonGeometryRecord>().get(cscGeometry);
-  
+
   if (watchTrackingGeometry_.check(iSetup) || !trackingGeometry_) {
     edm::ESHandle<GlobalTrackingGeometry> trackingGeometry;
     iSetup.get<GlobalTrackingGeometryRecord>().get(trackingGeometry);
     trackingGeometry_ = &*trackingGeometry;
   }
-  
+
   if (watchMagneticFieldRecord_.check(iSetup) || !magneticField_) {
     edm::ESHandle<MagneticField> magneticField;
     iSetup.get<IdealMagneticFieldRecord>().get(magneticField);
@@ -663,92 +675,95 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrack
     edm::ESHandle<Alignments> globalPositionRcd;
     iSetup.get<GlobalPositionRcd>().get(globalPositionRcd);
     globalPositionRcd_ = &*globalPositionRcd;
-    for (std::vector<AlignTransform>::const_iterator i 
-	   = globalPositionRcd_->m_align.begin();
-	 i != globalPositionRcd_->m_align.end();  ++i){
-      if(DetId(DetId::Tracker).rawId() == i->rawId()) iteratorTrackerRcd = i;
-      if(DetId(DetId::Muon).rawId() == i->rawId()) iteratorMuonRcd = i;
-      if(DetId(DetId::Ecal).rawId() == i->rawId()) iteratorEcalRcd = i;
-      if(DetId(DetId::Hcal).rawId() == i->rawId()) iteratorHcalRcd = i;
+    for (std::vector<AlignTransform>::const_iterator i = globalPositionRcd_->m_align.begin();
+         i != globalPositionRcd_->m_align.end();
+         ++i) {
+      if (DetId(DetId::Tracker).rawId() == i->rawId())
+        iteratorTrackerRcd = i;
+      if (DetId(DetId::Muon).rawId() == i->rawId())
+        iteratorMuonRcd = i;
+      if (DetId(DetId::Ecal).rawId() == i->rawId())
+        iteratorEcalRcd = i;
+      if (DetId(DetId::Hcal).rawId() == i->rawId())
+        iteratorHcalRcd = i;
     }
-    if(true || debug_){
-      std::cout << "=== iteratorMuonRcd " << iteratorMuonRcd->rawId()<<" ====\n" 
-		<< " translation " << iteratorMuonRcd->translation()<<"\n" 
-		<< " angles " << iteratorMuonRcd->rotation().eulerAngles() << std::endl;
+    if (true || debug_) {
+      std::cout << "=== iteratorMuonRcd " << iteratorMuonRcd->rawId() << " ====\n"
+                << " translation " << iteratorMuonRcd->translation() << "\n"
+                << " angles " << iteratorMuonRcd->rotation().eulerAngles() << std::endl;
       std::cout << iteratorMuonRcd->rotation() << std::endl;
-    }   
-  } // end of GlobalPositionRcd
-  
+    }
+  }  // end of GlobalPositionRcd
+
   ESHandle<Propagator> propagator;
   iSetup.get<TrackingComponentsRecord>().get(propagator_, propagator);
-  
-  SteppingHelixPropagator alongStHePr = 
-    SteppingHelixPropagator(magneticField_, alongMomentum);  
-  SteppingHelixPropagator oppositeStHePr = 
-    SteppingHelixPropagator(magneticField_, oppositeToMomentum);  
+
+  SteppingHelixPropagator alongStHePr = SteppingHelixPropagator(magneticField_, alongMomentum);
+  SteppingHelixPropagator oppositeStHePr = SteppingHelixPropagator(magneticField_, oppositeToMomentum);
 
   //double tolerance = 5.e-5;
-  defaultRKPropagator::Product  aprod( magneticField_, alongMomentum, 5.e-5); auto & alongRKPr = aprod.propagator;
-  defaultRKPropagator::Product  oprod( magneticField_, oppositeToMomentum, 5.e-5); auto & oppositeRKPr = oprod.propagator;
+  defaultRKPropagator::Product aprod(magneticField_, alongMomentum, 5.e-5);
+  auto& alongRKPr = aprod.propagator;
+  defaultRKPropagator::Product oprod(magneticField_, oppositeToMomentum, 5.e-5);
+  auto& oppositeRKPr = oprod.propagator;
 
   float epsilon = 5.;
-  SmartPropagator alongSmPr = 
-    SmartPropagator(alongRKPr, alongStHePr, magneticField_, alongMomentum, epsilon);
-  SmartPropagator oppositeSmPr = 
-    SmartPropagator(oppositeRKPr, oppositeStHePr, magneticField_, oppositeToMomentum, epsilon);
-  
+  SmartPropagator alongSmPr = SmartPropagator(alongRKPr, alongStHePr, magneticField_, alongMomentum, epsilon);
+  SmartPropagator oppositeSmPr =
+      SmartPropagator(oppositeRKPr, oppositeStHePr, magneticField_, oppositeToMomentum, epsilon);
+
   // ................................................ selected/global muon
-  //itMuon -->  Jim's globalMuon  
-  for(MuonCollection::const_iterator itMuon = smuons->begin();
-      itMuon != smuons->end(); ++itMuon) {
-    
-    if(debug_){
-      std::cout<<" mu gM is GM Mu SaM tM "<<itMuon->isGlobalMuon()<<" "
-	       <<itMuon->isMuon()<<" "<<itMuon->isStandAloneMuon()
-	       <<" "<<itMuon->isTrackerMuon()<<" "
-	       <<std::endl;
+  //itMuon -->  Jim's globalMuon
+  for (MuonCollection::const_iterator itMuon = smuons->begin(); itMuon != smuons->end(); ++itMuon) {
+    if (debug_) {
+      std::cout << " mu gM is GM Mu SaM tM " << itMuon->isGlobalMuon() << " " << itMuon->isMuon() << " "
+                << itMuon->isStandAloneMuon() << " " << itMuon->isTrackerMuon() << " " << std::endl;
     }
-    
+
     // get information about the innermost muon hit -------------------------
     TransientTrack muTT(itMuon->outerTrack(), magneticField_, trackingGeometry_);
     TrajectoryStateOnSurface innerMuTSOS = muTT.innermostMeasurementState();
     TrajectoryStateOnSurface outerMuTSOS = muTT.outermostMeasurementState();
-    
+
     // get information about the outermost tracker hit -----------------------
     TransientTrack trackTT(itMuon->track(), magneticField_, trackingGeometry_);
     TrajectoryStateOnSurface outerTrackTSOS = trackTT.outermostMeasurementState();
     TrajectoryStateOnSurface innerTrackTSOS = trackTT.innermostMeasurementState();
-    
-    GlobalPoint pointTrackIn  = innerTrackTSOS.globalPosition();
+
+    GlobalPoint pointTrackIn = innerTrackTSOS.globalPosition();
     GlobalPoint pointTrackOut = outerTrackTSOS.globalPosition();
-    float lenghtTrack = (pointTrackOut-pointTrackIn).mag();
-    GlobalPoint pointMuonIn  = innerMuTSOS.globalPosition();
+    float lenghtTrack = (pointTrackOut - pointTrackIn).mag();
+    GlobalPoint pointMuonIn = innerMuTSOS.globalPosition();
     GlobalPoint pointMuonOut = outerMuTSOS.globalPosition();
     float lenghtMuon = (pointMuonOut - pointMuonIn).mag();
     GlobalVector momentumTrackOut = outerTrackTSOS.globalMomentum();
     GlobalVector momentumTrackIn = innerTrackTSOS.globalMomentum();
-    float distanceInIn   = (pointTrackIn  - pointMuonIn).mag();
-    float distanceInOut  = (pointTrackIn  - pointMuonOut).mag();
-    float distanceOutIn  = (pointTrackOut - pointMuonIn).mag();
+    float distanceInIn = (pointTrackIn - pointMuonIn).mag();
+    float distanceInOut = (pointTrackIn - pointMuonOut).mag();
+    float distanceOutIn = (pointTrackOut - pointMuonIn).mag();
     float distanceOutOut = (pointTrackOut - pointMuonOut).mag();
 
-    if(debug_){
-      std::cout<<" pointTrackIn "<<pointTrackIn<<std::endl;
-      std::cout<<"          Out "<<pointTrackOut<<" lenght "<<lenghtTrack<<std::endl;
-      std::cout<<" point MuonIn "<<pointMuonIn<<std::endl;
-      std::cout<<"          Out "<<pointMuonOut<<" lenght "<<lenghtMuon<<std::endl;
-      std::cout<<" momeTrackIn Out "<<momentumTrackIn<<" "<<momentumTrackOut<<std::endl;
-      std::cout<<" doi io ii oo "<<distanceOutIn<<" "<<distanceInOut<<" "
-	       <<distanceInIn<<" "<<distanceOutOut<<std::endl; 
-  }   
+    if (debug_) {
+      std::cout << " pointTrackIn " << pointTrackIn << std::endl;
+      std::cout << "          Out " << pointTrackOut << " lenght " << lenghtTrack << std::endl;
+      std::cout << " point MuonIn " << pointMuonIn << std::endl;
+      std::cout << "          Out " << pointMuonOut << " lenght " << lenghtMuon << std::endl;
+      std::cout << " momeTrackIn Out " << momentumTrackIn << " " << momentumTrackOut << std::endl;
+      std::cout << " doi io ii oo " << distanceOutIn << " " << distanceInOut << " " << distanceInIn << " "
+                << distanceOutOut << std::endl;
+    }
 
-    if(lenghtTrack < 90.) continue;
-    if(lenghtMuon < 300.) continue;
-    if(momentumTrackIn.mag() < 15. || momentumTrackOut.mag() < 15.) continue;
-    if(trackTT.charge() != muTT.charge()) continue;
+    if (lenghtTrack < 90.)
+      continue;
+    if (lenghtMuon < 300.)
+      continue;
+    if (momentumTrackIn.mag() < 15. || momentumTrackOut.mag() < 15.)
+      continue;
+    if (trackTT.charge() != muTT.charge())
+      continue;
 
-    if(debug_)
-      std::cout<<" passed lenght momentum cuts"<<std::endl;
+    if (debug_)
+      std::cout << " passed lenght momentum cuts" << std::endl;
 
     GlobalVector GRm, GPm, Nl, Rm, Pm, Rt, Pt, Rt0;
     AlgebraicSymMatrix66 Cm, C0, Ce, C1;
@@ -756,297 +771,289 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrack
     TrajectoryStateOnSurface extrapolationT;
     int tsosMuonIf = 0;
 
-    if( isolatedMuonMode_ ){      //------------------------------- Isolated Muon -----
-      const Surface& refSurface = innerMuTSOS.surface(); 
-      ConstReferenceCountingPointer<TangentPlane> 
-	tpMuLocal(refSurface.tangentPlane(innerMuTSOS.localPosition()));
+    if (isolatedMuonMode_) {  //------------------------------- Isolated Muon -----
+      const Surface& refSurface = innerMuTSOS.surface();
+      ConstReferenceCountingPointer<TangentPlane> tpMuLocal(refSurface.tangentPlane(innerMuTSOS.localPosition()));
       Nl = tpMuLocal->normalVector();
-      ConstReferenceCountingPointer<TangentPlane> 
-      tpMuGlobal(refSurface.tangentPlane(innerMuTSOS.globalPosition()));
+      ConstReferenceCountingPointer<TangentPlane> tpMuGlobal(refSurface.tangentPlane(innerMuTSOS.globalPosition()));
       GlobalVector Ng = tpMuGlobal->normalVector();
       Surface* surf = (Surface*)&refSurface;
-      const Plane* refPlane = dynamic_cast<Plane*>(surf); 
+      const Plane* refPlane = dynamic_cast<Plane*>(surf);
       GlobalVector Nlp = refPlane->normalVector();
-      
-      if(debug_){
-	std::cout<<" Nlocal "<<Nl.x()<<" "<<Nl.y()<<" "<<Nl.z()<<" "
-	 <<" alfa "<<int(asin(Nl.x())*57.29578)<<std::endl;
-	std::cout<<"  global "<<Ng.x()<<" "<<Ng.y()<<" "<<Ng.z()<<std::endl;
-	std::cout<<"      lp "<<Nlp.x()<<" "<<Nlp.y()<<" "<<Nlp.z()<<std::endl;
-	//std::cout<<" Nlocal Nglobal "<<Nl.x()<<" "<<Nl.y()<<" "<<Nl.z()<<" "
-	// <<Ng.x()<<" "<<Ng.y()<<" "<<Ng.z()
-	//<<" alfa "<<int(asin(Nl.x())*57.29578)<<std::endl;
+
+      if (debug_) {
+        std::cout << " Nlocal " << Nl.x() << " " << Nl.y() << " " << Nl.z() << " "
+                  << " alfa " << int(asin(Nl.x()) * 57.29578) << std::endl;
+        std::cout << "  global " << Ng.x() << " " << Ng.y() << " " << Ng.z() << std::endl;
+        std::cout << "      lp " << Nlp.x() << " " << Nlp.y() << " " << Nlp.z() << std::endl;
+        //std::cout<<" Nlocal Nglobal "<<Nl.x()<<" "<<Nl.y()<<" "<<Nl.z()<<" "
+        // <<Ng.x()<<" "<<Ng.y()<<" "<<Ng.z()
+        //<<" alfa "<<int(asin(Nl.x())*57.29578)<<std::endl;
       }
 
-      //                          extrapolation to innermost muon hit     
+      //                          extrapolation to innermost muon hit
       extrapolationT = alongSmPr.propagate(outerTrackTSOS, refSurface);
       //extrapolationT = propagator->propagate(outerTrackTSOS, refSurface);
-      
-      if(!extrapolationT.isValid()){
-	if(false & alarm)
-	  std::cout<<" !!!!!!!!! Catastrophe Out-In extrapolationT.isValid "
-	    //<<"\a\a\a\a\a\a\a\a"<<extrapolationT.isValid()
-		   <<std::endl;
-	continue;
+
+      if (!extrapolationT.isValid()) {
+        if (false & alarm)
+          std::cout << " !!!!!!!!! Catastrophe Out-In extrapolationT.isValid "
+                    //<<"\a\a\a\a\a\a\a\a"<<extrapolationT.isValid()
+                    << std::endl;
+        continue;
       }
       tsosMuonIf = 1;
       Rt = GlobalVector((extrapolationT.globalPosition()).x(),
-			(extrapolationT.globalPosition()).y(),
-			(extrapolationT.globalPosition()).z());
-      
+                        (extrapolationT.globalPosition()).y(),
+                        (extrapolationT.globalPosition()).z());
+
       Pt = extrapolationT.globalMomentum();
       //                          global parameters of muon
-      GRm = GlobalVector((innerMuTSOS.globalPosition()).x(),
-			 (innerMuTSOS.globalPosition()).y(),
-			 (innerMuTSOS.globalPosition()).z());
+      GRm = GlobalVector(
+          (innerMuTSOS.globalPosition()).x(), (innerMuTSOS.globalPosition()).y(), (innerMuTSOS.globalPosition()).z());
       GPm = innerMuTSOS.globalMomentum();
       Rt0 = GlobalVector((outerTrackTSOS.globalPosition()).x(),
-			 (outerTrackTSOS.globalPosition()).y(),
-			 (outerTrackTSOS.globalPosition()).z());
-      Cm = AlgebraicSymMatrix66 (extrapolationT.cartesianError().matrix() + 
-				 innerMuTSOS.cartesianError().matrix());
-      C0 = AlgebraicSymMatrix66(outerTrackTSOS.cartesianError().matrix()); 		   
-      Ce = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix()); 
+                         (outerTrackTSOS.globalPosition()).y(),
+                         (outerTrackTSOS.globalPosition()).z());
+      Cm = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix() + innerMuTSOS.cartesianError().matrix());
+      C0 = AlgebraicSymMatrix66(outerTrackTSOS.cartesianError().matrix());
+      Ce = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix());
       C1 = AlgebraicSymMatrix66(innerMuTSOS.cartesianError().matrix());
-     
+
     }  //                    -------------------------------   end Isolated Muon -----
-    
-    
-    if( cosmicMuonMode_ ){      //------------------------------- Cosmic Muon -----
-
-      if((distanceOutIn <= distanceInOut) & (distanceOutIn <= distanceInIn) & 
-	 (distanceOutIn <= distanceOutOut)){             // ----- Out - In ------    
-	if(debug_) std::cout<<" -----    Out - In -----"<<std::endl;
-
-        const Surface& refSurface = innerMuTSOS.surface(); 
-	ConstReferenceCountingPointer<TangentPlane> 
-	  tpMuGlobal(refSurface.tangentPlane(innerMuTSOS.globalPosition()));
-	Nl = tpMuGlobal->normalVector();
-
-	//                          extrapolation to innermost muon hit     
-	extrapolationT = alongSmPr.propagate(outerTrackTSOS, refSurface);
-	//extrapolationT = propagator->propagate(outerTrackTSOS, refSurface);
-
-	if(!extrapolationT.isValid()){
-	  if(false & alarm)
-	    std::cout<<" !!!!!!!!! Catastrophe Out-In extrapolationT.isValid "
-	      //<<"\a\a\a\a\a\a\a\a"<<extrapolationT.isValid()
-		     <<std::endl;
-	  continue;
-	}
-	if(debug_)
-	  std::cout<<" extrapolationT.isValid "<<extrapolationT.isValid()<<std::endl; 
-
-	tsosMuonIf = 1;
-	Rt = GlobalVector((extrapolationT.globalPosition()).x(),
-			  (extrapolationT.globalPosition()).y(),
-			  (extrapolationT.globalPosition()).z());
-	
-	Pt = extrapolationT.globalMomentum();
-	//                          global parameters of muon
-	GRm = GlobalVector((innerMuTSOS.globalPosition()).x(),
-			   (innerMuTSOS.globalPosition()).y(),
-			   (innerMuTSOS.globalPosition()).z());
-	GPm = innerMuTSOS.globalMomentum();
-	Rt0 = GlobalVector((outerTrackTSOS.globalPosition()).x(),
-			   (outerTrackTSOS.globalPosition()).y(),
-			   (outerTrackTSOS.globalPosition()).z());
-	Cm = AlgebraicSymMatrix66 (extrapolationT.cartesianError().matrix() + 
-				   innerMuTSOS.cartesianError().matrix());
-	C0 = AlgebraicSymMatrix66(outerTrackTSOS.cartesianError().matrix()); 		   
-	Ce = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix()); 
-	C1 = AlgebraicSymMatrix66(innerMuTSOS.cartesianError().matrix());
-	
-	if(false & debug_){
-	  //std::cout<<" ->propDir "<<propagator->propagationDirection()<<std::endl;
-	  PropagationDirectionChooser Chooser;
-	  std::cout<<" propDirCh "
-		   <<Chooser.operator()(*outerTrackTSOS.freeState(), refSurface)
-		   <<" Ch == along "<<(alongMomentum == 
-				       Chooser.operator()(*outerTrackTSOS.freeState(), refSurface))
-		   <<std::endl;
-	  std::cout<<" --- Nlocal "<<Nl.x()<<" "<<Nl.y()<<" "<<Nl.z()<<" "
-		   <<" alfa "<<int(asin(Nl.x())*57.29578)<<std::endl;
-	}
-      }           //                                       enf of ---- Out - In -----
-      
-
-      else if((distanceInOut <= distanceInIn) & (distanceInOut <= distanceOutIn) & 
-	      (distanceInOut <= distanceOutOut)){            // ----- In - Out ------    
-	if(debug_) std::cout<<" -----    In - Out -----"<<std::endl;
-
-	const Surface& refSurface = outerMuTSOS.surface(); 
-	ConstReferenceCountingPointer<TangentPlane> 
-	  tpMuGlobal(refSurface.tangentPlane(outerMuTSOS.globalPosition()));
-	Nl = tpMuGlobal->normalVector();
-		
-	//                          extrapolation to outermost muon hit     
-	extrapolationT = oppositeSmPr.propagate(innerTrackTSOS, refSurface);
-
-	if(!extrapolationT.isValid()){
-	  if(false & alarm)
-	    std::cout<<" !!!!!!!!! Catastrophe Out-In extrapolationT.isValid "
-	      <<"\a\a\a\a\a\a\a\a"<<extrapolationT.isValid()
-		     <<std::endl;
-	  continue;
-	}
-	if(debug_)
-	  std::cout<<" extrapolationT.isValid "<<extrapolationT.isValid()<<std::endl; 
-	
-	tsosMuonIf = 2;
-	Rt = GlobalVector((extrapolationT.globalPosition()).x(),
-			  (extrapolationT.globalPosition()).y(),
-			  (extrapolationT.globalPosition()).z());
-	
-	Pt = extrapolationT.globalMomentum();
-	//                          global parameters of muon
-	GRm = GlobalVector((outerMuTSOS.globalPosition()).x(),
-			   (outerMuTSOS.globalPosition()).y(),
-			   (outerMuTSOS.globalPosition()).z());
-	GPm = outerMuTSOS.globalMomentum();
-	Rt0 = GlobalVector((innerTrackTSOS.globalPosition()).x(),
-			   (innerTrackTSOS.globalPosition()).y(),
-			   (innerTrackTSOS.globalPosition()).z());
-	Cm = AlgebraicSymMatrix66 (extrapolationT.cartesianError().matrix() + 
-				   outerMuTSOS.cartesianError().matrix());
-	C0 = AlgebraicSymMatrix66(innerTrackTSOS.cartesianError().matrix()); 		   
-	Ce = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix()); 
-	C1 = AlgebraicSymMatrix66(outerMuTSOS.cartesianError().matrix());
-	
-	if(false & debug_){
-	  //std::cout<<" ->propDir "<<propagator->propagationDirection()<<std::endl;
-	  PropagationDirectionChooser Chooser;
-	  std::cout<<" propDirCh "
-		   <<Chooser.operator()(*innerTrackTSOS.freeState(), refSurface)
-		   <<" Ch == oppisite "<<(oppositeToMomentum == 
-					  Chooser.operator()(*innerTrackTSOS.freeState(), refSurface))
-		   <<std::endl;
-	  std::cout<<" --- Nlocal "<<Nl.x()<<" "<<Nl.y()<<" "<<Nl.z()<<" "
-		   <<" alfa "<<int(asin(Nl.x())*57.29578)<<std::endl;
-	}
-      }           //                                        enf of ---- In - Out -----
-
-      else if((distanceOutOut <= distanceInOut) & (distanceOutOut <= distanceInIn) & 
-	      (distanceOutOut <= distanceOutIn)){          // ----- Out - Out ------    
-	if(debug_) std::cout<<" -----    Out - Out -----"<<std::endl;
-
-	// reject: momentum of track has opposite direction to muon track
-	continue;
-
-	const Surface& refSurface = outerMuTSOS.surface(); 
-	ConstReferenceCountingPointer<TangentPlane> 
-	  tpMuGlobal(refSurface.tangentPlane(outerMuTSOS.globalPosition()));
-	Nl = tpMuGlobal->normalVector();
-		
-	//                          extrapolation to outermost muon hit     
-	extrapolationT = alongSmPr.propagate(outerTrackTSOS, refSurface);
-
-	if(!extrapolationT.isValid()){
-	  if(alarm)
-	    std::cout<<" !!!!!!!!! Catastrophe Out-Out extrapolationT.isValid "
-		     <<"\a\a\a\a\a\a\a\a"<<extrapolationT.isValid()
-		     <<std::endl;
-	  continue;
-	}
-	if(debug_)
-	  std::cout<<" extrapolationT.isValid "<<extrapolationT.isValid()<<std::endl; 
-
-	tsosMuonIf = 2;
-	Rt = GlobalVector((extrapolationT.globalPosition()).x(),
-			  (extrapolationT.globalPosition()).y(),
-			  (extrapolationT.globalPosition()).z());
-	
-	Pt = extrapolationT.globalMomentum();
-	//                          global parameters of muon
-	GRm = GlobalVector((outerMuTSOS.globalPosition()).x(),
-			   (outerMuTSOS.globalPosition()).y(),
-			   (outerMuTSOS.globalPosition()).z());
-	GPm = outerMuTSOS.globalMomentum();
-	Rt0 = GlobalVector((outerTrackTSOS.globalPosition()).x(),
-			   (outerTrackTSOS.globalPosition()).y(),
-			   (outerTrackTSOS.globalPosition()).z());
-	Cm = AlgebraicSymMatrix66 (extrapolationT.cartesianError().matrix() + 
-				   outerMuTSOS.cartesianError().matrix());
-	C0 = AlgebraicSymMatrix66(outerTrackTSOS.cartesianError().matrix()); 		   
-	Ce = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix()); 
-	C1 = AlgebraicSymMatrix66(outerMuTSOS.cartesianError().matrix());
-	
-	if(debug_){
-	  PropagationDirectionChooser Chooser;
-	  std::cout<<" propDirCh "
-		   <<Chooser.operator()(*outerTrackTSOS.freeState(), refSurface)
-		   <<" Ch == along "<<(alongMomentum == 
-				       Chooser.operator()(*outerTrackTSOS.freeState(), refSurface))
-		   <<std::endl;
-	  std::cout<<" --- Nlocal "<<Nl.x()<<" "<<Nl.y()<<" "<<Nl.z()<<" "
-		   <<" alfa "<<int(asin(Nl.x())*57.29578)<<std::endl;
-	  std::cout<<"     Nornal "<<Nl.x()<<" "<<Nl.y()<<" "<<Nl.z()<<" "
-		   <<" alfa "<<int(asin(Nl.x())*57.29578)<<std::endl;
-	}
-      }           //                                       enf of ---- Out - Out -----
-      else{
-	if(alarm)
-	  std::cout<<" ------- !!!!!!!!!!!!!!! No proper Out - In \a\a\a\a\a\a\a"<<std::endl; 
-	continue;
+
+    if (cosmicMuonMode_) {  //------------------------------- Cosmic Muon -----
+
+      if ((distanceOutIn <= distanceInOut) & (distanceOutIn <= distanceInIn) &
+          (distanceOutIn <= distanceOutOut)) {  // ----- Out - In ------
+        if (debug_)
+          std::cout << " -----    Out - In -----" << std::endl;
+
+        const Surface& refSurface = innerMuTSOS.surface();
+        ConstReferenceCountingPointer<TangentPlane> tpMuGlobal(refSurface.tangentPlane(innerMuTSOS.globalPosition()));
+        Nl = tpMuGlobal->normalVector();
+
+        //                          extrapolation to innermost muon hit
+        extrapolationT = alongSmPr.propagate(outerTrackTSOS, refSurface);
+        //extrapolationT = propagator->propagate(outerTrackTSOS, refSurface);
+
+        if (!extrapolationT.isValid()) {
+          if (false & alarm)
+            std::cout << " !!!!!!!!! Catastrophe Out-In extrapolationT.isValid "
+                      //<<"\a\a\a\a\a\a\a\a"<<extrapolationT.isValid()
+                      << std::endl;
+          continue;
+        }
+        if (debug_)
+          std::cout << " extrapolationT.isValid " << extrapolationT.isValid() << std::endl;
+
+        tsosMuonIf = 1;
+        Rt = GlobalVector((extrapolationT.globalPosition()).x(),
+                          (extrapolationT.globalPosition()).y(),
+                          (extrapolationT.globalPosition()).z());
+
+        Pt = extrapolationT.globalMomentum();
+        //                          global parameters of muon
+        GRm = GlobalVector(
+            (innerMuTSOS.globalPosition()).x(), (innerMuTSOS.globalPosition()).y(), (innerMuTSOS.globalPosition()).z());
+        GPm = innerMuTSOS.globalMomentum();
+        Rt0 = GlobalVector((outerTrackTSOS.globalPosition()).x(),
+                           (outerTrackTSOS.globalPosition()).y(),
+                           (outerTrackTSOS.globalPosition()).z());
+        Cm = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix() + innerMuTSOS.cartesianError().matrix());
+        C0 = AlgebraicSymMatrix66(outerTrackTSOS.cartesianError().matrix());
+        Ce = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix());
+        C1 = AlgebraicSymMatrix66(innerMuTSOS.cartesianError().matrix());
+
+        if (false & debug_) {
+          //std::cout<<" ->propDir "<<propagator->propagationDirection()<<std::endl;
+          PropagationDirectionChooser Chooser;
+          std::cout << " propDirCh " << Chooser.operator()(*outerTrackTSOS.freeState(), refSurface) << " Ch == along "
+                    << (alongMomentum == Chooser.operator()(*outerTrackTSOS.freeState(), refSurface)) << std::endl;
+          std::cout << " --- Nlocal " << Nl.x() << " " << Nl.y() << " " << Nl.z() << " "
+                    << " alfa " << int(asin(Nl.x()) * 57.29578) << std::endl;
+        }
+      }  //                                       enf of ---- Out - In -----
+
+      else if ((distanceInOut <= distanceInIn) & (distanceInOut <= distanceOutIn) &
+               (distanceInOut <= distanceOutOut)) {  // ----- In - Out ------
+        if (debug_)
+          std::cout << " -----    In - Out -----" << std::endl;
+
+        const Surface& refSurface = outerMuTSOS.surface();
+        ConstReferenceCountingPointer<TangentPlane> tpMuGlobal(refSurface.tangentPlane(outerMuTSOS.globalPosition()));
+        Nl = tpMuGlobal->normalVector();
+
+        //                          extrapolation to outermost muon hit
+        extrapolationT = oppositeSmPr.propagate(innerTrackTSOS, refSurface);
+
+        if (!extrapolationT.isValid()) {
+          if (false & alarm)
+            std::cout << " !!!!!!!!! Catastrophe Out-In extrapolationT.isValid "
+                      << "\a\a\a\a\a\a\a\a" << extrapolationT.isValid() << std::endl;
+          continue;
+        }
+        if (debug_)
+          std::cout << " extrapolationT.isValid " << extrapolationT.isValid() << std::endl;
+
+        tsosMuonIf = 2;
+        Rt = GlobalVector((extrapolationT.globalPosition()).x(),
+                          (extrapolationT.globalPosition()).y(),
+                          (extrapolationT.globalPosition()).z());
+
+        Pt = extrapolationT.globalMomentum();
+        //                          global parameters of muon
+        GRm = GlobalVector(
+            (outerMuTSOS.globalPosition()).x(), (outerMuTSOS.globalPosition()).y(), (outerMuTSOS.globalPosition()).z());
+        GPm = outerMuTSOS.globalMomentum();
+        Rt0 = GlobalVector((innerTrackTSOS.globalPosition()).x(),
+                           (innerTrackTSOS.globalPosition()).y(),
+                           (innerTrackTSOS.globalPosition()).z());
+        Cm = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix() + outerMuTSOS.cartesianError().matrix());
+        C0 = AlgebraicSymMatrix66(innerTrackTSOS.cartesianError().matrix());
+        Ce = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix());
+        C1 = AlgebraicSymMatrix66(outerMuTSOS.cartesianError().matrix());
+
+        if (false & debug_) {
+          //std::cout<<" ->propDir "<<propagator->propagationDirection()<<std::endl;
+          PropagationDirectionChooser Chooser;
+          std::cout << " propDirCh " << Chooser.operator()(*innerTrackTSOS.freeState(), refSurface)
+                    << " Ch == oppisite "
+                    << (oppositeToMomentum == Chooser.operator()(*innerTrackTSOS.freeState(), refSurface)) << std::endl;
+          std::cout << " --- Nlocal " << Nl.x() << " " << Nl.y() << " " << Nl.z() << " "
+                    << " alfa " << int(asin(Nl.x()) * 57.29578) << std::endl;
+        }
+      }  //                                        enf of ---- In - Out -----
+
+      else if ((distanceOutOut <= distanceInOut) & (distanceOutOut <= distanceInIn) &
+               (distanceOutOut <= distanceOutIn)) {  // ----- Out - Out ------
+        if (debug_)
+          std::cout << " -----    Out - Out -----" << std::endl;
+
+        // reject: momentum of track has opposite direction to muon track
+        continue;
+
+        const Surface& refSurface = outerMuTSOS.surface();
+        ConstReferenceCountingPointer<TangentPlane> tpMuGlobal(refSurface.tangentPlane(outerMuTSOS.globalPosition()));
+        Nl = tpMuGlobal->normalVector();
+
+        //                          extrapolation to outermost muon hit
+        extrapolationT = alongSmPr.propagate(outerTrackTSOS, refSurface);
+
+        if (!extrapolationT.isValid()) {
+          if (alarm)
+            std::cout << " !!!!!!!!! Catastrophe Out-Out extrapolationT.isValid "
+                      << "\a\a\a\a\a\a\a\a" << extrapolationT.isValid() << std::endl;
+          continue;
+        }
+        if (debug_)
+          std::cout << " extrapolationT.isValid " << extrapolationT.isValid() << std::endl;
+
+        tsosMuonIf = 2;
+        Rt = GlobalVector((extrapolationT.globalPosition()).x(),
+                          (extrapolationT.globalPosition()).y(),
+                          (extrapolationT.globalPosition()).z());
+
+        Pt = extrapolationT.globalMomentum();
+        //                          global parameters of muon
+        GRm = GlobalVector(
+            (outerMuTSOS.globalPosition()).x(), (outerMuTSOS.globalPosition()).y(), (outerMuTSOS.globalPosition()).z());
+        GPm = outerMuTSOS.globalMomentum();
+        Rt0 = GlobalVector((outerTrackTSOS.globalPosition()).x(),
+                           (outerTrackTSOS.globalPosition()).y(),
+                           (outerTrackTSOS.globalPosition()).z());
+        Cm = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix() + outerMuTSOS.cartesianError().matrix());
+        C0 = AlgebraicSymMatrix66(outerTrackTSOS.cartesianError().matrix());
+        Ce = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix());
+        C1 = AlgebraicSymMatrix66(outerMuTSOS.cartesianError().matrix());
+
+        if (debug_) {
+          PropagationDirectionChooser Chooser;
+          std::cout << " propDirCh " << Chooser.operator()(*outerTrackTSOS.freeState(), refSurface) << " Ch == along "
+                    << (alongMomentum == Chooser.operator()(*outerTrackTSOS.freeState(), refSurface)) << std::endl;
+          std::cout << " --- Nlocal " << Nl.x() << " " << Nl.y() << " " << Nl.z() << " "
+                    << " alfa " << int(asin(Nl.x()) * 57.29578) << std::endl;
+          std::cout << "     Nornal " << Nl.x() << " " << Nl.y() << " " << Nl.z() << " "
+                    << " alfa " << int(asin(Nl.x()) * 57.29578) << std::endl;
+        }
+      }  //                                       enf of ---- Out - Out -----
+      else {
+        if (alarm)
+          std::cout << " ------- !!!!!!!!!!!!!!! No proper Out - In \a\a\a\a\a\a\a" << std::endl;
+        continue;
       }
-      
+
     }  //                     -------------------------------   end Cosmic Muon -----
-    
-    if(tsosMuonIf == 0) {if(info) {std::cout<<"No tsosMuon !!!!!!"<<std::endl; continue;}}
+
+    if (tsosMuonIf == 0) {
+      if (info) {
+        std::cout << "No tsosMuon !!!!!!" << std::endl;
+        continue;
+      }
+    }
     TrajectoryStateOnSurface tsosMuon;
-    if(tsosMuonIf == 1) tsosMuon = muTT.innermostMeasurementState();
-    else tsosMuon = muTT.outermostMeasurementState();
+    if (tsosMuonIf == 1)
+      tsosMuon = muTT.innermostMeasurementState();
+    else
+      tsosMuon = muTT.outermostMeasurementState();
 
     //GlobalTrackerMuonAlignment::misalignMuon(GRm, GPm, Nl, Rt, Rm, Pm);
     AlgebraicVector4 LPRm;  // muon local (dx/dz, dy/dz, x, y)
-    GlobalTrackerMuonAlignment::misalignMuonL
-    (GRm, GPm, Nl, Rt, Rm, Pm, LPRm, extrapolationT, tsosMuon);
+    GlobalTrackerMuonAlignment::misalignMuonL(GRm, GPm, Nl, Rt, Rm, Pm, LPRm, extrapolationT, tsosMuon);
 
     GlobalVector resR = Rm - Rt;
     GlobalVector resP0 = Pm - Pt;
     GlobalVector resP = Pm / Pm.mag() - Pt / Pt.mag();
-    float RelMomResidual = (Pm.mag() - Pt.mag()) / (Pt.mag() + 1.e-6);;
+    float RelMomResidual = (Pm.mag() - Pt.mag()) / (Pt.mag() + 1.e-6);
+    ;
 
     AlgebraicVector6 Vm;
-    Vm(0) = resR.x();  Vm(1) = resR.y();  Vm(2) = resR.z(); 
-    Vm(3) = resP0.x();  Vm(4) = resP0.y();  Vm(5) = resP0.z(); 
+    Vm(0) = resR.x();
+    Vm(1) = resR.y();
+    Vm(2) = resR.z();
+    Vm(3) = resP0.x();
+    Vm(4) = resP0.y();
+    Vm(5) = resP0.z();
     float Rmuon = Rm.perp();
     float Zmuon = Rm.z();
-    float alfa_x = atan2(Nl.x(),Nl.y())*57.29578;
-    
-    if(debug_){
-      std::cout<<" Nx Ny Nz alfa_x "<<Nl.x()<<" "<<Nl.y()<<" "<<Nl.z()<<" "<<alfa_x<<std::endl;
+    float alfa_x = atan2(Nl.x(), Nl.y()) * 57.29578;
+
+    if (debug_) {
+      std::cout << " Nx Ny Nz alfa_x " << Nl.x() << " " << Nl.y() << " " << Nl.z() << " " << alfa_x << std::endl;
       //std::cout<<" Rm "<<Rm<<std::endl<<" Rt "<<Rt<<std::endl<<" resR "<<resR<<std::endl
       //       <<" resP "<<resP<<" dp/p "<<RelMomResidual<<std::endl;
     }
 
     double chi_d = 0;
-    for(int i=0; i<=5; i++) chi_d += Vm(i)*Vm(i)/Cm(i,i);
-        
-    AlgebraicVector5 Vml(tsosMuon.localParameters().vector() 
-		       - extrapolationT.localParameters().vector());
+    for (int i = 0; i <= 5; i++)
+      chi_d += Vm(i) * Vm(i) / Cm(i, i);
+
+    AlgebraicVector5 Vml(tsosMuon.localParameters().vector() - extrapolationT.localParameters().vector());
     AlgebraicSymMatrix55 m(tsosMuon.localError().matrix() + extrapolationT.localError().matrix());
     AlgebraicSymMatrix55 Cml(tsosMuon.localError().matrix() + extrapolationT.localError().matrix());
     bool ierrLoc = !m.Invert();
-    if (ierrLoc && debug_ && info) { 
-      std::cout<< " ==== Error inverting Local covariance matrix ==== "<<std::endl;
-      continue;}
-    double chi_Loc = ROOT::Math::Similarity(Vml,m);
-    if(debug_)
-      std::cout<<" chi_Loc px/pz/err "<<chi_Loc<<" "<<Vml(1)/sqrt(Cml(1,1))<<std::endl;
-
-    if(Pt.mag() < 15.) continue;
-    if(Pm.mag() <  5.) continue;
- 
+    if (ierrLoc && debug_ && info) {
+      std::cout << " ==== Error inverting Local covariance matrix ==== " << std::endl;
+      continue;
+    }
+    double chi_Loc = ROOT::Math::Similarity(Vml, m);
+    if (debug_)
+      std::cout << " chi_Loc px/pz/err " << chi_Loc << " " << Vml(1) / sqrt(Cml(1, 1)) << std::endl;
+
+    if (Pt.mag() < 15.)
+      continue;
+    if (Pm.mag() < 5.)
+      continue;
+
     //if(Pt.mag() < 30.) continue;          // momenum cut  < 30GeV
     //if(Pt.mag() < 60.) continue;          // momenum cut  < 30GeV
     //if(Pt.mag() > 50.) continue;          //  momenum cut > 50GeV
     //if(Pt.mag() > 100.) continue;          //  momenum cut > 100GeV
     //if(trackTT.charge() < 0) continue;    // select positive charge
     //if(trackTT.charge() > 0) continue;    // select negative charge
-    
-    //if(fabs(resR.x()) > 5.) continue;     // strong cut  X 
-    //if(fabs(resR.y()) > 5.) continue;     //             Y 
+
+    //if(fabs(resR.x()) > 5.) continue;     // strong cut  X
+    //if(fabs(resR.y()) > 5.) continue;     //             Y
     //if(fabs(resR.z()) > 5.) continue;     //             Z
     //if(fabs(resR.mag()) > 7.5) continue;   //            dR
 
@@ -1062,8 +1069,8 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrack
     if(chi_d > 40.) continue;
     */
 
-    //                                            select Barrel 
-    //if(Rmuon < 400. || Rmuon > 450.) continue; 
+    //                                            select Barrel
+    //if(Rmuon < 400. || Rmuon > 450.) continue;
     //if(Zmuon < -600. || Zmuon > 600.) continue;
     //if(fabs(Nl.z()) > 0.95) continue;
     //MuSelect = " Barrel";
@@ -1071,51 +1078,51 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrack
     //if(Rmuon < 120. || Rmuon > 450.) continue;
     //if(Zmuon < -720.) continue;
     //if(Zmuon > -580.) continue;
-    //if(fabs(Nl.z()) < 0.95) continue;  
+    //if(fabs(Nl.z()) < 0.95) continue;
     //MuSelect = " EndCap1";
     //                                                  EndCap2
     //if(Rmuon < 120. || Rmuon > 450.) continue;
     //if(Zmuon >  720.) continue;
     //if(Zmuon <  580.) continue;
-    //if(fabs(Nl.z()) < 0.95) continue;  
+    //if(fabs(Nl.z()) < 0.95) continue;
     //MuSelect = " EndCap2";
     //                                                 select All
-    if(Rmuon < 120. || Rmuon > 450.) continue;  
-    if(Zmuon < -720. || Zmuon > 720.) continue;
+    if (Rmuon < 120. || Rmuon > 450.)
+      continue;
+    if (Zmuon < -720. || Zmuon > 720.)
+      continue;
     MuSelect = " Barrel+EndCaps";
 
-    
-    if(debug_)
-      std::cout<<" .............. passed all cuts"<<std::endl;
-        
+    if (debug_)
+      std::cout << " .............. passed all cuts" << std::endl;
+
     N_track++;
     //                     gradient and Hessian for each track
-    
+
     GlobalTrackerMuonAlignment::gradientGlobalAlg(Rt, Pt, Rm, Nl, Cm);
-    GlobalTrackerMuonAlignment::gradientGlobal(Rt, Pt, Rm, Pm, Nl, Cm); 
-
-    CLHEP::HepSymMatrix covLoc(4,0);
-    for(int i=1; i<=4; i++)
-      for(int j=1; j<=i; j++){
-	covLoc(i,j) = (tsosMuon.localError().matrix()
-		       + extrapolationT.localError().matrix())(i,j);
-	//if(i != j) Cov(i,j) = 0.;
+    GlobalTrackerMuonAlignment::gradientGlobal(Rt, Pt, Rm, Pm, Nl, Cm);
+
+    CLHEP::HepSymMatrix covLoc(4, 0);
+    for (int i = 1; i <= 4; i++)
+      for (int j = 1; j <= i; j++) {
+        covLoc(i, j) = (tsosMuon.localError().matrix() + extrapolationT.localError().matrix())(i, j);
+        //if(i != j) Cov(i,j) = 0.;
       }
 
-    const Surface& refSurface = tsosMuon.surface(); 
-    CLHEP::HepMatrix rotLoc (3,3,0);
-    rotLoc(1,1) = refSurface.rotation().xx();
-    rotLoc(1,2) = refSurface.rotation().xy();
-    rotLoc(1,3) = refSurface.rotation().xz();
-    
-    rotLoc(2,1) = refSurface.rotation().yx();
-    rotLoc(2,2) = refSurface.rotation().yy();
-    rotLoc(2,3) = refSurface.rotation().yz();
-    
-    rotLoc(3,1) = refSurface.rotation().zx();
-    rotLoc(3,2) = refSurface.rotation().zy();
-    rotLoc(3,3) = refSurface.rotation().zz();
-    
+    const Surface& refSurface = tsosMuon.surface();
+    CLHEP::HepMatrix rotLoc(3, 3, 0);
+    rotLoc(1, 1) = refSurface.rotation().xx();
+    rotLoc(1, 2) = refSurface.rotation().xy();
+    rotLoc(1, 3) = refSurface.rotation().xz();
+
+    rotLoc(2, 1) = refSurface.rotation().yx();
+    rotLoc(2, 2) = refSurface.rotation().yy();
+    rotLoc(2, 3) = refSurface.rotation().yz();
+
+    rotLoc(3, 1) = refSurface.rotation().zx();
+    rotLoc(3, 2) = refSurface.rotation().zy();
+    rotLoc(3, 3) = refSurface.rotation().zz();
+
     CLHEP::HepVector posLoc(3);
     posLoc(1) = refSurface.position().x();
     posLoc(2) = refSurface.position().y();
@@ -1123,143 +1130,147 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrack
 
     GlobalTrackerMuonAlignment::gradientLocal(Rt, Pt, Rm, Pm, Nl, covLoc, rotLoc, posLoc, LPRm);
 
-    if(debug_){
-      std::cout<<" Norm   "<<Nl<<std::endl;
-      std::cout<<" posLoc "<<posLoc.T()<<std::endl;
-      std::cout<<" rotLoc "<<rotLoc<<std::endl;
+    if (debug_) {
+      std::cout << " Norm   " << Nl << std::endl;
+      std::cout << " posLoc " << posLoc.T() << std::endl;
+      std::cout << " rotLoc " << rotLoc << std::endl;
     }
 
-    // -----------------------------------------------------  fill histogram 
-    histo->Fill(itMuon->track()->pt()); 
-    
-    //histo2->Fill(itMuon->track()->outerP()); 
-    histo2->Fill(Pt.mag()); 
-    histo3->Fill((PI/2.-itMuon->track()->outerTheta())); 
-    histo4->Fill(itMuon->track()->phi()); 
-    histo5->Fill(Rmuon); 
-    histo6->Fill(Zmuon); 
-    histo7->Fill(RelMomResidual); 
-    //histo8->Fill(chi); 
-    histo8->Fill(chi_d); 
-    
-    histo101->Fill(Zmuon, Rmuon); 
-    histo101->Fill(Rt0.z(), Rt0.perp()); 
-    histo102->Fill(Rt0.x(), Rt0.y()); 
-    histo102->Fill(Rm.x(), Rm.y()); 
-    
-    histo11->Fill(resR.mag()); 
-    if(fabs(Nl.x()) < 0.98) histo12->Fill(resR.x()); 
-    if(fabs(Nl.y()) < 0.98) histo13->Fill(resR.y()); 
-    if(fabs(Nl.z()) < 0.98) histo14->Fill(resR.z()); 
-    histo15->Fill(resP.x()); 
-    histo16->Fill(resP.y()); 
-    histo17->Fill(resP.z()); 
-    
-    if((fabs(Nl.x()) < 0.98) && (fabs(Nl.y()) < 0.98) &&(fabs(Nl.z()) < 0.98))
-      { 
-	histo18->Fill(sqrt(C0(0,0))); 
-	histo19->Fill(sqrt(C1(0,0))); 
-	histo20->Fill(sqrt(C1(0,0)+Ce(0,0))); 		   
-      }
-    if(fabs(Nl.x()) < 0.98) histo21->Fill(Vm(0)/sqrt(Cm(0,0))); 
-    if(fabs(Nl.y()) < 0.98) histo22->Fill(Vm(1)/sqrt(Cm(1,1))); 
-    if(fabs(Nl.z()) < 0.98) histo23->Fill(Vm(2)/sqrt(Cm(2,2))); 
-    histo24->Fill(Vm(3)/sqrt(C1(3,3)+Ce(3,3))); 
-    histo25->Fill(Vm(4)/sqrt(C1(4,4)+Ce(4,4))); 
-    histo26->Fill(Vm(5)/sqrt(C1(5,5)+Ce(5,5))); 
-    histo27->Fill(Nl.x()); 
-    histo28->Fill(Nl.y()); 
-    histo29->Fill(lenghtTrack); 
-    histo30->Fill(lenghtMuon);     
+    // -----------------------------------------------------  fill histogram
+    histo->Fill(itMuon->track()->pt());
+
+    //histo2->Fill(itMuon->track()->outerP());
+    histo2->Fill(Pt.mag());
+    histo3->Fill((PI / 2. - itMuon->track()->outerTheta()));
+    histo4->Fill(itMuon->track()->phi());
+    histo5->Fill(Rmuon);
+    histo6->Fill(Zmuon);
+    histo7->Fill(RelMomResidual);
+    //histo8->Fill(chi);
+    histo8->Fill(chi_d);
+
+    histo101->Fill(Zmuon, Rmuon);
+    histo101->Fill(Rt0.z(), Rt0.perp());
+    histo102->Fill(Rt0.x(), Rt0.y());
+    histo102->Fill(Rm.x(), Rm.y());
+
+    histo11->Fill(resR.mag());
+    if (fabs(Nl.x()) < 0.98)
+      histo12->Fill(resR.x());
+    if (fabs(Nl.y()) < 0.98)
+      histo13->Fill(resR.y());
+    if (fabs(Nl.z()) < 0.98)
+      histo14->Fill(resR.z());
+    histo15->Fill(resP.x());
+    histo16->Fill(resP.y());
+    histo17->Fill(resP.z());
+
+    if ((fabs(Nl.x()) < 0.98) && (fabs(Nl.y()) < 0.98) && (fabs(Nl.z()) < 0.98)) {
+      histo18->Fill(sqrt(C0(0, 0)));
+      histo19->Fill(sqrt(C1(0, 0)));
+      histo20->Fill(sqrt(C1(0, 0) + Ce(0, 0)));
+    }
+    if (fabs(Nl.x()) < 0.98)
+      histo21->Fill(Vm(0) / sqrt(Cm(0, 0)));
+    if (fabs(Nl.y()) < 0.98)
+      histo22->Fill(Vm(1) / sqrt(Cm(1, 1)));
+    if (fabs(Nl.z()) < 0.98)
+      histo23->Fill(Vm(2) / sqrt(Cm(2, 2)));
+    histo24->Fill(Vm(3) / sqrt(C1(3, 3) + Ce(3, 3)));
+    histo25->Fill(Vm(4) / sqrt(C1(4, 4) + Ce(4, 4)));
+    histo26->Fill(Vm(5) / sqrt(C1(5, 5) + Ce(5, 5)));
+    histo27->Fill(Nl.x());
+    histo28->Fill(Nl.y());
+    histo29->Fill(lenghtTrack);
+    histo30->Fill(lenghtMuon);
     histo31->Fill(chi_Loc);
-    histo32->Fill(Vml(1)/sqrt(Cml(1,1))); 
-    histo33->Fill(Vml(2)/sqrt(Cml(2,2))); 
-    histo34->Fill(Vml(3)/sqrt(Cml(3,3))); 
-    histo35->Fill(Vml(4)/sqrt(Cml(4,4))); 
-
-    if (debug_) {   //--------------------------------- debug print ----------
-      
-      std::cout<<" diag 0[ "<<C0(0,0)<<" "<<C0(1,1)<<" "<<C0(2,2)<<" "<<C0(3,3)<<" "
-	       <<C0(4,4)<<" "<<C0(5,5)<<" ]"<<std::endl;
-      std::cout<<" diag e[ "<<Ce(0,0)<<" "<<Ce(1,1)<<" "<<Ce(2,2)<<" "<<Ce(3,3)<<" "
-	       <<Ce(4,4)<<" "<<Ce(5,5)<<" ]"<<std::endl;
-      std::cout<<" diag 1[ "<<C1(0,0)<<" "<<C1(1,1)<<" "<<C1(2,2)<<" "<<C1(3,3)<<" "
-	       <<C1(4,4)<<" "<<C1(5,5)<<" ]"<<std::endl;
-      std::cout<<" Rm   "<<Rm.x()<<" "<<Rm.y()<<" "<<Rm.z()
-	       <<" Pm   "<<Pm.x()<<" "<<Pm.y()<<" "<<Pm.z()<<std::endl;
-      std::cout<<" Rt   "<<Rt.x()<<" "<<Rt.y()<<" "<<Rt.z()
-	       <<" Pt   "<<Pt.x()<<" "<<Pt.y()<<" "<<Pt.z()<<std::endl;
-      std::cout<<" Nl*(Rm-Rt) "<<Nl.dot(Rm-Rt)<<std::endl;
-      std::cout<<" resR "<<resR.x()<<" "<<resR.y()<<" "<<resR.z()
-	       <<" resP "<<resP.x()<<" "<<resP.y()<<" "<<resP.z()<<std::endl;       
-      std::cout<<" Rm-t "<<(Rm-Rt).x()<<" "<<(Rm-Rt).y()<<" "<<(Rm-Rt).z()
-	       <<" Pm-t "<<(Pm-Pt).x()<<" "<<(Pm-Pt).y()<<" "<<(Pm-Pt).z()<<std::endl;       
-      std::cout<<" Vm   "<<Vm<<std::endl;
-      std::cout<<" +-   "<<sqrt(Cm(0,0))<<" "<<sqrt(Cm(1,1))<<" "<<sqrt(Cm(2,2))<<" "
-	       <<sqrt(Cm(3,3))<<" "<<sqrt(Cm(4,4))<<" "<<sqrt(Cm(5,5))<<std::endl;
-      std::cout<<" Pmuon Ptrack dP/Ptrack "<<itMuon->outerTrack()->p()<<" "
-	       <<itMuon->track()->outerP()<<" "
-	       <<(itMuon->outerTrack()->p() - 
-		  itMuon->track()->outerP())/itMuon->track()->outerP()<<std::endl;
-      std::cout<<" cov matrix "<<std::endl;
-      std::cout<<Cm<<std::endl;
-      std::cout<<" diag [ "<<Cm(0,0)<<" "<<Cm(1,1)<<" "<<Cm(2,2)<<" "<<Cm(3,3)<<" "
-	       <<Cm(4,4)<<" "<<Cm(5,5)<<" ]"<<std::endl;
-      
+    histo32->Fill(Vml(1) / sqrt(Cml(1, 1)));
+    histo33->Fill(Vml(2) / sqrt(Cml(2, 2)));
+    histo34->Fill(Vml(3) / sqrt(Cml(3, 3)));
+    histo35->Fill(Vml(4) / sqrt(Cml(4, 4)));
+
+    if (debug_) {  //--------------------------------- debug print ----------
+
+      std::cout << " diag 0[ " << C0(0, 0) << " " << C0(1, 1) << " " << C0(2, 2) << " " << C0(3, 3) << " " << C0(4, 4)
+                << " " << C0(5, 5) << " ]" << std::endl;
+      std::cout << " diag e[ " << Ce(0, 0) << " " << Ce(1, 1) << " " << Ce(2, 2) << " " << Ce(3, 3) << " " << Ce(4, 4)
+                << " " << Ce(5, 5) << " ]" << std::endl;
+      std::cout << " diag 1[ " << C1(0, 0) << " " << C1(1, 1) << " " << C1(2, 2) << " " << C1(3, 3) << " " << C1(4, 4)
+                << " " << C1(5, 5) << " ]" << std::endl;
+      std::cout << " Rm   " << Rm.x() << " " << Rm.y() << " " << Rm.z() << " Pm   " << Pm.x() << " " << Pm.y() << " "
+                << Pm.z() << std::endl;
+      std::cout << " Rt   " << Rt.x() << " " << Rt.y() << " " << Rt.z() << " Pt   " << Pt.x() << " " << Pt.y() << " "
+                << Pt.z() << std::endl;
+      std::cout << " Nl*(Rm-Rt) " << Nl.dot(Rm - Rt) << std::endl;
+      std::cout << " resR " << resR.x() << " " << resR.y() << " " << resR.z() << " resP " << resP.x() << " " << resP.y()
+                << " " << resP.z() << std::endl;
+      std::cout << " Rm-t " << (Rm - Rt).x() << " " << (Rm - Rt).y() << " " << (Rm - Rt).z() << " Pm-t "
+                << (Pm - Pt).x() << " " << (Pm - Pt).y() << " " << (Pm - Pt).z() << std::endl;
+      std::cout << " Vm   " << Vm << std::endl;
+      std::cout << " +-   " << sqrt(Cm(0, 0)) << " " << sqrt(Cm(1, 1)) << " " << sqrt(Cm(2, 2)) << " " << sqrt(Cm(3, 3))
+                << " " << sqrt(Cm(4, 4)) << " " << sqrt(Cm(5, 5)) << std::endl;
+      std::cout << " Pmuon Ptrack dP/Ptrack " << itMuon->outerTrack()->p() << " " << itMuon->track()->outerP() << " "
+                << (itMuon->outerTrack()->p() - itMuon->track()->outerP()) / itMuon->track()->outerP() << std::endl;
+      std::cout << " cov matrix " << std::endl;
+      std::cout << Cm << std::endl;
+      std::cout << " diag [ " << Cm(0, 0) << " " << Cm(1, 1) << " " << Cm(2, 2) << " " << Cm(3, 3) << " " << Cm(4, 4)
+                << " " << Cm(5, 5) << " ]" << std::endl;
+
       AlgebraicSymMatrix66 Ro;
       double Diag[6];
-      for(int i=0; i<=5; i++) Diag[i] = sqrt(Cm(i,i));
-      for(int i=0; i<=5; i++)
-	for(int j=0; j<=5; j++)
-	  Ro(i,j) = Cm(i,j)/Diag[i]/Diag[j];
-      std::cout<<" correlation matrix "<<std::endl;
-      std::cout<<Ro<<std::endl;
-      
+      for (int i = 0; i <= 5; i++)
+        Diag[i] = sqrt(Cm(i, i));
+      for (int i = 0; i <= 5; i++)
+        for (int j = 0; j <= 5; j++)
+          Ro(i, j) = Cm(i, j) / Diag[i] / Diag[j];
+      std::cout << " correlation matrix " << std::endl;
+      std::cout << Ro << std::endl;
+
       AlgebraicSymMatrix66 CmI;
-      for(int i=0; i<=5; i++)
-	for(int j=0; j<=5; j++)
-	  CmI(i,j) = Cm(i,j);
-      
+      for (int i = 0; i <= 5; i++)
+        for (int j = 0; j <= 5; j++)
+          CmI(i, j) = Cm(i, j);
+
       bool ierr = !CmI.Invert();
-      if( ierr ) { if(alarm || debug_)
-	  std::cout<<" Error inverse covariance matrix !!!!!!!!!!!"<<std::endl;
-	continue;
-      }       
-      std::cout<<" inverse cov matrix "<<std::endl;
-      std::cout<<Cm<<std::endl;
-      
+      if (ierr) {
+        if (alarm || debug_)
+          std::cout << " Error inverse covariance matrix !!!!!!!!!!!" << std::endl;
+        continue;
+      }
+      std::cout << " inverse cov matrix " << std::endl;
+      std::cout << Cm << std::endl;
+
       double chi = ROOT::Math::Similarity(Vm, CmI);
-      std::cout<<" chi chi_d "<<chi<<" "<<chi_d<<std::endl;
+      std::cout << " chi chi_d " << chi << " " << chi_d << std::endl;
     }  // end of debug_ printout  --------------------------------------------
-    
-  } // end loop on selected muons, i.e. Jim's globalMuon
 
-} //end of analyzeTrackTrack
+  }  // end loop on selected muons, i.e. Jim's globalMuon
 
+}  //end of analyzeTrackTrack
 
 // ------- method to analyze recoTrack & trajectoryMuon of Global Muon ------
-void GlobalTrackerMuonAlignment::analyzeTrackTrajectory
-(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void GlobalTrackerMuonAlignment::analyzeTrackTrajectory(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   using namespace edm;
-  using namespace reco;  
+  using namespace reco;
   //debug_ = true;
   bool info = false;
   bool alarm = false;
   //bool alarm = true;
   double PI = 3.1415927;
- 
+
   //-*-*-*-*-*-*-
-  cosmicMuonMode_ = true; // true: both Cosmic and IsolatedMuon are treated with 1,2 tracks
+  cosmicMuonMode_ = true;  // true: both Cosmic and IsolatedMuon are treated with 1,2 tracks
   //cosmicMuonMode_ = false; // true: both Cosmic and IsolatedMuon are treated with 1,2 tracks
   //-*-*-*-*-*-*-
-  isolatedMuonMode_ = !cosmicMuonMode_; //true: only IsolatedMuon are treated with 1 track
- 
+  isolatedMuonMode_ = !cosmicMuonMode_;  //true: only IsolatedMuon are treated with 1 track
+
   N_event++;
   if (info || debug_) {
-    std::cout << "----- event " << N_event << " -- tracks "<<N_track<<" ---";
-    if (cosmicMuonMode_) std::cout << " treated as CosmicMu ";
-    if (isolatedMuonMode_) std::cout <<" treated as IsolatedMu ";
+    std::cout << "----- event " << N_event << " -- tracks " << N_track << " ---";
+    if (cosmicMuonMode_)
+      std::cout << " treated as CosmicMu ";
+    if (isolatedMuonMode_)
+      std::cout << " treated as IsolatedMu ";
     std::cout << std::endl;
   }
 
@@ -1268,52 +1279,55 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrajectory
   Handle<reco::TrackCollection> gmuons;
   Handle<reco::MuonCollection> smuons;
 
-  if (collectionIsolated){
-    iEvent.getByLabel("ALCARECOMuAlCalIsolatedMu", "TrackerOnly",  tracks);
-    iEvent.getByLabel("ALCARECOMuAlCalIsolatedMu", "StandAlone",  muons);
-    iEvent.getByLabel("ALCARECOMuAlCalIsolatedMu", "GlobalMuon",  gmuons);
-    iEvent.getByLabel("ALCARECOMuAlCalIsolatedMu", "SelectedMuons",  smuons);
-  }
-  else if (collectionCosmic){
-    iEvent.getByLabel("ALCARECOMuAlGlobalCosmics", "TrackerOnly",  tracks);
-    iEvent.getByLabel("ALCARECOMuAlGlobalCosmics", "StandAlone",  muons);
-    iEvent.getByLabel("ALCARECOMuAlGlobalCosmics", "GlobalMuon",  gmuons);
-    iEvent.getByLabel("ALCARECOMuAlGlobalCosmics", "SelectedMuons",  smuons);
+  if (collectionIsolated) {
+    iEvent.getByLabel("ALCARECOMuAlCalIsolatedMu", "TrackerOnly", tracks);
+    iEvent.getByLabel("ALCARECOMuAlCalIsolatedMu", "StandAlone", muons);
+    iEvent.getByLabel("ALCARECOMuAlCalIsolatedMu", "GlobalMuon", gmuons);
+    iEvent.getByLabel("ALCARECOMuAlCalIsolatedMu", "SelectedMuons", smuons);
+  } else if (collectionCosmic) {
+    iEvent.getByLabel("ALCARECOMuAlGlobalCosmics", "TrackerOnly", tracks);
+    iEvent.getByLabel("ALCARECOMuAlGlobalCosmics", "StandAlone", muons);
+    iEvent.getByLabel("ALCARECOMuAlGlobalCosmics", "GlobalMuon", gmuons);
+    iEvent.getByLabel("ALCARECOMuAlGlobalCosmics", "SelectedMuons", smuons);
+  } else {
+    iEvent.getByLabel(trackTags_, tracks);
+    iEvent.getByLabel(muonTags_, muons);
+    iEvent.getByLabel(gmuonTags_, gmuons);
+    iEvent.getByLabel(smuonTags_, smuons);
   }
-  else{
-    iEvent.getByLabel(trackTags_,tracks);
-    iEvent.getByLabel(muonTags_,muons);
-    iEvent.getByLabel(gmuonTags_,gmuons);
-    iEvent.getByLabel(smuonTags_,smuons);
-  }  
 
   if (debug_) {
-    std::cout << " ievBunch " << iEvent.bunchCrossing()
-	      << " runN " << (int)iEvent.run() <<std::endl;
-    std::cout << " N tracks s/amu gmu selmu "<<tracks->size() << " " <<muons->size()
-              << " "<<gmuons->size() << " " << smuons->size() << std::endl;
-    for (MuonCollection::const_iterator itMuon = smuons->begin();
-	itMuon != smuons->end();
-	 ++itMuon) {
-      std::cout << " is isolatValid Matches " << itMuon->isIsolationValid()
-		<< " " <<itMuon->isMatchesValid() << std::endl;
+    std::cout << " ievBunch " << iEvent.bunchCrossing() << " runN " << (int)iEvent.run() << std::endl;
+    std::cout << " N tracks s/amu gmu selmu " << tracks->size() << " " << muons->size() << " " << gmuons->size() << " "
+              << smuons->size() << std::endl;
+    for (MuonCollection::const_iterator itMuon = smuons->begin(); itMuon != smuons->end(); ++itMuon) {
+      std::cout << " is isolatValid Matches " << itMuon->isIsolationValid() << " " << itMuon->isMatchesValid()
+                << std::endl;
     }
   }
 
-  if (isolatedMuonMode_) {                // ---- Only 1 Isolated Muon --------
-    if (tracks->size() != 1) return;  
-    if (muons->size()  != 1) return;  
-    if (gmuons->size() != 1) return; 
-    if (smuons->size() != 1) return; 
+  if (isolatedMuonMode_) {  // ---- Only 1 Isolated Muon --------
+    if (tracks->size() != 1)
+      return;
+    if (muons->size() != 1)
+      return;
+    if (gmuons->size() != 1)
+      return;
+    if (smuons->size() != 1)
+      return;
   }
-  
-  if (cosmicMuonMode_){                // ---- 1,2 Cosmic Muon --------
-    if (smuons->size() > 2) return; 
-    if (tracks->size() != smuons->size()) return;  
-    if (muons->size() != smuons->size()) return;  
-    if (gmuons->size() != smuons->size()) return;  
+
+  if (cosmicMuonMode_) {  // ---- 1,2 Cosmic Muon --------
+    if (smuons->size() > 2)
+      return;
+    if (tracks->size() != smuons->size())
+      return;
+    if (muons->size() != smuons->size())
+      return;
+    if (gmuons->size() != smuons->size())
+      return;
   }
-  
+
   // ok mc_isolated_mu
   //edm::ESHandle<TrackerGeometry> trackerGeometry;
   //iSetup.get<TrackerDigiGeometryRecord>().get(trackerGeometry);
@@ -1323,14 +1337,14 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrajectory
   // don't work
   //edm::ESHandle<CSCGeometry> cscGeometry;
   //iSetup.get<MuonGeometryRecord>().get(cscGeometry);
-  
+
   if (watchTrackingGeometry_.check(iSetup) || !trackingGeometry_) {
     edm::ESHandle<GlobalTrackingGeometry> trackingGeometry;
     iSetup.get<GlobalTrackingGeometryRecord>().get(trackingGeometry);
     trackingGeometry_ = &*trackingGeometry;
     theTrackingGeometry = trackingGeometry;
   }
-  
+
   if (watchMagneticFieldRecord_.check(iSetup) || !magneticField_) {
     edm::ESHandle<MagneticField> magneticField;
     iSetup.get<IdealMagneticFieldRecord>().get(magneticField);
@@ -1341,128 +1355,126 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrajectory
     edm::ESHandle<Alignments> globalPositionRcd;
     iSetup.get<GlobalPositionRcd>().get(globalPositionRcd);
     globalPositionRcd_ = &*globalPositionRcd;
-    for (std::vector<AlignTransform>::const_iterator i 
-	   = globalPositionRcd_->m_align.begin();
-	 i != globalPositionRcd_->m_align.end();  ++i){
-      if(DetId(DetId::Tracker).rawId() == i->rawId()) iteratorTrackerRcd = i;
-      if(DetId(DetId::Muon).rawId() == i->rawId()) iteratorMuonRcd = i;
-      if(DetId(DetId::Ecal).rawId() == i->rawId()) iteratorEcalRcd = i;
-      if(DetId(DetId::Hcal).rawId() == i->rawId()) iteratorHcalRcd = i;
+    for (std::vector<AlignTransform>::const_iterator i = globalPositionRcd_->m_align.begin();
+         i != globalPositionRcd_->m_align.end();
+         ++i) {
+      if (DetId(DetId::Tracker).rawId() == i->rawId())
+        iteratorTrackerRcd = i;
+      if (DetId(DetId::Muon).rawId() == i->rawId())
+        iteratorMuonRcd = i;
+      if (DetId(DetId::Ecal).rawId() == i->rawId())
+        iteratorEcalRcd = i;
+      if (DetId(DetId::Hcal).rawId() == i->rawId())
+        iteratorHcalRcd = i;
     }
-    if(debug_){
-      std::cout << "=== iteratorTrackerRcd " << iteratorTrackerRcd->rawId()<<" ====\n" 
-		<< " translation " << iteratorTrackerRcd->translation()<<"\n" 
-		<< " angles " << iteratorTrackerRcd->rotation().eulerAngles() << std::endl;
+    if (debug_) {
+      std::cout << "=== iteratorTrackerRcd " << iteratorTrackerRcd->rawId() << " ====\n"
+                << " translation " << iteratorTrackerRcd->translation() << "\n"
+                << " angles " << iteratorTrackerRcd->rotation().eulerAngles() << std::endl;
       std::cout << iteratorTrackerRcd->rotation() << std::endl;
-      std::cout << "=== iteratorMuonRcd " << iteratorMuonRcd->rawId()<<" ====\n" 
-		<< " translation " << iteratorMuonRcd->translation()<<"\n" 
-		<< " angles " << iteratorMuonRcd->rotation().eulerAngles() << std::endl;
+      std::cout << "=== iteratorMuonRcd " << iteratorMuonRcd->rawId() << " ====\n"
+                << " translation " << iteratorMuonRcd->translation() << "\n"
+                << " angles " << iteratorMuonRcd->rotation().eulerAngles() << std::endl;
       std::cout << iteratorMuonRcd->rotation() << std::endl;
-    }   
-  } // end of GlobalPositionRcd
-  
+    }
+  }  // end of GlobalPositionRcd
+
   ESHandle<Propagator> propagator;
   iSetup.get<TrackingComponentsRecord>().get(propagator_, propagator);
 
-  SteppingHelixPropagator alongStHePr = 
-    SteppingHelixPropagator(magneticField_, alongMomentum);  
-  SteppingHelixPropagator oppositeStHePr = 
-    SteppingHelixPropagator(magneticField_, oppositeToMomentum);  
+  SteppingHelixPropagator alongStHePr = SteppingHelixPropagator(magneticField_, alongMomentum);
+  SteppingHelixPropagator oppositeStHePr = SteppingHelixPropagator(magneticField_, oppositeToMomentum);
 
   //double tolerance = 5.e-5;
-  defaultRKPropagator::Product  aprod( magneticField_, alongMomentum, 5.e-5); auto & alongRKPr = aprod.propagator;
-  defaultRKPropagator::Product  oprod( magneticField_, oppositeToMomentum, 5.e-5); auto & oppositeRKPr = oprod.propagator;
+  defaultRKPropagator::Product aprod(magneticField_, alongMomentum, 5.e-5);
+  auto& alongRKPr = aprod.propagator;
+  defaultRKPropagator::Product oprod(magneticField_, oppositeToMomentum, 5.e-5);
+  auto& oppositeRKPr = oprod.propagator;
 
   float epsilon = 5.;
-  SmartPropagator alongSmPr = 
-    SmartPropagator(alongRKPr, alongStHePr, magneticField_, alongMomentum, epsilon);
-  SmartPropagator oppositeSmPr = 
-    SmartPropagator(oppositeRKPr, oppositeStHePr, magneticField_, oppositeToMomentum, epsilon);
-
-  if(defineFitter){
-    if(debug_)
-      std::cout<<" ............... DEFINE FITTER ..................."<<std::endl;
+  SmartPropagator alongSmPr = SmartPropagator(alongRKPr, alongStHePr, magneticField_, alongMomentum, epsilon);
+  SmartPropagator oppositeSmPr =
+      SmartPropagator(oppositeRKPr, oppositeStHePr, magneticField_, oppositeToMomentum, epsilon);
+
+  if (defineFitter) {
+    if (debug_)
+      std::cout << " ............... DEFINE FITTER ..................." << std::endl;
     KFUpdator* theUpdator = new KFUpdator();
     //Chi2MeasurementEstimator* theEstimator = new Chi2MeasurementEstimator(30);
-    Chi2MeasurementEstimator* theEstimator = new Chi2MeasurementEstimator(100000,100000);
-    theFitter = new KFTrajectoryFitter(alongSmPr, 
-				       *theUpdator, 
-				       *theEstimator);
-    theSmoother = new KFTrajectorySmoother(alongSmPr,
-					   *theUpdator,     
-					   *theEstimator);
-    theFitterOp = new KFTrajectoryFitter(oppositeSmPr, 
-					 *theUpdator, 
-					 *theEstimator);
-    theSmootherOp = new KFTrajectorySmoother(oppositeSmPr,
-					     *theUpdator,     
-					     *theEstimator);
-    
+    Chi2MeasurementEstimator* theEstimator = new Chi2MeasurementEstimator(100000, 100000);
+    theFitter = new KFTrajectoryFitter(alongSmPr, *theUpdator, *theEstimator);
+    theSmoother = new KFTrajectorySmoother(alongSmPr, *theUpdator, *theEstimator);
+    theFitterOp = new KFTrajectoryFitter(oppositeSmPr, *theUpdator, *theEstimator);
+    theSmootherOp = new KFTrajectorySmoother(oppositeSmPr, *theUpdator, *theEstimator);
+
     edm::ESHandle<TransientTrackingRecHitBuilder> builder;
-    iSetup.get<TransientRecHitRecord>().get("WithTrackAngle",builder);
+    iSetup.get<TransientRecHitRecord>().get("WithTrackAngle", builder);
     this->TTRHBuilder = &(*builder);
     this->MuRHBuilder = new MuonTransientTrackingRecHitBuilder(theTrackingGeometry);
-    if(debug_){
-      std::cout<<" theTrackingGeometry.isValid() "<<theTrackingGeometry.isValid()<<std::endl;
-      std::cout<< "get also the MuonTransientTrackingRecHitBuilder" << "\n";
-      std::cout<< "get also the TransientTrackingRecHitBuilder" << "\n";
+    if (debug_) {
+      std::cout << " theTrackingGeometry.isValid() " << theTrackingGeometry.isValid() << std::endl;
+      std::cout << "get also the MuonTransientTrackingRecHitBuilder"
+                << "\n";
+      std::cout << "get also the TransientTrackingRecHitBuilder"
+                << "\n";
     }
     defineFitter = false;
   }
 
   // ................................................ selected/global muon
-  //itMuon -->  Jim's globalMuon  
-  for(MuonCollection::const_iterator itMuon = smuons->begin();
-      itMuon != smuons->end(); ++itMuon) {
-    
-    if(debug_){
-      std::cout<<" mu gM is GM Mu SaM tM "<<itMuon->isGlobalMuon()<<" "
-	       <<itMuon->isMuon()<<" "<<itMuon->isStandAloneMuon()
-	       <<" "<<itMuon->isTrackerMuon()<<" "
-	       <<std::endl;
+  //itMuon -->  Jim's globalMuon
+  for (MuonCollection::const_iterator itMuon = smuons->begin(); itMuon != smuons->end(); ++itMuon) {
+    if (debug_) {
+      std::cout << " mu gM is GM Mu SaM tM " << itMuon->isGlobalMuon() << " " << itMuon->isMuon() << " "
+                << itMuon->isStandAloneMuon() << " " << itMuon->isTrackerMuon() << " " << std::endl;
     }
-    
+
     // get information about the innermost muon hit -------------------------
     TransientTrack muTT(itMuon->outerTrack(), magneticField_, trackingGeometry_);
     TrajectoryStateOnSurface innerMuTSOS = muTT.innermostMeasurementState();
     TrajectoryStateOnSurface outerMuTSOS = muTT.outermostMeasurementState();
-    
+
     // get information about the outermost tracker hit -----------------------
     TransientTrack trackTT(itMuon->track(), magneticField_, trackingGeometry_);
     TrajectoryStateOnSurface outerTrackTSOS = trackTT.outermostMeasurementState();
     TrajectoryStateOnSurface innerTrackTSOS = trackTT.innermostMeasurementState();
-    
-    GlobalPoint pointTrackIn  = innerTrackTSOS.globalPosition();
+
+    GlobalPoint pointTrackIn = innerTrackTSOS.globalPosition();
     GlobalPoint pointTrackOut = outerTrackTSOS.globalPosition();
-    float lenghtTrack = (pointTrackOut-pointTrackIn).mag();
-    GlobalPoint pointMuonIn  = innerMuTSOS.globalPosition();
+    float lenghtTrack = (pointTrackOut - pointTrackIn).mag();
+    GlobalPoint pointMuonIn = innerMuTSOS.globalPosition();
     GlobalPoint pointMuonOut = outerMuTSOS.globalPosition();
     float lenghtMuon = (pointMuonOut - pointMuonIn).mag();
     GlobalVector momentumTrackOut = outerTrackTSOS.globalMomentum();
     GlobalVector momentumTrackIn = innerTrackTSOS.globalMomentum();
-    float distanceInIn   = (pointTrackIn  - pointMuonIn).mag();
-    float distanceInOut  = (pointTrackIn  - pointMuonOut).mag();
-    float distanceOutIn  = (pointTrackOut - pointMuonIn).mag();
+    float distanceInIn = (pointTrackIn - pointMuonIn).mag();
+    float distanceInOut = (pointTrackIn - pointMuonOut).mag();
+    float distanceOutIn = (pointTrackOut - pointMuonIn).mag();
     float distanceOutOut = (pointTrackOut - pointMuonOut).mag();
 
-    if(debug_){
-      std::cout<<" pointTrackIn "<<pointTrackIn<<std::endl;
-      std::cout<<"          Out "<<pointTrackOut<<" lenght "<<lenghtTrack<<std::endl;
-      std::cout<<" point MuonIn "<<pointMuonIn<<std::endl;
-      std::cout<<"          Out "<<pointMuonOut<<" lenght "<<lenghtMuon<<std::endl;
-      std::cout<<" momeTrackIn Out "<<momentumTrackIn<<" "<<momentumTrackOut<<std::endl;
-      std::cout<<" doi io ii oo "<<distanceOutIn<<" "<<distanceInOut<<" "
-	       <<distanceInIn<<" "<<distanceOutOut<<std::endl; 
-  }   
-
-    if(lenghtTrack < 90.) continue;
-    if(lenghtMuon < 300.) continue;
-    if(innerMuTSOS.globalMomentum().mag() < 5. || outerMuTSOS.globalMomentum().mag() < 5.) continue;
-    if(momentumTrackIn.mag() < 15. || momentumTrackOut.mag() < 15.) continue;
-    if(trackTT.charge() != muTT.charge()) continue;
-
-    if(debug_)
-      std::cout<<" passed lenght momentum cuts"<<std::endl;
+    if (debug_) {
+      std::cout << " pointTrackIn " << pointTrackIn << std::endl;
+      std::cout << "          Out " << pointTrackOut << " lenght " << lenghtTrack << std::endl;
+      std::cout << " point MuonIn " << pointMuonIn << std::endl;
+      std::cout << "          Out " << pointMuonOut << " lenght " << lenghtMuon << std::endl;
+      std::cout << " momeTrackIn Out " << momentumTrackIn << " " << momentumTrackOut << std::endl;
+      std::cout << " doi io ii oo " << distanceOutIn << " " << distanceInOut << " " << distanceInIn << " "
+                << distanceOutOut << std::endl;
+    }
+
+    if (lenghtTrack < 90.)
+      continue;
+    if (lenghtMuon < 300.)
+      continue;
+    if (innerMuTSOS.globalMomentum().mag() < 5. || outerMuTSOS.globalMomentum().mag() < 5.)
+      continue;
+    if (momentumTrackIn.mag() < 15. || momentumTrackOut.mag() < 15.)
+      continue;
+    if (trackTT.charge() != muTT.charge())
+      continue;
+
+    if (debug_)
+      std::cout << " passed lenght momentum cuts" << std::endl;
 
     GlobalVector GRm, GPm, Nl, Rm, Pm, Rt, Pt, Rt0;
     AlgebraicSymMatrix66 Cm, C0, Ce, C1;
@@ -1474,418 +1486,423 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrajectory
     TrajectoryStateOnSurface muonFittedTSOS;
     TrajectoryStateOnSurface trackFittedTSOS;
 
-    if( isolatedMuonMode_ ){      //------------------------------- Isolated Muon --- Out-In --
-      if(debug_) std::cout<<" ------ Isolated (out-in) ----- "<<std::endl;
-      const Surface& refSurface = innerMuTSOS.surface(); 
-      ConstReferenceCountingPointer<TangentPlane> 
-	tpMuLocal(refSurface.tangentPlane(innerMuTSOS.localPosition()));
+    if (isolatedMuonMode_) {  //------------------------------- Isolated Muon --- Out-In --
+      if (debug_)
+        std::cout << " ------ Isolated (out-in) ----- " << std::endl;
+      const Surface& refSurface = innerMuTSOS.surface();
+      ConstReferenceCountingPointer<TangentPlane> tpMuLocal(refSurface.tangentPlane(innerMuTSOS.localPosition()));
       Nl = tpMuLocal->normalVector();
-      ConstReferenceCountingPointer<TangentPlane> 
-      tpMuGlobal(refSurface.tangentPlane(innerMuTSOS.globalPosition()));
+      ConstReferenceCountingPointer<TangentPlane> tpMuGlobal(refSurface.tangentPlane(innerMuTSOS.globalPosition()));
       GlobalVector Ng = tpMuGlobal->normalVector();
       Surface* surf = (Surface*)&refSurface;
-      const Plane* refPlane = dynamic_cast<Plane*>(surf); 
+      const Plane* refPlane = dynamic_cast<Plane*>(surf);
       GlobalVector Nlp = refPlane->normalVector();
-      
-      if(debug_){
-	std::cout<<" Nlocal "<<Nl.x()<<" "<<Nl.y()<<" "<<Nl.z()<<" "
-	 <<" alfa "<<int(asin(Nl.x())*57.29578)<<std::endl;
-	std::cout<<"  global "<<Ng.x()<<" "<<Ng.y()<<" "<<Ng.z()<<std::endl;
-	std::cout<<"      lp "<<Nlp.x()<<" "<<Nlp.y()<<" "<<Nlp.z()<<std::endl;
-	//std::cout<<" Nlocal Nglobal "<<Nl.x()<<" "<<Nl.y()<<" "<<Nl.z()<<" "
-	// <<Ng.x()<<" "<<Ng.y()<<" "<<Ng.z()
-	//<<" alfa "<<int(asin(Nl.x())*57.29578)<<std::endl;
+
+      if (debug_) {
+        std::cout << " Nlocal " << Nl.x() << " " << Nl.y() << " " << Nl.z() << " "
+                  << " alfa " << int(asin(Nl.x()) * 57.29578) << std::endl;
+        std::cout << "  global " << Ng.x() << " " << Ng.y() << " " << Ng.z() << std::endl;
+        std::cout << "      lp " << Nlp.x() << " " << Nlp.y() << " " << Nlp.z() << std::endl;
+        //std::cout<<" Nlocal Nglobal "<<Nl.x()<<" "<<Nl.y()<<" "<<Nl.z()<<" "
+        // <<Ng.x()<<" "<<Ng.y()<<" "<<Ng.z()
+        //<<" alfa "<<int(asin(Nl.x())*57.29578)<<std::endl;
       }
 
-      //                          extrapolation to innermost muon hit     
+      //                          extrapolation to innermost muon hit
 
       //extrapolationT = alongSmPr.propagate(outerTrackTSOS, refSurface);
-      if(!refitTrack_)
-	extrapolationT = alongSmPr.propagate(outerTrackTSOS, refSurface);
-      else{
-	GlobalTrackerMuonAlignment::trackFitter(itMuon->track(),
-						trackTT,alongMomentum,trackFittedTSOS);
-	if(trackFittedTSOS.isValid())
-	  extrapolationT = alongSmPr.propagate(trackFittedTSOS, refSurface);	   
-      }   
-      
-      if(!extrapolationT.isValid()){
-	if(false & alarm)
-	  std::cout<<" !!!!!!!!! Catastrophe Out-In extrapolationT.isValid "
-	    //<<"\a\a\a\a\a\a\a\a"<<extrapolationT.isValid()
-		   <<std::endl;
-	continue;
+      if (!refitTrack_)
+        extrapolationT = alongSmPr.propagate(outerTrackTSOS, refSurface);
+      else {
+        GlobalTrackerMuonAlignment::trackFitter(itMuon->track(), trackTT, alongMomentum, trackFittedTSOS);
+        if (trackFittedTSOS.isValid())
+          extrapolationT = alongSmPr.propagate(trackFittedTSOS, refSurface);
+      }
+
+      if (!extrapolationT.isValid()) {
+        if (false & alarm)
+          std::cout << " !!!!!!!!! Catastrophe Out-In extrapolationT.isValid "
+                    //<<"\a\a\a\a\a\a\a\a"<<extrapolationT.isValid()
+                    << std::endl;
+        continue;
       }
       tsosMuonIf = 1;
       Rt = GlobalVector((extrapolationT.globalPosition()).x(),
-			(extrapolationT.globalPosition()).y(),
-			(extrapolationT.globalPosition()).z());
-      
+                        (extrapolationT.globalPosition()).y(),
+                        (extrapolationT.globalPosition()).z());
+
       Pt = extrapolationT.globalMomentum();
       //                          global parameters of muon
-      GRm = GlobalVector((innerMuTSOS.globalPosition()).x(),
-			 (innerMuTSOS.globalPosition()).y(),
-			 (innerMuTSOS.globalPosition()).z());
+      GRm = GlobalVector(
+          (innerMuTSOS.globalPosition()).x(), (innerMuTSOS.globalPosition()).y(), (innerMuTSOS.globalPosition()).z());
       GPm = innerMuTSOS.globalMomentum();
-      
+
       Rt0 = GlobalVector((outerTrackTSOS.globalPosition()).x(),
-			 (outerTrackTSOS.globalPosition()).y(),
-			 (outerTrackTSOS.globalPosition()).z());
-      Cm = AlgebraicSymMatrix66 (extrapolationT.cartesianError().matrix() + 
-				 innerMuTSOS.cartesianError().matrix());
-      C0 = AlgebraicSymMatrix66(outerTrackTSOS.cartesianError().matrix()); 		   
-      Ce = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix()); 
+                         (outerTrackTSOS.globalPosition()).y(),
+                         (outerTrackTSOS.globalPosition()).z());
+      Cm = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix() + innerMuTSOS.cartesianError().matrix());
+      C0 = AlgebraicSymMatrix66(outerTrackTSOS.cartesianError().matrix());
+      Ce = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix());
       C1 = AlgebraicSymMatrix66(innerMuTSOS.cartesianError().matrix());
 
-      if(refitMuon_)
-	GlobalTrackerMuonAlignment::muonFitter(itMuon->outerTrack(),muTT,oppositeToMomentum,muonFittedTSOS);
+      if (refitMuon_)
+        GlobalTrackerMuonAlignment::muonFitter(itMuon->outerTrack(), muTT, oppositeToMomentum, muonFittedTSOS);
 
     }  //                    -------------------------------   end Isolated Muon -- Out - In  ---
-    
-    
-    if( cosmicMuonMode_ ){      //------------------------------- Cosmic Muon -----
-      
-      if((distanceOutIn <= distanceInOut) & (distanceOutIn <= distanceInIn) & 
-	 (distanceOutIn <= distanceOutOut)){             // ----- Out - In ------    
-	if(debug_) std::cout<<" -----    Out - In -----"<<std::endl;
-
-        const Surface& refSurface = innerMuTSOS.surface(); 
-	ConstReferenceCountingPointer<TangentPlane> 
-	  tpMuGlobal(refSurface.tangentPlane(innerMuTSOS.globalPosition()));
-	Nl = tpMuGlobal->normalVector();
-
-	//                          extrapolation to innermost muon hit     
-	//extrapolationT = alongSmPr.propagate(outerTrackTSOS, refSurface);
-	if(!refitTrack_)
-	  extrapolationT = alongSmPr.propagate(outerTrackTSOS, refSurface);
-	else{
-	  GlobalTrackerMuonAlignment::trackFitter(itMuon->track(),
-						  trackTT,alongMomentum,trackFittedTSOS);
-	  if(trackFittedTSOS.isValid())
-	    extrapolationT = alongSmPr.propagate(trackFittedTSOS, refSurface);	   
-	}  
-
-	if(!extrapolationT.isValid()){
-	  if(false & alarm)
-	    std::cout<<" !!!!!!!!! Catastrophe Out-In extrapolationT.isValid "
-	      //<<"\a\a\a\a\a\a\a\a"<<extrapolationT.isValid()
-		     <<std::endl;
-	  continue;
-	}
-	if(debug_)
-	  std::cout<<" extrapolationT.isValid "<<extrapolationT.isValid()<<std::endl; 
-
-	tsosMuonIf = 1;
-	Rt = GlobalVector((extrapolationT.globalPosition()).x(),
-			  (extrapolationT.globalPosition()).y(),
-			  (extrapolationT.globalPosition()).z());
-	
-	Pt = extrapolationT.globalMomentum();
-	//                          global parameters of muon
-	GRm = GlobalVector((innerMuTSOS.globalPosition()).x(),
-			   (innerMuTSOS.globalPosition()).y(),
-			   (innerMuTSOS.globalPosition()).z());
-	GPm = innerMuTSOS.globalMomentum();
-	Rt0 = GlobalVector((outerTrackTSOS.globalPosition()).x(),
-			   (outerTrackTSOS.globalPosition()).y(),
-			   (outerTrackTSOS.globalPosition()).z());
-	Cm = AlgebraicSymMatrix66 (extrapolationT.cartesianError().matrix() + 
-				   innerMuTSOS.cartesianError().matrix());
-	C0 = AlgebraicSymMatrix66(outerTrackTSOS.cartesianError().matrix()); 		   
-	Ce = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix()); 
-	C1 = AlgebraicSymMatrix66(innerMuTSOS.cartesianError().matrix());
-	
-	if(refitMuon_)
-	  GlobalTrackerMuonAlignment::muonFitter(itMuon->outerTrack(),muTT,oppositeToMomentum,muonFittedTSOS);
-
-	if(false & debug_){
-	  //std::cout<<" ->propDir "<<propagator->propagationDirection()<<std::endl;
-	  PropagationDirectionChooser Chooser;
-	  std::cout<<" propDirCh "
-		   <<Chooser.operator()(*outerTrackTSOS.freeState(), refSurface)
-		   <<" Ch == along "<<(alongMomentum == 
-				       Chooser.operator()(*outerTrackTSOS.freeState(), refSurface))
-		   <<std::endl;
-	  std::cout<<" --- Nlocal "<<Nl.x()<<" "<<Nl.y()<<" "<<Nl.z()<<" "
-		   <<" alfa "<<int(asin(Nl.x())*57.29578)<<std::endl;
-	}
-      }           //                                       enf of ---- Out - In -----
-      
-
-      else if((distanceInOut <= distanceInIn) & (distanceInOut <= distanceOutIn) & 
-	      (distanceInOut <= distanceOutOut)){            // ----- In - Out ------    
-	if(debug_) std::cout<<" -----    In - Out -----"<<std::endl;
-
-	const Surface& refSurface = outerMuTSOS.surface(); 
-	ConstReferenceCountingPointer<TangentPlane> 
-	  tpMuGlobal(refSurface.tangentPlane(outerMuTSOS.globalPosition()));
-	Nl = tpMuGlobal->normalVector();
-		
-	//                          extrapolation to outermost muon hit     
-	//extrapolationT = oppositeSmPr.propagate(innerTrackTSOS, refSurface);
-	if(!refitTrack_)
-	  extrapolationT = oppositeSmPr.propagate(innerTrackTSOS, refSurface);
-	else{
-	  GlobalTrackerMuonAlignment::trackFitter(itMuon->track(),
-						trackTT,oppositeToMomentum,trackFittedTSOS);
-	if(trackFittedTSOS.isValid())
-	  extrapolationT = oppositeSmPr.propagate(trackFittedTSOS, refSurface);	   
-      }   
-
-	if(!extrapolationT.isValid()){
-	  if(false & alarm)
-	    std::cout<<" !!!!!!!!! Catastrophe Out-In extrapolationT.isValid "
-	      <<"\a\a\a\a\a\a\a\a"<<extrapolationT.isValid()
-		     <<std::endl;
-	  continue;
-	}
-	if(debug_)
-	  std::cout<<" extrapolationT.isValid "<<extrapolationT.isValid()<<std::endl; 
-	
-	tsosMuonIf = 2;
-	Rt = GlobalVector((extrapolationT.globalPosition()).x(),
-			  (extrapolationT.globalPosition()).y(),
-			  (extrapolationT.globalPosition()).z());
-	
-	Pt = extrapolationT.globalMomentum();
-	//                          global parameters of muon
-	GRm = GlobalVector((outerMuTSOS.globalPosition()).x(),
-			   (outerMuTSOS.globalPosition()).y(),
-			   (outerMuTSOS.globalPosition()).z());
-	GPm = outerMuTSOS.globalMomentum();
-	Rt0 = GlobalVector((innerTrackTSOS.globalPosition()).x(),
-			   (innerTrackTSOS.globalPosition()).y(),
-			   (innerTrackTSOS.globalPosition()).z());
-	Cm = AlgebraicSymMatrix66 (extrapolationT.cartesianError().matrix() + 
-				   outerMuTSOS.cartesianError().matrix());
-	C0 = AlgebraicSymMatrix66(innerTrackTSOS.cartesianError().matrix()); 		   
-	Ce = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix()); 
-	C1 = AlgebraicSymMatrix66(outerMuTSOS.cartesianError().matrix());
-	
-	if(refitMuon_)
-	  GlobalTrackerMuonAlignment::muonFitter(itMuon->outerTrack(),muTT,alongMomentum,muonFittedTSOS);
-
-	if(false & debug_){
-	  //std::cout<<" ->propDir "<<propagator->propagationDirection()<<std::endl;
-	  PropagationDirectionChooser Chooser;
-	  std::cout<<" propDirCh "
-		   <<Chooser.operator()(*innerTrackTSOS.freeState(), refSurface)
-		   <<" Ch == oppisite "<<(oppositeToMomentum == 
-					  Chooser.operator()(*innerTrackTSOS.freeState(), refSurface))
-		   <<std::endl;
-	  std::cout<<" --- Nlocal "<<Nl.x()<<" "<<Nl.y()<<" "<<Nl.z()<<" "
-		   <<" alfa "<<int(asin(Nl.x())*57.29578)<<std::endl;
-	}
-      }           //                                        enf of ---- In - Out -----
-
-      else if((distanceOutOut <= distanceInOut) & (distanceOutOut <= distanceInIn) & 
-	      (distanceOutOut <= distanceOutIn)){          // ----- Out - Out ------    
-	if(debug_) std::cout<<" -----    Out - Out -----"<<std::endl;
-
-	// reject: momentum of track has opposite direction to muon track
-	continue;
-
-	const Surface& refSurface = outerMuTSOS.surface(); 
-	ConstReferenceCountingPointer<TangentPlane> 
-	  tpMuGlobal(refSurface.tangentPlane(outerMuTSOS.globalPosition()));
-	Nl = tpMuGlobal->normalVector();
-		
-	//                          extrapolation to outermost muon hit     
-	extrapolationT = alongSmPr.propagate(outerTrackTSOS, refSurface);
-
-	if(!extrapolationT.isValid()){
-	  if(alarm)
-	    std::cout<<" !!!!!!!!! Catastrophe Out-Out extrapolationT.isValid "
-		     <<"\a\a\a\a\a\a\a\a"<<extrapolationT.isValid()
-		     <<std::endl;
-	  continue;
-	}
-	if(debug_)
-	  std::cout<<" extrapolationT.isValid "<<extrapolationT.isValid()<<std::endl; 
-
-	tsosMuonIf = 2;
-	Rt = GlobalVector((extrapolationT.globalPosition()).x(),
-			  (extrapolationT.globalPosition()).y(),
-			  (extrapolationT.globalPosition()).z());
-	
-	Pt = extrapolationT.globalMomentum();
-	//                          global parameters of muon
-	GRm = GlobalVector((outerMuTSOS.globalPosition()).x(),
-			   (outerMuTSOS.globalPosition()).y(),
-			   (outerMuTSOS.globalPosition()).z());
-	GPm = outerMuTSOS.globalMomentum();
-	Rt0 = GlobalVector((outerTrackTSOS.globalPosition()).x(),
-			   (outerTrackTSOS.globalPosition()).y(),
-			   (outerTrackTSOS.globalPosition()).z());
-	Cm = AlgebraicSymMatrix66 (extrapolationT.cartesianError().matrix() + 
-				   outerMuTSOS.cartesianError().matrix());
-	C0 = AlgebraicSymMatrix66(outerTrackTSOS.cartesianError().matrix()); 		   
-	Ce = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix()); 
-	C1 = AlgebraicSymMatrix66(outerMuTSOS.cartesianError().matrix());
-	
-	if(debug_){
-	  PropagationDirectionChooser Chooser;
-	  std::cout<<" propDirCh "
-		   <<Chooser.operator()(*outerTrackTSOS.freeState(), refSurface)
-		   <<" Ch == along "<<(alongMomentum == 
-				       Chooser.operator()(*outerTrackTSOS.freeState(), refSurface))
-		   <<std::endl;
-	  std::cout<<" --- Nlocal "<<Nl.x()<<" "<<Nl.y()<<" "<<Nl.z()<<" "
-		   <<" alfa "<<int(asin(Nl.x())*57.29578)<<std::endl;
-	  std::cout<<"     Nornal "<<Nl.x()<<" "<<Nl.y()<<" "<<Nl.z()<<" "
-		   <<" alfa "<<int(asin(Nl.x())*57.29578)<<std::endl;
-	}
-      }           //                                       enf of ---- Out - Out -----
-      else{
-	if(alarm)
-	  std::cout<<" ------- !!!!!!!!!!!!!!! No proper Out - In \a\a\a\a\a\a\a"<<std::endl; 
-	continue;
+
+    if (cosmicMuonMode_) {  //------------------------------- Cosmic Muon -----
+
+      if ((distanceOutIn <= distanceInOut) & (distanceOutIn <= distanceInIn) &
+          (distanceOutIn <= distanceOutOut)) {  // ----- Out - In ------
+        if (debug_)
+          std::cout << " -----    Out - In -----" << std::endl;
+
+        const Surface& refSurface = innerMuTSOS.surface();
+        ConstReferenceCountingPointer<TangentPlane> tpMuGlobal(refSurface.tangentPlane(innerMuTSOS.globalPosition()));
+        Nl = tpMuGlobal->normalVector();
+
+        //                          extrapolation to innermost muon hit
+        //extrapolationT = alongSmPr.propagate(outerTrackTSOS, refSurface);
+        if (!refitTrack_)
+          extrapolationT = alongSmPr.propagate(outerTrackTSOS, refSurface);
+        else {
+          GlobalTrackerMuonAlignment::trackFitter(itMuon->track(), trackTT, alongMomentum, trackFittedTSOS);
+          if (trackFittedTSOS.isValid())
+            extrapolationT = alongSmPr.propagate(trackFittedTSOS, refSurface);
+        }
+
+        if (!extrapolationT.isValid()) {
+          if (false & alarm)
+            std::cout << " !!!!!!!!! Catastrophe Out-In extrapolationT.isValid "
+                      //<<"\a\a\a\a\a\a\a\a"<<extrapolationT.isValid()
+                      << std::endl;
+          continue;
+        }
+        if (debug_)
+          std::cout << " extrapolationT.isValid " << extrapolationT.isValid() << std::endl;
+
+        tsosMuonIf = 1;
+        Rt = GlobalVector((extrapolationT.globalPosition()).x(),
+                          (extrapolationT.globalPosition()).y(),
+                          (extrapolationT.globalPosition()).z());
+
+        Pt = extrapolationT.globalMomentum();
+        //                          global parameters of muon
+        GRm = GlobalVector(
+            (innerMuTSOS.globalPosition()).x(), (innerMuTSOS.globalPosition()).y(), (innerMuTSOS.globalPosition()).z());
+        GPm = innerMuTSOS.globalMomentum();
+        Rt0 = GlobalVector((outerTrackTSOS.globalPosition()).x(),
+                           (outerTrackTSOS.globalPosition()).y(),
+                           (outerTrackTSOS.globalPosition()).z());
+        Cm = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix() + innerMuTSOS.cartesianError().matrix());
+        C0 = AlgebraicSymMatrix66(outerTrackTSOS.cartesianError().matrix());
+        Ce = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix());
+        C1 = AlgebraicSymMatrix66(innerMuTSOS.cartesianError().matrix());
+
+        if (refitMuon_)
+          GlobalTrackerMuonAlignment::muonFitter(itMuon->outerTrack(), muTT, oppositeToMomentum, muonFittedTSOS);
+
+        if (false & debug_) {
+          //std::cout<<" ->propDir "<<propagator->propagationDirection()<<std::endl;
+          PropagationDirectionChooser Chooser;
+          std::cout << " propDirCh " << Chooser.operator()(*outerTrackTSOS.freeState(), refSurface) << " Ch == along "
+                    << (alongMomentum == Chooser.operator()(*outerTrackTSOS.freeState(), refSurface)) << std::endl;
+          std::cout << " --- Nlocal " << Nl.x() << " " << Nl.y() << " " << Nl.z() << " "
+                    << " alfa " << int(asin(Nl.x()) * 57.29578) << std::endl;
+        }
+      }  //                                       enf of ---- Out - In -----
+
+      else if ((distanceInOut <= distanceInIn) & (distanceInOut <= distanceOutIn) &
+               (distanceInOut <= distanceOutOut)) {  // ----- In - Out ------
+        if (debug_)
+          std::cout << " -----    In - Out -----" << std::endl;
+
+        const Surface& refSurface = outerMuTSOS.surface();
+        ConstReferenceCountingPointer<TangentPlane> tpMuGlobal(refSurface.tangentPlane(outerMuTSOS.globalPosition()));
+        Nl = tpMuGlobal->normalVector();
+
+        //                          extrapolation to outermost muon hit
+        //extrapolationT = oppositeSmPr.propagate(innerTrackTSOS, refSurface);
+        if (!refitTrack_)
+          extrapolationT = oppositeSmPr.propagate(innerTrackTSOS, refSurface);
+        else {
+          GlobalTrackerMuonAlignment::trackFitter(itMuon->track(), trackTT, oppositeToMomentum, trackFittedTSOS);
+          if (trackFittedTSOS.isValid())
+            extrapolationT = oppositeSmPr.propagate(trackFittedTSOS, refSurface);
+        }
+
+        if (!extrapolationT.isValid()) {
+          if (false & alarm)
+            std::cout << " !!!!!!!!! Catastrophe Out-In extrapolationT.isValid "
+                      << "\a\a\a\a\a\a\a\a" << extrapolationT.isValid() << std::endl;
+          continue;
+        }
+        if (debug_)
+          std::cout << " extrapolationT.isValid " << extrapolationT.isValid() << std::endl;
+
+        tsosMuonIf = 2;
+        Rt = GlobalVector((extrapolationT.globalPosition()).x(),
+                          (extrapolationT.globalPosition()).y(),
+                          (extrapolationT.globalPosition()).z());
+
+        Pt = extrapolationT.globalMomentum();
+        //                          global parameters of muon
+        GRm = GlobalVector(
+            (outerMuTSOS.globalPosition()).x(), (outerMuTSOS.globalPosition()).y(), (outerMuTSOS.globalPosition()).z());
+        GPm = outerMuTSOS.globalMomentum();
+        Rt0 = GlobalVector((innerTrackTSOS.globalPosition()).x(),
+                           (innerTrackTSOS.globalPosition()).y(),
+                           (innerTrackTSOS.globalPosition()).z());
+        Cm = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix() + outerMuTSOS.cartesianError().matrix());
+        C0 = AlgebraicSymMatrix66(innerTrackTSOS.cartesianError().matrix());
+        Ce = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix());
+        C1 = AlgebraicSymMatrix66(outerMuTSOS.cartesianError().matrix());
+
+        if (refitMuon_)
+          GlobalTrackerMuonAlignment::muonFitter(itMuon->outerTrack(), muTT, alongMomentum, muonFittedTSOS);
+
+        if (false & debug_) {
+          //std::cout<<" ->propDir "<<propagator->propagationDirection()<<std::endl;
+          PropagationDirectionChooser Chooser;
+          std::cout << " propDirCh " << Chooser.operator()(*innerTrackTSOS.freeState(), refSurface)
+                    << " Ch == oppisite "
+                    << (oppositeToMomentum == Chooser.operator()(*innerTrackTSOS.freeState(), refSurface)) << std::endl;
+          std::cout << " --- Nlocal " << Nl.x() << " " << Nl.y() << " " << Nl.z() << " "
+                    << " alfa " << int(asin(Nl.x()) * 57.29578) << std::endl;
+        }
+      }  //                                        enf of ---- In - Out -----
+
+      else if ((distanceOutOut <= distanceInOut) & (distanceOutOut <= distanceInIn) &
+               (distanceOutOut <= distanceOutIn)) {  // ----- Out - Out ------
+        if (debug_)
+          std::cout << " -----    Out - Out -----" << std::endl;
+
+        // reject: momentum of track has opposite direction to muon track
+        continue;
+
+        const Surface& refSurface = outerMuTSOS.surface();
+        ConstReferenceCountingPointer<TangentPlane> tpMuGlobal(refSurface.tangentPlane(outerMuTSOS.globalPosition()));
+        Nl = tpMuGlobal->normalVector();
+
+        //                          extrapolation to outermost muon hit
+        extrapolationT = alongSmPr.propagate(outerTrackTSOS, refSurface);
+
+        if (!extrapolationT.isValid()) {
+          if (alarm)
+            std::cout << " !!!!!!!!! Catastrophe Out-Out extrapolationT.isValid "
+                      << "\a\a\a\a\a\a\a\a" << extrapolationT.isValid() << std::endl;
+          continue;
+        }
+        if (debug_)
+          std::cout << " extrapolationT.isValid " << extrapolationT.isValid() << std::endl;
+
+        tsosMuonIf = 2;
+        Rt = GlobalVector((extrapolationT.globalPosition()).x(),
+                          (extrapolationT.globalPosition()).y(),
+                          (extrapolationT.globalPosition()).z());
+
+        Pt = extrapolationT.globalMomentum();
+        //                          global parameters of muon
+        GRm = GlobalVector(
+            (outerMuTSOS.globalPosition()).x(), (outerMuTSOS.globalPosition()).y(), (outerMuTSOS.globalPosition()).z());
+        GPm = outerMuTSOS.globalMomentum();
+        Rt0 = GlobalVector((outerTrackTSOS.globalPosition()).x(),
+                           (outerTrackTSOS.globalPosition()).y(),
+                           (outerTrackTSOS.globalPosition()).z());
+        Cm = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix() + outerMuTSOS.cartesianError().matrix());
+        C0 = AlgebraicSymMatrix66(outerTrackTSOS.cartesianError().matrix());
+        Ce = AlgebraicSymMatrix66(extrapolationT.cartesianError().matrix());
+        C1 = AlgebraicSymMatrix66(outerMuTSOS.cartesianError().matrix());
+
+        if (debug_) {
+          PropagationDirectionChooser Chooser;
+          std::cout << " propDirCh " << Chooser.operator()(*outerTrackTSOS.freeState(), refSurface) << " Ch == along "
+                    << (alongMomentum == Chooser.operator()(*outerTrackTSOS.freeState(), refSurface)) << std::endl;
+          std::cout << " --- Nlocal " << Nl.x() << " " << Nl.y() << " " << Nl.z() << " "
+                    << " alfa " << int(asin(Nl.x()) * 57.29578) << std::endl;
+          std::cout << "     Nornal " << Nl.x() << " " << Nl.y() << " " << Nl.z() << " "
+                    << " alfa " << int(asin(Nl.x()) * 57.29578) << std::endl;
+        }
+      }  //                                       enf of ---- Out - Out -----
+      else {
+        if (alarm)
+          std::cout << " ------- !!!!!!!!!!!!!!! No proper Out - In \a\a\a\a\a\a\a" << std::endl;
+        continue;
       }
-      
+
     }  //                     -------------------------------   end Cosmic Muon -----
-    
-    if(tsosMuonIf == 0) {if(info) {std::cout<<"No tsosMuon !!!!!!"<<std::endl; continue;}}
+
+    if (tsosMuonIf == 0) {
+      if (info) {
+        std::cout << "No tsosMuon !!!!!!" << std::endl;
+        continue;
+      }
+    }
     TrajectoryStateOnSurface tsosMuon;
-    if(tsosMuonIf == 1) tsosMuon = muTT.innermostMeasurementState();
-    else tsosMuon = muTT.outermostMeasurementState();
+    if (tsosMuonIf == 1)
+      tsosMuon = muTT.innermostMeasurementState();
+    else
+      tsosMuon = muTT.outermostMeasurementState();
 
     //GlobalTrackerMuonAlignment::misalignMuon(GRm, GPm, Nl, Rt, Rm, Pm);
     AlgebraicVector4 LPRm;  // muon local (dx/dz, dy/dz, x, y)
-    GlobalTrackerMuonAlignment::misalignMuonL
-    (GRm, GPm, Nl, Rt, Rm, Pm, LPRm, extrapolationT, tsosMuon);
-
-    if(refitTrack_){
-      if(!trackFittedTSOS.isValid()){ 
-	if(info) std::cout<<" =================  trackFittedTSOS notValid !!!!!!!! "<<std::endl;
-	continue;}
-      if(debug_) this->debugTrajectorySOS(" trackFittedTSOS ", trackFittedTSOS);
+    GlobalTrackerMuonAlignment::misalignMuonL(GRm, GPm, Nl, Rt, Rm, Pm, LPRm, extrapolationT, tsosMuon);
+
+    if (refitTrack_) {
+      if (!trackFittedTSOS.isValid()) {
+        if (info)
+          std::cout << " =================  trackFittedTSOS notValid !!!!!!!! " << std::endl;
+        continue;
+      }
+      if (debug_)
+        this->debugTrajectorySOS(" trackFittedTSOS ", trackFittedTSOS);
     }
 
-    if(refitMuon_){
-      if(!muonFittedTSOS.isValid()){ 
-	if(info) std::cout<<" =================  muonFittedTSOS notValid !!!!!!!! "<<std::endl;
-	continue;}
-      if(debug_) this->debugTrajectorySOS(" muonFittedTSOS ", muonFittedTSOS);
+    if (refitMuon_) {
+      if (!muonFittedTSOS.isValid()) {
+        if (info)
+          std::cout << " =================  muonFittedTSOS notValid !!!!!!!! " << std::endl;
+        continue;
+      }
+      if (debug_)
+        this->debugTrajectorySOS(" muonFittedTSOS ", muonFittedTSOS);
       Rm = GlobalVector((muonFittedTSOS.globalPosition()).x(),
-			(muonFittedTSOS.globalPosition()).y(),
-			(muonFittedTSOS.globalPosition()).z());
+                        (muonFittedTSOS.globalPosition()).y(),
+                        (muonFittedTSOS.globalPosition()).z());
       Pm = muonFittedTSOS.globalMomentum();
       LPRm = AlgebraicVector4(muonFittedTSOS.localParameters().vector()(1),
-			      muonFittedTSOS.localParameters().vector()(2),
-			      muonFittedTSOS.localParameters().vector()(3),
-			      muonFittedTSOS.localParameters().vector()(4)); 
+                              muonFittedTSOS.localParameters().vector()(2),
+                              muonFittedTSOS.localParameters().vector()(3),
+                              muonFittedTSOS.localParameters().vector()(4));
     }
     GlobalVector resR = Rm - Rt;
     GlobalVector resP0 = Pm - Pt;
     GlobalVector resP = Pm / Pm.mag() - Pt / Pt.mag();
-    float RelMomResidual = (Pm.mag() - Pt.mag()) / (Pt.mag() + 1.e-6);;
+    float RelMomResidual = (Pm.mag() - Pt.mag()) / (Pt.mag() + 1.e-6);
+    ;
 
     AlgebraicVector6 Vm;
-    Vm(0) = resR.x();  Vm(1) = resR.y();  Vm(2) = resR.z(); 
-    Vm(3) = resP0.x();  Vm(4) = resP0.y();  Vm(5) = resP0.z(); 
+    Vm(0) = resR.x();
+    Vm(1) = resR.y();
+    Vm(2) = resR.z();
+    Vm(3) = resP0.x();
+    Vm(4) = resP0.y();
+    Vm(5) = resP0.z();
     float Rmuon = Rm.perp();
     float Zmuon = Rm.z();
-    float alfa_x = atan2(Nl.x(),Nl.y())*57.29578;
-    
-    if(debug_){
-      std::cout<<" Nx Ny Nz alfa_x "<<Nl.x()<<" "<<Nl.y()<<" "<<Nl.z()<<" "<<alfa_x<<std::endl;
+    float alfa_x = atan2(Nl.x(), Nl.y()) * 57.29578;
+
+    if (debug_) {
+      std::cout << " Nx Ny Nz alfa_x " << Nl.x() << " " << Nl.y() << " " << Nl.z() << " " << alfa_x << std::endl;
       //std::cout<<" Rm "<<Rm<<std::endl<<" Rt "<<Rt<<std::endl<<" resR "<<resR<<std::endl
       //       <<" resP "<<resP<<" dp/p "<<RelMomResidual<<std::endl;
     }
 
     double chi_d = 0;
-    for(int i=0; i<=5; i++) chi_d += Vm(i)*Vm(i)/Cm(i,i);
-        
-    AlgebraicVector5 Vml(tsosMuon.localParameters().vector() 
-		       - extrapolationT.localParameters().vector());
+    for (int i = 0; i <= 5; i++)
+      chi_d += Vm(i) * Vm(i) / Cm(i, i);
+
+    AlgebraicVector5 Vml(tsosMuon.localParameters().vector() - extrapolationT.localParameters().vector());
     AlgebraicSymMatrix55 m(tsosMuon.localError().matrix() + extrapolationT.localError().matrix());
     AlgebraicSymMatrix55 Cml(tsosMuon.localError().matrix() + extrapolationT.localError().matrix());
     bool ierrLoc = !m.Invert();
-    if (ierrLoc && debug_ && info) { 
-      std::cout<< " ==== Error inverting Local covariance matrix ==== "<<std::endl;
-      continue;}
-    double chi_Loc = ROOT::Math::Similarity(Vml,m);
-    if(debug_)
-      std::cout<<" chi_Loc px/pz/err "<<chi_Loc<<" "<<Vml(1)/sqrt(Cml(1,1))<<std::endl;
-
-    if(Pt.mag() < 15.) continue;
-    if(Pm.mag() <  5.) continue;
- 
+    if (ierrLoc && debug_ && info) {
+      std::cout << " ==== Error inverting Local covariance matrix ==== " << std::endl;
+      continue;
+    }
+    double chi_Loc = ROOT::Math::Similarity(Vml, m);
+    if (debug_)
+      std::cout << " chi_Loc px/pz/err " << chi_Loc << " " << Vml(1) / sqrt(Cml(1, 1)) << std::endl;
+
+    if (Pt.mag() < 15.)
+      continue;
+    if (Pm.mag() < 5.)
+      continue;
+
     //if(Pt.mag() < 30.) continue;          // momenum cut  < 30GeV
     //if(Pt.mag() < 60.) continue;          // momenum cut  < 30GeV
     //if(Pt.mag() > 50.) continue;          //  momenum cut > 50GeV
     //if(Pt.mag() > 100.) continue;          //  momenum cut > 100GeV
     //if(trackTT.charge() < 0) continue;    // select positive charge
     //if(trackTT.charge() > 0) continue;    // select negative charge
-    
-    //if(fabs(resR.x()) > 5.) continue;     // strong cut  X 
-    //if(fabs(resR.y()) > 5.) continue;     //             Y 
+
+    //if(fabs(resR.x()) > 5.) continue;     // strong cut  X
+    //if(fabs(resR.y()) > 5.) continue;     //             Y
     //if(fabs(resR.z()) > 5.) continue;     //             Z
     //if(fabs(resR.mag()) > 7.5) continue;   //            dR
 
     //if(fabs(RelMomResidual) > 0.5) continue;
-    if(fabs(resR.x()) > 20.) continue;
-    if(fabs(resR.y()) > 20.) continue;
-    if(fabs(resR.z()) > 20.) continue;
-    if(fabs(resR.mag()) > 30.) continue;
-    if(fabs(resP.x()) > 0.06) continue;
-    if(fabs(resP.y()) > 0.06) continue;
-    if(fabs(resP.z()) > 0.06) continue;
-    if(chi_d > 40.) continue;
-
-    //                                            select Barrel 
-    //if(Rmuon < 400. || Rmuon > 450.) continue; 
+    if (fabs(resR.x()) > 20.)
+      continue;
+    if (fabs(resR.y()) > 20.)
+      continue;
+    if (fabs(resR.z()) > 20.)
+      continue;
+    if (fabs(resR.mag()) > 30.)
+      continue;
+    if (fabs(resP.x()) > 0.06)
+      continue;
+    if (fabs(resP.y()) > 0.06)
+      continue;
+    if (fabs(resP.z()) > 0.06)
+      continue;
+    if (chi_d > 40.)
+      continue;
+
+    //                                            select Barrel
+    //if(Rmuon < 400. || Rmuon > 450.) continue;
     //if(Zmuon < -600. || Zmuon > 600.) continue;
-    //if(fabs(Nl.z()) > 0.95) continue;  
+    //if(fabs(Nl.z()) > 0.95) continue;
     //MuSelect = " Barrel";
     //                                                  EndCap1
     //if(Rmuon < 120. || Rmuon > 450.) continue;
     //if(Zmuon < -720.) continue;
     //if(Zmuon > -580.) continue;
-    //if(fabs(Nl.z()) < 0.95) continue;  
+    //if(fabs(Nl.z()) < 0.95) continue;
     //MuSelect = " EndCap1";
     //                                                  EndCap2
     //if(Rmuon < 120. || Rmuon > 450.) continue;
     //if(Zmuon >  720.) continue;
     //if(Zmuon <  580.) continue;
-    //if(fabs(Nl.z()) < 0.95) continue;  
+    //if(fabs(Nl.z()) < 0.95) continue;
     //MuSelect = " EndCap2";
     //                                                 select All
-    if(Rmuon < 120. || Rmuon > 450.) continue;  
-    if(Zmuon < -720. || Zmuon > 720.) continue;
+    if (Rmuon < 120. || Rmuon > 450.)
+      continue;
+    if (Zmuon < -720. || Zmuon > 720.)
+      continue;
     MuSelect = " Barrel+EndCaps";
 
-    if(debug_)
-      std::cout<<" .............. passed all cuts"<<std::endl;
-        
+    if (debug_)
+      std::cout << " .............. passed all cuts" << std::endl;
+
     N_track++;
     //                     gradient and Hessian for each track
-    
+
     GlobalTrackerMuonAlignment::gradientGlobalAlg(Rt, Pt, Rm, Nl, Cm);
-    GlobalTrackerMuonAlignment::gradientGlobal(Rt, Pt, Rm, Pm, Nl, Cm); 
-
-    CLHEP::HepSymMatrix covLoc(4,0);
-    for(int i=1; i<=4; i++)
-      for(int j=1; j<=i; j++){
-	covLoc(i,j) = (tsosMuon.localError().matrix()
-		       + extrapolationT.localError().matrix())(i,j);
-	//if(i != j) Cov(i,j) = 0.;
+    GlobalTrackerMuonAlignment::gradientGlobal(Rt, Pt, Rm, Pm, Nl, Cm);
+
+    CLHEP::HepSymMatrix covLoc(4, 0);
+    for (int i = 1; i <= 4; i++)
+      for (int j = 1; j <= i; j++) {
+        covLoc(i, j) = (tsosMuon.localError().matrix() + extrapolationT.localError().matrix())(i, j);
+        //if(i != j) Cov(i,j) = 0.;
       }
 
-    const Surface& refSurface = tsosMuon.surface(); 
-    CLHEP::HepMatrix rotLoc (3,3,0);
-    rotLoc(1,1) = refSurface.rotation().xx();
-    rotLoc(1,2) = refSurface.rotation().xy();
-    rotLoc(1,3) = refSurface.rotation().xz();
-    
-    rotLoc(2,1) = refSurface.rotation().yx();
-    rotLoc(2,2) = refSurface.rotation().yy();
-    rotLoc(2,3) = refSurface.rotation().yz();
-    
-    rotLoc(3,1) = refSurface.rotation().zx();
-    rotLoc(3,2) = refSurface.rotation().zy();
-    rotLoc(3,3) = refSurface.rotation().zz();
-    
+    const Surface& refSurface = tsosMuon.surface();
+    CLHEP::HepMatrix rotLoc(3, 3, 0);
+    rotLoc(1, 1) = refSurface.rotation().xx();
+    rotLoc(1, 2) = refSurface.rotation().xy();
+    rotLoc(1, 3) = refSurface.rotation().xz();
+
+    rotLoc(2, 1) = refSurface.rotation().yx();
+    rotLoc(2, 2) = refSurface.rotation().yy();
+    rotLoc(2, 3) = refSurface.rotation().yz();
+
+    rotLoc(3, 1) = refSurface.rotation().zx();
+    rotLoc(3, 2) = refSurface.rotation().zy();
+    rotLoc(3, 3) = refSurface.rotation().zz();
+
     CLHEP::HepVector posLoc(3);
     posLoc(1) = refSurface.position().x();
     posLoc(2) = refSurface.position().y();
@@ -1893,292 +1910,324 @@ void GlobalTrackerMuonAlignment::analyzeTrackTrajectory
 
     GlobalTrackerMuonAlignment::gradientLocal(Rt, Pt, Rm, Pm, Nl, covLoc, rotLoc, posLoc, LPRm);
 
-    if(debug_){
-      std::cout<<" Norm   "<<Nl<<std::endl;
-      std::cout<<" posLoc "<<posLoc.T()<<std::endl;
-      std::cout<<" rotLoc "<<rotLoc<<std::endl;
+    if (debug_) {
+      std::cout << " Norm   " << Nl << std::endl;
+      std::cout << " posLoc " << posLoc.T() << std::endl;
+      std::cout << " rotLoc " << rotLoc << std::endl;
     }
 
-    // -----------------------------------------------------  fill histogram 
-    histo->Fill(itMuon->track()->pt()); 
-    
-    //histo2->Fill(itMuon->track()->outerP()); 
-    histo2->Fill(Pt.mag()); 
-    histo3->Fill((PI/2.-itMuon->track()->outerTheta())); 
-    histo4->Fill(itMuon->track()->phi()); 
-    histo5->Fill(Rmuon); 
-    histo6->Fill(Zmuon); 
-    histo7->Fill(RelMomResidual); 
-    //histo8->Fill(chi); 
-    histo8->Fill(chi_d); 
-    
-    histo101->Fill(Zmuon, Rmuon); 
-    histo101->Fill(Rt0.z(), Rt0.perp()); 
-    histo102->Fill(Rt0.x(), Rt0.y()); 
-    histo102->Fill(Rm.x(), Rm.y()); 
-    
-    histo11->Fill(resR.mag()); 
-    if(fabs(Nl.x()) < 0.98) histo12->Fill(resR.x()); 
-    if(fabs(Nl.y()) < 0.98) histo13->Fill(resR.y()); 
-    if(fabs(Nl.z()) < 0.98) histo14->Fill(resR.z()); 
-    histo15->Fill(resP.x()); 
-    histo16->Fill(resP.y()); 
-    histo17->Fill(resP.z()); 
-    
-    if((fabs(Nl.x()) < 0.98) && (fabs(Nl.y()) < 0.98) &&(fabs(Nl.z()) < 0.98))
-      { 
-	histo18->Fill(sqrt(C0(0,0))); 
-	histo19->Fill(sqrt(C1(0,0))); 
-	histo20->Fill(sqrt(C1(0,0)+Ce(0,0))); 		   
-      }
-    if(fabs(Nl.x()) < 0.98) histo21->Fill(Vm(0)/sqrt(Cm(0,0))); 
-    if(fabs(Nl.y()) < 0.98) histo22->Fill(Vm(1)/sqrt(Cm(1,1))); 
-    if(fabs(Nl.z()) < 0.98) histo23->Fill(Vm(2)/sqrt(Cm(2,2))); 
-    histo24->Fill(Vm(3)/sqrt(C1(3,3)+Ce(3,3))); 
-    histo25->Fill(Vm(4)/sqrt(C1(4,4)+Ce(4,4))); 
-    histo26->Fill(Vm(5)/sqrt(C1(5,5)+Ce(5,5))); 
-    histo27->Fill(Nl.x()); 
-    histo28->Fill(Nl.y()); 
-    histo29->Fill(lenghtTrack); 
-    histo30->Fill(lenghtMuon);     
+    // -----------------------------------------------------  fill histogram
+    histo->Fill(itMuon->track()->pt());
+
+    //histo2->Fill(itMuon->track()->outerP());
+    histo2->Fill(Pt.mag());
+    histo3->Fill((PI / 2. - itMuon->track()->outerTheta()));
+    histo4->Fill(itMuon->track()->phi());
+    histo5->Fill(Rmuon);
+    histo6->Fill(Zmuon);
+    histo7->Fill(RelMomResidual);
+    //histo8->Fill(chi);
+    histo8->Fill(chi_d);
+
+    histo101->Fill(Zmuon, Rmuon);
+    histo101->Fill(Rt0.z(), Rt0.perp());
+    histo102->Fill(Rt0.x(), Rt0.y());
+    histo102->Fill(Rm.x(), Rm.y());
+
+    histo11->Fill(resR.mag());
+    if (fabs(Nl.x()) < 0.98)
+      histo12->Fill(resR.x());
+    if (fabs(Nl.y()) < 0.98)
+      histo13->Fill(resR.y());
+    if (fabs(Nl.z()) < 0.98)
+      histo14->Fill(resR.z());
+    histo15->Fill(resP.x());
+    histo16->Fill(resP.y());
+    histo17->Fill(resP.z());
+
+    if ((fabs(Nl.x()) < 0.98) && (fabs(Nl.y()) < 0.98) && (fabs(Nl.z()) < 0.98)) {
+      histo18->Fill(sqrt(C0(0, 0)));
+      histo19->Fill(sqrt(C1(0, 0)));
+      histo20->Fill(sqrt(C1(0, 0) + Ce(0, 0)));
+    }
+    if (fabs(Nl.x()) < 0.98)
+      histo21->Fill(Vm(0) / sqrt(Cm(0, 0)));
+    if (fabs(Nl.y()) < 0.98)
+      histo22->Fill(Vm(1) / sqrt(Cm(1, 1)));
+    if (fabs(Nl.z()) < 0.98)
+      histo23->Fill(Vm(2) / sqrt(Cm(2, 2)));
+    histo24->Fill(Vm(3) / sqrt(C1(3, 3) + Ce(3, 3)));
+    histo25->Fill(Vm(4) / sqrt(C1(4, 4) + Ce(4, 4)));
+    histo26->Fill(Vm(5) / sqrt(C1(5, 5) + Ce(5, 5)));
+    histo27->Fill(Nl.x());
+    histo28->Fill(Nl.y());
+    histo29->Fill(lenghtTrack);
+    histo30->Fill(lenghtMuon);
     histo31->Fill(chi_Loc);
-    histo32->Fill(Vml(1)/sqrt(Cml(1,1))); 
-    histo33->Fill(Vml(2)/sqrt(Cml(2,2))); 
-    histo34->Fill(Vml(3)/sqrt(Cml(3,3))); 
-    histo35->Fill(Vml(4)/sqrt(Cml(4,4))); 
-
-    if (debug_) {   //--------------------------------- debug print ----------
-      
-      std::cout<<" diag 0[ "<<C0(0,0)<<" "<<C0(1,1)<<" "<<C0(2,2)<<" "<<C0(3,3)<<" "
-	       <<C0(4,4)<<" "<<C0(5,5)<<" ]"<<std::endl;
-      std::cout<<" diag e[ "<<Ce(0,0)<<" "<<Ce(1,1)<<" "<<Ce(2,2)<<" "<<Ce(3,3)<<" "
-	       <<Ce(4,4)<<" "<<Ce(5,5)<<" ]"<<std::endl;
-      std::cout<<" diag 1[ "<<C1(0,0)<<" "<<C1(1,1)<<" "<<C1(2,2)<<" "<<C1(3,3)<<" "
-	       <<C1(4,4)<<" "<<C1(5,5)<<" ]"<<std::endl;
-      std::cout<<" Rm   "<<Rm.x()<<" "<<Rm.y()<<" "<<Rm.z()
-	       <<" Pm   "<<Pm.x()<<" "<<Pm.y()<<" "<<Pm.z()<<std::endl;
-      std::cout<<" Rt   "<<Rt.x()<<" "<<Rt.y()<<" "<<Rt.z()
-	       <<" Pt   "<<Pt.x()<<" "<<Pt.y()<<" "<<Pt.z()<<std::endl;
-      std::cout<<" Nl*(Rm-Rt) "<<Nl.dot(Rm-Rt)<<std::endl;
-      std::cout<<" resR "<<resR.x()<<" "<<resR.y()<<" "<<resR.z()
-	       <<" resP "<<resP.x()<<" "<<resP.y()<<" "<<resP.z()<<std::endl;       
-      std::cout<<" Rm-t "<<(Rm-Rt).x()<<" "<<(Rm-Rt).y()<<" "<<(Rm-Rt).z()
-	       <<" Pm-t "<<(Pm-Pt).x()<<" "<<(Pm-Pt).y()<<" "<<(Pm-Pt).z()<<std::endl;       
-      std::cout<<" Vm   "<<Vm<<std::endl;
-      std::cout<<" +-   "<<sqrt(Cm(0,0))<<" "<<sqrt(Cm(1,1))<<" "<<sqrt(Cm(2,2))<<" "
-	       <<sqrt(Cm(3,3))<<" "<<sqrt(Cm(4,4))<<" "<<sqrt(Cm(5,5))<<std::endl;
-      std::cout<<" Pmuon Ptrack dP/Ptrack "<<itMuon->outerTrack()->p()<<" "
-	       <<itMuon->track()->outerP()<<" "
-	       <<(itMuon->outerTrack()->p() - 
-		  itMuon->track()->outerP())/itMuon->track()->outerP()<<std::endl;
-      std::cout<<" cov matrix "<<std::endl;
-      std::cout<<Cm<<std::endl;
-      std::cout<<" diag [ "<<Cm(0,0)<<" "<<Cm(1,1)<<" "<<Cm(2,2)<<" "<<Cm(3,3)<<" "
-	       <<Cm(4,4)<<" "<<Cm(5,5)<<" ]"<<std::endl;
-      
+    histo32->Fill(Vml(1) / sqrt(Cml(1, 1)));
+    histo33->Fill(Vml(2) / sqrt(Cml(2, 2)));
+    histo34->Fill(Vml(3) / sqrt(Cml(3, 3)));
+    histo35->Fill(Vml(4) / sqrt(Cml(4, 4)));
+
+    if (debug_) {  //--------------------------------- debug print ----------
+
+      std::cout << " diag 0[ " << C0(0, 0) << " " << C0(1, 1) << " " << C0(2, 2) << " " << C0(3, 3) << " " << C0(4, 4)
+                << " " << C0(5, 5) << " ]" << std::endl;
+      std::cout << " diag e[ " << Ce(0, 0) << " " << Ce(1, 1) << " " << Ce(2, 2) << " " << Ce(3, 3) << " " << Ce(4, 4)
+                << " " << Ce(5, 5) << " ]" << std::endl;
+      std::cout << " diag 1[ " << C1(0, 0) << " " << C1(1, 1) << " " << C1(2, 2) << " " << C1(3, 3) << " " << C1(4, 4)
+                << " " << C1(5, 5) << " ]" << std::endl;
+      std::cout << " Rm   " << Rm.x() << " " << Rm.y() << " " << Rm.z() << " Pm   " << Pm.x() << " " << Pm.y() << " "
+                << Pm.z() << std::endl;
+      std::cout << " Rt   " << Rt.x() << " " << Rt.y() << " " << Rt.z() << " Pt   " << Pt.x() << " " << Pt.y() << " "
+                << Pt.z() << std::endl;
+      std::cout << " Nl*(Rm-Rt) " << Nl.dot(Rm - Rt) << std::endl;
+      std::cout << " resR " << resR.x() << " " << resR.y() << " " << resR.z() << " resP " << resP.x() << " " << resP.y()
+                << " " << resP.z() << std::endl;
+      std::cout << " Rm-t " << (Rm - Rt).x() << " " << (Rm - Rt).y() << " " << (Rm - Rt).z() << " Pm-t "
+                << (Pm - Pt).x() << " " << (Pm - Pt).y() << " " << (Pm - Pt).z() << std::endl;
+      std::cout << " Vm   " << Vm << std::endl;
+      std::cout << " +-   " << sqrt(Cm(0, 0)) << " " << sqrt(Cm(1, 1)) << " " << sqrt(Cm(2, 2)) << " " << sqrt(Cm(3, 3))
+                << " " << sqrt(Cm(4, 4)) << " " << sqrt(Cm(5, 5)) << std::endl;
+      std::cout << " Pmuon Ptrack dP/Ptrack " << itMuon->outerTrack()->p() << " " << itMuon->track()->outerP() << " "
+                << (itMuon->outerTrack()->p() - itMuon->track()->outerP()) / itMuon->track()->outerP() << std::endl;
+      std::cout << " cov matrix " << std::endl;
+      std::cout << Cm << std::endl;
+      std::cout << " diag [ " << Cm(0, 0) << " " << Cm(1, 1) << " " << Cm(2, 2) << " " << Cm(3, 3) << " " << Cm(4, 4)
+                << " " << Cm(5, 5) << " ]" << std::endl;
+
       AlgebraicSymMatrix66 Ro;
       double Diag[6];
-      for(int i=0; i<=5; i++) Diag[i] = sqrt(Cm(i,i));
-      for(int i=0; i<=5; i++)
-	for(int j=0; j<=5; j++)
-	  Ro(i,j) = Cm(i,j)/Diag[i]/Diag[j];
-      std::cout<<" correlation matrix "<<std::endl;
-      std::cout<<Ro<<std::endl;
-      
+      for (int i = 0; i <= 5; i++)
+        Diag[i] = sqrt(Cm(i, i));
+      for (int i = 0; i <= 5; i++)
+        for (int j = 0; j <= 5; j++)
+          Ro(i, j) = Cm(i, j) / Diag[i] / Diag[j];
+      std::cout << " correlation matrix " << std::endl;
+      std::cout << Ro << std::endl;
+
       AlgebraicSymMatrix66 CmI;
-      for(int i=0; i<=5; i++)
-	for(int j=0; j<=5; j++)
-	  CmI(i,j) = Cm(i,j);
-      
+      for (int i = 0; i <= 5; i++)
+        for (int j = 0; j <= 5; j++)
+          CmI(i, j) = Cm(i, j);
+
       bool ierr = !CmI.Invert();
-      if( ierr ) { if(alarm || debug_)
-	  std::cout<<" Error inverse covariance matrix !!!!!!!!!!!"<<std::endl;
-	continue;
-      }       
-      std::cout<<" inverse cov matrix "<<std::endl;
-      std::cout<<Cm<<std::endl;
-      
+      if (ierr) {
+        if (alarm || debug_)
+          std::cout << " Error inverse covariance matrix !!!!!!!!!!!" << std::endl;
+        continue;
+      }
+      std::cout << " inverse cov matrix " << std::endl;
+      std::cout << Cm << std::endl;
+
       double chi = ROOT::Math::Similarity(Vm, CmI);
-      std::cout<<" chi chi_d "<<chi<<" "<<chi_d<<std::endl;
+      std::cout << " chi chi_d " << chi << " " << chi_d << std::endl;
     }  // end of debug_ printout  --------------------------------------------
-    
-  } // end loop on selected muons, i.e. Jim's globalMuon
 
-} //end of analyzeTrackTrajectory
+  }  // end loop on selected muons, i.e. Jim's globalMuon
 
+}  //end of analyzeTrackTrajectory
 
 // ----  calculate gradient and Hessian matrix (algebraic) to search global shifts ------
-void 
-GlobalTrackerMuonAlignment::gradientGlobalAlg(GlobalVector& Rt, GlobalVector& Pt, 
-				     GlobalVector& Rm, GlobalVector& Nl, 
-				     AlgebraicSymMatrix66& Cm)
-{
+void GlobalTrackerMuonAlignment::gradientGlobalAlg(
+    GlobalVector& Rt, GlobalVector& Pt, GlobalVector& Rm, GlobalVector& Nl, AlgebraicSymMatrix66& Cm) {
   // ---------------------------- Calculate Information matrix and Gfree vector
   // Information == Hessian , Gfree == gradient of the objective function
-  
-  AlgebraicMatrix33 Jac; 
-  AlgebraicVector3 Wi, R_m, R_t, P_t, Norm, dR;   
-  
-  R_m(0)  = Rm.x();  R_m(1)  = Rm.y();  R_m(2)  = Rm.z(); 
-  R_t(0)  = Rt.x();  R_t(1)  = Rt.y();  R_t(2)  = Rt.z(); 
-  P_t(0)  = Pt.x();  P_t(1)  = Pt.y();  P_t(2)  = Pt.z(); 
-  Norm(0) = Nl.x();  Norm(1) = Nl.y();  Norm(2) = Nl.z(); 
-  
-  for(int i=0; i<=2; i++){
-    if(Cm(i,i) > 1.e-20)
-      Wi(i) = 1./Cm(i,i);
-    else Wi(i) = 1.e-10;
+
+  AlgebraicMatrix33 Jac;
+  AlgebraicVector3 Wi, R_m, R_t, P_t, Norm, dR;
+
+  R_m(0) = Rm.x();
+  R_m(1) = Rm.y();
+  R_m(2) = Rm.z();
+  R_t(0) = Rt.x();
+  R_t(1) = Rt.y();
+  R_t(2) = Rt.z();
+  P_t(0) = Pt.x();
+  P_t(1) = Pt.y();
+  P_t(2) = Pt.z();
+  Norm(0) = Nl.x();
+  Norm(1) = Nl.y();
+  Norm(2) = Nl.z();
+
+  for (int i = 0; i <= 2; i++) {
+    if (Cm(i, i) > 1.e-20)
+      Wi(i) = 1. / Cm(i, i);
+    else
+      Wi(i) = 1.e-10;
     dR(i) = R_m(i) - R_t(i);
   }
-  
-  float PtN = P_t(0)*Norm(0) + P_t(1)*Norm(1) + P_t(2)*Norm(2);
-  
-  Jac(0,0) = 1. - P_t(0)*Norm(0)/PtN;
-  Jac(0,1) =    - P_t(0)*Norm(1)/PtN;
-  Jac(0,2) =    - P_t(0)*Norm(2)/PtN;
-  
-  Jac(1,0) =    - P_t(1)*Norm(0)/PtN;
-  Jac(1,1) = 1. - P_t(1)*Norm(1)/PtN;
-  Jac(1,2) =    - P_t(1)*Norm(2)/PtN;
-  
-  Jac(2,0) =    - P_t(2)*Norm(0)/PtN;
-  Jac(2,1) =    - P_t(2)*Norm(1)/PtN;
-  Jac(2,2) = 1. - P_t(2)*Norm(2)/PtN;
-  
+
+  float PtN = P_t(0) * Norm(0) + P_t(1) * Norm(1) + P_t(2) * Norm(2);
+
+  Jac(0, 0) = 1. - P_t(0) * Norm(0) / PtN;
+  Jac(0, 1) = -P_t(0) * Norm(1) / PtN;
+  Jac(0, 2) = -P_t(0) * Norm(2) / PtN;
+
+  Jac(1, 0) = -P_t(1) * Norm(0) / PtN;
+  Jac(1, 1) = 1. - P_t(1) * Norm(1) / PtN;
+  Jac(1, 2) = -P_t(1) * Norm(2) / PtN;
+
+  Jac(2, 0) = -P_t(2) * Norm(0) / PtN;
+  Jac(2, 1) = -P_t(2) * Norm(1) / PtN;
+  Jac(2, 2) = 1. - P_t(2) * Norm(2) / PtN;
+
   AlgebraicSymMatrix33 Itr;
-  
-  for(int i=0; i<=2; i++) 
-    for(int j=0; j<=2; j++){
-      if(j < i) continue;
-      Itr(i,j) = 0.;
-      //std::cout<<" ij "<<i<<" "<<j<<std::endl;	 
-      for(int k=0; k<=2; k++){
-	Itr(i,j) += Jac(k,i)*Wi(k)*Jac(k,j);}}
-  
-  for(int i=0; i<=2; i++) 
-    for(int j=0; j<=2; j++){
-      if(j < i) continue;
-      Inf(i,j) += Itr(i,j);}
-  
+
+  for (int i = 0; i <= 2; i++)
+    for (int j = 0; j <= 2; j++) {
+      if (j < i)
+        continue;
+      Itr(i, j) = 0.;
+      //std::cout<<" ij "<<i<<" "<<j<<std::endl;
+      for (int k = 0; k <= 2; k++) {
+        Itr(i, j) += Jac(k, i) * Wi(k) * Jac(k, j);
+      }
+    }
+
+  for (int i = 0; i <= 2; i++)
+    for (int j = 0; j <= 2; j++) {
+      if (j < i)
+        continue;
+      Inf(i, j) += Itr(i, j);
+    }
+
   AlgebraicVector3 Gtr(0., 0., 0.);
-  for(int i=0; i<=2; i++)
-    for(int k=0; k<=2; k++) Gtr(i) += dR(k)*Wi(k)*Jac(k,i);
-  for(int i=0; i<=2; i++) Gfr(i) += Gtr(i); 
-
-  if(debug_){
-   std::cout<<" Wi  "<<Wi<<std::endl;     
-   std::cout<<" N   "<<Norm<<std::endl;
-   std::cout<<" P_t "<<P_t<<std::endl;
-   std::cout<<" (Pt*N) "<<PtN<<std::endl;  
-   std::cout<<" dR  "<<dR<<std::endl;
-   std::cout<<" +/- "<<1./sqrt(Wi(0))<<" "<<1./sqrt(Wi(1))<<" "<<1./sqrt(Wi(2))
-         <<" "<<std::endl;
-   std::cout<<" Jacobian dr/ddx "<<std::endl;
-   std::cout<<Jac<<std::endl;
-   std::cout<<" G-- "<<Gtr<<std::endl;
-   std::cout<<" Itrack "<<std::endl;
-   std::cout<<Itr<<std::endl;
-   std::cout<<" Gfr "<<Gfr<<std::endl;
-   std::cout<<" -- Inf --"<<std::endl;
-   std::cout<<Inf<<std::endl;
+  for (int i = 0; i <= 2; i++)
+    for (int k = 0; k <= 2; k++)
+      Gtr(i) += dR(k) * Wi(k) * Jac(k, i);
+  for (int i = 0; i <= 2; i++)
+    Gfr(i) += Gtr(i);
+
+  if (debug_) {
+    std::cout << " Wi  " << Wi << std::endl;
+    std::cout << " N   " << Norm << std::endl;
+    std::cout << " P_t " << P_t << std::endl;
+    std::cout << " (Pt*N) " << PtN << std::endl;
+    std::cout << " dR  " << dR << std::endl;
+    std::cout << " +/- " << 1. / sqrt(Wi(0)) << " " << 1. / sqrt(Wi(1)) << " " << 1. / sqrt(Wi(2)) << " " << std::endl;
+    std::cout << " Jacobian dr/ddx " << std::endl;
+    std::cout << Jac << std::endl;
+    std::cout << " G-- " << Gtr << std::endl;
+    std::cout << " Itrack " << std::endl;
+    std::cout << Itr << std::endl;
+    std::cout << " Gfr " << Gfr << std::endl;
+    std::cout << " -- Inf --" << std::endl;
+    std::cout << Inf << std::endl;
   }
 
   return;
 }
 
 // ----  calculate gradient and Hessian matrix in global parameters ------
-void 
-GlobalTrackerMuonAlignment::gradientGlobal(GlobalVector& GRt, GlobalVector& GPt, 
-				  GlobalVector& GRm, GlobalVector& GPm, 
-				  GlobalVector& GNorm, AlgebraicSymMatrix66 & GCov)
-{
+void GlobalTrackerMuonAlignment::gradientGlobal(GlobalVector& GRt,
+                                                GlobalVector& GPt,
+                                                GlobalVector& GRm,
+                                                GlobalVector& GPm,
+                                                GlobalVector& GNorm,
+                                                AlgebraicSymMatrix66& GCov) {
   // we search for 6D global correction vector (d, a), where
-  //                        3D vector of shihts d 
-  //               3D vector of rotation angles    a   
+  //                        3D vector of shihts d
+  //               3D vector of rotation angles    a
 
   //bool alarm = true;
   bool alarm = false;
   bool info = false;
 
-  int Nd = 6;     // dimension of vector of alignment pararmeters, d 
-  
+  int Nd = 6;  // dimension of vector of alignment pararmeters, d
+
   //double PtMom = GPt.mag();
-  CLHEP::HepSymMatrix w(Nd,0);
-  for (int i=1; i <= Nd; i++)
-    for (int j=1; j <= Nd; j++){
-      if(j <= i ) w(i,j) = GCov(i-1, j-1);
+  CLHEP::HepSymMatrix w(Nd, 0);
+  for (int i = 1; i <= Nd; i++)
+    for (int j = 1; j <= Nd; j++) {
+      if (j <= i)
+        w(i, j) = GCov(i - 1, j - 1);
       //if(i >= 3) w(i,j) /= PtMom;
       //if(j >= 3) w(i,j) /= PtMom;
-      if((i == j) && (i<=3) && (GCov(i-1, j-1) < 1.e-20))  w(i,j) = 1.e20; // w=0  
-      if(i != j) w(i,j) = 0.;                // use diaginal elements    
+      if ((i == j) && (i <= 3) && (GCov(i - 1, j - 1) < 1.e-20))
+        w(i, j) = 1.e20;  // w=0
+      if (i != j)
+        w(i, j) = 0.;  // use diaginal elements
     }
 
   //GPt /= GPt.mag();
   //GPm /= GPm.mag();   // end of transform
 
   CLHEP::HepVector V(Nd), Rt(3), Pt(3), Rm(3), Pm(3), Norm(3);
-  Rt(1) = GRt.x(); Rt(2) = GRt.y();  Rt(3) = GRt.z();
-  Pt(1) = GPt.x(); Pt(2) = GPt.y();  Pt(3) = GPt.z();
-  Rm(1) = GRm.x(); Rm(2) = GRm.y();  Rm(3) = GRm.z();
-  Pm(1) = GPm.x(); Pm(2) = GPm.y();  Pm(3) = GPm.z();
-   Norm(1) = GNorm.x(); Norm(2) = GNorm.y(); Norm(3) = GNorm.z(); 
+  Rt(1) = GRt.x();
+  Rt(2) = GRt.y();
+  Rt(3) = GRt.z();
+  Pt(1) = GPt.x();
+  Pt(2) = GPt.y();
+  Pt(3) = GPt.z();
+  Rm(1) = GRm.x();
+  Rm(2) = GRm.y();
+  Rm(3) = GRm.z();
+  Pm(1) = GPm.x();
+  Pm(2) = GPm.y();
+  Pm(3) = GPm.z();
+  Norm(1) = GNorm.x();
+  Norm(2) = GNorm.y();
+  Norm(3) = GNorm.z();
+
+  V = dsum(Rm - Rt, Pm - Pt);  //std::cout<<" V "<<V.T()<<std::endl;
 
-  V = dsum(Rm - Rt, Pm - Pt) ;   //std::cout<<" V "<<V.T()<<std::endl;
-  
   //double PmN = CLHEP::dot(Pm, Norm);
   double PmN = CLHEP_dot(Pm, Norm);
 
-  CLHEP::HepMatrix Jac(Nd,Nd,0);
-  for (int i=1; i <= 3; i++)
-    for (int j=1; j <= 3; j++){
-      Jac(i,j) =  Pm(i)*Norm(j) / PmN;
-      if(i == j ) Jac(i,j) -= 1.;
-    } 
-
-  //                                            dp/da                   
-  Jac(4,4) =     0.;   // dpx/dax
-  Jac(5,4) = -Pm(3);   // dpy/dax
-  Jac(6,4) =  Pm(2);   // dpz/dax
-  Jac(4,5) =  Pm(3);   // dpx/day
-  Jac(5,5) =     0.;   // dpy/day
-  Jac(6,5) = -Pm(1);   // dpz/day
-  Jac(4,6) = -Pm(2);   // dpx/daz
-  Jac(5,6) =  Pm(1);   // dpy/daz
-  Jac(6,6) =     0.;   // dpz/daz
+  CLHEP::HepMatrix Jac(Nd, Nd, 0);
+  for (int i = 1; i <= 3; i++)
+    for (int j = 1; j <= 3; j++) {
+      Jac(i, j) = Pm(i) * Norm(j) / PmN;
+      if (i == j)
+        Jac(i, j) -= 1.;
+    }
+
+  //                                            dp/da
+  Jac(4, 4) = 0.;      // dpx/dax
+  Jac(5, 4) = -Pm(3);  // dpy/dax
+  Jac(6, 4) = Pm(2);   // dpz/dax
+  Jac(4, 5) = Pm(3);   // dpx/day
+  Jac(5, 5) = 0.;      // dpy/day
+  Jac(6, 5) = -Pm(1);  // dpz/day
+  Jac(4, 6) = -Pm(2);  // dpx/daz
+  Jac(5, 6) = Pm(1);   // dpy/daz
+  Jac(6, 6) = 0.;      // dpz/daz
 
   CLHEP::HepVector dsda(3);
-  dsda(1) = (Norm(2)*Rm(3) - Norm(3)*Rm(2)) / PmN;
-  dsda(2) = (Norm(3)*Rm(1) - Norm(1)*Rm(3)) / PmN;
-  dsda(3) = (Norm(1)*Rm(2) - Norm(2)*Rm(1)) / PmN;
+  dsda(1) = (Norm(2) * Rm(3) - Norm(3) * Rm(2)) / PmN;
+  dsda(2) = (Norm(3) * Rm(1) - Norm(1) * Rm(3)) / PmN;
+  dsda(3) = (Norm(1) * Rm(2) - Norm(2) * Rm(1)) / PmN;
 
-  //                                             dr/da  
-  Jac(1,4) =          Pm(1)*dsda(1);  // drx/dax
-  Jac(2,4) = -Rm(3) + Pm(2)*dsda(1);  // dry/dax
-  Jac(3,4) =  Rm(2) + Pm(3)*dsda(1);  // drz/dax
+  //                                             dr/da
+  Jac(1, 4) = Pm(1) * dsda(1);           // drx/dax
+  Jac(2, 4) = -Rm(3) + Pm(2) * dsda(1);  // dry/dax
+  Jac(3, 4) = Rm(2) + Pm(3) * dsda(1);   // drz/dax
 
-  Jac(1,5) =  Rm(3) + Pm(1)*dsda(2);  // drx/day
-  Jac(2,5) =          Pm(2)*dsda(2);  // dry/day
-  Jac(3,5) = -Rm(1) + Pm(3)*dsda(2);  // drz/day
+  Jac(1, 5) = Rm(3) + Pm(1) * dsda(2);   // drx/day
+  Jac(2, 5) = Pm(2) * dsda(2);           // dry/day
+  Jac(3, 5) = -Rm(1) + Pm(3) * dsda(2);  // drz/day
 
-  Jac(1,6) = -Rm(2) + Pm(1)*dsda(3);  // drx/daz
-  Jac(2,6) =  Rm(1) + Pm(2)*dsda(3);  // dry/daz
-  Jac(3,6) =          Pm(3)*dsda(3);  // drz/daz
+  Jac(1, 6) = -Rm(2) + Pm(1) * dsda(3);  // drx/daz
+  Jac(2, 6) = Rm(1) + Pm(2) * dsda(3);   // dry/daz
+  Jac(3, 6) = Pm(3) * dsda(3);           // drz/daz
 
-  CLHEP::HepSymMatrix W(Nd,0);
+  CLHEP::HepSymMatrix W(Nd, 0);
   int ierr;
   W = w.inverse(ierr);
-  if(ierr != 0) { if(alarm)
-      std::cout<<" gradientGlobal: inversion of matrix w fail "<<std::endl;
+  if (ierr != 0) {
+    if (alarm)
+      std::cout << " gradientGlobal: inversion of matrix w fail " << std::endl;
     return;
   }
 
-  CLHEP::HepMatrix W_Jac(Nd,Nd,0);
+  CLHEP::HepMatrix W_Jac(Nd, Nd, 0);
   W_Jac = Jac.T() * W;
-  
+
   CLHEP::HepVector grad3(Nd);
   grad3 = W_Jac * V;
 
-  CLHEP::HepMatrix hess3(Nd,Nd);
+  CLHEP::HepMatrix hess3(Nd, Nd);
   hess3 = Jac.T() * W * Jac;
   //hess3(4,4) = 1.e-10;  hess3(5,5) = 1.e-10;  hess3(6,6) = 1.e-10; //????????????????
 
@@ -2188,97 +2237,93 @@ GlobalTrackerMuonAlignment::gradientGlobal(GlobalVector& GRt, GlobalVector& GPt,
   CLHEP::HepVector d3I = CLHEP::solve(Hess, -Grad);
   int iEr3I;
   CLHEP::HepMatrix Errd3I = Hess.inverse(iEr3I);
-  if( iEr3I != 0) { if(alarm)
-      std::cout<<" gradientGlobal error inverse  Hess matrix !!!!!!!!!!!"<<std::endl;
+  if (iEr3I != 0) {
+    if (alarm)
+      std::cout << " gradientGlobal error inverse  Hess matrix !!!!!!!!!!!" << std::endl;
   }
 
-  if(info || debug_){
-    std::cout<<" dG   "<<d3I(1)<<" "<<d3I(2)<<" "<<d3I(3)<<" "<<d3I(4)<<" "
-	     <<d3I(5)<<" "<<d3I(6)<<std::endl;;
-    std::cout<<" +-   "<<sqrt(Errd3I(1,1))<<" "<<sqrt(Errd3I(2,2))<<" "<<sqrt(Errd3I(3,3))
-	     <<" "<<sqrt(Errd3I(4,4))<<" "<<sqrt(Errd3I(5,5))<<" "<<sqrt(Errd3I(6,6))
-	     <<std::endl;
+  if (info || debug_) {
+    std::cout << " dG   " << d3I(1) << " " << d3I(2) << " " << d3I(3) << " " << d3I(4) << " " << d3I(5) << " " << d3I(6)
+              << std::endl;
+    ;
+    std::cout << " +-   " << sqrt(Errd3I(1, 1)) << " " << sqrt(Errd3I(2, 2)) << " " << sqrt(Errd3I(3, 3)) << " "
+              << sqrt(Errd3I(4, 4)) << " " << sqrt(Errd3I(5, 5)) << " " << sqrt(Errd3I(6, 6)) << std::endl;
   }
 
 #ifdef CHECK_OF_DERIVATIVES
   //              --------------------    check of derivatives
-  
-  CLHEP::HepVector d(3,0), a(3,0); 
-  CLHEP::HepMatrix T(3,3,1);
+
+  CLHEP::HepVector d(3, 0), a(3, 0);
+  CLHEP::HepMatrix T(3, 3, 1);
 
   CLHEP::HepMatrix Ti = T.T();
   //double A = CLHEP::dot(Ti*Pm, Norm);
   //double B = CLHEP::dot((Rt -Ti*Rm + Ti*d), Norm);
-  double A = CLHEP_dot(Ti*Pm, Norm);
-  double B = CLHEP_dot((Rt -Ti*Rm + Ti*d), Norm);
+  double A = CLHEP_dot(Ti * Pm, Norm);
+  double B = CLHEP_dot((Rt - Ti * Rm + Ti * d), Norm);
   double s0 = B / A;
 
-  CLHEP::HepVector r0(3,0), p0(3,0);
-  r0 = Ti*Rm - Ti*d + s0*(Ti*Pm) - Rt;
-  p0 = Ti*Pm - Pt;
+  CLHEP::HepVector r0(3, 0), p0(3, 0);
+  r0 = Ti * Rm - Ti * d + s0 * (Ti * Pm) - Rt;
+  p0 = Ti * Pm - Pt;
 
   double delta = 0.0001;
 
-  int ii = 3; d(ii) += delta; // d
+  int ii = 3;
+  d(ii) += delta;  // d
   //T(2,3) += delta;   T(3,2) -= delta;  int ii = 1; // a1
   //T(3,1) += delta;   T(1,3) -= delta;   int ii = 2; // a2
   //T(1,2) += delta;   T(2,1) -= delta;   int ii = 3; // a2
   Ti = T.T();
   //A = CLHEP::dot(Ti*Pm, Norm);
   //B = CLHEP::dot((Rt -Ti*Rm + Ti*d), Norm);
-  A = CLHEP_dot(Ti*Pm, Norm);
-  B = CLHEP_dot((Rt -Ti*Rm + Ti*d), Norm);
+  A = CLHEP_dot(Ti * Pm, Norm);
+  B = CLHEP_dot((Rt - Ti * Rm + Ti * d), Norm);
   double s = B / A;
 
-  CLHEP::HepVector r(3,0), p(3,0);
-  r = Ti*Rm - Ti*d + s*(Ti*Pm) - Rt;
-  p = Ti*Pm - Pt;
+  CLHEP::HepVector r(3, 0), p(3, 0);
+  r = Ti * Rm - Ti * d + s * (Ti * Pm) - Rt;
+  p = Ti * Pm - Pt;
 
-  std::cout<<" s0 s num dsda("<<ii<<") "<<s0<<" "<<s<<" "
-  	   <<(s-s0)/delta<<" "<<dsda(ii)<<endl;
+  std::cout << " s0 s num dsda(" << ii << ") " << s0 << " " << s << " " << (s - s0) / delta << " " << dsda(ii) << endl;
   // d(r,p) / d shift
-  std::cout<<" -- An d(r,p)/d("<<ii<<") "<<Jac(1,ii)<<" "<<Jac(2,ii)<<" "
-     <<Jac(3,ii)<<" "<<Jac(4,ii)<<" "<<Jac(5,ii)<<" "
-     <<Jac(6,ii)<<std::endl;
-  std::cout<<"    Nu d(r,p)/d("<<ii<<") "<<(r(1)-r0(1))/delta<<" "
-     <<(r(2)-r0(2))/delta<<" "<<(r(3)-r0(3))/delta<<" "
-     <<(p(1)-p0(1))/delta<<" "<<(p(2)-p0(2))/delta<<" "
-     <<(p(3)-p0(3))/delta<<std::endl;
+  std::cout << " -- An d(r,p)/d(" << ii << ") " << Jac(1, ii) << " " << Jac(2, ii) << " " << Jac(3, ii) << " "
+            << Jac(4, ii) << " " << Jac(5, ii) << " " << Jac(6, ii) << std::endl;
+  std::cout << "    Nu d(r,p)/d(" << ii << ") " << (r(1) - r0(1)) / delta << " " << (r(2) - r0(2)) / delta << " "
+            << (r(3) - r0(3)) / delta << " " << (p(1) - p0(1)) / delta << " " << (p(2) - p0(2)) / delta << " "
+            << (p(3) - p0(3)) / delta << std::endl;
   // d(r,p) / d angle
-  std::cout<<" -- An d(r,p)/a("<<ii<<") "<<Jac(1,ii+3)<<" "<<Jac(2,ii+3)<<" "
-	   <<Jac(3,ii+3)<<" "<<Jac(4,ii+3)<<" "<<Jac(5,ii+3)<<" "
-	   <<Jac(6,ii+3)<<std::endl;
-  std::cout<<"    Nu d(r,p)/a("<<ii<<") "<<(r(1)-r0(1))/delta<<" "
-	   <<(r(2)-r0(2))/delta<<" "<<(r(3)-r0(3))/delta<<" "
-	   <<(p(1)-p0(1))/delta<<" "<<(p(2)-p0(2))/delta<<" "
-	   <<(p(3)-p0(3))/delta<<std::endl;
+  std::cout << " -- An d(r,p)/a(" << ii << ") " << Jac(1, ii + 3) << " " << Jac(2, ii + 3) << " " << Jac(3, ii + 3)
+            << " " << Jac(4, ii + 3) << " " << Jac(5, ii + 3) << " " << Jac(6, ii + 3) << std::endl;
+  std::cout << "    Nu d(r,p)/a(" << ii << ") " << (r(1) - r0(1)) / delta << " " << (r(2) - r0(2)) / delta << " "
+            << (r(3) - r0(3)) / delta << " " << (p(1) - p0(1)) / delta << " " << (p(2) - p0(2)) / delta << " "
+            << (p(3) - p0(3)) / delta << std::endl;
   //               -----------------------------  end of check
 #endif
 
   return;
-} // end gradientGlobal
-
+}  // end gradientGlobal
 
 // ----  calculate gradient and Hessian matrix in local parameters ------
-void 
-GlobalTrackerMuonAlignment::gradientLocal(GlobalVector& GRt, GlobalVector& GPt, 
-					  GlobalVector& GRm, GlobalVector& GPm, 
-					  GlobalVector& GNorm, 
-					  CLHEP::HepSymMatrix& covLoc,
-					  CLHEP::HepMatrix& rotLoc,
-					  CLHEP::HepVector& R0,
-					  AlgebraicVector4& LPRm) 
-{
+void GlobalTrackerMuonAlignment::gradientLocal(GlobalVector& GRt,
+                                               GlobalVector& GPt,
+                                               GlobalVector& GRm,
+                                               GlobalVector& GPm,
+                                               GlobalVector& GNorm,
+                                               CLHEP::HepSymMatrix& covLoc,
+                                               CLHEP::HepMatrix& rotLoc,
+                                               CLHEP::HepVector& R0,
+                                               AlgebraicVector4& LPRm) {
   // we search for 6D global correction vector (d, a), where
-  //                        3D vector of shihts d 
-  //               3D vector of rotation angles    a   
+  //                        3D vector of shihts d
+  //               3D vector of rotation angles    a
 
   bool alarm = true;
   //bool alarm = false;
   bool info = false;
 
-  if(debug_)
-    std::cout<<" gradientLocal "<<std::endl; 
+  if (debug_)
+    std::cout << " gradientLocal " << std::endl;
 
   /*
   const Surface& refSurface = tsosMuon.surface();
@@ -2295,14 +2340,24 @@ GlobalTrackerMuonAlignment::gradientLocal(GlobalVector& GRt, GlobalVector& GPt,
   rotLoc(3,1) = refSurface.rotation().zx();
   rotLoc(3,2) = refSurface.rotation().zy();
   rotLoc(3,3) = refSurface.rotation().zz();
-  */  
+  */
 
   CLHEP::HepVector Rt(3), Pt(3), Rm(3), Pm(3), Norm(3);
-  Rt(1) = GRt.x(); Rt(2) = GRt.y();  Rt(3) = GRt.z();
-  Pt(1) = GPt.x(); Pt(2) = GPt.y();  Pt(3) = GPt.z();
-  Rm(1) = GRm.x(); Rm(2) = GRm.y();  Rm(3) = GRm.z();
-  Pm(1) = GPm.x(); Pm(2) = GPm.y();  Pm(3) = GPm.z();
-  Norm(1) = GNorm.x(); Norm(2) = GNorm.y(); Norm(3) = GNorm.z(); 
+  Rt(1) = GRt.x();
+  Rt(2) = GRt.y();
+  Rt(3) = GRt.z();
+  Pt(1) = GPt.x();
+  Pt(2) = GPt.y();
+  Pt(3) = GPt.z();
+  Rm(1) = GRm.x();
+  Rm(2) = GRm.y();
+  Rm(3) = GRm.z();
+  Pm(1) = GPm.x();
+  Pm(2) = GPm.y();
+  Pm(3) = GPm.z();
+  Norm(1) = GNorm.x();
+  Norm(2) = GNorm.y();
+  Norm(3) = GNorm.z();
 
   CLHEP::HepVector V(4), Rml(3), Pml(3), Rtl(3), Ptl(3);
 
@@ -2310,17 +2365,17 @@ GlobalTrackerMuonAlignment::gradientLocal(GlobalVector& GRt, GlobalVector& GPt,
   R0(1) = refSurface.position().x();
   R0(2) = refSurface.position().y();
   R0(3) = refSurface.position().z();
-  */ 
+  */
 
   Rml = rotLoc * (Rm - R0);
   Rtl = rotLoc * (Rt - R0);
   Pml = rotLoc * Pm;
   Ptl = rotLoc * Pt;
-  
-  V(1) = LPRm(0) - Ptl(1)/Ptl(3); 
-  V(2) = LPRm(1) - Ptl(2)/Ptl(3);   
-  V(3) = LPRm(2) - Rtl(1);   
-  V(4) = LPRm(3) - Rtl(2); 
+
+  V(1) = LPRm(0) - Ptl(1) / Ptl(3);
+  V(2) = LPRm(1) - Ptl(2) / Ptl(3);
+  V(3) = LPRm(2) - Rtl(1);
+  V(4) = LPRm(3) - Rtl(2);
 
   /*
   CLHEP::HepSymMatrix Cov(4,0), W(4,0);
@@ -2339,78 +2394,80 @@ GlobalTrackerMuonAlignment::gradientLocal(GlobalVector& GRt, GlobalVector& GPt,
 
   int ierr;
   W.invert(ierr);
-  if(ierr != 0) { if(alarm)
-      std::cout<<" gradientLocal: inversion of matrix W fail "<<std::endl;
+  if (ierr != 0) {
+    if (alarm)
+      std::cout << " gradientLocal: inversion of matrix W fail " << std::endl;
     return;
   }
-  
+
   //                               JacobianCartesianToLocal
- 
-  //AlgebraicMatrix56 jacobian   // differ from calculation above 
-  //= JacobianCartesianToLocal::JacobianCartesianToLocal 
-  //(refSurface, tsosTrack.localParameters()).jacobian();  
+
+  //AlgebraicMatrix56 jacobian   // differ from calculation above
+  //= JacobianCartesianToLocal::JacobianCartesianToLocal
+  //(refSurface, tsosTrack.localParameters()).jacobian();
   //for(int i=1; i<=4; i++) for(int j=1; j<=6; j++){
   //int j1 = j - 1; JacToLoc(i,j) = jacobian(i, j1);}
-  
-  CLHEP::HepMatrix JacToLoc(4,6,0);
-  for(int i=1; i<=2; i++)
-    for(int j=1; j<=3; j++){
-      JacToLoc(i,j+3) = (rotLoc(i,j) - rotLoc(3,j)*Pml(i)/Pml(3))/Pml(3); 
-      JacToLoc(i+2,j) = rotLoc(i,j);
+
+  CLHEP::HepMatrix JacToLoc(4, 6, 0);
+  for (int i = 1; i <= 2; i++)
+    for (int j = 1; j <= 3; j++) {
+      JacToLoc(i, j + 3) = (rotLoc(i, j) - rotLoc(3, j) * Pml(i) / Pml(3)) / Pml(3);
+      JacToLoc(i + 2, j) = rotLoc(i, j);
     }
 
   //                                    JacobianCorrectionsToCartesian
   //double PmN = CLHEP::dot(Pm, Norm);
   double PmN = CLHEP_dot(Pm, Norm);
 
-  CLHEP::HepMatrix Jac(6,6,0);
-  for (int i=1; i <= 3; i++)
-    for (int j=1; j <= 3; j++){
-      Jac(i,j) =  Pm(i)*Norm(j) / PmN;
-      if(i == j ) Jac(i,j) -= 1.;
-    }  
-
-  //                                            dp/da                   
-  Jac(4,4) =     0.;   // dpx/dax
-  Jac(5,4) = -Pm(3);   // dpy/dax
-  Jac(6,4) =  Pm(2);   // dpz/dax
-  Jac(4,5) =  Pm(3);   // dpx/day
-  Jac(5,5) =     0.;   // dpy/day
-  Jac(6,5) = -Pm(1);   // dpz/day
-  Jac(4,6) = -Pm(2);   // dpx/daz
-  Jac(5,6) =  Pm(1);   // dpy/daz
-  Jac(6,6) =     0.;   // dpz/daz
+  CLHEP::HepMatrix Jac(6, 6, 0);
+  for (int i = 1; i <= 3; i++)
+    for (int j = 1; j <= 3; j++) {
+      Jac(i, j) = Pm(i) * Norm(j) / PmN;
+      if (i == j)
+        Jac(i, j) -= 1.;
+    }
+
+  //                                            dp/da
+  Jac(4, 4) = 0.;      // dpx/dax
+  Jac(5, 4) = -Pm(3);  // dpy/dax
+  Jac(6, 4) = Pm(2);   // dpz/dax
+  Jac(4, 5) = Pm(3);   // dpx/day
+  Jac(5, 5) = 0.;      // dpy/day
+  Jac(6, 5) = -Pm(1);  // dpz/day
+  Jac(4, 6) = -Pm(2);  // dpx/daz
+  Jac(5, 6) = Pm(1);   // dpy/daz
+  Jac(6, 6) = 0.;      // dpz/daz
 
   CLHEP::HepVector dsda(3);
-  dsda(1) = (Norm(2)*Rm(3) - Norm(3)*Rm(2)) / PmN;
-  dsda(2) = (Norm(3)*Rm(1) - Norm(1)*Rm(3)) / PmN;
-  dsda(3) = (Norm(1)*Rm(2) - Norm(2)*Rm(1)) / PmN;
+  dsda(1) = (Norm(2) * Rm(3) - Norm(3) * Rm(2)) / PmN;
+  dsda(2) = (Norm(3) * Rm(1) - Norm(1) * Rm(3)) / PmN;
+  dsda(3) = (Norm(1) * Rm(2) - Norm(2) * Rm(1)) / PmN;
 
-  //                                             dr/da  
-  Jac(1,4) =          Pm(1)*dsda(1);  // drx/dax
-  Jac(2,4) = -Rm(3) + Pm(2)*dsda(1);  // dry/dax
-  Jac(3,4) =  Rm(2) + Pm(3)*dsda(1);  // drz/dax
+  //                                             dr/da
+  Jac(1, 4) = Pm(1) * dsda(1);           // drx/dax
+  Jac(2, 4) = -Rm(3) + Pm(2) * dsda(1);  // dry/dax
+  Jac(3, 4) = Rm(2) + Pm(3) * dsda(1);   // drz/dax
 
-  Jac(1,5) =  Rm(3) + Pm(1)*dsda(2);  // drx/day
-  Jac(2,5) =          Pm(2)*dsda(2);  // dry/day
-  Jac(3,5) = -Rm(1) + Pm(3)*dsda(2);  // drz/day
+  Jac(1, 5) = Rm(3) + Pm(1) * dsda(2);   // drx/day
+  Jac(2, 5) = Pm(2) * dsda(2);           // dry/day
+  Jac(3, 5) = -Rm(1) + Pm(3) * dsda(2);  // drz/day
 
-  Jac(1,6) = -Rm(2) + Pm(1)*dsda(3);  // drx/daz
-  Jac(2,6) =  Rm(1) + Pm(2)*dsda(3);  // dry/daz
-  Jac(3,6) =          Pm(3)*dsda(3);  // drz/daz
+  Jac(1, 6) = -Rm(2) + Pm(1) * dsda(3);  // drx/daz
+  Jac(2, 6) = Rm(1) + Pm(2) * dsda(3);   // dry/daz
+  Jac(3, 6) = Pm(3) * dsda(3);           // drz/daz
 
   //                                   JacobianCorrectionToLocal
-  CLHEP::HepMatrix JacCorLoc(4,6,0);
+  CLHEP::HepMatrix JacCorLoc(4, 6, 0);
   JacCorLoc = JacToLoc * Jac;
 
-  //                                   gradient and Hessian 
-  CLHEP::HepMatrix W_Jac(6,4,0);
+  //                                   gradient and Hessian
+  CLHEP::HepMatrix W_Jac(6, 4, 0);
   W_Jac = JacCorLoc.T() * W;
-  
+
   CLHEP::HepVector gradL(6);
   gradL = W_Jac * V;
 
-  CLHEP::HepMatrix hessL(6,6);
+  CLHEP::HepMatrix hessL(6, 6);
   hessL = JacCorLoc.T() * W * JacCorLoc;
 
   GradL += gradL;
@@ -2419,19 +2476,20 @@ GlobalTrackerMuonAlignment::gradientLocal(GlobalVector& GRt, GlobalVector& GPt,
   CLHEP::HepVector dLI = CLHEP::solve(HessL, -GradL);
   int iErI;
   CLHEP::HepMatrix ErrdLI = HessL.inverse(iErI);
-  if( iErI != 0) { if(alarm)
-      std::cout<<" gradLocal Error inverse  Hess matrix !!!!!!!!!!!"<<std::endl;
+  if (iErI != 0) {
+    if (alarm)
+      std::cout << " gradLocal Error inverse  Hess matrix !!!!!!!!!!!" << std::endl;
   }
 
-  if(info || debug_){
-    std::cout<<" dL   "<<dLI(1)<<" "<<dLI(2)<<" "<<dLI(3)<<" "<<dLI(4)<<" "
-	     <<dLI(5)<<" "<<dLI(6)<<std::endl;;
-    std::cout<<" +-   "<<sqrt(ErrdLI(1,1))<<" "<<sqrt(ErrdLI(2,2))<<" "<<sqrt(ErrdLI(3,3))
-	     <<" "<<sqrt(ErrdLI(4,4))<<" "<<sqrt(ErrdLI(5,5))<<" "<<sqrt(ErrdLI(6,6))
-	     <<std::endl;
+  if (info || debug_) {
+    std::cout << " dL   " << dLI(1) << " " << dLI(2) << " " << dLI(3) << " " << dLI(4) << " " << dLI(5) << " " << dLI(6)
+              << std::endl;
+    ;
+    std::cout << " +-   " << sqrt(ErrdLI(1, 1)) << " " << sqrt(ErrdLI(2, 2)) << " " << sqrt(ErrdLI(3, 3)) << " "
+              << sqrt(ErrdLI(4, 4)) << " " << sqrt(ErrdLI(5, 5)) << " " << sqrt(ErrdLI(6, 6)) << std::endl;
   }
- 
-  if(debug_){
+
+  if (debug_) {
     //std::cout<<" dV(da3) {"<<-JacCorLoc(1,6)*0.002<<" "<<-JacCorLoc(2,6)*0.002<<" "
     //   <<-JacCorLoc(3,6)*0.002<<" "<<-JacCorLoc(4,6)*0.002<<"}"<<std::endl;
     //std::cout<<" JacCLo {"<<JacCorLoc(1,6)<<" "<<JacCorLoc(2,6)<<" "
@@ -2440,176 +2498,193 @@ GlobalTrackerMuonAlignment::gradientLocal(GlobalVector& GRt, GlobalVector& GPt,
     //   <<Jac(1,6)<<" "<<Jac(2,6)<<"}"<<std::endl;
     //std::cout<<"Jac(,a3){"<<Jac(1,6)<<" "<<Jac(2,6)<<" "<<Jac(3,6)<<" "<<Jac(4,6)<<" "
     //   <<Jac(5,6)<<" "<<Jac(6,6)<<std::endl;
-    int i=5;  
-    if(GNorm.z() > 0.95)
-      std::cout<<" Ecap1   N "<<GNorm<<std::endl; 
-    else if(GNorm.z() < -0.95)
-      std::cout<<" Ecap2   N "<<GNorm<<std::endl; 
+    int i = 5;
+    if (GNorm.z() > 0.95)
+      std::cout << " Ecap1   N " << GNorm << std::endl;
+    else if (GNorm.z() < -0.95)
+      std::cout << " Ecap2   N " << GNorm << std::endl;
     else
-      std::cout<<" Barrel  N "<<GNorm<<std::endl; 
-    std::cout<<" JacCLo(i,"<<i<<") = {"<<JacCorLoc(1,i)<<" "<<JacCorLoc(2,i)<<" "
-     <<JacCorLoc(3,i)<<" "<<JacCorLoc(4,i)<<"}"<<std::endl;
-    std::cout<<"   rotLoc "<<rotLoc<<std::endl;
-    std::cout<<" position "<<R0<<std::endl;
-    std::cout<<" Pm,l "<<Pm.T()<<" "<<Pml(1)/Pml(3)<<" "<<Pml(2)/Pml(3)<<std::endl;
-    std::cout<<" Pt,l "<<Pt.T()<<" "<<Ptl(1)/Ptl(3)<<" "<<Ptl(2)/Ptl(3)<<std::endl;
-    std::cout<<" V  "<<V.T()<<std::endl;  
-    std::cout<<" Cov \n"<<covLoc<<std::endl;
-    std::cout<<" W*Cov "<<W*covLoc<<std::endl;
+      std::cout << " Barrel  N " << GNorm << std::endl;
+    std::cout << " JacCLo(i," << i << ") = {" << JacCorLoc(1, i) << " " << JacCorLoc(2, i) << " " << JacCorLoc(3, i)
+              << " " << JacCorLoc(4, i) << "}" << std::endl;
+    std::cout << "   rotLoc " << rotLoc << std::endl;
+    std::cout << " position " << R0 << std::endl;
+    std::cout << " Pm,l " << Pm.T() << " " << Pml(1) / Pml(3) << " " << Pml(2) / Pml(3) << std::endl;
+    std::cout << " Pt,l " << Pt.T() << " " << Ptl(1) / Ptl(3) << " " << Ptl(2) / Ptl(3) << std::endl;
+    std::cout << " V  " << V.T() << std::endl;
+    std::cout << " Cov \n" << covLoc << std::endl;
+    std::cout << " W*Cov " << W * covLoc << std::endl;
     //std::cout<<" JacCarToLoc = drldrc \n"<<
     //JacobianCartesianToLocal::JacobianCartesianToLocal
     //(refSurface, tsosTrack.localParameters()).jacobian()<<std::endl;
-    std::cout<<" JacToLoc "<<JacToLoc<<std::endl;
-    
+    std::cout << " JacToLoc " << JacToLoc << std::endl;
   }
 
 #ifdef CHECK_OF_JACOBIAN_CARTESIAN_TO_LOCAL
   //---------------------- check of derivatives
-  CLHEP::HepVector V0(4,0);
-  V0(1) = Pml(1)/Pml(3) - Ptl(1)/Ptl(3); 
-  V0(2) = Pml(2)/Pml(3) - Ptl(2)/Ptl(3);   
-  V0(3) = Rml(1) - Rtl(1);   
-  V0(4) = Rml(2) - Rtl(2); 
-  int ii = 3; float delta = 0.01;
-  CLHEP::HepVector V1(4,0);
-  if(ii <= 3) {Rm(ii) += delta; Rml = rotLoc * (Rm - R0);}
-  else {Pm(ii-3) += delta; Pml = rotLoc * Pm;}
+  CLHEP::HepVector V0(4, 0);
+  V0(1) = Pml(1) / Pml(3) - Ptl(1) / Ptl(3);
+  V0(2) = Pml(2) / Pml(3) - Ptl(2) / Ptl(3);
+  V0(3) = Rml(1) - Rtl(1);
+  V0(4) = Rml(2) - Rtl(2);
+  int ii = 3;
+  float delta = 0.01;
+  CLHEP::HepVector V1(4, 0);
+  if (ii <= 3) {
+    Rm(ii) += delta;
+    Rml = rotLoc * (Rm - R0);
+  } else {
+    Pm(ii - 3) += delta;
+    Pml = rotLoc * Pm;
+  }
   //if(ii <= 3) {Rt(ii) += delta; Rtl = rotLoc * (Rt - R0);}
   //else {Pt(ii-3) += delta; Ptl = rotLoc * Pt;}
-  V1(1) = Pml(1)/Pml(3) - Ptl(1)/Ptl(3); 
-  V1(2) = Pml(2)/Pml(3) - Ptl(2)/Ptl(3);   
-  V1(3) = Rml(1) - Rtl(1);   
-  V1(4) = Rml(2) - Rtl(2); 
-
-  if(GNorm.z() > 0.95)
-    std::cout<<" Ecap1   N "<<GNorm<<std::endl; 
-  else if(GNorm.z() < -0.95)
-    std::cout<<" Ecap2   N "<<GNorm<<std::endl; 
+  V1(1) = Pml(1) / Pml(3) - Ptl(1) / Ptl(3);
+  V1(2) = Pml(2) / Pml(3) - Ptl(2) / Ptl(3);
+  V1(3) = Rml(1) - Rtl(1);
+  V1(4) = Rml(2) - Rtl(2);
+
+  if (GNorm.z() > 0.95)
+    std::cout << " Ecap1   N " << GNorm << std::endl;
+  else if (GNorm.z() < -0.95)
+    std::cout << " Ecap2   N " << GNorm << std::endl;
   else
-    std::cout<<" Barrel  N "<<GNorm<<std::endl; 
-  std::cout<<" dldc Num (i,"<<ii<<") "<<(V1(1)-V0(1))/delta<<" "<<(V1(2)-V0(2))/delta<<" "
-	   <<(V1(3)-V0(3))/delta<<" "<<(V1(4)-V0(4))/delta<<std::endl;
-  std::cout<<" dldc Ana (i,"<<ii<<") "<<JacToLoc(1,ii)<<" "<<JacToLoc(2,ii)<<" "
-	   <<JacToLoc(3,ii)<<" "<<JacToLoc(4,ii)<<std::endl;
+    std::cout << " Barrel  N " << GNorm << std::endl;
+  std::cout << " dldc Num (i," << ii << ") " << (V1(1) - V0(1)) / delta << " " << (V1(2) - V0(2)) / delta << " "
+            << (V1(3) - V0(3)) / delta << " " << (V1(4) - V0(4)) / delta << std::endl;
+  std::cout << " dldc Ana (i," << ii << ") " << JacToLoc(1, ii) << " " << JacToLoc(2, ii) << " " << JacToLoc(3, ii)
+            << " " << JacToLoc(4, ii) << std::endl;
   //float dtxdpx = (rotLoc(1,1) - rotLoc(3,1)*Pml(1)/Pml(3))/Pml(3);
   //float dtydpx = (rotLoc(2,1) - rotLoc(3,2)*Pml(2)/Pml(3))/Pml(3);
   //std::cout<<" dtx/dpx dty/ "<<dtxdpx<<" "<<dtydpx<<std::endl;
-#endif						  
+#endif
 
   return;
-} // end gradientLocal
-
+}  // end gradientLocal
 
 // ----  simulate a misalignment of muon system   ------
-void 
-GlobalTrackerMuonAlignment::misalignMuon(GlobalVector& GRm, GlobalVector& GPm, GlobalVector& Nl, 
-				GlobalVector& Rt, GlobalVector& Rm, GlobalVector& Pm)
-{
-  CLHEP::HepVector d(3,0), a(3,0), Norm(3), Rm0(3), Pm0(3), Rm1(3), Pm1(3), 
-    Rmi(3), Pmi(3) ; 
-  
-  d(1)=0.0; d(2)=0.0; d(3)=0.0; a(1)=0.0000; a(2)=0.0000; a(3)=0.0000; // zero     
+void GlobalTrackerMuonAlignment::misalignMuon(
+    GlobalVector& GRm, GlobalVector& GPm, GlobalVector& Nl, GlobalVector& Rt, GlobalVector& Rm, GlobalVector& Pm) {
+  CLHEP::HepVector d(3, 0), a(3, 0), Norm(3), Rm0(3), Pm0(3), Rm1(3), Pm1(3), Rmi(3), Pmi(3);
+
+  d(1) = 0.0;
+  d(2) = 0.0;
+  d(3) = 0.0;
+  a(1) = 0.0000;
+  a(2) = 0.0000;
+  a(3) = 0.0000;  // zero
   //d(1)=0.0; d(2)=0.0; d(3)=0.0; a(1)=0.0020; a(2)=0.0000; a(3)=0.0000; // a1=.002
   //d(1)=0.0; d(2)=0.0; d(3)=0.0; a(1)=0.0000; a(2)=0.0020; a(3)=0.0000; // a2=.002
-  //d(1)=0.0; d(2)=0.0; d(3)=0.0; a(1)=0.0000; a(2)=0.0000; a(3)=0.0020; // a3=.002    
-  //d(1)=1.0; d(2)=2.0; d(3)=3.0; a(1)=0.0000; a(2)=0.0000; a(3)=0.0000; // 12300     
-  //d(1)=0.0; d(2)=0.0; d(3)=0.0; a(1)=0.0000; a(2)=0.0000; a(3)=0.0020; // a3=0.002    
-  //d(1)=10.; d(2)=20.; d(3)=30.; a(1)=0.0100; a(2)=0.0200; a(3)=0.0300; // huge      
-  //d(1)=10.; d(2)=20.; d(3)=30.; a(1)=0.2000; a(2)=0.2500; a(3)=0.3000; // huge angles      
+  //d(1)=0.0; d(2)=0.0; d(3)=0.0; a(1)=0.0000; a(2)=0.0000; a(3)=0.0020; // a3=.002
+  //d(1)=1.0; d(2)=2.0; d(3)=3.0; a(1)=0.0000; a(2)=0.0000; a(3)=0.0000; // 12300
+  //d(1)=0.0; d(2)=0.0; d(3)=0.0; a(1)=0.0000; a(2)=0.0000; a(3)=0.0020; // a3=0.002
+  //d(1)=10.; d(2)=20.; d(3)=30.; a(1)=0.0100; a(2)=0.0200; a(3)=0.0300; // huge
+  //d(1)=10.; d(2)=20.; d(3)=30.; a(1)=0.2000; a(2)=0.2500; a(3)=0.3000; // huge angles
   //d(1)=0.3; d(2)=0.4; d(3)=0.5; a(1)=0.0005; a(2)=0.0006; a(3)=0.0007; // 0345 0567
   //d(1)=0.3; d(2)=0.4; d(3)=0.5; a(1)=0.0001; a(2)=0.0002; a(3)=0.0003; // 0345 0123
   //d(1)=0.2; d(2)=0.2; d(3)=0.2; a(1)=0.0002; a(2)=0.0002; a(3)=0.0002; // 0111 0111
 
-  MuGlShift = d; MuGlAngle = a;
+  MuGlShift = d;
+  MuGlAngle = a;
 
-  if((d(1) == 0.) & (d(2) == 0.) & (d(3) == 0.) & 
-     (a(1) == 0.) & (a(2) == 0.) & (a(3) == 0.)){
+  if ((d(1) == 0.) & (d(2) == 0.) & (d(3) == 0.) & (a(1) == 0.) & (a(2) == 0.) & (a(3) == 0.)) {
     Rm = GRm;
     Pm = GPm;
-    if(debug_)
-      std::cout<<" ......   without misalignment "<<std::endl;
+    if (debug_)
+      std::cout << " ......   without misalignment " << std::endl;
     return;
   }
-  
-  Rm0(1) = GRm.x(); Rm0(2) = GRm.y(); Rm0(3) = GRm.z();
-  Pm0(1) = GPm.x(); Pm0(2) = GPm.y(); Pm0(3) = GPm.z();  
-  Norm(1) = Nl.x(); Norm(2) = Nl.y(); Norm(3) = Nl.z();     
-  
-  CLHEP::HepMatrix T(3,3,1);
- 
+
+  Rm0(1) = GRm.x();
+  Rm0(2) = GRm.y();
+  Rm0(3) = GRm.z();
+  Pm0(1) = GPm.x();
+  Pm0(2) = GPm.y();
+  Pm0(3) = GPm.z();
+  Norm(1) = Nl.x();
+  Norm(2) = Nl.y();
+  Norm(3) = Nl.z();
+
+  CLHEP::HepMatrix T(3, 3, 1);
+
   //T(1,2) =  a(3); T(1,3) = -a(2);
   //T(2,1) = -a(3); T(2,3) =  a(1);
   //T(3,1) =  a(2); T(3,2) = -a(1);
-  
+
   double s1 = std::sin(a(1)), c1 = std::cos(a(1));
   double s2 = std::sin(a(2)), c2 = std::cos(a(2));
-  double s3 = std::sin(a(3)), c3 = std::cos(a(3));     
-  T(1,1) =  c2 * c3;  
-  T(1,2) =  c1 * s3 + s1 * s2 * c3;
-  T(1,3) =  s1 * s3 - c1 * s2 * c3;
-  T(2,1) = -c2 * s3; 
-  T(2,2) =  c1 * c3 - s1 * s2 * s3;
-  T(2,3) =  s1 * c3 + c1 * s2 * s3;
-  T(3,1) =  s2;
-  T(3,2) = -s1 * c2;
-  T(3,3) =  c1 * c2;
-  
+  double s3 = std::sin(a(3)), c3 = std::cos(a(3));
+  T(1, 1) = c2 * c3;
+  T(1, 2) = c1 * s3 + s1 * s2 * c3;
+  T(1, 3) = s1 * s3 - c1 * s2 * c3;
+  T(2, 1) = -c2 * s3;
+  T(2, 2) = c1 * c3 - s1 * s2 * s3;
+  T(2, 3) = s1 * c3 + c1 * s2 * s3;
+  T(3, 1) = s2;
+  T(3, 2) = -s1 * c2;
+  T(3, 3) = c1 * c2;
+
   //int terr;
   //CLHEP::HepMatrix Ti = T.inverse(terr);
   CLHEP::HepMatrix Ti = T.T();
   CLHEP::HepVector di = -Ti * d;
-  
-  CLHEP::HepVector ex0(3,0), ey0(3,0), ez0(3,0), ex(3,0), ey(3,0), ez(3,0);
-  ex0(1) = 1.; ey0(2) = 1.;  ez0(3) = 1.;
-  ex = Ti*ex0; ey = Ti*ey0; ez = Ti*ez0;
-  
-  CLHEP::HepVector TiN = Ti * Norm; 
-  //double si = CLHEP::dot((Ti*Rm0 - Rm0 + di), TiN) / CLHEP::dot(Pm0, TiN); 
+
+  CLHEP::HepVector ex0(3, 0), ey0(3, 0), ez0(3, 0), ex(3, 0), ey(3, 0), ez(3, 0);
+  ex0(1) = 1.;
+  ey0(2) = 1.;
+  ez0(3) = 1.;
+  ex = Ti * ex0;
+  ey = Ti * ey0;
+  ez = Ti * ez0;
+
+  CLHEP::HepVector TiN = Ti * Norm;
+  //double si = CLHEP::dot((Ti*Rm0 - Rm0 + di), TiN) / CLHEP::dot(Pm0, TiN);
   //Rm1(1) = CLHEP::dot(ex, Rm0 + si*Pm0 - di);
   //Rm1(2) = CLHEP::dot(ey, Rm0 + si*Pm0 - di);
   //Rm1(3) = CLHEP::dot(ez, Rm0 + si*Pm0 - di);
-  double si = CLHEP_dot((Ti*Rm0 - Rm0 + di), TiN) / CLHEP_dot(Pm0, TiN); 
-  Rm1(1) = CLHEP_dot(ex, Rm0 + si*Pm0 - di);
-  Rm1(2) = CLHEP_dot(ey, Rm0 + si*Pm0 - di);
-  Rm1(3) = CLHEP_dot(ez, Rm0 + si*Pm0 - di);
+  double si = CLHEP_dot((Ti * Rm0 - Rm0 + di), TiN) / CLHEP_dot(Pm0, TiN);
+  Rm1(1) = CLHEP_dot(ex, Rm0 + si * Pm0 - di);
+  Rm1(2) = CLHEP_dot(ey, Rm0 + si * Pm0 - di);
+  Rm1(3) = CLHEP_dot(ez, Rm0 + si * Pm0 - di);
   Pm1 = T * Pm0;
-  
-  Rm = GlobalVector(Rm1(1), Rm1(2), Rm1(3));  
-  //Pm = GlobalVector(CLHEP::dot(Pm0,ex), CLHEP::dot(Pm0, ey), CLHEP::dot(Pm0,ez));// =T*Pm0 
-  Pm = GlobalVector(CLHEP_dot(Pm0,ex), CLHEP_dot(Pm0, ey), CLHEP_dot(Pm0,ez));// =T*Pm0 
-  
-  if(debug_){    //    -------------  debug tranformation 
-    
-    std::cout<<" ----- Pm "<<Pm<<std::endl;
-    std::cout<<"    T*Pm0 "<<Pm1.T()<<std::endl;
+
+  Rm = GlobalVector(Rm1(1), Rm1(2), Rm1(3));
+  //Pm = GlobalVector(CLHEP::dot(Pm0,ex), CLHEP::dot(Pm0, ey), CLHEP::dot(Pm0,ez));// =T*Pm0
+  Pm = GlobalVector(CLHEP_dot(Pm0, ex), CLHEP_dot(Pm0, ey), CLHEP_dot(Pm0, ez));  // =T*Pm0
+
+  if (debug_) {  //    -------------  debug tranformation
+
+    std::cout << " ----- Pm " << Pm << std::endl;
+    std::cout << "    T*Pm0 " << Pm1.T() << std::endl;
     //std::cout<<" Ti*T*Pm0 "<<(Ti*(T*Pm0)).T()<<std::endl;
-    
+
     //CLHEP::HepVector Rml = (Rm0 + si*Pm0 - di) + di;
-    CLHEP::HepVector Rml = Rm1(1)*ex + Rm1(2)*ey + Rm1(3)*ez + di;
-    
-    CLHEP::HepVector Rt0(3); 
-    Rt0(1)=Rt.x();  Rt0(2)=Rt.y();  Rt0(3)=Rt.z();      
-    
-    //double sl = CLHEP::dot(T*(Rt0 - Rml), T*Norm) / CLHEP::dot(Ti * Pm1, Norm);     
-    double sl = CLHEP_dot(T*(Rt0 - Rml), T*Norm) / CLHEP_dot(Ti * Pm1, Norm);     
-    CLHEP::HepVector Rl = Rml + sl*(Ti*Pm1);
-    
+    CLHEP::HepVector Rml = Rm1(1) * ex + Rm1(2) * ey + Rm1(3) * ez + di;
+
+    CLHEP::HepVector Rt0(3);
+    Rt0(1) = Rt.x();
+    Rt0(2) = Rt.y();
+    Rt0(3) = Rt.z();
+
+    //double sl = CLHEP::dot(T*(Rt0 - Rml), T*Norm) / CLHEP::dot(Ti * Pm1, Norm);
+    double sl = CLHEP_dot(T * (Rt0 - Rml), T * Norm) / CLHEP_dot(Ti * Pm1, Norm);
+    CLHEP::HepVector Rl = Rml + sl * (Ti * Pm1);
+
     //double A = CLHEP::dot(Ti*Pm1, Norm);
-    //double B = CLHEP::dot(Rt0, Norm) - CLHEP::dot(Ti*Rm1, Norm) 
-    //+ CLHEP::dot(Ti*d, Norm); 
-    double A = CLHEP_dot(Ti*Pm1, Norm);
-    double B = CLHEP_dot(Rt0, Norm) - CLHEP_dot(Ti*Rm1, Norm) 
-      + CLHEP_dot(Ti*d, Norm); 
-    double s = B/A;
-    CLHEP::HepVector Dr = Ti*Rm1 - Ti*d  + s*(Ti*Pm1) - Rm0;
-    CLHEP::HepVector Dp = Ti*Pm1 - Pm0;
+    //double B = CLHEP::dot(Rt0, Norm) - CLHEP::dot(Ti*Rm1, Norm)
+    //+ CLHEP::dot(Ti*d, Norm);
+    double A = CLHEP_dot(Ti * Pm1, Norm);
+    double B = CLHEP_dot(Rt0, Norm) - CLHEP_dot(Ti * Rm1, Norm) + CLHEP_dot(Ti * d, Norm);
+    double s = B / A;
+    CLHEP::HepVector Dr = Ti * Rm1 - Ti * d + s * (Ti * Pm1) - Rm0;
+    CLHEP::HepVector Dp = Ti * Pm1 - Pm0;
 
     CLHEP::HepVector TiR = Ti * Rm0 + di;
     CLHEP::HepVector Ri = T * TiR + d;
-    
-    std::cout<<" --TTi-0 "<<(Ri-Rm0).T()<<std::endl;
-    std::cout<<" --  Dr  "<<Dr.T()<<endl;
-    std::cout<<" --  Dp  "<<Dp.T()<<endl;
+
+    std::cout << " --TTi-0 " << (Ri - Rm0).T() << std::endl;
+    std::cout << " --  Dr  " << Dr.T() << endl;
+    std::cout << " --  Dp  " << Dp.T() << endl;
     //std::cout<<" ex "<<ex.T()<<endl;
     //std::cout<<" ey "<<ey.T()<<endl;
     //std::cout<<" ez "<<ez.T()<<endl;
@@ -2617,10 +2692,10 @@ GlobalTrackerMuonAlignment::misalignMuon(GlobalVector& GRm, GlobalVector& GPm, G
     //std::cout<<" ---- Ti ---- "<<Ti<<std::endl;
     //std::cout<<" ---- d  ---- "<<d.T()<<std::endl;
     //std::cout<<" ---- di ---- "<<di.T()<<std::endl;
-    std::cout<<" -- si sl s "<<si<<" "<<sl<<" "<<s<<std::endl;
+    std::cout << " -- si sl s " << si << " " << sl << " " << s << std::endl;
     //std::cout<<" -- si sl "<<si<<" "<<sl<<endl;
     //std::cout<<" -- si s "<<si<<" "<<s<<endl;
-    std::cout<<" -- Rml-(Rm0+si*Pm0) "<<(Rml - Rm0 - si*Pm0).T()<<std::endl;
+    std::cout << " -- Rml-(Rm0+si*Pm0) " << (Rml - Rm0 - si * Pm0).T() << std::endl;
     //std::cout<<" -- Rm0 "<<Rm0.T()<<std::endl;
     //std::cout<<" -- Rm1 "<<Rm1.T()<<std::endl;
     //std::cout<<" -- Rmi "<<Rmi.T()<<std::endl;
@@ -2628,121 +2703,137 @@ GlobalTrackerMuonAlignment::misalignMuon(GlobalVector& GRm, GlobalVector& GPm, G
     //std::cout<<" --s2Pm "<<(s2*(T * Pm1)).T()<<std::endl;
     //std::cout<<" --R1-0 "<<(Rm1-Rm0).T()<<std::endl;
     //std::cout<<" --Ri-0 "<<(Rmi-Rm0).T()<<std::endl;
-    std::cout<<" --Rl-0 "<<(Rl-Rm0).T()<<std::endl;
+    std::cout << " --Rl-0 " << (Rl - Rm0).T() << std::endl;
     //std::cout<<" --Pi-0 "<<(Pmi-Pm0).T()<<std::endl;
-  }      //                                --------   end of debug
-  
+  }  //                                --------   end of debug
+
   return;
 
-} // end of misalignMuon
+}  // end of misalignMuon
 
 // ----  simulate a misalignment of muon system with Local  ------
-void 
-GlobalTrackerMuonAlignment::misalignMuonL(GlobalVector& GRm, GlobalVector& GPm, GlobalVector& Nl, 
-					  GlobalVector& Rt, GlobalVector& Rm, GlobalVector& Pm,
-					  AlgebraicVector4& Vm, 
-					  TrajectoryStateOnSurface& tsosTrack,
-					  TrajectoryStateOnSurface& tsosMuon)
-{
-  CLHEP::HepVector d(3,0), a(3,0), Norm(3), Rm0(3), Pm0(3), Rm1(3), Pm1(3), 
-    Rmi(3), Pmi(3); 
-  
-  d(1)=0.0; d(2)=0.0; d(3)=0.0; a(1)=0.0000; a(2)=0.0000; a(3)=0.0000; // zero     
+void GlobalTrackerMuonAlignment::misalignMuonL(GlobalVector& GRm,
+                                               GlobalVector& GPm,
+                                               GlobalVector& Nl,
+                                               GlobalVector& Rt,
+                                               GlobalVector& Rm,
+                                               GlobalVector& Pm,
+                                               AlgebraicVector4& Vm,
+                                               TrajectoryStateOnSurface& tsosTrack,
+                                               TrajectoryStateOnSurface& tsosMuon) {
+  CLHEP::HepVector d(3, 0), a(3, 0), Norm(3), Rm0(3), Pm0(3), Rm1(3), Pm1(3), Rmi(3), Pmi(3);
+
+  d(1) = 0.0;
+  d(2) = 0.0;
+  d(3) = 0.0;
+  a(1) = 0.0000;
+  a(2) = 0.0000;
+  a(3) = 0.0000;  // zero
   //d(1)=0.0000001; d(2)=0.0; d(3)=0.0; a(1)=0.0000; a(2)=0.0000; a(3)=0.0000; // nonzero
   //d(1)=0.0; d(2)=0.0; d(3)=0.0; a(1)=0.0020; a(2)=0.0000; a(3)=0.0000; // a1=.002
   //d(1)=0.0; d(2)=0.0; d(3)=0.0; a(1)=0.0000; a(2)=0.0020; a(3)=0.0000; // a2=.002
-  //d(1)=0.0; d(2)=0.0; d(3)=0.0; a(1)=0.0000; a(2)=0.0000; a(3)=0.0020; // a3=.002    
-  //d(1)=0.0; d(2)=0.0; d(3)=0.0; a(1)=0.0000; a(2)=0.0000; a(3)=0.0200; // a3=.020    
-  //d(1)=1.0; d(2)=2.0; d(3)=3.0; a(1)=0.0000; a(2)=0.0000; a(3)=0.0000; // 12300     
-  //d(1)=0.0; d(2)=0.0; d(3)=0.0; a(1)=0.0000; a(2)=0.0000; a(3)=0.0020; // a3=0.002    
-  //d(1)=10.; d(2)=20.; d(3)=30.; a(1)=0.0100; a(2)=0.0200; a(3)=0.0300; // huge      
-  //d(1)=10.; d(2)=20.; d(3)=30.; a(1)=0.2000; a(2)=0.2500; a(3)=0.3000; // huge angles      
+  //d(1)=0.0; d(2)=0.0; d(3)=0.0; a(1)=0.0000; a(2)=0.0000; a(3)=0.0020; // a3=.002
+  //d(1)=0.0; d(2)=0.0; d(3)=0.0; a(1)=0.0000; a(2)=0.0000; a(3)=0.0200; // a3=.020
+  //d(1)=1.0; d(2)=2.0; d(3)=3.0; a(1)=0.0000; a(2)=0.0000; a(3)=0.0000; // 12300
+  //d(1)=0.0; d(2)=0.0; d(3)=0.0; a(1)=0.0000; a(2)=0.0000; a(3)=0.0020; // a3=0.002
+  //d(1)=10.; d(2)=20.; d(3)=30.; a(1)=0.0100; a(2)=0.0200; a(3)=0.0300; // huge
+  //d(1)=10.; d(2)=20.; d(3)=30.; a(1)=0.2000; a(2)=0.2500; a(3)=0.3000; // huge angles
   //d(1)=0.3; d(2)=0.4; d(3)=0.5; a(1)=0.0005; a(2)=0.0006; a(3)=0.0007; // 0345 0567
   //d(1)=0.3; d(2)=0.4; d(3)=0.5; a(1)=0.0001; a(2)=0.0002; a(3)=0.0003; // 0345 0123
   //d(1)=0.1; d(2)=0.2; d(3)=0.3; a(1)=0.0003; a(2)=0.0004; a(3)=0.0005; // 0123 0345
 
-  MuGlShift = d; MuGlAngle = a;
+  MuGlShift = d;
+  MuGlAngle = a;
 
-  if((d(1) == 0.) & (d(2) == 0.) & (d(3) == 0.) & 
-     (a(1) == 0.) & (a(2) == 0.) & (a(3) == 0.)){
+  if ((d(1) == 0.) & (d(2) == 0.) & (d(3) == 0.) & (a(1) == 0.) & (a(2) == 0.) & (a(3) == 0.)) {
     Rm = GRm;
     Pm = GPm;
     AlgebraicVector4 Vm0;
     Vm = AlgebraicVector4(tsosMuon.localParameters().vector()(1),
-			  tsosMuon.localParameters().vector()(2),
-			  tsosMuon.localParameters().vector()(3),
-			  tsosMuon.localParameters().vector()(4)); 
-    if(debug_)
-      std::cout<<" ......   without misalignment "<<std::endl;
+                          tsosMuon.localParameters().vector()(2),
+                          tsosMuon.localParameters().vector()(3),
+                          tsosMuon.localParameters().vector()(4));
+    if (debug_)
+      std::cout << " ......   without misalignment " << std::endl;
     return;
   }
-  
-  Rm0(1) = GRm.x(); Rm0(2) = GRm.y(); Rm0(3) = GRm.z();
-  Pm0(1) = GPm.x(); Pm0(2) = GPm.y(); Pm0(3) = GPm.z();  
-  Norm(1) = Nl.x(); Norm(2) = Nl.y(); Norm(3) = Nl.z();     
-  
-  CLHEP::HepMatrix T(3,3,1);
- 
+
+  Rm0(1) = GRm.x();
+  Rm0(2) = GRm.y();
+  Rm0(3) = GRm.z();
+  Pm0(1) = GPm.x();
+  Pm0(2) = GPm.y();
+  Pm0(3) = GPm.z();
+  Norm(1) = Nl.x();
+  Norm(2) = Nl.y();
+  Norm(3) = Nl.z();
+
+  CLHEP::HepMatrix T(3, 3, 1);
+
   //T(1,2) =  a(3); T(1,3) = -a(2);
   //T(2,1) = -a(3); T(2,3) =  a(1);
   //T(3,1) =  a(2); T(3,2) = -a(1);
-  
+
   double s1 = std::sin(a(1)), c1 = std::cos(a(1));
   double s2 = std::sin(a(2)), c2 = std::cos(a(2));
-  double s3 = std::sin(a(3)), c3 = std::cos(a(3));     
-  T(1,1) =  c2 * c3;  
-  T(1,2) =  c1 * s3 + s1 * s2 * c3;
-  T(1,3) =  s1 * s3 - c1 * s2 * c3;
-  T(2,1) = -c2 * s3; 
-  T(2,2) =  c1 * c3 - s1 * s2 * s3;
-  T(2,3) =  s1 * c3 + c1 * s2 * s3;
-  T(3,1) =  s2;
-  T(3,2) = -s1 * c2;
-  T(3,3) =  c1 * c2;
-
-  //                    Ti, di what we have to apply for misalignment  
+  double s3 = std::sin(a(3)), c3 = std::cos(a(3));
+  T(1, 1) = c2 * c3;
+  T(1, 2) = c1 * s3 + s1 * s2 * c3;
+  T(1, 3) = s1 * s3 - c1 * s2 * c3;
+  T(2, 1) = -c2 * s3;
+  T(2, 2) = c1 * c3 - s1 * s2 * s3;
+  T(2, 3) = s1 * c3 + c1 * s2 * s3;
+  T(3, 1) = s2;
+  T(3, 2) = -s1 * c2;
+  T(3, 3) = c1 * c2;
+
+  //                    Ti, di what we have to apply for misalignment
   //int terr;
   //CLHEP::HepMatrix Ti = T.inverse(terr);
   CLHEP::HepMatrix Ti = T.T();
   CLHEP::HepVector di = -Ti * d;
-  
-  CLHEP::HepVector ex0(3,0), ey0(3,0), ez0(3,0), ex(3,0), ey(3,0), ez(3,0);
-  ex0(1) = 1.; ey0(2) = 1.;  ez0(3) = 1.;
-  ex = Ti*ex0; ey = Ti*ey0; ez = Ti*ez0;
 
-  CLHEP::HepVector TiN = Ti * Norm; 
-  //double si = CLHEP::dot((Ti*Rm0 - Rm0 + di), TiN) / CLHEP::dot(Pm0, TiN); 
+  CLHEP::HepVector ex0(3, 0), ey0(3, 0), ez0(3, 0), ex(3, 0), ey(3, 0), ez(3, 0);
+  ex0(1) = 1.;
+  ey0(2) = 1.;
+  ez0(3) = 1.;
+  ex = Ti * ex0;
+  ey = Ti * ey0;
+  ez = Ti * ez0;
+
+  CLHEP::HepVector TiN = Ti * Norm;
+  //double si = CLHEP::dot((Ti*Rm0 - Rm0 + di), TiN) / CLHEP::dot(Pm0, TiN);
   //Rm1(1) = CLHEP::dot(ex, Rm0 + si*Pm0 - di);
   //Rm1(2) = CLHEP::dot(ey, Rm0 + si*Pm0 - di);
   //Rm1(3) = CLHEP::dot(ez, Rm0 + si*Pm0 - di);
-  double si = CLHEP_dot((Ti*Rm0 - Rm0 + di), TiN) / CLHEP_dot(Pm0, TiN); 
-  Rm1(1) = CLHEP_dot(ex, Rm0 + si*Pm0 - di);
-  Rm1(2) = CLHEP_dot(ey, Rm0 + si*Pm0 - di);
-  Rm1(3) = CLHEP_dot(ez, Rm0 + si*Pm0 - di);
+  double si = CLHEP_dot((Ti * Rm0 - Rm0 + di), TiN) / CLHEP_dot(Pm0, TiN);
+  Rm1(1) = CLHEP_dot(ex, Rm0 + si * Pm0 - di);
+  Rm1(2) = CLHEP_dot(ey, Rm0 + si * Pm0 - di);
+  Rm1(3) = CLHEP_dot(ez, Rm0 + si * Pm0 - di);
   Pm1 = T * Pm0;
-    
+
   // Global muon parameters after misalignment
-  Rm = GlobalVector(Rm1(1), Rm1(2), Rm1(3));  
-  //Pm = GlobalVector(CLHEP::dot(Pm0,ex), CLHEP::dot(Pm0, ey), CLHEP::dot(Pm0,ez));// =T*Pm0 
-  Pm = GlobalVector(CLHEP_dot(Pm0,ex), CLHEP_dot(Pm0, ey), CLHEP_dot(Pm0,ez));// =T*Pm0 
+  Rm = GlobalVector(Rm1(1), Rm1(2), Rm1(3));
+  //Pm = GlobalVector(CLHEP::dot(Pm0,ex), CLHEP::dot(Pm0, ey), CLHEP::dot(Pm0,ez));// =T*Pm0
+  Pm = GlobalVector(CLHEP_dot(Pm0, ex), CLHEP_dot(Pm0, ey), CLHEP_dot(Pm0, ez));  // =T*Pm0
 
   // Local muon parameters after misalignment
   const Surface& refSurface = tsosMuon.surface();
-  CLHEP::HepMatrix Tl(3,3,0);
+  CLHEP::HepMatrix Tl(3, 3, 0);
 
-  Tl(1,1) = refSurface.rotation().xx();
-  Tl(1,2) = refSurface.rotation().xy();
-  Tl(1,3) = refSurface.rotation().xz();
-  
-  Tl(2,1) = refSurface.rotation().yx();
-  Tl(2,2) = refSurface.rotation().yy();
-  Tl(2,3) = refSurface.rotation().yz();
-  
-  Tl(3,1) = refSurface.rotation().zx();
-  Tl(3,2) = refSurface.rotation().zy();
-  Tl(3,3) = refSurface.rotation().zz();
+  Tl(1, 1) = refSurface.rotation().xx();
+  Tl(1, 2) = refSurface.rotation().xy();
+  Tl(1, 3) = refSurface.rotation().xz();
+
+  Tl(2, 1) = refSurface.rotation().yx();
+  Tl(2, 2) = refSurface.rotation().yy();
+  Tl(2, 3) = refSurface.rotation().yz();
 
-  CLHEP::HepVector R0(3,0), newR0(3,0), newRl(3,0), newPl(3,0);
+  Tl(3, 1) = refSurface.rotation().zx();
+  Tl(3, 2) = refSurface.rotation().zy();
+  Tl(3, 3) = refSurface.rotation().zz();
+
+  CLHEP::HepVector R0(3, 0), newR0(3, 0), newRl(3, 0), newPl(3, 0);
   R0(1) = refSurface.position().x();
   R0(2) = refSurface.position().y();
   R0(3) = refSurface.position().z();
@@ -2750,129 +2841,132 @@ GlobalTrackerMuonAlignment::misalignMuonL(GlobalVector& GRm, GlobalVector& GPm,
   newRl = Tl * (Rm1 - R0);
   newPl = Tl * Pm1;
 
-  Vm(0) = newPl(1)/newPl(3);
-  Vm(1) = newPl(2)/newPl(3);
+  Vm(0) = newPl(1) / newPl(3);
+  Vm(1) = newPl(2) / newPl(3);
   Vm(2) = newRl(1);
   Vm(3) = newRl(2);
-  
+
 #ifdef CHECK_DERIVATIVES_LOCAL_VS_ANGLES
   float del = 0.0001;
   //int ii = 1; T(3,2) +=del; T(2,3) -=del;
-  int ii = 2; T(3,1) -=del; T(1,3) +=del;
+  int ii = 2;
+  T(3, 1) -= del;
+  T(1, 3) += del;
   //int ii = 3; T(1,2) -=del; T(2,1) +=del;
   AlgebraicVector4 Vm0 = Vm;
-  CLHEP::HepVector Rm10 = Rm1, Pm10 = Pm1;;
-  CLHEP::HepMatrix newTl = Tl*T;
+  CLHEP::HepVector Rm10 = Rm1, Pm10 = Pm1;
+  ;
+  CLHEP::HepMatrix newTl = Tl * T;
   Ti = T.T();
-  di = -Ti * d;  
-  ex = Ti*ex0; ey = Ti*ey0; ez = Ti*ez0;
-  TiN = Ti * Norm; 
-  si = CLHEP_dot((Ti*Rm0 - Rm0 + di), TiN) / CLHEP_dot(Pm0, TiN); 
-  Rm1(1) = CLHEP_dot(ex, Rm0 + si*Pm0 - di);
-  Rm1(2) = CLHEP_dot(ey, Rm0 + si*Pm0 - di);
-  Rm1(3) = CLHEP_dot(ez, Rm0 + si*Pm0 - di);
+  di = -Ti * d;
+  ex = Ti * ex0;
+  ey = Ti * ey0;
+  ez = Ti * ez0;
+  TiN = Ti * Norm;
+  si = CLHEP_dot((Ti * Rm0 - Rm0 + di), TiN) / CLHEP_dot(Pm0, TiN);
+  Rm1(1) = CLHEP_dot(ex, Rm0 + si * Pm0 - di);
+  Rm1(2) = CLHEP_dot(ey, Rm0 + si * Pm0 - di);
+  Rm1(3) = CLHEP_dot(ez, Rm0 + si * Pm0 - di);
   Pm1 = T * Pm0;
 
   newRl = Tl * (Rm1 - R0);
   newPl = Tl * Pm1;
 
-  Vm(0) = newPl(1)/newPl(3);
-  Vm(1) = newPl(2)/newPl(3);
+  Vm(0) = newPl(1) / newPl(3);
+  Vm(1) = newPl(2) / newPl(3);
   Vm(2) = newRl(1);
   Vm(3) = newRl(2);
-  std::cout<<" ========= dVm/da"<<ii<<" "<<(Vm-Vm0)*(1./del)<<std::endl;
-#endif 
-
-  if(debug_){
-  //std::cout<<" dRm/da3 "<<((Rm1-Rm10)*(1./del)).T()<<" "<<((Pm1-Pm10)*(1./del)).T()<<std::endl; 
-  //std::cout<<"             Norm "<<Norm.T()<<std::endl;
-  std::cout<<"             ex  "<<(Tl.T()*ex0).T()<<std::endl;
-  std::cout<<"             ey  "<<(Tl.T()*ey0).T()<<std::endl;
-  std::cout<<"             ez  "<<(Tl.T()*ez0).T()<<std::endl;
-  //std::cpot<<" 
-
-  std::cout<<"    pxyz/p gl 0 "<<(Pm0/Pm0.norm()).T()<<std::endl;
-  std::cout<<"    pxyz/p loc0 "<<(Tl*Pm0/(Tl*Pm0).norm()).T()<<std::endl;
-  std::cout<<"    pxyz/p glob  "<<(Pm1/Pm1.norm()).T()<<std::endl;
-  std::cout<<"    pxyz/p  loc  "<<(newPl/newPl.norm()).T()<<std::endl;
-
-  //std::cout<<"             Rot   "<<refSurface.rotation()<<endl;
-  //std::cout<<"             Tl   "<<Tl<<endl;
-  std::cout<<" ---- phi g0 g1 l0 l1  "
-	   <<atan2(Pm0(2),Pm0(1))<<" "<<atan2(Pm1(2),Pm1(1))<<" "
-	   <<atan2((Tl*Pm0)(2),(Tl*Pm0)(1))<<" "
-	   <<atan2(newPl(2),newPl(1))<<std::endl;
-  std::cout<<" ---- angl Gl Loc "<<atan2(Pm1(2),Pm1(1))-atan2(Pm0(2),Pm0(1))<<" "
-	   <<atan2(newPl(2),newPl(1))-atan2((Tl*Pm0)(2),(Tl*Pm0)(1))<<" "
-	   <<atan2(newPl(3),newPl(2))-atan2((Tl*Pm0)(3),(Tl*Pm0)(2))<<" "
-	   <<atan2(newPl(1),newPl(3))-atan2((Tl*Pm0)(1),(Tl*Pm0)(3))<<" "<<std::endl;
+  std::cout << " ========= dVm/da" << ii << " " << (Vm - Vm0) * (1. / del) << std::endl;
+#endif
+
+  if (debug_) {
+    //std::cout<<" dRm/da3 "<<((Rm1-Rm10)*(1./del)).T()<<" "<<((Pm1-Pm10)*(1./del)).T()<<std::endl;
+    //std::cout<<"             Norm "<<Norm.T()<<std::endl;
+    std::cout << "             ex  " << (Tl.T() * ex0).T() << std::endl;
+    std::cout << "             ey  " << (Tl.T() * ey0).T() << std::endl;
+    std::cout << "             ez  " << (Tl.T() * ez0).T() << std::endl;
+    //std::cpot<<"
+
+    std::cout << "    pxyz/p gl 0 " << (Pm0 / Pm0.norm()).T() << std::endl;
+    std::cout << "    pxyz/p loc0 " << (Tl * Pm0 / (Tl * Pm0).norm()).T() << std::endl;
+    std::cout << "    pxyz/p glob  " << (Pm1 / Pm1.norm()).T() << std::endl;
+    std::cout << "    pxyz/p  loc  " << (newPl / newPl.norm()).T() << std::endl;
+
+    //std::cout<<"             Rot   "<<refSurface.rotation()<<endl;
+    //std::cout<<"             Tl   "<<Tl<<endl;
+    std::cout << " ---- phi g0 g1 l0 l1  " << atan2(Pm0(2), Pm0(1)) << " " << atan2(Pm1(2), Pm1(1)) << " "
+              << atan2((Tl * Pm0)(2), (Tl * Pm0)(1)) << " " << atan2(newPl(2), newPl(1)) << std::endl;
+    std::cout << " ---- angl Gl Loc " << atan2(Pm1(2), Pm1(1)) - atan2(Pm0(2), Pm0(1)) << " "
+              << atan2(newPl(2), newPl(1)) - atan2((Tl * Pm0)(2), (Tl * Pm0)(1)) << " "
+              << atan2(newPl(3), newPl(2)) - atan2((Tl * Pm0)(3), (Tl * Pm0)(2)) << " "
+              << atan2(newPl(1), newPl(3)) - atan2((Tl * Pm0)(1), (Tl * Pm0)(3)) << " " << std::endl;
   }
 
-  if(debug_){
-    CLHEP::HepMatrix newTl(3,3,0);
-    CLHEP::HepVector R0(3,0), newRl(3,0), newPl(3,0);
+  if (debug_) {
+    CLHEP::HepMatrix newTl(3, 3, 0);
+    CLHEP::HepVector R0(3, 0), newRl(3, 0), newPl(3, 0);
     newTl = Tl * Ti.T();
     newR0 = Ti * R0 + di;
 
-    std::cout<<" N "<<Norm.T()<<std::endl;
-    std::cout<<" dtxl yl "<<Vm(0)-tsosMuon.localParameters().vector()(1)<<" "
-	     <<Vm(1)-tsosMuon.localParameters().vector()(2)<<std::endl;
-    std::cout<<" dXl dYl "<<Vm(2)-tsosMuon.localParameters().vector()(3)<<" "
-	     <<Vm(3)-tsosMuon.localParameters().vector()(4)<<std::endl;
-    std::cout<<" localM    "<<tsosMuon.localParameters().vector()<<std::endl;  
-    std::cout<<"       Vm  "<<Vm<<std::endl;
-    
-    
-    CLHEP::HepVector Rvc(3,0), Pvc(3,0), Rvg(3,0), Pvg(3,0);
-    Rvc(1) = Vm(2); Rvc(2) = Vm(3);
-    Pvc(3) = tsosMuon.localParameters().pzSign() * Pm0.norm() /
-      sqrt(1 + Vm(0)*Vm(0) + Vm(1)*Vm(1));
+    std::cout << " N " << Norm.T() << std::endl;
+    std::cout << " dtxl yl " << Vm(0) - tsosMuon.localParameters().vector()(1) << " "
+              << Vm(1) - tsosMuon.localParameters().vector()(2) << std::endl;
+    std::cout << " dXl dYl " << Vm(2) - tsosMuon.localParameters().vector()(3) << " "
+              << Vm(3) - tsosMuon.localParameters().vector()(4) << std::endl;
+    std::cout << " localM    " << tsosMuon.localParameters().vector() << std::endl;
+    std::cout << "       Vm  " << Vm << std::endl;
+
+    CLHEP::HepVector Rvc(3, 0), Pvc(3, 0), Rvg(3, 0), Pvg(3, 0);
+    Rvc(1) = Vm(2);
+    Rvc(2) = Vm(3);
+    Pvc(3) = tsosMuon.localParameters().pzSign() * Pm0.norm() / sqrt(1 + Vm(0) * Vm(0) + Vm(1) * Vm(1));
     Pvc(1) = Pvc(3) * Vm(0);
     Pvc(2) = Pvc(3) * Vm(1);
-    
+
     Rvg = newTl.T() * Rvc + newR0;
     Pvg = newTl.T() * Pvc;
-    
-    std::cout<<" newPl     "<<newPl.T()<<std::endl;
-    std::cout<<"    Pvc    "<<Pvc.T()<<std::endl;
-    std::cout<<"    Rvg    "<<Rvg.T()<<std::endl;
-    std::cout<<"    Rm1    "<<Rm1.T()<<std::endl;
-    std::cout<<"    Pvg    "<<Pvg.T()<<std::endl;
-    std::cout<<"    Pm1    "<<Pm1.T()<<std::endl;
+
+    std::cout << " newPl     " << newPl.T() << std::endl;
+    std::cout << "    Pvc    " << Pvc.T() << std::endl;
+    std::cout << "    Rvg    " << Rvg.T() << std::endl;
+    std::cout << "    Rm1    " << Rm1.T() << std::endl;
+    std::cout << "    Pvg    " << Pvg.T() << std::endl;
+    std::cout << "    Pm1    " << Pm1.T() << std::endl;
   }
-  
-  if(debug_){    //    ----------  how to transform cartesian from shifted to correct 
-    
-    std::cout<<" ----- Pm "<<Pm<<std::endl;
-    std::cout<<"    T*Pm0 "<<Pm1.T()<<std::endl;
+
+  if (debug_) {  //    ----------  how to transform cartesian from shifted to correct
+
+    std::cout << " ----- Pm " << Pm << std::endl;
+    std::cout << "    T*Pm0 " << Pm1.T() << std::endl;
     //std::cout<<" Ti*T*Pm0 "<<(Ti*(T*Pm0)).T()<<std::endl;
-    
+
     //CLHEP::HepVector Rml = (Rm0 + si*Pm0 - di) + di;
-    CLHEP::HepVector Rml = Rm1(1)*ex + Rm1(2)*ey + Rm1(3)*ez + di;
-    
-    CLHEP::HepVector Rt0(3); 
-    Rt0(1)=Rt.x();  Rt0(2)=Rt.y();  Rt0(3)=Rt.z();      
-    
-    //double sl = CLHEP::dot(T*(Rt0 - Rml), T*Norm) / CLHEP::dot(Ti * Pm1, Norm);     
-    double sl = CLHEP_dot(T*(Rt0 - Rml), T*Norm) / CLHEP_dot(Ti * Pm1, Norm);     
-    CLHEP::HepVector Rl = Rml + sl*(Ti*Pm1);
-    
+    CLHEP::HepVector Rml = Rm1(1) * ex + Rm1(2) * ey + Rm1(3) * ez + di;
+
+    CLHEP::HepVector Rt0(3);
+    Rt0(1) = Rt.x();
+    Rt0(2) = Rt.y();
+    Rt0(3) = Rt.z();
+
+    //double sl = CLHEP::dot(T*(Rt0 - Rml), T*Norm) / CLHEP::dot(Ti * Pm1, Norm);
+    double sl = CLHEP_dot(T * (Rt0 - Rml), T * Norm) / CLHEP_dot(Ti * Pm1, Norm);
+    CLHEP::HepVector Rl = Rml + sl * (Ti * Pm1);
+
     //double A = CLHEP::dot(Ti*Pm1, Norm);
-    //double B = CLHEP::dot(Rt0, Norm) - CLHEP::dot(Ti*Rm1, Norm) 
-    //+ CLHEP::dot(Ti*d, Norm); 
-    double A = CLHEP_dot(Ti*Pm1, Norm);
-    double B = CLHEP_dot(Rt0, Norm) - CLHEP_dot(Ti*Rm1, Norm) 
-      + CLHEP_dot(Ti*d, Norm); 
-    double s = B/A;
-    CLHEP::HepVector Dr = Ti*Rm1 - Ti*d  + s*(Ti*Pm1) - Rm0;
-    CLHEP::HepVector Dp = Ti*Pm1 - Pm0;
+    //double B = CLHEP::dot(Rt0, Norm) - CLHEP::dot(Ti*Rm1, Norm)
+    //+ CLHEP::dot(Ti*d, Norm);
+    double A = CLHEP_dot(Ti * Pm1, Norm);
+    double B = CLHEP_dot(Rt0, Norm) - CLHEP_dot(Ti * Rm1, Norm) + CLHEP_dot(Ti * d, Norm);
+    double s = B / A;
+    CLHEP::HepVector Dr = Ti * Rm1 - Ti * d + s * (Ti * Pm1) - Rm0;
+    CLHEP::HepVector Dp = Ti * Pm1 - Pm0;
 
     CLHEP::HepVector TiR = Ti * Rm0 + di;
     CLHEP::HepVector Ri = T * TiR + d;
-    
-    std::cout<<" --TTi-0 "<<(Ri-Rm0).T()<<std::endl;
-    std::cout<<" --  Dr  "<<Dr.T()<<endl;
-    std::cout<<" --  Dp  "<<Dp.T()<<endl;
+
+    std::cout << " --TTi-0 " << (Ri - Rm0).T() << std::endl;
+    std::cout << " --  Dr  " << Dr.T() << endl;
+    std::cout << " --  Dp  " << Dp.T() << endl;
     //std::cout<<" ex "<<ex.T()<<endl;
     //std::cout<<" ey "<<ey.T()<<endl;
     //std::cout<<" ez "<<ez.T()<<endl;
@@ -2880,10 +2974,10 @@ GlobalTrackerMuonAlignment::misalignMuonL(GlobalVector& GRm, GlobalVector& GPm,
     //std::cout<<" ---- Ti ---- "<<Ti<<std::endl;
     //std::cout<<" ---- d  ---- "<<d.T()<<std::endl;
     //std::cout<<" ---- di ---- "<<di.T()<<std::endl;
-    std::cout<<" -- si sl s "<<si<<" "<<sl<<" "<<s<<std::endl;
+    std::cout << " -- si sl s " << si << " " << sl << " " << s << std::endl;
     //std::cout<<" -- si sl "<<si<<" "<<sl<<endl;
     //std::cout<<" -- si s "<<si<<" "<<s<<endl;
-    std::cout<<" -- Rml-(Rm0+si*Pm0) "<<(Rml - Rm0 - si*Pm0).T()<<std::endl;
+    std::cout << " -- Rml-(Rm0+si*Pm0) " << (Rml - Rm0 - si * Pm0).T() << std::endl;
     //std::cout<<" -- Rm0 "<<Rm0.T()<<std::endl;
     //std::cout<<" -- Rm1 "<<Rm1.T()<<std::endl;
     //std::cout<<" -- Rmi "<<Rmi.T()<<std::endl;
@@ -2891,330 +2985,341 @@ GlobalTrackerMuonAlignment::misalignMuonL(GlobalVector& GRm, GlobalVector& GPm,
     //std::cout<<" --s2Pm "<<(s2*(T * Pm1)).T()<<std::endl;
     //std::cout<<" --R1-0 "<<(Rm1-Rm0).T()<<std::endl;
     //std::cout<<" --Ri-0 "<<(Rmi-Rm0).T()<<std::endl;
-    std::cout<<" --Rl-0 "<<(Rl-Rm0).T()<<std::endl;
+    std::cout << " --Rl-0 " << (Rl - Rm0).T() << std::endl;
     //std::cout<<" --Pi-0 "<<(Pmi-Pm0).T()<<std::endl;
-  }      //                                --------   end of debug
-  
+  }  //                                --------   end of debug
+
   return;
 
 }  // end misalignMuonL
 
-
 // ----  refit any direction of transient track ------
-void 
-GlobalTrackerMuonAlignment::trackFitter(reco::TrackRef alongTr, reco::TransientTrack& alongTTr,
-				       PropagationDirection direction,
-				       TrajectoryStateOnSurface& trackFittedTSOS)
-{
+void GlobalTrackerMuonAlignment::trackFitter(reco::TrackRef alongTr,
+                                             reco::TransientTrack& alongTTr,
+                                             PropagationDirection direction,
+                                             TrajectoryStateOnSurface& trackFittedTSOS) {
   bool info = false;
   bool smooth = false;
-  
-  if(info)
-    std::cout<<" ......... start of trackFitter ......... "<<std::endl;  
-  if(false && info){ 
-    this->debugTrackHit(" Tracker track hits ", alongTr); 
-    this->debugTrackHit(" Tracker TransientTrack hits ", alongTTr); 
+
+  if (info)
+    std::cout << " ......... start of trackFitter ......... " << std::endl;
+  if (false && info) {
+    this->debugTrackHit(" Tracker track hits ", alongTr);
+    this->debugTrackHit(" Tracker TransientTrack hits ", alongTTr);
   }
 
   edm::OwnVector<TrackingRecHit> recHit;
   DetId trackDetId = DetId(alongTr->innerDetId());
-  for(auto const& hit : alongTr->recHits()) recHit.push_back(hit->clone());
-  if(direction != alongMomentum)
-    {
-      edm::OwnVector<TrackingRecHit> recHitAlong = recHit;
-      recHit.clear();
-      for(unsigned int ihit = recHitAlong.size()-1; ihit+1>0; ihit--){
-	recHit.push_back(recHitAlong[ihit]);
-      }
-      recHitAlong.clear();
+  for (auto const& hit : alongTr->recHits())
+    recHit.push_back(hit->clone());
+  if (direction != alongMomentum) {
+    edm::OwnVector<TrackingRecHit> recHitAlong = recHit;
+    recHit.clear();
+    for (unsigned int ihit = recHitAlong.size() - 1; ihit + 1 > 0; ihit--) {
+      recHit.push_back(recHitAlong[ihit]);
     }
-  if(info)
-    std::cout<<" ... Own recHit.size() "<<recHit.size()<<" "<<trackDetId.rawId()<<std::endl;
+    recHitAlong.clear();
+  }
+  if (info)
+    std::cout << " ... Own recHit.size() " << recHit.size() << " " << trackDetId.rawId() << std::endl;
 
   //MuonTransientTrackingRecHitBuilder::ConstRecHitContainer recHitTrack;
   TransientTrackingRecHit::RecHitContainer recHitTrack;
-  for(auto const& hit : alongTr->recHits()) recHitTrack.push_back(TTRHBuilder->build(hit));
-  
-  if(info)
-    std::cout<<" ... recHitTrack.size() "<<recHit.size()<<" "<<trackDetId.rawId()
-	     <<" ======> recHitMu "<<std::endl;
+  for (auto const& hit : alongTr->recHits())
+    recHitTrack.push_back(TTRHBuilder->build(hit));
+
+  if (info)
+    std::cout << " ... recHitTrack.size() " << recHit.size() << " " << trackDetId.rawId() << " ======> recHitMu "
+              << std::endl;
 
   MuonTransientTrackingRecHitBuilder::ConstRecHitContainer recHitMu = recHitTrack;
   /*
     MuonTransientTrackingRecHitBuilder::ConstRecHitContainer recHitMu =
     MuRHBuilder->build(alongTTr.recHits().begin(), alongTTr.recHits().end());
   */
-  if(info)
-    std::cout<<" ...along.... recHitMu.size() "<<recHitMu.size()<<std::endl;
-  if(direction != alongMomentum){
+  if (info)
+    std::cout << " ...along.... recHitMu.size() " << recHitMu.size() << std::endl;
+  if (direction != alongMomentum) {
     MuonTransientTrackingRecHitBuilder::ConstRecHitContainer recHitMuAlong = recHitMu;
     recHitMu.clear();
-    for(unsigned int ihit = recHitMuAlong.size()-1; ihit+1>0; ihit--){
+    for (unsigned int ihit = recHitMuAlong.size() - 1; ihit + 1 > 0; ihit--) {
       recHitMu.push_back(recHitMuAlong[ihit]);
     }
     recHitMuAlong.clear();
   }
-  if(info)
-    std::cout<<" ...opposite... recHitMu.size() "<<recHitMu.size()<<std::endl;
+  if (info)
+    std::cout << " ...opposite... recHitMu.size() " << recHitMu.size() << std::endl;
 
   TrajectoryStateOnSurface firstTSOS;
-  if(direction == alongMomentum) firstTSOS = alongTTr.innermostMeasurementState();
-  else                           firstTSOS = alongTTr.outermostMeasurementState();
+  if (direction == alongMomentum)
+    firstTSOS = alongTTr.innermostMeasurementState();
+  else
+    firstTSOS = alongTTr.outermostMeasurementState();
 
   AlgebraicSymMatrix55 CovLoc;
-  CovLoc(0,0) = 1.   * firstTSOS.localError().matrix()(0,0);
-  CovLoc(1,1) = 10.  * firstTSOS.localError().matrix()(1,1);
-  CovLoc(2,2) = 10.  * firstTSOS.localError().matrix()(2,2);
-  CovLoc(3,3) = 100. * firstTSOS.localError().matrix()(3,3);
-  CovLoc(4,4) = 100. * firstTSOS.localError().matrix()(4,4);
-  TrajectoryStateOnSurface initialTSOS(firstTSOS.localParameters(), LocalTrajectoryError(CovLoc),
-				       firstTSOS.surface(), &*magneticField_);
-  
-  PTrajectoryStateOnDet  PTraj = 
-    trajectoryStateTransform::persistentState(initialTSOS, trackDetId.rawId());
-  //const TrajectorySeed seedT(*PTraj, recHit, alongMomentum);  
-  const TrajectorySeed seedT(PTraj, recHit, direction);  
+  CovLoc(0, 0) = 1. * firstTSOS.localError().matrix()(0, 0);
+  CovLoc(1, 1) = 10. * firstTSOS.localError().matrix()(1, 1);
+  CovLoc(2, 2) = 10. * firstTSOS.localError().matrix()(2, 2);
+  CovLoc(3, 3) = 100. * firstTSOS.localError().matrix()(3, 3);
+  CovLoc(4, 4) = 100. * firstTSOS.localError().matrix()(4, 4);
+  TrajectoryStateOnSurface initialTSOS(
+      firstTSOS.localParameters(), LocalTrajectoryError(CovLoc), firstTSOS.surface(), &*magneticField_);
+
+  PTrajectoryStateOnDet PTraj = trajectoryStateTransform::persistentState(initialTSOS, trackDetId.rawId());
+  //const TrajectorySeed seedT(*PTraj, recHit, alongMomentum);
+  const TrajectorySeed seedT(PTraj, recHit, direction);
 
   std::vector<Trajectory> trajVec;
-  if(direction == alongMomentum) trajVec = theFitter->fit(seedT, recHitMu, initialTSOS);
-  else                           trajVec = theFitterOp->fit(seedT, recHitMu, initialTSOS);
-  
-  if(info){
-    this->debugTrajectorySOSv(" innermostTSOS of TransientTrack", 
-			     alongTTr.innermostMeasurementState());
-    this->debugTrajectorySOSv(" outermostTSOS of TransientTrack", 
-			     alongTTr.outermostMeasurementState());
+  if (direction == alongMomentum)
+    trajVec = theFitter->fit(seedT, recHitMu, initialTSOS);
+  else
+    trajVec = theFitterOp->fit(seedT, recHitMu, initialTSOS);
+
+  if (info) {
+    this->debugTrajectorySOSv(" innermostTSOS of TransientTrack", alongTTr.innermostMeasurementState());
+    this->debugTrajectorySOSv(" outermostTSOS of TransientTrack", alongTTr.outermostMeasurementState());
     this->debugTrajectorySOS(" initialTSOS for theFitter ", initialTSOS);
-    std::cout<<" . . . . . trajVec.size() "<<trajVec.size()<<std::endl;
-    if(!trajVec.empty()) this->debugTrajectory(" theFitter trajectory ", trajVec[0]);
+    std::cout << " . . . . . trajVec.size() " << trajVec.size() << std::endl;
+    if (!trajVec.empty())
+      this->debugTrajectory(" theFitter trajectory ", trajVec[0]);
   }
 
-  if(!smooth){
-    if(!trajVec.empty()) trackFittedTSOS = trajVec[0].lastMeasurement().updatedState();}
-  else{
+  if (!smooth) {
+    if (!trajVec.empty())
+      trackFittedTSOS = trajVec[0].lastMeasurement().updatedState();
+  } else {
     std::vector<Trajectory> trajSVec;
-    if (!trajVec.empty()){
-      if(direction == alongMomentum) trajSVec = theSmoother->trajectories(*(trajVec.begin()));
-      else                           trajSVec = theSmootherOp->trajectories(*(trajVec.begin()));
+    if (!trajVec.empty()) {
+      if (direction == alongMomentum)
+        trajSVec = theSmoother->trajectories(*(trajVec.begin()));
+      else
+        trajSVec = theSmootherOp->trajectories(*(trajVec.begin()));
     }
-    if(info) std::cout<<" . . . . trajSVec.size() "<<trajSVec.size()<<std::endl;
-    if(!trajSVec.empty()) this->debugTrajectorySOSv("smoothed geom InnermostState",
-						  trajSVec[0].geometricalInnermostState());
-    if(!trajSVec.empty()) trackFittedTSOS = trajSVec[0].geometricalInnermostState();
+    if (info)
+      std::cout << " . . . . trajSVec.size() " << trajSVec.size() << std::endl;
+    if (!trajSVec.empty())
+      this->debugTrajectorySOSv("smoothed geom InnermostState", trajSVec[0].geometricalInnermostState());
+    if (!trajSVec.empty())
+      trackFittedTSOS = trajSVec[0].geometricalInnermostState();
   }
 
-  if(info) this->debugTrajectorySOSv(" trackFittedTSOS ", trackFittedTSOS);
+  if (info)
+    this->debugTrajectorySOSv(" trackFittedTSOS ", trackFittedTSOS);
 
-} // end of trackFitter
+}  // end of trackFitter
 
 // ----  refit any direction of muon transient track ------
-void 
-GlobalTrackerMuonAlignment::muonFitter(reco::TrackRef alongTr, reco::TransientTrack& alongTTr,
-				       PropagationDirection direction,
-				       TrajectoryStateOnSurface& trackFittedTSOS)
-{  
+void GlobalTrackerMuonAlignment::muonFitter(reco::TrackRef alongTr,
+                                            reco::TransientTrack& alongTTr,
+                                            PropagationDirection direction,
+                                            TrajectoryStateOnSurface& trackFittedTSOS) {
   bool info = false;
   bool smooth = false;
-  
-  if(info)  std::cout<<" ......... start of muonFitter ........"<<std::endl;  
-  if(false && info){  
-    this->debugTrackHit(" Muon track hits ", alongTr); 
-    this->debugTrackHit(" Muon TransientTrack hits ", alongTTr); 
+
+  if (info)
+    std::cout << " ......... start of muonFitter ........" << std::endl;
+  if (false && info) {
+    this->debugTrackHit(" Muon track hits ", alongTr);
+    this->debugTrackHit(" Muon TransientTrack hits ", alongTTr);
   }
 
   edm::OwnVector<TrackingRecHit> recHit;
   DetId trackDetId = DetId(alongTr->innerDetId());
-  for(auto const& hit : alongTr->recHits()) recHit.push_back(hit->clone());
-  if(direction != alongMomentum)
-    {
-      edm::OwnVector<TrackingRecHit> recHitAlong = recHit;
-      recHit.clear();
-      for(unsigned int ihit = recHitAlong.size()-1; ihit+1>0; ihit--){
-	recHit.push_back(recHitAlong[ihit]);
-      }
-      recHitAlong.clear();
+  for (auto const& hit : alongTr->recHits())
+    recHit.push_back(hit->clone());
+  if (direction != alongMomentum) {
+    edm::OwnVector<TrackingRecHit> recHitAlong = recHit;
+    recHit.clear();
+    for (unsigned int ihit = recHitAlong.size() - 1; ihit + 1 > 0; ihit--) {
+      recHit.push_back(recHitAlong[ihit]);
     }
-  if(info)
-    std::cout<<" ... Own recHit.size() DetId==Muon "<<recHit.size()<<" "<<trackDetId.rawId()<<std::endl;
+    recHitAlong.clear();
+  }
+  if (info)
+    std::cout << " ... Own recHit.size() DetId==Muon " << recHit.size() << " " << trackDetId.rawId() << std::endl;
 
   MuonTransientTrackingRecHitBuilder::ConstRecHitContainer recHitMu =
-    MuRHBuilder->build(alongTTr.recHitsBegin(), alongTTr.recHitsEnd());
-  if(info)
-    std::cout<<" ...along.... recHitMu.size() "<<recHitMu.size()<<std::endl;
-  if(direction != alongMomentum){
+      MuRHBuilder->build(alongTTr.recHitsBegin(), alongTTr.recHitsEnd());
+  if (info)
+    std::cout << " ...along.... recHitMu.size() " << recHitMu.size() << std::endl;
+  if (direction != alongMomentum) {
     MuonTransientTrackingRecHitBuilder::ConstRecHitContainer recHitMuAlong = recHitMu;
     recHitMu.clear();
-    for(unsigned int ihit = recHitMuAlong.size()-1; ihit+1>0; ihit--){
+    for (unsigned int ihit = recHitMuAlong.size() - 1; ihit + 1 > 0; ihit--) {
       recHitMu.push_back(recHitMuAlong[ihit]);
     }
     recHitMuAlong.clear();
   }
-  if(info)
-    std::cout<<" ...opposite... recHitMu.size() "<<recHitMu.size()<<std::endl;
+  if (info)
+    std::cout << " ...opposite... recHitMu.size() " << recHitMu.size() << std::endl;
 
   TrajectoryStateOnSurface firstTSOS;
-  if(direction == alongMomentum) firstTSOS = alongTTr.innermostMeasurementState();
-  else                           firstTSOS = alongTTr.outermostMeasurementState();
+  if (direction == alongMomentum)
+    firstTSOS = alongTTr.innermostMeasurementState();
+  else
+    firstTSOS = alongTTr.outermostMeasurementState();
 
   AlgebraicSymMatrix55 CovLoc;
-  CovLoc(0,0) = 1.   * firstTSOS.localError().matrix()(0,0);
-  CovLoc(1,1) = 10.  * firstTSOS.localError().matrix()(1,1);
-  CovLoc(2,2) = 10.  * firstTSOS.localError().matrix()(2,2);
-  CovLoc(3,3) = 100. * firstTSOS.localError().matrix()(3,3);
-  CovLoc(4,4) = 100. * firstTSOS.localError().matrix()(4,4);
-  TrajectoryStateOnSurface initialTSOS(firstTSOS.localParameters(), LocalTrajectoryError(CovLoc),
-				       firstTSOS.surface(), &*magneticField_);
-  
-  PTrajectoryStateOnDet PTraj = 
-    trajectoryStateTransform::persistentState(initialTSOS, trackDetId.rawId());
-  //const TrajectorySeed seedT(*PTraj, recHit, alongMomentum);  
-  const TrajectorySeed seedT(PTraj, recHit, direction);  
+  CovLoc(0, 0) = 1. * firstTSOS.localError().matrix()(0, 0);
+  CovLoc(1, 1) = 10. * firstTSOS.localError().matrix()(1, 1);
+  CovLoc(2, 2) = 10. * firstTSOS.localError().matrix()(2, 2);
+  CovLoc(3, 3) = 100. * firstTSOS.localError().matrix()(3, 3);
+  CovLoc(4, 4) = 100. * firstTSOS.localError().matrix()(4, 4);
+  TrajectoryStateOnSurface initialTSOS(
+      firstTSOS.localParameters(), LocalTrajectoryError(CovLoc), firstTSOS.surface(), &*magneticField_);
+
+  PTrajectoryStateOnDet PTraj = trajectoryStateTransform::persistentState(initialTSOS, trackDetId.rawId());
+  //const TrajectorySeed seedT(*PTraj, recHit, alongMomentum);
+  const TrajectorySeed seedT(PTraj, recHit, direction);
 
   std::vector<Trajectory> trajVec;
-  if(direction == alongMomentum) trajVec = theFitter->fit(seedT, recHitMu, initialTSOS);
-  else                           trajVec = theFitterOp->fit(seedT, recHitMu, initialTSOS);
-  
-  if(info){
-    this->debugTrajectorySOSv(" innermostTSOS of TransientTrack", 
-			     alongTTr.innermostMeasurementState());
-    this->debugTrajectorySOSv(" outermostTSOS of TransientTrack", 
-			     alongTTr.outermostMeasurementState());
+  if (direction == alongMomentum)
+    trajVec = theFitter->fit(seedT, recHitMu, initialTSOS);
+  else
+    trajVec = theFitterOp->fit(seedT, recHitMu, initialTSOS);
+
+  if (info) {
+    this->debugTrajectorySOSv(" innermostTSOS of TransientTrack", alongTTr.innermostMeasurementState());
+    this->debugTrajectorySOSv(" outermostTSOS of TransientTrack", alongTTr.outermostMeasurementState());
     this->debugTrajectorySOS(" initialTSOS for theFitter ", initialTSOS);
-    std::cout<<" . . . . . trajVec.size() "<<trajVec.size()<<std::endl;
-    if(!trajVec.empty()) this->debugTrajectory(" theFitter trajectory ", trajVec[0]);
+    std::cout << " . . . . . trajVec.size() " << trajVec.size() << std::endl;
+    if (!trajVec.empty())
+      this->debugTrajectory(" theFitter trajectory ", trajVec[0]);
   }
 
-  if(!smooth){
-    if(!trajVec.empty()) trackFittedTSOS = trajVec[0].lastMeasurement().updatedState();}
-  else{
+  if (!smooth) {
+    if (!trajVec.empty())
+      trackFittedTSOS = trajVec[0].lastMeasurement().updatedState();
+  } else {
     std::vector<Trajectory> trajSVec;
-    if (!trajVec.empty()){
-      if(direction == alongMomentum) trajSVec = theSmoother->trajectories(*(trajVec.begin()));
-      else                           trajSVec = theSmootherOp->trajectories(*(trajVec.begin()));
+    if (!trajVec.empty()) {
+      if (direction == alongMomentum)
+        trajSVec = theSmoother->trajectories(*(trajVec.begin()));
+      else
+        trajSVec = theSmootherOp->trajectories(*(trajVec.begin()));
     }
-    if(info) std::cout<<" . . . . trajSVec.size() "<<trajSVec.size()<<std::endl;
-    if(!trajSVec.empty()) this->debugTrajectorySOSv("smoothed geom InnermostState",
-						  trajSVec[0].geometricalInnermostState());
-    if(!trajSVec.empty()) trackFittedTSOS = trajSVec[0].geometricalInnermostState();
+    if (info)
+      std::cout << " . . . . trajSVec.size() " << trajSVec.size() << std::endl;
+    if (!trajSVec.empty())
+      this->debugTrajectorySOSv("smoothed geom InnermostState", trajSVec[0].geometricalInnermostState());
+    if (!trajSVec.empty())
+      trackFittedTSOS = trajSVec[0].geometricalInnermostState();
   }
 
-} // end of muonFitter
-
+}  // end of muonFitter
 
 // ----  debug printout of hits from TransientTrack  ------
-void GlobalTrackerMuonAlignment::debugTrackHit(const std::string title, TransientTrack& alongTr) 
-{
-  std::cout<<" ------- "<<title<<" --------"<<std::endl;
+void GlobalTrackerMuonAlignment::debugTrackHit(const std::string title, TransientTrack& alongTr) {
+  std::cout << " ------- " << title << " --------" << std::endl;
   int nHit = 1;
-  for (trackingRecHit_iterator i=alongTr.recHitsBegin();i!=alongTr.recHitsEnd(); i++) {
-    std::cout<<" Hit "<<nHit++<<" DetId "<< (*i)->geographicalId().det();
-    if( (*i)->geographicalId().det() == DetId::Tracker ) std::cout<<" Tracker ";
-    else if ( (*i)->geographicalId().det() == DetId::Muon ) std::cout<<" Muon "; 
-    else std::cout<<" Unknown ";
-    if(!(*i)->isValid()) std::cout<<" not valid "<<std::endl;  
-    else std::cout<<std::endl;
+  for (trackingRecHit_iterator i = alongTr.recHitsBegin(); i != alongTr.recHitsEnd(); i++) {
+    std::cout << " Hit " << nHit++ << " DetId " << (*i)->geographicalId().det();
+    if ((*i)->geographicalId().det() == DetId::Tracker)
+      std::cout << " Tracker ";
+    else if ((*i)->geographicalId().det() == DetId::Muon)
+      std::cout << " Muon ";
+    else
+      std::cout << " Unknown ";
+    if (!(*i)->isValid())
+      std::cout << " not valid " << std::endl;
+    else
+      std::cout << std::endl;
   }
 }
 
-
 // ----  debug printout of hits from TrackRef   ------
-void GlobalTrackerMuonAlignment::debugTrackHit(const std::string title, reco::TrackRef alongTr) 
-{
-  std::cout<<" ------- "<<title<<" --------"<<std::endl;
+void GlobalTrackerMuonAlignment::debugTrackHit(const std::string title, reco::TrackRef alongTr) {
+  std::cout << " ------- " << title << " --------" << std::endl;
   int nHit = 1;
-  for(auto const& hit : alongTr->recHits()) {
-    std::cout<<" Hit "<<nHit++<<" DetId "<< hit->geographicalId().det();
-    if( hit->geographicalId().det() == DetId::Tracker ) std::cout<<" Tracker ";
-    else if ( hit->geographicalId().det() == DetId::Muon ) std::cout<<" Muon "; 
-    else std::cout<<" Unknown ";
-    if(!hit->isValid()) std::cout<<" not valid "<<std::endl;  
-    else std::cout<<std::endl;
+  for (auto const& hit : alongTr->recHits()) {
+    std::cout << " Hit " << nHit++ << " DetId " << hit->geographicalId().det();
+    if (hit->geographicalId().det() == DetId::Tracker)
+      std::cout << " Tracker ";
+    else if (hit->geographicalId().det() == DetId::Muon)
+      std::cout << " Muon ";
+    else
+      std::cout << " Unknown ";
+    if (!hit->isValid())
+      std::cout << " not valid " << std::endl;
+    else
+      std::cout << std::endl;
   }
 }
 
 // ----  debug printout TrajectoryStateOnSurface  ------
-void GlobalTrackerMuonAlignment::debugTrajectorySOS(const std::string title, 
-						     TrajectoryStateOnSurface& trajSOS) 
-{
-  std::cout<<"    --- "<<title<<" --- "<<std::endl;
-  if(!trajSOS.isValid()) {std::cout<<"      Not valid !!!! "<<std::endl; return;}
-  std::cout<<" R |p| "<<trajSOS.globalPosition().perp()<<" "
-	   <<trajSOS.globalMomentum().mag()<<" charge "<<trajSOS.charge()<<std::endl; 
-  std::cout<<" x p  "<<trajSOS.globalParameters().vector()(0)<<" "
-	   <<trajSOS.globalParameters().vector()(1)<<" "
-	   <<trajSOS.globalParameters().vector()(2)<<" "
-	   <<trajSOS.globalParameters().vector()(3)<<" "
-	   <<trajSOS.globalParameters().vector()(4)<<" "
-	   <<trajSOS.globalParameters().vector()(5)<<std::endl;
-  std::cout<<" +/- "<<sqrt(trajSOS.cartesianError().matrix()(0,0))<<" "
-	   <<sqrt(trajSOS.cartesianError().matrix()(1,1))<<" "
-	   <<sqrt(trajSOS.cartesianError().matrix()(2,2))<<" "
-	   <<sqrt(trajSOS.cartesianError().matrix()(3,3))<<" "
-	   <<sqrt(trajSOS.cartesianError().matrix()(4,4))<<" "
-	   <<sqrt(trajSOS.cartesianError().matrix()(5,5))<<std::endl;
-  std::cout<<" q/p dxy/dz xy "<<trajSOS.localParameters().vector()(0)<<" "
-	   <<trajSOS.localParameters().vector()(1)<<" "
-	   <<trajSOS.localParameters().vector()(2)<<" "
-	   <<trajSOS.localParameters().vector()(3)<<" "
-	   <<trajSOS.localParameters().vector()(4)<<std::endl;
-  std::cout<<"   +/- error  "<<sqrt(trajSOS.localError().matrix()(0,0))<<" "
-	   <<sqrt(trajSOS.localError().matrix()(1,1))<<" "
-	   <<sqrt(trajSOS.localError().matrix()(2,2))<<" "
-	   <<sqrt(trajSOS.localError().matrix()(3,3))<<" "
-	   <<sqrt(trajSOS.localError().matrix()(4,4))<<" "<<std::endl;
+void GlobalTrackerMuonAlignment::debugTrajectorySOS(const std::string title, TrajectoryStateOnSurface& trajSOS) {
+  std::cout << "    --- " << title << " --- " << std::endl;
+  if (!trajSOS.isValid()) {
+    std::cout << "      Not valid !!!! " << std::endl;
+    return;
+  }
+  std::cout << " R |p| " << trajSOS.globalPosition().perp() << " " << trajSOS.globalMomentum().mag() << " charge "
+            << trajSOS.charge() << std::endl;
+  std::cout << " x p  " << trajSOS.globalParameters().vector()(0) << " " << trajSOS.globalParameters().vector()(1)
+            << " " << trajSOS.globalParameters().vector()(2) << " " << trajSOS.globalParameters().vector()(3) << " "
+            << trajSOS.globalParameters().vector()(4) << " " << trajSOS.globalParameters().vector()(5) << std::endl;
+  std::cout << " +/- " << sqrt(trajSOS.cartesianError().matrix()(0, 0)) << " "
+            << sqrt(trajSOS.cartesianError().matrix()(1, 1)) << " " << sqrt(trajSOS.cartesianError().matrix()(2, 2))
+            << " " << sqrt(trajSOS.cartesianError().matrix()(3, 3)) << " "
+            << sqrt(trajSOS.cartesianError().matrix()(4, 4)) << " " << sqrt(trajSOS.cartesianError().matrix()(5, 5))
+            << std::endl;
+  std::cout << " q/p dxy/dz xy " << trajSOS.localParameters().vector()(0) << " "
+            << trajSOS.localParameters().vector()(1) << " " << trajSOS.localParameters().vector()(2) << " "
+            << trajSOS.localParameters().vector()(3) << " " << trajSOS.localParameters().vector()(4) << std::endl;
+  std::cout << "   +/- error  " << sqrt(trajSOS.localError().matrix()(0, 0)) << " "
+            << sqrt(trajSOS.localError().matrix()(1, 1)) << " " << sqrt(trajSOS.localError().matrix()(2, 2)) << " "
+            << sqrt(trajSOS.localError().matrix()(3, 3)) << " " << sqrt(trajSOS.localError().matrix()(4, 4)) << " "
+            << std::endl;
 }
 
 // ----  debug printout TrajectoryStateOnSurface  ------
-void GlobalTrackerMuonAlignment::debugTrajectorySOSv(const std::string title, 
-						     TrajectoryStateOnSurface trajSOS) 
-{
-  std::cout<<"    --- "<<title<<" --- "<<std::endl;
-  if(!trajSOS.isValid()) {std::cout<<"      Not valid !!!! "<<std::endl; return;}
-  std::cout<<" R |p| "<<trajSOS.globalPosition().perp()<<" "
-	   <<trajSOS.globalMomentum().mag()<<" charge "<<trajSOS.charge()<<std::endl; 
-  std::cout<<" x p  "<<trajSOS.globalParameters().vector()(0)<<" "
-	   <<trajSOS.globalParameters().vector()(1)<<" "
-	   <<trajSOS.globalParameters().vector()(2)<<" "
-	   <<trajSOS.globalParameters().vector()(3)<<" "
-	   <<trajSOS.globalParameters().vector()(4)<<" "
-	   <<trajSOS.globalParameters().vector()(5)<<std::endl;
-  std::cout<<" +/- "<<sqrt(trajSOS.cartesianError().matrix()(0,0))<<" "
-	   <<sqrt(trajSOS.cartesianError().matrix()(1,1))<<" "
-	   <<sqrt(trajSOS.cartesianError().matrix()(2,2))<<" "
-	   <<sqrt(trajSOS.cartesianError().matrix()(3,3))<<" "
-	   <<sqrt(trajSOS.cartesianError().matrix()(4,4))<<" "
-	   <<sqrt(trajSOS.cartesianError().matrix()(5,5))<<std::endl;
-  std::cout<<" q/p dxy/dz xy "<<trajSOS.localParameters().vector()(0)<<" "
-	   <<trajSOS.localParameters().vector()(1)<<" "
-	   <<trajSOS.localParameters().vector()(2)<<" "
-	   <<trajSOS.localParameters().vector()(3)<<" "
-	   <<trajSOS.localParameters().vector()(4)<<std::endl;
-  std::cout<<"   +/- error  "<<sqrt(trajSOS.localError().matrix()(0,0))<<" "
-	   <<sqrt(trajSOS.localError().matrix()(1,1))<<" "
-	   <<sqrt(trajSOS.localError().matrix()(2,2))<<" "
-	   <<sqrt(trajSOS.localError().matrix()(3,3))<<" "
-	   <<sqrt(trajSOS.localError().matrix()(4,4))<<" "<<std::endl;
+void GlobalTrackerMuonAlignment::debugTrajectorySOSv(const std::string title, TrajectoryStateOnSurface trajSOS) {
+  std::cout << "    --- " << title << " --- " << std::endl;
+  if (!trajSOS.isValid()) {
+    std::cout << "      Not valid !!!! " << std::endl;
+    return;
+  }
+  std::cout << " R |p| " << trajSOS.globalPosition().perp() << " " << trajSOS.globalMomentum().mag() << " charge "
+            << trajSOS.charge() << std::endl;
+  std::cout << " x p  " << trajSOS.globalParameters().vector()(0) << " " << trajSOS.globalParameters().vector()(1)
+            << " " << trajSOS.globalParameters().vector()(2) << " " << trajSOS.globalParameters().vector()(3) << " "
+            << trajSOS.globalParameters().vector()(4) << " " << trajSOS.globalParameters().vector()(5) << std::endl;
+  std::cout << " +/- " << sqrt(trajSOS.cartesianError().matrix()(0, 0)) << " "
+            << sqrt(trajSOS.cartesianError().matrix()(1, 1)) << " " << sqrt(trajSOS.cartesianError().matrix()(2, 2))
+            << " " << sqrt(trajSOS.cartesianError().matrix()(3, 3)) << " "
+            << sqrt(trajSOS.cartesianError().matrix()(4, 4)) << " " << sqrt(trajSOS.cartesianError().matrix()(5, 5))
+            << std::endl;
+  std::cout << " q/p dxy/dz xy " << trajSOS.localParameters().vector()(0) << " "
+            << trajSOS.localParameters().vector()(1) << " " << trajSOS.localParameters().vector()(2) << " "
+            << trajSOS.localParameters().vector()(3) << " " << trajSOS.localParameters().vector()(4) << std::endl;
+  std::cout << "   +/- error  " << sqrt(trajSOS.localError().matrix()(0, 0)) << " "
+            << sqrt(trajSOS.localError().matrix()(1, 1)) << " " << sqrt(trajSOS.localError().matrix()(2, 2)) << " "
+            << sqrt(trajSOS.localError().matrix()(3, 3)) << " " << sqrt(trajSOS.localError().matrix()(4, 4)) << " "
+            << std::endl;
 }
 
 // ----  debug printout Trajectory   ------
-void GlobalTrackerMuonAlignment::debugTrajectory(const std::string title, Trajectory& traj) 
-{
-  std::cout<<"\n"<<"    ...... "<<title<<" ...... "<<std::endl;
-  if(!traj.isValid()) {std::cout<<"          Not valid !!!!!!!!  "<<std::endl; return;}
-  std::cout<<" chi2/Nhit "<<traj.chiSquared()<<" / "<<traj.foundHits();
-  if(traj.direction() == alongMomentum) std::cout<<" alongMomentum  >>>>"<<std::endl;
-  else                                  std::cout<<" oppositeToMomentum  <<<<"<<std::endl;
-  this->debugTrajectorySOSv(" firstMeasurementTSOS ",traj.firstMeasurement().updatedState());
+void GlobalTrackerMuonAlignment::debugTrajectory(const std::string title, Trajectory& traj) {
+  std::cout << "\n"
+            << "    ...... " << title << " ...... " << std::endl;
+  if (!traj.isValid()) {
+    std::cout << "          Not valid !!!!!!!!  " << std::endl;
+    return;
+  }
+  std::cout << " chi2/Nhit " << traj.chiSquared() << " / " << traj.foundHits();
+  if (traj.direction() == alongMomentum)
+    std::cout << " alongMomentum  >>>>" << std::endl;
+  else
+    std::cout << " oppositeToMomentum  <<<<" << std::endl;
+  this->debugTrajectorySOSv(" firstMeasurementTSOS ", traj.firstMeasurement().updatedState());
   //this->debugTrajectorySOSv(" firstMeasurementTSOS ",traj.firstMeasurement().predictedState());
-  this->debugTrajectorySOSv(" lastMeasurementTSOS ",traj.lastMeasurement().updatedState());
+  this->debugTrajectorySOSv(" lastMeasurementTSOS ", traj.lastMeasurement().updatedState());
   //this->debugTrajectorySOSv(" geom InnermostState", traj.geometricalInnermostState());
-  std::cout<<"    . . . . . . . . . . . . . . . . . . . . . . . . . . . . \n"<<std::endl;
+  std::cout << "    . . . . . . . . . . . . . . . . . . . . . . . . . . . . \n" << std::endl;
 }
 
-
 // ----  write GlobalPositionRcd   ------
-void GlobalTrackerMuonAlignment::writeGlPosRcd(CLHEP::HepVector& paramVec) 
-{
+void GlobalTrackerMuonAlignment::writeGlPosRcd(CLHEP::HepVector& paramVec) {
   //paramVec(1) = 0.1; paramVec(2) = 0.2; paramVec(3) = 0.3;         //0123
   //paramVec(4) = 0.0001; paramVec(5) = 0.0002; paramVec(6) = 0.0003;
   //paramVec(1) = 0.3; paramVec(2) = 0.4; paramVec(3) = 0.5;         //03450123
@@ -3226,141 +3331,121 @@ void GlobalTrackerMuonAlignment::writeGlPosRcd(CLHEP::HepVector& paramVec)
   //paramVec(1) = 0.; paramVec(2) = 0.; paramVec(3) = 1.;               //1z
   //paramVec(4) = 0.0000; paramVec(5) = 0.0000; paramVec(6) = 0.0000;
 
-  std::cout<<" paramVector "<<paramVec.T()<<std::endl;
-  
+  std::cout << " paramVector " << paramVec.T() << std::endl;
+
   CLHEP::Hep3Vector colX, colY, colZ;
 
-#ifdef NOT_EXACT_ROTATION_MATRIX     
-  colX = CLHEP::Hep3Vector(          1.,  -paramVec(6),  paramVec(5));
-  colY = CLHEP::Hep3Vector( paramVec(6),            1., -paramVec(4));
-  colZ = CLHEP::Hep3Vector(-paramVec(5),   paramVec(4),           1.);
-#else 
+#ifdef NOT_EXACT_ROTATION_MATRIX
+  colX = CLHEP::Hep3Vector(1., -paramVec(6), paramVec(5));
+  colY = CLHEP::Hep3Vector(paramVec(6), 1., -paramVec(4));
+  colZ = CLHEP::Hep3Vector(-paramVec(5), paramVec(4), 1.);
+#else
   double s1 = std::sin(paramVec(4)), c1 = std::cos(paramVec(4));
   double s2 = std::sin(paramVec(5)), c2 = std::cos(paramVec(5));
   double s3 = std::sin(paramVec(6)), c3 = std::cos(paramVec(6));
-  colX = CLHEP::Hep3Vector(               c2 * c3,               -c2 * s3,       s2);
+  colX = CLHEP::Hep3Vector(c2 * c3, -c2 * s3, s2);
   colY = CLHEP::Hep3Vector(c1 * s3 + s1 * s2 * c3, c1 * c3 - s1 * s2 * s3, -s1 * c2);
-  colZ = CLHEP::Hep3Vector(s1 * s3 - c1 * s2 * c3, s1 * c3 + c1 * s2 * s3,  c1 * c2);
+  colZ = CLHEP::Hep3Vector(s1 * s3 - c1 * s2 * c3, s1 * c3 + c1 * s2 * s3, c1 * c2);
 #endif
 
-  CLHEP::HepVector  param0(6,0);
+  CLHEP::HepVector param0(6, 0);
 
-  Alignments* globalPositions = new Alignments();  
+  Alignments* globalPositions = new Alignments();
 
   //Tracker
-  AlignTransform tracker(iteratorTrackerRcd->translation(),
-			 iteratorTrackerRcd->rotation(),
-			 DetId(DetId::Tracker).rawId());
+  AlignTransform tracker(
+      iteratorTrackerRcd->translation(), iteratorTrackerRcd->rotation(), DetId(DetId::Tracker).rawId());
   // Muon
   CLHEP::Hep3Vector posMuGlRcd = iteratorMuonRcd->translation();
   CLHEP::HepRotation rotMuGlRcd = iteratorMuonRcd->rotation();
   CLHEP::HepEulerAngles angMuGlRcd = iteratorMuonRcd->rotation().eulerAngles();
-  if(debug_)
-    std::cout<<" Old muon Rcd Euler angles "<<angMuGlRcd.phi()<<" "<<angMuGlRcd.theta()
-	     <<" "<<angMuGlRcd.psi()<<std::endl;
+  if (debug_)
+    std::cout << " Old muon Rcd Euler angles " << angMuGlRcd.phi() << " " << angMuGlRcd.theta() << " "
+              << angMuGlRcd.psi() << std::endl;
   AlignTransform muon;
-  if((angMuGlRcd.phi() == 0.) && (angMuGlRcd.theta() == 0.) && (angMuGlRcd.psi() == 0.) &&
-     (posMuGlRcd.x() == 0.) && (posMuGlRcd.y() == 0.) && (posMuGlRcd.z() == 0.)){
-    std::cout<<" New muon parameters are stored in Rcd"<<std::endl; 
-
-    AlignTransform muonNew(AlignTransform::Translation(paramVec(1),
-						       paramVec(2),
-						       paramVec(3)),
-			   AlignTransform::Rotation   (colX,
-						       colY,
-						       colZ),
-			   DetId(DetId::Muon).rawId());
+  if ((angMuGlRcd.phi() == 0.) && (angMuGlRcd.theta() == 0.) && (angMuGlRcd.psi() == 0.) && (posMuGlRcd.x() == 0.) &&
+      (posMuGlRcd.y() == 0.) && (posMuGlRcd.z() == 0.)) {
+    std::cout << " New muon parameters are stored in Rcd" << std::endl;
+
+    AlignTransform muonNew(AlignTransform::Translation(paramVec(1), paramVec(2), paramVec(3)),
+                           AlignTransform::Rotation(colX, colY, colZ),
+                           DetId(DetId::Muon).rawId());
     muon = muonNew;
-  }
-  else if((paramVec(1) == 0.) && (paramVec(2) == 0.) && (paramVec(3) == 0.) && 
-	  (paramVec(4) == 0.) && (paramVec(5) == 0.) && (paramVec(6) == 0.)){
-    std::cout<<" Old muon parameters are stored in Rcd"<<std::endl; 
-    
-    AlignTransform muonNew(iteratorMuonRcd->translation(),
-			   iteratorMuonRcd->rotation(),
-			   DetId(DetId::Muon).rawId());
-    muon = muonNew;  
-  }
-  else{
-    std::cout<<" New + Old muon parameters are stored in Rcd"<<std::endl; 
-    CLHEP::Hep3Vector posMuGlRcdThis = CLHEP::Hep3Vector(paramVec(1), paramVec(2), paramVec(3));   
-    CLHEP::HepRotation rotMuGlRcdThis = CLHEP::HepRotation(colX, colY, colZ);   
+  } else if ((paramVec(1) == 0.) && (paramVec(2) == 0.) && (paramVec(3) == 0.) && (paramVec(4) == 0.) &&
+             (paramVec(5) == 0.) && (paramVec(6) == 0.)) {
+    std::cout << " Old muon parameters are stored in Rcd" << std::endl;
+
+    AlignTransform muonNew(iteratorMuonRcd->translation(), iteratorMuonRcd->rotation(), DetId(DetId::Muon).rawId());
+    muon = muonNew;
+  } else {
+    std::cout << " New + Old muon parameters are stored in Rcd" << std::endl;
+    CLHEP::Hep3Vector posMuGlRcdThis = CLHEP::Hep3Vector(paramVec(1), paramVec(2), paramVec(3));
+    CLHEP::HepRotation rotMuGlRcdThis = CLHEP::HepRotation(colX, colY, colZ);
     CLHEP::Hep3Vector posMuGlRcdNew = rotMuGlRcdThis * posMuGlRcd + posMuGlRcdThis;
     CLHEP::HepRotation rotMuGlRcdNew = rotMuGlRcdThis * rotMuGlRcd;
 
-    AlignTransform muonNew(posMuGlRcdNew,
-			   rotMuGlRcdNew, 
-			   DetId(DetId::Muon).rawId());
+    AlignTransform muonNew(posMuGlRcdNew, rotMuGlRcdNew, DetId(DetId::Muon).rawId());
     muon = muonNew;
   }
 
   // Ecal
-  AlignTransform ecal(iteratorEcalRcd->translation(),
-			 iteratorEcalRcd->rotation(),
-			 DetId(DetId::Ecal).rawId());
+  AlignTransform ecal(iteratorEcalRcd->translation(), iteratorEcalRcd->rotation(), DetId(DetId::Ecal).rawId());
   // Hcal
-  AlignTransform hcal(iteratorHcalRcd->translation(),
-			 iteratorHcalRcd->rotation(),
-			 DetId(DetId::Hcal).rawId());
+  AlignTransform hcal(iteratorHcalRcd->translation(), iteratorHcalRcd->rotation(), DetId(DetId::Hcal).rawId());
   // Calo
-  AlignTransform calo(AlignTransform::Translation(param0(1),
-						  param0(2),
-						  param0(3)),
-		      AlignTransform::EulerAngles(param0(4),
-						  param0(5),
-						  param0(6)),
-		      DetId(DetId::Calo).rawId());
-
-  std::cout << "Tracker (" << tracker.rawId() << ") at " << tracker.translation() 
-	    << " " << tracker.rotation().eulerAngles() << std::endl;
+  AlignTransform calo(AlignTransform::Translation(param0(1), param0(2), param0(3)),
+                      AlignTransform::EulerAngles(param0(4), param0(5), param0(6)),
+                      DetId(DetId::Calo).rawId());
+
+  std::cout << "Tracker (" << tracker.rawId() << ") at " << tracker.translation() << " "
+            << tracker.rotation().eulerAngles() << std::endl;
   std::cout << tracker.rotation() << std::endl;
-  
-  std::cout << "Muon (" << muon.rawId() << ") at " << muon.translation() 
-    	    << " " << muon.rotation().eulerAngles() << std::endl;
+
+  std::cout << "Muon (" << muon.rawId() << ") at " << muon.translation() << " " << muon.rotation().eulerAngles()
+            << std::endl;
   std::cout << "          rotations angles around x,y,z "
-	    << " ( " << -muon.rotation().zy() << " " << muon.rotation().zx() 
-	    << " " << -muon.rotation().yx() << " )" << std::endl;
-   std::cout << muon.rotation() << std::endl;
-   
-   std::cout << "Ecal (" << ecal.rawId() << ") at " << ecal.translation() 
-	     << " " << ecal.rotation().eulerAngles() << std::endl;
-   std::cout << ecal.rotation() << std::endl;
-   
-   std::cout << "Hcal (" << hcal.rawId() << ") at " << hcal.translation()
-	     << " " << hcal.rotation().eulerAngles() << std::endl;
-   std::cout << hcal.rotation() << std::endl;
-   
-   std::cout << "Calo (" << calo.rawId() << ") at " << calo.translation()
-	     << " " << calo.rotation().eulerAngles() << std::endl;
-   std::cout << calo.rotation() << std::endl;
-
-   globalPositions->m_align.push_back(tracker);
-   globalPositions->m_align.push_back(muon);
-   globalPositions->m_align.push_back(ecal);
-   globalPositions->m_align.push_back(hcal);
-   globalPositions->m_align.push_back(calo);
-
-   std::cout << "Uploading to the database..." << std::endl;
-
-   edm::Service<cond::service::PoolDBOutputService> poolDbService;
-   
-   if (!poolDbService.isAvailable())
-     throw cms::Exception("NotAvailable") << "PoolDBOutputService not available";
-                  
-   //    if (poolDbService->isNewTagRequest("GlobalPositionRcd")) {
-//       poolDbService->createNewIOV<Alignments>(&(*globalPositions), poolDbService->endOfTime(), "GlobalPositionRcd");
-//    } else {
-//       poolDbService->appendSinceTime<Alignments>(&(*globalPositions), poolDbService->currentTime(), "GlobalPositionRcd");
-//    }
-   poolDbService->writeOne<Alignments>(&(*globalPositions), 
-				       poolDbService->currentTime(),
-				       //poolDbService->beginOfTime(),
-                                       "GlobalPositionRcd");
-   std::cout << "done!" << std::endl;
-   
-   return;
-}
+            << " ( " << -muon.rotation().zy() << " " << muon.rotation().zx() << " " << -muon.rotation().yx() << " )"
+            << std::endl;
+  std::cout << muon.rotation() << std::endl;
+
+  std::cout << "Ecal (" << ecal.rawId() << ") at " << ecal.translation() << " " << ecal.rotation().eulerAngles()
+            << std::endl;
+  std::cout << ecal.rotation() << std::endl;
+
+  std::cout << "Hcal (" << hcal.rawId() << ") at " << hcal.translation() << " " << hcal.rotation().eulerAngles()
+            << std::endl;
+  std::cout << hcal.rotation() << std::endl;
+
+  std::cout << "Calo (" << calo.rawId() << ") at " << calo.translation() << " " << calo.rotation().eulerAngles()
+            << std::endl;
+  std::cout << calo.rotation() << std::endl;
+
+  globalPositions->m_align.push_back(tracker);
+  globalPositions->m_align.push_back(muon);
+  globalPositions->m_align.push_back(ecal);
+  globalPositions->m_align.push_back(hcal);
+  globalPositions->m_align.push_back(calo);
+
+  std::cout << "Uploading to the database..." << std::endl;
+
+  edm::Service<cond::service::PoolDBOutputService> poolDbService;
+
+  if (!poolDbService.isAvailable())
+    throw cms::Exception("NotAvailable") << "PoolDBOutputService not available";
+
+  //    if (poolDbService->isNewTagRequest("GlobalPositionRcd")) {
+  //       poolDbService->createNewIOV<Alignments>(&(*globalPositions), poolDbService->endOfTime(), "GlobalPositionRcd");
+  //    } else {
+  //       poolDbService->appendSinceTime<Alignments>(&(*globalPositions), poolDbService->currentTime(), "GlobalPositionRcd");
+  //    }
+  poolDbService->writeOne<Alignments>(&(*globalPositions),
+                                      poolDbService->currentTime(),
+                                      //poolDbService->beginOfTime(),
+                                      "GlobalPositionRcd");
+  std::cout << "done!" << std::endl;
 
+  return;
+}
 
 //define this as a plug-in
 DEFINE_FWK_MODULE(GlobalTrackerMuonAlignment);
diff --git a/Alignment/CommonAlignmentProducer/plugins/LSNumberFilter.cc b/Alignment/CommonAlignmentProducer/plugins/LSNumberFilter.cc
index 3663152367c4f..cb29ee14d6376 100644
--- a/Alignment/CommonAlignmentProducer/plugins/LSNumberFilter.cc
+++ b/Alignment/CommonAlignmentProducer/plugins/LSNumberFilter.cc
@@ -10,67 +10,48 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-
-
 //
 // class declaration
 //
 
-
-
 class LSNumberFilter : public edm::EDFilter {
 public:
   explicit LSNumberFilter(const edm::ParameterSet&);
   ~LSNumberFilter() override;
 
 private:
-
-  void beginJob() override ;
+  void beginJob() override;
   bool filter(edm::Event&, const edm::EventSetup&) override;
-  void endJob() override ;
+  void endJob() override;
 
   unsigned int minLS;
 };
 
+LSNumberFilter::LSNumberFilter(const edm::ParameterSet& iConfig)
+    : minLS(iConfig.getUntrackedParameter<unsigned>("minLS", 21)) {}
 
-
-LSNumberFilter::LSNumberFilter(const edm::ParameterSet& iConfig):
-  minLS(iConfig.getUntrackedParameter<unsigned>("minLS",21))
-{}
-
-
-LSNumberFilter::~LSNumberFilter()
-{
-
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+LSNumberFilter::~LSNumberFilter() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called on each new Event  ------------
-bool LSNumberFilter::filter(edm::Event& iEvent,
-			    const edm::EventSetup& iSetup) {
+bool LSNumberFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup) {
+  if (iEvent.luminosityBlock() < minLS)
+    return false;
 
-  if(iEvent.luminosityBlock() < minLS) return false;
-  
   return true;
-
 }
 
 // ------------ method called once each job just before starting event loop  ------------
-void
-LSNumberFilter::beginJob()
-{}
+void LSNumberFilter::beginJob() {}
 
 // ------------ method called once each job just after ending the event loop  ------------
-void
-LSNumberFilter::endJob() {
-}
+void LSNumberFilter::endJob() {}
 
 //define this as a plug-in
 DEFINE_FWK_MODULE(LSNumberFilter);
diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentCSCBeamHaloSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentCSCBeamHaloSelector.cc
index 6d90bad37ac4d..6c5a325fdf700 100644
--- a/Alignment/CommonAlignmentProducer/src/AlignmentCSCBeamHaloSelector.cc
+++ b/Alignment/CommonAlignmentProducer/src/AlignmentCSCBeamHaloSelector.cc
@@ -11,12 +11,12 @@
 
 // constructor ----------------------------------------------------------------
 
-AlignmentCSCBeamHaloSelector::AlignmentCSCBeamHaloSelector(const edm::ParameterSet &iConfig, edm::ConsumesCollector & iC)
-   : m_minStations(iConfig.getParameter<unsigned int>("minStations"))
-   , m_minHitsPerStation(iConfig.getParameter<unsigned int>("minHitsPerStation"))
-{
-   edm::LogInfo("AlignmentCSCBeamHaloSelector")
-      << "Acceptable tracks must have at least " << m_minHitsPerStation << " hits in " << m_minStations << " different CSC stations." << std::endl;
+AlignmentCSCBeamHaloSelector::AlignmentCSCBeamHaloSelector(const edm::ParameterSet &iConfig, edm::ConsumesCollector &iC)
+    : m_minStations(iConfig.getParameter<unsigned int>("minStations")),
+      m_minHitsPerStation(iConfig.getParameter<unsigned int>("minHitsPerStation")) {
+  edm::LogInfo("AlignmentCSCBeamHaloSelector")
+      << "Acceptable tracks must have at least " << m_minHitsPerStation << " hits in " << m_minStations
+      << " different CSC stations." << std::endl;
 }
 
 // destructor -----------------------------------------------------------------
@@ -25,35 +25,38 @@ AlignmentCSCBeamHaloSelector::~AlignmentCSCBeamHaloSelector() {}
 
 // do selection ---------------------------------------------------------------
 
-AlignmentCSCBeamHaloSelector::Tracks
-AlignmentCSCBeamHaloSelector::select(const Tracks &tracks, const edm::Event &iEvent) const {
-   Tracks result;
-
-   for(auto const& track : tracks) {
-      std::map<int, unsigned int> station_map;
-
-      for(auto const& hit : track->recHits()) {
-	 DetId id = hit->geographicalId();
-	 if (id.det() == DetId::Muon  &&  id.subdetId() == MuonSubdetId::CSC) {
-	    CSCDetId cscid(id.rawId());
-	    int station = (cscid.endcap() == 1 ? 1 : -1) * cscid.station();
-
-	    std::map<int, unsigned int>::const_iterator station_iter = station_map.find(station);
-	    if (station_iter == station_map.end()) {
-	       station_map[station] = 0;
-	    }
-	    station_map[station]++;
-	 } // end if it's a CSC hit
-      } // end loop over hits
-
-      unsigned int stations = 0;
-      for (std::map<int, unsigned int>::const_iterator station_iter = station_map.begin();  station_iter != station_map.end();  ++station_iter) {
-	 if (station_iter->second > m_minHitsPerStation) stations++;
-      }
-      if (stations >= m_minStations) {
-	 result.push_back(track);
-      }
-   } // end loop over tracks
-
-   return result;
+AlignmentCSCBeamHaloSelector::Tracks AlignmentCSCBeamHaloSelector::select(const Tracks &tracks,
+                                                                          const edm::Event &iEvent) const {
+  Tracks result;
+
+  for (auto const &track : tracks) {
+    std::map<int, unsigned int> station_map;
+
+    for (auto const &hit : track->recHits()) {
+      DetId id = hit->geographicalId();
+      if (id.det() == DetId::Muon && id.subdetId() == MuonSubdetId::CSC) {
+        CSCDetId cscid(id.rawId());
+        int station = (cscid.endcap() == 1 ? 1 : -1) * cscid.station();
+
+        std::map<int, unsigned int>::const_iterator station_iter = station_map.find(station);
+        if (station_iter == station_map.end()) {
+          station_map[station] = 0;
+        }
+        station_map[station]++;
+      }  // end if it's a CSC hit
+    }    // end loop over hits
+
+    unsigned int stations = 0;
+    for (std::map<int, unsigned int>::const_iterator station_iter = station_map.begin();
+         station_iter != station_map.end();
+         ++station_iter) {
+      if (station_iter->second > m_minHitsPerStation)
+        stations++;
+    }
+    if (stations >= m_minStations) {
+      result.push_back(track);
+    }
+  }  // end loop over tracks
+
+  return result;
 }
diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentCSCOverlapSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentCSCOverlapSelector.cc
index d15876505ac6b..a8edd189e46ee 100644
--- a/Alignment/CommonAlignmentProducer/src/AlignmentCSCOverlapSelector.cc
+++ b/Alignment/CommonAlignmentProducer/src/AlignmentCSCOverlapSelector.cc
@@ -12,17 +12,15 @@
 // constructor ----------------------------------------------------------------
 
 AlignmentCSCOverlapSelector::AlignmentCSCOverlapSelector(const edm::ParameterSet &iConfig)
-   : m_station(iConfig.getParameter<int>("station"))
-   , m_minHitsPerChamber(iConfig.getParameter<unsigned int>("minHitsPerChamber"))
-{
-   if (m_station == 0) {
-      edm::LogInfo("AlignmentCSCOverlapSelector") 
-	 << "Acceptable tracks must have " << m_minHitsPerChamber << " in two chambers on all stations." << std::endl;
-   }
-   else {
-      edm::LogInfo("AlignmentCSCOverlapSelector") 
-	 << "Acceptable tracks must have " << m_minHitsPerChamber << " in two chambers on station " << m_station << "." << std::endl;
-   }
+    : m_station(iConfig.getParameter<int>("station")),
+      m_minHitsPerChamber(iConfig.getParameter<unsigned int>("minHitsPerChamber")) {
+  if (m_station == 0) {
+    edm::LogInfo("AlignmentCSCOverlapSelector")
+        << "Acceptable tracks must have " << m_minHitsPerChamber << " in two chambers on all stations." << std::endl;
+  } else {
+    edm::LogInfo("AlignmentCSCOverlapSelector") << "Acceptable tracks must have " << m_minHitsPerChamber
+                                                << " in two chambers on station " << m_station << "." << std::endl;
+  }
 }
 
 // destructor -----------------------------------------------------------------
@@ -31,97 +29,115 @@ AlignmentCSCOverlapSelector::~AlignmentCSCOverlapSelector() {}
 
 // do selection ---------------------------------------------------------------
 
-AlignmentCSCOverlapSelector::Tracks 
-AlignmentCSCOverlapSelector::select(const Tracks &tracks, const edm::Event &iEvent) const {
-   Tracks result;
-
-   for(auto const& track : tracks) {
-      unsigned int MEminus4_even = 0;
-      unsigned int MEminus4_odd = 0;
-      unsigned int MEminus3_even = 0;
-      unsigned int MEminus3_odd = 0;
-      unsigned int MEminus2_even = 0;
-      unsigned int MEminus2_odd = 0;
-      unsigned int MEminus1_even = 0;
-      unsigned int MEminus1_odd = 0;
-
-      unsigned int MEplus1_even = 0;
-      unsigned int MEplus1_odd = 0;
-      unsigned int MEplus2_even = 0;
-      unsigned int MEplus2_odd = 0;
-      unsigned int MEplus3_even = 0;
-      unsigned int MEplus3_odd = 0;
-      unsigned int MEplus4_even = 0;
-      unsigned int MEplus4_odd = 0;
-
-      for(auto const& hit : track->recHits()) {
-	 DetId id = hit->geographicalId();
-	 if (id.det() == DetId::Muon  &&  id.subdetId() == MuonSubdetId::CSC) {
-	    CSCDetId cscid(id.rawId());
-	    int station = (cscid.endcap() == 1 ? 1 : -1) * cscid.station();
-
-	    if (station == -4) {
-	       if (cscid.chamber() % 2 == 0) MEminus4_even++;
-	       else MEminus4_odd++;
-	    }
-	    else if (station == -3) {
-	       if (cscid.chamber() % 2 == 0) MEminus3_even++;
-	       else MEminus3_odd++;
-	    }
-	    else if (station == -2) {
-	       if (cscid.chamber() % 2 == 0) MEminus2_even++;
-	       else MEminus2_odd++;
-	    }
-	    else if (station == -1) {
-	       if (cscid.chamber() % 2 == 0) MEminus1_even++;
-	       else MEminus1_odd++;
-	    }
-
-	    else if (station == 1) {
-	       if (cscid.chamber() % 2 == 0) MEplus1_even++;
-	       else MEplus1_odd++;
-	    }
-	    else if (station == 2) {
-	       if (cscid.chamber() % 2 == 0) MEplus2_even++;
-	       else MEplus2_odd++;
-	    }
-	    else if (station == 3) {
-	       if (cscid.chamber() % 2 == 0) MEplus3_even++;
-	       else MEplus3_odd++;
-	    }
-	    else if (station == 4) {
-	       if (cscid.chamber() % 2 == 0) MEplus4_even++;
-	       else MEplus4_odd++;
-	    }
-
-	 } // end if it's a CSC hit
-      } // end loop over hits
-
-      if ((m_station == 0  ||  m_station == -4)  &&
-	  (MEminus4_even >= m_minHitsPerChamber)  &&  (MEminus4_odd >= m_minHitsPerChamber)) result.push_back(track);
-
-      else if ((m_station == 0  ||  m_station == -3)  &&
-	       (MEminus3_even >= m_minHitsPerChamber)  &&  (MEminus3_odd >= m_minHitsPerChamber)) result.push_back(track);
-
-      else if ((m_station == 0  ||  m_station == -2)  &&
-	       (MEminus2_even >= m_minHitsPerChamber)  &&  (MEminus2_odd >= m_minHitsPerChamber)) result.push_back(track);
-
-      else if ((m_station == 0  ||  m_station == -1)  &&
-	       (MEminus1_even >= m_minHitsPerChamber)  &&  (MEminus1_odd >= m_minHitsPerChamber)) result.push_back(track);
-
-      else if ((m_station == 0  ||  m_station == 1)  &&
-	       (MEplus1_even >= m_minHitsPerChamber)  &&  (MEplus1_odd >= m_minHitsPerChamber)) result.push_back(track);
-
-      else if ((m_station == 0  ||  m_station == 2)  &&
-	       (MEplus2_even >= m_minHitsPerChamber)  &&  (MEplus2_odd >= m_minHitsPerChamber)) result.push_back(track);
-
-      else if ((m_station == 0  ||  m_station == 3)  &&
-	       (MEplus3_even >= m_minHitsPerChamber)  &&  (MEplus3_odd >= m_minHitsPerChamber)) result.push_back(track);
-
-      else if ((m_station == 0  ||  m_station == 4)  &&
-	       (MEplus4_even >= m_minHitsPerChamber)  &&  (MEplus4_odd >= m_minHitsPerChamber)) result.push_back(track);
-
-   } // end loop over tracks
-  
-   return result;
+AlignmentCSCOverlapSelector::Tracks AlignmentCSCOverlapSelector::select(const Tracks &tracks,
+                                                                        const edm::Event &iEvent) const {
+  Tracks result;
+
+  for (auto const &track : tracks) {
+    unsigned int MEminus4_even = 0;
+    unsigned int MEminus4_odd = 0;
+    unsigned int MEminus3_even = 0;
+    unsigned int MEminus3_odd = 0;
+    unsigned int MEminus2_even = 0;
+    unsigned int MEminus2_odd = 0;
+    unsigned int MEminus1_even = 0;
+    unsigned int MEminus1_odd = 0;
+
+    unsigned int MEplus1_even = 0;
+    unsigned int MEplus1_odd = 0;
+    unsigned int MEplus2_even = 0;
+    unsigned int MEplus2_odd = 0;
+    unsigned int MEplus3_even = 0;
+    unsigned int MEplus3_odd = 0;
+    unsigned int MEplus4_even = 0;
+    unsigned int MEplus4_odd = 0;
+
+    for (auto const &hit : track->recHits()) {
+      DetId id = hit->geographicalId();
+      if (id.det() == DetId::Muon && id.subdetId() == MuonSubdetId::CSC) {
+        CSCDetId cscid(id.rawId());
+        int station = (cscid.endcap() == 1 ? 1 : -1) * cscid.station();
+
+        if (station == -4) {
+          if (cscid.chamber() % 2 == 0)
+            MEminus4_even++;
+          else
+            MEminus4_odd++;
+        } else if (station == -3) {
+          if (cscid.chamber() % 2 == 0)
+            MEminus3_even++;
+          else
+            MEminus3_odd++;
+        } else if (station == -2) {
+          if (cscid.chamber() % 2 == 0)
+            MEminus2_even++;
+          else
+            MEminus2_odd++;
+        } else if (station == -1) {
+          if (cscid.chamber() % 2 == 0)
+            MEminus1_even++;
+          else
+            MEminus1_odd++;
+        }
+
+        else if (station == 1) {
+          if (cscid.chamber() % 2 == 0)
+            MEplus1_even++;
+          else
+            MEplus1_odd++;
+        } else if (station == 2) {
+          if (cscid.chamber() % 2 == 0)
+            MEplus2_even++;
+          else
+            MEplus2_odd++;
+        } else if (station == 3) {
+          if (cscid.chamber() % 2 == 0)
+            MEplus3_even++;
+          else
+            MEplus3_odd++;
+        } else if (station == 4) {
+          if (cscid.chamber() % 2 == 0)
+            MEplus4_even++;
+          else
+            MEplus4_odd++;
+        }
+
+      }  // end if it's a CSC hit
+    }    // end loop over hits
+
+    if ((m_station == 0 || m_station == -4) && (MEminus4_even >= m_minHitsPerChamber) &&
+        (MEminus4_odd >= m_minHitsPerChamber))
+      result.push_back(track);
+
+    else if ((m_station == 0 || m_station == -3) && (MEminus3_even >= m_minHitsPerChamber) &&
+             (MEminus3_odd >= m_minHitsPerChamber))
+      result.push_back(track);
+
+    else if ((m_station == 0 || m_station == -2) && (MEminus2_even >= m_minHitsPerChamber) &&
+             (MEminus2_odd >= m_minHitsPerChamber))
+      result.push_back(track);
+
+    else if ((m_station == 0 || m_station == -1) && (MEminus1_even >= m_minHitsPerChamber) &&
+             (MEminus1_odd >= m_minHitsPerChamber))
+      result.push_back(track);
+
+    else if ((m_station == 0 || m_station == 1) && (MEplus1_even >= m_minHitsPerChamber) &&
+             (MEplus1_odd >= m_minHitsPerChamber))
+      result.push_back(track);
+
+    else if ((m_station == 0 || m_station == 2) && (MEplus2_even >= m_minHitsPerChamber) &&
+             (MEplus2_odd >= m_minHitsPerChamber))
+      result.push_back(track);
+
+    else if ((m_station == 0 || m_station == 3) && (MEplus3_even >= m_minHitsPerChamber) &&
+             (MEplus3_odd >= m_minHitsPerChamber))
+      result.push_back(track);
+
+    else if ((m_station == 0 || m_station == 4) && (MEplus4_even >= m_minHitsPerChamber) &&
+             (MEplus4_odd >= m_minHitsPerChamber))
+      result.push_back(track);
+
+  }  // end loop over tracks
+
+  return result;
 }
diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentCSCTrackSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentCSCTrackSelector.cc
index 13eff7639ea92..545258e38ea53 100644
--- a/Alignment/CommonAlignmentProducer/src/AlignmentCSCTrackSelector.cc
+++ b/Alignment/CommonAlignmentProducer/src/AlignmentCSCTrackSelector.cc
@@ -10,65 +10,65 @@
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/MuonDetId/interface/CSCDetId.h"
 
-
 // constructor ----------------------------------------------------------------
 
-AlignmentCSCTrackSelector::AlignmentCSCTrackSelector(const edm::ParameterSet & cfg)
-   : m_src(cfg.getParameter<edm::InputTag>("src"))
-   , m_stationA(cfg.getParameter<int>("stationA"))
-   , m_stationB(cfg.getParameter<int>("stationB"))
-   , m_minHitsDT(cfg.getParameter<int>("minHitsDT"))
-   , m_minHitsPerStation(cfg.getParameter<int>("minHitsPerStation"))
-   , m_maxHitsPerStation(cfg.getParameter<int>("maxHitsPerStation"))
-{}
+AlignmentCSCTrackSelector::AlignmentCSCTrackSelector(const edm::ParameterSet& cfg)
+    : m_src(cfg.getParameter<edm::InputTag>("src")),
+      m_stationA(cfg.getParameter<int>("stationA")),
+      m_stationB(cfg.getParameter<int>("stationB")),
+      m_minHitsDT(cfg.getParameter<int>("minHitsDT")),
+      m_minHitsPerStation(cfg.getParameter<int>("minHitsPerStation")),
+      m_maxHitsPerStation(cfg.getParameter<int>("maxHitsPerStation")) {}
 
 // destructor -----------------------------------------------------------------
 
-AlignmentCSCTrackSelector::~AlignmentCSCTrackSelector()
-{}
-
+AlignmentCSCTrackSelector::~AlignmentCSCTrackSelector() {}
 
 // do selection ---------------------------------------------------------------
 
-AlignmentCSCTrackSelector::Tracks 
-AlignmentCSCTrackSelector::select(const Tracks& tracks, const edm::Event& evt) const 
-{
-   Tracks result;
-
-   for(auto const& track : tracks) {
-      int hitsOnStationA = 0;
-      int hitsOnStationB = 0;
-
-      for(auto const& hit : track->recHits()) {
-	 DetId id = hit->geographicalId();
-
-	 if (id.det() == DetId::Muon  &&  id.subdetId() == MuonSubdetId::DT) {
-	    if (m_stationA == 0) hitsOnStationA++;
-	    if (m_stationB == 0) hitsOnStationB++;
-	 }
-	 else if (id.det() == DetId::Muon  &&  id.subdetId() == MuonSubdetId::CSC) {
-	    CSCDetId cscid(id.rawId());
-	    int station = (cscid.endcap() == 1 ? 1 : -1) * cscid.station();
-
-	    if (station == m_stationA) hitsOnStationA++;
-	    if (station == m_stationB) hitsOnStationB++;
-
-	 } // end if CSC
-      } // end loop over hits
-
-      bool stationAokay;
-      if (m_stationA == 0) stationAokay = (m_minHitsDT <= hitsOnStationA);
-      else stationAokay = (m_minHitsPerStation <= hitsOnStationA  &&  hitsOnStationA <= m_maxHitsPerStation);
-
-      bool stationBokay;
-      if (m_stationB == 0) stationBokay = (m_minHitsDT <= hitsOnStationB);
-      else stationBokay = (m_minHitsPerStation <= hitsOnStationB  &&  hitsOnStationB <= m_maxHitsPerStation);
-
-      if (stationAokay  &&  stationBokay) {
-	 result.push_back(track);
-      }
-   } // end loop over tracks
-  
-   return result;
+AlignmentCSCTrackSelector::Tracks AlignmentCSCTrackSelector::select(const Tracks& tracks, const edm::Event& evt) const {
+  Tracks result;
+
+  for (auto const& track : tracks) {
+    int hitsOnStationA = 0;
+    int hitsOnStationB = 0;
+
+    for (auto const& hit : track->recHits()) {
+      DetId id = hit->geographicalId();
+
+      if (id.det() == DetId::Muon && id.subdetId() == MuonSubdetId::DT) {
+        if (m_stationA == 0)
+          hitsOnStationA++;
+        if (m_stationB == 0)
+          hitsOnStationB++;
+      } else if (id.det() == DetId::Muon && id.subdetId() == MuonSubdetId::CSC) {
+        CSCDetId cscid(id.rawId());
+        int station = (cscid.endcap() == 1 ? 1 : -1) * cscid.station();
+
+        if (station == m_stationA)
+          hitsOnStationA++;
+        if (station == m_stationB)
+          hitsOnStationB++;
+
+      }  // end if CSC
+    }    // end loop over hits
+
+    bool stationAokay;
+    if (m_stationA == 0)
+      stationAokay = (m_minHitsDT <= hitsOnStationA);
+    else
+      stationAokay = (m_minHitsPerStation <= hitsOnStationA && hitsOnStationA <= m_maxHitsPerStation);
+
+    bool stationBokay;
+    if (m_stationB == 0)
+      stationBokay = (m_minHitsDT <= hitsOnStationB);
+    else
+      stationBokay = (m_minHitsPerStation <= hitsOnStationB && hitsOnStationB <= m_maxHitsPerStation);
+
+    if (stationAokay && stationBokay) {
+      result.push_back(track);
+    }
+  }  // end loop over tracks
+
+  return result;
 }
-
diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentGlobalTrackSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentGlobalTrackSelector.cc
index 940a496625394..a6d82272e3465 100644
--- a/Alignment/CommonAlignmentProducer/src/AlignmentGlobalTrackSelector.cc
+++ b/Alignment/CommonAlignmentProducer/src/AlignmentGlobalTrackSelector.cc
@@ -12,7 +12,7 @@
 
 #include <DataFormats/MuonReco/interface/Muon.h>
 
-#include <DataFormats/RecoCandidate/interface/RecoCandidate.h> //for the get<TrackRef>() Call
+#include <DataFormats/RecoCandidate/interface/RecoCandidate.h>  //for the get<TrackRef>() Call
 
 #include <DataFormats/Math/interface/deltaR.h>
 
@@ -21,85 +21,76 @@
 
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentGlobalTrackSelector.h"
 
-
 using namespace std;
-using namespace edm;   
+using namespace edm;
 
 // constructor ----------------------------------------------------------------
-AlignmentGlobalTrackSelector::AlignmentGlobalTrackSelector(const edm::ParameterSet & cfg, edm::ConsumesCollector& iC) :
-  theGMFilterSwitch(cfg.getParameter<bool>("applyGlobalMuonFilter")),
-  theIsoFilterSwitch(cfg.getParameter<bool>("applyIsolationtest")),
-  theJetCountFilterSwitch(cfg.getParameter<bool>("applyJetCountFilter"))
-{
+AlignmentGlobalTrackSelector::AlignmentGlobalTrackSelector(const edm::ParameterSet& cfg, edm::ConsumesCollector& iC)
+    : theGMFilterSwitch(cfg.getParameter<bool>("applyGlobalMuonFilter")),
+      theIsoFilterSwitch(cfg.getParameter<bool>("applyIsolationtest")),
+      theJetCountFilterSwitch(cfg.getParameter<bool>("applyJetCountFilter")) {
   if (theGMFilterSwitch || theIsoFilterSwitch || theJetCountFilterSwitch)
     LogDebug("Alignment") << "> applying global Trackfilter ...";
 
   if (theGMFilterSwitch) {
     edm::InputTag theMuonSource = cfg.getParameter<InputTag>("muonSource");
     theMuonToken = iC.consumes<reco::MuonCollection>(theMuonSource);
-    theMaxTrackDeltaR =cfg.getParameter<double>("maxTrackDeltaR");
+    theMaxTrackDeltaR = cfg.getParameter<double>("maxTrackDeltaR");
     theMinGlobalMuonCount = cfg.getParameter<int>("minGlobalMuonCount");
-    LogDebug("Alignment") << ">  GlobalMuonFilter : source, maxTrackDeltaR, min. Count       : "
-			  << theMuonSource << " , "
-			  << theMaxTrackDeltaR << " , "
-			  << theMinIsolatedCount;
+    LogDebug("Alignment") << ">  GlobalMuonFilter : source, maxTrackDeltaR, min. Count       : " << theMuonSource
+                          << " , " << theMaxTrackDeltaR << " , " << theMinIsolatedCount;
   }
-  
+
   if (theIsoFilterSwitch) {
     edm::InputTag theJetIsoSource = cfg.getParameter<InputTag>("jetIsoSource");
     theJetIsoToken = iC.consumes<reco::CaloJetCollection>(theJetIsoSource);
     theMaxJetPt = cfg.getParameter<double>("maxJetPt");
     theMinJetDeltaR = cfg.getParameter<double>("minJetDeltaR");
     theMinIsolatedCount = cfg.getParameter<int>("minIsolatedCount");
-    LogDebug("Alignment") << ">  Isolationtest    : source, maxJetPt, minJetDeltaR, min. Count: "
-			  << theJetIsoSource << " , "
-			  << theMaxJetPt << " ,"
-			  << theMinJetDeltaR << " ,"
-			  << theMinGlobalMuonCount;
+    LogDebug("Alignment") << ">  Isolationtest    : source, maxJetPt, minJetDeltaR, min. Count: " << theJetIsoSource
+                          << " , " << theMaxJetPt << " ," << theMinJetDeltaR << " ," << theMinGlobalMuonCount;
   }
-  
+
   if (theJetCountFilterSwitch) {
     edm::InputTag theJetCountSource = cfg.getParameter<InputTag>("jetCountSource");
     theJetCountToken = iC.consumes<reco::CaloJetCollection>(theJetCountSource);
     theMinJetPt = cfg.getParameter<double>("minJetPt");
     theMaxJetCount = cfg.getParameter<int>("maxJetCount");
-    LogDebug("Alignment") << ">  JetCountFilter   : source, minJetPt, maxJetCount             : "
-			  << theJetCountSource << " , "
-			  << theMinJetPt << " ,"
-			  << theMaxJetCount;  
+    LogDebug("Alignment") << ">  JetCountFilter   : source, minJetPt, maxJetCount             : " << theJetCountSource
+                          << " , " << theMinJetPt << " ," << theMaxJetCount;
   }
 }
 
 // destructor -----------------------------------------------------------------
-AlignmentGlobalTrackSelector::~AlignmentGlobalTrackSelector()
-{}
+AlignmentGlobalTrackSelector::~AlignmentGlobalTrackSelector() {}
 
 ///returns if any of the Filters is used.
-bool AlignmentGlobalTrackSelector::useThisFilter()
-{
-  return theGMFilterSwitch || theIsoFilterSwitch|| theJetCountFilterSwitch;
+bool AlignmentGlobalTrackSelector::useThisFilter() {
+  return theGMFilterSwitch || theIsoFilterSwitch || theJetCountFilterSwitch;
 }
 
 // do selection ---------------------------------------------------------------
-AlignmentGlobalTrackSelector::Tracks 
-AlignmentGlobalTrackSelector::select(const Tracks& tracks, const edm::Event& iEvent, const edm::EventSetup& iSetup) 
-{
+AlignmentGlobalTrackSelector::Tracks AlignmentGlobalTrackSelector::select(const Tracks& tracks,
+                                                                          const edm::Event& iEvent,
+                                                                          const edm::EventSetup& iSetup) {
   Tracks result = tracks;
 
-  if (theGMFilterSwitch) result = findMuons(result, iEvent);
-  if (theIsoFilterSwitch) result = checkIsolation(result, iEvent);
-  if (theJetCountFilterSwitch) result = checkJetCount(result, iEvent);
+  if (theGMFilterSwitch)
+    result = findMuons(result, iEvent);
+  if (theIsoFilterSwitch)
+    result = checkIsolation(result, iEvent);
+  if (theJetCountFilterSwitch)
+    result = checkJetCount(result, iEvent);
   LogDebug("Alignment") << ">  Global: tracks all, kept: " << tracks.size() << ", " << result.size();
-//  LogDebug("Alignment")<<">  o kept:";
-//  printTracks(result);
-  
+  //  LogDebug("Alignment")<<">  o kept:";
+  //  printTracks(result);
+
   return result;
 }
 
 ///filter for Tracks that match the Track of a global Muon
-AlignmentGlobalTrackSelector::Tracks 
-AlignmentGlobalTrackSelector::findMuons(const Tracks& tracks, const edm::Event& iEvent) const
-{
+AlignmentGlobalTrackSelector::Tracks AlignmentGlobalTrackSelector::findMuons(const Tracks& tracks,
+                                                                             const edm::Event& iEvent) const {
   Tracks result;
   Tracks globalMuons;
 
@@ -108,78 +99,72 @@ AlignmentGlobalTrackSelector::findMuons(const Tracks& tracks, const edm::Event&
   iEvent.getByToken(theMuonToken, muons);
 
   if (muons.isValid()) {
-    for (reco::MuonCollection::const_iterator itMuon = muons->begin(); 
-	 itMuon != muons->end();
-	 ++itMuon) {
+    for (reco::MuonCollection::const_iterator itMuon = muons->begin(); itMuon != muons->end(); ++itMuon) {
       const reco::Track* muonTrack = (*itMuon).get<reco::TrackRef>().get();
       if (!muonTrack) {
-	LogDebug("Alignment") << "@SUB=AlignmentGlobalTrackSelector::findMuons"
-			      << "Found muon without track: Standalone Muon!";
+        LogDebug("Alignment") << "@SUB=AlignmentGlobalTrackSelector::findMuons"
+                              << "Found muon without track: Standalone Muon!";
       } else {
-	globalMuons.push_back(muonTrack);
+        globalMuons.push_back(muonTrack);
       }
     }
   } else {
     LogError("Alignment") << "@SUB=AlignmentGlobalTrackSelector::findMuons"
-			  <<">  could not optain mounCollection!";
+                          << ">  could not optain mounCollection!";
   }
 
   result = this->matchTracks(tracks, globalMuons);
-  
-  if (static_cast<int>(result.size()) < theMinGlobalMuonCount) result.clear();
+
+  if (static_cast<int>(result.size()) < theMinGlobalMuonCount)
+    result.clear();
 
   return result;
 }
 
 ///returns only isolated tracks in [cands]
-AlignmentGlobalTrackSelector::Tracks 
-AlignmentGlobalTrackSelector::checkIsolation(const Tracks& cands,const edm::Event& iEvent) const
-{
-  Tracks result; result.clear();
+AlignmentGlobalTrackSelector::Tracks AlignmentGlobalTrackSelector::checkIsolation(const Tracks& cands,
+                                                                                  const edm::Event& iEvent) const {
+  Tracks result;
+  result.clear();
 
   Handle<reco::CaloJetCollection> jets;
   iEvent.getByToken(theJetIsoToken, jets);
 
   if (jets.isValid()) {
-    for (Tracks::const_iterator it = cands.begin();
-	 it!=cands.end();
-	 ++it) {
+    for (Tracks::const_iterator it = cands.begin(); it != cands.end(); ++it) {
       bool isolated = true;
-      for (reco::CaloJetCollection::const_iterator itJet = jets->begin();
-	   itJet!=jets->end();
-	   ++itJet) 
-	isolated &= !((*itJet).pt() > theMaxJetPt && deltaR(*(*it),(*itJet)) < theMinJetDeltaR);
-      
+      for (reco::CaloJetCollection::const_iterator itJet = jets->begin(); itJet != jets->end(); ++itJet)
+        isolated &= !((*itJet).pt() > theMaxJetPt && deltaR(*(*it), (*itJet)) < theMinJetDeltaR);
+
       if (isolated)
-	result.push_back(*it);
+        result.push_back(*it);
     }
-    //    LogDebug("Alignment") << "D  Found "<<result.size()<<" isolated of "<< cands.size()<<" Tracks!";   
-    
+    //    LogDebug("Alignment") << "D  Found "<<result.size()<<" isolated of "<< cands.size()<<" Tracks!";
+
   } else
-    LogError("Alignment")<< "@SUB=AlignmentGlobalTrackSelector::checkIsolation"
-			 << "> could not optain jetCollection!";
+    LogError("Alignment") << "@SUB=AlignmentGlobalTrackSelector::checkIsolation"
+                          << "> could not optain jetCollection!";
 
-  if (static_cast<int>(result.size()) < theMinIsolatedCount) result.clear();
+  if (static_cast<int>(result.size()) < theMinIsolatedCount)
+    result.clear();
 
   return result;
 }
 
 ///returns [tracks] if there are less than theMaxCount Jets with theMinJetPt and an empty set if not
-AlignmentGlobalTrackSelector::Tracks 
-AlignmentGlobalTrackSelector::checkJetCount(const Tracks& tracks, const edm::Event& iEvent) const
-{
-  Tracks result; result.clear();
+AlignmentGlobalTrackSelector::Tracks AlignmentGlobalTrackSelector::checkJetCount(const Tracks& tracks,
+                                                                                 const edm::Event& iEvent) const {
+  Tracks result;
+  result.clear();
 
   Handle<reco::CaloJetCollection> jets;
   iEvent.getByToken(theJetCountToken, jets);
 
   if (jets.isValid()) {
     int jetCount = 0;
-    for (reco::CaloJetCollection::const_iterator itJet = jets->begin();
-	 itJet!=jets->end();
-	 ++itJet) {
+    for (reco::CaloJetCollection::const_iterator itJet = jets->begin(); itJet != jets->end(); ++itJet) {
       if ((*itJet).pt() > theMinJetPt)
-	jetCount++;
+        jetCount++;
     }
 
     if (jetCount <= theMaxJetCount)
@@ -188,7 +173,7 @@ AlignmentGlobalTrackSelector::checkJetCount(const Tracks& tracks, const edm::Eve
     LogDebug("Alignment") << "> found " << jetCount << " Jets";
   } else
     LogError("Alignment") << "@SUB=AlignmentGlobalTrackSelector::checkJetCount"
-			  << ">  could not optain jetCollection!";
+                          << ">  could not optain jetCollection!";
 
   return result;
 }
@@ -196,45 +181,34 @@ AlignmentGlobalTrackSelector::checkJetCount(const Tracks& tracks, const edm::Eve
 //===================HELPERS===================
 
 ///matches [src] with [comp] returns collection with matching Tracks coming from [src]
-AlignmentGlobalTrackSelector::Tracks
-AlignmentGlobalTrackSelector::matchTracks(const Tracks& src, const Tracks& comp) const
-{
+AlignmentGlobalTrackSelector::Tracks AlignmentGlobalTrackSelector::matchTracks(const Tracks& src,
+                                                                               const Tracks& comp) const {
   Tracks result;
-  for (Tracks::const_iterator itComp = comp.begin();
-       itComp!=comp.end();
-       ++itComp) {
+  for (Tracks::const_iterator itComp = comp.begin(); itComp != comp.end(); ++itComp) {
     int match = -1;
     double min = theMaxTrackDeltaR;
-    for (unsigned int i=0;i<src.size();i++) {
+    for (unsigned int i = 0; i < src.size(); i++) {
       // LogDebug("Alignment") << "> Trackmatch dist: "<<deltaR(src.at(i),*itComp);
-      if(min > deltaR(*(src.at(i)),*(*itComp))){
-	min = deltaR(*(src.at(i)),*(*itComp));
-	match = static_cast<int>(i);
+      if (min > deltaR(*(src.at(i)), *(*itComp))) {
+        min = deltaR(*(src.at(i)), *(*itComp));
+        match = static_cast<int>(i);
       }
     }
     if (match > -1)
-      result.push_back(src.at(match)); 
+      result.push_back(src.at(match));
   }
   return result;
 }
 
 ///print Information on Track-Collection
-void AlignmentGlobalTrackSelector::printTracks(const Tracks& col) const
-{
+void AlignmentGlobalTrackSelector::printTracks(const Tracks& col) const {
   int count = 0;
   LogDebug("Alignment") << ">......................................";
-  for (Tracks::const_iterator it = col.begin();
-       it < col.end();
-       ++it,++count) {
-    LogDebug("Alignment") 
-      << ">  Track No. " << count << ": p = (" 
-      << (*it)->px() << "," 
-      << (*it)->py() << ","
-      << (*it)->pz() << ")\n"
-      << ">                        pT = "
-      << (*it)->pt() << " eta = "
-      << (*it)->eta() << " charge = "
-      << (*it)->charge();    
+  for (Tracks::const_iterator it = col.begin(); it < col.end(); ++it, ++count) {
+    LogDebug("Alignment") << ">  Track No. " << count << ": p = (" << (*it)->px() << "," << (*it)->py() << ","
+                          << (*it)->pz() << ")\n"
+                          << ">                        pT = " << (*it)->pt() << " eta = " << (*it)->eta()
+                          << " charge = " << (*it)->charge();
   }
   LogDebug("Alignment") << ">......................................";
 }
diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentMuonSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentMuonSelector.cc
index 1b54459c5cd16..ee22664772e8b 100644
--- a/Alignment/CommonAlignmentProducer/src/AlignmentMuonSelector.cc
+++ b/Alignment/CommonAlignmentProducer/src/AlignmentMuonSelector.cc
@@ -1,147 +1,132 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentMuonSelector.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h" 
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "TLorentzVector.h"
 
 // constructor ----------------------------------------------------------------
 
-AlignmentMuonSelector::AlignmentMuonSelector(const edm::ParameterSet & cfg) :
-  applyBasicCuts( cfg.getParameter<bool>( "applyBasicCuts" ) ),
-  applyNHighestPt( cfg.getParameter<bool>( "applyNHighestPt" ) ),
-  applyMultiplicityFilter( cfg.getParameter<bool>( "applyMultiplicityFilter" ) ),
-  applyMassPairFilter( cfg.getParameter<bool>( "applyMassPairFilter" ) ),
-  nHighestPt( cfg.getParameter<int>( "nHighestPt" ) ),
-  minMultiplicity ( cfg.getParameter<int>( "minMultiplicity" ) ),
-  pMin( cfg.getParameter<double>( "pMin" ) ),
-  pMax( cfg.getParameter<double>( "pMax" ) ),
-  ptMin( cfg.getParameter<double>( "ptMin" ) ),
-  ptMax( cfg.getParameter<double>( "ptMax" ) ),
-  etaMin( cfg.getParameter<double>( "etaMin" ) ),
-  etaMax( cfg.getParameter<double>( "etaMax" ) ),
-  phiMin( cfg.getParameter<double>( "phiMin" ) ),
-  phiMax( cfg.getParameter<double>( "phiMax" ) ),
-  nHitMinSA( cfg.getParameter<double>( "nHitMinSA" ) ),
-  nHitMaxSA( cfg.getParameter<double>( "nHitMaxSA" ) ),
-  chi2nMaxSA( cfg.getParameter<double>( "chi2nMaxSA") ),
-  nHitMinGB( cfg.getParameter<double>( "nHitMinGB" ) ),
-  nHitMaxGB( cfg.getParameter<double>( "nHitMaxGB" ) ),
-  chi2nMaxGB( cfg.getParameter<double>( "chi2nMaxGB") ),
-  nHitMinTO( cfg.getParameter<double>( "nHitMinTO" ) ),
-  nHitMaxTO( cfg.getParameter<double>( "nHitMaxTO" ) ),
-  chi2nMaxTO( cfg.getParameter<double>( "chi2nMaxTO" ) ),
-  minMassPair( cfg.getParameter<double>( "minMassPair" ) ),
-  maxMassPair( cfg.getParameter<double>( "maxMassPair" ) )
-{
-
+AlignmentMuonSelector::AlignmentMuonSelector(const edm::ParameterSet& cfg)
+    : applyBasicCuts(cfg.getParameter<bool>("applyBasicCuts")),
+      applyNHighestPt(cfg.getParameter<bool>("applyNHighestPt")),
+      applyMultiplicityFilter(cfg.getParameter<bool>("applyMultiplicityFilter")),
+      applyMassPairFilter(cfg.getParameter<bool>("applyMassPairFilter")),
+      nHighestPt(cfg.getParameter<int>("nHighestPt")),
+      minMultiplicity(cfg.getParameter<int>("minMultiplicity")),
+      pMin(cfg.getParameter<double>("pMin")),
+      pMax(cfg.getParameter<double>("pMax")),
+      ptMin(cfg.getParameter<double>("ptMin")),
+      ptMax(cfg.getParameter<double>("ptMax")),
+      etaMin(cfg.getParameter<double>("etaMin")),
+      etaMax(cfg.getParameter<double>("etaMax")),
+      phiMin(cfg.getParameter<double>("phiMin")),
+      phiMax(cfg.getParameter<double>("phiMax")),
+      nHitMinSA(cfg.getParameter<double>("nHitMinSA")),
+      nHitMaxSA(cfg.getParameter<double>("nHitMaxSA")),
+      chi2nMaxSA(cfg.getParameter<double>("chi2nMaxSA")),
+      nHitMinGB(cfg.getParameter<double>("nHitMinGB")),
+      nHitMaxGB(cfg.getParameter<double>("nHitMaxGB")),
+      chi2nMaxGB(cfg.getParameter<double>("chi2nMaxGB")),
+      nHitMinTO(cfg.getParameter<double>("nHitMinTO")),
+      nHitMaxTO(cfg.getParameter<double>("nHitMaxTO")),
+      chi2nMaxTO(cfg.getParameter<double>("chi2nMaxTO")),
+      minMassPair(cfg.getParameter<double>("minMassPair")),
+      maxMassPair(cfg.getParameter<double>("maxMassPair")) {
   if (applyBasicCuts)
-	edm::LogInfo("AlignmentMuonSelector") 
-	  << "applying basic muon cuts ..."
-          << "\npmin,pmax:           " << pMin   << "," << pMax
-	  << "\nptmin,ptmax:         " << ptMin   << "," << ptMax 
-	  << "\netamin,etamax:       " << etaMin  << "," << etaMax
-	  << "\nphimin,phimax:       " << phiMin  << "," << phiMax
-	  << "\nnhitminSA,nhitmaxSA: " << nHitMinSA << "," << nHitMaxSA
-	  << "\nchi2nmaxSA:          " << chi2nMaxSA<< ","
-	  << "\nnhitminGB,nhitmaxGB: " << nHitMinGB << "," << nHitMaxGB
-	  << "\nchi2nmaxGB:          " << chi2nMaxGB<< ","
-	  << "\nnhitminTO,nhitmaxTO: " << nHitMinTO << "," << nHitMaxTO
-	  << "\nchi2nmaxTO:          " << chi2nMaxTO;
+    edm::LogInfo("AlignmentMuonSelector")
+        << "applying basic muon cuts ..."
+        << "\npmin,pmax:           " << pMin << "," << pMax << "\nptmin,ptmax:         " << ptMin << "," << ptMax
+        << "\netamin,etamax:       " << etaMin << "," << etaMax << "\nphimin,phimax:       " << phiMin << "," << phiMax
+        << "\nnhitminSA,nhitmaxSA: " << nHitMinSA << "," << nHitMaxSA << "\nchi2nmaxSA:          " << chi2nMaxSA << ","
+        << "\nnhitminGB,nhitmaxGB: " << nHitMinGB << "," << nHitMaxGB << "\nchi2nmaxGB:          " << chi2nMaxGB << ","
+        << "\nnhitminTO,nhitmaxTO: " << nHitMinTO << "," << nHitMaxTO << "\nchi2nmaxTO:          " << chi2nMaxTO;
 
   if (applyNHighestPt)
-	edm::LogInfo("AlignmentMuonSelector") 
-	  << "filter N muons with highest Pt N=" << nHighestPt;
+    edm::LogInfo("AlignmentMuonSelector") << "filter N muons with highest Pt N=" << nHighestPt;
 
   if (applyMultiplicityFilter)
-	edm::LogInfo("AlignmentMuonSelector") 
-	  << "apply multiplicity filter N>=" << minMultiplicity;
+    edm::LogInfo("AlignmentMuonSelector") << "apply multiplicity filter N>=" << minMultiplicity;
 
   if (applyMassPairFilter)
-	edm::LogInfo("AlignmentMuonSelector") 
-	  << "apply Mass Pair filter minMassPair=" << minMassPair << " maxMassPair=" << maxMassPair;
-
+    edm::LogInfo("AlignmentMuonSelector")
+        << "apply Mass Pair filter minMassPair=" << minMassPair << " maxMassPair=" << maxMassPair;
 }
 
 // destructor -----------------------------------------------------------------
 
-AlignmentMuonSelector::~AlignmentMuonSelector()
-{}
-
+AlignmentMuonSelector::~AlignmentMuonSelector() {}
 
 // do selection ---------------------------------------------------------------
 
-AlignmentMuonSelector::Muons 
-AlignmentMuonSelector::select(const Muons& muons, const edm::Event& evt) const 
-{
-  Muons result=muons;
+AlignmentMuonSelector::Muons AlignmentMuonSelector::select(const Muons& muons, const edm::Event& evt) const {
+  Muons result = muons;
 
   // apply basic muon cuts (if selected)
-  if (applyBasicCuts)  result= this->basicCuts(result);
+  if (applyBasicCuts)
+    result = this->basicCuts(result);
 
   // filter N muons with highest Pt (if selected)
-  if (applyNHighestPt) result= this->theNHighestPtMuons(result);
+  if (applyNHighestPt)
+    result = this->theNHighestPtMuons(result);
 
   // apply minimum multiplicity requirement (if selected)
   if (applyMultiplicityFilter) {
-    if (result.size()<(unsigned int)minMultiplicity) result.clear();
+    if (result.size() < (unsigned int)minMultiplicity)
+      result.clear();
   }
 
   // apply mass pair requirement (if selected)
   if (applyMassPairFilter) {
-    if (result.size()<2) result.clear();  // at least 2 muons are require for a mass pair...
-    else result = this->theBestMassPairCombinationMuons(result);
+    if (result.size() < 2)
+      result.clear();  // at least 2 muons are require for a mass pair...
+    else
+      result = this->theBestMassPairCombinationMuons(result);
   }
 
   edm::LogInfo("AlignmentMuonSelector") << "muons all,kept: " << muons.size() << "," << result.size();
 
   return result;
-
 }
 
 // make basic cuts ------------------------------------------------------------
 
-AlignmentMuonSelector::Muons 
-AlignmentMuonSelector::basicCuts(const Muons& muons) const 
-{
+AlignmentMuonSelector::Muons AlignmentMuonSelector::basicCuts(const Muons& muons) const {
   Muons result;
 
-  for(Muons::const_iterator it=muons.begin();
-      it!=muons.end();++it) {
-    const reco::Muon* muonp=*it;
-    float p=muonp->p();
-    float pt=muonp->pt();
-    float eta=muonp->eta();
-    float phi=muonp->phi();
-
-    int nhitSA=0;float chi2nSA=9999.;
-    if(muonp->isStandAloneMuon()){
-    nhitSA = muonp->standAloneMuon()->numberOfValidHits();// standAlone Muon
-    chi2nSA = muonp->standAloneMuon()->normalizedChi2();  // standAlone Muon
+  for (Muons::const_iterator it = muons.begin(); it != muons.end(); ++it) {
+    const reco::Muon* muonp = *it;
+    float p = muonp->p();
+    float pt = muonp->pt();
+    float eta = muonp->eta();
+    float phi = muonp->phi();
+
+    int nhitSA = 0;
+    float chi2nSA = 9999.;
+    if (muonp->isStandAloneMuon()) {
+      nhitSA = muonp->standAloneMuon()->numberOfValidHits();  // standAlone Muon
+      chi2nSA = muonp->standAloneMuon()->normalizedChi2();    // standAlone Muon
     }
-    int nhitGB=0;float chi2nGB=9999.;
-    if(muonp->isGlobalMuon()){
-    nhitGB = muonp->combinedMuon()->numberOfValidHits();// global Muon
-    chi2nGB = muonp->combinedMuon()->normalizedChi2();	// global Muon
+    int nhitGB = 0;
+    float chi2nGB = 9999.;
+    if (muonp->isGlobalMuon()) {
+      nhitGB = muonp->combinedMuon()->numberOfValidHits();  // global Muon
+      chi2nGB = muonp->combinedMuon()->normalizedChi2();    // global Muon
     }
-	int nhitTO=0;float chi2nTO=9999.;
-    if(muonp->isTrackerMuon()){
-    nhitTO = muonp->track()->numberOfValidHits(); 	// Tracker Only
-    chi2nTO = muonp->track()->normalizedChi2();		// Tracker Only
+    int nhitTO = 0;
+    float chi2nTO = 9999.;
+    if (muonp->isTrackerMuon()) {
+      nhitTO = muonp->track()->numberOfValidHits();  // Tracker Only
+      chi2nTO = muonp->track()->normalizedChi2();    // Tracker Only
     }
-    edm::LogInfo("AlignmentMuonSelector") << " pt,eta,phi,nhitSA,chi2nSA,nhitGB,chi2nGB,nhitTO,chi2nTO: "
-      <<pt<<","<<eta<<","<<phi<<","<<nhitSA<< ","<<chi2nSA<<","<<nhitGB<< ","<<chi2nGB<<","<<nhitTO<< ","<<chi2nTO;
-
-    if (p>pMin && p<pMax
-       && pt>ptMin && pt<ptMax 
-       && eta>etaMin && eta<etaMax 
-       && phi>phiMin && phi<phiMax 
-       && nhitSA>=nHitMinSA && nhitSA<=nHitMaxSA
-       && chi2nSA<chi2nMaxSA 
-       && nhitGB>=nHitMinGB && nhitGB<=nHitMaxGB
-       && chi2nGB<chi2nMaxGB 
-       && nhitTO>=nHitMinTO && nhitTO<=nHitMaxTO
-       && chi2nTO<chi2nMaxTO) {
+    edm::LogInfo("AlignmentMuonSelector")
+        << " pt,eta,phi,nhitSA,chi2nSA,nhitGB,chi2nGB,nhitTO,chi2nTO: " << pt << "," << eta << "," << phi << ","
+        << nhitSA << "," << chi2nSA << "," << nhitGB << "," << chi2nGB << "," << nhitTO << "," << chi2nTO;
+
+    if (p > pMin && p < pMax && pt > ptMin && pt < ptMax && eta > etaMin && eta < etaMax && phi > phiMin &&
+        phi < phiMax && nhitSA >= nHitMinSA && nhitSA <= nHitMaxSA && chi2nSA < chi2nMaxSA && nhitGB >= nHitMinGB &&
+        nhitGB <= nHitMaxGB && chi2nGB < chi2nMaxGB && nhitTO >= nHitMinTO && nhitTO <= nHitMaxTO &&
+        chi2nTO < chi2nMaxTO) {
       result.push_back(muonp);
     }
   }
@@ -151,20 +136,20 @@ AlignmentMuonSelector::basicCuts(const Muons& muons) const
 
 //-----------------------------------------------------------------------------
 
-AlignmentMuonSelector::Muons 
-AlignmentMuonSelector::theNHighestPtMuons(const Muons& muons) const
-{
-  Muons sortedMuons=muons;
+AlignmentMuonSelector::Muons AlignmentMuonSelector::theNHighestPtMuons(const Muons& muons) const {
+  Muons sortedMuons = muons;
   Muons result;
 
   // sort in pt
-  std::sort(sortedMuons.begin(),sortedMuons.end(),ptComparator);
+  std::sort(sortedMuons.begin(), sortedMuons.end(), ptComparator);
 
   // copy theMuonMult highest pt muons to result vector
-  int n=0;
-  for (Muons::const_iterator it=sortedMuons.begin();
-	   it!=sortedMuons.end(); ++it) {
-	if (n<nHighestPt) { result.push_back(*it); n++; }
+  int n = 0;
+  for (Muons::const_iterator it = sortedMuons.begin(); it != sortedMuons.end(); ++it) {
+    if (n < nHighestPt) {
+      result.push_back(*it);
+      n++;
+    }
   }
 
   return result;
@@ -172,39 +157,42 @@ AlignmentMuonSelector::theNHighestPtMuons(const Muons& muons) const
 
 //-----------------------------------------------------------------------------
 
-AlignmentMuonSelector::Muons 
-AlignmentMuonSelector::theBestMassPairCombinationMuons(const Muons& muons) const
-{
-  Muons sortedMuons=muons;
+AlignmentMuonSelector::Muons AlignmentMuonSelector::theBestMassPairCombinationMuons(const Muons& muons) const {
+  Muons sortedMuons = muons;
   Muons result;
-  TLorentzVector mu1,mu2,pair;
-  double mass=0, minDiff=999999.;
+  TLorentzVector mu1, mu2, pair;
+  double mass = 0, minDiff = 999999.;
 
   // sort in pt
-  std::sort(sortedMuons.begin(),sortedMuons.end(),ptComparator);
+  std::sort(sortedMuons.begin(), sortedMuons.end(), ptComparator);
 
   // copy best mass pair combination muons to result vector
-  // Criteria: 
+  // Criteria:
   // a) maxMassPair !=    minMassPair: the two highest pt muons with mass pair inside the given mass window
   // b) maxMassPair ==    minMassPair: the muon pair with massPair closest to given mass value
-   for (Muons::const_iterator it1=sortedMuons.begin();
-	   it1!=sortedMuons.end(); ++it1) {
-	   for (Muons::const_iterator it2=it1+1;
-	   it2!=sortedMuons.end(); ++it2) {
-	   mu1 = TLorentzVector((*it1)->momentum().x(),(*it1)->momentum().y(),(*it1)->momentum().z(),(*it1)->p());
-	   mu2 = TLorentzVector((*it2)->momentum().x(),(*it2)->momentum().y(),(*it2)->momentum().z(),(*it2)->p());
-	   pair=mu1+mu2;
-	   mass = pair.M();
-	   
-	if(	maxMassPair !=    minMassPair){
-	   if(mass<maxMassPair && mass>minMassPair) { result.push_back(*it1); result.push_back(*it2); break;}
-	}
-	else{
-	   if(fabs(mass-maxMassPair)< minDiff) { minDiff=fabs(mass-maxMassPair); result.clear(); result.push_back(*it1); result.push_back(*it2);}
-	}
-	}
+  for (Muons::const_iterator it1 = sortedMuons.begin(); it1 != sortedMuons.end(); ++it1) {
+    for (Muons::const_iterator it2 = it1 + 1; it2 != sortedMuons.end(); ++it2) {
+      mu1 = TLorentzVector((*it1)->momentum().x(), (*it1)->momentum().y(), (*it1)->momentum().z(), (*it1)->p());
+      mu2 = TLorentzVector((*it2)->momentum().x(), (*it2)->momentum().y(), (*it2)->momentum().z(), (*it2)->p());
+      pair = mu1 + mu2;
+      mass = pair.M();
+
+      if (maxMassPair != minMassPair) {
+        if (mass < maxMassPair && mass > minMassPair) {
+          result.push_back(*it1);
+          result.push_back(*it2);
+          break;
+        }
+      } else {
+        if (fabs(mass - maxMassPair) < minDiff) {
+          minDiff = fabs(mass - maxMassPair);
+          result.clear();
+          result.push_back(*it1);
+          result.push_back(*it2);
+        }
+      }
+    }
   }
 
   return result;
 }
-
diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc b/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc
index a5a790e48ab67..4a7791a3bfd6c 100644
--- a/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc
+++ b/Alignment/CommonAlignmentProducer/src/AlignmentProducerBase.cc
@@ -30,32 +30,29 @@
 #include "Geometry/Records/interface/MuonNumberingRecord.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
-
 //------------------------------------------------------------------------------
-AlignmentProducerBase::AlignmentProducerBase(const edm::ParameterSet& config) :
-  doTracker_{config.getUntrackedParameter<bool>("doTracker")},
-  doMuon_{config.getUntrackedParameter<bool>("doMuon")},
-  useExtras_{config.getUntrackedParameter<bool>("useExtras")},
-  tjTkAssociationMapTag_{config.getParameter<edm::InputTag>("tjTkAssociationMapTag")},
-  beamSpotTag_{config.getParameter<edm::InputTag>("beamSpotTag")},
-  tkLasBeamTag_{config.getParameter<edm::InputTag>("tkLasBeamTag")},
-  clusterValueMapTag_{config.getParameter<edm::InputTag>("hitPrescaleMapTag")},
-  uniqueRunRanges_
-  {align::makeUniqueRunRanges(config.getParameter<edm::VParameterSet>("RunRangeSelection"),
-                              cond::timeTypeSpecs[cond::runnumber].beginValue)},
-  config_{config},
-  stNFixAlignables_{config.getParameter<int>("nFixAlignables")},
-  stRandomShift_{config.getParameter<double>("randomShift")},
-  stRandomRotation_{config.getParameter<double>("randomRotation")},
-  applyDbAlignment_{config.getUntrackedParameter<bool>("applyDbAlignment")},
-  checkDbAlignmentValidity_{config.getUntrackedParameter<bool>("checkDbAlignmentValidity")},
-  doMisalignmentScenario_{config.getParameter<bool>("doMisalignmentScenario")},
-  saveToDB_{config.getParameter<bool>("saveToDB")},
-  saveApeToDB_{config.getParameter<bool>("saveApeToDB")},
-  saveDeformationsToDB_{config.getParameter<bool>("saveDeformationsToDB")},
-  useSurvey_{config.getParameter<bool>("useSurvey")},
-  enableAlignableUpdates_{config.getParameter<bool>("enableAlignableUpdates")}
-{
+AlignmentProducerBase::AlignmentProducerBase(const edm::ParameterSet& config)
+    : doTracker_{config.getUntrackedParameter<bool>("doTracker")},
+      doMuon_{config.getUntrackedParameter<bool>("doMuon")},
+      useExtras_{config.getUntrackedParameter<bool>("useExtras")},
+      tjTkAssociationMapTag_{config.getParameter<edm::InputTag>("tjTkAssociationMapTag")},
+      beamSpotTag_{config.getParameter<edm::InputTag>("beamSpotTag")},
+      tkLasBeamTag_{config.getParameter<edm::InputTag>("tkLasBeamTag")},
+      clusterValueMapTag_{config.getParameter<edm::InputTag>("hitPrescaleMapTag")},
+      uniqueRunRanges_{align::makeUniqueRunRanges(config.getParameter<edm::VParameterSet>("RunRangeSelection"),
+                                                  cond::timeTypeSpecs[cond::runnumber].beginValue)},
+      config_{config},
+      stNFixAlignables_{config.getParameter<int>("nFixAlignables")},
+      stRandomShift_{config.getParameter<double>("randomShift")},
+      stRandomRotation_{config.getParameter<double>("randomRotation")},
+      applyDbAlignment_{config.getUntrackedParameter<bool>("applyDbAlignment")},
+      checkDbAlignmentValidity_{config.getUntrackedParameter<bool>("checkDbAlignmentValidity")},
+      doMisalignmentScenario_{config.getParameter<bool>("doMisalignmentScenario")},
+      saveToDB_{config.getParameter<bool>("saveToDB")},
+      saveApeToDB_{config.getParameter<bool>("saveApeToDB")},
+      saveDeformationsToDB_{config.getParameter<bool>("saveDeformationsToDB")},
+      useSurvey_{config.getParameter<bool>("useSurvey")},
+      enableAlignableUpdates_{config.getParameter<bool>("enableAlignableUpdates")} {
   edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::AlignmentProducerBase";
 
   const auto& algoConfig = config_.getParameterSet("algoConfig");
@@ -63,11 +60,9 @@ AlignmentProducerBase::AlignmentProducerBase(const edm::ParameterSet& config) :
     // configured in main config?
     runAtPCL_ = config_.getParameter<bool>("runAtPCL");
 
-    if (hasParameter<bool>(algoConfig, "runAtPCL") &&
-        (runAtPCL_ != algoConfig.getParameter<bool>("runAtPCL"))) {
-      throw cms::Exception("BadConfig")
-        << "Inconsistent settings for 'runAtPCL' in configuration of the "
-        << "alignment producer and the alignment algorithm.";
+    if (hasParameter<bool>(algoConfig, "runAtPCL") && (runAtPCL_ != algoConfig.getParameter<bool>("runAtPCL"))) {
+      throw cms::Exception("BadConfig") << "Inconsistent settings for 'runAtPCL' in configuration of the "
+                                        << "alignment producer and the alignment algorithm.";
     }
 
   } else if (hasParameter<bool>(algoConfig, "runAtPCL")) {
@@ -84,12 +79,10 @@ AlignmentProducerBase::AlignmentProducerBase(const edm::ParameterSet& config) :
   createCalibrations();
 }
 
-
-
 //------------------------------------------------------------------------------
-AlignmentProducerBase::~AlignmentProducerBase() noexcept(false)
-{
-  for (auto& iCal: calibrations_) delete iCal;
+AlignmentProducerBase::~AlignmentProducerBase() noexcept(false) {
+  for (auto& iCal : calibrations_)
+    delete iCal;
 
   delete alignmentParameterStore_;
   delete alignableExtras_;
@@ -97,22 +90,18 @@ AlignmentProducerBase::~AlignmentProducerBase() noexcept(false)
   delete alignableMuon_;
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::startProcessing()
-{
-  if (isDuringLoop_) return;
+void AlignmentProducerBase::startProcessing() {
+  if (isDuringLoop_)
+    return;
 
-  edm::LogInfo("Alignment")
-    << "@SUB=AlignmentProducerBase::startProcessing"
-    << "Begin";
+  edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::startProcessing"
+                            << "Begin";
 
   if (!isAlgoInitialized_) {
-    throw cms::Exception("LogicError")
-      << "@SUB=AlignmentProducerBase::startProcessing\n"
-      << "Trying to start event processing before initializing the alignment "
-      << "algorithm.";
+    throw cms::Exception("LogicError") << "@SUB=AlignmentProducerBase::startProcessing\n"
+                                       << "Trying to start event processing before initializing the alignment "
+                                       << "algorithm.";
   }
 
   nevent_ = 0;
@@ -120,23 +109,22 @@ AlignmentProducerBase::startProcessing()
   alignmentAlgo_->startNewLoop();
 
   // FIXME: Should this be done in algorithm::startNewLoop()??
-  for (const auto& iCal: calibrations_) iCal->startNewLoop();
-  for (const auto& monitor: monitors_) monitor->startingNewLoop();
+  for (const auto& iCal : calibrations_)
+    iCal->startNewLoop();
+  for (const auto& monitor : monitors_)
+    monitor->startingNewLoop();
 
   applyAlignmentsToGeometry();
   isDuringLoop_ = true;
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::terminateProcessing(const edm::EventSetup* setup)
-{
-  if (!isDuringLoop_) return;
-
-  edm::LogInfo("Alignment")
-    << "@SUB=AlignmentProducerBase::terminateProcessing"
-    << "Terminating algorithm.";
+void AlignmentProducerBase::terminateProcessing(const edm::EventSetup* setup) {
+  if (!isDuringLoop_)
+    return;
+
+  edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::terminateProcessing"
+                            << "Terminating algorithm.";
   if (setup) {
     alignmentAlgo_->terminate(*setup);
   } else {
@@ -144,22 +132,19 @@ AlignmentProducerBase::terminateProcessing(const edm::EventSetup* setup)
   }
 
   // FIXME: Should this be done in algorithm::terminate()??
-  for (const auto& iCal:calibrations_) iCal->endOfLoop();
-  for (const auto& monitor: monitors_) monitor->endOfLoop();
+  for (const auto& iCal : calibrations_)
+    iCal->endOfLoop();
+  for (const auto& monitor : monitors_)
+    monitor->endOfLoop();
 
   isDuringLoop_ = false;
 }
 
-
 //------------------------------------------------------------------------------
-bool
-AlignmentProducerBase::processEvent(const edm::Event& event,
-                                    const edm::EventSetup& setup)
-{
+bool AlignmentProducerBase::processEvent(const edm::Event& event, const edm::EventSetup& setup) {
   if (setupChanged(setup)) {
-    edm::LogInfo("Alignment")
-      << "@SUB=AlignmentProducerBase::processEvent"
-      << "EventSetup-Record changed.";
+    edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::processEvent"
+                              << "EventSetup-Record changed.";
 
     // updatable alignables are currently not used at PCL, but event setup
     // changes require a complete re-initialization
@@ -170,16 +155,15 @@ AlignmentProducerBase::processEvent(const edm::Event& event,
     }
   }
 
-  initBeamSpot(event); // must happen every event and before incrementing 'nevent_'
+  initBeamSpot(event);  // must happen every event and before incrementing 'nevent_'
 
   ++nevent_;  // must happen before the check below;
               // otherwise subsequent checks fail for "EmptySource"
 
   if (!alignmentAlgo_->processesEvents()) {
-    edm::LogInfo("Alignment")
-      << "@SUB=AlignmentProducerBase::processEvent"
-      << "Skipping event. The current configuration of the alignment algorithm "
-      << "does not need to process any events.";
+    edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::processEvent"
+                              << "Skipping event. The current configuration of the alignment algorithm "
+                              << "does not need to process any events.";
     return false;
   }
 
@@ -187,11 +171,10 @@ AlignmentProducerBase::processEvent(const edm::Event& event,
   readInSurveyRcds(setup);
 
   // Printout event number
-  for ( int i=10; i<10000000; i*=10 ) {
-    if ( nevent_<10*i && (nevent_%i)==0 ) {
-      edm::LogInfo("Alignment")
-        << "@SUB=AlignmentProducerBase::processEvent"
-        << "Events processed: " << nevent_;
+  for (int i = 10; i < 10000000; i *= 10) {
+    if (nevent_ < 10 * i && (nevent_ % i) == 0) {
+      edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::processEvent"
+                                << "Events processed: " << nevent_;
     }
   }
 
@@ -200,12 +183,9 @@ AlignmentProducerBase::processEvent(const edm::Event& event,
   edm::Handle<TrajTrackAssociationCollection> handleTrajTracksCollection;
 
   if (getTrajTrackAssociationCollection(event, handleTrajTracksCollection)) {
-
     // Form pairs of trajectories and tracks
     ConstTrajTrackPairs trajTracks;
-    for (auto iter  = handleTrajTracksCollection->begin();
-              iter != handleTrajTracksCollection->end();
-            ++iter) {
+    for (auto iter = handleTrajTracksCollection->begin(); iter != handleTrajTracksCollection->end(); ++iter) {
       trajTracks.push_back(ConstTrajTrackPair(&(*(*iter).key), &(*(*iter).val)));
     }
 
@@ -217,36 +197,26 @@ AlignmentProducerBase::processEvent(const edm::Event& event,
       clusterValueMapPtr = &(*clusterValueMap);
     }
 
-
-    const AlignmentAlgorithmBase::EventInfo eventInfo{event.id(),
-                                                      trajTracks,
-                                                      *beamSpot_,
-                                                      clusterValueMapPtr};
+    const AlignmentAlgorithmBase::EventInfo eventInfo{event.id(), trajTracks, *beamSpot_, clusterValueMapPtr};
     alignmentAlgo_->run(setup, eventInfo);
 
-
-    for (const auto& monitor: monitors_) {
-      monitor->duringLoop(event, setup, trajTracks); // forward eventInfo?
+    for (const auto& monitor : monitors_) {
+      monitor->duringLoop(event, setup, trajTracks);  // forward eventInfo?
     }
   } else {
-    edm::LogError("Alignment")
-      << "@SUB=AlignmentProducerBase::processEvent"
-      << "No track collection found: skipping event";
+    edm::LogError("Alignment") << "@SUB=AlignmentProducerBase::processEvent"
+                               << "No track collection found: skipping event";
   }
 
   return true;
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::beginRunImpl(const edm::Run& run, const edm::EventSetup& setup)
-{
+void AlignmentProducerBase::beginRunImpl(const edm::Run& run, const edm::EventSetup& setup) {
   const bool changed{setupChanged(setup)};
   if (changed) {
-    edm::LogInfo("Alignment")
-      << "@SUB=AlignmentProducerBase::beginRunImpl"
-      << "EventSetup-Record changed.";
+    edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::beginRunImpl"
+                              << "EventSetup-Record changed.";
 
     // updatable alignables are currently not used at PCL, but event setup
     // changes require a complete re-initialization
@@ -257,10 +227,10 @@ AlignmentProducerBase::beginRunImpl(const edm::Run& run, const edm::EventSetup&
     }
   }
 
-  alignmentAlgo_->beginRun(run, setup,
-                           changed && (runAtPCL_ || enableAlignableUpdates_));
+  alignmentAlgo_->beginRun(run, setup, changed && (runAtPCL_ || enableAlignableUpdates_));
 
-  for (const auto& iCal:calibrations_) iCal->beginRun(run, setup);
+  for (const auto& iCal : calibrations_)
+    iCal->beginRun(run, setup);
 
   //store the first run analyzed to be used for setting the IOV (for PCL)
   if (firstRun_ > static_cast<cond::Time_t>(run.id().run())) {
@@ -268,11 +238,8 @@ AlignmentProducerBase::beginRunImpl(const edm::Run& run, const edm::EventSetup&
   }
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::endRunImpl(const edm::Run& run, const edm::EventSetup& setup)
-{
+void AlignmentProducerBase::endRunImpl(const edm::Run& run, const edm::EventSetup& setup) {
   if (!tkLasBeamTag_.encode().empty()) {
     edm::Handle<TkFittedLasBeamCollection> lasBeams;
     edm::Handle<TsosVectorCollection> tsoses;
@@ -281,71 +248,47 @@ AlignmentProducerBase::endRunImpl(const edm::Run& run, const edm::EventSetup& se
 
     alignmentAlgo_->endRun(EndRunInfo(run.id(), &(*lasBeams), &(*tsoses)), setup);
   } else {
-    edm::LogInfo("Alignment")
-      << "@SUB=AlignmentProducerBase::endRunImpl"
-      << "No Tk LAS beams to forward to algorithm.";
+    edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::endRunImpl"
+                              << "No Tk LAS beams to forward to algorithm.";
     alignmentAlgo_->endRun(EndRunInfo(run.id(), nullptr, nullptr), setup);
   }
-
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::beginLuminosityBlockImpl(const edm::LuminosityBlock&,
-                                                const edm::EventSetup& setup)
-{
+void AlignmentProducerBase::beginLuminosityBlockImpl(const edm::LuminosityBlock&, const edm::EventSetup& setup) {
   // Do not forward edm::LuminosityBlock
   alignmentAlgo_->beginLuminosityBlock(setup);
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::endLuminosityBlockImpl(const edm::LuminosityBlock&,
-                                              const edm::EventSetup& setup)
-{
+void AlignmentProducerBase::endLuminosityBlockImpl(const edm::LuminosityBlock&, const edm::EventSetup& setup) {
   // Do not forward edm::LuminosityBlock
   alignmentAlgo_->endLuminosityBlock(setup);
 }
 
-
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::createAlignmentAlgorithm()
-{
+void AlignmentProducerBase::createAlignmentAlgorithm() {
   auto algoConfig = config_.getParameter<edm::ParameterSet>("algoConfig");
-  algoConfig.addUntrackedParameter("RunRangeSelection",
-                                   config_.getParameter<edm::VParameterSet>("RunRangeSelection"));
-  algoConfig.addUntrackedParameter<align::RunNumber>("firstIOV",
-                                                     runAtPCL_ ?
-                                                     1 :
-                                                     uniqueRunRanges_.front().first);
-  algoConfig.addUntrackedParameter("enableAlignableUpdates",
-                                   enableAlignableUpdates_);
+  algoConfig.addUntrackedParameter("RunRangeSelection", config_.getParameter<edm::VParameterSet>("RunRangeSelection"));
+  algoConfig.addUntrackedParameter<align::RunNumber>("firstIOV", runAtPCL_ ? 1 : uniqueRunRanges_.front().first);
+  algoConfig.addUntrackedParameter("enableAlignableUpdates", enableAlignableUpdates_);
 
   const auto& algoName = algoConfig.getParameter<std::string>("algoName");
-  alignmentAlgo_ = std::unique_ptr<AlignmentAlgorithmBase>
-    {AlignmentAlgorithmPluginFactory::get()->create(algoName, algoConfig)};
+  alignmentAlgo_ =
+      std::unique_ptr<AlignmentAlgorithmBase>{AlignmentAlgorithmPluginFactory::get()->create(algoName, algoConfig)};
 
   if (!alignmentAlgo_) {
-    throw cms::Exception("BadConfig")
-      << "Couldn't find the called alignment algorithm: " << algoName;
+    throw cms::Exception("BadConfig") << "Couldn't find the called alignment algorithm: " << algoName;
   }
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::createMonitors()
-{
+void AlignmentProducerBase::createMonitors() {
   const auto& monitorConfig = config_.getParameter<edm::ParameterSet>("monitorConfig");
   auto monitors = monitorConfig.getUntrackedParameter<std::vector<std::string> >("monitors");
-  for (const auto& miter: monitors) {
-    std::unique_ptr<AlignmentMonitorBase> newMonitor
-      {AlignmentMonitorPluginFactory::get()
-       ->create(miter, monitorConfig.getUntrackedParameterSet(miter))};
+  for (const auto& miter : monitors) {
+    std::unique_ptr<AlignmentMonitorBase> newMonitor{
+        AlignmentMonitorPluginFactory::get()->create(miter, monitorConfig.getUntrackedParameterSet(miter))};
 
     if (!newMonitor) {
       throw cms::Exception("BadConfig") << "Couldn't find monitor named " << miter;
@@ -354,24 +297,17 @@ AlignmentProducerBase::createMonitors()
   }
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::createCalibrations()
-{
+void AlignmentProducerBase::createCalibrations() {
   const auto& calibrations = config_.getParameter<edm::VParameterSet>("calibrations");
-  for (const auto& iCalib: calibrations) {
-    calibrations_.push_back(IntegratedCalibrationPluginFactory::get()
-                            ->create(iCalib.getParameter<std::string>("calibrationName"),
-                                     iCalib));
+  for (const auto& iCalib : calibrations) {
+    calibrations_.push_back(
+        IntegratedCalibrationPluginFactory::get()->create(iCalib.getParameter<std::string>("calibrationName"), iCalib));
   }
 }
 
-
 //------------------------------------------------------------------------------
-bool
-AlignmentProducerBase::setupChanged(const edm::EventSetup& setup)
-{
+bool AlignmentProducerBase::setupChanged(const edm::EventSetup& setup) {
   bool changed{false};
 
   if (watchIdealGeometryRcd_.check(setup)) {
@@ -422,15 +358,10 @@ AlignmentProducerBase::setupChanged(const edm::EventSetup& setup)
   return changed;
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::initAlignmentAlgorithm(const edm::EventSetup& setup,
-                                              bool update)
-{
-  edm::LogInfo("Alignment")
-    << "@SUB=AlignmentProducerBase::initAlignmentAlgorithm"
-    << "Begin";
+void AlignmentProducerBase::initAlignmentAlgorithm(const edm::EventSetup& setup, bool update) {
+  edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::initAlignmentAlgorithm"
+                            << "Begin";
 
   auto isTrueUpdate = update && isAlgoInitialized_;
 
@@ -449,14 +380,9 @@ AlignmentProducerBase::initAlignmentAlgorithm(const edm::EventSetup& setup,
 
   // Initialize alignment algorithm and integrated calibration and pass the
   // latter to algorithm
-  edm::LogInfo("Alignment")
-    << "@SUB=AlignmentProducerBase::initAlignmentAlgorithm"
-    << "Initializing alignment algorithm.";
-  alignmentAlgo_->initialize(setup,
-                             alignableTracker_,
-                             alignableMuon_,
-                             alignableExtras_,
-                             alignmentParameterStore_);
+  edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::initAlignmentAlgorithm"
+                            << "Initializing alignment algorithm.";
+  alignmentAlgo_->initialize(setup, alignableTracker_, alignableMuon_, alignableExtras_, alignmentParameterStore_);
 
   // Not all algorithms support calibrations - so do not pass empty vector
   // and throw if non-empty and not supported:
@@ -464,10 +390,9 @@ AlignmentProducerBase::initAlignmentAlgorithm(const edm::EventSetup& setup,
     if (alignmentAlgo_->supportsCalibrations()) {
       alignmentAlgo_->addCalibrations(calibrations_);
     } else {
-      throw cms::Exception("BadConfig")
-        << "@SUB=AlignmentProducerBase::createCalibrations\n"
-        << "Configured " << calibrations_.size() << " calibration(s) "
-        << "for algorithm not supporting it.";
+      throw cms::Exception("BadConfig") << "@SUB=AlignmentProducerBase::createCalibrations\n"
+                                        << "Configured " << calibrations_.size() << " calibration(s) "
+                                        << "for algorithm not supporting it.";
     }
   }
 
@@ -475,48 +400,36 @@ AlignmentProducerBase::initAlignmentAlgorithm(const edm::EventSetup& setup,
 
   applyAlignmentsToGeometry();
 
-  if (!isTrueUpdate) {                // only needed the first time
-    for (const auto& iCal: calibrations_) {
+  if (!isTrueUpdate) {  // only needed the first time
+    for (const auto& iCal : calibrations_) {
       iCal->beginOfJob(alignableTracker_, alignableMuon_, alignableExtras_);
     }
-    for (const auto& monitor: monitors_) {
-     monitor->beginOfJob(alignableTracker_, alignableMuon_, alignmentParameterStore_);
+    for (const auto& monitor : monitors_) {
+      monitor->beginOfJob(alignableTracker_, alignableMuon_, alignmentParameterStore_);
     }
   }
-  startProcessing();            // needed if derived class is non-EDLooper-based
-                                // has no effect, if called during loop
+  startProcessing();  // needed if derived class is non-EDLooper-based
+                      // has no effect, if called during loop
 
-  edm::LogInfo("Alignment")
-    << "@SUB=AlignmentProducerBase::initAlignmentAlgorithm"
-    << "End";
+  edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::initAlignmentAlgorithm"
+                            << "End";
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::initBeamSpot(const edm::Event& event)
-{
+void AlignmentProducerBase::initBeamSpot(const edm::Event& event) {
   getBeamSpot(event, beamSpot_);
 
-  if (nevent_== 0 && alignableExtras_) {
-    edm::LogInfo("Alignment")
-      << "@SUB=AlignmentProducerBase::initBeamSpot"
-      << "Initializing AlignableBeamSpot";
+  if (nevent_ == 0 && alignableExtras_) {
+    edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::initBeamSpot"
+                              << "Initializing AlignableBeamSpot";
 
-    alignableExtras_->initializeBeamSpot(beamSpot_->x0(),
-                                         beamSpot_->y0(),
-                                         beamSpot_->z0(),
-                                         beamSpot_->dxdz(),
-                                         beamSpot_->dydz());
+    alignableExtras_->initializeBeamSpot(
+        beamSpot_->x0(), beamSpot_->y0(), beamSpot_->z0(), beamSpot_->dxdz(), beamSpot_->dydz());
   }
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::createGeometries(const edm::EventSetup& iSetup,
-                                        const TrackerTopology* tTopo)
-{
+void AlignmentProducerBase::createGeometries(const edm::EventSetup& iSetup, const TrackerTopology* tTopo) {
   if (doTracker_) {
     edm::ESHandle<GeometricDet> geometricDet;
     iSetup.get<IdealGeometryRecord>().get(geometricDet);
@@ -526,8 +439,7 @@ AlignmentProducerBase::createGeometries(const edm::EventSetup& iSetup,
 
     TrackerGeomBuilderFromGeometricDet trackerBuilder;
 
-    trackerGeometry_ = std::shared_ptr<TrackerGeometry>
-      (trackerBuilder.build(&(*geometricDet), *ptp, tTopo));
+    trackerGeometry_ = std::shared_ptr<TrackerGeometry>(trackerBuilder.build(&(*geometricDet), *ptp, tTopo));
   }
 
   if (doMuon_) {
@@ -540,15 +452,12 @@ AlignmentProducerBase::createGeometries(const edm::EventSetup& iSetup,
     muonDTGeometry_ = std::make_shared<DTGeometry>();
     DTGeometryBuilder.build(*muonDTGeometry_, &(*cpv), *mdc);
     muonCSCGeometry_ = std::make_shared<CSCGeometry>();
-    CSCGeometryBuilder.build(*muonCSCGeometry_, &(*cpv), *mdc );
+    CSCGeometryBuilder.build(*muonCSCGeometry_, &(*cpv), *mdc);
   }
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::applyAlignmentsToDB(const edm::EventSetup& setup)
-{
+void AlignmentProducerBase::applyAlignmentsToDB(const edm::EventSetup& setup) {
   // Retrieve and apply alignments, if requested (requires z setup)
   if (applyDbAlignment_) {
     // we need GlobalPositionRcd - and have to keep track for later removal
@@ -559,40 +468,24 @@ AlignmentProducerBase::applyAlignmentsToDB(const edm::EventSetup& setup)
     globalPositions_ = std::make_unique<Alignments>(*globalAlignments);
 
     if (doTracker_) {
-      applyDB<TrackerGeometry,
-              TrackerAlignmentRcd,
-              TrackerAlignmentErrorExtendedRcd>
-        (trackerGeometry_.get(), setup,
-         align::DetectorGlobalPosition(*globalPositions_, DetId(DetId::Tracker))
-         );
-
-      applyDB<TrackerGeometry,
-              TrackerSurfaceDeformationRcd>(trackerGeometry_.get(), setup);
+      applyDB<TrackerGeometry, TrackerAlignmentRcd, TrackerAlignmentErrorExtendedRcd>(
+          trackerGeometry_.get(), setup, align::DetectorGlobalPosition(*globalPositions_, DetId(DetId::Tracker)));
+
+      applyDB<TrackerGeometry, TrackerSurfaceDeformationRcd>(trackerGeometry_.get(), setup);
     }
 
     if (doMuon_) {
-      applyDB<DTGeometry,
-              DTAlignmentRcd,
-              DTAlignmentErrorExtendedRcd>
-        (muonDTGeometry_.get(), setup,
-         align::DetectorGlobalPosition(*globalPositions_, DetId(DetId::Muon))
-         );
-
-      applyDB<CSCGeometry,
-              CSCAlignmentRcd,
-              CSCAlignmentErrorExtendedRcd>
-        (muonCSCGeometry_.get(), setup,
-         align::DetectorGlobalPosition(*globalPositions_, DetId(DetId::Muon))
-         );
+      applyDB<DTGeometry, DTAlignmentRcd, DTAlignmentErrorExtendedRcd>(
+          muonDTGeometry_.get(), setup, align::DetectorGlobalPosition(*globalPositions_, DetId(DetId::Muon)));
+
+      applyDB<CSCGeometry, CSCAlignmentRcd, CSCAlignmentErrorExtendedRcd>(
+          muonCSCGeometry_.get(), setup, align::DetectorGlobalPosition(*globalPositions_, DetId(DetId::Muon)));
     }
   }
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::createAlignables(const TrackerTopology* tTopo, bool update)
-{
+void AlignmentProducerBase::createAlignables(const TrackerTopology* tTopo, bool update) {
   if (doTracker_) {
     if (update) {
       alignableTracker_->update(trackerGeometry_.get(), tTopo);
@@ -618,25 +511,17 @@ AlignmentProducerBase::createAlignables(const TrackerTopology* tTopo, bool updat
   }
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::buildParameterStore()
-{
+void AlignmentProducerBase::buildParameterStore() {
   // Create alignment parameter builder
-  edm::LogInfo("Alignment")
-    << "@SUB=AlignmentProducerBase::buildParameterStore"
-    << "Creating AlignmentParameterBuilder";
+  edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::buildParameterStore"
+                            << "Creating AlignmentParameterBuilder";
 
-  const auto& alParamBuildCfg =
-    config_.getParameter<edm::ParameterSet>("ParameterBuilder");
-  const auto& alParamStoreCfg =
-    config_.getParameter<edm::ParameterSet>("ParameterStore");
+  const auto& alParamBuildCfg = config_.getParameter<edm::ParameterSet>("ParameterBuilder");
+  const auto& alParamStoreCfg = config_.getParameter<edm::ParameterSet>("ParameterStore");
 
-  AlignmentParameterBuilder alignmentParameterBuilder{alignableTracker_,
-                                                      alignableMuon_,
-                                                      alignableExtras_,
-                                                      alParamBuildCfg};
+  AlignmentParameterBuilder alignmentParameterBuilder{
+      alignableTracker_, alignableMuon_, alignableExtras_, alParamBuildCfg};
 
   // Fix alignables if requested
   if (stNFixAlignables_ > 0) {
@@ -645,32 +530,24 @@ AlignmentProducerBase::buildParameterStore()
 
   // Get list of alignables
   const auto& alignables = alignmentParameterBuilder.alignables();
-  edm::LogInfo("Alignment")
-    << "@SUB=AlignmentProducerBase::buildParameterStore"
-    << "got " << alignables.size() << " alignables";
+  edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::buildParameterStore"
+                            << "got " << alignables.size() << " alignables";
 
   // Create AlignmentParameterStore
-  alignmentParameterStore_ =
-    new AlignmentParameterStore(alignables, alParamStoreCfg);
-  edm::LogInfo("Alignment")
-    << "@SUB=AlignmentProducerBase::buildParameterStore"
-    << "AlignmentParameterStore created!";
+  alignmentParameterStore_ = new AlignmentParameterStore(alignables, alParamStoreCfg);
+  edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::buildParameterStore"
+                            << "AlignmentParameterStore created!";
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::applyMisalignment()
-{
+void AlignmentProducerBase::applyMisalignment() {
   // Apply misalignment scenario to alignable tracker and muon if requested
   // WARNING: this assumes scenarioConfig can be passed to both muon and tracker
 
   if (doMisalignmentScenario_ && (doTracker_ || doMuon_)) {
-    edm::LogInfo("Alignment")
-      << "@SUB=AlignmentProducerBase::applyMisalignment"
-      << "Applying misalignment scenario to "
-      << (doTracker_ ? "tracker" : "")
-      << (doMuon_    ? (doTracker_ ? " and muon" : "muon") : ".");
+    edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::applyMisalignment"
+                              << "Applying misalignment scenario to " << (doTracker_ ? "tracker" : "")
+                              << (doMuon_ ? (doTracker_ ? " and muon" : "muon") : ".");
 
     const auto& scenarioConfig = config_.getParameterSet("MisalignmentScenario");
 
@@ -684,155 +561,137 @@ AlignmentProducerBase::applyMisalignment()
     }
 
   } else {
-    edm::LogInfo("Alignment")
-      << "@SUB=AlignmentProducerBase::applyMisalignment"
-      << "NOT applying misalignment scenario!";
+    edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::applyMisalignment"
+                              << "NOT applying misalignment scenario!";
   }
 
   // Apply simple misalignment
-  const auto& sParSel =
-    config_.getParameter<std::string>("parameterSelectorSimple");
-  simpleMisalignment(alignmentParameterStore_->alignables(), sParSel,
-                     stRandomShift_, stRandomRotation_, true);
+  const auto& sParSel = config_.getParameter<std::string>("parameterSelectorSimple");
+  simpleMisalignment(alignmentParameterStore_->alignables(), sParSel, stRandomShift_, stRandomRotation_, true);
 }
 
-
 // ----------------------------------------------------------------------------
-void
-AlignmentProducerBase::simpleMisalignment(const align::Alignables &alivec,
-                                          const std::string &selection,
-                                          float shift, float rot, bool local)
-{
-
-  std::ostringstream output; // collecting output
+void AlignmentProducerBase::simpleMisalignment(
+    const align::Alignables& alivec, const std::string& selection, float shift, float rot, bool local) {
+  std::ostringstream output;  // collecting output
 
   if (shift > 0. || rot > 0.) {
-    output << "Adding random flat shift of max size " << shift
-           << " and adding random flat rotation of max size " << rot <<" to ";
+    output << "Adding random flat shift of max size " << shift << " and adding random flat rotation of max size " << rot
+           << " to ";
 
     std::vector<bool> commSel(0);
     if (selection != "-1") {
-      AlignmentParameterSelector aSelector(nullptr,nullptr); // no alignable needed here...
+      AlignmentParameterSelector aSelector(nullptr, nullptr);  // no alignable needed here...
       const std::vector<char> cSel(aSelector.convertParamSel(selection));
       if (cSel.size() < RigidBodyAlignmentParameters::N_PARAM) {
         throw cms::Exception("BadConfig")
-          << "[AlignmentProducerBase::simpleMisalignment_]\n"
-          << "Expect selection string '" << selection << "' to be at least of length "
-          << RigidBodyAlignmentParameters::N_PARAM << " or to be '-1'.\n"
-          << "(Most probably you have to adjust the parameter 'parameterSelectorSimple'.)";
+            << "[AlignmentProducerBase::simpleMisalignment_]\n"
+            << "Expect selection string '" << selection << "' to be at least of length "
+            << RigidBodyAlignmentParameters::N_PARAM << " or to be '-1'.\n"
+            << "(Most probably you have to adjust the parameter 'parameterSelectorSimple'.)";
       }
-      for (const auto& cIter: cSel) {
+      for (const auto& cIter : cSel) {
         commSel.push_back(cIter == '0' ? false : true);
       }
-      output << "parameters defined by (" << selection
-             << "), representing (x,y,z,alpha,beta,gamma),";
+      output << "parameters defined by (" << selection << "), representing (x,y,z,alpha,beta,gamma),";
     } else {
       output << "the active parameters of each alignable,";
     }
     output << " in " << (local ? "local" : "global") << " frame.";
 
-    for (const auto& ali: alivec) {
+    for (const auto& ali : alivec) {
       std::vector<bool> mysel(commSel.empty() ? ali->alignmentParameters()->selector() : commSel);
 
-      if (std::abs(shift)>0.00001) {
+      if (std::abs(shift) > 0.00001) {
         double s0 = 0., s1 = 0., s2 = 0.;
-        if (mysel[RigidBodyAlignmentParameters::dx]) s0 = shift * double(random()%1000-500)/500.;
-        if (mysel[RigidBodyAlignmentParameters::dy]) s1 = shift * double(random()%1000-500)/500.;
-        if (mysel[RigidBodyAlignmentParameters::dz]) s2 = shift * double(random()%1000-500)/500.;
-
-        if (local) ali->move(ali->surface().toGlobal(align::LocalVector(s0,s1,s2)));
-        else       ali->move(align::GlobalVector(s0,s1,s2));
+        if (mysel[RigidBodyAlignmentParameters::dx])
+          s0 = shift * double(random() % 1000 - 500) / 500.;
+        if (mysel[RigidBodyAlignmentParameters::dy])
+          s1 = shift * double(random() % 1000 - 500) / 500.;
+        if (mysel[RigidBodyAlignmentParameters::dz])
+          s2 = shift * double(random() % 1000 - 500) / 500.;
+
+        if (local)
+          ali->move(ali->surface().toGlobal(align::LocalVector(s0, s1, s2)));
+        else
+          ali->move(align::GlobalVector(s0, s1, s2));
 
         //AlignmentPositionError ape(dx,dy,dz);
         //ali->addAlignmentPositionError(ape);
       }
 
-      if (std::abs(rot)>0.00001) {
+      if (std::abs(rot) > 0.00001) {
         align::EulerAngles r(3);
-        if (mysel[RigidBodyAlignmentParameters::dalpha]) r(1)=rot*double(random()%1000-500)/500.;
-        if (mysel[RigidBodyAlignmentParameters::dbeta])  r(2)=rot*double(random()%1000-500)/500.;
-        if (mysel[RigidBodyAlignmentParameters::dgamma]) r(3)=rot*double(random()%1000-500)/500.;
+        if (mysel[RigidBodyAlignmentParameters::dalpha])
+          r(1) = rot * double(random() % 1000 - 500) / 500.;
+        if (mysel[RigidBodyAlignmentParameters::dbeta])
+          r(2) = rot * double(random() % 1000 - 500) / 500.;
+        if (mysel[RigidBodyAlignmentParameters::dgamma])
+          r(3) = rot * double(random() % 1000 - 500) / 500.;
 
         const align::RotationType mrot = align::toMatrix(r);
-        if (local) ali->rotateInLocalFrame(mrot);
-        else       ali->rotateInGlobalFrame(mrot);
+        if (local)
+          ali->rotateInLocalFrame(mrot);
+        else
+          ali->rotateInGlobalFrame(mrot);
 
         //ali->addAlignmentPositionErrorFromRotation(mrot);
       }
-    } // end loop on alignables
+    }  // end loop on alignables
   } else {
     output << "No simple misalignment added!";
   }
-  edm::LogInfo("Alignment")
-    << "@SUB=AlignmentProducerBase::simpleMisalignment" << output.str();
+  edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::simpleMisalignment" << output.str();
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::applyAlignmentsToGeometry()
-{
-  edm::LogInfo("Alignment")
-    << "@SUB=AlignmentProducerBase::applyAlignmentsToGeometry"
-    << "Now physically apply alignments to  geometry...";
+void AlignmentProducerBase::applyAlignmentsToGeometry() {
+  edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::applyAlignmentsToGeometry"
+                            << "Now physically apply alignments to  geometry...";
 
   // Propagate changes to reconstruction geometry (from initialisation or iteration)
   GeometryAligner aligner;
 
   if (doTracker_) {
     if (!alignableTracker_) {
-      throw cms::Exception("LogicError")
-        << "@SUB=AlignmentProducerBase::applyAlignmentsToGeometry\n"
-        << "Trying to apply tracker alignment before creating it.";
+      throw cms::Exception("LogicError") << "@SUB=AlignmentProducerBase::applyAlignmentsToGeometry\n"
+                                         << "Trying to apply tracker alignment before creating it.";
     }
 
     std::unique_ptr<Alignments> alignments{alignableTracker_->alignments()};
-    std::unique_ptr<AlignmentErrorsExtended>
-      alignmentErrExt{alignableTracker_->alignmentErrors()};
-    std::unique_ptr<AlignmentSurfaceDeformations>
-      aliDeforms{alignableTracker_->surfaceDeformations()};
+    std::unique_ptr<AlignmentErrorsExtended> alignmentErrExt{alignableTracker_->alignmentErrors()};
+    std::unique_ptr<AlignmentSurfaceDeformations> aliDeforms{alignableTracker_->surfaceDeformations()};
 
-    aligner.applyAlignments(trackerGeometry_.get(), alignments.get(),
-                            alignmentErrExt.get(), AlignTransform());
+    aligner.applyAlignments(trackerGeometry_.get(), alignments.get(), alignmentErrExt.get(), AlignTransform());
     aligner.attachSurfaceDeformations(trackerGeometry_.get(), aliDeforms.get());
   }
 
   if (doMuon_) {
     if (!alignableMuon_) {
-      throw cms::Exception("LogicError")
-        << "@SUB=AlignmentProducerBase::applyAlignmentsToGeometry\n"
-        << "Trying to apply muon alignment before creating it.";
+      throw cms::Exception("LogicError") << "@SUB=AlignmentProducerBase::applyAlignmentsToGeometry\n"
+                                         << "Trying to apply muon alignment before creating it.";
     }
 
     std::unique_ptr<Alignments> dtAlignments{alignableMuon_->dtAlignments()};
     std::unique_ptr<Alignments> cscAlignments{alignableMuon_->cscAlignments()};
 
-    std::unique_ptr<AlignmentErrorsExtended>
-      dtAlignmentErrExt{alignableMuon_->dtAlignmentErrorsExtended()};
-    std::unique_ptr<AlignmentErrorsExtended>
-      cscAlignmentErrExt{alignableMuon_->cscAlignmentErrorsExtended()};
+    std::unique_ptr<AlignmentErrorsExtended> dtAlignmentErrExt{alignableMuon_->dtAlignmentErrorsExtended()};
+    std::unique_ptr<AlignmentErrorsExtended> cscAlignmentErrExt{alignableMuon_->cscAlignmentErrorsExtended()};
 
-    aligner.applyAlignments(muonDTGeometry_.get(), dtAlignments.get(),
-                            dtAlignmentErrExt.get(), AlignTransform());
-    aligner.applyAlignments(muonCSCGeometry_.get(), cscAlignments.get(),
-                            cscAlignmentErrExt.get(), AlignTransform());
+    aligner.applyAlignments(muonDTGeometry_.get(), dtAlignments.get(), dtAlignmentErrExt.get(), AlignTransform());
+    aligner.applyAlignments(muonCSCGeometry_.get(), cscAlignments.get(), cscAlignmentErrExt.get(), AlignTransform());
   }
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::readInSurveyRcds(const edm::EventSetup& iSetup)
-{
-
+void AlignmentProducerBase::readInSurveyRcds(const edm::EventSetup& iSetup) {
   // Get Survey Rcds and add Survey Info
-  if ( doTracker_ && useSurvey_ ){
+  if (doTracker_ && useSurvey_) {
     bool tkSurveyBool = watchTkSurveyRcd_.check(iSetup);
     bool tkSurveyErrBool = watchTkSurveyErrExtRcd_.check(iSetup);
     edm::LogInfo("Alignment") << "watcher tksurveyrcd: " << tkSurveyBool;
     edm::LogInfo("Alignment") << "watcher tksurveyerrrcd: " << tkSurveyErrBool;
-    if ( tkSurveyBool || tkSurveyErrBool){
-
+    if (tkSurveyBool || tkSurveyErrBool) {
       edm::LogInfo("Alignment") << "ADDING THE SURVEY INFORMATION";
       edm::ESHandle<Alignments> surveys;
       edm::ESHandle<SurveyErrors> surveyErrors;
@@ -840,20 +699,20 @@ AlignmentProducerBase::readInSurveyRcds(const edm::EventSetup& iSetup)
       iSetup.get<TrackerSurveyRcd>().get(surveys);
       iSetup.get<TrackerSurveyErrorExtendedRcd>().get(surveyErrors);
 
-      surveyIndex_  = 0;
+      surveyIndex_ = 0;
       surveyValues_ = &*surveys;
       surveyErrors_ = &*surveyErrors;
       addSurveyInfo(alignableTracker_);
     }
   }
 
-  if ( doMuon_ && useSurvey_) {
+  if (doMuon_ && useSurvey_) {
     bool DTSurveyBool = watchTkSurveyRcd_.check(iSetup);
     bool DTSurveyErrBool = watchTkSurveyErrExtRcd_.check(iSetup);
     bool CSCSurveyBool = watchTkSurveyRcd_.check(iSetup);
     bool CSCSurveyErrBool = watchTkSurveyErrExtRcd_.check(iSetup);
 
-    if ( DTSurveyBool || DTSurveyErrBool || CSCSurveyBool || CSCSurveyErrBool ){
+    if (DTSurveyBool || DTSurveyErrBool || CSCSurveyBool || CSCSurveyErrBool) {
       edm::ESHandle<Alignments> dtSurveys;
       edm::ESHandle<SurveyErrors> dtSurveyErrors;
       edm::ESHandle<Alignments> cscSurveys;
@@ -864,48 +723,42 @@ AlignmentProducerBase::readInSurveyRcds(const edm::EventSetup& iSetup)
       iSetup.get<CSCSurveyRcd>().get(cscSurveys);
       iSetup.get<CSCSurveyErrorExtendedRcd>().get(cscSurveyErrors);
 
-      surveyIndex_  = 0;
+      surveyIndex_ = 0;
       surveyValues_ = &*dtSurveys;
       surveyErrors_ = &*dtSurveyErrors;
       const auto& barrels = alignableMuon_->DTBarrel();
-      for (const auto& barrel: barrels) addSurveyInfo(barrel);
+      for (const auto& barrel : barrels)
+        addSurveyInfo(barrel);
 
-      surveyIndex_  = 0;
+      surveyIndex_ = 0;
       surveyValues_ = &*cscSurveys;
       surveyErrors_ = &*cscSurveyErrors;
       const auto& endcaps = alignableMuon_->CSCEndcaps();
-      for (const auto& endcap: endcaps) addSurveyInfo(endcap);
-
+      for (const auto& endcap : endcaps)
+        addSurveyInfo(endcap);
     }
   }
-
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::addSurveyInfo(Alignable* ali)
-{
+void AlignmentProducerBase::addSurveyInfo(Alignable* ali) {
   const auto& comps = ali->components();
 
-  for (const auto& comp: comps) addSurveyInfo(comp);
+  for (const auto& comp : comps)
+    addSurveyInfo(comp);
 
   const SurveyError& error = surveyErrors_->m_surveyErrors[surveyIndex_];
 
-  if ( ali->id() != error.rawId() ||
-       ali->alignableObjectId() != error.structureType() )
-    {
-      throw cms::Exception("DatabaseError")
-        << "Error reading survey info from DB. Mismatched id!";
-    }
+  if (ali->id() != error.rawId() || ali->alignableObjectId() != error.structureType()) {
+    throw cms::Exception("DatabaseError") << "Error reading survey info from DB. Mismatched id!";
+  }
 
   const auto& pos = surveyValues_->m_align[surveyIndex_].translation();
   const auto& rot = surveyValues_->m_align[surveyIndex_].rotation();
 
-  AlignableSurface surf(align::PositionType(pos.x(), pos.y(), pos.z()),
-                        align::RotationType(rot.xx(), rot.xy(), rot.xz(),
-                                            rot.yx(), rot.yy(), rot.yz(),
-                                            rot.zx(), rot.zy(), rot.zz()));
+  AlignableSurface surf(
+      align::PositionType(pos.x(), pos.y(), pos.z()),
+      align::RotationType(rot.xx(), rot.xy(), rot.xz(), rot.yx(), rot.yy(), rot.yz(), rot.zx(), rot.zy(), rot.zz()));
 
   surf.setWidth(ali->surface().width());
   surf.setLength(ali->surface().length());
@@ -915,51 +768,42 @@ AlignmentProducerBase::addSurveyInfo(Alignable* ali)
   ++surveyIndex_;
 }
 
-
 //------------------------------------------------------------------------------
-bool
-AlignmentProducerBase::finish()
-{
-
-  for (const auto& monitor: monitors_) monitor->endOfJob();
+bool AlignmentProducerBase::finish() {
+  for (const auto& monitor : monitors_)
+    monitor->endOfJob();
 
   if (alignmentAlgo_->processesEvents() && nevent_ == 0) {
     return false;
   }
 
   if (saveToDB_ || saveApeToDB_ || saveDeformationsToDB_) {
-    if (alignmentAlgo_->storeAlignments()) storeAlignmentsToDB();
+    if (alignmentAlgo_->storeAlignments())
+      storeAlignmentsToDB();
   } else {
-    edm::LogInfo("Alignment")
-      << "@SUB=AlignmentProducerBase::finish"
-      << "No payload to be stored!";
+    edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::finish"
+                              << "No payload to be stored!";
   }
 
   // takes care of storing output of calibrations, but needs to be called only
   // after 'storeAlignmentsToDB()'
-  for (const auto& iCal:calibrations_) iCal->endOfJob();
+  for (const auto& iCal : calibrations_)
+    iCal->endOfJob();
 
   return true;
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::storeAlignmentsToDB()
-{
-  const auto runRangeSelectionVPSet =
-    config_.getParameterSetVector("RunRangeSelection");
+void AlignmentProducerBase::storeAlignmentsToDB() {
+  const auto runRangeSelectionVPSet = config_.getParameterSetVector("RunRangeSelection");
 
   // handle PCL use case
   const auto& uniqueRunRanges =
-    (runAtPCL_ ?
-     align::makeUniqueRunRanges(runRangeSelectionVPSet, firstRun_) :
-     uniqueRunRanges_);
+      (runAtPCL_ ? align::makeUniqueRunRanges(runRangeSelectionVPSet, firstRun_) : uniqueRunRanges_);
 
   std::vector<AlgebraicVector> beamSpotParameters;
 
-  for (const auto& iRunRange: uniqueRunRanges) {
-
+  for (const auto& iRunRange : uniqueRunRanges) {
     alignmentAlgo_->setParametersForRunRange(iRunRange);
 
     // Save alignments to database
@@ -971,13 +815,11 @@ AlignmentProducerBase::storeAlignmentsToDB()
     if (alignableExtras_) {
       auto& alis = alignableExtras_->beamSpot();
       if (!alis.empty()) {
-        auto beamSpotAliPars =
-          dynamic_cast<BeamSpotAlignmentParameters*>(alis[0]->alignmentParameters());
+        auto beamSpotAliPars = dynamic_cast<BeamSpotAlignmentParameters*>(alis[0]->alignmentParameters());
         if (!beamSpotAliPars) {
-          throw cms::Exception("LogicError")
-            << "@SUB=AlignmentProducerBase::storeAlignmentsToDB\n"
-            << "First alignable of alignableExtras_ does not have "
-            << "'BeamSpotAlignmentParameters', while it should have.";
+          throw cms::Exception("LogicError") << "@SUB=AlignmentProducerBase::storeAlignmentsToDB\n"
+                                             << "First alignable of alignableExtras_ does not have "
+                                             << "'BeamSpotAlignmentParameters', while it should have.";
         }
 
         beamSpotParameters.push_back(beamSpotAliPars->parameters());
@@ -989,37 +831,30 @@ AlignmentProducerBase::storeAlignmentsToDB()
     std::ostringstream bsOutput;
 
     auto itPar = beamSpotParameters.cbegin();
-    for (auto iRunRange = uniqueRunRanges.cbegin();
-         iRunRange != uniqueRunRanges.cend();
-         ++iRunRange, ++itPar) {
+    for (auto iRunRange = uniqueRunRanges.cbegin(); iRunRange != uniqueRunRanges.cend(); ++iRunRange, ++itPar) {
       bsOutput << "Run range: " << (*iRunRange).first << " - " << (*iRunRange).second << "\n";
       bsOutput << "  Displacement: x=" << (*itPar)[0] << ", y=" << (*itPar)[1] << "\n";
       bsOutput << "  Slope: dx/dz=" << (*itPar)[2] << ", dy/dz=" << (*itPar)[3] << "\n";
     }
 
-    edm::LogInfo("Alignment")
-      << "@SUB=AlignmentProducerBase::storeAlignmentsToDB"
-      << "Parameters for alignable beamspot:\n" << bsOutput.str();
+    edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::storeAlignmentsToDB"
+                              << "Parameters for alignable beamspot:\n"
+                              << bsOutput.str();
   }
 }
 
-
 //------------------------------------------------------------------------------
-void
-AlignmentProducerBase::writeForRunRange(cond::Time_t time)
-{
-  if (doTracker_) { // first tracker
-    const AlignTransform* trackerGlobal{nullptr}; // will be 'removed' from constants
-    if (globalPositions_) { // i.e. applied before in applyDB
-      trackerGlobal = &align::DetectorGlobalPosition(*globalPositions_,
-                                                     DetId(DetId::Tracker));
+void AlignmentProducerBase::writeForRunRange(cond::Time_t time) {
+  if (doTracker_) {                                // first tracker
+    const AlignTransform* trackerGlobal{nullptr};  // will be 'removed' from constants
+    if (globalPositions_) {                        // i.e. applied before in applyDB
+      trackerGlobal = &align::DetectorGlobalPosition(*globalPositions_, DetId(DetId::Tracker));
     }
 
     auto alignments = alignableTracker_->alignments();
     auto alignmentErrors = alignableTracker_->alignmentErrors();
-    this->writeDB(alignments, "TrackerAlignmentRcd",
-                  alignmentErrors, "TrackerAlignmentErrorExtendedRcd", trackerGlobal,
-                  time);
+    this->writeDB(
+        alignments, "TrackerAlignmentRcd", alignmentErrors, "TrackerAlignmentErrorExtendedRcd", trackerGlobal, time);
 
     // Save surface deformations to database
     if (saveDeformationsToDB_) {
@@ -1028,115 +863,96 @@ AlignmentProducerBase::writeForRunRange(cond::Time_t time)
     }
   }
 
-  if (doMuon_) { // now muon
-    const AlignTransform* muonGlobal{nullptr}; // will be 'removed' from constants
-    if (globalPositions_) { // i.e. applied before in applyDB
-      muonGlobal = &align::DetectorGlobalPosition(*globalPositions_,
-                                                  DetId(DetId::Muon));
+  if (doMuon_) {                                // now muon
+    const AlignTransform* muonGlobal{nullptr};  // will be 'removed' from constants
+    if (globalPositions_) {                     // i.e. applied before in applyDB
+      muonGlobal = &align::DetectorGlobalPosition(*globalPositions_, DetId(DetId::Muon));
     }
     // Get alignments+errors, first DT - ownership taken over by writeDB(..), so no delete
     auto alignments = alignableMuon_->dtAlignments();
     auto alignmentErrors = alignableMuon_->dtAlignmentErrorsExtended();
-    this->writeDB(alignments, "DTAlignmentRcd",
-                  alignmentErrors, "DTAlignmentErrorExtendedRcd", muonGlobal,
-                  time);
+    this->writeDB(alignments, "DTAlignmentRcd", alignmentErrors, "DTAlignmentErrorExtendedRcd", muonGlobal, time);
 
     // Get alignments+errors, now CSC - ownership taken over by writeDB(..), so no delete
     alignments = alignableMuon_->cscAlignments();
     alignmentErrors = alignableMuon_->cscAlignmentErrorsExtended();
-    this->writeDB(alignments, "CSCAlignmentRcd",
-                  alignmentErrors, "CSCAlignmentErrorExtendedRcd", muonGlobal,
-                  time);
+    this->writeDB(alignments, "CSCAlignmentRcd", alignmentErrors, "CSCAlignmentErrorExtendedRcd", muonGlobal, time);
   }
 }
 
-
 //------------------------------------------------------------------------------
 void AlignmentProducerBase::writeDB(Alignments* alignments,
                                     const std::string& alignRcd,
                                     AlignmentErrorsExtended* alignmentErrors,
                                     const std::string& errRcd,
                                     const AlignTransform* globalCoordinates,
-                                    cond::Time_t time) const
-{
+                                    cond::Time_t time) const {
   Alignments* tempAlignments = alignments;
   AlignmentErrorsExtended* tempAlignmentErrorsExtended = alignmentErrors;
 
   // Call service
   edm::Service<cond::service::PoolDBOutputService> poolDb;
-  if (!poolDb.isAvailable()) { // Die if not available
-    delete tempAlignments;      // promised to take over ownership...
-    delete tempAlignmentErrorsExtended; // dito
+  if (!poolDb.isAvailable()) {           // Die if not available
+    delete tempAlignments;               // promised to take over ownership...
+    delete tempAlignmentErrorsExtended;  // dito
     throw cms::Exception("NotAvailable") << "PoolDBOutputService not available";
   }
 
   if (globalCoordinates  // happens only if (applyDbAlignment_ == true)
       && globalCoordinates->transform() != AlignTransform::Transform::Identity) {
-
-    tempAlignments = new Alignments();            // temporary storage for
+    tempAlignments = new Alignments();                            // temporary storage for
     tempAlignmentErrorsExtended = new AlignmentErrorsExtended();  // final alignments and errors
 
     GeometryAligner aligner;
-    aligner.removeGlobalTransform(alignments, alignmentErrors,
-                                  *globalCoordinates,
-                                  tempAlignments, tempAlignmentErrorsExtended);
+    aligner.removeGlobalTransform(
+        alignments, alignmentErrors, *globalCoordinates, tempAlignments, tempAlignmentErrorsExtended);
 
     delete alignments;       // have to delete original alignments
     delete alignmentErrors;  // same thing for the errors
 
-    edm::LogInfo("Alignment")
-      << "@SUB=AlignmentProducerBase::writeDB"
-      << "globalCoordinates removed from alignments (" << alignRcd
-      << ") and errors (" << alignRcd << ").";
+    edm::LogInfo("Alignment") << "@SUB=AlignmentProducerBase::writeDB"
+                              << "globalCoordinates removed from alignments (" << alignRcd << ") and errors ("
+                              << alignRcd << ").";
   }
 
   if (saveToDB_) {
-    edm::LogInfo("Alignment") << "Writing Alignments for run " << time
-                              << " to " << alignRcd << ".";
+    edm::LogInfo("Alignment") << "Writing Alignments for run " << time << " to " << alignRcd << ".";
     poolDb->writeOne<Alignments>(tempAlignments, time, alignRcd);
-  } else { // poolDb->writeOne(..) takes over 'alignments' ownership,...
-    delete tempAlignments; // ...otherwise we have to delete, as promised!
+  } else {                  // poolDb->writeOne(..) takes over 'alignments' ownership,...
+    delete tempAlignments;  // ...otherwise we have to delete, as promised!
   }
 
   if (saveApeToDB_) {
-    edm::LogInfo("Alignment") << "Writing AlignmentErrorsExtended for run " << time
-                              << " to " << errRcd << ".";
+    edm::LogInfo("Alignment") << "Writing AlignmentErrorsExtended for run " << time << " to " << errRcd << ".";
     poolDb->writeOne<AlignmentErrorsExtended>(tempAlignmentErrorsExtended, time, errRcd);
-  } else { // poolDb->writeOne(..) takes over 'alignmentErrors' ownership,...
-    delete tempAlignmentErrorsExtended; // ...otherwise we have to delete, as promised!
+  } else {                               // poolDb->writeOne(..) takes over 'alignmentErrors' ownership,...
+    delete tempAlignmentErrorsExtended;  // ...otherwise we have to delete, as promised!
   }
 }
 
-
 //------------------------------------------------------------------------------
 void AlignmentProducerBase::writeDB(AlignmentSurfaceDeformations* alignmentSurfaceDeformations,
                                     const std::string& surfaceDeformationRcd,
-                                    cond::Time_t time) const
-{
+                                    cond::Time_t time) const {
   // Call service
   edm::Service<cond::service::PoolDBOutputService> poolDb;
-  if (!poolDb.isAvailable()) { // Die if not available
-    delete alignmentSurfaceDeformations; // promised to take over ownership...
+  if (!poolDb.isAvailable()) {            // Die if not available
+    delete alignmentSurfaceDeformations;  // promised to take over ownership...
     throw cms::Exception("NotAvailable") << "PoolDBOutputService not available";
   }
 
   if (saveDeformationsToDB_) {
-    edm::LogInfo("Alignment") << "Writing AlignmentSurfaceDeformations for run " << time
-                              << " to " << surfaceDeformationRcd  << ".";
-    poolDb->writeOne<AlignmentSurfaceDeformations>(alignmentSurfaceDeformations, time,
-                                                   surfaceDeformationRcd);
-  } else { // poolDb->writeOne(..) takes over 'surfaceDeformation' ownership,...
-    delete alignmentSurfaceDeformations; // ...otherwise we have to delete, as promised!
+    edm::LogInfo("Alignment") << "Writing AlignmentSurfaceDeformations for run " << time << " to "
+                              << surfaceDeformationRcd << ".";
+    poolDb->writeOne<AlignmentSurfaceDeformations>(alignmentSurfaceDeformations, time, surfaceDeformationRcd);
+  } else {                                // poolDb->writeOne(..) takes over 'surfaceDeformation' ownership,...
+    delete alignmentSurfaceDeformations;  // ...otherwise we have to delete, as promised!
   }
 }
 
-
 //------------------------------------------------------------------------------
-template<typename T>
-bool
-AlignmentProducerBase::hasParameter(const edm::ParameterSet& config,
-                                    const std::string& name)
-{
+template <typename T>
+bool AlignmentProducerBase::hasParameter(const edm::ParameterSet& config, const std::string& name) {
   try {
     config.getParameter<T>(name);
   } catch (const edm::Exception& e) {
diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentSeedSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentSeedSelector.cc
index fcc5da55ad966..56879b6d543fa 100644
--- a/Alignment/CommonAlignmentProducer/src/AlignmentSeedSelector.cc
+++ b/Alignment/CommonAlignmentProducer/src/AlignmentSeedSelector.cc
@@ -4,38 +4,30 @@
 
 // constructor ----------------------------------------------------------------
 
-AlignmentSeedSelector::AlignmentSeedSelector(const edm::ParameterSet & cfg) :
-  applySeedNumber( cfg.getParameter<bool>( "applySeedNumber" ) ),
-  minNSeeds ( cfg.getParameter<int>( "minNSeeds" ) ),
-  maxNSeeds ( cfg.getParameter<int>( "maxNSeeds" ) )
-{
-
+AlignmentSeedSelector::AlignmentSeedSelector(const edm::ParameterSet& cfg)
+    : applySeedNumber(cfg.getParameter<bool>("applySeedNumber")),
+      minNSeeds(cfg.getParameter<int>("minNSeeds")),
+      maxNSeeds(cfg.getParameter<int>("maxNSeeds")) {
   if (applySeedNumber)
-	edm::LogInfo("AlignmentSeedSelector") 
-	  << "apply seedNumber N<=" << minNSeeds;
-
+    edm::LogInfo("AlignmentSeedSelector") << "apply seedNumber N<=" << minNSeeds;
 }
 
 // destructor -----------------------------------------------------------------
 
-AlignmentSeedSelector::~AlignmentSeedSelector()
-{}
-
+AlignmentSeedSelector::~AlignmentSeedSelector() {}
 
 // do selection ---------------------------------------------------------------
 
-AlignmentSeedSelector::Seeds 
-AlignmentSeedSelector::select(const Seeds& seeds, const edm::Event& evt) const 
-{
+AlignmentSeedSelector::Seeds AlignmentSeedSelector::select(const Seeds& seeds, const edm::Event& evt) const {
   Seeds result = seeds;
 
   // apply minimum/maximum multiplicity requirement (if selected)
   if (applySeedNumber) {
-    if (result.size()<(unsigned int)minNSeeds || result.size()>(unsigned int)maxNSeeds ) result.clear();
+    if (result.size() < (unsigned int)minNSeeds || result.size() > (unsigned int)maxNSeeds)
+      result.clear();
   }
 
   return result;
-
 }
 
 // make basic cuts ------------------------------------------------------------
diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc
index 98521251d6011..eff9c2d35733d 100644
--- a/Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc
+++ b/Alignment/CommonAlignmentProducer/src/AlignmentTrackSelector.cc
@@ -30,298 +30,285 @@ const int kFPIX = PixelSubdetector::PixelEndcap;
 
 // constructor ----------------------------------------------------------------
 
-AlignmentTrackSelector::AlignmentTrackSelector(const edm::ParameterSet & cfg, edm::ConsumesCollector& iC) :
-  applyBasicCuts_( cfg.getParameter<bool>( "applyBasicCuts" ) ),
-  applyNHighestPt_( cfg.getParameter<bool>( "applyNHighestPt" ) ),
-  applyMultiplicityFilter_( cfg.getParameter<bool>( "applyMultiplicityFilter" ) ),
-  seedOnlyFromAbove_( cfg.getParameter<int>( "seedOnlyFrom" ) ),
-  applyIsolation_( cfg.getParameter<bool>( "applyIsolationCut" ) ),
-  chargeCheck_( cfg.getParameter<bool>( "applyChargeCheck" ) ),
-  nHighestPt_( cfg.getParameter<int>( "nHighestPt" ) ),
-  minMultiplicity_ ( cfg.getParameter<int>( "minMultiplicity" ) ),
-  maxMultiplicity_ ( cfg.getParameter<int>( "maxMultiplicity" ) ),
-  multiplicityOnInput_ ( cfg.getParameter<bool>( "multiplicityOnInput" ) ),
-  ptMin_( cfg.getParameter<double>( "ptMin" ) ),
-  ptMax_( cfg.getParameter<double>( "ptMax" ) ),
-  pMin_( cfg.getParameter<double>( "pMin" ) ),
-  pMax_( cfg.getParameter<double>( "pMax" ) ),
-  etaMin_( cfg.getParameter<double>( "etaMin" ) ),
-  etaMax_( cfg.getParameter<double>( "etaMax" ) ),
-  phiMin_( cfg.getParameter<double>( "phiMin" ) ),
-  phiMax_( cfg.getParameter<double>( "phiMax" ) ),
-  nHitMin_( cfg.getParameter<double>( "nHitMin" ) ),
-  nHitMax_( cfg.getParameter<double>( "nHitMax" ) ),
-  chi2nMax_( cfg.getParameter<double>( "chi2nMax" ) ),
-  d0Min_(  cfg.getParameter<double>( "d0Min" ) ),
-  d0Max_(  cfg.getParameter<double>( "d0Max" ) ),
-  dzMin_(  cfg.getParameter<double>( "dzMin" ) ),
-  dzMax_(  cfg.getParameter<double>( "dzMax" ) ),
-  theCharge_( cfg.getParameter<int>( "theCharge" ) ),
-  minHitChargeStrip_( cfg.getParameter<double>( "minHitChargeStrip" ) ),
-  minHitIsolation_( cfg.getParameter<double>( "minHitIsolation" ) ),
-  countStereoHitAs2D_( cfg.getParameter<bool>( "countStereoHitAs2D" ) ),
-  nHitMin2D_( cfg.getParameter<unsigned int>( "nHitMin2D" ) ),
-  // Ugly to use the same getParameter n times, but this allows const cut variables...
-  minHitsinTIB_(cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inTIB" ) ),
-  minHitsinTOB_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inTOB" ) ),
-  minHitsinTID_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inTID" ) ),
-  minHitsinTEC_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inTEC" ) ),
-  minHitsinBPIX_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inBPIX" ) ),
-  minHitsinFPIX_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inFPIX" ) ),
-  minHitsinPIX_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inPIXEL" ) ),
-  minHitsinTIDplus_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inTIDplus" ) ),
-  minHitsinTIDminus_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inTIDminus" ) ),
-  minHitsinTECplus_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inTECplus" ) ),
-  minHitsinTECminus_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inTECminus" ) ),
-  minHitsinFPIXplus_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inFPIXplus" ) ),
-  minHitsinFPIXminus_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inFPIXminus" ) ),
-  minHitsinENDCAP_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inENDCAP" ) ),
-  minHitsinENDCAPplus_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inENDCAPplus" ) ),
-  minHitsinENDCAPminus_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inENDCAPminus" ) ),
-  maxHitDiffEndcaps_( cfg.getParameter<double>( "maxHitDiffEndcaps" ) ),
-  nLostHitMax_( cfg.getParameter<double>( "nLostHitMax" ) ),
-  RorZofFirstHitMin_( cfg.getParameter<std::vector<double> >( "RorZofFirstHitMin" ) ),
-  RorZofFirstHitMax_( cfg.getParameter<std::vector<double> >( "RorZofFirstHitMax" ) ),
-  RorZofLastHitMin_( cfg.getParameter<std::vector<double> >( "RorZofLastHitMin" ) ),
-  RorZofLastHitMax_( cfg.getParameter<std::vector<double> >( "RorZofLastHitMax" ) ),
-  clusterValueMapTag_(cfg.getParameter<edm::InputTag>("hitPrescaleMapTag")),
-  minPrescaledHits_( cfg.getParameter<int>("minPrescaledHits")),
-  applyPrescaledHitsFilter_(!clusterValueMapTag_.encode().empty() && minPrescaledHits_ > 0)
-{
-  if(applyIsolation_) {
+AlignmentTrackSelector::AlignmentTrackSelector(const edm::ParameterSet& cfg, edm::ConsumesCollector& iC)
+    : applyBasicCuts_(cfg.getParameter<bool>("applyBasicCuts")),
+      applyNHighestPt_(cfg.getParameter<bool>("applyNHighestPt")),
+      applyMultiplicityFilter_(cfg.getParameter<bool>("applyMultiplicityFilter")),
+      seedOnlyFromAbove_(cfg.getParameter<int>("seedOnlyFrom")),
+      applyIsolation_(cfg.getParameter<bool>("applyIsolationCut")),
+      chargeCheck_(cfg.getParameter<bool>("applyChargeCheck")),
+      nHighestPt_(cfg.getParameter<int>("nHighestPt")),
+      minMultiplicity_(cfg.getParameter<int>("minMultiplicity")),
+      maxMultiplicity_(cfg.getParameter<int>("maxMultiplicity")),
+      multiplicityOnInput_(cfg.getParameter<bool>("multiplicityOnInput")),
+      ptMin_(cfg.getParameter<double>("ptMin")),
+      ptMax_(cfg.getParameter<double>("ptMax")),
+      pMin_(cfg.getParameter<double>("pMin")),
+      pMax_(cfg.getParameter<double>("pMax")),
+      etaMin_(cfg.getParameter<double>("etaMin")),
+      etaMax_(cfg.getParameter<double>("etaMax")),
+      phiMin_(cfg.getParameter<double>("phiMin")),
+      phiMax_(cfg.getParameter<double>("phiMax")),
+      nHitMin_(cfg.getParameter<double>("nHitMin")),
+      nHitMax_(cfg.getParameter<double>("nHitMax")),
+      chi2nMax_(cfg.getParameter<double>("chi2nMax")),
+      d0Min_(cfg.getParameter<double>("d0Min")),
+      d0Max_(cfg.getParameter<double>("d0Max")),
+      dzMin_(cfg.getParameter<double>("dzMin")),
+      dzMax_(cfg.getParameter<double>("dzMax")),
+      theCharge_(cfg.getParameter<int>("theCharge")),
+      minHitChargeStrip_(cfg.getParameter<double>("minHitChargeStrip")),
+      minHitIsolation_(cfg.getParameter<double>("minHitIsolation")),
+      countStereoHitAs2D_(cfg.getParameter<bool>("countStereoHitAs2D")),
+      nHitMin2D_(cfg.getParameter<unsigned int>("nHitMin2D")),
+      // Ugly to use the same getParameter n times, but this allows const cut variables...
+      minHitsinTIB_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inTIB")),
+      minHitsinTOB_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inTOB")),
+      minHitsinTID_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inTID")),
+      minHitsinTEC_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inTEC")),
+      minHitsinBPIX_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inBPIX")),
+      minHitsinFPIX_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inFPIX")),
+      minHitsinPIX_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inPIXEL")),
+      minHitsinTIDplus_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inTIDplus")),
+      minHitsinTIDminus_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inTIDminus")),
+      minHitsinTECplus_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inTECplus")),
+      minHitsinTECminus_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inTECminus")),
+      minHitsinFPIXplus_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inFPIXplus")),
+      minHitsinFPIXminus_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inFPIXminus")),
+      minHitsinENDCAP_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inENDCAP")),
+      minHitsinENDCAPplus_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inENDCAPplus")),
+      minHitsinENDCAPminus_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inENDCAPminus")),
+      maxHitDiffEndcaps_(cfg.getParameter<double>("maxHitDiffEndcaps")),
+      nLostHitMax_(cfg.getParameter<double>("nLostHitMax")),
+      RorZofFirstHitMin_(cfg.getParameter<std::vector<double> >("RorZofFirstHitMin")),
+      RorZofFirstHitMax_(cfg.getParameter<std::vector<double> >("RorZofFirstHitMax")),
+      RorZofLastHitMin_(cfg.getParameter<std::vector<double> >("RorZofLastHitMin")),
+      RorZofLastHitMax_(cfg.getParameter<std::vector<double> >("RorZofLastHitMax")),
+      clusterValueMapTag_(cfg.getParameter<edm::InputTag>("hitPrescaleMapTag")),
+      minPrescaledHits_(cfg.getParameter<int>("minPrescaledHits")),
+      applyPrescaledHitsFilter_(!clusterValueMapTag_.encode().empty() && minPrescaledHits_ > 0) {
+  if (applyIsolation_) {
     rphirecHitsToken_ = iC.consumes<SiStripRecHit2DCollection>(cfg.getParameter<edm::InputTag>("rphirecHits"));
-    matchedrecHitsToken_ = iC.consumes<SiStripMatchedRecHit2DCollection>(cfg.getParameter<edm::InputTag>("matchedrecHits"));
+    matchedrecHitsToken_ =
+        iC.consumes<SiStripMatchedRecHit2DCollection>(cfg.getParameter<edm::InputTag>("matchedrecHits"));
   }
 
-  if(applyPrescaledHitsFilter_) {
+  if (applyPrescaledHitsFilter_) {
     clusterValueMapToken_ = iC.consumes<AliClusterValueMap>(clusterValueMapTag_);
   }
 
   //convert track quality from string to enum
   std::vector<std::string> trkQualityStrings(cfg.getParameter<std::vector<std::string> >("trackQualities"));
   std::string qualities;
-  if(!trkQualityStrings.empty()){
-    applyTrkQualityCheck_=true;
+  if (!trkQualityStrings.empty()) {
+    applyTrkQualityCheck_ = true;
     for (unsigned int i = 0; i < trkQualityStrings.size(); ++i) {
       (qualities += trkQualityStrings[i]) += ", ";
       trkQualities_.push_back(reco::TrackBase::qualityByName(trkQualityStrings[i]));
     }
-  }
-  else applyTrkQualityCheck_=false;
+  } else
+    applyTrkQualityCheck_ = false;
 
   std::vector<std::string> trkIterStrings(cfg.getParameter<std::vector<std::string> >("iterativeTrackingSteps"));
-  if(!trkIterStrings.empty()){
-    applyIterStepCheck_=true;
+  if (!trkIterStrings.empty()) {
+    applyIterStepCheck_ = true;
     std::string tracksteps;
     for (unsigned int i = 0; i < trkIterStrings.size(); ++i) {
       (tracksteps += trkIterStrings[i]) += ", ";
       trkSteps_.push_back(reco::TrackBase::algoByName(trkIterStrings[i]));
     }
-  }
-  else   applyIterStepCheck_=false;
-
-  if (applyBasicCuts_){
-      edm::LogInfo("AlignmentTrackSelector") 
-	<< "applying basic track cuts ..."
-	<< "\nptmin,ptmax:     " << ptMin_   << "," << ptMax_ 
-	<< "\npmin,pmax:       " << pMin_    << "," << pMax_ 
-	<< "\netamin,etamax:   " << etaMin_  << "," << etaMax_
-	<< "\nphimin,phimax:   " << phiMin_  << "," << phiMax_
-	<< "\nnhitmin,nhitmax: " << nHitMin_ << "," << nHitMax_
-	<< "\nnlosthitmax:     " << nLostHitMax_
-	<< "\nnhitmin2D:       " << nHitMin2D_
-        << (countStereoHitAs2D_ ? "," : ", not") << " counting hits on SiStrip stereo modules as 2D" 
-	<< "\nchi2nmax:        " << chi2nMax_;
-
-      if (applyIsolation_)
-	edm::LogInfo("AlignmentTrackSelector") 
-	  << "only retain tracks isolated at least by " << minHitIsolation_ << 
-	  " cm from other rechits"; 
-      
-      if (chargeCheck_)
-	edm::LogInfo("AlignmentTrackSelector") 
-	  << "only retain hits with at least " << minHitChargeStrip_ <<  
-	  " ADC counts of total cluster charge"; 
-   
-      edm::LogInfo("AlignmentTrackSelector") 
-	<< "Minimum number of hits in TIB/TID/TOB/TEC/BPIX/FPIX/PIXEL = " 
-	<< minHitsinTIB_ << "/" << minHitsinTID_ << "/" << minHitsinTOB_
-        << "/" << minHitsinTEC_ << "/" << minHitsinBPIX_ << "/" << minHitsinFPIX_ << "/" << minHitsinPIX_;
-
+  } else
+    applyIterStepCheck_ = false;
+
+  if (applyBasicCuts_) {
+    edm::LogInfo("AlignmentTrackSelector")
+        << "applying basic track cuts ..."
+        << "\nptmin,ptmax:     " << ptMin_ << "," << ptMax_ << "\npmin,pmax:       " << pMin_ << "," << pMax_
+        << "\netamin,etamax:   " << etaMin_ << "," << etaMax_ << "\nphimin,phimax:   " << phiMin_ << "," << phiMax_
+        << "\nnhitmin,nhitmax: " << nHitMin_ << "," << nHitMax_ << "\nnlosthitmax:     " << nLostHitMax_
+        << "\nnhitmin2D:       " << nHitMin2D_ << (countStereoHitAs2D_ ? "," : ", not")
+        << " counting hits on SiStrip stereo modules as 2D"
+        << "\nchi2nmax:        " << chi2nMax_;
+
+    if (applyIsolation_)
       edm::LogInfo("AlignmentTrackSelector")
-        << "Minimum number of hits in TID+/TID-/TEC+/TEC-/FPIX+/FPIX- = "
-        << minHitsinTIDplus_ << "/" << minHitsinTIDminus_
-        << "/" << minHitsinTECplus_ << "/" << minHitsinTECminus_
-        << "/" << minHitsinFPIXplus_ << "/" << minHitsinFPIXminus_;
+          << "only retain tracks isolated at least by " << minHitIsolation_ << " cm from other rechits";
 
+    if (chargeCheck_)
       edm::LogInfo("AlignmentTrackSelector")
-        << "Minimum number of hits in EndCap (TID+TEC)/EndCap+/EndCap- = "
-        << minHitsinENDCAP_ << "/" << minHitsinENDCAPplus_ << "/" << minHitsinENDCAPminus_;
+          << "only retain hits with at least " << minHitChargeStrip_ << " ADC counts of total cluster charge";
 
-      edm::LogInfo("AlignmentTrackSelector")
-	<< "Max value of |nHitsinENDCAPplus - nHitsinENDCAPminus| = "
-	<< maxHitDiffEndcaps_;
+    edm::LogInfo("AlignmentTrackSelector")
+        << "Minimum number of hits in TIB/TID/TOB/TEC/BPIX/FPIX/PIXEL = " << minHitsinTIB_ << "/" << minHitsinTID_
+        << "/" << minHitsinTOB_ << "/" << minHitsinTEC_ << "/" << minHitsinBPIX_ << "/" << minHitsinFPIX_ << "/"
+        << minHitsinPIX_;
+
+    edm::LogInfo("AlignmentTrackSelector")
+        << "Minimum number of hits in TID+/TID-/TEC+/TEC-/FPIX+/FPIX- = " << minHitsinTIDplus_ << "/"
+        << minHitsinTIDminus_ << "/" << minHitsinTECplus_ << "/" << minHitsinTECminus_ << "/" << minHitsinFPIXplus_
+        << "/" << minHitsinFPIXminus_;
+
+    edm::LogInfo("AlignmentTrackSelector")
+        << "Minimum number of hits in EndCap (TID+TEC)/EndCap+/EndCap- = " << minHitsinENDCAP_ << "/"
+        << minHitsinENDCAPplus_ << "/" << minHitsinENDCAPminus_;
+
+    edm::LogInfo("AlignmentTrackSelector")
+        << "Max value of |nHitsinENDCAPplus - nHitsinENDCAPminus| = " << maxHitDiffEndcaps_;
 
-      if (!trkQualityStrings.empty()) {
-	edm::LogInfo("AlignmentTrackSelector")
-	  << "Select tracks with these qualities: " << qualities;
-      }    
+    if (!trkQualityStrings.empty()) {
+      edm::LogInfo("AlignmentTrackSelector") << "Select tracks with these qualities: " << qualities;
+    }
   }
-  
+
   if (applyNHighestPt_)
-	edm::LogInfo("AlignmentTrackSelector") 
-	  << "filter N tracks with highest Pt N=" << nHighestPt_;
+    edm::LogInfo("AlignmentTrackSelector") << "filter N tracks with highest Pt N=" << nHighestPt_;
 
   if (applyMultiplicityFilter_)
-	edm::LogInfo("AlignmentTrackSelector") 
-	  << "apply multiplicity filter N>= " << minMultiplicity_ << "and N<= " << maxMultiplicity_
-          << " on " << (multiplicityOnInput_ ? "input" : "output");
+    edm::LogInfo("AlignmentTrackSelector")
+        << "apply multiplicity filter N>= " << minMultiplicity_ << "and N<= " << maxMultiplicity_ << " on "
+        << (multiplicityOnInput_ ? "input" : "output");
 
   if (applyPrescaledHitsFilter_) {
-    edm::LogInfo("AlignmentTrackSelector") 
-      << "apply cut on number of prescaled hits N>= " << minPrescaledHits_
-      << " (prescale info from " << clusterValueMapTag_ << ")";
-    
+    edm::LogInfo("AlignmentTrackSelector") << "apply cut on number of prescaled hits N>= " << minPrescaledHits_
+                                           << " (prescale info from " << clusterValueMapTag_ << ")";
   }
 
   // Checking whether cuts on positions of first and last track hits are defined properly
-  if(RorZofFirstHitMin_.size() != 2){
-      throw cms::Exception("BadConfig") << "@SUB=AlignmentTrackSelector::AlignmentTrackSelector" 
-	  << "Wrong configuration of 'RorZofFirstHitMin'."
-	  << " Must have exactly 2 values instead of configured " << RorZofFirstHitMin_.size() << ")";
+  if (RorZofFirstHitMin_.size() != 2) {
+    throw cms::Exception("BadConfig") << "@SUB=AlignmentTrackSelector::AlignmentTrackSelector"
+                                      << "Wrong configuration of 'RorZofFirstHitMin'."
+                                      << " Must have exactly 2 values instead of configured "
+                                      << RorZofFirstHitMin_.size() << ")";
   } else {
-    RorZofFirstHitMin_.at(0)=std::fabs(RorZofFirstHitMin_.at(0));
-    RorZofFirstHitMin_.at(1)=std::fabs(RorZofFirstHitMin_.at(1));
+    RorZofFirstHitMin_.at(0) = std::fabs(RorZofFirstHitMin_.at(0));
+    RorZofFirstHitMin_.at(1) = std::fabs(RorZofFirstHitMin_.at(1));
   }
-  if(RorZofFirstHitMax_.size() != 2){
-      throw cms::Exception("BadConfig") << "@SUB=AlignmentTrackSelector::AlignmentTrackSelector" 
-	  << "Wrong configuration of 'RorZofFirstHitMax'."
-	  << " Must have exactly 2 values instead of configured " << RorZofFirstHitMax_.size() << ")";
+  if (RorZofFirstHitMax_.size() != 2) {
+    throw cms::Exception("BadConfig") << "@SUB=AlignmentTrackSelector::AlignmentTrackSelector"
+                                      << "Wrong configuration of 'RorZofFirstHitMax'."
+                                      << " Must have exactly 2 values instead of configured "
+                                      << RorZofFirstHitMax_.size() << ")";
   } else {
     RorZofFirstHitMax_.at(0) = std::fabs(RorZofFirstHitMax_.at(0));
     RorZofFirstHitMax_.at(1) = std::fabs(RorZofFirstHitMax_.at(1));
   }
-  if(RorZofLastHitMin_.size() != 2){
-      throw cms::Exception("BadConfig") << "@SUB=AlignmentTrackSelector::AlignmentTrackSelector" 
-	  << "Wrong configuration of 'RorZofLastHitMin'."
-	  << " Must have exactly 2 values instead of configured " << RorZofLastHitMin_.size() << ")";
+  if (RorZofLastHitMin_.size() != 2) {
+    throw cms::Exception("BadConfig") << "@SUB=AlignmentTrackSelector::AlignmentTrackSelector"
+                                      << "Wrong configuration of 'RorZofLastHitMin'."
+                                      << " Must have exactly 2 values instead of configured "
+                                      << RorZofLastHitMin_.size() << ")";
   } else {
     RorZofLastHitMin_.at(0) = std::fabs(RorZofLastHitMin_.at(0));
     RorZofLastHitMin_.at(1) = std::fabs(RorZofLastHitMin_.at(1));
   }
-  if(RorZofLastHitMax_.size() != 2){
-      throw cms::Exception("BadConfig") << "@SUB=AlignmentTrackSelector::AlignmentTrackSelector" 
-	  << "Wrong configuration of 'RorZofLastHitMax'."
-	  << " Must have exactly 2 values instead of configured " << RorZofLastHitMax_.size() << ")";
+  if (RorZofLastHitMax_.size() != 2) {
+    throw cms::Exception("BadConfig") << "@SUB=AlignmentTrackSelector::AlignmentTrackSelector"
+                                      << "Wrong configuration of 'RorZofLastHitMax'."
+                                      << " Must have exactly 2 values instead of configured "
+                                      << RorZofLastHitMax_.size() << ")";
   } else {
     RorZofLastHitMax_.at(0) = std::fabs(RorZofLastHitMax_.at(0));
     RorZofLastHitMax_.at(1) = std::fabs(RorZofLastHitMax_.at(1));
   }
   // If first hit set to be at larger distance then the last hit
-  if(RorZofFirstHitMin_.at(0) > RorZofLastHitMax_.at(0) && RorZofFirstHitMin_.at(1) > RorZofLastHitMax_.at(1)){
-      throw cms::Exception("BadConfig") << "@SUB=AlignmentTrackSelector::AlignmentTrackSelector" 
-	  << "Position of the first hit is set to larger distance than the last hit:."
-	  << " First hit(min): [" << RorZofFirstHitMin_.at(0) << ", " << RorZofFirstHitMin_.at(1) << "]; Last hit(max): [" 
-	  << RorZofLastHitMax_.at(0) << ", " << RorZofLastHitMax_.at(1) << "];";
+  if (RorZofFirstHitMin_.at(0) > RorZofLastHitMax_.at(0) && RorZofFirstHitMin_.at(1) > RorZofLastHitMax_.at(1)) {
+    throw cms::Exception("BadConfig") << "@SUB=AlignmentTrackSelector::AlignmentTrackSelector"
+                                      << "Position of the first hit is set to larger distance than the last hit:."
+                                      << " First hit(min): [" << RorZofFirstHitMin_.at(0) << ", "
+                                      << RorZofFirstHitMin_.at(1) << "]; Last hit(max): [" << RorZofLastHitMax_.at(0)
+                                      << ", " << RorZofLastHitMax_.at(1) << "];";
   }
-
 }
 
 // destructor -----------------------------------------------------------------
 
-AlignmentTrackSelector::~AlignmentTrackSelector()
-{}
-
+AlignmentTrackSelector::~AlignmentTrackSelector() {}
 
 // do selection ---------------------------------------------------------------
 
-AlignmentTrackSelector::Tracks 
-AlignmentTrackSelector::select(const Tracks& tracks, const edm::Event& evt, const edm::EventSetup& eSetup) const 
-{
-  
-  if (applyMultiplicityFilter_ && multiplicityOnInput_ && 
-      (tracks.size() < static_cast<unsigned int>(minMultiplicity_) 
-       || tracks.size() > static_cast<unsigned int>(maxMultiplicity_))) {
-    return Tracks(); // empty collection
+AlignmentTrackSelector::Tracks AlignmentTrackSelector::select(const Tracks& tracks,
+                                                              const edm::Event& evt,
+                                                              const edm::EventSetup& eSetup) const {
+  if (applyMultiplicityFilter_ && multiplicityOnInput_ &&
+      (tracks.size() < static_cast<unsigned int>(minMultiplicity_) ||
+       tracks.size() > static_cast<unsigned int>(maxMultiplicity_))) {
+    return Tracks();  // empty collection
   }
 
   Tracks result = tracks;
   // apply basic track cuts (if selected)
-  if (applyBasicCuts_) result= this->basicCuts(result, evt, eSetup);
-  
+  if (applyBasicCuts_)
+    result = this->basicCuts(result, evt, eSetup);
+
   // filter N tracks with highest Pt (if selected)
-  if (applyNHighestPt_) result = this->theNHighestPtTracks(result);
-  
+  if (applyNHighestPt_)
+    result = this->theNHighestPtTracks(result);
+
   // apply minimum multiplicity requirement (if selected)
   if (applyMultiplicityFilter_ && !multiplicityOnInput_) {
-    if (result.size() < static_cast<unsigned int>(minMultiplicity_) 
-        || result.size() > static_cast<unsigned int>(maxMultiplicity_) ) {
-
+    if (result.size() < static_cast<unsigned int>(minMultiplicity_) ||
+        result.size() > static_cast<unsigned int>(maxMultiplicity_)) {
       result.clear();
     }
   }
 
-  if(applyPrescaledHitsFilter_){
+  if (applyPrescaledHitsFilter_) {
     result = this->checkPrescaledHits(result, evt);
   }
 
   return result;
 }
 
- ///returns if any of the Filters is used.
-bool AlignmentTrackSelector::useThisFilter()
-{
+///returns if any of the Filters is used.
+bool AlignmentTrackSelector::useThisFilter() {
   return applyMultiplicityFilter_ || applyBasicCuts_ || applyNHighestPt_ || applyPrescaledHitsFilter_;
-
 }
 
-
 // make basic cuts ------------------------------------------------------------
 
-AlignmentTrackSelector::Tracks 
-AlignmentTrackSelector::basicCuts(const Tracks& tracks, const edm::Event& evt, const edm::EventSetup& eSetup) const 
-{
+AlignmentTrackSelector::Tracks AlignmentTrackSelector::basicCuts(const Tracks& tracks,
+                                                                 const edm::Event& evt,
+                                                                 const edm::EventSetup& eSetup) const {
   Tracks result;
 
-  for (Tracks::const_iterator it=tracks.begin(); it != tracks.end(); ++it) {
-    const reco::Track* trackp=*it;
-    float pt=trackp->pt();
-    float p=trackp->p();
-    float eta=trackp->eta();
-    float phi=trackp->phi();
-    int nhit = trackp->numberOfValidHits(); 
-    int nlosthit = trackp->numberOfLostHits(); 
+  for (Tracks::const_iterator it = tracks.begin(); it != tracks.end(); ++it) {
+    const reco::Track* trackp = *it;
+    float pt = trackp->pt();
+    float p = trackp->p();
+    float eta = trackp->eta();
+    float phi = trackp->phi();
+    int nhit = trackp->numberOfValidHits();
+    int nlosthit = trackp->numberOfLostHits();
     float chi2n = trackp->normalizedChi2();
 
     int q = trackp->charge();
     bool isChargeOk = false;
-    if(theCharge_==-1 && q<0)         isChargeOk = true; 
-    else if (theCharge_==1 && q>0)    isChargeOk = true; 
-    else if (theCharge_==0)           isChargeOk = true; 
+    if (theCharge_ == -1 && q < 0)
+      isChargeOk = true;
+    else if (theCharge_ == 1 && q > 0)
+      isChargeOk = true;
+    else if (theCharge_ == 0)
+      isChargeOk = true;
 
-    float d0    = trackp->d0();
-    float dz    = trackp->dz();
+    float d0 = trackp->d0();
+    float dz = trackp->dz();
 
     // edm::LogDebug("AlignmentTrackSelector") << " pt,eta,phi,nhit: "
     //  <<pt<<","<<eta<<","<<phi<<","<<nhit;
 
-    if (pt>ptMin_ && pt<ptMax_ 
-       && p>pMin_ && p<pMax_ 
-       && eta>etaMin_ && eta<etaMax_ 
-       && phi>phiMin_ && phi<phiMax_ 
-       && nhit>=nHitMin_ && nhit<=nHitMax_
-       && nlosthit<=nLostHitMax_
-       && chi2n<chi2nMax_
-       && isChargeOk
-       && d0>=d0Min_ && d0<=d0Max_
-       && dz>=dzMin_ && dz<=dzMax_) {
-      bool trkQualityOk=false ;
-      if (!applyTrkQualityCheck_ &&!applyIterStepCheck_)trkQualityOk=true ; // nothing required
-      else trkQualityOk = this->isOkTrkQuality(trackp);
-
-      bool hitsCheckOk=this->detailedHitsCheck(trackp, evt, eSetup);
- 
-      if (trkQualityOk && hitsCheckOk )  result.push_back(trackp);
+    if (pt > ptMin_ && pt < ptMax_ && p > pMin_ && p < pMax_ && eta > etaMin_ && eta < etaMax_ && phi > phiMin_ &&
+        phi < phiMax_ && nhit >= nHitMin_ && nhit <= nHitMax_ && nlosthit <= nLostHitMax_ && chi2n < chi2nMax_ &&
+        isChargeOk && d0 >= d0Min_ && d0 <= d0Max_ && dz >= dzMin_ && dz <= dzMax_) {
+      bool trkQualityOk = false;
+      if (!applyTrkQualityCheck_ && !applyIterStepCheck_)
+        trkQualityOk = true;  // nothing required
+      else
+        trkQualityOk = this->isOkTrkQuality(trackp);
+
+      bool hitsCheckOk = this->detailedHitsCheck(trackp, evt, eSetup);
+
+      if (trkQualityOk && hitsCheckOk)
+        result.push_back(trackp);
     }
   }
 
@@ -330,9 +317,9 @@ AlignmentTrackSelector::basicCuts(const Tracks& tracks, const edm::Event& evt, c
 
 //-----------------------------------------------------------------------------
 
-bool AlignmentTrackSelector::detailedHitsCheck(const reco::Track *trackp, const edm::Event& evt, const edm::EventSetup& eSetup) const
-{
-
+bool AlignmentTrackSelector::detailedHitsCheck(const reco::Track* trackp,
+                                               const edm::Event& evt,
+                                               const edm::EventSetup& eSetup) const {
   //Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   eSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
@@ -340,18 +327,16 @@ bool AlignmentTrackSelector::detailedHitsCheck(const reco::Track *trackp, const
 
   // checking hit requirements beyond simple number of valid hits
 
-  if (minHitsinTIB_ || minHitsinTOB_ || minHitsinTID_ || minHitsinTEC_
-      || minHitsinENDCAP_ || minHitsinENDCAPplus_ || minHitsinENDCAPminus_ || (maxHitDiffEndcaps_ < 999)
-      || minHitsinTIDplus_ || minHitsinTIDminus_
-      || minHitsinFPIXplus_ || minHitsinFPIXminus_
-      || minHitsinTECplus_ || minHitsinTECminus_
-      || minHitsinFPIX_ || minHitsinBPIX_ || minHitsinPIX_ ||nHitMin2D_ || chargeCheck_
-      || applyIsolation_ || (seedOnlyFromAbove_ == 1 || seedOnlyFromAbove_ == 2)
-      || !RorZofFirstHitMin_.empty() || !RorZofFirstHitMax_.empty() || !RorZofLastHitMin_.empty() || !RorZofLastHitMax_.empty() ) {
+  if (minHitsinTIB_ || minHitsinTOB_ || minHitsinTID_ || minHitsinTEC_ || minHitsinENDCAP_ || minHitsinENDCAPplus_ ||
+      minHitsinENDCAPminus_ || (maxHitDiffEndcaps_ < 999) || minHitsinTIDplus_ || minHitsinTIDminus_ ||
+      minHitsinFPIXplus_ || minHitsinFPIXminus_ || minHitsinTECplus_ || minHitsinTECminus_ || minHitsinFPIX_ ||
+      minHitsinBPIX_ || minHitsinPIX_ || nHitMin2D_ || chargeCheck_ || applyIsolation_ ||
+      (seedOnlyFromAbove_ == 1 || seedOnlyFromAbove_ == 2) || !RorZofFirstHitMin_.empty() ||
+      !RorZofFirstHitMax_.empty() || !RorZofLastHitMin_.empty() || !RorZofLastHitMax_.empty()) {
     // any detailed hit cut is active, so have to check
-    
+
     int nhitinTIB = 0, nhitinTOB = 0, nhitinTID = 0;
-    int nhitinTEC = 0, nhitinBPIX = 0, nhitinFPIX = 0, nhitinPIXEL=0;
+    int nhitinTEC = 0, nhitinBPIX = 0, nhitinFPIX = 0, nhitinPIXEL = 0;
     int nhitinENDCAP = 0, nhitinENDCAPplus = 0, nhitinENDCAPminus = 0;
     int nhitinTIDplus = 0, nhitinTIDminus = 0;
     int nhitinFPIXplus = 0, nhitinFPIXminus = 0;
@@ -359,157 +344,164 @@ bool AlignmentTrackSelector::detailedHitsCheck(const reco::Track *trackp, const
     unsigned int nHit2D = 0;
     unsigned int thishit = 0;
 
-    for(auto const& hit : trackp->recHits()) {
+    for (auto const& hit : trackp->recHits()) {
       thishit++;
       const DetId detId(hit->geographicalId());
-      const int subdetId = detId.subdetId(); 
+      const int subdetId = detId.subdetId();
 
-      // *** thishit == 1 means last hit in CTF *** 
+      // *** thishit == 1 means last hit in CTF ***
       // (FIXME: assumption might change or not be valid for all tracking algorthms)
       // ==> for cosmics
       // seedOnlyFrom = 1 is TIB-TOB-TEC tracks only
-      // seedOnlyFrom = 2 is TOB-TEC tracks only 
-      if (seedOnlyFromAbove_ == 1 && thishit == 1 
-          && (subdetId == int(SiStripDetId::TOB) || subdetId == int(SiStripDetId::TEC))){
-        return false; 
+      // seedOnlyFrom = 2 is TOB-TEC tracks only
+      if (seedOnlyFromAbove_ == 1 && thishit == 1 &&
+          (subdetId == int(SiStripDetId::TOB) || subdetId == int(SiStripDetId::TEC))) {
+        return false;
       }
       if (seedOnlyFromAbove_ == 2 && thishit == 1 && subdetId == int(SiStripDetId::TIB)) {
         return false;
       }
 
-      if (!hit->isValid()) continue; // only real hits count as in trackp->numberOfValidHits()
+      if (!hit->isValid())
+        continue;  // only real hits count as in trackp->numberOfValidHits()
       if (detId.det() != DetId::Tracker) {
-        edm::LogError("DetectorMismatch") << "@SUB=AlignmentTrackSelector::detailedHitsCheck"
-                                          << "DetId.det() != DetId::Tracker (=" << DetId::Tracker
-                                          << "), but " << detId.det() << ".";
+        edm::LogError("DetectorMismatch")
+            << "@SUB=AlignmentTrackSelector::detailedHitsCheck"
+            << "DetId.det() != DetId::Tracker (=" << DetId::Tracker << "), but " << detId.det() << ".";
       }
-      if (chargeCheck_ && !(this->isOkCharge(hit))) return false;
-      if (applyIsolation_ && (!this->isIsolated(hit, evt))) return false;
-      if      (SiStripDetId::TIB == subdetId) ++nhitinTIB;
-      else if (SiStripDetId::TOB == subdetId) ++nhitinTOB;
+      if (chargeCheck_ && !(this->isOkCharge(hit)))
+        return false;
+      if (applyIsolation_ && (!this->isIsolated(hit, evt)))
+        return false;
+      if (SiStripDetId::TIB == subdetId)
+        ++nhitinTIB;
+      else if (SiStripDetId::TOB == subdetId)
+        ++nhitinTOB;
       else if (SiStripDetId::TID == subdetId) {
         ++nhitinTID;
         ++nhitinENDCAP;
-        
+
         if (tTopo->tidIsZMinusSide(detId)) {
           ++nhitinTIDminus;
           ++nhitinENDCAPminus;
-	}
-        else if (tTopo->tidIsZPlusSide(detId)) {
+        } else if (tTopo->tidIsZPlusSide(detId)) {
           ++nhitinTIDplus;
           ++nhitinENDCAPplus;
-	}
-      }
-      else if (SiStripDetId::TEC == subdetId) {
+        }
+      } else if (SiStripDetId::TEC == subdetId) {
         ++nhitinTEC;
         ++nhitinENDCAP;
-        
+
         if (tTopo->tecIsZMinusSide(detId)) {
           ++nhitinTECminus;
           ++nhitinENDCAPminus;
-	}
-        else if (tTopo->tecIsZPlusSide(detId)) {
+        } else if (tTopo->tecIsZPlusSide(detId)) {
           ++nhitinTECplus;
           ++nhitinENDCAPplus;
-	}
-      }
-      else if (            kBPIX == subdetId) {++nhitinBPIX;++nhitinPIXEL;}
-      else if (            kFPIX == subdetId) {
+        }
+      } else if (kBPIX == subdetId) {
+        ++nhitinBPIX;
+        ++nhitinPIXEL;
+      } else if (kFPIX == subdetId) {
         ++nhitinFPIX;
         ++nhitinPIXEL;
-	
-        if (tTopo->pxfSide(detId)==1) ++nhitinFPIXminus;
-        else if (tTopo->pxfSide(detId)==2) ++nhitinFPIXplus;
+
+        if (tTopo->pxfSide(detId) == 1)
+          ++nhitinFPIXminus;
+        else if (tTopo->pxfSide(detId) == 2)
+          ++nhitinFPIXplus;
       }
       // Do not call isHit2D(..) if already enough 2D hits for performance reason:
-      if (nHit2D < nHitMin2D_ && this->isHit2D(*hit)) ++nHit2D;
-    } // end loop on hits
-
+      if (nHit2D < nHitMin2D_ && this->isHit2D(*hit))
+        ++nHit2D;
+    }  // end loop on hits
 
     // Checking whether the track satisfies requirement of the first and last hit positions
     bool passedLastHitPositionR = true;
     bool passedLastHitPositionZ = true;
     bool passedFirstHitPositionR = true;
     bool passedFirstHitPositionZ = true;
-    
-    if( RorZofFirstHitMin_.at(0) != 0.0 || RorZofFirstHitMin_.at(1) != 0.0 
-      || RorZofFirstHitMax_.at(0) != 999.0 || RorZofFirstHitMax_.at(1) != 999.0 ) {
 
+    if (RorZofFirstHitMin_.at(0) != 0.0 || RorZofFirstHitMin_.at(1) != 0.0 || RorZofFirstHitMax_.at(0) != 999.0 ||
+        RorZofFirstHitMax_.at(1) != 999.0) {
       const reco::TrackBase::Point& firstPoint(trackp->innerPosition());
 
-      if( (std::fabs(firstPoint.R()) < RorZofFirstHitMin_.at(0) )) passedFirstHitPositionR = false;
-      if( (std::fabs(firstPoint.R()) > RorZofFirstHitMax_.at(0) )) passedFirstHitPositionR = false;
-      if( (std::fabs(firstPoint.Z()) < RorZofFirstHitMin_.at(1) )) passedFirstHitPositionZ = false;
-      if( (std::fabs(firstPoint.Z()) > RorZofFirstHitMax_.at(1) )) passedFirstHitPositionZ = false;
+      if ((std::fabs(firstPoint.R()) < RorZofFirstHitMin_.at(0)))
+        passedFirstHitPositionR = false;
+      if ((std::fabs(firstPoint.R()) > RorZofFirstHitMax_.at(0)))
+        passedFirstHitPositionR = false;
+      if ((std::fabs(firstPoint.Z()) < RorZofFirstHitMin_.at(1)))
+        passedFirstHitPositionZ = false;
+      if ((std::fabs(firstPoint.Z()) > RorZofFirstHitMax_.at(1)))
+        passedFirstHitPositionZ = false;
     }
-    
-    if( RorZofLastHitMin_.at(0) != 0.0 || RorZofLastHitMin_.at(1) != 0.0 
-      || RorZofLastHitMax_.at(0) != 999.0 || RorZofLastHitMax_.at(1) != 999.0 ) {
 
+    if (RorZofLastHitMin_.at(0) != 0.0 || RorZofLastHitMin_.at(1) != 0.0 || RorZofLastHitMax_.at(0) != 999.0 ||
+        RorZofLastHitMax_.at(1) != 999.0) {
       const reco::TrackBase::Point& lastPoint(trackp->outerPosition());
 
-      if( (std::fabs(lastPoint.R()) < RorZofLastHitMin_.at(0) )) passedLastHitPositionR = false;
-      if( (std::fabs(lastPoint.R()) > RorZofLastHitMax_.at(0) )) passedLastHitPositionR = false;
-      if( (std::fabs(lastPoint.Z()) < RorZofLastHitMin_.at(1) )) passedLastHitPositionZ = false;
-      if( (std::fabs(lastPoint.Z()) > RorZofLastHitMax_.at(1) )) passedLastHitPositionZ = false;
+      if ((std::fabs(lastPoint.R()) < RorZofLastHitMin_.at(0)))
+        passedLastHitPositionR = false;
+      if ((std::fabs(lastPoint.R()) > RorZofLastHitMax_.at(0)))
+        passedLastHitPositionR = false;
+      if ((std::fabs(lastPoint.Z()) < RorZofLastHitMin_.at(1)))
+        passedLastHitPositionZ = false;
+      if ((std::fabs(lastPoint.Z()) > RorZofLastHitMax_.at(1)))
+        passedLastHitPositionZ = false;
     }
 
     bool passedFirstHitPosition = passedFirstHitPositionR || passedFirstHitPositionZ;
     bool passedLastHitPosition = passedLastHitPositionR || passedLastHitPositionZ;
 
-
-  
-    return (nhitinTIB >= minHitsinTIB_ && nhitinTOB >= minHitsinTOB_ 
-            && nhitinTID >= minHitsinTID_ && nhitinTEC >= minHitsinTEC_ 
-            && nhitinENDCAP >= minHitsinENDCAP_ && nhitinENDCAPplus >= minHitsinENDCAPplus_ && nhitinENDCAPminus >= minHitsinENDCAPminus_
-	    && std::abs(nhitinENDCAPplus-nhitinENDCAPminus) <= maxHitDiffEndcaps_
-            && nhitinTIDplus >= minHitsinTIDplus_ && nhitinTIDminus >= minHitsinTIDminus_
-            && nhitinFPIXplus >= minHitsinFPIXplus_ && nhitinFPIXminus >= minHitsinFPIXminus_
-            && nhitinTECplus >= minHitsinTECplus_ && nhitinTECminus >= minHitsinTECminus_
-            && nhitinBPIX >= minHitsinBPIX_ 
-	    && nhitinFPIX >= minHitsinFPIX_ && nhitinPIXEL>=minHitsinPIX_ 
-            && nHit2D >= nHitMin2D_ && passedFirstHitPosition && passedLastHitPosition);
-  } else { // no cuts set, so we are just fine and can avoid loop on hits
+    return (nhitinTIB >= minHitsinTIB_ && nhitinTOB >= minHitsinTOB_ && nhitinTID >= minHitsinTID_ &&
+            nhitinTEC >= minHitsinTEC_ && nhitinENDCAP >= minHitsinENDCAP_ &&
+            nhitinENDCAPplus >= minHitsinENDCAPplus_ && nhitinENDCAPminus >= minHitsinENDCAPminus_ &&
+            std::abs(nhitinENDCAPplus - nhitinENDCAPminus) <= maxHitDiffEndcaps_ &&
+            nhitinTIDplus >= minHitsinTIDplus_ && nhitinTIDminus >= minHitsinTIDminus_ &&
+            nhitinFPIXplus >= minHitsinFPIXplus_ && nhitinFPIXminus >= minHitsinFPIXminus_ &&
+            nhitinTECplus >= minHitsinTECplus_ && nhitinTECminus >= minHitsinTECminus_ &&
+            nhitinBPIX >= minHitsinBPIX_ && nhitinFPIX >= minHitsinFPIX_ && nhitinPIXEL >= minHitsinPIX_ &&
+            nHit2D >= nHitMin2D_ && passedFirstHitPosition && passedLastHitPosition);
+  } else {  // no cuts set, so we are just fine and can avoid loop on hits
     return true;
   }
-  
 }
 
 //-----------------------------------------------------------------------------
 
-bool AlignmentTrackSelector::isHit2D(const TrackingRecHit &hit) const
-{
+bool AlignmentTrackSelector::isHit2D(const TrackingRecHit& hit) const {
   // we count SiStrip stereo modules as 2D if selected via countStereoHitAs2D_
   // (since they provide theta information)
-  if (!hit.isValid() ||
-      (hit.dimension() < 2 && !countStereoHitAs2D_ && !dynamic_cast<const SiStripRecHit1D*>(&hit))){
-    return false; // real RecHit1D - but SiStripRecHit1D depends on countStereoHitAs2D_
+  if (!hit.isValid() || (hit.dimension() < 2 && !countStereoHitAs2D_ && !dynamic_cast<const SiStripRecHit1D*>(&hit))) {
+    return false;  // real RecHit1D - but SiStripRecHit1D depends on countStereoHitAs2D_
   } else {
     const DetId detId(hit.geographicalId());
     if (detId.det() == DetId::Tracker) {
       if (detId.subdetId() == kBPIX || detId.subdetId() == kFPIX) {
-        return true; // pixel is always 2D
-      } else { // should be SiStrip now
-	const SiStripDetId stripId(detId);
-	if (stripId.stereo()) return countStereoHitAs2D_; // stereo modules
-        else if (dynamic_cast<const SiStripRecHit1D*>(&hit)
-		 || dynamic_cast<const SiStripRecHit2D*>(&hit)) return false; // rphi modules hit
-	//the following two are not used any more since ages... 
-        else if (dynamic_cast<const SiStripMatchedRecHit2D*>(&hit)) return true; // matched is 2D
+        return true;  // pixel is always 2D
+      } else {        // should be SiStrip now
+        const SiStripDetId stripId(detId);
+        if (stripId.stereo())
+          return countStereoHitAs2D_;  // stereo modules
+        else if (dynamic_cast<const SiStripRecHit1D*>(&hit) || dynamic_cast<const SiStripRecHit2D*>(&hit))
+          return false;  // rphi modules hit
+                         //the following two are not used any more since ages...
+        else if (dynamic_cast<const SiStripMatchedRecHit2D*>(&hit))
+          return true;  // matched is 2D
         else if (dynamic_cast<const ProjectedSiStripRecHit2D*>(&hit)) {
-	  const ProjectedSiStripRecHit2D* pH = static_cast<const ProjectedSiStripRecHit2D*>(&hit);
-	  return (countStereoHitAs2D_ && this->isHit2D(pH->originalHit())); // depends on original...
-	} else {
+          const ProjectedSiStripRecHit2D* pH = static_cast<const ProjectedSiStripRecHit2D*>(&hit);
+          return (countStereoHitAs2D_ && this->isHit2D(pH->originalHit()));  // depends on original...
+        } else {
           edm::LogError("UnkownType") << "@SUB=AlignmentTrackSelector::isHit2D"
                                       << "Tracker hit not in pixel, neither SiStripRecHit[12]D nor "
                                       << "SiStripMatchedRecHit2D nor ProjectedSiStripRecHit2D.";
           return false;
         }
       }
-    } else { // not tracker??
+    } else {  // not tracker??
       edm::LogWarning("DetectorMismatch") << "@SUB=AlignmentTrackSelector::isHit2D"
                                           << "Hit not in tracker with 'official' dimension >=2.";
-      return true; // dimension() >= 2 so accept that...
+      return true;  // dimension() >= 2 so accept that...
     }
   }
   // never reached...
@@ -517,78 +509,72 @@ bool AlignmentTrackSelector::isHit2D(const TrackingRecHit &hit) const
 
 //-----------------------------------------------------------------------------
 
-bool AlignmentTrackSelector::isOkCharge(const TrackingRecHit* hit) const
-{
-  if (!hit || !hit->isValid()) return true; 
+bool AlignmentTrackSelector::isOkCharge(const TrackingRecHit* hit) const {
+  if (!hit || !hit->isValid())
+    return true;
 
   // check det and subdet
   const DetId id(hit->geographicalId());
   if (id.det() != DetId::Tracker) {
-    edm::LogWarning("DetectorMismatch") << "@SUB=isOkCharge" << "Hit not in tracker!";
+    edm::LogWarning("DetectorMismatch") << "@SUB=isOkCharge"
+                                        << "Hit not in tracker!";
     return true;
   }
   if (id.subdetId() == kFPIX || id.subdetId() == kBPIX) {
-    return true; // might add some requirement...
+    return true;  // might add some requirement...
   }
 
   // We are in SiStrip now, so test normal hit:
-  const std::type_info &type = typeid(*hit);
-  
+  const std::type_info& type = typeid(*hit);
 
   if (type == typeid(SiStripRecHit2D)) {
-    const SiStripRecHit2D *stripHit2D = dynamic_cast<const SiStripRecHit2D*>(hit);
+    const SiStripRecHit2D* stripHit2D = dynamic_cast<const SiStripRecHit2D*>(hit);
     if (stripHit2D) {
       return this->isOkChargeStripHit(*stripHit2D);
     }
-  }
-  else if(type == typeid(SiStripRecHit1D)){
-    const SiStripRecHit1D *stripHit1D = dynamic_cast<const SiStripRecHit1D*>(hit);
+  } else if (type == typeid(SiStripRecHit1D)) {
+    const SiStripRecHit1D* stripHit1D = dynamic_cast<const SiStripRecHit1D*>(hit);
     if (stripHit1D) {
       return this->isOkChargeStripHit(*stripHit1D);
-    } 
+    }
   }
 
-  else if(type == typeid(SiStripMatchedRecHit2D)){  // or matched (should not occur anymore due to hit splitting since 20X)
-    const SiStripMatchedRecHit2D *matchedHit = dynamic_cast<const SiStripMatchedRecHit2D*>(hit);
-    if (matchedHit) {  
-      return (this->isOkChargeStripHit(matchedHit->monoHit())
-	      && this->isOkChargeStripHit(matchedHit->stereoHit()));
+  else if (type ==
+           typeid(SiStripMatchedRecHit2D)) {  // or matched (should not occur anymore due to hit splitting since 20X)
+    const SiStripMatchedRecHit2D* matchedHit = dynamic_cast<const SiStripMatchedRecHit2D*>(hit);
+    if (matchedHit) {
+      return (this->isOkChargeStripHit(matchedHit->monoHit()) && this->isOkChargeStripHit(matchedHit->stereoHit()));
     }
-  }
-  else if(type == typeid(ProjectedSiStripRecHit2D)){ 
+  } else if (type == typeid(ProjectedSiStripRecHit2D)) {
     // or projected (should not occur anymore due to hit splitting since 20X):
-    const ProjectedSiStripRecHit2D *projHit = dynamic_cast<const ProjectedSiStripRecHit2D*>(hit);
+    const ProjectedSiStripRecHit2D* projHit = dynamic_cast<const ProjectedSiStripRecHit2D*>(hit);
     if (projHit) {
       return this->isOkChargeStripHit(projHit->originalHit());
     }
-  }
-  else{
-    edm::LogError("AlignmentTrackSelector")<< "@SUB=isOkCharge" <<"Unknown type of a valid tracker hit in Strips "
-                                           << " SubDet = "<<id.subdetId();
+  } else {
+    edm::LogError("AlignmentTrackSelector") << "@SUB=isOkCharge"
+                                            << "Unknown type of a valid tracker hit in Strips "
+                                            << " SubDet = " << id.subdetId();
     return false;
   }
-  
-
 
   // and now? SiTrackerMultiRecHit? Not here I guess!
   // Should we throw instead?
-  edm::LogError("AlignmentTrackSelector") 
-    << "@SUB=isOkCharge" << "Unknown valid tracker hit not in pixel, subdet " << id.subdetId()
-    << ", SiTrackerMultiRecHit " << dynamic_cast<const SiTrackerMultiRecHit*>(hit)
-    << ", BaseTrackerRecHit " << dynamic_cast<const BaseTrackerRecHit*>(hit); 
-  
-  return true;
-} 
+  edm::LogError("AlignmentTrackSelector") << "@SUB=isOkCharge"
+                                          << "Unknown valid tracker hit not in pixel, subdet " << id.subdetId()
+                                          << ", SiTrackerMultiRecHit " << dynamic_cast<const SiTrackerMultiRecHit*>(hit)
+                                          << ", BaseTrackerRecHit " << dynamic_cast<const BaseTrackerRecHit*>(hit);
 
+  return true;
+}
 
 //-----------------------------------------------------------------------------
 
-bool AlignmentTrackSelector::isOkChargeStripHit(const SiStripRecHit2D & siStripRecHit2D) const
-{
+bool AlignmentTrackSelector::isOkChargeStripHit(const SiStripRecHit2D& siStripRecHit2D) const {
   double charge = 0.;
 
   SiStripRecHit2D::ClusterRef cluster(siStripRecHit2D.cluster());
-  const auto &amplitudes = cluster->amplitudes();
+  const auto& amplitudes = cluster->amplitudes();
 
   for (size_t ia = 0; ia < amplitudes.size(); ++ia) {
     charge += amplitudes[ia];
@@ -599,12 +585,11 @@ bool AlignmentTrackSelector::isOkChargeStripHit(const SiStripRecHit2D & siStripR
 
 //-----------------------------------------------------------------------------
 
-bool AlignmentTrackSelector::isOkChargeStripHit(const SiStripRecHit1D & siStripRecHit1D) const
-{
+bool AlignmentTrackSelector::isOkChargeStripHit(const SiStripRecHit1D& siStripRecHit1D) const {
   double charge = 0.;
 
   SiStripRecHit1D::ClusterRef cluster(siStripRecHit1D.cluster());
-  const auto &amplitudes = cluster->amplitudes();
+  const auto& amplitudes = cluster->amplitudes();
 
   for (size_t ia = 0; ia < amplitudes.size(); ++ia) {
     charge += amplitudes[ia];
@@ -615,8 +600,7 @@ bool AlignmentTrackSelector::isOkChargeStripHit(const SiStripRecHit1D & siStripR
 
 //-----------------------------------------------------------------------------
 
-bool AlignmentTrackSelector::isIsolated(const TrackingRecHit* hit, const edm::Event& evt) const
-{
+bool AlignmentTrackSelector::isIsolated(const TrackingRecHit* hit, const edm::Event& evt) const {
   // FIXME:
   // adapt to changes after introduction of SiStripRecHit1D...
   //
@@ -624,56 +608,60 @@ bool AlignmentTrackSelector::isIsolated(const TrackingRecHit* hit, const edm::Ev
   edm::Handle<SiStripRecHit2DCollection> rphirecHits;
   edm::Handle<SiStripMatchedRecHit2DCollection> matchedrecHits;
   // es.get<TrackerDigiGeometryRecord>().get(tracker);
-  evt.getByToken( rphirecHitsToken_, rphirecHits );
-  evt.getByToken( matchedrecHitsToken_, matchedrecHits );
+  evt.getByToken(rphirecHitsToken_, rphirecHits);
+  evt.getByToken(matchedrecHitsToken_, matchedrecHits);
 
-  SiStripRecHit2DCollection::DataContainer::const_iterator istripSt; 
-  SiStripMatchedRecHit2DCollection::DataContainer::const_iterator istripStm; 
+  SiStripRecHit2DCollection::DataContainer::const_iterator istripSt;
+  SiStripMatchedRecHit2DCollection::DataContainer::const_iterator istripStm;
   const SiStripRecHit2DCollection::DataContainer& stripcollSt = rphirecHits->data();
   const SiStripMatchedRecHit2DCollection::DataContainer& stripcollStm = matchedrecHits->data();
-  
-  DetId idet = hit->geographicalId(); 
-  
-  // FIXME: instead of looping the full hit collection, we should explore the features of 
+
+  DetId idet = hit->geographicalId();
+
+  // FIXME: instead of looping the full hit collection, we should explore the features of
   // SiStripRecHit2DCollection::rangeRphi = rphirecHits.get(idet) and loop
   // only from rangeRphi.first until rangeRphi.second
-  for( istripSt=stripcollSt.begin(); istripSt!=stripcollSt.end(); ++istripSt ) {
-    const SiStripRecHit2D *aHit = &*(istripSt);
-    DetId mydet1 = aHit->geographicalId(); 
-    if (idet.rawId() != mydet1.rawId()) continue; 
-    float theDistance = ( hit->localPosition() - aHit->localPosition() ).mag();
+  for (istripSt = stripcollSt.begin(); istripSt != stripcollSt.end(); ++istripSt) {
+    const SiStripRecHit2D* aHit = &*(istripSt);
+    DetId mydet1 = aHit->geographicalId();
+    if (idet.rawId() != mydet1.rawId())
+      continue;
+    float theDistance = (hit->localPosition() - aHit->localPosition()).mag();
     // std::cout << "theDistance1 = " << theDistance << "\n";
-    if (theDistance > 0.001 && theDistance < minHitIsolation_) return false;
+    if (theDistance > 0.001 && theDistance < minHitIsolation_)
+      return false;
   }
-  
+
   // FIXME: see above
-  for( istripStm=stripcollStm.begin(); istripStm!=stripcollStm.end(); ++istripStm ) {
-    const SiStripMatchedRecHit2D *aHit = &*(istripStm);
-    DetId mydet2 = aHit->geographicalId(); 
-    if (idet.rawId() != mydet2.rawId()) continue;
+  for (istripStm = stripcollStm.begin(); istripStm != stripcollStm.end(); ++istripStm) {
+    const SiStripMatchedRecHit2D* aHit = &*(istripStm);
+    DetId mydet2 = aHit->geographicalId();
+    if (idet.rawId() != mydet2.rawId())
+      continue;
     float theDistance = (hit->localPosition() - aHit->localPosition()).mag();
     // std::cout << "theDistance1 = " << theDistance << "\n";
-    if (theDistance > 0.001 && theDistance < minHitIsolation_) return false;
+    if (theDistance > 0.001 && theDistance < minHitIsolation_)
+      return false;
   }
   return true;
 }
 
 //-----------------------------------------------------------------------------
 
-AlignmentTrackSelector::Tracks 
-AlignmentTrackSelector::theNHighestPtTracks(const Tracks& tracks) const
-{
-  Tracks sortedTracks=tracks;
+AlignmentTrackSelector::Tracks AlignmentTrackSelector::theNHighestPtTracks(const Tracks& tracks) const {
+  Tracks sortedTracks = tracks;
   Tracks result;
 
   // sort in pt
-  std::sort(sortedTracks.begin(),sortedTracks.end(),ptComparator);
+  std::sort(sortedTracks.begin(), sortedTracks.end(), ptComparator);
 
   // copy theTrackMult highest pt tracks to result vector
-  int n=0;
-  for (Tracks::const_iterator it=sortedTracks.begin();
-	   it!=sortedTracks.end(); ++it) {
-	if (n<nHighestPt_) { result.push_back(*it); n++; }
+  int n = 0;
+  for (Tracks::const_iterator it = sortedTracks.begin(); it != sortedTracks.end(); ++it) {
+    if (n < nHighestPt_) {
+      result.push_back(*it);
+      n++;
+    }
   }
 
   return result;
@@ -681,101 +669,99 @@ AlignmentTrackSelector::theNHighestPtTracks(const Tracks& tracks) const
 
 //---------
 
-AlignmentTrackSelector::Tracks 
-AlignmentTrackSelector::checkPrescaledHits(const Tracks& tracks, const edm::Event& evt) const 
-{
+AlignmentTrackSelector::Tracks AlignmentTrackSelector::checkPrescaledHits(const Tracks& tracks,
+                                                                          const edm::Event& evt) const {
   Tracks result;
 
   //take Cluster-Flag Assomap
   edm::Handle<AliClusterValueMap> fMap;
-  evt.getByToken( clusterValueMapToken_, fMap);
-  const AliClusterValueMap &flagMap=*fMap;
+  evt.getByToken(clusterValueMapToken_, fMap);
+  const AliClusterValueMap& flagMap = *fMap;
 
   //for each track loop on hits and count the number of taken hits
-  for(auto const& trackp : tracks) {
-    int ntakenhits=0;
+  for (auto const& trackp : tracks) {
+    int ntakenhits = 0;
     //    float pt=trackp->pt();
 
-    for(auto const& hit : trackp->recHits()) {
-      if(! hit->isValid())continue;
+    for (auto const& hit : trackp->recHits()) {
+      if (!hit->isValid())
+        continue;
       DetId detid = hit->geographicalId();
       int subDet = detid.subdetId();
       AlignmentClusterFlag flag;
 
-      bool isPixelHit=(subDet == kFPIX || subDet == kBPIX);
-
-      if (!isPixelHit){
-	const std::type_info &type = typeid(*hit);
-
-	if (type == typeid(SiStripRecHit2D)) {	
-	  const SiStripRecHit2D* striphit=dynamic_cast<const  SiStripRecHit2D*>(hit); 
-	  if(striphit!=nullptr){
-	    SiStripRecHit2D::ClusterRef stripclust(striphit->cluster());
-	    flag = flagMap[stripclust];
-	  }
-	}
-	else if(type == typeid(SiStripRecHit1D)){
-	  const SiStripRecHit1D* striphit = dynamic_cast<const SiStripRecHit1D*>(hit);
-	  if(striphit!=nullptr){
-	    SiStripRecHit1D::ClusterRef stripclust(striphit->cluster());
-	    flag = flagMap[stripclust];
-	  }
-	} 
-	else{
-	   edm::LogError("AlignmentTrackSelector")<<"ERROR in <AlignmentTrackSelector::checkPrescaledHits>: Dynamic cast of Strip RecHit failed!"
-						  <<" Skipping this hit.";
-	   continue;
-	}
-
-	  
-
-      }//end if hit in Strips
-      else{ // test explicitely BPIX/FPIX
-	const SiPixelRecHit* pixelhit= dynamic_cast<const SiPixelRecHit*>(hit);
-	if(pixelhit!=nullptr){
-	  SiPixelRecHit::ClusterRef pixclust(pixelhit->cluster());
-	  flag = flagMap[pixclust];
-	}
-	else{
-	    edm::LogError("AlignmentTrackSelector")<<"ERROR in <AlignmentTrackSelector::checkPrescaledHits>: Dynamic cast of Pixel RecHit failed!  ";
-	}
-      }//end else hit is in Pixel
-      
-      if(flag.isTaken())ntakenhits++;
-
-    }//end loop on hits
-    if(ntakenhits >= minPrescaledHits_)result.push_back(trackp);
-  }//end loop on tracks
+      bool isPixelHit = (subDet == kFPIX || subDet == kBPIX);
+
+      if (!isPixelHit) {
+        const std::type_info& type = typeid(*hit);
+
+        if (type == typeid(SiStripRecHit2D)) {
+          const SiStripRecHit2D* striphit = dynamic_cast<const SiStripRecHit2D*>(hit);
+          if (striphit != nullptr) {
+            SiStripRecHit2D::ClusterRef stripclust(striphit->cluster());
+            flag = flagMap[stripclust];
+          }
+        } else if (type == typeid(SiStripRecHit1D)) {
+          const SiStripRecHit1D* striphit = dynamic_cast<const SiStripRecHit1D*>(hit);
+          if (striphit != nullptr) {
+            SiStripRecHit1D::ClusterRef stripclust(striphit->cluster());
+            flag = flagMap[stripclust];
+          }
+        } else {
+          edm::LogError("AlignmentTrackSelector")
+              << "ERROR in <AlignmentTrackSelector::checkPrescaledHits>: Dynamic cast of Strip RecHit failed!"
+              << " Skipping this hit.";
+          continue;
+        }
+
+      }       //end if hit in Strips
+      else {  // test explicitely BPIX/FPIX
+        const SiPixelRecHit* pixelhit = dynamic_cast<const SiPixelRecHit*>(hit);
+        if (pixelhit != nullptr) {
+          SiPixelRecHit::ClusterRef pixclust(pixelhit->cluster());
+          flag = flagMap[pixclust];
+        } else {
+          edm::LogError("AlignmentTrackSelector")
+              << "ERROR in <AlignmentTrackSelector::checkPrescaledHits>: Dynamic cast of Pixel RecHit failed!  ";
+        }
+      }  //end else hit is in Pixel
+
+      if (flag.isTaken())
+        ntakenhits++;
+
+    }  //end loop on hits
+    if (ntakenhits >= minPrescaledHits_)
+      result.push_back(trackp);
+  }  //end loop on tracks
 
   return result;
-}//end checkPrescaledHits
+}  //end checkPrescaledHits
 
 //-----------------------------------------------------------------
 
-bool AlignmentTrackSelector::isOkTrkQuality(const reco::Track* track) const
-{
-  bool qualityOk=false;
-  bool iterStepOk=false;
+bool AlignmentTrackSelector::isOkTrkQuality(const reco::Track* track) const {
+  bool qualityOk = false;
+  bool iterStepOk = false;
 
   //check iterative step
-  if(applyIterStepCheck_){
+  if (applyIterStepCheck_) {
     for (unsigned int i = 0; i < trkSteps_.size(); ++i) {
-      if (track->algo()==(trkSteps_[i])) {
-	iterStepOk=true;
+      if (track->algo() == (trkSteps_[i])) {
+        iterStepOk = true;
       }
     }
-  }
-  else iterStepOk=true;
+  } else
+    iterStepOk = true;
 
   //check track quality
-  if(applyTrkQualityCheck_){
+  if (applyTrkQualityCheck_) {
     for (unsigned int i = 0; i < trkQualities_.size(); ++i) {
       if (track->quality(trkQualities_[i])) {
-	qualityOk=true;
+        qualityOk = true;
       }
     }
-  }
-  else 	qualityOk=true;
+  } else
+    qualityOk = true;
 
-  return qualityOk&&iterStepOk;
-}//end check on track quality
+  return qualityOk && iterStepOk;
+}  //end check on track quality
diff --git a/Alignment/CommonAlignmentProducer/src/AlignmentTwoBoyDecayTrackSelector.cc b/Alignment/CommonAlignmentProducer/src/AlignmentTwoBoyDecayTrackSelector.cc
index 40c34147022d8..ce828ff96d910 100644
--- a/Alignment/CommonAlignmentProducer/src/AlignmentTwoBoyDecayTrackSelector.cc
+++ b/Alignment/CommonAlignmentProducer/src/AlignmentTwoBoyDecayTrackSelector.cc
@@ -18,77 +18,73 @@
 #include "Alignment/CommonAlignmentProducer/interface/AlignmentTwoBodyDecayTrackSelector.h"
 //TODO put those namespaces into functions?
 using namespace std;
-using namespace edm; 
+using namespace edm;
 // constructor ----------------------------------------------------------------
 
-AlignmentTwoBodyDecayTrackSelector::AlignmentTwoBodyDecayTrackSelector(const edm::ParameterSet & cfg, edm::ConsumesCollector& iC)
-{
- LogDebug("Alignment")   << "> applying two body decay Trackfilter ...";
-  theMassrangeSwitch = cfg.getParameter<bool>( "applyMassrangeFilter" );
-  if (theMassrangeSwitch){
-    theMinMass = cfg.getParameter<double>( "minXMass" );
-    theMaxMass = cfg.getParameter<double>( "maxXMass" );
-    theDaughterMass = cfg.getParameter<double>( "daughterMass" );
-    theCandNumber = cfg.getParameter<unsigned int>( "numberOfCandidates" );//Number of candidates to keep
-    secThrBool = cfg.getParameter<bool> ( "applySecThreshold" );
-    thesecThr = cfg.getParameter<double>( "secondThreshold" );
-    LogDebug("Alignment") << ">  Massrange min,max         :   " << theMinMass   << "," << theMaxMass 
-			 << "\n>  Mass of daughter Particle :   " << theDaughterMass;
-
-  }else{
+AlignmentTwoBodyDecayTrackSelector::AlignmentTwoBodyDecayTrackSelector(const edm::ParameterSet& cfg,
+                                                                       edm::ConsumesCollector& iC) {
+  LogDebug("Alignment") << "> applying two body decay Trackfilter ...";
+  theMassrangeSwitch = cfg.getParameter<bool>("applyMassrangeFilter");
+  if (theMassrangeSwitch) {
+    theMinMass = cfg.getParameter<double>("minXMass");
+    theMaxMass = cfg.getParameter<double>("maxXMass");
+    theDaughterMass = cfg.getParameter<double>("daughterMass");
+    theCandNumber = cfg.getParameter<unsigned int>("numberOfCandidates");  //Number of candidates to keep
+    secThrBool = cfg.getParameter<bool>("applySecThreshold");
+    thesecThr = cfg.getParameter<double>("secondThreshold");
+    LogDebug("Alignment") << ">  Massrange min,max         :   " << theMinMass << "," << theMaxMass
+                          << "\n>  Mass of daughter Particle :   " << theDaughterMass;
+
+  } else {
     theMinMass = 0;
     theMaxMass = 0;
     theDaughterMass = 0;
   }
-  theChargeSwitch = cfg.getParameter<bool>( "applyChargeFilter" );
-  if(theChargeSwitch){
-    theCharge = cfg.getParameter<int>( "charge" );
-    theUnsignedSwitch = cfg.getParameter<bool>( "useUnsignedCharge" );
-    if(theUnsignedSwitch) 
-      theCharge=std::abs(theCharge);
-    LogDebug("Alignment") << ">  Desired Charge, unsigned: "<<theCharge<<" , "<<theUnsignedSwitch;
-  }else{
-    theCharge =0;
+  theChargeSwitch = cfg.getParameter<bool>("applyChargeFilter");
+  if (theChargeSwitch) {
+    theCharge = cfg.getParameter<int>("charge");
+    theUnsignedSwitch = cfg.getParameter<bool>("useUnsignedCharge");
+    if (theUnsignedSwitch)
+      theCharge = std::abs(theCharge);
+    LogDebug("Alignment") << ">  Desired Charge, unsigned: " << theCharge << " , " << theUnsignedSwitch;
+  } else {
+    theCharge = 0;
     theUnsignedSwitch = true;
   }
-  theMissingETSwitch = cfg.getParameter<bool>( "applyMissingETFilter" );
-  if(theMissingETSwitch){
-    edm::InputTag theMissingETSource = cfg.getParameter<InputTag>( "missingETSource" );
+  theMissingETSwitch = cfg.getParameter<bool>("applyMissingETFilter");
+  if (theMissingETSwitch) {
+    edm::InputTag theMissingETSource = cfg.getParameter<InputTag>("missingETSource");
     theMissingETToken = iC.consumes<reco::CaloMETCollection>(theMissingETSource);
-    LogDebug("Alignment") << ">  missing Et Source: "<< theMissingETSource;
+    LogDebug("Alignment") << ">  missing Et Source: " << theMissingETSource;
   }
-  theAcoplanarityFilterSwitch = cfg.getParameter<bool>( "applyAcoplanarityFilter" );
-  if(theAcoplanarityFilterSwitch){
-    theAcoplanarDistance = cfg.getParameter<double>( "acoplanarDistance" );
-    LogDebug("Alignment") << ">  Acoplanar Distance: "<<theAcoplanarDistance;
+  theAcoplanarityFilterSwitch = cfg.getParameter<bool>("applyAcoplanarityFilter");
+  if (theAcoplanarityFilterSwitch) {
+    theAcoplanarDistance = cfg.getParameter<double>("acoplanarDistance");
+    LogDebug("Alignment") << ">  Acoplanar Distance: " << theAcoplanarDistance;
   }
-  
 }
 
 // destructor -----------------------------------------------------------------
 
-AlignmentTwoBodyDecayTrackSelector::~AlignmentTwoBodyDecayTrackSelector()
-{}
-
+AlignmentTwoBodyDecayTrackSelector::~AlignmentTwoBodyDecayTrackSelector() {}
 
 ///returns if any of the Filters is used.
-bool AlignmentTwoBodyDecayTrackSelector::useThisFilter()
-{
+bool AlignmentTwoBodyDecayTrackSelector::useThisFilter() {
   return theMassrangeSwitch || theChargeSwitch || theAcoplanarityFilterSwitch;
 }
 
 // do selection ---------------------------------------------------------------
 
-AlignmentTwoBodyDecayTrackSelector::Tracks 
-AlignmentTwoBodyDecayTrackSelector::select(const Tracks& tracks, const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+AlignmentTwoBodyDecayTrackSelector::Tracks AlignmentTwoBodyDecayTrackSelector::select(const Tracks& tracks,
+                                                                                      const edm::Event& iEvent,
+                                                                                      const edm::EventSetup& iSetup) {
   Tracks result = tracks;
 
-  if (theMassrangeSwitch) {  
+  if (theMassrangeSwitch) {
     if (theMissingETSwitch)
-      result = checkMETMass(result,iEvent); 
+      result = checkMETMass(result, iEvent);
     else
-      result = checkMass(result); 
+      result = checkMass(result);
   }
 
   LogDebug("Alignment") << ">  TwoBodyDecay tracks all,kept: " << tracks.size() << "," << result.size();
@@ -96,76 +92,71 @@ AlignmentTwoBodyDecayTrackSelector::select(const Tracks& tracks, const edm::Even
 }
 
 ///checks if the mass of the X is in the mass region
-AlignmentTwoBodyDecayTrackSelector::Tracks 
-AlignmentTwoBodyDecayTrackSelector::checkMass(const Tracks& cands) const
-{
+AlignmentTwoBodyDecayTrackSelector::Tracks AlignmentTwoBodyDecayTrackSelector::checkMass(const Tracks& cands) const {
   Tracks result;
-  
-  LogDebug("Alignment") <<">  cands size : "<< cands.size();
-  
-  if (cands.size()<2) return result;
+
+  LogDebug("Alignment") << ">  cands size : " << cands.size();
+
+  if (cands.size() < 2)
+    return result;
 
   TLorentzVector track0;
   TLorentzVector track1;
   TLorentzVector mother;
-  typedef pair<const reco::Track*,const reco::Track*> constTrackPair;
-  typedef pair<double,constTrackPair> candCollectionItem;
+  typedef pair<const reco::Track*, const reco::Track*> constTrackPair;
+  typedef pair<double, constTrackPair> candCollectionItem;
   vector<candCollectionItem> candCollection;
-  
+
   for (unsigned int iCand = 0; iCand < cands.size(); iCand++) {
-    
     track0.SetXYZT(cands.at(iCand)->px(),
-		   cands.at(iCand)->py(),
-		   cands.at(iCand)->pz(),
-		   sqrt( cands.at(iCand)->p()*cands.at(iCand)->p() + theDaughterMass*theDaughterMass ));
-    
-    for (unsigned int jCand = iCand+1; jCand < cands.size(); jCand++) {
+                   cands.at(iCand)->py(),
+                   cands.at(iCand)->pz(),
+                   sqrt(cands.at(iCand)->p() * cands.at(iCand)->p() + theDaughterMass * theDaughterMass));
 
+    for (unsigned int jCand = iCand + 1; jCand < cands.size(); jCand++) {
       track1.SetXYZT(cands.at(jCand)->px(),
-		     cands.at(jCand)->py(),
-		     cands.at(jCand)->pz(),
-		     sqrt( cands.at(jCand)->p()*cands.at(jCand)->p() + theDaughterMass*theDaughterMass ));
-      if (secThrBool==true && track1.Pt() < thesecThr && track0.Pt()< thesecThr) continue;          
+                     cands.at(jCand)->py(),
+                     cands.at(jCand)->pz(),
+                     sqrt(cands.at(jCand)->p() * cands.at(jCand)->p() + theDaughterMass * theDaughterMass));
+      if (secThrBool == true && track1.Pt() < thesecThr && track0.Pt() < thesecThr)
+        continue;
       mother = track0 + track1;
-      
-      const reco::Track *trk1 = cands.at(iCand);
-      const reco::Track *trk2 = cands.at(jCand);
+
+      const reco::Track* trk1 = cands.at(iCand);
+      const reco::Track* trk2 = cands.at(jCand);
 
       bool correctCharge = true;
-      if (theChargeSwitch) correctCharge = this->checkCharge(trk1, trk2);
+      if (theChargeSwitch)
+        correctCharge = this->checkCharge(trk1, trk2);
 
       bool acoplanarTracks = true;
-      if (theAcoplanarityFilterSwitch) acoplanarTracks = this->checkAcoplanarity(trk1, trk2);
-
-      if (mother.M() > theMinMass &&
-	  mother.M() < theMaxMass &&
-	  correctCharge &&
-	  acoplanarTracks) {
-	candCollection.push_back(candCollectionItem(mother.Pt(),
-						    constTrackPair(trk1, trk2)));
+      if (theAcoplanarityFilterSwitch)
+        acoplanarTracks = this->checkAcoplanarity(trk1, trk2);
+
+      if (mother.M() > theMinMass && mother.M() < theMaxMass && correctCharge && acoplanarTracks) {
+        candCollection.push_back(candCollectionItem(mother.Pt(), constTrackPair(trk1, trk2)));
       }
     }
   }
 
-  if (candCollection.empty()) return result;
+  if (candCollection.empty())
+    return result;
 
-  sort(candCollection.begin(), candCollection.end(), [](auto& a, auto& b){return a.first > b.first ;});
+  sort(candCollection.begin(), candCollection.end(), [](auto& a, auto& b) { return a.first > b.first; });
+
+  std::map<const reco::Track*, unsigned int> uniqueTrackIndex;
+  std::map<const reco::Track*, unsigned int>::iterator it;
+  for (unsigned int i = 0; i < candCollection.size() && i < theCandNumber; i++) {
+    constTrackPair& trackPair = candCollection[i].second;
 
-  std::map<const reco::Track*,unsigned int> uniqueTrackIndex;
-  std::map<const reco::Track*,unsigned int>::iterator it;
-  for (unsigned int i=0;
-       i<candCollection.size() && i<theCandNumber;
-       i++) {
-    constTrackPair & trackPair = candCollection[i].second;
-    
     it = uniqueTrackIndex.find(trackPair.first);
-    if (it==uniqueTrackIndex.end()) {
+    if (it == uniqueTrackIndex.end()) {
       result.push_back(trackPair.first);
       uniqueTrackIndex[trackPair.first] = i;
     }
-    
+
     it = uniqueTrackIndex.find(trackPair.second);
-    if (it==uniqueTrackIndex.end()) {
+    if (it == uniqueTrackIndex.end()) {
       result.push_back(trackPair.second);
       uniqueTrackIndex[trackPair.second] = i;
     }
@@ -175,77 +166,68 @@ AlignmentTwoBodyDecayTrackSelector::checkMass(const Tracks& cands) const
 }
 
 ///checks if the mass of the X is in the mass region adding missing E_T
-AlignmentTwoBodyDecayTrackSelector::Tracks 
-AlignmentTwoBodyDecayTrackSelector::checkMETMass(const Tracks& cands,const edm::Event& iEvent) const
-{
+AlignmentTwoBodyDecayTrackSelector::Tracks AlignmentTwoBodyDecayTrackSelector::checkMETMass(
+    const Tracks& cands, const edm::Event& iEvent) const {
   Tracks result;
-  
-  LogDebug("Alignment") <<">  cands size : "<< cands.size();
-  
-  if (cands.empty()) return result;
+
+  LogDebug("Alignment") << ">  cands size : " << cands.size();
+
+  if (cands.empty())
+    return result;
 
   TLorentzVector track;
   TLorentzVector met4;
   TLorentzVector mother;
 
   Handle<reco::CaloMETCollection> missingET;
-  iEvent.getByToken(theMissingETToken ,missingET);
+  iEvent.getByToken(theMissingETToken, missingET);
   if (!missingET.isValid()) {
-    LogError("Alignment")<< "@SUB=AlignmentTwoBodyDecayTrackSelector::checkMETMass"
-			 << ">  could not optain missingET Collection!";
+    LogError("Alignment") << "@SUB=AlignmentTwoBodyDecayTrackSelector::checkMETMass"
+                          << ">  could not optain missingET Collection!";
     return result;
   }
 
-  typedef pair<double,const reco::Track*> candCollectionItem;
+  typedef pair<double, const reco::Track*> candCollectionItem;
   vector<candCollectionItem> candCollection;
 
-  for (reco::CaloMETCollection::const_iterator itMET = missingET->begin();
-       itMET != missingET->end();
-       ++itMET) {
-    
-    met4.SetXYZT((*itMET).px(),
-		 (*itMET).py(),
-		 (*itMET).pz(),
-		 (*itMET).p());
-  
+  for (reco::CaloMETCollection::const_iterator itMET = missingET->begin(); itMET != missingET->end(); ++itMET) {
+    met4.SetXYZT((*itMET).px(), (*itMET).py(), (*itMET).pz(), (*itMET).p());
+
     for (unsigned int iCand = 0; iCand < cands.size(); iCand++) {
-    
       track.SetXYZT(cands.at(iCand)->px(),
-		    cands.at(iCand)->py(),
-		    cands.at(iCand)->pz(),
-		    sqrt( cands.at(iCand)->p()*cands.at(iCand)->p() + theDaughterMass*theDaughterMass ));
-      
+                    cands.at(iCand)->py(),
+                    cands.at(iCand)->pz(),
+                    sqrt(cands.at(iCand)->p() * cands.at(iCand)->p() + theDaughterMass * theDaughterMass));
+
       mother = track + met4;
-      
-      const reco::Track *trk = cands.at(iCand);
-      const reco::CaloMET *met = &(*itMET);
+
+      const reco::Track* trk = cands.at(iCand);
+      const reco::CaloMET* met = &(*itMET);
 
       bool correctCharge = true;
-      if (theChargeSwitch) correctCharge = this->checkCharge(trk);
+      if (theChargeSwitch)
+        correctCharge = this->checkCharge(trk);
 
       bool acoplanarTracks = true;
-      if (theAcoplanarityFilterSwitch) acoplanarTracks = this->checkMETAcoplanarity(trk, met);
+      if (theAcoplanarityFilterSwitch)
+        acoplanarTracks = this->checkMETAcoplanarity(trk, met);
 
-      if (mother.M() > theMinMass &&
-	  mother.M() < theMaxMass &&
-	  correctCharge &&
-	  acoplanarTracks) {
-	candCollection.push_back(candCollectionItem(mother.Pt(), trk));
+      if (mother.M() > theMinMass && mother.M() < theMaxMass && correctCharge && acoplanarTracks) {
+        candCollection.push_back(candCollectionItem(mother.Pt(), trk));
       }
     }
   }
 
-  if (candCollection.empty()) return result;
+  if (candCollection.empty())
+    return result;
+
+  sort(candCollection.begin(), candCollection.end(), [](auto& a, auto& b) { return a.first > b.first; });
 
-  sort(candCollection.begin(), candCollection.end(), [](auto& a, auto& b){return a.first > b.first ;});
-  
-  std::map<const reco::Track*,unsigned int> uniqueTrackIndex;
-  std::map<const reco::Track*,unsigned int>::iterator it;
-  for (unsigned int i=0;
-       i<candCollection.size() && i<theCandNumber;
-       i++) {
+  std::map<const reco::Track*, unsigned int> uniqueTrackIndex;
+  std::map<const reco::Track*, unsigned int>::iterator it;
+  for (unsigned int i = 0; i < candCollection.size() && i < theCandNumber; i++) {
     it = uniqueTrackIndex.find(candCollection[i].second);
-    if (it==uniqueTrackIndex.end()) {
+    if (it == uniqueTrackIndex.end()) {
       result.push_back(candCollection[i].second);
       uniqueTrackIndex[candCollection[i].second] = i;
     }
@@ -255,45 +237,42 @@ AlignmentTwoBodyDecayTrackSelector::checkMETMass(const Tracks& cands,const edm::
 }
 
 ///checks if the mother has charge = [theCharge]
-bool
-AlignmentTwoBodyDecayTrackSelector::checkCharge(const reco::Track* trk1, const reco::Track* trk2)const
-{
+bool AlignmentTwoBodyDecayTrackSelector::checkCharge(const reco::Track* trk1, const reco::Track* trk2) const {
   int sumCharge = trk1->charge();
-  if (trk2) sumCharge += trk2->charge();
-  if (theUnsignedSwitch) sumCharge = std::abs(sumCharge);
-  if (sumCharge == theCharge) return true;
+  if (trk2)
+    sumCharge += trk2->charge();
+  if (theUnsignedSwitch)
+    sumCharge = std::abs(sumCharge);
+  if (sumCharge == theCharge)
+    return true;
   return false;
 }
 
 ///checks if the [cands] are acoplanar (returns empty set if not)
-bool
-AlignmentTwoBodyDecayTrackSelector::checkAcoplanarity(const reco::Track* trk1, const reco::Track* trk2)const
-{
-  if (fabs(deltaPhi(trk1->phi(),trk2->phi()-M_PI)) < theAcoplanarDistance) return true;
+bool AlignmentTwoBodyDecayTrackSelector::checkAcoplanarity(const reco::Track* trk1, const reco::Track* trk2) const {
+  if (fabs(deltaPhi(trk1->phi(), trk2->phi() - M_PI)) < theAcoplanarDistance)
+    return true;
   return false;
 }
 
 ///checks if the [cands] are acoplanar (returns empty set if not)
-bool
-AlignmentTwoBodyDecayTrackSelector::checkMETAcoplanarity(const reco::Track* trk1, const reco::CaloMET* met)const
-{
-  if (fabs(deltaPhi(trk1->phi(),met->phi()-M_PI)) < theAcoplanarDistance) return true;
+bool AlignmentTwoBodyDecayTrackSelector::checkMETAcoplanarity(const reco::Track* trk1, const reco::CaloMET* met) const {
+  if (fabs(deltaPhi(trk1->phi(), met->phi() - M_PI)) < theAcoplanarDistance)
+    return true;
   return false;
 }
 
 //===================HELPERS===================
 
 ///print Information on Track-Collection
-void AlignmentTwoBodyDecayTrackSelector::printTracks(const Tracks& col) const
-{
+void AlignmentTwoBodyDecayTrackSelector::printTracks(const Tracks& col) const {
   int count = 0;
   LogDebug("Alignment") << ">......................................";
-  for(Tracks::const_iterator it = col.begin();it < col.end();++it,++count){
-    LogDebug("Alignment") 
-      <<">  Track No. "<< count <<": p = ("<<(*it)->px()<<","<<(*it)->py()<<","<<(*it)->pz()<<")\n"
-      <<">                        pT = "<<(*it)->pt()<<" eta = "<<(*it)->eta()<<" charge = "<<(*it)->charge();    
+  for (Tracks::const_iterator it = col.begin(); it < col.end(); ++it, ++count) {
+    LogDebug("Alignment") << ">  Track No. " << count << ": p = (" << (*it)->px() << "," << (*it)->py() << ","
+                          << (*it)->pz() << ")\n"
+                          << ">                        pT = " << (*it)->pt() << " eta = " << (*it)->eta()
+                          << " charge = " << (*it)->charge();
   }
   LogDebug("Alignment") << ">......................................";
 }
-
-
diff --git a/Alignment/CommonAlignmentProducer/test/AlignmentRcdScan.cpp b/Alignment/CommonAlignmentProducer/test/AlignmentRcdScan.cpp
index 842704f29cdf6..6c4116c1d1830 100644
--- a/Alignment/CommonAlignmentProducer/test/AlignmentRcdScan.cpp
+++ b/Alignment/CommonAlignmentProducer/test/AlignmentRcdScan.cpp
@@ -26,99 +26,84 @@
 
 #include "FWCore/Framework/interface/ESWatcher.h"
 
-class AlignmentRcdScan : public edm::EDAnalyzer
-{
+class AlignmentRcdScan : public edm::EDAnalyzer {
 public:
+  enum Mode { Unknown = 0, Tk = 1, DT = 2, CSC = 3 };
 
-  enum Mode {
-    Unknown=0,
-    Tk=1,
-    DT=2,
-    CSC=3
-  };
-
-  explicit AlignmentRcdScan( const edm::ParameterSet& iConfig );
+  explicit AlignmentRcdScan(const edm::ParameterSet& iConfig);
   ~AlignmentRcdScan();
 
-  virtual void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup); 
+  virtual void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup);
 
 private:
-
-  void inspectRecord(const std::string & rcdname,
-		     const edm::Event& evt, 
-		     const edm::ESHandle<Alignments> & alignments);
+  void inspectRecord(const std::string& rcdname, const edm::Event& evt, const edm::ESHandle<Alignments>& alignments);
 
   int mode_;
   bool verbose_;
 
   edm::ESWatcher<TrackerAlignmentRcd> watchTk_;
-  edm::ESWatcher<DTAlignmentRcd>      watchDT_;
-  edm::ESWatcher<CSCAlignmentRcd>     watchCSC_;
+  edm::ESWatcher<DTAlignmentRcd> watchDT_;
+  edm::ESWatcher<CSCAlignmentRcd> watchCSC_;
 
-  Alignments *refAlignments_;
+  Alignments* refAlignments_;
 };
 
-AlignmentRcdScan::AlignmentRcdScan( const edm::ParameterSet& iConfig )
-  :verbose_(iConfig.getUntrackedParameter<bool>("verbose")),
-   refAlignments_(0)
-{
+AlignmentRcdScan::AlignmentRcdScan(const edm::ParameterSet& iConfig)
+    : verbose_(iConfig.getUntrackedParameter<bool>("verbose")), refAlignments_(0) {
   std::string modestring = iConfig.getUntrackedParameter<std::string>("mode");
-  if (modestring=="Tk") {
+  if (modestring == "Tk") {
     mode_ = Tk;
-  } else if (modestring=="DT") {
+  } else if (modestring == "DT") {
     mode_ = DT;
-  } else if (modestring=="CSC") {
+  } else if (modestring == "CSC") {
     mode_ = CSC;
   } else {
     mode_ = Unknown;
   }
 
-  if (mode_==Unknown) {
+  if (mode_ == Unknown) {
     throw cms::Exception("BadConfig") << "Mode " << modestring << " not known";
   }
 }
 
-AlignmentRcdScan::~AlignmentRcdScan()
-{
-  if (refAlignments_) delete refAlignments_;
+AlignmentRcdScan::~AlignmentRcdScan() {
+  if (refAlignments_)
+    delete refAlignments_;
 }
 
-void AlignmentRcdScan::analyze(const edm::Event& evt, const edm::EventSetup& evtSetup)
-{
-  if (mode_==Tk && watchTk_.check(evtSetup)) {
+void AlignmentRcdScan::analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) {
+  if (mode_ == Tk && watchTk_.check(evtSetup)) {
     edm::ESHandle<Alignments> alignments;
     evtSetup.get<TrackerAlignmentRcd>().get(alignments);
     inspectRecord("TrackerAlignmentRcd", evt, alignments);
   }
-  if (mode_==DT && watchDT_.check(evtSetup)) {
+  if (mode_ == DT && watchDT_.check(evtSetup)) {
     edm::ESHandle<Alignments> alignments;
-    evtSetup.get<DTAlignmentRcd>().get(alignments);  
+    evtSetup.get<DTAlignmentRcd>().get(alignments);
     inspectRecord("DTAlignmentRcd", evt, alignments);
   }
-  if (mode_==CSC && watchCSC_.check(evtSetup)) {
+  if (mode_ == CSC && watchCSC_.check(evtSetup)) {
     edm::ESHandle<Alignments> alignments;
-    evtSetup.get<CSCAlignmentRcd>().get(alignments);    
+    evtSetup.get<CSCAlignmentRcd>().get(alignments);
     inspectRecord("CSCAlignmentRcd", evt, alignments);
   }
 }
- 
-void AlignmentRcdScan::inspectRecord(const std::string & rcdname,
-				     const edm::Event& evt, 
-				     const edm::ESHandle<Alignments> & alignments)
-{
+
+void AlignmentRcdScan::inspectRecord(const std::string& rcdname,
+                                     const edm::Event& evt,
+                                     const edm::ESHandle<Alignments>& alignments) {
   std::cout << rcdname << " content starting from run " << evt.run();
-  
-  if (verbose_==false) {
+
+  if (verbose_ == false) {
     std::cout << std::endl;
     return;
   }
 
   std::cout << " with " << alignments->m_align.size() << " entries" << std::endl;
-  
-  if (refAlignments_) {
 
+  if (refAlignments_) {
     std::cout << "  Compared to previous record:" << std::endl;
-    
+
     double meanX = 0;
     double rmsX = 0;
     double meanY = 0;
@@ -130,30 +115,30 @@ void AlignmentRcdScan::inspectRecord(const std::string & rcdname,
     double dPhi;
     double meanPhi = 0;
     double rmsPhi = 0;
-    
+
     std::vector<AlignTransform>::const_iterator iref = refAlignments_->m_align.begin();
-    for (std::vector<AlignTransform>::const_iterator i = alignments->m_align.begin();
-	 i != alignments->m_align.end();
-	 ++i, ++iref) {
-      
+    for (std::vector<AlignTransform>::const_iterator i = alignments->m_align.begin(); i != alignments->m_align.end();
+         ++i, ++iref) {
       meanX += i->translation().x() - iref->translation().x();
       rmsX += pow(i->translation().x() - iref->translation().x(), 2);
- 
+
       meanY += i->translation().y() - iref->translation().y();
       rmsY += pow(i->translation().y() - iref->translation().y(), 2);
-      
+
       meanZ += i->translation().z() - iref->translation().z();
       rmsZ += pow(i->translation().z() - iref->translation().z(), 2);
-      
+
       meanR += i->translation().perp() - iref->translation().perp();
       rmsR += pow(i->translation().perp() - iref->translation().perp(), 2);
 
       dPhi = i->translation().phi() - iref->translation().phi();
-      if (dPhi>TMath::Pi()) dPhi -= 2.0*TMath::Pi();
-      if (dPhi<-TMath::Pi()) dPhi += 2.0*TMath::Pi();
+      if (dPhi > TMath::Pi())
+        dPhi -= 2.0 * TMath::Pi();
+      if (dPhi < -TMath::Pi())
+        dPhi += 2.0 * TMath::Pi();
 
       meanPhi += dPhi;
-      rmsPhi += dPhi*dPhi;
+      rmsPhi += dPhi * dPhi;
     }
 
     meanX /= alignments->m_align.size();
@@ -166,23 +151,18 @@ void AlignmentRcdScan::inspectRecord(const std::string & rcdname,
     rmsR /= alignments->m_align.size();
     meanPhi /= alignments->m_align.size();
     rmsPhi /= alignments->m_align.size();
-    
-    std::cout << "    mean X shift:   " 
-	      << std::setw(12) << std::scientific << std::setprecision(3) << meanX
-	      << " (RMS = " << sqrt(rmsX) << ")" << std::endl;
-    std::cout << "    mean Y shift:   " 
-	      << std::setw(12) << std::scientific << std::setprecision(3) << meanY
-	      << " (RMS = " << sqrt(rmsY) << ")" << std::endl;
-    std::cout << "    mean Z shift:   " 
-	      << std::setw(12) << std::scientific << std::setprecision(3) << meanZ
-	      << " (RMS = " << sqrt(rmsZ) << ")" << std::endl;
-    std::cout << "    mean R shift:   " 
-	      << std::setw(12) << std::scientific << std::setprecision(3) << meanR
-	      << " (RMS = " << sqrt(rmsR) << ")" << std::endl;
-    std::cout << "    mean Phi shift: " 
-	      << std::setw(12) << std::scientific << std::setprecision(3) << meanPhi
-	      << " (RMS = " << sqrt(rmsPhi) << ")" << std::endl;
-    
+
+    std::cout << "    mean X shift:   " << std::setw(12) << std::scientific << std::setprecision(3) << meanX
+              << " (RMS = " << sqrt(rmsX) << ")" << std::endl;
+    std::cout << "    mean Y shift:   " << std::setw(12) << std::scientific << std::setprecision(3) << meanY
+              << " (RMS = " << sqrt(rmsY) << ")" << std::endl;
+    std::cout << "    mean Z shift:   " << std::setw(12) << std::scientific << std::setprecision(3) << meanZ
+              << " (RMS = " << sqrt(rmsZ) << ")" << std::endl;
+    std::cout << "    mean R shift:   " << std::setw(12) << std::scientific << std::setprecision(3) << meanR
+              << " (RMS = " << sqrt(rmsR) << ")" << std::endl;
+    std::cout << "    mean Phi shift: " << std::setw(12) << std::scientific << std::setprecision(3) << meanPhi
+              << " (RMS = " << sqrt(rmsPhi) << ")" << std::endl;
+
     delete refAlignments_;
   }
 
diff --git a/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdRead.cpp b/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdRead.cpp
index 21fd616607124..49d294153fbe3 100644
--- a/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdRead.cpp
+++ b/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdRead.cpp
@@ -11,48 +11,40 @@
 #include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h"
 #include "DataFormats/DetId/interface/DetId.h"
 
-class  GlobalPositionRcdRead : public edm::EDAnalyzer
-{
+class GlobalPositionRcdRead : public edm::EDAnalyzer {
 public:
-  explicit GlobalPositionRcdRead( const edm::ParameterSet& iConfig )
-    : nEventCalls_(0)
-  {}
+  explicit GlobalPositionRcdRead(const edm::ParameterSet& iConfig) : nEventCalls_(0) {}
   ~GlobalPositionRcdRead() {}
-  virtual void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup); 
-  
-private:
+  virtual void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup);
 
+private:
   unsigned int nEventCalls_;
 };
 
-void GlobalPositionRcdRead::analyze(const edm::Event& evt, const edm::EventSetup& evtSetup)
-{
-  if (nEventCalls_>0) {
+void GlobalPositionRcdRead::analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) {
+  if (nEventCalls_ > 0) {
     std::cout << "Reading from DB to be done only once, "
-	      << "set 'untracked PSet maxEvents = {untracked int32 input = 1}'." << std::endl;
- 
+              << "set 'untracked PSet maxEvents = {untracked int32 input = 1}'." << std::endl;
+
     return;
   }
 
   std::cout << "Reading from database in GlobalPositionRcdRead::analyze..." << std::endl;
-  
+
   edm::ESHandle<Alignments> globalPositionRcd;
   evtSetup.get<GlobalPositionRcd>().get(globalPositionRcd);
-  
-  std::cout << "Expecting entries in " 
-	    << DetId(DetId::Tracker).rawId() << " " 
-	    << DetId(DetId::Muon).rawId() << " " 
-	    << DetId(DetId::Ecal).rawId() << " " 
-	    << DetId(DetId::Hcal).rawId() << " " 
-	    << DetId(DetId::Calo).rawId() << std::endl;
+
+  std::cout << "Expecting entries in " << DetId(DetId::Tracker).rawId() << " " << DetId(DetId::Muon).rawId() << " "
+            << DetId(DetId::Ecal).rawId() << " " << DetId(DetId::Hcal).rawId() << " " << DetId(DetId::Calo).rawId()
+            << std::endl;
   for (std::vector<AlignTransform>::const_iterator i = globalPositionRcd->m_align.begin();
-       i != globalPositionRcd->m_align.end();  ++i) {
-    std::cout << "entry " << i->rawId() 
-	      << " translation " << i->translation() 
-	      << " angles " << i->rotation().eulerAngles() << std::endl;
+       i != globalPositionRcd->m_align.end();
+       ++i) {
+    std::cout << "entry " << i->rawId() << " translation " << i->translation() << " angles "
+              << i->rotation().eulerAngles() << std::endl;
     std::cout << i->rotation() << std::endl;
   }
-  
+
   std::cout << "done!" << std::endl;
   nEventCalls_++;
 }
diff --git a/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdScan.cpp b/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdScan.cpp
index df33594204a1e..6ede80231d3ae 100644
--- a/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdScan.cpp
+++ b/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdScan.cpp
@@ -16,17 +16,15 @@
 
 #include "Alignment/CommonAlignment/interface/Utilities.h"
 
-class  GlobalPositionRcdScan : public edm::EDAnalyzer
-{
+class GlobalPositionRcdScan : public edm::EDAnalyzer {
 public:
   explicit GlobalPositionRcdScan(const edm::ParameterSet& iConfig);
 
   virtual ~GlobalPositionRcdScan() {}
-  virtual void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup); 
+  virtual void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup);
   virtual void endJob();
 
 private:
-
   edm::ESWatcher<GlobalPositionRcd> watcher_;
 
   bool eulerAngles_;
@@ -37,88 +35,84 @@ class  GlobalPositionRcdScan : public edm::EDAnalyzer
 };
 
 GlobalPositionRcdScan::GlobalPositionRcdScan(const edm::ParameterSet& iConfig)
-  : eulerAngles_(false), alignAngles_(false), matrix_(false),
-    firstRun_(0), lastRun_(0)
-{
-
+    : eulerAngles_(false), alignAngles_(false), matrix_(false), firstRun_(0), lastRun_(0) {
   const std::string howRot(iConfig.getParameter<std::string>("rotation"));
-  
-  if (howRot == "euler"  || howRot == "all") eulerAngles_ = true;
-  if (howRot == "align"  || howRot == "all") alignAngles_ = true;
-  if (howRot == "matrix" || howRot == "all") matrix_      = true;
+
+  if (howRot == "euler" || howRot == "all")
+    eulerAngles_ = true;
+  if (howRot == "align" || howRot == "all")
+    alignAngles_ = true;
+  if (howRot == "matrix" || howRot == "all")
+    matrix_ = true;
 
   if (!eulerAngles_ && !alignAngles_ && !matrix_) {
     edm::LogError("BadConfig") << "@SUB=GlobalPositionRcdScan"
-			       << "Parameter 'rotation' should be 'euler', 'align',"
-			       << "'matrix' or 'all', but is '" << howRot
-			       << "'. Treat as 'all'.";
+                               << "Parameter 'rotation' should be 'euler', 'align',"
+                               << "'matrix' or 'all', but is '" << howRot << "'. Treat as 'all'.";
     eulerAngles_ = alignAngles_ = matrix_ = true;
   }
-
 }
 
-void GlobalPositionRcdScan::analyze(const edm::Event& evt, const edm::EventSetup& evtSetup)
-{
+void GlobalPositionRcdScan::analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) {
   lastRun_ = evt.run();
-  if (0 == firstRun_) firstRun_ = lastRun_;
+  if (0 == firstRun_)
+    firstRun_ = lastRun_;
 
   if (watcher_.check(evtSetup)) {
-  
     edm::ESHandle<Alignments> globalPositionRcd;
     evtSetup.get<GlobalPositionRcd>().get(globalPositionRcd);
 
-    std::cout << "=====================================================\n" 
-	      << "GlobalPositionRcd content starting from run " << evt.run() << ":" << std::endl;
-  
+    std::cout << "=====================================================\n"
+              << "GlobalPositionRcd content starting from run " << evt.run() << ":" << std::endl;
+
     for (std::vector<AlignTransform>::const_iterator i = globalPositionRcd->m_align.begin();
-	 i != globalPositionRcd->m_align.end();  ++i) {
+         i != globalPositionRcd->m_align.end();
+         ++i) {
       std::cout << "  Component ";
       if (i->rawId() == DetId(DetId::Tracker).rawId()) {
-	std::cout << "Tracker";
-      }
-      else if (i->rawId() == DetId(DetId::Muon).rawId()) {
-	std::cout << "Muon   ";
+        std::cout << "Tracker";
+      } else if (i->rawId() == DetId(DetId::Muon).rawId()) {
+        std::cout << "Muon   ";
+      } else if (i->rawId() == DetId(DetId::Ecal).rawId()) {
+        std::cout << "Ecal   ";
+      } else if (i->rawId() == DetId(DetId::Hcal).rawId()) {
+        std::cout << "Hcal   ";
+      } else if (i->rawId() == DetId(DetId::Calo).rawId()) {
+        std::cout << "Calo   ";
+      } else {
+        std::cout << "Unknown";
       }
-      else if (i->rawId() == DetId(DetId::Ecal).rawId()) {
-	std::cout << "Ecal   ";
-      }
-      else if (i->rawId() == DetId(DetId::Hcal).rawId()) {
-	std::cout << "Hcal   ";
-      }
-      else if (i->rawId() == DetId(DetId::Calo).rawId()) {
-	std::cout << "Calo   ";
-      }
-      else {
-	std::cout << "Unknown";
-      }
-      std::cout << " entry " << i->rawId() 
-		<< "\n     translation " << i->translation() << "\n";
+      std::cout << " entry " << i->rawId() << "\n     translation " << i->translation() << "\n";
       const AlignTransform::Rotation hepRot(i->rotation());
       if (eulerAngles_) {
-	std::cout << "     euler angles " << hepRot.eulerAngles() << std::endl;
+        std::cout << "     euler angles " << hepRot.eulerAngles() << std::endl;
       }
       if (alignAngles_) {
-	const align::RotationType matrix(hepRot.xx(), hepRot.xy(), hepRot.xz(),
-					 hepRot.yx(), hepRot.yy(), hepRot.yz(),
-					 hepRot.zx(), hepRot.zy(), hepRot.zz());
-	const AlgebraicVector angles(align::toAngles(matrix));
-	std::cout << "     alpha, beta, gamma (" << angles[0] << ", " << angles[1] << ", "
-		  << angles[2] << ')' << std::endl;
+        const align::RotationType matrix(hepRot.xx(),
+                                         hepRot.xy(),
+                                         hepRot.xz(),
+                                         hepRot.yx(),
+                                         hepRot.yy(),
+                                         hepRot.yz(),
+                                         hepRot.zx(),
+                                         hepRot.zy(),
+                                         hepRot.zz());
+        const AlgebraicVector angles(align::toAngles(matrix));
+        std::cout << "     alpha, beta, gamma (" << angles[0] << ", " << angles[1] << ", " << angles[2] << ')'
+                  << std::endl;
       }
       if (matrix_) {
-	std::cout << "     rotation matrix " << hepRot << std::endl;
+        std::cout << "     rotation matrix " << hepRot << std::endl;
       }
     }
   }
 }
 
-void GlobalPositionRcdScan::endJob()
-{
-  std::cout << "\n=====================================================\n" 
-	    << "=====================================================\n" 
-	    << "Checked run range " << firstRun_ << " to " << lastRun_ << "." << std::endl;
+void GlobalPositionRcdScan::endJob() {
+  std::cout << "\n=====================================================\n"
+            << "=====================================================\n"
+            << "Checked run range " << firstRun_ << " to " << lastRun_ << "." << std::endl;
 }
 
-
 //define this as a plug-in
 DEFINE_FWK_MODULE(GlobalPositionRcdScan);
diff --git a/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdWrite.cpp b/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdWrite.cpp
index 7af926960b6ba..d34780d0b9285 100644
--- a/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdWrite.cpp
+++ b/Alignment/CommonAlignmentProducer/test/GlobalPositionRcdWrite.cpp
@@ -21,22 +21,20 @@
 #include "CondFormats/Alignment/interface/AlignTransform.h"
 #include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h"
 
-class  GlobalPositionRcdWrite : public edm::EDAnalyzer {
-   public:
-      explicit  GlobalPositionRcdWrite(const edm::ParameterSet& iConfig)
-	 : m_useEulerAngles(iConfig.getParameter<bool>("useEulerAngles"))
-	 , m_tracker(iConfig.getParameter<edm::ParameterSet>("tracker"))
-         , m_muon(iConfig.getParameter<edm::ParameterSet>("muon"))
-         , m_ecal(iConfig.getParameter<edm::ParameterSet>("ecal"))
-         , m_hcal(iConfig.getParameter<edm::ParameterSet>("hcal"))
-         , m_calo(iConfig.getParameter<edm::ParameterSet>("calo"))
-	 , nEventCalls_(0)
-      {};
-      ~GlobalPositionRcdWrite() {}
+class GlobalPositionRcdWrite : public edm::EDAnalyzer {
+public:
+  explicit GlobalPositionRcdWrite(const edm::ParameterSet& iConfig)
+      : m_useEulerAngles(iConfig.getParameter<bool>("useEulerAngles")),
+        m_tracker(iConfig.getParameter<edm::ParameterSet>("tracker")),
+        m_muon(iConfig.getParameter<edm::ParameterSet>("muon")),
+        m_ecal(iConfig.getParameter<edm::ParameterSet>("ecal")),
+        m_hcal(iConfig.getParameter<edm::ParameterSet>("hcal")),
+        m_calo(iConfig.getParameter<edm::ParameterSet>("calo")),
+        nEventCalls_(0){};
+  ~GlobalPositionRcdWrite() {}
   virtual void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup);
 
 private:
-  
   AlignTransform::Rotation toMatrix(double alpha, double beta, double gamma);
 
   bool m_useEulerAngles;
@@ -44,147 +42,140 @@ class  GlobalPositionRcdWrite : public edm::EDAnalyzer {
   unsigned int nEventCalls_;
 };
 
-AlignTransform::Rotation GlobalPositionRcdWrite::toMatrix(double alpha, double beta, double gamma)
-{
+AlignTransform::Rotation GlobalPositionRcdWrite::toMatrix(double alpha, double beta, double gamma) {
   align::EulerAngles angles(3);
   angles(1) = alpha;
   angles(2) = beta;
   angles(3) = gamma;
-  
+
   align::RotationType alignRotation = align::toMatrix(angles);
 
-  return AlignTransform::Rotation(CLHEP::HepRep3x3(alignRotation.xx(), alignRotation.xy(), alignRotation.xz(),
-						   alignRotation.yx(), alignRotation.yy(), alignRotation.yz(),
-						   alignRotation.zx(), alignRotation.zy(), alignRotation.zz()));
+  return AlignTransform::Rotation(CLHEP::HepRep3x3(alignRotation.xx(),
+                                                   alignRotation.xy(),
+                                                   alignRotation.xz(),
+                                                   alignRotation.yx(),
+                                                   alignRotation.yy(),
+                                                   alignRotation.yz(),
+                                                   alignRotation.zx(),
+                                                   alignRotation.zy(),
+                                                   alignRotation.zz()));
 }
 
-void GlobalPositionRcdWrite::analyze(const edm::Event& evt, const edm::EventSetup& iSetup)
-{
-   if (nEventCalls_ > 0) {
-     std::cout << "Writing to DB to be done only once, "
-	       << "set 'untracked PSet maxEvents = {untracked int32 input = 1}'."
-	       << "(Your writing should be fine.)" << std::endl;
-     return;
-   }
-   
-   Alignments* globalPositions = new Alignments();
-
-   AlignTransform tracker(AlignTransform::Translation(m_tracker.getParameter<double>("x"),
-						      m_tracker.getParameter<double>("y"),
-						      m_tracker.getParameter<double>("z")),
-			  (m_useEulerAngles != true) ?
-			    this->toMatrix(m_tracker.getParameter<double>("alpha"),
-					   m_tracker.getParameter<double>("beta"),
-					   m_tracker.getParameter<double>("gamma"))
-			  :
-			    AlignTransform::EulerAngles(m_tracker.getParameter<double>("alpha"),
-							m_tracker.getParameter<double>("beta"),
-							m_tracker.getParameter<double>("gamma")),
-			  DetId(DetId::Tracker).rawId());
-   
-   AlignTransform muon(AlignTransform::Translation(m_muon.getParameter<double>("x"),
-						   m_muon.getParameter<double>("y"),
-						   m_muon.getParameter<double>("z")),
-		       (m_useEulerAngles != true) ?
-		         this->toMatrix(m_muon.getParameter<double>("alpha"),
-					m_muon.getParameter<double>("beta"),
-					m_muon.getParameter<double>("gamma"))
-		       :
-		         AlignTransform::EulerAngles(m_muon.getParameter<double>("alpha"),
-						     m_muon.getParameter<double>("beta"),
-						     m_muon.getParameter<double>("gamma")),
-		       DetId(DetId::Muon).rawId());
-   
-   AlignTransform ecal(AlignTransform::Translation(m_ecal.getParameter<double>("x"),
-						   m_ecal.getParameter<double>("y"),
-						   m_ecal.getParameter<double>("z")),
-		       (m_useEulerAngles != true) ?
-		         this->toMatrix(m_ecal.getParameter<double>("alpha"),
-					m_ecal.getParameter<double>("beta"),
-					m_ecal.getParameter<double>("gamma"))
-		       :
-		         AlignTransform::EulerAngles(m_ecal.getParameter<double>("alpha"),
-						     m_ecal.getParameter<double>("beta"),
-						     m_ecal.getParameter<double>("gamma")),
-		       DetId(DetId::Ecal).rawId());
-
-   AlignTransform hcal(AlignTransform::Translation(m_hcal.getParameter<double>("x"),
-						   m_hcal.getParameter<double>("y"),
-						   m_hcal.getParameter<double>("z")),
-		       (m_useEulerAngles != true) ?
-		         this->toMatrix(m_hcal.getParameter<double>("alpha"),
-					m_hcal.getParameter<double>("beta"),
-					m_hcal.getParameter<double>("gamma"))
-		       :
-		         AlignTransform::EulerAngles(m_hcal.getParameter<double>("alpha"),
-						     m_hcal.getParameter<double>("beta"),
-						     m_hcal.getParameter<double>("gamma")),
-		       DetId(DetId::Hcal).rawId());
-
-   AlignTransform calo(AlignTransform::Translation(m_calo.getParameter<double>("x"),
-						   m_calo.getParameter<double>("y"),
-						   m_calo.getParameter<double>("z")),
-		       (m_useEulerAngles != true) ?
-		         this->toMatrix(m_calo.getParameter<double>("alpha"),
-					m_calo.getParameter<double>("beta"),
-					m_calo.getParameter<double>("gamma"))
-		       :
-		         AlignTransform::EulerAngles(m_calo.getParameter<double>("alpha"),
-						     m_calo.getParameter<double>("beta"),
-						     m_calo.getParameter<double>("gamma")),
-		       DetId(DetId::Calo).rawId());
-
-   std::cout << "\nProvided rotation angles are interpreted as "
-	     << ((m_useEulerAngles != true) ? "rotations around X, Y and Z" : "Euler angles")
-	     << ".\n" << std::endl;
-   
-   std::cout << "Tracker (" << tracker.rawId() << ") at " << tracker.translation() 
-	     << " " << tracker.rotation().eulerAngles() << std::endl;
-   std::cout << tracker.rotation() << std::endl;
-
-   std::cout << "Muon (" << muon.rawId() << ") at " << muon.translation() 
-	     << " " << muon.rotation().eulerAngles() << std::endl;
-   std::cout << muon.rotation() << std::endl;
-
-   std::cout << "Ecal (" << ecal.rawId() << ") at " << ecal.translation() 
-	     << " " << ecal.rotation().eulerAngles() << std::endl;
-   std::cout << ecal.rotation() << std::endl;
-
-   std::cout << "Hcal (" << hcal.rawId() << ") at " << hcal.translation()
-	     << " " << hcal.rotation().eulerAngles() << std::endl;
-   std::cout << hcal.rotation() << std::endl;
-
-   std::cout << "Calo (" << calo.rawId() << ") at " << calo.translation()
-	     << " " << calo.rotation().eulerAngles() << std::endl;
-   std::cout << calo.rotation() << std::endl;
-
-   globalPositions->m_align.push_back(tracker);
-   globalPositions->m_align.push_back(muon);
-   globalPositions->m_align.push_back(ecal);
-   globalPositions->m_align.push_back(hcal);
-   globalPositions->m_align.push_back(calo);
-
-   std::cout << "Uploading to the database..." << std::endl;
-
-   edm::Service<cond::service::PoolDBOutputService> poolDbService;
-
-   if (!poolDbService.isAvailable())
-      throw cms::Exception("NotAvailable") << "PoolDBOutputService not available";
-                  
-//    if (poolDbService->isNewTagRequest("GlobalPositionRcd")) {
-//       poolDbService->createNewIOV<Alignments>(&(*globalPositions), poolDbService->endOfTime(), "GlobalPositionRcd");
-//    } else {
-//       poolDbService->appendSinceTime<Alignments>(&(*globalPositions), poolDbService->currentTime(), "GlobalPositionRcd");
-//    }
-   poolDbService->writeOne<Alignments>(&(*globalPositions), 
-				       poolDbService->currentTime(),
-				       //poolDbService->beginOfTime(),
-                                       "GlobalPositionRcd");
-
-
-
-   std::cout << "done!" << std::endl;
-   nEventCalls_++;
+void GlobalPositionRcdWrite::analyze(const edm::Event& evt, const edm::EventSetup& iSetup) {
+  if (nEventCalls_ > 0) {
+    std::cout << "Writing to DB to be done only once, "
+              << "set 'untracked PSet maxEvents = {untracked int32 input = 1}'."
+              << "(Your writing should be fine.)" << std::endl;
+    return;
+  }
+
+  Alignments* globalPositions = new Alignments();
+
+  AlignTransform tracker(AlignTransform::Translation(m_tracker.getParameter<double>("x"),
+                                                     m_tracker.getParameter<double>("y"),
+                                                     m_tracker.getParameter<double>("z")),
+                         (m_useEulerAngles != true)
+                             ? this->toMatrix(m_tracker.getParameter<double>("alpha"),
+                                              m_tracker.getParameter<double>("beta"),
+                                              m_tracker.getParameter<double>("gamma"))
+                             : AlignTransform::EulerAngles(m_tracker.getParameter<double>("alpha"),
+                                                           m_tracker.getParameter<double>("beta"),
+                                                           m_tracker.getParameter<double>("gamma")),
+                         DetId(DetId::Tracker).rawId());
+
+  AlignTransform muon(
+      AlignTransform::Translation(
+          m_muon.getParameter<double>("x"), m_muon.getParameter<double>("y"), m_muon.getParameter<double>("z")),
+      (m_useEulerAngles != true) ? this->toMatrix(m_muon.getParameter<double>("alpha"),
+                                                  m_muon.getParameter<double>("beta"),
+                                                  m_muon.getParameter<double>("gamma"))
+                                 : AlignTransform::EulerAngles(m_muon.getParameter<double>("alpha"),
+                                                               m_muon.getParameter<double>("beta"),
+                                                               m_muon.getParameter<double>("gamma")),
+      DetId(DetId::Muon).rawId());
+
+  AlignTransform ecal(
+      AlignTransform::Translation(
+          m_ecal.getParameter<double>("x"), m_ecal.getParameter<double>("y"), m_ecal.getParameter<double>("z")),
+      (m_useEulerAngles != true) ? this->toMatrix(m_ecal.getParameter<double>("alpha"),
+                                                  m_ecal.getParameter<double>("beta"),
+                                                  m_ecal.getParameter<double>("gamma"))
+                                 : AlignTransform::EulerAngles(m_ecal.getParameter<double>("alpha"),
+                                                               m_ecal.getParameter<double>("beta"),
+                                                               m_ecal.getParameter<double>("gamma")),
+      DetId(DetId::Ecal).rawId());
+
+  AlignTransform hcal(
+      AlignTransform::Translation(
+          m_hcal.getParameter<double>("x"), m_hcal.getParameter<double>("y"), m_hcal.getParameter<double>("z")),
+      (m_useEulerAngles != true) ? this->toMatrix(m_hcal.getParameter<double>("alpha"),
+                                                  m_hcal.getParameter<double>("beta"),
+                                                  m_hcal.getParameter<double>("gamma"))
+                                 : AlignTransform::EulerAngles(m_hcal.getParameter<double>("alpha"),
+                                                               m_hcal.getParameter<double>("beta"),
+                                                               m_hcal.getParameter<double>("gamma")),
+      DetId(DetId::Hcal).rawId());
+
+  AlignTransform calo(
+      AlignTransform::Translation(
+          m_calo.getParameter<double>("x"), m_calo.getParameter<double>("y"), m_calo.getParameter<double>("z")),
+      (m_useEulerAngles != true) ? this->toMatrix(m_calo.getParameter<double>("alpha"),
+                                                  m_calo.getParameter<double>("beta"),
+                                                  m_calo.getParameter<double>("gamma"))
+                                 : AlignTransform::EulerAngles(m_calo.getParameter<double>("alpha"),
+                                                               m_calo.getParameter<double>("beta"),
+                                                               m_calo.getParameter<double>("gamma")),
+      DetId(DetId::Calo).rawId());
+
+  std::cout << "\nProvided rotation angles are interpreted as "
+            << ((m_useEulerAngles != true) ? "rotations around X, Y and Z" : "Euler angles") << ".\n"
+            << std::endl;
+
+  std::cout << "Tracker (" << tracker.rawId() << ") at " << tracker.translation() << " "
+            << tracker.rotation().eulerAngles() << std::endl;
+  std::cout << tracker.rotation() << std::endl;
+
+  std::cout << "Muon (" << muon.rawId() << ") at " << muon.translation() << " " << muon.rotation().eulerAngles()
+            << std::endl;
+  std::cout << muon.rotation() << std::endl;
+
+  std::cout << "Ecal (" << ecal.rawId() << ") at " << ecal.translation() << " " << ecal.rotation().eulerAngles()
+            << std::endl;
+  std::cout << ecal.rotation() << std::endl;
+
+  std::cout << "Hcal (" << hcal.rawId() << ") at " << hcal.translation() << " " << hcal.rotation().eulerAngles()
+            << std::endl;
+  std::cout << hcal.rotation() << std::endl;
+
+  std::cout << "Calo (" << calo.rawId() << ") at " << calo.translation() << " " << calo.rotation().eulerAngles()
+            << std::endl;
+  std::cout << calo.rotation() << std::endl;
+
+  globalPositions->m_align.push_back(tracker);
+  globalPositions->m_align.push_back(muon);
+  globalPositions->m_align.push_back(ecal);
+  globalPositions->m_align.push_back(hcal);
+  globalPositions->m_align.push_back(calo);
+
+  std::cout << "Uploading to the database..." << std::endl;
+
+  edm::Service<cond::service::PoolDBOutputService> poolDbService;
+
+  if (!poolDbService.isAvailable())
+    throw cms::Exception("NotAvailable") << "PoolDBOutputService not available";
+
+  //    if (poolDbService->isNewTagRequest("GlobalPositionRcd")) {
+  //       poolDbService->createNewIOV<Alignments>(&(*globalPositions), poolDbService->endOfTime(), "GlobalPositionRcd");
+  //    } else {
+  //       poolDbService->appendSinceTime<Alignments>(&(*globalPositions), poolDbService->currentTime(), "GlobalPositionRcd");
+  //    }
+  poolDbService->writeOne<Alignments>(&(*globalPositions),
+                                      poolDbService->currentTime(),
+                                      //poolDbService->beginOfTime(),
+                                      "GlobalPositionRcd");
+
+  std::cout << "done!" << std::endl;
+  nEventCalls_++;
 }
 
 //define this as a plug-in
diff --git a/Alignment/CommonAlignmentProducer/test/TestAccessGeom.cc b/Alignment/CommonAlignmentProducer/test/TestAccessGeom.cc
index 8a97f5256f03c..5f54828c5ecfa 100644
--- a/Alignment/CommonAlignmentProducer/test/TestAccessGeom.cc
+++ b/Alignment/CommonAlignmentProducer/test/TestAccessGeom.cc
@@ -2,7 +2,7 @@
 //
 // Package:    TestAccessGeom
 // Class:      TestAccessGeom
-// 
+//
 /**\class TestAccessGeom Alignment/CommonAlignmentProducer/test/TestAccessGeom.cc
 
  Description: <one line class summary>
@@ -17,7 +17,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -31,9 +30,9 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"  
-#include "Geometry/DTGeometry/interface/DTGeometry.h"  
-#include "Geometry/CSCGeometry/interface/CSCGeometry.h"  
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/DTGeometry/interface/DTGeometry.h"
+#include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
@@ -49,19 +48,18 @@
 //
 
 class TestAccessGeom : public edm::EDAnalyzer {
-   public:
-      explicit TestAccessGeom(const edm::ParameterSet&);
-      ~TestAccessGeom();
-
+public:
+  explicit TestAccessGeom(const edm::ParameterSet&);
+  ~TestAccessGeom();
 
-   private:
-      virtual void analyze(const edm::Event&, const edm::EventSetup&);
+private:
+  virtual void analyze(const edm::Event&, const edm::EventSetup&);
 
-      // ----------member data ---------------------------
+  // ----------member data ---------------------------
 
-      const std::vector<std::string> tkGeomLabels_;
-      const std::vector<std::string> dtGeomLabels_;
-      const std::vector<std::string> cscGeomLabels_;
+  const std::vector<std::string> tkGeomLabels_;
+  const std::vector<std::string> dtGeomLabels_;
+  const std::vector<std::string> cscGeomLabels_;
 };
 
 //
@@ -76,73 +74,63 @@ class TestAccessGeom : public edm::EDAnalyzer {
 // constructors and destructor
 //
 TestAccessGeom::TestAccessGeom(const edm::ParameterSet& iConfig)
-  : tkGeomLabels_(iConfig.getParameter<std::vector<std::string> >("TrackerGeomLabels")),
-    dtGeomLabels_(iConfig.getParameter<std::vector<std::string> >("DTGeomLabels")),
-    cscGeomLabels_(iConfig.getParameter<std::vector<std::string> >("CSCGeomLabels"))
-{
-   //now do what ever initialization is needed
-
+    : tkGeomLabels_(iConfig.getParameter<std::vector<std::string> >("TrackerGeomLabels")),
+      dtGeomLabels_(iConfig.getParameter<std::vector<std::string> >("DTGeomLabels")),
+      cscGeomLabels_(iConfig.getParameter<std::vector<std::string> >("CSCGeomLabels")) {
+  //now do what ever initialization is needed
 }
 
-
-TestAccessGeom::~TestAccessGeom()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+TestAccessGeom::~TestAccessGeom() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-TestAccessGeom::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-  using std::vector;
+void TestAccessGeom::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   using std::string;
+  using std::vector;
 
-  edm::LogInfo("Test") << "@SUB=analyze" << "Try to  access " << tkGeomLabels_.size() 
-		       << " Tracker-, " << dtGeomLabels_.size() << " DT- and "
-		       << cscGeomLabels_.size() << " CSC-geometries.";
+  edm::LogInfo("Test") << "@SUB=analyze"
+                       << "Try to  access " << tkGeomLabels_.size() << " Tracker-, " << dtGeomLabels_.size()
+                       << " DT- and " << cscGeomLabels_.size() << " CSC-geometries.";
 
-  for (vector<string>::const_iterator iL = tkGeomLabels_.begin(), iE = tkGeomLabels_.end();
-       iL != iE; ++iL) {
-    TString label(iL->c_str()); label.ReplaceAll(" ", ""); // fix for buggy framework
+  for (vector<string>::const_iterator iL = tkGeomLabels_.begin(), iE = tkGeomLabels_.end(); iL != iE; ++iL) {
+    TString label(iL->c_str());
+    label.ReplaceAll(" ", "");  // fix for buggy framework
     edm::LogInfo("Test") << "Try access to tracker geometry with label '" << label << "'.";
     //*iL << "'.";
     edm::ESHandle<TrackerGeometry> tkGeomHandle;
-    iSetup.get<TrackerDigiGeometryRecord>().get(label, tkGeomHandle);// *iL, tkGeomHandle);
+    iSetup.get<TrackerDigiGeometryRecord>().get(label, tkGeomHandle);  // *iL, tkGeomHandle);
     edm::LogInfo("Test") << "TrackerGeometry pointer: " << tkGeomHandle.product();
   }
 
-  for (vector<string>::const_iterator iL = dtGeomLabels_.begin(), iE = dtGeomLabels_.end();
-       iL != iE; ++iL) {
-    TString label(iL->c_str()); label.ReplaceAll(" ", ""); // fix for buggy framework
+  for (vector<string>::const_iterator iL = dtGeomLabels_.begin(), iE = dtGeomLabels_.end(); iL != iE; ++iL) {
+    TString label(iL->c_str());
+    label.ReplaceAll(" ", "");  // fix for buggy framework
     edm::LogInfo("Test") << "Try access to DT geometry with label '" << label << "'.";
     //*iL << "'.";
     edm::ESHandle<DTGeometry> dtGeomHandle;
-    iSetup.get<MuonGeometryRecord>().get(label, dtGeomHandle);//*iL, dtGeomHandle);
+    iSetup.get<MuonGeometryRecord>().get(label, dtGeomHandle);  //*iL, dtGeomHandle);
     edm::LogInfo("Test") << "DTGeometry pointer: " << dtGeomHandle.product();
   }
 
-  for (vector<string>::const_iterator iL = cscGeomLabels_.begin(), iE = cscGeomLabels_.end();
-       iL != iE; ++iL) {
-    TString label(iL->c_str()); label.ReplaceAll(" ", ""); // fix for buggy framework
+  for (vector<string>::const_iterator iL = cscGeomLabels_.begin(), iE = cscGeomLabels_.end(); iL != iE; ++iL) {
+    TString label(iL->c_str());
+    label.ReplaceAll(" ", "");  // fix for buggy framework
     edm::LogInfo("Test") << "Try access to CSC geometry with label '" << label << "'.";
     //*iL << "'.";
     edm::ESHandle<CSCGeometry> cscGeomHandle;
-    iSetup.get<MuonGeometryRecord>().get(label, cscGeomHandle); //*iL, cscGeomHandle);
+    iSetup.get<MuonGeometryRecord>().get(label, cscGeomHandle);  //*iL, cscGeomHandle);
     edm::LogInfo("Test") << "CSCGeometry pointer: " << cscGeomHandle.product();
   }
 
-
-  edm::LogInfo("Test") << "@SUB=analyze" << "Succesfully accessed " << tkGeomLabels_.size() 
-                       << " Tracker-, " << dtGeomLabels_.size() << " DT- and "
-                       << cscGeomLabels_.size() << " CSC-geometries.";
+  edm::LogInfo("Test") << "@SUB=analyze"
+                       << "Succesfully accessed " << tkGeomLabels_.size() << " Tracker-, " << dtGeomLabels_.size()
+                       << " DT- and " << cscGeomLabels_.size() << " CSC-geometries.";
 }
 
 //define this as a plug-in
diff --git a/Alignment/Geners/interface/AbsArchive.hh b/Alignment/Geners/interface/AbsArchive.hh
index 74222eb503cfa..a228fb15bd8de 100644
--- a/Alignment/Geners/interface/AbsArchive.hh
+++ b/Alignment/Geners/interface/AbsArchive.hh
@@ -3,167 +3,156 @@
 
 #include <vector>
 
-#include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
 #include "Alignment/Geners/interface/AbsRecord.hh"
 #include "Alignment/Geners/interface/AbsReference.hh"
+#include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
 #include "Alignment/Geners/interface/CatalogEntry.hh"
 #include "Alignment/Geners/interface/SearchSpecifier.hh"
 
 namespace gs {
-    class AbsArchive;
+  class AbsArchive;
 }
 
-gs::AbsArchive& operator<<(gs::AbsArchive& ar, const gs::AbsRecord& record);
+gs::AbsArchive &operator<<(gs::AbsArchive &ar, const gs::AbsRecord &record);
 
 namespace gs {
+  //
+  // If you need to retrieve the items, use the interface provided
+  // by the "Reference" class. Public interface of this class only
+  // allows to examine the item metadata and to copy items as BLOBs.
+  //
+  class AbsArchive {
+  public:
+    AbsArchive(const char *name);
+    inline virtual ~AbsArchive() {}
+
+    // Archive name
+    const std::string &name() const { return name_; }
+
+    // Is it correctly open?
+    virtual bool isOpen() const = 0;
+
+    // If an attempt to open the archive failed, call the following
+    // method to find out why
+    virtual std::string error() const = 0;
+
+    // Is the archive readable?
+    virtual bool isReadable() const = 0;
+
+    // Is the archive writable?
+    virtual bool isWritable() const = 0;
+
+    // Number of items in the archive. Note that id value
+    // of 0 refers to an invalid item.
+    virtual unsigned long long size() const = 0;
+
+    // Smallest and largest ids of any item in the archive
+    virtual unsigned long long smallestId() const = 0;
+    virtual unsigned long long largestId() const = 0;
+
+    // Are the item ids contiguous between the smallest and
+    // the largest?
+    virtual bool idsAreContiguous() const = 0;
+
+    // Check if the item with given id is actually present
+    // in the archive
+    virtual bool itemExists(unsigned long long id) const = 0;
+
+    // Search for matching items based on item name and
+    // category (no type match required)
+    virtual void itemSearch(const SearchSpecifier &namePattern,
+                            const SearchSpecifier &categoryPattern,
+                            std::vector<unsigned long long> *found) const = 0;
+
+    // Fetch metadata for the item with given id. NULL pointer is
+    // returned if there is no item in the archive with the given id
+    // (and there is an automatic cast from CPP11_shared_ptr to bool).
+    virtual CPP11_shared_ptr<const CatalogEntry> catalogEntry(unsigned long long id) = 0;
+
+    // Dump everything to storage (if the archive is open for writing
+    // and if this makes sense for the archive)
+    virtual void flush() = 0;
+
+    // Copy an item from this archive to a destination archive.
+    // This archive and destination archive must be distinct.
+    // Note that, while it is always possible to copy an item
+    // with correct id, a standalone operation like this is
+    // not necessarily going to make sense because the item
+    // could be just a part of some distributed object.
     //
-    // If you need to retrieve the items, use the interface provided
-    // by the "Reference" class. Public interface of this class only
-    // allows to examine the item metadata and to copy items as BLOBs.
-    // 
-    class AbsArchive
-    {
-    public:
-        AbsArchive(const char* name);
-        inline virtual ~AbsArchive() {}
-
-        // Archive name
-        const std::string& name() const {return name_;}
-
-        // Is it correctly open?
-        virtual bool isOpen() const = 0;
-
-        // If an attempt to open the archive failed, call the following
-        // method to find out why
-        virtual std::string error() const = 0;
-
-        // Is the archive readable?
-        virtual bool isReadable() const = 0;
-
-        // Is the archive writable?
-        virtual bool isWritable() const = 0;
-
-        // Number of items in the archive. Note that id value
-        // of 0 refers to an invalid item.
-        virtual unsigned long long size() const = 0;
-
-        // Smallest and largest ids of any item in the archive
-        virtual unsigned long long smallestId() const = 0;
-        virtual unsigned long long largestId() const = 0;
-
-        // Are the item ids contiguous between the smallest and
-        // the largest?
-        virtual bool idsAreContiguous() const = 0;
-
-        // Check if the item with given id is actually present
-        // in the archive
-        virtual bool itemExists(unsigned long long id) const = 0;
-
-        // Search for matching items based on item name and
-        // category (no type match required)
-        virtual void itemSearch(const SearchSpecifier& namePattern,
-                                const SearchSpecifier& categoryPattern,
-                                std::vector<unsigned long long>* found) const=0;
-
-        // Fetch metadata for the item with given id. NULL pointer is
-        // returned if there is no item in the archive with the given id
-        // (and there is an automatic cast from CPP11_shared_ptr to bool).
-        virtual CPP11_shared_ptr<const CatalogEntry> 
-        catalogEntry(unsigned long long id) = 0;
-
-        // Dump everything to storage (if the archive is open for writing
-        // and if this makes sense for the archive)
-        virtual void flush() = 0;
-
-        // Copy an item from this archive to a destination archive.
-        // This archive and destination archive must be distinct.
-        // Note that, while it is always possible to copy an item
-        // with correct id, a standalone operation like this is
-        // not necessarily going to make sense because the item
-        // could be just a part of some distributed object.
-        //
-        // If "newName" and/or "newCategory" arguments are left at their
-        // default value of 0, the existing name and/or category are used.
-        //
-        // This method returns the id of the copy in the destination
-        // archive.
-        unsigned long long copyItem(unsigned long long id,
-                                    AbsArchive* destination,
-                                    const char* newName = 0,
-                                    const char* newCategory = 0);
-
-        // The id and the length of the last item written
-        // (the results make sense only for the archives
-        //  that have been open for writing)
-        inline unsigned long long lastItemId() const
-            {return lastItemId_;}
-        inline unsigned long long lastItemLength() const
-            {return lastItemLength_;}
-
-        inline bool operator==(const AbsArchive& r) const
-            {return (typeid(*this) == typeid(r)) && this->isEqual(r);}
-        inline bool operator!=(const AbsArchive& r) const
-            {return !(*this == r);}
-
-    protected:
-        void addItemToReference(AbsReference& r, unsigned long long id) const;
-
-        // Archives which want to implement reasonable comparisons
-        // should override the function below
-        virtual bool isEqual(const AbsArchive&) const {return false;}
-
-    private:
-        friend class AbsReference;
-        friend gs::AbsArchive& ::operator<<(gs::AbsArchive& ar,
-                                            const gs::AbsRecord& record);
-
-        // Search for items which correspond to the given reference.
-        // The "reference" works both as the input and as the output in
-        // this query. The concrete implementations should utilize the
-        // "addItemToReference" method in order to produce results.
-        virtual void search(AbsReference& reference) = 0;
-
-        // Position the input stream for reading the item with given id.
-        // The reading must follow immediately, any other operaction on
-        // the archive can invalidate the result.
-        //
-        // The "sz" argument could be NULL in which case it should be
-        // ignored. If it is not NULL, the *sz value on completion
-        // should be set as follows:
-        //
-        // *sz = -1  -- if the uncompressed object size in the stream
-        //              is the same as in the catalog
-        // *sz >= 0  -- *sz is the object size after decompression
-        //              (usually not the same as in the catalog)
-        //
-        virtual std::istream& inputStream(unsigned long long id,
-                                          long long* sz) = 0;
-
-        // Get the stream for writing the next object
-        virtual std::ostream& outputStream() = 0;
-
-        // The following function should return 0 on failure and
-        // the item id in the archive on success. The id must be positive.
-        virtual unsigned long long addToCatalog(
-            const AbsRecord& record, unsigned compressCode,
-            unsigned long long itemLength) = 0;
-
-        // The archives which want to support compression should
-        // override the following two methods
-        virtual std::ostream& compressedStream(std::ostream& uncompressed)
-            {return uncompressed;}
-
-        // The following function returns some kind of a code which
-        // tells us how the item was compressed. Default value of 0
-        // means no compression.
-        virtual unsigned flushCompressedRecord(std::ostream& /* compressed */)
-            {return 0U;}
-
-        std::string name_;
-        unsigned long long lastItemId_;
-        unsigned long long lastItemLength_;
-    };
-}
+    // If "newName" and/or "newCategory" arguments are left at their
+    // default value of 0, the existing name and/or category are used.
+    //
+    // This method returns the id of the copy in the destination
+    // archive.
+    unsigned long long copyItem(unsigned long long id,
+                                AbsArchive *destination,
+                                const char *newName = nullptr,
+                                const char *newCategory = nullptr);
+
+    // The id and the length of the last item written
+    // (the results make sense only for the archives
+    //  that have been open for writing)
+    inline unsigned long long lastItemId() const { return lastItemId_; }
+    inline unsigned long long lastItemLength() const { return lastItemLength_; }
+
+    inline bool operator==(const AbsArchive &r) const { return (typeid(*this) == typeid(r)) && this->isEqual(r); }
+    inline bool operator!=(const AbsArchive &r) const { return !(*this == r); }
+
+  protected:
+    void addItemToReference(AbsReference &r, unsigned long long id) const;
+
+    // Archives which want to implement reasonable comparisons
+    // should override the function below
+    virtual bool isEqual(const AbsArchive &) const { return false; }
+
+  private:
+    friend class AbsReference;
+    friend gs::AbsArchive & ::operator<<(gs::AbsArchive &ar, const gs::AbsRecord &record);
+
+    // Search for items which correspond to the given reference.
+    // The "reference" works both as the input and as the output in
+    // this query. The concrete implementations should utilize the
+    // "addItemToReference" method in order to produce results.
+    virtual void search(AbsReference &reference) = 0;
+
+    // Position the input stream for reading the item with given id.
+    // The reading must follow immediately, any other operaction on
+    // the archive can invalidate the result.
+    //
+    // The "sz" argument could be NULL in which case it should be
+    // ignored. If it is not NULL, the *sz value on completion
+    // should be set as follows:
+    //
+    // *sz = -1  -- if the uncompressed object size in the stream
+    //              is the same as in the catalog
+    // *sz >= 0  -- *sz is the object size after decompression
+    //              (usually not the same as in the catalog)
+    //
+    virtual std::istream &inputStream(unsigned long long id, long long *sz) = 0;
+
+    // Get the stream for writing the next object
+    virtual std::ostream &outputStream() = 0;
+
+    // The following function should return 0 on failure and
+    // the item id in the archive on success. The id must be positive.
+    virtual unsigned long long addToCatalog(const AbsRecord &record,
+                                            unsigned compressCode,
+                                            unsigned long long itemLength) = 0;
+
+    // The archives which want to support compression should
+    // override the following two methods
+    virtual std::ostream &compressedStream(std::ostream &uncompressed) { return uncompressed; }
+
+    // The following function returns some kind of a code which
+    // tells us how the item was compressed. Default value of 0
+    // means no compression.
+    virtual unsigned flushCompressedRecord(std::ostream & /* compressed */) { return 0U; }
 
-#endif // GENERS_ABSARCHIVE_HH_
+    std::string name_;
+    unsigned long long lastItemId_;
+    unsigned long long lastItemLength_;
+  };
+}  // namespace gs
 
+#endif  // GENERS_ABSARCHIVE_HH_
diff --git a/Alignment/Geners/interface/AbsCatalog.hh b/Alignment/Geners/interface/AbsCatalog.hh
index 6dc82973f8b41..22f343e13fedb 100644
--- a/Alignment/Geners/interface/AbsCatalog.hh
+++ b/Alignment/Geners/interface/AbsCatalog.hh
@@ -1,86 +1,82 @@
 #ifndef GENERS_ABSCATALOG_HH_
 #define GENERS_ABSCATALOG_HH_
 
-#include <vector>
 #include <cassert>
+#include <vector>
 
 #include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
-#include "Alignment/Geners/interface/ItemDescriptor.hh"
 #include "Alignment/Geners/interface/CatalogEntry.hh"
+#include "Alignment/Geners/interface/ItemDescriptor.hh"
 #include "Alignment/Geners/interface/SearchSpecifier.hh"
 
 namespace gs {
-    //
-    // This abstract class defines interfaces for adding entries to
-    // a catalog but not for removing them. Of course, derived classes
-    // can also implement catalog entry removal if necessary.
-    //
-    struct AbsCatalog
-    {
-        virtual ~AbsCatalog() {}
-
-        // The number of entries in the catalog
-        virtual unsigned long long size() const = 0;
-
-        // Smallest and largest ids of any item in the catalog
-        virtual unsigned long long smallestId() const = 0;
-        virtual unsigned long long largestId() const = 0;
-        virtual bool isContiguous() const = 0;
-
-        // Check if an item with the given id is actually present in
-        // the catalog. Catalogs which support non-contiguous item ids
-        // (for example, if items can be removed) MUST override this.
-        virtual bool itemExists(const unsigned long long id) const
-        {
-            if (id == 0ULL) return false;
-            assert(isContiguous());
-            return id >= smallestId() && id <= largestId();
-        }
-
-        // The following function should return the id of the new entry
-        virtual unsigned long long makeEntry(const ItemDescriptor& descriptor,
-                                             unsigned compressionCode,
-                                             unsigned long long itemLength,
-                                             const ItemLocation& loc,
-                                             unsigned long long offset=0ULL)=0;
-
-        // It must be possible to retrieve the entry made by the last
-        // "makeEntry" call. If no "makeEntry" calls were made in this
-        // program (e.g., the catalog was only read and not written),
-        // null pointer should be returned. The entry should be owned
-        // by the catalog itself.
-        virtual const CatalogEntry* lastEntryMade() const = 0;
-
-        // The following function returns a shared pointer to the entry.
-        // The pointer will contain NULL in case the item is not found.
-        virtual CPP11_shared_ptr<const CatalogEntry> retrieveEntry(
-            unsigned long long id) const = 0;
-
-        // The following function fetches just the stream position
-        // associated with the entry. "true" is returned on success.
-        // Useful for catalogs which serve a single stream.
-        virtual bool retrieveStreampos(
-            unsigned long long id, unsigned* compressionCode,
-            unsigned long long* length, std::streampos* pos) const = 0;
-
-        // Search for matching entries based on item name and category
-        virtual void search(const SearchSpecifier& namePattern,
-                            const SearchSpecifier& categoryPattern,
-                            std::vector<unsigned long long>* idsFound) const=0;
-
-        inline bool operator==(const AbsCatalog& r) const
-            {return (typeid(*this) == typeid(r)) && this->isEqual(r);}
-        inline bool operator!=(const AbsCatalog& r) const
-            {return !(*this == r);}
-
-        // Prototypes needed for I/O
-        virtual ClassId classId() const = 0;
-        virtual bool write(std::ostream&) const = 0;
-
-    protected:
-        virtual bool isEqual(const AbsCatalog&) const = 0;
-    };
-}
-
-#endif // GENERS_ABSCATALOG_HH_
-
+  //
+  // This abstract class defines interfaces for adding entries to
+  // a catalog but not for removing them. Of course, derived classes
+  // can also implement catalog entry removal if necessary.
+  //
+  struct AbsCatalog {
+    virtual ~AbsCatalog() {}
+
+    // The number of entries in the catalog
+    virtual unsigned long long size() const = 0;
+
+    // Smallest and largest ids of any item in the catalog
+    virtual unsigned long long smallestId() const = 0;
+    virtual unsigned long long largestId() const = 0;
+    virtual bool isContiguous() const = 0;
+
+    // Check if an item with the given id is actually present in
+    // the catalog. Catalogs which support non-contiguous item ids
+    // (for example, if items can be removed) MUST override this.
+    virtual bool itemExists(const unsigned long long id) const {
+      if (id == 0ULL)
+        return false;
+      assert(isContiguous());
+      return id >= smallestId() && id <= largestId();
+    }
+
+    // The following function should return the id of the new entry
+    virtual unsigned long long makeEntry(const ItemDescriptor &descriptor,
+                                         unsigned compressionCode,
+                                         unsigned long long itemLength,
+                                         const ItemLocation &loc,
+                                         unsigned long long offset = 0ULL) = 0;
+
+    // It must be possible to retrieve the entry made by the last
+    // "makeEntry" call. If no "makeEntry" calls were made in this
+    // program (e.g., the catalog was only read and not written),
+    // null pointer should be returned. The entry should be owned
+    // by the catalog itself.
+    virtual const CatalogEntry *lastEntryMade() const = 0;
+
+    // The following function returns a shared pointer to the entry.
+    // The pointer will contain NULL in case the item is not found.
+    virtual CPP11_shared_ptr<const CatalogEntry> retrieveEntry(unsigned long long id) const = 0;
+
+    // The following function fetches just the stream position
+    // associated with the entry. "true" is returned on success.
+    // Useful for catalogs which serve a single stream.
+    virtual bool retrieveStreampos(unsigned long long id,
+                                   unsigned *compressionCode,
+                                   unsigned long long *length,
+                                   std::streampos *pos) const = 0;
+
+    // Search for matching entries based on item name and category
+    virtual void search(const SearchSpecifier &namePattern,
+                        const SearchSpecifier &categoryPattern,
+                        std::vector<unsigned long long> *idsFound) const = 0;
+
+    inline bool operator==(const AbsCatalog &r) const { return (typeid(*this) == typeid(r)) && this->isEqual(r); }
+    inline bool operator!=(const AbsCatalog &r) const { return !(*this == r); }
+
+    // Prototypes needed for I/O
+    virtual ClassId classId() const = 0;
+    virtual bool write(std::ostream &) const = 0;
+
+  protected:
+    virtual bool isEqual(const AbsCatalog &) const = 0;
+  };
+}  // namespace gs
+
+#endif  // GENERS_ABSCATALOG_HH_
diff --git a/Alignment/Geners/interface/AbsReader.hh b/Alignment/Geners/interface/AbsReader.hh
index 9607d0205b410..d0b8ef0e4763b 100644
--- a/Alignment/Geners/interface/AbsReader.hh
+++ b/Alignment/Geners/interface/AbsReader.hh
@@ -25,105 +25,91 @@
 #ifndef GENERS_ABSREADER_HH_
 #define GENERS_ABSREADER_HH_
 
+#include "Alignment/Geners/interface/IOException.hh"
 #include <map>
-#include <string>
 #include <sstream>
-#include "Alignment/Geners/interface/IOException.hh"
+#include <string>
 
 #include "Alignment/Geners/interface/ClassId.hh"
 
 namespace gs {
-    template<class Base>
-    struct AbsReader
-    {
-        virtual ~AbsReader() {}
-
-        virtual Base* read(const ClassId& id, std::istream& in) const = 0;
-    };
-
-    template<class Base, class Derived>
-    struct ConcreteReader : public AbsReader<Base>
-    {
-        virtual ~ConcreteReader() {}
-
-        inline Derived* read(const ClassId& id, std::istream& in) const
-        {
-            // Assume that Derived::read(id, in) returns a new object
-            // of type "Derived" allocated on the heap
-            return Derived::read(id, in);
-        }
-    };
-
-    template<class Base>
-    class DefaultReader : public std::map<std::string, AbsReader<Base>*>
-    {
-    public:
-        typedef Base value_type;
-
-        inline DefaultReader() : std::map<std::string, AbsReader<Base>*>() {}
-
-        virtual ~DefaultReader()
-        {
-            for (typename std::map<std::string, AbsReader<Base>*>::
-                     iterator it = this->begin(); it != this->end(); ++it)
-                delete it->second;
-        }
-
-        inline Base* read(const ClassId& id, std::istream& in) const
-        {
-            typename std::map<std::string, AbsReader<Base>*>::
-                const_iterator it = this->find(id.name());
-            if (it == this->end()) 
-            {
-                std::ostringstream os;
-                os << "In gs::DefaultReader::read: class \""
-                   << id.name() << "\" is not mapped to a concrete reader";
-                throw gs::IOInvalidArgument(os.str());
-            }
-            return it->second->read(id, in);
-        }
-
-    private:
-        DefaultReader(const DefaultReader&);
-        DefaultReader& operator=(const DefaultReader&);
-    };
-
-    // A trivial implementation of the Meyers singleton for use with reader
-    // factories. Naturally, this assumes that all factories are independent
-    // from each other (otherwise we are getting into trouble with undefined
-    // singleton destruction order). Also, this particular code is not
-    // thread-safe (but should become thread-safe in C++11 if I understand
-    // static local initialization guarantees correctly).
-    //
-    // Assume that "Reader" is derived from "DefaultReader" and that it
-    // publishes its base class as "Base".
-    //
-    template <class Reader>
-    class StaticReader
-    {
-    public:
-        typedef typename Reader::Base::value_type InheritanceBase;
-
-        static const Reader& instance()
-        {
-            static Reader obj;
-            return obj;
-        }
-
-        template <class Derived>
-        static void registerClass()
-        {
-            Reader& rd = const_cast<Reader&>(instance());
-            const ClassId& id(ClassId::makeId<Derived>());
-            delete rd[id.name()];
-            rd[id.name()] = new ConcreteReader<InheritanceBase,Derived>();
-        }
-
-    private:
-        // Disable the constructor
-        StaticReader();
-    };
-}
-
-#endif // GENERS_ABSREADER_HH_
-
+  template <class Base>
+  struct AbsReader {
+    virtual ~AbsReader() {}
+
+    virtual Base *read(const ClassId &id, std::istream &in) const = 0;
+  };
+
+  template <class Base, class Derived>
+  struct ConcreteReader : public AbsReader<Base> {
+    virtual ~ConcreteReader() {}
+
+    inline Derived *read(const ClassId &id, std::istream &in) const {
+      // Assume that Derived::read(id, in) returns a new object
+      // of type "Derived" allocated on the heap
+      return Derived::read(id, in);
+    }
+  };
+
+  template <class Base>
+  class DefaultReader : public std::map<std::string, AbsReader<Base> *> {
+  public:
+    typedef Base value_type;
+
+    inline DefaultReader() : std::map<std::string, AbsReader<Base> *>() {}
+
+    virtual ~DefaultReader() {
+      for (typename std::map<std::string, AbsReader<Base> *>::iterator it = this->begin(); it != this->end(); ++it)
+        delete it->second;
+    }
+
+    inline Base *read(const ClassId &id, std::istream &in) const {
+      typename std::map<std::string, AbsReader<Base> *>::const_iterator it = this->find(id.name());
+      if (it == this->end()) {
+        std::ostringstream os;
+        os << "In gs::DefaultReader::read: class \"" << id.name() << "\" is not mapped to a concrete reader";
+        throw gs::IOInvalidArgument(os.str());
+      }
+      return it->second->read(id, in);
+    }
+
+  private:
+    DefaultReader(const DefaultReader &);
+    DefaultReader &operator=(const DefaultReader &);
+  };
+
+  // A trivial implementation of the Meyers singleton for use with reader
+  // factories. Naturally, this assumes that all factories are independent
+  // from each other (otherwise we are getting into trouble with undefined
+  // singleton destruction order). Also, this particular code is not
+  // thread-safe (but should become thread-safe in C++11 if I understand
+  // static local initialization guarantees correctly).
+  //
+  // Assume that "Reader" is derived from "DefaultReader" and that it
+  // publishes its base class as "Base".
+  //
+  template <class Reader>
+  class StaticReader {
+  public:
+    typedef typename Reader::Base::value_type InheritanceBase;
+
+    static const Reader &instance() {
+      static Reader obj;
+      return obj;
+    }
+
+    template <class Derived>
+    static void registerClass() {
+      Reader &rd = const_cast<Reader &>(instance());
+      const ClassId &id(ClassId::makeId<Derived>());
+      delete rd[id.name()];
+      rd[id.name()] = new ConcreteReader<InheritanceBase, Derived>();
+    }
+
+  private:
+    // Disable the constructor
+    StaticReader();
+  };
+}  // namespace gs
+
+#endif  // GENERS_ABSREADER_HH_
diff --git a/Alignment/Geners/interface/AbsRecord.hh b/Alignment/Geners/interface/AbsRecord.hh
index 2319910d1c708..05ecdfeff4f87 100644
--- a/Alignment/Geners/interface/AbsRecord.hh
+++ b/Alignment/Geners/interface/AbsRecord.hh
@@ -4,47 +4,42 @@
 #include "Alignment/Geners/interface/ItemDescriptor.hh"
 
 namespace gs {
-    class AbsArchive;
-    class AbsRecord;
-}
+  class AbsArchive;
+  class AbsRecord;
+}  // namespace gs
 
-gs::AbsArchive& operator<<(gs::AbsArchive& ar, const gs::AbsRecord& record);
+gs::AbsArchive &operator<<(gs::AbsArchive &ar, const gs::AbsRecord &record);
 
 namespace gs {
-    class AbsRecord : public ItemDescriptor
-    {
-    public:
-        inline virtual ~AbsRecord() {}
-
-        // Item id will be set to non-0 value upon writing the item
-        // into the archive. When the id is not 0, the record can no
-        // longer be written out (if you really want to write out the
-        // same item again, make another record).
-        inline unsigned long long id() const {return itemId_;}
-
-        // Item length will be set to non-0 value upon writing the item
-        // into the archive.
-        inline unsigned long long itemLength() const {return itemLength_;}
-
-    protected:
-        inline AbsRecord() : ItemDescriptor(), itemId_(0), itemLength_(0) {}
-        inline AbsRecord(const ClassId& classId, const char* ioPrototype,
-                         const char* name, const char* category)
-            : ItemDescriptor(classId, ioPrototype, name, category),
-              itemId_(0), itemLength_(0) {}
-
-    private:
-        friend gs::AbsArchive& ::operator<<(gs::AbsArchive& ar,
-                                            const gs::AbsRecord& record);
-
-        // The following functions must be overriden by derived classes.
-        // "writeData" should return "true" upon success.
-        virtual bool writeData(std::ostream& os) const = 0;
-        
-        mutable unsigned long long itemId_;
-        mutable unsigned long long itemLength_;
-    };
-}
-
-#endif // GENERS_ABSRECORD_HH_
-
+  class AbsRecord : public ItemDescriptor {
+  public:
+    inline ~AbsRecord() override {}
+
+    // Item id will be set to non-0 value upon writing the item
+    // into the archive. When the id is not 0, the record can no
+    // longer be written out (if you really want to write out the
+    // same item again, make another record).
+    inline unsigned long long id() const { return itemId_; }
+
+    // Item length will be set to non-0 value upon writing the item
+    // into the archive.
+    inline unsigned long long itemLength() const { return itemLength_; }
+
+  protected:
+    inline AbsRecord() : ItemDescriptor(), itemId_(0), itemLength_(0) {}
+    inline AbsRecord(const ClassId &classId, const char *ioPrototype, const char *name, const char *category)
+        : ItemDescriptor(classId, ioPrototype, name, category), itemId_(0), itemLength_(0) {}
+
+  private:
+    friend gs::AbsArchive & ::operator<<(gs::AbsArchive &ar, const gs::AbsRecord &record);
+
+    // The following functions must be overriden by derived classes.
+    // "writeData" should return "true" upon success.
+    virtual bool writeData(std::ostream &os) const = 0;
+
+    mutable unsigned long long itemId_;
+    mutable unsigned long long itemLength_;
+  };
+}  // namespace gs
+
+#endif  // GENERS_ABSRECORD_HH_
diff --git a/Alignment/Geners/interface/AbsReference.hh b/Alignment/Geners/interface/AbsReference.hh
index 8f8fbc55f6e54..3fe1ae59696cf 100644
--- a/Alignment/Geners/interface/AbsReference.hh
+++ b/Alignment/Geners/interface/AbsReference.hh
@@ -1,103 +1,97 @@
 #ifndef GENERS_ABSREFERENCE_HH_
 #define GENERS_ABSREFERENCE_HH_
 
-#include <vector>
 #include <iostream>
+#include <vector>
 
 #include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
 #include "Alignment/Geners/interface/ClassId.hh"
 #include "Alignment/Geners/interface/SearchSpecifier.hh"
 
 namespace gs {
-    class AbsArchive;
-    class CatalogEntry;
-
-    class AbsReference
-    {
-    public:
-        inline virtual ~AbsReference() {}
-
-        inline AbsArchive& archive() const {return archive_;}
-        inline const ClassId& type() const {return classId_;}
-        inline const std::string& ioPrototype() const {return ioProto_;}
-        inline const SearchSpecifier& namePattern() const
-            {return namePattern_;}
-        inline const SearchSpecifier& categoryPattern() const
-            {return categoryPattern_;}
-
-        // Determine if the item in the catalog is compatible for I/O 
-        // purposes with the one referenced here 
-        virtual bool isIOCompatible(const CatalogEntry& r) const;
-
-        // Check I/O prototype only allowing for class id mismatch
-        bool isSameIOPrototype(const CatalogEntry& r) const;
-
-        // Are there any items referenced?
-        bool empty() const;
-
-        // Exactly one item referenced?
-        bool unique() const;
-
-        // How many items are referenced?
-        unsigned long size() const;
-
-        // The following function throws gs::IOOutOfRange exception
-        // if the index is out of range
-        unsigned long long id(unsigned long index) const;
-
-        // Catalog entry retrieval by index in the list of referenced items.
-        // Throws gs::IOOutOfRange exception if the index is out of range.
-        CPP11_shared_ptr<const CatalogEntry> 
-        indexedCatalogEntry(unsigned long index) const;
-
-    protected:
-        // Use the following constructor to retrieve an item with
-        // a known id
-        AbsReference(AbsArchive& ar, const ClassId& classId,
-                     const char* ioProto,
-                     unsigned long long itemId);
-
-        // Use the following constructor to search for items which
-        // match name and category patterns
-        AbsReference(AbsArchive& ar, const ClassId& classId,
-                     const char* ioProto,
-                     const SearchSpecifier& namePattern,
-                     const SearchSpecifier& categoryPattern);
-
-        std::istream& positionInputStream(unsigned long long id) const;
-
-    private:
-        friend class AbsArchive;
-
-        AbsReference();
-
-        void initialize() const;
-        void addItemId(unsigned long long id);
-
-        AbsArchive& archive_;
-        ClassId classId_;
-        std::string ioProto_;
-
-        // The following items will be filled or not,
-        // depending on which constructor was called
-        unsigned long long searchId_;
-        SearchSpecifier namePattern_;
-        SearchSpecifier categoryPattern_;
-
-        // Id for a unique verified item
-        unsigned long long itemId_;
-
-        // The item list in case ids are not unique
-        std::vector<unsigned long long> idList_;
-
-        // We can't talk to the archive from the constructor
-        // because we need correct "isIOCompatible" which
-        // can be overriden by derived classes. Therefore,
-        // we will delay archive searching until the first
-        // function call.
-        bool initialized_;
-    };
-}
-
-#endif // GENERS_ABSREFERENCE_HH_
+  class AbsArchive;
+  class CatalogEntry;
+
+  class AbsReference {
+  public:
+    inline virtual ~AbsReference() {}
+
+    inline AbsArchive &archive() const { return archive_; }
+    inline const ClassId &type() const { return classId_; }
+    inline const std::string &ioPrototype() const { return ioProto_; }
+    inline const SearchSpecifier &namePattern() const { return namePattern_; }
+    inline const SearchSpecifier &categoryPattern() const { return categoryPattern_; }
+
+    // Determine if the item in the catalog is compatible for I/O
+    // purposes with the one referenced here
+    virtual bool isIOCompatible(const CatalogEntry &r) const;
+
+    // Check I/O prototype only allowing for class id mismatch
+    bool isSameIOPrototype(const CatalogEntry &r) const;
+
+    // Are there any items referenced?
+    bool empty() const;
+
+    // Exactly one item referenced?
+    bool unique() const;
+
+    // How many items are referenced?
+    unsigned long size() const;
+
+    // The following function throws gs::IOOutOfRange exception
+    // if the index is out of range
+    unsigned long long id(unsigned long index) const;
+
+    // Catalog entry retrieval by index in the list of referenced items.
+    // Throws gs::IOOutOfRange exception if the index is out of range.
+    CPP11_shared_ptr<const CatalogEntry> indexedCatalogEntry(unsigned long index) const;
+
+  protected:
+    // Use the following constructor to retrieve an item with
+    // a known id
+    AbsReference(AbsArchive &ar, const ClassId &classId, const char *ioProto, unsigned long long itemId);
+
+    // Use the following constructor to search for items which
+    // match name and category patterns
+    AbsReference(AbsArchive &ar,
+                 const ClassId &classId,
+                 const char *ioProto,
+                 const SearchSpecifier &namePattern,
+                 const SearchSpecifier &categoryPattern);
+
+    std::istream &positionInputStream(unsigned long long id) const;
+
+  private:
+    friend class AbsArchive;
+
+    AbsReference() = delete;
+
+    void initialize() const;
+    void addItemId(unsigned long long id);
+
+    AbsArchive &archive_;
+    ClassId classId_;
+    std::string ioProto_;
+
+    // The following items will be filled or not,
+    // depending on which constructor was called
+    unsigned long long searchId_;
+    SearchSpecifier namePattern_;
+    SearchSpecifier categoryPattern_;
+
+    // Id for a unique verified item
+    unsigned long long itemId_;
+
+    // The item list in case ids are not unique
+    std::vector<unsigned long long> idList_;
+
+    // We can't talk to the archive from the constructor
+    // because we need correct "isIOCompatible" which
+    // can be overriden by derived classes. Therefore,
+    // we will delay archive searching until the first
+    // function call.
+    bool initialized_;
+  };
+}  // namespace gs
 
+#endif  // GENERS_ABSREFERENCE_HH_
diff --git a/Alignment/Geners/interface/ArrayAdaptor.hh b/Alignment/Geners/interface/ArrayAdaptor.hh
index 2c8620205ab24..7f5c626a82095 100644
--- a/Alignment/Geners/interface/ArrayAdaptor.hh
+++ b/Alignment/Geners/interface/ArrayAdaptor.hh
@@ -1,197 +1,170 @@
 #ifndef GENERS_ARRAYADAPTOR_HH_
 #define GENERS_ARRAYADAPTOR_HH_
 
-#include <cstddef>
-#include <cassert>
 #include "Alignment/Geners/interface/IOException.hh"
+#include <cassert>
+#include <cstddef>
 
-#include "Alignment/Geners/interface/ProcessItem.hh"
-#include "Alignment/Geners/interface/InsertContainerItem.hh"
 #include "Alignment/Geners/interface/IOIsContiguous.hh"
+#include "Alignment/Geners/interface/InsertContainerItem.hh"
+#include "Alignment/Geners/interface/ProcessItem.hh"
 #include "Alignment/Geners/interface/binaryIO.hh"
 
 namespace gs {
-    template <class Stream, class State, class Item, class Stage>
-    struct GenericWriter;
-
-    template <class Stream, class State, class Item, class Stage>
-    struct GenericReader;
-
-    template<typename T>
-    class ArrayAdaptor
-    {
-    public:
-        typedef T value_type;
-        typedef const T* const_iterator;
-
-        inline ArrayAdaptor(const T* indata, const std::size_t sz,
-                            const bool writeItemClassId = true)
-            : data_(indata), size_(sz), writetemCl_(writeItemClassId)
-              {if (sz) assert(data_);}
-
-        inline std::size_t size() const {return size_;}
-        inline const_iterator begin() const {return data_;}
-        inline const_iterator end() const {return data_ + size_;}
-        inline bool writeItemClassId() const {return writetemCl_;}
-        inline const T& operator[](const std::size_t index) const
-            {return data_[index];}
-        inline T& operator[](const std::size_t index)
-            {return (const_cast<T*>(data_))[index];}
-        inline T& at(const std::size_t index)
-        {
-            if (index >= size_) throw gs::IOOutOfRange(
-                "gs::ArrayAdaptor::at: index out of range");
-            return (const_cast<T*>(data_))[index];
-        }
-
-    private:
-        ArrayAdaptor();
-
-        const T* data_;
-        std::size_t size_;
-        bool writetemCl_;
-    };
-
-    template <class T>
-    struct IOIsContiguous<ArrayAdaptor<T> >
-    {enum {value = 1};};
-
-    template <class T>
-    struct IOIsContiguous<const ArrayAdaptor<T> >
-    {enum {value = 1};};
-
-    template <class T>
-    struct IOIsContiguous<volatile ArrayAdaptor<T> >
-    {enum {value = 1};};
-
-    template <class T>
-    struct IOIsContiguous<const volatile ArrayAdaptor<T> >
-    {enum {value = 1};};
-
-    template <class T>
-    struct InsertContainerItem<ArrayAdaptor<T> >
-    {
-        typedef ArrayAdaptor<T> A;
-        static inline void insert(A& obj, const typename A::value_type& item,
-                                  const std::size_t itemNumber)
-            {obj.at(itemNumber) = item;}
-    };
-
-    template <class T>
-    struct InsertContainerItem<volatile ArrayAdaptor<T> >
-    {
-        typedef ArrayAdaptor<T> A;
-        static inline void insert(A& obj, const typename A::value_type& item,
-                                  const std::size_t itemNumber)
-            {obj.at(itemNumber) = item;}
-    };
-
-    // Ignore array size I/O. The size is provided in the constructor.
-    // Of course, it still has to be written somewhere, but that code
-    // is external w.r.t. the array adaptor.
-    template <class Stream, class State, class T>
-    struct GenericWriter<Stream, State, ArrayAdaptor<T>, InContainerSize>
-    {
-        inline static bool process(std::size_t, Stream& os, State*,
-                                   const bool processClassId)
-            {return true;}
-    };
-
-    template <class Stream, class State, class T>
-    struct GenericReader<Stream, State, ArrayAdaptor<T>, InContainerSize>
-    {
-        inline static bool process(std::size_t, Stream& os, State*,
-                                   const bool processClassId)
-            {return true;}
-    };
-
-    template <class Stream, class State, class T>
-    struct GenericWriter<Stream, State, ArrayAdaptor<T>, InPODArray>
-    {
-        inline static bool process(const ArrayAdaptor<T>& a, Stream& os,
-                                   State*, bool)
-        {
-            const std::size_t len = a.size();
-            if (len)
-                write_pod_array(os, &a[0], len);
-            return !os.fail();
-        }
-    };
-
-    template <class Stream, class State, class T>
-    struct GenericReader<Stream, State, ArrayAdaptor<T>, InPODArray>
-    {
-        inline static bool process(ArrayAdaptor<T>& a, Stream& s, State*, bool)
-        {
-            const std::size_t len = a.size();
-            if (len)
-                read_pod_array(s, &a[0], len);
-            return !s.fail();
-        }
-    };
-
-    template <class Stream, class State, class T>
-    struct GenericWriter<Stream, State, ArrayAdaptor<T>, InContainerHeader>
-    {
-        typedef ArrayAdaptor<T> Container;
-
-        inline static bool process(const Container& c, Stream& os, State*,
-                                   const bool processClassId)
-        {
-            bool status = processClassId ?
-                ClassId::makeId<Container>().write(os) : true;
-            if (status && !(IOTraits<T>::IsPOD && 
-                            IOTraits<Container>::IsContiguous) && 
-                c.writeItemClassId())
-                status = ClassId::makeId<T>().write(os);
-            return status;
-        }
-    };
-
-    template <class Stream, class State, class T>
-    struct GenericReader<Stream, State, ArrayAdaptor<T>, InContainerHeader>
-    {
-        typedef ArrayAdaptor<T> Container;
-
-        inline static bool process(Container& a, Stream& is, State* state,
-                                   const bool processClassId)
-        {
-            bool status = true;
-            if (processClassId)
-            {
-                ClassId id(is, 1);
-                const ClassId& current = ClassId::makeId<Container>();
-                status = (id.name() == current.name());
-            }
-            if (status)
-            {
-                if (!(IOTraits<T>::IsPOD && IOTraits<Container>::IsContiguous))
-                    if (a.writeItemClassId())
-                    {
-                        ClassId id(is, 1);
-                        state->push_back(id);
-                    }
-            }
-            return status;
-        }
-    };
-
-    template <class Stream, class State, class T>
-    struct GenericReader<Stream, State, ArrayAdaptor<T>, InContainerFooter>
-    {
-        typedef ArrayAdaptor<T> Container;
-
-        inline static bool process(Container& a, Stream&, State* state, bool)
-        {
-            if (!(IOTraits<T>::IsPOD && IOTraits<Container>::IsContiguous))
-                if (a.writeItemClassId())
-                    state->pop_back();
-            return true;
-        }
-    };
-}
+  template <class Stream, class State, class Item, class Stage>
+  struct GenericWriter;
+
+  template <class Stream, class State, class Item, class Stage>
+  struct GenericReader;
+
+  template <typename T>
+  class ArrayAdaptor {
+  public:
+    typedef T value_type;
+    typedef const T *const_iterator;
+
+    inline ArrayAdaptor(const T *indata, const std::size_t sz, const bool writeItemClassId = true)
+        : data_(indata), size_(sz), writetemCl_(writeItemClassId) {
+      if (sz)
+        assert(data_);
+    }
+
+    inline std::size_t size() const { return size_; }
+    inline const_iterator begin() const { return data_; }
+    inline const_iterator end() const { return data_ + size_; }
+    inline bool writeItemClassId() const { return writetemCl_; }
+    inline const T &operator[](const std::size_t index) const { return data_[index]; }
+    inline T &operator[](const std::size_t index) { return (const_cast<T *>(data_))[index]; }
+    inline T &at(const std::size_t index) {
+      if (index >= size_)
+        throw gs::IOOutOfRange("gs::ArrayAdaptor::at: index out of range");
+      return (const_cast<T *>(data_))[index];
+    }
+
+  private:
+    ArrayAdaptor() = delete;
+
+    const T *data_;
+    std::size_t size_;
+    bool writetemCl_;
+  };
+
+  template <class T>
+  struct IOIsContiguous<ArrayAdaptor<T>> {
+    enum { value = 1 };
+  };
+
+  template <class T>
+  struct IOIsContiguous<const ArrayAdaptor<T>> {
+    enum { value = 1 };
+  };
+
+  template <class T>
+  struct IOIsContiguous<volatile ArrayAdaptor<T>> {
+    enum { value = 1 };
+  };
+
+  template <class T>
+  struct IOIsContiguous<const volatile ArrayAdaptor<T>> {
+    enum { value = 1 };
+  };
+
+  template <class T>
+  struct InsertContainerItem<ArrayAdaptor<T>> {
+    typedef ArrayAdaptor<T> A;
+    static inline void insert(A &obj, const typename A::value_type &item, const std::size_t itemNumber) {
+      obj.at(itemNumber) = item;
+    }
+  };
+
+  template <class T>
+  struct InsertContainerItem<volatile ArrayAdaptor<T>> {
+    typedef ArrayAdaptor<T> A;
+    static inline void insert(A &obj, const typename A::value_type &item, const std::size_t itemNumber) {
+      obj.at(itemNumber) = item;
+    }
+  };
+
+  // Ignore array size I/O. The size is provided in the constructor.
+  // Of course, it still has to be written somewhere, but that code
+  // is external w.r.t. the array adaptor.
+  template <class Stream, class State, class T>
+  struct GenericWriter<Stream, State, ArrayAdaptor<T>, InContainerSize> {
+    inline static bool process(std::size_t, Stream &os, State *, const bool processClassId) { return true; }
+  };
+
+  template <class Stream, class State, class T>
+  struct GenericReader<Stream, State, ArrayAdaptor<T>, InContainerSize> {
+    inline static bool process(std::size_t, Stream &os, State *, const bool processClassId) { return true; }
+  };
+
+  template <class Stream, class State, class T>
+  struct GenericWriter<Stream, State, ArrayAdaptor<T>, InPODArray> {
+    inline static bool process(const ArrayAdaptor<T> &a, Stream &os, State *, bool) {
+      const std::size_t len = a.size();
+      if (len)
+        write_pod_array(os, &a[0], len);
+      return !os.fail();
+    }
+  };
+
+  template <class Stream, class State, class T>
+  struct GenericReader<Stream, State, ArrayAdaptor<T>, InPODArray> {
+    inline static bool process(ArrayAdaptor<T> &a, Stream &s, State *, bool) {
+      const std::size_t len = a.size();
+      if (len)
+        read_pod_array(s, &a[0], len);
+      return !s.fail();
+    }
+  };
+
+  template <class Stream, class State, class T>
+  struct GenericWriter<Stream, State, ArrayAdaptor<T>, InContainerHeader> {
+    typedef ArrayAdaptor<T> Container;
+
+    inline static bool process(const Container &c, Stream &os, State *, const bool processClassId) {
+      bool status = processClassId ? ClassId::makeId<Container>().write(os) : true;
+      if (status && !(IOTraits<T>::IsPOD && IOTraits<Container>::IsContiguous) && c.writeItemClassId())
+        status = ClassId::makeId<T>().write(os);
+      return status;
+    }
+  };
+
+  template <class Stream, class State, class T>
+  struct GenericReader<Stream, State, ArrayAdaptor<T>, InContainerHeader> {
+    typedef ArrayAdaptor<T> Container;
+
+    inline static bool process(Container &a, Stream &is, State *state, const bool processClassId) {
+      bool status = true;
+      if (processClassId) {
+        ClassId id(is, 1);
+        const ClassId &current = ClassId::makeId<Container>();
+        status = (id.name() == current.name());
+      }
+      if (status) {
+        if (!(IOTraits<T>::IsPOD && IOTraits<Container>::IsContiguous))
+          if (a.writeItemClassId()) {
+            ClassId id(is, 1);
+            state->push_back(id);
+          }
+      }
+      return status;
+    }
+  };
+
+  template <class Stream, class State, class T>
+  struct GenericReader<Stream, State, ArrayAdaptor<T>, InContainerFooter> {
+    typedef ArrayAdaptor<T> Container;
+
+    inline static bool process(Container &a, Stream &, State *state, bool) {
+      if (!(IOTraits<T>::IsPOD && IOTraits<Container>::IsContiguous))
+        if (a.writeItemClassId())
+          state->pop_back();
+      return true;
+    }
+  };
+}  // namespace gs
 
 gs_specialize_template_id_T(gs::ArrayAdaptor, 0, 1)
 
-#endif // GENERS_ARRAYADAPTOR_HH_
-
+#endif  // GENERS_ARRAYADAPTOR_HH_
diff --git a/Alignment/Geners/interface/BZ2Handle.hh b/Alignment/Geners/interface/BZ2Handle.hh
index 82adfaf96bcb2..9b5333bf54d4d 100644
--- a/Alignment/Geners/interface/BZ2Handle.hh
+++ b/Alignment/Geners/interface/BZ2Handle.hh
@@ -12,34 +12,31 @@
 // is performed, and having it on the stack saves a bit of time.
 
 namespace gs {
-    class BZ2InflateHandle
-    {
-    public:
-        explicit BZ2InflateHandle(bz_stream& strm);
-        ~BZ2InflateHandle();
-
-    private:
-        BZ2InflateHandle();
-        BZ2InflateHandle(const BZ2InflateHandle&);
-        BZ2InflateHandle& operator=(const BZ2InflateHandle&);
-
-        bz_stream* strm_;
-    };
-
-    class BZ2DeflateHandle
-    {
-    public:
-        explicit BZ2DeflateHandle(bz_stream& strm);
-        ~BZ2DeflateHandle();
-
-    private:
-        BZ2DeflateHandle();
-        BZ2DeflateHandle(const BZ2DeflateHandle&);
-        BZ2DeflateHandle& operator=(const BZ2DeflateHandle&);
-
-        bz_stream* strm_;
-    };
-}
-
-#endif // GENERS_BZ2HANDLE_HH_
-
+  class BZ2InflateHandle {
+  public:
+    explicit BZ2InflateHandle(bz_stream &strm);
+    ~BZ2InflateHandle();
+
+  private:
+    BZ2InflateHandle() = delete;
+    BZ2InflateHandle(const BZ2InflateHandle &) = delete;
+    BZ2InflateHandle &operator=(const BZ2InflateHandle &) = delete;
+
+    bz_stream *strm_;
+  };
+
+  class BZ2DeflateHandle {
+  public:
+    explicit BZ2DeflateHandle(bz_stream &strm);
+    ~BZ2DeflateHandle();
+
+  private:
+    BZ2DeflateHandle() = delete;
+    BZ2DeflateHandle(const BZ2DeflateHandle &) = delete;
+    BZ2DeflateHandle &operator=(const BZ2DeflateHandle &) = delete;
+
+    bz_stream *strm_;
+  };
+}  // namespace gs
+
+#endif  // GENERS_BZ2HANDLE_HH_
diff --git a/Alignment/Geners/interface/BinaryArchiveBase.hh b/Alignment/Geners/interface/BinaryArchiveBase.hh
index 88ad44576ad15..b4169af649980 100644
--- a/Alignment/Geners/interface/BinaryArchiveBase.hh
+++ b/Alignment/Geners/interface/BinaryArchiveBase.hh
@@ -4,220 +4,210 @@
 #include <fstream>
 #include <sstream>
 
-#include "Alignment/Geners/interface/AbsCatalog.hh"
 #include "Alignment/Geners/interface/AbsArchive.hh"
+#include "Alignment/Geners/interface/AbsCatalog.hh"
 #include "Alignment/Geners/interface/CStringStream.hh"
 
 namespace gs {
-    class BinaryArchiveBase : public AbsArchive
-    {
-    public:
-        // The "mode" argument is a string which can have one or more
-        // sections, separated by ":". The first section has the same
-        // meaning as in the "fopen" call (see "man 3 fopen"). Additional
-        // sections can specify other aspects of the archive behavior
-        // using the format "option=value" if the default settings are
-        // not suitable. The available options are:
-        //
-        // "z"   -- compression type. Possible option values are
-        //           "n" -- no compression (default)
-        //           "z" -- compress with zlib
-        //           "b" -- compress with bzlib2
-        //
-        // "cl"  -- compression level (an integer between -1 and 9,
-        //           -1 is default. Meanigful for zlib compression
-        //           only. See zlib documentation for details.
-        //
-        // "cb"  -- compression buffer size in bytes (unsigned integer).
-        //           Default is 1 MB.
-        //
-        // "cm"  -- minimum object size in bytes to compress (unsigned
-        //           integer). Objects whose serialized size is below
-        //           this limit are not compressed. Default is 1 KB.
-        //
-        // "cat" -- if the value is set to "i" (which means "internal"
-        //           or "injected"), the catalog data will be injected
-        //           into the data stream in addition to having it in
-        //           a separate catalog file. This allows for catalog
-        //           recovery from the data stream in cases of program
-        //           failure but also increases the data file size.
-        //           The default value of this option is "s" which means
-        //           that the catalog data will be stored separately.
-        //           This option is meaningful for new archives only,
-        //           for existing archives the value of this option is
-        //           taken from the archive header record.
-        //
-        // Example: "w+:z=z:cl=9:cm=2048:cat=s". This will compress
-        // objects with 2 KB or larger size using level 9 zlib compression
-        // (the best compression ratio possible in zlib which is also
-        // the slowest). The archive will be open for reading and writing.
-        // If an archive with the same name already exists, it will be
-        // overwritten. The catalog will be stored in a separate file
-        // created when the archive is closed, catalog recovery from the
-        // data file(s) in case of a catastrophic program failure will not
-        // be possible.
-        //
-        BinaryArchiveBase(const char* name, const char* mode);
-
-        virtual ~BinaryArchiveBase();
-
-        inline bool isOpen() const {return modeIsValid_ && catalog_;}
-
-        inline bool isReadable() const
-            {return modeIsValid_ && catalog_ && (mode_ & std::ios_base::in);}
-
-        inline bool isWritable() const
-            {return modeIsValid_ && catalog_ && (mode_ & std::ios_base::out);}
-
-        // Error message produced in case the archive could not be opened
-        inline std::string error() const
-            {return errorStream_ ? errorStream_->str() : std::string("");}
-
-        // Check whether the constructor "mode" argument was valid.
-        // If it was not, derived classes should behave as if the
-        // archive could not be opened.
-        inline bool modeValid() const {return modeIsValid_;}
-
-        inline unsigned long long size() const
-            {return catalog_ ? catalog_->size() : 0ULL;}
-
-        inline unsigned long long smallestId() const
-            {return catalog_ ? catalog_->smallestId() : 0ULL;}
-
-        inline unsigned long long largestId() const
-            {return catalog_ ? catalog_->largestId() : 0ULL;}
-
-        inline bool idsAreContiguous() const
-            {return catalog_ ? catalog_->isContiguous() : false;}
-
-        inline bool itemExists(const unsigned long long id) const
-            {return catalog_ ? catalog_->itemExists(id) : false;}
-
-        void itemSearch(const SearchSpecifier& namePattern,
-                        const SearchSpecifier& categoryPattern,
-                        std::vector<unsigned long long>* idsFound) const;
-
-        inline CPP11_shared_ptr<const CatalogEntry>
-        catalogEntry(const unsigned long long id)
-            {return catalog_ ? catalog_->retrieveEntry(id) :
-             CPP11_shared_ptr<const CatalogEntry>((const CatalogEntry*)0);}
-
-        // Inspection methods for compression options
-        inline CStringStream::CompressionMode compressionMode() const
-            {return cStream_->compressionMode();}
-
-        inline std::size_t compressionBufferSize() const
-            {return cStream_->bufferSize();}
-
-        inline int compressionLevel() const
-            {return cStream_->compressionLevel();}
-
-        inline unsigned minSizeToCompress() const
-            {return cStream_->minSizeToCompress();}
-
-        // Inject metadata into the data stream when writing? If this
-        // method returns "true", we either had "cat=i" in the opening
-        // mode for a new archive or a corresponding flag was set in
-        // the header of an existing archive data file.
-        inline bool injectMetadata() const {return addCatalogToData_;}
-
-        // The following method moves the "get pointer" of the stream
-        // to the end of file as a side effect
-        static bool isEmptyFile(std::fstream& s);
-
-        // The following method converts the first section of the "mode"
-        // argument into std::ios_base::openmode
-        static std::ios_base::openmode parseMode(const char* mode);
-
-    protected:
-        inline AbsCatalog* catalog() const {return catalog_;}
-
-        // Non-null catalog must be set exactly once. This object will
-        // assume the catalog ownership. Null catalog can be set after
-        // non-null in case some essential operation on the catalog has
-        // failed (such as writing it to file) in order to indicate
-        // failure to open the archive.
-        void setCatalog(AbsCatalog* c);
-
-        // Set compression mode (can be used when the catalog is read).
-        // The argment must be consistent with one of the modes defined
-        // in the CStringStream.hh header.
-        inline void setCompressionMode(const unsigned cMode)
-            {cStream_->setCompressionMode(
-                 static_cast<CStringStream::CompressionMode>(cMode));}
-
-        // Stream for error messages. To be used from constructors
-        // of derived classes in case of problems, to indicate the
-        // reason why the archive could not be opened.
-        inline std::ostringstream& errorStream()
-        {
-            if (!errorStream_) errorStream_ = new std::ostringstream();
-            return *errorStream_;
-        }
-
-        // The following method opens a binary archive. It makes sure
-        // that a proper header is written out in case an empty file
-        // is open or in case the file is truncated, and that the header
-        // is there when a non-empty file is open without truncation.
-        // If the argument fstream is open when this method is invoked,
-        // it is closed first. After invocation of this method, the
-        // "injectMetadata()" flag will be properly set up for the
-        // data file open last. If the method is not successful, it
-        // closes the stream and throws an exception inherited from
-        // "IOException".
-        //
-        void openDataFile(std::fstream& stream, const char* filename);
-
-        // Stream mode used to open the archive data file(s)
-        inline std::ios_base::openmode openmode() const {return mode_;}
-
-        // Info needed for catalog recovery. These methods will return
-        // null pointers if item metadata is not in the data stream.
-        const ClassId* catalogEntryClassId() const {return storedEntryId_;}
-        const ClassId* itemLocationClassId() const {return storedLocationId_;}
-
-    private:
-        BinaryArchiveBase();
-        BinaryArchiveBase(const BinaryArchiveBase&);
-        BinaryArchiveBase& operator=(const BinaryArchiveBase&);
-
-        static bool parseArchiveOptions(
-            std::ostringstream& errmes,
-            const char* mode, CStringStream::CompressionMode* m,
-            int* compressionLevel, unsigned* minSizeToCompress,
-            unsigned* bufSize, bool* multiplexCatalog);
-
-        void writeHeader(std::ostream& os);
-
-        // The following method returns "true" if a correctly
-        // formatted header was found
-        bool readHeader(std::istream& is);
-
-        virtual void search(AbsReference& reference);
-
-        // The derived classes must override the following two methods
-        virtual std::ostream& plainOutputStream() = 0;
-        virtual std::istream& plainInputStream(unsigned long long id,
-                                               unsigned* compressionCode,
-                                               unsigned long long* length) = 0;
-
-        std::istream& inputStream(unsigned long long id, long long* sz);
-        std::ostream& outputStream();
-        std::ostream& compressedStream(std::ostream& uncompressed);
-        unsigned flushCompressedRecord(std::ostream& compressed);
-        void releaseClassIds();
-
-        const std::ios_base::openmode mode_;
-        std::ostringstream* errorStream_;
-        CStringStream* cStream_;
-        AbsCatalog* catalog_;
-        ClassId* storedEntryId_;
-        ClassId* storedLocationId_;
-        bool catalogIsSet_;
-        bool modeIsValid_;
-        bool addCatalogToData_;
-    };
-}
-
-#endif // GENERS_BINARYARCHIVEBASE_HH_
-
+  class BinaryArchiveBase : public AbsArchive {
+  public:
+    // The "mode" argument is a string which can have one or more
+    // sections, separated by ":". The first section has the same
+    // meaning as in the "fopen" call (see "man 3 fopen"). Additional
+    // sections can specify other aspects of the archive behavior
+    // using the format "option=value" if the default settings are
+    // not suitable. The available options are:
+    //
+    // "z"   -- compression type. Possible option values are
+    //           "n" -- no compression (default)
+    //           "z" -- compress with zlib
+    //           "b" -- compress with bzlib2
+    //
+    // "cl"  -- compression level (an integer between -1 and 9,
+    //           -1 is default. Meanigful for zlib compression
+    //           only. See zlib documentation for details.
+    //
+    // "cb"  -- compression buffer size in bytes (unsigned integer).
+    //           Default is 1 MB.
+    //
+    // "cm"  -- minimum object size in bytes to compress (unsigned
+    //           integer). Objects whose serialized size is below
+    //           this limit are not compressed. Default is 1 KB.
+    //
+    // "cat" -- if the value is set to "i" (which means "internal"
+    //           or "injected"), the catalog data will be injected
+    //           into the data stream in addition to having it in
+    //           a separate catalog file. This allows for catalog
+    //           recovery from the data stream in cases of program
+    //           failure but also increases the data file size.
+    //           The default value of this option is "s" which means
+    //           that the catalog data will be stored separately.
+    //           This option is meaningful for new archives only,
+    //           for existing archives the value of this option is
+    //           taken from the archive header record.
+    //
+    // Example: "w+:z=z:cl=9:cm=2048:cat=s". This will compress
+    // objects with 2 KB or larger size using level 9 zlib compression
+    // (the best compression ratio possible in zlib which is also
+    // the slowest). The archive will be open for reading and writing.
+    // If an archive with the same name already exists, it will be
+    // overwritten. The catalog will be stored in a separate file
+    // created when the archive is closed, catalog recovery from the
+    // data file(s) in case of a catastrophic program failure will not
+    // be possible.
+    //
+    BinaryArchiveBase(const char *name, const char *mode);
+
+    ~BinaryArchiveBase() override;
+
+    inline bool isOpen() const override { return modeIsValid_ && catalog_; }
+
+    inline bool isReadable() const override { return modeIsValid_ && catalog_ && (mode_ & std::ios_base::in); }
+
+    inline bool isWritable() const override { return modeIsValid_ && catalog_ && (mode_ & std::ios_base::out); }
+
+    // Error message produced in case the archive could not be opened
+    inline std::string error() const override { return errorStream_ ? errorStream_->str() : std::string(""); }
+
+    // Check whether the constructor "mode" argument was valid.
+    // If it was not, derived classes should behave as if the
+    // archive could not be opened.
+    inline bool modeValid() const { return modeIsValid_; }
+
+    inline unsigned long long size() const override { return catalog_ ? catalog_->size() : 0ULL; }
+
+    inline unsigned long long smallestId() const override { return catalog_ ? catalog_->smallestId() : 0ULL; }
+
+    inline unsigned long long largestId() const override { return catalog_ ? catalog_->largestId() : 0ULL; }
+
+    inline bool idsAreContiguous() const override { return catalog_ ? catalog_->isContiguous() : false; }
+
+    inline bool itemExists(const unsigned long long id) const override {
+      return catalog_ ? catalog_->itemExists(id) : false;
+    }
+
+    void itemSearch(const SearchSpecifier &namePattern,
+                    const SearchSpecifier &categoryPattern,
+                    std::vector<unsigned long long> *idsFound) const override;
+
+    inline CPP11_shared_ptr<const CatalogEntry> catalogEntry(const unsigned long long id) override {
+      return catalog_ ? catalog_->retrieveEntry(id)
+                      : CPP11_shared_ptr<const CatalogEntry>((const CatalogEntry *)nullptr);
+    }
+
+    // Inspection methods for compression options
+    inline CStringStream::CompressionMode compressionMode() const { return cStream_->compressionMode(); }
+
+    inline std::size_t compressionBufferSize() const { return cStream_->bufferSize(); }
+
+    inline int compressionLevel() const { return cStream_->compressionLevel(); }
+
+    inline unsigned minSizeToCompress() const { return cStream_->minSizeToCompress(); }
+
+    // Inject metadata into the data stream when writing? If this
+    // method returns "true", we either had "cat=i" in the opening
+    // mode for a new archive or a corresponding flag was set in
+    // the header of an existing archive data file.
+    inline bool injectMetadata() const { return addCatalogToData_; }
+
+    // The following method moves the "get pointer" of the stream
+    // to the end of file as a side effect
+    static bool isEmptyFile(std::fstream &s);
+
+    // The following method converts the first section of the "mode"
+    // argument into std::ios_base::openmode
+    static std::ios_base::openmode parseMode(const char *mode);
+
+  protected:
+    inline AbsCatalog *catalog() const { return catalog_; }
+
+    // Non-null catalog must be set exactly once. This object will
+    // assume the catalog ownership. Null catalog can be set after
+    // non-null in case some essential operation on the catalog has
+    // failed (such as writing it to file) in order to indicate
+    // failure to open the archive.
+    void setCatalog(AbsCatalog *c);
+
+    // Set compression mode (can be used when the catalog is read).
+    // The argment must be consistent with one of the modes defined
+    // in the CStringStream.hh header.
+    inline void setCompressionMode(const unsigned cMode) {
+      cStream_->setCompressionMode(static_cast<CStringStream::CompressionMode>(cMode));
+    }
+
+    // Stream for error messages. To be used from constructors
+    // of derived classes in case of problems, to indicate the
+    // reason why the archive could not be opened.
+    inline std::ostringstream &errorStream() {
+      if (!errorStream_)
+        errorStream_ = new std::ostringstream();
+      return *errorStream_;
+    }
+
+    // The following method opens a binary archive. It makes sure
+    // that a proper header is written out in case an empty file
+    // is open or in case the file is truncated, and that the header
+    // is there when a non-empty file is open without truncation.
+    // If the argument fstream is open when this method is invoked,
+    // it is closed first. After invocation of this method, the
+    // "injectMetadata()" flag will be properly set up for the
+    // data file open last. If the method is not successful, it
+    // closes the stream and throws an exception inherited from
+    // "IOException".
+    //
+    void openDataFile(std::fstream &stream, const char *filename);
+
+    // Stream mode used to open the archive data file(s)
+    inline std::ios_base::openmode openmode() const { return mode_; }
+
+    // Info needed for catalog recovery. These methods will return
+    // null pointers if item metadata is not in the data stream.
+    const ClassId *catalogEntryClassId() const { return storedEntryId_; }
+    const ClassId *itemLocationClassId() const { return storedLocationId_; }
+
+  private:
+    BinaryArchiveBase() = delete;
+    BinaryArchiveBase(const BinaryArchiveBase &) = delete;
+    BinaryArchiveBase &operator=(const BinaryArchiveBase &) = delete;
+
+    static bool parseArchiveOptions(std::ostringstream &errmes,
+                                    const char *mode,
+                                    CStringStream::CompressionMode *m,
+                                    int *compressionLevel,
+                                    unsigned *minSizeToCompress,
+                                    unsigned *bufSize,
+                                    bool *multiplexCatalog);
+
+    void writeHeader(std::ostream &os);
+
+    // The following method returns "true" if a correctly
+    // formatted header was found
+    bool readHeader(std::istream &is);
+
+    void search(AbsReference &reference) override;
+
+    // The derived classes must override the following two methods
+    virtual std::ostream &plainOutputStream() = 0;
+    virtual std::istream &plainInputStream(unsigned long long id,
+                                           unsigned *compressionCode,
+                                           unsigned long long *length) = 0;
+
+    std::istream &inputStream(unsigned long long id, long long *sz) override;
+    std::ostream &outputStream() override;
+    std::ostream &compressedStream(std::ostream &uncompressed) override;
+    unsigned flushCompressedRecord(std::ostream &compressed) override;
+    void releaseClassIds();
+
+    const std::ios_base::openmode mode_;
+    std::ostringstream *errorStream_;
+    CStringStream *cStream_;
+    AbsCatalog *catalog_;
+    ClassId *storedEntryId_;
+    ClassId *storedLocationId_;
+    bool catalogIsSet_;
+    bool modeIsValid_;
+    bool addCatalogToData_;
+  };
+}  // namespace gs
+
+#endif  // GENERS_BINARYARCHIVEBASE_HH_
diff --git a/Alignment/Geners/interface/BinaryFileArchive.hh b/Alignment/Geners/interface/BinaryFileArchive.hh
index 411f872863966..9fa10b0558981 100644
--- a/Alignment/Geners/interface/BinaryFileArchive.hh
+++ b/Alignment/Geners/interface/BinaryFileArchive.hh
@@ -7,61 +7,58 @@
 #include "Alignment/Geners/interface/CatalogIO.hh"
 
 namespace gs {
-    class BinaryFileArchive : public BinaryArchiveBase
-    {
-    public:
-        // See the note inside the "BinaryArchiveBase.hh" header
-        // for the meaning of the "mode" argument
-        BinaryFileArchive(const char* basename, const char* mode,
-                          const char* annotation = 0,
-                          unsigned dataFileBufferSize = 1048576U,
-                          unsigned catalogFileBufferSize = 131072U);
-        virtual ~BinaryFileArchive();
+  class BinaryFileArchive : public BinaryArchiveBase {
+  public:
+    // See the note inside the "BinaryArchiveBase.hh" header
+    // for the meaning of the "mode" argument
+    BinaryFileArchive(const char *basename,
+                      const char *mode,
+                      const char *annotation = nullptr,
+                      unsigned dataFileBufferSize = 1048576U,
+                      unsigned catalogFileBufferSize = 131072U);
+    ~BinaryFileArchive() override;
 
-        void flush();
+    void flush() override;
 
-    private:
-        void writeCatalog();
-        void releaseBuffers();
+  private:
+    void writeCatalog();
+    void releaseBuffers();
 
-        template<class Catalog>
-        void readCatalog()
-        {
-            assert(!catalog());
-            unsigned compressionMode;
-            setCatalog(readBinaryCatalog<Catalog>(
-                           catStream_, &compressionMode, &catalogMergeLevel_,
-                           &catalogAnnotations_, true));
-            assert(catalog());
-            setCompressionMode(compressionMode);
-        }
+    template <class Catalog>
+    void readCatalog() {
+      assert(!catalog());
+      unsigned compressionMode;
+      setCatalog(
+          readBinaryCatalog<Catalog>(catStream_, &compressionMode, &catalogMergeLevel_, &catalogAnnotations_, true));
+      assert(catalog());
+      setCompressionMode(compressionMode);
+    }
 
-        // The following methods have to be overriden from the base
-        std::ostream& plainOutputStream();
-        std::istream& plainInputStream(unsigned long long id,
-                                       unsigned* compressionCode,
-                                       unsigned long long* length);
+    // The following methods have to be overriden from the base
+    std::ostream &plainOutputStream() override;
+    std::istream &plainInputStream(unsigned long long id,
+                                   unsigned *compressionCode,
+                                   unsigned long long *length) override;
 
-        unsigned long long addToCatalog(
-            const AbsRecord& record, unsigned compressionCode,
-            unsigned long long itemLength);
+    unsigned long long addToCatalog(const AbsRecord &record,
+                                    unsigned compressionCode,
+                                    unsigned long long itemLength) override;
 
-        char* filebuf_;
-        char* catabuf_;
-        std::string annotation_;
-        std::string dataFileName_;
-        std::string catalogFileName_;
-        std::string dataFileURI_;
-        std::fstream dataStream_;
-        std::fstream catStream_;
-        std::streampos lastpos_;
-        std::streampos jumppos_;
-        std::vector<std::string> catalogAnnotations_;
-        unsigned catalogMergeLevel_;
-        bool annotationsMerged_;
-        bool streamFlushed_;
-    };
-}
-
-#endif // GENERS_BINARYFILEARCHIVE_HH_
+    char *filebuf_;
+    char *catabuf_;
+    std::string annotation_;
+    std::string dataFileName_;
+    std::string catalogFileName_;
+    std::string dataFileURI_;
+    std::fstream dataStream_;
+    std::fstream catStream_;
+    std::streampos lastpos_;
+    std::streampos jumppos_;
+    std::vector<std::string> catalogAnnotations_;
+    unsigned catalogMergeLevel_;
+    bool annotationsMerged_;
+    bool streamFlushed_;
+  };
+}  // namespace gs
 
+#endif  // GENERS_BINARYFILEARCHIVE_HH_
diff --git a/Alignment/Geners/interface/CPP11_auto_ptr.hh b/Alignment/Geners/interface/CPP11_auto_ptr.hh
index bc8d98fec5628..1de84b424a6b1 100644
--- a/Alignment/Geners/interface/CPP11_auto_ptr.hh
+++ b/Alignment/Geners/interface/CPP11_auto_ptr.hh
@@ -11,5 +11,4 @@
 #define CPP11_auto_ptr std::auto_ptr
 #endif
 
-#endif // GENERS_CPP11_AUTO_PTR_HH_
-
+#endif  // GENERS_CPP11_AUTO_PTR_HH_
diff --git a/Alignment/Geners/interface/CPP11_config.hh b/Alignment/Geners/interface/CPP11_config.hh
index ab30ecf9200f4..f3e0ae462b695 100644
--- a/Alignment/Geners/interface/CPP11_config.hh
+++ b/Alignment/Geners/interface/CPP11_config.hh
@@ -5,5 +5,4 @@
 #define CPP11_STD_AVAILABLE
 #endif
 
-#endif // GENERS_CPP11_CONFIG_HH_
-
+#endif  // GENERS_CPP11_CONFIG_HH_
diff --git a/Alignment/Geners/interface/CPP11_shared_ptr.hh b/Alignment/Geners/interface/CPP11_shared_ptr.hh
index bbd87bbffd3f8..cc80ba4422ab0 100644
--- a/Alignment/Geners/interface/CPP11_shared_ptr.hh
+++ b/Alignment/Geners/interface/CPP11_shared_ptr.hh
@@ -11,5 +11,4 @@
 #define CPP11_shared_ptr std::tr1::shared_ptr
 #endif
 
-#endif // GENERS_CPP11_SHARED_PTR_HH_
-
+#endif  // GENERS_CPP11_SHARED_PTR_HH_
diff --git a/Alignment/Geners/interface/CPP11_type_traits.hh b/Alignment/Geners/interface/CPP11_type_traits.hh
index 4f2ad38755dc0..259b6d994fc86 100644
--- a/Alignment/Geners/interface/CPP11_type_traits.hh
+++ b/Alignment/Geners/interface/CPP11_type_traits.hh
@@ -13,5 +13,4 @@
 #define CPP11_is_pointer std::tr1::is_pointer
 #endif
 
-#endif // GENERS_CPP11_TYPE_TRAITS_HH_
-
+#endif  // GENERS_CPP11_TYPE_TRAITS_HH_
diff --git a/Alignment/Geners/interface/CStringBuf.hh b/Alignment/Geners/interface/CStringBuf.hh
index 8f744c3006e9b..793bd1b9a5bb5 100644
--- a/Alignment/Geners/interface/CStringBuf.hh
+++ b/Alignment/Geners/interface/CStringBuf.hh
@@ -4,21 +4,17 @@
 #include <sstream>
 
 namespace gs {
-    class CStringBuf : public std::stringbuf
-    {
-    public:
-        explicit CStringBuf(std::ios_base::openmode mode = 
-                            std::ios_base::in | std::ios_base::out)
-            : std::stringbuf(mode) {}
+  class CStringBuf : public std::stringbuf {
+  public:
+    explicit CStringBuf(std::ios_base::openmode mode = std::ios_base::in | std::ios_base::out) : std::stringbuf(mode) {}
 
-        const char* getGetBuffer(unsigned long long* len) const;
-        const char* getPutBuffer(unsigned long long* len) const;
+    const char *getGetBuffer(unsigned long long *len) const;
+    const char *getPutBuffer(unsigned long long *len) const;
 
-    private:
-        CStringBuf(const CStringBuf&);
-        CStringBuf& operator=(const CStringBuf&);
-    };
-}
-
-#endif // GENERS_CSTRINGBUF_HH_
+  private:
+    CStringBuf(const CStringBuf &) = delete;
+    CStringBuf &operator=(const CStringBuf &) = delete;
+  };
+}  // namespace gs
 
+#endif  // GENERS_CSTRINGBUF_HH_
diff --git a/Alignment/Geners/interface/CStringStream.hh b/Alignment/Geners/interface/CStringStream.hh
index c6a1bf8a63d20..f43826f439c8d 100644
--- a/Alignment/Geners/interface/CStringStream.hh
+++ b/Alignment/Geners/interface/CStringStream.hh
@@ -15,80 +15,70 @@
 #ifndef GENERS_CSTRINGSTREAM_HH_
 #define GENERS_CSTRINGSTREAM_HH_
 
-#include <vector>
 #include <iostream>
+#include <vector>
 
 #include "Alignment/Geners/interface/CPP11_auto_ptr.hh"
 #include "Alignment/Geners/interface/CStringBuf.hh"
 #include "Alignment/Geners/interface/ZlibHandle.hh"
 
 namespace gs {
-    class CStringStream : public std::basic_iostream<char>
-    {
-    public:
-        enum CompressionMode
-        {
-            NOT_COMPRESSED = 0,
-            ZLIB,
-            BZIP2
-        };
-
-        CStringStream(CompressionMode m, int compressionLevel,
-                      unsigned minSizeToCompress, unsigned bufSize);
-
-        // Basic inspectors
-        inline CompressionMode compressionMode() const {return mode_;}
-        inline int compressionLevel() const {return compressionLevel_;}
-        inline unsigned minSizeToCompress() const {return minSizeToCompress_;}
-        inline std::size_t bufferSize() const {return comprBuf_.size();}
-
-        // "setCompressionMode" calls "reset" internally.
-        // All unprocessed data will be lost.
-        void setCompressionMode(CompressionMode m);
-
-        // The sink must be set before calling "writeCompressed".
-        // This is where the compressed data will be dumped.
-        inline void setSink(std::ostream& os) {sink_ = &os;}
-
-        // "writeCompressed" compresses the content of this stream
-        // and dumps them to sink. The write pointer is repositioned
-        // at the beginning of the stream. The compression mode is
-        // returned (always NOT_COMPRESSED if the amount of data
-        // was below "minSizeToCompress").
-        CompressionMode writeCompressed();
-
-        // Fill this stream from compressed data. Could be called
-        // repetitively. Uncompressed data is appended at the end
-        // (internal pointers are not reset).
-        void readCompressed(std::istream& in, unsigned compressionCode,
-                            unsigned long long len);
-
-        // Reposition both read and write pointers of the stream
-        // at the beginning of the stream
-        void reset();
-
-        // Parse the compression mode. Returns "true" on success.
-        static bool getCompressionModeByName(const char* name,
-                                             CompressionMode* m);
-
-        // String representation of the compression mode
-        static std::string compressionModeName(CompressionMode m,
-                                               bool useShortName=true);
-    private:
-        CStringStream(const CStringStream&);
-        CStringStream& operator=(const CStringStream&);
-
-        CStringBuf buf_;
-        CompressionMode mode_;
-        int compressionLevel_;
-        unsigned minSizeToCompress_;
-        std::vector<char> comprBuf_;
-        std::vector<char> readBuf_;
-        std::ostream* sink_;
-        CPP11_auto_ptr<ZlibInflateHandle> inflator_;
-        CPP11_auto_ptr<ZlibDeflateHandle> deflator_;
-    };
-}
-
-#endif // GENERS_CSTRINGSTREAM_HH_
-
+  class CStringStream : public std::basic_iostream<char> {
+  public:
+    enum CompressionMode { NOT_COMPRESSED = 0, ZLIB, BZIP2 };
+
+    CStringStream(CompressionMode m, int compressionLevel, unsigned minSizeToCompress, unsigned bufSize);
+
+    // Basic inspectors
+    inline CompressionMode compressionMode() const { return mode_; }
+    inline int compressionLevel() const { return compressionLevel_; }
+    inline unsigned minSizeToCompress() const { return minSizeToCompress_; }
+    inline std::size_t bufferSize() const { return comprBuf_.size(); }
+
+    // "setCompressionMode" calls "reset" internally.
+    // All unprocessed data will be lost.
+    void setCompressionMode(CompressionMode m);
+
+    // The sink must be set before calling "writeCompressed".
+    // This is where the compressed data will be dumped.
+    inline void setSink(std::ostream &os) { sink_ = &os; }
+
+    // "writeCompressed" compresses the content of this stream
+    // and dumps them to sink. The write pointer is repositioned
+    // at the beginning of the stream. The compression mode is
+    // returned (always NOT_COMPRESSED if the amount of data
+    // was below "minSizeToCompress").
+    CompressionMode writeCompressed();
+
+    // Fill this stream from compressed data. Could be called
+    // repetitively. Uncompressed data is appended at the end
+    // (internal pointers are not reset).
+    void readCompressed(std::istream &in, unsigned compressionCode, unsigned long long len);
+
+    // Reposition both read and write pointers of the stream
+    // at the beginning of the stream
+    void reset();
+
+    // Parse the compression mode. Returns "true" on success.
+    static bool getCompressionModeByName(const char *name, CompressionMode *m);
+
+    // String representation of the compression mode
+    static std::string compressionModeName(CompressionMode m, bool useShortName = true);
+
+  private:
+    CStringStream(const CStringStream &) = delete;
+    CStringStream &operator=(const CStringStream &) = delete;
+
+    CStringBuf buf_;
+    CompressionMode mode_;
+    int compressionLevel_;
+    unsigned minSizeToCompress_;
+    std::vector<char> comprBuf_;
+    std::vector<char> readBuf_;
+    std::ostream *sink_;
+    CPP11_auto_ptr<ZlibInflateHandle> inflator_;
+    CPP11_auto_ptr<ZlibDeflateHandle> deflator_;
+  };
+}  // namespace gs
+
+#endif  // GENERS_CSTRINGSTREAM_HH_
diff --git a/Alignment/Geners/interface/CatalogEntry.hh b/Alignment/Geners/interface/CatalogEntry.hh
index a4756b8b8fe01..a9548dfd5cf07 100644
--- a/Alignment/Geners/interface/CatalogEntry.hh
+++ b/Alignment/Geners/interface/CatalogEntry.hh
@@ -5,63 +5,68 @@
 #include "Alignment/Geners/interface/ItemLocation.hh"
 
 namespace gs {
-    class CatalogEntry : public ItemDescriptor
-    {
-    public:
-        // Default constructor returns an invalid entry
-        CatalogEntry();
+  class CatalogEntry : public ItemDescriptor {
+  public:
+    // Default constructor returns an invalid entry
+    CatalogEntry();
 
-        // Use this constructor to build valid entries
-        CatalogEntry(const ItemDescriptor& descr,
-                     unsigned long long id,
-                     unsigned compressionCode,
-                     unsigned long long itemLength,
-                     const ItemLocation& location,
-                     unsigned long long offset=0ULL);
+    // Use this constructor to build valid entries
+    CatalogEntry(const ItemDescriptor &descr,
+                 unsigned long long id,
+                 unsigned compressionCode,
+                 unsigned long long itemLength,
+                 const ItemLocation &location,
+                 unsigned long long offset = 0ULL);
 
-        inline virtual ~CatalogEntry() {}
+    inline ~CatalogEntry() override {}
 
-        inline unsigned long long id() const {return id_;}
-        inline unsigned long long offset() const {return offset_;}
-        inline const ItemLocation& location() const {return location_;}
-        inline unsigned long long itemLength() const {return len_;}
-        inline unsigned compressionCode() const {return compressionCode_;}
+    inline unsigned long long id() const { return id_; }
+    inline unsigned long long offset() const { return offset_; }
+    inline const ItemLocation &location() const { return location_; }
+    inline unsigned long long itemLength() const { return len_; }
+    inline unsigned compressionCode() const { return compressionCode_; }
 
-        inline CatalogEntry& setStreamPosition(std::streampos pos)
-            {location_.setStreamPosition(pos); return *this;}
-        inline CatalogEntry& setURI(const char* newURI)
-            {location_.setURI(newURI); return *this;}
-        inline CatalogEntry& setCachedItemURI(const char* newURI)
-            {location_.setCachedItemURI(newURI); return *this;}
-        inline CatalogEntry& setOffset(const unsigned long long off)
-            {offset_ = off; return *this;}
+    inline CatalogEntry &setStreamPosition(std::streampos pos) {
+      location_.setStreamPosition(pos);
+      return *this;
+    }
+    inline CatalogEntry &setURI(const char *newURI) {
+      location_.setURI(newURI);
+      return *this;
+    }
+    inline CatalogEntry &setCachedItemURI(const char *newURI) {
+      location_.setCachedItemURI(newURI);
+      return *this;
+    }
+    inline CatalogEntry &setOffset(const unsigned long long off) {
+      offset_ = off;
+      return *this;
+    }
 
-        // Dump a simple human-readable representation
-        bool humanReadable(std::ostream& os) const;
+    // Dump a simple human-readable representation
+    bool humanReadable(std::ostream &os) const;
 
-        // Methods related to I/O for this record itself
-        inline virtual ClassId classId() const {return ClassId(*this);}
-        virtual bool write(std::ostream& of) const;
+    // Methods related to I/O for this record itself
+    inline virtual ClassId classId() const { return ClassId(*this); }
+    virtual bool write(std::ostream &of) const;
 
-        static inline const char* classname() {return "gs::CatalogEntry";}
-        static inline unsigned version() {return 1;}
+    static inline const char *classname() { return "gs::CatalogEntry"; }
+    static inline unsigned version() { return 1; }
 
-        // "locId" is the class id for ItemLocation. Should be written
-        // out by the catalog together with the CatalogEntry class id.
-        static CatalogEntry* read(const ClassId& id, const ClassId& locId,
-                                  std::istream& in);
+    // "locId" is the class id for ItemLocation. Should be written
+    // out by the catalog together with the CatalogEntry class id.
+    static CatalogEntry *read(const ClassId &id, const ClassId &locId, std::istream &in);
 
-    protected:
-        virtual bool isEqual(const ItemDescriptor&) const;
+  protected:
+    bool isEqual(const ItemDescriptor &) const override;
 
-    private:
-        unsigned long long id_;
-        unsigned long long len_;
-        unsigned long long offset_;
-        unsigned compressionCode_;
-        ItemLocation location_;
-    };
-}
-
-#endif // GENERS_CATALOGENTRY_HH_
+  private:
+    unsigned long long id_;
+    unsigned long long len_;
+    unsigned long long offset_;
+    unsigned compressionCode_;
+    ItemLocation location_;
+  };
+}  // namespace gs
 
+#endif  // GENERS_CATALOGENTRY_HH_
diff --git a/Alignment/Geners/interface/CatalogIO.hh b/Alignment/Geners/interface/CatalogIO.hh
index 86000a132a9a5..41ed25a553d5f 100644
--- a/Alignment/Geners/interface/CatalogIO.hh
+++ b/Alignment/Geners/interface/CatalogIO.hh
@@ -16,127 +16,121 @@
 #include "Alignment/Geners/interface/AbsCatalog.hh"
 
 namespace gs {
-    struct CatalogFormat1
-    {
-        enum {ID = 713265489};
-    };
-
-    // In the following, it is assumed that the catalog is stored
-    // in memory and that it has a stream dedicated to it. The
-    // function returns "true" on success.
-    //
-    // Programs which make new catalogs should set "mergeLevel" to 1.
-    // Programs which combine existing catalogs should add up the
-    // merge levels of those catalogs to come up with the "mergeLevel".
-    //
-    // "annotations" are arbitrary strings (which should be just combined
-    // when catalogs are merged).
-    bool writeBinaryCatalog(std::ostream& os, unsigned compressionCode,
-                            unsigned mergeLevel,
-                            const std::vector<std::string>& annotations,
-                            const AbsCatalog& catalog,
-                            unsigned formatId = CatalogFormat1::ID);
-
-    // In the following, it is assumed that the Catalog class
-    // has a "read" function which builds the catalog on the heap.
-    // The "allowReadingByDifferentClass" parameter specifies
-    // whether the catalog class is allowed to read something
-    // written by another catalog class. This function returns NULL
-    // pointer on failure. Note that the user must call "delete"
-    // on the returned pointer at some point in the future.
-    template <class Catalog>
-    Catalog* readBinaryCatalog(std::istream& is, unsigned* compressionCode,
-                               unsigned* mergeLevel,
-                               std::vector<std::string>* annotations,
-                               bool allowReadingByDifferentClass,
-                               unsigned formatId = CatalogFormat1::ID);
-}
+  struct CatalogFormat1 {
+    enum { ID = 713265489 };
+  };
+
+  // In the following, it is assumed that the catalog is stored
+  // in memory and that it has a stream dedicated to it. The
+  // function returns "true" on success.
+  //
+  // Programs which make new catalogs should set "mergeLevel" to 1.
+  // Programs which combine existing catalogs should add up the
+  // merge levels of those catalogs to come up with the "mergeLevel".
+  //
+  // "annotations" are arbitrary strings (which should be just combined
+  // when catalogs are merged).
+  bool writeBinaryCatalog(std::ostream &os,
+                          unsigned compressionCode,
+                          unsigned mergeLevel,
+                          const std::vector<std::string> &annotations,
+                          const AbsCatalog &catalog,
+                          unsigned formatId = CatalogFormat1::ID);
+
+  // In the following, it is assumed that the Catalog class
+  // has a "read" function which builds the catalog on the heap.
+  // The "allowReadingByDifferentClass" parameter specifies
+  // whether the catalog class is allowed to read something
+  // written by another catalog class. This function returns NULL
+  // pointer on failure. Note that the user must call "delete"
+  // on the returned pointer at some point in the future.
+  template <class Catalog>
+  Catalog *readBinaryCatalog(std::istream &is,
+                             unsigned *compressionCode,
+                             unsigned *mergeLevel,
+                             std::vector<std::string> *annotations,
+                             bool allowReadingByDifferentClass,
+                             unsigned formatId = CatalogFormat1::ID);
+}  // namespace gs
 
-#include <sstream>
 #include <cassert>
+#include <sstream>
 
-#include "Alignment/Geners/interface/binaryIO.hh"
 #include "Alignment/Geners/interface/IOException.hh"
+#include "Alignment/Geners/interface/binaryIO.hh"
 
 namespace gs {
-    template <class Catalog>
-    Catalog* readBinaryCatalog(std::istream& is, unsigned* compressionCode,
-                               unsigned* mergeLevel,
-                               std::vector<std::string>* annotations,
-                               const bool allowReadingByDifferentClass,
-                               const unsigned expectedformatId)
-    {
-        assert(compressionCode);
-        assert(mergeLevel);
-        assert(annotations);
-
-        is.seekg(0, std::ios_base::beg);
-
-        unsigned formatId = 0, endianness = 0;
-        unsigned char sizelong = 0;
-        read_pod(is, &formatId);
-        read_pod(is, &endianness);
-        read_pod(is, &sizelong);
-
-        if (is.fail()) throw IOReadFailure(
-            "In gs::readBinaryCatalog: input stream failure");
-
-        if (endianness != 0x01020304 ||
-              formatId != expectedformatId ||
-              sizelong != sizeof(long))
-            throw IOInvalidData("In gs::readBinaryCatalog: not \"geners\" "
-                                "binary metafile or incompatible system "
-                                "architecture");
-
-        read_pod(is, compressionCode);
-        read_pod(is, mergeLevel);
-        read_pod_vector(is, annotations);
-        ClassId id(is, 1);
-        Catalog* readback = 0;
-
-        ClassId catId(ClassId::makeId<Catalog>());
-        if (id.name() == catId.name())
-            // The reading is done by the same class as the writing.
-            // Make sure the "read" function gets the correct class version.
-            readback = Catalog::read(id, is);
-        else
-        {
-            if (!allowReadingByDifferentClass)
-            {
-                std::ostringstream os;
-                os << "In gs::readBinarCatalog: incompatible "
-                   << "catalog class: written by \"" << id.name()
-                   << "\", but reading is attempted by \""
-                   << catId.name() << '"';
-                throw IOInvalidData(os.str());
-            }
-
-            // The reading is not done by the same class as the writing.
-            // All bets are off, and it is up to the user to decide whether
-            // this makes sense. However, to maintain compatibility with
-            // version 1 archives, we need to pass this version to the
-            // catalog read function.
-            if (id.version() == 1)
-                catId.setVersion(1);
-
-            readback = Catalog::read(catId, is);
-        }
-
-        // Catalogs do not necessarily know their size in advance,
-        // so that they might read until the end of file is encountered.
-        // However, the eof flag on the stream can result in various
-        // problems later (for example, in writing to the stream).
-        // Remove this flag.
-        if (is.eof() && !is.fail() && !is.bad())
-        {
-            is.clear();
-            is.seekg(0, std::ios_base::end);
-        }
-
-        return readback;
+  template <class Catalog>
+  Catalog *readBinaryCatalog(std::istream &is,
+                             unsigned *compressionCode,
+                             unsigned *mergeLevel,
+                             std::vector<std::string> *annotations,
+                             const bool allowReadingByDifferentClass,
+                             const unsigned expectedformatId) {
+    assert(compressionCode);
+    assert(mergeLevel);
+    assert(annotations);
+
+    is.seekg(0, std::ios_base::beg);
+
+    unsigned formatId = 0, endianness = 0;
+    unsigned char sizelong = 0;
+    read_pod(is, &formatId);
+    read_pod(is, &endianness);
+    read_pod(is, &sizelong);
+
+    if (is.fail())
+      throw IOReadFailure("In gs::readBinaryCatalog: input stream failure");
+
+    if (endianness != 0x01020304 || formatId != expectedformatId || sizelong != sizeof(long))
+      throw IOInvalidData(
+          "In gs::readBinaryCatalog: not \"geners\" "
+          "binary metafile or incompatible system "
+          "architecture");
+
+    read_pod(is, compressionCode);
+    read_pod(is, mergeLevel);
+    read_pod_vector(is, annotations);
+    ClassId id(is, 1);
+    Catalog *readback = nullptr;
+
+    ClassId catId(ClassId::makeId<Catalog>());
+    if (id.name() == catId.name())
+      // The reading is done by the same class as the writing.
+      // Make sure the "read" function gets the correct class version.
+      readback = Catalog::read(id, is);
+    else {
+      if (!allowReadingByDifferentClass) {
+        std::ostringstream os;
+        os << "In gs::readBinarCatalog: incompatible "
+           << "catalog class: written by \"" << id.name() << "\", but reading is attempted by \"" << catId.name()
+           << '"';
+        throw IOInvalidData(os.str());
+      }
+
+      // The reading is not done by the same class as the writing.
+      // All bets are off, and it is up to the user to decide whether
+      // this makes sense. However, to maintain compatibility with
+      // version 1 archives, we need to pass this version to the
+      // catalog read function.
+      if (id.version() == 1)
+        catId.setVersion(1);
+
+      readback = Catalog::read(catId, is);
     }
-}
 
+    // Catalogs do not necessarily know their size in advance,
+    // so that they might read until the end of file is encountered.
+    // However, the eof flag on the stream can result in various
+    // problems later (for example, in writing to the stream).
+    // Remove this flag.
+    if (is.eof() && !is.fail() && !is.bad()) {
+      is.clear();
+      is.seekg(0, std::ios_base::end);
+    }
 
-#endif // GENERS_CATALOGIO_HH_
+    return readback;
+  }
+}  // namespace gs
 
+#endif  // GENERS_CATALOGIO_HH_
diff --git a/Alignment/Geners/interface/CharBuffer.hh b/Alignment/Geners/interface/CharBuffer.hh
index 5ad2f356b2b95..84da1a2b9d5c9 100644
--- a/Alignment/Geners/interface/CharBuffer.hh
+++ b/Alignment/Geners/interface/CharBuffer.hh
@@ -3,33 +3,29 @@
 
 #include <iostream>
 
-#include "Alignment/Geners/interface/ClassId.hh"
 #include "Alignment/Geners/interface/CStringBuf.hh"
+#include "Alignment/Geners/interface/ClassId.hh"
 
 namespace gs {
-    class CharBuffer : public std::basic_iostream<char>
-    {
-    public:
-        inline CharBuffer() {this->init(&buf_);}
-
-        unsigned long size() const;
+  class CharBuffer : public std::basic_iostream<char> {
+  public:
+    inline CharBuffer() { this->init(&buf_); }
 
-        inline ClassId classId() const {return ClassId(*this);}
-        bool write(std::ostream& of) const;
+    unsigned long size() const;
 
-        static inline const char* classname() {return "gs::CharBuffer";}
-        static inline unsigned version() {return 1;}
-        static void restore(const ClassId& id, std::istream& in,
-                            CharBuffer* buf);
+    inline ClassId classId() const { return ClassId(*this); }
+    bool write(std::ostream &of) const;
 
-        bool operator==(const CharBuffer& r) const;
-        inline bool operator!=(const CharBuffer& r) const
-            {return !(*this == r);}
+    static inline const char *classname() { return "gs::CharBuffer"; }
+    static inline unsigned version() { return 1; }
+    static void restore(const ClassId &id, std::istream &in, CharBuffer *buf);
 
-    private:
-        CStringBuf buf_;
-    };
-}
+    bool operator==(const CharBuffer &r) const;
+    inline bool operator!=(const CharBuffer &r) const { return !(*this == r); }
 
-#endif // GENERS_CHARBUFFER_HH_
+  private:
+    CStringBuf buf_;
+  };
+}  // namespace gs
 
+#endif  // GENERS_CHARBUFFER_HH_
diff --git a/Alignment/Geners/interface/ClassId.hh b/Alignment/Geners/interface/ClassId.hh
index 521e2650ca56f..9ceb182923606 100644
--- a/Alignment/Geners/interface/ClassId.hh
+++ b/Alignment/Geners/interface/ClassId.hh
@@ -12,243 +12,215 @@
 #ifndef GENERS_CLASSID_HH_
 #define GENERS_CLASSID_HH_
 
-#include <vector>
-#include <string>
 #include <iostream>
+#include <string>
+#include <vector>
 
 namespace gs {
-    class ClassId
-    {
-    public:
-        // Generic constructor using a prefix (which is usually
-        // a class name) and a version number
-        inline ClassId(const char* prefix, const unsigned version,
-                       const bool isPtr=false)
-            {initialize(prefix, version, isPtr);}
-
-        // Generic constructor using a prefix (which is usually
-        // a class name) and a version number
-        inline ClassId(const std::string& prefix, const unsigned version,
-                       const bool isPtr=false)
-            {initialize(prefix.c_str(), version, isPtr);}
-
-        // Use the following constructor in the "classId()" methods
-        // of user-developed classes.
-        //
-        // Implementation note: it is possible to "specialize"
-        // this constructor by delegating the actual job to the
-        // "ClassIdSpecialization". Then we would be able to create
-        // class ids for built-in and user types in a unified
-        // way. This, however, would incur a performance hit
-        // due to the necessity of making another ClassId and
-        // copying the result into the internals of the new object.
-        // This performance hit was deemed significant. If you
-        // need a universal way to create class ids at some
-        // point in your code, use the "itemId" method instead
-        // (this may or may not incur a performance hit, depending
-        // on what exactly the compiler does).
-        template<class T>
-        inline ClassId(const T&)
-            {initialize(T::classname(), T::version(), false);}
-
-        // Constructor from the class id represented by a string
-        explicit ClassId(const std::string& id);
-
-        // Use the following constructor in "read" functions.
-        // Dummy argument "reading" is needed in order to generate
-        // a distinct function signature (otherwise the templated
-        // constructor can win).
-        ClassId(std::istream& in, int reading);
-
-        // Use the following pseudo-constructor in static "read"
-        // methods in case a type check is desired. It has to be
-        // made static because constructor without any arguments
-        // can not be a template. Also, this is the way to construct
-        // class ids for built-in types (there is no way to specialize
-        // member methods).
-        template<class T>
-        static ClassId makeId();
-
-        // "Universal" item id which also works for built-in types
-        template<class T>
-        static ClassId itemId(const T&);
-
-        // Inspectors for the class name and version number
-        inline const std::string& name() const {return name_;}
-        inline unsigned version() const {return version_;}
-
-        // Is this class a pointer for I/O purposes?
-        inline bool isPointer() const {return isPtr_;}
-
-        // The following function should return a unique class id string
-        // which takes version number into account
-        inline const std::string& id() const {return id_;}
-
-        // The following checks if the class name corresponds to
-        // a template (using the standard manner of class name forming)
-        bool isTemplate() const;
-
-        // The following function fills the vector with class template
-        // parameters (if the class is not a template, the vector is
-        // cleared). Due to the manner in which things are used in this
-        // package, the result is actually a vector of (vectors of size 1).
-        void templateParameters(std::vector<std::vector<ClassId> >* p) const;
-
-        // Function to write this object out. Returns "true" on success.
-        bool write(std::ostream& of) const;        
-
-        // Comparison operators
-        inline bool operator==(const ClassId& r) const
-            {return id_ == r.id_;}
-        inline bool operator!=(const ClassId& r) const
-            {return !(*this == r);}
-        inline bool operator<(const ClassId& r) const
-            {return id_ < r.id_;}
-        inline bool operator>(const ClassId& r) const
-            {return id_ > r.id_;}
-
-        // Modify the version number
-        void setVersion(unsigned newVersion);
-
-        // The following methods verify that the id/classname/version
-        // of this object are equal to those of the argument and throw
-        // "gs::IOInvalidArgument" exception if this is not so
-        void ensureSameId(const ClassId& id) const;
-        void ensureSameName(const ClassId& id) const;
-        void ensureSameVersion(const ClassId& id) const;
-
-        // The following method ensures that the version number of this
-        // class id is within certain range [min, max], with both limits
-        // allowed. "gs::IOInvalidArgument" exception is thrown if this
-        // is not so.
-        void ensureVersionInRange(unsigned min, unsigned max) const;
-
-        // Sometimes one really needs to make a placeholder class id...
-        // This is a dangerous function: the code using ClassId class
-        // will normally assume that a ClassId object is always in a valid
-        // state. Invalid class ids can be distinguished by their empty
-        // class names (i.e., name().empty() returns "true").
-        static ClassId invalidId();
-
-    private:
-        ClassId();
-
-        void initialize(const char* prefix, unsigned version, bool isPtr);
-        bool makeName();
-        bool makeVersion();
-
-        std::string name_;
-        std::string id_;
-        unsigned version_;
-        bool isPtr_;
-
-        // Return "true" if the prefix is valid
-        static bool validatePrefix(const char* prefix);
-    };
-
-
-    // Simple class id compatibility checkers for use as policy classes
-    // in templated code
-    struct SameClassId
-    {
-        inline static bool compatible(const ClassId& id1, const ClassId& id2)
-            {return id1.name() == id2.name();}
-    };
-
-    struct SameClassName
-    {
-        inline static bool compatible(const ClassId& id1, const ClassId& id2)
-            {return id1 == id2;}
-    };
-
-
-    // Specialize the following template in order to be able to construct
-    // ClassId for classes which do not implement static functions
-    // "classname()" and "version()".
-    template<class T>
-    struct ClassIdSpecialization
-    {
-        inline static ClassId classId(const bool isPtr=false)
-        {
-            return ClassId(T::classname(), T::version(), isPtr);
-        }
-    };
+  class ClassId {
+  public:
+    // Generic constructor using a prefix (which is usually
+    // a class name) and a version number
+    inline ClassId(const char *prefix, const unsigned version, const bool isPtr = false) {
+      initialize(prefix, version, isPtr);
+    }
 
+    // Generic constructor using a prefix (which is usually
+    // a class name) and a version number
+    inline ClassId(const std::string &prefix, const unsigned version, const bool isPtr = false) {
+      initialize(prefix.c_str(), version, isPtr);
+    }
 
-    // Utility functions for naming template classes. The "nInclude"
-    // argument tells us how many template parameters to include into
-    // the generated template name. For example, use of
-    //
-    // template_class_name<X,Y>("myTemplate",1)
-    //
-    // will generate a class name which looks like myTemplate<X>, with
-    // second template parameter omitted. While the result is equivalent
-    // to invoking "template_class_name<X>("myTemplate")", having an
-    // explicit limit is convenient for use from certain higher-level
-    // functions. Note, however, that in the call with two template
-    // parameters the class id specialization for Y must be available,
-    // even though it is not used.
+    // Use the following constructor in the "classId()" methods
+    // of user-developed classes.
     //
-    // This feature is sometimes helpful when certain template parameters
-    // specify aspects of template behavior which have nothing to do
-    // with object data contents and I/O. Typical example of such
-    // a parameter is std::allocator of STL -- changing this to a custom
-    // allocator will not affect serialized representation of an STL
-    // container.
-    //
-    template<class T>
-    std::string template_class_name(const char* templateName,
-                                    unsigned nInclude=1);
-    template<class T>
-    std::string template_class_name(const std::string& templateName,
-                                    unsigned nInclude=1);
-    template<class T1, class T2>
-    std::string template_class_name(const char* templateName,
-                                    unsigned nInclude=2);
-    template<class T1, class T2>
-    std::string template_class_name(const std::string& templateName,
-                                    unsigned nInclude=2);
-    template<class T1, class T2, class T3>
-    std::string template_class_name(const char* templateName,
-                                    unsigned nInclude=3);
-    template<class T1, class T2, class T3>
-    std::string template_class_name(const std::string& templateName,
-                                    unsigned nInclude=3);
-    template<class T1, class T2, class T3, class T4>
-    std::string template_class_name(const char* templateName,
-                                    unsigned nInclude=4);
-    template<class T1, class T2, class T3, class T4>
-    std::string template_class_name(const std::string& templateName,
-                                    unsigned nInclude=4);
-    template<class T1, class T2, class T3, class T4, class T5>
-    std::string template_class_name(const char* templateName,
-                                    unsigned nInclude=5);
-    template<class T1, class T2, class T3, class T4, class T5>
-    std::string template_class_name(const std::string& templateName,
-                                    unsigned nInclude=5);
-    template<class T1, class T2, class T3, class T4, class T5, class T6>
-    std::string template_class_name(const char* templateName,
-                                    unsigned nInclude=6);
-    template<class T1, class T2, class T3, class T4, class T5, class T6>
-    std::string template_class_name(const std::string& templateName,
-                                    unsigned nInclude=6);
-
-    // Utility functions for naming stack-based containers such as std::array
-    template<class T, std::size_t N>
-    std::string stack_container_name(const char* templateName);
-
-    template<class T, std::size_t N>
-    std::string stack_container_name(const std::string& templateName);
-}
+    // Implementation note: it is possible to "specialize"
+    // this constructor by delegating the actual job to the
+    // "ClassIdSpecialization". Then we would be able to create
+    // class ids for built-in and user types in a unified
+    // way. This, however, would incur a performance hit
+    // due to the necessity of making another ClassId and
+    // copying the result into the internals of the new object.
+    // This performance hit was deemed significant. If you
+    // need a universal way to create class ids at some
+    // point in your code, use the "itemId" method instead
+    // (this may or may not incur a performance hit, depending
+    // on what exactly the compiler does).
+    template <class T>
+    inline ClassId(const T &) {
+      initialize(T::classname(), T::version(), false);
+    }
+
+    // Constructor from the class id represented by a string
+    explicit ClassId(const std::string &id);
+
+    // Use the following constructor in "read" functions.
+    // Dummy argument "reading" is needed in order to generate
+    // a distinct function signature (otherwise the templated
+    // constructor can win).
+    ClassId(std::istream &in, int reading);
+
+    // Use the following pseudo-constructor in static "read"
+    // methods in case a type check is desired. It has to be
+    // made static because constructor without any arguments
+    // can not be a template. Also, this is the way to construct
+    // class ids for built-in types (there is no way to specialize
+    // member methods).
+    template <class T>
+    static ClassId makeId();
+
+    // "Universal" item id which also works for built-in types
+    template <class T>
+    static ClassId itemId(const T &);
+
+    // Inspectors for the class name and version number
+    inline const std::string &name() const { return name_; }
+    inline unsigned version() const { return version_; }
+
+    // Is this class a pointer for I/O purposes?
+    inline bool isPointer() const { return isPtr_; }
+
+    // The following function should return a unique class id string
+    // which takes version number into account
+    inline const std::string &id() const { return id_; }
+
+    // The following checks if the class name corresponds to
+    // a template (using the standard manner of class name forming)
+    bool isTemplate() const;
+
+    // The following function fills the vector with class template
+    // parameters (if the class is not a template, the vector is
+    // cleared). Due to the manner in which things are used in this
+    // package, the result is actually a vector of (vectors of size 1).
+    void templateParameters(std::vector<std::vector<ClassId>> *p) const;
+
+    // Function to write this object out. Returns "true" on success.
+    bool write(std::ostream &of) const;
+
+    // Comparison operators
+    inline bool operator==(const ClassId &r) const { return id_ == r.id_; }
+    inline bool operator!=(const ClassId &r) const { return !(*this == r); }
+    inline bool operator<(const ClassId &r) const { return id_ < r.id_; }
+    inline bool operator>(const ClassId &r) const { return id_ > r.id_; }
+
+    // Modify the version number
+    void setVersion(unsigned newVersion);
+
+    // The following methods verify that the id/classname/version
+    // of this object are equal to those of the argument and throw
+    // "gs::IOInvalidArgument" exception if this is not so
+    void ensureSameId(const ClassId &id) const;
+    void ensureSameName(const ClassId &id) const;
+    void ensureSameVersion(const ClassId &id) const;
+
+    // The following method ensures that the version number of this
+    // class id is within certain range [min, max], with both limits
+    // allowed. "gs::IOInvalidArgument" exception is thrown if this
+    // is not so.
+    void ensureVersionInRange(unsigned min, unsigned max) const;
+
+    // Sometimes one really needs to make a placeholder class id...
+    // This is a dangerous function: the code using ClassId class
+    // will normally assume that a ClassId object is always in a valid
+    // state. Invalid class ids can be distinguished by their empty
+    // class names (i.e., name().empty() returns "true").
+    static ClassId invalidId();
+
+  private:
+    ClassId();
+
+    void initialize(const char *prefix, unsigned version, bool isPtr);
+    bool makeName();
+    bool makeVersion();
+
+    std::string name_;
+    std::string id_;
+    unsigned version_;
+    bool isPtr_;
+
+    // Return "true" if the prefix is valid
+    static bool validatePrefix(const char *prefix);
+  };
+
+  // Simple class id compatibility checkers for use as policy classes
+  // in templated code
+  struct SameClassId {
+    inline static bool compatible(const ClassId &id1, const ClassId &id2) { return id1.name() == id2.name(); }
+  };
+
+  struct SameClassName {
+    inline static bool compatible(const ClassId &id1, const ClassId &id2) { return id1 == id2; }
+  };
+
+  // Specialize the following template in order to be able to construct
+  // ClassId for classes which do not implement static functions
+  // "classname()" and "version()".
+  template <class T>
+  struct ClassIdSpecialization {
+    inline static ClassId classId(const bool isPtr = false) { return ClassId(T::classname(), T::version(), isPtr); }
+  };
+
+  // Utility functions for naming template classes. The "nInclude"
+  // argument tells us how many template parameters to include into
+  // the generated template name. For example, use of
+  //
+  // template_class_name<X,Y>("myTemplate",1)
+  //
+  // will generate a class name which looks like myTemplate<X>, with
+  // second template parameter omitted. While the result is equivalent
+  // to invoking "template_class_name<X>("myTemplate")", having an
+  // explicit limit is convenient for use from certain higher-level
+  // functions. Note, however, that in the call with two template
+  // parameters the class id specialization for Y must be available,
+  // even though it is not used.
+  //
+  // This feature is sometimes helpful when certain template parameters
+  // specify aspects of template behavior which have nothing to do
+  // with object data contents and I/O. Typical example of such
+  // a parameter is std::allocator of STL -- changing this to a custom
+  // allocator will not affect serialized representation of an STL
+  // container.
+  //
+  template <class T>
+  std::string template_class_name(const char *templateName, unsigned nInclude = 1);
+  template <class T>
+  std::string template_class_name(const std::string &templateName, unsigned nInclude = 1);
+  template <class T1, class T2>
+  std::string template_class_name(const char *templateName, unsigned nInclude = 2);
+  template <class T1, class T2>
+  std::string template_class_name(const std::string &templateName, unsigned nInclude = 2);
+  template <class T1, class T2, class T3>
+  std::string template_class_name(const char *templateName, unsigned nInclude = 3);
+  template <class T1, class T2, class T3>
+  std::string template_class_name(const std::string &templateName, unsigned nInclude = 3);
+  template <class T1, class T2, class T3, class T4>
+  std::string template_class_name(const char *templateName, unsigned nInclude = 4);
+  template <class T1, class T2, class T3, class T4>
+  std::string template_class_name(const std::string &templateName, unsigned nInclude = 4);
+  template <class T1, class T2, class T3, class T4, class T5>
+  std::string template_class_name(const char *templateName, unsigned nInclude = 5);
+  template <class T1, class T2, class T3, class T4, class T5>
+  std::string template_class_name(const std::string &templateName, unsigned nInclude = 5);
+  template <class T1, class T2, class T3, class T4, class T5, class T6>
+  std::string template_class_name(const char *templateName, unsigned nInclude = 6);
+  template <class T1, class T2, class T3, class T4, class T5, class T6>
+  std::string template_class_name(const std::string &templateName, unsigned nInclude = 6);
+
+  // Utility functions for naming stack-based containers such as std::array
+  template <class T, std::size_t N>
+  std::string stack_container_name(const char *templateName);
+
+  template <class T, std::size_t N>
+  std::string stack_container_name(const std::string &templateName);
+}  // namespace gs
 
 #include <cassert>
+#include <sstream>
 #include <utility>
 #include <vector>
-#include <sstream>
 
-#include "Alignment/Geners/interface/IOIsClassType.hh"
 #include "Alignment/Geners/interface/IOIsAnyPtr.hh"
-
+#include "Alignment/Geners/interface/IOIsClassType.hh"
 
 #ifdef GENERS_EMPTY_TYPE_QUALIFYER_
 #undef GENERS_EMPTY_TYPE_QUALIFYER_
@@ -258,598 +230,517 @@ namespace gs {
 
 // Specializations of "ClassIdSpecialization" for built-in classes.
 // They all look the same, so we want to use a macro
-#define gs_specialize_class_helper(qualifyer, name, version) /**/       \
-    template<> struct ClassIdSpecialization<qualifyer name>             \
-    {inline static ClassId classId(const bool isPtr=false)              \
-    {return ClassId(#name, version, isPtr);}};
-
-#define gs_specialize_class_id(name, version) /**/                           \
-namespace gs {                                                               \
-    gs_specialize_class_helper(GENERS_EMPTY_TYPE_QUALIFYER_, name, version)\
-    gs_specialize_class_helper(const, name, version)                         \
-    gs_specialize_class_helper(volatile, name, version)                      \
-    gs_specialize_class_helper(const volatile, name, version)                \
-}
+#define gs_specialize_class_helper(qualifyer, name, version) /**/                                      \
+  template <>                                                                                          \
+  struct ClassIdSpecialization<qualifyer name> {                                                       \
+    inline static ClassId classId(const bool isPtr = false) { return ClassId(#name, version, isPtr); } \
+  };
+
+#define gs_specialize_class_id(name, version) /**/                                                           \
+  namespace gs {                                                                                             \
+    gs_specialize_class_helper(GENERS_EMPTY_TYPE_QUALIFYER_, name, version)                                  \
+        gs_specialize_class_helper(const, name, version) gs_specialize_class_helper(volatile, name, version) \
+            gs_specialize_class_helper(const volatile, name, version)                                        \
+  }
 
 // Specializations of "ClassIdSpecialization" for single-argument templates
-#define gs_specialize_template_help_T(qualifyer, name, version, MAX) /**/   \
-    template<class T> struct ClassIdSpecialization<qualifyer name <T> >     \
-    {inline static ClassId classId(const bool isPtr=false)                  \
-    {return ClassId(template_class_name<T>(#name,MAX), version, isPtr);}};
-
-#define gs_specialize_template_id_T(name, version, MAX) /**/                         \
-namespace gs {                                                                       \
-    gs_specialize_template_help_T(GENERS_EMPTY_TYPE_QUALIFYER_, name, version, MAX)\
-    gs_specialize_template_help_T(const, name, version, MAX)                         \
-    gs_specialize_template_help_T(volatile, name, version, MAX)                      \
-    gs_specialize_template_help_T(const volatile, name, version, MAX)                \
-}
+#define gs_specialize_template_help_T(qualifyer, name, version, MAX) /**/ \
+  template <class T>                                                      \
+  struct ClassIdSpecialization<qualifyer name<T>> {                       \
+    inline static ClassId classId(const bool isPtr = false) {             \
+      return ClassId(template_class_name<T>(#name, MAX), version, isPtr); \
+    }                                                                     \
+  };
+
+#define gs_specialize_template_id_T(name, version, MAX) /**/                        \
+  namespace gs {                                                                    \
+    gs_specialize_template_help_T(GENERS_EMPTY_TYPE_QUALIFYER_, name, version, MAX) \
+        gs_specialize_template_help_T(const, name, version, MAX)                    \
+            gs_specialize_template_help_T(volatile, name, version, MAX)             \
+                gs_specialize_template_help_T(const volatile, name, version, MAX)   \
+  }
 
 // Specializations of "ClassIdSpecialization" for two-argument templates
-#define gs_specialize_template_help_TT(qualifyer, name, version, MAX) /**/  \
-    template<class T,class U>                                               \
-    struct ClassIdSpecialization<qualifyer name <T,U> >                     \
-    {inline static ClassId classId(const bool isPtr=false)                  \
-    {return ClassId(template_class_name<T,U>(#name,MAX), version, isPtr);}};
-
-#define gs_specialize_template_id_TT(name, version, MAX) /**/                         \
-namespace gs {                                                                        \
-    gs_specialize_template_help_TT(GENERS_EMPTY_TYPE_QUALIFYER_, name, version, MAX)\
-    gs_specialize_template_help_TT(const, name, version, MAX)                         \
-    gs_specialize_template_help_TT(volatile, name, version, MAX)                      \
-    gs_specialize_template_help_TT(const volatile, name, version, MAX)                \
-}
+#define gs_specialize_template_help_TT(qualifyer, name, version, MAX) /**/   \
+  template <class T, class U>                                                \
+  struct ClassIdSpecialization<qualifyer name<T, U>> {                       \
+    inline static ClassId classId(const bool isPtr = false) {                \
+      return ClassId(template_class_name<T, U>(#name, MAX), version, isPtr); \
+    }                                                                        \
+  };
+
+#define gs_specialize_template_id_TT(name, version, MAX) /**/                        \
+  namespace gs {                                                                     \
+    gs_specialize_template_help_TT(GENERS_EMPTY_TYPE_QUALIFYER_, name, version, MAX) \
+        gs_specialize_template_help_TT(const, name, version, MAX)                    \
+            gs_specialize_template_help_TT(volatile, name, version, MAX)             \
+                gs_specialize_template_help_TT(const volatile, name, version, MAX)   \
+  }
 
 // Specializations of "ClassIdSpecialization" for three-argument templates
-#define gs_specialize_template_help_TTT(qualifyer, name, version, MAX) /**/ \
-    template<class T,class U,class V>                                       \
-    struct ClassIdSpecialization<qualifyer name <T,U,V> >                   \
-    {inline static ClassId classId(const bool isPtr=false)                  \
-    {return ClassId(template_class_name<T,U,V>(#name,MAX), version, isPtr);}};
-
-#define gs_specialize_template_id_TTT(name, version, MAX) /**/                         \
-namespace gs {                                                                         \
-    gs_specialize_template_help_TTT(GENERS_EMPTY_TYPE_QUALIFYER_, name, version, MAX)\
-    gs_specialize_template_help_TTT(const, name, version, MAX)                         \
-    gs_specialize_template_help_TTT(volatile, name, version, MAX)                      \
-    gs_specialize_template_help_TTT(const volatile, name, version, MAX)                \
-}
+#define gs_specialize_template_help_TTT(qualifyer, name, version, MAX) /**/     \
+  template <class T, class U, class V>                                          \
+  struct ClassIdSpecialization<qualifyer name<T, U, V>> {                       \
+    inline static ClassId classId(const bool isPtr = false) {                   \
+      return ClassId(template_class_name<T, U, V>(#name, MAX), version, isPtr); \
+    }                                                                           \
+  };
+
+#define gs_specialize_template_id_TTT(name, version, MAX) /**/                        \
+  namespace gs {                                                                      \
+    gs_specialize_template_help_TTT(GENERS_EMPTY_TYPE_QUALIFYER_, name, version, MAX) \
+        gs_specialize_template_help_TTT(const, name, version, MAX)                    \
+            gs_specialize_template_help_TTT(volatile, name, version, MAX)             \
+                gs_specialize_template_help_TTT(const volatile, name, version, MAX)   \
+  }
 
 // Specializations of "ClassIdSpecialization" for four-argument templates
-#define gs_specialize_template_help_TTTT(qualifyer, name, version, MAX) /**/   \
-    template<class T,class U,class V,class X>                                  \
-    struct ClassIdSpecialization<qualifyer name <T,U,V,X> >                    \
-    {inline static ClassId classId(const bool isPtr=false)                     \
-    {return ClassId(template_class_name<T,U,V,X>(#name,MAX), version, isPtr);}};
-
-#define gs_specialize_template_id_TTTT(name, version, MAX) /**/                         \
-namespace gs {                                                                          \
-    gs_specialize_template_help_TTTT(GENERS_EMPTY_TYPE_QUALIFYER_, name, version, MAX)\
-    gs_specialize_template_help_TTTT(const, name, version, MAX)                         \
-    gs_specialize_template_help_TTTT(volatile, name, version, MAX)                      \
-    gs_specialize_template_help_TTTT(const volatile, name, version, MAX)                \
-}
+#define gs_specialize_template_help_TTTT(qualifyer, name, version, MAX) /**/       \
+  template <class T, class U, class V, class X>                                    \
+  struct ClassIdSpecialization<qualifyer name<T, U, V, X>> {                       \
+    inline static ClassId classId(const bool isPtr = false) {                      \
+      return ClassId(template_class_name<T, U, V, X>(#name, MAX), version, isPtr); \
+    }                                                                              \
+  };
+
+#define gs_specialize_template_id_TTTT(name, version, MAX) /**/                        \
+  namespace gs {                                                                       \
+    gs_specialize_template_help_TTTT(GENERS_EMPTY_TYPE_QUALIFYER_, name, version, MAX) \
+        gs_specialize_template_help_TTTT(const, name, version, MAX)                    \
+            gs_specialize_template_help_TTTT(volatile, name, version, MAX)             \
+                gs_specialize_template_help_TTTT(const volatile, name, version, MAX)   \
+  }
 
 // Specializations of "ClassIdSpecialization" for five-argument templates
-#define gs_specialize_template_hlp_TTTTT(qualifyer, name, version, MAX) /**/     \
-    template<class T,class U,class V,class X,class Y>                            \
-    struct ClassIdSpecialization<qualifyer name <T,U,V,X,Y> >                    \
-    {inline static ClassId classId(const bool isPtr=false)                       \
-    {return ClassId(template_class_name<T,U,V,X,Y>(#name,MAX), version, isPtr);}};
-
-#define gs_specialize_template_id_TTTTT(name, version, MAX) /**/                        \
-namespace gs {                                                                          \
-    gs_specialize_template_hlp_TTTTT(GENERS_EMPTY_TYPE_QUALIFYER_, name, version, MAX)\
-    gs_specialize_template_hlp_TTTTT(const, name, version, MAX)                         \
-    gs_specialize_template_hlp_TTTTT(volatile, name, version, MAX)                      \
-    gs_specialize_template_hlp_TTTTT(const volatile, name, version, MAX)                \
-}
+#define gs_specialize_template_hlp_TTTTT(qualifyer, name, version, MAX) /**/          \
+  template <class T, class U, class V, class X, class Y>                              \
+  struct ClassIdSpecialization<qualifyer name<T, U, V, X, Y>> {                       \
+    inline static ClassId classId(const bool isPtr = false) {                         \
+      return ClassId(template_class_name<T, U, V, X, Y>(#name, MAX), version, isPtr); \
+    }                                                                                 \
+  };
+
+#define gs_specialize_template_id_TTTTT(name, version, MAX) /**/                       \
+  namespace gs {                                                                       \
+    gs_specialize_template_hlp_TTTTT(GENERS_EMPTY_TYPE_QUALIFYER_, name, version, MAX) \
+        gs_specialize_template_hlp_TTTTT(const, name, version, MAX)                    \
+            gs_specialize_template_hlp_TTTTT(volatile, name, version, MAX)             \
+                gs_specialize_template_hlp_TTTTT(const volatile, name, version, MAX)   \
+  }
 
 // Specializations of "ClassIdSpecialization" for six-argument templates
-#define gs_specialize_template_h_TTTTTT(qualifyer, name, version, MAX) /**/       \
-    template<class T,class U,class V,class X,class Y,class Z>                     \
-    struct ClassIdSpecialization<qualifyer name <T,U,V,X,Y,Z> >                   \
-    {inline static ClassId classId(const bool isPtr=false)                        \
-    {return ClassId(template_class_name<T,U,V,X,Y,Z>(#name,MAX), version, isPtr);}};
-
-#define gs_specialize_template_id_TTTTTT(name, version, MAX) /**/                      \
-namespace gs {                                                                         \
-    gs_specialize_template_h_TTTTTT(GENERS_EMPTY_TYPE_QUALIFYER_, name, version, MAX)\
-    gs_specialize_template_h_TTTTTT(const, name, version, MAX)                         \
-    gs_specialize_template_h_TTTTTT(volatile, name, version, MAX)                      \
-    gs_specialize_template_h_TTTTTT(const volatile, name, version, MAX)                \
-}
+#define gs_specialize_template_h_TTTTTT(qualifyer, name, version, MAX) /**/              \
+  template <class T, class U, class V, class X, class Y, class Z>                        \
+  struct ClassIdSpecialization<qualifyer name<T, U, V, X, Y, Z>> {                       \
+    inline static ClassId classId(const bool isPtr = false) {                            \
+      return ClassId(template_class_name<T, U, V, X, Y, Z>(#name, MAX), version, isPtr); \
+    }                                                                                    \
+  };
+
+#define gs_specialize_template_id_TTTTTT(name, version, MAX) /**/                     \
+  namespace gs {                                                                      \
+    gs_specialize_template_h_TTTTTT(GENERS_EMPTY_TYPE_QUALIFYER_, name, version, MAX) \
+        gs_specialize_template_h_TTTTTT(const, name, version, MAX)                    \
+            gs_specialize_template_h_TTTTTT(volatile, name, version, MAX)             \
+                gs_specialize_template_h_TTTTTT(const volatile, name, version, MAX)   \
+  }
 
 // Specializations of "ClassIdSpecialization" for two-argument templates
 // which include an integer as a second argument (like std::array)
-#define gs_specialize_template_help_TN(qualifyer, name, version, MAX) /**/  \
-    template<class T,std::size_t N>                                         \
-    struct ClassIdSpecialization<qualifyer name <T,N> >                     \
-    {inline static ClassId classId(const bool isPtr=false)                  \
-    {return ClassId(stack_container_name<T,N>(#name,MAX), version, isPtr);}};
-
-#define gs_specialize_template_id_TN(name, version, MAX) /**/                         \
-namespace gs {                                                                        \
-    gs_specialize_template_help_TN(GENERS_EMPTY_TYPE_QUALIFYER_, name, version, MAX)\
-    gs_specialize_template_help_TN(const, name, version, MAX)                         \
-    gs_specialize_template_help_TN(volatile, name, version, MAX)                      \
-    gs_specialize_template_help_TN(const volatile, name, version, MAX)                \
-}
+#define gs_specialize_template_help_TN(qualifyer, name, version, MAX) /**/    \
+  template <class T, std::size_t N>                                           \
+  struct ClassIdSpecialization<qualifyer name<T, N>> {                        \
+    inline static ClassId classId(const bool isPtr = false) {                 \
+      return ClassId(stack_container_name<T, N>(#name, MAX), version, isPtr); \
+    }                                                                         \
+  };
+
+#define gs_specialize_template_id_TN(name, version, MAX) /**/                        \
+  namespace gs {                                                                     \
+    gs_specialize_template_help_TN(GENERS_EMPTY_TYPE_QUALIFYER_, name, version, MAX) \
+        gs_specialize_template_help_TN(const, name, version, MAX)                    \
+            gs_specialize_template_help_TN(volatile, name, version, MAX)             \
+                gs_specialize_template_help_TN(const volatile, name, version, MAX)   \
+  }
 
 namespace gs {
-    // "template_class_name" implementations
-    template<class T>
-    std::string template_class_name(const char* templateName,
-                                    const unsigned nInclude)
-    {
-        assert(templateName);
-        std::string name(templateName);
-        if (nInclude)
-        {
-            name += '<';
-            const ClassId& id(ClassIdSpecialization<T>::classId());
-            name += id.id();
-            name += '>';
-        }
-        return name;
-    }
-
-    template<class T>
-    inline std::string template_class_name(const std::string& templateName,
-                                           const unsigned nInclude)
-    {
-        return template_class_name<T>(templateName.c_str(), nInclude);
-    }
-
-    template<class T1, class T2>
-    std::string template_class_name(const char* templateName,
-                                    const unsigned nInclude)
-    {
-        assert(templateName);
-        std::string name(templateName);
-        if (nInclude)
-        {
-            name += '<';
-            const ClassId& id1(ClassIdSpecialization<T1>::classId());
-            name += id1.id();
-            if (nInclude > 1)
-            {
-                name += ',';
-                const ClassId& id2(ClassIdSpecialization<T2>::classId());
-                name += id2.id();
-            }
-            name += '>';
-        }
-        return name;
-    }
-
-    template<class T1, class T2>
-    inline std::string template_class_name(const std::string& templateName,
-                                           const unsigned nInclude)
-    {
-        return template_class_name<T1,T2>(templateName.c_str(), nInclude);
-    }
-
-    template<class T1, class T2, class T3>
-    std::string template_class_name(const char* templateName,
-                                    const unsigned nInclude)
-    {
-        assert(templateName);
-        std::string name(templateName);
-        if (nInclude)
-        {
-            name += '<';
-            const ClassId& id1(ClassIdSpecialization<T1>::classId());
-            name += id1.id();
-            if (nInclude > 1)
-            {
-                name += ',';
-                const ClassId& id2(ClassIdSpecialization<T2>::classId());
-                name += id2.id();
-            }
-            if (nInclude > 2)
-            {
-                name += ',';
-                const ClassId& id3(ClassIdSpecialization<T3>::classId());
-                name += id3.id();
-            }
-            name += '>';
-        }
-        return name;
-    }
-
-    template<class T1, class T2, class T3>
-    inline std::string template_class_name(const std::string& templateName,
-                                           const unsigned nInclude)
-    {
-        return template_class_name<T1,T2,T3>(templateName.c_str(), nInclude);
-    }
-
-    template<class T1, class T2, class T3, class T4>
-    std::string template_class_name(const char* templateName,
-                                    const unsigned nInclude)
-    {
-        assert(templateName);
-        std::string name(templateName);
-        if (nInclude)
-        {
-            name += '<';
-            const ClassId& id1(ClassIdSpecialization<T1>::classId());
-            name += id1.id();
-            if (nInclude > 1)
-            {
-                name += ',';
-                const ClassId& id2(ClassIdSpecialization<T2>::classId());
-                name += id2.id();
-            }    
-            if (nInclude > 2)
-            {
-                name += ',';
-                const ClassId& id3(ClassIdSpecialization<T3>::classId());
-                name += id3.id();
-            }
-            if (nInclude > 3)
-            {
-                name += ',';
-                const ClassId& id4(ClassIdSpecialization<T4>::classId());
-                name += id4.id();
-            }
-            name += '>';
-        }
-        return name;
-    }
-
-    template<class T1, class T2, class T3, class T4>
-    inline std::string template_class_name(const std::string& templateName,
-                                           const unsigned n)
-    {
-        return template_class_name<T1,T2,T3,T4>(templateName.c_str(), n);
+  // "template_class_name" implementations
+  template <class T>
+  std::string template_class_name(const char *templateName, const unsigned nInclude) {
+    assert(templateName);
+    std::string name(templateName);
+    if (nInclude) {
+      name += '<';
+      const ClassId &id(ClassIdSpecialization<T>::classId());
+      name += id.id();
+      name += '>';
     }
-
-    template<class T1, class T2, class T3, class T4, class T5>
-    std::string template_class_name(const char* templateName,
-                                    const unsigned nInclude)
-    {
-        assert(templateName);
-        std::string name(templateName);
-        if (nInclude)
-        {
-            name += '<';
-            const ClassId& id1(ClassIdSpecialization<T1>::classId());
-            name += id1.id();
-            if (nInclude > 1)
-            {
-                name += ',';
-                const ClassId& id2(ClassIdSpecialization<T2>::classId());
-                name += id2.id();
-            }
-            if (nInclude > 2)
-            {
-                name += ',';
-                const ClassId& id3(ClassIdSpecialization<T3>::classId());
-                name += id3.id();
-            }
-            if (nInclude > 3)
-            {
-                name += ',';
-                const ClassId& id4(ClassIdSpecialization<T4>::classId());
-                name += id4.id();
-            }
-            if (nInclude > 4)
-            {
-                name += ',';
-                const ClassId& id5(ClassIdSpecialization<T5>::classId());
-                name += id5.id();
-            }
-            name += '>';
-        }
-        return name;
+    return name;
+  }
+
+  template <class T>
+  inline std::string template_class_name(const std::string &templateName, const unsigned nInclude) {
+    return template_class_name<T>(templateName.c_str(), nInclude);
+  }
+
+  template <class T1, class T2>
+  std::string template_class_name(const char *templateName, const unsigned nInclude) {
+    assert(templateName);
+    std::string name(templateName);
+    if (nInclude) {
+      name += '<';
+      const ClassId &id1(ClassIdSpecialization<T1>::classId());
+      name += id1.id();
+      if (nInclude > 1) {
+        name += ',';
+        const ClassId &id2(ClassIdSpecialization<T2>::classId());
+        name += id2.id();
+      }
+      name += '>';
     }
-
-    template<class T1, class T2, class T3, class T4, class T5>
-    inline std::string template_class_name(const std::string& templateName,
-                                           const unsigned n)
-    {
-        return template_class_name<T1,T2,T3,T4,T5>(templateName.c_str(), n);
-    }
-
-    template<class T1, class T2, class T3, class T4, class T5, class T6>
-    std::string template_class_name(const char* templateName,
-                                    const unsigned nInclude)
-    {
-        assert(templateName);
-        std::string name(templateName);
-        if (nInclude)
-        {
-            name += '<';
-            const ClassId& id1(ClassIdSpecialization<T1>::classId());
-            name += id1.id();
-            if (nInclude > 1)
-            {
-                name += ',';
-                const ClassId& id2(ClassIdSpecialization<T2>::classId());
-                name += id2.id();
-            }
-            if (nInclude > 2)
-            {
-                name += ',';
-                const ClassId& id3(ClassIdSpecialization<T3>::classId());
-                name += id3.id();
-            }
-            if (nInclude > 3)
-            {
-                name += ',';
-                const ClassId& id4(ClassIdSpecialization<T4>::classId());
-                name += id4.id();
-            }
-            if (nInclude > 4)
-            {
-                name += ',';
-                const ClassId& id5(ClassIdSpecialization<T5>::classId());
-                name += id5.id();
-            }
-            if (nInclude > 5)
-            {
-                name += ',';
-                const ClassId& id6(ClassIdSpecialization<T6>::classId());
-                name += id6.id();
-            }
-            name += '>';
-        }
-        return name;
+    return name;
+  }
+
+  template <class T1, class T2>
+  inline std::string template_class_name(const std::string &templateName, const unsigned nInclude) {
+    return template_class_name<T1, T2>(templateName.c_str(), nInclude);
+  }
+
+  template <class T1, class T2, class T3>
+  std::string template_class_name(const char *templateName, const unsigned nInclude) {
+    assert(templateName);
+    std::string name(templateName);
+    if (nInclude) {
+      name += '<';
+      const ClassId &id1(ClassIdSpecialization<T1>::classId());
+      name += id1.id();
+      if (nInclude > 1) {
+        name += ',';
+        const ClassId &id2(ClassIdSpecialization<T2>::classId());
+        name += id2.id();
+      }
+      if (nInclude > 2) {
+        name += ',';
+        const ClassId &id3(ClassIdSpecialization<T3>::classId());
+        name += id3.id();
+      }
+      name += '>';
     }
-
-    template<class T1, class T2, class T3, class T4, class T5, class T6>
-    inline std::string template_class_name(const std::string& templateName,
-                                           const unsigned n)
-    {
-        return template_class_name<T1,T2,T3,T4,T5,T6>(templateName.c_str(), n);
+    return name;
+  }
+
+  template <class T1, class T2, class T3>
+  inline std::string template_class_name(const std::string &templateName, const unsigned nInclude) {
+    return template_class_name<T1, T2, T3>(templateName.c_str(), nInclude);
+  }
+
+  template <class T1, class T2, class T3, class T4>
+  std::string template_class_name(const char *templateName, const unsigned nInclude) {
+    assert(templateName);
+    std::string name(templateName);
+    if (nInclude) {
+      name += '<';
+      const ClassId &id1(ClassIdSpecialization<T1>::classId());
+      name += id1.id();
+      if (nInclude > 1) {
+        name += ',';
+        const ClassId &id2(ClassIdSpecialization<T2>::classId());
+        name += id2.id();
+      }
+      if (nInclude > 2) {
+        name += ',';
+        const ClassId &id3(ClassIdSpecialization<T3>::classId());
+        name += id3.id();
+      }
+      if (nInclude > 3) {
+        name += ',';
+        const ClassId &id4(ClassIdSpecialization<T4>::classId());
+        name += id4.id();
+      }
+      name += '>';
     }
-
-    template<class T, std::size_t N>
-    std::string stack_container_name(const char* templateName)
-    {
-        assert(templateName);
-        const ClassId& id1(ClassIdSpecialization<T>::classId());
-        std::ostringstream os;
-        os << templateName << '<' << id1.id() << ',' << N << "(0)>";
-        return os.str();
+    return name;
+  }
+
+  template <class T1, class T2, class T3, class T4>
+  inline std::string template_class_name(const std::string &templateName, const unsigned n) {
+    return template_class_name<T1, T2, T3, T4>(templateName.c_str(), n);
+  }
+
+  template <class T1, class T2, class T3, class T4, class T5>
+  std::string template_class_name(const char *templateName, const unsigned nInclude) {
+    assert(templateName);
+    std::string name(templateName);
+    if (nInclude) {
+      name += '<';
+      const ClassId &id1(ClassIdSpecialization<T1>::classId());
+      name += id1.id();
+      if (nInclude > 1) {
+        name += ',';
+        const ClassId &id2(ClassIdSpecialization<T2>::classId());
+        name += id2.id();
+      }
+      if (nInclude > 2) {
+        name += ',';
+        const ClassId &id3(ClassIdSpecialization<T3>::classId());
+        name += id3.id();
+      }
+      if (nInclude > 3) {
+        name += ',';
+        const ClassId &id4(ClassIdSpecialization<T4>::classId());
+        name += id4.id();
+      }
+      if (nInclude > 4) {
+        name += ',';
+        const ClassId &id5(ClassIdSpecialization<T5>::classId());
+        name += id5.id();
+      }
+      name += '>';
     }
-
-    template<class T, std::size_t N>
-    std::string stack_container_name(const std::string& templateName)
-    {
-        return stack_container_name<T,N>(templateName.c_str());
+    return name;
+  }
+
+  template <class T1, class T2, class T3, class T4, class T5>
+  inline std::string template_class_name(const std::string &templateName, const unsigned n) {
+    return template_class_name<T1, T2, T3, T4, T5>(templateName.c_str(), n);
+  }
+
+  template <class T1, class T2, class T3, class T4, class T5, class T6>
+  std::string template_class_name(const char *templateName, const unsigned nInclude) {
+    assert(templateName);
+    std::string name(templateName);
+    if (nInclude) {
+      name += '<';
+      const ClassId &id1(ClassIdSpecialization<T1>::classId());
+      name += id1.id();
+      if (nInclude > 1) {
+        name += ',';
+        const ClassId &id2(ClassIdSpecialization<T2>::classId());
+        name += id2.id();
+      }
+      if (nInclude > 2) {
+        name += ',';
+        const ClassId &id3(ClassIdSpecialization<T3>::classId());
+        name += id3.id();
+      }
+      if (nInclude > 3) {
+        name += ',';
+        const ClassId &id4(ClassIdSpecialization<T4>::classId());
+        name += id4.id();
+      }
+      if (nInclude > 4) {
+        name += ',';
+        const ClassId &id5(ClassIdSpecialization<T5>::classId());
+        name += id5.id();
+      }
+      if (nInclude > 5) {
+        name += ',';
+        const ClassId &id6(ClassIdSpecialization<T6>::classId());
+        name += id6.id();
+      }
+      name += '>';
     }
-
-    // Skip references in class ids
-    template<class T>
-    struct ClassIdSpecialization<T&>
-    {
-        inline static ClassId classId(const bool isPtr=false)
-            {return ClassIdSpecialization<T>::classId(isPtr);}
-    };
-
-    // Skip pointers in class ids
-    template<class T>
-    struct ClassIdSpecialization<T*>
-    {
-        inline static ClassId classId(const bool /* isPtr */=false)
-            {return ClassIdSpecialization<T>::classId(true);}
-    };
-
-    template<class T>
-    struct ClassIdSpecialization<T* const>
-    {
-        inline static ClassId classId(const bool /* isPtr */=false)
-        {return ClassIdSpecialization<T>::classId(true);}
-    };
-
-    template<class T>
-    struct ClassIdSpecialization<T* volatile>
-    {
-        inline static ClassId classId(const bool /* isPtr */=false)
-        {return ClassIdSpecialization<T>::classId(true);}
+    return name;
+  }
+
+  template <class T1, class T2, class T3, class T4, class T5, class T6>
+  inline std::string template_class_name(const std::string &templateName, const unsigned n) {
+    return template_class_name<T1, T2, T3, T4, T5, T6>(templateName.c_str(), n);
+  }
+
+  template <class T, std::size_t N>
+  std::string stack_container_name(const char *templateName) {
+    assert(templateName);
+    const ClassId &id1(ClassIdSpecialization<T>::classId());
+    std::ostringstream os;
+    os << templateName << '<' << id1.id() << ',' << N << "(0)>";
+    return os.str();
+  }
+
+  template <class T, std::size_t N>
+  std::string stack_container_name(const std::string &templateName) {
+    return stack_container_name<T, N>(templateName.c_str());
+  }
+
+  // Skip references in class ids
+  template <class T>
+  struct ClassIdSpecialization<T &> {
+    inline static ClassId classId(const bool isPtr = false) { return ClassIdSpecialization<T>::classId(isPtr); }
+  };
+
+  // Skip pointers in class ids
+  template <class T>
+  struct ClassIdSpecialization<T *> {
+    inline static ClassId classId(const bool /* isPtr */ = false) { return ClassIdSpecialization<T>::classId(true); }
+  };
+
+  template <class T>
+  struct ClassIdSpecialization<T *const> {
+    inline static ClassId classId(const bool /* isPtr */ = false) { return ClassIdSpecialization<T>::classId(true); }
+  };
+
+  template <class T>
+  struct ClassIdSpecialization<T *volatile> {
+    inline static ClassId classId(const bool /* isPtr */ = false) { return ClassIdSpecialization<T>::classId(true); }
+  };
+
+  template <class T>
+  struct ClassIdSpecialization<T *const volatile> {
+    inline static ClassId classId(const bool /* isPtr */ = false) { return ClassIdSpecialization<T>::classId(true); }
+  };
+
+  // Skip shared pointers in class ids
+  template <class T>
+  struct ClassIdSpecialization<CPP11_shared_ptr<T>> {
+    inline static ClassId classId(const bool /* isPtr */ = false) { return ClassIdSpecialization<T>::classId(true); }
+  };
+
+  template <class T>
+  struct ClassIdSpecialization<const CPP11_shared_ptr<T>> {
+    inline static ClassId classId(const bool /* isPtr */ = false) { return ClassIdSpecialization<T>::classId(true); }
+  };
+
+  template <class T>
+  struct ClassIdSpecialization<volatile CPP11_shared_ptr<T>> {
+    inline static ClassId classId(const bool /* isPtr */ = false) { return ClassIdSpecialization<T>::classId(true); }
+  };
+
+  template <class T>
+  struct ClassIdSpecialization<const volatile CPP11_shared_ptr<T>> {
+    inline static ClassId classId(const bool /* isPtr */ = false) { return ClassIdSpecialization<T>::classId(true); }
+  };
+
+  // Skip IOPtr in class ids and do not turn on the pointer flag
+  template <class T>
+  struct ClassIdSpecialization<IOPtr<T>> {
+    inline static ClassId classId(const bool isPtr = false) { return ClassIdSpecialization<T>::classId(isPtr); }
+  };
+
+  template <class T>
+  struct ClassIdSpecialization<const IOPtr<T>> {
+    inline static ClassId classId(const bool isPtr = false) { return ClassIdSpecialization<T>::classId(isPtr); }
+  };
+
+  template <class T>
+  struct ClassIdSpecialization<volatile IOPtr<T>> {
+    inline static ClassId classId(const bool isPtr = false) { return ClassIdSpecialization<T>::classId(isPtr); }
+  };
+
+  template <class T>
+  struct ClassIdSpecialization<const volatile IOPtr<T>> {
+    inline static ClassId classId(const bool isPtr = false) { return ClassIdSpecialization<T>::classId(isPtr); }
+  };
+
+  // Same thing for IOProxy
+  template <class T>
+  struct ClassIdSpecialization<IOProxy<T>> {
+    inline static ClassId classId(const bool isPtr = false) { return ClassIdSpecialization<T>::classId(isPtr); }
+  };
+
+  template <class T>
+  struct ClassIdSpecialization<const IOProxy<T>> {
+    inline static ClassId classId(const bool isPtr = false) { return ClassIdSpecialization<T>::classId(isPtr); }
+  };
+
+  template <class T>
+  struct ClassIdSpecialization<volatile IOProxy<T>> {
+    inline static ClassId classId(const bool isPtr = false) { return ClassIdSpecialization<T>::classId(isPtr); }
+  };
+
+  template <class T>
+  struct ClassIdSpecialization<const volatile IOProxy<T>> {
+    inline static ClassId classId(const bool isPtr = false) { return ClassIdSpecialization<T>::classId(isPtr); }
+  };
+
+  // The remaining ClassId static functions
+  template <class T>
+  inline ClassId ClassId::makeId() {
+    return ClassIdSpecialization<T>::classId();
+  }
+
+  namespace Private {
+    template <bool, class T>
+    struct CallClassId {
+      static inline ClassId get(const T &) { return ClassIdSpecialization<T>::classId(); }
     };
 
-    template<class T>
-    struct ClassIdSpecialization<T* const volatile>
-    {
-        inline static ClassId classId(const bool /* isPtr */=false)
-        {return ClassIdSpecialization<T>::classId(true);}
+    template <class T>
+    struct CallClassId<true, T> {
+      static inline ClassId get(const T &obj) { return obj.classId(); }
     };
 
-    // Skip shared pointers in class ids
-    template<class T>
-    struct ClassIdSpecialization<CPP11_shared_ptr<T> >
-    {
-        inline static ClassId classId(const bool /* isPtr */=false)
-        {return ClassIdSpecialization<T>::classId(true);}
-    };
-
-    template<class T>
-    struct ClassIdSpecialization<const CPP11_shared_ptr<T> >
-    {
-        inline static ClassId classId(const bool /* isPtr */=false)
-        {return ClassIdSpecialization<T>::classId(true);}
-    };
-
-    template<class T>
-    struct ClassIdSpecialization<volatile CPP11_shared_ptr<T> >
-    {
-        inline static ClassId classId(const bool /* isPtr */=false)
-        {return ClassIdSpecialization<T>::classId(true);}
-    };
+    // The following class will check for the existence of two
+    // possible signatures of the "classId" method:
+    // "const ClassId& classId() const" and "ClassId classId() const".
+    template <class Tp>
+    class TypeHasClassIdHelper {
+      template <typename T, T>
+      struct TypeCheck;
+      template <typename T>
+      struct FcnType1 {
+        typedef ClassId (T::*fptr)() const;
+      };
+      template <typename T>
+      struct FcnType2 {
+        typedef const ClassId &(T::*fptr)() const;
+      };
+
+      typedef char Yes;
+      typedef struct {
+        char a[2];
+      } No;
+
+      template <typename T>
+      static Yes Has1(TypeCheck<typename FcnType1<T>::fptr, &T::classId> *);
+      template <typename T>
+      static No Has1(...);
+
+      template <typename T>
+      static Yes Has2(TypeCheck<typename FcnType2<T>::fptr, &T::classId> *);
+      template <typename T>
+      static No Has2(...);
 
-    template<class T>
-    struct ClassIdSpecialization<const volatile CPP11_shared_ptr<T> >
-    {
-        inline static ClassId classId(const bool /* isPtr */=false)
-        {return ClassIdSpecialization<T>::classId(true);}
-    };
-
-    // Skip IOPtr in class ids and do not turn on the pointer flag
-    template<class T>
-    struct ClassIdSpecialization<IOPtr<T> >
-    {
-        inline static ClassId classId(const bool isPtr=false)
-        {return ClassIdSpecialization<T>::classId(isPtr);}
-    };
-
-    template<class T>
-    struct ClassIdSpecialization<const IOPtr<T> >
-    {
-        inline static ClassId classId(const bool isPtr=false)
-        {return ClassIdSpecialization<T>::classId(isPtr);}
-    };
-
-    template<class T>
-    struct ClassIdSpecialization<volatile IOPtr<T> >
-    {
-        inline static ClassId classId(const bool isPtr=false)
-        {return ClassIdSpecialization<T>::classId(isPtr);}
-    };
-
-    template<class T>
-    struct ClassIdSpecialization<const volatile IOPtr<T> >
-    {
-        inline static ClassId classId(const bool isPtr=false)
-        {return ClassIdSpecialization<T>::classId(isPtr);}
-    };
-
-    // Same thing for IOProxy
-    template<class T>
-    struct ClassIdSpecialization<IOProxy<T> >
-    {
-        inline static ClassId classId(const bool isPtr=false)
-        {return ClassIdSpecialization<T>::classId(isPtr);}
+    public:
+      static const bool value = ((sizeof(Has1<Tp>(0)) == sizeof(Yes)) || (sizeof(Has2<Tp>(0)) == sizeof(Yes)));
     };
 
-    template<class T>
-    struct ClassIdSpecialization<const IOProxy<T> >
-    {
-        inline static ClassId classId(const bool isPtr=false)
-        {return ClassIdSpecialization<T>::classId(isPtr);}
+    template <class T, bool b = IOIsClassType<T>::value>
+    struct TypeHasClassId {
+      static const bool value = false;
     };
 
-    template<class T>
-    struct ClassIdSpecialization<volatile IOProxy<T> >
-    {
-        inline static ClassId classId(const bool isPtr=false)
-        {return ClassIdSpecialization<T>::classId(isPtr);}
+    template <typename T>
+    struct TypeHasClassId<T, true> {
+      static const bool value = TypeHasClassIdHelper<T>::value;
     };
+  }  // namespace Private
 
-    template<class T>
-    struct ClassIdSpecialization<const volatile IOProxy<T> >
-    {
-        inline static ClassId classId(const bool isPtr=false)
-        {return ClassIdSpecialization<T>::classId(isPtr);}
-    };
+  template <class T>
+  inline ClassId ClassId::itemId(const T &item) {
+    // Make sure that item is not a pointer.
+    static_assert((!IOIsAnyPtr<T>::value), "can not use pointers with this method");
 
-    // The remaining ClassId static functions
-    template<class T>
-    inline ClassId ClassId::makeId()
-    {
-        return ClassIdSpecialization<T>::classId();
-    }
-
-    namespace Private {
-        template<bool, class T>
-        struct CallClassId
-        {
-            static inline ClassId get(const T&)
-                {return ClassIdSpecialization<T>::classId();}
-        };
-
-        template<class T>
-        struct CallClassId<true,T>
-        {
-            static inline ClassId get(const T& obj) {return obj.classId();}
-        };
-
-        // The following class will check for the existence of two
-        // possible signatures of the "classId" method:
-        // "const ClassId& classId() const" and "ClassId classId() const".
-        template<class Tp>
-        class TypeHasClassIdHelper
-        {
-            template <typename T, T> struct TypeCheck;
-            template <typename T> struct FcnType1
-            {typedef ClassId (T::*fptr)() const;};
-            template <typename T> struct FcnType2
-            {typedef const ClassId& (T::*fptr)() const;};
-
-            typedef char Yes;
-            typedef struct {char a[2];} No;
-
-            template <typename T> static Yes Has1(
-                TypeCheck<typename FcnType1<T>::fptr, &T::classId>*);
-            template <typename T> static No  Has1(...);
-
-            template <typename T> static Yes Has2(
-                TypeCheck<typename FcnType2<T>::fptr, &T::classId>*);
-            template <typename T> static No  Has2(...);
-
-        public:
-            static const bool value = ((sizeof(Has1<Tp>(0)) == sizeof(Yes)) ||
-                                       (sizeof(Has2<Tp>(0)) == sizeof(Yes)));
-        };
-
-        template<class T, bool b=IOIsClassType<T>::value>
-        struct TypeHasClassId
-        {
-            static const bool value = 0;
-        };
-
-        template <typename T>
-        struct TypeHasClassId<T, true>
-        {
-            static const bool value = TypeHasClassIdHelper<T>::value;
-        };
-    }
-
-    template<class T>
-    inline ClassId ClassId::itemId(const T& item)
-    {
-        // Make sure that item is not a pointer.
-        static_assert((!IOIsAnyPtr<T>::value), "can not use pointers with this method");
-
-        // If the classId() function is avalable for this item, call it
-        // (it could be virtual). Otherwise, call the generic method.
-        return Private::CallClassId<
-            Private::TypeHasClassId<T>::value,T>::get(item);
-    }
-}
+    // If the classId() function is avalable for this item, call it
+    // (it could be virtual). Otherwise, call the generic method.
+    return Private::CallClassId<Private::TypeHasClassId<T>::value, T>::get(item);
+  }
+}  // namespace gs
 
 // Class ids for standard types
-gs_specialize_class_id(float, 0)
-gs_specialize_class_id(double, 0)
-gs_specialize_class_id(long double, 0)
-gs_specialize_class_id(int, 0)
-gs_specialize_class_id(unsigned, 0)
-gs_specialize_class_id(long, 0)
-gs_specialize_class_id(long long, 0)
-gs_specialize_class_id(unsigned long, 0)
-gs_specialize_class_id(unsigned long long, 0)
-gs_specialize_class_id(short, 0)
-gs_specialize_class_id(unsigned short, 0)
-gs_specialize_class_id(bool, 0)
-gs_specialize_class_id(char, 0)
-gs_specialize_class_id(unsigned char, 0)
-gs_specialize_class_id(signed char, 0)
-gs_specialize_class_id(void, 0)
-gs_specialize_class_id(std::string, 0)
-
-// Class ids for some standard library templates
-// used by this I/O package
-gs_specialize_template_id_T(std::less, 0, 1)
-gs_specialize_template_id_T(std::equal_to, 0, 1)
-gs_specialize_template_id_T(std::allocator, 0, 1)
-gs_specialize_template_id_T(std::char_traits, 0, 1)
-gs_specialize_template_id_TT(std::vector, 0, 1)
-gs_specialize_template_id_TT(std::pair, 0, 2)
-gs_specialize_template_id_TTT(std::basic_string, 0, 2)
-
-
-#endif // GENERS_CLASSID_HH_
-
+gs_specialize_class_id(float, 0) gs_specialize_class_id(double, 0) gs_specialize_class_id(long double, 0)
+    gs_specialize_class_id(int, 0) gs_specialize_class_id(unsigned, 0) gs_specialize_class_id(long, 0)
+        gs_specialize_class_id(long long, 0) gs_specialize_class_id(unsigned long, 0)
+            gs_specialize_class_id(unsigned long long, 0) gs_specialize_class_id(short, 0)
+                gs_specialize_class_id(unsigned short, 0) gs_specialize_class_id(bool, 0)
+                    gs_specialize_class_id(char, 0) gs_specialize_class_id(unsigned char, 0)
+                        gs_specialize_class_id(signed char, 0) gs_specialize_class_id(void, 0)
+                            gs_specialize_class_id(std::string, 0)
+
+    // Class ids for some standard library templates
+    // used by this I/O package
+    gs_specialize_template_id_T(std::less, 0, 1) gs_specialize_template_id_T(std::equal_to, 0, 1)
+        gs_specialize_template_id_T(std::allocator, 0, 1) gs_specialize_template_id_T(std::char_traits, 0, 1)
+            gs_specialize_template_id_TT(std::vector, 0, 1) gs_specialize_template_id_TT(std::pair, 0, 2)
+                gs_specialize_template_id_TTT(std::basic_string, 0, 2)
+
+#endif  // GENERS_CLASSID_HH_
diff --git a/Alignment/Geners/interface/ClearIfPointer.hh b/Alignment/Geners/interface/ClearIfPointer.hh
index 303fe012b9519..43c476e09eb7f 100644
--- a/Alignment/Geners/interface/ClearIfPointer.hh
+++ b/Alignment/Geners/interface/ClearIfPointer.hh
@@ -2,22 +2,21 @@
 #define GENERS_CLEARIFPOINTER_HH_
 
 namespace gs {
-    template <class T>
-    struct ClearIfPointer
-    {
-        static void clear(T&) {}
-    };
+  template <class T>
+  struct ClearIfPointer {
+    static void clear(T &) {}
+  };
 
-    template <class T>
-    struct ClearIfPointer<T*>
-    {
-        static void clear(T*& ptr) {ptr = 0;}
-    };
+  template <class T>
+  struct ClearIfPointer<T *> {
+    static void clear(T *&ptr) { ptr = 0; }
+  };
 
-    // The following will set object value to 0 if object is a pointer
-    template <class T>
-    void clearIfPointer(T& obj) {ClearIfPointer<T>::clear(obj);}
-}
-
-#endif // GENERS_CLEARIFPOINTER_HH_
+  // The following will set object value to 0 if object is a pointer
+  template <class T>
+  void clearIfPointer(T &obj) {
+    ClearIfPointer<T>::clear(obj);
+  }
+}  // namespace gs
 
+#endif  // GENERS_CLEARIFPOINTER_HH_
diff --git a/Alignment/Geners/interface/ColumnBuffer.hh b/Alignment/Geners/interface/ColumnBuffer.hh
index d81574f2e58be..69dde408c347f 100644
--- a/Alignment/Geners/interface/ColumnBuffer.hh
+++ b/Alignment/Geners/interface/ColumnBuffer.hh
@@ -1,66 +1,58 @@
 #ifndef GENERS_COLUMNBUFFER_HH_
 #define GENERS_COLUMNBUFFER_HH_
 
-#include <vector>
 #include <iostream>
+#include <vector>
 
 #include "Alignment/Geners/interface/CharBuffer.hh"
 #include "Alignment/Geners/interface/ClassId.hh"
 
 namespace gs {
-    namespace Private {
-        struct ColumnBuffer
-        {
-            inline ColumnBuffer() : firstrow(0), lastrowp1(0), podsize(0) {}
-
-            // The actual buffer
-            CharBuffer buf;
-
-            // The range of rows stored in the buffer is [firstrow, lastrowp1)
-            unsigned long firstrow;
-            unsigned long lastrowp1;
-
-            // The following member will be non-0 if the column
-            // members are PODs for I/O purposes
-            unsigned long podsize;
-
-            // If the above member is 0, objects in the buffer may have
-            // variable size. Because of this, we need to store an offset
-            // of each object separately. To conserve space, the vector
-            // of object offsets is not filled for PODs.
-            std::vector<std::streampos> offsets;
-
-            // Methods related to I/O
-            bool write(std::ostream& os) const;
-            inline const ClassId& classId() const
-            {
-                return static_classId();
-            }
-
-            // The "restore" method is special and requires
-            // use of special references. The reason is the
-            // following: we will likely store a large number
-            // of these buffers at a time. Storing the class id
-            // of CharBuffer every time would be a waste of
-            // storage space. Because of this, we will assume
-            // that the code that manages these buffers will
-            // stash the CharBuffer class id somewhere.
-            static void restore(const ClassId& id, const ClassId& charBufId,
-                                std::istream& in, ColumnBuffer* buf);
-
-            static inline const char* classname()
-                {return "gs::Private::ColumnBuffer";}
-            static inline unsigned version() {return 1;}
-
-            bool operator==(const ColumnBuffer& r) const;
-            inline bool operator!=(const ColumnBuffer& r) const
-                {return !(*this == r);}
-
-        private:
-            static const ClassId& static_classId();
-        };
-    }
-}
-
-#endif // GENERS_COLUMNBUFFER_HH_
-
+  namespace Private {
+    struct ColumnBuffer {
+      inline ColumnBuffer() : firstrow(0), lastrowp1(0), podsize(0) {}
+
+      // The actual buffer
+      CharBuffer buf;
+
+      // The range of rows stored in the buffer is [firstrow, lastrowp1)
+      unsigned long firstrow;
+      unsigned long lastrowp1;
+
+      // The following member will be non-0 if the column
+      // members are PODs for I/O purposes
+      unsigned long podsize;
+
+      // If the above member is 0, objects in the buffer may have
+      // variable size. Because of this, we need to store an offset
+      // of each object separately. To conserve space, the vector
+      // of object offsets is not filled for PODs.
+      std::vector<std::streampos> offsets;
+
+      // Methods related to I/O
+      bool write(std::ostream &os) const;
+      inline const ClassId &classId() const { return static_classId(); }
+
+      // The "restore" method is special and requires
+      // use of special references. The reason is the
+      // following: we will likely store a large number
+      // of these buffers at a time. Storing the class id
+      // of CharBuffer every time would be a waste of
+      // storage space. Because of this, we will assume
+      // that the code that manages these buffers will
+      // stash the CharBuffer class id somewhere.
+      static void restore(const ClassId &id, const ClassId &charBufId, std::istream &in, ColumnBuffer *buf);
+
+      static inline const char *classname() { return "gs::Private::ColumnBuffer"; }
+      static inline unsigned version() { return 1; }
+
+      bool operator==(const ColumnBuffer &r) const;
+      inline bool operator!=(const ColumnBuffer &r) const { return !(*this == r); }
+
+    private:
+      static const ClassId &static_classId();
+    };
+  }  // namespace Private
+}  // namespace gs
+
+#endif  // GENERS_COLUMNBUFFER_HH_
diff --git a/Alignment/Geners/interface/CompressedIO.hh b/Alignment/Geners/interface/CompressedIO.hh
index ae75b21e8d3a3..be107abd91fa2 100644
--- a/Alignment/Geners/interface/CompressedIO.hh
+++ b/Alignment/Geners/interface/CompressedIO.hh
@@ -8,90 +8,89 @@
 #ifndef GENERS_COMPRESSEDIO_HH_
 #define GENERS_COMPRESSEDIO_HH_
 
-#include "Alignment/Geners/interface/GenericIO.hh"
 #include "Alignment/Geners/interface/CStringStream.hh"
+#include "Alignment/Geners/interface/GenericIO.hh"
 
 namespace gs {
-    // The following function returns "true" on success, "false" on failure
-    template <class Item>
-    bool write_compressed_item(std::ostream& os, const Item& item,
-             CStringStream::CompressionMode m = CStringStream::ZLIB,
-             int compressionLevel = -1, unsigned minSizeToCompress = 1024U,
-             unsigned bufSize = 1048576U);
+  // The following function returns "true" on success, "false" on failure
+  template <class Item>
+  bool write_compressed_item(std::ostream &os,
+                             const Item &item,
+                             CStringStream::CompressionMode m = CStringStream::ZLIB,
+                             int compressionLevel = -1,
+                             unsigned minSizeToCompress = 1024U,
+                             unsigned bufSize = 1048576U);
 
-    template <class Item>
-    void restore_compressed_item(std::istream& in, Item* item);
+  template <class Item>
+  void restore_compressed_item(std::istream &in, Item *item);
 
-    template <class Item>
-    CPP11_auto_ptr<Item> read_compressed_item(std::istream& in);
-}
+  template <class Item>
+  CPP11_auto_ptr<Item> read_compressed_item(std::istream &in);
+}  // namespace gs
 
 namespace gs {
-    template <class Item>
-    inline bool write_compressed_item(std::ostream& os, const Item& item,
-             const CStringStream::CompressionMode m,
-             const int compressionLevel, const unsigned minSizeToCompress,
-             const unsigned bufSize)
-    {
-        CStringStream cs(m, compressionLevel, minSizeToCompress, bufSize);
-        unsigned compressionCode = 0;
-        long long len = 0;
-        const std::streampos base = os.tellp();
-        write_pod(os, len);
-        write_pod(os, compressionCode);
-        if (os.fail() || os.bad())
-            return false;
-        const std::streampos start = os.tellp();
-        cs.setSink(os);
-        if (!write_item(cs, item))
-            return false;
-        cs.flush();
-        compressionCode = static_cast<unsigned>(cs.writeCompressed());
-        const std::streampos now = os.tellp();
-        const std::streamoff off = now - start;
-        len = off;
-        os.seekp(base);
-        write_pod(os, len);
-        write_pod(os, compressionCode);
-        os.seekp(now);
-        return !(cs.fail() || cs.bad() || os.fail() || os.bad());
-    }
-
-    template <class Item>
-    inline void restore_compressed_item(std::istream& is, Item* item)
-    {
-        long long len;
-        read_pod(is, &len);
-        unsigned compressionCode;
-        read_pod(is, &compressionCode);
-        CStringStream::CompressionMode m = 
-            static_cast<CStringStream::CompressionMode>(compressionCode);
-        CStringStream cs(m, -1, 1024U, 1048576U);
-        cs.readCompressed(is, compressionCode, len);
-        if (!is.good())
-            throw IOReadFailure("In restore_compressed_item: "
-                                "input stream failure");
-        restore_item(cs, item);
-    }
-
-    template <class Item>
-    inline CPP11_auto_ptr<Item> read_compressed_item(std::istream& is)
-    {
-        long long len;
-        read_pod(is, &len);
-        unsigned compressionCode;
-        read_pod(is, &compressionCode);
-        CStringStream::CompressionMode m = 
-            static_cast<CStringStream::CompressionMode>(compressionCode);
-        CStringStream cs(m, -1, 1024U, 1048576U);
-        cs.readCompressed(is, compressionCode, len);
-        if (!is.good())
-            throw IOReadFailure("In read_compressed_item: "
-                                "input stream failure");
-        return read_item<Item,std::istream>(cs);
-    }
-}
+  template <class Item>
+  inline bool write_compressed_item(std::ostream &os,
+                                    const Item &item,
+                                    const CStringStream::CompressionMode m,
+                                    const int compressionLevel,
+                                    const unsigned minSizeToCompress,
+                                    const unsigned bufSize) {
+    CStringStream cs(m, compressionLevel, minSizeToCompress, bufSize);
+    unsigned compressionCode = 0;
+    long long len = 0;
+    const std::streampos base = os.tellp();
+    write_pod(os, len);
+    write_pod(os, compressionCode);
+    if (os.fail() || os.bad())
+      return false;
+    const std::streampos start = os.tellp();
+    cs.setSink(os);
+    if (!write_item(cs, item))
+      return false;
+    cs.flush();
+    compressionCode = static_cast<unsigned>(cs.writeCompressed());
+    const std::streampos now = os.tellp();
+    const std::streamoff off = now - start;
+    len = off;
+    os.seekp(base);
+    write_pod(os, len);
+    write_pod(os, compressionCode);
+    os.seekp(now);
+    return !(cs.fail() || cs.bad() || os.fail() || os.bad());
+  }
 
+  template <class Item>
+  inline void restore_compressed_item(std::istream &is, Item *item) {
+    long long len;
+    read_pod(is, &len);
+    unsigned compressionCode;
+    read_pod(is, &compressionCode);
+    CStringStream::CompressionMode m = static_cast<CStringStream::CompressionMode>(compressionCode);
+    CStringStream cs(m, -1, 1024U, 1048576U);
+    cs.readCompressed(is, compressionCode, len);
+    if (!is.good())
+      throw IOReadFailure(
+          "In restore_compressed_item: "
+          "input stream failure");
+    restore_item(cs, item);
+  }
 
-#endif // GENERS_COMPRESSEDIO_HH_
+  template <class Item>
+  inline CPP11_auto_ptr<Item> read_compressed_item(std::istream &is) {
+    long long len;
+    read_pod(is, &len);
+    unsigned compressionCode;
+    read_pod(is, &compressionCode);
+    CStringStream::CompressionMode m = static_cast<CStringStream::CompressionMode>(compressionCode);
+    CStringStream cs(m, -1, 1024U, 1048576U);
+    cs.readCompressed(is, compressionCode, len);
+    if (!is.good())
+      throw IOReadFailure(
+          "In read_compressed_item: "
+          "input stream failure");
+    return read_item<Item, std::istream>(cs);
+  }
+}  // namespace gs
 
+#endif  // GENERS_COMPRESSEDIO_HH_
diff --git a/Alignment/Geners/interface/ContiguousCatalog.hh b/Alignment/Geners/interface/ContiguousCatalog.hh
index 8cf135b5938a1..778140b1a0f25 100644
--- a/Alignment/Geners/interface/ContiguousCatalog.hh
+++ b/Alignment/Geners/interface/ContiguousCatalog.hh
@@ -8,76 +8,71 @@
 #include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
 
 namespace gs {
-    class ContiguousCatalog : public AbsCatalog
-    {
-    public:
-        // Default constructor creates an empty catalog
-        inline ContiguousCatalog(const unsigned long long firstId=1)
-            : firstId_(firstId ? firstId : 1ULL) {}
-        inline virtual ~ContiguousCatalog() {}
-
-        inline unsigned long long size() const {return records_.size();}
-        inline unsigned long long smallestId() const {return firstId_;}
-        inline unsigned long long largestId() const
-            {return firstId_ + records_.size() - 1;}
-        inline bool isContiguous() const {return true;}
-
-        CPP11_shared_ptr<const CatalogEntry> retrieveEntry(
-            unsigned long long id) const;
-
-        bool retrieveStreampos(
-            unsigned long long id, unsigned* compressionCode,
-            unsigned long long* length, std::streampos* pos) const;
-
-        // Add a new entry without an id (id will be generated internally
-        // and returned)
-        unsigned long long makeEntry(const ItemDescriptor& descriptor,
-                                     unsigned compressionCode,
-                                     unsigned long long itemLength,
-                                     const ItemLocation& loc,
-                                     unsigned long long offset=0ULL);
-
-        inline const CatalogEntry* lastEntryMade() const
-            {return lastEntry_.get();}
-
-        // Search for matching entries based on item name and category
-        void search(const SearchSpecifier& namePattern,
-                    const SearchSpecifier& categoryPattern,
-                    std::vector<unsigned long long>* idsFound) const;
-
-        // Methods needed for I/O
-        virtual ClassId classId() const {return ClassId(*this);}
-        virtual bool write(std::ostream& os) const;
-
-        static inline const char* classname() {return "gs::ContiguousCatalog";}
-        static inline unsigned version() {return 2;}
-        static ContiguousCatalog* read(const ClassId& id, std::istream& in);
-
-    protected:
-        virtual bool isEqual(const AbsCatalog&) const;
-
-    private:
-        typedef CPP11_shared_ptr<const CatalogEntry> SPtr;
-
-        // In the following multimap, item name is the key and
-        // item id is the value
-        typedef std::multimap<std::string,unsigned long long> NameMap;
-
-        // In the following map, item category is the key
-        typedef std::map<std::string,NameMap> RecordMap;
-
-        void findByName(const NameMap& nmap,
-                        const SearchSpecifier& namePattern,
-                        std::vector<unsigned long long>* found) const;
-
-        std::vector<SPtr> records_;
-        unsigned long long firstId_;
-        RecordMap recordMap_;
-        SPtr lastEntry_;
-
-        static ContiguousCatalog* read_v1(std::istream& in);
-    };
-}
-
-#endif // GENERS_CONTIGUOUSCATALOG_HH_
-
+  class ContiguousCatalog : public AbsCatalog {
+  public:
+    // Default constructor creates an empty catalog
+    inline ContiguousCatalog(const unsigned long long firstId = 1) : firstId_(firstId ? firstId : 1ULL) {}
+    inline ~ContiguousCatalog() override {}
+
+    inline unsigned long long size() const override { return records_.size(); }
+    inline unsigned long long smallestId() const override { return firstId_; }
+    inline unsigned long long largestId() const override { return firstId_ + records_.size() - 1; }
+    inline bool isContiguous() const override { return true; }
+
+    CPP11_shared_ptr<const CatalogEntry> retrieveEntry(unsigned long long id) const override;
+
+    bool retrieveStreampos(unsigned long long id,
+                           unsigned *compressionCode,
+                           unsigned long long *length,
+                           std::streampos *pos) const override;
+
+    // Add a new entry without an id (id will be generated internally
+    // and returned)
+    unsigned long long makeEntry(const ItemDescriptor &descriptor,
+                                 unsigned compressionCode,
+                                 unsigned long long itemLength,
+                                 const ItemLocation &loc,
+                                 unsigned long long offset = 0ULL) override;
+
+    inline const CatalogEntry *lastEntryMade() const override { return lastEntry_.get(); }
+
+    // Search for matching entries based on item name and category
+    void search(const SearchSpecifier &namePattern,
+                const SearchSpecifier &categoryPattern,
+                std::vector<unsigned long long> *idsFound) const override;
+
+    // Methods needed for I/O
+    ClassId classId() const override { return ClassId(*this); }
+    bool write(std::ostream &os) const override;
+
+    static inline const char *classname() { return "gs::ContiguousCatalog"; }
+    static inline unsigned version() { return 2; }
+    static ContiguousCatalog *read(const ClassId &id, std::istream &in);
+
+  protected:
+    bool isEqual(const AbsCatalog &) const override;
+
+  private:
+    typedef CPP11_shared_ptr<const CatalogEntry> SPtr;
+
+    // In the following multimap, item name is the key and
+    // item id is the value
+    typedef std::multimap<std::string, unsigned long long> NameMap;
+
+    // In the following map, item category is the key
+    typedef std::map<std::string, NameMap> RecordMap;
+
+    void findByName(const NameMap &nmap,
+                    const SearchSpecifier &namePattern,
+                    std::vector<unsigned long long> *found) const;
+
+    std::vector<SPtr> records_;
+    unsigned long long firstId_;
+    RecordMap recordMap_;
+    SPtr lastEntry_;
+
+    static ContiguousCatalog *read_v1(std::istream &in);
+  };
+}  // namespace gs
+
+#endif  // GENERS_CONTIGUOUSCATALOG_HH_
diff --git a/Alignment/Geners/interface/GeneralCatalog.hh b/Alignment/Geners/interface/GeneralCatalog.hh
index 7a869c3b2fa74..4fa065ec9cf84 100644
--- a/Alignment/Geners/interface/GeneralCatalog.hh
+++ b/Alignment/Geners/interface/GeneralCatalog.hh
@@ -6,89 +6,85 @@
 #include "Alignment/Geners/interface/AbsCatalog.hh"
 
 namespace gs {
-    class GeneralCatalog : public AbsCatalog
-    {
-    public:
-        // Default constructor creates an empty catalog
-        GeneralCatalog();
-        inline virtual ~GeneralCatalog() {}
-
-        inline unsigned long long size() const {return records_.size();}
-        inline unsigned long long smallestId() const {return smallestId_;}
-        inline unsigned long long largestId() const {return largestId_;}
-        inline bool isContiguous() const {return false;}
-        inline bool itemExists(const unsigned long long id) const
-            {return records_.find(id) != records_.end();}
-
-        CPP11_shared_ptr<const CatalogEntry> retrieveEntry(
-            const unsigned long long id) const;
-
-        bool retrieveStreampos(
-            unsigned long long id, unsigned* compressionCode,
-            unsigned long long* length, std::streampos* pos) const;
-
-        // Add a new entry without an id (id will be generated internally
-        // and returned)
-        unsigned long long makeEntry(const ItemDescriptor& descriptor,
-                                     unsigned compressionCode,
-                                     unsigned long long itemLength,
-                                     const ItemLocation& loc,
-                                     unsigned long long offset=0ULL);
-
-        inline const CatalogEntry* lastEntryMade() const
-            {return lastEntry_.get();}
-
-        // Add a new entry with id (presumably, from another catalog).
-        // Returns "true" on success. The entry is not included (and "false"
-        // is returned) in case the entry with the given id already exists.
-        bool addEntry(CPP11_shared_ptr<const CatalogEntry> ptr);
-
-        // Remove an entry with the given id. "false" is returned in case
-        // an entry with the specified id does not exist.
-        bool removeEntry(unsigned long long id);
-
-        // Search for matching entries based on item name and category
-        void search(const SearchSpecifier& namePattern,
-                    const SearchSpecifier& categoryPattern,
-                    std::vector<unsigned long long>* idsFound) const;
-
-        // Methods needed for I/O
-        virtual ClassId classId() const {return ClassId(*this);}
-        virtual bool write(std::ostream& os) const;
-
-        static inline const char* classname() {return "gs::GeneralCatalog";}
-        static inline unsigned version() {return 2;}
-        static GeneralCatalog* read(const ClassId& id, std::istream& in);
-
-    protected:
-        virtual bool isEqual(const AbsCatalog&) const;
-
-    private:
-        typedef CPP11_shared_ptr<const CatalogEntry> SPtr;
-
-        // In the following multimap, item name is the key and
-        // catalog entry pointer is the value
-        typedef std::multimap<std::string,SPtr> NameMap;
-
-        // In the following map, item category is the key
-        typedef std::map<std::string,NameMap> RecordMap;
-
-        // In the following map, item id is the key
-        typedef std::map<unsigned long long,SPtr> IdMap;
-
-        void findByName(const NameMap& nmap,
-                        const SearchSpecifier& namePattern,
-                        std::vector<unsigned long long>* found) const;
-
-        IdMap records_;
-        RecordMap recordMap_;
-        unsigned long long smallestId_;
-        unsigned long long largestId_;
-        SPtr lastEntry_;
-
-        static GeneralCatalog* read_v1(std::istream& in);
-    };
-}
-
-#endif // GENERS_GENERALCATALOG_HH_
-
+  class GeneralCatalog : public AbsCatalog {
+  public:
+    // Default constructor creates an empty catalog
+    GeneralCatalog();
+    inline ~GeneralCatalog() override {}
+
+    inline unsigned long long size() const override { return records_.size(); }
+    inline unsigned long long smallestId() const override { return smallestId_; }
+    inline unsigned long long largestId() const override { return largestId_; }
+    inline bool isContiguous() const override { return false; }
+    inline bool itemExists(const unsigned long long id) const override { return records_.find(id) != records_.end(); }
+
+    CPP11_shared_ptr<const CatalogEntry> retrieveEntry(const unsigned long long id) const override;
+
+    bool retrieveStreampos(unsigned long long id,
+                           unsigned *compressionCode,
+                           unsigned long long *length,
+                           std::streampos *pos) const override;
+
+    // Add a new entry without an id (id will be generated internally
+    // and returned)
+    unsigned long long makeEntry(const ItemDescriptor &descriptor,
+                                 unsigned compressionCode,
+                                 unsigned long long itemLength,
+                                 const ItemLocation &loc,
+                                 unsigned long long offset = 0ULL) override;
+
+    inline const CatalogEntry *lastEntryMade() const override { return lastEntry_.get(); }
+
+    // Add a new entry with id (presumably, from another catalog).
+    // Returns "true" on success. The entry is not included (and "false"
+    // is returned) in case the entry with the given id already exists.
+    bool addEntry(CPP11_shared_ptr<const CatalogEntry> ptr);
+
+    // Remove an entry with the given id. "false" is returned in case
+    // an entry with the specified id does not exist.
+    bool removeEntry(unsigned long long id);
+
+    // Search for matching entries based on item name and category
+    void search(const SearchSpecifier &namePattern,
+                const SearchSpecifier &categoryPattern,
+                std::vector<unsigned long long> *idsFound) const override;
+
+    // Methods needed for I/O
+    ClassId classId() const override { return ClassId(*this); }
+    bool write(std::ostream &os) const override;
+
+    static inline const char *classname() { return "gs::GeneralCatalog"; }
+    static inline unsigned version() { return 2; }
+    static GeneralCatalog *read(const ClassId &id, std::istream &in);
+
+  protected:
+    bool isEqual(const AbsCatalog &) const override;
+
+  private:
+    typedef CPP11_shared_ptr<const CatalogEntry> SPtr;
+
+    // In the following multimap, item name is the key and
+    // catalog entry pointer is the value
+    typedef std::multimap<std::string, SPtr> NameMap;
+
+    // In the following map, item category is the key
+    typedef std::map<std::string, NameMap> RecordMap;
+
+    // In the following map, item id is the key
+    typedef std::map<unsigned long long, SPtr> IdMap;
+
+    void findByName(const NameMap &nmap,
+                    const SearchSpecifier &namePattern,
+                    std::vector<unsigned long long> *found) const;
+
+    IdMap records_;
+    RecordMap recordMap_;
+    unsigned long long smallestId_;
+    unsigned long long largestId_;
+    SPtr lastEntry_;
+
+    static GeneralCatalog *read_v1(std::istream &in);
+  };
+}  // namespace gs
+
+#endif  // GENERS_GENERALCATALOG_HH_
diff --git a/Alignment/Geners/interface/GenericIO.hh b/Alignment/Geners/interface/GenericIO.hh
index 9cba477be518c..95e0848f0d1e3 100644
--- a/Alignment/Geners/interface/GenericIO.hh
+++ b/Alignment/Geners/interface/GenericIO.hh
@@ -1,884 +1,693 @@
-// 
+//
 // Top-level API for serializing and deserializing arbitrary classes
 //
 
 #ifndef GENERS_GENERICIO_HH_
 #define GENERS_GENERICIO_HH_
 
-#include "Alignment/Geners/interface/binaryIO.hh"
 #include "Alignment/Geners/interface/IOPointeeType.hh"
+#include "Alignment/Geners/interface/binaryIO.hh"
 
-#include "Alignment/Geners/interface/StrippedType.hh"
 #include "Alignment/Geners/interface/ArrayAdaptor.hh"
 #include "Alignment/Geners/interface/ClearIfPointer.hh"
+#include "Alignment/Geners/interface/StrippedType.hh"
 
 namespace gs {
-    /**
-    // Generic top-level function which can be used to write out
-    // almost anything. Intended mainly for use inside "write"
-    // methods of user-developed classes and templates. Returns
-    // "true" if the argument item is successfully written out.
-    */
-    template <class Stream, class Item>
-    inline bool write_item(Stream& os, const Item& item,
-                           const bool writeClassId=true)
-    {
-        char* ps = 0;
-        return process_const_item<GenericWriter>(item, os, ps, writeClassId);
-    }
-
-    /**
-    // A function for overwriting existing objects (which usually live
-    // on the stack). This function actually skips couple levels of
-    // indirection which would be generated by a call to "process_item".
-    */
-    template <class Stream, class Item>
-    inline void restore_item(Stream& is, Item* item,
-                             const bool readClassId=true)
-    {
-        typedef std::vector<ClassId> State;
-        assert(item);
-        State state;
-        const bool status = GenericReader<Stream, State, Item*,
-            Int2Type<IOTraits<int>::ISPOINTER> >::process(
-                item, is, &state, readClassId);
-        if (is.fail())
-            throw IOReadFailure("In gs::restore_item: input stream failure");
-        if (!status)
-            throw IOInvalidData("In gs::restore_item: invalid input stream data");
-    }
-
-    /**
-    // Function for returning objects on the heap. This function
-    // requires explicit specification of its first template
-    // parameter, the type of the item to read. This function
-    // either succeeds or throws an exception which inherits
-    // from std::exception.
-    */
-    template <class Item, class Stream>
-    inline CPP11_auto_ptr<Item> read_item(Stream& is, const bool readClassId=true)
-    {
-        typedef std::vector<ClassId> State;
-        Item* item = 0;
-        State state;
-        const bool status = GenericReader<Stream, State, Item*,
-            Int2Type<IOTraits<int>::ISNULLPOINTER> >::process(
-                item, is, &state, readClassId);
-        CPP11_auto_ptr<Item> ptr(item);
-        if (is.fail())
-            throw IOReadFailure("In gs::read_item: input stream failure");
-        if (!status || item == 0)
-            throw IOInvalidData("In gs::read_item: invalid input stream data");
-        return ptr;
-    }
-
-    /**
-    // Generic top-level function for writing arrays. Note that
-    // the length of the array is not written out and that the
-    // length must be known in advance in the scope from which
-    // the companion function, "read_array", is called. "true"
-    // is returned upon success, "false" on failure.
-    */
-    template <class Stream, class Item>
-    inline bool write_array(Stream& os, Item* items, const std::size_t length)
-    {
-        char* ps = 0;
-        return process_const_item<GenericWriter>(
-            ArrayAdaptor<Item>(items, length), os, ps, false);
-    }
-
-    /**
-    // Function for deserializing arrays. The length of the array
-    // must be known in the scope from which this function is invoked.
-    */
-    template <class Stream, class Item>
-    inline void read_array(Stream& is, Item* items, const std::size_t length)
-    {
-        typedef std::vector<ClassId> State;
-        State state;
-        ArrayAdaptor<Item> adap(items, length);
-        const bool st = process_item<GenericReader>(adap, is, &state, false);
-        if (is.fail())
-            throw IOReadFailure("In gs::read_array: input stream failure");
-        if (!st)
-            throw IOInvalidData("In gs::read_array: invalid input stream data");
-    }
-}
+  /**
+// Generic top-level function which can be used to write out
+// almost anything. Intended mainly for use inside "write"
+// methods of user-developed classes and templates. Returns
+// "true" if the argument item is successfully written out.
+*/
+  template <class Stream, class Item>
+  inline bool write_item(Stream &os, const Item &item, const bool writeClassId = true) {
+    char *ps = nullptr;
+    return process_const_item<GenericWriter>(item, os, ps, writeClassId);
+  }
+
+  /**
+// A function for overwriting existing objects (which usually live
+// on the stack). This function actually skips couple levels of
+// indirection which would be generated by a call to "process_item".
+*/
+  template <class Stream, class Item>
+  inline void restore_item(Stream &is, Item *item, const bool readClassId = true) {
+    typedef std::vector<ClassId> State;
+    assert(item);
+    State state;
+    const bool status = GenericReader<Stream, State, Item *, Int2Type<IOTraits<int>::ISPOINTER>>::process(
+        item, is, &state, readClassId);
+    if (is.fail())
+      throw IOReadFailure("In gs::restore_item: input stream failure");
+    if (!status)
+      throw IOInvalidData("In gs::restore_item: invalid input stream data");
+  }
+
+  /**
+// Function for returning objects on the heap. This function
+// requires explicit specification of its first template
+// parameter, the type of the item to read. This function
+// either succeeds or throws an exception which inherits
+// from std::exception.
+*/
+  template <class Item, class Stream>
+  inline CPP11_auto_ptr<Item> read_item(Stream &is, const bool readClassId = true) {
+    typedef std::vector<ClassId> State;
+    Item *item = nullptr;
+    State state;
+    const bool status = GenericReader<Stream, State, Item *, Int2Type<IOTraits<int>::ISNULLPOINTER>>::process(
+        item, is, &state, readClassId);
+    CPP11_auto_ptr<Item> ptr(item);
+    if (is.fail())
+      throw IOReadFailure("In gs::read_item: input stream failure");
+    if (!status || item == nullptr)
+      throw IOInvalidData("In gs::read_item: invalid input stream data");
+    return ptr;
+  }
+
+  /**
+// Generic top-level function for writing arrays. Note that
+// the length of the array is not written out and that the
+// length must be known in advance in the scope from which
+// the companion function, "read_array", is called. "true"
+// is returned upon success, "false" on failure.
+*/
+  template <class Stream, class Item>
+  inline bool write_array(Stream &os, Item *items, const std::size_t length) {
+    char *ps = nullptr;
+    return process_const_item<GenericWriter>(ArrayAdaptor<Item>(items, length), os, ps, false);
+  }
+
+  /**
+// Function for deserializing arrays. The length of the array
+// must be known in the scope from which this function is invoked.
+*/
+  template <class Stream, class Item>
+  inline void read_array(Stream &is, Item *items, const std::size_t length) {
+    typedef std::vector<ClassId> State;
+    State state;
+    ArrayAdaptor<Item> adap(items, length);
+    const bool st = process_item<GenericReader>(adap, is, &state, false);
+    if (is.fail())
+      throw IOReadFailure("In gs::read_array: input stream failure");
+    if (!st)
+      throw IOInvalidData("In gs::read_array: invalid input stream data");
+  }
+}  // namespace gs
 
 namespace gs {
-    template <class Stream, class State, class Item, class Stage>
-    struct GenericWriter2 : public GenericWriter<Stream,State,Item,Stage> {};
-
-    template <class Stream, class State, class Item, class Stage>
-    struct GenericReader2 : public GenericReader<Stream,State,Item,Stage> {};
-
-    // The reader and writer templates should be specialized
-    // (that is, their "process" function should be defined) using
-    // the following processing stage types from "ProcessItem.hh":
-    //
-    // Int2Type<IOTraits<int>::ISPOD>                (+readIntoPtr)
-    // InContainerHeader
-    // InContainerFooter
-    // InContainerSize
-    // InPODArray
-    // Int2Type<IOTraits<int>::ISWRITABLE>
-    // Int2Type<IOTraits<int>::ISPOINTER>
-    // Int2Type<IOTraits<int>::ISSHAREDPTR>
-    // Int2Type<IOTraits<int>::ISPAIR>               (+readIntoPtr)
-    // Int2Type<IOTraits<int>::ISSTRING>             (+readIntoPtr)
-    //
-    // In addition, the reader should be specialized for the following
-    // types:
-    //
-    // InContainerCycle                              (process     only)
-    // Int2Type<IOTraits<int>::ISSTDCONTAINER>       (readIntoPtr only)
-    // Int2Type<IOTraits<int>::ISHEAPREADABLE>       (readIntoPtr only)
-    // Int2Type<IOTraits<int>::ISPLACEREADABLE>      (readIntoPtr only)
-    //
-    // The resulting code is essentially one big compile-time state
-    // machine with two main switching hubs: "process_item" function
-    // from "ProcessItem.hh" and "process" function in GenericReader
-    // template specialized for bare pointers.
-    //
-
-    //===================================================================
-    //
-    // Processing of a POD
-    //
-    //===================================================================
-    template <class Stream, class State, class T>
-    struct GenericWriter<Stream, State, T,
-                         Int2Type<IOTraits<int>::ISPOD> >
-    {
-        inline static bool process(const T& s, Stream& os, State*,
-                                   const bool processClassId)
-        {
-            static const ClassId current(ClassId::makeId<T>());
-            const bool status = processClassId ? current.write(os) : true;
-            if (status)
-                write_pod(os, s);
-            return status && !os.fail();
-        }
-    };
-
-    template <class Stream, class State, class T>
-    struct GenericReader<Stream, State, T,
-                         Int2Type<IOTraits<int>::ISPOD> >
-    {
-        inline static bool readIntoPtr(T*& ptr, Stream& str, State*,
-                                       const bool processClassId)
-        {
-            CPP11_auto_ptr<T> myptr;
-            if (ptr == 0)
-                myptr = CPP11_auto_ptr<T>(new T());
-            if (processClassId)
-            {
-                static const ClassId current(ClassId::makeId<T>());
-                ClassId id(str, 1);
-                current.ensureSameName(id);
-            }
-            read_pod(str, ptr ? ptr : myptr.get());
-            if (str.fail())
-                return false;
-            if (ptr == 0)
-                ptr = myptr.release();
-            return true;
-        }
-
-        inline static bool process(T& s, Stream& os, State* st,
-                                   const bool processClassId)
-        {
-            T* ps = &s;
-            return readIntoPtr(ps, os, st, processClassId);
-        }
-    };
-
-
-    //===================================================================
-    //
-    // Processing of a container header
-    //
-    //===================================================================
-    template <class Stream, class State,  class Container>
-    struct GenericWriter<Stream, State, Container, InContainerHeader>
-    {
-        inline static bool process(const Container&, Stream& os, State*,
-                                   const bool processClassId)
-        {
-            typedef typename Container::value_type T;
-
-            static const ClassId current(ClassId::makeId<Container>());
-            bool status = processClassId ? current.write(os) : true;
-
-            // Maybe we do not have to write out the container class id,
-            // but we do have to write out the item class id -- unless the
-            // container is just an array of pods. Otherwise we might not
-            // be able to read the container items back.
-            if (status && !(IOTraits<T>::IsPOD && 
-                            IOTraits<Container>::IsContiguous))
-            {
-                static const ClassId itemId(ClassId::makeId<T>());
-                status = itemId.write(os);
-            }
-            return status;
-        }
-    };
-
-    template <class Stream, class State, class Container>
-    struct GenericReader<Stream, State, Container, InContainerHeader>
-    {
-        inline static bool process(Container& a, Stream& is, State* state,
-                                   const bool processClassId)
-        {
-            typedef typename Container::value_type T;
-
-            if (processClassId)
-            {
-                static const ClassId current(ClassId::makeId<Container>());
-                ClassId id(is, 1);
-                current.ensureSameName(id);
-            }
-            a.clear();
-            if (!(IOTraits<T>::IsPOD && IOTraits<Container>::IsContiguous))
-            {
-                ClassId id(is, 1);
-
-                // Remember the class id of the contained items.
-                // We need to do this even if the id is invalid because
-                // the id will be popped back when the "InContainerFooter"
-                // stage is processed.
-                state->push_back(id);
-            }
-            return true;
-        }
-    };
-
-
-    //===================================================================
-    //
-    // Processing of a container footer
-    //
-    //===================================================================
-    template <class Stream, class State,  class Container>
-    struct GenericWriter<Stream, State, Container, InContainerFooter>
-    {
-        inline static bool process(const Container&, Stream&, State*, bool)
-            {return true;}
-    };
-
-    template <class Stream, class State, class Container>
-    struct GenericReader<Stream, State, Container, InContainerFooter>
-    {
-        inline static bool process(Container&, Stream&, State* state, bool)
-        {
-            typedef typename Container::value_type T;
-            if (!(IOTraits<T>::IsPOD && IOTraits<Container>::IsContiguous))
-                state->pop_back();
-            return true;
-        }
-    };
-
-
-    //===================================================================
-    //
-    // Processing of container size
-    //
-    //===================================================================
-    template <class Stream, class State,  class Container>
-    struct GenericWriter<Stream, State, Container, InContainerSize>
-    {
-        inline static bool process(const std::size_t& sz, Stream& os, State*,
-                                   bool /* processClassId */)
-        {
-            write_pod(os, sz);
-            return !os.fail();
-        }
-    };
-
-    template <class Stream, class State,  class Container>
-    struct GenericReader<Stream, State, Container, InContainerSize>
-    {
-        inline static bool process(std::size_t& sz, Stream& is, State*,
-                                   bool /* processClassId */)
-        {
-            read_pod(is, &sz);
-            return !is.fail();
-        }
-    };
-
-
-    //===================================================================
-    //
-    // Processing of data in contiguous POD containers
-    //
-    //===================================================================
-    template <class Stream, class State, class ArrayLike>
-    struct GenericWriter<Stream, State, ArrayLike, InPODArray>
-    {
-        inline static bool process(const ArrayLike& a, Stream& os,
-                                   State*, bool)
-        {
-            const std::size_t len = a.size();
-            write_pod(os, len);
-            if (len)
-                write_pod_array(os, &a[0], len);
-            return !os.fail();
-        }
-    };
-
-    template <class Stream, class State, class ArrayLike>
-    struct GenericReader<Stream, State, ArrayLike, InPODArray>
-    {
-        inline static bool process(ArrayLike& a, Stream& s, State*, bool)
-        {
-            std::size_t len = 0;
-            read_pod(s, &len);
-            if (s.fail())
-                return false;
-            a.resize(len);
-            if (!len)
-                return true;
-            read_pod_array(s, &a[0], len);
-            return !s.fail();
-        }
-    };
-
-    //===================================================================
-    //
-    // Processing of "writable" objects
-    //
-    //===================================================================
-    template <class Stream, class State, class T>
-    struct GenericWriter<Stream, State, T,
-                         Int2Type<IOTraits<int>::ISWRITABLE> >
-    {
-        inline static bool process(const T& s, Stream& os, State*,
-                                   const bool processClassId)
-        {
-            return (processClassId ? s.classId().write(os) : true) &&
-                s.write(os) && !os.fail();
-        }
-    };
-
-    template <class Stream, class State, class T>
-    struct GenericReader<Stream, State, T,
-                         Int2Type<IOTraits<int>::ISWRITABLE> >
-    {
-        inline static bool process(T& s, Stream& is, State* st,
-                                   const bool processClassId)
-        {
-            typedef IOTraits<T> M;
-            T* ps = &s;
-            return GenericReader<Stream, State, T,
-                Int2Type<M::Signature & (M::ISPLACEREADABLE | 
-                                         M::ISHEAPREADABLE
-                )> >::readIntoPtr(ps, is, st, processClassId);
-        }
-    };
-
-
-    //===================================================================
-    //
-    // Processing of bare pointers.
-    //
-    // The writer simply dereferences the pointer.
-    //
-    // In the reader, we want to read stuff into the pointee object,
-    // or want to create an item on the heap if the pointer value is 0.
-    //
-    //===================================================================
-    template <class Stream, class State, class Ptr>
-    struct GenericWriter<Stream, State, Ptr,
-                         Int2Type<IOTraits<int>::ISPOINTER> >
-    {
-        inline static bool process(const Ptr& ptr, Stream& os, State* s,
-                                   const bool processClassId)
-        {
-            // Can't have pointers to pointers. This is a design
-            // decision which simplifies things considerably.
-            typedef typename IOPointeeType<Ptr>::type Pointee;
-            typedef IOTraits<Pointee> M;
-            static_assert((M::Signature & (M::ISPOINTER | 
-                                               M::ISSHAREDPTR)) == 0, "can not write pointers to pointers");
-
-            // Can't have NULL pointers either. But this
-            // can be checked at run time only.
-            assert(ptr);
-            return process_const_item<GenericWriter2>(
-                *ptr, os, s, processClassId);
-        }
-    };
-
-    template <class Stream, class State, class Ptr>
-    struct GenericReader<Stream, State, Ptr,
-                         Int2Type<IOTraits<int>::ISPOINTER> >
-    {
-        inline static bool process(Ptr& ptr, Stream& str, State* s,
-                                   const bool processClassId)
-        {
-            // We need to figure out the type of the pointee
-            // and make a swich depending on that type.
-            // Note that the pointee itself can not be a pointer.
-            typedef typename IOPointeeType<Ptr>::type Pointee;
-            typedef IOTraits<Pointee> M;
-            static_assert((M::Signature & (M::ISPOINTER | 
-                                               M::ISSHAREDPTR)) == 0, "can not read pointers to pointers");
-
-            return GenericReader<Stream, State, Pointee,
-                Int2Type<M::Signature & (M::ISPOD | 
-                                         M::ISSTDCONTAINER |
-                                         M::ISHEAPREADABLE |
-                                         M::ISPLACEREADABLE |
-                                         M::ISPAIR |
-                                         M::ISTUPLE |
-                                         M::ISEXTERNAL |
-                                         M::ISSTRING
-                )> >::readIntoPtr(ptr, str, s, processClassId);
-        }
-    };
-
-    template <class Stream, class State, class Ptr>
-    struct GenericReader<Stream, State, Ptr,
-                         Int2Type<IOTraits<int>::ISNULLPOINTER> >
-    {
-        inline static bool process(Ptr& ptr, Stream& str, State* s,
-                                   const bool processClassId)
-        {
-            // We need to figure out the type of the pointee
-            // and make a swich depending on that type.
-            // Note that the pointee itself can not be a pointer.
-            typedef typename IOPointeeType<Ptr>::type Pointee;
-            typedef IOTraits<Pointee> M;
-            static_assert((M::Signature & (M::ISNULLPOINTER | 
-                                               M::ISSHAREDPTR)) == 0, "can not read pointers to pointers");
-
-            return GenericReader<Stream, State, Pointee,
-                Int2Type<M::Signature & (M::ISPOD | 
-                                         M::ISSTDCONTAINER |
-                                         M::ISPUREHEAPREADABLE |
-                                         M::ISPLACEREADABLE |
-                                         M::ISPAIR |
-                                         M::ISTUPLE |
-                                         M::ISEXTERNAL |
-                                         M::ISSTRING
-                )> >::readIntoPtr(ptr, str, s, processClassId);
-        }
-    };
-
-
-    //===================================================================
-    //
-    // Processing of shared pointers -- similar logic to pointers.
-    // For the reader, handling of the shared pointer is reduced
-    // to handling of a normal pointer with 0 value.
-    //
-    //===================================================================
-    template <class Stream, class State, class Ptr>
-    struct GenericWriter<Stream, State, Ptr,
-                         Int2Type<IOTraits<int>::ISSHAREDPTR> >
-    {
-        inline static bool process(const Ptr& ptr, Stream& os, State* s,
-                                   const bool processClassId)
-        {
-            typedef typename Ptr::element_type Pointee;
-            typedef IOTraits<Pointee> M;
-            static_assert((M::Signature & (M::ISPOINTER | 
-                                               M::ISSHAREDPTR)) == 0, "can not write pointers to pointers");
-            assert(ptr.get());
-            return process_const_item<GenericWriter2>(
-                *ptr, os, s, processClassId);
-        }
-    };
-
-    template <class Stream, class State, class ShPtr>
-    struct GenericReader<Stream, State, ShPtr,
-                         Int2Type<IOTraits<int>::ISSHAREDPTR> >
-    {
-        inline static bool process(ShPtr& a, Stream& str, State* s,
-                                   const bool processClassId)
-        {
-            typedef typename ShPtr::element_type Pointee;
-            typedef IOTraits<Pointee> M;
-            static_assert((M::Signature & (M::ISPOINTER | 
-                                               M::ISSHAREDPTR)) == 0, "can not read pointers to pointers");
-            Pointee* ptr = 0;
-            const bool status = GenericReader<Stream, State, Pointee*,
-                Int2Type<IOTraits<int>::ISNULLPOINTER> >::process(
-                    ptr, str, s, processClassId);
-            if (status)
-            {
-                assert(ptr);
-                a = CPP11_shared_ptr<Pointee>(ptr);
-                return true;
-            }
-            else
-            {
-                delete ptr;
-                return false;
-            }
-        }
-    };
-
-
-    //===================================================================
-    //
-    // Processing of std::pair
-    //
-    //===================================================================
-    template <class Stream, class State, class T>
-    struct GenericWriter<Stream, State, T,
-                         Int2Type<IOTraits<int>::ISPAIR> >
-    {
-        inline static bool process(const T& s, Stream& os, State* st,
-                                   const bool processClassId)
-        {
-            // Here is a little problem: in this scope "GenericWriter"
-            // means GenericWriter<Stream, State, T,
-            //                     Int2Type<IOTraits<int>::ISPAIR> >
-            // However, we want to use the whole template, unspecialized.
-            // This is why "GenericWriter2" is introduced: a copy of
-            // "GenericWriter" via public inheritance.
-            static const ClassId current(ClassId::makeId<T>());
-            return (processClassId ? current.write(os) : true) &&
-                process_const_item<GenericWriter2>(s.first, os, st, false) &&
-                process_const_item<GenericWriter2>(s.second, os, st, false);
-        }
-    };
-
-    template <class Stream, class State, class T>
-    struct GenericReader<Stream, State, T,
-                         Int2Type<IOTraits<int>::ISPAIR> >
-    {
-        inline static bool readIntoPtr(T*& ptr, Stream& str, State* s,
-                                       const bool processClassId)
-        {
-            CPP11_auto_ptr<T> myptr;
-            if (ptr == 0)
-            {
-                myptr = CPP11_auto_ptr<T>(new T());
-                clearIfPointer(myptr.get()->first);
-                clearIfPointer(myptr.get()->second);
-            }
-            std::vector<std::vector<ClassId> > itemIds;
-            if (processClassId)
-            {
-                static const ClassId current(ClassId::makeId<T>());
-                ClassId pairId(str, 1);
-                current.ensureSameName(pairId);
-                pairId.templateParameters(&itemIds);
-                assert(itemIds.size() == 2U);
-            }
-            else
-            {
-                assert(!s->empty());
-                s->back().templateParameters(&itemIds);
-                if (itemIds.size() != 2U)
-                {
-                    std::string err("In gs::GenericReader::readIntoPtr: "
-                                    "bad class id for std::pair on the "
-                                    "class id stack: ");
-                    err += s->back().id();
-                    throw IOInvalidData(err);
-                }
-            }
-            if (!(process_item<GenericReader2>(
-                     (ptr ? ptr : myptr.get())->first,str,&itemIds[0],false) &&
-                  process_item<GenericReader2>(
-                     (ptr ? ptr : myptr.get())->second,str,&itemIds[1],false)))
-                return false;
-            if (ptr == 0)
-                ptr = myptr.release();
-            return true;
-        }
+  template <class Stream, class State, class Item, class Stage>
+  struct GenericWriter2 : public GenericWriter<Stream, State, Item, Stage> {};
+
+  template <class Stream, class State, class Item, class Stage>
+  struct GenericReader2 : public GenericReader<Stream, State, Item, Stage> {};
+
+  // The reader and writer templates should be specialized
+  // (that is, their "process" function should be defined) using
+  // the following processing stage types from "ProcessItem.hh":
+  //
+  // Int2Type<IOTraits<int>::ISPOD>                (+readIntoPtr)
+  // InContainerHeader
+  // InContainerFooter
+  // InContainerSize
+  // InPODArray
+  // Int2Type<IOTraits<int>::ISWRITABLE>
+  // Int2Type<IOTraits<int>::ISPOINTER>
+  // Int2Type<IOTraits<int>::ISSHAREDPTR>
+  // Int2Type<IOTraits<int>::ISPAIR>               (+readIntoPtr)
+  // Int2Type<IOTraits<int>::ISSTRING>             (+readIntoPtr)
+  //
+  // In addition, the reader should be specialized for the following
+  // types:
+  //
+  // InContainerCycle                              (process     only)
+  // Int2Type<IOTraits<int>::ISSTDCONTAINER>       (readIntoPtr only)
+  // Int2Type<IOTraits<int>::ISHEAPREADABLE>       (readIntoPtr only)
+  // Int2Type<IOTraits<int>::ISPLACEREADABLE>      (readIntoPtr only)
+  //
+  // The resulting code is essentially one big compile-time state
+  // machine with two main switching hubs: "process_item" function
+  // from "ProcessItem.hh" and "process" function in GenericReader
+  // template specialized for bare pointers.
+  //
+
+  //===================================================================
+  //
+  // Processing of a POD
+  //
+  //===================================================================
+  template <class Stream, class State, class T>
+  struct GenericWriter<Stream, State, T, Int2Type<IOTraits<int>::ISPOD>> {
+    inline static bool process(const T &s, Stream &os, State *, const bool processClassId) {
+      static const ClassId current(ClassId::makeId<T>());
+      const bool status = processClassId ? current.write(os) : true;
+      if (status)
+        write_pod(os, s);
+      return status && !os.fail();
+    }
+  };
+
+  template <class Stream, class State, class T>
+  struct GenericReader<Stream, State, T, Int2Type<IOTraits<int>::ISPOD>> {
+    inline static bool readIntoPtr(T *&ptr, Stream &str, State *, const bool processClassId) {
+      CPP11_auto_ptr<T> myptr;
+      if (ptr == 0)
+        myptr = CPP11_auto_ptr<T>(new T());
+      if (processClassId) {
+        static const ClassId current(ClassId::makeId<T>());
+        ClassId id(str, 1);
+        current.ensureSameName(id);
+      }
+      read_pod(str, ptr ? ptr : myptr.get());
+      if (str.fail())
+        return false;
+      if (ptr == 0)
+        ptr = myptr.release();
+      return true;
+    }
 
-        inline static bool process(T& s, Stream& os, State* st,
-                                   const bool processClassId)
-        {
-            T* ps = &s;
-            return readIntoPtr(ps, os, st, processClassId);
-        }
-    };
-
-
-    //===================================================================
-    //
-    // Processing of std::string
-    //
-    //===================================================================
-    template <class Stream, class State>
-    struct GenericWriter<Stream, State, std::string,
-                         Int2Type<IOTraits<int>::ISSTRING> >
-    {
-        inline static bool process(const std::string& s, Stream& os, State*,
-                                   const bool processClassId)
-        {
-            static const ClassId current(ClassId::makeId<std::string>());
-            const bool status = processClassId ? current.write(os) : true;
-            if (status)
-                write_string<char>(os, s);
-            return status && !os.fail();
-        }
-    };
-
-    template <class Stream, class State>
-    struct GenericReader<Stream, State, std::string,
-                         Int2Type<IOTraits<int>::ISSTRING> >
-    {
-        inline static bool readIntoPtr(std::string*& ptr, Stream& is,
-                                       State* , const bool processClassId)
-        {
-            CPP11_auto_ptr<std::string> myptr;
-            if (ptr == 0)
-                myptr = CPP11_auto_ptr<std::string>(new std::string());
-            if (processClassId)
-            {
-                static const ClassId current(ClassId::makeId<std::string>());
-                ClassId id(is, 1);
-                current.ensureSameName(id);
-            }
-            read_string<char>(is, ptr ? ptr : myptr.get());
-            if (is.fail())
-                return false;
-            if (ptr == 0)
-                ptr = myptr.release();
-            return true;
-        }
+    inline static bool process(T &s, Stream &os, State *st, const bool processClassId) {
+      T *ps = &s;
+      return readIntoPtr(ps, os, st, processClassId);
+    }
+  };
+
+  //===================================================================
+  //
+  // Processing of a container header
+  //
+  //===================================================================
+  template <class Stream, class State, class Container>
+  struct GenericWriter<Stream, State, Container, InContainerHeader> {
+    inline static bool process(const Container &, Stream &os, State *, const bool processClassId) {
+      typedef typename Container::value_type T;
+
+      static const ClassId current(ClassId::makeId<Container>());
+      bool status = processClassId ? current.write(os) : true;
+
+      // Maybe we do not have to write out the container class id,
+      // but we do have to write out the item class id -- unless the
+      // container is just an array of pods. Otherwise we might not
+      // be able to read the container items back.
+      if (status && !(IOTraits<T>::IsPOD && IOTraits<Container>::IsContiguous)) {
+        static const ClassId itemId(ClassId::makeId<T>());
+        status = itemId.write(os);
+      }
+      return status;
+    }
+  };
+
+  template <class Stream, class State, class Container>
+  struct GenericReader<Stream, State, Container, InContainerHeader> {
+    inline static bool process(Container &a, Stream &is, State *state, const bool processClassId) {
+      typedef typename Container::value_type T;
+
+      if (processClassId) {
+        static const ClassId current(ClassId::makeId<Container>());
+        ClassId id(is, 1);
+        current.ensureSameName(id);
+      }
+      a.clear();
+      if (!(IOTraits<T>::IsPOD && IOTraits<Container>::IsContiguous)) {
+        ClassId id(is, 1);
+
+        // Remember the class id of the contained items.
+        // We need to do this even if the id is invalid because
+        // the id will be popped back when the "InContainerFooter"
+        // stage is processed.
+        state->push_back(id);
+      }
+      return true;
+    }
+  };
+
+  //===================================================================
+  //
+  // Processing of a container footer
+  //
+  //===================================================================
+  template <class Stream, class State, class Container>
+  struct GenericWriter<Stream, State, Container, InContainerFooter> {
+    inline static bool process(const Container &, Stream &, State *, bool) { return true; }
+  };
+
+  template <class Stream, class State, class Container>
+  struct GenericReader<Stream, State, Container, InContainerFooter> {
+    inline static bool process(Container &, Stream &, State *state, bool) {
+      typedef typename Container::value_type T;
+      if (!(IOTraits<T>::IsPOD && IOTraits<Container>::IsContiguous))
+        state->pop_back();
+      return true;
+    }
+  };
+
+  //===================================================================
+  //
+  // Processing of container size
+  //
+  //===================================================================
+  template <class Stream, class State, class Container>
+  struct GenericWriter<Stream, State, Container, InContainerSize> {
+    inline static bool process(const std::size_t &sz, Stream &os, State *, bool /* processClassId */) {
+      write_pod(os, sz);
+      return !os.fail();
+    }
+  };
 
-        inline static bool process(std::string& s, Stream& is, State* st,
-                                   const bool processClassId)
-        {
-            std::string* ptr = &s;
-            return readIntoPtr(ptr, is, st, processClassId);
-        }
-    };
-
-
-    //===================================================================
-    //
-    // Processing of container readout
-    //
-    //===================================================================
-    template <class Stream, class State, class Container>
-    struct GenericReader<Stream, State, Container, InContainerCycle>
-    {
-    private:
-        typedef typename Container::value_type item_type;
-        typedef IOTraits<item_type> M;
-
-        // Item is a simple pointer
-        inline static bool process2(Container& obj, Stream& is,
-                                    State* st, const std::size_t itemN,
-                                    Int2Type<1>)
-        {
-            item_type ptr = 0;
-            const bool status = GenericReader<Stream, State, item_type,
-                Int2Type<IOTraits<int>::ISNULLPOINTER> >::process(
-                    ptr, is, st, true);
-            if (status)
-            {
-                assert(ptr);
-                InsertContainerItem<Container>::insert(obj, ptr, itemN);
-            }
-            else
-                delete ptr;
-            return status;
-        }
+  template <class Stream, class State, class Container>
+  struct GenericReader<Stream, State, Container, InContainerSize> {
+    inline static bool process(std::size_t &sz, Stream &is, State *, bool /* processClassId */) {
+      read_pod(is, &sz);
+      return !is.fail();
+    }
+  };
+
+  //===================================================================
+  //
+  // Processing of data in contiguous POD containers
+  //
+  //===================================================================
+  template <class Stream, class State, class ArrayLike>
+  struct GenericWriter<Stream, State, ArrayLike, InPODArray> {
+    inline static bool process(const ArrayLike &a, Stream &os, State *, bool) {
+      const std::size_t len = a.size();
+      write_pod(os, len);
+      if (len)
+        write_pod_array(os, &a[0], len);
+      return !os.fail();
+    }
+  };
+
+  template <class Stream, class State, class ArrayLike>
+  struct GenericReader<Stream, State, ArrayLike, InPODArray> {
+    inline static bool process(ArrayLike &a, Stream &s, State *, bool) {
+      std::size_t len = 0;
+      read_pod(s, &len);
+      if (s.fail())
+        return false;
+      a.resize(len);
+      if (!len)
+        return true;
+      read_pod_array(s, &a[0], len);
+      return !s.fail();
+    }
+  };
+
+  //===================================================================
+  //
+  // Processing of "writable" objects
+  //
+  //===================================================================
+  template <class Stream, class State, class T>
+  struct GenericWriter<Stream, State, T, Int2Type<IOTraits<int>::ISWRITABLE>> {
+    inline static bool process(const T &s, Stream &os, State *, const bool processClassId) {
+      return (processClassId ? s.classId().write(os) : true) && s.write(os) && !os.fail();
+    }
+  };
+
+  template <class Stream, class State, class T>
+  struct GenericReader<Stream, State, T, Int2Type<IOTraits<int>::ISWRITABLE>> {
+    inline static bool process(T &s, Stream &is, State *st, const bool processClassId) {
+      typedef IOTraits<T> M;
+      T *ps = &s;
+      return GenericReader<Stream, State, T, Int2Type<M::Signature &(M::ISPLACEREADABLE | M::ISHEAPREADABLE)>>::
+          readIntoPtr(ps, is, st, processClassId);
+    }
+  };
+
+  //===================================================================
+  //
+  // Processing of bare pointers.
+  //
+  // The writer simply dereferences the pointer.
+  //
+  // In the reader, we want to read stuff into the pointee object,
+  // or want to create an item on the heap if the pointer value is 0.
+  //
+  //===================================================================
+  template <class Stream, class State, class Ptr>
+  struct GenericWriter<Stream, State, Ptr, Int2Type<IOTraits<int>::ISPOINTER>> {
+    inline static bool process(const Ptr &ptr, Stream &os, State *s, const bool processClassId) {
+      // Can't have pointers to pointers. This is a design
+      // decision which simplifies things considerably.
+      typedef typename IOPointeeType<Ptr>::type Pointee;
+      typedef IOTraits<Pointee> M;
+      static_assert((M::Signature & (M::ISPOINTER | M::ISSHAREDPTR)) == 0, "can not write pointers to pointers");
+
+      // Can't have NULL pointers either. But this
+      // can be checked at run time only.
+      assert(ptr);
+      return process_const_item<GenericWriter2>(*ptr, os, s, processClassId);
+    }
+  };
+
+  template <class Stream, class State, class Ptr>
+  struct GenericReader<Stream, State, Ptr, Int2Type<IOTraits<int>::ISPOINTER>> {
+    inline static bool process(Ptr &ptr, Stream &str, State *s, const bool processClassId) {
+      // We need to figure out the type of the pointee
+      // and make a swich depending on that type.
+      // Note that the pointee itself can not be a pointer.
+      typedef typename IOPointeeType<Ptr>::type Pointee;
+      typedef IOTraits<Pointee> M;
+      static_assert((M::Signature & (M::ISPOINTER | M::ISSHAREDPTR)) == 0, "can not read pointers to pointers");
+
+      return GenericReader<
+          Stream,
+          State,
+          Pointee,
+          Int2Type<M::Signature &(M::ISPOD | M::ISSTDCONTAINER | M::ISHEAPREADABLE | M::ISPLACEREADABLE | M::ISPAIR |
+                                  M::ISTUPLE | M::ISEXTERNAL | M::ISSTRING)>>::readIntoPtr(ptr, str, s, processClassId);
+    }
+  };
+
+  template <class Stream, class State, class Ptr>
+  struct GenericReader<Stream, State, Ptr, Int2Type<IOTraits<int>::ISNULLPOINTER>> {
+    inline static bool process(Ptr &ptr, Stream &str, State *s, const bool processClassId) {
+      // We need to figure out the type of the pointee
+      // and make a swich depending on that type.
+      // Note that the pointee itself can not be a pointer.
+      typedef typename IOPointeeType<Ptr>::type Pointee;
+      typedef IOTraits<Pointee> M;
+      static_assert((M::Signature & (M::ISNULLPOINTER | M::ISSHAREDPTR)) == 0, "can not read pointers to pointers");
+
+      return GenericReader<
+          Stream,
+          State,
+          Pointee,
+          Int2Type<M::Signature &(M::ISPOD | M::ISSTDCONTAINER | M::ISPUREHEAPREADABLE | M::ISPLACEREADABLE | M::ISPAIR |
+                                  M::ISTUPLE | M::ISEXTERNAL | M::ISSTRING)>>::readIntoPtr(ptr, str, s, processClassId);
+    }
+  };
+
+  //===================================================================
+  //
+  // Processing of shared pointers -- similar logic to pointers.
+  // For the reader, handling of the shared pointer is reduced
+  // to handling of a normal pointer with 0 value.
+  //
+  //===================================================================
+  template <class Stream, class State, class Ptr>
+  struct GenericWriter<Stream, State, Ptr, Int2Type<IOTraits<int>::ISSHAREDPTR>> {
+    inline static bool process(const Ptr &ptr, Stream &os, State *s, const bool processClassId) {
+      typedef typename Ptr::element_type Pointee;
+      typedef IOTraits<Pointee> M;
+      static_assert((M::Signature & (M::ISPOINTER | M::ISSHAREDPTR)) == 0, "can not write pointers to pointers");
+      assert(ptr.get());
+      return process_const_item<GenericWriter2>(*ptr, os, s, processClassId);
+    }
+  };
+
+  template <class Stream, class State, class ShPtr>
+  struct GenericReader<Stream, State, ShPtr, Int2Type<IOTraits<int>::ISSHAREDPTR>> {
+    inline static bool process(ShPtr &a, Stream &str, State *s, const bool processClassId) {
+      typedef typename ShPtr::element_type Pointee;
+      typedef IOTraits<Pointee> M;
+      static_assert((M::Signature & (M::ISPOINTER | M::ISSHAREDPTR)) == 0, "can not read pointers to pointers");
+      Pointee *ptr = 0;
+      const bool status = GenericReader<Stream, State, Pointee *, Int2Type<IOTraits<int>::ISNULLPOINTER>>::process(
+          ptr, str, s, processClassId);
+      if (status) {
+        assert(ptr);
+        a = CPP11_shared_ptr<Pointee>(ptr);
+        return true;
+      } else {
+        delete ptr;
+        return false;
+      }
+    }
+  };
+
+  //===================================================================
+  //
+  // Processing of std::pair
+  //
+  //===================================================================
+  template <class Stream, class State, class T>
+  struct GenericWriter<Stream, State, T, Int2Type<IOTraits<int>::ISPAIR>> {
+    inline static bool process(const T &s, Stream &os, State *st, const bool processClassId) {
+      // Here is a little problem: in this scope "GenericWriter"
+      // means GenericWriter<Stream, State, T,
+      //                     Int2Type<IOTraits<int>::ISPAIR> >
+      // However, we want to use the whole template, unspecialized.
+      // This is why "GenericWriter2" is introduced: a copy of
+      // "GenericWriter" via public inheritance.
+      static const ClassId current(ClassId::makeId<T>());
+      return (processClassId ? current.write(os) : true) &&
+             process_const_item<GenericWriter2>(s.first, os, st, false) &&
+             process_const_item<GenericWriter2>(s.second, os, st, false);
+    }
+  };
+
+  template <class Stream, class State, class T>
+  struct GenericReader<Stream, State, T, Int2Type<IOTraits<int>::ISPAIR>> {
+    inline static bool readIntoPtr(T *&ptr, Stream &str, State *s, const bool processClassId) {
+      CPP11_auto_ptr<T> myptr;
+      if (ptr == 0) {
+        myptr = CPP11_auto_ptr<T>(new T());
+        clearIfPointer(myptr.get()->first);
+        clearIfPointer(myptr.get()->second);
+      }
+      std::vector<std::vector<ClassId>> itemIds;
+      if (processClassId) {
+        static const ClassId current(ClassId::makeId<T>());
+        ClassId pairId(str, 1);
+        current.ensureSameName(pairId);
+        pairId.templateParameters(&itemIds);
+        assert(itemIds.size() == 2U);
+      } else {
+        assert(!s->empty());
+        s->back().templateParameters(&itemIds);
+        if (itemIds.size() != 2U) {
+          std::string err(
+              "In gs::GenericReader::readIntoPtr: "
+              "bad class id for std::pair on the "
+              "class id stack: ");
+          err += s->back().id();
+          throw IOInvalidData(err);
+        }
+      }
+      if (!(process_item<GenericReader2>((ptr ? ptr : myptr.get())->first, str, &itemIds[0], false) &&
+            process_item<GenericReader2>((ptr ? ptr : myptr.get())->second, str, &itemIds[1], false)))
+        return false;
+      if (ptr == 0)
+        ptr = myptr.release();
+      return true;
+    }
 
-        // Item is a shared pointer
-        inline static bool process2(Container& obj, Stream& is,
-                                    State* st, const std::size_t itemN,
-                                    Int2Type<2>)
-        {
-            typedef typename item_type::element_type Pointee;
-            Pointee* ptr = 0;
-            const bool status = GenericReader<Stream, State, Pointee*,
-                Int2Type<IOTraits<int>::ISNULLPOINTER> >::process(
-                    ptr, is, st, true);
-            if (status)
-            {
-                assert(ptr);
-                CPP11_shared_ptr<Pointee> sptr(ptr);
-                InsertContainerItem<Container>::insert(obj, sptr, itemN);
-            }
-            else
-                delete ptr;
-            return status;
-        }
+    inline static bool process(T &s, Stream &os, State *st, const bool processClassId) {
+      T *ps = &s;
+      return readIntoPtr(ps, os, st, processClassId);
+    }
+  };
+
+  //===================================================================
+  //
+  // Processing of std::string
+  //
+  //===================================================================
+  template <class Stream, class State>
+  struct GenericWriter<Stream, State, std::string, Int2Type<IOTraits<int>::ISSTRING>> {
+    inline static bool process(const std::string &s, Stream &os, State *, const bool processClassId) {
+      static const ClassId current(ClassId::makeId<std::string>());
+      const bool status = processClassId ? current.write(os) : true;
+      if (status)
+        write_string<char>(os, s);
+      return status && !os.fail();
+    }
+  };
+
+  template <class Stream, class State>
+  struct GenericReader<Stream, State, std::string, Int2Type<IOTraits<int>::ISSTRING>> {
+    inline static bool readIntoPtr(std::string *&ptr, Stream &is, State *, const bool processClassId) {
+      CPP11_auto_ptr<std::string> myptr;
+      if (ptr == nullptr)
+        myptr = CPP11_auto_ptr<std::string>(new std::string());
+      if (processClassId) {
+        static const ClassId current(ClassId::makeId<std::string>());
+        ClassId id(is, 1);
+        current.ensureSameName(id);
+      }
+      read_string<char>(is, ptr ? ptr : myptr.get());
+      if (is.fail())
+        return false;
+      if (ptr == nullptr)
+        ptr = myptr.release();
+      return true;
+    }
 
-        // Item is heap-readable
-        inline static bool process2(Container& obj, Stream& is,
-                                    State* st, const std::size_t itemN,
-                                    Int2Type<3>)
-        {
-            // No class id -- this is a member of a container
-            assert(!st->empty());
-            item_type* ptr = item_type::read(st->back(), is);
-            if (ptr)
-            {
-                InsertContainerItem<Container>::insert(obj, *ptr, itemN);
-                delete ptr;
-            }
-            return ptr;
-        }
+    inline static bool process(std::string &s, Stream &is, State *st, const bool processClassId) {
+      std::string *ptr = &s;
+      return readIntoPtr(ptr, is, st, processClassId);
+    }
+  };
+
+  //===================================================================
+  //
+  // Processing of container readout
+  //
+  //===================================================================
+  template <class Stream, class State, class Container>
+  struct GenericReader<Stream, State, Container, InContainerCycle> {
+  private:
+    typedef typename Container::value_type item_type;
+    typedef IOTraits<item_type> M;
+
+    // Item is a simple pointer
+    inline static bool process2(Container &obj, Stream &is, State *st, const std::size_t itemN, Int2Type<1>) {
+      item_type ptr = 0;
+      const bool status =
+          GenericReader<Stream, State, item_type, Int2Type<IOTraits<int>::ISNULLPOINTER>>::process(ptr, is, st, true);
+      if (status) {
+        assert(ptr);
+        InsertContainerItem<Container>::insert(obj, ptr, itemN);
+      } else
+        delete ptr;
+      return status;
+    }
 
-        // Item is not a pointer and not heap-readable.
-        // Assume that it has a default constructor.
-        inline static bool process2(Container& obj, Stream& is,
-                                    State* st, const std::size_t itemN,
-                                    Int2Type<4>)
-        {
-            typedef typename StrippedType<item_type>::type NCType;
-            NCType item;
-            NCType* pitem = &item;
-            bool status = GenericReader<Stream, State, NCType*,
-                Int2Type<IOTraits<int>::ISPOINTER> >::process(
-                    pitem, is, st, false);
-            if (status)
-                InsertContainerItem<Container>::insert(obj, item, itemN);
-            return status;
-        }
+    // Item is a shared pointer
+    inline static bool process2(Container &obj, Stream &is, State *st, const std::size_t itemN, Int2Type<2>) {
+      typedef typename item_type::element_type Pointee;
+      Pointee *ptr = 0;
+      const bool status =
+          GenericReader<Stream, State, Pointee *, Int2Type<IOTraits<int>::ISNULLPOINTER>>::process(ptr, is, st, true);
+      if (status) {
+        assert(ptr);
+        CPP11_shared_ptr<Pointee> sptr(ptr);
+        InsertContainerItem<Container>::insert(obj, sptr, itemN);
+      } else
+        delete ptr;
+      return status;
+    }
 
-    public:
-        inline static bool process(Container& obj, Stream& is, State* st,
-                                   const std::size_t itemN)
-        {
-            // By default, we will assume that container starts empty.
-            // Here, we need to produce a new item. There are 3 options:
-            //   1) make it on the stack, insert a copy into the container
-            //   2) make it on the heap, insert a copy, delete original
-            //   3) the container contains pointers to begin with, so
-            //      we make it on the stack and add a pointer to the container
-            return process2(obj, is, st, itemN, Int2Type<
-                            M::IsPointer   * 1 + 
-                            M::IsSharedPtr * 2 +
-                            M::IsHeapReadable * 3 + 
-                            !(M::IsPointer || M::IsSharedPtr ||
-                              M::IsHeapReadable) * 4>());
-        }
-    };
-
-
-    //===================================================================
-    //
-    // Reading things when a pointer is given
-    //
-    //===================================================================
-    template <class Stream, class State, class T>
-    struct GenericReader<Stream, State, T,
-                         Int2Type<IOTraits<int>::ISSTDCONTAINER> >
-    {
-        inline static bool readIntoPtr(T*& ptr, Stream& str, State* s,
-                                       const bool processClassId)
-        {
-            if (ptr)
-                return process_item<GenericReader2>(
-                    *ptr, str, s, processClassId);
-            else
-            {
-                CPP11_auto_ptr<T> myptr(new T());
-                if (!process_item<GenericReader2>(
-                        *myptr, str, s, processClassId))
-                    return false;
-                ptr = myptr.release();
-                return true;
-            }
-        }
-    };
-
-    template <class Stream, class State, class T>
-    struct GenericReader<Stream, State, T,
-                         Int2Type<IOTraits<int>::ISHEAPREADABLE> >
-    {
-        inline static bool readIntoPtr(T*& ptr, Stream& str, State* s,
-                                       const bool processClassId)
-        {
-            T* readback = 0;
-            if (processClassId)
-            {
-                ClassId id(str, 1);
-                readback = T::read(id, str);
-            }
-            else
-            {
-                assert(!s->empty());
-                readback = T::read(s->back(), str);
-            }
-            if (readback)
-            {
-                if (ptr)
-                {
-                    try {
-                        // We will assume here that the "read"
-                        // operation takes precedence over constness
-                        *const_cast<typename StrippedType<T>::type *>(ptr) =
-                            *readback;
-                    } catch (...) {
-                        delete readback;
-                        throw;
-                    }
-                    delete readback;
-                }
-                else
-                    ptr = readback;
-            }
-            return readback;
-        }
-    };
-
-    template <class Stream, class State, class T>
-    struct GenericReader<Stream, State, T,
-                         Int2Type<IOTraits<int>::ISPUREHEAPREADABLE> >
-    {
-        inline static bool readIntoPtr(T*& ptr, Stream& str, State* s,
-                                       const bool processClassId)
-        {
-            T* readback = 0;
-            if (processClassId)
-            {
-                ClassId id(str, 1);
-                readback = T::read(id, str);
-            }
-            else
-            {
-                assert(!s->empty());
-                readback = T::read(s->back(), str);
-            }
-            if (readback)
-            {
-                assert(!ptr);
-                ptr = readback;
-            }
-            return readback;
-        }
-    };
-
-    template <class Stream, class State, class T>
-    struct GenericReader<Stream, State, T,
-                         Int2Type<IOTraits<int>::ISPLACEREADABLE> >
-    {
-        inline static bool readIntoPtr(T*& ptr, Stream& str, State* s,
-                                       const bool processClassId)
-        {
-            CPP11_auto_ptr<T> myptr;
-            if (ptr == 0)
-                myptr = CPP11_auto_ptr<T>(new T());
-            if (processClassId)
-            {
-                ClassId id(str, 1);
-                T::restore(id, str, ptr ? ptr : myptr.get());
-            }
-            else
-            {
-                assert(!s->empty());
-                T::restore(s->back(), str, ptr ? ptr : myptr.get());
-            }
-            if (ptr == 0)
-                ptr = myptr.release();
-            return ptr;
-        }
-    };
-}
+    // Item is heap-readable
+    inline static bool process2(Container &obj, Stream &is, State *st, const std::size_t itemN, Int2Type<3>) {
+      // No class id -- this is a member of a container
+      assert(!st->empty());
+      item_type *ptr = item_type::read(st->back(), is);
+      if (ptr) {
+        InsertContainerItem<Container>::insert(obj, *ptr, itemN);
+        delete ptr;
+      }
+      return ptr;
+    }
 
+    // Item is not a pointer and not heap-readable.
+    // Assume that it has a default constructor.
+    inline static bool process2(Container &obj, Stream &is, State *st, const std::size_t itemN, Int2Type<4>) {
+      typedef typename StrippedType<item_type>::type NCType;
+      NCType item;
+      NCType *pitem = &item;
+      bool status =
+          GenericReader<Stream, State, NCType *, Int2Type<IOTraits<int>::ISPOINTER>>::process(pitem, is, st, false);
+      if (status)
+        InsertContainerItem<Container>::insert(obj, item, itemN);
+      return status;
+    }
 
-#endif // GENERS_GENERICIO_HH_
+  public:
+    inline static bool process(Container &obj, Stream &is, State *st, const std::size_t itemN) {
+      // By default, we will assume that container starts empty.
+      // Here, we need to produce a new item. There are 3 options:
+      //   1) make it on the stack, insert a copy into the container
+      //   2) make it on the heap, insert a copy, delete original
+      //   3) the container contains pointers to begin with, so
+      //      we make it on the stack and add a pointer to the container
+      return process2(obj,
+                      is,
+                      st,
+                      itemN,
+                      Int2Type<M::IsPointer * 1 + M::IsSharedPtr * 2 + M::IsHeapReadable * 3 +
+                               !(M::IsPointer || M::IsSharedPtr || M::IsHeapReadable) * 4>());
+    }
+  };
+
+  //===================================================================
+  //
+  // Reading things when a pointer is given
+  //
+  //===================================================================
+  template <class Stream, class State, class T>
+  struct GenericReader<Stream, State, T, Int2Type<IOTraits<int>::ISSTDCONTAINER>> {
+    inline static bool readIntoPtr(T *&ptr, Stream &str, State *s, const bool processClassId) {
+      if (ptr)
+        return process_item<GenericReader2>(*ptr, str, s, processClassId);
+      else {
+        CPP11_auto_ptr<T> myptr(new T());
+        if (!process_item<GenericReader2>(*myptr, str, s, processClassId))
+          return false;
+        ptr = myptr.release();
+        return true;
+      }
+    }
+  };
+
+  template <class Stream, class State, class T>
+  struct GenericReader<Stream, State, T, Int2Type<IOTraits<int>::ISHEAPREADABLE>> {
+    inline static bool readIntoPtr(T *&ptr, Stream &str, State *s, const bool processClassId) {
+      T *readback = 0;
+      if (processClassId) {
+        ClassId id(str, 1);
+        readback = T::read(id, str);
+      } else {
+        assert(!s->empty());
+        readback = T::read(s->back(), str);
+      }
+      if (readback) {
+        if (ptr) {
+          try {
+            // We will assume here that the "read"
+            // operation takes precedence over constness
+            *const_cast<typename StrippedType<T>::type *>(ptr) = *readback;
+          } catch (...) {
+            delete readback;
+            throw;
+          }
+          delete readback;
+        } else
+          ptr = readback;
+      }
+      return readback;
+    }
+  };
+
+  template <class Stream, class State, class T>
+  struct GenericReader<Stream, State, T, Int2Type<IOTraits<int>::ISPUREHEAPREADABLE>> {
+    inline static bool readIntoPtr(T *&ptr, Stream &str, State *s, const bool processClassId) {
+      T *readback = nullptr;
+      if (processClassId) {
+        ClassId id(str, 1);
+        readback = T::read(id, str);
+      } else {
+        assert(!s->empty());
+        readback = T::read(s->back(), str);
+      }
+      if (readback) {
+        assert(!ptr);
+        ptr = readback;
+      }
+      return readback;
+    }
+  };
+
+  template <class Stream, class State, class T>
+  struct GenericReader<Stream, State, T, Int2Type<IOTraits<int>::ISPLACEREADABLE>> {
+    inline static bool readIntoPtr(T *&ptr, Stream &str, State *s, const bool processClassId) {
+      CPP11_auto_ptr<T> myptr;
+      if (ptr == 0)
+        myptr = CPP11_auto_ptr<T>(new T());
+      if (processClassId) {
+        ClassId id(str, 1);
+        T::restore(id, str, ptr ? ptr : myptr.get());
+      } else {
+        assert(!s->empty());
+        T::restore(s->back(), str, ptr ? ptr : myptr.get());
+      }
+      if (ptr == 0)
+        ptr = myptr.release();
+      return ptr;
+    }
+  };
+}  // namespace gs
 
+#endif  // GENERS_GENERICIO_HH_
diff --git a/Alignment/Geners/interface/IOException.hh b/Alignment/Geners/interface/IOException.hh
index d4e63df61eba0..a52c211073c26 100644
--- a/Alignment/Geners/interface/IOException.hh
+++ b/Alignment/Geners/interface/IOException.hh
@@ -6,128 +6,106 @@
 #include "FWCore/Utilities/interface/Exception.h"
 
 namespace gs {
-    /** Base class for the exceptions specific to the Geners I/O library */
-    struct IOException : public cms::Exception
-    {
-        inline IOException() : cms::Exception("gs::IOException") {}
-
-        inline explicit IOException(const std::string& description)
-            : cms::Exception(description) {}
-
-        inline explicit IOException(const char* description)
-            : cms::Exception(description) {}
-
-        virtual ~IOException() throw() {}
-    };
-
-    struct IOLengthError : public IOException
-    {
-        inline IOLengthError() : IOException("gs::IOLengthError") {}
-
-        inline explicit IOLengthError(const std::string& description)
-            : IOException(description) {}
-
-        virtual ~IOLengthError() throw() {}
-    };
-
-    struct IOOutOfRange : public IOException
-    {
-        inline IOOutOfRange() : IOException("gs::IOOutOfRange") {}
-
-        inline explicit IOOutOfRange(const std::string& description)
-            : IOException(description) {}
-
-        virtual ~IOOutOfRange() throw() {}
-    };
-
-    struct IOInvalidArgument : public IOException
-    {
-        inline IOInvalidArgument() : IOException("gs::IOInvalidArgument") {}
-
-        inline explicit IOInvalidArgument(const std::string& description)
-            : IOException(description) {}
-
-        virtual ~IOInvalidArgument() throw() {}
-    };
-
-    /* Automatic replacement end} */
-
-    /**
-    // Throw this exception to indicate failure of various stream
-    // opening methods if it is difficult or impossible to clean up
-    // after the failure in the normal flow of control
-    */
-    class IOOpeningFailure : public IOException
-    {
-        inline static std::string fileOpeningFailure(
-            const std::string& whereInTheCode,
-            const std::string& filename)
-        {
-            std::string msg("In ");
-            msg += whereInTheCode;
-            msg += ": failed to open file \"";
-            msg += filename;
-            msg += "\"";
-            return msg;
-        }
-
-    public:
-        inline IOOpeningFailure() : IOException("gs::IOOpeningFailure") {}
-
-        inline explicit IOOpeningFailure(const std::string& description)
-            : IOException(description) {}
-
-        inline IOOpeningFailure(const std::string& whereInTheCode,
-                                const std::string& filename)
-            : IOException(fileOpeningFailure(whereInTheCode, filename)) {}
-
-        virtual ~IOOpeningFailure() throw() {}
-    };
-
-    /**
-    // Throw this exception to indicate failure in the writing process.
-    // For example, fail() method of the output stream returns "true",
-    // and the function is unable to handle this situation locally.
-    */
-    struct IOWriteFailure : public IOException
-    {
-        inline IOWriteFailure() : IOException("gs::IOWriteFailure") {}
-
-        inline explicit IOWriteFailure(const std::string& description)
-            : IOException(description) {}
-
-        virtual ~IOWriteFailure() throw() {}
-    };
-
-    /**
-    // Throw this exception to indicate failure in the reading process.
-    // For example, fail() method of the input stream returns "true",
-    // and the function is unable to handle this situation locally.
-    */
-    struct IOReadFailure : public IOException
-    {
-        inline IOReadFailure() : IOException("gs::IOReadFailure") {}
-
-        inline explicit IOReadFailure(const std::string& description)
-            : IOException(description) {}
-
-        virtual ~IOReadFailure() throw() {}
-    };
-
-    /**
-    // Throw this exception when improperly formatted or invalid data
-    // is detected
-    */
-    struct IOInvalidData : public IOException
-    {
-        inline IOInvalidData() : IOException("gs::IOInvalidData") {}
-
-        inline explicit IOInvalidData(const std::string& description)
-            : IOException(description) {}
-
-        virtual ~IOInvalidData() throw() {}
-    };
-}
-
-#endif // GENERS_IOEXCEPTION_HH_
+  /** Base class for the exceptions specific to the Geners I/O library */
+  struct IOException : public cms::Exception {
+    inline IOException() : cms::Exception("gs::IOException") {}
 
+    inline explicit IOException(const std::string &description) : cms::Exception(description) {}
+
+    inline explicit IOException(const char *description) : cms::Exception(description) {}
+
+    ~IOException() throw() override {}
+  };
+
+  struct IOLengthError : public IOException {
+    inline IOLengthError() : IOException("gs::IOLengthError") {}
+
+    inline explicit IOLengthError(const std::string &description) : IOException(description) {}
+
+    ~IOLengthError() throw() override {}
+  };
+
+  struct IOOutOfRange : public IOException {
+    inline IOOutOfRange() : IOException("gs::IOOutOfRange") {}
+
+    inline explicit IOOutOfRange(const std::string &description) : IOException(description) {}
+
+    ~IOOutOfRange() throw() override {}
+  };
+
+  struct IOInvalidArgument : public IOException {
+    inline IOInvalidArgument() : IOException("gs::IOInvalidArgument") {}
+
+    inline explicit IOInvalidArgument(const std::string &description) : IOException(description) {}
+
+    ~IOInvalidArgument() throw() override {}
+  };
+
+  /* Automatic replacement end} */
+
+  /**
+// Throw this exception to indicate failure of various stream
+// opening methods if it is difficult or impossible to clean up
+// after the failure in the normal flow of control
+*/
+  class IOOpeningFailure : public IOException {
+    inline static std::string fileOpeningFailure(const std::string &whereInTheCode, const std::string &filename) {
+      std::string msg("In ");
+      msg += whereInTheCode;
+      msg += ": failed to open file \"";
+      msg += filename;
+      msg += "\"";
+      return msg;
+    }
+
+  public:
+    inline IOOpeningFailure() : IOException("gs::IOOpeningFailure") {}
+
+    inline explicit IOOpeningFailure(const std::string &description) : IOException(description) {}
+
+    inline IOOpeningFailure(const std::string &whereInTheCode, const std::string &filename)
+        : IOException(fileOpeningFailure(whereInTheCode, filename)) {}
+
+    ~IOOpeningFailure() throw() override {}
+  };
+
+  /**
+// Throw this exception to indicate failure in the writing process.
+// For example, fail() method of the output stream returns "true",
+// and the function is unable to handle this situation locally.
+*/
+  struct IOWriteFailure : public IOException {
+    inline IOWriteFailure() : IOException("gs::IOWriteFailure") {}
+
+    inline explicit IOWriteFailure(const std::string &description) : IOException(description) {}
+
+    ~IOWriteFailure() throw() override {}
+  };
+
+  /**
+// Throw this exception to indicate failure in the reading process.
+// For example, fail() method of the input stream returns "true",
+// and the function is unable to handle this situation locally.
+*/
+  struct IOReadFailure : public IOException {
+    inline IOReadFailure() : IOException("gs::IOReadFailure") {}
+
+    inline explicit IOReadFailure(const std::string &description) : IOException(description) {}
+
+    ~IOReadFailure() throw() override {}
+  };
+
+  /**
+// Throw this exception when improperly formatted or invalid data
+// is detected
+*/
+  struct IOInvalidData : public IOException {
+    inline IOInvalidData() : IOException("gs::IOInvalidData") {}
+
+    inline explicit IOInvalidData(const std::string &description) : IOException(description) {}
+
+    ~IOInvalidData() throw() override {}
+  };
+}  // namespace gs
+
+#endif  // GENERS_IOEXCEPTION_HH_
diff --git a/Alignment/Geners/interface/IOIsAnyPtr.hh b/Alignment/Geners/interface/IOIsAnyPtr.hh
index 8e7b5558a1cf6..f23c0c4aa36a1 100644
--- a/Alignment/Geners/interface/IOIsAnyPtr.hh
+++ b/Alignment/Geners/interface/IOIsAnyPtr.hh
@@ -2,20 +2,16 @@
 #define GENERS_IOISANYPTR_HH_
 
 #include "Alignment/Geners/interface/CPP11_type_traits.hh"
-#include "Alignment/Geners/interface/IOIsSharedPtr.hh"
 #include "Alignment/Geners/interface/IOIsIOPtr.hh"
+#include "Alignment/Geners/interface/IOIsSharedPtr.hh"
 
 namespace gs {
-    // Here we are taking into account only the types of pointers
-    // known to the I/O system
-    template <class T>
-    struct IOIsAnyPtr
-    {
-        static const bool value = (CPP11_is_pointer<T>::value ||
-                                   IOIsSharedPtr<T>::value ||
-                                   IOIsIOPtr<T>::value);
-    };
-}
-
-#endif // GENERS_IOISANYPTR_HH_
+  // Here we are taking into account only the types of pointers
+  // known to the I/O system
+  template <class T>
+  struct IOIsAnyPtr {
+    static const bool value = (CPP11_is_pointer<T>::value || IOIsSharedPtr<T>::value || IOIsIOPtr<T>::value);
+  };
+}  // namespace gs
 
+#endif  // GENERS_IOISANYPTR_HH_
diff --git a/Alignment/Geners/interface/IOIsClassType.hh b/Alignment/Geners/interface/IOIsClassType.hh
index 2adbb0ca5b9d9..a9d1968110c80 100644
--- a/Alignment/Geners/interface/IOIsClassType.hh
+++ b/Alignment/Geners/interface/IOIsClassType.hh
@@ -2,18 +2,20 @@
 #define GENERS_IOISCLASSTYPE_HH_
 
 namespace gs {
-    template <typename T>
-    class IOIsClassType
-    {
-        typedef char One;
-        typedef struct {char a[2];} Two;
-        template<typename C> static One test(int C::*);
-        template<typename C> static Two test(...);
+  template <typename T>
+  class IOIsClassType {
+    typedef char One;
+    typedef struct {
+      char a[2];
+    } Two;
+    template <typename C>
+    static One test(int C::*);
+    template <typename C>
+    static Two test(...);
 
-    public:
-        enum {value = sizeof(IOIsClassType<T>::template test<T>(0)) == 1};
-    };
-}
-
-#endif // GENERS_IOISCLASSTYPE_HH_
+  public:
+    enum { value = sizeof(IOIsClassType<T>::template test<T>(nullptr)) == 1 };
+  };
+}  // namespace gs
 
+#endif  // GENERS_IOISCLASSTYPE_HH_
diff --git a/Alignment/Geners/interface/IOIsContainer.hh b/Alignment/Geners/interface/IOIsContainer.hh
index 9b6ffbf27ce5d..2986195dae50c 100644
--- a/Alignment/Geners/interface/IOIsContainer.hh
+++ b/Alignment/Geners/interface/IOIsContainer.hh
@@ -4,50 +4,48 @@
 #include <string>
 
 namespace gs {
-    // In the following template, enum "IsContainer" is evaluated to 1
-    // at compile time if T has T::value_type typedef
-    template <typename T>
-    class IOIsContainer
-    {
-    private:
-        typedef char One;
-        typedef struct {char a[2];} Two;
-        template<typename C> static One test(typename C::value_type const*);
-        template<typename C> static Two test(...);
-
-    public:
-        enum {value = sizeof(IOIsContainer<T>::template test<T>(0)) == 1};
-    };
-
-    // Char strings get a special treatment
-    template <>
-    class IOIsContainer<std::string>
-    {
-    public:
-        enum {value = 0};
-    };
-
-    template <>
-    class IOIsContainer<const std::string>
-    {
-    public:
-        enum {value = 0};
-    };
-
-    template <>
-    class IOIsContainer<volatile std::string>
-    {
-    public:
-        enum {value = 0};
-    };
-
-    template <>
-    class IOIsContainer<const volatile std::string>
-    {
-    public:
-        enum {value = 0};
-    };
-}
-
-#endif // GENERS_IOISCONTAINER_HH_
-
+  // In the following template, enum "IsContainer" is evaluated to 1
+  // at compile time if T has T::value_type typedef
+  template <typename T>
+  class IOIsContainer {
+  private:
+    typedef char One;
+    typedef struct {
+      char a[2];
+    } Two;
+    template <typename C>
+    static One test(typename C::value_type const *);
+    template <typename C>
+    static Two test(...);
+
+  public:
+    enum { value = sizeof(IOIsContainer<T>::template test<T>(0)) == 1 };
+  };
+
+  // Char strings get a special treatment
+  template <>
+  class IOIsContainer<std::string> {
+  public:
+    enum { value = 0 };
+  };
+
+  template <>
+  class IOIsContainer<const std::string> {
+  public:
+    enum { value = 0 };
+  };
+
+  template <>
+  class IOIsContainer<volatile std::string> {
+  public:
+    enum { value = 0 };
+  };
+
+  template <>
+  class IOIsContainer<const volatile std::string> {
+  public:
+    enum { value = 0 };
+  };
+}  // namespace gs
+
+#endif  // GENERS_IOISCONTAINER_HH_
diff --git a/Alignment/Geners/interface/IOIsContiguous.hh b/Alignment/Geners/interface/IOIsContiguous.hh
index 70eef34c0cf72..779ad3ad6df40 100644
--- a/Alignment/Geners/interface/IOIsContiguous.hh
+++ b/Alignment/Geners/interface/IOIsContiguous.hh
@@ -5,67 +5,77 @@
 #include <vector>
 
 namespace gs {
-    template <class T>
-    struct IOIsContiguous
-    {
-        enum {value = 0};
-    };
-
-    // String is treated as a pod vector. This will be guaranteed
-    // to work correctly in the C++11 standard. The current standard
-    // does not specify that the characters must be stored contuguously
-    // inside the string -- however, this is always true in practice.
-    template <class T, class Traits, class Alloc>
-    struct IOIsContiguous<std::basic_string<T,Traits,Alloc> >
-    {enum {value = 1};};
-
-    template <class T, class Traits, class Alloc>
-    struct IOIsContiguous<const std::basic_string<T,Traits,Alloc> >
-    {enum {value = 1};};
-
-    template <class T, class Traits, class Alloc>
-    struct IOIsContiguous<volatile std::basic_string<T,Traits,Alloc> >
-    {enum {value = 1};};
-
-    template <class T, class Traits, class Alloc>
-    struct IOIsContiguous<const volatile std::basic_string<T,Traits,Alloc> >
-    {enum {value = 1};};
-
-    // std::vector is used by the package everywhere. No point in not
-    // having it here.
-    template <class T, class Alloc>
-    struct IOIsContiguous<std::vector<T,Alloc> >
-    {enum {value = 1};};
-
-    template <class T, class Alloc>
-    struct IOIsContiguous<const std::vector<T,Alloc> >
-    {enum {value = 1};};
-
-    template <class T, class Alloc>
-    struct IOIsContiguous<volatile std::vector<T,Alloc> >
-    {enum {value = 1};};
-
-    template <class T, class Alloc>
-    struct IOIsContiguous<const volatile std::vector<T,Alloc> >
-    {enum {value = 1};};
-
-    // Hovever, std::vector<bool> should be excluded
-    template <>
-    struct IOIsContiguous<std::vector<bool> >
-    {enum {value = 0};};
-
-    template <>
-    struct IOIsContiguous<const std::vector<bool> >
-    {enum {value = 0};};
-
-    template <>
-    struct IOIsContiguous<volatile std::vector<bool> >
-    {enum {value = 0};};
-
-    template <>
-    struct IOIsContiguous<const volatile std::vector<bool> >
-    {enum {value = 0};};
-}
-
-#endif // GENERS_IOISCONTIGUOUS_HH_
-
+  template <class T>
+  struct IOIsContiguous {
+    enum { value = 0 };
+  };
+
+  // String is treated as a pod vector. This will be guaranteed
+  // to work correctly in the C++11 standard. The current standard
+  // does not specify that the characters must be stored contuguously
+  // inside the string -- however, this is always true in practice.
+  template <class T, class Traits, class Alloc>
+  struct IOIsContiguous<std::basic_string<T, Traits, Alloc>> {
+    enum { value = 1 };
+  };
+
+  template <class T, class Traits, class Alloc>
+  struct IOIsContiguous<const std::basic_string<T, Traits, Alloc>> {
+    enum { value = 1 };
+  };
+
+  template <class T, class Traits, class Alloc>
+  struct IOIsContiguous<volatile std::basic_string<T, Traits, Alloc>> {
+    enum { value = 1 };
+  };
+
+  template <class T, class Traits, class Alloc>
+  struct IOIsContiguous<const volatile std::basic_string<T, Traits, Alloc>> {
+    enum { value = 1 };
+  };
+
+  // std::vector is used by the package everywhere. No point in not
+  // having it here.
+  template <class T, class Alloc>
+  struct IOIsContiguous<std::vector<T, Alloc>> {
+    enum { value = 1 };
+  };
+
+  template <class T, class Alloc>
+  struct IOIsContiguous<const std::vector<T, Alloc>> {
+    enum { value = 1 };
+  };
+
+  template <class T, class Alloc>
+  struct IOIsContiguous<volatile std::vector<T, Alloc>> {
+    enum { value = 1 };
+  };
+
+  template <class T, class Alloc>
+  struct IOIsContiguous<const volatile std::vector<T, Alloc>> {
+    enum { value = 1 };
+  };
+
+  // Hovever, std::vector<bool> should be excluded
+  template <>
+  struct IOIsContiguous<std::vector<bool>> {
+    enum { value = 0 };
+  };
+
+  template <>
+  struct IOIsContiguous<const std::vector<bool>> {
+    enum { value = 0 };
+  };
+
+  template <>
+  struct IOIsContiguous<volatile std::vector<bool>> {
+    enum { value = 0 };
+  };
+
+  template <>
+  struct IOIsContiguous<const volatile std::vector<bool>> {
+    enum { value = 0 };
+  };
+}  // namespace gs
+
+#endif  // GENERS_IOISCONTIGUOUS_HH_
diff --git a/Alignment/Geners/interface/IOIsExternal.hh b/Alignment/Geners/interface/IOIsExternal.hh
index 94e18520ca087..c46a0c43b3d55 100644
--- a/Alignment/Geners/interface/IOIsExternal.hh
+++ b/Alignment/Geners/interface/IOIsExternal.hh
@@ -2,55 +2,81 @@
 #define GENERS_IOISEXTERNAL_HH_
 
 namespace gs {
-    template <class T>
-    struct IOIsExternal
-    {
-        enum {value = 0};
-    };
-}
+  template <class T>
+  struct IOIsExternal {
+    enum { value = 0 };
+  };
+}  // namespace gs
 
 // Use the following macro (outside of any namespace)
 // to declare some type as external for I/O purposes
 //
-#define gs_declare_type_external(T) /**/                                   \
-namespace gs {                                                             \
-    template <> struct IOIsExternal<T> {enum {value = 1};};                \
-    template <> struct IOIsExternal<T const> {enum {value = 1};};          \
-    template <> struct IOIsExternal<T volatile> {enum {value = 1};};       \
-    template <> struct IOIsExternal<T const volatile> {enum {value = 1};}; \
-}
+#define gs_declare_type_external(T) /**/    \
+  namespace gs {                            \
+    template <>                             \
+    struct IOIsExternal<T> {                \
+      enum { value = 1 };                   \
+    };                                      \
+    template <>                             \
+    struct IOIsExternal<T const> {          \
+      enum { value = 1 };                   \
+    };                                      \
+    template <>                             \
+    struct IOIsExternal<T volatile> {       \
+      enum { value = 1 };                   \
+    };                                      \
+    template <>                             \
+    struct IOIsExternal<T const volatile> { \
+      enum { value = 1 };                   \
+    };                                      \
+  }
 
 // Use the following macro (outside of any namespace)
 // to declare some template parameterized by one argument
 // as external for I/O purposes
 //
-#define gs_declare_template_external_T(name) /**/                          \
-namespace gs {                                                             \
-    template <class T> struct IOIsExternal< name <T> >                     \
-       {enum {value = 1};};                                                \
-    template <class T> struct IOIsExternal<const name <T> >                \
-       {enum {value = 1};};                                                \
-    template <class T> struct IOIsExternal<volatile name <T> >             \
-       {enum {value = 1};};                                                \
-    template <class T> struct IOIsExternal<const volatile name <T> >       \
-       {enum {value = 1};};                                                \
-}
+#define gs_declare_template_external_T(name) /**/ \
+  namespace gs {                                  \
+    template <class T>                            \
+    struct IOIsExternal<name<T>> {                \
+      enum { value = 1 };                         \
+    };                                            \
+    template <class T>                            \
+    struct IOIsExternal<const name<T>> {          \
+      enum { value = 1 };                         \
+    };                                            \
+    template <class T>                            \
+    struct IOIsExternal<volatile name<T>> {       \
+      enum { value = 1 };                         \
+    };                                            \
+    template <class T>                            \
+    struct IOIsExternal<const volatile name<T>> { \
+      enum { value = 1 };                         \
+    };                                            \
+  }
 
 // Use the following macro (outside of any namespace)
 // to declare some template parameterized by two arguments
 // as external for I/O purposes
 //
-#define gs_declare_template_external_TT(name) /**/                         \
-namespace gs {                                                             \
-    template <class T,class U> struct IOIsExternal< name <T,U> >           \
-       {enum {value = 1};};                                                \
-    template <class T,class U> struct IOIsExternal<const name <T,U> >      \
-       {enum {value = 1};};                                                \
-    template <class T,class U> struct IOIsExternal<volatile name <T,U> >   \
-       {enum {value = 1};};                                                \
-    template <class T,class U> struct IOIsExternal<const volatile name <T,U> >\
-       {enum {value = 1};};                                                \
-}
-
-#endif // GENERS_IOISEXTERNAL_HH_
+#define gs_declare_template_external_TT(name) /**/   \
+  namespace gs {                                     \
+    template <class T, class U>                      \
+    struct IOIsExternal<name<T, U>> {                \
+      enum { value = 1 };                            \
+    };                                               \
+    template <class T, class U>                      \
+    struct IOIsExternal<const name<T, U>> {          \
+      enum { value = 1 };                            \
+    };                                               \
+    template <class T, class U>                      \
+    struct IOIsExternal<volatile name<T, U>> {       \
+      enum { value = 1 };                            \
+    };                                               \
+    template <class T, class U>                      \
+    struct IOIsExternal<const volatile name<T, U>> { \
+      enum { value = 1 };                            \
+    };                                               \
+  }
 
+#endif  // GENERS_IOISEXTERNAL_HH_
diff --git a/Alignment/Geners/interface/IOIsIOPtr.hh b/Alignment/Geners/interface/IOIsIOPtr.hh
index b8a556ee4f410..7da2fd68b0edf 100644
--- a/Alignment/Geners/interface/IOIsIOPtr.hh
+++ b/Alignment/Geners/interface/IOIsIOPtr.hh
@@ -4,60 +4,50 @@
 #include "Alignment/Geners/interface/IOPtr.hh"
 
 namespace gs {
-    template <class T>
-    struct IOIsIOPtr
-    {
-        enum {value = 0};
-    };
-
-    template <class T>
-    struct IOIsIOPtr<IOPtr<T> >
-    {
-        enum {value = 1};
-    };
-
-    template <class T>
-    struct IOIsIOPtr<const IOPtr<T> >
-    {
-        enum {value = 1};
-    };
-
-    template <class T>
-    struct IOIsIOPtr<volatile IOPtr<T> >
-    {
-        enum {value = 1};
-    };
-
-    template <class T>
-    struct IOIsIOPtr<const volatile IOPtr<T> >
-    {
-        enum {value = 1};
-    };
-
-    template <class T>
-    struct IOIsIOPtr<IOProxy<T> >
-    {
-        enum {value = 1};
-    };
-
-    template <class T>
-    struct IOIsIOPtr<const IOProxy<T> >
-    {
-        enum {value = 1};
-    };
-
-    template <class T>
-    struct IOIsIOPtr<volatile IOProxy<T> >
-    {
-        enum {value = 1};
-    };
-
-    template <class T>
-    struct IOIsIOPtr<const volatile IOProxy<T> >
-    {
-        enum {value = 1};
-    };
-}
-
-#endif // GENERS_IOISIOPTR_HH_
-
+  template <class T>
+  struct IOIsIOPtr {
+    enum { value = 0 };
+  };
+
+  template <class T>
+  struct IOIsIOPtr<IOPtr<T>> {
+    enum { value = 1 };
+  };
+
+  template <class T>
+  struct IOIsIOPtr<const IOPtr<T>> {
+    enum { value = 1 };
+  };
+
+  template <class T>
+  struct IOIsIOPtr<volatile IOPtr<T>> {
+    enum { value = 1 };
+  };
+
+  template <class T>
+  struct IOIsIOPtr<const volatile IOPtr<T>> {
+    enum { value = 1 };
+  };
+
+  template <class T>
+  struct IOIsIOPtr<IOProxy<T>> {
+    enum { value = 1 };
+  };
+
+  template <class T>
+  struct IOIsIOPtr<const IOProxy<T>> {
+    enum { value = 1 };
+  };
+
+  template <class T>
+  struct IOIsIOPtr<volatile IOProxy<T>> {
+    enum { value = 1 };
+  };
+
+  template <class T>
+  struct IOIsIOPtr<const volatile IOProxy<T>> {
+    enum { value = 1 };
+  };
+}  // namespace gs
+
+#endif  // GENERS_IOISIOPTR_HH_
diff --git a/Alignment/Geners/interface/IOIsNumber.hh b/Alignment/Geners/interface/IOIsNumber.hh
index 3b61073181714..7b8732665da77 100644
--- a/Alignment/Geners/interface/IOIsNumber.hh
+++ b/Alignment/Geners/interface/IOIsNumber.hh
@@ -2,35 +2,37 @@
 #define GENERS_IOISNUMBER_HH_
 
 namespace gs {
-    template <class T>
-    struct IOIsNumber
-    {
-        enum {value = 0};
-    };
-}
+  template <class T>
+  struct IOIsNumber {
+    enum { value = 0 };
+  };
+}  // namespace gs
 
-#define gs_declare_type_as_number(T) /**/                                \
-namespace gs {                                                           \
-    template <> struct IOIsNumber<T> {enum {value = 1};};                \
-    template <> struct IOIsNumber<T const> {enum {value = 1};};          \
-    template <> struct IOIsNumber<T volatile> {enum {value = 1};};       \
-    template <> struct IOIsNumber<T const volatile> {enum {value = 1};}; \
-}
+#define gs_declare_type_as_number(T) /**/ \
+  namespace gs {                          \
+    template <>                           \
+    struct IOIsNumber<T> {                \
+      enum { value = 1 };                 \
+    };                                    \
+    template <>                           \
+    struct IOIsNumber<T const> {          \
+      enum { value = 1 };                 \
+    };                                    \
+    template <>                           \
+    struct IOIsNumber<T volatile> {       \
+      enum { value = 1 };                 \
+    };                                    \
+    template <>                           \
+    struct IOIsNumber<T const volatile> { \
+      enum { value = 1 };                 \
+    };                                    \
+  }
 
-gs_declare_type_as_number(float)
-gs_declare_type_as_number(double)
-gs_declare_type_as_number(long double)
-gs_declare_type_as_number(int)
-gs_declare_type_as_number(unsigned)
-gs_declare_type_as_number(long)
-gs_declare_type_as_number(long long)
-gs_declare_type_as_number(unsigned long)
-gs_declare_type_as_number(unsigned long long)
-gs_declare_type_as_number(short)
-gs_declare_type_as_number(unsigned short)
-gs_declare_type_as_number(char)
-gs_declare_type_as_number(unsigned char)
-gs_declare_type_as_number(signed char)
-
-#endif // GENERS_IOISNUMBER_HH_
+gs_declare_type_as_number(float) gs_declare_type_as_number(double) gs_declare_type_as_number(long double)
+    gs_declare_type_as_number(int) gs_declare_type_as_number(unsigned) gs_declare_type_as_number(long)
+        gs_declare_type_as_number(long long) gs_declare_type_as_number(unsigned long)
+            gs_declare_type_as_number(unsigned long long) gs_declare_type_as_number(short)
+                gs_declare_type_as_number(unsigned short) gs_declare_type_as_number(char)
+                    gs_declare_type_as_number(unsigned char) gs_declare_type_as_number(signed char)
 
+#endif  // GENERS_IOISNUMBER_HH_
diff --git a/Alignment/Geners/interface/IOIsPOD.hh b/Alignment/Geners/interface/IOIsPOD.hh
index ab7dc5774de4e..84d9ebf624267 100644
--- a/Alignment/Geners/interface/IOIsPOD.hh
+++ b/Alignment/Geners/interface/IOIsPOD.hh
@@ -4,25 +4,35 @@
 #include "Alignment/Geners/interface/CPP11_type_traits.hh"
 
 namespace gs {
-    // In the following template, enum "IsPOD" is evaluated to 1
-    // at compile time if T belongs to one of the known POD types.
-    template <typename T>
-    struct IOIsPOD
-    {
-        enum {value = CPP11_is_pod<T>::value};
-    };
-}
+  // In the following template, enum "IsPOD" is evaluated to 1
+  // at compile time if T belongs to one of the known POD types.
+  template <typename T>
+  struct IOIsPOD {
+    enum { value = CPP11_is_pod<T>::value };
+  };
+}  // namespace gs
 
 // Use the following macro (outside of any namespace)
 // to declare some struct as POD for I/O purposes
 //
-#define gs_declare_type_as_pod(T) /**/                                \
-namespace gs {                                                        \
-    template <> struct IOIsPOD<T> {enum {value = 1};};                \
-    template <> struct IOIsPOD<T const> {enum {value = 1};};          \
-    template <> struct IOIsPOD<T volatile> {enum {value = 1};};       \
-    template <> struct IOIsPOD<T const volatile> {enum {value = 1};}; \
-}
-
-#endif // GENERS_IOISPOD_HH_
+#define gs_declare_type_as_pod(T) /**/ \
+  namespace gs {                       \
+    template <>                        \
+    struct IOIsPOD<T> {                \
+      enum { value = 1 };              \
+    };                                 \
+    template <>                        \
+    struct IOIsPOD<T const> {          \
+      enum { value = 1 };              \
+    };                                 \
+    template <>                        \
+    struct IOIsPOD<T volatile> {       \
+      enum { value = 1 };              \
+    };                                 \
+    template <>                        \
+    struct IOIsPOD<T const volatile> { \
+      enum { value = 1 };              \
+    };                                 \
+  }
 
+#endif  // GENERS_IOISPOD_HH_
diff --git a/Alignment/Geners/interface/IOIsPair.hh b/Alignment/Geners/interface/IOIsPair.hh
index 107f2626b2cf0..9b9e3b1f8ed44 100644
--- a/Alignment/Geners/interface/IOIsPair.hh
+++ b/Alignment/Geners/interface/IOIsPair.hh
@@ -4,18 +4,15 @@
 #include <utility>
 
 namespace gs {
-    template <class T>
-    struct IOIsPair
-    {
-        enum {value = 0};
-    };
+  template <class T>
+  struct IOIsPair {
+    enum { value = 0 };
+  };
 
-    template <class T1, class T2>
-    struct IOIsPair<std::pair<T1,T2> >
-    {
-        enum {value = 1};
-    };
-}
-
-#endif // GENERS_IOISPAIR_HH_
+  template <class T1, class T2>
+  struct IOIsPair<std::pair<T1, T2>> {
+    enum { value = 1 };
+  };
+}  // namespace gs
 
+#endif  // GENERS_IOISPAIR_HH_
diff --git a/Alignment/Geners/interface/IOIsReadable.hh b/Alignment/Geners/interface/IOIsReadable.hh
index 435c206c0550e..7dbabe2ffbb28 100644
--- a/Alignment/Geners/interface/IOIsReadable.hh
+++ b/Alignment/Geners/interface/IOIsReadable.hh
@@ -6,63 +6,61 @@
 #include "Alignment/Geners/interface/StrippedType.hh"
 
 namespace gs {
-    template <typename T>
-    class IOIsHeapReadableHelper
-    {
-    private:
-        template<T* (*)(const ClassId&, std::istream&)> struct tester;
-        typedef char One;
-        typedef struct {char a[2];} Two;
-        template<typename C> static One test(tester<&C::read>*);
-        template<typename C> static Two test(...);
-
-    public:
-        enum {value = sizeof(IOIsHeapReadableHelper<T>::template test<T>(0)) == 1};
-    };
-
-
-    template<typename T, bool is_class_type=IOIsClassType<T>::value>
-    struct IOIsHeapReadable
-    {
-        enum {value = 0};
-    };
-
-
-    template <typename T>
-    struct IOIsHeapReadable<T, true>
-    {
-        enum {value = IOIsHeapReadableHelper<typename StrippedType<T>::type>::value};
-    };
-
-
-    template <typename T>
-    class IOIsPlaceReadableHelper
-    {
-    private:
-        template<void (*)(const ClassId&, std::istream&, T*)> struct tester;
-        typedef char One;
-        typedef struct {char a[2];} Two;
-        template<typename C> static One test(tester<&C::restore>*);
-        template<typename C> static Two test(...);
-
-    public:
-        enum {value = sizeof(IOIsPlaceReadableHelper<T>::template test<T>(0)) == 1};
-    };
-
-
-    template<typename T, bool is_class_type=IOIsClassType<T>::value>
-    struct IOIsPlaceReadable
-    {
-        enum {value = 0};
-    };
-
-
-    template <typename T>
-    struct IOIsPlaceReadable<T, true>
-    {
-        enum {value = IOIsPlaceReadableHelper<typename StrippedType<T>::type>::value};
-    };
-}
-
-#endif // GENERS_IOISREADABLE_HH_
-
+  template <typename T>
+  class IOIsHeapReadableHelper {
+  private:
+    template <T *(*)(const ClassId &, std::istream &)>
+    struct tester;
+    typedef char One;
+    typedef struct {
+      char a[2];
+    } Two;
+    template <typename C>
+    static One test(tester<&C::read> *);
+    template <typename C>
+    static Two test(...);
+
+  public:
+    enum { value = sizeof(IOIsHeapReadableHelper<T>::template test<T>(nullptr)) == 1 };
+  };
+
+  template <typename T, bool is_class_type = IOIsClassType<T>::value>
+  struct IOIsHeapReadable {
+    enum { value = 0 };
+  };
+
+  template <typename T>
+  struct IOIsHeapReadable<T, true> {
+    enum { value = IOIsHeapReadableHelper<typename StrippedType<T>::type>::value };
+  };
+
+  template <typename T>
+  class IOIsPlaceReadableHelper {
+  private:
+    template <void (*)(const ClassId &, std::istream &, T *)>
+    struct tester;
+    typedef char One;
+    typedef struct {
+      char a[2];
+    } Two;
+    template <typename C>
+    static One test(tester<&C::restore> *);
+    template <typename C>
+    static Two test(...);
+
+  public:
+    enum { value = sizeof(IOIsPlaceReadableHelper<T>::template test<T>(0)) == 1 };
+  };
+
+  template <typename T, bool is_class_type = IOIsClassType<T>::value>
+  struct IOIsPlaceReadable {
+    enum { value = 0 };
+  };
+
+  template <typename T>
+  struct IOIsPlaceReadable<T, true> {
+    enum { value = IOIsPlaceReadableHelper<typename StrippedType<T>::type>::value };
+  };
+}  // namespace gs
+
+#endif  // GENERS_IOISREADABLE_HH_
diff --git a/Alignment/Geners/interface/IOIsSharedPtr.hh b/Alignment/Geners/interface/IOIsSharedPtr.hh
index bcfdbf187ab77..93d419f940aa4 100644
--- a/Alignment/Geners/interface/IOIsSharedPtr.hh
+++ b/Alignment/Geners/interface/IOIsSharedPtr.hh
@@ -4,36 +4,30 @@
 #include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
 
 namespace gs {
-    template <class T>
-    struct IOIsSharedPtr
-    {
-        enum {value = 0};
-    };
-
-    template <class T>
-    struct IOIsSharedPtr<CPP11_shared_ptr<T> >
-    {
-        enum {value = 1};
-    };
-
-    template <class T>
-    struct IOIsSharedPtr<const CPP11_shared_ptr<T> >
-    {
-        enum {value = 1};
-    };
-
-    template <class T>
-    struct IOIsSharedPtr<volatile CPP11_shared_ptr<T> >
-    {
-        enum {value = 1};
-    };
-
-    template <class T>
-    struct IOIsSharedPtr<const volatile CPP11_shared_ptr<T> >
-    {
-        enum {value = 1};
-    };
-}
-
-#endif // GENERS_IOISSHAREDPTR_HH_
-
+  template <class T>
+  struct IOIsSharedPtr {
+    enum { value = 0 };
+  };
+
+  template <class T>
+  struct IOIsSharedPtr<CPP11_shared_ptr<T>> {
+    enum { value = 1 };
+  };
+
+  template <class T>
+  struct IOIsSharedPtr<const CPP11_shared_ptr<T>> {
+    enum { value = 1 };
+  };
+
+  template <class T>
+  struct IOIsSharedPtr<volatile CPP11_shared_ptr<T>> {
+    enum { value = 1 };
+  };
+
+  template <class T>
+  struct IOIsSharedPtr<const volatile CPP11_shared_ptr<T>> {
+    enum { value = 1 };
+  };
+}  // namespace gs
+
+#endif  // GENERS_IOISSHAREDPTR_HH_
diff --git a/Alignment/Geners/interface/IOIsString.hh b/Alignment/Geners/interface/IOIsString.hh
index 5d13f2ddd5ded..415312219c2be 100644
--- a/Alignment/Geners/interface/IOIsString.hh
+++ b/Alignment/Geners/interface/IOIsString.hh
@@ -4,36 +4,30 @@
 #include <string>
 
 namespace gs {
-    template <class T>
-    struct IOIsString
-    {
-        enum {value = 0};
-    };
-
-    template <>
-    struct IOIsString<std::string>
-    {
-        enum {value = 1};
-    };
-
-    template <>
-    struct IOIsString<const std::string>
-    {
-        enum {value = 1};
-    };
-
-    template <>
-    struct IOIsString<volatile std::string>
-    {
-        enum {value = 1};
-    };
-
-    template <>
-    struct IOIsString<const volatile std::string>
-    {
-        enum {value = 1};
-    };
-}
-
-#endif // GENERS_IOISSTRING_HH_
-
+  template <class T>
+  struct IOIsString {
+    enum { value = 0 };
+  };
+
+  template <>
+  struct IOIsString<std::string> {
+    enum { value = 1 };
+  };
+
+  template <>
+  struct IOIsString<const std::string> {
+    enum { value = 1 };
+  };
+
+  template <>
+  struct IOIsString<volatile std::string> {
+    enum { value = 1 };
+  };
+
+  template <>
+  struct IOIsString<const volatile std::string> {
+    enum { value = 1 };
+  };
+}  // namespace gs
+
+#endif  // GENERS_IOISSTRING_HH_
diff --git a/Alignment/Geners/interface/IOIsTuple.hh b/Alignment/Geners/interface/IOIsTuple.hh
index fb867373b0c6f..e8b20aca7b9e6 100644
--- a/Alignment/Geners/interface/IOIsTuple.hh
+++ b/Alignment/Geners/interface/IOIsTuple.hh
@@ -2,12 +2,10 @@
 #define GENERS_IOISTUPLE_HH_
 
 namespace gs {
-    template <class T>
-    struct IOIsTuple
-    {
-        enum {value = 0};
-    };
-}
-
-#endif // GENERS_IOISTUPLE_HH_
+  template <class T>
+  struct IOIsTuple {
+    enum { value = 0 };
+  };
+}  // namespace gs
 
+#endif  // GENERS_IOISTUPLE_HH_
diff --git a/Alignment/Geners/interface/IOIsUnsigned.hh b/Alignment/Geners/interface/IOIsUnsigned.hh
index e39ace3f2096d..ded98d149c84c 100644
--- a/Alignment/Geners/interface/IOIsUnsigned.hh
+++ b/Alignment/Geners/interface/IOIsUnsigned.hh
@@ -2,26 +2,34 @@
 #define GENERS_IOISUNSIGNED_HH_
 
 namespace gs {
-    template <class T>
-    struct IOIsUnsigned
-    {
-        enum {value = 0};
-    };
-}
+  template <class T>
+  struct IOIsUnsigned {
+    enum { value = 0 };
+  };
+}  // namespace gs
 
-#define gs_declare_type_as_unsigned(T) /**/                                \
-namespace gs {                                                             \
-    template <> struct IOIsUnsigned<T> {enum {value = 1};};                \
-    template <> struct IOIsUnsigned<T const> {enum {value = 1};};          \
-    template <> struct IOIsUnsigned<T volatile> {enum {value = 1};};       \
-    template <> struct IOIsUnsigned<T const volatile> {enum {value = 1};}; \
-}
+#define gs_declare_type_as_unsigned(T) /**/ \
+  namespace gs {                            \
+    template <>                             \
+    struct IOIsUnsigned<T> {                \
+      enum { value = 1 };                   \
+    };                                      \
+    template <>                             \
+    struct IOIsUnsigned<T const> {          \
+      enum { value = 1 };                   \
+    };                                      \
+    template <>                             \
+    struct IOIsUnsigned<T volatile> {       \
+      enum { value = 1 };                   \
+    };                                      \
+    template <>                             \
+    struct IOIsUnsigned<T const volatile> { \
+      enum { value = 1 };                   \
+    };                                      \
+  }
 
-gs_declare_type_as_unsigned(unsigned char)
-gs_declare_type_as_unsigned(unsigned short)
-gs_declare_type_as_unsigned(unsigned int)
-gs_declare_type_as_unsigned(unsigned long)
-gs_declare_type_as_unsigned(unsigned long long)
-
-#endif // GENERS_IOISUNSIGNED_HH_
+gs_declare_type_as_unsigned(unsigned char) gs_declare_type_as_unsigned(unsigned short)
+    gs_declare_type_as_unsigned(unsigned int) gs_declare_type_as_unsigned(unsigned long)
+        gs_declare_type_as_unsigned(unsigned long long)
 
+#endif  // GENERS_IOISUNSIGNED_HH_
diff --git a/Alignment/Geners/interface/IOIsWritable.hh b/Alignment/Geners/interface/IOIsWritable.hh
index 35682b42b2bdb..6a7b4d00620b1 100644
--- a/Alignment/Geners/interface/IOIsWritable.hh
+++ b/Alignment/Geners/interface/IOIsWritable.hh
@@ -6,34 +6,33 @@
 #include <ostream>
 
 namespace gs {
-    template <typename T>
-    class IOIsWritableHelper
-    {
-    private:
-        template<bool (T::*)(std::ostream&) const> struct tester;
-        typedef char One;
-        typedef struct {char a[2];} Two;
-        template<typename C> static One test(tester<&C::write>*);
-        template<typename C> static Two test(...);
-
-    public:
-        enum {value = sizeof(IOIsWritableHelper<T>::template test<T>(0)) == 1};
-    };
-
-
-    template<typename T, bool is_class_type=IOIsClassType<T>::value>
-    struct IOIsWritable
-    {
-        enum {value = 0};
-    };
-
-
-    template <typename T>
-    struct IOIsWritable<T, true>
-    {
-        enum {value = IOIsWritableHelper<T>::value};
-    };
-}
-
-#endif // GENERS_IOISWRITABLE_HH_
-
+  template <typename T>
+  class IOIsWritableHelper {
+  private:
+    template <bool (T::*)(std::ostream &) const>
+    struct tester;
+    typedef char One;
+    typedef struct {
+      char a[2];
+    } Two;
+    template <typename C>
+    static One test(tester<&C::write> *);
+    template <typename C>
+    static Two test(...);
+
+  public:
+    enum { value = sizeof(IOIsWritableHelper<T>::template test<T>(nullptr)) == 1 };
+  };
+
+  template <typename T, bool is_class_type = IOIsClassType<T>::value>
+  struct IOIsWritable {
+    enum { value = 0 };
+  };
+
+  template <typename T>
+  struct IOIsWritable<T, true> {
+    enum { value = IOIsWritableHelper<T>::value };
+  };
+}  // namespace gs
+
+#endif  // GENERS_IOISWRITABLE_HH_
diff --git a/Alignment/Geners/interface/IOPointeeType.hh b/Alignment/Geners/interface/IOPointeeType.hh
index 17d6ca46c3a9c..70de6579a104e 100644
--- a/Alignment/Geners/interface/IOPointeeType.hh
+++ b/Alignment/Geners/interface/IOPointeeType.hh
@@ -2,33 +2,28 @@
 #define GENERS_IOPOINTEETYPE_HH_
 
 namespace gs {
-    template <typename T>
-    struct IOPointeeType;
+  template <typename T>
+  struct IOPointeeType;
 
-    template <typename T>
-    struct IOPointeeType<T*>
-    {
-        typedef T type;
-    };
+  template <typename T>
+  struct IOPointeeType<T *> {
+    typedef T type;
+  };
 
-    template <typename T>
-    struct IOPointeeType<T* const>
-    {
-        typedef T type;
-    };
+  template <typename T>
+  struct IOPointeeType<T *const> {
+    typedef T type;
+  };
 
-    template <typename T>
-    struct IOPointeeType<T* volatile>
-    {
-        typedef T type;
-    };
+  template <typename T>
+  struct IOPointeeType<T *volatile> {
+    typedef T type;
+  };
 
-    template <typename T>
-    struct IOPointeeType<T* const volatile>
-    {
-        typedef T type;
-    };
-}
-
-#endif // GENERS_IOPOINTEETYPE_HH_
+  template <typename T>
+  struct IOPointeeType<T *const volatile> {
+    typedef T type;
+  };
+}  // namespace gs
 
+#endif  // GENERS_IOPOINTEETYPE_HH_
diff --git a/Alignment/Geners/interface/IOPtr.hh b/Alignment/Geners/interface/IOPtr.hh
index 75846695a7a0e..94b69a38dcaba 100644
--- a/Alignment/Geners/interface/IOPtr.hh
+++ b/Alignment/Geners/interface/IOPtr.hh
@@ -1,190 +1,202 @@
 #ifndef GENERS_IOPTR_HH_
 #define GENERS_IOPTR_HH_
 
-#include <string>
 #include "Alignment/Geners/interface/IOException.hh"
+#include <string>
 
 // "Silent" pointers for the I/O system
 namespace gs {
-    template <typename T> class IOProxy;
-
-    template <typename T>
-    class IOPtr
-    {
-        template <typename T2> friend class IOProxy;
-
-    public:
-        typedef T element_type;
-
-        inline IOPtr() : ptr_(0) {}
-        inline IOPtr(T* ptr) : ptr_(ptr) {}
-        IOPtr(const IOProxy<T>& p);
-
-        IOPtr& operator=(const IOProxy<T>& p);
-        inline IOPtr& operator=(const IOPtr& p)
-            {ptr_ = p.ptr_; return *this;}
-
-        // Typical pointer operations
-        inline T* get() const {return ptr_;}
-        inline T* operator->() const
-        {
-            if (!ptr_) throw gs::IOInvalidArgument(
-               "In gs::IOPtr::operator->: attempt to dereference null pointer");
-            return ptr_;
-        }
-        inline T& operator*() const
-        {
-            if (!ptr_) throw gs::IOInvalidArgument(
-               "In gs::IOPtr::operator*: attempt to dereference null pointer");
-            return *ptr_;
-        }
-        inline IOPtr& operator++() {++ptr_; return *this;}
-        inline void operator++(int) {++ptr_;}
-        inline IOPtr& operator--() {--ptr_; return *this;}
-        inline void operator--(int) {--ptr_;}
-
-        // Implicit conversion to "bool"
-        inline operator bool() const {return !(ptr_ == 0);}
-
-        // Names are ignored during comparisons
-        inline bool operator==(const IOPtr& r) const {return ptr_ == r.ptr_;}
-        inline bool operator!=(const IOPtr& r) const {return ptr_ != r.ptr_;}
-        bool operator==(const IOProxy<T>& r) const;
-        bool operator!=(const IOProxy<T>& r) const;
-
-        // Should be able to work as with bare pointer inside the I/O code
-        inline T*& getIOReference() {return ptr_;}
-        inline T* const & getIOReference() const
-        {
-            if (!ptr_) throw gs::IOInvalidArgument(
-                "In gs::IOPtr::getIOReference: unusable "
-                "const reference to null pointer");
-            return ptr_;
-        }
-
-    private:
-        T* ptr_;
-    };
-
-    template <typename T>
-    class IOProxy
-    {
-        template <typename T2> friend class IOPtr;
-
-    public:
-        typedef T element_type;
-
-        inline IOProxy() : ptr_(0) {}
-        inline IOProxy(T* ptr) : ptr_(ptr) {}
-        inline IOProxy(T* ptr, const char* varname)
-            : ptr_(ptr), name_(varname ? varname : "") {}
-        inline IOProxy(T* ptr, const std::string& varname)
-            : ptr_(ptr), name_(varname) {}
-        inline IOProxy(const IOPtr<T>& p) : ptr_(p.ptr_) {}
-        inline IOProxy(const IOPtr<T>& p, const char* varname)
-            : ptr_(p.ptr_), name_(varname ? varname : "") {}
-        inline IOProxy(const IOPtr<T>& p, const std::string& varname)
-            : ptr_(p.ptr_), name_(varname) {}
-
-        inline IOProxy& operator=(const IOProxy& p)
-            {ptr_ = p.ptr_; name_ = p.name_; return *this;}
-        inline IOProxy& operator=(const IOPtr<T>& p)
-            {ptr_ = p.ptr_; name_ = ""; return *this;}
-
-        // Get name
-        inline const std::string& name() const {return name_;}
-
-        // Set name
-        inline IOProxy& setName(const char* varname)
-        {
-            name_ = varname ? varname : "";
-            return *this;
-        }
-        inline IOProxy& setName(const std::string& varname)
-        {
-            name_ = varname;
-            return *this;
-        }
-
-        // Typical pointer operations
-        inline T* get() const {return ptr_;}
-        inline T* operator->() const
-        {
-            if (!ptr_) throw gs::IOInvalidArgument(
-               "In gs::IOProxy::operator->: attempt to dereference null pointer");
-            return ptr_;
-        }
-        inline T& operator*() const
-        {
-            if (!ptr_) throw gs::IOInvalidArgument(
-               "In gs::IOProxy::operator*: attempt to dereference null pointer");
-            return *ptr_;
-        }
-        inline IOProxy& operator++() {++ptr_; return *this;}
-        inline void operator++(int) {++ptr_;}
-        inline IOProxy& operator--() {--ptr_; return *this;}
-        inline void operator--(int) {--ptr_;}
-
-        // Implicit conversion to "bool"
-        inline operator bool() const {return !(ptr_ == 0);}
-
-        // Names are ignored during comparisons
-        inline bool operator==(const IOProxy& r) const {return ptr_ == r.ptr_;}
-        inline bool operator!=(const IOProxy& r) const {return ptr_ != r.ptr_;}
-        inline bool operator==(const IOPtr<T>& r) const {return ptr_== r.ptr_;}
-        inline bool operator!=(const IOPtr<T>& r) const {return ptr_!= r.ptr_;}
-
-        // Should be able to work as with bare pointer inside the I/O code
-        inline T*& getIOReference() {return ptr_;}
-        inline T* const & getIOReference() const 
-        {
-            if (!ptr_) throw gs::IOInvalidArgument(
-                "In gs::IOProxy::getIOReference: unusable "
-                "const reference to null pointer");
-            return ptr_;
-        }
-
-    private:
-        T* ptr_;
-        std::string name_;
-    };
-
-    // Convenience function for making IOPtr objects
-    template <typename T>
-    inline IOPtr<T> make_IOPtr(T& obj)
-    {
-        return IOPtr<T>(&obj);
+  template <typename T>
+  class IOProxy;
+
+  template <typename T>
+  class IOPtr {
+    template <typename T2>
+    friend class IOProxy;
+
+  public:
+    typedef T element_type;
+
+    inline IOPtr() : ptr_(0) {}
+    inline IOPtr(T *ptr) : ptr_(ptr) {}
+    IOPtr(const IOProxy<T> &p);
+
+    IOPtr &operator=(const IOProxy<T> &p);
+    inline IOPtr &operator=(const IOPtr &p) {
+      ptr_ = p.ptr_;
+      return *this;
     }
 
-    // In the user code, the following function can be usually wrapped
-    // as follows:
-    //
-    // #define io_proxy(obj) gs::make_IOProxy( obj , #obj )
-    //
-    template <typename T>
-    inline IOProxy<T> make_IOProxy(T& obj, const char* name)
-    {
-        return IOProxy<T>(&obj, name);
+    // Typical pointer operations
+    inline T *get() const { return ptr_; }
+    inline T *operator->() const {
+      if (!ptr_)
+        throw gs::IOInvalidArgument("In gs::IOPtr::operator->: attempt to dereference null pointer");
+      return ptr_;
+    }
+    inline T &operator*() const {
+      if (!ptr_)
+        throw gs::IOInvalidArgument("In gs::IOPtr::operator*: attempt to dereference null pointer");
+      return *ptr_;
+    }
+    inline IOPtr &operator++() {
+      ++ptr_;
+      return *this;
+    }
+    inline void operator++(int) { ++ptr_; }
+    inline IOPtr &operator--() {
+      --ptr_;
+      return *this;
+    }
+    inline void operator--(int) { --ptr_; }
+
+    // Implicit conversion to "bool"
+    inline operator bool() const { return !(ptr_ == 0); }
+
+    // Names are ignored during comparisons
+    inline bool operator==(const IOPtr &r) const { return ptr_ == r.ptr_; }
+    inline bool operator!=(const IOPtr &r) const { return ptr_ != r.ptr_; }
+    bool operator==(const IOProxy<T> &r) const;
+    bool operator!=(const IOProxy<T> &r) const;
+
+    // Should be able to work as with bare pointer inside the I/O code
+    inline T *&getIOReference() { return ptr_; }
+    inline T *const &getIOReference() const {
+      if (!ptr_)
+        throw gs::IOInvalidArgument(
+            "In gs::IOPtr::getIOReference: unusable "
+            "const reference to null pointer");
+      return ptr_;
     }
-}
 
-// IOPtr methods which could not be defined earlier
-namespace gs {
-    template <typename T>
-    inline IOPtr<T>::IOPtr(const IOProxy<T>& p) : ptr_(p.ptr_) {}
+  private:
+    T *ptr_;
+  };
+
+  template <typename T>
+  class IOProxy {
+    template <typename T2>
+    friend class IOPtr;
+
+  public:
+    typedef T element_type;
+
+    inline IOProxy() : ptr_(0) {}
+    inline IOProxy(T *ptr) : ptr_(ptr) {}
+    inline IOProxy(T *ptr, const char *varname) : ptr_(ptr), name_(varname ? varname : "") {}
+    inline IOProxy(T *ptr, const std::string &varname) : ptr_(ptr), name_(varname) {}
+    inline IOProxy(const IOPtr<T> &p) : ptr_(p.ptr_) {}
+    inline IOProxy(const IOPtr<T> &p, const char *varname) : ptr_(p.ptr_), name_(varname ? varname : "") {}
+    inline IOProxy(const IOPtr<T> &p, const std::string &varname) : ptr_(p.ptr_), name_(varname) {}
+
+    inline IOProxy &operator=(const IOProxy &p) {
+      ptr_ = p.ptr_;
+      name_ = p.name_;
+      return *this;
+    }
+    inline IOProxy &operator=(const IOPtr<T> &p) {
+      ptr_ = p.ptr_;
+      name_ = "";
+      return *this;
+    }
 
-    template <typename T>
-    inline IOPtr<T>& IOPtr<T>::operator=(const IOProxy<T>& p)
-    {ptr_ = p.ptr_; return *this;}
+    // Get name
+    inline const std::string &name() const { return name_; }
 
-    template <typename T>
-    inline bool IOPtr<T>::operator==(const IOProxy<T>& r) const 
-    {return ptr_ == r.ptr_;}
+    // Set name
+    inline IOProxy &setName(const char *varname) {
+      name_ = varname ? varname : "";
+      return *this;
+    }
+    inline IOProxy &setName(const std::string &varname) {
+      name_ = varname;
+      return *this;
+    }
 
-    template <typename T>
-    inline bool IOPtr<T>::operator!=(const IOProxy<T>& r) const 
-    {return ptr_ != r.ptr_;}
-}
+    // Typical pointer operations
+    inline T *get() const { return ptr_; }
+    inline T *operator->() const {
+      if (!ptr_)
+        throw gs::IOInvalidArgument("In gs::IOProxy::operator->: attempt to dereference null pointer");
+      return ptr_;
+    }
+    inline T &operator*() const {
+      if (!ptr_)
+        throw gs::IOInvalidArgument("In gs::IOProxy::operator*: attempt to dereference null pointer");
+      return *ptr_;
+    }
+    inline IOProxy &operator++() {
+      ++ptr_;
+      return *this;
+    }
+    inline void operator++(int) { ++ptr_; }
+    inline IOProxy &operator--() {
+      --ptr_;
+      return *this;
+    }
+    inline void operator--(int) { --ptr_; }
+
+    // Implicit conversion to "bool"
+    inline operator bool() const { return !(ptr_ == 0); }
+
+    // Names are ignored during comparisons
+    inline bool operator==(const IOProxy &r) const { return ptr_ == r.ptr_; }
+    inline bool operator!=(const IOProxy &r) const { return ptr_ != r.ptr_; }
+    inline bool operator==(const IOPtr<T> &r) const { return ptr_ == r.ptr_; }
+    inline bool operator!=(const IOPtr<T> &r) const { return ptr_ != r.ptr_; }
+
+    // Should be able to work as with bare pointer inside the I/O code
+    inline T *&getIOReference() { return ptr_; }
+    inline T *const &getIOReference() const {
+      if (!ptr_)
+        throw gs::IOInvalidArgument(
+            "In gs::IOProxy::getIOReference: unusable "
+            "const reference to null pointer");
+      return ptr_;
+    }
 
-#endif // GENERS_IOPTR_HH_
+  private:
+    T *ptr_;
+    std::string name_;
+  };
+
+  // Convenience function for making IOPtr objects
+  template <typename T>
+  inline IOPtr<T> make_IOPtr(T &obj) {
+    return IOPtr<T>(&obj);
+  }
+
+  // In the user code, the following function can be usually wrapped
+  // as follows:
+  //
+  // #define io_proxy(obj) gs::make_IOProxy( obj , #obj )
+  //
+  template <typename T>
+  inline IOProxy<T> make_IOProxy(T &obj, const char *name) {
+    return IOProxy<T>(&obj, name);
+  }
+}  // namespace gs
 
+// IOPtr methods which could not be defined earlier
+namespace gs {
+  template <typename T>
+  inline IOPtr<T>::IOPtr(const IOProxy<T> &p) : ptr_(p.ptr_) {}
+
+  template <typename T>
+  inline IOPtr<T> &IOPtr<T>::operator=(const IOProxy<T> &p) {
+    ptr_ = p.ptr_;
+    return *this;
+  }
+
+  template <typename T>
+  inline bool IOPtr<T>::operator==(const IOProxy<T> &r) const {
+    return ptr_ == r.ptr_;
+  }
+
+  template <typename T>
+  inline bool IOPtr<T>::operator!=(const IOProxy<T> &r) const {
+    return ptr_ != r.ptr_;
+  }
+}  // namespace gs
+
+#endif  // GENERS_IOPTR_HH_
diff --git a/Alignment/Geners/interface/IOTraits.hh b/Alignment/Geners/interface/IOTraits.hh
index 10cf3451585a3..7c64ee549b2f5 100644
--- a/Alignment/Geners/interface/IOTraits.hh
+++ b/Alignment/Geners/interface/IOTraits.hh
@@ -3,140 +3,111 @@
 
 #include <iostream>
 
+#include "Alignment/Geners/interface/IOIsClassType.hh"
+#include "Alignment/Geners/interface/IOIsContainer.hh"
+#include "Alignment/Geners/interface/IOIsContiguous.hh"
+#include "Alignment/Geners/interface/IOIsExternal.hh"
+#include "Alignment/Geners/interface/IOIsIOPtr.hh"
 #include "Alignment/Geners/interface/IOIsPOD.hh"
 #include "Alignment/Geners/interface/IOIsPair.hh"
+#include "Alignment/Geners/interface/IOIsReadable.hh"
+#include "Alignment/Geners/interface/IOIsSharedPtr.hh"
 #include "Alignment/Geners/interface/IOIsString.hh"
 #include "Alignment/Geners/interface/IOIsTuple.hh"
-#include "Alignment/Geners/interface/IOIsContainer.hh"
 #include "Alignment/Geners/interface/IOIsWritable.hh"
-#include "Alignment/Geners/interface/IOIsReadable.hh"
-#include "Alignment/Geners/interface/IOIsExternal.hh"
-#include "Alignment/Geners/interface/IOIsSharedPtr.hh"
-#include "Alignment/Geners/interface/IOIsIOPtr.hh"
-#include "Alignment/Geners/interface/IOIsClassType.hh"
-#include "Alignment/Geners/interface/IOIsContiguous.hh"
 
 namespace gs {
-    template <class T>
-    struct IOTraits
-    {
-        static const bool IsClass = IOIsClassType<T>::value;
-        enum {ISCLASS = 1};
-
-        // Pointers are not PODs for I/O purposes.
-        //
-        // It looks like std::array of PODs is itself considered
-        // a POD by the "CPP11_is_pod" template, at least by some
-        // g++ versions (in particular, 4.4.5). This is a bug/feature
-        // that we need to avoid.
-        static const bool IsPOD = (IOIsPOD<T>::value &&
-                                   !IOIsContainer<T>::value &&
-                                   !CPP11_is_pointer<T>::value &&
-                                   !IOIsExternal<T>::value);
-        enum {ISPOD = 2};
-
-        static const bool IsWritable = (IOIsWritable<T>::value &&
-                                        !IOIsExternal<T>::value);
-        enum {ISWRITABLE = 4};
-
-        static const bool IsStdContainer = (IOIsContainer<T>::value && 
-                                            !IOIsWritable<T>::value &&
-                                            !IOIsExternal<T>::value);
-        enum {ISSTDCONTAINER = 8};
-
-        // Readable objects are required to be writable
-        static const bool IsPlaceReadable = (IOIsPlaceReadable<T>::value &&
-                                             IOIsWritable<T>::value);
-        enum {ISPLACEREADABLE = 16};
-
-        // Prefer place readability to heap readability
-        static const bool IsHeapReadable = (IOIsHeapReadable<T>::value &&
-                                            !IOIsPlaceReadable<T>::value &&
-                                            IOIsWritable<T>::value);
-        enum {ISHEAPREADABLE = 32};
-
-        static const bool IsPointer = (CPP11_is_pointer<T>::value &&
-                                       !IOIsExternal<T>::value);
-        enum {ISPOINTER = 64};
-
-        static const bool IsSharedPtr = (IOIsSharedPtr<T>::value &&
-                                         !IOIsExternal<T>::value);
-        enum {ISSHAREDPTR = 128};
-
-        static const bool IsPair = IOIsPair<T>::value;
-        enum {ISPAIR = 256};
-
-        static const bool IsString = IOIsString<T>::value;
-        enum {ISSTRING = 512};
-
-        // The following trait is relevant for containers only
-        static const bool IsContiguous = IOIsContiguous<T>::value;
-        enum {ISCONTIGUOUS = 1024};
-
-        static const bool IsTuple = IOIsTuple<T>::value;
-        enum {ISTUPLE = 2048};
-
-        static const bool IsIOPtr = IOIsIOPtr<T>::value;
-        enum {ISIOPTR = 4096};
-
-        // A catch-all definition for externally defined types which
-        // want to use the template-based I/O within this system but
-        // do not want to implement the standard "read/write" mechanism.
-        // The user has to declare the external type by modifying the
-        // "IOIsExternal" template.
-        static const bool IsExternal = IOIsExternal<T>::value;
-        enum {ISEXTERNAL = 8192};
-
-        // Special enums for heap-readable objects known
-        // to be called with zero pointer as an argument.
-        // In this case we will avoid compiling an assignment
-        // operator for the object.
-        enum {ISNULLPOINTER = 16384};
-        enum {ISPUREHEAPREADABLE = 32768};
-
-        static const int Signature = 
-            IsClass*ISCLASS + 
-            IsPOD*ISPOD +
-            IsWritable*ISWRITABLE +
-            IsStdContainer*ISSTDCONTAINER + 
-            IsPlaceReadable*ISPLACEREADABLE +
-            IsHeapReadable*ISHEAPREADABLE + 
-            IsPointer*ISPOINTER + 
-            IsSharedPtr*ISSHAREDPTR + 
-            IsPair*ISPAIR +
-            IsString*ISSTRING + 
-            IsContiguous*ISCONTIGUOUS + 
-            IsTuple*ISTUPLE +
-            IsIOPtr*ISIOPTR +
-            IsExternal*ISEXTERNAL +
-            IsPointer*ISNULLPOINTER +
-            IsHeapReadable*ISPUREHEAPREADABLE;
-    };
-
-    template <class T>
-    inline IOTraits<T> IOItemTraits(const T&) {return IOTraits<T>();}
-}
+  template <class T>
+  struct IOTraits {
+    static const bool IsClass = IOIsClassType<T>::value;
+    enum { ISCLASS = 1 };
+
+    // Pointers are not PODs for I/O purposes.
+    //
+    // It looks like std::array of PODs is itself considered
+    // a POD by the "CPP11_is_pod" template, at least by some
+    // g++ versions (in particular, 4.4.5). This is a bug/feature
+    // that we need to avoid.
+    static const bool IsPOD =
+        (IOIsPOD<T>::value && !IOIsContainer<T>::value && !CPP11_is_pointer<T>::value && !IOIsExternal<T>::value);
+    enum { ISPOD = 2 };
+
+    static const bool IsWritable = (IOIsWritable<T>::value && !IOIsExternal<T>::value);
+    enum { ISWRITABLE = 4 };
+
+    static const bool IsStdContainer = (IOIsContainer<T>::value && !IOIsWritable<T>::value && !IOIsExternal<T>::value);
+    enum { ISSTDCONTAINER = 8 };
+
+    // Readable objects are required to be writable
+    static const bool IsPlaceReadable = (IOIsPlaceReadable<T>::value && IOIsWritable<T>::value);
+    enum { ISPLACEREADABLE = 16 };
+
+    // Prefer place readability to heap readability
+    static const bool IsHeapReadable =
+        (IOIsHeapReadable<T>::value && !IOIsPlaceReadable<T>::value && IOIsWritable<T>::value);
+    enum { ISHEAPREADABLE = 32 };
+
+    static const bool IsPointer = (CPP11_is_pointer<T>::value && !IOIsExternal<T>::value);
+    enum { ISPOINTER = 64 };
+
+    static const bool IsSharedPtr = (IOIsSharedPtr<T>::value && !IOIsExternal<T>::value);
+    enum { ISSHAREDPTR = 128 };
+
+    static const bool IsPair = IOIsPair<T>::value;
+    enum { ISPAIR = 256 };
+
+    static const bool IsString = IOIsString<T>::value;
+    enum { ISSTRING = 512 };
+
+    // The following trait is relevant for containers only
+    static const bool IsContiguous = IOIsContiguous<T>::value;
+    enum { ISCONTIGUOUS = 1024 };
+
+    static const bool IsTuple = IOIsTuple<T>::value;
+    enum { ISTUPLE = 2048 };
+
+    static const bool IsIOPtr = IOIsIOPtr<T>::value;
+    enum { ISIOPTR = 4096 };
+
+    // A catch-all definition for externally defined types which
+    // want to use the template-based I/O within this system but
+    // do not want to implement the standard "read/write" mechanism.
+    // The user has to declare the external type by modifying the
+    // "IOIsExternal" template.
+    static const bool IsExternal = IOIsExternal<T>::value;
+    enum { ISEXTERNAL = 8192 };
+
+    // Special enums for heap-readable objects known
+    // to be called with zero pointer as an argument.
+    // In this case we will avoid compiling an assignment
+    // operator for the object.
+    enum { ISNULLPOINTER = 16384 };
+    enum { ISPUREHEAPREADABLE = 32768 };
+
+    static const int Signature = IsClass * ISCLASS + IsPOD * ISPOD + IsWritable * ISWRITABLE +
+                                 IsStdContainer * ISSTDCONTAINER + IsPlaceReadable * ISPLACEREADABLE +
+                                 IsHeapReadable * ISHEAPREADABLE + IsPointer * ISPOINTER + IsSharedPtr * ISSHAREDPTR +
+                                 IsPair * ISPAIR + IsString * ISSTRING + IsContiguous * ISCONTIGUOUS +
+                                 IsTuple * ISTUPLE + IsIOPtr * ISIOPTR + IsExternal * ISEXTERNAL +
+                                 IsPointer * ISNULLPOINTER + IsHeapReadable * ISPUREHEAPREADABLE;
+  };
+
+  template <class T>
+  inline IOTraits<T> IOItemTraits(const T &) {
+    return IOTraits<T>();
+  }
+}  // namespace gs
 
 template <class T>
-std::ostream& operator<<(std::ostream& os, const gs::IOTraits<T>&)
-{
-    typedef gs::IOTraits<T> Tr;
-    os << "IsClass = " << Tr::IsClass
-       << ", IsPOD = " << Tr::IsPOD
-       << ", IsWritable = " << Tr::IsWritable
-       << ", IsStdContainer = " << Tr::IsStdContainer
-       << ", IsPlaceReadable = " << Tr::IsPlaceReadable
-       << ", IsHeapReadable = " << Tr::IsHeapReadable
-       << ", IsPointer = " << Tr::IsPointer
-       << ", IsSharedPtr = " << Tr::IsSharedPtr
-       << ", IsPair = " << Tr::IsPair
-       << ", IsString = " << Tr::IsString
-       << ", IsContiguous = " << Tr::IsContiguous
-       << ", IsTuple = " << Tr::IsTuple
-       << ", IsIOPtr = " << Tr::IsIOPtr
-       << ", IsExternal = " << Tr::IsExternal;
-    return os;
+std::ostream &operator<<(std::ostream &os, const gs::IOTraits<T> &) {
+  typedef gs::IOTraits<T> Tr;
+  os << "IsClass = " << Tr::IsClass << ", IsPOD = " << Tr::IsPOD << ", IsWritable = " << Tr::IsWritable
+     << ", IsStdContainer = " << Tr::IsStdContainer << ", IsPlaceReadable = " << Tr::IsPlaceReadable
+     << ", IsHeapReadable = " << Tr::IsHeapReadable << ", IsPointer = " << Tr::IsPointer
+     << ", IsSharedPtr = " << Tr::IsSharedPtr << ", IsPair = " << Tr::IsPair << ", IsString = " << Tr::IsString
+     << ", IsContiguous = " << Tr::IsContiguous << ", IsTuple = " << Tr::IsTuple << ", IsIOPtr = " << Tr::IsIOPtr
+     << ", IsExternal = " << Tr::IsExternal;
+  return os;
 }
 
-#endif // GENERS_IOTRAITS_HH_
-
+#endif  // GENERS_IOTRAITS_HH_
diff --git a/Alignment/Geners/interface/InsertContainerItem.hh b/Alignment/Geners/interface/InsertContainerItem.hh
index e43237ed2556b..dd1aa6c2845e5 100644
--- a/Alignment/Geners/interface/InsertContainerItem.hh
+++ b/Alignment/Geners/interface/InsertContainerItem.hh
@@ -4,16 +4,12 @@
 #include <cstddef>
 
 namespace gs {
-    template <typename T>
-    struct InsertContainerItem
-    {
-        static inline void insert(T& obj, const typename T::value_type& item,
-                                  const std::size_t /* itemNumber */)
-        {
-            obj.push_back(item);
-        }
-    };
-}
-
-#endif // GENERS_INSERTCONTAINERITEM_HH_
-
+  template <typename T>
+  struct InsertContainerItem {
+    static inline void insert(T &obj, const typename T::value_type &item, const std::size_t /* itemNumber */) {
+      obj.push_back(item);
+    }
+  };
+}  // namespace gs
+
+#endif  // GENERS_INSERTCONTAINERITEM_HH_
diff --git a/Alignment/Geners/interface/Int2Type.hh b/Alignment/Geners/interface/Int2Type.hh
index 9419390260cff..9d749f2a84d3a 100644
--- a/Alignment/Geners/interface/Int2Type.hh
+++ b/Alignment/Geners/interface/Int2Type.hh
@@ -4,27 +4,23 @@
 #include <sstream>
 
 namespace gs {
-    namespace Private {
-        inline std::string makeInt2TypeStage(const int v)
-        {
-            std::ostringstream os;
-            os << "Int2Type::" << v;
-            return os.str();
-        }
+  namespace Private {
+    inline std::string makeInt2TypeStage(const int v) {
+      std::ostringstream os;
+      os << "Int2Type::" << v;
+      return os.str();
     }
+  }  // namespace Private
 
-    template <int v>
-    struct Int2Type
-    {
-        enum {value = v};
+  template <int v>
+  struct Int2Type {
+    enum { value = v };
 
-        static const char* stage()
-        {
-            static const std::string buf(Private::makeInt2TypeStage(v));
-            return buf.c_str();
-        }
-    };
-}
-
-#endif // GENERS_INT2TYPE_HH_
+    static const char *stage() {
+      static const std::string buf(Private::makeInt2TypeStage(v));
+      return buf.c_str();
+    }
+  };
+}  // namespace gs
 
+#endif  // GENERS_INT2TYPE_HH_
diff --git a/Alignment/Geners/interface/ItemDescriptor.hh b/Alignment/Geners/interface/ItemDescriptor.hh
index 6e15005bccae6..a069c40a801b7 100644
--- a/Alignment/Geners/interface/ItemDescriptor.hh
+++ b/Alignment/Geners/interface/ItemDescriptor.hh
@@ -4,51 +4,44 @@
 #define GENERS_ITEMDESCRIPTOR_HH_
 
 #include <string>
-#include <utility>
 #include <typeinfo>
+#include <utility>
 
 #include "Alignment/Geners/interface/ClassId.hh"
 
 namespace gs {
-    class ItemDescriptor
-    {
-    public:
-        ItemDescriptor();
-        ItemDescriptor(const ClassId& classId, const char* ioPrototype,
-                       const char* name, const char* category);
-        inline virtual ~ItemDescriptor() {}
-
-        inline const ClassId& type() const {return classId_;}
-        inline const std::string& ioPrototype() const {return ioProto_;}
-        inline const std::string& name() const {return nameCat_.first;}
-        inline const std::string& category() const {return nameCat_.second;}
-        inline const std::pair<std::string,std::string>& nameAndCategory()
-            const {return nameCat_;}
-
-        inline bool operator==(const ItemDescriptor& r) const
-            {return (typeid(*this) == typeid(r)) && this->isEqual(r);}
-        inline bool operator!=(const ItemDescriptor& r) const
-            {return !(*this == r);}
-
-        // The following returns "true" if the class id and
-        // I/O prototype of this item coincide with those of
-        // the argument
-        bool isSameClassIdandIO(const ItemDescriptor& r) const;
-
-        // The following method checks I/O prototype only
-        // allowing for class id mismatch
-        inline bool isSameIOPrototype(const ItemDescriptor& r) const
-            {return ioProto_ == r.ioProto_;}
-
-    protected:
-        virtual bool isEqual(const ItemDescriptor&) const;
-
-    private:
-        ClassId classId_;
-        std::string ioProto_;
-        std::pair<std::string,std::string> nameCat_;
-    };
-}
-
-#endif // GENERS_ITEMDESCRIPTOR_HH_
-
+  class ItemDescriptor {
+  public:
+    ItemDescriptor();
+    ItemDescriptor(const ClassId &classId, const char *ioPrototype, const char *name, const char *category);
+    inline virtual ~ItemDescriptor() {}
+
+    inline const ClassId &type() const { return classId_; }
+    inline const std::string &ioPrototype() const { return ioProto_; }
+    inline const std::string &name() const { return nameCat_.first; }
+    inline const std::string &category() const { return nameCat_.second; }
+    inline const std::pair<std::string, std::string> &nameAndCategory() const { return nameCat_; }
+
+    inline bool operator==(const ItemDescriptor &r) const { return (typeid(*this) == typeid(r)) && this->isEqual(r); }
+    inline bool operator!=(const ItemDescriptor &r) const { return !(*this == r); }
+
+    // The following returns "true" if the class id and
+    // I/O prototype of this item coincide with those of
+    // the argument
+    bool isSameClassIdandIO(const ItemDescriptor &r) const;
+
+    // The following method checks I/O prototype only
+    // allowing for class id mismatch
+    inline bool isSameIOPrototype(const ItemDescriptor &r) const { return ioProto_ == r.ioProto_; }
+
+  protected:
+    virtual bool isEqual(const ItemDescriptor &) const;
+
+  private:
+    ClassId classId_;
+    std::string ioProto_;
+    std::pair<std::string, std::string> nameCat_;
+  };
+}  // namespace gs
+
+#endif  // GENERS_ITEMDESCRIPTOR_HH_
diff --git a/Alignment/Geners/interface/ItemLocation.hh b/Alignment/Geners/interface/ItemLocation.hh
index 2deef11395f5a..10f2e9a059b2e 100644
--- a/Alignment/Geners/interface/ItemLocation.hh
+++ b/Alignment/Geners/interface/ItemLocation.hh
@@ -1,52 +1,43 @@
 #ifndef GENERS_ITEMLOCATION_HH_
 #define GENERS_ITEMLOCATION_HH_
 
-#include <string>
 #include <iostream>
+#include <string>
 
 #include "Alignment/Geners/interface/ClassId.hh"
 
 namespace gs {
-    class ItemLocation
-    {
-    public:
-        inline ItemLocation(std::streampos pos, const char* URI,
-                            const char* cachedItemURI=0)
-            : pos_(pos),
-              URI_(URI ? URI : ""),
-              cachedItemURI_(cachedItemURI ? cachedItemURI : "") {}
-
-        inline std::streampos streamPosition() const {return pos_;}
-        inline const std::string& URI() const {return URI_;}
-        inline const std::string& cachedItemURI() const
-           {return cachedItemURI_;}
-
-        inline void setStreamPosition(std::streampos pos) {pos_ = pos;}
-        inline void setURI(const char* newURI)
-           {URI_ = newURI ? newURI : "";}
-        inline void setCachedItemURI(const char* newURI)
-           {cachedItemURI_ = newURI ? newURI : "";}
-
-        bool operator==(const ItemLocation& r) const;
-        inline bool operator!=(const ItemLocation& r) const
-            {return !(*this == r);}
-
-        // Methods related to I/O
-        inline ClassId classId() const {return ClassId(*this);}
-        bool write(std::ostream& of) const;
-
-        static inline const char* classname() {return "gs::ItemLocation";}
-        static inline unsigned version() {return 1;}
-        static ItemLocation* read(const ClassId& id, std::istream& in);
-
-    private:
-        ItemLocation();
-
-        std::streampos pos_;        
-        std::string URI_;
-        std::string cachedItemURI_;
-    };
-}
-
-#endif // GENERS_ITEMLOCATION_HH_
+  class ItemLocation {
+  public:
+    inline ItemLocation(std::streampos pos, const char *URI, const char *cachedItemURI = nullptr)
+        : pos_(pos), URI_(URI ? URI : ""), cachedItemURI_(cachedItemURI ? cachedItemURI : "") {}
+
+    inline std::streampos streamPosition() const { return pos_; }
+    inline const std::string &URI() const { return URI_; }
+    inline const std::string &cachedItemURI() const { return cachedItemURI_; }
+
+    inline void setStreamPosition(std::streampos pos) { pos_ = pos; }
+    inline void setURI(const char *newURI) { URI_ = newURI ? newURI : ""; }
+    inline void setCachedItemURI(const char *newURI) { cachedItemURI_ = newURI ? newURI : ""; }
+
+    bool operator==(const ItemLocation &r) const;
+    inline bool operator!=(const ItemLocation &r) const { return !(*this == r); }
+
+    // Methods related to I/O
+    inline ClassId classId() const { return ClassId(*this); }
+    bool write(std::ostream &of) const;
+
+    static inline const char *classname() { return "gs::ItemLocation"; }
+    static inline unsigned version() { return 1; }
+    static ItemLocation *read(const ClassId &id, std::istream &in);
+
+  private:
+    ItemLocation() = delete;
+
+    std::streampos pos_;
+    std::string URI_;
+    std::string cachedItemURI_;
+  };
+}  // namespace gs
 
+#endif  // GENERS_ITEMLOCATION_HH_
diff --git a/Alignment/Geners/interface/MultiFileArchive.hh b/Alignment/Geners/interface/MultiFileArchive.hh
index aa8c4eaae2030..a040ef4a6b935 100644
--- a/Alignment/Geners/interface/MultiFileArchive.hh
+++ b/Alignment/Geners/interface/MultiFileArchive.hh
@@ -7,71 +7,68 @@
 #include "Alignment/Geners/interface/CatalogIO.hh"
 
 namespace gs {
-    class MultiFileArchive : public BinaryArchiveBase
-    {
-    public:
-        // See the note inside the "BinaryArchiveBase.hh" header
-        // for the meaning of the "mode" argument
-        MultiFileArchive(const char* basename, const char* mode,
-                         const char* annotation = 0,
-                         unsigned typicalFileSizeInMB = 1000U,
-                         unsigned dataFileBufferSize = 1048576U,
-                         unsigned catalogFileBufferSize = 131072U);
-        virtual ~MultiFileArchive();
+  class MultiFileArchive : public BinaryArchiveBase {
+  public:
+    // See the note inside the "BinaryArchiveBase.hh" header
+    // for the meaning of the "mode" argument
+    MultiFileArchive(const char *basename,
+                     const char *mode,
+                     const char *annotation = nullptr,
+                     unsigned typicalFileSizeInMB = 1000U,
+                     unsigned dataFileBufferSize = 1048576U,
+                     unsigned catalogFileBufferSize = 131072U);
+    ~MultiFileArchive() override;
 
-        void flush();
+    void flush() override;
 
-    private:
-        void writeCatalog();
-        void openWriteStream();
-        void setupWriteStream();
-        void updateReadStream(const std::string& uri);
-        void releaseBuffers();
+  private:
+    void writeCatalog();
+    void openWriteStream();
+    void setupWriteStream();
+    void updateReadStream(const std::string &uri);
+    void releaseBuffers();
 
-        template<class Catalog>
-        void readCatalog()
-        {
-            assert(!catalog());
-            unsigned compressionMode;
-            setCatalog(readBinaryCatalog<Catalog>(
-                           catStream_, &compressionMode, &catalogMergeLevel_,
-                           &catalogAnnotations_, true));
-            assert(catalog());
-            setCompressionMode(compressionMode);
-        }
+    template <class Catalog>
+    void readCatalog() {
+      assert(!catalog());
+      unsigned compressionMode;
+      setCatalog(
+          readBinaryCatalog<Catalog>(catStream_, &compressionMode, &catalogMergeLevel_, &catalogAnnotations_, true));
+      assert(catalog());
+      setCompressionMode(compressionMode);
+    }
 
-        // The following methods have to be overriden from the base
-        std::ostream& plainOutputStream();
-        std::istream& plainInputStream(unsigned long long id,
-                                       unsigned* compressionCode,
-                                       unsigned long long* length);
+    // The following methods have to be overriden from the base
+    std::ostream &plainOutputStream() override;
+    std::istream &plainInputStream(unsigned long long id,
+                                   unsigned *compressionCode,
+                                   unsigned long long *length) override;
 
-        unsigned long long addToCatalog(
-            const AbsRecord& record, unsigned compressionCode,
-            unsigned long long itemLength);
+    unsigned long long addToCatalog(const AbsRecord &record,
+                                    unsigned compressionCode,
+                                    unsigned long long itemLength) override;
 
-        char* filebuf_;
-        char* readbuf_;
-        char* catabuf_;
-        std::string annotation_;
-        std::string catalogFileName_;
-        std::string writeFileName_;
-        std::string writeFileURI_;
-        std::string readFileName_;
-        std::string readFileURI_;
-        std::fstream writeStream_;
-        std::fstream catStream_;
-        std::fstream separateReadStream_;
-        std::streampos lastpos_;
-        std::streampos jumppos_;
-        std::streampos maxpos_;
-        std::vector<std::string> catalogAnnotations_;
-        unsigned long writeFileNumber_;
-        unsigned catalogMergeLevel_;
-        bool annotationsMerged_;
-        bool streamFlushed_;
-    };
-}
-
-#endif // GENERS_MULTIFILEARCHIVE_HH_
+    char *filebuf_;
+    char *readbuf_;
+    char *catabuf_;
+    std::string annotation_;
+    std::string catalogFileName_;
+    std::string writeFileName_;
+    std::string writeFileURI_;
+    std::string readFileName_;
+    std::string readFileURI_;
+    std::fstream writeStream_;
+    std::fstream catStream_;
+    std::fstream separateReadStream_;
+    std::streampos lastpos_;
+    std::streampos jumppos_;
+    std::streampos maxpos_;
+    std::vector<std::string> catalogAnnotations_;
+    unsigned long writeFileNumber_;
+    unsigned catalogMergeLevel_;
+    bool annotationsMerged_;
+    bool streamFlushed_;
+  };
+}  // namespace gs
 
+#endif  // GENERS_MULTIFILEARCHIVE_HH_
diff --git a/Alignment/Geners/interface/ProcessItem.hh b/Alignment/Geners/interface/ProcessItem.hh
index 69e2621b1ccfb..26d2297427fc9 100644
--- a/Alignment/Geners/interface/ProcessItem.hh
+++ b/Alignment/Geners/interface/ProcessItem.hh
@@ -30,32 +30,27 @@
 #include "Alignment/Geners/interface/Int2Type.hh"
 
 namespace gs {
-    // Special types to designate stages in container processing
-    struct InContainerHeader 
-    {
-        static const char* stage() {return "InContainerHeader";}
-    };
+  // Special types to designate stages in container processing
+  struct InContainerHeader {
+    static const char *stage() { return "InContainerHeader"; }
+  };
 
-    struct InContainerSize
-    {
-        static const char* stage() {return "InContainerSize";}
-    };
+  struct InContainerSize {
+    static const char *stage() { return "InContainerSize"; }
+  };
 
-    struct InContainerFooter
-    {
-        static const char* stage() {return "InContainerFooter";}
-    };
+  struct InContainerFooter {
+    static const char *stage() { return "InContainerFooter"; }
+  };
 
-    struct InContainerCycle
-    {
-        static const char* stage() {return "InContainerCycle";}
-    };
+  struct InContainerCycle {
+    static const char *stage() { return "InContainerCycle"; }
+  };
 
-    struct InPODArray
-    {
-        static const char* stage() {return "InPODArray";}
-    };
-}
+  struct InPODArray {
+    static const char *stage() { return "InPODArray"; }
+  };
+}  // namespace gs
 
 // I am not aware of an easy way to have both const and non-const
 // version of a template defined in the same code fragment. This is
@@ -81,8 +76,8 @@ namespace gs {
 #undef GENERS_CONTAINER_ITERATION_PROC
 #endif
 
-#ifdef GENERS_GENERIC_ITEM_PROCESSOR 
-#undef GENERS_GENERIC_ITEM_PROCESSOR 
+#ifdef GENERS_GENERIC_ITEM_PROCESSOR
+#undef GENERS_GENERIC_ITEM_PROCESSOR
 #endif
 
 #ifdef GENERS_GENERATE_CONST_IO_PROCESSOR
@@ -98,322 +93,185 @@ namespace gs {
 #endif
 
 namespace gs {
-    namespace Private {
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2,
-            int Mode
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR ;
-    }
-}
+  namespace Private {
+    template <template <typename, typename, typename, typename> class Visitor,
+              typename T,
+              typename Arg1,
+              typename Arg2,
+              int Mode>
+    struct GENERS_GENERATED_IO_PROCESSOR;
+  }
+}  // namespace gs
 
 namespace gs {
-    template
-    <
-        template <typename, typename, typename, typename> class Visitor,
-        typename T,
-        typename Arg1,
-        typename Arg2
-    >
-    bool GENERS_GENERIC_ITEM_PROCESSOR (GENERS_GENERATED_IO_CONSTNESS T& obj,
-                               Arg1& a1, Arg2* p2, const bool processClassId)
-    {
-        // The following works like a compile-time "switch" statement.
-        // This switch is too high level to be implemented using types,
-        // so we must do something like what is coded below.
-        typedef IOTraits<T> M;
-        return Private:: GENERS_GENERATED_IO_PROCESSOR <Visitor, T, Arg1, Arg2,
-            M::Signature & (M::ISPOD | 
-                            M::ISSTDCONTAINER | 
-                            M::ISWRITABLE | 
-                            M::ISPOINTER |
-                            M::ISSHAREDPTR |
-                            M::ISIOPTR |
-                            M::ISPAIR |
-                            M::ISSTRING |
-                            M::ISTUPLE |
-                            M::ISEXTERNAL
-                )>::process(obj, a1, p2, processClassId);
-    }
-}
+  template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+  bool GENERS_GENERIC_ITEM_PROCESSOR(GENERS_GENERATED_IO_CONSTNESS T &obj,
+                                     Arg1 &a1,
+                                     Arg2 *p2,
+                                     const bool processClassId) {
+    // The following works like a compile-time "switch" statement.
+    // This switch is too high level to be implemented using types,
+    // so we must do something like what is coded below.
+    typedef IOTraits<T> M;
+    return Private::GENERS_GENERATED_IO_PROCESSOR<
+        Visitor,
+        T,
+        Arg1,
+        Arg2,
+        M::Signature &(M::ISPOD | M::ISSTDCONTAINER | M::ISWRITABLE | M::ISPOINTER | M::ISSHAREDPTR | M::ISIOPTR |
+                       M::ISPAIR | M::ISSTRING | M::ISTUPLE | M::ISEXTERNAL)>::process(obj, a1, p2, processClassId);
+  }
+}  // namespace gs
 
 namespace gs {
-    namespace Private {
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_CONTAINER_ITERATION_PROC
-        {
+  namespace Private {
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_CONTAINER_ITERATION_PROC {
 #ifdef GENERS_GENERATE_CONST_IO_PROCESSOR
-            static bool process(const T& v, Arg1& a1, Arg2* p2, std::size_t)
-            {
-                bool itemStatus = true;
-                typename T::const_iterator end = v.end();
-                for (typename T::const_iterator it = v.begin();
-                     it != end && itemStatus; ++it)
-                    itemStatus = process_const_item<Visitor>(*it,a1,p2,false);
-                return itemStatus;
-            }
+      static bool process(const T &v, Arg1 &a1, Arg2 *p2, std::size_t) {
+        bool itemStatus = true;
+        typename T::const_iterator end = v.end();
+        for (typename T::const_iterator it = v.begin(); it != end && itemStatus; ++it)
+          itemStatus = process_const_item<Visitor>(*it, a1, p2, false);
+        return itemStatus;
+      }
 #else
-            static bool process(T& obj, Arg1& a1, Arg2* p2,
-                                const std::size_t newSize)
-            {
-                bool itemStatus = true;
-                for (std::size_t i=0; i<newSize && itemStatus; ++i)
-                    itemStatus = Visitor<Arg1,Arg2,T,InContainerCycle>::process(
-                        obj, a1, p2, i);
-                return itemStatus;
-            }
+      static bool process(T &obj, Arg1 &a1, Arg2 *p2, const std::size_t newSize) {
+        bool itemStatus = true;
+        for (std::size_t i = 0; i < newSize && itemStatus; ++i)
+          itemStatus = Visitor<Arg1, Arg2, T, InContainerCycle>::process(obj, a1, p2, i);
+        return itemStatus;
+      }
 #endif
-        };
-
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISPOD>
-        {
-            // POD-processing visitor
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, const bool processClassId)
-            {
-                return Visitor<Arg1,Arg2,T,Int2Type<IOTraits<int>::ISPOD> >::process(
-                    obj, a1, p2, processClassId);
-            }
-        };
-
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISWRITABLE>
-        {
-            // Processor of writable objects
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, const bool processClassId)
-            {
-                return Visitor<Arg1,Arg2,T,Int2Type<IOTraits<int>::ISWRITABLE> >::process(
-                    obj, a1, p2, processClassId);
-            }
-        };
-
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISPOINTER>
-        {
-            // There is not enough info here to decide how the pointer
-            // should be managed. Therefore, just call the visitor.
-            // However, turn on the class id writing because pointer
-            // usually signifies polymorphic class.
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, bool /* processClassId */)
-            {
-                return Visitor<Arg1,Arg2,T,Int2Type<IOTraits<int>::ISPOINTER> >::process(
-                    obj, a1, p2, true);
-            }
-        };
-
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISIOPTR>
-        {
-            // There is not enough info here to decide how the pointer
-            // should be managed. Therefore, just call the visitor.
-            // In this particular case, we are passing the "processClassId"
-            // value as is.
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, const bool processClassId)
-            {
-                return Visitor<Arg1,Arg2,typename T::element_type*,
-                               Int2Type<IOTraits<int>::ISPOINTER> >::process(
-                                   obj.getIOReference(), a1, p2, processClassId);
-            }
-        };
-
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISSHAREDPTR>
-        {
-            // There is not enough info here to decide how the shared pointer
-            // should be managed. Therefore, just call the visitor.
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, bool /* processClassId */)
-            {
-                return Visitor<Arg1,Arg2,T,Int2Type<IOTraits<int>::ISSHAREDPTR> >::process(
-                    obj, a1, p2, true);
-            }
-        };
-
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISPAIR>
-        {
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, const bool processClassId)
-            {
-                return Visitor<Arg1,Arg2,T,Int2Type<IOTraits<int>::ISPAIR> >::process(
-                    obj, a1, p2, processClassId);
-            }
-        };
-
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISTUPLE>
-        {
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, const bool processClassId)
-            {
-                return Visitor<Arg1,Arg2,T,Int2Type<IOTraits<int>::ISTUPLE> >::process(
-                    obj, a1, p2, processClassId);
-            }
-        };
-
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISEXTERNAL>
-        {
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, const bool processClassId)
-            {
-                return Visitor<Arg1,Arg2,T,Int2Type<IOTraits<int>::ISEXTERNAL> >::process(
-                    obj, a1, p2, processClassId);
-            }
-        };
-
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISSTRING>
-        {
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, const bool processClassId)
-            {
-                return Visitor<Arg1,Arg2,T,Int2Type<IOTraits<int>::ISSTRING> >::process(
-                    obj, a1, p2, processClassId);
-            }
-        };
-
-        // Processing of containers which do not support "write",
-        // "read" or "restore"
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISSTDCONTAINER>
-        {
-        private:
-            // The following function will be fired on containers which
-            // store PODs contiguously
-            static bool process2(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                 Arg2* p2, const bool processClassId, Int2Type<true>)
-            {
-                return Visitor<Arg1,Arg2,T,InPODArray>::process(
-                    obj, a1, p2, processClassId);
-            }
-
-            // The following function will be fired on containers which
-            // do not not store PODs contiguously
-            static bool process2(GENERS_GENERATED_IO_CONSTNESS T& v, Arg1& a1,
-                                 Arg2* p2, const bool processClassId, Int2Type<false>)
-            {
-                GENERS_GENERATED_IO_CONSTNESS std::size_t sz = v.size();
-                return Visitor<Arg1,Arg2,T,InContainerSize>::process(
-                    sz, a1, p2, processClassId) && 
-                    GENERS_CONTAINER_ITERATION_PROC<Visitor,T,Arg1,Arg2>::process(
-                        v, a1, p2, sz) && 
-                    sz == v.size();
-            }
-
-        public:
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, const bool processClassId)
-            {
-                if (Visitor<Arg1,Arg2,T,InContainerHeader>::process(
-                        obj, a1, p2, processClassId))
-                {
-                    // Do generic container processing in case the container
-                    // either does not have contiguous storage or its items
-                    // are non-PODs. Otherwise do fast processing.
-                    bool bodyStatus = true, footerStatus = true;
-                    try
-                    {
-                        bodyStatus = process2(obj, a1, p2, processClassId,
-                                 Int2Type<IOTraits<typename T::value_type>::IsPOD &&
-                                 IOTraits<T>::IsContiguous>());
-                    }
-                    catch (...) 
-                    {
-                        footerStatus = Visitor<Arg1,Arg2,T,InContainerFooter>::process(
-                            obj, a1, p2, processClassId);
-                        throw;
-                    }
-                    footerStatus = Visitor<Arg1,Arg2,T,InContainerFooter>::process(
-                        obj, a1, p2, processClassId);
-                    return bodyStatus && footerStatus;
-                }
-                else
-                    return false;
-            }
-        };
-    }
-}
+    };
+
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISPOD> {
+      // POD-processing visitor
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, const bool processClassId) {
+        return Visitor<Arg1, Arg2, T, Int2Type<IOTraits<int>::ISPOD>>::process(obj, a1, p2, processClassId);
+      }
+    };
+
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISWRITABLE> {
+      // Processor of writable objects
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, const bool processClassId) {
+        return Visitor<Arg1, Arg2, T, Int2Type<IOTraits<int>::ISWRITABLE>>::process(obj, a1, p2, processClassId);
+      }
+    };
+
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISPOINTER> {
+      // There is not enough info here to decide how the pointer
+      // should be managed. Therefore, just call the visitor.
+      // However, turn on the class id writing because pointer
+      // usually signifies polymorphic class.
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, bool /* processClassId */) {
+        return Visitor<Arg1, Arg2, T, Int2Type<IOTraits<int>::ISPOINTER>>::process(obj, a1, p2, true);
+      }
+    };
+
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISIOPTR> {
+      // There is not enough info here to decide how the pointer
+      // should be managed. Therefore, just call the visitor.
+      // In this particular case, we are passing the "processClassId"
+      // value as is.
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, const bool processClassId) {
+        return Visitor<Arg1, Arg2, typename T::element_type *, Int2Type<IOTraits<int>::ISPOINTER>>::process(
+            obj.getIOReference(), a1, p2, processClassId);
+      }
+    };
+
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISSHAREDPTR> {
+      // There is not enough info here to decide how the shared pointer
+      // should be managed. Therefore, just call the visitor.
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, bool /* processClassId */) {
+        return Visitor<Arg1, Arg2, T, Int2Type<IOTraits<int>::ISSHAREDPTR>>::process(obj, a1, p2, true);
+      }
+    };
+
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISPAIR> {
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, const bool processClassId) {
+        return Visitor<Arg1, Arg2, T, Int2Type<IOTraits<int>::ISPAIR>>::process(obj, a1, p2, processClassId);
+      }
+    };
+
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISTUPLE> {
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, const bool processClassId) {
+        return Visitor<Arg1, Arg2, T, Int2Type<IOTraits<int>::ISTUPLE>>::process(obj, a1, p2, processClassId);
+      }
+    };
+
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISEXTERNAL> {
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, const bool processClassId) {
+        return Visitor<Arg1, Arg2, T, Int2Type<IOTraits<int>::ISEXTERNAL>>::process(obj, a1, p2, processClassId);
+      }
+    };
+
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISSTRING> {
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, const bool processClassId) {
+        return Visitor<Arg1, Arg2, T, Int2Type<IOTraits<int>::ISSTRING>>::process(obj, a1, p2, processClassId);
+      }
+    };
+
+    // Processing of containers which do not support "write",
+    // "read" or "restore"
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISSTDCONTAINER> {
+    private:
+      // The following function will be fired on containers which
+      // store PODs contiguously
+      static bool process2(
+          GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, const bool processClassId, Int2Type<true>) {
+        return Visitor<Arg1, Arg2, T, InPODArray>::process(obj, a1, p2, processClassId);
+      }
+
+      // The following function will be fired on containers which
+      // do not not store PODs contiguously
+      static bool process2(
+          GENERS_GENERATED_IO_CONSTNESS T &v, Arg1 &a1, Arg2 *p2, const bool processClassId, Int2Type<false>) {
+        GENERS_GENERATED_IO_CONSTNESS std::size_t sz = v.size();
+        return Visitor<Arg1, Arg2, T, InContainerSize>::process(sz, a1, p2, processClassId) &&
+               GENERS_CONTAINER_ITERATION_PROC<Visitor, T, Arg1, Arg2>::process(v, a1, p2, sz) && sz == v.size();
+      }
+
+    public:
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, const bool processClassId) {
+        if (Visitor<Arg1, Arg2, T, InContainerHeader>::process(obj, a1, p2, processClassId)) {
+          // Do generic container processing in case the container
+          // either does not have contiguous storage or its items
+          // are non-PODs. Otherwise do fast processing.
+          bool bodyStatus = true, footerStatus = true;
+          try {
+            bodyStatus = process2(obj,
+                                  a1,
+                                  p2,
+                                  processClassId,
+                                  Int2Type < IOTraits<typename T::value_type>::IsPOD && IOTraits<T>::IsContiguous > ());
+          } catch (...) {
+            footerStatus = Visitor<Arg1, Arg2, T, InContainerFooter>::process(obj, a1, p2, processClassId);
+            throw;
+          }
+          footerStatus = Visitor<Arg1, Arg2, T, InContainerFooter>::process(obj, a1, p2, processClassId);
+          return bodyStatus && footerStatus;
+        } else
+          return false;
+      }
+    };
+  }  // namespace Private
+}  // namespace gs
 
 #undef GENERS_GENERATED_IO_PROCESSOR
 #undef GENERS_GENERATED_IO_CONSTNESS
 #undef GENERS_CONTAINER_ITERATION_PROC
-#undef GENERS_GENERIC_ITEM_PROCESSOR 
-
+#undef GENERS_GENERIC_ITEM_PROCESSOR
 
 #define GENERS_GENERATE_CONST_IO_PROCESSOR
 
@@ -432,8 +290,8 @@ namespace gs {
 #undef GENERS_CONTAINER_ITERATION_PROC
 #endif
 
-#ifdef GENERS_GENERIC_ITEM_PROCESSOR 
-#undef GENERS_GENERIC_ITEM_PROCESSOR 
+#ifdef GENERS_GENERIC_ITEM_PROCESSOR
+#undef GENERS_GENERIC_ITEM_PROCESSOR
 #endif
 
 #ifdef GENERS_GENERATE_CONST_IO_PROCESSOR
@@ -449,324 +307,186 @@ namespace gs {
 #endif
 
 namespace gs {
-    namespace Private {
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2,
-            int Mode
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR ;
-    }
-}
+  namespace Private {
+    template <template <typename, typename, typename, typename> class Visitor,
+              typename T,
+              typename Arg1,
+              typename Arg2,
+              int Mode>
+    struct GENERS_GENERATED_IO_PROCESSOR;
+  }
+}  // namespace gs
 
 namespace gs {
-    template
-    <
-        template <typename, typename, typename, typename> class Visitor,
-        typename T,
-        typename Arg1,
-        typename Arg2
-    >
-    bool GENERS_GENERIC_ITEM_PROCESSOR (GENERS_GENERATED_IO_CONSTNESS T& obj,
-                               Arg1& a1, Arg2* p2, const bool processClassId)
-    {
-        // The following works like a compile-time "switch" statement.
-        // This switch is too high level to be implemented using types,
-        // so we must do something like what is coded below.
-        typedef IOTraits<T> M;
-        return Private:: GENERS_GENERATED_IO_PROCESSOR <Visitor, T, Arg1, Arg2,
-            M::Signature & (M::ISPOD | 
-                            M::ISSTDCONTAINER | 
-                            M::ISWRITABLE | 
-                            M::ISPOINTER |
-                            M::ISSHAREDPTR |
-                            M::ISIOPTR |
-                            M::ISPAIR |
-                            M::ISSTRING |
-                            M::ISTUPLE |
-                            M::ISEXTERNAL
-                )>::process(obj, a1, p2, processClassId);
-    }
-}
+  template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+  bool GENERS_GENERIC_ITEM_PROCESSOR(GENERS_GENERATED_IO_CONSTNESS T &obj,
+                                     Arg1 &a1,
+                                     Arg2 *p2,
+                                     const bool processClassId) {
+    // The following works like a compile-time "switch" statement.
+    // This switch is too high level to be implemented using types,
+    // so we must do something like what is coded below.
+    typedef IOTraits<T> M;
+    return Private::GENERS_GENERATED_IO_PROCESSOR<
+        Visitor,
+        T,
+        Arg1,
+        Arg2,
+        M::Signature &(M::ISPOD | M::ISSTDCONTAINER | M::ISWRITABLE | M::ISPOINTER | M::ISSHAREDPTR | M::ISIOPTR |
+                       M::ISPAIR | M::ISSTRING | M::ISTUPLE | M::ISEXTERNAL)>::process(obj, a1, p2, processClassId);
+  }
+}  // namespace gs
 
 namespace gs {
-    namespace Private {
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_CONTAINER_ITERATION_PROC
-        {
+  namespace Private {
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_CONTAINER_ITERATION_PROC {
 #ifdef GENERS_GENERATE_CONST_IO_PROCESSOR
-            static bool process(const T& v, Arg1& a1, Arg2* p2, std::size_t)
-            {
-                bool itemStatus = true;
-                typename T::const_iterator end = v.end();
-                for (typename T::const_iterator it = v.begin();
-                     it != end && itemStatus; ++it)
-                    itemStatus = process_const_item<Visitor>(*it,a1,p2,false);
-                return itemStatus;
-            }
+      static bool process(const T &v, Arg1 &a1, Arg2 *p2, std::size_t) {
+        bool itemStatus = true;
+        typename T::const_iterator end = v.end();
+        for (typename T::const_iterator it = v.begin(); it != end && itemStatus; ++it)
+          itemStatus = process_const_item<Visitor>(*it, a1, p2, false);
+        return itemStatus;
+      }
 #else
-            static bool process(T& obj, Arg1& a1, Arg2* p2,
-                                const std::size_t newSize)
-            {
-                bool itemStatus = true;
-                for (std::size_t i=0; i<newSize && itemStatus; ++i)
-                    itemStatus = Visitor<Arg1,Arg2,T,InContainerCycle>::process(
-                        obj, a1, p2, i);
-                return itemStatus;
-            }
+      static bool process(T &obj, Arg1 &a1, Arg2 *p2, const std::size_t newSize) {
+        bool itemStatus = true;
+        for (std::size_t i = 0; i < newSize && itemStatus; ++i)
+          itemStatus = Visitor<Arg1, Arg2, T, InContainerCycle>::process(obj, a1, p2, i);
+        return itemStatus;
+      }
 #endif
-        };
-
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISPOD>
-        {
-            // POD-processing visitor
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, const bool processClassId)
-            {
-                return Visitor<Arg1,Arg2,T,Int2Type<IOTraits<int>::ISPOD> >::process(
-                    obj, a1, p2, processClassId);
-            }
-        };
-
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISWRITABLE>
-        {
-            // Processor of writable objects
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, const bool processClassId)
-            {
-                return Visitor<Arg1,Arg2,T,Int2Type<IOTraits<int>::ISWRITABLE> >::process(
-                    obj, a1, p2, processClassId);
-            }
-        };
-
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISPOINTER>
-        {
-            // There is not enough info here to decide how the pointer
-            // should be managed. Therefore, just call the visitor.
-            // However, turn on the class id writing because pointer
-            // usually signifies polymorphic class.
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, bool /* processClassId */)
-            {
-                return Visitor<Arg1,Arg2,T,Int2Type<IOTraits<int>::ISPOINTER> >::process(
-                    obj, a1, p2, true);
-            }
-        };
-
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISIOPTR>
-        {
-            // There is not enough info here to decide how the pointer
-            // should be managed. Therefore, just call the visitor.
-            // In this particular case, we are passing the "processClassId"
-            // value as is.
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, const bool processClassId)
-            {
-                return Visitor<Arg1,Arg2,typename T::element_type*,
-                               Int2Type<IOTraits<int>::ISPOINTER> >::process(
-                                   obj.getIOReference(), a1, p2, processClassId);
-            }
-        };
-
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISSHAREDPTR>
-        {
-            // There is not enough info here to decide how the shared pointer
-            // should be managed. Therefore, just call the visitor.
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, bool /* processClassId */)
-            {
-                return Visitor<Arg1,Arg2,T,Int2Type<IOTraits<int>::ISSHAREDPTR> >::process(
-                    obj, a1, p2, true);
-            }
-        };
-
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISPAIR>
-        {
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, const bool processClassId)
-            {
-                return Visitor<Arg1,Arg2,T,Int2Type<IOTraits<int>::ISPAIR> >::process(
-                    obj, a1, p2, processClassId);
-            }
-        };
-
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISTUPLE>
-        {
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, const bool processClassId)
-            {
-                return Visitor<Arg1,Arg2,T,Int2Type<IOTraits<int>::ISTUPLE> >::process(
-                    obj, a1, p2, processClassId);
-            }
-        };
-
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISEXTERNAL>
-        {
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, const bool processClassId)
-            {
-                return Visitor<Arg1,Arg2,T,Int2Type<IOTraits<int>::ISEXTERNAL> >::process(
-                    obj, a1, p2, processClassId);
-            }
-        };
-
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISSTRING>
-        {
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, const bool processClassId)
-            {
-                return Visitor<Arg1,Arg2,T,Int2Type<IOTraits<int>::ISSTRING> >::process(
-                    obj, a1, p2, processClassId);
-            }
-        };
-
-        // Processing of containers which do not support "write",
-        // "read" or "restore"
-        template
-        <
-            template <typename, typename, typename, typename> class Visitor,
-            typename T,
-            typename Arg1,
-            typename Arg2
-        >
-        struct GENERS_GENERATED_IO_PROCESSOR <Visitor,T,Arg1,Arg2,IOTraits<int>::ISSTDCONTAINER>
-        {
-        private:
-            // The following function will be fired on containers which
-            // store PODs contiguously
-            static bool process2(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                 Arg2* p2, const bool processClassId, Int2Type<true>)
-            {
-                return Visitor<Arg1,Arg2,T,InPODArray>::process(
-                    obj, a1, p2, processClassId);
-            }
-
-            // The following function will be fired on containers which
-            // do not not store PODs contiguously
-            static bool process2(GENERS_GENERATED_IO_CONSTNESS T& v, Arg1& a1,
-                                 Arg2* p2, const bool processClassId, Int2Type<false>)
-            {
-                GENERS_GENERATED_IO_CONSTNESS std::size_t sz = v.size();
-                return Visitor<Arg1,Arg2,T,InContainerSize>::process(
-                    sz, a1, p2, processClassId) && 
-                    GENERS_CONTAINER_ITERATION_PROC<Visitor,T,Arg1,Arg2>::process(
-                        v, a1, p2, sz) && 
-                    sz == v.size();
-            }
-
-        public:
-            static bool process(GENERS_GENERATED_IO_CONSTNESS T& obj, Arg1& a1,
-                                Arg2* p2, const bool processClassId)
-            {
-                if (Visitor<Arg1,Arg2,T,InContainerHeader>::process(
-                        obj, a1, p2, processClassId))
-                {
-                    // Do generic container processing in case the container
-                    // either does not have contiguous storage or its items
-                    // are non-PODs. Otherwise do fast processing.
-                    bool bodyStatus = true, footerStatus = true;
-                    try
-                    {
-                        bodyStatus = process2(obj, a1, p2, processClassId,
-                                 Int2Type<IOTraits<typename T::value_type>::IsPOD &&
-                                 IOTraits<T>::IsContiguous>());
-                    }
-                    catch (...) 
-                    {
-                        footerStatus = Visitor<Arg1,Arg2,T,InContainerFooter>::process(
-                            obj, a1, p2, processClassId);
-                        throw;
-                    }
-                    footerStatus = Visitor<Arg1,Arg2,T,InContainerFooter>::process(
-                        obj, a1, p2, processClassId);
-                    return bodyStatus && footerStatus;
-                }
-                else
-                    return false;
-            }
-        };
-    }
-}
+    };
+
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISPOD> {
+      // POD-processing visitor
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, const bool processClassId) {
+        return Visitor<Arg1, Arg2, T, Int2Type<IOTraits<int>::ISPOD>>::process(obj, a1, p2, processClassId);
+      }
+    };
+
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISWRITABLE> {
+      // Processor of writable objects
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, const bool processClassId) {
+        return Visitor<Arg1, Arg2, T, Int2Type<IOTraits<int>::ISWRITABLE>>::process(obj, a1, p2, processClassId);
+      }
+    };
+
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISPOINTER> {
+      // There is not enough info here to decide how the pointer
+      // should be managed. Therefore, just call the visitor.
+      // However, turn on the class id writing because pointer
+      // usually signifies polymorphic class.
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, bool /* processClassId */) {
+        return Visitor<Arg1, Arg2, T, Int2Type<IOTraits<int>::ISPOINTER>>::process(obj, a1, p2, true);
+      }
+    };
+
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISIOPTR> {
+      // There is not enough info here to decide how the pointer
+      // should be managed. Therefore, just call the visitor.
+      // In this particular case, we are passing the "processClassId"
+      // value as is.
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, const bool processClassId) {
+        return Visitor<Arg1, Arg2, typename T::element_type *, Int2Type<IOTraits<int>::ISPOINTER>>::process(
+            obj.getIOReference(), a1, p2, processClassId);
+      }
+    };
+
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISSHAREDPTR> {
+      // There is not enough info here to decide how the shared pointer
+      // should be managed. Therefore, just call the visitor.
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, bool /* processClassId */) {
+        return Visitor<Arg1, Arg2, T, Int2Type<IOTraits<int>::ISSHAREDPTR>>::process(obj, a1, p2, true);
+      }
+    };
+
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISPAIR> {
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, const bool processClassId) {
+        return Visitor<Arg1, Arg2, T, Int2Type<IOTraits<int>::ISPAIR>>::process(obj, a1, p2, processClassId);
+      }
+    };
+
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISTUPLE> {
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, const bool processClassId) {
+        return Visitor<Arg1, Arg2, T, Int2Type<IOTraits<int>::ISTUPLE>>::process(obj, a1, p2, processClassId);
+      }
+    };
+
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISEXTERNAL> {
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, const bool processClassId) {
+        return Visitor<Arg1, Arg2, T, Int2Type<IOTraits<int>::ISEXTERNAL>>::process(obj, a1, p2, processClassId);
+      }
+    };
+
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISSTRING> {
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, const bool processClassId) {
+        return Visitor<Arg1, Arg2, T, Int2Type<IOTraits<int>::ISSTRING>>::process(obj, a1, p2, processClassId);
+      }
+    };
+
+    // Processing of containers which do not support "write",
+    // "read" or "restore"
+    template <template <typename, typename, typename, typename> class Visitor, typename T, typename Arg1, typename Arg2>
+    struct GENERS_GENERATED_IO_PROCESSOR<Visitor, T, Arg1, Arg2, IOTraits<int>::ISSTDCONTAINER> {
+    private:
+      // The following function will be fired on containers which
+      // store PODs contiguously
+      static bool process2(
+          GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, const bool processClassId, Int2Type<true>) {
+        return Visitor<Arg1, Arg2, T, InPODArray>::process(obj, a1, p2, processClassId);
+      }
+
+      // The following function will be fired on containers which
+      // do not not store PODs contiguously
+      static bool process2(
+          GENERS_GENERATED_IO_CONSTNESS T &v, Arg1 &a1, Arg2 *p2, const bool processClassId, Int2Type<false>) {
+        GENERS_GENERATED_IO_CONSTNESS std::size_t sz = v.size();
+        return Visitor<Arg1, Arg2, T, InContainerSize>::process(sz, a1, p2, processClassId) &&
+               GENERS_CONTAINER_ITERATION_PROC<Visitor, T, Arg1, Arg2>::process(v, a1, p2, sz) && sz == v.size();
+      }
+
+    public:
+      static bool process(GENERS_GENERATED_IO_CONSTNESS T &obj, Arg1 &a1, Arg2 *p2, const bool processClassId) {
+        if (Visitor<Arg1, Arg2, T, InContainerHeader>::process(obj, a1, p2, processClassId)) {
+          // Do generic container processing in case the container
+          // either does not have contiguous storage or its items
+          // are non-PODs. Otherwise do fast processing.
+          bool bodyStatus = true, footerStatus = true;
+          try {
+            bodyStatus = process2(obj,
+                                  a1,
+                                  p2,
+                                  processClassId,
+                                  Int2Type < IOTraits<typename T::value_type>::IsPOD && IOTraits<T>::IsContiguous > ());
+          } catch (...) {
+            footerStatus = Visitor<Arg1, Arg2, T, InContainerFooter>::process(obj, a1, p2, processClassId);
+            throw;
+          }
+          footerStatus = Visitor<Arg1, Arg2, T, InContainerFooter>::process(obj, a1, p2, processClassId);
+          return bodyStatus && footerStatus;
+        } else
+          return false;
+      }
+    };
+  }  // namespace Private
+}  // namespace gs
 
 #undef GENERS_GENERATED_IO_PROCESSOR
 #undef GENERS_GENERATED_IO_CONSTNESS
 #undef GENERS_CONTAINER_ITERATION_PROC
-#undef GENERS_GENERIC_ITEM_PROCESSOR 
-
+#undef GENERS_GENERIC_ITEM_PROCESSOR
 
 #undef GENERS_GENERATE_CONST_IO_PROCESSOR
 
-#endif // GENERS_PROCESSITEM_HH_
-
+#endif  // GENERS_PROCESSITEM_HH_
diff --git a/Alignment/Geners/interface/Reference.hh b/Alignment/Geners/interface/Reference.hh
index cf37273ab8ef9..a1e1d17180671 100644
--- a/Alignment/Geners/interface/Reference.hh
+++ b/Alignment/Geners/interface/Reference.hh
@@ -1,102 +1,84 @@
 #ifndef GENERS_REFERENCE_HH_
 #define GENERS_REFERENCE_HH_
 
+#include "Alignment/Geners/interface/AbsReference.hh"
 #include "Alignment/Geners/interface/CPP11_auto_ptr.hh"
 #include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
-#include "Alignment/Geners/interface/AbsReference.hh"
 
 namespace gs {
-    template <typename T>
-    class Reference : public AbsReference
-    {
-    public:
-        inline Reference(AbsArchive& ar, const unsigned long long itemId)
-            : AbsReference(ar, ClassId::makeId<T>(), "gs::Single", itemId) {}
+  template <typename T>
+  class Reference : public AbsReference {
+  public:
+    inline Reference(AbsArchive &ar, const unsigned long long itemId)
+        : AbsReference(ar, ClassId::makeId<T>(), "gs::Single", itemId) {}
 
-        inline Reference(AbsArchive& ar, const char* name, const char* category)
-            :  AbsReference(ar, ClassId::makeId<T>(), "gs::Single",
-                            name, category) {}
+    inline Reference(AbsArchive &ar, const char *name, const char *category)
+        : AbsReference(ar, ClassId::makeId<T>(), "gs::Single", name, category) {}
 
 #ifndef SWIG
-        inline Reference(AbsArchive& ar, const std::string& name,
-                         const char* category)
-            :  AbsReference(ar, ClassId::makeId<T>(), "gs::Single",
-                            name.c_str(), category) {}
+    inline Reference(AbsArchive &ar, const std::string &name, const char *category)
+        : AbsReference(ar, ClassId::makeId<T>(), "gs::Single", name.c_str(), category) {}
 
-        inline Reference(AbsArchive& ar, const char* name,
-                         const std::string& category)
-            :  AbsReference(ar, ClassId::makeId<T>(), "gs::Single",
-                            name, category.c_str()) {}
+    inline Reference(AbsArchive &ar, const char *name, const std::string &category)
+        : AbsReference(ar, ClassId::makeId<T>(), "gs::Single", name, category.c_str()) {}
 
-        inline Reference(AbsArchive& ar, const std::string& name,
-                         const std::string& category)
-            :  AbsReference(ar, ClassId::makeId<T>(), "gs::Single",
-                            name.c_str(), category.c_str()) {}
+    inline Reference(AbsArchive &ar, const std::string &name, const std::string &category)
+        : AbsReference(ar, ClassId::makeId<T>(), "gs::Single", name.c_str(), category.c_str()) {}
 #endif
 
-        inline Reference(AbsArchive& ar, const SearchSpecifier& namePattern,
-                         const SearchSpecifier& categoryPattern)
-            :  AbsReference(ar, ClassId::makeId<T>(), "gs::Single",
-                            namePattern, categoryPattern) {}
+    inline Reference(AbsArchive &ar, const SearchSpecifier &namePattern, const SearchSpecifier &categoryPattern)
+        : AbsReference(ar, ClassId::makeId<T>(), "gs::Single", namePattern, categoryPattern) {}
 
-        // Methods to retrieve the item
-        void restore(unsigned long index, T* obj) const;
-        CPP11_auto_ptr<T> get(unsigned long index) const;
-        CPP11_shared_ptr<T> getShared(unsigned long index) const;
+    // Methods to retrieve the item
+    void restore(unsigned long index, T *obj) const;
+    CPP11_auto_ptr<T> get(unsigned long index) const;
+    CPP11_shared_ptr<T> getShared(unsigned long index) const;
 
-    private:
-        Reference();
-        T* getPtr(unsigned long index) const;
-    };
-}
+  private:
+    Reference() = delete;
+    T *getPtr(unsigned long index) const;
+  };
+}  // namespace gs
 
 #include "Alignment/Geners/interface/GenericIO.hh"
 
 namespace gs {
-    template <typename T>
-    inline void Reference<T>::restore(const unsigned long index, T* obj) const
-    {
-        const unsigned long long itemId = this->id(index);
-        assert(itemId);
-        restore_item(this->positionInputStream(itemId), obj, true);
-    }
-
-    template <typename T>
-    inline T* Reference<T>::getPtr(const unsigned long index) const
-    {
-        const unsigned long long itemId = this->id(index);
-        assert(itemId);
-        T* barePtr = 0;
-        std::vector<ClassId> state;
-        if (GenericReader<std::istream, std::vector<ClassId>, T*,
-            Int2Type<IOTraits<int>::ISNULLPOINTER> >::process(
-                barePtr, this->positionInputStream(itemId), &state, true))
-            assert(barePtr);
-        else
-        {
-            delete barePtr;
-            barePtr = 0;
-        }
-        if (!barePtr)
-            throw IOInvalidData("In gs::Reference::getPtr: "
-                                "failed to read in the object");
-        return barePtr;
-    }
-
-    template <typename T>
-    inline CPP11_auto_ptr<T> Reference<T>::get(const unsigned long index) const
-    {
-        return CPP11_auto_ptr<T>(getPtr(index));
+  template <typename T>
+  inline void Reference<T>::restore(const unsigned long index, T *obj) const {
+    const unsigned long long itemId = this->id(index);
+    assert(itemId);
+    restore_item(this->positionInputStream(itemId), obj, true);
+  }
+
+  template <typename T>
+  inline T *Reference<T>::getPtr(const unsigned long index) const {
+    const unsigned long long itemId = this->id(index);
+    assert(itemId);
+    T *barePtr = nullptr;
+    std::vector<ClassId> state;
+    if (GenericReader<std::istream, std::vector<ClassId>, T *, Int2Type<IOTraits<int>::ISNULLPOINTER>>::process(
+            barePtr, this->positionInputStream(itemId), &state, true))
+      assert(barePtr);
+    else {
+      delete barePtr;
+      barePtr = nullptr;
     }
-
-    template <typename T>
-    inline CPP11_shared_ptr<T> Reference<T>::getShared(
-        const unsigned long index) const
-    {
-        return CPP11_shared_ptr<T>(getPtr(index));
-    }
-}
-
-
-#endif // GENERS_REFERENCE_HH_
-
+    if (!barePtr)
+      throw IOInvalidData(
+          "In gs::Reference::getPtr: "
+          "failed to read in the object");
+    return barePtr;
+  }
+
+  template <typename T>
+  inline CPP11_auto_ptr<T> Reference<T>::get(const unsigned long index) const {
+    return CPP11_auto_ptr<T>(getPtr(index));
+  }
+
+  template <typename T>
+  inline CPP11_shared_ptr<T> Reference<T>::getShared(const unsigned long index) const {
+    return CPP11_shared_ptr<T>(getPtr(index));
+  }
+}  // namespace gs
+
+#endif  // GENERS_REFERENCE_HH_
diff --git a/Alignment/Geners/interface/Regex.hh b/Alignment/Geners/interface/Regex.hh
index 647f766a67b35..6529fa1eaab96 100644
--- a/Alignment/Geners/interface/Regex.hh
+++ b/Alignment/Geners/interface/Regex.hh
@@ -10,83 +10,72 @@
 #include <regex>
 
 namespace gs {
-    typedef std::regex Regex;
+  typedef std::regex Regex;
 }
 
-#else // CPP11_STD_AVAILABLE
+#else  // CPP11_STD_AVAILABLE
 
 // Use POSIX extended regex matching
 
-#include <string>
-#include <cassert>
 #include "Alignment/Geners/interface/IOException.hh"
-#include <sys/types.h>
+#include <cassert>
 #include <regex.h>
+#include <string>
+#include <sys/types.h>
 
 namespace gs {
-    class SearchSpecifier;
-
-    class Regex
-    {
-        friend class SearchSpecifier;
-
-        std::string re_;
-        mutable regex_t* preg_;
-
-        inline void cleanup()
-        {
-            if (preg_)
-            {
-                regfree(preg_);
-                delete preg_;
-                preg_ = 0;
-            }
-        }
-
-        inline bool matches(const std::string& sentence) const
-        {
-            if (!preg_)
-            {
-                preg_ = new regex_t();
-                assert(!regcomp(preg_, re_.c_str(), REG_EXTENDED | REG_NOSUB));
-            }
-            return regexec(preg_, sentence.c_str(), 0, 0, 0) == 0;
-        }
-
-    public:
-        inline Regex() : preg_(0) {}
-
-        inline Regex(const std::string& re) 
-            : re_(re), preg_(new regex_t())
-        {
-            const int statusCode = regcomp(preg_, re_.c_str(),
-                                           REG_EXTENDED | REG_NOSUB);
-            if (statusCode)
-            {
-                const size_t n = regerror(statusCode, preg_, 0, 0);
-                std::string s;
-                s.resize(n+1);
-                regerror(statusCode, preg_, const_cast<char*>(s.data()), n+1);
-                cleanup();
-                throw gs::IOInvalidArgument(s.data());
-            }
-        }
-
-        inline Regex(const Regex& r) : re_(r.re_), preg_(0) {}
-
-        inline Regex& operator=(const Regex& r)
-        {
-            if (&r == this)
-                return *this;
-            re_ = r.re_;
-            cleanup();
-            return *this;
-        }
-
-        inline ~Regex() {cleanup();}
-    };
-}
-
-#endif // CPP11_STD_AVAILABLE
-#endif // GENERS_REGEX_HH_
-
+  class SearchSpecifier;
+
+  class Regex {
+    friend class SearchSpecifier;
+
+    std::string re_;
+    mutable regex_t *preg_;
+
+    inline void cleanup() {
+      if (preg_) {
+        regfree(preg_);
+        delete preg_;
+        preg_ = 0;
+      }
+    }
+
+    inline bool matches(const std::string &sentence) const {
+      if (!preg_) {
+        preg_ = new regex_t();
+        assert(!regcomp(preg_, re_.c_str(), REG_EXTENDED | REG_NOSUB));
+      }
+      return regexec(preg_, sentence.c_str(), 0, 0, 0) == 0;
+    }
+
+  public:
+    inline Regex() : preg_(0) {}
+
+    inline Regex(const std::string &re) : re_(re), preg_(new regex_t()) {
+      const int statusCode = regcomp(preg_, re_.c_str(), REG_EXTENDED | REG_NOSUB);
+      if (statusCode) {
+        const size_t n = regerror(statusCode, preg_, 0, 0);
+        std::string s;
+        s.resize(n + 1);
+        regerror(statusCode, preg_, const_cast<char *>(s.data()), n + 1);
+        cleanup();
+        throw gs::IOInvalidArgument(s.data());
+      }
+    }
+
+    inline Regex(const Regex &r) : re_(r.re_), preg_(0) {}
+
+    inline Regex &operator=(const Regex &r) {
+      if (&r == this)
+        return *this;
+      re_ = r.re_;
+      cleanup();
+      return *this;
+    }
+
+    inline ~Regex() { cleanup(); }
+  };
+}  // namespace gs
+
+#endif  // CPP11_STD_AVAILABLE
+#endif  // GENERS_REGEX_HH_
diff --git a/Alignment/Geners/interface/SearchSpecifier.hh b/Alignment/Geners/interface/SearchSpecifier.hh
index 42452081334e4..b59b5c4b59d15 100644
--- a/Alignment/Geners/interface/SearchSpecifier.hh
+++ b/Alignment/Geners/interface/SearchSpecifier.hh
@@ -6,45 +6,39 @@
 #include "Alignment/Geners/interface/Regex.hh"
 
 namespace gs {
-    class SearchSpecifier
-    {
-    public:
-        inline SearchSpecifier(const char* exact)
-            : tag_(exact ? exact : ""), useRegex_(false) {}
-
-        inline SearchSpecifier(const std::string& exact)
-            : tag_(exact), useRegex_(false) {}
-
-        inline SearchSpecifier(const Regex& regex)
-            : regex_(regex), useRegex_(true) {}
-
-        // Note that the C++11 regex object does not specify a way to
-        // extract the regular expression from it. Sometimes, however,
-        // it is useful to have a way to print the expression searched.
-        // The following special constructor helps: it can be used in
-        // case one wants to use regex but also wants to remember the
-        // regular expression itself. This constructor can also be useful
-        // in case the code gets a command line switch on whether to use
-        // regular expressions or not. Note that, for C++11 regex, the
-        // regex flavor can no longer be specified (default is used).
-        //
-        inline SearchSpecifier(const std::string& expr, const bool useRegex)
-            : tag_(expr), regex_(useRegex ? expr : std::string()),
-              useRegex_(useRegex) {}
-
-        inline bool useRegex() const {return useRegex_;}
-        inline const std::string& pattern() const {return tag_;}
-
-        bool matches(const std::string& sentence) const;
-
-    private:
-        SearchSpecifier();
-
-        std::string tag_;
-        Regex regex_;
-        bool useRegex_;
-    };
-}
-
-#endif // GENERS_SEARCHSPECIFIER_HH_
-
+  class SearchSpecifier {
+  public:
+    inline SearchSpecifier(const char *exact) : tag_(exact ? exact : ""), useRegex_(false) {}
+
+    inline SearchSpecifier(const std::string &exact) : tag_(exact), useRegex_(false) {}
+
+    inline SearchSpecifier(const Regex &regex) : regex_(regex), useRegex_(true) {}
+
+    // Note that the C++11 regex object does not specify a way to
+    // extract the regular expression from it. Sometimes, however,
+    // it is useful to have a way to print the expression searched.
+    // The following special constructor helps: it can be used in
+    // case one wants to use regex but also wants to remember the
+    // regular expression itself. This constructor can also be useful
+    // in case the code gets a command line switch on whether to use
+    // regular expressions or not. Note that, for C++11 regex, the
+    // regex flavor can no longer be specified (default is used).
+    //
+    inline SearchSpecifier(const std::string &expr, const bool useRegex)
+        : tag_(expr), regex_(useRegex ? expr : std::string()), useRegex_(useRegex) {}
+
+    inline bool useRegex() const { return useRegex_; }
+    inline const std::string &pattern() const { return tag_; }
+
+    bool matches(const std::string &sentence) const;
+
+  private:
+    SearchSpecifier() = delete;
+
+    std::string tag_;
+    Regex regex_;
+    bool useRegex_;
+  };
+}  // namespace gs
+
+#endif  // GENERS_SEARCHSPECIFIER_HH_
diff --git a/Alignment/Geners/interface/StringArchive.hh b/Alignment/Geners/interface/StringArchive.hh
index a1e801e86bbe7..97510e9c4240c 100644
--- a/Alignment/Geners/interface/StringArchive.hh
+++ b/Alignment/Geners/interface/StringArchive.hh
@@ -6,82 +6,74 @@
 #include "Alignment/Geners/interface/ContiguousCatalog.hh"
 
 namespace gs {
-    class StringArchive : public AbsArchive
-    {
-    public:
-        inline StringArchive(const char* name=0) : AbsArchive(name) {}
-        virtual ~StringArchive() {}
-
-        inline bool isOpen() const {return true;}
-        inline std::string error() const {return std::string("");}
-        inline bool isReadable() const {return true;}
-        inline bool isWritable() const {return true;}
-        inline unsigned long long size() const {return catalog_.size();}
-        inline unsigned long long smallestId() const
-            {return catalog_.smallestId();}
-        inline unsigned long long largestId() const
-            {return catalog_.largestId();}
-        inline bool idsAreContiguous() const {return catalog_.isContiguous();}
-        inline bool itemExists(const unsigned long long id) const
-            {return catalog_.itemExists(id);}
-        inline void itemSearch(const SearchSpecifier& namePattern,
-                               const SearchSpecifier& categoryPattern,
-                               std::vector<unsigned long long>* idsFound) const
-            {catalog_.search(namePattern, categoryPattern, idsFound);}
-
-        inline CPP11_shared_ptr<const CatalogEntry> 
-        catalogEntry(const unsigned long long id)
-            {return catalog_.retrieveEntry(id);}
-
-        inline void flush() {stream_.flush();}
-
-        inline std::string str() const
-           {return static_cast<const std::stringbuf*>(stream_.rdbuf())->str();}
-
-        // The following operation is equivalent to but much more efficient
-        // than calling str() and finding out the size of the obtained string
-        inline unsigned long dataSize() const {return stream_.size();}
-
-        // Methods related to I/O
-        inline ClassId classId() const {return ClassId(*this);}
-        bool write(std::ostream& of) const;
-
-        static inline const char* classname() {return "gs::StringArchive";}
-        static inline unsigned version() {return 1;}
-
-        // Can't have "restore" function: no default constructor.
-        // Note that lastItemId() and lastItemLength() methods
-        // of the parent class will return 0 when the archive is
-        // read back from a stream and nothing has been inserted
-        // into it yet.
-        static StringArchive* read(const ClassId& id, std::istream& in);
-
-    protected:
-        virtual bool isEqual(const AbsArchive&) const;
-
-    private:
-        void search(AbsReference& reference);
-        std::istream& inputStream(unsigned long long id, long long* sz);
-
-        inline std::ostream& outputStream()
-        {
-            lastpos_ = stream_.tellp();
-            return stream_;
-        }
-
-        inline unsigned long long addToCatalog(
-            const AbsRecord& record, const unsigned compressCode,
-            const unsigned long long itemLength)
-        {
-            return catalog_.makeEntry(record, compressCode, itemLength,
-                                      ItemLocation(lastpos_, 0));
-        }
-
-        CharBuffer stream_;
-        std::streampos lastpos_;
-        ContiguousCatalog catalog_;
-    };
-}
-
-#endif // GENERS_STRINGARCHIVE_HH_
-
+  class StringArchive : public AbsArchive {
+  public:
+    inline StringArchive(const char *name = nullptr) : AbsArchive(name) {}
+    ~StringArchive() override {}
+
+    inline bool isOpen() const override { return true; }
+    inline std::string error() const override { return std::string(""); }
+    inline bool isReadable() const override { return true; }
+    inline bool isWritable() const override { return true; }
+    inline unsigned long long size() const override { return catalog_.size(); }
+    inline unsigned long long smallestId() const override { return catalog_.smallestId(); }
+    inline unsigned long long largestId() const override { return catalog_.largestId(); }
+    inline bool idsAreContiguous() const override { return catalog_.isContiguous(); }
+    inline bool itemExists(const unsigned long long id) const override { return catalog_.itemExists(id); }
+    inline void itemSearch(const SearchSpecifier &namePattern,
+                           const SearchSpecifier &categoryPattern,
+                           std::vector<unsigned long long> *idsFound) const override {
+      catalog_.search(namePattern, categoryPattern, idsFound);
+    }
+
+    inline CPP11_shared_ptr<const CatalogEntry> catalogEntry(const unsigned long long id) override {
+      return catalog_.retrieveEntry(id);
+    }
+
+    inline void flush() override { stream_.flush(); }
+
+    inline std::string str() const { return static_cast<const std::stringbuf *>(stream_.rdbuf())->str(); }
+
+    // The following operation is equivalent to but much more efficient
+    // than calling str() and finding out the size of the obtained string
+    inline unsigned long dataSize() const { return stream_.size(); }
+
+    // Methods related to I/O
+    inline ClassId classId() const { return ClassId(*this); }
+    bool write(std::ostream &of) const;
+
+    static inline const char *classname() { return "gs::StringArchive"; }
+    static inline unsigned version() { return 1; }
+
+    // Can't have "restore" function: no default constructor.
+    // Note that lastItemId() and lastItemLength() methods
+    // of the parent class will return 0 when the archive is
+    // read back from a stream and nothing has been inserted
+    // into it yet.
+    static StringArchive *read(const ClassId &id, std::istream &in);
+
+  protected:
+    bool isEqual(const AbsArchive &) const override;
+
+  private:
+    void search(AbsReference &reference) override;
+    std::istream &inputStream(unsigned long long id, long long *sz) override;
+
+    inline std::ostream &outputStream() override {
+      lastpos_ = stream_.tellp();
+      return stream_;
+    }
+
+    inline unsigned long long addToCatalog(const AbsRecord &record,
+                                           const unsigned compressCode,
+                                           const unsigned long long itemLength) override {
+      return catalog_.makeEntry(record, compressCode, itemLength, ItemLocation(lastpos_, nullptr));
+    }
+
+    CharBuffer stream_;
+    std::streampos lastpos_;
+    ContiguousCatalog catalog_;
+  };
+}  // namespace gs
+
+#endif  // GENERS_STRINGARCHIVE_HH_
diff --git a/Alignment/Geners/interface/StrippedType.hh b/Alignment/Geners/interface/StrippedType.hh
index e500a80b5ab87..f5858e74daa12 100644
--- a/Alignment/Geners/interface/StrippedType.hh
+++ b/Alignment/Geners/interface/StrippedType.hh
@@ -6,58 +6,45 @@
 #include <utility>
 
 namespace gs {
-    template <class T>
-    struct StrippedType
-    {
-        typedef T type;
-    };
-
-    template <class T>
-    struct StrippedType<T const>
-    {
-        typedef T type;
-    };
-
-    template <class T>
-    struct StrippedType<T volatile>
-    {
-        typedef T type;
-    };
-
-    template <class T>
-    struct StrippedType<T const volatile>
-    {
-        typedef T type;
-    };
-
-    template <class T, class U>
-    struct StrippedType<std::pair<T,U> >
-    {
-        typedef std::pair<typename StrippedType<T>::type,
-                          typename StrippedType<U>::type> type;
-    };
-
-    template <class T, class U>
-    struct StrippedType<const std::pair<T,U> >
-    {
-        typedef std::pair<typename StrippedType<T>::type,
-                          typename StrippedType<U>::type> type;
-    };
-
-    template <class T, class U>
-    struct StrippedType<volatile std::pair<T,U> >
-    {
-        typedef std::pair<typename StrippedType<T>::type,
-                          typename StrippedType<U>::type> type;
-    };
-
-    template <class T, class U>
-    struct StrippedType<const volatile std::pair<T,U> >
-    {
-        typedef std::pair<typename StrippedType<T>::type,
-                          typename StrippedType<U>::type> type;
-    };
-}
-
-#endif // GENERS_STRIPPEDTYPE_HH_
-
+  template <class T>
+  struct StrippedType {
+    typedef T type;
+  };
+
+  template <class T>
+  struct StrippedType<T const> {
+    typedef T type;
+  };
+
+  template <class T>
+  struct StrippedType<T volatile> {
+    typedef T type;
+  };
+
+  template <class T>
+  struct StrippedType<T const volatile> {
+    typedef T type;
+  };
+
+  template <class T, class U>
+  struct StrippedType<std::pair<T, U>> {
+    typedef std::pair<typename StrippedType<T>::type, typename StrippedType<U>::type> type;
+  };
+
+  template <class T, class U>
+  struct StrippedType<const std::pair<T, U>> {
+    typedef std::pair<typename StrippedType<T>::type, typename StrippedType<U>::type> type;
+  };
+
+  template <class T, class U>
+  struct StrippedType<volatile std::pair<T, U>> {
+    typedef std::pair<typename StrippedType<T>::type, typename StrippedType<U>::type> type;
+  };
+
+  template <class T, class U>
+  struct StrippedType<const volatile std::pair<T, U>> {
+    typedef std::pair<typename StrippedType<T>::type, typename StrippedType<U>::type> type;
+  };
+}  // namespace gs
+
+#endif  // GENERS_STRIPPEDTYPE_HH_
diff --git a/Alignment/Geners/interface/WriteOnlyCatalog.hh b/Alignment/Geners/interface/WriteOnlyCatalog.hh
index c2ec7d9f024ce..4a6e7dba871bc 100644
--- a/Alignment/Geners/interface/WriteOnlyCatalog.hh
+++ b/Alignment/Geners/interface/WriteOnlyCatalog.hh
@@ -7,67 +7,64 @@
 #include "Alignment/Geners/interface/CPP11_auto_ptr.hh"
 
 namespace gs {
-    class WriteOnlyCatalog : public AbsCatalog
-    {
-    public:
-        // The output stream should be dedicated exclusively to this catalog
-        WriteOnlyCatalog(std::ostream& os, unsigned long long firstId=1);
-        inline virtual ~WriteOnlyCatalog() {}
-
-        inline unsigned long long size() const {return count_;}
-        inline unsigned long long smallestId() const {return smallestId_;}
-        inline unsigned long long largestId() const {return largestId_;}
-        inline bool isContiguous() const {return true;}
-
-        // The following methods will cause a run-time error: there is
-        // no way to read a write-only catalog or to search it
-        CPP11_shared_ptr<const CatalogEntry> retrieveEntry(
-            unsigned long long) const;
-
-        bool retrieveStreampos(
-            unsigned long long id, unsigned* compressionCode,
-            unsigned long long* length, std::streampos* pos) const;
-
-        void search(const SearchSpecifier& namePattern,
-                    const SearchSpecifier& categoryPattern,
-                    std::vector<unsigned long long>* idsFound) const;
-
-        // Added entries will be immediately written out
-        unsigned long long makeEntry(const ItemDescriptor& descriptor,
-                                     unsigned compressionCode,
-                                     unsigned long long itemLength,
-                                     const ItemLocation& loc,
-                                     unsigned long long offset=0ULL);
-
-        inline const CatalogEntry* lastEntryMade() const
-            {return lastEntry_.get();}
-
-        // Methods needed for I/O (not really useful,
-        //  but must be overriden anyway)
-        virtual ClassId classId() const {return ClassId(*this);}
-        virtual bool write(std::ostream&) const;
-
-        static inline const char* classname() {return "gs::WriteOnlyCatalog";}
-        static inline unsigned version() {return 2;}
-
-        // The following function works only if there is a dynamic cast
-        // which can convert "in" into std::ostream.
-        static WriteOnlyCatalog* read(const ClassId& id, std::istream& in);
-
-    protected:
-        inline virtual bool isEqual(const AbsCatalog&) const {return false;}
-
-    private:
-        WriteOnlyCatalog(const WriteOnlyCatalog&);
-        WriteOnlyCatalog& operator=(const WriteOnlyCatalog&);
-
-        std::ostream& os_;
-        unsigned long long count_;
-        unsigned long long smallestId_;
-        unsigned long long largestId_;
-        CPP11_auto_ptr<const CatalogEntry> lastEntry_;
-    };
-}
-
-#endif // GENERS_WRITEONLYCATALOG_HH_
-
+  class WriteOnlyCatalog : public AbsCatalog {
+  public:
+    // The output stream should be dedicated exclusively to this catalog
+    WriteOnlyCatalog(std::ostream &os, unsigned long long firstId = 1);
+    inline ~WriteOnlyCatalog() override {}
+
+    inline unsigned long long size() const override { return count_; }
+    inline unsigned long long smallestId() const override { return smallestId_; }
+    inline unsigned long long largestId() const override { return largestId_; }
+    inline bool isContiguous() const override { return true; }
+
+    // The following methods will cause a run-time error: there is
+    // no way to read a write-only catalog or to search it
+    CPP11_shared_ptr<const CatalogEntry> retrieveEntry(unsigned long long) const override;
+
+    bool retrieveStreampos(unsigned long long id,
+                           unsigned *compressionCode,
+                           unsigned long long *length,
+                           std::streampos *pos) const override;
+
+    void search(const SearchSpecifier &namePattern,
+                const SearchSpecifier &categoryPattern,
+                std::vector<unsigned long long> *idsFound) const override;
+
+    // Added entries will be immediately written out
+    unsigned long long makeEntry(const ItemDescriptor &descriptor,
+                                 unsigned compressionCode,
+                                 unsigned long long itemLength,
+                                 const ItemLocation &loc,
+                                 unsigned long long offset = 0ULL) override;
+
+    inline const CatalogEntry *lastEntryMade() const override { return lastEntry_.get(); }
+
+    // Methods needed for I/O (not really useful,
+    //  but must be overriden anyway)
+    ClassId classId() const override { return ClassId(*this); }
+    bool write(std::ostream &) const override;
+
+    static inline const char *classname() { return "gs::WriteOnlyCatalog"; }
+    static inline unsigned version() { return 2; }
+
+    // The following function works only if there is a dynamic cast
+    // which can convert "in" into std::ostream.
+    static WriteOnlyCatalog *read(const ClassId &id, std::istream &in);
+
+  protected:
+    inline bool isEqual(const AbsCatalog &) const override { return false; }
+
+  private:
+    WriteOnlyCatalog(const WriteOnlyCatalog &) = delete;
+    WriteOnlyCatalog &operator=(const WriteOnlyCatalog &) = delete;
+
+    std::ostream &os_;
+    unsigned long long count_;
+    unsigned long long smallestId_;
+    unsigned long long largestId_;
+    CPP11_auto_ptr<const CatalogEntry> lastEntry_;
+  };
+}  // namespace gs
+
+#endif  // GENERS_WRITEONLYCATALOG_HH_
diff --git a/Alignment/Geners/interface/ZlibHandle.hh b/Alignment/Geners/interface/ZlibHandle.hh
index a1dfbab2640af..53cd6f9ceba3e 100644
--- a/Alignment/Geners/interface/ZlibHandle.hh
+++ b/Alignment/Geners/interface/ZlibHandle.hh
@@ -2,43 +2,40 @@
 #define GENERS_ZLIBHANDLE_HH_
 
 extern "C" {
-    struct z_stream_s;
+struct z_stream_s;
 }
 
 namespace gs {
-    class ZlibInflateHandle
-    {
-    public:
-        ZlibInflateHandle();
-        ~ZlibInflateHandle();
-
-        inline z_stream_s& strm() {return *strm_;}
-
-    private:
-        ZlibInflateHandle(const ZlibInflateHandle&);
-        ZlibInflateHandle& operator=(const ZlibInflateHandle&);
-
-        z_stream_s *strm_;
-    };
-
-    class ZlibDeflateHandle
-    {
-    public:
-        explicit ZlibDeflateHandle(int level);
-        ~ZlibDeflateHandle();
-
-        inline z_stream_s& strm() {return *strm_;}
-        inline int level() {return level_;}
-
-    private:
-        ZlibDeflateHandle();
-        ZlibDeflateHandle(const ZlibDeflateHandle&);
-        ZlibDeflateHandle& operator=(const ZlibDeflateHandle&);
-
-        z_stream_s *strm_;
-        int level_;
-    };
-}
+  class ZlibInflateHandle {
+  public:
+    ZlibInflateHandle();
+    ~ZlibInflateHandle();
+
+    inline z_stream_s &strm() { return *strm_; }
+
+  private:
+    ZlibInflateHandle(const ZlibInflateHandle &) = delete;
+    ZlibInflateHandle &operator=(const ZlibInflateHandle &) = delete;
+
+    z_stream_s *strm_;
+  };
+
+  class ZlibDeflateHandle {
+  public:
+    explicit ZlibDeflateHandle(int level);
+    ~ZlibDeflateHandle();
+
+    inline z_stream_s &strm() { return *strm_; }
+    inline int level() { return level_; }
+
+  private:
+    ZlibDeflateHandle() = delete;
+    ZlibDeflateHandle(const ZlibDeflateHandle &) = delete;
+    ZlibDeflateHandle &operator=(const ZlibDeflateHandle &) = delete;
 
-#endif // GENERS_ZLIBHANDLE_HH_
+    z_stream_s *strm_;
+    int level_;
+  };
+}  // namespace gs
 
+#endif  // GENERS_ZLIBHANDLE_HH_
diff --git a/Alignment/Geners/interface/binaryIO.hh b/Alignment/Geners/interface/binaryIO.hh
index 990775f68478a..e1562cd8bd8e4 100644
--- a/Alignment/Geners/interface/binaryIO.hh
+++ b/Alignment/Geners/interface/binaryIO.hh
@@ -15,353 +15,292 @@
 #ifndef GENERS_BINARYIO_HH_
 #define GENERS_BINARYIO_HH_
 
-#include <vector>
 #include <cassert>
 #include <iostream>
+#include <vector>
 
-#include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
 #include "Alignment/Geners/interface/CPP11_auto_ptr.hh"
+#include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
 #include "Alignment/Geners/interface/ClassId.hh"
 #include "Alignment/Geners/interface/IOException.hh"
 
 namespace gs {
-    // The following functions perform binary I/O of built-in types.
-    // Note that all of them are "void". It is assumed that the
-    // top-level code will check the status of the stream after
-    // several I/O operations.
-    template <typename T>
-    inline void write_pod(std::ostream& of, const T& pod)
-    {
-        of.write(reinterpret_cast<const char*>(&pod), sizeof(T));
-    }
+  // The following functions perform binary I/O of built-in types.
+  // Note that all of them are "void". It is assumed that the
+  // top-level code will check the status of the stream after
+  // several I/O operations.
+  template <typename T>
+  inline void write_pod(std::ostream &of, const T &pod) {
+    of.write(reinterpret_cast<const char *>(&pod), sizeof(T));
+  }
 
-    template <typename T>
-    inline void read_pod(std::istream& in, T* pod)
-    {
-        assert(pod);
-        in.read(reinterpret_cast<char*>(pod), sizeof(T));
-    }
+  template <typename T>
+  inline void read_pod(std::istream &in, T *pod) {
+    assert(pod);
+    in.read(reinterpret_cast<char *>(pod), sizeof(T));
+  }
 
-    template <typename T>
-    inline void write_pod_array(std::ostream& of, const T* pod,
-                                const unsigned long len)
-    {
-        if (len)
-        {
-            assert(pod);
-            of.write(reinterpret_cast<const char*>(pod), len*sizeof(T));
-        }
+  template <typename T>
+  inline void write_pod_array(std::ostream &of, const T *pod, const unsigned long len) {
+    if (len) {
+      assert(pod);
+      of.write(reinterpret_cast<const char *>(pod), len * sizeof(T));
     }
+  }
 
-    template <typename T>
-    inline void read_pod_array(std::istream& in, T* pod,
-                               const unsigned long len)
-    {
-        if (len)
-        {
-            assert(pod);
-            in.read(reinterpret_cast<char*>(pod), len*sizeof(T));
-        }
+  template <typename T>
+  inline void read_pod_array(std::istream &in, T *pod, const unsigned long len) {
+    if (len) {
+      assert(pod);
+      in.read(reinterpret_cast<char *>(pod), len * sizeof(T));
     }
+  }
 
-    // String is treated as a pod vector. This will be guaranteed
-    // to work correctly in the C++11 standard (the current standard
-    // does not specify that the characters must be stored contuguously
-    // inside the string -- however, this is always true in practice).
-    template <typename T>
-    inline void write_string(std::ostream& of, const std::basic_string<T>& v)
-    {
-        const unsigned long sz = v.size();
-        write_pod(of, sz);
-        if (sz)
-            write_pod_array(of, v.data(), sz);
-    }
+  // String is treated as a pod vector. This will be guaranteed
+  // to work correctly in the C++11 standard (the current standard
+  // does not specify that the characters must be stored contuguously
+  // inside the string -- however, this is always true in practice).
+  template <typename T>
+  inline void write_string(std::ostream &of, const std::basic_string<T> &v) {
+    const unsigned long sz = v.size();
+    write_pod(of, sz);
+    if (sz)
+      write_pod_array(of, v.data(), sz);
+  }
 
-    template <typename T>
-    inline void read_string(std::istream& in, std::basic_string<T>* pv)
-    {
-        assert(pv);
-        unsigned long vlen = 0UL;
-        read_pod(in, &vlen);
-        if (vlen)
-        {
-            pv->resize(vlen);
-            read_pod_array(in, const_cast<T*>(pv->data()), vlen);
-        }
-        else
-            pv->clear();
-    }
+  template <typename T>
+  inline void read_string(std::istream &in, std::basic_string<T> *pv) {
+    assert(pv);
+    unsigned long vlen = 0UL;
+    read_pod(in, &vlen);
+    if (vlen) {
+      pv->resize(vlen);
+      read_pod_array(in, const_cast<T *>(pv->data()), vlen);
+    } else
+      pv->clear();
+  }
 
-    // Specialization of POD-based I/O functions so that they work
-    // as if std::string is a POD
-    template<>
-    inline void write_pod<std::string>(std::ostream& of, const std::string& s)
-    {
-        write_string<char>(of, s);
-    }
+  // Specialization of POD-based I/O functions so that they work
+  // as if std::string is a POD
+  template <>
+  inline void write_pod<std::string>(std::ostream &of, const std::string &s) {
+    write_string<char>(of, s);
+  }
 
-    template<>
-    inline void read_pod<std::string>(std::istream& in, std::string* ps)
-    {
-        read_string<char>(in, ps);
-    }
+  template <>
+  inline void read_pod<std::string>(std::istream &in, std::string *ps) {
+    read_string<char>(in, ps);
+  }
 
-    template<>
-    inline void write_pod_array<std::string>(std::ostream& of,
-                                             const std::string* pod,
-                                             const unsigned long len)
-    {
-        if (len)
-        {
-            assert(pod);
-            for (unsigned long i=0; i<len; ++i)
-                write_string<char>(of, pod[i]);
-        }
+  template <>
+  inline void write_pod_array<std::string>(std::ostream &of, const std::string *pod, const unsigned long len) {
+    if (len) {
+      assert(pod);
+      for (unsigned long i = 0; i < len; ++i)
+        write_string<char>(of, pod[i]);
     }
+  }
 
-    template<>
-    inline void read_pod_array<std::string>(std::istream& in,
-                                            std::string* pod,
-                                            const unsigned long len)
-    {
-        if (len)
-        {
-            assert(pod);
-            for (unsigned long i=0; i<len; ++i)
-                read_string<char>(in, pod + i);
-        }
+  template <>
+  inline void read_pod_array<std::string>(std::istream &in, std::string *pod, const unsigned long len) {
+    if (len) {
+      assert(pod);
+      for (unsigned long i = 0; i < len; ++i)
+        read_string<char>(in, pod + i);
     }
+  }
 
-    template <typename T>
-    inline void write_pod_vector(std::ostream& of, const std::vector<T>& v)
-    {
-        const unsigned long sz = v.size();
-        write_pod(of, sz);
-        if (sz)
-            write_pod_array(of, &v[0], sz);
-    }
+  template <typename T>
+  inline void write_pod_vector(std::ostream &of, const std::vector<T> &v) {
+    const unsigned long sz = v.size();
+    write_pod(of, sz);
+    if (sz)
+      write_pod_array(of, &v[0], sz);
+  }
 
-    template <typename T>
-    inline void read_pod_vector(std::istream& in, std::vector<T>* pv)
-    {
-        assert(pv);
-        unsigned long vlen = 0UL;
-        read_pod(in, &vlen);
-        if (in.fail()) throw IOReadFailure(
-            "In gs::read_pod_vector: input stream failure");
-        if (vlen)
-        {
-            pv->resize(vlen);
-            read_pod_array(in, &((*pv)[0]), vlen);
-        }
-        else
-            pv->clear();
-    }
+  template <typename T>
+  inline void read_pod_vector(std::istream &in, std::vector<T> *pv) {
+    assert(pv);
+    unsigned long vlen = 0UL;
+    read_pod(in, &vlen);
+    if (in.fail())
+      throw IOReadFailure("In gs::read_pod_vector: input stream failure");
+    if (vlen) {
+      pv->resize(vlen);
+      read_pod_array(in, &((*pv)[0]), vlen);
+    } else
+      pv->clear();
+  }
 
-    // The following functions perform binary I/O on objects
-    // which have write/read/restore functions. Compared to
-    // calling the corresponding class methods directly, these
-    // function take care of writing out the class identifier.
-    //
-    template <typename T>
-    inline bool write_obj(std::ostream& of, const T& obj)
-    {
-        return obj.classId().write(of) && obj.write(of);
-    }
+  // The following functions perform binary I/O on objects
+  // which have write/read/restore functions. Compared to
+  // calling the corresponding class methods directly, these
+  // function take care of writing out the class identifier.
+  //
+  template <typename T>
+  inline bool write_obj(std::ostream &of, const T &obj) {
+    return obj.classId().write(of) && obj.write(of);
+  }
 
-    template <typename T>
-    inline CPP11_auto_ptr<T> read_obj(std::istream& in)
-    {
-        const ClassId id(in, 1);
-        return CPP11_auto_ptr<T>(T::read(id, in));
-    }
-
-    template <typename T>
-    inline void restore_obj(std::istream& in, T* obj)
-    {
-        assert(obj);
-        const ClassId id(in, 1);
-        T::restore(id, in, obj);
-    }
+  template <typename T>
+  inline CPP11_auto_ptr<T> read_obj(std::istream &in) {
+    const ClassId id(in, 1);
+    return CPP11_auto_ptr<T>(T::read(id, in));
+  }
 
-    // The following function is templated upon the reader factory
-    template <typename Reader>
-    inline CPP11_auto_ptr<typename Reader::value_type>
-    read_base_obj(std::istream& in, const Reader& f)
-    {
-        typedef typename Reader::value_type T;
-        const ClassId id(in, 1);
-        return CPP11_auto_ptr<T>(f.read(id, in));
-    }
+  template <typename T>
+  inline void restore_obj(std::istream &in, T *obj) {
+    assert(obj);
+    const ClassId id(in, 1);
+    T::restore(id, in, obj);
+  }
 
-    // The following function assumes that the array contains actual
-    // objects rather than pointers
-    template <typename T>
-    inline bool write_obj_array(std::ostream& of, const T* arr,
-                                const unsigned long len)
-    {
-        bool status = true;
-        if (len)
-        {
-            assert(arr);
-            status = arr[0].classId().write(of);
-            for (unsigned long i=0; i<len && status; ++i)
-                status = arr[i].write(of);
-        }
-        return status;
-    }
+  // The following function is templated upon the reader factory
+  template <typename Reader>
+  inline CPP11_auto_ptr<typename Reader::value_type> read_base_obj(std::istream &in, const Reader &f) {
+    typedef typename Reader::value_type T;
+    const ClassId id(in, 1);
+    return CPP11_auto_ptr<T>(f.read(id, in));
+  }
 
-    // The following assumes that the array contains actual objects
-    // and that class T has the "restore" function
-    template <typename T>
-    inline void read_placed_obj_array(std::istream& in, T* arr,
-                                      const unsigned long len)
-    {
-        if (len)
-        {
-            assert(arr);
-            const ClassId id(in, 1);
-            for (unsigned long i=0; i<len; ++i)
-                T::restore(id, in, arr + i);
-        }
+  // The following function assumes that the array contains actual
+  // objects rather than pointers
+  template <typename T>
+  inline bool write_obj_array(std::ostream &of, const T *arr, const unsigned long len) {
+    bool status = true;
+    if (len) {
+      assert(arr);
+      status = arr[0].classId().write(of);
+      for (unsigned long i = 0; i < len && status; ++i)
+        status = arr[i].write(of);
     }
+    return status;
+  }
 
-    // The following assumes that the array contains a bunch of
-    // shared pointers and that class T has the "read" function
-    template <typename T>
-    inline void read_heap_obj_array(std::istream& in,
-                                    CPP11_shared_ptr<T>* arr,
-                                    const unsigned long len)
-    {
-        if (len)
-        {
-            assert(arr);
-            const ClassId id(in, 1);
-            for (unsigned long i=0; i<len; ++i)
-            {
-                T* obj = T::read(id, in);
-                arr[i] = CPP11_shared_ptr<T>(obj);
-            }
-        }
+  // The following assumes that the array contains actual objects
+  // and that class T has the "restore" function
+  template <typename T>
+  inline void read_placed_obj_array(std::istream &in, T *arr, const unsigned long len) {
+    if (len) {
+      assert(arr);
+      const ClassId id(in, 1);
+      for (unsigned long i = 0; i < len; ++i)
+        T::restore(id, in, arr + i);
     }
+  }
 
-    // The following function is templated upon the reader factory
-    template <typename Reader>
-    inline void read_base_obj_array(
-        std::istream& in, const Reader& f,
-        CPP11_shared_ptr<typename Reader::value_type>* arr,
-        const unsigned long len)
-    {
-        typedef typename Reader::value_type T;
-        if (len)
-        {
-            assert(arr);
-            const ClassId id(in, 1);
-            for (unsigned long i=0; i<len; ++i)
-            {
-                T* obj = f.read(id, in);
-                arr[i] = CPP11_shared_ptr<T>(obj);
-            }
-        }
+  // The following assumes that the array contains a bunch of
+  // shared pointers and that class T has the "read" function
+  template <typename T>
+  inline void read_heap_obj_array(std::istream &in, CPP11_shared_ptr<T> *arr, const unsigned long len) {
+    if (len) {
+      assert(arr);
+      const ClassId id(in, 1);
+      for (unsigned long i = 0; i < len; ++i) {
+        T *obj = T::read(id, in);
+        arr[i] = CPP11_shared_ptr<T>(obj);
+      }
     }
+  }
 
-    // The following assumes that the vector contains actual objects
-    template <typename T>
-    inline bool write_obj_vector(std::ostream& of, const std::vector<T>& v)
-    {
-        const unsigned long sz = v.size();
-        write_pod(of, sz);
-        bool status = !of.fail();
-        if (sz && status)
-            status = write_obj_array(of, &v[0], sz);
-        return status;
+  // The following function is templated upon the reader factory
+  template <typename Reader>
+  inline void read_base_obj_array(std::istream &in,
+                                  const Reader &f,
+                                  CPP11_shared_ptr<typename Reader::value_type> *arr,
+                                  const unsigned long len) {
+    typedef typename Reader::value_type T;
+    if (len) {
+      assert(arr);
+      const ClassId id(in, 1);
+      for (unsigned long i = 0; i < len; ++i) {
+        T *obj = f.read(id, in);
+        arr[i] = CPP11_shared_ptr<T>(obj);
+      }
     }
+  }
 
-    // The following assumes that the vector contains actual objects
-    template <typename T>
-    inline void read_placed_obj_vector(std::istream& in, std::vector<T>* pv)
-    {
-        unsigned long vlen = 0UL;
-        read_pod(in, &vlen);
-        if (in.fail()) throw IOReadFailure(
-            "In gs::read_placed_obj_vector: input stream failure");
-        assert(pv);
-        if (vlen)
-        {
-            pv->resize(vlen);
-            read_placed_obj_array(in, &(*pv)[0], vlen);
-        }
-        else
-            pv->clear();
-    }
+  // The following assumes that the vector contains actual objects
+  template <typename T>
+  inline bool write_obj_vector(std::ostream &of, const std::vector<T> &v) {
+    const unsigned long sz = v.size();
+    write_pod(of, sz);
+    bool status = !of.fail();
+    if (sz && status)
+      status = write_obj_array(of, &v[0], sz);
+    return status;
+  }
 
-    // The following assumes that the vector contains a bunch of
-    // shared pointers
-    template <typename T>
-    inline void read_heap_obj_vector(std::istream& in,
-                                     std::vector<CPP11_shared_ptr<T> >* pv)
-    {
-        unsigned long vlen = 0UL;
-        read_pod(in, &vlen);
-        if (in.fail()) throw IOReadFailure(
-            "In gs::read_heap_obj_vector: input stream failure");
-        assert(pv);
-        if (vlen)
-        {
-            pv->resize(vlen);
-            return read_heap_obj_array(in, &(*pv)[0], vlen);
-        }
-        else
-            pv->clear();
-    }
+  // The following assumes that the vector contains actual objects
+  template <typename T>
+  inline void read_placed_obj_vector(std::istream &in, std::vector<T> *pv) {
+    unsigned long vlen = 0UL;
+    read_pod(in, &vlen);
+    if (in.fail())
+      throw IOReadFailure("In gs::read_placed_obj_vector: input stream failure");
+    assert(pv);
+    if (vlen) {
+      pv->resize(vlen);
+      read_placed_obj_array(in, &(*pv)[0], vlen);
+    } else
+      pv->clear();
+  }
 
-    // The following assumes that the vector contains actual objects.
-    // This function is less efficient than others, but it has to be
-    // used sometimes if one wants to have a vector of objects without
-    // default constructors.
-    //
-    template <typename T>
-    inline void read_heap_obj_vector_as_placed(std::istream& in,
-                                               std::vector<T>* pv)
-    {
-        unsigned long vlen = 0UL;
-        read_pod(in, &vlen);
-        if (in.fail()) throw IOReadFailure(
-            "In gs::read_heap_obj_vector_as_placed: input stream failure");
-        assert(pv);
-        pv->clear();
-        if (vlen)
-        {
-            const ClassId id(in, 1);
-            pv->reserve(vlen);
-            for (unsigned long i=0; i<vlen; ++i)
-            {
-                CPP11_auto_ptr<T> obj(T::read(id, in));
-                pv->push_back(*obj);
-            }
-        }
-    }
+  // The following assumes that the vector contains a bunch of
+  // shared pointers
+  template <typename T>
+  inline void read_heap_obj_vector(std::istream &in, std::vector<CPP11_shared_ptr<T>> *pv) {
+    unsigned long vlen = 0UL;
+    read_pod(in, &vlen);
+    if (in.fail())
+      throw IOReadFailure("In gs::read_heap_obj_vector: input stream failure");
+    assert(pv);
+    if (vlen) {
+      pv->resize(vlen);
+      return read_heap_obj_array(in, &(*pv)[0], vlen);
+    } else
+      pv->clear();
+  }
 
-    // The following function is templated upon the reader factory
-    template <typename Reader>
-    inline void read_base_obj_vector(
-        std::istream& in, const Reader& f,
-        std::vector<CPP11_shared_ptr<typename Reader::value_type> >* pv)
-    {
-        unsigned long vlen = 0UL;
-        read_pod(in, &vlen);
-        if (in.fail()) throw IOReadFailure(
-            "In gs::read_base_obj_vector: input stream failure");
-        assert(pv);
-        if (vlen)
-        {
-            pv->resize(vlen);
-            read_base_obj_array(in, f, &(*pv)[0], vlen);
-        }
-        else
-            pv->clear();
+  // The following assumes that the vector contains actual objects.
+  // This function is less efficient than others, but it has to be
+  // used sometimes if one wants to have a vector of objects without
+  // default constructors.
+  //
+  template <typename T>
+  inline void read_heap_obj_vector_as_placed(std::istream &in, std::vector<T> *pv) {
+    unsigned long vlen = 0UL;
+    read_pod(in, &vlen);
+    if (in.fail())
+      throw IOReadFailure("In gs::read_heap_obj_vector_as_placed: input stream failure");
+    assert(pv);
+    pv->clear();
+    if (vlen) {
+      const ClassId id(in, 1);
+      pv->reserve(vlen);
+      for (unsigned long i = 0; i < vlen; ++i) {
+        CPP11_auto_ptr<T> obj(T::read(id, in));
+        pv->push_back(*obj);
+      }
     }
-}
+  }
 
-#endif // GENERS_BINARYIO_HH_
+  // The following function is templated upon the reader factory
+  template <typename Reader>
+  inline void read_base_obj_vector(std::istream &in,
+                                   const Reader &f,
+                                   std::vector<CPP11_shared_ptr<typename Reader::value_type>> *pv) {
+    unsigned long vlen = 0UL;
+    read_pod(in, &vlen);
+    if (in.fail())
+      throw IOReadFailure("In gs::read_base_obj_vector: input stream failure");
+    assert(pv);
+    if (vlen) {
+      pv->resize(vlen);
+      read_base_obj_array(in, f, &(*pv)[0], vlen);
+    } else
+      pv->clear();
+  }
+}  // namespace gs
 
+#endif  // GENERS_BINARYIO_HH_
diff --git a/Alignment/Geners/interface/complexIO.hh b/Alignment/Geners/interface/complexIO.hh
index 86e183e671f64..488387ed57842 100644
--- a/Alignment/Geners/interface/complexIO.hh
+++ b/Alignment/Geners/interface/complexIO.hh
@@ -3,119 +3,98 @@
 
 #include <complex>
 
-#include "Alignment/Geners/interface/binaryIO.hh"
-#include "Alignment/Geners/interface/IOIsPOD.hh"
 #include "Alignment/Geners/interface/IOIsContainer.hh"
+#include "Alignment/Geners/interface/IOIsPOD.hh"
+#include "Alignment/Geners/interface/binaryIO.hh"
 
-#define gs_specialize_complex_read_write(T) /**/                       \
-namespace gs {                                                         \
-    template <>                                                        \
-    inline void write_pod<std::complex<T> >(std::ostream& of,          \
-                                            const std::complex<T>& s)  \
-    {                                                                  \
-        write_pod(of, s.real());                                       \
-        write_pod(of, s.imag());                                       \
-    }                                                                  \
-    template <>                                                        \
-    inline void read_pod<std::complex<T> >(std::istream& in,           \
-                                           std::complex<T>* ps)        \
-    {                                                                  \
-        assert(ps);                                                    \
-        T re, im;                                                      \
-        read_pod(in, &re);                                             \
-        read_pod(in, &im);                                             \
-        *ps = std::complex<T>(re, im);                                 \
-    }                                                                  \
-    template <>                                                        \
-    inline void write_pod_array<std::complex<T> >(                     \
-        std::ostream& of, const std::complex<T>* pod,                  \
-        const unsigned long len)                                       \
-    {                                                                  \
-        if (len)                                                       \
-        {                                                              \
-            assert(pod);                                               \
-            for (unsigned long i=0; i<len; ++i)                        \
-                write_pod<std::complex<T> >(of, pod[i]);               \
-        }                                                              \
-    }                                                                  \
-    template <>                                                        \
-    inline void read_pod_array<std::complex<T> >(                      \
-        std::istream& in, std::complex<T>* pod,                        \
-        const unsigned long len)                                       \
-    {                                                                  \
-        if (len)                                                       \
-        {                                                              \
-            assert(pod);                                               \
-            T re, im;                                                  \
-            for (unsigned long i=0; i<len; ++i)                        \
-            {                                                          \
-                read_pod(in, &re);                                     \
-                read_pod(in, &im);                                     \
-                pod[i] = std::complex<T>(re, im);                      \
-            }                                                          \
-        }                                                              \
-    }                                                                  \
-}
+#define gs_specialize_complex_read_write(T) /**/                                                                    \
+  namespace gs {                                                                                                    \
+    template <>                                                                                                     \
+    inline void write_pod<std::complex<T>>(std::ostream & of, const std::complex<T> &s) {                           \
+      write_pod(of, s.real());                                                                                      \
+      write_pod(of, s.imag());                                                                                      \
+    }                                                                                                               \
+    template <>                                                                                                     \
+    inline void read_pod<std::complex<T>>(std::istream & in, std::complex<T> *ps) {                                 \
+      assert(ps);                                                                                                   \
+      T re, im;                                                                                                     \
+      read_pod(in, &re);                                                                                            \
+      read_pod(in, &im);                                                                                            \
+      *ps = std::complex<T>(re, im);                                                                                \
+    }                                                                                                               \
+    template <>                                                                                                     \
+    inline void write_pod_array<std::complex<T>>(std::ostream & of,                                                 \
+                                                 const std::complex<T> *pod,                                        \
+                                                 const unsigned long len) {                                         \
+      if (len) {                                                                                                    \
+        assert(pod);                                                                                                \
+        for (unsigned long i = 0; i < len; ++i)                                                                     \
+          write_pod<std::complex<T>>(of, pod[i]);                                                                   \
+      }                                                                                                             \
+    }                                                                                                               \
+    template <>                                                                                                     \
+    inline void read_pod_array<std::complex<T>>(std::istream & in, std::complex<T> *pod, const unsigned long len) { \
+      if (len) {                                                                                                    \
+        assert(pod);                                                                                                \
+        T re, im;                                                                                                   \
+        for (unsigned long i = 0; i < len; ++i) {                                                                   \
+          read_pod(in, &re);                                                                                        \
+          read_pod(in, &im);                                                                                        \
+          pod[i] = std::complex<T>(re, im);                                                                         \
+        }                                                                                                           \
+      }                                                                                                             \
+    }                                                                                                               \
+  }
 
-gs_specialize_complex_read_write(float)
-gs_specialize_complex_read_write(double)
-gs_specialize_complex_read_write(long double)
+gs_specialize_complex_read_write(float) gs_specialize_complex_read_write(double)
+    gs_specialize_complex_read_write(long double)
 
-namespace gs {
-    template <typename T>
-    struct IOIsPOD<std::complex<T> >
-    {
-        enum {value = 1};
-    };
+        namespace gs {
+  template <typename T>
+  struct IOIsPOD<std::complex<T>> {
+    enum { value = 1 };
+  };
 
-    template <typename T>
-    struct IOIsPOD<const std::complex<T> >
-    {
-        enum {value = 1};
-    };
+  template <typename T>
+  struct IOIsPOD<const std::complex<T>> {
+    enum { value = 1 };
+  };
 
-    template <typename T>
-    struct IOIsPOD<volatile std::complex<T> >
-    {
-        enum {value = 1};
-    };
+  template <typename T>
+  struct IOIsPOD<volatile std::complex<T>> {
+    enum { value = 1 };
+  };
 
-    template <typename T>
-    struct IOIsPOD<const volatile std::complex<T> >
-    {
-        enum {value = 1};
-    };
+  template <typename T>
+  struct IOIsPOD<const volatile std::complex<T>> {
+    enum { value = 1 };
+  };
 
-    template <typename T>
-    class IOIsContainer<std::complex<T> >
-    {
-    public:
-        enum {value = 0};
-    };
+  template <typename T>
+  class IOIsContainer<std::complex<T>> {
+  public:
+    enum { value = 0 };
+  };
 
-    template <typename T>
-    class IOIsContainer<const std::complex<T> >
-    {
-    public:
-        enum {value = 0};
-    };
+  template <typename T>
+  class IOIsContainer<const std::complex<T>> {
+  public:
+    enum { value = 0 };
+  };
 
-    template <typename T>
-    class IOIsContainer<volatile std::complex<T> >
-    {
-    public:
-        enum {value = 0};
-    };
+  template <typename T>
+  class IOIsContainer<volatile std::complex<T>> {
+  public:
+    enum { value = 0 };
+  };
 
-    template <typename T>
-    class IOIsContainer<const volatile std::complex<T> >
-    {
-    public:
-        enum {value = 0};
-    };
+  template <typename T>
+  class IOIsContainer<const volatile std::complex<T>> {
+  public:
+    enum { value = 0 };
+  };
 }
 
 gs_specialize_template_id_T(std::complex, 0, 1)
 
-#endif // GENERS_COMPLEXIO_HH_
-
+#endif  // GENERS_COMPLEXIO_HH_
diff --git a/Alignment/Geners/interface/streamposIO.hh b/Alignment/Geners/interface/streamposIO.hh
index 2eb9dbeb696dc..3132fc52ba171 100644
--- a/Alignment/Geners/interface/streamposIO.hh
+++ b/Alignment/Geners/interface/streamposIO.hh
@@ -18,52 +18,39 @@
 #include "Alignment/Geners/interface/binaryIO.hh"
 
 namespace gs {
-    template<>
-    inline void write_pod<std::streampos>(std::ostream& of,
-                                          const std::streampos& s)
-    {
-        std::streamoff off(s);
-        long long loc = off;
-        write_pod(of, loc);
+  template <>
+  inline void write_pod<std::streampos>(std::ostream &of, const std::streampos &s) {
+    std::streamoff off(s);
+    long long loc = off;
+    write_pod(of, loc);
+  }
+
+  template <>
+  inline void read_pod<std::streampos>(std::istream &in, std::streampos *ps) {
+    assert(ps);
+    long long loc = 0LL;
+    read_pod(in, &loc);
+    std::streamoff off(loc);
+    *ps = std::streampos(off);
+  }
+
+  template <>
+  inline void write_pod_array<std::streampos>(std::ostream &of, const std::streampos *pod, const unsigned long len) {
+    if (len) {
+      assert(pod);
+      for (unsigned long i = 0; i < len; ++i)
+        write_pod(of, pod[i]);
     }
-
-    template<>
-    inline void read_pod<std::streampos>(std::istream& in,
-                                         std::streampos* ps)
-    {
-        assert(ps);
-        long long loc = 0LL;
-        read_pod(in, &loc);
-        std::streamoff off(loc);
-        *ps = std::streampos(off);
-    }
-
-    template<>
-    inline void write_pod_array<std::streampos>(std::ostream& of,
-                                                const std::streampos* pod,
-                                                const unsigned long len)
-    {
-        if (len)
-        {
-            assert(pod);
-            for (unsigned long i=0; i<len; ++i)
-                write_pod(of, pod[i]);
-        }
+  }
+
+  template <>
+  inline void read_pod_array<std::streampos>(std::istream &in, std::streampos *pod, const unsigned long len) {
+    if (len) {
+      assert(pod);
+      for (unsigned long i = 0; i < len; ++i)
+        read_pod(in, pod + i);
     }
+  }
+}  // namespace gs
 
-    template<>
-    inline void read_pod_array<std::streampos>(std::istream& in,
-                                               std::streampos* pod,
-                                               const unsigned long len)
-    {
-        if (len)
-        {
-            assert(pod);
-            for (unsigned long i=0; i<len; ++i)
-                read_pod(in, pod + i);
-        }
-    }
-}
-
-#endif // GENERS_STREAMPOSIO_HH_
-
+#endif  // GENERS_STREAMPOSIO_HH_
diff --git a/Alignment/Geners/interface/stringArchiveIO.hh b/Alignment/Geners/interface/stringArchiveIO.hh
index b9b0a3c42be96..23b005f8d4d5e 100644
--- a/Alignment/Geners/interface/stringArchiveIO.hh
+++ b/Alignment/Geners/interface/stringArchiveIO.hh
@@ -4,43 +4,40 @@
 #include "Alignment/Geners/interface/StringArchive.hh"
 
 namespace gs {
-    // The following function returns "true" on success,
-    // "false" on failure.
-    bool writeStringArchive(const StringArchive& ar, const char* filename);
-
-    // The following function either succeeds or throws
-    // an exception. The archive is created on the heap
-    // and eventually has to be deleted by the user.
-    StringArchive* readStringArchive(const char* filename);
-
-    // Similar operations with compression
-    bool writeCompressedStringArchive(
-        const StringArchive& ar, const char* filename,
-        unsigned compressionMode = 1U, int compressionLevel = -1,
-        unsigned minSizeToCompress = 1024U, unsigned bufSize = 1048576U);
-
-    StringArchive* readCompressedStringArchive(const char* filename);
-
-    // The following function will write a compressed string archive
-    // using default compression parameters if the file name has the
-    // given suffix, otherwise it will write an uncompressed archive.
-    // If the suffix is not provided (i.e., default value of 0 is used),
-    // ".gssaz" will be assumed.
-    bool writeCompressedStringArchiveExt(const StringArchive& ar,
-                                         const char* filename,
-                                         const char* suffix = 0);
-
-    // The following function will attempt to read a compressed string
-    // archive if the file name has the given suffix, otherwise it will
-    // attempt to read an uncompressed archive. If the suffix is not
-    // provided (i.e., default value of 0 is used), ".gssaz" will be assumed.
-    StringArchive* readCompressedStringArchiveExt(const char* filename,
-                                                  const char* suffix = 0);
-
-    // This function will extract one string archive from another
-    StringArchive* loadStringArchiveFromArchive(AbsArchive& arch,
-                                                unsigned long long id);
-}
-
-#endif // GENERS_STRINGARCHIVEIO_HH_
-
+  // The following function returns "true" on success,
+  // "false" on failure.
+  bool writeStringArchive(const StringArchive &ar, const char *filename);
+
+  // The following function either succeeds or throws
+  // an exception. The archive is created on the heap
+  // and eventually has to be deleted by the user.
+  StringArchive *readStringArchive(const char *filename);
+
+  // Similar operations with compression
+  bool writeCompressedStringArchive(const StringArchive &ar,
+                                    const char *filename,
+                                    unsigned compressionMode = 1U,
+                                    int compressionLevel = -1,
+                                    unsigned minSizeToCompress = 1024U,
+                                    unsigned bufSize = 1048576U);
+
+  StringArchive *readCompressedStringArchive(const char *filename);
+
+  // The following function will write a compressed string archive
+  // using default compression parameters if the file name has the
+  // given suffix, otherwise it will write an uncompressed archive.
+  // If the suffix is not provided (i.e., default value of 0 is used),
+  // ".gssaz" will be assumed.
+  bool writeCompressedStringArchiveExt(const StringArchive &ar, const char *filename, const char *suffix = nullptr);
+
+  // The following function will attempt to read a compressed string
+  // archive if the file name has the given suffix, otherwise it will
+  // attempt to read an uncompressed archive. If the suffix is not
+  // provided (i.e., default value of 0 is used), ".gssaz" will be assumed.
+  StringArchive *readCompressedStringArchiveExt(const char *filename, const char *suffix = nullptr);
+
+  // This function will extract one string archive from another
+  StringArchive *loadStringArchiveFromArchive(AbsArchive &arch, unsigned long long id);
+}  // namespace gs
+
+#endif  // GENERS_STRINGARCHIVEIO_HH_
diff --git a/Alignment/Geners/interface/uriUtils.hh b/Alignment/Geners/interface/uriUtils.hh
index e10fe05c4164c..6bb1ae2198a1b 100644
--- a/Alignment/Geners/interface/uriUtils.hh
+++ b/Alignment/Geners/interface/uriUtils.hh
@@ -4,14 +4,13 @@
 #include <string>
 
 namespace gs {
-    std::string localFileURI(const char* filename);
+  std::string localFileURI(const char *filename);
 
-    std::string fileTail(const char* filename);
+  std::string fileTail(const char *filename);
 
-    std::string fileDirname(const char* filename);
+  std::string fileDirname(const char *filename);
 
-    std::string joinDir1WithName2(const char* fname1, const char* fname2);
-}
-
-#endif // GENERS_URIUTILS_HH_
+  std::string joinDir1WithName2(const char *fname1, const char *fname2);
+}  // namespace gs
 
+#endif  // GENERS_URIUTILS_HH_
diff --git a/Alignment/Geners/src/AbsArchive.cc b/Alignment/Geners/src/AbsArchive.cc
index 3ce2fea8db9ca..de3321296db95 100644
--- a/Alignment/Geners/src/AbsArchive.cc
+++ b/Alignment/Geners/src/AbsArchive.cc
@@ -6,197 +6,177 @@
 
 #define GS_STREAM_COPY_BUFFER_SIZE 65536
 
-static void archive_stream_copy(std::istream &in, std::size_t count,
-                                std::ostream &out)
-{
-    if (count)
-    {
-        const std::size_t bufsize = GS_STREAM_COPY_BUFFER_SIZE;
-        char buffer[bufsize];
-
-        bool in_fail = in.fail();
-        bool out_fail = out.fail();
-        while (count > bufsize && !in_fail && !out_fail)
-        {
-            in.read(buffer, bufsize);
-            in_fail = in.fail();
-            if (!in_fail)
-            {
-                out.write(buffer, bufsize);
-                out_fail = out.fail();
-            }
-            count -= bufsize;
-        }
-        if (!in_fail && !out_fail)
-        {
-            in.read(buffer, count);
-            if (!in.fail())
-                out.write(buffer, count);
-        }
+static void archive_stream_copy(std::istream &in, std::size_t count, std::ostream &out) {
+  if (count) {
+    const std::size_t bufsize = GS_STREAM_COPY_BUFFER_SIZE;
+    char buffer[bufsize];
+
+    bool in_fail = in.fail();
+    bool out_fail = out.fail();
+    while (count > bufsize && !in_fail && !out_fail) {
+      in.read(buffer, bufsize);
+      in_fail = in.fail();
+      if (!in_fail) {
+        out.write(buffer, bufsize);
+        out_fail = out.fail();
+      }
+      count -= bufsize;
     }
-}
-
-namespace {
-    class NotWritableRecord : public gs::AbsRecord
-    {
-    public:
-        inline NotWritableRecord(const gs::ClassId& classId,
-                                 const char* ioPrototype,
-                                 const char* name, const char* category)
-            : gs::AbsRecord(classId, ioPrototype, name, category) {}
-    private:
-        NotWritableRecord() = delete;
-        inline bool writeData(std::ostream&) const override {return false;}
-    };
-}
-
-namespace gs {
-    AbsArchive::AbsArchive(const char* name)
-        : name_(name ? name : ""),
-          lastItemId_(0),
-          lastItemLength_(0)
-    {
-    }
-
-    void AbsArchive::addItemToReference(AbsReference& r,
-                                        const unsigned long long id) const
-    {
-        r.addItemId(id);
-    }
-
-    unsigned long long AbsArchive::copyItem(const unsigned long long id,
-                                            AbsArchive* destination,
-                                            const char* newName,
-                                            const char* newCategory)
-    {
-        if (!isReadable())
-            throw gs::IOInvalidArgument("In gs::AbsArchive::copyItem: "
-                                        "origin archive is not readable");
-        assert(destination);
-        if (this == destination)
-            throw gs::IOInvalidArgument("In gs::AbsArchive::copyItem: "
-                         "origin and destination archives are the same");
-        AbsArchive& ar(*destination);
-        if (!ar.isWritable())
-            throw gs::IOInvalidArgument("In gs::AbsArchive::copyItem: "
-                                        "destination archive is not writable");
-        CPP11_shared_ptr<const CatalogEntry> entry(catalogEntry(id));
-        if (!entry)
-            throw gs::IOInvalidArgument("In gs::AbsArchive::copyItem: no item "
-                                        "in the archive with the given id");
-
-        // Position the input stream
-        long long sz = 0;
-        std::istream& is = inputStream(id, &sz);
-
-        // The following code is similar to the one in the "operator<<"
-        // below w.r.t. operations with the output archive
-        std::ostream& os = ar.outputStream();
-        std::streampos base = os.tellp();
-        std::ostream& compressed = ar.compressedStream(os);
-
-        // Transfer the data between the streams
-        unsigned long long len;
-        if (sz >= 0)
-            len = sz;
-        else
-            len = entry->itemLength();
-        archive_stream_copy(is, len, compressed);
-        if (is.fail())
-            throw IOReadFailure("In gs::AbsArchive::copyItem: "
-                                "input stream failure");
-        if (compressed.fail())
-            throw IOWriteFailure("In gs::AbsArchive::copyItem: "
-                                 "output stream failure");
-        const unsigned compressCode = ar.flushCompressedRecord(compressed);
-        if (os.fail())
-            throw IOWriteFailure("In gs::AbsArchive::copyItem: "
-                                 "failed to transfer compressed data");
-
-        // Figure out the record length. Naturally, can't have negative length.
-        std::streamoff off = os.tellp() - base;
-        const long long delta = off;
-        assert(delta >= 0LL);
-
-        // We need to create a record out of the catalog entry we have found
-        const char* name = newName;
-        if (!name)
-            name = entry->name().c_str();
-        const char* category = newCategory;
-        if (!category)
-            category = entry->category().c_str();
-        NotWritableRecord record(entry->type(), entry->ioPrototype().c_str(),
-                                 name, category);
-
-        // Add the record to the catalog
-        const unsigned long long id2 = ar.addToCatalog(
-            record, compressCode, delta);
-        if (id == 0ULL)
-            throw IOWriteFailure("In gs::AbsArchive::copyItem: "
-                                 "failed to add catalog entry");
-        ar.lastItemId_ = id2;
-        ar.lastItemLength_ = delta;
-        return id2;
+    if (!in_fail && !out_fail) {
+      in.read(buffer, count);
+      if (!in.fail())
+        out.write(buffer, count);
     }
+  }
 }
 
-static std::string local_error_message(gs::AbsArchive& ar,
-                                       const gs::AbsRecord& record,
-                                       const char* failedAction)
-{
-    std::ostringstream err;
-    err << "In operator<<(gs::AbsArchive& ar, const gs::AbsRecord& record): "
-        << "failed to " << failedAction << " to the archive \""
-        << ar.name() << "\" for item with type \""
-        << record.type().name() << "\", name \""
-        << record.name() << "\", and category \""
-        << record.category() << '"';
-    return err.str();
-}
+namespace {
+  class NotWritableRecord : public gs::AbsRecord {
+  public:
+    inline NotWritableRecord(const gs::ClassId &classId, const char *ioPrototype, const char *name, const char *category)
+        : gs::AbsRecord(classId, ioPrototype, name, category) {}
 
-gs::AbsArchive& operator<<(gs::AbsArchive& ar, const gs::AbsRecord& record)
-{
-    // Do not reuse records
-    if (record.id()) throw gs::IOInvalidArgument(
-        "In operator<<(gs::AbsArchive& ar, const gs::AbsRecord& record): "
-        "records can not be reused");
+  private:
+    NotWritableRecord() = delete;
+    inline bool writeData(std::ostream &) const override { return false; }
+  };
+}  // namespace
 
-    // Get the relevant streams. Do not change the order
-    // of the next three lines, some code which does
-    // not implement compression may actually rely on
-    // the fact that the "outputStream()" method
-    // is called before "compressedStream()".
-    std::ostream& os = ar.outputStream();
+namespace gs {
+  AbsArchive::AbsArchive(const char *name) : name_(name ? name : ""), lastItemId_(0), lastItemLength_(0) {}
+
+  void AbsArchive::addItemToReference(AbsReference &r, const unsigned long long id) const { r.addItemId(id); }
+
+  unsigned long long AbsArchive::copyItem(const unsigned long long id,
+                                          AbsArchive *destination,
+                                          const char *newName,
+                                          const char *newCategory) {
+    if (!isReadable())
+      throw gs::IOInvalidArgument(
+          "In gs::AbsArchive::copyItem: "
+          "origin archive is not readable");
+    assert(destination);
+    if (this == destination)
+      throw gs::IOInvalidArgument(
+          "In gs::AbsArchive::copyItem: "
+          "origin and destination archives are the same");
+    AbsArchive &ar(*destination);
+    if (!ar.isWritable())
+      throw gs::IOInvalidArgument(
+          "In gs::AbsArchive::copyItem: "
+          "destination archive is not writable");
+    CPP11_shared_ptr<const CatalogEntry> entry(catalogEntry(id));
+    if (!entry)
+      throw gs::IOInvalidArgument(
+          "In gs::AbsArchive::copyItem: no item "
+          "in the archive with the given id");
+
+    // Position the input stream
+    long long sz = 0;
+    std::istream &is = inputStream(id, &sz);
+
+    // The following code is similar to the one in the "operator<<"
+    // below w.r.t. operations with the output archive
+    std::ostream &os = ar.outputStream();
     std::streampos base = os.tellp();
-    std::ostream& compressed = ar.compressedStream(os);
-
-    // Write the data
-    if (!record.writeData(compressed))
-        throw gs::IOWriteFailure(local_error_message(ar, record, "write data"));
-
+    std::ostream &compressed = ar.compressedStream(os);
+
+    // Transfer the data between the streams
+    unsigned long long len;
+    if (sz >= 0)
+      len = sz;
+    else
+      len = entry->itemLength();
+    archive_stream_copy(is, len, compressed);
+    if (is.fail())
+      throw IOReadFailure(
+          "In gs::AbsArchive::copyItem: "
+          "input stream failure");
+    if (compressed.fail())
+      throw IOWriteFailure(
+          "In gs::AbsArchive::copyItem: "
+          "output stream failure");
     const unsigned compressCode = ar.flushCompressedRecord(compressed);
     if (os.fail())
-        throw gs::IOWriteFailure(local_error_message(
-                                     ar, record, "transfer compressed data"));
+      throw IOWriteFailure(
+          "In gs::AbsArchive::copyItem: "
+          "failed to transfer compressed data");
 
     // Figure out the record length. Naturally, can't have negative length.
     std::streamoff off = os.tellp() - base;
     const long long delta = off;
     assert(delta >= 0LL);
 
+    // We need to create a record out of the catalog entry we have found
+    const char *name = newName;
+    if (!name)
+      name = entry->name().c_str();
+    const char *category = newCategory;
+    if (!category)
+      category = entry->category().c_str();
+    NotWritableRecord record(entry->type(), entry->ioPrototype().c_str(), name, category);
+
     // Add the record to the catalog
-    const unsigned long long id = ar.addToCatalog(record, compressCode, delta);
+    const unsigned long long id2 = ar.addToCatalog(record, compressCode, delta);
     if (id == 0ULL)
-        throw gs::IOWriteFailure(local_error_message(
-                                     ar, record, "add catalog entry"));
-
-    // Mark record as written and give feedback about item length
-    record.itemId_ = id;
-    record.itemLength_ = delta;
-
-    // Same thing for the archive
-    ar.lastItemId_ = id;
+      throw IOWriteFailure(
+          "In gs::AbsArchive::copyItem: "
+          "failed to add catalog entry");
+    ar.lastItemId_ = id2;
     ar.lastItemLength_ = delta;
+    return id2;
+  }
+}  // namespace gs
+
+static std::string local_error_message(gs::AbsArchive &ar, const gs::AbsRecord &record, const char *failedAction) {
+  std::ostringstream err;
+  err << "In operator<<(gs::AbsArchive& ar, const gs::AbsRecord& record): "
+      << "failed to " << failedAction << " to the archive \"" << ar.name() << "\" for item with type \""
+      << record.type().name() << "\", name \"" << record.name() << "\", and category \"" << record.category() << '"';
+  return err.str();
+}
+
+gs::AbsArchive &operator<<(gs::AbsArchive &ar, const gs::AbsRecord &record) {
+  // Do not reuse records
+  if (record.id())
+    throw gs::IOInvalidArgument(
+        "In operator<<(gs::AbsArchive& ar, const gs::AbsRecord& record): "
+        "records can not be reused");
 
-    return ar;
+  // Get the relevant streams. Do not change the order
+  // of the next three lines, some code which does
+  // not implement compression may actually rely on
+  // the fact that the "outputStream()" method
+  // is called before "compressedStream()".
+  std::ostream &os = ar.outputStream();
+  std::streampos base = os.tellp();
+  std::ostream &compressed = ar.compressedStream(os);
+
+  // Write the data
+  if (!record.writeData(compressed))
+    throw gs::IOWriteFailure(local_error_message(ar, record, "write data"));
+
+  const unsigned compressCode = ar.flushCompressedRecord(compressed);
+  if (os.fail())
+    throw gs::IOWriteFailure(local_error_message(ar, record, "transfer compressed data"));
+
+  // Figure out the record length. Naturally, can't have negative length.
+  std::streamoff off = os.tellp() - base;
+  const long long delta = off;
+  assert(delta >= 0LL);
+
+  // Add the record to the catalog
+  const unsigned long long id = ar.addToCatalog(record, compressCode, delta);
+  if (id == 0ULL)
+    throw gs::IOWriteFailure(local_error_message(ar, record, "add catalog entry"));
+
+  // Mark record as written and give feedback about item length
+  record.itemId_ = id;
+  record.itemLength_ = delta;
+
+  // Same thing for the archive
+  ar.lastItemId_ = id;
+  ar.lastItemLength_ = delta;
+
+  return ar;
 }
diff --git a/Alignment/Geners/src/AbsReference.cc b/Alignment/Geners/src/AbsReference.cc
index 0b2f091ea9f71..b01ee5f776a66 100644
--- a/Alignment/Geners/src/AbsReference.cc
+++ b/Alignment/Geners/src/AbsReference.cc
@@ -1,8 +1,8 @@
 #include <algorithm>
 
+#include "Alignment/Geners/interface/AbsArchive.hh"
 #include "Alignment/Geners/interface/AbsReference.hh"
 #include "Alignment/Geners/interface/CatalogEntry.hh"
-#include "Alignment/Geners/interface/AbsArchive.hh"
 #include "Alignment/Geners/interface/IOException.hh"
 
 // Notes on implementation
@@ -14,160 +14,135 @@
 // more items: must have itemId_ == 0 && !idList_.empty()
 //
 namespace gs {
-    std::istream& AbsReference::positionInputStream(
-        const unsigned long long id) const
-    {
-        return archive_.inputStream(id, nullptr);
-    }
-
-    void AbsReference::initialize() const
-    {
-        AbsReference* modifiable = const_cast<AbsReference*>(this);
-        if (searchId_)
-        {
-            // Make sure that the searchId_ item id is going to produce
-            // a valid item
-            CPP11_shared_ptr<const CatalogEntry> record = 
-                archive_.catalogEntry(searchId_);
-            const unsigned long long idFound = record->id();
-
-            // Check for valid id in the archive
-            if (idFound && this->isIOCompatible(*record))
-            {
-                if (idFound != searchId_) throw IOInvalidData(
-                    "In AbsReference::initialize: catalog is corrupted");
-                modifiable->itemId_ = searchId_;
-            }
-        }
-        else
-        {
-            // Search for matching items in the archive
-            archive_.search(*modifiable);
-            if (!idList_.empty())
-            {
-                // Check if the list is sorted.
-                // Sort if it is not.
-                const unsigned long nFound = idList_.size();
-                const unsigned long long* ids = &idList_[0];
-                bool sorted = true;
-                for (unsigned long i=1; i<nFound; ++i)
-                    if (ids[i-1] >= ids[i])
-                    {
-                        sorted = false;
-                        break;
-                    }
-                if (!sorted)
-                    std::sort(modifiable->idList_.begin(),
-                              modifiable->idList_.end());
-            }            
-        }
-        modifiable->initialized_ = true;
-    }
-
-    bool AbsReference::isIOCompatible(const CatalogEntry& r) const
-    {
-        return !classId_.name().empty() && 
-                classId_.name() == r.type().name() &&
-                ioProto_ == r.ioPrototype();
-    }
-
-    bool AbsReference::empty() const
-    {
-        if (!initialized_)
-            initialize();
-        return itemId_ == 0 && idList_.empty();
-    }
-
-    bool AbsReference::unique() const
-    {
-        if (!initialized_)
-            initialize();
-        return itemId_ && idList_.empty();
-    }
-
-    unsigned long AbsReference::size() const
-    {
-        if (!initialized_)
-            initialize();
-        return itemId_ ? 1UL : idList_.size();
-    }
-
-    unsigned long long AbsReference::id(const unsigned long index) const
-    {
-        if (!initialized_)
-            initialize();
-        if (itemId_ && index == 0UL)
-            return itemId_;
-        else if (index < idList_.size())
-            return idList_[index];
-        else
-            throw gs::IOOutOfRange("In gs::AbsReference::id: "
-                                    "index out of range");
-    }
-
-    CPP11_shared_ptr<const CatalogEntry> 
-    AbsReference::indexedCatalogEntry(const unsigned long index) const
-    {
-        return archive_.catalogEntry(id(index));
-    }
-
-    bool AbsReference::isSameIOPrototype(const CatalogEntry& r) const
-    {
-        return ioProto_ == r.ioPrototype();
-    }
-
-    void AbsReference::addItemId(const unsigned long long idIn)
-    {
-        if (!idIn) throw gs::IOInvalidArgument(
-            "In AbsReference::addItemId: invalid item id");
-        const unsigned long mySize = itemId_ ? 1UL : idList_.size();
-        switch (mySize)
-        {
-        case 0UL:
-            itemId_ = idIn;
+  std::istream &AbsReference::positionInputStream(const unsigned long long id) const {
+    return archive_.inputStream(id, nullptr);
+  }
+
+  void AbsReference::initialize() const {
+    AbsReference *modifiable = const_cast<AbsReference *>(this);
+    if (searchId_) {
+      // Make sure that the searchId_ item id is going to produce
+      // a valid item
+      CPP11_shared_ptr<const CatalogEntry> record = archive_.catalogEntry(searchId_);
+      const unsigned long long idFound = record->id();
+
+      // Check for valid id in the archive
+      if (idFound && this->isIOCompatible(*record)) {
+        if (idFound != searchId_)
+          throw IOInvalidData("In AbsReference::initialize: catalog is corrupted");
+        modifiable->itemId_ = searchId_;
+      }
+    } else {
+      // Search for matching items in the archive
+      archive_.search(*modifiable);
+      if (!idList_.empty()) {
+        // Check if the list is sorted.
+        // Sort if it is not.
+        const unsigned long nFound = idList_.size();
+        const unsigned long long *ids = &idList_[0];
+        bool sorted = true;
+        for (unsigned long i = 1; i < nFound; ++i)
+          if (ids[i - 1] >= ids[i]) {
+            sorted = false;
             break;
-
-        case 1UL:
-            idList_.reserve(2);
-            idList_.push_back(itemId_);
-            idList_.push_back(idIn);
-            itemId_ = 0ULL;
-            break;
-
-        default:
-            idList_.push_back(idIn);
-            break;
-        }
+          }
+        if (!sorted)
+          std::sort(modifiable->idList_.begin(), modifiable->idList_.end());
+      }
     }
-
-    AbsReference::AbsReference(AbsArchive& ar, const ClassId& classId,
-                               const char* ioPrototype,
-                               const unsigned long long itemId)
-        : archive_(ar),
-          classId_(classId),
-          ioProto_(ioPrototype ? ioPrototype : ""),
-          searchId_(itemId),
-          namePattern_(nullptr),
-          categoryPattern_(nullptr),
-          itemId_(0),
-          initialized_(false)
-    {
-        if (!itemId) throw gs::IOInvalidArgument(
-            "In AbsReference constructor: invalid item id");
-    }
-
-    AbsReference::AbsReference(AbsArchive& ar, const ClassId& classId,
-                               const char* ioPrototype,
-                               const SearchSpecifier& namePattern,
-                               const SearchSpecifier& categoryPattern)
-        : archive_(ar),
-          classId_(classId),
-          ioProto_(ioPrototype ? ioPrototype : ""),
-          searchId_(0),
-          namePattern_(namePattern),
-          categoryPattern_(categoryPattern),
-          itemId_(0),
-          initialized_(false)
-    {
+    modifiable->initialized_ = true;
+  }
+
+  bool AbsReference::isIOCompatible(const CatalogEntry &r) const {
+    return !classId_.name().empty() && classId_.name() == r.type().name() && ioProto_ == r.ioPrototype();
+  }
+
+  bool AbsReference::empty() const {
+    if (!initialized_)
+      initialize();
+    return itemId_ == 0 && idList_.empty();
+  }
+
+  bool AbsReference::unique() const {
+    if (!initialized_)
+      initialize();
+    return itemId_ && idList_.empty();
+  }
+
+  unsigned long AbsReference::size() const {
+    if (!initialized_)
+      initialize();
+    return itemId_ ? 1UL : idList_.size();
+  }
+
+  unsigned long long AbsReference::id(const unsigned long index) const {
+    if (!initialized_)
+      initialize();
+    if (itemId_ && index == 0UL)
+      return itemId_;
+    else if (index < idList_.size())
+      return idList_[index];
+    else
+      throw gs::IOOutOfRange(
+          "In gs::AbsReference::id: "
+          "index out of range");
+  }
+
+  CPP11_shared_ptr<const CatalogEntry> AbsReference::indexedCatalogEntry(const unsigned long index) const {
+    return archive_.catalogEntry(id(index));
+  }
+
+  bool AbsReference::isSameIOPrototype(const CatalogEntry &r) const { return ioProto_ == r.ioPrototype(); }
+
+  void AbsReference::addItemId(const unsigned long long idIn) {
+    if (!idIn)
+      throw gs::IOInvalidArgument("In AbsReference::addItemId: invalid item id");
+    const unsigned long mySize = itemId_ ? 1UL : idList_.size();
+    switch (mySize) {
+      case 0UL:
+        itemId_ = idIn;
+        break;
+
+      case 1UL:
+        idList_.reserve(2);
+        idList_.push_back(itemId_);
+        idList_.push_back(idIn);
+        itemId_ = 0ULL;
+        break;
+
+      default:
+        idList_.push_back(idIn);
+        break;
     }
-}
+  }
+
+  AbsReference::AbsReference(AbsArchive &ar,
+                             const ClassId &classId,
+                             const char *ioPrototype,
+                             const unsigned long long itemId)
+      : archive_(ar),
+        classId_(classId),
+        ioProto_(ioPrototype ? ioPrototype : ""),
+        searchId_(itemId),
+        namePattern_(nullptr),
+        categoryPattern_(nullptr),
+        itemId_(0),
+        initialized_(false) {
+    if (!itemId)
+      throw gs::IOInvalidArgument("In AbsReference constructor: invalid item id");
+  }
+
+  AbsReference::AbsReference(AbsArchive &ar,
+                             const ClassId &classId,
+                             const char *ioPrototype,
+                             const SearchSpecifier &namePattern,
+                             const SearchSpecifier &categoryPattern)
+      : archive_(ar),
+        classId_(classId),
+        ioProto_(ioPrototype ? ioPrototype : ""),
+        searchId_(0),
+        namePattern_(namePattern),
+        categoryPattern_(categoryPattern),
+        itemId_(0),
+        initialized_(false) {}
+}  // namespace gs
diff --git a/Alignment/Geners/src/BZ2Handle.cc b/Alignment/Geners/src/BZ2Handle.cc
index ed8771a3bce70..256d1b0ed549c 100644
--- a/Alignment/Geners/src/BZ2Handle.cc
+++ b/Alignment/Geners/src/BZ2Handle.cc
@@ -3,35 +3,25 @@
 #include "Alignment/Geners/interface/BZ2Handle.hh"
 
 namespace gs {
-    BZ2InflateHandle::BZ2InflateHandle(bz_stream& strm)
-        : strm_(&strm)
-    {
-        strm_->bzalloc = nullptr;
-        strm_->bzfree = nullptr;
-        strm_->opaque = nullptr;
-        strm_->avail_in = 0;
-        strm_->next_in = nullptr;
-        assert(BZ2_bzDecompressInit(strm_, 0, 0) == BZ_OK);
-    }
+  BZ2InflateHandle::BZ2InflateHandle(bz_stream &strm) : strm_(&strm) {
+    strm_->bzalloc = nullptr;
+    strm_->bzfree = nullptr;
+    strm_->opaque = nullptr;
+    strm_->avail_in = 0;
+    strm_->next_in = nullptr;
+    assert(BZ2_bzDecompressInit(strm_, 0, 0) == BZ_OK);
+  }
 
-    BZ2InflateHandle::~BZ2InflateHandle()
-    {
-        assert(BZ2_bzDecompressEnd(strm_) == BZ_OK);
-    }
+  BZ2InflateHandle::~BZ2InflateHandle() { assert(BZ2_bzDecompressEnd(strm_) == BZ_OK); }
 
-    BZ2DeflateHandle::BZ2DeflateHandle(bz_stream& strm)
-        : strm_(&strm)
-    {
-        strm_->bzalloc = nullptr;
-        strm_->bzfree = nullptr;
-        strm_->opaque = nullptr;
-        strm_->avail_in = 0;
-        strm_->next_in = nullptr;
-        assert(BZ2_bzCompressInit(strm_, 9, 0, 0) == BZ_OK);
-    }
+  BZ2DeflateHandle::BZ2DeflateHandle(bz_stream &strm) : strm_(&strm) {
+    strm_->bzalloc = nullptr;
+    strm_->bzfree = nullptr;
+    strm_->opaque = nullptr;
+    strm_->avail_in = 0;
+    strm_->next_in = nullptr;
+    assert(BZ2_bzCompressInit(strm_, 9, 0, 0) == BZ_OK);
+  }
 
-    BZ2DeflateHandle::~BZ2DeflateHandle()
-    {
-        assert(BZ2_bzCompressEnd(strm_) == BZ_OK);
-    }
-}
+  BZ2DeflateHandle::~BZ2DeflateHandle() { assert(BZ2_bzCompressEnd(strm_) == BZ_OK); }
+}  // namespace gs
diff --git a/Alignment/Geners/src/BinaryArchiveBase.cc b/Alignment/Geners/src/BinaryArchiveBase.cc
index 75c794adaafa7..1a6abd7b8814f 100644
--- a/Alignment/Geners/src/BinaryArchiveBase.cc
+++ b/Alignment/Geners/src/BinaryArchiveBase.cc
@@ -1,9 +1,9 @@
-#include <cerrno>
+#include <cassert>
 #include <cctype>
+#include <cerrno>
+#include <climits>
 #include <cstdlib>
 #include <cstring>
-#include <climits>
-#include <cassert>
 
 #include "Alignment/Geners/interface/BinaryArchiveBase.hh"
 #include "Alignment/Geners/interface/CatalogIO.hh"
@@ -14,485 +14,395 @@
 #endif
 #define GENERS_BINARY_ARCHIVE_FORMAT_ID (0x1f2e3d4c)
 
-static bool parse_unsigned(std::ostringstream& err,
-                           const char *c, unsigned *result)
-{
-    char *endptr;
-    errno = 0;
-    const unsigned long value = strtoul(c, &endptr, 0);
-    if (errno || *endptr != '\0')
-    {
-        err << "expected an unsigned integer, got \"" << c << '"';
-        if (errno) err << ", " << strerror(errno);
-        return false;
-    }
-    if (value > UINT_MAX)
-    {
-        err << "unsigned value \"" << c << "\" is out of range";
-        return false;
-    }
-    *result = value;
-    return true;
+static bool parse_unsigned(std::ostringstream &err, const char *c, unsigned *result) {
+  char *endptr;
+  errno = 0;
+  const unsigned long value = strtoul(c, &endptr, 0);
+  if (errno || *endptr != '\0') {
+    err << "expected an unsigned integer, got \"" << c << '"';
+    if (errno)
+      err << ", " << strerror(errno);
+    return false;
+  }
+  if (value > UINT_MAX) {
+    err << "unsigned value \"" << c << "\" is out of range";
+    return false;
+  }
+  *result = value;
+  return true;
 }
 
-static bool parse_int(std::ostringstream& err,
-                      const char *c, int *result)
-{
-    char *endptr;
-    errno = 0;
-    const long value = strtol(c, &endptr, 0);
-    if (errno || *endptr != '\0')
-    {
-        err << "expected an integer, got \"" << c << '"';
-        if (errno) err << ", " << strerror(errno);
-        return false;
-    }
-    if (value < INT_MIN || value > INT_MAX)
-    {
-        err << "integer value \"" << c << "\" is out of range";
-        return false;
-    }
-    *result = value;
-    return true;
+static bool parse_int(std::ostringstream &err, const char *c, int *result) {
+  char *endptr;
+  errno = 0;
+  const long value = strtol(c, &endptr, 0);
+  if (errno || *endptr != '\0') {
+    err << "expected an integer, got \"" << c << '"';
+    if (errno)
+      err << ", " << strerror(errno);
+    return false;
+  }
+  if (value < INT_MIN || value > INT_MAX) {
+    err << "integer value \"" << c << "\" is out of range";
+    return false;
+  }
+  *result = value;
+  return true;
 }
 
 namespace gs {
-    BinaryArchiveBase::BinaryArchiveBase(const char* name, const char* mode)
-        : AbsArchive(name),
-          mode_(parseMode(mode)),
-          errorStream_(nullptr),
-          cStream_(nullptr),
-          catalog_(nullptr),
-          storedEntryId_(nullptr),
-          storedLocationId_(nullptr),
-          catalogIsSet_(false),
-          addCatalogToData_(false)
-    {
-        CStringStream::CompressionMode m = CStringStream::NOT_COMPRESSED;
-        int compressionLevel = -1;
-        unsigned minSizeToCompress = 1024U;
-        unsigned bufSize = 1048576U; // 1024*1024
-
-        std::ostringstream err;
-        modeIsValid_ = parseArchiveOptions(err, mode, &m, &compressionLevel,
-                                           &minSizeToCompress, &bufSize,
-                                           &addCatalogToData_);
-        if (modeIsValid_)
-            cStream_ = new CStringStream(m, compressionLevel,
-                                         minSizeToCompress, bufSize);
-        else
-        {
-            errorStream() << "In BinaryArchiveBase constructor: "
-                          << "invalid archive opening mode \"" << mode << '"';
-            const std::string& errInfo = err.str();
-            if (!errInfo.empty())
-                errorStream() << ": " << errInfo;
-        }
+  BinaryArchiveBase::BinaryArchiveBase(const char *name, const char *mode)
+      : AbsArchive(name),
+        mode_(parseMode(mode)),
+        errorStream_(nullptr),
+        cStream_(nullptr),
+        catalog_(nullptr),
+        storedEntryId_(nullptr),
+        storedLocationId_(nullptr),
+        catalogIsSet_(false),
+        addCatalogToData_(false) {
+    CStringStream::CompressionMode m = CStringStream::NOT_COMPRESSED;
+    int compressionLevel = -1;
+    unsigned minSizeToCompress = 1024U;
+    unsigned bufSize = 1048576U;  // 1024*1024
+
+    std::ostringstream err;
+    modeIsValid_ =
+        parseArchiveOptions(err, mode, &m, &compressionLevel, &minSizeToCompress, &bufSize, &addCatalogToData_);
+    if (modeIsValid_)
+      cStream_ = new CStringStream(m, compressionLevel, minSizeToCompress, bufSize);
+    else {
+      errorStream() << "In BinaryArchiveBase constructor: "
+                    << "invalid archive opening mode \"" << mode << '"';
+      const std::string &errInfo = err.str();
+      if (!errInfo.empty())
+        errorStream() << ": " << errInfo;
     }
-
-
-    void BinaryArchiveBase::releaseClassIds()
-    {
-        delete storedEntryId_; storedEntryId_ = nullptr;
-        delete storedLocationId_; storedLocationId_ = nullptr;
+  }
+
+  void BinaryArchiveBase::releaseClassIds() {
+    delete storedEntryId_;
+    storedEntryId_ = nullptr;
+    delete storedLocationId_;
+    storedLocationId_ = nullptr;
+  }
+
+  BinaryArchiveBase::~BinaryArchiveBase() {
+    releaseClassIds();
+    delete errorStream_;
+    delete catalog_;
+    delete cStream_;
+  }
+
+  void BinaryArchiveBase::writeHeader(std::ostream &os) {
+    const unsigned format = GENERS_BINARY_ARCHIVE_FORMAT_ID;
+    write_pod(os, format);
+
+    // Write some other info
+    const unsigned multiplex = addCatalogToData_ ? 1 : 0;
+    const unsigned sizeoflong = sizeof(long);
+    const unsigned infoword = (sizeoflong << 1) | multiplex;
+    write_pod(os, infoword);
+
+    if (multiplex) {
+      // Write class ids for CatalogEntry and ItemLocation
+      releaseClassIds();
+      storedEntryId_ = new ClassId(ClassId::makeId<CatalogEntry>());
+      storedEntryId_->write(os);
+      storedLocationId_ = new ClassId(ClassId::makeId<ItemLocation>());
+      storedLocationId_->write(os);
     }
-
-
-    BinaryArchiveBase::~BinaryArchiveBase()
-    {
-        releaseClassIds();
-        delete errorStream_;
-        delete catalog_;
-        delete cStream_;
+  }
+
+  bool BinaryArchiveBase::readHeader(std::istream &is) {
+    const unsigned expectedFormat = GENERS_BINARY_ARCHIVE_FORMAT_ID;
+    is.seekg(0, std::ios_base::beg);
+    unsigned format = 0;
+    read_pod(is, &format);
+    if (format != expectedFormat)
+      return false;
+
+    unsigned infoword = 0xffffffff;
+    read_pod(is, &infoword);
+    const unsigned multiplex = infoword & 0x1U;
+    const unsigned sizeoflong = infoword >> 1;
+
+    // The following check will make sure that we are not reading
+    // an archive created on a 32-bit machine with a 64-bit system
+    // (and otherwise)
+    if (sizeoflong != sizeof(long))
+      return false;
+
+    addCatalogToData_ = multiplex;
+    if (addCatalogToData_) {
+      releaseClassIds();
+      storedEntryId_ = new ClassId(is, 1);
+      storedLocationId_ = new ClassId(is, 1);
+
+      // Can't open this archive for update if the above class ids
+      // are obsolete -- otherwise we will loose the capability to
+      // restore the catalog
+      if (mode_ & std::ios_base::out) {
+        const ClassId &entryId = ClassId::makeId<CatalogEntry>();
+        const ClassId &locId = ClassId::makeId<ItemLocation>();
+        if (entryId != *storedEntryId_ || locId != *storedLocationId_)
+          throw IOInvalidData(
+              "In gs::BinaryArchiveBase::readHeader: this "
+              "archive can no longer be open for update as it was "
+              "created using an older version of I/O software");
+      }
     }
-
-
-    void BinaryArchiveBase::writeHeader(std::ostream& os)
-    {
-        const unsigned format = GENERS_BINARY_ARCHIVE_FORMAT_ID;
-        write_pod(os, format);
-
-        // Write some other info
-        const unsigned multiplex = addCatalogToData_ ? 1 : 0;
-        const unsigned sizeoflong = sizeof(long);
-        const unsigned infoword = (sizeoflong << 1) | multiplex;
-        write_pod(os, infoword);
-
-        if (multiplex)
-        {
-            // Write class ids for CatalogEntry and ItemLocation
-            releaseClassIds();
-            storedEntryId_ = new ClassId(ClassId::makeId<CatalogEntry>());
-            storedEntryId_->write(os);
-            storedLocationId_ = new ClassId(ClassId::makeId<ItemLocation>());
-            storedLocationId_->write(os);
-        }
+    return !is.fail();
+  }
+
+  void BinaryArchiveBase::openDataFile(std::fstream &stream, const char *filename) {
+    assert(filename);
+    if (stream.is_open())
+      stream.close();
+    stream.clear();
+    stream.open(filename, mode_);
+    if (!stream.is_open())
+      throw IOOpeningFailure("gs::BinaryArchiveBase::openDataFile", filename);
+
+    // Do we need to write the header out or to read it in?
+    bool writeHead = false;
+    if (mode_ & std::ios_base::out) {
+      if (mode_ & std::ios_base::trunc)
+        writeHead = true;
+      else if (isEmptyFile(stream))
+        writeHead = true;
     }
 
-
-    bool BinaryArchiveBase::readHeader(std::istream& is)
-    {
-        const unsigned expectedFormat = GENERS_BINARY_ARCHIVE_FORMAT_ID;
-        is.seekg(0, std::ios_base::beg);
-        unsigned format = 0;
-        read_pod(is, &format);
-        if (format != expectedFormat)
-            return false;
-
-        unsigned infoword = 0xffffffff;
-        read_pod(is, &infoword);
-        const unsigned multiplex = infoword & 0x1U;
-        const unsigned sizeoflong = infoword >> 1;
-
-        // The following check will make sure that we are not reading
-        // an archive created on a 32-bit machine with a 64-bit system
-        // (and otherwise)
-        if (sizeoflong != sizeof(long))
-            return false;
-
-        addCatalogToData_ = multiplex;
-        if (addCatalogToData_)
-        {
-            releaseClassIds();
-            storedEntryId_ = new ClassId(is, 1);
-            storedLocationId_ = new ClassId(is, 1);
-
-            // Can't open this archive for update if the above class ids
-            // are obsolete -- otherwise we will loose the capability to
-            // restore the catalog
-            if (mode_ & std::ios_base::out)
-            {
-                const ClassId& entryId = ClassId::makeId<CatalogEntry>();
-                const ClassId& locId = ClassId::makeId<ItemLocation>();
-                if (entryId != *storedEntryId_ || locId != *storedLocationId_)
-                    throw IOInvalidData(
-                        "In gs::BinaryArchiveBase::readHeader: this "
-                        "archive can no longer be open for update as it was "
-                        "created using an older version of I/O software");
-            }
+    if (writeHead) {
+      writeHeader(stream);
+      if (stream.fail()) {
+        stream.close();
+        std::string e =
+            "In gs::BinaryArchiveBase::openDataFile: "
+            "failed to write archive header to file \"";
+        e += filename;
+        e += "\"";
+        throw IOWriteFailure(e);
+      }
+    } else {
+      if (!readHeader(stream)) {
+        const bool failed = stream.fail();
+        stream.close();
+        std::string e = "In gs::BinaryArchiveBase::openDataFile: ";
+        if (failed) {
+          e += "could not read archive header from file \"";
+          e += filename;
+          e += "\"";
+          throw IOReadFailure(e);
+        } else {
+          e += "no valid archive header in file \"";
+          e += filename;
+          e += "\"";
+          throw IOInvalidData(e);
         }
-        return !is.fail();
+      }
     }
+  }
 
-
-    void BinaryArchiveBase::openDataFile(std::fstream& stream,
-                                         const char* filename)
-    {
-        assert(filename);
-        if (stream.is_open())
-            stream.close();
-        stream.clear();
-        stream.open(filename, mode_);
-        if (!stream.is_open())
-            throw IOOpeningFailure("gs::BinaryArchiveBase::openDataFile",
-                                   filename);
-
-        // Do we need to write the header out or to read it in?
-        bool writeHead = false;
-        if (mode_ & std::ios_base::out)
-        {
-            if (mode_ & std::ios_base::trunc)
-                writeHead = true;
-            else if (isEmptyFile(stream))
-                writeHead = true;
-        }
-
-        if (writeHead)
-        {
-            writeHeader(stream);
-            if (stream.fail())
-            {
-                stream.close();
-                std::string e = "In gs::BinaryArchiveBase::openDataFile: "
-                    "failed to write archive header to file \"";
-                e += filename;
-                e += "\"";
-                throw IOWriteFailure(e);
-            }
-        }
-        else
-        {
-            if (!readHeader(stream))
-            {
-                const bool failed = stream.fail();
-                stream.close();                
-                std::string e = "In gs::BinaryArchiveBase::openDataFile: ";
-                if (failed)
-                {
-                    e += "could not read archive header from file \"";
-                    e += filename;
-                    e += "\"";
-                    throw IOReadFailure(e);
-                }
-                else
-                {
-                    e += "no valid archive header in file \"";
-                    e += filename;
-                    e += "\"";
-                    throw IOInvalidData(e);
-                }
-            }
-        }
+  void BinaryArchiveBase::setCatalog(AbsCatalog *c) {
+    if (c) {
+      assert(!catalogIsSet_);
+      catalogIsSet_ = true;
     }
-
-
-    void BinaryArchiveBase::setCatalog(AbsCatalog* c)
-    {
-        if (c)
-        {
-            assert(!catalogIsSet_);
-            catalogIsSet_ = true;
-        }
-        delete catalog_;
-        catalog_ = c;
+    delete catalog_;
+    catalog_ = c;
+  }
+
+  void BinaryArchiveBase::itemSearch(const SearchSpecifier &namePattern,
+                                     const SearchSpecifier &categoryPattern,
+                                     std::vector<unsigned long long> *idsFound) const {
+    if (catalog_)
+      catalog_->search(namePattern, categoryPattern, idsFound);
+    else {
+      assert(idsFound);
+      idsFound->clear();
     }
-
-
-    void BinaryArchiveBase::itemSearch(
-        const SearchSpecifier& namePattern,
-        const SearchSpecifier& categoryPattern,
-        std::vector<unsigned long long>* idsFound) const
-    {
-        if (catalog_)
-            catalog_->search(namePattern, categoryPattern, idsFound);
-        else
-        {
-            assert(idsFound);
-            idsFound->clear();
+  }
+
+  bool BinaryArchiveBase::parseArchiveOptions(std::ostringstream &err,
+                                              const char *modeIn,
+                                              CStringStream::CompressionMode *m,
+                                              int *compressionLevel,
+                                              unsigned *minSizeToCompress,
+                                              unsigned *bufSize,
+                                              bool *multiplexCatalog) {
+    if (!modeIn)
+      return true;
+    std::string cmode(modeIn ? modeIn : "");
+    if (cmode.empty())
+      return true;
+    char *mode = const_cast<char *>(cmode.c_str());
+
+    unsigned cnt = 0;
+    for (char *opt = strtok(mode, ":"); opt; opt = strtok(nullptr, ":"), ++cnt) {
+      // Skip the first word -- this is the file opening mode
+      if (!cnt)
+        continue;
+      char *eq = strchr(opt, '=');
+      if (eq) {
+        // Get rid of spaces around option name
+        char *optname = opt;
+        while (isspace(*optname) && optname < eq)
+          ++optname;
+        if (optname == eq) {
+          err << "invalid binary archive option \"\"";
+          return false;
         }
-    }
-
-
-    bool BinaryArchiveBase::parseArchiveOptions(
-        std::ostringstream& err,
-        const char* modeIn, CStringStream::CompressionMode* m,
-        int* compressionLevel, unsigned* minSizeToCompress,
-        unsigned* bufSize, bool* multiplexCatalog)
-    {
-        if (!modeIn)
-            return true;
-        std::string cmode(modeIn ? modeIn : "");
-        if (cmode.empty())
-            return true;
-        char* mode = const_cast<char*>(cmode.c_str());
-
-        unsigned cnt = 0;
-        for (char* opt = strtok(mode, ":"); opt; opt = strtok(nullptr, ":"), ++cnt)
-        {
-            // Skip the first word -- this is the file opening mode
-            if (!cnt)
-                continue;
-            char* eq = strchr(opt, '=');
-            if (eq)
-            {
-                // Get rid of spaces around option name
-                char* optname = opt;
-                while (isspace(*optname) && optname < eq)
-                    ++optname;
-                if (optname == eq)
-                {
-                    err << "invalid binary archive option \"\"";
-                    return false;
-                }
-                char* optend = eq - 1;
-                while (isspace(*optend))
-                    --optend;
-                ++optend;
-                *optend = '\0';
-
-                // Get rid of spaces around option value
-                char* optval = eq + 1;
-                while (*optval && isspace(*optval))
-                    ++optval;
-                if (!*optval)
-                {
-                    err << "invalid binary archive option value \"\"";
-                    return false;
-                }
-                char* valend = opt + strlen(opt) - 1;
-                while (isspace(*valend))
-                    --valend;
-                ++valend;
-                *valend = '\0';
-                if (strlen(optval) == 0)
-                {
-                    err << "invalid binary archive option value \"\"";
-                    return false;
-                }
-
-                // Go over possible options
-                if (!strcasecmp(optname, "z"))
-                {
-                    // Compression type
-                    if (!CStringStream::getCompressionModeByName(optval, m))
-                    {
-                        err << "invalid compression type \"" << optval << '"';
-                        return false;
-                    }
-                }
-                else if (!strcasecmp(optname, "cl"))
-                {
-                    // Compression level
-                    if (!parse_int(err, optval, compressionLevel))
-                        return false;
-                    if (*compressionLevel < -1 || *compressionLevel > 9)
-                    {
-                        err << "compression level is out of range";
-                        return false;
-                    }
-                }
-                else if (!strcasecmp(optname, "cb"))
-                {
-                    // Compression buffer size
-                    if (!parse_unsigned(err, optval, bufSize))
-                        return false;
-                }
-                else if (!strcasecmp(optname, "cm"))
-                {
-                    // Compression minimum size
-                    if (!parse_unsigned(err, optval, minSizeToCompress))
-                        return false;
-                }
-                else if (!strcasecmp(optname, "cat"))
-                {
-                    // Internal or external catalog
-                    if (optval[0] == 'i' || optval[0] == 'I')
-                        *multiplexCatalog = true;
-                    else if (optval[0] == 's' || optval[0] == 'S')
-                        *multiplexCatalog = false;
-                    else
-                    {
-                        err << "invalid catalog mode \"" << optval << '"';
-                        return false;
-                    }
-                }
-                else
-                {
-                    // Unknown option
-                    err << "unrecognized binary archive option \""
-                        << optname << '"';
-                    return false;
-                }
-            }
-            else
-            {
-                err << "invalid binary archive option \"" << opt << '"';
-                return false;
-            }
+        char *optend = eq - 1;
+        while (isspace(*optend))
+          --optend;
+        ++optend;
+        *optend = '\0';
+
+        // Get rid of spaces around option value
+        char *optval = eq + 1;
+        while (*optval && isspace(*optval))
+          ++optval;
+        if (!*optval) {
+          err << "invalid binary archive option value \"\"";
+          return false;
         }
-        return true;
-    }
-
-
-    std::ios_base::openmode BinaryArchiveBase::parseMode(const char* mode)
-    {
-        std::ios_base::openmode m = std::ios_base::binary;
-        if (mode)
-        {
-            const unsigned len = strlen(mode);
-            for (unsigned i=0; i<len; ++i)
-            {
-                // Note that all characters other than 'r', 'w',
-                // 'a', and '+' are basically ignored inside this cycle
-                if (mode[i] == 'r')
-                    m |= std::ios_base::in;
-                else if (mode[i] == 'w')
-                    m |= (std::ios_base::out | std::ios_base::trunc);
-                else if (mode[i] == 'a')
-                    m |= (std::ios_base::out | std::ios_base::app);
-                else if (mode[i] == '+')
-                    m |= (std::ios_base::in | std::ios_base::out);
-                else if (mode[i] == ':')
-                    break;
-            }
+        char *valend = opt + strlen(opt) - 1;
+        while (isspace(*valend))
+          --valend;
+        ++valend;
+        *valend = '\0';
+        if (strlen(optval) == 0) {
+          err << "invalid binary archive option value \"\"";
+          return false;
         }
 
-        // Make sure that we are at least reading
-        if (!(m & (std::ios_base::in | std::ios_base::out)))
-            m |= std::ios_base::in;
-        return m;
-    }
-
-
-    void BinaryArchiveBase::search(AbsReference& reference)
-    {
-        if (catalog_)
-        {
-            std::vector<unsigned long long> idlist;
-            catalog_->search(reference.namePattern(),
-                             reference.categoryPattern(),
-                             &idlist);
-            const unsigned long nfound = idlist.size();
-            for (unsigned long i=0; i<nfound; ++i)
-            {
-                CPP11_shared_ptr<const CatalogEntry> pentry = 
-                    catalog_->retrieveEntry(idlist[i]);
-                if (reference.isIOCompatible(*pentry))
-                    addItemToReference(reference, idlist[i]);
-            }
+        // Go over possible options
+        if (!strcasecmp(optname, "z")) {
+          // Compression type
+          if (!CStringStream::getCompressionModeByName(optval, m)) {
+            err << "invalid compression type \"" << optval << '"';
+            return false;
+          }
+        } else if (!strcasecmp(optname, "cl")) {
+          // Compression level
+          if (!parse_int(err, optval, compressionLevel))
+            return false;
+          if (*compressionLevel < -1 || *compressionLevel > 9) {
+            err << "compression level is out of range";
+            return false;
+          }
+        } else if (!strcasecmp(optname, "cb")) {
+          // Compression buffer size
+          if (!parse_unsigned(err, optval, bufSize))
+            return false;
+        } else if (!strcasecmp(optname, "cm")) {
+          // Compression minimum size
+          if (!parse_unsigned(err, optval, minSizeToCompress))
+            return false;
+        } else if (!strcasecmp(optname, "cat")) {
+          // Internal or external catalog
+          if (optval[0] == 'i' || optval[0] == 'I')
+            *multiplexCatalog = true;
+          else if (optval[0] == 's' || optval[0] == 'S')
+            *multiplexCatalog = false;
+          else {
+            err << "invalid catalog mode \"" << optval << '"';
+            return false;
+          }
+        } else {
+          // Unknown option
+          err << "unrecognized binary archive option \"" << optname << '"';
+          return false;
         }
+      } else {
+        err << "invalid binary archive option \"" << opt << '"';
+        return false;
+      }
     }
-
-
-    bool BinaryArchiveBase::isEmptyFile(std::fstream& s)
-    {
-        s.seekg(0, std::ios_base::end);
-        return s.tellg() == std::streampos(0);
+    return true;
+  }
+
+  std::ios_base::openmode BinaryArchiveBase::parseMode(const char *mode) {
+    std::ios_base::openmode m = std::ios_base::binary;
+    if (mode) {
+      const unsigned len = strlen(mode);
+      for (unsigned i = 0; i < len; ++i) {
+        // Note that all characters other than 'r', 'w',
+        // 'a', and '+' are basically ignored inside this cycle
+        if (mode[i] == 'r')
+          m |= std::ios_base::in;
+        else if (mode[i] == 'w')
+          m |= (std::ios_base::out | std::ios_base::trunc);
+        else if (mode[i] == 'a')
+          m |= (std::ios_base::out | std::ios_base::app);
+        else if (mode[i] == '+')
+          m |= (std::ios_base::in | std::ios_base::out);
+        else if (mode[i] == ':')
+          break;
+      }
     }
 
-
-    std::istream& BinaryArchiveBase::inputStream(const unsigned long long id,
-                                                 long long *sz)
-    {
-        unsigned long long length = 0;
-        unsigned compressionCode = 0;
-        std::istream& is = plainInputStream(id, &compressionCode, &length);
-        if (cStream_->compressionMode() == CStringStream::NOT_COMPRESSED)
-        {
-            if (sz)
-                *sz = -1LL;
-            return is;
-        }
-        else
-        {
-            cStream_->readCompressed(is, compressionCode, length);
-            if (sz)
-            {
-                std::streamoff off = cStream_->tellp();
-                *sz = off;
-            }
-            return *cStream_;
-        }
+    // Make sure that we are at least reading
+    if (!(m & (std::ios_base::in | std::ios_base::out)))
+      m |= std::ios_base::in;
+    return m;
+  }
+
+  void BinaryArchiveBase::search(AbsReference &reference) {
+    if (catalog_) {
+      std::vector<unsigned long long> idlist;
+      catalog_->search(reference.namePattern(), reference.categoryPattern(), &idlist);
+      const unsigned long nfound = idlist.size();
+      for (unsigned long i = 0; i < nfound; ++i) {
+        CPP11_shared_ptr<const CatalogEntry> pentry = catalog_->retrieveEntry(idlist[i]);
+        if (reference.isIOCompatible(*pentry))
+          addItemToReference(reference, idlist[i]);
+      }
     }
-
-
-    std::ostream& BinaryArchiveBase::outputStream()
-    {
-        return plainOutputStream();
+  }
+
+  bool BinaryArchiveBase::isEmptyFile(std::fstream &s) {
+    s.seekg(0, std::ios_base::end);
+    return s.tellg() == std::streampos(0);
+  }
+
+  std::istream &BinaryArchiveBase::inputStream(const unsigned long long id, long long *sz) {
+    unsigned long long length = 0;
+    unsigned compressionCode = 0;
+    std::istream &is = plainInputStream(id, &compressionCode, &length);
+    if (cStream_->compressionMode() == CStringStream::NOT_COMPRESSED) {
+      if (sz)
+        *sz = -1LL;
+      return is;
+    } else {
+      cStream_->readCompressed(is, compressionCode, length);
+      if (sz) {
+        std::streamoff off = cStream_->tellp();
+        *sz = off;
+      }
+      return *cStream_;
     }
+  }
 
+  std::ostream &BinaryArchiveBase::outputStream() { return plainOutputStream(); }
 
-    std::ostream& BinaryArchiveBase::compressedStream(std::ostream& os)
-    {
-        if (cStream_->compressionMode() == CStringStream::NOT_COMPRESSED)
-            return os;
-        else
-        {
-            cStream_->reset();
-            cStream_->setSink(os);
-            return *cStream_;
-        }
+  std::ostream &BinaryArchiveBase::compressedStream(std::ostream &os) {
+    if (cStream_->compressionMode() == CStringStream::NOT_COMPRESSED)
+      return os;
+    else {
+      cStream_->reset();
+      cStream_->setSink(os);
+      return *cStream_;
     }
+  }
 
-
-    unsigned BinaryArchiveBase::flushCompressedRecord(std::ostream&)
-    {
-        CStringStream::CompressionMode m = cStream_->compressionMode();
-        if (m != CStringStream::NOT_COMPRESSED)
-        {
-            cStream_->flush();
-            m = cStream_->writeCompressed();
-        }
-        return static_cast<unsigned>(m);
+  unsigned BinaryArchiveBase::flushCompressedRecord(std::ostream &) {
+    CStringStream::CompressionMode m = cStream_->compressionMode();
+    if (m != CStringStream::NOT_COMPRESSED) {
+      cStream_->flush();
+      m = cStream_->writeCompressed();
     }
-}
+    return static_cast<unsigned>(m);
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/src/BinaryFileArchive.cc b/Alignment/Geners/src/BinaryFileArchive.cc
index 069f915976209..8a2687662434b 100644
--- a/Alignment/Geners/src/BinaryFileArchive.cc
+++ b/Alignment/Geners/src/BinaryFileArchive.cc
@@ -2,230 +2,194 @@
 
 #include "Alignment/Geners/interface/BinaryFileArchive.hh"
 
-#include "Alignment/Geners/interface/uriUtils.hh"
 #include "Alignment/Geners/interface/ContiguousCatalog.hh"
-#include "Alignment/Geners/interface/WriteOnlyCatalog.hh"
 #include "Alignment/Geners/interface/IOException.hh"
+#include "Alignment/Geners/interface/WriteOnlyCatalog.hh"
 #include "Alignment/Geners/interface/streamposIO.hh"
+#include "Alignment/Geners/interface/uriUtils.hh"
 
 namespace gs {
-    BinaryFileArchive::BinaryFileArchive(const char* basename,
-                                         const char* mode, const char* ann,
-                                         const unsigned dataFileBufferSize,
-                                         const unsigned catalogFileBufferSize)
-        : BinaryArchiveBase(basename, mode),
-          filebuf_(nullptr),
-          catabuf_(nullptr),
-          annotation_(ann ? std::string(ann) : std::string("")),
-          dataFileName_(AbsArchive::name() + ".0.gsbd"),   // binary data
-          catalogFileName_(AbsArchive::name() + ".gsbmf"), // binary metafile
-          dataFileURI_(localFileURI(dataFileName_.c_str())),
-          lastpos_(0),
-          jumppos_(0),
-          catalogMergeLevel_(1),
-          annotationsMerged_(false),
-          streamFlushed_(true)
-    {
-        if (!modeValid()) return;
+  BinaryFileArchive::BinaryFileArchive(const char *basename,
+                                       const char *mode,
+                                       const char *ann,
+                                       const unsigned dataFileBufferSize,
+                                       const unsigned catalogFileBufferSize)
+      : BinaryArchiveBase(basename, mode),
+        filebuf_(nullptr),
+        catabuf_(nullptr),
+        annotation_(ann ? std::string(ann) : std::string("")),
+        dataFileName_(AbsArchive::name() + ".0.gsbd"),    // binary data
+        catalogFileName_(AbsArchive::name() + ".gsbmf"),  // binary metafile
+        dataFileURI_(localFileURI(dataFileName_.c_str())),
+        lastpos_(0),
+        jumppos_(0),
+        catalogMergeLevel_(1),
+        annotationsMerged_(false),
+        streamFlushed_(true) {
+    if (!modeValid())
+      return;
 
-        try
-        {
-            // Get a new buffer for the data and open the data stream
-            if (dataFileBufferSize)
-                filebuf_ = new char[dataFileBufferSize];
-            dataStream_.rdbuf()->pubsetbuf(filebuf_, dataFileBufferSize);
-            openDataFile(dataStream_, dataFileName_.c_str());
-            dataStream_.seekp(0, std::ios_base::end);
+    try {
+      // Get a new buffer for the data and open the data stream
+      if (dataFileBufferSize)
+        filebuf_ = new char[dataFileBufferSize];
+      dataStream_.rdbuf()->pubsetbuf(filebuf_, dataFileBufferSize);
+      openDataFile(dataStream_, dataFileName_.c_str());
+      dataStream_.seekp(0, std::ios_base::end);
 
-            // Get a new buffer for the catalog and open the catalog stream.
-            // We may have to rewrite the complete catalog, so remove the flag
-            // std::ios_base::app from the opening mode.
-            if (catalogFileBufferSize)
-                catabuf_ = new char[catalogFileBufferSize];
-            catStream_.rdbuf()->pubsetbuf(catabuf_, catalogFileBufferSize);
-            catStream_.open(catalogFileName_.c_str(),
-                            openmode() & ~std::ios_base::app);
-            if (!catStream_.is_open())
-                throw IOOpeningFailure("gs::BinaryFileArchive constructor",
-                                       catalogFileName_);
+      // Get a new buffer for the catalog and open the catalog stream.
+      // We may have to rewrite the complete catalog, so remove the flag
+      // std::ios_base::app from the opening mode.
+      if (catalogFileBufferSize)
+        catabuf_ = new char[catalogFileBufferSize];
+      catStream_.rdbuf()->pubsetbuf(catabuf_, catalogFileBufferSize);
+      catStream_.open(catalogFileName_.c_str(), openmode() & ~std::ios_base::app);
+      if (!catStream_.is_open())
+        throw IOOpeningFailure("gs::BinaryFileArchive constructor", catalogFileName_);
 
-            // Can we use a write-only catalog?
-            if (openmode() & std::ios_base::in)
-            {
-                // Reading is allowed. Have to use in-memory catalog.
-                // If the file data already exists, get the catalog in.
-                if (isEmptyFile(catStream_))
-                    setCatalog(new ContiguousCatalog());
-                else
-                    readCatalog<ContiguousCatalog>();
-            }
-            else
-            {
-                // Yes, we can use a write-only catalog.
-                // Is the catalog file empty? If so, write out
-                // the stuff needed at the beginning of the file.
-                // If not, assume that the necessary stuff is
-                // already there. Note that in this case we will
-                // not be able to add the annotation.
-                if (isEmptyFile(catStream_))
-                {
-                    setCatalog(new WriteOnlyCatalog(catStream_));
-                    writeCatalog();
-                }
-                else
-                {
-                    // Have to read in the catalog contents
-                    catStream_.close();
-                    catStream_.clear();
-                    catStream_.open(catalogFileName_.c_str(),
-                                    openmode() | std::ios_base::in);
-                    if (!catStream_.is_open()) throw IOOpeningFailure(
-                        "gs::BinaryFileArchive constructor", catalogFileName_);
-                    readCatalog<WriteOnlyCatalog>();
-                    catStream_.seekp(0, std::ios_base::end);
-                }
-            }
-        }
-        catch (std::exception& e)
-        {
-            setCatalog(nullptr);
-            releaseBuffers();
-            errorStream() << e.what();
+      // Can we use a write-only catalog?
+      if (openmode() & std::ios_base::in) {
+        // Reading is allowed. Have to use in-memory catalog.
+        // If the file data already exists, get the catalog in.
+        if (isEmptyFile(catStream_))
+          setCatalog(new ContiguousCatalog());
+        else
+          readCatalog<ContiguousCatalog>();
+      } else {
+        // Yes, we can use a write-only catalog.
+        // Is the catalog file empty? If so, write out
+        // the stuff needed at the beginning of the file.
+        // If not, assume that the necessary stuff is
+        // already there. Note that in this case we will
+        // not be able to add the annotation.
+        if (isEmptyFile(catStream_)) {
+          setCatalog(new WriteOnlyCatalog(catStream_));
+          writeCatalog();
+        } else {
+          // Have to read in the catalog contents
+          catStream_.close();
+          catStream_.clear();
+          catStream_.open(catalogFileName_.c_str(), openmode() | std::ios_base::in);
+          if (!catStream_.is_open())
+            throw IOOpeningFailure("gs::BinaryFileArchive constructor", catalogFileName_);
+          readCatalog<WriteOnlyCatalog>();
+          catStream_.seekp(0, std::ios_base::end);
         }
+      }
+    } catch (std::exception &e) {
+      setCatalog(nullptr);
+      releaseBuffers();
+      errorStream() << e.what();
     }
+  }
 
-    void BinaryFileArchive::releaseBuffers()
-    {
-        if (dataStream_.is_open()) dataStream_.close();
-        if (catStream_.is_open()) catStream_.close();
-        catStream_.rdbuf()->pubsetbuf(nullptr, 0);
-        dataStream_.rdbuf()->pubsetbuf(nullptr, 0);
-        delete [] catabuf_; catabuf_ = nullptr;
-        delete [] filebuf_; filebuf_ = nullptr;
-    }
+  void BinaryFileArchive::releaseBuffers() {
+    if (dataStream_.is_open())
+      dataStream_.close();
+    if (catStream_.is_open())
+      catStream_.close();
+    catStream_.rdbuf()->pubsetbuf(nullptr, 0);
+    dataStream_.rdbuf()->pubsetbuf(nullptr, 0);
+    delete[] catabuf_;
+    catabuf_ = nullptr;
+    delete[] filebuf_;
+    filebuf_ = nullptr;
+  }
 
-    BinaryFileArchive::~BinaryFileArchive()
-    {
-        flush();
-        releaseBuffers();
-    }
+  BinaryFileArchive::~BinaryFileArchive() {
+    flush();
+    releaseBuffers();
+  }
 
-    void BinaryFileArchive::writeCatalog()
-    {
-        if (isOpen())
-        {
-            if (!annotationsMerged_)
-            {
-                if (!annotation_.empty())
-                    catalogAnnotations_.push_back(annotation_);
-                annotationsMerged_ = true;
-            }
-            const unsigned compress = static_cast<unsigned>(compressionMode());
-            if (!writeBinaryCatalog(catStream_, compress, catalogMergeLevel_,
-                                    catalogAnnotations_, *catalog()))
-            {
-                std::ostringstream os;
-                os << "In BinaryFileArchive::writeCatalog: "
-                   << "failed to write catalog data to file "
-                   << catalogFileName_;
-                throw IOWriteFailure(os.str());
-            }
-        }
+  void BinaryFileArchive::writeCatalog() {
+    if (isOpen()) {
+      if (!annotationsMerged_) {
+        if (!annotation_.empty())
+          catalogAnnotations_.push_back(annotation_);
+        annotationsMerged_ = true;
+      }
+      const unsigned compress = static_cast<unsigned>(compressionMode());
+      if (!writeBinaryCatalog(catStream_, compress, catalogMergeLevel_, catalogAnnotations_, *catalog())) {
+        std::ostringstream os;
+        os << "In BinaryFileArchive::writeCatalog: "
+           << "failed to write catalog data to file " << catalogFileName_;
+        throw IOWriteFailure(os.str());
+      }
     }
+  }
 
-    std::istream& BinaryFileArchive::plainInputStream(
-        const unsigned long long id,
-        unsigned* compressionCode,
-        unsigned long long* length)
-    {
-        if (isOpen())
-        {
-            assert(openmode() & std::ios_base::in);
-            if (!id) throw gs::IOInvalidArgument(
-                "In gs::BinaryFileArchive::plainInputStream: invalid item id");
-            std::streampos pos;
-            if (!catalog()->retrieveStreampos(
-                    id, compressionCode, length, &pos))
-            {
-                std::ostringstream os;
-                os << "In gs::BinaryFileArchive::plainInputStream: "
-                   << "failed to locate item with id " << id
-                   << "in the catalog stored in file " << catalogFileName_;
-                throw gs::IOInvalidArgument(os.str());
-            }
-            if (!streamFlushed_)
-            {
-                dataStream_.flush();
-                streamFlushed_ = true;
-            }
-            dataStream_.seekg(pos);
-        }
-        return dataStream_;
+  std::istream &BinaryFileArchive::plainInputStream(const unsigned long long id,
+                                                    unsigned *compressionCode,
+                                                    unsigned long long *length) {
+    if (isOpen()) {
+      assert(openmode() & std::ios_base::in);
+      if (!id)
+        throw gs::IOInvalidArgument("In gs::BinaryFileArchive::plainInputStream: invalid item id");
+      std::streampos pos;
+      if (!catalog()->retrieveStreampos(id, compressionCode, length, &pos)) {
+        std::ostringstream os;
+        os << "In gs::BinaryFileArchive::plainInputStream: "
+           << "failed to locate item with id " << id << "in the catalog stored in file " << catalogFileName_;
+        throw gs::IOInvalidArgument(os.str());
+      }
+      if (!streamFlushed_) {
+        dataStream_.flush();
+        streamFlushed_ = true;
+      }
+      dataStream_.seekg(pos);
     }
+    return dataStream_;
+  }
 
-    unsigned long long BinaryFileArchive::addToCatalog(
-        const AbsRecord& record, const unsigned compressionCode,
-        const unsigned long long itemLength)
-    {
-        unsigned long long id = 0;
-        if (isOpen())
-        {
-            id = catalog()->makeEntry(
-                record, compressionCode, itemLength,
-                ItemLocation(lastpos_, dataFileURI_.c_str()));
-            if (id && injectMetadata())
-            {
-                const CatalogEntry* entry = catalog()->lastEntryMade();
-                assert(entry);
-                dataStream_.seekp(0, std::ios_base::end);
-                std::streampos now = dataStream_.tellp();
-                if (entry->write(dataStream_))
-                {
-                    dataStream_.seekp(jumppos_);
-                    write_pod(dataStream_, now);
-                    dataStream_.seekp(0, std::ios_base::end);
-                }
-                else
-                    id = 0;
-            }
-        }
-        return id;
+  unsigned long long BinaryFileArchive::addToCatalog(const AbsRecord &record,
+                                                     const unsigned compressionCode,
+                                                     const unsigned long long itemLength) {
+    unsigned long long id = 0;
+    if (isOpen()) {
+      id = catalog()->makeEntry(record, compressionCode, itemLength, ItemLocation(lastpos_, dataFileURI_.c_str()));
+      if (id && injectMetadata()) {
+        const CatalogEntry *entry = catalog()->lastEntryMade();
+        assert(entry);
+        dataStream_.seekp(0, std::ios_base::end);
+        std::streampos now = dataStream_.tellp();
+        if (entry->write(dataStream_)) {
+          dataStream_.seekp(jumppos_);
+          write_pod(dataStream_, now);
+          dataStream_.seekp(0, std::ios_base::end);
+        } else
+          id = 0;
+      }
     }
+    return id;
+  }
 
-    std::ostream& BinaryFileArchive::plainOutputStream()
-    {
-        if (isOpen())
-        {
-            assert(openmode() & std::ios_base::out);
-            dataStream_.seekp(0, std::ios_base::end);
-            if (injectMetadata())
-            {
-                jumppos_ = dataStream_.tellp();
-                std::streampos catpos(0);
-                write_pod(dataStream_, catpos);
-            }
-            lastpos_ = dataStream_.tellp();
-            streamFlushed_ = false;
-        }
-        return dataStream_;
+  std::ostream &BinaryFileArchive::plainOutputStream() {
+    if (isOpen()) {
+      assert(openmode() & std::ios_base::out);
+      dataStream_.seekp(0, std::ios_base::end);
+      if (injectMetadata()) {
+        jumppos_ = dataStream_.tellp();
+        std::streampos catpos(0);
+        write_pod(dataStream_, catpos);
+      }
+      lastpos_ = dataStream_.tellp();
+      streamFlushed_ = false;
     }
+    return dataStream_;
+  }
 
-    void BinaryFileArchive::flush()
-    {
-        if (isOpen())
-        {
-            if (!streamFlushed_)
-            {
-                dataStream_.flush();
-                streamFlushed_ = true;
-            }
+  void BinaryFileArchive::flush() {
+    if (isOpen()) {
+      if (!streamFlushed_) {
+        dataStream_.flush();
+        streamFlushed_ = true;
+      }
 
-            if (openmode() & std::ios_base::out)
-            {
-                if (dynamic_cast<WriteOnlyCatalog*>(catalog()) == nullptr)
-                    writeCatalog();
-                catStream_.flush();
-            }
-        }
+      if (openmode() & std::ios_base::out) {
+        if (dynamic_cast<WriteOnlyCatalog *>(catalog()) == nullptr)
+          writeCatalog();
+        catStream_.flush();
+      }
     }
-}
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/src/CStringBuf.cc b/Alignment/Geners/src/CStringBuf.cc
index 11ae0a34cad9d..fc3bc9ec45f5d 100644
--- a/Alignment/Geners/src/CStringBuf.cc
+++ b/Alignment/Geners/src/CStringBuf.cc
@@ -3,21 +3,19 @@
 #include "Alignment/Geners/interface/CStringBuf.hh"
 
 namespace gs {
-    const char* CStringBuf::getGetBuffer(unsigned long long* len) const
-    {
-        const long long delta = gptr() - eback();
-        assert(delta >= 0LL);
-        assert(len);
-        *len = delta;
-        return eback();
-    }
+  const char *CStringBuf::getGetBuffer(unsigned long long *len) const {
+    const long long delta = gptr() - eback();
+    assert(delta >= 0LL);
+    assert(len);
+    *len = delta;
+    return eback();
+  }
 
-    const char* CStringBuf::getPutBuffer(unsigned long long* len) const
-    {
-        const long long delta = pptr() - pbase();
-        assert(delta >= 0LL);
-        assert(len);
-        *len = delta;
-        return pbase();
-    }
-}
+  const char *CStringBuf::getPutBuffer(unsigned long long *len) const {
+    const long long delta = pptr() - pbase();
+    assert(delta >= 0LL);
+    assert(len);
+    *len = delta;
+    return pbase();
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/src/CStringStream.cc b/Alignment/Geners/src/CStringStream.cc
index 9c28a073e40d5..b507f45903b49 100644
--- a/Alignment/Geners/src/CStringStream.cc
+++ b/Alignment/Geners/src/CStringStream.cc
@@ -7,232 +7,194 @@
 #include "Alignment/Geners/interface/CStringStream.hh"
 #include "Alignment/Geners/interface/IOException.hh"
 
-static void doZlibCompression(const char* data, const unsigned long long len,
-                              const bool defl, z_stream_s& strm,
-                              char* buffer, const unsigned long long bufLen,
-                              std::ostream& sink)
-{
-    assert(buffer);
-    assert(bufLen);
-
-    int status = Z_OK;
-    strm.next_in = reinterpret_cast<Bytef*>(const_cast<char*>(data));
-    strm.avail_in = len;
-    do 
-    {
-        strm.next_out = reinterpret_cast<Bytef*>(buffer);
-        strm.avail_out = bufLen;
-        status = defl ? deflate(&strm, Z_FINISH) :
-                        inflate(&strm, Z_NO_FLUSH);
-        assert(status == Z_OK || status == Z_STREAM_END);
-        const unsigned have = bufLen - strm.avail_out;
-        sink.write(buffer, have);
-        if (sink.fail()) throw gs::IOWriteFailure(
-            "In gs::doZlibCompression: sink stream failure");
-    } while (strm.avail_out == 0);
-
-    if (defl)
-    {
-        assert(strm.avail_in == 0);
-        assert(status == Z_STREAM_END);
-        assert(deflateReset(&strm) == Z_OK);
-    }
-    else
-        assert(inflateReset(&strm) == Z_OK);
+static void doZlibCompression(const char *data,
+                              const unsigned long long len,
+                              const bool defl,
+                              z_stream_s &strm,
+                              char *buffer,
+                              const unsigned long long bufLen,
+                              std::ostream &sink) {
+  assert(buffer);
+  assert(bufLen);
+
+  int status = Z_OK;
+  strm.next_in = reinterpret_cast<Bytef *>(const_cast<char *>(data));
+  strm.avail_in = len;
+  do {
+    strm.next_out = reinterpret_cast<Bytef *>(buffer);
+    strm.avail_out = bufLen;
+    status = defl ? deflate(&strm, Z_FINISH) : inflate(&strm, Z_NO_FLUSH);
+    assert(status == Z_OK || status == Z_STREAM_END);
+    const unsigned have = bufLen - strm.avail_out;
+    sink.write(buffer, have);
+    if (sink.fail())
+      throw gs::IOWriteFailure("In gs::doZlibCompression: sink stream failure");
+  } while (strm.avail_out == 0);
+
+  if (defl) {
+    assert(strm.avail_in == 0);
+    assert(status == Z_STREAM_END);
+    assert(deflateReset(&strm) == Z_OK);
+  } else
+    assert(inflateReset(&strm) == Z_OK);
 }
 
-
-static void doBZ2Compression(const char* data, const unsigned long long len,
-                             const bool defl, bz_stream& strm,
-                             char* buffer, const unsigned long long bufLen,
-                             std::ostream& sink)
-{
-    assert(buffer);
-    assert(bufLen);
-
-    int status = BZ_OK;
-    strm.next_in = const_cast<char*>(data);
-    strm.avail_in = len;
-    do 
-    {
-        strm.next_out = buffer;
-        strm.avail_out = bufLen;
-        status = defl ? BZ2_bzCompress(&strm, BZ_FINISH) :
-                        BZ2_bzDecompress(&strm);
-        assert(status == BZ_OK || status == BZ_STREAM_END);
-        const unsigned have = bufLen - strm.avail_out;
-        sink.write(buffer, have);
-        if (sink.fail()) throw gs::IOWriteFailure(
-            "In gs::doBZ2Compression: sink stream failure");
-    } while (status != BZ_STREAM_END);
+static void doBZ2Compression(const char *data,
+                             const unsigned long long len,
+                             const bool defl,
+                             bz_stream &strm,
+                             char *buffer,
+                             const unsigned long long bufLen,
+                             std::ostream &sink) {
+  assert(buffer);
+  assert(bufLen);
+
+  int status = BZ_OK;
+  strm.next_in = const_cast<char *>(data);
+  strm.avail_in = len;
+  do {
+    strm.next_out = buffer;
+    strm.avail_out = bufLen;
+    status = defl ? BZ2_bzCompress(&strm, BZ_FINISH) : BZ2_bzDecompress(&strm);
+    assert(status == BZ_OK || status == BZ_STREAM_END);
+    const unsigned have = bufLen - strm.avail_out;
+    sink.write(buffer, have);
+    if (sink.fail())
+      throw gs::IOWriteFailure("In gs::doBZ2Compression: sink stream failure");
+  } while (status != BZ_STREAM_END);
 }
 
-
 namespace gs {
-    CStringStream::CStringStream(const CompressionMode m,
-                                 const int compressionLevel,
-                                 const unsigned minSizeToCompress,
-                                 const unsigned bufSize)
-        : mode_(m),
-          compressionLevel_(compressionLevel),
-          minSizeToCompress_(minSizeToCompress),
-          // Have a reasonable minimum buffer size to maintain
-          // performance even if the user wants to shoot himself
-          // in a foot
-          comprBuf_(bufSize > 1024U ? bufSize : 1024U),
-          sink_(nullptr)
-    {
-        this->init(&buf_);
+  CStringStream::CStringStream(const CompressionMode m,
+                               const int compressionLevel,
+                               const unsigned minSizeToCompress,
+                               const unsigned bufSize)
+      : mode_(m),
+        compressionLevel_(compressionLevel),
+        minSizeToCompress_(minSizeToCompress),
+        // Have a reasonable minimum buffer size to maintain
+        // performance even if the user wants to shoot himself
+        // in a foot
+        comprBuf_(bufSize > 1024U ? bufSize : 1024U),
+        sink_(nullptr) {
+    this->init(&buf_);
+  }
+
+  void CStringStream::setCompressionMode(const CompressionMode newmode) {
+    reset();
+    mode_ = newmode;
+  }
+
+  void CStringStream::reset() {
+    clear();
+    seekp(0);
+    seekg(0);
+  }
+
+  void CStringStream::readCompressed(std::istream &in, const unsigned compressionCode, const unsigned long long len) {
+    reset();
+    if (!len)
+      return;
+
+    // Decompress and dump to this string stream
+    if (len > readBuf_.size())
+      readBuf_.resize(len);
+    in.read(&readBuf_[0], len);
+
+    switch (static_cast<CompressionMode>(compressionCode)) {
+      case NOT_COMPRESSED:
+        this->write(&readBuf_[0], len);
+        return;
+
+      case ZLIB: {
+        if (!inflator_.get())
+          inflator_ = CPP11_auto_ptr<ZlibInflateHandle>(new ZlibInflateHandle());
+        doZlibCompression(&readBuf_[0], len, false, inflator_->strm(), &comprBuf_[0], comprBuf_.size(), *this);
+      } break;
+
+      case BZIP2: {
+        // bzlib2 can not be reset, so we have to make
+        // a new inflator every time
+        bz_stream strm;
+        BZ2InflateHandle h(strm);
+        doBZ2Compression(&readBuf_[0], len, false, strm, &comprBuf_[0], comprBuf_.size(), *this);
+      } break;
+
+      default:
+        assert(!"Unhandled switch case in "
+            "CStringStream::readCompressed. "
+            "This is a bug. Please report.");
     }
+  }
 
-    void CStringStream::setCompressionMode(const CompressionMode newmode)
-    {
-        reset();
-        mode_ = newmode;
-    }
+  CStringStream::CompressionMode CStringStream::writeCompressed() {
+    // Compress and dump to sink
+    assert(sink_);
 
-    void CStringStream::reset()
-    {
-        clear();
-        seekp(0);
-        seekg(0);
-    }
+    unsigned long long len = 0;
+    const char *data = buf_.getPutBuffer(&len);
+    if (len == 0)
+      return NOT_COMPRESSED;
 
-    void CStringStream::readCompressed(std::istream& in,
-                                       const unsigned compressionCode,
-                                       const unsigned long long len)
-    {
-        reset();
-        if (!len)
-            return;
-
-        // Decompress and dump to this string stream
-        if (len > readBuf_.size())
-            readBuf_.resize(len);
-        in.read(&readBuf_[0], len);
-
-        switch (static_cast<CompressionMode>(compressionCode))
-        {
-        case NOT_COMPRESSED:
-            this->write(&readBuf_[0], len);
-            return;
-
-        case ZLIB:
-        {
-            if (!inflator_.get())
-                inflator_ = CPP11_auto_ptr<ZlibInflateHandle>(
-                    new ZlibInflateHandle());
-            doZlibCompression(&readBuf_[0], len, false, inflator_->strm(),
-                              &comprBuf_[0], comprBuf_.size(), *this);
-        }
-        break;
-
-        case BZIP2:
-        {
-            // bzlib2 can not be reset, so we have to make
-            // a new inflator every time
-            bz_stream strm;
-            BZ2InflateHandle h(strm);
-            doBZ2Compression(&readBuf_[0], len, false, strm,
-                             &comprBuf_[0], comprBuf_.size(), *this);
-        }
-        break;
+    if (mode_ == NOT_COMPRESSED || len < minSizeToCompress_) {
+      sink_->write(data, len);
+      return NOT_COMPRESSED;
+    }
 
-        default:
-            assert(!"Unhandled switch case in "
-                   "CStringStream::readCompressed. "
-                   "This is a bug. Please report.");
-        }
+    switch (mode_) {
+      case ZLIB: {
+        if (!deflator_.get())
+          deflator_ = CPP11_auto_ptr<ZlibDeflateHandle>(new ZlibDeflateHandle(compressionLevel_));
+        doZlibCompression(data, len, true, deflator_->strm(), &comprBuf_[0], comprBuf_.size(), *sink_);
+      } break;
+
+      case BZIP2: {
+        // bzlib2 can not be reset, so we have to make
+        // a new deflator every time
+        bz_stream strm;
+        BZ2DeflateHandle h(strm);
+        doBZ2Compression(data, len, true, strm, &comprBuf_[0], comprBuf_.size(), *sink_);
+      } break;
+
+      default:
+        assert(!"Unhandled switch case in "
+            "CStringStream::writeCompressed. "
+            "This is a bug. Please report.");
     }
 
-    CStringStream::CompressionMode CStringStream::writeCompressed()
-    {
-        // Compress and dump to sink
-        assert(sink_);
-
-        unsigned long long len = 0;
-        const char* data = buf_.getPutBuffer(&len);
-        if (len == 0)
-            return NOT_COMPRESSED;
-
-        if (mode_ == NOT_COMPRESSED || len < minSizeToCompress_)
-        {
-            sink_->write(data, len);
-            return NOT_COMPRESSED;
-        }
-
-        switch (mode_)
-        {
-        case ZLIB:
-        {
-            if (!deflator_.get())
-                deflator_ = CPP11_auto_ptr<ZlibDeflateHandle>(
-                    new ZlibDeflateHandle(compressionLevel_));
-            doZlibCompression(data, len, true, deflator_->strm(),
-                              &comprBuf_[0], comprBuf_.size(), *sink_);
-        }        
+    seekp(0);
+    return mode_;
+  }
+
+  bool CStringStream::getCompressionModeByName(const char *name, CompressionMode *m) {
+    static const char *names[] = {"n", "z", "b"};
+    if (!name || !m)
+      return false;
+    for (unsigned i = 0; i < sizeof(names) / sizeof(names[0]); ++i)
+      if (strcasecmp(name, names[i]) == 0) {
+        *m = static_cast<CompressionMode>(i);
+        return true;
+      }
+    return false;
+  }
+
+  std::string CStringStream::compressionModeName(const CompressionMode m, const bool useShortName) {
+    std::string mode;
+    switch (m) {
+      case NOT_COMPRESSED:
+        mode = useShortName ? "n" : "not compressed";
         break;
-
-        case BZIP2:
-        {
-            // bzlib2 can not be reset, so we have to make
-            // a new deflator every time
-            bz_stream strm;
-            BZ2DeflateHandle h(strm);
-            doBZ2Compression(data, len, true, strm,
-                             &comprBuf_[0], comprBuf_.size(), *sink_);
-        }
+      case ZLIB:
+        mode = useShortName ? "z" : "zlib";
         break;
-
-        default:
-            assert(!"Unhandled switch case in "
-                   "CStringStream::writeCompressed. "
-                   "This is a bug. Please report.");
-        }
-
-        seekp(0);
-        return mode_;
-    }
-
-    bool CStringStream::getCompressionModeByName(const char* name,
-                                                 CompressionMode* m)
-    {
-        static const char* names[] = {
-            "n",
-            "z",
-            "b"
-        };
-        if (!name || !m)
-            return false;
-        for (unsigned i=0; i<sizeof(names)/sizeof(names[0]); ++i)
-            if (strcasecmp(name, names[i]) == 0)
-            {
-                *m = static_cast<CompressionMode>(i);
-                return true;
-            }
-        return false;
-    }
-
-    std::string CStringStream::compressionModeName(const CompressionMode m,
-                                                   const bool useShortName)
-    {
-        std::string mode;
-        switch (m)
-        {
-        case NOT_COMPRESSED:
-            mode = useShortName ? "n" : "not compressed";
-            break;
-        case ZLIB:
-            mode = useShortName ? "z" : "zlib";
-            break;
-        case BZIP2:
-            mode = useShortName ? "b" : "bzip2";
-            break;
-        default:
-            assert(!"Unhandled switch case in "
-                   "CStringStream::compressionModeName. "
-                   "This is a bug. Please report.");
-        }
-        return mode;
+      case BZIP2:
+        mode = useShortName ? "b" : "bzip2";
+        break;
+      default:
+        assert(!"Unhandled switch case in "
+            "CStringStream::compressionModeName. "
+            "This is a bug. Please report.");
     }
-}
+    return mode;
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/src/CatalogEntry.cc b/Alignment/Geners/src/CatalogEntry.cc
index 0af54c50efdb6..65dee0ec12e8c 100644
--- a/Alignment/Geners/src/CatalogEntry.cc
+++ b/Alignment/Geners/src/CatalogEntry.cc
@@ -5,119 +5,105 @@
 #include "Alignment/Geners/interface/binaryIO.hh"
 
 namespace gs {
-    CatalogEntry::CatalogEntry()
-        : ItemDescriptor(),
-          id_(0),
-          len_(0),
-          location_(ItemLocation(std::streampos(0), nullptr))
-    {
+  CatalogEntry::CatalogEntry()
+      : ItemDescriptor(), id_(0), len_(0), location_(ItemLocation(std::streampos(0), nullptr)) {}
+
+  CatalogEntry::CatalogEntry(const ItemDescriptor &r,
+                             const unsigned long long id,
+                             const unsigned compressionCod,
+                             const unsigned long long itemLength,
+                             const ItemLocation &location,
+                             const unsigned long long offset)
+      : ItemDescriptor(r),
+        id_(id),
+        len_(itemLength),
+        offset_(offset),
+        compressionCode_(compressionCod),
+        location_(location) {
+    if (!id)
+      throw gs::IOInvalidArgument("In CatalogEntry constructor: invalid item id");
+  }
+
+  bool CatalogEntry::isEqual(const ItemDescriptor &other) const {
+    if ((void *)this == (void *)(&other))
+      return true;
+    if (!ItemDescriptor::isEqual(other))
+      return false;
+    const CatalogEntry &r = static_cast<const CatalogEntry &>(other);
+    return id_ == r.id_ && len_ == r.len_ && offset_ == r.offset_ && compressionCode_ == r.compressionCode_ &&
+           location_ == r.location_;
+  }
+
+  bool CatalogEntry::write(std::ostream &of) const {
+    type().write(of);
+    write_pod(of, ioPrototype());
+    write_pod(of, name());
+    write_pod(of, category());
+    write_pod(of, id_);
+    write_pod(of, len_);
+    write_pod(of, compressionCode_);
+
+    // Most items will not have offsets
+    unsigned char hasOffset = offset_ > 0ULL;
+    write_pod(of, hasOffset);
+    if (hasOffset)
+      write_pod(of, offset_);
+
+    location_.write(of);
+
+    return !of.fail();
+  }
+
+  CatalogEntry *CatalogEntry::read(const ClassId &id, const ClassId &locId, std::istream &in) {
+    static const ClassId current(ClassId::makeId<CatalogEntry>());
+    current.ensureSameId(id);
+
+    ClassId itemClass(in, 1);
+
+    std::string ioPrototype, name, category;
+    read_pod(in, &ioPrototype);
+    read_pod(in, &name);
+    read_pod(in, &category);
+
+    unsigned long long itemId = 0, itemLen = 0;
+    read_pod(in, &itemId);
+    read_pod(in, &itemLen);
+
+    unsigned coCode;
+    read_pod(in, &coCode);
+
+    unsigned long long offset = 0;
+    unsigned char hasOffset = 0;
+    read_pod(in, &hasOffset);
+    if (hasOffset)
+      read_pod(in, &offset);
+
+    CatalogEntry *rec = nullptr;
+    if (!in.fail()) {
+      CPP11_auto_ptr<ItemLocation> loc(ItemLocation::read(locId, in));
+      if (loc.get())
+        rec = new CatalogEntry(ItemDescriptor(itemClass, ioPrototype.c_str(), name.c_str(), category.c_str()),
+                               itemId,
+                               coCode,
+                               itemLen,
+                               *loc,
+                               offset);
     }
-
-    CatalogEntry::CatalogEntry(const ItemDescriptor& r,
-                               const unsigned long long id,
-                               const unsigned compressionCod,
-                               const unsigned long long itemLength,
-                               const ItemLocation& location,
-                               const unsigned long long offset)
-        : ItemDescriptor(r),
-          id_(id),
-          len_(itemLength),
-          offset_(offset),
-          compressionCode_(compressionCod),
-          location_(location)
-    {
-        if (!id) throw gs::IOInvalidArgument(
-            "In CatalogEntry constructor: invalid item id");
-    }
-
-    bool CatalogEntry::isEqual(const ItemDescriptor& other) const
-    {
-        if ((void*)this == (void*)(&other))
-            return true;
-        if (!ItemDescriptor::isEqual(other))
-            return false;
-        const CatalogEntry& r = static_cast<const CatalogEntry&>(other);
-        return id_ == r.id_ && len_ == r.len_ &&
-               offset_ == r.offset_ &&
-               compressionCode_ == r.compressionCode_ &&
-               location_ == r.location_;
-    }
-
-    bool CatalogEntry::write(std::ostream& of) const
-    {
-        type().write(of);
-        write_pod(of, ioPrototype());
-        write_pod(of, name());
-        write_pod(of, category());
-        write_pod(of, id_);
-        write_pod(of, len_);
-        write_pod(of, compressionCode_);
-
-        // Most items will not have offsets
-        unsigned char hasOffset = offset_ > 0ULL;
-        write_pod(of, hasOffset);
-        if (hasOffset)
-            write_pod(of, offset_);
-
-        location_.write(of);
-
-        return !of.fail();
-    }
-
-    CatalogEntry* CatalogEntry::read(const ClassId& id,
-                                     const ClassId& locId,
-                                     std::istream& in)
-    {
-        static const ClassId current(ClassId::makeId<CatalogEntry>());
-        current.ensureSameId(id);
-
-        ClassId itemClass(in, 1);
-
-        std::string ioPrototype, name, category;
-        read_pod(in, &ioPrototype);
-        read_pod(in, &name);
-        read_pod(in, &category);
-
-        unsigned long long itemId = 0, itemLen = 0;
-        read_pod(in, &itemId);
-        read_pod(in, &itemLen);
-
-        unsigned coCode;
-        read_pod(in, &coCode);
-
-        unsigned long long offset = 0;
-        unsigned char hasOffset = 0;
-        read_pod(in, &hasOffset);
-        if (hasOffset)
-            read_pod(in, &offset);
-
-        CatalogEntry* rec = nullptr;
-        if (!in.fail())
-        {
-            CPP11_auto_ptr<ItemLocation> loc(ItemLocation::read(locId, in));
-            if (loc.get())
-                rec = new CatalogEntry(
-                    ItemDescriptor(itemClass, ioPrototype.c_str(),
-                                   name.c_str(), category.c_str()),
-                    itemId, coCode, itemLen, *loc, offset);
-        }
-        return rec;
-    }
-
-    bool CatalogEntry::humanReadable(std::ostream& os) const
-    {
-        os << "Id: " << id_ << '\n'
-           << "Class: " << type().id() << '\n'
-           << "Name: " << name() << '\n'
-           << "Category: " << category() << '\n'
-           << "I/O prototype: " << ioPrototype() << '\n'
-           << "URI: " << location().URI() << '\n'
-           << "Cached: " << location().cachedItemURI() << '\n'
-           << "Compression: " << compressionCode_ << '\n'
-           << "Length: " << len_ << '\n'
-           << "Streampos: " << location().streamPosition() << '\n'
-           << "Offset: " << offset_
-           << std::endl;
-        return !os.fail();
-    }
-}
+    return rec;
+  }
+
+  bool CatalogEntry::humanReadable(std::ostream &os) const {
+    os << "Id: " << id_ << '\n'
+       << "Class: " << type().id() << '\n'
+       << "Name: " << name() << '\n'
+       << "Category: " << category() << '\n'
+       << "I/O prototype: " << ioPrototype() << '\n'
+       << "URI: " << location().URI() << '\n'
+       << "Cached: " << location().cachedItemURI() << '\n'
+       << "Compression: " << compressionCode_ << '\n'
+       << "Length: " << len_ << '\n'
+       << "Streampos: " << location().streamPosition() << '\n'
+       << "Offset: " << offset_ << std::endl;
+    return !os.fail();
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/src/CatalogIO.cc b/Alignment/Geners/src/CatalogIO.cc
index 08aeaa2df32a9..fb8a9d86daeb2 100644
--- a/Alignment/Geners/src/CatalogIO.cc
+++ b/Alignment/Geners/src/CatalogIO.cc
@@ -1,24 +1,24 @@
 #include "Alignment/Geners/interface/CatalogIO.hh"
 
 namespace gs {
-    bool writeBinaryCatalog(std::ostream& os, const unsigned compressionCode,
-                            const unsigned mergeLevel,
-                            const std::vector<std::string>& annotations,
-                            const AbsCatalog& catalog, const unsigned formatId)
-    {
-        os.seekp(0, std::ios_base::beg);
+  bool writeBinaryCatalog(std::ostream &os,
+                          const unsigned compressionCode,
+                          const unsigned mergeLevel,
+                          const std::vector<std::string> &annotations,
+                          const AbsCatalog &catalog,
+                          const unsigned formatId) {
+    os.seekp(0, std::ios_base::beg);
 
-        const unsigned endianness = 0x01020304;
-        const unsigned char sizelong = sizeof(long);
+    const unsigned endianness = 0x01020304;
+    const unsigned char sizelong = sizeof(long);
 
-        write_pod(os, formatId);
-        write_pod(os, endianness);
-        write_pod(os, sizelong);
-        write_pod(os, compressionCode);
-        write_pod(os, mergeLevel);
-        write_pod_vector(os, annotations);
+    write_pod(os, formatId);
+    write_pod(os, endianness);
+    write_pod(os, sizelong);
+    write_pod(os, compressionCode);
+    write_pod(os, mergeLevel);
+    write_pod_vector(os, annotations);
 
-        return !os.fail() && 
-               catalog.classId().write(os) && catalog.write(os);
-    }
-}
+    return !os.fail() && catalog.classId().write(os) && catalog.write(os);
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/src/CharBuffer.cc b/Alignment/Geners/src/CharBuffer.cc
index fdea64c9c8b55..ad541e564de71 100644
--- a/Alignment/Geners/src/CharBuffer.cc
+++ b/Alignment/Geners/src/CharBuffer.cc
@@ -1,73 +1,66 @@
-#include <cstring>
-#include <climits>
-#include <cassert>
 #include "Alignment/Geners/interface/IOException.hh"
+#include <cassert>
+#include <climits>
+#include <cstring>
 
-#include "Alignment/Geners/interface/binaryIO.hh"
 #include "Alignment/Geners/interface/CharBuffer.hh"
+#include "Alignment/Geners/interface/binaryIO.hh"
 
 namespace gs {
-    bool CharBuffer::write(std::ostream& os) const
-    {
-        unsigned long long tmp = 0ULL;
-        const char* buf = buf_.getPutBuffer(&tmp);
-        write_pod(os, tmp);
-        os.write(buf, tmp);
-        return !os.fail();
-    }
+  bool CharBuffer::write(std::ostream &os) const {
+    unsigned long long tmp = 0ULL;
+    const char *buf = buf_.getPutBuffer(&tmp);
+    write_pod(os, tmp);
+    os.write(buf, tmp);
+    return !os.fail();
+  }
 
-    unsigned long CharBuffer::size() const
-    {
-        unsigned long long tmp = 0ULL;
-        buf_.getPutBuffer(&tmp);
-        if (tmp > ULONG_MAX) 
-            throw gs::IOLengthError("In CharBuffer::size: buffer is too large");
-        return static_cast<unsigned long>(tmp);
-    }
+  unsigned long CharBuffer::size() const {
+    unsigned long long tmp = 0ULL;
+    buf_.getPutBuffer(&tmp);
+    if (tmp > ULONG_MAX)
+      throw gs::IOLengthError("In CharBuffer::size: buffer is too large");
+    return static_cast<unsigned long>(tmp);
+  }
 
-    void CharBuffer::restore(const ClassId& id, std::istream& in,
-                             CharBuffer* buf)
-    {
-        static const ClassId current(ClassId::makeId<CharBuffer>());
+  void CharBuffer::restore(const ClassId &id, std::istream &in, CharBuffer *buf) {
+    static const ClassId current(ClassId::makeId<CharBuffer>());
 
-        assert(buf);
-        current.ensureSameId(id);
+    assert(buf);
+    current.ensureSameId(id);
 
-        unsigned long long tmp = 0ULL;
-        read_pod(in, &tmp);
-        buf->clear();
-        buf->seekp(0);
-        
-        const unsigned locLen = 4096;
-        char local[locLen];
-        std::streambuf* inbuf = in.rdbuf();
-        std::streambuf* outbuf = buf->rdbuf();
+    unsigned long long tmp = 0ULL;
+    read_pod(in, &tmp);
+    buf->clear();
+    buf->seekp(0);
 
-        while (tmp > locLen)
-        {
-            inbuf->sgetn(local, locLen);
-            outbuf->sputn(local, locLen);
-            tmp -= locLen;
-        }
-        if (tmp)
-        {
-            inbuf->sgetn(local, tmp);
-            outbuf->sputn(local, tmp);
-        }
-        if (in.fail()) throw IOReadFailure(
-            "In gs::CharBuffer::restore: input stream failure");
-        if (buf->fail()) throw IOWriteFailure(
-            "In gs::CharBuffer::restore: buffer stream failure");
-    }
+    const unsigned locLen = 4096;
+    char local[locLen];
+    std::streambuf *inbuf = in.rdbuf();
+    std::streambuf *outbuf = buf->rdbuf();
 
-    bool CharBuffer::operator==(const CharBuffer& r) const
-    {
-        unsigned long long tmp = 0ULL;
-        const char* buf = buf_.getPutBuffer(&tmp);
-        unsigned long long tmp2 = 0ULL;
-        const char* buf2 = r.buf_.getPutBuffer(&tmp2);
-        if (tmp != tmp2)
-            return false;
-        return memcmp(buf, buf2, tmp) == 0;
+    while (tmp > locLen) {
+      inbuf->sgetn(local, locLen);
+      outbuf->sputn(local, locLen);
+      tmp -= locLen;
+    }
+    if (tmp) {
+      inbuf->sgetn(local, tmp);
+      outbuf->sputn(local, tmp);
     }
-}
+    if (in.fail())
+      throw IOReadFailure("In gs::CharBuffer::restore: input stream failure");
+    if (buf->fail())
+      throw IOWriteFailure("In gs::CharBuffer::restore: buffer stream failure");
+  }
+
+  bool CharBuffer::operator==(const CharBuffer &r) const {
+    unsigned long long tmp = 0ULL;
+    const char *buf = buf_.getPutBuffer(&tmp);
+    unsigned long long tmp2 = 0ULL;
+    const char *buf2 = r.buf_.getPutBuffer(&tmp2);
+    if (tmp != tmp2)
+      return false;
+    return memcmp(buf, buf2, tmp) == 0;
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/src/ClassId.cc b/Alignment/Geners/src/ClassId.cc
index 1d62012857728..f2ce6886749d7 100644
--- a/Alignment/Geners/src/ClassId.cc
+++ b/Alignment/Geners/src/ClassId.cc
@@ -1,369 +1,314 @@
-#include <sstream>
-#include <cstring>
-#include <cstdio>
-#include <cstdlib>
+#include "Alignment/Geners/interface/IOException.hh"
 #include <cassert>
 #include <cctype>
-#include "Alignment/Geners/interface/IOException.hh"
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <sstream>
 
 #include "Alignment/Geners/interface/ClassId.hh"
-#include "Alignment/Geners/interface/binaryIO.hh"
 #include "Alignment/Geners/interface/IOException.hh"
+#include "Alignment/Geners/interface/binaryIO.hh"
 
 #define NLOCAL 1024
 
 namespace gs {
-    void ClassId::setVersion(const unsigned newVersion)
-    {
-        if (version_ != newVersion)
-        {
-            version_ = newVersion;
+  void ClassId::setVersion(const unsigned newVersion) {
+    if (version_ != newVersion) {
+      version_ = newVersion;
 
-            // Need to update the id string
-            const std::size_t lastOpen = id_.find_last_of('(');
-            assert(lastOpen != std::string::npos);
+      // Need to update the id string
+      const std::size_t lastOpen = id_.find_last_of('(');
+      assert(lastOpen != std::string::npos);
 
-            std::ostringstream os;
-            os << id_.substr(0, lastOpen) << '(' << version_ << ')';
-            if (isPtr_)
-                os << '*';
-            id_ = os.str();
-        }
+      std::ostringstream os;
+      os << id_.substr(0, lastOpen) << '(' << version_ << ')';
+      if (isPtr_)
+        os << '*';
+      id_ = os.str();
     }
+  }
 
-    void ClassId::ensureSameId(const ClassId& id) const
-    {
-        if (name_.empty())
-            throw gs::IOInvalidArgument(
-                "In gs::ClassId::ensureSameId: reference id is not valid");
-        if (id.name_.empty())
-            throw gs::IOInvalidArgument(
-                "In gs::ClassId::ensureSameId: argument id is not valid");
-        if (id_ != id.id_)
-        {
-            std::ostringstream os;
-            os << "In gs::ClassId::ensureSameId: expected \""
-               << id_ << "\", got \"" << id.id_ << "\"";
-            throw gs::IOInvalidArgument(os.str());
-        }
+  void ClassId::ensureSameId(const ClassId &id) const {
+    if (name_.empty())
+      throw gs::IOInvalidArgument("In gs::ClassId::ensureSameId: reference id is not valid");
+    if (id.name_.empty())
+      throw gs::IOInvalidArgument("In gs::ClassId::ensureSameId: argument id is not valid");
+    if (id_ != id.id_) {
+      std::ostringstream os;
+      os << "In gs::ClassId::ensureSameId: expected \"" << id_ << "\", got \"" << id.id_ << "\"";
+      throw gs::IOInvalidArgument(os.str());
     }
+  }
 
-    void ClassId::ensureSameName(const ClassId& id) const
-    {
-        if (name_.empty())
-            throw gs::IOInvalidArgument(
-                "In gs::ClassId::ensureSameName: reference id is not valid");
-        if (id.name_.empty())
-            throw gs::IOInvalidArgument(
-                "In gs::ClassId::ensureSameName: argument id is not valid");
-        if (name_ != id.name_)
-        {
-            std::ostringstream os;
-            os << "In gs::ClassId::ensureSameName: expected class name \""
-               << name_ << "\", got \"" << id.name_ << "\"";
-            throw gs::IOInvalidArgument(os.str());
-        }
+  void ClassId::ensureSameName(const ClassId &id) const {
+    if (name_.empty())
+      throw gs::IOInvalidArgument("In gs::ClassId::ensureSameName: reference id is not valid");
+    if (id.name_.empty())
+      throw gs::IOInvalidArgument("In gs::ClassId::ensureSameName: argument id is not valid");
+    if (name_ != id.name_) {
+      std::ostringstream os;
+      os << "In gs::ClassId::ensureSameName: expected class name \"" << name_ << "\", got \"" << id.name_ << "\"";
+      throw gs::IOInvalidArgument(os.str());
     }
+  }
 
-    void ClassId::ensureSameVersion(const ClassId& id) const
-    {
-        if (name_.empty())
-            throw gs::IOInvalidArgument(
-                "In gs::ClassId::ensureSameVersion: reference id is not valid");
-        if (id.name_.empty())
-            throw gs::IOInvalidArgument(
-                "In gs::ClassId::ensureSameVersion: argument id is not valid");
-        if (version_ != id.version_)
-        {
-            std::ostringstream os;
-            os << "In gs::ClassId::ensureSameVersion: expected version "
-               << version_ << " for class " << id.name_
-               << ", got " << id.version_;
-            throw gs::IOInvalidArgument(os.str());
-        }
+  void ClassId::ensureSameVersion(const ClassId &id) const {
+    if (name_.empty())
+      throw gs::IOInvalidArgument("In gs::ClassId::ensureSameVersion: reference id is not valid");
+    if (id.name_.empty())
+      throw gs::IOInvalidArgument("In gs::ClassId::ensureSameVersion: argument id is not valid");
+    if (version_ != id.version_) {
+      std::ostringstream os;
+      os << "In gs::ClassId::ensureSameVersion: expected version " << version_ << " for class " << id.name_ << ", got "
+         << id.version_;
+      throw gs::IOInvalidArgument(os.str());
     }
+  }
 
-    void ClassId::ensureVersionInRange(const unsigned vmin,
-                                       const unsigned vmax) const
-    {
-        if (name_.empty())
-            throw gs::IOInvalidArgument(
-                "In gs::ClassId::ensureVersionInRange: id is not valid");
-        if (version_ < vmin || version_ > vmax)
-        {
-            std::ostringstream os;
-            os << "In gs::ClassId::ensureVersionInRange: expected version"
-               << " number for class " << name_ << " to be in range ["
-               <<  vmin << ", " << vmax << "], got " << version_;
-            throw gs::IOInvalidArgument(os.str());
-        }
+  void ClassId::ensureVersionInRange(const unsigned vmin, const unsigned vmax) const {
+    if (name_.empty())
+      throw gs::IOInvalidArgument("In gs::ClassId::ensureVersionInRange: id is not valid");
+    if (version_ < vmin || version_ > vmax) {
+      std::ostringstream os;
+      os << "In gs::ClassId::ensureVersionInRange: expected version"
+         << " number for class " << name_ << " to be in range [" << vmin << ", " << vmax << "], got " << version_;
+      throw gs::IOInvalidArgument(os.str());
     }
+  }
 
-    bool ClassId::validatePrefix(const char* prefix)
-    {
-        // Prefix can not be an empty string
-        if (prefix == nullptr)
-            return false;
-        const unsigned len = strlen(prefix);
-        if (len == 0)
-            return false;
-
-        // Characters '(' and ')' are special and can not be used
-        // as parts of class names unless they enclose a version
-        // number. Version number is an unsigned integer.
-        bool inVersion = false;
-        unsigned vstart = 0;
-        for (unsigned i=0; i<len; ++i)
-        {
-            if (prefix[i] == '(')
-            {
-                // Can't have stacked parentheses.
-                // Can't have '(' as the very first character.
-                if (inVersion || i == 0)
-                    return false;
-                inVersion = true;
-                vstart = i + 1;
-            }
-            else if (prefix[i] == ')')
-            {
-                // Can't have closing parentheses withoup opening ones
-                if (!inVersion)
-                    return false;
-                inVersion = false;
-                if (vstart >= i)
-                    return false;
-                char *endptr;
-                // Compiler can complain about unused result of "strtoul"
-                unsigned long dummy = strtoul(prefix+vstart, &endptr, 10);
-                ++dummy;
-                if (endptr != prefix+i)
-                    return false;
-            }
-        }
-        // Can't have missing closing parentheses
-        if (inVersion)
-            return false;
+  bool ClassId::validatePrefix(const char *prefix) {
+    // Prefix can not be an empty string
+    if (prefix == nullptr)
+      return false;
+    const unsigned len = strlen(prefix);
+    if (len == 0)
+      return false;
 
-        return true;
+    // Characters '(' and ')' are special and can not be used
+    // as parts of class names unless they enclose a version
+    // number. Version number is an unsigned integer.
+    bool inVersion = false;
+    unsigned vstart = 0;
+    for (unsigned i = 0; i < len; ++i) {
+      if (prefix[i] == '(') {
+        // Can't have stacked parentheses.
+        // Can't have '(' as the very first character.
+        if (inVersion || i == 0)
+          return false;
+        inVersion = true;
+        vstart = i + 1;
+      } else if (prefix[i] == ')') {
+        // Can't have closing parentheses withoup opening ones
+        if (!inVersion)
+          return false;
+        inVersion = false;
+        if (vstart >= i)
+          return false;
+        char *endptr;
+        // Compiler can complain about unused result of "strtoul"
+        unsigned long dummy = strtoul(prefix + vstart, &endptr, 10);
+        ++dummy;
+        if (endptr != prefix + i)
+          return false;
+      }
     }
+    // Can't have missing closing parentheses
+    if (inVersion)
+      return false;
 
-    void ClassId::initialize(const char* prefix, const unsigned version,
-                             const bool isPtr)
-    {
-        std::ostringstream os;
-        if (!validatePrefix(prefix))
-        {
-            if (prefix)
-                os << "In gs::ClassId::initialize: bad class name prefix \""
-                   << prefix << "\". Check for problematic parentheses.";
-            else
-                os << "In gs::ClassId::initialize: NULL class name prefix.";
-            throw gs::IOInvalidArgument(os.str());
-        }
-        os << prefix << '(' << version << ')';
-        if (isPtr)
-            os << '*';
-        id_ = os.str();
-        version_ = version;
-        isPtr_ = isPtr;
-        makeName();
+    return true;
+  }
+
+  void ClassId::initialize(const char *prefix, const unsigned version, const bool isPtr) {
+    std::ostringstream os;
+    if (!validatePrefix(prefix)) {
+      if (prefix)
+        os << "In gs::ClassId::initialize: bad class name prefix \"" << prefix
+           << "\". Check for problematic parentheses.";
+      else
+        os << "In gs::ClassId::initialize: NULL class name prefix.";
+      throw gs::IOInvalidArgument(os.str());
     }
+    os << prefix << '(' << version << ')';
+    if (isPtr)
+      os << '*';
+    id_ = os.str();
+    version_ = version;
+    isPtr_ = isPtr;
+    makeName();
+  }
 
-    // Remove all version numbers from the class id
-    bool ClassId::makeName()
-    {
-        char localbuf[NLOCAL];
-        char* buf = localbuf;
-        const unsigned idLen = id_.size();
-        if (idLen+1U > NLOCAL)
-            buf = new char[idLen+1U];
-        const char* from = id_.data();
-        bool inVersion = false;
-        unsigned ito=0;
-        for (unsigned ifrom=0; ifrom < idLen; ++ifrom)
-        {
-            if (from[ifrom] == '(')
-            {
-                if (inVersion) 
-                {
-                    if (buf != localbuf) delete [] buf;
-                    return false;
-                }
-                inVersion = true;
-            }
-            else if (from[ifrom] == ')')
-            {
-                if (!inVersion)
-                {
-                    if (buf != localbuf) delete [] buf;
-                    return false;
-                }
-                inVersion = false;
-            }
-            else if (!inVersion)
-                buf[ito++] = from[ifrom];
+  // Remove all version numbers from the class id
+  bool ClassId::makeName() {
+    char localbuf[NLOCAL];
+    char *buf = localbuf;
+    const unsigned idLen = id_.size();
+    if (idLen + 1U > NLOCAL)
+      buf = new char[idLen + 1U];
+    const char *from = id_.data();
+    bool inVersion = false;
+    unsigned ito = 0;
+    for (unsigned ifrom = 0; ifrom < idLen; ++ifrom) {
+      if (from[ifrom] == '(') {
+        if (inVersion) {
+          if (buf != localbuf)
+            delete[] buf;
+          return false;
         }
-        if (inVersion)
-        {
-            if (buf != localbuf) delete [] buf;
-            return false;
+        inVersion = true;
+      } else if (from[ifrom] == ')') {
+        if (!inVersion) {
+          if (buf != localbuf)
+            delete[] buf;
+          return false;
         }
-        buf[ito] = '\0';
-        name_ = buf;
-        if (buf != localbuf) delete [] buf;
-        return true;
+        inVersion = false;
+      } else if (!inVersion)
+        buf[ito++] = from[ifrom];
     }
+    if (inVersion) {
+      if (buf != localbuf)
+        delete[] buf;
+      return false;
+    }
+    buf[ito] = '\0';
+    name_ = buf;
+    if (buf != localbuf)
+      delete[] buf;
+    return true;
+  }
 
-    // Parse the version number and pointer switch
-    bool ClassId::makeVersion()
-    {
-        bool correct = false;
-        const unsigned ns = id_.size();
-        const char* const buf = id_.data();
-        const char* sep = buf + (ns - 1U);
-        if (*sep == '*')
-        {
-            isPtr_ = true;
-            --sep;
-        }
-        else
-            isPtr_ = false;
-        if (*sep == ')')
-        {
-            const char* closingBrace = sep;
-            for (; sep != buf; --sep)
-                if (*sep == '(')
-                    break;
-            if (sep != buf)
-            {
-                char* endptr;
-                version_ = strtoul(sep + 1, &endptr, 10);
-                if (endptr > sep + 1 && endptr == closingBrace)
-                    correct = true;
-            }
-        }
-        return correct;
+  // Parse the version number and pointer switch
+  bool ClassId::makeVersion() {
+    bool correct = false;
+    const unsigned ns = id_.size();
+    const char *const buf = id_.data();
+    const char *sep = buf + (ns - 1U);
+    if (*sep == '*') {
+      isPtr_ = true;
+      --sep;
+    } else
+      isPtr_ = false;
+    if (*sep == ')') {
+      const char *closingBrace = sep;
+      for (; sep != buf; --sep)
+        if (*sep == '(')
+          break;
+      if (sep != buf) {
+        char *endptr;
+        version_ = strtoul(sep + 1, &endptr, 10);
+        if (endptr > sep + 1 && endptr == closingBrace)
+          correct = true;
+      }
     }
+    return correct;
+  }
 
-    ClassId::ClassId(const std::string& id)
-        : id_(id)
-    {
-        if (!(!id_.empty() && makeName() && makeVersion()))
-        {
-            std::ostringstream os;
-            os << "In gs::ClassId::ClassId(const std::string&): "
-               << "invalid input id string \"" << id_ << "\"";
-            throw gs::IOInvalidArgument(os.str());
-        }
+  ClassId::ClassId(const std::string &id) : id_(id) {
+    if (!(!id_.empty() && makeName() && makeVersion())) {
+      std::ostringstream os;
+      os << "In gs::ClassId::ClassId(const std::string&): "
+         << "invalid input id string \"" << id_ << "\"";
+      throw gs::IOInvalidArgument(os.str());
     }
+  }
 
-    ClassId::ClassId(std::istream& in, int)
-    {
-        read_pod(in, &id_);
-        if (in.fail()) throw IOReadFailure(
-            "In gs::ClassId::ClassId(std::istream&, int): "
-            "input stream failure");
+  ClassId::ClassId(std::istream &in, int) {
+    read_pod(in, &id_);
+    if (in.fail())
+      throw IOReadFailure(
+          "In gs::ClassId::ClassId(std::istream&, int): "
+          "input stream failure");
 
-        if (!(!id_.empty() && makeName() && makeVersion()))
-        {
-            std::ostringstream os;
-            os << "In gs::ClassId::ClassId(std::istream&, int): "
-               << "read invalid id string \"" << id_ << "\"";
-            throw IOInvalidData(os.str());
-        }
+    if (!(!id_.empty() && makeName() && makeVersion())) {
+      std::ostringstream os;
+      os << "In gs::ClassId::ClassId(std::istream&, int): "
+         << "read invalid id string \"" << id_ << "\"";
+      throw IOInvalidData(os.str());
     }
+  }
 
-    bool ClassId::write(std::ostream& os) const
-    {
-        write_pod(os, id_);
-        return !os.fail();
-    }
+  bool ClassId::write(std::ostream &os) const {
+    write_pod(os, id_);
+    return !os.fail();
+  }
 
-    ClassId::ClassId()
-        : name_(""), id_("(0)"), version_(0U), isPtr_(false)
-    {
-    }
+  ClassId::ClassId() : name_(""), id_("(0)"), version_(0U), isPtr_(false) {}
 
-    ClassId ClassId::invalidId()
-    {
-        ClassId dummy;
-        return dummy;
-    }
+  ClassId ClassId::invalidId() {
+    ClassId dummy;
+    return dummy;
+  }
 
-    bool ClassId::isTemplate() const
-    {
-        const std::size_t leftBrak = id_.find('<');
-        const std::size_t rightBrak = id_.rfind('>');
-        return leftBrak != std::string::npos && 
-               rightBrak != std::string::npos && 
-               leftBrak < rightBrak;
-    }
+  bool ClassId::isTemplate() const {
+    const std::size_t leftBrak = id_.find('<');
+    const std::size_t rightBrak = id_.rfind('>');
+    return leftBrak != std::string::npos && rightBrak != std::string::npos && leftBrak < rightBrak;
+  }
 
-    void ClassId::templateParameters(
-        std::vector<std::vector<ClassId> >* params) const
-    {
-        assert(params);
-        params->clear();
-        const std::size_t leftBrak = id_.find('<');
-        const std::size_t rightBrak = id_.rfind('>');
-        if (leftBrak != std::string::npos && 
-            rightBrak != std::string::npos && 
-            leftBrak < rightBrak)
-        {
-            // Count commas and angle brackets
-            unsigned ncommas = 0;
-            int nbrackets = 0;
-            for (std::size_t pos = leftBrak+1; pos<rightBrak; ++pos)
-            {
-                const char c = id_[pos];
-                if (c == '<') ++nbrackets;
-                else if (c == '>') --nbrackets;
-                else if (c == ',' && nbrackets == 0)
-                    ++ncommas;
-            }
+  void ClassId::templateParameters(std::vector<std::vector<ClassId>> *params) const {
+    assert(params);
+    params->clear();
+    const std::size_t leftBrak = id_.find('<');
+    const std::size_t rightBrak = id_.rfind('>');
+    if (leftBrak != std::string::npos && rightBrak != std::string::npos && leftBrak < rightBrak) {
+      // Count commas and angle brackets
+      unsigned ncommas = 0;
+      int nbrackets = 0;
+      for (std::size_t pos = leftBrak + 1; pos < rightBrak; ++pos) {
+        const char c = id_[pos];
+        if (c == '<')
+          ++nbrackets;
+        else if (c == '>')
+          --nbrackets;
+        else if (c == ',' && nbrackets == 0)
+          ++ncommas;
+      }
 
-            // Must be a well-formed name
-            if (nbrackets)
-            {
-                std::ostringstream os;
-                os << "In gs::ClassId::templateParameters: "
-                   << "unbalanced angle brackets in the "
-                   << "template id \"" << id_ << "\"";
-                throw gs::IOInvalidArgument(os.str());
-            }
+      // Must be a well-formed name
+      if (nbrackets) {
+        std::ostringstream os;
+        os << "In gs::ClassId::templateParameters: "
+           << "unbalanced angle brackets in the "
+           << "template id \"" << id_ << "\"";
+        throw gs::IOInvalidArgument(os.str());
+      }
 
-            // Reserve a proper size vector
-            params->resize(ncommas + 1);
-            for (unsigned i=0; i<=ncommas; ++i)
-                (*params)[i].reserve(1);
+      // Reserve a proper size vector
+      params->resize(ncommas + 1);
+      for (unsigned i = 0; i <= ncommas; ++i)
+        (*params)[i].reserve(1);
 
-            // Cycle over commas again and fill the ids
-            ncommas = 0;
-            nbrackets = 0;
-            std::size_t begin = leftBrak + 1;
-            for (std::size_t pos = begin; pos<rightBrak; ++pos)
-            {
-                const char c = id_[pos];
-                if (c == '<') ++nbrackets;
-                else if (c == '>') --nbrackets;
-                else if (c == ',' && nbrackets == 0)
-                {
-                    while (isspace(id_[begin])) ++begin;
-                    std::size_t end = pos - 1;
-                    while (isspace(id_[end])) --end;
-                    ++end;
-                    (*params)[ncommas].push_back(
-                        ClassId(id_.substr(begin, end - begin)));
-                    begin = pos + 1;
-                    ++ncommas;
-                }
-            }
-            while (isspace(id_[begin])) ++begin;
-            std::size_t end = rightBrak - 1;
-            while (isspace(id_[end])) --end;
-            ++end;
-            (*params)[ncommas].push_back(
-                ClassId(id_.substr(begin, end - begin)));
+      // Cycle over commas again and fill the ids
+      ncommas = 0;
+      nbrackets = 0;
+      std::size_t begin = leftBrak + 1;
+      for (std::size_t pos = begin; pos < rightBrak; ++pos) {
+        const char c = id_[pos];
+        if (c == '<')
+          ++nbrackets;
+        else if (c == '>')
+          --nbrackets;
+        else if (c == ',' && nbrackets == 0) {
+          while (isspace(id_[begin]))
+            ++begin;
+          std::size_t end = pos - 1;
+          while (isspace(id_[end]))
+            --end;
+          ++end;
+          (*params)[ncommas].push_back(ClassId(id_.substr(begin, end - begin)));
+          begin = pos + 1;
+          ++ncommas;
         }
+      }
+      while (isspace(id_[begin]))
+        ++begin;
+      std::size_t end = rightBrak - 1;
+      while (isspace(id_[end]))
+        --end;
+      ++end;
+      (*params)[ncommas].push_back(ClassId(id_.substr(begin, end - begin)));
     }
-}
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/src/ColumnBuffer.cc b/Alignment/Geners/src/ColumnBuffer.cc
index 9349df6d552a0..9f0a97cbdd204 100644
--- a/Alignment/Geners/src/ColumnBuffer.cc
+++ b/Alignment/Geners/src/ColumnBuffer.cc
@@ -2,63 +2,52 @@
 #include "Alignment/Geners/interface/streamposIO.hh"
 
 namespace gs {
-    namespace Private {
-        bool ColumnBuffer::write(std::ostream& os) const
-        {
-            write_pod(os, firstrow);
-            write_pod(os, lastrowp1);
-            const unsigned char isPod = (podsize ? 1 : 0);
-            write_pod(os, isPod);
-            if (isPod)
-                write_pod(os, podsize);
-            else
-                write_pod_vector(os, offsets);
-            return !os.fail() && buf.write(os);
-        }
+  namespace Private {
+    bool ColumnBuffer::write(std::ostream &os) const {
+      write_pod(os, firstrow);
+      write_pod(os, lastrowp1);
+      const unsigned char isPod = (podsize ? 1 : 0);
+      write_pod(os, isPod);
+      if (isPod)
+        write_pod(os, podsize);
+      else
+        write_pod_vector(os, offsets);
+      return !os.fail() && buf.write(os);
+    }
 
-        void ColumnBuffer::restore(const ClassId& id, const ClassId& bufId,
-                                   std::istream& is, ColumnBuffer* obj)
-        {
-            assert(obj);
-            obj->classId().ensureSameId(id);
+    void ColumnBuffer::restore(const ClassId &id, const ClassId &bufId, std::istream &is, ColumnBuffer *obj) {
+      assert(obj);
+      obj->classId().ensureSameId(id);
 
-            read_pod(is, &obj->firstrow);
-            read_pod(is, &obj->lastrowp1);
-            unsigned char isPod;
-            read_pod(is, &isPod);
-            if (isPod)
-            {
-                obj->offsets.clear();
-                read_pod(is, &obj->podsize);
-            }
-            else
-            {
-                obj->podsize = 0;
-                read_pod_vector(is, &obj->offsets);
-            }
-            if (is.fail()) throw IOReadFailure(
-                "In gs::Private::ColumnBuffer::restore: input stream failure");
+      read_pod(is, &obj->firstrow);
+      read_pod(is, &obj->lastrowp1);
+      unsigned char isPod;
+      read_pod(is, &isPod);
+      if (isPod) {
+        obj->offsets.clear();
+        read_pod(is, &obj->podsize);
+      } else {
+        obj->podsize = 0;
+        read_pod_vector(is, &obj->offsets);
+      }
+      if (is.fail())
+        throw IOReadFailure("In gs::Private::ColumnBuffer::restore: input stream failure");
 
-            // Size of a POD object can not be zero
-            if (isPod && !obj->podsize) throw IOInvalidData(
-                "In gs::Private::ColumnBuffer::restore: corrupted record");
+      // Size of a POD object can not be zero
+      if (isPod && !obj->podsize)
+        throw IOInvalidData("In gs::Private::ColumnBuffer::restore: corrupted record");
 
-            CharBuffer::restore(bufId, is, &obj->buf);
-        }
+      CharBuffer::restore(bufId, is, &obj->buf);
+    }
 
-        bool ColumnBuffer::operator==(const ColumnBuffer& r) const
-        {
-            return firstrow == r.firstrow &&
-                   lastrowp1 == r.lastrowp1 &&
-                   podsize == r.podsize &&
-                   offsets == r.offsets &&
-                   buf == r.buf;
-        }
+    bool ColumnBuffer::operator==(const ColumnBuffer &r) const {
+      return firstrow == r.firstrow && lastrowp1 == r.lastrowp1 && podsize == r.podsize && offsets == r.offsets &&
+             buf == r.buf;
+    }
 
-        const ClassId& ColumnBuffer::static_classId()
-        {
-            static const ClassId classId_(ClassId(classname(), version()));
-            return classId_;
-        }
+    const ClassId &ColumnBuffer::static_classId() {
+      static const ClassId classId_(ClassId(classname(), version()));
+      return classId_;
     }
-}
+  }  // namespace Private
+}  // namespace gs
diff --git a/Alignment/Geners/src/ContiguousCatalog.cc b/Alignment/Geners/src/ContiguousCatalog.cc
index da64e03e5ba02..80e2e0c86b49c 100644
--- a/Alignment/Geners/src/ContiguousCatalog.cc
+++ b/Alignment/Geners/src/ContiguousCatalog.cc
@@ -1,244 +1,204 @@
+#include <algorithm>
 #include <cassert>
 #include <utility>
-#include <algorithm>
 
 #include "Alignment/Geners/interface/CPP11_auto_ptr.hh"
 #include "Alignment/Geners/interface/ContiguousCatalog.hh"
-#include "Alignment/Geners/interface/binaryIO.hh"
 #include "Alignment/Geners/interface/IOException.hh"
+#include "Alignment/Geners/interface/binaryIO.hh"
 
 namespace gs {
-    void ContiguousCatalog::findByName(
-        const NameMap& m,
-        const SearchSpecifier& namePattern,
-        std::vector<unsigned long long>* found) const
-    {
-        typedef NameMap::const_iterator Nameiter;
-
-        if (namePattern.useRegex())
-        {
-            const Nameiter itend = m.end();
-            for (Nameiter it = m.begin(); it != itend; ++it)
-                if (namePattern.matches(it->first))
-                    found->push_back(it->second);
-        }
-        else
-        {
-            const std::pair<Nameiter, Nameiter> limits =
-                m.equal_range(namePattern.pattern());
-            for (Nameiter it = limits.first; it != limits.second; ++it)
-                found->push_back(it->second);
-        }
-    }
-
-    unsigned long long ContiguousCatalog::makeEntry(
-        const ItemDescriptor& descriptor,
-        const unsigned compressionCode,
-        const unsigned long long itemLength,
-        const ItemLocation& loc,
-        const unsigned long long offset)
-    {
-        const unsigned long long nextId = records_.size() + firstId_;
-        lastEntry_ = SPtr(new CatalogEntry(
-            descriptor, nextId, compressionCode, itemLength, loc, offset));
-        records_.push_back(lastEntry_);
-        recordMap_[descriptor.category()].insert(
-            std::make_pair(descriptor.name(), nextId));
-
-        return nextId;
-    }
-
-    void ContiguousCatalog::search(const SearchSpecifier& namePattern,
-                                   const SearchSpecifier& categoryPattern,
-                                   std::vector<unsigned long long>* found) const
-    {
-        typedef RecordMap::const_iterator Mapiter;
-
-        assert(found);
-        found->clear();
-
-        const Mapiter endMap = recordMap_.end();
-        if (categoryPattern.useRegex())
-        {
-            for (Mapiter it = recordMap_.begin(); it != endMap; ++it)
-                if (categoryPattern.matches(it->first))
-                    findByName(it->second, namePattern, found);
-        }
-        else
-        {
-            Mapiter it = recordMap_.find(categoryPattern.pattern());
-            if (it != endMap)
-                findByName(it->second, namePattern, found);
-        }
-        std::sort(found->begin(), found->end());
-    }
-
-    bool ContiguousCatalog::isEqual(const AbsCatalog& other) const
-    {
-        if ((void*)this == (void*)(&other))
-            return true;
-        const ContiguousCatalog& r = static_cast<const ContiguousCatalog&>(other);
-        if (firstId_ != r.firstId_)
-            return false;
-        if (recordMap_ != r.recordMap_)
-            return false;
-        const unsigned long nRecords = records_.size();
-        if (nRecords != r.records_.size())
-            return false;
-        for (unsigned long i=0; i<nRecords; ++i)
-            if (*records_[i] != *r.records_[i])
-                return false;
-        return true;
+  void ContiguousCatalog::findByName(const NameMap &m,
+                                     const SearchSpecifier &namePattern,
+                                     std::vector<unsigned long long> *found) const {
+    typedef NameMap::const_iterator Nameiter;
+
+    if (namePattern.useRegex()) {
+      const Nameiter itend = m.end();
+      for (Nameiter it = m.begin(); it != itend; ++it)
+        if (namePattern.matches(it->first))
+          found->push_back(it->second);
+    } else {
+      const std::pair<Nameiter, Nameiter> limits = m.equal_range(namePattern.pattern());
+      for (Nameiter it = limits.first; it != limits.second; ++it)
+        found->push_back(it->second);
     }
-
-    // Version 1 write function
-    // bool ContiguousCatalog::write(std::ostream& os) const
-    // {
-    //     bool status = ClassId::makeId<CatalogEntry>().write(os) &&
-    //                   ClassId::makeId<ItemLocation>().write(os);
-    //     const unsigned long long sz = records_.size();
-    //     for (unsigned long long i=0; i<sz && status; ++i)
-    //         status = records_[i]->write(os);
-    //     return status;
-    // }
-
-    bool ContiguousCatalog::write(std::ostream& os) const
-    {
-        const unsigned long long sz = records_.size();
-        long long nRecords = sz;
-        write_pod(os, nRecords);
-        bool status = !os.fail() && ClassId::makeId<CatalogEntry>().write(os) &&
-                                    ClassId::makeId<ItemLocation>().write(os);
-        for (unsigned long long i=0; i<sz && status; ++i)
-            status = records_[i]->write(os);
-        return status;
+  }
+
+  unsigned long long ContiguousCatalog::makeEntry(const ItemDescriptor &descriptor,
+                                                  const unsigned compressionCode,
+                                                  const unsigned long long itemLength,
+                                                  const ItemLocation &loc,
+                                                  const unsigned long long offset) {
+    const unsigned long long nextId = records_.size() + firstId_;
+    lastEntry_ = SPtr(new CatalogEntry(descriptor, nextId, compressionCode, itemLength, loc, offset));
+    records_.push_back(lastEntry_);
+    recordMap_[descriptor.category()].insert(std::make_pair(descriptor.name(), nextId));
+
+    return nextId;
+  }
+
+  void ContiguousCatalog::search(const SearchSpecifier &namePattern,
+                                 const SearchSpecifier &categoryPattern,
+                                 std::vector<unsigned long long> *found) const {
+    typedef RecordMap::const_iterator Mapiter;
+
+    assert(found);
+    found->clear();
+
+    const Mapiter endMap = recordMap_.end();
+    if (categoryPattern.useRegex()) {
+      for (Mapiter it = recordMap_.begin(); it != endMap; ++it)
+        if (categoryPattern.matches(it->first))
+          findByName(it->second, namePattern, found);
+    } else {
+      Mapiter it = recordMap_.find(categoryPattern.pattern());
+      if (it != endMap)
+        findByName(it->second, namePattern, found);
     }
-
-    ContiguousCatalog* ContiguousCatalog::read(const ClassId& cid,
-                                               std::istream& in)
-    {
-        static const ClassId current(ClassId::makeId<ContiguousCatalog>());
-        cid.ensureSameName(current);
-        cid.ensureVersionInRange(1, version());
-
-        if (cid.version() == 1)
-            return read_v1(in);
-
-        long long nRecords;
-        read_pod(in, &nRecords);
-        if (nRecords < 0)
-            return read_v1(in);
-
-        ClassId rId(in, 1);
-        ClassId locId(in, 1);
-
-        CPP11_auto_ptr<ContiguousCatalog> catalog(new ContiguousCatalog());
-        bool firstEntry = true;
-        for (long long recnum=0; recnum<nRecords; ++recnum)
-        {
-            CatalogEntry* rec = CatalogEntry::read(rId, locId, in);
-            if (rec)
-            {
-                const unsigned long long id = rec->id();
-                if (firstEntry)
-                {
-                    catalog->firstId_ = id;
-                    firstEntry = false;
-                }
-                else
-                {
-                    const unsigned long long nextId = 
-                        catalog->records_.size() + catalog->firstId_;
-                    if (id != nextId)
-                    {
-                        delete rec;
-                        throw IOInvalidData("In gs::ContiguousCatalog::read:"
-                                            " unexpected item id. "
-                                            "Catalog is corrupted.");
-                    }
-                }
-                catalog->records_.push_back(SPtr(rec));
-                catalog->recordMap_[rec->category()].insert(
-                    std::make_pair(rec->name(), id));
-            }
-            else
-                throw IOInvalidData("In gs::ContiguousCatalog::read:"
-                                    " failed to read catalog entry");
+    std::sort(found->begin(), found->end());
+  }
+
+  bool ContiguousCatalog::isEqual(const AbsCatalog &other) const {
+    if ((void *)this == (void *)(&other))
+      return true;
+    const ContiguousCatalog &r = static_cast<const ContiguousCatalog &>(other);
+    if (firstId_ != r.firstId_)
+      return false;
+    if (recordMap_ != r.recordMap_)
+      return false;
+    const unsigned long nRecords = records_.size();
+    if (nRecords != r.records_.size())
+      return false;
+    for (unsigned long i = 0; i < nRecords; ++i)
+      if (*records_[i] != *r.records_[i])
+        return false;
+    return true;
+  }
+
+  // Version 1 write function
+  // bool ContiguousCatalog::write(std::ostream& os) const
+  // {
+  //     bool status = ClassId::makeId<CatalogEntry>().write(os) &&
+  //                   ClassId::makeId<ItemLocation>().write(os);
+  //     const unsigned long long sz = records_.size();
+  //     for (unsigned long long i=0; i<sz && status; ++i)
+  //         status = records_[i]->write(os);
+  //     return status;
+  // }
+
+  bool ContiguousCatalog::write(std::ostream &os) const {
+    const unsigned long long sz = records_.size();
+    long long nRecords = sz;
+    write_pod(os, nRecords);
+    bool status = !os.fail() && ClassId::makeId<CatalogEntry>().write(os) && ClassId::makeId<ItemLocation>().write(os);
+    for (unsigned long long i = 0; i < sz && status; ++i)
+      status = records_[i]->write(os);
+    return status;
+  }
+
+  ContiguousCatalog *ContiguousCatalog::read(const ClassId &cid, std::istream &in) {
+    static const ClassId current(ClassId::makeId<ContiguousCatalog>());
+    cid.ensureSameName(current);
+    cid.ensureVersionInRange(1, version());
+
+    if (cid.version() == 1)
+      return read_v1(in);
+
+    long long nRecords;
+    read_pod(in, &nRecords);
+    if (nRecords < 0)
+      return read_v1(in);
+
+    ClassId rId(in, 1);
+    ClassId locId(in, 1);
+
+    CPP11_auto_ptr<ContiguousCatalog> catalog(new ContiguousCatalog());
+    bool firstEntry = true;
+    for (long long recnum = 0; recnum < nRecords; ++recnum) {
+      CatalogEntry *rec = CatalogEntry::read(rId, locId, in);
+      if (rec) {
+        const unsigned long long id = rec->id();
+        if (firstEntry) {
+          catalog->firstId_ = id;
+          firstEntry = false;
+        } else {
+          const unsigned long long nextId = catalog->records_.size() + catalog->firstId_;
+          if (id != nextId) {
+            delete rec;
+            throw IOInvalidData(
+                "In gs::ContiguousCatalog::read:"
+                " unexpected item id. "
+                "Catalog is corrupted.");
+          }
         }
-        return catalog.release();
+        catalog->records_.push_back(SPtr(rec));
+        catalog->recordMap_[rec->category()].insert(std::make_pair(rec->name(), id));
+      } else
+        throw IOInvalidData(
+            "In gs::ContiguousCatalog::read:"
+            " failed to read catalog entry");
     }
-
-    ContiguousCatalog* ContiguousCatalog::read_v1(std::istream& in)
-    {
-        ClassId rId(in, 1);
-        ClassId locId(in, 1);
-
-        CPP11_auto_ptr<ContiguousCatalog> catalog(new ContiguousCatalog());
-        bool firstEntry = true;
-        for (in.peek(); !in.eof(); in.peek())
-        {
-            CatalogEntry* rec = CatalogEntry::read(rId, locId, in);
-            if (rec)
-            {
-                const unsigned long long id = rec->id();
-                if (firstEntry)
-                {
-                    catalog->firstId_ = id;
-                    firstEntry = false;
-                }
-                else
-                {
-                    const unsigned long long nextId = 
-                        catalog->records_.size() + catalog->firstId_;
-                    if (id != nextId)
-                    {
-                        delete rec;
-                        throw IOInvalidData("In gs::ContiguousCatalog::read_v1:"
-                                            " unexpected item id. "
-                                            "Catalog is corrupted.");
-                    }
-                }
-                catalog->records_.push_back(SPtr(rec));
-                catalog->recordMap_[rec->category()].insert(
-                    std::make_pair(rec->name(), id));
-            }
-            else
-                throw IOInvalidData("In gs::ContiguousCatalog::read_v1:"
-                                    " failed to read catalog entry");
+    return catalog.release();
+  }
+
+  ContiguousCatalog *ContiguousCatalog::read_v1(std::istream &in) {
+    ClassId rId(in, 1);
+    ClassId locId(in, 1);
+
+    CPP11_auto_ptr<ContiguousCatalog> catalog(new ContiguousCatalog());
+    bool firstEntry = true;
+    for (in.peek(); !in.eof(); in.peek()) {
+      CatalogEntry *rec = CatalogEntry::read(rId, locId, in);
+      if (rec) {
+        const unsigned long long id = rec->id();
+        if (firstEntry) {
+          catalog->firstId_ = id;
+          firstEntry = false;
+        } else {
+          const unsigned long long nextId = catalog->records_.size() + catalog->firstId_;
+          if (id != nextId) {
+            delete rec;
+            throw IOInvalidData(
+                "In gs::ContiguousCatalog::read_v1:"
+                " unexpected item id. "
+                "Catalog is corrupted.");
+          }
         }
-        return catalog.release();
+        catalog->records_.push_back(SPtr(rec));
+        catalog->recordMap_[rec->category()].insert(std::make_pair(rec->name(), id));
+      } else
+        throw IOInvalidData(
+            "In gs::ContiguousCatalog::read_v1:"
+            " failed to read catalog entry");
     }
-
-    CPP11_shared_ptr<const CatalogEntry> ContiguousCatalog::retrieveEntry(
-        const unsigned long long id) const
-    {
-        if (id >= firstId_ && id < records_.size() + firstId_)
-            return records_[id - firstId_];
-        else
-        {
-            CatalogEntry* ptr = nullptr;
-            return CPP11_shared_ptr<const CatalogEntry>(ptr);
-        }
-    }
-
-    bool ContiguousCatalog::retrieveStreampos(
-        unsigned long long id, unsigned* compressionCode,
-        unsigned long long* length, std::streampos* pos) const
-    {
-        assert(compressionCode);
-        assert(length);
-        assert(pos);
-
-        if (id >= firstId_ && id < records_.size() + firstId_)
-        {
-            const CPP11_shared_ptr<const CatalogEntry>&
-                rec(records_[id-firstId_]);
-            *compressionCode = rec->compressionCode();
-            *length = rec->itemLength();
-            *pos = rec->location().streamPosition();
-            return true;
-        }
-        else
-            return false;
+    return catalog.release();
+  }
+
+  CPP11_shared_ptr<const CatalogEntry> ContiguousCatalog::retrieveEntry(const unsigned long long id) const {
+    if (id >= firstId_ && id < records_.size() + firstId_)
+      return records_[id - firstId_];
+    else {
+      CatalogEntry *ptr = nullptr;
+      return CPP11_shared_ptr<const CatalogEntry>(ptr);
     }
-}
+  }
+
+  bool ContiguousCatalog::retrieveStreampos(unsigned long long id,
+                                            unsigned *compressionCode,
+                                            unsigned long long *length,
+                                            std::streampos *pos) const {
+    assert(compressionCode);
+    assert(length);
+    assert(pos);
+
+    if (id >= firstId_ && id < records_.size() + firstId_) {
+      const CPP11_shared_ptr<const CatalogEntry> &rec(records_[id - firstId_]);
+      *compressionCode = rec->compressionCode();
+      *length = rec->itemLength();
+      *pos = rec->location().streamPosition();
+      return true;
+    } else
+      return false;
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/src/GeneralCatalog.cc b/Alignment/Geners/src/GeneralCatalog.cc
index 31ff426246156..c82b44c8b19b2 100644
--- a/Alignment/Geners/src/GeneralCatalog.cc
+++ b/Alignment/Geners/src/GeneralCatalog.cc
@@ -1,344 +1,294 @@
+#include <algorithm>
 #include <cassert>
 #include <utility>
-#include <algorithm>
 
 #include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
 #include "Alignment/Geners/interface/GeneralCatalog.hh"
-#include "Alignment/Geners/interface/binaryIO.hh"
 #include "Alignment/Geners/interface/IOException.hh"
+#include "Alignment/Geners/interface/binaryIO.hh"
 
 namespace gs {
-    GeneralCatalog::GeneralCatalog()
-        : smallestId_(1ULL),
-          largestId_(0)
-    {
-    }
-
-    void GeneralCatalog::findByName(
-        const NameMap& m,
-        const SearchSpecifier& namePattern,
-        std::vector<unsigned long long>* found) const
-    {
-        typedef NameMap::const_iterator Nameiter;
-
-        if (namePattern.useRegex())
-        {
-            const Nameiter itend = m.end();
-            for (Nameiter it = m.begin(); it != itend; ++it)
-                if (namePattern.matches(it->first))
-                    found->push_back(it->second->id());
-        }
-        else
-        {
-            const std::pair<Nameiter, Nameiter> limits =
-                m.equal_range(namePattern.pattern());
-            for (Nameiter it = limits.first; it != limits.second; ++it)
-                found->push_back(it->second->id());
-        }
-    }
-
-    bool GeneralCatalog::addEntry(const SPtr inptr)
-    {
-        assert(inptr.get());
-
-        const bool first = records_.empty();
-        const unsigned long long id = inptr->id();
-        if (id && records_.insert(std::make_pair(id, inptr)).second)
-        {
-            recordMap_[inptr->category()].insert(
-                std::make_pair(inptr->name(), inptr));
-            if (first)
-            {
-                smallestId_ = id;
-                largestId_ = id;
-            }
-            else
-            {
-                if (id < smallestId_)
-                    smallestId_ = id;
-                if (id > largestId_)
-                    largestId_ = id;
-            }
-            return true;
-        }
-        else
-            return false;
-    }
-
-    bool GeneralCatalog::removeEntry(const unsigned long long id)
-    {
-        typedef RecordMap::iterator Mapiter;
-        typedef NameMap::iterator Nameiter;
-
-        IdMap::iterator rit = records_.find(id);
-        if (rit == records_.end())
-            return false;
-
-        const SPtr item = rit->second;
-        records_.erase(rit);
-
-        bool found = false;
-        const Mapiter mit = recordMap_.find(item->category());
-        assert(mit != recordMap_.end());
-        const std::pair<Nameiter, Nameiter> limits =
-            mit->second.equal_range(item->name());
-        for (Nameiter nit = limits.first; nit != limits.second; ++nit)
-            if (nit->second->id() == id)
-            {
-                mit->second.erase(nit);
-                found = true;
-                break;
-            }
-        assert(found);
-        if (mit->second.empty())
-            recordMap_.erase(mit);
-
-        if (records_.empty())
-        {
-            recordMap_.clear();
-            smallestId_ = 0;
-            largestId_ = 0;
-        }
-        else if (id == smallestId_ || id == largestId_)
-        {
-            IdMap::const_iterator it = records_.begin();
-            smallestId_ = it->first;
-            largestId_ = it->first;
-            const IdMap::const_iterator itend = records_.end();
-            for (++it; it != itend; ++it)
-                if (it->first < smallestId_)
-                    smallestId_ = it->first;
-                else if (it->first > largestId_)
-                    largestId_ = it->first;
-        }
-        return true;
+  GeneralCatalog::GeneralCatalog() : smallestId_(1ULL), largestId_(0) {}
+
+  void GeneralCatalog::findByName(const NameMap &m,
+                                  const SearchSpecifier &namePattern,
+                                  std::vector<unsigned long long> *found) const {
+    typedef NameMap::const_iterator Nameiter;
+
+    if (namePattern.useRegex()) {
+      const Nameiter itend = m.end();
+      for (Nameiter it = m.begin(); it != itend; ++it)
+        if (namePattern.matches(it->first))
+          found->push_back(it->second->id());
+    } else {
+      const std::pair<Nameiter, Nameiter> limits = m.equal_range(namePattern.pattern());
+      for (Nameiter it = limits.first; it != limits.second; ++it)
+        found->push_back(it->second->id());
     }
-
-    unsigned long long GeneralCatalog::makeEntry(
-        const ItemDescriptor& descriptor,
-        const unsigned compressionCode,
-        const unsigned long long itemLength,
-        const ItemLocation& loc,
-        const unsigned long long offset)
-    {
-        const unsigned long long nextId = records_.empty() ? 1ULL :
-                                          largestId_ + 1;
-        lastEntry_ = SPtr(new CatalogEntry(
-            descriptor, nextId, compressionCode, itemLength, loc, offset));
-        assert(addEntry(lastEntry_));
-        return nextId;
+  }
+
+  bool GeneralCatalog::addEntry(const SPtr inptr) {
+    assert(inptr.get());
+
+    const bool first = records_.empty();
+    const unsigned long long id = inptr->id();
+    if (id && records_.insert(std::make_pair(id, inptr)).second) {
+      recordMap_[inptr->category()].insert(std::make_pair(inptr->name(), inptr));
+      if (first) {
+        smallestId_ = id;
+        largestId_ = id;
+      } else {
+        if (id < smallestId_)
+          smallestId_ = id;
+        if (id > largestId_)
+          largestId_ = id;
+      }
+      return true;
+    } else
+      return false;
+  }
+
+  bool GeneralCatalog::removeEntry(const unsigned long long id) {
+    typedef RecordMap::iterator Mapiter;
+    typedef NameMap::iterator Nameiter;
+
+    IdMap::iterator rit = records_.find(id);
+    if (rit == records_.end())
+      return false;
+
+    const SPtr item = rit->second;
+    records_.erase(rit);
+
+    bool found = false;
+    const Mapiter mit = recordMap_.find(item->category());
+    assert(mit != recordMap_.end());
+    const std::pair<Nameiter, Nameiter> limits = mit->second.equal_range(item->name());
+    for (Nameiter nit = limits.first; nit != limits.second; ++nit)
+      if (nit->second->id() == id) {
+        mit->second.erase(nit);
+        found = true;
+        break;
+      }
+    assert(found);
+    if (mit->second.empty())
+      recordMap_.erase(mit);
+
+    if (records_.empty()) {
+      recordMap_.clear();
+      smallestId_ = 0;
+      largestId_ = 0;
+    } else if (id == smallestId_ || id == largestId_) {
+      IdMap::const_iterator it = records_.begin();
+      smallestId_ = it->first;
+      largestId_ = it->first;
+      const IdMap::const_iterator itend = records_.end();
+      for (++it; it != itend; ++it)
+        if (it->first < smallestId_)
+          smallestId_ = it->first;
+        else if (it->first > largestId_)
+          largestId_ = it->first;
     }
-
-    void GeneralCatalog::search(const SearchSpecifier& namePattern,
-                                const SearchSpecifier& categoryPattern,
-                                std::vector<unsigned long long>* found) const
-    {
-        typedef RecordMap::const_iterator Mapiter;
-
-        assert(found);
-        found->clear();
-
-        const Mapiter endMap = recordMap_.end();
-        if (categoryPattern.useRegex())
-        {
-            for (Mapiter it = recordMap_.begin(); it != endMap; ++it)
-                if (categoryPattern.matches(it->first))
-                    findByName(it->second, namePattern, found);
-        }
-        else
-        {
-            Mapiter it = recordMap_.find(categoryPattern.pattern());
-            if (it != endMap)
-                findByName(it->second, namePattern, found);
-        }
-        std::sort(found->begin(), found->end());
+    return true;
+  }
+
+  unsigned long long GeneralCatalog::makeEntry(const ItemDescriptor &descriptor,
+                                               const unsigned compressionCode,
+                                               const unsigned long long itemLength,
+                                               const ItemLocation &loc,
+                                               const unsigned long long offset) {
+    const unsigned long long nextId = records_.empty() ? 1ULL : largestId_ + 1;
+    lastEntry_ = SPtr(new CatalogEntry(descriptor, nextId, compressionCode, itemLength, loc, offset));
+    assert(addEntry(lastEntry_));
+    return nextId;
+  }
+
+  void GeneralCatalog::search(const SearchSpecifier &namePattern,
+                              const SearchSpecifier &categoryPattern,
+                              std::vector<unsigned long long> *found) const {
+    typedef RecordMap::const_iterator Mapiter;
+
+    assert(found);
+    found->clear();
+
+    const Mapiter endMap = recordMap_.end();
+    if (categoryPattern.useRegex()) {
+      for (Mapiter it = recordMap_.begin(); it != endMap; ++it)
+        if (categoryPattern.matches(it->first))
+          findByName(it->second, namePattern, found);
+    } else {
+      Mapiter it = recordMap_.find(categoryPattern.pattern());
+      if (it != endMap)
+        findByName(it->second, namePattern, found);
     }
-
-    bool GeneralCatalog::isEqual(const AbsCatalog& other) const
-    {
-        if ((void*)this == (void*)(&other))
-            return true;
-        const GeneralCatalog& r = static_cast<const GeneralCatalog&>(other);
-        if (smallestId_ != r.smallestId_)
-            return false;
-        if (largestId_ != r.largestId_)
-            return false;
-        if (records_.size() != r.records_.size())
-            return false;
-        IdMap::const_iterator itend = records_.end();
-        IdMap::const_iterator itend2 = r.records_.end();
-        for (IdMap::const_iterator it = records_.begin();
-             it != itend; ++it)
-        {
-            IdMap::const_iterator it2 = r.records_.find(it->first);
-            if (it2 == itend2)
-                return false;
-            if (!(*it->second == *it2->second))
-                return false;
-        }
-        return true;
+    std::sort(found->begin(), found->end());
+  }
+
+  bool GeneralCatalog::isEqual(const AbsCatalog &other) const {
+    if ((void *)this == (void *)(&other))
+      return true;
+    const GeneralCatalog &r = static_cast<const GeneralCatalog &>(other);
+    if (smallestId_ != r.smallestId_)
+      return false;
+    if (largestId_ != r.largestId_)
+      return false;
+    if (records_.size() != r.records_.size())
+      return false;
+    IdMap::const_iterator itend = records_.end();
+    IdMap::const_iterator itend2 = r.records_.end();
+    for (IdMap::const_iterator it = records_.begin(); it != itend; ++it) {
+      IdMap::const_iterator it2 = r.records_.find(it->first);
+      if (it2 == itend2)
+        return false;
+      if (!(*it->second == *it2->second))
+        return false;
     }
-
-    // Version 1 write function
-    // bool GeneralCatalog::write(std::ostream& os) const
-    // {
-    //     if (!ClassId::makeId<CatalogEntry>().write(os))
-    //         return false;
-    //     if (!ClassId::makeId<ItemLocation>().write(os))
-    //         return false;
-
-    //     // Sort item ids in the increasing order first
-    //     std::vector<unsigned long long> idlist;
-    //     const unsigned long sz = records_.size();
-    //     idlist.reserve(sz);
-    //     const IdMap::const_iterator itend = records_.end();
-    //     for (IdMap::const_iterator it = records_.begin(); it != itend; ++it)
-    //         idlist.push_back(it->first);
-    //     std::sort(idlist.begin(), idlist.end());
-
-    //     // Now, write the catalog records in the order of increasing ids
-    //     for (unsigned long i=0; i<sz; ++i)
-    //     {
-    //         IdMap::const_iterator it = records_.find(idlist[i]);
-    //         if (!it->second->write(os))
-    //             return false;
-    //     }
-
-    //     return true;
-    // }
-
-    bool GeneralCatalog::write(std::ostream& os) const
-    {
-        const unsigned long sz = records_.size();
-        long long ltmp = sz;
-        write_pod(os, ltmp);
-        if (os.fail())
-            return false;
-        if (!ClassId::makeId<CatalogEntry>().write(os))
-            return false;
-        if (!ClassId::makeId<ItemLocation>().write(os))
-            return false;
-
-        // Sort item ids in the increasing order first
-        std::vector<unsigned long long> idlist;
-        idlist.reserve(sz);
-        const IdMap::const_iterator itend = records_.end();
-        for (IdMap::const_iterator it = records_.begin(); it != itend; ++it)
-            idlist.push_back(it->first);
-        std::sort(idlist.begin(), idlist.end());
-
-        // Now, write the catalog records in the order of increasing ids
-        for (unsigned long i=0; i<sz; ++i)
-        {
-            IdMap::const_iterator it = records_.find(idlist[i]);
-            if (!it->second->write(os))
-                return false;
-        }
-
-        return true;
+    return true;
+  }
+
+  // Version 1 write function
+  // bool GeneralCatalog::write(std::ostream& os) const
+  // {
+  //     if (!ClassId::makeId<CatalogEntry>().write(os))
+  //         return false;
+  //     if (!ClassId::makeId<ItemLocation>().write(os))
+  //         return false;
+
+  //     // Sort item ids in the increasing order first
+  //     std::vector<unsigned long long> idlist;
+  //     const unsigned long sz = records_.size();
+  //     idlist.reserve(sz);
+  //     const IdMap::const_iterator itend = records_.end();
+  //     for (IdMap::const_iterator it = records_.begin(); it != itend; ++it)
+  //         idlist.push_back(it->first);
+  //     std::sort(idlist.begin(), idlist.end());
+
+  //     // Now, write the catalog records in the order of increasing ids
+  //     for (unsigned long i=0; i<sz; ++i)
+  //     {
+  //         IdMap::const_iterator it = records_.find(idlist[i]);
+  //         if (!it->second->write(os))
+  //             return false;
+  //     }
+
+  //     return true;
+  // }
+
+  bool GeneralCatalog::write(std::ostream &os) const {
+    const unsigned long sz = records_.size();
+    long long ltmp = sz;
+    write_pod(os, ltmp);
+    if (os.fail())
+      return false;
+    if (!ClassId::makeId<CatalogEntry>().write(os))
+      return false;
+    if (!ClassId::makeId<ItemLocation>().write(os))
+      return false;
+
+    // Sort item ids in the increasing order first
+    std::vector<unsigned long long> idlist;
+    idlist.reserve(sz);
+    const IdMap::const_iterator itend = records_.end();
+    for (IdMap::const_iterator it = records_.begin(); it != itend; ++it)
+      idlist.push_back(it->first);
+    std::sort(idlist.begin(), idlist.end());
+
+    // Now, write the catalog records in the order of increasing ids
+    for (unsigned long i = 0; i < sz; ++i) {
+      IdMap::const_iterator it = records_.find(idlist[i]);
+      if (!it->second->write(os))
+        return false;
     }
 
-    GeneralCatalog* GeneralCatalog::read(const ClassId& id, std::istream& in)
-    {
-        static const ClassId current(ClassId::makeId<GeneralCatalog>());
-        id.ensureSameName(current);
-        id.ensureVersionInRange(1, version());
-
-        if (id.version() == 1)
-            return read_v1(in);
-
-        long long nRecords;
-        read_pod(in, &nRecords);
-        if (nRecords < 0)
-            return read_v1(in);
-
-        ClassId rId(in, 1);
-        ClassId locId(in, 1);
-
-        GeneralCatalog* catalog = new GeneralCatalog();
-        bool ok = true;
-        for (long long recnum=0; ok && recnum<nRecords; ++recnum)
-        {
-            CatalogEntry* rec = CatalogEntry::read(rId, locId, in);
-            if (rec)
-            {
-                if (!catalog->addEntry(
-                        CPP11_shared_ptr<const CatalogEntry>(rec)))
-                    ok = false;
-            }
-            else
-                ok = false;
-        }
-
-        if (!ok)
-        {
-            delete catalog;
-            throw IOInvalidData("In gs::GeneralCatalog::read: "
-                                "duplicate item id. "
-                                "Catalog is corrupted.");
-        }
-        return catalog;
+    return true;
+  }
+
+  GeneralCatalog *GeneralCatalog::read(const ClassId &id, std::istream &in) {
+    static const ClassId current(ClassId::makeId<GeneralCatalog>());
+    id.ensureSameName(current);
+    id.ensureVersionInRange(1, version());
+
+    if (id.version() == 1)
+      return read_v1(in);
+
+    long long nRecords;
+    read_pod(in, &nRecords);
+    if (nRecords < 0)
+      return read_v1(in);
+
+    ClassId rId(in, 1);
+    ClassId locId(in, 1);
+
+    GeneralCatalog *catalog = new GeneralCatalog();
+    bool ok = true;
+    for (long long recnum = 0; ok && recnum < nRecords; ++recnum) {
+      CatalogEntry *rec = CatalogEntry::read(rId, locId, in);
+      if (rec) {
+        if (!catalog->addEntry(CPP11_shared_ptr<const CatalogEntry>(rec)))
+          ok = false;
+      } else
+        ok = false;
     }
 
-    GeneralCatalog* GeneralCatalog::read_v1(std::istream& in)
-    {
-        ClassId rId(in, 1);
-        ClassId locId(in, 1);
-
-        GeneralCatalog* catalog = new GeneralCatalog();
-        bool ok = true;
-        for (in.peek(); ok && !in.eof(); in.peek())
-        {
-            CatalogEntry* rec = CatalogEntry::read(rId, locId, in);
-            if (rec)
-            {
-                if (!catalog->addEntry(
-                        CPP11_shared_ptr<const CatalogEntry>(rec)))
-                    ok = false;
-            }
-            else
-                ok = false;
-        }
-
-        if (!ok)
-        {
-            delete catalog;
-            throw IOInvalidData("In gs::GeneralCatalog::read_v1: "
-                                "duplicate item id. "
-                                "Catalog is corrupted.");
-        }
-        return catalog;
+    if (!ok) {
+      delete catalog;
+      throw IOInvalidData(
+          "In gs::GeneralCatalog::read: "
+          "duplicate item id. "
+          "Catalog is corrupted.");
     }
-
-    CPP11_shared_ptr<const CatalogEntry> GeneralCatalog::retrieveEntry(
-        const unsigned long long id) const
-    {
-        IdMap::const_iterator it = records_.find(id);
-        if (it == records_.end())
-        {
-            CatalogEntry* ptr = nullptr;
-            return CPP11_shared_ptr<const CatalogEntry>(ptr);
-        }
-        else
-            return it->second;
+    return catalog;
+  }
+
+  GeneralCatalog *GeneralCatalog::read_v1(std::istream &in) {
+    ClassId rId(in, 1);
+    ClassId locId(in, 1);
+
+    GeneralCatalog *catalog = new GeneralCatalog();
+    bool ok = true;
+    for (in.peek(); ok && !in.eof(); in.peek()) {
+      CatalogEntry *rec = CatalogEntry::read(rId, locId, in);
+      if (rec) {
+        if (!catalog->addEntry(CPP11_shared_ptr<const CatalogEntry>(rec)))
+          ok = false;
+      } else
+        ok = false;
     }
 
-    bool GeneralCatalog::retrieveStreampos(
-        unsigned long long id, unsigned* compressionCode,
-        unsigned long long* length, std::streampos* pos) const
-    {
-        IdMap::const_iterator it = records_.find(id);
-        if (it == records_.end())
-            return false;
-
-        assert(compressionCode);
-        assert(length);
-        assert(pos);
-
-        *compressionCode = it->second->compressionCode();
-        *length = it->second->itemLength();
-        *pos = it->second->location().streamPosition();
-
-        return true;
+    if (!ok) {
+      delete catalog;
+      throw IOInvalidData(
+          "In gs::GeneralCatalog::read_v1: "
+          "duplicate item id. "
+          "Catalog is corrupted.");
     }
-}
+    return catalog;
+  }
+
+  CPP11_shared_ptr<const CatalogEntry> GeneralCatalog::retrieveEntry(const unsigned long long id) const {
+    IdMap::const_iterator it = records_.find(id);
+    if (it == records_.end()) {
+      CatalogEntry *ptr = nullptr;
+      return CPP11_shared_ptr<const CatalogEntry>(ptr);
+    } else
+      return it->second;
+  }
+
+  bool GeneralCatalog::retrieveStreampos(unsigned long long id,
+                                         unsigned *compressionCode,
+                                         unsigned long long *length,
+                                         std::streampos *pos) const {
+    IdMap::const_iterator it = records_.find(id);
+    if (it == records_.end())
+      return false;
+
+    assert(compressionCode);
+    assert(length);
+    assert(pos);
+
+    *compressionCode = it->second->compressionCode();
+    *length = it->second->itemLength();
+    *pos = it->second->location().streamPosition();
+
+    return true;
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/src/ItemDescriptor.cc b/Alignment/Geners/src/ItemDescriptor.cc
index ed0d4b20ba9f4..cbd433f539edf 100644
--- a/Alignment/Geners/src/ItemDescriptor.cc
+++ b/Alignment/Geners/src/ItemDescriptor.cc
@@ -3,35 +3,21 @@
 #include "Alignment/Geners/interface/ItemDescriptor.hh"
 
 namespace gs {
-    ItemDescriptor::ItemDescriptor()
-        : classId_(ClassId::invalidId())
-    {
-    }
+  ItemDescriptor::ItemDescriptor() : classId_(ClassId::invalidId()) {}
 
-    ItemDescriptor::ItemDescriptor(
-        const ClassId& classId, const char* ioPrototype,
-        const char* name, const char* categ)
-        : classId_(classId),
-          ioProto_(ioPrototype ? ioPrototype : ""),
-          nameCat_(name ? std::string(name) : std::string(""),
-                   categ ? std::string(categ) : std::string(""))
-    {
-        if (classId_.name().empty()) throw gs::IOInvalidArgument(
-            "In ItemDescriptor constructor: invalid class id");
-    }
+  ItemDescriptor::ItemDescriptor(const ClassId &classId, const char *ioPrototype, const char *name, const char *categ)
+      : classId_(classId),
+        ioProto_(ioPrototype ? ioPrototype : ""),
+        nameCat_(name ? std::string(name) : std::string(""), categ ? std::string(categ) : std::string("")) {
+    if (classId_.name().empty())
+      throw gs::IOInvalidArgument("In ItemDescriptor constructor: invalid class id");
+  }
 
-    bool ItemDescriptor::isSameClassIdandIO(const ItemDescriptor& r) const
-    {
-        return !classId_.name().empty() && 
-               classId_.name() == r.classId_.name() &&
-               ioProto_ == r.ioProto_;
-    }
+  bool ItemDescriptor::isSameClassIdandIO(const ItemDescriptor &r) const {
+    return !classId_.name().empty() && classId_.name() == r.classId_.name() && ioProto_ == r.ioProto_;
+  }
 
-    bool ItemDescriptor::isEqual(const ItemDescriptor& r) const
-    {
-        return !classId_.name().empty() && 
-               classId_ == r.classId_ && 
-               ioProto_ == r.ioProto_ &&
-               nameCat_ == r.nameCat_;
-    }
-}
+  bool ItemDescriptor::isEqual(const ItemDescriptor &r) const {
+    return !classId_.name().empty() && classId_ == r.classId_ && ioProto_ == r.ioProto_ && nameCat_ == r.nameCat_;
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/src/ItemLocation.cc b/Alignment/Geners/src/ItemLocation.cc
index 3250107d834a2..39374f60c8219 100644
--- a/Alignment/Geners/src/ItemLocation.cc
+++ b/Alignment/Geners/src/ItemLocation.cc
@@ -1,56 +1,50 @@
+#include "Alignment/Geners/interface/IOException.hh"
 #include "Alignment/Geners/interface/ItemLocation.hh"
 #include "Alignment/Geners/interface/streamposIO.hh"
-#include "Alignment/Geners/interface/IOException.hh"
 
 namespace gs {
-    bool ItemLocation::operator==(const ItemLocation& r) const
-    {
-        if (pos_ != r.pos_)
-            return false;
-        if (URI_ != r.URI_)
-            return false;
-        // If global URI does not exist, local URI must coincide exactly.
-        // If global URI exists, local URI may or may not be defined.
-        if (!URI_.empty())
-        {
-            if (!cachedItemURI_.empty() && !r.cachedItemURI_.empty())
-                if (cachedItemURI_ != r.cachedItemURI_)
-                    return false;
-        }
-        else
-            if (cachedItemURI_ != r.cachedItemURI_)
-                return false;
-        return true;
-    }
-
-    bool ItemLocation::write(std::ostream& of) const
-    {
-        // The code for storing the stream offset is necessarily
-        // going to be implementation-dependent. The C++ standard
-        // does not specify std::streampos with enough detail.
-        write_pod(of, pos_);
-        write_pod(of, URI_);
-        write_pod(of, cachedItemURI_);
-        return !of.fail();
-    }
-
-    ItemLocation* ItemLocation::read(const ClassId& id, std::istream& in)
-    {
-        static const ClassId current(ClassId::makeId<ItemLocation>());
-        current.ensureSameId(id);
-
-        std::streampos pos;
-        read_pod(in, &pos);
-
-        std::string globURI;
-        read_pod(in, &globURI);
-
-        std::string cachedItemURI;
-        read_pod(in, &cachedItemURI);
-
-        if (in.fail())
-            throw IOReadFailure("In ItemLocation::read: input stream failure");
-
-        return new ItemLocation(pos, globURI.c_str(), cachedItemURI.c_str());
-    }
-}
+  bool ItemLocation::operator==(const ItemLocation &r) const {
+    if (pos_ != r.pos_)
+      return false;
+    if (URI_ != r.URI_)
+      return false;
+    // If global URI does not exist, local URI must coincide exactly.
+    // If global URI exists, local URI may or may not be defined.
+    if (!URI_.empty()) {
+      if (!cachedItemURI_.empty() && !r.cachedItemURI_.empty())
+        if (cachedItemURI_ != r.cachedItemURI_)
+          return false;
+    } else if (cachedItemURI_ != r.cachedItemURI_)
+      return false;
+    return true;
+  }
+
+  bool ItemLocation::write(std::ostream &of) const {
+    // The code for storing the stream offset is necessarily
+    // going to be implementation-dependent. The C++ standard
+    // does not specify std::streampos with enough detail.
+    write_pod(of, pos_);
+    write_pod(of, URI_);
+    write_pod(of, cachedItemURI_);
+    return !of.fail();
+  }
+
+  ItemLocation *ItemLocation::read(const ClassId &id, std::istream &in) {
+    static const ClassId current(ClassId::makeId<ItemLocation>());
+    current.ensureSameId(id);
+
+    std::streampos pos;
+    read_pod(in, &pos);
+
+    std::string globURI;
+    read_pod(in, &globURI);
+
+    std::string cachedItemURI;
+    read_pod(in, &cachedItemURI);
+
+    if (in.fail())
+      throw IOReadFailure("In ItemLocation::read: input stream failure");
+
+    return new ItemLocation(pos, globURI.c_str(), cachedItemURI.c_str());
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/src/MultiFileArchive.cc b/Alignment/Geners/src/MultiFileArchive.cc
index 4046b27a97e04..6093d0eed49ad 100644
--- a/Alignment/Geners/src/MultiFileArchive.cc
+++ b/Alignment/Geners/src/MultiFileArchive.cc
@@ -1,380 +1,320 @@
-#include <sstream>
 #include <cstdio>
+#include <sstream>
 
 #include "Alignment/Geners/interface/MultiFileArchive.hh"
 
-#include "Alignment/Geners/interface/uriUtils.hh"
 #include "Alignment/Geners/interface/ContiguousCatalog.hh"
-#include "Alignment/Geners/interface/WriteOnlyCatalog.hh"
 #include "Alignment/Geners/interface/IOException.hh"
+#include "Alignment/Geners/interface/WriteOnlyCatalog.hh"
 #include "Alignment/Geners/interface/streamposIO.hh"
+#include "Alignment/Geners/interface/uriUtils.hh"
 
 namespace gs {
-    MultiFileArchive::MultiFileArchive(const char* basename, const char* mode,
-                                       const char* ann,
-                                       const unsigned typicalFileSizeInMB,
-                                       const unsigned dataFileBufferSize,
-                                       const unsigned catalogFileBufferSize)
-        : BinaryArchiveBase(basename, mode),
-          filebuf_(nullptr),
-          readbuf_(nullptr),
-          catabuf_(nullptr),
-          annotation_(ann ? std::string(ann) : std::string("")),
-          catalogFileName_(AbsArchive::name() + ".gsbmf"), // binary metafile
-          writeFileURI_("/ / / / / / /\\ \\ \\ \\"),
-          readFileURI_(writeFileURI_),
-          lastpos_(0),
-          jumppos_(0),
-          maxpos_(std::streamoff(1048576LL*typicalFileSizeInMB)),
-          writeFileNumber_(0),
-          catalogMergeLevel_(1),
-          annotationsMerged_(false),
-          streamFlushed_(true)
-    {
-        if (!modeValid()) return;
-
-        try
-        {
-            // Get a new buffer for the output stream
-            if (dataFileBufferSize)
-                filebuf_ = new char[dataFileBufferSize];
-            writeStream_.rdbuf()->pubsetbuf(filebuf_, dataFileBufferSize);
+  MultiFileArchive::MultiFileArchive(const char *basename,
+                                     const char *mode,
+                                     const char *ann,
+                                     const unsigned typicalFileSizeInMB,
+                                     const unsigned dataFileBufferSize,
+                                     const unsigned catalogFileBufferSize)
+      : BinaryArchiveBase(basename, mode),
+        filebuf_(nullptr),
+        readbuf_(nullptr),
+        catabuf_(nullptr),
+        annotation_(ann ? std::string(ann) : std::string("")),
+        catalogFileName_(AbsArchive::name() + ".gsbmf"),  // binary metafile
+        writeFileURI_("/ / / / / / /\\ \\ \\ \\"),
+        readFileURI_(writeFileURI_),
+        lastpos_(0),
+        jumppos_(0),
+        maxpos_(std::streamoff(1048576LL * typicalFileSizeInMB)),
+        writeFileNumber_(0),
+        catalogMergeLevel_(1),
+        annotationsMerged_(false),
+        streamFlushed_(true) {
+    if (!modeValid())
+      return;
 
-            // Get a new buffer for the input stream
-            if (dataFileBufferSize)
-                readbuf_ = new char[dataFileBufferSize];
-            separateReadStream_.rdbuf()->pubsetbuf(readbuf_,dataFileBufferSize);
+    try {
+      // Get a new buffer for the output stream
+      if (dataFileBufferSize)
+        filebuf_ = new char[dataFileBufferSize];
+      writeStream_.rdbuf()->pubsetbuf(filebuf_, dataFileBufferSize);
 
-            // Get a new buffer for the catalog and open the catalog stream.
-            // We may have to rewrite the complete catalog, so remove the flag
-            // std::ios_base::app from the opening mode.
-            if (catalogFileBufferSize)
-                catabuf_ = new char[catalogFileBufferSize];
-            catStream_.rdbuf()->pubsetbuf(catabuf_, catalogFileBufferSize);
-            catStream_.open(catalogFileName_.c_str(),
-                            openmode() & ~std::ios_base::app);
-            if (!catStream_.is_open())
-                throw IOOpeningFailure("gs::MultiFileArchive constructor",
-                                       catalogFileName_);
+      // Get a new buffer for the input stream
+      if (dataFileBufferSize)
+        readbuf_ = new char[dataFileBufferSize];
+      separateReadStream_.rdbuf()->pubsetbuf(readbuf_, dataFileBufferSize);
 
-            // Can we use a write-only catalog?
-            if (openmode() & std::ios_base::in)
-            {
-                // Reading is allowed. Have to use in-memory catalog.
-                // If the file data already exists, get the catalog in.
-                if (isEmptyFile(catStream_))
-                    setCatalog(new ContiguousCatalog());
-                else
-                    readCatalog<ContiguousCatalog>();
-            }
-            else
-            {
-                // Yes, we can use a write-only catalog.
-                // Is the catalog file empty? If so, write out
-                // the stuff needed at the beginning of the file.
-                // If not, assume that the necessary stuff is
-                // already there. Note that in this case we will
-                // not be able to add the annotation.
-                if (isEmptyFile(catStream_))
-                {
-                    setCatalog(new WriteOnlyCatalog(catStream_));
-                    writeCatalog();
-                }
-                else
-                {
-                    catStream_.close();
-                    catStream_.clear();
-                    catStream_.open(catalogFileName_.c_str(),
-                                    openmode() | std::ios_base::in);
-                    if (!catStream_.is_open()) throw IOOpeningFailure(
-                        "gs::MultiFileArchive constructor", catalogFileName_);
-                    readCatalog<WriteOnlyCatalog>();
-                    catStream_.seekp(0, std::ios_base::end);
-                }
-            }
+      // Get a new buffer for the catalog and open the catalog stream.
+      // We may have to rewrite the complete catalog, so remove the flag
+      // std::ios_base::app from the opening mode.
+      if (catalogFileBufferSize)
+        catabuf_ = new char[catalogFileBufferSize];
+      catStream_.rdbuf()->pubsetbuf(catabuf_, catalogFileBufferSize);
+      catStream_.open(catalogFileName_.c_str(), openmode() & ~std::ios_base::app);
+      if (!catStream_.is_open())
+        throw IOOpeningFailure("gs::MultiFileArchive constructor", catalogFileName_);
 
-            // Open the write stream
-            if (openmode() & std::ios_base::out)
-            {
-                setupWriteStream();
-                const std::streampos pos1 = writeStream_.tellp();
-                if (maxpos_ < pos1)
-                    maxpos_ = pos1;
-            }
-        }
-        catch (std::exception& e)
-        {
-            setCatalog(nullptr);
-            releaseBuffers();
-            errorStream() << e.what();
+      // Can we use a write-only catalog?
+      if (openmode() & std::ios_base::in) {
+        // Reading is allowed. Have to use in-memory catalog.
+        // If the file data already exists, get the catalog in.
+        if (isEmptyFile(catStream_))
+          setCatalog(new ContiguousCatalog());
+        else
+          readCatalog<ContiguousCatalog>();
+      } else {
+        // Yes, we can use a write-only catalog.
+        // Is the catalog file empty? If so, write out
+        // the stuff needed at the beginning of the file.
+        // If not, assume that the necessary stuff is
+        // already there. Note that in this case we will
+        // not be able to add the annotation.
+        if (isEmptyFile(catStream_)) {
+          setCatalog(new WriteOnlyCatalog(catStream_));
+          writeCatalog();
+        } else {
+          catStream_.close();
+          catStream_.clear();
+          catStream_.open(catalogFileName_.c_str(), openmode() | std::ios_base::in);
+          if (!catStream_.is_open())
+            throw IOOpeningFailure("gs::MultiFileArchive constructor", catalogFileName_);
+          readCatalog<WriteOnlyCatalog>();
+          catStream_.seekp(0, std::ios_base::end);
         }
-    }
+      }
 
-    void MultiFileArchive::releaseBuffers()
-    {
-        if (writeStream_.is_open()) writeStream_.close();
-        if (separateReadStream_.is_open()) separateReadStream_.close();
-        if (catStream_.is_open()) catStream_.close();
-        catStream_.rdbuf()->pubsetbuf(nullptr, 0);
-        writeStream_.rdbuf()->pubsetbuf(nullptr, 0);
-        separateReadStream_.rdbuf()->pubsetbuf(nullptr, 0);
-        delete [] catabuf_; catabuf_ = nullptr;
-        delete [] readbuf_; readbuf_ = nullptr;
-        delete [] filebuf_; filebuf_ = nullptr;
+      // Open the write stream
+      if (openmode() & std::ios_base::out) {
+        setupWriteStream();
+        const std::streampos pos1 = writeStream_.tellp();
+        if (maxpos_ < pos1)
+          maxpos_ = pos1;
+      }
+    } catch (std::exception &e) {
+      setCatalog(nullptr);
+      releaseBuffers();
+      errorStream() << e.what();
     }
+  }
 
-    MultiFileArchive::~MultiFileArchive()
-    {
-        flush();
-        releaseBuffers();
-    }
+  void MultiFileArchive::releaseBuffers() {
+    if (writeStream_.is_open())
+      writeStream_.close();
+    if (separateReadStream_.is_open())
+      separateReadStream_.close();
+    if (catStream_.is_open())
+      catStream_.close();
+    catStream_.rdbuf()->pubsetbuf(nullptr, 0);
+    writeStream_.rdbuf()->pubsetbuf(nullptr, 0);
+    separateReadStream_.rdbuf()->pubsetbuf(nullptr, 0);
+    delete[] catabuf_;
+    catabuf_ = nullptr;
+    delete[] readbuf_;
+    readbuf_ = nullptr;
+    delete[] filebuf_;
+    filebuf_ = nullptr;
+  }
 
-    void MultiFileArchive::writeCatalog()
-    {
-        if (isOpen())
-        {
-            if (!annotationsMerged_)
-            {
-                if (!annotation_.empty())
-                    catalogAnnotations_.push_back(annotation_);
-                annotationsMerged_ = true;
-            }
-            const unsigned compress = static_cast<unsigned>(compressionMode());
-            if (!writeBinaryCatalog(catStream_, compress, catalogMergeLevel_,
-                                    catalogAnnotations_, *catalog()))
-            {
-                std::ostringstream os;
-                os << "In MultiFileArchive::writeCatalog: "
-                   << "failed to write catalog data to file "
-                   << catalogFileName_;
-                throw IOWriteFailure(os.str());
-            }
-        }
+  MultiFileArchive::~MultiFileArchive() {
+    flush();
+    releaseBuffers();
+  }
+
+  void MultiFileArchive::writeCatalog() {
+    if (isOpen()) {
+      if (!annotationsMerged_) {
+        if (!annotation_.empty())
+          catalogAnnotations_.push_back(annotation_);
+        annotationsMerged_ = true;
+      }
+      const unsigned compress = static_cast<unsigned>(compressionMode());
+      if (!writeBinaryCatalog(catStream_, compress, catalogMergeLevel_, catalogAnnotations_, *catalog())) {
+        std::ostringstream os;
+        os << "In MultiFileArchive::writeCatalog: "
+           << "failed to write catalog data to file " << catalogFileName_;
+        throw IOWriteFailure(os.str());
+      }
     }
+  }
 
-    void MultiFileArchive::openWriteStream()
+  void MultiFileArchive::openWriteStream() {
+    assert(openmode() & std::ios_base::out);
+    assert(!writeStream_.is_open());
     {
-        assert(openmode() & std::ios_base::out);
-        assert(!writeStream_.is_open());
-        {
-            std::ostringstream os;
-            os << AbsArchive::name() << '.' << writeFileNumber_ << ".gsbd";
-            writeFileName_  = os.str();
-        }
-        writeFileURI_ = localFileURI(writeFileName_.c_str());
-        openDataFile(writeStream_, writeFileName_.c_str());
+      std::ostringstream os;
+      os << AbsArchive::name() << '.' << writeFileNumber_ << ".gsbd";
+      writeFileName_ = os.str();
     }
+    writeFileURI_ = localFileURI(writeFileName_.c_str());
+    openDataFile(writeStream_, writeFileName_.c_str());
+  }
 
-    std::ostream& MultiFileArchive::plainOutputStream()
-    {
-        if (isOpen())
-        {
-            assert(openmode() & std::ios_base::out);
-            if (writeStream_.is_open())
-            {
-                writeStream_.seekp(0, std::ios_base::end);
-                lastpos_ = writeStream_.tellp();
-                if (lastpos_ > maxpos_)
-                {
-                    writeStream_.close();
-                    // Don't have to clear. "openDataFile" will do it.
-                    // writeStream_.clear();
-                    ++writeFileNumber_;
-                }
-                else if (injectMetadata())
-                {
-                    jumppos_ = lastpos_;
-                    std::streampos catpos(0);
-                    write_pod(writeStream_, catpos);
-                    lastpos_ = writeStream_.tellp();
-                }
-            }
-            if (!writeStream_.is_open())
-            {
-                openWriteStream();
-                writeStream_.seekp(0, std::ios_base::end);
-                if (injectMetadata())
-                {
-                    jumppos_ = writeStream_.tellp();
-                    std::streampos catpos(0);
-                    write_pod(writeStream_, catpos);
-                }
-                lastpos_ = writeStream_.tellp();
-            }
-            streamFlushed_ = false;
+  std::ostream &MultiFileArchive::plainOutputStream() {
+    if (isOpen()) {
+      assert(openmode() & std::ios_base::out);
+      if (writeStream_.is_open()) {
+        writeStream_.seekp(0, std::ios_base::end);
+        lastpos_ = writeStream_.tellp();
+        if (lastpos_ > maxpos_) {
+          writeStream_.close();
+          // Don't have to clear. "openDataFile" will do it.
+          // writeStream_.clear();
+          ++writeFileNumber_;
+        } else if (injectMetadata()) {
+          jumppos_ = lastpos_;
+          std::streampos catpos(0);
+          write_pod(writeStream_, catpos);
+          lastpos_ = writeStream_.tellp();
+        }
+      }
+      if (!writeStream_.is_open()) {
+        openWriteStream();
+        writeStream_.seekp(0, std::ios_base::end);
+        if (injectMetadata()) {
+          jumppos_ = writeStream_.tellp();
+          std::streampos catpos(0);
+          write_pod(writeStream_, catpos);
         }
-        return writeStream_;
+        lastpos_ = writeStream_.tellp();
+      }
+      streamFlushed_ = false;
     }
+    return writeStream_;
+  }
 
-    void MultiFileArchive::flush()
-    {
-        if (isOpen())
-        {
-            if (!streamFlushed_)
-            {
-                writeStream_.flush();
-                streamFlushed_ = true;
-            }
+  void MultiFileArchive::flush() {
+    if (isOpen()) {
+      if (!streamFlushed_) {
+        writeStream_.flush();
+        streamFlushed_ = true;
+      }
 
-            if (openmode() & std::ios_base::out)
-            {
-                if (dynamic_cast<WriteOnlyCatalog*>(catalog()) == nullptr)
-                    writeCatalog();
-                catStream_.flush();
-            }
-        }
+      if (openmode() & std::ios_base::out) {
+        if (dynamic_cast<WriteOnlyCatalog *>(catalog()) == nullptr)
+          writeCatalog();
+        catStream_.flush();
+      }
     }
+  }
 
-    void MultiFileArchive::setupWriteStream()
-    {
-        if (openmode() & std::ios_base::trunc)
-        {
-            bool removed = true;
-            for (unsigned i=0; removed; ++i)
-            {
-                std::ostringstream os;
-                os << AbsArchive::name() << '.' << i << ".gsbd";
-                std::string fname = os.str();
-                removed = std::remove(fname.c_str()) == 0;
-            }
-            writeFileNumber_ = 0;
-        }
-        else
-        {
-            unsigned long firstNonExistent = 0;
-            for (; ; ++firstNonExistent)
-            {
-                std::ostringstream os;
-                os << AbsArchive::name() << '.' << firstNonExistent << ".gsbd";
-                std::string fname = os.str();
-                std::ifstream f(fname.c_str());
-                if (!f)
-                    break;
-            }
-            writeFileNumber_ = firstNonExistent ? firstNonExistent - 1UL : 0UL;
-        }
-        openWriteStream();
+  void MultiFileArchive::setupWriteStream() {
+    if (openmode() & std::ios_base::trunc) {
+      bool removed = true;
+      for (unsigned i = 0; removed; ++i) {
+        std::ostringstream os;
+        os << AbsArchive::name() << '.' << i << ".gsbd";
+        std::string fname = os.str();
+        removed = std::remove(fname.c_str()) == 0;
+      }
+      writeFileNumber_ = 0;
+    } else {
+      unsigned long firstNonExistent = 0;
+      for (;; ++firstNonExistent) {
+        std::ostringstream os;
+        os << AbsArchive::name() << '.' << firstNonExistent << ".gsbd";
+        std::string fname = os.str();
+        std::ifstream f(fname.c_str());
+        if (!f)
+          break;
+      }
+      writeFileNumber_ = firstNonExistent ? firstNonExistent - 1UL : 0UL;
     }
+    openWriteStream();
+  }
 
-    std::istream& MultiFileArchive::plainInputStream(
-        const unsigned long long id,
-        unsigned* compressionCode,
-        unsigned long long* length)
-    {
-        std::fstream* readStream = &writeStream_;
-        if (isOpen())
-        {
-            assert(openmode() & std::ios_base::in);
-            if (!id) throw gs::IOInvalidArgument(
-                "In gs::MultiFileArchive::plainInputStream: invalid item id");
-
-            // If we have a write stream, and if the archive
-            // has one file only, we should be able to retrieve
-            // stream position quickly
-            std::streampos pos(0);
-            if ((openmode() & std::ios_base::out) && writeFileNumber_ == 0UL)
-            {
-                if (!catalog()->retrieveStreampos(
-                        id, compressionCode, length, &pos))
-                {
-                    std::ostringstream os;
-                    os << "In gs::MultiFileArchive::plainInputStream: "
-                       << "failed to locate item with id " << id
-                       << "in the catalog stored in file " << catalogFileName_;
-                    throw gs::IOInvalidArgument(os.str());
-                }
-            }
-            else
-            {
-                // Here, we have to do a full catalog search
-                CPP11_shared_ptr<const CatalogEntry> sptr = 
-                    catalog()->retrieveEntry(id);
-                const CatalogEntry* pe = sptr.get();
-                if (!pe)
-                {
-                    std::ostringstream os;
-                    os << "In gs::MultiFileArchive::plainInputStream: "
-                       << "failed to locate item with id " << id
-                       << "in the catalog stored in file " << catalogFileName_;
-                    throw gs::IOInvalidArgument(os.str());
-                }
-                pos = pe->location().streamPosition();
-                if (pe->location().URI() != writeFileURI_)
-                {
-                    updateReadStream(pe->location().URI());
-                    readStream = &separateReadStream_;
-                }
-                *compressionCode = pe->compressionCode();
-                *length = pe->itemLength();
-            }
+  std::istream &MultiFileArchive::plainInputStream(const unsigned long long id,
+                                                   unsigned *compressionCode,
+                                                   unsigned long long *length) {
+    std::fstream *readStream = &writeStream_;
+    if (isOpen()) {
+      assert(openmode() & std::ios_base::in);
+      if (!id)
+        throw gs::IOInvalidArgument("In gs::MultiFileArchive::plainInputStream: invalid item id");
 
-            // Flush the write stream if it will be used for reading
-            if (readStream == &writeStream_)
-            {
-                assert(writeStream_.is_open());
-                if (!streamFlushed_)
-                {
-                    writeStream_.flush();
-                    streamFlushed_ = true;
-                }
-            }
+      // If we have a write stream, and if the archive
+      // has one file only, we should be able to retrieve
+      // stream position quickly
+      std::streampos pos(0);
+      if ((openmode() & std::ios_base::out) && writeFileNumber_ == 0UL) {
+        if (!catalog()->retrieveStreampos(id, compressionCode, length, &pos)) {
+          std::ostringstream os;
+          os << "In gs::MultiFileArchive::plainInputStream: "
+             << "failed to locate item with id " << id << "in the catalog stored in file " << catalogFileName_;
+          throw gs::IOInvalidArgument(os.str());
+        }
+      } else {
+        // Here, we have to do a full catalog search
+        CPP11_shared_ptr<const CatalogEntry> sptr = catalog()->retrieveEntry(id);
+        const CatalogEntry *pe = sptr.get();
+        if (!pe) {
+          std::ostringstream os;
+          os << "In gs::MultiFileArchive::plainInputStream: "
+             << "failed to locate item with id " << id << "in the catalog stored in file " << catalogFileName_;
+          throw gs::IOInvalidArgument(os.str());
+        }
+        pos = pe->location().streamPosition();
+        if (pe->location().URI() != writeFileURI_) {
+          updateReadStream(pe->location().URI());
+          readStream = &separateReadStream_;
+        }
+        *compressionCode = pe->compressionCode();
+        *length = pe->itemLength();
+      }
 
-            readStream->seekg(pos);
+      // Flush the write stream if it will be used for reading
+      if (readStream == &writeStream_) {
+        assert(writeStream_.is_open());
+        if (!streamFlushed_) {
+          writeStream_.flush();
+          streamFlushed_ = true;
         }
-        return *readStream;
-    }
+      }
 
-    void MultiFileArchive::updateReadStream(const std::string& uri)
-    {
-        if (uri == readFileURI_)
-            return;
+      readStream->seekg(pos);
+    }
+    return *readStream;
+  }
 
-        assert(openmode() & std::ios_base::in);
-        if (separateReadStream_.is_open())
-        {
-            separateReadStream_.close();
-            separateReadStream_.clear();
-        }
+  void MultiFileArchive::updateReadStream(const std::string &uri) {
+    if (uri == readFileURI_)
+      return;
 
-        // We need to get the name of the local file from the URI.
-        // We will assume that it belongs to the archive we are
-        // working with right now.
-        readFileName_ = joinDir1WithName2(AbsArchive::name().c_str(),
-                                          uri.c_str());
-        separateReadStream_.open(readFileName_.c_str(), std::ios_base::binary |
-                                                        std::ios_base::in);
-        if (!separateReadStream_.is_open())
-            throw IOOpeningFailure("gs::MultiFileArchive::updateReadStream",
-                                   readFileName_);
-        readFileURI_ = uri;
+    assert(openmode() & std::ios_base::in);
+    if (separateReadStream_.is_open()) {
+      separateReadStream_.close();
+      separateReadStream_.clear();
     }
 
-    unsigned long long MultiFileArchive::addToCatalog(
-        const AbsRecord& record, const unsigned compressionCode,
-        const unsigned long long itemLength)
-    {
-        unsigned long long id = 0;
-        if (isOpen())
-        {
-            id = catalog()->makeEntry(
-                record, compressionCode, itemLength,
-                ItemLocation(lastpos_, writeFileURI_.c_str()));
-            if (id && injectMetadata())
-            {
-                const CatalogEntry* entry = catalog()->lastEntryMade();
-                assert(entry);
-                writeStream_.seekp(0, std::ios_base::end);
-                std::streampos now = writeStream_.tellp();
-                if (entry->write(writeStream_))
-                {
-                    writeStream_.seekp(jumppos_);
-                    write_pod(writeStream_, now);
-                    writeStream_.seekp(0, std::ios_base::end);
-                }
-                else
-                    id = 0;
-            }
-        }
-        return id;
+    // We need to get the name of the local file from the URI.
+    // We will assume that it belongs to the archive we are
+    // working with right now.
+    readFileName_ = joinDir1WithName2(AbsArchive::name().c_str(), uri.c_str());
+    separateReadStream_.open(readFileName_.c_str(), std::ios_base::binary | std::ios_base::in);
+    if (!separateReadStream_.is_open())
+      throw IOOpeningFailure("gs::MultiFileArchive::updateReadStream", readFileName_);
+    readFileURI_ = uri;
+  }
+
+  unsigned long long MultiFileArchive::addToCatalog(const AbsRecord &record,
+                                                    const unsigned compressionCode,
+                                                    const unsigned long long itemLength) {
+    unsigned long long id = 0;
+    if (isOpen()) {
+      id = catalog()->makeEntry(record, compressionCode, itemLength, ItemLocation(lastpos_, writeFileURI_.c_str()));
+      if (id && injectMetadata()) {
+        const CatalogEntry *entry = catalog()->lastEntryMade();
+        assert(entry);
+        writeStream_.seekp(0, std::ios_base::end);
+        std::streampos now = writeStream_.tellp();
+        if (entry->write(writeStream_)) {
+          writeStream_.seekp(jumppos_);
+          write_pod(writeStream_, now);
+          writeStream_.seekp(0, std::ios_base::end);
+        } else
+          id = 0;
+      }
     }
-}
+    return id;
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/src/SearchSpecifier.cc b/Alignment/Geners/src/SearchSpecifier.cc
index 27d86ba7ac31e..eef599123af32 100644
--- a/Alignment/Geners/src/SearchSpecifier.cc
+++ b/Alignment/Geners/src/SearchSpecifier.cc
@@ -1,15 +1,14 @@
 #include "Alignment/Geners/interface/SearchSpecifier.hh"
 
 namespace gs {
-    bool SearchSpecifier::matches(const std::string& sentence) const
-    {
-        if (useRegex_)
+  bool SearchSpecifier::matches(const std::string &sentence) const {
+    if (useRegex_)
 #ifdef CPP11_STD_AVAILABLE
-            return std::regex_match(sentence.begin(), sentence.end(), regex_);
+      return std::regex_match(sentence.begin(), sentence.end(), regex_);
 #else
-            return regex_.matches(sentence);
+      return regex_.matches(sentence);
 #endif
-        else
-            return sentence == tag_;
-    }
-}
+    else
+      return sentence == tag_;
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/src/StringArchive.cc b/Alignment/Geners/src/StringArchive.cc
index d1f3d4b6759c5..397816f9dd308 100644
--- a/Alignment/Geners/src/StringArchive.cc
+++ b/Alignment/Geners/src/StringArchive.cc
@@ -1,87 +1,70 @@
-#include <sstream>
-#include <cassert>
 #include "Alignment/Geners/interface/IOException.hh"
+#include <cassert>
+#include <sstream>
 
 #include "Alignment/Geners/interface/StringArchive.hh"
 #include "Alignment/Geners/interface/streamposIO.hh"
 
 namespace gs {
-    void StringArchive::search(AbsReference& reference)
-    {
-        std::vector<unsigned long long> idlist;
-        catalog_.search(reference.namePattern(),
-                        reference.categoryPattern(),
-                        &idlist);
-        const unsigned long nfound = idlist.size();
-        for (unsigned long i=0; i<nfound; ++i)
-        {
-            CPP11_shared_ptr<const CatalogEntry> pentry = 
-                catalog_.retrieveEntry(idlist[i]);
-            if (reference.isIOCompatible(*pentry))
-                addItemToReference(reference, idlist[i]);
-        }
+  void StringArchive::search(AbsReference &reference) {
+    std::vector<unsigned long long> idlist;
+    catalog_.search(reference.namePattern(), reference.categoryPattern(), &idlist);
+    const unsigned long nfound = idlist.size();
+    for (unsigned long i = 0; i < nfound; ++i) {
+      CPP11_shared_ptr<const CatalogEntry> pentry = catalog_.retrieveEntry(idlist[i]);
+      if (reference.isIOCompatible(*pentry))
+        addItemToReference(reference, idlist[i]);
     }
+  }
 
-    std::istream& StringArchive::inputStream(const unsigned long long id,
-                                             long long* sz)
-    {
-        if (!id) throw gs::IOInvalidArgument(
-            "In gs::StringArchive::inputStream: invalid item id");
-        unsigned cCode;
-        std::streampos pos;
-        unsigned long long itemLen;
-        if (!catalog_.retrieveStreampos(id, &cCode, &itemLen, &pos))
-        {
-            std::ostringstream os;
-            os << "In gs::StringArchive::inputStream: "
-               << "failed to locate item with id " << id;
-            throw gs::IOInvalidArgument(os.str());
-        }
-        if (sz)
-            *sz = -1LL;
-        stream_.seekg(pos);
-        return stream_;
+  std::istream &StringArchive::inputStream(const unsigned long long id, long long *sz) {
+    if (!id)
+      throw gs::IOInvalidArgument("In gs::StringArchive::inputStream: invalid item id");
+    unsigned cCode;
+    std::streampos pos;
+    unsigned long long itemLen;
+    if (!catalog_.retrieveStreampos(id, &cCode, &itemLen, &pos)) {
+      std::ostringstream os;
+      os << "In gs::StringArchive::inputStream: "
+         << "failed to locate item with id " << id;
+      throw gs::IOInvalidArgument(os.str());
     }
+    if (sz)
+      *sz = -1LL;
+    stream_.seekg(pos);
+    return stream_;
+  }
 
-    bool StringArchive::isEqual(const AbsArchive& cata) const
-    {
-        const StringArchive& r = static_cast<const StringArchive&>(cata);
-        return lastpos_ == r.lastpos_ && 
-               name() == r.name() && 
-               stream_ == r.stream_ &&
-               catalog_ == r.catalog_;        
-    }
+  bool StringArchive::isEqual(const AbsArchive &cata) const {
+    const StringArchive &r = static_cast<const StringArchive &>(cata);
+    return lastpos_ == r.lastpos_ && name() == r.name() && stream_ == r.stream_ && catalog_ == r.catalog_;
+  }
 
-    bool StringArchive::write(std::ostream& of) const
-    {
-        write_pod(of, lastpos_);
-        write_pod(of, name());
-        return !of.fail() &&
-               stream_.classId().write(of) &&
-               stream_.write(of) &&
-               catalog_.classId().write(of) &&
-               catalog_.write(of);
-    }
+  bool StringArchive::write(std::ostream &of) const {
+    write_pod(of, lastpos_);
+    write_pod(of, name());
+    return !of.fail() && stream_.classId().write(of) && stream_.write(of) && catalog_.classId().write(of) &&
+           catalog_.write(of);
+  }
 
-    StringArchive* StringArchive::read(const ClassId& id, std::istream& in)
-    {
-        static const ClassId current(ClassId::makeId<StringArchive>());
-        current.ensureSameId(id);
+  StringArchive *StringArchive::read(const ClassId &id, std::istream &in) {
+    static const ClassId current(ClassId::makeId<StringArchive>());
+    current.ensureSameId(id);
 
-        std::streampos lastpos;
-        read_pod(in, &lastpos);
-        std::string nam;
-        read_pod(in, &nam);
-        if (in.fail()) throw IOReadFailure(
-            "In gs::StringArchive::read: input stream failure");
-        CPP11_auto_ptr<StringArchive> archive(new StringArchive(nam.c_str()));
-        archive->lastpos_ = lastpos;
-        ClassId streamId(in, 1);
-        CharBuffer::restore(streamId, in, &archive->stream_);
-        ClassId catId(in, 1);
-        CPP11_auto_ptr<ContiguousCatalog> p(ContiguousCatalog::read(catId, in));
-        assert(p.get());
-        archive->catalog_ = *p;
-        return archive.release();
-    }
-}
+    std::streampos lastpos;
+    read_pod(in, &lastpos);
+    std::string nam;
+    read_pod(in, &nam);
+    if (in.fail())
+      throw IOReadFailure("In gs::StringArchive::read: input stream failure");
+    CPP11_auto_ptr<StringArchive> archive(new StringArchive(nam.c_str()));
+    archive->lastpos_ = lastpos;
+    ClassId streamId(in, 1);
+    CharBuffer::restore(streamId, in, &archive->stream_);
+    ClassId catId(in, 1);
+    CPP11_auto_ptr<ContiguousCatalog> p(ContiguousCatalog::read(catId, in));
+    assert(p.get());
+    archive->catalog_ = *p;
+    return archive.release();
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/src/WriteOnlyCatalog.cc b/Alignment/Geners/src/WriteOnlyCatalog.cc
index debaf65e34ac7..e85e3df905411 100644
--- a/Alignment/Geners/src/WriteOnlyCatalog.cc
+++ b/Alignment/Geners/src/WriteOnlyCatalog.cc
@@ -1,145 +1,118 @@
 #include "Alignment/Geners/interface/CPP11_auto_ptr.hh"
 #include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
+#include "Alignment/Geners/interface/IOException.hh"
 #include "Alignment/Geners/interface/WriteOnlyCatalog.hh"
 #include "Alignment/Geners/interface/binaryIO.hh"
-#include "Alignment/Geners/interface/IOException.hh"
 
 namespace gs {
-    WriteOnlyCatalog::WriteOnlyCatalog(std::ostream& os,
-                                       const unsigned long long firstId)
-        : AbsCatalog(),
-          os_(os),
-          count_(0),
-          smallestId_(firstId ? firstId : 1ULL),
-          largestId_(0)
-    {
-    }
+  WriteOnlyCatalog::WriteOnlyCatalog(std::ostream &os, const unsigned long long firstId)
+      : AbsCatalog(), os_(os), count_(0), smallestId_(firstId ? firstId : 1ULL), largestId_(0) {}
 
-    unsigned long long WriteOnlyCatalog::makeEntry(
-        const ItemDescriptor& descriptor,
-        const unsigned compressionCode,
-        const unsigned long long itemLen,
-        const ItemLocation& loc,
-        const unsigned long long off)
-    {
-        const unsigned long long id = count_ ? largestId_ + 1 : smallestId_;
-        lastEntry_ = CPP11_auto_ptr<const CatalogEntry>(new CatalogEntry(
-            descriptor, id, compressionCode, itemLen, loc, off));
-        if (lastEntry_->write(os_))
-        {
-            ++count_;
-            largestId_ = id;
-            return id;
-        }
-        else
-        {
-            lastEntry_ = nullptr;
-            return 0ULL;
-        }
+  unsigned long long WriteOnlyCatalog::makeEntry(const ItemDescriptor &descriptor,
+                                                 const unsigned compressionCode,
+                                                 const unsigned long long itemLen,
+                                                 const ItemLocation &loc,
+                                                 const unsigned long long off) {
+    const unsigned long long id = count_ ? largestId_ + 1 : smallestId_;
+    lastEntry_ =
+        CPP11_auto_ptr<const CatalogEntry>(new CatalogEntry(descriptor, id, compressionCode, itemLen, loc, off));
+    if (lastEntry_->write(os_)) {
+      ++count_;
+      largestId_ = id;
+      return id;
+    } else {
+      lastEntry_ = nullptr;
+      return 0ULL;
     }
+  }
 
-    // Version 1 write function
-    // bool WriteOnlyCatalog::write(std::ostream& os) const
-    // {
-    //     return ClassId::makeId<CatalogEntry>().write(os) &&
-    //            ClassId::makeId<ItemLocation>().write(os);
-    // }
+  // Version 1 write function
+  // bool WriteOnlyCatalog::write(std::ostream& os) const
+  // {
+  //     return ClassId::makeId<CatalogEntry>().write(os) &&
+  //            ClassId::makeId<ItemLocation>().write(os);
+  // }
 
-    bool WriteOnlyCatalog::write(std::ostream& os) const
-    {
-        long long dummy = -1;
-        write_pod(os, dummy);
-        return !os.fail() && ClassId::makeId<CatalogEntry>().write(os) &&
-                             ClassId::makeId<ItemLocation>().write(os);
-    }
+  bool WriteOnlyCatalog::write(std::ostream &os) const {
+    long long dummy = -1;
+    write_pod(os, dummy);
+    return !os.fail() && ClassId::makeId<CatalogEntry>().write(os) && ClassId::makeId<ItemLocation>().write(os);
+  }
 
-    WriteOnlyCatalog* WriteOnlyCatalog::read(const ClassId& id,
-                                             std::istream& in)
-    {
-        static const ClassId current(ClassId::makeId<WriteOnlyCatalog>());
-        id.ensureSameName(current);
-        id.ensureVersionInRange(1, version());
+  WriteOnlyCatalog *WriteOnlyCatalog::read(const ClassId &id, std::istream &in) {
+    static const ClassId current(ClassId::makeId<WriteOnlyCatalog>());
+    id.ensureSameName(current);
+    id.ensureVersionInRange(1, version());
 
-        if (id.version() > 1)
-        {
-            long long dummy;
-            read_pod(in, &dummy);
-        }
+    if (id.version() > 1) {
+      long long dummy;
+      read_pod(in, &dummy);
+    }
 
-        ClassId rId(in, 1);
-        ClassId locId(in, 1);
+    ClassId rId(in, 1);
+    ClassId locId(in, 1);
 
-        CPP11_auto_ptr<WriteOnlyCatalog> cat(new WriteOnlyCatalog(
-                dynamic_cast<std::ostream&>(in)));
-        bool firstEntry = true;
-        for (in.peek(); !in.eof(); in.peek())
-        {
-            CatalogEntry* rec = CatalogEntry::read(rId, locId, in);
-            if (rec)
-            {
-                bool ordered = true;
-                const unsigned long long id = rec->id();
-                if (firstEntry)
-                {
-                    cat->smallestId_ = id;
-                    cat->count_ = 1;
-                    cat->largestId_ = id;
-                    firstEntry = false;
-                }
-                else
-                {
-                    if (id < cat->smallestId_)
-                    {
-                        cat->smallestId_ = id;
-                        ++cat->count_;
-                    }
-                    else if (id > cat->largestId_)
-                    {
-                        cat->largestId_ = id;
-                        ++cat->count_;
-                    }
-                    else
-                        ordered = false;
-                }
-                delete rec;
-                if (!ordered)
-                    throw IOInvalidData("In gs::WriteOnlyCatalog::read: "
-                                        "entry out of order. Catalog is "
-                                        "likely to be corrupted.");
-            }
-            else
-                throw IOInvalidData("In gs::WriteOnlyCatalog::read: "
-                                    "failed to read catalog entry");
+    CPP11_auto_ptr<WriteOnlyCatalog> cat(new WriteOnlyCatalog(dynamic_cast<std::ostream &>(in)));
+    bool firstEntry = true;
+    for (in.peek(); !in.eof(); in.peek()) {
+      CatalogEntry *rec = CatalogEntry::read(rId, locId, in);
+      if (rec) {
+        bool ordered = true;
+        const unsigned long long id = rec->id();
+        if (firstEntry) {
+          cat->smallestId_ = id;
+          cat->count_ = 1;
+          cat->largestId_ = id;
+          firstEntry = false;
+        } else {
+          if (id < cat->smallestId_) {
+            cat->smallestId_ = id;
+            ++cat->count_;
+          } else if (id > cat->largestId_) {
+            cat->largestId_ = id;
+            ++cat->count_;
+          } else
+            ordered = false;
         }
-        return cat.release();
+        delete rec;
+        if (!ordered)
+          throw IOInvalidData(
+              "In gs::WriteOnlyCatalog::read: "
+              "entry out of order. Catalog is "
+              "likely to be corrupted.");
+      } else
+        throw IOInvalidData(
+            "In gs::WriteOnlyCatalog::read: "
+            "failed to read catalog entry");
     }
+    return cat.release();
+  }
 
-    CPP11_shared_ptr<const CatalogEntry> WriteOnlyCatalog::retrieveEntry(
-        unsigned long long) const
-    {
-        throw IOReadFailure("In gs::WriteOnlyCatalog::retrieveEntry: "
-                            "entries can not be retrieved "
-                            "from a write-only catalog");
-        return CPP11_shared_ptr<CatalogEntry>(
-            reinterpret_cast<CatalogEntry*>(0));
-    }
+  CPP11_shared_ptr<const CatalogEntry> WriteOnlyCatalog::retrieveEntry(unsigned long long) const {
+    throw IOReadFailure(
+        "In gs::WriteOnlyCatalog::retrieveEntry: "
+        "entries can not be retrieved "
+        "from a write-only catalog");
+    return CPP11_shared_ptr<CatalogEntry>(reinterpret_cast<CatalogEntry *>(0));
+  }
 
-    bool WriteOnlyCatalog::retrieveStreampos(
-        unsigned long long /* id */, unsigned* /* compressionCode */,
-        unsigned long long* /* length */, std::streampos* /* pos */) const
-    {
-        throw IOReadFailure("In gs::WriteOnlyCatalog::retrieveStreampos: "
-                            "stream positions can not be retrieved "
-                            "from a write-only catalog");
-        return false;
-    }
+  bool WriteOnlyCatalog::retrieveStreampos(unsigned long long /* id */,
+                                           unsigned * /* compressionCode */,
+                                           unsigned long long * /* length */,
+                                           std::streampos * /* pos */) const {
+    throw IOReadFailure(
+        "In gs::WriteOnlyCatalog::retrieveStreampos: "
+        "stream positions can not be retrieved "
+        "from a write-only catalog");
+    return false;
+  }
 
-    void WriteOnlyCatalog::search(const SearchSpecifier&,
-                                  const SearchSpecifier&,
-                                  std::vector<unsigned long long>*) const
-    {
-        throw IOReadFailure("In gs::WriteOnlyCatalog::search: "
-                            "entries can not be searched "
-                            "in a write-only catalog");
-    }
-}
+  void WriteOnlyCatalog::search(const SearchSpecifier &,
+                                const SearchSpecifier &,
+                                std::vector<unsigned long long> *) const {
+    throw IOReadFailure(
+        "In gs::WriteOnlyCatalog::search: "
+        "entries can not be searched "
+        "in a write-only catalog");
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/src/ZlibHandle.cc b/Alignment/Geners/src/ZlibHandle.cc
index 0316ff00fae47..47b2a3ec0ab4a 100644
--- a/Alignment/Geners/src/ZlibHandle.cc
+++ b/Alignment/Geners/src/ZlibHandle.cc
@@ -5,38 +5,33 @@
 #include "Alignment/Geners/interface/ZlibHandle.hh"
 
 namespace gs {
-    ZlibInflateHandle::ZlibInflateHandle()
-    {
-        strm_ = new z_stream_s();
-        strm_->zalloc = Z_NULL;
-        strm_->zfree = Z_NULL;
-        strm_->opaque = Z_NULL;
-        strm_->avail_in = 0;
-        strm_->next_in = Z_NULL;
-        assert(inflateInit(strm_) == Z_OK);
-    }
+  ZlibInflateHandle::ZlibInflateHandle() {
+    strm_ = new z_stream_s();
+    strm_->zalloc = Z_NULL;
+    strm_->zfree = Z_NULL;
+    strm_->opaque = Z_NULL;
+    strm_->avail_in = 0;
+    strm_->next_in = Z_NULL;
+    assert(inflateInit(strm_) == Z_OK);
+  }
 
-    ZlibInflateHandle::~ZlibInflateHandle()
-    {
-        inflateEnd(strm_);
-        delete strm_;
-    }
+  ZlibInflateHandle::~ZlibInflateHandle() {
+    inflateEnd(strm_);
+    delete strm_;
+  }
 
-    ZlibDeflateHandle::ZlibDeflateHandle(const int lev)
-        : level_(lev)
-    {
-        strm_ = new z_stream_s();
-        strm_->zalloc = Z_NULL;
-        strm_->zfree = Z_NULL;
-        strm_->opaque = Z_NULL;
-        strm_->avail_in = 0;
-        strm_->next_in = Z_NULL;
-        assert(deflateInit(strm_, lev) == Z_OK);
-    }
+  ZlibDeflateHandle::ZlibDeflateHandle(const int lev) : level_(lev) {
+    strm_ = new z_stream_s();
+    strm_->zalloc = Z_NULL;
+    strm_->zfree = Z_NULL;
+    strm_->opaque = Z_NULL;
+    strm_->avail_in = 0;
+    strm_->next_in = Z_NULL;
+    assert(deflateInit(strm_, lev) == Z_OK);
+  }
 
-    ZlibDeflateHandle::~ZlibDeflateHandle()
-    {
-        deflateEnd(strm_);
-        delete strm_;
-    }
-}
+  ZlibDeflateHandle::~ZlibDeflateHandle() {
+    deflateEnd(strm_);
+    delete strm_;
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/src/stringArchiveIO.cc b/Alignment/Geners/src/stringArchiveIO.cc
index 610306297ba8c..9ab011ba47434 100644
--- a/Alignment/Geners/src/stringArchiveIO.cc
+++ b/Alignment/Geners/src/stringArchiveIO.cc
@@ -1,123 +1,105 @@
+#include "Alignment/Geners/interface/IOException.hh"
 #include <cassert>
 #include <cstring>
 #include <fstream>
 #include <sstream>
-#include "Alignment/Geners/interface/IOException.hh"
 
-#include "Alignment/Geners/interface/stringArchiveIO.hh"
 #include "Alignment/Geners/interface/CompressedIO.hh"
 #include "Alignment/Geners/interface/IOException.hh"
 #include "Alignment/Geners/interface/Reference.hh"
+#include "Alignment/Geners/interface/stringArchiveIO.hh"
 
-
-static bool suffix_matches(const char* filename, const char* suffix)
-{
-    static const char default_suffix[] = ".gssaz";
-    assert(filename);
-    if (suffix == nullptr)
-        suffix = default_suffix;
-    const std::size_t lenSuffix = strlen(suffix);
-    const std::size_t len = strlen(filename);
-    bool suffixMatches = len >= lenSuffix;
-    for (std::size_t i=0; i<lenSuffix && suffixMatches; ++i)
-        suffixMatches = suffix[i] == filename[len-lenSuffix+i];
-    return suffixMatches;
+static bool suffix_matches(const char *filename, const char *suffix) {
+  static const char default_suffix[] = ".gssaz";
+  assert(filename);
+  if (suffix == nullptr)
+    suffix = default_suffix;
+  const std::size_t lenSuffix = strlen(suffix);
+  const std::size_t len = strlen(filename);
+  bool suffixMatches = len >= lenSuffix;
+  for (std::size_t i = 0; i < lenSuffix && suffixMatches; ++i)
+    suffixMatches = suffix[i] == filename[len - lenSuffix + i];
+  return suffixMatches;
 }
 
-
 namespace gs {
-    bool writeStringArchive(const StringArchive& ar, const char* filename)
+  bool writeStringArchive(const StringArchive &ar, const char *filename) {
+    assert(filename);
+    bool status = false;
     {
-        assert(filename);
-        bool status = false;
-        {
-            std::ofstream of(filename, std::ios_base::binary);
-            if (of.is_open())
-            {
-                const_cast<StringArchive&>(ar).flush();
-                status = write_item(of, ar);
-            }
-        }
-        return status;
+      std::ofstream of(filename, std::ios_base::binary);
+      if (of.is_open()) {
+        const_cast<StringArchive &>(ar).flush();
+        status = write_item(of, ar);
+      }
     }
+    return status;
+  }
 
-    StringArchive* readStringArchive(const char* filename)
-    {
-        assert(filename);
-        std::ifstream is(filename, std::ios_base::binary);
-        if (!is.is_open())
-            throw IOOpeningFailure("gs::readStringArchive", filename);
-        CPP11_auto_ptr<StringArchive> ar = read_item<StringArchive>(is);
-        return ar.release();
-    }
+  StringArchive *readStringArchive(const char *filename) {
+    assert(filename);
+    std::ifstream is(filename, std::ios_base::binary);
+    if (!is.is_open())
+      throw IOOpeningFailure("gs::readStringArchive", filename);
+    CPP11_auto_ptr<StringArchive> ar = read_item<StringArchive>(is);
+    return ar.release();
+  }
 
-    bool writeCompressedStringArchive(
-        const StringArchive& ar, const char* filename,
-        const unsigned inCompressionMode, const int compressionLevel,
-        const unsigned minSizeToCompress, const unsigned bufSize)
+  bool writeCompressedStringArchive(const StringArchive &ar,
+                                    const char *filename,
+                                    const unsigned inCompressionMode,
+                                    const int compressionLevel,
+                                    const unsigned minSizeToCompress,
+                                    const unsigned bufSize) {
+    assert(filename);
+    if (inCompressionMode > CStringStream::BZIP2)
+      throw gs::IOInvalidArgument(
+          "In gs::writeCompressedStringArchive: "
+          "compression mode argument out of range");
+    const CStringStream::CompressionMode m = static_cast<CStringStream::CompressionMode>(inCompressionMode);
+    bool status = false;
     {
-        assert(filename);
-        if (inCompressionMode > CStringStream::BZIP2)
-            throw gs::IOInvalidArgument(
-                "In gs::writeCompressedStringArchive: "
-                "compression mode argument out of range");
-        const CStringStream::CompressionMode m = 
-            static_cast<CStringStream::CompressionMode>(inCompressionMode);
-        bool status = false;
-        {
-            std::ofstream of(filename, std::ios_base::binary);
-            if (of.is_open())
-            {
-                const_cast<StringArchive&>(ar).flush();
-                status = write_compressed_item(of, ar, m, compressionLevel,
-                                               minSizeToCompress, bufSize);
-            }
-        }
-        return status;        
+      std::ofstream of(filename, std::ios_base::binary);
+      if (of.is_open()) {
+        const_cast<StringArchive &>(ar).flush();
+        status = write_compressed_item(of, ar, m, compressionLevel, minSizeToCompress, bufSize);
+      }
     }
+    return status;
+  }
 
-    StringArchive* readCompressedStringArchive(const char* filename)
-    {
-        assert(filename);
-        std::ifstream is(filename, std::ios_base::binary);
-        if (!is.is_open())
-            throw IOOpeningFailure("gs::readCompressedStringArchive", filename);
-        CPP11_auto_ptr<StringArchive> ar =
-            read_compressed_item<StringArchive>(is);
-        return ar.release();
-    }
+  StringArchive *readCompressedStringArchive(const char *filename) {
+    assert(filename);
+    std::ifstream is(filename, std::ios_base::binary);
+    if (!is.is_open())
+      throw IOOpeningFailure("gs::readCompressedStringArchive", filename);
+    CPP11_auto_ptr<StringArchive> ar = read_compressed_item<StringArchive>(is);
+    return ar.release();
+  }
 
-    StringArchive* loadStringArchiveFromArchive(AbsArchive& arch,
-                                                const unsigned long long id)
-    {
-        Reference<StringArchive> ref(arch, id);
-        if (!ref.unique())
-        {
-            std::ostringstream os;
-            os << "In gs::loadStringArchiveFromArchive: "
-               << "StringArchive item with id " << id << " not found";
-            throw gs::IOInvalidArgument(os.str());
-        }
-        CPP11_auto_ptr<StringArchive> p = ref.get(0);
-        return p.release();
+  StringArchive *loadStringArchiveFromArchive(AbsArchive &arch, const unsigned long long id) {
+    Reference<StringArchive> ref(arch, id);
+    if (!ref.unique()) {
+      std::ostringstream os;
+      os << "In gs::loadStringArchiveFromArchive: "
+         << "StringArchive item with id " << id << " not found";
+      throw gs::IOInvalidArgument(os.str());
     }
+    CPP11_auto_ptr<StringArchive> p = ref.get(0);
+    return p.release();
+  }
 
-    StringArchive* readCompressedStringArchiveExt(const char* filename,
-                                                  const char* suffix)
-    {
-        if (suffix_matches(filename, suffix))
-            return readCompressedStringArchive(filename);
-        else
-            return readStringArchive(filename);
-    }
+  StringArchive *readCompressedStringArchiveExt(const char *filename, const char *suffix) {
+    if (suffix_matches(filename, suffix))
+      return readCompressedStringArchive(filename);
+    else
+      return readStringArchive(filename);
+  }
 
-    bool writeCompressedStringArchiveExt(const StringArchive& ar,
-                                         const char* filename,
-                                         const char* suffix)
-    {
-        if (suffix_matches(filename, suffix))
-            return writeCompressedStringArchive(ar, filename);
-        else
-            return writeStringArchive(ar, filename);
-    }
-}
+  bool writeCompressedStringArchiveExt(const StringArchive &ar, const char *filename, const char *suffix) {
+    if (suffix_matches(filename, suffix))
+      return writeCompressedStringArchive(ar, filename);
+    else
+      return writeStringArchive(ar, filename);
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/src/uriUtils.cc b/Alignment/Geners/src/uriUtils.cc
index d1a16e514c7be..d93ee0b3dddee 100644
--- a/Alignment/Geners/src/uriUtils.cc
+++ b/Alignment/Geners/src/uriUtils.cc
@@ -1,48 +1,44 @@
-#include <cstring>
-#include <cassert>
 #include "Alignment/Geners/interface/IOException.hh"
+#include <cassert>
+#include <cstring>
 
 #include "Alignment/Geners/interface/uriUtils.hh"
 
 namespace gs {
-    std::string localFileURI(const char* filename)
-    {
-        assert(filename);
-        if (strlen(filename) == 0) throw gs::IOInvalidArgument(
-            "In gs::localFileURI: empty file name");
-        std::string uri("file://");
-        if (filename[0] != '/')
-            uri += "./";
-        uri += filename;
-        return uri;
-    }
+  std::string localFileURI(const char *filename) {
+    assert(filename);
+    if (strlen(filename) == 0)
+      throw gs::IOInvalidArgument("In gs::localFileURI: empty file name");
+    std::string uri("file://");
+    if (filename[0] != '/')
+      uri += "./";
+    uri += filename;
+    return uri;
+  }
 
-    std::string fileTail(const char* filename)
-    {
-        assert(filename);
-        const char *progname = std::strrchr(filename, '/');
-        if (progname)
-            ++progname;
-        else
-            progname = filename;
-        return std::string(progname);
-    }
+  std::string fileTail(const char *filename) {
+    assert(filename);
+    const char *progname = std::strrchr(filename, '/');
+    if (progname)
+      ++progname;
+    else
+      progname = filename;
+    return std::string(progname);
+  }
 
-    std::string fileDirname(const char* filename)
-    {
-        assert(filename);
-        const char *progname = std::strrchr(filename, '/');
-        if (progname)
-            return std::string(filename, progname - filename);
-        else
-            return std::string(".");
-    }
+  std::string fileDirname(const char *filename) {
+    assert(filename);
+    const char *progname = std::strrchr(filename, '/');
+    if (progname)
+      return std::string(filename, progname - filename);
+    else
+      return std::string(".");
+  }
 
-    std::string joinDir1WithName2(const char* fname1, const char* fname2)
-    {
-        std::string res(fileDirname(fname1));
-        res += '/';
-        res += fileTail(fname2);
-        return res;
-    }
-}
+  std::string joinDir1WithName2(const char *fname1, const char *fname2) {
+    std::string res(fileDirname(fname1));
+    res += '/';
+    res += fileTail(fname2);
+    return res;
+  }
+}  // namespace gs
diff --git a/Alignment/Geners/test/CmdLine.hh b/Alignment/Geners/test/CmdLine.hh
index 1bd98231eee9f..0e005c1a9073d 100644
--- a/Alignment/Geners/test/CmdLine.hh
+++ b/Alignment/Geners/test/CmdLine.hh
@@ -37,7 +37,7 @@
 //         /* will cause an exception to be thrown.                     */
 //         cmdline.optend();
 //
-//         /* Process all remaining arguments */ 
+//         /* Process all remaining arguments */
 //         while (cmdline)
 //         {
 //             std::string s;
@@ -54,7 +54,7 @@
 //     /* ..... Do main processing here ..... */
 //
 //     return 0;
-// }    
+// }
 //
 // Short version options must use a single character. It is possible
 // to combine several short options together on the command line,
@@ -77,7 +77,7 @@
 // avoid difficulties with deciding what to do when multiple option values
 // were consumed by the user code only partially.
 //
-// After the "optend()" call, the "argc()" method of the CmdLine 
+// After the "optend()" call, the "argc()" method of the CmdLine
 // class can be used to determine the number of remaining program
 // arguments. If the expected number of arguments is known in advance,
 // the simplest way to get the arguments out is like this (should be
@@ -95,270 +95,221 @@
 #ifndef CMDLINE_HH_
 #define CMDLINE_HH_
 
+#include <cstdio>
+#include <cstring>
 #include <list>
 #include <sstream>
-#include <cstring>
 #include <utility>
-#include <cstdio>
 
 #include "Alignment/Geners/interface/CPP11_shared_ptr.hh"
 
 // Subsequent classes will throw exceptions of the following class
-class CmdLineError
-{
+class CmdLineError {
 public:
-    inline CmdLineError(const char* msg = 0)
-        : os_(new std::ostringstream()) {if (msg) *os_ << msg;}
+  inline CmdLineError(const char *msg = 0) : os_(new std::ostringstream()) {
+    if (msg)
+      *os_ << msg;
+  }
 
-    template<typename T>
-    inline CmdLineError& operator<<(const T& obj)
-    {
-        *os_ << obj;
-        return *this;
-    }
+  template <typename T>
+  inline CmdLineError &operator<<(const T &obj) {
+    *os_ << obj;
+    return *this;
+  }
 
-    inline std::string str() const {return os_->str();}
+  inline std::string str() const { return os_->str(); }
 
 private:
-    CPP11_shared_ptr<std::ostringstream> os_;
+  CPP11_shared_ptr<std::ostringstream> os_;
 };
 
-template<typename T>
-inline void OneShotExtract(std::istringstream& is, T& obj)
-{is >> obj;}
+template <typename T>
+inline void OneShotExtract(std::istringstream &is, T &obj) {
+  is >> obj;
+}
 
-template<>
-inline void OneShotExtract<std::string>(std::istringstream& is,
-                                        std::string& obj)
-{obj = is.str(); is.seekg(0, std::ios_base::end);}
+template <>
+inline void OneShotExtract<std::string>(std::istringstream &is, std::string &obj) {
+  obj = is.str();
+  is.seekg(0, std::ios_base::end);
+}
 
-class OneShotIStream
-{
+class OneShotIStream {
 public:
-    inline OneShotIStream() : valid_(false), readout_(false) {}
+  inline OneShotIStream() : valid_(false), readout_(false) {}
 
-    inline OneShotIStream(const std::string& s)
-        : str_(s), valid_(true), readout_(false) {}
+  inline OneShotIStream(const std::string &s) : str_(s), valid_(true), readout_(false) {}
 
-    inline operator void*() const
-    {
-        return valid_ && !readout_ ? (void*)this : (void*)0;
-    }
+  inline operator void *() const { return valid_ && !readout_ ? (void *)this : (void *)0; }
 
-    template<typename T>
-    inline bool operator>>(T& obj)
-    {
-        if (readout_)
-            throw CmdLineError()
-                << "can't reuse command line argument \"" << str_ << '"';
-        readout_ = true;
-        if (valid_)
-        {
-            std::istringstream is(str_);
-            OneShotExtract(is, obj);
-            if (is.bad() || is.fail())
-                throw CmdLineError()
-                    << "failed to parse command line argument \""
-                    << str_ << '"';
-            if (is.peek() != EOF)
-                throw CmdLineError()
-                    << "extra characters in command line argument \""
-                    << str_ << '"';
-        }
-        return valid_;
+  template <typename T>
+  inline bool operator>>(T &obj) {
+    if (readout_)
+      throw CmdLineError() << "can't reuse command line argument \"" << str_ << '"';
+    readout_ = true;
+    if (valid_) {
+      std::istringstream is(str_);
+      OneShotExtract(is, obj);
+      if (is.bad() || is.fail())
+        throw CmdLineError() << "failed to parse command line argument \"" << str_ << '"';
+      if (is.peek() != EOF)
+        throw CmdLineError() << "extra characters in command line argument \"" << str_ << '"';
     }
+    return valid_;
+  }
 
-    inline bool isValid() const {return valid_;}
+  inline bool isValid() const { return valid_; }
 
 private:
-    std::string str_;
-    bool valid_;
-    bool readout_;
+  std::string str_;
+  bool valid_;
+  bool readout_;
 };
 
-class CmdLine
-{
-    // Argument codes (second member of the pair):
-    //   0 -- possible option value (or program argument, not yet known which)
-    //   1 -- short option switch
-    //   2 -- long option switch
-    //   3 -- program argument
-    typedef std::pair<std::string,int> Pair;
-    typedef std::list<Pair> Optlist;
+class CmdLine {
+  // Argument codes (second member of the pair):
+  //   0 -- possible option value (or program argument, not yet known which)
+  //   1 -- short option switch
+  //   2 -- long option switch
+  //   3 -- program argument
+  typedef std::pair<std::string, int> Pair;
+  typedef std::list<Pair> Optlist;
 
-    inline Optlist::iterator find(const char* shortOpt, const char* longOpt)
-    {
-        Optlist::iterator iend = args_.end();
-        for (Optlist::iterator it = args_.begin(); it != iend; ++it)
-        {
-            if (shortOpt && it->second == 1 && it->first == shortOpt)
-                return it;
-            if (longOpt && it->second == 2 && it->first == longOpt)
-                return it;
-        }
-        return iend;
+  inline Optlist::iterator find(const char *shortOpt, const char *longOpt) {
+    Optlist::iterator iend = args_.end();
+    for (Optlist::iterator it = args_.begin(); it != iend; ++it) {
+      if (shortOpt && it->second == 1 && it->first == shortOpt)
+        return it;
+      if (longOpt && it->second == 2 && it->first == longOpt)
+        return it;
     }
+    return iend;
+  }
 
 public:
-    inline CmdLine(const unsigned argc, const char* const argv[])
-        : nprogargs_(0)
-    {
-        // Parse the program name
-        const char *progname = std::strrchr(argv[0], '/');
-        if (progname)
-            ++progname;
-        else
-            progname = argv[0];
+  inline CmdLine(const unsigned argc, const char *const argv[]) : nprogargs_(0) {
+    // Parse the program name
+    const char *progname = std::strrchr(argv[0], '/');
+    if (progname)
+      ++progname;
+    else
+      progname = argv[0];
 
-        // Take into account program name mangling by GNU autotools
-        if (strncmp(progname, "lt-", 3) == 0)
-            progname += 3;
-        progname_ = progname;
+    // Take into account program name mangling by GNU autotools
+    if (strncmp(progname, "lt-", 3) == 0)
+      progname += 3;
+    progname_ = progname;
 
-        // Make a list of arguments noting on the way if this is
-        // a short option, long option, or possible option argument
-        bool previousIsOpt = false;
-        bool nextIsArg = false;
-        for (unsigned i=1; i<argc; ++i)
-        {
-            if (nextIsArg)
-            {
-                args_.push_back(Pair(argv[i], previousIsOpt ? 0 : 3));
-                previousIsOpt = false;
-                ++nprogargs_;
-                nextIsArg = false;
-            }
-            else if (strcmp(argv[i], "-") == 0)
-                nextIsArg = true;
-            else if (strcmp(argv[i], "--") == 0)
-            {
-                // End of options
-                for (unsigned k=i+1; k<argc; ++k)
-                {
-                    args_.push_back(Pair(argv[k], 3));
-                    ++nprogargs_;
-                }
-                return;
-            }
-            else if (strncmp(argv[i], "--", 2) == 0)
-            {
-                args_.push_back(Pair(argv[i], 2));
-                previousIsOpt = true;
-            }
-            else if (argv[i][0] == '-')
-            {
-                const unsigned len = strlen(argv[i]);
-                for (unsigned k=1; k<len; ++k)
-                {
-                    std::string dummy("-");
-                    dummy += argv[i][k];
-                    args_.push_back(Pair(dummy, 1));
-                    previousIsOpt = true;
-                }
-            }
-            else
-            {
-                args_.push_back(Pair(argv[i], previousIsOpt ? 0 : 3));
-                previousIsOpt = false;
-                ++nprogargs_;
-            }
+    // Make a list of arguments noting on the way if this is
+    // a short option, long option, or possible option argument
+    bool previousIsOpt = false;
+    bool nextIsArg = false;
+    for (unsigned i = 1; i < argc; ++i) {
+      if (nextIsArg) {
+        args_.push_back(Pair(argv[i], previousIsOpt ? 0 : 3));
+        previousIsOpt = false;
+        ++nprogargs_;
+        nextIsArg = false;
+      } else if (strcmp(argv[i], "-") == 0)
+        nextIsArg = true;
+      else if (strcmp(argv[i], "--") == 0) {
+        // End of options
+        for (unsigned k = i + 1; k < argc; ++k) {
+          args_.push_back(Pair(argv[k], 3));
+          ++nprogargs_;
         }
+        return;
+      } else if (strncmp(argv[i], "--", 2) == 0) {
+        args_.push_back(Pair(argv[i], 2));
+        previousIsOpt = true;
+      } else if (argv[i][0] == '-') {
+        const unsigned len = strlen(argv[i]);
+        for (unsigned k = 1; k < len; ++k) {
+          std::string dummy("-");
+          dummy += argv[i][k];
+          args_.push_back(Pair(dummy, 1));
+          previousIsOpt = true;
+        }
+      } else {
+        args_.push_back(Pair(argv[i], previousIsOpt ? 0 : 3));
+        previousIsOpt = false;
+        ++nprogargs_;
+      }
     }
+  }
 
-    inline const char* progname() const {return progname_.c_str();}
+  inline const char *progname() const { return progname_.c_str(); }
 
-    inline bool has(const char* shortOpt, const char* longOpt=0)
-    {
-        bool found = false;
-        for (Optlist::iterator it = find(shortOpt, longOpt);
-             it != args_.end(); it = find(shortOpt, longOpt))
-        {
-            found = true;
-            Optlist::iterator it0(it);
-            if (++it != args_.end())
-                if (it->second == 0)
-                    it->second = 3;
-            args_.erase(it0);
-        }
-        return found;
+  inline bool has(const char *shortOpt, const char *longOpt = 0) {
+    bool found = false;
+    for (Optlist::iterator it = find(shortOpt, longOpt); it != args_.end(); it = find(shortOpt, longOpt)) {
+      found = true;
+      Optlist::iterator it0(it);
+      if (++it != args_.end())
+        if (it->second == 0)
+          it->second = 3;
+      args_.erase(it0);
     }
+    return found;
+  }
 
-    inline OneShotIStream option(const char* shortOpt, const char* longOpt=0)
-    {
-        OneShotIStream result;
-        for (Optlist::iterator it = find(shortOpt, longOpt);
-             it != args_.end(); it = find(shortOpt, longOpt))
-        {
-            Optlist::iterator it0(it);
-            if (++it != args_.end())
-                if (it->second == 0)
-                {
-                    result = OneShotIStream(it->first);
-                    args_.erase(it0, ++it);
-                    --nprogargs_;
-                    continue;
-                }
-            throw CmdLineError()
-                << "missing command line argument for option \""
-                << it0->first << '"';
+  inline OneShotIStream option(const char *shortOpt, const char *longOpt = 0) {
+    OneShotIStream result;
+    for (Optlist::iterator it = find(shortOpt, longOpt); it != args_.end(); it = find(shortOpt, longOpt)) {
+      Optlist::iterator it0(it);
+      if (++it != args_.end())
+        if (it->second == 0) {
+          result = OneShotIStream(it->first);
+          args_.erase(it0, ++it);
+          --nprogargs_;
+          continue;
         }
-        return result;
+      throw CmdLineError() << "missing command line argument for option \"" << it0->first << '"';
     }
+    return result;
+  }
 
-    inline OneShotIStream require(const char* shortOpt, const char* longOpt=0)
-    {
-        const OneShotIStream& is(option(shortOpt, longOpt));
-        if (!is.isValid())
-        {
-            const char empty[] = "";
-            const char* s = shortOpt ? shortOpt : (longOpt ? longOpt : empty);
-            throw CmdLineError()
-                << "required command line option \"" << s << "\" is missing";
-        }
-        return is;
+  inline OneShotIStream require(const char *shortOpt, const char *longOpt = 0) {
+    const OneShotIStream &is(option(shortOpt, longOpt));
+    if (!is.isValid()) {
+      const char empty[] = "";
+      const char *s = shortOpt ? shortOpt : (longOpt ? longOpt : empty);
+      throw CmdLineError() << "required command line option \"" << s << "\" is missing";
     }
+    return is;
+  }
 
-    inline void optend() const
-    {
-        for (Optlist::const_iterator it = args_.begin();
-             it != args_.end(); ++it)
-            if (it->second == 1 || it->second == 2)
-                throw CmdLineError("invalid command line option \"")
-                    << it->first << '"';
-    }
+  inline void optend() const {
+    for (Optlist::const_iterator it = args_.begin(); it != args_.end(); ++it)
+      if (it->second == 1 || it->second == 2)
+        throw CmdLineError("invalid command line option \"") << it->first << '"';
+  }
 
-    inline operator void*() const
-    {
-        return (void*)(static_cast<unsigned long>(nprogargs_));
-    }
+  inline operator void *() const { return (void *)(static_cast<unsigned long>(nprogargs_)); }
 
-    inline unsigned argc() const
-    {
-        return nprogargs_;
-    }
+  inline unsigned argc() const { return nprogargs_; }
 
-    template<typename T>
-    inline CmdLine& operator>>(T& obj)
-    {
-        if (!nprogargs_)
-            throw CmdLineError("no more input available on the command line");
-        Optlist::iterator it = args_.begin();
-        for (; it != args_.end(); ++it)
-            if (it->second == 0 || it->second == 3)
-                break;
-        OneShotIStream is(it->first);
-        args_.erase(it);
-        --nprogargs_;
-        is >> obj;
-        return *this;
-    }
+  template <typename T>
+  inline CmdLine &operator>>(T &obj) {
+    if (!nprogargs_)
+      throw CmdLineError("no more input available on the command line");
+    Optlist::iterator it = args_.begin();
+    for (; it != args_.end(); ++it)
+      if (it->second == 0 || it->second == 3)
+        break;
+    OneShotIStream is(it->first);
+    args_.erase(it);
+    --nprogargs_;
+    is >> obj;
+    return *this;
+  }
 
 private:
-    CmdLine();
+  CmdLine();
 
-    std::string progname_;
-    Optlist args_;
-    unsigned nprogargs_;
+  std::string progname_;
+  Optlist args_;
+  unsigned nprogargs_;
 };
 
-#endif // CMDLINE_HH_
+#endif  // CMDLINE_HH_
diff --git a/Alignment/Geners/test/cdump.cc b/Alignment/Geners/test/cdump.cc
index 60a53f30fa8b0..6dcc2288655de 100644
--- a/Alignment/Geners/test/cdump.cc
+++ b/Alignment/Geners/test/cdump.cc
@@ -1,150 +1,138 @@
 // The following program dumps contents of an object catalog stored
 // in a "geners" binary metafile to the standard output
 
-#include <map>
+#include "Alignment/Geners/interface/IOException.hh"
 #include <fstream>
 #include <iostream>
-#include "Alignment/Geners/interface/IOException.hh"
+#include <map>
 
 #include "Alignment/Geners/interface/CPP11_auto_ptr.hh"
-#include "Alignment/Geners/interface/ContiguousCatalog.hh"
-#include "Alignment/Geners/interface/CatalogIO.hh"
 #include "Alignment/Geners/interface/CStringStream.hh"
+#include "Alignment/Geners/interface/CatalogIO.hh"
+#include "Alignment/Geners/interface/ContiguousCatalog.hh"
 
 #include "CmdLine.hh"
 
 using namespace gs;
 using namespace std;
 
-static void print_usage(const char* progname)
-{
-    cout << "\nUsage: " << progname << " [-a] [-c] [-f] [-i] [-s] filename\n\n"
-         << "This program prints the contents of \"geners\" catalog files to the standard\n"
-         << "output. These files can be usually recognized by their \".gsbmf\" extension\n"
-         << "(Generic Serialization Binary MetaFile). Normally, the program prints class\n"
-         << "names, item names in the archive, and archive categories for all items in\n"
-         << "the catalog. This default behavior can be modified with option switches.\n"
-         << "The meaning of the switches is as follows:\n\n"
-         << " -a   Print catalog annotations, if any.\n\n"
-         << " -c   Print default archive compression mode.\n\n"
-         << " -f   Full dump. Print complete info for each catalog entry.\n\n"
-         << " -i   Include the catalog item ids into the printout.\n\n"
-         << " -s   Print only the summary statistics for item types. If option \"-f\" is given\n"
-         << "      together with \"-s\", the summary will be printed after the full dump.\n"
-         << endl;
+static void print_usage(const char *progname) {
+  cout << "\nUsage: " << progname << " [-a] [-c] [-f] [-i] [-s] filename\n\n"
+       << "This program prints the contents of \"geners\" catalog files to the "
+          "standard\n"
+       << "output. These files can be usually recognized by their \".gsbmf\" "
+          "extension\n"
+       << "(Generic Serialization Binary MetaFile). Normally, the program "
+          "prints class\n"
+       << "names, item names in the archive, and archive categories for all "
+          "items in\n"
+       << "the catalog. This default behavior can be modified with option "
+          "switches.\n"
+       << "The meaning of the switches is as follows:\n\n"
+       << " -a   Print catalog annotations, if any.\n\n"
+       << " -c   Print default archive compression mode.\n\n"
+       << " -f   Full dump. Print complete info for each catalog entry.\n\n"
+       << " -i   Include the catalog item ids into the printout.\n\n"
+       << " -s   Print only the summary statistics for item types. If option "
+          "\"-f\" is given\n"
+       << "      together with \"-s\", the summary will be printed after the "
+          "full dump.\n"
+       << endl;
 }
 
-int main(int argc, char const* argv[])
-{
-    CmdLine cmdline(argc, argv);
-
-    if (argc == 1)
-    {
-        print_usage(cmdline.progname());
-        return 0;
-    }
-
-    std::string inputfile;
-    bool printAnnotations = false;
-    bool printCompressionMode = false;
-    bool fullDump = false;
-    bool printIds = false;
-    bool summaryMode = false;
-
-    try {
-        printAnnotations     = cmdline.has("-a");
-        printCompressionMode = cmdline.has("-c");
-        fullDump             = cmdline.has("-f");
-        printIds             = cmdline.has("-i");
-        summaryMode          = cmdline.has("-s");
-
-        cmdline.optend();
-
-        if (cmdline.argc() != 1)
-            throw CmdLineError("wrong number of command line arguments");
-        cmdline >> inputfile;
-    }
-    catch (CmdLineError& e) {
-        cerr << "Error in " << cmdline.progname() << ": "
-             << e.str() << endl;
-        print_usage(cmdline.progname());
-        return 1;
-    }
+int main(int argc, char const *argv[]) {
+  CmdLine cmdline(argc, argv);
 
-    ifstream in(inputfile.c_str(), ios_base::binary);
-    if (!in.is_open())
-    {
-        cerr << "Error: failed to open file \"" << inputfile << "\"" << endl;
-        return 1;
-    }
-
-    unsigned compressionCode = 0, mergeLevel = 0;
-    std::vector<std::string> annotations;
-    CPP11_auto_ptr<ContiguousCatalog> cat;
-    try 
-    {
-        cat = CPP11_auto_ptr<ContiguousCatalog>(readBinaryCatalog<ContiguousCatalog>(
-                      in, &compressionCode, &mergeLevel, &annotations, true));
-    }
-    catch (std::exception& e)
-    {
-        cerr << "Failed to read catalog from file \""
-             << inputfile << "\". " << e.what() << endl;
-        return 1;
-    }
-
-    if (printCompressionMode)
-    {
-        CStringStream::CompressionMode mode = 
-            static_cast<CStringStream::CompressionMode>(compressionCode);
-        cout << "Default compression mode: "
-             << CStringStream::compressionModeName(mode, false) << endl;
-    }
-    if (printAnnotations)
-    {
-        const unsigned nAnnotations = annotations.size();
-        for (unsigned i=0; i<nAnnotations; ++i)
-        {
-            if (i) cout << '\n';
-            cout << "Annotation " << i << ": " << annotations[i] << endl;
-        }
-        if (!nAnnotations)
-            cout << "This catalog does not have any annotations" << endl;
+  if (argc == 1) {
+    print_usage(cmdline.progname());
+    return 0;
+  }
+
+  std::string inputfile;
+  bool printAnnotations = false;
+  bool printCompressionMode = false;
+  bool fullDump = false;
+  bool printIds = false;
+  bool summaryMode = false;
+
+  try {
+    printAnnotations = cmdline.has("-a");
+    printCompressionMode = cmdline.has("-c");
+    fullDump = cmdline.has("-f");
+    printIds = cmdline.has("-i");
+    summaryMode = cmdline.has("-s");
+
+    cmdline.optend();
+
+    if (cmdline.argc() != 1)
+      throw CmdLineError("wrong number of command line arguments");
+    cmdline >> inputfile;
+  } catch (CmdLineError &e) {
+    cerr << "Error in " << cmdline.progname() << ": " << e.str() << endl;
+    print_usage(cmdline.progname());
+    return 1;
+  }
+
+  ifstream in(inputfile.c_str(), ios_base::binary);
+  if (!in.is_open()) {
+    cerr << "Error: failed to open file \"" << inputfile << "\"" << endl;
+    return 1;
+  }
+
+  unsigned compressionCode = 0, mergeLevel = 0;
+  std::vector<std::string> annotations;
+  CPP11_auto_ptr<ContiguousCatalog> cat;
+  try {
+    cat = CPP11_auto_ptr<ContiguousCatalog>(
+        readBinaryCatalog<ContiguousCatalog>(in, &compressionCode, &mergeLevel, &annotations, true));
+  } catch (std::exception &e) {
+    cerr << "Failed to read catalog from file \"" << inputfile << "\". " << e.what() << endl;
+    return 1;
+  }
+
+  if (printCompressionMode) {
+    CStringStream::CompressionMode mode = static_cast<CStringStream::CompressionMode>(compressionCode);
+    cout << "Default compression mode: " << CStringStream::compressionModeName(mode, false) << endl;
+  }
+  if (printAnnotations) {
+    const unsigned nAnnotations = annotations.size();
+    for (unsigned i = 0; i < nAnnotations; ++i) {
+      if (i)
+        cout << '\n';
+      cout << "Annotation " << i << ": " << annotations[i] << endl;
     }
-
-    std::map<std::string,unsigned> typecount;
-
-    const unsigned long long first = cat->smallestId();
-    const unsigned long long last = cat->largestId();    
-    for (unsigned long long id = first; id <= last; ++id)
-    {
-        if (!cat->itemExists(id)) continue;
-
-        CPP11_shared_ptr<const CatalogEntry> e = cat->retrieveEntry(id);
-        if (fullDump)
-        {
-            if (id != first) cout << '\n';
-            e->humanReadable(cout);
-        }
-        else if (!summaryMode)
-        {
-            if (printIds)
-                cout << e->id() << "  ";
-            cout << e->type().name() << "  " << '"' << e->name() << '"'
-                 << "  " << '"' << e->category() << '"' << endl;
-        }
-        if (summaryMode)
-            typecount[e->type().name()]++;
+    if (!nAnnotations)
+      cout << "This catalog does not have any annotations" << endl;
+  }
+
+  std::map<std::string, unsigned> typecount;
+
+  const unsigned long long first = cat->smallestId();
+  const unsigned long long last = cat->largestId();
+  for (unsigned long long id = first; id <= last; ++id) {
+    if (!cat->itemExists(id))
+      continue;
+
+    CPP11_shared_ptr<const CatalogEntry> e = cat->retrieveEntry(id);
+    if (fullDump) {
+      if (id != first)
+        cout << '\n';
+      e->humanReadable(cout);
+    } else if (!summaryMode) {
+      if (printIds)
+        cout << e->id() << "  ";
+      cout << e->type().name() << "  " << '"' << e->name() << '"' << "  " << '"' << e->category() << '"' << endl;
     }
-
     if (summaryMode)
-    {
-        if (fullDump)
-            cout << '\n';
-        for (std::map<std::string,unsigned>::const_iterator it = typecount.begin();
-             it != typecount.end(); ++it)
-            cout << it->second << ' ' << it->first << endl;
-    }
+      typecount[e->type().name()]++;
+  }
 
-    return 0;
+  if (summaryMode) {
+    if (fullDump)
+      cout << '\n';
+    for (std::map<std::string, unsigned>::const_iterator it = typecount.begin(); it != typecount.end(); ++it)
+      cout << it->second << ' ' << it->first << endl;
+  }
+
+  return 0;
 }
diff --git a/Alignment/Geners/test/cmerge.cc b/Alignment/Geners/test/cmerge.cc
index fef9c1633bd4f..eb4c5dd9b7153 100644
--- a/Alignment/Geners/test/cmerge.cc
+++ b/Alignment/Geners/test/cmerge.cc
@@ -1,13 +1,13 @@
 // The following program merges contents of several object catalogs
 // stored in "geners" binary metafiles
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <vector>
 
 #include "Alignment/Geners/interface/CPP11_auto_ptr.hh"
-#include "Alignment/Geners/interface/ContiguousCatalog.hh"
 #include "Alignment/Geners/interface/CatalogIO.hh"
+#include "Alignment/Geners/interface/ContiguousCatalog.hh"
 #include "Alignment/Geners/interface/uriUtils.hh"
 
 #include "CmdLine.hh"
@@ -15,168 +15,141 @@
 using namespace gs;
 using namespace std;
 
-
-static void print_usage(const char* progname)
-{
-    cout << "\nUsage: " << progname << " -o output_file input_file0 input_file1 ...\n\n"
-         << "This program merges the contents of several object catalogs stored in \"geners\"\n"
-         << "binary metafiles. The output metafile can be used as a single \"geners\" archive\n"
-         << "which includes all items from the merged catalogs.\n"
-         << endl;
+static void print_usage(const char *progname) {
+  cout << "\nUsage: " << progname << " -o output_file input_file0 input_file1 ...\n\n"
+       << "This program merges the contents of several object catalogs stored "
+          "in \"geners\"\n"
+       << "binary metafiles. The output metafile can be used as a single "
+          "\"geners\" archive\n"
+       << "which includes all items from the merged catalogs.\n"
+       << endl;
 }
 
+static const char *update_uri(const char *inputfile, const std::string &originalUri) {
+  static std::string result, old_inputfile, old_URI;
 
-static const char* update_uri(const char* inputfile,
-                              const std::string& originalUri)
-{
-    static std::string result, old_inputfile, old_URI;
-
-    if (old_inputfile != inputfile || old_URI != originalUri)
-    {
-        old_inputfile = inputfile;
-        old_URI = originalUri;
-        result = joinDir1WithName2(inputfile, originalUri.c_str());
-    }
-    return result.c_str();
+  if (old_inputfile != inputfile || old_URI != originalUri) {
+    old_inputfile = inputfile;
+    old_URI = originalUri;
+    result = joinDir1WithName2(inputfile, originalUri.c_str());
+  }
+  return result.c_str();
 }
 
-
-static ItemLocation update_location(const char* inputfile,
-                                    const ItemLocation& original)
-{
-    ItemLocation loc(original);
-    loc.setURI(update_uri(inputfile, original.URI()));
-    return loc;
+static ItemLocation update_location(const char *inputfile, const ItemLocation &original) {
+  ItemLocation loc(original);
+  loc.setURI(update_uri(inputfile, original.URI()));
+  return loc;
 }
 
+int main(int argc, char const *argv[]) {
+  CmdLine cmdline(argc, argv);
 
-int main(int argc, char const* argv[])
-{
-    CmdLine cmdline(argc, argv);
+  if (argc == 1) {
+    print_usage(cmdline.progname());
+    return 0;
+  }
 
-    if (argc == 1)
-    {
-        print_usage(cmdline.progname());
-        return 0;
-    }
+  std::string outputfile;
+  std::vector<std::string> inputfiles;
 
-    std::string outputfile;
-    std::vector<std::string> inputfiles;
+  try {
+    cmdline.require("-o") >> outputfile;
+    cmdline.optend();
 
-    try {
-        cmdline.require("-o") >> outputfile;
-        cmdline.optend();
-        
-        while (cmdline)
-        {
-            std::string s;
-            cmdline >> s;
-            inputfiles.push_back(s);
-        }
-
-        if (inputfiles.empty())
-            throw CmdLineError("must specify at least one input file");
-    }
-    catch (CmdLineError& e) {
-        cerr << "Error in " << cmdline.progname() << ": "
-             << e.str() << endl;
-        print_usage(cmdline.progname());
-        return 1;
+    while (cmdline) {
+      std::string s;
+      cmdline >> s;
+      inputfiles.push_back(s);
     }
 
-    // Before we perform any significant data processing,
-    // make sure that we can open all input files
-    const unsigned nfiles = inputfiles.size();
-    for (unsigned ifile=0; ifile<nfiles; ++ifile)
-    {
-        const std::string& inputfile(inputfiles[ifile]);
-        ifstream in(inputfile.c_str(), ios_base::binary);
-        if (!in.is_open())
-        {
-            cerr << "Error: failed to open file \""
-                 << inputfile << "\"" << endl;
-            return 1;
-        }
+    if (inputfiles.empty())
+      throw CmdLineError("must specify at least one input file");
+  } catch (CmdLineError &e) {
+    cerr << "Error in " << cmdline.progname() << ": " << e.str() << endl;
+    print_usage(cmdline.progname());
+    return 1;
+  }
+
+  // Before we perform any significant data processing,
+  // make sure that we can open all input files
+  const unsigned nfiles = inputfiles.size();
+  for (unsigned ifile = 0; ifile < nfiles; ++ifile) {
+    const std::string &inputfile(inputfiles[ifile]);
+    ifstream in(inputfile.c_str(), ios_base::binary);
+    if (!in.is_open()) {
+      cerr << "Error: failed to open file \"" << inputfile << "\"" << endl;
+      return 1;
     }
-
-    // Variables which summarize the combined catalog
-    unsigned totalMergeLevel = 0, lastCompressionCode = 0;
-    bool compressionCodeMixed = false;
-    std::vector<std::string> allAnnotations;
-    ContiguousCatalog merged;
-
-    // Now, do the real cycle over the input files
-    for (unsigned ifile=0; ifile<nfiles; ++ifile)
-    {
-        const std::string& inputfile(inputfiles[ifile]);
-        const unsigned long long fileOffset = merged.size();
-
-        ifstream in(inputfile.c_str(), ios_base::binary);
-        if (!in.is_open())
-        {
-            cerr << "Error: failed to open file \""
-                 << inputfile << "\"" << endl;
-            return 1;
-        }
-
-        unsigned compressionCode = 0, mergeLevel = 0;
-        std::vector<std::string> annotations;
-        CPP11_auto_ptr<ContiguousCatalog> cat;
-        try
-        {
-            cat = CPP11_auto_ptr<ContiguousCatalog>(readBinaryCatalog<ContiguousCatalog>(
-                          in, &compressionCode, &mergeLevel, &annotations, true));
-        }
-        catch (std::exception& e)
-        {
-            cerr << "Failed to read catalog from file \""
-                 << inputfile << "\". " << e.what() << endl;
-            return 1;
-        }
-
-        // Update compression code info
-        if (ifile)
-            if (compressionCode != lastCompressionCode)
-                compressionCodeMixed = true;
-        lastCompressionCode = compressionCode;
-
-        // Update merge level
-        if (mergeLevel == 0) ++mergeLevel;
-        totalMergeLevel += mergeLevel;
-
-        // Update annotations
-        std::copy(annotations.begin(), annotations.end(),
-                  std::back_inserter(allAnnotations));
-
-        const unsigned long long last = cat->largestId();
-        for (unsigned long long id=cat->smallestId(); id<=last; ++id)
-        {
-            if (!cat->itemExists(id)) continue;
-            CPP11_shared_ptr<const CatalogEntry> e=cat->retrieveEntry(id);
-            const unsigned long long newid = merged.makeEntry(
-                *e, e->compressionCode(), e->itemLength(),
-                update_location(inputfile.c_str(),e->location()),
-                e->offset() + fileOffset);
-            assert(newid);
-        }
+  }
+
+  // Variables which summarize the combined catalog
+  unsigned totalMergeLevel = 0, lastCompressionCode = 0;
+  bool compressionCodeMixed = false;
+  std::vector<std::string> allAnnotations;
+  ContiguousCatalog merged;
+
+  // Now, do the real cycle over the input files
+  for (unsigned ifile = 0; ifile < nfiles; ++ifile) {
+    const std::string &inputfile(inputfiles[ifile]);
+    const unsigned long long fileOffset = merged.size();
+
+    ifstream in(inputfile.c_str(), ios_base::binary);
+    if (!in.is_open()) {
+      cerr << "Error: failed to open file \"" << inputfile << "\"" << endl;
+      return 1;
     }
 
-    ofstream of(outputfile.c_str(), ios_base::binary);
-    if (!of.is_open())
-    {
-        cerr << "Error: failed to open file \""
-             << outputfile << "\"" << endl;
-        return 1;
+    unsigned compressionCode = 0, mergeLevel = 0;
+    std::vector<std::string> annotations;
+    CPP11_auto_ptr<ContiguousCatalog> cat;
+    try {
+      cat = CPP11_auto_ptr<ContiguousCatalog>(
+          readBinaryCatalog<ContiguousCatalog>(in, &compressionCode, &mergeLevel, &annotations, true));
+    } catch (std::exception &e) {
+      cerr << "Failed to read catalog from file \"" << inputfile << "\". " << e.what() << endl;
+      return 1;
     }
-    const unsigned compress = compressionCodeMixed ? 1 : lastCompressionCode;
-    if (!writeBinaryCatalog(of, compress, totalMergeLevel,
-                            allAnnotations, merged))
-    {
-        cerr << "Error: failed to write merged catalog to file \""
-             << outputfile << "\"" << endl;
-        return 1;
+
+    // Update compression code info
+    if (ifile)
+      if (compressionCode != lastCompressionCode)
+        compressionCodeMixed = true;
+    lastCompressionCode = compressionCode;
+
+    // Update merge level
+    if (mergeLevel == 0)
+      ++mergeLevel;
+    totalMergeLevel += mergeLevel;
+
+    // Update annotations
+    std::copy(annotations.begin(), annotations.end(), std::back_inserter(allAnnotations));
+
+    const unsigned long long last = cat->largestId();
+    for (unsigned long long id = cat->smallestId(); id <= last; ++id) {
+      if (!cat->itemExists(id))
+        continue;
+      CPP11_shared_ptr<const CatalogEntry> e = cat->retrieveEntry(id);
+      const unsigned long long newid = merged.makeEntry(*e,
+                                                        e->compressionCode(),
+                                                        e->itemLength(),
+                                                        update_location(inputfile.c_str(), e->location()),
+                                                        e->offset() + fileOffset);
+      assert(newid);
     }
-    of.close();
- 
-    return 0;
+  }
+
+  ofstream of(outputfile.c_str(), ios_base::binary);
+  if (!of.is_open()) {
+    cerr << "Error: failed to open file \"" << outputfile << "\"" << endl;
+    return 1;
+  }
+  const unsigned compress = compressionCodeMixed ? 1 : lastCompressionCode;
+  if (!writeBinaryCatalog(of, compress, totalMergeLevel, allAnnotations, merged)) {
+    cerr << "Error: failed to write merged catalog to file \"" << outputfile << "\"" << endl;
+    return 1;
+  }
+  of.close();
+
+  return 0;
 }
diff --git a/Alignment/Geners/test/crecover.cc b/Alignment/Geners/test/crecover.cc
index ee60d5095e69a..c530c61a0a057 100644
--- a/Alignment/Geners/test/crecover.cc
+++ b/Alignment/Geners/test/crecover.cc
@@ -1,13 +1,13 @@
 // This is the catalog recovery program. For it to be successful, the
 // original archive must have been created using the "cat=s" option.
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 
-#include "Alignment/Geners/interface/CPP11_auto_ptr.hh"
 #include "Alignment/Geners/interface/BinaryArchiveBase.hh"
-#include "Alignment/Geners/interface/ContiguousCatalog.hh"
+#include "Alignment/Geners/interface/CPP11_auto_ptr.hh"
 #include "Alignment/Geners/interface/CatalogIO.hh"
+#include "Alignment/Geners/interface/ContiguousCatalog.hh"
 #include "Alignment/Geners/interface/IOException.hh"
 #include "Alignment/Geners/interface/streamposIO.hh"
 
@@ -16,200 +16,185 @@
 using namespace gs;
 using namespace std;
 
-static void print_usage(const char* progname)
-{
-    cout << "\nUsage: " << progname << " archive_name [annotation]\n\n"
-         << "This program recovers the \"geners\" catalog data from binary archives.\n"
-         << "The recovery is possible only if the archive mode string included the\n"
-         << "\"cat=i\" section which instructs the binary archive to write a duplicate\n"
-         << "copy of item metadata into the data stream. This mode of operation\n"
-         << "is recommended in the development stage of your project, so that the\n"
-         << "catalog can be recovered even after an unexpected program crash.\n\n"
-         << "The first command line argument is the name of the \"geners\" archive\n"
-         << "without extension or data file number. The second argument is optional.\n"
-         << "If provided, it will become the annotation string added to the recovered\n"
-         << "catalog.\n"
-         << endl;
+static void print_usage(const char *progname) {
+  cout << "\nUsage: " << progname << " archive_name [annotation]\n\n"
+       << "This program recovers the \"geners\" catalog data from binary "
+          "archives.\n"
+       << "The recovery is possible only if the archive mode string included "
+          "the\n"
+       << "\"cat=i\" section which instructs the binary archive to write a "
+          "duplicate\n"
+       << "copy of item metadata into the data stream. This mode of operation\n"
+       << "is recommended in the development stage of your project, so that "
+          "the\n"
+       << "catalog can be recovered even after an unexpected program crash.\n\n"
+       << "The first command line argument is the name of the \"geners\" "
+          "archive\n"
+       << "without extension or data file number. The second argument is "
+          "optional.\n"
+       << "If provided, it will become the annotation string added to the "
+          "recovered\n"
+       << "catalog.\n"
+       << endl;
 }
 
 namespace {
-    class CatalogRecovery : public BinaryArchiveBase
-    {
-        inline std::ostream& plainOutputStream() {return f_;}
-
-        inline std::istream& plainInputStream(
-            unsigned long long /* id */, unsigned* /* compressionCode */,
-            unsigned long long* /* length */) {return f_;}
-
-        inline void openFile(const unsigned long count)
-        {
-            std::ostringstream os;
-            os << AbsArchive::name() << '.' << count << ".gsbd";
-            const std::string& fname = os.str();
-            openDataFile(f_, fname.c_str());
-            cout << "Processing file " << fname << "\n";
-            cout.flush();
-        }
+  class CatalogRecovery : public BinaryArchiveBase {
+    inline std::ostream &plainOutputStream() { return f_; }
 
-        inline unsigned long long addToCatalog(
-            const AbsRecord& /* record */, unsigned /* compressCode */,
-            unsigned long long /* itemLength */)
-        {
-            return 0ULL;
-        }
-
-        fstream f_;
-        ContiguousCatalog cat_;
-
-    public:
-        inline CatalogRecovery(const char* name)
-            : BinaryArchiveBase(name, "r") {}
-
-        inline ~CatalogRecovery() {if (f_.is_open()) f_.close();}
-
-        inline std::string catalogFileName() const
-        {
-            return AbsArchive::name() + ".gsbmf";
-        }
+    inline std::istream &plainInputStream(unsigned long long /* id */,
+                                          unsigned * /* compressionCode */,
+                                          unsigned long long * /* length */) {
+      return f_;
+    }
 
-        inline unsigned long long processFile(const unsigned long fileNumber)
-        {
-            openFile(fileNumber);
-            if (!injectMetadata())
-                throw IOInvalidData("Item metadata was not written into the data stream. "
-                                    "Catalog can not be recovered.");
-            assert(catalogEntryClassId());
-            assert(itemLocationClassId());
-
-            const std::streampos zeropos(0);
-            unsigned long long count = 0;
-            for (f_.peek(); !f_.eof(); f_.peek())
-            {
-                unsigned long long id = 0;
-                std::streampos jump(0);
-                read_pod(f_, &jump);
-                if (f_.fail() || jump == zeropos) return count;
-                f_.seekp(jump);
-                if (f_.fail()) return count;
-                const CatalogEntry* entry = CatalogEntry::read(
-                    *catalogEntryClassId(), *itemLocationClassId(), f_);
-                if (entry)
-                {
-                    id = cat_.makeEntry(*entry, entry->compressionCode(),
-                                        entry->itemLength(), entry->location(),
-                                        entry->offset());
-                    delete entry;
-                }
-                if (!id) return count;
-                ++count;
-            }
-            return count;
-        }
+    inline void openFile(const unsigned long count) {
+      std::ostringstream os;
+      os << AbsArchive::name() << '.' << count << ".gsbd";
+      const std::string &fname = os.str();
+      openDataFile(f_, fname.c_str());
+      cout << "Processing file " << fname << "\n";
+      cout.flush();
+    }
 
-        inline void writeCatalog(const std::vector<std::string>& annotations)
-        {
-            const std::string& catFile = catalogFileName();
-            ofstream cats(catFile.c_str());
-            if (!cats)
-            {
-                std::ostringstream os;
-                os << "In CatalogRecovery::writeCatalog: "
-                   << "failed to open catalog data file \""
-                   << catFile << '"';
-                throw IOOpeningFailure(os.str());
-            }
-
-            const unsigned compress = static_cast<unsigned>(compressionMode());
-            if (!writeBinaryCatalog(cats, compress, 1, annotations, cat_))
-            {
-                std::ostringstream os;
-                os << "In CatalogRecovery::writeCatalog: "
-                   << "failed to write catalog data to file "
-                   << catFile;
-                throw IOWriteFailure(os.str());
-            }
-        }
+    inline unsigned long long addToCatalog(const AbsRecord & /* record */,
+                                           unsigned /* compressCode */,
+                                           unsigned long long /* itemLength */) {
+      return 0ULL;
+    }
 
-        inline void flush() {}
-    };
-}
+    fstream f_;
+    ContiguousCatalog cat_;
 
-int main(int argc, char const* argv[])
-{
-    CmdLine cmdline(argc, argv);
+  public:
+    inline CatalogRecovery(const char *name) : BinaryArchiveBase(name, "r") {}
 
-    if (argc == 1)
-    {
-        print_usage(cmdline.progname());
-        return 0;
+    inline ~CatalogRecovery() {
+      if (f_.is_open())
+        f_.close();
     }
 
-    std::string archiveName;
-    std::vector<std::string> annotations;
-    try {
-        cmdline.optend();
-
-        const unsigned cmdargc = cmdline.argc();
-        if (cmdargc != 1 && cmdargc != 2)
-            throw CmdLineError("wrong number of command line arguments");
-        cmdline >> archiveName;
-        if (cmdargc > 1)
-        {
-            annotations.resize(1);
-            cmdline >> annotations[0];
+    inline std::string catalogFileName() const { return AbsArchive::name() + ".gsbmf"; }
+
+    inline unsigned long long processFile(const unsigned long fileNumber) {
+      openFile(fileNumber);
+      if (!injectMetadata())
+        throw IOInvalidData(
+            "Item metadata was not written into the data stream. "
+            "Catalog can not be recovered.");
+      assert(catalogEntryClassId());
+      assert(itemLocationClassId());
+
+      const std::streampos zeropos(0);
+      unsigned long long count = 0;
+      for (f_.peek(); !f_.eof(); f_.peek()) {
+        unsigned long long id = 0;
+        std::streampos jump(0);
+        read_pod(f_, &jump);
+        if (f_.fail() || jump == zeropos)
+          return count;
+        f_.seekp(jump);
+        if (f_.fail())
+          return count;
+        const CatalogEntry *entry = CatalogEntry::read(*catalogEntryClassId(), *itemLocationClassId(), f_);
+        if (entry) {
+          id =
+              cat_.makeEntry(*entry, entry->compressionCode(), entry->itemLength(), entry->location(), entry->offset());
+          delete entry;
         }
+        if (!id)
+          return count;
+        ++count;
+      }
+      return count;
     }
-    catch (CmdLineError& e) {
-        cerr << "Error in " << cmdline.progname() << ": "
-             << e.str() << endl;
-        print_usage(cmdline.progname());
-        return 1;
+
+    inline void writeCatalog(const std::vector<std::string> &annotations) {
+      const std::string &catFile = catalogFileName();
+      ofstream cats(catFile.c_str());
+      if (!cats) {
+        std::ostringstream os;
+        os << "In CatalogRecovery::writeCatalog: "
+           << "failed to open catalog data file \"" << catFile << '"';
+        throw IOOpeningFailure(os.str());
+      }
+
+      const unsigned compress = static_cast<unsigned>(compressionMode());
+      if (!writeBinaryCatalog(cats, compress, 1, annotations, cat_)) {
+        std::ostringstream os;
+        os << "In CatalogRecovery::writeCatalog: "
+           << "failed to write catalog data to file " << catFile;
+        throw IOWriteFailure(os.str());
+      }
     }
 
-    CatalogRecovery recovery(archiveName.c_str());
+    inline void flush() {}
+  };
+}  // namespace
 
-    // Check if the catalog file already exists. Do not overwrite.
-    const std::string& catFile = recovery.catalogFileName();
-    {
-        ifstream cats(catFile.c_str());
-        if (cats)
-        {
-            cout << "Catalog file \"" << catFile << "\" already exists" << endl;
-            return 1;
-        }
-    }
+int main(int argc, char const *argv[]) {
+  CmdLine cmdline(argc, argv);
 
-    unsigned long long itemCount = 0;
-    unsigned long fileCount = 0;
-    try {
-        for (; ; ++fileCount)
-            itemCount += recovery.processFile(fileCount);
-    }
-    catch (IOOpeningFailure& e) {
-        if (!fileCount)
-        {
-            cout << "Archive \"" << archiveName << "\" could not be open. "
-                 << e.what() << endl;
-            return 1;
-        }
+  if (argc == 1) {
+    print_usage(cmdline.progname());
+    return 0;
+  }
+
+  std::string archiveName;
+  std::vector<std::string> annotations;
+  try {
+    cmdline.optend();
+
+    const unsigned cmdargc = cmdline.argc();
+    if (cmdargc != 1 && cmdargc != 2)
+      throw CmdLineError("wrong number of command line arguments");
+    cmdline >> archiveName;
+    if (cmdargc > 1) {
+      annotations.resize(1);
+      cmdline >> annotations[0];
     }
-    catch (exception& e) {
-        cout << "Error in data processing cycle. "
-             << e.what() << endl;
-        return 1;
+  } catch (CmdLineError &e) {
+    cerr << "Error in " << cmdline.progname() << ": " << e.str() << endl;
+    print_usage(cmdline.progname());
+    return 1;
+  }
+
+  CatalogRecovery recovery(archiveName.c_str());
+
+  // Check if the catalog file already exists. Do not overwrite.
+  const std::string &catFile = recovery.catalogFileName();
+  {
+    ifstream cats(catFile.c_str());
+    if (cats) {
+      cout << "Catalog file \"" << catFile << "\" already exists" << endl;
+      return 1;
     }
-
-    try {
-        recovery.writeCatalog(annotations);
+  }
+
+  unsigned long long itemCount = 0;
+  unsigned long fileCount = 0;
+  try {
+    for (;; ++fileCount)
+      itemCount += recovery.processFile(fileCount);
+  } catch (IOOpeningFailure &e) {
+    if (!fileCount) {
+      cout << "Archive \"" << archiveName << "\" could not be open. " << e.what() << endl;
+      return 1;
     }
-    catch (exception& e) {
-        cout << e.what() << endl;
-        return 1;
-    }
-
-    cout << "Wrote catalog file \"" << catFile << "\"\n"
-         << "The catalog contains metadata for " << itemCount
-         << " items found in " << fileCount << " data file"
-         << (fileCount == 1UL ? "" : "s") << endl;
-    return 0;
+  } catch (exception &e) {
+    cout << "Error in data processing cycle. " << e.what() << endl;
+    return 1;
+  }
+
+  try {
+    recovery.writeCatalog(annotations);
+  } catch (exception &e) {
+    cout << e.what() << endl;
+    return 1;
+  }
+
+  cout << "Wrote catalog file \"" << catFile << "\"\n"
+       << "The catalog contains metadata for " << itemCount << " items found in " << fileCount << " data file"
+       << (fileCount == 1UL ? "" : "s") << endl;
+  return 0;
 }
diff --git a/Alignment/Geners/test/gssa_dump.cc b/Alignment/Geners/test/gssa_dump.cc
index c5b3dd18af326..23cb9541301fe 100644
--- a/Alignment/Geners/test/gssa_dump.cc
+++ b/Alignment/Geners/test/gssa_dump.cc
@@ -1,6 +1,6 @@
-#include <map>
-#include <cstring>
 #include "Alignment/Geners/interface/IOException.hh"
+#include <cstring>
+#include <map>
 
 #include "CmdLine.hh"
 
@@ -9,95 +9,90 @@
 using namespace gs;
 using namespace std;
 
-static void print_usage(const char* progname)
-{
-    cout << "\nUsage: " << progname << " [-f] [-s] filename\n\n"
-         << "This program prints the contents of \"geners\" string archives to the standard\n"
-         << "output. Files which contain string archive can be usually recognised by their\n"
-         << "extensions \".gssa\" (Generic Serialization String Archive) and \".gssaz\"\n"
-         << "(string archive with compression). Normally, the program prints item ids,\n"
-         << "class names, item names, and archive categories for all items in the archive.\n"
-         << "This default behavior can be modified with option switches. The meaning of\n"
-         << "the switches is as follows:\n\n"
-         << " -f   Full dump. Print complete info for each catalog entry.\n\n"
-         << " -s   Print only the summary statistics for item types. If option \"-f\" is given\n"
-         << "      together with \"-s\", the summary will be printed after the full dump.\n"
-         << endl;
+static void print_usage(const char *progname) {
+  cout << "\nUsage: " << progname << " [-f] [-s] filename\n\n"
+       << "This program prints the contents of \"geners\" string archives to "
+          "the standard\n"
+       << "output. Files which contain string archive can be usually "
+          "recognised by their\n"
+       << "extensions \".gssa\" (Generic Serialization String Archive) and "
+          "\".gssaz\"\n"
+       << "(string archive with compression). Normally, the program prints "
+          "item ids,\n"
+       << "class names, item names, and archive categories for all items in "
+          "the archive.\n"
+       << "This default behavior can be modified with option switches. The "
+          "meaning of\n"
+       << "the switches is as follows:\n\n"
+       << " -f   Full dump. Print complete info for each catalog entry.\n\n"
+       << " -s   Print only the summary statistics for item types. If option "
+          "\"-f\" is given\n"
+       << "      together with \"-s\", the summary will be printed after the "
+          "full dump.\n"
+       << endl;
 }
 
-int main(int argc, char const* argv[])
-{
-    CmdLine cmdline(argc, argv);
-
-    if (argc == 1)
-    {
-        print_usage(cmdline.progname());
-        return 0;
-    }
-
-    std::string inputfile;
-    bool fullDump = false;
-    bool summaryMode = false;
-
-    try {
-        fullDump    = cmdline.has("-f");
-        summaryMode = cmdline.has("-s");
-
-        cmdline.optend();
-
-        if (cmdline.argc() != 1)
-            throw CmdLineError("wrong number of command line arguments");
-        cmdline >> inputfile;
-    }
-    catch (CmdLineError& e) {
-        cerr << "Error in " << cmdline.progname() << ": "
-             << e.str() << endl;
-        print_usage(cmdline.progname());
-        return 1;
-    }
-
-    StringArchive* ar = 0;
-    try
-    {
-        ar = readCompressedStringArchiveExt(inputfile.c_str());
-    }
-    catch (std::exception& e)
-    {
-        cerr << "Failed to load string archive from file \""
-             << inputfile << "\" (" << e.what() << ')' << endl;
-        return 1;
-    }
-
-    std::map<std::string,unsigned> typecount;
-
-    const unsigned long long first = ar->smallestId();
-    const unsigned long long last = ar->largestId();    
-    for (unsigned long long id = first; id <= last; ++id)
-    {
-        if (!ar->itemExists(id)) continue;
-
-        CPP11_shared_ptr<const CatalogEntry> e = ar->catalogEntry(id);
-        if (fullDump)
-        {
-            if (id != first) cout << '\n';
-            e->humanReadable(cout);
-        }
-        else if (!summaryMode)
-            cout << e->id() << "  "
-                 << e->type().name() << "  " << '"' << e->name() << '"'
-                 << "  " << '"' << e->category() << '"' << endl;
-        if (summaryMode)
-            typecount[e->type().name()]++;
-    }
+int main(int argc, char const *argv[]) {
+  CmdLine cmdline(argc, argv);
 
+  if (argc == 1) {
+    print_usage(cmdline.progname());
+    return 0;
+  }
+
+  std::string inputfile;
+  bool fullDump = false;
+  bool summaryMode = false;
+
+  try {
+    fullDump = cmdline.has("-f");
+    summaryMode = cmdline.has("-s");
+
+    cmdline.optend();
+
+    if (cmdline.argc() != 1)
+      throw CmdLineError("wrong number of command line arguments");
+    cmdline >> inputfile;
+  } catch (CmdLineError &e) {
+    cerr << "Error in " << cmdline.progname() << ": " << e.str() << endl;
+    print_usage(cmdline.progname());
+    return 1;
+  }
+
+  StringArchive *ar = 0;
+  try {
+    ar = readCompressedStringArchiveExt(inputfile.c_str());
+  } catch (std::exception &e) {
+    cerr << "Failed to load string archive from file \"" << inputfile << "\" (" << e.what() << ')' << endl;
+    return 1;
+  }
+
+  std::map<std::string, unsigned> typecount;
+
+  const unsigned long long first = ar->smallestId();
+  const unsigned long long last = ar->largestId();
+  for (unsigned long long id = first; id <= last; ++id) {
+    if (!ar->itemExists(id))
+      continue;
+
+    CPP11_shared_ptr<const CatalogEntry> e = ar->catalogEntry(id);
+    if (fullDump) {
+      if (id != first)
+        cout << '\n';
+      e->humanReadable(cout);
+    } else if (!summaryMode)
+      cout << e->id() << "  " << e->type().name() << "  " << '"' << e->name() << '"' << "  " << '"' << e->category()
+           << '"' << endl;
     if (summaryMode)
-    {
-        if (fullDump)
-            cout << '\n';
-        for (std::map<std::string,unsigned>::const_iterator it = typecount.begin();
-             it != typecount.end(); ++it)
-            cout << it->second << ' ' << it->first << endl;
-    }
+      typecount[e->type().name()]++;
+  }
 
-    return 0;
+  if (summaryMode) {
+    if (fullDump)
+      cout << '\n';
+    for (std::map<std::string, unsigned>::const_iterator it = typecount.begin(); it != typecount.end(); ++it)
+      cout << it->second << ' ' << it->first << endl;
+  }
+
+  return 0;
 }
diff --git a/Alignment/Geners/test/print_items.cc b/Alignment/Geners/test/print_items.cc
index fef9ca10157aa..fe0e11840de8a 100644
--- a/Alignment/Geners/test/print_items.cc
+++ b/Alignment/Geners/test/print_items.cc
@@ -8,154 +8,140 @@
 // statements already present in this program.
 //
 
-#include <set>
-#include <map>
 #include <iostream>
+#include <map>
+#include <set>
 
-#include "Alignment/Geners/interface/ClassId.hh"
 #include "Alignment/Geners/interface/CPP11_auto_ptr.hh"
+#include "Alignment/Geners/interface/ClassId.hh"
 #include "Alignment/Geners/interface/MultiFileArchive.hh"
-#include "Alignment/Geners/interface/complexIO.hh"
 #include "Alignment/Geners/interface/Reference.hh"
+#include "Alignment/Geners/interface/complexIO.hh"
 
 #include "CmdLine.hh"
 
 using namespace gs;
 using namespace std;
 
-static void print_usage(const char* progname)
-{
-    cout << "\nUsage: " << progname << " [-n] [-c] archive_name item_name item_category\n\n"
-         << "Optional switches \"-n\" and \"-c\" turn on regular expression search for item\n"
-         << "name and category, respectively. For each matching item, the program prints\n"
-         << "its class and its text representation, as defined by \"operator <<\".\n"
-         << endl;
+static void print_usage(const char *progname) {
+  cout << "\nUsage: " << progname << " [-n] [-c] archive_name item_name item_category\n\n"
+       << "Optional switches \"-n\" and \"-c\" turn on regular expression "
+          "search for item\n"
+       << "name and category, respectively. For each matching item, the "
+          "program prints\n"
+       << "its class and its text representation, as defined by \"operator "
+          "<<\".\n"
+       << endl;
 }
 
 namespace {
-    typedef unsigned long (*PrinterFunction)(
-        MultiFileArchive&, const SearchSpecifier&, const SearchSpecifier&);
-
-    template <class T>
-    struct Printer
-    {
-        static unsigned long print(MultiFileArchive& ar,
-                                   const SearchSpecifier& name,
-                                   const SearchSpecifier& category)
-        {
-            ClassId id(ClassId::makeId<T>());
-            Reference<T> ref(ar, name, category);
-            const unsigned long nItems = ref.size();
-            for (unsigned long i=0; i<nItems; ++i)
-                cout << id.name() << "  " << *ref.get(i) << endl;
-            return nItems;
-        }
-    };
-}
-
-#define printable_type(sometype) do {                 \
-    ClassId id(ClassId::makeId< sometype >());        \
-    typemap[id.name()] = &Printer< sometype >::print; \
-} while(0);
-
-int main(int argc, char const* argv[])
-{
-    typedef std::map<std::string,PrinterFunction> Typemap;
-
-    CmdLine cmdline(argc, argv);
-    if (argc == 1)
-    {
-        print_usage(cmdline.progname());
-        return 0;
+  typedef unsigned long (*PrinterFunction)(MultiFileArchive &, const SearchSpecifier &, const SearchSpecifier &);
+
+  template <class T>
+  struct Printer {
+    static unsigned long print(MultiFileArchive &ar, const SearchSpecifier &name, const SearchSpecifier &category) {
+      ClassId id(ClassId::makeId<T>());
+      Reference<T> ref(ar, name, category);
+      const unsigned long nItems = ref.size();
+      for (unsigned long i = 0; i < nItems; ++i)
+        cout << id.name() << "  " << *ref.get(i) << endl;
+      return nItems;
     }
+  };
+}  // namespace
 
-    bool useRegexForName = false, useRegexForCategory = false;
-    std::string archiveName, nameIn, categoryIn;
+#define printable_type(sometype)                    \
+  do {                                              \
+    ClassId id(ClassId::makeId<sometype>());        \
+    typemap[id.name()] = &Printer<sometype>::print; \
+  } while (0);
 
-    try {
-        useRegexForName = cmdline.has("-n");
-        useRegexForCategory = cmdline.has("-c");
+int main(int argc, char const *argv[]) {
+  typedef std::map<std::string, PrinterFunction> Typemap;
 
-        cmdline.optend();
-
-        const unsigned cmdargc = cmdline.argc();
-        if (cmdargc != 3)
-            throw CmdLineError("wrong number of command line arguments");
-        cmdline >> archiveName >> nameIn >> categoryIn;
-    }
-    catch (CmdLineError& e) {
-        cerr << "Error in " << cmdline.progname() << ": "
-             << e.str() << endl;
-        print_usage(cmdline.progname());
-        return 1;
-    }
-
-    MultiFileArchive mar(archiveName.c_str(), "r");
-    if (!mar.isOpen())
-    {
-        cerr << mar.error() << endl;
-        return 1;
-    }
-
-    SearchSpecifier name(nameIn, useRegexForName);
-    SearchSpecifier category(categoryIn, useRegexForCategory);
-    std::vector<unsigned long long> found;
-    mar.itemSearch(name, category, &found);
-    const unsigned long nfound = found.size();
-    if (!nfound)
-    {
-        cout << "No items found" << endl;
-        return 0;
-    }
-
-    Typemap typemap;
-
-    // You can add more printable types to the following collection
-    // as long as the type supports "<<" operator with ostream
-    printable_type(bool);
-    printable_type(char);
-    printable_type(unsigned char);
-    printable_type(signed char);
-    printable_type(short);
-    printable_type(unsigned short);
-    printable_type(int);
-    printable_type(long);
-    printable_type(long long);
-    printable_type(unsigned);
-    printable_type(unsigned long);
-    printable_type(unsigned long long);
-    printable_type(float);
-    printable_type(double);
-    printable_type(long double);
-    printable_type(std::complex<float>);
-    printable_type(std::complex<double>);
-    printable_type(std::complex<long double>);
-    printable_type(std::string);
-
-
-    // We need to call the generic printer exactly once for each distinct
-    // type of the items satisfying the search criterion
-    std::set<std::string> typenames;
-    unsigned long nprinted = 0;
-    for (unsigned long i=0; i<nfound; ++i)
-    {
-        CPP11_shared_ptr<const CatalogEntry> entry = 
-            mar.catalogEntry(found[i]);
-        const ClassId& type = entry->type();
-        const std::string& tname = type.name();
-        if (typenames.insert(tname).second)
-        {
-            Typemap::iterator it = typemap.find(tname);
-            if (it != typemap.end())
-                nprinted += (*it->second)(mar, name, category);
-        }
-    }
-    if (nprinted != nfound)
-    {
-        const unsigned long notprinted = nfound - nprinted;
-        cout << "Found " << notprinted << " non-printable item" 
-             << (notprinted == 1UL ? "" : "s") << endl;
+  CmdLine cmdline(argc, argv);
+  if (argc == 1) {
+    print_usage(cmdline.progname());
+    return 0;
+  }
+
+  bool useRegexForName = false, useRegexForCategory = false;
+  std::string archiveName, nameIn, categoryIn;
+
+  try {
+    useRegexForName = cmdline.has("-n");
+    useRegexForCategory = cmdline.has("-c");
+
+    cmdline.optend();
+
+    const unsigned cmdargc = cmdline.argc();
+    if (cmdargc != 3)
+      throw CmdLineError("wrong number of command line arguments");
+    cmdline >> archiveName >> nameIn >> categoryIn;
+  } catch (CmdLineError &e) {
+    cerr << "Error in " << cmdline.progname() << ": " << e.str() << endl;
+    print_usage(cmdline.progname());
+    return 1;
+  }
+
+  MultiFileArchive mar(archiveName.c_str(), "r");
+  if (!mar.isOpen()) {
+    cerr << mar.error() << endl;
+    return 1;
+  }
+
+  SearchSpecifier name(nameIn, useRegexForName);
+  SearchSpecifier category(categoryIn, useRegexForCategory);
+  std::vector<unsigned long long> found;
+  mar.itemSearch(name, category, &found);
+  const unsigned long nfound = found.size();
+  if (!nfound) {
+    cout << "No items found" << endl;
+    return 0;
+  }
+
+  Typemap typemap;
+
+  // You can add more printable types to the following collection
+  // as long as the type supports "<<" operator with ostream
+  printable_type(bool);
+  printable_type(char);
+  printable_type(unsigned char);
+  printable_type(signed char);
+  printable_type(short);
+  printable_type(unsigned short);
+  printable_type(int);
+  printable_type(long);
+  printable_type(long long);
+  printable_type(unsigned);
+  printable_type(unsigned long);
+  printable_type(unsigned long long);
+  printable_type(float);
+  printable_type(double);
+  printable_type(long double);
+  printable_type(std::complex<float>);
+  printable_type(std::complex<double>);
+  printable_type(std::complex<long double>);
+  printable_type(std::string);
+
+  // We need to call the generic printer exactly once for each distinct
+  // type of the items satisfying the search criterion
+  std::set<std::string> typenames;
+  unsigned long nprinted = 0;
+  for (unsigned long i = 0; i < nfound; ++i) {
+    CPP11_shared_ptr<const CatalogEntry> entry = mar.catalogEntry(found[i]);
+    const ClassId &type = entry->type();
+    const std::string &tname = type.name();
+    if (typenames.insert(tname).second) {
+      Typemap::iterator it = typemap.find(tname);
+      if (it != typemap.end())
+        nprinted += (*it->second)(mar, name, category);
     }
+  }
+  if (nprinted != nfound) {
+    const unsigned long notprinted = nfound - nprinted;
+    cout << "Found " << notprinted << " non-printable item" << (notprinted == 1UL ? "" : "s") << endl;
+  }
 
-    return 0;
+  return 0;
 }
diff --git a/Alignment/LaserAlignment/interface/LaserHitPairGenerator.h b/Alignment/LaserAlignment/interface/LaserHitPairGenerator.h
deleted file mode 100644
index 8ba0b0846d627..0000000000000
--- a/Alignment/LaserAlignment/interface/LaserHitPairGenerator.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef LaserAlignment_LaserHitPairGenerator_h
-#define LaserAlignment_LaserHitPairGenerator_h
-
-/** \class LaserHitPairGenerator
- *  generate hit pairs from hits on consecutive discs in the endcaps used by the LaserSeedGenerator
- *
- *  $Date: 2007/05/10 12:00:32 $
- *  $Revision: 1.5 $
- *  \author Maarten Thomas
- */
-
-
-#include "RecoTracker/TkHitPairs/interface/LayerHitMapCache.h"
-
-
-#include "Alignment/LaserAlignment/interface/OrderedLaserHitPairs.h"
-
-#include <vector>
-
-class SeedLayerPairs;
-class LayerWithHits;
-class DetLayer;
-class TrackingRegion;
-class LaserHitPairGeneratorFromLayerPair;
-
-
-class LaserHitPairGenerator
-{
-  typedef std::vector<LaserHitPairGeneratorFromLayerPair *> Container;
-  typedef LayerHitMapCache LayerCacheType;
-
- public:
-   /// constructor
-   LaserHitPairGenerator(unsigned int size=30000) {thePairs.reserve(size); }
-
-	/// constructor
-  LaserHitPairGenerator(SeedLayerPairs & layers, const edm::EventSetup & iSetup);
-	/// default constructor
-  LaserHitPairGenerator(SeedLayerPairs & layers);
-
-  /// destructor
-  virtual ~LaserHitPairGenerator();
-
-  /// add generators based on layers
-  void add(const LayerWithHits * inner, const LayerWithHits * outer, const edm::EventSetup & iSetup);
-
-  virtual void hitPairs(const TrackingRegion & reg, OrderedLaserHitPairs & prs, const edm::EventSetup & iSetup);
-  virtual void hitPairs(const TrackingRegion & reg, OrderedLaserHitPairs & prs, const edm::Event & ev, const edm::EventSetup & iSetup) {}
-  
-  virtual const OrderedLaserHitPairs & run(const TrackingRegion& region, const edm::Event & iEvent, const edm::EventSetup& iSetup);
-  
-  virtual LaserHitPairGenerator * clone() const { return new LaserHitPairGenerator(*this); }
-
- private:
-  OrderedLaserHitPairs thePairs;
-  LayerCacheType theLayerCache;
-  Container theGenerators;
-
-};
-
-#endif
diff --git a/Alignment/LaserAlignment/interface/SeedGeneratorForLaserBeams.h b/Alignment/LaserAlignment/interface/SeedGeneratorForLaserBeams.h
deleted file mode 100644
index 3f2c855a2d057..0000000000000
--- a/Alignment/LaserAlignment/interface/SeedGeneratorForLaserBeams.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#ifndef LaserAlignment_SeedGeneratorForLaserBeams_h
-#define LaserAlignment_SeedGeneratorForLaserBeams_h
-
-/** \class SeedGeneratorForLaserBeams
- *  seed finding algorithm for the LAS
- *
- *  $Date: 2007/12/04 23:51:42 $
- *  $Revision: 1.7 $
- *  \author Maarten Thomas
- */
-
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-
-#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
-#include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2DCollection.h"
-#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h"
-
-#include "RecoTracker/TkTrackingRegions/interface/GlobalTrackingRegion.h"
-#include "Alignment/LaserAlignment/interface/LaserHitPairGenerator.h"
-#include "DataFormats/Common/interface/RangeMap.h" 
-#include "Alignment/LaserAlignment/interface/LaserHitPairGeneratorFromLayerPair.h" 
-
-
-#include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
-#include "TrackingTools/MaterialEffects/interface/PropagatorWithMaterial.h"
-#include "TrackingTools/GeomPropagators/interface/AnalyticalPropagator.h"
-#include "TrackingTools/KalmanUpdators/interface/KFUpdator.h"
-
-class SeedGeneratorForLaserBeams
-{
- public:
-  typedef TrajectoryStateOnSurface TSOS;
-  
-	/// constructor
-  SeedGeneratorForLaserBeams(const edm::ParameterSet& iConfig);
-	/// destructor
-  virtual ~SeedGeneratorForLaserBeams();
-  
-	/// initialize seed finder algorithm
-  void init(const SiStripRecHit2DCollection &collstereo,
-	    const SiStripRecHit2DCollection &collrphi,
-	    const SiStripMatchedRecHit2DCollection &collmatched,
-	    const edm::EventSetup & iSetup);
-
-	/// run the seed finder
-  void run(TrajectorySeedCollection &, const edm::EventSetup & iSetup);
-
- private:
-  /// propagate using PropagatorWithMaterial
-  void propagateWithMaterial(OrderedLaserHitPairs & HitPairs, TrajectorySeedCollection & output);
-  /// propagate using AnalyticalPropagator
-  void propagateAnalytical(OrderedLaserHitPairs & HitPairs, TrajectorySeedCollection & output);
-   
-  edm::ParameterSet conf_;
-  GlobalTrackingRegion region;
-  LaserHitPairGenerator * thePairGenerator;
-  edm::ESHandle<MagneticField> magfield;
-  edm::ESHandle<TrackerGeometry> tracker;
-  
-  KFUpdator * theUpdator;
-  PropagatorWithMaterial * thePropagatorMaterialAl;
-  PropagatorWithMaterial * thePropagatorMaterialOp;
-  AnalyticalPropagator * thePropagatorAnalyticalAl;
-  AnalyticalPropagator * thePropagatorAnalyticalOp;
-  const TransientTrackingRecHitBuilder * TTRHBuilder;
-  std::string builderName;
-  std::string propagatorName;
-};
-#endif
diff --git a/Alignment/LaserAlignmentSimulation/interface/LaserBeamsBarrel.h b/Alignment/LaserAlignmentSimulation/interface/LaserBeamsBarrel.h
index 7acb993b185e2..963b8e527f942 100644
--- a/Alignment/LaserAlignmentSimulation/interface/LaserBeamsBarrel.h
+++ b/Alignment/LaserAlignmentSimulation/interface/LaserBeamsBarrel.h
@@ -18,32 +18,30 @@
 class G4ParticleGun;
 class G4Event;
 
-class LaserBeamsBarrel : public G4VUserPrimaryGeneratorAction
-{
- public:
-	/// default constructor
+class LaserBeamsBarrel : public G4VUserPrimaryGeneratorAction {
+public:
+  /// default constructor
   LaserBeamsBarrel();
-	/// constructor
+  /// constructor
   LaserBeamsBarrel(G4int nPhotonsInGun, G4int nPhotonsInBeam, G4double PhotonEnergy);
-	/// destructor
+  /// destructor
   ~LaserBeamsBarrel() override;
 
- public:
-	/// shoot optical photons into the detector at the beginning of an event
-  void GeneratePrimaries(G4Event* myEvent) override;
-	/// set the polarisation of the photons
+public:
+  /// shoot optical photons into the detector at the beginning of an event
+  void GeneratePrimaries(G4Event *myEvent) override;
+  /// set the polarisation of the photons
   void setOptPhotonPolar(G4double Angle);
 
- private:
+private:
   G4int thenParticleInGun;
   G4int thenParticle;
   G4double thePhotonEnergy;
 
- private:
-  G4ParticleGun * theParticleGun;
+private:
+  G4ParticleGun *theParticleGun;
 
   // Unique random number generator
-  CLHEP::DRand48Engine* theDRand48Engine;
+  CLHEP::DRand48Engine *theDRand48Engine;
 };
 #endif
-
diff --git a/Alignment/LaserAlignmentSimulation/interface/LaserBeamsTEC1.h b/Alignment/LaserAlignmentSimulation/interface/LaserBeamsTEC1.h
index a48ed9871e36d..14a6d897029c4 100644
--- a/Alignment/LaserAlignmentSimulation/interface/LaserBeamsTEC1.h
+++ b/Alignment/LaserAlignmentSimulation/interface/LaserBeamsTEC1.h
@@ -18,32 +18,30 @@
 class G4ParticleGun;
 class G4Event;
 
-class LaserBeamsTEC1 : public G4VUserPrimaryGeneratorAction
-{
- public:
-	/// default constructor
+class LaserBeamsTEC1 : public G4VUserPrimaryGeneratorAction {
+public:
+  /// default constructor
   LaserBeamsTEC1();
-	/// constructor
+  /// constructor
   LaserBeamsTEC1(G4int nPhotonsInGun, G4int nPhotonsInBeam, G4double PhotonEnergy);
-	/// destructor
+  /// destructor
   ~LaserBeamsTEC1() override;
 
- public:
-	/// shoot optical photons into the detector at the beginning of an event
-	void GeneratePrimaries(G4Event* myEvent) override;
-	/// set the polarisation of the photons
+public:
+  /// shoot optical photons into the detector at the beginning of an event
+  void GeneratePrimaries(G4Event *myEvent) override;
+  /// set the polarisation of the photons
   void setOptPhotonPolar(G4double Angle);
 
- private:
+private:
   G4int thenParticleInGun;
   G4int thenParticle;
   G4double thePhotonEnergy;
 
- private:
-  G4ParticleGun * theParticleGun;
+private:
+  G4ParticleGun *theParticleGun;
 
   // Unique random number generator
-  CLHEP::DRand48Engine* theDRand48Engine;
+  CLHEP::DRand48Engine *theDRand48Engine;
 };
 #endif
-
diff --git a/Alignment/LaserAlignmentSimulation/interface/LaserBeamsTEC2.h b/Alignment/LaserAlignmentSimulation/interface/LaserBeamsTEC2.h
index 642c52a4b2cf8..558b9cf83a8c1 100644
--- a/Alignment/LaserAlignmentSimulation/interface/LaserBeamsTEC2.h
+++ b/Alignment/LaserAlignmentSimulation/interface/LaserBeamsTEC2.h
@@ -18,32 +18,30 @@
 class G4ParticleGun;
 class G4Event;
 
-class LaserBeamsTEC2 : public G4VUserPrimaryGeneratorAction
-{
- public:
-	/// default constructor
+class LaserBeamsTEC2 : public G4VUserPrimaryGeneratorAction {
+public:
+  /// default constructor
   LaserBeamsTEC2();
-	/// constructor
+  /// constructor
   LaserBeamsTEC2(G4int nPhotonsInGun, G4int nPhotonsInBeam, G4double PhotonEnergy);
-	/// destructor
+  /// destructor
   ~LaserBeamsTEC2() override;
 
- public:
-	/// shoot optical photons into the detector at the beginning of an event
-  void GeneratePrimaries(G4Event* myEvent) override;
-	/// set the polarisation of the photons
+public:
+  /// shoot optical photons into the detector at the beginning of an event
+  void GeneratePrimaries(G4Event *myEvent) override;
+  /// set the polarisation of the photons
   void setOptPhotonPolar(G4double Angle);
 
- private:
+private:
   G4int thenParticleInGun;
   G4int thenParticle;
   G4double thePhotonEnergy;
 
- private:
-  G4ParticleGun * theParticleGun;
+private:
+  G4ParticleGun *theParticleGun;
 
   // Unique random number generator
-  CLHEP::DRand48Engine* theDRand48Engine;
+  CLHEP::DRand48Engine *theDRand48Engine;
 };
 #endif
-
diff --git a/Alignment/LaserAlignmentSimulation/interface/LaserOpticalPhysicsList.h b/Alignment/LaserAlignmentSimulation/interface/LaserOpticalPhysicsList.h
index 0507962107124..9b10f428ee7b0 100644
--- a/Alignment/LaserAlignmentSimulation/interface/LaserOpticalPhysicsList.h
+++ b/Alignment/LaserAlignmentSimulation/interface/LaserOpticalPhysicsList.h
@@ -2,7 +2,8 @@
 #define LaserAlignmentSimulation_LaserOpticalPhysicsList_H
 
 /** \class LaserOpticalPhysicsList
- *  Define the Optical processes for the Simulation of the Laser Alignment System
+ *  Define the Optical processes for the Simulation of the Laser Alignment
+ * System
  *
  *  $Date: 2007/06/11 14:44:28 $
  *  $Revision: 1.3 $
@@ -20,28 +21,27 @@ class G4OpAbsorption;
 class G4OpRayleigh;
 class G4OpBoundaryProcess;
 
-class LaserOpticalPhysicsList : public G4VPhysicsConstructor
-{
- public:
-	/// constructor
-  LaserOpticalPhysicsList(const G4String& name="optical");
-	/// destructor
-   ~LaserOpticalPhysicsList() override;
+class LaserOpticalPhysicsList : public G4VPhysicsConstructor {
+public:
+  /// constructor
+  LaserOpticalPhysicsList(const G4String &name = "optical");
+  /// destructor
+  ~LaserOpticalPhysicsList() override;
 
- public:
-	/// construct Optical Photons
+public:
+  /// construct Optical Photons
   void ConstructParticle() override;
-	/// construct Optical Processes
+  /// construct Optical Processes
   void ConstructProcess() override;
 
- protected:
+protected:
   G4bool wasActivated;
 
-  G4Scintillation* theScintProcess;
-  G4Cerenkov* theCerenkovProcess;
-  G4OpAbsorption* theAbsorptionProcess;
-  G4OpRayleigh* theRayleighScattering;
-  G4OpBoundaryProcess* theBoundaryProcess;
-  G4OpWLS* theWLSProcess;
+  G4Scintillation *theScintProcess;
+  G4Cerenkov *theCerenkovProcess;
+  G4OpAbsorption *theAbsorptionProcess;
+  G4OpRayleigh *theRayleighScattering;
+  G4OpBoundaryProcess *theBoundaryProcess;
+  G4OpWLS *theWLSProcess;
 };
 #endif
diff --git a/Alignment/LaserAlignmentSimulation/interface/LaserPrimaryGeneratorAction.h b/Alignment/LaserAlignmentSimulation/interface/LaserPrimaryGeneratorAction.h
index ccb4f1b895c91..8aaa6a0fbca6c 100644
--- a/Alignment/LaserAlignmentSimulation/interface/LaserPrimaryGeneratorAction.h
+++ b/Alignment/LaserAlignmentSimulation/interface/LaserPrimaryGeneratorAction.h
@@ -9,9 +9,9 @@
  *  \author Maarten Thomas
  */
 
+#include "Alignment/LaserAlignmentSimulation/interface/LaserBeamsBarrel.h"
 #include "Alignment/LaserAlignmentSimulation/interface/LaserBeamsTEC1.h"
 #include "Alignment/LaserAlignmentSimulation/interface/LaserBeamsTEC2.h"
-#include "Alignment/LaserAlignmentSimulation/interface/LaserBeamsBarrel.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -23,28 +23,28 @@
 class G4Event;
 class LaserPrimaryGeneratorMessenger;
 
-class LaserPrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction
-{
- public:
-	/// constructor
-  LaserPrimaryGeneratorAction(edm::ParameterSet const& theConf);
-	/// destructor
+class LaserPrimaryGeneratorAction : public G4VUserPrimaryGeneratorAction {
+public:
+  /// constructor
+  LaserPrimaryGeneratorAction(edm::ParameterSet const &theConf);
+  /// destructor
   ~LaserPrimaryGeneratorAction() override;
 
- public:
-	/// call the corresponding GeneratePrimaries routines for both TEC's and the Barrel
-  void GeneratePrimaries(G4Event* myEvent) override;
-	/// set Id of the optical photons
-  void setGeneratorId(G4PrimaryParticle * aParticle, int ID) const;
+public:
+  /// call the corresponding GeneratePrimaries routines for both TEC's and the
+  /// Barrel
+  void GeneratePrimaries(G4Event *myEvent) override;
+  /// set Id of the optical photons
+  void setGeneratorId(G4PrimaryParticle *aParticle, int ID) const;
 
- private:
+private:
   G4double thePhotonEnergy;
   G4int thenParticleInGun;
   G4int thenParticle;
 
- private:
-  LaserBeamsTEC1 * theLaserBeamsInTEC1;
-  LaserBeamsTEC2 * theLaserBeamsInTEC2;
-  LaserBeamsBarrel * theLaserBeamsInTECTIBTOBTEC;
+private:
+  LaserBeamsTEC1 *theLaserBeamsInTEC1;
+  LaserBeamsTEC2 *theLaserBeamsInTEC2;
+  LaserBeamsBarrel *theLaserBeamsInTECTIBTOBTEC;
 };
 #endif
diff --git a/Alignment/LaserAlignmentSimulation/interface/LaserSteppingAction.h b/Alignment/LaserAlignmentSimulation/interface/LaserSteppingAction.h
index 81022ce43962d..7ba60653ffa8a 100644
--- a/Alignment/LaserAlignmentSimulation/interface/LaserSteppingAction.h
+++ b/Alignment/LaserAlignmentSimulation/interface/LaserSteppingAction.h
@@ -13,17 +13,17 @@
 
 #include "G4SteppingManager.hh"
 
-class LaserSteppingAction : public G4UserSteppingAction
-{
- public:
-	/// constructor
-  LaserSteppingAction(edm::ParameterSet const& theConf);
-	/// destructor
+class LaserSteppingAction : public G4UserSteppingAction {
+public:
+  /// constructor
+  LaserSteppingAction(edm::ParameterSet const &theConf);
+  /// destructor
   ~LaserSteppingAction() override;
-	/// stepping action: set energydeposit when a photon is absorbed in a Si module
-  void UserSteppingAction(const G4Step* myStep) override;
+  /// stepping action: set energydeposit when a photon is absorbed in a Si
+  /// module
+  void UserSteppingAction(const G4Step *myStep) override;
 
- private: 
+private:
   int theDebugLevel;
   double theEnergyLossScalingFactor;
 };
diff --git a/Alignment/LaserAlignmentSimulation/interface/LaserSteppingVerbose.h b/Alignment/LaserAlignmentSimulation/interface/LaserSteppingVerbose.h
index 424c05f2bd1ac..02a767669015c 100644
--- a/Alignment/LaserAlignmentSimulation/interface/LaserSteppingVerbose.h
+++ b/Alignment/LaserAlignmentSimulation/interface/LaserSteppingVerbose.h
@@ -10,16 +10,15 @@
  */
 #include "G4SteppingVerbose.hh"
 
-class LaserSteppingVerbose : public G4SteppingVerbose
-{
+class LaserSteppingVerbose : public G4SteppingVerbose {
 public:
-	/// constructor
+  /// constructor
   LaserSteppingVerbose();
   /// destructor
   ~LaserSteppingVerbose() override;
-	/// step information 
+  /// step information
   void StepInfo() override;
-	/// tracking information
+  /// tracking information
   void TrackingStarted() override;
 };
 #endif
diff --git a/Alignment/LaserAlignmentSimulation/interface/LaserTrackingAction.h b/Alignment/LaserAlignmentSimulation/interface/LaserTrackingAction.h
index 5a81251872dfb..fb51631fe9372 100644
--- a/Alignment/LaserAlignmentSimulation/interface/LaserTrackingAction.h
+++ b/Alignment/LaserAlignmentSimulation/interface/LaserTrackingAction.h
@@ -13,19 +13,18 @@
 
 #include "G4TrackingManager.hh"
 
-class LaserTrackingAction : public G4UserTrackingAction
-{
- public:
-	/// constructor
-  LaserTrackingAction(edm::ParameterSet const& theConf);
-	/// destructor
+class LaserTrackingAction : public G4UserTrackingAction {
+public:
+  /// constructor
+  LaserTrackingAction(edm::ParameterSet const &theConf);
+  /// destructor
   ~LaserTrackingAction() override;
 
-	/// pre tracking action
-  void PreUserTrackingAction(const G4Track * theTrack) override;
-	/// post tracking action
-  void PostUserTrackingAction(const G4Track * theTrack) override;
+  /// pre tracking action
+  void PreUserTrackingAction(const G4Track *theTrack) override;
+  /// post tracking action
+  void PostUserTrackingAction(const G4Track *theTrack) override;
 
- protected:
+protected:
 };
 #endif
diff --git a/Alignment/LaserAlignmentSimulation/interface/MaterialProperties.h b/Alignment/LaserAlignmentSimulation/interface/MaterialProperties.h
index 70687a6929411..58daa981e3577 100644
--- a/Alignment/LaserAlignmentSimulation/interface/MaterialProperties.h
+++ b/Alignment/LaserAlignmentSimulation/interface/MaterialProperties.h
@@ -12,27 +12,26 @@
 #include "G4MaterialPropertiesTable.hh"
 #include "G4SDManager.hh"
 
-class MaterialProperties
-{
- public:
-	/// constructor
+class MaterialProperties {
+public:
+  /// constructor
   MaterialProperties(int DebugLevel, double SiAbsLengthScale);
-	/// destructor
+  /// destructor
   ~MaterialProperties();
 
- private:
-	/// define optical properties of materials in the detector
+private:
+  /// define optical properties of materials in the detector
   void setMaterialProperties();
 
- private:
-  const G4MaterialTable * theMaterialTable;
+private:
+  const G4MaterialTable *theMaterialTable;
 
- private:
+private:
   int theMPDebugLevel;
   double theSiAbsLengthScalingFactor;
-  G4MaterialPropertiesTable * theMPT;
-  G4Material * theTECWafer;
-  G4Material * theTOBWafer;
-  G4Material * theTIBWafer;
+  G4MaterialPropertiesTable *theMPT;
+  G4Material *theTECWafer;
+  G4Material *theTOBWafer;
+  G4Material *theTIBWafer;
 };
 #endif
diff --git a/Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentProducer.cc b/Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentProducer.cc
index 705b43c3b8f6e..a88f581564c74 100644
--- a/Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentProducer.cc
+++ b/Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentProducer.cc
@@ -1,7 +1,8 @@
 /** \file LaserAlignmentProducer.cc
  *  Producer to be used for the Simulation of the Laser Alignment System
- *  an empty MCHepEvent will be generated (needed by OscarProducer). The actual simulation of 
- *  the laser beams is done in the SimWatcher attached to OscarProducer
+ *  an empty MCHepEvent will be generated (needed by OscarProducer). The actual
+ * simulation of the laser beams is done in the SimWatcher attached to
+ * OscarProducer
  *
  *  $Date: 2011/09/16 06:23:27 $
  *  $Revision: 1.6 $
@@ -12,42 +13,36 @@
 
 // user include files
 #include "Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentProducer.h"
-#include "FWCore/Framework/interface/MakerMacros.h" 
+#include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 
 //
 // constructors and destructor
 //
-LaserAlignmentProducer::LaserAlignmentProducer(const edm::ParameterSet&) :
-  EDProducer(),
-  theEvent(nullptr)
-{
-  //register your products
+LaserAlignmentProducer::LaserAlignmentProducer(const edm::ParameterSet &) : EDProducer(), theEvent(nullptr) {
+  // register your products
   produces<edm::HepMCProduct>("unsmeared");
 
-  //now do what ever other initialization is needed
+  // now do what ever other initialization is needed
 }
 
-
-LaserAlignmentProducer::~LaserAlignmentProducer()
-{
+LaserAlignmentProducer::~LaserAlignmentProducer() {
   // no need to cleanup theEvent since it's done in HepMCProduct
 }
 
 // ------------ method called to produce the event  ------------
-void LaserAlignmentProducer::produce(edm::Event& iEvent, const edm::EventSetup&)
-{
+void LaserAlignmentProducer::produce(edm::Event &iEvent, const edm::EventSetup &) {
   // create the event
   theEvent = new HepMC::GenEvent();
 
   // create a primary vertex
-  HepMC::GenVertex * theVtx = new HepMC::GenVertex(HepMC::FourVector(0.,0.,0.));
+  HepMC::GenVertex *theVtx = new HepMC::GenVertex(HepMC::FourVector(0., 0., 0.));
+
+  // add a particle to the vertex; this is needed to avoid crashes in
+  // OscarProducer. Use a electron neutrino, with zero energy and mass
+  HepMC::GenParticle *theParticle = new HepMC::GenParticle(HepMC::FourVector(0., 0., 0., 0.), 12, 1);
 
-  // add a particle to the vertex; this is needed to avoid crashes in OscarProducer. Use a 
-  // electron neutrino, with zero energy and mass
-  HepMC::GenParticle * theParticle = new HepMC::GenParticle(HepMC::FourVector(0.,0.,0.,0.),12,1);
-  
   theVtx->add_particle_out(theParticle);
 
   // add the vertex to the event
@@ -61,11 +56,11 @@ void LaserAlignmentProducer::produce(edm::Event& iEvent, const edm::EventSetup&)
   // create an empty output collection
   auto theOutput = std::make_unique<edm::HepMCProduct>();
   theOutput->addHepMCData(theEvent);
-   
+
   // put the output to the event
   iEvent.put(std::move(theOutput));
 }
 
-//define this as a plug-in
+// define this as a plug-in
 
 DEFINE_FWK_MODULE(LaserAlignmentProducer);
diff --git a/Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentProducer.h b/Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentProducer.h
index a183dccfdf6e7..2e8e5a248a275 100644
--- a/Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentProducer.h
+++ b/Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentProducer.h
@@ -3,8 +3,9 @@
 
 /** \class LaserAlignmentProducer
  *  Producer to be used for the Simulation of the Laser Alignment System
- *  an empty MCHepEvent will be generated (needed by OscarProducer). The actual simulation of 
- *  the laser beams is done in the SimWatcher attached to OscarProducer
+ *  an empty MCHepEvent will be generated (needed by OscarProducer). The actual
+ * simulation of the laser beams is done in the SimWatcher attached to
+ * OscarProducer
  *
  *  $Date: 2007/12/04 23:53:06 $
  *  $Revision: 1.3 $
@@ -24,18 +25,17 @@
 // class decleration
 //
 class LaserAlignmentProducer : public edm::one::EDProducer<> {
- public:
-	/// constructor
-  explicit LaserAlignmentProducer(const edm::ParameterSet&);
-	/// destructor
+public:
+  /// constructor
+  explicit LaserAlignmentProducer(const edm::ParameterSet &);
+  /// destructor
   ~LaserAlignmentProducer() override;
 
-  
- private:
-	/// produce the HepMCProduct
-  void produce(edm::Event&, const edm::EventSetup&) override;
-  
+private:
+  /// produce the HepMCProduct
+  void produce(edm::Event &, const edm::EventSetup &) override;
+
   // the event format itself
-  HepMC::GenEvent* theEvent;
+  HepMC::GenEvent *theEvent;
 };
 #endif
diff --git a/Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentSimulation.cc b/Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentSimulation.cc
index 6b60165a1d5e1..090a3b5569ae4 100644
--- a/Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentSimulation.cc
+++ b/Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentSimulation.cc
@@ -1,5 +1,6 @@
 /** \file LaserAlignmentSimulation.cc
- *  SimWatcher for the simulation of the Laser Alignment System of the CMS Tracker
+ *  SimWatcher for the simulation of the Laser Alignment System of the CMS
+ * Tracker
  *
  *  $Date: 2010/02/25 00:27:58 $
  *  $Revision: 1.6 $
@@ -7,180 +8,176 @@
  */
 
 #include "Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentSimulation.h"
-#include "SimG4Core/Notification/interface/BeginOfRun.h" 
-#include "SimG4Core/Notification/interface/EndOfRun.h" 
-#include "SimG4Core/Notification/interface/BeginOfEvent.h" 
-#include "SimG4Core/Notification/interface/EndOfEvent.h" 
-#include "G4SDManager.hh" 
-#include "G4Step.hh" 
-#include "G4Timer.hh" 
-#include "G4VProcess.hh" 
+#include "G4SDManager.hh"
+#include "G4Step.hh"
+#include "G4Timer.hh"
+#include "G4VProcess.hh"
+#include "SimG4Core/Notification/interface/BeginOfEvent.h"
+#include "SimG4Core/Notification/interface/BeginOfRun.h"
+#include "SimG4Core/Notification/interface/EndOfEvent.h"
+#include "SimG4Core/Notification/interface/EndOfRun.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-
+#include "G4StepPoint.hh"
 #include "SimG4CMS/Tracker/interface/TkAccumulatingSensitiveDetector.h"
-#include "G4StepPoint.hh" 
-
-
-
-LaserAlignmentSimulation::LaserAlignmentSimulation(edm::ParameterSet const& theConf) 
-  : theDebugLevel(theConf.getUntrackedParameter<int>("DebugLevel",0)),
-    theEnergyLossScalingFactor(theConf.getUntrackedParameter<double>("EnergyLossScalingFactor",1.0)),
-    theMPDebug(theConf.getUntrackedParameter<int>("MaterialPropertiesDebugLevel",0)),
-    theSiAbsLengthScale(theConf.getUntrackedParameter<double>("SiAbsorptionLengthScalingFactor",1.0)),
-    theTimer(), 
-    theMaterialProperties(),
-    thePrimaryGenerator(), theSteppingAction(),
-    theBarrelHits(0), theEndcapHits(0),
-		theParameterSet(theConf)
-{
 
+LaserAlignmentSimulation::LaserAlignmentSimulation(edm::ParameterSet const &theConf)
+    : theDebugLevel(theConf.getUntrackedParameter<int>("DebugLevel", 0)),
+      theEnergyLossScalingFactor(theConf.getUntrackedParameter<double>("EnergyLossScalingFactor", 1.0)),
+      theMPDebug(theConf.getUntrackedParameter<int>("MaterialPropertiesDebugLevel", 0)),
+      theSiAbsLengthScale(theConf.getUntrackedParameter<double>("SiAbsorptionLengthScalingFactor", 1.0)),
+      theTimer(),
+      theMaterialProperties(),
+      thePrimaryGenerator(),
+      theSteppingAction(),
+      theBarrelHits(0),
+      theEndcapHits(0),
+      theParameterSet(theConf) {
   // make some noise
-  edm::LogInfo("SimLaserAlignmentSimulation") << " *****     AC1CMS: Configuration from ParameterSet      ***** " 
-				    << "\n  AC1CMS: theDebugLevel               = " << theDebugLevel 
-				    << "\n  AC1CMS: theEnergyLossScalingFactor  = " << theEnergyLossScalingFactor 
-				    << "\n  AC1CMS: theMPDebugLevel             = " << theMPDebug
-				    << "\n  AC1CMS: theSiAbsLengthScalingFactor = " << theSiAbsLengthScale;
+  edm::LogInfo("SimLaserAlignmentSimulation")
+      << " *****     AC1CMS: Configuration from ParameterSet      ***** "
+      << "\n  AC1CMS: theDebugLevel               = " << theDebugLevel
+      << "\n  AC1CMS: theEnergyLossScalingFactor  = " << theEnergyLossScalingFactor
+      << "\n  AC1CMS: theMPDebugLevel             = " << theMPDebug
+      << "\n  AC1CMS: theSiAbsLengthScalingFactor = " << theSiAbsLengthScale;
 
   // declare timer
   theTimer = new G4Timer;
 }
 
-LaserAlignmentSimulation::~LaserAlignmentSimulation() 
-{
-  if ( theMaterialProperties != nullptr )        { delete theMaterialProperties; }
-  if ( theSteppingAction != nullptr )            { delete theSteppingAction; }
-  if ( thePrimaryGenerator != nullptr )          { delete thePrimaryGenerator; }
-  if ( theTimer != nullptr )                     { delete theTimer; }
+LaserAlignmentSimulation::~LaserAlignmentSimulation() {
+  if (theMaterialProperties != nullptr) {
+    delete theMaterialProperties;
+  }
+  if (theSteppingAction != nullptr) {
+    delete theSteppingAction;
+  }
+  if (thePrimaryGenerator != nullptr) {
+    delete thePrimaryGenerator;
+  }
+  if (theTimer != nullptr) {
+    delete theTimer;
+  }
 }
 
-void LaserAlignmentSimulation::update(const BeginOfRun * myRun)
-{
-  LogDebug("SimLaserAlignmentSimulation") << "<LaserAlignmentSimulation::update(const BeginOfRun * myRun)>"
-				<< "\n *****     AC1CMS: Start of Run: " << (*myRun)()->GetRunID() << "     ***** ";
+void LaserAlignmentSimulation::update(const BeginOfRun *myRun) {
+  LogDebug("SimLaserAlignmentSimulation")
+      << "<LaserAlignmentSimulation::update(const BeginOfRun * myRun)>"
+      << "\n *****     AC1CMS: Start of Run: " << (*myRun)()->GetRunID() << "     ***** ";
 
   // start timer
   theTimer->Start();
 
-
-  // the PrimaryGeneratorAction: defines the used particlegun for the Laser events
+  // the PrimaryGeneratorAction: defines the used particlegun for the Laser
+  // events
   thePrimaryGenerator = new LaserPrimaryGeneratorAction(theParameterSet);
 
   // the UserSteppingAction: at the moment this prints only some information
   theSteppingAction = new LaserSteppingAction(theParameterSet);
 
-  // construct your own material properties for setting refractionindex and so on
+  // construct your own material properties for setting refractionindex and so
+  // on
   theMaterialProperties = new MaterialProperties(theMPDebug, theSiAbsLengthScale);
 
   // list the tree of sensitive detectors
-  if (theDebugLevel >= 1)
-    {
-      G4SDManager * theSDManager = G4SDManager::GetSDMpointer();
-      theSDManager->ListTree();
-    }
+  if (theDebugLevel >= 1) {
+    G4SDManager *theSDManager = G4SDManager::GetSDMpointer();
+    theSDManager->ListTree();
+  }
 }
 
-void LaserAlignmentSimulation::update(const BeginOfEvent * myEvent) 
-{
+void LaserAlignmentSimulation::update(const BeginOfEvent *myEvent) {
   LogDebug("SimLaserAlignmentSimulation") << "<LaserAlignmentSimulation::update(const BeginOfEvent * myEvent)>"
-				<< "\n AC1CMS: Event number = " << (*myEvent)()->GetEventID();
+                                          << "\n AC1CMS: Event number = " << (*myEvent)()->GetEventID();
 
   // some statistics for this event
   theBarrelHits = 0;
   theEndcapHits = 0;
 
   // generate the Primaries
-  thePrimaryGenerator->GeneratePrimaries((G4Event*)(*myEvent)());
+  thePrimaryGenerator->GeneratePrimaries((G4Event *)(*myEvent)());
 }
 
-void LaserAlignmentSimulation::update(const BeginOfTrack * myTrack)
-{
-}
+void LaserAlignmentSimulation::update(const BeginOfTrack *myTrack) {}
 
-void LaserAlignmentSimulation::update(const G4Step * myStep) 
-{
+void LaserAlignmentSimulation::update(const G4Step *myStep) {
   LogDebug("SimLaserAlignmentSimulationStepping") << "<LaserAlignmentSimulation::update(const G4Step * myStep)>";
 
-  G4Step * theStep = const_cast<G4Step*>(myStep);
+  G4Step *theStep = const_cast<G4Step *>(myStep);
 
   // do the LaserSteppingAction
   theSteppingAction->UserSteppingAction(theStep);
 
   // Trigger sensitive detector manually since photon is absorbed
-  if ( ( theStep->GetPostStepPoint()->GetProcessDefinedStep()->GetProcessName()== "OpAbsorption" ) )
-    {
-      LogDebug("SimLaserAlignmentSimulationStepping") << "<LaserAlignmentSimulation::update(const G4Step*)>: Photon was absorbed! ";
-      
-      
-      if ( theStep->GetPreStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetSensitiveDetector() )
-	{
-	  LogDebug("SimLaserAlignmentSimulationStepping") << " AC1CMS: Setting the EnergyLoss to " << theStep->GetTotalEnergyDeposit() 
-						<< "\n AC1CMS: The z position is " << theStep->GetPreStepPoint()->GetPosition().z()
-						<< "\n AC1CMS: the Sensitive Detector: " 
-						<< theStep->GetPreStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetSensitiveDetector()->GetName()
-						<< "\n AC1CMS: the Material: " << theStep->GetPreStepPoint()->GetMaterial()->GetName()
-						<< "\n AC1CMS: the Logical Volume: " 
-						<< theStep->GetPostStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetName();
-
-	  if (theStep->GetTotalEnergyDeposit() > 0.0)
-	    {
-	      // process a hit
-	      TkAccumulatingSensitiveDetector * theSD = (TkAccumulatingSensitiveDetector*)
-		(theStep->GetPreStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetSensitiveDetector());
-	      
-	      theSD->ProcessHits(theStep, ((G4TouchableHistory *)(theStep->GetPreStepPoint()->GetTouchable())));
-
-
-	      // some statistics for this event
-	      if ( ( theStep->GetPostStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetName() == "TECModule3RphiActive" ) || 
-		   ( theStep->GetPostStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetName() == "TECModule5RphiActive" ) )
-		{
-		  theEndcapHits++;
-		}
-	      else if ( ( theStep->GetPostStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetName() == "TOBActiveSter0" ) ||
-			( theStep->GetPostStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetName() == "TOBActiveRphi0" ) ||
-			( theStep->GetPostStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetName() == "TIBActiveRphi2" ) )
-		{
-		  theBarrelHits++;
-		}
-	    }
-	}
-      else 
-	{
-	  LogDebug("SimLaserAlignmentSimulationStepping") << " AC1CMS: No SensitiveDetector available for this Step ... No Hit created :-( "
-						<< "\n AC1CMS: The Material was: " << theStep->GetPreStepPoint()->GetMaterial()->GetName(); 
-	}
+  if ((theStep->GetPostStepPoint()->GetProcessDefinedStep()->GetProcessName() == "OpAbsorption")) {
+    LogDebug("SimLaserAlignmentSimulationStepping") << "<LaserAlignmentSimulation::update(const G4Step*)>: Photon was "
+                                                       "absorbed! ";
+
+    if (theStep->GetPreStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetSensitiveDetector()) {
+      LogDebug("SimLaserAlignmentSimulationStepping")
+          << " AC1CMS: Setting the EnergyLoss to " << theStep->GetTotalEnergyDeposit()
+          << "\n AC1CMS: The z position is " << theStep->GetPreStepPoint()->GetPosition().z()
+          << "\n AC1CMS: the Sensitive Detector: "
+          << theStep->GetPreStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetSensitiveDetector()->GetName()
+          << "\n AC1CMS: the Material: " << theStep->GetPreStepPoint()->GetMaterial()->GetName()
+          << "\n AC1CMS: the Logical Volume: "
+          << theStep->GetPostStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetName();
+
+      if (theStep->GetTotalEnergyDeposit() > 0.0) {
+        // process a hit
+        TkAccumulatingSensitiveDetector *theSD =
+            (TkAccumulatingSensitiveDetector
+                 *)(theStep->GetPreStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetSensitiveDetector());
+
+        theSD->ProcessHits(theStep, ((G4TouchableHistory *)(theStep->GetPreStepPoint()->GetTouchable())));
+
+        // some statistics for this event
+        if ((theStep->GetPostStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetName() ==
+             "TECModule3RphiActive") ||
+            (theStep->GetPostStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetName() ==
+             "TECModule5RphiActive")) {
+          theEndcapHits++;
+        } else if ((theStep->GetPostStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetName() ==
+                    "TOBActiveSter0") ||
+                   (theStep->GetPostStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetName() ==
+                    "TOBActiveRphi0") ||
+                   (theStep->GetPostStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetName() ==
+                    "TIBActiveRphi2")) {
+          theBarrelHits++;
+        }
+      }
+    } else {
+      LogDebug("SimLaserAlignmentSimulationStepping")
+          << " AC1CMS: No SensitiveDetector available for this Step ... No Hit "
+             "created :-( "
+          << "\n AC1CMS: The Material was: " << theStep->GetPreStepPoint()->GetMaterial()->GetName();
     }
+  }
 }
 
-void LaserAlignmentSimulation::update(const EndOfTrack * myTrack)
-{
-}
+void LaserAlignmentSimulation::update(const EndOfTrack *myTrack) {}
 
-void LaserAlignmentSimulation::update(const EndOfEvent * myEvent) 
-{
+void LaserAlignmentSimulation::update(const EndOfEvent *myEvent) {
   LogDebug("SimLaserAlignmentSimulation") << "<LaserAlignmentSimulation::update(const EndOfEvent * myEvent)>"
-				<< "\n AC1CMS: End of Event " << (*myEvent)()->GetEventID();
+                                          << "\n AC1CMS: End of Event " << (*myEvent)()->GetEventID();
 
   // some statistics for this event
-  edm::LogInfo("SimLaserAlignmentSimulation") << " *** Number of Hits: " << theBarrelHits << " / " << theEndcapHits
-				    << " (Barrel / Endcaps) *** ";
+  edm::LogInfo("SimLaserAlignmentSimulation")
+      << " *** Number of Hits: " << theBarrelHits << " / " << theEndcapHits << " (Barrel / Endcaps) *** ";
 }
 
-void LaserAlignmentSimulation::update(const EndOfRun * myRun)
-{
+void LaserAlignmentSimulation::update(const EndOfRun *myRun) {
   LogDebug("SimLaserAlignmentSimulation") << "<LaserAlignmentSimulation::update(const EndOfRun * myRun)>";
 
   // stop timer
   theTimer->Stop();
-  edm::LogInfo("SimLaserAlignmentSimulation") << " AC1CMS: Number of Events = " << (*myRun)()->GetNumberOfEventToBeProcessed()
-				    << " " << *theTimer 
-				    << " *****     AC1CMS: End of Run: " << (*myRun)()->GetRunID() << "     ***** ";
+  edm::LogInfo("SimLaserAlignmentSimulation")
+      << " AC1CMS: Number of Events = " << (*myRun)()->GetNumberOfEventToBeProcessed() << " " << *theTimer
+      << " *****     AC1CMS: End of Run: " << (*myRun)()->GetRunID() << "     ***** ";
 }
 
 // register a SimWatcher to get the Observer signals from OscarProducer
 #include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
 
-
-DEFINE_SIMWATCHER (LaserAlignmentSimulation);
+DEFINE_SIMWATCHER(LaserAlignmentSimulation);
diff --git a/Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentSimulation.h b/Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentSimulation.h
index 2a3dfb814a090..139e0bc5057c2 100644
--- a/Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentSimulation.h
+++ b/Alignment/LaserAlignmentSimulation/plugins/LaserAlignmentSimulation.h
@@ -2,7 +2,8 @@
 #define LaserAlignmentSimulation_LaserAlignmentSimulation_H
 
 /** \class LaserAlignmentSimulation
- *  SimWatcher for the simulation of the Laser Alignment System of the CMS Tracker
+ *  SimWatcher for the simulation of the Laser Alignment System of the CMS
+ * Tracker
  *
  *  $Date: 2007/03/20 12:01:00 $
  *  $Revision: 1.3 $
@@ -14,16 +15,15 @@
 #include "SimG4Core/Notification/interface/Observer.h"
 
 // own classes
-#include "Alignment/LaserAlignmentSimulation/interface/MaterialProperties.h"
 #include "Alignment/LaserAlignmentSimulation/interface/LaserPrimaryGeneratorAction.h"
 #include "Alignment/LaserAlignmentSimulation/interface/LaserSteppingAction.h"
+#include "Alignment/LaserAlignmentSimulation/interface/MaterialProperties.h"
 
-#include <map>
 #include <iostream>
+#include <map>
 
 // Geant4 includes
 
-
 class BeginOfRun;
 class EndOfRun;
 class BeginOfEvent;
@@ -40,53 +40,52 @@ class SteppingAction;
 class TrackingAction;
 
 class LaserAlignmentSimulation : public Observer<const BeginOfRun *>,
-  public Observer<const BeginOfEvent *>,
-  public Observer<const G4Step *>,
-  public Observer<const EndOfEvent *>,
-  public Observer<const EndOfRun *>,
-  public Observer<const BeginOfTrack *>,
-  public Observer<const EndOfTrack *>,
-  public SimWatcher
-{
- public:
-	/// constructor
-  explicit LaserAlignmentSimulation(edm::ParameterSet const & theConf);
-	/// destructor
+                                 public Observer<const BeginOfEvent *>,
+                                 public Observer<const G4Step *>,
+                                 public Observer<const EndOfEvent *>,
+                                 public Observer<const EndOfRun *>,
+                                 public Observer<const BeginOfTrack *>,
+                                 public Observer<const EndOfTrack *>,
+                                 public SimWatcher {
+public:
+  /// constructor
+  explicit LaserAlignmentSimulation(edm::ParameterSet const &theConf);
+  /// destructor
   ~LaserAlignmentSimulation() override;
-  
-/*  private: */
-	/// observer for BeginOfRun
-  void update(const BeginOfRun * myRun) override;
-	/// observer for BeginOfEvent
-  void update(const BeginOfEvent * myEvent) override;
-	/// observer for G4Step
-  void update(const G4Step * myStep) override;
-	/// observer for EndOfEvent
-  void update(const EndOfEvent * myEvent) override;
-	/// observer for EndOfRun
-  void update(const EndOfRun * myRun) override;
-	/// observer for BeginOfTrack
-  void update(const BeginOfTrack * myTrack) override;
-	/// observer for EndOfTrack
-  void update(const EndOfTrack * myTrack) override;
-  
- private:
+
+  /*  private: */
+  /// observer for BeginOfRun
+  void update(const BeginOfRun *myRun) override;
+  /// observer for BeginOfEvent
+  void update(const BeginOfEvent *myEvent) override;
+  /// observer for G4Step
+  void update(const G4Step *myStep) override;
+  /// observer for EndOfEvent
+  void update(const EndOfEvent *myEvent) override;
+  /// observer for EndOfRun
+  void update(const EndOfRun *myRun) override;
+  /// observer for BeginOfTrack
+  void update(const BeginOfTrack *myTrack) override;
+  /// observer for EndOfTrack
+  void update(const EndOfTrack *myTrack) override;
+
+private:
   int theDebugLevel;
   double theEnergyLossScalingFactor;
   int theMPDebug;
   double theSiAbsLengthScale;
 
- private:
-  G4Timer * theTimer;
-  MaterialProperties * theMaterialProperties;
-  LaserPrimaryGeneratorAction * thePrimaryGenerator;
-  LaserSteppingAction * theSteppingAction;
+private:
+  G4Timer *theTimer;
+  MaterialProperties *theMaterialProperties;
+  LaserPrimaryGeneratorAction *thePrimaryGenerator;
+  LaserSteppingAction *theSteppingAction;
 
   int theBarrelHits;
   int theEndcapHits;
 
   edm::ParameterSet theParameterSet;
-/*   TrackerG4SimHitNumberingScheme theNumberingScheme; */
+  /*   TrackerG4SimHitNumberingScheme theNumberingScheme; */
 };
 
 #endif
diff --git a/Alignment/LaserAlignmentSimulation/plugins/LaserOpticalPhysics.cc b/Alignment/LaserAlignmentSimulation/plugins/LaserOpticalPhysics.cc
index e8e9a9a9c1a24..1ed20ba4c5fa9 100644
--- a/Alignment/LaserAlignmentSimulation/plugins/LaserOpticalPhysics.cc
+++ b/Alignment/LaserAlignmentSimulation/plugins/LaserOpticalPhysics.cc
@@ -1,35 +1,35 @@
 /** \file LaserOpticalPhysics.cc
- *  Custom Physics to activate optical processes for the simulation of the Laser Alignment System
+ *  Custom Physics to activate optical processes for the simulation of the Laser
+ * Alignment System
  *
  *  $Date: 2010/08/02 13:09:56 $
  *  $Revision: 1.11 $
  *  \author Maarten Thomas
  */
 
-#include "Alignment/LaserAlignmentSimulation/plugins/LaserOpticalPhysics.h"
 #include "Alignment/LaserAlignmentSimulation/interface/LaserOpticalPhysicsList.h"
- 
+#include "Alignment/LaserAlignmentSimulation/plugins/LaserOpticalPhysics.h"
+
 #include "G4HadronPhysicsQGSP_FTFP_BERT.hh"
 
-#include "SimG4Core/Physics/interface/PhysicsListFactory.h" 
+#include "SimG4Core/Physics/interface/PhysicsListFactory.h"
 #include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics.h"
 
+#include "G4DataQuestionaire.hh"
 #include "G4DecayPhysics.hh"
 #include "G4EmExtraPhysics.hh"
+#include "G4HadronElasticPhysics.hh"
+#include "G4HadronicProcessStore.hh"
 #include "G4IonPhysics.hh"
 #include "G4StoppingPhysics.hh"
-#include "G4HadronElasticPhysics.hh" 
-#include "G4HadronicProcessStore.hh"
-#include "G4DataQuestionaire.hh"
 
-LaserOpticalPhysics::LaserOpticalPhysics(const edm::ParameterSet & p) 
-: PhysicsList(p)
-{
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
+LaserOpticalPhysics::LaserOpticalPhysics(const edm::ParameterSet &p) : PhysicsList(p) {
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
   G4DataQuestionaire it(photon);
-  std::cout << "You are using the simulation engine: QGSP together with optical physics" 
-	    << std::endl;
-  
+  std::cout << "You are using the simulation engine: QGSP together with "
+               "optical physics"
+            << std::endl;
+
   // EM Physics
   RegisterPhysics(new CMSEmStandardPhysics(ver));
   // Synchroton Radiation & GN Physics
@@ -38,7 +38,7 @@ LaserOpticalPhysics::LaserOpticalPhysics(const edm::ParameterSet & p)
   RegisterPhysics(new G4DecayPhysics(ver));
   // Hadron Elastic scattering
   G4HadronicProcessStore::Instance()->SetVerbose(ver);
-  RegisterPhysics(new G4HadronElasticPhysics(ver)); 
+  RegisterPhysics(new G4HadronElasticPhysics(ver));
   // Hadron Physics
   RegisterPhysics(new G4HadronPhysicsQGSP_FTFP_BERT(ver));
   // Stopping Physics
@@ -47,9 +47,8 @@ LaserOpticalPhysics::LaserOpticalPhysics(const edm::ParameterSet & p)
   RegisterPhysics(new G4IonPhysics(ver));
   // Optical physics
   RegisterPhysics(new LaserOpticalPhysicsList("optical"));
-
 }
 
 // define the custom physics list
 
-DEFINE_PHYSICSLIST (LaserOpticalPhysics);
+DEFINE_PHYSICSLIST(LaserOpticalPhysics);
diff --git a/Alignment/LaserAlignmentSimulation/plugins/LaserOpticalPhysics.h b/Alignment/LaserAlignmentSimulation/plugins/LaserOpticalPhysics.h
index 72d50051e2123..ad8aa7478adbe 100644
--- a/Alignment/LaserAlignmentSimulation/plugins/LaserOpticalPhysics.h
+++ b/Alignment/LaserAlignmentSimulation/plugins/LaserOpticalPhysics.h
@@ -2,21 +2,20 @@
 #define LaserAlignmentSimulation_LaserOpticalPhysics_H
 
 /** \class LaserOpticalPhysics
- *  Custom physics to activate optical processes for the simulation of the Laser Alignment System
+ *  Custom physics to activate optical processes for the simulation of the Laser
+ * Alignment System
  *
  *  $Date: 2009/12/10 18:10:05 $
  *  $Revision: 1.4 $
  *  \author Maarten Thomas
- */ 
+ */
 
-#include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
- 
-class LaserOpticalPhysics : public PhysicsList
-{
-public:
+#include "SimG4Core/Physics/interface/PhysicsList.h"
 
-  LaserOpticalPhysics(const edm::ParameterSet & p);
+class LaserOpticalPhysics : public PhysicsList {
+public:
+  LaserOpticalPhysics(const edm::ParameterSet &p);
 };
- 
+
 #endif
diff --git a/Alignment/LaserAlignmentSimulation/src/LaserBeamsBarrel.cc b/Alignment/LaserAlignmentSimulation/src/LaserBeamsBarrel.cc
index 23529414012ee..9541791f4441a 100644
--- a/Alignment/LaserAlignmentSimulation/src/LaserBeamsBarrel.cc
+++ b/Alignment/LaserAlignmentSimulation/src/LaserBeamsBarrel.cc
@@ -1,5 +1,5 @@
 /** \file LaserBeamsBarrel.cc
- *  
+ *
  *
  *  $Date: 2010/09/09 18:22:48 $
  *  $Revision: 1.7 $
@@ -13,15 +13,12 @@
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 
 #include "CLHEP/Random/RandGaussQ.h"
-#include "globals.hh"                        // Global Constants and typedefs
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleGun.hh"
 #include "G4SystemOfUnits.hh"
+#include "globals.hh"  // Global Constants and typedefs
 
-LaserBeamsBarrel::LaserBeamsBarrel() :
-  theParticleGun(nullptr),
-  theDRand48Engine(nullptr)
-{
+LaserBeamsBarrel::LaserBeamsBarrel() : theParticleGun(nullptr), theDRand48Engine(nullptr) {
   G4int nPhotonsGun = 1;
   G4int nPhotonsBeam = 1;
   G4double Energy = 1.15 * eV;
@@ -29,12 +26,8 @@ LaserBeamsBarrel::LaserBeamsBarrel() :
   LaserBeamsBarrel(nPhotonsGun, nPhotonsBeam, Energy);
 }
 
-LaserBeamsBarrel::LaserBeamsBarrel(G4int nPhotonsInGun, G4int nPhotonsInBeam, G4double PhotonEnergy) : thenParticleInGun(0),
-												       thenParticle(0),
-												       thePhotonEnergy(0),
-												       theParticleGun(),
-												       theDRand48Engine()
-{
+LaserBeamsBarrel::LaserBeamsBarrel(G4int nPhotonsInGun, G4int nPhotonsInBeam, G4double PhotonEnergy)
+    : thenParticleInGun(0), thenParticle(0), thePhotonEnergy(0), theParticleGun(), theDRand48Engine() {
   /* *********************************************************************** */
   /*  initialize and configure the particle gun                              */
   /* *********************************************************************** */
@@ -45,17 +38,18 @@ LaserBeamsBarrel::LaserBeamsBarrel(G4int nPhotonsInGun, G4int nPhotonsInBeam, G4
   // number of particles in the Laser beam
   thenParticleInGun = nPhotonsInGun;
 
-  // number of particles in one beam. ATTENTION: each beam contains nParticleInGun with the same
-  // startpoint and direction. nParticle gives the number of particles in the beam with a different
-  // startpoint. They are used to simulate the gaussian beamprofile of the Laser Beams.
+  // number of particles in one beam. ATTENTION: each beam contains
+  // nParticleInGun with the same startpoint and direction. nParticle gives the
+  // number of particles in the beam with a different startpoint. They are used
+  // to simulate the gaussian beamprofile of the Laser Beams.
   thenParticle = nPhotonsInBeam;
 
   // create the particle gun
   theParticleGun = new G4ParticleGun(thenParticleInGun);
 
   // default kinematics
-  G4ParticleTable * theParticleTable = G4ParticleTable::GetParticleTable();
-  G4ParticleDefinition * theOpticalPhoton = theParticleTable->FindParticle("opticalphoton");
+  G4ParticleTable *theParticleTable = G4ParticleTable::GetParticleTable();
+  G4ParticleDefinition *theOpticalPhoton = theParticleTable->FindParticle("opticalphoton");
 
   theParticleGun->SetParticleDefinition(theOpticalPhoton);
   theParticleGun->SetParticleTime(0.0 * ns);
@@ -66,18 +60,20 @@ LaserBeamsBarrel::LaserBeamsBarrel(G4int nPhotonsInGun, G4int nPhotonsInBeam, G4
 
   // initialize the random number engine
   theDRand48Engine = new CLHEP::DRand48Engine();
-
 }
 
-LaserBeamsBarrel::~LaserBeamsBarrel()
-{
-  if ( theParticleGun != nullptr ) { delete theParticleGun; }
-  if ( theDRand48Engine != nullptr ) { delete theDRand48Engine; }
+LaserBeamsBarrel::~LaserBeamsBarrel() {
+  if (theParticleGun != nullptr) {
+    delete theParticleGun;
+  }
+  if (theDRand48Engine != nullptr) {
+    delete theDRand48Engine;
+  }
 }
 
-void LaserBeamsBarrel::GeneratePrimaries(G4Event * myEvent)
-{
-  // this function is called at the beginning of an Event in LaserAlignment::upDate(const BeginOfEvent * myEvent)
+void LaserBeamsBarrel::GeneratePrimaries(G4Event *myEvent) {
+  // this function is called at the beginning of an Event in
+  // LaserAlignment::upDate(const BeginOfEvent * myEvent)
 
   // use the random number generator service of the framework
   edm::Service<edm::RandomNumberGenerator> rng;
@@ -90,107 +86,107 @@ void LaserBeamsBarrel::GeneratePrimaries(G4Event * myEvent)
   const G4int nLaserBeams = 8;
 
   // z position of the Laserdiodes (value from design drawings)
-  G4double LaserPositionZ = 1137.0 * mm; 
+  G4double LaserPositionZ = 1137.0 * mm;
 
   // Radius of the Laser ring
   G4double LaserRingRadius = 564.0 * mm;
 
-  // phi positions of the Laserdiodes (from CMS Note 2001/053 or from http://abbaneo.home.cern.ch/abbaneo/cms/layout)
-  G4double LaserPhi[nLaserBeams] = { G4double(7.0/112.0)   * G4double(2.0 * M_PI),
-				     G4double(23.0/112.0)  * G4double(2.0 * M_PI),
-			 	     G4double(33.0/112.0)  * G4double(2.0 * M_PI),
-				     G4double(49.0/112.0)  * G4double(2.0 * M_PI),
-				     G4double(65.0/112.0)  * G4double(2.0 * M_PI),
-				     G4double(77.0/112.0)  * G4double(2.0 * M_PI),
-				     G4double(93.0/112.0)  * G4double(2.0 * M_PI),
-				     G4double(103.0/112.0) * G4double(2.0 * M_PI) };
+  // phi positions of the Laserdiodes (from CMS Note 2001/053 or from
+  // http://abbaneo.home.cern.ch/abbaneo/cms/layout)
+  G4double LaserPhi[nLaserBeams] = {G4double(7.0 / 112.0) * G4double(2.0 * M_PI),
+                                    G4double(23.0 / 112.0) * G4double(2.0 * M_PI),
+                                    G4double(33.0 / 112.0) * G4double(2.0 * M_PI),
+                                    G4double(49.0 / 112.0) * G4double(2.0 * M_PI),
+                                    G4double(65.0 / 112.0) * G4double(2.0 * M_PI),
+                                    G4double(77.0 / 112.0) * G4double(2.0 * M_PI),
+                                    G4double(93.0 / 112.0) * G4double(2.0 * M_PI),
+                                    G4double(103.0 / 112.0) * G4double(2.0 * M_PI)};
 
   // width of the LaserBeams
   G4double LaserBeamSigmaX = 0.5 * mm;
   G4double LaserBeamSigmaY = 0.5 * mm;
 
   // get the definition of the optical photon
-  G4ParticleTable * theParticleTable = G4ParticleTable::GetParticleTable();
-  G4ParticleDefinition * theOpticalPhoton = theParticleTable->FindParticle("opticalphoton");
+  G4ParticleTable *theParticleTable = G4ParticleTable::GetParticleTable();
+  G4ParticleDefinition *theOpticalPhoton = theParticleTable->FindParticle("opticalphoton");
 
   // loop over the LaserBeams
-  for (int theBeam = 0; theBeam < nLaserBeams; theBeam++)
-    {
-      // code for forward and backward beam
-      // calculate x and y position of the current laser diode
-      G4double LaserPositionX = cos(LaserPhi[theBeam]) * LaserRingRadius;
-      G4double LaserPositionY = sin(LaserPhi[theBeam]) * LaserRingRadius;
-
-      // loop over all the particles in one beam
-      for (int theParticle = 0; theParticle < thenParticle; theParticle++)
-	{
-	  // get randomnumbers  and calculate the position
-	  CLHEP::RandGaussQ aGaussObjX( *theDRand48Engine, LaserPositionX, LaserBeamSigmaX );
-	  CLHEP::RandGaussQ aGaussObjY( *theDRand48Engine, LaserPositionY, LaserBeamSigmaY );
-	  
-	  G4double theXPosition = aGaussObjX.fire();
-	  G4double theYPosition = aGaussObjY.fire();
-	  G4double theZPosition = LaserPositionZ;
-
-	  // set the properties of the newly created particle
-	  theParticleGun->SetParticleDefinition(theOpticalPhoton);
-	  theParticleGun->SetParticleTime(0.0 * ns);
-	  theParticleGun->SetParticlePosition(G4ThreeVector(theXPosition, theYPosition, theZPosition));
-	  theParticleGun->SetParticleEnergy(thePhotonEnergy);
-
-	  // loop over both directions of the beam
-	  for (int theDirection = 0; theDirection < 2; theDirection++)
-	    {
-	      // shoot in both beam directions ...
-	      if (theDirection == 0) // shoot in forward direction (+z)
-		{
-		  theParticleGun->SetParticleMomentumDirection(G4ThreeVector(0.0, 0.0, 1.0));
-		  // set the polarization
-		  setOptPhotonPolar(90.0);
-		  // generate the particle
-		  theParticleGun->GeneratePrimaryVertex(myEvent);
-		}
-	      else if (theDirection == 1) // shoot in backward direction (-z)
-		{
-		  theParticleGun->SetParticleMomentumDirection(G4ThreeVector(0.0, 0.0, -1.0));
-		  // set the polarization
-		  setOptPhotonPolar(90.0);
-		  // generate the particle
-		  theParticleGun->GeneratePrimaryVertex(myEvent);
-		}
-	    } // end looop over both beam directions
-	} // end looop over particles in beam
-    } // end loop over beams
+  for (int theBeam = 0; theBeam < nLaserBeams; theBeam++) {
+    // code for forward and backward beam
+    // calculate x and y position of the current laser diode
+    G4double LaserPositionX = cos(LaserPhi[theBeam]) * LaserRingRadius;
+    G4double LaserPositionY = sin(LaserPhi[theBeam]) * LaserRingRadius;
+
+    // loop over all the particles in one beam
+    for (int theParticle = 0; theParticle < thenParticle; theParticle++) {
+      // get randomnumbers  and calculate the position
+      CLHEP::RandGaussQ aGaussObjX(*theDRand48Engine, LaserPositionX, LaserBeamSigmaX);
+      CLHEP::RandGaussQ aGaussObjY(*theDRand48Engine, LaserPositionY, LaserBeamSigmaY);
+
+      G4double theXPosition = aGaussObjX.fire();
+      G4double theYPosition = aGaussObjY.fire();
+      G4double theZPosition = LaserPositionZ;
+
+      // set the properties of the newly created particle
+      theParticleGun->SetParticleDefinition(theOpticalPhoton);
+      theParticleGun->SetParticleTime(0.0 * ns);
+      theParticleGun->SetParticlePosition(G4ThreeVector(theXPosition, theYPosition, theZPosition));
+      theParticleGun->SetParticleEnergy(thePhotonEnergy);
+
+      // loop over both directions of the beam
+      for (int theDirection = 0; theDirection < 2; theDirection++) {
+        // shoot in both beam directions ...
+        if (theDirection == 0)  // shoot in forward direction (+z)
+        {
+          theParticleGun->SetParticleMomentumDirection(G4ThreeVector(0.0, 0.0, 1.0));
+          // set the polarization
+          setOptPhotonPolar(90.0);
+          // generate the particle
+          theParticleGun->GeneratePrimaryVertex(myEvent);
+        } else if (theDirection == 1)  // shoot in backward direction (-z)
+        {
+          theParticleGun->SetParticleMomentumDirection(G4ThreeVector(0.0, 0.0, -1.0));
+          // set the polarization
+          setOptPhotonPolar(90.0);
+          // generate the particle
+          theParticleGun->GeneratePrimaryVertex(myEvent);
+        }
+      }  // end looop over both beam directions
+    }    // end looop over particles in beam
+  }      // end loop over beams
 }
 
-void LaserBeamsBarrel::setOptPhotonPolar(G4double Angle)
-{
+void LaserBeamsBarrel::setOptPhotonPolar(G4double Angle) {
   /* *********************************************************************** */
   /*   to get optical processes working properly, you have to make sure      *
    *   that the photon polarisation is defined.                              */
   /* *********************************************************************** */
 
   // first check if we have an optical photon
-  if ( theParticleGun->GetParticleDefinition()->GetParticleName() != "opticalphoton" )
-    { 
-      edm::LogWarning("SimLaserAlignment:LaserBeamsBarrel") << "<LaserBeamsBarrel::setOptPhotonPolar()>: WARNING! The ParticleGun is not an optical photon";
-      return;
-    }
-
-//   G4cout << "  AC1CMS: The ParticleGun is an " << theParticleGun->GetParticleDefinition()->GetParticleName();
+  if (theParticleGun->GetParticleDefinition()->GetParticleName() != "opticalphoton") {
+    edm::LogWarning("SimLaserAlignment:LaserBeamsBarrel")
+        << "<LaserBeamsBarrel::setOptPhotonPolar()>: WARNING! The ParticleGun "
+           "is not an optical photon";
+    return;
+  }
+
+  //   G4cout << "  AC1CMS: The ParticleGun is an " <<
+  //   theParticleGun->GetParticleDefinition()->GetParticleName();
   G4ThreeVector normal(1.0, 0.0, 0.0);
   G4ThreeVector kphoton = theParticleGun->GetParticleMomentumDirection();
   G4ThreeVector product = normal.cross(kphoton);
   G4double modul2 = product * product;
 
   G4ThreeVector e_perpendicular(0.0, 0.0, 1.0);
-  
-  if ( modul2 > 0.0 ) { e_perpendicular = (1.0 / sqrt(modul2)) * product; }
-  
+
+  if (modul2 > 0.0) {
+    e_perpendicular = (1.0 / sqrt(modul2)) * product;
+  }
+
   G4ThreeVector e_parallel = e_perpendicular.cross(kphoton);
 
   G4ThreeVector polar = cos(Angle) * e_parallel + sin(Angle) * e_perpendicular;
-  
-//   G4cout << ", the polarization = " << polar << G4endl;
+
+  //   G4cout << ", the polarization = " << polar << G4endl;
   theParticleGun->SetParticlePolarization(polar);
 }
diff --git a/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC1.cc b/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC1.cc
index 95723cef7a4f1..00784f0203aee 100644
--- a/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC1.cc
+++ b/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC1.cc
@@ -1,5 +1,5 @@
 /** \file LaserBeamsTEC1.cc
- *  
+ *
  *
  *  $Date: 2010/09/09 18:22:48 $
  *  $Revision: 1.7 $
@@ -12,16 +12,13 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "CLHEP/Random/RandGaussQ.h"
-#include "globals.hh"                        // Global Constants and typedefs
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleGun.hh"
+#include "globals.hh"  // Global Constants and typedefs
 
-LaserBeamsTEC1::LaserBeamsTEC1() :
-  theParticleGun(nullptr),
-  theDRand48Engine(nullptr)
-{
+LaserBeamsTEC1::LaserBeamsTEC1() : theParticleGun(nullptr), theDRand48Engine(nullptr) {
   G4int nPhotonsGun = 1;
   G4int nPhotonsBeam = 1;
   G4double Energy = 1.15 * eV;
@@ -29,11 +26,8 @@ LaserBeamsTEC1::LaserBeamsTEC1() :
   LaserBeamsTEC1(nPhotonsGun, nPhotonsBeam, Energy);
 }
 
-LaserBeamsTEC1::LaserBeamsTEC1(G4int nPhotonsInGun, G4int nPhotonsInBeam, G4double PhotonEnergy) : 
-  thenParticleInGun(0), 
-  thenParticle(0), 
-  thePhotonEnergy(0)
-{
+LaserBeamsTEC1::LaserBeamsTEC1(G4int nPhotonsInGun, G4int nPhotonsInBeam, G4double PhotonEnergy)
+    : thenParticleInGun(0), thenParticle(0), thePhotonEnergy(0) {
   /* *********************************************************************** */
   /*  initialize and configure the particle gun                              */
   /* *********************************************************************** */
@@ -44,17 +38,18 @@ LaserBeamsTEC1::LaserBeamsTEC1(G4int nPhotonsInGun, G4int nPhotonsInBeam, G4doub
   // number of particles in the Laser beam
   thenParticleInGun = nPhotonsInGun;
 
-  // number of particles in one beam. ATTENTION: each beam contains nParticleInGun with the same
-  // startpoint and direction. nParticle gives the number of particles in the beam with a different
-  // startpoint. They are used to simulate the gaussian beamprofile of the Laser Beams.
+  // number of particles in one beam. ATTENTION: each beam contains
+  // nParticleInGun with the same startpoint and direction. nParticle gives the
+  // number of particles in the beam with a different startpoint. They are used
+  // to simulate the gaussian beamprofile of the Laser Beams.
   thenParticle = nPhotonsInBeam;
 
   // create the particle gun
   theParticleGun = new G4ParticleGun(thenParticleInGun);
 
   // default kinematics
-  G4ParticleTable * theParticleTable = G4ParticleTable::GetParticleTable();
-  G4ParticleDefinition * theOpticalPhoton = theParticleTable->FindParticle("opticalphoton");
+  G4ParticleTable *theParticleTable = G4ParticleTable::GetParticleTable();
+  G4ParticleDefinition *theOpticalPhoton = theParticleTable->FindParticle("opticalphoton");
 
   theParticleGun->SetParticleDefinition(theOpticalPhoton);
   theParticleGun->SetParticleTime(0.0 * ns);
@@ -65,18 +60,20 @@ LaserBeamsTEC1::LaserBeamsTEC1(G4int nPhotonsInGun, G4int nPhotonsInBeam, G4doub
 
   // initialize the random number engine
   theDRand48Engine = new CLHEP::DRand48Engine();
-
 }
 
-LaserBeamsTEC1::~LaserBeamsTEC1()
-{
-  if ( theParticleGun != nullptr )  { delete theParticleGun; }
-  if ( theDRand48Engine != nullptr ) { delete theDRand48Engine; }
+LaserBeamsTEC1::~LaserBeamsTEC1() {
+  if (theParticleGun != nullptr) {
+    delete theParticleGun;
+  }
+  if (theDRand48Engine != nullptr) {
+    delete theDRand48Engine;
+  }
 }
 
-void LaserBeamsTEC1::GeneratePrimaries(G4Event* myEvent)
-{
-  // this function is called at the beginning of an Event in LaserAlignment::upDate(const BeginOfEvent * myEvent)
+void LaserBeamsTEC1::GeneratePrimaries(G4Event *myEvent) {
+  // this function is called at the beginning of an Event in
+  // LaserAlignment::upDate(const BeginOfEvent * myEvent)
 
   // use the random number generator service of the framework
   edm::Service<edm::RandomNumberGenerator> rng;
@@ -89,7 +86,8 @@ void LaserBeamsTEC1::GeneratePrimaries(G4Event* myEvent)
   const G4int nLaserRings = 2;
   const G4int nLaserBeams = 8;
 
-  // z position of the sixth Tracker Endcap Disc, where the Laserdiodes are positioned
+  // z position of the sixth Tracker Endcap Disc, where the Laserdiodes are
+  // positioned
   G4double LaserPositionZ = 2057.5 * mm;
 
   // Radius of the inner and outer Laser ring
@@ -103,96 +101,94 @@ void LaserBeamsTEC1::GeneratePrimaries(G4Event* myEvent)
   G4double LaserRingSigmaY[nLaserRings] = {0.5 * mm, 0.5 * mm};
 
   // get the definition of the optical photon
-  G4ParticleTable * theParticleTable = G4ParticleTable::GetParticleTable();
-  G4ParticleDefinition * theOpticalPhoton= theParticleTable->FindParticle("opticalphoton");
-  
+  G4ParticleTable *theParticleTable = G4ParticleTable::GetParticleTable();
+  G4ParticleDefinition *theOpticalPhoton = theParticleTable->FindParticle("opticalphoton");
+
   // loop over the LaserRings
-  for (int theRing = 0; theRing < nLaserRings; theRing++)
-    {
-      // loop over the LaserBeams
-      for (int theBeam = 0; theBeam < nLaserBeams; theBeam++)
-	{
-	  // code for forward and backward beam
-	  // calculate the right phi for the current beam
-	  G4double LaserPositionPhi = LaserPhi0 + G4double(theBeam * G4double(G4double(2 * M_PI) / nLaserBeams));
-
-	  // calculate x and y position for the current beam
-	  G4double LaserPositionX = cos(LaserPositionPhi) * LaserRingRadius[theRing];
-	  G4double LaserPositionY = sin(LaserPositionPhi) * LaserRingRadius[theRing];
-
-	  // loop over all the particles in one beam
-	  for (int theParticle = 0; theParticle < thenParticle; theParticle++)
-	    {
-	      // get randomnumbers  and calculate the position
-	      CLHEP::RandGaussQ aGaussObjX( *theDRand48Engine, LaserPositionX, LaserRingSigmaX[theRing] );
-	      CLHEP::RandGaussQ aGaussObjY( *theDRand48Engine, LaserPositionY, LaserRingSigmaY[theRing] );
-
-	      G4double theXPosition = aGaussObjX.fire();
-	      G4double theYPosition = aGaussObjY.fire();
-	      G4double theZPosition = LaserPositionZ;
-
-	      // set the properties of the newly created particle
-	      theParticleGun->SetParticleDefinition(theOpticalPhoton);
-	      theParticleGun->SetParticleTime(0.0 * ns);
-	      theParticleGun->SetParticlePosition(G4ThreeVector(theXPosition, theYPosition, theZPosition));
-	      theParticleGun->SetParticleEnergy(thePhotonEnergy);
-
-	      // loop over both directions of the beam
-	      for (int theDirection = 0; theDirection < 2; theDirection++)
-		{
-		  // shoot in both beam directions ...
-		  if (theDirection == 0)  // shoot in forward direction (+z)
-		    {
-		      theParticleGun->SetParticleMomentumDirection(G4ThreeVector(0.0, 0.0, 1.0));
-		      // set the polarization
-		      setOptPhotonPolar(90.0);
-		      // generate the particle
-		      theParticleGun->GeneratePrimaryVertex(myEvent);
-		    }
-
-		  if (theDirection == 1)  // shoot in backward direction (-z)
-		    {
-		      theParticleGun->SetParticleMomentumDirection(G4ThreeVector(0.0, 0.0, -1.0));
-		      // set the polarization
-		      setOptPhotonPolar(90.0);
-		      // generate the particle
-		      theParticleGun->GeneratePrimaryVertex(myEvent);
-		    }
-		} // end loop over both beam directions
-	    } // end loop over particles in beam
-	} // end loop over beams
-    } // end loop over rings
+  for (int theRing = 0; theRing < nLaserRings; theRing++) {
+    // loop over the LaserBeams
+    for (int theBeam = 0; theBeam < nLaserBeams; theBeam++) {
+      // code for forward and backward beam
+      // calculate the right phi for the current beam
+      G4double LaserPositionPhi = LaserPhi0 + G4double(theBeam * G4double(G4double(2 * M_PI) / nLaserBeams));
+
+      // calculate x and y position for the current beam
+      G4double LaserPositionX = cos(LaserPositionPhi) * LaserRingRadius[theRing];
+      G4double LaserPositionY = sin(LaserPositionPhi) * LaserRingRadius[theRing];
+
+      // loop over all the particles in one beam
+      for (int theParticle = 0; theParticle < thenParticle; theParticle++) {
+        // get randomnumbers  and calculate the position
+        CLHEP::RandGaussQ aGaussObjX(*theDRand48Engine, LaserPositionX, LaserRingSigmaX[theRing]);
+        CLHEP::RandGaussQ aGaussObjY(*theDRand48Engine, LaserPositionY, LaserRingSigmaY[theRing]);
+
+        G4double theXPosition = aGaussObjX.fire();
+        G4double theYPosition = aGaussObjY.fire();
+        G4double theZPosition = LaserPositionZ;
+
+        // set the properties of the newly created particle
+        theParticleGun->SetParticleDefinition(theOpticalPhoton);
+        theParticleGun->SetParticleTime(0.0 * ns);
+        theParticleGun->SetParticlePosition(G4ThreeVector(theXPosition, theYPosition, theZPosition));
+        theParticleGun->SetParticleEnergy(thePhotonEnergy);
+
+        // loop over both directions of the beam
+        for (int theDirection = 0; theDirection < 2; theDirection++) {
+          // shoot in both beam directions ...
+          if (theDirection == 0)  // shoot in forward direction (+z)
+          {
+            theParticleGun->SetParticleMomentumDirection(G4ThreeVector(0.0, 0.0, 1.0));
+            // set the polarization
+            setOptPhotonPolar(90.0);
+            // generate the particle
+            theParticleGun->GeneratePrimaryVertex(myEvent);
+          }
+
+          if (theDirection == 1)  // shoot in backward direction (-z)
+          {
+            theParticleGun->SetParticleMomentumDirection(G4ThreeVector(0.0, 0.0, -1.0));
+            // set the polarization
+            setOptPhotonPolar(90.0);
+            // generate the particle
+            theParticleGun->GeneratePrimaryVertex(myEvent);
+          }
+        }  // end loop over both beam directions
+      }    // end loop over particles in beam
+    }      // end loop over beams
+  }        // end loop over rings
 }
 
-void LaserBeamsTEC1::setOptPhotonPolar(G4double Angle)
-{
+void LaserBeamsTEC1::setOptPhotonPolar(G4double Angle) {
   /* *********************************************************************** */
   /*   to get optical processes working properly, you have to make sure      *
    *   that the photon polarisation is defined.                              */
   /* *********************************************************************** */
 
   // first check if we have an optical photon
-  if ( theParticleGun->GetParticleDefinition()->GetParticleName() != "opticalphoton" )
-    { 
-      edm::LogWarning("SimLaserAlignment:LaserBeamsTEC1") << "<LaserBeamsTEC1::SetOptPhotonPolar()>: WARNING! The ParticleGun is not an optical photon";
-      return;
-    }
-
-//   G4cout << "  AC1CMS: The ParticleGun is an " << theParticleGun->GetParticleDefinition()->GetParticleName();
+  if (theParticleGun->GetParticleDefinition()->GetParticleName() != "opticalphoton") {
+    edm::LogWarning("SimLaserAlignment:LaserBeamsTEC1")
+        << "<LaserBeamsTEC1::SetOptPhotonPolar()>: WARNING! The ParticleGun is "
+           "not an optical photon";
+    return;
+  }
+
+  //   G4cout << "  AC1CMS: The ParticleGun is an " <<
+  //   theParticleGun->GetParticleDefinition()->GetParticleName();
   G4ThreeVector normal(1.0, 0.0, 0.0);
   G4ThreeVector kphoton = theParticleGun->GetParticleMomentumDirection();
   G4ThreeVector product = normal.cross(kphoton);
   G4double modul2 = product * product;
 
   G4ThreeVector e_perpendicular(0.0, 0.0, 1.0);
-  
-  if ( modul2 > 0.0 ) { e_perpendicular = (1.0 / sqrt(modul2)) * product; }
-  
+
+  if (modul2 > 0.0) {
+    e_perpendicular = (1.0 / sqrt(modul2)) * product;
+  }
+
   G4ThreeVector e_parallel = e_perpendicular.cross(kphoton);
 
   G4ThreeVector polar = cos(Angle) * e_parallel + sin(Angle) * e_perpendicular;
-  
-//   G4cout << ", the polarization = " << polar << G4endl;
+
+  //   G4cout << ", the polarization = " << polar << G4endl;
   theParticleGun->SetParticlePolarization(polar);
 }
-
diff --git a/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC2.cc b/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC2.cc
index ff29bbbf447e1..cf4e4a9f560cb 100644
--- a/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC2.cc
+++ b/Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC2.cc
@@ -1,5 +1,5 @@
 /** \file LaserBeamsTEC2.cc
- *  
+ *
  *
  *  $Date: 2010/09/09 18:22:48 $
  *  $Revision: 1.7 $
@@ -14,14 +14,11 @@
 
 #include "CLHEP/Random/RandGaussQ.h"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
-#include "globals.hh"                        // Global Constants and typedefs
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleGun.hh"
+#include "globals.hh"  // Global Constants and typedefs
 
-LaserBeamsTEC2::LaserBeamsTEC2() :
-  theParticleGun(nullptr),
-  theDRand48Engine(nullptr)
-{ 
+LaserBeamsTEC2::LaserBeamsTEC2() : theParticleGun(nullptr), theDRand48Engine(nullptr) {
   G4int nPhotonsGun = 1;
   G4int nPhotonsBeam = 1;
   G4double Energy = 1.15 * eV;
@@ -29,12 +26,8 @@ LaserBeamsTEC2::LaserBeamsTEC2() :
   LaserBeamsTEC2(nPhotonsGun, nPhotonsBeam, Energy);
 }
 
-LaserBeamsTEC2::LaserBeamsTEC2(G4int nPhotonsInGun, G4int nPhotonsInBeam, G4double PhotonEnergy) : thenParticleInGun(0),
-												   thenParticle(0),
-												   thePhotonEnergy(0),
-												   theParticleGun(),
-												   theDRand48Engine()
-{
+LaserBeamsTEC2::LaserBeamsTEC2(G4int nPhotonsInGun, G4int nPhotonsInBeam, G4double PhotonEnergy)
+    : thenParticleInGun(0), thenParticle(0), thePhotonEnergy(0), theParticleGun(), theDRand48Engine() {
   /* *********************************************************************** */
   /*  initialize and configure the particle gun                              */
   /* *********************************************************************** */
@@ -45,17 +38,18 @@ LaserBeamsTEC2::LaserBeamsTEC2(G4int nPhotonsInGun, G4int nPhotonsInBeam, G4doub
   // number of particles in the Laser beam
   thenParticleInGun = nPhotonsInGun;
 
-  // number of particles in one beam. ATTENTION: each beam contains nParticleInGun with the same
-  // startpoint and direction. nParticle gives the number of particles in the beam with a different
-  // startpoint. They are used to simulate the gaussian beamprofile of the Laser Beams.
+  // number of particles in one beam. ATTENTION: each beam contains
+  // nParticleInGun with the same startpoint and direction. nParticle gives the
+  // number of particles in the beam with a different startpoint. They are used
+  // to simulate the gaussian beamprofile of the Laser Beams.
   thenParticle = nPhotonsInBeam;
 
   // create the particle gun
   theParticleGun = new G4ParticleGun(thenParticleInGun);
 
   // default kinematics
-  G4ParticleTable * theParticleTable = G4ParticleTable::GetParticleTable();
-  G4ParticleDefinition * theOpticalPhoton = theParticleTable->FindParticle("opticalphoton");
+  G4ParticleTable *theParticleTable = G4ParticleTable::GetParticleTable();
+  G4ParticleDefinition *theOpticalPhoton = theParticleTable->FindParticle("opticalphoton");
 
   theParticleGun->SetParticleDefinition(theOpticalPhoton);
   theParticleGun->SetParticleTime(0.0 * ns);
@@ -68,15 +62,18 @@ LaserBeamsTEC2::LaserBeamsTEC2(G4int nPhotonsInGun, G4int nPhotonsInBeam, G4doub
   theDRand48Engine = new CLHEP::DRand48Engine();
 }
 
-LaserBeamsTEC2::~LaserBeamsTEC2()
-{
-  if ( theParticleGun != nullptr )  { delete theParticleGun; }
-  if ( theDRand48Engine != nullptr ) { delete theDRand48Engine; }
+LaserBeamsTEC2::~LaserBeamsTEC2() {
+  if (theParticleGun != nullptr) {
+    delete theParticleGun;
+  }
+  if (theDRand48Engine != nullptr) {
+    delete theDRand48Engine;
+  }
 }
 
-void LaserBeamsTEC2::GeneratePrimaries(G4Event* myEvent)
-{
-  // this function is called at the beginning of an Event in LaserAlignment::upDate(const BeginOfEvent * myEvent)
+void LaserBeamsTEC2::GeneratePrimaries(G4Event *myEvent) {
+  // this function is called at the beginning of an Event in
+  // LaserAlignment::upDate(const BeginOfEvent * myEvent)
 
   // use the random number generator service of the framework
   edm::Service<edm::RandomNumberGenerator> rng;
@@ -85,12 +82,12 @@ void LaserBeamsTEC2::GeneratePrimaries(G4Event* myEvent)
   // set the seed
   theDRand48Engine->setSeed(seed);
 
-
   // number of LaserRings and Laserdiodes
   const G4int nLaserRings = 2;
   const G4int nLaserBeams = 8;
 
-  // z position of the sixth Tracker Endcap Disc, where the Laserdiodes are positioned
+  // z position of the sixth Tracker Endcap Disc, where the Laserdiodes are
+  // positioned
   G4double LaserPositionZ = -2057.5 * mm;
 
   // Radius of the inner and outer Laser ring
@@ -104,96 +101,94 @@ void LaserBeamsTEC2::GeneratePrimaries(G4Event* myEvent)
   G4double LaserRingSigmaY[nLaserRings] = {0.5 * mm, 0.5 * mm};
 
   // get the definition of the optical photon
-  G4ParticleTable * theParticleTable = G4ParticleTable::GetParticleTable();
-  G4ParticleDefinition * theOpticalPhoton= theParticleTable->FindParticle("opticalphoton");
+  G4ParticleTable *theParticleTable = G4ParticleTable::GetParticleTable();
+  G4ParticleDefinition *theOpticalPhoton = theParticleTable->FindParticle("opticalphoton");
 
   // loop over the LaserRings
-  for (int theRing = 0; theRing < nLaserRings; theRing++)
-    {
-      // loop over the LaserBeams
-      for (int theBeam = 0; theBeam < nLaserBeams; theBeam++)
-	{
-	  // code for forward and backward beam
-	  // calculate the right phi for the current beam
-	  G4double LaserPositionPhi = LaserPhi0 + G4double(theBeam * G4double(G4double(2 * M_PI) / nLaserBeams));
-
-	  // calculate x and y position for the current beam
-	  G4double LaserPositionX = cos(LaserPositionPhi) * LaserRingRadius[theRing];
-	  G4double LaserPositionY = sin(LaserPositionPhi) * LaserRingRadius[theRing];
-
-	  // loop over all the particles in one beam
-	  for (int theParticle = 0; theParticle < thenParticle; theParticle++)
-	    {
-	      // get randomnumbers  and calculate the position
-	      CLHEP::RandGaussQ aGaussObjX( *theDRand48Engine, LaserPositionX, LaserRingSigmaX[theRing] );
-	      CLHEP::RandGaussQ aGaussObjY( *theDRand48Engine, LaserPositionY, LaserRingSigmaY[theRing] );
-
-	      G4double theXPosition = aGaussObjX.fire();
-	      G4double theYPosition = aGaussObjY.fire();
-	      G4double theZPosition = LaserPositionZ;
-
-	      // set the properties of the newly created particle
-	      theParticleGun->SetParticleDefinition(theOpticalPhoton);
-	      theParticleGun->SetParticleTime(0.0 * ns);
-	      theParticleGun->SetParticlePosition(G4ThreeVector(theXPosition, theYPosition, theZPosition));
-	      theParticleGun->SetParticleEnergy(thePhotonEnergy);
-
-	      // loop over both directions of the beam
-	      for (int theDirection = 0; theDirection < 2; theDirection++)
-		{
-		  // shoot in both beam directions ...
-		  if (theDirection == 0)  // shoot in forward direction (+z)
-		    {
-		      theParticleGun->SetParticleMomentumDirection(G4ThreeVector(0.0, 0.0, 1.0));
-		      // set the polarization
-		      setOptPhotonPolar(90.0);
-		      // generate the particle
-		      theParticleGun->GeneratePrimaryVertex(myEvent);
-		    }
-
-		  if (theDirection == 1)  // shoot in backward direction (-z)
-		    {
-		      theParticleGun->SetParticleMomentumDirection(G4ThreeVector(0.0, 0.0, -1.0));
-		      // set the polarization
-		      setOptPhotonPolar(90.0);
-		      // generate the particle
-		      theParticleGun->GeneratePrimaryVertex(myEvent);
-		    }
-		} // end loop over both beam directions
-	    } // end loop over particles in beam
-	} // end loop over beams
-    } // end loop over rings
+  for (int theRing = 0; theRing < nLaserRings; theRing++) {
+    // loop over the LaserBeams
+    for (int theBeam = 0; theBeam < nLaserBeams; theBeam++) {
+      // code for forward and backward beam
+      // calculate the right phi for the current beam
+      G4double LaserPositionPhi = LaserPhi0 + G4double(theBeam * G4double(G4double(2 * M_PI) / nLaserBeams));
+
+      // calculate x and y position for the current beam
+      G4double LaserPositionX = cos(LaserPositionPhi) * LaserRingRadius[theRing];
+      G4double LaserPositionY = sin(LaserPositionPhi) * LaserRingRadius[theRing];
+
+      // loop over all the particles in one beam
+      for (int theParticle = 0; theParticle < thenParticle; theParticle++) {
+        // get randomnumbers  and calculate the position
+        CLHEP::RandGaussQ aGaussObjX(*theDRand48Engine, LaserPositionX, LaserRingSigmaX[theRing]);
+        CLHEP::RandGaussQ aGaussObjY(*theDRand48Engine, LaserPositionY, LaserRingSigmaY[theRing]);
+
+        G4double theXPosition = aGaussObjX.fire();
+        G4double theYPosition = aGaussObjY.fire();
+        G4double theZPosition = LaserPositionZ;
+
+        // set the properties of the newly created particle
+        theParticleGun->SetParticleDefinition(theOpticalPhoton);
+        theParticleGun->SetParticleTime(0.0 * ns);
+        theParticleGun->SetParticlePosition(G4ThreeVector(theXPosition, theYPosition, theZPosition));
+        theParticleGun->SetParticleEnergy(thePhotonEnergy);
+
+        // loop over both directions of the beam
+        for (int theDirection = 0; theDirection < 2; theDirection++) {
+          // shoot in both beam directions ...
+          if (theDirection == 0)  // shoot in forward direction (+z)
+          {
+            theParticleGun->SetParticleMomentumDirection(G4ThreeVector(0.0, 0.0, 1.0));
+            // set the polarization
+            setOptPhotonPolar(90.0);
+            // generate the particle
+            theParticleGun->GeneratePrimaryVertex(myEvent);
+          }
+
+          if (theDirection == 1)  // shoot in backward direction (-z)
+          {
+            theParticleGun->SetParticleMomentumDirection(G4ThreeVector(0.0, 0.0, -1.0));
+            // set the polarization
+            setOptPhotonPolar(90.0);
+            // generate the particle
+            theParticleGun->GeneratePrimaryVertex(myEvent);
+          }
+        }  // end loop over both beam directions
+      }    // end loop over particles in beam
+    }      // end loop over beams
+  }        // end loop over rings
 }
 
-void LaserBeamsTEC2::setOptPhotonPolar(G4double Angle)
-{
+void LaserBeamsTEC2::setOptPhotonPolar(G4double Angle) {
   /* *********************************************************************** */
   /*   to get optical processes working properly, you have to make sure      *
    *   that the photon polarisation is defined.                              */
   /* *********************************************************************** */
 
   // first check if we have an optical photon
-  if ( theParticleGun->GetParticleDefinition()->GetParticleName() != "opticalphoton" )
-    { 
-      edm::LogWarning("SimLaserAlignment:LaserBeamsTEC2") << "<LaserBeamsTEC2::setOptPhotonPolar()>: WARNING! The ParticleGun is not an optical photon";
-      return;
-    }
-
-//   G4cout << "  AC1CMS: The ParticleGun is an " << theParticleGun->GetParticleDefinition()->GetParticleName();
+  if (theParticleGun->GetParticleDefinition()->GetParticleName() != "opticalphoton") {
+    edm::LogWarning("SimLaserAlignment:LaserBeamsTEC2")
+        << "<LaserBeamsTEC2::setOptPhotonPolar()>: WARNING! The ParticleGun is "
+           "not an optical photon";
+    return;
+  }
+
+  //   G4cout << "  AC1CMS: The ParticleGun is an " <<
+  //   theParticleGun->GetParticleDefinition()->GetParticleName();
   G4ThreeVector normal(1.0, 0.0, 0.0);
   G4ThreeVector kphoton = theParticleGun->GetParticleMomentumDirection();
   G4ThreeVector product = normal.cross(kphoton);
   G4double modul2 = product * product;
 
   G4ThreeVector e_perpendicular(0.0, 0.0, 1.0);
-  
-  if ( modul2 > 0.0 ) { e_perpendicular = (1.0 / sqrt(modul2)) * product; }
-  
+
+  if (modul2 > 0.0) {
+    e_perpendicular = (1.0 / sqrt(modul2)) * product;
+  }
+
   G4ThreeVector e_parallel = e_perpendicular.cross(kphoton);
 
   G4ThreeVector polar = cos(Angle) * e_parallel + sin(Angle) * e_perpendicular;
-  
-//   G4cout << ", the polarization = " << polar << G4endl;
+
+  //   G4cout << ", the polarization = " << polar << G4endl;
   theParticleGun->SetParticlePolarization(polar);
 }
-
diff --git a/Alignment/LaserAlignmentSimulation/src/LaserOpticalPhysicsList.cc b/Alignment/LaserAlignmentSimulation/src/LaserOpticalPhysicsList.cc
index 854d97c7d61a0..ffb9f2a5e5576 100644
--- a/Alignment/LaserAlignmentSimulation/src/LaserOpticalPhysicsList.cc
+++ b/Alignment/LaserAlignmentSimulation/src/LaserOpticalPhysicsList.cc
@@ -1,5 +1,5 @@
 /** \file LaserOpticalPhysicsList.cc
- *  
+ *
  *
  *  $Date: 2008/03/10 12:52:52 $
  *  $Revision: 1.5 $
@@ -9,95 +9,107 @@
 #include "Alignment/LaserAlignmentSimulation/interface/LaserOpticalPhysicsList.h"
 #include "SimG4Core/PhysicsLists/interface/EmParticleList.h"
 
-#include "G4ProcessManager.hh" 
-#include "G4ParticleTable.hh" 
+#include "G4ParticleTable.hh"
+#include "G4ProcessManager.hh"
 
-#include "G4Cerenkov.hh" 
-#include "G4Scintillation.hh" 
-#include "G4OpAbsorption.hh" 
-#include "G4OpRayleigh.hh" 
-#include "G4OpBoundaryProcess.hh" 
+#include "G4Cerenkov.hh"
+#include "G4OpAbsorption.hh"
+#include "G4OpBoundaryProcess.hh"
+#include "G4OpRayleigh.hh"
+#include "G4Scintillation.hh"
 
-LaserOpticalPhysicsList::LaserOpticalPhysicsList(const G4String& name)
-  :  G4VPhysicsConstructor(name),
-     wasActivated(false),
-     theScintProcess(), 
-     theCerenkovProcess(), 
-     theAbsorptionProcess(),
-     theRayleighScattering(), 
-     theBoundaryProcess(), 
-     theWLSProcess()
-{
+LaserOpticalPhysicsList::LaserOpticalPhysicsList(const G4String &name)
+    : G4VPhysicsConstructor(name),
+      wasActivated(false),
+      theScintProcess(),
+      theCerenkovProcess(),
+      theAbsorptionProcess(),
+      theRayleighScattering(),
+      theBoundaryProcess(),
+      theWLSProcess() {
   if (verboseLevel > 0)
-    std::cout << "<LaserOpticalPhysicsList::LaserOpticalPhysicsList(...)> entering constructor ..." << std::endl;
+    std::cout << "<LaserOpticalPhysicsList::LaserOpticalPhysicsList(...)> "
+                 "entering constructor ..."
+              << std::endl;
 }
 
-LaserOpticalPhysicsList::~LaserOpticalPhysicsList()
-{
-  if (verboseLevel > 0)
-    {
-      std::cout << "<LaserOpticalPhysicsList::~LaserOpticalPhysicsList()> entering destructor ... " << std::endl;
-      std::cout << "  deleting the processes ... ";
-    }
-  if ( theWLSProcess != nullptr )         { delete theWLSProcess; }
-  if ( theBoundaryProcess != nullptr )    { delete theBoundaryProcess; }
-  if ( theRayleighScattering != nullptr ) { delete theRayleighScattering; }
-  if ( theAbsorptionProcess != nullptr )  { delete theAbsorptionProcess; }
-  if ( theScintProcess != nullptr )       { delete theScintProcess; }
+LaserOpticalPhysicsList::~LaserOpticalPhysicsList() {
+  if (verboseLevel > 0) {
+    std::cout << "<LaserOpticalPhysicsList::~LaserOpticalPhysicsList()> "
+                 "entering destructor ... "
+              << std::endl;
+    std::cout << "  deleting the processes ... ";
+  }
+  if (theWLSProcess != nullptr) {
+    delete theWLSProcess;
+  }
+  if (theBoundaryProcess != nullptr) {
+    delete theBoundaryProcess;
+  }
+  if (theRayleighScattering != nullptr) {
+    delete theRayleighScattering;
+  }
+  if (theAbsorptionProcess != nullptr) {
+    delete theAbsorptionProcess;
+  }
+  if (theScintProcess != nullptr) {
+    delete theScintProcess;
+  }
   if (verboseLevel > 0)
     std::cout << " done " << std::endl;
 }
 
-void LaserOpticalPhysicsList::ConstructParticle()
-{
+void LaserOpticalPhysicsList::ConstructParticle() {
   if (verboseLevel > 0)
-    std::cout << "<LaserOpticalPhysicsList::ConstructParticle()>: constructing the optical photon ... " << std::endl;
+    std::cout << "<LaserOpticalPhysicsList::ConstructParticle()>: constructing "
+                 "the optical photon ... "
+              << std::endl;
 
   // optical photon
   G4OpticalPhoton::OpticalPhotonDefinition();
 }
 
-void LaserOpticalPhysicsList::ConstructProcess()
-{
+void LaserOpticalPhysicsList::ConstructProcess() {
   if (verboseLevel > 0)
-    std::cout << "<LaserOpticalPhysicsList::ConstructProcess()>: constructing the physics ... " << std::endl;
+    std::cout << "<LaserOpticalPhysicsList::ConstructProcess()>: constructing "
+                 "the physics ... "
+              << std::endl;
 
   theScintProcess = new G4Scintillation();
-//  theCerenkovProcess=new G4Cerenkov();
-  theAbsorptionProcess=new G4OpAbsorption();
-  theRayleighScattering=new G4OpRayleigh();
-  theBoundaryProcess=new G4OpBoundaryProcess("OpBoundary");
-  theWLSProcess=new G4OpWLS();
-  
+  //  theCerenkovProcess=new G4Cerenkov();
+  theAbsorptionProcess = new G4OpAbsorption();
+  theRayleighScattering = new G4OpRayleigh();
+  theBoundaryProcess = new G4OpBoundaryProcess("OpBoundary");
+  theWLSProcess = new G4OpWLS();
+
   // set the verbosity level
   theAbsorptionProcess->SetVerboseLevel(verboseLevel);
   theBoundaryProcess->SetVerboseLevel(verboseLevel);
 
-  G4ProcessManager * pManager = nullptr;
-  
+  G4ProcessManager *pManager = nullptr;
+
   pManager = G4OpticalPhoton::OpticalPhoton()->GetProcessManager();
   pManager->AddDiscreteProcess(theAbsorptionProcess);
   pManager->AddDiscreteProcess(theRayleighScattering);
-  //theBoundaryProcess->SetModel(unified);
+  // theBoundaryProcess->SetModel(unified);
   pManager->AddDiscreteProcess(theBoundaryProcess);
   pManager->AddDiscreteProcess(theWLSProcess);
-  
+
   theScintProcess->SetScintillationYieldFactor(1.);
   theScintProcess->SetScintillationExcitationRatio(0.0);
   theScintProcess->SetTrackSecondariesFirst(true);
-  
-  G4ParticleTable* table = G4ParticleTable::GetParticleTable();
+
+  G4ParticleTable *table = G4ParticleTable::GetParticleTable();
   EmParticleList emList;
-  for(const auto& particleName : emList.PartNames()) {
-    G4ParticleDefinition* particle = table->FindParticle(particleName);
+  for (const auto &particleName : emList.PartNames()) {
+    G4ParticleDefinition *particle = table->FindParticle(particleName);
     pManager = particle->GetProcessManager();
-    if(theScintProcess->IsApplicable(*particle))
-      {
-	pManager->AddProcess(theScintProcess);
-	pManager->SetProcessOrderingToLast(theScintProcess,idxAtRest);
-	pManager->SetProcessOrderingToLast(theScintProcess,idxPostStep);
-      }
+    if (theScintProcess->IsApplicable(*particle)) {
+      pManager->AddProcess(theScintProcess);
+      pManager->SetProcessOrderingToLast(theScintProcess, idxAtRest);
+      pManager->SetProcessOrderingToLast(theScintProcess, idxPostStep);
     }
+  }
 
   wasActivated = true;
 }
diff --git a/Alignment/LaserAlignmentSimulation/src/LaserPrimaryGeneratorAction.cc b/Alignment/LaserAlignmentSimulation/src/LaserPrimaryGeneratorAction.cc
index ca251ea7db840..44092aa6db143 100644
--- a/Alignment/LaserAlignmentSimulation/src/LaserPrimaryGeneratorAction.cc
+++ b/Alignment/LaserAlignmentSimulation/src/LaserPrimaryGeneratorAction.cc
@@ -1,5 +1,5 @@
 /** \file LaserPrimaryGeneratorAction.cc
- *  
+ *
  *
  *  $Date: 2007/03/20 12:01:01 $
  *  $Revision: 1.2 $
@@ -13,30 +13,30 @@
 
 #include "G4SystemOfUnits.hh"
 
-LaserPrimaryGeneratorAction::LaserPrimaryGeneratorAction(edm::ParameterSet const& theConf) 
-  : thePhotonEnergy(0),
-    thenParticleInGun(0),
-    thenParticle(0),
-    theLaserBeamsInTEC1(),
-    theLaserBeamsInTEC2(),
-    theLaserBeamsInTECTIBTOBTEC()
-{
+LaserPrimaryGeneratorAction::LaserPrimaryGeneratorAction(edm::ParameterSet const &theConf)
+    : thePhotonEnergy(0),
+      thenParticleInGun(0),
+      thenParticle(0),
+      theLaserBeamsInTEC1(),
+      theLaserBeamsInTEC2(),
+      theLaserBeamsInTECTIBTOBTEC() {
   // {{{ LaserPrimaryGeneratorAction constructor
 
   // get the PhotonEnergy from the parameter set
-  thePhotonEnergy = theConf.getUntrackedParameter<double>("PhotonEnergy",1.15) * eV;
+  thePhotonEnergy = theConf.getUntrackedParameter<double>("PhotonEnergy", 1.15) * eV;
 
   // number of particles in the Laser beam
-  thenParticleInGun = theConf.getUntrackedParameter<int>("NumberOfPhotonsInParticleGun",1);
+  thenParticleInGun = theConf.getUntrackedParameter<int>("NumberOfPhotonsInParticleGun", 1);
 
-  // number of particles in one beam. ATTENTION: each beam contains nParticleInGun with the same
-  // startpoint and direction. nParticle gives the number of particles in the beam with a different
-  // startpoint. They are used to simulate the gaussian beamprofile of the Laser Beams.
-  thenParticle = theConf.getUntrackedParameter<int>("NumberOfPhotonsInEachBeam",1);
+  // number of particles in one beam. ATTENTION: each beam contains
+  // nParticleInGun with the same startpoint and direction. nParticle gives the
+  // number of particles in the beam with a different startpoint. They are used
+  // to simulate the gaussian beamprofile of the Laser Beams.
+  thenParticle = theConf.getUntrackedParameter<int>("NumberOfPhotonsInEachBeam", 1);
 
   // create a messenger for this class
-//   theGunMessenger = new LaserPrimaryGeneratorMessenger(this);
-  
+  //   theGunMessenger = new LaserPrimaryGeneratorMessenger(this);
+
   // create the beams in the right endcap
   theLaserBeamsInTEC1 = new LaserBeamsTEC1(thenParticleInGun, thenParticle, thePhotonEnergy);
 
@@ -48,22 +48,28 @@ LaserPrimaryGeneratorAction::LaserPrimaryGeneratorAction(edm::ParameterSet const
   // }}}
 }
 
-LaserPrimaryGeneratorAction::~LaserPrimaryGeneratorAction()
-{
+LaserPrimaryGeneratorAction::~LaserPrimaryGeneratorAction() {
   // {{{ LaserPrimaryGeneratorAction destructor
 
-  if ( theLaserBeamsInTEC1 != nullptr ) { delete theLaserBeamsInTEC1; }
-  if ( theLaserBeamsInTEC2 != nullptr ) { delete theLaserBeamsInTEC2; }
-  if ( theLaserBeamsInTECTIBTOBTEC != nullptr ) { delete theLaserBeamsInTECTIBTOBTEC; }
+  if (theLaserBeamsInTEC1 != nullptr) {
+    delete theLaserBeamsInTEC1;
+  }
+  if (theLaserBeamsInTEC2 != nullptr) {
+    delete theLaserBeamsInTEC2;
+  }
+  if (theLaserBeamsInTECTIBTOBTEC != nullptr) {
+    delete theLaserBeamsInTECTIBTOBTEC;
+  }
   // }}}
 }
 
-void LaserPrimaryGeneratorAction::GeneratePrimaries(G4Event* myEvent)
-{
+void LaserPrimaryGeneratorAction::GeneratePrimaries(G4Event *myEvent) {
   // {{{ GeneratePrimaries (G4Event * myEvent)
 
-  // this function is called at the beginning of an Event in LaserAlignment::upDate(const BeginOfEvent * myEvent)
-  LogDebug("LaserPrimaryGeneratorAction") << "<LaserPrimaryGeneratorAction::GeneratePrimaries(G4Event*)>: create a new Laser Event";
+  // this function is called at the beginning of an Event in
+  // LaserAlignment::upDate(const BeginOfEvent * myEvent)
+  LogDebug("LaserPrimaryGeneratorAction") << "<LaserPrimaryGeneratorAction::GeneratePrimaries(G4Event*)>: create a "
+                                             "new Laser Event";
 
   // shoot in the right endcap
   theLaserBeamsInTEC1->GeneratePrimaries(myEvent);
@@ -74,26 +80,24 @@ void LaserPrimaryGeneratorAction::GeneratePrimaries(G4Event* myEvent)
   // shoot in the barrel
   theLaserBeamsInTECTIBTOBTEC->GeneratePrimaries(myEvent);
 
-  // loop over all the generated vertices, get the primaries and set the user information
+  // loop over all the generated vertices, get the primaries and set the user
+  // information
   int theID = 0;
 
-  for (int i = 1; i < myEvent->GetNumberOfPrimaryVertex(); i++)
-    {
-      G4PrimaryVertex * theVertex = myEvent->GetPrimaryVertex(i);
-
-      for (int j = 0; j < theVertex->GetNumberOfParticle(); j++)
-	{
-	  G4PrimaryParticle * thePrimary = theVertex->GetPrimary(j);
-	  
-	  setGeneratorId(thePrimary, theID);
-	  theID++;
-	}
+  for (int i = 1; i < myEvent->GetNumberOfPrimaryVertex(); i++) {
+    G4PrimaryVertex *theVertex = myEvent->GetPrimaryVertex(i);
+
+    for (int j = 0; j < theVertex->GetNumberOfParticle(); j++) {
+      G4PrimaryParticle *thePrimary = theVertex->GetPrimary(j);
+
+      setGeneratorId(thePrimary, theID);
+      theID++;
     }
+  }
   // }}}
 }
 
-void LaserPrimaryGeneratorAction::setGeneratorId(G4PrimaryParticle * aParticle, int ID) const
-{
+void LaserPrimaryGeneratorAction::setGeneratorId(G4PrimaryParticle *aParticle, int ID) const {
   // {{{ SetGeneratorId(G4PrimaryParticle * aParticle, int ID) const
 
   /* *********************************************************************** */
diff --git a/Alignment/LaserAlignmentSimulation/src/LaserSteppingAction.cc b/Alignment/LaserAlignmentSimulation/src/LaserSteppingAction.cc
index 12901014930cd..f11b80b7cbed9 100644
--- a/Alignment/LaserAlignmentSimulation/src/LaserSteppingAction.cc
+++ b/Alignment/LaserAlignmentSimulation/src/LaserSteppingAction.cc
@@ -1,5 +1,5 @@
 /** \file LaserSteppingAction.cc
- *  
+ *
  *
  *  $Date: 2007/06/11 14:44:29 $
  *  $Revision: 1.3 $
@@ -7,251 +7,326 @@
  */
 
 #include "Alignment/LaserAlignmentSimulation/interface/LaserSteppingAction.h"
-#include "G4ParticleTypes.hh" 
+#include "G4ParticleTypes.hh"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-LaserSteppingAction::LaserSteppingAction(edm::ParameterSet const& theConf) 
-  : theDebugLevel(theConf.getUntrackedParameter<int>("DebugLevel",0)),
-    theEnergyLossScalingFactor(theConf.getUntrackedParameter<double>("EnergyLossScalingFactor",1.0))
-{
-}
+LaserSteppingAction::LaserSteppingAction(edm::ParameterSet const &theConf)
+    : theDebugLevel(theConf.getUntrackedParameter<int>("DebugLevel", 0)),
+      theEnergyLossScalingFactor(theConf.getUntrackedParameter<double>("EnergyLossScalingFactor", 1.0)) {}
 
-LaserSteppingAction::~LaserSteppingAction()
-{
-}
+LaserSteppingAction::~LaserSteppingAction() {}
 
-void LaserSteppingAction::UserSteppingAction(const G4Step * myStep)
-{
-  G4Step * theStep = const_cast<G4Step*>(myStep);
+void LaserSteppingAction::UserSteppingAction(const G4Step *myStep) {
+  G4Step *theStep = const_cast<G4Step *>(myStep);
 
-  G4Track * theTrack = theStep->GetTrack();
+  G4Track *theTrack = theStep->GetTrack();
 
   // some debug info
   {
     G4TrackStatus isGood = theTrack->GetTrackStatus();
-    
-    LogDebug("LaserAlignmentSimulationStepping") << "<LaserSteppingAction::UserSteppingAction(const G4Step *)>: AC1CMS: the PreStep Material = " 
-					  << theStep->GetPreStepPoint()->GetMaterial()->GetName()
-					  << "\n<LaserSteppingAction::UserSteppingAction(const G4Step *)>: AC1CMS: The Track Status = " << isGood;
-    if ( isGood == fStopAndKill ) 
-      LogDebug("LaserAlignmentSimulationStepping") << "<LaserSteppingAction::UserSteppingAction(const G4Step *)>: AC1CMS: Track Status = fStopAndKill ";
-      
-    if ( theStep->GetPreStepPoint()->GetProcessDefinedStep() != nullptr )
-      LogDebug("LaserAlignmentSimulationStepping") << "<LaserSteppingAction::UserSteppingAction(const G4Step *)>: AC1CMS: PreStep Process  = " 
-					    << theStep->GetPreStepPoint()->GetProcessDefinedStep()->GetProcessName();
-    if ( theStep->GetPostStepPoint()->GetProcessDefinedStep() != nullptr )
-      LogDebug("LaserAlignmentSimulationStepping") << "<LaserSteppingAction::UserSteppingAction(const G4Step *)>: AC1CMS: PostStep Process = " 
-					    << theStep->GetPostStepPoint()->GetProcessDefinedStep()->GetProcessName();
+
+    LogDebug("LaserAlignmentSimulationStepping")
+        << "<LaserSteppingAction::UserSteppingAction(const G4Step *)>: AC1CMS: "
+           "the PreStep Material = "
+        << theStep->GetPreStepPoint()->GetMaterial()->GetName()
+        << "\n<LaserSteppingAction::UserSteppingAction(const G4Step *)>: "
+           "AC1CMS: The Track Status = "
+        << isGood;
+    if (isGood == fStopAndKill)
+      LogDebug("LaserAlignmentSimulationStepping") << "<LaserSteppingAction::UserSteppingAction(const G4Step *)>: "
+                                                      "AC1CMS: Track Status = fStopAndKill ";
+
+    if (theStep->GetPreStepPoint()->GetProcessDefinedStep() != nullptr)
+      LogDebug("LaserAlignmentSimulationStepping")
+          << "<LaserSteppingAction::UserSteppingAction(const G4Step *)>: "
+             "AC1CMS: PreStep Process  = "
+          << theStep->GetPreStepPoint()->GetProcessDefinedStep()->GetProcessName();
+    if (theStep->GetPostStepPoint()->GetProcessDefinedStep() != nullptr)
+      LogDebug("LaserAlignmentSimulationStepping")
+          << "<LaserSteppingAction::UserSteppingAction(const G4Step *)>: "
+             "AC1CMS: PostStep Process = "
+          << theStep->GetPostStepPoint()->GetProcessDefinedStep()->GetProcessName();
   }
 
   // ***********************************************************************************************************
   // Set the EnergyDeposit if the photon is absorbed by a active sensor
-  if ( ( theStep->GetPostStepPoint()->GetProcessDefinedStep()->GetProcessName()== "OpAbsorption" ) )
-    {
-      LogDebug("LaserAlignmentStepping") << "<LaserSteppingAction::UserSteppingAction(const G4Step*)>: Photon was absorbed! ";
-      
-      if ( theStep->GetPreStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetSensitiveDetector() )
-	{
-	  double EnergyLoss = theEnergyLossScalingFactor * theTrack->GetTotalEnergy();
-	  
-	  // use different energy deposit for the discs depending on the z-position to simulate the variable laser power
-	  // Disc 1 TEC2TEC
-	  if ( ( (theStep->GetPreStepPoint()->GetPosition().z() > 1262.5 && theStep->GetPreStepPoint()->GetPosition().z() < 1382.5 )
-                 || (theStep->GetPreStepPoint()->GetPosition().z() < -1262.5 && theStep->GetPreStepPoint()->GetPosition().z() > -1382.5 ) )
-               && ( ( ( theStep->GetPreStepPoint()->GetPosition().phi() > 1.285 && theStep->GetPreStepPoint()->GetPosition().phi() < 1.295 ) 
-                      || ( theStep->GetPreStepPoint()->GetPosition().phi() > 1.84 && theStep->GetPreStepPoint()->GetPosition().phi() < 1.86 )
-                      || ( theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI > 3.63 && theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI < 3.66 )
-                      || ( theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI > 5.20 && theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI < 5.23 )
-                      || ( theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI > 5.76 && theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI < 5.80 ) ) ) )
- 	    { theStep->AddTotalEnergyDeposit(EnergyLoss); } // Disc 1 TEC2TEC
-	  // Disc 1
-	  else if ( (theStep->GetPreStepPoint()->GetPosition().z() > 1262.5 && theStep->GetPreStepPoint()->GetPosition().z() < 1382.5 )
-		    || (theStep->GetPreStepPoint()->GetPosition().z() < -1262.5 && theStep->GetPreStepPoint()->GetPosition().z() > -1382.5 ) )
- 	    { theStep->AddTotalEnergyDeposit(EnergyLoss/(0.2*0.2*0.2*0.2)); } // Disc 1
-	  // Disc 2 TEC2TEC
-	  else if ( ( (theStep->GetPreStepPoint()->GetPosition().z() > 1402.5 && theStep->GetPreStepPoint()->GetPosition().z() < 1522.5 )
-                      || (theStep->GetPreStepPoint()->GetPosition().z() < -1402.5 && theStep->GetPreStepPoint()->GetPosition().z() > -1522.5 ) )
-		    && ( ( ( theStep->GetPreStepPoint()->GetPosition().phi() > 1.285 && theStep->GetPreStepPoint()->GetPosition().phi() < 1.295 ) 
-                           || ( theStep->GetPreStepPoint()->GetPosition().phi() > 1.84 && theStep->GetPreStepPoint()->GetPosition().phi() < 1.86 )
-                           || ( theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI > 3.63 && theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI < 3.66 )
-                           || ( theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI > 5.20 && theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI < 5.23 )
-                           || ( theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI > 5.76 && theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI < 5.80 ) ) ) )
- 	    { theStep->AddTotalEnergyDeposit(EnergyLoss/(0.2)); } // Disc 2 TEC2TEC
-	  // Disc 2
-	  else if ( (theStep->GetPreStepPoint()->GetPosition().z() > 1402.5 && theStep->GetPreStepPoint()->GetPosition().z() < 1522.5 )
-		    || (theStep->GetPreStepPoint()->GetPosition().z() < -1402.5 && theStep->GetPreStepPoint()->GetPosition().z() > -1522.5 ) )
-	    { theStep->AddTotalEnergyDeposit(EnergyLoss/(0.2*0.2*0.2)); } // Disc 2
-	  // Disc 3 TEC2TEC
-	  else if ( ( (theStep->GetPreStepPoint()->GetPosition().z() > 1542.5 && theStep->GetPreStepPoint()->GetPosition().z() < 1662.5 )
-		    || (theStep->GetPreStepPoint()->GetPosition().z() < -1542.5 && theStep->GetPreStepPoint()->GetPosition().z() > -1662.5 ) ) 
-		    && ( ( ( theStep->GetPreStepPoint()->GetPosition().phi() > 1.285 && theStep->GetPreStepPoint()->GetPosition().phi() < 1.295 ) 
-                           || ( theStep->GetPreStepPoint()->GetPosition().phi() > 1.84 && theStep->GetPreStepPoint()->GetPosition().phi() < 1.86 )
-                           || ( theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI > 3.63 && theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI < 3.66 )
-                           || ( theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI > 5.20 && theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI < 5.23 )
-                           || ( theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI > 5.76 && theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI < 5.80 ) ) ) )
-	    { theStep->AddTotalEnergyDeposit(EnergyLoss/(0.2*0.2)); } // Disc 3 TEC2TEC
-	  // Disc 3
-	  else if ( (theStep->GetPreStepPoint()->GetPosition().z() > 1542.5 && theStep->GetPreStepPoint()->GetPosition().z() < 1662.5 )
-		    || (theStep->GetPreStepPoint()->GetPosition().z() < -1542.5 && theStep->GetPreStepPoint()->GetPosition().z() > -1662.5 ) )
-	    { theStep->AddTotalEnergyDeposit(EnergyLoss/(0.2*0.2)); } // Disc 3
-	  // Disc 4 TEC2TEC
-	  else if ( ( (theStep->GetPreStepPoint()->GetPosition().z() > 1682.5 && theStep->GetPreStepPoint()->GetPosition().z() < 1802.5 )
-                      || (theStep->GetPreStepPoint()->GetPosition().z() < -1682.5 && theStep->GetPreStepPoint()->GetPosition().z() > -1802.5 ) ) 
-		    && ( ( ( theStep->GetPreStepPoint()->GetPosition().phi() > 1.285 && theStep->GetPreStepPoint()->GetPosition().phi() < 1.295 ) 
-                           || ( theStep->GetPreStepPoint()->GetPosition().phi() > 1.84 && theStep->GetPreStepPoint()->GetPosition().phi() < 1.86 )
-                           || ( theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI > 3.63 && theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI < 3.66 )
-                           || ( theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI > 5.20 && theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI < 5.23 )
-                           || ( theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI > 5.76 && theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI < 5.80 ) ) ) )
-	    { theStep->AddTotalEnergyDeposit(EnergyLoss/(0.2*0.2*0.2)); } // Disc 4 TEC2TEC
-	  // Disc 4
-	  else if ( (theStep->GetPreStepPoint()->GetPosition().z() > 1682.5 && theStep->GetPreStepPoint()->GetPosition().z() < 1802.5 )
-		    || (theStep->GetPreStepPoint()->GetPosition().z() < -1682.5 && theStep->GetPreStepPoint()->GetPosition().z() > -1802.5 ) )
-	    { theStep->AddTotalEnergyDeposit(EnergyLoss/(0.2)); } // Disc 4
-	  // Disc 5 TEC2TEC
-	  else if ( ( ( theStep->GetPreStepPoint()->GetPosition().z() > 1822.5 && theStep->GetPreStepPoint()->GetPosition().z() < 1942.5 )
-		    || ( theStep->GetPreStepPoint()->GetPosition().z() < -1822.5 && theStep->GetPreStepPoint()->GetPosition().z() > -1942.5 ) )
-		    && ( ( ( theStep->GetPreStepPoint()->GetPosition().phi() > 1.285 && theStep->GetPreStepPoint()->GetPosition().phi() < 1.295 ) 
-                           || ( theStep->GetPreStepPoint()->GetPosition().phi() > 1.84 && theStep->GetPreStepPoint()->GetPosition().phi() < 1.86 )
-                           || ( theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI > 3.63 && theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI < 3.66 )
-                           || ( theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI > 5.20 && theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI < 5.23 )
-                           || ( theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI > 5.76 && theStep->GetPreStepPoint()->GetPosition().phi() + 2.0*M_PI < 5.80 ) ) ) )
-	    { theStep->AddTotalEnergyDeposit(EnergyLoss/(0.2*0.2*0.2*0.2)); } // Disc 5 TEC2TEC
-	  // Disc 5
-	  else if ( (theStep->GetPreStepPoint()->GetPosition().z() > 1822.5 && theStep->GetPreStepPoint()->GetPosition().z() < 1942.5 )
-		    || (theStep->GetPreStepPoint()->GetPosition().z() < -1822.5 && theStep->GetPreStepPoint()->GetPosition().z() > -1942.5 ) )
-	    { theStep->AddTotalEnergyDeposit(EnergyLoss); } // Disc 5
-	  // Disc 6
-	  else if ( (theStep->GetPreStepPoint()->GetPosition().z() > 1997.5 && theStep->GetPreStepPoint()->GetPosition().z() < 2117.5 )
-		    || (theStep->GetPreStepPoint()->GetPosition().z() < -1997.5 && theStep->GetPreStepPoint()->GetPosition().z() > -2117.5 ) )
-	    { theStep->AddTotalEnergyDeposit(EnergyLoss); } // Disc 6
-	  // Disc 7
-	  else if ( (theStep->GetPreStepPoint()->GetPosition().z() > 2187.5 && theStep->GetPreStepPoint()->GetPosition().z() < 2307.5 )
-		    || (theStep->GetPreStepPoint()->GetPosition().z() < -2187.5 && theStep->GetPreStepPoint()->GetPosition().z() > -2307.5 ) )
-	    { theStep->AddTotalEnergyDeposit(EnergyLoss/(0.2)); } // Disc 7
-	  // Disc 8
-	  else if ( (theStep->GetPreStepPoint()->GetPosition().z() > 2392.5 && theStep->GetPreStepPoint()->GetPosition().z() < 2512.5 )
-		    || (theStep->GetPreStepPoint()->GetPosition().z() < -2392.5 && theStep->GetPreStepPoint()->GetPosition().z() > -2512.5 ) )
-	    { theStep->AddTotalEnergyDeposit(EnergyLoss/(0.2*0.2)); } // Disc 8
-	  // Disc 9
-	  else if ( (theStep->GetPreStepPoint()->GetPosition().z() > 2607.5 && theStep->GetPreStepPoint()->GetPosition().z() < 2727.5 )
-		    || (theStep->GetPreStepPoint()->GetPosition().z() < -2607.5 && theStep->GetPreStepPoint()->GetPosition().z() > -2727.5 ) )
-	    { theStep->AddTotalEnergyDeposit(EnergyLoss/(0.2*0.2*0.2)); } // Disc 9
-	  // Beams in Barrel
-	  else if ( (theStep->GetPreStepPoint()->GetPosition().z() > -870.0 && theStep->GetPreStepPoint()->GetPosition().z() < 1050.0) &&
-		    (theStep->GetPreStepPoint()->GetPosition().perp() > 500.0 && theStep->GetPreStepPoint()->GetPosition().perp() < 630.0) )
-	    { theStep->AddTotalEnergyDeposit(EnergyLoss/(0.2*0.2)); } // Beams in the Barrel
-	  else
-	    { 
-	      // apparently we are not in a detector which should be hit by a LaserBeam
-	      // therefore set the EnergyDeposit to zero and do not create a SimHit
-	      theStep->ResetTotalEnergyDeposit(); 
-	    }
-	}
-    }
-  // kill the photon if it goes through a module in the outer barrel detector. In practice on the back 
-  // of a module is a thin layer of Aluminium that absorbs the photons, so hits will only be created in 
-  // the first layer of the TOB. In the current geometry this Aluminium layer is not included. This should
-  // also avoid unwanted reflections (which then create hits in the TIB at the wrong positions)
-  else if ( ( (theStep->GetPreStepPoint()->GetMaterial()->GetName() == "TOB_Wafer") &&
-	      (theStep->GetPostStepPoint()->GetMaterial()->GetName() == "Air") ) )
-    {
-      LogDebug("LaserAlignmentSimulationStepping") << " AC1CMS: stepping aborted! ";
-      theTrack->SetTrackStatus(fStopAndKill);
-    }
-  else if ( (theStep->GetPreStepPoint()->GetPosition().z() > -870.0 && 
-	     theStep->GetPreStepPoint()->GetPosition().z() < 1050.0) &&
-	    (theStep->GetPreStepPoint()->GetPosition().perp() > 630.0) )
-    {
-      LogDebug("LaserAlignmentSimulationStepping") << " AC1CMS: stepping aborted! ";
-      theTrack->SetTrackStatus(fStopAndKill);
-    }
-  // do the same for photons that a) go through a module in the inner barrel detector or b) are reflected
-  // at the surface of a TIB module. The photons in case b) can create hits in the TOB at the wrong z
-  // positions :-(
-  else if ( ( (theStep->GetPreStepPoint()->GetMaterial()->GetName() == "TIB_Wafer") &&
-              (theStep->GetPostStepPoint()->GetMaterial()->GetName() == "Air") ) )
-    {
-      LogDebug("LaserAlignmentSimulationStepping") << " AC1CMS: stepping aborted! ";
-      theTrack->SetTrackStatus(fStopAndKill);
-    }
-  else if ( (theStep->GetPreStepPoint()->GetPosition().z() > -870.0 && 
-	     theStep->GetPreStepPoint()->GetPosition().z() < 1050.0) &&
-	    (theStep->GetPreStepPoint()->GetPosition().perp() < 500.0) )
-    {
-      LogDebug("LaserAlignmentSimulationStepping") << " AC1CMS: stepping aborted! ";
-      theTrack->SetTrackStatus(fStopAndKill);
-    }
-  // avoid reflections at Disc 1 of TEC- which enter again the Barrel Volume. These Photons
-  // create hits at the wrong positions in TIB and TOB
-  else if ( ( ( (theStep->GetPreStepPoint()->GetMaterial()->GetName() == "TEC_Wafer") &&
-		(theStep->GetPostStepPoint()->GetMaterial()->GetName() == "T_Air")  ) ||
-	      ( (theStep->GetPreStepPoint()->GetMaterial()->GetName() == "TEC_Wafer") &&
-		(theStep->GetPostStepPoint()->GetMaterial()->GetName() == "Air") ) ) &&
-	    (theStep->GetPreStepPoint()->GetMomentum().z() != theStep->GetPostStepPoint()->GetMomentum().z() ) &&
-	    (theStep->GetPostStepPoint()->GetPosition().z() == -1137.25) )
-    {
-      LogDebug("LaserAlignmentSimulationStepping") << " AC1CMS: stepping aborted! photon in wrong direction";
-      theTrack->SetTrackStatus(fStopAndKill);
-    }
-  // kill photons in the barrel which go in the wrong (i.e. +z) direction; they create unwanted hits
-  // due to reflections ...
-  else if ( ( theStep->GetPostStepPoint()->GetPosition().z() > -1100.0 )
-	    && ( theStep->GetPostStepPoint()->GetPosition().z() < 1100.0 )
-	    && ( theStep->GetPostStepPoint()->GetMomentumDirection().z() > 0.8 ) )
-    {
-      LogDebug("LaserAlignmentSimulationStepping") << " AC1CMS: stepping aborted! photon in wrong direction";
-      theTrack->SetTrackStatus(fStopAndKill);
-    }
-  else
-    {
-      LogDebug("LaserAlignmentSimulationStepping") << " AC1CMS: stepping continuous ... ";
+  if ((theStep->GetPostStepPoint()->GetProcessDefinedStep()->GetProcessName() == "OpAbsorption")) {
+    LogDebug("LaserAlignmentStepping") << "<LaserSteppingAction::UserSteppingAction(const G4Step*)>: Photon "
+                                          "was absorbed! ";
+
+    if (theStep->GetPreStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetSensitiveDetector()) {
+      double EnergyLoss = theEnergyLossScalingFactor * theTrack->GetTotalEnergy();
+
+      // use different energy deposit for the discs depending on the z-position
+      // to simulate the variable laser power Disc 1 TEC2TEC
+      if (((theStep->GetPreStepPoint()->GetPosition().z() > 1262.5 &&
+            theStep->GetPreStepPoint()->GetPosition().z() < 1382.5) ||
+           (theStep->GetPreStepPoint()->GetPosition().z() < -1262.5 &&
+            theStep->GetPreStepPoint()->GetPosition().z() > -1382.5)) &&
+          (((theStep->GetPreStepPoint()->GetPosition().phi() > 1.285 &&
+             theStep->GetPreStepPoint()->GetPosition().phi() < 1.295) ||
+            (theStep->GetPreStepPoint()->GetPosition().phi() > 1.84 &&
+             theStep->GetPreStepPoint()->GetPosition().phi() < 1.86) ||
+            (theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI > 3.63 &&
+             theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI < 3.66) ||
+            (theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI > 5.20 &&
+             theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI < 5.23) ||
+            (theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI > 5.76 &&
+             theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI < 5.80)))) {
+        theStep->AddTotalEnergyDeposit(EnergyLoss);
+      }  // Disc 1 TEC2TEC
+      // Disc 1
+      else if ((theStep->GetPreStepPoint()->GetPosition().z() > 1262.5 &&
+                theStep->GetPreStepPoint()->GetPosition().z() < 1382.5) ||
+               (theStep->GetPreStepPoint()->GetPosition().z() < -1262.5 &&
+                theStep->GetPreStepPoint()->GetPosition().z() > -1382.5)) {
+        theStep->AddTotalEnergyDeposit(EnergyLoss / (0.2 * 0.2 * 0.2 * 0.2));
+      }  // Disc 1
+      // Disc 2 TEC2TEC
+      else if (((theStep->GetPreStepPoint()->GetPosition().z() > 1402.5 &&
+                 theStep->GetPreStepPoint()->GetPosition().z() < 1522.5) ||
+                (theStep->GetPreStepPoint()->GetPosition().z() < -1402.5 &&
+                 theStep->GetPreStepPoint()->GetPosition().z() > -1522.5)) &&
+               (((theStep->GetPreStepPoint()->GetPosition().phi() > 1.285 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() < 1.295) ||
+                 (theStep->GetPreStepPoint()->GetPosition().phi() > 1.84 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() < 1.86) ||
+                 (theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI > 3.63 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI < 3.66) ||
+                 (theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI > 5.20 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI < 5.23) ||
+                 (theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI > 5.76 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI < 5.80)))) {
+        theStep->AddTotalEnergyDeposit(EnergyLoss / (0.2));
+      }  // Disc 2 TEC2TEC
+      // Disc 2
+      else if ((theStep->GetPreStepPoint()->GetPosition().z() > 1402.5 &&
+                theStep->GetPreStepPoint()->GetPosition().z() < 1522.5) ||
+               (theStep->GetPreStepPoint()->GetPosition().z() < -1402.5 &&
+                theStep->GetPreStepPoint()->GetPosition().z() > -1522.5)) {
+        theStep->AddTotalEnergyDeposit(EnergyLoss / (0.2 * 0.2 * 0.2));
+      }  // Disc 2
+      // Disc 3 TEC2TEC
+      else if (((theStep->GetPreStepPoint()->GetPosition().z() > 1542.5 &&
+                 theStep->GetPreStepPoint()->GetPosition().z() < 1662.5) ||
+                (theStep->GetPreStepPoint()->GetPosition().z() < -1542.5 &&
+                 theStep->GetPreStepPoint()->GetPosition().z() > -1662.5)) &&
+               (((theStep->GetPreStepPoint()->GetPosition().phi() > 1.285 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() < 1.295) ||
+                 (theStep->GetPreStepPoint()->GetPosition().phi() > 1.84 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() < 1.86) ||
+                 (theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI > 3.63 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI < 3.66) ||
+                 (theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI > 5.20 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI < 5.23) ||
+                 (theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI > 5.76 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI < 5.80)))) {
+        theStep->AddTotalEnergyDeposit(EnergyLoss / (0.2 * 0.2));
+      }  // Disc 3 TEC2TEC
+      // Disc 3
+      else if ((theStep->GetPreStepPoint()->GetPosition().z() > 1542.5 &&
+                theStep->GetPreStepPoint()->GetPosition().z() < 1662.5) ||
+               (theStep->GetPreStepPoint()->GetPosition().z() < -1542.5 &&
+                theStep->GetPreStepPoint()->GetPosition().z() > -1662.5)) {
+        theStep->AddTotalEnergyDeposit(EnergyLoss / (0.2 * 0.2));
+      }  // Disc 3
+      // Disc 4 TEC2TEC
+      else if (((theStep->GetPreStepPoint()->GetPosition().z() > 1682.5 &&
+                 theStep->GetPreStepPoint()->GetPosition().z() < 1802.5) ||
+                (theStep->GetPreStepPoint()->GetPosition().z() < -1682.5 &&
+                 theStep->GetPreStepPoint()->GetPosition().z() > -1802.5)) &&
+               (((theStep->GetPreStepPoint()->GetPosition().phi() > 1.285 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() < 1.295) ||
+                 (theStep->GetPreStepPoint()->GetPosition().phi() > 1.84 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() < 1.86) ||
+                 (theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI > 3.63 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI < 3.66) ||
+                 (theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI > 5.20 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI < 5.23) ||
+                 (theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI > 5.76 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI < 5.80)))) {
+        theStep->AddTotalEnergyDeposit(EnergyLoss / (0.2 * 0.2 * 0.2));
+      }  // Disc 4 TEC2TEC
+      // Disc 4
+      else if ((theStep->GetPreStepPoint()->GetPosition().z() > 1682.5 &&
+                theStep->GetPreStepPoint()->GetPosition().z() < 1802.5) ||
+               (theStep->GetPreStepPoint()->GetPosition().z() < -1682.5 &&
+                theStep->GetPreStepPoint()->GetPosition().z() > -1802.5)) {
+        theStep->AddTotalEnergyDeposit(EnergyLoss / (0.2));
+      }  // Disc 4
+      // Disc 5 TEC2TEC
+      else if (((theStep->GetPreStepPoint()->GetPosition().z() > 1822.5 &&
+                 theStep->GetPreStepPoint()->GetPosition().z() < 1942.5) ||
+                (theStep->GetPreStepPoint()->GetPosition().z() < -1822.5 &&
+                 theStep->GetPreStepPoint()->GetPosition().z() > -1942.5)) &&
+               (((theStep->GetPreStepPoint()->GetPosition().phi() > 1.285 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() < 1.295) ||
+                 (theStep->GetPreStepPoint()->GetPosition().phi() > 1.84 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() < 1.86) ||
+                 (theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI > 3.63 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI < 3.66) ||
+                 (theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI > 5.20 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI < 5.23) ||
+                 (theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI > 5.76 &&
+                  theStep->GetPreStepPoint()->GetPosition().phi() + 2.0 * M_PI < 5.80)))) {
+        theStep->AddTotalEnergyDeposit(EnergyLoss / (0.2 * 0.2 * 0.2 * 0.2));
+      }  // Disc 5 TEC2TEC
+      // Disc 5
+      else if ((theStep->GetPreStepPoint()->GetPosition().z() > 1822.5 &&
+                theStep->GetPreStepPoint()->GetPosition().z() < 1942.5) ||
+               (theStep->GetPreStepPoint()->GetPosition().z() < -1822.5 &&
+                theStep->GetPreStepPoint()->GetPosition().z() > -1942.5)) {
+        theStep->AddTotalEnergyDeposit(EnergyLoss);
+      }  // Disc 5
+      // Disc 6
+      else if ((theStep->GetPreStepPoint()->GetPosition().z() > 1997.5 &&
+                theStep->GetPreStepPoint()->GetPosition().z() < 2117.5) ||
+               (theStep->GetPreStepPoint()->GetPosition().z() < -1997.5 &&
+                theStep->GetPreStepPoint()->GetPosition().z() > -2117.5)) {
+        theStep->AddTotalEnergyDeposit(EnergyLoss);
+      }  // Disc 6
+      // Disc 7
+      else if ((theStep->GetPreStepPoint()->GetPosition().z() > 2187.5 &&
+                theStep->GetPreStepPoint()->GetPosition().z() < 2307.5) ||
+               (theStep->GetPreStepPoint()->GetPosition().z() < -2187.5 &&
+                theStep->GetPreStepPoint()->GetPosition().z() > -2307.5)) {
+        theStep->AddTotalEnergyDeposit(EnergyLoss / (0.2));
+      }  // Disc 7
+      // Disc 8
+      else if ((theStep->GetPreStepPoint()->GetPosition().z() > 2392.5 &&
+                theStep->GetPreStepPoint()->GetPosition().z() < 2512.5) ||
+               (theStep->GetPreStepPoint()->GetPosition().z() < -2392.5 &&
+                theStep->GetPreStepPoint()->GetPosition().z() > -2512.5)) {
+        theStep->AddTotalEnergyDeposit(EnergyLoss / (0.2 * 0.2));
+      }  // Disc 8
+      // Disc 9
+      else if ((theStep->GetPreStepPoint()->GetPosition().z() > 2607.5 &&
+                theStep->GetPreStepPoint()->GetPosition().z() < 2727.5) ||
+               (theStep->GetPreStepPoint()->GetPosition().z() < -2607.5 &&
+                theStep->GetPreStepPoint()->GetPosition().z() > -2727.5)) {
+        theStep->AddTotalEnergyDeposit(EnergyLoss / (0.2 * 0.2 * 0.2));
+      }  // Disc 9
+      // Beams in Barrel
+      else if ((theStep->GetPreStepPoint()->GetPosition().z() > -870.0 &&
+                theStep->GetPreStepPoint()->GetPosition().z() < 1050.0) &&
+               (theStep->GetPreStepPoint()->GetPosition().perp() > 500.0 &&
+                theStep->GetPreStepPoint()->GetPosition().perp() < 630.0)) {
+        theStep->AddTotalEnergyDeposit(EnergyLoss / (0.2 * 0.2));
+      }  // Beams in the Barrel
+      else {
+        // apparently we are not in a detector which should be hit by a
+        // LaserBeam therefore set the EnergyDeposit to zero and do not create a
+        // SimHit
+        theStep->ResetTotalEnergyDeposit();
+      }
     }
+  }
+  // kill the photon if it goes through a module in the outer barrel detector.
+  // In practice on the back of a module is a thin layer of Aluminium that
+  // absorbs the photons, so hits will only be created in the first layer of the
+  // TOB. In the current geometry this Aluminium layer is not included. This
+  // should also avoid unwanted reflections (which then create hits in the TIB
+  // at the wrong positions)
+  else if (((theStep->GetPreStepPoint()->GetMaterial()->GetName() == "TOB_Wafer") &&
+            (theStep->GetPostStepPoint()->GetMaterial()->GetName() == "Air"))) {
+    LogDebug("LaserAlignmentSimulationStepping") << " AC1CMS: stepping aborted! ";
+    theTrack->SetTrackStatus(fStopAndKill);
+  } else if ((theStep->GetPreStepPoint()->GetPosition().z() > -870.0 &&
+              theStep->GetPreStepPoint()->GetPosition().z() < 1050.0) &&
+             (theStep->GetPreStepPoint()->GetPosition().perp() > 630.0)) {
+    LogDebug("LaserAlignmentSimulationStepping") << " AC1CMS: stepping aborted! ";
+    theTrack->SetTrackStatus(fStopAndKill);
+  }
+  // do the same for photons that a) go through a module in the inner barrel
+  // detector or b) are reflected at the surface of a TIB module. The photons in
+  // case b) can create hits in the TOB at the wrong z positions :-(
+  else if (((theStep->GetPreStepPoint()->GetMaterial()->GetName() == "TIB_Wafer") &&
+            (theStep->GetPostStepPoint()->GetMaterial()->GetName() == "Air"))) {
+    LogDebug("LaserAlignmentSimulationStepping") << " AC1CMS: stepping aborted! ";
+    theTrack->SetTrackStatus(fStopAndKill);
+  } else if ((theStep->GetPreStepPoint()->GetPosition().z() > -870.0 &&
+              theStep->GetPreStepPoint()->GetPosition().z() < 1050.0) &&
+             (theStep->GetPreStepPoint()->GetPosition().perp() < 500.0)) {
+    LogDebug("LaserAlignmentSimulationStepping") << " AC1CMS: stepping aborted! ";
+    theTrack->SetTrackStatus(fStopAndKill);
+  }
+  // avoid reflections at Disc 1 of TEC- which enter again the Barrel Volume.
+  // These Photons create hits at the wrong positions in TIB and TOB
+  else if ((((theStep->GetPreStepPoint()->GetMaterial()->GetName() == "TEC_Wafer") &&
+             (theStep->GetPostStepPoint()->GetMaterial()->GetName() == "T_Air")) ||
+            ((theStep->GetPreStepPoint()->GetMaterial()->GetName() == "TEC_Wafer") &&
+             (theStep->GetPostStepPoint()->GetMaterial()->GetName() == "Air"))) &&
+           (theStep->GetPreStepPoint()->GetMomentum().z() != theStep->GetPostStepPoint()->GetMomentum().z()) &&
+           (theStep->GetPostStepPoint()->GetPosition().z() == -1137.25)) {
+    LogDebug("LaserAlignmentSimulationStepping") << " AC1CMS: stepping aborted! photon in wrong direction";
+    theTrack->SetTrackStatus(fStopAndKill);
+  }
+  // kill photons in the barrel which go in the wrong (i.e. +z) direction; they
+  // create unwanted hits due to reflections ...
+  else if ((theStep->GetPostStepPoint()->GetPosition().z() > -1100.0) &&
+           (theStep->GetPostStepPoint()->GetPosition().z() < 1100.0) &&
+           (theStep->GetPostStepPoint()->GetMomentumDirection().z() > 0.8)) {
+    LogDebug("LaserAlignmentSimulationStepping") << " AC1CMS: stepping aborted! photon in wrong direction";
+    theTrack->SetTrackStatus(fStopAndKill);
+  } else {
+    LogDebug("LaserAlignmentSimulationStepping") << " AC1CMS: stepping continuous ... ";
+  }
   // ***********************************************************************************************************
 
-
   // check if it is alive
-  if ( theTrack->GetTrackStatus() != fAlive ) 
-    {
-      LogDebug("LaserAlignmentSimulationStepping") << "<LaserSteppingAction::UserSteppingAction(const G4Step *)>: Track is not alive! -> return ";
-      return; 
-    }
-  
+  if (theTrack->GetTrackStatus() != fAlive) {
+    LogDebug("LaserAlignmentSimulationStepping") << "<LaserSteppingAction::UserSteppingAction(const G4Step *)>: Track "
+                                                    "is not alive! -> return ";
+    return;
+  }
+
   // check if it is a primary
-  if ( theTrack->GetParentID() != 0 ) 
-    { 
-      LogDebug("LaserAlignmentSimulationStepping") << "<LaserSteppingAction::UserSteppingAction(const G4Step *)>: Track is not a primary! -> return ";
-      return; 
-    }
+  if (theTrack->GetParentID() != 0) {
+    LogDebug("LaserAlignmentSimulationStepping") << "<LaserSteppingAction::UserSteppingAction(const G4Step *)>: Track "
+                                                    "is not a primary! -> return ";
+    return;
+  }
 
   // check if it is a optical photon
-  if ( theDebugLevel >= 4 )
-    {
-      G4ParticleDefinition * theOpticalType = theTrack->GetDefinition();
-      if ( theOpticalType == G4OpticalPhoton::OpticalPhotonDefinition() )
-	{ 
-	  LogDebug("LaserAlignmentSimulationStepping") << "<LaserSteppingAction::UserSteppingAction(const G4Step *)>: Optical Photon found! ";
-	}
+  if (theDebugLevel >= 4) {
+    G4ParticleDefinition *theOpticalType = theTrack->GetDefinition();
+    if (theOpticalType == G4OpticalPhoton::OpticalPhotonDefinition()) {
+      LogDebug("LaserAlignmentSimulationStepping") << "<LaserSteppingAction::UserSteppingAction(const G4Step *)>: "
+                                                      "Optical Photon found! ";
+    }
 
-      // check in which volume it is
+    // check in which volume it is
 #ifdef EDM_ML_DEBUG
-      G4StepPoint * thePreStepPoint = theStep->GetPreStepPoint();
-      G4VPhysicalVolume * thePreStepPhysicalVolume = thePreStepPoint->GetPhysicalVolume();
-      G4String thePreStepPhysicalVolumeName = thePreStepPhysicalVolume->GetName();
-      G4Material * thePreStepMaterial = thePreStepPoint->GetMaterial();
-      
-      LogDebug("LaserAlignmentSimulationStepping") << "<LaserSteppingAction::UserSteppingAction(const G4Step *)>: the PreStep Position = " << thePreStepPoint->GetPosition()
-					    << "\n<LaserSteppingAction::UserSteppingAction(const G4Step *)>: the PreStep Physical Volume = " << thePreStepPhysicalVolumeName
-					    << "\n<LaserSteppingAction::UserSteppingAction(const G4Step *)>: the PreStep Material =" << thePreStepMaterial->GetName();
+    G4StepPoint *thePreStepPoint = theStep->GetPreStepPoint();
+    G4VPhysicalVolume *thePreStepPhysicalVolume = thePreStepPoint->GetPhysicalVolume();
+    G4String thePreStepPhysicalVolumeName = thePreStepPhysicalVolume->GetName();
+    G4Material *thePreStepMaterial = thePreStepPoint->GetMaterial();
+
+    LogDebug("LaserAlignmentSimulationStepping") << "<LaserSteppingAction::UserSteppingAction(const G4Step *)>: the "
+                                                    "PreStep Position = "
+                                                 << thePreStepPoint->GetPosition()
+                                                 << "\n<LaserSteppingAction::UserSteppingAction(const G4Step *)>: the "
+                                                    "PreStep Physical Volume = "
+                                                 << thePreStepPhysicalVolumeName
+                                                 << "\n<LaserSteppingAction::UserSteppingAction(const G4Step *)>: the "
+                                                    "PreStep Material ="
+                                                 << thePreStepMaterial->GetName();
 
-      G4StepPoint * thePostStepPoint = theStep->GetPostStepPoint();
-      G4VPhysicalVolume * thePostStepPhysicalVolume = thePostStepPoint->GetPhysicalVolume();
-      G4String thePostStepPhysicalVolumeName = thePostStepPhysicalVolume->GetName();
-      G4Material * thePostStepMaterial = thePostStepPoint->GetMaterial();
-      
-      LogDebug("LaserAlignmentSimulationStepping") << "<LaserSteppingAction::UserSteppingAction(const G4Step *)>: the PostStep Position = " << thePostStepPoint->GetPosition()
-					    << "\n<LaserSteppingAction::UserSteppingAction(const G4Step *)>: the PostStep Physical Volume = " << thePostStepPhysicalVolumeName
-					    << "\n<LaserSteppingAction::UserSteppingAction(const G4Step *)>: the PostStep Material = " << thePostStepMaterial->GetName();
+    G4StepPoint *thePostStepPoint = theStep->GetPostStepPoint();
+    G4VPhysicalVolume *thePostStepPhysicalVolume = thePostStepPoint->GetPhysicalVolume();
+    G4String thePostStepPhysicalVolumeName = thePostStepPhysicalVolume->GetName();
+    G4Material *thePostStepMaterial = thePostStepPoint->GetMaterial();
+
+    LogDebug("LaserAlignmentSimulationStepping") << "<LaserSteppingAction::UserSteppingAction(const G4Step *)>: the "
+                                                    "PostStep Position = "
+                                                 << thePostStepPoint->GetPosition()
+                                                 << "\n<LaserSteppingAction::UserSteppingAction(const G4Step *)>: the "
+                                                    "PostStep Physical Volume = "
+                                                 << thePostStepPhysicalVolumeName
+                                                 << "\n<LaserSteppingAction::UserSteppingAction(const G4Step *)>: the "
+                                                    "PostStep Material = "
+                                                 << thePostStepMaterial->GetName();
 #endif
-    }
+  }
 }
diff --git a/Alignment/LaserAlignmentSimulation/src/LaserSteppingVerbose.cc b/Alignment/LaserAlignmentSimulation/src/LaserSteppingVerbose.cc
index 63f3d34111888..32b1ca09cde2d 100644
--- a/Alignment/LaserAlignmentSimulation/src/LaserSteppingVerbose.cc
+++ b/Alignment/LaserAlignmentSimulation/src/LaserSteppingVerbose.cc
@@ -1,5 +1,5 @@
 /** \file LaserSteppingVerbose.cc
- *  
+ *
  *
  *  $Date: 2007/03/20 12:01:01 $
  *  $Revision: 1.2 $
@@ -9,151 +9,119 @@
 #include "Alignment/LaserAlignmentSimulation/interface/LaserSteppingVerbose.h"
 #include "G4UnitsTable.hh"
 
-LaserSteppingVerbose::LaserSteppingVerbose()
-{
-}
+LaserSteppingVerbose::LaserSteppingVerbose() {}
 
-LaserSteppingVerbose::~LaserSteppingVerbose()
-{
-}
+LaserSteppingVerbose::~LaserSteppingVerbose() {}
 
-void LaserSteppingVerbose::StepInfo()
-{
-  //  G4cout << "<LaserSteppingVerbose::StepInfo()>: verboseLevel = " << verboseLevel << endl;
+void LaserSteppingVerbose::StepInfo() {
+  //  G4cout << "<LaserSteppingVerbose::StepInfo()>: verboseLevel = " <<
+  //  verboseLevel << endl;
 
   CopyState();
 
   G4int precision = G4cout.precision(3);
 
-  if ( verboseLevel >= 1 )
-    {
-      if ( verboseLevel >= 4 ) VerboseTrack();
-      if ( verboseLevel >= 3 )
-	{
-	  G4cout << G4endl;
-	  G4cout << std::setw( 5) << "#Step#"      << " "
-		 << std::setw( 6) << "X"           << "   "
-		 << std::setw( 6) << "Y"           << "   "
-		 << std::setw( 6) << "Z"           << "   "
-		 << std::setw( 9) << "KineE"       << "   "
-		 << std::setw( 9) << "dEStep"      << "   "
-		 << std::setw(10) << "StepLength"  << " "
-		 << std::setw(10) << "TrackLength" << " "
-		 << std::setw(10) << "Volume"      << " "
-		 << std::setw(10) << "Process"     << G4endl;
-
-	  G4cout << std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
-		 << std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
-		 << std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
-		 << std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
-		 << std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
-		 << std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
-		 << std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
-		 << std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length")
-		 << " ";
-
-	  if ( fTrack->GetNextVolume() != nullptr )
-	    {
-	      G4cout << std::setw(10) << fTrack->GetVolume()->GetName();
-	    }
-	  else
-	    {
-	      G4cout << std::setw(10) << "OutOfWorld";
-	    }
-
-	  if ( fStep->GetPostStepPoint()->GetProcessDefinedStep() != nullptr )
-	    {
-	      G4cout << " " << std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()
-		->GetProcessName();
-	    }
-	  else
-	    {
-	      G4cout << "    UserLimit";
-	    }
-
-	  G4cout << G4endl;
-
-	  if ( verboseLevel == 2 )
-	    {
-	      // total number of secondaries
-	      G4int tN2ndariesTot = fN2ndariesAtRestDoIt +
-		fN2ndariesAlongStepDoIt + fN2ndariesPostStepDoIt;
-
-	      if ( tN2ndariesTot > 0 ) 
-		{
-		  G4cout << "   :---- List of Secondaries - "
-			 << "#SpawnInStep = " << std::setw(3) << tN2ndariesTot
-			 << "(Rest = " << std::setw(2) << fN2ndariesAtRestDoIt
-			 << ", Along = " << std::setw(2) << fN2ndariesAlongStepDoIt
-			 << ", Post = " << std::setw(2) << fN2ndariesPostStepDoIt
-			 << "), "
-			 << "#SpawnTotal = " << std::setw(3) << (*fSecondary).size()
-			 << " --------- " << G4endl;
-
-		  for ( size_t lp1 = (*fSecondary).size() - tN2ndariesTot; lp1 < (*fSecondary).size(); lp1++)
-		    {
-		      G4cout << "   : " 
-			     << std::setw(6) 
-			     << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(),"Length")
-			     << std::setw(6)
-			     << G4BestUnit((*fSecondary)[lp1]->GetPosition().y(),"Length")
-			     << std::setw(6)
-			     << G4BestUnit((*fSecondary)[lp1]->GetPosition().z(),"Length")
-			     << std::setw(6)
-			     << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy(),"Energy")
-			     << std::setw(10)
-			     << (*fSecondary)[lp1]->GetDefinition()->GetParticleName();
-		      G4cout << G4endl;
-		    }
-
-		  G4cout << "   :----------------------"
-			 << "--------------------------"
-			 << "-- End of Secondaries Info --------------------------------- "
-			 << G4endl;
-		}
-	    }
-	}
+  if (verboseLevel >= 1) {
+    if (verboseLevel >= 4)
+      VerboseTrack();
+    if (verboseLevel >= 3) {
+      G4cout << G4endl;
+      G4cout << std::setw(5) << "#Step#"
+             << " " << std::setw(6) << "X"
+             << "   " << std::setw(6) << "Y"
+             << "   " << std::setw(6) << "Z"
+             << "   " << std::setw(9) << "KineE"
+             << "   " << std::setw(9) << "dEStep"
+             << "   " << std::setw(10) << "StepLength"
+             << " " << std::setw(10) << "TrackLength"
+             << " " << std::setw(10) << "Volume"
+             << " " << std::setw(10) << "Process" << G4endl;
+
+      G4cout << std::setw(5) << fTrack->GetCurrentStepNumber() << " " << std::setw(6)
+             << G4BestUnit(fTrack->GetPosition().x(), "Length") << std::setw(6)
+             << G4BestUnit(fTrack->GetPosition().y(), "Length") << std::setw(6)
+             << G4BestUnit(fTrack->GetPosition().z(), "Length") << std::setw(6)
+             << G4BestUnit(fTrack->GetKineticEnergy(), "Energy") << std::setw(6)
+             << G4BestUnit(fStep->GetTotalEnergyDeposit(), "Energy") << std::setw(6)
+             << G4BestUnit(fStep->GetStepLength(), "Length") << std::setw(6)
+             << G4BestUnit(fTrack->GetTrackLength(), "Length") << " ";
+
+      if (fTrack->GetNextVolume() != nullptr) {
+        G4cout << std::setw(10) << fTrack->GetVolume()->GetName();
+      } else {
+        G4cout << std::setw(10) << "OutOfWorld";
+      }
+
+      if (fStep->GetPostStepPoint()->GetProcessDefinedStep() != nullptr) {
+        G4cout << " " << std::setw(10) << fStep->GetPostStepPoint()->GetProcessDefinedStep()->GetProcessName();
+      } else {
+        G4cout << "    UserLimit";
+      }
+
+      G4cout << G4endl;
+
+      if (verboseLevel == 2) {
+        // total number of secondaries
+        G4int tN2ndariesTot = fN2ndariesAtRestDoIt + fN2ndariesAlongStepDoIt + fN2ndariesPostStepDoIt;
+
+        if (tN2ndariesTot > 0) {
+          G4cout << "   :---- List of Secondaries - "
+                 << "#SpawnInStep = " << std::setw(3) << tN2ndariesTot << "(Rest = " << std::setw(2)
+                 << fN2ndariesAtRestDoIt << ", Along = " << std::setw(2) << fN2ndariesAlongStepDoIt
+                 << ", Post = " << std::setw(2) << fN2ndariesPostStepDoIt << "), "
+                 << "#SpawnTotal = " << std::setw(3) << (*fSecondary).size() << " --------- " << G4endl;
+
+          for (size_t lp1 = (*fSecondary).size() - tN2ndariesTot; lp1 < (*fSecondary).size(); lp1++) {
+            G4cout << "   : " << std::setw(6) << G4BestUnit((*fSecondary)[lp1]->GetPosition().x(), "Length")
+                   << std::setw(6) << G4BestUnit((*fSecondary)[lp1]->GetPosition().y(), "Length") << std::setw(6)
+                   << G4BestUnit((*fSecondary)[lp1]->GetPosition().z(), "Length") << std::setw(6)
+                   << G4BestUnit((*fSecondary)[lp1]->GetKineticEnergy(), "Energy") << std::setw(10)
+                   << (*fSecondary)[lp1]->GetDefinition()->GetParticleName();
+            G4cout << G4endl;
+          }
+
+          G4cout << "   :----------------------"
+                 << "--------------------------"
+                 << "-- End of Secondaries Info --------------------------------- " << G4endl;
+        }
+      }
     }
+  }
   G4cout.precision(precision);
 }
 
-void LaserSteppingVerbose::TrackingStarted()
-{
+void LaserSteppingVerbose::TrackingStarted() {
   CopyState();
-  
+
   G4int precision = G4cout.precision(3);
-  if ( verboseLevel > 0 )
-    {
-      G4cout << std::setw( 5) << "Step#"       << " " 
-	     << std::setw( 6) << "X"           << "     "
-	     << std::setw( 6) << "Y"           << "     "
-	     << std::setw( 6) << "Z"           << "     "
-	     << std::setw( 9) << "KineE"       << " "
-	     << std::setw( 9) << "dEStep"      << " "
-	     << std::setw(10) << "StepLength"  << " "
-	     << std::setw(10) << "TrackLength" << " "
-	     << std::setw(10) << "Volume"      << "  "
-	     << std::setw(10) << "Process "    << G4endl;
-      
-      G4cout << std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
-	     << std::setw( 6) << G4BestUnit(fTrack->GetPosition().x(),"Length")
-	     << std::setw( 6) << G4BestUnit(fTrack->GetPosition().y(),"Length")
-	     << std::setw( 6) << G4BestUnit(fTrack->GetPosition().z(),"Length")
-	     << std::setw( 6) << G4BestUnit(fTrack->GetKineticEnergy(),"Energy")
-	     << std::setw( 6) << G4BestUnit(fStep->GetTotalEnergyDeposit(),"Energy")
-	     << std::setw( 6) << G4BestUnit(fStep->GetStepLength(),"Length")
-	     << std::setw( 6) << G4BestUnit(fTrack->GetTrackLength(),"Length") << "   ";
-      
-      if (fTrack->GetNextVolume() != nullptr)
-	{
-	  G4cout << std::setw(10) << fTrack->GetVolume()->GetName();
-	}
-      else
-	{
-	  G4cout << "OutOfWorld";
-	}
-      
-      G4cout << "     initStep" << G4endl;
+  if (verboseLevel > 0) {
+    G4cout << std::setw(5) << "Step#"
+           << " " << std::setw(6) << "X"
+           << "     " << std::setw(6) << "Y"
+           << "     " << std::setw(6) << "Z"
+           << "     " << std::setw(9) << "KineE"
+           << " " << std::setw(9) << "dEStep"
+           << " " << std::setw(10) << "StepLength"
+           << " " << std::setw(10) << "TrackLength"
+           << " " << std::setw(10) << "Volume"
+           << "  " << std::setw(10) << "Process " << G4endl;
+
+    G4cout << std::setw(5) << fTrack->GetCurrentStepNumber() << " " << std::setw(6)
+           << G4BestUnit(fTrack->GetPosition().x(), "Length") << std::setw(6)
+           << G4BestUnit(fTrack->GetPosition().y(), "Length") << std::setw(6)
+           << G4BestUnit(fTrack->GetPosition().z(), "Length") << std::setw(6)
+           << G4BestUnit(fTrack->GetKineticEnergy(), "Energy") << std::setw(6)
+           << G4BestUnit(fStep->GetTotalEnergyDeposit(), "Energy") << std::setw(6)
+           << G4BestUnit(fStep->GetStepLength(), "Length") << std::setw(6)
+           << G4BestUnit(fTrack->GetTrackLength(), "Length") << "   ";
+
+    if (fTrack->GetNextVolume() != nullptr) {
+      G4cout << std::setw(10) << fTrack->GetVolume()->GetName();
+    } else {
+      G4cout << "OutOfWorld";
     }
+
+    G4cout << "     initStep" << G4endl;
+  }
   G4cout.precision(precision);
 }
diff --git a/Alignment/LaserAlignmentSimulation/src/LaserTrackingAction.cc b/Alignment/LaserAlignmentSimulation/src/LaserTrackingAction.cc
index 6447436902af6..c17f4e4bba607 100644
--- a/Alignment/LaserAlignmentSimulation/src/LaserTrackingAction.cc
+++ b/Alignment/LaserAlignmentSimulation/src/LaserTrackingAction.cc
@@ -1,5 +1,5 @@
 /** \file LaserTrackingAction.cc
- *  
+ *
  *
  *  $Date: Mon Mar 19 12:21:52 CET 2007 $
  *  $Revision: 1.1 $
@@ -8,29 +8,23 @@
 
 #include "Alignment/LaserAlignmentSimulation/interface/LaserTrackingAction.h"
 
-LaserTrackingAction::LaserTrackingAction(edm::ParameterSet const& theConf) 
-{
-}
+LaserTrackingAction::LaserTrackingAction(edm::ParameterSet const &theConf) {}
 
-LaserTrackingAction::~LaserTrackingAction()
-{
-}
+LaserTrackingAction::~LaserTrackingAction() {}
 
-void LaserTrackingAction::PreUserTrackingAction(const G4Track * theTrack)
-{
+void LaserTrackingAction::PreUserTrackingAction(const G4Track *theTrack) {
   /* *********************************************************************** */
   /* This code is called every time a new Track is created                   */
   /* *********************************************************************** */
 
-   if ( theTrack->GetParentID()==0 )
-     { fpTrackingManager->SetStoreTrajectory(true); }
-   else
-     { fpTrackingManager->SetStoreTrajectory(true); }
-
+  if (theTrack->GetParentID() == 0) {
+    fpTrackingManager->SetStoreTrajectory(true);
+  } else {
+    fpTrackingManager->SetStoreTrajectory(true);
+  }
 }
 
-void LaserTrackingAction::PostUserTrackingAction(const G4Track * theTrack)
-{
+void LaserTrackingAction::PostUserTrackingAction(const G4Track *theTrack) {
   /* *********************************************************************** */
   /* This code is called every time a new Track is destroyed                 */
   /* *********************************************************************** */
diff --git a/Alignment/LaserAlignmentSimulation/src/MaterialProperties.cc b/Alignment/LaserAlignmentSimulation/src/MaterialProperties.cc
index 522e819cad4bf..626b887f6250f 100644
--- a/Alignment/LaserAlignmentSimulation/src/MaterialProperties.cc
+++ b/Alignment/LaserAlignmentSimulation/src/MaterialProperties.cc
@@ -1,5 +1,5 @@
 /** \file MaterialProperties.cc
- *  
+ *
  *
  *  $Date: 2007/06/11 14:44:29 $
  *  $Revision: 1.3 $
@@ -7,442 +7,407 @@
  */
 
 #include "Alignment/LaserAlignmentSimulation/interface/MaterialProperties.h"
-#include "G4LogicalVolumeStore.hh" 
+#include "G4LogicalVolumeStore.hh"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "G4SystemOfUnits.hh"
 
-	MaterialProperties::MaterialProperties(int DebugLevel, double SiAbsLengthScale) 
-	: theMaterialTable(), theMPDebugLevel(0), 
-	theSiAbsLengthScalingFactor(0),
-	theMPT(),
-	theTECWafer(), theTOBWafer(), theTIBWafer()
-{
-	theMPDebugLevel = DebugLevel;
-	theSiAbsLengthScalingFactor = SiAbsLengthScale;
-	/* *********************************************************************** */
-	/* 
-	define the materials for the sensitive detectors in TEC, TIB and TOB
-		we need this to specify different properties for Barrel and Endcap
-		detectors, which is by default no longer possible in CMSSW due to
-		the fact that all modules are made out of the same G4Material 
-	*/
-	/* *********************************************************************** */
-		G4double theDensity = 2.33*g/cm3;
-	G4double theAtomicWeight = 28.09*g/mole;
-	G4double theAtomicNumber = 14.0;
-
-	theTECWafer = new G4Material("TEC_Wafer", theAtomicNumber, theAtomicWeight, theDensity);
-	theTOBWafer = new G4Material("TOB_Wafer", theAtomicNumber, theAtomicWeight, theDensity);
-	theTIBWafer = new G4Material("TIB_Wafer", theAtomicNumber, theAtomicWeight, theDensity);
-
-	// set the properties of the materials
-	setMaterialProperties();
+MaterialProperties::MaterialProperties(int DebugLevel, double SiAbsLengthScale)
+    : theMaterialTable(),
+      theMPDebugLevel(0),
+      theSiAbsLengthScalingFactor(0),
+      theMPT(),
+      theTECWafer(),
+      theTOBWafer(),
+      theTIBWafer() {
+  theMPDebugLevel = DebugLevel;
+  theSiAbsLengthScalingFactor = SiAbsLengthScale;
+  /* *********************************************************************** */
+  /*
+  define the materials for the sensitive detectors in TEC, TIB and TOB
+          we need this to specify different properties for Barrel and Endcap
+          detectors, which is by default no longer possible in CMSSW due to
+          the fact that all modules are made out of the same G4Material
+  */
+  /* *********************************************************************** */
+  G4double theDensity = 2.33 * g / cm3;
+  G4double theAtomicWeight = 28.09 * g / mole;
+  G4double theAtomicNumber = 14.0;
+
+  theTECWafer = new G4Material("TEC_Wafer", theAtomicNumber, theAtomicWeight, theDensity);
+  theTOBWafer = new G4Material("TOB_Wafer", theAtomicNumber, theAtomicWeight, theDensity);
+  theTIBWafer = new G4Material("TIB_Wafer", theAtomicNumber, theAtomicWeight, theDensity);
+
+  // set the properties of the materials
+  setMaterialProperties();
 }
 
-MaterialProperties::~MaterialProperties()
-{
-	if ( theMPT != nullptr )                  { delete theMPT; }
-	if ( theTECWafer != nullptr )             { delete theTECWafer; }
-	if ( theTOBWafer != nullptr )             { delete theTOBWafer; }
-	if ( theTIBWafer != nullptr )             { delete theTIBWafer; }
+MaterialProperties::~MaterialProperties() {
+  if (theMPT != nullptr) {
+    delete theMPT;
+  }
+  if (theTECWafer != nullptr) {
+    delete theTECWafer;
+  }
+  if (theTOBWafer != nullptr) {
+    delete theTOBWafer;
+  }
+  if (theTIBWafer != nullptr) {
+    delete theTIBWafer;
+  }
 }
 
-
-void MaterialProperties::setMaterialProperties()
-{
-	/* *********************************************************************** */
-	/* 
-	use this function to define material properties (like refraction
-		index, absorptionlenght and so on) and add them to the 
-		MaterialPropertiesTable. Finally set the MPT to a give Material.
-	*/
-	/* *********************************************************************** */
-
-	// get the MaterialTable as it is defined in OSCAR (CMSSW now)
-		theMaterialTable = G4Material::GetMaterialTable();
-
-	/* *********************************************************************** */
-	/*
-	with the following code one can access the MaterialTable defined in
-		OSCAR. This contains all the materials needed for the CMS detector,
-		which are defined in the Geometry and DDD packages. COBRA takes care 
-		of the proper conversion between a DDMaterial and a G4Material.
-	*/
-	/* *********************************************************************** */
-
-//   if (theMPDebugLevel > 1)
-//     {
-			// print the materialtable
-		LogDebug("SimLaserAlignment:MaterialProperties") << " **** here comes the material table **** "
-		<< *(G4Material::GetMaterialTable());
-//     }
-
-	// define the MateriapropertiesTable for the Sensitive Regions in the Tracker
-	// TOB_Wafer, TOB_Silicon, TID_Wafer, TIB_Wafer and TEC_Wafer
-
-	const G4int nEntries = 3;
-
-	// Photon energies
-	G4double PhotonEnergy[nEntries] = { 1.10 * eV, 1.15 * eV, 1.20 * eV };
-
-	// scintillation
-	G4double Scintillation[nEntries] = { 0.1, 1.0, 0.1 };
-
-	// Refractive Index
-	G4double RefractiveIndex[nEntries] = { 3.5400, 3.5425, 3.5450 };
-	// Refractive Index of the Mirrors (BK7)
-	G4double RefractiveIndexMirror[nEntries] = { 1.50669, 1.50669, 1.50669 };
-
-	/* *********************************************************************** */
-	/*  set the refractive index for the other materials to 1.0. This is       *
-	*  needed to propagate the optical photons through the detector according *
-		*  to Peter Gumplinger.                                                   */
-	/* *********************************************************************** */
-		G4double RefractiveIndexGeneral[nEntries] = { 1.0, 1.0, 1.0 };
-
-	// Absorption Length
-	// G4double AbsorptionLengthSi[nEntries] = { 198.8 * micrometer, 198.8 * micrometer, 198.8 * micrometer }; ///////////////////////////////////
-	G4double AbsorptionLengthSi[nEntries] = { 1136 * micrometer, 1136 * micrometer, 1136 * micrometer };
-
-	G4double AbsorptionLengthSiBarrel[nEntries] = { 0.1 * fermi, 
-		0.1 * fermi, 
-		0.1 * fermi };
-
-
-	// Absorption length of the mirrors
-	G4double AbsorptionLengthMirror[nEntries] = { 11.7 * cm, 0.5 * 11.7 * cm, 11.7 * cm };
-
-	// Absorption Length for dead material in the tracker; set to small values
-	// to kill the optical photons outside the TEC. Maybe this is later a problem
-	// when implementing Ray 1 to connect both TECs which eachother and with TIB
-	// and TOB!??
-	G4double AbsorptionLengthDead[nEntries] = { 0.001 * micrometer, 0.001 * micrometer,
-		0.001 * micrometer };
-
-	// Absorption Length of the other Materials in the Tracker
-	G4double AbsorptionLengthGeneral[nEntries] = { 75 * cm, 75 * cm, 75 * cm };
-
-	// Absorption Length of the Air in the Tracker
-	G4double AbsorptionLengthTAir[nEntries] = { 10 * m, 1.8 * m, 10 * m };
-
-	G4double AbsorptionLengthAl[nEntries] = { 10 * mm, 10 * mm, 10 * mm};
-	G4double AbsorptionLengthTOB_CF_Str[nEntries] = { 1 * cm, 10 * cm, 1 * cm };
-	G4double AbsorptionLengthTOBCF[nEntries] = { 0.1 * mm, 20 * mm, 0.1 * mm };
-	G4double AbsorptionLengthTIBCF[nEntries] = { 15.0 * cm, 15.0 * cm, 15.0 * cm };
-
-	// Reflectivity of the modules
-	G4double SiReflectivity[nEntries] = { 0.0, 0.0, 0.0 };
-
-	// Efficiency of the modules
-	G4double TECEfficiency[nEntries] = { 0.9, 0.9, 0.9 };
-	G4double BarrelEfficiency[nEntries] = { 1.0, 1.0, 1.0 };
-
-	// Reflectivity of the mirrors in the Alignment Tubes
-	G4double Reflectivity[nEntries] = { 0.05, 0.05, 0.05 };
-
-	/* *********************************************************************** */
-
-	/* *********************************************************************** */
-	/* 
-	define the materials for the sensitive detectors in TEC, TIB and TOB
-		we need this to specify different properties for Barrel and Endcap
-		detectors, which is by default no longer possible in CMSSW due to
-		the fact that all modules are made out of the same G4Material 
-	*/
-	/* *********************************************************************** */
-
-	// set the options for the materials 
-	{
-		for(G4MaterialTable::const_iterator theMTEntry = theMaterialTable->begin();
-		theMTEntry != theMaterialTable->end(); theMTEntry++) 
-		{
-			if(*theMTEntry)
-			{
-				G4Material * theMaterial = const_cast<G4Material*>(*theMTEntry);
-
-				if (theMaterial->GetMaterialPropertiesTable())
-				{ 
-					theMPT = theMaterial->GetMaterialPropertiesTable(); 
-				}
-				else
-				{ 
-					theMPT = new G4MaterialPropertiesTable; 
-				}
-
-			// properties of the TEC_Wafer
-				if ( theMaterial->GetName() == "TEC_Wafer" )
-				{
-					theMPT->AddProperty("FASTCOMPONENT", PhotonEnergy, Scintillation, nEntries);
-					theMPT->AddProperty("SLOWCOMPONENT", PhotonEnergy, Scintillation, nEntries);
-					theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndex, nEntries);
-					theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthSi, nEntries);
-					theMPT->AddProperty("EFFICIENCY", PhotonEnergy, TECEfficiency, nEntries);
-
-					theMPT->AddConstProperty("SCINTILLATIONYIELD", 12000.0/MeV);
-					theMPT->AddConstProperty("RESOLTUIONSCALE", 1.0);
-					theMPT->AddConstProperty("FASTTIMECONSTANT", 20.0 * ns);
-					theMPT->AddConstProperty("SLOWTIMECONSTANT", 45.0 * ns);
-					theMPT->AddConstProperty("YIELDRATIO", 1.0);
-
-		// set the MaterialPropertiesTable
-					theMaterial->SetMaterialPropertiesTable(theMPT);
-				}
-
-			// properties of Silicon (used as Module Material in CMSSW)
-				else if ( theMaterial->GetName() == "Silicon" )
-				{
-					theMPT->AddProperty("FASTCOMPONENT", PhotonEnergy, Scintillation, nEntries);
-					theMPT->AddProperty("SLOWCOMPONENT", PhotonEnergy, Scintillation, nEntries);
-					theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndex, nEntries);
-					theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthSi, nEntries);
-					theMPT->AddProperty("EFFICIENCY", PhotonEnergy, TECEfficiency, nEntries);
-
-					theMPT->AddConstProperty("SCINTILLATIONYIELD", 12000.0/MeV);
-					theMPT->AddConstProperty("RESOLTUIONSCALE", 1.0);
-					theMPT->AddConstProperty("FASTTIMECONSTANT", 20.0 * ns);
-					theMPT->AddConstProperty("SLOWTIMECONSTANT", 45.0 * ns);
-					theMPT->AddConstProperty("YIELDRATIO", 1.0);
-
-		// set the MaterialPropertiesTable
-					theMaterial->SetMaterialPropertiesTable(theMPT);
-				}
-
-			// properties of the TOB_Wafer, TOB_Silicon, TIB_Wafer
-				else if ( ( theMaterial->GetName() == "TOB_Wafer" ) || 
-					( theMaterial->GetName() == "TIB_Wafer" ) )
-				{
-					theMPT->AddProperty("FASTCOMPONENT", PhotonEnergy, Scintillation, nEntries);
-					theMPT->AddProperty("SLOWCOMPONENT", PhotonEnergy, Scintillation, nEntries);
-					theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndex, nEntries);
-					theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthSiBarrel, nEntries);
-					theMPT->AddProperty("REFLECTIVITY", PhotonEnergy, SiReflectivity, nEntries);
-					theMPT->AddProperty("EFFICIENCY", PhotonEnergy, BarrelEfficiency, nEntries);
-
-					theMPT->AddConstProperty("SCINTILLATIONYIELD", 12000.0/MeV);
-					theMPT->AddConstProperty("RESOLTUIONSCALE", 1.0);
-					theMPT->AddConstProperty("FASTTIMECONSTANT", 20.0 * ns);
-					theMPT->AddConstProperty("SLOWTIMECONSTANT", 45.0 * ns);
-					theMPT->AddConstProperty("YIELDRATIO", 1.0);
-
-		// set the MaterialPropertiesTable
-					theMaterial->SetMaterialPropertiesTable(theMPT);
-				}
-
-			// properties of the TIB_ledge_side
-				else if ( theMaterial->GetName() == "TIB_ledge_side" )
-				{
-		// set the refractive index
-					theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndexGeneral, nEntries);
-					theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthGeneral, nEntries);
-
-		// set the MaterialPropertiesTable
-					theMaterial->SetMaterialPropertiesTable(theMPT);
-				}
-
-			// properties of air
-				else if ( ( theMaterial->GetName() == "T_Air" ) ||
-					( theMaterial->GetName() == "Air" ) )
-				{
-		// set the refractive index
-					theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndexGeneral, nEntries);
-		// set the reflectivity
-					theMPT->AddProperty("REFLECTIVITY", PhotonEnergy, SiReflectivity, nEntries);
-		// set the absorptionlength
-					theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthTAir, nEntries);
-
-		// set the MaterialPropertiesTable
-					theMaterial->SetMaterialPropertiesTable(theMPT);
-				}
-
-			// properties of some materials in the Barrel
-			// used to absorb photons to avoid hits in other TEC
-				else if ( ( theMaterial->GetName() == "TIB_connector" ) ||  
-					( theMaterial->GetName() == "TIB_cylinder" ) || 
-					( theMaterial->GetName() == "TID_Connector" ) )
-				{
-		// set the refractive index
-					theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndexGeneral, nEntries);
-		// set the reflectivity
-					theMPT->AddProperty("REFLECTIVITY", PhotonEnergy, SiReflectivity, nEntries);
-		// set the absorptionlength
-					theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthDead, nEntries);
-
-		// set the MaterialPropertiesTable
-					theMaterial->SetMaterialPropertiesTable(theMPT);
-				}
-
-			// properties of SiO2; used for the mirrors of the Alignment Tubes
-				else if ( theMaterial->GetName() == "Si O_2" )
-				{
-		// set the refractive index
-					theMPT->AddProperty("RINDEX", PhotonEnergy,RefractiveIndexMirror, nEntries);
-		//set the absorptionlength
-					theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthMirror, nEntries);
-		// set the reflectivity
-					theMPT->AddProperty("REFLECTIVITY",PhotonEnergy,Reflectivity, nEntries);
-
-		// set the MaterialPropertiesTable
-					theMaterial->SetMaterialPropertiesTable(theMPT);
-				}
-
-			// properties of Aluminium
-				else if ( ( theMaterial->GetName() == "TOB_Aluminium" ) || 
-					( theMaterial->GetName() == "Aluminium" ) )
-				{
-		// set the refractive index
-					theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndexGeneral, nEntries);
-		// set the reflectivity
-					theMPT->AddProperty("REFLECTIVITY", PhotonEnergy, SiReflectivity, nEntries);
-		// set the absorptionlength
-					theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthAl, nEntries);
-
-		// set the MaterialPropertiesTable
-					theMaterial->SetMaterialPropertiesTable(theMPT);
-				}
-
-			// properties of TOB_CF_Str
-				else if ( ( theMaterial->GetName() == "TOB_CF_Str" ) )
-				{
-		// set the refractive index
-					theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndexGeneral, nEntries);
-		// set the reflectivity
-					theMPT->AddProperty("REFLECTIVITY", PhotonEnergy, SiReflectivity, nEntries);
-		// set the absorptionlength
-					theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthTOB_CF_Str, nEntries);
-
-		// set the MaterialPropertiesTable
-					theMaterial->SetMaterialPropertiesTable(theMPT);
-				}
-
-			// some other Tracker materials
-				else if ( ( theMaterial->GetName() == "TID_CF" ) ||
-					( theMaterial->GetName() == "Nomex" ) || 
-					( theMaterial->GetName() == "TOB_Nomex" ) ||
-					( theMaterial->GetName() == "TID_Nomex" ) ||
-					( theMaterial->GetName() == "TOB_plate_C" ) ||
-					( theMaterial->GetName() == "TOB_rod" ) || 
-					( theMaterial->GetName() == "TOB_cool_DS" ) ||
-					( theMaterial->GetName() == "TOB_cool_SS" ) ||
-					( theMaterial->GetName() == "TID_in_cable" ) ||
-					( theMaterial->GetName() == "TOB_PA_rphi" ) ||
-					( theMaterial->GetName() == "TOB_frame_ele" ) ||
-					( theMaterial->GetName() == "TOB_PA_ster" ) ||
-					( theMaterial->GetName() == "TOB_ICB" ) ||
-					( theMaterial->GetName() == "TOB_CONN1" ) || 
-					( theMaterial->GetName() == "TOB_CONN2" ) || 
-					( theMaterial->GetName() == "TOB_CONN3" ) || 
-					( theMaterial->GetName() == "TOB_rail" ) ||
-					( theMaterial->GetName() == "TOB_sid_rail1" ) ||
-					( theMaterial->GetName() == "TOB_sid_rail2" ) )
-				{
-		// set the refractive index
-					theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndexGeneral, nEntries);
-		// set the reflectivity
-					theMPT->AddProperty("REFLECTIVITY", PhotonEnergy, SiReflectivity, nEntries);
-		// set the absorptionlength
-					theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthTOBCF, nEntries);
-
-		// set the MaterialPropertiesTable
-					theMaterial->SetMaterialPropertiesTable(theMPT);
-				}
-
-			// properties of some TIB materials
-				else if ( ( theMaterial->GetName() == "TIB_CF" ) || 
-					( theMaterial->GetName() == "TIB_cables_ax_out" ) ||
-					( theMaterial->GetName() == "TIB_outer_supp" ) ||
-					( theMaterial->GetName() == "TIB_PA_rphi" ) ||
-					( theMaterial->GetName() == "TIB_rail" ) ||
-					( theMaterial->GetName() == "TIB_sid_rail1" ) ||
-					( theMaterial->GetName() == "TIB_sid_rail2" ) ||
-					( theMaterial->GetName() == "TIB_mod_cool" ) )
-				{
-		// set the refractive index
-					theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndexGeneral, nEntries);
-		// set the reflectivity
-					theMPT->AddProperty("REFLECTIVITY", PhotonEnergy, SiReflectivity, nEntries);
-		// set the absorptionlength
-					theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthTIBCF, nEntries);
-
-		// set the MaterialPropertiesTable
-					theMaterial->SetMaterialPropertiesTable(theMPT);
-				}
-
-			// properties of all other materials in the detector
-				else
-				{
-		// set the refractive index
-					theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndexGeneral, nEntries);
-		// set the absorptionlength
-					theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthGeneral, nEntries);
-
-		// set the MaterialPropertiesTable
-					theMaterial->SetMaterialPropertiesTable(theMPT);
-				}
-
-			}
-		}
-	}
-
-	// loop over the logical volumes and set the material for the sensitive detectors
-		const G4LogicalVolumeStore * theLogicalVolumeStore = G4LogicalVolumeStore::GetInstance();
-	std::vector<G4LogicalVolume*>::const_iterator theLogicalVolume;
-
-	for ( theLogicalVolume = theLogicalVolumeStore->begin(); theLogicalVolume != theLogicalVolumeStore->end(); theLogicalVolume++ )
-	{
-		if ( ( (*theLogicalVolume)->GetName() == "TECModule0StereoActive" ) ||
-			( (*theLogicalVolume)->GetName() == "TECModule0RphiActive" ) ||
-			( (*theLogicalVolume)->GetName() == "TECModule1StereoActive" ) ||
-			( (*theLogicalVolume)->GetName() == "TECModule1RphiActive" ) ||
-			( (*theLogicalVolume)->GetName() == "TECModule2RphiActive" ) ||
-			( (*theLogicalVolume)->GetName() == "TECModule3RphiActive" ) ||
-			( (*theLogicalVolume)->GetName() == "TECModule4StereoActive" ) ||
-			( (*theLogicalVolume)->GetName() == "TECModule4RphiActive" ) ||
-			( (*theLogicalVolume)->GetName() == "TECModule5RphiActive" ) ||
-			( (*theLogicalVolume)->GetName() == "TECModule6RphiActive" ) )
-		{
-		// set the material
-			(*theLogicalVolume)->SetMaterial(theTECWafer);
-
-			if (theMPDebugLevel > 2)
-			{
-				std::cout << "  AC1CMS: found a logical volume: " << (*theLogicalVolume)->GetName() << std::endl;
-				std::cout << "  AC1CMS: the logical volume material = " << (*theLogicalVolume)->GetMaterial()->GetName() << std::endl;
-				std::cout << "  AC1CMS: the MaterialPropertiesTable = " << std::endl;
-				(*theLogicalVolume)->GetMaterial()->GetMaterialPropertiesTable()->DumpTable();
-			}
-		}
-		else if ( ( (*theLogicalVolume)->GetName() == "TOBActiveSter0" ) ||
-			( (*theLogicalVolume)->GetName() == "TOBActiveRphi0" ) ||
-			( (*theLogicalVolume)->GetName() == "TOBActiveRphi2" ) ||
-			( (*theLogicalVolume)->GetName() == "TOBActiveRphi4" ) )
-		{
-		// set the material
-			(*theLogicalVolume)->SetMaterial(theTOBWafer);
-
-			if (theMPDebugLevel > 2)
-			{
-				std::cout << "  AC1CMS: found a logical volume: " << (*theLogicalVolume)->GetName() << std::endl;
-				std::cout << "  AC1CMS: the logical volume material = " << (*theLogicalVolume)->GetMaterial()->GetName() << std::endl;
-				std::cout << "  AC1CMS: the MaterialPropertiesTable = " << std::endl;
-				(*theLogicalVolume)->GetMaterial()->GetMaterialPropertiesTable()->DumpTable();
-			}
-		}
-		else if ( ( (*theLogicalVolume)->GetName() == "TIBActiveSter0" ) ||
-			( (*theLogicalVolume)->GetName() == "TIBActiveRphi0" ) ||
-			( (*theLogicalVolume)->GetName() == "TIBActiveRphi2" ) )
-		{
-		// set the material
-			(*theLogicalVolume)->SetMaterial(theTIBWafer);
-
-			if (theMPDebugLevel > 2)
-			{
-				std::cout << "  AC1CMS: found a logical volume: " << (*theLogicalVolume)->GetName() << std::endl;
-				std::cout << "  AC1CMS: the logical volume material = " << (*theLogicalVolume)->GetMaterial()->GetName() << std::endl;
-				std::cout << "  AC1CMS: the MaterialPropertiesTable = " << std::endl;
-				(*theLogicalVolume)->GetMaterial()->GetMaterialPropertiesTable()->DumpTable();
-			}
-		}
-	}
+void MaterialProperties::setMaterialProperties() {
+  /* *********************************************************************** */
+  /*
+  use this function to define material properties (like refraction
+          index, absorptionlenght and so on) and add them to the
+          MaterialPropertiesTable. Finally set the MPT to a give Material.
+  */
+  /* *********************************************************************** */
+
+  // get the MaterialTable as it is defined in OSCAR (CMSSW now)
+  theMaterialTable = G4Material::GetMaterialTable();
+
+  /* *********************************************************************** */
+  /*
+  with the following code one can access the MaterialTable defined in
+          OSCAR. This contains all the materials needed for the CMS detector,
+          which are defined in the Geometry and DDD packages. COBRA takes care
+          of the proper conversion between a DDMaterial and a G4Material.
+  */
+  /* *********************************************************************** */
+
+  //   if (theMPDebugLevel > 1)
+  //     {
+  // print the materialtable
+  LogDebug("SimLaserAlignment:MaterialProperties")
+      << " **** here comes the material table **** " << *(G4Material::GetMaterialTable());
+  //     }
+
+  // define the MateriapropertiesTable for the Sensitive Regions in the Tracker
+  // TOB_Wafer, TOB_Silicon, TID_Wafer, TIB_Wafer and TEC_Wafer
+
+  const G4int nEntries = 3;
+
+  // Photon energies
+  G4double PhotonEnergy[nEntries] = {1.10 * eV, 1.15 * eV, 1.20 * eV};
+
+  // scintillation
+  G4double Scintillation[nEntries] = {0.1, 1.0, 0.1};
+
+  // Refractive Index
+  G4double RefractiveIndex[nEntries] = {3.5400, 3.5425, 3.5450};
+  // Refractive Index of the Mirrors (BK7)
+  G4double RefractiveIndexMirror[nEntries] = {1.50669, 1.50669, 1.50669};
+
+  /* *********************************************************************** */
+  /*  set the refractive index for the other materials to 1.0. This is       *
+   *  needed to propagate the optical photons through the detector according *
+   *  to Peter Gumplinger.                                                   */
+  /* *********************************************************************** */
+  G4double RefractiveIndexGeneral[nEntries] = {1.0, 1.0, 1.0};
+
+  // Absorption Length
+  // G4double AbsorptionLengthSi[nEntries] = { 198.8 * micrometer, 198.8 *
+  // micrometer, 198.8 * micrometer }; ///////////////////////////////////
+  G4double AbsorptionLengthSi[nEntries] = {1136 * micrometer, 1136 * micrometer, 1136 * micrometer};
+
+  G4double AbsorptionLengthSiBarrel[nEntries] = {0.1 * fermi, 0.1 * fermi, 0.1 * fermi};
+
+  // Absorption length of the mirrors
+  G4double AbsorptionLengthMirror[nEntries] = {11.7 * cm, 0.5 * 11.7 * cm, 11.7 * cm};
+
+  // Absorption Length for dead material in the tracker; set to small values
+  // to kill the optical photons outside the TEC. Maybe this is later a problem
+  // when implementing Ray 1 to connect both TECs which eachother and with TIB
+  // and TOB!??
+  G4double AbsorptionLengthDead[nEntries] = {0.001 * micrometer, 0.001 * micrometer, 0.001 * micrometer};
+
+  // Absorption Length of the other Materials in the Tracker
+  G4double AbsorptionLengthGeneral[nEntries] = {75 * cm, 75 * cm, 75 * cm};
+
+  // Absorption Length of the Air in the Tracker
+  G4double AbsorptionLengthTAir[nEntries] = {10 * m, 1.8 * m, 10 * m};
+
+  G4double AbsorptionLengthAl[nEntries] = {10 * mm, 10 * mm, 10 * mm};
+  G4double AbsorptionLengthTOB_CF_Str[nEntries] = {1 * cm, 10 * cm, 1 * cm};
+  G4double AbsorptionLengthTOBCF[nEntries] = {0.1 * mm, 20 * mm, 0.1 * mm};
+  G4double AbsorptionLengthTIBCF[nEntries] = {15.0 * cm, 15.0 * cm, 15.0 * cm};
+
+  // Reflectivity of the modules
+  G4double SiReflectivity[nEntries] = {0.0, 0.0, 0.0};
+
+  // Efficiency of the modules
+  G4double TECEfficiency[nEntries] = {0.9, 0.9, 0.9};
+  G4double BarrelEfficiency[nEntries] = {1.0, 1.0, 1.0};
+
+  // Reflectivity of the mirrors in the Alignment Tubes
+  G4double Reflectivity[nEntries] = {0.05, 0.05, 0.05};
+
+  /* *********************************************************************** */
+
+  /* *********************************************************************** */
+  /*
+  define the materials for the sensitive detectors in TEC, TIB and TOB
+          we need this to specify different properties for Barrel and Endcap
+          detectors, which is by default no longer possible in CMSSW due to
+          the fact that all modules are made out of the same G4Material
+  */
+  /* *********************************************************************** */
+
+  // set the options for the materials
+  {
+    for (G4MaterialTable::const_iterator theMTEntry = theMaterialTable->begin(); theMTEntry != theMaterialTable->end();
+         theMTEntry++) {
+      if (*theMTEntry) {
+        G4Material *theMaterial = const_cast<G4Material *>(*theMTEntry);
+
+        if (theMaterial->GetMaterialPropertiesTable()) {
+          theMPT = theMaterial->GetMaterialPropertiesTable();
+        } else {
+          theMPT = new G4MaterialPropertiesTable;
+        }
+
+        // properties of the TEC_Wafer
+        if (theMaterial->GetName() == "TEC_Wafer") {
+          theMPT->AddProperty("FASTCOMPONENT", PhotonEnergy, Scintillation, nEntries);
+          theMPT->AddProperty("SLOWCOMPONENT", PhotonEnergy, Scintillation, nEntries);
+          theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndex, nEntries);
+          theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthSi, nEntries);
+          theMPT->AddProperty("EFFICIENCY", PhotonEnergy, TECEfficiency, nEntries);
+
+          theMPT->AddConstProperty("SCINTILLATIONYIELD", 12000.0 / MeV);
+          theMPT->AddConstProperty("RESOLTUIONSCALE", 1.0);
+          theMPT->AddConstProperty("FASTTIMECONSTANT", 20.0 * ns);
+          theMPT->AddConstProperty("SLOWTIMECONSTANT", 45.0 * ns);
+          theMPT->AddConstProperty("YIELDRATIO", 1.0);
+
+          // set the MaterialPropertiesTable
+          theMaterial->SetMaterialPropertiesTable(theMPT);
+        }
+
+        // properties of Silicon (used as Module Material in CMSSW)
+        else if (theMaterial->GetName() == "Silicon") {
+          theMPT->AddProperty("FASTCOMPONENT", PhotonEnergy, Scintillation, nEntries);
+          theMPT->AddProperty("SLOWCOMPONENT", PhotonEnergy, Scintillation, nEntries);
+          theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndex, nEntries);
+          theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthSi, nEntries);
+          theMPT->AddProperty("EFFICIENCY", PhotonEnergy, TECEfficiency, nEntries);
+
+          theMPT->AddConstProperty("SCINTILLATIONYIELD", 12000.0 / MeV);
+          theMPT->AddConstProperty("RESOLTUIONSCALE", 1.0);
+          theMPT->AddConstProperty("FASTTIMECONSTANT", 20.0 * ns);
+          theMPT->AddConstProperty("SLOWTIMECONSTANT", 45.0 * ns);
+          theMPT->AddConstProperty("YIELDRATIO", 1.0);
+
+          // set the MaterialPropertiesTable
+          theMaterial->SetMaterialPropertiesTable(theMPT);
+        }
+
+        // properties of the TOB_Wafer, TOB_Silicon, TIB_Wafer
+        else if ((theMaterial->GetName() == "TOB_Wafer") || (theMaterial->GetName() == "TIB_Wafer")) {
+          theMPT->AddProperty("FASTCOMPONENT", PhotonEnergy, Scintillation, nEntries);
+          theMPT->AddProperty("SLOWCOMPONENT", PhotonEnergy, Scintillation, nEntries);
+          theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndex, nEntries);
+          theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthSiBarrel, nEntries);
+          theMPT->AddProperty("REFLECTIVITY", PhotonEnergy, SiReflectivity, nEntries);
+          theMPT->AddProperty("EFFICIENCY", PhotonEnergy, BarrelEfficiency, nEntries);
+
+          theMPT->AddConstProperty("SCINTILLATIONYIELD", 12000.0 / MeV);
+          theMPT->AddConstProperty("RESOLTUIONSCALE", 1.0);
+          theMPT->AddConstProperty("FASTTIMECONSTANT", 20.0 * ns);
+          theMPT->AddConstProperty("SLOWTIMECONSTANT", 45.0 * ns);
+          theMPT->AddConstProperty("YIELDRATIO", 1.0);
+
+          // set the MaterialPropertiesTable
+          theMaterial->SetMaterialPropertiesTable(theMPT);
+        }
+
+        // properties of the TIB_ledge_side
+        else if (theMaterial->GetName() == "TIB_ledge_side") {
+          // set the refractive index
+          theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndexGeneral, nEntries);
+          theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthGeneral, nEntries);
+
+          // set the MaterialPropertiesTable
+          theMaterial->SetMaterialPropertiesTable(theMPT);
+        }
+
+        // properties of air
+        else if ((theMaterial->GetName() == "T_Air") || (theMaterial->GetName() == "Air")) {
+          // set the refractive index
+          theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndexGeneral, nEntries);
+          // set the reflectivity
+          theMPT->AddProperty("REFLECTIVITY", PhotonEnergy, SiReflectivity, nEntries);
+          // set the absorptionlength
+          theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthTAir, nEntries);
+
+          // set the MaterialPropertiesTable
+          theMaterial->SetMaterialPropertiesTable(theMPT);
+        }
+
+        // properties of some materials in the Barrel
+        // used to absorb photons to avoid hits in other TEC
+        else if ((theMaterial->GetName() == "TIB_connector") || (theMaterial->GetName() == "TIB_cylinder") ||
+                 (theMaterial->GetName() == "TID_Connector")) {
+          // set the refractive index
+          theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndexGeneral, nEntries);
+          // set the reflectivity
+          theMPT->AddProperty("REFLECTIVITY", PhotonEnergy, SiReflectivity, nEntries);
+          // set the absorptionlength
+          theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthDead, nEntries);
+
+          // set the MaterialPropertiesTable
+          theMaterial->SetMaterialPropertiesTable(theMPT);
+        }
+
+        // properties of SiO2; used for the mirrors of the Alignment Tubes
+        else if (theMaterial->GetName() == "Si O_2") {
+          // set the refractive index
+          theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndexMirror, nEntries);
+          // set the absorptionlength
+          theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthMirror, nEntries);
+          // set the reflectivity
+          theMPT->AddProperty("REFLECTIVITY", PhotonEnergy, Reflectivity, nEntries);
+
+          // set the MaterialPropertiesTable
+          theMaterial->SetMaterialPropertiesTable(theMPT);
+        }
+
+        // properties of Aluminium
+        else if ((theMaterial->GetName() == "TOB_Aluminium") || (theMaterial->GetName() == "Aluminium")) {
+          // set the refractive index
+          theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndexGeneral, nEntries);
+          // set the reflectivity
+          theMPT->AddProperty("REFLECTIVITY", PhotonEnergy, SiReflectivity, nEntries);
+          // set the absorptionlength
+          theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthAl, nEntries);
+
+          // set the MaterialPropertiesTable
+          theMaterial->SetMaterialPropertiesTable(theMPT);
+        }
+
+        // properties of TOB_CF_Str
+        else if ((theMaterial->GetName() == "TOB_CF_Str")) {
+          // set the refractive index
+          theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndexGeneral, nEntries);
+          // set the reflectivity
+          theMPT->AddProperty("REFLECTIVITY", PhotonEnergy, SiReflectivity, nEntries);
+          // set the absorptionlength
+          theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthTOB_CF_Str, nEntries);
+
+          // set the MaterialPropertiesTable
+          theMaterial->SetMaterialPropertiesTable(theMPT);
+        }
+
+        // some other Tracker materials
+        else if ((theMaterial->GetName() == "TID_CF") || (theMaterial->GetName() == "Nomex") ||
+                 (theMaterial->GetName() == "TOB_Nomex") || (theMaterial->GetName() == "TID_Nomex") ||
+                 (theMaterial->GetName() == "TOB_plate_C") || (theMaterial->GetName() == "TOB_rod") ||
+                 (theMaterial->GetName() == "TOB_cool_DS") || (theMaterial->GetName() == "TOB_cool_SS") ||
+                 (theMaterial->GetName() == "TID_in_cable") || (theMaterial->GetName() == "TOB_PA_rphi") ||
+                 (theMaterial->GetName() == "TOB_frame_ele") || (theMaterial->GetName() == "TOB_PA_ster") ||
+                 (theMaterial->GetName() == "TOB_ICB") || (theMaterial->GetName() == "TOB_CONN1") ||
+                 (theMaterial->GetName() == "TOB_CONN2") || (theMaterial->GetName() == "TOB_CONN3") ||
+                 (theMaterial->GetName() == "TOB_rail") || (theMaterial->GetName() == "TOB_sid_rail1") ||
+                 (theMaterial->GetName() == "TOB_sid_rail2")) {
+          // set the refractive index
+          theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndexGeneral, nEntries);
+          // set the reflectivity
+          theMPT->AddProperty("REFLECTIVITY", PhotonEnergy, SiReflectivity, nEntries);
+          // set the absorptionlength
+          theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthTOBCF, nEntries);
+
+          // set the MaterialPropertiesTable
+          theMaterial->SetMaterialPropertiesTable(theMPT);
+        }
+
+        // properties of some TIB materials
+        else if ((theMaterial->GetName() == "TIB_CF") || (theMaterial->GetName() == "TIB_cables_ax_out") ||
+                 (theMaterial->GetName() == "TIB_outer_supp") || (theMaterial->GetName() == "TIB_PA_rphi") ||
+                 (theMaterial->GetName() == "TIB_rail") || (theMaterial->GetName() == "TIB_sid_rail1") ||
+                 (theMaterial->GetName() == "TIB_sid_rail2") || (theMaterial->GetName() == "TIB_mod_cool")) {
+          // set the refractive index
+          theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndexGeneral, nEntries);
+          // set the reflectivity
+          theMPT->AddProperty("REFLECTIVITY", PhotonEnergy, SiReflectivity, nEntries);
+          // set the absorptionlength
+          theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthTIBCF, nEntries);
+
+          // set the MaterialPropertiesTable
+          theMaterial->SetMaterialPropertiesTable(theMPT);
+        }
+
+        // properties of all other materials in the detector
+        else {
+          // set the refractive index
+          theMPT->AddProperty("RINDEX", PhotonEnergy, RefractiveIndexGeneral, nEntries);
+          // set the absorptionlength
+          theMPT->AddProperty("ABSLENGTH", PhotonEnergy, AbsorptionLengthGeneral, nEntries);
+
+          // set the MaterialPropertiesTable
+          theMaterial->SetMaterialPropertiesTable(theMPT);
+        }
+      }
+    }
+  }
+
+  // loop over the logical volumes and set the material for the sensitive
+  // detectors
+  const G4LogicalVolumeStore *theLogicalVolumeStore = G4LogicalVolumeStore::GetInstance();
+  std::vector<G4LogicalVolume *>::const_iterator theLogicalVolume;
+
+  for (theLogicalVolume = theLogicalVolumeStore->begin(); theLogicalVolume != theLogicalVolumeStore->end();
+       theLogicalVolume++) {
+    if (((*theLogicalVolume)->GetName() == "TECModule0StereoActive") ||
+        ((*theLogicalVolume)->GetName() == "TECModule0RphiActive") ||
+        ((*theLogicalVolume)->GetName() == "TECModule1StereoActive") ||
+        ((*theLogicalVolume)->GetName() == "TECModule1RphiActive") ||
+        ((*theLogicalVolume)->GetName() == "TECModule2RphiActive") ||
+        ((*theLogicalVolume)->GetName() == "TECModule3RphiActive") ||
+        ((*theLogicalVolume)->GetName() == "TECModule4StereoActive") ||
+        ((*theLogicalVolume)->GetName() == "TECModule4RphiActive") ||
+        ((*theLogicalVolume)->GetName() == "TECModule5RphiActive") ||
+        ((*theLogicalVolume)->GetName() == "TECModule6RphiActive")) {
+      // set the material
+      (*theLogicalVolume)->SetMaterial(theTECWafer);
+
+      if (theMPDebugLevel > 2) {
+        std::cout << "  AC1CMS: found a logical volume: " << (*theLogicalVolume)->GetName() << std::endl;
+        std::cout << "  AC1CMS: the logical volume material = " << (*theLogicalVolume)->GetMaterial()->GetName()
+                  << std::endl;
+        std::cout << "  AC1CMS: the MaterialPropertiesTable = " << std::endl;
+        (*theLogicalVolume)->GetMaterial()->GetMaterialPropertiesTable()->DumpTable();
+      }
+    } else if (((*theLogicalVolume)->GetName() == "TOBActiveSter0") ||
+               ((*theLogicalVolume)->GetName() == "TOBActiveRphi0") ||
+               ((*theLogicalVolume)->GetName() == "TOBActiveRphi2") ||
+               ((*theLogicalVolume)->GetName() == "TOBActiveRphi4")) {
+      // set the material
+      (*theLogicalVolume)->SetMaterial(theTOBWafer);
+
+      if (theMPDebugLevel > 2) {
+        std::cout << "  AC1CMS: found a logical volume: " << (*theLogicalVolume)->GetName() << std::endl;
+        std::cout << "  AC1CMS: the logical volume material = " << (*theLogicalVolume)->GetMaterial()->GetName()
+                  << std::endl;
+        std::cout << "  AC1CMS: the MaterialPropertiesTable = " << std::endl;
+        (*theLogicalVolume)->GetMaterial()->GetMaterialPropertiesTable()->DumpTable();
+      }
+    } else if (((*theLogicalVolume)->GetName() == "TIBActiveSter0") ||
+               ((*theLogicalVolume)->GetName() == "TIBActiveRphi0") ||
+               ((*theLogicalVolume)->GetName() == "TIBActiveRphi2")) {
+      // set the material
+      (*theLogicalVolume)->SetMaterial(theTIBWafer);
+
+      if (theMPDebugLevel > 2) {
+        std::cout << "  AC1CMS: found a logical volume: " << (*theLogicalVolume)->GetName() << std::endl;
+        std::cout << "  AC1CMS: the logical volume material = " << (*theLogicalVolume)->GetMaterial()->GetName()
+                  << std::endl;
+        std::cout << "  AC1CMS: the MaterialPropertiesTable = " << std::endl;
+        (*theLogicalVolume)->GetMaterial()->GetMaterialPropertiesTable()->DumpTable();
+      }
+    }
+  }
 }
diff --git a/Alignment/LaserAlignmentSimulation/test/SealModules.cc b/Alignment/LaserAlignmentSimulation/test/SealModules.cc
index 5281cda4a4ae6..5b4f4957757e5 100644
--- a/Alignment/LaserAlignmentSimulation/test/SealModules.cc
+++ b/Alignment/LaserAlignmentSimulation/test/SealModules.cc
@@ -1,6 +1,6 @@
 
 // define the SEAL module
+#include "Alignment/LaserAlignmentSimulation/test/SimAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "Alignment/LaserAlignmentSimulation/test/SimAnalyzer.h" 
 
 DEFINE_FWK_MODULE(SimAnalyzer);
diff --git a/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.cc b/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.cc
index eb93c780f14ba..96bdc7fe6ba89 100644
--- a/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.cc
+++ b/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.cc
@@ -1,5 +1,6 @@
 /** \file SimAnalyzer.cc
- *  Get some statistics and plots about the simulation of the Laser Alignment System
+ *  Get some statistics and plots about the simulation of the Laser Alignment
+ * System
  *
  *  $Date: 2009/12/14 22:21:45 $
  *  $Revision: 1.6 $
@@ -7,396 +8,372 @@
  */
 
 #include "Alignment/LaserAlignmentSimulation/test/SimAnalyzer.h"
-#include "FWCore/Framework/interface/Event.h" 
-#include "FWCore/Framework/interface/ESHandle.h" 
-#include "FWCore/ParameterSet/interface/ParameterSet.h" 
-#include "FWCore/Framework/interface/EventSetup.h" 
-#include "FWCore/Utilities/interface/EDMException.h" 
-#include "FWCore/MessageLogger/interface/MessageLogger.h" 
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h" 
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" 
-#include "DataFormats/DetId/interface/DetId.h" 
-#include "SimDataFormats/TrackingHit/interface/PSimHit.h" 
-#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h" 
-#include "DataFormats/SiStripDetId/interface/StripSubdetector.h" 
-#include "TFile.h" 
-
-	SimAnalyzer::SimAnalyzer(edm::ParameterSet const& theConf) 
-	: theEvents(0), 
-	theDebugLevel(theConf.getUntrackedParameter<int>("DebugLevel",0)),
-	theSearchPhiTIB(theConf.getUntrackedParameter<double>("SearchWindowPhiTIB",0.05)),
-	theSearchPhiTOB(theConf.getUntrackedParameter<double>("SearchWindowPhiTOB",0.05)),
-	theSearchPhiTEC(theConf.getUntrackedParameter<double>("SearchWindowPhiTEC",0.05)),
-	theSearchZTIB(theConf.getUntrackedParameter<double>("SearchWindowZTIB",1.0)),
-	theSearchZTOB(theConf.getUntrackedParameter<double>("SearchWindowZTOB",1.0)),
-	theFile(),
-	theCompression(theConf.getUntrackedParameter<int>("ROOTFileCompression",1)),
-	theFileName(theConf.getUntrackedParameter<std::string>("ROOTFileName","test.root")),
-	theBarrelSimHitsX(0),
-	theBarrelSimHitsY(0),
-	theBarrelSimHitsZ(0),
-	theBarrelSimHitsYvsX(0),
-	theBarrelSimHitsXvsZ(0),
-	theBarrelSimHitsYvsZ(0),
-	theBarrelSimHitsRvsZ(0),
-	theBarrelSimHitsPhivsX(0),
-	theBarrelSimHitsPhivsY(0),
-	theBarrelSimHitsPhivsZ(0),
-	// the histograms for Endcap Hits
-	theEndcapSimHitsX(0),
-	theEndcapSimHitsY(0),
-	theEndcapSimHitsZ(0),
-	theEndcapSimHitsYvsX(0),
-	theEndcapSimHitsXvsZ(0),
-	theEndcapSimHitsYvsZ(0),
-	theEndcapSimHitsRvsZ(0),
-	theEndcapSimHitsPhivsX(0),
-	theEndcapSimHitsPhivsY(0),
-	theEndcapSimHitsPhivsZ(0),
-	// the histograms for all SimHits
-	theSimHitsRvsZ(0),
-	theSimHitsPhivsZ(0)  
-{
-	// load the configuration from the ParameterSet  
-	edm::LogInfo("SimAnalyzer") << "==========================================================="  
-		<< "===                Start configuration                  ==="
-		<< "    theDebugLevel                  = " << theDebugLevel
-		<< "    theSearchPhiTIB                = " << theSearchPhiTIB
-		<< "    theSearchPhiTOB                = " << theSearchPhiTOB 
-		<< "    theSearchPhiTEC                = " << theSearchPhiTEC
-		<< "    theSearchZTIB                  = " << theSearchZTIB 
-		<< "    theSearchZTOB                  = " << theSearchZTOB
-		<< "    ROOT filename                  = " << theFileName 
-		<< "    compression                    = " << theCompression
-		<< "===========================================================";  
+#include "DataFormats/DetId/interface/DetId.h"
+#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/EDMException.h"
+#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
+#include "TFile.h"
+
+SimAnalyzer::SimAnalyzer(edm::ParameterSet const &theConf)
+    : theEvents(0),
+      theDebugLevel(theConf.getUntrackedParameter<int>("DebugLevel", 0)),
+      theSearchPhiTIB(theConf.getUntrackedParameter<double>("SearchWindowPhiTIB", 0.05)),
+      theSearchPhiTOB(theConf.getUntrackedParameter<double>("SearchWindowPhiTOB", 0.05)),
+      theSearchPhiTEC(theConf.getUntrackedParameter<double>("SearchWindowPhiTEC", 0.05)),
+      theSearchZTIB(theConf.getUntrackedParameter<double>("SearchWindowZTIB", 1.0)),
+      theSearchZTOB(theConf.getUntrackedParameter<double>("SearchWindowZTOB", 1.0)),
+      theFile(),
+      theCompression(theConf.getUntrackedParameter<int>("ROOTFileCompression", 1)),
+      theFileName(theConf.getUntrackedParameter<std::string>("ROOTFileName", "test.root")),
+      theBarrelSimHitsX(0),
+      theBarrelSimHitsY(0),
+      theBarrelSimHitsZ(0),
+      theBarrelSimHitsYvsX(0),
+      theBarrelSimHitsXvsZ(0),
+      theBarrelSimHitsYvsZ(0),
+      theBarrelSimHitsRvsZ(0),
+      theBarrelSimHitsPhivsX(0),
+      theBarrelSimHitsPhivsY(0),
+      theBarrelSimHitsPhivsZ(0),
+      // the histograms for Endcap Hits
+      theEndcapSimHitsX(0),
+      theEndcapSimHitsY(0),
+      theEndcapSimHitsZ(0),
+      theEndcapSimHitsYvsX(0),
+      theEndcapSimHitsXvsZ(0),
+      theEndcapSimHitsYvsZ(0),
+      theEndcapSimHitsRvsZ(0),
+      theEndcapSimHitsPhivsX(0),
+      theEndcapSimHitsPhivsY(0),
+      theEndcapSimHitsPhivsZ(0),
+      // the histograms for all SimHits
+      theSimHitsRvsZ(0),
+      theSimHitsPhivsZ(0) {
+  // load the configuration from the ParameterSet
+  edm::LogInfo("SimAnalyzer") << "==========================================================="
+                              << "===                Start configuration                  ==="
+                              << "    theDebugLevel                  = " << theDebugLevel
+                              << "    theSearchPhiTIB                = " << theSearchPhiTIB
+                              << "    theSearchPhiTOB                = " << theSearchPhiTOB
+                              << "    theSearchPhiTEC                = " << theSearchPhiTEC
+                              << "    theSearchZTIB                  = " << theSearchZTIB
+                              << "    theSearchZTOB                  = " << theSearchZTOB
+                              << "    ROOT filename                  = " << theFileName
+                              << "    compression                    = " << theCompression
+                              << "===========================================================";
 }
 
-SimAnalyzer::~SimAnalyzer()
-{
-	if (theFile != 0) {
-	        // close the rootfile
-	        closeRootFile();
-	  
-   	        delete theFile; 
-	}
+SimAnalyzer::~SimAnalyzer() {
+  if (theFile != 0) {
+    // close the rootfile
+    closeRootFile();
 
+    delete theFile;
+  }
 }
 
-void SimAnalyzer::analyze(edm::Event const& theEvent, edm::EventSetup const& theSetup) 
-{
-	LogDebug("SimAnalyzer") << "==========================================================="
-		<< "   Private analysis of event #"<< theEvent.id().event() 
-		<< " in run #" << theEvent.id().run();
+void SimAnalyzer::analyze(edm::Event const &theEvent, edm::EventSetup const &theSetup) {
+  LogDebug("SimAnalyzer") << "==========================================================="
+                          << "   Private analysis of event #" << theEvent.id().event() << " in run #"
+                          << theEvent.id().run();
 
-	// ----- check if the actual event can be used -----
-	/* here we can later on add some criteria for good alignment events!? */
+  // ----- check if the actual event can be used -----
+  /* here we can later on add some criteria for good alignment events!? */
 
-	theEvents++;
+  theEvents++;
 
-	LogDebug("SimAnalyzer") << "     Total Event number = " << theEvents;
+  LogDebug("SimAnalyzer") << "     Total Event number = " << theEvents;
 
-	// do the Tracker Statistics
-	trackerStatistics(theEvent, theSetup);
+  // do the Tracker Statistics
+  trackerStatistics(theEvent, theSetup);
 
-	LogDebug("SimAnalyzer") << "===========================================================";
+  LogDebug("SimAnalyzer") << "===========================================================";
 }
 
-void SimAnalyzer::beginJob() 
-{
-	LogDebug("SimAnalyzer") << "==========================================================="
-		<< "===                Start beginJob()                     ==="
-		<< "     creating a CMS Root Tree ...";
-	// creating a new file
-	theFile = new TFile(theFileName.c_str(),"RECREATE","CMS ROOT file");
-
-	// initialize the histograms
-	if (theFile) 
-	{
-         	theFile->SetCompressionLevel(theCompression);
-		this->initHistograms();
-	}
-	else 
-	{
-		throw edm::Exception(edm::errors::LogicError,
-			"<SimAnalyzer::initSetup()>: ERROR!!! something wrong with the RootFile");
-	} 
-
-
-	LogDebug("SimAnalyzer") << "===                Done beginJob()                      ==="
-		<< "===========================================================";
+void SimAnalyzer::beginJob() {
+  LogDebug("SimAnalyzer") << "==========================================================="
+                          << "===                Start beginJob()                     ==="
+                          << "     creating a CMS Root Tree ...";
+  // creating a new file
+  theFile = new TFile(theFileName.c_str(), "RECREATE", "CMS ROOT file");
+
+  // initialize the histograms
+  if (theFile) {
+    theFile->SetCompressionLevel(theCompression);
+    this->initHistograms();
+  } else {
+    throw edm::Exception(edm::errors::LogicError,
+                         "<SimAnalyzer::initSetup()>: ERROR!!! something wrong "
+                         "with the RootFile");
+  }
+
+  LogDebug("SimAnalyzer") << "===                Done beginJob()                      ==="
+                          << "===========================================================";
 }
 
-double SimAnalyzer::angle(double theAngle)
-{
-	return theAngle += (theAngle >= 0.0) ? 0.0 : 2.0 * M_PI;
-}
+double SimAnalyzer::angle(double theAngle) { return theAngle += (theAngle >= 0.0) ? 0.0 : 2.0 * M_PI; }
 
-void SimAnalyzer::closeRootFile()
-{
-	LogDebug("SimAnalyzer") << " writing all information into a file ";
+void SimAnalyzer::closeRootFile() {
+  LogDebug("SimAnalyzer") << " writing all information into a file ";
 
-	theFile->Write();
+  theFile->Write();
 }
 
-void SimAnalyzer::initHistograms()
-{
-	LogDebug("SimAnalyzer") << "     Start of initialisation monitor histograms ...";
-
-	// the directories in the ROOT file
-	TDirectory * SimHitDir = theFile->mkdir("SimHits");
-	TDirectory * BarrelDir = SimHitDir->mkdir("Barrel");
-	TDirectory * EndcapDir = SimHitDir->mkdir("Endcap");
-
-	// histograms for Barrel Hits
-	theBarrelSimHitsX = new TH1D("BarrelSimHitsX","X Position of the SimHits", 200, -100.0, 100.0);
-	theBarrelSimHitsX->SetDirectory(BarrelDir);
-	theBarrelSimHitsX->Sumw2();
-
-	theBarrelSimHitsY = new TH1D("BarrelSimHitsY","Y Position of the SimHits", 200, -100.0, 100.0);
-	theBarrelSimHitsY->SetDirectory(BarrelDir);
-	theBarrelSimHitsY->Sumw2();
-
-	theBarrelSimHitsZ = new TH1D("BarrelSimHitsZ","Z Position of the SimHits", 240, -120.0, 120.0);
-	theBarrelSimHitsZ->SetDirectory(BarrelDir);
-	theBarrelSimHitsZ->Sumw2();
-
-	theBarrelSimHitsYvsX = new TH2D("BarrelSimHitsYvsX","Y vs X Position of the SimHits", 
-		200, -100.0, 100.0, 200, -100.0, 100.0);
-	theBarrelSimHitsYvsX->SetDirectory(BarrelDir);
-	theBarrelSimHitsYvsX->Sumw2();
-
-	theBarrelSimHitsXvsZ = new TH2D("BarrelSimHitsXvsZ","X vs Z Position of the SimHits",
-		240, -120.0, 120.0, 200, -100.0, 100.0);
-	theBarrelSimHitsXvsZ->SetDirectory(BarrelDir);
-	theBarrelSimHitsXvsZ->Sumw2();
-
-	theBarrelSimHitsYvsZ = new TH2D("BarrelSimHitsYvsZ","Y vs Z Position of the SimHits",
-		240, -120.0, 120.0, 200, -100.0, 100.0);
-	theBarrelSimHitsYvsZ->SetDirectory(BarrelDir);
-	theBarrelSimHitsYvsZ->Sumw2();
-
-	theBarrelSimHitsRvsZ = new TH2D("BarrelSimHitsRvsZ","R vs Z Position of the SimHits",
-		240, -120.0, 120.0, 130, 0.0, 65.0);
-	theBarrelSimHitsRvsZ->SetDirectory(BarrelDir);
-	theBarrelSimHitsRvsZ->Sumw2();
-
-	theBarrelSimHitsPhivsX = new TH2D("BarrelSimHitsPhivsX","Phi [rad] vs X Position of the SimHits",
-		200, -100.0, 100.0, 70, 0.0, 7.0);
-	theBarrelSimHitsPhivsX->SetDirectory(BarrelDir);
-	theBarrelSimHitsPhivsX->Sumw2();
-
-	theBarrelSimHitsPhivsY = new TH2D("BarrelSimHitsPhivsY","Phi [rad] vs Y Position of the SimHits",
-		200, -100.0, 100.0, 70, 0.0, 7.0);
-	theBarrelSimHitsPhivsY->SetDirectory(BarrelDir);
-	theBarrelSimHitsPhivsY->Sumw2();
-
-	theBarrelSimHitsPhivsZ = new TH2D("BarrelSimHitsPhivsZ","Phi [rad] vs Z Position of the SimHits",
-		240, -120.0, 120.0, 70, 0.0, 7.0);
-	theBarrelSimHitsPhivsZ->SetDirectory(BarrelDir);
-	theBarrelSimHitsPhivsZ->Sumw2();
-
-	// histograms for Endcap Hits
-	theEndcapSimHitsX = new TH1D("EndcapSimHitsX","X Position of the SimHits", 200, -100.0, 100.0);
-	theEndcapSimHitsX->SetDirectory(EndcapDir);
-	theEndcapSimHitsX->Sumw2();
-
-	theEndcapSimHitsY = new TH1D("EndcapSimHitsY","Y Position of the SimHits", 200, -100.0, 100.0);
-	theEndcapSimHitsY->SetDirectory(EndcapDir);
-	theEndcapSimHitsY->Sumw2();
-
-	theEndcapSimHitsZ = new TH1D("EndcapSimHitsZ","Z Position of the SimHits", 600, -300.0, 300.0);
-	theEndcapSimHitsZ->SetDirectory(EndcapDir);
-	theEndcapSimHitsZ->Sumw2();
-
-	theEndcapSimHitsYvsX = new TH2D("EndcapSimHitsYvsX","Y vs X Position of the SimHits", 
-		200, -100.0, 100.0, 200, -100.0, 100.0);
-	theEndcapSimHitsYvsX->SetDirectory(EndcapDir);
-	theEndcapSimHitsYvsX->Sumw2();
-
-	theEndcapSimHitsXvsZ = new TH2D("EndcapSimHitsXvsZ","X vs Z Position of the SimHits",
-		600, -300.0, 300.0, 200, -100.0, 100.0);
-	theEndcapSimHitsXvsZ->SetDirectory(EndcapDir);
-	theEndcapSimHitsXvsZ->Sumw2();
-
-	theEndcapSimHitsYvsZ = new TH2D("EndcapSimHitsYvsZ","Y vs Z Position of the SimHits",
-		600, -300.0, 300.0, 200, -100.0, 100.0);
-	theEndcapSimHitsYvsZ->SetDirectory(EndcapDir);
-	theEndcapSimHitsYvsZ->Sumw2();
-
-	theEndcapSimHitsRvsZ = new TH2D("EndcapSimHitsRvsZ","R vs Z Position of the SimHits",
-		600, -300.0, 300.0, 1000, 0.0, 100.0);
-	theEndcapSimHitsRvsZ->SetDirectory(EndcapDir);
-	theEndcapSimHitsRvsZ->Sumw2();
-
-	theEndcapSimHitsPhivsX = new TH2D("EndcapSimHitsPhivsX","Phi [rad] vs X Positon of the SimHits",
-		200, -100.0, 100.0, 70, 0.0, 7.0);
-	theEndcapSimHitsPhivsX->SetDirectory(EndcapDir);
-	theEndcapSimHitsPhivsX->Sumw2();
-
-	theEndcapSimHitsPhivsY = new TH2D("EndcapSimHitsPhivsY","Phi [rad] vs Y Position of the SimHits",
-		200, -100.0, 100.0, 70, 0.0, 7.0);
-	theEndcapSimHitsPhivsY->SetDirectory(EndcapDir);
-	theEndcapSimHitsPhivsY->Sumw2();
-
-	theEndcapSimHitsPhivsZ = new TH2D("EndcapSimHitsPhivsZ","Phi [rad] vs Z Position of the SimHits",
-		600, -300.0, 300.0, 70, 0.0, 7.0);
-	theEndcapSimHitsPhivsZ->SetDirectory(EndcapDir);
-	theEndcapSimHitsPhivsZ->Sumw2();
-
-	// histograms for all SimHits
-	theSimHitsRvsZ = new TH2D("SimHitsRvsZ","R vs Z Position of the SimHits", 600, -300.0, 300.0, 1000, 0.0, 100.0);
-	theSimHitsRvsZ->SetDirectory(SimHitDir);
-	theSimHitsRvsZ->Sumw2();
-
-	theSimHitsPhivsZ = new TH2D("SimHitsPhivsZ","Phi [rad] vs Z Position of the SimHits", 600, -300.0, 300.0, 700, 0.0, 7.0);
-	theSimHitsPhivsZ->SetDirectory(SimHitDir);
-	theSimHitsPhivsZ->Sumw2();
+void SimAnalyzer::initHistograms() {
+  LogDebug("SimAnalyzer") << "     Start of initialisation monitor histograms ...";
+
+  // the directories in the ROOT file
+  TDirectory *SimHitDir = theFile->mkdir("SimHits");
+  TDirectory *BarrelDir = SimHitDir->mkdir("Barrel");
+  TDirectory *EndcapDir = SimHitDir->mkdir("Endcap");
+
+  // histograms for Barrel Hits
+  theBarrelSimHitsX = new TH1D("BarrelSimHitsX", "X Position of the SimHits", 200, -100.0, 100.0);
+  theBarrelSimHitsX->SetDirectory(BarrelDir);
+  theBarrelSimHitsX->Sumw2();
+
+  theBarrelSimHitsY = new TH1D("BarrelSimHitsY", "Y Position of the SimHits", 200, -100.0, 100.0);
+  theBarrelSimHitsY->SetDirectory(BarrelDir);
+  theBarrelSimHitsY->Sumw2();
+
+  theBarrelSimHitsZ = new TH1D("BarrelSimHitsZ", "Z Position of the SimHits", 240, -120.0, 120.0);
+  theBarrelSimHitsZ->SetDirectory(BarrelDir);
+  theBarrelSimHitsZ->Sumw2();
+
+  theBarrelSimHitsYvsX =
+      new TH2D("BarrelSimHitsYvsX", "Y vs X Position of the SimHits", 200, -100.0, 100.0, 200, -100.0, 100.0);
+  theBarrelSimHitsYvsX->SetDirectory(BarrelDir);
+  theBarrelSimHitsYvsX->Sumw2();
+
+  theBarrelSimHitsXvsZ =
+      new TH2D("BarrelSimHitsXvsZ", "X vs Z Position of the SimHits", 240, -120.0, 120.0, 200, -100.0, 100.0);
+  theBarrelSimHitsXvsZ->SetDirectory(BarrelDir);
+  theBarrelSimHitsXvsZ->Sumw2();
+
+  theBarrelSimHitsYvsZ =
+      new TH2D("BarrelSimHitsYvsZ", "Y vs Z Position of the SimHits", 240, -120.0, 120.0, 200, -100.0, 100.0);
+  theBarrelSimHitsYvsZ->SetDirectory(BarrelDir);
+  theBarrelSimHitsYvsZ->Sumw2();
+
+  theBarrelSimHitsRvsZ =
+      new TH2D("BarrelSimHitsRvsZ", "R vs Z Position of the SimHits", 240, -120.0, 120.0, 130, 0.0, 65.0);
+  theBarrelSimHitsRvsZ->SetDirectory(BarrelDir);
+  theBarrelSimHitsRvsZ->Sumw2();
+
+  theBarrelSimHitsPhivsX =
+      new TH2D("BarrelSimHitsPhivsX", "Phi [rad] vs X Position of the SimHits", 200, -100.0, 100.0, 70, 0.0, 7.0);
+  theBarrelSimHitsPhivsX->SetDirectory(BarrelDir);
+  theBarrelSimHitsPhivsX->Sumw2();
+
+  theBarrelSimHitsPhivsY =
+      new TH2D("BarrelSimHitsPhivsY", "Phi [rad] vs Y Position of the SimHits", 200, -100.0, 100.0, 70, 0.0, 7.0);
+  theBarrelSimHitsPhivsY->SetDirectory(BarrelDir);
+  theBarrelSimHitsPhivsY->Sumw2();
+
+  theBarrelSimHitsPhivsZ =
+      new TH2D("BarrelSimHitsPhivsZ", "Phi [rad] vs Z Position of the SimHits", 240, -120.0, 120.0, 70, 0.0, 7.0);
+  theBarrelSimHitsPhivsZ->SetDirectory(BarrelDir);
+  theBarrelSimHitsPhivsZ->Sumw2();
+
+  // histograms for Endcap Hits
+  theEndcapSimHitsX = new TH1D("EndcapSimHitsX", "X Position of the SimHits", 200, -100.0, 100.0);
+  theEndcapSimHitsX->SetDirectory(EndcapDir);
+  theEndcapSimHitsX->Sumw2();
+
+  theEndcapSimHitsY = new TH1D("EndcapSimHitsY", "Y Position of the SimHits", 200, -100.0, 100.0);
+  theEndcapSimHitsY->SetDirectory(EndcapDir);
+  theEndcapSimHitsY->Sumw2();
+
+  theEndcapSimHitsZ = new TH1D("EndcapSimHitsZ", "Z Position of the SimHits", 600, -300.0, 300.0);
+  theEndcapSimHitsZ->SetDirectory(EndcapDir);
+  theEndcapSimHitsZ->Sumw2();
+
+  theEndcapSimHitsYvsX =
+      new TH2D("EndcapSimHitsYvsX", "Y vs X Position of the SimHits", 200, -100.0, 100.0, 200, -100.0, 100.0);
+  theEndcapSimHitsYvsX->SetDirectory(EndcapDir);
+  theEndcapSimHitsYvsX->Sumw2();
+
+  theEndcapSimHitsXvsZ =
+      new TH2D("EndcapSimHitsXvsZ", "X vs Z Position of the SimHits", 600, -300.0, 300.0, 200, -100.0, 100.0);
+  theEndcapSimHitsXvsZ->SetDirectory(EndcapDir);
+  theEndcapSimHitsXvsZ->Sumw2();
+
+  theEndcapSimHitsYvsZ =
+      new TH2D("EndcapSimHitsYvsZ", "Y vs Z Position of the SimHits", 600, -300.0, 300.0, 200, -100.0, 100.0);
+  theEndcapSimHitsYvsZ->SetDirectory(EndcapDir);
+  theEndcapSimHitsYvsZ->Sumw2();
+
+  theEndcapSimHitsRvsZ =
+      new TH2D("EndcapSimHitsRvsZ", "R vs Z Position of the SimHits", 600, -300.0, 300.0, 1000, 0.0, 100.0);
+  theEndcapSimHitsRvsZ->SetDirectory(EndcapDir);
+  theEndcapSimHitsRvsZ->Sumw2();
+
+  theEndcapSimHitsPhivsX =
+      new TH2D("EndcapSimHitsPhivsX", "Phi [rad] vs X Positon of the SimHits", 200, -100.0, 100.0, 70, 0.0, 7.0);
+  theEndcapSimHitsPhivsX->SetDirectory(EndcapDir);
+  theEndcapSimHitsPhivsX->Sumw2();
+
+  theEndcapSimHitsPhivsY =
+      new TH2D("EndcapSimHitsPhivsY", "Phi [rad] vs Y Position of the SimHits", 200, -100.0, 100.0, 70, 0.0, 7.0);
+  theEndcapSimHitsPhivsY->SetDirectory(EndcapDir);
+  theEndcapSimHitsPhivsY->Sumw2();
+
+  theEndcapSimHitsPhivsZ =
+      new TH2D("EndcapSimHitsPhivsZ", "Phi [rad] vs Z Position of the SimHits", 600, -300.0, 300.0, 70, 0.0, 7.0);
+  theEndcapSimHitsPhivsZ->SetDirectory(EndcapDir);
+  theEndcapSimHitsPhivsZ->Sumw2();
+
+  // histograms for all SimHits
+  theSimHitsRvsZ = new TH2D("SimHitsRvsZ", "R vs Z Position of the SimHits", 600, -300.0, 300.0, 1000, 0.0, 100.0);
+  theSimHitsRvsZ->SetDirectory(SimHitDir);
+  theSimHitsRvsZ->Sumw2();
+
+  theSimHitsPhivsZ =
+      new TH2D("SimHitsPhivsZ", "Phi [rad] vs Z Position of the SimHits", 600, -300.0, 300.0, 700, 0.0, 7.0);
+  theSimHitsPhivsZ->SetDirectory(SimHitDir);
+  theSimHitsPhivsZ->Sumw2();
 }
 
-void SimAnalyzer::trackerStatistics(edm::Event const& theEvent, edm::EventSetup const& theSetup)
-{
-	LogDebug("SimAnalyzer") << "<SimAnalyzer::trackerStatistics(edm::Event const& theEvent): filling the histograms ... ";
-
-	int theBarrelHits = 0;
-	int theEndcapHits = 0;
-
-	// access the tracker
-	edm::ESHandle<TrackerGeometry> theTrackerGeometry;
-	theSetup.get<TrackerDigiGeometryRecord>().get(theTrackerGeometry);
-	const TrackerGeometry& theTracker(*theTrackerGeometry);
-
-	// the DetUnits
-	TrackingGeometry::DetContainer theDetUnits = theTracker.dets();
-
-	// get the SimHitContainers
-	std::vector<edm::Handle<edm::PSimHitContainer> > theSimHitContainers;
-	theEvent.getManyByType(theSimHitContainers);
-
-	LogDebug("SimAnalyzer") << " Geometry node for TrackingGeometry is  " << &(*theTrackerGeometry)
-		<< "\n I have " << theTrackerGeometry->dets().size() << " detectors "
-		<< "\n I have " << theTrackerGeometry->detTypes().size() << " types "
-		<< "\n theDetUnits has " << theDetUnits.size() << " dets ";
-
-	// theSimHits contains all the sim hits in this event
-	std::vector<PSimHit> theSimHits;
-	for (int i = 0; i < int(theSimHitContainers.size()); i++)
-	{
-		theSimHits.insert(theSimHits.end(),theSimHitContainers.at(i)->begin(),theSimHitContainers.at(i)->end());
-	}
-
-	// loop over the SimHits and fill the histograms
-	for (std::vector<PSimHit>::const_iterator iHit = theSimHits.begin();
-	iHit != theSimHits.end(); iHit++)
-	{
-			// create a DetId from the detUnitId
-		DetId theDetUnitId((*iHit).detUnitId());
-
-			// get the DetUnit via the DetUnitId and cast it to a StripGeomDetUnit
-		const GeomDet * theDet = theTracker.idToDet(theDetUnitId);
-
-			// the detector part
-		std::string thePart = "";
-
-		LogDebug("SimAnalyzer:SimHitInfo") << " ============================================================ "
-			<< "\n Some Information for this SimHit: "
-			<< "\n" << *iHit 
-			<< "\n GlobalPosition = (" << theDet->surface().toGlobal((*iHit).localPosition()).x() << ","
-			<< theDet->surface().toGlobal((*iHit).localPosition()).y() << "," 
-			<< theDet->surface().toGlobal((*iHit).localPosition()).z() << ") "
-			<< "\n R = " << theDet->surface().toGlobal((*iHit).localPosition()).perp()
-			<< "\n phi = " << theDet->surface().toGlobal((*iHit).localPosition()).phi()
-			<< "\n angle(phi) = " << angle(theDet->surface().toGlobal((*iHit).localPosition()).phi())
-			<< "\n GlobalDirection = (" << theDet->surface().toGlobal((*iHit).localDirection()).x() << ","
-			<< theDet->surface().toGlobal((*iHit).localDirection()).y() << "," 
-			<< theDet->surface().toGlobal((*iHit).localDirection()).z() << ") "
-			<< "\n Total momentum = " << (*iHit).pabs()
-			<< "\n ParticleType = " << (*iHit).particleType()
-			<< "\n detUnitId = " << (*iHit).detUnitId();
-
-
-			// select hits in Barrel and Endcaps
-		switch (theDetUnitId.subdetId())
-		{
-			case StripSubdetector::TIB:
-			{
-				thePart = "TIB";
-				break;
-			}
-			case StripSubdetector::TOB:
-			{
-				thePart = "TOB";
-				break;
-			}
-			case StripSubdetector::TEC:
-			{
-				thePart = "TEC";
-				break;
-			}
-		}
-
-		if ( (thePart == "TIB") || (thePart == "TOB") )
-		{
-			theBarrelHits++;
-
-		// histograms for the Barrel
-			theBarrelSimHitsX->Fill(theDet->surface().toGlobal((*iHit).localPosition()).x());
-			theBarrelSimHitsY->Fill(theDet->surface().toGlobal((*iHit).localPosition()).y());
-			theBarrelSimHitsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z());
-			theBarrelSimHitsYvsX->Fill(theDet->surface().toGlobal((*iHit).localPosition()).x(),
-				theDet->surface().toGlobal((*iHit).localPosition()).y());
-			theBarrelSimHitsXvsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
-				theDet->surface().toGlobal((*iHit).localPosition()).x());
-			theBarrelSimHitsYvsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
-				theDet->surface().toGlobal((*iHit).localPosition()).y());
-			theBarrelSimHitsRvsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
-				theDet->surface().toGlobal((*iHit).localPosition()).perp());
-			theBarrelSimHitsPhivsX->Fill(theDet->surface().toGlobal((*iHit).localPosition()).x(),
-				angle(theDet->surface().toGlobal((*iHit).localPosition()).phi()));
-			theBarrelSimHitsPhivsY->Fill(theDet->surface().toGlobal((*iHit).localPosition()).y(),
-				angle(theDet->surface().toGlobal((*iHit).localPosition()).phi()));
-			theBarrelSimHitsPhivsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
-				angle(theDet->surface().toGlobal((*iHit).localPosition()).phi()));
-		}
-		else if ( thePart == "TEC" )
-		{
-			theEndcapHits++;
-
-		// histograms for the Endcaps
-			theEndcapSimHitsX->Fill(theDet->surface().toGlobal((*iHit).localPosition()).x());
-			theEndcapSimHitsY->Fill(theDet->surface().toGlobal((*iHit).localPosition()).y());
-			theEndcapSimHitsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z());
-			theEndcapSimHitsYvsX->Fill(theDet->surface().toGlobal((*iHit).localPosition()).x(),
-				theDet->surface().toGlobal((*iHit).localPosition()).y());
-			theEndcapSimHitsXvsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
-				theDet->surface().toGlobal((*iHit).localPosition()).x());
-			theEndcapSimHitsYvsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
-				theDet->surface().toGlobal((*iHit).localPosition()).y());
-			theEndcapSimHitsRvsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
-				theDet->surface().toGlobal((*iHit).localPosition()).perp());
-			theEndcapSimHitsPhivsX->Fill(theDet->surface().toGlobal((*iHit).localPosition()).x(),
-				angle(theDet->surface().toGlobal((*iHit).localPosition()).phi()));
-			theEndcapSimHitsPhivsY->Fill(theDet->surface().toGlobal((*iHit).localPosition()).y(),
-				angle(theDet->surface().toGlobal((*iHit).localPosition()).phi()));
-			theEndcapSimHitsPhivsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
-				angle(theDet->surface().toGlobal((*iHit).localPosition()).phi()));
-		}
-
-			// histograms for all SimHits (both Barrel and Endcaps)
-		if ( (thePart == "TIB") || (thePart == "TOB") || (thePart == "TEC") )
-		{
-			theSimHitsRvsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
-				theDet->surface().toGlobal((*iHit).localPosition()).perp());
-			theSimHitsPhivsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
-				angle(theDet->surface().toGlobal((*iHit).localPosition()).phi()));
-		}
-
-
-	} // end loop over SimHits
-
-	// some statistics for this event
-	edm::LogInfo("SimAnalyzer") << "     number of SimHits = " << theBarrelHits << "/" 
-		<< theEndcapHits << " (Barrel/Endcap) ";
-
+void SimAnalyzer::trackerStatistics(edm::Event const &theEvent, edm::EventSetup const &theSetup) {
+  LogDebug("SimAnalyzer") << "<SimAnalyzer::trackerStatistics(edm::Event "
+                             "const& theEvent): filling the histograms ... ";
+
+  int theBarrelHits = 0;
+  int theEndcapHits = 0;
+
+  // access the tracker
+  edm::ESHandle<TrackerGeometry> theTrackerGeometry;
+  theSetup.get<TrackerDigiGeometryRecord>().get(theTrackerGeometry);
+  const TrackerGeometry &theTracker(*theTrackerGeometry);
+
+  // the DetUnits
+  TrackingGeometry::DetContainer theDetUnits = theTracker.dets();
+
+  // get the SimHitContainers
+  std::vector<edm::Handle<edm::PSimHitContainer>> theSimHitContainers;
+  theEvent.getManyByType(theSimHitContainers);
+
+  LogDebug("SimAnalyzer") << " Geometry node for TrackingGeometry is  " << &(*theTrackerGeometry) << "\n I have "
+                          << theTrackerGeometry->dets().size() << " detectors "
+                          << "\n I have " << theTrackerGeometry->detTypes().size() << " types "
+                          << "\n theDetUnits has " << theDetUnits.size() << " dets ";
+
+  // theSimHits contains all the sim hits in this event
+  std::vector<PSimHit> theSimHits;
+  for (int i = 0; i < int(theSimHitContainers.size()); i++) {
+    theSimHits.insert(theSimHits.end(), theSimHitContainers.at(i)->begin(), theSimHitContainers.at(i)->end());
+  }
+
+  // loop over the SimHits and fill the histograms
+  for (std::vector<PSimHit>::const_iterator iHit = theSimHits.begin(); iHit != theSimHits.end(); iHit++) {
+    // create a DetId from the detUnitId
+    DetId theDetUnitId((*iHit).detUnitId());
+
+    // get the DetUnit via the DetUnitId and cast it to a StripGeomDetUnit
+    const GeomDet *theDet = theTracker.idToDet(theDetUnitId);
+
+    // the detector part
+    std::string thePart = "";
+
+    LogDebug("SimAnalyzer:SimHitInfo") << " ============================================================ "
+                                       << "\n Some Information for this SimHit: "
+                                       << "\n"
+                                       << *iHit << "\n GlobalPosition = ("
+                                       << theDet->surface().toGlobal((*iHit).localPosition()).x() << ","
+                                       << theDet->surface().toGlobal((*iHit).localPosition()).y() << ","
+                                       << theDet->surface().toGlobal((*iHit).localPosition()).z() << ") "
+                                       << "\n R = " << theDet->surface().toGlobal((*iHit).localPosition()).perp()
+                                       << "\n phi = " << theDet->surface().toGlobal((*iHit).localPosition()).phi()
+                                       << "\n angle(phi) = "
+                                       << angle(theDet->surface().toGlobal((*iHit).localPosition()).phi())
+                                       << "\n GlobalDirection = ("
+                                       << theDet->surface().toGlobal((*iHit).localDirection()).x() << ","
+                                       << theDet->surface().toGlobal((*iHit).localDirection()).y() << ","
+                                       << theDet->surface().toGlobal((*iHit).localDirection()).z() << ") "
+                                       << "\n Total momentum = " << (*iHit).pabs()
+                                       << "\n ParticleType = " << (*iHit).particleType()
+                                       << "\n detUnitId = " << (*iHit).detUnitId();
+
+    // select hits in Barrel and Endcaps
+    switch (theDetUnitId.subdetId()) {
+      case StripSubdetector::TIB: {
+        thePart = "TIB";
+        break;
+      }
+      case StripSubdetector::TOB: {
+        thePart = "TOB";
+        break;
+      }
+      case StripSubdetector::TEC: {
+        thePart = "TEC";
+        break;
+      }
+    }
+
+    if ((thePart == "TIB") || (thePart == "TOB")) {
+      theBarrelHits++;
+
+      // histograms for the Barrel
+      theBarrelSimHitsX->Fill(theDet->surface().toGlobal((*iHit).localPosition()).x());
+      theBarrelSimHitsY->Fill(theDet->surface().toGlobal((*iHit).localPosition()).y());
+      theBarrelSimHitsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z());
+      theBarrelSimHitsYvsX->Fill(theDet->surface().toGlobal((*iHit).localPosition()).x(),
+                                 theDet->surface().toGlobal((*iHit).localPosition()).y());
+      theBarrelSimHitsXvsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
+                                 theDet->surface().toGlobal((*iHit).localPosition()).x());
+      theBarrelSimHitsYvsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
+                                 theDet->surface().toGlobal((*iHit).localPosition()).y());
+      theBarrelSimHitsRvsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
+                                 theDet->surface().toGlobal((*iHit).localPosition()).perp());
+      theBarrelSimHitsPhivsX->Fill(theDet->surface().toGlobal((*iHit).localPosition()).x(),
+                                   angle(theDet->surface().toGlobal((*iHit).localPosition()).phi()));
+      theBarrelSimHitsPhivsY->Fill(theDet->surface().toGlobal((*iHit).localPosition()).y(),
+                                   angle(theDet->surface().toGlobal((*iHit).localPosition()).phi()));
+      theBarrelSimHitsPhivsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
+                                   angle(theDet->surface().toGlobal((*iHit).localPosition()).phi()));
+    } else if (thePart == "TEC") {
+      theEndcapHits++;
+
+      // histograms for the Endcaps
+      theEndcapSimHitsX->Fill(theDet->surface().toGlobal((*iHit).localPosition()).x());
+      theEndcapSimHitsY->Fill(theDet->surface().toGlobal((*iHit).localPosition()).y());
+      theEndcapSimHitsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z());
+      theEndcapSimHitsYvsX->Fill(theDet->surface().toGlobal((*iHit).localPosition()).x(),
+                                 theDet->surface().toGlobal((*iHit).localPosition()).y());
+      theEndcapSimHitsXvsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
+                                 theDet->surface().toGlobal((*iHit).localPosition()).x());
+      theEndcapSimHitsYvsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
+                                 theDet->surface().toGlobal((*iHit).localPosition()).y());
+      theEndcapSimHitsRvsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
+                                 theDet->surface().toGlobal((*iHit).localPosition()).perp());
+      theEndcapSimHitsPhivsX->Fill(theDet->surface().toGlobal((*iHit).localPosition()).x(),
+                                   angle(theDet->surface().toGlobal((*iHit).localPosition()).phi()));
+      theEndcapSimHitsPhivsY->Fill(theDet->surface().toGlobal((*iHit).localPosition()).y(),
+                                   angle(theDet->surface().toGlobal((*iHit).localPosition()).phi()));
+      theEndcapSimHitsPhivsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
+                                   angle(theDet->surface().toGlobal((*iHit).localPosition()).phi()));
+    }
+
+    // histograms for all SimHits (both Barrel and Endcaps)
+    if ((thePart == "TIB") || (thePart == "TOB") || (thePart == "TEC")) {
+      theSimHitsRvsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
+                           theDet->surface().toGlobal((*iHit).localPosition()).perp());
+      theSimHitsPhivsZ->Fill(theDet->surface().toGlobal((*iHit).localPosition()).z(),
+                             angle(theDet->surface().toGlobal((*iHit).localPosition()).phi()));
+    }
+
+  }  // end loop over SimHits
+
+  // some statistics for this event
+  edm::LogInfo("SimAnalyzer") << "     number of SimHits = " << theBarrelHits << "/" << theEndcapHits
+                              << " (Barrel/Endcap) ";
 }
-
diff --git a/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.h b/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.h
index f52eadcbd9447..701ced78e21c7 100644
--- a/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.h
+++ b/Alignment/LaserAlignmentSimulation/test/SimAnalyzer.h
@@ -2,7 +2,8 @@
 #define LaserAlignmentSimulation_SimAnalyzer_H
 
 /** \class SimAnalyzer
- *  Get some statistics and plots about the simulation of the Laser Alignment System
+ *  Get some statistics and plots about the simulation of the Laser Alignment
+ * System
  *
  *  $Date: 2008/01/05 15:30:17 $
  *  $Revision: 1.5 $
@@ -11,9 +12,6 @@
 
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
-
-
 // ROOT
 #include "TH1.h"
 #include "TH2.h"
@@ -21,30 +19,30 @@ class TFile;
 
 #include <iostream>
 
-class SimAnalyzer : public edm::EDAnalyzer
-{
- public:
-	/// constructor
-  explicit SimAnalyzer(edm::ParameterSet const& theConf);
-	/// destructor
+class SimAnalyzer : public edm::EDAnalyzer {
+public:
+  /// constructor
+  explicit SimAnalyzer(edm::ParameterSet const &theConf);
+  /// destructor
   ~SimAnalyzer();
-  
-  /// this method will do the user analysis 
-  virtual void analyze(edm::Event const& theEvent, edm::EventSetup const& theSetup);
-	/// begin job
+
+  /// this method will do the user analysis
+  virtual void analyze(edm::Event const &theEvent, edm::EventSetup const &theSetup);
+  /// begin job
   virtual void beginJob();
-    
- private:
-	/// return angle in radian betwee 0 and 2*pi
+
+private:
+  /// return angle in radian betwee 0 and 2*pi
   double angle(double theAngle);
-	/// write the ROOT file with histograms
+  /// write the ROOT file with histograms
   void closeRootFile();
   /// initialize the histograms
   void initHistograms();
-	/// find the dets which are hit by a laser beam and fill the SimHit info into histograms
-  void trackerStatistics(edm::Event const& theEvent, edm::EventSetup const& theSetup);
-  
- private:
+  /// find the dets which are hit by a laser beam and fill the SimHit info into
+  /// histograms
+  void trackerStatistics(edm::Event const &theEvent, edm::EventSetup const &theSetup);
+
+private:
   int theEvents;
   int theDebugLevel;
   double theSearchPhiTIB;
@@ -54,36 +52,36 @@ class SimAnalyzer : public edm::EDAnalyzer
   double theSearchZTOB;
 
   // Tree stuff
-  TFile * theFile;
+  TFile *theFile;
   int theCompression;
   std::string theFileName;
 
   // the histograms for Barrel Hits
-  TH1D * theBarrelSimHitsX;
-  TH1D * theBarrelSimHitsY;
-  TH1D * theBarrelSimHitsZ;
-  TH2D * theBarrelSimHitsYvsX;
-  TH2D * theBarrelSimHitsXvsZ;
-  TH2D * theBarrelSimHitsYvsZ;
-  TH2D * theBarrelSimHitsRvsZ;
-  TH2D * theBarrelSimHitsPhivsX;
-  TH2D * theBarrelSimHitsPhivsY;
-  TH2D * theBarrelSimHitsPhivsZ;
+  TH1D *theBarrelSimHitsX;
+  TH1D *theBarrelSimHitsY;
+  TH1D *theBarrelSimHitsZ;
+  TH2D *theBarrelSimHitsYvsX;
+  TH2D *theBarrelSimHitsXvsZ;
+  TH2D *theBarrelSimHitsYvsZ;
+  TH2D *theBarrelSimHitsRvsZ;
+  TH2D *theBarrelSimHitsPhivsX;
+  TH2D *theBarrelSimHitsPhivsY;
+  TH2D *theBarrelSimHitsPhivsZ;
 
   // the histograms for Endcap Hits
-  TH1D * theEndcapSimHitsX;
-  TH1D * theEndcapSimHitsY;
-  TH1D * theEndcapSimHitsZ;
-  TH2D * theEndcapSimHitsYvsX;
-  TH2D * theEndcapSimHitsXvsZ;
-  TH2D * theEndcapSimHitsYvsZ;
-  TH2D * theEndcapSimHitsRvsZ;
-  TH2D * theEndcapSimHitsPhivsX;
-  TH2D * theEndcapSimHitsPhivsY;
-  TH2D * theEndcapSimHitsPhivsZ;
+  TH1D *theEndcapSimHitsX;
+  TH1D *theEndcapSimHitsY;
+  TH1D *theEndcapSimHitsZ;
+  TH2D *theEndcapSimHitsYvsX;
+  TH2D *theEndcapSimHitsXvsZ;
+  TH2D *theEndcapSimHitsYvsZ;
+  TH2D *theEndcapSimHitsRvsZ;
+  TH2D *theEndcapSimHitsPhivsX;
+  TH2D *theEndcapSimHitsPhivsY;
+  TH2D *theEndcapSimHitsPhivsZ;
 
   // the histograms for all SimHits
-  TH2D * theSimHitsRvsZ;
-  TH2D * theSimHitsPhivsZ;  
+  TH2D *theSimHitsRvsZ;
+  TH2D *theSimHitsPhivsZ;
 };
 #endif
diff --git a/Alignment/LaserDQM/plugins/LaserDQM.cc b/Alignment/LaserDQM/plugins/LaserDQM.cc
index d467fd4460acf..18f8aca8dd04e 100644
--- a/Alignment/LaserDQM/plugins/LaserDQM.cc
+++ b/Alignment/LaserDQM/plugins/LaserDQM.cc
@@ -7,577 +7,566 @@
  */
 
 #include "Alignment/LaserDQM/plugins/LaserDQM.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h" 
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
-
-
-LaserDQM::LaserDQM(edm::ParameterSet const& theConf) 
-  : theDebugLevel(theConf.getUntrackedParameter<int>("DebugLevel",0)),
-    theSearchPhiTIB(theConf.getUntrackedParameter<double>("SearchWindowPhiTIB",0.05)),
-    theSearchPhiTOB(theConf.getUntrackedParameter<double>("SearchWindowPhiTOB",0.05)),
-    theSearchPhiTEC(theConf.getUntrackedParameter<double>("SearchWindowPhiTEC",0.05)),
-    theSearchZTIB(theConf.getUntrackedParameter<double>("SearchWindowZTIB",1.0)),
-    theSearchZTOB(theConf.getUntrackedParameter<double>("SearchWindowZTOB",1.0)),
-    theDigiProducersList(theConf.getParameter<Parameters>("DigiProducersList")),
-    theDQMFileName(theConf.getUntrackedParameter<std::string>("DQMFileName","testDQM.root")),
-    theDaqMonitorBEI(),
-    theMEBeam0Ring4Disc1PosAdcCounts(nullptr),
-    theMEBeam0Ring4Disc2PosAdcCounts(nullptr),
-    theMEBeam0Ring4Disc3PosAdcCounts(nullptr),
-    theMEBeam0Ring4Disc4PosAdcCounts(nullptr),
-    theMEBeam0Ring4Disc5PosAdcCounts(nullptr),
-    theMEBeam0Ring4Disc6PosAdcCounts(nullptr),
-    theMEBeam0Ring4Disc7PosAdcCounts(nullptr),
-    theMEBeam0Ring4Disc8PosAdcCounts(nullptr),
-    theMEBeam0Ring4Disc9PosAdcCounts(nullptr),
-    // Adc counts for Beam 1 in Ring 4
-    theMEBeam1Ring4Disc1PosAdcCounts(nullptr),
-    theMEBeam1Ring4Disc2PosAdcCounts(nullptr),
-    theMEBeam1Ring4Disc3PosAdcCounts(nullptr),
-    theMEBeam1Ring4Disc4PosAdcCounts(nullptr),
-    theMEBeam1Ring4Disc5PosAdcCounts(nullptr),
-    theMEBeam1Ring4Disc6PosAdcCounts(nullptr),
-    theMEBeam1Ring4Disc7PosAdcCounts(nullptr),
-    theMEBeam1Ring4Disc8PosAdcCounts(nullptr),
-    theMEBeam1Ring4Disc9PosAdcCounts(nullptr),
-    // plots for TEC2TEC
-    theMEBeam1Ring4Disc1PosTEC2TECAdcCounts(nullptr),
-    theMEBeam1Ring4Disc2PosTEC2TECAdcCounts(nullptr),
-    theMEBeam1Ring4Disc3PosTEC2TECAdcCounts(nullptr),
-    theMEBeam1Ring4Disc4PosTEC2TECAdcCounts(nullptr),
-    theMEBeam1Ring4Disc5PosTEC2TECAdcCounts(nullptr),
-    // Adc counts for Beam 2 in Ring 4
-    theMEBeam2Ring4Disc1PosAdcCounts(nullptr),
-    theMEBeam2Ring4Disc2PosAdcCounts(nullptr),
-    theMEBeam2Ring4Disc3PosAdcCounts(nullptr),
-    theMEBeam2Ring4Disc4PosAdcCounts(nullptr),
-    theMEBeam2Ring4Disc5PosAdcCounts(nullptr),
-    theMEBeam2Ring4Disc6PosAdcCounts(nullptr),
-    theMEBeam2Ring4Disc7PosAdcCounts(nullptr),
-    theMEBeam2Ring4Disc8PosAdcCounts(nullptr),
-    theMEBeam2Ring4Disc9PosAdcCounts(nullptr),
-    // plots for TEC2TEC
-    theMEBeam2Ring4Disc1PosTEC2TECAdcCounts(nullptr),
-    theMEBeam2Ring4Disc2PosTEC2TECAdcCounts(nullptr),
-    theMEBeam2Ring4Disc3PosTEC2TECAdcCounts(nullptr),
-    theMEBeam2Ring4Disc4PosTEC2TECAdcCounts(nullptr),
-    theMEBeam2Ring4Disc5PosTEC2TECAdcCounts(nullptr),
-    // Adc counts for Beam 3 in Ring 4
-    theMEBeam3Ring4Disc1PosAdcCounts(nullptr),
-    theMEBeam3Ring4Disc2PosAdcCounts(nullptr),
-    theMEBeam3Ring4Disc3PosAdcCounts(nullptr),
-    theMEBeam3Ring4Disc4PosAdcCounts(nullptr),
-    theMEBeam3Ring4Disc5PosAdcCounts(nullptr),
-    theMEBeam3Ring4Disc6PosAdcCounts(nullptr),
-    theMEBeam3Ring4Disc7PosAdcCounts(nullptr),
-    theMEBeam3Ring4Disc8PosAdcCounts(nullptr),
-    theMEBeam3Ring4Disc9PosAdcCounts(nullptr),
-    // Adc counts for Beam 4 in Ring 4
-    theMEBeam4Ring4Disc1PosAdcCounts(nullptr),
-    theMEBeam4Ring4Disc2PosAdcCounts(nullptr),
-    theMEBeam4Ring4Disc3PosAdcCounts(nullptr),
-    theMEBeam4Ring4Disc4PosAdcCounts(nullptr),
-    theMEBeam4Ring4Disc5PosAdcCounts(nullptr),
-    theMEBeam4Ring4Disc6PosAdcCounts(nullptr),
-    theMEBeam4Ring4Disc7PosAdcCounts(nullptr),
-    theMEBeam4Ring4Disc8PosAdcCounts(nullptr),
-    theMEBeam4Ring4Disc9PosAdcCounts(nullptr),
-    // plots for TEC2TEC
-    theMEBeam4Ring4Disc1PosTEC2TECAdcCounts(nullptr),
-    theMEBeam4Ring4Disc2PosTEC2TECAdcCounts(nullptr),
-    theMEBeam4Ring4Disc3PosTEC2TECAdcCounts(nullptr),
-    theMEBeam4Ring4Disc4PosTEC2TECAdcCounts(nullptr),
-    theMEBeam4Ring4Disc5PosTEC2TECAdcCounts(nullptr),
-    // Adc counts for Beam 5 in Ring 4
-    theMEBeam5Ring4Disc1PosAdcCounts(nullptr),
-    theMEBeam5Ring4Disc2PosAdcCounts(nullptr),
-    theMEBeam5Ring4Disc3PosAdcCounts(nullptr),
-    theMEBeam5Ring4Disc4PosAdcCounts(nullptr),
-    theMEBeam5Ring4Disc5PosAdcCounts(nullptr),
-    theMEBeam5Ring4Disc6PosAdcCounts(nullptr),
-    theMEBeam5Ring4Disc7PosAdcCounts(nullptr),
-    theMEBeam5Ring4Disc8PosAdcCounts(nullptr),
-    theMEBeam5Ring4Disc9PosAdcCounts(nullptr),
-    // Adc counts for Beam 6 in Ring 4
-    theMEBeam6Ring4Disc1PosAdcCounts(nullptr),
-    theMEBeam6Ring4Disc2PosAdcCounts(nullptr),
-    theMEBeam6Ring4Disc3PosAdcCounts(nullptr),
-    theMEBeam6Ring4Disc4PosAdcCounts(nullptr),
-    theMEBeam6Ring4Disc5PosAdcCounts(nullptr),
-    theMEBeam6Ring4Disc6PosAdcCounts(nullptr),
-    theMEBeam6Ring4Disc7PosAdcCounts(nullptr),
-    theMEBeam6Ring4Disc8PosAdcCounts(nullptr),
-    theMEBeam6Ring4Disc9PosAdcCounts(nullptr),
-    // plots for TEC2TEC
-    theMEBeam6Ring4Disc1PosTEC2TECAdcCounts(nullptr),
-    theMEBeam6Ring4Disc2PosTEC2TECAdcCounts(nullptr),
-    theMEBeam6Ring4Disc3PosTEC2TECAdcCounts(nullptr),
-    theMEBeam6Ring4Disc4PosTEC2TECAdcCounts(nullptr),
-    theMEBeam6Ring4Disc5PosTEC2TECAdcCounts(nullptr),
-    // Adc counts for Beam 7 in Ring 4
-    theMEBeam7Ring4Disc1PosAdcCounts(nullptr),
-    theMEBeam7Ring4Disc2PosAdcCounts(nullptr),
-    theMEBeam7Ring4Disc3PosAdcCounts(nullptr),
-    theMEBeam7Ring4Disc4PosAdcCounts(nullptr),
-    theMEBeam7Ring4Disc5PosAdcCounts(nullptr),
-    theMEBeam7Ring4Disc6PosAdcCounts(nullptr),
-    theMEBeam7Ring4Disc7PosAdcCounts(nullptr),
-    theMEBeam7Ring4Disc8PosAdcCounts(nullptr),
-    theMEBeam7Ring4Disc9PosAdcCounts(nullptr),
-    // plots for TEC2TEC
-    theMEBeam7Ring4Disc1PosTEC2TECAdcCounts(nullptr),
-    theMEBeam7Ring4Disc2PosTEC2TECAdcCounts(nullptr),
-    theMEBeam7Ring4Disc3PosTEC2TECAdcCounts(nullptr),
-    theMEBeam7Ring4Disc4PosTEC2TECAdcCounts(nullptr),
-    theMEBeam7Ring4Disc5PosTEC2TECAdcCounts(nullptr),
-    // Adc counts for Beam 0 in Ring 6
-    theMEBeam0Ring6Disc1PosAdcCounts(nullptr),
-    theMEBeam0Ring6Disc2PosAdcCounts(nullptr),
-    theMEBeam0Ring6Disc3PosAdcCounts(nullptr),
-    theMEBeam0Ring6Disc4PosAdcCounts(nullptr),
-    theMEBeam0Ring6Disc5PosAdcCounts(nullptr),
-    theMEBeam0Ring6Disc6PosAdcCounts(nullptr),
-    theMEBeam0Ring6Disc7PosAdcCounts(nullptr),
-    theMEBeam0Ring6Disc8PosAdcCounts(nullptr),
-    theMEBeam0Ring6Disc9PosAdcCounts(nullptr),
-    // Adc counts for Beam 1 in Ring 6
-    theMEBeam1Ring6Disc1PosAdcCounts(nullptr),
-    theMEBeam1Ring6Disc2PosAdcCounts(nullptr),
-    theMEBeam1Ring6Disc3PosAdcCounts(nullptr),
-    theMEBeam1Ring6Disc4PosAdcCounts(nullptr),
-    theMEBeam1Ring6Disc5PosAdcCounts(nullptr),
-    theMEBeam1Ring6Disc6PosAdcCounts(nullptr),
-    theMEBeam1Ring6Disc7PosAdcCounts(nullptr),
-    theMEBeam1Ring6Disc8PosAdcCounts(nullptr),
-    theMEBeam1Ring6Disc9PosAdcCounts(nullptr),
-    // Adc counts for Beam 2 in Ring 6
-    theMEBeam2Ring6Disc1PosAdcCounts(nullptr),
-    theMEBeam2Ring6Disc2PosAdcCounts(nullptr),
-    theMEBeam2Ring6Disc3PosAdcCounts(nullptr),
-    theMEBeam2Ring6Disc4PosAdcCounts(nullptr),
-    theMEBeam2Ring6Disc5PosAdcCounts(nullptr),
-    theMEBeam2Ring6Disc6PosAdcCounts(nullptr),
-    theMEBeam2Ring6Disc7PosAdcCounts(nullptr),
-    theMEBeam2Ring6Disc8PosAdcCounts(nullptr),
-    theMEBeam2Ring6Disc9PosAdcCounts(nullptr),
-    // Adc counts for Beam 3 in Ring 6
-    theMEBeam3Ring6Disc1PosAdcCounts(nullptr),
-    theMEBeam3Ring6Disc2PosAdcCounts(nullptr),
-    theMEBeam3Ring6Disc3PosAdcCounts(nullptr),
-    theMEBeam3Ring6Disc4PosAdcCounts(nullptr),
-    theMEBeam3Ring6Disc5PosAdcCounts(nullptr),
-    theMEBeam3Ring6Disc6PosAdcCounts(nullptr),
-    theMEBeam3Ring6Disc7PosAdcCounts(nullptr),
-    theMEBeam3Ring6Disc8PosAdcCounts(nullptr),
-    theMEBeam3Ring6Disc9PosAdcCounts(nullptr),
-    // Adc counts for Beam 4 in Ring 6
-    theMEBeam4Ring6Disc1PosAdcCounts(nullptr),
-    theMEBeam4Ring6Disc2PosAdcCounts(nullptr),
-    theMEBeam4Ring6Disc3PosAdcCounts(nullptr),
-    theMEBeam4Ring6Disc4PosAdcCounts(nullptr),
-    theMEBeam4Ring6Disc5PosAdcCounts(nullptr),
-    theMEBeam4Ring6Disc6PosAdcCounts(nullptr),
-    theMEBeam4Ring6Disc7PosAdcCounts(nullptr),
-    theMEBeam4Ring6Disc8PosAdcCounts(nullptr),
-    theMEBeam4Ring6Disc9PosAdcCounts(nullptr),
-    // Adc counts for Beam 5 in Ring 6
-    theMEBeam5Ring6Disc1PosAdcCounts(nullptr),
-    theMEBeam5Ring6Disc2PosAdcCounts(nullptr),
-    theMEBeam5Ring6Disc3PosAdcCounts(nullptr),
-    theMEBeam5Ring6Disc4PosAdcCounts(nullptr),
-    theMEBeam5Ring6Disc5PosAdcCounts(nullptr),
-    theMEBeam5Ring6Disc6PosAdcCounts(nullptr),
-    theMEBeam5Ring6Disc7PosAdcCounts(nullptr),
-    theMEBeam5Ring6Disc8PosAdcCounts(nullptr),
-    theMEBeam5Ring6Disc9PosAdcCounts(nullptr),
-    // Adc counts for Beam 6 in Ring 6
-    theMEBeam6Ring6Disc1PosAdcCounts(nullptr),
-    theMEBeam6Ring6Disc2PosAdcCounts(nullptr),
-    theMEBeam6Ring6Disc3PosAdcCounts(nullptr),
-    theMEBeam6Ring6Disc4PosAdcCounts(nullptr),
-    theMEBeam6Ring6Disc5PosAdcCounts(nullptr),
-    theMEBeam6Ring6Disc6PosAdcCounts(nullptr),
-    theMEBeam6Ring6Disc7PosAdcCounts(nullptr),
-    theMEBeam6Ring6Disc8PosAdcCounts(nullptr),
-    theMEBeam6Ring6Disc9PosAdcCounts(nullptr),
-    // Adc counts for Beam 7 in Ring 6
-    theMEBeam7Ring6Disc1PosAdcCounts(nullptr),
-    theMEBeam7Ring6Disc2PosAdcCounts(nullptr),
-    theMEBeam7Ring6Disc3PosAdcCounts(nullptr),
-    theMEBeam7Ring6Disc4PosAdcCounts(nullptr),
-    theMEBeam7Ring6Disc5PosAdcCounts(nullptr),
-    theMEBeam7Ring6Disc6PosAdcCounts(nullptr),
-    theMEBeam7Ring6Disc7PosAdcCounts(nullptr),
-    theMEBeam7Ring6Disc8PosAdcCounts(nullptr),
-    theMEBeam7Ring6Disc9PosAdcCounts(nullptr),
-    /* Laser Beams in TEC- */
-    // Adc counts for Beam 0 in Ring 4
-    theMEBeam0Ring4Disc1NegAdcCounts(nullptr),
-    theMEBeam0Ring4Disc2NegAdcCounts(nullptr),
-    theMEBeam0Ring4Disc3NegAdcCounts(nullptr),
-    theMEBeam0Ring4Disc4NegAdcCounts(nullptr),
-    theMEBeam0Ring4Disc5NegAdcCounts(nullptr),
-    theMEBeam0Ring4Disc6NegAdcCounts(nullptr),
-    theMEBeam0Ring4Disc7NegAdcCounts(nullptr),
-    theMEBeam0Ring4Disc8NegAdcCounts(nullptr),
-    theMEBeam0Ring4Disc9NegAdcCounts(nullptr),
-    // Adc counts for Beam 1 in Ring 4
-    theMEBeam1Ring4Disc1NegAdcCounts(nullptr),
-    theMEBeam1Ring4Disc2NegAdcCounts(nullptr),
-    theMEBeam1Ring4Disc3NegAdcCounts(nullptr),
-    theMEBeam1Ring4Disc4NegAdcCounts(nullptr),
-    theMEBeam1Ring4Disc5NegAdcCounts(nullptr),
-    theMEBeam1Ring4Disc6NegAdcCounts(nullptr),
-    theMEBeam1Ring4Disc7NegAdcCounts(nullptr),
-    theMEBeam1Ring4Disc8NegAdcCounts(nullptr),
-    theMEBeam1Ring4Disc9NegAdcCounts(nullptr),
-    // plots for TEC2TEC
-    theMEBeam1Ring4Disc1NegTEC2TECAdcCounts(nullptr),
-    theMEBeam1Ring4Disc2NegTEC2TECAdcCounts(nullptr),
-    theMEBeam1Ring4Disc3NegTEC2TECAdcCounts(nullptr),
-    theMEBeam1Ring4Disc4NegTEC2TECAdcCounts(nullptr),
-    theMEBeam1Ring4Disc5NegTEC2TECAdcCounts(nullptr),
-    // Adc counts for Beam 2 in Ring 4
-    theMEBeam2Ring4Disc1NegAdcCounts(nullptr),
-    theMEBeam2Ring4Disc2NegAdcCounts(nullptr),
-    theMEBeam2Ring4Disc3NegAdcCounts(nullptr),
-    theMEBeam2Ring4Disc4NegAdcCounts(nullptr),
-    theMEBeam2Ring4Disc5NegAdcCounts(nullptr),
-    theMEBeam2Ring4Disc6NegAdcCounts(nullptr),
-    theMEBeam2Ring4Disc7NegAdcCounts(nullptr),
-    theMEBeam2Ring4Disc8NegAdcCounts(nullptr),
-    theMEBeam2Ring4Disc9NegAdcCounts(nullptr),
-    // plots for TEC2TEC
-    theMEBeam2Ring4Disc1NegTEC2TECAdcCounts(nullptr),
-    theMEBeam2Ring4Disc2NegTEC2TECAdcCounts(nullptr),
-    theMEBeam2Ring4Disc3NegTEC2TECAdcCounts(nullptr),
-    theMEBeam2Ring4Disc4NegTEC2TECAdcCounts(nullptr),
-    theMEBeam2Ring4Disc5NegTEC2TECAdcCounts(nullptr),
-    // Adc counts for Beam 3 in Ring 4
-    theMEBeam3Ring4Disc1NegAdcCounts(nullptr),
-    theMEBeam3Ring4Disc2NegAdcCounts(nullptr),
-    theMEBeam3Ring4Disc3NegAdcCounts(nullptr),
-    theMEBeam3Ring4Disc4NegAdcCounts(nullptr),
-    theMEBeam3Ring4Disc5NegAdcCounts(nullptr),
-    theMEBeam3Ring4Disc6NegAdcCounts(nullptr),
-    theMEBeam3Ring4Disc7NegAdcCounts(nullptr),
-    theMEBeam3Ring4Disc8NegAdcCounts(nullptr),
-    theMEBeam3Ring4Disc9NegAdcCounts(nullptr),
-    // Adc counts for Beam 4 in Ring 4
-    theMEBeam4Ring4Disc1NegAdcCounts(nullptr),
-    theMEBeam4Ring4Disc2NegAdcCounts(nullptr),
-    theMEBeam4Ring4Disc3NegAdcCounts(nullptr),
-    theMEBeam4Ring4Disc4NegAdcCounts(nullptr),
-    theMEBeam4Ring4Disc5NegAdcCounts(nullptr),
-    theMEBeam4Ring4Disc6NegAdcCounts(nullptr),
-    theMEBeam4Ring4Disc7NegAdcCounts(nullptr),
-    theMEBeam4Ring4Disc8NegAdcCounts(nullptr),
-    theMEBeam4Ring4Disc9NegAdcCounts(nullptr),
-    // plots for TEC2TEC
-    theMEBeam4Ring4Disc1NegTEC2TECAdcCounts(nullptr),
-    theMEBeam4Ring4Disc2NegTEC2TECAdcCounts(nullptr),
-    theMEBeam4Ring4Disc3NegTEC2TECAdcCounts(nullptr),
-    theMEBeam4Ring4Disc4NegTEC2TECAdcCounts(nullptr),
-    theMEBeam4Ring4Disc5NegTEC2TECAdcCounts(nullptr),
-    // Adc counts for Beam 5 in Ring 4
-    theMEBeam5Ring4Disc1NegAdcCounts(nullptr),
-    theMEBeam5Ring4Disc2NegAdcCounts(nullptr),
-    theMEBeam5Ring4Disc3NegAdcCounts(nullptr),
-    theMEBeam5Ring4Disc4NegAdcCounts(nullptr),
-    theMEBeam5Ring4Disc5NegAdcCounts(nullptr),
-    theMEBeam5Ring4Disc6NegAdcCounts(nullptr),
-    theMEBeam5Ring4Disc7NegAdcCounts(nullptr),
-    theMEBeam5Ring4Disc8NegAdcCounts(nullptr),
-    theMEBeam5Ring4Disc9NegAdcCounts(nullptr),
-    // Adc counts for Beam 6 in Ring 4
-    theMEBeam6Ring4Disc1NegAdcCounts(nullptr),
-    theMEBeam6Ring4Disc2NegAdcCounts(nullptr),
-    theMEBeam6Ring4Disc3NegAdcCounts(nullptr),
-    theMEBeam6Ring4Disc4NegAdcCounts(nullptr),
-    theMEBeam6Ring4Disc5NegAdcCounts(nullptr),
-    theMEBeam6Ring4Disc6NegAdcCounts(nullptr),
-    theMEBeam6Ring4Disc7NegAdcCounts(nullptr),
-    theMEBeam6Ring4Disc8NegAdcCounts(nullptr),
-    theMEBeam6Ring4Disc9NegAdcCounts(nullptr),
-    // plots for TEC2TEC
-    theMEBeam6Ring4Disc1NegTEC2TECAdcCounts(nullptr),
-    theMEBeam6Ring4Disc2NegTEC2TECAdcCounts(nullptr),
-    theMEBeam6Ring4Disc3NegTEC2TECAdcCounts(nullptr),
-    theMEBeam6Ring4Disc4NegTEC2TECAdcCounts(nullptr),
-    theMEBeam6Ring4Disc5NegTEC2TECAdcCounts(nullptr),
-    // Adc counts for Beam 7 in Ring 4
-    theMEBeam7Ring4Disc1NegAdcCounts(nullptr),
-    theMEBeam7Ring4Disc2NegAdcCounts(nullptr),
-    theMEBeam7Ring4Disc3NegAdcCounts(nullptr),
-    theMEBeam7Ring4Disc4NegAdcCounts(nullptr),
-    theMEBeam7Ring4Disc5NegAdcCounts(nullptr),
-    theMEBeam7Ring4Disc6NegAdcCounts(nullptr),
-    theMEBeam7Ring4Disc7NegAdcCounts(nullptr),
-    theMEBeam7Ring4Disc8NegAdcCounts(nullptr),
-    theMEBeam7Ring4Disc9NegAdcCounts(nullptr),
-    // plots for TEC2TEC
-    theMEBeam7Ring4Disc1NegTEC2TECAdcCounts(nullptr),
-    theMEBeam7Ring4Disc2NegTEC2TECAdcCounts(nullptr),
-    theMEBeam7Ring4Disc3NegTEC2TECAdcCounts(nullptr),
-    theMEBeam7Ring4Disc4NegTEC2TECAdcCounts(nullptr),
-    theMEBeam7Ring4Disc5NegTEC2TECAdcCounts(nullptr),
-    // Adc counts for Beam 0 in Ring 6
-    theMEBeam0Ring6Disc1NegAdcCounts(nullptr),
-    theMEBeam0Ring6Disc2NegAdcCounts(nullptr),
-    theMEBeam0Ring6Disc3NegAdcCounts(nullptr),
-    theMEBeam0Ring6Disc4NegAdcCounts(nullptr),
-    theMEBeam0Ring6Disc5NegAdcCounts(nullptr),
-    theMEBeam0Ring6Disc6NegAdcCounts(nullptr),
-    theMEBeam0Ring6Disc7NegAdcCounts(nullptr),
-    theMEBeam0Ring6Disc8NegAdcCounts(nullptr),
-    theMEBeam0Ring6Disc9NegAdcCounts(nullptr),
-    // Adc counts for Beam 1 in Ring 6
-    theMEBeam1Ring6Disc1NegAdcCounts(nullptr),
-    theMEBeam1Ring6Disc2NegAdcCounts(nullptr),
-    theMEBeam1Ring6Disc3NegAdcCounts(nullptr),
-    theMEBeam1Ring6Disc4NegAdcCounts(nullptr),
-    theMEBeam1Ring6Disc5NegAdcCounts(nullptr),
-    theMEBeam1Ring6Disc6NegAdcCounts(nullptr),
-    theMEBeam1Ring6Disc7NegAdcCounts(nullptr),
-    theMEBeam1Ring6Disc8NegAdcCounts(nullptr),
-    theMEBeam1Ring6Disc9NegAdcCounts(nullptr),
-    // Adc counts for Beam 2 in Ring 6
-    theMEBeam2Ring6Disc1NegAdcCounts(nullptr),
-    theMEBeam2Ring6Disc2NegAdcCounts(nullptr),
-    theMEBeam2Ring6Disc3NegAdcCounts(nullptr),
-    theMEBeam2Ring6Disc4NegAdcCounts(nullptr),
-    theMEBeam2Ring6Disc5NegAdcCounts(nullptr),
-    theMEBeam2Ring6Disc6NegAdcCounts(nullptr),
-    theMEBeam2Ring6Disc7NegAdcCounts(nullptr),
-    theMEBeam2Ring6Disc8NegAdcCounts(nullptr),
-    theMEBeam2Ring6Disc9NegAdcCounts(nullptr),
-    // Adc counts for Beam 3 in Ring 6
-    theMEBeam3Ring6Disc1NegAdcCounts(nullptr),
-    theMEBeam3Ring6Disc2NegAdcCounts(nullptr),
-    theMEBeam3Ring6Disc3NegAdcCounts(nullptr),
-    theMEBeam3Ring6Disc4NegAdcCounts(nullptr),
-    theMEBeam3Ring6Disc5NegAdcCounts(nullptr),
-    theMEBeam3Ring6Disc6NegAdcCounts(nullptr),
-    theMEBeam3Ring6Disc7NegAdcCounts(nullptr),
-    theMEBeam3Ring6Disc8NegAdcCounts(nullptr),
-    theMEBeam3Ring6Disc9NegAdcCounts(nullptr),
-    // Adc counts for Beam 4 in Ring 6
-    theMEBeam4Ring6Disc1NegAdcCounts(nullptr),
-    theMEBeam4Ring6Disc2NegAdcCounts(nullptr),
-    theMEBeam4Ring6Disc3NegAdcCounts(nullptr),
-    theMEBeam4Ring6Disc4NegAdcCounts(nullptr),
-    theMEBeam4Ring6Disc5NegAdcCounts(nullptr),
-    theMEBeam4Ring6Disc6NegAdcCounts(nullptr),
-    theMEBeam4Ring6Disc7NegAdcCounts(nullptr),
-    theMEBeam4Ring6Disc8NegAdcCounts(nullptr),
-    theMEBeam4Ring6Disc9NegAdcCounts(nullptr),
-    // Adc counts for Beam 5 in Ring 6
-    theMEBeam5Ring6Disc1NegAdcCounts(nullptr),
-    theMEBeam5Ring6Disc2NegAdcCounts(nullptr),
-    theMEBeam5Ring6Disc3NegAdcCounts(nullptr),
-    theMEBeam5Ring6Disc4NegAdcCounts(nullptr),
-    theMEBeam5Ring6Disc5NegAdcCounts(nullptr),
-    theMEBeam5Ring6Disc6NegAdcCounts(nullptr),
-    theMEBeam5Ring6Disc7NegAdcCounts(nullptr),
-    theMEBeam5Ring6Disc8NegAdcCounts(nullptr),
-    theMEBeam5Ring6Disc9NegAdcCounts(nullptr),
-    // Adc counts for Beam 6 in Ring 6
-    theMEBeam6Ring6Disc1NegAdcCounts(nullptr),
-    theMEBeam6Ring6Disc2NegAdcCounts(nullptr),
-    theMEBeam6Ring6Disc3NegAdcCounts(nullptr),
-    theMEBeam6Ring6Disc4NegAdcCounts(nullptr),
-    theMEBeam6Ring6Disc5NegAdcCounts(nullptr),
-    theMEBeam6Ring6Disc6NegAdcCounts(nullptr),
-    theMEBeam6Ring6Disc7NegAdcCounts(nullptr),
-    theMEBeam6Ring6Disc8NegAdcCounts(nullptr),
-    theMEBeam6Ring6Disc9NegAdcCounts(nullptr),
-    // Adc counts for Beam 7 in Ring 6
-    theMEBeam7Ring6Disc1NegAdcCounts(nullptr),
-    theMEBeam7Ring6Disc2NegAdcCounts(nullptr),
-    theMEBeam7Ring6Disc3NegAdcCounts(nullptr),
-    theMEBeam7Ring6Disc4NegAdcCounts(nullptr),
-    theMEBeam7Ring6Disc5NegAdcCounts(nullptr),
-    theMEBeam7Ring6Disc6NegAdcCounts(nullptr),
-    theMEBeam7Ring6Disc7NegAdcCounts(nullptr),
-    theMEBeam7Ring6Disc8NegAdcCounts(nullptr),
-    theMEBeam7Ring6Disc9NegAdcCounts(nullptr),
-    // TOB Beams
-    // Adc counts for Beam 0
-    theMEBeam0TOBPosition1AdcCounts(nullptr),
-    theMEBeam0TOBPosition2AdcCounts(nullptr),
-    theMEBeam0TOBPosition3AdcCounts(nullptr),
-    theMEBeam0TOBPosition4AdcCounts(nullptr),
-    theMEBeam0TOBPosition5AdcCounts(nullptr),
-    theMEBeam0TOBPosition6AdcCounts(nullptr),
-    // Adc counts for Beam 1
-    theMEBeam1TOBPosition1AdcCounts(nullptr),
-    theMEBeam1TOBPosition2AdcCounts(nullptr),
-    theMEBeam1TOBPosition3AdcCounts(nullptr),
-    theMEBeam1TOBPosition4AdcCounts(nullptr),
-    theMEBeam1TOBPosition5AdcCounts(nullptr),
-    theMEBeam1TOBPosition6AdcCounts(nullptr),
-    // Adc counts for Beam 2
-    theMEBeam2TOBPosition1AdcCounts(nullptr),
-    theMEBeam2TOBPosition2AdcCounts(nullptr),
-    theMEBeam2TOBPosition3AdcCounts(nullptr),
-    theMEBeam2TOBPosition4AdcCounts(nullptr),
-    theMEBeam2TOBPosition5AdcCounts(nullptr),
-    theMEBeam2TOBPosition6AdcCounts(nullptr),
-    // Adc counts for Beam 3
-    theMEBeam3TOBPosition1AdcCounts(nullptr),
-    theMEBeam3TOBPosition2AdcCounts(nullptr),
-    theMEBeam3TOBPosition3AdcCounts(nullptr),
-    theMEBeam3TOBPosition4AdcCounts(nullptr),
-    theMEBeam3TOBPosition5AdcCounts(nullptr),
-    theMEBeam3TOBPosition6AdcCounts(nullptr),
-    // Adc counts for Beam 4
-    theMEBeam4TOBPosition1AdcCounts(nullptr),
-    theMEBeam4TOBPosition2AdcCounts(nullptr),
-    theMEBeam4TOBPosition3AdcCounts(nullptr),
-    theMEBeam4TOBPosition4AdcCounts(nullptr),
-    theMEBeam4TOBPosition5AdcCounts(nullptr),
-    theMEBeam4TOBPosition6AdcCounts(nullptr),
-    // Adc counts for Beam 5
-    theMEBeam5TOBPosition1AdcCounts(nullptr),
-    theMEBeam5TOBPosition2AdcCounts(nullptr),
-    theMEBeam5TOBPosition3AdcCounts(nullptr),
-    theMEBeam5TOBPosition4AdcCounts(nullptr),
-    theMEBeam5TOBPosition5AdcCounts(nullptr),
-    theMEBeam5TOBPosition6AdcCounts(nullptr),
-    // Adc counts for Beam 6
-    theMEBeam6TOBPosition1AdcCounts(nullptr),
-    theMEBeam6TOBPosition2AdcCounts(nullptr),
-    theMEBeam6TOBPosition3AdcCounts(nullptr),
-    theMEBeam6TOBPosition4AdcCounts(nullptr),
-    theMEBeam6TOBPosition5AdcCounts(nullptr),
-    theMEBeam6TOBPosition6AdcCounts(nullptr),
-    // Adc counts for Beam 7
-    theMEBeam7TOBPosition1AdcCounts(nullptr),
-    theMEBeam7TOBPosition2AdcCounts(nullptr),
-    theMEBeam7TOBPosition3AdcCounts(nullptr),
-    theMEBeam7TOBPosition4AdcCounts(nullptr),
-    theMEBeam7TOBPosition5AdcCounts(nullptr),
-    theMEBeam7TOBPosition6AdcCounts(nullptr),
-    // TIB Beams
-    // Adc counts for Beam 0
-    theMEBeam0TIBPosition1AdcCounts(nullptr),
-    theMEBeam0TIBPosition2AdcCounts(nullptr),
-    theMEBeam0TIBPosition3AdcCounts(nullptr),
-    theMEBeam0TIBPosition4AdcCounts(nullptr),
-    theMEBeam0TIBPosition5AdcCounts(nullptr),
-    theMEBeam0TIBPosition6AdcCounts(nullptr),
-    // Adc counts for Beam 1
-    theMEBeam1TIBPosition1AdcCounts(nullptr),
-    theMEBeam1TIBPosition2AdcCounts(nullptr),
-    theMEBeam1TIBPosition3AdcCounts(nullptr),
-    theMEBeam1TIBPosition4AdcCounts(nullptr),
-    theMEBeam1TIBPosition5AdcCounts(nullptr),
-    theMEBeam1TIBPosition6AdcCounts(nullptr),
-    // Adc counts for Beam 2
-    theMEBeam2TIBPosition1AdcCounts(nullptr),
-    theMEBeam2TIBPosition2AdcCounts(nullptr),
-    theMEBeam2TIBPosition3AdcCounts(nullptr),
-    theMEBeam2TIBPosition4AdcCounts(nullptr),
-    theMEBeam2TIBPosition5AdcCounts(nullptr),
-    theMEBeam2TIBPosition6AdcCounts(nullptr),
-    // Adc counts for Beam 3
-    theMEBeam3TIBPosition1AdcCounts(nullptr),
-    theMEBeam3TIBPosition2AdcCounts(nullptr),
-    theMEBeam3TIBPosition3AdcCounts(nullptr),
-    theMEBeam3TIBPosition4AdcCounts(nullptr),
-    theMEBeam3TIBPosition5AdcCounts(nullptr),
-    theMEBeam3TIBPosition6AdcCounts(nullptr),
-    // Adc counts for Beam 4
-    theMEBeam4TIBPosition1AdcCounts(nullptr),
-    theMEBeam4TIBPosition2AdcCounts(nullptr),
-    theMEBeam4TIBPosition3AdcCounts(nullptr),
-    theMEBeam4TIBPosition4AdcCounts(nullptr),
-    theMEBeam4TIBPosition5AdcCounts(nullptr),
-    theMEBeam4TIBPosition6AdcCounts(nullptr),
-    // Adc counts for Beam 5
-    theMEBeam5TIBPosition1AdcCounts(nullptr),
-    theMEBeam5TIBPosition2AdcCounts(nullptr),
-    theMEBeam5TIBPosition3AdcCounts(nullptr),
-    theMEBeam5TIBPosition4AdcCounts(nullptr),
-    theMEBeam5TIBPosition5AdcCounts(nullptr),
-    theMEBeam5TIBPosition6AdcCounts(nullptr),
-    // Adc counts for Beam 6
-    theMEBeam6TIBPosition1AdcCounts(nullptr),
-    theMEBeam6TIBPosition2AdcCounts(nullptr),
-    theMEBeam6TIBPosition3AdcCounts(nullptr),
-    theMEBeam6TIBPosition4AdcCounts(nullptr),
-    theMEBeam6TIBPosition5AdcCounts(nullptr),
-    theMEBeam6TIBPosition6AdcCounts(nullptr),
-    // Adc counts for Beam 7
-    theMEBeam7TIBPosition1AdcCounts(nullptr),
-    theMEBeam7TIBPosition2AdcCounts(nullptr),
-    theMEBeam7TIBPosition3AdcCounts(nullptr),
-    theMEBeam7TIBPosition4AdcCounts(nullptr),
-    theMEBeam7TIBPosition5AdcCounts(nullptr),
-    theMEBeam7TIBPosition6AdcCounts(nullptr)
-{
-  // load the configuration from the ParameterSet  
+LaserDQM::LaserDQM(edm::ParameterSet const &theConf)
+    : theDebugLevel(theConf.getUntrackedParameter<int>("DebugLevel", 0)),
+      theSearchPhiTIB(theConf.getUntrackedParameter<double>("SearchWindowPhiTIB", 0.05)),
+      theSearchPhiTOB(theConf.getUntrackedParameter<double>("SearchWindowPhiTOB", 0.05)),
+      theSearchPhiTEC(theConf.getUntrackedParameter<double>("SearchWindowPhiTEC", 0.05)),
+      theSearchZTIB(theConf.getUntrackedParameter<double>("SearchWindowZTIB", 1.0)),
+      theSearchZTOB(theConf.getUntrackedParameter<double>("SearchWindowZTOB", 1.0)),
+      theDigiProducersList(theConf.getParameter<Parameters>("DigiProducersList")),
+      theDQMFileName(theConf.getUntrackedParameter<std::string>("DQMFileName", "testDQM.root")),
+      theDaqMonitorBEI(),
+      theMEBeam0Ring4Disc1PosAdcCounts(nullptr),
+      theMEBeam0Ring4Disc2PosAdcCounts(nullptr),
+      theMEBeam0Ring4Disc3PosAdcCounts(nullptr),
+      theMEBeam0Ring4Disc4PosAdcCounts(nullptr),
+      theMEBeam0Ring4Disc5PosAdcCounts(nullptr),
+      theMEBeam0Ring4Disc6PosAdcCounts(nullptr),
+      theMEBeam0Ring4Disc7PosAdcCounts(nullptr),
+      theMEBeam0Ring4Disc8PosAdcCounts(nullptr),
+      theMEBeam0Ring4Disc9PosAdcCounts(nullptr),
+      // Adc counts for Beam 1 in Ring 4
+      theMEBeam1Ring4Disc1PosAdcCounts(nullptr),
+      theMEBeam1Ring4Disc2PosAdcCounts(nullptr),
+      theMEBeam1Ring4Disc3PosAdcCounts(nullptr),
+      theMEBeam1Ring4Disc4PosAdcCounts(nullptr),
+      theMEBeam1Ring4Disc5PosAdcCounts(nullptr),
+      theMEBeam1Ring4Disc6PosAdcCounts(nullptr),
+      theMEBeam1Ring4Disc7PosAdcCounts(nullptr),
+      theMEBeam1Ring4Disc8PosAdcCounts(nullptr),
+      theMEBeam1Ring4Disc9PosAdcCounts(nullptr),
+      // plots for TEC2TEC
+      theMEBeam1Ring4Disc1PosTEC2TECAdcCounts(nullptr),
+      theMEBeam1Ring4Disc2PosTEC2TECAdcCounts(nullptr),
+      theMEBeam1Ring4Disc3PosTEC2TECAdcCounts(nullptr),
+      theMEBeam1Ring4Disc4PosTEC2TECAdcCounts(nullptr),
+      theMEBeam1Ring4Disc5PosTEC2TECAdcCounts(nullptr),
+      // Adc counts for Beam 2 in Ring 4
+      theMEBeam2Ring4Disc1PosAdcCounts(nullptr),
+      theMEBeam2Ring4Disc2PosAdcCounts(nullptr),
+      theMEBeam2Ring4Disc3PosAdcCounts(nullptr),
+      theMEBeam2Ring4Disc4PosAdcCounts(nullptr),
+      theMEBeam2Ring4Disc5PosAdcCounts(nullptr),
+      theMEBeam2Ring4Disc6PosAdcCounts(nullptr),
+      theMEBeam2Ring4Disc7PosAdcCounts(nullptr),
+      theMEBeam2Ring4Disc8PosAdcCounts(nullptr),
+      theMEBeam2Ring4Disc9PosAdcCounts(nullptr),
+      // plots for TEC2TEC
+      theMEBeam2Ring4Disc1PosTEC2TECAdcCounts(nullptr),
+      theMEBeam2Ring4Disc2PosTEC2TECAdcCounts(nullptr),
+      theMEBeam2Ring4Disc3PosTEC2TECAdcCounts(nullptr),
+      theMEBeam2Ring4Disc4PosTEC2TECAdcCounts(nullptr),
+      theMEBeam2Ring4Disc5PosTEC2TECAdcCounts(nullptr),
+      // Adc counts for Beam 3 in Ring 4
+      theMEBeam3Ring4Disc1PosAdcCounts(nullptr),
+      theMEBeam3Ring4Disc2PosAdcCounts(nullptr),
+      theMEBeam3Ring4Disc3PosAdcCounts(nullptr),
+      theMEBeam3Ring4Disc4PosAdcCounts(nullptr),
+      theMEBeam3Ring4Disc5PosAdcCounts(nullptr),
+      theMEBeam3Ring4Disc6PosAdcCounts(nullptr),
+      theMEBeam3Ring4Disc7PosAdcCounts(nullptr),
+      theMEBeam3Ring4Disc8PosAdcCounts(nullptr),
+      theMEBeam3Ring4Disc9PosAdcCounts(nullptr),
+      // Adc counts for Beam 4 in Ring 4
+      theMEBeam4Ring4Disc1PosAdcCounts(nullptr),
+      theMEBeam4Ring4Disc2PosAdcCounts(nullptr),
+      theMEBeam4Ring4Disc3PosAdcCounts(nullptr),
+      theMEBeam4Ring4Disc4PosAdcCounts(nullptr),
+      theMEBeam4Ring4Disc5PosAdcCounts(nullptr),
+      theMEBeam4Ring4Disc6PosAdcCounts(nullptr),
+      theMEBeam4Ring4Disc7PosAdcCounts(nullptr),
+      theMEBeam4Ring4Disc8PosAdcCounts(nullptr),
+      theMEBeam4Ring4Disc9PosAdcCounts(nullptr),
+      // plots for TEC2TEC
+      theMEBeam4Ring4Disc1PosTEC2TECAdcCounts(nullptr),
+      theMEBeam4Ring4Disc2PosTEC2TECAdcCounts(nullptr),
+      theMEBeam4Ring4Disc3PosTEC2TECAdcCounts(nullptr),
+      theMEBeam4Ring4Disc4PosTEC2TECAdcCounts(nullptr),
+      theMEBeam4Ring4Disc5PosTEC2TECAdcCounts(nullptr),
+      // Adc counts for Beam 5 in Ring 4
+      theMEBeam5Ring4Disc1PosAdcCounts(nullptr),
+      theMEBeam5Ring4Disc2PosAdcCounts(nullptr),
+      theMEBeam5Ring4Disc3PosAdcCounts(nullptr),
+      theMEBeam5Ring4Disc4PosAdcCounts(nullptr),
+      theMEBeam5Ring4Disc5PosAdcCounts(nullptr),
+      theMEBeam5Ring4Disc6PosAdcCounts(nullptr),
+      theMEBeam5Ring4Disc7PosAdcCounts(nullptr),
+      theMEBeam5Ring4Disc8PosAdcCounts(nullptr),
+      theMEBeam5Ring4Disc9PosAdcCounts(nullptr),
+      // Adc counts for Beam 6 in Ring 4
+      theMEBeam6Ring4Disc1PosAdcCounts(nullptr),
+      theMEBeam6Ring4Disc2PosAdcCounts(nullptr),
+      theMEBeam6Ring4Disc3PosAdcCounts(nullptr),
+      theMEBeam6Ring4Disc4PosAdcCounts(nullptr),
+      theMEBeam6Ring4Disc5PosAdcCounts(nullptr),
+      theMEBeam6Ring4Disc6PosAdcCounts(nullptr),
+      theMEBeam6Ring4Disc7PosAdcCounts(nullptr),
+      theMEBeam6Ring4Disc8PosAdcCounts(nullptr),
+      theMEBeam6Ring4Disc9PosAdcCounts(nullptr),
+      // plots for TEC2TEC
+      theMEBeam6Ring4Disc1PosTEC2TECAdcCounts(nullptr),
+      theMEBeam6Ring4Disc2PosTEC2TECAdcCounts(nullptr),
+      theMEBeam6Ring4Disc3PosTEC2TECAdcCounts(nullptr),
+      theMEBeam6Ring4Disc4PosTEC2TECAdcCounts(nullptr),
+      theMEBeam6Ring4Disc5PosTEC2TECAdcCounts(nullptr),
+      // Adc counts for Beam 7 in Ring 4
+      theMEBeam7Ring4Disc1PosAdcCounts(nullptr),
+      theMEBeam7Ring4Disc2PosAdcCounts(nullptr),
+      theMEBeam7Ring4Disc3PosAdcCounts(nullptr),
+      theMEBeam7Ring4Disc4PosAdcCounts(nullptr),
+      theMEBeam7Ring4Disc5PosAdcCounts(nullptr),
+      theMEBeam7Ring4Disc6PosAdcCounts(nullptr),
+      theMEBeam7Ring4Disc7PosAdcCounts(nullptr),
+      theMEBeam7Ring4Disc8PosAdcCounts(nullptr),
+      theMEBeam7Ring4Disc9PosAdcCounts(nullptr),
+      // plots for TEC2TEC
+      theMEBeam7Ring4Disc1PosTEC2TECAdcCounts(nullptr),
+      theMEBeam7Ring4Disc2PosTEC2TECAdcCounts(nullptr),
+      theMEBeam7Ring4Disc3PosTEC2TECAdcCounts(nullptr),
+      theMEBeam7Ring4Disc4PosTEC2TECAdcCounts(nullptr),
+      theMEBeam7Ring4Disc5PosTEC2TECAdcCounts(nullptr),
+      // Adc counts for Beam 0 in Ring 6
+      theMEBeam0Ring6Disc1PosAdcCounts(nullptr),
+      theMEBeam0Ring6Disc2PosAdcCounts(nullptr),
+      theMEBeam0Ring6Disc3PosAdcCounts(nullptr),
+      theMEBeam0Ring6Disc4PosAdcCounts(nullptr),
+      theMEBeam0Ring6Disc5PosAdcCounts(nullptr),
+      theMEBeam0Ring6Disc6PosAdcCounts(nullptr),
+      theMEBeam0Ring6Disc7PosAdcCounts(nullptr),
+      theMEBeam0Ring6Disc8PosAdcCounts(nullptr),
+      theMEBeam0Ring6Disc9PosAdcCounts(nullptr),
+      // Adc counts for Beam 1 in Ring 6
+      theMEBeam1Ring6Disc1PosAdcCounts(nullptr),
+      theMEBeam1Ring6Disc2PosAdcCounts(nullptr),
+      theMEBeam1Ring6Disc3PosAdcCounts(nullptr),
+      theMEBeam1Ring6Disc4PosAdcCounts(nullptr),
+      theMEBeam1Ring6Disc5PosAdcCounts(nullptr),
+      theMEBeam1Ring6Disc6PosAdcCounts(nullptr),
+      theMEBeam1Ring6Disc7PosAdcCounts(nullptr),
+      theMEBeam1Ring6Disc8PosAdcCounts(nullptr),
+      theMEBeam1Ring6Disc9PosAdcCounts(nullptr),
+      // Adc counts for Beam 2 in Ring 6
+      theMEBeam2Ring6Disc1PosAdcCounts(nullptr),
+      theMEBeam2Ring6Disc2PosAdcCounts(nullptr),
+      theMEBeam2Ring6Disc3PosAdcCounts(nullptr),
+      theMEBeam2Ring6Disc4PosAdcCounts(nullptr),
+      theMEBeam2Ring6Disc5PosAdcCounts(nullptr),
+      theMEBeam2Ring6Disc6PosAdcCounts(nullptr),
+      theMEBeam2Ring6Disc7PosAdcCounts(nullptr),
+      theMEBeam2Ring6Disc8PosAdcCounts(nullptr),
+      theMEBeam2Ring6Disc9PosAdcCounts(nullptr),
+      // Adc counts for Beam 3 in Ring 6
+      theMEBeam3Ring6Disc1PosAdcCounts(nullptr),
+      theMEBeam3Ring6Disc2PosAdcCounts(nullptr),
+      theMEBeam3Ring6Disc3PosAdcCounts(nullptr),
+      theMEBeam3Ring6Disc4PosAdcCounts(nullptr),
+      theMEBeam3Ring6Disc5PosAdcCounts(nullptr),
+      theMEBeam3Ring6Disc6PosAdcCounts(nullptr),
+      theMEBeam3Ring6Disc7PosAdcCounts(nullptr),
+      theMEBeam3Ring6Disc8PosAdcCounts(nullptr),
+      theMEBeam3Ring6Disc9PosAdcCounts(nullptr),
+      // Adc counts for Beam 4 in Ring 6
+      theMEBeam4Ring6Disc1PosAdcCounts(nullptr),
+      theMEBeam4Ring6Disc2PosAdcCounts(nullptr),
+      theMEBeam4Ring6Disc3PosAdcCounts(nullptr),
+      theMEBeam4Ring6Disc4PosAdcCounts(nullptr),
+      theMEBeam4Ring6Disc5PosAdcCounts(nullptr),
+      theMEBeam4Ring6Disc6PosAdcCounts(nullptr),
+      theMEBeam4Ring6Disc7PosAdcCounts(nullptr),
+      theMEBeam4Ring6Disc8PosAdcCounts(nullptr),
+      theMEBeam4Ring6Disc9PosAdcCounts(nullptr),
+      // Adc counts for Beam 5 in Ring 6
+      theMEBeam5Ring6Disc1PosAdcCounts(nullptr),
+      theMEBeam5Ring6Disc2PosAdcCounts(nullptr),
+      theMEBeam5Ring6Disc3PosAdcCounts(nullptr),
+      theMEBeam5Ring6Disc4PosAdcCounts(nullptr),
+      theMEBeam5Ring6Disc5PosAdcCounts(nullptr),
+      theMEBeam5Ring6Disc6PosAdcCounts(nullptr),
+      theMEBeam5Ring6Disc7PosAdcCounts(nullptr),
+      theMEBeam5Ring6Disc8PosAdcCounts(nullptr),
+      theMEBeam5Ring6Disc9PosAdcCounts(nullptr),
+      // Adc counts for Beam 6 in Ring 6
+      theMEBeam6Ring6Disc1PosAdcCounts(nullptr),
+      theMEBeam6Ring6Disc2PosAdcCounts(nullptr),
+      theMEBeam6Ring6Disc3PosAdcCounts(nullptr),
+      theMEBeam6Ring6Disc4PosAdcCounts(nullptr),
+      theMEBeam6Ring6Disc5PosAdcCounts(nullptr),
+      theMEBeam6Ring6Disc6PosAdcCounts(nullptr),
+      theMEBeam6Ring6Disc7PosAdcCounts(nullptr),
+      theMEBeam6Ring6Disc8PosAdcCounts(nullptr),
+      theMEBeam6Ring6Disc9PosAdcCounts(nullptr),
+      // Adc counts for Beam 7 in Ring 6
+      theMEBeam7Ring6Disc1PosAdcCounts(nullptr),
+      theMEBeam7Ring6Disc2PosAdcCounts(nullptr),
+      theMEBeam7Ring6Disc3PosAdcCounts(nullptr),
+      theMEBeam7Ring6Disc4PosAdcCounts(nullptr),
+      theMEBeam7Ring6Disc5PosAdcCounts(nullptr),
+      theMEBeam7Ring6Disc6PosAdcCounts(nullptr),
+      theMEBeam7Ring6Disc7PosAdcCounts(nullptr),
+      theMEBeam7Ring6Disc8PosAdcCounts(nullptr),
+      theMEBeam7Ring6Disc9PosAdcCounts(nullptr),
+      /* Laser Beams in TEC- */
+      // Adc counts for Beam 0 in Ring 4
+      theMEBeam0Ring4Disc1NegAdcCounts(nullptr),
+      theMEBeam0Ring4Disc2NegAdcCounts(nullptr),
+      theMEBeam0Ring4Disc3NegAdcCounts(nullptr),
+      theMEBeam0Ring4Disc4NegAdcCounts(nullptr),
+      theMEBeam0Ring4Disc5NegAdcCounts(nullptr),
+      theMEBeam0Ring4Disc6NegAdcCounts(nullptr),
+      theMEBeam0Ring4Disc7NegAdcCounts(nullptr),
+      theMEBeam0Ring4Disc8NegAdcCounts(nullptr),
+      theMEBeam0Ring4Disc9NegAdcCounts(nullptr),
+      // Adc counts for Beam 1 in Ring 4
+      theMEBeam1Ring4Disc1NegAdcCounts(nullptr),
+      theMEBeam1Ring4Disc2NegAdcCounts(nullptr),
+      theMEBeam1Ring4Disc3NegAdcCounts(nullptr),
+      theMEBeam1Ring4Disc4NegAdcCounts(nullptr),
+      theMEBeam1Ring4Disc5NegAdcCounts(nullptr),
+      theMEBeam1Ring4Disc6NegAdcCounts(nullptr),
+      theMEBeam1Ring4Disc7NegAdcCounts(nullptr),
+      theMEBeam1Ring4Disc8NegAdcCounts(nullptr),
+      theMEBeam1Ring4Disc9NegAdcCounts(nullptr),
+      // plots for TEC2TEC
+      theMEBeam1Ring4Disc1NegTEC2TECAdcCounts(nullptr),
+      theMEBeam1Ring4Disc2NegTEC2TECAdcCounts(nullptr),
+      theMEBeam1Ring4Disc3NegTEC2TECAdcCounts(nullptr),
+      theMEBeam1Ring4Disc4NegTEC2TECAdcCounts(nullptr),
+      theMEBeam1Ring4Disc5NegTEC2TECAdcCounts(nullptr),
+      // Adc counts for Beam 2 in Ring 4
+      theMEBeam2Ring4Disc1NegAdcCounts(nullptr),
+      theMEBeam2Ring4Disc2NegAdcCounts(nullptr),
+      theMEBeam2Ring4Disc3NegAdcCounts(nullptr),
+      theMEBeam2Ring4Disc4NegAdcCounts(nullptr),
+      theMEBeam2Ring4Disc5NegAdcCounts(nullptr),
+      theMEBeam2Ring4Disc6NegAdcCounts(nullptr),
+      theMEBeam2Ring4Disc7NegAdcCounts(nullptr),
+      theMEBeam2Ring4Disc8NegAdcCounts(nullptr),
+      theMEBeam2Ring4Disc9NegAdcCounts(nullptr),
+      // plots for TEC2TEC
+      theMEBeam2Ring4Disc1NegTEC2TECAdcCounts(nullptr),
+      theMEBeam2Ring4Disc2NegTEC2TECAdcCounts(nullptr),
+      theMEBeam2Ring4Disc3NegTEC2TECAdcCounts(nullptr),
+      theMEBeam2Ring4Disc4NegTEC2TECAdcCounts(nullptr),
+      theMEBeam2Ring4Disc5NegTEC2TECAdcCounts(nullptr),
+      // Adc counts for Beam 3 in Ring 4
+      theMEBeam3Ring4Disc1NegAdcCounts(nullptr),
+      theMEBeam3Ring4Disc2NegAdcCounts(nullptr),
+      theMEBeam3Ring4Disc3NegAdcCounts(nullptr),
+      theMEBeam3Ring4Disc4NegAdcCounts(nullptr),
+      theMEBeam3Ring4Disc5NegAdcCounts(nullptr),
+      theMEBeam3Ring4Disc6NegAdcCounts(nullptr),
+      theMEBeam3Ring4Disc7NegAdcCounts(nullptr),
+      theMEBeam3Ring4Disc8NegAdcCounts(nullptr),
+      theMEBeam3Ring4Disc9NegAdcCounts(nullptr),
+      // Adc counts for Beam 4 in Ring 4
+      theMEBeam4Ring4Disc1NegAdcCounts(nullptr),
+      theMEBeam4Ring4Disc2NegAdcCounts(nullptr),
+      theMEBeam4Ring4Disc3NegAdcCounts(nullptr),
+      theMEBeam4Ring4Disc4NegAdcCounts(nullptr),
+      theMEBeam4Ring4Disc5NegAdcCounts(nullptr),
+      theMEBeam4Ring4Disc6NegAdcCounts(nullptr),
+      theMEBeam4Ring4Disc7NegAdcCounts(nullptr),
+      theMEBeam4Ring4Disc8NegAdcCounts(nullptr),
+      theMEBeam4Ring4Disc9NegAdcCounts(nullptr),
+      // plots for TEC2TEC
+      theMEBeam4Ring4Disc1NegTEC2TECAdcCounts(nullptr),
+      theMEBeam4Ring4Disc2NegTEC2TECAdcCounts(nullptr),
+      theMEBeam4Ring4Disc3NegTEC2TECAdcCounts(nullptr),
+      theMEBeam4Ring4Disc4NegTEC2TECAdcCounts(nullptr),
+      theMEBeam4Ring4Disc5NegTEC2TECAdcCounts(nullptr),
+      // Adc counts for Beam 5 in Ring 4
+      theMEBeam5Ring4Disc1NegAdcCounts(nullptr),
+      theMEBeam5Ring4Disc2NegAdcCounts(nullptr),
+      theMEBeam5Ring4Disc3NegAdcCounts(nullptr),
+      theMEBeam5Ring4Disc4NegAdcCounts(nullptr),
+      theMEBeam5Ring4Disc5NegAdcCounts(nullptr),
+      theMEBeam5Ring4Disc6NegAdcCounts(nullptr),
+      theMEBeam5Ring4Disc7NegAdcCounts(nullptr),
+      theMEBeam5Ring4Disc8NegAdcCounts(nullptr),
+      theMEBeam5Ring4Disc9NegAdcCounts(nullptr),
+      // Adc counts for Beam 6 in Ring 4
+      theMEBeam6Ring4Disc1NegAdcCounts(nullptr),
+      theMEBeam6Ring4Disc2NegAdcCounts(nullptr),
+      theMEBeam6Ring4Disc3NegAdcCounts(nullptr),
+      theMEBeam6Ring4Disc4NegAdcCounts(nullptr),
+      theMEBeam6Ring4Disc5NegAdcCounts(nullptr),
+      theMEBeam6Ring4Disc6NegAdcCounts(nullptr),
+      theMEBeam6Ring4Disc7NegAdcCounts(nullptr),
+      theMEBeam6Ring4Disc8NegAdcCounts(nullptr),
+      theMEBeam6Ring4Disc9NegAdcCounts(nullptr),
+      // plots for TEC2TEC
+      theMEBeam6Ring4Disc1NegTEC2TECAdcCounts(nullptr),
+      theMEBeam6Ring4Disc2NegTEC2TECAdcCounts(nullptr),
+      theMEBeam6Ring4Disc3NegTEC2TECAdcCounts(nullptr),
+      theMEBeam6Ring4Disc4NegTEC2TECAdcCounts(nullptr),
+      theMEBeam6Ring4Disc5NegTEC2TECAdcCounts(nullptr),
+      // Adc counts for Beam 7 in Ring 4
+      theMEBeam7Ring4Disc1NegAdcCounts(nullptr),
+      theMEBeam7Ring4Disc2NegAdcCounts(nullptr),
+      theMEBeam7Ring4Disc3NegAdcCounts(nullptr),
+      theMEBeam7Ring4Disc4NegAdcCounts(nullptr),
+      theMEBeam7Ring4Disc5NegAdcCounts(nullptr),
+      theMEBeam7Ring4Disc6NegAdcCounts(nullptr),
+      theMEBeam7Ring4Disc7NegAdcCounts(nullptr),
+      theMEBeam7Ring4Disc8NegAdcCounts(nullptr),
+      theMEBeam7Ring4Disc9NegAdcCounts(nullptr),
+      // plots for TEC2TEC
+      theMEBeam7Ring4Disc1NegTEC2TECAdcCounts(nullptr),
+      theMEBeam7Ring4Disc2NegTEC2TECAdcCounts(nullptr),
+      theMEBeam7Ring4Disc3NegTEC2TECAdcCounts(nullptr),
+      theMEBeam7Ring4Disc4NegTEC2TECAdcCounts(nullptr),
+      theMEBeam7Ring4Disc5NegTEC2TECAdcCounts(nullptr),
+      // Adc counts for Beam 0 in Ring 6
+      theMEBeam0Ring6Disc1NegAdcCounts(nullptr),
+      theMEBeam0Ring6Disc2NegAdcCounts(nullptr),
+      theMEBeam0Ring6Disc3NegAdcCounts(nullptr),
+      theMEBeam0Ring6Disc4NegAdcCounts(nullptr),
+      theMEBeam0Ring6Disc5NegAdcCounts(nullptr),
+      theMEBeam0Ring6Disc6NegAdcCounts(nullptr),
+      theMEBeam0Ring6Disc7NegAdcCounts(nullptr),
+      theMEBeam0Ring6Disc8NegAdcCounts(nullptr),
+      theMEBeam0Ring6Disc9NegAdcCounts(nullptr),
+      // Adc counts for Beam 1 in Ring 6
+      theMEBeam1Ring6Disc1NegAdcCounts(nullptr),
+      theMEBeam1Ring6Disc2NegAdcCounts(nullptr),
+      theMEBeam1Ring6Disc3NegAdcCounts(nullptr),
+      theMEBeam1Ring6Disc4NegAdcCounts(nullptr),
+      theMEBeam1Ring6Disc5NegAdcCounts(nullptr),
+      theMEBeam1Ring6Disc6NegAdcCounts(nullptr),
+      theMEBeam1Ring6Disc7NegAdcCounts(nullptr),
+      theMEBeam1Ring6Disc8NegAdcCounts(nullptr),
+      theMEBeam1Ring6Disc9NegAdcCounts(nullptr),
+      // Adc counts for Beam 2 in Ring 6
+      theMEBeam2Ring6Disc1NegAdcCounts(nullptr),
+      theMEBeam2Ring6Disc2NegAdcCounts(nullptr),
+      theMEBeam2Ring6Disc3NegAdcCounts(nullptr),
+      theMEBeam2Ring6Disc4NegAdcCounts(nullptr),
+      theMEBeam2Ring6Disc5NegAdcCounts(nullptr),
+      theMEBeam2Ring6Disc6NegAdcCounts(nullptr),
+      theMEBeam2Ring6Disc7NegAdcCounts(nullptr),
+      theMEBeam2Ring6Disc8NegAdcCounts(nullptr),
+      theMEBeam2Ring6Disc9NegAdcCounts(nullptr),
+      // Adc counts for Beam 3 in Ring 6
+      theMEBeam3Ring6Disc1NegAdcCounts(nullptr),
+      theMEBeam3Ring6Disc2NegAdcCounts(nullptr),
+      theMEBeam3Ring6Disc3NegAdcCounts(nullptr),
+      theMEBeam3Ring6Disc4NegAdcCounts(nullptr),
+      theMEBeam3Ring6Disc5NegAdcCounts(nullptr),
+      theMEBeam3Ring6Disc6NegAdcCounts(nullptr),
+      theMEBeam3Ring6Disc7NegAdcCounts(nullptr),
+      theMEBeam3Ring6Disc8NegAdcCounts(nullptr),
+      theMEBeam3Ring6Disc9NegAdcCounts(nullptr),
+      // Adc counts for Beam 4 in Ring 6
+      theMEBeam4Ring6Disc1NegAdcCounts(nullptr),
+      theMEBeam4Ring6Disc2NegAdcCounts(nullptr),
+      theMEBeam4Ring6Disc3NegAdcCounts(nullptr),
+      theMEBeam4Ring6Disc4NegAdcCounts(nullptr),
+      theMEBeam4Ring6Disc5NegAdcCounts(nullptr),
+      theMEBeam4Ring6Disc6NegAdcCounts(nullptr),
+      theMEBeam4Ring6Disc7NegAdcCounts(nullptr),
+      theMEBeam4Ring6Disc8NegAdcCounts(nullptr),
+      theMEBeam4Ring6Disc9NegAdcCounts(nullptr),
+      // Adc counts for Beam 5 in Ring 6
+      theMEBeam5Ring6Disc1NegAdcCounts(nullptr),
+      theMEBeam5Ring6Disc2NegAdcCounts(nullptr),
+      theMEBeam5Ring6Disc3NegAdcCounts(nullptr),
+      theMEBeam5Ring6Disc4NegAdcCounts(nullptr),
+      theMEBeam5Ring6Disc5NegAdcCounts(nullptr),
+      theMEBeam5Ring6Disc6NegAdcCounts(nullptr),
+      theMEBeam5Ring6Disc7NegAdcCounts(nullptr),
+      theMEBeam5Ring6Disc8NegAdcCounts(nullptr),
+      theMEBeam5Ring6Disc9NegAdcCounts(nullptr),
+      // Adc counts for Beam 6 in Ring 6
+      theMEBeam6Ring6Disc1NegAdcCounts(nullptr),
+      theMEBeam6Ring6Disc2NegAdcCounts(nullptr),
+      theMEBeam6Ring6Disc3NegAdcCounts(nullptr),
+      theMEBeam6Ring6Disc4NegAdcCounts(nullptr),
+      theMEBeam6Ring6Disc5NegAdcCounts(nullptr),
+      theMEBeam6Ring6Disc6NegAdcCounts(nullptr),
+      theMEBeam6Ring6Disc7NegAdcCounts(nullptr),
+      theMEBeam6Ring6Disc8NegAdcCounts(nullptr),
+      theMEBeam6Ring6Disc9NegAdcCounts(nullptr),
+      // Adc counts for Beam 7 in Ring 6
+      theMEBeam7Ring6Disc1NegAdcCounts(nullptr),
+      theMEBeam7Ring6Disc2NegAdcCounts(nullptr),
+      theMEBeam7Ring6Disc3NegAdcCounts(nullptr),
+      theMEBeam7Ring6Disc4NegAdcCounts(nullptr),
+      theMEBeam7Ring6Disc5NegAdcCounts(nullptr),
+      theMEBeam7Ring6Disc6NegAdcCounts(nullptr),
+      theMEBeam7Ring6Disc7NegAdcCounts(nullptr),
+      theMEBeam7Ring6Disc8NegAdcCounts(nullptr),
+      theMEBeam7Ring6Disc9NegAdcCounts(nullptr),
+      // TOB Beams
+      // Adc counts for Beam 0
+      theMEBeam0TOBPosition1AdcCounts(nullptr),
+      theMEBeam0TOBPosition2AdcCounts(nullptr),
+      theMEBeam0TOBPosition3AdcCounts(nullptr),
+      theMEBeam0TOBPosition4AdcCounts(nullptr),
+      theMEBeam0TOBPosition5AdcCounts(nullptr),
+      theMEBeam0TOBPosition6AdcCounts(nullptr),
+      // Adc counts for Beam 1
+      theMEBeam1TOBPosition1AdcCounts(nullptr),
+      theMEBeam1TOBPosition2AdcCounts(nullptr),
+      theMEBeam1TOBPosition3AdcCounts(nullptr),
+      theMEBeam1TOBPosition4AdcCounts(nullptr),
+      theMEBeam1TOBPosition5AdcCounts(nullptr),
+      theMEBeam1TOBPosition6AdcCounts(nullptr),
+      // Adc counts for Beam 2
+      theMEBeam2TOBPosition1AdcCounts(nullptr),
+      theMEBeam2TOBPosition2AdcCounts(nullptr),
+      theMEBeam2TOBPosition3AdcCounts(nullptr),
+      theMEBeam2TOBPosition4AdcCounts(nullptr),
+      theMEBeam2TOBPosition5AdcCounts(nullptr),
+      theMEBeam2TOBPosition6AdcCounts(nullptr),
+      // Adc counts for Beam 3
+      theMEBeam3TOBPosition1AdcCounts(nullptr),
+      theMEBeam3TOBPosition2AdcCounts(nullptr),
+      theMEBeam3TOBPosition3AdcCounts(nullptr),
+      theMEBeam3TOBPosition4AdcCounts(nullptr),
+      theMEBeam3TOBPosition5AdcCounts(nullptr),
+      theMEBeam3TOBPosition6AdcCounts(nullptr),
+      // Adc counts for Beam 4
+      theMEBeam4TOBPosition1AdcCounts(nullptr),
+      theMEBeam4TOBPosition2AdcCounts(nullptr),
+      theMEBeam4TOBPosition3AdcCounts(nullptr),
+      theMEBeam4TOBPosition4AdcCounts(nullptr),
+      theMEBeam4TOBPosition5AdcCounts(nullptr),
+      theMEBeam4TOBPosition6AdcCounts(nullptr),
+      // Adc counts for Beam 5
+      theMEBeam5TOBPosition1AdcCounts(nullptr),
+      theMEBeam5TOBPosition2AdcCounts(nullptr),
+      theMEBeam5TOBPosition3AdcCounts(nullptr),
+      theMEBeam5TOBPosition4AdcCounts(nullptr),
+      theMEBeam5TOBPosition5AdcCounts(nullptr),
+      theMEBeam5TOBPosition6AdcCounts(nullptr),
+      // Adc counts for Beam 6
+      theMEBeam6TOBPosition1AdcCounts(nullptr),
+      theMEBeam6TOBPosition2AdcCounts(nullptr),
+      theMEBeam6TOBPosition3AdcCounts(nullptr),
+      theMEBeam6TOBPosition4AdcCounts(nullptr),
+      theMEBeam6TOBPosition5AdcCounts(nullptr),
+      theMEBeam6TOBPosition6AdcCounts(nullptr),
+      // Adc counts for Beam 7
+      theMEBeam7TOBPosition1AdcCounts(nullptr),
+      theMEBeam7TOBPosition2AdcCounts(nullptr),
+      theMEBeam7TOBPosition3AdcCounts(nullptr),
+      theMEBeam7TOBPosition4AdcCounts(nullptr),
+      theMEBeam7TOBPosition5AdcCounts(nullptr),
+      theMEBeam7TOBPosition6AdcCounts(nullptr),
+      // TIB Beams
+      // Adc counts for Beam 0
+      theMEBeam0TIBPosition1AdcCounts(nullptr),
+      theMEBeam0TIBPosition2AdcCounts(nullptr),
+      theMEBeam0TIBPosition3AdcCounts(nullptr),
+      theMEBeam0TIBPosition4AdcCounts(nullptr),
+      theMEBeam0TIBPosition5AdcCounts(nullptr),
+      theMEBeam0TIBPosition6AdcCounts(nullptr),
+      // Adc counts for Beam 1
+      theMEBeam1TIBPosition1AdcCounts(nullptr),
+      theMEBeam1TIBPosition2AdcCounts(nullptr),
+      theMEBeam1TIBPosition3AdcCounts(nullptr),
+      theMEBeam1TIBPosition4AdcCounts(nullptr),
+      theMEBeam1TIBPosition5AdcCounts(nullptr),
+      theMEBeam1TIBPosition6AdcCounts(nullptr),
+      // Adc counts for Beam 2
+      theMEBeam2TIBPosition1AdcCounts(nullptr),
+      theMEBeam2TIBPosition2AdcCounts(nullptr),
+      theMEBeam2TIBPosition3AdcCounts(nullptr),
+      theMEBeam2TIBPosition4AdcCounts(nullptr),
+      theMEBeam2TIBPosition5AdcCounts(nullptr),
+      theMEBeam2TIBPosition6AdcCounts(nullptr),
+      // Adc counts for Beam 3
+      theMEBeam3TIBPosition1AdcCounts(nullptr),
+      theMEBeam3TIBPosition2AdcCounts(nullptr),
+      theMEBeam3TIBPosition3AdcCounts(nullptr),
+      theMEBeam3TIBPosition4AdcCounts(nullptr),
+      theMEBeam3TIBPosition5AdcCounts(nullptr),
+      theMEBeam3TIBPosition6AdcCounts(nullptr),
+      // Adc counts for Beam 4
+      theMEBeam4TIBPosition1AdcCounts(nullptr),
+      theMEBeam4TIBPosition2AdcCounts(nullptr),
+      theMEBeam4TIBPosition3AdcCounts(nullptr),
+      theMEBeam4TIBPosition4AdcCounts(nullptr),
+      theMEBeam4TIBPosition5AdcCounts(nullptr),
+      theMEBeam4TIBPosition6AdcCounts(nullptr),
+      // Adc counts for Beam 5
+      theMEBeam5TIBPosition1AdcCounts(nullptr),
+      theMEBeam5TIBPosition2AdcCounts(nullptr),
+      theMEBeam5TIBPosition3AdcCounts(nullptr),
+      theMEBeam5TIBPosition4AdcCounts(nullptr),
+      theMEBeam5TIBPosition5AdcCounts(nullptr),
+      theMEBeam5TIBPosition6AdcCounts(nullptr),
+      // Adc counts for Beam 6
+      theMEBeam6TIBPosition1AdcCounts(nullptr),
+      theMEBeam6TIBPosition2AdcCounts(nullptr),
+      theMEBeam6TIBPosition3AdcCounts(nullptr),
+      theMEBeam6TIBPosition4AdcCounts(nullptr),
+      theMEBeam6TIBPosition5AdcCounts(nullptr),
+      theMEBeam6TIBPosition6AdcCounts(nullptr),
+      // Adc counts for Beam 7
+      theMEBeam7TIBPosition1AdcCounts(nullptr),
+      theMEBeam7TIBPosition2AdcCounts(nullptr),
+      theMEBeam7TIBPosition3AdcCounts(nullptr),
+      theMEBeam7TIBPosition4AdcCounts(nullptr),
+      theMEBeam7TIBPosition5AdcCounts(nullptr),
+      theMEBeam7TIBPosition6AdcCounts(nullptr) {
+  // load the configuration from the ParameterSet
   edm::LogInfo("LaserDQM") << "==========================================================="
-			   << "\n===                Start configuration                  ==="
-			   << "\n    theDebugLevel              = " << theDebugLevel
-			   << "\n    theSearchPhiTIB            = " << theSearchPhiTIB
-			   << "\n    theSearchPhiTOB            = " << theSearchPhiTOB
-			   << "\n    theSearchPhiTEC            = " << theSearchPhiTEC
-			   << "\n    theSearchZTIB              = " << theSearchZTIB
-			   << "\n    theSearchZTOB              = " << theSearchZTOB
-			   << "\n    DQM filename               = " << theDQMFileName
-			   << "\n===========================================================";
-
+                           << "\n===                Start configuration                  ==="
+                           << "\n    theDebugLevel              = " << theDebugLevel
+                           << "\n    theSearchPhiTIB            = " << theSearchPhiTIB
+                           << "\n    theSearchPhiTOB            = " << theSearchPhiTOB
+                           << "\n    theSearchPhiTEC            = " << theSearchPhiTEC
+                           << "\n    theSearchZTIB              = " << theSearchZTIB
+                           << "\n    theSearchZTOB              = " << theSearchZTOB
+                           << "\n    DQM filename               = " << theDQMFileName
+                           << "\n===========================================================";
 }
 
 LaserDQM::~LaserDQM() {}
 
-void LaserDQM::analyze(edm::Event const& theEvent, edm::EventSetup const& theSetup) 
-{
+void LaserDQM::analyze(edm::Event const &theEvent, edm::EventSetup const &theSetup) {
   // do the Tracker Statistics
   trackerStatistics(theEvent, theSetup);
 }
 
-void LaserDQM::beginJob()
-{
+void LaserDQM::beginJob() {
   // get hold of DQM Backend interface
   theDaqMonitorBEI = edm::Service<DQMStore>().operator->();
-      
+
   // initialize the Monitor Elements
   initMonitors();
 }
 
-void LaserDQM::endJob(void)
-{
-  theDaqMonitorBEI->save(theDQMFileName);
-}
+void LaserDQM::endJob(void) { theDaqMonitorBEI->save(theDQMFileName); }
 
-void LaserDQM::fillAdcCounts(MonitorElement * theMonitor, 
-			     edm::DetSet<SiStripDigi>::const_iterator digiRangeIterator,
-			     edm::DetSet<SiStripDigi>::const_iterator digiRangeIteratorEnd)
-{
+void LaserDQM::fillAdcCounts(MonitorElement *theMonitor,
+                             edm::DetSet<SiStripDigi>::const_iterator digiRangeIterator,
+                             edm::DetSet<SiStripDigi>::const_iterator digiRangeIteratorEnd) {
   // get the ROOT object from the MonitorElement
-  TH1F * theMEHistogram = theMonitor->getTH1F();
+  TH1F *theMEHistogram = theMonitor->getTH1F();
 
   // loop over all the digis in this det
-  for (; digiRangeIterator != digiRangeIteratorEnd; ++digiRangeIterator) 
-    {
-      const SiStripDigi *digi = &*digiRangeIterator;
-      
-      if ( theDebugLevel > 4 ) 
-	{ std::cout << " Channel " << digi->channel() << " has " << digi->adc() << " adc counts " << std::endl; }
+  for (; digiRangeIterator != digiRangeIteratorEnd; ++digiRangeIterator) {
+    const SiStripDigi *digi = &*digiRangeIterator;
+
+    if (theDebugLevel > 4) {
+      std::cout << " Channel " << digi->channel() << " has " << digi->adc() << " adc counts " << std::endl;
+    }
 
-      // fill the number of adc counts in the histogram
-      if (digi->channel() < 512)
-	{
-	  Double_t theBinContent = theMEHistogram->GetBinContent(digi->channel()) + digi->adc();
-	  theMEHistogram->SetBinContent(digi->channel(), theBinContent);
-	}
+    // fill the number of adc counts in the histogram
+    if (digi->channel() < 512) {
+      Double_t theBinContent = theMEHistogram->GetBinContent(digi->channel()) + digi->adc();
+      theMEHistogram->SetBinContent(digi->channel(), theBinContent);
     }
+  }
 }
 
 // define the SEAL module
diff --git a/Alignment/LaserDQM/plugins/LaserDQM.h b/Alignment/LaserDQM/plugins/LaserDQM.h
index 9cc064d52ac2e..a33435514f8e1 100644
--- a/Alignment/LaserDQM/plugins/LaserDQM.h
+++ b/Alignment/LaserDQM/plugins/LaserDQM.h
@@ -9,44 +9,43 @@
  *  \author Maarten Thomas
  */
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "DataFormats/SiStripDigi/interface/SiStripDigi.h"
 #include "DataFormats/Common/interface/DetSetVector.h"
+#include "DataFormats/SiStripDigi/interface/SiStripDigi.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
 
 // DQM
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 
 #include <iostream>
 
-class LaserDQM : public edm::EDAnalyzer
-{
- public:
+class LaserDQM : public edm::EDAnalyzer {
+public:
   typedef std::vector<edm::ParameterSet> Parameters;
 
-	/// constructor
-  explicit LaserDQM(edm::ParameterSet const& theConf);
-	/// destructor
+  /// constructor
+  explicit LaserDQM(edm::ParameterSet const &theConf);
+  /// destructor
   ~LaserDQM() override;
-  
-  /// this method will do the user analysis 
-  void analyze(edm::Event const& theEvent, edm::EventSetup const& theSetup) override;
+
+  /// this method will do the user analysis
+  void analyze(edm::Event const &theEvent, edm::EventSetup const &theSetup) override;
   /// begin job
   void beginJob() override;
-	/// end job
+  /// end job
   void endJob(void) override;
-    
- private:
-	/// fill adc counts from the laser beam into a monitor histogram
-  void fillAdcCounts(MonitorElement * theMonitor,
-		     edm::DetSet<SiStripDigi>::const_iterator digiRangeIterator,
-		     edm::DetSet<SiStripDigi>::const_iterator digiRangeIteratorEnd);
-	/// initialize monitors
+
+private:
+  /// fill adc counts from the laser beam into a monitor histogram
+  void fillAdcCounts(MonitorElement *theMonitor,
+                     edm::DetSet<SiStripDigi>::const_iterator digiRangeIterator,
+                     edm::DetSet<SiStripDigi>::const_iterator digiRangeIteratorEnd);
+  /// initialize monitors
   void initMonitors();
-	/// find dets which are hit by a laser beam and fill the monitors
-  void trackerStatistics(edm::Event const& theEvent, edm::EventSetup const& theSetup);
-  
- private:
+  /// find dets which are hit by a laser beam and fill the monitors
+  void trackerStatistics(edm::Event const &theEvent, edm::EventSetup const &theSetup);
+
+private:
   int theDebugLevel;
   double theSearchPhiTIB;
   double theSearchPhiTOB;
@@ -61,563 +60,562 @@ class LaserDQM : public edm::EDAnalyzer
   std::string theDQMFileName;
 
   // DQM Backend Interface
-  DQMStore * theDaqMonitorBEI;
+  DQMStore *theDaqMonitorBEI;
 
   // DQM Monitor Elements
 
   /* Laser Beams in TEC+ */
   // Adc counts for Beam 0 in Ring 4
-  MonitorElement * theMEBeam0Ring4Disc1PosAdcCounts;
-  MonitorElement * theMEBeam0Ring4Disc2PosAdcCounts;
-  MonitorElement * theMEBeam0Ring4Disc3PosAdcCounts;
-  MonitorElement * theMEBeam0Ring4Disc4PosAdcCounts;
-  MonitorElement * theMEBeam0Ring4Disc5PosAdcCounts;
-  MonitorElement * theMEBeam0Ring4Disc6PosAdcCounts;
-  MonitorElement * theMEBeam0Ring4Disc7PosAdcCounts;
-  MonitorElement * theMEBeam0Ring4Disc8PosAdcCounts;
-  MonitorElement * theMEBeam0Ring4Disc9PosAdcCounts;
+  MonitorElement *theMEBeam0Ring4Disc1PosAdcCounts;
+  MonitorElement *theMEBeam0Ring4Disc2PosAdcCounts;
+  MonitorElement *theMEBeam0Ring4Disc3PosAdcCounts;
+  MonitorElement *theMEBeam0Ring4Disc4PosAdcCounts;
+  MonitorElement *theMEBeam0Ring4Disc5PosAdcCounts;
+  MonitorElement *theMEBeam0Ring4Disc6PosAdcCounts;
+  MonitorElement *theMEBeam0Ring4Disc7PosAdcCounts;
+  MonitorElement *theMEBeam0Ring4Disc8PosAdcCounts;
+  MonitorElement *theMEBeam0Ring4Disc9PosAdcCounts;
 
   // Adc counts for Beam 1 in Ring 4
-  MonitorElement * theMEBeam1Ring4Disc1PosAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc2PosAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc3PosAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc4PosAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc5PosAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc6PosAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc7PosAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc8PosAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc9PosAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc1PosAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc2PosAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc3PosAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc4PosAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc5PosAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc6PosAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc7PosAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc8PosAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc9PosAdcCounts;
 
   // plots for TEC2TEC
-  MonitorElement * theMEBeam1Ring4Disc1PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc2PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc3PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc4PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc5PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc1PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc2PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc3PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc4PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc5PosTEC2TECAdcCounts;
 
   // Adc counts for Beam 2 in Ring 4
-  MonitorElement * theMEBeam2Ring4Disc1PosAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc2PosAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc3PosAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc4PosAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc5PosAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc6PosAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc7PosAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc8PosAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc9PosAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc1PosAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc2PosAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc3PosAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc4PosAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc5PosAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc6PosAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc7PosAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc8PosAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc9PosAdcCounts;
 
   // plots for TEC2TEC
-  MonitorElement * theMEBeam2Ring4Disc1PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc2PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc3PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc4PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc5PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc1PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc2PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc3PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc4PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc5PosTEC2TECAdcCounts;
 
   // Adc counts for Beam 3 in Ring 4
-  MonitorElement * theMEBeam3Ring4Disc1PosAdcCounts;
-  MonitorElement * theMEBeam3Ring4Disc2PosAdcCounts;
-  MonitorElement * theMEBeam3Ring4Disc3PosAdcCounts;
-  MonitorElement * theMEBeam3Ring4Disc4PosAdcCounts;
-  MonitorElement * theMEBeam3Ring4Disc5PosAdcCounts;
-  MonitorElement * theMEBeam3Ring4Disc6PosAdcCounts;
-  MonitorElement * theMEBeam3Ring4Disc7PosAdcCounts;
-  MonitorElement * theMEBeam3Ring4Disc8PosAdcCounts;
-  MonitorElement * theMEBeam3Ring4Disc9PosAdcCounts;
+  MonitorElement *theMEBeam3Ring4Disc1PosAdcCounts;
+  MonitorElement *theMEBeam3Ring4Disc2PosAdcCounts;
+  MonitorElement *theMEBeam3Ring4Disc3PosAdcCounts;
+  MonitorElement *theMEBeam3Ring4Disc4PosAdcCounts;
+  MonitorElement *theMEBeam3Ring4Disc5PosAdcCounts;
+  MonitorElement *theMEBeam3Ring4Disc6PosAdcCounts;
+  MonitorElement *theMEBeam3Ring4Disc7PosAdcCounts;
+  MonitorElement *theMEBeam3Ring4Disc8PosAdcCounts;
+  MonitorElement *theMEBeam3Ring4Disc9PosAdcCounts;
 
   // Adc counts for Beam 4 in Ring 4
-  MonitorElement * theMEBeam4Ring4Disc1PosAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc2PosAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc3PosAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc4PosAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc5PosAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc6PosAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc7PosAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc8PosAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc9PosAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc1PosAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc2PosAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc3PosAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc4PosAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc5PosAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc6PosAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc7PosAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc8PosAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc9PosAdcCounts;
 
   // plots for TEC2TEC
-  MonitorElement * theMEBeam4Ring4Disc1PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc2PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc3PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc4PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc5PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc1PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc2PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc3PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc4PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc5PosTEC2TECAdcCounts;
 
   // Adc counts for Beam 5 in Ring 4
-  MonitorElement * theMEBeam5Ring4Disc1PosAdcCounts;
-  MonitorElement * theMEBeam5Ring4Disc2PosAdcCounts;
-  MonitorElement * theMEBeam5Ring4Disc3PosAdcCounts;
-  MonitorElement * theMEBeam5Ring4Disc4PosAdcCounts;
-  MonitorElement * theMEBeam5Ring4Disc5PosAdcCounts;
-  MonitorElement * theMEBeam5Ring4Disc6PosAdcCounts;
-  MonitorElement * theMEBeam5Ring4Disc7PosAdcCounts;
-  MonitorElement * theMEBeam5Ring4Disc8PosAdcCounts;
-  MonitorElement * theMEBeam5Ring4Disc9PosAdcCounts;
+  MonitorElement *theMEBeam5Ring4Disc1PosAdcCounts;
+  MonitorElement *theMEBeam5Ring4Disc2PosAdcCounts;
+  MonitorElement *theMEBeam5Ring4Disc3PosAdcCounts;
+  MonitorElement *theMEBeam5Ring4Disc4PosAdcCounts;
+  MonitorElement *theMEBeam5Ring4Disc5PosAdcCounts;
+  MonitorElement *theMEBeam5Ring4Disc6PosAdcCounts;
+  MonitorElement *theMEBeam5Ring4Disc7PosAdcCounts;
+  MonitorElement *theMEBeam5Ring4Disc8PosAdcCounts;
+  MonitorElement *theMEBeam5Ring4Disc9PosAdcCounts;
 
   // Adc counts for Beam 6 in Ring 4
-  MonitorElement * theMEBeam6Ring4Disc1PosAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc2PosAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc3PosAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc4PosAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc5PosAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc6PosAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc7PosAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc8PosAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc9PosAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc1PosAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc2PosAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc3PosAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc4PosAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc5PosAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc6PosAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc7PosAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc8PosAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc9PosAdcCounts;
 
   // plots for TEC2TEC
-  MonitorElement * theMEBeam6Ring4Disc1PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc2PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc3PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc4PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc5PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc1PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc2PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc3PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc4PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc5PosTEC2TECAdcCounts;
 
   // Adc counts for Beam 7 in Ring 4
-  MonitorElement * theMEBeam7Ring4Disc1PosAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc2PosAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc3PosAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc4PosAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc5PosAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc6PosAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc7PosAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc8PosAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc9PosAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc1PosAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc2PosAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc3PosAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc4PosAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc5PosAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc6PosAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc7PosAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc8PosAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc9PosAdcCounts;
 
   // plots for TEC2TEC
-  MonitorElement * theMEBeam7Ring4Disc1PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc2PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc3PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc4PosTEC2TECAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc5PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc1PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc2PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc3PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc4PosTEC2TECAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc5PosTEC2TECAdcCounts;
 
   // Adc counts for Beam 0 in Ring 6
-  MonitorElement * theMEBeam0Ring6Disc1PosAdcCounts;
-  MonitorElement * theMEBeam0Ring6Disc2PosAdcCounts;
-  MonitorElement * theMEBeam0Ring6Disc3PosAdcCounts;
-  MonitorElement * theMEBeam0Ring6Disc4PosAdcCounts;
-  MonitorElement * theMEBeam0Ring6Disc5PosAdcCounts;
-  MonitorElement * theMEBeam0Ring6Disc6PosAdcCounts;
-  MonitorElement * theMEBeam0Ring6Disc7PosAdcCounts;
-  MonitorElement * theMEBeam0Ring6Disc8PosAdcCounts;
-  MonitorElement * theMEBeam0Ring6Disc9PosAdcCounts;
+  MonitorElement *theMEBeam0Ring6Disc1PosAdcCounts;
+  MonitorElement *theMEBeam0Ring6Disc2PosAdcCounts;
+  MonitorElement *theMEBeam0Ring6Disc3PosAdcCounts;
+  MonitorElement *theMEBeam0Ring6Disc4PosAdcCounts;
+  MonitorElement *theMEBeam0Ring6Disc5PosAdcCounts;
+  MonitorElement *theMEBeam0Ring6Disc6PosAdcCounts;
+  MonitorElement *theMEBeam0Ring6Disc7PosAdcCounts;
+  MonitorElement *theMEBeam0Ring6Disc8PosAdcCounts;
+  MonitorElement *theMEBeam0Ring6Disc9PosAdcCounts;
 
   // Adc counts for Beam 1 in Ring 6
-  MonitorElement * theMEBeam1Ring6Disc1PosAdcCounts;
-  MonitorElement * theMEBeam1Ring6Disc2PosAdcCounts;
-  MonitorElement * theMEBeam1Ring6Disc3PosAdcCounts;
-  MonitorElement * theMEBeam1Ring6Disc4PosAdcCounts;
-  MonitorElement * theMEBeam1Ring6Disc5PosAdcCounts;
-  MonitorElement * theMEBeam1Ring6Disc6PosAdcCounts;
-  MonitorElement * theMEBeam1Ring6Disc7PosAdcCounts;
-  MonitorElement * theMEBeam1Ring6Disc8PosAdcCounts;
-  MonitorElement * theMEBeam1Ring6Disc9PosAdcCounts;
+  MonitorElement *theMEBeam1Ring6Disc1PosAdcCounts;
+  MonitorElement *theMEBeam1Ring6Disc2PosAdcCounts;
+  MonitorElement *theMEBeam1Ring6Disc3PosAdcCounts;
+  MonitorElement *theMEBeam1Ring6Disc4PosAdcCounts;
+  MonitorElement *theMEBeam1Ring6Disc5PosAdcCounts;
+  MonitorElement *theMEBeam1Ring6Disc6PosAdcCounts;
+  MonitorElement *theMEBeam1Ring6Disc7PosAdcCounts;
+  MonitorElement *theMEBeam1Ring6Disc8PosAdcCounts;
+  MonitorElement *theMEBeam1Ring6Disc9PosAdcCounts;
 
   // Adc counts for Beam 2 in Ring 6
-  MonitorElement * theMEBeam2Ring6Disc1PosAdcCounts;
-  MonitorElement * theMEBeam2Ring6Disc2PosAdcCounts;
-  MonitorElement * theMEBeam2Ring6Disc3PosAdcCounts;
-  MonitorElement * theMEBeam2Ring6Disc4PosAdcCounts;
-  MonitorElement * theMEBeam2Ring6Disc5PosAdcCounts;
-  MonitorElement * theMEBeam2Ring6Disc6PosAdcCounts;
-  MonitorElement * theMEBeam2Ring6Disc7PosAdcCounts;
-  MonitorElement * theMEBeam2Ring6Disc8PosAdcCounts;
-  MonitorElement * theMEBeam2Ring6Disc9PosAdcCounts;
+  MonitorElement *theMEBeam2Ring6Disc1PosAdcCounts;
+  MonitorElement *theMEBeam2Ring6Disc2PosAdcCounts;
+  MonitorElement *theMEBeam2Ring6Disc3PosAdcCounts;
+  MonitorElement *theMEBeam2Ring6Disc4PosAdcCounts;
+  MonitorElement *theMEBeam2Ring6Disc5PosAdcCounts;
+  MonitorElement *theMEBeam2Ring6Disc6PosAdcCounts;
+  MonitorElement *theMEBeam2Ring6Disc7PosAdcCounts;
+  MonitorElement *theMEBeam2Ring6Disc8PosAdcCounts;
+  MonitorElement *theMEBeam2Ring6Disc9PosAdcCounts;
 
   // Adc counts for Beam 3 in Ring 6
-  MonitorElement * theMEBeam3Ring6Disc1PosAdcCounts;
-  MonitorElement * theMEBeam3Ring6Disc2PosAdcCounts;
-  MonitorElement * theMEBeam3Ring6Disc3PosAdcCounts;
-  MonitorElement * theMEBeam3Ring6Disc4PosAdcCounts;
-  MonitorElement * theMEBeam3Ring6Disc5PosAdcCounts;
-  MonitorElement * theMEBeam3Ring6Disc6PosAdcCounts;
-  MonitorElement * theMEBeam3Ring6Disc7PosAdcCounts;
-  MonitorElement * theMEBeam3Ring6Disc8PosAdcCounts;
-  MonitorElement * theMEBeam3Ring6Disc9PosAdcCounts;
+  MonitorElement *theMEBeam3Ring6Disc1PosAdcCounts;
+  MonitorElement *theMEBeam3Ring6Disc2PosAdcCounts;
+  MonitorElement *theMEBeam3Ring6Disc3PosAdcCounts;
+  MonitorElement *theMEBeam3Ring6Disc4PosAdcCounts;
+  MonitorElement *theMEBeam3Ring6Disc5PosAdcCounts;
+  MonitorElement *theMEBeam3Ring6Disc6PosAdcCounts;
+  MonitorElement *theMEBeam3Ring6Disc7PosAdcCounts;
+  MonitorElement *theMEBeam3Ring6Disc8PosAdcCounts;
+  MonitorElement *theMEBeam3Ring6Disc9PosAdcCounts;
 
   // Adc counts for Beam 4 in Ring 6
-  MonitorElement * theMEBeam4Ring6Disc1PosAdcCounts;
-  MonitorElement * theMEBeam4Ring6Disc2PosAdcCounts;
-  MonitorElement * theMEBeam4Ring6Disc3PosAdcCounts;
-  MonitorElement * theMEBeam4Ring6Disc4PosAdcCounts;
-  MonitorElement * theMEBeam4Ring6Disc5PosAdcCounts;
-  MonitorElement * theMEBeam4Ring6Disc6PosAdcCounts;
-  MonitorElement * theMEBeam4Ring6Disc7PosAdcCounts;
-  MonitorElement * theMEBeam4Ring6Disc8PosAdcCounts;
-  MonitorElement * theMEBeam4Ring6Disc9PosAdcCounts;
+  MonitorElement *theMEBeam4Ring6Disc1PosAdcCounts;
+  MonitorElement *theMEBeam4Ring6Disc2PosAdcCounts;
+  MonitorElement *theMEBeam4Ring6Disc3PosAdcCounts;
+  MonitorElement *theMEBeam4Ring6Disc4PosAdcCounts;
+  MonitorElement *theMEBeam4Ring6Disc5PosAdcCounts;
+  MonitorElement *theMEBeam4Ring6Disc6PosAdcCounts;
+  MonitorElement *theMEBeam4Ring6Disc7PosAdcCounts;
+  MonitorElement *theMEBeam4Ring6Disc8PosAdcCounts;
+  MonitorElement *theMEBeam4Ring6Disc9PosAdcCounts;
 
   // Adc counts for Beam 5 in Ring 6
-  MonitorElement * theMEBeam5Ring6Disc1PosAdcCounts;
-  MonitorElement * theMEBeam5Ring6Disc2PosAdcCounts;
-  MonitorElement * theMEBeam5Ring6Disc3PosAdcCounts;
-  MonitorElement * theMEBeam5Ring6Disc4PosAdcCounts;
-  MonitorElement * theMEBeam5Ring6Disc5PosAdcCounts;
-  MonitorElement * theMEBeam5Ring6Disc6PosAdcCounts;
-  MonitorElement * theMEBeam5Ring6Disc7PosAdcCounts;
-  MonitorElement * theMEBeam5Ring6Disc8PosAdcCounts;
-  MonitorElement * theMEBeam5Ring6Disc9PosAdcCounts;
+  MonitorElement *theMEBeam5Ring6Disc1PosAdcCounts;
+  MonitorElement *theMEBeam5Ring6Disc2PosAdcCounts;
+  MonitorElement *theMEBeam5Ring6Disc3PosAdcCounts;
+  MonitorElement *theMEBeam5Ring6Disc4PosAdcCounts;
+  MonitorElement *theMEBeam5Ring6Disc5PosAdcCounts;
+  MonitorElement *theMEBeam5Ring6Disc6PosAdcCounts;
+  MonitorElement *theMEBeam5Ring6Disc7PosAdcCounts;
+  MonitorElement *theMEBeam5Ring6Disc8PosAdcCounts;
+  MonitorElement *theMEBeam5Ring6Disc9PosAdcCounts;
 
   // Adc counts for Beam 6 in Ring 6
-  MonitorElement * theMEBeam6Ring6Disc1PosAdcCounts;
-  MonitorElement * theMEBeam6Ring6Disc2PosAdcCounts;
-  MonitorElement * theMEBeam6Ring6Disc3PosAdcCounts;
-  MonitorElement * theMEBeam6Ring6Disc4PosAdcCounts;
-  MonitorElement * theMEBeam6Ring6Disc5PosAdcCounts;
-  MonitorElement * theMEBeam6Ring6Disc6PosAdcCounts;
-  MonitorElement * theMEBeam6Ring6Disc7PosAdcCounts;
-  MonitorElement * theMEBeam6Ring6Disc8PosAdcCounts;
-  MonitorElement * theMEBeam6Ring6Disc9PosAdcCounts;
+  MonitorElement *theMEBeam6Ring6Disc1PosAdcCounts;
+  MonitorElement *theMEBeam6Ring6Disc2PosAdcCounts;
+  MonitorElement *theMEBeam6Ring6Disc3PosAdcCounts;
+  MonitorElement *theMEBeam6Ring6Disc4PosAdcCounts;
+  MonitorElement *theMEBeam6Ring6Disc5PosAdcCounts;
+  MonitorElement *theMEBeam6Ring6Disc6PosAdcCounts;
+  MonitorElement *theMEBeam6Ring6Disc7PosAdcCounts;
+  MonitorElement *theMEBeam6Ring6Disc8PosAdcCounts;
+  MonitorElement *theMEBeam6Ring6Disc9PosAdcCounts;
 
   // Adc counts for Beam 7 in Ring 6
-  MonitorElement * theMEBeam7Ring6Disc1PosAdcCounts;
-  MonitorElement * theMEBeam7Ring6Disc2PosAdcCounts;
-  MonitorElement * theMEBeam7Ring6Disc3PosAdcCounts;
-  MonitorElement * theMEBeam7Ring6Disc4PosAdcCounts;
-  MonitorElement * theMEBeam7Ring6Disc5PosAdcCounts;
-  MonitorElement * theMEBeam7Ring6Disc6PosAdcCounts;
-  MonitorElement * theMEBeam7Ring6Disc7PosAdcCounts;
-  MonitorElement * theMEBeam7Ring6Disc8PosAdcCounts;
-  MonitorElement * theMEBeam7Ring6Disc9PosAdcCounts;
+  MonitorElement *theMEBeam7Ring6Disc1PosAdcCounts;
+  MonitorElement *theMEBeam7Ring6Disc2PosAdcCounts;
+  MonitorElement *theMEBeam7Ring6Disc3PosAdcCounts;
+  MonitorElement *theMEBeam7Ring6Disc4PosAdcCounts;
+  MonitorElement *theMEBeam7Ring6Disc5PosAdcCounts;
+  MonitorElement *theMEBeam7Ring6Disc6PosAdcCounts;
+  MonitorElement *theMEBeam7Ring6Disc7PosAdcCounts;
+  MonitorElement *theMEBeam7Ring6Disc8PosAdcCounts;
+  MonitorElement *theMEBeam7Ring6Disc9PosAdcCounts;
 
   /* Laser Beams in TEC- */
   // Adc counts for Beam 0 in Ring 4
-  MonitorElement * theMEBeam0Ring4Disc1NegAdcCounts;
-  MonitorElement * theMEBeam0Ring4Disc2NegAdcCounts;
-  MonitorElement * theMEBeam0Ring4Disc3NegAdcCounts;
-  MonitorElement * theMEBeam0Ring4Disc4NegAdcCounts;
-  MonitorElement * theMEBeam0Ring4Disc5NegAdcCounts;
-  MonitorElement * theMEBeam0Ring4Disc6NegAdcCounts;
-  MonitorElement * theMEBeam0Ring4Disc7NegAdcCounts;
-  MonitorElement * theMEBeam0Ring4Disc8NegAdcCounts;
-  MonitorElement * theMEBeam0Ring4Disc9NegAdcCounts;
+  MonitorElement *theMEBeam0Ring4Disc1NegAdcCounts;
+  MonitorElement *theMEBeam0Ring4Disc2NegAdcCounts;
+  MonitorElement *theMEBeam0Ring4Disc3NegAdcCounts;
+  MonitorElement *theMEBeam0Ring4Disc4NegAdcCounts;
+  MonitorElement *theMEBeam0Ring4Disc5NegAdcCounts;
+  MonitorElement *theMEBeam0Ring4Disc6NegAdcCounts;
+  MonitorElement *theMEBeam0Ring4Disc7NegAdcCounts;
+  MonitorElement *theMEBeam0Ring4Disc8NegAdcCounts;
+  MonitorElement *theMEBeam0Ring4Disc9NegAdcCounts;
 
   // Adc counts for Beam 1 in Ring 4
-  MonitorElement * theMEBeam1Ring4Disc1NegAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc2NegAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc3NegAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc4NegAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc5NegAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc6NegAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc7NegAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc8NegAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc9NegAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc1NegAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc2NegAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc3NegAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc4NegAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc5NegAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc6NegAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc7NegAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc8NegAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc9NegAdcCounts;
 
   // plots for TEC2TEC
-  MonitorElement * theMEBeam1Ring4Disc1NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc2NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc3NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc4NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam1Ring4Disc5NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc1NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc2NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc3NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc4NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam1Ring4Disc5NegTEC2TECAdcCounts;
 
   // Adc counts for Beam 2 in Ring 4
-  MonitorElement * theMEBeam2Ring4Disc1NegAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc2NegAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc3NegAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc4NegAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc5NegAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc6NegAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc7NegAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc8NegAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc9NegAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc1NegAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc2NegAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc3NegAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc4NegAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc5NegAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc6NegAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc7NegAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc8NegAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc9NegAdcCounts;
 
   // plots for TEC2TEC
-  MonitorElement * theMEBeam2Ring4Disc1NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc2NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc3NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc4NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam2Ring4Disc5NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc1NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc2NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc3NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc4NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam2Ring4Disc5NegTEC2TECAdcCounts;
 
   // Adc counts for Beam 3 in Ring 4
-  MonitorElement * theMEBeam3Ring4Disc1NegAdcCounts;
-  MonitorElement * theMEBeam3Ring4Disc2NegAdcCounts;
-  MonitorElement * theMEBeam3Ring4Disc3NegAdcCounts;
-  MonitorElement * theMEBeam3Ring4Disc4NegAdcCounts;
-  MonitorElement * theMEBeam3Ring4Disc5NegAdcCounts;
-  MonitorElement * theMEBeam3Ring4Disc6NegAdcCounts;
-  MonitorElement * theMEBeam3Ring4Disc7NegAdcCounts;
-  MonitorElement * theMEBeam3Ring4Disc8NegAdcCounts;
-  MonitorElement * theMEBeam3Ring4Disc9NegAdcCounts;
+  MonitorElement *theMEBeam3Ring4Disc1NegAdcCounts;
+  MonitorElement *theMEBeam3Ring4Disc2NegAdcCounts;
+  MonitorElement *theMEBeam3Ring4Disc3NegAdcCounts;
+  MonitorElement *theMEBeam3Ring4Disc4NegAdcCounts;
+  MonitorElement *theMEBeam3Ring4Disc5NegAdcCounts;
+  MonitorElement *theMEBeam3Ring4Disc6NegAdcCounts;
+  MonitorElement *theMEBeam3Ring4Disc7NegAdcCounts;
+  MonitorElement *theMEBeam3Ring4Disc8NegAdcCounts;
+  MonitorElement *theMEBeam3Ring4Disc9NegAdcCounts;
 
   // Adc counts for Beam 4 in Ring 4
-  MonitorElement * theMEBeam4Ring4Disc1NegAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc2NegAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc3NegAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc4NegAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc5NegAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc6NegAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc7NegAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc8NegAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc9NegAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc1NegAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc2NegAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc3NegAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc4NegAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc5NegAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc6NegAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc7NegAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc8NegAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc9NegAdcCounts;
 
   // plots for TEC2TEC
-  MonitorElement * theMEBeam4Ring4Disc1NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc2NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc3NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc4NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam4Ring4Disc5NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc1NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc2NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc3NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc4NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam4Ring4Disc5NegTEC2TECAdcCounts;
 
   // Adc counts for Beam 5 in Ring 4
-  MonitorElement * theMEBeam5Ring4Disc1NegAdcCounts;
-  MonitorElement * theMEBeam5Ring4Disc2NegAdcCounts;
-  MonitorElement * theMEBeam5Ring4Disc3NegAdcCounts;
-  MonitorElement * theMEBeam5Ring4Disc4NegAdcCounts;
-  MonitorElement * theMEBeam5Ring4Disc5NegAdcCounts;
-  MonitorElement * theMEBeam5Ring4Disc6NegAdcCounts;
-  MonitorElement * theMEBeam5Ring4Disc7NegAdcCounts;
-  MonitorElement * theMEBeam5Ring4Disc8NegAdcCounts;
-  MonitorElement * theMEBeam5Ring4Disc9NegAdcCounts;
+  MonitorElement *theMEBeam5Ring4Disc1NegAdcCounts;
+  MonitorElement *theMEBeam5Ring4Disc2NegAdcCounts;
+  MonitorElement *theMEBeam5Ring4Disc3NegAdcCounts;
+  MonitorElement *theMEBeam5Ring4Disc4NegAdcCounts;
+  MonitorElement *theMEBeam5Ring4Disc5NegAdcCounts;
+  MonitorElement *theMEBeam5Ring4Disc6NegAdcCounts;
+  MonitorElement *theMEBeam5Ring4Disc7NegAdcCounts;
+  MonitorElement *theMEBeam5Ring4Disc8NegAdcCounts;
+  MonitorElement *theMEBeam5Ring4Disc9NegAdcCounts;
 
   // Adc counts for Beam 6 in Ring 4
-  MonitorElement * theMEBeam6Ring4Disc1NegAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc2NegAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc3NegAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc4NegAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc5NegAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc6NegAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc7NegAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc8NegAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc9NegAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc1NegAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc2NegAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc3NegAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc4NegAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc5NegAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc6NegAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc7NegAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc8NegAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc9NegAdcCounts;
 
   // plots for TEC2TEC
-  MonitorElement * theMEBeam6Ring4Disc1NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc2NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc3NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc4NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam6Ring4Disc5NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc1NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc2NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc3NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc4NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam6Ring4Disc5NegTEC2TECAdcCounts;
 
   // Adc counts for Beam 7 in Ring 4
-  MonitorElement * theMEBeam7Ring4Disc1NegAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc2NegAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc3NegAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc4NegAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc5NegAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc6NegAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc7NegAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc8NegAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc9NegAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc1NegAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc2NegAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc3NegAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc4NegAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc5NegAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc6NegAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc7NegAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc8NegAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc9NegAdcCounts;
 
   // plots for TEC2TEC
-  MonitorElement * theMEBeam7Ring4Disc1NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc2NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc3NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc4NegTEC2TECAdcCounts;
-  MonitorElement * theMEBeam7Ring4Disc5NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc1NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc2NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc3NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc4NegTEC2TECAdcCounts;
+  MonitorElement *theMEBeam7Ring4Disc5NegTEC2TECAdcCounts;
 
   // Adc counts for Beam 0 in Ring 6
-  MonitorElement * theMEBeam0Ring6Disc1NegAdcCounts;
-  MonitorElement * theMEBeam0Ring6Disc2NegAdcCounts;
-  MonitorElement * theMEBeam0Ring6Disc3NegAdcCounts;
-  MonitorElement * theMEBeam0Ring6Disc4NegAdcCounts;
-  MonitorElement * theMEBeam0Ring6Disc5NegAdcCounts;
-  MonitorElement * theMEBeam0Ring6Disc6NegAdcCounts;
-  MonitorElement * theMEBeam0Ring6Disc7NegAdcCounts;
-  MonitorElement * theMEBeam0Ring6Disc8NegAdcCounts;
-  MonitorElement * theMEBeam0Ring6Disc9NegAdcCounts;
+  MonitorElement *theMEBeam0Ring6Disc1NegAdcCounts;
+  MonitorElement *theMEBeam0Ring6Disc2NegAdcCounts;
+  MonitorElement *theMEBeam0Ring6Disc3NegAdcCounts;
+  MonitorElement *theMEBeam0Ring6Disc4NegAdcCounts;
+  MonitorElement *theMEBeam0Ring6Disc5NegAdcCounts;
+  MonitorElement *theMEBeam0Ring6Disc6NegAdcCounts;
+  MonitorElement *theMEBeam0Ring6Disc7NegAdcCounts;
+  MonitorElement *theMEBeam0Ring6Disc8NegAdcCounts;
+  MonitorElement *theMEBeam0Ring6Disc9NegAdcCounts;
 
   // Adc counts for Beam 1 in Ring 6
-  MonitorElement * theMEBeam1Ring6Disc1NegAdcCounts;
-  MonitorElement * theMEBeam1Ring6Disc2NegAdcCounts;
-  MonitorElement * theMEBeam1Ring6Disc3NegAdcCounts;
-  MonitorElement * theMEBeam1Ring6Disc4NegAdcCounts;
-  MonitorElement * theMEBeam1Ring6Disc5NegAdcCounts;
-  MonitorElement * theMEBeam1Ring6Disc6NegAdcCounts;
-  MonitorElement * theMEBeam1Ring6Disc7NegAdcCounts;
-  MonitorElement * theMEBeam1Ring6Disc8NegAdcCounts;
-  MonitorElement * theMEBeam1Ring6Disc9NegAdcCounts;
+  MonitorElement *theMEBeam1Ring6Disc1NegAdcCounts;
+  MonitorElement *theMEBeam1Ring6Disc2NegAdcCounts;
+  MonitorElement *theMEBeam1Ring6Disc3NegAdcCounts;
+  MonitorElement *theMEBeam1Ring6Disc4NegAdcCounts;
+  MonitorElement *theMEBeam1Ring6Disc5NegAdcCounts;
+  MonitorElement *theMEBeam1Ring6Disc6NegAdcCounts;
+  MonitorElement *theMEBeam1Ring6Disc7NegAdcCounts;
+  MonitorElement *theMEBeam1Ring6Disc8NegAdcCounts;
+  MonitorElement *theMEBeam1Ring6Disc9NegAdcCounts;
 
   // Adc counts for Beam 2 in Ring 6
-  MonitorElement * theMEBeam2Ring6Disc1NegAdcCounts;
-  MonitorElement * theMEBeam2Ring6Disc2NegAdcCounts;
-  MonitorElement * theMEBeam2Ring6Disc3NegAdcCounts;
-  MonitorElement * theMEBeam2Ring6Disc4NegAdcCounts;
-  MonitorElement * theMEBeam2Ring6Disc5NegAdcCounts;
-  MonitorElement * theMEBeam2Ring6Disc6NegAdcCounts;
-  MonitorElement * theMEBeam2Ring6Disc7NegAdcCounts;
-  MonitorElement * theMEBeam2Ring6Disc8NegAdcCounts;
-  MonitorElement * theMEBeam2Ring6Disc9NegAdcCounts;
+  MonitorElement *theMEBeam2Ring6Disc1NegAdcCounts;
+  MonitorElement *theMEBeam2Ring6Disc2NegAdcCounts;
+  MonitorElement *theMEBeam2Ring6Disc3NegAdcCounts;
+  MonitorElement *theMEBeam2Ring6Disc4NegAdcCounts;
+  MonitorElement *theMEBeam2Ring6Disc5NegAdcCounts;
+  MonitorElement *theMEBeam2Ring6Disc6NegAdcCounts;
+  MonitorElement *theMEBeam2Ring6Disc7NegAdcCounts;
+  MonitorElement *theMEBeam2Ring6Disc8NegAdcCounts;
+  MonitorElement *theMEBeam2Ring6Disc9NegAdcCounts;
 
   // Adc counts for Beam 3 in Ring 6
-  MonitorElement * theMEBeam3Ring6Disc1NegAdcCounts;
-  MonitorElement * theMEBeam3Ring6Disc2NegAdcCounts;
-  MonitorElement * theMEBeam3Ring6Disc3NegAdcCounts;
-  MonitorElement * theMEBeam3Ring6Disc4NegAdcCounts;
-  MonitorElement * theMEBeam3Ring6Disc5NegAdcCounts;
-  MonitorElement * theMEBeam3Ring6Disc6NegAdcCounts;
-  MonitorElement * theMEBeam3Ring6Disc7NegAdcCounts;
-  MonitorElement * theMEBeam3Ring6Disc8NegAdcCounts;
-  MonitorElement * theMEBeam3Ring6Disc9NegAdcCounts;
+  MonitorElement *theMEBeam3Ring6Disc1NegAdcCounts;
+  MonitorElement *theMEBeam3Ring6Disc2NegAdcCounts;
+  MonitorElement *theMEBeam3Ring6Disc3NegAdcCounts;
+  MonitorElement *theMEBeam3Ring6Disc4NegAdcCounts;
+  MonitorElement *theMEBeam3Ring6Disc5NegAdcCounts;
+  MonitorElement *theMEBeam3Ring6Disc6NegAdcCounts;
+  MonitorElement *theMEBeam3Ring6Disc7NegAdcCounts;
+  MonitorElement *theMEBeam3Ring6Disc8NegAdcCounts;
+  MonitorElement *theMEBeam3Ring6Disc9NegAdcCounts;
 
   // Adc counts for Beam 4 in Ring 6
-  MonitorElement * theMEBeam4Ring6Disc1NegAdcCounts;
-  MonitorElement * theMEBeam4Ring6Disc2NegAdcCounts;
-  MonitorElement * theMEBeam4Ring6Disc3NegAdcCounts;
-  MonitorElement * theMEBeam4Ring6Disc4NegAdcCounts;
-  MonitorElement * theMEBeam4Ring6Disc5NegAdcCounts;
-  MonitorElement * theMEBeam4Ring6Disc6NegAdcCounts;
-  MonitorElement * theMEBeam4Ring6Disc7NegAdcCounts;
-  MonitorElement * theMEBeam4Ring6Disc8NegAdcCounts;
-  MonitorElement * theMEBeam4Ring6Disc9NegAdcCounts;
+  MonitorElement *theMEBeam4Ring6Disc1NegAdcCounts;
+  MonitorElement *theMEBeam4Ring6Disc2NegAdcCounts;
+  MonitorElement *theMEBeam4Ring6Disc3NegAdcCounts;
+  MonitorElement *theMEBeam4Ring6Disc4NegAdcCounts;
+  MonitorElement *theMEBeam4Ring6Disc5NegAdcCounts;
+  MonitorElement *theMEBeam4Ring6Disc6NegAdcCounts;
+  MonitorElement *theMEBeam4Ring6Disc7NegAdcCounts;
+  MonitorElement *theMEBeam4Ring6Disc8NegAdcCounts;
+  MonitorElement *theMEBeam4Ring6Disc9NegAdcCounts;
 
   // Adc counts for Beam 5 in Ring 6
-  MonitorElement * theMEBeam5Ring6Disc1NegAdcCounts;
-  MonitorElement * theMEBeam5Ring6Disc2NegAdcCounts;
-  MonitorElement * theMEBeam5Ring6Disc3NegAdcCounts;
-  MonitorElement * theMEBeam5Ring6Disc4NegAdcCounts;
-  MonitorElement * theMEBeam5Ring6Disc5NegAdcCounts;
-  MonitorElement * theMEBeam5Ring6Disc6NegAdcCounts;
-  MonitorElement * theMEBeam5Ring6Disc7NegAdcCounts;
-  MonitorElement * theMEBeam5Ring6Disc8NegAdcCounts;
-  MonitorElement * theMEBeam5Ring6Disc9NegAdcCounts;
+  MonitorElement *theMEBeam5Ring6Disc1NegAdcCounts;
+  MonitorElement *theMEBeam5Ring6Disc2NegAdcCounts;
+  MonitorElement *theMEBeam5Ring6Disc3NegAdcCounts;
+  MonitorElement *theMEBeam5Ring6Disc4NegAdcCounts;
+  MonitorElement *theMEBeam5Ring6Disc5NegAdcCounts;
+  MonitorElement *theMEBeam5Ring6Disc6NegAdcCounts;
+  MonitorElement *theMEBeam5Ring6Disc7NegAdcCounts;
+  MonitorElement *theMEBeam5Ring6Disc8NegAdcCounts;
+  MonitorElement *theMEBeam5Ring6Disc9NegAdcCounts;
 
   // Adc counts for Beam 6 in Ring 6
-  MonitorElement * theMEBeam6Ring6Disc1NegAdcCounts;
-  MonitorElement * theMEBeam6Ring6Disc2NegAdcCounts;
-  MonitorElement * theMEBeam6Ring6Disc3NegAdcCounts;
-  MonitorElement * theMEBeam6Ring6Disc4NegAdcCounts;
-  MonitorElement * theMEBeam6Ring6Disc5NegAdcCounts;
-  MonitorElement * theMEBeam6Ring6Disc6NegAdcCounts;
-  MonitorElement * theMEBeam6Ring6Disc7NegAdcCounts;
-  MonitorElement * theMEBeam6Ring6Disc8NegAdcCounts;
-  MonitorElement * theMEBeam6Ring6Disc9NegAdcCounts;
+  MonitorElement *theMEBeam6Ring6Disc1NegAdcCounts;
+  MonitorElement *theMEBeam6Ring6Disc2NegAdcCounts;
+  MonitorElement *theMEBeam6Ring6Disc3NegAdcCounts;
+  MonitorElement *theMEBeam6Ring6Disc4NegAdcCounts;
+  MonitorElement *theMEBeam6Ring6Disc5NegAdcCounts;
+  MonitorElement *theMEBeam6Ring6Disc6NegAdcCounts;
+  MonitorElement *theMEBeam6Ring6Disc7NegAdcCounts;
+  MonitorElement *theMEBeam6Ring6Disc8NegAdcCounts;
+  MonitorElement *theMEBeam6Ring6Disc9NegAdcCounts;
 
   // Adc counts for Beam 7 in Ring 6
-  MonitorElement * theMEBeam7Ring6Disc1NegAdcCounts;
-  MonitorElement * theMEBeam7Ring6Disc2NegAdcCounts;
-  MonitorElement * theMEBeam7Ring6Disc3NegAdcCounts;
-  MonitorElement * theMEBeam7Ring6Disc4NegAdcCounts;
-  MonitorElement * theMEBeam7Ring6Disc5NegAdcCounts;
-  MonitorElement * theMEBeam7Ring6Disc6NegAdcCounts;
-  MonitorElement * theMEBeam7Ring6Disc7NegAdcCounts;
-  MonitorElement * theMEBeam7Ring6Disc8NegAdcCounts;
-  MonitorElement * theMEBeam7Ring6Disc9NegAdcCounts;
+  MonitorElement *theMEBeam7Ring6Disc1NegAdcCounts;
+  MonitorElement *theMEBeam7Ring6Disc2NegAdcCounts;
+  MonitorElement *theMEBeam7Ring6Disc3NegAdcCounts;
+  MonitorElement *theMEBeam7Ring6Disc4NegAdcCounts;
+  MonitorElement *theMEBeam7Ring6Disc5NegAdcCounts;
+  MonitorElement *theMEBeam7Ring6Disc6NegAdcCounts;
+  MonitorElement *theMEBeam7Ring6Disc7NegAdcCounts;
+  MonitorElement *theMEBeam7Ring6Disc8NegAdcCounts;
+  MonitorElement *theMEBeam7Ring6Disc9NegAdcCounts;
 
   // TOB Beams
   // Adc counts for Beam 0
-  MonitorElement * theMEBeam0TOBPosition1AdcCounts;
-  MonitorElement * theMEBeam0TOBPosition2AdcCounts;
-  MonitorElement * theMEBeam0TOBPosition3AdcCounts;
-  MonitorElement * theMEBeam0TOBPosition4AdcCounts;
-  MonitorElement * theMEBeam0TOBPosition5AdcCounts;
-  MonitorElement * theMEBeam0TOBPosition6AdcCounts;
+  MonitorElement *theMEBeam0TOBPosition1AdcCounts;
+  MonitorElement *theMEBeam0TOBPosition2AdcCounts;
+  MonitorElement *theMEBeam0TOBPosition3AdcCounts;
+  MonitorElement *theMEBeam0TOBPosition4AdcCounts;
+  MonitorElement *theMEBeam0TOBPosition5AdcCounts;
+  MonitorElement *theMEBeam0TOBPosition6AdcCounts;
 
   // Adc counts for Beam 1
-  MonitorElement * theMEBeam1TOBPosition1AdcCounts;
-  MonitorElement * theMEBeam1TOBPosition2AdcCounts;
-  MonitorElement * theMEBeam1TOBPosition3AdcCounts;
-  MonitorElement * theMEBeam1TOBPosition4AdcCounts;
-  MonitorElement * theMEBeam1TOBPosition5AdcCounts;
-  MonitorElement * theMEBeam1TOBPosition6AdcCounts;
+  MonitorElement *theMEBeam1TOBPosition1AdcCounts;
+  MonitorElement *theMEBeam1TOBPosition2AdcCounts;
+  MonitorElement *theMEBeam1TOBPosition3AdcCounts;
+  MonitorElement *theMEBeam1TOBPosition4AdcCounts;
+  MonitorElement *theMEBeam1TOBPosition5AdcCounts;
+  MonitorElement *theMEBeam1TOBPosition6AdcCounts;
 
   // Adc counts for Beam 2
-  MonitorElement * theMEBeam2TOBPosition1AdcCounts;
-  MonitorElement * theMEBeam2TOBPosition2AdcCounts;
-  MonitorElement * theMEBeam2TOBPosition3AdcCounts;
-  MonitorElement * theMEBeam2TOBPosition4AdcCounts;
-  MonitorElement * theMEBeam2TOBPosition5AdcCounts;
-  MonitorElement * theMEBeam2TOBPosition6AdcCounts;
+  MonitorElement *theMEBeam2TOBPosition1AdcCounts;
+  MonitorElement *theMEBeam2TOBPosition2AdcCounts;
+  MonitorElement *theMEBeam2TOBPosition3AdcCounts;
+  MonitorElement *theMEBeam2TOBPosition4AdcCounts;
+  MonitorElement *theMEBeam2TOBPosition5AdcCounts;
+  MonitorElement *theMEBeam2TOBPosition6AdcCounts;
 
   // Adc counts for Beam 3
-  MonitorElement * theMEBeam3TOBPosition1AdcCounts;
-  MonitorElement * theMEBeam3TOBPosition2AdcCounts;
-  MonitorElement * theMEBeam3TOBPosition3AdcCounts;
-  MonitorElement * theMEBeam3TOBPosition4AdcCounts;
-  MonitorElement * theMEBeam3TOBPosition5AdcCounts;
-  MonitorElement * theMEBeam3TOBPosition6AdcCounts;
+  MonitorElement *theMEBeam3TOBPosition1AdcCounts;
+  MonitorElement *theMEBeam3TOBPosition2AdcCounts;
+  MonitorElement *theMEBeam3TOBPosition3AdcCounts;
+  MonitorElement *theMEBeam3TOBPosition4AdcCounts;
+  MonitorElement *theMEBeam3TOBPosition5AdcCounts;
+  MonitorElement *theMEBeam3TOBPosition6AdcCounts;
 
   // Adc counts for Beam 4
-  MonitorElement * theMEBeam4TOBPosition1AdcCounts;
-  MonitorElement * theMEBeam4TOBPosition2AdcCounts;
-  MonitorElement * theMEBeam4TOBPosition3AdcCounts;
-  MonitorElement * theMEBeam4TOBPosition4AdcCounts;
-  MonitorElement * theMEBeam4TOBPosition5AdcCounts;
-  MonitorElement * theMEBeam4TOBPosition6AdcCounts;
+  MonitorElement *theMEBeam4TOBPosition1AdcCounts;
+  MonitorElement *theMEBeam4TOBPosition2AdcCounts;
+  MonitorElement *theMEBeam4TOBPosition3AdcCounts;
+  MonitorElement *theMEBeam4TOBPosition4AdcCounts;
+  MonitorElement *theMEBeam4TOBPosition5AdcCounts;
+  MonitorElement *theMEBeam4TOBPosition6AdcCounts;
 
   // Adc counts for Beam 5
-  MonitorElement * theMEBeam5TOBPosition1AdcCounts;
-  MonitorElement * theMEBeam5TOBPosition2AdcCounts;
-  MonitorElement * theMEBeam5TOBPosition3AdcCounts;
-  MonitorElement * theMEBeam5TOBPosition4AdcCounts;
-  MonitorElement * theMEBeam5TOBPosition5AdcCounts;
-  MonitorElement * theMEBeam5TOBPosition6AdcCounts;
+  MonitorElement *theMEBeam5TOBPosition1AdcCounts;
+  MonitorElement *theMEBeam5TOBPosition2AdcCounts;
+  MonitorElement *theMEBeam5TOBPosition3AdcCounts;
+  MonitorElement *theMEBeam5TOBPosition4AdcCounts;
+  MonitorElement *theMEBeam5TOBPosition5AdcCounts;
+  MonitorElement *theMEBeam5TOBPosition6AdcCounts;
 
   // Adc counts for Beam 6
-  MonitorElement * theMEBeam6TOBPosition1AdcCounts;
-  MonitorElement * theMEBeam6TOBPosition2AdcCounts;
-  MonitorElement * theMEBeam6TOBPosition3AdcCounts;
-  MonitorElement * theMEBeam6TOBPosition4AdcCounts;
-  MonitorElement * theMEBeam6TOBPosition5AdcCounts;
-  MonitorElement * theMEBeam6TOBPosition6AdcCounts;
+  MonitorElement *theMEBeam6TOBPosition1AdcCounts;
+  MonitorElement *theMEBeam6TOBPosition2AdcCounts;
+  MonitorElement *theMEBeam6TOBPosition3AdcCounts;
+  MonitorElement *theMEBeam6TOBPosition4AdcCounts;
+  MonitorElement *theMEBeam6TOBPosition5AdcCounts;
+  MonitorElement *theMEBeam6TOBPosition6AdcCounts;
 
   // Adc counts for Beam 7
-  MonitorElement * theMEBeam7TOBPosition1AdcCounts;
-  MonitorElement * theMEBeam7TOBPosition2AdcCounts;
-  MonitorElement * theMEBeam7TOBPosition3AdcCounts;
-  MonitorElement * theMEBeam7TOBPosition4AdcCounts;
-  MonitorElement * theMEBeam7TOBPosition5AdcCounts;
-  MonitorElement * theMEBeam7TOBPosition6AdcCounts;
+  MonitorElement *theMEBeam7TOBPosition1AdcCounts;
+  MonitorElement *theMEBeam7TOBPosition2AdcCounts;
+  MonitorElement *theMEBeam7TOBPosition3AdcCounts;
+  MonitorElement *theMEBeam7TOBPosition4AdcCounts;
+  MonitorElement *theMEBeam7TOBPosition5AdcCounts;
+  MonitorElement *theMEBeam7TOBPosition6AdcCounts;
 
   // TIB Beams
   // Adc counts for Beam 0
-  MonitorElement * theMEBeam0TIBPosition1AdcCounts;
-  MonitorElement * theMEBeam0TIBPosition2AdcCounts;
-  MonitorElement * theMEBeam0TIBPosition3AdcCounts;
-  MonitorElement * theMEBeam0TIBPosition4AdcCounts;
-  MonitorElement * theMEBeam0TIBPosition5AdcCounts;
-  MonitorElement * theMEBeam0TIBPosition6AdcCounts;
+  MonitorElement *theMEBeam0TIBPosition1AdcCounts;
+  MonitorElement *theMEBeam0TIBPosition2AdcCounts;
+  MonitorElement *theMEBeam0TIBPosition3AdcCounts;
+  MonitorElement *theMEBeam0TIBPosition4AdcCounts;
+  MonitorElement *theMEBeam0TIBPosition5AdcCounts;
+  MonitorElement *theMEBeam0TIBPosition6AdcCounts;
 
   // Adc counts for Beam 1
-  MonitorElement * theMEBeam1TIBPosition1AdcCounts;
-  MonitorElement * theMEBeam1TIBPosition2AdcCounts;
-  MonitorElement * theMEBeam1TIBPosition3AdcCounts;
-  MonitorElement * theMEBeam1TIBPosition4AdcCounts;
-  MonitorElement * theMEBeam1TIBPosition5AdcCounts;
-  MonitorElement * theMEBeam1TIBPosition6AdcCounts;
+  MonitorElement *theMEBeam1TIBPosition1AdcCounts;
+  MonitorElement *theMEBeam1TIBPosition2AdcCounts;
+  MonitorElement *theMEBeam1TIBPosition3AdcCounts;
+  MonitorElement *theMEBeam1TIBPosition4AdcCounts;
+  MonitorElement *theMEBeam1TIBPosition5AdcCounts;
+  MonitorElement *theMEBeam1TIBPosition6AdcCounts;
 
   // Adc counts for Beam 2
-  MonitorElement * theMEBeam2TIBPosition1AdcCounts;
-  MonitorElement * theMEBeam2TIBPosition2AdcCounts;
-  MonitorElement * theMEBeam2TIBPosition3AdcCounts;
-  MonitorElement * theMEBeam2TIBPosition4AdcCounts;
-  MonitorElement * theMEBeam2TIBPosition5AdcCounts;
-  MonitorElement * theMEBeam2TIBPosition6AdcCounts;
+  MonitorElement *theMEBeam2TIBPosition1AdcCounts;
+  MonitorElement *theMEBeam2TIBPosition2AdcCounts;
+  MonitorElement *theMEBeam2TIBPosition3AdcCounts;
+  MonitorElement *theMEBeam2TIBPosition4AdcCounts;
+  MonitorElement *theMEBeam2TIBPosition5AdcCounts;
+  MonitorElement *theMEBeam2TIBPosition6AdcCounts;
 
   // Adc counts for Beam 3
-  MonitorElement * theMEBeam3TIBPosition1AdcCounts;
-  MonitorElement * theMEBeam3TIBPosition2AdcCounts;
-  MonitorElement * theMEBeam3TIBPosition3AdcCounts;
-  MonitorElement * theMEBeam3TIBPosition4AdcCounts;
-  MonitorElement * theMEBeam3TIBPosition5AdcCounts;
-  MonitorElement * theMEBeam3TIBPosition6AdcCounts;
+  MonitorElement *theMEBeam3TIBPosition1AdcCounts;
+  MonitorElement *theMEBeam3TIBPosition2AdcCounts;
+  MonitorElement *theMEBeam3TIBPosition3AdcCounts;
+  MonitorElement *theMEBeam3TIBPosition4AdcCounts;
+  MonitorElement *theMEBeam3TIBPosition5AdcCounts;
+  MonitorElement *theMEBeam3TIBPosition6AdcCounts;
 
   // Adc counts for Beam 4
-  MonitorElement * theMEBeam4TIBPosition1AdcCounts;
-  MonitorElement * theMEBeam4TIBPosition2AdcCounts;
-  MonitorElement * theMEBeam4TIBPosition3AdcCounts;
-  MonitorElement * theMEBeam4TIBPosition4AdcCounts;
-  MonitorElement * theMEBeam4TIBPosition5AdcCounts;
-  MonitorElement * theMEBeam4TIBPosition6AdcCounts;
+  MonitorElement *theMEBeam4TIBPosition1AdcCounts;
+  MonitorElement *theMEBeam4TIBPosition2AdcCounts;
+  MonitorElement *theMEBeam4TIBPosition3AdcCounts;
+  MonitorElement *theMEBeam4TIBPosition4AdcCounts;
+  MonitorElement *theMEBeam4TIBPosition5AdcCounts;
+  MonitorElement *theMEBeam4TIBPosition6AdcCounts;
 
   // Adc counts for Beam 5
-  MonitorElement * theMEBeam5TIBPosition1AdcCounts;
-  MonitorElement * theMEBeam5TIBPosition2AdcCounts;
-  MonitorElement * theMEBeam5TIBPosition3AdcCounts;
-  MonitorElement * theMEBeam5TIBPosition4AdcCounts;
-  MonitorElement * theMEBeam5TIBPosition5AdcCounts;
-  MonitorElement * theMEBeam5TIBPosition6AdcCounts;
+  MonitorElement *theMEBeam5TIBPosition1AdcCounts;
+  MonitorElement *theMEBeam5TIBPosition2AdcCounts;
+  MonitorElement *theMEBeam5TIBPosition3AdcCounts;
+  MonitorElement *theMEBeam5TIBPosition4AdcCounts;
+  MonitorElement *theMEBeam5TIBPosition5AdcCounts;
+  MonitorElement *theMEBeam5TIBPosition6AdcCounts;
 
   // Adc counts for Beam 6
-  MonitorElement * theMEBeam6TIBPosition1AdcCounts;
-  MonitorElement * theMEBeam6TIBPosition2AdcCounts;
-  MonitorElement * theMEBeam6TIBPosition3AdcCounts;
-  MonitorElement * theMEBeam6TIBPosition4AdcCounts;
-  MonitorElement * theMEBeam6TIBPosition5AdcCounts;
-  MonitorElement * theMEBeam6TIBPosition6AdcCounts;
+  MonitorElement *theMEBeam6TIBPosition1AdcCounts;
+  MonitorElement *theMEBeam6TIBPosition2AdcCounts;
+  MonitorElement *theMEBeam6TIBPosition3AdcCounts;
+  MonitorElement *theMEBeam6TIBPosition4AdcCounts;
+  MonitorElement *theMEBeam6TIBPosition5AdcCounts;
+  MonitorElement *theMEBeam6TIBPosition6AdcCounts;
 
   // Adc counts for Beam 7
-  MonitorElement * theMEBeam7TIBPosition1AdcCounts;
-  MonitorElement * theMEBeam7TIBPosition2AdcCounts;
-  MonitorElement * theMEBeam7TIBPosition3AdcCounts;
-  MonitorElement * theMEBeam7TIBPosition4AdcCounts;
-  MonitorElement * theMEBeam7TIBPosition5AdcCounts;
-  MonitorElement * theMEBeam7TIBPosition6AdcCounts;
-
+  MonitorElement *theMEBeam7TIBPosition1AdcCounts;
+  MonitorElement *theMEBeam7TIBPosition2AdcCounts;
+  MonitorElement *theMEBeam7TIBPosition3AdcCounts;
+  MonitorElement *theMEBeam7TIBPosition4AdcCounts;
+  MonitorElement *theMEBeam7TIBPosition5AdcCounts;
+  MonitorElement *theMEBeam7TIBPosition6AdcCounts;
 };
 #endif
diff --git a/Alignment/LaserDQM/plugins/LaserDQMInitMonitors.cc b/Alignment/LaserDQM/plugins/LaserDQMInitMonitors.cc
index cd42d3f916d84..127315dd62fd2 100644
--- a/Alignment/LaserDQM/plugins/LaserDQMInitMonitors.cc
+++ b/Alignment/LaserDQM/plugins/LaserDQMInitMonitors.cc
@@ -8,804 +8,1141 @@
 
 #include "Alignment/LaserDQM/plugins/LaserDQM.h"
 
-void LaserDQM::initMonitors()
-{
+void LaserDQM::initMonitors() {
   /* LaserBeams in the TEC+ */
   //  ----- Adc counts for Beam 0 in Ring 4
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/PosTEC/Ring4/Beam0");
-  theMEBeam0Ring4Disc1PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 0 in Ring 4", 512, 0, 511);
+  theMEBeam0Ring4Disc1PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 0 in Ring 4", 512, 0, 511);
   theMEBeam0Ring4Disc1PosAdcCounts->setResetMe(true);
-  theMEBeam0Ring4Disc2PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 0 in Ring 4", 512, 0, 511);
+  theMEBeam0Ring4Disc2PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 0 in Ring 4", 512, 0, 511);
   theMEBeam0Ring4Disc2PosAdcCounts->setResetMe(true);
-  theMEBeam0Ring4Disc3PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 0 in Ring 4", 512, 0, 511);
+  theMEBeam0Ring4Disc3PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 0 in Ring 4", 512, 0, 511);
   theMEBeam0Ring4Disc3PosAdcCounts->setResetMe(true);
-  theMEBeam0Ring4Disc4PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 0 in Ring 4", 512, 0, 511);
+  theMEBeam0Ring4Disc4PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 0 in Ring 4", 512, 0, 511);
   theMEBeam0Ring4Disc4PosAdcCounts->setResetMe(true);
-  theMEBeam0Ring4Disc5PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 0 in Ring 4", 512, 0, 511);
+  theMEBeam0Ring4Disc5PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 0 in Ring 4", 512, 0, 511);
   theMEBeam0Ring4Disc5PosAdcCounts->setResetMe(true);
-  theMEBeam0Ring4Disc6PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 0 in Ring 4", 512, 0, 511);
+  theMEBeam0Ring4Disc6PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 0 in Ring 4", 512, 0, 511);
   theMEBeam0Ring4Disc6PosAdcCounts->setResetMe(true);
-  theMEBeam0Ring4Disc7PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 0 in Ring 4", 512, 0, 511);
+  theMEBeam0Ring4Disc7PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 0 in Ring 4", 512, 0, 511);
   theMEBeam0Ring4Disc7PosAdcCounts->setResetMe(true);
-  theMEBeam0Ring4Disc8PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 0 in Ring 4", 512, 0, 511);
+  theMEBeam0Ring4Disc8PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 0 in Ring 4", 512, 0, 511);
   theMEBeam0Ring4Disc8PosAdcCounts->setResetMe(true);
-  theMEBeam0Ring4Disc9PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 0 in Ring 4", 512, 0, 511);
+  theMEBeam0Ring4Disc9PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 0 in Ring 4", 512, 0, 511);
   theMEBeam0Ring4Disc9PosAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 1 in Ring 4
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/PosTEC/Ring4/Beam1");
-  theMEBeam1Ring4Disc1PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc1PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc1PosAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc2PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc2PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc2PosAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc3PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc3PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc3PosAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc4PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc4PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc4PosAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc5PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc5PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc5PosAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc6PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc6PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc6PosAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc7PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc7PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc7PosAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc8PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc8PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc8PosAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc9PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc9PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc9PosAdcCounts->setResetMe(true);
 
   // plots for TEC2TEC beam 1
-  theMEBeam1Ring4Disc1PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC","Adc counts on Disc 1 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc1PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC", "Adc counts on Disc 1 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc1PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc2PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC","Adc counts on Disc 2 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc2PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC", "Adc counts on Disc 2 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc2PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc3PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC","Adc counts on Disc 3 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc3PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC", "Adc counts on Disc 3 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc3PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc4PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC","Adc counts on Disc 4 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc4PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC", "Adc counts on Disc 4 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc4PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc5PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC","Adc counts on Disc 5 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc5PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC", "Adc counts on Disc 5 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc5PosTEC2TECAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 2 in Ring 4
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/PosTEC/Ring4/Beam2");
-  theMEBeam2Ring4Disc1PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc1PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc1PosAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc2PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc2PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc2PosAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc3PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc3PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc3PosAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc4PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc4PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc4PosAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc5PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc5PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc5PosAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc6PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc6PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc6PosAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc7PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc7PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc7PosAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc8PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc8PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc8PosAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc9PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc9PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc9PosAdcCounts->setResetMe(true);
 
   // plots for TEC2TEC beam 2
-  theMEBeam2Ring4Disc1PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC","Adc counts on Disc 1 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc1PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC", "Adc counts on Disc 1 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc1PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc2PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC","Adc counts on Disc 2 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc2PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC", "Adc counts on Disc 2 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc2PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc3PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC","Adc counts on Disc 3 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc3PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC", "Adc counts on Disc 3 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc3PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc4PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC","Adc counts on Disc 4 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc4PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC", "Adc counts on Disc 4 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc4PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc5PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC","Adc counts on Disc 5 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc5PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC", "Adc counts on Disc 5 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc5PosTEC2TECAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 3 in Ring 4
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/PosTEC/Ring4/Beam3");
-  theMEBeam3Ring4Disc1PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 3 in Ring 4", 512, 0, 511);
+  theMEBeam3Ring4Disc1PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 3 in Ring 4", 512, 0, 511);
   theMEBeam3Ring4Disc1PosAdcCounts->setResetMe(true);
-  theMEBeam3Ring4Disc2PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 3 in Ring 4", 512, 0, 511);
+  theMEBeam3Ring4Disc2PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 3 in Ring 4", 512, 0, 511);
   theMEBeam3Ring4Disc2PosAdcCounts->setResetMe(true);
-  theMEBeam3Ring4Disc3PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 3 in Ring 4", 512, 0, 511);
+  theMEBeam3Ring4Disc3PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 3 in Ring 4", 512, 0, 511);
   theMEBeam3Ring4Disc3PosAdcCounts->setResetMe(true);
-  theMEBeam3Ring4Disc4PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 3 in Ring 4", 512, 0, 511);
+  theMEBeam3Ring4Disc4PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 3 in Ring 4", 512, 0, 511);
   theMEBeam3Ring4Disc4PosAdcCounts->setResetMe(true);
-  theMEBeam3Ring4Disc5PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 3 in Ring 4", 512, 0, 511);
+  theMEBeam3Ring4Disc5PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 3 in Ring 4", 512, 0, 511);
   theMEBeam3Ring4Disc5PosAdcCounts->setResetMe(true);
-  theMEBeam3Ring4Disc6PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 3 in Ring 4", 512, 0, 511);
+  theMEBeam3Ring4Disc6PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 3 in Ring 4", 512, 0, 511);
   theMEBeam3Ring4Disc6PosAdcCounts->setResetMe(true);
-  theMEBeam3Ring4Disc7PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 3 in Ring 4", 512, 0, 511);
+  theMEBeam3Ring4Disc7PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 3 in Ring 4", 512, 0, 511);
   theMEBeam3Ring4Disc7PosAdcCounts->setResetMe(true);
-  theMEBeam3Ring4Disc8PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 3 in Ring 4", 512, 0, 511);
+  theMEBeam3Ring4Disc8PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 3 in Ring 4", 512, 0, 511);
   theMEBeam3Ring4Disc8PosAdcCounts->setResetMe(true);
-  theMEBeam3Ring4Disc9PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 3 in Ring 4", 512, 0, 511);
+  theMEBeam3Ring4Disc9PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 3 in Ring 4", 512, 0, 511);
   theMEBeam3Ring4Disc9PosAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 4 in Ring 4
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/PosTEC/Ring4/Beam4");
-  theMEBeam4Ring4Disc1PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc1PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc1PosAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc2PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc2PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc2PosAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc3PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc3PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc3PosAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc4PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc4PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc4PosAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc5PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc5PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc5PosAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc6PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc6PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc6PosAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc7PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc7PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc7PosAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc8PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc8PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc8PosAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc9PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc9PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc9PosAdcCounts->setResetMe(true);
 
   // plots for TEC2TEC beam 4
-  theMEBeam4Ring4Disc1PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC","Adc counts on Disc 1 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc1PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC", "Adc counts on Disc 1 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc1PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc2PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC","Adc counts on Disc 2 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc2PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC", "Adc counts on Disc 2 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc2PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc3PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC","Adc counts on Disc 3 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc3PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC", "Adc counts on Disc 3 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc3PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc4PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC","Adc counts on Disc 4 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc4PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC", "Adc counts on Disc 4 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc4PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc5PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC","Adc counts on Disc 5 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc5PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC", "Adc counts on Disc 5 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc5PosTEC2TECAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 5 in Ring 4
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/PosTEC/Ring4/Beam5");
-  theMEBeam5Ring4Disc1PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 5 in Ring 4", 512, 0, 511);
+  theMEBeam5Ring4Disc1PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 5 in Ring 4", 512, 0, 511);
   theMEBeam5Ring4Disc1PosAdcCounts->setResetMe(true);
-  theMEBeam5Ring4Disc2PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 5 in Ring 4", 512, 0, 511);
+  theMEBeam5Ring4Disc2PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 5 in Ring 4", 512, 0, 511);
   theMEBeam5Ring4Disc2PosAdcCounts->setResetMe(true);
-  theMEBeam5Ring4Disc3PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 5 in Ring 4", 512, 0, 511);
+  theMEBeam5Ring4Disc3PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 5 in Ring 4", 512, 0, 511);
   theMEBeam5Ring4Disc3PosAdcCounts->setResetMe(true);
-  theMEBeam5Ring4Disc4PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 5 in Ring 4", 512, 0, 511);
+  theMEBeam5Ring4Disc4PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 5 in Ring 4", 512, 0, 511);
   theMEBeam5Ring4Disc4PosAdcCounts->setResetMe(true);
-  theMEBeam5Ring4Disc5PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 5 in Ring 4", 512, 0, 511);
+  theMEBeam5Ring4Disc5PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 5 in Ring 4", 512, 0, 511);
   theMEBeam5Ring4Disc5PosAdcCounts->setResetMe(true);
-  theMEBeam5Ring4Disc6PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 5 in Ring 4", 512, 0, 511);
+  theMEBeam5Ring4Disc6PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 5 in Ring 4", 512, 0, 511);
   theMEBeam5Ring4Disc6PosAdcCounts->setResetMe(true);
-  theMEBeam5Ring4Disc7PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 5 in Ring 4", 512, 0, 511);
+  theMEBeam5Ring4Disc7PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 5 in Ring 4", 512, 0, 511);
   theMEBeam5Ring4Disc7PosAdcCounts->setResetMe(true);
-  theMEBeam5Ring4Disc8PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 5 in Ring 4", 512, 0, 511);
+  theMEBeam5Ring4Disc8PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 5 in Ring 4", 512, 0, 511);
   theMEBeam5Ring4Disc8PosAdcCounts->setResetMe(true);
-  theMEBeam5Ring4Disc9PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 5 in Ring 4", 512, 0, 511);
+  theMEBeam5Ring4Disc9PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 5 in Ring 4", 512, 0, 511);
   theMEBeam5Ring4Disc9PosAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 6 in Ring 4
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/PosTEC/Ring4/Beam6");
-  theMEBeam6Ring4Disc1PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc1PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc1PosAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc2PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc2PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc2PosAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc3PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc3PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc3PosAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc4PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc4PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc4PosAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc5PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc5PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc5PosAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc6PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc6PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc6PosAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc7PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc7PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc7PosAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc8PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc8PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc8PosAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc9PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc9PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc9PosAdcCounts->setResetMe(true);
 
   // plots for TEC2TEC beam 6
-  theMEBeam6Ring4Disc1PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC","Adc counts on Disc 1 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc1PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC", "Adc counts on Disc 1 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc1PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc2PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC","Adc counts on Disc 2 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc2PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC", "Adc counts on Disc 2 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc2PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc3PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC","Adc counts on Disc 3 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc3PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC", "Adc counts on Disc 3 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc3PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc4PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC","Adc counts on Disc 4 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc4PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC", "Adc counts on Disc 4 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc4PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc5PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC","Adc counts on Disc 5 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc5PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC", "Adc counts on Disc 5 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc5PosTEC2TECAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 7 in Ring 4
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/PosTEC/Ring4/Beam7");
-  theMEBeam7Ring4Disc1PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc1PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc1PosAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc2PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc2PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc2PosAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc3PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc3PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc3PosAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc4PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc4PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc4PosAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc5PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc5PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc5PosAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc6PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc6PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc6PosAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc7PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc7PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc7PosAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc8PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc8PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc8PosAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc9PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc9PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc9PosAdcCounts->setResetMe(true);
 
   // plots for TEC2TEC beam 7
-  theMEBeam7Ring4Disc1PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC","Adc counts on Disc 1 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc1PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC", "Adc counts on Disc 1 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc1PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc2PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC","Adc counts on Disc 2 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc2PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC", "Adc counts on Disc 2 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc2PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc3PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC","Adc counts on Disc 3 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc3PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC", "Adc counts on Disc 3 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc3PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc4PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC","Adc counts on Disc 4 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc4PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC", "Adc counts on Disc 4 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc4PosTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc5PosTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC","Adc counts on Disc 5 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc5PosTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC", "Adc counts on Disc 5 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc5PosTEC2TECAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 0 in Ring 6
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/PosTEC/Ring6/Beam0");
-  theMEBeam0Ring6Disc1PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 0 in Ring 6", 512, 0, 511);
+  theMEBeam0Ring6Disc1PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 0 in Ring 6", 512, 0, 511);
   theMEBeam0Ring6Disc1PosAdcCounts->setResetMe(true);
-  theMEBeam0Ring6Disc2PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 0 in Ring 6", 512, 0, 511);
+  theMEBeam0Ring6Disc2PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 0 in Ring 6", 512, 0, 511);
   theMEBeam0Ring6Disc2PosAdcCounts->setResetMe(true);
-  theMEBeam0Ring6Disc3PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 0 in Ring 6", 512, 0, 511);
+  theMEBeam0Ring6Disc3PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 0 in Ring 6", 512, 0, 511);
   theMEBeam0Ring6Disc3PosAdcCounts->setResetMe(true);
-  theMEBeam0Ring6Disc4PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 0 in Ring 6", 512, 0, 511);
+  theMEBeam0Ring6Disc4PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 0 in Ring 6", 512, 0, 511);
   theMEBeam0Ring6Disc4PosAdcCounts->setResetMe(true);
-  theMEBeam0Ring6Disc5PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 0 in Ring 6", 512, 0, 511);
+  theMEBeam0Ring6Disc5PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 0 in Ring 6", 512, 0, 511);
   theMEBeam0Ring6Disc5PosAdcCounts->setResetMe(true);
-  theMEBeam0Ring6Disc6PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 0 in Ring 6", 512, 0, 511);
+  theMEBeam0Ring6Disc6PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 0 in Ring 6", 512, 0, 511);
   theMEBeam0Ring6Disc6PosAdcCounts->setResetMe(true);
-  theMEBeam0Ring6Disc7PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 0 in Ring 6", 512, 0, 511);
+  theMEBeam0Ring6Disc7PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 0 in Ring 6", 512, 0, 511);
   theMEBeam0Ring6Disc7PosAdcCounts->setResetMe(true);
-  theMEBeam0Ring6Disc8PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 0 in Ring 6", 512, 0, 511);
+  theMEBeam0Ring6Disc8PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 0 in Ring 6", 512, 0, 511);
   theMEBeam0Ring6Disc8PosAdcCounts->setResetMe(true);
-  theMEBeam0Ring6Disc9PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 0 in Ring 6", 512, 0, 511);
+  theMEBeam0Ring6Disc9PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 0 in Ring 6", 512, 0, 511);
   theMEBeam0Ring6Disc9PosAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 1 in Ring 6
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/PosTEC/Ring6/Beam1");
-  theMEBeam1Ring6Disc1PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 1 in Ring 6", 512, 0, 511);
+  theMEBeam1Ring6Disc1PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 1 in Ring 6", 512, 0, 511);
   theMEBeam1Ring6Disc1PosAdcCounts->setResetMe(true);
-  theMEBeam1Ring6Disc2PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 1 in Ring 6", 512, 0, 511);
+  theMEBeam1Ring6Disc2PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 1 in Ring 6", 512, 0, 511);
   theMEBeam1Ring6Disc2PosAdcCounts->setResetMe(true);
-  theMEBeam1Ring6Disc3PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 1 in Ring 6", 512, 0, 511);
+  theMEBeam1Ring6Disc3PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 1 in Ring 6", 512, 0, 511);
   theMEBeam1Ring6Disc3PosAdcCounts->setResetMe(true);
-  theMEBeam1Ring6Disc4PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 1 in Ring 6", 512, 0, 511);
+  theMEBeam1Ring6Disc4PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 1 in Ring 6", 512, 0, 511);
   theMEBeam1Ring6Disc4PosAdcCounts->setResetMe(true);
-  theMEBeam1Ring6Disc5PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 1 in Ring 6", 512, 0, 511);
+  theMEBeam1Ring6Disc5PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 1 in Ring 6", 512, 0, 511);
   theMEBeam1Ring6Disc5PosAdcCounts->setResetMe(true);
-  theMEBeam1Ring6Disc6PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 1 in Ring 6", 512, 0, 511);
+  theMEBeam1Ring6Disc6PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 1 in Ring 6", 512, 0, 511);
   theMEBeam1Ring6Disc6PosAdcCounts->setResetMe(true);
-  theMEBeam1Ring6Disc7PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 1 in Ring 6", 512, 0, 511);
+  theMEBeam1Ring6Disc7PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 1 in Ring 6", 512, 0, 511);
   theMEBeam1Ring6Disc7PosAdcCounts->setResetMe(true);
-  theMEBeam1Ring6Disc8PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 1 in Ring 6", 512, 0, 511);
+  theMEBeam1Ring6Disc8PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 1 in Ring 6", 512, 0, 511);
   theMEBeam1Ring6Disc8PosAdcCounts->setResetMe(true);
-  theMEBeam1Ring6Disc9PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 1 in Ring 6", 512, 0, 511);
+  theMEBeam1Ring6Disc9PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 1 in Ring 6", 512, 0, 511);
   theMEBeam1Ring6Disc9PosAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 2 in Ring 6
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/PosTEC/Ring6/Beam2");
-  theMEBeam2Ring6Disc1PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 2 in Ring 6", 512, 0, 511);
+  theMEBeam2Ring6Disc1PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 2 in Ring 6", 512, 0, 511);
   theMEBeam2Ring6Disc1PosAdcCounts->setResetMe(true);
-  theMEBeam2Ring6Disc2PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 2 in Ring 6", 512, 0, 511);
+  theMEBeam2Ring6Disc2PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 2 in Ring 6", 512, 0, 511);
   theMEBeam2Ring6Disc2PosAdcCounts->setResetMe(true);
-  theMEBeam2Ring6Disc3PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 2 in Ring 6", 512, 0, 511);
+  theMEBeam2Ring6Disc3PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 2 in Ring 6", 512, 0, 511);
   theMEBeam2Ring6Disc3PosAdcCounts->setResetMe(true);
-  theMEBeam2Ring6Disc4PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 2 in Ring 6", 512, 0, 511);
+  theMEBeam2Ring6Disc4PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 2 in Ring 6", 512, 0, 511);
   theMEBeam2Ring6Disc4PosAdcCounts->setResetMe(true);
-  theMEBeam2Ring6Disc5PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 2 in Ring 6", 512, 0, 511);
+  theMEBeam2Ring6Disc5PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 2 in Ring 6", 512, 0, 511);
   theMEBeam2Ring6Disc5PosAdcCounts->setResetMe(true);
-  theMEBeam2Ring6Disc6PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 2 in Ring 6", 512, 0, 511);
+  theMEBeam2Ring6Disc6PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 2 in Ring 6", 512, 0, 511);
   theMEBeam2Ring6Disc6PosAdcCounts->setResetMe(true);
-  theMEBeam2Ring6Disc7PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 2 in Ring 6", 512, 0, 511);
+  theMEBeam2Ring6Disc7PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 2 in Ring 6", 512, 0, 511);
   theMEBeam2Ring6Disc7PosAdcCounts->setResetMe(true);
-  theMEBeam2Ring6Disc8PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 2 in Ring 6", 512, 0, 511);
+  theMEBeam2Ring6Disc8PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 2 in Ring 6", 512, 0, 511);
   theMEBeam2Ring6Disc8PosAdcCounts->setResetMe(true);
-  theMEBeam2Ring6Disc9PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 2 in Ring 6", 512, 0, 511);
+  theMEBeam2Ring6Disc9PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 2 in Ring 6", 512, 0, 511);
   theMEBeam2Ring6Disc9PosAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 3 in Ring 6
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/PosTEC/Ring6/Beam3");
-  theMEBeam3Ring6Disc1PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 3 in Ring 6", 512, 0, 511);
+  theMEBeam3Ring6Disc1PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 3 in Ring 6", 512, 0, 511);
   theMEBeam3Ring6Disc1PosAdcCounts->setResetMe(true);
-  theMEBeam3Ring6Disc2PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 3 in Ring 6", 512, 0, 511);
+  theMEBeam3Ring6Disc2PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 3 in Ring 6", 512, 0, 511);
   theMEBeam3Ring6Disc2PosAdcCounts->setResetMe(true);
-  theMEBeam3Ring6Disc3PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 3 in Ring 6", 512, 0, 511);
+  theMEBeam3Ring6Disc3PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 3 in Ring 6", 512, 0, 511);
   theMEBeam3Ring6Disc3PosAdcCounts->setResetMe(true);
-  theMEBeam3Ring6Disc4PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 3 in Ring 6", 512, 0, 511);
+  theMEBeam3Ring6Disc4PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 3 in Ring 6", 512, 0, 511);
   theMEBeam3Ring6Disc4PosAdcCounts->setResetMe(true);
-  theMEBeam3Ring6Disc5PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 3 in Ring 6", 512, 0, 511);
+  theMEBeam3Ring6Disc5PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 3 in Ring 6", 512, 0, 511);
   theMEBeam3Ring6Disc5PosAdcCounts->setResetMe(true);
-  theMEBeam3Ring6Disc6PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 3 in Ring 6", 512, 0, 511);
+  theMEBeam3Ring6Disc6PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 3 in Ring 6", 512, 0, 511);
   theMEBeam3Ring6Disc6PosAdcCounts->setResetMe(true);
-  theMEBeam3Ring6Disc7PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 3 in Ring 6", 512, 0, 511);
+  theMEBeam3Ring6Disc7PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 3 in Ring 6", 512, 0, 511);
   theMEBeam3Ring6Disc7PosAdcCounts->setResetMe(true);
-  theMEBeam3Ring6Disc8PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 3 in Ring 6", 512, 0, 511);
+  theMEBeam3Ring6Disc8PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 3 in Ring 6", 512, 0, 511);
   theMEBeam3Ring6Disc8PosAdcCounts->setResetMe(true);
-  theMEBeam3Ring6Disc9PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 3 in Ring 6", 512, 0, 511);
+  theMEBeam3Ring6Disc9PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 3 in Ring 6", 512, 0, 511);
   theMEBeam3Ring6Disc9PosAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 4 in Ring 6
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/PosTEC/Ring6/Beam4");
-  theMEBeam4Ring6Disc1PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 4 in Ring 6", 512, 0, 511);
+  theMEBeam4Ring6Disc1PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 4 in Ring 6", 512, 0, 511);
   theMEBeam4Ring6Disc1PosAdcCounts->setResetMe(true);
-  theMEBeam4Ring6Disc2PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 4 in Ring 6", 512, 0, 511);
+  theMEBeam4Ring6Disc2PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 4 in Ring 6", 512, 0, 511);
   theMEBeam4Ring6Disc2PosAdcCounts->setResetMe(true);
-  theMEBeam4Ring6Disc3PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 4 in Ring 6", 512, 0, 511);
+  theMEBeam4Ring6Disc3PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 4 in Ring 6", 512, 0, 511);
   theMEBeam4Ring6Disc3PosAdcCounts->setResetMe(true);
-  theMEBeam4Ring6Disc4PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 4 in Ring 6", 512, 0, 511);
+  theMEBeam4Ring6Disc4PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 4 in Ring 6", 512, 0, 511);
   theMEBeam4Ring6Disc4PosAdcCounts->setResetMe(true);
-  theMEBeam4Ring6Disc5PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 4 in Ring 6", 512, 0, 511);
+  theMEBeam4Ring6Disc5PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 4 in Ring 6", 512, 0, 511);
   theMEBeam4Ring6Disc5PosAdcCounts->setResetMe(true);
-  theMEBeam4Ring6Disc6PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 4 in Ring 6", 512, 0, 511);
+  theMEBeam4Ring6Disc6PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 4 in Ring 6", 512, 0, 511);
   theMEBeam4Ring6Disc6PosAdcCounts->setResetMe(true);
-  theMEBeam4Ring6Disc7PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 4 in Ring 6", 512, 0, 511);
+  theMEBeam4Ring6Disc7PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 4 in Ring 6", 512, 0, 511);
   theMEBeam4Ring6Disc7PosAdcCounts->setResetMe(true);
-  theMEBeam4Ring6Disc8PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 4 in Ring 6", 512, 0, 511);
+  theMEBeam4Ring6Disc8PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 4 in Ring 6", 512, 0, 511);
   theMEBeam4Ring6Disc8PosAdcCounts->setResetMe(true);
-  theMEBeam4Ring6Disc9PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 4 in Ring 6", 512, 0, 511);
+  theMEBeam4Ring6Disc9PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 4 in Ring 6", 512, 0, 511);
   theMEBeam4Ring6Disc9PosAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 5 in Ring 6
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/PosTEC/Ring6/Beam5");
-  theMEBeam5Ring6Disc1PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 5 in Ring 6", 512, 0, 511);
+  theMEBeam5Ring6Disc1PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 5 in Ring 6", 512, 0, 511);
   theMEBeam5Ring6Disc1PosAdcCounts->setResetMe(true);
-  theMEBeam5Ring6Disc2PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 5 in Ring 6", 512, 0, 511);
+  theMEBeam5Ring6Disc2PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 5 in Ring 6", 512, 0, 511);
   theMEBeam5Ring6Disc2PosAdcCounts->setResetMe(true);
-  theMEBeam5Ring6Disc3PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 5 in Ring 6", 512, 0, 511);
+  theMEBeam5Ring6Disc3PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 5 in Ring 6", 512, 0, 511);
   theMEBeam5Ring6Disc3PosAdcCounts->setResetMe(true);
-  theMEBeam5Ring6Disc4PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 5 in Ring 6", 512, 0, 511);
+  theMEBeam5Ring6Disc4PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 5 in Ring 6", 512, 0, 511);
   theMEBeam5Ring6Disc4PosAdcCounts->setResetMe(true);
-  theMEBeam5Ring6Disc5PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 5 in Ring 6", 512, 0, 511);
+  theMEBeam5Ring6Disc5PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 5 in Ring 6", 512, 0, 511);
   theMEBeam5Ring6Disc5PosAdcCounts->setResetMe(true);
-  theMEBeam5Ring6Disc6PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 5 in Ring 6", 512, 0, 511);
+  theMEBeam5Ring6Disc6PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 5 in Ring 6", 512, 0, 511);
   theMEBeam5Ring6Disc6PosAdcCounts->setResetMe(true);
-  theMEBeam5Ring6Disc7PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 5 in Ring 6", 512, 0, 511);
+  theMEBeam5Ring6Disc7PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 5 in Ring 6", 512, 0, 511);
   theMEBeam5Ring6Disc7PosAdcCounts->setResetMe(true);
-  theMEBeam5Ring6Disc8PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 5 in Ring 6", 512, 0, 511);
+  theMEBeam5Ring6Disc8PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 5 in Ring 6", 512, 0, 511);
   theMEBeam5Ring6Disc8PosAdcCounts->setResetMe(true);
-  theMEBeam5Ring6Disc9PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 5 in Ring 6", 512, 0, 511);
+  theMEBeam5Ring6Disc9PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 5 in Ring 6", 512, 0, 511);
   theMEBeam5Ring6Disc9PosAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 6 in Ring 6
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/PosTEC/Ring6/Beam6");
-  theMEBeam6Ring6Disc1PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 6 in Ring 6", 512, 0, 511);
+  theMEBeam6Ring6Disc1PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 6 in Ring 6", 512, 0, 511);
   theMEBeam6Ring6Disc1PosAdcCounts->setResetMe(true);
-  theMEBeam6Ring6Disc2PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 6 in Ring 6", 512, 0, 511);
+  theMEBeam6Ring6Disc2PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 6 in Ring 6", 512, 0, 511);
   theMEBeam6Ring6Disc2PosAdcCounts->setResetMe(true);
-  theMEBeam6Ring6Disc3PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 6 in Ring 6", 512, 0, 511);
+  theMEBeam6Ring6Disc3PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 6 in Ring 6", 512, 0, 511);
   theMEBeam6Ring6Disc3PosAdcCounts->setResetMe(true);
-  theMEBeam6Ring6Disc4PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 6 in Ring 6", 512, 0, 511);
+  theMEBeam6Ring6Disc4PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 6 in Ring 6", 512, 0, 511);
   theMEBeam6Ring6Disc4PosAdcCounts->setResetMe(true);
-  theMEBeam6Ring6Disc5PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 6 in Ring 6", 512, 0, 511);
+  theMEBeam6Ring6Disc5PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 6 in Ring 6", 512, 0, 511);
   theMEBeam6Ring6Disc5PosAdcCounts->setResetMe(true);
-  theMEBeam6Ring6Disc6PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 6 in Ring 6", 512, 0, 511);
+  theMEBeam6Ring6Disc6PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 6 in Ring 6", 512, 0, 511);
   theMEBeam6Ring6Disc6PosAdcCounts->setResetMe(true);
-  theMEBeam6Ring6Disc7PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 6 in Ring 6", 512, 0, 511);
+  theMEBeam6Ring6Disc7PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 6 in Ring 6", 512, 0, 511);
   theMEBeam6Ring6Disc7PosAdcCounts->setResetMe(true);
-  theMEBeam6Ring6Disc8PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 6 in Ring 6", 512, 0, 511);
+  theMEBeam6Ring6Disc8PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 6 in Ring 6", 512, 0, 511);
   theMEBeam6Ring6Disc8PosAdcCounts->setResetMe(true);
-  theMEBeam6Ring6Disc9PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 6 in Ring 6", 512, 0, 511);
+  theMEBeam6Ring6Disc9PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 6 in Ring 6", 512, 0, 511);
   theMEBeam6Ring6Disc9PosAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 7 in Ring 6
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/PosTEC/Ring6/Beam7");
-  theMEBeam7Ring6Disc1PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 7 in Ring 6", 512, 0, 511);
+  theMEBeam7Ring6Disc1PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 7 in Ring 6", 512, 0, 511);
   theMEBeam7Ring6Disc1PosAdcCounts->setResetMe(true);
-  theMEBeam7Ring6Disc2PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 7 in Ring 6", 512, 0, 511);
+  theMEBeam7Ring6Disc2PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 7 in Ring 6", 512, 0, 511);
   theMEBeam7Ring6Disc2PosAdcCounts->setResetMe(true);
-  theMEBeam7Ring6Disc3PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 7 in Ring 6", 512, 0, 511);
+  theMEBeam7Ring6Disc3PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 7 in Ring 6", 512, 0, 511);
   theMEBeam7Ring6Disc3PosAdcCounts->setResetMe(true);
-  theMEBeam7Ring6Disc4PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 7 in Ring 6", 512, 0, 511);
+  theMEBeam7Ring6Disc4PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 7 in Ring 6", 512, 0, 511);
   theMEBeam7Ring6Disc4PosAdcCounts->setResetMe(true);
-  theMEBeam7Ring6Disc5PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 7 in Ring 6", 512, 0, 511);
+  theMEBeam7Ring6Disc5PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 7 in Ring 6", 512, 0, 511);
   theMEBeam7Ring6Disc5PosAdcCounts->setResetMe(true);
-  theMEBeam7Ring6Disc6PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 7 in Ring 6", 512, 0, 511);
+  theMEBeam7Ring6Disc6PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 7 in Ring 6", 512, 0, 511);
   theMEBeam7Ring6Disc6PosAdcCounts->setResetMe(true);
-  theMEBeam7Ring6Disc7PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 7 in Ring 6", 512, 0, 511);
+  theMEBeam7Ring6Disc7PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 7 in Ring 6", 512, 0, 511);
   theMEBeam7Ring6Disc7PosAdcCounts->setResetMe(true);
-  theMEBeam7Ring6Disc8PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 7 in Ring 6", 512, 0, 511);
+  theMEBeam7Ring6Disc8PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 7 in Ring 6", 512, 0, 511);
   theMEBeam7Ring6Disc8PosAdcCounts->setResetMe(true);
-  theMEBeam7Ring6Disc9PosAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 7 in Ring 6", 512, 0, 511);
+  theMEBeam7Ring6Disc9PosAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 7 in Ring 6", 512, 0, 511);
   theMEBeam7Ring6Disc9PosAdcCounts->setResetMe(true);
 
   /* LaserBeams in the TEC- */
   // ----- Adc counts for Beam 0 in Ring 4
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/NegTEC/Ring4/Beam0");
-  theMEBeam0Ring4Disc1NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 0 in Ring 4", 512, 0, 511);
+  theMEBeam0Ring4Disc1NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 0 in Ring 4", 512, 0, 511);
   theMEBeam0Ring4Disc1NegAdcCounts->setResetMe(true);
-  theMEBeam0Ring4Disc2NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 0 in Ring 4", 512, 0, 511);
+  theMEBeam0Ring4Disc2NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 0 in Ring 4", 512, 0, 511);
   theMEBeam0Ring4Disc2NegAdcCounts->setResetMe(true);
-  theMEBeam0Ring4Disc3NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 0 in Ring 4", 512, 0, 511);
+  theMEBeam0Ring4Disc3NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 0 in Ring 4", 512, 0, 511);
   theMEBeam0Ring4Disc3NegAdcCounts->setResetMe(true);
-  theMEBeam0Ring4Disc4NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 0 in Ring 4", 512, 0, 511);
+  theMEBeam0Ring4Disc4NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 0 in Ring 4", 512, 0, 511);
   theMEBeam0Ring4Disc4NegAdcCounts->setResetMe(true);
-  theMEBeam0Ring4Disc5NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 0 in Ring 4", 512, 0, 511);
+  theMEBeam0Ring4Disc5NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 0 in Ring 4", 512, 0, 511);
   theMEBeam0Ring4Disc5NegAdcCounts->setResetMe(true);
-  theMEBeam0Ring4Disc6NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 0 in Ring 4", 512, 0, 511);
+  theMEBeam0Ring4Disc6NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 0 in Ring 4", 512, 0, 511);
   theMEBeam0Ring4Disc6NegAdcCounts->setResetMe(true);
-  theMEBeam0Ring4Disc7NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 0 in Ring 4", 512, 0, 511);
+  theMEBeam0Ring4Disc7NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 0 in Ring 4", 512, 0, 511);
   theMEBeam0Ring4Disc7NegAdcCounts->setResetMe(true);
-  theMEBeam0Ring4Disc8NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 0 in Ring 4", 512, 0, 511);
+  theMEBeam0Ring4Disc8NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 0 in Ring 4", 512, 0, 511);
   theMEBeam0Ring4Disc8NegAdcCounts->setResetMe(true);
-  theMEBeam0Ring4Disc9NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 0 in Ring 4", 512, 0, 511);
+  theMEBeam0Ring4Disc9NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 0 in Ring 4", 512, 0, 511);
   theMEBeam0Ring4Disc9NegAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 1 in Ring 4
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/NegTEC/Ring4/Beam1");
-  theMEBeam1Ring4Disc1NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc1NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc1NegAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc2NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc2NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc2NegAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc3NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc3NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc3NegAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc4NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc4NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc4NegAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc5NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc5NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc5NegAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc6NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc6NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc6NegAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc7NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc7NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc7NegAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc8NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc8NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc8NegAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc9NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc9NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc9NegAdcCounts->setResetMe(true);
 
   // plots for TEC2TEC beam 1
-  theMEBeam1Ring4Disc1NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC","Adc counts on Disc 1 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc1NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC", "Adc counts on Disc 1 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc1NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc2NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC","Adc counts on Disc 2 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc2NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC", "Adc counts on Disc 2 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc2NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc3NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC","Adc counts on Disc 3 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc3NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC", "Adc counts on Disc 3 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc3NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc4NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC","Adc counts on Disc 4 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc4NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC", "Adc counts on Disc 4 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc4NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam1Ring4Disc5NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC","Adc counts on Disc 5 for Beam 1 in Ring 4", 512, 0, 511);
+  theMEBeam1Ring4Disc5NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC", "Adc counts on Disc 5 for Beam 1 in Ring 4", 512, 0, 511);
   theMEBeam1Ring4Disc5NegTEC2TECAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 2 in Ring 4
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/NegTEC/Ring4/Beam2");
-  theMEBeam2Ring4Disc1NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc1NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc1NegAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc2NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc2NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc2NegAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc3NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc3NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc3NegAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc4NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc4NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc4NegAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc5NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc5NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc5NegAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc6NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc6NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc6NegAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc7NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc7NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc7NegAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc8NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc8NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc8NegAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc9NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc9NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc9NegAdcCounts->setResetMe(true);
 
   // plots for TEC2TEC beam 2
-  theMEBeam2Ring4Disc1NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC","Adc counts on Disc 1 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc1NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC", "Adc counts on Disc 1 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc1NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc2NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC","Adc counts on Disc 2 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc2NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC", "Adc counts on Disc 2 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc2NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc3NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC","Adc counts on Disc 3 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc3NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC", "Adc counts on Disc 3 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc3NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc4NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC","Adc counts on Disc 4 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc4NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC", "Adc counts on Disc 4 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc4NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam2Ring4Disc5NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC","Adc counts on Disc 5 for Beam 2 in Ring 4", 512, 0, 511);
+  theMEBeam2Ring4Disc5NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC", "Adc counts on Disc 5 for Beam 2 in Ring 4", 512, 0, 511);
   theMEBeam2Ring4Disc5NegTEC2TECAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 3 in Ring 4
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/NegTEC/Ring4/Beam3");
-  theMEBeam3Ring4Disc1NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 3 in Ring 4", 512, 0, 511);
+  theMEBeam3Ring4Disc1NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 3 in Ring 4", 512, 0, 511);
   theMEBeam3Ring4Disc1NegAdcCounts->setResetMe(true);
-  theMEBeam3Ring4Disc2NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 3 in Ring 4", 512, 0, 511);
+  theMEBeam3Ring4Disc2NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 3 in Ring 4", 512, 0, 511);
   theMEBeam3Ring4Disc2NegAdcCounts->setResetMe(true);
-  theMEBeam3Ring4Disc3NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 3 in Ring 4", 512, 0, 511);
+  theMEBeam3Ring4Disc3NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 3 in Ring 4", 512, 0, 511);
   theMEBeam3Ring4Disc3NegAdcCounts->setResetMe(true);
-  theMEBeam3Ring4Disc4NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 3 in Ring 4", 512, 0, 511);
+  theMEBeam3Ring4Disc4NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 3 in Ring 4", 512, 0, 511);
   theMEBeam3Ring4Disc4NegAdcCounts->setResetMe(true);
-  theMEBeam3Ring4Disc5NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 3 in Ring 4", 512, 0, 511);
+  theMEBeam3Ring4Disc5NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 3 in Ring 4", 512, 0, 511);
   theMEBeam3Ring4Disc5NegAdcCounts->setResetMe(true);
-  theMEBeam3Ring4Disc6NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 3 in Ring 4", 512, 0, 511);
+  theMEBeam3Ring4Disc6NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 3 in Ring 4", 512, 0, 511);
   theMEBeam3Ring4Disc6NegAdcCounts->setResetMe(true);
-  theMEBeam3Ring4Disc7NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 3 in Ring 4", 512, 0, 511);
+  theMEBeam3Ring4Disc7NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 3 in Ring 4", 512, 0, 511);
   theMEBeam3Ring4Disc7NegAdcCounts->setResetMe(true);
-  theMEBeam3Ring4Disc8NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 3 in Ring 4", 512, 0, 511);
+  theMEBeam3Ring4Disc8NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 3 in Ring 4", 512, 0, 511);
   theMEBeam3Ring4Disc8NegAdcCounts->setResetMe(true);
-  theMEBeam3Ring4Disc9NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 3 in Ring 4", 512, 0, 511);
+  theMEBeam3Ring4Disc9NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 3 in Ring 4", 512, 0, 511);
   theMEBeam3Ring4Disc9NegAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 4 in Ring 4
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/NegTEC/Ring4/Beam4");
-  theMEBeam4Ring4Disc1NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc1NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc1NegAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc2NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc2NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc2NegAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc3NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc3NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc3NegAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc4NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc4NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc4NegAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc5NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc5NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc5NegAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc6NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc6NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc6NegAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc7NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc7NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc7NegAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc8NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc8NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc8NegAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc9NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc9NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc9NegAdcCounts->setResetMe(true);
 
   // plots for TEC2TEC beam 4
-  theMEBeam4Ring4Disc1NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC","Adc counts on Disc 1 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc1NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC", "Adc counts on Disc 1 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc1NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc2NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC","Adc counts on Disc 2 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc2NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC", "Adc counts on Disc 2 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc2NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc3NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC","Adc counts on Disc 3 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc3NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC", "Adc counts on Disc 3 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc3NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc4NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC","Adc counts on Disc 4 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc4NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC", "Adc counts on Disc 4 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc4NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam4Ring4Disc5NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC","Adc counts on Disc 5 for Beam 4 in Ring 4", 512, 0, 511);
+  theMEBeam4Ring4Disc5NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC", "Adc counts on Disc 5 for Beam 4 in Ring 4", 512, 0, 511);
   theMEBeam4Ring4Disc5NegTEC2TECAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 5 in Ring 4
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/NegTEC/Ring4/Beam5");
-  theMEBeam5Ring4Disc1NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 5 in Ring 4", 512, 0, 511);
+  theMEBeam5Ring4Disc1NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 5 in Ring 4", 512, 0, 511);
   theMEBeam5Ring4Disc1NegAdcCounts->setResetMe(true);
-  theMEBeam5Ring4Disc2NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 5 in Ring 4", 512, 0, 511);
+  theMEBeam5Ring4Disc2NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 5 in Ring 4", 512, 0, 511);
   theMEBeam5Ring4Disc2NegAdcCounts->setResetMe(true);
-  theMEBeam5Ring4Disc3NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 5 in Ring 4", 512, 0, 511);
+  theMEBeam5Ring4Disc3NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 5 in Ring 4", 512, 0, 511);
   theMEBeam5Ring4Disc3NegAdcCounts->setResetMe(true);
-  theMEBeam5Ring4Disc4NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 5 in Ring 4", 512, 0, 511);
+  theMEBeam5Ring4Disc4NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 5 in Ring 4", 512, 0, 511);
   theMEBeam5Ring4Disc4NegAdcCounts->setResetMe(true);
-  theMEBeam5Ring4Disc5NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 5 in Ring 4", 512, 0, 511);
+  theMEBeam5Ring4Disc5NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 5 in Ring 4", 512, 0, 511);
   theMEBeam5Ring4Disc5NegAdcCounts->setResetMe(true);
-  theMEBeam5Ring4Disc6NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 5 in Ring 4", 512, 0, 511);
+  theMEBeam5Ring4Disc6NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 5 in Ring 4", 512, 0, 511);
   theMEBeam5Ring4Disc6NegAdcCounts->setResetMe(true);
-  theMEBeam5Ring4Disc7NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 5 in Ring 4", 512, 0, 511);
+  theMEBeam5Ring4Disc7NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 5 in Ring 4", 512, 0, 511);
   theMEBeam5Ring4Disc7NegAdcCounts->setResetMe(true);
-  theMEBeam5Ring4Disc8NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 5 in Ring 4", 512, 0, 511);
+  theMEBeam5Ring4Disc8NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 5 in Ring 4", 512, 0, 511);
   theMEBeam5Ring4Disc8NegAdcCounts->setResetMe(true);
-  theMEBeam5Ring4Disc9NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 5 in Ring 4", 512, 0, 511);
+  theMEBeam5Ring4Disc9NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 5 in Ring 4", 512, 0, 511);
   theMEBeam5Ring4Disc9NegAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 6 in Ring 4
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/NegTEC/Ring4/Beam6");
-  theMEBeam6Ring4Disc1NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc1NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc1NegAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc2NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc2NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc2NegAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc3NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc3NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc3NegAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc4NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc4NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc4NegAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc5NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc5NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc5NegAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc6NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc6NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc6NegAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc7NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc7NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc7NegAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc8NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc8NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc8NegAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc9NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc9NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc9NegAdcCounts->setResetMe(true);
 
   // plots for TEC2TEC beam 6
-  theMEBeam6Ring4Disc1NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC","Adc counts on Disc 1 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc1NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC", "Adc counts on Disc 1 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc1NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc2NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC","Adc counts on Disc 2 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc2NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC", "Adc counts on Disc 2 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc2NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc3NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC","Adc counts on Disc 3 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc3NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC", "Adc counts on Disc 3 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc3NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc4NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC","Adc counts on Disc 4 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc4NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC", "Adc counts on Disc 4 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc4NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam6Ring4Disc5NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC","Adc counts on Disc 5 for Beam 6 in Ring 4", 512, 0, 511);
+  theMEBeam6Ring4Disc5NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC", "Adc counts on Disc 5 for Beam 6 in Ring 4", 512, 0, 511);
   theMEBeam6Ring4Disc5NegTEC2TECAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 7 in Ring 4
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/NegTEC/Ring4/Beam7");
-  theMEBeam7Ring4Disc1NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc1NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc1NegAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc2NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc2NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc2NegAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc3NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc3NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc3NegAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc4NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc4NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc4NegAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc5NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc5NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc5NegAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc6NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc6NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc6NegAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc7NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc7NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc7NegAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc8NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc8NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc8NegAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc9NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc9NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc9NegAdcCounts->setResetMe(true);
 
   // plots for TEC2TEC beam 7
-  theMEBeam7Ring4Disc1NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC","Adc counts on Disc 1 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc1NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1TEC2TEC", "Adc counts on Disc 1 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc1NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc2NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC","Adc counts on Disc 2 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc2NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2TEC2TEC", "Adc counts on Disc 2 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc2NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc3NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC","Adc counts on Disc 3 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc3NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3TEC2TEC", "Adc counts on Disc 3 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc3NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc4NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC","Adc counts on Disc 4 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc4NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4TEC2TEC", "Adc counts on Disc 4 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc4NegTEC2TECAdcCounts->setResetMe(true);
-  theMEBeam7Ring4Disc5NegTEC2TECAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC","Adc counts on Disc 5 for Beam 7 in Ring 4", 512, 0, 511);
+  theMEBeam7Ring4Disc5NegTEC2TECAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5TEC2TEC", "Adc counts on Disc 5 for Beam 7 in Ring 4", 512, 0, 511);
   theMEBeam7Ring4Disc5NegTEC2TECAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 0 in Ring 6
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/NegTEC/Ring6/Beam0");
-  theMEBeam0Ring6Disc1NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 0 in Ring 6", 512, 0, 511);
+  theMEBeam0Ring6Disc1NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 0 in Ring 6", 512, 0, 511);
   theMEBeam0Ring6Disc1NegAdcCounts->setResetMe(true);
-  theMEBeam0Ring6Disc2NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 0 in Ring 6", 512, 0, 511);
+  theMEBeam0Ring6Disc2NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 0 in Ring 6", 512, 0, 511);
   theMEBeam0Ring6Disc2NegAdcCounts->setResetMe(true);
-  theMEBeam0Ring6Disc3NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 0 in Ring 6", 512, 0, 511);
+  theMEBeam0Ring6Disc3NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 0 in Ring 6", 512, 0, 511);
   theMEBeam0Ring6Disc3NegAdcCounts->setResetMe(true);
-  theMEBeam0Ring6Disc4NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 0 in Ring 6", 512, 0, 511);
+  theMEBeam0Ring6Disc4NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 0 in Ring 6", 512, 0, 511);
   theMEBeam0Ring6Disc4NegAdcCounts->setResetMe(true);
-  theMEBeam0Ring6Disc5NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 0 in Ring 6", 512, 0, 511);
+  theMEBeam0Ring6Disc5NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 0 in Ring 6", 512, 0, 511);
   theMEBeam0Ring6Disc5NegAdcCounts->setResetMe(true);
-  theMEBeam0Ring6Disc6NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 0 in Ring 6", 512, 0, 511);
+  theMEBeam0Ring6Disc6NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 0 in Ring 6", 512, 0, 511);
   theMEBeam0Ring6Disc6NegAdcCounts->setResetMe(true);
-  theMEBeam0Ring6Disc7NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 0 in Ring 6", 512, 0, 511);
+  theMEBeam0Ring6Disc7NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 0 in Ring 6", 512, 0, 511);
   theMEBeam0Ring6Disc7NegAdcCounts->setResetMe(true);
-  theMEBeam0Ring6Disc8NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 0 in Ring 6", 512, 0, 511);
+  theMEBeam0Ring6Disc8NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 0 in Ring 6", 512, 0, 511);
   theMEBeam0Ring6Disc8NegAdcCounts->setResetMe(true);
-  theMEBeam0Ring6Disc9NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 0 in Ring 6", 512, 0, 511);
+  theMEBeam0Ring6Disc9NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 0 in Ring 6", 512, 0, 511);
   theMEBeam0Ring6Disc9NegAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 1 in Ring 6
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/NegTEC/Ring6/Beam1");
-  theMEBeam1Ring6Disc1NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 1 in Ring 6", 512, 0, 511);
+  theMEBeam1Ring6Disc1NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 1 in Ring 6", 512, 0, 511);
   theMEBeam1Ring6Disc1NegAdcCounts->setResetMe(true);
-  theMEBeam1Ring6Disc2NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 1 in Ring 6", 512, 0, 511);
+  theMEBeam1Ring6Disc2NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 1 in Ring 6", 512, 0, 511);
   theMEBeam1Ring6Disc2NegAdcCounts->setResetMe(true);
-  theMEBeam1Ring6Disc3NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 1 in Ring 6", 512, 0, 511);
+  theMEBeam1Ring6Disc3NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 1 in Ring 6", 512, 0, 511);
   theMEBeam1Ring6Disc3NegAdcCounts->setResetMe(true);
-  theMEBeam1Ring6Disc4NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 1 in Ring 6", 512, 0, 511);
+  theMEBeam1Ring6Disc4NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 1 in Ring 6", 512, 0, 511);
   theMEBeam1Ring6Disc4NegAdcCounts->setResetMe(true);
-  theMEBeam1Ring6Disc5NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 1 in Ring 6", 512, 0, 511);
+  theMEBeam1Ring6Disc5NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 1 in Ring 6", 512, 0, 511);
   theMEBeam1Ring6Disc5NegAdcCounts->setResetMe(true);
-  theMEBeam1Ring6Disc6NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 1 in Ring 6", 512, 0, 511);
+  theMEBeam1Ring6Disc6NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 1 in Ring 6", 512, 0, 511);
   theMEBeam1Ring6Disc6NegAdcCounts->setResetMe(true);
-  theMEBeam1Ring6Disc7NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 1 in Ring 6", 512, 0, 511);
+  theMEBeam1Ring6Disc7NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 1 in Ring 6", 512, 0, 511);
   theMEBeam1Ring6Disc7NegAdcCounts->setResetMe(true);
-  theMEBeam1Ring6Disc8NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 1 in Ring 6", 512, 0, 511);
+  theMEBeam1Ring6Disc8NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 1 in Ring 6", 512, 0, 511);
   theMEBeam1Ring6Disc8NegAdcCounts->setResetMe(true);
-  theMEBeam1Ring6Disc9NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 1 in Ring 6", 512, 0, 511);
+  theMEBeam1Ring6Disc9NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 1 in Ring 6", 512, 0, 511);
   theMEBeam1Ring6Disc9NegAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 2 in Ring 6
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/NegTEC/Ring6/Beam2");
-  theMEBeam2Ring6Disc1NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 2 in Ring 6", 512, 0, 511);
+  theMEBeam2Ring6Disc1NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 2 in Ring 6", 512, 0, 511);
   theMEBeam2Ring6Disc1NegAdcCounts->setResetMe(true);
-  theMEBeam2Ring6Disc2NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 2 in Ring 6", 512, 0, 511);
+  theMEBeam2Ring6Disc2NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 2 in Ring 6", 512, 0, 511);
   theMEBeam2Ring6Disc2NegAdcCounts->setResetMe(true);
-  theMEBeam2Ring6Disc3NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 2 in Ring 6", 512, 0, 511);
+  theMEBeam2Ring6Disc3NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 2 in Ring 6", 512, 0, 511);
   theMEBeam2Ring6Disc3NegAdcCounts->setResetMe(true);
-  theMEBeam2Ring6Disc4NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 2 in Ring 6", 512, 0, 511);
+  theMEBeam2Ring6Disc4NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 2 in Ring 6", 512, 0, 511);
   theMEBeam2Ring6Disc4NegAdcCounts->setResetMe(true);
-  theMEBeam2Ring6Disc5NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 2 in Ring 6", 512, 0, 511);
+  theMEBeam2Ring6Disc5NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 2 in Ring 6", 512, 0, 511);
   theMEBeam2Ring6Disc5NegAdcCounts->setResetMe(true);
-  theMEBeam2Ring6Disc6NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 2 in Ring 6", 512, 0, 511);
+  theMEBeam2Ring6Disc6NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 2 in Ring 6", 512, 0, 511);
   theMEBeam2Ring6Disc6NegAdcCounts->setResetMe(true);
-  theMEBeam2Ring6Disc7NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 2 in Ring 6", 512, 0, 511);
+  theMEBeam2Ring6Disc7NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 2 in Ring 6", 512, 0, 511);
   theMEBeam2Ring6Disc7NegAdcCounts->setResetMe(true);
-  theMEBeam2Ring6Disc8NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 2 in Ring 6", 512, 0, 511);
+  theMEBeam2Ring6Disc8NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 2 in Ring 6", 512, 0, 511);
   theMEBeam2Ring6Disc8NegAdcCounts->setResetMe(true);
-  theMEBeam2Ring6Disc9NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 2 in Ring 6", 512, 0, 511);
+  theMEBeam2Ring6Disc9NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 2 in Ring 6", 512, 0, 511);
   theMEBeam2Ring6Disc9NegAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 3 in Ring 6
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/NegTEC/Ring6/Beam3");
-  theMEBeam3Ring6Disc1NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 3 in Ring 6", 512, 0, 511);
+  theMEBeam3Ring6Disc1NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 3 in Ring 6", 512, 0, 511);
   theMEBeam3Ring6Disc1NegAdcCounts->setResetMe(true);
-  theMEBeam3Ring6Disc2NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 3 in Ring 6", 512, 0, 511);
+  theMEBeam3Ring6Disc2NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 3 in Ring 6", 512, 0, 511);
   theMEBeam3Ring6Disc2NegAdcCounts->setResetMe(true);
-  theMEBeam3Ring6Disc3NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 3 in Ring 6", 512, 0, 511);
+  theMEBeam3Ring6Disc3NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 3 in Ring 6", 512, 0, 511);
   theMEBeam3Ring6Disc3NegAdcCounts->setResetMe(true);
-  theMEBeam3Ring6Disc4NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 3 in Ring 6", 512, 0, 511);
+  theMEBeam3Ring6Disc4NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 3 in Ring 6", 512, 0, 511);
   theMEBeam3Ring6Disc4NegAdcCounts->setResetMe(true);
-  theMEBeam3Ring6Disc5NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 3 in Ring 6", 512, 0, 511);
+  theMEBeam3Ring6Disc5NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 3 in Ring 6", 512, 0, 511);
   theMEBeam3Ring6Disc5NegAdcCounts->setResetMe(true);
-  theMEBeam3Ring6Disc6NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 3 in Ring 6", 512, 0, 511);
+  theMEBeam3Ring6Disc6NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 3 in Ring 6", 512, 0, 511);
   theMEBeam3Ring6Disc6NegAdcCounts->setResetMe(true);
-  theMEBeam3Ring6Disc7NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 3 in Ring 6", 512, 0, 511);
+  theMEBeam3Ring6Disc7NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 3 in Ring 6", 512, 0, 511);
   theMEBeam3Ring6Disc7NegAdcCounts->setResetMe(true);
-  theMEBeam3Ring6Disc8NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 3 in Ring 6", 512, 0, 511);
+  theMEBeam3Ring6Disc8NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 3 in Ring 6", 512, 0, 511);
   theMEBeam3Ring6Disc8NegAdcCounts->setResetMe(true);
-  theMEBeam3Ring6Disc9NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 3 in Ring 6", 512, 0, 511);
+  theMEBeam3Ring6Disc9NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 3 in Ring 6", 512, 0, 511);
   theMEBeam3Ring6Disc9NegAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 4 in Ring 6
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/NegTEC/Ring6/Beam4");
-  theMEBeam4Ring6Disc1NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 4 in Ring 6", 512, 0, 511);
+  theMEBeam4Ring6Disc1NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 4 in Ring 6", 512, 0, 511);
   theMEBeam4Ring6Disc1NegAdcCounts->setResetMe(true);
-  theMEBeam4Ring6Disc2NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 4 in Ring 6", 512, 0, 511);
+  theMEBeam4Ring6Disc2NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 4 in Ring 6", 512, 0, 511);
   theMEBeam4Ring6Disc2NegAdcCounts->setResetMe(true);
-  theMEBeam4Ring6Disc3NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 4 in Ring 6", 512, 0, 511);
+  theMEBeam4Ring6Disc3NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 4 in Ring 6", 512, 0, 511);
   theMEBeam4Ring6Disc3NegAdcCounts->setResetMe(true);
-  theMEBeam4Ring6Disc4NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 4 in Ring 6", 512, 0, 511);
+  theMEBeam4Ring6Disc4NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 4 in Ring 6", 512, 0, 511);
   theMEBeam4Ring6Disc4NegAdcCounts->setResetMe(true);
-  theMEBeam4Ring6Disc5NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 4 in Ring 6", 512, 0, 511);
+  theMEBeam4Ring6Disc5NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 4 in Ring 6", 512, 0, 511);
   theMEBeam4Ring6Disc5NegAdcCounts->setResetMe(true);
-  theMEBeam4Ring6Disc6NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 4 in Ring 6", 512, 0, 511);
+  theMEBeam4Ring6Disc6NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 4 in Ring 6", 512, 0, 511);
   theMEBeam4Ring6Disc6NegAdcCounts->setResetMe(true);
-  theMEBeam4Ring6Disc7NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 4 in Ring 6", 512, 0, 511);
+  theMEBeam4Ring6Disc7NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 4 in Ring 6", 512, 0, 511);
   theMEBeam4Ring6Disc7NegAdcCounts->setResetMe(true);
-  theMEBeam4Ring6Disc8NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 4 in Ring 6", 512, 0, 511);
+  theMEBeam4Ring6Disc8NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 4 in Ring 6", 512, 0, 511);
   theMEBeam4Ring6Disc8NegAdcCounts->setResetMe(true);
-  theMEBeam4Ring6Disc9NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 4 in Ring 6", 512, 0, 511);
+  theMEBeam4Ring6Disc9NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 4 in Ring 6", 512, 0, 511);
   theMEBeam4Ring6Disc9NegAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 5 in Ring 6
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/NegTEC/Ring6/Beam5");
-  theMEBeam5Ring6Disc1NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 5 in Ring 6", 512, 0, 511);
+  theMEBeam5Ring6Disc1NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 5 in Ring 6", 512, 0, 511);
   theMEBeam5Ring6Disc1NegAdcCounts->setResetMe(true);
-  theMEBeam5Ring6Disc2NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 5 in Ring 6", 512, 0, 511);
+  theMEBeam5Ring6Disc2NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 5 in Ring 6", 512, 0, 511);
   theMEBeam5Ring6Disc2NegAdcCounts->setResetMe(true);
-  theMEBeam5Ring6Disc3NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 5 in Ring 6", 512, 0, 511);
+  theMEBeam5Ring6Disc3NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 5 in Ring 6", 512, 0, 511);
   theMEBeam5Ring6Disc3NegAdcCounts->setResetMe(true);
-  theMEBeam5Ring6Disc4NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 5 in Ring 6", 512, 0, 511);
+  theMEBeam5Ring6Disc4NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 5 in Ring 6", 512, 0, 511);
   theMEBeam5Ring6Disc4NegAdcCounts->setResetMe(true);
-  theMEBeam5Ring6Disc5NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 5 in Ring 6", 512, 0, 511);
+  theMEBeam5Ring6Disc5NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 5 in Ring 6", 512, 0, 511);
   theMEBeam5Ring6Disc5NegAdcCounts->setResetMe(true);
-  theMEBeam5Ring6Disc6NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 5 in Ring 6", 512, 0, 511);
+  theMEBeam5Ring6Disc6NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 5 in Ring 6", 512, 0, 511);
   theMEBeam5Ring6Disc6NegAdcCounts->setResetMe(true);
-  theMEBeam5Ring6Disc7NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 5 in Ring 6", 512, 0, 511);
+  theMEBeam5Ring6Disc7NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 5 in Ring 6", 512, 0, 511);
   theMEBeam5Ring6Disc7NegAdcCounts->setResetMe(true);
-  theMEBeam5Ring6Disc8NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 5 in Ring 6", 512, 0, 511);
+  theMEBeam5Ring6Disc8NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 5 in Ring 6", 512, 0, 511);
   theMEBeam5Ring6Disc8NegAdcCounts->setResetMe(true);
-  theMEBeam5Ring6Disc9NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 5 in Ring 6", 512, 0, 511);
+  theMEBeam5Ring6Disc9NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 5 in Ring 6", 512, 0, 511);
   theMEBeam5Ring6Disc9NegAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 6 in Ring 6
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/NegTEC/Ring6/Beam6");
-  theMEBeam6Ring6Disc1NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 6 in Ring 6", 512, 0, 511);
+  theMEBeam6Ring6Disc1NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 6 in Ring 6", 512, 0, 511);
   theMEBeam6Ring6Disc1NegAdcCounts->setResetMe(true);
-  theMEBeam6Ring6Disc2NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 6 in Ring 6", 512, 0, 511);
+  theMEBeam6Ring6Disc2NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 6 in Ring 6", 512, 0, 511);
   theMEBeam6Ring6Disc2NegAdcCounts->setResetMe(true);
-  theMEBeam6Ring6Disc3NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 6 in Ring 6", 512, 0, 511);
+  theMEBeam6Ring6Disc3NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 6 in Ring 6", 512, 0, 511);
   theMEBeam6Ring6Disc3NegAdcCounts->setResetMe(true);
-  theMEBeam6Ring6Disc4NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 6 in Ring 6", 512, 0, 511);
+  theMEBeam6Ring6Disc4NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 6 in Ring 6", 512, 0, 511);
   theMEBeam6Ring6Disc4NegAdcCounts->setResetMe(true);
-  theMEBeam6Ring6Disc5NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 6 in Ring 6", 512, 0, 511);
+  theMEBeam6Ring6Disc5NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 6 in Ring 6", 512, 0, 511);
   theMEBeam6Ring6Disc5NegAdcCounts->setResetMe(true);
-  theMEBeam6Ring6Disc6NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 6 in Ring 6", 512, 0, 511);
+  theMEBeam6Ring6Disc6NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 6 in Ring 6", 512, 0, 511);
   theMEBeam6Ring6Disc6NegAdcCounts->setResetMe(true);
-  theMEBeam6Ring6Disc7NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 6 in Ring 6", 512, 0, 511);
+  theMEBeam6Ring6Disc7NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 6 in Ring 6", 512, 0, 511);
   theMEBeam6Ring6Disc7NegAdcCounts->setResetMe(true);
-  theMEBeam6Ring6Disc8NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 6 in Ring 6", 512, 0, 511);
+  theMEBeam6Ring6Disc8NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 6 in Ring 6", 512, 0, 511);
   theMEBeam6Ring6Disc8NegAdcCounts->setResetMe(true);
-  theMEBeam6Ring6Disc9NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 6 in Ring 6", 512, 0, 511);
+  theMEBeam6Ring6Disc9NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 6 in Ring 6", 512, 0, 511);
   theMEBeam6Ring6Disc9NegAdcCounts->setResetMe(true);
 
   // ----- Adc counts for Beam 7 in Ring 6
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/NegTEC/Ring6/Beam7");
-  theMEBeam7Ring6Disc1NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc1","Adc counts on Disc 1 for Beam 7 in Ring 6", 512, 0, 511);
+  theMEBeam7Ring6Disc1NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc1", "Adc counts on Disc 1 for Beam 7 in Ring 6", 512, 0, 511);
   theMEBeam7Ring6Disc1NegAdcCounts->setResetMe(true);
-  theMEBeam7Ring6Disc2NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc2","Adc counts on Disc 2 for Beam 7 in Ring 6", 512, 0, 511);
+  theMEBeam7Ring6Disc2NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc2", "Adc counts on Disc 2 for Beam 7 in Ring 6", 512, 0, 511);
   theMEBeam7Ring6Disc2NegAdcCounts->setResetMe(true);
-  theMEBeam7Ring6Disc3NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc3","Adc counts on Disc 3 for Beam 7 in Ring 6", 512, 0, 511);
+  theMEBeam7Ring6Disc3NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc3", "Adc counts on Disc 3 for Beam 7 in Ring 6", 512, 0, 511);
   theMEBeam7Ring6Disc3NegAdcCounts->setResetMe(true);
-  theMEBeam7Ring6Disc4NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc4","Adc counts on Disc 4 for Beam 7 in Ring 6", 512, 0, 511);
+  theMEBeam7Ring6Disc4NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc4", "Adc counts on Disc 4 for Beam 7 in Ring 6", 512, 0, 511);
   theMEBeam7Ring6Disc4NegAdcCounts->setResetMe(true);
-  theMEBeam7Ring6Disc5NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc5","Adc counts on Disc 5 for Beam 7 in Ring 6", 512, 0, 511);
+  theMEBeam7Ring6Disc5NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc5", "Adc counts on Disc 5 for Beam 7 in Ring 6", 512, 0, 511);
   theMEBeam7Ring6Disc5NegAdcCounts->setResetMe(true);
-  theMEBeam7Ring6Disc6NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc6","Adc counts on Disc 6 for Beam 7 in Ring 6", 512, 0, 511);
+  theMEBeam7Ring6Disc6NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc6", "Adc counts on Disc 6 for Beam 7 in Ring 6", 512, 0, 511);
   theMEBeam7Ring6Disc6NegAdcCounts->setResetMe(true);
-  theMEBeam7Ring6Disc7NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc7","Adc counts on Disc 7 for Beam 7 in Ring 6", 512, 0, 511);
+  theMEBeam7Ring6Disc7NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc7", "Adc counts on Disc 7 for Beam 7 in Ring 6", 512, 0, 511);
   theMEBeam7Ring6Disc7NegAdcCounts->setResetMe(true);
-  theMEBeam7Ring6Disc8NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc8","Adc counts on Disc 8 for Beam 7 in Ring 6", 512, 0, 511);
+  theMEBeam7Ring6Disc8NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc8", "Adc counts on Disc 8 for Beam 7 in Ring 6", 512, 0, 511);
   theMEBeam7Ring6Disc8NegAdcCounts->setResetMe(true);
-  theMEBeam7Ring6Disc9NegAdcCounts = theDaqMonitorBEI->book1D("AdcCountsDisc9","Adc counts on Disc 9 for Beam 7 in Ring 6", 512, 0, 511);
+  theMEBeam7Ring6Disc9NegAdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsDisc9", "Adc counts on Disc 9 for Beam 7 in Ring 6", 512, 0, 511);
   theMEBeam7Ring6Disc9NegAdcCounts->setResetMe(true);
 
   /* LaserBeams in the TOB */
-  /**************************************** 
+  /****************************************
    * the different z positions of the beams
    * are numbered in the following way
    *
@@ -818,126 +1155,174 @@ void LaserDQM::initMonitors()
    *****************************************/
   // ----- Adc Counts in Beam 0
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/TOB/Beam0");
-  theMEBeam0TOBPosition1AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=1040mm","Adc counts for Beam 0 at z = 1040 mm", 512, 0, 511);
+  theMEBeam0TOBPosition1AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=1040mm", "Adc counts for Beam 0 at z = 1040 mm", 512, 0, 511);
   theMEBeam0TOBPosition1AdcCounts->setResetMe(true);
-  theMEBeam0TOBPosition2AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=580mm","Adc counts for Beam 0 at z = 580 mm", 512, 0, 511);
+  theMEBeam0TOBPosition2AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=580mm", "Adc counts for Beam 0 at z = 580 mm", 512, 0, 511);
   theMEBeam0TOBPosition2AdcCounts->setResetMe(true);
-  theMEBeam0TOBPosition3AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=220mm","Adc counts for Beam 0 at z = 220 mm", 512, 0, 511);
+  theMEBeam0TOBPosition3AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=220mm", "Adc counts for Beam 0 at z = 220 mm", 512, 0, 511);
   theMEBeam0TOBPosition3AdcCounts->setResetMe(true);
-  theMEBeam0TOBPosition4AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-140mm","Adc counts for Beam 0 at z = -140 mm", 512, 0, 511);
+  theMEBeam0TOBPosition4AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-140mm", "Adc counts for Beam 0 at z = -140 mm", 512, 0, 511);
   theMEBeam0TOBPosition4AdcCounts->setResetMe(true);
-  theMEBeam0TOBPosition5AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-500mm","Adc counts for Beam 0 at z = -500 mm", 512, 0, 511);
+  theMEBeam0TOBPosition5AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-500mm", "Adc counts for Beam 0 at z = -500 mm", 512, 0, 511);
   theMEBeam0TOBPosition5AdcCounts->setResetMe(true);
-  theMEBeam0TOBPosition6AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-860mm","Adc counts for Beam 0 at z = -860 mm", 512, 0, 511);
+  theMEBeam0TOBPosition6AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-860mm", "Adc counts for Beam 0 at z = -860 mm", 512, 0, 511);
   theMEBeam0TOBPosition6AdcCounts->setResetMe(true);
 
   // ----- Adc Counts in Beam 1
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/TOB/Beam1");
-  theMEBeam1TOBPosition1AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=1040mm","Adc counts for Beam 1 at z = 1040 mm", 512, 0, 511);
+  theMEBeam1TOBPosition1AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=1040mm", "Adc counts for Beam 1 at z = 1040 mm", 512, 0, 511);
   theMEBeam1TOBPosition1AdcCounts->setResetMe(true);
-  theMEBeam1TOBPosition2AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=580mm","Adc counts for Beam 1 at z = 580 mm", 512, 0, 511);
+  theMEBeam1TOBPosition2AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=580mm", "Adc counts for Beam 1 at z = 580 mm", 512, 0, 511);
   theMEBeam1TOBPosition2AdcCounts->setResetMe(true);
-  theMEBeam1TOBPosition3AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=220mm","Adc counts for Beam 1 at z = 220 mm", 512, 0, 511);
+  theMEBeam1TOBPosition3AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=220mm", "Adc counts for Beam 1 at z = 220 mm", 512, 0, 511);
   theMEBeam1TOBPosition3AdcCounts->setResetMe(true);
-  theMEBeam1TOBPosition4AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-140mm","Adc counts for Beam 1 at z = -140 mm", 512, 0, 511);
+  theMEBeam1TOBPosition4AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-140mm", "Adc counts for Beam 1 at z = -140 mm", 512, 0, 511);
   theMEBeam1TOBPosition4AdcCounts->setResetMe(true);
-  theMEBeam1TOBPosition5AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-500mm","Adc counts for Beam 1 at z = -500 mm", 512, 0, 511);
+  theMEBeam1TOBPosition5AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-500mm", "Adc counts for Beam 1 at z = -500 mm", 512, 0, 511);
   theMEBeam1TOBPosition5AdcCounts->setResetMe(true);
-  theMEBeam1TOBPosition6AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-860mm","Adc counts for Beam 1 at z = -860 mm", 512, 0, 511);
+  theMEBeam1TOBPosition6AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-860mm", "Adc counts for Beam 1 at z = -860 mm", 512, 0, 511);
   theMEBeam1TOBPosition6AdcCounts->setResetMe(true);
-  
+
   // ----- Adc Counts in Beam 2
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/TOB/Beam2");
-  theMEBeam2TOBPosition1AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=1040mm","Adc counts for Beam 2 at z = 1040 mm", 512, 0, 511);
+  theMEBeam2TOBPosition1AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=1040mm", "Adc counts for Beam 2 at z = 1040 mm", 512, 0, 511);
   theMEBeam2TOBPosition1AdcCounts->setResetMe(true);
-  theMEBeam2TOBPosition2AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=580mm","Adc counts for Beam 2 at z = 580 mm", 512, 0, 511);
+  theMEBeam2TOBPosition2AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=580mm", "Adc counts for Beam 2 at z = 580 mm", 512, 0, 511);
   theMEBeam2TOBPosition2AdcCounts->setResetMe(true);
-  theMEBeam2TOBPosition3AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=220mm","Adc counts for Beam 2 at z = 220 mm", 512, 0, 511);
+  theMEBeam2TOBPosition3AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=220mm", "Adc counts for Beam 2 at z = 220 mm", 512, 0, 511);
   theMEBeam2TOBPosition3AdcCounts->setResetMe(true);
-  theMEBeam2TOBPosition4AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-140mm","Adc counts for Beam 2 at z = -140 mm", 512, 0, 511);
+  theMEBeam2TOBPosition4AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-140mm", "Adc counts for Beam 2 at z = -140 mm", 512, 0, 511);
   theMEBeam2TOBPosition4AdcCounts->setResetMe(true);
-  theMEBeam2TOBPosition5AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-500mm","Adc counts for Beam 2 at z = -500 mm", 512, 0, 511);
+  theMEBeam2TOBPosition5AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-500mm", "Adc counts for Beam 2 at z = -500 mm", 512, 0, 511);
   theMEBeam2TOBPosition5AdcCounts->setResetMe(true);
-  theMEBeam2TOBPosition6AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-860mm","Adc counts for Beam 2 at z = -860 mm", 512, 0, 511);
+  theMEBeam2TOBPosition6AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-860mm", "Adc counts for Beam 2 at z = -860 mm", 512, 0, 511);
   theMEBeam2TOBPosition6AdcCounts->setResetMe(true);
 
   // ----- Adc Counts in Beam 3
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/TOB/Beam3");
-  theMEBeam3TOBPosition1AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=1040mm","Adc counts for Beam 3 at z = 1040 mm", 512, 0, 511);
+  theMEBeam3TOBPosition1AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=1040mm", "Adc counts for Beam 3 at z = 1040 mm", 512, 0, 511);
   theMEBeam3TOBPosition1AdcCounts->setResetMe(true);
-  theMEBeam3TOBPosition2AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=580mm","Adc counts for Beam 3 at z = 580 mm", 512, 0, 511);
+  theMEBeam3TOBPosition2AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=580mm", "Adc counts for Beam 3 at z = 580 mm", 512, 0, 511);
   theMEBeam3TOBPosition2AdcCounts->setResetMe(true);
-  theMEBeam3TOBPosition3AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=220mm","Adc counts for Beam 3 at z = 220 mm", 512, 0, 511);
+  theMEBeam3TOBPosition3AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=220mm", "Adc counts for Beam 3 at z = 220 mm", 512, 0, 511);
   theMEBeam3TOBPosition3AdcCounts->setResetMe(true);
-  theMEBeam3TOBPosition4AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-140mm","Adc counts for Beam 3 at z = -140 mm", 512, 0, 511);
+  theMEBeam3TOBPosition4AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-140mm", "Adc counts for Beam 3 at z = -140 mm", 512, 0, 511);
   theMEBeam3TOBPosition4AdcCounts->setResetMe(true);
-  theMEBeam3TOBPosition5AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-500mm","Adc counts for Beam 3 at z = -500 mm", 512, 0, 511);
+  theMEBeam3TOBPosition5AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-500mm", "Adc counts for Beam 3 at z = -500 mm", 512, 0, 511);
   theMEBeam3TOBPosition5AdcCounts->setResetMe(true);
-  theMEBeam3TOBPosition6AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-860mm","Adc counts for Beam 3 at z = -860 mm", 512, 0, 511);
+  theMEBeam3TOBPosition6AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-860mm", "Adc counts for Beam 3 at z = -860 mm", 512, 0, 511);
   theMEBeam3TOBPosition6AdcCounts->setResetMe(true);
 
   // ----- Adc Counts in Beam 4
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/TOB/Beam4");
-  theMEBeam4TOBPosition1AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=1040mm","Adc counts for Beam 4 at z = 1040 mm", 512, 0, 511);
+  theMEBeam4TOBPosition1AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=1040mm", "Adc counts for Beam 4 at z = 1040 mm", 512, 0, 511);
   theMEBeam4TOBPosition1AdcCounts->setResetMe(true);
-  theMEBeam4TOBPosition2AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=580mm","Adc counts for Beam 4 at z = 580 mm", 512, 0, 511);
+  theMEBeam4TOBPosition2AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=580mm", "Adc counts for Beam 4 at z = 580 mm", 512, 0, 511);
   theMEBeam4TOBPosition2AdcCounts->setResetMe(true);
-  theMEBeam4TOBPosition3AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=220mm","Adc counts for Beam 4 at z = 220 mm", 512, 0, 511);
+  theMEBeam4TOBPosition3AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=220mm", "Adc counts for Beam 4 at z = 220 mm", 512, 0, 511);
   theMEBeam4TOBPosition3AdcCounts->setResetMe(true);
-  theMEBeam4TOBPosition4AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-140mm","Adc counts for Beam 4 at z = -140 mm", 512, 0, 511);
+  theMEBeam4TOBPosition4AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-140mm", "Adc counts for Beam 4 at z = -140 mm", 512, 0, 511);
   theMEBeam4TOBPosition4AdcCounts->setResetMe(true);
-  theMEBeam4TOBPosition5AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-500mm","Adc counts for Beam 4 at z = -500 mm", 512, 0, 511);
+  theMEBeam4TOBPosition5AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-500mm", "Adc counts for Beam 4 at z = -500 mm", 512, 0, 511);
   theMEBeam4TOBPosition5AdcCounts->setResetMe(true);
-  theMEBeam4TOBPosition6AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-860mm","Adc counts for Beam 4 at z = -860 mm", 512, 0, 511);
+  theMEBeam4TOBPosition6AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-860mm", "Adc counts for Beam 4 at z = -860 mm", 512, 0, 511);
   theMEBeam4TOBPosition6AdcCounts->setResetMe(true);
 
   // ----- Adc Counts in Beam 5
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/TOB/Beam5");
-  theMEBeam5TOBPosition1AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=1040mm","Adc counts for Beam 5 at z = 1040 mm", 512, 0, 511);
+  theMEBeam5TOBPosition1AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=1040mm", "Adc counts for Beam 5 at z = 1040 mm", 512, 0, 511);
   theMEBeam5TOBPosition1AdcCounts->setResetMe(true);
-  theMEBeam5TOBPosition2AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=580mm","Adc counts for Beam 5 at z = 580 mm", 512, 0, 511);
+  theMEBeam5TOBPosition2AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=580mm", "Adc counts for Beam 5 at z = 580 mm", 512, 0, 511);
   theMEBeam5TOBPosition2AdcCounts->setResetMe(true);
-  theMEBeam5TOBPosition3AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=220mm","Adc counts for Beam 5 at z = 220 mm", 512, 0, 511);
+  theMEBeam5TOBPosition3AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=220mm", "Adc counts for Beam 5 at z = 220 mm", 512, 0, 511);
   theMEBeam5TOBPosition3AdcCounts->setResetMe(true);
-  theMEBeam5TOBPosition4AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-140mm","Adc counts for Beam 5 at z = -140 mm", 512, 0, 511);
+  theMEBeam5TOBPosition4AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-140mm", "Adc counts for Beam 5 at z = -140 mm", 512, 0, 511);
   theMEBeam5TOBPosition4AdcCounts->setResetMe(true);
-  theMEBeam5TOBPosition5AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-500mm","Adc counts for Beam 5 at z = -500 mm", 512, 0, 511);
+  theMEBeam5TOBPosition5AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-500mm", "Adc counts for Beam 5 at z = -500 mm", 512, 0, 511);
   theMEBeam5TOBPosition5AdcCounts->setResetMe(true);
-  theMEBeam5TOBPosition6AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-860mm","Adc counts for Beam 5 at z = -860 mm", 512, 0, 511);
+  theMEBeam5TOBPosition6AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-860mm", "Adc counts for Beam 5 at z = -860 mm", 512, 0, 511);
   theMEBeam5TOBPosition6AdcCounts->setResetMe(true);
 
   // ----- Adc Counts in Beam 6
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/TOB/Beam6");
-  theMEBeam6TOBPosition1AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=1040mm","Adc counts for Beam 6 at z = 1040 mm", 512, 0, 511);
+  theMEBeam6TOBPosition1AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=1040mm", "Adc counts for Beam 6 at z = 1040 mm", 512, 0, 511);
   theMEBeam6TOBPosition1AdcCounts->setResetMe(true);
-  theMEBeam6TOBPosition2AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=580mm","Adc counts for Beam 6 at z = 580 mm", 512, 0, 511);
+  theMEBeam6TOBPosition2AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=580mm", "Adc counts for Beam 6 at z = 580 mm", 512, 0, 511);
   theMEBeam6TOBPosition2AdcCounts->setResetMe(true);
-  theMEBeam6TOBPosition3AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=220mm","Adc counts for Beam 6 at z = 220 mm", 512, 0, 511);
+  theMEBeam6TOBPosition3AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=220mm", "Adc counts for Beam 6 at z = 220 mm", 512, 0, 511);
   theMEBeam6TOBPosition3AdcCounts->setResetMe(true);
-  theMEBeam6TOBPosition4AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-140mm","Adc counts for Beam 6 at z = -140 mm", 512, 0, 511);
+  theMEBeam6TOBPosition4AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-140mm", "Adc counts for Beam 6 at z = -140 mm", 512, 0, 511);
   theMEBeam6TOBPosition4AdcCounts->setResetMe(true);
-  theMEBeam6TOBPosition5AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-500mm","Adc counts for Beam 6 at z = -500 mm", 512, 0, 511);
+  theMEBeam6TOBPosition5AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-500mm", "Adc counts for Beam 6 at z = -500 mm", 512, 0, 511);
   theMEBeam6TOBPosition5AdcCounts->setResetMe(true);
-  theMEBeam6TOBPosition6AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-860mm","Adc counts for Beam 6 at z = -860 mm", 512, 0, 511);
+  theMEBeam6TOBPosition6AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-860mm", "Adc counts for Beam 6 at z = -860 mm", 512, 0, 511);
   theMEBeam6TOBPosition6AdcCounts->setResetMe(true);
 
   // ----- Adc Counts in Beam 7
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/TOB/Beam7");
-  theMEBeam7TOBPosition1AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=1040mm","Adc counts for Beam 7 at z = 1040 mm", 512, 0, 511);
+  theMEBeam7TOBPosition1AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=1040mm", "Adc counts for Beam 7 at z = 1040 mm", 512, 0, 511);
   theMEBeam7TOBPosition1AdcCounts->setResetMe(true);
-  theMEBeam7TOBPosition2AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=580mm","Adc counts for Beam 7 at z = 580 mm", 512, 0, 511);
+  theMEBeam7TOBPosition2AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=580mm", "Adc counts for Beam 7 at z = 580 mm", 512, 0, 511);
   theMEBeam7TOBPosition2AdcCounts->setResetMe(true);
-  theMEBeam7TOBPosition3AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=220mm","Adc counts for Beam 7 at z = 220 mm", 512, 0, 511);
+  theMEBeam7TOBPosition3AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=220mm", "Adc counts for Beam 7 at z = 220 mm", 512, 0, 511);
   theMEBeam7TOBPosition3AdcCounts->setResetMe(true);
-  theMEBeam7TOBPosition4AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-140mm","Adc counts for Beam 7 at z = -140 mm", 512, 0, 511);
+  theMEBeam7TOBPosition4AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-140mm", "Adc counts for Beam 7 at z = -140 mm", 512, 0, 511);
   theMEBeam7TOBPosition4AdcCounts->setResetMe(true);
-  theMEBeam7TOBPosition5AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-500mm","Adc counts for Beam 7 at z = -500 mm", 512, 0, 511);
+  theMEBeam7TOBPosition5AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-500mm", "Adc counts for Beam 7 at z = -500 mm", 512, 0, 511);
   theMEBeam7TOBPosition5AdcCounts->setResetMe(true);
-  theMEBeam7TOBPosition6AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-860mm","Adc counts for Beam 7 at z = -860 mm", 512, 0, 511);
+  theMEBeam7TOBPosition6AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-860mm", "Adc counts for Beam 7 at z = -860 mm", 512, 0, 511);
   theMEBeam7TOBPosition6AdcCounts->setResetMe(true);
 
   /* LaserBeams in the TIB */
-  /**************************************** 
+  /****************************************
    * the different z positions of the beams
    * are numbered in the following way
    *
@@ -950,126 +1335,173 @@ void LaserDQM::initMonitors()
    *****************************************/
   // ----- Adc Counts in Beam 0
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/TIB/Beam0");
-  theMEBeam0TIBPosition1AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=620mm","Adc counts for Beam 0 at z = 620 mm", 512, 0, 511);
+  theMEBeam0TIBPosition1AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=620mm", "Adc counts for Beam 0 at z = 620 mm", 512, 0, 511);
   theMEBeam0TIBPosition1AdcCounts->setResetMe(true);
-  theMEBeam0TIBPosition2AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=380mm","Adc counts for Beam 0 at z = 380 mm", 512, 0, 511);
+  theMEBeam0TIBPosition2AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=380mm", "Adc counts for Beam 0 at z = 380 mm", 512, 0, 511);
   theMEBeam0TIBPosition2AdcCounts->setResetMe(true);
-  theMEBeam0TIBPosition3AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=180mm","Adc counts for Beam 0 at z = 180 mm", 512, 0, 511);
+  theMEBeam0TIBPosition3AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=180mm", "Adc counts for Beam 0 at z = 180 mm", 512, 0, 511);
   theMEBeam0TIBPosition3AdcCounts->setResetMe(true);
-  theMEBeam0TIBPosition4AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-100mm","Adc counts for Beam 0 at z = -100 mm", 512, 0, 511);
+  theMEBeam0TIBPosition4AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-100mm", "Adc counts for Beam 0 at z = -100 mm", 512, 0, 511);
   theMEBeam0TIBPosition4AdcCounts->setResetMe(true);
-  theMEBeam0TIBPosition5AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-340mm","Adc counts for Beam 0 at z = -340 mm", 512, 0, 511);
+  theMEBeam0TIBPosition5AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-340mm", "Adc counts for Beam 0 at z = -340 mm", 512, 0, 511);
   theMEBeam0TIBPosition5AdcCounts->setResetMe(true);
-  theMEBeam0TIBPosition6AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-540mm","Adc counts for Beam 0 at z = -540 mm", 512, 0, 511);
+  theMEBeam0TIBPosition6AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-540mm", "Adc counts for Beam 0 at z = -540 mm", 512, 0, 511);
   theMEBeam0TIBPosition6AdcCounts->setResetMe(true);
 
   // ----- Adc Counts in Beam 1
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/TIB/Beam1");
-  theMEBeam1TIBPosition1AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=620mm","Adc counts for Beam 1 at z = 620 mm", 512, 0, 511);
+  theMEBeam1TIBPosition1AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=620mm", "Adc counts for Beam 1 at z = 620 mm", 512, 0, 511);
   theMEBeam1TIBPosition1AdcCounts->setResetMe(true);
-  theMEBeam1TIBPosition2AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=380mm","Adc counts for Beam 1 at z = 380 mm", 512, 0, 511);
+  theMEBeam1TIBPosition2AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=380mm", "Adc counts for Beam 1 at z = 380 mm", 512, 0, 511);
   theMEBeam1TIBPosition2AdcCounts->setResetMe(true);
-  theMEBeam1TIBPosition3AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=180mm","Adc counts for Beam 1 at z = 180 mm", 512, 0, 511);
+  theMEBeam1TIBPosition3AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=180mm", "Adc counts for Beam 1 at z = 180 mm", 512, 0, 511);
   theMEBeam1TIBPosition3AdcCounts->setResetMe(true);
-  theMEBeam1TIBPosition4AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-100mm","Adc counts for Beam 1 at z = -100 mm", 512, 0, 511);
+  theMEBeam1TIBPosition4AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-100mm", "Adc counts for Beam 1 at z = -100 mm", 512, 0, 511);
   theMEBeam1TIBPosition4AdcCounts->setResetMe(true);
-  theMEBeam1TIBPosition5AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-340mm","Adc counts for Beam 1 at z = -340 mm", 512, 0, 511);
+  theMEBeam1TIBPosition5AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-340mm", "Adc counts for Beam 1 at z = -340 mm", 512, 0, 511);
   theMEBeam1TIBPosition5AdcCounts->setResetMe(true);
-  theMEBeam1TIBPosition6AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-540mm","Adc counts for Beam 1 at z = -540 mm", 512, 0, 511);
+  theMEBeam1TIBPosition6AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-540mm", "Adc counts for Beam 1 at z = -540 mm", 512, 0, 511);
   theMEBeam1TIBPosition6AdcCounts->setResetMe(true);
 
   // ----- Adc Counts in Beam 2
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/TIB/Beam2");
-  theMEBeam2TIBPosition1AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=620mm","Adc counts for Beam 2 at z = 620 mm", 512, 0, 511);
+  theMEBeam2TIBPosition1AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=620mm", "Adc counts for Beam 2 at z = 620 mm", 512, 0, 511);
   theMEBeam2TIBPosition1AdcCounts->setResetMe(true);
-  theMEBeam2TIBPosition2AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=380mm","Adc counts for Beam 2 at z = 380 mm", 512, 0, 511);
+  theMEBeam2TIBPosition2AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=380mm", "Adc counts for Beam 2 at z = 380 mm", 512, 0, 511);
   theMEBeam2TIBPosition2AdcCounts->setResetMe(true);
-  theMEBeam2TIBPosition3AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=180mm","Adc counts for Beam 2 at z = 180 mm", 512, 0, 511);
+  theMEBeam2TIBPosition3AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=180mm", "Adc counts for Beam 2 at z = 180 mm", 512, 0, 511);
   theMEBeam2TIBPosition3AdcCounts->setResetMe(true);
-  theMEBeam2TIBPosition4AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-100mm","Adc counts for Beam 2 at z = -100 mm", 512, 0, 511);
+  theMEBeam2TIBPosition4AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-100mm", "Adc counts for Beam 2 at z = -100 mm", 512, 0, 511);
   theMEBeam2TIBPosition4AdcCounts->setResetMe(true);
-  theMEBeam2TIBPosition5AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-340mm","Adc counts for Beam 2 at z = -340 mm", 512, 0, 511);
+  theMEBeam2TIBPosition5AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-340mm", "Adc counts for Beam 2 at z = -340 mm", 512, 0, 511);
   theMEBeam2TIBPosition5AdcCounts->setResetMe(true);
-  theMEBeam2TIBPosition6AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-540mm","Adc counts for Beam 2 at z = -540 mm", 512, 0, 511);
+  theMEBeam2TIBPosition6AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-540mm", "Adc counts for Beam 2 at z = -540 mm", 512, 0, 511);
   theMEBeam2TIBPosition6AdcCounts->setResetMe(true);
 
   // ----- Adc Counts in Beam 3
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/TIB/Beam3");
-  theMEBeam3TIBPosition1AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=620mm","Adc counts for Beam 3 at z = 620 mm", 512, 0, 511);
+  theMEBeam3TIBPosition1AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=620mm", "Adc counts for Beam 3 at z = 620 mm", 512, 0, 511);
   theMEBeam3TIBPosition1AdcCounts->setResetMe(true);
-  theMEBeam3TIBPosition2AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=380mm","Adc counts for Beam 3 at z = 380 mm", 512, 0, 511);
+  theMEBeam3TIBPosition2AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=380mm", "Adc counts for Beam 3 at z = 380 mm", 512, 0, 511);
   theMEBeam3TIBPosition2AdcCounts->setResetMe(true);
-  theMEBeam3TIBPosition3AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=180mm","Adc counts for Beam 3 at z = 180 mm", 512, 0, 511);
+  theMEBeam3TIBPosition3AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=180mm", "Adc counts for Beam 3 at z = 180 mm", 512, 0, 511);
   theMEBeam3TIBPosition3AdcCounts->setResetMe(true);
-  theMEBeam3TIBPosition4AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-100mm","Adc counts for Beam 3 at z = -100 mm", 512, 0, 511);
+  theMEBeam3TIBPosition4AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-100mm", "Adc counts for Beam 3 at z = -100 mm", 512, 0, 511);
   theMEBeam3TIBPosition4AdcCounts->setResetMe(true);
-  theMEBeam3TIBPosition5AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-340mm","Adc counts for Beam 3 at z = -340 mm", 512, 0, 511);
+  theMEBeam3TIBPosition5AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-340mm", "Adc counts for Beam 3 at z = -340 mm", 512, 0, 511);
   theMEBeam3TIBPosition5AdcCounts->setResetMe(true);
-  theMEBeam3TIBPosition6AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-540mm","Adc counts for Beam 3 at z = -540 mm", 512, 0, 511);
+  theMEBeam3TIBPosition6AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-540mm", "Adc counts for Beam 3 at z = -540 mm", 512, 0, 511);
   theMEBeam3TIBPosition6AdcCounts->setResetMe(true);
 
   // ----- Adc Counts in Beam 4
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/TIB/Beam4");
-  theMEBeam4TIBPosition1AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=620mm","Adc counts for Beam 4 at z = 620 mm", 512, 0, 511);
+  theMEBeam4TIBPosition1AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=620mm", "Adc counts for Beam 4 at z = 620 mm", 512, 0, 511);
   theMEBeam4TIBPosition1AdcCounts->setResetMe(true);
-  theMEBeam4TIBPosition2AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=380mm","Adc counts for Beam 4 at z = 380 mm", 512, 0, 511);
+  theMEBeam4TIBPosition2AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=380mm", "Adc counts for Beam 4 at z = 380 mm", 512, 0, 511);
   theMEBeam4TIBPosition2AdcCounts->setResetMe(true);
-  theMEBeam4TIBPosition3AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=180mm","Adc counts for Beam 4 at z = 180 mm", 512, 0, 511);
+  theMEBeam4TIBPosition3AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=180mm", "Adc counts for Beam 4 at z = 180 mm", 512, 0, 511);
   theMEBeam4TIBPosition3AdcCounts->setResetMe(true);
-  theMEBeam4TIBPosition4AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-100mm","Adc counts for Beam 4 at z = -100 mm", 512, 0, 511);
+  theMEBeam4TIBPosition4AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-100mm", "Adc counts for Beam 4 at z = -100 mm", 512, 0, 511);
   theMEBeam4TIBPosition4AdcCounts->setResetMe(true);
-  theMEBeam4TIBPosition5AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-340mm","Adc counts for Beam 4 at z = -340 mm", 512, 0, 511);
+  theMEBeam4TIBPosition5AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-340mm", "Adc counts for Beam 4 at z = -340 mm", 512, 0, 511);
   theMEBeam4TIBPosition5AdcCounts->setResetMe(true);
-  theMEBeam4TIBPosition6AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-540mm","Adc counts for Beam 4 at z = -540 mm", 512, 0, 511);
+  theMEBeam4TIBPosition6AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-540mm", "Adc counts for Beam 4 at z = -540 mm", 512, 0, 511);
   theMEBeam4TIBPosition6AdcCounts->setResetMe(true);
 
   // ----- Adc Counts in Beam 5
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/TIB/Beam5");
-  theMEBeam5TIBPosition1AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=620mm","Adc counts for Beam 5 at z = 620 mm", 512, 0, 511);
+  theMEBeam5TIBPosition1AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=620mm", "Adc counts for Beam 5 at z = 620 mm", 512, 0, 511);
   theMEBeam5TIBPosition1AdcCounts->setResetMe(true);
-  theMEBeam5TIBPosition2AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=380mm","Adc counts for Beam 5 at z = 380 mm", 512, 0, 511);
+  theMEBeam5TIBPosition2AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=380mm", "Adc counts for Beam 5 at z = 380 mm", 512, 0, 511);
   theMEBeam5TIBPosition2AdcCounts->setResetMe(true);
-  theMEBeam5TIBPosition3AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=180mm","Adc counts for Beam 5 at z = 180 mm", 512, 0, 511);
+  theMEBeam5TIBPosition3AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=180mm", "Adc counts for Beam 5 at z = 180 mm", 512, 0, 511);
   theMEBeam5TIBPosition3AdcCounts->setResetMe(true);
-  theMEBeam5TIBPosition4AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-100mm","Adc counts for Beam 5 at z = -100 mm", 512, 0, 511);
+  theMEBeam5TIBPosition4AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-100mm", "Adc counts for Beam 5 at z = -100 mm", 512, 0, 511);
   theMEBeam5TIBPosition4AdcCounts->setResetMe(true);
-  theMEBeam5TIBPosition5AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-340mm","Adc counts for Beam 5 at z = -340 mm", 512, 0, 511);
+  theMEBeam5TIBPosition5AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-340mm", "Adc counts for Beam 5 at z = -340 mm", 512, 0, 511);
   theMEBeam5TIBPosition5AdcCounts->setResetMe(true);
-  theMEBeam5TIBPosition6AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-540mm","Adc counts for Beam 5 at z = -540 mm", 512, 0, 511);
+  theMEBeam5TIBPosition6AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-540mm", "Adc counts for Beam 5 at z = -540 mm", 512, 0, 511);
   theMEBeam5TIBPosition6AdcCounts->setResetMe(true);
 
   // ----- Adc Counts in Beam 6
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/TIB/Beam6");
-  theMEBeam6TIBPosition1AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=620mm","Adc counts for Beam 6 at z = 620 mm", 512, 0, 511);
+  theMEBeam6TIBPosition1AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=620mm", "Adc counts for Beam 6 at z = 620 mm", 512, 0, 511);
   theMEBeam6TIBPosition1AdcCounts->setResetMe(true);
-  theMEBeam6TIBPosition2AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=380mm","Adc counts for Beam 6 at z = 380 mm", 512, 0, 511);
+  theMEBeam6TIBPosition2AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=380mm", "Adc counts for Beam 6 at z = 380 mm", 512, 0, 511);
   theMEBeam6TIBPosition2AdcCounts->setResetMe(true);
-  theMEBeam6TIBPosition3AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=180mm","Adc counts for Beam 6 at z = 180 mm", 512, 0, 511);
+  theMEBeam6TIBPosition3AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=180mm", "Adc counts for Beam 6 at z = 180 mm", 512, 0, 511);
   theMEBeam6TIBPosition3AdcCounts->setResetMe(true);
-  theMEBeam6TIBPosition4AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-100mm","Adc counts for Beam 6 at z = -100 mm", 512, 0, 511);
+  theMEBeam6TIBPosition4AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-100mm", "Adc counts for Beam 6 at z = -100 mm", 512, 0, 511);
   theMEBeam6TIBPosition4AdcCounts->setResetMe(true);
-  theMEBeam6TIBPosition5AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-340mm","Adc counts for Beam 6 at z = -340 mm", 512, 0, 511);
+  theMEBeam6TIBPosition5AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-340mm", "Adc counts for Beam 6 at z = -340 mm", 512, 0, 511);
   theMEBeam6TIBPosition5AdcCounts->setResetMe(true);
-  theMEBeam6TIBPosition6AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-540mm","Adc counts for Beam 6 at z = -540 mm", 512, 0, 511);
+  theMEBeam6TIBPosition6AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-540mm", "Adc counts for Beam 6 at z = -540 mm", 512, 0, 511);
   theMEBeam6TIBPosition6AdcCounts->setResetMe(true);
 
   // ----- Adc Counts in Beam 7
   theDaqMonitorBEI->setCurrentFolder("LaserAlignment/TIB/Beam7");
-  theMEBeam7TIBPosition1AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=620mm","Adc counts for Beam 7 at z = 620 mm", 512, 0, 511);
+  theMEBeam7TIBPosition1AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=620mm", "Adc counts for Beam 7 at z = 620 mm", 512, 0, 511);
   theMEBeam7TIBPosition1AdcCounts->setResetMe(true);
-  theMEBeam7TIBPosition2AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=380mm","Adc counts for Beam 7 at z = 380 mm", 512, 0, 511);
+  theMEBeam7TIBPosition2AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=380mm", "Adc counts for Beam 7 at z = 380 mm", 512, 0, 511);
   theMEBeam7TIBPosition2AdcCounts->setResetMe(true);
-  theMEBeam7TIBPosition3AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=180mm","Adc counts for Beam 7 at z = 180 mm", 512, 0, 511);
+  theMEBeam7TIBPosition3AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=180mm", "Adc counts for Beam 7 at z = 180 mm", 512, 0, 511);
   theMEBeam7TIBPosition3AdcCounts->setResetMe(true);
-  theMEBeam7TIBPosition4AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-100mm","Adc counts for Beam 7 at z = -100 mm", 512, 0, 511);
+  theMEBeam7TIBPosition4AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-100mm", "Adc counts for Beam 7 at z = -100 mm", 512, 0, 511);
   theMEBeam7TIBPosition4AdcCounts->setResetMe(true);
-  theMEBeam7TIBPosition5AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-340mm","Adc counts for Beam 7 at z = -340 mm", 512, 0, 511);
+  theMEBeam7TIBPosition5AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-340mm", "Adc counts for Beam 7 at z = -340 mm", 512, 0, 511);
   theMEBeam7TIBPosition5AdcCounts->setResetMe(true);
-  theMEBeam7TIBPosition6AdcCounts = theDaqMonitorBEI->book1D("AdcCountsZ=-540mm","Adc counts for Beam 7 at z = -540 mm", 512, 0, 511);
+  theMEBeam7TIBPosition6AdcCounts =
+      theDaqMonitorBEI->book1D("AdcCountsZ=-540mm", "Adc counts for Beam 7 at z = -540 mm", 512, 0, 511);
   theMEBeam7TIBPosition6AdcCounts->setResetMe(true);
 
   // show directory structure
   if (theDebugLevel > 3)
     theDaqMonitorBEI->showDirStructure();
-
 }
diff --git a/Alignment/LaserDQM/plugins/LaserDQMStatistics.cc b/Alignment/LaserDQM/plugins/LaserDQMStatistics.cc
index 5f00e4ff15627..06614e9ffb6cb 100644
--- a/Alignment/LaserDQM/plugins/LaserDQMStatistics.cc
+++ b/Alignment/LaserDQM/plugins/LaserDQMStatistics.cc
@@ -7,2721 +7,1581 @@
  */
 
 #include "Alignment/LaserDQM/plugins/LaserDQM.h"
-#include "FWCore/Framework/interface/Event.h" 
-#include "FWCore/ParameterSet/interface/ParameterSet.h" 
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "DataFormats/DetId/interface/DetId.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
-#include "DataFormats/DetId/interface/DetId.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
-void LaserDQM::trackerStatistics(edm::Event const& theEvent,edm::EventSetup const& theSetup)
-{
-  //Retrieve tracker topology from geometry
+void LaserDQM::trackerStatistics(edm::Event const &theEvent, edm::EventSetup const &theSetup) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   theSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
-
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
   // access the tracker
   edm::ESHandle<TrackerGeometry> theTrackerGeometry;
   theSetup.get<TrackerDigiGeometryRecord>().get(theTrackerGeometry);
-  const TrackerGeometry& theTracker(*theTrackerGeometry);
+  const TrackerGeometry &theTracker(*theTrackerGeometry);
 
   // get the StripDigiCollection
   // get the StripDigiCollection
-  edm::Handle< edm::DetSetVector<SiStripDigi> > theStripDigis;
-  
-  for (Parameters::iterator itDigiProducersList = theDigiProducersList.begin(); itDigiProducersList != theDigiProducersList.end(); ++itDigiProducersList)
-    {
-      std::string digiProducer = itDigiProducersList->getParameter<std::string>("DigiProducer");
-      std::string digiLabel = itDigiProducersList->getParameter<std::string>("DigiLabel");
-
-      theEvent.getByLabel(digiProducer, digiLabel, theStripDigis);
-
-      // loop over the entries of theStripDigis, get the DetId to identify the Detunit and find the one which will be hit by the laser beams
-      for (edm::DetSetVector<SiStripDigi>::const_iterator DSViter = theStripDigis->begin(); DSViter != theStripDigis->end(); DSViter++)
-	{
-	  DetId theDetUnitID(DSViter->id);
-
-	  // get the DetUnit via the DetUnitId and cast it to a StripGeomDetUnit
-	  const StripGeomDetUnit * const theStripDet = dynamic_cast<const StripGeomDetUnit*>(theTracker.idToDet(theDetUnitID));
-
-	  // get the Digis in this DetUnit
-	  edm::DetSet<SiStripDigi>::const_iterator theDigiRangeIterator = (*DSViter).data.begin();
-	  edm::DetSet<SiStripDigi>::const_iterator theDigiRangeIteratorEnd = (*DSViter).data.end();
-      
-	  // some variables we need later on in the program
-	  int theBeam     = 0;
-	  int theRing     = 0;
-	  std::string thePart  = "";
-	  int theTIBLayer = 0;
-	  int theTOBLayer = 0;
-	  int theTECWheel = 0;
-	  int theTOBStereoDet = 0;
-
-	  switch (theDetUnitID.subdetId())
-	    {
-	    case StripSubdetector::TIB:
-	      {
-		
-		thePart = "TIB";
-		theTIBLayer = tTopo->tibLayer(theDetUnitID.rawId());
-		break;
-	      }
-	    case StripSubdetector::TOB:
-	      {
-		
-		thePart = "TOB";
-		theTOBLayer = tTopo->tobLayer(theDetUnitID.rawId());
-		theTOBStereoDet = tTopo->tobStereo(theDetUnitID.rawId());
-		break;
-	      }
-	    case StripSubdetector::TEC:
-	      {
-		
-	    
-		// is this module in TEC+ or TEC-?
-		if (tTopo->tecSide(theDetUnitID.rawId()) == 1) { thePart = "TEC-"; }
-		else if (tTopo->tecSide(theDetUnitID.rawId()) == 2) { thePart = "TEC+"; }
-	    
-		// in which ring is this module?
-		if ( theStripDet->surface().position().perp() > 55.0 && theStripDet->surface().position().perp() < 59.0 )
-		  { theRing = 4; } // Ring 4
-		else if ( theStripDet->surface().position().perp() > 81.0 && theStripDet->surface().position().perp() < 85.0 )
-		  { theRing = 6; } // Ring 6
-		else
-		  { theRing = -1; } // probably not a Laser Hit!
-	    
-		// on which disk is this module
-		theTECWheel = tTopo->tecWheel(theDetUnitID.rawId());
-		break;
-	      }
-	    }
-      
-	  // which beam belongs these digis to
-	  if ( thePart == "TIB" && theTIBLayer == 4 )
-	    {
-	      if ( (theStripDet->surface().position().phi() > 0.39 - theSearchPhiTIB) 
-		   && (theStripDet->surface().position().phi() < 0.39 + theSearchPhiTIB))          { theBeam = 0; } // beam 0 
-
-	      else if ( (theStripDet->surface().position().phi() > 1.29 - theSearchPhiTIB) 
-			&& (theStripDet->surface().position().phi() < 1.29 + theSearchPhiTIB))     { theBeam = 1; } // beam 1
-
-	      else if ( (theStripDet->surface().position().phi() > 1.85 - theSearchPhiTIB) 
-			&& (theStripDet->surface().position().phi() < 1.85 + theSearchPhiTIB))     { theBeam = 2; } // beam 2
-
-	      else if ( (theStripDet->surface().position().phi() > 2.75 - theSearchPhiTIB) 
-			&& (theStripDet->surface().position().phi() < 2.75 + theSearchPhiTIB))     { theBeam = 3; } // beam 3
-
-	      else if ( (theStripDet->surface().position().phi() > -2.59 - theSearchPhiTIB) 
-			&& (theStripDet->surface().position().phi() < -2.59 + theSearchPhiTIB))    { theBeam = 4; } // beam 4
-
-	      else if ( (theStripDet->surface().position().phi() > -2.00 - theSearchPhiTIB) 
-			&& (theStripDet->surface().position().phi() < -2.00 + theSearchPhiTIB))    { theBeam = 5; } // beam 5
-
-	      else if ( (theStripDet->surface().position().phi() > -1.10 - theSearchPhiTIB) 
-			&& (theStripDet->surface().position().phi() < -1.10 + theSearchPhiTIB))    { theBeam = 6; } // beam 6
-
-	      else if ( (theStripDet->surface().position().phi() > -0.50 - theSearchPhiTIB) 
-			&& (theStripDet->surface().position().phi() < -0.50 + theSearchPhiTIB))    { theBeam = 7; } // beam 7
-	      else
-		{ theBeam = -1; } // probably not a Laser Hit!
-	    }
-	  else if ( thePart == "TOB" && theTOBLayer == 1 )
-	    {
-	      if ( (theStripDet->surface().position().phi() > 0.39 - theSearchPhiTOB) 
-		   && (theStripDet->surface().position().phi() < 0.39 + theSearchPhiTOB))          { theBeam = 0; } // beam 0 
-
-	      else if ( (theStripDet->surface().position().phi() > 1.29 - theSearchPhiTOB) 
-			&& (theStripDet->surface().position().phi() < 1.29 + theSearchPhiTOB))     { theBeam = 1; } // beam 1
-
-	      else if ( (theStripDet->surface().position().phi() > 1.85 - theSearchPhiTOB)
-			&& (theStripDet->surface().position().phi() < 1.85 + theSearchPhiTOB))     { theBeam = 2; } // beam 2
-
-	      else if ( (theStripDet->surface().position().phi() > 2.75 - theSearchPhiTOB)
-			&& (theStripDet->surface().position().phi() < 2.75 + theSearchPhiTOB))     { theBeam = 3; } // beam 3
-	  
-	      else if ( (theStripDet->surface().position().phi() > -2.59 - theSearchPhiTOB)
-			&& (theStripDet->surface().position().phi() < -2.59 + theSearchPhiTOB))    { theBeam = 4; } // beam 4
-
-	      else if ( (theStripDet->surface().position().phi() > -2.00 - theSearchPhiTOB)
-			&& (theStripDet->surface().position().phi() < -2.00 + theSearchPhiTOB))    { theBeam = 5; } // beam 5
-
-	      else if ( (theStripDet->surface().position().phi() > -1.10 - theSearchPhiTOB)
-			&& (theStripDet->surface().position().phi() < -1.10 + theSearchPhiTOB))    { theBeam = 6; } // beam 6
-
-	      else if ( (theStripDet->surface().position().phi() > -0.50 - theSearchPhiTOB)
-			&& (theStripDet->surface().position().phi() < -0.50 + theSearchPhiTOB))    { theBeam = 7; } // beam 7
-	      else
-		{ theBeam = -1; } // probably not a Laser Hit!
-	    }
-	  else if ( thePart == "TEC+" || thePart == "TEC-" )
-	    {
-	      if ( (theStripDet->surface().position().phi() > 0.39 - theSearchPhiTEC)
-		   && (theStripDet->surface().position().phi() < 0.39 + theSearchPhiTEC))          { theBeam = 0; } // beam 0 
-
-	      else if ( (theStripDet->surface().position().phi() > 1.18 - theSearchPhiTEC)
-			&& (theStripDet->surface().position().phi() < 1.18 + theSearchPhiTEC))     { theBeam = 1; } // beam 1
-
-	      else if ( (theStripDet->surface().position().phi() > 1.96 - theSearchPhiTEC)
-			&& (theStripDet->surface().position().phi() < 1.96 + theSearchPhiTEC))     { theBeam = 2; } // beam 2
-
-	      else if ( (theStripDet->surface().position().phi() > 2.74 - theSearchPhiTEC)
-			&& (theStripDet->surface().position().phi() < 2.74 + theSearchPhiTEC))     { theBeam = 3; } // beam 3
-
-	      else if ( (theStripDet->surface().position().phi() > -2.74 - theSearchPhiTEC)
-			&& (theStripDet->surface().position().phi() < -2.74 + theSearchPhiTEC))    { theBeam = 4; } // beam 4
-
-	      else if ( (theStripDet->surface().position().phi() > -1.96 - theSearchPhiTEC)
-			&& (theStripDet->surface().position().phi() < -1.96 + theSearchPhiTEC))    { theBeam = 5; } // beam 5
-
-	      else if ( (theStripDet->surface().position().phi() > -1.18 - theSearchPhiTEC)
-			&& (theStripDet->surface().position().phi() < -1.18 + theSearchPhiTEC))    { theBeam = 6; } // beam 6
-
-	      else if ( (theStripDet->surface().position().phi() > -0.39 - theSearchPhiTEC)
-			&& (theStripDet->surface().position().phi() < -0.39 + theSearchPhiTEC))    { theBeam = 7; } // beam 7
-
-	      else if ( (theStripDet->surface().position().phi() > 1.28 - theSearchPhiTEC)
-			&& (theStripDet->surface().position().phi() < 1.28 + theSearchPhiTEC))     { theBeam = 21; } // beam 1 TEC2TEC
-
-	      else if ( (theStripDet->surface().position().phi() > 1.84 - theSearchPhiTEC)
-			&& (theStripDet->surface().position().phi() < 1.84 + theSearchPhiTEC))     { theBeam = 22; } // beam 2 TEC2TEC
-
-	      else if ( (theStripDet->surface().position().phi() > -2.59 - theSearchPhiTEC)
-			&& (theStripDet->surface().position().phi() < -2.59 + theSearchPhiTEC))    { theBeam = 24; } // beam 4 TEC2TEC
-
-	      else if ( (theStripDet->surface().position().phi() > -1.10 - theSearchPhiTEC)
-			&& (theStripDet->surface().position().phi() < -1.10 + theSearchPhiTEC))    { theBeam = 26; } // beam 6 TEC2TEC
-
-	      else if ( (theStripDet->surface().position().phi() > -0.50 - theSearchPhiTEC)
-			&& (theStripDet->surface().position().phi() < -0.50 + theSearchPhiTEC))    { theBeam = 27; } // beam 7 TEC2TEC
-	      else 
-		{ theBeam = -1; } // probably not a Laser Hit!
-	    }
-
-
-	  //       if ( ( thePart == "TEC+" || thePart == "TEC-" ) && theEvents == 1 )
-	  // 	{
-	  // 	  cout << " theBeam = " << theBeam << " thePart = " << thePart << " theRing = " << theRing << " Disc = " << theTECWheel << endl;
-	  // 	  cout << " DetUnitId = " << theDetUnitID.rawId() << endl;
-	  // 	  cout << " Phi of Det = " << theStripDet->surface().position().phi() << endl;
-	  
-	  // 	}
-
-	  // fill the histograms which will be fitted at the end of the run to reconstruct the laser profile
-
-	  /* work with else if ... for all the parts and beams */
-	  // ****** beam 0 in Ring 4
-	  if ( (thePart == "TEC+") && (theRing == 4) && (theBeam == 0) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam0Ring4Disc1PosAdcCounts, 
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam0Ring4Disc2PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam0Ring4Disc3PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam0Ring4Disc4PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam0Ring4Disc5PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam0Ring4Disc6PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam0Ring4Disc7PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam0Ring4Disc8PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam0Ring4Disc9PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 0 in Ring 4 ****
-
-	  // **** Beam 1 in Ring 4 ****
-	  else if ( (thePart == "TEC+") && (theRing == 4) && (theBeam == 1) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam1Ring4Disc1PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc2PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc3PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc4PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc5PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc6PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc7PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc8PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam1Ring4Disc9PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** TEC2TEC
-	  else if ( (thePart == "TEC+") && (theRing == 4) && (theBeam == 21) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam1Ring4Disc1PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc2PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc3PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc4PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc5PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 1 in Ring 4 ****
-
-	  // **** Beam 2 in Ring 4 ****
-	  else if ( (thePart == "TEC+") && (theRing == 4) && (theBeam == 2) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam2Ring4Disc1PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc2PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc3PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-
-		  fillAdcCounts(theMEBeam2Ring4Disc4PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc5PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc6PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc7PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc8PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam2Ring4Disc9PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // TEC2TEC
-	  // **** Beam 2 in Ring 4 ****
-	  else if ( (thePart == "TEC+") && (theRing == 4) && (theBeam == 22) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam2Ring4Disc1PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc2PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc3PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc4PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc5PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 2 in Ring 4 ****
-
-	  // **** Beam 3 in Ring 4 ****
-	  else if ( (thePart == "TEC+") && (theRing == 4) && (theBeam == 3) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam3Ring4Disc1PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam3Ring4Disc2PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam3Ring4Disc3PosAdcCounts, 
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam3Ring4Disc4PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam3Ring4Disc5PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam3Ring4Disc6PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam3Ring4Disc7PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam3Ring4Disc8PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam3Ring4Disc9PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 3 in Ring 4 ****
-
-	  // **** Beam 4 in Ring 4 ****
-	  else if ( (thePart == "TEC+") && (theRing == 4) && (theBeam == 4) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam4Ring4Disc1PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc2PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc3PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc4PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc5PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc6PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc7PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc8PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam4Ring4Disc9PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // TEC2TEC
-	  else if ( (thePart == "TEC+") && (theRing == 4) && (theBeam == 24) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam4Ring4Disc1PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc2PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc3PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc4PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc5PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 4 in Ring 4 ****
-
-	  // **** Beam 5 in Ring 4 ****
-	  else if ( (thePart == "TEC+") && (theRing == 4) && (theBeam == 5) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam5Ring4Disc1PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam5Ring4Disc2PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam5Ring4Disc3PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam5Ring4Disc4PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam5Ring4Disc5PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam5Ring4Disc6PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam5Ring4Disc7PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam5Ring4Disc8PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam5Ring4Disc9PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 5 in Ring 4 ****
-
-	  // **** Beam 6 in Ring 4 ****
-	  else if ( (thePart == "TEC+") && (theRing == 4) && (theBeam == 6) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam6Ring4Disc1PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc2PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc3PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc4PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc5PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc6PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc7PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc8PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam6Ring4Disc9PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // TEC2TEC
-	  else if ( (thePart == "TEC+") && (theRing == 4) && (theBeam == 26) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam6Ring4Disc1PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc2PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc3PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc4PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc5PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 6 in Ring 4 ****
-
-	  // **** Beam 7 in Ring 4 ****
-	  else if ( (thePart == "TEC+") && (theRing == 4) && (theBeam == 7) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam7Ring4Disc1PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc2PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc3PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc4PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc5PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc6PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc7PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc8PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam7Ring4Disc9PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // TEC2TEC
-	  else if ( (thePart == "TEC+") && (theRing == 4) && (theBeam == 27) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam7Ring4Disc1PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc2PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc3PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc4PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc5PosTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 7 in Ring 4 ****
-
-	  // **** Ring 6
-	  else if ( (thePart == "TEC+") && (theRing == 6) && (theBeam == 0) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam0Ring6Disc1PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam0Ring6Disc2PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam0Ring6Disc3PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam0Ring6Disc4PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam0Ring6Disc5PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam0Ring6Disc6PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam0Ring6Disc7PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam0Ring6Disc8PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam0Ring6Disc9PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 0 in Ring 6 ****
-
-	  // **** Beam 1 in Ring 6 ****
-	  else if ( (thePart == "TEC+") && (theRing == 6) && (theBeam == 1) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam1Ring6Disc1PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam1Ring6Disc2PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam1Ring6Disc3PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam1Ring6Disc4PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam1Ring6Disc5PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam1Ring6Disc6PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam1Ring6Disc7PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam1Ring6Disc8PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam1Ring6Disc9PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 1 in Ring 6 ****
-
-	  // **** Beam 2 in Ring 6 ****
-	  else if ( (thePart == "TEC+") && (theRing == 6) && (theBeam == 2) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam2Ring6Disc1PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam2Ring6Disc2PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam2Ring6Disc3PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam2Ring6Disc4PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam2Ring6Disc5PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam2Ring6Disc6PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam2Ring6Disc7PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam2Ring6Disc8PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam2Ring6Disc9PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 2 in Ring 6 ****
-
-	  // **** Beam 3 in Ring 6 ****
-	  else if ( (thePart == "TEC+") && (theRing == 6) && (theBeam == 3) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam3Ring6Disc1PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam3Ring6Disc2PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam3Ring6Disc3PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam3Ring6Disc4PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam3Ring6Disc5PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam3Ring6Disc6PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam3Ring6Disc7PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam3Ring6Disc8PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam3Ring6Disc9PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 3 in Ring 6 ****
-
-	  // **** Beam 4 in Ring 6 ****
-	  else if ( (thePart == "TEC+") && (theRing == 6) && (theBeam == 4) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam4Ring6Disc1PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam4Ring6Disc2PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam4Ring6Disc3PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam4Ring6Disc4PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam4Ring6Disc5PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam4Ring6Disc6PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam4Ring6Disc7PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam4Ring6Disc8PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam4Ring6Disc9PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 4 in Ring 6 ****
-
-	  // **** Beam 5 in Ring 6 ****
-	  else if ( (thePart == "TEC+") && (theRing == 6) && (theBeam == 5) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam5Ring6Disc1PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam5Ring6Disc2PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam5Ring6Disc3PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam5Ring6Disc4PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam5Ring6Disc5PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam5Ring6Disc6PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam5Ring6Disc7PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam5Ring6Disc8PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam5Ring6Disc9PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 5 in Ring 6 ****
-
-	  // **** Beam 6 in Ring 6 ****
-	  else if ( (thePart == "TEC+") && (theRing == 6) && (theBeam == 6) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam6Ring6Disc1PosAdcCounts, 
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam6Ring6Disc2PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam6Ring6Disc3PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam6Ring6Disc4PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam6Ring6Disc5PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam6Ring6Disc6PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam6Ring6Disc7PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam6Ring6Disc8PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam6Ring6Disc9PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 6 in Ring 6 ****
-
-	  // **** Beam 7 in Ring 6 ****
-	  else if ( (thePart == "TEC+") && (theRing == 6) && (theBeam == 7) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam7Ring6Disc1PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam7Ring6Disc2PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam7Ring6Disc3PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam7Ring6Disc4PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam7Ring6Disc5PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam7Ring6Disc6PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam7Ring6Disc7PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam7Ring6Disc8PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam7Ring6Disc9PosAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 7 in Ring 6 ****
-
-	  // ***** TEC- *****
-	  else if ( (thePart == "TEC-") && (theRing == 4) && (theBeam == 0) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam0Ring4Disc1NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam0Ring4Disc2NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam0Ring4Disc3NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam0Ring4Disc4NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam0Ring4Disc5NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam0Ring4Disc6NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam0Ring4Disc7NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam0Ring4Disc8NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam0Ring4Disc9NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 0 in Ring 4 ****
-
-	  // **** Beam 1 in Ring 4 ****
-	  else if ( (thePart == "TEC-") && (theRing == 4) && (theBeam == 1) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam1Ring4Disc1NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc2NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc3NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc4NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc5NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc6NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc7NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc8NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam1Ring4Disc9NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** TEC2TEC
-	  else if ( (thePart == "TEC-") && (theRing == 4) && (theBeam == 21) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam1Ring4Disc1NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc2NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc3NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc4NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam1Ring4Disc5NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 1 in Ring 4 ****
-
-	  // **** Beam 2 in Ring 4 ****
-	  else if ( (thePart == "TEC-") && (theRing == 4) && (theBeam == 2) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam2Ring4Disc1NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc2NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc3NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc4NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc5NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc6NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc7NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc8NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam2Ring4Disc9NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // TEC2TEC
-	  // **** Beam 2 in Ring 4 ****
-	  else if ( (thePart == "TEC-") && (theRing == 4) && (theBeam == 22) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam2Ring4Disc1NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc2NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc3NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc4NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam2Ring4Disc5NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 2 in Ring 4 ****
-
-	  // **** Beam 3 in Ring 4 ****
-	  else if ( (thePart == "TEC-") && (theRing == 4) && (theBeam == 3) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam3Ring4Disc1NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam3Ring4Disc2NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam3Ring4Disc3NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam3Ring4Disc4NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam3Ring4Disc5NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam3Ring4Disc6NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam3Ring4Disc7NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam3Ring4Disc8NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam3Ring4Disc9NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 3 in Ring 4 ****
-
-	  // **** Beam 4 in Ring 4 ****
-	  else if ( (thePart == "TEC-") && (theRing == 4) && (theBeam == 4) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam4Ring4Disc1NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc2NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc3NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc4NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc5NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc6NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc7NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc8NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam4Ring4Disc9NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // TEC2TEC
-	  else if ( (thePart == "TEC-") && (theRing == 4) && (theBeam == 24) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam4Ring4Disc1NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc2NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc3NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc4NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam4Ring4Disc5NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 4 in Ring 4 ****
-
-	  // **** Beam 5 in Ring 4 ****
-	  else if ( (thePart == "TEC-") && (theRing == 4) && (theBeam == 5) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam5Ring4Disc1NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam5Ring4Disc2NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam5Ring4Disc3NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam5Ring4Disc4NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam5Ring4Disc5NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam5Ring4Disc6NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam5Ring4Disc7NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam5Ring4Disc8NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam5Ring4Disc9NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 5 in Ring 4 ****
-
-	  // **** Beam 6 in Ring 4 ****
-	  else if ( (thePart == "TEC-") && (theRing == 4) && (theBeam == 6) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam6Ring4Disc1NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc2NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc3NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc4NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc5NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc6NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc7NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc8NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam6Ring4Disc9NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // TEC2TEC
-	  else if ( (thePart == "TEC-") && (theRing == 4) && (theBeam == 26) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam6Ring4Disc1NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc2NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc3NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc4NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam6Ring4Disc5NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 6 in Ring 4 ****
-
-	  // **** Beam 7 in Ring 4 ****
-	  else if ( (thePart == "TEC-") && (theRing == 4) && (theBeam == 7) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam7Ring4Disc1NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc2NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc3NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc4NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc5NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc6NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc7NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc8NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam7Ring4Disc9NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // TEC2TEC
-	  else if ( (thePart == "TEC-") && (theRing == 4) && (theBeam == 27) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam7Ring4Disc1NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc2NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc3NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc4NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam7Ring4Disc5NegTEC2TECAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 7 in Ring 4 ****
-
-	  // **** Ring 6
-	  else if ( (thePart == "TEC-") && (theRing == 6) && (theBeam == 0) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam0Ring6Disc1NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam0Ring6Disc2NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam0Ring6Disc3NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam0Ring6Disc4NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam0Ring6Disc5NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam0Ring6Disc6NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam0Ring6Disc7NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam0Ring6Disc8NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam0Ring6Disc9NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 0 in Ring 6 ****
-
-	  // **** Beam 1 in Ring 6 ****
-	  else if ( (thePart == "TEC-") && (theRing == 6) && (theBeam == 1) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam1Ring6Disc1NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam1Ring6Disc2NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam1Ring6Disc3NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam1Ring6Disc4NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam1Ring6Disc5NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam1Ring6Disc6NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam1Ring6Disc7NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam1Ring6Disc8NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam1Ring6Disc9NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 1 in Ring 6 ****
-
-	  // **** Beam 2 in Ring 6 ****
-	  else if ( (thePart == "TEC-") && (theRing == 6) && (theBeam == 2) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam2Ring6Disc1NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam2Ring6Disc2NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam2Ring6Disc3NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam2Ring6Disc4NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam2Ring6Disc5NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam2Ring6Disc6NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam2Ring6Disc7NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam2Ring6Disc8NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam2Ring6Disc9NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 2 in Ring 6 ****
-
-	  // **** Beam 3 in Ring 6 ****
-	  else if ( (thePart == "TEC-") && (theRing == 6) && (theBeam == 3) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam3Ring6Disc1NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam3Ring6Disc2NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam3Ring6Disc3NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam3Ring6Disc4NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam3Ring6Disc5NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam3Ring6Disc6NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam3Ring6Disc7NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam3Ring6Disc8NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam3Ring6Disc9NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 3 in Ring 6 ****
-
-	  // **** Beam 4 in Ring 6 ****
-	  else if ( (thePart == "TEC-") && (theRing == 6) && (theBeam == 4) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam4Ring6Disc1NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam4Ring6Disc2NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam4Ring6Disc3NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam4Ring6Disc4NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam4Ring6Disc5NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam4Ring6Disc6NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam4Ring6Disc7NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam4Ring6Disc8NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam4Ring6Disc9NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 4 in Ring 6 ****
-
-	  // **** Beam 5 in Ring 6 ****
-	  else if ( (thePart == "TEC-") && (theRing == 6) && (theBeam == 5) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam5Ring6Disc1NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam5Ring6Disc2NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam5Ring6Disc3NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam5Ring6Disc4NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam5Ring6Disc5NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam5Ring6Disc6NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam5Ring6Disc7NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam5Ring6Disc8NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam5Ring6Disc9NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 5 in Ring 6 ****
-
-	  // **** Beam 6 in Ring 6 ****
-	  else if ( (thePart == "TEC-") && (theRing == 6) && (theBeam == 6) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam6Ring6Disc1NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam6Ring6Disc2NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam6Ring6Disc3NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam6Ring6Disc4NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam6Ring6Disc5NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam6Ring6Disc6NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam6Ring6Disc7NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam6Ring6Disc8NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam6Ring6Disc9NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 6 in Ring 6 ****
-
-	  // **** Beam 7 in Ring 6 ****
-	  else if ( (thePart == "TEC-") && (theRing == 6) && (theBeam == 7) )
-	    {
-	      if ( theTECWheel == 1 )
-		{ 
-		  fillAdcCounts(theMEBeam7Ring6Disc1NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 2 )
-		{
-		  fillAdcCounts(theMEBeam7Ring6Disc2NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 3 )
-		{
-		  fillAdcCounts(theMEBeam7Ring6Disc3NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 4 )
-		{
-		  fillAdcCounts(theMEBeam7Ring6Disc4NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 5 )
-		{
-		  fillAdcCounts(theMEBeam7Ring6Disc5NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 6 )
-		{
-		  fillAdcCounts(theMEBeam7Ring6Disc6NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 7 )
-		{
-		  fillAdcCounts(theMEBeam7Ring6Disc7NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 8 )
-		{
-		  fillAdcCounts(theMEBeam7Ring6Disc8NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( theTECWheel == 9 )
-		{ 
-		  fillAdcCounts(theMEBeam7Ring6Disc9NegAdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of beam 7 in Ring 6 ****
-
-	  // ***** TOB *****
-	  // **** Beam 0 in TOB ****
-	  else if ( (thePart == "TOB") && (theTOBLayer == 1) && (theBeam == 0) && (theTOBStereoDet == 0) && (theStripDet->surface().position().perp() < 58.5) )
-	    {
-	      if ( (theStripDet->surface().position().z() > 99.0 - theSearchZTOB) && (theStripDet->surface().position().z() < 99.0 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam0TOBPosition1AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 64.0 - theSearchZTOB) && (theStripDet->surface().position().z() < 64.0 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam0TOBPosition2AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 27.5 - theSearchZTOB) && (theStripDet->surface().position().z() < 27.5 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam0TOBPosition3AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -10.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -10.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam0TOBPosition4AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -46.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -46.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam0TOBPosition5AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -80.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -80.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam0TOBPosition6AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of Beam 0 in TOB ****
-      
-	  // **** Beam 1 in TOB ****
-	  else if ( (thePart == "TOB") && (theTOBLayer == 1) && (theBeam == 1) && (theTOBStereoDet == 0) && (theStripDet->surface().position().perp() < 58.5) )
-	    {
-	      if ( (theStripDet->surface().position().z() > 99.0 - theSearchZTOB) && (theStripDet->surface().position().z() < 99.0 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam1TOBPosition1AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 64.0 - theSearchZTOB) && (theStripDet->surface().position().z() < 64.0 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam1TOBPosition2AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 27.5 - theSearchZTOB) && (theStripDet->surface().position().z() < 27.5 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam1TOBPosition3AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -10.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -10.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam1TOBPosition4AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -46.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -46.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam1TOBPosition5AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -80.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -80.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam1TOBPosition6AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of Beam 1 in TOB ****
-      
-	  // **** Beam 2 in TOB ****
-	  else if ( (thePart == "TOB") && (theTOBLayer == 1) && (theBeam == 2) && (theTOBStereoDet == 0) && (theStripDet->surface().position().perp() < 58.5) )
-	    {
-	      if ( (theStripDet->surface().position().z() > 99.0 - theSearchZTOB) && (theStripDet->surface().position().z() < 99.0 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam2TOBPosition1AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 64.0 - theSearchZTOB) && (theStripDet->surface().position().z() < 64.0 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam2TOBPosition2AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 27.5 - theSearchZTOB) && (theStripDet->surface().position().z() < 27.5 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam2TOBPosition3AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -10.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -10.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam2TOBPosition4AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -46.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -46.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam2TOBPosition5AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -80.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -80.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam2TOBPosition6AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of Beam 2 in TOB ****
-      
-	  // **** Beam 3 in TOB ****
-	  else if ( (thePart == "TOB") && (theTOBLayer == 1) && (theBeam == 3) && (theTOBStereoDet == 0) && (theStripDet->surface().position().perp() < 58.5) )
-	    {
-	      if ( (theStripDet->surface().position().z() > 99.0 - theSearchZTOB) && (theStripDet->surface().position().z() < 99.0 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam3TOBPosition1AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 64.0 - theSearchZTOB) && (theStripDet->surface().position().z() < 64.0 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam3TOBPosition2AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 27.5 - theSearchZTOB) && (theStripDet->surface().position().z() < 27.5 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam3TOBPosition3AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -10.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -10.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam3TOBPosition4AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -46.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -46.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam3TOBPosition5AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -80.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -80.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam3TOBPosition6AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of Beam 3 in TOB ****
-
-	  // **** Beam 4 in TOB ****
-	  else if ( (thePart == "TOB") && (theTOBLayer == 1) && (theBeam == 4) && (theTOBStereoDet == 0) && (theStripDet->surface().position().perp() < 58.5) )
-	    {
-	      if ( (theStripDet->surface().position().z() > 99.0 - theSearchZTOB) && (theStripDet->surface().position().z() < 99.0 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam4TOBPosition1AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 64.0 - theSearchZTOB) && (theStripDet->surface().position().z() < 64.0 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam4TOBPosition2AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 27.5 - theSearchZTOB) && (theStripDet->surface().position().z() < 27.5 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam4TOBPosition3AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -10.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -10.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam4TOBPosition4AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -46.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -46.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam4TOBPosition5AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -80.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -80.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam4TOBPosition6AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of Beam 4 in TOB ****
-
-	  // **** Beam 5 in TOB ****
-	  else if ( (thePart == "TOB") && (theTOBLayer == 1) && (theBeam == 5) && (theTOBStereoDet == 0) && (theStripDet->surface().position().perp() < 58.5) )
-	    {
-	      if ( (theStripDet->surface().position().z() > 99.0 - theSearchZTOB) && (theStripDet->surface().position().z() < 99.0 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam5TOBPosition1AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 64.0 - theSearchZTOB) && (theStripDet->surface().position().z() < 64.0 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam5TOBPosition2AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 27.5 - theSearchZTOB) && (theStripDet->surface().position().z() < 27.5 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam5TOBPosition3AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -10.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -10.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam5TOBPosition4AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -46.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -46.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam5TOBPosition5AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -80.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -80.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam5TOBPosition6AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of Beam 5 in TOB ****
-
-	  // **** Beam 6 in TOB ****
-	  else if ( (thePart == "TOB") && (theTOBLayer == 1) && (theBeam == 6) && (theTOBStereoDet == 0) && (theStripDet->surface().position().perp() < 58.5) )
-	    {
-	      if ( (theStripDet->surface().position().z() > 99.0 - theSearchZTOB) && (theStripDet->surface().position().z() < 99.0 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam6TOBPosition1AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 64.0 - theSearchZTOB) && (theStripDet->surface().position().z() < 64.0 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam6TOBPosition2AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 27.5 - theSearchZTOB) && (theStripDet->surface().position().z() < 27.5 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam6TOBPosition3AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -10.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -10.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam6TOBPosition4AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -46.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -46.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam6TOBPosition5AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -80.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -80.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam6TOBPosition6AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of Beam 6 in TOB ****
-      
-	  // **** Beam 7 in TOB ****
-	  else if ( (thePart == "TOB") && (theTOBLayer == 1) && (theBeam == 7) && (theTOBStereoDet == 0) && (theStripDet->surface().position().perp() < 58.5) )
-	    {
-	      if ( (theStripDet->surface().position().z() > 99.0 - theSearchZTOB) && (theStripDet->surface().position().z() < 99.0 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam7TOBPosition1AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 64.0 - theSearchZTOB) && (theStripDet->surface().position().z() < 64.0 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam7TOBPosition2AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 27.5 - theSearchZTOB) && (theStripDet->surface().position().z() < 27.5 + theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam7TOBPosition3AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -10.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -10.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam7TOBPosition4AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -46.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -46.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam7TOBPosition5AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -80.0 + theSearchZTOB) && (theStripDet->surface().position().z() > -80.0 - theSearchZTOB) )
-		{ 
-		  fillAdcCounts(theMEBeam7TOBPosition6AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of Beam 7 in TOB ****
-
-	  // ***** TIB *****
-	  // **** Beam 0 in TIB ****
-	  else if ( (thePart == "TIB") && (theTIBLayer == 4) && (theBeam == 0) )
-	    {
-	      if ( (theStripDet->surface().position().z() > 60.5 - theSearchZTIB) && (theStripDet->surface().position().z() < 60.5 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam0TIBPosition1AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 37.5 - theSearchZTIB) && (theStripDet->surface().position().z() < 37.5 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam0TIBPosition2AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 15.0 - theSearchZTIB) && (theStripDet->surface().position().z() < 15.0 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam0TIBPosition3AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -7.5 + theSearchZTIB) && (theStripDet->surface().position().z() > -7.5 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam0TIBPosition4AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -30.5 + theSearchZTIB) && (theStripDet->surface().position().z() > -30.5 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam0TIBPosition5AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -53.0 + theSearchZTIB) && (theStripDet->surface().position().z() > -53.0 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam0TIBPosition6AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of Beam 0 in TIB ****
-      
-	  // **** Beam 1 in TIB ****
-	  else if ( (thePart == "TIB") && (theTIBLayer == 4) && (theBeam == 1) ) 
-	    {
-	      if ( (theStripDet->surface().position().z() > 60.5 - theSearchZTIB) && (theStripDet->surface().position().z() < 60.5 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam1TIBPosition1AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 37.5 - theSearchZTIB) && (theStripDet->surface().position().z() < 37.5 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam1TIBPosition2AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 15.0 - theSearchZTIB) && (theStripDet->surface().position().z() < 15.0 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam1TIBPosition3AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -7.5 + theSearchZTIB) && (theStripDet->surface().position().z() > -7.5 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam1TIBPosition4AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -30.5 + theSearchZTIB) && (theStripDet->surface().position().z() > -30.5 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam1TIBPosition5AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -53.0 + theSearchZTIB) && (theStripDet->surface().position().z() > -53.0 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam1TIBPosition6AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of Beam 1 in TIB ****
-      
-	  // **** Beam 2 in TIB ****
-	  else if ( (thePart == "TIB") && (theTIBLayer == 4) && (theBeam == 2) )
-	    {
-	      if ( (theStripDet->surface().position().z() > 60.5 - theSearchZTIB) && (theStripDet->surface().position().z() < 60.5 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam2TIBPosition1AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 37.5 - theSearchZTIB) && (theStripDet->surface().position().z() < 37.5 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam2TIBPosition2AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 15.0 - theSearchZTIB) && (theStripDet->surface().position().z() < 15.0 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam2TIBPosition3AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -7.5 + theSearchZTIB) && (theStripDet->surface().position().z() > -7.5 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam2TIBPosition4AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -30.5 + theSearchZTIB) && (theStripDet->surface().position().z() > -30.5 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam2TIBPosition5AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -53.0 + theSearchZTIB) && (theStripDet->surface().position().z() > -53.0 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam2TIBPosition6AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of Beam 2 in TIB ****
-      
-	  // **** Beam 3 in TIB ****
-	  else if ( (thePart == "TIB") && (theTIBLayer == 4) && (theBeam == 3) )
-	    {
-	      if ( (theStripDet->surface().position().z() > 60.5 - theSearchZTIB) && (theStripDet->surface().position().z() < 60.5 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam3TIBPosition1AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 37.5 - theSearchZTIB) && (theStripDet->surface().position().z() < 37.5 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam3TIBPosition2AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 15.0 - theSearchZTIB) && (theStripDet->surface().position().z() < 15.0 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam3TIBPosition3AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -7.5 + theSearchZTIB) && (theStripDet->surface().position().z() > -7.5 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam3TIBPosition4AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -30.5 + theSearchZTIB) && (theStripDet->surface().position().z() > -30.5 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam3TIBPosition5AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -53.0 + theSearchZTIB) && (theStripDet->surface().position().z() > -53.0 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam3TIBPosition6AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of Beam 3 in TIB ****
-
-	  // **** Beam 4 in TIB ****
-	  else if ( (thePart == "TIB") && (theTIBLayer == 4) && (theBeam == 4) )
-	    {
-	      if ( (theStripDet->surface().position().z() > 60.5 - theSearchZTIB) && (theStripDet->surface().position().z() < 60.5 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam4TIBPosition1AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 37.5 - theSearchZTIB) && (theStripDet->surface().position().z() < 37.5 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam4TIBPosition2AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 15.0 - theSearchZTIB) && (theStripDet->surface().position().z() < 15.0 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam4TIBPosition3AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -7.5 + theSearchZTIB) && (theStripDet->surface().position().z() > -7.5 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam4TIBPosition4AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -30.5 + theSearchZTIB) && (theStripDet->surface().position().z() > -30.5 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam4TIBPosition5AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -53.0 + theSearchZTIB) && (theStripDet->surface().position().z() > -53.0 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam4TIBPosition6AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of Beam 4 in TIB ****
-      
-	  // **** Beam 5 in TIB ****
-	  else if ( (thePart == "TIB") && (theTIBLayer == 4) && (theBeam == 5) )
-	    {
-	      if ( (theStripDet->surface().position().z() > 60.5 - theSearchZTIB) && (theStripDet->surface().position().z() < 60.5 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam5TIBPosition1AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 37.5 - theSearchZTIB) && (theStripDet->surface().position().z() < 37.5 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam5TIBPosition2AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 15.0 - theSearchZTIB) && (theStripDet->surface().position().z() < 15.0 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam5TIBPosition3AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -7.5 + theSearchZTIB) && (theStripDet->surface().position().z() > -7.5 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam5TIBPosition4AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -30.5 + theSearchZTIB) && (theStripDet->surface().position().z() > -30.5 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam5TIBPosition5AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -53.0 + theSearchZTIB) && (theStripDet->surface().position().z() > -53.0 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam5TIBPosition6AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of Beam 5 in TIB ****
-
-	  // **** Beam 6 in TIB ****
-	  else if ( (thePart == "TIB") && (theTIBLayer == 4) && (theBeam == 6) )
-	    {
-	      if ( (theStripDet->surface().position().z() > 60.5 - theSearchZTIB) && (theStripDet->surface().position().z() < 60.5 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam6TIBPosition1AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 37.5 - theSearchZTIB) && (theStripDet->surface().position().z() < 37.5 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam6TIBPosition2AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 15.0 - theSearchZTIB) && (theStripDet->surface().position().z() < 15.0 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam6TIBPosition3AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -7.5 + theSearchZTIB) && (theStripDet->surface().position().z() > -7.5 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam6TIBPosition4AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -30.5 + theSearchZTIB) && (theStripDet->surface().position().z() > -30.5 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam6TIBPosition5AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -53.0 + theSearchZTIB) && (theStripDet->surface().position().z() > -53.0 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam6TIBPosition6AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of Beam 6 in TIB ****
-      
-	  // **** Beam 7 in TIB ****
-	  else if ( (thePart == "TIB") && (theTIBLayer == 4) && (theBeam == 7) )
-	    {
-	      if ( (theStripDet->surface().position().z() > 60.5 - theSearchZTIB) && (theStripDet->surface().position().z() < 60.5 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam7TIBPosition1AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 37.5 - theSearchZTIB) && (theStripDet->surface().position().z() < 37.5 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam7TIBPosition2AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() > 15.0 - theSearchZTIB) && (theStripDet->surface().position().z() < 15.0 + theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam7TIBPosition3AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -7.5 + theSearchZTIB) && (theStripDet->surface().position().z() > -7.5 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam7TIBPosition4AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -30.5 + theSearchZTIB) && (theStripDet->surface().position().z() > -30.5 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam7TIBPosition5AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	      else if ( (theStripDet->surface().position().z() < -53.0 + theSearchZTIB) && (theStripDet->surface().position().z() > -53.0 - theSearchZTIB) )
-		{ 
-		  fillAdcCounts(theMEBeam7TIBPosition6AdcCounts,
-				theDigiRangeIterator, theDigiRangeIteratorEnd);
-		}
-	    }
-	  // **** end of Beam 7 in TIB ****
-	}
+  edm::Handle<edm::DetSetVector<SiStripDigi>> theStripDigis;
+
+  for (Parameters::iterator itDigiProducersList = theDigiProducersList.begin();
+       itDigiProducersList != theDigiProducersList.end();
+       ++itDigiProducersList) {
+    std::string digiProducer = itDigiProducersList->getParameter<std::string>("DigiProducer");
+    std::string digiLabel = itDigiProducersList->getParameter<std::string>("DigiLabel");
+
+    theEvent.getByLabel(digiProducer, digiLabel, theStripDigis);
+
+    // loop over the entries of theStripDigis, get the DetId to identify the
+    // Detunit and find the one which will be hit by the laser beams
+    for (edm::DetSetVector<SiStripDigi>::const_iterator DSViter = theStripDigis->begin();
+         DSViter != theStripDigis->end();
+         DSViter++) {
+      DetId theDetUnitID(DSViter->id);
+
+      // get the DetUnit via the DetUnitId and cast it to a StripGeomDetUnit
+      const StripGeomDetUnit *const theStripDet =
+          dynamic_cast<const StripGeomDetUnit *>(theTracker.idToDet(theDetUnitID));
+
+      // get the Digis in this DetUnit
+      edm::DetSet<SiStripDigi>::const_iterator theDigiRangeIterator = (*DSViter).data.begin();
+      edm::DetSet<SiStripDigi>::const_iterator theDigiRangeIteratorEnd = (*DSViter).data.end();
+
+      // some variables we need later on in the program
+      int theBeam = 0;
+      int theRing = 0;
+      std::string thePart = "";
+      int theTIBLayer = 0;
+      int theTOBLayer = 0;
+      int theTECWheel = 0;
+      int theTOBStereoDet = 0;
+
+      switch (theDetUnitID.subdetId()) {
+        case StripSubdetector::TIB: {
+          thePart = "TIB";
+          theTIBLayer = tTopo->tibLayer(theDetUnitID.rawId());
+          break;
+        }
+        case StripSubdetector::TOB: {
+          thePart = "TOB";
+          theTOBLayer = tTopo->tobLayer(theDetUnitID.rawId());
+          theTOBStereoDet = tTopo->tobStereo(theDetUnitID.rawId());
+          break;
+        }
+        case StripSubdetector::TEC: {
+          // is this module in TEC+ or TEC-?
+          if (tTopo->tecSide(theDetUnitID.rawId()) == 1) {
+            thePart = "TEC-";
+          } else if (tTopo->tecSide(theDetUnitID.rawId()) == 2) {
+            thePart = "TEC+";
+          }
+
+          // in which ring is this module?
+          if (theStripDet->surface().position().perp() > 55.0 && theStripDet->surface().position().perp() < 59.0) {
+            theRing = 4;
+          }  // Ring 4
+          else if (theStripDet->surface().position().perp() > 81.0 && theStripDet->surface().position().perp() < 85.0) {
+            theRing = 6;
+          }  // Ring 6
+          else {
+            theRing = -1;
+          }  // probably not a Laser Hit!
+
+          // on which disk is this module
+          theTECWheel = tTopo->tecWheel(theDetUnitID.rawId());
+          break;
+        }
+      }
+
+      // which beam belongs these digis to
+      if (thePart == "TIB" && theTIBLayer == 4) {
+        if ((theStripDet->surface().position().phi() > 0.39 - theSearchPhiTIB) &&
+            (theStripDet->surface().position().phi() < 0.39 + theSearchPhiTIB)) {
+          theBeam = 0;
+        }  // beam 0
+
+        else if ((theStripDet->surface().position().phi() > 1.29 - theSearchPhiTIB) &&
+                 (theStripDet->surface().position().phi() < 1.29 + theSearchPhiTIB)) {
+          theBeam = 1;
+        }  // beam 1
+
+        else if ((theStripDet->surface().position().phi() > 1.85 - theSearchPhiTIB) &&
+                 (theStripDet->surface().position().phi() < 1.85 + theSearchPhiTIB)) {
+          theBeam = 2;
+        }  // beam 2
+
+        else if ((theStripDet->surface().position().phi() > 2.75 - theSearchPhiTIB) &&
+                 (theStripDet->surface().position().phi() < 2.75 + theSearchPhiTIB)) {
+          theBeam = 3;
+        }  // beam 3
+
+        else if ((theStripDet->surface().position().phi() > -2.59 - theSearchPhiTIB) &&
+                 (theStripDet->surface().position().phi() < -2.59 + theSearchPhiTIB)) {
+          theBeam = 4;
+        }  // beam 4
+
+        else if ((theStripDet->surface().position().phi() > -2.00 - theSearchPhiTIB) &&
+                 (theStripDet->surface().position().phi() < -2.00 + theSearchPhiTIB)) {
+          theBeam = 5;
+        }  // beam 5
+
+        else if ((theStripDet->surface().position().phi() > -1.10 - theSearchPhiTIB) &&
+                 (theStripDet->surface().position().phi() < -1.10 + theSearchPhiTIB)) {
+          theBeam = 6;
+        }  // beam 6
+
+        else if ((theStripDet->surface().position().phi() > -0.50 - theSearchPhiTIB) &&
+                 (theStripDet->surface().position().phi() < -0.50 + theSearchPhiTIB)) {
+          theBeam = 7;
+        }  // beam 7
+        else {
+          theBeam = -1;
+        }  // probably not a Laser Hit!
+      } else if (thePart == "TOB" && theTOBLayer == 1) {
+        if ((theStripDet->surface().position().phi() > 0.39 - theSearchPhiTOB) &&
+            (theStripDet->surface().position().phi() < 0.39 + theSearchPhiTOB)) {
+          theBeam = 0;
+        }  // beam 0
+
+        else if ((theStripDet->surface().position().phi() > 1.29 - theSearchPhiTOB) &&
+                 (theStripDet->surface().position().phi() < 1.29 + theSearchPhiTOB)) {
+          theBeam = 1;
+        }  // beam 1
+
+        else if ((theStripDet->surface().position().phi() > 1.85 - theSearchPhiTOB) &&
+                 (theStripDet->surface().position().phi() < 1.85 + theSearchPhiTOB)) {
+          theBeam = 2;
+        }  // beam 2
+
+        else if ((theStripDet->surface().position().phi() > 2.75 - theSearchPhiTOB) &&
+                 (theStripDet->surface().position().phi() < 2.75 + theSearchPhiTOB)) {
+          theBeam = 3;
+        }  // beam 3
+
+        else if ((theStripDet->surface().position().phi() > -2.59 - theSearchPhiTOB) &&
+                 (theStripDet->surface().position().phi() < -2.59 + theSearchPhiTOB)) {
+          theBeam = 4;
+        }  // beam 4
+
+        else if ((theStripDet->surface().position().phi() > -2.00 - theSearchPhiTOB) &&
+                 (theStripDet->surface().position().phi() < -2.00 + theSearchPhiTOB)) {
+          theBeam = 5;
+        }  // beam 5
+
+        else if ((theStripDet->surface().position().phi() > -1.10 - theSearchPhiTOB) &&
+                 (theStripDet->surface().position().phi() < -1.10 + theSearchPhiTOB)) {
+          theBeam = 6;
+        }  // beam 6
+
+        else if ((theStripDet->surface().position().phi() > -0.50 - theSearchPhiTOB) &&
+                 (theStripDet->surface().position().phi() < -0.50 + theSearchPhiTOB)) {
+          theBeam = 7;
+        }  // beam 7
+        else {
+          theBeam = -1;
+        }  // probably not a Laser Hit!
+      } else if (thePart == "TEC+" || thePart == "TEC-") {
+        if ((theStripDet->surface().position().phi() > 0.39 - theSearchPhiTEC) &&
+            (theStripDet->surface().position().phi() < 0.39 + theSearchPhiTEC)) {
+          theBeam = 0;
+        }  // beam 0
+
+        else if ((theStripDet->surface().position().phi() > 1.18 - theSearchPhiTEC) &&
+                 (theStripDet->surface().position().phi() < 1.18 + theSearchPhiTEC)) {
+          theBeam = 1;
+        }  // beam 1
+
+        else if ((theStripDet->surface().position().phi() > 1.96 - theSearchPhiTEC) &&
+                 (theStripDet->surface().position().phi() < 1.96 + theSearchPhiTEC)) {
+          theBeam = 2;
+        }  // beam 2
+
+        else if ((theStripDet->surface().position().phi() > 2.74 - theSearchPhiTEC) &&
+                 (theStripDet->surface().position().phi() < 2.74 + theSearchPhiTEC)) {
+          theBeam = 3;
+        }  // beam 3
+
+        else if ((theStripDet->surface().position().phi() > -2.74 - theSearchPhiTEC) &&
+                 (theStripDet->surface().position().phi() < -2.74 + theSearchPhiTEC)) {
+          theBeam = 4;
+        }  // beam 4
+
+        else if ((theStripDet->surface().position().phi() > -1.96 - theSearchPhiTEC) &&
+                 (theStripDet->surface().position().phi() < -1.96 + theSearchPhiTEC)) {
+          theBeam = 5;
+        }  // beam 5
+
+        else if ((theStripDet->surface().position().phi() > -1.18 - theSearchPhiTEC) &&
+                 (theStripDet->surface().position().phi() < -1.18 + theSearchPhiTEC)) {
+          theBeam = 6;
+        }  // beam 6
+
+        else if ((theStripDet->surface().position().phi() > -0.39 - theSearchPhiTEC) &&
+                 (theStripDet->surface().position().phi() < -0.39 + theSearchPhiTEC)) {
+          theBeam = 7;
+        }  // beam 7
+
+        else if ((theStripDet->surface().position().phi() > 1.28 - theSearchPhiTEC) &&
+                 (theStripDet->surface().position().phi() < 1.28 + theSearchPhiTEC)) {
+          theBeam = 21;
+        }  // beam 1 TEC2TEC
+
+        else if ((theStripDet->surface().position().phi() > 1.84 - theSearchPhiTEC) &&
+                 (theStripDet->surface().position().phi() < 1.84 + theSearchPhiTEC)) {
+          theBeam = 22;
+        }  // beam 2 TEC2TEC
+
+        else if ((theStripDet->surface().position().phi() > -2.59 - theSearchPhiTEC) &&
+                 (theStripDet->surface().position().phi() < -2.59 + theSearchPhiTEC)) {
+          theBeam = 24;
+        }  // beam 4 TEC2TEC
+
+        else if ((theStripDet->surface().position().phi() > -1.10 - theSearchPhiTEC) &&
+                 (theStripDet->surface().position().phi() < -1.10 + theSearchPhiTEC)) {
+          theBeam = 26;
+        }  // beam 6 TEC2TEC
+
+        else if ((theStripDet->surface().position().phi() > -0.50 - theSearchPhiTEC) &&
+                 (theStripDet->surface().position().phi() < -0.50 + theSearchPhiTEC)) {
+          theBeam = 27;
+        }  // beam 7 TEC2TEC
+        else {
+          theBeam = -1;
+        }  // probably not a Laser Hit!
+      }
+
+      //       if ( ( thePart == "TEC+" || thePart == "TEC-" ) && theEvents == 1
+      //       )
+      // 	{
+      // 	  cout << " theBeam = " << theBeam << " thePart = " << thePart
+      // << " theRing = " << theRing << " Disc = " << theTECWheel << endl;
+      // cout
+      // << " DetUnitId = " << theDetUnitID.rawId() << endl; 	  cout << " Phi
+      // of Det = " << theStripDet->surface().position().phi() << endl;
+
+      // 	}
+
+      // fill the histograms which will be fitted at the end of the run to
+      // reconstruct the laser profile
+
+      /* work with else if ... for all the parts and beams */
+      // ****** beam 0 in Ring 4
+      if ((thePart == "TEC+") && (theRing == 4) && (theBeam == 0)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam0Ring4Disc1PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam0Ring4Disc2PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam0Ring4Disc3PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam0Ring4Disc4PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam0Ring4Disc5PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam0Ring4Disc6PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam0Ring4Disc7PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam0Ring4Disc8PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam0Ring4Disc9PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 0 in Ring 4 ****
+
+      // **** Beam 1 in Ring 4 ****
+      else if ((thePart == "TEC+") && (theRing == 4) && (theBeam == 1)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam1Ring4Disc1PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam1Ring4Disc2PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam1Ring4Disc3PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam1Ring4Disc4PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam1Ring4Disc5PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam1Ring4Disc6PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam1Ring4Disc7PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam1Ring4Disc8PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam1Ring4Disc9PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** TEC2TEC
+      else if ((thePart == "TEC+") && (theRing == 4) && (theBeam == 21)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam1Ring4Disc1PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam1Ring4Disc2PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam1Ring4Disc3PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam1Ring4Disc4PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam1Ring4Disc5PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 1 in Ring 4 ****
+
+      // **** Beam 2 in Ring 4 ****
+      else if ((thePart == "TEC+") && (theRing == 4) && (theBeam == 2)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam2Ring4Disc1PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam2Ring4Disc2PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam2Ring4Disc3PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam2Ring4Disc4PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam2Ring4Disc5PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam2Ring4Disc6PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam2Ring4Disc7PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam2Ring4Disc8PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam2Ring4Disc9PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // TEC2TEC
+      // **** Beam 2 in Ring 4 ****
+      else if ((thePart == "TEC+") && (theRing == 4) && (theBeam == 22)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam2Ring4Disc1PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam2Ring4Disc2PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam2Ring4Disc3PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam2Ring4Disc4PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam2Ring4Disc5PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 2 in Ring 4 ****
+
+      // **** Beam 3 in Ring 4 ****
+      else if ((thePart == "TEC+") && (theRing == 4) && (theBeam == 3)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam3Ring4Disc1PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam3Ring4Disc2PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam3Ring4Disc3PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam3Ring4Disc4PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam3Ring4Disc5PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam3Ring4Disc6PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam3Ring4Disc7PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam3Ring4Disc8PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam3Ring4Disc9PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 3 in Ring 4 ****
+
+      // **** Beam 4 in Ring 4 ****
+      else if ((thePart == "TEC+") && (theRing == 4) && (theBeam == 4)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam4Ring4Disc1PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam4Ring4Disc2PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam4Ring4Disc3PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam4Ring4Disc4PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam4Ring4Disc5PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam4Ring4Disc6PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam4Ring4Disc7PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam4Ring4Disc8PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam4Ring4Disc9PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // TEC2TEC
+      else if ((thePart == "TEC+") && (theRing == 4) && (theBeam == 24)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam4Ring4Disc1PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam4Ring4Disc2PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam4Ring4Disc3PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam4Ring4Disc4PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam4Ring4Disc5PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 4 in Ring 4 ****
+
+      // **** Beam 5 in Ring 4 ****
+      else if ((thePart == "TEC+") && (theRing == 4) && (theBeam == 5)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam5Ring4Disc1PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam5Ring4Disc2PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam5Ring4Disc3PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam5Ring4Disc4PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam5Ring4Disc5PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam5Ring4Disc6PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam5Ring4Disc7PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam5Ring4Disc8PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam5Ring4Disc9PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 5 in Ring 4 ****
+
+      // **** Beam 6 in Ring 4 ****
+      else if ((thePart == "TEC+") && (theRing == 4) && (theBeam == 6)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam6Ring4Disc1PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam6Ring4Disc2PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam6Ring4Disc3PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam6Ring4Disc4PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam6Ring4Disc5PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam6Ring4Disc6PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam6Ring4Disc7PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam6Ring4Disc8PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam6Ring4Disc9PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // TEC2TEC
+      else if ((thePart == "TEC+") && (theRing == 4) && (theBeam == 26)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam6Ring4Disc1PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam6Ring4Disc2PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam6Ring4Disc3PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam6Ring4Disc4PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam6Ring4Disc5PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 6 in Ring 4 ****
+
+      // **** Beam 7 in Ring 4 ****
+      else if ((thePart == "TEC+") && (theRing == 4) && (theBeam == 7)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam7Ring4Disc1PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam7Ring4Disc2PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam7Ring4Disc3PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam7Ring4Disc4PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam7Ring4Disc5PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam7Ring4Disc6PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam7Ring4Disc7PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam7Ring4Disc8PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam7Ring4Disc9PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // TEC2TEC
+      else if ((thePart == "TEC+") && (theRing == 4) && (theBeam == 27)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam7Ring4Disc1PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam7Ring4Disc2PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam7Ring4Disc3PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam7Ring4Disc4PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam7Ring4Disc5PosTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 7 in Ring 4 ****
+
+      // **** Ring 6
+      else if ((thePart == "TEC+") && (theRing == 6) && (theBeam == 0)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam0Ring6Disc1PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam0Ring6Disc2PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam0Ring6Disc3PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam0Ring6Disc4PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam0Ring6Disc5PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam0Ring6Disc6PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam0Ring6Disc7PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam0Ring6Disc8PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam0Ring6Disc9PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 0 in Ring 6 ****
+
+      // **** Beam 1 in Ring 6 ****
+      else if ((thePart == "TEC+") && (theRing == 6) && (theBeam == 1)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam1Ring6Disc1PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam1Ring6Disc2PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam1Ring6Disc3PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam1Ring6Disc4PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam1Ring6Disc5PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam1Ring6Disc6PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam1Ring6Disc7PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam1Ring6Disc8PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam1Ring6Disc9PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 1 in Ring 6 ****
+
+      // **** Beam 2 in Ring 6 ****
+      else if ((thePart == "TEC+") && (theRing == 6) && (theBeam == 2)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam2Ring6Disc1PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam2Ring6Disc2PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam2Ring6Disc3PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam2Ring6Disc4PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam2Ring6Disc5PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam2Ring6Disc6PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam2Ring6Disc7PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam2Ring6Disc8PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam2Ring6Disc9PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 2 in Ring 6 ****
+
+      // **** Beam 3 in Ring 6 ****
+      else if ((thePart == "TEC+") && (theRing == 6) && (theBeam == 3)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam3Ring6Disc1PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam3Ring6Disc2PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam3Ring6Disc3PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam3Ring6Disc4PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam3Ring6Disc5PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam3Ring6Disc6PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam3Ring6Disc7PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam3Ring6Disc8PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam3Ring6Disc9PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 3 in Ring 6 ****
+
+      // **** Beam 4 in Ring 6 ****
+      else if ((thePart == "TEC+") && (theRing == 6) && (theBeam == 4)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam4Ring6Disc1PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam4Ring6Disc2PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam4Ring6Disc3PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam4Ring6Disc4PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam4Ring6Disc5PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam4Ring6Disc6PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam4Ring6Disc7PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam4Ring6Disc8PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam4Ring6Disc9PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 4 in Ring 6 ****
+
+      // **** Beam 5 in Ring 6 ****
+      else if ((thePart == "TEC+") && (theRing == 6) && (theBeam == 5)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam5Ring6Disc1PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam5Ring6Disc2PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam5Ring6Disc3PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam5Ring6Disc4PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam5Ring6Disc5PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam5Ring6Disc6PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam5Ring6Disc7PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam5Ring6Disc8PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam5Ring6Disc9PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 5 in Ring 6 ****
+
+      // **** Beam 6 in Ring 6 ****
+      else if ((thePart == "TEC+") && (theRing == 6) && (theBeam == 6)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam6Ring6Disc1PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam6Ring6Disc2PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam6Ring6Disc3PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam6Ring6Disc4PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam6Ring6Disc5PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam6Ring6Disc6PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam6Ring6Disc7PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam6Ring6Disc8PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam6Ring6Disc9PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 6 in Ring 6 ****
+
+      // **** Beam 7 in Ring 6 ****
+      else if ((thePart == "TEC+") && (theRing == 6) && (theBeam == 7)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam7Ring6Disc1PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam7Ring6Disc2PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam7Ring6Disc3PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam7Ring6Disc4PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam7Ring6Disc5PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam7Ring6Disc6PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam7Ring6Disc7PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam7Ring6Disc8PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam7Ring6Disc9PosAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 7 in Ring 6 ****
+
+      // ***** TEC- *****
+      else if ((thePart == "TEC-") && (theRing == 4) && (theBeam == 0)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam0Ring4Disc1NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam0Ring4Disc2NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam0Ring4Disc3NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam0Ring4Disc4NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam0Ring4Disc5NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam0Ring4Disc6NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam0Ring4Disc7NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam0Ring4Disc8NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam0Ring4Disc9NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 0 in Ring 4 ****
+
+      // **** Beam 1 in Ring 4 ****
+      else if ((thePart == "TEC-") && (theRing == 4) && (theBeam == 1)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam1Ring4Disc1NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam1Ring4Disc2NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam1Ring4Disc3NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam1Ring4Disc4NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam1Ring4Disc5NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam1Ring4Disc6NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam1Ring4Disc7NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam1Ring4Disc8NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam1Ring4Disc9NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** TEC2TEC
+      else if ((thePart == "TEC-") && (theRing == 4) && (theBeam == 21)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam1Ring4Disc1NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam1Ring4Disc2NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam1Ring4Disc3NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam1Ring4Disc4NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam1Ring4Disc5NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 1 in Ring 4 ****
+
+      // **** Beam 2 in Ring 4 ****
+      else if ((thePart == "TEC-") && (theRing == 4) && (theBeam == 2)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam2Ring4Disc1NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam2Ring4Disc2NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam2Ring4Disc3NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam2Ring4Disc4NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam2Ring4Disc5NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam2Ring4Disc6NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam2Ring4Disc7NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam2Ring4Disc8NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam2Ring4Disc9NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // TEC2TEC
+      // **** Beam 2 in Ring 4 ****
+      else if ((thePart == "TEC-") && (theRing == 4) && (theBeam == 22)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam2Ring4Disc1NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam2Ring4Disc2NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam2Ring4Disc3NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam2Ring4Disc4NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam2Ring4Disc5NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 2 in Ring 4 ****
+
+      // **** Beam 3 in Ring 4 ****
+      else if ((thePart == "TEC-") && (theRing == 4) && (theBeam == 3)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam3Ring4Disc1NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam3Ring4Disc2NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam3Ring4Disc3NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam3Ring4Disc4NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam3Ring4Disc5NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam3Ring4Disc6NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam3Ring4Disc7NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam3Ring4Disc8NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam3Ring4Disc9NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 3 in Ring 4 ****
+
+      // **** Beam 4 in Ring 4 ****
+      else if ((thePart == "TEC-") && (theRing == 4) && (theBeam == 4)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam4Ring4Disc1NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam4Ring4Disc2NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam4Ring4Disc3NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam4Ring4Disc4NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam4Ring4Disc5NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam4Ring4Disc6NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam4Ring4Disc7NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam4Ring4Disc8NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam4Ring4Disc9NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // TEC2TEC
+      else if ((thePart == "TEC-") && (theRing == 4) && (theBeam == 24)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam4Ring4Disc1NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam4Ring4Disc2NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam4Ring4Disc3NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam4Ring4Disc4NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam4Ring4Disc5NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 4 in Ring 4 ****
+
+      // **** Beam 5 in Ring 4 ****
+      else if ((thePart == "TEC-") && (theRing == 4) && (theBeam == 5)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam5Ring4Disc1NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam5Ring4Disc2NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam5Ring4Disc3NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam5Ring4Disc4NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam5Ring4Disc5NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam5Ring4Disc6NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam5Ring4Disc7NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam5Ring4Disc8NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam5Ring4Disc9NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 5 in Ring 4 ****
+
+      // **** Beam 6 in Ring 4 ****
+      else if ((thePart == "TEC-") && (theRing == 4) && (theBeam == 6)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam6Ring4Disc1NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam6Ring4Disc2NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam6Ring4Disc3NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam6Ring4Disc4NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam6Ring4Disc5NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam6Ring4Disc6NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam6Ring4Disc7NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam6Ring4Disc8NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam6Ring4Disc9NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // TEC2TEC
+      else if ((thePart == "TEC-") && (theRing == 4) && (theBeam == 26)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam6Ring4Disc1NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam6Ring4Disc2NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam6Ring4Disc3NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam6Ring4Disc4NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam6Ring4Disc5NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 6 in Ring 4 ****
+
+      // **** Beam 7 in Ring 4 ****
+      else if ((thePart == "TEC-") && (theRing == 4) && (theBeam == 7)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam7Ring4Disc1NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam7Ring4Disc2NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam7Ring4Disc3NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam7Ring4Disc4NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam7Ring4Disc5NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam7Ring4Disc6NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam7Ring4Disc7NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam7Ring4Disc8NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam7Ring4Disc9NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // TEC2TEC
+      else if ((thePart == "TEC-") && (theRing == 4) && (theBeam == 27)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam7Ring4Disc1NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam7Ring4Disc2NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam7Ring4Disc3NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam7Ring4Disc4NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam7Ring4Disc5NegTEC2TECAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 7 in Ring 4 ****
+
+      // **** Ring 6
+      else if ((thePart == "TEC-") && (theRing == 6) && (theBeam == 0)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam0Ring6Disc1NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam0Ring6Disc2NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam0Ring6Disc3NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam0Ring6Disc4NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam0Ring6Disc5NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam0Ring6Disc6NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam0Ring6Disc7NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam0Ring6Disc8NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam0Ring6Disc9NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 0 in Ring 6 ****
+
+      // **** Beam 1 in Ring 6 ****
+      else if ((thePart == "TEC-") && (theRing == 6) && (theBeam == 1)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam1Ring6Disc1NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam1Ring6Disc2NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam1Ring6Disc3NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam1Ring6Disc4NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam1Ring6Disc5NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam1Ring6Disc6NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam1Ring6Disc7NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam1Ring6Disc8NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam1Ring6Disc9NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 1 in Ring 6 ****
+
+      // **** Beam 2 in Ring 6 ****
+      else if ((thePart == "TEC-") && (theRing == 6) && (theBeam == 2)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam2Ring6Disc1NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam2Ring6Disc2NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam2Ring6Disc3NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam2Ring6Disc4NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam2Ring6Disc5NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam2Ring6Disc6NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam2Ring6Disc7NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam2Ring6Disc8NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam2Ring6Disc9NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 2 in Ring 6 ****
+
+      // **** Beam 3 in Ring 6 ****
+      else if ((thePart == "TEC-") && (theRing == 6) && (theBeam == 3)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam3Ring6Disc1NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam3Ring6Disc2NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam3Ring6Disc3NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam3Ring6Disc4NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam3Ring6Disc5NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam3Ring6Disc6NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam3Ring6Disc7NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam3Ring6Disc8NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam3Ring6Disc9NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 3 in Ring 6 ****
+
+      // **** Beam 4 in Ring 6 ****
+      else if ((thePart == "TEC-") && (theRing == 6) && (theBeam == 4)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam4Ring6Disc1NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam4Ring6Disc2NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam4Ring6Disc3NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam4Ring6Disc4NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam4Ring6Disc5NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam4Ring6Disc6NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam4Ring6Disc7NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam4Ring6Disc8NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam4Ring6Disc9NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 4 in Ring 6 ****
+
+      // **** Beam 5 in Ring 6 ****
+      else if ((thePart == "TEC-") && (theRing == 6) && (theBeam == 5)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam5Ring6Disc1NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam5Ring6Disc2NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam5Ring6Disc3NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam5Ring6Disc4NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam5Ring6Disc5NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam5Ring6Disc6NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam5Ring6Disc7NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam5Ring6Disc8NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam5Ring6Disc9NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 5 in Ring 6 ****
+
+      // **** Beam 6 in Ring 6 ****
+      else if ((thePart == "TEC-") && (theRing == 6) && (theBeam == 6)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam6Ring6Disc1NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam6Ring6Disc2NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam6Ring6Disc3NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam6Ring6Disc4NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam6Ring6Disc5NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam6Ring6Disc6NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam6Ring6Disc7NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam6Ring6Disc8NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam6Ring6Disc9NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 6 in Ring 6 ****
+
+      // **** Beam 7 in Ring 6 ****
+      else if ((thePart == "TEC-") && (theRing == 6) && (theBeam == 7)) {
+        if (theTECWheel == 1) {
+          fillAdcCounts(theMEBeam7Ring6Disc1NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 2) {
+          fillAdcCounts(theMEBeam7Ring6Disc2NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 3) {
+          fillAdcCounts(theMEBeam7Ring6Disc3NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 4) {
+          fillAdcCounts(theMEBeam7Ring6Disc4NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 5) {
+          fillAdcCounts(theMEBeam7Ring6Disc5NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 6) {
+          fillAdcCounts(theMEBeam7Ring6Disc6NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 7) {
+          fillAdcCounts(theMEBeam7Ring6Disc7NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 8) {
+          fillAdcCounts(theMEBeam7Ring6Disc8NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if (theTECWheel == 9) {
+          fillAdcCounts(theMEBeam7Ring6Disc9NegAdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of beam 7 in Ring 6 ****
+
+      // ***** TOB *****
+      // **** Beam 0 in TOB ****
+      else if ((thePart == "TOB") && (theTOBLayer == 1) && (theBeam == 0) && (theTOBStereoDet == 0) &&
+               (theStripDet->surface().position().perp() < 58.5)) {
+        if ((theStripDet->surface().position().z() > 99.0 - theSearchZTOB) &&
+            (theStripDet->surface().position().z() < 99.0 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam0TOBPosition1AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 64.0 - theSearchZTOB) &&
+                   (theStripDet->surface().position().z() < 64.0 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam0TOBPosition2AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 27.5 - theSearchZTOB) &&
+                   (theStripDet->surface().position().z() < 27.5 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam0TOBPosition3AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -10.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -10.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam0TOBPosition4AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -46.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -46.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam0TOBPosition5AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -80.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -80.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam0TOBPosition6AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of Beam 0 in TOB ****
+
+      // **** Beam 1 in TOB ****
+      else if ((thePart == "TOB") && (theTOBLayer == 1) && (theBeam == 1) && (theTOBStereoDet == 0) &&
+               (theStripDet->surface().position().perp() < 58.5)) {
+        if ((theStripDet->surface().position().z() > 99.0 - theSearchZTOB) &&
+            (theStripDet->surface().position().z() < 99.0 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam1TOBPosition1AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 64.0 - theSearchZTOB) &&
+                   (theStripDet->surface().position().z() < 64.0 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam1TOBPosition2AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 27.5 - theSearchZTOB) &&
+                   (theStripDet->surface().position().z() < 27.5 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam1TOBPosition3AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -10.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -10.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam1TOBPosition4AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -46.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -46.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam1TOBPosition5AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -80.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -80.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam1TOBPosition6AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of Beam 1 in TOB ****
+
+      // **** Beam 2 in TOB ****
+      else if ((thePart == "TOB") && (theTOBLayer == 1) && (theBeam == 2) && (theTOBStereoDet == 0) &&
+               (theStripDet->surface().position().perp() < 58.5)) {
+        if ((theStripDet->surface().position().z() > 99.0 - theSearchZTOB) &&
+            (theStripDet->surface().position().z() < 99.0 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam2TOBPosition1AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 64.0 - theSearchZTOB) &&
+                   (theStripDet->surface().position().z() < 64.0 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam2TOBPosition2AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 27.5 - theSearchZTOB) &&
+                   (theStripDet->surface().position().z() < 27.5 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam2TOBPosition3AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -10.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -10.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam2TOBPosition4AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -46.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -46.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam2TOBPosition5AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -80.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -80.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam2TOBPosition6AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of Beam 2 in TOB ****
+
+      // **** Beam 3 in TOB ****
+      else if ((thePart == "TOB") && (theTOBLayer == 1) && (theBeam == 3) && (theTOBStereoDet == 0) &&
+               (theStripDet->surface().position().perp() < 58.5)) {
+        if ((theStripDet->surface().position().z() > 99.0 - theSearchZTOB) &&
+            (theStripDet->surface().position().z() < 99.0 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam3TOBPosition1AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 64.0 - theSearchZTOB) &&
+                   (theStripDet->surface().position().z() < 64.0 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam3TOBPosition2AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 27.5 - theSearchZTOB) &&
+                   (theStripDet->surface().position().z() < 27.5 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam3TOBPosition3AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -10.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -10.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam3TOBPosition4AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -46.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -46.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam3TOBPosition5AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -80.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -80.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam3TOBPosition6AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of Beam 3 in TOB ****
+
+      // **** Beam 4 in TOB ****
+      else if ((thePart == "TOB") && (theTOBLayer == 1) && (theBeam == 4) && (theTOBStereoDet == 0) &&
+               (theStripDet->surface().position().perp() < 58.5)) {
+        if ((theStripDet->surface().position().z() > 99.0 - theSearchZTOB) &&
+            (theStripDet->surface().position().z() < 99.0 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam4TOBPosition1AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 64.0 - theSearchZTOB) &&
+                   (theStripDet->surface().position().z() < 64.0 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam4TOBPosition2AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 27.5 - theSearchZTOB) &&
+                   (theStripDet->surface().position().z() < 27.5 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam4TOBPosition3AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -10.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -10.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam4TOBPosition4AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -46.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -46.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam4TOBPosition5AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -80.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -80.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam4TOBPosition6AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of Beam 4 in TOB ****
+
+      // **** Beam 5 in TOB ****
+      else if ((thePart == "TOB") && (theTOBLayer == 1) && (theBeam == 5) && (theTOBStereoDet == 0) &&
+               (theStripDet->surface().position().perp() < 58.5)) {
+        if ((theStripDet->surface().position().z() > 99.0 - theSearchZTOB) &&
+            (theStripDet->surface().position().z() < 99.0 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam5TOBPosition1AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 64.0 - theSearchZTOB) &&
+                   (theStripDet->surface().position().z() < 64.0 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam5TOBPosition2AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 27.5 - theSearchZTOB) &&
+                   (theStripDet->surface().position().z() < 27.5 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam5TOBPosition3AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -10.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -10.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam5TOBPosition4AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -46.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -46.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam5TOBPosition5AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -80.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -80.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam5TOBPosition6AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of Beam 5 in TOB ****
+
+      // **** Beam 6 in TOB ****
+      else if ((thePart == "TOB") && (theTOBLayer == 1) && (theBeam == 6) && (theTOBStereoDet == 0) &&
+               (theStripDet->surface().position().perp() < 58.5)) {
+        if ((theStripDet->surface().position().z() > 99.0 - theSearchZTOB) &&
+            (theStripDet->surface().position().z() < 99.0 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam6TOBPosition1AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 64.0 - theSearchZTOB) &&
+                   (theStripDet->surface().position().z() < 64.0 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam6TOBPosition2AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 27.5 - theSearchZTOB) &&
+                   (theStripDet->surface().position().z() < 27.5 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam6TOBPosition3AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -10.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -10.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam6TOBPosition4AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -46.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -46.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam6TOBPosition5AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -80.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -80.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam6TOBPosition6AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of Beam 6 in TOB ****
+
+      // **** Beam 7 in TOB ****
+      else if ((thePart == "TOB") && (theTOBLayer == 1) && (theBeam == 7) && (theTOBStereoDet == 0) &&
+               (theStripDet->surface().position().perp() < 58.5)) {
+        if ((theStripDet->surface().position().z() > 99.0 - theSearchZTOB) &&
+            (theStripDet->surface().position().z() < 99.0 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam7TOBPosition1AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 64.0 - theSearchZTOB) &&
+                   (theStripDet->surface().position().z() < 64.0 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam7TOBPosition2AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 27.5 - theSearchZTOB) &&
+                   (theStripDet->surface().position().z() < 27.5 + theSearchZTOB)) {
+          fillAdcCounts(theMEBeam7TOBPosition3AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -10.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -10.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam7TOBPosition4AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -46.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -46.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam7TOBPosition5AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -80.0 + theSearchZTOB) &&
+                   (theStripDet->surface().position().z() > -80.0 - theSearchZTOB)) {
+          fillAdcCounts(theMEBeam7TOBPosition6AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of Beam 7 in TOB ****
+
+      // ***** TIB *****
+      // **** Beam 0 in TIB ****
+      else if ((thePart == "TIB") && (theTIBLayer == 4) && (theBeam == 0)) {
+        if ((theStripDet->surface().position().z() > 60.5 - theSearchZTIB) &&
+            (theStripDet->surface().position().z() < 60.5 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam0TIBPosition1AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 37.5 - theSearchZTIB) &&
+                   (theStripDet->surface().position().z() < 37.5 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam0TIBPosition2AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 15.0 - theSearchZTIB) &&
+                   (theStripDet->surface().position().z() < 15.0 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam0TIBPosition3AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -7.5 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -7.5 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam0TIBPosition4AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -30.5 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -30.5 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam0TIBPosition5AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -53.0 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -53.0 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam0TIBPosition6AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of Beam 0 in TIB ****
+
+      // **** Beam 1 in TIB ****
+      else if ((thePart == "TIB") && (theTIBLayer == 4) && (theBeam == 1)) {
+        if ((theStripDet->surface().position().z() > 60.5 - theSearchZTIB) &&
+            (theStripDet->surface().position().z() < 60.5 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam1TIBPosition1AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 37.5 - theSearchZTIB) &&
+                   (theStripDet->surface().position().z() < 37.5 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam1TIBPosition2AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 15.0 - theSearchZTIB) &&
+                   (theStripDet->surface().position().z() < 15.0 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam1TIBPosition3AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -7.5 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -7.5 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam1TIBPosition4AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -30.5 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -30.5 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam1TIBPosition5AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -53.0 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -53.0 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam1TIBPosition6AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of Beam 1 in TIB ****
+
+      // **** Beam 2 in TIB ****
+      else if ((thePart == "TIB") && (theTIBLayer == 4) && (theBeam == 2)) {
+        if ((theStripDet->surface().position().z() > 60.5 - theSearchZTIB) &&
+            (theStripDet->surface().position().z() < 60.5 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam2TIBPosition1AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 37.5 - theSearchZTIB) &&
+                   (theStripDet->surface().position().z() < 37.5 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam2TIBPosition2AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 15.0 - theSearchZTIB) &&
+                   (theStripDet->surface().position().z() < 15.0 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam2TIBPosition3AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -7.5 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -7.5 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam2TIBPosition4AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -30.5 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -30.5 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam2TIBPosition5AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -53.0 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -53.0 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam2TIBPosition6AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of Beam 2 in TIB ****
+
+      // **** Beam 3 in TIB ****
+      else if ((thePart == "TIB") && (theTIBLayer == 4) && (theBeam == 3)) {
+        if ((theStripDet->surface().position().z() > 60.5 - theSearchZTIB) &&
+            (theStripDet->surface().position().z() < 60.5 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam3TIBPosition1AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 37.5 - theSearchZTIB) &&
+                   (theStripDet->surface().position().z() < 37.5 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam3TIBPosition2AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 15.0 - theSearchZTIB) &&
+                   (theStripDet->surface().position().z() < 15.0 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam3TIBPosition3AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -7.5 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -7.5 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam3TIBPosition4AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -30.5 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -30.5 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam3TIBPosition5AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -53.0 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -53.0 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam3TIBPosition6AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of Beam 3 in TIB ****
+
+      // **** Beam 4 in TIB ****
+      else if ((thePart == "TIB") && (theTIBLayer == 4) && (theBeam == 4)) {
+        if ((theStripDet->surface().position().z() > 60.5 - theSearchZTIB) &&
+            (theStripDet->surface().position().z() < 60.5 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam4TIBPosition1AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 37.5 - theSearchZTIB) &&
+                   (theStripDet->surface().position().z() < 37.5 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam4TIBPosition2AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 15.0 - theSearchZTIB) &&
+                   (theStripDet->surface().position().z() < 15.0 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam4TIBPosition3AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -7.5 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -7.5 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam4TIBPosition4AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -30.5 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -30.5 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam4TIBPosition5AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -53.0 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -53.0 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam4TIBPosition6AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of Beam 4 in TIB ****
+
+      // **** Beam 5 in TIB ****
+      else if ((thePart == "TIB") && (theTIBLayer == 4) && (theBeam == 5)) {
+        if ((theStripDet->surface().position().z() > 60.5 - theSearchZTIB) &&
+            (theStripDet->surface().position().z() < 60.5 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam5TIBPosition1AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 37.5 - theSearchZTIB) &&
+                   (theStripDet->surface().position().z() < 37.5 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam5TIBPosition2AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 15.0 - theSearchZTIB) &&
+                   (theStripDet->surface().position().z() < 15.0 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam5TIBPosition3AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -7.5 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -7.5 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam5TIBPosition4AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -30.5 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -30.5 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam5TIBPosition5AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -53.0 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -53.0 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam5TIBPosition6AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of Beam 5 in TIB ****
+
+      // **** Beam 6 in TIB ****
+      else if ((thePart == "TIB") && (theTIBLayer == 4) && (theBeam == 6)) {
+        if ((theStripDet->surface().position().z() > 60.5 - theSearchZTIB) &&
+            (theStripDet->surface().position().z() < 60.5 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam6TIBPosition1AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 37.5 - theSearchZTIB) &&
+                   (theStripDet->surface().position().z() < 37.5 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam6TIBPosition2AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 15.0 - theSearchZTIB) &&
+                   (theStripDet->surface().position().z() < 15.0 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam6TIBPosition3AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -7.5 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -7.5 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam6TIBPosition4AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -30.5 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -30.5 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam6TIBPosition5AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -53.0 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -53.0 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam6TIBPosition6AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of Beam 6 in TIB ****
+
+      // **** Beam 7 in TIB ****
+      else if ((thePart == "TIB") && (theTIBLayer == 4) && (theBeam == 7)) {
+        if ((theStripDet->surface().position().z() > 60.5 - theSearchZTIB) &&
+            (theStripDet->surface().position().z() < 60.5 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam7TIBPosition1AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 37.5 - theSearchZTIB) &&
+                   (theStripDet->surface().position().z() < 37.5 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam7TIBPosition2AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() > 15.0 - theSearchZTIB) &&
+                   (theStripDet->surface().position().z() < 15.0 + theSearchZTIB)) {
+          fillAdcCounts(theMEBeam7TIBPosition3AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -7.5 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -7.5 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam7TIBPosition4AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -30.5 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -30.5 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam7TIBPosition5AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        } else if ((theStripDet->surface().position().z() < -53.0 + theSearchZTIB) &&
+                   (theStripDet->surface().position().z() > -53.0 - theSearchZTIB)) {
+          fillAdcCounts(theMEBeam7TIBPosition6AdcCounts, theDigiRangeIterator, theDigiRangeIteratorEnd);
+        }
+      }
+      // **** end of Beam 7 in TIB ****
     }
+  }
 }
diff --git a/Alignment/MillePedeAlignmentAlgorithm/src/MillePedeMonitor.cc b/Alignment/MillePedeAlignmentAlgorithm/src/MillePedeMonitor.cc
index 31bdf09a8052a..70eaa66606db0 100644
--- a/Alignment/MillePedeAlignmentAlgorithm/src/MillePedeMonitor.cc
+++ b/Alignment/MillePedeAlignmentAlgorithm/src/MillePedeMonitor.cc
@@ -300,41 +300,41 @@ bool MillePedeMonitor::init(TDirectory *directory)
                                     51, -TMath::Pi(), TMath::Pi(), 101, -14., 14.));
   
 //   myResidHists2D.push_back(new TProfile2D("residXProfXy",
-// 					  "mean |residuum| (u);x [cm];y [cm];#LT|residuum|#GT",
-// 					  25, -110., 110., 25, -110., 110.));
+//                                        "mean |residuum| (u);x [cm];y [cm];#LT|residuum|#GT",
+//                                        25, -110., 110., 25, -110., 110.));
 //   myResidHists2D.push_back(new TProfile2D("residXProfZr",
-// 					  "mean |residuum| (u);z [cm];r_{#pm} [cm];#LT|residuum|#GT",
-// 					  25, -275., 275., 25, -110., 110.));
+//                                        "mean |residuum| (u);z [cm];r_{#pm} [cm];#LT|residuum|#GT",
+//                                        25, -275., 275., 25, -110., 110.));
 //   myResidHists2D.push_back(new TProfile2D("residYProfXy",
-// 					  "mean |residuum| (v);x [cm];y [cm];#LT|residuum|#GT",
-// 					  25, -110., 110., 25, -110., 110.));
+//                                        "mean |residuum| (v);x [cm];y [cm];#LT|residuum|#GT",
+//                                        25, -110., 110., 25, -110., 110.));
 //   myResidHists2D.push_back(new TProfile2D("residYProfZr",
-// 					  "mean |residuum| (v);z [cm];r_{#pm} [cm];#LT|residuum|#GT",
-// 					  25, -275., 275., 25, -110., 110.));
+//                                        "mean |residuum| (v);z [cm];r_{#pm} [cm];#LT|residuum|#GT",
+//                                        25, -275., 275., 25, -110., 110.));
 //   myResidHists2D.push_back(new TProfile2D("reduResidXProfXy",
-// 					  "mean |residuum/#sigma| (u);x [cm];y [cm];#LT|res./#sigma|#GT",
-// 					  25, -110., 110., 25, -110., 110.));
+//                                        "mean |residuum/#sigma| (u);x [cm];y [cm];#LT|res./#sigma|#GT",
+//                                        25, -110., 110., 25, -110., 110.));
 //   myResidHists2D.push_back(new TProfile2D("reduResidXProfZr",
-// 					  "mean |residuum/#sigma| (u);z [cm];r_{#pm} [cm];#LT|res./#sigma|#GT",
-// 					  25, -275., 275., 25, -110., 110.));
+//                                        "mean |residuum/#sigma| (u);z [cm];r_{#pm} [cm];#LT|res./#sigma|#GT",
+//                                        25, -275., 275., 25, -110., 110.));
 //   myResidHists2D.push_back(new TProfile2D("reduResidYProfXy",
-// 					  "mean |residuum/#sigma| (v);x [cm];y [cm];#LT|res./#sigma|#GT",
-// 					  25, -110., 110., 25, -110., 110.));
+//                                        "mean |residuum/#sigma| (v);x [cm];y [cm];#LT|res./#sigma|#GT",
+//                                        25, -110., 110., 25, -110., 110.));
 //   myResidHists2D.push_back(new TProfile2D("reduResidYProfZr",
-// 					  "mean |residuum/#sigma| (v);z [cm];r_{#pm} [cm];#LT|res./#sigma|#GT",
-// 					  25, -275., 275., 25, -110., 110.));
+//                                        "mean |residuum/#sigma| (v);z [cm];r_{#pm} [cm];#LT|res./#sigma|#GT",
+//                                        25, -275., 275., 25, -110., 110.));
 //   myResidHists2D.push_back(new TProfile2D("sigmaXProfXy",
-// 					  "mean sigma (u);x [cm];y [cm];#LT#sigma#GT",
-// 					  25, -110., 110., 25, -110., 110.));
+//                                        "mean sigma (u);x [cm];y [cm];#LT#sigma#GT",
+//                                        25, -110., 110., 25, -110., 110.));
 //   myResidHists2D.push_back(new TProfile2D("sigmaXProfZr",
-// 					  "mean sigma (u);z [cm];r_{#pm} [cm];#LT#sigma#GT",
-// 					  25, -275., 275., 25, -110., 110.));
+//                                        "mean sigma (u);z [cm];r_{#pm} [cm];#LT#sigma#GT",
+//                                        25, -275., 275., 25, -110., 110.));
 //   myResidHists2D.push_back(new TProfile2D("sigmaYProfXy",
-// 					  "mean sigma (v);x [cm];y [cm];#LT#sigma#GT",
-// 					  25, -110., 110., 25, -110., 110.));
+//                                        "mean sigma (v);x [cm];y [cm];#LT#sigma#GT",
+//                                        25, -110., 110., 25, -110., 110.));
 //   myResidHists2D.push_back(new TProfile2D("sigmaYProfZr",
-// 					  "mean sigma (v);z [cm];r_{#pm} [cm];#LT#sigma#GT",
-// 					  25, -275., 275., 25, -110., 110.));
+//                                        "mean sigma (v);z [cm];r_{#pm} [cm];#LT#sigma#GT",
+//                                        25, -275., 275., 25, -110., 110.));
   
   TDirectory *dirResid = directory->mkdir("residuals", "hit residuals, sigma,...");
   this->addToDirectory(myResidHists2D, dirResid);
diff --git a/Alignment/OfflineValidation/macros/FitPVResiduals.C b/Alignment/OfflineValidation/macros/FitPVResiduals.C
index 04380fd6fc981..0bedd8fdeacf3 100644
--- a/Alignment/OfflineValidation/macros/FitPVResiduals.C
+++ b/Alignment/OfflineValidation/macros/FitPVResiduals.C
@@ -43,7 +43,7 @@
 #include <TSystem.h>
 #include <TTimeStamp.h>
 #include <TStopwatch.h>
-//#include "Alignment/OfflineValidation/plugins/TkAlStyle.cc" 
+//#include "Alignment/OfflineValidation/macros/TkAlStyle.cc" 
 #include "Alignment/OfflineValidation/macros/CMS_lumi.C"
 #include "Alignment/OfflineValidation/interface/PVValidationHelpers.h"
 
diff --git a/Alignment/OfflineValidation/macros/PlotAlignmentValidation.C b/Alignment/OfflineValidation/macros/PlotAlignmentValidation.C
index 210fcbea574f5..15742c9108570 100644
--- a/Alignment/OfflineValidation/macros/PlotAlignmentValidation.C
+++ b/Alignment/OfflineValidation/macros/PlotAlignmentValidation.C
@@ -1,6 +1,6 @@
 #include "Alignment/OfflineValidation/macros/PlotAlignmentValidation.h"
 
-#include "Alignment/OfflineValidation/plugins/TkAlStyle.cc"
+#include "Alignment/OfflineValidation/macros/TkAlStyle.cc"
 #include "Alignment/OfflineValidation/interface/TkOffTreeVariables.h"
 
 #include "Math/ProbFunc.h"
diff --git a/Alignment/OfflineValidation/plugins/TkAlStyle.cc b/Alignment/OfflineValidation/macros/TkAlStyle.cc
similarity index 100%
rename from Alignment/OfflineValidation/plugins/TkAlStyle.cc
rename to Alignment/OfflineValidation/macros/TkAlStyle.cc
diff --git a/Alignment/OfflineValidation/macros/trackSplitPlot.C b/Alignment/OfflineValidation/macros/trackSplitPlot.C
index 69a8d23dfb459..1e48e0ee52a1e 100644
--- a/Alignment/OfflineValidation/macros/trackSplitPlot.C
+++ b/Alignment/OfflineValidation/macros/trackSplitPlot.C
@@ -9,7 +9,7 @@ Table Of Contents
 ***********************************/
 
 #include "trackSplitPlot.h"
-#include "Alignment/OfflineValidation/plugins/TkAlStyle.cc"
+#include "Alignment/OfflineValidation/macros/TkAlStyle.cc"
 
 //===================
 //0. Track Split Plot
diff --git a/Alignment/OfflineValidation/plugins/BuildFile.xml b/Alignment/OfflineValidation/plugins/BuildFile.xml
index 064c770a2d40b..4f0b263865cc5 100644
--- a/Alignment/OfflineValidation/plugins/BuildFile.xml
+++ b/Alignment/OfflineValidation/plugins/BuildFile.xml
@@ -47,9 +47,7 @@
 <use   name="root"/>
 <use   name="TrackingTools/TrackAssociator"/>
 <use   name="Geometry/CaloGeometry"/>
-<use   name="rootgraphics"/>
 <use   name="rootmath"/>
-<use   name="rootinteractive"/>
 <use   name="rootrflx"/>
 <use   name="rootcore"/>
 <use   name="boost"/>
diff --git a/Alignment/OfflineValidation/plugins/OverlapValidation.cc b/Alignment/OfflineValidation/plugins/OverlapValidation.cc
new file mode 100644
index 0000000000000..a5939f61e8304
--- /dev/null
+++ b/Alignment/OfflineValidation/plugins/OverlapValidation.cc
@@ -0,0 +1,874 @@
+// -*- C++ -*-
+//
+// Package:    Alignment/OfflineValidation
+// Class:      OverlapValidation
+// 
+/**\ Alignment/OfflineValidation/src/OverlapValidation.cc
+
+ Description: <one line class summary>
+	
+*/
+//
+// Original Authors:  Wolfgang Adam, Keith Ulmer
+//         Created:  Thu Oct 11 14:53:32 CEST 2007
+// $Id: OverlapValidation.cc,v 1.16 2009/11/04 19:40:27 kaulmer Exp $
+//
+//
+ 
+
+// system include files
+#include <memory>
+
+// user include files
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+#include "MagneticField/Engine/interface/MagneticField.h"
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "CommonTools/UtilAlgos/interface/TFileService.h"
+
+#include "CommonTools/Statistics/interface/ChiSquaredProbability.h"
+#include "FWCore/ParameterSet/interface/FileInPath.h"
+#include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
+
+#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
+#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
+#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
+
+#include  "DataFormats/TrackReco/interface/TrackFwd.h"
+#include  "DataFormats/TrackReco/interface/Track.h"
+#include  "DataFormats/TrackReco/interface/TrackExtra.h"
+#include  "DataFormats/TrackReco/interface/TrackExtraFwd.h"
+#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
+#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
+#include "DataFormats/DetId/interface/DetId.h" 
+#include "DataFormats/SiPixelDetId/interface/PXBDetId.h"
+#include "DataFormats/SiPixelDetId/interface/PXFDetId.h"
+#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
+#include "TrackingTools/PatternTools/interface/Trajectory.h"
+#include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h"
+#include "RecoTracker/TransientTrackingRecHit/interface/TSiStripMatchedRecHit.h"
+#include "RecoTracker/TransientTrackingRecHit/interface/ProjectedRecHit2D.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
+#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
+
+#include "TrackingTools/GeomPropagators/interface/AnalyticalPropagator.h"
+#include "TrackingTools/AnalyticalJacobians/interface/JacobianLocalToCurvilinear.h"
+#include "TrackingTools/AnalyticalJacobians/interface/JacobianCurvilinearToLocal.h"
+#include "TrackingTools/AnalyticalJacobians/interface/AnalyticalCurvilinearJacobian.h"
+#include "TrackingTools/TrackFitters/interface/TrajectoryStateCombiner.h"
+#include "DataFormats/GeometryVector/interface/LocalPoint.h"
+#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
+#include "DataFormats/SiStripDetId/interface/SiStripDetId.h"
+#include "Alignment/TrackerAlignment/interface/TrackerAlignableId.h"
+#include "TFile.h"
+#include "TTree.h"
+
+#include <vector>
+#include <utility>
+
+using namespace std;
+//
+// class decleration
+//
+
+
+class OverlapValidation : public edm::one::EDAnalyzer<> {
+public:
+  explicit OverlapValidation(const edm::ParameterSet&);
+  ~OverlapValidation() override;
+
+private:
+  typedef vector<Trajectory> TrajectoryCollection;
+
+  
+
+  edm::EDGetTokenT<TrajectoryCollection> trajectoryToken_;
+  typedef TransientTrackingRecHit::ConstRecHitPointer ConstRecHitPointer;
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void endJob() override ;
+
+  virtual void analyze(const Trajectory&, const Propagator&, TrackerHitAssociator&, const TrackerTopology* const tTopo);
+  int layerFromId (const DetId&,  const TrackerTopology* const tTopo) const;
+
+  // ----------member data ---------------------------
+  edm::ParameterSet config_;
+  edm::InputTag trajectoryTag_;
+  SiStripDetInfoFileReader* reader;
+  bool doSimHit_;
+  const TrackerGeometry* trackerGeometry_;
+  const MagneticField* magField_;
+
+  TrajectoryStateCombiner combiner_;
+  int overlapCounts_[3];
+
+  TTree* rootTree_;
+  edm::FileInPath FileInPath_;
+  const bool addExtraBranches_;
+  const int minHitsCut_;
+  const float chi2ProbCut_;
+
+  float overlapPath_;
+  uint layer_;
+  unsigned short hitCounts_[2];
+  float chi2_[2];
+  unsigned int overlapIds_[2];
+  float predictedPositions_[3][2];
+  float predictedLocalParameters_[5][2];
+  float predictedLocalErrors_[5][2];
+  float predictedDeltaXError_;
+  float predictedDeltaYError_;
+  char relativeXSign_;
+  char relativeYSign_;
+  float hitPositions_[2];
+  float hitErrors_[2];
+  float hitPositionsY_[2];
+  float hitErrorsY_[2];
+  float simHitPositions_[2];
+  float simHitPositionsY_[2];
+  float clusterWidthX_[2];
+  float clusterWidthY_[2];
+  float clusterSize_[2];
+  uint clusterCharge_[2];
+  int edge_[2];
+  
+  vector<bool> acceptLayer;
+  float momentum_;
+  uint run_, event_;
+  bool barrelOnly_;
+
+  //added by Heshy and Jared
+  float moduleX_[2];
+  float moduleY_[2];
+  float moduleZ_[2];
+  int subdetID;
+  const Point2DBase<float, LocalTag> zerozero = Point2DBase<float, LocalTag>(0, 0);
+  const Point2DBase<float, LocalTag> onezero = Point2DBase<float, LocalTag>(1, 0);
+  const Point2DBase<float, LocalTag> zeroone = Point2DBase<float, LocalTag>(0, 1);
+  //added by Jason
+  float localxdotglobalphi_[2];
+  float localxdotglobalr_[2];
+  float localxdotglobalz_[2];
+  float localxdotglobalx_[2];
+  float localxdotglobaly_[2];
+  float localydotglobalphi_[2];
+  float localydotglobalr_[2];
+  float localydotglobalz_[2];
+  float localydotglobalx_[2];
+  float localydotglobaly_[2];
+
+};
+
+//
+// constants, enums and typedefs
+//
+
+//
+// static data member definitions
+//
+
+using std::vector;
+//
+// constructors and destructor
+//
+OverlapValidation::OverlapValidation(const edm::ParameterSet& iConfig) :
+  config_(iConfig), rootTree_(nullptr),
+  FileInPath_("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat"),
+  addExtraBranches_(false),
+  minHitsCut_(6),
+  chi2ProbCut_(0.001)
+{
+  
+  edm::ConsumesCollector&& iC = consumesCollector();
+  //now do what ever initialization is needed
+  trajectoryTag_ = iConfig.getParameter<edm::InputTag>("trajectories");
+  trajectoryToken_ = iC.consumes<TrajectoryCollection>(trajectoryTag_);
+  doSimHit_ = iConfig.getParameter<bool>("associateStrip");
+  reader=new SiStripDetInfoFileReader(FileInPath_.fullPath());
+  
+  
+  overlapCounts_[0] = 0;  // #trajectories
+  overlapCounts_[1] = 0;  // #hits
+  overlapCounts_[2] = 0;  // #overlap hits
+  acceptLayer.resize(7,false);
+  acceptLayer[PixelSubdetector::PixelBarrel] = iConfig.getParameter<bool>("usePXB") ;
+  acceptLayer[PixelSubdetector::PixelEndcap] = iConfig.getParameter<bool>("usePXF") ;
+  acceptLayer[StripSubdetector::TIB] = iConfig.getParameter<bool>("useTIB") ;
+  acceptLayer[StripSubdetector::TOB] = iConfig.getParameter<bool>("useTOB") ;
+  acceptLayer[StripSubdetector::TID] = iConfig.getParameter<bool>("useTID") ;
+  acceptLayer[StripSubdetector::TEC] = iConfig.getParameter<bool>("useTEC") ;
+  barrelOnly_ = iConfig.getParameter<bool>("barrelOnly");
+  
+
+  edm::Service<TFileService> fs;
+  //
+  // root output
+  //
+  rootTree_ = fs->make<TTree>("Overlaps","Overlaps");
+  if (addExtraBranches_) {
+    rootTree_->Branch("hitCounts",hitCounts_,"found/s:lost/s");
+    rootTree_->Branch("chi2",chi2_,"chi2/F:ndf/F");
+    rootTree_->Branch("path",&overlapPath_,"path/F");
+  }
+  rootTree_->Branch("layer",&layer_,"layer/i");
+  rootTree_->Branch("detids",overlapIds_,"id[2]/i");
+  rootTree_->Branch("predPos",predictedPositions_,"gX[2]/F:gY[2]/F:gZ[2]/F");
+  rootTree_->Branch("predPar",predictedLocalParameters_,
+		    "predQP[2]/F:predDX[2]/F:predDY[2]/F:predX[2]/F:predY[2]/F");
+  rootTree_->Branch("predErr",predictedLocalErrors_,
+		    "predEQP[2]/F:predEDX[2]/F:predEDY[2]/F:predEX[2]/F:predEY[2]/F");
+  rootTree_->Branch("predEDeltaX",&predictedDeltaXError_,"sigDeltaX/F");
+  rootTree_->Branch("predEDeltaY",&predictedDeltaYError_,"sigDeltaY/F"); 
+  rootTree_->Branch("relSignX",&relativeXSign_,"relSignX/B");
+  rootTree_->Branch("relSignY",&relativeYSign_,"relSignY/B");
+  rootTree_->Branch("hitX",hitPositions_,"hitX[2]/F");
+  rootTree_->Branch("hitEX",hitErrors_,"hitEX[2]/F");
+  rootTree_->Branch("hitY",hitPositionsY_,"hitY[2]/F");
+  rootTree_->Branch("hitEY",hitErrorsY_,"hitEY[2]/F");
+  if (addExtraBranches_) {
+    rootTree_->Branch("simX",simHitPositions_,"simX[2]/F");
+    rootTree_->Branch("simY",simHitPositionsY_,"simY[2]/F");
+    rootTree_->Branch("clusterSize",clusterSize_,"clusterSize[2]/F");
+    rootTree_->Branch("clusterWidthX",clusterWidthX_,"clusterWidthX[2]/F");
+    rootTree_->Branch("clusterWidthY",clusterWidthY_,"clusterWidthY[2]/F");
+    rootTree_->Branch("clusterCharge",clusterCharge_,"clusterCharge[2]/i");
+    rootTree_->Branch("edge",edge_,"edge[2]/I");
+  }
+  rootTree_->Branch("momentum",&momentum_,"momentum/F");
+  rootTree_->Branch("run",&run_,"run/i");
+  rootTree_->Branch("event",&event_,"event/i");
+  rootTree_->Branch("subdetID",&subdetID,"subdetID/I");
+  rootTree_->Branch("moduleX",moduleX_,"moduleX[2]/F");
+  rootTree_->Branch("moduleY",moduleY_,"moduleY[2]/F");
+  rootTree_->Branch("moduleZ",moduleZ_,"moduleZ[2]/F");
+  rootTree_->Branch("localxdotglobalphi",localxdotglobalphi_,"localxdotglobalphi[2]/F");
+  rootTree_->Branch("localxdotglobalr",localxdotglobalr_,"localxdotglobalr[2]/F");
+  rootTree_->Branch("localxdotglobalz",localxdotglobalz_,"localxdotglobalz[2]/F");
+  rootTree_->Branch("localxdotglobalx",localxdotglobalx_,"localxdotglobalx[2]/F");
+  rootTree_->Branch("localxdotglobaly",localxdotglobaly_,"localxdotglobaly[2]/F");
+  rootTree_->Branch("localydotglobalphi",localydotglobalphi_,"localydotglobalphi[2]/F");
+  rootTree_->Branch("localydotglobalr",localydotglobalr_,"localydotglobalr[2]/F");
+  rootTree_->Branch("localydotglobalz",localydotglobalz_,"localydotglobalz[2]/F");
+  rootTree_->Branch("localydotglobalx",localydotglobalx_,"localydotglobalx[2]/F");
+  rootTree_->Branch("localydotglobaly",localydotglobaly_,"localydotglobaly[2]/F");
+
+}
+
+
+OverlapValidation::~OverlapValidation()
+{
+  edm::LogWarning w("Overlaps");
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
+  
+  w << "Counters =" ;
+  w << " Number of tracks: " << overlapCounts_[0];
+  w << " Number of valid hits: " << overlapCounts_[1];
+  w << " Number of overlaps: " << overlapCounts_[2];
+}
+
+
+//
+// member functions
+//
+
+
+// ------------ method called to for each event  ------------
+void
+OverlapValidation::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
+{
+  using namespace edm;
+  //
+  // mag field & search tracker
+  //
+  edm::ESHandle<MagneticField> magFieldHandle;
+  iSetup.get<IdealMagneticFieldRecord>().get(magFieldHandle);
+  magField_ = magFieldHandle.product();
+  //
+  // propagator
+  //
+  AnalyticalPropagator propagator(magField_,anyDirection);
+  //
+  // geometry
+  
+
+  //
+  edm::ESHandle<TrackerGeometry> geometryHandle;
+  iSetup.get<TrackerDigiGeometryRecord>().get(geometryHandle);
+  trackerGeometry_ = geometryHandle.product();
+  //
+  // make associator for SimHits
+  //
+  TrackerHitAssociator* associator;
+  if(doSimHit_) {
+    TrackerHitAssociator::Config hitassociatorconfig(config_, consumesCollector());
+    associator = new TrackerHitAssociator(iEvent, hitassociatorconfig);
+  } else {
+    associator = nullptr;
+  
+
+  }  
+
+
+
+
+
+
+
+
+//if(doSimHit_) associator = new TrackerHitAssociator(iEvent, config_); else associator = 0; 
+
+  //
+  // trajectories (from refit)
+  //
+  //typedef vector<Trajectory> TrajectoryCollection;
+  edm::Handle<TrajectoryCollection> trajectoryCollectionHandle;
+  iEvent.getByToken(trajectoryToken_,trajectoryCollectionHandle);
+  const TrajectoryCollection* const trajectoryCollection = trajectoryCollectionHandle.product();
+
+  //
+  // loop over trajectories from refit
+ edm::ESHandle<TrackerTopology> tTopoHandle;
+ iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
+ const TrackerTopology* const tTopo = tTopoHandle.product(); 
+ for (const auto& trajectory : *trajectoryCollection)  analyze(trajectory,propagator,*associator, tTopo);
+  
+  run_ = iEvent.id().run();
+  event_ = iEvent.id().event();
+  
+
+  
+}
+
+
+void
+OverlapValidation::analyze (const Trajectory& trajectory,
+		     const Propagator& propagator,
+		     TrackerHitAssociator& associator,  const TrackerTopology* const tTopo)
+{
+  typedef std::pair<const TrajectoryMeasurement*, const TrajectoryMeasurement*> Overlap;
+  typedef vector<Overlap> OverlapContainer;
+  ++overlapCounts_[0];
+
+  OverlapContainer overlapHits;
+
+  // quality cuts on trajectory
+  // min. # hits / matched hits
+
+  if ( trajectory.foundHits()<minHitsCut_ )  return;
+  if ( ChiSquaredProbability((double)( trajectory.chiSquared() ),(double)( trajectory.ndof(false) )) < chi2ProbCut_ ) return;
+  //
+  // loop over measurements in the trajectory and calculate residuals
+  //
+  
+
+  vector<TrajectoryMeasurement> measurements(trajectory.measurements());
+  for ( vector<TrajectoryMeasurement>::const_iterator itm=measurements.begin();
+	itm!=measurements.end(); ++itm ) {
+    //
+    // skip "invalid" (i.e. missing) hits
+    //
+    ConstRecHitPointer hit = itm->recHit();
+    DetId id = hit->geographicalId();
+    int layer(layerFromId(id, tTopo));
+    int subDet = id.subdetId();
+
+    if ( !hit->isValid() ) {
+      edm::LogVerbatim("OverlapValidation")  << "Invalid";
+      continue;
+    }
+    if (barrelOnly_ && (subDet==StripSubdetector::TID || subDet==StripSubdetector::TEC) ) return;
+
+    //edm::LogVerbatim("OverlapValidation")  << "Check " <<subDet << ", layer = " << layer<<" stereo: "<< ((subDet > 2)?(SiStripDetId(id).stereo()):2);
+    //cout << "Check SubID " <<subDet << ", layer = " << layer<<" stereo: "<< ((subDet > 2)?(SiStripDetId(id).stereo()):2) << endl;
+
+    //
+    // check for overlap: same subdet-id && layer number for
+    // two consecutive hits
+    //
+    ++overlapCounts_[1];
+    if ( (layer!=-1 )&&(acceptLayer[subDet])) {
+      for (vector<TrajectoryMeasurement>::const_iterator itmCompare = itm-1; 
+	   itmCompare >= measurements.begin() &&  itmCompare > itm - 4; 
+	   --itmCompare){
+	
+	DetId compareId = itmCompare->recHit()->geographicalId();
+	
+	if ( subDet != compareId.subdetId() || layer != layerFromId(compareId, tTopo)) break;
+        if (!itmCompare->recHit()->isValid()) continue;
+	if ( (subDet == PixelSubdetector::PixelBarrel || subDet == PixelSubdetector::PixelEndcap) || 
+	     (SiStripDetId(id).stereo()==SiStripDetId(compareId).stereo() )) {
+	  overlapHits.push_back(std::make_pair(&(*itmCompare),&(*itm)));
+	  //edm::LogVerbatim("OverlapValidation") << "adding pair "<< ((subDet > 2)?(SiStripDetId(id).stereo()) : 2)
+	  //			     << " from layer = " << layer;
+	  //cout << "adding pair "<< ((subDet > 2)?(SiStripDetId(id).stereo()) : 2) << " from subDet = " << subDet << " and layer = " << layer;
+	  //cout << " \t"<<run_<< "\t"<<event_<<"\t";
+	  //cout << min(id.rawId(),compareId.rawId())<<"\t"<<max(id.rawId(),compareId.rawId())<<endl;
+	  if (  SiStripDetId(id).glued() == id.rawId() ) edm::LogInfo("Overlaps") << "BAD GLUED: Have glued layer with id = " << id.rawId() << " and glued id = " << SiStripDetId(id).glued() << "  and stereo = " << SiStripDetId(id).stereo() << endl;
+	  if (  SiStripDetId(compareId).glued() == compareId.rawId() ) edm::LogInfo("Overlaps") << "BAD GLUED: Have glued layer with id = " << compareId.rawId() << " and glued id = " << SiStripDetId(compareId).glued() << "  and stereo = " << SiStripDetId(compareId).stereo() << endl;
+	  break;
+	}
+      }
+    }
+  }
+  
+
+  //
+  // Loop over all overlap pairs. 
+  //
+  hitCounts_[0] = trajectory.foundHits();
+  hitCounts_[1] = trajectory.lostHits();
+  chi2_[0] = trajectory.chiSquared();
+  chi2_[1] = trajectory.ndof(false);
+
+  for (const auto& overlapHit : overlapHits) {
+    //              
+    // create reference state @ module 1 (no info from overlap hits)
+    //
+    ++overlapCounts_[2];
+    // backward predicted state at module 1
+     TrajectoryStateOnSurface bwdPred1 = overlapHit.first->backwardPredictedState();
+    if ( !bwdPred1.isValid() )  continue;
+    //cout << "momentum from backward predicted state = " << bwdPred1.globalMomentum().mag() << endl;
+    // forward predicted state at module 2
+    TrajectoryStateOnSurface fwdPred2 = overlapHit.second->forwardPredictedState();
+    //cout << "momentum from forward predicted state = " << fwdPred2.globalMomentum().mag() << endl;
+    if ( !fwdPred2.isValid() )  continue;
+    // extrapolate fwdPred2 to module 1
+    TrajectoryStateOnSurface fwdPred2At1 = propagator.propagate(fwdPred2,bwdPred1.surface());
+    if ( !fwdPred2At1.isValid() )  continue;
+    // combine fwdPred2At1 with bwdPred1 (ref. state, best estimate without hits 1 and 2)
+    TrajectoryStateOnSurface comb1 = combiner_.combine(bwdPred1,fwdPred2At1);
+    if ( !comb1.isValid() )  continue;
+    //
+    // propagation of reference parameters to module 2
+    //
+    std::pair<TrajectoryStateOnSurface,double> tsosWithS = 
+      propagator.propagateWithPath(comb1,fwdPred2.surface());
+    TrajectoryStateOnSurface comb1At2 = tsosWithS.first;
+    if ( !comb1At2.isValid() )  continue;
+    //distance of propagation from one surface to the next==could cut here
+    overlapPath_ = tsosWithS.second;
+    if (abs(overlapPath_) > 15 ) continue; //cut to remove hit pairs > 15 cm apart
+    // global position on module 1
+    GlobalPoint position = comb1.globalPosition();
+    predictedPositions_[0][0] = position.x();
+    predictedPositions_[1][0] = position.y();
+    predictedPositions_[2][0] = position.z();
+    momentum_ = comb1.globalMomentum().mag();
+    //cout << "momentum from combination = " << momentum_ << endl;
+    //cout << "magnetic field from TSOS = " << comb1.magneticField()->inTesla(position).mag() << endl;
+    // local parameters and errors on module 1
+    AlgebraicVector5 pars = comb1.localParameters().vector();
+    AlgebraicSymMatrix55 errs = comb1.localError().matrix();
+    for ( int i=0; i<5; ++i ) {
+      predictedLocalParameters_[i][0] = pars[i];
+      predictedLocalErrors_[i][0] = sqrt(errs(i,i));
+    }
+    // global position on module 2
+    position = comb1At2.globalPosition();
+    predictedPositions_[0][1] = position.x();
+    predictedPositions_[1][1] = position.y();
+    predictedPositions_[2][1] = position.z();
+    // local parameters and errors on module 2
+    pars = comb1At2.localParameters().vector();
+    errs = comb1At2.localError().matrix();
+    for ( int i=0; i<5; ++i ) {
+      predictedLocalParameters_[i][1] = pars[i];
+      predictedLocalErrors_[i][1] = sqrt(errs(i,i));
+    }
+    
+
+    //print out local errors in X to check
+    //cout << "Predicted local error in X at 1 = " << predictedLocalErrors_[3][0] << "   and predicted local error in X at 2 is = " <<  predictedLocalErrors_[3][1] << endl;
+    //cout << "Predicted local error in Y at 1 = " << predictedLocalErrors_[4][0] << "   and predicted local error in Y at 2 is = " <<  predictedLocalErrors_[4][1] << endl;
+
+    //
+    // jacobians (local-to-global@1,global 1-2,global-to-local@2)
+    //
+    JacobianLocalToCurvilinear jacLocToCurv(comb1.surface(),
+					    comb1.localParameters(),
+					    *magField_);
+    AnalyticalCurvilinearJacobian jacCurvToCurv(comb1.globalParameters(),
+						comb1At2.globalPosition(),
+						comb1At2.globalMomentum(),
+						tsosWithS.second);
+    JacobianCurvilinearToLocal jacCurvToLoc(comb1At2.surface(),
+					    comb1At2.localParameters(),
+					    *magField_);
+    // combined jacobian local-1-to-local-2
+    AlgebraicMatrix55 jacobian = 
+      jacLocToCurv.jacobian()*jacCurvToCurv.jacobian()*jacCurvToLoc.jacobian();
+    // covariance on module 1
+    AlgebraicSymMatrix55 covComb1 = comb1.localError().matrix();
+    // variance and correlations for predicted local_x on modules 1 and 2
+    double c00 = covComb1(3,3);
+    double c10(0.);
+    double c11(0.);
+    for ( int i=1; i<5; ++i ) {
+      c10 += jacobian(3,i)*covComb1(i,3);
+      for ( int j=1; j<5; ++j )  c11 += jacobian(3,i)*covComb1(i,j)*jacobian(3,j);
+    }
+    // choose relative sign in order to minimize error on difference
+    double diff = c00 - 2*fabs(c10) + c11;
+    diff = diff>0 ? sqrt(diff) : -sqrt(-diff);
+    predictedDeltaXError_ = diff;
+    relativeXSign_ = c10>0 ? -1 : 1;
+    //
+    // now find variance and correlations for predicted local_y
+    double c00Y = covComb1(4,4);
+    double c10Y(0.);
+    double c11Y(0.);
+    for ( int i=1; i<5; ++i ) {
+      c10Y += jacobian(4,i)*covComb1(i,4);
+      for ( int j=1; j<5; ++j )  c11Y += jacobian(4,i)*covComb1(i,j)*jacobian(4,j);
+    }
+    double diffY = c00Y - 2*fabs(c10Y) + c11Y;
+    diffY = diffY>0 ? sqrt(diffY) : -sqrt(-diffY);
+    predictedDeltaYError_ = diffY;
+    relativeYSign_ = c10Y>0 ? -1 : 1;
+
+    // information on modules and hits
+    overlapIds_[0] = overlapHit.first->recHit()->geographicalId().rawId();
+    overlapIds_[1] = overlapHit.second->recHit()->geographicalId().rawId();
+
+    //added by Heshy and Jared
+    moduleX_[0] = overlapHit.first->recHit()->det()->surface().position().x();
+    moduleX_[1] = overlapHit.second->recHit()->det()->surface().position().x();
+    moduleY_[0] = overlapHit.first->recHit()->det()->surface().position().y();
+    moduleY_[1] = overlapHit.second->recHit()->det()->surface().position().y();
+    moduleZ_[0] = overlapHit.first->recHit()->det()->surface().position().z();
+    moduleZ_[1] = overlapHit.second->recHit()->det()->surface().position().z();
+    subdetID = overlapHit.first->recHit()->geographicalId().subdetId();
+    localxdotglobalphi_[0] = overlapHit.first->recHit()->det()->surface().toGlobal(onezero).phi() - overlapHit.first->recHit()->det()->surface().toGlobal(zerozero).phi();
+    localxdotglobalphi_[1] = overlapHit.second->recHit()->det()->surface().toGlobal(onezero).phi() - overlapHit.second->recHit()->det()->surface().toGlobal(zerozero).phi();
+    //added by Jason
+    localxdotglobalr_[0] = overlapHit.first->recHit()->det()->surface().toGlobal(onezero).perp() - overlapHit.first->recHit()->det()->surface().toGlobal(zerozero).perp();
+    localxdotglobalr_[1] = overlapHit.second->recHit()->det()->surface().toGlobal(onezero).perp() - overlapHit.second->recHit()->det()->surface().toGlobal(zerozero).perp();
+    localxdotglobalz_[0] = overlapHit.first->recHit()->det()->surface().toGlobal(onezero).z() - overlapHit.first->recHit()->det()->surface().toGlobal(zerozero).z();
+    localxdotglobalz_[1] = overlapHit.second->recHit()->det()->surface().toGlobal(onezero).z() - overlapHit.second->recHit()->det()->surface().toGlobal(zerozero).z();
+    localxdotglobalx_[0] = overlapHit.first->recHit()->det()->surface().toGlobal(onezero).x() - overlapHit.first->recHit()->det()->surface().toGlobal(zerozero).x();
+    localxdotglobalx_[1] = overlapHit.second->recHit()->det()->surface().toGlobal(onezero).x() - overlapHit.second->recHit()->det()->surface().toGlobal(zerozero).x();
+    localxdotglobaly_[0] = overlapHit.first->recHit()->det()->surface().toGlobal(onezero).y() - overlapHit.first->recHit()->det()->surface().toGlobal(zerozero).y();
+    localxdotglobaly_[1] = overlapHit.second->recHit()->det()->surface().toGlobal(onezero).y() - overlapHit.second->recHit()->det()->surface().toGlobal(zerozero).y();
+    localydotglobalr_[0] = overlapHit.first->recHit()->det()->surface().toGlobal(zeroone).perp() - overlapHit.first->recHit()->det()->surface().toGlobal(zerozero).perp();
+    localydotglobalr_[1] = overlapHit.second->recHit()->det()->surface().toGlobal(zeroone).perp() - overlapHit.second->recHit()->det()->surface().toGlobal(zerozero).perp();
+    localydotglobalz_[0] = overlapHit.first->recHit()->det()->surface().toGlobal(zeroone).z() - overlapHit.first->recHit()->det()->surface().toGlobal(zerozero).z();
+    localydotglobalz_[1] = overlapHit.second->recHit()->det()->surface().toGlobal(zeroone).z() - overlapHit.second->recHit()->det()->surface().toGlobal(zerozero).z();
+    localydotglobalx_[0] = overlapHit.first->recHit()->det()->surface().toGlobal(zeroone).x() - overlapHit.first->recHit()->det()->surface().toGlobal(zerozero).x();
+    localydotglobalx_[1] = overlapHit.second->recHit()->det()->surface().toGlobal(zeroone).x() - overlapHit.second->recHit()->det()->surface().toGlobal(zerozero).x();
+    localydotglobaly_[0] = overlapHit.first->recHit()->det()->surface().toGlobal(zeroone).y() - overlapHit.first->recHit()->det()->surface().toGlobal(zerozero).y();
+    localydotglobaly_[1] = overlapHit.second->recHit()->det()->surface().toGlobal(zeroone).y() - overlapHit.second->recHit()->det()->surface().toGlobal(zerozero).y();
+    localydotglobalphi_[0] = overlapHit.first->recHit()->det()->surface().toGlobal(zeroone).phi() - overlapHit.first->recHit()->det()->surface().toGlobal(zerozero).phi();
+    localydotglobalphi_[1] = overlapHit.second->recHit()->det()->surface().toGlobal(zeroone).phi() - overlapHit.second->recHit()->det()->surface().toGlobal(zerozero).phi();
+
+
+
+
+    if ( overlapHit.first->recHit()->geographicalId().subdetId()==StripSubdetector::TIB ) layer_ =  layerFromId(overlapHit.first->recHit()->geographicalId().rawId(), tTopo);
+    else if (  overlapHit.first->recHit()->geographicalId().subdetId()==StripSubdetector::TOB ) layer_ =  layerFromId(overlapHit.first->recHit()->geographicalId().rawId(), tTopo)+4;
+    else if ( overlapHit.first->recHit()->geographicalId().subdetId()==StripSubdetector::TID ) layer_ =  layerFromId(overlapHit.first->recHit()->geographicalId().rawId(), tTopo)+10;
+    else if (  overlapHit.first->recHit()->geographicalId().subdetId()==StripSubdetector::TEC ) layer_ =  layerFromId(overlapHit.first->recHit()->geographicalId().rawId(), tTopo)+13;
+    else if ( overlapHit.first->recHit()->geographicalId().subdetId()==PixelSubdetector::PixelBarrel ) layer_ =  layerFromId(overlapHit.first->recHit()->geographicalId().rawId(), tTopo)+20;
+    else if (  overlapHit.first->recHit()->geographicalId().subdetId()==PixelSubdetector::PixelEndcap ) layer_ =  layerFromId(overlapHit.first->recHit()->geographicalId().rawId(), tTopo)+30; 
+    else layer_ = 99;
+    
+
+    if ( overlapIds_[0] ==  SiStripDetId(overlapHit.first->recHit()->geographicalId()).glued() )
+    edm::LogWarning("Overlaps") << "BAD GLUED: First Id = " << overlapIds_[0] << " has glued = " << SiStripDetId(overlapHit.first->recHit()->geographicalId()).glued() << "  and stereo = " << SiStripDetId(overlapHit.first->recHit()->geographicalId()).stereo() << endl;
+    if ( overlapIds_[1] ==  SiStripDetId(overlapHit.second->recHit()->geographicalId()).glued() )
+    edm::LogWarning("Overlaps") << "BAD GLUED: Second Id = " <<overlapIds_[1] << " has glued = " << SiStripDetId(overlapHit.second->recHit()->geographicalId()).glued() << "  and stereo = " << SiStripDetId(overlapHit.second->recHit()->geographicalId()).stereo() << endl;
+
+    const TransientTrackingRecHit::ConstRecHitPointer firstRecHit = overlapHit.first->recHit();
+    const TransientTrackingRecHit::ConstRecHitPointer secondRecHit = overlapHit.second->recHit();
+    hitPositions_[0] = firstRecHit->localPosition().x();
+    hitErrors_[0] = sqrt(firstRecHit->localPositionError().xx());
+    hitPositions_[1] = secondRecHit->localPosition().x();
+    hitErrors_[1] = sqrt(secondRecHit->localPositionError().xx());
+
+    hitPositionsY_[0] = firstRecHit->localPosition().y();
+    hitErrorsY_[0] = sqrt(firstRecHit->localPositionError().yy());
+    hitPositionsY_[1] = secondRecHit->localPosition().y();
+    hitErrorsY_[1] = sqrt(secondRecHit->localPositionError().yy());
+
+    //cout << "printing local X hit position and error for the overlap hits. Hit 1 = " << hitPositions_[0] << "+-" << hitErrors_[0] << "  and hit 2 is "  << hitPositions_[1] << "+-" << hitErrors_[1] << endl;
+
+    DetId id1 = overlapHit.first->recHit()->geographicalId();
+    DetId id2 = overlapHit.second->recHit()->geographicalId();
+    int layer1 = layerFromId(id1, tTopo);
+    int subDet1 = id1.subdetId();
+    int layer2 = layerFromId(id2, tTopo);
+    int subDet2 = id2.subdetId();
+    if (abs(hitPositions_[0])>5) edm::LogInfo("Overlaps") << "BAD: Bad hit position: Id = " << id1.rawId()  << " stereo = " << SiStripDetId(id1).stereo() << "  glued = " << SiStripDetId(id1).glued() << " from subdet = " << subDet1 << " and layer = " << layer1 << endl;
+    if (abs(hitPositions_[1])>5) edm::LogInfo("Overlaps") << "BAD: Bad hit position: Id = " << id2.rawId()  << " stereo = " << SiStripDetId(id2).stereo() << "  glued = " << SiStripDetId(id2).glued() << " from subdet = " << subDet2 << " and layer = " << layer2 << endl;
+    
+
+    // get track momentum
+    momentum_ = comb1.globalMomentum().mag();
+    
+    // get cluster size
+    if (!(subDet1 == PixelSubdetector::PixelBarrel || subDet1 == PixelSubdetector::PixelEndcap)) { //strip
+      const TransientTrackingRecHit::ConstRecHitPointer thit1=overlapHit.first->recHit();
+      const SiStripRecHit1D* hit1=dynamic_cast<const SiStripRecHit1D*>((*thit1).hit());
+      if (hit1) {
+	//check cluster width
+	const SiStripRecHit1D::ClusterRef & cluster1=hit1->cluster();
+	clusterSize_[0] = (cluster1->amplitudes()).size();
+	clusterWidthX_[0] = (cluster1->amplitudes()).size();
+	clusterWidthY_[0] = -1;
+
+	//check if cluster at edge of sensor
+	uint16_t firstStrip = cluster1->firstStrip();
+	uint16_t lastStrip = firstStrip + (cluster1->amplitudes()).size() -1;
+	unsigned short Nstrips;
+	Nstrips=reader->getNumberOfApvsAndStripLength(id1).first*128;
+	bool atEdge = false;
+	if (firstStrip == 0 || lastStrip == (Nstrips-1) ) atEdge = true;
+	if (atEdge) edge_[0] = 1; else edge_[0] = -1;
+	
+	// get cluster total charge
+	const std::vector<uint8_t>& stripCharges = cluster1->amplitudes();
+	uint16_t charge = 0;
+	for (uint i = 0; i < stripCharges.size(); i++) {
+	  charge += stripCharges.at(i);
+	}
+	clusterCharge_[0] = charge;
+      } 
+	
+      const TransientTrackingRecHit::ConstRecHitPointer thit2=overlapHit.second->recHit();
+      const SiStripRecHit1D* hit2=dynamic_cast<const SiStripRecHit1D*>((*thit2).hit());
+      if (hit2) {
+	const SiStripRecHit1D::ClusterRef & cluster2=hit2->cluster();
+	clusterSize_[1] = (cluster2->amplitudes()).size();
+	clusterWidthX_[1] = (cluster2->amplitudes()).size();
+	clusterWidthY_[1] = -1;
+
+	uint16_t firstStrip = cluster2->firstStrip();
+	uint16_t lastStrip = firstStrip + (cluster2->amplitudes()).size() -1;
+	unsigned short Nstrips;
+	Nstrips=reader->getNumberOfApvsAndStripLength(id2).first*128;
+	bool atEdge = false;
+	if (firstStrip == 0 || lastStrip == (Nstrips-1) ) atEdge = true;
+	if (atEdge) edge_[1] = 1; else edge_[1] = -1;
+
+	// get cluster total charge
+	const std::vector<uint8_t>& stripCharges = cluster2->amplitudes();
+	uint16_t charge = 0;
+	for (uint i = 0; i < stripCharges.size(); i++) {
+	  charge += stripCharges.at(i);
+	}
+	clusterCharge_[1] = charge;
+	
+      }
+      //cout << "strip cluster size2 = " << clusterWidthX_[0] << "  and size 2 = " << clusterWidthX_[1] << endl;
+    }
+    
+
+    if (subDet2 == PixelSubdetector::PixelBarrel || subDet2 == PixelSubdetector::PixelEndcap) { //pixel
+      
+      const TransientTrackingRecHit::ConstRecHitPointer thit1=overlapHit.first->recHit();
+      const SiPixelRecHit * recHitPix1 = dynamic_cast<const SiPixelRecHit *>((*thit1).hit());
+      if(recHitPix1) {
+	// check for cluster size and width
+	SiPixelRecHit::ClusterRef const& cluster1 = recHitPix1->cluster();
+	
+	clusterSize_[0] = cluster1->size();
+	clusterWidthX_[0] = cluster1->sizeX();
+	clusterWidthY_[0] = cluster1->sizeY();
+	
+	// check for cluster at edge
+	const PixelGeomDetUnit * theGeomDet =
+	  dynamic_cast<const PixelGeomDetUnit*> ((*trackerGeometry_).idToDet(id1) );	
+	const PixelTopology * topol =
+	  (&(theGeomDet->specificTopology()));
+	
+    
+	int minPixelRow = cluster1->minPixelRow(); //x
+	int maxPixelRow = cluster1->maxPixelRow();
+	int minPixelCol = cluster1->minPixelCol(); //y
+	int maxPixelCol = cluster1->maxPixelCol();
+
+	bool edgeHitX = (topol->isItEdgePixelInX(minPixelRow)) || 
+	  (topol->isItEdgePixelInX(maxPixelRow)); 
+	bool edgeHitY = (topol->isItEdgePixelInY(minPixelCol)) || 
+	  (topol->isItEdgePixelInY(maxPixelCol)); 
+	if (edgeHitX||edgeHitY) edge_[0] = 1; else edge_[0] = -1;
+
+	clusterCharge_[0] = (uint)cluster1->charge();
+	
+      } else {
+	edm::LogWarning("Overlaps") << "didn't find pixel cluster" << endl;
+	continue;
+      }
+
+      const TransientTrackingRecHit::ConstRecHitPointer thit2=overlapHit.second->recHit();
+      const SiPixelRecHit * recHitPix2 = dynamic_cast<const SiPixelRecHit *>((*thit2).hit());
+      if(recHitPix2) {
+	SiPixelRecHit::ClusterRef const& cluster2 = recHitPix2->cluster();
+	
+	clusterSize_[1] = cluster2->size();
+	clusterWidthX_[1] = cluster2->sizeX();
+	clusterWidthY_[1] = cluster2->sizeY();
+	//cout << "second pixel cluster is " << clusterSize_[1] << " pixels with x width = " << clusterWidthX_[1] << " and y width = " << clusterWidthY_[1] << endl;
+	
+	const PixelGeomDetUnit * theGeomDet =
+	  dynamic_cast<const PixelGeomDetUnit*> ((*trackerGeometry_).idToDet(id2) );	
+	const PixelTopology * topol =
+	  (&(theGeomDet->specificTopology()));
+	
+	int minPixelRow = cluster2->minPixelRow(); //x
+	int maxPixelRow = cluster2->maxPixelRow();
+	int minPixelCol = cluster2->minPixelCol(); //y
+	int maxPixelCol = cluster2->maxPixelCol();
+
+	bool edgeHitX = (topol->isItEdgePixelInX(minPixelRow)) || 
+	  (topol->isItEdgePixelInX(maxPixelRow)); 
+	bool edgeHitY = (topol->isItEdgePixelInY(minPixelCol)) || 
+	  (topol->isItEdgePixelInY(maxPixelCol)); 
+	if (edgeHitX||edgeHitY) edge_[1] = 1; else edge_[1] = -1;
+	
+	clusterCharge_[1] = (uint)cluster2->charge();
+	
+      } else {
+	edm::LogWarning("Overlaps") << "didn't find pixel cluster" << endl;
+	continue;
+      }
+      
+    }
+
+ 
+
+    //also check for edge pixels
+    
+    //try writing out the SimHit info (for MC only)
+    if(doSimHit_){
+      std::vector<PSimHit> psimHits1;
+      std::vector<PSimHit> psimHits2;
+      //calculate layer
+      DetId id = overlapHit.first->recHit()->geographicalId();
+      int layer(-1);
+      layer = layerFromId(id, tTopo);
+     int subDet = id.subdetId();
+      edm::LogVerbatim("OverlapValidation") << "Subdet = " << subDet << " ; layer = " << layer;
+       
+      psimHits1 = associator.associateHit( *(firstRecHit->hit()) );
+      edm::LogVerbatim("OverlapValidation") << "single hit ";
+      edm::LogVerbatim("OverlapValidation") << "length of psimHits1: " << psimHits1.size();
+      if ( !psimHits1.empty() ) {
+	float closest_dist = 99999.9;
+	std::vector<PSimHit>::const_iterator closest_simhit = psimHits1.begin();
+	for (std::vector<PSimHit>::const_iterator m = psimHits1.begin(); m < psimHits1.end(); m++) {
+	  //find closest simHit to the recHit
+	  float simX = (*m).localPosition().x();
+	  float dist = fabs( simX - (overlapHit.first->recHit()->localPosition().x()) );
+	  edm::LogVerbatim("OverlapValidation") << "simHit1 simX = " << simX << "   hitX = " << overlapHit.first->recHit()->localPosition().x() << "   distX = " << dist << "   layer = " << layer;
+	  if (dist<closest_dist) {
+	    //cout << "found newest closest dist for simhit1" << endl;
+	    closest_dist = dist;
+	    closest_simhit = m;
+	  }
+	}
+	//if glued layer, convert sim hit position to matchedhit surface
+	//layer index from 1-4 for TIB, 1-6 for TOB
+	// Are the sim hits on the glued layers or are they split???
+	if ( subDet > 2 && !SiStripDetId(id).glued() ) {
+	  const GluedGeomDet* gluedDet = (const GluedGeomDet*)(*trackerGeometry_).idToDet((*firstRecHit).hit()->geographicalId());
+	  const StripGeomDetUnit* stripDet =(StripGeomDetUnit*) gluedDet->monoDet();
+	  GlobalPoint gp = stripDet->surface().toGlobal( (*closest_simhit).localPosition() );
+	  LocalPoint lp = gluedDet->surface().toLocal( gp );
+	  LocalVector localdirection = (*closest_simhit).localDirection();
+	  GlobalVector globaldirection = stripDet->surface().toGlobal(localdirection);
+	  LocalVector direction = gluedDet->surface().toLocal(globaldirection);
+	  float scale = -lp.z() / direction.z();
+	  LocalPoint projectedPos = lp + scale*direction;
+          simHitPositions_[0] =	projectedPos.x();
+	  edm::LogVerbatim("OverlapValidation") << "simhit position from matched layer = " << simHitPositions_[0];
+	  simHitPositionsY_[0] = projectedPos.y();
+	} else {
+	  simHitPositions_[0] = (*closest_simhit).localPosition().x();
+	  simHitPositionsY_[0] = (*closest_simhit).localPosition().y();
+	  edm::LogVerbatim("OverlapValidation") << "simhit position from non-matched layer = " << simHitPositions_[0];
+	}
+	edm::LogVerbatim("OverlapValidation") << "hit position = " << hitPositions_[0];
+      } else {
+	simHitPositions_[0] = -99.;
+	simHitPositionsY_[0] = -99.;	
+	//cout << " filling simHitX: " << -99 << endl;
+      }
+
+
+      psimHits2 = associator.associateHit( *(secondRecHit->hit()) );
+      if ( !psimHits2.empty() ) {
+	float closest_dist = 99999.9;
+	std::vector<PSimHit>::const_iterator closest_simhit = psimHits2.begin();
+	for (std::vector<PSimHit>::const_iterator m = psimHits2.begin(); m < psimHits2.end(); m++) {
+	  float simX = (*m).localPosition().x();
+	  float dist = fabs( simX - (overlapHit.second->recHit()->localPosition().x()) );
+	  if (dist<closest_dist) {
+	    closest_dist = dist;
+	    closest_simhit = m;
+	  }
+	}
+	//if glued layer, convert sim hit position to matchedhit surface
+	// if no sim hits on matched layers then this section can be removed
+	if ( subDet > 2 && !SiStripDetId(id).glued() ) {
+	  const GluedGeomDet* gluedDet = (const GluedGeomDet*)(*trackerGeometry_).idToDet((*secondRecHit).hit()->geographicalId());
+	  const StripGeomDetUnit* stripDet =(StripGeomDetUnit*) gluedDet->monoDet();
+	  GlobalPoint gp = stripDet->surface().toGlobal( (*closest_simhit).localPosition() );
+	  LocalPoint lp = gluedDet->surface().toLocal( gp );
+	  LocalVector localdirection = (*closest_simhit).localDirection();
+	  GlobalVector globaldirection = stripDet->surface().toGlobal(localdirection);
+	  LocalVector direction = gluedDet->surface().toLocal(globaldirection);
+	  float scale = -lp.z() / direction.z();
+	  LocalPoint projectedPos = lp + scale*direction;
+          simHitPositions_[1] =	projectedPos.x();
+	  simHitPositionsY_[1] =	projectedPos.y();
+	} else {
+	  simHitPositions_[1] = (*closest_simhit).localPosition().x();
+	  simHitPositionsY_[1] = (*closest_simhit).localPosition().y();
+	}
+      } else {
+	simHitPositions_[1] = -99.;
+	simHitPositionsY_[1] = -99.;
+      }
+    }
+    rootTree_->Fill();
+  }
+}
+
+int
+OverlapValidation::layerFromId (const DetId& id,const TrackerTopology* const tTopo) const
+{
+  TrackerAlignableId aliid;
+  std::pair<int,int> subdetandlayer = aliid.typeAndLayerFromDetId(id, tTopo);
+  int layer = subdetandlayer.second;
+
+
+  return layer;
+  
+}
+
+void 
+OverlapValidation::endJob() {
+  if ( rootTree_ ) {
+    rootTree_->GetDirectory()->cd();
+    rootTree_->Write();
+    delete rootTree_;
+  }
+}
+
+//define this as a plug-in
+DEFINE_FWK_MODULE(OverlapValidation);
diff --git a/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc b/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc
index 0e299a93af235..76036b10e5a96 100644
--- a/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc
+++ b/Alignment/OfflineValidation/plugins/TrackerOfflineValidation.cc
@@ -274,6 +274,8 @@ class TrackerOfflineValidation : public edm::EDAnalyzer {
   const bool useOverflowForRMS_;
   const bool dqmMode_;
   const std::string moduleDirectory_;
+
+  const int chargeCut_;
   
   // a vector to keep track which pointers should be deleted at the very end
   std::vector<TH1*> vDeleteObjects_;
@@ -389,6 +391,7 @@ TrackerOfflineValidation::TrackerOfflineValidation(const edm::ParameterSet& iCon
     useOverflowForRMS_(parSet_.getParameter<bool>("useOverflowForRMS")),
     dqmMode_(parSet_.getParameter<bool>("useInDqmMode")),
     moduleDirectory_(parSet_.getParameter<std::string>("moduleDirectoryInOutput")),
+    chargeCut_(parSet_.getParameter<int>("chargeCut")),
     nTracks_(0),
     maxTracks_(parSet_.getParameter<unsigned long long>("maxTracks")),
     avalidator_(iConfig, consumesCollector())
@@ -1022,6 +1025,8 @@ TrackerOfflineValidation::analyze(const edm::Event& iEvent, const edm::EventSetu
   for (std::vector<TrackerValidationVariables::AVTrackStruct>::const_iterator itT = vTrackstruct.begin();	 
        itT != vTrackstruct.end();
        ++itT) {
+
+    if (itT->charge * chargeCut_ < 0) continue;
     
     if (maxTracks_ > 0 && nTracks_++ >= maxTracks_) break; //exit the loop after hitting the max number of tracks
     // Fill 1D track histos
diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/configTemplates.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/configTemplates.py
index 27ef8d639f8b3..d5b7a3c522f8c 100644
--- a/Alignment/OfflineValidation/python/TkAlAllInOneTool/configTemplates.py
+++ b/Alignment/OfflineValidation/python/TkAlAllInOneTool/configTemplates.py
@@ -7,6 +7,7 @@
 from .trackSplittingValidationTemplates import *
 from .zMuMuValidationTemplates import *
 from .TkAlExceptions import AllInOneError
+from .overlapValidationTemplates import *
 
 ######################################################################
 ######################################################################
diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/offlineValidation.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/offlineValidation.py
index 2179596fbb0c8..ee2438f34c57a 100644
--- a/Alignment/OfflineValidation/python/TkAlAllInOneTool/offlineValidation.py
+++ b/Alignment/OfflineValidation/python/TkAlAllInOneTool/offlineValidation.py
@@ -18,6 +18,7 @@ class OfflineValidation(GenericValidationData_CTSR, ParallelValidation, Validati
         "offlineModuleLevelProfiles": "True",
         "stripYResiduals": "False",
         "maxtracks": "0",
+        "chargeCut": "0",
         }
     deprecateddefaults = {
         "DMRMethod":"",
diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/offlineValidationTemplates.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/offlineValidationTemplates.py
index 1ecd1d1cdec92..04f7616947fe4 100644
--- a/Alignment/OfflineValidation/python/TkAlAllInOneTool/offlineValidationTemplates.py
+++ b/Alignment/OfflineValidation/python/TkAlAllInOneTool/offlineValidationTemplates.py
@@ -32,6 +32,7 @@
 process.TrackerOfflineValidation.oO[offlineValidationMode]Oo..moduleLevelProfiles = .oO[offlineModuleLevelProfiles]Oo.
 process.TrackerOfflineValidation.oO[offlineValidationMode]Oo..stripYResiduals = .oO[stripYResiduals]Oo.
 process.TrackerOfflineValidation.oO[offlineValidationMode]Oo..maxTracks = .oO[maxtracks]Oo./ .oO[parallelJobs]Oo.
+process.TrackerOfflineValidation.oO[offlineValidationMode]Oo..chargeCut = .oO[chargeCut]Oo.
 """
 
 OfflineValidationSequence = "process.seqTrackerOfflineValidation.oO[offlineValidationMode]Oo."
diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/overlapValidation.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/overlapValidation.py
new file mode 100644
index 0000000000000..08d9508266b6d
--- /dev/null
+++ b/Alignment/OfflineValidation/python/TkAlAllInOneTool/overlapValidation.py
@@ -0,0 +1,72 @@
+from __future__ import absolute_import
+
+import os
+
+from . import configTemplates
+from .genericValidation import GenericValidationData_CTSR, ParallelValidation, ValidationWithPlots
+from .helperFunctions import replaceByMap
+from .presentation import SubsectionFromList, SubsectionOnePage
+from .TkAlExceptions import AllInOneError
+
+
+class OverlapValidation(GenericValidationData_CTSR, ParallelValidation, ValidationWithPlots):
+    configBaseName = "TkAlOverlapValidation"
+    scriptBaseName = "TkAlOverlapValidation"
+    crabCfgBaseName = "TkAlOverlapValidation"
+    resultBaseName = "OverlapValidation"
+    outputBaseName = "OverlapValidation"
+    mandatories = {"trackcollection"}
+    valType = "overlap"
+
+    @property
+    def ValidationTemplate(self):
+        return configTemplates.overlapTemplate
+
+    @property
+    def ValidationSequence(self):
+        return configTemplates.overlapValidationSequence
+
+    @property
+    def ProcessName(self):
+        return "overlap"
+
+    def getRepMap( self, alignment = None ):
+        repMap = super(OverlapValidation, self).getRepMap(alignment)
+        repMap.update({ 
+            "nEvents": self.general["maxevents"],
+            "TrackCollection": self.general["trackcollection"],
+        })
+        return repMap
+
+    def appendToPlots(self):
+        """
+        if no argument or "" is passed a string with an instantiation is
+        returned, else the validation is appended to the list
+        """
+        return '("{file}", "{title}", {color}, {style}),'.format(file=self.getCompareStrings(plain=True)["DEFAULT"], **self.getRepMap())
+
+    def appendToMerge(self):
+        repMap = self.getRepMap()
+
+        parameters = " ".join(os.path.join("root://eoscms//eos/cms", file.lstrip("/")) for file in repMap["resultFiles"])
+
+        mergedoutputfile = os.path.join("root://eoscms//eos/cms", repMap["finalResultFile"].lstrip("/"))
+        return "hadd -f %s %s" % (mergedoutputfile, parameters)
+
+    @classmethod
+    def plottingscriptname(cls):
+        return "TkAlOverlapValidation.py"
+
+    @classmethod
+    def plottingscripttemplate(cls):
+        return configTemplates.overlapPlottingTemplate
+
+    @classmethod
+    def plotsdirname(cls):
+        return "OverlapValidationPlots"
+
+    @classmethod
+    def runPlots(cls, validations):
+        return ("rfcp .oO[plottingscriptpath]Oo. .\n"
+                "python .oO[plottingscriptname]Oo.")
+
diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/overlapValidationTemplates.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/overlapValidationTemplates.py
new file mode 100644
index 0000000000000..7157e97a08585
--- /dev/null
+++ b/Alignment/OfflineValidation/python/TkAlAllInOneTool/overlapValidationTemplates.py
@@ -0,0 +1,54 @@
+overlapTemplate = """
+process.analysis = cms.EDAnalyzer("OverlapValidation",
+    usePXB = cms.bool(True),
+    usePXF = cms.bool(True),
+    useTIB = cms.bool(True),
+    useTOB = cms.bool(True),
+    useTID = cms.bool(True),
+    useTEC = cms.bool(True),
+    ROUList = cms.vstring('TrackerHitsTIBLowTof',
+        'TrackerHitsTIBHighTof',
+        'TrackerHitsTOBLowTof',
+        'TrackerHitsTOBHighTof'),
+    trajectories = cms.InputTag("FinalTrackRefitter"),
+    associatePixel = cms.bool(False),
+    associateStrip = cms.bool(False),
+    associateRecoTracks = cms.bool(False),
+    tracks = cms.InputTag("FinalTrackRefitter"),
+    barrelOnly = cms.bool(False)
+)
+
+"""
+
+overlapValidationSequence = "process.analysis"
+
+overlapPlottingTemplate = """
+
+import os
+import ROOT
+from Alignment.OfflineValidation.TkAlStyle import TkAlStyle
+
+TkAlStyle.legendheader = ".oO[legendheader]Oo."
+TkAlStyle.set(ROOT..oO[publicationstatus]Oo., ROOT..oO[era]Oo., ".oO[customtitle]Oo.", ".oO[customrighttitle]Oo.")
+
+try:
+  os.makedirs(".oO[datadir]Oo./.oO[PlotsDirName]Oo./")
+except OSError:
+  pass
+try:
+  os.makedirs(".oO[datadir]Oo./.oO[PlotsDirName]Oo./Profiles")
+except OSError:
+  pass
+
+from Alignment.OfflineValidation.overlapValidationPlot import plot
+
+subdet_ids=[True,True,True,True,True,True]#(BPIX,FPIX,TIB,TID,TOB,TEC)
+module_directions=[True,True,True]#(z,r,phi)
+overlap_directions=[True,True,True]#(z,r,phi)
+profile_directions=[True,True,True,True]#(histogtam,z-profiles,r-profiles,phi-profiles)
+
+
+plot(".oO[datadir]Oo./.oO[PlotsDirName]Oo./",subdet_ids,module_directions,overlap_directions,profile_directions,.oO[PlottingInstantiation]Oo.)
+
+
+"""
diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/plottingOptions.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/plottingOptions.py
index 9d04e37b9c106..5a11b8831cb2a 100644
--- a/Alignment/OfflineValidation/python/TkAlAllInOneTool/plottingOptions.py
+++ b/Alignment/OfflineValidation/python/TkAlAllInOneTool/plottingOptions.py
@@ -13,6 +13,7 @@
 from .TkAlExceptions import AllInOneError
 from .trackSplittingValidation import TrackSplittingValidation
 from .zMuMuValidation import ZMuMuValidation
+from .overlapValidation import OverlapValidation
 
 class BasePlottingOptions(object):
     __metaclass__ = ValidationMetaClass
@@ -224,12 +225,18 @@ def __init__(self, config):
         for name in "autoLimits", "doMaps", "stdResiduals":
             self.general[name] = cppboolstring(self.general[name], name)
 
+class PlottingOptionsOverlap(BasePlottingOptions):
+    validationclass = OverlapValidation
+    def __init__(self, config):
+        super(PlottingOptionsOverlap, self).__init__(config, "overlap")
+
 def PlottingOptions(config, valType):
     plottingOptionsClasses = {
                               "offline": PlottingOptionsOffline,
                               "split": PlottingOptionsTrackSplitting,
                               "zmumu": PlottingOptionsZMuMu,
                               "primaryvertex": PlottingOptionsPrimaryVertex,
+                              "overlap": PlottingOptionsOverlap
                              }
     if isinstance(valType, type):
         valType = valType.valType
@@ -239,3 +246,6 @@ def PlottingOptions(config, valType):
             raise ValueError("Have to provide a config the first time you call PlottingOptions for {}".format(valType))
         globalDictionaries.plottingOptions[valType] = plottingOptionsClasses[valType](config)
     return globalDictionaries.plottingOptions[valType].getRepMap()
+
+
+
diff --git a/Alignment/OfflineValidation/python/TkAlStyle.py b/Alignment/OfflineValidation/python/TkAlStyle.py
new file mode 100644
index 0000000000000..4bed74f8a465c
--- /dev/null
+++ b/Alignment/OfflineValidation/python/TkAlStyle.py
@@ -0,0 +1,5 @@
+import ROOT
+
+ROOT.gROOT.ProcessLine('#include "Alignment/OfflineValidation/macros/TkAlStyle.cc"')
+
+from ROOT import TkAlStyle
diff --git a/Alignment/OfflineValidation/python/TrackerOfflineValidation_cfi.py b/Alignment/OfflineValidation/python/TrackerOfflineValidation_cfi.py
index e47038fe5268e..c7c117aabf9a8 100644
--- a/Alignment/OfflineValidation/python/TrackerOfflineValidation_cfi.py
+++ b/Alignment/OfflineValidation/python/TrackerOfflineValidation_cfi.py
@@ -15,6 +15,7 @@
     useCombinedTrajectory     = cms.bool(False),
     useOverflowForRMS         = cms.bool(False),
     maxTracks                 = cms.uint64(0),
+    chargeCut                 = cms.int32(0),
     # Normalized X Residuals, normal local coordinates (Strip)
     TH1NormXResStripModules = cms.PSet(
         Nbinx = cms.int32(100), xmin = cms.double(-5.0), xmax = cms.double(5.0)
diff --git a/Alignment/OfflineValidation/python/overlapValidationPlot.py b/Alignment/OfflineValidation/python/overlapValidationPlot.py
new file mode 100644
index 0000000000000..9a83a9c4c7c49
--- /dev/null
+++ b/Alignment/OfflineValidation/python/overlapValidationPlot.py
@@ -0,0 +1,252 @@
+from __future__ import absolute_import
+from __future__ import print_function
+
+from builtins import range
+import math
+
+import ROOT
+
+from .TkAlStyle import TkAlStyle
+
+dirNameList=["z","r","phi"]# in general directions are labeled z=0 r =1 phi =2 throughout this, I should probably think of something more elegant
+detNameList = ("BPIX", "FPIX", "TIB", "TID", "TOB", "TEC")
+def subdetCondition(subdet,module,overlap):
+        if (subdet+1 == 1 and (module == 1 or overlap ==1))or (subdet+1== 2 and (module == 0 or overlap == 0))or ((subdet+1== 3 or subdet+1== 5) and (overlap != 2 or module == 1))or ((subdet+1== 4 or subdet+1== 6) and (overlap != 2 or module == 0)):
+                return True
+        else:
+                return False
+def hist(tree_file_name, hist_name,subdet_ids,module_directions,overlap_directions,profile_directions):
+    f = ROOT.TFile(tree_file_name)
+    t = f.Get("analysis/Overlaps")
+    h = []
+    for subdet in range(6):#Creates a 4-D list of empty histograms for permutations of subdetector, overlap direction, module direction and profile direction.
+                h.append([])
+                for module in range(3):
+                        h[subdet].append([])
+                        for overlap in range(3):
+                                h[subdet][module].append([])
+                                for profile in range(4):
+                                        if subdetConditon(subdet,module,overlap):
+                                                h[subdet][module][overlap].append(0)
+                                                continue
+                                        name = hist_name + "{0}_{1}_{2}".format(dirNameList[module],dirNameList[overlap],detNameList[subdet])
+                                        if not ((subdet_ids[subdet]) and  (module_directions[module]) and (profile_directions[profile]) and overlap_directions[overlap]): #puts a 0 in any unwanted plots
+                                                h[subdet][module][overlap].append(0)
+                                                continue
+                                        if (profile>0):
+                                                if profile == 3: bins, xmin, xmax = 10, -math.pi, math.pi
+                                                if subdet+1 == 1 and profile == 1: bins, xmin, xmax = 10, -30, -30
+                                                if subdet+1 == 2 and profile == 1: bins, xmin, xmax = 40, -60, 60 
+                                                if subdet+1 == 3 and profile == 1: bins, xmin, xmax = 10, -70, 70 
+                                                if subdet+1 == 4 and profile == 1: bins, xmin, xmax = 40, -110, 110 
+                                                if subdet+1 == 5 and profile == 1: bins, xmin, xmax = 10, -110, 110
+                                                if subdet+1 == 6 and profile == 1: bins, xmin, xmax = 20, -280, 280 
+                                                if subdet+1 == 1 and profile == 2: bins, xmin, xmax = 10, 0, 20 
+                                                if subdet+1 == 2 and profile == 2: bins, xmin, xmax = 10, 0, 20
+                                                if subdet+1 == 3 and profile == 2: bins, xmin, xmax = 10, 20, 55 
+                                                if subdet+1 == 4 and profile == 2: bins, xmin, xmax = 10, 20, 55 
+                                                if subdet+1 == 5 and profile == 2: bins, xmin, xmax = 10, 55, 110 
+                                                if subdet+1 == 6 and profile == 2: bins, xmin, xmax = 10, 20, 110 
+                                                h[subdet][module][overlap].append(ROOT.TProfile(hist_name, hist_name, bins, xmin, xmax)) 
+                                        elif subdet+1==4 or subdet+1==6:
+                                            h[subdet][module][overlap].append(ROOT.TH1F(name, name, 100, -5000, 5000))
+                                        else:
+                                            h[subdet][module][overlap].append(ROOT.TH1F(name, name, 100, -300, 300))                                            
+                                        h[subdet][module][overlap][profile].SetDirectory(0)
+
+    nentries = t.GetEntries()
+
+    for i, entry in enumerate(t, start=1):#loops through the tree, filling in relevant histograms for each event
+        if i % 10000 == 0 or i == nentries:
+            print(i, "/", nentries)
+        
+        subdet_id = t.subdetID
+        if subdet_ids[subdet_id-1]==False:
+                continue
+
+        modulePhi0 = math.atan2(t.moduleY[0], t.moduleX[0]) 
+        modulePhi1 = math.atan2(t.moduleY[1], t.moduleX[1])
+        phidiff = min(abs(modulePhi0-modulePhi1), abs(math.pi - abs(modulePhi0-modulePhi1)))
+        moduleR0 = math.sqrt(t.moduleY[0]**2+t.moduleX[0]**2)
+        moduleR1 = math.sqrt(t.moduleY[1]**2+t.moduleX[1]**2)
+
+        #determines the direction the modules are in respect to each other for each event
+        if subdet_id%2 == 1 and ((abs(t.moduleZ[0] - t.moduleZ[1]) > 1)): 
+            module_direction = 0 #0 refers to Z, 1 to R and 2 to phi
+        elif subdet_id%2 == 0 and (abs(moduleR0 - moduleR1)>1):
+            module_direction = 1        
+        elif ((moduleR0*phidiff)>1):
+            module_direction = 2
+        else: #prints if this method of selecting module_direction misses anything
+            print(str(i)+" skipped")
+            continue
+        if module_directions[module_direction]==False:
+                continue
+        avgList=[(t.moduleZ[0]+t.moduleZ[1])/2,(moduleR0+moduleR1)/2,(modulePhi0+modulePhi1)/2]
+        if overlap_directions[2]:
+             overlap_direction = 2
+             if modulePhi0 > modulePhi1:
+                 hitXA = t.hitX[1]
+                 hitXB = t.hitX[0]
+                 predXA = t.predX[1]
+                 predXB = t.predX[0]
+                 overlapSignA = t.localxdotglobalphi[1]
+                 overlapSignB = t.localxdotglobalphi[0]
+             else:
+                 hitXA = t.hitX[0]
+                 hitXB = t.hitX[1]
+                 predXA = t.predX[0]
+                 predXB = t.predX[1]
+                 overlapSignA = t.localxdotglobalphi[0]
+                 overlapSignB = t.localxdotglobalphi[1]
+             residualA = hitXA - predXA
+             residualB = hitXB - predXB
+             if overlapSignA < 0:
+                 residualA *= -1
+             if overlapSignB < 0:
+                 residualB *= -1
+             A = 10000*(residualA - residualB)
+             h[subdet_id-1][module_direction][overlap_direction][0].Fill(A)
+             for profile in range(3):
+                 if profile_directions[profile+1]:
+                        h[subdet_id-1][module_direction][overlap_direction][profile+1].Fill(avgList[profile],A)
+                 
+                        
+        if subdet_id==1 and module_direction != 1 and overlap_directions[0]:
+             overlap_direction = 0
+             if t.moduleZ[0] > t.moduleZ[1]:
+                 hitXA = t.hitY[1]
+                 hitXB = t.hitY[0]
+                 predXA = t.predY[1]
+                 predXB = t.predY[0]
+                 overlapSignA = t.localydotglobalz[1]
+                 overlapSignB = t.localydotglobalz[0]
+             else:
+                 hitXA = t.hitY[0]
+                 hitXB = t.hitY[1]
+                 predXA = t.predY[0]
+                 predXB = t.predY[1]
+                 overlapSignA = t.localydotglobalz[0]
+                 overlapSignB = t.localydotglobalz[1]
+             residualA = hitXA - predXA
+             residualB = hitXB - predXB
+             if overlapSignA < 0:
+                residualA *= -1
+             if overlapSignB < 0:
+                residualB *= -1
+             A = 10000*(residualA - residualB)
+             h[subdet_id-1][module_direction][overlap_direction][0].Fill(A)
+             for profile in range(3):
+                 if profile_directions[profile+1]:
+                        h[subdet_id-1][module_direction][overlap_direction][profile+1].Fill(avgList[profile],A)
+
+        if subdet_id==2 and module_direction !=0 and overlap_directions[1]:
+             overlap_direction = 1
+             if moduleR0 > moduleR1:
+                 hitXA = t.hitY[1]
+                 hitXB = t.hitY[0]
+                 predXA = t.predY[1]
+                 predXB = t.predY[0]
+                 overlapSignA = t.localydotglobalr[1]
+                 overlapSignB = t.localydotglobalr[0]
+             else:
+                 hitXA = t.hitY[0]
+                 hitXB = t.hitY[1]
+                 predXA = t.predY[0]
+                 predXB = t.predY[1]
+                 overlapSignA = t.localydotglobalr[0]
+                 overlapSignB = t.localydotglobalr[1]
+             
+             residualA = hitXA - predXA
+             residualB = hitXB - predXB
+             if overlapSignA < 0:
+                 residualA *= -1
+             if overlapSignB < 0:
+                 residualB *= -1
+             A = 10000*(residualA - residualB)
+             h[subdet_id-1][module_direction][overlap_direction][0].Fill(A)
+             for profile in range(3):
+                 if profile_directions[profile+1]:
+                        h[subdet_id-1][module_direction][overlap_direction][profile+1].Fill(avgList[profile],A)
+    return h
+
+def plot(file_name,subdet_ids,module_directions,overlap_directions,profile_directions,*filesTitlesColorsStyles):
+
+        legend=[]
+        hstack=[]
+        
+        for subdet in range(6):#creates lists of empty THStacks and legends to be filled later
+                hstack.append([])
+                legend.append([])
+                for module in range(3):
+                        hstack[subdet].append([])
+                        legend[subdet].append([])
+                        for overlap in range(3):
+                                hstack[subdet][module].append([])
+                                legend[subdet][module].append([])
+                                for profile in range(4):
+                                        if subdetCondition(subdet,module,overlap):
+                                                hstack[subdet][module][overlap].append(0)
+                                                legend[subdet][module][overlap].append(0)
+                                                continue
+                                        if not ((subdet_ids[subdet]) and  (module_directions[module]) and (profile_directions[profile]) and overlap_directions[overlap]):
+                                                legend[subdet][module][overlap].append(0)
+                                                hstack[subdet][module][overlap].append(0)
+                                                continue
+                                        else:
+                                                hstack[subdet][module][overlap].append(ROOT.THStack("hstack",""))
+                                                legend[subdet][module][overlap].append(TkAlStyle.legend(len(filesTitlesColorsStyles), 1))
+                                                legend[subdet][module][overlap][profile].SetBorderSize(0)
+                                                legend[subdet][module][overlap][profile].SetFillStyle(0)    
+        for files, title, color, style in filesTitlesColorsStyles:
+                h = hist(files,files.replace("/",""),subdet_ids,module_directions,overlap_directions,profile_directions)
+                for subdet in range(6):
+                        for module in range(3):
+                                for overlap in range(3):
+                                        if subdetCondition(subdet,module,overlap):
+                                                        continue
+                                        for profile in range(4):
+                                                if not((subdet_ids[subdet]) and  (module_directions[module]) and (profile_directions[profile]) and overlap_directions[overlap]):
+                                                        continue
+                                                g = h[subdet][module][overlap][profile]
+                                                g.SetLineColor(color)
+                                                g.SetLineStyle(style)
+                                                hMean = g.GetMean(1)
+                                                hMeanError = g.GetMeanError(1)
+                                                if (profile==0):
+                                                        legend[subdet][module][overlap][profile].AddEntry(g, title + ", mean = {0}#pm{1}#mum ".format(round(hMean,3),round(hMeanError,3)), "l")
+                                                        g.Scale(1 / g.Integral())
+                                                else:
+                                                        legend[subdet][module][overlap][profile].AddEntry(g, title, "l")
+                                                hstack[subdet][module][overlap][profile].Add(g)
+        for subdet in range(6):
+                for module in range(3):
+                        for overlap in range(3):
+                                if subdetCondition(subdet,module,overlap):
+                                        continue
+                                for profile in range(4):
+                                        if not((subdet_ids[subdet]) and  (module_directions[module]) and (profile_directions[profile]) and overlap_directions[overlap]):
+                                                continue
+                                        currLegend = legend[subdet][module][overlap][profile]
+                                        currhstack = hstack[subdet][module][overlap][profile]
+                                        currhstack.SetMaximum(currhstack.GetMaximum("nostack") * 1.2)    
+                                        c = ROOT.TCanvas()
+                                        currhstack.Draw("hist nostack" if profile == 0 else "nostack")
+                                        currLegend.Draw()
+                                        xTitle = "hit_{A} - pred_{A} - (hit_{B} - pred_{B}) (#mum)"
+                                        yTitle="fraction of events"
+                                        save_as_file_name = file_name +  "{0}_{1}_{2}".format(dirNameList[module],dirNameList[overlap],detNameList[subdet])
+                                        if profile>0:
+                                                save_as_file_name = file_name +"Profiles/profile_{0}_{1}_{2}_{3}".format(dirNameList[module],dirNameList[overlap],detNameList[subdet],dirNameList[profile-1])
+                                                yTitle= xTitle
+                                                xTitle= dirNameList[profile-1]
+                                        currhstack.GetXaxis().SetTitle(xTitle)
+                                        currhstack.GetYaxis().SetTitle(yTitle)
+                                        if profile==0:
+                                                currhstack.GetXaxis().SetNdivisions(404)
+                                                
+                                        TkAlStyle.drawStandardTitle()        
+                                                        
+                                        for ext in "png", "eps", "root", "pdf":
+                                                c.SaveAs(save_as_file_name+"." +ext)
+
diff --git a/Alignment/OfflineValidation/scripts/compareAlignments.cc b/Alignment/OfflineValidation/scripts/compareAlignments.cc
index 57ac956efe84e..387f8ade4ecf8 100644
--- a/Alignment/OfflineValidation/scripts/compareAlignments.cc
+++ b/Alignment/OfflineValidation/scripts/compareAlignments.cc
@@ -18,7 +18,7 @@
 #include "TStyle.h"
 #include "TEnv.h"
 
-#include "Alignment/OfflineValidation/plugins/TkAlStyle.cc"
+#include "Alignment/OfflineValidation/macros/TkAlStyle.cc"
 
 
 TList *FileList;
diff --git a/Alignment/OfflineValidation/scripts/validateAlignments.py b/Alignment/OfflineValidation/scripts/validateAlignments.py
index 13b843aa91521..c5c94c28da593 100755
--- a/Alignment/OfflineValidation/scripts/validateAlignments.py
+++ b/Alignment/OfflineValidation/scripts/validateAlignments.py
@@ -40,7 +40,8 @@
     import PlottingOptions
 import Alignment.OfflineValidation.TkAlAllInOneTool.globalDictionaries \
     as globalDictionaries
-
+from Alignment.OfflineValidation.TkAlAllInOneTool.overlapValidation \
+    import OverlapValidation 
 
 ####################--- Classes ---############################
 class ParallelMergeJob(object):
@@ -178,6 +179,9 @@ def __getValidation( self, valType, name, alignments, config, options ):
                 Alignment( alignments.strip(), self.__config ), self.__config )
         elif valType == "preexistingprimaryvertex":
             validation = PreexistingPrimaryVertexValidation(name, self.__config)
+        elif valType == "overlap":
+            validation = OverlapValidation( name,
+                Alignment( alignments.strip(), self.__config ), self.__config )
         else:
             raise AllInOneError("Unknown validation mode '%s'"%valType)
 
diff --git a/Alignment/OfflineValidation/test/testTkAlStyle.C b/Alignment/OfflineValidation/test/testTkAlStyle.C
index eca8245f62a33..039561b000528 100644
--- a/Alignment/OfflineValidation/test/testTkAlStyle.C
+++ b/Alignment/OfflineValidation/test/testTkAlStyle.C
@@ -6,11 +6,11 @@
 #include "TPaveText.h"
 #include "TROOT.h"
 
-#include "../plugins/TkAlStyle.cc"
+#include "../macros/TkAlStyle.cc"
 
 
 void testTkAlStyle() {
-  gROOT->ProcessLine(".L ../plugins/TkAlStyle.cc+");
+  gROOT->ProcessLine(".L ../macros/TkAlStyle.cc+");
   TkAlStyle::set(PRELIMINARY);	// set publication status
 
   TCanvas* can = new TCanvas("can","can",500,500);
diff --git a/Alignment/ReferenceTrajectories/interface/BeamSpotGeomDet.h b/Alignment/ReferenceTrajectories/interface/BeamSpotGeomDet.h
index 08a243aaf47f8..ba6653a3a9690 100644
--- a/Alignment/ReferenceTrajectories/interface/BeamSpotGeomDet.h
+++ b/Alignment/ReferenceTrajectories/interface/BeamSpotGeomDet.h
@@ -20,25 +20,18 @@
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
 
 class BeamSpotGeomDet : public GeomDet {
- public:
-
+public:
   typedef GeomDetEnumerators::SubDetector SubDetector;
-  
-  explicit BeamSpotGeomDet(const ReferenceCountingPointer<BoundPlane>& plane)
-    :GeomDet(plane) {
+
+  explicit BeamSpotGeomDet(const ReferenceCountingPointer<BoundPlane>& plane) : GeomDet(plane) {
     setDetId(AlignableBeamSpot::detId());
   }
 
-  ~BeamSpotGeomDet() override { }
+  ~BeamSpotGeomDet() override {}
 
-  SubDetector subDetector() const override {
-    return GeomDetEnumerators::invalidDet;
-  }
+  SubDetector subDetector() const override { return GeomDetEnumerators::invalidDet; }
 
-  std::vector< const GeomDet*> components() const override {
-    return std::vector< const GeomDet*>();
-  }
+  std::vector<const GeomDet*> components() const override { return std::vector<const GeomDet*>(); }
 };
 
 #endif
-
diff --git a/Alignment/ReferenceTrajectories/interface/BeamSpotTransientTrackingRecHit.h b/Alignment/ReferenceTrajectories/interface/BeamSpotTransientTrackingRecHit.h
index 1f260501634fe..c90858eb30834 100644
--- a/Alignment/ReferenceTrajectories/interface/BeamSpotTransientTrackingRecHit.h
+++ b/Alignment/ReferenceTrajectories/interface/BeamSpotTransientTrackingRecHit.h
@@ -14,7 +14,7 @@
 
 #include <cmath>
 
-#include "DataFormats/CLHEP/interface/AlgebraicObjects.h" 
+#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/ErrorFrameTransformer.h"
 
@@ -25,21 +25,18 @@
 #include "TrackingTools/TransientTrackingRecHit/interface/TValidTrackingRecHit.h"
 
 class BeamSpotTransientTrackingRecHit final : public TValidTrackingRecHit {
- public:
-
+public:
   typedef TrackingRecHit::Type Type;
-  
-  BeamSpotTransientTrackingRecHit(const reco::BeamSpot &beamSpot,
-				  const BeamSpotGeomDet * geom,
-				  double phi)
-    : TValidTrackingRecHit(*geom) {
 
+  BeamSpotTransientTrackingRecHit(const reco::BeamSpot &beamSpot, const BeamSpotGeomDet *geom, double phi)
+      : TValidTrackingRecHit(*geom) {
     localPosition_ = det()->toLocal(GlobalPoint(beamSpot.x0(), beamSpot.y0(), beamSpot.z0()));
-    localError_ = LocalError(std::pow(beamSpot.BeamWidthX()*cos(phi), 2) +
-		  	     std::pow(beamSpot.BeamWidthY()*sin(phi), 2),
-		             0.0, std::pow(beamSpot.sigmaZ(), 2));
+    localError_ =
+        LocalError(std::pow(beamSpot.BeamWidthX() * cos(phi), 2) + std::pow(beamSpot.BeamWidthY() * sin(phi), 2),
+                   0.0,
+                   std::pow(beamSpot.sigmaZ(), 2));
   }
-    
+
   ~BeamSpotTransientTrackingRecHit() override {}
 
   LocalPoint localPosition() const override { return localPosition_; }
@@ -49,41 +46,27 @@ class BeamSpotTransientTrackingRecHit final : public TValidTrackingRecHit {
   AlgebraicSymMatrix parametersError() const override;
   int dimension() const override { return 1; }
 
-  const TrackingRecHit * hit() const override { return nullptr; }
-  TrackingRecHit * cloneHit() const override { return nullptr;}
-
-
-  std::vector<const TrackingRecHit*> recHits() const override {
-    return std::vector<const TrackingRecHit*>();
-  }
-  std::vector<TrackingRecHit*> recHits() override {
-    return std::vector<TrackingRecHit*>();
-  }
+  const TrackingRecHit *hit() const override { return nullptr; }
+  TrackingRecHit *cloneHit() const override { return nullptr; }
 
-  AlgebraicMatrix projectionMatrix() const override {
-    return theProjectionMatrix;
-  }
+  std::vector<const TrackingRecHit *> recHits() const override { return std::vector<const TrackingRecHit *>(); }
+  std::vector<TrackingRecHit *> recHits() override { return std::vector<TrackingRecHit *>(); }
 
- protected:
+  AlgebraicMatrix projectionMatrix() const override { return theProjectionMatrix; }
 
+protected:
   LocalPoint localPosition_;
   LocalError localError_;
 
- private:
-  
+private:
   // should not have assignment operator (?)
-  BeamSpotTransientTrackingRecHit & operator= (const BeamSpotTransientTrackingRecHit & t) {
-     return *(this);
-  }
+  BeamSpotTransientTrackingRecHit &operator=(const BeamSpotTransientTrackingRecHit &t) { return *(this); }
 
-  // hide the clone method for ReferenceCounted. Warning: this method is still 
+  // hide the clone method for ReferenceCounted. Warning: this method is still
   // accessible via the bas class TrackingRecHit interface!
-   BeamSpotTransientTrackingRecHit * clone() const override {
-     return new BeamSpotTransientTrackingRecHit(*this);
-   }
-   
-   static const AlgebraicMatrix theProjectionMatrix;
+  BeamSpotTransientTrackingRecHit *clone() const override { return new BeamSpotTransientTrackingRecHit(*this); }
+
+  static const AlgebraicMatrix theProjectionMatrix;
 };
 
 #endif
-
diff --git a/Alignment/ReferenceTrajectories/interface/BzeroReferenceTrajectory.h b/Alignment/ReferenceTrajectories/interface/BzeroReferenceTrajectory.h
index 6658e0f6d84a9..ddaab988f5338 100644
--- a/Alignment/ReferenceTrajectories/interface/BzeroReferenceTrajectory.h
+++ b/Alignment/ReferenceTrajectories/interface/BzeroReferenceTrajectory.h
@@ -1,5 +1,5 @@
-#ifndef Alignment_ReferenceTrajectories_BzeroReferenceTrajectory_h 
-#define Alignment_ReferenceTrajectories_BzeroReferenceTrajectory_h 
+#ifndef Alignment_ReferenceTrajectories_BzeroReferenceTrajectory_h
+#define Alignment_ReferenceTrajectories_BzeroReferenceTrajectory_h
 
 /**
  *  Class implementing the reference trajectory of a single particle in
@@ -32,9 +32,7 @@
 
 #include "Alignment/ReferenceTrajectories/interface/ReferenceTrajectory.h"
 
-class BzeroReferenceTrajectory : public ReferenceTrajectory
-{
-
+class BzeroReferenceTrajectory : public ReferenceTrajectory {
 public:
   /**Constructor with Tsos at first hit (in physical order) and list of hits 
      [if (hitsAreReverse) ==> order of hits is in opposite direction compared
@@ -45,17 +43,15 @@ class BzeroReferenceTrajectory : public ReferenceTrajectory
    */
   BzeroReferenceTrajectory(const TrajectoryStateOnSurface& tsos,
                            const TransientTrackingRecHit::ConstRecHitContainer& recHits,
-                           const MagneticField *magField,
+                           const MagneticField* magField,
                            const reco::BeamSpot& beamSpot,
                            const ReferenceTrajectoryBase::Config& config);
 
   ~BzeroReferenceTrajectory() override {}
 
-  BzeroReferenceTrajectory* clone() const override
-    { return new BzeroReferenceTrajectory(*this); }
+  BzeroReferenceTrajectory* clone() const override { return new BzeroReferenceTrajectory(*this); }
 
 private:
-
   double theMomentumEstimate;
 };
 
diff --git a/Alignment/ReferenceTrajectories/interface/DualBzeroReferenceTrajectory.h b/Alignment/ReferenceTrajectories/interface/DualBzeroReferenceTrajectory.h
index 63d40e1048d0c..95a036ed67cda 100644
--- a/Alignment/ReferenceTrajectories/interface/DualBzeroReferenceTrajectory.h
+++ b/Alignment/ReferenceTrajectories/interface/DualBzeroReferenceTrajectory.h
@@ -34,12 +34,8 @@
 
 class BzeroReferenceTrajectory;
 
-
-class DualBzeroReferenceTrajectory : public DualReferenceTrajectory
-{
-
+class DualBzeroReferenceTrajectory : public DualReferenceTrajectory {
 public:
-
   typedef TransientTrackingRecHit::ConstRecHitContainer ConstRecHitContainer;
 
   DualBzeroReferenceTrajectory(const TrajectoryStateOnSurface& tsos,
@@ -56,18 +52,18 @@ class DualBzeroReferenceTrajectory : public DualReferenceTrajectory
 protected:
   using DualReferenceTrajectory::construct;
 
-  virtual ReferenceTrajectory* construct(const TrajectoryStateOnSurface &referenceTsos, 
-					 const ConstRecHitContainer &recHits,
-					 double mass, MaterialEffects materialEffects,
-					 const PropagationDirection propDir,
-					 const MagneticField *magField,
-					 bool useBeamSpot,
-					 const reco::BeamSpot &beamSpot) const;
+  virtual ReferenceTrajectory* construct(const TrajectoryStateOnSurface& referenceTsos,
+                                         const ConstRecHitContainer& recHits,
+                                         double mass,
+                                         MaterialEffects materialEffects,
+                                         const PropagationDirection propDir,
+                                         const MagneticField* magField,
+                                         bool useBeamSpot,
+                                         const reco::BeamSpot& beamSpot) const;
 
-  AlgebraicVector extractParameters(const TrajectoryStateOnSurface &referenceTsos) const override;
+  AlgebraicVector extractParameters(const TrajectoryStateOnSurface& referenceTsos) const override;
 
   double theMomentumEstimate;
-
 };
 
 #endif
diff --git a/Alignment/ReferenceTrajectories/interface/DualReferenceTrajectory.h b/Alignment/ReferenceTrajectories/interface/DualReferenceTrajectory.h
index 3e44898f51fd3..65d4bf4d7145f 100644
--- a/Alignment/ReferenceTrajectories/interface/DualReferenceTrajectory.h
+++ b/Alignment/ReferenceTrajectories/interface/DualReferenceTrajectory.h
@@ -30,49 +30,47 @@
 #include "DataFormats/TrajectorySeed/interface/PropagationDirection.h"
 
 class ReferenceTrajectory;
-namespace reco { class BeamSpot;}
-
-class DualReferenceTrajectory : public ReferenceTrajectoryBase
-{
+namespace reco {
+  class BeamSpot;
+}
 
+class DualReferenceTrajectory : public ReferenceTrajectoryBase {
 public:
-
   typedef TransientTrackingRecHit::ConstRecHitContainer ConstRecHitContainer;
 
-  DualReferenceTrajectory(const TrajectoryStateOnSurface& tsos,
-                          const ConstRecHitContainer& forwardRecHits,
-                          const ConstRecHitContainer& backwardRecHits,
-                          const MagneticField* magField,
-                          const reco::BeamSpot& beamSpot,
-                          const ReferenceTrajectoryBase::Config& config);
+  DualReferenceTrajectory(const TrajectoryStateOnSurface &tsos,
+                          const ConstRecHitContainer &forwardRecHits,
+                          const ConstRecHitContainer &backwardRecHits,
+                          const MagneticField *magField,
+                          const reco::BeamSpot &beamSpot,
+                          const ReferenceTrajectoryBase::Config &config);
 
   ~DualReferenceTrajectory() override {}
 
-  DualReferenceTrajectory* clone() const override { return new DualReferenceTrajectory(*this); }
+  DualReferenceTrajectory *clone() const override { return new DualReferenceTrajectory(*this); }
 
 protected:
-
-  DualReferenceTrajectory(unsigned int nPar, unsigned int nHits,
-                          const ReferenceTrajectoryBase::Config& config);
+  DualReferenceTrajectory(unsigned int nPar, unsigned int nHits, const ReferenceTrajectoryBase::Config &config);
 
   /** internal method to calculate members
    */
-  virtual bool construct(const TrajectoryStateOnSurface &referenceTsos, 
-			 const ConstRecHitContainer &forwardRecHits,
-			 const ConstRecHitContainer &backwardRecHits,
-			 const MagneticField *magField,
-			 const reco::BeamSpot &beamSpot);
-
-  virtual ReferenceTrajectory* construct(const TrajectoryStateOnSurface &referenceTsos, 
-					 const ConstRecHitContainer &recHits,
-					 const MagneticField *magField,
-					 const reco::BeamSpot &beamSpot,
-					 const bool revertDirection = false) const;
+  virtual bool construct(const TrajectoryStateOnSurface &referenceTsos,
+                         const ConstRecHitContainer &forwardRecHits,
+                         const ConstRecHitContainer &backwardRecHits,
+                         const MagneticField *magField,
+                         const reco::BeamSpot &beamSpot);
+
+  virtual ReferenceTrajectory *construct(const TrajectoryStateOnSurface &referenceTsos,
+                                         const ConstRecHitContainer &recHits,
+                                         const MagneticField *magField,
+                                         const reco::BeamSpot &beamSpot,
+                                         const bool revertDirection = false) const;
 
   virtual AlgebraicVector extractParameters(const TrajectoryStateOnSurface &referenceTsos) const;
 
-  inline const PropagationDirection oppositeDirection( const PropagationDirection propDir ) const
-  { return ( propDir == anyDirection ) ? anyDirection : ( ( propDir == alongMomentum ) ? oppositeToMomentum : alongMomentum ); }
+  inline const PropagationDirection oppositeDirection(const PropagationDirection propDir) const {
+    return (propDir == anyDirection) ? anyDirection : ((propDir == alongMomentum) ? oppositeToMomentum : alongMomentum);
+  }
 
 private:
   const double mass_;
diff --git a/Alignment/ReferenceTrajectories/interface/ReferenceTrajectory.h b/Alignment/ReferenceTrajectories/interface/ReferenceTrajectory.h
index bf73a5b573cf7..22339895b8429 100644
--- a/Alignment/ReferenceTrajectories/interface/ReferenceTrajectory.h
+++ b/Alignment/ReferenceTrajectories/interface/ReferenceTrajectory.h
@@ -48,13 +48,12 @@ class MaterialEffectsUpdator;
 class Plane;
 class BeamSpotTransientTrackingRecHit;
 
-namespace reco { class BeamSpot; }
-
-class ReferenceTrajectory : public ReferenceTrajectoryBase
-{
+namespace reco {
+  class BeamSpot;
+}
 
+class ReferenceTrajectory : public ReferenceTrajectoryBase {
 public:
-
   typedef SurfaceSideDefinition::SurfaceSide SurfaceSide;
 
   /**Constructor with Tsos at first hit (in physical order) and list of hits 
@@ -64,130 +63,129 @@ class ReferenceTrajectory : public ReferenceTrajectoryBase
      the material effects to be considered and a particle mass,
      the magnetic field and beamSpot of the event are needed for propagations etc.
    */
-  ReferenceTrajectory(const TrajectoryStateOnSurface& referenceTsos,
-                      const TransientTrackingRecHit::ConstRecHitContainer& recHits,
-                      const MagneticField* magField,
-                      const reco::BeamSpot& beamSpot,
-                      const ReferenceTrajectoryBase::Config& config);
+  ReferenceTrajectory(const TrajectoryStateOnSurface &referenceTsos,
+                      const TransientTrackingRecHit::ConstRecHitContainer &recHits,
+                      const MagneticField *magField,
+                      const reco::BeamSpot &beamSpot,
+                      const ReferenceTrajectoryBase::Config &config);
 
   ~ReferenceTrajectory() override {}
 
-  ReferenceTrajectory* clone() const override { return new ReferenceTrajectory(*this); }
+  ReferenceTrajectory *clone() const override { return new ReferenceTrajectory(*this); }
 
 protected:
-
   // ReferenceTrajectory(unsigned int nPar, unsigned int nHits, MaterialEffects materialEffects);
-  ReferenceTrajectory(unsigned int nPar, unsigned int nHits,
-		      const ReferenceTrajectoryBase::Config& config);
+  ReferenceTrajectory(unsigned int nPar, unsigned int nHits, const ReferenceTrajectoryBase::Config &config);
 
   /** internal method to calculate members
    */
-  virtual bool construct(const TrajectoryStateOnSurface &referenceTsos, 
-			 const TransientTrackingRecHit::ConstRecHitContainer &recHits,
-			 const MagneticField *magField,
-			 const reco::BeamSpot &beamSpot);
+  virtual bool construct(const TrajectoryStateOnSurface &referenceTsos,
+                         const TransientTrackingRecHit::ConstRecHitContainer &recHits,
+                         const MagneticField *magField,
+                         const reco::BeamSpot &beamSpot);
 
   /** internal method to get apropriate updator
    */
-  MaterialEffectsUpdator* createUpdator(MaterialEffects materialEffects, double mass) const;
+  MaterialEffectsUpdator *createUpdator(MaterialEffects materialEffects, double mass) const;
 
   /** internal method to calculate jacobian
    */
-  virtual bool propagate(const Plane &previousSurface, const TrajectoryStateOnSurface &previousTsos,
-			 const Plane &newSurface, TrajectoryStateOnSurface &newTsos, AlgebraicMatrix &newJacobian, 
-			 AlgebraicMatrix &newCurvlinJacobian, double &nextStep,
-			 const MagneticField *magField) const;
-  
+  virtual bool propagate(const Plane &previousSurface,
+                         const TrajectoryStateOnSurface &previousTsos,
+                         const Plane &newSurface,
+                         TrajectoryStateOnSurface &newTsos,
+                         AlgebraicMatrix &newJacobian,
+                         AlgebraicMatrix &newCurvlinJacobian,
+                         double &nextStep,
+                         const MagneticField *magField) const;
+
   /** internal method to fill measurement and error matrix for hit iRow/2
    */
   virtual void fillMeasurementAndError(const TransientTrackingRecHit::ConstRecHitPointer &hitPtr,
-				       unsigned int iRow,
-				       const TrajectoryStateOnSurface &updatedTsos);
+                                       unsigned int iRow,
+                                       const TrajectoryStateOnSurface &updatedTsos);
 
   /** internal method to fill derivatives for hit iRow/2
    */
   virtual void fillDerivatives(const AlgebraicMatrix &projection,
-			       const AlgebraicMatrix &fullJacobian, unsigned int iRow);
+                               const AlgebraicMatrix &fullJacobian,
+                               unsigned int iRow);
 
   /** internal method to fill the trajectory positions for hit iRow/2
    */
-  virtual void fillTrajectoryPositions(const AlgebraicMatrix &projection, 
-				       const AlgebraicVector &mixedLocalParams, 
-				       unsigned int iRow);
+  virtual void fillTrajectoryPositions(const AlgebraicMatrix &projection,
+                                       const AlgebraicVector &mixedLocalParams,
+                                       unsigned int iRow);
 
   /** internal method to add material effects to measurments covariance matrix
    */
-  virtual bool addMaterialEffectsCov(const std::vector<AlgebraicMatrix> &allJacobians, 
-				     const std::vector<AlgebraicMatrix> &allProjections,
-				     const std::vector<AlgebraicSymMatrix> &allCurvChanges,
-				     const std::vector<AlgebraicSymMatrix> &allDeltaParaCovs);
-				     
+  virtual bool addMaterialEffectsCov(const std::vector<AlgebraicMatrix> &allJacobians,
+                                     const std::vector<AlgebraicMatrix> &allProjections,
+                                     const std::vector<AlgebraicSymMatrix> &allCurvChanges,
+                                     const std::vector<AlgebraicSymMatrix> &allDeltaParaCovs);
+
   /** internal method to add material effects using break points
    */
-  virtual bool addMaterialEffectsBp (const std::vector<AlgebraicMatrix> &allJacobians, 
-				     const std::vector<AlgebraicMatrix> &allProjections,
-				     const std::vector<AlgebraicSymMatrix> &allCurvChanges,
-				     const std::vector<AlgebraicSymMatrix> &allDeltaParaCovs,
-				     const std::vector<AlgebraicMatrix> &allLocalToCurv);
-				     
+  virtual bool addMaterialEffectsBp(const std::vector<AlgebraicMatrix> &allJacobians,
+                                    const std::vector<AlgebraicMatrix> &allProjections,
+                                    const std::vector<AlgebraicSymMatrix> &allCurvChanges,
+                                    const std::vector<AlgebraicSymMatrix> &allDeltaParaCovs,
+                                    const std::vector<AlgebraicMatrix> &allLocalToCurv);
+
   /** internal methods to add material effects using broken lines (fine version)
    */
-  virtual bool addMaterialEffectsBrl(const std::vector<AlgebraicMatrix> &allJacobians, 
-				     const std::vector<AlgebraicMatrix> &allProjections,
-				     const std::vector<AlgebraicSymMatrix> &allCurvChanges,
-				     const std::vector<AlgebraicSymMatrix> &allDeltaParaCovs,
-				     const std::vector<AlgebraicMatrix> &allLocalToCurv,
-				     const GlobalTrajectoryParameters &gtp);
+  virtual bool addMaterialEffectsBrl(const std::vector<AlgebraicMatrix> &allJacobians,
+                                     const std::vector<AlgebraicMatrix> &allProjections,
+                                     const std::vector<AlgebraicSymMatrix> &allCurvChanges,
+                                     const std::vector<AlgebraicSymMatrix> &allDeltaParaCovs,
+                                     const std::vector<AlgebraicMatrix> &allLocalToCurv,
+                                     const GlobalTrajectoryParameters &gtp);
   /** internal methods to add material effects using broken lines (coarse version)
    */
   virtual bool addMaterialEffectsBrl(const std::vector<AlgebraicMatrix> &allProjections,
-				     const std::vector<AlgebraicSymMatrix> &allDeltaParaCovs,
-				     const std::vector<AlgebraicMatrix> &allLocalToCurv,
-				     const std::vector<double> &allSteps,
-				     const GlobalTrajectoryParameters &gtp,   
-				     const double minStep = 1.0);
-  
+                                     const std::vector<AlgebraicSymMatrix> &allDeltaParaCovs,
+                                     const std::vector<AlgebraicMatrix> &allLocalToCurv,
+                                     const std::vector<double> &allSteps,
+                                     const GlobalTrajectoryParameters &gtp,
+                                     const double minStep = 1.0);
+
   /** internal methods to add material effects using broken lines (fine version, local system)
    */
   virtual bool addMaterialEffectsLocalGbl(const std::vector<AlgebraicMatrix> &allJacobians,
-                                     const std::vector<AlgebraicMatrix> &allProjections,
-                                     const std::vector<AlgebraicSymMatrix> &allCurvatureChanges,
-                                     const std::vector<AlgebraicSymMatrix> &allDeltaParameterCovs);
+                                          const std::vector<AlgebraicMatrix> &allProjections,
+                                          const std::vector<AlgebraicSymMatrix> &allCurvatureChanges,
+                                          const std::vector<AlgebraicSymMatrix> &allDeltaParameterCovs);
 
   /** internal methods to add material effects using broken lines (fine version, curvilinear system)
    */
   virtual bool addMaterialEffectsCurvlinGbl(const std::vector<AlgebraicMatrix> &allJacobians,
-                                     const std::vector<AlgebraicMatrix> &allProjections,
-                                     const std::vector<AlgebraicSymMatrix> &allCurvChanges,
-                                     const std::vector<AlgebraicSymMatrix> &allDeltaParaCovs,
-                                     const std::vector<AlgebraicMatrix> &allLocalToCurv);
-          
+                                            const std::vector<AlgebraicMatrix> &allProjections,
+                                            const std::vector<AlgebraicSymMatrix> &allCurvChanges,
+                                            const std::vector<AlgebraicSymMatrix> &allDeltaParaCovs,
+                                            const std::vector<AlgebraicMatrix> &allLocalToCurv);
+
   /// Don't care for propagation direction 'anyDirection' - in that case the material effects
   /// are anyway not updated ...
-  inline SurfaceSide surfaceSide(const PropagationDirection dir) const
-  {
-    return ( dir == alongMomentum ) ?
-      SurfaceSideDefinition::beforeSurface :
-      SurfaceSideDefinition::afterSurface;
+  inline SurfaceSide surfaceSide(const PropagationDirection dir) const {
+    return (dir == alongMomentum) ? SurfaceSideDefinition::beforeSurface : SurfaceSideDefinition::afterSurface;
   }
 
   /** first (generic) helper to get the projection matrix
    */
-  AlgebraicMatrix
-    getHitProjectionMatrix(const TransientTrackingRecHit::ConstRecHitPointer &recHit) const;
+  AlgebraicMatrix getHitProjectionMatrix(const TransientTrackingRecHit::ConstRecHitPointer &recHit) const;
 
   /** second helper (templated on the dimension) to get the projection matrix
    */
   template <unsigned int N>
-    AlgebraicMatrix
-    getHitProjectionMatrixT(const TransientTrackingRecHit::ConstRecHitPointer &recHit) const;
+  AlgebraicMatrix getHitProjectionMatrixT(const TransientTrackingRecHit::ConstRecHitPointer &recHit) const;
+
 private:
   template <typename Derived>
-  void clhep2eigen(const AlgebraicVector& in, Eigen::MatrixBase<Derived>& out);
+  void clhep2eigen(const AlgebraicVector &in, Eigen::MatrixBase<Derived> &out);
   template <typename Derived>
-  void clhep2eigen(const AlgebraicMatrix& in, Eigen::MatrixBase<Derived>& out);
+  void clhep2eigen(const AlgebraicMatrix &in, Eigen::MatrixBase<Derived> &out);
   template <typename Derived>
-  void clhep2eigen(const AlgebraicSymMatrix& in, Eigen::MatrixBase<Derived>& out);
+  void clhep2eigen(const AlgebraicSymMatrix &in, Eigen::MatrixBase<Derived> &out);
 
   const double mass_;
   const MaterialEffects materialEffects_;
diff --git a/Alignment/ReferenceTrajectories/interface/ReferenceTrajectoryBase.h b/Alignment/ReferenceTrajectories/interface/ReferenceTrajectoryBase.h
index f15fa6038d0aa..74d4fbcf13030 100644
--- a/Alignment/ReferenceTrajectories/interface/ReferenceTrajectoryBase.h
+++ b/Alignment/ReferenceTrajectories/interface/ReferenceTrajectoryBase.h
@@ -102,26 +102,28 @@
 
 #include "GblTrajectory.h"
 
-
-class ReferenceTrajectoryBase : public ReferenceCounted
-{
-
+class ReferenceTrajectoryBase : public ReferenceCounted {
 public:
-
   typedef ReferenceCountingPointer<ReferenceTrajectoryBase> ReferenceTrajectoryPtr;
 
-  enum MaterialEffects { none, multipleScattering, energyLoss, combined, 
-			 breakPoints, brokenLinesCoarse, brokenLinesFine, localGBL, curvlinGBL };
+  enum MaterialEffects {
+    none,
+    multipleScattering,
+    energyLoss,
+    combined,
+    breakPoints,
+    brokenLinesCoarse,
+    brokenLinesFine,
+    localGBL,
+    curvlinGBL
+  };
 
   struct Config {
-    Config(MaterialEffects matEff, PropagationDirection direction,
-	   double m = -std::numeric_limits<double>::infinity(),
-	   double est = -std::numeric_limits<double>::infinity()) :
-      materialEffects(matEff),
-      propDir(direction),
-      mass(m),
-      momentumEstimate(est)
-    {}
+    Config(MaterialEffects matEff,
+           PropagationDirection direction,
+           double m = -std::numeric_limits<double>::infinity(),
+           double est = -std::numeric_limits<double>::infinity())
+        : materialEffects(matEff), propDir(direction), mass(m), momentumEstimate(est) {}
 
     MaterialEffects materialEffects;
     PropagationDirection propDir;
@@ -146,7 +148,7 @@ class ReferenceTrajectoryBase : public ReferenceCounted
   /** Returns the full covariance matrix of the measurements. ORCA-equivalent: covariance()
    */
   const AlgebraicSymMatrix& measurementErrors() const { return theMeasurementsCov; }
-  
+
   /** Returns the local coordinates of the reference trajectory.
       ORCA-equivalent: referenceTrack()
    */
@@ -166,8 +168,8 @@ class ReferenceTrajectoryBase : public ReferenceCounted
   const AlgebraicMatrix& trajectoryToCurv() const { return theInnerTrajectoryToCurvilinear; }
   /** Returns the transformation of local to tracjectory parameters
    */
-  const AlgebraicMatrix& localToTrajectory() const { return theInnerLocalToTrajectory; }  
-  
+  const AlgebraicMatrix& localToTrajectory() const { return theInnerLocalToTrajectory; }
+
   /** Returns the GBL input
    */
   std::vector<std::pair<std::vector<gbl::GblPoint>, Eigen::MatrixXd> >& gblInput() { return theGblInput; }
@@ -183,10 +185,9 @@ class ReferenceTrajectoryBase : public ReferenceCounted
   /** Returns the GBL external derivatives.
    */
   const Eigen::VectorXd& gblExtPrecisions() const { return theGblExtPrecisions; }
-  
 
   /** Returns the set of 'track'-parameters.
-   */  
+   */
   const AlgebraicVector& parameters() const { return theParameters; }
 
   /** Returns true if the covariance matrix of the 'track'-parameters is set.
@@ -195,8 +196,11 @@ class ReferenceTrajectoryBase : public ReferenceCounted
 
   /** Set the covariance matrix of the 'track'-parameters.
    */
-  inline void setParameterErrors( const AlgebraicSymMatrix& error ) { theParameterCov = error; theParamCovFlag = true; }
-  
+  inline void setParameterErrors(const AlgebraicSymMatrix& error) {
+    theParameterCov = error;
+    theParamCovFlag = true;
+  }
+
   /** Returns the covariance matrix of the 'track'-parameters.
    */
   inline const AlgebraicSymMatrix& parameterErrors() const { return theParameterCov; }
@@ -212,57 +216,57 @@ class ReferenceTrajectoryBase : public ReferenceCounted
 
   inline unsigned int numberOfHits() const { return theNumberOfHits; }
   inline unsigned int numberOfPar() const { return theNumberOfPars; }
-  inline unsigned int numberOfVirtualMeas() const { return theNumberOfVirtualMeas; }  
-  inline unsigned int numberOfVirtualPar() const { return theNumberOfVirtualPars; }  
-  inline unsigned int numberOfHitMeas() const { return theNumberOfHits * nMeasPerHit; } 
+  inline unsigned int numberOfVirtualMeas() const { return theNumberOfVirtualMeas; }
+  inline unsigned int numberOfVirtualPar() const { return theNumberOfVirtualPars; }
+  inline unsigned int numberOfHitMeas() const { return theNumberOfHits * nMeasPerHit; }
   inline int nominalField() const { return theNomField; }
-       
+
   virtual ReferenceTrajectoryBase* clone() const = 0;
 
 protected:
+  explicit ReferenceTrajectoryBase(unsigned int nPar,
+                                   unsigned int nHits,
+                                   unsigned int nVirtualPar,
+                                   unsigned int nVirtualMeas);
 
-  explicit ReferenceTrajectoryBase(unsigned int nPar, unsigned int nHits,
-				   unsigned int nVirtualPar, unsigned int nVirtualMeas);
-
-  unsigned int numberOfUsedRecHits(const TransientTrackingRecHit::ConstRecHitContainer &recHits) const;
+  unsigned int numberOfUsedRecHits(const TransientTrackingRecHit::ConstRecHitContainer& recHits) const;
   bool useRecHit(const TransientTrackingRecHit::ConstRecHitPointer& hitPtr) const;
 
   bool theValidityFlag;
   bool theParamCovFlag;
 
-  unsigned int theNumberOfHits;   // number of (measurements from) hits
-  unsigned int theNumberOfPars;   // number of (track) parameters
-  unsigned int theNumberOfVirtualMeas; // number of virtual measurements
-  unsigned int theNumberOfVirtualPars; // number of parameters for virtual measurements
-      
+  unsigned int theNumberOfHits;         // number of (measurements from) hits
+  unsigned int theNumberOfPars;         // number of (track) parameters
+  unsigned int theNumberOfVirtualMeas;  // number of virtual measurements
+  unsigned int theNumberOfVirtualPars;  // number of parameters for virtual measurements
+
   std::vector<TrajectoryStateOnSurface> theTsosVec;
   TransientTrackingRecHit::ConstRecHitContainer theRecHits;
 
-  AlgebraicVector     theMeasurements;
-  AlgebraicSymMatrix  theMeasurementsCov;
+  AlgebraicVector theMeasurements;
+  AlgebraicSymMatrix theMeasurementsCov;
 
-  AlgebraicVector     theTrajectoryPositions;
-  AlgebraicSymMatrix  theTrajectoryPositionCov;
+  AlgebraicVector theTrajectoryPositions;
+  AlgebraicSymMatrix theTrajectoryPositionCov;
 
-  AlgebraicVector     theParameters;
-  AlgebraicSymMatrix  theParameterCov;
+  AlgebraicVector theParameters;
+  AlgebraicSymMatrix theParameterCov;
 
-  AlgebraicMatrix     theDerivatives;
+  AlgebraicMatrix theDerivatives;
 
-// CHK for beamspot   transformation trajectory parameter to curvilinear at refTSos
-  AlgebraicMatrix     theInnerTrajectoryToCurvilinear;  
-// CHK for TwoBodyD.  transformation local to trajectory parameter at refTsos
-  AlgebraicMatrix     theInnerLocalToTrajectory;
-// CHK GBL input:     list of (list of points on trajectory and transformation at inner (first) point)
+  // CHK for beamspot   transformation trajectory parameter to curvilinear at refTSos
+  AlgebraicMatrix theInnerTrajectoryToCurvilinear;
+  // CHK for TwoBodyD.  transformation local to trajectory parameter at refTsos
+  AlgebraicMatrix theInnerLocalToTrajectory;
+  // CHK GBL input:     list of (list of points on trajectory and transformation at inner (first) point)
   std::vector<std::pair<std::vector<gbl::GblPoint>, Eigen::MatrixXd> > theGblInput;
-  int                           theNomField;
-// CHK GBL TBD:       virtual (mass) measurement
-  Eigen::MatrixXd     theGblExtDerivatives;
-  Eigen::VectorXd     theGblExtMeasurements;
-  Eigen::VectorXd     theGblExtPrecisions;
-    
+  int theNomField;
+  // CHK GBL TBD:       virtual (mass) measurement
+  Eigen::MatrixXd theGblExtDerivatives;
+  Eigen::VectorXd theGblExtMeasurements;
+  Eigen::VectorXd theGblExtPrecisions;
+
   static constexpr unsigned int nMeasPerHit{2};
 };
 
-#endif // REFERENCE_TRAJECTORY_BASE_H
-
+#endif  // REFERENCE_TRAJECTORY_BASE_H
diff --git a/Alignment/ReferenceTrajectories/interface/TrajectoryFactoryBase.h b/Alignment/ReferenceTrajectories/interface/TrajectoryFactoryBase.h
index 0290ff8ad6ce2..191d29d92726c 100644
--- a/Alignment/ReferenceTrajectories/interface/TrajectoryFactoryBase.h
+++ b/Alignment/ReferenceTrajectories/interface/TrajectoryFactoryBase.h
@@ -13,56 +13,51 @@
 /// Base class for factories producing reference trajectories, i.e. instances of classes deriving from
 /// ReferenceTrajectoryBase, from a TrajTrackPairCollection.
 
+namespace reco {
+  class BeamSpot;
+}
 
-namespace reco { class BeamSpot;}
-
-class TrajectoryFactoryBase
-{
-
+class TrajectoryFactoryBase {
 public:
-
   typedef ReferenceTrajectoryBase::ReferenceTrajectoryPtr ReferenceTrajectoryPtr;
   typedef ReferenceTrajectoryBase::MaterialEffects MaterialEffects;
   typedef AlignmentAlgorithmBase::ConstTrajTrackPair ConstTrajTrackPair;
   typedef AlignmentAlgorithmBase::ConstTrajTrackPairCollection ConstTrajTrackPairCollection;
-  typedef std::vector< ReferenceTrajectoryPtr > ReferenceTrajectoryCollection;
-  typedef std::pair< TrajectoryStateOnSurface, TransientTrackingRecHit::ConstRecHitContainer > TrajectoryInput;
-  typedef std::vector< TrajectoryStateOnSurface > ExternalPredictionCollection;
+  typedef std::vector<ReferenceTrajectoryPtr> ReferenceTrajectoryCollection;
+  typedef std::pair<TrajectoryStateOnSurface, TransientTrackingRecHit::ConstRecHitContainer> TrajectoryInput;
+  typedef std::vector<TrajectoryStateOnSurface> ExternalPredictionCollection;
 
   TrajectoryFactoryBase(const edm::ParameterSet& config);
-  TrajectoryFactoryBase(const edm::ParameterSet& config,
-                        unsigned int tracksPerTrajectory);
-  virtual ~TrajectoryFactoryBase( void );
+  TrajectoryFactoryBase(const edm::ParameterSet& config, unsigned int tracksPerTrajectory);
+  virtual ~TrajectoryFactoryBase(void);
 
-  virtual const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
-							   const ConstTrajTrackPairCollection &tracks,
-							   const reco::BeamSpot &beamSpot) const = 0;
+  virtual const ReferenceTrajectoryCollection trajectories(const edm::EventSetup& setup,
+                                                           const ConstTrajTrackPairCollection& tracks,
+                                                           const reco::BeamSpot& beamSpot) const = 0;
 
-  virtual const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
-							   const ConstTrajTrackPairCollection &tracks,
-							   const ExternalPredictionCollection &external,
-							   const reco::BeamSpot &beamSpot) const = 0;
+  virtual const ReferenceTrajectoryCollection trajectories(const edm::EventSetup& setup,
+                                                           const ConstTrajTrackPairCollection& tracks,
+                                                           const ExternalPredictionCollection& external,
+                                                           const reco::BeamSpot& beamSpot) const = 0;
 
-  virtual TrajectoryFactoryBase* clone( void ) const = 0;
+  virtual TrajectoryFactoryBase* clone(void) const = 0;
 
-  inline MaterialEffects materialEffects( void ) const { return materialEffects_; }
-  inline PropagationDirection propagationDirection( void ) const { return propDir_; }
+  inline MaterialEffects materialEffects(void) const { return materialEffects_; }
+  inline PropagationDirection propagationDirection(void) const { return propDir_; }
   inline const edm::ParameterSet& configuration() const { return cfg_; }
   inline unsigned int tracksPerTrajectory() const { return tracksPerTrajectory_; }
 
 protected:
-
-  virtual const TrajectoryInput innermostStateAndRecHits( const ConstTrajTrackPair & track ) const;
-  virtual const Trajectory::DataContainer orderedTrajectoryMeasurements( const Trajectory & trajectory ) const;
-  bool sameSurface( const Surface& s1, const Surface& s2 ) const;
-  bool useRecHit( const TransientTrackingRecHit::ConstRecHitPointer& hitPtr ) const;
+  virtual const TrajectoryInput innermostStateAndRecHits(const ConstTrajTrackPair& track) const;
+  virtual const Trajectory::DataContainer orderedTrajectoryMeasurements(const Trajectory& trajectory) const;
+  bool sameSurface(const Surface& s1, const Surface& s2) const;
+  bool useRecHit(const TransientTrackingRecHit::ConstRecHitPointer& hitPtr) const;
 
 private:
+  MaterialEffects materialEffects(const std::string& strME) const;
+  PropagationDirection propagationDirection(const std::string& strPD) const;
 
-  MaterialEffects materialEffects( const std::string & strME ) const;
-  PropagationDirection propagationDirection( const std::string & strPD ) const;
-
-  const edm::ParameterSet cfg_; // need to keep for possible re-use after constructor... :-(
+  const edm::ParameterSet cfg_;  // need to keep for possible re-use after constructor... :-(
   const unsigned int tracksPerTrajectory_;
   const MaterialEffects materialEffects_;
   const PropagationDirection propDir_;
@@ -70,13 +65,11 @@ class TrajectoryFactoryBase
   const bool useWithoutDet_;
   const bool useInvalidHits_;
   const bool useProjectedHits_;
-  
-protected:
 
+protected:
   const bool useBeamSpot_;
   const bool includeAPEs_;
   const bool allowZeroMaterial_;
 };
 
-
 #endif
diff --git a/Alignment/ReferenceTrajectories/interface/TrajectoryFactoryPlugin.h b/Alignment/ReferenceTrajectories/interface/TrajectoryFactoryPlugin.h
index 041b3457733aa..4ce8bfa38c038 100644
--- a/Alignment/ReferenceTrajectories/interface/TrajectoryFactoryPlugin.h
+++ b/Alignment/ReferenceTrajectories/interface/TrajectoryFactoryPlugin.h
@@ -8,8 +8,6 @@
 
 /// A PluginFactory that produces factories that inherit from TrajectoryFactoryBase.
 
-
-typedef edmplugin::PluginFactory< TrajectoryFactoryBase *( const edm::ParameterSet & ) >
-                   TrajectoryFactoryPlugin;
+typedef edmplugin::PluginFactory<TrajectoryFactoryBase *(const edm::ParameterSet &)> TrajectoryFactoryPlugin;
 
 #endif
diff --git a/Alignment/ReferenceTrajectories/interface/TwoBodyDecayTrajectory.h b/Alignment/ReferenceTrajectories/interface/TwoBodyDecayTrajectory.h
index 1e31f1325ddc8..bdaa7966f8f24 100644
--- a/Alignment/ReferenceTrajectories/interface/TwoBodyDecayTrajectory.h
+++ b/Alignment/ReferenceTrajectories/interface/TwoBodyDecayTrajectory.h
@@ -4,20 +4,18 @@
 #include "Alignment/ReferenceTrajectories/interface/ReferenceTrajectory.h"
 #include "Alignment/ReferenceTrajectories/interface/TwoBodyDecayTrajectoryState.h"
 
-
 /**
    by Edmund Widl, see CMS NOTE-2007/032.
  */
 
-namespace reco { class BeamSpot; }
-
-class TwoBodyDecayTrajectory : public ReferenceTrajectoryBase
-{
+namespace reco {
+  class BeamSpot;
+}
 
+class TwoBodyDecayTrajectory : public ReferenceTrajectoryBase {
 public:
-
   typedef TransientTrackingRecHit::ConstRecHitContainer ConstRecHitContainer;
-  typedef std::pair< ConstRecHitContainer, ConstRecHitContainer > ConstRecHitCollection;
+  typedef std::pair<ConstRecHitContainer, ConstRecHitContainer> ConstRecHitCollection;
 
   TwoBodyDecayTrajectory(const TwoBodyDecayTrajectoryState& tsos,
                          const ConstRecHitCollection& recHits,
@@ -25,38 +23,34 @@ class TwoBodyDecayTrajectory : public ReferenceTrajectoryBase
                          const reco::BeamSpot& beamSpot,
                          const ReferenceTrajectoryBase::Config& config);
 
-  TwoBodyDecayTrajectory( void );
+  TwoBodyDecayTrajectory(void);
 
-  ~TwoBodyDecayTrajectory( void ) override {}
+  ~TwoBodyDecayTrajectory(void) override {}
 
-  TwoBodyDecayTrajectory* clone( void ) const override
-    { return new TwoBodyDecayTrajectory( *this ); }
+  TwoBodyDecayTrajectory* clone(void) const override { return new TwoBodyDecayTrajectory(*this); }
 
   /**Number of RecHits belonging to the first and second track.
    */
-  inline const std::pair< int, int > numberOfRecHits( void ) { return theNumberOfRecHits; }
+  inline const std::pair<int, int> numberOfRecHits(void) { return theNumberOfRecHits; }
 
 private:
-
   bool construct(const TwoBodyDecayTrajectoryState& state,
                  const ConstRecHitCollection& recHits,
                  const MagneticField* field,
                  const reco::BeamSpot& beamSpot);
 
-  void constructTsosVecWithErrors( const ReferenceTrajectory& traj1,
-				   const ReferenceTrajectory& traj2,
-				   const MagneticField* field );
+  void constructTsosVecWithErrors(const ReferenceTrajectory& traj1,
+                                  const ReferenceTrajectory& traj2,
+                                  const MagneticField* field);
 
-  void constructSingleTsosWithErrors( const TrajectoryStateOnSurface & tsos,
-				      int iTsos,
-				      const MagneticField* field );
+  void constructSingleTsosWithErrors(const TrajectoryStateOnSurface& tsos, int iTsos, const MagneticField* field);
 
   const MaterialEffects materialEffects_;
   const PropagationDirection propDir_;
   const bool useRefittedState_;
   const bool constructTsosWithErrors_;
 
-  std::pair< int, int > theNumberOfRecHits;
+  std::pair<int, int> theNumberOfRecHits;
 };
 
 #endif
diff --git a/Alignment/ReferenceTrajectories/interface/TwoBodyDecayTrajectoryState.h b/Alignment/ReferenceTrajectories/interface/TwoBodyDecayTrajectoryState.h
index 9c367805c0907..72c556a5a9ea7 100644
--- a/Alignment/ReferenceTrajectories/interface/TwoBodyDecayTrajectoryState.h
+++ b/Alignment/ReferenceTrajectories/interface/TwoBodyDecayTrajectoryState.h
@@ -9,54 +9,48 @@
 
 class GlobalTrajectoryParameters;
 
-
-class TwoBodyDecayTrajectoryState
-{
-
+class TwoBodyDecayTrajectoryState {
 public:
-
-  typedef std::pair< TrajectoryStateOnSurface, TrajectoryStateOnSurface > TsosContainer;
-  typedef std::pair< AlgebraicMatrix, AlgebraicMatrix > Derivatives;
+  typedef std::pair<TrajectoryStateOnSurface, TrajectoryStateOnSurface> TsosContainer;
+  typedef std::pair<AlgebraicMatrix, AlgebraicMatrix> Derivatives;
 
   /** The constructor takes the two trajectory states that are to be updated (typically the
    *  innermost trajectory states of two tracks) and the decay parameters.
    */
-  TwoBodyDecayTrajectoryState( const TsosContainer & tsos,
-			       const TwoBodyDecay & tbd,
-			       double particleMass,
-			       const MagneticField* magField,
-			       bool propagateErrors = false );
+  TwoBodyDecayTrajectoryState(const TsosContainer& tsos,
+                              const TwoBodyDecay& tbd,
+                              double particleMass,
+                              const MagneticField* magField,
+                              bool propagateErrors = false);
 
-  ~TwoBodyDecayTrajectoryState( void ) {}
+  ~TwoBodyDecayTrajectoryState(void) {}
 
-  inline bool isValid( void ) const { return theValidityFlag; }
+  inline bool isValid(void) const { return theValidityFlag; }
 
-  inline double particleMass( void ) const { return theParticleMass; }
-  inline const TwoBodyDecayParameters & decayParameters( void ) const { return theParameters; }
-  inline const TsosContainer& trajectoryStates( bool useRefittedState = true ) const { return useRefittedState ? theRefittedTsos : theOriginalTsos; }
-  inline const Derivatives& derivatives( void ) const { return theDerivatives; }
+  inline double particleMass(void) const { return theParticleMass; }
+  inline const TwoBodyDecayParameters& decayParameters(void) const { return theParameters; }
+  inline const TsosContainer& trajectoryStates(bool useRefittedState = true) const {
+    return useRefittedState ? theRefittedTsos : theOriginalTsos;
+  }
+  inline const Derivatives& derivatives(void) const { return theDerivatives; }
 
-  void rescaleError( double scale );
+  void rescaleError(double scale);
 
-  inline double primaryMass( void ) const { return thePrimaryMass; }
-  inline double primaryWidth( void ) const { return thePrimaryWidth; }
+  inline double primaryMass(void) const { return thePrimaryMass; }
+  inline double primaryWidth(void) const { return thePrimaryWidth; }
 
 private:
+  void construct(const MagneticField* magField, bool propagateErrors);
 
-  void construct( const MagneticField* magField,
-		  bool propagateErrors );
+  bool propagateSingleState(const FreeTrajectoryState& fts,
+                            const GlobalTrajectoryParameters& gtp,
+                            const AlgebraicMatrix& startDeriv,
+                            const Surface& surface,
+                            const MagneticField* magField,
+                            TrajectoryStateOnSurface& tsos,
+                            AlgebraicMatrix& endDeriv) const;
 
-  bool propagateSingleState( const FreeTrajectoryState & fts,
-			     const GlobalTrajectoryParameters & gtp,
-			     const AlgebraicMatrix & startDeriv,
-			     const Surface & surface,
-			     const MagneticField* magField,
-			     TrajectoryStateOnSurface & tsos,
-			     AlgebraicMatrix & endDeriv ) const;
-
-
-  void setError( FreeTrajectoryState& fts,
-		 AlgebraicMatrix& derivative ) const;
+  void setError(FreeTrajectoryState& fts, AlgebraicMatrix& derivative) const;
 
   bool theValidityFlag;
 
@@ -74,5 +68,4 @@ class TwoBodyDecayTrajectoryState
   static const unsigned int nDecayParam = TwoBodyDecayParameters::dimension;
 };
 
-
 #endif
diff --git a/Alignment/ReferenceTrajectories/plugins/BzeroReferenceTrajectoryFactory.cc b/Alignment/ReferenceTrajectories/plugins/BzeroReferenceTrajectoryFactory.cc
index e3911f0215cd6..b237810c4fe90 100644
--- a/Alignment/ReferenceTrajectories/plugins/BzeroReferenceTrajectoryFactory.cc
+++ b/Alignment/ReferenceTrajectories/plugins/BzeroReferenceTrajectoryFactory.cc
@@ -1,7 +1,7 @@
 // Local include from plugins directory...:
 #include "BzeroReferenceTrajectoryFactory.h"
 
-#include "Alignment/ReferenceTrajectories/interface/BzeroReferenceTrajectory.h" 
+#include "Alignment/ReferenceTrajectories/interface/BzeroReferenceTrajectory.h"
 #include "Alignment/ReferenceTrajectories/interface/TrajectoryFactoryPlugin.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -9,60 +9,49 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" 
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 
 #include "Alignment/ReferenceTrajectories/interface/TrajectoryFactoryBase.h"
 
 /// A factory that produces instances of class BzeroReferenceTrajectory from a
 /// given TrajTrackPairCollection.
 
-
 /////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////
 
-BzeroReferenceTrajectoryFactory::BzeroReferenceTrajectoryFactory(const edm::ParameterSet &config) :
-  TrajectoryFactoryBase(config),
-  theMass(config.getParameter<double>("ParticleMass")), 
-  theMomentumEstimate(config.getParameter<double>("MomentumEstimate"))
-{
+BzeroReferenceTrajectoryFactory::BzeroReferenceTrajectoryFactory(const edm::ParameterSet &config)
+    : TrajectoryFactoryBase(config),
+      theMass(config.getParameter<double>("ParticleMass")),
+      theMomentumEstimate(config.getParameter<double>("MomentumEstimate")) {
   edm::LogInfo("Alignment") << "@SUB=BzeroReferenceTrajectoryFactory"
-                            << "mass: " << theMass
-                            << "\nmomentum: " << theMomentumEstimate;
+                            << "mass: " << theMass << "\nmomentum: " << theMomentumEstimate;
 }
 
-BzeroReferenceTrajectoryFactory::~BzeroReferenceTrajectoryFactory( void ) {}
-
+BzeroReferenceTrajectoryFactory::~BzeroReferenceTrajectoryFactory(void) {}
 
 /////////////////////////////////////////////////////////////////////
-const BzeroReferenceTrajectoryFactory::ReferenceTrajectoryCollection
-BzeroReferenceTrajectoryFactory::trajectories(const edm::EventSetup &setup,
-					      const ConstTrajTrackPairCollection &tracks,
-					      const reco::BeamSpot &beamSpot) const
-{
+const BzeroReferenceTrajectoryFactory::ReferenceTrajectoryCollection BzeroReferenceTrajectoryFactory::trajectories(
+    const edm::EventSetup &setup, const ConstTrajTrackPairCollection &tracks, const reco::BeamSpot &beamSpot) const {
   ReferenceTrajectoryCollection trajectories;
 
-  edm::ESHandle< MagneticField > magneticField;
-  setup.get< IdealMagneticFieldRecord >().get( magneticField );
+  edm::ESHandle<MagneticField> magneticField;
+  setup.get<IdealMagneticFieldRecord>().get(magneticField);
 
   ConstTrajTrackPairCollection::const_iterator itTracks = tracks.begin();
 
-  while ( itTracks != tracks.end() )
-  { 
-    TrajectoryInput input = this->innermostStateAndRecHits( *itTracks );
+  while (itTracks != tracks.end()) {
+    TrajectoryInput input = this->innermostStateAndRecHits(*itTracks);
     // Check input: If all hits were rejected, the TSOS is initialized as invalid.
-    if ( input.first.isValid() )
-    {
-      ReferenceTrajectoryBase::Config config(materialEffects(), propagationDirection(),
-                                             theMass, theMomentumEstimate);
+    if (input.first.isValid()) {
+      ReferenceTrajectoryBase::Config config(materialEffects(), propagationDirection(), theMass, theMomentumEstimate);
       config.useBeamSpot = useBeamSpot_;
       config.includeAPEs = includeAPEs_;
       config.allowZeroMaterial = allowZeroMaterial_;
       // set the flag for reversing the RecHits to false, since they are already in the correct order.
       config.hitsAreReverse = false;
-      trajectories.push_back(ReferenceTrajectoryPtr(new BzeroReferenceTrajectory(input.first, input.second,
-                                                                                 magneticField.product(),
-                                                                                 beamSpot, config)));
+      trajectories.push_back(ReferenceTrajectoryPtr(
+          new BzeroReferenceTrajectory(input.first, input.second, magneticField.product(), beamSpot, config)));
     }
 
     ++itTracks;
@@ -71,67 +60,55 @@ BzeroReferenceTrajectoryFactory::trajectories(const edm::EventSetup &setup,
   return trajectories;
 }
 
-
 /////////////////////////////////////////////////////////////////////
-const BzeroReferenceTrajectoryFactory::ReferenceTrajectoryCollection
-BzeroReferenceTrajectoryFactory::trajectories(const edm::EventSetup &setup,
-					      const ConstTrajTrackPairCollection &tracks,
-					      const ExternalPredictionCollection &external,
-					      const reco::BeamSpot &beamSpot) const
-{
+const BzeroReferenceTrajectoryFactory::ReferenceTrajectoryCollection BzeroReferenceTrajectoryFactory::trajectories(
+    const edm::EventSetup &setup,
+    const ConstTrajTrackPairCollection &tracks,
+    const ExternalPredictionCollection &external,
+    const reco::BeamSpot &beamSpot) const {
   ReferenceTrajectoryCollection trajectories;
 
-  if ( tracks.size() != external.size() )
-  {
-    edm::LogInfo("ReferenceTrajectories") << "@SUB=BzeroReferenceTrajectoryFactory::trajectories"
-					  << "Inconsistent input:\n"
-					  << "\tnumber of tracks = " << tracks.size()
-					  << "\tnumber of external predictions = " << external.size();
+  if (tracks.size() != external.size()) {
+    edm::LogInfo("ReferenceTrajectories")
+        << "@SUB=BzeroReferenceTrajectoryFactory::trajectories"
+        << "Inconsistent input:\n"
+        << "\tnumber of tracks = " << tracks.size() << "\tnumber of external predictions = " << external.size();
     return trajectories;
   }
 
-  edm::ESHandle< MagneticField > magneticField;
-  setup.get< IdealMagneticFieldRecord >().get( magneticField );
+  edm::ESHandle<MagneticField> magneticField;
+  setup.get<IdealMagneticFieldRecord>().get(magneticField);
 
   ConstTrajTrackPairCollection::const_iterator itTracks = tracks.begin();
   ExternalPredictionCollection::const_iterator itExternal = external.begin();
 
-  while ( itTracks != tracks.end() )
-  {
-    TrajectoryInput input = innermostStateAndRecHits( *itTracks );
+  while (itTracks != tracks.end()) {
+    TrajectoryInput input = innermostStateAndRecHits(*itTracks);
     // Check input: If all hits were rejected, the TSOS is initialized as invalid.
-    if ( input.first.isValid() )
-    {
-      if ( (*itExternal).isValid() && sameSurface( (*itExternal).surface(), input.first.surface() ) )
-      {
-        ReferenceTrajectoryBase::Config config(materialEffects(), propagationDirection(),
-                                               theMass, theMomentumEstimate);
+    if (input.first.isValid()) {
+      if ((*itExternal).isValid() && sameSurface((*itExternal).surface(), input.first.surface())) {
+        ReferenceTrajectoryBase::Config config(materialEffects(), propagationDirection(), theMass, theMomentumEstimate);
         config.useBeamSpot = useBeamSpot_;
         config.includeAPEs = includeAPEs_;
         config.allowZeroMaterial = allowZeroMaterial_;
         // set the flag for reversing the RecHits to false, since they are already in the correct order.
         config.hitsAreReverse = false;
-        ReferenceTrajectoryPtr refTraj (new BzeroReferenceTrajectory(*itExternal, input.second,
-                                                                     magneticField.product(),
-                                                                     beamSpot, config));
+        ReferenceTrajectoryPtr refTraj(
+            new BzeroReferenceTrajectory(*itExternal, input.second, magneticField.product(), beamSpot, config));
 
-	AlgebraicSymMatrix externalParamErrors( asHepMatrix<5>( (*itExternal).localError().matrix() ) );
-	refTraj->setParameterErrors( externalParamErrors.sub( 2, 5 ) );
+        AlgebraicSymMatrix externalParamErrors(asHepMatrix<5>((*itExternal).localError().matrix()));
+        refTraj->setParameterErrors(externalParamErrors.sub(2, 5));
 
-	trajectories.push_back( refTraj );
-      }
-      else
-      {
-        ReferenceTrajectoryBase::Config config(materialEffects(), propagationDirection(),
-                                               theMass, theMomentumEstimate);
+        trajectories.push_back(refTraj);
+      } else {
+        ReferenceTrajectoryBase::Config config(materialEffects(), propagationDirection(), theMass, theMomentumEstimate);
         config.useBeamSpot = useBeamSpot_;
         config.includeAPEs = includeAPEs_;
         config.allowZeroMaterial = allowZeroMaterial_;
         // set the flag for reversing the RecHits to false, since they are already in the correct order.
         config.hitsAreReverse = false;
-        trajectories.push_back(ReferenceTrajectoryPtr(new BzeroReferenceTrajectory(input.first, input.second,
-                                                                                   magneticField.product(),
-                                                                                   beamSpot, config)));
+        trajectories.push_back(ReferenceTrajectoryPtr(
+            new BzeroReferenceTrajectory(input.first, input.second, magneticField.product(), beamSpot, config)));
       }
     }
 
@@ -142,6 +119,4 @@ BzeroReferenceTrajectoryFactory::trajectories(const edm::EventSetup &setup,
   return trajectories;
 }
 
-
-
-DEFINE_EDM_PLUGIN( TrajectoryFactoryPlugin, BzeroReferenceTrajectoryFactory, "BzeroReferenceTrajectoryFactory" );
+DEFINE_EDM_PLUGIN(TrajectoryFactoryPlugin, BzeroReferenceTrajectoryFactory, "BzeroReferenceTrajectoryFactory");
diff --git a/Alignment/ReferenceTrajectories/plugins/BzeroReferenceTrajectoryFactory.h b/Alignment/ReferenceTrajectories/plugins/BzeroReferenceTrajectoryFactory.h
index cd6009ec9d7d6..eba346053f071 100644
--- a/Alignment/ReferenceTrajectories/plugins/BzeroReferenceTrajectoryFactory.h
+++ b/Alignment/ReferenceTrajectories/plugins/BzeroReferenceTrajectoryFactory.h
@@ -3,7 +3,7 @@
 namespace edm {
   class ParameterSet;
   class EventSetup;
-}
+}  // namespace edm
 namespace reco {
   class BeamSpot;
 }
@@ -11,27 +11,24 @@ namespace reco {
 /// A factory that produces instances of class BzeroReferenceTrajectory from a
 /// given TrajTrackPairCollection.
 
-class BzeroReferenceTrajectoryFactory : public TrajectoryFactoryBase
-{
+class BzeroReferenceTrajectoryFactory : public TrajectoryFactoryBase {
 public:
   BzeroReferenceTrajectoryFactory(const edm::ParameterSet &config);
   ~BzeroReferenceTrajectoryFactory() override;
 
   /// Produce the reference trajectories.
   const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
-							   const ConstTrajTrackPairCollection &tracks,
-							   const reco::BeamSpot &beamSpot) const override;
+                                                   const ConstTrajTrackPairCollection &tracks,
+                                                   const reco::BeamSpot &beamSpot) const override;
 
   const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
-							   const ConstTrajTrackPairCollection &tracks,
-							   const ExternalPredictionCollection &external,
-							   const reco::BeamSpot &beamSpot) const override;
+                                                   const ConstTrajTrackPairCollection &tracks,
+                                                   const ExternalPredictionCollection &external,
+                                                   const reco::BeamSpot &beamSpot) const override;
 
-  BzeroReferenceTrajectoryFactory* clone() const override { return new BzeroReferenceTrajectoryFactory( *this ); }
+  BzeroReferenceTrajectoryFactory *clone() const override { return new BzeroReferenceTrajectoryFactory(*this); }
 
 private:
-
   double theMass;
   double theMomentumEstimate;
 };
-
diff --git a/Alignment/ReferenceTrajectories/plugins/CombinedTrajectoryFactory.cc b/Alignment/ReferenceTrajectories/plugins/CombinedTrajectoryFactory.cc
index 5db67c216a50b..023dc913f37a8 100644
--- a/Alignment/ReferenceTrajectories/plugins/CombinedTrajectoryFactory.cc
+++ b/Alignment/ReferenceTrajectories/plugins/CombinedTrajectoryFactory.cc
@@ -10,41 +10,36 @@
 
 /// A factory that can combine the functionality of several 'trajectory factories'. At construction
 /// time, it is given an ordered list of what kinds factories it should use. When called, all the
-/// factories are called one after each other, 
+/// factories are called one after each other,
 ///  - either until one of them gives a result
 ///  - or until all factories are really called.
 /// This is determined by the useAllFactories flag.
 ///
-/// Example: 
-/// Combine TwoBodyDecayTrajectoryFactory and ReferenceTrajectoryFactory 
+/// Example:
+/// Combine TwoBodyDecayTrajectoryFactory and ReferenceTrajectoryFactory
 /// with useAllFactories = false. In case the former
 /// can't produce a trajectory from two given tracks, the tracks can still be used for 'ordinary'
 /// reference trajectories (see also TrajectoryFactories.cff).
 
-
-class CombinedTrajectoryFactory : public TrajectoryFactoryBase
-{
-
+class CombinedTrajectoryFactory : public TrajectoryFactoryBase {
 public:
-
   CombinedTrajectoryFactory(const edm::ParameterSet &config);
   ~CombinedTrajectoryFactory() override;
 
   const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
-							   const ConstTrajTrackPairCollection &tracks,
-							   const reco::BeamSpot &beamSpot) const override;
+                                                   const ConstTrajTrackPairCollection &tracks,
+                                                   const reco::BeamSpot &beamSpot) const override;
 
   const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
-							   const ConstTrajTrackPairCollection &tracks,
-							   const ExternalPredictionCollection &external,
-							   const reco::BeamSpot &beamSpot) const override;
+                                                   const ConstTrajTrackPairCollection &tracks,
+                                                   const ExternalPredictionCollection &external,
+                                                   const reco::BeamSpot &beamSpot) const override;
 
-  CombinedTrajectoryFactory* clone() const override { return new CombinedTrajectoryFactory(*this); }
+  CombinedTrajectoryFactory *clone() const override { return new CombinedTrajectoryFactory(*this); }
 
 private:
-
-  std::vector<TrajectoryFactoryBase*> theFactories;
-  bool                                theUseAllFactories; /// use not only the first 'successful'?
+  std::vector<TrajectoryFactoryBase *> theFactories;
+  bool theUseAllFactories;  /// use not only the first 'successful'?
 };
 
 //////////////////////////////////////////////////////////////////////////////////////
@@ -53,13 +48,11 @@ class CombinedTrajectoryFactory : public TrajectoryFactoryBase
 
 using namespace std;
 
-CombinedTrajectoryFactory::CombinedTrajectoryFactory( const edm::ParameterSet & config ) :
-  TrajectoryFactoryBase( config ), theUseAllFactories(config.getParameter<bool>("useAllFactories"))
-{
-  vector<string> factoryNames = config.getParameter< vector<string> >( "TrajectoryFactoryNames" );
+CombinedTrajectoryFactory::CombinedTrajectoryFactory(const edm::ParameterSet &config)
+    : TrajectoryFactoryBase(config), theUseAllFactories(config.getParameter<bool>("useAllFactories")) {
+  vector<string> factoryNames = config.getParameter<vector<string> >("TrajectoryFactoryNames");
   vector<string>::iterator itFactoryName;
-  for ( itFactoryName = factoryNames.begin(); itFactoryName != factoryNames.end(); ++itFactoryName )
-  {
+  for (itFactoryName = factoryNames.begin(); itFactoryName != factoryNames.end(); ++itFactoryName) {
     // auto_ptr to avoid missing a delete due to throw...
     std::unique_ptr<TObjArray> namePset(TString((*itFactoryName).c_str()).Tokenize(","));
     if (namePset->GetEntriesFast() != 2) {
@@ -67,57 +60,48 @@ CombinedTrajectoryFactory::CombinedTrajectoryFactory( const edm::ParameterSet &
                                         << "TrajectoryFactoryNames must contain 2 comma "
                                         << "separated strings, but is '" << *itFactoryName << "'";
     }
-    const edm::ParameterSet factoryCfg 
-      = config.getParameter<edm::ParameterSet>(namePset->At(1)->GetName());
-    theFactories.push_back(TrajectoryFactoryPlugin::get()->create(namePset->At(0)->GetName(),
-								  factoryCfg));
+    const edm::ParameterSet factoryCfg = config.getParameter<edm::ParameterSet>(namePset->At(1)->GetName());
+    theFactories.push_back(TrajectoryFactoryPlugin::get()->create(namePset->At(0)->GetName(), factoryCfg));
   }
 }
 
- 
-CombinedTrajectoryFactory::~CombinedTrajectoryFactory( void ) {}
-
+CombinedTrajectoryFactory::~CombinedTrajectoryFactory(void) {}
 
-const CombinedTrajectoryFactory::ReferenceTrajectoryCollection
-CombinedTrajectoryFactory::trajectories(const edm::EventSetup &setup,
-					const ConstTrajTrackPairCollection &tracks,
-					const reco::BeamSpot &beamSpot) const
-{
+const CombinedTrajectoryFactory::ReferenceTrajectoryCollection CombinedTrajectoryFactory::trajectories(
+    const edm::EventSetup &setup, const ConstTrajTrackPairCollection &tracks, const reco::BeamSpot &beamSpot) const {
   ReferenceTrajectoryCollection trajectories;
-  ReferenceTrajectoryCollection tmpTrajectories; // outside loop for efficiency
+  ReferenceTrajectoryCollection tmpTrajectories;  // outside loop for efficiency
 
-  vector< TrajectoryFactoryBase* >::const_iterator itFactory;
-  for ( itFactory = theFactories.begin(); itFactory != theFactories.end(); ++itFactory )
-  {
-    tmpTrajectories = ( *itFactory )->trajectories(setup, tracks, beamSpot);
+  vector<TrajectoryFactoryBase *>::const_iterator itFactory;
+  for (itFactory = theFactories.begin(); itFactory != theFactories.end(); ++itFactory) {
+    tmpTrajectories = (*itFactory)->trajectories(setup, tracks, beamSpot);
     trajectories.insert(trajectories.end(), tmpTrajectories.begin(), tmpTrajectories.end());
 
-    if (!theUseAllFactories && !trajectories.empty()) break;
+    if (!theUseAllFactories && !trajectories.empty())
+      break;
   }
 
   return trajectories;
 }
 
-const CombinedTrajectoryFactory::ReferenceTrajectoryCollection
-CombinedTrajectoryFactory::trajectories(const edm::EventSetup &setup,
-					const ConstTrajTrackPairCollection &tracks,
-					const ExternalPredictionCollection &external,
-					const reco::BeamSpot &beamSpot) const
-{
+const CombinedTrajectoryFactory::ReferenceTrajectoryCollection CombinedTrajectoryFactory::trajectories(
+    const edm::EventSetup &setup,
+    const ConstTrajTrackPairCollection &tracks,
+    const ExternalPredictionCollection &external,
+    const reco::BeamSpot &beamSpot) const {
   ReferenceTrajectoryCollection trajectories;
-  ReferenceTrajectoryCollection tmpTrajectories; // outside loop for efficiency
+  ReferenceTrajectoryCollection tmpTrajectories;  // outside loop for efficiency
 
-  vector< TrajectoryFactoryBase* >::const_iterator itFactory;
-  for ( itFactory = theFactories.begin(); itFactory != theFactories.end(); ++itFactory )
-  {
-    tmpTrajectories = ( *itFactory )->trajectories(setup, tracks, external, beamSpot);
+  vector<TrajectoryFactoryBase *>::const_iterator itFactory;
+  for (itFactory = theFactories.begin(); itFactory != theFactories.end(); ++itFactory) {
+    tmpTrajectories = (*itFactory)->trajectories(setup, tracks, external, beamSpot);
     trajectories.insert(trajectories.end(), tmpTrajectories.begin(), tmpTrajectories.end());
 
-    if (!theUseAllFactories && !trajectories.empty()) break;
+    if (!theUseAllFactories && !trajectories.empty())
+      break;
   }
 
   return trajectories;
 }
 
-
-DEFINE_EDM_PLUGIN( TrajectoryFactoryPlugin, CombinedTrajectoryFactory, "CombinedTrajectoryFactory" );
+DEFINE_EDM_PLUGIN(TrajectoryFactoryPlugin, CombinedTrajectoryFactory, "CombinedTrajectoryFactory");
diff --git a/Alignment/ReferenceTrajectories/plugins/DualBzeroTrajectoryFactory.cc b/Alignment/ReferenceTrajectories/plugins/DualBzeroTrajectoryFactory.cc
index 34878fbe6e21d..81918c252ed86 100644
--- a/Alignment/ReferenceTrajectories/plugins/DualBzeroTrajectoryFactory.cc
+++ b/Alignment/ReferenceTrajectories/plugins/DualBzeroTrajectoryFactory.cc
@@ -2,40 +2,37 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" 
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 #include "Alignment/ReferenceTrajectories/interface/TrajectoryFactoryPlugin.h"
 #include "TrackingTools/GeomPropagators/interface/AnalyticalPropagator.h"
 
 #include <algorithm>
 
-#include "Alignment/ReferenceTrajectories/interface/DualBzeroReferenceTrajectory.h" 
+#include "Alignment/ReferenceTrajectories/interface/DualBzeroReferenceTrajectory.h"
 
 #include "Alignment/ReferenceTrajectories/interface/TrajectoryFactoryBase.h"
 
 /// A factory that produces instances of class ReferenceTrajectory from a given TrajTrackPairCollection.
 
-
-class DualBzeroTrajectoryFactory : public TrajectoryFactoryBase
-{
+class DualBzeroTrajectoryFactory : public TrajectoryFactoryBase {
 public:
   DualBzeroTrajectoryFactory(const edm::ParameterSet &config);
   ~DualBzeroTrajectoryFactory() override;
 
   /// Produce the reference trajectories.
   const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
-							   const ConstTrajTrackPairCollection &tracks,
-							    const reco::BeamSpot &beamSpot) const override;
+                                                   const ConstTrajTrackPairCollection &tracks,
+                                                   const reco::BeamSpot &beamSpot) const override;
 
   const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
-							   const ConstTrajTrackPairCollection &tracks,
-							   const ExternalPredictionCollection &external,
-							   const reco::BeamSpot &beamSpot) const override;
+                                                   const ConstTrajTrackPairCollection &tracks,
+                                                   const ExternalPredictionCollection &external,
+                                                   const reco::BeamSpot &beamSpot) const override;
 
-  DualBzeroTrajectoryFactory* clone() const override { return new DualBzeroTrajectoryFactory(*this); }
+  DualBzeroTrajectoryFactory *clone() const override { return new DualBzeroTrajectoryFactory(*this); }
 
 protected:
-  struct DualBzeroTrajectoryInput
-  {
+  struct DualBzeroTrajectoryInput {
     TrajectoryStateOnSurface refTsos;
     TransientTrackingRecHit::ConstRecHitContainer fwdRecHits;
     TransientTrackingRecHit::ConstRecHitContainer bwdRecHits;
@@ -44,59 +41,45 @@ class DualBzeroTrajectoryFactory : public TrajectoryFactoryBase
   const DualBzeroTrajectoryInput referenceStateAndRecHits(const ConstTrajTrackPair &track) const;
 
   const TrajectoryStateOnSurface propagateExternal(const TrajectoryStateOnSurface &external,
-						   const Surface &surface,
-						   const MagneticField *magField) const;
+                                                   const Surface &surface,
+                                                   const MagneticField *magField) const;
 
   double theMass;
   double theMomentumEstimate;
-  
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 
-DualBzeroTrajectoryFactory::DualBzeroTrajectoryFactory( const edm::ParameterSet & config ) :
-  TrajectoryFactoryBase( config )
-{
-  theMass = config.getParameter< double >( "ParticleMass" );
-  theMomentumEstimate = config.getParameter< double >( "MomentumEstimate" );
+DualBzeroTrajectoryFactory::DualBzeroTrajectoryFactory(const edm::ParameterSet &config)
+    : TrajectoryFactoryBase(config) {
+  theMass = config.getParameter<double>("ParticleMass");
+  theMomentumEstimate = config.getParameter<double>("MomentumEstimate");
 }
 
- 
-DualBzeroTrajectoryFactory::~DualBzeroTrajectoryFactory( void ) {}
-
+DualBzeroTrajectoryFactory::~DualBzeroTrajectoryFactory(void) {}
 
-const DualBzeroTrajectoryFactory::ReferenceTrajectoryCollection
-DualBzeroTrajectoryFactory::trajectories(const edm::EventSetup  &setup,
-					 const ConstTrajTrackPairCollection &tracks,
-					 const reco::BeamSpot &beamSpot) const
-{
+const DualBzeroTrajectoryFactory::ReferenceTrajectoryCollection DualBzeroTrajectoryFactory::trajectories(
+    const edm::EventSetup &setup, const ConstTrajTrackPairCollection &tracks, const reco::BeamSpot &beamSpot) const {
   ReferenceTrajectoryCollection trajectories;
 
-  edm::ESHandle< MagneticField > magneticField;
-  setup.get< IdealMagneticFieldRecord >().get( magneticField );
+  edm::ESHandle<MagneticField> magneticField;
+  setup.get<IdealMagneticFieldRecord>().get(magneticField);
 
   ConstTrajTrackPairCollection::const_iterator itTracks = tracks.begin();
 
-  while ( itTracks != tracks.end() )
-  { 
-    const DualBzeroTrajectoryInput input = this->referenceStateAndRecHits( *itTracks );
+  while (itTracks != tracks.end()) {
+    const DualBzeroTrajectoryInput input = this->referenceStateAndRecHits(*itTracks);
     // Check input: If all hits were rejected, the TSOS is initialized as invalid.
-    if ( input.refTsos.isValid() )
-    {
-      ReferenceTrajectoryBase::Config config(materialEffects(), propagationDirection(),
-                                             theMass, theMomentumEstimate);
+    if (input.refTsos.isValid()) {
+      ReferenceTrajectoryBase::Config config(materialEffects(), propagationDirection(), theMass, theMomentumEstimate);
       config.useBeamSpot = useBeamSpot_;
       config.includeAPEs = includeAPEs_;
       config.allowZeroMaterial = allowZeroMaterial_;
-      ReferenceTrajectoryPtr ptr(new DualBzeroReferenceTrajectory(input.refTsos,
-                                                                  input.fwdRecHits,
-                                                                  input.bwdRecHits,
-                                                                  magneticField.product(),
-                                                                  beamSpot,
-                                                                  config));
-      trajectories.push_back( ptr );
+      ReferenceTrajectoryPtr ptr(new DualBzeroReferenceTrajectory(
+          input.refTsos, input.fwdRecHits, input.bwdRecHits, magneticField.product(), beamSpot, config));
+      trajectories.push_back(ptr);
     }
 
     ++itTracks;
@@ -105,73 +88,57 @@ DualBzeroTrajectoryFactory::trajectories(const edm::EventSetup  &setup,
   return trajectories;
 }
 
-const DualBzeroTrajectoryFactory::ReferenceTrajectoryCollection
-DualBzeroTrajectoryFactory::trajectories(const edm::EventSetup &setup,
-					 const ConstTrajTrackPairCollection &tracks,
-					 const ExternalPredictionCollection &external,
-					 const reco::BeamSpot &beamSpot) const
-{
+const DualBzeroTrajectoryFactory::ReferenceTrajectoryCollection DualBzeroTrajectoryFactory::trajectories(
+    const edm::EventSetup &setup,
+    const ConstTrajTrackPairCollection &tracks,
+    const ExternalPredictionCollection &external,
+    const reco::BeamSpot &beamSpot) const {
   ReferenceTrajectoryCollection trajectories;
 
-  if ( tracks.size() != external.size() )
-  {
-    edm::LogInfo("ReferenceTrajectories") << "@SUB=DualBzeroTrajectoryFactory::trajectories"
-					  << "Inconsistent input:\n"
-					  << "\tnumber of tracks = " << tracks.size()
-					  << "\tnumber of external predictions = " << external.size();
+  if (tracks.size() != external.size()) {
+    edm::LogInfo("ReferenceTrajectories")
+        << "@SUB=DualBzeroTrajectoryFactory::trajectories"
+        << "Inconsistent input:\n"
+        << "\tnumber of tracks = " << tracks.size() << "\tnumber of external predictions = " << external.size();
     return trajectories;
   }
 
-  edm::ESHandle< MagneticField > magneticField;
-  setup.get< IdealMagneticFieldRecord >().get( magneticField );
+  edm::ESHandle<MagneticField> magneticField;
+  setup.get<IdealMagneticFieldRecord>().get(magneticField);
 
   ConstTrajTrackPairCollection::const_iterator itTracks = tracks.begin();
   ExternalPredictionCollection::const_iterator itExternal = external.begin();
 
-  while ( itTracks != tracks.end() )
-  {
-    const DualBzeroTrajectoryInput input = referenceStateAndRecHits( *itTracks );
+  while (itTracks != tracks.end()) {
+    const DualBzeroTrajectoryInput input = referenceStateAndRecHits(*itTracks);
     // Check input: If all hits were rejected, the TSOS is initialized as invalid.
-    if ( input.refTsos.isValid() )
-    {
-      if ( (*itExternal).isValid() )
-      {
-	TrajectoryStateOnSurface propExternal =
-	  propagateExternal( *itExternal, input.refTsos.surface(), magneticField.product() );
+    if (input.refTsos.isValid()) {
+      if ((*itExternal).isValid()) {
+        TrajectoryStateOnSurface propExternal =
+            propagateExternal(*itExternal, input.refTsos.surface(), magneticField.product());
 
-	if ( !propExternal.isValid() ) continue;
+        if (!propExternal.isValid())
+          continue;
 
-        ReferenceTrajectoryBase::Config config(materialEffects(), propagationDirection(),
-                                               theMass, theMomentumEstimate);
+        ReferenceTrajectoryBase::Config config(materialEffects(), propagationDirection(), theMass, theMomentumEstimate);
         config.useBeamSpot = useBeamSpot_;
         config.includeAPEs = includeAPEs_;
         config.allowZeroMaterial = allowZeroMaterial_;
-        ReferenceTrajectoryPtr ptr(new DualBzeroReferenceTrajectory(propExternal,
-                                                                    input.fwdRecHits,
-                                                                    input.bwdRecHits,
-                                                                    magneticField.product(),
-                                                                    beamSpot,
-                                                                    config));
-
-	AlgebraicSymMatrix externalParamErrors( asHepMatrix<5>( propExternal.localError().matrix() ) );
-	ptr->setParameterErrors( externalParamErrors.sub( 2, 5 ) );
-	trajectories.push_back( ptr );
-      }
-      else
-      {
-        ReferenceTrajectoryBase::Config config(materialEffects(), propagationDirection(),
-                                               theMass, theMomentumEstimate);
+        ReferenceTrajectoryPtr ptr(new DualBzeroReferenceTrajectory(
+            propExternal, input.fwdRecHits, input.bwdRecHits, magneticField.product(), beamSpot, config));
+
+        AlgebraicSymMatrix externalParamErrors(asHepMatrix<5>(propExternal.localError().matrix()));
+        ptr->setParameterErrors(externalParamErrors.sub(2, 5));
+        trajectories.push_back(ptr);
+      } else {
+        ReferenceTrajectoryBase::Config config(materialEffects(), propagationDirection(), theMass, theMomentumEstimate);
         config.useBeamSpot = useBeamSpot_;
         config.includeAPEs = includeAPEs_;
         config.allowZeroMaterial = allowZeroMaterial_;
-        ReferenceTrajectoryPtr ptr(new DualBzeroReferenceTrajectory(input.refTsos,
-                                                                    input.fwdRecHits,
-                                                                    input.bwdRecHits,
-                                                                    magneticField.product(),
-                                                                    beamSpot,
-                                                                    config));
-
-	trajectories.push_back( ptr );
+        ReferenceTrajectoryPtr ptr(new DualBzeroReferenceTrajectory(
+            input.refTsos, input.fwdRecHits, input.bwdRecHits, magneticField.product(), beamSpot, config));
+
+        trajectories.push_back(ptr);
       }
     }
 
@@ -182,64 +149,56 @@ DualBzeroTrajectoryFactory::trajectories(const edm::EventSetup &setup,
   return trajectories;
 }
 
-
-const DualBzeroTrajectoryFactory::DualBzeroTrajectoryInput
-DualBzeroTrajectoryFactory::referenceStateAndRecHits( const ConstTrajTrackPair& track ) const
-{
+const DualBzeroTrajectoryFactory::DualBzeroTrajectoryInput DualBzeroTrajectoryFactory::referenceStateAndRecHits(
+    const ConstTrajTrackPair &track) const {
   DualBzeroTrajectoryInput input;
- 
+
   // get the trajectory measurements in the correct order, i.e. reverse if needed
-  Trajectory::DataContainer allTrajMeas = this->orderedTrajectoryMeasurements( *track.first );
+  Trajectory::DataContainer allTrajMeas = this->orderedTrajectoryMeasurements(*track.first);
   Trajectory::DataContainer usedTrajMeas;
   Trajectory::DataContainer::iterator itM;
   // get all relevant trajectory measurements
-  for ( itM = allTrajMeas.begin(); itM != allTrajMeas.end(); itM++ )
-  {
-    if ( useRecHit( ( *itM ).recHit() ) ) usedTrajMeas.push_back( *itM );
+  for (itM = allTrajMeas.begin(); itM != allTrajMeas.end(); itM++) {
+    if (useRecHit((*itM).recHit()))
+      usedTrajMeas.push_back(*itM);
   }
 
   unsigned int iMeas = 0;
   unsigned int nMeas = usedTrajMeas.size();
-  unsigned int nRefStateMeas = nMeas/2;
+  unsigned int nRefStateMeas = nMeas / 2;
   // get the valid RecHits
-  for ( itM = usedTrajMeas.begin(); itM != usedTrajMeas.end(); itM++, iMeas++ )
-  {
-    TransientTrackingRecHit::ConstRecHitPointer aRecHit = ( *itM ).recHit();
-
-    if ( iMeas < nRefStateMeas ) {
-      input.bwdRecHits.push_back( aRecHit );
-    } else if ( iMeas > nRefStateMeas ) {
-      input.fwdRecHits.push_back( aRecHit );
-    } else { // iMeas == nRefStateMeas
-      if ( ( *itM ).updatedState().isValid() )
-      {
-	input.refTsos = ( *itM ).updatedState();
-	input.bwdRecHits.push_back( aRecHit );
-	input.fwdRecHits.push_back( aRecHit );
+  for (itM = usedTrajMeas.begin(); itM != usedTrajMeas.end(); itM++, iMeas++) {
+    TransientTrackingRecHit::ConstRecHitPointer aRecHit = (*itM).recHit();
+
+    if (iMeas < nRefStateMeas) {
+      input.bwdRecHits.push_back(aRecHit);
+    } else if (iMeas > nRefStateMeas) {
+      input.fwdRecHits.push_back(aRecHit);
+    } else {  // iMeas == nRefStateMeas
+      if ((*itM).updatedState().isValid()) {
+        input.refTsos = (*itM).updatedState();
+        input.bwdRecHits.push_back(aRecHit);
+        input.fwdRecHits.push_back(aRecHit);
       } else {
-	// if the tsos of the middle hit is not valid, try the next one ...
-	nRefStateMeas++;
-	input.bwdRecHits.push_back( aRecHit );
+        // if the tsos of the middle hit is not valid, try the next one ...
+        nRefStateMeas++;
+        input.bwdRecHits.push_back(aRecHit);
       }
     }
   }
 
   // bring input.fwdRecHits into correct order
-  std::reverse( input.bwdRecHits.begin(), input.bwdRecHits.end() );
+  std::reverse(input.bwdRecHits.begin(), input.bwdRecHits.end());
 
   return input;
 }
 
-const TrajectoryStateOnSurface
-DualBzeroTrajectoryFactory::propagateExternal( const TrajectoryStateOnSurface& external,
-					  const Surface& surface,
-					  const MagneticField* magField ) const
-{
-  AnalyticalPropagator propagator( magField, anyDirection );
-  const std::pair< TrajectoryStateOnSurface, double > tsosWithPath =
-    propagator.propagateWithPath( external, surface );
+const TrajectoryStateOnSurface DualBzeroTrajectoryFactory::propagateExternal(const TrajectoryStateOnSurface &external,
+                                                                             const Surface &surface,
+                                                                             const MagneticField *magField) const {
+  AnalyticalPropagator propagator(magField, anyDirection);
+  const std::pair<TrajectoryStateOnSurface, double> tsosWithPath = propagator.propagateWithPath(external, surface);
   return tsosWithPath.first;
 }
 
-
-DEFINE_EDM_PLUGIN( TrajectoryFactoryPlugin, DualBzeroTrajectoryFactory, "DualBzeroTrajectoryFactory" );
+DEFINE_EDM_PLUGIN(TrajectoryFactoryPlugin, DualBzeroTrajectoryFactory, "DualBzeroTrajectoryFactory");
diff --git a/Alignment/ReferenceTrajectories/plugins/DualTrajectoryFactory.cc b/Alignment/ReferenceTrajectories/plugins/DualTrajectoryFactory.cc
index 7a252a85cc1de..d4fd9a4cf3ab1 100644
--- a/Alignment/ReferenceTrajectories/plugins/DualTrajectoryFactory.cc
+++ b/Alignment/ReferenceTrajectories/plugins/DualTrajectoryFactory.cc
@@ -2,40 +2,37 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" 
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "Alignment/ReferenceTrajectories/interface/TrajectoryFactoryPlugin.h"
 #include "TrackingTools/GeomPropagators/interface/AnalyticalPropagator.h"
 
 #include <algorithm>
 
-#include "Alignment/ReferenceTrajectories/interface/DualReferenceTrajectory.h" 
+#include "Alignment/ReferenceTrajectories/interface/DualReferenceTrajectory.h"
 #include "Alignment/ReferenceTrajectories/interface/TrajectoryFactoryBase.h"
 
 /// A factory that produces instances of class ReferenceTrajectory from a given TrajTrackPairCollection.
 
-
-class DualTrajectoryFactory : public TrajectoryFactoryBase
-{
+class DualTrajectoryFactory : public TrajectoryFactoryBase {
 public:
   DualTrajectoryFactory(const edm::ParameterSet &config);
   ~DualTrajectoryFactory() override;
 
   /// Produce the reference trajectories.
-  const ReferenceTrajectoryCollection trajectories(const edm::EventSetup  &setup,
-							   const ConstTrajTrackPairCollection &tracks,
-							   const reco::BeamSpot &beamSpot) const override;
+  const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
+                                                   const ConstTrajTrackPairCollection &tracks,
+                                                   const reco::BeamSpot &beamSpot) const override;
 
   const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
-							   const ConstTrajTrackPairCollection &tracks,
-							   const ExternalPredictionCollection &external,
-							   const reco::BeamSpot &beamSpot) const override;
+                                                   const ConstTrajTrackPairCollection &tracks,
+                                                   const ExternalPredictionCollection &external,
+                                                   const reco::BeamSpot &beamSpot) const override;
 
-  DualTrajectoryFactory* clone() const override { return new DualTrajectoryFactory(*this); }
+  DualTrajectoryFactory *clone() const override { return new DualTrajectoryFactory(*this); }
 
 protected:
-  struct DualTrajectoryInput
-  {
+  struct DualTrajectoryInput {
     TrajectoryStateOnSurface refTsos;
     TransientTrackingRecHit::ConstRecHitContainer fwdRecHits;
     TransientTrackingRecHit::ConstRecHitContainer bwdRecHits;
@@ -44,8 +41,8 @@ class DualTrajectoryFactory : public TrajectoryFactoryBase
   const DualTrajectoryInput referenceStateAndRecHits(const ConstTrajTrackPair &track) const;
 
   const TrajectoryStateOnSurface propagateExternal(const TrajectoryStateOnSurface &external,
-						   const Surface &surface,
-						   const MagneticField *magField) const;
+                                                   const Surface &surface,
+                                                   const MagneticField *magField) const;
 
   double theMass;
 };
@@ -54,53 +51,40 @@ class DualTrajectoryFactory : public TrajectoryFactoryBase
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 
-DualTrajectoryFactory::DualTrajectoryFactory( const edm::ParameterSet & config ) :
-  TrajectoryFactoryBase( config ),
-  theMass(config.getParameter<double>("ParticleMass"))
-{
+DualTrajectoryFactory::DualTrajectoryFactory(const edm::ParameterSet &config)
+    : TrajectoryFactoryBase(config), theMass(config.getParameter<double>("ParticleMass")) {
   edm::LogInfo("Alignment") << "@SUB=DualTrajectoryFactory"
                             << "mass: " << theMass;
 }
 
- 
-DualTrajectoryFactory::~DualTrajectoryFactory( void ) {}
-
+DualTrajectoryFactory::~DualTrajectoryFactory(void) {}
 
-const DualTrajectoryFactory::ReferenceTrajectoryCollection
-DualTrajectoryFactory::trajectories(const edm::EventSetup &setup,
-				    const ConstTrajTrackPairCollection &tracks,
-				    const reco::BeamSpot &beamSpot) const
-{
+const DualTrajectoryFactory::ReferenceTrajectoryCollection DualTrajectoryFactory::trajectories(
+    const edm::EventSetup &setup, const ConstTrajTrackPairCollection &tracks, const reco::BeamSpot &beamSpot) const {
   ReferenceTrajectoryCollection trajectories;
 
-  edm::ESHandle< MagneticField > magneticField;
-  setup.get< IdealMagneticFieldRecord >().get( magneticField );
-  if (magneticField->inTesla(GlobalPoint(0.,0.,0.)).mag2() < 1.e-6) {
+  edm::ESHandle<MagneticField> magneticField;
+  setup.get<IdealMagneticFieldRecord>().get(magneticField);
+  if (magneticField->inTesla(GlobalPoint(0., 0., 0.)).mag2() < 1.e-6) {
     edm::LogWarning("Alignment") << "@SUB=DualTrajectoryFactory::trajectories"
-                                 << "B-field in z is " << magneticField->inTesla(GlobalPoint(0.,0.,0.)).z()
-                                 << ": You should probably use the DualBzeroTrajectoryFactory\n" 
+                                 << "B-field in z is " << magneticField->inTesla(GlobalPoint(0., 0., 0.)).z()
+                                 << ": You should probably use the DualBzeroTrajectoryFactory\n"
                                  << "or fix this code to switch automatically as the ReferenceTrajectoryFactory does.";
   }
 
   ConstTrajTrackPairCollection::const_iterator itTracks = tracks.begin();
 
-  while ( itTracks != tracks.end() )
-  { 
-    const DualTrajectoryInput input = this->referenceStateAndRecHits( *itTracks );
+  while (itTracks != tracks.end()) {
+    const DualTrajectoryInput input = this->referenceStateAndRecHits(*itTracks);
     // Check input: If all hits were rejected, the TSOS is initialized as invalid.
-    if ( input.refTsos.isValid() )
-    {
+    if (input.refTsos.isValid()) {
       ReferenceTrajectoryBase::Config config(materialEffects(), propagationDirection(), theMass);
       config.useBeamSpot = useBeamSpot_;
       config.includeAPEs = includeAPEs_;
       config.allowZeroMaterial = allowZeroMaterial_;
-      ReferenceTrajectoryPtr ptr(new DualReferenceTrajectory(input.refTsos,
-                                                             input.fwdRecHits,
-                                                             input.bwdRecHits,
-                                                             magneticField.product(),
-                                                             beamSpot,
-                                                             config));
-      trajectories.push_back( ptr );
+      ReferenceTrajectoryPtr ptr(new DualReferenceTrajectory(
+          input.refTsos, input.fwdRecHits, input.bwdRecHits, magneticField.product(), beamSpot, config));
+      trajectories.push_back(ptr);
     }
 
     ++itTracks;
@@ -109,76 +93,62 @@ DualTrajectoryFactory::trajectories(const edm::EventSetup &setup,
   return trajectories;
 }
 
-const DualTrajectoryFactory::ReferenceTrajectoryCollection
-DualTrajectoryFactory::trajectories(const edm::EventSetup &setup,
-				    const ConstTrajTrackPairCollection &tracks,
-				    const ExternalPredictionCollection &external,
-				    const reco::BeamSpot &beamSpot) const
-{
+const DualTrajectoryFactory::ReferenceTrajectoryCollection DualTrajectoryFactory::trajectories(
+    const edm::EventSetup &setup,
+    const ConstTrajTrackPairCollection &tracks,
+    const ExternalPredictionCollection &external,
+    const reco::BeamSpot &beamSpot) const {
   ReferenceTrajectoryCollection trajectories;
 
-  if ( tracks.size() != external.size() )
-  {
-    edm::LogInfo("ReferenceTrajectories") << "@SUB=DualTrajectoryFactory::trajectories"
-					  << "Inconsistent input:\n"
-					  << "\tnumber of tracks = " << tracks.size()
-					  << "\tnumber of external predictions = " << external.size();
+  if (tracks.size() != external.size()) {
+    edm::LogInfo("ReferenceTrajectories")
+        << "@SUB=DualTrajectoryFactory::trajectories"
+        << "Inconsistent input:\n"
+        << "\tnumber of tracks = " << tracks.size() << "\tnumber of external predictions = " << external.size();
     return trajectories;
   }
 
-  edm::ESHandle< MagneticField > magneticField;
-  setup.get< IdealMagneticFieldRecord >().get( magneticField );
-  if (magneticField->inTesla(GlobalPoint(0.,0.,0.)).mag2() < 1.e-6) {
+  edm::ESHandle<MagneticField> magneticField;
+  setup.get<IdealMagneticFieldRecord>().get(magneticField);
+  if (magneticField->inTesla(GlobalPoint(0., 0., 0.)).mag2() < 1.e-6) {
     edm::LogWarning("Alignment") << "@SUB=DualTrajectoryFactory::trajectories"
-                                 << "B-field in z is " << magneticField->inTesla(GlobalPoint(0.,0.,0.)).z()
-                                 << ": You should probably use the DualBzeroTrajectoryFactory\n" 
+                                 << "B-field in z is " << magneticField->inTesla(GlobalPoint(0., 0., 0.)).z()
+                                 << ": You should probably use the DualBzeroTrajectoryFactory\n"
                                  << "or fix this code to switch automatically as the ReferenceTrajectoryFactory does.";
   }
 
   ConstTrajTrackPairCollection::const_iterator itTracks = tracks.begin();
   ExternalPredictionCollection::const_iterator itExternal = external.begin();
 
-  while ( itTracks != tracks.end() )
-  {
-    const DualTrajectoryInput input = referenceStateAndRecHits( *itTracks );
+  while (itTracks != tracks.end()) {
+    const DualTrajectoryInput input = referenceStateAndRecHits(*itTracks);
     // Check input: If all hits were rejected, the TSOS is initialized as invalid.
-    if ( input.refTsos.isValid() )
-    {
-      if ( (*itExternal).isValid() )
-      {
-	TrajectoryStateOnSurface propExternal =
-	  propagateExternal( *itExternal, input.refTsos.surface(), magneticField.product() );
+    if (input.refTsos.isValid()) {
+      if ((*itExternal).isValid()) {
+        TrajectoryStateOnSurface propExternal =
+            propagateExternal(*itExternal, input.refTsos.surface(), magneticField.product());
 
-	if ( !propExternal.isValid() ) continue;
+        if (!propExternal.isValid())
+          continue;
 
         ReferenceTrajectoryBase::Config config(materialEffects(), propagationDirection(), theMass);
         config.useBeamSpot = useBeamSpot_;
         config.includeAPEs = includeAPEs_;
         config.allowZeroMaterial = allowZeroMaterial_;
-        ReferenceTrajectoryPtr ptr(new DualReferenceTrajectory(propExternal,
-                                                               input.fwdRecHits,
-                                                               input.bwdRecHits,
-                                                               magneticField.product(),
-                                                               beamSpot,
-                                                               config));
-
-	AlgebraicSymMatrix externalParamErrors( asHepMatrix<5>( propExternal.localError().matrix() ) );
-	ptr->setParameterErrors( externalParamErrors );
-	trajectories.push_back( ptr );
-      }
-      else
-      {
+        ReferenceTrajectoryPtr ptr(new DualReferenceTrajectory(
+            propExternal, input.fwdRecHits, input.bwdRecHits, magneticField.product(), beamSpot, config));
+
+        AlgebraicSymMatrix externalParamErrors(asHepMatrix<5>(propExternal.localError().matrix()));
+        ptr->setParameterErrors(externalParamErrors);
+        trajectories.push_back(ptr);
+      } else {
         ReferenceTrajectoryBase::Config config(materialEffects(), propagationDirection(), theMass);
         config.useBeamSpot = useBeamSpot_;
         config.includeAPEs = includeAPEs_;
         config.allowZeroMaterial = allowZeroMaterial_;
-        ReferenceTrajectoryPtr ptr(new DualReferenceTrajectory(input.refTsos,
-                                                               input.fwdRecHits,
-                                                               input.bwdRecHits,
-                                                               magneticField.product(),
-                                                               beamSpot,
-                                                               config));
-	trajectories.push_back( ptr );
+        ReferenceTrajectoryPtr ptr(new DualReferenceTrajectory(
+            input.refTsos, input.fwdRecHits, input.bwdRecHits, magneticField.product(), beamSpot, config));
+        trajectories.push_back(ptr);
       }
     }
 
@@ -189,64 +159,56 @@ DualTrajectoryFactory::trajectories(const edm::EventSetup &setup,
   return trajectories;
 }
 
-
-const DualTrajectoryFactory::DualTrajectoryInput
-DualTrajectoryFactory::referenceStateAndRecHits( const ConstTrajTrackPair& track ) const
-{
+const DualTrajectoryFactory::DualTrajectoryInput DualTrajectoryFactory::referenceStateAndRecHits(
+    const ConstTrajTrackPair &track) const {
   DualTrajectoryInput input;
- 
+
   // get the trajectory measurements in the correct order, i.e. reverse if needed
-  Trajectory::DataContainer allTrajMeas = this->orderedTrajectoryMeasurements( *track.first );
+  Trajectory::DataContainer allTrajMeas = this->orderedTrajectoryMeasurements(*track.first);
   Trajectory::DataContainer usedTrajMeas;
   Trajectory::DataContainer::iterator itM;
   // get all relevant trajectory measurements
-  for ( itM = allTrajMeas.begin(); itM != allTrajMeas.end(); itM++ )
-  {
-    if ( useRecHit( ( *itM ).recHit() ) ) usedTrajMeas.push_back( *itM );
+  for (itM = allTrajMeas.begin(); itM != allTrajMeas.end(); itM++) {
+    if (useRecHit((*itM).recHit()))
+      usedTrajMeas.push_back(*itM);
   }
 
   unsigned int iMeas = 0;
   unsigned int nMeas = usedTrajMeas.size();
-  unsigned int nRefStateMeas = nMeas/2;
+  unsigned int nRefStateMeas = nMeas / 2;
   // get the valid RecHits
-  for ( itM = usedTrajMeas.begin(); itM != usedTrajMeas.end(); itM++, iMeas++ )
-  {
-    TransientTrackingRecHit::ConstRecHitPointer aRecHit = ( *itM ).recHit();
-
-    if ( iMeas < nRefStateMeas ) {
-      input.bwdRecHits.push_back( aRecHit );
-    } else if ( iMeas > nRefStateMeas ) {
-      input.fwdRecHits.push_back( aRecHit );
-    } else { // iMeas == nRefStateMeas
-      if ( ( *itM ).updatedState().isValid() )
-      {
-	input.refTsos = ( *itM ).updatedState();
-	input.bwdRecHits.push_back( aRecHit );
-	input.fwdRecHits.push_back( aRecHit );
+  for (itM = usedTrajMeas.begin(); itM != usedTrajMeas.end(); itM++, iMeas++) {
+    TransientTrackingRecHit::ConstRecHitPointer aRecHit = (*itM).recHit();
+
+    if (iMeas < nRefStateMeas) {
+      input.bwdRecHits.push_back(aRecHit);
+    } else if (iMeas > nRefStateMeas) {
+      input.fwdRecHits.push_back(aRecHit);
+    } else {  // iMeas == nRefStateMeas
+      if ((*itM).updatedState().isValid()) {
+        input.refTsos = (*itM).updatedState();
+        input.bwdRecHits.push_back(aRecHit);
+        input.fwdRecHits.push_back(aRecHit);
       } else {
-	// if the tsos of the middle hit is not valid, try the next one ...
-	nRefStateMeas++;
-	input.bwdRecHits.push_back( aRecHit );
+        // if the tsos of the middle hit is not valid, try the next one ...
+        nRefStateMeas++;
+        input.bwdRecHits.push_back(aRecHit);
       }
     }
   }
 
   // bring input.fwdRecHits into correct order
-  std::reverse( input.bwdRecHits.begin(), input.bwdRecHits.end() );
+  std::reverse(input.bwdRecHits.begin(), input.bwdRecHits.end());
 
   return input;
 }
 
-const TrajectoryStateOnSurface
-DualTrajectoryFactory::propagateExternal( const TrajectoryStateOnSurface& external,
-					  const Surface& surface,
-					  const MagneticField* magField ) const
-{
-  AnalyticalPropagator propagator( magField, anyDirection );
-  const std::pair< TrajectoryStateOnSurface, double > tsosWithPath =
-    propagator.propagateWithPath( external, surface );
+const TrajectoryStateOnSurface DualTrajectoryFactory::propagateExternal(const TrajectoryStateOnSurface &external,
+                                                                        const Surface &surface,
+                                                                        const MagneticField *magField) const {
+  AnalyticalPropagator propagator(magField, anyDirection);
+  const std::pair<TrajectoryStateOnSurface, double> tsosWithPath = propagator.propagateWithPath(external, surface);
   return tsosWithPath.first;
 }
 
-
-DEFINE_EDM_PLUGIN( TrajectoryFactoryPlugin, DualTrajectoryFactory, "DualTrajectoryFactory" );
+DEFINE_EDM_PLUGIN(TrajectoryFactoryPlugin, DualTrajectoryFactory, "DualTrajectoryFactory");
diff --git a/Alignment/ReferenceTrajectories/plugins/ReferenceTrajectoryFactory.cc b/Alignment/ReferenceTrajectories/plugins/ReferenceTrajectoryFactory.cc
index 36cb2bfd66a77..d592a39ce8e00 100644
--- a/Alignment/ReferenceTrajectories/plugins/ReferenceTrajectoryFactory.cc
+++ b/Alignment/ReferenceTrajectories/plugins/ReferenceTrajectoryFactory.cc
@@ -4,10 +4,10 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" 
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "Alignment/ReferenceTrajectories/interface/TrajectoryFactoryPlugin.h"
-#include "Alignment/ReferenceTrajectories/interface/ReferenceTrajectory.h" 
+#include "Alignment/ReferenceTrajectories/interface/ReferenceTrajectory.h"
 
 #include "Alignment/ReferenceTrajectories/interface/TrajectoryFactoryBase.h"
 
@@ -17,30 +17,29 @@
 /// If |B| = 0 T and configuration parameter UseBzeroIfFieldOff is True,
 /// hand-over to the BzeroReferenceTrajectoryFactory.
 
-class ReferenceTrajectoryFactory : public TrajectoryFactoryBase
-{
+class ReferenceTrajectoryFactory : public TrajectoryFactoryBase {
 public:
   ReferenceTrajectoryFactory(const edm::ParameterSet &config);
   ~ReferenceTrajectoryFactory() override;
 
   /// Produce the reference trajectories.
   const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
-							   const ConstTrajTrackPairCollection &tracks,
-							   const reco::BeamSpot &beamSpot) const override;
+                                                   const ConstTrajTrackPairCollection &tracks,
+                                                   const reco::BeamSpot &beamSpot) const override;
 
   const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
-							   const ConstTrajTrackPairCollection &tracks,
-							   const ExternalPredictionCollection &external,
-							   const reco::BeamSpot &beamSpot) const override;
+                                                   const ConstTrajTrackPairCollection &tracks,
+                                                   const ExternalPredictionCollection &external,
+                                                   const reco::BeamSpot &beamSpot) const override;
 
-  ReferenceTrajectoryFactory* clone() const override { return new ReferenceTrajectoryFactory(*this); }
+  ReferenceTrajectoryFactory *clone() const override { return new ReferenceTrajectoryFactory(*this); }
 
 protected:
   ReferenceTrajectoryFactory(const ReferenceTrajectoryFactory &other);
   const TrajectoryFactoryBase *bzeroFactory() const;
 
   double theMass;
-  bool   theUseBzeroIfFieldOff;
+  bool theUseBzeroIfFieldOff;
   mutable const TrajectoryFactoryBase *theBzeroFactory;
 };
 
@@ -48,63 +47,50 @@ class ReferenceTrajectoryFactory : public TrajectoryFactoryBase
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 
-ReferenceTrajectoryFactory::ReferenceTrajectoryFactory( const edm::ParameterSet & config ) :
-  TrajectoryFactoryBase( config ),
-  theMass(config.getParameter<double>("ParticleMass")),
-  theUseBzeroIfFieldOff(config.getParameter<bool>("UseBzeroIfFieldOff")),
-  theBzeroFactory(nullptr)
-{
+ReferenceTrajectoryFactory::ReferenceTrajectoryFactory(const edm::ParameterSet &config)
+    : TrajectoryFactoryBase(config),
+      theMass(config.getParameter<double>("ParticleMass")),
+      theUseBzeroIfFieldOff(config.getParameter<bool>("UseBzeroIfFieldOff")),
+      theBzeroFactory(nullptr) {
   edm::LogInfo("Alignment") << "@SUB=ReferenceTrajectoryFactory"
                             << "mass: " << theMass
-                            << "\nusing Bzero if |B| = 0: " 
-                            << (theUseBzeroIfFieldOff ? "yes" : "no");
+                            << "\nusing Bzero if |B| = 0: " << (theUseBzeroIfFieldOff ? "yes" : "no");
 }
 
-ReferenceTrajectoryFactory::ReferenceTrajectoryFactory(const ReferenceTrajectoryFactory &other) :
-  TrajectoryFactoryBase(other),
-  theMass(other.theMass),
-  theUseBzeroIfFieldOff(other.theUseBzeroIfFieldOff),
-  theBzeroFactory(nullptr) // copy data members, but no double pointing to same Bzero factory...
-{
-}
- 
-ReferenceTrajectoryFactory::~ReferenceTrajectoryFactory( void )
-{
-  delete theBzeroFactory;
-}
+ReferenceTrajectoryFactory::ReferenceTrajectoryFactory(const ReferenceTrajectoryFactory &other)
+    : TrajectoryFactoryBase(other),
+      theMass(other.theMass),
+      theUseBzeroIfFieldOff(other.theUseBzeroIfFieldOff),
+      theBzeroFactory(nullptr)  // copy data members, but no double pointing to same Bzero factory...
+{}
 
+ReferenceTrajectoryFactory::~ReferenceTrajectoryFactory(void) { delete theBzeroFactory; }
 
-const ReferenceTrajectoryFactory::ReferenceTrajectoryCollection
-ReferenceTrajectoryFactory::trajectories(const edm::EventSetup &setup,
-					 const ConstTrajTrackPairCollection &tracks,
-					 const reco::BeamSpot &beamSpot) const
-{
-  edm::ESHandle< MagneticField > magneticField;
-  setup.get< IdealMagneticFieldRecord >().get( magneticField );
-  if (theUseBzeroIfFieldOff && magneticField->inTesla(GlobalPoint(0.,0.,0.)).mag2() < 1.e-6) {
+const ReferenceTrajectoryFactory::ReferenceTrajectoryCollection ReferenceTrajectoryFactory::trajectories(
+    const edm::EventSetup &setup, const ConstTrajTrackPairCollection &tracks, const reco::BeamSpot &beamSpot) const {
+  edm::ESHandle<MagneticField> magneticField;
+  setup.get<IdealMagneticFieldRecord>().get(magneticField);
+  if (theUseBzeroIfFieldOff && magneticField->inTesla(GlobalPoint(0., 0., 0.)).mag2() < 1.e-6) {
     return this->bzeroFactory()->trajectories(setup, tracks, beamSpot);
   }
 
   ReferenceTrajectoryCollection trajectories;
 
   ConstTrajTrackPairCollection::const_iterator itTracks = tracks.begin();
-  
-  while ( itTracks != tracks.end() )
-  { 
-    TrajectoryInput input = this->innermostStateAndRecHits( *itTracks );
-    
+
+  while (itTracks != tracks.end()) {
+    TrajectoryInput input = this->innermostStateAndRecHits(*itTracks);
+
     // Check input: If all hits were rejected, the TSOS is initialized as invalid.
-    if ( input.first.isValid() )
-    {
+    if (input.first.isValid()) {
       ReferenceTrajectoryBase::Config config(materialEffects(), propagationDirection(), theMass);
       config.useBeamSpot = useBeamSpot_;
       config.includeAPEs = includeAPEs_;
       config.allowZeroMaterial = allowZeroMaterial_;
       // set the flag for reversing the RecHits to false, since they are already in the correct order.
       config.hitsAreReverse = false;
-      trajectories.push_back(ReferenceTrajectoryPtr(new ReferenceTrajectory(input.first, input.second,
-                                                                            magneticField.product(),
-                                                                            beamSpot, config)));
+      trajectories.push_back(ReferenceTrajectoryPtr(
+          new ReferenceTrajectory(input.first, input.second, magneticField.product(), beamSpot, config)));
     }
 
     ++itTracks;
@@ -113,82 +99,71 @@ ReferenceTrajectoryFactory::trajectories(const edm::EventSetup &setup,
   return trajectories;
 }
 
-
-const ReferenceTrajectoryFactory::ReferenceTrajectoryCollection
-ReferenceTrajectoryFactory::trajectories( const edm::EventSetup & setup,
-					  const ConstTrajTrackPairCollection& tracks,
-					  const ExternalPredictionCollection& external,
-					  const reco::BeamSpot &beamSpot) const
-{
+const ReferenceTrajectoryFactory::ReferenceTrajectoryCollection ReferenceTrajectoryFactory::trajectories(
+    const edm::EventSetup &setup,
+    const ConstTrajTrackPairCollection &tracks,
+    const ExternalPredictionCollection &external,
+    const reco::BeamSpot &beamSpot) const {
   ReferenceTrajectoryCollection trajectories;
 
-  if ( tracks.size() != external.size() )
-  {
-    edm::LogInfo("ReferenceTrajectories") << "@SUB=ReferenceTrajectoryFactory::trajectories"
-					  << "Inconsistent input:\n"
-					  << "\tnumber of tracks = " << tracks.size()
-					  << "\tnumber of external predictions = " << external.size();
+  if (tracks.size() != external.size()) {
+    edm::LogInfo("ReferenceTrajectories")
+        << "@SUB=ReferenceTrajectoryFactory::trajectories"
+        << "Inconsistent input:\n"
+        << "\tnumber of tracks = " << tracks.size() << "\tnumber of external predictions = " << external.size();
     return trajectories;
   }
 
-  edm::ESHandle< MagneticField > magneticField;
-  setup.get< IdealMagneticFieldRecord >().get( magneticField );
-  if (theUseBzeroIfFieldOff && magneticField->inTesla(GlobalPoint(0.,0.,0.)).mag2() < 1.e-6) {
+  edm::ESHandle<MagneticField> magneticField;
+  setup.get<IdealMagneticFieldRecord>().get(magneticField);
+  if (theUseBzeroIfFieldOff && magneticField->inTesla(GlobalPoint(0., 0., 0.)).mag2() < 1.e-6) {
     return this->bzeroFactory()->trajectories(setup, tracks, external, beamSpot);
   }
 
   ConstTrajTrackPairCollection::const_iterator itTracks = tracks.begin();
   ExternalPredictionCollection::const_iterator itExternal = external.begin();
 
-  while ( itTracks != tracks.end() )
-  {
-    TrajectoryInput input = innermostStateAndRecHits( *itTracks );
+  while (itTracks != tracks.end()) {
+    TrajectoryInput input = innermostStateAndRecHits(*itTracks);
     // Check input: If all hits were rejected, the TSOS is initialized as invalid.
-    if ( input.first.isValid() )
-    {
-      if ( (*itExternal).isValid() && sameSurface( (*itExternal).surface(), input.first.surface() ) )
-      {
+    if (input.first.isValid()) {
+      if ((*itExternal).isValid() && sameSurface((*itExternal).surface(), input.first.surface())) {
         ReferenceTrajectoryBase::Config config(materialEffects(), propagationDirection(), theMass);
         config.useBeamSpot = useBeamSpot_;
         config.includeAPEs = includeAPEs_;
         config.allowZeroMaterial = allowZeroMaterial_;
         // set the flag for reversing the RecHits to false, since they are already in the correct order.
         config.hitsAreReverse = false;
-        ReferenceTrajectoryPtr refTraj(new ReferenceTrajectory(*itExternal, input.second,
-                                                               magneticField.product(),
-                                                               beamSpot, config));
+        ReferenceTrajectoryPtr refTraj(
+            new ReferenceTrajectory(*itExternal, input.second, magneticField.product(), beamSpot, config));
 
-        AlgebraicSymMatrix externalParamErrors( asHepMatrix<5>( (*itExternal).localError().matrix() ) );
-        refTraj->setParameterErrors( externalParamErrors );
-	trajectories.push_back( refTraj );
-      }
-      else
-      {
+        AlgebraicSymMatrix externalParamErrors(asHepMatrix<5>((*itExternal).localError().matrix()));
+        refTraj->setParameterErrors(externalParamErrors);
+        trajectories.push_back(refTraj);
+      } else {
         ReferenceTrajectoryBase::Config config(materialEffects(), propagationDirection(), theMass);
         config.useBeamSpot = useBeamSpot_;
         config.includeAPEs = includeAPEs_;
         config.allowZeroMaterial = allowZeroMaterial_;
         config.hitsAreReverse = false;
-        trajectories.push_back(ReferenceTrajectoryPtr(new ReferenceTrajectory(input.first, input.second,
-                                                                              magneticField.product(),
-                                                                              beamSpot, config)));
+        trajectories.push_back(ReferenceTrajectoryPtr(
+            new ReferenceTrajectory(input.first, input.second, magneticField.product(), beamSpot, config)));
       }
     }
-    
+
     ++itTracks;
     ++itExternal;
   }
-  
+
   return trajectories;
 }
 
-const TrajectoryFactoryBase *ReferenceTrajectoryFactory::bzeroFactory() const
-{
+const TrajectoryFactoryBase *ReferenceTrajectoryFactory::bzeroFactory() const {
   if (!theBzeroFactory) {
     const edm::ParameterSet &myPset = this->configuration();
     edm::LogInfo("Alignment") << "@SUB=ReferenceTrajectoryFactory::bzeroFactory"
-			      << "Using BzeroReferenceTrajectoryFactory for some (all?) events.";
-    // We take the config of this factory, copy it, replace its name and add 
+                              << "Using BzeroReferenceTrajectoryFactory for some (all?) events.";
+    // We take the config of this factory, copy it, replace its name and add
     // the momentum parameter as expected by BzeroReferenceTrajectoryFactory and create it:
     edm::ParameterSet pset;
     pset.copyForModify(myPset);
@@ -201,4 +176,4 @@ const TrajectoryFactoryBase *ReferenceTrajectoryFactory::bzeroFactory() const
   return theBzeroFactory;
 }
 
-DEFINE_EDM_PLUGIN( TrajectoryFactoryPlugin, ReferenceTrajectoryFactory, "ReferenceTrajectoryFactory" );
+DEFINE_EDM_PLUGIN(TrajectoryFactoryPlugin, ReferenceTrajectoryFactory, "ReferenceTrajectoryFactory");
diff --git a/Alignment/ReferenceTrajectories/plugins/TwoBodyDecayTrajectoryFactory.cc b/Alignment/ReferenceTrajectories/plugins/TwoBodyDecayTrajectoryFactory.cc
index 70b385a8d499c..7d340cecb93d2 100644
--- a/Alignment/ReferenceTrajectories/plugins/TwoBodyDecayTrajectoryFactory.cc
+++ b/Alignment/ReferenceTrajectories/plugins/TwoBodyDecayTrajectoryFactory.cc
@@ -1,21 +1,20 @@
-#include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h" 
-#include "DataFormats/GeometrySurface/interface/Surface.h" 
-#include "DataFormats/CLHEP/interface/AlgebraicObjects.h" 
-#include "DataFormats/Math/interface/Vector.h" 
-#include "DataFormats/Math/interface/Error.h" 
-#include "RecoVertex/VertexTools/interface/PerigeeLinearizedTrackState.h" 
+#include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h"
+#include "DataFormats/GeometrySurface/interface/Surface.h"
+#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
+#include "DataFormats/Math/interface/Vector.h"
+#include "DataFormats/Math/interface/Error.h"
+#include "RecoVertex/VertexTools/interface/PerigeeLinearizedTrackState.h"
 #include "Alignment/ReferenceTrajectories/interface/TrajectoryFactoryPlugin.h"
 
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
 
 #include "Geometry/CommonDetUnit/interface/TrackerGeomDet.h"
 
-#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" 
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-
 #include "Alignment/ReferenceTrajectories/interface/TrajectoryFactoryBase.h"
 #include "Alignment/ReferenceTrajectories/interface/TwoBodyDecayTrajectory.h"
 
@@ -26,10 +25,8 @@
    extension for BreakPoints or BrokenLines by Claus Kleinwort
  */
 
-class TwoBodyDecayTrajectoryFactory : public TrajectoryFactoryBase
-{
+class TwoBodyDecayTrajectoryFactory : public TrajectoryFactoryBase {
 public:
-
   typedef TwoBodyDecayVirtualMeasurement VirtualMeasurement;
   typedef TwoBodyDecayTrajectoryState::TsosContainer TsosContainer;
   typedef TwoBodyDecayTrajectory::ConstRecHitCollection ConstRecHitCollection;
@@ -39,26 +36,25 @@ class TwoBodyDecayTrajectoryFactory : public TrajectoryFactoryBase
 
   /// Produce the trajectories.
   const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
-							   const ConstTrajTrackPairCollection &tracks,
-							   const reco::BeamSpot &beamSpot) const override;
+                                                   const ConstTrajTrackPairCollection &tracks,
+                                                   const reco::BeamSpot &beamSpot) const override;
 
   const ReferenceTrajectoryCollection trajectories(const edm::EventSetup &setup,
-							   const ConstTrajTrackPairCollection &tracks,
-							   const ExternalPredictionCollection &external,
-							   const reco::BeamSpot &beamSpot) const override;
+                                                   const ConstTrajTrackPairCollection &tracks,
+                                                   const ExternalPredictionCollection &external,
+                                                   const reco::BeamSpot &beamSpot) const override;
 
-  TwoBodyDecayTrajectoryFactory* clone() const override { return new TwoBodyDecayTrajectoryFactory(*this); }
+  TwoBodyDecayTrajectoryFactory *clone() const override { return new TwoBodyDecayTrajectoryFactory(*this); }
 
 protected:
   const ReferenceTrajectoryCollection constructTrajectories(const ConstTrajTrackPairCollection &tracks,
-							    const TwoBodyDecay &tbd,
-							    const MagneticField *magField,
-							    const reco::BeamSpot &beamSpot,
-							    bool setParameterErrors) const;
-
-  bool match(const TrajectoryStateOnSurface &state,
-	     const TransientTrackingRecHit::ConstRecHitPointer &recHit) const;
-    
+                                                            const TwoBodyDecay &tbd,
+                                                            const MagneticField *magField,
+                                                            const reco::BeamSpot &beamSpot,
+                                                            bool setParameterErrors) const;
+
+  bool match(const TrajectoryStateOnSurface &state, const TransientTrackingRecHit::ConstRecHitPointer &recHit) const;
+
   TwoBodyDecayFitter theFitter;
 
   double thePrimaryMass;
@@ -69,152 +65,130 @@ class TwoBodyDecayTrajectoryFactory : public TrajectoryFactoryBase
   double theChi2CutValue;
   bool theUseRefittedStateFlag;
   bool theConstructTsosWithErrorsFlag;
-
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 
-TwoBodyDecayTrajectoryFactory::TwoBodyDecayTrajectoryFactory( const edm::ParameterSet& config )
-  : TrajectoryFactoryBase(config, 2),
-    theFitter(config)
-{
-  const edm::ParameterSet ppc = config.getParameter< edm::ParameterSet >( "ParticleProperties" );
-  thePrimaryMass = ppc.getParameter< double >( "PrimaryMass" );
-  thePrimaryWidth = ppc.getParameter< double >( "PrimaryWidth" );
-  theSecondaryMass = ppc.getParameter< double >( "SecondaryMass" );
-
-  theNSigmaCutValue = config.getParameter< double >( "NSigmaCut" );
-  theChi2CutValue = config.getParameter< double >( "Chi2Cut" );
-  theUseRefittedStateFlag = config.getParameter< bool >( "UseRefittedState" );
-  theConstructTsosWithErrorsFlag = config.getParameter< bool >( "ConstructTsosWithErrors" );
+TwoBodyDecayTrajectoryFactory::TwoBodyDecayTrajectoryFactory(const edm::ParameterSet &config)
+    : TrajectoryFactoryBase(config, 2), theFitter(config) {
+  const edm::ParameterSet ppc = config.getParameter<edm::ParameterSet>("ParticleProperties");
+  thePrimaryMass = ppc.getParameter<double>("PrimaryMass");
+  thePrimaryWidth = ppc.getParameter<double>("PrimaryWidth");
+  theSecondaryMass = ppc.getParameter<double>("SecondaryMass");
+
+  theNSigmaCutValue = config.getParameter<double>("NSigmaCut");
+  theChi2CutValue = config.getParameter<double>("Chi2Cut");
+  theUseRefittedStateFlag = config.getParameter<bool>("UseRefittedState");
+  theConstructTsosWithErrorsFlag = config.getParameter<bool>("ConstructTsosWithErrors");
 }
 
-TwoBodyDecayTrajectoryFactory::~TwoBodyDecayTrajectoryFactory()
-{
-}
+TwoBodyDecayTrajectoryFactory::~TwoBodyDecayTrajectoryFactory() {}
 
-const TrajectoryFactoryBase::ReferenceTrajectoryCollection
-TwoBodyDecayTrajectoryFactory::trajectories(const edm::EventSetup &setup,
-					    const ConstTrajTrackPairCollection &tracks,
-					    const reco::BeamSpot &beamSpot) const
-{
+const TrajectoryFactoryBase::ReferenceTrajectoryCollection TwoBodyDecayTrajectoryFactory::trajectories(
+    const edm::EventSetup &setup, const ConstTrajTrackPairCollection &tracks, const reco::BeamSpot &beamSpot) const {
   ReferenceTrajectoryCollection trajectories;
 
-  edm::ESHandle< MagneticField > magneticField;
-  setup.get< IdealMagneticFieldRecord >().get( magneticField );
+  edm::ESHandle<MagneticField> magneticField;
+  setup.get<IdealMagneticFieldRecord>().get(magneticField);
 
-  if ( tracks.size() == 2 )
-  {
+  if (tracks.size() == 2) {
     // produce transient tracks from persistent tracks
-    std::vector< reco::TransientTrack > transientTracks( 2 );
+    std::vector<reco::TransientTrack> transientTracks(2);
 
-    transientTracks[0] = reco::TransientTrack( *tracks[0].second, magneticField.product() );
-    transientTracks[0].setES( setup );
+    transientTracks[0] = reco::TransientTrack(*tracks[0].second, magneticField.product());
+    transientTracks[0].setES(setup);
 
-    transientTracks[1] = reco::TransientTrack( *tracks[1].second, magneticField.product() );
-    transientTracks[1].setES( setup );
+    transientTracks[1] = reco::TransientTrack(*tracks[1].second, magneticField.product());
+    transientTracks[1].setES(setup);
 
     // estimate the decay parameters
-    VirtualMeasurement vm( thePrimaryMass, thePrimaryWidth, theSecondaryMass, beamSpot );
-    TwoBodyDecay tbd = theFitter.estimate( transientTracks, vm );
+    VirtualMeasurement vm(thePrimaryMass, thePrimaryWidth, theSecondaryMass, beamSpot);
+    TwoBodyDecay tbd = theFitter.estimate(transientTracks, vm);
 
-    if ( !tbd.isValid() || ( tbd.chi2() > theChi2CutValue ) )
-    {
-      trajectories.push_back( ReferenceTrajectoryPtr( new TwoBodyDecayTrajectory() ) );
+    if (!tbd.isValid() || (tbd.chi2() > theChi2CutValue)) {
+      trajectories.push_back(ReferenceTrajectoryPtr(new TwoBodyDecayTrajectory()));
       return trajectories;
     }
 
-    return constructTrajectories( tracks, tbd, magneticField.product(), beamSpot, false );
-  }
-  else
-  {
-    edm::LogInfo( "ReferenceTrajectories" ) << "@SUB=TwoBodyDecayTrajectoryFactory::trajectories"
-					    << "Need 2 tracks, got " << tracks.size() << ".\n";
+    return constructTrajectories(tracks, tbd, magneticField.product(), beamSpot, false);
+  } else {
+    edm::LogInfo("ReferenceTrajectories") << "@SUB=TwoBodyDecayTrajectoryFactory::trajectories"
+                                          << "Need 2 tracks, got " << tracks.size() << ".\n";
   }
 
   return trajectories;
 }
 
-
-const TrajectoryFactoryBase::ReferenceTrajectoryCollection
-TwoBodyDecayTrajectoryFactory::trajectories(const edm::EventSetup &setup,
-					    const ConstTrajTrackPairCollection &tracks,
-					    const ExternalPredictionCollection &external,
-					    const reco::BeamSpot &beamSpot) const
-{
+const TrajectoryFactoryBase::ReferenceTrajectoryCollection TwoBodyDecayTrajectoryFactory::trajectories(
+    const edm::EventSetup &setup,
+    const ConstTrajTrackPairCollection &tracks,
+    const ExternalPredictionCollection &external,
+    const reco::BeamSpot &beamSpot) const {
   ReferenceTrajectoryCollection trajectories;
 
-  edm::ESHandle< MagneticField > magneticField;
-  setup.get< IdealMagneticFieldRecord >().get( magneticField );
+  edm::ESHandle<MagneticField> magneticField;
+  setup.get<IdealMagneticFieldRecord>().get(magneticField);
 
-  if ( tracks.size() == 2 && external.size() == 2 )
-  {
-    if ( external[0].isValid() && external[1].isValid() ) // Include external estimates
+  if (tracks.size() == 2 && external.size() == 2) {
+    if (external[0].isValid() && external[1].isValid())  // Include external estimates
     {
       // produce transient tracks from persistent tracks
-      std::vector< reco::TransientTrack > transientTracks( 2 );
+      std::vector<reco::TransientTrack> transientTracks(2);
 
-      transientTracks[0] = reco::TransientTrack( *tracks[0].second, magneticField.product() );
-      transientTracks[0].setES( setup );
+      transientTracks[0] = reco::TransientTrack(*tracks[0].second, magneticField.product());
+      transientTracks[0].setES(setup);
 
-      transientTracks[1] = reco::TransientTrack( *tracks[1].second, magneticField.product() );
-      transientTracks[1].setES( setup );
+      transientTracks[1] = reco::TransientTrack(*tracks[1].second, magneticField.product());
+      transientTracks[1].setES(setup);
 
       // estimate the decay parameters. the transient tracks are not really associated to the
       // the external tsos, but this is o.k., because the only information retrieved from them
       // is the magnetic field.
-      VirtualMeasurement vm( thePrimaryMass, thePrimaryWidth, theSecondaryMass, beamSpot );
+      VirtualMeasurement vm(thePrimaryMass, thePrimaryWidth, theSecondaryMass, beamSpot);
       TwoBodyDecay tbd = theFitter.estimate(transientTracks, external, vm);
 
-      if ( !tbd.isValid()  || ( tbd.chi2() > theChi2CutValue ) )
-      {
-	trajectories.push_back( ReferenceTrajectoryPtr( new TwoBodyDecayTrajectory() ) );
-	return trajectories;
+      if (!tbd.isValid() || (tbd.chi2() > theChi2CutValue)) {
+        trajectories.push_back(ReferenceTrajectoryPtr(new TwoBodyDecayTrajectory()));
+        return trajectories;
       }
 
-      return constructTrajectories( tracks, tbd, magneticField.product(), beamSpot, true );
-    }
-    else
-    {
+      return constructTrajectories(tracks, tbd, magneticField.product(), beamSpot, true);
+    } else {
       // Return without external estimate
       trajectories = this->trajectories(setup, tracks, beamSpot);
     }
-  }
-  else
-  {
-    edm::LogInfo( "ReferenceTrajectories" ) << "@SUB=TwoBodyDecayTrajectoryFactory::trajectories"
-					    << "Need 2 tracks, got " << tracks.size() << ".\n";
+  } else {
+    edm::LogInfo("ReferenceTrajectories") << "@SUB=TwoBodyDecayTrajectoryFactory::trajectories"
+                                          << "Need 2 tracks, got " << tracks.size() << ".\n";
   }
 
   return trajectories;
 }
 
-
-const TwoBodyDecayTrajectoryFactory::ReferenceTrajectoryCollection
-TwoBodyDecayTrajectoryFactory::constructTrajectories( const ConstTrajTrackPairCollection& tracks,
-						      const TwoBodyDecay& tbd,
-						      const MagneticField* magField,
-						      const reco::BeamSpot &beamSpot,
-						      bool setParameterErrors ) const
-{
+const TwoBodyDecayTrajectoryFactory::ReferenceTrajectoryCollection TwoBodyDecayTrajectoryFactory::constructTrajectories(
+    const ConstTrajTrackPairCollection &tracks,
+    const TwoBodyDecay &tbd,
+    const MagneticField *magField,
+    const reco::BeamSpot &beamSpot,
+    bool setParameterErrors) const {
   ReferenceTrajectoryCollection trajectories;
 
   // get innermost valid trajectory state and hits from the tracks
-  TrajectoryInput input1 = this->innermostStateAndRecHits( tracks[0] );
-  TrajectoryInput input2 = this->innermostStateAndRecHits( tracks[1] );
+  TrajectoryInput input1 = this->innermostStateAndRecHits(tracks[0]);
+  TrajectoryInput input2 = this->innermostStateAndRecHits(tracks[1]);
 
-  if ( !( input1.first.isValid() && input2.first.isValid() ) ) return trajectories;
+  if (!(input1.first.isValid() && input2.first.isValid()))
+    return trajectories;
 
   // produce TwoBodyDecayTrajectoryState (input for TwoBodyDecayTrajectory)
-  TsosContainer tsos( input1.first, input2.first );
-  ConstRecHitCollection recHits( input1.second, input2.second );
-  TwoBodyDecayTrajectoryState trajectoryState( tsos, tbd, theSecondaryMass, magField );
+  TsosContainer tsos(input1.first, input2.first);
+  ConstRecHitCollection recHits(input1.second, input2.second);
+  TwoBodyDecayTrajectoryState trajectoryState(tsos, tbd, theSecondaryMass, magField);
 
-  if ( !trajectoryState.isValid() )
-  {
-    trajectories.push_back( ReferenceTrajectoryPtr( new TwoBodyDecayTrajectory() ) );
+  if (!trajectoryState.isValid()) {
+    trajectories.push_back(ReferenceTrajectoryPtr(new TwoBodyDecayTrajectory()));
     return trajectories;
   }
 
@@ -223,19 +197,15 @@ TwoBodyDecayTrajectoryFactory::constructTrajectories( const ConstTrajTrackPairCo
   //TrackingRecHit::ConstRecHitPointer updatedRecHit1( recHits.first.front()->clone( tsos.first ) );
   // TrackingRecHit::ConstRecHitPointer updatedRecHit2( recHits.second.front()->clone( tsos.second ) );
 
-  TrackingRecHit::ConstRecHitPointer updatedRecHit1( recHits.first.front() );
-  TrackingRecHit::ConstRecHitPointer updatedRecHit2( recHits.second.front() );
-
+  TrackingRecHit::ConstRecHitPointer updatedRecHit1(recHits.first.front());
+  TrackingRecHit::ConstRecHitPointer updatedRecHit2(recHits.second.front());
 
-  bool valid1 = match( trajectoryState.trajectoryStates( true ).first,
-		       updatedRecHit1 );
+  bool valid1 = match(trajectoryState.trajectoryStates(true).first, updatedRecHit1);
 
-  bool valid2 = match( trajectoryState.trajectoryStates( true ).second,
-		       updatedRecHit2 );
+  bool valid2 = match(trajectoryState.trajectoryStates(true).second, updatedRecHit2);
 
-  if ( !valid1 || !valid2 )
-  {
-    trajectories.push_back( ReferenceTrajectoryPtr( new TwoBodyDecayTrajectory() ) );
+  if (!valid1 || !valid2) {
+    trajectories.push_back(ReferenceTrajectoryPtr(new TwoBodyDecayTrajectory()));
     return trajectories;
   }
 
@@ -247,20 +217,15 @@ TwoBodyDecayTrajectoryFactory::constructTrajectories( const ConstTrajTrackPairCo
   config.constructTsosWithErrors = theConstructTsosWithErrorsFlag;
   // set the flag for reversing the RecHits to false, since they are already in the correct order.
   config.hitsAreReverse = false;
-  TwoBodyDecayTrajectory* result = new TwoBodyDecayTrajectory(trajectoryState,
-                                                              recHits,
-                                                              magField,
-                                                              beamSpot,
-                                                              config);
-  if ( setParameterErrors && tbd.hasError() ) result->setParameterErrors( tbd.covariance() );
-  trajectories.push_back( ReferenceTrajectoryPtr( result ) );
+  TwoBodyDecayTrajectory *result = new TwoBodyDecayTrajectory(trajectoryState, recHits, magField, beamSpot, config);
+  if (setParameterErrors && tbd.hasError())
+    result->setParameterErrors(tbd.covariance());
+  trajectories.push_back(ReferenceTrajectoryPtr(result));
   return trajectories;
 }
 
-
-bool TwoBodyDecayTrajectoryFactory::match( const TrajectoryStateOnSurface& state,
-					   const TransientTrackingRecHit::ConstRecHitPointer& recHit ) const
-{
+bool TwoBodyDecayTrajectoryFactory::match(const TrajectoryStateOnSurface &state,
+                                          const TransientTrackingRecHit::ConstRecHitPointer &recHit) const {
   LocalPoint lp1 = state.localPosition();
   LocalPoint lp2 = recHit->localPosition();
 
@@ -272,8 +237,7 @@ bool TwoBodyDecayTrajectoryFactory::match( const TrajectoryStateOnSurface& state
   double varX = le.xx();
   double varY = le.yy();
 
-  return ( ( fabs(deltaX)/sqrt(varX) < theNSigmaCutValue ) && ( fabs(deltaY)/sqrt(varY) < theNSigmaCutValue ) );
+  return ((fabs(deltaX) / sqrt(varX) < theNSigmaCutValue) && (fabs(deltaY) / sqrt(varY) < theNSigmaCutValue));
 }
 
-
-DEFINE_EDM_PLUGIN( TrajectoryFactoryPlugin, TwoBodyDecayTrajectoryFactory, "TwoBodyDecayTrajectoryFactory" );
+DEFINE_EDM_PLUGIN(TrajectoryFactoryPlugin, TwoBodyDecayTrajectoryFactory, "TwoBodyDecayTrajectoryFactory");
diff --git a/Alignment/ReferenceTrajectories/src/BeamSpotTransientTrackingRecHit.cc b/Alignment/ReferenceTrajectories/src/BeamSpotTransientTrackingRecHit.cc
index d67fee81add81..4cc9850a88a43 100644
--- a/Alignment/ReferenceTrajectories/src/BeamSpotTransientTrackingRecHit.cc
+++ b/Alignment/ReferenceTrajectories/src/BeamSpotTransientTrackingRecHit.cc
@@ -8,27 +8,23 @@
 
 #include "Alignment/ReferenceTrajectories/interface/BeamSpotTransientTrackingRecHit.h"
 
-AlgebraicVector BeamSpotTransientTrackingRecHit::parameters() const
-{
+AlgebraicVector BeamSpotTransientTrackingRecHit::parameters() const {
   AlgebraicVector result(1);
   result[0] = localPosition().x();
   return result;
 }
 
-AlgebraicSymMatrix BeamSpotTransientTrackingRecHit::parametersError() const
-{
+AlgebraicSymMatrix BeamSpotTransientTrackingRecHit::parametersError() const {
   LocalError le = localPositionError();
   AlgebraicSymMatrix m(1);
   m[0][0] = le.xx();
   return m;
 }
 
-
-static AlgebraicMatrix initialize()
-{
-  AlgebraicMatrix ret( 1, 5, 0);
+static AlgebraicMatrix initialize() {
+  AlgebraicMatrix ret(1, 5, 0);
   ret[0][3] = 1;
   return ret;
 }
 
-const AlgebraicMatrix BeamSpotTransientTrackingRecHit::theProjectionMatrix=initialize();
+const AlgebraicMatrix BeamSpotTransientTrackingRecHit::theProjectionMatrix = initialize();
diff --git a/Alignment/ReferenceTrajectories/src/BzeroReferenceTrajectory.cc b/Alignment/ReferenceTrajectories/src/BzeroReferenceTrajectory.cc
index 37ad9507c8b6e..f14fbc17cf482 100644
--- a/Alignment/ReferenceTrajectories/src/BzeroReferenceTrajectory.cc
+++ b/Alignment/ReferenceTrajectories/src/BzeroReferenceTrajectory.cc
@@ -1,41 +1,38 @@
 
 #include "Alignment/ReferenceTrajectories/interface/BzeroReferenceTrajectory.h"
 
-#include "DataFormats/CLHEP/interface/AlgebraicObjects.h" 
+#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
 #include "DataFormats/TrajectoryState/interface/LocalTrajectoryParameters.h"
 
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h"
 
-
 BzeroReferenceTrajectory::BzeroReferenceTrajectory(const TrajectoryStateOnSurface& tsos,
                                                    const TransientTrackingRecHit::ConstRecHitContainer& recHits,
-                                                   const MagneticField *magField,
+                                                   const MagneticField* magField,
                                                    const reco::BeamSpot& beamSpot,
-                                                   const ReferenceTrajectoryBase::Config& config) :
-  ReferenceTrajectory(tsos.localParameters().mixedFormatVector().kSize, recHits.size(), config),
-  theMomentumEstimate(config.momentumEstimate)
-{
+                                                   const ReferenceTrajectoryBase::Config& config)
+    : ReferenceTrajectory(tsos.localParameters().mixedFormatVector().kSize, recHits.size(), config),
+      theMomentumEstimate(config.momentumEstimate) {
   // no check against magField == 0
 
   // No estimate for momentum of cosmics available -> set to default value.
   theParameters = asHepVector(tsos.localParameters().mixedFormatVector());
-  theParameters[0] = 1./theMomentumEstimate;
+  theParameters[0] = 1. / theMomentumEstimate;
 
-  LocalTrajectoryParameters locParamWithFixedMomentum( asSVector<5>(theParameters),
-						       tsos.localParameters().pzSign(),
-						       tsos.localParameters().charge() );
+  LocalTrajectoryParameters locParamWithFixedMomentum(
+      asSVector<5>(theParameters), tsos.localParameters().pzSign(), tsos.localParameters().charge());
 
-  const TrajectoryStateOnSurface refTsosWithFixedMomentum(locParamWithFixedMomentum, tsos.localError(),
-							  tsos.surface(), magField,
-							  surfaceSide(config.propDir));
+  const TrajectoryStateOnSurface refTsosWithFixedMomentum(
+      locParamWithFixedMomentum, tsos.localError(), tsos.surface(), magField, surfaceSide(config.propDir));
 
-  if (config.hitsAreReverse)
-  {
+  if (config.hitsAreReverse) {
     TransientTrackingRecHit::ConstRecHitContainer fwdRecHits;
     fwdRecHits.reserve(recHits.size());
 
-    for (TransientTrackingRecHit::ConstRecHitContainer::const_reverse_iterator it=recHits.rbegin(); it != recHits.rend(); ++it)
+    for (TransientTrackingRecHit::ConstRecHitContainer::const_reverse_iterator it = recHits.rbegin();
+         it != recHits.rend();
+         ++it)
       fwdRecHits.push_back(*it);
 
     theValidityFlag = this->construct(refTsosWithFixedMomentum, fwdRecHits, magField, beamSpot);
@@ -44,6 +41,6 @@ BzeroReferenceTrajectory::BzeroReferenceTrajectory(const TrajectoryStateOnSurfac
   }
 
   // Exclude momentum from the parameters and also the derivatives of the measurements w.r.t. the momentum.
-  theParameters = theParameters.sub( 2, 5 );
-  theDerivatives = theDerivatives.sub( 1, theDerivatives.num_row(), 2, theDerivatives.num_col() );
+  theParameters = theParameters.sub(2, 5);
+  theDerivatives = theDerivatives.sub(1, theDerivatives.num_row(), 2, theDerivatives.num_col());
 }
diff --git a/Alignment/ReferenceTrajectories/src/DualBzeroReferenceTrajectory.cc b/Alignment/ReferenceTrajectories/src/DualBzeroReferenceTrajectory.cc
index b7754f8a24f2e..543c540548ecf 100644
--- a/Alignment/ReferenceTrajectories/src/DualBzeroReferenceTrajectory.cc
+++ b/Alignment/ReferenceTrajectories/src/DualBzeroReferenceTrajectory.cc
@@ -4,50 +4,43 @@
 
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 
-#include "DataFormats/CLHEP/interface/AlgebraicObjects.h" 
+#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
 #include "DataFormats/TrajectoryState/interface/LocalTrajectoryParameters.h"
 
 #include "Alignment/ReferenceTrajectories/interface/BzeroReferenceTrajectory.h"
 
-
-
 DualBzeroReferenceTrajectory::DualBzeroReferenceTrajectory(const TrajectoryStateOnSurface& tsos,
                                                            const ConstRecHitContainer& forwardRecHits,
                                                            const ConstRecHitContainer& backwardRecHits,
                                                            const MagneticField* magField,
                                                            const reco::BeamSpot& beamSpot,
-                                                           const ReferenceTrajectoryBase::Config& config) :
-  DualReferenceTrajectory(tsos.localParameters().mixedFormatVector().kSize - 1,
-                          numberOfUsedRecHits(forwardRecHits) + numberOfUsedRecHits(backwardRecHits) - 1,
-                          config),
-    theMomentumEstimate(config.momentumEstimate)
-{
+                                                           const ReferenceTrajectoryBase::Config& config)
+    : DualReferenceTrajectory(tsos.localParameters().mixedFormatVector().kSize - 1,
+                              numberOfUsedRecHits(forwardRecHits) + numberOfUsedRecHits(backwardRecHits) - 1,
+                              config),
+      theMomentumEstimate(config.momentumEstimate) {
   theValidityFlag = construct(tsos, forwardRecHits, backwardRecHits, magField, beamSpot);
 }
 
+ReferenceTrajectory* DualBzeroReferenceTrajectory::construct(const TrajectoryStateOnSurface& referenceTsos,
+                                                             const ConstRecHitContainer& recHits,
+                                                             double mass,
+                                                             MaterialEffects materialEffects,
+                                                             const PropagationDirection propDir,
+                                                             const MagneticField* magField,
+                                                             bool useBeamSpot,
+                                                             const reco::BeamSpot& beamSpot) const {
+  if (materialEffects >= breakPoints)
+    throw cms::Exception("BadConfig") << "[DualBzeroReferenceTrajectory::construct] Wrong MaterialEffects: "
+                                      << materialEffects;
 
-ReferenceTrajectory*
-DualBzeroReferenceTrajectory::construct(const TrajectoryStateOnSurface &referenceTsos, 
-					const ConstRecHitContainer &recHits,
-					double mass, MaterialEffects materialEffects,
-					const PropagationDirection propDir,
-					const MagneticField *magField,
-					bool useBeamSpot,
-					const reco::BeamSpot &beamSpot) const
-{
-  if (materialEffects >= breakPoints)  throw cms::Exception("BadConfig")
-    << "[DualBzeroReferenceTrajectory::construct] Wrong MaterialEffects: " << materialEffects;
-  
   ReferenceTrajectoryBase::Config config(materialEffects, propDir, mass, theMomentumEstimate);
   config.useBeamSpot = useBeamSpot;
   config.hitsAreReverse = false;
   return new BzeroReferenceTrajectory(referenceTsos, recHits, magField, beamSpot, config);
 }
 
-
-AlgebraicVector
-DualBzeroReferenceTrajectory::extractParameters(const TrajectoryStateOnSurface &referenceTsos) const
-{
-  AlgebraicVector param = asHepVector<5>( referenceTsos.localParameters().mixedFormatVector() );
-  return param.sub( 2, 5 );
+AlgebraicVector DualBzeroReferenceTrajectory::extractParameters(const TrajectoryStateOnSurface& referenceTsos) const {
+  AlgebraicVector param = asHepVector<5>(referenceTsos.localParameters().mixedFormatVector());
+  return param.sub(2, 5);
 }
diff --git a/Alignment/ReferenceTrajectories/src/DualReferenceTrajectory.cc b/Alignment/ReferenceTrajectories/src/DualReferenceTrajectory.cc
index f3c1359cdec0a..cbe123618fec4 100644
--- a/Alignment/ReferenceTrajectories/src/DualReferenceTrajectory.cc
+++ b/Alignment/ReferenceTrajectories/src/DualReferenceTrajectory.cc
@@ -3,7 +3,7 @@
 
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 
-#include "DataFormats/CLHEP/interface/AlgebraicObjects.h" 
+#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
 #include "DataFormats/TrajectoryState/interface/LocalTrajectoryParameters.h"
 
 #include "Alignment/ReferenceTrajectories/interface/ReferenceTrajectory.h"
@@ -13,46 +13,42 @@ DualReferenceTrajectory::DualReferenceTrajectory(const TrajectoryStateOnSurface&
                                                  const ConstRecHitContainer& backwardRecHits,
                                                  const MagneticField* magField,
                                                  const reco::BeamSpot& beamSpot,
-                                                 const ReferenceTrajectoryBase::Config& config) :
-  ReferenceTrajectoryBase(tsos.localParameters().mixedFormatVector().kSize,
-                          numberOfUsedRecHits(forwardRecHits) + numberOfUsedRecHits(backwardRecHits) - 1,
-                          0, 0),
-  mass_(config.mass),
-  materialEffects_(config.materialEffects),
-  propDir_(config.propDir),
-  useBeamSpot_(config.useBeamSpot)
-{
+                                                 const ReferenceTrajectoryBase::Config& config)
+    : ReferenceTrajectoryBase(tsos.localParameters().mixedFormatVector().kSize,
+                              numberOfUsedRecHits(forwardRecHits) + numberOfUsedRecHits(backwardRecHits) - 1,
+                              0,
+                              0),
+      mass_(config.mass),
+      materialEffects_(config.materialEffects),
+      propDir_(config.propDir),
+      useBeamSpot_(config.useBeamSpot) {
   theValidityFlag = this->construct(tsos, forwardRecHits, backwardRecHits, magField, beamSpot);
 }
 
+DualReferenceTrajectory::DualReferenceTrajectory(unsigned int nPar,
+                                                 unsigned int nHits,
+                                                 const ReferenceTrajectoryBase::Config& config)
+    : ReferenceTrajectoryBase(nPar, nHits, 0, 0),
+      mass_(config.mass),
+      materialEffects_(config.materialEffects),
+      propDir_(config.propDir),
+      useBeamSpot_(config.useBeamSpot) {}
+
+bool DualReferenceTrajectory::construct(const TrajectoryStateOnSurface& refTsos,
+                                        const ConstRecHitContainer& forwardRecHits,
+                                        const ConstRecHitContainer& backwardRecHits,
+                                        const MagneticField* magField,
+                                        const reco::BeamSpot& beamSpot) {
+  if (materialEffects_ >= breakPoints)
+    throw cms::Exception("BadConfig") << "[DualReferenceTrajectory::construct] Wrong MaterialEffects: "
+                                      << materialEffects_;
 
-
-DualReferenceTrajectory::DualReferenceTrajectory(unsigned int nPar, unsigned int nHits,
-						 const ReferenceTrajectoryBase::Config& config)
-  : ReferenceTrajectoryBase(nPar, nHits, 0, 0),
-  mass_(config.mass),
-  materialEffects_(config.materialEffects),
-  propDir_(config.propDir),
-  useBeamSpot_(config.useBeamSpot)
-{}
-
-
-bool DualReferenceTrajectory::construct(const TrajectoryStateOnSurface &refTsos,
-                                        const ConstRecHitContainer &forwardRecHits,
-                                        const ConstRecHitContainer &backwardRecHits,
-                                        const MagneticField *magField,
-                                        const reco::BeamSpot &beamSpot)
-{
-  if (materialEffects_ >= breakPoints)  throw cms::Exception("BadConfig")
-    << "[DualReferenceTrajectory::construct] Wrong MaterialEffects: " << materialEffects_;
-    
   ReferenceTrajectoryBase* fwdTraj = construct(refTsos, forwardRecHits, magField, beamSpot);
 
   // set flag for opposite direction to true
   ReferenceTrajectoryBase* bwdTraj = construct(refTsos, backwardRecHits, magField, beamSpot, true);
 
-  if ( !( fwdTraj->isValid() && bwdTraj->isValid() ) )
-  {
+  if (!(fwdTraj->isValid() && bwdTraj->isValid())) {
     delete fwdTraj;
     delete bwdTraj;
     return false;
@@ -64,83 +60,81 @@ bool DualReferenceTrajectory::construct(const TrajectoryStateOnSurface &refTsos,
 
   const std::vector<TrajectoryStateOnSurface>& fwdTsosVec = fwdTraj->trajectoryStates();
   const std::vector<TrajectoryStateOnSurface>& bwdTsosVec = bwdTraj->trajectoryStates();
-  theTsosVec.insert( theTsosVec.end(), fwdTsosVec.begin(), fwdTsosVec.end() );
-  theTsosVec.insert( theTsosVec.end(), ++bwdTsosVec.begin(), bwdTsosVec.end() );
+  theTsosVec.insert(theTsosVec.end(), fwdTsosVec.begin(), fwdTsosVec.end());
+  theTsosVec.insert(theTsosVec.end(), ++bwdTsosVec.begin(), bwdTsosVec.end());
+
+  const ConstRecHitContainer& fwdRecHits = fwdTraj->recHits();
+  const ConstRecHitContainer& bwdRecHits = bwdTraj->recHits();
+  theRecHits.insert(theRecHits.end(), fwdRecHits.begin(), fwdRecHits.end());
+  theRecHits.insert(theRecHits.end(), ++bwdRecHits.begin(), bwdRecHits.end());
 
-  const ConstRecHitContainer &fwdRecHits = fwdTraj->recHits();
-  const ConstRecHitContainer &bwdRecHits = bwdTraj->recHits();
-  theRecHits.insert( theRecHits.end(), fwdRecHits.begin(), fwdRecHits.end() );
-  theRecHits.insert( theRecHits.end(), ++bwdRecHits.begin(), bwdRecHits.end() );
+  theParameters = extractParameters(refTsos);
 
-  theParameters = extractParameters( refTsos );
-  
-  unsigned int nParam   = theNumberOfPars;
+  unsigned int nParam = theNumberOfPars;
   unsigned int nFwdMeas = fwdTraj->numberOfHitMeas();
   unsigned int nBwdMeas = bwdTraj->numberOfHitMeas();
-  unsigned int nFwdBP   = fwdTraj->numberOfVirtualMeas();
-  unsigned int nBwdBP   = bwdTraj->numberOfVirtualMeas();
-  unsigned int nMeas    = nFwdMeas+nBwdMeas-nMeasPerHit; 
-       
-  theMeasurements.sub( 1, fwdTraj->measurements().sub( 1, nFwdMeas ) );
-  theMeasurements.sub( nFwdMeas+1, bwdTraj->measurements().sub( nMeasPerHit+1, nBwdMeas ) );
-    
-  theMeasurementsCov.sub( 1, fwdTraj->measurementErrors().sub( 1, nFwdMeas ) );
-  theMeasurementsCov.sub( nFwdMeas+1, bwdTraj->measurementErrors().sub( nMeasPerHit+1, nBwdMeas ) );
-  
-  theTrajectoryPositions.sub( 1, fwdTraj->trajectoryPositions() );
-  theTrajectoryPositions.sub( nFwdMeas+1, bwdTraj->trajectoryPositions().sub( nMeasPerHit+1, nBwdMeas ) );
-
-  theTrajectoryPositionCov.sub( 1, fwdTraj->trajectoryPositionErrors() );
-  theTrajectoryPositionCov.sub( nFwdMeas+1, bwdTraj->trajectoryPositionErrors().sub( nMeasPerHit+1, nBwdMeas ) );
-
-  theDerivatives.sub( 1, 1, fwdTraj->derivatives().sub( 1, nFwdMeas, 1, nParam ) );
-  theDerivatives.sub( nFwdMeas+1, 1, bwdTraj->derivatives().sub( nMeasPerHit+1, nBwdMeas, 1, nParam ) );
-  
-// for the break points 
-// DUAL with break points makes no sense: (MS) correlations between the two parts are lost ! 
-  if (nFwdBP>0 )
-  {
-    theMeasurements.sub( nMeas+1, fwdTraj->measurements().sub( nFwdMeas+1, nFwdMeas+nFwdBP ) );
-    theMeasurementsCov.sub( nMeas+1, fwdTraj->measurementErrors().sub( nFwdMeas+1, nFwdMeas+nFwdBP ) );  
-    theDerivatives.sub( 1, nParam+1, fwdTraj->derivatives().sub( 1, nFwdMeas, nParam+1, nParam+nFwdBP ) );
-    theDerivatives.sub( nMeas+1, nParam+1, fwdTraj->derivatives().sub( nFwdMeas+1, nFwdMeas+nFwdBP, nParam+1, nParam+nFwdBP ) );
-  }  
-  if (nBwdBP>0 )
-  {
-    theMeasurements.sub( nMeas+nFwdBP+1, bwdTraj->measurements().sub( nBwdMeas+1, nBwdMeas+nBwdBP ) );  
-    theMeasurementsCov.sub( nMeas+nFwdBP+1, bwdTraj->measurementErrors().sub( nBwdMeas+1, nBwdMeas+nBwdBP ) );  
-    theDerivatives.sub( nFwdMeas+1, nParam+nFwdBP+1, bwdTraj->derivatives().sub( nMeasPerHit+1, nBwdMeas, nParam+1, nParam+nBwdBP ) );
-    theDerivatives.sub( nMeas+nFwdBP+1, nParam+nFwdBP+1, bwdTraj->derivatives().sub( nBwdMeas+1, nBwdMeas+nBwdBP, nParam+1, nParam+nBwdBP ) );
+  unsigned int nFwdBP = fwdTraj->numberOfVirtualMeas();
+  unsigned int nBwdBP = bwdTraj->numberOfVirtualMeas();
+  unsigned int nMeas = nFwdMeas + nBwdMeas - nMeasPerHit;
+
+  theMeasurements.sub(1, fwdTraj->measurements().sub(1, nFwdMeas));
+  theMeasurements.sub(nFwdMeas + 1, bwdTraj->measurements().sub(nMeasPerHit + 1, nBwdMeas));
+
+  theMeasurementsCov.sub(1, fwdTraj->measurementErrors().sub(1, nFwdMeas));
+  theMeasurementsCov.sub(nFwdMeas + 1, bwdTraj->measurementErrors().sub(nMeasPerHit + 1, nBwdMeas));
+
+  theTrajectoryPositions.sub(1, fwdTraj->trajectoryPositions());
+  theTrajectoryPositions.sub(nFwdMeas + 1, bwdTraj->trajectoryPositions().sub(nMeasPerHit + 1, nBwdMeas));
+
+  theTrajectoryPositionCov.sub(1, fwdTraj->trajectoryPositionErrors());
+  theTrajectoryPositionCov.sub(nFwdMeas + 1, bwdTraj->trajectoryPositionErrors().sub(nMeasPerHit + 1, nBwdMeas));
+
+  theDerivatives.sub(1, 1, fwdTraj->derivatives().sub(1, nFwdMeas, 1, nParam));
+  theDerivatives.sub(nFwdMeas + 1, 1, bwdTraj->derivatives().sub(nMeasPerHit + 1, nBwdMeas, 1, nParam));
+
+  // for the break points
+  // DUAL with break points makes no sense: (MS) correlations between the two parts are lost !
+  if (nFwdBP > 0) {
+    theMeasurements.sub(nMeas + 1, fwdTraj->measurements().sub(nFwdMeas + 1, nFwdMeas + nFwdBP));
+    theMeasurementsCov.sub(nMeas + 1, fwdTraj->measurementErrors().sub(nFwdMeas + 1, nFwdMeas + nFwdBP));
+    theDerivatives.sub(1, nParam + 1, fwdTraj->derivatives().sub(1, nFwdMeas, nParam + 1, nParam + nFwdBP));
+    theDerivatives.sub(nMeas + 1,
+                       nParam + 1,
+                       fwdTraj->derivatives().sub(nFwdMeas + 1, nFwdMeas + nFwdBP, nParam + 1, nParam + nFwdBP));
   }
-    
+  if (nBwdBP > 0) {
+    theMeasurements.sub(nMeas + nFwdBP + 1, bwdTraj->measurements().sub(nBwdMeas + 1, nBwdMeas + nBwdBP));
+    theMeasurementsCov.sub(nMeas + nFwdBP + 1, bwdTraj->measurementErrors().sub(nBwdMeas + 1, nBwdMeas + nBwdBP));
+    theDerivatives.sub(nFwdMeas + 1,
+                       nParam + nFwdBP + 1,
+                       bwdTraj->derivatives().sub(nMeasPerHit + 1, nBwdMeas, nParam + 1, nParam + nBwdBP));
+    theDerivatives.sub(nMeas + nFwdBP + 1,
+                       nParam + nFwdBP + 1,
+                       bwdTraj->derivatives().sub(nBwdMeas + 1, nBwdMeas + nBwdBP, nParam + 1, nParam + nBwdBP));
+  }
+
   delete fwdTraj;
   delete bwdTraj;
 
-  return true; 
+  return true;
 }
 
-
-ReferenceTrajectory*
-DualReferenceTrajectory::construct(const TrajectoryStateOnSurface &referenceTsos, 
-				   const ConstRecHitContainer &recHits,
-				   const MagneticField *magField,
-				   const reco::BeamSpot &beamSpot,
-				   const bool revertDirection) const
-{
-  if (materialEffects_ >= breakPoints)  throw cms::Exception("BadConfig")
-    << "[DualReferenceTrajectory::construct] Wrong MaterialEffects: " << materialEffects_;
-  
-  ReferenceTrajectoryBase::Config config(materialEffects_,
-                                         (revertDirection ? oppositeDirection(propDir_): propDir_),
-                                         mass_);
+ReferenceTrajectory* DualReferenceTrajectory::construct(const TrajectoryStateOnSurface& referenceTsos,
+                                                        const ConstRecHitContainer& recHits,
+                                                        const MagneticField* magField,
+                                                        const reco::BeamSpot& beamSpot,
+                                                        const bool revertDirection) const {
+  if (materialEffects_ >= breakPoints)
+    throw cms::Exception("BadConfig") << "[DualReferenceTrajectory::construct] Wrong MaterialEffects: "
+                                      << materialEffects_;
+
+  ReferenceTrajectoryBase::Config config(
+      materialEffects_, (revertDirection ? oppositeDirection(propDir_) : propDir_), mass_);
   config.useBeamSpot = useBeamSpot_;
   config.hitsAreReverse = false;
   return new ReferenceTrajectory(referenceTsos, recHits, magField, beamSpot, config);
 }
 
-
-AlgebraicVector
-DualReferenceTrajectory::extractParameters(const TrajectoryStateOnSurface &referenceTsos) const
-{
-  return asHepVector<5>( referenceTsos.localParameters().mixedFormatVector() );
+AlgebraicVector DualReferenceTrajectory::extractParameters(const TrajectoryStateOnSurface& referenceTsos) const {
+  return asHepVector<5>(referenceTsos.localParameters().mixedFormatVector());
 }
diff --git a/Alignment/ReferenceTrajectories/src/ReferenceTrajectory.cc b/Alignment/ReferenceTrajectories/src/ReferenceTrajectory.cc
index 83cf7b7184898..6fe8cc45ab15d 100644
--- a/Alignment/ReferenceTrajectories/src/ReferenceTrajectory.cc
+++ b/Alignment/ReferenceTrajectories/src/ReferenceTrajectory.cc
@@ -10,12 +10,12 @@
 
 #include "Alignment/ReferenceTrajectories/interface/ReferenceTrajectory.h"
 
-#include "DataFormats/GeometrySurface/interface/Surface.h" 
+#include "DataFormats/GeometrySurface/interface/Surface.h"
 #include "DataFormats/GeometrySurface/interface/Plane.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "DataFormats/CLHEP/interface/AlgebraicObjects.h" 
+#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
 #include "DataFormats/GeometrySurface/interface/LocalError.h"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "Geometry/CommonDetUnit/interface/TrackerGeomDet.h"
@@ -49,36 +49,39 @@
 //__________________________________________________________________________________
 using namespace gbl;
 
+ReferenceTrajectory::ReferenceTrajectory(const TrajectoryStateOnSurface &refTsos,
+                                         const TransientTrackingRecHit::ConstRecHitContainer &recHits,
+                                         const MagneticField *magField,
+                                         const reco::BeamSpot &beamSpot,
+                                         const ReferenceTrajectoryBase::Config &config)
+    : ReferenceTrajectoryBase(
+          (config.materialEffects >= brokenLinesCoarse) ? 1 : refTsos.localParameters().mixedFormatVector().kSize,
+          (config.useBeamSpot) ? recHits.size() + 1 : recHits.size(),
+          (config.materialEffects >= brokenLinesCoarse)
+              ? 2 * ((config.useBeamSpot) ? recHits.size() + 1 : recHits.size())
+              : ((config.materialEffects == breakPoints)
+                     ? 2 * ((config.useBeamSpot) ? recHits.size() + 1 : recHits.size()) - 2
+                     : 0),
+          (config.materialEffects >= brokenLinesCoarse)
+              ? 2 * ((config.useBeamSpot) ? recHits.size() + 1 : recHits.size()) - 4
+              : ((config.materialEffects == breakPoints)
+                     ? 2 * ((config.useBeamSpot) ? recHits.size() + 1 : recHits.size()) - 2
+                     : 0)),
+      mass_(config.mass),
+      materialEffects_(config.materialEffects),
+      propDir_(config.propDir),
+      useBeamSpot_(config.useBeamSpot),
+      includeAPEs_(config.includeAPEs),
+      allowZeroMaterial_(config.allowZeroMaterial) {
+  // no check against magField == 0
+  theParameters = asHepVector<5>(refTsos.localParameters().mixedFormatVector());
 
-ReferenceTrajectory::ReferenceTrajectory(const TrajectoryStateOnSurface& refTsos,
-                                         const TransientTrackingRecHit::ConstRecHitContainer& recHits,
-                                         const MagneticField* magField,
-                                         const reco::BeamSpot& beamSpot,
-                                         const ReferenceTrajectoryBase::Config& config) :
-  ReferenceTrajectoryBase(
-   (config.materialEffects >= brokenLinesCoarse) ? 1 : refTsos.localParameters().mixedFormatVector().kSize,
-   (config.useBeamSpot) ? recHits.size()+1 : recHits.size(),
-   (config.materialEffects >= brokenLinesCoarse) ?
-       2*((config.useBeamSpot) ? recHits.size()+1 : recHits.size())   :
-   ( (config.materialEffects == breakPoints) ? 2*((config.useBeamSpot) ? recHits.size()+1 : recHits.size())-2 : 0) ,
-   (config.materialEffects >= brokenLinesCoarse) ?
-       2*((config.useBeamSpot) ? recHits.size()+1 : recHits.size())-4 :
-   ( (config.materialEffects == breakPoints) ? 2*((config.useBeamSpot) ? recHits.size()+1 : recHits.size())-2 : 0) ),
-  mass_(config.mass),
-  materialEffects_(config.materialEffects),
-  propDir_(config.propDir),
-  useBeamSpot_(config.useBeamSpot),
-  includeAPEs_(config.includeAPEs),
-  allowZeroMaterial_(config.allowZeroMaterial)
-{
-  // no check against magField == 0  
-  theParameters = asHepVector<5>( refTsos.localParameters().mixedFormatVector() );
-  
   if (config.hitsAreReverse) {
     TransientTrackingRecHit::ConstRecHitContainer fwdRecHits;
     fwdRecHits.reserve(recHits.size());
-    for (TransientTrackingRecHit::ConstRecHitContainer::const_reverse_iterator it=recHits.rbegin();
-	 it != recHits.rend(); ++it) {
+    for (TransientTrackingRecHit::ConstRecHitContainer::const_reverse_iterator it = recHits.rbegin();
+         it != recHits.rend();
+         ++it) {
       fwdRecHits.push_back(*it);
     }
     theValidityFlag = this->construct(refTsos, fwdRecHits, magField, beamSpot);
@@ -87,50 +90,50 @@ ReferenceTrajectory::ReferenceTrajectory(const TrajectoryStateOnSurface& refTsos
   }
 }
 
-
 //__________________________________________________________________________________
 
-ReferenceTrajectory::ReferenceTrajectory(unsigned int nPar, unsigned int nHits,
-					 const ReferenceTrajectoryBase::Config& config)
- : ReferenceTrajectoryBase( 
-   (config.materialEffects >= brokenLinesCoarse) ? 1 : nPar,
-   nHits, 
-   (config.materialEffects >= brokenLinesCoarse) ? 2*nHits   : ( (config.materialEffects == breakPoints) ? 2*nHits-2 : 0 ),
-   (config.materialEffects >= brokenLinesCoarse) ? 2*nHits-4 : ( (config.materialEffects == breakPoints) ? 2*nHits-2 : 0 ) ),
-   mass_(config.mass),
-   materialEffects_(config.materialEffects),
-   propDir_(config.propDir),
-   useBeamSpot_(config.useBeamSpot),
-   includeAPEs_(config.includeAPEs),
-   allowZeroMaterial_(config.allowZeroMaterial)
-{}
-
+ReferenceTrajectory::ReferenceTrajectory(unsigned int nPar,
+                                         unsigned int nHits,
+                                         const ReferenceTrajectoryBase::Config &config)
+    : ReferenceTrajectoryBase((config.materialEffects >= brokenLinesCoarse) ? 1 : nPar,
+                              nHits,
+                              (config.materialEffects >= brokenLinesCoarse)
+                                  ? 2 * nHits
+                                  : ((config.materialEffects == breakPoints) ? 2 * nHits - 2 : 0),
+                              (config.materialEffects >= brokenLinesCoarse)
+                                  ? 2 * nHits - 4
+                                  : ((config.materialEffects == breakPoints) ? 2 * nHits - 2 : 0)),
+      mass_(config.mass),
+      materialEffects_(config.materialEffects),
+      propDir_(config.propDir),
+      useBeamSpot_(config.useBeamSpot),
+      includeAPEs_(config.includeAPEs),
+      allowZeroMaterial_(config.allowZeroMaterial) {}
 
 //__________________________________________________________________________________
 
-bool ReferenceTrajectory::construct(const TrajectoryStateOnSurface &refTsos, 
-				    const TransientTrackingRecHit::ConstRecHitContainer &recHits,
-				    const MagneticField *magField,
-				    const reco::BeamSpot &beamSpot)
-{   
+bool ReferenceTrajectory::construct(const TrajectoryStateOnSurface &refTsos,
+                                    const TransientTrackingRecHit::ConstRecHitContainer &recHits,
+                                    const MagneticField *magField,
+                                    const reco::BeamSpot &beamSpot) {
   TrajectoryStateOnSurface theRefTsos = refTsos;
 
   const SurfaceSide surfaceSide = this->surfaceSide(propDir_);
   // auto_ptr to avoid memory leaks in case of not reaching delete at end of method:
-  std::unique_ptr<MaterialEffectsUpdator> aMaterialEffectsUpdator
-    (this->createUpdator(materialEffects_, mass_));
-  if (!aMaterialEffectsUpdator.get()) return false; // empty auto_ptr
+  std::unique_ptr<MaterialEffectsUpdator> aMaterialEffectsUpdator(this->createUpdator(materialEffects_, mass_));
+  if (!aMaterialEffectsUpdator.get())
+    return false;  // empty auto_ptr
 
-  AlgebraicMatrix                 fullJacobian(theParameters.num_row(), theParameters.num_row());
-  std::vector<AlgebraicMatrix>    allJacobians; 
+  AlgebraicMatrix fullJacobian(theParameters.num_row(), theParameters.num_row());
+  std::vector<AlgebraicMatrix> allJacobians;
   allJacobians.reserve(theNumberOfHits);
 
-  TransientTrackingRecHit::ConstRecHitPointer  previousHitPtr;
-  TrajectoryStateOnSurface                     previousTsos;
-  AlgebraicSymMatrix              previousChangeInCurvature(theParameters.num_row(), 1);
-  std::vector<AlgebraicSymMatrix> allCurvatureChanges; 
+  TransientTrackingRecHit::ConstRecHitPointer previousHitPtr;
+  TrajectoryStateOnSurface previousTsos;
+  AlgebraicSymMatrix previousChangeInCurvature(theParameters.num_row(), 1);
+  std::vector<AlgebraicSymMatrix> allCurvatureChanges;
   allCurvatureChanges.reserve(theNumberOfHits);
-  
+
   const LocalTrajectoryError zeroErrors(0., 0., 0., 0., 0.);
 
   std::vector<AlgebraicMatrix> allProjections;
@@ -140,197 +143,199 @@ bool ReferenceTrajectory::construct(const TrajectoryStateOnSurface &refTsos,
 
   // CHK
   std::vector<AlgebraicMatrix> allLocalToCurv;
-  allLocalToCurv.reserve(theNumberOfHits); 
+  allLocalToCurv.reserve(theNumberOfHits);
   std::vector<double> allSteps;
-  allSteps.reserve(theNumberOfHits); 
-  std::vector<AlgebraicMatrix>    allCurvlinJacobians; 
+  allSteps.reserve(theNumberOfHits);
+  std::vector<AlgebraicMatrix> allCurvlinJacobians;
   allCurvlinJacobians.reserve(theNumberOfHits);
-  
+
   AlgebraicMatrix firstCurvlinJacobian(5, 5, 1);
-  
+
   unsigned int iRow = 0;
 
-  theNomField = magField->nominalValue(); // nominal magnetic field in kGauss
+  theNomField = magField->nominalValue();  // nominal magnetic field in kGauss
   // local storage vector of all rechits (including rechit for beam spot in case it is used)
   TransientTrackingRecHit::ConstRecHitContainer allRecHits;
 
-  if (useBeamSpot_ && propDir_==alongMomentum) {
-    
+  if (useBeamSpot_ && propDir_ == alongMomentum) {
     GlobalPoint bs(beamSpot.x0(), beamSpot.y0(), beamSpot.z0());
-    
+
     TrajectoryStateClosestToBeamLine tsctbl(TSCBLBuilderNoMaterial()(*(refTsos.freeState()), beamSpot));
     if (!tsctbl.isValid()) {
-      edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::construct" 
-				 << "TrajectoryStateClostestToBeamLine invalid. Skip track.";
+      edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::construct"
+                                 << "TrajectoryStateClostestToBeamLine invalid. Skip track.";
       return false;
     }
 
     FreeTrajectoryState pcaFts = tsctbl.trackStateAtPCA();
     GlobalVector bd(beamSpot.dxdz(), beamSpot.dydz(), 1.0);
-    
+
     //propagation FIXME: Should use same propagator everywhere...
     AnalyticalPropagator propagator(magField);
-    std::pair< TrajectoryStateOnSurface, double > tsosWithPath =
-      propagator.propagateWithPath(pcaFts, refTsos.surface());
-    
-    if (!tsosWithPath.first.isValid()) return false;
-    
+    std::pair<TrajectoryStateOnSurface, double> tsosWithPath = propagator.propagateWithPath(pcaFts, refTsos.surface());
+
+    if (!tsosWithPath.first.isValid())
+      return false;
+
     GlobalVector momDir(pcaFts.momentum());
     GlobalVector perpDir(bd.cross(momDir));
     Plane::RotationType rotation(perpDir, bd);
-    
-    BeamSpotGeomDet * bsGeom = new BeamSpotGeomDet(Plane::build(bs, rotation));
+
+    BeamSpotGeomDet *bsGeom = new BeamSpotGeomDet(Plane::build(bs, rotation));
 
     // There is also a constructor taking the magentic field. Use this one instead?
     theRefTsos = TrajectoryStateOnSurface(pcaFts, bsGeom->surface());
-    
-    TransientTrackingRecHit::ConstRecHitPointer bsRecHit(new BeamSpotTransientTrackingRecHit(beamSpot,
-					  bsGeom,
-					  theRefTsos.freeState()->momentum().phi()));
-    allRecHits.push_back(bsRecHit);
 
+    TransientTrackingRecHit::ConstRecHitPointer bsRecHit(
+        new BeamSpotTransientTrackingRecHit(beamSpot, bsGeom, theRefTsos.freeState()->momentum().phi()));
+    allRecHits.push_back(bsRecHit);
   }
-  
+
   // copy all rechits to the local storage vector
   TransientTrackingRecHit::ConstRecHitContainer::const_iterator itRecHit;
-  for ( itRecHit = recHits.begin(); itRecHit != recHits.end(); ++itRecHit ) { 
+  for (itRecHit = recHits.begin(); itRecHit != recHits.end(); ++itRecHit) {
     const TransientTrackingRecHit::ConstRecHitPointer &hitPtr = *itRecHit;
     allRecHits.push_back(hitPtr);
   }
 
-  for ( itRecHit = allRecHits.begin(); itRecHit != allRecHits.end(); ++itRecHit ) { 
-    
+  for (itRecHit = allRecHits.begin(); itRecHit != allRecHits.end(); ++itRecHit) {
     const TransientTrackingRecHit::ConstRecHitPointer &hitPtr = *itRecHit;
     theRecHits.push_back(hitPtr);
 
     if (0 == iRow) {
-
       // compute the derivatives of the reference-track's parameters w.r.t. the initial ones
-      // derivative of the initial reference-track parameters w.r.t. themselves is of course the identity 
+      // derivative of the initial reference-track parameters w.r.t. themselves is of course the identity
       fullJacobian = AlgebraicMatrix(theParameters.num_row(), theParameters.num_row(), 1);
       allJacobians.push_back(fullJacobian);
       theTsosVec.push_back(theRefTsos);
       const JacobianLocalToCurvilinear startTrafo(hitPtr->det()->surface(), theRefTsos.localParameters(), *magField);
-      const AlgebraicMatrix localToCurvilinear =  asHepMatrix<5>(startTrafo.jacobian());
+      const AlgebraicMatrix localToCurvilinear = asHepMatrix<5>(startTrafo.jacobian());
       if (materialEffects_ <= breakPoints) {
-         theInnerTrajectoryToCurvilinear = asHepMatrix<5>(startTrafo.jacobian());
-	 theInnerLocalToTrajectory = AlgebraicMatrix(5, 5, 1);
-      }	 
+        theInnerTrajectoryToCurvilinear = asHepMatrix<5>(startTrafo.jacobian());
+        theInnerLocalToTrajectory = AlgebraicMatrix(5, 5, 1);
+      }
       allLocalToCurv.push_back(localToCurvilinear);
       allSteps.push_back(0.);
       allCurvlinJacobians.push_back(firstCurvlinJacobian);
 
     } else {
-
       AlgebraicMatrix nextJacobian;
       AlgebraicMatrix nextCurvlinJacobian;
       double nextStep = 0.;
       TrajectoryStateOnSurface nextTsos;
 
-      if (!this->propagate(previousHitPtr->det()->surface(), previousTsos,
-			   hitPtr->det()->surface(), nextTsos,
-			   nextJacobian, nextCurvlinJacobian, nextStep, magField)) {
-	return false; // stop if problem...// no delete aMaterialEffectsUpdator needed
+      if (!this->propagate(previousHitPtr->det()->surface(),
+                           previousTsos,
+                           hitPtr->det()->surface(),
+                           nextTsos,
+                           nextJacobian,
+                           nextCurvlinJacobian,
+                           nextStep,
+                           magField)) {
+        return false;  // stop if problem...// no delete aMaterialEffectsUpdator needed
       }
-      
+
       allJacobians.push_back(nextJacobian);
       fullJacobian = nextJacobian * previousChangeInCurvature * fullJacobian;
       theTsosVec.push_back(nextTsos);
-      
+
       const JacobianLocalToCurvilinear startTrafo(hitPtr->det()->surface(), nextTsos.localParameters(), *magField);
-      const AlgebraicMatrix localToCurvilinear =  asHepMatrix<5>(startTrafo.jacobian());
+      const AlgebraicMatrix localToCurvilinear = asHepMatrix<5>(startTrafo.jacobian());
       allLocalToCurv.push_back(localToCurvilinear);
-      if (nextStep == 0.) { 
-	edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::construct"
-				   << "step 0. from id " << previousHitPtr->geographicalId()
-				   << " to " << hitPtr->det()->geographicalId() << ".";
-	// brokenLinesFine will not work, brokenLinesCoarse combines close by layers
-	if (materialEffects_ == brokenLinesFine) {
-	  edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::construct" << "Skip track.";
-	  return false;
-	}
+      if (nextStep == 0.) {
+        edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::construct"
+                                   << "step 0. from id " << previousHitPtr->geographicalId() << " to "
+                                   << hitPtr->det()->geographicalId() << ".";
+        // brokenLinesFine will not work, brokenLinesCoarse combines close by layers
+        if (materialEffects_ == brokenLinesFine) {
+          edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::construct"
+                                     << "Skip track.";
+          return false;
+        }
       }
       allSteps.push_back(nextStep);
       allCurvlinJacobians.push_back(nextCurvlinJacobian);
-
     }
 
     // take material effects into account. since trajectory-state is constructed with errors equal zero,
     // the updated state contains only the uncertainties due to interactions in the current layer.
-    const TrajectoryStateOnSurface tmpTsos(theTsosVec.back().localParameters(), zeroErrors,
-					   theTsosVec.back().surface(), magField, surfaceSide);
+    const TrajectoryStateOnSurface tmpTsos(
+        theTsosVec.back().localParameters(), zeroErrors, theTsosVec.back().surface(), magField, surfaceSide);
     const TrajectoryStateOnSurface updatedTsos = aMaterialEffectsUpdator->updateState(tmpTsos, propDir_);
 
-    if ( !updatedTsos.isValid() ) return false;// no delete aMaterialEffectsUpdator needed
-    
-    if ( theTsosVec.back().localParameters().charge() )
-    {
-      previousChangeInCurvature[0][0] = updatedTsos.localParameters().signedInverseMomentum() 
-	/ theTsosVec.back().localParameters().signedInverseMomentum();
+    if (!updatedTsos.isValid())
+      return false;  // no delete aMaterialEffectsUpdator needed
+
+    if (theTsosVec.back().localParameters().charge()) {
+      previousChangeInCurvature[0][0] = updatedTsos.localParameters().signedInverseMomentum() /
+                                        theTsosVec.back().localParameters().signedInverseMomentum();
     }
-    
+
     // get multiple-scattering covariance-matrix
-    allDeltaParameterCovs.push_back( asHepMatrix<5>(updatedTsos.localError().matrix()) );
+    allDeltaParameterCovs.push_back(asHepMatrix<5>(updatedTsos.localError().matrix()));
     allCurvatureChanges.push_back(previousChangeInCurvature);
-    
+
     // projection-matrix tsos-parameters -> measurement-coordinates
     allProjections.push_back(this->getHitProjectionMatrix(hitPtr));
     // set start-parameters for next propagation. trajectory-state without error
     //  - no error propagation needed here.
     previousHitPtr = hitPtr;
-    previousTsos   = TrajectoryStateOnSurface(updatedTsos.globalParameters(),
-                                              updatedTsos.surface(), surfaceSide);
-    
+    previousTsos = TrajectoryStateOnSurface(updatedTsos.globalParameters(), updatedTsos.surface(), surfaceSide);
+
     if (materialEffects_ < brokenLinesCoarse) {
       this->fillDerivatives(allProjections.back(), fullJacobian, iRow);
     }
 
     AlgebraicVector mixedLocalParams = asHepVector<5>(theTsosVec.back().localParameters().mixedFormatVector());
     this->fillTrajectoryPositions(allProjections.back(), mixedLocalParams, iRow);
-    if ( useRecHit( hitPtr ) ) this->fillMeasurementAndError(hitPtr, iRow, updatedTsos);
+    if (useRecHit(hitPtr))
+      this->fillMeasurementAndError(hitPtr, iRow, updatedTsos);
 
     iRow += nMeasPerHit;
-  } // end of loop on hits
+  }  // end of loop on hits
 
   bool msOK = true;
   switch (materialEffects_) {
-  case none:
-    break;
-  case multipleScattering:
-  case energyLoss:
-  case combined:
-    msOK = this->addMaterialEffectsCov(allJacobians, allProjections, allCurvatureChanges,
-                                       allDeltaParameterCovs);
-    break;
-  case breakPoints:
-    msOK = this->addMaterialEffectsBp(allJacobians, allProjections, allCurvatureChanges,
-                                      allDeltaParameterCovs, allLocalToCurv);
-    break;
-  case brokenLinesCoarse:
-    msOK = this->addMaterialEffectsBrl(allProjections, allDeltaParameterCovs, allLocalToCurv,
-                                       allSteps, refTsos.globalParameters());
-    break;
-  case brokenLinesFine:
-    msOK = this->addMaterialEffectsBrl(allCurvlinJacobians, allProjections, allCurvatureChanges,
-                                       allDeltaParameterCovs, allLocalToCurv, refTsos.globalParameters());
-    break;
-  case localGBL:
-    msOK = this->addMaterialEffectsLocalGbl(allJacobians, allProjections, allCurvatureChanges,
-                                       allDeltaParameterCovs);
-    break;
-  case curvlinGBL:
-    msOK = this->addMaterialEffectsCurvlinGbl(allCurvlinJacobians, allProjections, allCurvatureChanges,
-                                       allDeltaParameterCovs, allLocalToCurv);
+    case none:
+      break;
+    case multipleScattering:
+    case energyLoss:
+    case combined:
+      msOK = this->addMaterialEffectsCov(allJacobians, allProjections, allCurvatureChanges, allDeltaParameterCovs);
+      break;
+    case breakPoints:
+      msOK = this->addMaterialEffectsBp(
+          allJacobians, allProjections, allCurvatureChanges, allDeltaParameterCovs, allLocalToCurv);
+      break;
+    case brokenLinesCoarse:
+      msOK = this->addMaterialEffectsBrl(
+          allProjections, allDeltaParameterCovs, allLocalToCurv, allSteps, refTsos.globalParameters());
+      break;
+    case brokenLinesFine:
+      msOK = this->addMaterialEffectsBrl(allCurvlinJacobians,
+                                         allProjections,
+                                         allCurvatureChanges,
+                                         allDeltaParameterCovs,
+                                         allLocalToCurv,
+                                         refTsos.globalParameters());
+      break;
+    case localGBL:
+      msOK = this->addMaterialEffectsLocalGbl(allJacobians, allProjections, allCurvatureChanges, allDeltaParameterCovs);
+      break;
+    case curvlinGBL:
+      msOK = this->addMaterialEffectsCurvlinGbl(
+          allCurvlinJacobians, allProjections, allCurvatureChanges, allDeltaParameterCovs, allLocalToCurv);
   }
-  if (!msOK) return false;
- 
+  if (!msOK)
+    return false;
+
   if (refTsos.hasError()) {
     AlgebraicSymMatrix parameterCov = asHepMatrix<5>(refTsos.localError().matrix());
-    AlgebraicMatrix  parDeriv;
-    if (theNumberOfVirtualPars>0) { 
-      parDeriv = theDerivatives.sub( 1, nMeasPerHit*allJacobians.size(), 1, theParameters.num_row() ); 
+    AlgebraicMatrix parDeriv;
+    if (theNumberOfVirtualPars > 0) {
+      parDeriv = theDerivatives.sub(1, nMeasPerHit * allJacobians.size(), 1, theParameters.num_row());
     } else {
-      parDeriv = theDerivatives; 
+      parDeriv = theDerivatives;
     }
     theTrajectoryPositionCov = parameterCov.similarity(parDeriv);
   } else {
@@ -342,38 +347,39 @@ bool ReferenceTrajectory::construct(const TrajectoryStateOnSurface &refTsos,
 
 //__________________________________________________________________________________
 
-MaterialEffectsUpdator*
-ReferenceTrajectory::createUpdator(MaterialEffects materialEffects, double mass) const
-{
+MaterialEffectsUpdator *ReferenceTrajectory::createUpdator(MaterialEffects materialEffects, double mass) const {
   switch (materialEffects) {
-    // MultipleScatteringUpdator doesn't change the trajectory-state
-    // during update and can therefore be used if material effects should be ignored:
-  case none:
-  case multipleScattering: 
-    return new MultipleScatteringUpdator(mass);
-  case energyLoss:
-    return new EnergyLossUpdator(mass);
-  case combined:
-    return new CombinedMaterialEffectsUpdator(mass);
-  case breakPoints:
-    return new CombinedMaterialEffectsUpdator(mass);
-  case brokenLinesCoarse:
-  case brokenLinesFine:
-  case localGBL:
-  case curvlinGBL:
-    return new CombinedMaterialEffectsUpdator(mass);
-}
+      // MultipleScatteringUpdator doesn't change the trajectory-state
+      // during update and can therefore be used if material effects should be ignored:
+    case none:
+    case multipleScattering:
+      return new MultipleScatteringUpdator(mass);
+    case energyLoss:
+      return new EnergyLossUpdator(mass);
+    case combined:
+      return new CombinedMaterialEffectsUpdator(mass);
+    case breakPoints:
+      return new CombinedMaterialEffectsUpdator(mass);
+    case brokenLinesCoarse:
+    case brokenLinesFine:
+    case localGBL:
+    case curvlinGBL:
+      return new CombinedMaterialEffectsUpdator(mass);
+  }
 
   return nullptr;
 }
 
 //__________________________________________________________________________________
 
-bool ReferenceTrajectory::propagate(const Plane &previousSurface, const TrajectoryStateOnSurface &previousTsos,
-				    const Plane &newSurface, TrajectoryStateOnSurface &newTsos, AlgebraicMatrix &newJacobian, 
-				    AlgebraicMatrix &newCurvlinJacobian, double &nextStep,
-				    const MagneticField *magField) const
-{
+bool ReferenceTrajectory::propagate(const Plane &previousSurface,
+                                    const TrajectoryStateOnSurface &previousTsos,
+                                    const Plane &newSurface,
+                                    TrajectoryStateOnSurface &newTsos,
+                                    AlgebraicMatrix &newJacobian,
+                                    AlgebraicMatrix &newCurvlinJacobian,
+                                    double &nextStep,
+                                    const MagneticField *magField) const {
   // propagate to next layer
   /** From TrackingTools/ GeomPropagators/ interface/ AnalyticalPropagator.h
    * NB: this propagator assumes constant, non-zero magnetic field parallel to the z-axis!
@@ -382,36 +388,37 @@ bool ReferenceTrajectory::propagate(const Plane &previousSurface, const Trajecto
   // Hard coded RungeKutta instead Analytical (avoid bias in TEC), but
   // work around TrackPropagation/RungeKutta/interface/RKTestPropagator.h and
   // http://www.parashift.com/c++-faq-lite/strange-inheritance.html#faq-23.9
-  defaultRKPropagator::Product  rkprod(magField, propDir_); //double tolerance = 5.e-5)
+  defaultRKPropagator::Product rkprod(magField, propDir_);  //double tolerance = 5.e-5)
   Propagator &aPropagator = rkprod.propagator;
   const std::pair<TrajectoryStateOnSurface, double> tsosWithPath =
-    aPropagator.propagateWithPath(previousTsos, newSurface);
+      aPropagator.propagateWithPath(previousTsos, newSurface);
 
   // stop if propagation wasn't successful
-  if (!tsosWithPath.first.isValid()) return false;
-  
+  if (!tsosWithPath.first.isValid())
+    return false;
+
   nextStep = tsosWithPath.second;
   // calculate derivative of reference-track parameters on the actual layer w.r.t. the ones
   // on the previous layer (both in global coordinates)
-  const AnalyticalCurvilinearJacobian aJacobian(previousTsos.globalParameters(), 
-						tsosWithPath.first.globalPosition(),
-						tsosWithPath.first.globalMomentum(),
-						tsosWithPath.second);
-  const AlgebraicMatrix curvilinearJacobian = asHepMatrix<5,5>(aJacobian.jacobian());
+  const AnalyticalCurvilinearJacobian aJacobian(previousTsos.globalParameters(),
+                                                tsosWithPath.first.globalPosition(),
+                                                tsosWithPath.first.globalMomentum(),
+                                                tsosWithPath.second);
+  const AlgebraicMatrix curvilinearJacobian = asHepMatrix<5, 5>(aJacobian.jacobian());
 
   // jacobian of the track parameters on the previous layer for local->global transformation
   const JacobianLocalToCurvilinear startTrafo(previousSurface, previousTsos.localParameters(), *magField);
   const AlgebraicMatrix localToCurvilinear = asHepMatrix<5>(startTrafo.jacobian());
-    
+
   // jacobian of the track parameters on the actual layer for global->local transformation
   const JacobianCurvilinearToLocal endTrafo(newSurface, tsosWithPath.first.localParameters(), *magField);
   const AlgebraicMatrix curvilinearToLocal = asHepMatrix<5>(endTrafo.jacobian());
-  
+
   // compute derivative of reference-track parameters on the actual layer w.r.t. the ones on
   // the previous layer (both in their local representation)
   newCurvlinJacobian = curvilinearJacobian;
   newJacobian = curvilinearToLocal * curvilinearJacobian * localToCurvilinear;
-  newTsos     = tsosWithPath.first;
+  newTsos = tsosWithPath.first;
 
   return true;
 }
@@ -419,38 +426,37 @@ bool ReferenceTrajectory::propagate(const Plane &previousSurface, const Trajecto
 //__________________________________________________________________________________
 
 void ReferenceTrajectory::fillMeasurementAndError(const TransientTrackingRecHit::ConstRecHitPointer &hitPtr,
-						  unsigned int iRow,
-						  const TrajectoryStateOnSurface &updatedTsos)
-{
+                                                  unsigned int iRow,
+                                                  const TrajectoryStateOnSurface &updatedTsos) {
   // get the measurements and their errors, use information updated with tsos if improving
   // (GF: Also for measurements or only for errors or do the former not change?)
   // GF 10/2008: I doubt that it makes sense to update the hit with the tsos here:
-  //             That is an analytical extrapolation and not the best guess of the real 
+  //             That is an analytical extrapolation and not the best guess of the real
   //             track state on the module, but the latter should be better to get the best
   //             hit uncertainty estimate!
 
-   // FIXME FIXME  CLONE
-  const auto& newHitPtr =  hitPtr;
-//  TransientTrackingRecHit::ConstRecHitPointer newHitPtr(hitPtr->canImproveWithTrack() ?
-//							hitPtr->clone(updatedTsos) : hitPtr);
+  // FIXME FIXME  CLONE
+  const auto &newHitPtr = hitPtr;
+  //  TransientTrackingRecHit::ConstRecHitPointer newHitPtr(hitPtr->canImproveWithTrack() ?
+  //							hitPtr->clone(updatedTsos) : hitPtr);
+
+  const LocalPoint localMeasurement = newHitPtr->localPosition();
+  const LocalError localMeasurementCov = newHitPtr->localPositionError();  // CPE+APE
 
-  const LocalPoint localMeasurement    = newHitPtr->localPosition();
-  const LocalError localMeasurementCov = newHitPtr->localPositionError(); // CPE+APE
-  
-  theMeasurements[iRow]   = localMeasurement.x();
-  theMeasurements[iRow+1] = localMeasurement.y();
-  theMeasurementsCov[iRow][iRow]     = localMeasurementCov.xx();
-  theMeasurementsCov[iRow][iRow+1]   = localMeasurementCov.xy();
-  theMeasurementsCov[iRow+1][iRow+1] = localMeasurementCov.yy();
+  theMeasurements[iRow] = localMeasurement.x();
+  theMeasurements[iRow + 1] = localMeasurement.y();
+  theMeasurementsCov[iRow][iRow] = localMeasurementCov.xx();
+  theMeasurementsCov[iRow][iRow + 1] = localMeasurementCov.xy();
+  theMeasurementsCov[iRow + 1][iRow + 1] = localMeasurementCov.yy();
 
   if (!includeAPEs_) {
     // subtract APEs (if existing) from covariance matrix
-    auto det = static_cast<const TrackerGeomDet*>(newHitPtr->det());
+    auto det = static_cast<const TrackerGeomDet *>(newHitPtr->det());
     const auto localAPE = det->localAlignmentError();
     if (localAPE.valid()) {
-      theMeasurementsCov[iRow][iRow]     -= localAPE.xx();
-      theMeasurementsCov[iRow][iRow+1]   -= localAPE.xy();
-      theMeasurementsCov[iRow+1][iRow+1] -= localAPE.yy();
+      theMeasurementsCov[iRow][iRow] -= localAPE.xx();
+      theMeasurementsCov[iRow][iRow + 1] -= localAPE.xy();
+      theMeasurementsCov[iRow + 1][iRow + 1] -= localAPE.yy();
     }
   }
 }
@@ -458,38 +464,35 @@ void ReferenceTrajectory::fillMeasurementAndError(const TransientTrackingRecHit:
 //__________________________________________________________________________________
 
 void ReferenceTrajectory::fillDerivatives(const AlgebraicMatrix &projection,
-					  const AlgebraicMatrix &fullJacobian,
-					  unsigned int iRow)
-{
+                                          const AlgebraicMatrix &fullJacobian,
+                                          unsigned int iRow) {
   // derivatives of the local coordinates of the reference track w.r.t. to the inital track-parameters
   const AlgebraicMatrix projectedJacobian(projection * fullJacobian);
   for (int i = 0; i < parameters().num_row(); ++i) {
     for (int j = 0; j < projectedJacobian.num_row(); ++j) {
-      theDerivatives[iRow+j][i] = projectedJacobian[j][i];
+      theDerivatives[iRow + j][i] = projectedJacobian[j][i];
     }
   }
 }
 
 //__________________________________________________________________________________
 
-void ReferenceTrajectory::fillTrajectoryPositions(const AlgebraicMatrix &projection, 
-						  const AlgebraicVector &mixedLocalParams, 
-						  unsigned int iRow)
-{
+void ReferenceTrajectory::fillTrajectoryPositions(const AlgebraicMatrix &projection,
+                                                  const AlgebraicVector &mixedLocalParams,
+                                                  unsigned int iRow) {
   // get the local coordinates of the reference trajectory
   const AlgebraicVector localPosition(projection * mixedLocalParams);
   for (int i = 0; i < localPosition.num_row(); ++i) {
-    theTrajectoryPositions[iRow+i] = localPosition[i];
+    theTrajectoryPositions[iRow + i] = localPosition[i];
   }
 }
 
 //__________________________________________________________________________________
 
-bool ReferenceTrajectory::addMaterialEffectsCov(const std::vector<AlgebraicMatrix> &allJacobians, 
-						const std::vector<AlgebraicMatrix> &allProjections,
-						const std::vector<AlgebraicSymMatrix> &allCurvatureChanges,
-						const std::vector<AlgebraicSymMatrix> &allDeltaParameterCovs)
-{
+bool ReferenceTrajectory::addMaterialEffectsCov(const std::vector<AlgebraicMatrix> &allJacobians,
+                                                const std::vector<AlgebraicMatrix> &allProjections,
+                                                const std::vector<AlgebraicSymMatrix> &allCurvatureChanges,
+                                                const std::vector<AlgebraicSymMatrix> &allDeltaParameterCovs) {
   // the uncertainty due to multiple scattering is 'transferred' to the error matrix of the hits
 
   // GF: Needs update once hit dimension is not hardcoded as nMeasPerHit!
@@ -500,7 +503,7 @@ bool ReferenceTrajectory::addMaterialEffectsCov(const std::vector<AlgebraicMatri
   AlgebraicSymMatrix deltaMaterialEffectsCov;
 
   // additional covariance-matrix of the parameters due to material-effects
-  AlgebraicSymMatrix paramMaterialEffectsCov(allDeltaParameterCovs[0]); //initialization
+  AlgebraicSymMatrix paramMaterialEffectsCov(allDeltaParameterCovs[0]);  //initialization
   // error-propagation to state after energy loss
   //GFback  paramMaterialEffectsCov = paramMaterialEffectsCov.similarity(allCurvatureChanges[0]);
 
@@ -513,10 +516,10 @@ bool ReferenceTrajectory::addMaterialEffectsCov(const std::vector<AlgebraicMatri
 
     // get dependences for the measurements
     deltaMaterialEffectsCov = paramMaterialEffectsCov.similarity(allProjections[k]);
-    materialEffectsCov[nMeasPerHit*k  ][nMeasPerHit*k  ] = deltaMaterialEffectsCov[0][0];
-    materialEffectsCov[nMeasPerHit*k  ][nMeasPerHit*k+1] = deltaMaterialEffectsCov[0][1];
-    materialEffectsCov[nMeasPerHit*k+1][nMeasPerHit*k  ] = deltaMaterialEffectsCov[1][0];
-    materialEffectsCov[nMeasPerHit*k+1][nMeasPerHit*k+1] = deltaMaterialEffectsCov[1][1];
+    materialEffectsCov[nMeasPerHit * k][nMeasPerHit * k] = deltaMaterialEffectsCov[0][0];
+    materialEffectsCov[nMeasPerHit * k][nMeasPerHit * k + 1] = deltaMaterialEffectsCov[0][1];
+    materialEffectsCov[nMeasPerHit * k + 1][nMeasPerHit * k] = deltaMaterialEffectsCov[1][0];
+    materialEffectsCov[nMeasPerHit * k + 1][nMeasPerHit * k + 1] = deltaMaterialEffectsCov[1][1];
 
     // GFback add uncertainties for the following layers due to scattering at this layer
     paramMaterialEffectsCov += allDeltaParameterCovs[k];
@@ -524,93 +527,89 @@ bool ReferenceTrajectory::addMaterialEffectsCov(const std::vector<AlgebraicMatri
     tempParameterCov = paramMaterialEffectsCov;
 
     // compute "inter-layer-dependencies"
-    for (unsigned int l = k+1; l < allJacobians.size(); ++l) {
-      tempParameterCov   = allJacobians[l]   * allCurvatureChanges[l] * tempParameterCov;
-      tempMeasurementCov = allProjections[l] * tempParameterCov       * allProjections[k].T();
+    for (unsigned int l = k + 1; l < allJacobians.size(); ++l) {
+      tempParameterCov = allJacobians[l] * allCurvatureChanges[l] * tempParameterCov;
+      tempMeasurementCov = allProjections[l] * tempParameterCov * allProjections[k].T();
 
-      materialEffectsCov[nMeasPerHit*l][nMeasPerHit*k] = tempMeasurementCov[0][0];
-      materialEffectsCov[nMeasPerHit*k][nMeasPerHit*l] = tempMeasurementCov[0][0];
+      materialEffectsCov[nMeasPerHit * l][nMeasPerHit * k] = tempMeasurementCov[0][0];
+      materialEffectsCov[nMeasPerHit * k][nMeasPerHit * l] = tempMeasurementCov[0][0];
 
-      materialEffectsCov[nMeasPerHit*l][nMeasPerHit*k+1] = tempMeasurementCov[0][1];
-      materialEffectsCov[nMeasPerHit*k+1][nMeasPerHit*l] = tempMeasurementCov[0][1];
+      materialEffectsCov[nMeasPerHit * l][nMeasPerHit * k + 1] = tempMeasurementCov[0][1];
+      materialEffectsCov[nMeasPerHit * k + 1][nMeasPerHit * l] = tempMeasurementCov[0][1];
 
-      materialEffectsCov[nMeasPerHit*l+1][nMeasPerHit*k] = tempMeasurementCov[1][0];
-      materialEffectsCov[nMeasPerHit*k][nMeasPerHit*l+1] = tempMeasurementCov[1][0];
+      materialEffectsCov[nMeasPerHit * l + 1][nMeasPerHit * k] = tempMeasurementCov[1][0];
+      materialEffectsCov[nMeasPerHit * k][nMeasPerHit * l + 1] = tempMeasurementCov[1][0];
 
-      materialEffectsCov[nMeasPerHit*l+1][nMeasPerHit*k+1] = tempMeasurementCov[1][1];
-      materialEffectsCov[nMeasPerHit*k+1][nMeasPerHit*l+1] = tempMeasurementCov[1][1];
-    } 
+      materialEffectsCov[nMeasPerHit * l + 1][nMeasPerHit * k + 1] = tempMeasurementCov[1][1];
+      materialEffectsCov[nMeasPerHit * k + 1][nMeasPerHit * l + 1] = tempMeasurementCov[1][1];
+    }
     // add uncertainties for the following layers due to scattering at this layer
-    // GFback paramMaterialEffectsCov += allDeltaParameterCovs[k];    
+    // GFback paramMaterialEffectsCov += allDeltaParameterCovs[k];
     // error-propagation to state after energy loss
     paramMaterialEffectsCov = paramMaterialEffectsCov.similarity(allCurvatureChanges[k]);
-     
   }
   theMeasurementsCov += materialEffectsCov;
 
-  return true; // cannot fail
+  return true;  // cannot fail
 }
 
 //__________________________________________________________________________________
 
-bool ReferenceTrajectory::addMaterialEffectsBp(const std::vector<AlgebraicMatrix> &allJacobians, 
+bool ReferenceTrajectory::addMaterialEffectsBp(const std::vector<AlgebraicMatrix> &allJacobians,
                                                const std::vector<AlgebraicMatrix> &allProjections,
                                                const std::vector<AlgebraicSymMatrix> &allCurvatureChanges,
                                                const std::vector<AlgebraicSymMatrix> &allDeltaParameterCovs,
-                                               const std::vector<AlgebraicMatrix> &allLocalToCurv)
-{
-//CHK: add material effects using break points
-  int offsetPar = theNumberOfPars; 
+                                               const std::vector<AlgebraicMatrix> &allLocalToCurv) {
+  //CHK: add material effects using break points
+  int offsetPar = theNumberOfPars;
   int offsetMeas = nMeasPerHit * allJacobians.size();
-  int ierr = 0; 
+  int ierr = 0;
 
   AlgebraicMatrix tempJacobian;
-  AlgebraicMatrix MSprojection(2,5);
+  AlgebraicMatrix MSprojection(2, 5);
   MSprojection[0][1] = 1;
   MSprojection[1][2] = 1;
-  AlgebraicSymMatrix tempMSCov; 
+  AlgebraicSymMatrix tempMSCov;
   AlgebraicSymMatrix tempMSCovProj;
-  AlgebraicMatrix tempMSJacProj;   
+  AlgebraicMatrix tempMSJacProj;
 
   for (unsigned int k = 1; k < allJacobians.size(); ++k) {
-// CHK 
-    int kbp = k-1;
+    // CHK
+    int kbp = k - 1;
     tempJacobian = allJacobians[k] * allCurvatureChanges[k];
-    tempMSCov = allDeltaParameterCovs[k-1].similarity(allLocalToCurv[k-1]);
+    tempMSCov = allDeltaParameterCovs[k - 1].similarity(allLocalToCurv[k - 1]);
     tempMSCovProj = tempMSCov.similarity(MSprojection);
-    theMeasurementsCov[offsetMeas+nMeasPerHit*kbp  ][offsetMeas+nMeasPerHit*kbp  ] = tempMSCovProj[0][0];
-    theMeasurementsCov[offsetMeas+nMeasPerHit*kbp+1][offsetMeas+nMeasPerHit*kbp+1]=  tempMSCovProj[1][1];
-    theDerivatives[offsetMeas+nMeasPerHit*kbp  ][offsetPar+2*kbp  ] = 1.0;
-    theDerivatives[offsetMeas+nMeasPerHit*kbp+1][offsetPar+2*kbp+1] = 1.0 ; 
+    theMeasurementsCov[offsetMeas + nMeasPerHit * kbp][offsetMeas + nMeasPerHit * kbp] = tempMSCovProj[0][0];
+    theMeasurementsCov[offsetMeas + nMeasPerHit * kbp + 1][offsetMeas + nMeasPerHit * kbp + 1] = tempMSCovProj[1][1];
+    theDerivatives[offsetMeas + nMeasPerHit * kbp][offsetPar + 2 * kbp] = 1.0;
+    theDerivatives[offsetMeas + nMeasPerHit * kbp + 1][offsetPar + 2 * kbp + 1] = 1.0;
 
-    tempMSJacProj = (allProjections[k] * ( tempJacobian * allLocalToCurv[k-1].inverse(ierr) )) * MSprojection.T();
+    tempMSJacProj = (allProjections[k] * (tempJacobian * allLocalToCurv[k - 1].inverse(ierr))) * MSprojection.T();
     if (ierr) {
       edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::addMaterialEffectsBp"
-	                         << "Inversion 1 for break points failed: " << ierr;
+                                 << "Inversion 1 for break points failed: " << ierr;
       return false;
     }
-    theDerivatives[nMeasPerHit*k  ][offsetPar+2*kbp  ] =  tempMSJacProj[0][0];  
-    theDerivatives[nMeasPerHit*k  ][offsetPar+2*kbp+1] =  tempMSJacProj[0][1]; 
-    theDerivatives[nMeasPerHit*k+1][offsetPar+2*kbp  ] =  tempMSJacProj[1][0];  
-    theDerivatives[nMeasPerHit*k+1][offsetPar+2*kbp+1] =  tempMSJacProj[1][1];
-              
-    for (unsigned int l = k+1; l < allJacobians.size(); ++l) {
-// CHK    
-      int kbp = k-1;
-      tempJacobian = allJacobians[l] * allCurvatureChanges[l] * tempJacobian; 
-      tempMSJacProj = (allProjections[l] * ( tempJacobian * allLocalToCurv[k-1].inverse(ierr) )) * MSprojection.T();
+    theDerivatives[nMeasPerHit * k][offsetPar + 2 * kbp] = tempMSJacProj[0][0];
+    theDerivatives[nMeasPerHit * k][offsetPar + 2 * kbp + 1] = tempMSJacProj[0][1];
+    theDerivatives[nMeasPerHit * k + 1][offsetPar + 2 * kbp] = tempMSJacProj[1][0];
+    theDerivatives[nMeasPerHit * k + 1][offsetPar + 2 * kbp + 1] = tempMSJacProj[1][1];
+
+    for (unsigned int l = k + 1; l < allJacobians.size(); ++l) {
+      // CHK
+      int kbp = k - 1;
+      tempJacobian = allJacobians[l] * allCurvatureChanges[l] * tempJacobian;
+      tempMSJacProj = (allProjections[l] * (tempJacobian * allLocalToCurv[k - 1].inverse(ierr))) * MSprojection.T();
       if (ierr) {
-	edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::addMaterialEffectsBp"
-				   << "Inversion 2 for break points failed: " << ierr;
+        edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::addMaterialEffectsBp"
+                                   << "Inversion 2 for break points failed: " << ierr;
         return false;
       }
-      theDerivatives[nMeasPerHit*l  ][offsetPar+2*kbp  ] =  tempMSJacProj[0][0];  
-      theDerivatives[nMeasPerHit*l  ][offsetPar+2*kbp+1] =  tempMSJacProj[0][1]; 
-      theDerivatives[nMeasPerHit*l+1][offsetPar+2*kbp  ] =  tempMSJacProj[1][0];  
-      theDerivatives[nMeasPerHit*l+1][offsetPar+2*kbp+1] =  tempMSJacProj[1][1]; 
-
+      theDerivatives[nMeasPerHit * l][offsetPar + 2 * kbp] = tempMSJacProj[0][0];
+      theDerivatives[nMeasPerHit * l][offsetPar + 2 * kbp + 1] = tempMSJacProj[0][1];
+      theDerivatives[nMeasPerHit * l + 1][offsetPar + 2 * kbp] = tempMSJacProj[1][0];
+      theDerivatives[nMeasPerHit * l + 1][offsetPar + 2 * kbp + 1] = tempMSJacProj[1][1];
     }
-
   }
 
   return true;
@@ -618,51 +617,50 @@ bool ReferenceTrajectory::addMaterialEffectsBp(const std::vector<AlgebraicMatrix
 
 //__________________________________________________________________________________
 
-bool ReferenceTrajectory::addMaterialEffectsBrl(const std::vector<AlgebraicMatrix> &allCurvlinJacobians, 
-						const std::vector<AlgebraicMatrix> &allProjections,
-						const std::vector<AlgebraicSymMatrix> &allCurvatureChanges,
-						const std::vector<AlgebraicSymMatrix> &allDeltaParameterCovs,
-						const std::vector<AlgebraicMatrix> &allLocalToCurv,
-						const GlobalTrajectoryParameters &gtp)
-{
-//CHK: add material effects using broken lines
-//fine: use exact Jacobians, all detectors  
-//broken lines: pair of offsets (u1,u2) = (xt,yt) (in curvilinear frame (q/p,lambda,phi,xt,yt)) at each layer
-//              scattering angles (alpha1,alpha2) = (cosLambda*dPhi, dLambda) (cosLambda cancels in Chi2)
-//              DU' = (dU'/dU)*DU + (dU'/dAlpha)*DAlpha + (dU'/dQbyp)*DQbyp (propagation of U)
-//                  = J*DU + S*DAlpha + d*DQbyp
-//           => DAlpha = S^-1 (DU' - J*DU - d*DQbyp)
+bool ReferenceTrajectory::addMaterialEffectsBrl(const std::vector<AlgebraicMatrix> &allCurvlinJacobians,
+                                                const std::vector<AlgebraicMatrix> &allProjections,
+                                                const std::vector<AlgebraicSymMatrix> &allCurvatureChanges,
+                                                const std::vector<AlgebraicSymMatrix> &allDeltaParameterCovs,
+                                                const std::vector<AlgebraicMatrix> &allLocalToCurv,
+                                                const GlobalTrajectoryParameters &gtp) {
+  //CHK: add material effects using broken lines
+  //fine: use exact Jacobians, all detectors
+  //broken lines: pair of offsets (u1,u2) = (xt,yt) (in curvilinear frame (q/p,lambda,phi,xt,yt)) at each layer
+  //              scattering angles (alpha1,alpha2) = (cosLambda*dPhi, dLambda) (cosLambda cancels in Chi2)
+  //              DU' = (dU'/dU)*DU + (dU'/dAlpha)*DAlpha + (dU'/dQbyp)*DQbyp (propagation of U)
+  //                  = J*DU + S*DAlpha + d*DQbyp
+  //           => DAlpha = S^-1 (DU' - J*DU - d*DQbyp)
 
   int offsetPar = theNumberOfPars;
-  int offsetMeas = nMeasPerHit*allCurvlinJacobians.size();
+  int offsetMeas = nMeasPerHit * allCurvlinJacobians.size();
   int ierr = 0;
 
   GlobalVector p = gtp.momentum();
-  double cosLambda = sqrt((p.x()*p.x()+p.y()*p.y())/(p.x()*p.x()+p.y()*p.y()+p.z()*p.z()));
-
-// transformations Curvilinear <-> BrokenLines
-  AlgebraicMatrix QbypToCurv(5,1);   // dCurv/dQbyp
-  QbypToCurv[0][0] = 1.;             // dQbyp/dQbyp
-  AlgebraicMatrix AngleToCurv(5,2);  // dCurv/dAlpha
-  AngleToCurv[1][1] = 1.;            // dlambda/dalpha2
-  AngleToCurv[2][0] = 1./cosLambda;  // dphi/dalpha1
-  AlgebraicMatrix CurvToAngle(2,5);  // dAlpha/dCurv
-  CurvToAngle[1][1] = 1.;            // dalpha2/dlambda
-  CurvToAngle[0][2] = cosLambda;     // dalpha1/dphi
-  AlgebraicMatrix OffsetToCurv(5,2); // dCurv/dU
-  OffsetToCurv[3][0] = 1.;           // dxt/du1
-  OffsetToCurv[4][1] = 1.;           // dyt/du2
-  AlgebraicMatrix CurvToOffset(2,5); // dU/dCurv
-  CurvToOffset[0][3] = 1.;           // du1/dxt
-  CurvToOffset[1][4] = 1.;           // du2/dyt
-
-// transformations  trajectory to components (Qbyp, U1, U2)
-  AlgebraicMatrix TrajToQbyp(1,5);
+  double cosLambda = sqrt((p.x() * p.x() + p.y() * p.y()) / (p.x() * p.x() + p.y() * p.y() + p.z() * p.z()));
+
+  // transformations Curvilinear <-> BrokenLines
+  AlgebraicMatrix QbypToCurv(5, 1);    // dCurv/dQbyp
+  QbypToCurv[0][0] = 1.;               // dQbyp/dQbyp
+  AlgebraicMatrix AngleToCurv(5, 2);   // dCurv/dAlpha
+  AngleToCurv[1][1] = 1.;              // dlambda/dalpha2
+  AngleToCurv[2][0] = 1. / cosLambda;  // dphi/dalpha1
+  AlgebraicMatrix CurvToAngle(2, 5);   // dAlpha/dCurv
+  CurvToAngle[1][1] = 1.;              // dalpha2/dlambda
+  CurvToAngle[0][2] = cosLambda;       // dalpha1/dphi
+  AlgebraicMatrix OffsetToCurv(5, 2);  // dCurv/dU
+  OffsetToCurv[3][0] = 1.;             // dxt/du1
+  OffsetToCurv[4][1] = 1.;             // dyt/du2
+  AlgebraicMatrix CurvToOffset(2, 5);  // dU/dCurv
+  CurvToOffset[0][3] = 1.;             // du1/dxt
+  CurvToOffset[1][4] = 1.;             // du2/dyt
+
+  // transformations  trajectory to components (Qbyp, U1, U2)
+  AlgebraicMatrix TrajToQbyp(1, 5);
   TrajToQbyp[0][0] = 1.;
-  AlgebraicMatrix TrajToOff1(2,5);
+  AlgebraicMatrix TrajToOff1(2, 5);
   TrajToOff1[0][1] = 1.;
   TrajToOff1[1][2] = 1.;
-  AlgebraicMatrix TrajToOff2(2,5);
+  AlgebraicMatrix TrajToOff2(2, 5);
   TrajToOff2[0][3] = 1.;
   TrajToOff2[1][4] = 1.;
 
@@ -670,22 +668,24 @@ bool ReferenceTrajectory::addMaterialEffectsBrl(const std::vector<AlgebraicMatri
   AlgebraicMatrix JacCurvToOffsetL, JacOffsetToOffsetL, JacAngleToOffsetL, JacQbypToOffsetL, JacOffsetToAngleL;
   AlgebraicMatrix JacCurvToOffsetN, JacOffsetToOffsetN, JacAngleToOffsetN, JacQbypToOffsetN, JacOffsetToAngleN;
 
-// transformation from trajectory to curvilinear parameters
+  // transformation from trajectory to curvilinear parameters
 
-  JacCurvToOffsetN = CurvToOffset * allCurvlinJacobians[1]; // (dU'/dCurv') * (dCurv'/dCurv) @ 2nd point
-  JacOffsetToOffsetN = JacCurvToOffsetN * OffsetToCurv; // J: (dU'/dU)     = (dU'/dCurv') * (dCurv'/dCurv) * (dCurv/dU)
-  JacAngleToOffsetN  = JacCurvToOffsetN * AngleToCurv;  // S: (dU'/dAlpha) = (dU'/dCurv') * (dCurv'/dCurv) * (dCurv/dAlpha)
-  JacQbypToOffsetN   = JacCurvToOffsetN * QbypToCurv;   // d: (dU'/dQbyp)  = (dU'/dCurv') * (dCurv'/dCurv) * (dCurv/dQbyp)
-  JacOffsetToAngleN  = JacAngleToOffsetN.inverse(ierr); // W
+  JacCurvToOffsetN = CurvToOffset * allCurvlinJacobians[1];  // (dU'/dCurv') * (dCurv'/dCurv) @ 2nd point
+  JacOffsetToOffsetN = JacCurvToOffsetN * OffsetToCurv;  // J: (dU'/dU)     = (dU'/dCurv') * (dCurv'/dCurv) * (dCurv/dU)
+  JacAngleToOffsetN =
+      JacCurvToOffsetN * AngleToCurv;                // S: (dU'/dAlpha) = (dU'/dCurv') * (dCurv'/dCurv) * (dCurv/dAlpha)
+  JacQbypToOffsetN = JacCurvToOffsetN * QbypToCurv;  // d: (dU'/dQbyp)  = (dU'/dCurv') * (dCurv'/dCurv) * (dCurv/dQbyp)
+  JacOffsetToAngleN = JacAngleToOffsetN.inverse(ierr);  // W
   if (ierr) {
-     edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::addMaterialEffectsBrl"
-                                << "Inversion 1 for fine broken lines failed: " << ierr;
-     return false;
+    edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::addMaterialEffectsBrl"
+                               << "Inversion 1 for fine broken lines failed: " << ierr;
+    return false;
   }
-  JacOffsetToAngleC = -(JacOffsetToAngleN * JacOffsetToOffsetN); // (dAlpha/dU)
-  JacQbypToAngleC   = -(JacOffsetToAngleN * JacQbypToOffsetN);   // (dAlpha/dQbyp)
+  JacOffsetToAngleC = -(JacOffsetToAngleN * JacOffsetToOffsetN);  // (dAlpha/dU)
+  JacQbypToAngleC = -(JacOffsetToAngleN * JacQbypToOffsetN);      // (dAlpha/dQbyp)
   // (dAlpha/dTraj) = (dAlpha/dQbyp) * (dQbyp/dTraj) + (dAlpha/dU1) * (dU1/dTraj) + (dAlpha/dU2) * (dU2/dTraj)
-  AlgebraicMatrix JacTrajToAngle = JacQbypToAngleC * TrajToQbyp + JacOffsetToAngleC * TrajToOff1 + JacOffsetToAngleN * TrajToOff2;
+  AlgebraicMatrix JacTrajToAngle =
+      JacQbypToAngleC * TrajToQbyp + JacOffsetToAngleC * TrajToOff1 + JacOffsetToAngleN * TrajToOff2;
   // (dCurv/dTraj) = (dCurv/dQbyp) * (dQbyp/dTraj) + (dCurv/dAlpha) * (dAlpha/dTraj) + (dCurv/dU) * (dU/dTraj)
   theInnerTrajectoryToCurvilinear = QbypToCurv * TrajToQbyp + AngleToCurv * JacTrajToAngle + OffsetToCurv * TrajToOff1;
   theInnerLocalToTrajectory = theInnerTrajectoryToCurvilinear.inverse(ierr) * allLocalToCurv[0];
@@ -701,87 +701,93 @@ bool ReferenceTrajectory::addMaterialEffectsBrl(const std::vector<AlgebraicMatri
   AlgebraicMatrix tempJacL, tempJacN;
   AlgebraicMatrix JacOffsetToMeas;
 
-// measurements from hits  
+  // measurements from hits
   for (unsigned int k = 0; k < allCurvlinJacobians.size(); ++k) {
-//  (dMeas/dU) = (dMeas/dLoc) * (dLoc/dCurv) * (dCurv/dU)
-    JacOffsetToMeas = (allProjections[k] * allLocalToCurv[k].inverse(ierr) ) * OffsetToCurv;
+    //  (dMeas/dU) = (dMeas/dLoc) * (dLoc/dCurv) * (dCurv/dU)
+    JacOffsetToMeas = (allProjections[k] * allLocalToCurv[k].inverse(ierr)) * OffsetToCurv;
     if (ierr) {
-       edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::addMaterialEffectsBrl"
-				   << "Inversion 3 for fine broken lines failed: " << ierr;
-       return false;
+      edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::addMaterialEffectsBrl"
+                                 << "Inversion 3 for fine broken lines failed: " << ierr;
+      return false;
     }
-    theDerivatives[nMeasPerHit*k  ][offsetPar+2*k  ] =  JacOffsetToMeas[0][0];
-    theDerivatives[nMeasPerHit*k  ][offsetPar+2*k+1] =  JacOffsetToMeas[0][1];
-    theDerivatives[nMeasPerHit*k+1][offsetPar+2*k  ] =  JacOffsetToMeas[1][0];
-    theDerivatives[nMeasPerHit*k+1][offsetPar+2*k+1] =  JacOffsetToMeas[1][1];
+    theDerivatives[nMeasPerHit * k][offsetPar + 2 * k] = JacOffsetToMeas[0][0];
+    theDerivatives[nMeasPerHit * k][offsetPar + 2 * k + 1] = JacOffsetToMeas[0][1];
+    theDerivatives[nMeasPerHit * k + 1][offsetPar + 2 * k] = JacOffsetToMeas[1][0];
+    theDerivatives[nMeasPerHit * k + 1][offsetPar + 2 * k + 1] = JacOffsetToMeas[1][1];
   }
 
-// measurement of MS kink  
-  for (unsigned int k = 1; k < allCurvlinJacobians.size()-1; ++k) {
-// CHK 
-    int iMsMeas = k-1; 
-    int l    = k-1; // last hit
-    int n    = k+1; // next hit
+  // measurement of MS kink
+  for (unsigned int k = 1; k < allCurvlinJacobians.size() - 1; ++k) {
+    // CHK
+    int iMsMeas = k - 1;
+    int l = k - 1;  // last hit
+    int n = k + 1;  // next hit
 
-// amount of multiple scattering in layer k  (angular error perp to direction)  
+    // amount of multiple scattering in layer k  (angular error perp to direction)
     tempMSCov = allDeltaParameterCovs[k].similarity(allLocalToCurv[k]);
     tempMSCovProj = tempMSCov.similarity(CurvToAngle);
-    theMeasurementsCov[offsetMeas+nMeasPerHit*iMsMeas  ][offsetMeas+nMeasPerHit*iMsMeas  ] = tempMSCovProj[1][1];
-    theMeasurementsCov[offsetMeas+nMeasPerHit*iMsMeas+1][offsetMeas+nMeasPerHit*iMsMeas+1] = tempMSCovProj[0][0];
+    theMeasurementsCov[offsetMeas + nMeasPerHit * iMsMeas][offsetMeas + nMeasPerHit * iMsMeas] = tempMSCovProj[1][1];
+    theMeasurementsCov[offsetMeas + nMeasPerHit * iMsMeas + 1][offsetMeas + nMeasPerHit * iMsMeas + 1] =
+        tempMSCovProj[0][0];
 
-// transformation matices for offsets ( l <- k -> n )
+    // transformation matices for offsets ( l <- k -> n )
     tempJacL = allCurvlinJacobians[k] * tempJacobian;
-    JacCurvToOffsetL = CurvToOffset * tempJacL.inverse(ierr); // (dU'/dCurv') * (dCurv'/dCurv) @ last point
+    JacCurvToOffsetL = CurvToOffset * tempJacL.inverse(ierr);  // (dU'/dCurv') * (dCurv'/dCurv) @ last point
 
     if (ierr) {
-       edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::addMaterialEffectsBrl"
-				   << "Inversion 4 for fine broken lines failed: " << ierr;
-       return false;
+      edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::addMaterialEffectsBrl"
+                                 << "Inversion 4 for fine broken lines failed: " << ierr;
+      return false;
     }
-    JacOffsetToOffsetL = JacCurvToOffsetL * OffsetToCurv; // J-: (dU'/dU)     = (dU'/dCurv') * (dCurv'/dCurv) * (dCurv/dU)
-    JacAngleToOffsetL  = JacCurvToOffsetL * AngleToCurv;  // S-: (dU'/dAlpha) = (dU'/dCurv') * (dCurv'/dCurv) * (dCurv/dAlpha)
-    JacQbypToOffsetL   = JacCurvToOffsetL * QbypToCurv;   // d-: (dU'/dQbyp)  = (dU'/dCurv') * (dCurv'/dCurv) * (dCurv/dQbyp)
-    JacOffsetToAngleL  =-JacAngleToOffsetL.inverse(ierr); // W-
+    JacOffsetToOffsetL =
+        JacCurvToOffsetL * OffsetToCurv;  // J-: (dU'/dU)     = (dU'/dCurv') * (dCurv'/dCurv) * (dCurv/dU)
+    JacAngleToOffsetL =
+        JacCurvToOffsetL * AngleToCurv;  // S-: (dU'/dAlpha) = (dU'/dCurv') * (dCurv'/dCurv) * (dCurv/dAlpha)
+    JacQbypToOffsetL =
+        JacCurvToOffsetL * QbypToCurv;  // d-: (dU'/dQbyp)  = (dU'/dCurv') * (dCurv'/dCurv) * (dCurv/dQbyp)
+    JacOffsetToAngleL = -JacAngleToOffsetL.inverse(ierr);  // W-
     if (ierr) {
-       edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::addMaterialEffectsBrl"
-				   << "Inversion 5 for fine broken lines failed: " << ierr;
-       return false;
+      edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::addMaterialEffectsBrl"
+                                 << "Inversion 5 for fine broken lines failed: " << ierr;
+      return false;
     }
     tempJacobian = tempJacobian * allCurvatureChanges[k];
     tempJacN = allCurvlinJacobians[n] * tempJacobian;
-    JacCurvToOffsetN = CurvToOffset * tempJacN; // (dU'/dCurv') * (dCurv'/dCurv) @ next point
-    JacOffsetToOffsetN = JacCurvToOffsetN * OffsetToCurv; // J+: (dU'/dU)     = (dU'/dCurv') * (dCurv'/dCurv) * (dCurv/dU)
-    JacAngleToOffsetN  = JacCurvToOffsetN * AngleToCurv;  // S+: (dU'/dAlpha) = (dU'/dCurv') * (dCurv'/dCurv) * (dCurv/dAlpha)
-    JacQbypToOffsetN   = JacCurvToOffsetN * QbypToCurv;   // d+: (dU'/dQbyp)  = (dU'/dCurv') * (dCurv'/dCurv) * (dCurv/dQbyp)
-    JacOffsetToAngleN  = JacAngleToOffsetN.inverse(ierr); // W+
+    JacCurvToOffsetN = CurvToOffset * tempJacN;  // (dU'/dCurv') * (dCurv'/dCurv) @ next point
+    JacOffsetToOffsetN =
+        JacCurvToOffsetN * OffsetToCurv;  // J+: (dU'/dU)     = (dU'/dCurv') * (dCurv'/dCurv) * (dCurv/dU)
+    JacAngleToOffsetN =
+        JacCurvToOffsetN * AngleToCurv;  // S+: (dU'/dAlpha) = (dU'/dCurv') * (dCurv'/dCurv) * (dCurv/dAlpha)
+    JacQbypToOffsetN =
+        JacCurvToOffsetN * QbypToCurv;  // d+: (dU'/dQbyp)  = (dU'/dCurv') * (dCurv'/dCurv) * (dCurv/dQbyp)
+    JacOffsetToAngleN = JacAngleToOffsetN.inverse(ierr);  // W+
     if (ierr) {
-       edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::addMaterialEffectsBrl"
-				   << "Inversion 6 for fine broken lines failed: " << ierr;
-       return false;
+      edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::addMaterialEffectsBrl"
+                                 << "Inversion 6 for fine broken lines failed: " << ierr;
+      return false;
     }
     JacOffsetToAngleC = -(JacOffsetToAngleL * JacOffsetToOffsetL + JacOffsetToAngleN * JacOffsetToOffsetN);
-    JacQbypToAngleC   = -(JacOffsetToAngleL * JacQbypToOffsetL   + JacOffsetToAngleN * JacQbypToOffsetN);
+    JacQbypToAngleC = -(JacOffsetToAngleL * JacQbypToOffsetL + JacOffsetToAngleN * JacQbypToOffsetN);
 
-    // bending    
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas  ][              0] = JacQbypToAngleC[0][0];
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas+1][              0] = JacQbypToAngleC[1][0];
+    // bending
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas][0] = JacQbypToAngleC[0][0];
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas + 1][0] = JacQbypToAngleC[1][0];
     // last layer
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas  ][offsetPar+2*l  ] = JacOffsetToAngleL[0][0];
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas  ][offsetPar+2*l+1] = JacOffsetToAngleL[0][1];
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas+1][offsetPar+2*l  ] = JacOffsetToAngleL[1][0];
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas+1][offsetPar+2*l+1] = JacOffsetToAngleL[1][1];
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas][offsetPar + 2 * l] = JacOffsetToAngleL[0][0];
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas][offsetPar + 2 * l + 1] = JacOffsetToAngleL[0][1];
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas + 1][offsetPar + 2 * l] = JacOffsetToAngleL[1][0];
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas + 1][offsetPar + 2 * l + 1] = JacOffsetToAngleL[1][1];
     // current layer
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas  ][offsetPar+2*k  ] = JacOffsetToAngleC[0][0];
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas  ][offsetPar+2*k+1] = JacOffsetToAngleC[0][1];
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas+1][offsetPar+2*k  ] = JacOffsetToAngleC[1][0];
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas+1][offsetPar+2*k+1] = JacOffsetToAngleC[1][1];
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas][offsetPar + 2 * k] = JacOffsetToAngleC[0][0];
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas][offsetPar + 2 * k + 1] = JacOffsetToAngleC[0][1];
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas + 1][offsetPar + 2 * k] = JacOffsetToAngleC[1][0];
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas + 1][offsetPar + 2 * k + 1] = JacOffsetToAngleC[1][1];
 
     // next layer
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas  ][offsetPar+2*n  ] = JacOffsetToAngleN[0][0];
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas  ][offsetPar+2*n+1] = JacOffsetToAngleN[0][1];
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas+1][offsetPar+2*n  ] = JacOffsetToAngleN[1][0];
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas+1][offsetPar+2*n+1] = JacOffsetToAngleN[1][1];
-
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas][offsetPar + 2 * n] = JacOffsetToAngleN[0][0];
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas][offsetPar + 2 * n + 1] = JacOffsetToAngleN[0][1];
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas + 1][offsetPar + 2 * n] = JacOffsetToAngleN[1][0];
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas + 1][offsetPar + 2 * n + 1] = JacOffsetToAngleN[1][1];
   }
 
   return true;
@@ -790,33 +796,32 @@ bool ReferenceTrajectory::addMaterialEffectsBrl(const std::vector<AlgebraicMatri
 //__________________________________________________________________________________
 
 bool ReferenceTrajectory::addMaterialEffectsBrl(const std::vector<AlgebraicMatrix> &allProjections,
-						const std::vector<AlgebraicSymMatrix> &allDeltaParameterCovs,
-						const std::vector<AlgebraicMatrix> &allLocalToCurv,
-						const std::vector<double> &allSteps,
-						const GlobalTrajectoryParameters &gtp,
-						const double minStep)
-{
-//CHK: add material effects using broken lines
-//BrokenLinesCoarse: combine close by detectors, 
-//                   use approximate Jacobians from Steps (limit Qbyp -> 0),
-//                   bending only in RPhi (B=(0,0,Bz)), no energy loss correction
-
-  int offsetPar = theNumberOfPars; 
-  int offsetMeas = nMeasPerHit*allSteps.size();
+                                                const std::vector<AlgebraicSymMatrix> &allDeltaParameterCovs,
+                                                const std::vector<AlgebraicMatrix> &allLocalToCurv,
+                                                const std::vector<double> &allSteps,
+                                                const GlobalTrajectoryParameters &gtp,
+                                                const double minStep) {
+  //CHK: add material effects using broken lines
+  //BrokenLinesCoarse: combine close by detectors,
+  //                   use approximate Jacobians from Steps (limit Qbyp -> 0),
+  //                   bending only in RPhi (B=(0,0,Bz)), no energy loss correction
+
+  int offsetPar = theNumberOfPars;
+  int offsetMeas = nMeasPerHit * allSteps.size();
   int ierr = 0;
 
   GlobalVector p = gtp.momentum();
-  double cosLambda = sqrt((p.x()*p.x()+p.y()*p.y())/(p.x()*p.x()+p.y()*p.y()+p.z()*p.z()));
+  double cosLambda = sqrt((p.x() * p.x() + p.y() * p.y()) / (p.x() * p.x() + p.y() * p.y() + p.z() * p.z()));
   double bFac = -gtp.magneticFieldInInverseGeV(gtp.position()).mag();
 
   // transformation from trajectory to curvilinear parameters at refTsos
-  double delta (1.0/allSteps[1]);    
+  double delta(1.0 / allSteps[1]);
   theInnerTrajectoryToCurvilinear[0][0] = 1;
-  theInnerTrajectoryToCurvilinear[1][2] = -delta;  
-  theInnerTrajectoryToCurvilinear[1][4] =  delta;    
-  theInnerTrajectoryToCurvilinear[2][0] = -0.5*bFac/delta;
-  theInnerTrajectoryToCurvilinear[2][1] = -delta/cosLambda;
-  theInnerTrajectoryToCurvilinear[2][3] =  delta/cosLambda;
+  theInnerTrajectoryToCurvilinear[1][2] = -delta;
+  theInnerTrajectoryToCurvilinear[1][4] = delta;
+  theInnerTrajectoryToCurvilinear[2][0] = -0.5 * bFac / delta;
+  theInnerTrajectoryToCurvilinear[2][1] = -delta / cosLambda;
+  theInnerTrajectoryToCurvilinear[2][3] = delta / cosLambda;
   theInnerTrajectoryToCurvilinear[3][1] = 1;
   theInnerTrajectoryToCurvilinear[4][2] = 1;
   theInnerLocalToTrajectory = theInnerTrajectoryToCurvilinear.inverse(ierr) * allLocalToCurv[0];
@@ -826,12 +831,12 @@ bool ReferenceTrajectory::addMaterialEffectsBrl(const std::vector<AlgebraicMatri
     return false;
   }
 
-  AlgebraicMatrix CurvToAngle(2,5);  // dAlpha/dCurv
-  CurvToAngle[1][1] = 1.;            // dalpha2/dlambda
-  CurvToAngle[0][2] = cosLambda;     // dalpha1/dphi
-  AlgebraicMatrix OffsetToCurv(5,2); // dCurv/dU
-  OffsetToCurv[3][0] = 1.;           // dxt/du1
-  OffsetToCurv[4][1] = 1.;           // dyt/du2
+  AlgebraicMatrix CurvToAngle(2, 5);   // dAlpha/dCurv
+  CurvToAngle[1][1] = 1.;              // dalpha2/dlambda
+  CurvToAngle[0][2] = cosLambda;       // dalpha1/dphi
+  AlgebraicMatrix OffsetToCurv(5, 2);  // dCurv/dU
+  OffsetToCurv[3][0] = 1.;             // dxt/du1
+  OffsetToCurv[4][1] = 1.;             // dyt/du2
 
   AlgebraicSymMatrix tempMSCov;
   AlgebraicSymMatrix tempMSCovProj;
@@ -839,7 +844,7 @@ bool ReferenceTrajectory::addMaterialEffectsBrl(const std::vector<AlgebraicMatri
 
   // combine closeby detectors into single plane
   std::vector<unsigned int> first(allSteps.size());
-  std::vector<unsigned int> last (allSteps.size());
+  std::vector<unsigned int> last(allSteps.size());
   std::vector<unsigned int> plane(allSteps.size());
   std::vector<double> sPlane(allSteps.size());
   unsigned int nPlane = 0;
@@ -847,23 +852,29 @@ bool ReferenceTrajectory::addMaterialEffectsBrl(const std::vector<AlgebraicMatri
 
   for (unsigned int k = 1; k < allSteps.size(); ++k) {
     sTot += allSteps[k];
-    if (fabs(allSteps[k])>minStep) { nPlane += 1; first[nPlane] = k; }
+    if (fabs(allSteps[k]) > minStep) {
+      nPlane += 1;
+      first[nPlane] = k;
+    }
     last[nPlane] = k;
     plane[k] = nPlane;
     sPlane[nPlane] += sTot;
   }
-  if (nPlane < 2) return false; // pathological cases: need at least 2 planes
+  if (nPlane < 2)
+    return false;  // pathological cases: need at least 2 planes
 
-  theNumberOfVirtualPars = 2*(nPlane+1);
-  theNumberOfVirtualMeas = 2*(nPlane-1);// unsigned underflow for nPlane == 0...
-  for (unsigned int k = 0; k <= nPlane; ++k) { sPlane[k] /= (double) (last[k]-first[k]+1); }
+  theNumberOfVirtualPars = 2 * (nPlane + 1);
+  theNumberOfVirtualMeas = 2 * (nPlane - 1);  // unsigned underflow for nPlane == 0...
+  for (unsigned int k = 0; k <= nPlane; ++k) {
+    sPlane[k] /= (double)(last[k] - first[k] + 1);
+  }
 
   // measurements from hits
-  sTot = 0; 
+  sTot = 0;
   for (unsigned int k = 0; k < allSteps.size(); ++k) {
     sTot += allSteps[k];
-//  (dMeas/dU) = (dMeas/dLoc) * (dLoc/dCurv) * (dCurv/dU)
-    JacOffsetToMeas = (allProjections[k] * allLocalToCurv[k].inverse(ierr) ) * OffsetToCurv;
+    //  (dMeas/dU) = (dMeas/dLoc) * (dLoc/dCurv) * (dCurv/dU)
+    JacOffsetToMeas = (allProjections[k] * allLocalToCurv[k].inverse(ierr)) * OffsetToCurv;
     if (ierr) {
       edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::addMaterialEffectsBrl"
                                  << "Inversion 2 for coarse broken lines failed: " << ierr;
@@ -871,64 +882,66 @@ bool ReferenceTrajectory::addMaterialEffectsBrl(const std::vector<AlgebraicMatri
     }
 
     unsigned int iPlane = plane[k];
-    if (last[iPlane] == first[iPlane])
-    { // single plane
-      theDerivatives[nMeasPerHit*k  ][offsetPar+2*iPlane  ] =  JacOffsetToMeas[0][0];
-      theDerivatives[nMeasPerHit*k  ][offsetPar+2*iPlane+1] =  JacOffsetToMeas[0][1];
-      theDerivatives[nMeasPerHit*k+1][offsetPar+2*iPlane  ] =  JacOffsetToMeas[1][0];
-      theDerivatives[nMeasPerHit*k+1][offsetPar+2*iPlane+1] =  JacOffsetToMeas[1][1];
-    } else
-    { // combined plane: (linear) interpolation
-      unsigned int jPlane; // neighbor plane for interpolation
-      if (fabs(sTot) < fabs(sPlane[iPlane])) { jPlane = (iPlane>0) ? iPlane - 1 : 1; }
-      else  { jPlane = (iPlane<nPlane) ? iPlane + 1 : nPlane -1 ;}
+    if (last[iPlane] == first[iPlane]) {  // single plane
+      theDerivatives[nMeasPerHit * k][offsetPar + 2 * iPlane] = JacOffsetToMeas[0][0];
+      theDerivatives[nMeasPerHit * k][offsetPar + 2 * iPlane + 1] = JacOffsetToMeas[0][1];
+      theDerivatives[nMeasPerHit * k + 1][offsetPar + 2 * iPlane] = JacOffsetToMeas[1][0];
+      theDerivatives[nMeasPerHit * k + 1][offsetPar + 2 * iPlane + 1] = JacOffsetToMeas[1][1];
+    } else {                // combined plane: (linear) interpolation
+      unsigned int jPlane;  // neighbor plane for interpolation
+      if (fabs(sTot) < fabs(sPlane[iPlane])) {
+        jPlane = (iPlane > 0) ? iPlane - 1 : 1;
+      } else {
+        jPlane = (iPlane < nPlane) ? iPlane + 1 : nPlane - 1;
+      }
       // interpolation weights
       double sDiff = sPlane[iPlane] - sPlane[jPlane];
       double iFrac = (sTot - sPlane[jPlane]) / sDiff;
       double jFrac = 1.0 - iFrac;
-      theDerivatives[nMeasPerHit*k  ][offsetPar+2*iPlane  ] =  JacOffsetToMeas[0][0]*iFrac;
-      theDerivatives[nMeasPerHit*k  ][offsetPar+2*iPlane+1] =  JacOffsetToMeas[0][1]*iFrac;
-      theDerivatives[nMeasPerHit*k+1][offsetPar+2*iPlane  ] =  JacOffsetToMeas[1][0]*iFrac;
-      theDerivatives[nMeasPerHit*k+1][offsetPar+2*iPlane+1] =  JacOffsetToMeas[1][1]*iFrac;
-      theDerivatives[nMeasPerHit*k  ][offsetPar+2*jPlane  ] =  JacOffsetToMeas[0][0]*jFrac;
-      theDerivatives[nMeasPerHit*k  ][offsetPar+2*jPlane+1] =  JacOffsetToMeas[0][1]*jFrac;
-      theDerivatives[nMeasPerHit*k+1][offsetPar+2*jPlane  ] =  JacOffsetToMeas[1][0]*jFrac;
-      theDerivatives[nMeasPerHit*k+1][offsetPar+2*jPlane+1] =  JacOffsetToMeas[1][1]*jFrac;
+      theDerivatives[nMeasPerHit * k][offsetPar + 2 * iPlane] = JacOffsetToMeas[0][0] * iFrac;
+      theDerivatives[nMeasPerHit * k][offsetPar + 2 * iPlane + 1] = JacOffsetToMeas[0][1] * iFrac;
+      theDerivatives[nMeasPerHit * k + 1][offsetPar + 2 * iPlane] = JacOffsetToMeas[1][0] * iFrac;
+      theDerivatives[nMeasPerHit * k + 1][offsetPar + 2 * iPlane + 1] = JacOffsetToMeas[1][1] * iFrac;
+      theDerivatives[nMeasPerHit * k][offsetPar + 2 * jPlane] = JacOffsetToMeas[0][0] * jFrac;
+      theDerivatives[nMeasPerHit * k][offsetPar + 2 * jPlane + 1] = JacOffsetToMeas[0][1] * jFrac;
+      theDerivatives[nMeasPerHit * k + 1][offsetPar + 2 * jPlane] = JacOffsetToMeas[1][0] * jFrac;
+      theDerivatives[nMeasPerHit * k + 1][offsetPar + 2 * jPlane + 1] = JacOffsetToMeas[1][1] * jFrac;
       // 2nd order neglected
       // theDerivatives[nMeasPerHit*k  ][                   0] = -0.5*bFac*sDiff*iFrac*sDiff*jFrac*cosLambda;
     }
   }
 
-// measurement of MS kink
+  // measurement of MS kink
   for (unsigned int i = 1; i < nPlane; ++i) {
-// CHK 
-    int iMsMeas = i-1;
-    int l    = i-1; // last hit
-    int n    = i+1; // next hit
+    // CHK
+    int iMsMeas = i - 1;
+    int l = i - 1;  // last hit
+    int n = i + 1;  // next hit
 
-// amount of multiple scattering in plane k
+    // amount of multiple scattering in plane k
     for (unsigned int k = first[i]; k <= last[i]; ++k) {
       tempMSCov = allDeltaParameterCovs[k].similarity(allLocalToCurv[k]);
       tempMSCovProj = tempMSCov.similarity(CurvToAngle);
-      theMeasurementsCov[offsetMeas+nMeasPerHit*iMsMeas  ][offsetMeas+nMeasPerHit*iMsMeas  ] += tempMSCovProj[0][0];
-      theMeasurementsCov[offsetMeas+nMeasPerHit*iMsMeas+1][offsetMeas+nMeasPerHit*iMsMeas+1] += tempMSCovProj[1][1];
+      theMeasurementsCov[offsetMeas + nMeasPerHit * iMsMeas][offsetMeas + nMeasPerHit * iMsMeas] += tempMSCovProj[0][0];
+      theMeasurementsCov[offsetMeas + nMeasPerHit * iMsMeas + 1][offsetMeas + nMeasPerHit * iMsMeas + 1] +=
+          tempMSCovProj[1][1];
     }
-// broken line measurements for layer k, correlations between both planes neglected
+    // broken line measurements for layer k, correlations between both planes neglected
     double stepK = sPlane[i] - sPlane[l];
     double stepN = sPlane[n] - sPlane[i];
-    double deltaK (1.0/stepK);
-    double deltaN (1.0/stepN);
+    double deltaK(1.0 / stepK);
+    double deltaN(1.0 / stepN);
     // bending (only in RPhi)
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas  ][              0] = -0.5*bFac*(stepK+stepN)*cosLambda;
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas][0] = -0.5 * bFac * (stepK + stepN) * cosLambda;
     // last layer
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas  ][offsetPar+2*l  ] = deltaK;
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas+1][offsetPar+2*l+1] = deltaK;
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas][offsetPar + 2 * l] = deltaK;
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas + 1][offsetPar + 2 * l + 1] = deltaK;
     // current layer
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas  ][offsetPar+2*i  ] = -(deltaK + deltaN);
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas+1][offsetPar+2*i+1] = -(deltaK + deltaN);
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas][offsetPar + 2 * i] = -(deltaK + deltaN);
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas + 1][offsetPar + 2 * i + 1] = -(deltaK + deltaN);
     // next layer
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas  ][offsetPar+2*n  ] = deltaN;
-    theDerivatives[offsetMeas+nMeasPerHit*iMsMeas+1][offsetPar+2*n+1] = deltaN;
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas][offsetPar + 2 * n] = deltaN;
+    theDerivatives[offsetMeas + nMeasPerHit * iMsMeas + 1][offsetPar + 2 * n + 1] = deltaN;
   }
 
   return true;
@@ -937,19 +950,18 @@ bool ReferenceTrajectory::addMaterialEffectsBrl(const std::vector<AlgebraicMatri
 //__________________________________________________________________________________
 
 bool ReferenceTrajectory::addMaterialEffectsLocalGbl(const std::vector<AlgebraicMatrix> &allJacobians,
-                                                const std::vector<AlgebraicMatrix> &allProjections,
-                                                const std::vector<AlgebraicSymMatrix> &allCurvatureChanges,
-                                                const std::vector<AlgebraicSymMatrix> &allDeltaParameterCovs)
-{
-//CHK: add material effects using general broken lines, no initial kinks
-// local track parameters are defined in the TSO system
+                                                     const std::vector<AlgebraicMatrix> &allProjections,
+                                                     const std::vector<AlgebraicSymMatrix> &allCurvatureChanges,
+                                                     const std::vector<AlgebraicSymMatrix> &allDeltaParameterCovs) {
+  //CHK: add material effects using general broken lines, no initial kinks
+  // local track parameters are defined in the TSO system
 
-  const double minPrec = 1.0; // minimum precision to use measurement (reject measurements in strip direction)
+  const double minPrec = 1.0;  // minimum precision to use measurement (reject measurements in strip direction)
 
-  AlgebraicMatrix OffsetToLocal(5,2); // dLocal/dU
+  AlgebraicMatrix OffsetToLocal(5, 2);  // dLocal/dU
   OffsetToLocal[3][0] = 1.;
   OffsetToLocal[4][1] = 1.;
-  AlgebraicMatrix SlopeToLocal(5,2); // dLocal/dU'
+  AlgebraicMatrix SlopeToLocal(5, 2);  // dLocal/dU'
   SlopeToLocal[1][0] = 1.;
   SlopeToLocal[2][1] = 1.;
 
@@ -962,36 +974,35 @@ bool ReferenceTrajectory::addMaterialEffectsLocalGbl(const std::vector<Algebraic
 
   //bool initialKinks = (allCurvlinKinks.size()>0);
 
-// measurements and scatterers from hits
+  // measurements and scatterers from hits
   unsigned int numHits = allJacobians.size();
   std::vector<GblPoint> GblPointList;
   GblPointList.reserve(numHits);
   for (unsigned int k = 0; k < numHits; ++k) {
-
     // GBL point to point jacobian
     clhep2eigen(allJacobians[k] * allCurvatureChanges[k], jacPointToPoint);
 
     // GBL point
-    GblPoint aGblPoint( jacPointToPoint );
+    GblPoint aGblPoint(jacPointToPoint);
 
     // GBL projection from local to measurement system
     clhep2eigen(allProjections[k] * OffsetToLocal, proLocalToMeas);
 
     // GBL measurement (residuum to initial trajectory)
-    clhep2eigen(theMeasurements.sub(2*k+1,2*k+2) - theTrajectoryPositions.sub(2*k+1,2*k+2), measurement);
+    clhep2eigen(theMeasurements.sub(2 * k + 1, 2 * k + 2) - theTrajectoryPositions.sub(2 * k + 1, 2 * k + 2),
+                measurement);
 
     // GBL measurement covariance matrix
-    clhep2eigen(theMeasurementsCov.sub(2*k+1,2*k+2), covariance);
+    clhep2eigen(theMeasurementsCov.sub(2 * k + 1, 2 * k + 2), covariance);
 
     // GBL add measurement to point
-    if (std::abs(covariance(0,1)) < std::numeric_limits<double>::epsilon()) {
+    if (std::abs(covariance(0, 1)) < std::numeric_limits<double>::epsilon()) {
       // covariance matrix is diagonal, independent measurements
       for (unsigned int row = 0; row < 2; ++row) {
-        measPrecDiag(row) = ( 0. < covariance(row,row) ? 1.0/covariance(row,row) : 0. );
+        measPrecDiag(row) = (0. < covariance(row, row) ? 1.0 / covariance(row, row) : 0.);
       }
       aGblPoint.addMeasurement(proLocalToMeas, measurement, measPrecDiag, minPrec);
-    } else
-    {
+    } else {
       // covariance matrix needs diagonalization
       aGblPoint.addMeasurement(proLocalToMeas, measurement, covariance.inverse(), minPrec);
     }
@@ -1000,17 +1011,16 @@ bool ReferenceTrajectory::addMaterialEffectsLocalGbl(const std::vector<Algebraic
     clhep2eigen(allDeltaParameterCovs[k].similarityT(SlopeToLocal), scatPrecision);
     if (!(scatPrecision.colPivHouseholderQr().isInvertible())) {
       if (!allowZeroMaterial_) {
-        throw cms::Exception("Alignment")
-          << "@SUB=ReferenceTrajectory::addMaterialEffectsLocalGbl"
-          << "\nEncountered singular scatter covariance-matrix without allowing "
-          << "for zero material.";
+        throw cms::Exception("Alignment") << "@SUB=ReferenceTrajectory::addMaterialEffectsLocalGbl"
+                                          << "\nEncountered singular scatter covariance-matrix without allowing "
+                                          << "for zero material.";
       }
     } else {
       // GBL add scatterer to point
       aGblPoint.addScatterer(scatterer, scatPrecision.inverse());
     }
     // add point to list
-    GblPointList.push_back( aGblPoint );
+    GblPointList.push_back(aGblPoint);
   }
   // add list of points and transformation local to fit (=local) system at first hit
   theGblInput.push_back(std::make_pair(GblPointList, identity));
@@ -1021,20 +1031,19 @@ bool ReferenceTrajectory::addMaterialEffectsLocalGbl(const std::vector<Algebraic
 //__________________________________________________________________________________
 
 bool ReferenceTrajectory::addMaterialEffectsCurvlinGbl(const std::vector<AlgebraicMatrix> &allCurvlinJacobians,
-                                                const std::vector<AlgebraicMatrix> &allProjections,
-                                                const std::vector<AlgebraicSymMatrix> &allCurvatureChanges,
-                                                const std::vector<AlgebraicSymMatrix> &allDeltaParameterCovs,
-                                                const std::vector<AlgebraicMatrix> &allLocalToCurv)
-{
-//CHK: add material effects using general broken lines
-// local track parameters are defined in the curvilinear system
-
-  const double minPrec = 1.0; // minimum precision to use measurement (reject measurements in strip direction)
+                                                       const std::vector<AlgebraicMatrix> &allProjections,
+                                                       const std::vector<AlgebraicSymMatrix> &allCurvatureChanges,
+                                                       const std::vector<AlgebraicSymMatrix> &allDeltaParameterCovs,
+                                                       const std::vector<AlgebraicMatrix> &allLocalToCurv) {
+  //CHK: add material effects using general broken lines
+  // local track parameters are defined in the curvilinear system
+
+  const double minPrec = 1.0;  // minimum precision to use measurement (reject measurements in strip direction)
   int ierr = 0;
 
-  AlgebraicMatrix OffsetToCurv(5,2); // dCurv/dU
-  OffsetToCurv[3][0] = 1.;           // dxt/du1
-  OffsetToCurv[4][1] = 1.;           // dyt/du2
+  AlgebraicMatrix OffsetToCurv(5, 2);  // dCurv/dU
+  OffsetToCurv[3][0] = 1.;             // dxt/du1
+  OffsetToCurv[4][1] = 1.;             // dyt/du2
 
   AlgebraicMatrix JacOffsetToMeas, tempMSCov;
 
@@ -1044,43 +1053,43 @@ bool ReferenceTrajectory::addMaterialEffectsCurvlinGbl(const std::vector<Algebra
   Eigen::Vector2d measurement, measPrecDiag, scatPrecDiag;
   auto scatterer = Eigen::Vector2d::Zero();
 
-// measurements and scatterers from hits
+  // measurements and scatterers from hits
   unsigned int numHits = allCurvlinJacobians.size();
   std::vector<GblPoint> GblPointList;
   GblPointList.reserve(numHits);
   for (unsigned int k = 0; k < numHits; ++k) {
-//  (dMeas/dU) = (dMeas/dLoc) * (dLoc/dCurv) * (dCurv/dU)
-    JacOffsetToMeas = (allProjections[k] * allLocalToCurv[k].inverse(ierr) ) * OffsetToCurv;
+    //  (dMeas/dU) = (dMeas/dLoc) * (dLoc/dCurv) * (dCurv/dU)
+    JacOffsetToMeas = (allProjections[k] * allLocalToCurv[k].inverse(ierr)) * OffsetToCurv;
     if (ierr) {
-       edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::addMaterialEffectsGbl"
-                                   << "Inversion 1 for general broken lines failed: " << ierr;
-       return false;
+      edm::LogError("Alignment") << "@SUB=ReferenceTrajectory::addMaterialEffectsGbl"
+                                 << "Inversion 1 for general broken lines failed: " << ierr;
+      return false;
     }
 
     // GBL point to point jacobian
     clhep2eigen(allCurvlinJacobians[k] * allCurvatureChanges[k], jacPointToPoint);
 
     // GBL point
-    GblPoint aGblPoint( jacPointToPoint );
+    GblPoint aGblPoint(jacPointToPoint);
 
     // GBL projection from local to measurement system
     clhep2eigen(JacOffsetToMeas, proLocalToMeas);
 
     // GBL measurement (residuum to initial trajectory)
-    clhep2eigen(theMeasurements.sub(2*k+1,2*k+2) - theTrajectoryPositions.sub(2*k+1,2*k+2), measurement);
+    clhep2eigen(theMeasurements.sub(2 * k + 1, 2 * k + 2) - theTrajectoryPositions.sub(2 * k + 1, 2 * k + 2),
+                measurement);
 
     // GBL measurement covariance matrix
-    clhep2eigen(theMeasurementsCov.sub(2*k+1,2*k+2), covariance);
+    clhep2eigen(theMeasurementsCov.sub(2 * k + 1, 2 * k + 2), covariance);
 
     // GBL add measurement to point
-    if (std::abs(covariance(0,1)) < std::numeric_limits<double>::epsilon()) {
+    if (std::abs(covariance(0, 1)) < std::numeric_limits<double>::epsilon()) {
       // covariance matrix is diagonal, independent measurements
       for (unsigned int row = 0; row < 2; ++row) {
-        measPrecDiag(row) = ( 0. < covariance(row,row) ? 1.0/covariance(row,row) : 0. );
+        measPrecDiag(row) = (0. < covariance(row, row) ? 1.0 / covariance(row, row) : 0.);
       }
       aGblPoint.addMeasurement(proLocalToMeas, measurement, measPrecDiag, minPrec);
-    } else
-    {
+    } else {
       // covariance matrix needs diagonalization
       aGblPoint.addMeasurement(proLocalToMeas, measurement, covariance.inverse(), minPrec);
     }
@@ -1088,29 +1097,28 @@ bool ReferenceTrajectory::addMaterialEffectsCurvlinGbl(const std::vector<Algebra
     // GBL multiple scattering (diagonal matrix in curvilinear system)
     tempMSCov = allDeltaParameterCovs[k].similarity(allLocalToCurv[k]);
     for (unsigned int row = 0; row < 2; ++row) {
-      scatPrecDiag(row) = 1.0/tempMSCov[row+1][row+1];
+      scatPrecDiag(row) = 1.0 / tempMSCov[row + 1][row + 1];
     }
 
     // check for singularity
     bool singularCovariance{false};
     for (int row = 0; row < scatPrecDiag.rows(); ++row) {
       if (!(scatPrecDiag[row] < std::numeric_limits<double>::infinity())) {
-	singularCovariance = true;
-	break;
+        singularCovariance = true;
+        break;
       }
     }
     if (singularCovariance && !allowZeroMaterial_) {
-      throw cms::Exception("Alignment")
-	<< "@SUB=ReferenceTrajectory::addMaterialEffectsCurvlinGbl"
-	<< "\nEncountered singular scatter covariance-matrix without allowing "
-	<< "for zero material.";
+      throw cms::Exception("Alignment") << "@SUB=ReferenceTrajectory::addMaterialEffectsCurvlinGbl"
+                                        << "\nEncountered singular scatter covariance-matrix without allowing "
+                                        << "for zero material.";
     }
 
     // GBL add scatterer to point
     aGblPoint.addScatterer(scatterer, scatPrecDiag);
 
     // add point to list
-    GblPointList.push_back( aGblPoint );
+    GblPointList.push_back(aGblPoint);
   }
   // add list of points and transformation local to fit (=curvilinear) system at first hit
   clhep2eigen(allLocalToCurv[0], firstLocalToCurv);
@@ -1121,18 +1129,15 @@ bool ReferenceTrajectory::addMaterialEffectsCurvlinGbl(const std::vector<Algebra
 
 //__________________________________________________________________________________
 template <typename Derived>
-void ReferenceTrajectory::clhep2eigen(const AlgebraicVector& in,
-                                      Eigen::MatrixBase<Derived>& out) {
-  static_assert(Derived::ColsAtCompileTime == 1,
-                "clhep2eigen: 'out' must be of vector type");
+void ReferenceTrajectory::clhep2eigen(const AlgebraicVector &in, Eigen::MatrixBase<Derived> &out) {
+  static_assert(Derived::ColsAtCompileTime == 1, "clhep2eigen: 'out' must be of vector type");
   for (int row = 0; row < in.num_row(); ++row) {
     out(row) = in[row];
   }
 }
 
 template <typename Derived>
-void ReferenceTrajectory::clhep2eigen(const AlgebraicMatrix& in,
-                                      Eigen::MatrixBase<Derived>& out) {
+void ReferenceTrajectory::clhep2eigen(const AlgebraicMatrix &in, Eigen::MatrixBase<Derived> &out) {
   for (int row = 0; row < in.num_row(); ++row) {
     for (int col = 0; col < in.num_col(); ++col) {
       out(row, col) = in[row][col];
@@ -1141,8 +1146,7 @@ void ReferenceTrajectory::clhep2eigen(const AlgebraicMatrix& in,
 }
 
 template <typename Derived>
-void ReferenceTrajectory::clhep2eigen(const AlgebraicSymMatrix& in,
-                                      Eigen::MatrixBase<Derived>& out) {
+void ReferenceTrajectory::clhep2eigen(const AlgebraicSymMatrix &in, Eigen::MatrixBase<Derived> &out) {
   for (int row = 0; row < in.num_row(); ++row) {
     for (int col = 0; col < in.num_col(); ++col) {
       out(row, col) = in[row][col];
@@ -1152,45 +1156,41 @@ void ReferenceTrajectory::clhep2eigen(const AlgebraicSymMatrix& in,
 
 //__________________________________________________________________________________
 
-AlgebraicMatrix
-ReferenceTrajectory::getHitProjectionMatrix
-(const TransientTrackingRecHit::ConstRecHitPointer &hitPtr) const
-{
+AlgebraicMatrix ReferenceTrajectory::getHitProjectionMatrix(
+    const TransientTrackingRecHit::ConstRecHitPointer &hitPtr) const {
   if (this->useRecHit(hitPtr)) {
     // check which templated non-member function to call:
     switch (hitPtr->dimension()) {
-    case 1:
-      return getHitProjectionMatrixT<1>(hitPtr);
-    case 2:
-      return getHitProjectionMatrixT<2>(hitPtr);
-    case 3:
-      return getHitProjectionMatrixT<3>(hitPtr);
-    case 4:
-      return getHitProjectionMatrixT<4>(hitPtr);
-    case 5:
-      return getHitProjectionMatrixT<5>(hitPtr);
-    default:
-      throw cms::Exception("ReferenceTrajectory::getHitProjectionMatrix")
-        << "Unexpected hit dimension: " << hitPtr->dimension() << "\n";
+      case 1:
+        return getHitProjectionMatrixT<1>(hitPtr);
+      case 2:
+        return getHitProjectionMatrixT<2>(hitPtr);
+      case 3:
+        return getHitProjectionMatrixT<3>(hitPtr);
+      case 4:
+        return getHitProjectionMatrixT<4>(hitPtr);
+      case 5:
+        return getHitProjectionMatrixT<5>(hitPtr);
+      default:
+        throw cms::Exception("ReferenceTrajectory::getHitProjectionMatrix")
+            << "Unexpected hit dimension: " << hitPtr->dimension() << "\n";
     }
   }
   // invalid or (to please compiler) unknown dimension
-  return AlgebraicMatrix(2, 5, 0); // get size from ???
+  return AlgebraicMatrix(2, 5, 0);  // get size from ???
 }
 
 //__________________________________________________________________________________
 
-template<unsigned int N>
-AlgebraicMatrix 
-ReferenceTrajectory::getHitProjectionMatrixT
-(const TransientTrackingRecHit::ConstRecHitPointer &hitPtr) const
-{
+template <unsigned int N>
+AlgebraicMatrix ReferenceTrajectory::getHitProjectionMatrixT(
+    const TransientTrackingRecHit::ConstRecHitPointer &hitPtr) const {
   // define variables that will be used to setup the KfComponentsHolder
   // (their allocated memory is needed by 'hitPtr->getKfComponents(..)'
 
-  ProjectMatrix<double,5,N>  pf; 
-  typename AlgebraicROOTObject<N>::Vector r, rMeas; 
-  typename AlgebraicROOTObject<N,N>::SymMatrix V, VMeas;
+  ProjectMatrix<double, 5, N> pf;
+  typename AlgebraicROOTObject<N>::Vector r, rMeas;
+  typename AlgebraicROOTObject<N, N>::SymMatrix V, VMeas;
   // input for the holder - but dummy is OK here to just get the projection matrix:
   const AlgebraicVector5 dummyPars;
   const AlgebraicSymMatrix55 dummyErr;
@@ -1200,6 +1200,5 @@ ReferenceTrajectory::getHitProjectionMatrixT
   holder.setup<N>(&r, &V, &pf, &rMeas, &VMeas, dummyPars, dummyErr);
   hitPtr->getKfComponents(holder);
 
-  return asHepMatrix<N,5>(holder.projection<N>());
+  return asHepMatrix<N, 5>(holder.projection<N>());
 }
-
diff --git a/Alignment/ReferenceTrajectories/src/ReferenceTrajectoryBase.cc b/Alignment/ReferenceTrajectories/src/ReferenceTrajectoryBase.cc
index 558495bc6e70e..4d554fb2d83a0 100644
--- a/Alignment/ReferenceTrajectories/src/ReferenceTrajectoryBase.cc
+++ b/Alignment/ReferenceTrajectories/src/ReferenceTrajectoryBase.cc
@@ -1,38 +1,40 @@
 #include "Alignment/ReferenceTrajectories/interface/ReferenceTrajectoryBase.h"
 
-ReferenceTrajectoryBase::ReferenceTrajectoryBase(unsigned int nPar, unsigned int nHits, 
-						 unsigned int nVirtualPar, unsigned int nVirtualMeas)
-  : theValidityFlag(false), theParamCovFlag(false),
-    theNumberOfHits( nHits ), theNumberOfPars( nPar ), 
-    theNumberOfVirtualMeas( nVirtualMeas ), theNumberOfVirtualPars( nVirtualPar ),
-    theTsosVec(), theRecHits(),
-    theMeasurements(nMeasPerHit * nHits + nVirtualMeas), 
-    theMeasurementsCov(nMeasPerHit * nHits + nVirtualMeas, 0),
-    theTrajectoryPositions(nMeasPerHit * nHits), 
-    theTrajectoryPositionCov(nMeasPerHit * nHits, 0),
-    theParameters(nPar), 
-    theParameterCov(nPar, 0),
-    theDerivatives(nMeasPerHit * nHits + nVirtualMeas, nPar + nVirtualPar, 0),
-    theInnerTrajectoryToCurvilinear( 5, 5, 0 ),
-    theInnerLocalToTrajectory( 5, 5, 0 )    
-{
+ReferenceTrajectoryBase::ReferenceTrajectoryBase(unsigned int nPar,
+                                                 unsigned int nHits,
+                                                 unsigned int nVirtualPar,
+                                                 unsigned int nVirtualMeas)
+    : theValidityFlag(false),
+      theParamCovFlag(false),
+      theNumberOfHits(nHits),
+      theNumberOfPars(nPar),
+      theNumberOfVirtualMeas(nVirtualMeas),
+      theNumberOfVirtualPars(nVirtualPar),
+      theTsosVec(),
+      theRecHits(),
+      theMeasurements(nMeasPerHit * nHits + nVirtualMeas),
+      theMeasurementsCov(nMeasPerHit * nHits + nVirtualMeas, 0),
+      theTrajectoryPositions(nMeasPerHit * nHits),
+      theTrajectoryPositionCov(nMeasPerHit * nHits, 0),
+      theParameters(nPar),
+      theParameterCov(nPar, 0),
+      theDerivatives(nMeasPerHit * nHits + nVirtualMeas, nPar + nVirtualPar, 0),
+      theInnerTrajectoryToCurvilinear(5, 5, 0),
+      theInnerLocalToTrajectory(5, 5, 0) {
   theTsosVec.reserve(nHits);
   theRecHits.reserve(nHits);
 }
 
-
-unsigned int
-ReferenceTrajectoryBase::numberOfUsedRecHits( const TransientTrackingRecHit::ConstRecHitContainer &recHits ) const
-{
+unsigned int ReferenceTrajectoryBase::numberOfUsedRecHits(
+    const TransientTrackingRecHit::ConstRecHitContainer& recHits) const {
   unsigned int nUsedHits = 0;
   TransientTrackingRecHit::ConstRecHitContainer::const_iterator itHit;
-  for ( itHit = recHits.begin(); itHit != recHits.end(); ++itHit ) if ( useRecHit( *itHit ) ) ++nUsedHits;
+  for (itHit = recHits.begin(); itHit != recHits.end(); ++itHit)
+    if (useRecHit(*itHit))
+      ++nUsedHits;
   return nUsedHits;
 }
 
-
-bool
-ReferenceTrajectoryBase::useRecHit( const TransientTrackingRecHit::ConstRecHitPointer& hitPtr ) const
-{
+bool ReferenceTrajectoryBase::useRecHit(const TransientTrackingRecHit::ConstRecHitPointer& hitPtr) const {
   return hitPtr->isValid();
 }
diff --git a/Alignment/ReferenceTrajectories/src/TrajectoryFactoryBase.cc b/Alignment/ReferenceTrajectories/src/TrajectoryFactoryBase.cc
index 5382b4ac6cc4f..d382a43b920d8 100644
--- a/Alignment/ReferenceTrajectories/src/TrajectoryFactoryBase.cc
+++ b/Alignment/ReferenceTrajectories/src/TrajectoryFactoryBase.cc
@@ -6,92 +6,78 @@
 
 #include "Alignment/ReferenceTrajectories/interface/TrajectoryFactoryBase.h"
 
-
-TrajectoryFactoryBase::TrajectoryFactoryBase(const edm::ParameterSet& config) :
-  TrajectoryFactoryBase(config, 1)
-{
-}
-
-TrajectoryFactoryBase::TrajectoryFactoryBase(const edm::ParameterSet& config,
-                                             unsigned int tracksPerTrajectory) :
-  cfg_(config),
-  tracksPerTrajectory_(tracksPerTrajectory),
-  materialEffects_(materialEffects(config.getParameter<std::string>("MaterialEffects"))),
-  propDir_(propagationDirection(config.getParameter<std::string>("PropagationDirection"))),
-  useWithoutDet_(config.getParameter<bool>("UseHitWithoutDet")),
-  useInvalidHits_(config.getParameter<bool>("UseInvalidHits")),
-  useProjectedHits_(config.getParameter<bool>("UseProjectedHits")),
-  useBeamSpot_(config.getParameter<bool>("UseBeamSpot")),
-  includeAPEs_(config.getParameter<bool>("IncludeAPEs")),
-  allowZeroMaterial_(config.getParameter<bool>("AllowZeroMaterial"))
-{
-  edm::LogInfo("Alignment")
-    << "@SUB=TrajectoryFactoryBase"
-    << "TrajectoryFactory '" << cfg_.getParameter<std::string>("TrajectoryFactoryName")
-    << "' with following settings:"
-    << "\nmaterial effects: " << cfg_.getParameter<std::string>("MaterialEffects")
-    << "\npropagation: " << cfg_.getParameter<std::string>("PropagationDirection")
-    << "\nuse hits without det: " << (useWithoutDet_ ? "yes" : "no")
-    << "\nuse invalid hits: " << (useInvalidHits_ ? "yes" : "no")
-    << "\nuse projected hits: " << (useProjectedHits_ ? "yes" : "no")
-    << "\nuse beamspot: " << (useBeamSpot_ ? "yes" : "no")
-    << "\ninclude APEs: " << (includeAPEs_ ? "yes" : "no")
-    << "\nallow zero material: " << (allowZeroMaterial_ ? "yes" : "no");
+TrajectoryFactoryBase::TrajectoryFactoryBase(const edm::ParameterSet& config) : TrajectoryFactoryBase(config, 1) {}
+
+TrajectoryFactoryBase::TrajectoryFactoryBase(const edm::ParameterSet& config, unsigned int tracksPerTrajectory)
+    : cfg_(config),
+      tracksPerTrajectory_(tracksPerTrajectory),
+      materialEffects_(materialEffects(config.getParameter<std::string>("MaterialEffects"))),
+      propDir_(propagationDirection(config.getParameter<std::string>("PropagationDirection"))),
+      useWithoutDet_(config.getParameter<bool>("UseHitWithoutDet")),
+      useInvalidHits_(config.getParameter<bool>("UseInvalidHits")),
+      useProjectedHits_(config.getParameter<bool>("UseProjectedHits")),
+      useBeamSpot_(config.getParameter<bool>("UseBeamSpot")),
+      includeAPEs_(config.getParameter<bool>("IncludeAPEs")),
+      allowZeroMaterial_(config.getParameter<bool>("AllowZeroMaterial")) {
+  edm::LogInfo("Alignment") << "@SUB=TrajectoryFactoryBase"
+                            << "TrajectoryFactory '" << cfg_.getParameter<std::string>("TrajectoryFactoryName")
+                            << "' with following settings:"
+                            << "\nmaterial effects: " << cfg_.getParameter<std::string>("MaterialEffects")
+                            << "\npropagation: " << cfg_.getParameter<std::string>("PropagationDirection")
+                            << "\nuse hits without det: " << (useWithoutDet_ ? "yes" : "no")
+                            << "\nuse invalid hits: " << (useInvalidHits_ ? "yes" : "no")
+                            << "\nuse projected hits: " << (useProjectedHits_ ? "yes" : "no")
+                            << "\nuse beamspot: " << (useBeamSpot_ ? "yes" : "no")
+                            << "\ninclude APEs: " << (includeAPEs_ ? "yes" : "no")
+                            << "\nallow zero material: " << (allowZeroMaterial_ ? "yes" : "no");
 }
 
+TrajectoryFactoryBase::~TrajectoryFactoryBase(void) {}
 
-TrajectoryFactoryBase::~TrajectoryFactoryBase( void ) {}
-
-
-const TrajectoryFactoryBase::TrajectoryInput
-TrajectoryFactoryBase::innermostStateAndRecHits( const ConstTrajTrackPair & track ) const
-{
+const TrajectoryFactoryBase::TrajectoryInput TrajectoryFactoryBase::innermostStateAndRecHits(
+    const ConstTrajTrackPair& track) const {
   TrajectoryInput result;
 
   // get the trajectory measurements in the correct order, i.e. reverse if needed
-  Trajectory::DataContainer trajectoryMeasurements 
-    = this->orderedTrajectoryMeasurements( *track.first );
+  Trajectory::DataContainer trajectoryMeasurements = this->orderedTrajectoryMeasurements(*track.first);
   Trajectory::DataContainer::iterator itM = trajectoryMeasurements.begin();
 
   // get the innermost valid trajectory state - the corresponding hit must be o.k. as well
-  while ( itM != trajectoryMeasurements.end() )
-  {
-    if ( ( *itM ).updatedState().isValid() && useRecHit( ( *itM ).recHit() ) ) break;
+  while (itM != trajectoryMeasurements.end()) {
+    if ((*itM).updatedState().isValid() && useRecHit((*itM).recHit()))
+      break;
     ++itM;
   }
-  if ( itM != trajectoryMeasurements.end() ) result.first = ( *itM ).updatedState();
+  if (itM != trajectoryMeasurements.end())
+    result.first = (*itM).updatedState();
 
   // get the valid RecHits
-  while ( itM != trajectoryMeasurements.end() )
-  {
-    TransientTrackingRecHit::ConstRecHitPointer aRecHit = ( *itM ).recHit();
-    if ( useRecHit( aRecHit ) ) result.second.push_back( aRecHit );
+  while (itM != trajectoryMeasurements.end()) {
+    TransientTrackingRecHit::ConstRecHitPointer aRecHit = (*itM).recHit();
+    if (useRecHit(aRecHit))
+      result.second.push_back(aRecHit);
     ++itM;
   }
 
   return result;
 }
 
-
-const Trajectory::DataContainer
-TrajectoryFactoryBase::orderedTrajectoryMeasurements( const Trajectory & trajectory ) const
-{
+const Trajectory::DataContainer TrajectoryFactoryBase::orderedTrajectoryMeasurements(
+    const Trajectory& trajectory) const {
   const PropagationDirection dir = trajectory.direction();
-  const bool hitsAreReverse = ( ( dir == propDir_ || propDir_ == anyDirection ) ? false : true );
+  const bool hitsAreReverse = ((dir == propDir_ || propDir_ == anyDirection) ? false : true);
 
-  const Trajectory::DataContainer & original = trajectory.measurements();
+  const Trajectory::DataContainer& original = trajectory.measurements();
 
-  if ( hitsAreReverse )
-  {
+  if (hitsAreReverse) {
     // Simply use this line instead of the copying by hand?
     // const Trajectory::DataContainer reordered(original.rbegin(), original.rend());
     Trajectory::DataContainer reordered;
-    reordered.reserve( original.size() );
+    reordered.reserve(original.size());
 
     Trajectory::DataContainer::const_reverse_iterator itM;
-    for ( itM = original.rbegin(); itM != original.rend(); ++itM )
-    {
-      reordered.push_back( *itM );
+    for (itM = original.rbegin(); itM != original.rend(); ++itM) {
+      reordered.push_back(*itM);
     }
     return reordered;
   }
@@ -99,58 +85,60 @@ TrajectoryFactoryBase::orderedTrajectoryMeasurements( const Trajectory & traject
   return original;
 }
 
-
-bool TrajectoryFactoryBase::sameSurface( const Surface& s1, const Surface& s2 ) const
-{
+bool TrajectoryFactoryBase::sameSurface(const Surface& s1, const Surface& s2) const {
   // - Should use perp2() instead of perp()
   // - Should not rely on floating point equality, but make a minimal range, e.g. 1.e-6 ?
-  return ( s1.eta() == s2.eta() ) && ( s1.phi() == s2.phi() ) && ( s1.position().perp() == s2.position().perp() );
+  return (s1.eta() == s2.eta()) && (s1.phi() == s2.phi()) && (s1.position().perp() == s2.position().perp());
 }
 
-
-bool
-TrajectoryFactoryBase::useRecHit( const TransientTrackingRecHit::ConstRecHitPointer& hitPtr ) const
-{
+bool TrajectoryFactoryBase::useRecHit(const TransientTrackingRecHit::ConstRecHitPointer& hitPtr) const {
   const GeomDet* det = hitPtr->det();
-  if ( !det && !useWithoutDet_ ) return false;
-  
-  if ( !( useInvalidHits_ || hitPtr->isValid() ) ) return false;
+  if (!det && !useWithoutDet_)
+    return false;
+
+  if (!(useInvalidHits_ || hitPtr->isValid()))
+    return false;
 
-  if ( !useProjectedHits_ )
-  {
-    if(trackerHitRTTI::isProjected(*hitPtr)) return false;
+  if (!useProjectedHits_) {
+    if (trackerHitRTTI::isProjected(*hitPtr))
+      return false;
   }
 
   return true;
 }
 
-
-TrajectoryFactoryBase::MaterialEffects
-TrajectoryFactoryBase::materialEffects( const std::string & strME ) const
-{
-  if ( strME == "MultipleScattering" ) return ReferenceTrajectoryBase::multipleScattering;
-  if ( strME == "EnergyLoss" ) return ReferenceTrajectoryBase::energyLoss;
-  if ( strME == "Combined" ) return ReferenceTrajectoryBase::combined;
-  if ( strME == "None" ) return ReferenceTrajectoryBase::none;
-  if ( strME == "BreakPoints" ) return ReferenceTrajectoryBase::breakPoints;
-  if ( strME == "BrokenLines" ) return ReferenceTrajectoryBase::brokenLinesCoarse;
-  if ( strME == "BrokenLinesCoarse" ) return ReferenceTrajectoryBase::brokenLinesCoarse;
-  if ( strME == "BrokenLinesFine" ) return ReferenceTrajectoryBase::brokenLinesFine;
-  if ( strME == "LocalGBL" ) return ReferenceTrajectoryBase::localGBL;
-  if ( strME == "CurvlinGBL" ) return ReferenceTrajectoryBase::curvlinGBL;
-            
-  throw cms::Exception("BadConfig")
-    << "[TrajectoryFactoryBase::materialEffects] Unknown parameter: " << strME;
+TrajectoryFactoryBase::MaterialEffects TrajectoryFactoryBase::materialEffects(const std::string& strME) const {
+  if (strME == "MultipleScattering")
+    return ReferenceTrajectoryBase::multipleScattering;
+  if (strME == "EnergyLoss")
+    return ReferenceTrajectoryBase::energyLoss;
+  if (strME == "Combined")
+    return ReferenceTrajectoryBase::combined;
+  if (strME == "None")
+    return ReferenceTrajectoryBase::none;
+  if (strME == "BreakPoints")
+    return ReferenceTrajectoryBase::breakPoints;
+  if (strME == "BrokenLines")
+    return ReferenceTrajectoryBase::brokenLinesCoarse;
+  if (strME == "BrokenLinesCoarse")
+    return ReferenceTrajectoryBase::brokenLinesCoarse;
+  if (strME == "BrokenLinesFine")
+    return ReferenceTrajectoryBase::brokenLinesFine;
+  if (strME == "LocalGBL")
+    return ReferenceTrajectoryBase::localGBL;
+  if (strME == "CurvlinGBL")
+    return ReferenceTrajectoryBase::curvlinGBL;
+
+  throw cms::Exception("BadConfig") << "[TrajectoryFactoryBase::materialEffects] Unknown parameter: " << strME;
 }
 
+PropagationDirection TrajectoryFactoryBase::propagationDirection(const std::string& strPD) const {
+  if (strPD == "oppositeToMomentum")
+    return oppositeToMomentum;
+  if (strPD == "alongMomentum")
+    return alongMomentum;
+  if (strPD == "anyDirection")
+    return anyDirection;
 
-PropagationDirection
-TrajectoryFactoryBase::propagationDirection( const std::string & strPD ) const
-{
-  if ( strPD == "oppositeToMomentum" ) return oppositeToMomentum;
-  if ( strPD == "alongMomentum" ) return alongMomentum;
-  if ( strPD == "anyDirection" ) return anyDirection;
-
-  throw cms::Exception("BadConfig")
-    << "[TrajectoryFactoryBase::propagationDirection] Unknown parameter: " << strPD;
+  throw cms::Exception("BadConfig") << "[TrajectoryFactoryBase::propagationDirection] Unknown parameter: " << strPD;
 }
diff --git a/Alignment/ReferenceTrajectories/src/TrajectoryFactoryPlugin.cc b/Alignment/ReferenceTrajectories/src/TrajectoryFactoryPlugin.cc
index e03b064d440cc..8c7671e702c2f 100644
--- a/Alignment/ReferenceTrajectories/src/TrajectoryFactoryPlugin.cc
+++ b/Alignment/ReferenceTrajectories/src/TrajectoryFactoryPlugin.cc
@@ -1,5 +1,4 @@
 
 #include "Alignment/ReferenceTrajectories/interface/TrajectoryFactoryPlugin.h"
 
-EDM_REGISTER_PLUGINFACTORY( TrajectoryFactoryPlugin, 
-                            "TrajectoryFactoryPlugin" );
+EDM_REGISTER_PLUGINFACTORY(TrajectoryFactoryPlugin, "TrajectoryFactoryPlugin");
diff --git a/Alignment/ReferenceTrajectories/src/TwoBodyDecayTrajectory.cc b/Alignment/ReferenceTrajectories/src/TwoBodyDecayTrajectory.cc
index 94aa74959f039..b1bc46858f8ff 100644
--- a/Alignment/ReferenceTrajectories/src/TwoBodyDecayTrajectory.cc
+++ b/Alignment/ReferenceTrajectories/src/TwoBodyDecayTrajectory.cc
@@ -1,72 +1,63 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h" 
-#include "DataFormats/GeometrySurface/interface/Surface.h" 
+#include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h"
+#include "DataFormats/GeometrySurface/interface/Surface.h"
 #include "Alignment/ReferenceTrajectories/interface/TwoBodyDecayTrajectory.h"
-#include "DataFormats/CLHEP/interface/AlgebraicObjects.h" 
-#include "DataFormats/Math/interface/Error.h" 
+#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
+#include "DataFormats/Math/interface/Error.h"
 #include "Alignment/TwoBodyDecay/interface/TwoBodyDecayParameters.h"
 
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
 
-
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 
 TwoBodyDecayTrajectory::TwoBodyDecayTrajectory(const TwoBodyDecayTrajectoryState& tsos,
                                                const ConstRecHitCollection& recHits,
                                                const MagneticField* magField,
                                                const reco::BeamSpot& beamSpot,
-                                               const ReferenceTrajectoryBase::Config& config) :
-  ReferenceTrajectoryBase(
-     TwoBodyDecayParameters::dimension, recHits.first.size() + recHits.second.size(),
-     (config.materialEffects >= breakPoints) ? 2*(recHits.first.size() + recHits.second.size())-4 : 0,
-     (config.materialEffects >= breakPoints) ? 2*(recHits.first.size() + recHits.second.size())-3 : 1 ),
-  materialEffects_(config.materialEffects),
-  propDir_(config.propDir),
-  useRefittedState_(config.useRefittedState),
-  constructTsosWithErrors_(config.constructTsosWithErrors)
+                                               const ReferenceTrajectoryBase::Config& config)
+    : ReferenceTrajectoryBase(
+          TwoBodyDecayParameters::dimension,
+          recHits.first.size() + recHits.second.size(),
+          (config.materialEffects >= breakPoints) ? 2 * (recHits.first.size() + recHits.second.size()) - 4 : 0,
+          (config.materialEffects >= breakPoints) ? 2 * (recHits.first.size() + recHits.second.size()) - 3 : 1),
+      materialEffects_(config.materialEffects),
+      propDir_(config.propDir),
+      useRefittedState_(config.useRefittedState),
+      constructTsosWithErrors_(config.constructTsosWithErrors)
 
 {
-  if ( config.hitsAreReverse )
-  {
+  if (config.hitsAreReverse) {
     TransientTrackingRecHit::ConstRecHitContainer::const_reverse_iterator itRecHits;
     ConstRecHitCollection fwdRecHits;
 
-    fwdRecHits.first.reserve( recHits.first.size() );
-    for ( itRecHits = recHits.first.rbegin(); itRecHits != recHits.first.rend(); ++itRecHits )
-    {
-      fwdRecHits.first.push_back( *itRecHits );
+    fwdRecHits.first.reserve(recHits.first.size());
+    for (itRecHits = recHits.first.rbegin(); itRecHits != recHits.first.rend(); ++itRecHits) {
+      fwdRecHits.first.push_back(*itRecHits);
     }
 
-    fwdRecHits.second.reserve( recHits.second.size() );
-    for ( itRecHits = recHits.second.rbegin(); itRecHits != recHits.second.rend(); ++itRecHits )
-    {
-      fwdRecHits.second.push_back( *itRecHits );
+    fwdRecHits.second.reserve(recHits.second.size());
+    for (itRecHits = recHits.second.rbegin(); itRecHits != recHits.second.rend(); ++itRecHits) {
+      fwdRecHits.second.push_back(*itRecHits);
     }
 
     theValidityFlag = this->construct(tsos, fwdRecHits, magField, beamSpot);
-  }
-  else
-  {
+  } else {
     theValidityFlag = this->construct(tsos, recHits, magField, beamSpot);
   }
 }
 
-
-TwoBodyDecayTrajectory::TwoBodyDecayTrajectory( void )
-  : ReferenceTrajectoryBase( 0, 0, 0, 0),
-  materialEffects_(none),
-  propDir_(anyDirection),
-  useRefittedState_(false),
-  constructTsosWithErrors_(false)
-{}
-
+TwoBodyDecayTrajectory::TwoBodyDecayTrajectory(void)
+    : ReferenceTrajectoryBase(0, 0, 0, 0),
+      materialEffects_(none),
+      propDir_(anyDirection),
+      useRefittedState_(false),
+      constructTsosWithErrors_(false) {}
 
 bool TwoBodyDecayTrajectory::construct(const TwoBodyDecayTrajectoryState& state,
                                        const ConstRecHitCollection& recHits,
                                        const MagneticField* field,
-                                       const reco::BeamSpot& beamSpot)
-{  
+                                       const reco::BeamSpot& beamSpot) {
   const TwoBodyDecayTrajectoryState::TsosContainer& tsos = state.trajectoryStates(useRefittedState_);
   const TwoBodyDecayTrajectoryState::Derivatives& deriv = state.derivatives();
   double mass = state.particleMass();
@@ -83,7 +74,8 @@ bool TwoBodyDecayTrajectory::construct(const TwoBodyDecayTrajectoryState& state,
   ReferenceTrajectory trajectory1(tsos.first, recHits.first, field, beamSpot, config);
 
   // check if construction of trajectory was successful
-  if ( !trajectory1.isValid() ) return false;
+  if (!trajectory1.isValid())
+    return false;
 
   //
   // second track
@@ -91,13 +83,14 @@ bool TwoBodyDecayTrajectory::construct(const TwoBodyDecayTrajectoryState& state,
 
   ReferenceTrajectory trajectory2(tsos.second, recHits.second, field, beamSpot, config);
 
-  if ( !trajectory2.isValid() ) return false;
-  
+  if (!trajectory2.isValid())
+    return false;
+
   //
   // combine both tracks
   //
   unsigned int nLocal = deriv.first.num_row();
-  unsigned int nTbd   = deriv.first.num_col();
+  unsigned int nTbd = deriv.first.num_col();
 
   if (materialEffects_ >= localGBL) {
     // GBL trajectory inputs
@@ -105,26 +98,26 @@ bool TwoBodyDecayTrajectory::construct(const TwoBodyDecayTrajectoryState& state,
     Eigen::MatrixXd tbdToLocal1{nLocal, nTbd};
     for (unsigned int row = 0; row < nLocal; ++row) {
       for (unsigned int col = 0; col < nTbd; ++col) {
-        tbdToLocal1(row,col) = deriv.first[row][col];
+        tbdToLocal1(row, col) = deriv.first[row][col];
       }
     }
     // add first body
-    theGblInput.push_back(std::make_pair(trajectory1.gblInput().front().first, 
-                                         trajectory1.gblInput().front().second*tbdToLocal1));
+    theGblInput.push_back(
+        std::make_pair(trajectory1.gblInput().front().first, trajectory1.gblInput().front().second * tbdToLocal1));
     // convert to Eigen::MatrixXd
     Eigen::MatrixXd tbdToLocal2{nLocal, nTbd};
     for (unsigned int row = 0; row < nLocal; ++row) {
       for (unsigned int col = 0; col < nTbd; ++col) {
-        tbdToLocal2(row,col) = deriv.second[row][col];
+        tbdToLocal2(row, col) = deriv.second[row][col];
       }
     }
     // add second body
-    theGblInput.push_back(std::make_pair(trajectory2.gblInput().front().first, 
-                                         trajectory2.gblInput().front().second*tbdToLocal2));
+    theGblInput.push_back(
+        std::make_pair(trajectory2.gblInput().front().first, trajectory2.gblInput().front().second * tbdToLocal2));
     // add virtual mass measurement
-    theGblExtDerivatives.resize(1,nTbd);
+    theGblExtDerivatives.resize(1, nTbd);
     theGblExtDerivatives.setZero();
-    theGblExtDerivatives(0,TwoBodyDecayParameters::mass) = 1.0;
+    theGblExtDerivatives(0, TwoBodyDecayParameters::mass) = 1.0;
     theGblExtMeasurements.resize(1);
     theGblExtMeasurements(0) = state.primaryMass() - state.decayParameters()[TwoBodyDecayParameters::mass];
     theGblExtPrecisions.resize(1);
@@ -132,127 +125,129 @@ bool TwoBodyDecayTrajectory::construct(const TwoBodyDecayTrajectoryState& state,
     // nominal field
     theNomField = trajectory1.nominalField();
   } else {
-    unsigned int nHitMeas1     = trajectory1.numberOfHitMeas();
-    unsigned int nVirtualMeas1 = trajectory1.numberOfVirtualMeas(); 
-    unsigned int nPar1         = trajectory1.numberOfPar();
-    unsigned int nVirtualPar1  = trajectory1.numberOfVirtualPar(); 
-     
+    unsigned int nHitMeas1 = trajectory1.numberOfHitMeas();
+    unsigned int nVirtualMeas1 = trajectory1.numberOfVirtualMeas();
+    unsigned int nPar1 = trajectory1.numberOfPar();
+    unsigned int nVirtualPar1 = trajectory1.numberOfVirtualPar();
+
     // derivatives of the trajectory w.r.t. to the decay parameters
-    AlgebraicMatrix fullDeriv1 = trajectory1.derivatives().sub(1,nHitMeas1+nVirtualMeas1,1,nLocal) * trajectory1.localToTrajectory() * deriv.first;
+    AlgebraicMatrix fullDeriv1 = trajectory1.derivatives().sub(1, nHitMeas1 + nVirtualMeas1, 1, nLocal) *
+                                 trajectory1.localToTrajectory() * deriv.first;
 
-    unsigned int nHitMeas2     = trajectory2.numberOfHitMeas();
-    unsigned int nVirtualMeas2 = trajectory2.numberOfVirtualMeas();  
-    unsigned int nPar2         = trajectory2.numberOfPar();
-    unsigned int nVirtualPar2  = trajectory2.numberOfVirtualPar();
+    unsigned int nHitMeas2 = trajectory2.numberOfHitMeas();
+    unsigned int nVirtualMeas2 = trajectory2.numberOfVirtualMeas();
+    unsigned int nPar2 = trajectory2.numberOfPar();
+    unsigned int nVirtualPar2 = trajectory2.numberOfVirtualPar();
 
-    AlgebraicMatrix fullDeriv2 = trajectory2.derivatives().sub(1,nHitMeas2+nVirtualMeas2,1,nLocal) * trajectory2.localToTrajectory() * deriv.second;
+    AlgebraicMatrix fullDeriv2 = trajectory2.derivatives().sub(1, nHitMeas2 + nVirtualMeas2, 1, nLocal) *
+                                 trajectory2.localToTrajectory() * deriv.second;
 
     theNumberOfRecHits.first = recHits.first.size();
     theNumberOfRecHits.second = recHits.second.size();
 
-    theNumberOfHits = trajectory1.numberOfHits() + trajectory2.numberOfHits(); 
+    theNumberOfHits = trajectory1.numberOfHits() + trajectory2.numberOfHits();
     theNumberOfPars = nPar1 + nPar2;
     theNumberOfVirtualPars = nVirtualPar1 + nVirtualPar2;
-    theNumberOfVirtualMeas = nVirtualMeas1 + nVirtualMeas2 + 1; // add virtual mass measurement
-  
+    theNumberOfVirtualMeas = nVirtualMeas1 + nVirtualMeas2 + 1;  // add virtual mass measurement
+
     // hit measurements from trajectory 1
     int rowOffset = 1;
-    int colOffset = 1; 
-    theDerivatives.sub( rowOffset, colOffset,                fullDeriv1.sub(            1, nHitMeas1,                     1, nTbd ) );
+    int colOffset = 1;
+    theDerivatives.sub(rowOffset, colOffset, fullDeriv1.sub(1, nHitMeas1, 1, nTbd));
     colOffset += nTbd;
-    theDerivatives.sub( rowOffset, colOffset, trajectory1.derivatives().sub(            1, nHitMeas1,            nLocal + 1, nPar1 + nVirtualPar1 ) );
+    theDerivatives.sub(
+        rowOffset, colOffset, trajectory1.derivatives().sub(1, nHitMeas1, nLocal + 1, nPar1 + nVirtualPar1));
     // hit measurements from trajectory 2
     rowOffset += nHitMeas1;
-    colOffset = 1; 
-    theDerivatives.sub( rowOffset, colOffset,                fullDeriv2.sub(            1, nHitMeas2,                     1, nTbd ) );
+    colOffset = 1;
+    theDerivatives.sub(rowOffset, colOffset, fullDeriv2.sub(1, nHitMeas2, 1, nTbd));
     colOffset += (nPar1 + nVirtualPar1 + nTbd - nLocal);
-    theDerivatives.sub( rowOffset, colOffset, trajectory2.derivatives().sub(            1, nHitMeas2,            nLocal + 1, nPar2 + nVirtualPar2 ) );  
+    theDerivatives.sub(
+        rowOffset, colOffset, trajectory2.derivatives().sub(1, nHitMeas2, nLocal + 1, nPar2 + nVirtualPar2));
     // MS measurements from trajectory 1
-    rowOffset += nHitMeas2;  
-    colOffset = 1; 
-    theDerivatives.sub( rowOffset, colOffset,                fullDeriv1.sub(nHitMeas1 + 1, nHitMeas1 + nVirtualMeas1,          1, nTbd ) );  
+    rowOffset += nHitMeas2;
+    colOffset = 1;
+    theDerivatives.sub(rowOffset, colOffset, fullDeriv1.sub(nHitMeas1 + 1, nHitMeas1 + nVirtualMeas1, 1, nTbd));
     colOffset += nTbd;
-    theDerivatives.sub( rowOffset, colOffset, trajectory1.derivatives().sub(nHitMeas1 + 1, nHitMeas1 + nVirtualMeas1, nLocal + 1, nPar1 + nVirtualPar1 ) ); 
+    theDerivatives.sub(
+        rowOffset,
+        colOffset,
+        trajectory1.derivatives().sub(nHitMeas1 + 1, nHitMeas1 + nVirtualMeas1, nLocal + 1, nPar1 + nVirtualPar1));
     // MS measurements from trajectory 2
-    rowOffset += nVirtualMeas1;  
-    colOffset = 1; 
-    theDerivatives.sub( rowOffset, colOffset,                fullDeriv2.sub(nHitMeas2 + 1, nHitMeas2 + nVirtualMeas2,          1, nTbd ) );
-    colOffset += (nPar1 + nVirtualPar1 + nTbd - nLocal);  
-    theDerivatives.sub( rowOffset, colOffset, trajectory2.derivatives().sub(nHitMeas2 + 1, nHitMeas2 + nVirtualMeas2, nLocal + 1, nPar2 + nVirtualPar2 ) ); 
-        
-    theMeasurements.sub(                                         1, trajectory1.measurements().sub(            1, nHitMeas1 ) );
-    theMeasurements.sub( nHitMeas1                             + 1, trajectory2.measurements().sub(            1, nHitMeas2 ) );
-    theMeasurements.sub( nHitMeas1 + nHitMeas2                 + 1, trajectory1.measurements().sub(nHitMeas1 + 1, nHitMeas1 + nVirtualMeas1 ) );
-    theMeasurements.sub( nHitMeas1 + nHitMeas2 + nVirtualMeas1 + 1, trajectory2.measurements().sub(nHitMeas2 + 1, nHitMeas2 + nVirtualMeas2 ) );
-
-    theMeasurementsCov.sub(                                         1, trajectory1.measurementErrors().sub(            1, nHitMeas1 ) );
-    theMeasurementsCov.sub( nHitMeas1                             + 1, trajectory2.measurementErrors().sub(            1, nHitMeas2 ) );
-    theMeasurementsCov.sub( nHitMeas1 + nHitMeas2                 + 1, trajectory1.measurementErrors().sub(nHitMeas1 + 1, nHitMeas1 + nVirtualMeas1 ) );
-    theMeasurementsCov.sub( nHitMeas1 + nHitMeas2 + nVirtualMeas1 + 1, trajectory2.measurementErrors().sub(nHitMeas2 + 1, nHitMeas2 + nVirtualMeas2 ) );
-
-    theTrajectoryPositions.sub(             1, trajectory1.trajectoryPositions() );
-    theTrajectoryPositions.sub( nHitMeas1 + 1, trajectory2.trajectoryPositions() );
-
-    theTrajectoryPositionCov = state.decayParameters().covariance().similarity( theDerivatives.sub(1, nHitMeas1 + nHitMeas2, 1, 9) );
+    rowOffset += nVirtualMeas1;
+    colOffset = 1;
+    theDerivatives.sub(rowOffset, colOffset, fullDeriv2.sub(nHitMeas2 + 1, nHitMeas2 + nVirtualMeas2, 1, nTbd));
+    colOffset += (nPar1 + nVirtualPar1 + nTbd - nLocal);
+    theDerivatives.sub(
+        rowOffset,
+        colOffset,
+        trajectory2.derivatives().sub(nHitMeas2 + 1, nHitMeas2 + nVirtualMeas2, nLocal + 1, nPar2 + nVirtualPar2));
+
+    theMeasurements.sub(1, trajectory1.measurements().sub(1, nHitMeas1));
+    theMeasurements.sub(nHitMeas1 + 1, trajectory2.measurements().sub(1, nHitMeas2));
+    theMeasurements.sub(nHitMeas1 + nHitMeas2 + 1,
+                        trajectory1.measurements().sub(nHitMeas1 + 1, nHitMeas1 + nVirtualMeas1));
+    theMeasurements.sub(nHitMeas1 + nHitMeas2 + nVirtualMeas1 + 1,
+                        trajectory2.measurements().sub(nHitMeas2 + 1, nHitMeas2 + nVirtualMeas2));
+
+    theMeasurementsCov.sub(1, trajectory1.measurementErrors().sub(1, nHitMeas1));
+    theMeasurementsCov.sub(nHitMeas1 + 1, trajectory2.measurementErrors().sub(1, nHitMeas2));
+    theMeasurementsCov.sub(nHitMeas1 + nHitMeas2 + 1,
+                           trajectory1.measurementErrors().sub(nHitMeas1 + 1, nHitMeas1 + nVirtualMeas1));
+    theMeasurementsCov.sub(nHitMeas1 + nHitMeas2 + nVirtualMeas1 + 1,
+                           trajectory2.measurementErrors().sub(nHitMeas2 + 1, nHitMeas2 + nVirtualMeas2));
+
+    theTrajectoryPositions.sub(1, trajectory1.trajectoryPositions());
+    theTrajectoryPositions.sub(nHitMeas1 + 1, trajectory2.trajectoryPositions());
+
+    theTrajectoryPositionCov =
+        state.decayParameters().covariance().similarity(theDerivatives.sub(1, nHitMeas1 + nHitMeas2, 1, 9));
 
     theParameters = state.decayParameters().parameters();
 
     // add virtual mass measurement
     rowOffset += nVirtualMeas2;
-    int indMass = rowOffset-1;
+    int indMass = rowOffset - 1;
     theMeasurements[indMass] = state.primaryMass() - state.decayParameters()[TwoBodyDecayParameters::mass];
     theMeasurementsCov[indMass][indMass] = state.primaryWidth() * state.primaryWidth();
     theDerivatives[indMass][TwoBodyDecayParameters::mass] = 1.0;
   }
 
-  theRecHits.insert( theRecHits.end(), recHits.first.begin(), recHits.first.end() );
-  theRecHits.insert( theRecHits.end(), recHits.second.begin(), recHits.second.end() );
+  theRecHits.insert(theRecHits.end(), recHits.first.begin(), recHits.first.end());
+  theRecHits.insert(theRecHits.end(), recHits.second.begin(), recHits.second.end());
 
-  if (constructTsosWithErrors_)
-  {
-    constructTsosVecWithErrors( trajectory1, trajectory2, field );
-  }
-  else
-  {
-    theTsosVec.insert( theTsosVec.end(),
-		       trajectory1.trajectoryStates().begin(),
-		       trajectory1.trajectoryStates().end() );
-
-    theTsosVec.insert( theTsosVec.end(),
-		       trajectory2.trajectoryStates().begin(),
-		       trajectory2.trajectoryStates().end() );
+  if (constructTsosWithErrors_) {
+    constructTsosVecWithErrors(trajectory1, trajectory2, field);
+  } else {
+    theTsosVec.insert(theTsosVec.end(), trajectory1.trajectoryStates().begin(), trajectory1.trajectoryStates().end());
+
+    theTsosVec.insert(theTsosVec.end(), trajectory2.trajectoryStates().begin(), trajectory2.trajectoryStates().end());
   }
 
   return true;
 }
 
-
-void TwoBodyDecayTrajectory::constructTsosVecWithErrors( const ReferenceTrajectory& traj1,
-							 const ReferenceTrajectory& traj2,
-							 const MagneticField* field )
-{
+void TwoBodyDecayTrajectory::constructTsosVecWithErrors(const ReferenceTrajectory& traj1,
+                                                        const ReferenceTrajectory& traj2,
+                                                        const MagneticField* field) {
   int iTsos = 0;
 
-  std::vector< TrajectoryStateOnSurface >::const_iterator itTsos;
+  std::vector<TrajectoryStateOnSurface>::const_iterator itTsos;
 
-  for ( itTsos = traj1.trajectoryStates().begin(); itTsos != traj1.trajectoryStates().end(); itTsos++ )
-  {
-    constructSingleTsosWithErrors( *itTsos, iTsos, field );
+  for (itTsos = traj1.trajectoryStates().begin(); itTsos != traj1.trajectoryStates().end(); itTsos++) {
+    constructSingleTsosWithErrors(*itTsos, iTsos, field);
     iTsos++;
   }
 
-  for ( itTsos = traj2.trajectoryStates().begin(); itTsos != traj2.trajectoryStates().end(); itTsos++ )
-  {
-    constructSingleTsosWithErrors( *itTsos, iTsos, field );
+  for (itTsos = traj2.trajectoryStates().begin(); itTsos != traj2.trajectoryStates().end(); itTsos++) {
+    constructSingleTsosWithErrors(*itTsos, iTsos, field);
     iTsos++;
   }
 }
 
-
-void TwoBodyDecayTrajectory::constructSingleTsosWithErrors( const TrajectoryStateOnSurface& tsos,
-							    int iTsos,
-							    const MagneticField* field )
-{
+void TwoBodyDecayTrajectory::constructSingleTsosWithErrors(const TrajectoryStateOnSurface& tsos,
+                                                           int iTsos,
+                                                           const MagneticField* field) {
   AlgebraicSymMatrix55 localErrors;
   const double coeff = 1e-2;
 
@@ -261,22 +256,19 @@ void TwoBodyDecayTrajectory::constructSingleTsosWithErrors( const TrajectoryStat
 
   // rough estimate for the errors of q/p, dx/dz and dy/dz, assuming that
   // sigma(px) = sigma(py) = sigma(pz) = coeff*p.
-  float dpinv = coeff*( fabs(p.x()) + fabs(p.y()) + fabs(p.z()) )*invP*invP;
-  float dxdir = coeff*( fabs(p.x()) + fabs(p.z()) )/p.z()/p.z();
-  float dydir = coeff*( fabs(p.y()) + fabs(p.z()) )/p.z()/p.z();
-  localErrors[0][0] = dpinv*dpinv;
-  localErrors[1][1] = dxdir*dxdir;
-  localErrors[2][2] = dydir*dydir;
+  float dpinv = coeff * (fabs(p.x()) + fabs(p.y()) + fabs(p.z())) * invP * invP;
+  float dxdir = coeff * (fabs(p.x()) + fabs(p.z())) / p.z() / p.z();
+  float dydir = coeff * (fabs(p.y()) + fabs(p.z())) / p.z() / p.z();
+  localErrors[0][0] = dpinv * dpinv;
+  localErrors[1][1] = dxdir * dxdir;
+  localErrors[2][2] = dydir * dydir;
 
   // exact values for the errors on local x and y
-  localErrors[3][3] = theTrajectoryPositionCov[nMeasPerHit*iTsos][nMeasPerHit*iTsos];
-  localErrors[3][4] = theTrajectoryPositionCov[nMeasPerHit*iTsos][nMeasPerHit*iTsos+1];
-  localErrors[4][4] = theTrajectoryPositionCov[nMeasPerHit*iTsos+1][nMeasPerHit*iTsos+1];
+  localErrors[3][3] = theTrajectoryPositionCov[nMeasPerHit * iTsos][nMeasPerHit * iTsos];
+  localErrors[3][4] = theTrajectoryPositionCov[nMeasPerHit * iTsos][nMeasPerHit * iTsos + 1];
+  localErrors[4][4] = theTrajectoryPositionCov[nMeasPerHit * iTsos + 1][nMeasPerHit * iTsos + 1];
 
   // construct tsos with local errors
-  theTsosVec[iTsos] =  TrajectoryStateOnSurface( tsos.localParameters(),
-						 LocalTrajectoryError( localErrors ),
-						 tsos.surface(),
-						 field,
-						 tsos.surfaceSide() );
+  theTsosVec[iTsos] = TrajectoryStateOnSurface(
+      tsos.localParameters(), LocalTrajectoryError(localErrors), tsos.surface(), field, tsos.surfaceSide());
 }
diff --git a/Alignment/ReferenceTrajectories/src/TwoBodyDecayTrajectoryState.cc b/Alignment/ReferenceTrajectories/src/TwoBodyDecayTrajectoryState.cc
index bd1cee9d5ba1b..7e8531139d595 100644
--- a/Alignment/ReferenceTrajectories/src/TwoBodyDecayTrajectoryState.cc
+++ b/Alignment/ReferenceTrajectories/src/TwoBodyDecayTrajectoryState.cc
@@ -1,6 +1,6 @@
 
 #include "Alignment/ReferenceTrajectories/interface/TwoBodyDecayTrajectoryState.h"
-#include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h" 
+#include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h"
 
 #include "Alignment/TwoBodyDecay/interface/TwoBodyDecayModel.h"
 #include "Alignment/TwoBodyDecay/interface/TwoBodyDecayDerivatives.h"
@@ -17,137 +17,120 @@
 
 using namespace std;
 
-
-TwoBodyDecayTrajectoryState::TwoBodyDecayTrajectoryState( const TsosContainer & tsos,
-							  const TwoBodyDecay & tbd,
-							  double particleMass,
-							  const MagneticField* magField,
-							  bool propagateErrors )
-  : theValidityFlag( false ),
-    theParticleMass( particleMass ),
-    theParameters( tbd.decayParameters() ),
-    theDerivatives( AlgebraicMatrix( nLocalParam, nDecayParam ), AlgebraicMatrix( nLocalParam, nDecayParam ) ),
-    theOriginalTsos( tsos ),
-    thePrimaryMass( tbd.primaryMass() ),
-    thePrimaryWidth( tbd.primaryWidth() )
-{
-  construct( magField, propagateErrors );
+TwoBodyDecayTrajectoryState::TwoBodyDecayTrajectoryState(const TsosContainer& tsos,
+                                                         const TwoBodyDecay& tbd,
+                                                         double particleMass,
+                                                         const MagneticField* magField,
+                                                         bool propagateErrors)
+    : theValidityFlag(false),
+      theParticleMass(particleMass),
+      theParameters(tbd.decayParameters()),
+      theDerivatives(AlgebraicMatrix(nLocalParam, nDecayParam), AlgebraicMatrix(nLocalParam, nDecayParam)),
+      theOriginalTsos(tsos),
+      thePrimaryMass(tbd.primaryMass()),
+      thePrimaryWidth(tbd.primaryWidth()) {
+  construct(magField, propagateErrors);
 }
 
-
-void TwoBodyDecayTrajectoryState::rescaleError( double scale )
-{
-  theOriginalTsos.first.rescaleError( scale );
-  theOriginalTsos.second.rescaleError( scale );
-  theRefittedTsos.first.rescaleError( scale );
-  theRefittedTsos.second.rescaleError( scale );
+void TwoBodyDecayTrajectoryState::rescaleError(double scale) {
+  theOriginalTsos.first.rescaleError(scale);
+  theOriginalTsos.second.rescaleError(scale);
+  theRefittedTsos.first.rescaleError(scale);
+  theRefittedTsos.second.rescaleError(scale);
 }
 
-
-void TwoBodyDecayTrajectoryState::construct( const MagneticField* magField,
-					     bool propagateErrors )
-{
+void TwoBodyDecayTrajectoryState::construct(const MagneticField* magField, bool propagateErrors) {
   // construct global trajectory parameters at the starting point
-  TwoBodyDecayModel tbdDecayModel( theParameters[TwoBodyDecayParameters::mass], theParticleMass );
-  pair< AlgebraicVector, AlgebraicVector > secondaryMomenta = tbdDecayModel.cartesianSecondaryMomenta( theParameters );
+  TwoBodyDecayModel tbdDecayModel(theParameters[TwoBodyDecayParameters::mass], theParticleMass);
+  pair<AlgebraicVector, AlgebraicVector> secondaryMomenta = tbdDecayModel.cartesianSecondaryMomenta(theParameters);
 
-  GlobalPoint vtx( theParameters[TwoBodyDecayParameters::x],
-		   theParameters[TwoBodyDecayParameters::y],
-		   theParameters[TwoBodyDecayParameters::z] );
+  GlobalPoint vtx(theParameters[TwoBodyDecayParameters::x],
+                  theParameters[TwoBodyDecayParameters::y],
+                  theParameters[TwoBodyDecayParameters::z]);
 
-  GlobalVector p1( secondaryMomenta.first[0],
-		   secondaryMomenta.first[1],
-		   secondaryMomenta.first[2] );
+  GlobalVector p1(secondaryMomenta.first[0], secondaryMomenta.first[1], secondaryMomenta.first[2]);
 
-  GlobalVector p2( secondaryMomenta.second[0],
-		   secondaryMomenta.second[1],
-		   secondaryMomenta.second[2] );
+  GlobalVector p2(secondaryMomenta.second[0], secondaryMomenta.second[1], secondaryMomenta.second[2]);
 
-  GlobalTrajectoryParameters gtp1( vtx, p1, theOriginalTsos.first.charge(), magField );
-  FreeTrajectoryState fts1( gtp1 );
+  GlobalTrajectoryParameters gtp1(vtx, p1, theOriginalTsos.first.charge(), magField);
+  FreeTrajectoryState fts1(gtp1);
 
-  GlobalTrajectoryParameters gtp2( vtx, p2, theOriginalTsos.second.charge(), magField );
-  FreeTrajectoryState fts2( gtp2 );
+  GlobalTrajectoryParameters gtp2(vtx, p2, theOriginalTsos.second.charge(), magField);
+  FreeTrajectoryState fts2(gtp2);
 
   // contruct derivatives at the starting point
-  TwoBodyDecayDerivatives tbdDerivatives( theParameters[TwoBodyDecayParameters::mass], theParticleMass );
-  pair< AlgebraicMatrix, AlgebraicMatrix > derivatives = tbdDerivatives.derivatives( theParameters );
+  TwoBodyDecayDerivatives tbdDerivatives(theParameters[TwoBodyDecayParameters::mass], theParticleMass);
+  pair<AlgebraicMatrix, AlgebraicMatrix> derivatives = tbdDerivatives.derivatives(theParameters);
 
-  AlgebraicMatrix deriv1( 6, 9, 0 );
-  deriv1.sub( 1, 1, AlgebraicMatrix( 3, 3, 1 ) );
-  deriv1.sub( 4, 4, derivatives.first );
+  AlgebraicMatrix deriv1(6, 9, 0);
+  deriv1.sub(1, 1, AlgebraicMatrix(3, 3, 1));
+  deriv1.sub(4, 4, derivatives.first);
 
-  AlgebraicMatrix deriv2( 6, 9, 0 );
-  deriv2.sub( 1, 1, AlgebraicMatrix( 3, 3, 1 ) );
-  deriv2.sub( 4, 4, derivatives.second );
+  AlgebraicMatrix deriv2(6, 9, 0);
+  deriv2.sub(1, 1, AlgebraicMatrix(3, 3, 1));
+  deriv2.sub(4, 4, derivatives.second);
 
   // compute errors of initial states
-  if ( propagateErrors ) {
-    setError( fts1, deriv1 );
-    setError( fts2, deriv2 );
+  if (propagateErrors) {
+    setError(fts1, deriv1);
+    setError(fts2, deriv2);
   }
 
-
   // propgate states and derivatives from the starting points to the end points
-  bool valid1 = propagateSingleState( fts1, gtp1, deriv1, theOriginalTsos.first.surface(),
-				      magField, theRefittedTsos.first, theDerivatives.first );
+  bool valid1 = propagateSingleState(
+      fts1, gtp1, deriv1, theOriginalTsos.first.surface(), magField, theRefittedTsos.first, theDerivatives.first);
 
-  bool valid2 = propagateSingleState( fts2, gtp2, deriv2, theOriginalTsos.second.surface(),
-				      magField, theRefittedTsos.second, theDerivatives.second );
+  bool valid2 = propagateSingleState(
+      fts2, gtp2, deriv2, theOriginalTsos.second.surface(), magField, theRefittedTsos.second, theDerivatives.second);
 
   theValidityFlag = valid1 && valid2;
 
   return;
 }
 
-
-bool TwoBodyDecayTrajectoryState::propagateSingleState( const FreeTrajectoryState & fts,
-							const GlobalTrajectoryParameters & gtp,
-							const AlgebraicMatrix & startDeriv,
-							const Surface & surface,
-							const MagneticField* magField,
-							TrajectoryStateOnSurface & tsos,
-							AlgebraicMatrix & endDeriv ) const
-{
-  AnalyticalPropagator propagator( magField );
+bool TwoBodyDecayTrajectoryState::propagateSingleState(const FreeTrajectoryState& fts,
+                                                       const GlobalTrajectoryParameters& gtp,
+                                                       const AlgebraicMatrix& startDeriv,
+                                                       const Surface& surface,
+                                                       const MagneticField* magField,
+                                                       TrajectoryStateOnSurface& tsos,
+                                                       AlgebraicMatrix& endDeriv) const {
+  AnalyticalPropagator propagator(magField);
 
   // propagate state
-  pair< TrajectoryStateOnSurface, double > tsosWithPath = propagator.propagateWithPath( fts, surface );
+  pair<TrajectoryStateOnSurface, double> tsosWithPath = propagator.propagateWithPath(fts, surface);
 
   // check if propagation was successful
-  if ( !tsosWithPath.first.isValid() ) return false;
+  if (!tsosWithPath.first.isValid())
+    return false;
 
   // jacobian for transformation from cartesian to curvilinear frame at the starting point
-  JacobianCartesianToCurvilinear cartToCurv( gtp );
+  JacobianCartesianToCurvilinear cartToCurv(gtp);
   const AlgebraicMatrix56& matCartToCurv = cartToCurv.jacobian();
 
   // jacobian in curvilinear frame for propagation from the starting point to the end point
-  AnalyticalCurvilinearJacobian curvJac( gtp, tsosWithPath.first.globalPosition(),
-					 tsosWithPath.first.globalMomentum(),
-					 tsosWithPath.second );
+  AnalyticalCurvilinearJacobian curvJac(
+      gtp, tsosWithPath.first.globalPosition(), tsosWithPath.first.globalMomentum(), tsosWithPath.second);
   const AlgebraicMatrix55& matCurvJac = curvJac.jacobian();
 
   // jacobian for transformation from curvilinear to local frame at the end point
-  JacobianCurvilinearToLocal curvToLoc( surface, tsosWithPath.first.localParameters(), *magField );
+  JacobianCurvilinearToLocal curvToLoc(surface, tsosWithPath.first.localParameters(), *magField);
   const AlgebraicMatrix55& matCurvToLoc = curvToLoc.jacobian();
 
-  AlgebraicMatrix56 tmpDeriv = matCurvToLoc*matCurvJac*matCartToCurv;
-  AlgebraicMatrix hepMatDeriv( asHepMatrix( tmpDeriv ) );
+  AlgebraicMatrix56 tmpDeriv = matCurvToLoc * matCurvJac * matCartToCurv;
+  AlgebraicMatrix hepMatDeriv(asHepMatrix(tmpDeriv));
   //AlgebraicMatrix hepMatDeriv = asHepMatrix< 5, 6 >( tmpDeriv );
 
   // replace original state with new state
   tsos = tsosWithPath.first;
 
   // propagate derivative matrix
-  endDeriv = hepMatDeriv*startDeriv;
+  endDeriv = hepMatDeriv * startDeriv;
 
   return true;
 }
 
-
-void TwoBodyDecayTrajectoryState::setError( FreeTrajectoryState& fts,
-					    AlgebraicMatrix& derivative ) const
-{
-  AlgebraicSymMatrix ftsCartesianError( theParameters.covariance().similarity( derivative ) );
-  fts.setCartesianError( asSMatrix<6>( ftsCartesianError ) );
+void TwoBodyDecayTrajectoryState::setError(FreeTrajectoryState& fts, AlgebraicMatrix& derivative) const {
+  AlgebraicSymMatrix ftsCartesianError(theParameters.covariance().similarity(derivative));
+  fts.setCartesianError(asSMatrix<6>(ftsCartesianError));
 }
diff --git a/Alignment/SurveyAnalysis/interface/Chi2.h b/Alignment/SurveyAnalysis/interface/Chi2.h
index 10f71fbe83b37..71c5cef50696e 100644
--- a/Alignment/SurveyAnalysis/interface/Chi2.h
+++ b/Alignment/SurveyAnalysis/interface/Chi2.h
@@ -7,33 +7,28 @@
  *  \author Pablo Martinez Ruiz del Arbol
  */
 
-
 #ifndef Alignment_SurveyAnalysis_Chi2_H
 #define Alignment_SurveyAnalysis_Chi2_H
 
 #include "TMatrixD.h"
 
-
 class Chi2 {
-
- public:
+public:
   Chi2(TMatrixD &, TMatrixD &, TMatrixD &);
   ~Chi2();
-  
-  TMatrixD & getCovariance();
-  TMatrixD & getSolution();
+
+  TMatrixD &getCovariance();
+  TMatrixD &getSolution();
   double getChi2();
   int getDOF();
-  
- private:
-  
+
+private:
   double myChi2;
   int dof;
   TMatrixD covariance;
   TMatrixD leftMatrix;
   TMatrixD rightMatrix;
   TMatrixD solution;
-
 };
 
 #endif
diff --git a/Alignment/SurveyAnalysis/interface/DTSurvey.h b/Alignment/SurveyAnalysis/interface/DTSurvey.h
index 01220d1a55dfa..2f268642f2051 100644
--- a/Alignment/SurveyAnalysis/interface/DTSurvey.h
+++ b/Alignment/SurveyAnalysis/interface/DTSurvey.h
@@ -9,8 +9,6 @@
  *  \author Pablo Martinez Ruiz del Arbol
  */
 
-
-
 #ifndef Alignment_SurveyAnalysis_DTSurvey_H
 #define Alignment_SurveyAnalysis_DTSurvey_H
 
@@ -19,40 +17,39 @@
 class DTGeometry;
 class DTSurveyChamber;
 
-namespace edm { template<class> class ESHandle; }
+namespace edm {
+  template <class>
+  class ESHandle;
+}
 
 class DTSurvey {
-
-  
- public:
-  DTSurvey(const std::string&, const std::string&, int);
+public:
+  DTSurvey(const std::string &, const std::string &, int);
   ~DTSurvey();
- 
+
   void ReadChambers(edm::ESHandle<DTGeometry>);
   void CalculateChambers();
 
-  const DTSurveyChamber * getChamber(int, int) const;
+  const DTSurveyChamber *getChamber(int, int) const;
 
   int getId() const { return id; }
 
   //void ToDB(MuonAlignment *);
- 
-  private:
+
+private:
   void FillWheelInfo();
 
   std::string nameOfWheelInfoFile, nameOfChamberInfoFile;
-  int id; 
-  
+  int id;
+
   //This is the displacement (vector) and rotation (matrix) for the wheel
   float OffsetZ;
   TMatrixD delta;
-  TMatrixD Rot; 
+  TMatrixD Rot;
 
   DTSurveyChamber ***chambers;
-  
 };
 
-
-std::ostream &operator<<(std::ostream &, const DTSurvey&);
+std::ostream &operator<<(std::ostream &, const DTSurvey &);
 
 #endif
diff --git a/Alignment/SurveyAnalysis/interface/DTSurveyChamber.h b/Alignment/SurveyAnalysis/interface/DTSurveyChamber.h
index b59fb44f5c3cb..bb9a2056b3205 100644
--- a/Alignment/SurveyAnalysis/interface/DTSurveyChamber.h
+++ b/Alignment/SurveyAnalysis/interface/DTSurveyChamber.h
@@ -8,77 +8,65 @@
  *  \author Pablo Martinez Ruiz del Arbol
  */
 
-
 #ifndef Alignment_SurveyAnalysis_DTSurveyChamber_H
 #define Alignment_SurveyAnalysis_DTSurveyChamber_H
 
 #include <vector>
 
 #include "TMath.h"
-#include "TMatrixD.h" 
+#include "TMatrixD.h"
 
 class DTSurveyChamber {
-  
-  
- public:
-
+public:
   DTSurveyChamber(int, int, int, long);
-  
 
   //Add a point to the Chamber
-  void addPoint(int, const TMatrixD&, const TMatrixD&, const TMatrixD&);
-  
+  void addPoint(int, const TMatrixD &, const TMatrixD &, const TMatrixD &);
+
   //Begin the chi2 computation
   int getNumberPoints() const { return pointNumber; }
   void compute();
-  void printChamberInfo(); 
-  long getId() const {return rawId;}
-  float getDeltaX() const {return Solution(0,0);}
-  float getDeltaY() const {return Solution(1,0);}
-  float getDeltaZ() const {return Solution(2,0);}
-  //My definition of the matrix rotation is not the same as the used in CMSSW  
-  float getAlpha() const {return Solution(5,0);}
-  float getBeta() const {return -1.0*Solution(4,0);}
-  float getGamma() const {return Solution(3,0);}
-  float getDeltaXError() const {return TMath::Sqrt(Covariance(0,0));}
-  float getDeltaYError() const {return TMath::Sqrt(Covariance(1,1));}
-  float getDeltaZError() const {return TMath::Sqrt(Covariance(2,2));}
-  float getAlphaError() const {return TMath::Sqrt(Covariance(5,5));}
-  float getBetaError() const {return TMath::Sqrt(Covariance(4,4));}
-  float getGammaError() const {return TMath::Sqrt(Covariance(3,3));}
-
- 
- private:
-
-//   static const unsigned int MAX_PUNTOS = 16;
-
-  TMatrixD & makeMatrix();
-  TMatrixD & makeErrors();
-  TMatrixD & makeVector();
+  void printChamberInfo();
+  long getId() const { return rawId; }
+  float getDeltaX() const { return Solution(0, 0); }
+  float getDeltaY() const { return Solution(1, 0); }
+  float getDeltaZ() const { return Solution(2, 0); }
+  //My definition of the matrix rotation is not the same as the used in CMSSW
+  float getAlpha() const { return Solution(5, 0); }
+  float getBeta() const { return -1.0 * Solution(4, 0); }
+  float getGamma() const { return Solution(3, 0); }
+  float getDeltaXError() const { return TMath::Sqrt(Covariance(0, 0)); }
+  float getDeltaYError() const { return TMath::Sqrt(Covariance(1, 1)); }
+  float getDeltaZError() const { return TMath::Sqrt(Covariance(2, 2)); }
+  float getAlphaError() const { return TMath::Sqrt(Covariance(5, 5)); }
+  float getBetaError() const { return TMath::Sqrt(Covariance(4, 4)); }
+  float getGammaError() const { return TMath::Sqrt(Covariance(3, 3)); }
+
+private:
+  //   static const unsigned int MAX_PUNTOS = 16;
+
+  TMatrixD &makeMatrix();
+  TMatrixD &makeErrors();
+  TMatrixD &makeVector();
 
-  
   //Identifiers
   int wheel, station, sector;
-  
-  long rawId;
 
+  long rawId;
 
   //Points data
   std::vector<TMatrixD> points;
   std::vector<TMatrixD> pointsDiff;
   std::vector<TMatrixD> pointsError;
   std::vector<TMatrixD> pointsTheoretical;
-  
+
   TMatrixD Solution;
   TMatrixD Covariance;
-   
+
   //Number of points
   int pointNumber;
-  
 };
 
-std::ostream & operator<<(std::ostream &, const DTSurveyChamber&);
-
-
+std::ostream &operator<<(std::ostream &, const DTSurveyChamber &);
 
 #endif
diff --git a/Alignment/SurveyAnalysis/interface/SurveyAlignment.h b/Alignment/SurveyAnalysis/interface/SurveyAlignment.h
index f767b2e2cfd54..171587a11070e 100644
--- a/Alignment/SurveyAnalysis/interface/SurveyAlignment.h
+++ b/Alignment/SurveyAnalysis/interface/SurveyAlignment.h
@@ -13,33 +13,24 @@
 #include "Alignment/CommonAlignment/interface/StructureType.h"
 #include "Alignment/CommonAlignment/interface/Utilities.h"
 
-class SurveyAlignment
-{
-  protected:
-
-  public:
-
+class SurveyAlignment {
+protected:
+public:
   /// Constructor to set the sensors and residual levels.
-  SurveyAlignment(
-		  const align::Alignables& sensors,
-		  const std::vector<align::StructureType>& levels
-		  );
+  SurveyAlignment(const align::Alignables& sensors, const std::vector<align::StructureType>& levels);
 
   virtual ~SurveyAlignment() {}
 
   /// Run the iteration: find residuals, write to output, shift sensors.
-  void iterate(
-	       unsigned int nIteration,     // number of iterations
-	       const std::string& fileName, // name of output file
-	       bool bias = false            // true for biased residuals
-	       );
-
-  protected:
+  void iterate(unsigned int nIteration,      // number of iterations
+               const std::string& fileName,  // name of output file
+               bool bias = false             // true for biased residuals
+  );
 
+protected:
   /// Find the alignment parameters for all sensors.
-  virtual void findAlignPars(
-			     bool bias = false // true for biased residuals
-			     ) = 0;
+  virtual void findAlignPars(bool bias = false  // true for biased residuals
+                             ) = 0;
 
   /// Apply the alignment parameters to all sensors.
   virtual void shiftSensors();
diff --git a/Alignment/SurveyAnalysis/interface/SurveyAlignmentPoints.h b/Alignment/SurveyAnalysis/interface/SurveyAlignmentPoints.h
index d518466b41af5..9ce4b41c0cdab 100644
--- a/Alignment/SurveyAnalysis/interface/SurveyAlignmentPoints.h
+++ b/Alignment/SurveyAnalysis/interface/SurveyAlignmentPoints.h
@@ -15,23 +15,15 @@
 
 #include "Alignment/SurveyAnalysis/interface/SurveyAlignment.h"
 
-class SurveyAlignmentPoints:
-  public SurveyAlignment
-{
-  public:
-
+class SurveyAlignmentPoints : public SurveyAlignment {
+public:
   /// Constructor to set the sensors and residual levels in base class.
-  SurveyAlignmentPoints(
-			const align::Alignables& sensors,
-			const std::vector<align::StructureType>& levels
-			);
-
-  protected:
+  SurveyAlignmentPoints(const align::Alignables& sensors, const std::vector<align::StructureType>& levels);
 
+protected:
   /// Find the alignment parameters for all sensors.
-  void findAlignPars(
-			     bool bias = false // true for biased residuals
-			     ) override;
+  void findAlignPars(bool bias = false  // true for biased residuals
+                     ) override;
 };
 
 #endif
diff --git a/Alignment/SurveyAnalysis/interface/SurveyAlignmentSensor.h b/Alignment/SurveyAnalysis/interface/SurveyAlignmentSensor.h
index 9b61f30707f67..52da8d2f40acf 100644
--- a/Alignment/SurveyAnalysis/interface/SurveyAlignmentSensor.h
+++ b/Alignment/SurveyAnalysis/interface/SurveyAlignmentSensor.h
@@ -15,23 +15,15 @@
 
 #include "Alignment/SurveyAnalysis/interface/SurveyAlignment.h"
 
-class SurveyAlignmentSensor:
-  public SurveyAlignment
-{
-  public:
-
+class SurveyAlignmentSensor : public SurveyAlignment {
+public:
   /// Constructor to set the sensors and residual levels in base class.
-  SurveyAlignmentSensor(
-			const align::Alignables& sensors,
-			const std::vector<align::StructureType>& levels
-			);
-
-  protected:
+  SurveyAlignmentSensor(const align::Alignables& sensors, const std::vector<align::StructureType>& levels);
 
+protected:
   /// Find the alignment parameters for all sensors.
-  void findAlignPars(
-			     bool bias = false // true for biased residuals
-			     ) override;
+  void findAlignPars(bool bias = false  // true for biased residuals
+                     ) override;
 };
 
 #endif
diff --git a/Alignment/SurveyAnalysis/interface/SurveyDataReader.h b/Alignment/SurveyAnalysis/interface/SurveyDataReader.h
index be745983319c3..5fc60ef6baf90 100644
--- a/Alignment/SurveyAnalysis/interface/SurveyDataReader.h
+++ b/Alignment/SurveyAnalysis/interface/SurveyDataReader.h
@@ -12,29 +12,24 @@
 
 class TrackerTopology;
 
-class SurveyDataReader
-{
-
+class SurveyDataReader {
 public:
+  typedef std::map<align::ID, align::Scalars> MapType;
+  typedef std::pair<align::ID, align::Scalars> PairType;
+  typedef std::map<std::vector<int>, align::Scalars> MapTypeOr;
+  typedef std::pair<std::vector<int>, align::Scalars> PairTypeOr;
 
-  typedef std::map<align::ID, align::Scalars >  MapType;
-  typedef std::pair<align::ID,align::Scalars > PairType;
-  typedef std::map< std::vector<int>, align::Scalars > MapTypeOr;
-  typedef std::pair< std::vector<int>, align::Scalars > PairTypeOr;
-  
   /// Read given text file
-  void readFile( const std::string& textFileName, const std::string& fileType, const TrackerTopology* tTopo);
-  align::Scalars convertToAlignableCoord( const align::Scalars& align_params );
+  void readFile(const std::string& textFileName, const std::string& fileType, const TrackerTopology* tTopo);
+  align::Scalars convertToAlignableCoord(const align::Scalars& align_params);
 
   // Returns the Map
   const MapType& detIdMap() const { return theMap; }
   const MapTypeOr& surveyMap() const { return theOriginalMap; }
 
 private:
-
   MapType theMap;
   MapTypeOr theOriginalMap;
-
 };
 
 #endif
diff --git a/Alignment/SurveyAnalysis/interface/SurveyInputBase.h b/Alignment/SurveyAnalysis/interface/SurveyInputBase.h
index 35f0f780e5f86..cb2caa1d21ede 100644
--- a/Alignment/SurveyAnalysis/interface/SurveyInputBase.h
+++ b/Alignment/SurveyAnalysis/interface/SurveyInputBase.h
@@ -14,43 +14,30 @@
 
 class Alignable;
 
-class SurveyInputBase:
-  public edm::EDAnalyzer
-{
-  public:
-
+class SurveyInputBase : public edm::EDAnalyzer {
+public:
   ~SurveyInputBase() override;
 
   /// Read data from input.
   void beginJob() override { theFirstEvent = true; }
 
   /// Do nothing for each event.
-  void analyze(
-		       const edm::Event&,
-		       const edm::EventSetup&
-		       ) override = 0;
+  void analyze(const edm::Event&, const edm::EventSetup&) override = 0;
 
   /// Get alignable detector as read from input.
   inline static Alignable* detector();
 
   /// Add a component or sub-system to the detector.
   /// Class will own component (takes care of deleting the pointer).
-  static void addComponent(
-			   Alignable*
-			   );
-
-  protected:
+  static void addComponent(Alignable*);
 
+protected:
   bool theFirstEvent;
 
-  private:
-
-  static Alignable* theDetector; // only one detector
+private:
+  static Alignable* theDetector;  // only one detector
 };
 
-Alignable* SurveyInputBase::detector()
-{
-  return theDetector;
-}
+Alignable* SurveyInputBase::detector() { return theDetector; }
 
 #endif
diff --git a/Alignment/SurveyAnalysis/interface/SurveyInputTextReader.h b/Alignment/SurveyAnalysis/interface/SurveyInputTextReader.h
index ff7cd3fd53882..9bf9e994a1a05 100644
--- a/Alignment/SurveyAnalysis/interface/SurveyInputTextReader.h
+++ b/Alignment/SurveyAnalysis/interface/SurveyInputTextReader.h
@@ -15,27 +15,23 @@
 #include "Alignment/CommonAlignment/interface/StructureType.h"
 #include "Alignment/CommonAlignment/interface/Utilities.h"
 
-class SurveyInputTextReader
-{
+class SurveyInputTextReader {
 public:
-
   typedef std::pair<align::ID, align::StructureType> UniqueId;
 
   typedef std::map<UniqueId, align::Scalars> MapType;
   typedef std::pair<UniqueId, align::Scalars> PairType;
 
   /// Read given text file
-  void readFile( const std::string& textFileName );
+  void readFile(const std::string& textFileName);
 
   // Returns the Map
   const MapType& UniqueIdMap() const { return theMap; }
 
 private:
-	
   MapType theMap;
 
-  static const int NINPUTS = 27; // Not including DetId
-	
+  static const int NINPUTS = 27;  // Not including DetId
 };
 
 #endif
diff --git a/Alignment/SurveyAnalysis/interface/SurveyOutput.h b/Alignment/SurveyAnalysis/interface/SurveyOutput.h
index 44999bf43f976..ebda51b245c7c 100644
--- a/Alignment/SurveyAnalysis/interface/SurveyOutput.h
+++ b/Alignment/SurveyAnalysis/interface/SurveyOutput.h
@@ -18,21 +18,15 @@
 
 class Alignable;
 
-class SurveyOutput
-{
-  public:
-
-  SurveyOutput(const align::Alignables&,
-	       const std::string& fileName
-	       );
+class SurveyOutput {
+public:
+  SurveyOutput(const align::Alignables&, const std::string& fileName);
 
   /// write out variables
-  void write(
-	     unsigned int iter // iteration number
-	     );
-
-  private:
+  void write(unsigned int iter  // iteration number
+  );
 
+private:
   const align::Alignables& theAlignables;
 
   TFile theFile;
diff --git a/Alignment/SurveyAnalysis/interface/SurveyParameters.h b/Alignment/SurveyAnalysis/interface/SurveyParameters.h
index fd302b30aed25..43415d6fe1a23 100644
--- a/Alignment/SurveyAnalysis/interface/SurveyParameters.h
+++ b/Alignment/SurveyAnalysis/interface/SurveyParameters.h
@@ -14,47 +14,27 @@
 
 #include "Alignment/CommonAlignment/interface/AlignmentParameters.h"
 
-class SurveyParameters:
-  public AlignmentParameters
-{
-  public:
-
+class SurveyParameters : public AlignmentParameters {
+public:
   /// Set the alignable, parameters, covariance in base class.
   /// No user variables, default is all parameters are selected and valid.
-  SurveyParameters(
-		   Alignable*,
-		   const AlgebraicVector& par,
-		   const AlgebraicSymMatrix& cov
-		   );
+  SurveyParameters(Alignable*, const AlgebraicVector& par, const AlgebraicSymMatrix& cov);
 
   /// apply not implemented
   void apply() override;
   int type() const override;
 
   /// Cloning not implemented.
-  AlignmentParameters* clone(
-				     const AlgebraicVector&,
-                                     const AlgebraicSymMatrix&
-				     ) const override;
+  AlignmentParameters* clone(const AlgebraicVector&, const AlgebraicSymMatrix&) const override;
 
   /// Cloning not implemented.
-  AlignmentParameters* cloneFromSelected(
-						 const AlgebraicVector&,
-                                                 const AlgebraicSymMatrix&
-						 ) const override;
+  AlignmentParameters* cloneFromSelected(const AlgebraicVector&, const AlgebraicSymMatrix&) const override;
 
   /// Derivatives not implemented.
-  AlgebraicMatrix derivatives(
-				      const TrajectoryStateOnSurface&,
-				      const AlignableDetOrUnitPtr&
-				      ) const override;
+  AlgebraicMatrix derivatives(const TrajectoryStateOnSurface&, const AlignableDetOrUnitPtr&) const override;
 
   /// Derivatives not implemented.
-  AlgebraicMatrix selectedDerivatives(
-					      const TrajectoryStateOnSurface&,
-					      const AlignableDetOrUnitPtr&
-					      ) const override;
-
+  AlgebraicMatrix selectedDerivatives(const TrajectoryStateOnSurface&, const AlignableDetOrUnitPtr&) const override;
 };
 
 #endif
diff --git a/Alignment/SurveyAnalysis/interface/SurveyPxbDicer.h b/Alignment/SurveyAnalysis/interface/SurveyPxbDicer.h
index 214503e2b3e7b..8e6fa74672304 100644
--- a/Alignment/SurveyAnalysis/interface/SurveyPxbDicer.h
+++ b/Alignment/SurveyAnalysis/interface/SurveyPxbDicer.h
@@ -18,61 +18,59 @@
 
 //! Class to dice a picture from a given set of fiducial points
 //! This class has its use for toy MC simulations to validate the PXB survey
-class SurveyPxbDicer
-{
+class SurveyPxbDicer {
 public:
-	typedef SurveyPxbImage::coord_t coord_t;
-	typedef double value_t;
-	typedef std::vector<coord_t> fidpoint_t;
-	typedef unsigned int count_t;
-	typedef SurveyPxbImage::id_t id_t;
-	typedef std::pair<id_t,id_t> idPair_t;
+  typedef SurveyPxbImage::coord_t coord_t;
+  typedef double value_t;
+  typedef std::vector<coord_t> fidpoint_t;
+  typedef unsigned int count_t;
+  typedef SurveyPxbImage::id_t id_t;
+  typedef std::pair<id_t, id_t> idPair_t;
 
-	// Constructors
-	SurveyPxbDicer() {};
-	// Constructor from VPSet
-	SurveyPxbDicer(const std::vector<edm::ParameterSet>& pars, unsigned int seed);
+  // Constructors
+  SurveyPxbDicer(){};
+  // Constructor from VPSet
+  SurveyPxbDicer(const std::vector<edm::ParameterSet> &pars, unsigned int seed);
 
-	//! Invoke the dicer
-	//! \param fidpointvec vector with fiducial points where values need to be diced for and transformed to the photo fram
-	//! \param idPair pair of the id values
-	std::string doDice(const fidpoint_t &fidpointvec, const idPair_t &id, const bool rotate=false);
-	void doDice(const fidpoint_t &fidpointvec, const idPair_t &id, std::ofstream &outfile, const bool rotate=false);
+  //! Invoke the dicer
+  //! \param fidpointvec vector with fiducial points where values need to be diced for and transformed to the photo fram
+  //! \param idPair pair of the id values
+  std::string doDice(const fidpoint_t &fidpointvec, const idPair_t &id, const bool rotate = false);
+  void doDice(const fidpoint_t &fidpointvec, const idPair_t &id, std::ofstream &outfile, const bool rotate = false);
 
 private:
-	//! invoke the RNG to geat a gaussian smeared value
-	//! \param mean mean value
-	//! \param sigma 
-	value_t ranGauss(value_t mean, value_t sigma) {return CLHEP::RandGauss::shoot(mean,sigma);};
+  //! invoke the RNG to geat a gaussian smeared value
+  //! \param mean mean value
+  //! \param sigma
+  value_t ranGauss(value_t mean, value_t sigma) { return CLHEP::RandGauss::shoot(mean, sigma); };
 
-	value_t mean_a0, sigma_a0;
-	value_t mean_a1, sigma_a1;
-	value_t mean_scale, sigma_scale;
-	value_t mean_phi, sigma_phi;
-	value_t mean_x, sigma_x;
-	value_t mean_y, sigma_y;
+  value_t mean_a0, sigma_a0;
+  value_t mean_a1, sigma_a1;
+  value_t mean_scale, sigma_scale;
+  value_t mean_phi, sigma_phi;
+  value_t mean_x, sigma_x;
+  value_t mean_y, sigma_y;
 
-	//! Gets parameter by name from the VPSet
-	//! \param name name of the parameter to be searched for in field 'name' of the VPSet
-	//! \param par selects the value, i.e. mean or sigma
-	//! \param pars reference to VPSet
-	value_t getParByName(const std::string &name, const std::string &par, const std::vector<edm::ParameterSet>& pars);
+  //! Gets parameter by name from the VPSet
+  //! \param name name of the parameter to be searched for in field 'name' of the VPSet
+  //! \param par selects the value, i.e. mean or sigma
+  //! \param pars reference to VPSet
+  value_t getParByName(const std::string &name, const std::string &par, const std::vector<edm::ParameterSet> &pars);
 
-	//! Transform the diced values to the frame of a toy photograph
-	//! \param x coordinate to be transformed from local frame to photo frame
-	//! \param a0 Transformation parameter, shift in x
-	//! \param a1 Transformation parameter, shift in y
-	//! \param a2 Transformation parameter, scale*cos(phi)
-	//! \param a3 Transformation parameter, scale*sin(phi)
-	coord_t transform(const coord_t &x, const value_t &a0, const value_t &a1, const value_t &a2, const value_t &a3);
-
-	//! Function object for searching for a parameter in the VPSet
-	struct findParByName {
-		bool operator () ( const std::string &name, const edm::ParameterSet &parset )
-			const {	return (parset.getParameter<std::string>("name") == name);}
-	};
+  //! Transform the diced values to the frame of a toy photograph
+  //! \param x coordinate to be transformed from local frame to photo frame
+  //! \param a0 Transformation parameter, shift in x
+  //! \param a1 Transformation parameter, shift in y
+  //! \param a2 Transformation parameter, scale*cos(phi)
+  //! \param a3 Transformation parameter, scale*sin(phi)
+  coord_t transform(const coord_t &x, const value_t &a0, const value_t &a1, const value_t &a2, const value_t &a3);
 
+  //! Function object for searching for a parameter in the VPSet
+  struct findParByName {
+    bool operator()(const std::string &name, const edm::ParameterSet &parset) const {
+      return (parset.getParameter<std::string>("name") == name);
+    }
+  };
 };
 
 #endif
-
diff --git a/Alignment/SurveyAnalysis/interface/SurveyPxbImage.h b/Alignment/SurveyAnalysis/interface/SurveyPxbImage.h
index 249dffb0677a9..0898a33166664 100644
--- a/Alignment/SurveyAnalysis/interface/SurveyPxbImage.h
+++ b/Alignment/SurveyAnalysis/interface/SurveyPxbImage.h
@@ -9,26 +9,25 @@
 #include "DataFormats/GeometryVector/interface/Point3DBase.h"
 
 //! Class to hold one picture of the BPix survey
-class SurveyPxbImage
-{
-    public:
-	typedef unsigned int count_t;
-	typedef unsigned int id_t;
-	typedef double value_t;
-	typedef Point3DBase<value_t, LocalTag> coord_t;
-	typedef std::pair<id_t,id_t> idPair_t;
-
-	//! \p enum to help access specific locations on a picture
-	enum location{
-	    ll, // lower left mark   (0)
-	    ul, // upper left mark   (1)
-	    lr, // lower right mark  (2)
-	    ur  // upper right mark  (3)
-	};
-
-	// Constructors
-	SurveyPxbImage();
-	/*! Constructor from a string stream.\n
+class SurveyPxbImage {
+public:
+  typedef unsigned int count_t;
+  typedef unsigned int id_t;
+  typedef double value_t;
+  typedef Point3DBase<value_t, LocalTag> coord_t;
+  typedef std::pair<id_t, id_t> idPair_t;
+
+  //! \p enum to help access specific locations on a picture
+  enum location {
+    ll,  // lower left mark   (0)
+    ul,  // upper left mark   (1)
+    lr,  // lower right mark  (2)
+    ur   // upper right mark  (3)
+  };
+
+  // Constructors
+  SurveyPxbImage();
+  /*! Constructor from a string stream.\n
 	  Observe the ordering:
 	  A line needs to be of the form <tt>rawID1 y_1_1 x_1_1 y_2_1 x_2_1 rawId2 y_1_2 x_1_2 y_2_2 x_2_2 sigma_y sigma_x</tt>\n
 	  <tt>x_i_1</tt> denoting the left, <tt>x_i_2</tt> the right module. The data is then mapped to
@@ -49,53 +48,47 @@ class SurveyPxbImage
 	  - <tt>y_2_2, x_2_2 -> (3)</tt>
 	  The sigmas denote the Gaussian error of the measurement in the u and v coordinate
 	  */
-	SurveyPxbImage(std::istringstream &iss) : isValidFlag_(false)
-	{
-		fill(iss);
-	};
+  SurveyPxbImage(std::istringstream &iss) : isValidFlag_(false) { fill(iss); };
 
-	void fill(std::istringstream &iss);
+  void fill(std::istringstream &iss);
 
-	//! Get \p Id of first module
-	id_t getIdFirst() { return idPair_.first; };
-	//! Get \p Id of second module
-	id_t getIdSecond() { return idPair_.second; };
-	//! Get \p Id pair
-	const idPair_t getIdPair() { return idPair_; };
+  //! Get \p Id of first module
+  id_t getIdFirst() { return idPair_.first; };
+  //! Get \p Id of second module
+  id_t getIdSecond() { return idPair_.second; };
+  //! Get \p Id pair
+  const idPair_t getIdPair() { return idPair_; };
 
-	/*! Get coordinate of a measurement
+  /*! Get coordinate of a measurement
 	  \param m number of mark
 	 */
-        const coord_t getCoord(count_t m);	
+  const coord_t getCoord(count_t m);
 
-	//! Get Gaussian error in u direction
-        value_t getSigmaX() { return sigma_x_; }
+  //! Get Gaussian error in u direction
+  value_t getSigmaX() { return sigma_x_; }
 
-	//! Get Gaussian error in u direction
-	value_t getSigmaY() { return sigma_y_; }
+  //! Get Gaussian error in u direction
+  value_t getSigmaY() { return sigma_y_; }
 
-	//! returns validity flag
-	bool isValid() { return isValidFlag_; };
-	
+  //! returns validity flag
+  bool isValid() { return isValidFlag_; };
 
-    protected:
-	//! Vector to hold four measurements
-	std::vector<coord_t> measurementVec_;
+protected:
+  //! Vector to hold four measurements
+  std::vector<coord_t> measurementVec_;
 
-	//! Gaussian errors
-	value_t sigma_x_, sigma_y_;
+  //! Gaussian errors
+  value_t sigma_x_, sigma_y_;
 
-	//! Flag if the image was rotated or not
-	bool isRotated_;
+  //! Flag if the image was rotated or not
+  bool isRotated_;
 
-	//! Validity Flag
-	bool isValidFlag_;
-	
-	//! Pair to hold the Id's of the involved modules
-	//! first: module with lower Id
-	idPair_t idPair_;
-	
+  //! Validity Flag
+  bool isValidFlag_;
+
+  //! Pair to hold the Id's of the involved modules
+  //! first: module with lower Id
+  idPair_t idPair_;
 };
 
 #endif
-
diff --git a/Alignment/SurveyAnalysis/interface/SurveyPxbImageLocalFit.h b/Alignment/SurveyAnalysis/interface/SurveyPxbImageLocalFit.h
index eb6759df1bbb9..b57c17a3659b0 100644
--- a/Alignment/SurveyAnalysis/interface/SurveyPxbImageLocalFit.h
+++ b/Alignment/SurveyAnalysis/interface/SurveyPxbImageLocalFit.h
@@ -11,108 +11,101 @@
 #include <iostream>
 
 //! Class to hold one picture of the BPix survey and the local fit
-class SurveyPxbImageLocalFit : public SurveyPxbImage
-{
+class SurveyPxbImageLocalFit : public SurveyPxbImage {
 public:
-	typedef std::vector<value_t> localpars_t;
-	typedef std::vector<coord_t> fidpoint_t;
-	typedef unsigned int count_t;
-	static const count_t nGlD = 3; // no of global derivs
-	static const count_t nLcD = 4; // no of local derivs
-	static const count_t nMsrmts = 8; // no of measurements per image
-	static const count_t nLcPars = 4; // no of local parameters
-	static const count_t nFidpoints = 4; // no of fiducial points
-	// Typedefs for pede
-	typedef int pede_label_t;
-	typedef float pede_deriv_t;
-
-	// Constructors
-	SurveyPxbImageLocalFit(): 
-		SurveyPxbImage(), a_(nLcPars,0), fidpoints_(nFidpoints), fitValidFlag_(false), derivsValidFlag_(false)
-	{
-		initFidPoints();
-	};
-
-	//! Constructor from istringstream
-	SurveyPxbImageLocalFit(std::istringstream &iss): 
-	    SurveyPxbImage(iss), a_(nLcPars,0), fidpoints_(nFidpoints), fitValidFlag_(false), derivsValidFlag_(false)
-	{
-		initFidPoints();
-	};
-
-	//! Invoke the fit
-	void doFit(const fidpoint_t &fidpointvec);
-	void doFit(const fidpoint_t &fidpointvec, const pede_label_t &label1, const pede_label_t &label2);
-	void doFit(value_t x1, value_t y1, value_t g1, value_t x2, value_t y2, value_t g2);
-
-	//! returns validity flag
-	bool isFitValid() { return fitValidFlag_; };
-
-	//! returns local parameters after fit
-	localpars_t getLocalParameters();
-
-	//! returns the chi^2 of the fit
-	value_t getChi2();
-
-	pede_label_t getLocalDerivsSize()                      {return nLcD; };
-	pede_label_t getGlobalDerivsSize()                     {return nGlD; };
-	const pede_deriv_t* getLocalDerivsPtr(count_t i)       {return localDerivsMatrix_.Array()+i*nLcD; };
-	const pede_deriv_t* getGlobalDerivsPtr(count_t i)      {return globalDerivsMatrix_.Array()+i*nGlD;};
-	const pede_label_t* getGlobalDerivsLabelPtr(count_t i) {return i<4 ? &labelVec1_[0] : &labelVec2_[0];};
-	pede_deriv_t getResiduum(count_t i) { return (pede_deriv_t) r(i); };
-	pede_deriv_t getSigma(count_t i) { return i%2 ? sigma_x_ : sigma_y_ ; };
-
-	void setLocalDerivsToZero(count_t i);
-	void setGlobalDerivsToZero(count_t i);
+  typedef std::vector<value_t> localpars_t;
+  typedef std::vector<coord_t> fidpoint_t;
+  typedef unsigned int count_t;
+  static const count_t nGlD = 3;        // no of global derivs
+  static const count_t nLcD = 4;        // no of local derivs
+  static const count_t nMsrmts = 8;     // no of measurements per image
+  static const count_t nLcPars = 4;     // no of local parameters
+  static const count_t nFidpoints = 4;  // no of fiducial points
+  // Typedefs for pede
+  typedef int pede_label_t;
+  typedef float pede_deriv_t;
+
+  // Constructors
+  SurveyPxbImageLocalFit()
+      : SurveyPxbImage(), a_(nLcPars, 0), fidpoints_(nFidpoints), fitValidFlag_(false), derivsValidFlag_(false) {
+    initFidPoints();
+  };
+
+  //! Constructor from istringstream
+  SurveyPxbImageLocalFit(std::istringstream& iss)
+      : SurveyPxbImage(iss), a_(nLcPars, 0), fidpoints_(nFidpoints), fitValidFlag_(false), derivsValidFlag_(false) {
+    initFidPoints();
+  };
+
+  //! Invoke the fit
+  void doFit(const fidpoint_t& fidpointvec);
+  void doFit(const fidpoint_t& fidpointvec, const pede_label_t& label1, const pede_label_t& label2);
+  void doFit(value_t x1, value_t y1, value_t g1, value_t x2, value_t y2, value_t g2);
+
+  //! returns validity flag
+  bool isFitValid() { return fitValidFlag_; };
+
+  //! returns local parameters after fit
+  localpars_t getLocalParameters();
+
+  //! returns the chi^2 of the fit
+  value_t getChi2();
+
+  pede_label_t getLocalDerivsSize() { return nLcD; };
+  pede_label_t getGlobalDerivsSize() { return nGlD; };
+  const pede_deriv_t* getLocalDerivsPtr(count_t i) { return localDerivsMatrix_.Array() + i * nLcD; };
+  const pede_deriv_t* getGlobalDerivsPtr(count_t i) { return globalDerivsMatrix_.Array() + i * nGlD; };
+  const pede_label_t* getGlobalDerivsLabelPtr(count_t i) { return i < 4 ? &labelVec1_[0] : &labelVec2_[0]; };
+  pede_deriv_t getResiduum(count_t i) { return (pede_deriv_t)r(i); };
+  pede_deriv_t getSigma(count_t i) { return i % 2 ? sigma_x_ : sigma_y_; };
+
+  void setLocalDerivsToZero(count_t i);
+  void setGlobalDerivsToZero(count_t i);
 
 private:
-	//! Local parameters
-	localpars_t a_;
-	
-	//! Vector of residuals
-	ROOT::Math::SVector<value_t, nMsrmts> r;
-
-	//! Matrix with global derivs
-	//std::vector<localDerivs_t> globalDerivsVec_;
-	ROOT::Math::SMatrix<pede_deriv_t,nMsrmts,nGlD> globalDerivsMatrix_;
-
-	//! Matrix with local derivs
-	//std::vector<globalDerivs_t> localDerivsVec_;
-	ROOT::Math::SMatrix<pede_deriv_t,nMsrmts,nLcD> localDerivsMatrix_;
-
-	//! Vector with labels to global derivs
-	std::vector<pede_label_t> labelVec1_, labelVec2_;
-
-	//! True position of the fiducial points on a sensor wrt. local frame (u,v)
-	std::vector<coord_t> fidpoints_;
-
-	//! chi2 of the local fit
-	value_t chi2_;
-
-	//! Validity Flag
-	bool fitValidFlag_;
-
-	//! 
-	bool derivsValidFlag_;
-
-	//! Initialise the fiducial points
-	void initFidPoints()
-	{
-		fidpoints_[0] = coord_t(-0.91,-3.30);
-		fidpoints_[1] = coord_t(+0.91,-3.30);
-		fidpoints_[2] = coord_t(-0.91,+3.30);
-		fidpoints_[3] = coord_t(+0.91,+3.30);
-	}
-
-	//! Distance
-	value_t dist(const coord_t& p1, const coord_t& p2)
-	{
-	    value_t dx = p1.x()-p2.x();
-	    value_t dy = p1.y()-p2.y();
-	    return sqrt(dx*dx+dy*dy);
-	}
-	
+  //! Local parameters
+  localpars_t a_;
+
+  //! Vector of residuals
+  ROOT::Math::SVector<value_t, nMsrmts> r;
+
+  //! Matrix with global derivs
+  //std::vector<localDerivs_t> globalDerivsVec_;
+  ROOT::Math::SMatrix<pede_deriv_t, nMsrmts, nGlD> globalDerivsMatrix_;
+
+  //! Matrix with local derivs
+  //std::vector<globalDerivs_t> localDerivsVec_;
+  ROOT::Math::SMatrix<pede_deriv_t, nMsrmts, nLcD> localDerivsMatrix_;
+
+  //! Vector with labels to global derivs
+  std::vector<pede_label_t> labelVec1_, labelVec2_;
+
+  //! True position of the fiducial points on a sensor wrt. local frame (u,v)
+  std::vector<coord_t> fidpoints_;
+
+  //! chi2 of the local fit
+  value_t chi2_;
+
+  //! Validity Flag
+  bool fitValidFlag_;
+
+  //!
+  bool derivsValidFlag_;
+
+  //! Initialise the fiducial points
+  void initFidPoints() {
+    fidpoints_[0] = coord_t(-0.91, -3.30);
+    fidpoints_[1] = coord_t(+0.91, -3.30);
+    fidpoints_[2] = coord_t(-0.91, +3.30);
+    fidpoints_[3] = coord_t(+0.91, +3.30);
+  }
+
+  //! Distance
+  value_t dist(const coord_t& p1, const coord_t& p2) {
+    value_t dx = p1.x() - p2.x();
+    value_t dy = p1.y() - p2.y();
+    return sqrt(dx * dx + dy * dy);
+  }
 };
 
 #endif
-
diff --git a/Alignment/SurveyAnalysis/interface/SurveyPxbImageReader.h b/Alignment/SurveyAnalysis/interface/SurveyPxbImageReader.h
index 8366f066f08b9..6023b2afa8be1 100644
--- a/Alignment/SurveyAnalysis/interface/SurveyPxbImageReader.h
+++ b/Alignment/SurveyAnalysis/interface/SurveyPxbImageReader.h
@@ -11,70 +11,62 @@
 #include <string>
 
 //! Class to hold one picture of the BPix survey
-template <class T> class SurveyPxbImageReader
-{
-    public:
-		typedef std::vector<T> measurements_t;
+template <class T>
+class SurveyPxbImageReader {
+public:
+  typedef std::vector<T> measurements_t;
 
-	// Constructors
-	//! Empty default constructor
-	SurveyPxbImageReader() {};
-	//! Constructor with ifstream and destination vector
-	SurveyPxbImageReader(std::ifstream &infile, measurements_t &measurements, SurveyPxbImage::count_t reserve = 800)
-	{
-		read(infile, measurements, reserve);
-	};
+  // Constructors
+  //! Empty default constructor
+  SurveyPxbImageReader(){};
+  //! Constructor with ifstream and destination vector
+  SurveyPxbImageReader(std::ifstream &infile, measurements_t &measurements, SurveyPxbImage::count_t reserve = 800) {
+    read(infile, measurements, reserve);
+  };
 
-	//! Constructor with filename and destination vector
-	SurveyPxbImageReader(std::string filename, measurements_t &measurements, SurveyPxbImage::count_t reserve = 800)
-	{ 
-		std::ifstream infile(filename.c_str());
-		if (!infile)
-		{
-			std::cerr << "Cannot open file " << filename
-			     << " - operation aborted." << std::endl;
-		}
-		read(infile, measurements, reserve);
-   	};
-	
-	//! Reads a file, parses its content and fills the data vector
-	//! All data after a hash sign (#) is treated as a comment and not read
-	//! \param filename Filename of the file to be read
-	//! \param measurements Vector containing the measurements, previous content will be deleted
-	//! \param reserve Initial size of the vector, set with vector::reserve()
-	//! \return number of succesfully read entries
-	SurveyPxbImage::count_t read(std::ifstream &infile, measurements_t &measurements, SurveyPxbImage::count_t reserve = 830)
-	{
+  //! Constructor with filename and destination vector
+  SurveyPxbImageReader(std::string filename, measurements_t &measurements, SurveyPxbImage::count_t reserve = 800) {
+    std::ifstream infile(filename.c_str());
+    if (!infile) {
+      std::cerr << "Cannot open file " << filename << " - operation aborted." << std::endl;
+    }
+    read(infile, measurements, reserve);
+  };
 
-		// prepare the measurements vector
-		measurements.clear();
-		measurements.reserve(reserve);
+  //! Reads a file, parses its content and fills the data vector
+  //! All data after a hash sign (#) is treated as a comment and not read
+  //! \param filename Filename of the file to be read
+  //! \param measurements Vector containing the measurements, previous content will be deleted
+  //! \param reserve Initial size of the vector, set with vector::reserve()
+  //! \return number of succesfully read entries
+  SurveyPxbImage::count_t read(std::ifstream &infile,
+                               measurements_t &measurements,
+                               SurveyPxbImage::count_t reserve = 830) {
+    // prepare the measurements vector
+    measurements.clear();
+    measurements.reserve(reserve);
 
-		// container for the current line
-		std::string aLine;
+    // container for the current line
+    std::string aLine;
 
-	    // loop over lines of input file
-	    while (std::getline(infile,aLine))
-	    {
-	        // strip off everything after a hash
-	        std::string stripped = "";
-	        std::string::iterator iter = std::find(aLine.begin(), aLine.end(), '#');
-	        std::copy(aLine.begin(), iter, std::back_inserter(stripped));
-	        // read one measurment and add to vector if successfull
-	        std::istringstream iss(stripped, std::istringstream::in);
-	        T curMeas(iss);
-	        if (curMeas.isValid())
-	        {
-	             measurements.push_back(curMeas);
-	        }
-	    }
+    // loop over lines of input file
+    while (std::getline(infile, aLine)) {
+      // strip off everything after a hash
+      std::string stripped = "";
+      std::string::iterator iter = std::find(aLine.begin(), aLine.end(), '#');
+      std::copy(aLine.begin(), iter, std::back_inserter(stripped));
+      // read one measurment and add to vector if successfull
+      std::istringstream iss(stripped, std::istringstream::in);
+      T curMeas(iss);
+      if (curMeas.isValid()) {
+        measurements.push_back(curMeas);
+      }
+    }
 
-		return measurements.size();
-	}
-
-    protected:
+    return measurements.size();
+  }
 
+protected:
 };
 
 #endif
-
diff --git a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc
index a484eef80037f..d5c4047bf5743 100644
--- a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc
+++ b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.cc
@@ -28,509 +28,991 @@
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-CreateSurveyRcds::CreateSurveyRcds(const edm::ParameterSet& cfg)
-{
-	m_inputGeom = cfg.getUntrackedParameter< std::string > ("inputGeom");
-	m_inputSimpleMis = cfg.getUntrackedParameter< double > ("simpleMis");
-	m_generatedRandom = cfg.getUntrackedParameter< bool > ("generatedRandom");
-	m_generatedSimple = cfg.getUntrackedParameter< bool > ("generatedSimple");
+CreateSurveyRcds::CreateSurveyRcds(const edm::ParameterSet& cfg) {
+  m_inputGeom = cfg.getUntrackedParameter<std::string>("inputGeom");
+  m_inputSimpleMis = cfg.getUntrackedParameter<double>("simpleMis");
+  m_generatedRandom = cfg.getUntrackedParameter<bool>("generatedRandom");
+  m_generatedSimple = cfg.getUntrackedParameter<bool>("generatedSimple");
 }
 
-void CreateSurveyRcds::analyze(const edm::Event& event, const edm::EventSetup& setup){
-
-	//Retrieve tracker topology from geometry
-	edm::ESHandle<TrackerTopology> tTopoHandle;
-	setup.get<TrackerTopologyRcd>().get(tTopoHandle);
-	const TrackerTopology* const tTopo = tTopoHandle.product();
-	
-	edm::ESHandle<GeometricDet>  geom;
-	setup.get<IdealGeometryRecord>().get(geom);	 
-	edm::ESHandle<PTrackerParameters> ptp;
-	setup.get<PTrackerParametersRcd>().get( ptp );
-	TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(&*geom, *ptp, tTopo);
-	
-	//take geometry from DB or randomly generate geometry
-	if (m_inputGeom == "sqlite"){
-		//build the tracker
-        edm::ESHandle<Alignments> alignments;
-        edm::ESHandle<AlignmentErrorsExtended> alignmentErrors;
-        
-        setup.get<TrackerAlignmentRcd>().get(alignments);
-        setup.get<TrackerAlignmentErrorExtendedRcd>().get(alignmentErrors);
-        
-        //apply the latest alignments
-        GeometryAligner aligner;
-        aligner.applyAlignments<TrackerGeometry>( &(*tracker), &(*alignments), &(*alignmentErrors), AlignTransform() );
-		
-	}
-	
-	
-	addComponent(new AlignableTracker( tracker, tTopo ) );
-	
-	Alignable* ali = detector();
-	if(m_inputGeom == "generated"){
-		setGeometry( ali );
-	}
-	
-	setSurveyErrors( ali ); 
-	
+void CreateSurveyRcds::analyze(const edm::Event& event, const edm::EventSetup& setup) {
+  //Retrieve tracker topology from geometry
+  edm::ESHandle<TrackerTopology> tTopoHandle;
+  setup.get<TrackerTopologyRcd>().get(tTopoHandle);
+  const TrackerTopology* const tTopo = tTopoHandle.product();
+
+  edm::ESHandle<GeometricDet> geom;
+  setup.get<IdealGeometryRecord>().get(geom);
+  edm::ESHandle<PTrackerParameters> ptp;
+  setup.get<PTrackerParametersRcd>().get(ptp);
+  TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(&*geom, *ptp, tTopo);
+
+  //take geometry from DB or randomly generate geometry
+  if (m_inputGeom == "sqlite") {
+    //build the tracker
+    edm::ESHandle<Alignments> alignments;
+    edm::ESHandle<AlignmentErrorsExtended> alignmentErrors;
+
+    setup.get<TrackerAlignmentRcd>().get(alignments);
+    setup.get<TrackerAlignmentErrorExtendedRcd>().get(alignmentErrors);
+
+    //apply the latest alignments
+    GeometryAligner aligner;
+    aligner.applyAlignments<TrackerGeometry>(&(*tracker), &(*alignments), &(*alignmentErrors), AlignTransform());
+  }
+
+  addComponent(new AlignableTracker(tracker, tTopo));
+
+  Alignable* ali = detector();
+  if (m_inputGeom == "generated") {
+    setGeometry(ali);
+  }
+
+  setSurveyErrors(ali);
 }
 
-void CreateSurveyRcds::setGeometry(Alignable* ali)
-{
-	
-	const align::Alignables& comp = ali->components();
-	unsigned int nComp = comp.size();
-	//move then do for lower level object
-	//for issue of det vs detunit
-	bool usecomps = true;
-	if ((ali->alignableObjectId()==2)&&(nComp>=1)) usecomps = false;
-	for (unsigned int i = 0; i < nComp; ++i){
-		if (usecomps) setGeometry(comp[i]);
-	}
-	DetId id( ali->id() );
-	int subdetlevel = id.subdetId();
-	int level = ali->alignableObjectId();
-		
-	//for random misalignment
-	if (m_generatedRandom){
-		if (subdetlevel > 0){
-			AlgebraicVector value = getStructureErrors(level, subdetlevel);
-
-			double value0 = CLHEP::RandGauss::shoot(0,value[0]);
-			double value1 = CLHEP::RandGauss::shoot(0,value[1]);
-			double value2 = CLHEP::RandGauss::shoot(0,value[2]);
-			double value3 = CLHEP::RandGauss::shoot(0,value[3]);
-			double value4 = CLHEP::RandGauss::shoot(0,value[4]);
-			double value5 = CLHEP::RandGauss::shoot(0,value[5]);
-			
-			//move/rotate the surface
-			align::LocalVector diffR(value0,value1,value2);
-			align::Scalar diffWx = value3;
-			align::Scalar diffWy = value4;
-			align::Scalar diffWz = value5;
-			ali->move(ali->surface().toGlobal(diffR));
-			ali->rotateAroundLocalX(diffWx);
-			ali->rotateAroundLocalY(diffWy);
-			ali->rotateAroundLocalZ(diffWz);
-		}
-	}
-	
-	// for simple misalignments
-	if (m_generatedSimple){
-		if ((level == 2)||((level == 1)&&(ali->mother()->alignableObjectId() != 2))){
-			
-			const double constMis = m_inputSimpleMis;
-			const double dAngle = constMis/ali->surface().length();
-			//std::cout << "Shift: " << constMis << ", Rot: " << dAngle << std::endl;
-			double value0 = CLHEP::RandGauss::shoot(0, constMis);
-			double value1 = CLHEP::RandGauss::shoot(0, constMis);
-			double value2 = CLHEP::RandGauss::shoot(0, constMis);
-			double value3 = CLHEP::RandGauss::shoot(0, dAngle);
-			double value4 = CLHEP::RandGauss::shoot(0, dAngle);
-			double value5 = CLHEP::RandGauss::shoot(0, dAngle);
-			
-			align::LocalVector diffR(value0,value1,value2);
-			ali->move(ali->surface().toGlobal(diffR));
-			align::Scalar diffWx = value3;
-			align::Scalar diffWy = value4;
-			align::Scalar diffWz = value5;
-			ali->rotateAroundLocalX(diffWx);
-			ali->rotateAroundLocalY(diffWy);
-			ali->rotateAroundLocalZ(diffWz);
-		}
-	}
-	
+void CreateSurveyRcds::setGeometry(Alignable* ali) {
+  const align::Alignables& comp = ali->components();
+  unsigned int nComp = comp.size();
+  //move then do for lower level object
+  //for issue of det vs detunit
+  bool usecomps = true;
+  if ((ali->alignableObjectId() == 2) && (nComp >= 1))
+    usecomps = false;
+  for (unsigned int i = 0; i < nComp; ++i) {
+    if (usecomps)
+      setGeometry(comp[i]);
+  }
+  DetId id(ali->id());
+  int subdetlevel = id.subdetId();
+  int level = ali->alignableObjectId();
+
+  //for random misalignment
+  if (m_generatedRandom) {
+    if (subdetlevel > 0) {
+      AlgebraicVector value = getStructureErrors(level, subdetlevel);
+
+      double value0 = CLHEP::RandGauss::shoot(0, value[0]);
+      double value1 = CLHEP::RandGauss::shoot(0, value[1]);
+      double value2 = CLHEP::RandGauss::shoot(0, value[2]);
+      double value3 = CLHEP::RandGauss::shoot(0, value[3]);
+      double value4 = CLHEP::RandGauss::shoot(0, value[4]);
+      double value5 = CLHEP::RandGauss::shoot(0, value[5]);
+
+      //move/rotate the surface
+      align::LocalVector diffR(value0, value1, value2);
+      align::Scalar diffWx = value3;
+      align::Scalar diffWy = value4;
+      align::Scalar diffWz = value5;
+      ali->move(ali->surface().toGlobal(diffR));
+      ali->rotateAroundLocalX(diffWx);
+      ali->rotateAroundLocalY(diffWy);
+      ali->rotateAroundLocalZ(diffWz);
+    }
+  }
+
+  // for simple misalignments
+  if (m_generatedSimple) {
+    if ((level == 2) || ((level == 1) && (ali->mother()->alignableObjectId() != 2))) {
+      const double constMis = m_inputSimpleMis;
+      const double dAngle = constMis / ali->surface().length();
+      //std::cout << "Shift: " << constMis << ", Rot: " << dAngle << std::endl;
+      double value0 = CLHEP::RandGauss::shoot(0, constMis);
+      double value1 = CLHEP::RandGauss::shoot(0, constMis);
+      double value2 = CLHEP::RandGauss::shoot(0, constMis);
+      double value3 = CLHEP::RandGauss::shoot(0, dAngle);
+      double value4 = CLHEP::RandGauss::shoot(0, dAngle);
+      double value5 = CLHEP::RandGauss::shoot(0, dAngle);
+
+      align::LocalVector diffR(value0, value1, value2);
+      ali->move(ali->surface().toGlobal(diffR));
+      align::Scalar diffWx = value3;
+      align::Scalar diffWy = value4;
+      align::Scalar diffWz = value5;
+      ali->rotateAroundLocalX(diffWx);
+      ali->rotateAroundLocalY(diffWy);
+      ali->rotateAroundLocalZ(diffWz);
+    }
+  }
 }
 
-void CreateSurveyRcds::setSurveyErrors( Alignable* ali ){
-	
-	const align::Alignables& comp = ali->components();
-	unsigned int nComp = comp.size();
-	//move then do for lower level object
-	//for issue of det vs detunit
-	for (unsigned int i = 0; i < nComp; ++i){
-		setSurveyErrors(comp[i]);
-	}
-	
-	DetId id( ali->id() );
-	int subdetlevel = id.subdetId();
-	int level = ali->alignableObjectId();
-	
-	AlgebraicVector error = getStructureErrors(level, subdetlevel);
-	
-	double error0 = error[0];
-	double error1 = error[1];
-	double error2 = error[2];
-	double error3 = error[3];
-	double error4 = error[4];
-	double error5 = error[5];
-
-	// ----------------INFLATING ERRORS----------------------
-	// inflating sensitive coordinates in each subdetector
-	// tib
-	if ((level <= 2)&&(subdetlevel == 3)){
-		error0 = 0.01; error5 = 0.001;
-		if ((level==2)&&(nComp == 2)){
-			error1 = 0.01;
-		}
-	}
-	// tid
-	if ((level <= 2)&&(subdetlevel == 4)){ 
-		error0=0.01; error1=0.01; error2=0.01; error3=0.001; error4=0.001; error5=0.001;
-		//error0=0.01; error1=0.002; error2=0.002; error3=0.0002; error4=0.0002; error5=0.001;
-		//if ((level == 2)&&(nComp == 2)){
-		//	error1 = 0.01;
-		//}
-	}
-	if ((level == 23)&&(subdetlevel == 4)){ //Ring is a Disk
-		error0=0.02; error1=0.02; error2=0.03; error3=0.0002; error4=0.0002; error5=0.0002;
-	}
-	if ((level == 22)&&(subdetlevel == 4)){ //Side of a Ring
-		error0=0.01; error1=0.01; error2=0.01; error3=0.0002; error4=0.0002; error5=0.0002;
-	}
-	// tob
-	if ((level <= 2)&&(subdetlevel == 5)){
-		//error0 = 0.015; error1 = 0.015; error2 = 0.05; error3 = 0.001; error4 = 0.001; error5 = 0.001;
-		error0 = 0.015; error1 = 0.003; error2 = 0.003; error3 = 0.0002; error4 = 0.0002; error5 = 0.001;
-		if ((level == 2)&&(nComp == 2)){
-			error1 = 0.015;
-		}
-	}
-	if ((level == 27)&&(subdetlevel == 5)){ //Rod in a Layer
-		error0=0.02; error1=0.02; error2=0.03; error3=0.001; error4=0.001; error5=0.001;
-	}	
-	// tec
-	if ((level <= 2)&&(subdetlevel == 6)){
-		error0 = 0.02; error5 = 0.0005; 
-		if ((level==2)&&(nComp == 2)){
-			error1 = 0.02;
-		}
-	}
-	if ((level == 34)&&(subdetlevel == 6)){ //Side on a Disk
-		error0=0.01; error1=0.01; error2=0.02; error3=0.00005; error4=0.00005; error5=0.00005;
-	}
-	if ((level == 33)&&(subdetlevel == 6)){ //Petal on a Side of a Disk
-		error0=0.01; error1=0.01; error2=0.02; error3=0.0001; error4=0.0001; error5=0.0001;
-	}
-	if ((level == 32)&&(subdetlevel == 6)){ //Ring on a Petal
-		error0=0.007; error1=0.007; error2=0.015; error3=0.00015; error4=0.00015; error5=0.00015;
-	}
-	// ----------------INFLATING ERRORS----------------------
-	
-	//create the error matrix
-	align::ErrorMatrix error_Matrix;
-	double * errorData = error_Matrix.Array();
-	errorData[0] = error0*error0; errorData[2] = error1*error1; errorData[5] = error2*error2;
-	errorData[9] = error3*error3; errorData[14] = error4*error4; errorData[20] = error5*error5;
-	errorData[1] = 0.0; 
-	errorData[3] = 0.0; errorData[4] = 0.0; 
-	errorData[6] = 0.0; errorData[7] = 0.0; errorData[8] = 0.0;
-	errorData[10] = 0.0; errorData[11] = 0.0; errorData[12] = 0.0; errorData[13] = 0.0;
-	errorData[15] = 0.0; errorData[16] = 0.0; errorData[17] = 0.0; errorData[18] = 0.0; errorData[19] = 0.0;
-	
-	
-	ali->setSurvey( new SurveyDet(ali->surface(), error_Matrix ) );
-	
+void CreateSurveyRcds::setSurveyErrors(Alignable* ali) {
+  const align::Alignables& comp = ali->components();
+  unsigned int nComp = comp.size();
+  //move then do for lower level object
+  //for issue of det vs detunit
+  for (unsigned int i = 0; i < nComp; ++i) {
+    setSurveyErrors(comp[i]);
+  }
+
+  DetId id(ali->id());
+  int subdetlevel = id.subdetId();
+  int level = ali->alignableObjectId();
+
+  AlgebraicVector error = getStructureErrors(level, subdetlevel);
+
+  double error0 = error[0];
+  double error1 = error[1];
+  double error2 = error[2];
+  double error3 = error[3];
+  double error4 = error[4];
+  double error5 = error[5];
+
+  // ----------------INFLATING ERRORS----------------------
+  // inflating sensitive coordinates in each subdetector
+  // tib
+  if ((level <= 2) && (subdetlevel == 3)) {
+    error0 = 0.01;
+    error5 = 0.001;
+    if ((level == 2) && (nComp == 2)) {
+      error1 = 0.01;
+    }
+  }
+  // tid
+  if ((level <= 2) && (subdetlevel == 4)) {
+    error0 = 0.01;
+    error1 = 0.01;
+    error2 = 0.01;
+    error3 = 0.001;
+    error4 = 0.001;
+    error5 = 0.001;
+    //error0=0.01; error1=0.002; error2=0.002; error3=0.0002; error4=0.0002; error5=0.001;
+    //if ((level == 2)&&(nComp == 2)){
+    //	error1 = 0.01;
+    //}
+  }
+  if ((level == 23) && (subdetlevel == 4)) {  //Ring is a Disk
+    error0 = 0.02;
+    error1 = 0.02;
+    error2 = 0.03;
+    error3 = 0.0002;
+    error4 = 0.0002;
+    error5 = 0.0002;
+  }
+  if ((level == 22) && (subdetlevel == 4)) {  //Side of a Ring
+    error0 = 0.01;
+    error1 = 0.01;
+    error2 = 0.01;
+    error3 = 0.0002;
+    error4 = 0.0002;
+    error5 = 0.0002;
+  }
+  // tob
+  if ((level <= 2) && (subdetlevel == 5)) {
+    //error0 = 0.015; error1 = 0.015; error2 = 0.05; error3 = 0.001; error4 = 0.001; error5 = 0.001;
+    error0 = 0.015;
+    error1 = 0.003;
+    error2 = 0.003;
+    error3 = 0.0002;
+    error4 = 0.0002;
+    error5 = 0.001;
+    if ((level == 2) && (nComp == 2)) {
+      error1 = 0.015;
+    }
+  }
+  if ((level == 27) && (subdetlevel == 5)) {  //Rod in a Layer
+    error0 = 0.02;
+    error1 = 0.02;
+    error2 = 0.03;
+    error3 = 0.001;
+    error4 = 0.001;
+    error5 = 0.001;
+  }
+  // tec
+  if ((level <= 2) && (subdetlevel == 6)) {
+    error0 = 0.02;
+    error5 = 0.0005;
+    if ((level == 2) && (nComp == 2)) {
+      error1 = 0.02;
+    }
+  }
+  if ((level == 34) && (subdetlevel == 6)) {  //Side on a Disk
+    error0 = 0.01;
+    error1 = 0.01;
+    error2 = 0.02;
+    error3 = 0.00005;
+    error4 = 0.00005;
+    error5 = 0.00005;
+  }
+  if ((level == 33) && (subdetlevel == 6)) {  //Petal on a Side of a Disk
+    error0 = 0.01;
+    error1 = 0.01;
+    error2 = 0.02;
+    error3 = 0.0001;
+    error4 = 0.0001;
+    error5 = 0.0001;
+  }
+  if ((level == 32) && (subdetlevel == 6)) {  //Ring on a Petal
+    error0 = 0.007;
+    error1 = 0.007;
+    error2 = 0.015;
+    error3 = 0.00015;
+    error4 = 0.00015;
+    error5 = 0.00015;
+  }
+  // ----------------INFLATING ERRORS----------------------
+
+  //create the error matrix
+  align::ErrorMatrix error_Matrix;
+  double* errorData = error_Matrix.Array();
+  errorData[0] = error0 * error0;
+  errorData[2] = error1 * error1;
+  errorData[5] = error2 * error2;
+  errorData[9] = error3 * error3;
+  errorData[14] = error4 * error4;
+  errorData[20] = error5 * error5;
+  errorData[1] = 0.0;
+  errorData[3] = 0.0;
+  errorData[4] = 0.0;
+  errorData[6] = 0.0;
+  errorData[7] = 0.0;
+  errorData[8] = 0.0;
+  errorData[10] = 0.0;
+  errorData[11] = 0.0;
+  errorData[12] = 0.0;
+  errorData[13] = 0.0;
+  errorData[15] = 0.0;
+  errorData[16] = 0.0;
+  errorData[17] = 0.0;
+  errorData[18] = 0.0;
+  errorData[19] = 0.0;
+
+  ali->setSurvey(new SurveyDet(ali->surface(), error_Matrix));
 }
 
 //-------------------------------------------------------
 // DEFAULT VALUES FOR THE ASSEMBLY PRECISION
 //-------------------------------------------------------
-AlgebraicVector CreateSurveyRcds::getStructurePlacements(int level, int subdetlevel)
-{
-	AlgebraicVector deltaRW(6);
-	deltaRW(1)=0.0; deltaRW(2)=0.0; deltaRW(3)=0.0; deltaRW(4)=0.0; deltaRW(5)=0.0; deltaRW(6)=0.0;
-	//PIXEL
-	if ((level == 37)&&(subdetlevel == 1)){
-		deltaRW(1)=0.3; deltaRW(2)=0.3; deltaRW(3)=0.3; deltaRW(4)=0.0017; deltaRW(5)=0.0017; deltaRW(6)=0.0017;
-	}
-	//STRIP
-	if ((level == 38)&&(subdetlevel == 3)){
-		deltaRW(1)=0.3; deltaRW(2)=0.3; deltaRW(3)=0.3; deltaRW(4)=0.0004; deltaRW(5)=0.0004; deltaRW(6)=0.0004;
-	}
-	//TRACKER
-	if ((level == 39)&&(subdetlevel == 1)){
-		deltaRW(1)=0.0; deltaRW(2)=0.0; deltaRW(3)=0.0; deltaRW(4)=0.0; deltaRW(5)=0.0; deltaRW(6)=0.0;
-	}
-	//TPB
-	if ((level == 7)&&(subdetlevel == 1)){
-		deltaRW(1)=0.2; deltaRW(2)=0.2; deltaRW(3)=0.2; deltaRW(4)=0.003; deltaRW(5)=0.003; deltaRW(6)=0.003;
-	}
-	if ((level == 6)&&(subdetlevel == 1)){
-		deltaRW(1)=0.05; deltaRW(2)=0.05; deltaRW(3)=0.05; deltaRW(4)=0.0008; deltaRW(5)=0.0008; deltaRW(6)=0.0008;
-	}
-	if ((level == 5)&&(subdetlevel == 1)){
-		deltaRW(1)=0.02; deltaRW(2)=0.02; deltaRW(3)=0.02; deltaRW(4)=0.0004; deltaRW(5)=0.0004; deltaRW(6)=0.0004;
-	}
-	if ((level == 4)&&(subdetlevel == 1)){
-		deltaRW(1)=0.01; deltaRW(2)=0.01; deltaRW(3)=0.005; deltaRW(4)=0.0002; deltaRW(5)=0.0002; deltaRW(6)=0.0002;
-	}
-	if ((level == 2)&&(subdetlevel == 1)){
-		deltaRW(1)=0.005; deltaRW(2)=0.005; deltaRW(3)=0.003; deltaRW(4)=0.001; deltaRW(5)=0.001; deltaRW(6)=0.001;
-	}
-	if ((level == 1)&&(subdetlevel == 1)){
-		deltaRW(1)=0.005; deltaRW(2)=0.005; deltaRW(3)=0.003; deltaRW(4)=0.001; deltaRW(5)=0.001; deltaRW(6)=0.001;
-	}
-	//TPE
-	if ((level == 13)&&(subdetlevel == 2)){
-		deltaRW(1)=0.2; deltaRW(2)=0.2; deltaRW(3)=0.2; deltaRW(4)=0.0017; deltaRW(5)=0.0017; deltaRW(6)=0.0017;
-	}
-	if ((level == 12)&&(subdetlevel == 2)){
-		deltaRW(1)=0.05; deltaRW(2)=0.05; deltaRW(3)=0.05; deltaRW(4)=0.0004; deltaRW(5)=0.0004; deltaRW(6)=0.0004;
-	}
-	if ((level == 11)&&(subdetlevel == 2)){
-		deltaRW(1)=0.02; deltaRW(2)=0.02; deltaRW(3)=0.02; deltaRW(4)=0.001; deltaRW(5)=0.001; deltaRW(6)=0.001;
-	}
-	if ((level == 10)&&(subdetlevel == 2)){
-		deltaRW(1)=0.01; deltaRW(2)=0.01; deltaRW(3)=0.01; deltaRW(4)=0.001; deltaRW(5)=0.001; deltaRW(6)=0.001;
-	}
-	if ((level == 9)&&(subdetlevel == 2)){
-		deltaRW(1)=0.01; deltaRW(2)=0.01; deltaRW(3)=0.005; deltaRW(4)=0.002; deltaRW(5)=0.002; deltaRW(6)=0.002;
-	}
-	if ((level == 2)&&(subdetlevel == 2)){
-		deltaRW(1)=0.005; deltaRW(2)=0.005; deltaRW(3)=0.003; deltaRW(4)=0.001; deltaRW(5)=0.001; deltaRW(6)=0.001;
-	}
-	if ((level == 1)&&(subdetlevel == 2)){
-		deltaRW(1)=0.005; deltaRW(2)=0.005; deltaRW(3)=0.003; deltaRW(4)=0.001; deltaRW(5)=0.001; deltaRW(6)=0.001;
-	}
-	//TIB
-	if ((level == 20)&&(subdetlevel == 3)){
-		deltaRW(1)=0.2; deltaRW(2)=0.2; deltaRW(3)=0.2; deltaRW(4)=0.0017; deltaRW(5)=0.0017; deltaRW(6)=0.0017;
-	}
-	if ((level == 19)&&(subdetlevel == 3)){
-		deltaRW(1)=0.1; deltaRW(2)=0.1; deltaRW(3)=0.1; deltaRW(4)=0.0008; deltaRW(5)=0.0008; deltaRW(6)=0.0008;
-	}
-	if ((level == 18)&&(subdetlevel == 3)){
-		deltaRW(1)=0.04; deltaRW(2)=0.04; deltaRW(3)=0.02; deltaRW(4)=0.0006; deltaRW(5)=0.0006; deltaRW(6)=0.0006;
-	}
-	if ((level == 17)&&(subdetlevel == 3)){
-		deltaRW(1)=0.03; deltaRW(2)=0.03; deltaRW(3)=0.015; deltaRW(4)=0.0004; deltaRW(5)=0.0004; deltaRW(6)=0.0004;
-	}
-	if ((level == 16)&&(subdetlevel == 3)){
-		deltaRW(1)=0.01; deltaRW(2)=0.01; deltaRW(3)=0.01; deltaRW(4)=0.0004; deltaRW(5)=0.0002; deltaRW(6)=0.0002;
-	}
-	if ((level == 15)&&(subdetlevel == 3)){
-		deltaRW(1)=0.01; deltaRW(2)=0.01; deltaRW(3)=0.01; deltaRW(4)=0.0004; deltaRW(5)=0.0002; deltaRW(6)=0.0002;
-	}
-	if ((level == 2)&&(subdetlevel == 3)){
-		deltaRW(1)=0.005; deltaRW(2)=0.005; deltaRW(3)=0.005; deltaRW(4)=0.001; deltaRW(5)=0.0005; deltaRW(6)=0.0005;
-	}
-	if ((level == 1)&&(subdetlevel == 3)){
-		deltaRW(1)=0.005; deltaRW(2)=0.005; deltaRW(3)=0.005; deltaRW(4)=0.001; deltaRW(5)=0.0005; deltaRW(6)=0.0005;
-	}
-	//TID
-	if ((level == 25)&&(subdetlevel == 4)){
-		deltaRW(1)=0.2; deltaRW(2)=0.2; deltaRW(3)=0.2; deltaRW(4)=0.0013; deltaRW(5)=0.0013; deltaRW(6)=0.0013;
-	}
-	if ((level == 24)&&(subdetlevel == 4)){
-		deltaRW(1)=0.05; deltaRW(2)=0.05; deltaRW(3)=0.05; deltaRW(4)=0.0004; deltaRW(5)=0.0004; deltaRW(6)=0.0004;
-	}
-	if ((level == 23)&&(subdetlevel == 4)){
-		deltaRW(1)=0.01; deltaRW(2)=0.01; deltaRW(3)=0.01; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 22)&&(subdetlevel == 4)){
-		deltaRW(1)=0.005; deltaRW(2)=0.005; deltaRW(3)=0.005; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 2)&&(subdetlevel == 4)){
-		deltaRW(1)=0.005; deltaRW(2)=0.005; deltaRW(3)=0.005; deltaRW(4)=0.0005; deltaRW(5)=0.0005; deltaRW(6)=0.0005;
-	}
-	if ((level == 1)&&(subdetlevel == 4)){
-		deltaRW(1)=0.005; deltaRW(2)=0.005; deltaRW(3)=0.005; deltaRW(4)=0.0005; deltaRW(5)=0.0005; deltaRW(6)=0.0005;
-	}
-	//TOB
-	if ((level == 30)&&(subdetlevel == 5)){
-		deltaRW(1)=0.2; deltaRW(2)=0.2; deltaRW(3)=0.2; deltaRW(4)=0.0008; deltaRW(5)=0.0008; deltaRW(6)=0.0008;
-	}
-	if ((level == 29)&&(subdetlevel == 5)){
-		deltaRW(1)=0.014; deltaRW(2)=0.014; deltaRW(3)=0.05; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 28)&&(subdetlevel == 5)){
-		deltaRW(1)=0.02; deltaRW(2)=0.02; deltaRW(3)=0.02; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 27)&&(subdetlevel == 5)){
-		deltaRW(1)=0.01; deltaRW(2)=0.01; deltaRW(3)=0.02; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 2)&&(subdetlevel == 5)){
-		deltaRW(1)=0.003; deltaRW(2)=0.003; deltaRW(3)=0.01; deltaRW(4)=0.0002; deltaRW(5)=0.0002; deltaRW(6)=0.0002;
-	}
-	if ((level == 1)&&(subdetlevel == 5)){
-		deltaRW(1)=0.003; deltaRW(2)=0.003; deltaRW(3)=0.01; deltaRW(4)=0.0002; deltaRW(5)=0.0002; deltaRW(6)=0.0002;
-	}
-	//TEC
-	if ((level == 36)&&(subdetlevel == 6)){
-		deltaRW(1)=0.2; deltaRW(2)=0.2; deltaRW(3)=0.2; deltaRW(4)=0.0008; deltaRW(5)=0.0008; deltaRW(6)=0.0008;
-	}
-	if ((level == 35)&&(subdetlevel == 6)){
-		deltaRW(1)=0.05; deltaRW(2)=0.05; deltaRW(3)=0.05; deltaRW(4)=0.0003; deltaRW(5)=0.0003; deltaRW(6)=0.0003;
-	}
-	if ((level == 34)&&(subdetlevel == 6)){
-		deltaRW(1)=0.01; deltaRW(2)=0.01; deltaRW(3)=0.02; deltaRW(4)=0.00005; deltaRW(5)=0.00005; deltaRW(6)=0.00005;
-	}
-	if ((level == 33)&&(subdetlevel == 6)){
-		deltaRW(1)=0.01; deltaRW(2)=0.01; deltaRW(3)=0.02; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 32)&&(subdetlevel == 6)){
-		deltaRW(1)=0.007; deltaRW(2)=0.007; deltaRW(3)=0.015; deltaRW(4)=0.00015; deltaRW(5)=0.00015; deltaRW(6)=0.00015;
-	}
-	if ((level == 2)&&(subdetlevel == 6)){
-		deltaRW(1)=0.002; deltaRW(2)=0.002; deltaRW(3)=0.005; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 1)&&(subdetlevel == 6)){
-		deltaRW(1)=0.002; deltaRW(2)=0.002; deltaRW(3)=0.005; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	
-	return deltaRW;
+AlgebraicVector CreateSurveyRcds::getStructurePlacements(int level, int subdetlevel) {
+  AlgebraicVector deltaRW(6);
+  deltaRW(1) = 0.0;
+  deltaRW(2) = 0.0;
+  deltaRW(3) = 0.0;
+  deltaRW(4) = 0.0;
+  deltaRW(5) = 0.0;
+  deltaRW(6) = 0.0;
+  //PIXEL
+  if ((level == 37) && (subdetlevel == 1)) {
+    deltaRW(1) = 0.3;
+    deltaRW(2) = 0.3;
+    deltaRW(3) = 0.3;
+    deltaRW(4) = 0.0017;
+    deltaRW(5) = 0.0017;
+    deltaRW(6) = 0.0017;
+  }
+  //STRIP
+  if ((level == 38) && (subdetlevel == 3)) {
+    deltaRW(1) = 0.3;
+    deltaRW(2) = 0.3;
+    deltaRW(3) = 0.3;
+    deltaRW(4) = 0.0004;
+    deltaRW(5) = 0.0004;
+    deltaRW(6) = 0.0004;
+  }
+  //TRACKER
+  if ((level == 39) && (subdetlevel == 1)) {
+    deltaRW(1) = 0.0;
+    deltaRW(2) = 0.0;
+    deltaRW(3) = 0.0;
+    deltaRW(4) = 0.0;
+    deltaRW(5) = 0.0;
+    deltaRW(6) = 0.0;
+  }
+  //TPB
+  if ((level == 7) && (subdetlevel == 1)) {
+    deltaRW(1) = 0.2;
+    deltaRW(2) = 0.2;
+    deltaRW(3) = 0.2;
+    deltaRW(4) = 0.003;
+    deltaRW(5) = 0.003;
+    deltaRW(6) = 0.003;
+  }
+  if ((level == 6) && (subdetlevel == 1)) {
+    deltaRW(1) = 0.05;
+    deltaRW(2) = 0.05;
+    deltaRW(3) = 0.05;
+    deltaRW(4) = 0.0008;
+    deltaRW(5) = 0.0008;
+    deltaRW(6) = 0.0008;
+  }
+  if ((level == 5) && (subdetlevel == 1)) {
+    deltaRW(1) = 0.02;
+    deltaRW(2) = 0.02;
+    deltaRW(3) = 0.02;
+    deltaRW(4) = 0.0004;
+    deltaRW(5) = 0.0004;
+    deltaRW(6) = 0.0004;
+  }
+  if ((level == 4) && (subdetlevel == 1)) {
+    deltaRW(1) = 0.01;
+    deltaRW(2) = 0.01;
+    deltaRW(3) = 0.005;
+    deltaRW(4) = 0.0002;
+    deltaRW(5) = 0.0002;
+    deltaRW(6) = 0.0002;
+  }
+  if ((level == 2) && (subdetlevel == 1)) {
+    deltaRW(1) = 0.005;
+    deltaRW(2) = 0.005;
+    deltaRW(3) = 0.003;
+    deltaRW(4) = 0.001;
+    deltaRW(5) = 0.001;
+    deltaRW(6) = 0.001;
+  }
+  if ((level == 1) && (subdetlevel == 1)) {
+    deltaRW(1) = 0.005;
+    deltaRW(2) = 0.005;
+    deltaRW(3) = 0.003;
+    deltaRW(4) = 0.001;
+    deltaRW(5) = 0.001;
+    deltaRW(6) = 0.001;
+  }
+  //TPE
+  if ((level == 13) && (subdetlevel == 2)) {
+    deltaRW(1) = 0.2;
+    deltaRW(2) = 0.2;
+    deltaRW(3) = 0.2;
+    deltaRW(4) = 0.0017;
+    deltaRW(5) = 0.0017;
+    deltaRW(6) = 0.0017;
+  }
+  if ((level == 12) && (subdetlevel == 2)) {
+    deltaRW(1) = 0.05;
+    deltaRW(2) = 0.05;
+    deltaRW(3) = 0.05;
+    deltaRW(4) = 0.0004;
+    deltaRW(5) = 0.0004;
+    deltaRW(6) = 0.0004;
+  }
+  if ((level == 11) && (subdetlevel == 2)) {
+    deltaRW(1) = 0.02;
+    deltaRW(2) = 0.02;
+    deltaRW(3) = 0.02;
+    deltaRW(4) = 0.001;
+    deltaRW(5) = 0.001;
+    deltaRW(6) = 0.001;
+  }
+  if ((level == 10) && (subdetlevel == 2)) {
+    deltaRW(1) = 0.01;
+    deltaRW(2) = 0.01;
+    deltaRW(3) = 0.01;
+    deltaRW(4) = 0.001;
+    deltaRW(5) = 0.001;
+    deltaRW(6) = 0.001;
+  }
+  if ((level == 9) && (subdetlevel == 2)) {
+    deltaRW(1) = 0.01;
+    deltaRW(2) = 0.01;
+    deltaRW(3) = 0.005;
+    deltaRW(4) = 0.002;
+    deltaRW(5) = 0.002;
+    deltaRW(6) = 0.002;
+  }
+  if ((level == 2) && (subdetlevel == 2)) {
+    deltaRW(1) = 0.005;
+    deltaRW(2) = 0.005;
+    deltaRW(3) = 0.003;
+    deltaRW(4) = 0.001;
+    deltaRW(5) = 0.001;
+    deltaRW(6) = 0.001;
+  }
+  if ((level == 1) && (subdetlevel == 2)) {
+    deltaRW(1) = 0.005;
+    deltaRW(2) = 0.005;
+    deltaRW(3) = 0.003;
+    deltaRW(4) = 0.001;
+    deltaRW(5) = 0.001;
+    deltaRW(6) = 0.001;
+  }
+  //TIB
+  if ((level == 20) && (subdetlevel == 3)) {
+    deltaRW(1) = 0.2;
+    deltaRW(2) = 0.2;
+    deltaRW(3) = 0.2;
+    deltaRW(4) = 0.0017;
+    deltaRW(5) = 0.0017;
+    deltaRW(6) = 0.0017;
+  }
+  if ((level == 19) && (subdetlevel == 3)) {
+    deltaRW(1) = 0.1;
+    deltaRW(2) = 0.1;
+    deltaRW(3) = 0.1;
+    deltaRW(4) = 0.0008;
+    deltaRW(5) = 0.0008;
+    deltaRW(6) = 0.0008;
+  }
+  if ((level == 18) && (subdetlevel == 3)) {
+    deltaRW(1) = 0.04;
+    deltaRW(2) = 0.04;
+    deltaRW(3) = 0.02;
+    deltaRW(4) = 0.0006;
+    deltaRW(5) = 0.0006;
+    deltaRW(6) = 0.0006;
+  }
+  if ((level == 17) && (subdetlevel == 3)) {
+    deltaRW(1) = 0.03;
+    deltaRW(2) = 0.03;
+    deltaRW(3) = 0.015;
+    deltaRW(4) = 0.0004;
+    deltaRW(5) = 0.0004;
+    deltaRW(6) = 0.0004;
+  }
+  if ((level == 16) && (subdetlevel == 3)) {
+    deltaRW(1) = 0.01;
+    deltaRW(2) = 0.01;
+    deltaRW(3) = 0.01;
+    deltaRW(4) = 0.0004;
+    deltaRW(5) = 0.0002;
+    deltaRW(6) = 0.0002;
+  }
+  if ((level == 15) && (subdetlevel == 3)) {
+    deltaRW(1) = 0.01;
+    deltaRW(2) = 0.01;
+    deltaRW(3) = 0.01;
+    deltaRW(4) = 0.0004;
+    deltaRW(5) = 0.0002;
+    deltaRW(6) = 0.0002;
+  }
+  if ((level == 2) && (subdetlevel == 3)) {
+    deltaRW(1) = 0.005;
+    deltaRW(2) = 0.005;
+    deltaRW(3) = 0.005;
+    deltaRW(4) = 0.001;
+    deltaRW(5) = 0.0005;
+    deltaRW(6) = 0.0005;
+  }
+  if ((level == 1) && (subdetlevel == 3)) {
+    deltaRW(1) = 0.005;
+    deltaRW(2) = 0.005;
+    deltaRW(3) = 0.005;
+    deltaRW(4) = 0.001;
+    deltaRW(5) = 0.0005;
+    deltaRW(6) = 0.0005;
+  }
+  //TID
+  if ((level == 25) && (subdetlevel == 4)) {
+    deltaRW(1) = 0.2;
+    deltaRW(2) = 0.2;
+    deltaRW(3) = 0.2;
+    deltaRW(4) = 0.0013;
+    deltaRW(5) = 0.0013;
+    deltaRW(6) = 0.0013;
+  }
+  if ((level == 24) && (subdetlevel == 4)) {
+    deltaRW(1) = 0.05;
+    deltaRW(2) = 0.05;
+    deltaRW(3) = 0.05;
+    deltaRW(4) = 0.0004;
+    deltaRW(5) = 0.0004;
+    deltaRW(6) = 0.0004;
+  }
+  if ((level == 23) && (subdetlevel == 4)) {
+    deltaRW(1) = 0.01;
+    deltaRW(2) = 0.01;
+    deltaRW(3) = 0.01;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 22) && (subdetlevel == 4)) {
+    deltaRW(1) = 0.005;
+    deltaRW(2) = 0.005;
+    deltaRW(3) = 0.005;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 2) && (subdetlevel == 4)) {
+    deltaRW(1) = 0.005;
+    deltaRW(2) = 0.005;
+    deltaRW(3) = 0.005;
+    deltaRW(4) = 0.0005;
+    deltaRW(5) = 0.0005;
+    deltaRW(6) = 0.0005;
+  }
+  if ((level == 1) && (subdetlevel == 4)) {
+    deltaRW(1) = 0.005;
+    deltaRW(2) = 0.005;
+    deltaRW(3) = 0.005;
+    deltaRW(4) = 0.0005;
+    deltaRW(5) = 0.0005;
+    deltaRW(6) = 0.0005;
+  }
+  //TOB
+  if ((level == 30) && (subdetlevel == 5)) {
+    deltaRW(1) = 0.2;
+    deltaRW(2) = 0.2;
+    deltaRW(3) = 0.2;
+    deltaRW(4) = 0.0008;
+    deltaRW(5) = 0.0008;
+    deltaRW(6) = 0.0008;
+  }
+  if ((level == 29) && (subdetlevel == 5)) {
+    deltaRW(1) = 0.014;
+    deltaRW(2) = 0.014;
+    deltaRW(3) = 0.05;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 28) && (subdetlevel == 5)) {
+    deltaRW(1) = 0.02;
+    deltaRW(2) = 0.02;
+    deltaRW(3) = 0.02;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 27) && (subdetlevel == 5)) {
+    deltaRW(1) = 0.01;
+    deltaRW(2) = 0.01;
+    deltaRW(3) = 0.02;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 2) && (subdetlevel == 5)) {
+    deltaRW(1) = 0.003;
+    deltaRW(2) = 0.003;
+    deltaRW(3) = 0.01;
+    deltaRW(4) = 0.0002;
+    deltaRW(5) = 0.0002;
+    deltaRW(6) = 0.0002;
+  }
+  if ((level == 1) && (subdetlevel == 5)) {
+    deltaRW(1) = 0.003;
+    deltaRW(2) = 0.003;
+    deltaRW(3) = 0.01;
+    deltaRW(4) = 0.0002;
+    deltaRW(5) = 0.0002;
+    deltaRW(6) = 0.0002;
+  }
+  //TEC
+  if ((level == 36) && (subdetlevel == 6)) {
+    deltaRW(1) = 0.2;
+    deltaRW(2) = 0.2;
+    deltaRW(3) = 0.2;
+    deltaRW(4) = 0.0008;
+    deltaRW(5) = 0.0008;
+    deltaRW(6) = 0.0008;
+  }
+  if ((level == 35) && (subdetlevel == 6)) {
+    deltaRW(1) = 0.05;
+    deltaRW(2) = 0.05;
+    deltaRW(3) = 0.05;
+    deltaRW(4) = 0.0003;
+    deltaRW(5) = 0.0003;
+    deltaRW(6) = 0.0003;
+  }
+  if ((level == 34) && (subdetlevel == 6)) {
+    deltaRW(1) = 0.01;
+    deltaRW(2) = 0.01;
+    deltaRW(3) = 0.02;
+    deltaRW(4) = 0.00005;
+    deltaRW(5) = 0.00005;
+    deltaRW(6) = 0.00005;
+  }
+  if ((level == 33) && (subdetlevel == 6)) {
+    deltaRW(1) = 0.01;
+    deltaRW(2) = 0.01;
+    deltaRW(3) = 0.02;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 32) && (subdetlevel == 6)) {
+    deltaRW(1) = 0.007;
+    deltaRW(2) = 0.007;
+    deltaRW(3) = 0.015;
+    deltaRW(4) = 0.00015;
+    deltaRW(5) = 0.00015;
+    deltaRW(6) = 0.00015;
+  }
+  if ((level == 2) && (subdetlevel == 6)) {
+    deltaRW(1) = 0.002;
+    deltaRW(2) = 0.002;
+    deltaRW(3) = 0.005;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 1) && (subdetlevel == 6)) {
+    deltaRW(1) = 0.002;
+    deltaRW(2) = 0.002;
+    deltaRW(3) = 0.005;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+
+  return deltaRW;
 }
 //-------------------------------------------------------
 // DEFAULT VALUES FOR THE PRECISION OF THE SURVEY
 //-------------------------------------------------------
-AlgebraicVector CreateSurveyRcds::getStructureErrors(int level, int subdetlevel)
-{
-	AlgebraicVector deltaRW(6);
-	deltaRW(1)=0.0; deltaRW(2)=0.0; deltaRW(3)=0.0; deltaRW(4)=0.0; deltaRW(5)=0.0; deltaRW(6)=0.0;
-	//PIXEL
-	if ((level == 37)&&(subdetlevel == 1)){ //Pixel Detector in Tracker
-		deltaRW(1)=0.2; deltaRW(2)=0.2; deltaRW(3)=0.2; deltaRW(4)=0.0017; deltaRW(5)=0.0017; deltaRW(6)=0.0017;
-	}
-	//STRIP
-	if ((level == 38)&&(subdetlevel == 3)){ //Strip Tracker in Tracker
-		deltaRW(1)=0.2; deltaRW(2)=0.2; deltaRW(3)=0.2; deltaRW(4)=0.0004; deltaRW(5)=0.0004; deltaRW(6)=0.0004;
-	}
-	//TRACKER
-	if ((level == 39)&&(subdetlevel == 1)){ //Tracker
-		deltaRW(1)=0.0; deltaRW(2)=0.0; deltaRW(3)=0.0; deltaRW(4)=0.0; deltaRW(5)=0.0; deltaRW(6)=0.0;
-	}
-	//TPB
-	if ((level == 7)&&(subdetlevel == 1)){ //Barrel Pixel in Pixel
-		deltaRW(1)=0.05; deltaRW(2)=0.05; deltaRW(3)=0.1; deltaRW(4)=0.0008; deltaRW(5)=0.0008; deltaRW(6)=0.0008;
-	}
-	if ((level == 6)&&(subdetlevel == 1)){ //HalfBarrel in Barrel Pixel
-		deltaRW(1)=0.015; deltaRW(2)=0.015; deltaRW(3)=0.03; deltaRW(4)=0.0003; deltaRW(5)=0.0003; deltaRW(6)=0.0003;
-	}
-	if ((level == 5)&&(subdetlevel == 1)){ //HalfShell in HalfBarrel
-		deltaRW(1)=0.005; deltaRW(2)=0.005; deltaRW(3)=0.01; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 4)&&(subdetlevel == 1)){ //Ladder in HalfShell
-		deltaRW(1)=0.001; deltaRW(2)=0.001; deltaRW(3)=0.002; deltaRW(4)=0.00005; deltaRW(5)=0.00005; deltaRW(6)=0.00005;
-	}
-	if ((level == 2)&&(subdetlevel == 1)){ //Det in Ladder
-		deltaRW(1)=0.0005; deltaRW(2)=0.001; deltaRW(3)=0.001; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 1)&&(subdetlevel == 1)){ //DetUnit in Ladder
-		deltaRW(1)=0.0005; deltaRW(2)=0.001; deltaRW(3)=0.001; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	//TPE
-	if ((level == 13)&&(subdetlevel == 2)){ //Forward Pixel in Pixel
-		deltaRW(1)=0.05; deltaRW(2)=0.05; deltaRW(3)=0.1; deltaRW(4)=0.0004; deltaRW(5)=0.0004; deltaRW(6)=0.0004;
-	}
-	if ((level == 12)&&(subdetlevel == 2)){ //HalfCylinder in Forward Pixel
-		deltaRW(1)=0.015; deltaRW(2)=0.015; deltaRW(3)=0.03; deltaRW(4)=0.00015; deltaRW(5)=0.00015; deltaRW(6)=0.00015;
-	}
-	if ((level == 11)&&(subdetlevel == 2)){ //HalfDisk in HalfCylinder
-		deltaRW(1)=0.005; deltaRW(2)=0.005; deltaRW(3)=0.01; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 10)&&(subdetlevel == 2)){ //Blade in HalfDisk
-		deltaRW(1)=0.001; deltaRW(2)=0.001; deltaRW(3)=0.002; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 9)&&(subdetlevel == 2)){ //Panel in Blade
-		deltaRW(1)=0.001; deltaRW(2)=0.0008; deltaRW(3)=0.0006; deltaRW(4)=0.0002; deltaRW(5)=0.0002; deltaRW(6)=0.0002;
-	}
-	if ((level == 2)&&(subdetlevel == 2)){ //Det in Panel
-		deltaRW(1)=0.0005; deltaRW(2)=0.0004; deltaRW(3)=0.0006; deltaRW(4)=0.0001; deltaRW(5)=0.0003; deltaRW(6)=0.0001;
-	}
-	if ((level == 1)&&(subdetlevel == 2)){ //DetUnit in Panel
-		deltaRW(1)=0.0005; deltaRW(2)=0.0004; deltaRW(3)=0.0006; deltaRW(4)=0.0001; deltaRW(5)=0.0003; deltaRW(6)=0.0001;
-	}
-	//TIB
-	if ((level == 20)&&(subdetlevel == 3)){ //TIB in Strip Tracker
-		deltaRW(1)=0.08; deltaRW(2)=0.08; deltaRW(3)=0.04; deltaRW(4)=0.0017; deltaRW(5)=0.0017; deltaRW(6)=0.0017;
-	}
-	if ((level == 19)&&(subdetlevel == 3)){ //HalfBarrel in TIB
-		deltaRW(1)=0.04; deltaRW(2)=0.04; deltaRW(3)=0.02; deltaRW(4)=0.0003; deltaRW(5)=0.0003; deltaRW(6)=0.0003;
-	}
-	if ((level == 18)&&(subdetlevel == 3)){ //Layer in HalfBarrel
-		deltaRW(1)=0.02; deltaRW(2)=0.02; deltaRW(3)=0.01; deltaRW(4)=0.0006; deltaRW(5)=0.0006; deltaRW(6)=0.0006;
-	}
-	if ((level == 17)&&(subdetlevel == 3)){ //HalfShell in Layer
-		deltaRW(1)=0.01; deltaRW(2)=0.01; deltaRW(3)=0.005; deltaRW(4)=0.0002; deltaRW(5)=0.0002; deltaRW(6)=0.0002;
-	}
-	if ((level == 16)&&(subdetlevel == 3)){ //Surface in a HalfShell
-		deltaRW(1)=0.004; deltaRW(2)=0.004; deltaRW(3)=0.008; deltaRW(4)=0.0002; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 15)&&(subdetlevel == 3)){ //String in a Surface
-		deltaRW(1)=0.004; deltaRW(2)=0.004; deltaRW(3)=0.008; deltaRW(4)=0.0002; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 2)&&(subdetlevel == 3)){ //Det in a String
-		deltaRW(1)=0.002; deltaRW(2)=0.002; deltaRW(3)=0.004; deltaRW(4)=0.0004; deltaRW(5)=0.0002; deltaRW(6)=0.0002;
-	}
-	if ((level == 1)&&(subdetlevel == 3)){ //DetUnit in a String
-		deltaRW(1)=0.002; deltaRW(2)=0.002; deltaRW(3)=0.004; deltaRW(4)=0.0004; deltaRW(5)=0.0002; deltaRW(6)=0.0002;
-	}
-	//TID
-	if ((level == 25)&&(subdetlevel == 4)){ //TID in Strip Tracker
-		deltaRW(1)=0.05; deltaRW(2)=0.05; deltaRW(3)=0.1; deltaRW(4)=0.0003; deltaRW(5)=0.0003; deltaRW(6)=0.0003;
-	}
-	if ((level == 24)&&(subdetlevel == 4)){ //Disk in a TID
-		deltaRW(1)=0.01; deltaRW(2)=0.01; deltaRW(3)=0.02; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 23)&&(subdetlevel == 4)){ //Ring is a Disk
-		deltaRW(1)=0.004; deltaRW(2)=0.004; deltaRW(3)=0.005; deltaRW(4)=0.00004; deltaRW(5)=0.00004; deltaRW(6)=0.00004;
-	}
-	if ((level == 22)&&(subdetlevel == 4)){ //Side of a Ring
-		deltaRW(1)=0.002; deltaRW(2)=0.002; deltaRW(3)=0.002; deltaRW(4)=0.00004; deltaRW(5)=0.00004; deltaRW(6)=0.00004;
-	}
-	if ((level == 2)&&(subdetlevel == 4)){ //Det in a Side
-		deltaRW(1)=0.002; deltaRW(2)=0.002; deltaRW(3)=0.002; deltaRW(4)=0.0002; deltaRW(5)=0.0002; deltaRW(6)=0.0002;
-	}
-	if ((level == 1)&&(subdetlevel == 4)){ //DetUnit is a Side
-		deltaRW(1)=0.002; deltaRW(2)=0.002; deltaRW(3)=0.002; deltaRW(4)=0.0002; deltaRW(5)=0.0002; deltaRW(6)=0.0002;
-	}
-	//TOB
-	if ((level == 30)&&(subdetlevel == 5)){ // TOB in Strip Tracker
-		deltaRW(1)=0.06; deltaRW(2)=0.06; deltaRW(3)=0.06; deltaRW(4)=0.00025; deltaRW(5)=0.00025; deltaRW(6)=0.00025;
-	}
-	if ((level == 29)&&(subdetlevel == 5)){ //HalfBarrel in the TOB
-		deltaRW(1)=0.014; deltaRW(2)=0.014; deltaRW(3)=0.05; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 28)&&(subdetlevel == 5)){ //Layer in a HalfBarrel
-		deltaRW(1)=0.02; deltaRW(2)=0.02; deltaRW(3)=0.02; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 27)&&(subdetlevel == 5)){ //Rod in a Layer
-		deltaRW(1)=0.01; deltaRW(2)=0.01; deltaRW(3)=0.02; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 2)&&(subdetlevel == 5)){ //Det in a Rod
-		deltaRW(1)=0.003; deltaRW(2)=0.003; deltaRW(3)=0.01; deltaRW(4)=0.0002; deltaRW(5)=0.0002; deltaRW(6)=0.0002;
-	}
-	if ((level == 1)&&(subdetlevel == 5)){ //DetUnit in a Rod
-		deltaRW(1)=0.003; deltaRW(2)=0.003; deltaRW(3)=0.01; deltaRW(4)=0.0002; deltaRW(5)=0.0002; deltaRW(6)=0.0002;
-	}
-	//TEC
-	if ((level == 36)&&(subdetlevel == 6)){ //TEC in the Strip Tracker
-		deltaRW(1)=0.06; deltaRW(2)=0.06; deltaRW(3)=0.1; deltaRW(4)=0.0003; deltaRW(5)=0.0003; deltaRW(6)=0.0003;
-	}
-	if ((level == 35)&&(subdetlevel == 6)){ //Disk in the TEC 
-		deltaRW(1)=0.015; deltaRW(2)=0.015; deltaRW(3)=0.03; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 34)&&(subdetlevel == 6)){ //Side on a Disk
-		deltaRW(1)=0.01; deltaRW(2)=0.01; deltaRW(3)=0.02; deltaRW(4)=0.00005; deltaRW(5)=0.00005; deltaRW(6)=0.00005;
-	}
-	if ((level == 33)&&(subdetlevel == 6)){ //Petal on a Side of a Disk
-		deltaRW(1)=0.01; deltaRW(2)=0.01; deltaRW(3)=0.02; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 32)&&(subdetlevel == 6)){ //Ring on a Petal
-		deltaRW(1)=0.007; deltaRW(2)=0.007; deltaRW(3)=0.015; deltaRW(4)=0.00015; deltaRW(5)=0.00015; deltaRW(6)=0.00015;
-	}
-	if ((level == 2)&&(subdetlevel == 6)){ //Det on a Ring
-		deltaRW(1)=0.002; deltaRW(2)=0.002; deltaRW(3)=0.005; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	if ((level == 1)&&(subdetlevel == 6)){ // DetUnit on a Ring
-		deltaRW(1)=0.002; deltaRW(2)=0.002; deltaRW(3)=0.005; deltaRW(4)=0.0001; deltaRW(5)=0.0001; deltaRW(6)=0.0001;
-	}
-	
-	return deltaRW;
-	
+AlgebraicVector CreateSurveyRcds::getStructureErrors(int level, int subdetlevel) {
+  AlgebraicVector deltaRW(6);
+  deltaRW(1) = 0.0;
+  deltaRW(2) = 0.0;
+  deltaRW(3) = 0.0;
+  deltaRW(4) = 0.0;
+  deltaRW(5) = 0.0;
+  deltaRW(6) = 0.0;
+  //PIXEL
+  if ((level == 37) && (subdetlevel == 1)) {  //Pixel Detector in Tracker
+    deltaRW(1) = 0.2;
+    deltaRW(2) = 0.2;
+    deltaRW(3) = 0.2;
+    deltaRW(4) = 0.0017;
+    deltaRW(5) = 0.0017;
+    deltaRW(6) = 0.0017;
+  }
+  //STRIP
+  if ((level == 38) && (subdetlevel == 3)) {  //Strip Tracker in Tracker
+    deltaRW(1) = 0.2;
+    deltaRW(2) = 0.2;
+    deltaRW(3) = 0.2;
+    deltaRW(4) = 0.0004;
+    deltaRW(5) = 0.0004;
+    deltaRW(6) = 0.0004;
+  }
+  //TRACKER
+  if ((level == 39) && (subdetlevel == 1)) {  //Tracker
+    deltaRW(1) = 0.0;
+    deltaRW(2) = 0.0;
+    deltaRW(3) = 0.0;
+    deltaRW(4) = 0.0;
+    deltaRW(5) = 0.0;
+    deltaRW(6) = 0.0;
+  }
+  //TPB
+  if ((level == 7) && (subdetlevel == 1)) {  //Barrel Pixel in Pixel
+    deltaRW(1) = 0.05;
+    deltaRW(2) = 0.05;
+    deltaRW(3) = 0.1;
+    deltaRW(4) = 0.0008;
+    deltaRW(5) = 0.0008;
+    deltaRW(6) = 0.0008;
+  }
+  if ((level == 6) && (subdetlevel == 1)) {  //HalfBarrel in Barrel Pixel
+    deltaRW(1) = 0.015;
+    deltaRW(2) = 0.015;
+    deltaRW(3) = 0.03;
+    deltaRW(4) = 0.0003;
+    deltaRW(5) = 0.0003;
+    deltaRW(6) = 0.0003;
+  }
+  if ((level == 5) && (subdetlevel == 1)) {  //HalfShell in HalfBarrel
+    deltaRW(1) = 0.005;
+    deltaRW(2) = 0.005;
+    deltaRW(3) = 0.01;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 4) && (subdetlevel == 1)) {  //Ladder in HalfShell
+    deltaRW(1) = 0.001;
+    deltaRW(2) = 0.001;
+    deltaRW(3) = 0.002;
+    deltaRW(4) = 0.00005;
+    deltaRW(5) = 0.00005;
+    deltaRW(6) = 0.00005;
+  }
+  if ((level == 2) && (subdetlevel == 1)) {  //Det in Ladder
+    deltaRW(1) = 0.0005;
+    deltaRW(2) = 0.001;
+    deltaRW(3) = 0.001;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 1) && (subdetlevel == 1)) {  //DetUnit in Ladder
+    deltaRW(1) = 0.0005;
+    deltaRW(2) = 0.001;
+    deltaRW(3) = 0.001;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  //TPE
+  if ((level == 13) && (subdetlevel == 2)) {  //Forward Pixel in Pixel
+    deltaRW(1) = 0.05;
+    deltaRW(2) = 0.05;
+    deltaRW(3) = 0.1;
+    deltaRW(4) = 0.0004;
+    deltaRW(5) = 0.0004;
+    deltaRW(6) = 0.0004;
+  }
+  if ((level == 12) && (subdetlevel == 2)) {  //HalfCylinder in Forward Pixel
+    deltaRW(1) = 0.015;
+    deltaRW(2) = 0.015;
+    deltaRW(3) = 0.03;
+    deltaRW(4) = 0.00015;
+    deltaRW(5) = 0.00015;
+    deltaRW(6) = 0.00015;
+  }
+  if ((level == 11) && (subdetlevel == 2)) {  //HalfDisk in HalfCylinder
+    deltaRW(1) = 0.005;
+    deltaRW(2) = 0.005;
+    deltaRW(3) = 0.01;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 10) && (subdetlevel == 2)) {  //Blade in HalfDisk
+    deltaRW(1) = 0.001;
+    deltaRW(2) = 0.001;
+    deltaRW(3) = 0.002;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 9) && (subdetlevel == 2)) {  //Panel in Blade
+    deltaRW(1) = 0.001;
+    deltaRW(2) = 0.0008;
+    deltaRW(3) = 0.0006;
+    deltaRW(4) = 0.0002;
+    deltaRW(5) = 0.0002;
+    deltaRW(6) = 0.0002;
+  }
+  if ((level == 2) && (subdetlevel == 2)) {  //Det in Panel
+    deltaRW(1) = 0.0005;
+    deltaRW(2) = 0.0004;
+    deltaRW(3) = 0.0006;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0003;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 1) && (subdetlevel == 2)) {  //DetUnit in Panel
+    deltaRW(1) = 0.0005;
+    deltaRW(2) = 0.0004;
+    deltaRW(3) = 0.0006;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0003;
+    deltaRW(6) = 0.0001;
+  }
+  //TIB
+  if ((level == 20) && (subdetlevel == 3)) {  //TIB in Strip Tracker
+    deltaRW(1) = 0.08;
+    deltaRW(2) = 0.08;
+    deltaRW(3) = 0.04;
+    deltaRW(4) = 0.0017;
+    deltaRW(5) = 0.0017;
+    deltaRW(6) = 0.0017;
+  }
+  if ((level == 19) && (subdetlevel == 3)) {  //HalfBarrel in TIB
+    deltaRW(1) = 0.04;
+    deltaRW(2) = 0.04;
+    deltaRW(3) = 0.02;
+    deltaRW(4) = 0.0003;
+    deltaRW(5) = 0.0003;
+    deltaRW(6) = 0.0003;
+  }
+  if ((level == 18) && (subdetlevel == 3)) {  //Layer in HalfBarrel
+    deltaRW(1) = 0.02;
+    deltaRW(2) = 0.02;
+    deltaRW(3) = 0.01;
+    deltaRW(4) = 0.0006;
+    deltaRW(5) = 0.0006;
+    deltaRW(6) = 0.0006;
+  }
+  if ((level == 17) && (subdetlevel == 3)) {  //HalfShell in Layer
+    deltaRW(1) = 0.01;
+    deltaRW(2) = 0.01;
+    deltaRW(3) = 0.005;
+    deltaRW(4) = 0.0002;
+    deltaRW(5) = 0.0002;
+    deltaRW(6) = 0.0002;
+  }
+  if ((level == 16) && (subdetlevel == 3)) {  //Surface in a HalfShell
+    deltaRW(1) = 0.004;
+    deltaRW(2) = 0.004;
+    deltaRW(3) = 0.008;
+    deltaRW(4) = 0.0002;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 15) && (subdetlevel == 3)) {  //String in a Surface
+    deltaRW(1) = 0.004;
+    deltaRW(2) = 0.004;
+    deltaRW(3) = 0.008;
+    deltaRW(4) = 0.0002;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 2) && (subdetlevel == 3)) {  //Det in a String
+    deltaRW(1) = 0.002;
+    deltaRW(2) = 0.002;
+    deltaRW(3) = 0.004;
+    deltaRW(4) = 0.0004;
+    deltaRW(5) = 0.0002;
+    deltaRW(6) = 0.0002;
+  }
+  if ((level == 1) && (subdetlevel == 3)) {  //DetUnit in a String
+    deltaRW(1) = 0.002;
+    deltaRW(2) = 0.002;
+    deltaRW(3) = 0.004;
+    deltaRW(4) = 0.0004;
+    deltaRW(5) = 0.0002;
+    deltaRW(6) = 0.0002;
+  }
+  //TID
+  if ((level == 25) && (subdetlevel == 4)) {  //TID in Strip Tracker
+    deltaRW(1) = 0.05;
+    deltaRW(2) = 0.05;
+    deltaRW(3) = 0.1;
+    deltaRW(4) = 0.0003;
+    deltaRW(5) = 0.0003;
+    deltaRW(6) = 0.0003;
+  }
+  if ((level == 24) && (subdetlevel == 4)) {  //Disk in a TID
+    deltaRW(1) = 0.01;
+    deltaRW(2) = 0.01;
+    deltaRW(3) = 0.02;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 23) && (subdetlevel == 4)) {  //Ring is a Disk
+    deltaRW(1) = 0.004;
+    deltaRW(2) = 0.004;
+    deltaRW(3) = 0.005;
+    deltaRW(4) = 0.00004;
+    deltaRW(5) = 0.00004;
+    deltaRW(6) = 0.00004;
+  }
+  if ((level == 22) && (subdetlevel == 4)) {  //Side of a Ring
+    deltaRW(1) = 0.002;
+    deltaRW(2) = 0.002;
+    deltaRW(3) = 0.002;
+    deltaRW(4) = 0.00004;
+    deltaRW(5) = 0.00004;
+    deltaRW(6) = 0.00004;
+  }
+  if ((level == 2) && (subdetlevel == 4)) {  //Det in a Side
+    deltaRW(1) = 0.002;
+    deltaRW(2) = 0.002;
+    deltaRW(3) = 0.002;
+    deltaRW(4) = 0.0002;
+    deltaRW(5) = 0.0002;
+    deltaRW(6) = 0.0002;
+  }
+  if ((level == 1) && (subdetlevel == 4)) {  //DetUnit is a Side
+    deltaRW(1) = 0.002;
+    deltaRW(2) = 0.002;
+    deltaRW(3) = 0.002;
+    deltaRW(4) = 0.0002;
+    deltaRW(5) = 0.0002;
+    deltaRW(6) = 0.0002;
+  }
+  //TOB
+  if ((level == 30) && (subdetlevel == 5)) {  // TOB in Strip Tracker
+    deltaRW(1) = 0.06;
+    deltaRW(2) = 0.06;
+    deltaRW(3) = 0.06;
+    deltaRW(4) = 0.00025;
+    deltaRW(5) = 0.00025;
+    deltaRW(6) = 0.00025;
+  }
+  if ((level == 29) && (subdetlevel == 5)) {  //HalfBarrel in the TOB
+    deltaRW(1) = 0.014;
+    deltaRW(2) = 0.014;
+    deltaRW(3) = 0.05;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 28) && (subdetlevel == 5)) {  //Layer in a HalfBarrel
+    deltaRW(1) = 0.02;
+    deltaRW(2) = 0.02;
+    deltaRW(3) = 0.02;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 27) && (subdetlevel == 5)) {  //Rod in a Layer
+    deltaRW(1) = 0.01;
+    deltaRW(2) = 0.01;
+    deltaRW(3) = 0.02;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 2) && (subdetlevel == 5)) {  //Det in a Rod
+    deltaRW(1) = 0.003;
+    deltaRW(2) = 0.003;
+    deltaRW(3) = 0.01;
+    deltaRW(4) = 0.0002;
+    deltaRW(5) = 0.0002;
+    deltaRW(6) = 0.0002;
+  }
+  if ((level == 1) && (subdetlevel == 5)) {  //DetUnit in a Rod
+    deltaRW(1) = 0.003;
+    deltaRW(2) = 0.003;
+    deltaRW(3) = 0.01;
+    deltaRW(4) = 0.0002;
+    deltaRW(5) = 0.0002;
+    deltaRW(6) = 0.0002;
+  }
+  //TEC
+  if ((level == 36) && (subdetlevel == 6)) {  //TEC in the Strip Tracker
+    deltaRW(1) = 0.06;
+    deltaRW(2) = 0.06;
+    deltaRW(3) = 0.1;
+    deltaRW(4) = 0.0003;
+    deltaRW(5) = 0.0003;
+    deltaRW(6) = 0.0003;
+  }
+  if ((level == 35) && (subdetlevel == 6)) {  //Disk in the TEC
+    deltaRW(1) = 0.015;
+    deltaRW(2) = 0.015;
+    deltaRW(3) = 0.03;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 34) && (subdetlevel == 6)) {  //Side on a Disk
+    deltaRW(1) = 0.01;
+    deltaRW(2) = 0.01;
+    deltaRW(3) = 0.02;
+    deltaRW(4) = 0.00005;
+    deltaRW(5) = 0.00005;
+    deltaRW(6) = 0.00005;
+  }
+  if ((level == 33) && (subdetlevel == 6)) {  //Petal on a Side of a Disk
+    deltaRW(1) = 0.01;
+    deltaRW(2) = 0.01;
+    deltaRW(3) = 0.02;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 32) && (subdetlevel == 6)) {  //Ring on a Petal
+    deltaRW(1) = 0.007;
+    deltaRW(2) = 0.007;
+    deltaRW(3) = 0.015;
+    deltaRW(4) = 0.00015;
+    deltaRW(5) = 0.00015;
+    deltaRW(6) = 0.00015;
+  }
+  if ((level == 2) && (subdetlevel == 6)) {  //Det on a Ring
+    deltaRW(1) = 0.002;
+    deltaRW(2) = 0.002;
+    deltaRW(3) = 0.005;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
+  if ((level == 1) && (subdetlevel == 6)) {  // DetUnit on a Ring
+    deltaRW(1) = 0.002;
+    deltaRW(2) = 0.002;
+    deltaRW(3) = 0.005;
+    deltaRW(4) = 0.0001;
+    deltaRW(5) = 0.0001;
+    deltaRW(6) = 0.0001;
+  }
 
+  return deltaRW;
 }
 
 // Plug in to framework
diff --git a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.h b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.h
index 0bff3ee74f866..2f5a61917f9b3 100644
--- a/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.h
+++ b/Alignment/SurveyAnalysis/plugins/CreateSurveyRcds.h
@@ -18,46 +18,34 @@
 class AlignableSurface;
 class Alignments;
 
-class CreateSurveyRcds:
-	public SurveyInputBase
-	{
-	public:
-		
-		CreateSurveyRcds(
-				 const edm::ParameterSet&
-				 );
-		
-		void analyze(
-				     const edm::Event&, 
-				     const edm::EventSetup&
-				     ) override;
-		
-	private:
-		
-		/// module which modifies the geometry
-		void setGeometry(Alignable* );
-		/// module which creates/inserts the survey errors
-		void setSurveyErrors( Alignable* );
-		
-		/// default values for assembly precision
-		AlgebraicVector getStructurePlacements(int ,int );
-		
-		/// default values for survey uncertainty
-		AlgebraicVector getStructureErrors(int ,int );
-		
-		
-		
-		std::string m_inputGeom;
-		double m_inputSimpleMis;
-		bool m_generatedRandom;
-		bool m_generatedSimple;
-		
-		
-		SurveyInputTextReader::MapType uIdMap;
-		
-		std::string textFileName;
-		
-		edm::ESHandle<Alignments> alignments;
-	};
+class CreateSurveyRcds : public SurveyInputBase {
+public:
+  CreateSurveyRcds(const edm::ParameterSet&);
+
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
+
+private:
+  /// module which modifies the geometry
+  void setGeometry(Alignable*);
+  /// module which creates/inserts the survey errors
+  void setSurveyErrors(Alignable*);
+
+  /// default values for assembly precision
+  AlgebraicVector getStructurePlacements(int, int);
+
+  /// default values for survey uncertainty
+  AlgebraicVector getStructureErrors(int, int);
+
+  std::string m_inputGeom;
+  double m_inputSimpleMis;
+  bool m_generatedRandom;
+  bool m_generatedSimple;
+
+  SurveyInputTextReader::MapType uIdMap;
+
+  std::string textFileName;
+
+  edm::ESHandle<Alignments> alignments;
+};
 
 #endif
diff --git a/Alignment/SurveyAnalysis/plugins/DTSurveyConvert.cc b/Alignment/SurveyAnalysis/plugins/DTSurveyConvert.cc
index 3c57ca4199d8e..3c4f481b3011d 100644
--- a/Alignment/SurveyAnalysis/plugins/DTSurveyConvert.cc
+++ b/Alignment/SurveyAnalysis/plugins/DTSurveyConvert.cc
@@ -11,89 +11,85 @@
 
 #include "Alignment/SurveyAnalysis/plugins/DTSurveyConvert.h"
 
-DTSurveyConvert::DTSurveyConvert(const edm::ParameterSet& iConfig)
-{
-   //now do what ever initialization is needed
-   nameWheel_m2 = iConfig.getUntrackedParameter<std::string>("nameWheel_m2");
-   nameWheel_m1 = iConfig.getUntrackedParameter<std::string>("nameWheel_m1");
-   nameWheel_0 = iConfig.getUntrackedParameter<std::string>("nameWheel_0");
-   nameWheel_p1 = iConfig.getUntrackedParameter<std::string>("nameWheel_p1");
-   nameWheel_p2 = iConfig.getUntrackedParameter<std::string>("nameWheel_p2");
-   
-   nameChambers_m2 = iConfig.getUntrackedParameter<std::string>("nameChambers_m2");
-   nameChambers_m1 = iConfig.getUntrackedParameter<std::string>("nameChambers_m1");
-   nameChambers_0 = iConfig.getUntrackedParameter<std::string>("nameChambers_0");
-   nameChambers_p1 = iConfig.getUntrackedParameter<std::string>("nameChambers_p1");
-   nameChambers_p2 = iConfig.getUntrackedParameter<std::string>("nameChambers_p2");
+DTSurveyConvert::DTSurveyConvert(const edm::ParameterSet &iConfig) {
+  //now do what ever initialization is needed
+  nameWheel_m2 = iConfig.getUntrackedParameter<std::string>("nameWheel_m2");
+  nameWheel_m1 = iConfig.getUntrackedParameter<std::string>("nameWheel_m1");
+  nameWheel_0 = iConfig.getUntrackedParameter<std::string>("nameWheel_0");
+  nameWheel_p1 = iConfig.getUntrackedParameter<std::string>("nameWheel_p1");
+  nameWheel_p2 = iConfig.getUntrackedParameter<std::string>("nameWheel_p2");
 
-   wheel_m2 = iConfig.getUntrackedParameter<bool>("wheel_m2");
-   wheel_m1 = iConfig.getUntrackedParameter<bool>("wheel_m1");
-   wheel_0 = iConfig.getUntrackedParameter<bool>("wheel_0");
-   wheel_p1 = iConfig.getUntrackedParameter<bool>("wheel_p1");
-   wheel_p2 = iConfig.getUntrackedParameter<bool>("wheel_p2");
+  nameChambers_m2 = iConfig.getUntrackedParameter<std::string>("nameChambers_m2");
+  nameChambers_m1 = iConfig.getUntrackedParameter<std::string>("nameChambers_m1");
+  nameChambers_0 = iConfig.getUntrackedParameter<std::string>("nameChambers_0");
+  nameChambers_p1 = iConfig.getUntrackedParameter<std::string>("nameChambers_p1");
+  nameChambers_p2 = iConfig.getUntrackedParameter<std::string>("nameChambers_p2");
 
-   outputFileName = iConfig.getUntrackedParameter<std::string>("OutputTextFile");
-   WriteToDB = iConfig.getUntrackedParameter<bool>("writeToDB");
-  
+  wheel_m2 = iConfig.getUntrackedParameter<bool>("wheel_m2");
+  wheel_m1 = iConfig.getUntrackedParameter<bool>("wheel_m1");
+  wheel_0 = iConfig.getUntrackedParameter<bool>("wheel_0");
+  wheel_p1 = iConfig.getUntrackedParameter<bool>("wheel_p1");
+  wheel_p2 = iConfig.getUntrackedParameter<bool>("wheel_p2");
+
+  outputFileName = iConfig.getUntrackedParameter<std::string>("OutputTextFile");
+  WriteToDB = iConfig.getUntrackedParameter<bool>("writeToDB");
 }
 
 // ------------ method called to for each event  ------------
-void
-DTSurveyConvert::analyze(const edm::Event&, const edm::EventSetup& iSetup)
-{
-
+void DTSurveyConvert::analyze(const edm::Event &, const edm::EventSetup &iSetup) {
   edm::ESHandle<DTGeometry> pDD;
-  iSetup.get<MuonGeometryRecord>().get( pDD );
- 
+  iSetup.get<MuonGeometryRecord>().get(pDD);
+
   std::ofstream outFile(outputFileName.c_str());
-  
+
   if (wheel_m2 == true) {
     DTSurvey *wheel = new DTSurvey(nameWheel_m2, nameChambers_m2, -2);
     wheel->ReadChambers(pDD);
     wheel->CalculateChambers();
-    outFile << *wheel; 
+    outFile << *wheel;
     wheelList.push_back(wheel);
-  } 
+  }
   if (wheel_m1 == true) {
     DTSurvey *wheel = new DTSurvey(nameWheel_m1, nameChambers_m1, -1);
     wheel->ReadChambers(pDD);
     wheel->CalculateChambers();
-    outFile << *wheel; 
+    outFile << *wheel;
     wheelList.push_back(wheel);
-  } 
+  }
   if (wheel_0 == true) {
     DTSurvey *wheel = new DTSurvey(nameWheel_0, nameChambers_0, 0);
     wheel->ReadChambers(pDD);
     wheel->CalculateChambers();
-    outFile << *wheel; 
+    outFile << *wheel;
     wheelList.push_back(wheel);
-  } 
+  }
   if (wheel_p1 == true) {
     DTSurvey *wheel = new DTSurvey(nameWheel_p1, nameChambers_p1, 1);
     wheel->ReadChambers(pDD);
     wheel->CalculateChambers();
-    outFile << *wheel; 
+    outFile << *wheel;
     wheelList.push_back(wheel);
-  } 
-  if(wheel_p2 == true) {
+  }
+  if (wheel_p2 == true) {
     DTSurvey *wheel = new DTSurvey(nameWheel_p2, nameChambers_p2, 2);
     wheel->ReadChambers(pDD);
     wheel->CalculateChambers();
-    outFile << *wheel; 
+    outFile << *wheel;
     wheelList.push_back(wheel);
   }
   outFile.close();
 
-  if(WriteToDB == true) {
+  if (WriteToDB == true) {
     // Instantiate the helper class
     MuonAlignment align(iSetup);
     std::ifstream inFile(outputFileName.c_str());
-    while(!inFile.eof()) {
+    while (!inFile.eof()) {
       float dx, dy, dz, sigma_dx, sigma_dy, sigma_dz;
       float alpha, beta, gamma, sigma_alpha, sigma_beta, sigma_gamma;
-      inFile >> dx >> sigma_dx >> dy >> sigma_dy >> dz >> sigma_dz
-             >> alpha >> sigma_alpha >> beta >> sigma_beta >> gamma >> sigma_gamma; 
-      if(inFile.eof()) break;
+      inFile >> dx >> sigma_dx >> dy >> sigma_dy >> dz >> sigma_dz >> alpha >> sigma_alpha >> beta >> sigma_beta >>
+          gamma >> sigma_gamma;
+      if (inFile.eof())
+        break;
       std::vector<float> displacement;
       displacement.push_back(dx);
       displacement.push_back(dy);
diff --git a/Alignment/SurveyAnalysis/plugins/DTSurveyConvert.h b/Alignment/SurveyAnalysis/plugins/DTSurveyConvert.h
index f91bcbad56b9a..a77be97829995 100644
--- a/Alignment/SurveyAnalysis/plugins/DTSurveyConvert.h
+++ b/Alignment/SurveyAnalysis/plugins/DTSurveyConvert.h
@@ -5,7 +5,7 @@
 //
 // Package:    DTSurveyConvert
 // Class:      DTSurveyConvert
-// 
+//
 /**\class DTSurveyConvert DTSurveyConvert.cc Alignment/DTSurveyConvert/src/DTSurveyConvert.cc
 
  Description: Reads survey information, process it and outputs a text file with results
@@ -23,32 +23,30 @@
 
 class DTSurvey;
 
-class DTSurveyConvert : public edm::EDAnalyzer
-{
-   public:
-      explicit DTSurveyConvert(const edm::ParameterSet&);
-
-   private:
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      std::vector<DTSurvey *> wheelList;
-      std::string nameWheel_m2; 
-      std::string nameWheel_m1; 
-      std::string nameWheel_0; 
-      std::string nameWheel_p1; 
-      std::string nameWheel_p2;
-      std::string nameChambers_m2;
-      std::string nameChambers_m1;
-      std::string nameChambers_0;
-      std::string nameChambers_p1;
-      std::string nameChambers_p2;
-      std::string outputFileName;
-      bool wheel_m2;
-      bool wheel_m1;
-      bool wheel_0;
-      bool wheel_p1;
-      bool wheel_p2;
-      bool WriteToDB;
+class DTSurveyConvert : public edm::EDAnalyzer {
+public:
+  explicit DTSurveyConvert(const edm::ParameterSet &);
+
+private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  std::vector<DTSurvey *> wheelList;
+  std::string nameWheel_m2;
+  std::string nameWheel_m1;
+  std::string nameWheel_0;
+  std::string nameWheel_p1;
+  std::string nameWheel_p2;
+  std::string nameChambers_m2;
+  std::string nameChambers_m1;
+  std::string nameChambers_0;
+  std::string nameChambers_p1;
+  std::string nameChambers_p2;
+  std::string outputFileName;
+  bool wheel_m2;
+  bool wheel_m1;
+  bool wheel_0;
+  bool wheel_p1;
+  bool wheel_p2;
+  bool WriteToDB;
 };
 
 #endif
-
diff --git a/Alignment/SurveyAnalysis/plugins/SurveyAlignmentAlgorithm.cc b/Alignment/SurveyAnalysis/plugins/SurveyAlignmentAlgorithm.cc
index 8bf01f146493d..0223b0a45cfde 100644
--- a/Alignment/SurveyAnalysis/plugins/SurveyAlignmentAlgorithm.cc
+++ b/Alignment/SurveyAnalysis/plugins/SurveyAlignmentAlgorithm.cc
@@ -5,28 +5,21 @@
 
 #include "Alignment/SurveyAnalysis/plugins/SurveyAlignmentAlgorithm.h"
 
-SurveyAlignmentAlgorithm::SurveyAlignmentAlgorithm(const edm::ParameterSet& cfg):
-  AlignmentAlgorithmBase(cfg),
-  theOutfile(cfg.getParameter<std::string>("outfile")),
-  theIterations(cfg.getParameter<unsigned int>("nIteration")),
-  theLevels(cfg.getParameter< std::vector<std::string> >("levels"))
-{
-}
-
-void SurveyAlignmentAlgorithm::initialize(const edm::EventSetup&,
-					  AlignableTracker*,
-					  AlignableMuon*,
-					  AlignableExtras*,
-					  AlignmentParameterStore* store)
-{
+SurveyAlignmentAlgorithm::SurveyAlignmentAlgorithm(const edm::ParameterSet& cfg)
+    : AlignmentAlgorithmBase(cfg),
+      theOutfile(cfg.getParameter<std::string>("outfile")),
+      theIterations(cfg.getParameter<unsigned int>("nIteration")),
+      theLevels(cfg.getParameter<std::vector<std::string> >("levels")) {}
+
+void SurveyAlignmentAlgorithm::initialize(
+    const edm::EventSetup&, AlignableTracker*, AlignableMuon*, AlignableExtras*, AlignmentParameterStore* store) {
   std::vector<align::StructureType> levels;
 
   // FIXME: - currently defaulting to RunI as this was the previous behaviour
   //        - check this, when resurrecting this code in the future
   AlignableObjectId alignableObjectId{AlignableObjectId::Geometry::General};
 
-  for (unsigned int l = 0; l < theLevels.size(); ++l)
-  {
+  for (unsigned int l = 0; l < theLevels.size(); ++l) {
     levels.push_back(alignableObjectId.stringToId(theLevels[l].c_str()));
   }
 
diff --git a/Alignment/SurveyAnalysis/plugins/SurveyAlignmentAlgorithm.h b/Alignment/SurveyAnalysis/plugins/SurveyAlignmentAlgorithm.h
index 08b952498753d..87980f38c1823 100644
--- a/Alignment/SurveyAnalysis/plugins/SurveyAlignmentAlgorithm.h
+++ b/Alignment/SurveyAnalysis/plugins/SurveyAlignmentAlgorithm.h
@@ -12,42 +12,31 @@
 
 #include "Alignment/CommonAlignmentAlgorithm/interface/AlignmentAlgorithmBase.h"
 
-namespace edm { class ParameterSet; class EventSetup; }
+namespace edm {
+  class ParameterSet;
+  class EventSetup;
+}  // namespace edm
 
 class AlignmentParameterStore;
 class AlignableMuon;
 class AlignableTracker;
 class AlignableExtras;
 
-class SurveyAlignmentAlgorithm : public AlignmentAlgorithmBase
-{
-  public:
-
-  SurveyAlignmentAlgorithm(
-			   const edm::ParameterSet&
-			   );
+class SurveyAlignmentAlgorithm : public AlignmentAlgorithmBase {
+public:
+  SurveyAlignmentAlgorithm(const edm::ParameterSet&);
 
   /// call at start of job
   void initialize(
-			  const edm::EventSetup&,
-			  AlignableTracker*,
-			  AlignableMuon*,
-			  AlignableExtras*,
-			  AlignmentParameterStore*
-			  ) override;
+      const edm::EventSetup&, AlignableTracker*, AlignableMuon*, AlignableExtras*, AlignmentParameterStore*) override;
 
   /// call at end of job
   void terminate(const edm::EventSetup& iSetup) override {}
 
   /// run for every event
-  void run(
-		   const edm::EventSetup&,
-		   const AlignmentAlgorithmBase::EventInfo &
-		   ) override {}
-
-
-  private:
+  void run(const edm::EventSetup&, const AlignmentAlgorithmBase::EventInfo&) override {}
 
+private:
   std::string theOutfile;
 
   unsigned int theIterations;
diff --git a/Alignment/SurveyAnalysis/plugins/SurveyDBUploader.cc b/Alignment/SurveyAnalysis/plugins/SurveyDBUploader.cc
index 188ff2330ca49..b6c4933212443 100644
--- a/Alignment/SurveyAnalysis/plugins/SurveyDBUploader.cc
+++ b/Alignment/SurveyAnalysis/plugins/SurveyDBUploader.cc
@@ -9,61 +9,49 @@
 
 #include "Alignment/SurveyAnalysis/plugins/SurveyDBUploader.h"
 
-SurveyDBUploader::SurveyDBUploader(const edm::ParameterSet& cfg):
-  theValueRcd( cfg.getParameter<std::string>("valueRcd") ),
-  theErrorExtendedRcd( cfg.getParameter<std::string>("errorRcd") ),
-  theValues(nullptr),
-  theErrors(nullptr)
-{
-}
+SurveyDBUploader::SurveyDBUploader(const edm::ParameterSet& cfg)
+    : theValueRcd(cfg.getParameter<std::string>("valueRcd")),
+      theErrorExtendedRcd(cfg.getParameter<std::string>("errorRcd")),
+      theValues(nullptr),
+      theErrors(nullptr) {}
 
-void SurveyDBUploader::endJob()
-{
+void SurveyDBUploader::endJob() {
   theValues = new SurveyValues;
   theErrors = new SurveyErrors;
 
   theValues->m_align.reserve(65536);
   theErrors->m_surveyErrors.reserve(65536);
 
-  getSurveyInfo( SurveyInputBase::detector() );
+  getSurveyInfo(SurveyInputBase::detector());
 
   edm::Service<cond::service::PoolDBOutputService> poolDbService;
 
-  if( poolDbService.isAvailable() )
-  {
-    poolDbService->writeOne<SurveyValues>
-      (theValues, poolDbService->currentTime(), theValueRcd);
-    poolDbService->writeOne<SurveyErrors>
-      (theErrors, poolDbService->currentTime(), theErrorExtendedRcd);
-  }
-  else
-    throw cms::Exception("ConfigError")
-      << "PoolDBOutputService is not available";
+  if (poolDbService.isAvailable()) {
+    poolDbService->writeOne<SurveyValues>(theValues, poolDbService->currentTime(), theValueRcd);
+    poolDbService->writeOne<SurveyErrors>(theErrors, poolDbService->currentTime(), theErrorExtendedRcd);
+  } else
+    throw cms::Exception("ConfigError") << "PoolDBOutputService is not available";
 }
 
-void SurveyDBUploader::getSurveyInfo(const Alignable* ali)
-{
+void SurveyDBUploader::getSurveyInfo(const Alignable* ali) {
   const auto& comp = ali->components();
 
   unsigned int nComp = comp.size();
 
-  for (unsigned int i = 0; i < nComp; ++i) getSurveyInfo(comp[i]);
+  for (unsigned int i = 0; i < nComp; ++i)
+    getSurveyInfo(comp[i]);
 
   const SurveyDet* survey = ali->survey();
 
   const align::PositionType& pos = survey->position();
   const align::RotationType& rot = survey->rotation();
 
-  SurveyValue value( CLHEP::Hep3Vector( pos.x(), pos.y(), pos.z() ),
-		     CLHEP::HepRotation
-		     ( CLHEP::HepRep3x3( rot.xx(), rot.xy(), rot.xz(),
-					 rot.yx(), rot.yy(), rot.yz(),
-					 rot.zx(), rot.zy(), rot.zz() ) ),
-		     ali->id() );
+  SurveyValue value(CLHEP::Hep3Vector(pos.x(), pos.y(), pos.z()),
+                    CLHEP::HepRotation(CLHEP::HepRep3x3(
+                        rot.xx(), rot.xy(), rot.xz(), rot.yx(), rot.yy(), rot.yz(), rot.zx(), rot.zy(), rot.zz())),
+                    ali->id());
 
-  SurveyError error( ali->alignableObjectId(),
-		     ali->id(),
-		     survey->errors() );
+  SurveyError error(ali->alignableObjectId(), ali->id(), survey->errors());
 
   theValues->m_align.push_back(value);
   theErrors->m_surveyErrors.push_back(error);
diff --git a/Alignment/SurveyAnalysis/plugins/SurveyDBUploader.h b/Alignment/SurveyAnalysis/plugins/SurveyDBUploader.h
index 448dddf7ace84..0dda349e7d6c6 100644
--- a/Alignment/SurveyAnalysis/plugins/SurveyDBUploader.h
+++ b/Alignment/SurveyAnalysis/plugins/SurveyDBUploader.h
@@ -24,39 +24,28 @@ class Alignments;
 class AlignTransform;
 struct SurveyErrors;
 
-class SurveyDBUploader:
-  public edm::EDAnalyzer
-{
+class SurveyDBUploader : public edm::EDAnalyzer {
   typedef AlignTransform SurveyValue;
-  typedef Alignments     SurveyValues;
-
-  public:
+  typedef Alignments SurveyValues;
 
+public:
   /// Set value & error tag names for survey records.
-  SurveyDBUploader(
-		   const edm::ParameterSet&
-		   );
+  SurveyDBUploader(const edm::ParameterSet&);
 
-  void analyze(
-		       const edm::Event&,
-		       const edm::EventSetup&
-		       ) override {}
+  void analyze(const edm::Event&, const edm::EventSetup&) override {}
 
   /// Upload to DB
   void endJob() override;
 
-  private:
-
+private:
   /// Get survey info of an alignable in the detector.
-  void getSurveyInfo(
-		     const Alignable*
-		     );
+  void getSurveyInfo(const Alignable*);
 
-  std::string theValueRcd; // tag name of survey values record in DB
-  std::string theErrorExtendedRcd; // tag name of survey errors record in DB
+  std::string theValueRcd;          // tag name of survey values record in DB
+  std::string theErrorExtendedRcd;  // tag name of survey errors record in DB
 
-  SurveyValues* theValues; // survey values for all alignables in detector
-  SurveyErrors* theErrors; // survey errors for all alignables in detector
+  SurveyValues* theValues;  // survey values for all alignables in detector
+  SurveyErrors* theErrors;  // survey errors for all alignables in detector
 };
 
 #endif
diff --git a/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.cc b/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.cc
index 73492e6738254..dc07924ecfec8 100644
--- a/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.cc
+++ b/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.cc
@@ -7,7 +7,7 @@
 #include "Alignment/CommonAlignment/interface/AlignableModifier.h"
 #include "Alignment/TrackerAlignment/interface/TrackerAlignment.h"
 #include "Alignment/TrackerAlignment/interface/TrackerScenarioBuilder.h"
-#include "Alignment/CommonAlignment/interface/Alignable.h" 
+#include "Alignment/CommonAlignment/interface/Alignable.h"
 
 #include "Alignment/SurveyAnalysis/plugins/SurveyDataConverter.h"
 
@@ -15,75 +15,84 @@
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
 //__________________________________________________________________________________________________
-SurveyDataConverter::SurveyDataConverter(const edm::ParameterSet& iConfig) :
-  theParameterSet( iConfig )
-{  
-}
+SurveyDataConverter::SurveyDataConverter(const edm::ParameterSet& iConfig) : theParameterSet(iConfig) {}
 
 //__________________________________________________________________________________________________
-void SurveyDataConverter::analyze( const edm::Event& iEvent, const edm::EventSetup& iSetup )
-{
+void SurveyDataConverter::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   //Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
   const TrackerTopology* const tTopo = tTopoHandle.product();
-  
+
   edm::LogInfo("SurveyDataConverter") << "Analyzer called";
   applyfineinfo = theParameterSet.getParameter<bool>("applyFineInfo");
   applycoarseinfo = theParameterSet.getParameter<bool>("applyCoarseInfo");
   adderrors = theParameterSet.getParameter<bool>("applyErrors");
 
   // Read in the information from the text files
-  edm::ParameterSet textFiles = theParameterSet.getParameter<edm::ParameterSet>( "textFileNames" );
+  edm::ParameterSet textFiles = theParameterSet.getParameter<edm::ParameterSet>("textFileNames");
 
-  std::string textFileNames[NFILES]; 
-  std::string fileType[NFILES];    
-  textFileNames[0] = textFiles.getUntrackedParameter<std::string>("forTIB","NONE");  
+  std::string textFileNames[NFILES];
+  std::string fileType[NFILES];
+  textFileNames[0] = textFiles.getUntrackedParameter<std::string>("forTIB", "NONE");
   fileType[0] = "TIB";
-  textFileNames[1] = textFiles.getUntrackedParameter<std::string>("forTID","NONE");
+  textFileNames[1] = textFiles.getUntrackedParameter<std::string>("forTID", "NONE");
   fileType[1] = "TID";
 
   SurveyDataReader dataReader;
-  for (int ii=0 ; ii<NFILES ;ii++) {
-    if ( textFileNames[ii] == "NONE" )
+  for (int ii = 0; ii < NFILES; ii++) {
+    if (textFileNames[ii] == "NONE")
       throw cms::Exception("BadConfig") << fileType[ii] << " input file not found in configuration";
-    dataReader.readFile( textFileNames[ii], fileType[ii], tTopo );
+    dataReader.readFile(textFileNames[ii], fileType[ii], tTopo);
   }
 
   // Get info and map
   const MapType& mapIdToInfo = dataReader.detIdMap();
   std::cout << "DATA HAS BEEN READ INTO THE MAP" << std::endl;
-  std::cout << "DATA HAS BEEN CONVERTED IN ALIGNABLE COORDINATES" << std::endl;  
-
-  TrackerAlignment tr_align( iSetup );
-  if (applycoarseinfo) this->applyCoarseSurveyInfo(tr_align); 
-  if (applyfineinfo) this->applyFineSurveyInfo(tr_align, mapIdToInfo);
-  if (adderrors) this->applyAPEs(tr_align);
+  std::cout << "DATA HAS BEEN CONVERTED IN ALIGNABLE COORDINATES" << std::endl;
+
+  TrackerAlignment tr_align(iSetup);
+  if (applycoarseinfo)
+    this->applyCoarseSurveyInfo(tr_align);
+  if (applyfineinfo)
+    this->applyFineSurveyInfo(tr_align, mapIdToInfo);
+  if (adderrors)
+    this->applyAPEs(tr_align);
   tr_align.saveToDB();
 }
 
 //___________________________________
 //
-void SurveyDataConverter::applyFineSurveyInfo( TrackerAlignment& tr_align, const MapType& map ){
-
+void SurveyDataConverter::applyFineSurveyInfo(TrackerAlignment& tr_align, const MapType& map) {
   std::cout << "Apply fine info: " << std::endl;
-	
-  for ( MapType::const_iterator it = map.begin(); it != map.end(); it++){
-
-    const align::Scalars& align_params = (it)->second; 
-      
-    align::Scalars translations; 
-    translations.push_back(align_params[0]);  
-    translations.push_back(align_params[1]);  
-    translations.push_back(align_params[2]); 
-
-    align::RotationType bRotation(align_params[6], align_params[9], align_params[3],
-                                  align_params[7], align_params[10], align_params[4],
-                                  align_params[8], align_params[11], align_params[5]);
 
-    align::RotationType fRotation(align_params[15], align_params[18], align_params[12],
-                                  align_params[16], align_params[19], align_params[13],
-                                  align_params[17], align_params[20], align_params[14]);
+  for (MapType::const_iterator it = map.begin(); it != map.end(); it++) {
+    const align::Scalars& align_params = (it)->second;
+
+    align::Scalars translations;
+    translations.push_back(align_params[0]);
+    translations.push_back(align_params[1]);
+    translations.push_back(align_params[2]);
+
+    align::RotationType bRotation(align_params[6],
+                                  align_params[9],
+                                  align_params[3],
+                                  align_params[7],
+                                  align_params[10],
+                                  align_params[4],
+                                  align_params[8],
+                                  align_params[11],
+                                  align_params[5]);
+
+    align::RotationType fRotation(align_params[15],
+                                  align_params[18],
+                                  align_params[12],
+                                  align_params[16],
+                                  align_params[19],
+                                  align_params[13],
+                                  align_params[17],
+                                  align_params[20],
+                                  align_params[14]);
 
     // Use "false" for debugging only
     tr_align.moveAlignableTIBTIDs((it)->first, translations, bRotation, fRotation, true);
@@ -92,101 +101,97 @@ void SurveyDataConverter::applyFineSurveyInfo( TrackerAlignment& tr_align, const
 
 //___________________________________
 //
-void SurveyDataConverter::applyCoarseSurveyInfo( TrackerAlignment& tr_align ){
-        
+void SurveyDataConverter::applyCoarseSurveyInfo(TrackerAlignment& tr_align) {
   std::cout << "Apply coarse info: " << std::endl;
-  MisalignScenario = theParameterSet.getParameter<edm::ParameterSet>( "MisalignmentScenario" );
+  MisalignScenario = theParameterSet.getParameter<edm::ParameterSet>("MisalignmentScenario");
 
-  TrackerScenarioBuilder scenarioBuilder( tr_align.getAlignableTracker() );
-  scenarioBuilder.applyScenario( MisalignScenario );
-  
+  TrackerScenarioBuilder scenarioBuilder(tr_align.getAlignableTracker());
+  scenarioBuilder.applyScenario(MisalignScenario);
 }
 
 //___________________________________
 //
-void SurveyDataConverter::applyAPEs( TrackerAlignment& tr_align ) {
-        
+void SurveyDataConverter::applyAPEs(TrackerAlignment& tr_align) {
   std::cout << "Apply APEs: " << std::endl;
   // Neglect sensor-on-module mounting precision (10 um)
   // Irrelevant given other sizes ..
-  std::vector<double> TIBerrors = theParameterSet.getParameter< std::vector<double> >("TIBerrors");
-  std::vector<double> TOBerrors = theParameterSet.getParameter< std::vector<double> >("TOBerrors");
-  std::vector<double> TIDerrors = theParameterSet.getParameter< std::vector<double> >("TIDerrors"); 
-  std::vector<double> TECerrors = theParameterSet.getParameter< std::vector<double> >("TECerrors"); 
-        
+  std::vector<double> TIBerrors = theParameterSet.getParameter<std::vector<double> >("TIBerrors");
+  std::vector<double> TOBerrors = theParameterSet.getParameter<std::vector<double> >("TOBerrors");
+  std::vector<double> TIDerrors = theParameterSet.getParameter<std::vector<double> >("TIDerrors");
+  std::vector<double> TECerrors = theParameterSet.getParameter<std::vector<double> >("TECerrors");
+
   if (TIBerrors.size() < 3 || TOBerrors.size() < 4 || TIDerrors.size() < 4 || TECerrors.size() < 4) {
     std::cout << "APE info not valid : please check test/run-converter.cfg" << std::endl;
     return;
   }
-         
+
   AlignableModifier theModifier{};
-  AlignableTracker* theAlignableTracker = tr_align.getAlignableTracker() ; 
+  AlignableTracker* theAlignableTracker = tr_align.getAlignableTracker();
   align::Alignables::const_iterator iter;
 
   // TIB
   const align::Alignables& theTIBhb = theAlignableTracker->innerHalfBarrels();
-  for (iter = theTIBhb.begin(); iter != theTIBhb.end(); ++iter ) 
-    { theModifier.addAlignmentPositionErrorLocal( *iter, TIBerrors.at(0),
-                                                  TIBerrors.at(0), TIBerrors.at(0) ); }
+  for (iter = theTIBhb.begin(); iter != theTIBhb.end(); ++iter) {
+    theModifier.addAlignmentPositionErrorLocal(*iter, TIBerrors.at(0), TIBerrors.at(0), TIBerrors.at(0));
+  }
   const align::Alignables& theTIBlayers = theAlignableTracker->innerBarrelLayers();
-  for (iter = theTIBlayers.begin(); iter != theTIBlayers.end(); ++iter)
-    { theModifier.addAlignmentPositionErrorLocal( *iter, TIBerrors.at(1),
-                                                  TIBerrors.at(1), TIBerrors.at(1) ); }
+  for (iter = theTIBlayers.begin(); iter != theTIBlayers.end(); ++iter) {
+    theModifier.addAlignmentPositionErrorLocal(*iter, TIBerrors.at(1), TIBerrors.at(1), TIBerrors.at(1));
+  }
   const align::Alignables& theTIBgd = theAlignableTracker->innerBarrelGeomDets();
-  for (iter = theTIBgd.begin(); iter != theTIBgd.end(); ++iter ) 
-    { theModifier.addAlignmentPositionErrorLocal( *iter, TIBerrors.at(2),
-                                                  TIBerrors.at(2), TIBerrors.at(2) ); }
+  for (iter = theTIBgd.begin(); iter != theTIBgd.end(); ++iter) {
+    theModifier.addAlignmentPositionErrorLocal(*iter, TIBerrors.at(2), TIBerrors.at(2), TIBerrors.at(2));
+  }
 
   // TOB
   const align::Alignables& theTOBhb = theAlignableTracker->outerHalfBarrels();
-  for (iter = theTOBhb.begin(); iter != theTOBhb.end(); ++iter )
-    { theModifier.addAlignmentPositionErrorLocal( *iter, TOBerrors.at(0),
-                                                  TOBerrors.at(0), TOBerrors.at(1) ); }
+  for (iter = theTOBhb.begin(); iter != theTOBhb.end(); ++iter) {
+    theModifier.addAlignmentPositionErrorLocal(*iter, TOBerrors.at(0), TOBerrors.at(0), TOBerrors.at(1));
+  }
   const align::Alignables& theTOBrods = theAlignableTracker->outerBarrelRods();
-  for (iter = theTOBrods.begin(); iter != theTOBrods.end(); ++iter ) 
-    { theModifier.addAlignmentPositionErrorLocal( *iter, TOBerrors.at(2),
-                                                  TOBerrors.at(2), TOBerrors.at(2) ); }
+  for (iter = theTOBrods.begin(); iter != theTOBrods.end(); ++iter) {
+    theModifier.addAlignmentPositionErrorLocal(*iter, TOBerrors.at(2), TOBerrors.at(2), TOBerrors.at(2));
+  }
   const align::Alignables& theTOBgd = theAlignableTracker->outerBarrelGeomDets();
-  for (iter = theTOBgd.begin(); iter != theTOBgd.end(); ++iter )
-    { theModifier.addAlignmentPositionErrorLocal( *iter, TOBerrors.at(3),
-                                                  TOBerrors.at(3), TOBerrors.at(3) ); }
+  for (iter = theTOBgd.begin(); iter != theTOBgd.end(); ++iter) {
+    theModifier.addAlignmentPositionErrorLocal(*iter, TOBerrors.at(3), TOBerrors.at(3), TOBerrors.at(3));
+  }
 
   // TID
   const align::Alignables& theTIDs = theAlignableTracker->TIDs();
-  for (iter = theTIDs.begin(); iter != theTIDs.end(); ++iter ) 
-    { theModifier.addAlignmentPositionErrorLocal( *iter, TIDerrors.at(0),
-                                                  TIDerrors.at(0), TIDerrors.at(0) ); }
+  for (iter = theTIDs.begin(); iter != theTIDs.end(); ++iter) {
+    theModifier.addAlignmentPositionErrorLocal(*iter, TIDerrors.at(0), TIDerrors.at(0), TIDerrors.at(0));
+  }
   const align::Alignables& theTIDdiscs = theAlignableTracker->TIDLayers();
-  for (iter = theTIDdiscs.begin(); iter != theTIDdiscs.end(); ++iter )
-    { theModifier.addAlignmentPositionErrorLocal( *iter, TIDerrors.at(1),
-                                                  TIDerrors.at(1), TIDerrors.at(1) ); }
+  for (iter = theTIDdiscs.begin(); iter != theTIDdiscs.end(); ++iter) {
+    theModifier.addAlignmentPositionErrorLocal(*iter, TIDerrors.at(1), TIDerrors.at(1), TIDerrors.at(1));
+  }
   const align::Alignables& theTIDrings = theAlignableTracker->TIDRings();
-  for (iter = theTIDrings.begin(); iter != theTIDrings.end(); ++iter )
-    { theModifier.addAlignmentPositionErrorLocal( *iter, TIDerrors.at(2),
-                                                  TIDerrors.at(2), TIDerrors.at(2) ); } 
+  for (iter = theTIDrings.begin(); iter != theTIDrings.end(); ++iter) {
+    theModifier.addAlignmentPositionErrorLocal(*iter, TIDerrors.at(2), TIDerrors.at(2), TIDerrors.at(2));
+  }
   const align::Alignables& theTIDgd = theAlignableTracker->TIDGeomDets();
-  for (iter = theTIDgd.begin(); iter != theTIDgd.end(); ++iter )
-    { theModifier.addAlignmentPositionErrorLocal( *iter, TIDerrors.at(3),
-                                                  TIDerrors.at(3), TIDerrors.at(3) ); } 
+  for (iter = theTIDgd.begin(); iter != theTIDgd.end(); ++iter) {
+    theModifier.addAlignmentPositionErrorLocal(*iter, TIDerrors.at(3), TIDerrors.at(3), TIDerrors.at(3));
+  }
 
   // TEC
   const align::Alignables& theTECs = theAlignableTracker->endCaps();
-  for (iter = theTECs.begin(); iter != theTECs.end(); ++iter ) 
-    { theModifier.addAlignmentPositionErrorLocal( *iter, TECerrors.at(0),
-                                                  TECerrors.at(0), TECerrors.at(0) ); } 
+  for (iter = theTECs.begin(); iter != theTECs.end(); ++iter) {
+    theModifier.addAlignmentPositionErrorLocal(*iter, TECerrors.at(0), TECerrors.at(0), TECerrors.at(0));
+  }
   const align::Alignables& theTECdiscs = theAlignableTracker->endcapLayers();
-  for (iter = theTECdiscs.begin(); iter != theTECdiscs.end(); ++iter )
-    { theModifier.addAlignmentPositionErrorLocal( *iter, TECerrors.at(1),
-                                                  TECerrors.at(1), TECerrors.at(1) ); } 
+  for (iter = theTECdiscs.begin(); iter != theTECdiscs.end(); ++iter) {
+    theModifier.addAlignmentPositionErrorLocal(*iter, TECerrors.at(1), TECerrors.at(1), TECerrors.at(1));
+  }
   const align::Alignables& theTECpetals = theAlignableTracker->endcapPetals();
-  for (iter = theTECpetals.begin(); iter != theTECpetals.end(); ++iter ) 
-    { theModifier.addAlignmentPositionErrorLocal( *iter, TECerrors.at(2),
-                                                  TECerrors.at(2), TECerrors.at(2) ); }   
+  for (iter = theTECpetals.begin(); iter != theTECpetals.end(); ++iter) {
+    theModifier.addAlignmentPositionErrorLocal(*iter, TECerrors.at(2), TECerrors.at(2), TECerrors.at(2));
+  }
   const align::Alignables& theTECgd = theAlignableTracker->endcapGeomDets();
-  for (iter = theTECgd.begin(); iter != theTECgd.end(); ++iter )
-    { theModifier.addAlignmentPositionErrorLocal( *iter, TECerrors.at(3),
-                                                  TECerrors.at(3), TECerrors.at(3) ); }   
+  for (iter = theTECgd.begin(); iter != theTECgd.end(); ++iter) {
+    theModifier.addAlignmentPositionErrorLocal(*iter, TECerrors.at(3), TECerrors.at(3), TECerrors.at(3));
+  }
 }
 
 DEFINE_FWK_MODULE(SurveyDataConverter);
-
diff --git a/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.h b/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.h
index e9606aab8fb03..3eb03e9e390f8 100644
--- a/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.h
+++ b/Alignment/SurveyAnalysis/plugins/SurveyDataConverter.h
@@ -3,7 +3,7 @@
 
 // Package:    SurveyDataConverter
 // Class:      SurveyDataConverter
-// 
+//
 /**\class SurveyDataConverter SurveyDataConverter.h Alignment/SurveyDataConverter/interface/SurveyDataConverter.h
 
  Description: Reads survey corrections and applies them to the geometry.
@@ -23,40 +23,36 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "Alignment/TrackerAlignment/interface/TrackerAlignment.h"
 
-class SurveyDataConverter : public edm::EDAnalyzer
-{
-
-  typedef SurveyDataReader::MapType    MapType;
-  typedef SurveyDataReader::PairType   PairType;
-  typedef SurveyDataReader::MapTypeOr  MapTypeOr;
+class SurveyDataConverter : public edm::EDAnalyzer {
+  typedef SurveyDataReader::MapType MapType;
+  typedef SurveyDataReader::PairType PairType;
+  typedef SurveyDataReader::MapTypeOr MapTypeOr;
   typedef SurveyDataReader::PairTypeOr PairTypeOr;
-	
+
 public:
   explicit SurveyDataConverter(const edm::ParameterSet& iConfig);
-	
-  void analyze( const edm::Event& iEvent, const edm::EventSetup& iSetup) override;
-  void endJob() override {};
 
-private:
+  void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override;
+  void endJob() override{};
 
+private:
   static const int NFILES = 2;
-  
+
   // void applyAllSurveyInfo( align::Alignables alignables,
   //			   const MapType map );
-  
+
   void applyCoarseSurveyInfo(TrackerAlignment& tr_align);
-  
+
   void applyFineSurveyInfo(TrackerAlignment& tr_align, const MapType& map);
-  
-  void applyAPEs( TrackerAlignment& tr_align );
-  
+
+  void applyAPEs(TrackerAlignment& tr_align);
+
   edm::ParameterSet theParameterSet;
   edm::ParameterSet MisalignScenario;
-  
+
   //private data members
   // AlignableTracker* theAlignableTracker;
   bool applyfineinfo, applycoarseinfo, adderrors;
-
 };
 
 #endif
diff --git a/Alignment/SurveyAnalysis/plugins/SurveyInputCSCfromPins.cc b/Alignment/SurveyAnalysis/plugins/SurveyInputCSCfromPins.cc
index b04539618a629..376226d86e32e 100644
--- a/Alignment/SurveyAnalysis/plugins/SurveyInputCSCfromPins.cc
+++ b/Alignment/SurveyAnalysis/plugins/SurveyInputCSCfromPins.cc
@@ -3,7 +3,7 @@
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Alignment/MuonAlignment/interface/AlignableMuon.h"
-#include "FWCore/Framework/interface/ESHandle.h" 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "Alignment/CommonAlignment/interface/AlignableNavigator.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
@@ -20,332 +20,350 @@
 
 #include "SurveyInputCSCfromPins.h"
 
-#define SQR(x) ((x)*(x))
-
-SurveyInputCSCfromPins::SurveyInputCSCfromPins(const edm::ParameterSet& cfg)
-  : m_pinPositions(cfg.getParameter<std::string>("pinPositions"))
-  , m_rootFile(cfg.getParameter<std::string>("rootFile"))
-  , m_verbose(cfg.getParameter<bool>("verbose"))
-  , m_errorX(cfg.getParameter<double>("errorX"))
-  , m_errorY(cfg.getParameter<double>("errorY"))
-  , m_errorZ(cfg.getParameter<double>("errorZ"))
-  , m_missingErrorTranslation(cfg.getParameter<double>("missingErrorTranslation"))
-  , m_missingErrorAngle(cfg.getParameter<double>("missingErrorAngle"))
-  , m_stationErrorX(cfg.getParameter<double>("stationErrorX"))
-  , m_stationErrorY(cfg.getParameter<double>("stationErrorY"))
-  , m_stationErrorZ(cfg.getParameter<double>("stationErrorZ"))
-  , m_stationErrorPhiX(cfg.getParameter<double>("stationErrorPhiX"))
-  , m_stationErrorPhiY(cfg.getParameter<double>("stationErrorPhiY"))
-  , m_stationErrorPhiZ(cfg.getParameter<double>("stationErrorPhiZ"))
-{}
-
-void SurveyInputCSCfromPins::orient(align::LocalVector LC1, align::LocalVector LC2, double a, double b, double &T, double &dx, double &dy, double &dz, double &PhX, double &PhZ) {
-   double cosPhX, sinPhX, cosPhZ, sinPhZ;
-
-   LocalPoint LP1(LC1.x(), LC1.y() + a, LC1.z() + b);
-   LocalPoint LP2(LC2.x(), LC2.y() - a, LC2.z() + b);
-  
-   LocalPoint P((LP1.x() - LP2.x())/(2.*a), (LP1.y() - LP2.y())/(2.*a), (LP1.z() - LP2.z())/(2.*a));
-   LocalPoint Pp((LP1.x() + LP2.x())/(2.), (LP1.y() + LP2.y())/(2.), (LP1.z() + LP2.z())/(2.));
-    
-   T=P.mag();
-	
-   sinPhX=P.z()/T;
-   cosPhX=sqrt(1-SQR(sinPhX));
-   cosPhZ=P.y()/(T*cosPhX);
-   sinPhZ=-P.x()/(T*cosPhZ);
-	 	
-   PhX=atan2(sinPhX,cosPhX);
-	
-   PhZ=atan2(sinPhZ,cosPhZ);
-	
-   dx=Pp.x()-sinPhZ*sinPhX*b;
-   dy=Pp.y()+cosPhZ*sinPhX*b;
-   dz=Pp.z()-cosPhX*b;
+#define SQR(x) ((x) * (x))
+
+SurveyInputCSCfromPins::SurveyInputCSCfromPins(const edm::ParameterSet &cfg)
+    : m_pinPositions(cfg.getParameter<std::string>("pinPositions")),
+      m_rootFile(cfg.getParameter<std::string>("rootFile")),
+      m_verbose(cfg.getParameter<bool>("verbose")),
+      m_errorX(cfg.getParameter<double>("errorX")),
+      m_errorY(cfg.getParameter<double>("errorY")),
+      m_errorZ(cfg.getParameter<double>("errorZ")),
+      m_missingErrorTranslation(cfg.getParameter<double>("missingErrorTranslation")),
+      m_missingErrorAngle(cfg.getParameter<double>("missingErrorAngle")),
+      m_stationErrorX(cfg.getParameter<double>("stationErrorX")),
+      m_stationErrorY(cfg.getParameter<double>("stationErrorY")),
+      m_stationErrorZ(cfg.getParameter<double>("stationErrorZ")),
+      m_stationErrorPhiX(cfg.getParameter<double>("stationErrorPhiX")),
+      m_stationErrorPhiY(cfg.getParameter<double>("stationErrorPhiY")),
+      m_stationErrorPhiZ(cfg.getParameter<double>("stationErrorPhiZ")) {}
+
+void SurveyInputCSCfromPins::orient(align::LocalVector LC1,
+                                    align::LocalVector LC2,
+                                    double a,
+                                    double b,
+                                    double &T,
+                                    double &dx,
+                                    double &dy,
+                                    double &dz,
+                                    double &PhX,
+                                    double &PhZ) {
+  double cosPhX, sinPhX, cosPhZ, sinPhZ;
+
+  LocalPoint LP1(LC1.x(), LC1.y() + a, LC1.z() + b);
+  LocalPoint LP2(LC2.x(), LC2.y() - a, LC2.z() + b);
+
+  LocalPoint P((LP1.x() - LP2.x()) / (2. * a), (LP1.y() - LP2.y()) / (2. * a), (LP1.z() - LP2.z()) / (2. * a));
+  LocalPoint Pp((LP1.x() + LP2.x()) / (2.), (LP1.y() + LP2.y()) / (2.), (LP1.z() + LP2.z()) / (2.));
+
+  T = P.mag();
+
+  sinPhX = P.z() / T;
+  cosPhX = sqrt(1 - SQR(sinPhX));
+  cosPhZ = P.y() / (T * cosPhX);
+  sinPhZ = -P.x() / (T * cosPhZ);
+
+  PhX = atan2(sinPhX, cosPhX);
+
+  PhZ = atan2(sinPhZ, cosPhZ);
+
+  dx = Pp.x() - sinPhZ * sinPhX * b;
+  dy = Pp.y() + cosPhZ * sinPhX * b;
+  dz = Pp.z() - cosPhX * b;
 }
 
-void SurveyInputCSCfromPins::errors(double a, double b, bool missing1, bool missing2, double &dx_dx, double &dy_dy, double &dz_dz, double &phix_phix, double &phiz_phiz, double &dy_phix) {
-   dx_dx = 0.;
-   dy_dy = 0.;
-   dz_dz = 0.;
-   phix_phix = 0.;
-   phiz_phiz = 0.;
-   dy_phix = 0.;
+void SurveyInputCSCfromPins::errors(double a,
+                                    double b,
+                                    bool missing1,
+                                    bool missing2,
+                                    double &dx_dx,
+                                    double &dy_dy,
+                                    double &dz_dz,
+                                    double &phix_phix,
+                                    double &phiz_phiz,
+                                    double &dy_phix) {
+  dx_dx = 0.;
+  dy_dy = 0.;
+  dz_dz = 0.;
+  phix_phix = 0.;
+  phiz_phiz = 0.;
+  dy_phix = 0.;
+
+  const double trials = 10000.;  // two significant digits
+
+  for (int i = 0; i < trials; i++) {
+    LocalVector LC1, LC2;
+    if (missing1) {
+      LC1 = LocalVector(gRandom->Gaus(0., m_missingErrorTranslation),
+                        gRandom->Gaus(0., m_missingErrorTranslation),
+                        gRandom->Gaus(0., m_missingErrorTranslation));
+    } else {
+      LC1 = LocalVector(gRandom->Gaus(0., m_errorX), gRandom->Gaus(0., m_errorY), gRandom->Gaus(0., m_errorZ));
+    }
+
+    if (missing2) {
+      LC2 = LocalVector(gRandom->Gaus(0., m_missingErrorTranslation),
+                        gRandom->Gaus(0., m_missingErrorTranslation),
+                        gRandom->Gaus(0., m_missingErrorTranslation));
+    } else {
+      LC2 = LocalVector(gRandom->Gaus(0., m_errorX), gRandom->Gaus(0., m_errorY), gRandom->Gaus(0., m_errorZ));
+    }
+
+    double dx, dy, dz, PhX, PhZ, T;
+    orient(LC1, LC2, a, b, T, dx, dy, dz, PhX, PhZ);
+
+    dx_dx += dx * dx;
+    dy_dy += dy * dy;
+    dz_dz += dz * dz;
+    phix_phix += PhX * PhX;
+    phiz_phiz += PhZ * PhZ;
+    dy_phix += dy * PhX;  // the only non-zero off-diagonal element
+  }
 
-   const double trials = 10000.;  // two significant digits
+  dx_dx /= trials;
+  dy_dy /= trials;
+  dz_dz /= trials;
+  phix_phix /= trials;
+  phiz_phiz /= trials;
+  dy_phix /= trials;
+}
 
-   for (int i = 0;  i < trials;  i++) {
-      LocalVector LC1, LC2;
-      if (missing1) {
-	 LC1 = LocalVector(gRandom->Gaus(0., m_missingErrorTranslation), gRandom->Gaus(0., m_missingErrorTranslation), gRandom->Gaus(0., m_missingErrorTranslation));
-      }
-      else {
-      	 LC1 = LocalVector(gRandom->Gaus(0., m_errorX), gRandom->Gaus(0., m_errorY), gRandom->Gaus(0., m_errorZ));
+void SurveyInputCSCfromPins::analyze(const edm::Event &, const edm::EventSetup &iSetup) {
+  if (theFirstEvent) {
+    edm::LogInfo("SurveyInputCSCfromPins") << "***************ENTERING INITIALIZATION******************"
+                                           << "  \n";
+
+    std::ifstream in;
+    in.open(m_pinPositions.c_str());
+
+    Double_t x1, y1, z1, x2, y2, z2, a, b, tot = 0.0, maxErr = 0.0, h, s1, dx, dy, dz, PhX, PhZ, T;
+
+    int ID1, ID2, ID3, ID4, ID5, i = 1, ii = 0;
+
+    TFile *file1 = new TFile(m_rootFile.c_str(), "recreate");
+    TTree *tree1 = new TTree("tree1", "alignment pins");
+
+    if (m_verbose) {
+      tree1->Branch("displacement_x_pin1_cm", &x1, "x1/D");
+      tree1->Branch("displacement_y_pin1_cm", &y1, "y1/D");
+      tree1->Branch("displacement_z_pin1_cm", &z1, "z1/D");
+      tree1->Branch("displacement_x_pin2_cm", &x2, "x2/D");
+      tree1->Branch("displacement_y_pin2_cm", &y2, "y2/D");
+      tree1->Branch("displacement_z_pin2_cm", &z2, "z2/D");
+      tree1->Branch("error_vector_length_cm", &h, "h/D");
+      tree1->Branch("stretch_diff_cm", &s1, "s1/D");
+      tree1->Branch("stretch_factor", &T, "T/D");
+      tree1->Branch("chamber_displacement_x_cm", &dx, "dx/D");
+      tree1->Branch("chamber_displacement_y_cm", &dy, "dy/D");
+      tree1->Branch("chamber_displacement_z_cm", &dz, "dz/D");
+      tree1->Branch("chamber_rotation_x_rad", &PhX, "PhX/D");
+      tree1->Branch("chamber_rotation_z_rad", &PhZ, "PhZ/D");
+    }
+
+    edm::ESHandle<DTGeometry> dtGeometry;
+    edm::ESHandle<CSCGeometry> cscGeometry;
+    iSetup.get<MuonGeometryRecord>().get(dtGeometry);
+    iSetup.get<MuonGeometryRecord>().get(cscGeometry);
+
+    AlignableMuon *theAlignableMuon = new AlignableMuon(&(*dtGeometry), &(*cscGeometry));
+    AlignableNavigator *theAlignableNavigator = new AlignableNavigator(theAlignableMuon);
+
+    const auto &theEndcaps = theAlignableMuon->CSCEndcaps();
+
+    for (const auto &aliiter : theEndcaps) {
+      addComponent(aliiter);
+    }
+
+    while (in.good()) {
+      bool missing1 = false;
+      bool missing2 = false;
+
+      in >> ID1 >> ID2 >> ID3 >> ID4 >> ID5 >> x1 >> y1 >> z1 >> x2 >> y2 >> z2 >> a >> b;
+
+      if (fabs(x1 - 1000.) < 1e5 && fabs(y1 - 1000.) < 1e5 && fabs(z1 - 1000.) < 1e5) {
+        missing1 = true;
+        x1 = x2;
+        y1 = y2;
+        z1 = z2;
       }
 
-      if (missing2) {
-	 LC2 = LocalVector(gRandom->Gaus(0., m_missingErrorTranslation), gRandom->Gaus(0., m_missingErrorTranslation), gRandom->Gaus(0., m_missingErrorTranslation));
-      }
-      else {
-	 LC2 = LocalVector(gRandom->Gaus(0., m_errorX), gRandom->Gaus(0., m_errorY), gRandom->Gaus(0., m_errorZ));
+      if (fabs(x2 - 1000.) < 1e5 && fabs(y2 - 1000.) < 1e5 && fabs(z2 - 1000.) < 1e5) {
+        missing2 = true;
+        x2 = x1;
+        y2 = y1;
+        z2 = z1;
       }
 
-      double dx, dy, dz, PhX, PhZ, T;
+      x1 = x1 / 10.0;
+      y1 = y1 / 10.0;
+      z1 = z1 / 10.0;
+      x2 = x2 / 10.0;
+      y2 = y2 / 10.0;
+      z2 = z2 / 10.0;
+
+      CSCDetId layerID(ID1, ID2, ID3, ID4, 1);
+
+      // We cannot use chamber ID (when ID5=0), because AlignableNavigator gives the error (aliDet and aliDetUnit are undefined for chambers)
+
+      Alignable *theAlignable1 = theAlignableNavigator->alignableFromDetId(layerID);
+      Alignable *chamberAli = theAlignable1->mother();
+
+      LocalVector LC1 = chamberAli->surface().toLocal(GlobalVector(x1, y1, z1));
+      LocalVector LC2 = chamberAli->surface().toLocal(GlobalVector(x2, y2, z2));
+
       orient(LC1, LC2, a, b, T, dx, dy, dz, PhX, PhZ);
 
-      dx_dx += dx * dx;
-      dy_dy += dy * dy;
-      dz_dz += dz * dz;
-      phix_phix += PhX * PhX;
-      phiz_phiz += PhZ * PhZ;
-      dy_phix += dy * PhX;      // the only non-zero off-diagonal element
-   }
-
-   dx_dx /= trials;
-   dy_dy /= trials;
-   dz_dz /= trials;
-   phix_phix /= trials;
-   phiz_phiz /= trials;
-   dy_phix /= trials;
-}
+      GlobalPoint PG1 = chamberAli->surface().toGlobal(LocalPoint(LC1.x(), LC1.y() + a, LC1.z() + b));
+      chamberAli->surface().toGlobal(LocalPoint(LC2.x(), LC2.y() - a, LC2.z() + b));
 
-void SurveyInputCSCfromPins::analyze(const edm::Event&, const edm::EventSetup& iSetup)
-{
-  if (theFirstEvent) {
+      LocalVector lvector(dx, dy, dz);
+      GlobalVector gvector = (chamberAli->surface()).toGlobal(lvector);
+      chamberAli->move(gvector);
 
-	edm::LogInfo("SurveyInputCSCfromPins") << "***************ENTERING INITIALIZATION******************" << "  \n";
-	
-	std::ifstream in;
-  	in.open(m_pinPositions.c_str());
-  
-	Double_t x1, y1, z1, x2, y2, z2, a, b, tot=0.0, maxErr=0.0, h, s1, dx, dy, dz, PhX, PhZ, T;
-   
-	int ID1, ID2, ID3, ID4, ID5, i=1, ii=0;
-	
-	TFile *file1 = new TFile(m_rootFile.c_str(),"recreate");
-	TTree *tree1 = new TTree("tree1","alignment pins");
-      
-   	if (m_verbose) {
-   
-   		tree1->Branch("displacement_x_pin1_cm", &x1, "x1/D");
-   		tree1->Branch("displacement_y_pin1_cm", &y1, "y1/D");
-	   	tree1->Branch("displacement_z_pin1_cm", &z1, "z1/D");
-	   	tree1->Branch("displacement_x_pin2_cm", &x2, "x2/D");
-   		tree1->Branch("displacement_y_pin2_cm", &y2, "y2/D");
-   		tree1->Branch("displacement_z_pin2_cm", &z2, "z2/D");     
-	   	tree1->Branch("error_vector_length_cm",&h, "h/D"); 
-   		tree1->Branch("stretch_diff_cm",&s1, "s1/D");
-	   	tree1->Branch("stretch_factor",&T, "T/D");
-   		tree1->Branch("chamber_displacement_x_cm",&dx, "dx/D");
-	   	tree1->Branch("chamber_displacement_y_cm",&dy, "dy/D");
-   		tree1->Branch("chamber_displacement_z_cm",&dz, "dz/D");
-	   	tree1->Branch("chamber_rotation_x_rad",&PhX, "PhX/D");
-   		tree1->Branch("chamber_rotation_z_rad",&PhZ, "PhZ/D");
-  	}
-  
-	edm::ESHandle<DTGeometry> dtGeometry;
-	edm::ESHandle<CSCGeometry> cscGeometry;
- 	iSetup.get<MuonGeometryRecord>().get( dtGeometry );     
- 	iSetup.get<MuonGeometryRecord>().get( cscGeometry );
- 
- 	AlignableMuon* theAlignableMuon = new AlignableMuon( &(*dtGeometry) , &(*cscGeometry) );
- 	AlignableNavigator* theAlignableNavigator = new AlignableNavigator( theAlignableMuon );
-
-        const auto& theEndcaps = theAlignableMuon->CSCEndcaps();
-
-        for (const auto& aliiter: theEndcaps) {
-                addComponent(aliiter);
-        }
-    
-	
-	while (in.good())
-  	{
-	   bool missing1 = false;
-	   bool missing2 = false;
-    
-    		in >> ID1 >> ID2 >> ID3 >> ID4 >> ID5 >> x1 >> y1 >> z1 >> x2 >> y2 >> z2 >> a >> b;
-
-		if (fabs(x1 - 1000.) < 1e5  &&  fabs(y1 - 1000.) < 1e5  &&  fabs(z1 - 1000.) < 1e5) {
-		   missing1 = true;
-		   x1 = x2;
-		   y1 = y2;
-		   z1 = z2;
-		}
-
-		if (fabs(x2 - 1000.) < 1e5  &&  fabs(y2 - 1000.) < 1e5  &&  fabs(z2 - 1000.) < 1e5) {
-		   missing2 = true;
-		   x2 = x1;
-		   y2 = y1;
-		   z2 = z1;
-		}
-
-		x1=x1/10.0;
-		y1=y1/10.0;
-		z1=z1/10.0;
-		x2=x2/10.0;
-		y2=y2/10.0;
-		z2=z2/10.0;
-   
- 		CSCDetId layerID(ID1, ID2, ID3, ID4, 1);
-		
-		// We cannot use chamber ID (when ID5=0), because AlignableNavigator gives the error (aliDet and aliDetUnit are undefined for chambers)
-		
-		
-		Alignable* theAlignable1 = theAlignableNavigator->alignableFromDetId( layerID ); 
- 		Alignable* chamberAli=theAlignable1->mother();
-
-  		LocalVector LC1 = chamberAli->surface().toLocal(GlobalVector(x1,y1,z1));
-  		LocalVector LC2 = chamberAli->surface().toLocal(GlobalVector(x2,y2,z2));
-  
-		orient(LC1, LC2, a, b, T, dx, dy, dz, PhX, PhZ);	
-   
- 		GlobalPoint PG1 = chamberAli->surface().toGlobal(LocalPoint(LC1.x(), LC1.y() + a, LC1.z() + b));
- 		chamberAli->surface().toGlobal(LocalPoint(LC2.x(), LC2.y() - a, LC2.z() + b));
- 
-	
- 		LocalVector lvector( dx, dy, dz);
- 		GlobalVector gvector = ( chamberAli->surface()).toGlobal( lvector );
- 		chamberAli->move( gvector );
-  
-  		chamberAli->rotateAroundLocalX( PhX );
-  		chamberAli->rotateAroundLocalZ( PhZ );
-		
-		double dx_dx, dy_dy, dz_dz, phix_phix, phiz_phiz, dy_phix;
-		errors(a, b, missing1, missing2, dx_dx, dy_dy, dz_dz, phix_phix, phiz_phiz, dy_phix);
-  		align::ErrorMatrix error = ROOT::Math::SMatrixIdentity();
-		error(0,0) = dx_dx;
-		error(1,1) = dy_dy;
-		error(2,2) = dz_dz;
-		error(3,3) = phix_phix;
-		error(4,4) = m_missingErrorAngle;
-		error(5,5) = phiz_phiz;
-		error(1,3) = dy_phix;
-		error(3,1) = dy_phix;  // just in case
-
-  		chamberAli->setSurvey( new SurveyDet(chamberAli->surface(), error) );
-    
-    		if (m_verbose) {
-    			
-			edm::LogInfo("SurveyInputCSCfromPins") << " survey information = " << chamberAli->survey() << "  \n";
-			
-  			LocalPoint LP1n = chamberAli->surface().toLocal(PG1);
-	
-			LocalPoint hiP(LP1n.x(), LP1n.y() - a*T, LP1n.z() - b);
-
-			h=hiP.mag();
-			s1=LP1n.y() - a;
-
-			if (h>maxErr) { maxErr=h; 
-			
-				ii=i;
-	 		}
-	
-			edm::LogInfo("SurveyInputCSCfromPins") << "  \n" 
-			 << "i " << i++ << " " << ID1 << " " << ID2 << " " << ID3 << " " << ID4 << " " << ID5 << " error  " << h  << " \n"	
-			 <<" x1 " << x1 << " y1 " << y1 << " z1 " << z1 << " x2 " << x2 << " y2 " << y2 << " z2 " << z2  << " \n"
-			 << " error " << h <<  " S1 " << s1 << " \n"
-			 <<" dx " << dx << " dy " << dy << " dz " << dz << " PhX " << PhX << " PhZ " << PhZ  << " \n";
-
-			tot+=h;
-	
-			tree1->Fill();
-			}
-   	
-   	} 
- 
-	in.close();
-
-	if (m_verbose) {
-	
-   		file1->Write();
-		edm::LogInfo("SurveyInputCSCfromPins") << " Total error  " << tot << "  Max Error " << maxErr << " N " << ii << "  \n";
-   	}
-
-	file1->Close();
-   
-        for (const auto& aliiter: theEndcaps) {
-                fillAllRecords(aliiter);
+      chamberAli->rotateAroundLocalX(PhX);
+      chamberAli->rotateAroundLocalZ(PhZ);
+
+      double dx_dx, dy_dy, dz_dz, phix_phix, phiz_phiz, dy_phix;
+      errors(a, b, missing1, missing2, dx_dx, dy_dy, dz_dz, phix_phix, phiz_phiz, dy_phix);
+      align::ErrorMatrix error = ROOT::Math::SMatrixIdentity();
+      error(0, 0) = dx_dx;
+      error(1, 1) = dy_dy;
+      error(2, 2) = dz_dz;
+      error(3, 3) = phix_phix;
+      error(4, 4) = m_missingErrorAngle;
+      error(5, 5) = phiz_phiz;
+      error(1, 3) = dy_phix;
+      error(3, 1) = dy_phix;  // just in case
+
+      chamberAli->setSurvey(new SurveyDet(chamberAli->surface(), error));
+
+      if (m_verbose) {
+        edm::LogInfo("SurveyInputCSCfromPins") << " survey information = " << chamberAli->survey() << "  \n";
+
+        LocalPoint LP1n = chamberAli->surface().toLocal(PG1);
+
+        LocalPoint hiP(LP1n.x(), LP1n.y() - a * T, LP1n.z() - b);
+
+        h = hiP.mag();
+        s1 = LP1n.y() - a;
+
+        if (h > maxErr) {
+          maxErr = h;
+
+          ii = i;
         }
 
-	delete theAlignableMuon;
-	delete theAlignableNavigator;
+        edm::LogInfo("SurveyInputCSCfromPins")
+            << "  \n"
+            << "i " << i++ << " " << ID1 << " " << ID2 << " " << ID3 << " " << ID4 << " " << ID5 << " error  " << h
+            << " \n"
+            << " x1 " << x1 << " y1 " << y1 << " z1 " << z1 << " x2 " << x2 << " y2 " << y2 << " z2 " << z2 << " \n"
+            << " error " << h << " S1 " << s1 << " \n"
+            << " dx " << dx << " dy " << dy << " dz " << dz << " PhX " << PhX << " PhZ " << PhZ << " \n";
+
+        tot += h;
+
+        tree1->Fill();
+      }
+    }
+
+    in.close();
+
+    if (m_verbose) {
+      file1->Write();
+      edm::LogInfo("SurveyInputCSCfromPins")
+          << " Total error  " << tot << "  Max Error " << maxErr << " N " << ii << "  \n";
+    }
+
+    file1->Close();
 
-	edm::LogInfo("SurveyInputCSCfromPins") << "*************END INITIALIZATION***************" << "  \n";
+    for (const auto &aliiter : theEndcaps) {
+      fillAllRecords(aliiter);
+    }
 
-	theFirstEvent = false;
+    delete theAlignableMuon;
+    delete theAlignableNavigator;
+
+    edm::LogInfo("SurveyInputCSCfromPins") << "*************END INITIALIZATION***************"
+                                           << "  \n";
+
+    theFirstEvent = false;
   }
 }
 
-
 void SurveyInputCSCfromPins::fillAllRecords(Alignable *ali) {
-   	if (ali->survey() == nullptr) {
-
-	   AlignableCSCChamber *ali_AlignableCSCChamber = dynamic_cast<AlignableCSCChamber*>(ali);
-	   AlignableCSCStation *ali_AlignableCSCStation = dynamic_cast<AlignableCSCStation*>(ali);
-
-	   if (ali_AlignableCSCChamber != nullptr) {
-	      CSCDetId detid(ali->geomDetId());
-	      if (abs(detid.station()) == 1  &&  (detid.ring() == 1  ||  detid.ring() == 4)) {
-		 align::ErrorMatrix error = ROOT::Math::SMatrixIdentity();
-		 error(0,0) = m_missingErrorTranslation;
-		 error(1,1) = m_missingErrorTranslation;
-		 error(2,2) = m_missingErrorTranslation;
-		 error(3,3) = m_missingErrorAngle;
-		 error(4,4) = m_missingErrorAngle;
-		 error(5,5) = m_missingErrorAngle;
-
-		 ali->setSurvey(new SurveyDet(ali->surface(), error));
-	      }
-	      else {
-		 double a = 100.;
-		 double b = -9.4034;
-		 if      (abs(detid.station()) == 1  &&  detid.ring() == 2) a = -90.260;
-		 else if (abs(detid.station()) == 1  &&  detid.ring() == 3) a = -85.205;
-		 else if (abs(detid.station()) == 2  &&  detid.ring() == 1) a = -97.855;
-		 else if (abs(detid.station()) == 2  &&  detid.ring() == 2) a = -164.555;
-		 else if (abs(detid.station()) == 3  &&  detid.ring() == 1) a = -87.870;
-		 else if (abs(detid.station()) == 3  &&  detid.ring() == 2) a = -164.555;
-		 else if (abs(detid.station()) == 4  &&  detid.ring() == 1) a = -77.890;
-
-		double dx_dx, dy_dy, dz_dz, phix_phix, phiz_phiz, dy_phix;
-		errors(a, b, true, true, dx_dx, dy_dy, dz_dz, phix_phix, phiz_phiz, dy_phix);
-  		align::ErrorMatrix error = ROOT::Math::SMatrixIdentity();
-		error(0,0) = dx_dx;
-		error(1,1) = dy_dy;
-		error(2,2) = dz_dz;
-		error(3,3) = phix_phix;
-		error(4,4) = m_missingErrorAngle;
-		error(5,5) = phiz_phiz;
-		error(1,3) = dy_phix;
-		error(3,1) = dy_phix;  // just in case
-
-		ali->setSurvey(new SurveyDet(ali->surface(), error));
-	      }
-	   }
-
-	   else if (ali_AlignableCSCStation != nullptr) {
-	      align::ErrorMatrix error = ROOT::Math::SMatrixIdentity();
-	      error(0,0) = m_stationErrorX;
-	      error(1,1) = m_stationErrorY;
-	      error(2,2) = m_stationErrorZ;
-	      error(3,3) = m_stationErrorPhiX;
-	      error(4,4) = m_stationErrorPhiY;
-	      error(5,5) = m_stationErrorPhiZ;
-
-	      ali->setSurvey(new SurveyDet(ali->surface(), error));
-	   }
-
-	   else {
-	      align::ErrorMatrix error = ROOT::Math::SMatrixIdentity();
-	      ali->setSurvey(new SurveyDet(ali->surface(), error*(1e-10)));
-	   }
-   	}
-
-        for (const auto& iter: ali->components()) {
-                fillAllRecords(iter);
-        }
-}
+  if (ali->survey() == nullptr) {
+    AlignableCSCChamber *ali_AlignableCSCChamber = dynamic_cast<AlignableCSCChamber *>(ali);
+    AlignableCSCStation *ali_AlignableCSCStation = dynamic_cast<AlignableCSCStation *>(ali);
+
+    if (ali_AlignableCSCChamber != nullptr) {
+      CSCDetId detid(ali->geomDetId());
+      if (abs(detid.station()) == 1 && (detid.ring() == 1 || detid.ring() == 4)) {
+        align::ErrorMatrix error = ROOT::Math::SMatrixIdentity();
+        error(0, 0) = m_missingErrorTranslation;
+        error(1, 1) = m_missingErrorTranslation;
+        error(2, 2) = m_missingErrorTranslation;
+        error(3, 3) = m_missingErrorAngle;
+        error(4, 4) = m_missingErrorAngle;
+        error(5, 5) = m_missingErrorAngle;
+
+        ali->setSurvey(new SurveyDet(ali->surface(), error));
+      } else {
+        double a = 100.;
+        double b = -9.4034;
+        if (abs(detid.station()) == 1 && detid.ring() == 2)
+          a = -90.260;
+        else if (abs(detid.station()) == 1 && detid.ring() == 3)
+          a = -85.205;
+        else if (abs(detid.station()) == 2 && detid.ring() == 1)
+          a = -97.855;
+        else if (abs(detid.station()) == 2 && detid.ring() == 2)
+          a = -164.555;
+        else if (abs(detid.station()) == 3 && detid.ring() == 1)
+          a = -87.870;
+        else if (abs(detid.station()) == 3 && detid.ring() == 2)
+          a = -164.555;
+        else if (abs(detid.station()) == 4 && detid.ring() == 1)
+          a = -77.890;
+
+        double dx_dx, dy_dy, dz_dz, phix_phix, phiz_phiz, dy_phix;
+        errors(a, b, true, true, dx_dx, dy_dy, dz_dz, phix_phix, phiz_phiz, dy_phix);
+        align::ErrorMatrix error = ROOT::Math::SMatrixIdentity();
+        error(0, 0) = dx_dx;
+        error(1, 1) = dy_dy;
+        error(2, 2) = dz_dz;
+        error(3, 3) = phix_phix;
+        error(4, 4) = m_missingErrorAngle;
+        error(5, 5) = phiz_phiz;
+        error(1, 3) = dy_phix;
+        error(3, 1) = dy_phix;  // just in case
+
+        ali->setSurvey(new SurveyDet(ali->surface(), error));
+      }
+    }
+
+    else if (ali_AlignableCSCStation != nullptr) {
+      align::ErrorMatrix error = ROOT::Math::SMatrixIdentity();
+      error(0, 0) = m_stationErrorX;
+      error(1, 1) = m_stationErrorY;
+      error(2, 2) = m_stationErrorZ;
+      error(3, 3) = m_stationErrorPhiX;
+      error(4, 4) = m_stationErrorPhiY;
+      error(5, 5) = m_stationErrorPhiZ;
+
+      ali->setSurvey(new SurveyDet(ali->surface(), error));
+    }
+
+    else {
+      align::ErrorMatrix error = ROOT::Math::SMatrixIdentity();
+      ali->setSurvey(new SurveyDet(ali->surface(), error * (1e-10)));
+    }
+  }
 
+  for (const auto &iter : ali->components()) {
+    fillAllRecords(iter);
+  }
+}
 
 // Plug in to framework
 #include "FWCore/Framework/interface/MakerMacros.h"
diff --git a/Alignment/SurveyAnalysis/plugins/SurveyInputCSCfromPins.h b/Alignment/SurveyAnalysis/plugins/SurveyInputCSCfromPins.h
index ac153dae772db..21e274d47b3d4 100644
--- a/Alignment/SurveyAnalysis/plugins/SurveyInputCSCfromPins.h
+++ b/Alignment/SurveyAnalysis/plugins/SurveyInputCSCfromPins.h
@@ -13,20 +13,34 @@
 #include "Alignment/SurveyAnalysis/interface/SurveyInputBase.h"
 #include "CondFormats/Alignment/interface/Definitions.h"
 
-class SurveyInputCSCfromPins:
-  public SurveyInputBase
-{
+class SurveyInputCSCfromPins : public SurveyInputBase {
 public:
-	
-  SurveyInputCSCfromPins(const edm::ParameterSet&);
-	
+  SurveyInputCSCfromPins(const edm::ParameterSet &);
+
   /// Read ideal tracker geometry from DB
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
 private:
-
-  void orient(align::LocalVector LC1, align::LocalVector LC2, double a, double b, double &T, double &dx, double &dy, double &dz, double &PhX, double &PhZ);
-  void errors(double a, double b, bool missing1, bool missing2, double &dx_dx, double &dy_dy, double &dz_dz, double &phix_phix, double &phiz_phiz, double &dy_phix);
+  void orient(align::LocalVector LC1,
+              align::LocalVector LC2,
+              double a,
+              double b,
+              double &T,
+              double &dx,
+              double &dy,
+              double &dz,
+              double &PhX,
+              double &PhZ);
+  void errors(double a,
+              double b,
+              bool missing1,
+              bool missing2,
+              double &dx_dx,
+              double &dy_dy,
+              double &dz_dz,
+              double &phix_phix,
+              double &phiz_phiz,
+              double &dy_phix);
 
   void fillAllRecords(Alignable *ali);
 
diff --git a/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc b/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc
index 3c30269bbe164..5e6f16490cd8a 100644
--- a/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc
+++ b/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.cc
@@ -17,98 +17,91 @@
 #include "CondFormats/Alignment/interface/Alignments.h"
 #include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
 
-
 #include "Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h"
 
 SurveyInputTrackerFromDB::SurveyInputTrackerFromDB(const edm::ParameterSet& cfg)
-  : textFileName( cfg.getParameter<std::string>("textFileName") )
-{}
-
-void SurveyInputTrackerFromDB::analyze(const edm::Event&, const edm::EventSetup& setup)
-{
+    : textFileName(cfg.getParameter<std::string>("textFileName")) {}
 
+void SurveyInputTrackerFromDB::analyze(const edm::Event&, const edm::EventSetup& setup) {
   if (theFirstEvent) {
+    //  std::cout << "***************ENTERING INITIALIZATION******************" << std::endl;
+
+    //Retrieve tracker topology from geometry
+    edm::ESHandle<TrackerTopology> tTopoHandle;
+    setup.get<TrackerTopologyRcd>().get(tTopoHandle);
+    const TrackerTopology* const tTopo = tTopoHandle.product();
+
+    //Get map from textreader
+    SurveyInputTextReader dataReader;
+    dataReader.readFile(textFileName);
+    uIdMap = dataReader.UniqueIdMap();
+
+    edm::ESHandle<GeometricDet> geom;
+    setup.get<IdealGeometryRecord>().get(geom);
+    edm::ESHandle<PTrackerParameters> ptp;
+    setup.get<PTrackerParametersRcd>().get(ptp);
+    TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(&*geom, *ptp, tTopo);
+
+    addComponent(new AlignableTracker(tracker, tTopo));
+    addSurveyInfo(detector());
+
+    //write out to a DB ...
+    Alignments* myAlignments = detector()->alignments();
+    AlignmentErrorsExtended* myAlignmentErrorsExtended = detector()->alignmentErrors();
+
+    // 2. Store alignment[Error]s to DB
+    edm::Service<cond::service::PoolDBOutputService> poolDbService;
+    // Call service
+
+    if (!poolDbService.isAvailable())  // Die if not available
+      throw cms::Exception("NotAvailable") << "PoolDBOutputService not available";
+
+    poolDbService->writeOne<Alignments>(myAlignments, poolDbService->beginOfTime(), "TrackerAlignmentRcd");
+    poolDbService->writeOne<AlignmentErrorsExtended>(
+        myAlignmentErrorsExtended, poolDbService->beginOfTime(), "TrackerAlignmentErrorExtendedRcd");
 
-	//  std::cout << "***************ENTERING INITIALIZATION******************" << std::endl;
-	
-	//Retrieve tracker topology from geometry
-	edm::ESHandle<TrackerTopology> tTopoHandle;
-	setup.get<TrackerTopologyRcd>().get(tTopoHandle);
-	const TrackerTopology* const tTopo = tTopoHandle.product();
-
-	//Get map from textreader
-	SurveyInputTextReader dataReader;
-	dataReader.readFile( textFileName );
-	uIdMap = dataReader.UniqueIdMap();
-	
-	edm::ESHandle<GeometricDet>  geom;
-	setup.get<IdealGeometryRecord>().get(geom); 
-	edm::ESHandle<PTrackerParameters> ptp;
-	setup.get<PTrackerParametersRcd>().get( ptp );
-	TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(&*geom, *ptp, tTopo );
-	
-	addComponent( new AlignableTracker( tracker, tTopo ) );
-	addSurveyInfo( detector() );
-	
-	//write out to a DB ...
-	Alignments* myAlignments = detector()->alignments();
-	AlignmentErrorsExtended* myAlignmentErrorsExtended = detector()->alignmentErrors();
-	
-	// 2. Store alignment[Error]s to DB
-	edm::Service<cond::service::PoolDBOutputService> poolDbService;
-	// Call service
-	
-	if( !poolDbService.isAvailable() ) // Die if not available
-		throw cms::Exception("NotAvailable") << "PoolDBOutputService not available";
-	
-	poolDbService->writeOne<Alignments>( myAlignments, poolDbService->beginOfTime(), "TrackerAlignmentRcd" );
-	poolDbService->writeOne<AlignmentErrorsExtended>( myAlignmentErrorsExtended, poolDbService->beginOfTime(), "TrackerAlignmentErrorExtendedRcd" );
-	
-	theFirstEvent = false;
+    theFirstEvent = false;
   }
 }
 
-void SurveyInputTrackerFromDB::addSurveyInfo(Alignable* ali)
-{
-	const align::Alignables& comp = ali->components();
-	unsigned int nComp = comp.size();
-	
-	for (unsigned int i = 0; i < nComp; ++i) addSurveyInfo(comp[i]);
-	
-	align::ErrorMatrix error;
-
-	SurveyInputTextReader::MapType::const_iterator it
-	  = uIdMap.find(std::make_pair(ali->id(), ali->alignableObjectId()));
-
-	if (it != uIdMap.end()){
-		
-		const align::Scalars& parameters = (it)->second;
-		
-		//move the surface
-		//displacement
-		align::LocalVector lvector (parameters[0], parameters[1], parameters[2]);
-		align::GlobalVector gvector = ali->surface().toGlobal(lvector);
-		ali->move(gvector);
-		//rotation
-		Basic3DVector<align::Scalar> rot_aa(parameters[3], parameters[4], parameters[5]);
-		align::RotationType rotation(rot_aa, rot_aa.mag());
-		ali->rotateInLocalFrame(rotation);
-		
-		//sets the errors for the hierarchy level
-		double* errorData = error.Array();
-		for (unsigned int i = 0; i < 21; ++i){errorData[i] = parameters[i+6];}
-		
-		ali->setSurvey( new SurveyDet(ali->surface(), error*(1e-6)) );
-	}
-	else {
-		error = ROOT::Math::SMatrixIdentity();
-		ali->setSurvey( new SurveyDet(ali->surface(), error * 1e-6) );
-	}
-	
+void SurveyInputTrackerFromDB::addSurveyInfo(Alignable* ali) {
+  const align::Alignables& comp = ali->components();
+  unsigned int nComp = comp.size();
+
+  for (unsigned int i = 0; i < nComp; ++i)
+    addSurveyInfo(comp[i]);
+
+  align::ErrorMatrix error;
+
+  SurveyInputTextReader::MapType::const_iterator it = uIdMap.find(std::make_pair(ali->id(), ali->alignableObjectId()));
+
+  if (it != uIdMap.end()) {
+    const align::Scalars& parameters = (it)->second;
+
+    //move the surface
+    //displacement
+    align::LocalVector lvector(parameters[0], parameters[1], parameters[2]);
+    align::GlobalVector gvector = ali->surface().toGlobal(lvector);
+    ali->move(gvector);
+    //rotation
+    Basic3DVector<align::Scalar> rot_aa(parameters[3], parameters[4], parameters[5]);
+    align::RotationType rotation(rot_aa, rot_aa.mag());
+    ali->rotateInLocalFrame(rotation);
+
+    //sets the errors for the hierarchy level
+    double* errorData = error.Array();
+    for (unsigned int i = 0; i < 21; ++i) {
+      errorData[i] = parameters[i + 6];
+    }
+
+    ali->setSurvey(new SurveyDet(ali->surface(), error * (1e-6)));
+  } else {
+    error = ROOT::Math::SMatrixIdentity();
+    ali->setSurvey(new SurveyDet(ali->surface(), error * 1e-6));
+  }
 }
 // Plug in to framework
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-
 DEFINE_FWK_MODULE(SurveyInputTrackerFromDB);
diff --git a/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h b/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h
index 924cd661dc32d..66376f8c1e2d2 100644
--- a/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h
+++ b/Alignment/SurveyAnalysis/plugins/SurveyInputTrackerFromDB.h
@@ -17,31 +17,20 @@ namespace edm {
   class ParameterSet;
 }
 
-class SurveyInputTrackerFromDB:
-  public SurveyInputBase
-{
+class SurveyInputTrackerFromDB : public SurveyInputBase {
 public:
-	
-  SurveyInputTrackerFromDB(
-			   const edm::ParameterSet&
-			   );
-	
+  SurveyInputTrackerFromDB(const edm::ParameterSet&);
+
   /// Read ideal tracker geometry from DB
-  void analyze(
-		       const edm::Event&,
-		       const edm::EventSetup&
-		       ) override;
-	
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
+
 private:
-	
   SurveyInputTextReader::MapType uIdMap;
 
   std::string textFileName;
-	
+
   /// Add survey info to an alignable
-  void addSurveyInfo(
-		     Alignable*
-		     );
+  void addSurveyInfo(Alignable*);
 };
 
 #endif
diff --git a/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.cc b/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.cc
index 16c7e51f2d7fb..25defcca4d34a 100644
--- a/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.cc
+++ b/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.cc
@@ -16,12 +16,10 @@
 
 #include "Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h"
 
-SurveyMisalignmentInput::SurveyMisalignmentInput(const edm::ParameterSet& cfg):
-  textFileName( cfg.getParameter<std::string>("textFileName") )
-{}
+SurveyMisalignmentInput::SurveyMisalignmentInput(const edm::ParameterSet& cfg)
+    : textFileName(cfg.getParameter<std::string>("textFileName")) {}
 
-void SurveyMisalignmentInput::analyze(const edm::Event&, const edm::EventSetup& setup)
-{
+void SurveyMisalignmentInput::analyze(const edm::Event&, const edm::EventSetup& setup) {
   if (theFirstEvent) {
     //Retrieve tracker topology from geometry
     edm::ESHandle<TrackerTopology> tTopoHandle;
@@ -29,85 +27,77 @@ void SurveyMisalignmentInput::analyze(const edm::Event&, const edm::EventSetup&
     const TrackerTopology* const tTopo = tTopoHandle.product();
 
     edm::ESHandle<GeometricDet> geom;
-    setup.get<IdealGeometryRecord>().get(geom);	 
+    setup.get<IdealGeometryRecord>().get(geom);
 
     edm::ESHandle<PTrackerParameters> ptp;
-    setup.get<PTrackerParametersRcd>().get( ptp );
-    TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(&*geom, *ptp, tTopo );
-    
-    addComponent(new AlignableTracker( tracker, tTopo ));
+    setup.get<PTrackerParametersRcd>().get(ptp);
+    TrackerGeometry* tracker = TrackerGeomBuilderFromGeometricDet().build(&*geom, *ptp, tTopo);
+
+    addComponent(new AlignableTracker(tracker, tTopo));
 
     edm::LogInfo("SurveyMisalignmentInput") << "Starting!";
     // Retrieve alignment[Error]s from DBase
-    setup.get<TrackerAlignmentRcd>().get( alignments );
-    
+    setup.get<TrackerAlignmentRcd>().get(alignments);
+
     //Get map from textreader
     SurveyInputTextReader dataReader;
-    dataReader.readFile( textFileName );
+    dataReader.readFile(textFileName);
     uIdMap = dataReader.UniqueIdMap();
-    
-    addSurveyInfo( detector() );
+
+    addSurveyInfo(detector());
 
     theFirstEvent = false;
   }
 }
 
-
-void SurveyMisalignmentInput::addSurveyInfo(Alignable* ali)
-{
-
+void SurveyMisalignmentInput::addSurveyInfo(Alignable* ali) {
   const align::Alignables& comp = ali->components();
   unsigned int nComp = comp.size();
-  for (unsigned int i = 0; i < nComp; ++i) addSurveyInfo(comp[i]);
-	
-  SurveyInputTextReader::MapType::const_iterator it
-    = uIdMap.find(std::make_pair(ali->id(), ali->alignableObjectId()));
+  for (unsigned int i = 0; i < nComp; ++i)
+    addSurveyInfo(comp[i]);
+
+  SurveyInputTextReader::MapType::const_iterator it = uIdMap.find(std::make_pair(ali->id(), ali->alignableObjectId()));
 
   align::ErrorMatrix error;
 
-  if (it != uIdMap.end()){
+  if (it != uIdMap.end()) {
     //survey error values
     const align::Scalars& parameters = (it)->second;
     //sets the errors for the hierarchy level
     double* errorData = error.Array();
-    for (unsigned int i = 0; i < 21; ++i){errorData[i] = parameters[i+6];}
-		
+    for (unsigned int i = 0; i < 21; ++i) {
+      errorData[i] = parameters[i + 6];
+    }
+
     //because record only needs global value of modules
-    if (ali->alignableObjectId() == align::AlignableDetUnit){
+    if (ali->alignableObjectId() == align::AlignableDetUnit) {
       // fill survey values
-      ali->setSurvey( new SurveyDet(getAlignableSurface(ali->id()), error) );
-    }
-    else{
-      ali->setSurvey( new SurveyDet(ali->surface(), error) );
+      ali->setSurvey(new SurveyDet(getAlignableSurface(ali->id()), error));
+    } else {
+      ali->setSurvey(new SurveyDet(ali->surface(), error));
     }
-  }
-  else{
+  } else {
     //fill
     error = ROOT::Math::SMatrixIdentity();
-    ali->setSurvey( new SurveyDet(ali->surface(), error*(1e-6)) );
+    ali->setSurvey(new SurveyDet(ali->surface(), error * (1e-6)));
   }
   //std::cout << "UniqueId: " << id.first << ", " << id.second << std::endl;
   //std::cout << error << std::endl;
-	
 }
 
-AlignableSurface SurveyMisalignmentInput::getAlignableSurface(align::ID id)
-{
+AlignableSurface SurveyMisalignmentInput::getAlignableSurface(align::ID id) {
   std::vector<AlignTransform>::const_iterator it;
 
-  for (it = alignments->m_align.begin(); it != alignments->m_align.end(); ++it)
-  {
-    if (id == (*it).rawId())
-    {
-      align::PositionType position( (*it).translation().x(), (*it).translation().y(), (*it).translation().z() );
-      CLHEP::HepRotation rot( (*it).rotation() );
-      align::RotationType rotation( rot.xx(), rot.xy(), rot.xz(),
-				    rot.yx(), rot.yy(), rot.yz(),
-				    rot.zx(), rot.zy(), rot.zz() );
-      return AlignableSurface(position,rotation);
+  for (it = alignments->m_align.begin(); it != alignments->m_align.end(); ++it) {
+    if (id == (*it).rawId()) {
+      align::PositionType position((*it).translation().x(), (*it).translation().y(), (*it).translation().z());
+      CLHEP::HepRotation rot((*it).rotation());
+      align::RotationType rotation(
+          rot.xx(), rot.xy(), rot.xz(), rot.yx(), rot.yy(), rot.yz(), rot.zx(), rot.zy(), rot.zz());
+      return AlignableSurface(position, rotation);
     }
   }
-	
+
   return AlignableSurface();
 }
 
diff --git a/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h b/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h
index 83d95d100fa78..62e9321706e79 100644
--- a/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h
+++ b/Alignment/SurveyAnalysis/plugins/SurveyMisalignmentInput.h
@@ -18,29 +18,20 @@
 class AlignableSurface;
 class Alignments;
 
-class SurveyMisalignmentInput:
-  public SurveyInputBase
-{
+class SurveyMisalignmentInput : public SurveyInputBase {
 public:
-	
-  SurveyMisalignmentInput(
-			  const edm::ParameterSet&
-			  );
-	
+  SurveyMisalignmentInput(const edm::ParameterSet&);
+
   /// Read ideal tracker geometry from DB
-  void analyze(
-		       const edm::Event&,
-		       const edm::EventSetup&
-		       ) override;
-	
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
+
 private:
-	
   SurveyInputTextReader::MapType uIdMap;
 
   std::string textFileName;
 
   edm::ESHandle<Alignments> alignments;
-	
+
   /// Add survey info to an alignable
   void addSurveyInfo(Alignable*);
 
diff --git a/Alignment/SurveyAnalysis/src/Chi2.cc b/Alignment/SurveyAnalysis/src/Chi2.cc
index 30b277f77db59..fc0ef72915186 100644
--- a/Alignment/SurveyAnalysis/src/Chi2.cc
+++ b/Alignment/SurveyAnalysis/src/Chi2.cc
@@ -1,34 +1,29 @@
 #include "Alignment/SurveyAnalysis/interface/Chi2.h"
 
 Chi2::Chi2(TMatrixD &m, TMatrixD &ym, TMatrixD &merrors) {
-  
   TMatrixD mt = m;
   mt.T();
   TMatrixD yt = ym;
   yt.T();
-  TMatrixD m_leftMatrix(mt*merrors*m);
-  TMatrixD m_rightMatrix(mt*merrors*ym);
+  TMatrixD m_leftMatrix(mt * merrors * m);
+  TMatrixD m_rightMatrix(mt * merrors * ym);
   leftMatrix.ResizeTo(m_leftMatrix.GetNrows(), m_leftMatrix.GetNcols());
   rightMatrix.ResizeTo(m_rightMatrix.GetNrows(), m_rightMatrix.GetNcols());
   covariance.ResizeTo(m_leftMatrix.GetNrows(), m_leftMatrix.GetNrows());
   rightMatrix = m_rightMatrix;
   leftMatrix = m_leftMatrix;
   covariance = m_leftMatrix.Invert();
-  TMatrixD m_solution(covariance*m_rightMatrix);
+  TMatrixD m_solution(covariance * m_rightMatrix);
   solution.ResizeTo(m_solution.GetNrows(), m_solution.GetNcols());
   solution = m_solution;
-  TMatrixD m_Chi2((yt-m_solution.T()*mt)*merrors*(ym-m*solution));
-  myChi2 = m_Chi2(0,0);
-  dof = ym.GetNrows()-solution.GetNrows();
-
-
+  TMatrixD m_Chi2((yt - m_solution.T() * mt) * merrors * (ym - m * solution));
+  myChi2 = m_Chi2(0, 0);
+  dof = ym.GetNrows() - solution.GetNrows();
 }
 
-Chi2::~Chi2(){}
-
-TMatrixD & Chi2::getCovariance() {return covariance;}
-TMatrixD & Chi2::getSolution() {return solution;}
-double Chi2::getChi2() {return myChi2;}
-int Chi2::getDOF() {return dof;}
+Chi2::~Chi2() {}
 
-  
+TMatrixD &Chi2::getCovariance() { return covariance; }
+TMatrixD &Chi2::getSolution() { return solution; }
+double Chi2::getChi2() { return myChi2; }
+int Chi2::getDOF() { return dof; }
diff --git a/Alignment/SurveyAnalysis/src/DTSurvey.cc b/Alignment/SurveyAnalysis/src/DTSurvey.cc
index 6d59ca8a37da8..4e656c0b584ec 100644
--- a/Alignment/SurveyAnalysis/src/DTSurvey.cc
+++ b/Alignment/SurveyAnalysis/src/DTSurvey.cc
@@ -1,86 +1,95 @@
 #include <fstream>
 
 #include "Alignment/SurveyAnalysis/interface/DTSurveyChamber.h"
-#include "DataFormats/MuonDetId/interface/DTChamberId.h" 
+#include "DataFormats/MuonDetId/interface/DTChamberId.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
-#include "Geometry/DTGeometry/interface/DTChamber.h" 
+#include "Geometry/DTGeometry/interface/DTChamber.h"
 
 #include "Alignment/SurveyAnalysis/interface/DTSurvey.h"
 #include <iostream>
 
-DTSurvey::DTSurvey(const std::string& Wheel, const std::string& Chambers, int n)
-  : chambers(nullptr) {
-  
+DTSurvey::DTSurvey(const std::string &Wheel, const std::string &Chambers, int n) : chambers(nullptr) {
   nameOfWheelInfoFile = Wheel;
   nameOfChamberInfoFile = Chambers;
-  id = n;   
-  
-  FillWheelInfo();
-}
-
+  id = n;
 
-DTSurvey::~DTSurvey() {
-  delete [] chambers;
+  FillWheelInfo();
 }
 
+DTSurvey::~DTSurvey() { delete[] chambers; }
 
 void DTSurvey::CalculateChambers() {
-  for(int stationCounter = 0; stationCounter < 4; stationCounter++) {
-    for(int sectorCounter = 0; sectorCounter < 14; sectorCounter++) {
-      if(chambers[stationCounter][sectorCounter]->getNumberPoints() > 2) {
+  for (int stationCounter = 0; stationCounter < 4; stationCounter++) {
+    for (int sectorCounter = 0; sectorCounter < 14; sectorCounter++) {
+      if (chambers[stationCounter][sectorCounter]->getNumberPoints() > 2) {
         chambers[stationCounter][sectorCounter]->compute();
       }
     }
   }
 }
 
-
-const DTSurveyChamber * DTSurvey::getChamber(int station, int sector) const {return chambers[station][sector];}
+const DTSurveyChamber *DTSurvey::getChamber(int station, int sector) const { return chambers[station][sector]; }
 
 void DTSurvey::ReadChambers(edm::ESHandle<DTGeometry> pDD) {
-  
   //Create the chambers
-  chambers = new DTSurveyChamber ** [4];
+  chambers = new DTSurveyChamber **[4];
   for (int cont_stat = 0; cont_stat < 4; cont_stat++) {
-    chambers[cont_stat] = new DTSurveyChamber * [14];
-    for(int cont_sect = 0; cont_sect < 14; cont_sect++) {
-      DTChamberId mId(id, cont_stat+1, cont_sect+1);
-      chambers[cont_stat][cont_sect] = new DTSurveyChamber(id, cont_stat+1, cont_sect+1, mId.rawId());
+    chambers[cont_stat] = new DTSurveyChamber *[14];
+    for (int cont_sect = 0; cont_sect < 14; cont_sect++) {
+      DTChamberId mId(id, cont_stat + 1, cont_sect + 1);
+      chambers[cont_stat][cont_sect] = new DTSurveyChamber(id, cont_stat + 1, cont_sect + 1, mId.rawId());
     }
   }
 
   std::cout << nameOfChamberInfoFile << std::endl;
   std::ifstream file(nameOfChamberInfoFile.c_str());
-  while(!file.eof()) {
+  while (!file.eof()) {
     int code, station, sector;
     double x, y, z, rms, dx, dy, dz;
     file >> code >> x >> y >> z >> rms >> dx >> dy >> dz;
-    if(file.eof()) break;
-    x = x/10.0; y=y/10.0; z=z/10.0; dx=dx/10.0; dy=dy/10.0; dz=dz/10.0;rms=rms/10.0; 
-    station = code/10000 - 1;
-    sector = (code-(station+1)*10000)/100 - 1;
+    if (file.eof())
+      break;
+    x = x / 10.0;
+    y = y / 10.0;
+    z = z / 10.0;
+    dx = dx / 10.0;
+    dy = dy / 10.0;
+    dz = dz / 10.0;
+    rms = rms / 10.0;
+    station = code / 10000 - 1;
+    sector = (code - (station + 1) * 10000) / 100 - 1;
     //De momento vamos a actuar como si no hubiera otra forma de resolver esto
-    TMatrixD r(3,1);
-    r(0,0) = x; r(1,0) = y;r(2,0) = z+OffsetZ;
-    TMatrixD disp(3,1);
-    disp(0,0) = dx; disp(1,0) = dy; disp(2,0) = dz;
-    TMatrixD rp = Rot*r-delta;
-    disp = disp-r+rp;
-    
-    GlobalPoint rg(r(0,0), r(1,0), r(2,0));
-    GlobalPoint rt(r(0,0)-disp(0,0), r(1,0)-disp(1,0), r(2,0)-disp(2,0));
-    DTChamberId mId(id, station+1, sector+1);
+    TMatrixD r(3, 1);
+    r(0, 0) = x;
+    r(1, 0) = y;
+    r(2, 0) = z + OffsetZ;
+    TMatrixD disp(3, 1);
+    disp(0, 0) = dx;
+    disp(1, 0) = dy;
+    disp(2, 0) = dz;
+    TMatrixD rp = Rot * r - delta;
+    disp = disp - r + rp;
+
+    GlobalPoint rg(r(0, 0), r(1, 0), r(2, 0));
+    GlobalPoint rt(r(0, 0) - disp(0, 0), r(1, 0) - disp(1, 0), r(2, 0) - disp(2, 0));
+    DTChamberId mId(id, station + 1, sector + 1);
     const DTChamber *mChamber = static_cast<const DTChamber *>(pDD->idToDet(mId));
     LocalPoint rl = mChamber->toLocal(rg);
     LocalPoint rtl = mChamber->toLocal(rt);
-    TMatrixD rLocal(3,1);
-    rLocal(0,0) = rl.x(); rLocal(1,0) = rl.y(); rLocal(2,0) = rl.z();
-    TMatrixD rTeo(3,1);
-    rTeo(0,0) = rtl.x(); rTeo(1,0) = rtl.y(); rTeo(2,0) = rtl.z();
-    TMatrixD diff = rLocal-rTeo;
-    TMatrixD errors(3,1);
-    errors(0,0) = rms; errors(1,0) = rms; errors(2,0) = rms;
+    TMatrixD rLocal(3, 1);
+    rLocal(0, 0) = rl.x();
+    rLocal(1, 0) = rl.y();
+    rLocal(2, 0) = rl.z();
+    TMatrixD rTeo(3, 1);
+    rTeo(0, 0) = rtl.x();
+    rTeo(1, 0) = rtl.y();
+    rTeo(2, 0) = rtl.z();
+    TMatrixD diff = rLocal - rTeo;
+    TMatrixD errors(3, 1);
+    errors(0, 0) = rms;
+    errors(1, 0) = rms;
+    errors(2, 0) = rms;
     chambers[station][sector]->addPoint(code, rLocal, diff, errors);
   }
   file.close();
@@ -109,57 +118,54 @@ void DTSurvey::ToDB(MuonAlignment *myMuonAlignment) {
 */
 
 void DTSurvey::FillWheelInfo() {
-
   std::ifstream wheeltowheel(nameOfWheelInfoFile.c_str());
   float zOffset, deltax, deltay, deltaz, alpha, beta, gamma;
   wheeltowheel >> zOffset >> deltax >> deltay >> deltaz >> alpha >> beta >> gamma;
   wheeltowheel.close();
-  
+
   OffsetZ = zOffset;
 
   //Build displacement vector
-  delta.ResizeTo(3,1);
-  delta(0,0) = deltax/10.0;
-  delta(1,0) = deltay/10.0;
-  delta(2,0) = deltaz/10.0;
-  
+  delta.ResizeTo(3, 1);
+  delta(0, 0) = deltax / 10.0;
+  delta(1, 0) = deltay / 10.0;
+  delta(2, 0) = deltaz / 10.0;
+
   //Build rotation matrix
-  Rot.ResizeTo(3,3);
-  TMatrixD alpha_m(3,3);
-  TMatrixD beta_m(3,3);
-  TMatrixD gamma_m(3,3);
+  Rot.ResizeTo(3, 3);
+  TMatrixD alpha_m(3, 3);
+  TMatrixD beta_m(3, 3);
+  TMatrixD gamma_m(3, 3);
   alpha_m.Zero();
   beta_m.Zero();
   gamma_m.Zero();
-  for(int k = 0; k < 3; k++) {
-    alpha_m(k,k) = 1.0;
-    beta_m(k,k) = 1.0;
-    gamma_m(k,k) = 1.0;
+  for (int k = 0; k < 3; k++) {
+    alpha_m(k, k) = 1.0;
+    beta_m(k, k) = 1.0;
+    gamma_m(k, k) = 1.0;
   }
-  alpha /= 1000.0; //New scale: angles in radians
+  alpha /= 1000.0;  //New scale: angles in radians
   beta /= 1000.0;
   gamma /= 1000.0;
-  alpha_m(1,1) = cos(alpha);
-  alpha_m(1,2) = sin(alpha);
-  alpha_m(2,1) = -sin(alpha);
-  alpha_m(2,2) = cos(alpha);
-  beta_m(0,0) = cos(beta);
-  beta_m(0,2) = -sin(beta);
-  beta_m(2,0) = sin(beta);
-  beta_m(2,2) = cos(beta);
-  gamma_m(0,0) = cos(gamma);
-  gamma_m(0,1) = sin(gamma);
-  gamma_m(1,0) = -sin(gamma);
-  gamma_m(1,1) = cos(gamma);
-  Rot = alpha_m*beta_m*gamma_m;
+  alpha_m(1, 1) = cos(alpha);
+  alpha_m(1, 2) = sin(alpha);
+  alpha_m(2, 1) = -sin(alpha);
+  alpha_m(2, 2) = cos(alpha);
+  beta_m(0, 0) = cos(beta);
+  beta_m(0, 2) = -sin(beta);
+  beta_m(2, 0) = sin(beta);
+  beta_m(2, 2) = cos(beta);
+  gamma_m(0, 0) = cos(gamma);
+  gamma_m(0, 1) = sin(gamma);
+  gamma_m(1, 0) = -sin(gamma);
+  gamma_m(1, 1) = cos(gamma);
+  Rot = alpha_m * beta_m * gamma_m;
 }
 
-
-std::ostream &operator<<(std::ostream & flux, const DTSurvey& obj) {
-
-  for(int stationCounter = 0; stationCounter < 4; stationCounter++) {
-    for(int sectorCounter = 0; sectorCounter < 14; sectorCounter++) {
-      if(obj.getChamber(stationCounter,sectorCounter)->getNumberPoints() > 2) {
+std::ostream &operator<<(std::ostream &flux, const DTSurvey &obj) {
+  for (int stationCounter = 0; stationCounter < 4; stationCounter++) {
+    for (int sectorCounter = 0; sectorCounter < 14; sectorCounter++) {
+      if (obj.getChamber(stationCounter, sectorCounter)->getNumberPoints() > 2) {
         const DTSurveyChamber *m_chamber = obj.getChamber(stationCounter, sectorCounter);
         flux << *m_chamber;
       }
diff --git a/Alignment/SurveyAnalysis/src/DTSurveyChamber.cc b/Alignment/SurveyAnalysis/src/DTSurveyChamber.cc
index ce5cd9318da0d..0ecca42540037 100644
--- a/Alignment/SurveyAnalysis/src/DTSurveyChamber.cc
+++ b/Alignment/SurveyAnalysis/src/DTSurveyChamber.cc
@@ -1,113 +1,89 @@
 #include <iostream>
 
 #include "Alignment/SurveyAnalysis/interface/DTSurveyChamber.h"
-#include "Alignment/SurveyAnalysis/interface/Chi2.h" 
-
+#include "Alignment/SurveyAnalysis/interface/Chi2.h"
 
 DTSurveyChamber::DTSurveyChamber(int m_wheel, int m_station, int m_sector, long m_rawId) {
-  
   //Coordinates of the chamber
   wheel = m_wheel;
   station = m_station;
   sector = m_sector;
   pointNumber = 0;
-  rawId = m_rawId;  
-   
+  rawId = m_rawId;
 }
 
-
 void DTSurveyChamber::compute() {
-  
   TMatrixD leftMatrix = makeMatrix();
   TMatrixD rightMatrix = makeVector();
   TMatrixD errors = makeErrors();
-  
+
   Chi2 myChi2(leftMatrix, rightMatrix, errors);
-  
-  Solution.ResizeTo(6,1);
+
+  Solution.ResizeTo(6, 1);
   Solution = myChi2.getSolution();
-  Covariance.ResizeTo(6,6);
+  Covariance.ResizeTo(6, 6);
   Covariance = myChi2.getCovariance();
-
 }
 
-
-void DTSurveyChamber::addPoint(int code, const TMatrixD& r, const TMatrixD& disp, const TMatrixD& err) {
-  
-  
+void DTSurveyChamber::addPoint(int code, const TMatrixD &r, const TMatrixD &disp, const TMatrixD &err) {
   ++pointNumber;
 
   points.push_back(r);
   pointsDiff.push_back(disp);
   pointsError.push_back(err);
-  pointsTheoretical.push_back(r-disp);
-
+  pointsTheoretical.push_back(r - disp);
 }
-  
-
 
-TMatrixD & DTSurveyChamber::makeVector() {
-
-  TMatrixD *result = new TMatrixD(3*getNumberPoints(),1);
+TMatrixD &DTSurveyChamber::makeVector() {
+  TMatrixD *result = new TMatrixD(3 * getNumberPoints(), 1);
   result->Zero();
   int real = 0;
-  for(std::vector<TMatrixD >::iterator p = pointsDiff.begin(); p != pointsDiff.end(); ++p) {  
-    (*result)(real*3,0) = (*p)(0,0);
-    (*result)(real*3+1,0) = (*p)(1,0);
-    (*result)(real*3+2,0) = (*p)(2,0);
+  for (std::vector<TMatrixD>::iterator p = pointsDiff.begin(); p != pointsDiff.end(); ++p) {
+    (*result)(real * 3, 0) = (*p)(0, 0);
+    (*result)(real * 3 + 1, 0) = (*p)(1, 0);
+    (*result)(real * 3 + 2, 0) = (*p)(2, 0);
     ++real;
   }
   return *result;
 }
 
-
-
-TMatrixD & DTSurveyChamber::makeErrors() {
-  
-  TMatrixD *result = new TMatrixD(3*getNumberPoints(),3*getNumberPoints());
+TMatrixD &DTSurveyChamber::makeErrors() {
+  TMatrixD *result = new TMatrixD(3 * getNumberPoints(), 3 * getNumberPoints());
   result->Zero();
   int real = 0;
-  for(std::vector<TMatrixD >::iterator p = pointsError.begin(); p != pointsError.end(); ++p) {
-    double rmsn = 1.0/((*p)(0,0)*(*p)(0,0));
-    (*result)(real*3,real*3) = rmsn;
-    (*result)(real*3+1,real*3+1) = rmsn;
-    (*result)(real*3+2,real*3+2) = rmsn;
+  for (std::vector<TMatrixD>::iterator p = pointsError.begin(); p != pointsError.end(); ++p) {
+    double rmsn = 1.0 / ((*p)(0, 0) * (*p)(0, 0));
+    (*result)(real * 3, real * 3) = rmsn;
+    (*result)(real * 3 + 1, real * 3 + 1) = rmsn;
+    (*result)(real * 3 + 2, real * 3 + 2) = rmsn;
     real++;
   }
   return *result;
 }
 
-
-TMatrixD & DTSurveyChamber::makeMatrix() {
-
-  TMatrixD *result = new TMatrixD(3*getNumberPoints(), 6);
+TMatrixD &DTSurveyChamber::makeMatrix() {
+  TMatrixD *result = new TMatrixD(3 * getNumberPoints(), 6);
   result->Zero();
   int real = 0;
-  for(std::vector<TMatrixD >::iterator p = pointsTheoretical.begin(); p != pointsTheoretical.end(); p++) {
-    (*result)(real*3,0)= 1.0;
-    (*result)(real*3,3) = (*p)(1,0);
-    (*result)(real*3,4) = (*p)(2,0);
-    (*result)(real*3+1,1) = 1.0;
-    (*result)(real*3+1,3) = -(*p)(0,0);
-    (*result)(real*3+1,5) = (*p)(2,0);
-    (*result)(real*3+2,2) = 1.0;
-    (*result)(real*3+2,4) = -(*p)(0,0);
-    (*result)(real*3+2,5) = -(*p)(1,0);
+  for (std::vector<TMatrixD>::iterator p = pointsTheoretical.begin(); p != pointsTheoretical.end(); p++) {
+    (*result)(real * 3, 0) = 1.0;
+    (*result)(real * 3, 3) = (*p)(1, 0);
+    (*result)(real * 3, 4) = (*p)(2, 0);
+    (*result)(real * 3 + 1, 1) = 1.0;
+    (*result)(real * 3 + 1, 3) = -(*p)(0, 0);
+    (*result)(real * 3 + 1, 5) = (*p)(2, 0);
+    (*result)(real * 3 + 2, 2) = 1.0;
+    (*result)(real * 3 + 2, 4) = -(*p)(0, 0);
+    (*result)(real * 3 + 2, 5) = -(*p)(1, 0);
     real++;
   }
   return *result;
 }
 
-
-std::ostream &operator<<(std::ostream &flujo, const DTSurveyChamber& obj) {
-
-  flujo << obj.getId() << " "
-        << obj.getDeltaX() << " " << obj.getDeltaXError() << " "
-        << obj.getDeltaY() << " " << obj.getDeltaYError() << " "
-        << obj.getDeltaZ() << " " << obj.getDeltaZError() << " "
-        << obj.getAlpha() << " " << obj.getAlphaError() << " "
-        << obj.getBeta() << " " << obj.getBetaError() << " "
-        << obj.getGamma() << " " << obj.getGammaError() << std::endl;
+std::ostream &operator<<(std::ostream &flujo, const DTSurveyChamber &obj) {
+  flujo << obj.getId() << " " << obj.getDeltaX() << " " << obj.getDeltaXError() << " " << obj.getDeltaY() << " "
+        << obj.getDeltaYError() << " " << obj.getDeltaZ() << " " << obj.getDeltaZError() << " " << obj.getAlpha() << " "
+        << obj.getAlphaError() << " " << obj.getBeta() << " " << obj.getBetaError() << " " << obj.getGamma() << " "
+        << obj.getGammaError() << std::endl;
   return flujo;
-
 }
diff --git a/Alignment/SurveyAnalysis/src/SurveyAlignment.cc b/Alignment/SurveyAnalysis/src/SurveyAlignment.cc
index ee5e17dea3dea..394eb374e753b 100644
--- a/Alignment/SurveyAnalysis/src/SurveyAlignment.cc
+++ b/Alignment/SurveyAnalysis/src/SurveyAlignment.cc
@@ -6,65 +6,56 @@
 
 using namespace align;
 
-SurveyAlignment::SurveyAlignment(const Alignables& sensors,
-				 const std::vector<StructureType>& levels):
-  theSensors(sensors),
-  theLevels(levels)
-{
-}
+SurveyAlignment::SurveyAlignment(const Alignables& sensors, const std::vector<StructureType>& levels)
+    : theSensors(sensors), theLevels(levels) {}
 
-void SurveyAlignment::shiftSensors()
-{
+void SurveyAlignment::shiftSensors() {
   unsigned int nSensor = theSensors.size();
 
-  for (unsigned int i = 0; i < nSensor; ++i)
-  {
+  for (unsigned int i = 0; i < nSensor; ++i) {
     Alignable* ali = theSensors[i];
 
     const AlignableSurface& surf = ali->surface();
-    const AlgebraicVector&  pars = ali->alignmentParameters()->parameters();
+    const AlgebraicVector& pars = ali->alignmentParameters()->parameters();
 
     EulerAngles angles(3);
 
-    angles(1) = pars[3]; angles(2) = pars[4]; angles(3) = pars[5];
+    angles(1) = pars[3];
+    angles(2) = pars[4];
+    angles(3) = pars[5];
 
-    RotationType rot = surf.toGlobal( toMatrix(angles) );
+    RotationType rot = surf.toGlobal(toMatrix(angles));
 
-    rectify(rot); // correct for rounding errors
+    rectify(rot);  // correct for rounding errors
 
-    ali->move( surf.toGlobal( align::LocalVector(pars[0], pars[1], pars[2]) ) );
+    ali->move(surf.toGlobal(align::LocalVector(pars[0], pars[1], pars[2])));
     ali->rotateInGlobalFrame(rot);
   }
 }
 
-void SurveyAlignment::iterate(unsigned int nIteration,
-			      const std::string& fileName,
-			      bool bias)
-{
-  static const double tolerance = 1e-4; // convergence criteria
+void SurveyAlignment::iterate(unsigned int nIteration, const std::string& fileName, bool bias) {
+  static const double tolerance = 1e-4;  // convergence criteria
 
   SurveyOutput out(theSensors, fileName);
 
   out.write(0);
 
-  for (unsigned int i = 1; i <= nIteration; ++i)
-  {
+  for (unsigned int i = 1; i <= nIteration; ++i) {
     std::cout << "***** Iteration " << i << " *****\n";
     findAlignPars(bias);
     shiftSensors();
     out.write(i);
 
-  // Check convergence
+    // Check convergence
 
     double parChi2 = 0.;
 
     unsigned int nSensor = theSensors.size();
 
-    for (unsigned int j = 0; j < nSensor; ++j)
-    {
+    for (unsigned int j = 0; j < nSensor; ++j) {
       AlignmentParameters* alignPar = theSensors[j]->alignmentParameters();
 
-      const AlgebraicVector&    par = alignPar->parameters();
+      const AlgebraicVector& par = alignPar->parameters();
       const AlgebraicSymMatrix& cov = alignPar->covariance();
 
       int dummy;
@@ -74,6 +65,7 @@ void SurveyAlignment::iterate(unsigned int nIteration,
 
     parChi2 /= static_cast<double>(nSensor);
     std::cout << "chi2 = " << parChi2 << std::endl;
-    if (parChi2 < tolerance) break; // converges, so exit loop
+    if (parChi2 < tolerance)
+      break;  // converges, so exit loop
   }
 }
diff --git a/Alignment/SurveyAnalysis/src/SurveyAlignmentPoints.cc b/Alignment/SurveyAnalysis/src/SurveyAlignmentPoints.cc
index a85ca70b8dc76..bd1c7bea097cf 100644
--- a/Alignment/SurveyAnalysis/src/SurveyAlignmentPoints.cc
+++ b/Alignment/SurveyAnalysis/src/SurveyAlignmentPoints.cc
@@ -6,51 +6,48 @@
 #include "Alignment/SurveyAnalysis/interface/SurveyAlignmentPoints.h"
 
 SurveyAlignmentPoints::SurveyAlignmentPoints(const align::Alignables& sensors,
-					     const std::vector<align::StructureType>& levels):
-  SurveyAlignment(sensors, levels)
-{
-}
+                                             const std::vector<align::StructureType>& levels)
+    : SurveyAlignment(sensors, levels) {}
 
-void SurveyAlignmentPoints::findAlignPars(bool bias)
-{
+void SurveyAlignmentPoints::findAlignPars(bool bias) {
   unsigned int nSensor = theSensors.size();
 
-  for (unsigned int i = 0; i < nSensor; ++i)
-  {
+  for (unsigned int i = 0; i < nSensor; ++i) {
     Alignable* ali = theSensors[i];
 
-    AlgebraicSymMatrix sumJVJT(6, 0); // 6 by 6 symmetric matrix init to 0
-    AlgebraicVector    sumJVe(6, 0);  // init to 0
+    AlgebraicSymMatrix sumJVJT(6, 0);  // 6 by 6 symmetric matrix init to 0
+    AlgebraicVector sumJVe(6, 0);      // init to 0
 
-    for (unsigned int l = 0; l < theLevels.size(); ++l)
-    {
+    for (unsigned int l = 0; l < theLevels.size(); ++l) {
       SurveyResidual res(*ali, theLevels[l], bias);
 
-      if ( !res.valid() ) continue;
+      if (!res.valid())
+        continue;
 
       align::LocalVectors residuals = res.pointsResidual();
 
       unsigned int nPoints = residuals.size();
 
-      for (unsigned int j = 0; j < nPoints; ++j)
-      {
-	AlgebraicMatrix J = ali->survey()->derivatives(j);
-	AlgebraicSymMatrix V(3, 1); // identity for now
-	AlgebraicVector e(3); // local residual
+      for (unsigned int j = 0; j < nPoints; ++j) {
+        AlgebraicMatrix J = ali->survey()->derivatives(j);
+        AlgebraicSymMatrix V(3, 1);  // identity for now
+        AlgebraicVector e(3);        // local residual
 
-	const align::LocalVector& lr = residuals[j];
+        const align::LocalVector& lr = residuals[j];
 
-	e(1) = lr.x(); e(2) = lr.y(); e(3) = lr.z();
-	V /= 1e-4 * 1e-4;
-	sumJVe  += J * (V * e);
-	sumJVJT += V.similarity(J);
+        e(1) = lr.x();
+        e(2) = lr.y();
+        e(3) = lr.z();
+        V /= 1e-4 * 1e-4;
+        sumJVe += J * (V * e);
+        sumJVJT += V.similarity(J);
       }
     }
 
     int dummy;
-    sumJVJT.invert(dummy); // sumJVJT = sumJVJT^-1
+    sumJVJT.invert(dummy);  // sumJVJT = sumJVJT^-1
     sumJVe = -sumJVJT * sumJVe;
 
-    ali->setAlignmentParameters( new SurveyParameters(ali, sumJVe, sumJVJT) );
+    ali->setAlignmentParameters(new SurveyParameters(ali, sumJVe, sumJVJT));
   }
 }
diff --git a/Alignment/SurveyAnalysis/src/SurveyAlignmentSensor.cc b/Alignment/SurveyAnalysis/src/SurveyAlignmentSensor.cc
index 900d4ce8e5602..53dd8b8c4da2e 100644
--- a/Alignment/SurveyAnalysis/src/SurveyAlignmentSensor.cc
+++ b/Alignment/SurveyAnalysis/src/SurveyAlignmentSensor.cc
@@ -5,27 +5,23 @@
 #include "Alignment/SurveyAnalysis/interface/SurveyAlignmentSensor.h"
 
 SurveyAlignmentSensor::SurveyAlignmentSensor(const align::Alignables& sensors,
-					     const std::vector<align::StructureType>& levels):
-  SurveyAlignment(sensors, levels)
-{
-}
+                                             const std::vector<align::StructureType>& levels)
+    : SurveyAlignment(sensors, levels) {}
 
-void SurveyAlignmentSensor::findAlignPars(bool bias)
-{
+void SurveyAlignmentSensor::findAlignPars(bool bias) {
   unsigned int nSensor = theSensors.size();
 
-  for (unsigned int i = 0; i < nSensor; ++i)
-  {
+  for (unsigned int i = 0; i < nSensor; ++i) {
     Alignable* ali = theSensors[i];
 
     AlgebraicVector par(6, 0);
     AlgebraicSymMatrix cov(6, 0);
 
-    for (unsigned int l = 0; l < theLevels.size(); ++l)
-    {
+    for (unsigned int l = 0; l < theLevels.size(); ++l) {
       SurveyResidual res(*ali, theLevels[l], bias);
 
-      if ( !res.valid() ) continue;
+      if (!res.valid())
+        continue;
 
       AlgebraicSymMatrix invCov = res.inverseCovariance();
 
@@ -34,9 +30,9 @@ void SurveyAlignmentSensor::findAlignPars(bool bias)
     }
 
     int dummy;
-    cov.invert(dummy); // cov = cov^-1
+    cov.invert(dummy);  // cov = cov^-1
     par = -cov * par;
 
-    ali->setAlignmentParameters( new SurveyParameters(ali, par, cov) );
+    ali->setAlignmentParameters(new SurveyParameters(ali, par, cov));
   }
 }
diff --git a/Alignment/SurveyAnalysis/src/SurveyDataReader.cc b/Alignment/SurveyAnalysis/src/SurveyDataReader.cc
index 741cc6389317d..6a629fd42049a 100644
--- a/Alignment/SurveyAnalysis/src/SurveyDataReader.cc
+++ b/Alignment/SurveyAnalysis/src/SurveyDataReader.cc
@@ -14,109 +14,102 @@ using namespace std;
 using namespace edm;
 
 //__________________________________________________________________________________________________
-void SurveyDataReader::readFile( const std::string& textFileName, const std::string& fileType, const TrackerTopology* tTopo) {
-  
-  std::ifstream myfile( textFileName.c_str() );
-  if ( !myfile.is_open() ) 
+void SurveyDataReader::readFile(const std::string& textFileName,
+                                const std::string& fileType,
+                                const TrackerTopology* tTopo) {
+  std::ifstream myfile(textFileName.c_str());
+  if (!myfile.is_open())
     throw cms::Exception("FileAccess") << "Unable to open input text file for " << fileType.c_str();
 
   int nErrors = 0;
   align::ID m_detId = 0;
   int NINPUTS_align = 30;
   int NINPUTS_detId = 6;
-  if (fileType == "TID") NINPUTS_detId++;
+  if (fileType == "TID")
+    NINPUTS_detId++;
 
   std::vector<int> d_inputs;
   align::Scalars a_inputs;
   align::Scalars a_outputs;
   int itmpInput;
-  float tmpInput; 
-
-  while ( !myfile.eof() && myfile.good() )
-	{
-	  d_inputs.clear();
-          a_inputs.clear();
-          a_outputs.clear();
-
-          if (fileType == "TIB") {
-	    itmpInput = int(StripSubdetector::TIB) ; 
-	  } else {
-	    itmpInput = int(StripSubdetector::TID) ;
-	  }
-
-          d_inputs.push_back( itmpInput );
-
-	  for ( int i=0; i<NINPUTS_detId; i++ )
-		{
-		  myfile >> itmpInput;
-		  d_inputs.push_back( itmpInput );
-		}
-            
-          // Calculate DetId(s)
-          int ster = 0;  // if module is single-sided, take the module
-                         // if double-sided get the glued module
-
-	  if (fileType == "TID") {
-	    
-	    m_detId = tTopo->tidDetId(d_inputs[2], d_inputs[3], d_inputs[4], d_inputs[5], d_inputs[6], ster);
-	  }
-	  else if (fileType == "TIB") {
-	     
-	    m_detId = tTopo->tibDetId(d_inputs[2], d_inputs[3], d_inputs[4], d_inputs[5], d_inputs[6], ster);
-	  }
-
-          if (abs(int(m_detId) - int(d_inputs[1])) > 2) {  // Check DetId calculation ...
-            std::cout << "ERROR : DetId - detector position mismatch! Found " << nErrors << std::endl;
-            nErrors++;
-	  }
-
-          // std::cout << m_detId << " " << d_inputs[1] << std::endl;
-	  // m_detId = d_inputs[1];
-	  for ( int j=0; j<NINPUTS_align; j++ )
-		{
-		  myfile >> tmpInput;
-		  a_inputs.push_back( tmpInput );
-		}
-
-	  // Check if read succeeded (otherwise, we are at eof)
-	  if ( myfile.fail() ) break;
-
-          a_outputs = convertToAlignableCoord( a_inputs );
-
-	  theOriginalMap.insert( PairTypeOr( d_inputs, a_inputs ));
-	  theMap.insert( PairType( m_detId, a_outputs ));
-	 
-	}
-
+  float tmpInput;
+
+  while (!myfile.eof() && myfile.good()) {
+    d_inputs.clear();
+    a_inputs.clear();
+    a_outputs.clear();
+
+    if (fileType == "TIB") {
+      itmpInput = int(StripSubdetector::TIB);
+    } else {
+      itmpInput = int(StripSubdetector::TID);
+    }
+
+    d_inputs.push_back(itmpInput);
+
+    for (int i = 0; i < NINPUTS_detId; i++) {
+      myfile >> itmpInput;
+      d_inputs.push_back(itmpInput);
+    }
+
+    // Calculate DetId(s)
+    int ster = 0;  // if module is single-sided, take the module
+                   // if double-sided get the glued module
+
+    if (fileType == "TID") {
+      m_detId = tTopo->tidDetId(d_inputs[2], d_inputs[3], d_inputs[4], d_inputs[5], d_inputs[6], ster);
+    } else if (fileType == "TIB") {
+      m_detId = tTopo->tibDetId(d_inputs[2], d_inputs[3], d_inputs[4], d_inputs[5], d_inputs[6], ster);
+    }
+
+    if (abs(int(m_detId) - int(d_inputs[1])) > 2) {  // Check DetId calculation ...
+      std::cout << "ERROR : DetId - detector position mismatch! Found " << nErrors << std::endl;
+      nErrors++;
+    }
+
+    // std::cout << m_detId << " " << d_inputs[1] << std::endl;
+    // m_detId = d_inputs[1];
+    for (int j = 0; j < NINPUTS_align; j++) {
+      myfile >> tmpInput;
+      a_inputs.push_back(tmpInput);
+    }
+
+    // Check if read succeeded (otherwise, we are at eof)
+    if (myfile.fail())
+      break;
+
+    a_outputs = convertToAlignableCoord(a_inputs);
+
+    theOriginalMap.insert(PairTypeOr(d_inputs, a_inputs));
+    theMap.insert(PairType(m_detId, a_outputs));
+  }
 }
 //__________________________________________________________________________________________________
-align::Scalars 
-SurveyDataReader::convertToAlignableCoord( const align::Scalars& align_params ) 
-{
-      align::Scalars align_outputs;
-
-      // Convert to coordinates that TrackerAlignment can read in
-     
-      // Center of sensor 
-      AlgebraicVector geomCent(3);
-      AlgebraicVector surCent(3);
-      for (int ii = 0; ii < 3; ii++) {
-	geomCent[ii] = align_params[ii];
-	surCent[ii] = align_params[ii+15];
-      }
-      surCent -= geomCent;
-                 
-      align_outputs.push_back( surCent[0] ); 
-      align_outputs.push_back( surCent[1] );   
-      align_outputs.push_back( surCent[2] );   
-      
-      // Rotation matrices
-      for (int ii = 3; ii < 12; ii++) { 
-	  align_outputs.push_back( align_params[ii] );
-      }
-      for (int ii = 18; ii < 27; ii++) { 
-	  align_outputs.push_back( align_params[ii] );
-      } 
-           
-      return align_outputs; 
+align::Scalars SurveyDataReader::convertToAlignableCoord(const align::Scalars& align_params) {
+  align::Scalars align_outputs;
+
+  // Convert to coordinates that TrackerAlignment can read in
+
+  // Center of sensor
+  AlgebraicVector geomCent(3);
+  AlgebraicVector surCent(3);
+  for (int ii = 0; ii < 3; ii++) {
+    geomCent[ii] = align_params[ii];
+    surCent[ii] = align_params[ii + 15];
+  }
+  surCent -= geomCent;
+
+  align_outputs.push_back(surCent[0]);
+  align_outputs.push_back(surCent[1]);
+  align_outputs.push_back(surCent[2]);
+
+  // Rotation matrices
+  for (int ii = 3; ii < 12; ii++) {
+    align_outputs.push_back(align_params[ii]);
+  }
+  for (int ii = 18; ii < 27; ii++) {
+    align_outputs.push_back(align_params[ii]);
+  }
+
+  return align_outputs;
 }
diff --git a/Alignment/SurveyAnalysis/src/SurveyInputBase.cc b/Alignment/SurveyAnalysis/src/SurveyInputBase.cc
index 79cd2b42972cb..ac3fe75e9965f 100644
--- a/Alignment/SurveyAnalysis/src/SurveyInputBase.cc
+++ b/Alignment/SurveyAnalysis/src/SurveyInputBase.cc
@@ -4,15 +4,13 @@
 
 Alignable* SurveyInputBase::theDetector(nullptr);
 
-SurveyInputBase::~SurveyInputBase()
-{
+SurveyInputBase::~SurveyInputBase() {
   delete theDetector;
 
   theDetector = nullptr;
 }
 
-void SurveyInputBase::addComponent(Alignable* comp)
-{
+void SurveyInputBase::addComponent(Alignable* comp) {
   if (nullptr == theDetector)
     theDetector = comp;
   else
diff --git a/Alignment/SurveyAnalysis/src/SurveyInputTextReader.cc b/Alignment/SurveyAnalysis/src/SurveyInputTextReader.cc
index 5882a0ac6c531..12666e359ffa1 100644
--- a/Alignment/SurveyAnalysis/src/SurveyInputTextReader.cc
+++ b/Alignment/SurveyAnalysis/src/SurveyInputTextReader.cc
@@ -8,54 +8,47 @@
 #include "Alignment/SurveyAnalysis/interface/SurveyInputTextReader.h"
 
 //__________________________________________________________________________________________________
-void SurveyInputTextReader::readFile( const std::string& textFileName )
-{
-
-  std::ifstream myfile( textFileName.c_str() );
-  if ( !myfile.is_open() )
-        throw cms::Exception("FileAccess") << "Unable to open input text file";
+void SurveyInputTextReader::readFile(const std::string& textFileName) {
+  std::ifstream myfile(textFileName.c_str());
+  if (!myfile.is_open())
+    throw cms::Exception("FileAccess") << "Unable to open input text file";
 
   // FIXME: - currently defaulting to RunI as this was the previous behaviour
   //        - check this, when resurrecting this code in the future
   AlignableObjectId alignableObjectId{AlignableObjectId::Geometry::General};
 
-  while ( !myfile.eof() && myfile.good() )
-    {
-      align::Scalars m_inputs;
-		
-      UniqueId  m_uId;
-      char firstchar;
-      firstchar = myfile.peek();
-
-      if(firstchar == '#'){
-	std::string line;
-	getline(myfile,line);
-      }
-      else if (firstchar == '!'){
-	std::string firststring;
-	std::string structure; 
-	myfile >> firststring >> structure;
-	std::string endofline;
-	getline(myfile,endofline);
-	m_uId.second = alignableObjectId.stringToId(structure.c_str());
+  while (!myfile.eof() && myfile.good()) {
+    align::Scalars m_inputs;
+
+    UniqueId m_uId;
+    char firstchar;
+    firstchar = myfile.peek();
+
+    if (firstchar == '#') {
+      std::string line;
+      getline(myfile, line);
+    } else if (firstchar == '!') {
+      std::string firststring;
+      std::string structure;
+      myfile >> firststring >> structure;
+      std::string endofline;
+      getline(myfile, endofline);
+      m_uId.second = alignableObjectId.stringToId(structure.c_str());
+    } else {
+      myfile >> m_uId.first;
+
+      for (int i = 0; i < NINPUTS; i++) {
+        float tmpInput;
+        myfile >> tmpInput;
+        m_inputs.push_back(tmpInput);
       }
-      else{
-	myfile >> m_uId.first;
-
-	for ( int i=0; i<NINPUTS; i++ )
-	  {
-	    float tmpInput;
-	    myfile >> tmpInput;
-	    m_inputs.push_back( tmpInput );
-	  }
-	std::string endofline;
-	getline(myfile,endofline);
-	theMap.insert( PairType( m_uId, m_inputs));			
-			
-	// Check if read succeeded (otherwise, we are at eof)
-	if ( myfile.fail() ) break;
-			
+      std::string endofline;
+      getline(myfile, endofline);
+      theMap.insert(PairType(m_uId, m_inputs));
 
-      }
+      // Check if read succeeded (otherwise, we are at eof)
+      if (myfile.fail())
+        break;
     }
+  }
 }
diff --git a/Alignment/SurveyAnalysis/src/SurveyOutput.cc b/Alignment/SurveyAnalysis/src/SurveyOutput.cc
index d42a881c01402..63ad9ba1c7ff5 100644
--- a/Alignment/SurveyAnalysis/src/SurveyOutput.cc
+++ b/Alignment/SurveyAnalysis/src/SurveyOutput.cc
@@ -7,15 +7,10 @@
 
 #include "Alignment/SurveyAnalysis/interface/SurveyOutput.h"
 
-SurveyOutput::SurveyOutput(const align::Alignables& alignables,
-			   const std::string& fileName):
-  theAlignables(alignables),
-  theFile(fileName.c_str(), "RECREATE")
-{
-}
+SurveyOutput::SurveyOutput(const align::Alignables& alignables, const std::string& fileName)
+    : theAlignables(alignables), theFile(fileName.c_str(), "RECREATE") {}
 
-void SurveyOutput::write(unsigned int iter)
-{
+void SurveyOutput::write(unsigned int iter) {
   std::ostringstream o;
 
   o << 't' << iter;
@@ -24,19 +19,17 @@ void SurveyOutput::write(unsigned int iter)
 
   unsigned int N = theAlignables.size();
 
-  for (unsigned int i = 0; i < N; ++i)
-  {
+  for (unsigned int i = 0; i < N; ++i) {
     const Alignable* ali = theAlignables[i];
 
-    align::GlobalVector shifts = ali->displacement() * 1e4; // cm to um
+    align::GlobalVector shifts = ali->displacement() * 1e4;  // cm to um
 
-    align::EulerAngles angles = align::toAngles( ali->rotation() ) * 1e3; // to mrad
+    align::EulerAngles angles = align::toAngles(ali->rotation()) * 1e3;  // to mrad
 
-    nt->Fill( shifts.x(), shifts.y(), shifts.z(),
-	      angles(1), angles(2), angles(3) );
-//     const AlgebraicVector& pars = ali->alignmentParameters()->parameters();
+    nt->Fill(shifts.x(), shifts.y(), shifts.z(), angles(1), angles(2), angles(3));
+    //     const AlgebraicVector& pars = ali->alignmentParameters()->parameters();
 
-//     nt->Fill(pars[0], pars[1], pars[2], pars[3], pars[4], pars[5]);
+    //     nt->Fill(pars[0], pars[1], pars[2], pars[3], pars[4], pars[5]);
   }
 
   theFile.Write();
diff --git a/Alignment/SurveyAnalysis/src/SurveyParameters.cc b/Alignment/SurveyAnalysis/src/SurveyParameters.cc
index 9183d10fa89e4..248ab59b80b2f 100644
--- a/Alignment/SurveyAnalysis/src/SurveyParameters.cc
+++ b/Alignment/SurveyAnalysis/src/SurveyParameters.cc
@@ -2,55 +2,35 @@
 #include "Alignment/CommonAlignmentParametrization/interface/AlignmentParametersFactory.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-SurveyParameters::SurveyParameters(Alignable* object,
-				   const AlgebraicVector& par,
-				   const AlgebraicSymMatrix& cov):
-  AlignmentParameters(object, par, cov)
-{
-}
+SurveyParameters::SurveyParameters(Alignable* object, const AlgebraicVector& par, const AlgebraicSymMatrix& cov)
+    : AlignmentParameters(object, par, cov) {}
 
-void SurveyParameters::apply()
-{
-  throw cms::Exception("BadInheritance") 
-      << "SurveyParameters::apply(): Not implemented.";
+void SurveyParameters::apply() {
+  throw cms::Exception("BadInheritance") << "SurveyParameters::apply(): Not implemented.";
 }
 
-int SurveyParameters::type() const
-{
-  return AlignmentParametersFactory::kSurvey;
-}
+int SurveyParameters::type() const { return AlignmentParametersFactory::kSurvey; }
 
-AlignmentParameters* SurveyParameters::clone(const AlgebraicVector&,
-					     const AlgebraicSymMatrix&) const
-{
-  throw cms::Exception("BadInheritance") 
-      << "SurveyParameters::clone(): Not implemented.";
+AlignmentParameters* SurveyParameters::clone(const AlgebraicVector&, const AlgebraicSymMatrix&) const {
+  throw cms::Exception("BadInheritance") << "SurveyParameters::clone(): Not implemented.";
   return nullptr;
 }
 
-AlignmentParameters* SurveyParameters::cloneFromSelected(const AlgebraicVector&,
-							 const AlgebraicSymMatrix&) const
-{
-  throw cms::Exception("BadInheritance") 
-      << "SurveyParameters::cloneFromSelected(): Not implemented.";
+AlignmentParameters* SurveyParameters::cloneFromSelected(const AlgebraicVector&, const AlgebraicSymMatrix&) const {
+  throw cms::Exception("BadInheritance") << "SurveyParameters::cloneFromSelected(): Not implemented.";
 
   return nullptr;
 }
 
-AlgebraicMatrix SurveyParameters::derivatives(const TrajectoryStateOnSurface&,
-					      const AlignableDetOrUnitPtr& ) const
-{
-  throw cms::Exception("BadInheritance") 
-      << "SurveyParameters::derivatives(): Not implemented.";
+AlgebraicMatrix SurveyParameters::derivatives(const TrajectoryStateOnSurface&, const AlignableDetOrUnitPtr&) const {
+  throw cms::Exception("BadInheritance") << "SurveyParameters::derivatives(): Not implemented.";
 
   return AlgebraicMatrix();
 }
 
 AlgebraicMatrix SurveyParameters::selectedDerivatives(const TrajectoryStateOnSurface&,
-						      const AlignableDetOrUnitPtr& ) const
-{
-  throw cms::Exception("BadInheritance") 
-      << "SurveyParameters::selectedDerivatives(): Not implemented.";
+                                                      const AlignableDetOrUnitPtr&) const {
+  throw cms::Exception("BadInheritance") << "SurveyParameters::selectedDerivatives(): Not implemented.";
 
   return AlgebraicMatrix();
 }
diff --git a/Alignment/SurveyAnalysis/src/SurveyPxbDicer.cc b/Alignment/SurveyAnalysis/src/SurveyPxbDicer.cc
index 86d6629ab5f90..039198c37b09e 100644
--- a/Alignment/SurveyAnalysis/src/SurveyPxbDicer.cc
+++ b/Alignment/SurveyAnalysis/src/SurveyPxbDicer.cc
@@ -18,73 +18,67 @@
 
 #include <iostream>
 
-SurveyPxbDicer::SurveyPxbDicer(const std::vector<edm::ParameterSet>& pars, unsigned int seed)
-{
-	CLHEP::HepRandom::setTheSeed( seed );
-	mean_a0 = getParByName("a0", "mean", pars);
-	sigma_a0 = getParByName("a0", "sigma", pars);
-	mean_a1 = getParByName("a1", "mean", pars);
-	sigma_a1 = getParByName("a1", "sigma", pars);
-	mean_scale = getParByName("scale", "mean", pars);
-	sigma_scale = getParByName("scale", "sigma", pars);
-	mean_phi = getParByName("phi", "mean", pars);
-	sigma_phi = getParByName("phi", "sigma", pars);
-	mean_x = getParByName("x", "mean", pars);
-	sigma_x = getParByName("x", "sigma", pars);
-	mean_y = getParByName("y", "mean", pars);
-	sigma_y = getParByName("y", "sigma", pars);
+SurveyPxbDicer::SurveyPxbDicer(const std::vector<edm::ParameterSet> &pars, unsigned int seed) {
+  CLHEP::HepRandom::setTheSeed(seed);
+  mean_a0 = getParByName("a0", "mean", pars);
+  sigma_a0 = getParByName("a0", "sigma", pars);
+  mean_a1 = getParByName("a1", "mean", pars);
+  sigma_a1 = getParByName("a1", "sigma", pars);
+  mean_scale = getParByName("scale", "mean", pars);
+  sigma_scale = getParByName("scale", "sigma", pars);
+  mean_phi = getParByName("phi", "mean", pars);
+  sigma_phi = getParByName("phi", "sigma", pars);
+  mean_x = getParByName("x", "mean", pars);
+  sigma_x = getParByName("x", "sigma", pars);
+  mean_y = getParByName("y", "mean", pars);
+  sigma_y = getParByName("y", "sigma", pars);
 }
 
-std::string SurveyPxbDicer::doDice(const fidpoint_t &fidpointvec, const idPair_t &id, const bool rotate)
-{
-	// Dice the local parameters
-	const value_t a0 = ranGauss(mean_a0, sigma_a0);
-	const value_t a1 = ranGauss(mean_a1, sigma_a1);
-	const value_t scale = ranGauss(mean_scale, sigma_scale);
-	const value_t phi = ranGauss(mean_phi, sigma_phi);
-	const value_t a2 = scale * cos(phi);
-	const value_t a3 = scale * sin(phi);
-	const coord_t p0 = transform(fidpointvec[0],a0,a1,a2,a3);
-	const coord_t p1 = transform(fidpointvec[1],a0,a1,a2,a3);
-	const coord_t p2 = transform(fidpointvec[2],a0,a1,a2,a3);
-	const coord_t p3 = transform(fidpointvec[3],a0,a1,a2,a3);
-	const value_t sign = rotate ? -1 : 1;
-	std::ostringstream oss;
-	oss << id.first << " " 
-		 << sign*ranGauss(p0.x(),sigma_x) << " " << -sign*ranGauss(p0.y(),sigma_y) << " "
-		 << sign*ranGauss(p1.x(),sigma_x) << " " << -sign*ranGauss(p1.y(),sigma_y) << " "
-		 << id.second << " "
-		 << sign*ranGauss(p2.x(),sigma_x) << " " << -sign*ranGauss(p2.y(),sigma_y) << " "
-		 << sign*ranGauss(p3.x(),sigma_x) << " " << -sign*ranGauss(p3.y(),sigma_y) << " "
-		 << sigma_x << " " << sigma_y << " "
-		 << rotate
-		 << " # MC-truth:"
-		 << " a0-a3: " << a0 << " " << a1 << " " << a2 << " " << a3
-		 << " S: " << scale
-		 << " phi: " << phi
-		 << " x0: " << fidpointvec[0].x() << " " << fidpointvec[0].y()
-		 << " x1: " << fidpointvec[1].x() << " " << fidpointvec[1].y()
-		 << " x2: " << fidpointvec[2].x() << " " << fidpointvec[2].y()
-		 << " x3: " << fidpointvec[3].x() << " " << fidpointvec[3].y()
-		 << std::endl;
-	return oss.str();
+std::string SurveyPxbDicer::doDice(const fidpoint_t &fidpointvec, const idPair_t &id, const bool rotate) {
+  // Dice the local parameters
+  const value_t a0 = ranGauss(mean_a0, sigma_a0);
+  const value_t a1 = ranGauss(mean_a1, sigma_a1);
+  const value_t scale = ranGauss(mean_scale, sigma_scale);
+  const value_t phi = ranGauss(mean_phi, sigma_phi);
+  const value_t a2 = scale * cos(phi);
+  const value_t a3 = scale * sin(phi);
+  const coord_t p0 = transform(fidpointvec[0], a0, a1, a2, a3);
+  const coord_t p1 = transform(fidpointvec[1], a0, a1, a2, a3);
+  const coord_t p2 = transform(fidpointvec[2], a0, a1, a2, a3);
+  const coord_t p3 = transform(fidpointvec[3], a0, a1, a2, a3);
+  const value_t sign = rotate ? -1 : 1;
+  std::ostringstream oss;
+  oss << id.first << " " << sign * ranGauss(p0.x(), sigma_x) << " " << -sign * ranGauss(p0.y(), sigma_y) << " "
+      << sign * ranGauss(p1.x(), sigma_x) << " " << -sign * ranGauss(p1.y(), sigma_y) << " " << id.second << " "
+      << sign * ranGauss(p2.x(), sigma_x) << " " << -sign * ranGauss(p2.y(), sigma_y) << " "
+      << sign * ranGauss(p3.x(), sigma_x) << " " << -sign * ranGauss(p3.y(), sigma_y) << " " << sigma_x << " "
+      << sigma_y << " " << rotate << " # MC-truth:"
+      << " a0-a3: " << a0 << " " << a1 << " " << a2 << " " << a3 << " S: " << scale << " phi: " << phi
+      << " x0: " << fidpointvec[0].x() << " " << fidpointvec[0].y() << " x1: " << fidpointvec[1].x() << " "
+      << fidpointvec[1].y() << " x2: " << fidpointvec[2].x() << " " << fidpointvec[2].y()
+      << " x3: " << fidpointvec[3].x() << " " << fidpointvec[3].y() << std::endl;
+  return oss.str();
 }
 
-void SurveyPxbDicer::doDice(const fidpoint_t &fidpointvec, const idPair_t &id, std::ofstream &outfile, const bool rotate)
-{
-	outfile << doDice(fidpointvec, id, rotate);
+void SurveyPxbDicer::doDice(const fidpoint_t &fidpointvec,
+                            const idPair_t &id,
+                            std::ofstream &outfile,
+                            const bool rotate) {
+  outfile << doDice(fidpointvec, id, rotate);
 }
 
-SurveyPxbDicer::coord_t SurveyPxbDicer::transform(const coord_t &x, const value_t &a0, const value_t &a1, const value_t &a2, const value_t &a3)
-{
-	return coord_t(a0+a2*x.x()+a3*x.y(), a1-a3*x.x()+a2*x.y());
+SurveyPxbDicer::coord_t SurveyPxbDicer::transform(
+    const coord_t &x, const value_t &a0, const value_t &a1, const value_t &a2, const value_t &a3) {
+  return coord_t(a0 + a2 * x.x() + a3 * x.y(), a1 - a3 * x.x() + a2 * x.y());
 }
 
-SurveyPxbDicer::value_t SurveyPxbDicer::getParByName(const std::string &name, const std::string &par, const std::vector<edm::ParameterSet>& pars)
-{
-	std::vector<edm::ParameterSet>::const_iterator it;
-	it = std::find_if(pars.begin(), pars.end(), [&name] (auto const& c){return findParByName()(name,c);});
-	if (it == pars.end()) { throw std::runtime_error("Parameter not found in SurveyPxbDicer::getParByName"); }
-	return (*it).getParameter<value_t>(par);
+SurveyPxbDicer::value_t SurveyPxbDicer::getParByName(const std::string &name,
+                                                     const std::string &par,
+                                                     const std::vector<edm::ParameterSet> &pars) {
+  std::vector<edm::ParameterSet>::const_iterator it;
+  it = std::find_if(pars.begin(), pars.end(), [&name](auto const &c) { return findParByName()(name, c); });
+  if (it == pars.end()) {
+    throw std::runtime_error("Parameter not found in SurveyPxbDicer::getParByName");
+  }
+  return (*it).getParameter<value_t>(par);
 }
-
diff --git a/Alignment/SurveyAnalysis/src/SurveyPxbImage.cc b/Alignment/SurveyAnalysis/src/SurveyPxbImage.cc
index 337e09d35c828..7b093182eb5c7 100644
--- a/Alignment/SurveyAnalysis/src/SurveyPxbImage.cc
+++ b/Alignment/SurveyAnalysis/src/SurveyPxbImage.cc
@@ -6,8 +6,7 @@
 #include <vector>
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
 
-void SurveyPxbImage::fill(std::istringstream &iss)
-{
+void SurveyPxbImage::fill(std::istringstream &iss) {
   id_t id1, id2;
   value_t x0, y0;
   value_t x1, y1;
@@ -15,40 +14,31 @@ void SurveyPxbImage::fill(std::istringstream &iss)
   value_t x3, y3;
   value_t sx, sy;
   bool rotflag;
-  if(! (iss >> id1 >> x0 >> y0 >> x1 >> y1
-            >> id2 >> x2 >> y2 >> x3 >> y3
-            >> sy >> sx >> rotflag).fail())
-    {
-      idPair_.first = id1;
-      idPair_.second = id2;
-      if (!rotflag)
-      {
-	  measurementVec_.push_back(coord_t(x0,-y0));
-	  measurementVec_.push_back(coord_t(x1,-y1));
-	  measurementVec_.push_back(coord_t(x2,-y2));
-	  measurementVec_.push_back(coord_t(x3,-y3));
-      }
-      else
-      {
-	  measurementVec_.push_back(coord_t(-x0,y0));
-	  measurementVec_.push_back(coord_t(-x1,y1));
-	  measurementVec_.push_back(coord_t(-x2,y2));
-	  measurementVec_.push_back(coord_t(-x3,y3));
-      }
-      sigma_x_ = sx;
-      sigma_y_ = sy;
-      isRotated_ = rotflag;
-      isValidFlag_ = true;
+  if (!(iss >> id1 >> x0 >> y0 >> x1 >> y1 >> id2 >> x2 >> y2 >> x3 >> y3 >> sy >> sx >> rotflag).fail()) {
+    idPair_.first = id1;
+    idPair_.second = id2;
+    if (!rotflag) {
+      measurementVec_.push_back(coord_t(x0, -y0));
+      measurementVec_.push_back(coord_t(x1, -y1));
+      measurementVec_.push_back(coord_t(x2, -y2));
+      measurementVec_.push_back(coord_t(x3, -y3));
+    } else {
+      measurementVec_.push_back(coord_t(-x0, y0));
+      measurementVec_.push_back(coord_t(-x1, y1));
+      measurementVec_.push_back(coord_t(-x2, y2));
+      measurementVec_.push_back(coord_t(-x3, y3));
     }
-  else
+    sigma_x_ = sx;
+    sigma_y_ = sy;
+    isRotated_ = rotflag;
+    isValidFlag_ = true;
+  } else
     isValidFlag_ = false;
 }
 
-const SurveyPxbImage::coord_t SurveyPxbImage::getCoord(count_t m)
-{
-  if (m>0 && m<5)
-    return measurementVec_[m-1];
+const SurveyPxbImage::coord_t SurveyPxbImage::getCoord(count_t m) {
+  if (m > 0 && m < 5)
+    return measurementVec_[m - 1];
   else
     throw std::out_of_range("Attempt to access an inexistent measurement");
 }
-
diff --git a/Alignment/SurveyAnalysis/src/SurveyPxbImageLocalFit.cc b/Alignment/SurveyAnalysis/src/SurveyPxbImageLocalFit.cc
index a42f7a822add5..fdf103a200137 100644
--- a/Alignment/SurveyAnalysis/src/SurveyPxbImageLocalFit.cc
+++ b/Alignment/SurveyAnalysis/src/SurveyPxbImageLocalFit.cc
@@ -12,263 +12,314 @@
 
 #include <iostream>
 
-void SurveyPxbImageLocalFit::doFit(const fidpoint_t &fidpointvec, const pede_label_t &label1, const pede_label_t &label2)
-{
-	labelVec1_.clear();
-	labelVec1_.push_back(label1+0);
-	labelVec1_.push_back(label1+1);
-	labelVec1_.push_back(label1+5);
-	labelVec2_.clear();
-	labelVec2_.push_back(label2+0);
-	labelVec2_.push_back(label2+1);
-	labelVec2_.push_back(label2+5);
-	doFit(fidpointvec);
+void SurveyPxbImageLocalFit::doFit(const fidpoint_t &fidpointvec,
+                                   const pede_label_t &label1,
+                                   const pede_label_t &label2) {
+  labelVec1_.clear();
+  labelVec1_.push_back(label1 + 0);
+  labelVec1_.push_back(label1 + 1);
+  labelVec1_.push_back(label1 + 5);
+  labelVec2_.clear();
+  labelVec2_.push_back(label2 + 0);
+  labelVec2_.push_back(label2 + 1);
+  labelVec2_.push_back(label2 + 5);
+  doFit(fidpointvec);
 }
 
-void SurveyPxbImageLocalFit::doFit(const fidpoint_t &fidpointvec)
-{
-	fitValidFlag_ = false;
+void SurveyPxbImageLocalFit::doFit(const fidpoint_t &fidpointvec) {
+  fitValidFlag_ = false;
 
-	// Calculate gamma of right module w.r.t left modules' fram
-	const value_t dxr = fidpointvec[3].x()-fidpointvec[2].x();
-	const value_t dyr = fidpointvec[3].y()-fidpointvec[2].y();
-	const value_t gammar = atan(dyr/dxr);
-	const value_t dxl = fidpointvec[1].x()-fidpointvec[0].x();
-	const value_t dyl = fidpointvec[1].y()-fidpointvec[0].y();
-	const value_t gammal = atan(dyl/dxl);
-	const value_t gamma = gammar-gammal;
-	//const value_t gamma = 0.; // Testhalber
-	const value_t sing = sin(gamma);
-	const value_t cosg = cos(gamma);
+  // Calculate gamma of right module w.r.t left modules' fram
+  const value_t dxr = fidpointvec[3].x() - fidpointvec[2].x();
+  const value_t dyr = fidpointvec[3].y() - fidpointvec[2].y();
+  const value_t gammar = atan(dyr / dxr);
+  const value_t dxl = fidpointvec[1].x() - fidpointvec[0].x();
+  const value_t dyl = fidpointvec[1].y() - fidpointvec[0].y();
+  const value_t gammal = atan(dyl / dxl);
+  const value_t gamma = gammar - gammal;
+  //const value_t gamma = 0.; // Testhalber
+  const value_t sing = sin(gamma);
+  const value_t cosg = cos(gamma);
 #ifdef DEBUG
-	std::cout << "gamma: " << gamma << " gamma left: " << gammal << " gamma right: " << gammar << std::endl;
+  std::cout << "gamma: " << gamma << " gamma left: " << gammal << " gamma right: " << gammar << std::endl;
 #endif
 
-
 #ifdef DEBUG
-	std::cout << "&fidpointvec: " << std::endl;
-	for (count_t i=0; i!=fidpointvec.size(); i++)
-	    std::cout << i << ": " << fidpointvec[i] << std::endl;
-	std::cout << "&fidpoints_: " << std::endl;
-	for (count_t i=0; i!=fidpoints_.size(); i++)
-	    std::cout << i << ": " << fidpoints_[i] << std::endl;
+  std::cout << "&fidpointvec: " << std::endl;
+  for (count_t i = 0; i != fidpointvec.size(); i++)
+    std::cout << i << ": " << fidpointvec[i] << std::endl;
+  std::cout << "&fidpoints_: " << std::endl;
+  for (count_t i = 0; i != fidpoints_.size(); i++)
+    std::cout << i << ": " << fidpoints_[i] << std::endl;
 #endif
 
-	// Matrix of the local derivatives
-	ROOT::Math::SMatrix<value_t,nMsrmts,nLcD> A; // 8x4
-	A(0,0)=1.; A(0,1)=0; A(0,2)=+fidpointvec[0].x(); A(0,3)=+fidpointvec[0].y();
-	A(1,0)=0.; A(1,1)=1; A(1,2)=+fidpointvec[0].y(); A(1,3)=-fidpointvec[0].x();
-	A(2,0)=1.; A(2,1)=0; A(2,2)=+fidpointvec[1].x(); A(2,3)=+fidpointvec[1].y();
-	A(3,0)=0.; A(3,1)=1; A(3,2)=+fidpointvec[1].y(); A(3,3)=-fidpointvec[1].x();
-	A(4,0)=1.; A(4,1)=0; A(4,2)=+fidpointvec[2].x(); A(4,3)=+fidpointvec[2].y();
-	A(5,0)=0.; A(5,1)=1; A(5,2)=+fidpointvec[2].y(); A(5,3)=-fidpointvec[2].x();
-	A(6,0)=1.; A(6,1)=0; A(6,2)=+fidpointvec[3].x(); A(6,3)=+fidpointvec[3].y();
-	A(7,0)=0.; A(7,1)=1; A(7,2)=+fidpointvec[3].y(); A(7,3)=-fidpointvec[3].x();
+  // Matrix of the local derivatives
+  ROOT::Math::SMatrix<value_t, nMsrmts, nLcD> A;  // 8x4
+  A(0, 0) = 1.;
+  A(0, 1) = 0;
+  A(0, 2) = +fidpointvec[0].x();
+  A(0, 3) = +fidpointvec[0].y();
+  A(1, 0) = 0.;
+  A(1, 1) = 1;
+  A(1, 2) = +fidpointvec[0].y();
+  A(1, 3) = -fidpointvec[0].x();
+  A(2, 0) = 1.;
+  A(2, 1) = 0;
+  A(2, 2) = +fidpointvec[1].x();
+  A(2, 3) = +fidpointvec[1].y();
+  A(3, 0) = 0.;
+  A(3, 1) = 1;
+  A(3, 2) = +fidpointvec[1].y();
+  A(3, 3) = -fidpointvec[1].x();
+  A(4, 0) = 1.;
+  A(4, 1) = 0;
+  A(4, 2) = +fidpointvec[2].x();
+  A(4, 3) = +fidpointvec[2].y();
+  A(5, 0) = 0.;
+  A(5, 1) = 1;
+  A(5, 2) = +fidpointvec[2].y();
+  A(5, 3) = -fidpointvec[2].x();
+  A(6, 0) = 1.;
+  A(6, 1) = 0;
+  A(6, 2) = +fidpointvec[3].x();
+  A(6, 3) = +fidpointvec[3].y();
+  A(7, 0) = 0.;
+  A(7, 1) = 1;
+  A(7, 2) = +fidpointvec[3].y();
+  A(7, 3) = -fidpointvec[3].x();
 #ifdef DEBUG
-	std::cout << "A: \n" << A << std::endl;
+  std::cout << "A: \n" << A << std::endl;
 #endif
 
-	// Covariance matrix
-	ROOT::Math::SMatrix<value_t,nMsrmts,nMsrmts> W; // 8x8
-	//ROOT::Math::MatRepSym<value_t,8> W;
-	const value_t sigma_x2inv = 1./(sigma_x_*sigma_x_);
-	const value_t sigma_y2inv = 1./(sigma_y_*sigma_y_);
-	W(0,0) = sigma_x2inv;
-	W(1,1) = sigma_y2inv;
-	W(2,2) = sigma_x2inv;
-	W(3,3) = sigma_y2inv;
-	W(4,4) = sigma_x2inv;
-	W(5,5) = sigma_y2inv;
-	W(6,6) = sigma_x2inv;
-	W(7,7) = sigma_y2inv;
+  // Covariance matrix
+  ROOT::Math::SMatrix<value_t, nMsrmts, nMsrmts> W;  // 8x8
+  //ROOT::Math::MatRepSym<value_t,8> W;
+  const value_t sigma_x2inv = 1. / (sigma_x_ * sigma_x_);
+  const value_t sigma_y2inv = 1. / (sigma_y_ * sigma_y_);
+  W(0, 0) = sigma_x2inv;
+  W(1, 1) = sigma_y2inv;
+  W(2, 2) = sigma_x2inv;
+  W(3, 3) = sigma_y2inv;
+  W(4, 4) = sigma_x2inv;
+  W(5, 5) = sigma_y2inv;
+  W(6, 6) = sigma_x2inv;
+  W(7, 7) = sigma_y2inv;
 #ifdef DEBUG
-	std::cout << "W: \n" << W << std::endl;
+  std::cout << "W: \n" << W << std::endl;
 #endif
 
-	// Prepare for the fit
-	ROOT::Math::SMatrix<value_t,nLcD,nLcD> ATWA; // 4x4
-	ATWA = ROOT::Math::Transpose(A) * W * A;
-	//ATWA = ROOT::Math::SimilarityT(A,W); // W muss symmterisch sein -> aendern.
-	//std::cout << "ATWA: \n" << ATWA << std::endl;
-	ROOT::Math::SMatrix<value_t,nLcD,nLcD> ATWAi; // 4x4
-	int ifail = 0;
-	ATWAi = ATWA.Inverse(ifail);
-	if (ifail != 0)
-	{ // TODO: ifail Pruefung auf message logger ausgeben statt cout
-		std::cout << "Problem singular - fit impossible." << std::endl;
-		fitValidFlag_ = false;
-		return;
-	}
+  // Prepare for the fit
+  ROOT::Math::SMatrix<value_t, nLcD, nLcD> ATWA;  // 4x4
+  ATWA = ROOT::Math::Transpose(A) * W * A;
+  //ATWA = ROOT::Math::SimilarityT(A,W); // W muss symmterisch sein -> aendern.
+  //std::cout << "ATWA: \n" << ATWA << std::endl;
+  ROOT::Math::SMatrix<value_t, nLcD, nLcD> ATWAi;  // 4x4
+  int ifail = 0;
+  ATWAi = ATWA.Inverse(ifail);
+  if (ifail != 0) {  // TODO: ifail Pruefung auf message logger ausgeben statt cout
+    std::cout << "Problem singular - fit impossible." << std::endl;
+    fitValidFlag_ = false;
+    return;
+  }
 #ifdef DEBUG
-	std::cout << "ATWA-1: \n" << ATWAi << ifail << std::endl;
+  std::cout << "ATWA-1: \n" << ATWAi << ifail << std::endl;
 #endif
 
-	// Measurements
-	ROOT::Math::SVector<value_t,nMsrmts> y; // 8
-	y(0) = measurementVec_[0].x();
-	y(1) = measurementVec_[0].y();
-	y(2) = measurementVec_[1].x();
-	y(3) = measurementVec_[1].y();
-	y(4) = measurementVec_[2].x();
-	y(5) = measurementVec_[2].y();
-	y(6) = measurementVec_[3].x();
-	y(7) = measurementVec_[3].y();
+  // Measurements
+  ROOT::Math::SVector<value_t, nMsrmts> y;  // 8
+  y(0) = measurementVec_[0].x();
+  y(1) = measurementVec_[0].y();
+  y(2) = measurementVec_[1].x();
+  y(3) = measurementVec_[1].y();
+  y(4) = measurementVec_[2].x();
+  y(5) = measurementVec_[2].y();
+  y(6) = measurementVec_[3].x();
+  y(7) = measurementVec_[3].y();
 #ifdef DEBUG
-	std::cout << "y: " << y << std::endl;
+  std::cout << "y: " << y << std::endl;
 #endif
 
-	// do the fit
-	ROOT::Math::SVector<value_t,nLcD> a; // 4
-	a = ATWAi * ROOT::Math::Transpose(A) * W * y;
-	chi2_ = ROOT::Math::Dot(y,W*y)-ROOT::Math::Dot(a,ROOT::Math::Transpose(A)*W*y);
+  // do the fit
+  ROOT::Math::SVector<value_t, nLcD> a;  // 4
+  a = ATWAi * ROOT::Math::Transpose(A) * W * y;
+  chi2_ = ROOT::Math::Dot(y, W * y) - ROOT::Math::Dot(a, ROOT::Math::Transpose(A) * W * y);
 #ifdef DEBUG
-	std::cout << "a: " << a 
-		<< " S= " << sqrt(a[2]*a[2]+a[3]*a[3]) 
-		<< " phi= " << atan(a[3]/a[2]) 
-		<< " chi2= " << chi2_ << std::endl;
-	std::cout << "A*a: " << A*a << std::endl;
+  std::cout << "a: " << a << " S= " << sqrt(a[2] * a[2] + a[3] * a[3]) << " phi= " << atan(a[3] / a[2])
+            << " chi2= " << chi2_ << std::endl;
+  std::cout << "A*a: " << A * a << std::endl;
 #endif
-	a_.assign(a.begin(),a.end());
+  a_.assign(a.begin(), a.end());
 
-	// Calculate vector of residuals
-	r = y - A*a;
+  // Calculate vector of residuals
+  r = y - A * a;
 #ifdef DEBUG
-	std::cout << "r: " << r << std::endl;
+  std::cout << "r: " << r << std::endl;
 #endif
 
-	// Fill matrix for global fit with local derivatives
-	localDerivsMatrix_(0,0)=1.; localDerivsMatrix_(0,1)=0; 
-	localDerivsMatrix_(1,0)=0.; localDerivsMatrix_(1,1)=1; 
-	localDerivsMatrix_(2,0)=1.; localDerivsMatrix_(2,1)=0; 
-	localDerivsMatrix_(3,0)=0.; localDerivsMatrix_(3,1)=1; 
-	localDerivsMatrix_(4,0)=1.; localDerivsMatrix_(4,1)=0; 
-	localDerivsMatrix_(5,0)=0.; localDerivsMatrix_(5,1)=1; 
-	localDerivsMatrix_(6,0)=1.; localDerivsMatrix_(6,1)=0; 
-	localDerivsMatrix_(7,0)=0.; localDerivsMatrix_(7,1)=1; 
-	localDerivsMatrix_(0,2)=+fidpointvec[0].x()+cosg*fidpoints_[0].x()-sing*fidpoints_[0].y();
-	localDerivsMatrix_(0,3)=+fidpointvec[0].y()+cosg*fidpoints_[0].y()+sing*fidpoints_[0].x();
-	localDerivsMatrix_(1,2)=+fidpointvec[0].y()+cosg*fidpoints_[0].y()+sing*fidpoints_[0].x();
-	localDerivsMatrix_(1,3)=-fidpointvec[0].x()-cosg*fidpoints_[0].x()+sing*fidpoints_[0].y();
-	localDerivsMatrix_(2,2)=+fidpointvec[1].x()+cosg*fidpoints_[1].x()-sing*fidpoints_[1].y();
-	localDerivsMatrix_(2,3)=+fidpointvec[1].y()+cosg*fidpoints_[1].y()+sing*fidpoints_[1].x();
-	localDerivsMatrix_(3,2)=+fidpointvec[1].y()+cosg*fidpoints_[1].y()+sing*fidpoints_[1].x();
-	localDerivsMatrix_(3,3)=-fidpointvec[1].x()-cosg*fidpoints_[1].x()+sing*fidpoints_[1].y();
-	localDerivsMatrix_(4,2)=+fidpointvec[2].x()+cosg*fidpoints_[2].x()-sing*fidpoints_[2].y();
-	localDerivsMatrix_(4,3)=+fidpointvec[2].y()+cosg*fidpoints_[2].y()+sing*fidpoints_[2].x();
-	localDerivsMatrix_(5,2)=+fidpointvec[2].y()+cosg*fidpoints_[2].y()+sing*fidpoints_[2].x();
-	localDerivsMatrix_(5,3)=-fidpointvec[2].x()-cosg*fidpoints_[2].x()+sing*fidpoints_[2].y();
-	localDerivsMatrix_(6,2)=+fidpointvec[3].x()+cosg*fidpoints_[3].x()-sing*fidpoints_[3].y();
-	localDerivsMatrix_(6,3)=+fidpointvec[3].y()+cosg*fidpoints_[3].y()+sing*fidpoints_[3].x();
-	localDerivsMatrix_(7,2)=+fidpointvec[3].y()+cosg*fidpoints_[3].y()+sing*fidpoints_[3].x();
-	localDerivsMatrix_(7,3)=-fidpointvec[3].x()-cosg*fidpoints_[3].x()+sing*fidpoints_[3].y();
+  // Fill matrix for global fit with local derivatives
+  localDerivsMatrix_(0, 0) = 1.;
+  localDerivsMatrix_(0, 1) = 0;
+  localDerivsMatrix_(1, 0) = 0.;
+  localDerivsMatrix_(1, 1) = 1;
+  localDerivsMatrix_(2, 0) = 1.;
+  localDerivsMatrix_(2, 1) = 0;
+  localDerivsMatrix_(3, 0) = 0.;
+  localDerivsMatrix_(3, 1) = 1;
+  localDerivsMatrix_(4, 0) = 1.;
+  localDerivsMatrix_(4, 1) = 0;
+  localDerivsMatrix_(5, 0) = 0.;
+  localDerivsMatrix_(5, 1) = 1;
+  localDerivsMatrix_(6, 0) = 1.;
+  localDerivsMatrix_(6, 1) = 0;
+  localDerivsMatrix_(7, 0) = 0.;
+  localDerivsMatrix_(7, 1) = 1;
+  localDerivsMatrix_(0, 2) = +fidpointvec[0].x() + cosg * fidpoints_[0].x() - sing * fidpoints_[0].y();
+  localDerivsMatrix_(0, 3) = +fidpointvec[0].y() + cosg * fidpoints_[0].y() + sing * fidpoints_[0].x();
+  localDerivsMatrix_(1, 2) = +fidpointvec[0].y() + cosg * fidpoints_[0].y() + sing * fidpoints_[0].x();
+  localDerivsMatrix_(1, 3) = -fidpointvec[0].x() - cosg * fidpoints_[0].x() + sing * fidpoints_[0].y();
+  localDerivsMatrix_(2, 2) = +fidpointvec[1].x() + cosg * fidpoints_[1].x() - sing * fidpoints_[1].y();
+  localDerivsMatrix_(2, 3) = +fidpointvec[1].y() + cosg * fidpoints_[1].y() + sing * fidpoints_[1].x();
+  localDerivsMatrix_(3, 2) = +fidpointvec[1].y() + cosg * fidpoints_[1].y() + sing * fidpoints_[1].x();
+  localDerivsMatrix_(3, 3) = -fidpointvec[1].x() - cosg * fidpoints_[1].x() + sing * fidpoints_[1].y();
+  localDerivsMatrix_(4, 2) = +fidpointvec[2].x() + cosg * fidpoints_[2].x() - sing * fidpoints_[2].y();
+  localDerivsMatrix_(4, 3) = +fidpointvec[2].y() + cosg * fidpoints_[2].y() + sing * fidpoints_[2].x();
+  localDerivsMatrix_(5, 2) = +fidpointvec[2].y() + cosg * fidpoints_[2].y() + sing * fidpoints_[2].x();
+  localDerivsMatrix_(5, 3) = -fidpointvec[2].x() - cosg * fidpoints_[2].x() + sing * fidpoints_[2].y();
+  localDerivsMatrix_(6, 2) = +fidpointvec[3].x() + cosg * fidpoints_[3].x() - sing * fidpoints_[3].y();
+  localDerivsMatrix_(6, 3) = +fidpointvec[3].y() + cosg * fidpoints_[3].y() + sing * fidpoints_[3].x();
+  localDerivsMatrix_(7, 2) = +fidpointvec[3].y() + cosg * fidpoints_[3].y() + sing * fidpoints_[3].x();
+  localDerivsMatrix_(7, 3) = -fidpointvec[3].x() - cosg * fidpoints_[3].x() + sing * fidpoints_[3].y();
 
-	// Fill vector with global derivatives and labels (8x3)
-	globalDerivsMatrix_(0,0) = +a(2);
-	globalDerivsMatrix_(0,1) = +a(3);
-	globalDerivsMatrix_(0,2) = +cosg*(a(3)*fidpoints_[0].x()-a(2)*fidpoints_[0].y())
-				   -sing*(a(2)*fidpoints_[0].x()+a(3)*fidpoints_[0].y());
-	globalDerivsMatrix_(1,0) = -a(3);
-	globalDerivsMatrix_(1,1) = +a(2);
-	globalDerivsMatrix_(1,2) = +cosg*(a(2)*fidpoints_[0].x()+a(3)*fidpoints_[0].y())
-				   -sing*(a(2)*fidpoints_[0].y()-a(3)*fidpoints_[0].x());
-	globalDerivsMatrix_(2,0) = +a(2);
-	globalDerivsMatrix_(2,1) = +a(3);
-	globalDerivsMatrix_(2,2) = +cosg*(a(3)*fidpoints_[1].x()-a(2)*fidpoints_[1].y())
-				   -sing*(a(2)*fidpoints_[1].x()+a(3)*fidpoints_[1].y());
-	globalDerivsMatrix_(3,0) = -a(3);
-	globalDerivsMatrix_(3,1) = +a(2);
-	globalDerivsMatrix_(3,2) = +cosg*(a(2)*fidpoints_[1].x()+a(3)*fidpoints_[1].y())
-				   -sing*(a(2)*fidpoints_[1].y()-a(3)*fidpoints_[1].x());
+  // Fill vector with global derivatives and labels (8x3)
+  globalDerivsMatrix_(0, 0) = +a(2);
+  globalDerivsMatrix_(0, 1) = +a(3);
+  globalDerivsMatrix_(0, 2) = +cosg * (a(3) * fidpoints_[0].x() - a(2) * fidpoints_[0].y()) -
+                              sing * (a(2) * fidpoints_[0].x() + a(3) * fidpoints_[0].y());
+  globalDerivsMatrix_(1, 0) = -a(3);
+  globalDerivsMatrix_(1, 1) = +a(2);
+  globalDerivsMatrix_(1, 2) = +cosg * (a(2) * fidpoints_[0].x() + a(3) * fidpoints_[0].y()) -
+                              sing * (a(2) * fidpoints_[0].y() - a(3) * fidpoints_[0].x());
+  globalDerivsMatrix_(2, 0) = +a(2);
+  globalDerivsMatrix_(2, 1) = +a(3);
+  globalDerivsMatrix_(2, 2) = +cosg * (a(3) * fidpoints_[1].x() - a(2) * fidpoints_[1].y()) -
+                              sing * (a(2) * fidpoints_[1].x() + a(3) * fidpoints_[1].y());
+  globalDerivsMatrix_(3, 0) = -a(3);
+  globalDerivsMatrix_(3, 1) = +a(2);
+  globalDerivsMatrix_(3, 2) = +cosg * (a(2) * fidpoints_[1].x() + a(3) * fidpoints_[1].y()) -
+                              sing * (a(2) * fidpoints_[1].y() - a(3) * fidpoints_[1].x());
 
-	globalDerivsMatrix_(4,0) = +a(2);
-	globalDerivsMatrix_(4,1) = +a(3);
-	globalDerivsMatrix_(4,2) = +cosg*(a(3)*fidpoints_[2].x()-a(2)*fidpoints_[2].y())
-				   -sing*(a(2)*fidpoints_[2].x()+a(3)*fidpoints_[2].y());
-	globalDerivsMatrix_(5,0) = -a(3);
-	globalDerivsMatrix_(5,1) = +a(2);
-	globalDerivsMatrix_(5,2) = +cosg*(a(2)*fidpoints_[2].x()+a(3)*fidpoints_[2].y())
-				   -sing*(a(2)*fidpoints_[2].y()-a(3)*fidpoints_[2].x());
-	globalDerivsMatrix_(6,0) = +a(2);
-	globalDerivsMatrix_(6,1) = +a(3);
-	globalDerivsMatrix_(6,2) = +cosg*(a(3)*fidpoints_[3].x()-a(2)*fidpoints_[3].y())
-				   -sing*(a(2)*fidpoints_[3].x()+a(3)*fidpoints_[3].y());
-	globalDerivsMatrix_(7,0) = -a(3);
-	globalDerivsMatrix_(7,1) = +a(2);
-	globalDerivsMatrix_(7,2) = +cosg*(a(2)*fidpoints_[3].x()+a(3)*fidpoints_[3].y())
-				   -sing*(a(2)*fidpoints_[3].y()-a(3)*fidpoints_[3].x());
+  globalDerivsMatrix_(4, 0) = +a(2);
+  globalDerivsMatrix_(4, 1) = +a(3);
+  globalDerivsMatrix_(4, 2) = +cosg * (a(3) * fidpoints_[2].x() - a(2) * fidpoints_[2].y()) -
+                              sing * (a(2) * fidpoints_[2].x() + a(3) * fidpoints_[2].y());
+  globalDerivsMatrix_(5, 0) = -a(3);
+  globalDerivsMatrix_(5, 1) = +a(2);
+  globalDerivsMatrix_(5, 2) = +cosg * (a(2) * fidpoints_[2].x() + a(3) * fidpoints_[2].y()) -
+                              sing * (a(2) * fidpoints_[2].y() - a(3) * fidpoints_[2].x());
+  globalDerivsMatrix_(6, 0) = +a(2);
+  globalDerivsMatrix_(6, 1) = +a(3);
+  globalDerivsMatrix_(6, 2) = +cosg * (a(3) * fidpoints_[3].x() - a(2) * fidpoints_[3].y()) -
+                              sing * (a(2) * fidpoints_[3].x() + a(3) * fidpoints_[3].y());
+  globalDerivsMatrix_(7, 0) = -a(3);
+  globalDerivsMatrix_(7, 1) = +a(2);
+  globalDerivsMatrix_(7, 2) = +cosg * (a(2) * fidpoints_[3].x() + a(3) * fidpoints_[3].y()) -
+                              sing * (a(2) * fidpoints_[3].y() - a(3) * fidpoints_[3].x());
 
-	fitValidFlag_ = true;
+  fitValidFlag_ = true;
 }
 
+void SurveyPxbImageLocalFit::doFit(value_t u1, value_t v1, value_t g1, value_t u2, value_t v2, value_t g2) {
+  // Creating vectors with the global parameters of the two modules
+  ROOT::Math::SVector<value_t, 4> mod1, mod2;
+  mod1(0) = u1;
+  mod1(1) = v1;
+  mod1(2) = cos(g1);
+  mod1(3) = sin(g1);
+  mod2(0) = u2;
+  mod2(1) = v2;
+  mod2(2) = cos(g2);
+  mod2(3) = sin(g2);
+  //std::cout << "mod1: " << mod1 << std::endl;
+  //std::cout << "mod2: " << mod2 << std::endl;
 
-void SurveyPxbImageLocalFit::doFit(value_t u1, value_t v1, value_t g1, value_t u2, value_t v2, value_t g2)
-{
-	// Creating vectors with the global parameters of the two modules
-	ROOT::Math::SVector<value_t,4> mod1, mod2;
-	mod1(0)=u1;
-	mod1(1)=v1;
-	mod1(2)=cos(g1);
-	mod1(3)=sin(g1);
-	mod2(0)=u2;
-	mod2(1)=v2;
-	mod2(2)=cos(g2);
-	mod2(3)=sin(g2);
-	//std::cout << "mod1: " << mod1 << std::endl;
-	//std::cout << "mod2: " << mod2 << std::endl;
-
-	// Create a matrix for the transformed position of the fidpoints
-	ROOT::Math::SMatrix<value_t,4,4> M1, M2;
-	M1(0,0)=1.; M1(0,1)=0.; M1(0,2)=+fidpoints_[0].x(); M1(0,3)=-fidpoints_[0].y();
-	M1(1,0)=0.; M1(1,1)=1.; M1(1,2)=+fidpoints_[0].y(); M1(1,3)=+fidpoints_[0].x();
-	M1(2,0)=1.; M1(2,1)=0.; M1(2,2)=+fidpoints_[1].x(); M1(2,3)=-fidpoints_[1].y();
-	M1(3,0)=0.; M1(3,1)=1.; M1(3,2)=+fidpoints_[1].y(); M1(3,3)=+fidpoints_[1].x();
-	M2(0,0)=1.; M2(0,1)=0.; M2(0,2)=+fidpoints_[2].x(); M2(0,3)=-fidpoints_[2].y();
-	M2(1,0)=0.; M2(1,1)=1.; M2(1,2)=+fidpoints_[2].y(); M2(1,3)=+fidpoints_[2].x();
-	M2(2,0)=1.; M2(2,1)=0.; M2(2,2)=+fidpoints_[3].x(); M2(2,3)=-fidpoints_[3].y();
-	M2(3,0)=0.; M2(3,1)=1.; M2(3,2)=+fidpoints_[3].y(); M2(3,3)=+fidpoints_[3].x();
+  // Create a matrix for the transformed position of the fidpoints
+  ROOT::Math::SMatrix<value_t, 4, 4> M1, M2;
+  M1(0, 0) = 1.;
+  M1(0, 1) = 0.;
+  M1(0, 2) = +fidpoints_[0].x();
+  M1(0, 3) = -fidpoints_[0].y();
+  M1(1, 0) = 0.;
+  M1(1, 1) = 1.;
+  M1(1, 2) = +fidpoints_[0].y();
+  M1(1, 3) = +fidpoints_[0].x();
+  M1(2, 0) = 1.;
+  M1(2, 1) = 0.;
+  M1(2, 2) = +fidpoints_[1].x();
+  M1(2, 3) = -fidpoints_[1].y();
+  M1(3, 0) = 0.;
+  M1(3, 1) = 1.;
+  M1(3, 2) = +fidpoints_[1].y();
+  M1(3, 3) = +fidpoints_[1].x();
+  M2(0, 0) = 1.;
+  M2(0, 1) = 0.;
+  M2(0, 2) = +fidpoints_[2].x();
+  M2(0, 3) = -fidpoints_[2].y();
+  M2(1, 0) = 0.;
+  M2(1, 1) = 1.;
+  M2(1, 2) = +fidpoints_[2].y();
+  M2(1, 3) = +fidpoints_[2].x();
+  M2(2, 0) = 1.;
+  M2(2, 1) = 0.;
+  M2(2, 2) = +fidpoints_[3].x();
+  M2(2, 3) = -fidpoints_[3].y();
+  M2(3, 0) = 0.;
+  M2(3, 1) = 1.;
+  M2(3, 2) = +fidpoints_[3].y();
+  M2(3, 3) = +fidpoints_[3].x();
 
-	//std::cout << "M1:\n" << M1 << std::endl;
-	//std::cout << "M2:\n" << M2 << std::endl;
+  //std::cout << "M1:\n" << M1 << std::endl;
+  //std::cout << "M2:\n" << M2 << std::endl;
 
-	ROOT::Math::SVector<value_t,4> mod_tr1, mod_tr2;
-	mod_tr1 = M1*mod2;
-	mod_tr2 = M2*mod1;
-	//std::cout << "mod_tr1: " << mod_tr1 << std::endl;
-	//std::cout << "mod_tr2: " << mod_tr2 << std::endl;
+  ROOT::Math::SVector<value_t, 4> mod_tr1, mod_tr2;
+  mod_tr1 = M1 * mod2;
+  mod_tr2 = M2 * mod1;
+  //std::cout << "mod_tr1: " << mod_tr1 << std::endl;
+  //std::cout << "mod_tr2: " << mod_tr2 << std::endl;
 
-	fidpoint_t fidpointvec;
-	fidpointvec.push_back(coord_t(mod_tr1(0),mod_tr1(1)));
-	fidpointvec.push_back(coord_t(mod_tr1(2),mod_tr1(3)));
-	fidpointvec.push_back(coord_t(mod_tr2(0),mod_tr2(1)));
-	fidpointvec.push_back(coord_t(mod_tr2(2),mod_tr2(3)));
+  fidpoint_t fidpointvec;
+  fidpointvec.push_back(coord_t(mod_tr1(0), mod_tr1(1)));
+  fidpointvec.push_back(coord_t(mod_tr1(2), mod_tr1(3)));
+  fidpointvec.push_back(coord_t(mod_tr2(0), mod_tr2(1)));
+  fidpointvec.push_back(coord_t(mod_tr2(2), mod_tr2(3)));
 
-	doFit(fidpointvec);
+  doFit(fidpointvec);
 }
 
-SurveyPxbImageLocalFit::localpars_t SurveyPxbImageLocalFit::getLocalParameters()
-{
-	if (!fitValidFlag_) throw std::logic_error("SurveyPxbImageLocalFit::getLocalParameters(): Fit is not valid. Call doFit(...) before calling this function.");
-	return a_;
+SurveyPxbImageLocalFit::localpars_t SurveyPxbImageLocalFit::getLocalParameters() {
+  if (!fitValidFlag_)
+    throw std::logic_error(
+        "SurveyPxbImageLocalFit::getLocalParameters(): Fit is not valid. Call doFit(...) before calling this "
+        "function.");
+  return a_;
 }
 
-SurveyPxbImageLocalFit::value_t SurveyPxbImageLocalFit::getChi2()
-{
-	if (!fitValidFlag_) throw std::logic_error("SurveyPxbImageLocalFit::getChi2(): Fit is not valid. Call doFit(...) before calling this function.");
-	return chi2_;
+SurveyPxbImageLocalFit::value_t SurveyPxbImageLocalFit::getChi2() {
+  if (!fitValidFlag_)
+    throw std::logic_error(
+        "SurveyPxbImageLocalFit::getChi2(): Fit is not valid. Call doFit(...) before calling this function.");
+  return chi2_;
 }
 
-void SurveyPxbImageLocalFit::setLocalDerivsToZero(count_t j)
-{
-    if (!(j < nLcD)) throw std::range_error("SurveyPxbImageLocalFit::setLocalDerivsToZero(j): j out of range.");
-    for(count_t i=0; i!=nMsrmts; i++)
-	localDerivsMatrix_(i,j)=0;
+void SurveyPxbImageLocalFit::setLocalDerivsToZero(count_t j) {
+  if (!(j < nLcD))
+    throw std::range_error("SurveyPxbImageLocalFit::setLocalDerivsToZero(j): j out of range.");
+  for (count_t i = 0; i != nMsrmts; i++)
+    localDerivsMatrix_(i, j) = 0;
 }
 
-void SurveyPxbImageLocalFit::setGlobalDerivsToZero(count_t j)
-{
-    if (!(j < nGlD)) throw std::range_error("SurveyPxbImageLocalFit::setLocalDerivsToZero(j): j out of range.");
-    for(count_t i=0; i!=nMsrmts; i++)
-	globalDerivsMatrix_(i,j)=0;
+void SurveyPxbImageLocalFit::setGlobalDerivsToZero(count_t j) {
+  if (!(j < nGlD))
+    throw std::range_error("SurveyPxbImageLocalFit::setLocalDerivsToZero(j): j out of range.");
+  for (count_t i = 0; i != nMsrmts; i++)
+    globalDerivsMatrix_(i, j) = 0;
 }
-
-
diff --git a/Alignment/SurveyAnalysis/test/SurveyDBReader.cc b/Alignment/SurveyAnalysis/test/SurveyDBReader.cc
index acf4802cdd5e7..7378de8465555 100644
--- a/Alignment/SurveyAnalysis/test/SurveyDBReader.cc
+++ b/Alignment/SurveyAnalysis/test/SurveyDBReader.cc
@@ -13,79 +13,70 @@
 
 #include "Alignment/SurveyAnalysis/test/SurveyDBReader.h"
 
-SurveyDBReader::SurveyDBReader(const edm::ParameterSet& cfg):
-  theFileName( cfg.getParameter<std::string>("fileName") ),
-  theFirstEvent(true)
-{
-}
+SurveyDBReader::SurveyDBReader(const edm::ParameterSet& cfg)
+    : theFileName(cfg.getParameter<std::string>("fileName")), theFirstEvent(true) {}
 
-void SurveyDBReader::analyze(const edm::Event&, const edm::EventSetup& setup)
-{
+void SurveyDBReader::analyze(const edm::Event&, const edm::EventSetup& setup) {
   typedef AlignTransform SurveyValue;
-  typedef Alignments     SurveyValues;
+  typedef Alignments SurveyValues;
 
   if (theFirstEvent) {
-
     edm::ESHandle<SurveyValues> valuesHandle;
     edm::ESHandle<SurveyErrors> errorsHandle;
-    
+
     setup.get<TrackerSurveyRcd>().get(valuesHandle);
     setup.get<TrackerSurveyErrorExtendedRcd>().get(errorsHandle);
-    
+
     const std::vector<SurveyValue>& values = valuesHandle->m_align;
     const std::vector<SurveyError>& errors = errorsHandle->m_surveyErrors;
-    
+
     unsigned int size = values.size();
-    
-    if ( errors.size() != size )
-      {
-	edm::LogError("SurveyDBReader")
-	  << "Value and error records have different sizes. Abort!";
-	
-	return;
-      }
-    
-    uint8_t  type = 0;
-    uint32_t id   = 0;
-    
-    ROOT::Math::Cartesian3D<double>* pos(0); // pointer required by ROOT
-    ROOT::Math::EulerAngles* rot(0); // pointer required by ROOT
-    const align::ErrorMatrix* cov(0); // pointer required by ROOT
-    
+
+    if (errors.size() != size) {
+      edm::LogError("SurveyDBReader") << "Value and error records have different sizes. Abort!";
+
+      return;
+    }
+
+    uint8_t type = 0;
+    uint32_t id = 0;
+
+    ROOT::Math::Cartesian3D<double>* pos(0);  // pointer required by ROOT
+    ROOT::Math::EulerAngles* rot(0);          // pointer required by ROOT
+    const align::ErrorMatrix* cov(0);         // pointer required by ROOT
+
     TFile fout(theFileName.c_str(), "RECREATE");
     TTree tree("survey", "");
-    
+
     tree.Branch("type", &type, "type/b");
-    tree.Branch("id",   &id,   "id/i");
-    tree.Branch("pos", "ROOT::Math::Cartesian3D<double>",    &pos);
-    tree.Branch("rot", "ROOT::Math::EulerAngles",   &rot);
+    tree.Branch("id", &id, "id/i");
+    tree.Branch("pos", "ROOT::Math::Cartesian3D<double>", &pos);
+    tree.Branch("rot", "ROOT::Math::EulerAngles", &rot);
     tree.Branch("cov", "align::ErrorMatrix", &cov);
-    
-    for (unsigned int i = 0; i < size; ++i)
-      {
-	const SurveyValue& value = values[i];
-	const SurveyError& error = errors[i];
-	
-	const CLHEP::Hep3Vector&  transl = value.translation();
-	const CLHEP::HepRotation& orient = value.rotation();
-	const align::ErrorMatrix& matrix = error.matrix();
-
-	ROOT::Math::Cartesian3D<double> coords( transl.x(),transl.y(),transl.z() );
-	ROOT::Math::EulerAngles angles( orient.phi(), orient.theta(), orient.psi() );
-	
-	type = error.structureType();
-	id   = error.rawId();
-	pos  = &coords;
-	rot  = &angles;
-	cov  = &matrix;
-	
-	tree.Fill();
-      }
-    
+
+    for (unsigned int i = 0; i < size; ++i) {
+      const SurveyValue& value = values[i];
+      const SurveyError& error = errors[i];
+
+      const CLHEP::Hep3Vector& transl = value.translation();
+      const CLHEP::HepRotation& orient = value.rotation();
+      const align::ErrorMatrix& matrix = error.matrix();
+
+      ROOT::Math::Cartesian3D<double> coords(transl.x(), transl.y(), transl.z());
+      ROOT::Math::EulerAngles angles(orient.phi(), orient.theta(), orient.psi());
+
+      type = error.structureType();
+      id = error.rawId();
+      pos = &coords;
+      rot = &angles;
+      cov = &matrix;
+
+      tree.Fill();
+    }
+
     fout.Write();
 
-    edm::LogInfo("SurveyDBReader")
-      << "Number of alignables read " << size << std::endl;
+    edm::LogInfo("SurveyDBReader") << "Number of alignables read " << size << std::endl;
 
     theFirstEvent = false;
   }
diff --git a/Alignment/SurveyAnalysis/test/SurveyDBReader.h b/Alignment/SurveyAnalysis/test/SurveyDBReader.h
index 6b2a21bbf46e1..57d0afba3963b 100644
--- a/Alignment/SurveyAnalysis/test/SurveyDBReader.h
+++ b/Alignment/SurveyAnalysis/test/SurveyDBReader.h
@@ -18,26 +18,17 @@
 
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-class SurveyDBReader:
-  public edm::EDAnalyzer
-{
-  public:
-
+class SurveyDBReader : public edm::EDAnalyzer {
+public:
   /// Set file name
-  SurveyDBReader(
-		 const edm::ParameterSet&
-		 );
+  SurveyDBReader(const edm::ParameterSet&);
 
   /// Read from DB and print survey info.
   virtual void beginJob() { theFirstEvent = true; }
 
-  virtual void analyze(
-		       const edm::Event&,
-		       const edm::EventSetup&
-		       );
-
-  private:
+  virtual void analyze(const edm::Event&, const edm::EventSetup&);
 
+private:
   std::string theFileName;
 
   bool theFirstEvent;
diff --git a/Alignment/SurveyAnalysis/test/SurveyInputDummy.cc b/Alignment/SurveyAnalysis/test/SurveyInputDummy.cc
index c7000d017b87a..e500979980c1f 100644
--- a/Alignment/SurveyAnalysis/test/SurveyInputDummy.cc
+++ b/Alignment/SurveyAnalysis/test/SurveyInputDummy.cc
@@ -11,11 +11,10 @@
 
 #include "Alignment/SurveyAnalysis/test/SurveyInputDummy.h"
 
-SurveyInputDummy::SurveyInputDummy(const edm::ParameterSet& cfg):
-  theRandomizeValue( cfg.getParameter<bool>("randomizeValue") )
-{
+SurveyInputDummy::SurveyInputDummy(const edm::ParameterSet& cfg)
+    : theRandomizeValue(cfg.getParameter<bool>("randomizeValue")) {
   typedef std::vector<edm::ParameterSet> ParameterSets;
- 
+
   const ParameterSets& errors = cfg.getParameter<ParameterSets>("errors");
 
   unsigned int nError = errors.size();
@@ -24,17 +23,15 @@ SurveyInputDummy::SurveyInputDummy(const edm::ParameterSet& cfg):
   //        - check this, when resurrecting this code in the future
   AlignableObjectId alignableObjectId{AlignableObjectId::Geometry::General};
 
-  for (unsigned int i = 0; i < nError; ++i)
-  {
+  for (unsigned int i = 0; i < nError; ++i) {
     const edm::ParameterSet& error = errors[i];
 
-    theErrors[alignableObjectId.stringToId( error.getParameter<std::string>("level") )]
-      = error.getParameter<double>("value");
+    theErrors[alignableObjectId.stringToId(error.getParameter<std::string>("level"))] =
+        error.getParameter<double>("value");
   }
 }
 
-void SurveyInputDummy::analyze(const edm::Event&, const edm::EventSetup& setup)
-{
+void SurveyInputDummy::analyze(const edm::Event&, const edm::EventSetup& setup) {
   if (theFirstEvent) {
     //Retrieve tracker topology from geometry
     edm::ESHandle<TrackerTopology> tTopoHandle;
@@ -42,10 +39,10 @@ void SurveyInputDummy::analyze(const edm::Event&, const edm::EventSetup& setup)
     const TrackerTopology* const tTopo = tTopoHandle.product();
 
     edm::ESHandle<TrackerGeometry> tracker;
-    setup.get<TrackerDigiGeometryRecord>().get( tracker );
-    
-    Alignable* ali = new AlignableTracker( &*tracker, tTopo );
-    
+    setup.get<TrackerDigiGeometryRecord>().get(tracker);
+
+    Alignable* ali = new AlignableTracker(&*tracker, tTopo);
+
     addSurveyInfo(ali);
     addComponent(ali);
 
@@ -53,26 +50,24 @@ void SurveyInputDummy::analyze(const edm::Event&, const edm::EventSetup& setup)
   }
 }
 
-void SurveyInputDummy::addSurveyInfo(Alignable* ali)
-{
+void SurveyInputDummy::addSurveyInfo(Alignable* ali) {
   static TRandom3 rand;
 
   const align::Alignables& comp = ali->components();
 
   unsigned int nComp = comp.size();
 
-  for (unsigned int i = 0; i < nComp; ++i) addSurveyInfo(comp[i]);
+  for (unsigned int i = 0; i < nComp; ++i)
+    addSurveyInfo(comp[i]);
 
-  align::ErrorMatrix cov; // default 0
+  align::ErrorMatrix cov;  // default 0
 
-  std::map<align::StructureType, double>::const_iterator e = theErrors.find( ali->alignableObjectId() );
+  std::map<align::StructureType, double>::const_iterator e = theErrors.find(ali->alignableObjectId());
 
-  if (theErrors.end() != e)
-  {
+  if (theErrors.end() != e) {
     double error = e->second;
 
-    if (theRandomizeValue)
-    {
+    if (theRandomizeValue) {
       double x = rand.Gaus(0., error);
       double y = rand.Gaus(0., error);
       double z = rand.Gaus(0., error);
@@ -82,15 +77,17 @@ void SurveyInputDummy::addSurveyInfo(Alignable* ali)
 
       align::EulerAngles angles(3);
 
-      angles(1) = a; angles(2) = b; angles(3) = g;
+      angles(1) = a;
+      angles(2) = b;
+      angles(3) = g;
 
-      ali->move( ali->surface().toGlobal( align::LocalVector(x, y, z) ) );
-      ali->rotateInLocalFrame( align::toMatrix(angles) );
+      ali->move(ali->surface().toGlobal(align::LocalVector(x, y, z)));
+      ali->rotateInLocalFrame(align::toMatrix(angles));
     }
 
     cov = ROOT::Math::SMatrixIdentity();
     cov *= error * error;
   }
 
-  ali->setSurvey( new SurveyDet(ali->surface(), cov) );
+  ali->setSurvey(new SurveyDet(ali->surface(), cov));
 }
diff --git a/Alignment/SurveyAnalysis/test/SurveyInputDummy.h b/Alignment/SurveyAnalysis/test/SurveyInputDummy.h
index ec8b2a145f8a1..3c97d255012bf 100644
--- a/Alignment/SurveyAnalysis/test/SurveyInputDummy.h
+++ b/Alignment/SurveyAnalysis/test/SurveyInputDummy.h
@@ -32,29 +32,18 @@
 
 #include <map>
 
-class SurveyInputDummy:
-  public SurveyInputBase
-{
-  public:
-
-  SurveyInputDummy(
-		   const edm::ParameterSet&
-		   );
+class SurveyInputDummy : public SurveyInputBase {
+public:
+  SurveyInputDummy(const edm::ParameterSet&);
 
   /// Read ideal tracker geometry from DB
-  virtual void analyze(
-		       const edm::Event&,
-		       const edm::EventSetup&
-		       );
-
-  private:
+  virtual void analyze(const edm::Event&, const edm::EventSetup&);
 
+private:
   /// Add survey info to an alignable
-  void addSurveyInfo(
-		     Alignable*
-		     );
+  void addSurveyInfo(Alignable*);
 
-  bool theRandomizeValue; // randomize survey values if true
+  bool theRandomizeValue;  // randomize survey values if true
 
   std::map<align::StructureType, double> theErrors;
 };
diff --git a/Alignment/SurveyAnalysis/test/SurveyInputTest.cc b/Alignment/SurveyAnalysis/test/SurveyInputTest.cc
index b6509129f3e8e..66fc5843a3790 100644
--- a/Alignment/SurveyAnalysis/test/SurveyInputTest.cc
+++ b/Alignment/SurveyAnalysis/test/SurveyInputTest.cc
@@ -6,19 +6,12 @@
 
 using namespace align;
 
-SurveyInputTest::SurveyInputTest(const edm::ParameterSet& cfg):
-  theConfig(cfg)
-{
-}
+SurveyInputTest::SurveyInputTest(const edm::ParameterSet& cfg) : theConfig(cfg) {}
 
-void SurveyInputTest::beginJob()
-{
-  addComponent( create( theConfig.getParameter<std::string>("detector") ) );
-}
+void SurveyInputTest::beginJob() { addComponent(create(theConfig.getParameter<std::string>("detector"))); }
 
-Alignable* SurveyInputTest::create(const std::string& parName)
-{
-  typedef std::vector<double>      Doubles;
+Alignable* SurveyInputTest::create(const std::string& parName) {
+  typedef std::vector<double> Doubles;
   typedef std::vector<std::string> Strings;
 
   static const Doubles zero3Vector(3, 0.);
@@ -34,42 +27,43 @@ Alignable* SurveyInputTest::create(const std::string& parName)
 
   ErrorMatrix cov;
 
-  for (unsigned int i = 0; i < 6; ++i) cov(i, i) = errors[i];
+  for (unsigned int i = 0; i < 6; ++i)
+    cov(i, i) = errors[i];
 
   PositionType pos(center[0], center[1], center[2]);
   EulerAngles ang(3);
 
-  ang(1) = angles[0], ang(2) = angles[1]; ang(3) = angles[2];
+  ang(1) = angles[0], ang(2) = angles[1];
+  ang(3) = angles[2];
 
-  AlignableSurface surf( pos, toMatrix(ang) );
+  AlignableSurface surf(pos, toMatrix(ang));
 
-  surf.setWidth ( pars.getUntrackedParameter<double>("width" , 0.) );
-  surf.setLength( pars.getUntrackedParameter<double>("length", 0.) );
+  surf.setWidth(pars.getUntrackedParameter<double>("width", 0.));
+  surf.setLength(pars.getUntrackedParameter<double>("length", 0.));
 
-          int type = pars.getParameter<int>        ("typeId");
+  int type = pars.getParameter<int>("typeId");
   std::string name = pars.getParameter<std::string>("object");
 
   // FIXME: - currently defaulting to RunI as this was the previous behaviour
   //        - check this, when resurrecting this code in the future
   AlignableObjectId alignableObjectId{AlignableObjectId::Geometry::General};
 
-  Alignable* ali = new AlignableComposite( type, alignableObjectId.stringToId(name),
-					   surf.rotation() );
+  Alignable* ali = new AlignableComposite(type, alignableObjectId.stringToId(name), surf.rotation());
 
   Strings comp = pars.getUntrackedParameter<Strings>("compon", emptyString);
 
   unsigned int nComp = comp.size();
 
-  for (unsigned int i = 0; i < nComp; ++i)
-  {
-    ali->addComponent( create(comp[i]) );
+  for (unsigned int i = 0; i < nComp; ++i) {
+    ali->addComponent(create(comp[i]));
   }
 
-  ang(1) = shifts[3], ang(2) = shifts[4]; ang(3) = shifts[5];
+  ang(1) = shifts[3], ang(2) = shifts[4];
+  ang(3) = shifts[5];
 
-  ali->setSurvey( new SurveyDet(surf, cov) );
-  ali->move( surf.toGlobal( align::LocalVector(shifts[0], shifts[1], shifts[2]) ) );
-  ali->rotateInLocalFrame( toMatrix(ang) );
+  ali->setSurvey(new SurveyDet(surf, cov));
+  ali->move(surf.toGlobal(align::LocalVector(shifts[0], shifts[1], shifts[2])));
+  ali->rotateInLocalFrame(toMatrix(ang));
 
   return ali;
 }
diff --git a/Alignment/SurveyAnalysis/test/SurveyInputTest.h b/Alignment/SurveyAnalysis/test/SurveyInputTest.h
index 7310d173b1900..0f30f4f853e64 100644
--- a/Alignment/SurveyAnalysis/test/SurveyInputTest.h
+++ b/Alignment/SurveyAnalysis/test/SurveyInputTest.h
@@ -13,28 +13,18 @@
 #include "Alignment/SurveyAnalysis/interface/SurveyInputBase.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class SurveyInputTest:
-  public SurveyInputBase
-{
-  public:
-
-  SurveyInputTest(
-		  const edm::ParameterSet&
-		  );
+class SurveyInputTest : public SurveyInputBase {
+public:
+  SurveyInputTest(const edm::ParameterSet&);
 
   /// Read data from cfg file
   virtual void beginJob();
-  
-  virtual void analyze(
-		       const edm::Event&,
-		       const edm::EventSetup&
-		       ) {}
 
-  private:
+  virtual void analyze(const edm::Event&, const edm::EventSetup&) {}
 
-  Alignable* create(
-		    const std::string& parName // name of alignable
-		    );
+private:
+  Alignable* create(const std::string& parName  // name of alignable
+  );
 
   edm::ParameterSet theConfig;
 };
diff --git a/Alignment/SurveyAnalysis/test/SurveyTest.cc b/Alignment/SurveyAnalysis/test/SurveyTest.cc
index bb9eba16457b1..d0f00a4ba4124 100644
--- a/Alignment/SurveyAnalysis/test/SurveyTest.cc
+++ b/Alignment/SurveyAnalysis/test/SurveyTest.cc
@@ -8,12 +8,11 @@
 
 #include "Alignment/SurveyAnalysis/test/SurveyTest.h"
 
-SurveyTest::SurveyTest(const edm::ParameterSet& cfg):
-  theBiasFlag( cfg.getUntrackedParameter<bool>("bias", false) ),
-  theIterations( cfg.getParameter<unsigned int>("iterator") ),
-  theAlgorithm ( cfg.getParameter<std::string>("algorith") ),
-  theOutputFile( cfg.getParameter<std::string>("fileName") )
-{
+SurveyTest::SurveyTest(const edm::ParameterSet& cfg)
+    : theBiasFlag(cfg.getUntrackedParameter<bool>("bias", false)),
+      theIterations(cfg.getParameter<unsigned int>("iterator")),
+      theAlgorithm(cfg.getParameter<std::string>("algorith")),
+      theOutputFile(cfg.getParameter<std::string>("fileName")) {
   typedef std::vector<std::string> Strings;
 
   const Strings& hierarchy = cfg.getParameter<Strings>("hierarch");
@@ -22,14 +21,12 @@ SurveyTest::SurveyTest(const edm::ParameterSet& cfg):
   //        - check this, when resurrecting this code in the future
   AlignableObjectId alignableObjectId{AlignableObjectId::Geometry::General};
 
-  for (unsigned int l = 0; l < hierarchy.size(); ++l)
-  {
-    theHierarchy.push_back(alignableObjectId.stringToId(hierarchy[l]) );
+  for (unsigned int l = 0; l < hierarchy.size(); ++l) {
+    theHierarchy.push_back(alignableObjectId.stringToId(hierarchy[l]));
   }
 }
 
-void SurveyTest::beginJob()
-{
+void SurveyTest::beginJob() {
   Alignable* det = SurveyInputBase::detector();
 
   align::Alignables sensors;
@@ -43,20 +40,17 @@ void SurveyTest::beginJob()
 
   algos[theAlgorithm]->iterate(theIterations, theOutputFile, theBiasFlag);
 
-  for (std::map<std::string, SurveyAlignment*>::iterator i = algos.begin();
-       i != algos.end(); ++i) delete i->second;
+  for (std::map<std::string, SurveyAlignment*>::iterator i = algos.begin(); i != algos.end(); ++i)
+    delete i->second;
 }
 
-void SurveyTest::getTerminals(align::Alignables& terminals,
-			      Alignable* ali)
-{
+void SurveyTest::getTerminals(align::Alignables& terminals, Alignable* ali) {
   const auto& comp = ali->components();
 
   unsigned int nComp = comp.size();
 
   if (nComp > 0)
-    for (unsigned int i = 0; i < nComp; ++i)
-    {
+    for (unsigned int i = 0; i < nComp; ++i) {
       getTerminals(terminals, comp[i]);
     }
   else
diff --git a/Alignment/SurveyAnalysis/test/SurveyTest.h b/Alignment/SurveyAnalysis/test/SurveyTest.h
index c935a369cd5f3..771e6eceee3ef 100644
--- a/Alignment/SurveyAnalysis/test/SurveyTest.h
+++ b/Alignment/SurveyAnalysis/test/SurveyTest.h
@@ -14,27 +14,23 @@
 #include "Alignment/CommonAlignment/interface/Utilities.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-class SurveyTest:
-  public edm::EDAnalyzer
-{
-  public:
-
+class SurveyTest : public edm::EDAnalyzer {
+public:
   SurveyTest(const edm::ParameterSet&);
 
   virtual void beginJob();
 
   virtual void analyze(const edm::Event&, const edm::EventSetup&) {}
 
-  private:
-
+private:
   void getTerminals(align::Alignables& terminals, Alignable* ali);
 
-  bool theBiasFlag; // true for biased residuals
+  bool theBiasFlag;  // true for biased residuals
 
-  unsigned int theIterations; // number of iterations
+  unsigned int theIterations;  // number of iterations
 
-  std::string theAlgorithm;  // points or sensor residual
-  std::string theOutputFile; // name of output file
+  std::string theAlgorithm;   // points or sensor residual
+  std::string theOutputFile;  // name of output file
 
   std::vector<align::StructureType> theHierarchy;
 };
diff --git a/Alignment/SurveyAnalysis/test/TestConverter.cpp b/Alignment/SurveyAnalysis/test/TestConverter.cpp
index 1ed3618c8f714..12e245da82b73 100644
--- a/Alignment/SurveyAnalysis/test/TestConverter.cpp
+++ b/Alignment/SurveyAnalysis/test/TestConverter.cpp
@@ -2,7 +2,7 @@
 //
 // Package:    TestConverter
 // Class:      TestConverter
-// 
+//
 //
 // Description: Module to test the SurveyConverter software
 //
@@ -11,7 +11,6 @@
 //         Created:  March 16, 2006
 //
 
-
 // system include files
 #include <string>
 #include "TTree.h"
@@ -28,9 +27,9 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "CondFormats/Alignment/interface/Alignments.h"
-#include <boost/cstdint.hpp> 
+#include <boost/cstdint.hpp>
 #include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
-#include "CLHEP/Vector/RotationInterfaces.h" 
+#include "CLHEP/Vector/RotationInterfaces.h"
 #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h"
 #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h"
 
@@ -44,27 +43,27 @@
 //
 
 class TestConverter : public edm::EDAnalyzer {
-
-  typedef SurveyDataReader::MapType    MapType;
-  typedef SurveyDataReader::PairType   PairType;
-  typedef SurveyDataReader::MapTypeOr  MapTypeOr;
+  typedef SurveyDataReader::MapType MapType;
+  typedef SurveyDataReader::PairType PairType;
+  typedef SurveyDataReader::MapTypeOr MapTypeOr;
   typedef SurveyDataReader::PairTypeOr PairTypeOr;
 
 public:
-  explicit TestConverter( const edm::ParameterSet& );
+  explicit TestConverter(const edm::ParameterSet&);
   ~TestConverter();
-  
-  virtual void analyze( const edm::Event&, const edm::EventSetup& );
+
+  virtual void analyze(const edm::Event&, const edm::EventSetup&);
+
 private:
   // ----------member data ---------------------------
   TTree* theTree;
   TFile* theFile;
   edm::ParameterSet theParameterSet;
-  float dx_,dy_,dz_;
-  float dtx_,dty_,dtz_;
-  float dkx_,dky_,dkz_;
-  float dnx_,dny_,dnz_;
-  float errx_,erry_,errz_; 
+  float dx_, dy_, dz_;
+  float dtx_, dty_, dtz_;
+  float dkx_, dky_, dkz_;
+  float dnx_, dny_, dnz_;
+  float errx_, erry_, errz_;
   int Id_;
   // TRotMatrix* rot_;
 
@@ -74,46 +73,36 @@ class TestConverter : public edm::EDAnalyzer {
 //
 // constructors and destructor
 //
-TestConverter::TestConverter( const edm::ParameterSet& iConfig ) :
-  theParameterSet( iConfig )
-{ 
-  
+TestConverter::TestConverter(const edm::ParameterSet& iConfig) : theParameterSet(iConfig) {
   // Open root file and define tree
-  std::string fileName = theParameterSet.getUntrackedParameter<std::string>("fileName","test.root");
-  theFile = new TFile( fileName.c_str(), "RECREATE" );
-  theTree = new TTree( "theTree", "Detector units positions" );
-  
-  theTree->Branch("Id",     &Id_,     "Id/I"     );
-  theTree->Branch("dx",     &dx_,     "dx/F"     );
-  theTree->Branch("dy",     &dy_,     "dy/F"     );
-  theTree->Branch("dz",     &dz_,     "dz/F"     );
-  theTree->Branch("dtx",    &dtx_,    "dtx/F"    );
-  theTree->Branch("dty",    &dty_,    "dty/F"    );
-  theTree->Branch("dtz",    &dtz_,    "dtz/F"    );
-  theTree->Branch("dkx",    &dkx_,    "dkx/F"    );
-  theTree->Branch("dky",    &dky_,    "dky/F"    );
-  theTree->Branch("dkz",    &dkz_,    "dkz/F"    );
-  theTree->Branch("dnx",    &dnx_,    "dnx/F"    );
-  theTree->Branch("dny",    &dny_,    "dny/F"    );
-  theTree->Branch("dnz",    &dnz_,    "dnz/F"    ); 
-  theTree->Branch("errx",   &errx_,   "errx/F"   );
-  theTree->Branch("erry",   &erry_,   "erry/F"   );
-  theTree->Branch("errz",   &errz_,   "errz/F"   );
-}
+  std::string fileName = theParameterSet.getUntrackedParameter<std::string>("fileName", "test.root");
+  theFile = new TFile(fileName.c_str(), "RECREATE");
+  theTree = new TTree("theTree", "Detector units positions");
 
+  theTree->Branch("Id", &Id_, "Id/I");
+  theTree->Branch("dx", &dx_, "dx/F");
+  theTree->Branch("dy", &dy_, "dy/F");
+  theTree->Branch("dz", &dz_, "dz/F");
+  theTree->Branch("dtx", &dtx_, "dtx/F");
+  theTree->Branch("dty", &dty_, "dty/F");
+  theTree->Branch("dtz", &dtz_, "dtz/F");
+  theTree->Branch("dkx", &dkx_, "dkx/F");
+  theTree->Branch("dky", &dky_, "dky/F");
+  theTree->Branch("dkz", &dkz_, "dkz/F");
+  theTree->Branch("dnx", &dnx_, "dnx/F");
+  theTree->Branch("dny", &dny_, "dny/F");
+  theTree->Branch("dnz", &dnz_, "dnz/F");
+  theTree->Branch("errx", &errx_, "errx/F");
+  theTree->Branch("erry", &erry_, "erry/F");
+  theTree->Branch("errz", &errz_, "errz/F");
+}
 
-TestConverter::~TestConverter()
-{ 
-  
+TestConverter::~TestConverter() {
   theTree->Write();
   theFile->Close();
-  
 }
 
-
-void
-TestConverter::analyze( const edm::Event& iEvent, const edm::EventSetup& iSetup )
-{
+void TestConverter::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   edm::LogInfo("TrackerAlignment") << "Starting!";
 
   //Retrieve tracker topology from geometry
@@ -123,21 +112,21 @@ TestConverter::analyze( const edm::Event& iEvent, const edm::EventSetup& iSetup
 
   //
   // Read in the survey information from the text files
-  // 
-  edm::ParameterSet textFiles = theParameterSet.getParameter<edm::ParameterSet>( "textFileNames" );
-  std::string textFileNames[NFILES]; 
-  std::string fileType[NFILES];    
-  textFileNames[0] = textFiles.getUntrackedParameter<std::string>("forTIB","NONE");  
+  //
+  edm::ParameterSet textFiles = theParameterSet.getParameter<edm::ParameterSet>("textFileNames");
+  std::string textFileNames[NFILES];
+  std::string fileType[NFILES];
+  textFileNames[0] = textFiles.getUntrackedParameter<std::string>("forTIB", "NONE");
   fileType[0] = "TIB";
-  textFileNames[1] = textFiles.getUntrackedParameter<std::string>("forTID","NONE");
+  textFileNames[1] = textFiles.getUntrackedParameter<std::string>("forTID", "NONE");
   fileType[1] = "TID";
 
   SurveyDataReader dataReader;
-  for (int ii=0 ; ii<NFILES ;ii++) {
-    if ( textFileNames[ii] == "NONE" )
+  for (int ii = 0; ii < NFILES; ii++) {
+    if (textFileNames[ii] == "NONE")
       throw cms::Exception("BadConfig") << fileType[ii] << " input file not found in configuration";
-    dataReader.readFile( textFileNames[ii], fileType[ii], tTopo );
-  } 
+    dataReader.readFile(textFileNames[ii], fileType[ii], tTopo);
+  }
 
   edm::LogInfo("TrackerAlignment") << "Files read";
 
@@ -153,20 +142,19 @@ TestConverter::analyze( const edm::Event& iEvent, const edm::EventSetup& iSetup
 
   // Retrieve alignment[Error]s from DBase
   edm::ESHandle<Alignments> alignments;
-  iSetup.get<TrackerAlignmentRcd>().get( alignments );
+  iSetup.get<TrackerAlignmentRcd>().get(alignments);
   edm::ESHandle<AlignmentErrorsExtended> alignmentErrors;
-  iSetup.get<TrackerAlignmentErrorExtendedRcd>().get( alignmentErrors );
-  
+  iSetup.get<TrackerAlignmentErrorExtendedRcd>().get(alignmentErrors);
+
   std::vector<AlignTransformErrorExtended> alignErrors = alignmentErrors->m_alignError;
   // int countDet = 0;
 
   // Now loop on detector units, and store difference position and orientation w.r.t. survey
-  
-   for ( std::vector<AlignTransform>::const_iterator iGeomDet = alignments->m_align.begin();
-		iGeomDet != alignments->m_align.end(); iGeomDet++ )
-	{
-          
-          /* if (countDet == 0) countDet = countDet + 3;
+
+  for (std::vector<AlignTransform>::const_iterator iGeomDet = alignments->m_align.begin();
+       iGeomDet != alignments->m_align.end();
+       iGeomDet++) {
+    /* if (countDet == 0) countDet = countDet + 3;
 	  unsigned int comparisonVect[6] = {0,0,0,0,0,0};
 	  
 	  DetId * thisId = new DetId( (*iGeomDet).rawId() );
@@ -197,75 +185,92 @@ TestConverter::analyze( const edm::Event& iEvent, const edm::EventSetup& iSetup
 	  if (countDet == 0) { // Store only r-phi for double-sided modules
           */
 
-	  for ( MapTypeOr::const_iterator it = theSurveyMap.begin(); it != theSurveyMap.end(); it++ ) {
-	      const std::vector<int>& locPos = (it)->first;
-	      const align::Scalars& align_params = (it)->second;
-	      
-	      /* if (locPos[0] == int(comparisonVect[0]) &&
+    for (MapTypeOr::const_iterator it = theSurveyMap.begin(); it != theSurveyMap.end(); it++) {
+      const std::vector<int>& locPos = (it)->first;
+      const align::Scalars& align_params = (it)->second;
+
+      /* if (locPos[0] == int(comparisonVect[0]) &&
 		  locPos[2] == int(comparisonVect[1]) &&
 		  locPos[3] == int(comparisonVect[2]) &&
 		  locPos[4] == int(comparisonVect[3]) &&
 		  locPos[5] == int(comparisonVect[4]) &&
 		  locPos[6] == int(comparisonVect[5]) ) { */
-                
-              int thecomparison = (int)locPos[1] - (int)(*iGeomDet).rawId();
-	      if (thecomparison == 0) {
-                
-		for ( std::vector<AlignTransformErrorExtended>::const_iterator it = alignErrors.begin();
-		      it != alignErrors.end(); it++ ) {
-		  
-		  if ((*it).rawId() == (*iGeomDet).rawId()) {
-		  
-		    CLHEP::HepRotation fromAngles = (*iGeomDet).rotation() ;
-		    align::RotationType rotation( fromAngles.xx(), fromAngles.xy(), fromAngles.xz(),
-						  fromAngles.yx(), fromAngles.yy(), fromAngles.yz(),
-						  fromAngles.zx(), fromAngles.zy(), fromAngles.zz() );
-		    
-		    Id_     = (*iGeomDet).rawId();    
-		    dx_      = (*iGeomDet).translation().x() - align_params[15]; 
-		    dy_      = (*iGeomDet).translation().y() - align_params[16];
-		    dz_      = (*iGeomDet).translation().z() - align_params[17];
-		    dtx_     = rotation.xx() - align_params[21];
-		    dty_     = rotation.xy() - align_params[22];
-		    dtz_     = rotation.xz() - align_params[23];
-		    dkx_     = rotation.yx() - align_params[24];
-		    dky_     = rotation.yy() - align_params[25];
-		    dkz_     = rotation.yz() - align_params[26];
-		    dnx_     = rotation.zx() - align_params[18];
-		    dny_     = rotation.zy() - align_params[19];
-		    dnz_     = rotation.zz() - align_params[20];
-                    CLHEP::HepSymMatrix errMat = (*it).matrix();
-                    errx_    = sqrt(errMat[0][0]); 
-		    erry_    = sqrt(errMat[1][1]);
-		    errz_    = sqrt(errMat[2][2]); 
-		    
-		    theTree->Fill();
-		    
-		    // if (dkx_ > 0.04) {
-		    edm::LogInfo("TrackerAlignment") << "DetId = " << Id_ << "\n"
-		     << "DetId decodified = " << locPos[0] << " " << locPos[2] << " " << locPos[3] << " " << locPos[4] << " " << locPos[5] << " " << locPos[6] << "\n"
-		     << "X pos : TRACKER_MOVED = " << std::fixed << std::setprecision(2) << (*iGeomDet).translation().x() << " / SURVEY RICCARDO = " << align_params[15] << "\n"
-		     << "Y pos : TRACKER_MOVED = " << std::fixed << std::setprecision(2) << (*iGeomDet).translation().y() << " / SURVEY RICCARDO = " << align_params[16] << "\n"
-		     << "Z pos : TRACKER_MOVED = " << std::fixed << std::setprecision(2) << (*iGeomDet).translation().z() << " / SURVEY RICCARDO = " << align_params[17] << "\n"
-		     << "SPATIAL DISTANCE = " << std::fixed << std::setprecision(3) << sqrt(pow(dx_,2)+pow(dy_,2)+pow(dz_,2)) << "\n"
-		     << "Trans vect X : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.xx() << " / SURVEY RICCARDO = " << align_params[21] << "\n"
-		     << "Trans vect Y : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.xy() << " / SURVEY RICCARDO = " << align_params[22] << "\n"
-		     << "Trans vect Z : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.xz() << " / SURVEY RICCARDO = " << align_params[23] << "\n" 
-		     << "Long vect X : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.yx() << " / SURVEY RICCARDO = " << align_params[24] << "\n"	
-		     << "Long vect Y : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.yy() << " / SURVEY RICCARDO = " << align_params[25] << "\n"  
-		     << "Long vect Z : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.yz() << " / SURVEY RICCARDO = " << align_params[26] << "\n"
-		     << "Norm vect X : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.zx() << " / SURVEY RICCARDO = " << align_params[18] << "\n"
-		     << "Norm vect Y : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.zy() << " / SURVEY RICCARDO = " << align_params[19] << "\n" 
-		     << "Norm vect Z : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.zz() << " / SURVEY RICCARDO = " << align_params[20]; 
-		      // }
-		  }
-		}
-	      }
-	    }	  
-	  } 
-   //}
-  edm::LogInfo("TrackerAlignment") << "Done!";
 
+      int thecomparison = (int)locPos[1] - (int)(*iGeomDet).rawId();
+      if (thecomparison == 0) {
+        for (std::vector<AlignTransformErrorExtended>::const_iterator it = alignErrors.begin(); it != alignErrors.end();
+             it++) {
+          if ((*it).rawId() == (*iGeomDet).rawId()) {
+            CLHEP::HepRotation fromAngles = (*iGeomDet).rotation();
+            align::RotationType rotation(fromAngles.xx(),
+                                         fromAngles.xy(),
+                                         fromAngles.xz(),
+                                         fromAngles.yx(),
+                                         fromAngles.yy(),
+                                         fromAngles.yz(),
+                                         fromAngles.zx(),
+                                         fromAngles.zy(),
+                                         fromAngles.zz());
+
+            Id_ = (*iGeomDet).rawId();
+            dx_ = (*iGeomDet).translation().x() - align_params[15];
+            dy_ = (*iGeomDet).translation().y() - align_params[16];
+            dz_ = (*iGeomDet).translation().z() - align_params[17];
+            dtx_ = rotation.xx() - align_params[21];
+            dty_ = rotation.xy() - align_params[22];
+            dtz_ = rotation.xz() - align_params[23];
+            dkx_ = rotation.yx() - align_params[24];
+            dky_ = rotation.yy() - align_params[25];
+            dkz_ = rotation.yz() - align_params[26];
+            dnx_ = rotation.zx() - align_params[18];
+            dny_ = rotation.zy() - align_params[19];
+            dnz_ = rotation.zz() - align_params[20];
+            CLHEP::HepSymMatrix errMat = (*it).matrix();
+            errx_ = sqrt(errMat[0][0]);
+            erry_ = sqrt(errMat[1][1]);
+            errz_ = sqrt(errMat[2][2]);
+
+            theTree->Fill();
+
+            // if (dkx_ > 0.04) {
+            edm::LogInfo("TrackerAlignment")
+                << "DetId = " << Id_ << "\n"
+                << "DetId decodified = " << locPos[0] << " " << locPos[2] << " " << locPos[3] << " " << locPos[4] << " "
+                << locPos[5] << " " << locPos[6] << "\n"
+                << "X pos : TRACKER_MOVED = " << std::fixed << std::setprecision(2) << (*iGeomDet).translation().x()
+                << " / SURVEY RICCARDO = " << align_params[15] << "\n"
+                << "Y pos : TRACKER_MOVED = " << std::fixed << std::setprecision(2) << (*iGeomDet).translation().y()
+                << " / SURVEY RICCARDO = " << align_params[16] << "\n"
+                << "Z pos : TRACKER_MOVED = " << std::fixed << std::setprecision(2) << (*iGeomDet).translation().z()
+                << " / SURVEY RICCARDO = " << align_params[17] << "\n"
+                << "SPATIAL DISTANCE = " << std::fixed << std::setprecision(3)
+                << sqrt(pow(dx_, 2) + pow(dy_, 2) + pow(dz_, 2)) << "\n"
+                << "Trans vect X : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.xx()
+                << " / SURVEY RICCARDO = " << align_params[21] << "\n"
+                << "Trans vect Y : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.xy()
+                << " / SURVEY RICCARDO = " << align_params[22] << "\n"
+                << "Trans vect Z : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.xz()
+                << " / SURVEY RICCARDO = " << align_params[23] << "\n"
+                << "Long vect X : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.yx()
+                << " / SURVEY RICCARDO = " << align_params[24] << "\n"
+                << "Long vect Y : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.yy()
+                << " / SURVEY RICCARDO = " << align_params[25] << "\n"
+                << "Long vect Z : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.yz()
+                << " / SURVEY RICCARDO = " << align_params[26] << "\n"
+                << "Norm vect X : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.zx()
+                << " / SURVEY RICCARDO = " << align_params[18] << "\n"
+                << "Norm vect Y : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.zy()
+                << " / SURVEY RICCARDO = " << align_params[19] << "\n"
+                << "Norm vect Z : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.zz()
+                << " / SURVEY RICCARDO = " << align_params[20];
+            // }
+          }
+        }
+      }
+    }
+  }
+  //}
+  edm::LogInfo("TrackerAlignment") << "Done!";
 }
 
 //define this as a plug-in
diff --git a/Alignment/SurveyAnalysis/test/TestConverter2.cpp b/Alignment/SurveyAnalysis/test/TestConverter2.cpp
index c044a1f74b9d2..2ed5dffb869b3 100644
--- a/Alignment/SurveyAnalysis/test/TestConverter2.cpp
+++ b/Alignment/SurveyAnalysis/test/TestConverter2.cpp
@@ -2,7 +2,7 @@
 //
 // Package:    TestConverter2
 // Class:      TestConverter2
-// 
+//
 //
 // Description: Module to test the SurveyConverter software
 //
@@ -11,7 +11,6 @@
 //         Created:  March 16, 2006
 //
 
-
 // system include files
 #include <string>
 #include "TTree.h"
@@ -32,9 +31,9 @@
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 
 #include "CondFormats/Alignment/interface/Alignments.h"
-#include <boost/cstdint.hpp> 
+#include <boost/cstdint.hpp>
 #include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
-#include "CLHEP/Vector/RotationInterfaces.h" 
+#include "CLHEP/Vector/RotationInterfaces.h"
 #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h"
 #include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h"
 
@@ -48,215 +47,208 @@
 using namespace std;
 
 class TestConverter2 : public edm::EDAnalyzer {
-
 public:
-  explicit TestConverter2( const edm::ParameterSet& );
+  explicit TestConverter2(const edm::ParameterSet&);
   ~TestConverter2();
-  
-  virtual void analyze( const edm::Event&, const edm::EventSetup& );
+
+  virtual void analyze(const edm::Event&, const edm::EventSetup&);
+
 private:
   // ----------member data ---------------------------
   TTree* theTree;
   TFile* theFile;
   edm::ParameterSet theParameterSet;
-  float dx_,dy_,dz_;
-  float dtx_,dty_,dtz_;
-  float dkx_,dky_,dkz_;
-  float dnx_,dny_,dnz_;
-  float errx_,erry_,errz_; 
+  float dx_, dy_, dz_;
+  float dtx_, dty_, dtz_;
+  float dkx_, dky_, dkz_;
+  float dnx_, dny_, dnz_;
+  float errx_, erry_, errz_;
   int subdid_, fwbw_, layerdisk_, frontback_, stringrod_, petal_, module_;
   // TRotMatrix* rot_;
-
 };
 
 //
 // constructors and destructor
 //
-TestConverter2::TestConverter2( const edm::ParameterSet& iConfig ) :
-  theParameterSet( iConfig )
-{ 
-  
+TestConverter2::TestConverter2(const edm::ParameterSet& iConfig) : theParameterSet(iConfig) {
   // Open root file and define tree
-  std::string fileName = theParameterSet.getUntrackedParameter<std::string>("fileName","test.root");
-  theFile = new TFile( fileName.c_str(), "RECREATE" );
-  theTree = new TTree( "theTree", "Detector units positions" );
-  
-  theTree->Branch("subDetId",     &subdid_,     "subDetId/I"     );
-  theTree->Branch("Fw_Bw",        &fwbw_,       "Fw_Bw/I"        );
-  theTree->Branch("FrBa_InEx",    &frontback_,  "FrBa_inEx/I"    );
-  theTree->Branch("LayerDisk",    &layerdisk_,  "LayerDisk/I"    );
-  theTree->Branch("Petal",        &petal_,      "Petal/I"        );
-  theTree->Branch("StRingRod",    &stringrod_,  "StRingRod/I"    );
-  theTree->Branch("Module",       &module_,     "Module/I"       );
-  theTree->Branch("dx",     &dx_,     "dx/F"     );
-  theTree->Branch("dy",     &dy_,     "dy/F"     );
-  theTree->Branch("dz",     &dz_,     "dz/F"     );
-  theTree->Branch("dtx",    &dtx_,    "dtx/F"    );
-  theTree->Branch("dty",    &dty_,    "dty/F"    );
-  theTree->Branch("dtz",    &dtz_,    "dtz/F"    );
-  theTree->Branch("dkx",    &dkx_,    "dkx/F"    );
-  theTree->Branch("dky",    &dky_,    "dky/F"    );
-  theTree->Branch("dkz",    &dkz_,    "dkz/F"    );
-  theTree->Branch("dnx",    &dnx_,    "dnx/F"    );
-  theTree->Branch("dny",    &dny_,    "dny/F"    );
-  theTree->Branch("dnz",    &dnz_,    "dnz/F"    ); 
-  theTree->Branch("errx",   &errx_,   "errx/F"   );
-  theTree->Branch("erry",   &erry_,   "erry/F"   );
-  theTree->Branch("errz",   &errz_,   "errz/F"   );
+  std::string fileName = theParameterSet.getUntrackedParameter<std::string>("fileName", "test.root");
+  theFile = new TFile(fileName.c_str(), "RECREATE");
+  theTree = new TTree("theTree", "Detector units positions");
+
+  theTree->Branch("subDetId", &subdid_, "subDetId/I");
+  theTree->Branch("Fw_Bw", &fwbw_, "Fw_Bw/I");
+  theTree->Branch("FrBa_InEx", &frontback_, "FrBa_inEx/I");
+  theTree->Branch("LayerDisk", &layerdisk_, "LayerDisk/I");
+  theTree->Branch("Petal", &petal_, "Petal/I");
+  theTree->Branch("StRingRod", &stringrod_, "StRingRod/I");
+  theTree->Branch("Module", &module_, "Module/I");
+  theTree->Branch("dx", &dx_, "dx/F");
+  theTree->Branch("dy", &dy_, "dy/F");
+  theTree->Branch("dz", &dz_, "dz/F");
+  theTree->Branch("dtx", &dtx_, "dtx/F");
+  theTree->Branch("dty", &dty_, "dty/F");
+  theTree->Branch("dtz", &dtz_, "dtz/F");
+  theTree->Branch("dkx", &dkx_, "dkx/F");
+  theTree->Branch("dky", &dky_, "dky/F");
+  theTree->Branch("dkz", &dkz_, "dkz/F");
+  theTree->Branch("dnx", &dnx_, "dnx/F");
+  theTree->Branch("dny", &dny_, "dny/F");
+  theTree->Branch("dnz", &dnz_, "dnz/F");
+  theTree->Branch("errx", &errx_, "errx/F");
+  theTree->Branch("erry", &erry_, "erry/F");
+  theTree->Branch("errz", &errz_, "errz/F");
 }
 
-
-TestConverter2::~TestConverter2()
-{ 
-  
+TestConverter2::~TestConverter2() {
   theTree->Write();
   theFile->Close();
-  
 }
 
-
-void
-TestConverter2::analyze( const edm::Event& iEvent, const edm::EventSetup& iSetup )
-{
+void TestConverter2::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   //Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
   const TrackerTopology* const tTopo = tTopoHandle.product();
 
-
-   
   edm::LogInfo("TrackerAlignment") << "Starting!";
 
   //
   // Retrieve tracker geometry from event setup
   edm::ESHandle<TrackerGeometry> trackerGeometry;
-  iSetup.get<TrackerDigiGeometryRecord>().get( trackerGeometry );
+  iSetup.get<TrackerDigiGeometryRecord>().get(trackerGeometry);
 
   // Retrieve alignment[Error]s from DBase
   edm::ESHandle<Alignments> alignments;
-  iSetup.get<TrackerAlignmentRcd>().get( alignments );
+  iSetup.get<TrackerAlignmentRcd>().get(alignments);
   edm::ESHandle<AlignmentErrorsExtended> alignmentErrors;
-  iSetup.get<TrackerAlignmentErrorExtendedRcd>().get( alignmentErrors );
-  
+  iSetup.get<TrackerAlignmentErrorExtendedRcd>().get(alignmentErrors);
+
   auto alignErrors = alignmentErrors->m_alignError;
 
   // Now loop on detector units, and store difference position and orientation w.r.t. survey
-  
-   for ( auto iGeomDet = alignments->m_align.begin();
-		iGeomDet != alignments->m_align.end(); iGeomDet++ )
-	{
-	  
-	  for ( auto iDet = trackerGeometry->dets().begin();
-		iDet != trackerGeometry->dets().end(); iDet++ )
-	    {
-              
-	      // std::cout << (*iDet)->geographicalId().rawId() << " " << (*iGeomDet).rawId() << std::endl;
-              if ((*iDet)->geographicalId().rawId() == (*iGeomDet).rawId()) {
-                
-		for ( auto it = alignErrors.begin();
-		      it != alignErrors.end(); it++ ) {
-		  
-		  if ((*it).rawId() == (*iGeomDet).rawId()) {
-		  
-		    DetId thisId((*iGeomDet).rawId());
-		    
-		    if (thisId.subdetId() == int(StripSubdetector::TIB) ) {
-		      
-		      subdid_ = 3;
-		      layerdisk_ = tTopo->tibLayer(thisId); 
-		      std::vector<unsigned int> theString = tTopo->tibStringInfo(thisId);
-		      fwbw_ = theString[0];
-		      frontback_ = theString[1];
-		      stringrod_ = theString[2];
-		      petal_ = 0;
-		      module_ = tTopo->tibModule(thisId);
 
-		    } else if (thisId.subdetId() == int(StripSubdetector::TID) ) {
-		      
-		      subdid_ = 4;
-		      layerdisk_ = tTopo->tidWheel(thisId); 
-		      std::vector<unsigned int> theModule = tTopo->tidModuleInfo(thisId);
-		      frontback_ = theModule[0];
-		      module_ = theModule[1];
-		      petal_ = 0;
-		      fwbw_ = tTopo->tidSide(thisId);
-		      stringrod_ = tTopo->tidRing(thisId);
-		     
-		    } else if (thisId.subdetId() == int(StripSubdetector::TOB) ) {
-		      
-		      subdid_ = 5;
-		      layerdisk_ = tTopo->tobLayer(thisId); 
-		      std::vector<unsigned int> theRod = tTopo->tobRodInfo(thisId);
-		      fwbw_ = theRod[0];
-		      stringrod_ = theRod[1];
-		      petal_ = 0;
-		      frontback_ = 0;
-		      module_ = tTopo->tobModule(thisId);
-		      
-		    } else if (thisId.subdetId() == int(StripSubdetector::TEC) ) {
-		      
-		      subdid_ = 6;
-		      layerdisk_ = tTopo->tecWheel(thisId); 
-		      std::vector<unsigned int> thePetal = tTopo->tecPetalInfo(thisId);
-		      frontback_ = thePetal[0];
-		      petal_ = thePetal[1];
-		      fwbw_ = tTopo->tecSide(thisId);
-		      stringrod_ = tTopo->tecRing(thisId);
-		      module_ = tTopo->tecModule(thisId);
-		         
-		    } else {
-		      std::cout << "WARNING!!! this DetId (" << thisId.rawId() << ") does not belong to SiStrip tracker" << std::endl;
-		      break;
-		    }
+  for (auto iGeomDet = alignments->m_align.begin(); iGeomDet != alignments->m_align.end(); iGeomDet++) {
+    for (auto iDet = trackerGeometry->dets().begin(); iDet != trackerGeometry->dets().end(); iDet++) {
+      // std::cout << (*iDet)->geographicalId().rawId() << " " << (*iGeomDet).rawId() << std::endl;
+      if ((*iDet)->geographicalId().rawId() == (*iGeomDet).rawId()) {
+        for (auto it = alignErrors.begin(); it != alignErrors.end(); it++) {
+          if ((*it).rawId() == (*iGeomDet).rawId()) {
+            DetId thisId((*iGeomDet).rawId());
+
+            if (thisId.subdetId() == int(StripSubdetector::TIB)) {
+              subdid_ = 3;
+              layerdisk_ = tTopo->tibLayer(thisId);
+              std::vector<unsigned int> theString = tTopo->tibStringInfo(thisId);
+              fwbw_ = theString[0];
+              frontback_ = theString[1];
+              stringrod_ = theString[2];
+              petal_ = 0;
+              module_ = tTopo->tibModule(thisId);
+
+            } else if (thisId.subdetId() == int(StripSubdetector::TID)) {
+              subdid_ = 4;
+              layerdisk_ = tTopo->tidWheel(thisId);
+              std::vector<unsigned int> theModule = tTopo->tidModuleInfo(thisId);
+              frontback_ = theModule[0];
+              module_ = theModule[1];
+              petal_ = 0;
+              fwbw_ = tTopo->tidSide(thisId);
+              stringrod_ = tTopo->tidRing(thisId);
+
+            } else if (thisId.subdetId() == int(StripSubdetector::TOB)) {
+              subdid_ = 5;
+              layerdisk_ = tTopo->tobLayer(thisId);
+              std::vector<unsigned int> theRod = tTopo->tobRodInfo(thisId);
+              fwbw_ = theRod[0];
+              stringrod_ = theRod[1];
+              petal_ = 0;
+              frontback_ = 0;
+              module_ = tTopo->tobModule(thisId);
+
+            } else if (thisId.subdetId() == int(StripSubdetector::TEC)) {
+              subdid_ = 6;
+              layerdisk_ = tTopo->tecWheel(thisId);
+              std::vector<unsigned int> thePetal = tTopo->tecPetalInfo(thisId);
+              frontback_ = thePetal[0];
+              petal_ = thePetal[1];
+              fwbw_ = tTopo->tecSide(thisId);
+              stringrod_ = tTopo->tecRing(thisId);
+              module_ = tTopo->tecModule(thisId);
+
+            } else {
+              std::cout << "WARNING!!! this DetId (" << thisId.rawId() << ") does not belong to SiStrip tracker"
+                        << std::endl;
+              break;
+            }
+
+            // CLHEP::HepRotation fromAngles( (*iGeomDet).eulerAngles()  );
+            CLHEP::HepRotation fromAngles((*iGeomDet).rotation());
+            align::RotationType rotation(fromAngles.xx(),
+                                         fromAngles.xy(),
+                                         fromAngles.xz(),
+                                         fromAngles.yx(),
+                                         fromAngles.yy(),
+                                         fromAngles.yz(),
+                                         fromAngles.zx(),
+                                         fromAngles.zy(),
+                                         fromAngles.zz());
+
+            dx_ = (*iGeomDet).translation().x() - (*iDet)->position().x();
+            dy_ = (*iGeomDet).translation().y() - (*iDet)->position().y();
+            dz_ = (*iGeomDet).translation().z() - (*iDet)->position().z();
+            dtx_ = rotation.xx() - (*iDet)->rotation().xx();
+            dty_ = rotation.xy() - (*iDet)->rotation().xy();
+            dtz_ = rotation.xz() - (*iDet)->rotation().xz();
+            dkx_ = rotation.yx() - (*iDet)->rotation().yx();
+            dky_ = rotation.yy() - (*iDet)->rotation().yy();
+            dkz_ = rotation.yz() - (*iDet)->rotation().yz();
+            dnx_ = rotation.zx() - (*iDet)->rotation().zx();
+            dny_ = rotation.zy() - (*iDet)->rotation().zy();
+            dnz_ = rotation.zz() - (*iDet)->rotation().zz();
+            CLHEP::HepSymMatrix errMat = (*it).matrix();
+            errx_ = sqrt(errMat[0][0]);
+            erry_ = sqrt(errMat[1][1]);
+            errz_ = sqrt(errMat[2][2]);
+
+            theTree->Fill();
+
+            cout << "DetId = " << (*iGeomDet).rawId() << " " << endl;
+            cout << "DetId decodified = " << subdid_ << " " << fwbw_ << " " << frontback_ << " " << layerdisk_ << " "
+                 << stringrod_ << " " << petal_ << " " << module_ << endl;
+            cout << "X pos : TRACKER_MOVED = " << std::fixed << std::setprecision(2) << (*iGeomDet).translation().x()
+                 << " / TRACKER_ORIGINAL = " << (*iDet)->position().x() << endl;
+            cout << "Y pos : TRACKER_MOVED = " << std::fixed << std::setprecision(2) << (*iGeomDet).translation().y()
+                 << " / TRACKER_ORIGINAL = " << (*iDet)->position().y() << endl;
+            cout << "Z pos : TRACKER_MOVED = " << std::fixed << std::setprecision(2) << (*iGeomDet).translation().z()
+                 << " / TRACKER_ORIGINAL = " << (*iDet)->position().z() << endl;
+            cout << "SPATIAL DISTANCE = " << std::fixed << std::setprecision(3)
+                 << sqrt(pow(dx_, 2) + pow(dy_, 2) + pow(dz_, 2)) << endl;
+            cout << "Trans vect X : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.xx()
+                 << " / TRACKER_ORIGINAL = " << (*iDet)->rotation().xx() << endl;
+            cout << "Trans vect Y : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.xy()
+                 << " / TRACKER_ORIGINAL = " << (*iDet)->rotation().xy() << endl;
+            cout << "Trans vect Z : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.xz()
+                 << " / TRACKER_ORIGINAL = " << (*iDet)->rotation().xz() << endl;
+            cout << "Long vect X : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.yx()
+                 << " / TRACKER_ORIGINAL = " << (*iDet)->rotation().yx() << endl;
+            cout << "Long vect Y : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.yy()
+                 << " / TRACKER_ORIGINAL = " << (*iDet)->rotation().yy() << endl;
+            cout << "Long vect Z : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.yz()
+                 << " / TRACKER_ORIGINAL = " << (*iDet)->rotation().yz() << endl;
+            cout << "Norm vect X : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.zx()
+                 << " / TRACKER_ORIGINAL = " << (*iDet)->rotation().zx() << endl;
+            cout << "Norm vect Y : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.zy()
+                 << " / TRACKER_ORIGINAL = " << (*iDet)->rotation().zy() << endl;
+            cout << "Norm vect Z : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.zz()
+                 << " / TRACKER_ORIGINAL = " << (*iDet)->rotation().zz() << endl;
+          }
+        }
+      }
+    }
+  }
 
-		    // CLHEP::HepRotation fromAngles( (*iGeomDet).eulerAngles()  );
-                    CLHEP::HepRotation fromAngles( (*iGeomDet).rotation()  );
-		    align::RotationType rotation( fromAngles.xx(), fromAngles.xy(), fromAngles.xz(),
-						    fromAngles.yx(), fromAngles.yy(), fromAngles.yz(),
-						    fromAngles.zx(), fromAngles.zy(), fromAngles.zz() );
-		    
-		    dx_      = (*iGeomDet).translation().x() - (*iDet)->position().x(); 
-		    dy_      = (*iGeomDet).translation().y() - (*iDet)->position().y();
-		    dz_      = (*iGeomDet).translation().z() - (*iDet)->position().z();
-		    dtx_     = rotation.xx() - (*iDet)->rotation().xx();
-		    dty_     = rotation.xy() - (*iDet)->rotation().xy();
-		    dtz_     = rotation.xz() - (*iDet)->rotation().xz();
-		    dkx_     = rotation.yx() - (*iDet)->rotation().yx();
-		    dky_     = rotation.yy() - (*iDet)->rotation().yy();
-		    dkz_     = rotation.yz() - (*iDet)->rotation().yz();
-		    dnx_     = rotation.zx() - (*iDet)->rotation().zx();
-		    dny_     = rotation.zy() - (*iDet)->rotation().zy();
-		    dnz_     = rotation.zz() - (*iDet)->rotation().zz();
-                    CLHEP::HepSymMatrix errMat = (*it).matrix();
-                    errx_    = sqrt(errMat[0][0]); 
-		    erry_    = sqrt(errMat[1][1]);
-		    errz_    = sqrt(errMat[2][2]); 
-		    
-		    theTree->Fill();
-		    
-		    cout << "DetId = " << (*iGeomDet).rawId() << " " << endl;
-		    cout << "DetId decodified = " << subdid_ << " " << fwbw_ << " " << frontback_ << " " << layerdisk_ << " " << stringrod_ << " " << petal_ << " " << module_ << endl;
-		    cout << "X pos : TRACKER_MOVED = " << std::fixed << std::setprecision(2) << (*iGeomDet).translation().x() << " / TRACKER_ORIGINAL = " << (*iDet)->position().x() << endl;
-		    cout << "Y pos : TRACKER_MOVED = " << std::fixed << std::setprecision(2) << (*iGeomDet).translation().y() << " / TRACKER_ORIGINAL = " << (*iDet)->position().y() << endl;
-		    cout << "Z pos : TRACKER_MOVED = " << std::fixed << std::setprecision(2) << (*iGeomDet).translation().z() << " / TRACKER_ORIGINAL = " << (*iDet)->position().z() << endl;
-		    cout << "SPATIAL DISTANCE = " << std::fixed << std::setprecision(3) << sqrt(pow(dx_,2)+pow(dy_,2)+pow(dz_,2)) << endl;
-		    cout << "Trans vect X : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.xx() << " / TRACKER_ORIGINAL = " << (*iDet)->rotation().xx() << endl;
-		    cout << "Trans vect Y : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.xy() << " / TRACKER_ORIGINAL = " << (*iDet)->rotation().xy() << endl;
-		    cout << "Trans vect Z : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.xz() << " / TRACKER_ORIGINAL = " << (*iDet)->rotation().xz() << endl; 
-		    cout << "Long vect X : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.yx() << " / TRACKER_ORIGINAL = " << (*iDet)->rotation().yx() << endl;	
-		    cout << "Long vect Y : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.yy() << " / TRACKER_ORIGINAL = " << (*iDet)->rotation().yy() << endl;  
-		    cout << "Long vect Z : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.yz() << " / TRACKER_ORIGINAL = " << (*iDet)->rotation().yz() << endl;
-		    cout << "Norm vect X : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.zx() << " / TRACKER_ORIGINAL = " << (*iDet)->rotation().zx() << endl;
-		    cout << "Norm vect Y : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.zy() << " / TRACKER_ORIGINAL = " << (*iDet)->rotation().zy() << endl; 
-		    cout << "Norm vect Z : TRACKER_MOVED = " << std::fixed << std::setprecision(5) << rotation.zz() << " / TRACKER_ORIGINAL = " << (*iDet)->rotation().zz() << endl; 
-		  }
-		}
-	      }
-	    }
-	}	   
-   
   edm::LogInfo("TrackerAlignment") << "Done!";
-
 }
 
 //define this as a plug-in
diff --git a/Alignment/SurveyAnalysis/test/TestIdealGeometry.cpp b/Alignment/SurveyAnalysis/test/TestIdealGeometry.cpp
index b542a246138c6..ee702bd6cdbc9 100644
--- a/Alignment/SurveyAnalysis/test/TestIdealGeometry.cpp
+++ b/Alignment/SurveyAnalysis/test/TestIdealGeometry.cpp
@@ -2,7 +2,7 @@
 //
 // Package:    TestIdealGeometry
 // Class:      TestIdealGeometry
-// 
+//
 //
 // Description: Module to test the SurveyConverter software
 //
@@ -11,7 +11,6 @@
 //         Created:  March 16, 2006
 //
 
-
 // system include files
 #include "TTree.h"
 #include "TFile.h"
@@ -47,26 +46,26 @@
 using namespace std;
 
 class TestIdealGeometry : public edm::EDAnalyzer {
-
-  typedef SurveyDataReader::MapType    MapType;
-  typedef SurveyDataReader::PairType   PairType;
-  typedef SurveyDataReader::MapTypeOr  MapTypeOr;
+  typedef SurveyDataReader::MapType MapType;
+  typedef SurveyDataReader::PairType PairType;
+  typedef SurveyDataReader::MapTypeOr MapTypeOr;
   typedef SurveyDataReader::PairTypeOr PairTypeOr;
 
 public:
-  explicit TestIdealGeometry( const edm::ParameterSet& );
+  explicit TestIdealGeometry(const edm::ParameterSet&);
   ~TestIdealGeometry();
-  
-  virtual void analyze( const edm::Event&, const edm::EventSetup& );
+
+  virtual void analyze(const edm::Event&, const edm::EventSetup&);
+
 private:
   // ----------member data ---------------------------
   TTree* theTree;
   TFile* theFile;
   edm::ParameterSet theParameterSet;
-  float dx_,dy_,dz_;
-  float dtx_,dty_,dtz_;
-  float dkx_,dky_,dkz_;
-  float dnx_,dny_,dnz_;
+  float dx_, dy_, dz_;
+  float dtx_, dty_, dtz_;
+  float dkx_, dky_, dkz_;
+  float dnx_, dny_, dnz_;
   int Id_;
   // TRotMatrix* rot_;
   static const int NFILES = 2;
@@ -75,43 +74,33 @@ class TestIdealGeometry : public edm::EDAnalyzer {
 //
 // constructors and destructor
 //
-TestIdealGeometry::TestIdealGeometry( const edm::ParameterSet& iConfig ) :
-  theParameterSet( iConfig )
-{ 
-  
+TestIdealGeometry::TestIdealGeometry(const edm::ParameterSet& iConfig) : theParameterSet(iConfig) {
   // Open root file and define tree
-  std::string fileName = theParameterSet.getUntrackedParameter<std::string>("fileName","testideal.root");
-  theFile = new TFile( fileName.c_str(), "RECREATE" );
-  theTree = new TTree( "theTree", "Detector units positions" );
-  
-  theTree->Branch("Id",     &Id_,     "Id/I"     );
-  theTree->Branch("dx",     &dx_,     "dx/F"     );
-  theTree->Branch("dy",     &dy_,     "dy/F"     );
-  theTree->Branch("dz",     &dz_,     "dz/F"     );
-  theTree->Branch("dtx",    &dtx_,    "dtx/F"    );
-  theTree->Branch("dty",    &dty_,    "dty/F"    );
-  theTree->Branch("dtz",    &dtz_,    "dtz/F"    );
-  theTree->Branch("dkx",    &dkx_,    "dkx/F"    );
-  theTree->Branch("dky",    &dky_,    "dky/F"    );
-  theTree->Branch("dkz",    &dkz_,    "dkz/F"    );
-  theTree->Branch("dnx",    &dnx_,    "dnx/F"    );
-  theTree->Branch("dny",    &dny_,    "dny/F"    );
-  theTree->Branch("dnz",    &dnz_,    "dnz/F"    ); 
+  std::string fileName = theParameterSet.getUntrackedParameter<std::string>("fileName", "testideal.root");
+  theFile = new TFile(fileName.c_str(), "RECREATE");
+  theTree = new TTree("theTree", "Detector units positions");
+
+  theTree->Branch("Id", &Id_, "Id/I");
+  theTree->Branch("dx", &dx_, "dx/F");
+  theTree->Branch("dy", &dy_, "dy/F");
+  theTree->Branch("dz", &dz_, "dz/F");
+  theTree->Branch("dtx", &dtx_, "dtx/F");
+  theTree->Branch("dty", &dty_, "dty/F");
+  theTree->Branch("dtz", &dtz_, "dtz/F");
+  theTree->Branch("dkx", &dkx_, "dkx/F");
+  theTree->Branch("dky", &dky_, "dky/F");
+  theTree->Branch("dkz", &dkz_, "dkz/F");
+  theTree->Branch("dnx", &dnx_, "dnx/F");
+  theTree->Branch("dny", &dny_, "dny/F");
+  theTree->Branch("dnz", &dnz_, "dnz/F");
 }
 
-
-TestIdealGeometry::~TestIdealGeometry()
-{ 
-  
+TestIdealGeometry::~TestIdealGeometry() {
   theTree->Write();
   theFile->Close();
-  
 }
 
-
-void
-TestIdealGeometry::analyze( const edm::Event& iEvent, const edm::EventSetup& iSetup )
-{
+void TestIdealGeometry::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   //Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
@@ -121,21 +110,21 @@ TestIdealGeometry::analyze( const edm::Event& iEvent, const edm::EventSetup& iSe
 
   //
   // Read in the survey information from the text files
-  // 
-  edm::ParameterSet textFiles = theParameterSet.getParameter<edm::ParameterSet>( "textFileNames" );
-  std::string textFileNames[NFILES]; 
-  std::string fileType[NFILES];    
-  textFileNames[0] = textFiles.getUntrackedParameter<std::string>("forTIB","NONE");  
+  //
+  edm::ParameterSet textFiles = theParameterSet.getParameter<edm::ParameterSet>("textFileNames");
+  std::string textFileNames[NFILES];
+  std::string fileType[NFILES];
+  textFileNames[0] = textFiles.getUntrackedParameter<std::string>("forTIB", "NONE");
   fileType[0] = "TIB";
-  textFileNames[1] = textFiles.getUntrackedParameter<std::string>("forTID","NONE");
+  textFileNames[1] = textFiles.getUntrackedParameter<std::string>("forTID", "NONE");
   fileType[1] = "TID";
 
   SurveyDataReader dataReader;
-  for (int ii=0 ; ii<NFILES ;ii++) {
-    if ( textFileNames[ii] == "NONE" )
+  for (int ii = 0; ii < NFILES; ii++) {
+    if (textFileNames[ii] == "NONE")
       throw cms::Exception("BadConfig") << fileType[ii] << " input file not found in configuration";
-    dataReader.readFile( textFileNames[ii], fileType[ii], tTopo );
-  } 
+    dataReader.readFile(textFileNames[ii], fileType[ii], tTopo);
+  }
 
   edm::LogInfo("TrackerAlignment") << "Files read";
 
@@ -147,7 +136,7 @@ TestIdealGeometry::analyze( const edm::Event& iEvent, const edm::EventSetup& iSe
   // Retrieve tracker geometry from event setup
   //
   edm::ESHandle<TrackerGeometry> trackerGeometry;
-  iSetup.get<TrackerDigiGeometryRecord>().get( trackerGeometry );
+  iSetup.get<TrackerDigiGeometryRecord>().get(trackerGeometry);
 
   // Retrieve alignment[Error]s from DBase
   // edm::ESHandle<Alignments> alignments;
@@ -155,93 +144,98 @@ TestIdealGeometry::analyze( const edm::Event& iEvent, const edm::EventSetup& iSe
   // edm::ESHandle<AlignmentErrorsExtended> alignmentErrors;
   // iSetup.get<TrackerAlignmentErrorExtendedRcd>().get( alignmentErrors );
 
-  int countDet = 0; 
+  int countDet = 0;
 
   // Now loop on detector units, and store difference position and orientation w.r.t. survey
-  for ( auto iGeomDet = trackerGeometry->dets().begin();
-  		iGeomDet != trackerGeometry->dets().end(); iGeomDet++ )
-    // for (auto iGeomDet = alignments->m_align.begin();
-    //	iGeomDet != alignments->m_align.end(); iGeomDet++ )
-	{
-          
-	  if (countDet == 0) {  // Enter only once for double-sided dets
-
-            countDet++;
-	    unsigned int comparisonVect[6] = {0,0,0,0,0,0};
-	    
-	    if (((*iGeomDet)->geographicalId()).subdetId() == int(StripSubdetector::TIB)) {
-	      
-	      comparisonVect[0] = int(StripSubdetector::TIB);
-	      
-	      comparisonVect[1] = tTopo->tibLayer((*iGeomDet)->geographicalId());
-              if (comparisonVect[1] < 3) countDet = countDet + 2;  
-	      std::vector<unsigned int> theString = tTopo->tibStringInfo((*iGeomDet)->geographicalId());
-	      comparisonVect[2] = theString[0];
-	      comparisonVect[3] = theString[1];
-	      comparisonVect[4] = theString[2];
-	      comparisonVect[5] = tTopo->tibModule((*iGeomDet)->geographicalId());
-	      
-	    } else if (((*iGeomDet)->geographicalId()).subdetId() == int(StripSubdetector::TID)) {
-	      
-	      comparisonVect[0] = int(StripSubdetector::TID);
-	      
-	      comparisonVect[1] = tTopo->tidSide((*iGeomDet)->geographicalId());
-	      comparisonVect[2] = tTopo->tidWheel((*iGeomDet)->geographicalId());
-	      comparisonVect[3] = tTopo->tidRing((*iGeomDet)->geographicalId());
-              if (comparisonVect[3] < 3) countDet = countDet + 2; 
-	      std::vector<unsigned int> theModule = tTopo->tidModuleInfo((*iGeomDet)->geographicalId());
-	      comparisonVect[4] = theModule[0];
-	      comparisonVect[5] = theModule[1];
-	      
-	    }
-
-	    for ( MapTypeOr::const_iterator it = theSurveyMap.begin(); it != theSurveyMap.end(); it++ ) {
-	      std::vector<int> locPos = (it)->first;
-	      align::Scalars align_params = (it)->second;
-	      
-	      if (locPos[0] == int(comparisonVect[0]) &&
-		  locPos[1] == int(comparisonVect[1]) &&
-		  locPos[2] == int(comparisonVect[2]) &&
-		  locPos[3] == int(comparisonVect[3]) &&
-		  locPos[4] == int(comparisonVect[4]) &&
-		  locPos[5] == int(comparisonVect[5]) ) {
-		
-		Id_     = (*iGeomDet)->geographicalId().rawId();
-		cout << "DetId = " << Id_ << " " << endl;
-		cout << "DetId decodified = " << comparisonVect[0] << " " << comparisonVect[1] << " " << comparisonVect[2] << " " << comparisonVect[3] << " " << comparisonVect[4] << " " << comparisonVect[5] << endl;	      
-		dx_      = (*iGeomDet)->position().x() - align_params[0];
-		cout << "X pos : TRACKER_GEOM = " << std::fixed << std::setprecision(2) << (*iGeomDet)->position().x() << " / IDEAL RICCARDO = " << align_params[0] << endl; 
-		dy_      = (*iGeomDet)->position().y() - align_params[1];
-		cout << "Y pos : TRACKER_GEOM = " << std::fixed << std::setprecision(2) << (*iGeomDet)->position().y() << " / IDEAL RICCARDO = " << align_params[1] << endl;
-		dz_      = (*iGeomDet)->position().z() - align_params[2];
-		cout << "Z pos : TRACKER_GEOM = " << std::fixed << std::setprecision(2) << (*iGeomDet)->position().z() << " / IDEAL RICCARDO = " << align_params[2] << endl;
-		dtx_     = (*iGeomDet)->rotation().xx() - align_params[6];
-		cout << "Trans vect X : TRACKER_GEOM = " << std::fixed << std::setprecision(3) << (*iGeomDet)->rotation().xx() << " / IDEAL RICCARDO = " << align_params[6] << endl;
-		dty_     = (*iGeomDet)->rotation().xy() - align_params[7];
-		cout << "Trans vect Y : TRACKER_GEOM = " << std::fixed << std::setprecision(3) << (*iGeomDet)->rotation().xy() << " / IDEAL RICCARDO = " << align_params[7] << endl;
-		dtz_     = (*iGeomDet)->rotation().xz() - align_params[8];
-		cout << "Trans vect Z : TRACKER_GEOM = " << std::fixed << std::setprecision(3) << (*iGeomDet)->rotation().xz() << " / IDEAL RICCARDO = " << align_params[8] << endl; 	
-		dkx_     = (*iGeomDet)->rotation().yx() - align_params[9];
-		cout << "Long vect X : TRACKER_GEOM = " << std::fixed << std::setprecision(3) << (*iGeomDet)->rotation().yx() << " / IDEAL RICCARDO = " << align_params[9] << endl;
-		dky_     = (*iGeomDet)->rotation().yy() - align_params[10];
-		cout << "Long vect Y : TRACKER_GEOM = " << std::fixed << std::setprecision(3) << (*iGeomDet)->rotation().yy() << " / IDEAL RICCARDO = " << align_params[10] << endl;
-		dkz_     = (*iGeomDet)->rotation().yz() - align_params[11];
-		cout << "Long vect Z : TRACKER_GEOM = " << std::fixed << std::setprecision(3) << (*iGeomDet)->rotation().yz() << " / IDEAL RICCARDO = " << align_params[11] << endl;
-		dnx_     = (*iGeomDet)->rotation().zx() - align_params[3];
-		cout << "Norm vect X : TRACKER_GEOM = " << std::fixed << std::setprecision(3) << (*iGeomDet)->rotation().zx() << " / IDEAL RICCARDO = " << align_params[3] << endl;
-		dny_     = (*iGeomDet)->rotation().zy() - align_params[4];
-		cout << "Norm vect Y : TRACKER_GEOM = " << std::fixed << std::setprecision(3) << (*iGeomDet)->rotation().zy() << " / IDEAL RICCARDO = " << align_params[4] << endl;
-		dnz_     = (*iGeomDet)->rotation().zz() - align_params[5];
-		cout << "Norm vect Z : TRACKER_GEOM = " << std::fixed << std::setprecision(3) << (*iGeomDet)->rotation().zz() << " / IDEAL RICCARDO = " << align_params[5] << endl; 
-		theTree->Fill();
-	      }
-	    }	  
-	  } 
-	  countDet--;
-	}
-  
-  edm::LogInfo("TrackerAlignment") << "Done!";
+  for (auto iGeomDet = trackerGeometry->dets().begin(); iGeomDet != trackerGeometry->dets().end(); iGeomDet++)
+  // for (auto iGeomDet = alignments->m_align.begin();
+  //	iGeomDet != alignments->m_align.end(); iGeomDet++ )
+  {
+    if (countDet == 0) {  // Enter only once for double-sided dets
+
+      countDet++;
+      unsigned int comparisonVect[6] = {0, 0, 0, 0, 0, 0};
+
+      if (((*iGeomDet)->geographicalId()).subdetId() == int(StripSubdetector::TIB)) {
+        comparisonVect[0] = int(StripSubdetector::TIB);
+
+        comparisonVect[1] = tTopo->tibLayer((*iGeomDet)->geographicalId());
+        if (comparisonVect[1] < 3)
+          countDet = countDet + 2;
+        std::vector<unsigned int> theString = tTopo->tibStringInfo((*iGeomDet)->geographicalId());
+        comparisonVect[2] = theString[0];
+        comparisonVect[3] = theString[1];
+        comparisonVect[4] = theString[2];
+        comparisonVect[5] = tTopo->tibModule((*iGeomDet)->geographicalId());
+
+      } else if (((*iGeomDet)->geographicalId()).subdetId() == int(StripSubdetector::TID)) {
+        comparisonVect[0] = int(StripSubdetector::TID);
+
+        comparisonVect[1] = tTopo->tidSide((*iGeomDet)->geographicalId());
+        comparisonVect[2] = tTopo->tidWheel((*iGeomDet)->geographicalId());
+        comparisonVect[3] = tTopo->tidRing((*iGeomDet)->geographicalId());
+        if (comparisonVect[3] < 3)
+          countDet = countDet + 2;
+        std::vector<unsigned int> theModule = tTopo->tidModuleInfo((*iGeomDet)->geographicalId());
+        comparisonVect[4] = theModule[0];
+        comparisonVect[5] = theModule[1];
+      }
+
+      for (MapTypeOr::const_iterator it = theSurveyMap.begin(); it != theSurveyMap.end(); it++) {
+        std::vector<int> locPos = (it)->first;
+        align::Scalars align_params = (it)->second;
+
+        if (locPos[0] == int(comparisonVect[0]) && locPos[1] == int(comparisonVect[1]) &&
+            locPos[2] == int(comparisonVect[2]) && locPos[3] == int(comparisonVect[3]) &&
+            locPos[4] == int(comparisonVect[4]) && locPos[5] == int(comparisonVect[5])) {
+          Id_ = (*iGeomDet)->geographicalId().rawId();
+          cout << "DetId = " << Id_ << " " << endl;
+          cout << "DetId decodified = " << comparisonVect[0] << " " << comparisonVect[1] << " " << comparisonVect[2]
+               << " " << comparisonVect[3] << " " << comparisonVect[4] << " " << comparisonVect[5] << endl;
+          dx_ = (*iGeomDet)->position().x() - align_params[0];
+          cout << "X pos : TRACKER_GEOM = " << std::fixed << std::setprecision(2) << (*iGeomDet)->position().x()
+               << " / IDEAL RICCARDO = " << align_params[0] << endl;
+          dy_ = (*iGeomDet)->position().y() - align_params[1];
+          cout << "Y pos : TRACKER_GEOM = " << std::fixed << std::setprecision(2) << (*iGeomDet)->position().y()
+               << " / IDEAL RICCARDO = " << align_params[1] << endl;
+          dz_ = (*iGeomDet)->position().z() - align_params[2];
+          cout << "Z pos : TRACKER_GEOM = " << std::fixed << std::setprecision(2) << (*iGeomDet)->position().z()
+               << " / IDEAL RICCARDO = " << align_params[2] << endl;
+          dtx_ = (*iGeomDet)->rotation().xx() - align_params[6];
+          cout << "Trans vect X : TRACKER_GEOM = " << std::fixed << std::setprecision(3) << (*iGeomDet)->rotation().xx()
+               << " / IDEAL RICCARDO = " << align_params[6] << endl;
+          dty_ = (*iGeomDet)->rotation().xy() - align_params[7];
+          cout << "Trans vect Y : TRACKER_GEOM = " << std::fixed << std::setprecision(3) << (*iGeomDet)->rotation().xy()
+               << " / IDEAL RICCARDO = " << align_params[7] << endl;
+          dtz_ = (*iGeomDet)->rotation().xz() - align_params[8];
+          cout << "Trans vect Z : TRACKER_GEOM = " << std::fixed << std::setprecision(3) << (*iGeomDet)->rotation().xz()
+               << " / IDEAL RICCARDO = " << align_params[8] << endl;
+          dkx_ = (*iGeomDet)->rotation().yx() - align_params[9];
+          cout << "Long vect X : TRACKER_GEOM = " << std::fixed << std::setprecision(3) << (*iGeomDet)->rotation().yx()
+               << " / IDEAL RICCARDO = " << align_params[9] << endl;
+          dky_ = (*iGeomDet)->rotation().yy() - align_params[10];
+          cout << "Long vect Y : TRACKER_GEOM = " << std::fixed << std::setprecision(3) << (*iGeomDet)->rotation().yy()
+               << " / IDEAL RICCARDO = " << align_params[10] << endl;
+          dkz_ = (*iGeomDet)->rotation().yz() - align_params[11];
+          cout << "Long vect Z : TRACKER_GEOM = " << std::fixed << std::setprecision(3) << (*iGeomDet)->rotation().yz()
+               << " / IDEAL RICCARDO = " << align_params[11] << endl;
+          dnx_ = (*iGeomDet)->rotation().zx() - align_params[3];
+          cout << "Norm vect X : TRACKER_GEOM = " << std::fixed << std::setprecision(3) << (*iGeomDet)->rotation().zx()
+               << " / IDEAL RICCARDO = " << align_params[3] << endl;
+          dny_ = (*iGeomDet)->rotation().zy() - align_params[4];
+          cout << "Norm vect Y : TRACKER_GEOM = " << std::fixed << std::setprecision(3) << (*iGeomDet)->rotation().zy()
+               << " / IDEAL RICCARDO = " << align_params[4] << endl;
+          dnz_ = (*iGeomDet)->rotation().zz() - align_params[5];
+          cout << "Norm vect Z : TRACKER_GEOM = " << std::fixed << std::setprecision(3) << (*iGeomDet)->rotation().zz()
+               << " / IDEAL RICCARDO = " << align_params[5] << endl;
+          theTree->Fill();
+        }
+      }
+    }
+    countDet--;
+  }
 
+  edm::LogInfo("TrackerAlignment") << "Done!";
 }
 
 //define this as a plug-in
diff --git a/Alignment/SurveyAnalysis/test/TestIdealGeometry2.cpp b/Alignment/SurveyAnalysis/test/TestIdealGeometry2.cpp
index 9b16f65a51c81..82f35783fb082 100644
--- a/Alignment/SurveyAnalysis/test/TestIdealGeometry2.cpp
+++ b/Alignment/SurveyAnalysis/test/TestIdealGeometry2.cpp
@@ -2,7 +2,7 @@
 //
 // Package:    TestIdealGeometry2
 // Class:      TestIdealGeometry2
-// 
+//
 //
 // Description: Module to test the SurveyConverter software
 //
@@ -11,7 +11,6 @@
 //         Created:  March 16, 2006
 //
 
-
 // system include files
 #include <string>
 #include "TTree.h"
@@ -43,26 +42,26 @@
 //
 
 class TestIdealGeometry2 : public edm::EDAnalyzer {
-
-  typedef SurveyDataReader::MapType    MapType;
-  typedef SurveyDataReader::PairType   PairType;
-  typedef SurveyDataReader::MapTypeOr  MapTypeOr;
+  typedef SurveyDataReader::MapType MapType;
+  typedef SurveyDataReader::PairType PairType;
+  typedef SurveyDataReader::MapTypeOr MapTypeOr;
   typedef SurveyDataReader::PairTypeOr PairTypeOr;
 
 public:
-  explicit TestIdealGeometry2( const edm::ParameterSet& );
+  explicit TestIdealGeometry2(const edm::ParameterSet&);
   ~TestIdealGeometry2();
-  
-  virtual void analyze( const edm::Event&, const edm::EventSetup& );
+
+  virtual void analyze(const edm::Event&, const edm::EventSetup&);
+
 private:
   // ----------member data ---------------------------
   TTree* theTree;
   TFile* theFile;
   edm::ParameterSet theParameterSet;
-  float dx_,dy_,dz_;
-  float dtx_,dty_,dtz_;
-  float dkx_,dky_,dkz_;
-  float dnx_,dny_,dnz_;
+  float dx_, dy_, dz_;
+  float dtx_, dty_, dtz_;
+  float dkx_, dky_, dkz_;
+  float dnx_, dny_, dnz_;
   int Id_;
   // TRotMatrix* rot_;
 
@@ -72,43 +71,33 @@ class TestIdealGeometry2 : public edm::EDAnalyzer {
 //
 // constructors and destructor
 //
-TestIdealGeometry2::TestIdealGeometry2( const edm::ParameterSet& iConfig ) :
-  theParameterSet( iConfig )
-{ 
-  
+TestIdealGeometry2::TestIdealGeometry2(const edm::ParameterSet& iConfig) : theParameterSet(iConfig) {
   // Open root file and define tree
-  std::string fileName = theParameterSet.getUntrackedParameter<std::string>("fileName","testideal.root");
-  theFile = new TFile( fileName.c_str(), "RECREATE" );
-  theTree = new TTree( "theTree", "Detector units positions" );
-  
-  theTree->Branch("Id",     &Id_,     "Id/I"     );
-  theTree->Branch("dx",     &dx_,     "dx/F"     );
-  theTree->Branch("dy",     &dy_,     "dy/F"     );
-  theTree->Branch("dz",     &dz_,     "dz/F"     );
-  theTree->Branch("dtx",    &dtx_,    "dtx/F"    );
-  theTree->Branch("dty",    &dty_,    "dty/F"    );
-  theTree->Branch("dtz",    &dtz_,    "dtz/F"    );
-  theTree->Branch("dkx",    &dkx_,    "dkx/F"    );
-  theTree->Branch("dky",    &dky_,    "dky/F"    );
-  theTree->Branch("dkz",    &dkz_,    "dkz/F"    );
-  theTree->Branch("dnx",    &dnx_,    "dnx/F"    );
-  theTree->Branch("dny",    &dny_,    "dny/F"    );
-  theTree->Branch("dnz",    &dnz_,    "dnz/F"    ); 
+  std::string fileName = theParameterSet.getUntrackedParameter<std::string>("fileName", "testideal.root");
+  theFile = new TFile(fileName.c_str(), "RECREATE");
+  theTree = new TTree("theTree", "Detector units positions");
+
+  theTree->Branch("Id", &Id_, "Id/I");
+  theTree->Branch("dx", &dx_, "dx/F");
+  theTree->Branch("dy", &dy_, "dy/F");
+  theTree->Branch("dz", &dz_, "dz/F");
+  theTree->Branch("dtx", &dtx_, "dtx/F");
+  theTree->Branch("dty", &dty_, "dty/F");
+  theTree->Branch("dtz", &dtz_, "dtz/F");
+  theTree->Branch("dkx", &dkx_, "dkx/F");
+  theTree->Branch("dky", &dky_, "dky/F");
+  theTree->Branch("dkz", &dkz_, "dkz/F");
+  theTree->Branch("dnx", &dnx_, "dnx/F");
+  theTree->Branch("dny", &dny_, "dny/F");
+  theTree->Branch("dnz", &dnz_, "dnz/F");
 }
 
-
-TestIdealGeometry2::~TestIdealGeometry2()
-{ 
-  
+TestIdealGeometry2::~TestIdealGeometry2() {
   theTree->Write();
   theFile->Close();
-  
 }
 
-
-void
-TestIdealGeometry2::analyze( const edm::Event& iEvent, const edm::EventSetup& iSetup )
-{
+void TestIdealGeometry2::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   //Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
@@ -118,21 +107,21 @@ TestIdealGeometry2::analyze( const edm::Event& iEvent, const edm::EventSetup& iS
 
   //
   // Read in the survey information from the text files
-  // 
-  edm::ParameterSet textFiles = theParameterSet.getParameter<edm::ParameterSet>( "textFileNames" );
-  std::string textFileNames[NFILES]; 
-  std::string fileType[NFILES];    
-  textFileNames[0] = textFiles.getUntrackedParameter<std::string>("forTIB","NONE");  
+  //
+  edm::ParameterSet textFiles = theParameterSet.getParameter<edm::ParameterSet>("textFileNames");
+  std::string textFileNames[NFILES];
+  std::string fileType[NFILES];
+  textFileNames[0] = textFiles.getUntrackedParameter<std::string>("forTIB", "NONE");
   fileType[0] = "TIB";
-  textFileNames[1] = textFiles.getUntrackedParameter<std::string>("forTID","NONE");
+  textFileNames[1] = textFiles.getUntrackedParameter<std::string>("forTID", "NONE");
   fileType[1] = "TID";
 
   SurveyDataReader dataReader;
-  for (int ii=0 ; ii<NFILES ;ii++) {
-    if ( textFileNames[ii] == "NONE" )
+  for (int ii = 0; ii < NFILES; ii++) {
+    if (textFileNames[ii] == "NONE")
       throw cms::Exception("BadConfig") << fileType[ii] << " input file not found in configuration";
-    dataReader.readFile( textFileNames[ii], fileType[ii], tTopo );
-  } 
+    dataReader.readFile(textFileNames[ii], fileType[ii], tTopo);
+  }
 
   edm::LogInfo("TrackerAlignment") << "Files read";
 
@@ -148,101 +137,100 @@ TestIdealGeometry2::analyze( const edm::Event& iEvent, const edm::EventSetup& iS
 
   // Retrieve alignment[Error]s from DBase
   edm::ESHandle<Alignments> alignments;
-  iSetup.get<TrackerAlignmentRcd>().get( alignments );
+  iSetup.get<TrackerAlignmentRcd>().get(alignments);
   edm::ESHandle<AlignmentErrorsExtended> alignmentErrors;
-  iSetup.get<TrackerAlignmentErrorExtendedRcd>().get( alignmentErrors );
+  iSetup.get<TrackerAlignmentErrorExtendedRcd>().get(alignmentErrors);
   int countDet = 0;
 
   // Now loop on detector units, and store difference position and orientation w.r.t. survey
-  
-   for ( std::vector<AlignTransform>::const_iterator iGeomDet = alignments->m_align.begin();
-		iGeomDet != alignments->m_align.end(); iGeomDet++ )
-	{
-          
-          if (countDet == 0) countDet = countDet + 3;
-	  unsigned int comparisonVect[6] = {0,0,0,0,0,0};
-	  
-	  DetId thisId( (*iGeomDet).rawId() );
-	  if (thisId.subdetId() == int(StripSubdetector::TIB)) {
-	    
-	    comparisonVect[0] = int(StripSubdetector::TIB);
-	    
-	    comparisonVect[1] = tTopo->tibLayer(thisId);  
-            if (comparisonVect[1] < 3) {countDet--;} else {countDet = countDet - 3;}
-	    std::vector<unsigned int> theString = tTopo->tibStringInfo(thisId);
-	    comparisonVect[2] = theString[0];
-	    comparisonVect[3] = theString[1];
-	    comparisonVect[4] = theString[2];
-	    comparisonVect[5] = tTopo->tibModule(thisId);
-	    
-	  } else if (thisId.subdetId() == int(StripSubdetector::TID)) {
-	    
-	    comparisonVect[0] = int(StripSubdetector::TID);
-	    
-	    comparisonVect[1] = tTopo->tidSide(thisId);
-	    comparisonVect[2] = tTopo->tidWheel(thisId);
-	    comparisonVect[3] = tTopo->tidRing(thisId); 
-            if (comparisonVect[3] < 3) {countDet--;} else {countDet = countDet - 3;}
-	    std::vector<unsigned int> theModule = tTopo->tidModuleInfo(thisId);
-	    comparisonVect[4] = theModule[0];
-	    comparisonVect[5] = theModule[1];
-	    
-	  }
-	  
-	  if (countDet == 0) { // Store only r-phi for double-sided modules
-
-	    for ( MapTypeOr::const_iterator it = theSurveyMap.begin(); it != theSurveyMap.end(); it++ ) {
-	      const std::vector<int>& locPos = (it)->first;
-	      const align::Scalars& align_params = (it)->second;
-	      
-	      if (locPos[0] == int(comparisonVect[0]) &&
-		  locPos[1] == int(comparisonVect[1]) &&
-		  locPos[2] == int(comparisonVect[2]) &&
-		  locPos[3] == int(comparisonVect[3]) &&
-		  locPos[4] == int(comparisonVect[4]) &&
-		  locPos[5] == int(comparisonVect[5]) ) {
-	      
-		const CLHEP::HepRotation& rot = (*iGeomDet).rotation();
-		align::RotationType rotation( rot.xx(), rot.xy(), rot.xz(),
-					      rot.yx(), rot.yy(), rot.yz(),
-					      rot.zx(), rot.zy(), rot.zz() );
-		
-		Id_     = (*iGeomDet).rawId();
-		// cout << "DetId = " << Id_ << " " << endl;
-		// cout << "DetId decodified = " << comparisonVect[0] << " " << comparisonVect[1] << " " << comparisonVect[2] << " " << comparisonVect[3] << " " << comparisonVect[4] << " " << comparisonVect[5] << endl;	      
-		dx_      = (*iGeomDet).translation().x() - align_params[0];
-		// cout << "X pos : TRACKER_ALIGN = " << std::fixed << std::setprecision(2) << (*iGeomDet).translation().x() << " / IDEAL RICCARDO = " << align_params[0] << endl; 
-		dy_      = (*iGeomDet).translation().y() - align_params[1];
-		// cout << "Y pos : TRACKER_ALIGN = " << std::fixed << std::setprecision(2) << (*iGeomDet).translation().y() << " / IDEAL RICCARDO = " << align_params[1] << endl;
-		dz_      = (*iGeomDet).translation().z() - align_params[2];
-		// cout << "Z pos : TRACKER_ALIGN = " << std::fixed << std::setprecision(2) << (*iGeomDet).translation().z() << " / IDEAL RICCARDO = " << align_params[2] << endl;
-		// cout << "SPATIAL DISTANCE = " << std::fixed << std::setprecision(3) << sqrt(pow(dx_,2)+pow(dy_,2)+pow(dz_,2)) << endl;
-		dtx_     = rotation.xx() - align_params[6];
-		// cout << "Trans vect X : TRACKER_ALIGN = " << std::fixed << std::setprecision(3) << rotation.xx() << " / IDEAL RICCARDO = " << align_params[6] << endl;
-		dty_     = rotation.xy() - align_params[7];
-		// cout << "Trans vect Y : TRACKER_ALIGN = " << std::fixed << std::setprecision(3) << rotation.xy() << " / IDEAL RICCARDO = " << align_params[7] << endl;
-		dtz_     = rotation.xz() - align_params[8];
-		// cout << "Trans vect Z : TRACKER_ALIGN = " << std::fixed << std::setprecision(3) << rotation.xz() << " / IDEAL RICCARDO = " << align_params[8] << endl; 	
-		dkx_     = rotation.yx() - align_params[9];
-		// cout << "Long vect X : TRACKER_ALIGN = " << std::fixed << std::setprecision(3) << rotation.yx() << " / IDEAL RICCARDO = " << align_params[9] << endl;
-		dky_     = rotation.yy() - align_params[10];
-		// cout << "Long vect Y : TRACKER_ALIGN = " << std::fixed << std::setprecision(3) << rotation.yy() << " / IDEAL RICCARDO = " << align_params[10] << endl;
-		dkz_     = rotation.yz() - align_params[11];
-		// cout << "Long vect Z : TRACKER_ALIGN = " << std::fixed << std::setprecision(3) << rotation.yz() << " / IDEAL RICCARDO = " << align_params[11] << endl;
-		dnx_     = rotation.zx() - align_params[3];
-		// cout << "Norm vect X : TRACKER_ALIGN = " << std::fixed << std::setprecision(3) << rotation.zx() << " / IDEAL RICCARDO = " << align_params[3] << endl;
-		dny_     = rotation.zy() - align_params[4];
-		// cout << "Norm vect Y : TRACKER_ALIGN = " << std::fixed << std::setprecision(3) << rotation.zy() << " / IDEAL RICCARDO = " << align_params[4] << endl;
-		dnz_     = rotation.zz() - align_params[5];
-		// cout << "Norm vect Z : TRACKER_ALIGN = " << std::fixed << std::setprecision(3) << rotation.zz() << " / IDEAL RICCARDO = " << align_params[5] << endl; 
-		theTree->Fill();
-	      }
-	    }
-	  }	  
-	} 
-   
-  edm::LogInfo("TrackerAlignment") << "Done!";
 
+  for (std::vector<AlignTransform>::const_iterator iGeomDet = alignments->m_align.begin();
+       iGeomDet != alignments->m_align.end();
+       iGeomDet++) {
+    if (countDet == 0)
+      countDet = countDet + 3;
+    unsigned int comparisonVect[6] = {0, 0, 0, 0, 0, 0};
+
+    DetId thisId((*iGeomDet).rawId());
+    if (thisId.subdetId() == int(StripSubdetector::TIB)) {
+      comparisonVect[0] = int(StripSubdetector::TIB);
+
+      comparisonVect[1] = tTopo->tibLayer(thisId);
+      if (comparisonVect[1] < 3) {
+        countDet--;
+      } else {
+        countDet = countDet - 3;
+      }
+      std::vector<unsigned int> theString = tTopo->tibStringInfo(thisId);
+      comparisonVect[2] = theString[0];
+      comparisonVect[3] = theString[1];
+      comparisonVect[4] = theString[2];
+      comparisonVect[5] = tTopo->tibModule(thisId);
+
+    } else if (thisId.subdetId() == int(StripSubdetector::TID)) {
+      comparisonVect[0] = int(StripSubdetector::TID);
+
+      comparisonVect[1] = tTopo->tidSide(thisId);
+      comparisonVect[2] = tTopo->tidWheel(thisId);
+      comparisonVect[3] = tTopo->tidRing(thisId);
+      if (comparisonVect[3] < 3) {
+        countDet--;
+      } else {
+        countDet = countDet - 3;
+      }
+      std::vector<unsigned int> theModule = tTopo->tidModuleInfo(thisId);
+      comparisonVect[4] = theModule[0];
+      comparisonVect[5] = theModule[1];
+    }
+
+    if (countDet == 0) {  // Store only r-phi for double-sided modules
+
+      for (MapTypeOr::const_iterator it = theSurveyMap.begin(); it != theSurveyMap.end(); it++) {
+        const std::vector<int>& locPos = (it)->first;
+        const align::Scalars& align_params = (it)->second;
+
+        if (locPos[0] == int(comparisonVect[0]) && locPos[1] == int(comparisonVect[1]) &&
+            locPos[2] == int(comparisonVect[2]) && locPos[3] == int(comparisonVect[3]) &&
+            locPos[4] == int(comparisonVect[4]) && locPos[5] == int(comparisonVect[5])) {
+          const CLHEP::HepRotation& rot = (*iGeomDet).rotation();
+          align::RotationType rotation(
+              rot.xx(), rot.xy(), rot.xz(), rot.yx(), rot.yy(), rot.yz(), rot.zx(), rot.zy(), rot.zz());
+
+          Id_ = (*iGeomDet).rawId();
+          // cout << "DetId = " << Id_ << " " << endl;
+          // cout << "DetId decodified = " << comparisonVect[0] << " " << comparisonVect[1] << " " << comparisonVect[2] << " " << comparisonVect[3] << " " << comparisonVect[4] << " " << comparisonVect[5] << endl;
+          dx_ = (*iGeomDet).translation().x() - align_params[0];
+          // cout << "X pos : TRACKER_ALIGN = " << std::fixed << std::setprecision(2) << (*iGeomDet).translation().x() << " / IDEAL RICCARDO = " << align_params[0] << endl;
+          dy_ = (*iGeomDet).translation().y() - align_params[1];
+          // cout << "Y pos : TRACKER_ALIGN = " << std::fixed << std::setprecision(2) << (*iGeomDet).translation().y() << " / IDEAL RICCARDO = " << align_params[1] << endl;
+          dz_ = (*iGeomDet).translation().z() - align_params[2];
+          // cout << "Z pos : TRACKER_ALIGN = " << std::fixed << std::setprecision(2) << (*iGeomDet).translation().z() << " / IDEAL RICCARDO = " << align_params[2] << endl;
+          // cout << "SPATIAL DISTANCE = " << std::fixed << std::setprecision(3) << sqrt(pow(dx_,2)+pow(dy_,2)+pow(dz_,2)) << endl;
+          dtx_ = rotation.xx() - align_params[6];
+          // cout << "Trans vect X : TRACKER_ALIGN = " << std::fixed << std::setprecision(3) << rotation.xx() << " / IDEAL RICCARDO = " << align_params[6] << endl;
+          dty_ = rotation.xy() - align_params[7];
+          // cout << "Trans vect Y : TRACKER_ALIGN = " << std::fixed << std::setprecision(3) << rotation.xy() << " / IDEAL RICCARDO = " << align_params[7] << endl;
+          dtz_ = rotation.xz() - align_params[8];
+          // cout << "Trans vect Z : TRACKER_ALIGN = " << std::fixed << std::setprecision(3) << rotation.xz() << " / IDEAL RICCARDO = " << align_params[8] << endl;
+          dkx_ = rotation.yx() - align_params[9];
+          // cout << "Long vect X : TRACKER_ALIGN = " << std::fixed << std::setprecision(3) << rotation.yx() << " / IDEAL RICCARDO = " << align_params[9] << endl;
+          dky_ = rotation.yy() - align_params[10];
+          // cout << "Long vect Y : TRACKER_ALIGN = " << std::fixed << std::setprecision(3) << rotation.yy() << " / IDEAL RICCARDO = " << align_params[10] << endl;
+          dkz_ = rotation.yz() - align_params[11];
+          // cout << "Long vect Z : TRACKER_ALIGN = " << std::fixed << std::setprecision(3) << rotation.yz() << " / IDEAL RICCARDO = " << align_params[11] << endl;
+          dnx_ = rotation.zx() - align_params[3];
+          // cout << "Norm vect X : TRACKER_ALIGN = " << std::fixed << std::setprecision(3) << rotation.zx() << " / IDEAL RICCARDO = " << align_params[3] << endl;
+          dny_ = rotation.zy() - align_params[4];
+          // cout << "Norm vect Y : TRACKER_ALIGN = " << std::fixed << std::setprecision(3) << rotation.zy() << " / IDEAL RICCARDO = " << align_params[4] << endl;
+          dnz_ = rotation.zz() - align_params[5];
+          // cout << "Norm vect Z : TRACKER_ALIGN = " << std::fixed << std::setprecision(3) << rotation.zz() << " / IDEAL RICCARDO = " << align_params[5] << endl;
+          theTree->Fill();
+        }
+      }
+    }
+  }
+
+  edm::LogInfo("TrackerAlignment") << "Done!";
 }
 
 //define this as a plug-in
diff --git a/Alignment/TrackerAlignment/src/AlignableSiStripDet.cc b/Alignment/TrackerAlignment/src/AlignableSiStripDet.cc
index 84b4002b7db54..471bc3f84d377 100644
--- a/Alignment/TrackerAlignment/src/AlignableSiStripDet.cc
+++ b/Alignment/TrackerAlignment/src/AlignableSiStripDet.cc
@@ -112,8 +112,8 @@ void AlignableSiStripDet::consistifyAlignments()
 
 //   if (movement.mag2()) { // > 1.e-10) { 
 //     edm::LogWarning("Alignment") << "@SUB=consistifyAlignments" 
-//  				 << "Delta: " << movement.x() << " " << movement.y() << " " << movement.z()
-// 				 << "\nPos: " << oldPos.perp() << " " << oldPos.phi() << " " << oldPos.z();
+//                                  << "Delta: " << movement.x() << " " << movement.y() << " " << movement.z()
+//                                  << "\nPos: " << oldPos.perp() << " " << oldPos.phi() << " " << oldPos.z();
 //   }
 
 }
diff --git a/Alignment/TwoBodyDecay/interface/TwoBodyDecay.h b/Alignment/TwoBodyDecay/interface/TwoBodyDecay.h
index eb7ac4d6d9711..3935fd0e50c15 100644
--- a/Alignment/TwoBodyDecay/interface/TwoBodyDecay.h
+++ b/Alignment/TwoBodyDecay/interface/TwoBodyDecay.h
@@ -6,60 +6,55 @@
 
 /** /class TwoBodyDecay
  *
- *  Container-class for all information associated with a two-body decay (estimated parameters,
- *  chi2 of the fit, validity-flag).
+ *  Container-class for all information associated with a two-body decay
+ * (estimated parameters, chi2 of the fit, validity-flag).
  *
  *  /author Edmund Widl
  */
 
-
-class TwoBodyDecay
-{
-
+class TwoBodyDecay {
 public:
-
   typedef TwoBodyDecayParameters::ParameterName ParameterName;
 
-  TwoBodyDecay( void ) :
-    theDecayParameters(), theChi2( 0. ), theValidityFlag( false ),
-    thePrimaryMass( 0. ), thePrimaryWidth( 0. )  {}
+  TwoBodyDecay(void)
+      : theDecayParameters(), theChi2(0.), theValidityFlag(false), thePrimaryMass(0.), thePrimaryWidth(0.) {}
 
-  TwoBodyDecay( const TwoBodyDecayParameters &param, double chi2, bool valid, 
-		const TwoBodyDecayVirtualMeasurement &vm ) :
-    theDecayParameters( param ), theChi2( chi2 ), theValidityFlag( valid ),
-    thePrimaryMass( vm.primaryMass() ), thePrimaryWidth( vm.primaryWidth() ) {}
+  TwoBodyDecay(const TwoBodyDecayParameters &param, double chi2, bool valid, const TwoBodyDecayVirtualMeasurement &vm)
+      : theDecayParameters(param),
+        theChi2(chi2),
+        theValidityFlag(valid),
+        thePrimaryMass(vm.primaryMass()),
+        thePrimaryWidth(vm.primaryWidth()) {}
 
-  ~TwoBodyDecay( void ) {}
+  ~TwoBodyDecay(void) {}
 
-  inline const TwoBodyDecayParameters & decayParameters( void ) const { return theDecayParameters; }
+  inline const TwoBodyDecayParameters &decayParameters(void) const { return theDecayParameters; }
 
-  inline const AlgebraicVector & parameters( void ) const { return theDecayParameters.parameters(); }
-  inline const AlgebraicSymMatrix & covariance( void ) const { return theDecayParameters.covariance(); }
+  inline const AlgebraicVector &parameters(void) const { return theDecayParameters.parameters(); }
+  inline const AlgebraicSymMatrix &covariance(void) const { return theDecayParameters.covariance(); }
 
   /// Get specified decay parameter.
-  inline double operator[]( ParameterName name ) const { return theDecayParameters[name]; }
+  inline double operator[](ParameterName name) const { return theDecayParameters[name]; }
 
   /// Get specified decay parameter.
-  inline double operator()( ParameterName name ) const { return theDecayParameters(name); }
+  inline double operator()(ParameterName name) const { return theDecayParameters(name); }
 
-  inline bool hasError( void ) const { return theDecayParameters.hasError(); }
+  inline bool hasError(void) const { return theDecayParameters.hasError(); }
 
-  inline double chi2( void ) const { return theChi2; }
+  inline double chi2(void) const { return theChi2; }
 
-  inline bool isValid( void ) const { return theValidityFlag; }
-  inline void setInvalid( void ) { theValidityFlag = false; }
+  inline bool isValid(void) const { return theValidityFlag; }
+  inline void setInvalid(void) { theValidityFlag = false; }
 
-  inline double primaryMass( void ) const { return thePrimaryMass; }
-  inline double primaryWidth( void ) const { return thePrimaryWidth; }
-
- private:
+  inline double primaryMass(void) const { return thePrimaryMass; }
+  inline double primaryWidth(void) const { return thePrimaryWidth; }
 
+private:
   TwoBodyDecayParameters theDecayParameters;
   double theChi2;
   bool theValidityFlag;
   double thePrimaryMass;
   double thePrimaryWidth;
-
 };
 
 #endif
diff --git a/Alignment/TwoBodyDecay/interface/TwoBodyDecayDerivatives.h b/Alignment/TwoBodyDecay/interface/TwoBodyDecayDerivatives.h
index 9e2edd3f12519..91322e514f305 100644
--- a/Alignment/TwoBodyDecay/interface/TwoBodyDecayDerivatives.h
+++ b/Alignment/TwoBodyDecay/interface/TwoBodyDecayDerivatives.h
@@ -5,77 +5,79 @@
 
 /** /class TwoBodyDecayDerivatives
  *
- *  This class provides the derivatives matrices need by the class TwoBodyDecayEstimator.
+ *  This class provides the derivatives matrices need by the class
+ * TwoBodyDecayEstimator.
  *
  *  /author Edmund Widl
  */
 
-
-class TwoBodyDecayDerivatives
-{
-
+class TwoBodyDecayDerivatives {
 public:
-
   enum { dimension = 6 };
 
   enum DerivativeParameterName { px = 1, py = 2, pz = 3, theta = 4, phi = 5, mass = 6 };
 
-  TwoBodyDecayDerivatives( double mPrimary = 91.1876, double mSecondary = 0.105658 );
+  TwoBodyDecayDerivatives(double mPrimary = 91.1876, double mSecondary = 0.105658);
   ~TwoBodyDecayDerivatives();
 
-  /**Derivatives of the lab frame momenta (in cartesian representation) of the secondaries
-   * w.r.t. z=(px,py,pz,theta,phi,m).
+  /**Derivatives of the lab frame momenta (in cartesian representation) of the
+   * secondaries w.r.t. z=(px,py,pz,theta,phi,m).
    */
-  const std::pair< AlgebraicMatrix, AlgebraicMatrix > derivatives( const TwoBodyDecay & tbd ) const;
+  const std::pair<AlgebraicMatrix, AlgebraicMatrix> derivatives(const TwoBodyDecay &tbd) const;
 
-  /**Derivatives of the lab frame momenta (in cartesian representation) of the secondaries
-   * w.r.t. z=(px,py,pz,theta,phi,m).
+  /**Derivatives of the lab frame momenta (in cartesian representation) of the
+   * secondaries w.r.t. z=(px,py,pz,theta,phi,m).
    */
-  const std::pair< AlgebraicMatrix, AlgebraicMatrix > derivatives( const TwoBodyDecayParameters & param ) const;
+  const std::pair<AlgebraicMatrix, AlgebraicMatrix> derivatives(const TwoBodyDecayParameters &param) const;
 
-  /**Derivatives of the lab frame momenta (in cartesian representation) of the secondaries
-   * w.r.t. the selected parameters.
+  /**Derivatives of the lab frame momenta (in cartesian representation) of the
+   * secondaries w.r.t. the selected parameters.
    */
-  const std::pair< AlgebraicMatrix, AlgebraicMatrix > selectedDerivatives( const TwoBodyDecay & tbd,
-									   const std::vector< bool > & selector ) const;
+  const std::pair<AlgebraicMatrix, AlgebraicMatrix> selectedDerivatives(const TwoBodyDecay &tbd,
+                                                                        const std::vector<bool> &selector) const;
 
-  /**Derivatives of the lab frame momenta (in cartesian representation) of the secondaries
-   * w.r.t. the selected parameters.
+  /**Derivatives of the lab frame momenta (in cartesian representation) of the
+   * secondaries w.r.t. the selected parameters.
    */
-  const std::pair< AlgebraicMatrix, AlgebraicMatrix > selectedDerivatives( const TwoBodyDecayParameters & param,
-									   const std::vector< bool > & selector ) const;
+  const std::pair<AlgebraicMatrix, AlgebraicMatrix> selectedDerivatives(const TwoBodyDecayParameters &param,
+                                                                        const std::vector<bool> &selector) const;
 
 private:
-
-  /**Derivatives of the lab frame momenta of the secondaries w.r.t. px of the primary particle.
+  /**Derivatives of the lab frame momenta of the secondaries w.r.t. px of the
+   * primary particle.
    */
-  const std::pair< AlgebraicMatrix, AlgebraicMatrix > dqsdpx( const TwoBodyDecayParameters & param ) const;
+  const std::pair<AlgebraicMatrix, AlgebraicMatrix> dqsdpx(const TwoBodyDecayParameters &param) const;
 
-  /**Derivatives of the lab frame momenta of the secondaries w.r.t. py of the primary particle.
+  /**Derivatives of the lab frame momenta of the secondaries w.r.t. py of the
+   * primary particle.
    */
-  const std::pair< AlgebraicMatrix, AlgebraicMatrix > dqsdpy( const TwoBodyDecayParameters & param ) const;
+  const std::pair<AlgebraicMatrix, AlgebraicMatrix> dqsdpy(const TwoBodyDecayParameters &param) const;
 
-  /**Derivatives of the lab frame momenta of the secondaries w.r.t. pz of the primary particle.
+  /**Derivatives of the lab frame momenta of the secondaries w.r.t. pz of the
+   * primary particle.
    */
-  const std::pair< AlgebraicMatrix, AlgebraicMatrix > dqsdpz( const TwoBodyDecayParameters & param ) const;
+  const std::pair<AlgebraicMatrix, AlgebraicMatrix> dqsdpz(const TwoBodyDecayParameters &param) const;
 
-  /**Derivatives of the lab frame momenta of the secondaries w.r.t. the decay angle theta in the primary's rest frame.
+  /**Derivatives of the lab frame momenta of the secondaries w.r.t. the decay
+   * angle theta in the primary's rest frame.
    */
-  const std::pair< AlgebraicMatrix, AlgebraicMatrix > dqsdtheta( const TwoBodyDecayParameters & param ) const;
+  const std::pair<AlgebraicMatrix, AlgebraicMatrix> dqsdtheta(const TwoBodyDecayParameters &param) const;
 
-  /**Derivatives of the lab frame momenta of the secondaries w.r.t. the decay angle phi in the primary's rest frame.
+  /**Derivatives of the lab frame momenta of the secondaries w.r.t. the decay
+   * angle phi in the primary's rest frame.
    */
-  const std::pair< AlgebraicMatrix, AlgebraicMatrix > dqsdphi( const TwoBodyDecayParameters & param ) const;
+  const std::pair<AlgebraicMatrix, AlgebraicMatrix> dqsdphi(const TwoBodyDecayParameters &param) const;
 
-  /**Derivatives of the lab frame momenta of the secondaries w.r.t. the mass of the primary
+  /**Derivatives of the lab frame momenta of the secondaries w.r.t. the mass of
+   * the primary
    */
-  const std::pair< AlgebraicMatrix, AlgebraicMatrix > dqsdm( const TwoBodyDecayParameters & param ) const;
+  const std::pair<AlgebraicMatrix, AlgebraicMatrix> dqsdm(const TwoBodyDecayParameters &param) const;
 
-  const std::pair< AlgebraicMatrix, AlgebraicMatrix > dqsdzi( const TwoBodyDecayParameters & param, const DerivativeParameterName & i ) const;
+  const std::pair<AlgebraicMatrix, AlgebraicMatrix> dqsdzi(const TwoBodyDecayParameters &param,
+                                                           const DerivativeParameterName &i) const;
 
   double thePrimaryMass;
   double theSecondaryMass;
-
 };
 
 #endif
diff --git a/Alignment/TwoBodyDecay/interface/TwoBodyDecayEstimator.h b/Alignment/TwoBodyDecay/interface/TwoBodyDecayEstimator.h
index dbef5206b5935..57592a3f063c6 100644
--- a/Alignment/TwoBodyDecay/interface/TwoBodyDecayEstimator.h
+++ b/Alignment/TwoBodyDecay/interface/TwoBodyDecayEstimator.h
@@ -4,48 +4,45 @@
 #include "Alignment/TwoBodyDecay/interface/TwoBodyDecay.h"
 #include "Alignment/TwoBodyDecay/interface/TwoBodyDecayVirtualMeasurement.h"
 
-#include "RecoVertex/VertexTools/interface/PerigeeLinearizedTrackState.h" 
-#include "DataFormats/CLHEP/interface/AlgebraicObjects.h" 
+#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
+#include "RecoVertex/VertexTools/interface/PerigeeLinearizedTrackState.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-/** Class  TwoBodyDecayEstimator estimates the decay parameters and the corresponding error
- *  matrix (see TwoBodyDecayParameter) from two linearized tracks, and an hypothesis for the
- *  primary particle's mass and width as well as the mass of the secondary particles. It utilizes
- *  a robust M-estimator.
+/** Class  TwoBodyDecayEstimator estimates the decay parameters and the
+ * corresponding error matrix (see TwoBodyDecayParameter) from two linearized
+ * tracks, and an hypothesis for the primary particle's mass and width as well
+ * as the mass of the secondary particles. It utilizes a robust M-estimator.
  *
  *  /author Edmund Widl
  */
 
-class TwoBodyDecayEstimator
-{
-
+class TwoBodyDecayEstimator {
 public:
-
   typedef PerigeeLinearizedTrackState::RefCountedLinearizedTrackState RefCountedLinearizedTrackState;
 
-  TwoBodyDecayEstimator( const edm::ParameterSet & config );
-  virtual ~TwoBodyDecayEstimator( void ) {}
+  TwoBodyDecayEstimator(const edm::ParameterSet &config);
+  virtual ~TwoBodyDecayEstimator(void) {}
 
-  virtual TwoBodyDecay estimate( const std::vector< RefCountedLinearizedTrackState > & linTracks,
-				 const TwoBodyDecayParameters & linearizationPoint,
-				 const TwoBodyDecayVirtualMeasurement & vm ) const;
+  virtual TwoBodyDecay estimate(const std::vector<RefCountedLinearizedTrackState> &linTracks,
+                                const TwoBodyDecayParameters &linearizationPoint,
+                                const TwoBodyDecayVirtualMeasurement &vm) const;
 
-  inline int ndf( void ) const { return theNdf; }
-  inline const AlgebraicVector& pulls( void ) const { return thePulls; }
+  inline int ndf(void) const { return theNdf; }
+  inline const AlgebraicVector &pulls(void) const { return thePulls; }
 
-  virtual TwoBodyDecayEstimator* clone( void ) const { return new TwoBodyDecayEstimator( *this ); }
+  virtual TwoBodyDecayEstimator *clone(void) const { return new TwoBodyDecayEstimator(*this); }
 
 protected:
-
-  virtual bool constructMatrices( const std::vector< RefCountedLinearizedTrackState > & linTracks,
-				  const TwoBodyDecayParameters & linearizationPoint,
-				  const TwoBodyDecayVirtualMeasurement & vm,
-				  AlgebraicVector & vecM, AlgebraicSymMatrix & matG, AlgebraicMatrix & matA ) const;
+  virtual bool constructMatrices(const std::vector<RefCountedLinearizedTrackState> &linTracks,
+                                 const TwoBodyDecayParameters &linearizationPoint,
+                                 const TwoBodyDecayVirtualMeasurement &vm,
+                                 AlgebraicVector &vecM,
+                                 AlgebraicSymMatrix &matG,
+                                 AlgebraicMatrix &matA) const;
 
 private:
-
-  bool checkValues( const AlgebraicVector & vec ) const;
+  bool checkValues(const AlgebraicVector &vec) const;
 
   double theRobustificationConstant;
   double theMaxIterDiff;
@@ -54,8 +51,6 @@ class TwoBodyDecayEstimator
 
   mutable int theNdf;
   mutable AlgebraicVector thePulls;
-
 };
 
-
 #endif
diff --git a/Alignment/TwoBodyDecay/interface/TwoBodyDecayFitter.h b/Alignment/TwoBodyDecay/interface/TwoBodyDecayFitter.h
index d0fb222022418..9624ebfb4792c 100644
--- a/Alignment/TwoBodyDecay/interface/TwoBodyDecayFitter.h
+++ b/Alignment/TwoBodyDecay/interface/TwoBodyDecayFitter.h
@@ -1,61 +1,57 @@
 #ifndef Alignment_TwoBodyDecay_TwoBodyDecayFitter_h
 #define Alignment_TwoBodyDecay_TwoBodyDecayFitter_h
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/DeepCopyPointerByClone.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "RecoVertex/LinearizationPointFinders/interface/DefaultLinearizationPointFinder.h"
 #include "RecoVertex/VertexTools/interface/LinearizedTrackStateFactory.h"
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
 
 #include "Alignment/TwoBodyDecay/interface/TwoBodyDecay.h"
-#include "Alignment/TwoBodyDecay/interface/TwoBodyDecayVirtualMeasurement.h"
 #include "Alignment/TwoBodyDecay/interface/TwoBodyDecayEstimator.h"
 #include "Alignment/TwoBodyDecay/interface/TwoBodyDecayLinearizationPointFinder.h"
+#include "Alignment/TwoBodyDecay/interface/TwoBodyDecayVirtualMeasurement.h"
 
 /** /class TwoBodyDecayFitter
  *
  *  /author Edmund Widl
  */
 
-
-class TwoBodyDecayFitter
-{
-
+class TwoBodyDecayFitter {
 public:
+  TwoBodyDecayFitter(const edm::ParameterSet &config);
 
-  TwoBodyDecayFitter( const edm::ParameterSet & config );
-
-  TwoBodyDecayFitter( const edm::ParameterSet & config,
-		      const LinearizationPointFinder* vf,
-		      const TwoBodyDecayLinearizationPointFinder* lpf,
-		      const TwoBodyDecayEstimator* est );
+  TwoBodyDecayFitter(const edm::ParameterSet &config,
+                     const LinearizationPointFinder *vf,
+                     const TwoBodyDecayLinearizationPointFinder *lpf,
+                     const TwoBodyDecayEstimator *est);
 
-  virtual ~TwoBodyDecayFitter( void );
+  virtual ~TwoBodyDecayFitter(void);
 
-  virtual const TwoBodyDecay estimate( const std::vector< reco::TransientTrack >& tracks,
-				       const TwoBodyDecayVirtualMeasurement& vm ) const;
+  virtual const TwoBodyDecay estimate(const std::vector<reco::TransientTrack> &tracks,
+                                      const TwoBodyDecayVirtualMeasurement &vm) const;
 
-  virtual const TwoBodyDecay estimate( const std::vector< reco::TransientTrack >& tracks,
-				       const std::vector< TrajectoryStateOnSurface >& tsos,
-				       const TwoBodyDecayVirtualMeasurement& vm ) const;
+  virtual const TwoBodyDecay estimate(const std::vector<reco::TransientTrack> &tracks,
+                                      const std::vector<TrajectoryStateOnSurface> &tsos,
+                                      const TwoBodyDecayVirtualMeasurement &vm) const;
 
-  inline const TwoBodyDecayLinearizationPointFinder* linearizationPointFinder( void ) const { return theLinPointFinder.operator->(); }
-  inline const TwoBodyDecayEstimator* estimator( void ) const { return theEstimator.operator->(); }
-  inline const LinearizationPointFinder* vertexFinder( void ) const { return theVertexFinder.operator->(); }
+  inline const TwoBodyDecayLinearizationPointFinder *linearizationPointFinder(void) const {
+    return theLinPointFinder.operator->();
+  }
+  inline const TwoBodyDecayEstimator *estimator(void) const { return theEstimator.operator->(); }
+  inline const LinearizationPointFinder *vertexFinder(void) const { return theVertexFinder.operator->(); }
 
-  virtual TwoBodyDecayFitter* clone( void ) const { return new TwoBodyDecayFitter( *this ); }
+  virtual TwoBodyDecayFitter *clone(void) const { return new TwoBodyDecayFitter(*this); }
 
 private:
-
   typedef PerigeeLinearizedTrackState::RefCountedLinearizedTrackState RefCountedLinearizedTrackState;
 
-  DeepCopyPointerByClone< const LinearizationPointFinder > theVertexFinder;
-  DeepCopyPointerByClone< const TwoBodyDecayLinearizationPointFinder > theLinPointFinder;
-  DeepCopyPointerByClone< const TwoBodyDecayEstimator > theEstimator;
+  DeepCopyPointerByClone<const LinearizationPointFinder> theVertexFinder;
+  DeepCopyPointerByClone<const TwoBodyDecayLinearizationPointFinder> theLinPointFinder;
+  DeepCopyPointerByClone<const TwoBodyDecayEstimator> theEstimator;
 
   LinearizedTrackStateFactory theLinTrackStateFactory;
-
 };
 
 #endif
diff --git a/Alignment/TwoBodyDecay/interface/TwoBodyDecayLinearizationPointFinder.h b/Alignment/TwoBodyDecay/interface/TwoBodyDecayLinearizationPointFinder.h
index 0c90a5d8297e0..406963882ca6d 100644
--- a/Alignment/TwoBodyDecay/interface/TwoBodyDecayLinearizationPointFinder.h
+++ b/Alignment/TwoBodyDecay/interface/TwoBodyDecayLinearizationPointFinder.h
@@ -1,36 +1,32 @@
 #ifndef Alignment_TwoBodyDecay_TwoBodyDecayLinearizationPointFinder_h
 #define Alignment_TwoBodyDecay_TwoBodyDecayLinearizationPointFinder_h
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "Alignment/TwoBodyDecay/interface/TwoBodyDecayParameters.h"
-#include "RecoVertex/VertexTools/interface/PerigeeLinearizedTrackState.h" 
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "RecoVertex/VertexTools/interface/PerigeeLinearizedTrackState.h"
 
-/** Class  TwoBodyDecayLinearizationPointFinder computes a rough estimate of the parameters
- *  of a decay. This serves as linearization point for TwoBodyDecayEstimator.
+/** Class  TwoBodyDecayLinearizationPointFinder computes a rough estimate of the
+ * parameters of a decay. This serves as linearization point for
+ * TwoBodyDecayEstimator.
  *
  *  /author Edmund Widl
  */
 
-
-
-class TwoBodyDecayLinearizationPointFinder
-{
-
+class TwoBodyDecayLinearizationPointFinder {
 public:
-
   typedef PerigeeLinearizedTrackState::RefCountedLinearizedTrackState RefCountedLinearizedTrackState;
 
-  TwoBodyDecayLinearizationPointFinder( const edm::ParameterSet & config ) {}
-
-  virtual ~TwoBodyDecayLinearizationPointFinder( void ) {}
+  TwoBodyDecayLinearizationPointFinder(const edm::ParameterSet &config) {}
 
-  virtual const TwoBodyDecayParameters
-  getLinearizationPoint( const std::vector< RefCountedLinearizedTrackState > & tracks,
-			 const double primaryMass,
-			 const double secondaryMass ) const;
+  virtual ~TwoBodyDecayLinearizationPointFinder(void) {}
 
-  virtual TwoBodyDecayLinearizationPointFinder* clone( void ) const { return new TwoBodyDecayLinearizationPointFinder( *this ); }
+  virtual const TwoBodyDecayParameters getLinearizationPoint(const std::vector<RefCountedLinearizedTrackState> &tracks,
+                                                             const double primaryMass,
+                                                             const double secondaryMass) const;
 
+  virtual TwoBodyDecayLinearizationPointFinder *clone(void) const {
+    return new TwoBodyDecayLinearizationPointFinder(*this);
+  }
 };
 
 #endif
diff --git a/Alignment/TwoBodyDecay/interface/TwoBodyDecayModel.h b/Alignment/TwoBodyDecay/interface/TwoBodyDecayModel.h
index 70d138660fa08..0f05c2d05b1f7 100644
--- a/Alignment/TwoBodyDecay/interface/TwoBodyDecayModel.h
+++ b/Alignment/TwoBodyDecay/interface/TwoBodyDecayModel.h
@@ -1,62 +1,57 @@
 #ifndef Alignment_TwoBodyDecay_TwoBodyDecayModel_h
 #define Alignment_TwoBodyDecay_TwoBodyDecayModel_h
 
-
 /** /class TwoBodyDecayModel
  *
- *  This class provides useful methods needed for the two-body decay model used by implementations
- *  of e.g. class TwoBodyDecayEstimator or TwoBodyDecayLinearizationPointFinder.
+ *  This class provides useful methods needed for the two-body decay model used
+ * by implementations of e.g. class TwoBodyDecayEstimator or
+ * TwoBodyDecayLinearizationPointFinder.
  *
  *  /author Edmund Widl
  */
 
 #include "Alignment/TwoBodyDecay/interface/TwoBodyDecay.h"
 
-
-class TwoBodyDecayModel
-{
- public:
-  
-  TwoBodyDecayModel( double mPrimary = 91.1876, double mSecondary = 0.105658 );
+class TwoBodyDecayModel {
+public:
+  TwoBodyDecayModel(double mPrimary = 91.1876, double mSecondary = 0.105658);
   ~TwoBodyDecayModel();
 
-  /** Rotates a vector pointing in z-direction into the direction defined by p=(px,py,pz).
+  /** Rotates a vector pointing in z-direction into the direction defined by
+   * p=(px,py,pz).
    */
-  AlgebraicMatrix rotationMatrix( double px, double py, double pz );
+  AlgebraicMatrix rotationMatrix(double px, double py, double pz);
 
-  /** Jacobian for transformation from curvilinear to cartesian representation (needs the z-component of
-   *  magnetic field in inverse GeV as input).
+  /** Jacobian for transformation from curvilinear to cartesian representation
+   * (needs the z-component of magnetic field in inverse GeV as input).
    */
-  AlgebraicMatrix curvilinearToCartesianJacobian( double rho, double theta, double phi, double zMagField );
+  AlgebraicMatrix curvilinearToCartesianJacobian(double rho, double theta, double phi, double zMagField);
 
-  /** Jacobian for transformation from curvilinear to cartesian representation (needs the z-component of
-   *  magnetic field in inverse GeV as input).
+  /** Jacobian for transformation from curvilinear to cartesian representation
+   * (needs the z-component of magnetic field in inverse GeV as input).
    */
-  AlgebraicMatrix curvilinearToCartesianJacobian( const AlgebraicVector& curv, double zMagField );
+  AlgebraicMatrix curvilinearToCartesianJacobian(const AlgebraicVector &curv, double zMagField);
 
-  /** Convert vector from curvilinear to cartesian coordinates (needs the z-component of
-   *  magnetic field in inverse GeV as input).
+  /** Convert vector from curvilinear to cartesian coordinates (needs the
+   * z-component of magnetic field in inverse GeV as input).
    */
-  AlgebraicVector convertCurvilinearToCartesian( const AlgebraicVector& curv, double zMagField );
+  AlgebraicVector convertCurvilinearToCartesian(const AlgebraicVector &curv, double zMagField);
 
   /** Momenta of the secondaries in cartesian repraesentation.
    */
-  const std::pair< AlgebraicVector, AlgebraicVector > cartesianSecondaryMomenta( const AlgebraicVector & param );
+  const std::pair<AlgebraicVector, AlgebraicVector> cartesianSecondaryMomenta(const AlgebraicVector &param);
 
   /** Momenta of the secondaries in cartesian repraesentation.
    */
-  const std::pair< AlgebraicVector, AlgebraicVector > cartesianSecondaryMomenta( const TwoBodyDecay & tbd );
+  const std::pair<AlgebraicVector, AlgebraicVector> cartesianSecondaryMomenta(const TwoBodyDecay &tbd);
 
   /** Momenta of the secondaries in cartesian repraesentation.
    */
-  const std::pair< AlgebraicVector, AlgebraicVector > cartesianSecondaryMomenta( const TwoBodyDecayParameters & tbdparam );
-
- private:
+  const std::pair<AlgebraicVector, AlgebraicVector> cartesianSecondaryMomenta(const TwoBodyDecayParameters &tbdparam);
 
+private:
   double thePrimaryMass;
   double theSecondaryMass;
-
 };
 
-
 #endif
diff --git a/Alignment/TwoBodyDecay/interface/TwoBodyDecayParameters.h b/Alignment/TwoBodyDecay/interface/TwoBodyDecayParameters.h
index 5b450099178eb..94bbe28a0fa2b 100644
--- a/Alignment/TwoBodyDecay/interface/TwoBodyDecayParameters.h
+++ b/Alignment/TwoBodyDecay/interface/TwoBodyDecayParameters.h
@@ -11,53 +11,47 @@
 
 #include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
 
-
-class TwoBodyDecayParameters
-{
-
+class TwoBodyDecayParameters {
 public:
-
   /// Define order of parameters
   enum ParameterName { x = 0, y = 1, z = 2, px = 3, py = 4, pz = 5, theta = 6, phi = 7, mass = 8 };
 
   enum { dimension = 9 };
 
-  TwoBodyDecayParameters( void ) :
-    theParameters( AlgebraicVector() ), theCovariance( AlgebraicSymMatrix() ) {}
+  TwoBodyDecayParameters(void) : theParameters(AlgebraicVector()), theCovariance(AlgebraicSymMatrix()) {}
 
-  TwoBodyDecayParameters( const AlgebraicVector & param, const AlgebraicSymMatrix & cov ) :
-    theParameters( param ), theCovariance( cov ) {}
+  TwoBodyDecayParameters(const AlgebraicVector &param, const AlgebraicSymMatrix &cov)
+      : theParameters(param), theCovariance(cov) {}
 
-  TwoBodyDecayParameters( const AlgebraicVector& param ) :
-    theParameters( param ), theCovariance( AlgebraicSymMatrix() ) {}
+  TwoBodyDecayParameters(const AlgebraicVector &param) : theParameters(param), theCovariance(AlgebraicSymMatrix()) {}
 
-  TwoBodyDecayParameters( const TwoBodyDecayParameters & other ) :
-    theParameters( other.parameters() ), theCovariance( other.covariance() ) {}
+  TwoBodyDecayParameters(const TwoBodyDecayParameters &other)
+      : theParameters(other.parameters()), theCovariance(other.covariance()) {}
 
-  ~TwoBodyDecayParameters( void ) {}
+  ~TwoBodyDecayParameters(void) {}
 
   /// Get decay parameters.
-  inline const AlgebraicVector & parameters( void ) const { return theParameters; }
+  inline const AlgebraicVector &parameters(void) const { return theParameters; }
 
   /// Get error matrix.
-  inline const AlgebraicSymMatrix & covariance( void ) const { return theCovariance; }
+  inline const AlgebraicSymMatrix &covariance(void) const { return theCovariance; }
 
   /// Get specified decay parameter.
-  inline double operator[]( ParameterName name ) const { return theParameters[name]; }
+  inline double operator[](ParameterName name) const { return theParameters[name]; }
 
   /// Get specified decay parameter.
-  inline double operator()( ParameterName name ) const { return theParameters[name]; }
+  inline double operator()(ParameterName name) const { return theParameters[name]; }
 
   /// Get specified range of decay parameters.
-  inline const AlgebraicVector sub( ParameterName first, ParameterName last ) const { return theParameters.sub( first+1, last+1 ); }
+  inline const AlgebraicVector sub(ParameterName first, ParameterName last) const {
+    return theParameters.sub(first + 1, last + 1);
+  }
 
-  inline bool hasError( void ) const { return ( theCovariance.num_row() != 0 ); }
+  inline bool hasError(void) const { return (theCovariance.num_row() != 0); }
 
 private:
-
   AlgebraicVector theParameters;
   AlgebraicSymMatrix theCovariance;
-
 };
 
 #endif
diff --git a/Alignment/TwoBodyDecay/interface/TwoBodyDecayVirtualMeasurement.h b/Alignment/TwoBodyDecay/interface/TwoBodyDecayVirtualMeasurement.h
index 8d1ae0205e095..07ea13f02db64 100644
--- a/Alignment/TwoBodyDecay/interface/TwoBodyDecayVirtualMeasurement.h
+++ b/Alignment/TwoBodyDecay/interface/TwoBodyDecayVirtualMeasurement.h
@@ -9,54 +9,59 @@
 
 /** /class TwoBodyDecayVirtualMeasurement
  *
- *  Container-class for the virtual measurements (beam profile, mass-constraint) included
- *  into the estimation of the properties of two-body decays (see TwoBodyDecayEstimator).
+ *  Container-class for the virtual measurements (beam profile, mass-constraint)
+ * included into the estimation of the properties of two-body decays (see
+ * TwoBodyDecayEstimator).
  *
  *  /author Edmund Widl
  */
 
+class TwoBodyDecayVirtualMeasurement {
+public:
+  TwoBodyDecayVirtualMeasurement(const double primaryMass,
+                                 const double primaryWidth,
+                                 const double secondaryMass,
+                                 const reco::BeamSpot &beamSpot)
+      : thePrimaryMass(primaryMass),
+        thePrimaryWidth(primaryWidth),
+        theSecondaryMass(secondaryMass),
+        theBeamSpot(beamSpot) {}
 
-class TwoBodyDecayVirtualMeasurement
-{
+  TwoBodyDecayVirtualMeasurement(const TwoBodyDecayVirtualMeasurement &other)
+      : thePrimaryMass(other.thePrimaryMass),
+        thePrimaryWidth(other.thePrimaryWidth),
+        theSecondaryMass(other.theSecondaryMass),
+        theBeamSpot(other.theBeamSpot) {}
 
-public:
+  inline const double &primaryMass(void) const { return thePrimaryMass; }
+  inline const double &primaryWidth(void) const { return thePrimaryWidth; }
+  inline const double &secondaryMass(void) const { return theSecondaryMass; }
 
-  TwoBodyDecayVirtualMeasurement( const double primaryMass,
-				  const double primaryWidth,
-				  const double secondaryMass,
-				  const reco::BeamSpot& beamSpot ) :
-    thePrimaryMass( primaryMass ),
-    thePrimaryWidth( primaryWidth ),
-    theSecondaryMass( secondaryMass ),
-    theBeamSpot( beamSpot ) {}
-
-  TwoBodyDecayVirtualMeasurement( const TwoBodyDecayVirtualMeasurement & other ) :
-    thePrimaryMass( other.thePrimaryMass ),
-    thePrimaryWidth( other.thePrimaryWidth ),
-    theSecondaryMass( other.theSecondaryMass ),
-    theBeamSpot( other.theBeamSpot ) {}
-
-  inline const double & primaryMass( void ) const { return thePrimaryMass; }
-  inline const double & primaryWidth( void ) const { return thePrimaryWidth; }
-  inline const double & secondaryMass( void ) const { return theSecondaryMass; }
-
-  inline const reco::BeamSpot & beamSpot( void ) const { return theBeamSpot; }
-  inline const AlgebraicVector beamSpotPosition( void ) const { return convertXYZPoint( theBeamSpot.position() ); }
-  inline const AlgebraicSymMatrix beamSpotError( void ) const { return extractBeamSpotError(); }
+  inline const reco::BeamSpot &beamSpot(void) const { return theBeamSpot; }
+  inline const AlgebraicVector beamSpotPosition(void) const { return convertXYZPoint(theBeamSpot.position()); }
+  inline const AlgebraicSymMatrix beamSpotError(void) const { return extractBeamSpotError(); }
 
 private:
+  inline const AlgebraicVector convertXYZPoint(const math::XYZPoint &p) const {
+    AlgebraicVector v(3);
+    v(1) = p.x();
+    v(2) = p.y();
+    v(3) = p.z();
+    return v;
+  }
 
-  inline const AlgebraicVector convertXYZPoint( const math::XYZPoint & p ) const
-    { AlgebraicVector v(3); v(1)=p.x(); v(2)=p.y(); v(3)=p.z(); return v; }
-
-  inline const AlgebraicSymMatrix extractBeamSpotError() const
-    { AlgebraicSymMatrix bse(3,0); bse[0][0] = theBeamSpot.BeamWidthX(); bse[1][1] = theBeamSpot.BeamWidthY(); bse[2][2] = theBeamSpot.sigmaZ(); return bse; }
+  inline const AlgebraicSymMatrix extractBeamSpotError() const {
+    AlgebraicSymMatrix bse(3, 0);
+    bse[0][0] = theBeamSpot.BeamWidthX();
+    bse[1][1] = theBeamSpot.BeamWidthY();
+    bse[2][2] = theBeamSpot.sigmaZ();
+    return bse;
+  }
 
   const double thePrimaryMass;
   const double thePrimaryWidth;
   const double theSecondaryMass;
-  const reco::BeamSpot & theBeamSpot;
-
+  const reco::BeamSpot &theBeamSpot;
 };
 
 #endif
diff --git a/Alignment/TwoBodyDecay/src/TwoBodyDecayDerivatives.cc b/Alignment/TwoBodyDecay/src/TwoBodyDecayDerivatives.cc
index 7d8553af87531..dbc528c71c708 100644
--- a/Alignment/TwoBodyDecay/src/TwoBodyDecayDerivatives.cc
+++ b/Alignment/TwoBodyDecay/src/TwoBodyDecayDerivatives.cc
@@ -6,90 +6,77 @@
 
 #include <algorithm>
 
-TwoBodyDecayDerivatives::TwoBodyDecayDerivatives( double mPrimary, double mSecondary ) : 
-  thePrimaryMass( mPrimary ), theSecondaryMass( mSecondary ) {}
-
+TwoBodyDecayDerivatives::TwoBodyDecayDerivatives(double mPrimary, double mSecondary)
+    : thePrimaryMass(mPrimary), theSecondaryMass(mSecondary) {}
 
 TwoBodyDecayDerivatives::~TwoBodyDecayDerivatives() {}
 
-
-const std::pair< AlgebraicMatrix, AlgebraicMatrix >
-TwoBodyDecayDerivatives::derivatives( const TwoBodyDecay & tbd )  const
-{
-  return derivatives( tbd.decayParameters() );
+const std::pair<AlgebraicMatrix, AlgebraicMatrix> TwoBodyDecayDerivatives::derivatives(const TwoBodyDecay &tbd) const {
+  return derivatives(tbd.decayParameters());
 }
 
-const std::pair< AlgebraicMatrix, AlgebraicMatrix >
-TwoBodyDecayDerivatives::derivatives( const TwoBodyDecayParameters & param )  const
-{
+const std::pair<AlgebraicMatrix, AlgebraicMatrix> TwoBodyDecayDerivatives::derivatives(
+    const TwoBodyDecayParameters &param) const {
   // get the derivatives with respect to all parameters
-  std::pair< AlgebraicMatrix, AlgebraicMatrix > dqsdpx = this->dqsdpx( param );
-  std::pair< AlgebraicMatrix, AlgebraicMatrix > dqsdpy = this->dqsdpy( param );
-  std::pair< AlgebraicMatrix, AlgebraicMatrix > dqsdpz = this->dqsdpz( param );
-  std::pair< AlgebraicMatrix, AlgebraicMatrix > dqsdtheta = this->dqsdtheta( param );
-  std::pair< AlgebraicMatrix, AlgebraicMatrix > dqsdphi = this->dqsdphi( param );
-  std::pair< AlgebraicMatrix, AlgebraicMatrix > dqsdm = this->dqsdm( param );
-
-  AlgebraicMatrix dqplusdz( 3, dimension );
-  dqplusdz.sub( 1, px, dqsdpx.first );
-  dqplusdz.sub( 1, py, dqsdpy.first );
-  dqplusdz.sub( 1, pz, dqsdpz.first );
-  dqplusdz.sub( 1, theta, dqsdtheta.first );
-  dqplusdz.sub( 1, phi, dqsdphi.first );
-  dqplusdz.sub( 1, mass, dqsdm.first );
-
-  AlgebraicMatrix dqminusdz( 3, dimension );
-  dqminusdz.sub( 1, px, dqsdpx.second );
-  dqminusdz.sub( 1, py, dqsdpy.second );
-  dqminusdz.sub( 1, pz, dqsdpz.second );
-  dqminusdz.sub( 1, theta, dqsdtheta.second );
-  dqminusdz.sub( 1, phi, dqsdphi.second );
-  dqminusdz.sub( 1, mass, dqsdm.second );
-
-  return std::make_pair( dqplusdz, dqminusdz );
+  std::pair<AlgebraicMatrix, AlgebraicMatrix> dqsdpx = this->dqsdpx(param);
+  std::pair<AlgebraicMatrix, AlgebraicMatrix> dqsdpy = this->dqsdpy(param);
+  std::pair<AlgebraicMatrix, AlgebraicMatrix> dqsdpz = this->dqsdpz(param);
+  std::pair<AlgebraicMatrix, AlgebraicMatrix> dqsdtheta = this->dqsdtheta(param);
+  std::pair<AlgebraicMatrix, AlgebraicMatrix> dqsdphi = this->dqsdphi(param);
+  std::pair<AlgebraicMatrix, AlgebraicMatrix> dqsdm = this->dqsdm(param);
+
+  AlgebraicMatrix dqplusdz(3, dimension);
+  dqplusdz.sub(1, px, dqsdpx.first);
+  dqplusdz.sub(1, py, dqsdpy.first);
+  dqplusdz.sub(1, pz, dqsdpz.first);
+  dqplusdz.sub(1, theta, dqsdtheta.first);
+  dqplusdz.sub(1, phi, dqsdphi.first);
+  dqplusdz.sub(1, mass, dqsdm.first);
+
+  AlgebraicMatrix dqminusdz(3, dimension);
+  dqminusdz.sub(1, px, dqsdpx.second);
+  dqminusdz.sub(1, py, dqsdpy.second);
+  dqminusdz.sub(1, pz, dqsdpz.second);
+  dqminusdz.sub(1, theta, dqsdtheta.second);
+  dqminusdz.sub(1, phi, dqsdphi.second);
+  dqminusdz.sub(1, mass, dqsdm.second);
+
+  return std::make_pair(dqplusdz, dqminusdz);
 }
 
-
-const std::pair< AlgebraicMatrix, AlgebraicMatrix >
-TwoBodyDecayDerivatives::selectedDerivatives( const TwoBodyDecay & tbd, const std::vector< bool > & selector ) const
-{
-  return selectedDerivatives( tbd.decayParameters(), selector );
+const std::pair<AlgebraicMatrix, AlgebraicMatrix> TwoBodyDecayDerivatives::selectedDerivatives(
+    const TwoBodyDecay &tbd, const std::vector<bool> &selector) const {
+  return selectedDerivatives(tbd.decayParameters(), selector);
 }
 
-
-const std::pair< AlgebraicMatrix, AlgebraicMatrix >
-TwoBodyDecayDerivatives::selectedDerivatives( const TwoBodyDecayParameters & param, const std::vector< bool > & selector ) const
-{
-  if ( selector.size() != dimension )
-  {
-    throw cms::Exception( "BadConfig" ) << "@SUB=TwoBodyDecayDerivatives::selectedDerivatives"
-					<< "selector has bad dimension (size=" << selector.size() << ").";
+const std::pair<AlgebraicMatrix, AlgebraicMatrix> TwoBodyDecayDerivatives::selectedDerivatives(
+    const TwoBodyDecayParameters &param, const std::vector<bool> &selector) const {
+  if (selector.size() != dimension) {
+    throw cms::Exception("BadConfig") << "@SUB=TwoBodyDecayDerivatives::selectedDerivatives"
+                                      << "selector has bad dimension (size=" << selector.size() << ").";
   }
 
-  int nSelected = std::count( selector.begin(), selector.end(), true );
+  int nSelected = std::count(selector.begin(), selector.end(), true);
   int iSelected = 1;
 
-  AlgebraicMatrix dqplusdz( 3, nSelected );
-  AlgebraicMatrix dqminusdz( 3, nSelected );
-  std::pair< AlgebraicMatrix, AlgebraicMatrix > dqsdzi;
-
-  for ( unsigned int i = 1; i <= dimension; i++ )
-  {
-    if ( selector[i] )
-    {
-      dqsdzi = this->dqsdzi( param, DerivativeParameterName(i) );
-      dqplusdz.sub( 1, iSelected, dqsdzi.first );
-      dqminusdz.sub( 1, iSelected, dqsdzi.second );
+  AlgebraicMatrix dqplusdz(3, nSelected);
+  AlgebraicMatrix dqminusdz(3, nSelected);
+  std::pair<AlgebraicMatrix, AlgebraicMatrix> dqsdzi;
+
+  for (unsigned int i = 1; i <= dimension; i++) {
+    if (selector[i]) {
+      dqsdzi = this->dqsdzi(param, DerivativeParameterName(i));
+      dqplusdz.sub(1, iSelected, dqsdzi.first);
+      dqminusdz.sub(1, iSelected, dqsdzi.second);
       iSelected++;
     }
   }
 
-  return std::make_pair( dqplusdz, dqminusdz );
+  return std::make_pair(dqplusdz, dqminusdz);
 }
 
-
-const std::pair< AlgebraicMatrix, AlgebraicMatrix > TwoBodyDecayDerivatives::dqsdpx( const TwoBodyDecayParameters & param ) const
-{
+const std::pair<AlgebraicMatrix, AlgebraicMatrix> TwoBodyDecayDerivatives::dqsdpx(
+    const TwoBodyDecayParameters &param) const {
   double px = param[TwoBodyDecayParameters::px];
   double py = param[TwoBodyDecayParameters::py];
   double pz = param[TwoBodyDecayParameters::pz];
@@ -97,72 +84,71 @@ const std::pair< AlgebraicMatrix, AlgebraicMatrix > TwoBodyDecayDerivatives::dqs
   double phi = param[TwoBodyDecayParameters::phi];
 
   // compute transverse and absolute momentum
-  double pT2 = px*px + py*py;
-  double p2 = pT2 + pz*pz;
-  double pT = sqrt( pT2 );
-  double p = sqrt( p2 );
+  double pT2 = px * px + py * py;
+  double p2 = pT2 + pz * pz;
+  double pT = sqrt(pT2);
+  double p = sqrt(p2);
 
-  double sphi = sin( phi );
-  double cphi = cos( phi );
-  double stheta = sin( theta );
-  double ctheta = cos( theta );
+  double sphi = sin(phi);
+  double cphi = cos(phi);
+  double stheta = sin(theta);
+  double ctheta = cos(theta);
 
   // some constants from kinematics
-  double c1 = 0.5*thePrimaryMass/theSecondaryMass;
-  double c2 = sqrt( c1*c1 - 1. );
-  double c3 = 0.5*c2*ctheta/c1;
-  double c4 = sqrt( p2 + thePrimaryMass*thePrimaryMass );
+  double c1 = 0.5 * thePrimaryMass / theSecondaryMass;
+  double c2 = sqrt(c1 * c1 - 1.);
+  double c3 = 0.5 * c2 * ctheta / c1;
+  double c4 = sqrt(p2 + thePrimaryMass * thePrimaryMass);
 
   // momentum of decay particle 1 in the primary's boosted frame
-  AlgebraicMatrix pplus( 3, 1 );
-  pplus[0][0] = theSecondaryMass*c2*stheta*cphi;
-  pplus[1][0] = theSecondaryMass*c2*stheta*sphi;
-  pplus[2][0] = 0.5*p + c3*c4;
+  AlgebraicMatrix pplus(3, 1);
+  pplus[0][0] = theSecondaryMass * c2 * stheta * cphi;
+  pplus[1][0] = theSecondaryMass * c2 * stheta * sphi;
+  pplus[2][0] = 0.5 * p + c3 * c4;
 
   // momentum of decay particle 2 in the primary's boosted frame
-  AlgebraicMatrix pminus( 3, 1 );
+  AlgebraicMatrix pminus(3, 1);
   pminus[0][0] = -pplus[0][0];
   pminus[1][0] = -pplus[1][0];
-  pminus[2][0] = 0.5*p - c3*c4;
+  pminus[2][0] = 0.5 * p - c3 * c4;
 
   // derivative of rotation matrix w.r.t. px
-  AlgebraicMatrix dRotMatdpx( 3, 3 );
+  AlgebraicMatrix dRotMatdpx(3, 3);
 
-  dRotMatdpx[0][0] = pz/(pT*p)*(1.-px*px*(1./pT2+1./p2));
-  dRotMatdpx[0][1] = px*py/(pT*pT2);
-  dRotMatdpx[0][2] = (1.-px*px/p2)/p;
+  dRotMatdpx[0][0] = pz / (pT * p) * (1. - px * px * (1. / pT2 + 1. / p2));
+  dRotMatdpx[0][1] = px * py / (pT * pT2);
+  dRotMatdpx[0][2] = (1. - px * px / p2) / p;
 
-  dRotMatdpx[1][0] = -px*py*pz/(pT*p)*(1./pT2+1./p2);
-  dRotMatdpx[1][1] = (1.-px*px/pT2)/pT;
-  dRotMatdpx[1][2] = -px*py/(p*p2);
+  dRotMatdpx[1][0] = -px * py * pz / (pT * p) * (1. / pT2 + 1. / p2);
+  dRotMatdpx[1][1] = (1. - px * px / pT2) / pT;
+  dRotMatdpx[1][2] = -px * py / (p * p2);
 
-  dRotMatdpx[2][0] = -(1./pT-pT/p2)*px/p;
+  dRotMatdpx[2][0] = -(1. / pT - pT / p2) * px / p;
   dRotMatdpx[2][1] = 0.;
-  dRotMatdpx[2][2] = -px*pz/(p*p2);
+  dRotMatdpx[2][2] = -px * pz / (p * p2);
 
   // derivative of the momentum of particle 1 in the lab frame w.r.t. px
-  double dpplusdpx = px*( 0.5/p + c3/c4 );
+  double dpplusdpx = px * (0.5 / p + c3 / c4);
 
-  AlgebraicMatrix dqplusdpx = dRotMatdpx*pplus;
-  dqplusdpx[0][0] += px*dpplusdpx/p;
-  dqplusdpx[1][0] += py*dpplusdpx/p;
-  dqplusdpx[2][0] += pz*dpplusdpx/p;
+  AlgebraicMatrix dqplusdpx = dRotMatdpx * pplus;
+  dqplusdpx[0][0] += px * dpplusdpx / p;
+  dqplusdpx[1][0] += py * dpplusdpx / p;
+  dqplusdpx[2][0] += pz * dpplusdpx / p;
 
   // derivative of the momentum of particle 2 in the lab frame w.r.t. px
-  double dpminusdpx = px*( 0.5/p - c3/c4 );
+  double dpminusdpx = px * (0.5 / p - c3 / c4);
 
-  AlgebraicMatrix dqminusdpx = dRotMatdpx*pminus; 
-  dqminusdpx[0][0] += px*dpminusdpx/p;
-  dqminusdpx[1][0] += py*dpminusdpx/p;
-  dqminusdpx[2][0] += pz*dpminusdpx/p;
+  AlgebraicMatrix dqminusdpx = dRotMatdpx * pminus;
+  dqminusdpx[0][0] += px * dpminusdpx / p;
+  dqminusdpx[1][0] += py * dpminusdpx / p;
+  dqminusdpx[2][0] += pz * dpminusdpx / p;
 
   // return result
-  return std::make_pair( dqplusdpx, dqminusdpx );
+  return std::make_pair(dqplusdpx, dqminusdpx);
 }
 
-
-const std::pair< AlgebraicMatrix, AlgebraicMatrix > TwoBodyDecayDerivatives::dqsdpy( const TwoBodyDecayParameters & param ) const
-{
+const std::pair<AlgebraicMatrix, AlgebraicMatrix> TwoBodyDecayDerivatives::dqsdpy(
+    const TwoBodyDecayParameters &param) const {
   double px = param[TwoBodyDecayParameters::px];
   double py = param[TwoBodyDecayParameters::py];
   double pz = param[TwoBodyDecayParameters::pz];
@@ -170,72 +156,71 @@ const std::pair< AlgebraicMatrix, AlgebraicMatrix > TwoBodyDecayDerivatives::dqs
   double phi = param[TwoBodyDecayParameters::phi];
 
   // compute transverse and absolute momentum
-  double pT2 = px*px + py*py;
-  double p2 = pT2 + pz*pz;
-  double pT = sqrt( pT2 );
-  double p = sqrt( p2 );
+  double pT2 = px * px + py * py;
+  double p2 = pT2 + pz * pz;
+  double pT = sqrt(pT2);
+  double p = sqrt(p2);
 
-  double sphi = sin( phi );
-  double cphi = cos( phi );
-  double stheta = sin( theta );
-  double ctheta = cos( theta );
+  double sphi = sin(phi);
+  double cphi = cos(phi);
+  double stheta = sin(theta);
+  double ctheta = cos(theta);
 
   // some constants from kinematics
-  double c1 = 0.5*thePrimaryMass/theSecondaryMass;
-  double c2 = sqrt( c1*c1 - 1. );
-  double c3 = 0.5*c2*ctheta/c1;
-  double c4 = sqrt( p2 + thePrimaryMass*thePrimaryMass );
+  double c1 = 0.5 * thePrimaryMass / theSecondaryMass;
+  double c2 = sqrt(c1 * c1 - 1.);
+  double c3 = 0.5 * c2 * ctheta / c1;
+  double c4 = sqrt(p2 + thePrimaryMass * thePrimaryMass);
 
   // momentum of decay particle 1 in the rest frame of the primary
-  AlgebraicMatrix pplus( 3, 1 );
-  pplus[0][0] = theSecondaryMass*c2*stheta*cphi;
-  pplus[1][0] = theSecondaryMass*c2*stheta*sphi;
-  pplus[2][0] = 0.5*p + c3*c4;
+  AlgebraicMatrix pplus(3, 1);
+  pplus[0][0] = theSecondaryMass * c2 * stheta * cphi;
+  pplus[1][0] = theSecondaryMass * c2 * stheta * sphi;
+  pplus[2][0] = 0.5 * p + c3 * c4;
 
   // momentum of decay particle 2 in the rest frame of the primary
-  AlgebraicMatrix pminus( 3, 1 );
+  AlgebraicMatrix pminus(3, 1);
   pminus[0][0] = -pplus[0][0];
   pminus[1][0] = -pplus[1][0];
-  pminus[2][0] = 0.5*p - c3*c4;
+  pminus[2][0] = 0.5 * p - c3 * c4;
 
   // derivative of rotation matrix w.r.t. py
-  AlgebraicMatrix dRotMatdpy( 3, 3 );
+  AlgebraicMatrix dRotMatdpy(3, 3);
 
-  dRotMatdpy[0][0] = -px*py*pz/(pT*p)*(1./pT2+1./p2);
-  dRotMatdpy[0][1] = (py*py/pT2-1.)/pT;
-  dRotMatdpy[0][2] = -px*py/(p*p2);
+  dRotMatdpy[0][0] = -px * py * pz / (pT * p) * (1. / pT2 + 1. / p2);
+  dRotMatdpy[0][1] = (py * py / pT2 - 1.) / pT;
+  dRotMatdpy[0][2] = -px * py / (p * p2);
 
-  dRotMatdpy[1][0] = pz/(pT*p)*(1.-py*py*(1./pT2+1./p2));
-  dRotMatdpy[1][1] = -px*py/(pT*pT2);
-  dRotMatdpy[1][2] = (1.-py*py/p2)/p;
+  dRotMatdpy[1][0] = pz / (pT * p) * (1. - py * py * (1. / pT2 + 1. / p2));
+  dRotMatdpy[1][1] = -px * py / (pT * pT2);
+  dRotMatdpy[1][2] = (1. - py * py / p2) / p;
 
-  dRotMatdpy[2][0] = -(1./pT-pT/p2)*py/p;
+  dRotMatdpy[2][0] = -(1. / pT - pT / p2) * py / p;
   dRotMatdpy[2][1] = 0.;
-  dRotMatdpy[2][2] = -py*pz/(p*p2);
+  dRotMatdpy[2][2] = -py * pz / (p * p2);
 
   // derivative of the momentum of particle 1 in the lab frame w.r.t. py
-  double dpplusdpy = py*( 0.5/p + c3/c4 );
+  double dpplusdpy = py * (0.5 / p + c3 / c4);
 
-  AlgebraicMatrix dqplusdpy = dRotMatdpy*pplus;
-  dqplusdpy[0][0] += px*dpplusdpy/p;
-  dqplusdpy[1][0] += py*dpplusdpy/p;
-  dqplusdpy[2][0] += pz*dpplusdpy/p;
+  AlgebraicMatrix dqplusdpy = dRotMatdpy * pplus;
+  dqplusdpy[0][0] += px * dpplusdpy / p;
+  dqplusdpy[1][0] += py * dpplusdpy / p;
+  dqplusdpy[2][0] += pz * dpplusdpy / p;
 
   // derivative of the momentum of particle 2 in the lab frame w.r.t. py
-  double dpminusdpy = py*( 0.5/p - c3/c4 );
+  double dpminusdpy = py * (0.5 / p - c3 / c4);
 
-  AlgebraicMatrix dqminusdpy = dRotMatdpy*pminus;
-  dqminusdpy[0][0] += px*dpminusdpy/p;
-  dqminusdpy[1][0] += py*dpminusdpy/p;
-  dqminusdpy[2][0] += pz*dpminusdpy/p;
+  AlgebraicMatrix dqminusdpy = dRotMatdpy * pminus;
+  dqminusdpy[0][0] += px * dpminusdpy / p;
+  dqminusdpy[1][0] += py * dpminusdpy / p;
+  dqminusdpy[2][0] += pz * dpminusdpy / p;
 
   // return result
-  return std::make_pair( dqplusdpy, dqminusdpy );
+  return std::make_pair(dqplusdpy, dqminusdpy);
 }
 
-
-const std::pair< AlgebraicMatrix, AlgebraicMatrix > TwoBodyDecayDerivatives::dqsdpz( const TwoBodyDecayParameters & param ) const
-{
+const std::pair<AlgebraicMatrix, AlgebraicMatrix> TwoBodyDecayDerivatives::dqsdpz(
+    const TwoBodyDecayParameters &param) const {
   double px = param[TwoBodyDecayParameters::px];
   double py = param[TwoBodyDecayParameters::py];
   double pz = param[TwoBodyDecayParameters::pz];
@@ -243,72 +228,71 @@ const std::pair< AlgebraicMatrix, AlgebraicMatrix > TwoBodyDecayDerivatives::dqs
   double phi = param[TwoBodyDecayParameters::phi];
 
   // compute transverse and absolute momentum
-  double pT2 = px*px + py*py;
-  double p2 = pT2 + pz*pz;
-  double pT = sqrt( pT2 );
-  double p = sqrt( p2 );
+  double pT2 = px * px + py * py;
+  double p2 = pT2 + pz * pz;
+  double pT = sqrt(pT2);
+  double p = sqrt(p2);
 
-  double sphi = sin( phi );
-  double cphi = cos( phi );
-  double stheta = sin( theta );
-  double ctheta = cos( theta );
+  double sphi = sin(phi);
+  double cphi = cos(phi);
+  double stheta = sin(theta);
+  double ctheta = cos(theta);
 
   // some constants from kinematics
-  double c1 = 0.5*thePrimaryMass/theSecondaryMass;
-  double c2 = sqrt( c1*c1 - 1. );
-  double c3 = 0.5*c2*ctheta/c1;
-  double c4 = sqrt( p2 + thePrimaryMass*thePrimaryMass );
+  double c1 = 0.5 * thePrimaryMass / theSecondaryMass;
+  double c2 = sqrt(c1 * c1 - 1.);
+  double c3 = 0.5 * c2 * ctheta / c1;
+  double c4 = sqrt(p2 + thePrimaryMass * thePrimaryMass);
 
   // momentum of decay particle 1 in the rest frame of the primary
-  AlgebraicMatrix pplus( 3, 1 );
-  pplus[0][0] = theSecondaryMass*c2*stheta*cphi;
-  pplus[1][0] = theSecondaryMass*c2*stheta*sphi;
-  pplus[2][0] = 0.5*p + c3*c4;
+  AlgebraicMatrix pplus(3, 1);
+  pplus[0][0] = theSecondaryMass * c2 * stheta * cphi;
+  pplus[1][0] = theSecondaryMass * c2 * stheta * sphi;
+  pplus[2][0] = 0.5 * p + c3 * c4;
 
   // momentum of decay particle 2 in the rest frame of the primary
-  AlgebraicMatrix pminus( 3, 1 );
+  AlgebraicMatrix pminus(3, 1);
   pminus[0][0] = -pplus[0][0];
   pminus[1][0] = -pplus[1][0];
-  pminus[2][0] = 0.5*p - c3*c4;
+  pminus[2][0] = 0.5 * p - c3 * c4;
 
   // derivative of rotation matrix w.r.t. py
-  AlgebraicMatrix dRotMatdpz( 3, 3 );
+  AlgebraicMatrix dRotMatdpz(3, 3);
 
-  dRotMatdpz[0][0] = px/(pT*p)*(1.-pz*pz/p2);
+  dRotMatdpz[0][0] = px / (pT * p) * (1. - pz * pz / p2);
   dRotMatdpz[0][1] = 0.;
-  dRotMatdpz[0][2] = -px*pz/(p*p2);
+  dRotMatdpz[0][2] = -px * pz / (p * p2);
 
-  dRotMatdpz[1][0] = py/(p*pT)*(1.-pz*pz/p2);
+  dRotMatdpz[1][0] = py / (p * pT) * (1. - pz * pz / p2);
   dRotMatdpz[1][1] = 0.;
-  dRotMatdpz[1][2] = -py*pz/(p*p2);
+  dRotMatdpz[1][2] = -py * pz / (p * p2);
 
-  dRotMatdpz[2][0] = pT*pz/(p*p2);
+  dRotMatdpz[2][0] = pT * pz / (p * p2);
   dRotMatdpz[2][1] = 0.;
-  dRotMatdpz[2][2] = (1.-pz*pz/p2)/p;
+  dRotMatdpz[2][2] = (1. - pz * pz / p2) / p;
 
   // derivative of the momentum of particle 1 in the lab frame w.r.t. pz
-  double dpplusdpz = pz*( 0.5/p + c3/c4 );
+  double dpplusdpz = pz * (0.5 / p + c3 / c4);
 
-  AlgebraicMatrix dqplusdpz = dRotMatdpz*pplus;
-  dqplusdpz[0][0] += px*dpplusdpz/p;
-  dqplusdpz[1][0] += py*dpplusdpz/p;
-  dqplusdpz[2][0] += pz*dpplusdpz/p;
+  AlgebraicMatrix dqplusdpz = dRotMatdpz * pplus;
+  dqplusdpz[0][0] += px * dpplusdpz / p;
+  dqplusdpz[1][0] += py * dpplusdpz / p;
+  dqplusdpz[2][0] += pz * dpplusdpz / p;
 
   // derivative of the momentum of particle 2 in the lab frame w.r.t. pz
-  double dpminusdpz = pz*( 0.5/p - c3/c4 );
+  double dpminusdpz = pz * (0.5 / p - c3 / c4);
 
-  AlgebraicMatrix dqminusdpz = dRotMatdpz*pminus;
-  dqminusdpz[0][0] += px*dpminusdpz/p;
-  dqminusdpz[1][0] += py*dpminusdpz/p;
-  dqminusdpz[2][0] += pz*dpminusdpz/p;
+  AlgebraicMatrix dqminusdpz = dRotMatdpz * pminus;
+  dqminusdpz[0][0] += px * dpminusdpz / p;
+  dqminusdpz[1][0] += py * dpminusdpz / p;
+  dqminusdpz[2][0] += pz * dpminusdpz / p;
 
   // return result
-  return std::make_pair( dqplusdpz, dqminusdpz );
+  return std::make_pair(dqplusdpz, dqminusdpz);
 }
 
-
-const std::pair< AlgebraicMatrix, AlgebraicMatrix > TwoBodyDecayDerivatives::dqsdtheta( const TwoBodyDecayParameters & param ) const
-{
+const std::pair<AlgebraicMatrix, AlgebraicMatrix> TwoBodyDecayDerivatives::dqsdtheta(
+    const TwoBodyDecayParameters &param) const {
   double px = param[TwoBodyDecayParameters::px];
   double py = param[TwoBodyDecayParameters::py];
   double pz = param[TwoBodyDecayParameters::pz];
@@ -316,150 +300,151 @@ const std::pair< AlgebraicMatrix, AlgebraicMatrix > TwoBodyDecayDerivatives::dqs
   double phi = param[TwoBodyDecayParameters::phi];
 
   // compute transverse and absolute momentum
-  double pT2 = px*px + py*py;
-  double p2 = pT2 + pz*pz;
+  double pT2 = px * px + py * py;
+  double p2 = pT2 + pz * pz;
 
-  double sphi = sin( phi );
-  double cphi = cos( phi );
-  double stheta = sin( theta );
-  double ctheta = cos( theta );
+  double sphi = sin(phi);
+  double cphi = cos(phi);
+  double stheta = sin(theta);
+  double ctheta = cos(theta);
 
   // some constants from kinematics
-  double c1 = 0.5*thePrimaryMass/theSecondaryMass;
-  double c2 = sqrt( c1*c1 - 1. );
-  double c3 = -0.5*c2*stheta/c1;
-  double c4 = sqrt( p2 + thePrimaryMass*thePrimaryMass );
-
-  // derivative of the momentum of particle 1 in the primary's rest frame w.r.t. theta
-  AlgebraicMatrix dpplusdtheta( 3, 1 );
-  dpplusdtheta[0][0] = theSecondaryMass*c2*ctheta*cphi;
-  dpplusdtheta[1][0] = theSecondaryMass*c2*ctheta*sphi;
-  dpplusdtheta[2][0] = c3*c4;
-
-  // derivative of the momentum of particle 2 in the primary's rest frame w.r.t. theta
-  AlgebraicMatrix dpminusdtheta( 3, 1 );
-  dpminusdtheta[0][0] = -theSecondaryMass*c2*ctheta*cphi;
-  dpminusdtheta[1][0] = -theSecondaryMass*c2*ctheta*sphi;
-  dpminusdtheta[2][0] = -c3*c4;
+  double c1 = 0.5 * thePrimaryMass / theSecondaryMass;
+  double c2 = sqrt(c1 * c1 - 1.);
+  double c3 = -0.5 * c2 * stheta / c1;
+  double c4 = sqrt(p2 + thePrimaryMass * thePrimaryMass);
+
+  // derivative of the momentum of particle 1 in the primary's rest frame w.r.t.
+  // theta
+  AlgebraicMatrix dpplusdtheta(3, 1);
+  dpplusdtheta[0][0] = theSecondaryMass * c2 * ctheta * cphi;
+  dpplusdtheta[1][0] = theSecondaryMass * c2 * ctheta * sphi;
+  dpplusdtheta[2][0] = c3 * c4;
+
+  // derivative of the momentum of particle 2 in the primary's rest frame w.r.t.
+  // theta
+  AlgebraicMatrix dpminusdtheta(3, 1);
+  dpminusdtheta[0][0] = -theSecondaryMass * c2 * ctheta * cphi;
+  dpminusdtheta[1][0] = -theSecondaryMass * c2 * ctheta * sphi;
+  dpminusdtheta[2][0] = -c3 * c4;
 
   TwoBodyDecayModel decayModel;
-  AlgebraicMatrix rotMat = decayModel.rotationMatrix( px, py, pz );
+  AlgebraicMatrix rotMat = decayModel.rotationMatrix(px, py, pz);
 
-  AlgebraicMatrix dqplusdtheta = rotMat*dpplusdtheta;
-  AlgebraicMatrix dqminusdtheta = rotMat*dpminusdtheta;
+  AlgebraicMatrix dqplusdtheta = rotMat * dpplusdtheta;
+  AlgebraicMatrix dqminusdtheta = rotMat * dpminusdtheta;
 
-  return std::make_pair( dqplusdtheta, dqminusdtheta );
+  return std::make_pair(dqplusdtheta, dqminusdtheta);
 }
 
-
-const std::pair< AlgebraicMatrix, AlgebraicMatrix > TwoBodyDecayDerivatives::dqsdphi( const TwoBodyDecayParameters & param ) const
-{
+const std::pair<AlgebraicMatrix, AlgebraicMatrix> TwoBodyDecayDerivatives::dqsdphi(
+    const TwoBodyDecayParameters &param) const {
   double px = param[TwoBodyDecayParameters::px];
   double py = param[TwoBodyDecayParameters::py];
   double pz = param[TwoBodyDecayParameters::pz];
   double theta = param[TwoBodyDecayParameters::theta];
   double phi = param[TwoBodyDecayParameters::phi];
 
-  double sphi = sin( phi );
-  double cphi = cos( phi );
-  double stheta = sin( theta );
+  double sphi = sin(phi);
+  double cphi = cos(phi);
+  double stheta = sin(theta);
 
   // some constants from kinematics
-  double c1 = 0.5*thePrimaryMass/theSecondaryMass;
-  double c2 = sqrt( c1*c1 - 1. );
-
-  // derivative of the momentum of particle 1 in the primary's rest frame w.r.t. phi
-  AlgebraicMatrix dpplusdphi( 3, 1 );
-  dpplusdphi[0][0] = -theSecondaryMass*c2*stheta*sphi;
-  dpplusdphi[1][0] = theSecondaryMass*c2*stheta*cphi;
+  double c1 = 0.5 * thePrimaryMass / theSecondaryMass;
+  double c2 = sqrt(c1 * c1 - 1.);
+
+  // derivative of the momentum of particle 1 in the primary's rest frame w.r.t.
+  // phi
+  AlgebraicMatrix dpplusdphi(3, 1);
+  dpplusdphi[0][0] = -theSecondaryMass * c2 * stheta * sphi;
+  dpplusdphi[1][0] = theSecondaryMass * c2 * stheta * cphi;
   dpplusdphi[2][0] = 0.;
 
-  // derivative of the momentum of particle 2 in the primary's rest frame w.r.t. phi
-  AlgebraicMatrix dpminusdphi( 3, 1 );
-  dpminusdphi[0][0] = theSecondaryMass*c2*stheta*sphi;
-  dpminusdphi[1][0] = -theSecondaryMass*c2*stheta*cphi;
+  // derivative of the momentum of particle 2 in the primary's rest frame w.r.t.
+  // phi
+  AlgebraicMatrix dpminusdphi(3, 1);
+  dpminusdphi[0][0] = theSecondaryMass * c2 * stheta * sphi;
+  dpminusdphi[1][0] = -theSecondaryMass * c2 * stheta * cphi;
   dpminusdphi[2][0] = 0.;
 
   TwoBodyDecayModel decayModel;
-  AlgebraicMatrix rotMat = decayModel.rotationMatrix( px, py, pz );
+  AlgebraicMatrix rotMat = decayModel.rotationMatrix(px, py, pz);
 
-  AlgebraicMatrix dqplusdphi = rotMat*dpplusdphi;
-  AlgebraicMatrix dqminusdphi = rotMat*dpminusdphi;
+  AlgebraicMatrix dqplusdphi = rotMat * dpplusdphi;
+  AlgebraicMatrix dqminusdphi = rotMat * dpminusdphi;
 
-  return std::make_pair( dqplusdphi, dqminusdphi );
+  return std::make_pair(dqplusdphi, dqminusdphi);
 }
 
-
-const std::pair< AlgebraicMatrix, AlgebraicMatrix > TwoBodyDecayDerivatives::dqsdm( const TwoBodyDecayParameters & param ) const
-{
+const std::pair<AlgebraicMatrix, AlgebraicMatrix> TwoBodyDecayDerivatives::dqsdm(
+    const TwoBodyDecayParameters &param) const {
   double px = param[TwoBodyDecayParameters::px];
   double py = param[TwoBodyDecayParameters::py];
   double pz = param[TwoBodyDecayParameters::pz];
   double theta = param[TwoBodyDecayParameters::theta];
   double phi = param[TwoBodyDecayParameters::phi];
 
-  double pT2 = px*px + py*py;
-  double p2 = pT2 + pz*pz;
+  double pT2 = px * px + py * py;
+  double p2 = pT2 + pz * pz;
 
-  double sphi = sin( phi );
-  double cphi = cos( phi );
-  double ctheta = cos( theta );
-  double stheta = sin( theta );
+  double sphi = sin(phi);
+  double cphi = cos(phi);
+  double ctheta = cos(theta);
+  double stheta = sin(theta);
 
   // some constants from kinematics
-  double c1 = 0.5*thePrimaryMass/theSecondaryMass;
-  double c2 = 1./sqrt( c1*c1 - 1. );
-  double m2 = thePrimaryMass*thePrimaryMass;
-
-  // derivative of the momentum of particle 1 in the primary's rest frame w.r.t. the primary's mass
-  AlgebraicMatrix dpplusdm( 3, 1 );
-  dpplusdm[0][0] = c2*0.5*c1*stheta*cphi;
-  dpplusdm[1][0] = c2*0.5*c1*stheta*sphi;
-  dpplusdm[2][0] = c2*theSecondaryMass*( c1*c1 + p2/m2 )/sqrt( p2 + m2 )*ctheta;
-
-  // derivative of the momentum of particle 2 in the primary's rest frame w.r.t. the primary's mass
-  AlgebraicMatrix dpminusdm( 3, 1 );
+  double c1 = 0.5 * thePrimaryMass / theSecondaryMass;
+  double c2 = 1. / sqrt(c1 * c1 - 1.);
+  double m2 = thePrimaryMass * thePrimaryMass;
+
+  // derivative of the momentum of particle 1 in the primary's rest frame w.r.t.
+  // the primary's mass
+  AlgebraicMatrix dpplusdm(3, 1);
+  dpplusdm[0][0] = c2 * 0.5 * c1 * stheta * cphi;
+  dpplusdm[1][0] = c2 * 0.5 * c1 * stheta * sphi;
+  dpplusdm[2][0] = c2 * theSecondaryMass * (c1 * c1 + p2 / m2) / sqrt(p2 + m2) * ctheta;
+
+  // derivative of the momentum of particle 2 in the primary's rest frame w.r.t.
+  // the primary's mass
+  AlgebraicMatrix dpminusdm(3, 1);
   dpminusdm[0][0] = -dpplusdm[0][0];
   dpminusdm[1][0] = -dpplusdm[1][0];
   dpminusdm[2][0] = -dpplusdm[2][0];
 
   TwoBodyDecayModel decayModel;
-  AlgebraicMatrix rotMat = decayModel.rotationMatrix( px, py, pz );
+  AlgebraicMatrix rotMat = decayModel.rotationMatrix(px, py, pz);
 
-  AlgebraicMatrix dqplusdm = rotMat*dpplusdm;
-  AlgebraicMatrix dqminusdm = rotMat*dpminusdm;
+  AlgebraicMatrix dqplusdm = rotMat * dpplusdm;
+  AlgebraicMatrix dqminusdm = rotMat * dpminusdm;
 
-  return std::make_pair( dqplusdm, dqminusdm );
+  return std::make_pair(dqplusdm, dqminusdm);
 }
 
-
-const std::pair< AlgebraicMatrix, AlgebraicMatrix >
-TwoBodyDecayDerivatives::dqsdzi( const TwoBodyDecayParameters & param, const DerivativeParameterName & i ) const
-{
-  switch ( i )
-  {
-  case TwoBodyDecayDerivatives::px :
-    return dqsdpx( param );
-    break;
-  case TwoBodyDecayDerivatives::py :
-    return dqsdpy( param );
-    break;
-  case TwoBodyDecayDerivatives::pz :
-    return dqsdpz( param );
-    break;
-  case TwoBodyDecayDerivatives::theta :
-    return dqsdtheta( param );
-    break;
-  case TwoBodyDecayDerivatives::phi :
-    return dqsdphi( param );
-    break;
-  case TwoBodyDecayDerivatives::mass :
-    return dqsdm( param );
-    break;
-  default:
-    throw cms::Exception( "BadConfig" ) << "@SUB=TwoBodyDecayDerivatives::dqsdzi"
-					<< "no decay parameter related to selector (" << i << ").";
+const std::pair<AlgebraicMatrix, AlgebraicMatrix> TwoBodyDecayDerivatives::dqsdzi(
+    const TwoBodyDecayParameters &param, const DerivativeParameterName &i) const {
+  switch (i) {
+    case TwoBodyDecayDerivatives::px:
+      return dqsdpx(param);
+      break;
+    case TwoBodyDecayDerivatives::py:
+      return dqsdpy(param);
+      break;
+    case TwoBodyDecayDerivatives::pz:
+      return dqsdpz(param);
+      break;
+    case TwoBodyDecayDerivatives::theta:
+      return dqsdtheta(param);
+      break;
+    case TwoBodyDecayDerivatives::phi:
+      return dqsdphi(param);
+      break;
+    case TwoBodyDecayDerivatives::mass:
+      return dqsdm(param);
+      break;
+    default:
+      throw cms::Exception("BadConfig") << "@SUB=TwoBodyDecayDerivatives::dqsdzi"
+                                        << "no decay parameter related to selector (" << i << ").";
   };
 
-  return std::make_pair( AlgebraicMatrix( 3, 1, 0 ), AlgebraicMatrix( 3, 1, 0 ) );
+  return std::make_pair(AlgebraicMatrix(3, 1, 0), AlgebraicMatrix(3, 1, 0));
 }
diff --git a/Alignment/TwoBodyDecay/src/TwoBodyDecayEstimator.cc b/Alignment/TwoBodyDecay/src/TwoBodyDecayEstimator.cc
index eae8e36e24742..fd735fe161a0b 100644
--- a/Alignment/TwoBodyDecay/src/TwoBodyDecayEstimator.cc
+++ b/Alignment/TwoBodyDecay/src/TwoBodyDecayEstimator.cc
@@ -2,32 +2,27 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 
+#include "Alignment/TwoBodyDecay/interface/TwoBodyDecayDerivatives.h"
 #include "Alignment/TwoBodyDecay/interface/TwoBodyDecayEstimator.h"
 #include "Alignment/TwoBodyDecay/interface/TwoBodyDecayModel.h"
-#include "Alignment/TwoBodyDecay/interface/TwoBodyDecayDerivatives.h"
 #include "FWCore/Utilities/interface/isFinite.h"
 //#include "DataFormats/CLHEP/interface/Migration.h"
 
-TwoBodyDecayEstimator::TwoBodyDecayEstimator( const edm::ParameterSet & config )
-  :theNdf(0)
-{
-  const edm::ParameterSet & estimatorConfig = config.getParameter< edm::ParameterSet >( "EstimatorParameters" );
+TwoBodyDecayEstimator::TwoBodyDecayEstimator(const edm::ParameterSet &config) : theNdf(0) {
+  const edm::ParameterSet &estimatorConfig = config.getParameter<edm::ParameterSet>("EstimatorParameters");
 
-  theRobustificationConstant = estimatorConfig.getUntrackedParameter< double >( "RobustificationConstant", 1.0 );
-  theMaxIterDiff = estimatorConfig.getUntrackedParameter< double >( "MaxIterationDifference", 1e-2 );
-  theMaxIterations = estimatorConfig.getUntrackedParameter< int >( "MaxIterations", 100 );
-  theUseInvariantMass = estimatorConfig.getUntrackedParameter< bool >( "UseInvariantMass", true );
+  theRobustificationConstant = estimatorConfig.getUntrackedParameter<double>("RobustificationConstant", 1.0);
+  theMaxIterDiff = estimatorConfig.getUntrackedParameter<double>("MaxIterationDifference", 1e-2);
+  theMaxIterations = estimatorConfig.getUntrackedParameter<int>("MaxIterations", 100);
+  theUseInvariantMass = estimatorConfig.getUntrackedParameter<bool>("UseInvariantMass", true);
 }
 
-
-TwoBodyDecay TwoBodyDecayEstimator::estimate( const std::vector< RefCountedLinearizedTrackState > & linTracks,
-					      const TwoBodyDecayParameters & linearizationPoint,
-					      const TwoBodyDecayVirtualMeasurement & vm ) const
-{
-  if ( linTracks.size() != 2 )
-  {
-    edm::LogInfo( "Alignment" ) << "@SUB=TwoBodyDecayEstimator::estimate"
-				<< "Need 2 linearized tracks, got " << linTracks.size() << ".\n";
+TwoBodyDecay TwoBodyDecayEstimator::estimate(const std::vector<RefCountedLinearizedTrackState> &linTracks,
+                                             const TwoBodyDecayParameters &linearizationPoint,
+                                             const TwoBodyDecayVirtualMeasurement &vm) const {
+  if (linTracks.size() != 2) {
+    edm::LogInfo("Alignment") << "@SUB=TwoBodyDecayEstimator::estimate"
+                              << "Need 2 linearized tracks, got " << linTracks.size() << ".\n";
     return TwoBodyDecay();
   }
 
@@ -35,8 +30,9 @@ TwoBodyDecay TwoBodyDecayEstimator::estimate( const std::vector< RefCountedLinea
   AlgebraicSymMatrix matG;
   AlgebraicMatrix matA;
 
-  bool check = constructMatrices( linTracks, linearizationPoint, vm, vecM, matG, matA );
-  if ( !check ) return TwoBodyDecay();
+  bool check = constructMatrices(linTracks, linearizationPoint, vm, vecM, matG, matA);
+  if (!check)
+    return TwoBodyDecay();
 
   AlgebraicSymMatrix matGPrime;
   AlgebraicSymMatrix invAtGPrimeA;
@@ -52,181 +48,175 @@ TwoBodyDecay TwoBodyDecayEstimator::estimate( const std::vector< RefCountedLinea
   double oldChi2 = 0.;
   bool isValid = true;
 
-  while( !stopIteration )
-  {
+  while (!stopIteration) {
     matGPrime = matG;
 
     // compute weights
-    if ( nIterations > 0 )
-    {
-      for ( int i = 0; i < 10; i++ )
-      {
-	double sigma = 1./sqrt( matG[i][i] );
-	double sigmaTimesR = sigma*theRobustificationConstant;
-	double absRes = fabs( res[i] ); 
-	if (  absRes > sigmaTimesR ) matGPrime[i][i] *= sigmaTimesR/absRes;
+    if (nIterations > 0) {
+      for (int i = 0; i < 10; i++) {
+        double sigma = 1. / sqrt(matG[i][i]);
+        double sigmaTimesR = sigma * theRobustificationConstant;
+        double absRes = fabs(res[i]);
+        if (absRes > sigmaTimesR)
+          matGPrime[i][i] *= sigmaTimesR / absRes;
       }
     }
 
     // make LS-fit
-    invAtGPrimeA = ( matGPrime.similarityT(matA) ).inverse( checkInversion );
-    if ( checkInversion != 0 )
-    {
-      LogDebug( "Alignment" ) << "@SUB=TwoBodyDecayEstimator::estimate"
-			      << "Matrix At*G'*A not invertible (in iteration " << nIterations
-			      << ", ifail = " << checkInversion << ").\n";
+    invAtGPrimeA = (matGPrime.similarityT(matA)).inverse(checkInversion);
+    if (checkInversion != 0) {
+      LogDebug("Alignment") << "@SUB=TwoBodyDecayEstimator::estimate"
+                            << "Matrix At*G'*A not invertible (in iteration " << nIterations
+                            << ", ifail = " << checkInversion << ").\n";
       isValid = false;
       break;
     }
-    vecEstimate = invAtGPrimeA*matA.T()*matGPrime*vecM;
-    res = matA*vecEstimate - vecM;
-    chi2 = dot( res, matGPrime*res );
+    vecEstimate = invAtGPrimeA * matA.T() * matGPrime * vecM;
+    res = matA * vecEstimate - vecM;
+    chi2 = dot(res, matGPrime * res);
 
-    if ( ( nIterations > 0 ) && ( fabs( chi2 - oldChi2 ) < theMaxIterDiff ) ) stopIteration = true;
-    if ( nIterations == theMaxIterations ) stopIteration = true;
+    if ((nIterations > 0) && (fabs(chi2 - oldChi2) < theMaxIterDiff))
+      stopIteration = true;
+    if (nIterations == theMaxIterations)
+      stopIteration = true;
 
     oldChi2 = chi2;
     nIterations++;
   }
 
-  if ( isValid )
-  {
-    AlgebraicSymMatrix pullsCov = matGPrime.inverse( checkInversion ) - invAtGPrimeA.similarity( matA );
-    thePulls = AlgebraicVector( matG.num_col(), 0 );
-    for ( int i = 0; i < pullsCov.num_col(); i++ ) thePulls[i] = res[i]/sqrt( pullsCov[i][i] );
+  if (isValid) {
+    AlgebraicSymMatrix pullsCov = matGPrime.inverse(checkInversion) - invAtGPrimeA.similarity(matA);
+    thePulls = AlgebraicVector(matG.num_col(), 0);
+    for (int i = 0; i < pullsCov.num_col(); i++)
+      thePulls[i] = res[i] / sqrt(pullsCov[i][i]);
   }
 
   theNdf = matA.num_row() - matA.num_col();
 
-  return TwoBodyDecay( TwoBodyDecayParameters( vecEstimate, invAtGPrimeA ), chi2, isValid, vm );
+  return TwoBodyDecay(TwoBodyDecayParameters(vecEstimate, invAtGPrimeA), chi2, isValid, vm);
 }
 
+bool TwoBodyDecayEstimator::constructMatrices(const std::vector<RefCountedLinearizedTrackState> &linTracks,
+                                              const TwoBodyDecayParameters &linearizationPoint,
+                                              const TwoBodyDecayVirtualMeasurement &vm,
+                                              AlgebraicVector &vecM,
+                                              AlgebraicSymMatrix &matG,
+                                              AlgebraicMatrix &matA) const {
+  PerigeeLinearizedTrackState *linTrack1 = dynamic_cast<PerigeeLinearizedTrackState *>(linTracks[0].get());
+  PerigeeLinearizedTrackState *linTrack2 = dynamic_cast<PerigeeLinearizedTrackState *>(linTracks[1].get());
 
-bool TwoBodyDecayEstimator::constructMatrices( const std::vector< RefCountedLinearizedTrackState > & linTracks,
-					       const TwoBodyDecayParameters & linearizationPoint,
-					       const TwoBodyDecayVirtualMeasurement & vm,
-					       AlgebraicVector & vecM, AlgebraicSymMatrix & matG, AlgebraicMatrix & matA ) const
-{
-
-  PerigeeLinearizedTrackState* linTrack1 = dynamic_cast<PerigeeLinearizedTrackState*>( linTracks[0].get() );
-  PerigeeLinearizedTrackState* linTrack2 = dynamic_cast<PerigeeLinearizedTrackState*>( linTracks[1].get() );
-
-  if (!linTrack1 || !linTrack2) return false;
+  if (!linTrack1 || !linTrack2)
+    return false;
 
-  AlgebraicVector trackParam1 = asHepVector( linTrack1->predictedStateParameters() );
-  AlgebraicVector trackParam2 = asHepVector( linTrack2->predictedStateParameters() );
+  AlgebraicVector trackParam1 = asHepVector(linTrack1->predictedStateParameters());
+  AlgebraicVector trackParam2 = asHepVector(linTrack2->predictedStateParameters());
 
-  if ( checkValues( trackParam1 ) || checkValues( trackParam2 ) || checkValues( linearizationPoint.parameters() ) ) return false;
+  if (checkValues(trackParam1) || checkValues(trackParam2) || checkValues(linearizationPoint.parameters()))
+    return false;
 
-  AlgebraicVector vecLinParam = linearizationPoint.sub( TwoBodyDecayParameters::px,
-							TwoBodyDecayParameters::mass );
+  AlgebraicVector vecLinParam = linearizationPoint.sub(TwoBodyDecayParameters::px, TwoBodyDecayParameters::mass);
 
-  double zMagField = linTrack1->track().field()->inInverseGeV( linTrack1->linearizationPoint() ).z();
+  double zMagField = linTrack1->track().field()->inInverseGeV(linTrack1->linearizationPoint()).z();
 
   int checkInversion = 0;
 
-  TwoBodyDecayDerivatives tpeDerivatives( linearizationPoint[TwoBodyDecayParameters::mass], vm.secondaryMass() );
-  std::pair< AlgebraicMatrix, AlgebraicMatrix > derivatives = tpeDerivatives.derivatives( linearizationPoint );
+  TwoBodyDecayDerivatives tpeDerivatives(linearizationPoint[TwoBodyDecayParameters::mass], vm.secondaryMass());
+  std::pair<AlgebraicMatrix, AlgebraicMatrix> derivatives = tpeDerivatives.derivatives(linearizationPoint);
 
-  TwoBodyDecayModel decayModel( linearizationPoint[TwoBodyDecayParameters::mass], vm.secondaryMass() );
-  std::pair< AlgebraicVector, AlgebraicVector > linCartMomenta = decayModel.cartesianSecondaryMomenta( linearizationPoint );
+  TwoBodyDecayModel decayModel(linearizationPoint[TwoBodyDecayParameters::mass], vm.secondaryMass());
+  std::pair<AlgebraicVector, AlgebraicVector> linCartMomenta = decayModel.cartesianSecondaryMomenta(linearizationPoint);
 
   // first track
-  AlgebraicMatrix matA1 = asHepMatrix( linTrack1->positionJacobian() );
-  AlgebraicMatrix matB1 = asHepMatrix( linTrack1->momentumJacobian() );
-  AlgebraicVector vecC1 = asHepVector( linTrack1->constantTerm() );
+  AlgebraicMatrix matA1 = asHepMatrix(linTrack1->positionJacobian());
+  AlgebraicMatrix matB1 = asHepMatrix(linTrack1->momentumJacobian());
+  AlgebraicVector vecC1 = asHepVector(linTrack1->constantTerm());
 
-  AlgebraicVector curvMomentum1 = asHepVector( linTrack1->predictedStateMomentumParameters() );
-  AlgebraicMatrix curv2cart1 = decayModel.curvilinearToCartesianJacobian( curvMomentum1, zMagField );
+  AlgebraicVector curvMomentum1 = asHepVector(linTrack1->predictedStateMomentumParameters());
+  AlgebraicMatrix curv2cart1 = decayModel.curvilinearToCartesianJacobian(curvMomentum1, zMagField);
 
-  AlgebraicVector cartMomentum1 = decayModel.convertCurvilinearToCartesian( curvMomentum1, zMagField );
-  vecC1 += matB1*( curvMomentum1 - curv2cart1*cartMomentum1 );
-  matB1 = matB1*curv2cart1;
+  AlgebraicVector cartMomentum1 = decayModel.convertCurvilinearToCartesian(curvMomentum1, zMagField);
+  vecC1 += matB1 * (curvMomentum1 - curv2cart1 * cartMomentum1);
+  matB1 = matB1 * curv2cart1;
 
   AlgebraicMatrix matF1 = derivatives.first;
-  AlgebraicVector vecD1 = linCartMomenta.first - matF1*vecLinParam;
-  AlgebraicVector vecM1 = trackParam1 - vecC1 - matB1*vecD1;
-  AlgebraicSymMatrix covM1 = asHepMatrix( linTrack1->predictedStateError() );
-
-
-  AlgebraicSymMatrix matG1 = covM1.inverse( checkInversion );
-  if ( checkInversion != 0 )
-  {
-    LogDebug( "Alignment" ) << "@SUB=TwoBodyDecayEstimator::constructMatrices"
-			    << "Matrix covM1 not invertible.";
+  AlgebraicVector vecD1 = linCartMomenta.first - matF1 * vecLinParam;
+  AlgebraicVector vecM1 = trackParam1 - vecC1 - matB1 * vecD1;
+  AlgebraicSymMatrix covM1 = asHepMatrix(linTrack1->predictedStateError());
+
+  AlgebraicSymMatrix matG1 = covM1.inverse(checkInversion);
+  if (checkInversion != 0) {
+    LogDebug("Alignment") << "@SUB=TwoBodyDecayEstimator::constructMatrices"
+                          << "Matrix covM1 not invertible.";
     return false;
   }
 
   // diagonalize for robustification
-   AlgebraicMatrix matU1 = diagonalize( &matG1 ).T();
+  AlgebraicMatrix matU1 = diagonalize(&matG1).T();
 
   // second track
-  AlgebraicMatrix matA2 = asHepMatrix( linTrack2->positionJacobian() );
-  AlgebraicMatrix matB2 = asHepMatrix( linTrack2->momentumJacobian() );
-  AlgebraicVector vecC2 = asHepVector( linTrack2->constantTerm() );
+  AlgebraicMatrix matA2 = asHepMatrix(linTrack2->positionJacobian());
+  AlgebraicMatrix matB2 = asHepMatrix(linTrack2->momentumJacobian());
+  AlgebraicVector vecC2 = asHepVector(linTrack2->constantTerm());
 
-  AlgebraicVector curvMomentum2 = asHepVector( linTrack2->predictedStateMomentumParameters() );
-  AlgebraicMatrix curv2cart2 = decayModel.curvilinearToCartesianJacobian( curvMomentum2, zMagField );
+  AlgebraicVector curvMomentum2 = asHepVector(linTrack2->predictedStateMomentumParameters());
+  AlgebraicMatrix curv2cart2 = decayModel.curvilinearToCartesianJacobian(curvMomentum2, zMagField);
 
-  AlgebraicVector cartMomentum2 = decayModel.convertCurvilinearToCartesian( curvMomentum2, zMagField );
-  vecC2 += matB2*( curvMomentum2 - curv2cart2*cartMomentum2 );
-  matB2 = matB2*curv2cart2;
+  AlgebraicVector cartMomentum2 = decayModel.convertCurvilinearToCartesian(curvMomentum2, zMagField);
+  vecC2 += matB2 * (curvMomentum2 - curv2cart2 * cartMomentum2);
+  matB2 = matB2 * curv2cart2;
 
   AlgebraicMatrix matF2 = derivatives.second;
-  AlgebraicVector vecD2 = linCartMomenta.second - matF2*vecLinParam;
-  AlgebraicVector vecM2 = trackParam2 - vecC2 - matB2*vecD2;
-  AlgebraicSymMatrix covM2 = asHepMatrix( linTrack2->predictedStateError() );
-
-  AlgebraicSymMatrix matG2 = covM2.inverse( checkInversion );
-  if ( checkInversion != 0 )
-  {
-    LogDebug( "Alignment" ) << "@SUB=TwoBodyDecayEstimator::constructMatrices"
-			    << "Matrix covM2 not invertible.";
+  AlgebraicVector vecD2 = linCartMomenta.second - matF2 * vecLinParam;
+  AlgebraicVector vecM2 = trackParam2 - vecC2 - matB2 * vecD2;
+  AlgebraicSymMatrix covM2 = asHepMatrix(linTrack2->predictedStateError());
+
+  AlgebraicSymMatrix matG2 = covM2.inverse(checkInversion);
+  if (checkInversion != 0) {
+    LogDebug("Alignment") << "@SUB=TwoBodyDecayEstimator::constructMatrices"
+                          << "Matrix covM2 not invertible.";
     return false;
   }
 
   // diagonalize for robustification
-  AlgebraicMatrix matU2 = diagonalize( &matG2 ).T();
+  AlgebraicMatrix matU2 = diagonalize(&matG2).T();
 
   // combine first and second track
-  vecM = AlgebraicVector( 14, 0 );
-  vecM.sub( 1, matU1*vecM1 );
-  vecM.sub( 6, matU2*vecM2 );
+  vecM = AlgebraicVector(14, 0);
+  vecM.sub(1, matU1 * vecM1);
+  vecM.sub(6, matU2 * vecM2);
   // virtual measurement of the primary mass
-  vecM( 11 ) = vm.primaryMass();
+  vecM(11) = vm.primaryMass();
   // virtual measurement of the beam spot
-  vecM.sub( 12, vm.beamSpotPosition() );
+  vecM.sub(12, vm.beamSpotPosition());
 
   // full weight matrix
-  matG = AlgebraicSymMatrix( 14, 0 );
-  matG.sub( 1, matG1 );
-  matG.sub( 6, matG2 );
+  matG = AlgebraicSymMatrix(14, 0);
+  matG.sub(1, matG1);
+  matG.sub(6, matG2);
   // virtual measurement error of the primary mass
-  matG[10][10] = 1./( vm.primaryWidth()*vm.primaryWidth() );
+  matG[10][10] = 1. / (vm.primaryWidth() * vm.primaryWidth());
   // virtual measurement error of the beam spot
-  matG.sub( 12, vm.beamSpotError().inverse( checkInversion ) );
+  matG.sub(12, vm.beamSpotError().inverse(checkInversion));
 
   // full derivative matrix
-  matA = AlgebraicMatrix( 14, 9, 0 );
-  matA.sub( 1, 1, matU1*matA1 );
-  matA.sub( 6, 1, matU2*matA2 );
-  matA.sub( 1, 4, matU1*matB1*matF1 );
-  matA.sub( 6, 4, matU2*matB2*matF2 );
-  matA( 11, 9 ) = 1.;//mass
-  matA( 12, 1 ) = 1.;//vx
-  matA( 13, 2 ) = 1.;//vy
-  matA( 14, 3 ) = 1.;//vz
+  matA = AlgebraicMatrix(14, 9, 0);
+  matA.sub(1, 1, matU1 * matA1);
+  matA.sub(6, 1, matU2 * matA2);
+  matA.sub(1, 4, matU1 * matB1 * matF1);
+  matA.sub(6, 4, matU2 * matB2 * matF2);
+  matA(11, 9) = 1.;  // mass
+  matA(12, 1) = 1.;  // vx
+  matA(13, 2) = 1.;  // vy
+  matA(14, 3) = 1.;  // vz
 
   return true;
 }
 
-
-bool TwoBodyDecayEstimator::checkValues( const AlgebraicVector & vec ) const
-{
+bool TwoBodyDecayEstimator::checkValues(const AlgebraicVector &vec) const {
   bool isNotFinite = false;
 
-  for ( int i = 0; i < vec.num_col(); ++i )
-    isNotFinite |= edm::isNotFinite( vec[i] );
+  for (int i = 0; i < vec.num_col(); ++i)
+    isNotFinite |= edm::isNotFinite(vec[i]);
 
   return isNotFinite;
 }
diff --git a/Alignment/TwoBodyDecay/src/TwoBodyDecayFitter.cc b/Alignment/TwoBodyDecay/src/TwoBodyDecayFitter.cc
index 1e98b9e0c8ed5..3ae75d26f232d 100644
--- a/Alignment/TwoBodyDecay/src/TwoBodyDecayFitter.cc
+++ b/Alignment/TwoBodyDecay/src/TwoBodyDecayFitter.cc
@@ -1,60 +1,54 @@
 #include "Alignment/TwoBodyDecay/interface/TwoBodyDecayFitter.h"
 
-TwoBodyDecayFitter::TwoBodyDecayFitter( const edm::ParameterSet & config ) :
-  theVertexFinder( new DefaultLinearizationPointFinder() ),
-  theLinPointFinder( new TwoBodyDecayLinearizationPointFinder( config ) ),
-  theEstimator( new TwoBodyDecayEstimator( config ) ) {}
+TwoBodyDecayFitter::TwoBodyDecayFitter(const edm::ParameterSet &config)
+    : theVertexFinder(new DefaultLinearizationPointFinder()),
+      theLinPointFinder(new TwoBodyDecayLinearizationPointFinder(config)),
+      theEstimator(new TwoBodyDecayEstimator(config)) {}
 
+TwoBodyDecayFitter::TwoBodyDecayFitter(const edm::ParameterSet &config,
+                                       const LinearizationPointFinder *vf,
+                                       const TwoBodyDecayLinearizationPointFinder *lpf,
+                                       const TwoBodyDecayEstimator *est)
+    : theVertexFinder(vf->clone()), theLinPointFinder(lpf->clone()), theEstimator(est->clone()) {}
 
-TwoBodyDecayFitter::TwoBodyDecayFitter( const edm::ParameterSet & config,
-					const LinearizationPointFinder* vf,
-					const TwoBodyDecayLinearizationPointFinder* lpf,
-					const TwoBodyDecayEstimator* est ) :
-  theVertexFinder( vf->clone() ),
-  theLinPointFinder( lpf->clone() ),
-  theEstimator( est->clone() ) {}
+TwoBodyDecayFitter::~TwoBodyDecayFitter(void) {}
 
-
-TwoBodyDecayFitter::~TwoBodyDecayFitter( void ) {}
-
-
-const TwoBodyDecay TwoBodyDecayFitter::estimate( const std::vector< reco::TransientTrack >& tracks,
-						 const TwoBodyDecayVirtualMeasurement& vm ) const
-{
+const TwoBodyDecay TwoBodyDecayFitter::estimate(const std::vector<reco::TransientTrack> &tracks,
+                                                const TwoBodyDecayVirtualMeasurement &vm) const {
   // get geometrical linearization point
-  GlobalPoint linVertex = theVertexFinder->getLinearizationPoint( tracks );
+  GlobalPoint linVertex = theVertexFinder->getLinearizationPoint(tracks);
 
   // create linearized track states
-  std::vector< RefCountedLinearizedTrackState > linTracks;
-  linTracks.push_back( theLinTrackStateFactory.linearizedTrackState( linVertex, tracks[0] ) );
-  linTracks.push_back( theLinTrackStateFactory.linearizedTrackState( linVertex, tracks[1] ) );
+  std::vector<RefCountedLinearizedTrackState> linTracks;
+  linTracks.push_back(theLinTrackStateFactory.linearizedTrackState(linVertex, tracks[0]));
+  linTracks.push_back(theLinTrackStateFactory.linearizedTrackState(linVertex, tracks[1]));
 
   // get full linearization point (geomatrical & kinematical)
-  const TwoBodyDecayParameters linPoint = theLinPointFinder->getLinearizationPoint( linTracks, vm.primaryMass(), vm.secondaryMass() );
+  const TwoBodyDecayParameters linPoint =
+      theLinPointFinder->getLinearizationPoint(linTracks, vm.primaryMass(), vm.secondaryMass());
 
   // make the fit
-  return theEstimator->estimate( linTracks, linPoint, vm );
+  return theEstimator->estimate(linTracks, linPoint, vm);
 }
 
-
-const TwoBodyDecay TwoBodyDecayFitter::estimate( const std::vector< reco::TransientTrack >& tracks,
-						 const std::vector< TrajectoryStateOnSurface >& tsos,
-						 const TwoBodyDecayVirtualMeasurement& vm ) const
-{
+const TwoBodyDecay TwoBodyDecayFitter::estimate(const std::vector<reco::TransientTrack> &tracks,
+                                                const std::vector<TrajectoryStateOnSurface> &tsos,
+                                                const TwoBodyDecayVirtualMeasurement &vm) const {
   // get geometrical linearization point
-  std::vector< FreeTrajectoryState > freeTrajStates;
-  freeTrajStates.push_back( *tsos[0].freeState() );
-  freeTrajStates.push_back( *tsos[1].freeState() );
-  GlobalPoint linVertex = theVertexFinder->getLinearizationPoint( freeTrajStates );
+  std::vector<FreeTrajectoryState> freeTrajStates;
+  freeTrajStates.push_back(*tsos[0].freeState());
+  freeTrajStates.push_back(*tsos[1].freeState());
+  GlobalPoint linVertex = theVertexFinder->getLinearizationPoint(freeTrajStates);
 
   // create linearized track states
-  std::vector< RefCountedLinearizedTrackState > linTracks;
-  linTracks.push_back( theLinTrackStateFactory.linearizedTrackState( linVertex, tracks[0], tsos[0] ) );
-  linTracks.push_back( theLinTrackStateFactory.linearizedTrackState( linVertex, tracks[1], tsos[1] ) );
+  std::vector<RefCountedLinearizedTrackState> linTracks;
+  linTracks.push_back(theLinTrackStateFactory.linearizedTrackState(linVertex, tracks[0], tsos[0]));
+  linTracks.push_back(theLinTrackStateFactory.linearizedTrackState(linVertex, tracks[1], tsos[1]));
 
   // get full linearization point (geomatrical & kinematical)
-  const TwoBodyDecayParameters linPoint = theLinPointFinder->getLinearizationPoint( linTracks, vm.primaryMass(), vm.secondaryMass() );
+  const TwoBodyDecayParameters linPoint =
+      theLinPointFinder->getLinearizationPoint(linTracks, vm.primaryMass(), vm.secondaryMass());
 
   // make the fit
-  return theEstimator->estimate( linTracks, linPoint, vm );
+  return theEstimator->estimate(linTracks, linPoint, vm);
 }
diff --git a/Alignment/TwoBodyDecay/src/TwoBodyDecayLinearizationPointFinder.cc b/Alignment/TwoBodyDecay/src/TwoBodyDecayLinearizationPointFinder.cc
index 58822b4426468..104472647510c 100644
--- a/Alignment/TwoBodyDecay/src/TwoBodyDecayLinearizationPointFinder.cc
+++ b/Alignment/TwoBodyDecay/src/TwoBodyDecayLinearizationPointFinder.cc
@@ -1,93 +1,96 @@
 
 #include "Alignment/TwoBodyDecay/interface/TwoBodyDecayLinearizationPointFinder.h"
-#include "DataFormats/CLHEP/interface/AlgebraicObjects.h" 
 #include "Alignment/TwoBodyDecay/interface/TwoBodyDecayModel.h"
+#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
 
-const TwoBodyDecayParameters 
-TwoBodyDecayLinearizationPointFinder::getLinearizationPoint( const std::vector< RefCountedLinearizedTrackState > & tracks,
-							     const double primaryMass,
-							     const double secondaryMass ) const
-{
+const TwoBodyDecayParameters TwoBodyDecayLinearizationPointFinder::getLinearizationPoint(
+    const std::vector<RefCountedLinearizedTrackState> &tracks,
+    const double primaryMass,
+    const double secondaryMass) const {
   GlobalPoint linPoint = tracks[0]->linearizationPoint();
-  PerigeeLinearizedTrackState* linTrack1 = dynamic_cast<PerigeeLinearizedTrackState*>( tracks[0].get() );
-  PerigeeLinearizedTrackState* linTrack2 = dynamic_cast<PerigeeLinearizedTrackState*>( tracks[1].get() );
-  if (!linTrack1 || !linTrack2) return TwoBodyDecayParameters();
+  PerigeeLinearizedTrackState *linTrack1 = dynamic_cast<PerigeeLinearizedTrackState *>(tracks[0].get());
+  PerigeeLinearizedTrackState *linTrack2 = dynamic_cast<PerigeeLinearizedTrackState *>(tracks[1].get());
+  if (!linTrack1 || !linTrack2)
+    return TwoBodyDecayParameters();
 
   GlobalVector firstMomentum = linTrack1->predictedState().momentum();
   GlobalVector secondMomentum = linTrack2->predictedState().momentum();
 
-  AlgebraicVector secondaryMomentum1( 3 );
+  AlgebraicVector secondaryMomentum1(3);
   secondaryMomentum1[0] = firstMomentum.x();
   secondaryMomentum1[1] = firstMomentum.y();
   secondaryMomentum1[2] = firstMomentum.z();
 
-  AlgebraicVector secondaryMomentum2( 3 );
+  AlgebraicVector secondaryMomentum2(3);
   secondaryMomentum2[0] = secondMomentum.x();
   secondaryMomentum2[1] = secondMomentum.y();
   secondaryMomentum2[2] = secondMomentum.z();
 
   AlgebraicVector primaryMomentum = secondaryMomentum1 + secondaryMomentum2;
 
-  TwoBodyDecayModel decayModel( primaryMass, secondaryMass );
-  AlgebraicMatrix rotMat = decayModel.rotationMatrix( primaryMomentum[0], primaryMomentum[1], primaryMomentum[2] );
+  TwoBodyDecayModel decayModel(primaryMass, secondaryMass);
+  AlgebraicMatrix rotMat = decayModel.rotationMatrix(primaryMomentum[0], primaryMomentum[1], primaryMomentum[2]);
   AlgebraicMatrix invRotMat = rotMat.T();
 
   double p = primaryMomentum.norm();
-  double pSquared = p*p;
-  double gamma = sqrt( pSquared + primaryMass*primaryMass )/primaryMass;
-  double betaGamma = p/primaryMass;
-  AlgebraicSymMatrix lorentzTransformation( 4, 1 );
+  double pSquared = p * p;
+  double gamma = sqrt(pSquared + primaryMass * primaryMass) / primaryMass;
+  double betaGamma = p / primaryMass;
+  AlgebraicSymMatrix lorentzTransformation(4, 1);
   lorentzTransformation[0][0] = gamma;
   lorentzTransformation[3][3] = gamma;
   lorentzTransformation[0][3] = -betaGamma;
 
   double p1 = secondaryMomentum1.norm();
-  AlgebraicVector boostedLorentzMomentum1( 4 );
-  boostedLorentzMomentum1[0] = sqrt( p1*p1 + secondaryMass*secondaryMass );
-  boostedLorentzMomentum1.sub( 2, invRotMat*secondaryMomentum1 );
+  AlgebraicVector boostedLorentzMomentum1(4);
+  boostedLorentzMomentum1[0] = sqrt(p1 * p1 + secondaryMass * secondaryMass);
+  boostedLorentzMomentum1.sub(2, invRotMat * secondaryMomentum1);
 
-  AlgebraicVector restFrameLorentzMomentum1 = lorentzTransformation*boostedLorentzMomentum1;
-  AlgebraicVector restFrameMomentum1 = restFrameLorentzMomentum1.sub( 2, 4 );
-  double perp1 = sqrt( restFrameMomentum1[0]*restFrameMomentum1[0] + restFrameMomentum1[1]*restFrameMomentum1[1] );
-  double theta1 = atan2( perp1, restFrameMomentum1[2] );
-  double phi1 = atan2( restFrameMomentum1[1], restFrameMomentum1[0] );
+  AlgebraicVector restFrameLorentzMomentum1 = lorentzTransformation * boostedLorentzMomentum1;
+  AlgebraicVector restFrameMomentum1 = restFrameLorentzMomentum1.sub(2, 4);
+  double perp1 = sqrt(restFrameMomentum1[0] * restFrameMomentum1[0] + restFrameMomentum1[1] * restFrameMomentum1[1]);
+  double theta1 = atan2(perp1, restFrameMomentum1[2]);
+  double phi1 = atan2(restFrameMomentum1[1], restFrameMomentum1[0]);
 
   double p2 = secondaryMomentum2.norm();
-  AlgebraicVector boostedLorentzMomentum2( 4 );
-  boostedLorentzMomentum2[0] = sqrt( p2*p2 + secondaryMass*secondaryMass );
-  boostedLorentzMomentum2.sub( 2, invRotMat*secondaryMomentum2 );
+  AlgebraicVector boostedLorentzMomentum2(4);
+  boostedLorentzMomentum2[0] = sqrt(p2 * p2 + secondaryMass * secondaryMass);
+  boostedLorentzMomentum2.sub(2, invRotMat * secondaryMomentum2);
 
-  AlgebraicVector restFrameLorentzMomentum2 = lorentzTransformation*boostedLorentzMomentum2;
-  AlgebraicVector restFrameMomentum2 = restFrameLorentzMomentum2.sub( 2, 4 );
-  double perp2 = sqrt( restFrameMomentum2[0]*restFrameMomentum2[0] + restFrameMomentum2[1]*restFrameMomentum2[1] );
-  double theta2 = atan2( perp2, restFrameMomentum2[2] );
-  double phi2 = atan2( restFrameMomentum2[1], restFrameMomentum2[0] );
+  AlgebraicVector restFrameLorentzMomentum2 = lorentzTransformation * boostedLorentzMomentum2;
+  AlgebraicVector restFrameMomentum2 = restFrameLorentzMomentum2.sub(2, 4);
+  double perp2 = sqrt(restFrameMomentum2[0] * restFrameMomentum2[0] + restFrameMomentum2[1] * restFrameMomentum2[1]);
+  double theta2 = atan2(perp2, restFrameMomentum2[2]);
+  double phi2 = atan2(restFrameMomentum2[1], restFrameMomentum2[0]);
 
   double pi = 3.141592654;
   double relSign = -1.;
 
-  if ( phi1 < 0 ) phi1 += 2*pi;
-  if ( phi2 < 0 ) phi2 += 2*pi;
-  if ( phi1 > phi2 ) relSign = 1.;
+  if (phi1 < 0)
+    phi1 += 2 * pi;
+  if (phi2 < 0)
+    phi2 += 2 * pi;
+  if (phi1 > phi2)
+    relSign = 1.;
 
   double momentumSquared1 = secondaryMomentum1.normsq();
-  double energy1 = sqrt( secondaryMass*secondaryMass + momentumSquared1 );
+  double energy1 = sqrt(secondaryMass * secondaryMass + momentumSquared1);
   double momentumSquared2 = secondaryMomentum2.normsq();
-  double energy2 = sqrt( secondaryMass*secondaryMass + momentumSquared2 );
-  double sumMomentaSquared = ( secondaryMomentum1 + secondaryMomentum2 ).normsq();
-  double sumEnergiesSquared = ( energy1 + energy2 )*( energy1 + energy2 );
-  double estimatedPrimaryMass = sqrt( sumEnergiesSquared - sumMomentaSquared );
+  double energy2 = sqrt(secondaryMass * secondaryMass + momentumSquared2);
+  double sumMomentaSquared = (secondaryMomentum1 + secondaryMomentum2).normsq();
+  double sumEnergiesSquared = (energy1 + energy2) * (energy1 + energy2);
+  double estimatedPrimaryMass = sqrt(sumEnergiesSquared - sumMomentaSquared);
 
-  AlgebraicVector linParam( TwoBodyDecayParameters::dimension, 0 );
+  AlgebraicVector linParam(TwoBodyDecayParameters::dimension, 0);
   linParam[TwoBodyDecayParameters::x] = linPoint.x();
   linParam[TwoBodyDecayParameters::y] = linPoint.y();
   linParam[TwoBodyDecayParameters::z] = linPoint.z();
   linParam[TwoBodyDecayParameters::px] = primaryMomentum[0];
   linParam[TwoBodyDecayParameters::py] = primaryMomentum[1];
   linParam[TwoBodyDecayParameters::pz] = primaryMomentum[2];
-  linParam[TwoBodyDecayParameters::theta] = 0.5*( theta1 - theta2 + pi ) ;
-  linParam[TwoBodyDecayParameters::phi] = 0.5*( phi1 + phi2 + relSign*pi );
+  linParam[TwoBodyDecayParameters::theta] = 0.5 * (theta1 - theta2 + pi);
+  linParam[TwoBodyDecayParameters::phi] = 0.5 * (phi1 + phi2 + relSign * pi);
   linParam[TwoBodyDecayParameters::mass] = estimatedPrimaryMass;
 
-  return TwoBodyDecayParameters( linParam );
+  return TwoBodyDecayParameters(linParam);
 }
diff --git a/Alignment/TwoBodyDecay/src/TwoBodyDecayModel.cc b/Alignment/TwoBodyDecay/src/TwoBodyDecayModel.cc
index bb8d2eee995cd..868bb0cac64ec 100644
--- a/Alignment/TwoBodyDecay/src/TwoBodyDecayModel.cc
+++ b/Alignment/TwoBodyDecay/src/TwoBodyDecayModel.cc
@@ -1,92 +1,84 @@
 
 #include "Alignment/TwoBodyDecay/interface/TwoBodyDecayModel.h"
 
-
-TwoBodyDecayModel::TwoBodyDecayModel( double mPrimary, double mSecondary ) :
-  thePrimaryMass( mPrimary ), theSecondaryMass( mSecondary ) {}
-
+TwoBodyDecayModel::TwoBodyDecayModel(double mPrimary, double mSecondary)
+    : thePrimaryMass(mPrimary), theSecondaryMass(mSecondary) {}
 
 TwoBodyDecayModel::~TwoBodyDecayModel() {}
 
-
-AlgebraicMatrix TwoBodyDecayModel::rotationMatrix( double px, double py, double pz )
-{
+AlgebraicMatrix TwoBodyDecayModel::rotationMatrix(double px, double py, double pz) {
   // compute transverse and absolute momentum
-  double pT2 = px*px + py*py;
-  double p2 = pT2 + pz*pz;
-  double pT = sqrt( pT2 );
-  double p = sqrt( p2 );
+  double pT2 = px * px + py * py;
+  double p2 = pT2 + pz * pz;
+  double pT = sqrt(pT2);
+  double p = sqrt(p2);
 
-  AlgebraicMatrix rotMat( 3, 3 );
+  AlgebraicMatrix rotMat(3, 3);
 
   // compute rotation matrix
-  rotMat[0][0] = px*pz/pT/p;
-  rotMat[0][1] = -py/pT;
-  rotMat[0][2] = px/p;
+  rotMat[0][0] = px * pz / pT / p;
+  rotMat[0][1] = -py / pT;
+  rotMat[0][2] = px / p;
 
-  rotMat[1][0] = py*pz/pT/p;
-  rotMat[1][1] = px/pT;
-  rotMat[1][2] = py/p;
+  rotMat[1][0] = py * pz / pT / p;
+  rotMat[1][1] = px / pT;
+  rotMat[1][2] = py / p;
 
-  rotMat[2][0] = -pT/p;
+  rotMat[2][0] = -pT / p;
   rotMat[2][1] = 0.;
-  rotMat[2][2] = pz/p;
+  rotMat[2][2] = pz / p;
 
   return rotMat;
 }
 
+AlgebraicMatrix TwoBodyDecayModel::curvilinearToCartesianJacobian(double rho,
+                                                                  double theta,
+                                                                  double phi,
+                                                                  double zMagField) {
+  double q = ((rho < 0) ? -1. : 1.);
+  double conv = q * zMagField;
 
-AlgebraicMatrix TwoBodyDecayModel::curvilinearToCartesianJacobian( double rho, double theta, double phi, double zMagField )
-{
-  double q = ( ( rho < 0 ) ? -1. : 1. );
-  double conv = q*zMagField;
-
-  double stheta = sin( theta );
-  double ctheta = cos( theta );
-  double sphi = sin( phi );
-  double cphi = cos( phi );
+  double stheta = sin(theta);
+  double ctheta = cos(theta);
+  double sphi = sin(phi);
+  double cphi = cos(phi);
 
-  AlgebraicMatrix curv2cart( 3, 3 );
+  AlgebraicMatrix curv2cart(3, 3);
 
-  curv2cart[0][0] = -rho*cphi;
-  curv2cart[0][1] = -rho*sphi;
+  curv2cart[0][0] = -rho * cphi;
+  curv2cart[0][1] = -rho * sphi;
   curv2cart[0][2] = 0.;
 
-  curv2cart[1][0] = cphi*stheta*ctheta;
-  curv2cart[1][1] = sphi*stheta*ctheta;
-  curv2cart[1][2] = -stheta*stheta;
+  curv2cart[1][0] = cphi * stheta * ctheta;
+  curv2cart[1][1] = sphi * stheta * ctheta;
+  curv2cart[1][2] = -stheta * stheta;
 
   curv2cart[2][0] = -sphi;
   curv2cart[2][1] = cphi;
   curv2cart[2][2] = 0.;
 
-  curv2cart *= rho/conv;
+  curv2cart *= rho / conv;
 
   return curv2cart;
 }
 
-
-AlgebraicMatrix TwoBodyDecayModel::curvilinearToCartesianJacobian( const AlgebraicVector& curv, double zMagField )
-{
-  return this->curvilinearToCartesianJacobian( curv[0], curv[1], curv[2], zMagField );
+AlgebraicMatrix TwoBodyDecayModel::curvilinearToCartesianJacobian(const AlgebraicVector &curv, double zMagField) {
+  return this->curvilinearToCartesianJacobian(curv[0], curv[1], curv[2], zMagField);
 }
 
+AlgebraicVector TwoBodyDecayModel::convertCurvilinearToCartesian(const AlgebraicVector &curv, double zMagField) {
+  double rt = fabs(zMagField / curv[0]);
 
-AlgebraicVector TwoBodyDecayModel::convertCurvilinearToCartesian( const AlgebraicVector& curv, double zMagField )
-{
-  double rt = fabs( zMagField/curv[0] );
-
-  AlgebraicVector cart( 3 );
-  cart[0] = rt*cos( curv[2] );
-  cart[1] = rt*sin( curv[2] );
-  cart[2] = rt/tan( curv[1] );
+  AlgebraicVector cart(3);
+  cart[0] = rt * cos(curv[2]);
+  cart[1] = rt * sin(curv[2]);
+  cart[2] = rt / tan(curv[1]);
 
   return cart;
 }
 
-
-const std::pair< AlgebraicVector, AlgebraicVector > TwoBodyDecayModel::cartesianSecondaryMomenta( const AlgebraicVector & param )
-{
+const std::pair<AlgebraicVector, AlgebraicVector> TwoBodyDecayModel::cartesianSecondaryMomenta(
+    const AlgebraicVector &param) {
   double px = param[TwoBodyDecayParameters::px];
   double py = param[TwoBodyDecayParameters::py];
   double pz = param[TwoBodyDecayParameters::pz];
@@ -94,45 +86,43 @@ const std::pair< AlgebraicVector, AlgebraicVector > TwoBodyDecayModel::cartesian
   double phi = param[TwoBodyDecayParameters::phi];
 
   // compute transverse and absolute momentum
-  double pT2 = px*px + py*py;
-  double p2 = pT2 + pz*pz;
-  double p = sqrt( p2 );
+  double pT2 = px * px + py * py;
+  double p2 = pT2 + pz * pz;
+  double p = sqrt(p2);
 
-  double sphi = sin( phi );
-  double cphi = cos( phi );
-  double stheta = sin( theta );
-  double ctheta = cos( theta );
+  double sphi = sin(phi);
+  double cphi = cos(phi);
+  double stheta = sin(theta);
+  double ctheta = cos(theta);
 
   // some constants from kinematics
-  double c1 = 0.5*thePrimaryMass/theSecondaryMass;
-  double c2 = sqrt( c1*c1 - 1. );
-  double c3 = 0.5*c2*ctheta/c1;
-  double c4 = sqrt( p2 + thePrimaryMass*thePrimaryMass );
+  double c1 = 0.5 * thePrimaryMass / theSecondaryMass;
+  double c2 = sqrt(c1 * c1 - 1.);
+  double c3 = 0.5 * c2 * ctheta / c1;
+  double c4 = sqrt(p2 + thePrimaryMass * thePrimaryMass);
 
   // momentum of decay particle 1 in the primary's boosted frame
-  AlgebraicMatrix pplus( 3, 1 );
-  pplus[0][0] = theSecondaryMass*c2*stheta*cphi;
-  pplus[1][0] = theSecondaryMass*c2*stheta*sphi;
-  pplus[2][0] = 0.5*p + c3*c4;
+  AlgebraicMatrix pplus(3, 1);
+  pplus[0][0] = theSecondaryMass * c2 * stheta * cphi;
+  pplus[1][0] = theSecondaryMass * c2 * stheta * sphi;
+  pplus[2][0] = 0.5 * p + c3 * c4;
 
   // momentum of decay particle 2 in the primary's boosted frame
-  AlgebraicMatrix pminus( 3, 1 );
+  AlgebraicMatrix pminus(3, 1);
   pminus[0][0] = -pplus[0][0];
   pminus[1][0] = -pplus[1][0];
-  pminus[2][0] = 0.5*p - c3*c4;
+  pminus[2][0] = 0.5 * p - c3 * c4;
 
-  AlgebraicMatrix rotMat = rotationMatrix( px, py, pz );
+  AlgebraicMatrix rotMat = rotationMatrix(px, py, pz);
 
-  return std::make_pair( rotMat*pplus, rotMat*pminus );
+  return std::make_pair(rotMat * pplus, rotMat * pminus);
 }
 
-
-const std::pair< AlgebraicVector, AlgebraicVector > TwoBodyDecayModel::cartesianSecondaryMomenta( const TwoBodyDecay & tbd )
-{
-  return cartesianSecondaryMomenta( tbd.parameters() );
+const std::pair<AlgebraicVector, AlgebraicVector> TwoBodyDecayModel::cartesianSecondaryMomenta(const TwoBodyDecay &tbd) {
+  return cartesianSecondaryMomenta(tbd.parameters());
 }
 
-const std::pair< AlgebraicVector, AlgebraicVector > TwoBodyDecayModel::cartesianSecondaryMomenta( const TwoBodyDecayParameters & tbdparam )
-{
-  return cartesianSecondaryMomenta( tbdparam.parameters() );
+const std::pair<AlgebraicVector, AlgebraicVector> TwoBodyDecayModel::cartesianSecondaryMomenta(
+    const TwoBodyDecayParameters &tbdparam) {
+  return cartesianSecondaryMomenta(tbdparam.parameters());
 }
diff --git a/AnalysisDataFormats/Egamma/BuildFile.xml b/AnalysisDataFormats/Egamma/BuildFile.xml
deleted file mode 100644
index 8caa6925e4b57..0000000000000
--- a/AnalysisDataFormats/Egamma/BuildFile.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Math"/>
-
-<export>
-  <lib   name="1"/>
-</export>
diff --git a/AnalysisDataFormats/Egamma/interface/ElectronID.h b/AnalysisDataFormats/Egamma/interface/ElectronID.h
deleted file mode 100644
index aec667a93c603..0000000000000
--- a/AnalysisDataFormats/Egamma/interface/ElectronID.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef ElectronID_h
-#define ElectronID_h
-
-#include "AnalysisDataFormats/Egamma/interface/ElectronIDFwd.h"
-
-namespace reco {
-
-class ElectronID
-{
- public:
-
-  ElectronID(bool cutBasedDecision=-1,
-	     double likelihood=-1.,
-	     double neuralNetOutput=-1.) :
-    cutBasedDecision_(cutBasedDecision),
-    likelihood_(likelihood), neuralNetOutput_(neuralNetOutput) {}
-
-  bool cutBasedDecision() const {return cutBasedDecision_;}
-
-  double likelihood() const {return likelihood_;}
-
-  double neuralNetOutput() const {return neuralNetOutput_;}
-
- private:
-
-  bool cutBasedDecision_;
-  double likelihood_;
-  double neuralNetOutput_;
-
-};
-
-}
-
-#endif
diff --git a/AnalysisDataFormats/Egamma/interface/ElectronIDAssociation.h b/AnalysisDataFormats/Egamma/interface/ElectronIDAssociation.h
deleted file mode 100644
index 3abc5deac8f26..0000000000000
--- a/AnalysisDataFormats/Egamma/interface/ElectronIDAssociation.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef ElectronIDAssociation_h
-#define ElectronIDAssociation_h
-
-#include <vector>
-#include "DataFormats/Common/interface/Ref.h"
-#include "DataFormats/Common/interface/RefVector.h"
-#include "DataFormats/Common/interface/RefProd.h"
-#include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
-#include "AnalysisDataFormats/Egamma/interface/ElectronIDFwd.h"
-#include "DataFormats/Common/interface/AssociationMap.h"
-
-namespace reco {
-
-  // association map
-  typedef edm::AssociationMap<edm::OneToOne<GsfElectronCollection, ElectronIDCollection> > ElectronIDAssociationCollection;
- 
-  typedef ElectronIDAssociationCollection::value_type ElectronIDAssociation;
-
-  /// reference to an object in a collection of SeedMap objects
-  typedef edm::Ref<ElectronIDAssociationCollection> ElectronIDAssociationRef;
-
-  /// reference to a collection of SeedMap objects
-  typedef edm::RefProd<ElectronIDAssociationCollection> ElectronIDAssociationRefProd;
-
-  /// vector of references to objects in the same colletion of SeedMap objects
-  typedef edm::RefVector<ElectronIDAssociationCollection> ElectronIDAssociationRefVector;
-
-}
-
-#endif
diff --git a/AnalysisDataFormats/Egamma/interface/ElectronIDFwd.h b/AnalysisDataFormats/Egamma/interface/ElectronIDFwd.h
deleted file mode 100644
index 8fcb6bba4cac5..0000000000000
--- a/AnalysisDataFormats/Egamma/interface/ElectronIDFwd.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef EgammaReco_ElectronIDFwd_h
-#define EgammaReco_ElectronIDFwd_h
-#include <vector>
-#include "DataFormats/Common/interface/Ref.h"
-#include "DataFormats/Common/interface/RefProd.h"
-#include "DataFormats/Common/interface/RefVector.h"
-
-namespace reco {
-  class ElectronID;
-
-  /// collection of ElectronID objects
-  typedef std::vector<ElectronID> ElectronIDCollection;
-
-  /// reference to an object in a collection of ElectronID objects
-  typedef edm::Ref<ElectronIDCollection> ElectronIDRef;
-
-  /// reference to a collection of ElectronID objects
-  typedef edm::RefProd<ElectronIDCollection> ElectronIDRefProd;
-
-  /// vector of objects in the same collection of ElectronID objects
-  typedef edm::RefVector<ElectronIDCollection> ElectronIDRefVector;
-
-  /// iterator over a vector of reference to ElectronID objects
-  typedef ElectronIDRefVector::iterator electronID_iterator;
-}
-
-#endif
diff --git a/AnalysisDataFormats/Egamma/src/classes.h b/AnalysisDataFormats/Egamma/src/classes.h
deleted file mode 100644
index 94cb0b3c3fe5c..0000000000000
--- a/AnalysisDataFormats/Egamma/src/classes.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "DataFormats/Common/interface/Wrapper.h"
-#include "AnalysisDataFormats/Egamma/interface/ElectronID.h"
-#include "AnalysisDataFormats/Egamma/interface/ElectronIDAssociation.h"
-#include "DataFormats/Common/interface/RefToBase.h"
diff --git a/AnalysisDataFormats/Egamma/src/classes_def.xml b/AnalysisDataFormats/Egamma/src/classes_def.xml
deleted file mode 100644
index d3e6ebedd3d52..0000000000000
--- a/AnalysisDataFormats/Egamma/src/classes_def.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<lcgdict>
-   <class name="reco::ElectronID" ClassVersion="10">
-    <version ClassVersion="10" checksum="3416557521"/>
-   </class>
-   <class name="std::vector<reco::ElectronID>"/>
-   <class name="edm::Wrapper<std::vector<reco::ElectronID> >"/>
-   <class name="edm::Ref<std::vector<reco::ElectronID>, reco::ElectronID, edm::refhelper::FindUsingAdvance<std::vector<reco::ElectronID>, reco::ElectronID> >" />
-   <class name="edm::RefProd<std::vector<reco::ElectronID> >" />
-   <class name="edm::RefVector<std::vector<reco::ElectronID>, reco::ElectronID, edm::refhelper::FindUsingAdvance<std::vector<reco::ElectronID>, reco::ElectronID> >"/>
-
-   <class name="edm::AssociationMap<edm::OneToOne<std::vector<reco::GsfElectron>, std::vector<reco::ElectronID>, unsigned int > >">
-     <field name="transientMap_" transient="true" />
-   </class>
-   <class name="edm::Wrapper<edm::AssociationMap<edm::OneToOne<std::vector<reco::GsfElectron>,std::vector<reco::ElectronID>,unsigned int> > >" />
-   <class name="edm::Ref<edm::AssociationMap<edm::OneToOne<std::vector<reco::GsfElectron>,std::vector<reco::ElectronID>,unsigned int> >,edm::helpers::KeyVal<edm::Ref<std::vector<reco::GsfElectron>,reco::GsfElectron,edm::refhelper::FindUsingAdvance<std::vector<reco::GsfElectron>,reco::GsfElectron> >,edm::Ref<std::vector<reco::ElectronID>,reco::ElectronID,edm::refhelper::FindUsingAdvance<std::vector<reco::ElectronID>,reco::ElectronID> > >,edm::AssociationMap<edm::OneToOne<std::vector<reco::GsfElectron>,std::vector<reco::ElectronID>,unsigned int> >::Find>"/>
-   <class name="edm::RefProd<edm::AssociationMap<edm::OneToOne<std::vector<reco::GsfElectron>,std::vector<reco::ElectronID>,unsigned int> > >" />
-   <class name="edm::RefVector<edm::AssociationMap<edm::OneToOne<std::vector<reco::GsfElectron>,std::vector<reco::ElectronID>,unsigned int> >,edm::helpers::KeyVal<edm::Ref<std::vector<reco::GsfElectron>,reco::GsfElectron,edm::refhelper::FindUsingAdvance<std::vector<reco::GsfElectron>,reco::GsfElectron> >,edm::Ref<std::vector<reco::ElectronID>,reco::ElectronID,edm::refhelper::FindUsingAdvance<std::vector<reco::ElectronID>,reco::ElectronID> > >,edm::AssociationMap<edm::OneToOne<std::vector<reco::GsfElectron>,std::vector<reco::ElectronID>,unsigned int> >::Find>" />
-   <class name="edm::RefVector<std::vector<reco::ElectronID>,reco::ElectronID,edm::refhelper::FindUsingAdvance<std::vector<reco::ElectronID>,reco::ElectronID> >" />
-   <class name="edm::helpers::KeyVal<edm::RefProd<std::vector<reco::GsfElectron> > , edm::RefProd<std::vector<reco::ElectronID> > >"/> 
-
-</lcgdict>
diff --git a/AnalysisDataFormats/SiStripClusterInfo/BuildFile.xml b/AnalysisDataFormats/SiStripClusterInfo/BuildFile.xml
deleted file mode 100644
index 5657a244828a1..0000000000000
--- a/AnalysisDataFormats/SiStripClusterInfo/BuildFile.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<export>
-</export>
diff --git a/AnalysisDataFormats/SiStripClusterInfo/interface/SiStripClusterInfo.h b/AnalysisDataFormats/SiStripClusterInfo/interface/SiStripClusterInfo.h
deleted file mode 100644
index 56a1ad882d8c9..0000000000000
--- a/AnalysisDataFormats/SiStripClusterInfo/interface/SiStripClusterInfo.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "RecoLocalTracker/SiStripClusterizer/interface/SiStripClusterInfo.h"
diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMap.h b/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMap.h
index 2f2c427b18c9c..cf6d8af6717af 100644
--- a/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMap.h
+++ b/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMap.h
@@ -5,18 +5,13 @@
 #include "DataFormats/DetId/interface/DetId.h"
 #include <map>
 
-class CaloMiscalibMap{
-
+class CaloMiscalibMap {
 public:
-CaloMiscalibMap(){}
-virtual ~CaloMiscalibMap(){}
+  CaloMiscalibMap() {}
+  virtual ~CaloMiscalibMap() {}
 
 public:
-
-
-virtual void addCell(const DetId &cell, float scaling_factor)=0;
-
+  virtual void addCell(const DetId &cell, float scaling_factor) = 0;
 };
 
-
 #endif
diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMapEcal.h b/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMapEcal.h
index 17d040415355f..9ddfdc473c6cf 100644
--- a/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMapEcal.h
+++ b/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMapEcal.h
@@ -13,109 +13,85 @@
 #include <map>
 #include <vector>
 
-
-
-class CaloMiscalibMapEcal: public CaloMiscalibMap {
+class CaloMiscalibMapEcal : public CaloMiscalibMap {
 public:
-CaloMiscalibMapEcal(){ 
-}
-
-void prefillMap(){
-  
-
-   for(int iEta=-EBDetId::MAX_IETA; iEta<=EBDetId::MAX_IETA ;++iEta) {
-     if(iEta==0) continue;
-     for(int iPhi=EBDetId::MIN_IPHI; iPhi<=EBDetId::MAX_IPHI; ++iPhi) {
-
-       try 
-	 {
-	   EBDetId ebdetid(iEta,iPhi);
-	   map_.setValue(ebdetid.rawId(),1.0);
-	 }
-       catch (...)
-	 {
-	 }
-     }
-   }
-   
-   for(int iX=EEDetId::IX_MIN; iX<=EEDetId::IX_MAX ;++iX) {
-     for(int iY=EEDetId::IY_MIN; iY<=EEDetId::IY_MAX; ++iY) {
-       try 
-	 {
- 	   EEDetId eedetidpos(iX,iY,1);
-	   map_.setValue(eedetidpos.rawId(),1.0);
-	   EEDetId eedetidneg(iX,iY,-1);
-	   map_.setValue(eedetidneg.rawId(),1.0);
-	 }
-       catch (...)
-	 {
-	 }
-     }
-   }
-
-
-}
-
-
-void addCell(const DetId &cell, float scaling_factor) override
-{
-map_.setValue(cell.rawId(),scaling_factor);
-}
-
-void print()
- {
-
-   int icount=0;
-   for(int iEta=-EBDetId::MAX_IETA; iEta<=EBDetId::MAX_IETA ;++iEta) {
-     if(iEta==0) continue;
-     for(int iPhi=EBDetId::MIN_IPHI; iPhi<=EBDetId::MAX_IPHI; ++iPhi) {
-       if (EBDetId::validDetId(iEta,iPhi))
-	 {
-	   EBDetId ebdetid(iEta,iPhi);
-	   EcalIntercalibConstantMap::const_iterator icalit= map_.find(ebdetid.rawId());
-	   EcalIntercalibConstant icalconst;
-	   icalconst = (*icalit);
-	   
-	   icount++;
-	   if(icount%230==0){
-	     std::cout<< "here is value for chan eta/phi "<<iEta<<"/"<<iPhi<<"="<<icalconst<<std::endl;}
-	 }
-     }
-   }
-   for(int iX=EEDetId::IX_MIN; iX<=EEDetId::IX_MAX ;++iX) {
-     for(int iY=EEDetId::IY_MIN; iY<=EEDetId::IY_MAX; ++iY) {
-       if (EEDetId::validDetId(iX,iY,1))
-	 {
-	   EEDetId eedetidpos(iX,iY,1);
-	   EcalIntercalibConstantMap::const_iterator icalit= map_.find(eedetidpos.rawId());
-           EcalIntercalibConstant icalconst;
-           icalconst = (*icalit);
-
-	   EEDetId eedetidneg(iX,iY,-1);
-	   EcalIntercalibConstantMap::const_iterator icalit2= map_.find(eedetidneg.rawId());
-           EcalIntercalibConstant icalconst2;
-           icalconst2 = (*icalit2);
-
-
-	   icount++;
-	   if(icount%230==0){
-
-	     std::cout<< "here is value for chan x/y "<<iX<<"/"<<iY<<" pos side is ="<<icalconst<< " and neg side is= "<< icalconst2<<std::endl;}
-
-	 }
-     }
-   }
- 
-}
-
-const EcalIntercalibConstants & get(){
-return map_;
-}
+  CaloMiscalibMapEcal() {}
+
+  void prefillMap() {
+    for (int iEta = -EBDetId::MAX_IETA; iEta <= EBDetId::MAX_IETA; ++iEta) {
+      if (iEta == 0)
+        continue;
+      for (int iPhi = EBDetId::MIN_IPHI; iPhi <= EBDetId::MAX_IPHI; ++iPhi) {
+        try {
+          EBDetId ebdetid(iEta, iPhi);
+          map_.setValue(ebdetid.rawId(), 1.0);
+        } catch (...) {
+        }
+      }
+    }
+
+    for (int iX = EEDetId::IX_MIN; iX <= EEDetId::IX_MAX; ++iX) {
+      for (int iY = EEDetId::IY_MIN; iY <= EEDetId::IY_MAX; ++iY) {
+        try {
+          EEDetId eedetidpos(iX, iY, 1);
+          map_.setValue(eedetidpos.rawId(), 1.0);
+          EEDetId eedetidneg(iX, iY, -1);
+          map_.setValue(eedetidneg.rawId(), 1.0);
+        } catch (...) {
+        }
+      }
+    }
+  }
+
+  void addCell(const DetId &cell, float scaling_factor) override { map_.setValue(cell.rawId(), scaling_factor); }
+
+  void print() {
+    int icount = 0;
+    for (int iEta = -EBDetId::MAX_IETA; iEta <= EBDetId::MAX_IETA; ++iEta) {
+      if (iEta == 0)
+        continue;
+      for (int iPhi = EBDetId::MIN_IPHI; iPhi <= EBDetId::MAX_IPHI; ++iPhi) {
+        if (EBDetId::validDetId(iEta, iPhi)) {
+          EBDetId ebdetid(iEta, iPhi);
+          EcalIntercalibConstantMap::const_iterator icalit = map_.find(ebdetid.rawId());
+          EcalIntercalibConstant icalconst;
+          icalconst = (*icalit);
+
+          icount++;
+          if (icount % 230 == 0) {
+            std::cout << "here is value for chan eta/phi " << iEta << "/" << iPhi << "=" << icalconst << std::endl;
+          }
+        }
+      }
+    }
+    for (int iX = EEDetId::IX_MIN; iX <= EEDetId::IX_MAX; ++iX) {
+      for (int iY = EEDetId::IY_MIN; iY <= EEDetId::IY_MAX; ++iY) {
+        if (EEDetId::validDetId(iX, iY, 1)) {
+          EEDetId eedetidpos(iX, iY, 1);
+          EcalIntercalibConstantMap::const_iterator icalit = map_.find(eedetidpos.rawId());
+          EcalIntercalibConstant icalconst;
+          icalconst = (*icalit);
+
+          EEDetId eedetidneg(iX, iY, -1);
+          EcalIntercalibConstantMap::const_iterator icalit2 = map_.find(eedetidneg.rawId());
+          EcalIntercalibConstant icalconst2;
+          icalconst2 = (*icalit2);
+
+          icount++;
+          if (icount % 230 == 0) {
+            std::cout << "here is value for chan x/y " << iX << "/" << iY << " pos side is =" << icalconst
+                      << " and neg side is= " << icalconst2 << std::endl;
+          }
+        }
+      }
+    }
+  }
+
+  const EcalIntercalibConstants &get() { return map_; }
 
 private:
-
-EcalIntercalibConstants map_;
-const CaloSubdetectorGeometry *geometry;
+  EcalIntercalibConstants map_;
+  const CaloSubdetectorGeometry *geometry;
 };
 
 #endif
diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMapHcal.h b/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMapHcal.h
index 4837fa53c8407..e70c7038d491f 100644
--- a/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMapHcal.h
+++ b/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMapHcal.h
@@ -14,62 +14,50 @@
 #include <map>
 #include <vector>
 
-class CaloMiscalibMapHcal: public CaloMiscalibMap {
+class CaloMiscalibMapHcal : public CaloMiscalibMap {
 public:
-    CaloMiscalibMapHcal(){
-    }
-
-void prefillMap(const HcalTopology & topology){
-
-  for (int det = 1; det <= HcalForward; det++) {
-    for (int eta = -HcalDetId::kHcalEtaMask2; eta <= (int)(HcalDetId::kHcalEtaMask2); eta++) {
-      for (unsigned int phi = 1; phi <= HcalDetId::kHcalPhiMask2; phi++) {
-	for (unsigned int depth = 1; depth <= HcalDetId::kHcalDepthMask2; depth++) {
-
-	  try {
-	    HcalDetId hcaldetid ((HcalSubdetector) det, eta, phi, depth);
-	    if (topology.valid(hcaldetid)) {
-	      mapHcal_[hcaldetid.rawId()]=1.0; 
-	      //	      std::cout << "Valid cell found: " << det << " " << eta << " " << phi << " " << depth << std::endl;
-	    }
-		
-	  }
-	  catch (...) {
-	  }
-	}
+  CaloMiscalibMapHcal() {}
+
+  void prefillMap(const HcalTopology &topology) {
+    for (int det = 1; det <= HcalForward; det++) {
+      for (int eta = -HcalDetId::kHcalEtaMask2; eta <= (int)(HcalDetId::kHcalEtaMask2); eta++) {
+        for (unsigned int phi = 1; phi <= HcalDetId::kHcalPhiMask2; phi++) {
+          for (unsigned int depth = 1; depth <= HcalDetId::kHcalDepthMask2; depth++) {
+            try {
+              HcalDetId hcaldetid((HcalSubdetector)det, eta, phi, depth);
+              if (topology.valid(hcaldetid)) {
+                mapHcal_[hcaldetid.rawId()] = 1.0;
+                //	      std::cout << "Valid cell found: " << det << " " << eta << " " << phi << " " << depth << std::endl;
+              }
+
+            } catch (...) {
+            }
+          }
+        }
       }
     }
   }
-}
 
+  void addCell(const DetId &cell, float scaling_factor) override {
+    //mapHcal_.setValue(cell.rawId(),scaling_factor);
+    mapHcal_[cell.rawId()] = scaling_factor;
+  }
 
-void addCell(const DetId &cell, float scaling_factor) override
-{
-  //mapHcal_.setValue(cell.rawId(),scaling_factor);
-  mapHcal_[cell.rawId()]=scaling_factor;
-}
+  void print() {
+    std::map<uint32_t, float>::const_iterator it;
 
-void print()
- {
- 
- std::map<uint32_t,float>::const_iterator it;
- 
- //   for(it=mapHcal_.getMap().begin();it!=mapHcal_.getMap().end();it++){
- //   }
-   for(it=mapHcal_.begin();it!=mapHcal_.end();it++){
-   }
- 
-}
+    //   for(it=mapHcal_.getMap().begin();it!=mapHcal_.getMap().end();it++){
+    //   }
+    for (it = mapHcal_.begin(); it != mapHcal_.end(); it++) {
+    }
+  }
 
-const std::map<uint32_t, float> & get(){
-return mapHcal_;
-}
+  const std::map<uint32_t, float> &get() { return mapHcal_; }
 
 private:
-
-   std::map<uint32_t, float> mapHcal_;
-   // EcalIntercalibConstants map_;
-   // const CaloSubdetectorGeometry *geometry;
+  std::map<uint32_t, float> mapHcal_;
+  // EcalIntercalibConstants map_;
+  // const CaloSubdetectorGeometry *geometry;
 };
 
 #endif
diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibTools.h b/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibTools.h
index dd87263caa26f..05b35da8b158b 100644
--- a/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibTools.h
+++ b/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibTools.h
@@ -5,7 +5,7 @@
 //
 // Package:    CaloMiscalibTools
 // Class:      CaloMiscalibTools
-// 
+//
 /**\class CaloMiscalibTools CaloMiscalibTools.cc CalibCalorimetry/CaloMiscalibTools/src/CaloMiscalibTools.cc
 
  Description: Definition of CaloMiscalibTools
@@ -17,10 +17,9 @@
 // Original Author:  Lorenzo AGOSTINO
 //         Created:  Mon Jul 17 18:07:01 CEST 2006
 //
-// Modified       : Luca Malgeri 
-// Date:          : 11/09/2006 
+// Modified       : Luca Malgeri
+// Date:          : 11/09/2006
 // Reason         : split class definition (.h) from source code (.cc)
- 
 
 // system include files
 #include <memory>
@@ -47,23 +46,25 @@
 // class decleration
 //
 
-class CaloMiscalibTools : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
-   public:
-      CaloMiscalibTools(const edm::ParameterSet&);
-      ~CaloMiscalibTools() override;
+class CaloMiscalibTools : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CaloMiscalibTools(const edm::ParameterSet &);
+  ~CaloMiscalibTools() override;
+
+  typedef std::unique_ptr<EcalIntercalibConstants> ReturnType;
 
-      typedef std::unique_ptr<EcalIntercalibConstants> ReturnType;
+  ReturnType produce(const EcalIntercalibConstantsRcd &);
 
-      ReturnType produce(const EcalIntercalibConstantsRcd&);
-   private:
-      // ----------member data ---------------------------
-    void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
-    
-    std::string barrelfile_; 
-    std::string endcapfile_; 
-    std::string barrelfileinpath_; 
-    std::string endcapfileinpath_; 
+private:
+  // ----------member data ---------------------------
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
 
+  std::string barrelfile_;
+  std::string endcapfile_;
+  std::string barrelfileinpath_;
+  std::string endcapfileinpath_;
 };
 
 #endif
diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibToolsMC.h b/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibToolsMC.h
index b3c684f8269f2..da451d3c98cd6 100644
--- a/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibToolsMC.h
+++ b/CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibToolsMC.h
@@ -5,7 +5,7 @@
 //
 // Package:    CaloMiscalibToolsMC
 // Class:      CaloMiscalibToolsMC
-// 
+//
 /**\class CaloMiscalibToolsMC CaloMiscalibToolsMC.cc CalibCalorimetry/CaloMiscalibToolsMC/src/CaloMiscalibToolsMC.cc
 
  Description: Definition of CaloMiscalibToolsMC
@@ -17,10 +17,9 @@
 // Original Author:  Lorenzo AGOSTINO
 //         Created:  Mon Jul 17 18:07:01 CEST 2006
 //
-// Modified       : Luca Malgeri 
-// Date:          : 11/09/2006 
+// Modified       : Luca Malgeri
+// Date:          : 11/09/2006
 // Reason         : split class definition (.h) from source code (.cc)
- 
 
 // system include files
 #include <memory>
@@ -47,23 +46,25 @@
 // class decleration
 //
 
-class CaloMiscalibToolsMC : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
-   public:
-      CaloMiscalibToolsMC(const edm::ParameterSet&);
-      ~CaloMiscalibToolsMC() override;
+class CaloMiscalibToolsMC : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CaloMiscalibToolsMC(const edm::ParameterSet &);
+  ~CaloMiscalibToolsMC() override;
+
+  typedef std::unique_ptr<EcalIntercalibConstantsMC> ReturnType;
 
-      typedef std::unique_ptr<EcalIntercalibConstantsMC> ReturnType;
+  ReturnType produce(const EcalIntercalibConstantsMCRcd &);
 
-      ReturnType produce(const EcalIntercalibConstantsMCRcd&);
-   private:
-      // ----------member data ---------------------------
-    void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
-    
-    std::string barrelfile_; 
-    std::string endcapfile_; 
-    std::string barrelfileinpath_; 
-    std::string endcapfileinpath_; 
+private:
+  // ----------member data ---------------------------
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
 
+  std::string barrelfile_;
+  std::string endcapfile_;
+  std::string barrelfileinpath_;
+  std::string endcapfileinpath_;
 };
 
 #endif
diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/EcalRecHitRecalib.h b/CalibCalorimetry/CaloMiscalibTools/interface/EcalRecHitRecalib.h
index 777828a8c94f8..b2cc951b731d7 100644
--- a/CalibCalorimetry/CaloMiscalibTools/interface/EcalRecHitRecalib.h
+++ b/CalibCalorimetry/CaloMiscalibTools/interface/EcalRecHitRecalib.h
@@ -1,11 +1,11 @@
-#ifndef  _ECALRECHITRECALIB_H
-#define  _ECALRECHITRECALIB_H
+#ifndef _ECALRECHITRECALIB_H
+#define _ECALRECHITRECALIB_H
 
 // -*- C++ -*-
 //
 // Package:    EcalRecHitRecalib
 // Class:      EcalRecHitRecalib
-// 
+//
 /**\class EcalRecHitRecalib EcalRecHitRecalib.cc CalibCalorimetry/CaloMiscalibTools.src/EcalRecHitRecalib.cc
 
  Description: Producer to miscalibrate (calibrated) Ecal RecHit 
@@ -18,7 +18,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -36,23 +35,22 @@
 //
 
 class EcalRecHitRecalib : public edm::EDProducer {
-   public:
-      explicit EcalRecHitRecalib(const edm::ParameterSet&);
-      ~EcalRecHitRecalib() override;
-
-
-      void produce(edm::Event &, const edm::EventSetup&) override;
-   private:
-      // ----------member data ---------------------------
-
- std::string ecalHitsProducer_;
- std::string barrelHits_;
- std::string endcapHits_;
- std::string RecalibBarrelHits_;
- std::string RecalibEndcapHits_;
- double refactor_;
- double refactor_mean_;
-
+public:
+  explicit EcalRecHitRecalib(const edm::ParameterSet &);
+  ~EcalRecHitRecalib() override;
+
+  void produce(edm::Event &, const edm::EventSetup &) override;
+
+private:
+  // ----------member data ---------------------------
+
+  std::string ecalHitsProducer_;
+  std::string barrelHits_;
+  std::string endcapHits_;
+  std::string RecalibBarrelHits_;
+  std::string RecalibEndcapHits_;
+  double refactor_;
+  double refactor_mean_;
 };
 
 #endif
diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/HcalRecHitRecalib.h b/CalibCalorimetry/CaloMiscalibTools/interface/HcalRecHitRecalib.h
index 971cd7f59ec6d..57874afc9f098 100644
--- a/CalibCalorimetry/CaloMiscalibTools/interface/HcalRecHitRecalib.h
+++ b/CalibCalorimetry/CaloMiscalibTools/interface/HcalRecHitRecalib.h
@@ -5,7 +5,7 @@
 //
 // Package:    HcalRecHitRecalib
 // Class:      HcalRecHitRecalib
-// 
+//
 /**\class HcalRecHitRecalib HcalRecHitRecalib.cc CalibCalorimetry/CaloRecalibTools.src/HcalRecHitRecalib.cc
 
  Description: Producer to miscalibrate (calibrated) Hcal RecHit 
@@ -18,7 +18,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -34,28 +33,27 @@
 #include "CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMapHcal.h"
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 
-class HcalRecHitRecalib : public edm::EDProducer
-{
+class HcalRecHitRecalib : public edm::EDProducer {
 public:
-    explicit HcalRecHitRecalib(const edm::ParameterSet&);
-    ~HcalRecHitRecalib() override;
+  explicit HcalRecHitRecalib(const edm::ParameterSet &);
+  ~HcalRecHitRecalib() override;
 
-    void beginRun(const edm::Run&, const edm::EventSetup&) override;
-    void produce(edm::Event &, const edm::EventSetup&) override;
+  void beginRun(const edm::Run &, const edm::EventSetup &) override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
 private:
-    edm::EDGetTokenT<HBHERecHitCollection> tok_hbhe_;
-    edm::EDGetTokenT<HORecHitCollection> tok_ho_;
-    edm::EDGetTokenT<HFRecHitCollection> tok_hf_;
-    std::string RecalibHBHEHits_;
-    std::string RecalibHFHits_;
-    std::string RecalibHOHits_;
-
-    std::string hcalfile_;
-    std::string hcalfileinpath_;
-
-    CaloMiscalibMapHcal mapHcal_;
-    double refactor_;
-    double refactor_mean_;
+  edm::EDGetTokenT<HBHERecHitCollection> tok_hbhe_;
+  edm::EDGetTokenT<HORecHitCollection> tok_ho_;
+  edm::EDGetTokenT<HFRecHitCollection> tok_hf_;
+  std::string RecalibHBHEHits_;
+  std::string RecalibHFHits_;
+  std::string RecalibHOHits_;
+
+  std::string hcalfile_;
+  std::string hcalfileinpath_;
+
+  CaloMiscalibMapHcal mapHcal_;
+  double refactor_;
+  double refactor_mean_;
 };
 #endif
diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXML.h b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXML.h
index c2b8335aad998..eef00e820b62a 100644
--- a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXML.h
+++ b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXML.h
@@ -17,30 +17,27 @@
 #include <xercesc/util/XMLUni.hpp>
 #include <xercesc/util/XMLURL.hpp>
 #include "CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMap.h"
-          
 
-#include<iostream>
-#include<string>
-#include<vector>
-#include<map>
-
-
-class MiscalibReaderFromXML{
+#include <iostream>
+#include <string>
+#include <vector>
+#include <map>
 
+class MiscalibReaderFromXML {
 public:
-MiscalibReaderFromXML(CaloMiscalibMap &);
-virtual ~MiscalibReaderFromXML(){}
+  MiscalibReaderFromXML(CaloMiscalibMap &);
+  virtual ~MiscalibReaderFromXML() {}
 
-bool parseXMLMiscalibFile(std::string configFile);
+  bool parseXMLMiscalibFile(std::string configFile);
 
-virtual DetId parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute)=0;
-int    getIntAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute, const std::string &attribute_name);
-double getScalingFactor(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute);
-double getFloatAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute, const std::string &attribute_name);
+  virtual DetId parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute) = 0;
+  int getIntAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute, const std::string &attribute_name);
+  double getScalingFactor(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute);
+  double getFloatAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute, const std::string &attribute_name);
 
 private:
-static int s_numberOfInstances;
-CaloMiscalibMap & caloMap_;
+  static int s_numberOfInstances;
+  CaloMiscalibMap &caloMap_;
 };
 
 #endif
diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLDomUtils.h b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLDomUtils.h
index 9fabd5971803d..1632bd33b5400 100644
--- a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLDomUtils.h
+++ b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLDomUtils.h
@@ -9,19 +9,22 @@
 #include <xercesc/dom/DOMNode.hpp>
 
 /** a collection of some XML reading utilities */
-class MiscalibReaderFromXMLDomUtils
-{
+class MiscalibReaderFromXMLDomUtils {
 public:
   inline static std::string toString(const XMLCh *str);
 
-  inline static int getIntAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attributes, std::string attr_name, bool &well_formed_string);
-  
-  inline static double getFloatAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attributes, std::string attr_name, bool &well_formed_string);
+  inline static int getIntAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attributes,
+                                    std::string attr_name,
+                                    bool &well_formed_string);
 
-  inline static std::string getStringAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attributes, std::string attr_name);
+  inline static double getFloatAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attributes,
+                                         std::string attr_name,
+                                         bool &well_formed_string);
+
+  inline static std::string getStringAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attributes,
+                                               std::string attr_name);
 
   inline static bool hasAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attributes, std::string attr_name);
-  
 };
 
 #include <CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLDomUtils.icc>
diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLDomUtils.icc b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLDomUtils.icc
index 26043518da6ca..0d1df919d17e1 100644
--- a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLDomUtils.icc
+++ b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLDomUtils.icc
@@ -1,55 +1,51 @@
-// -*- c++ -*- 
+// -*- c++ -*-
 #ifndef _MISCALIB_READER_FROM_XML_DOM_UTILS_ICC
 #define _MISCALIB_READER_FROM_XML_DOM_UTILS_ICC
 
 //----------------------------------------------------------------------
 
-inline std::string 
-MiscalibReaderFromXMLDomUtils::toString(const XMLCh *str)
-{
+inline std::string MiscalibReaderFromXMLDomUtils::toString(const XMLCh *str) {
   char *name = XERCES_CPP_NAMESPACE::XMLString::transcode(str);
   std::string retval(name);
-  delete [] name;
+  delete[] name;
   return retval;
 }
 
 //----------------------------------------------------------------------
 
-inline int 
-MiscalibReaderFromXMLDomUtils::getIntAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attributes, std::string attr_name, bool &well_formed_string)
-{
+inline int MiscalibReaderFromXMLDomUtils::getIntAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attributes,
+                                                          std::string attr_name,
+                                                          bool &well_formed_string) {
   XMLCh *buffer = XERCES_CPP_NAMESPACE::XMLString::transcode(attr_name.c_str());
 
   // we could also use XMLString::parseInt(...) here..
-  char *endptr = NULL;
-  int retval = strtol(toString(attributes->getNamedItem(buffer)->getNodeValue()).c_str(),
-                      &endptr,0);
+  char *endptr = nullptr;
+  int retval = strtol(toString(attributes->getNamedItem(buffer)->getNodeValue()).c_str(), &endptr, 0);
   if (*endptr != '\0')
     well_formed_string = false;
   else
     well_formed_string = true;
 
-  delete [] buffer;
+  delete[] buffer;
   // std::cout << "retval=" << retval << std::endl;
   return retval;
 }
 
 //----------------------------------------------------------------------
 
-inline double 
-MiscalibReaderFromXMLDomUtils::getFloatAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attributes, std::string attr_name, bool &well_formed_string)
-{
+inline double MiscalibReaderFromXMLDomUtils::getFloatAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attributes,
+                                                               std::string attr_name,
+                                                               bool &well_formed_string) {
   XMLCh *buffer = XERCES_CPP_NAMESPACE::XMLString::transcode(attr_name.c_str());
 
-  char *endptr = NULL;
-  double retval = strtod(toString(attributes->getNamedItem(buffer)->getNodeValue()).c_str(),
-                         &endptr);
+  char *endptr = nullptr;
+  double retval = strtod(toString(attributes->getNamedItem(buffer)->getNodeValue()).c_str(), &endptr);
   if (*endptr != '\0')
     well_formed_string = false;
   else
     well_formed_string = true;
-  
-  delete [] buffer;
+
+  delete[] buffer;
   // std::cout << "retval=" << retval << std::endl;
   return retval;
 
@@ -58,29 +54,26 @@ MiscalibReaderFromXMLDomUtils::getFloatAttribute(XERCES_CPP_NAMESPACE::DOMNamedN
 
 //----------------------------------------------------------------------
 
-inline std::string 
-MiscalibReaderFromXMLDomUtils::getStringAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attributes, std::string attr_name)
-{
+inline std::string MiscalibReaderFromXMLDomUtils::getStringAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attributes,
+                                                                     std::string attr_name) {
   XMLCh *buffer = XERCES_CPP_NAMESPACE::XMLString::transcode(attr_name.c_str());
   std::string retval = toString(attributes->getNamedItem(buffer)->getNodeValue());
 
-  delete [] buffer;
+  delete[] buffer;
   // std::cout << "retval=" << retval << std::endl;
   return retval;
 }
 
 //----------------------------------------------------------------------
 
-inline bool 
-MiscalibReaderFromXMLDomUtils::hasAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attributes, std::string attr_name)
-{
+inline bool MiscalibReaderFromXMLDomUtils::hasAttribute(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attributes,
+                                                        std::string attr_name) {
   bool retval;
   XMLCh *buffer = XERCES_CPP_NAMESPACE::XMLString::transcode(attr_name.c_str());
-  retval = attributes->getNamedItem(buffer) != NULL;
-  delete [] buffer;
-    
+  retval = attributes->getNamedItem(buffer) != nullptr;
+  delete[] buffer;
+
   return retval;
-    
 }
 
 //----------------------------------------------------------------------
diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalBarrel.h b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalBarrel.h
index 6bd8a5ba9cc50..c9fa4bab7f27a 100644
--- a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalBarrel.h
+++ b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalBarrel.h
@@ -5,19 +5,13 @@
 #include "CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXML.h"
 #include "CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMapEcal.h"
 
-
-
-class MiscalibReaderFromXMLEcalBarrel : public MiscalibReaderFromXML
-{
- public:
-  MiscalibReaderFromXMLEcalBarrel(CaloMiscalibMapEcal & map):MiscalibReaderFromXML(map){};
-
+class MiscalibReaderFromXMLEcalBarrel : public MiscalibReaderFromXML {
+public:
+  MiscalibReaderFromXMLEcalBarrel(CaloMiscalibMapEcal &map) : MiscalibReaderFromXML(map){};
 
   DetId parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute) override;
 
   EBDetId getCellFromAttributes(int ieta, int iphi);
-
 };
 
 #endif
-
diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalEndcap.h b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalEndcap.h
index faf3db6148f41..b2ee790f2994e 100644
--- a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalEndcap.h
+++ b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalEndcap.h
@@ -5,18 +5,13 @@
 #include "CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXML.h"
 #include "CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMapEcal.h"
 
-
-
-class MiscalibReaderFromXMLEcalEndcap : public MiscalibReaderFromXML
-{
- public:
-  MiscalibReaderFromXMLEcalEndcap(CaloMiscalibMapEcal & map):MiscalibReaderFromXML(map){};
+class MiscalibReaderFromXMLEcalEndcap : public MiscalibReaderFromXML {
+public:
+  MiscalibReaderFromXMLEcalEndcap(CaloMiscalibMapEcal &map) : MiscalibReaderFromXML(map){};
 
   DetId parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute) override;
 
   EEDetId getCellFromAttributes(int ix, int iy, int iz);
-
 };
 
 #endif
-
diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLHcal.h b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLHcal.h
index 017a702e16c07..2689a41d25079 100644
--- a/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLHcal.h
+++ b/CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLHcal.h
@@ -5,19 +5,13 @@
 #include "CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXML.h"
 #include "CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibMapHcal.h"
 
-
-
-class MiscalibReaderFromXMLHcal : public MiscalibReaderFromXML
-{
- public:
-  MiscalibReaderFromXMLHcal(CaloMiscalibMapHcal & map):MiscalibReaderFromXML(map){};
-
+class MiscalibReaderFromXMLHcal : public MiscalibReaderFromXML {
+public:
+  MiscalibReaderFromXMLHcal(CaloMiscalibMapHcal &map) : MiscalibReaderFromXML(map){};
 
   DetId parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute) override;
 
   HcalDetId getCellFromAttributes(int idet, int ieta, int iphi, int idepth);
-
 };
 
 #endif
-
diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/WriteEcalMiscalibConstants.h b/CalibCalorimetry/CaloMiscalibTools/interface/WriteEcalMiscalibConstants.h
index 577d6f4d08d4a..a275dcce6c143 100644
--- a/CalibCalorimetry/CaloMiscalibTools/interface/WriteEcalMiscalibConstants.h
+++ b/CalibCalorimetry/CaloMiscalibTools/interface/WriteEcalMiscalibConstants.h
@@ -6,7 +6,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -23,16 +22,15 @@
 //
 
 class WriteEcalMiscalibConstants : public edm::EDAnalyzer {
- public:
+public:
   explicit WriteEcalMiscalibConstants(const edm::ParameterSet&);
   ~WriteEcalMiscalibConstants() override;
-  
-  
- private:
-      void beginJob() override ;
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      void endJob() override ;
-      
-      // ----------member data ---------------------------
-      std::string newTagRequest_;
+
+private:
+  void beginJob() override;
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void endJob() override;
+
+  // ----------member data ---------------------------
+  std::string newTagRequest_;
 };
diff --git a/CalibCalorimetry/CaloMiscalibTools/interface/WriteEcalMiscalibConstantsMC.h b/CalibCalorimetry/CaloMiscalibTools/interface/WriteEcalMiscalibConstantsMC.h
index 905dff58aa5a9..9b4577cdd1053 100644
--- a/CalibCalorimetry/CaloMiscalibTools/interface/WriteEcalMiscalibConstantsMC.h
+++ b/CalibCalorimetry/CaloMiscalibTools/interface/WriteEcalMiscalibConstantsMC.h
@@ -6,7 +6,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -23,16 +22,15 @@
 //
 
 class WriteEcalMiscalibConstantsMC : public edm::EDAnalyzer {
- public:
+public:
   explicit WriteEcalMiscalibConstantsMC(const edm::ParameterSet&);
   ~WriteEcalMiscalibConstantsMC() override;
-  
-  
- private:
-      void beginJob() override ;
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      void endJob() override ;
-      
-      // ----------member data ---------------------------
-      std::string newTagRequest_;
+
+private:
+  void beginJob() override;
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void endJob() override;
+
+  // ----------member data ---------------------------
+  std::string newTagRequest_;
 };
diff --git a/CalibCalorimetry/CaloMiscalibTools/plugins/CaloMiscalibTools.cc b/CalibCalorimetry/CaloMiscalibTools/plugins/CaloMiscalibTools.cc
index 70ed58ff43231..77c34d8532ee3 100644
--- a/CalibCalorimetry/CaloMiscalibTools/plugins/CaloMiscalibTools.cc
+++ b/CalibCalorimetry/CaloMiscalibTools/plugins/CaloMiscalibTools.cc
@@ -2,7 +2,7 @@
 //
 // Package:    CaloMiscalibTools
 // Class:      CaloMiscalibTools
-// 
+//
 /**\class CaloMiscalibTools CaloMiscalibTools.h CalibCalorimetry/CaloMiscalibTools/interface/CaloMiscalibTools.h
 
  Description: <one line class summary>
@@ -14,13 +14,12 @@
 // Original Author:  Lorenzo AGOSTINO
 //         Created:  Wed May 31 10:37:45 CEST 2006
 //
-// Modified       : Luca Malgeri 
-// Date:          : 11/09/2006 
+// Modified       : Luca Malgeri
+// Date:          : 11/09/2006
 // Reason         : split class definition (.h) from source code (.cc)
 //
 //
 
-
 // system include files
 
 // user include files
@@ -33,67 +32,57 @@
 //
 // constructors and destructor
 //
-CaloMiscalibTools::CaloMiscalibTools(const edm::ParameterSet& iConfig)
-{
-   //the following line is needed to tell the framework what
-   // data is being produced
+CaloMiscalibTools::CaloMiscalibTools(const edm::ParameterSet& iConfig) {
+  //the following line is needed to tell the framework what
+  // data is being produced
 
-  barrelfileinpath_=iConfig.getUntrackedParameter<std::string> ("fileNameBarrel","");
-  endcapfileinpath_=iConfig.getUntrackedParameter<std::string> ("fileNameEndcap","");
+  barrelfileinpath_ = iConfig.getUntrackedParameter<std::string>("fileNameBarrel", "");
+  endcapfileinpath_ = iConfig.getUntrackedParameter<std::string>("fileNameEndcap", "");
 
-  edm::FileInPath barrelfiletmp("CalibCalorimetry/CaloMiscalibTools/data/"+barrelfileinpath_);
-  edm::FileInPath endcapfiletmp("CalibCalorimetry/CaloMiscalibTools/data/"+endcapfileinpath_);
-  
-  
-  barrelfile_=barrelfiletmp.fullPath();
-  endcapfile_=endcapfiletmp.fullPath();
+  edm::FileInPath barrelfiletmp("CalibCalorimetry/CaloMiscalibTools/data/" + barrelfileinpath_);
+  edm::FileInPath endcapfiletmp("CalibCalorimetry/CaloMiscalibTools/data/" + endcapfileinpath_);
 
-  std::cout <<"Barrel file is:"<< barrelfile_<<std::endl;
-  std::cout <<"endcap file is:"<< endcapfile_<<std::endl;
+  barrelfile_ = barrelfiletmp.fullPath();
+  endcapfile_ = endcapfiletmp.fullPath();
 
+  std::cout << "Barrel file is:" << barrelfile_ << std::endl;
+  std::cout << "endcap file is:" << endcapfile_ << std::endl;
 
-   // added by Zhen (changed since 1_2_0)
-   setWhatProduced(this,&CaloMiscalibTools::produce);
-   findingRecord<EcalIntercalibConstantsRcd>();
-   //now do what ever other initialization is needed
+  // added by Zhen (changed since 1_2_0)
+  setWhatProduced(this, &CaloMiscalibTools::produce);
+  findingRecord<EcalIntercalibConstantsRcd>();
+  //now do what ever other initialization is needed
 }
 
-
-CaloMiscalibTools::~CaloMiscalibTools()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+CaloMiscalibTools::~CaloMiscalibTools() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CaloMiscalibTools::ReturnType
-CaloMiscalibTools::produce(const EcalIntercalibConstantsRcd& iRecord)
-{
-    CaloMiscalibMapEcal map;
-    map.prefillMap();
-    MiscalibReaderFromXMLEcalBarrel barrelreader_(map);
-    MiscalibReaderFromXMLEcalEndcap endcapreader_(map);
-    if(!barrelfile_.empty()) barrelreader_.parseXMLMiscalibFile(barrelfile_);
-    if(!endcapfile_.empty())endcapreader_.parseXMLMiscalibFile(endcapfile_);
-    map.print();
-    // Added by Zhen, need a new object so to not be deleted at exit
-    //    std::cout<<"about to copy"<<std::endl;
-    CaloMiscalibTools::ReturnType mydata = std::make_unique<EcalIntercalibConstants>(map.get());
-    //    std::cout<<"mydata "<<mydata<<std::endl;
-    return mydata;
+CaloMiscalibTools::ReturnType CaloMiscalibTools::produce(const EcalIntercalibConstantsRcd& iRecord) {
+  CaloMiscalibMapEcal map;
+  map.prefillMap();
+  MiscalibReaderFromXMLEcalBarrel barrelreader_(map);
+  MiscalibReaderFromXMLEcalEndcap endcapreader_(map);
+  if (!barrelfile_.empty())
+    barrelreader_.parseXMLMiscalibFile(barrelfile_);
+  if (!endcapfile_.empty())
+    endcapreader_.parseXMLMiscalibFile(endcapfile_);
+  map.print();
+  // Added by Zhen, need a new object so to not be deleted at exit
+  //    std::cout<<"about to copy"<<std::endl;
+  CaloMiscalibTools::ReturnType mydata = std::make_unique<EcalIntercalibConstants>(map.get());
+  //    std::cout<<"mydata "<<mydata<<std::endl;
+  return mydata;
 }
 
- void CaloMiscalibTools::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
- oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- 
- }
-
+void CaloMiscalibTools::setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
+                                       const edm::IOVSyncValue&,
+                                       edm::ValidityInterval& oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibCalorimetry/CaloMiscalibTools/plugins/CaloMiscalibToolsMC.cc b/CalibCalorimetry/CaloMiscalibTools/plugins/CaloMiscalibToolsMC.cc
index c42586e32a5ae..3f3a5bd06b71d 100644
--- a/CalibCalorimetry/CaloMiscalibTools/plugins/CaloMiscalibToolsMC.cc
+++ b/CalibCalorimetry/CaloMiscalibTools/plugins/CaloMiscalibToolsMC.cc
@@ -2,7 +2,7 @@
 //
 // Package:    CaloMiscalibToolsMC
 // Class:      CaloMiscalibToolsMC
-// 
+//
 /**\class CaloMiscalibToolsMC CaloMiscalibToolsMC.h CalibCalorimetry/CaloMiscalibToolsMC/interface/CaloMiscalibToolsMC.h
 
  Description: <one line class summary>
@@ -14,13 +14,12 @@
 // Original Author:  Lorenzo AGOSTINO
 //         Created:  Wed May 31 10:37:45 CEST 2006
 //
-// Modified       : Luca Malgeri 
-// Date:          : 11/09/2006 
+// Modified       : Luca Malgeri
+// Date:          : 11/09/2006
 // Reason         : split class definition (.h) from source code (.cc)
 //
 //
 
-
 // system include files
 
 // user include files
@@ -33,67 +32,57 @@
 //
 // constructors and destructor
 //
-CaloMiscalibToolsMC::CaloMiscalibToolsMC(const edm::ParameterSet& iConfig)
-{
-   //the following line is needed to tell the framework what
-   // data is being produced
+CaloMiscalibToolsMC::CaloMiscalibToolsMC(const edm::ParameterSet& iConfig) {
+  //the following line is needed to tell the framework what
+  // data is being produced
 
-  barrelfileinpath_=iConfig.getUntrackedParameter<std::string> ("fileNameBarrel","");
-  endcapfileinpath_=iConfig.getUntrackedParameter<std::string> ("fileNameEndcap","");
+  barrelfileinpath_ = iConfig.getUntrackedParameter<std::string>("fileNameBarrel", "");
+  endcapfileinpath_ = iConfig.getUntrackedParameter<std::string>("fileNameEndcap", "");
 
-  edm::FileInPath barrelfiletmp("CalibCalorimetry/CaloMiscalibTools/data/"+barrelfileinpath_);
-  edm::FileInPath endcapfiletmp("CalibCalorimetry/CaloMiscalibTools/data/"+endcapfileinpath_);
-  
-  
-  barrelfile_=barrelfiletmp.fullPath();
-  endcapfile_=endcapfiletmp.fullPath();
+  edm::FileInPath barrelfiletmp("CalibCalorimetry/CaloMiscalibTools/data/" + barrelfileinpath_);
+  edm::FileInPath endcapfiletmp("CalibCalorimetry/CaloMiscalibTools/data/" + endcapfileinpath_);
 
-  std::cout <<"Barrel file is:"<< barrelfile_<<std::endl;
-  std::cout <<"endcap file is:"<< endcapfile_<<std::endl;
+  barrelfile_ = barrelfiletmp.fullPath();
+  endcapfile_ = endcapfiletmp.fullPath();
 
+  std::cout << "Barrel file is:" << barrelfile_ << std::endl;
+  std::cout << "endcap file is:" << endcapfile_ << std::endl;
 
-   // added by Zhen (changed since 1_2_0)
-   setWhatProduced(this,&CaloMiscalibToolsMC::produce);
-   findingRecord<EcalIntercalibConstantsMCRcd>();
-   //now do what ever other initialization is needed
+  // added by Zhen (changed since 1_2_0)
+  setWhatProduced(this, &CaloMiscalibToolsMC::produce);
+  findingRecord<EcalIntercalibConstantsMCRcd>();
+  //now do what ever other initialization is needed
 }
 
-
-CaloMiscalibToolsMC::~CaloMiscalibToolsMC()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+CaloMiscalibToolsMC::~CaloMiscalibToolsMC() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CaloMiscalibToolsMC::ReturnType
-CaloMiscalibToolsMC::produce(const EcalIntercalibConstantsMCRcd& iRecord)
-{
-    CaloMiscalibMapEcal map;
-    map.prefillMap();
-    MiscalibReaderFromXMLEcalBarrel barrelreader_(map);
-    MiscalibReaderFromXMLEcalEndcap endcapreader_(map);
-    if(!barrelfile_.empty()) barrelreader_.parseXMLMiscalibFile(barrelfile_);
-    if(!endcapfile_.empty())endcapreader_.parseXMLMiscalibFile(endcapfile_);
-    map.print();
-    // Added by Zhen, need a new object so to not be deleted at exit
-    //    std::cout<<"about to copy"<<std::endl;
-    CaloMiscalibToolsMC::ReturnType mydata = std::make_unique<EcalIntercalibConstantsMC>(map.get());
-    //    std::cout<<"mydata "<<mydata<<std::endl;
-    return mydata;
+CaloMiscalibToolsMC::ReturnType CaloMiscalibToolsMC::produce(const EcalIntercalibConstantsMCRcd& iRecord) {
+  CaloMiscalibMapEcal map;
+  map.prefillMap();
+  MiscalibReaderFromXMLEcalBarrel barrelreader_(map);
+  MiscalibReaderFromXMLEcalEndcap endcapreader_(map);
+  if (!barrelfile_.empty())
+    barrelreader_.parseXMLMiscalibFile(barrelfile_);
+  if (!endcapfile_.empty())
+    endcapreader_.parseXMLMiscalibFile(endcapfile_);
+  map.print();
+  // Added by Zhen, need a new object so to not be deleted at exit
+  //    std::cout<<"about to copy"<<std::endl;
+  CaloMiscalibToolsMC::ReturnType mydata = std::make_unique<EcalIntercalibConstantsMC>(map.get());
+  //    std::cout<<"mydata "<<mydata<<std::endl;
+  return mydata;
 }
 
- void CaloMiscalibToolsMC::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
- oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- 
- }
-
+void CaloMiscalibToolsMC::setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
+                                         const edm::IOVSyncValue&,
+                                         edm::ValidityInterval& oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibCalorimetry/CaloMiscalibTools/plugins/EcalRecHitRecalib.cc b/CalibCalorimetry/CaloMiscalibTools/plugins/EcalRecHitRecalib.cc
index c6f4340e3226b..784494847b81c 100644
--- a/CalibCalorimetry/CaloMiscalibTools/plugins/EcalRecHitRecalib.cc
+++ b/CalibCalorimetry/CaloMiscalibTools/plugins/EcalRecHitRecalib.cc
@@ -12,126 +12,109 @@
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-EcalRecHitRecalib::EcalRecHitRecalib(const edm::ParameterSet& iConfig)
-{
-  ecalHitsProducer_ = iConfig.getParameter< std::string > ("ecalRecHitsProducer");
-  barrelHits_ = iConfig.getParameter< std::string > ("barrelHitCollection");
-  endcapHits_ = iConfig.getParameter< std::string > ("endcapHitCollection");
-  RecalibBarrelHits_ = iConfig.getParameter< std::string > ("RecalibBarrelHitCollection");
-  RecalibEndcapHits_ = iConfig.getParameter< std::string > ("RecalibEndcapHitCollection");
-  refactor_ = iConfig.getUntrackedParameter<double> ("Refactor",(double)1);
-  refactor_mean_ = iConfig.getUntrackedParameter<double> ("Refactor_mean",(double)1);
+EcalRecHitRecalib::EcalRecHitRecalib(const edm::ParameterSet& iConfig) {
+  ecalHitsProducer_ = iConfig.getParameter<std::string>("ecalRecHitsProducer");
+  barrelHits_ = iConfig.getParameter<std::string>("barrelHitCollection");
+  endcapHits_ = iConfig.getParameter<std::string>("endcapHitCollection");
+  RecalibBarrelHits_ = iConfig.getParameter<std::string>("RecalibBarrelHitCollection");
+  RecalibEndcapHits_ = iConfig.getParameter<std::string>("RecalibEndcapHitCollection");
+  refactor_ = iConfig.getUntrackedParameter<double>("Refactor", (double)1);
+  refactor_mean_ = iConfig.getUntrackedParameter<double>("Refactor_mean", (double)1);
 
   //register your products
-  produces< EBRecHitCollection >(RecalibBarrelHits_);
-  produces< EERecHitCollection >(RecalibEndcapHits_);
-}
-
-
-EcalRecHitRecalib::~EcalRecHitRecalib()
-{
- 
-
+  produces<EBRecHitCollection>(RecalibBarrelHits_);
+  produces<EERecHitCollection>(RecalibEndcapHits_);
 }
 
+EcalRecHitRecalib::~EcalRecHitRecalib() {}
 
 // ------------ method called to produce the data  ------------
-void
-EcalRecHitRecalib::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void EcalRecHitRecalib::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   using namespace edm;
   using namespace std;
 
   Handle<EBRecHitCollection> barrelRecHitsHandle;
   Handle<EERecHitCollection> endcapRecHitsHandle;
 
-  const EBRecHitCollection*  EBRecHits = nullptr;
-  const EERecHitCollection*  EERecHits = nullptr; 
- 
-  iEvent.getByLabel(ecalHitsProducer_,barrelHits_,barrelRecHitsHandle);
+  const EBRecHitCollection* EBRecHits = nullptr;
+  const EERecHitCollection* EERecHits = nullptr;
+
+  iEvent.getByLabel(ecalHitsProducer_, barrelHits_, barrelRecHitsHandle);
   if (!barrelRecHitsHandle.isValid()) {
     LogDebug("") << "EcalREcHitMiscalib: Error! can't get product!" << std::endl;
   } else {
-    EBRecHits = barrelRecHitsHandle.product(); // get a ptr to the product
+    EBRecHits = barrelRecHitsHandle.product();  // get a ptr to the product
   }
 
-  iEvent.getByLabel(ecalHitsProducer_,endcapHits_,endcapRecHitsHandle);
+  iEvent.getByLabel(ecalHitsProducer_, endcapHits_, endcapRecHitsHandle);
   if (!endcapRecHitsHandle.isValid()) {
     LogDebug("") << "EcalREcHitMiscalib: Error! can't get product!" << std::endl;
   } else {
-    EERecHits = endcapRecHitsHandle.product(); // get a ptr to the product
+    EERecHits = endcapRecHitsHandle.product();  // get a ptr to the product
   }
 
   //Create empty output collections
   auto RecalibEBRecHitCollection = std::make_unique<EBRecHitCollection>();
   auto RecalibEERecHitCollection = std::make_unique<EERecHitCollection>();
 
-
   // Intercalib constants
   edm::ESHandle<EcalIntercalibConstants> pIcal;
   iSetup.get<EcalIntercalibConstantsRcd>().get(pIcal);
   const EcalIntercalibConstants* ical = pIcal.product();
 
-  if(EBRecHits)
-    {
-
-       //loop on all EcalRecHits (barrel)
-      EBRecHitCollection::const_iterator itb;
-      for (itb=EBRecHits->begin(); itb!=EBRecHits->end(); ++itb) {
-	
-	// find intercalib constant for this xtal
-	EcalIntercalibConstantMap::const_iterator icalit=ical->getMap().find(itb->id().rawId());
-	EcalIntercalibConstant icalconst = -1;
-
-	if( icalit!=ical->getMap().end() ){
-	  icalconst = (*icalit);
-	  // edm::LogDebug("EcalRecHitRecalib") << "Found intercalib for xtal " << EBDetId(itb->id()) << " " << icalconst ;
-
-	} else {
-	  edm::LogError("EcalRecHitRecalib") << "No intercalib const found for xtal " << EBDetId(itb->id()) << "! something wrong with EcalIntercalibConstants in your DB? "
-              ;
-          }
-          
-          // make the rechit with rescaled energy and put in the output collection
-	icalconst=refactor_mean_+(icalconst-refactor_mean_)*refactor_; //apply additional scaling factor (works if gaussian)
-	EcalRecHit aHit(itb->id(),itb->energy()*icalconst,itb->time());
-	  
-	RecalibEBRecHitCollection->push_back( aHit);
+  if (EBRecHits) {
+    //loop on all EcalRecHits (barrel)
+    EBRecHitCollection::const_iterator itb;
+    for (itb = EBRecHits->begin(); itb != EBRecHits->end(); ++itb) {
+      // find intercalib constant for this xtal
+      EcalIntercalibConstantMap::const_iterator icalit = ical->getMap().find(itb->id().rawId());
+      EcalIntercalibConstant icalconst = -1;
+
+      if (icalit != ical->getMap().end()) {
+        icalconst = (*icalit);
+        // edm::LogDebug("EcalRecHitRecalib") << "Found intercalib for xtal " << EBDetId(itb->id()) << " " << icalconst ;
+
+      } else {
+        edm::LogError("EcalRecHitRecalib") << "No intercalib const found for xtal " << EBDetId(itb->id())
+                                           << "! something wrong with EcalIntercalibConstants in your DB? ";
       }
+
+      // make the rechit with rescaled energy and put in the output collection
+      icalconst = refactor_mean_ +
+                  (icalconst - refactor_mean_) * refactor_;  //apply additional scaling factor (works if gaussian)
+      EcalRecHit aHit(itb->id(), itb->energy() * icalconst, itb->time());
+
+      RecalibEBRecHitCollection->push_back(aHit);
     }
+  }
 
-  if(EERecHits)
-    {
-
-       //loop on all EcalRecHits (barrel)
-      EERecHitCollection::const_iterator ite;
-      for (ite=EERecHits->begin(); ite!=EERecHits->end(); ++ite) {
-	
-	// find intercalib constant for this xtal
-	EcalIntercalibConstantMap::const_iterator icalit=ical->getMap().find(ite->id().rawId());
-	EcalIntercalibConstant icalconst = -1;
-
-	if( icalit!=ical->getMap().end() ){
-	  icalconst = (*icalit);
-	  // edm:: LogDebug("EcalRecHitRecalib") << "Found intercalib for xtal " << EEDetId(ite->id()) << " " << icalconst ;
-          } else {
-            edm::LogError("EcalRecHitRecalib") << "No intercalib const found for xtal " << EEDetId(ite->id()) << "! something wrong with EcalIntercalibConstants in your DB? "
-              ;
-          }
-          
-          // make the rechit with rescaled energy and put in the output collection
-	
-	icalconst=refactor_mean_+(icalconst-refactor_mean_)*refactor_; //apply additional scaling factor (works if gaussian)
-	EcalRecHit aHit(ite->id(),ite->energy()*icalconst,ite->time());
-	
-	RecalibEERecHitCollection->push_back( aHit);
+  if (EERecHits) {
+    //loop on all EcalRecHits (barrel)
+    EERecHitCollection::const_iterator ite;
+    for (ite = EERecHits->begin(); ite != EERecHits->end(); ++ite) {
+      // find intercalib constant for this xtal
+      EcalIntercalibConstantMap::const_iterator icalit = ical->getMap().find(ite->id().rawId());
+      EcalIntercalibConstant icalconst = -1;
+
+      if (icalit != ical->getMap().end()) {
+        icalconst = (*icalit);
+        // edm:: LogDebug("EcalRecHitRecalib") << "Found intercalib for xtal " << EEDetId(ite->id()) << " " << icalconst ;
+      } else {
+        edm::LogError("EcalRecHitRecalib") << "No intercalib const found for xtal " << EEDetId(ite->id())
+                                           << "! something wrong with EcalIntercalibConstants in your DB? ";
       }
-    }
 
+      // make the rechit with rescaled energy and put in the output collection
+
+      icalconst = refactor_mean_ +
+                  (icalconst - refactor_mean_) * refactor_;  //apply additional scaling factor (works if gaussian)
+      EcalRecHit aHit(ite->id(), ite->energy() * icalconst, ite->time());
+
+      RecalibEERecHitCollection->push_back(aHit);
+    }
+  }
 
   //Put Recalibrated rechit in the event
   iEvent.put(std::move(RecalibEBRecHitCollection), RecalibBarrelHits_);
   iEvent.put(std::move(RecalibEERecHitCollection), RecalibEndcapHits_);
-  
 }
-
diff --git a/CalibCalorimetry/CaloMiscalibTools/plugins/HcalRecHitRecalib.cc b/CalibCalorimetry/CaloMiscalibTools/plugins/HcalRecHitRecalib.cc
index ece85aa7e5cb2..9c1dd235f249a 100644
--- a/CalibCalorimetry/CaloMiscalibTools/plugins/HcalRecHitRecalib.cc
+++ b/CalibCalorimetry/CaloMiscalibTools/plugins/HcalRecHitRecalib.cc
@@ -9,64 +9,54 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLHcal.h"
 
-HcalRecHitRecalib::HcalRecHitRecalib(const edm::ParameterSet& iConfig)
-{
-
+HcalRecHitRecalib::HcalRecHitRecalib(const edm::ParameterSet& iConfig) {
   tok_hbhe_ = consumes<HBHERecHitCollection>(iConfig.getParameter<edm::InputTag>("hbheInput"));
   tok_ho_ = consumes<HORecHitCollection>(iConfig.getParameter<edm::InputTag>("hoInput"));
   tok_hf_ = consumes<HFRecHitCollection>(iConfig.getParameter<edm::InputTag>("hfInput"));
 
-//   HBHEHitsProducer_ = iConfig.getParameter< std::string > ("HBHERecHitsProducer");
-//   HOHitsProducer_ = iConfig.getParameter< std::string > ("HERecHitsProducer");
-//   HFHitsProducer_ = iConfig.getParameter< std::string > ("HERecHitsProducer");
-//   HBHEHits_ = iConfig.getParameter< std::string > ("HBHEHitCollection");
-//   HFHits_ = iConfig.getParameter< std::string > ("HFHitCollection");
-//   HOHits_ = iConfig.getParameter< std::string > ("HOHitCollection");
+  //   HBHEHitsProducer_ = iConfig.getParameter< std::string > ("HBHERecHitsProducer");
+  //   HOHitsProducer_ = iConfig.getParameter< std::string > ("HERecHitsProducer");
+  //   HFHitsProducer_ = iConfig.getParameter< std::string > ("HERecHitsProducer");
+  //   HBHEHits_ = iConfig.getParameter< std::string > ("HBHEHitCollection");
+  //   HFHits_ = iConfig.getParameter< std::string > ("HFHitCollection");
+  //   HOHits_ = iConfig.getParameter< std::string > ("HOHitCollection");
 
-  RecalibHBHEHits_ = iConfig.getParameter< std::string > ("RecalibHBHEHitCollection");
-  RecalibHFHits_ = iConfig.getParameter< std::string > ("RecalibHFHitCollection");
-  RecalibHOHits_ = iConfig.getParameter< std::string > ("RecalibHOHitCollection");
+  RecalibHBHEHits_ = iConfig.getParameter<std::string>("RecalibHBHEHitCollection");
+  RecalibHFHits_ = iConfig.getParameter<std::string>("RecalibHFHitCollection");
+  RecalibHOHits_ = iConfig.getParameter<std::string>("RecalibHOHitCollection");
 
-  refactor_ = iConfig.getUntrackedParameter<double> ("Refactor",(double)1);
-  refactor_mean_ = iConfig.getUntrackedParameter<double> ("Refactor_mean",(double)1);
+  refactor_ = iConfig.getUntrackedParameter<double>("Refactor", (double)1);
+  refactor_mean_ = iConfig.getUntrackedParameter<double>("Refactor_mean", (double)1);
 
   //register your products
-  produces< HBHERecHitCollection >(RecalibHBHEHits_);
-  produces< HFRecHitCollection >(RecalibHFHits_);
-  produces< HORecHitCollection >(RecalibHOHits_);
+  produces<HBHERecHitCollection>(RecalibHBHEHits_);
+  produces<HFRecHitCollection>(RecalibHFHits_);
+  produces<HORecHitCollection>(RecalibHOHits_);
 
   // here read them from xml (particular to HCAL)
 
-  hcalfileinpath_=iConfig.getUntrackedParameter<std::string> ("fileNameHcal","");
-  edm::FileInPath hcalfiletmp("CalibCalorimetry/CaloMiscalibTools/data/"+hcalfileinpath_);
+  hcalfileinpath_ = iConfig.getUntrackedParameter<std::string>("fileNameHcal", "");
+  edm::FileInPath hcalfiletmp("CalibCalorimetry/CaloMiscalibTools/data/" + hcalfileinpath_);
 
-  hcalfile_=hcalfiletmp.fullPath();
+  hcalfile_ = hcalfiletmp.fullPath();
 }
 
+HcalRecHitRecalib::~HcalRecHitRecalib() {}
 
-HcalRecHitRecalib::~HcalRecHitRecalib()
-{
- 
-
-}
-
-void
-HcalRecHitRecalib::beginRun(const edm::Run&, const edm::EventSetup& iSetup)
-{
+void HcalRecHitRecalib::beginRun(const edm::Run&, const edm::EventSetup& iSetup) {
   edm::ESHandle<HcalTopology> topology;
-  iSetup.get<HcalRecNumberingRecord>().get( topology );
-  
+  iSetup.get<HcalRecNumberingRecord>().get(topology);
+
   mapHcal_.prefillMap(*topology);
 
   MiscalibReaderFromXMLHcal hcalreader_(mapHcal_);
-  if(!hcalfile_.empty()) hcalreader_.parseXMLMiscalibFile(hcalfile_);
+  if (!hcalfile_.empty())
+    hcalreader_.parseXMLMiscalibFile(hcalfile_);
   mapHcal_.print();
 }
 
 // ------------ method called to produce the data  ------------
-void
-HcalRecHitRecalib::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void HcalRecHitRecalib::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   using namespace edm;
   using namespace std;
 
@@ -74,41 +64,39 @@ HcalRecHitRecalib::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
   Handle<HFRecHitCollection> HFRecHitsHandle;
   Handle<HORecHitCollection> HORecHitsHandle;
 
-  const HBHERecHitCollection*  HBHERecHits = nullptr;
-  const HFRecHitCollection*  HFRecHits = nullptr;
-  const HORecHitCollection*  HORecHits = nullptr;
+  const HBHERecHitCollection* HBHERecHits = nullptr;
+  const HFRecHitCollection* HFRecHits = nullptr;
+  const HORecHitCollection* HORecHits = nullptr;
 
-  iEvent.getByToken(tok_hbhe_,HBHERecHitsHandle);
+  iEvent.getByToken(tok_hbhe_, HBHERecHitsHandle);
   if (!HBHERecHitsHandle.isValid()) {
     LogDebug("") << "HcalREcHitRecalib: Error! can't get product!" << std::endl;
   } else {
-    HBHERecHits = HBHERecHitsHandle.product(); // get a ptr to the product
+    HBHERecHits = HBHERecHitsHandle.product();  // get a ptr to the product
   }
 
-  iEvent.getByToken(tok_ho_,HORecHitsHandle);
+  iEvent.getByToken(tok_ho_, HORecHitsHandle);
   if (!HORecHitsHandle.isValid()) {
     LogDebug("") << "HcalREcHitRecalib: Error! can't get product!" << std::endl;
   } else {
-    HORecHits = HORecHitsHandle.product(); // get a ptr to the product
+    HORecHits = HORecHitsHandle.product();  // get a ptr to the product
   }
 
-  iEvent.getByToken(tok_hf_,HFRecHitsHandle);
+  iEvent.getByToken(tok_hf_, HFRecHitsHandle);
   if (!HFRecHitsHandle.isValid()) {
     LogDebug("") << "HcalREcHitRecalib: Error! can't get product!" << std::endl;
   } else {
-    HFRecHits = HFRecHitsHandle.product(); // get a ptr to the product
+    HFRecHits = HFRecHitsHandle.product();  // get a ptr to the product
   }
 
+  //     iEvent.getByLabel(HBHEHitsProducer_,HBHEHits_,HBHERecHitsHandle);
+  //     HBHERecHits = HBHERecHitsHandle.product(); // get a ptr to the product
 
-//     iEvent.getByLabel(HBHEHitsProducer_,HBHEHits_,HBHERecHitsHandle);
-//     HBHERecHits = HBHERecHitsHandle.product(); // get a ptr to the product
-
-//     iEvent.getByLabel(HFHitsProducer_,HFHits_,HFRecHitsHandle);
-//     HFRecHits = HFRecHitsHandle.product(); // get a ptr to the product
-
-//     iEvent.getByLabel(HOHitsProducer_,HOHits_,HORecHitsHandle);
-//     HORecHits = HORecHitsHandle.product(); // get a ptr to the product
+  //     iEvent.getByLabel(HFHitsProducer_,HFHits_,HFRecHitsHandle);
+  //     HFRecHits = HFRecHitsHandle.product(); // get a ptr to the product
 
+  //     iEvent.getByLabel(HOHitsProducer_,HOHits_,HORecHitsHandle);
+  //     HORecHits = HORecHitsHandle.product(); // get a ptr to the product
 
   //Create empty output collections
   auto RecalibHBHERecHitCollection = std::make_unique<HBHERecHitCollection>();
@@ -120,103 +108,95 @@ HcalRecHitRecalib::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
   //  iSetup.get<EcalIntercalibConstantsRcd>().get(pIcal);
   //  const EcalIntercalibConstants* ical = pIcal.product();
 
-  if(HBHERecHits)
-    {
-
-       //loop on all EcalRecHits (barrel)
-      HBHERecHitCollection::const_iterator itHBHE;
-      for (itHBHE=HBHERecHits->begin(); itHBHE!=HBHERecHits->end(); ++itHBHE) {
-	
-	// find intercalib constant for this cell
-
-	//	EcalIntercalibConstants::EcalIntercalibConstantMap::const_iterator icalit=ical->getMap().find(itb->id().rawId());
-	//	EcalIntercalibConstants::EcalIntercalibConstant icalconst;
-
-	//	if( icalit!=ical->getMap().end() ){
-	//	  icalconst = icalit->second;
-	  // edm::LogDebug("EcalRecHitMiscalib") << "Found intercalib for xtal " << EBDetId(itb->id()) << " " << icalconst ;
-
-	//	} else {
-	//	  edm::LogError("EcalRecHitMiscalib") << "No intercalib const found for xtal " << EBDetId(itb->id()) << "! something wrong with EcalIntercalibConstants in your DB? "
-	//              ;
-	//          }
-          
-	float icalconst=(mapHcal_.get().find(itHBHE->id().rawId()))->second;
-          // make the rechit with rescaled energy and put in the output collection
-
-	icalconst=refactor_mean_+(icalconst-refactor_mean_)*refactor_; //apply additional scaling factor (works if gaussian)	
-	HBHERecHit aHit(itHBHE->id(),itHBHE->energy()*icalconst,itHBHE->time());
-	
-	RecalibHBHERecHitCollection->push_back( aHit);
-      }
-    }
+  if (HBHERecHits) {
+    //loop on all EcalRecHits (barrel)
+    HBHERecHitCollection::const_iterator itHBHE;
+    for (itHBHE = HBHERecHits->begin(); itHBHE != HBHERecHits->end(); ++itHBHE) {
+      // find intercalib constant for this cell
 
-  if(HFRecHits)
-    {
-
-       //loop on all EcalRecHits (barrel)
-      HFRecHitCollection::const_iterator itHF;
-      for (itHF=HFRecHits->begin(); itHF!=HFRecHits->end(); ++itHF) {
-	
-	// find intercalib constant for this cell
-
-	//	EcalIntercalibConstants::EcalIntercalibConstantMap::const_iterator icalit=ical->getMap().find(itb->id().rawId());
-	//	EcalIntercalibConstants::EcalIntercalibConstant icalconst;
-
-	//	if( icalit!=ical->getMap().end() ){
-	//	  icalconst = icalit->second;
-	  // edm::LogDebug("EcalRecHitMiscalib") << "Found intercalib for xtal " << EBDetId(itb->id()) << " " << icalconst ;
-
-	//	} else {
-	//	  edm::LogError("EcalRecHitMiscalib") << "No intercalib const found for xtal " << EBDetId(itb->id()) << "! something wrong with EcalIntercalibConstants in your DB? "
-	//              ;
-	//          }
-          
-          // make the rechit with rescaled energy and put in the output collection
-	
-	float icalconst=(mapHcal_.get().find(itHF->id().rawId()))->second;
-	icalconst=refactor_mean_+(icalconst-refactor_mean_)*refactor_; //apply additional scaling factor (works if gaussian)	
-	HFRecHit aHit(itHF->id(),itHF->energy()*icalconst,itHF->time());
-	
-	RecalibHFRecHitCollection->push_back( aHit);
-      }
+      //	EcalIntercalibConstants::EcalIntercalibConstantMap::const_iterator icalit=ical->getMap().find(itb->id().rawId());
+      //	EcalIntercalibConstants::EcalIntercalibConstant icalconst;
+
+      //	if( icalit!=ical->getMap().end() ){
+      //	  icalconst = icalit->second;
+      // edm::LogDebug("EcalRecHitMiscalib") << "Found intercalib for xtal " << EBDetId(itb->id()) << " " << icalconst ;
+
+      //	} else {
+      //	  edm::LogError("EcalRecHitMiscalib") << "No intercalib const found for xtal " << EBDetId(itb->id()) << "! something wrong with EcalIntercalibConstants in your DB? "
+      //              ;
+      //          }
+
+      float icalconst = (mapHcal_.get().find(itHBHE->id().rawId()))->second;
+      // make the rechit with rescaled energy and put in the output collection
+
+      icalconst = refactor_mean_ +
+                  (icalconst - refactor_mean_) * refactor_;  //apply additional scaling factor (works if gaussian)
+      HBHERecHit aHit(itHBHE->id(), itHBHE->energy() * icalconst, itHBHE->time());
+
+      RecalibHBHERecHitCollection->push_back(aHit);
     }
+  }
+
+  if (HFRecHits) {
+    //loop on all EcalRecHits (barrel)
+    HFRecHitCollection::const_iterator itHF;
+    for (itHF = HFRecHits->begin(); itHF != HFRecHits->end(); ++itHF) {
+      // find intercalib constant for this cell
 
-  if(HORecHits)
-    {
-
-       //loop on all EcalRecHits (barrel)
-      HORecHitCollection::const_iterator itHO;
-      for (itHO=HORecHits->begin(); itHO!=HORecHits->end(); ++itHO) {
-	
-	// find intercalib constant for this cell
-
-	//	EcalIntercalibConstants::EcalIntercalibConstantMap::const_iterator icalit=ical->getMap().find(itb->id().rawId());
-	//	EcalIntercalibConstants::EcalIntercalibConstant icalconst;
-
-	//	if( icalit!=ical->getMap().end() ){
-	//	  icalconst = icalit->second;
-	  // edm::LogDebug("EcalRecHitMiscalib") << "Found intercalib for xtal " << EBDetId(itb->id()) << " " << icalconst ;
-
-	//	} else {
-	//	  edm::LogError("EcalRecHitMiscalib") << "No intercalib const found for xtal " << EBDetId(itb->id()) << "! something wrong with EcalIntercalibConstants in your DB? "
-	//              ;
-	//          }
-          
-          // make the rechit with rescaled energy and put in the output collection
-
-	float icalconst=(mapHcal_.get().find(itHO->id().rawId()))->second;
-	icalconst=refactor_mean_+(icalconst-refactor_mean_)*refactor_; //apply additional scaling factor (works if gaussian)	
-	HORecHit aHit(itHO->id(),itHO->energy()*icalconst,itHO->time());
-	  
-	  RecalibHORecHitCollection->push_back( aHit);
-      }
+      //	EcalIntercalibConstants::EcalIntercalibConstantMap::const_iterator icalit=ical->getMap().find(itb->id().rawId());
+      //	EcalIntercalibConstants::EcalIntercalibConstant icalconst;
+
+      //	if( icalit!=ical->getMap().end() ){
+      //	  icalconst = icalit->second;
+      // edm::LogDebug("EcalRecHitMiscalib") << "Found intercalib for xtal " << EBDetId(itb->id()) << " " << icalconst ;
+
+      //	} else {
+      //	  edm::LogError("EcalRecHitMiscalib") << "No intercalib const found for xtal " << EBDetId(itb->id()) << "! something wrong with EcalIntercalibConstants in your DB? "
+      //              ;
+      //          }
+
+      // make the rechit with rescaled energy and put in the output collection
+
+      float icalconst = (mapHcal_.get().find(itHF->id().rawId()))->second;
+      icalconst = refactor_mean_ +
+                  (icalconst - refactor_mean_) * refactor_;  //apply additional scaling factor (works if gaussian)
+      HFRecHit aHit(itHF->id(), itHF->energy() * icalconst, itHF->time());
+
+      RecalibHFRecHitCollection->push_back(aHit);
     }
+  }
+
+  if (HORecHits) {
+    //loop on all EcalRecHits (barrel)
+    HORecHitCollection::const_iterator itHO;
+    for (itHO = HORecHits->begin(); itHO != HORecHits->end(); ++itHO) {
+      // find intercalib constant for this cell
+
+      //	EcalIntercalibConstants::EcalIntercalibConstantMap::const_iterator icalit=ical->getMap().find(itb->id().rawId());
+      //	EcalIntercalibConstants::EcalIntercalibConstant icalconst;
 
+      //	if( icalit!=ical->getMap().end() ){
+      //	  icalconst = icalit->second;
+      // edm::LogDebug("EcalRecHitMiscalib") << "Found intercalib for xtal " << EBDetId(itb->id()) << " " << icalconst ;
+
+      //	} else {
+      //	  edm::LogError("EcalRecHitMiscalib") << "No intercalib const found for xtal " << EBDetId(itb->id()) << "! something wrong with EcalIntercalibConstants in your DB? "
+      //              ;
+      //          }
+
+      // make the rechit with rescaled energy and put in the output collection
+
+      float icalconst = (mapHcal_.get().find(itHO->id().rawId()))->second;
+      icalconst = refactor_mean_ +
+                  (icalconst - refactor_mean_) * refactor_;  //apply additional scaling factor (works if gaussian)
+      HORecHit aHit(itHO->id(), itHO->energy() * icalconst, itHO->time());
+
+      RecalibHORecHitCollection->push_back(aHit);
+    }
+  }
 
   //Put Recalibrated rechit in the event
   iEvent.put(std::move(RecalibHBHERecHitCollection), RecalibHBHEHits_);
   iEvent.put(std::move(RecalibHFRecHitCollection), RecalibHFHits_);
   iEvent.put(std::move(RecalibHORecHitCollection), RecalibHOHits_);
 }
-
diff --git a/CalibCalorimetry/CaloMiscalibTools/plugins/SealModule.cc b/CalibCalorimetry/CaloMiscalibTools/plugins/SealModule.cc
index 0184bff235e60..d639aec7f493b 100644
--- a/CalibCalorimetry/CaloMiscalibTools/plugins/SealModule.cc
+++ b/CalibCalorimetry/CaloMiscalibTools/plugins/SealModule.cc
@@ -8,11 +8,9 @@
 #include "CalibCalorimetry/CaloMiscalibTools/interface/WriteEcalMiscalibConstants.h"
 #include "CalibCalorimetry/CaloMiscalibTools/interface/WriteEcalMiscalibConstantsMC.h"
 
-
 DEFINE_FWK_EVENTSETUP_SOURCE(CaloMiscalibTools);
 DEFINE_FWK_EVENTSETUP_SOURCE(CaloMiscalibToolsMC);
 DEFINE_FWK_MODULE(EcalRecHitRecalib);
 DEFINE_FWK_MODULE(HcalRecHitRecalib);
 DEFINE_FWK_MODULE(WriteEcalMiscalibConstants);
 DEFINE_FWK_MODULE(WriteEcalMiscalibConstantsMC);
-
diff --git a/CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstants.cc b/CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstants.cc
index 68a129862767f..0847724a04d78 100644
--- a/CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstants.cc
+++ b/CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstants.cc
@@ -2,7 +2,7 @@
 //
 // Package:    WriteEcalMiscalibConstants
 // Class:      WriteEcalMiscalibConstants
-// 
+//
 /**\class WriteEcalMiscalibConstants WriteEcalMiscalibConstants.cc CalibCalorimetry/WriteEcalMiscalibConstants/src/WriteEcalMiscalibConstants.cc
 
  Description: <one line class summary>
@@ -16,15 +16,11 @@
 //
 //
 
-
 // system include files
 #include <iostream>
 
 // user include files
 
-
-
-
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
@@ -47,62 +43,48 @@
 //
 // constructors and destructor
 //
-WriteEcalMiscalibConstants::WriteEcalMiscalibConstants(const edm::ParameterSet& iConfig)
-{
-   //now do what ever initialization is needed
-  newTagRequest_ = iConfig.getParameter< std::string > ("NewTagRequest");
-
-
+WriteEcalMiscalibConstants::WriteEcalMiscalibConstants(const edm::ParameterSet& iConfig) {
+  //now do what ever initialization is needed
+  newTagRequest_ = iConfig.getParameter<std::string>("NewTagRequest");
 }
 
-
-WriteEcalMiscalibConstants::~WriteEcalMiscalibConstants()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+WriteEcalMiscalibConstants::~WriteEcalMiscalibConstants() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-WriteEcalMiscalibConstants::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace edm;
+void WriteEcalMiscalibConstants::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
+  using namespace edm;
   // Intercalib constants
-   edm::ESHandle<EcalIntercalibConstants> pIcal;
-   iSetup.get<EcalIntercalibConstantsRcd>().get(pIcal);
-   const EcalIntercalibConstants* Mcal = pIcal.product();
+  edm::ESHandle<EcalIntercalibConstants> pIcal;
+  iSetup.get<EcalIntercalibConstantsRcd>().get(pIcal);
+  const EcalIntercalibConstants* Mcal = pIcal.product();
 
   edm::Service<cond::service::PoolDBOutputService> poolDbService;
-  if( poolDbService.isAvailable() ){
-    if ( poolDbService->isNewTagRequest(newTagRequest_) ){
-      std::cout<<" Creating a  new one "<<std::endl;
-      poolDbService->createNewIOV<const EcalIntercalibConstants>( Mcal, poolDbService->beginOfTime(), poolDbService->endOfTime(),newTagRequest_);
-      std::cout<<"Done" << std::endl;
-    }else{
-      std::cout<<"Old One "<<std::endl;
-       poolDbService->appendSinceTime<const EcalIntercalibConstants>( Mcal, poolDbService->currentTime(),newTagRequest_);
+  if (poolDbService.isAvailable()) {
+    if (poolDbService->isNewTagRequest(newTagRequest_)) {
+      std::cout << " Creating a  new one " << std::endl;
+      poolDbService->createNewIOV<const EcalIntercalibConstants>(
+          Mcal, poolDbService->beginOfTime(), poolDbService->endOfTime(), newTagRequest_);
+      std::cout << "Done" << std::endl;
+    } else {
+      std::cout << "Old One " << std::endl;
+      poolDbService->appendSinceTime<const EcalIntercalibConstants>(Mcal, poolDbService->currentTime(), newTagRequest_);
     }
-  }  
+  }
 }
 
-
 // ------------ method called once each job just before starting event loop  ------------
-void 
-WriteEcalMiscalibConstants::beginJob()
-{
-}
+void WriteEcalMiscalibConstants::beginJob() {}
 
 // ------------ method called once each job just after ending the event loop  ------------
 void 
 
 WriteEcalMiscalibConstants::endJob() {
-  std::cout << "Here is the end" << std::endl; 
+  std::cout << "Here is the end" << std::endl;
 }
-
diff --git a/CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstantsMC.cc b/CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstantsMC.cc
index 668bce7e5c4e0..f43abd36c1b1c 100644
--- a/CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstantsMC.cc
+++ b/CalibCalorimetry/CaloMiscalibTools/plugins/WriteEcalMiscalibConstantsMC.cc
@@ -2,7 +2,7 @@
 //
 // Package:    WriteEcalMiscalibConstantsMC
 // Class:      WriteEcalMiscalibConstantsMC
-// 
+//
 /**\class WriteEcalMiscalibConstantsMC WriteEcalMiscalibConstantsMC.cc CalibCalorimetry/WriteEcalMiscalibConstantsMC/src/WriteEcalMiscalibConstantsMC.cc
 
  Description: <one line class summary>
@@ -16,15 +16,11 @@
 //
 //
 
-
 // system include files
 #include <iostream>
 
 // user include files
 
-
-
-
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
@@ -47,62 +43,49 @@
 //
 // constructors and destructor
 //
-WriteEcalMiscalibConstantsMC::WriteEcalMiscalibConstantsMC(const edm::ParameterSet& iConfig)
-{
-   //now do what ever initialization is needed
-  newTagRequest_ = iConfig.getParameter< std::string > ("NewTagRequest");
-
-
+WriteEcalMiscalibConstantsMC::WriteEcalMiscalibConstantsMC(const edm::ParameterSet& iConfig) {
+  //now do what ever initialization is needed
+  newTagRequest_ = iConfig.getParameter<std::string>("NewTagRequest");
 }
 
-
-WriteEcalMiscalibConstantsMC::~WriteEcalMiscalibConstantsMC()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+WriteEcalMiscalibConstantsMC::~WriteEcalMiscalibConstantsMC() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-WriteEcalMiscalibConstantsMC::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace edm;
+void WriteEcalMiscalibConstantsMC::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
+  using namespace edm;
   // Intercalib constants
-   edm::ESHandle<EcalIntercalibConstantsMC> pIcal;
-   iSetup.get<EcalIntercalibConstantsMCRcd>().get(pIcal);
-   const EcalIntercalibConstantsMC* Mcal = pIcal.product();
+  edm::ESHandle<EcalIntercalibConstantsMC> pIcal;
+  iSetup.get<EcalIntercalibConstantsMCRcd>().get(pIcal);
+  const EcalIntercalibConstantsMC* Mcal = pIcal.product();
 
   edm::Service<cond::service::PoolDBOutputService> poolDbService;
-  if( poolDbService.isAvailable() ){
-    if ( poolDbService->isNewTagRequest(newTagRequest_) ){
-      std::cout<<" Creating a  new one "<<std::endl;
-      poolDbService->createNewIOV<const EcalIntercalibConstantsMC>( Mcal, poolDbService->beginOfTime(), poolDbService->endOfTime(),newTagRequest_);
-      std::cout<<"Done" << std::endl;
-    }else{
-      std::cout<<"Old One "<<std::endl;
-       poolDbService->appendSinceTime<const EcalIntercalibConstantsMC>( Mcal, poolDbService->currentTime(),newTagRequest_);
+  if (poolDbService.isAvailable()) {
+    if (poolDbService->isNewTagRequest(newTagRequest_)) {
+      std::cout << " Creating a  new one " << std::endl;
+      poolDbService->createNewIOV<const EcalIntercalibConstantsMC>(
+          Mcal, poolDbService->beginOfTime(), poolDbService->endOfTime(), newTagRequest_);
+      std::cout << "Done" << std::endl;
+    } else {
+      std::cout << "Old One " << std::endl;
+      poolDbService->appendSinceTime<const EcalIntercalibConstantsMC>(
+          Mcal, poolDbService->currentTime(), newTagRequest_);
     }
-  }  
+  }
 }
 
-
 // ------------ method called once each job just before starting event loop  ------------
-void 
-WriteEcalMiscalibConstantsMC::beginJob()
-{
-}
+void WriteEcalMiscalibConstantsMC::beginJob() {}
 
 // ------------ method called once each job just after ending the event loop  ------------
 void 
 
 WriteEcalMiscalibConstantsMC::endJob() {
-  std::cout << "Here is the end" << std::endl; 
+  std::cout << "Here is the end" << std::endl;
 }
-
diff --git a/CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXML.cc b/CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXML.cc
index 87c159ac58b1a..5525eec3373ef 100644
--- a/CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXML.cc
+++ b/CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXML.cc
@@ -9,127 +9,106 @@
 
 using namespace xercesc;
 
-int MiscalibReaderFromXML::s_numberOfInstances = 0; //to check that there is only 1 instance
+int MiscalibReaderFromXML::s_numberOfInstances = 0;  //to check that there is only 1 instance
 
-inline std::string _toString(const XMLCh *toTranscode){
-	std::string tmp(XMLString::transcode(toTranscode));
-	return tmp;
+inline std::string _toString(const XMLCh* toTranscode) {
+  std::string tmp(XMLString::transcode(toTranscode));
+  return tmp;
 }
 
-inline XMLCh*  _toDOMS( std::string temp ){
-	XMLCh* buff = XMLString::transcode(temp.c_str());    
-	return  buff;
+inline XMLCh* _toDOMS(std::string temp) {
+  XMLCh* buff = XMLString::transcode(temp.c_str());
+  return buff;
 }
 
-
-
-MiscalibReaderFromXML::MiscalibReaderFromXML(CaloMiscalibMap & caloMap):caloMap_(caloMap){
-      
-	     
-	try { 
-		//std::cout << "Xerces-c initialization Number "
-		//<< s_numberOfInstances<<std::endl;
-		if (s_numberOfInstances==0) 
-		cms::concurrency::xercesInitialize();  
-	}
-	catch (const XMLException& e) {
-		std::cout << "Xerces-c error in initialization \n"
-		<< "Exception message is:  \n"
-		<< _toString(e.getMessage()) <<std::endl;
-		// throw an exception here
-	}
- 
-	++s_numberOfInstances;
-	
-	
-	
-	
+MiscalibReaderFromXML::MiscalibReaderFromXML(CaloMiscalibMap& caloMap) : caloMap_(caloMap) {
+  try {
+    //std::cout << "Xerces-c initialization Number "
+    //<< s_numberOfInstances<<std::endl;
+    if (s_numberOfInstances == 0)
+      cms::concurrency::xercesInitialize();
+  } catch (const XMLException& e) {
+    std::cout << "Xerces-c error in initialization \n"
+              << "Exception message is:  \n"
+              << _toString(e.getMessage()) << std::endl;
+    // throw an exception here
+  }
+
+  ++s_numberOfInstances;
 }
 //////////////////////////////////////////////////////////////////////////////////
 
-
-int MiscalibReaderFromXML::getIntAttribute(DOMNamedNodeMap * attribute, const std::string & attribute_name)
-{
-bool well_formed_string;
-int retval = MiscalibReaderFromXMLDomUtils::getIntAttribute(attribute,attribute_name,well_formed_string);
-if(!well_formed_string) std::cout << "MiscalibReaderFromXML::getIntAttribute PROBLEMS ...!!!" << std::endl;
+int MiscalibReaderFromXML::getIntAttribute(DOMNamedNodeMap* attribute, const std::string& attribute_name) {
+  bool well_formed_string;
+  int retval = MiscalibReaderFromXMLDomUtils::getIntAttribute(attribute, attribute_name, well_formed_string);
+  if (!well_formed_string)
+    std::cout << "MiscalibReaderFromXML::getIntAttribute PROBLEMS ...!!!" << std::endl;
 
   return retval;
 }
 
 //////////////////////////////////////////////////////////////////////////////////
 
-double MiscalibReaderFromXML::getScalingFactor(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute)
-{
-return MiscalibReaderFromXML::getFloatAttribute(attribute,"scale_factor");
+double MiscalibReaderFromXML::getScalingFactor(XERCES_CPP_NAMESPACE::DOMNamedNodeMap* attribute) {
+  return MiscalibReaderFromXML::getFloatAttribute(attribute, "scale_factor");
 }
 
 //////////////////////////////////////////////////////////////////////////////////
 
-double MiscalibReaderFromXML::getFloatAttribute(DOMNamedNodeMap * attribute, const std::string & attribute_name)
-{
-bool well_formed_string;
-double retval = MiscalibReaderFromXMLDomUtils::getFloatAttribute(attribute,attribute_name,well_formed_string);
-if(!well_formed_string) std::cout << "MiscalibReaderFromXML::getFloatAttribute PROBLEMS ...!!!" << std::endl;
-  
+double MiscalibReaderFromXML::getFloatAttribute(DOMNamedNodeMap* attribute, const std::string& attribute_name) {
+  bool well_formed_string;
+  double retval = MiscalibReaderFromXMLDomUtils::getFloatAttribute(attribute, attribute_name, well_formed_string);
+  if (!well_formed_string)
+    std::cout << "MiscalibReaderFromXML::getFloatAttribute PROBLEMS ...!!!" << std::endl;
+
   return retval;
 }
 
 //////////////////////////////////////////////////////////////////////////////////
 
-bool MiscalibReaderFromXML::parseXMLMiscalibFile(std::string configFile){
-
-	XercesDOMParser* parser = new XercesDOMParser;     
-	parser->setValidationScheme(XercesDOMParser::Val_Auto);
-	parser->setDoNamespaces(false);
-	parser->parse(configFile.c_str()); 
-	DOMDocument* doc = parser->getDocument();
-	assert(doc);
-
-        unsigned int linkTagsNum = doc->getElementsByTagName(_toDOMS("Cell"))->getLength();
-        // The following should be on LogInfo
-        //std::cout << "Read number of Cells = " << linkTagsNum << std::endl;
-
-        if(linkTagsNum==0) std::cout <<"Number of Cells in file is 0 - probably bad file format"<<std::endl;
-
-        int count=0;	
-	for (unsigned int i=0; i<linkTagsNum; i++){
-			
-		
-		DOMNode* linkNode = doc->getElementsByTagName(_toDOMS("Cell"))->item(i);
-		///Get ME name
-		if (! linkNode){
-			std::cout<<"Node LINK does not exist, i="<<i<<std::endl;
-			return true;
-		}
-		DOMElement* linkElement = static_cast<DOMElement *>(linkNode);          
-		if (! linkElement){
-			std::cout<<"Element LINK does not exist, i="<<i<<std::endl;
-			return true;		 
-		}
-
-
-                DOMNamedNodeMap *attributes = linkNode->getAttributes();
-		double scalingfactor= getScalingFactor(attributes);
-		
-		
-		
-		DetId cell = parseCellEntry(attributes);
-		
-		if(cell!= DetId(0)) 
-		{ 
-		count++;
-		caloMap_.addCell(cell,scalingfactor);
-		} else  
-		{
-		  //		std::cout << "Null received" << std::endl;
-		}
-		
-	}
- 
-        // The following should be on LogInfo
-        // std::cout << "Number of good Cells = " << count << std::endl;
-	return false;
-
+bool MiscalibReaderFromXML::parseXMLMiscalibFile(std::string configFile) {
+  XercesDOMParser* parser = new XercesDOMParser;
+  parser->setValidationScheme(XercesDOMParser::Val_Auto);
+  parser->setDoNamespaces(false);
+  parser->parse(configFile.c_str());
+  DOMDocument* doc = parser->getDocument();
+  assert(doc);
+
+  unsigned int linkTagsNum = doc->getElementsByTagName(_toDOMS("Cell"))->getLength();
+  // The following should be on LogInfo
+  //std::cout << "Read number of Cells = " << linkTagsNum << std::endl;
+
+  if (linkTagsNum == 0)
+    std::cout << "Number of Cells in file is 0 - probably bad file format" << std::endl;
+
+  int count = 0;
+  for (unsigned int i = 0; i < linkTagsNum; i++) {
+    DOMNode* linkNode = doc->getElementsByTagName(_toDOMS("Cell"))->item(i);
+    ///Get ME name
+    if (!linkNode) {
+      std::cout << "Node LINK does not exist, i=" << i << std::endl;
+      return true;
+    }
+    DOMElement* linkElement = static_cast<DOMElement*>(linkNode);
+    if (!linkElement) {
+      std::cout << "Element LINK does not exist, i=" << i << std::endl;
+      return true;
+    }
+
+    DOMNamedNodeMap* attributes = linkNode->getAttributes();
+    double scalingfactor = getScalingFactor(attributes);
+
+    DetId cell = parseCellEntry(attributes);
+
+    if (cell != DetId(0)) {
+      count++;
+      caloMap_.addCell(cell, scalingfactor);
+    } else {
+      //		std::cout << "Null received" << std::endl;
+    }
+  }
+
+  // The following should be on LogInfo
+  // std::cout << "Number of good Cells = " << count << std::endl;
+  return false;
 }
-
diff --git a/CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXMLEcalBarrel.cc b/CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXMLEcalBarrel.cc
index 7db8e2ac51da1..5976b5f86091c 100644
--- a/CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXMLEcalBarrel.cc
+++ b/CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXMLEcalBarrel.cc
@@ -1,21 +1,13 @@
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
 #include "CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalBarrel.h"
 
-
-
-DetId MiscalibReaderFromXMLEcalBarrel::parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute)
-{
-
-EBDetId cell= MiscalibReaderFromXMLEcalBarrel::getCellFromAttributes(
-                                            getIntAttribute(attribute,"eta_index"),
-                                            getIntAttribute(attribute,"phi_index")
-                                            );
-return cell;
+DetId MiscalibReaderFromXMLEcalBarrel::parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute) {
+  EBDetId cell = MiscalibReaderFromXMLEcalBarrel::getCellFromAttributes(getIntAttribute(attribute, "eta_index"),
+                                                                        getIntAttribute(attribute, "phi_index"));
+  return cell;
 }
 
-EBDetId MiscalibReaderFromXMLEcalBarrel::getCellFromAttributes(int ieta, int iphi)
-{
-EBDetId cell(ieta,iphi);
-return cell;
+EBDetId MiscalibReaderFromXMLEcalBarrel::getCellFromAttributes(int ieta, int iphi) {
+  EBDetId cell(ieta, iphi);
+  return cell;
 }
-
diff --git a/CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXMLEcalEndcap.cc b/CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXMLEcalEndcap.cc
index ee7f6e3dcdc45..0e723f3333069 100644
--- a/CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXMLEcalEndcap.cc
+++ b/CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXMLEcalEndcap.cc
@@ -1,38 +1,27 @@
 #include "DataFormats/EcalDetId/interface/EEDetId.h"
 #include "CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLEcalEndcap.h"
 
-
-DetId MiscalibReaderFromXMLEcalEndcap::parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute)
-{
-
-EEDetId cell= MiscalibReaderFromXMLEcalEndcap::getCellFromAttributes(
-                                            getIntAttribute(attribute,"x_index"),
-                                            getIntAttribute(attribute,"y_index"),
-                                            getIntAttribute(attribute,"z_index")
-                                            );
-return cell;
+DetId MiscalibReaderFromXMLEcalEndcap::parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute) {
+  EEDetId cell = MiscalibReaderFromXMLEcalEndcap::getCellFromAttributes(getIntAttribute(attribute, "x_index"),
+                                                                        getIntAttribute(attribute, "y_index"),
+                                                                        getIntAttribute(attribute, "z_index"));
+  return cell;
 }
 
-EEDetId MiscalibReaderFromXMLEcalEndcap::getCellFromAttributes(int ix, int iy, int iz)
-{
+EEDetId MiscalibReaderFromXMLEcalEndcap::getCellFromAttributes(int ix, int iy, int iz) {
+  try {
+    if (EEDetId::validDetId(ix, iy, iz)) {
+      EEDetId cell(ix, iy, iz);
+      return cell;
+    } else {
+      return EEDetId(0);
+    }
+  }
 
-       try 
-         {
-	   if (EEDetId::validDetId(ix, iy, iz)) {
-	     EEDetId cell(ix,iy,iz);
-	     return cell;
-	   } else {
-	     return EEDetId(0);
-	   }
-         }
-    
-           catch (...)
-	  
-        {
-          std::cout << "Null coordinates = "<< ix << "," << iy << "," << iz << std::endl;
-	  return EEDetId(0);
-        }
-	    
-	    
-}
+  catch (...)
 
+  {
+    std::cout << "Null coordinates = " << ix << "," << iy << "," << iz << std::endl;
+    return EEDetId(0);
+  }
+}
diff --git a/CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXMLHcal.cc b/CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXMLHcal.cc
index 11da189c4696b..0fb005422334d 100644
--- a/CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXMLHcal.cc
+++ b/CalibCalorimetry/CaloMiscalibTools/src/MiscalibReaderXMLHcal.cc
@@ -1,31 +1,20 @@
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "CalibCalorimetry/CaloMiscalibTools/interface/MiscalibReaderFromXMLHcal.h"
 
-
-
-DetId MiscalibReaderFromXMLHcal::parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute)
-{
-
-HcalDetId cell= MiscalibReaderFromXMLHcal::getCellFromAttributes(
-                                            getIntAttribute(attribute,"det_index"),
-                                            getIntAttribute(attribute,"eta_index"),
-                                            getIntAttribute(attribute,"phi_index"),
-                                            getIntAttribute(attribute,"depth_index")
-                                            );
-return cell;
+DetId MiscalibReaderFromXMLHcal::parseCellEntry(XERCES_CPP_NAMESPACE::DOMNamedNodeMap *attribute) {
+  HcalDetId cell = MiscalibReaderFromXMLHcal::getCellFromAttributes(getIntAttribute(attribute, "det_index"),
+                                                                    getIntAttribute(attribute, "eta_index"),
+                                                                    getIntAttribute(attribute, "phi_index"),
+                                                                    getIntAttribute(attribute, "depth_index"));
+  return cell;
 }
 
-HcalDetId MiscalibReaderFromXMLHcal::getCellFromAttributes(int idet, int ieta, int iphi, int idepth)
-{
-  try
-    {
-      HcalDetId cell((HcalSubdetector) idet, ieta, iphi, idepth);
-      return cell;
-    }
-  catch (...)
-    {
-      std::cout << "Null coordinates = "<< idet << "," << ieta << "," << iphi << "," << idepth << std::endl;
-      return HcalDetId(0);
-    }
+HcalDetId MiscalibReaderFromXMLHcal::getCellFromAttributes(int idet, int ieta, int iphi, int idepth) {
+  try {
+    HcalDetId cell((HcalSubdetector)idet, ieta, iphi, idepth);
+    return cell;
+  } catch (...) {
+    std::cout << "Null coordinates = " << idet << "," << ieta << "," << iphi << "," << idepth << std::endl;
+    return HcalDetId(0);
+  }
 }
-
diff --git a/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc b/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc
index a32aa436aa6e9..7479f5dd73def 100644
--- a/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc
+++ b/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc
@@ -240,7 +240,7 @@ CaloTPGTranscoderULUT::getOutputLUTSize(const HcalTrigTowerDetId& id) const
             return QIE11_OUTPUT_LUT_SIZE;
          else
             return QIE10_OUTPUT_LUT_SIZE;
-      case HcalTopologyMode::TriggerMode_2019:
+      case HcalTopologyMode::TriggerMode_2021:
          if (id.ietaAbs() <= theTopology->lastHERing())
             return QIE11_OUTPUT_LUT_SIZE;
          else
@@ -268,7 +268,7 @@ CaloTPGTranscoderULUT::isOnlyQIE11(const HcalTrigTowerDetId& id) const
          if (id.ietaAbs() <= theTopology->lastHBRing())
             return false;
          return true;
-      case HcalTopologyMode::TriggerMode_2019:
+      case HcalTopologyMode::TriggerMode_2021:
          return true;
       default:
          throw cms::Exception("CaloTPGTranscoderULUT")
diff --git a/CalibCalorimetry/CastorCalib/interface/CastorAlgoUtils.h b/CalibCalorimetry/CastorCalib/interface/CastorAlgoUtils.h
index 94bb9901179e8..f52385b399762 100644
--- a/CalibCalorimetry/CastorCalib/interface/CastorAlgoUtils.h
+++ b/CalibCalorimetry/CastorCalib/interface/CastorAlgoUtils.h
@@ -7,15 +7,12 @@
 namespace reco {
   namespace castor {
 
-    void getLinearizedADC(const CastorQIEShape& shape,
-		      const CastorQIECoder* coder,
-		      int bins,int capid,
-		      float& lo,
-		      float& hi);
+    void getLinearizedADC(
+        const CastorQIEShape& shape, const CastorQIECoder* coder, int bins, int capid, float& lo, float& hi);
 
     float maxDiff(float one, float two, float three, float four);
 
-  }
-}
+  }  // namespace castor
+}  // namespace reco
 
 #endif
diff --git a/CalibCalorimetry/CastorCalib/interface/CastorDbASCIIIO.h b/CalibCalorimetry/CastorCalib/interface/CastorDbASCIIIO.h
index 5e46d8b6805c3..77953a6e9a5d2 100644
--- a/CalibCalorimetry/CastorCalib/interface/CastorDbASCIIIO.h
+++ b/CalibCalorimetry/CastorCalib/interface/CastorDbASCIIIO.h
@@ -35,27 +35,27 @@ Text file formats for different data types is as following:
   
 */
 namespace CastorDbASCIIIO {
-  bool getObject (std::istream& fInput, CastorPedestals& fObject);
-  bool dumpObject (std::ostream& fOutput, const CastorPedestals& fObject);
-  bool getObject (std::istream& fInput, CastorPedestalWidths& fObject);
-  bool dumpObject (std::ostream& fOutput, const CastorPedestalWidths& fObject);
-  bool getObject (std::istream& fInput, CastorGains& fObject);
-  bool dumpObject (std::ostream& fOutput, const CastorGains& fObject);
-  bool getObject (std::istream& fInput, CastorGainWidths& fObject);
-  bool dumpObject (std::ostream& fOutput, const CastorGainWidths& fObject);
-  bool getObject (std::istream& fInput, CastorQIEData& fObject);
-  bool dumpObject (std::ostream& fOutput, const CastorQIEData& fObject);
-  bool getObject (std::istream& fInput, CastorCalibrationQIEData& fObject);
-  bool dumpObject (std::ostream& fOutput, const CastorCalibrationQIEData& fObject);
-  bool getObject (std::istream& fInput, CastorElectronicsMap& fObject);
-  bool dumpObject (std::ostream& fOutput, const CastorElectronicsMap& fObject);
-  bool getObject (std::istream& fInput, CastorChannelQuality& fObject);
-  bool dumpObject (std::ostream& fOutput, const CastorChannelQuality& fObject);
-  bool getObject (std::istream& fInput, CastorRecoParams& fObject);
-  bool dumpObject (std::ostream& fOutput, const CastorRecoParams& fObject);
-  bool getObject (std::istream& fInput, CastorSaturationCorrs& fObject);
-  bool dumpObject (std::ostream& fOutput, const CastorSaturationCorrs& fObject);
-  DetId getId (const std::vector <std::string> & items);
-  void dumpId (std::ostream& fOutput, DetId id);
-} 
+  bool getObject(std::istream& fInput, CastorPedestals& fObject);
+  bool dumpObject(std::ostream& fOutput, const CastorPedestals& fObject);
+  bool getObject(std::istream& fInput, CastorPedestalWidths& fObject);
+  bool dumpObject(std::ostream& fOutput, const CastorPedestalWidths& fObject);
+  bool getObject(std::istream& fInput, CastorGains& fObject);
+  bool dumpObject(std::ostream& fOutput, const CastorGains& fObject);
+  bool getObject(std::istream& fInput, CastorGainWidths& fObject);
+  bool dumpObject(std::ostream& fOutput, const CastorGainWidths& fObject);
+  bool getObject(std::istream& fInput, CastorQIEData& fObject);
+  bool dumpObject(std::ostream& fOutput, const CastorQIEData& fObject);
+  bool getObject(std::istream& fInput, CastorCalibrationQIEData& fObject);
+  bool dumpObject(std::ostream& fOutput, const CastorCalibrationQIEData& fObject);
+  bool getObject(std::istream& fInput, CastorElectronicsMap& fObject);
+  bool dumpObject(std::ostream& fOutput, const CastorElectronicsMap& fObject);
+  bool getObject(std::istream& fInput, CastorChannelQuality& fObject);
+  bool dumpObject(std::ostream& fOutput, const CastorChannelQuality& fObject);
+  bool getObject(std::istream& fInput, CastorRecoParams& fObject);
+  bool dumpObject(std::ostream& fOutput, const CastorRecoParams& fObject);
+  bool getObject(std::istream& fInput, CastorSaturationCorrs& fObject);
+  bool dumpObject(std::ostream& fOutput, const CastorSaturationCorrs& fObject);
+  DetId getId(const std::vector<std::string>& items);
+  void dumpId(std::ostream& fOutput, DetId id);
+}  // namespace CastorDbASCIIIO
 #endif
diff --git a/CalibCalorimetry/CastorCalib/interface/CastorDbHardcode.h b/CalibCalorimetry/CastorCalib/interface/CastorDbHardcode.h
index 2b146ddfa0551..fb854fb784be7 100644
--- a/CalibCalorimetry/CastorCalib/interface/CastorDbHardcode.h
+++ b/CalibCalorimetry/CastorCalib/interface/CastorDbHardcode.h
@@ -16,15 +16,15 @@
 #include "CondFormats/CastorObjects/interface/CastorSaturationCorr.h"
 
 namespace CastorDbHardcode {
-  CastorPedestal makePedestal (HcalGenericDetId fId, bool fSmear = false);
-  CastorPedestalWidth makePedestalWidth (HcalGenericDetId fId);
-  CastorGain makeGain (HcalGenericDetId fId, bool fSmear = false);
-  CastorGainWidth makeGainWidth (HcalGenericDetId fId);
-  CastorQIECoder makeQIECoder (HcalGenericDetId fId);
-  CastorCalibrationQIECoder makeCalibrationQIECoder (HcalGenericDetId fId);
-  CastorQIEShape makeQIEShape ();
-  CastorRecoParam makeRecoParam (HcalGenericDetId fId);
-  CastorSaturationCorr makeSaturationCorr (HcalGenericDetId fId);
+  CastorPedestal makePedestal(HcalGenericDetId fId, bool fSmear = false);
+  CastorPedestalWidth makePedestalWidth(HcalGenericDetId fId);
+  CastorGain makeGain(HcalGenericDetId fId, bool fSmear = false);
+  CastorGainWidth makeGainWidth(HcalGenericDetId fId);
+  CastorQIECoder makeQIECoder(HcalGenericDetId fId);
+  CastorCalibrationQIECoder makeCalibrationQIECoder(HcalGenericDetId fId);
+  CastorQIEShape makeQIEShape();
+  CastorRecoParam makeRecoParam(HcalGenericDetId fId);
+  CastorSaturationCorr makeSaturationCorr(HcalGenericDetId fId);
   void makeHardcodeMap(CastorElectronicsMap& emap);
-}
+}  // namespace CastorDbHardcode
 #endif
diff --git a/CalibCalorimetry/CastorCalib/interface/CastorDbXml.h b/CalibCalorimetry/CastorCalib/interface/CastorDbXml.h
index 2cc7ea819c1c1..5b4193928bb94 100644
--- a/CalibCalorimetry/CastorCalib/interface/CastorDbXml.h
+++ b/CalibCalorimetry/CastorCalib/interface/CastorDbXml.h
@@ -11,32 +11,80 @@
    \brief IO for XML instances of Hcal/Castor Calibrations
 */
 namespace CastorDbXml {
-  bool dumpObject (std::ostream& fOutput, 
-		   unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, const std::string& fTag, unsigned fVersion, 
-		   const CastorPedestals& fObject, const CastorPedestalWidths& fError);
-  bool dumpObject (std::ostream& fOutput, 
-		   unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, const std::string& fTag, unsigned fVersion,
-		   const CastorPedestals& fObject);
-  bool dumpObject (std::ostream& fOutput, 
-		   unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, const std::string& fTag, unsigned fVersion,
-		   const CastorPedestalWidths& fObject) {return false;}
-  bool dumpObject (std::ostream& fOutput, 
-		   unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, const std::string& fTag, unsigned fVersion, 
-		   const CastorGains& fObject, const CastorGainWidths& fError);
-  bool dumpObject (std::ostream& fOutput, 
-		   unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, const std::string& fTag, unsigned fVersion, 
-		   const CastorGains& fObject);
-  bool dumpObject (std::ostream& fOutput, 
-		   unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, const std::string& fTag, unsigned fVersion, 
-		   const CastorGainWidths& fObject) {return false;}
-  bool dumpObject (std::ostream& fOutput, 
-		   unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, const std::string& fTag, unsigned fVersion, 
-		   const CastorElectronicsMap& fObject) {return false;}
-  bool dumpObject (std::ostream& fOutput, 
-		   unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, const std::string& fTag, unsigned fVersion, 
-		   const CastorQIEData& fObject) {return false;}
-  bool dumpObject (std::ostream& fOutput, 
-		   unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, const std::string& fTag, unsigned fVersion, 
-		   const CastorCalibrationQIEData& fObject) {return false;}
-} 
+  bool dumpObject(std::ostream& fOutput,
+                  unsigned fRun,
+                  unsigned long fGMTIOVBegin,
+                  unsigned long fGMTIOVEnd,
+                  const std::string& fTag,
+                  unsigned fVersion,
+                  const CastorPedestals& fObject,
+                  const CastorPedestalWidths& fError);
+  bool dumpObject(std::ostream& fOutput,
+                  unsigned fRun,
+                  unsigned long fGMTIOVBegin,
+                  unsigned long fGMTIOVEnd,
+                  const std::string& fTag,
+                  unsigned fVersion,
+                  const CastorPedestals& fObject);
+  bool dumpObject(std::ostream& fOutput,
+                  unsigned fRun,
+                  unsigned long fGMTIOVBegin,
+                  unsigned long fGMTIOVEnd,
+                  const std::string& fTag,
+                  unsigned fVersion,
+                  const CastorPedestalWidths& fObject) {
+    return false;
+  }
+  bool dumpObject(std::ostream& fOutput,
+                  unsigned fRun,
+                  unsigned long fGMTIOVBegin,
+                  unsigned long fGMTIOVEnd,
+                  const std::string& fTag,
+                  unsigned fVersion,
+                  const CastorGains& fObject,
+                  const CastorGainWidths& fError);
+  bool dumpObject(std::ostream& fOutput,
+                  unsigned fRun,
+                  unsigned long fGMTIOVBegin,
+                  unsigned long fGMTIOVEnd,
+                  const std::string& fTag,
+                  unsigned fVersion,
+                  const CastorGains& fObject);
+  bool dumpObject(std::ostream& fOutput,
+                  unsigned fRun,
+                  unsigned long fGMTIOVBegin,
+                  unsigned long fGMTIOVEnd,
+                  const std::string& fTag,
+                  unsigned fVersion,
+                  const CastorGainWidths& fObject) {
+    return false;
+  }
+  bool dumpObject(std::ostream& fOutput,
+                  unsigned fRun,
+                  unsigned long fGMTIOVBegin,
+                  unsigned long fGMTIOVEnd,
+                  const std::string& fTag,
+                  unsigned fVersion,
+                  const CastorElectronicsMap& fObject) {
+    return false;
+  }
+  bool dumpObject(std::ostream& fOutput,
+                  unsigned fRun,
+                  unsigned long fGMTIOVBegin,
+                  unsigned long fGMTIOVEnd,
+                  const std::string& fTag,
+                  unsigned fVersion,
+                  const CastorQIEData& fObject) {
+    return false;
+  }
+  bool dumpObject(std::ostream& fOutput,
+                  unsigned fRun,
+                  unsigned long fGMTIOVBegin,
+                  unsigned long fGMTIOVEnd,
+                  const std::string& fTag,
+                  unsigned fVersion,
+                  const CastorCalibrationQIEData& fObject) {
+    return false;
+  }
+}  // namespace CastorDbXml
 #endif
diff --git a/CalibCalorimetry/CastorCalib/interface/CastorLedAnalysis.h b/CalibCalorimetry/CastorCalib/interface/CastorLedAnalysis.h
index dc344f30e705c..9eec25118f889 100644
--- a/CalibCalorimetry/CastorCalib/interface/CastorLedAnalysis.h
+++ b/CalibCalorimetry/CastorCalib/interface/CastorLedAnalysis.h
@@ -1,7 +1,6 @@
 #ifndef CastorLedAnalysis_H
 #define CastorLedAnalysis_H
 
-
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
@@ -12,12 +11,10 @@
 
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 
-
 #include "TH1F.h"
 #include "TF1.h"
 #include "TProfile.h"
 
-
 #include <memory>
 //#include <iostream>
 #include <fstream>
@@ -30,96 +27,93 @@ class CastorQIEShape;
 class CastorQIECoder;
 class TFile;
 
-class CastorLedAnalysis{
-  
+class CastorLedAnalysis {
 public:
-  
   /// Constructor
-  CastorLedAnalysis(const edm::ParameterSet& ps);  
+  CastorLedAnalysis(const edm::ParameterSet& ps);
   /// Destructor
   ~CastorLedAnalysis();
   void LedSetup(const std::string& m_outputFileROOT);
   //void doPeds(const CastorPedestals* fInputPedestals);
   void LedSampleAnalysis();
   void LedDone();
-  void processLedEvent(const CastorDigiCollection& castor,
-		    const CastorDbService& cond);
+  void processLedEvent(const CastorDigiCollection& castor, const CastorDbService& cond);
 
 protected:
-  
-  
 private:
   //###
   //#  LEDBUNCH is used in map<HcalDetId,map<int, LEDBUNCH > > LEDTRENDS;
   //#  For each HcalDetId (channel) a map<int, LEDBUNCH> is associated;
   //#  int was originally cap-id and now is just dummy;
-  //#  LEDBUNCH is a pair - first element is the main 
+  //#  LEDBUNCH is a pair - first element is the main
   //#  histo with the ADC values and second one is another pair;
   //#  this pair contains map<int, std::vector<double> > as a first element;
   //#  vector contains some useful variables;
   //#  the second element is a vector of histos (pointers);
-  //#  for the "trend" analysis the main histo (with ADC values) is reset every 
+  //#  for the "trend" analysis the main histo (with ADC values) is reset every
   //#  m_nevtsample events and info is put in the other part of the LEDBUNCH;
   //#  so at the end we have the trends for the variables in concern
-  //#  which are written in THE vector<TH1F*>; 
-  //###  
-  typedef std::pair<TH1F*,std::pair<std::map<int, std::vector<double> >,std::vector<TH1F*> > > LEDBUNCH;
-  typedef struct{
+  //#  which are written in THE vector<TH1F*>;
+  //###
+  typedef std::pair<TH1F*, std::pair<std::map<int, std::vector<double> >, std::vector<TH1F*> > > LEDBUNCH;
+  typedef struct {
     TProfile* avePulse[3];
     TH1F* thisPulse[3];
     TH1F* integPulse[3];
   } CALIBBUNCH;
   TFile* m_file;
-  void LedCastorHists(const HcalDetId& detid, const CastorDataFrame& ledDigi, std::map<HcalDetId, std::map<int,LEDBUNCH> > &toolT, const CastorDbService& cond);
-  void SetupLEDHists(int id, const HcalDetId detid, std::map<HcalDetId, std::map<int,LEDBUNCH> > &toolT);
-  void GetLedConst(std::map<HcalDetId,std::map<int, LEDBUNCH > > &toolT);
-  void LedTrendings(std::map<HcalDetId,std::map<int, LEDBUNCH > > &toolT);
+  void LedCastorHists(const HcalDetId& detid,
+                      const CastorDataFrame& ledDigi,
+                      std::map<HcalDetId, std::map<int, LEDBUNCH> >& toolT,
+                      const CastorDbService& cond);
+  void SetupLEDHists(int id, const HcalDetId detid, std::map<HcalDetId, std::map<int, LEDBUNCH> >& toolT);
+  void GetLedConst(std::map<HcalDetId, std::map<int, LEDBUNCH> >& toolT);
+  void LedTrendings(std::map<HcalDetId, std::map<int, LEDBUNCH> >& toolT);
   float BinsizeCorr(float time);
-  
+
   std::string m_outputFileROOT;
   std::string m_outputFileText;
   std::string m_outputFileX;
   std::ofstream m_outFile;
   std::ofstream m_logFile;
   std::ofstream m_outputFileXML;
- 
+
   int m_startTS;
   int m_endTS;
   int m_nevtsample;
   int m_hiSaveflag;
   bool m_usecalib;
-// analysis flag:
-//  m_fitflag = 0  - take mean TS value of averaged pulse shape
-//              1  - take peak from landau fit to averaged pulse shape
-//              2  - take average of mean TS values per event
-//                     (preferred for laser & HF LED)
-//              3  - take average of peaks from landau fits per event
-//                     (preferred for LED)
-//              4  - 0+1+2+3 REMOVED in 1_6
+  // analysis flag:
+  //  m_fitflag = 0  - take mean TS value of averaged pulse shape
+  //              1  - take peak from landau fit to averaged pulse shape
+  //              2  - take average of mean TS values per event
+  //                     (preferred for laser & HF LED)
+  //              3  - take average of peaks from landau fits per event
+  //                     (preferred for LED)
+  //              4  - 0+1+2+3 REMOVED in 1_6
   int m_fitflag;
-  
+
   const CastorQIEShape* m_shape;
   const CastorQIECoder* m_coder;
   const CastorPedestal* m_ped;
-  struct{
-    std::map<HcalDetId,std::map<int, LEDBUNCH > > LEDTRENDS;
+  struct {
+    std::map<HcalDetId, std::map<int, LEDBUNCH> > LEDTRENDS;
     TH1F* ALLLEDS;
     TH1F* LEDRMS;
     TH1F* LEDMEAN;
     TH1F* CHI2;
   } castorHists;
-  std::map<HcalDetId,std::map<int, LEDBUNCH > >::iterator _meol;
-  std::map<HcalDetId,std::map<int,float> > m_AllPedVals;
-  std::map<HcalDetId,std::map<int,float> >::iterator _meee;
+  std::map<HcalDetId, std::map<int, LEDBUNCH> >::iterator _meol;
+  std::map<HcalDetId, std::map<int, float> > m_AllPedVals;
+  std::map<HcalDetId, std::map<int, float> >::iterator _meee;
 
-  std::map<HcalCalibDetId,CALIBBUNCH>::iterator _meca;
+  std::map<HcalCalibDetId, CALIBBUNCH>::iterator _meca;
 
   //const CastorPedestal* pedCan;
   int evt;
   int sample;
   int evt_curr;
   std::vector<bool> state;
-
 };
 
 #endif
diff --git a/CalibCalorimetry/CastorCalib/interface/CastorPedestalAnalysis.h b/CalibCalorimetry/CastorCalib/interface/CastorPedestalAnalysis.h
index 45eff4095f039..04a7ee2360bb7 100644
--- a/CalibCalorimetry/CastorCalib/interface/CastorPedestalAnalysis.h
+++ b/CalibCalorimetry/CastorCalib/interface/CastorPedestalAnalysis.h
@@ -12,7 +12,6 @@
 #include "DataFormats/HcalDetId/interface/HcalCastorDetId.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 
-
 #include "TH1F.h"
 #include "TF1.h"
 
@@ -36,12 +35,10 @@ class CastorDbService;
 class CastorQIEShape;
 class CastorQIECoder;
 class TFile;
-class CastorPedestalAnalysis{
-  
+class CastorPedestalAnalysis {
 public:
-  
   /// Constructor
-  CastorPedestalAnalysis(const edm::ParameterSet& ps);  
+  CastorPedestalAnalysis(const edm::ParameterSet& ps);
   /// Destructor
   ~CastorPedestalAnalysis();
 
@@ -49,52 +46,63 @@ class CastorPedestalAnalysis{
 
   void SampleAnalysis();
 
-  int done(const CastorPedestals* fInputPedestals, 
-	    const CastorPedestalWidths* fInputWidths,
-	    CastorPedestals* fOutputPedestals, 
-	    CastorPedestalWidths* fOutputWidths);
-
-  void processEvent(const CastorDigiCollection& castor,
-		    const CastorDbService& cond);
-
-// pedestal validation: CastorPedVal=-1 means not validated,
-//                                  0 everything OK,
-//                                  N>0 : mod(N,100000) drifts + width changes
-//                                        int(N/100000) missing channels
-  static int CastorPedVal(int nstat[4], const CastorPedestals* fRefPedestals,
-            const CastorPedestalWidths* fRefPedestalWidths,
-            CastorPedestals* fRawPedestals,
-            CastorPedestalWidths* fRawPedestalWidths,
-            CastorPedestals* fValPedestals,
-            CastorPedestalWidths* fValPedestalWidths);
+  int done(const CastorPedestals* fInputPedestals,
+           const CastorPedestalWidths* fInputWidths,
+           CastorPedestals* fOutputPedestals,
+           CastorPedestalWidths* fOutputWidths);
+
+  void processEvent(const CastorDigiCollection& castor, const CastorDbService& cond);
+
+  // pedestal validation: CastorPedVal=-1 means not validated,
+  //                                  0 everything OK,
+  //                                  N>0 : mod(N,100000) drifts + width changes
+  //                                        int(N/100000) missing channels
+  static int CastorPedVal(int nstat[4],
+                          const CastorPedestals* fRefPedestals,
+                          const CastorPedestalWidths* fRefPedestalWidths,
+                          CastorPedestals* fRawPedestals,
+                          CastorPedestalWidths* fRawPedestalWidths,
+                          CastorPedestals* fValPedestals,
+                          CastorPedestalWidths* fValPedestalWidths);
 
 protected:
-  
-  
 private:
   //###
   //#  PEDBUNCH is used in map<HcalDetId,map<int, PEDBUNCH > > PEDTRENDS;
   //#  For each HcalDetId (channel) a map<int, PEDBUNCH> is associated;
   //#  int is cap-id (1-4);
-  //#  PEDBUNCH is a pair - first element is the main 
+  //#  PEDBUNCH is a pair - first element is the main
   //#  histo with the pedestal distribution and second one is another pair;
   //#  this pair contains map<int, std::vector<double> > as a first element;
   //#  int is cap-id, and vector contains some useful variables;
   //#  the second element is a vector of histos (pointers);
-  //#  for the "trend" analysis the main histo (with pedestals) is reset every 
+  //#  for the "trend" analysis the main histo (with pedestals) is reset every
   //#  nevt_ped events and info is put in the other part of the PEDBUNCH;
   //#  so at the end we have the trends for the variables in concern
-  //#  which are written in THE vector<TH1F*>; 
-  //###  
-  typedef std::pair<TH1F*,std::pair<std::map<int, std::vector<double> >,std::vector<TH1F*> > > PEDBUNCH;
+  //#  which are written in THE vector<TH1F*>;
+  //###
+  typedef std::pair<TH1F*, std::pair<std::map<int, std::vector<double> >, std::vector<TH1F*> > > PEDBUNCH;
 
-  void per2CapsHists(int flag, int id, const HcalDetId detid, const HcalQIESample& qie1, const HcalQIESample& qie2, std::map<HcalDetId, std::map<int,PEDBUNCH> > &toolT,const CastorDbService& cond);
+  void per2CapsHists(int flag,
+                     int id,
+                     const HcalDetId detid,
+                     const HcalQIESample& qie1,
+                     const HcalQIESample& qie2,
+                     std::map<HcalDetId, std::map<int, PEDBUNCH> >& toolT,
+                     const CastorDbService& cond);
 
-  void GetPedConst(std::map<HcalDetId,std::map<int, PEDBUNCH > > &toolT, TH1F* PedMeans, TH1F* PedWidths);
+  void GetPedConst(std::map<HcalDetId, std::map<int, PEDBUNCH> >& toolT, TH1F* PedMeans, TH1F* PedWidths);
 
-  void Trendings(std::map<HcalDetId,std::map<int, PEDBUNCH > > &toolT, TH1F* Chi2, TH1F* CapidAverage, TH1F* CapidChi2);
+  void Trendings(std::map<HcalDetId, std::map<int, PEDBUNCH> >& toolT, TH1F* Chi2, TH1F* CapidAverage, TH1F* CapidChi2);
 
-  void AllChanHists(const HcalDetId detid, const HcalQIESample& qie0, const HcalQIESample& qie1, const HcalQIESample& qie2, const HcalQIESample& qie3, const HcalQIESample& qie4, const HcalQIESample& qie5, std::map<HcalDetId, std::map<int,PEDBUNCH> > &toolT);
+  void AllChanHists(const HcalDetId detid,
+                    const HcalQIESample& qie0,
+                    const HcalQIESample& qie1,
+                    const HcalQIESample& qie2,
+                    const HcalQIESample& qie3,
+                    const HcalQIESample& qie4,
+                    const HcalQIESample& qie5,
+                    std::map<HcalDetId, std::map<int, PEDBUNCH> >& toolT);
 
   TFile* m_file;
 
@@ -109,11 +117,11 @@ class CastorPedestalAnalysis{
   int m_hiSaveflag;
   int m_pedValflag;
   int m_AllPedsOK;
-  
+
   const CastorQIEShape* m_shape;
   const CastorQIECoder* m_coder;
-  struct{
-    std::map<HcalDetId,std::map<int, PEDBUNCH > > PEDTRENDS;
+  struct {
+    std::map<HcalDetId, std::map<int, PEDBUNCH> > PEDTRENDS;
     TH1F* ALLPEDS;
     TH1F* PEDRMS;
     TH1F* PEDMEAN;
@@ -121,7 +129,7 @@ class CastorPedestalAnalysis{
     TH1F* CAPID_AVERAGE;
     TH1F* CAPID_CHI2;
   } castorHists;
-  std::map<HcalDetId,std::map<int, PEDBUNCH > >::iterator _meot;
+  std::map<HcalDetId, std::map<int, PEDBUNCH> >::iterator _meot;
   const CastorPedestals* fRefPedestals;
   const CastorPedestalWidths* fRefPedestalWidths;
   CastorPedestals* fRawPedestals;
@@ -134,8 +142,8 @@ class CastorPedestalAnalysis{
   float m_stat[4];
   std::vector<bool> state;
 
-// flag to make gaussian fits to charge dists
-  static const int fitflag=0;
+  // flag to make gaussian fits to charge dists
+  static const int fitflag = 0;
 };
 
 #endif
diff --git a/CalibCalorimetry/CastorCalib/interface/CastorPedestalsAnalysis.h b/CalibCalorimetry/CastorCalib/interface/CastorPedestalsAnalysis.h
index 709d6e515832f..e776ad21df6c5 100644
--- a/CalibCalorimetry/CastorCalib/interface/CastorPedestalsAnalysis.h
+++ b/CalibCalorimetry/CastorCalib/interface/CastorPedestalsAnalysis.h
@@ -55,60 +55,57 @@ namespace edm {
   class ParameterSet;
   class Event;
   class EventSetup;
-}
-
-   struct NewPedBunch
-   {
-      HcalCastorDetId detid;
-      bool usedflag;
-      float cap[4];
-      float capfc[4];
-      float sig[4][4];
-      float sigfc[4][4];
-      float prod[4][4];
-      float prodfc[4][4];
-      int num[4][4];
-   };
-
-class CastorPedestalsAnalysis : public edm::EDAnalyzer
-{
-   public:
-   //Constructor
-   CastorPedestalsAnalysis(const edm::ParameterSet& ps);
-   //Destructor
-   ~CastorPedestalsAnalysis() override;
-   //Analysis
-   void analyze(const edm::Event & event, const edm::EventSetup& eventSetup) override;
-
-   private:
-   //Container for data, 1 per channel
-   std::vector<NewPedBunch> Bunches;
-   //Flag for saving histos
-   bool hiSaveFlag;
-   bool dumpXML;
-   bool verboseflag;
-   int runnum;
-   int firstTS;
-   int lastTS;
-   std::string ROOTfilename;
-   std::string pedsADCfilename;
-   std::string pedsfCfilename;
-   std::string widthsADCfilename;
-   std::string widthsfCfilename;
-   std::string XMLfilename;
-   std::string XMLtag;
-   std::string ZSfilename;
-
-   TH1F *CASTORMeans;
-   TH1F *CASTORWidths;
-
-   // TH2F *dephist[4];
-   TH2F *dephist;
-
-   TFile *theFile;
-   bool firsttime;
+}  // namespace edm
+
+struct NewPedBunch {
+  HcalCastorDetId detid;
+  bool usedflag;
+  float cap[4];
+  float capfc[4];
+  float sig[4][4];
+  float sigfc[4][4];
+  float prod[4][4];
+  float prodfc[4][4];
+  int num[4][4];
+};
 
-   edm::InputTag castorDigiCollectionTag;
+class CastorPedestalsAnalysis : public edm::EDAnalyzer {
+public:
+  //Constructor
+  CastorPedestalsAnalysis(const edm::ParameterSet &ps);
+  //Destructor
+  ~CastorPedestalsAnalysis() override;
+  //Analysis
+  void analyze(const edm::Event &event, const edm::EventSetup &eventSetup) override;
+
+private:
+  //Container for data, 1 per channel
+  std::vector<NewPedBunch> Bunches;
+  //Flag for saving histos
+  bool hiSaveFlag;
+  bool dumpXML;
+  bool verboseflag;
+  int runnum;
+  int firstTS;
+  int lastTS;
+  std::string ROOTfilename;
+  std::string pedsADCfilename;
+  std::string pedsfCfilename;
+  std::string widthsADCfilename;
+  std::string widthsfCfilename;
+  std::string XMLfilename;
+  std::string XMLtag;
+  std::string ZSfilename;
+
+  TH1F *CASTORMeans;
+  TH1F *CASTORWidths;
+
+  // TH2F *dephist[4];
+  TH2F *dephist;
+
+  TFile *theFile;
+  bool firsttime;
+
+  edm::InputTag castorDigiCollectionTag;
 };
 #endif
-
diff --git a/CalibCalorimetry/CastorCalib/interface/CastorPulseContainmentCorrection.h b/CalibCalorimetry/CastorCalib/interface/CastorPulseContainmentCorrection.h
index 94cfbc493fc3f..58f50f24e3f3c 100644
--- a/CalibCalorimetry/CastorCalib/interface/CastorPulseContainmentCorrection.h
+++ b/CalibCalorimetry/CastorCalib/interface/CastorPulseContainmentCorrection.h
@@ -11,15 +11,13 @@
 
 class CastorPulseContainmentCorrection {
 public:
-  CastorPulseContainmentCorrection(int num_samples,
-                                 float fixedphase_ns,
-                                 float max_fracerror);
+  CastorPulseContainmentCorrection(int num_samples, float fixedphase_ns, float max_fracerror);
 
   double getCorrection(double fc_ampl) const;
-  double fractionContained(double fc_ampl) const { return 1.0/this->getCorrection(fc_ampl); }
+  double fractionContained(double fc_ampl) const { return 1.0 / this->getCorrection(fc_ampl); }
 
 private:
-  std::map<double,double> mCorFactors_;
+  std::map<double, double> mCorFactors_;
 };
 
 #endif
diff --git a/CalibCalorimetry/CastorCalib/interface/CastorPulseShapes.h b/CalibCalorimetry/CastorCalib/interface/CastorPulseShapes.h
index 2d9999a2836b3..5f4d3c70691a3 100644
--- a/CalibCalorimetry/CastorCalib/interface/CastorPulseShapes.h
+++ b/CalibCalorimetry/CastorCalib/interface/CastorPulseShapes.h
@@ -20,6 +20,7 @@ class CastorPulseShapes {
     float operator()(double time) const;
     float at(double time) const;
     float integrate(double tmin, double tmax) const;
+
   private:
     std::vector<float> shape_;
     int nbin_;
diff --git a/CalibCalorimetry/CastorCalib/interface/CastorTimeSlew.h b/CalibCalorimetry/CastorCalib/interface/CastorTimeSlew.h
index 58a3de34ff640..4a5afb32e6b82 100644
--- a/CalibCalorimetry/CastorCalib/interface/CastorTimeSlew.h
+++ b/CalibCalorimetry/CastorCalib/interface/CastorTimeSlew.h
@@ -1,7 +1,6 @@
 #ifndef CALIBCALORIMETRY_CASTORCALIB_CASTORTIMESLEW_H
 #define CALIBCALORIMETRY_CASTORCALIB_CASTORTIMESLEW_H 1
 
-
 /** \class CastorTimeSlew
   * 
   * copy from HCAL (author: J. Mans)
@@ -17,12 +16,12 @@
   */
 class CastorTimeSlew {
 public:
-  enum BiasSetting { Slow=0, Medium=1, Fast=2 };
+  enum BiasSetting { Slow = 0, Medium = 1, Fast = 2 };
 
   /** \brief Returns the amount (ns) by which a pulse of the given
    number of fC will be delayed by the timeslew effect, for the
    specified bias setting. */
-  static double delay(double fC, BiasSetting bias=Medium);
+  static double delay(double fC, BiasSetting bias = Medium);
 };
 
 #endif
diff --git a/CalibCalorimetry/CastorCalib/plugins/CastorDbProducer.cc b/CalibCalorimetry/CastorCalib/plugins/CastorDbProducer.cc
index 7cb21c588a960..d075e389e5d1c 100644
--- a/CalibCalorimetry/CastorCalib/plugins/CastorDbProducer.cc
+++ b/CalibCalorimetry/CastorCalib/plugins/CastorDbProducer.cc
@@ -2,7 +2,7 @@
 //
 // Package:    CastorDbProducer
 // Class:      CastorDbProducer
-// 
+//
 /**\class CastorDbProducer CastorDbProducer.h CalibFormats/CastorDbProducer/interface/CastorDbProducer.h
 
  Description: <one line class summary>
@@ -17,7 +17,6 @@
 //
 //
 
-
 // system include files
 #include <iostream>
 #include <fstream>
@@ -28,90 +27,67 @@
 #include "CalibFormats/CastorObjects/interface/CastorDbService.h"
 #include "CalibFormats/CastorObjects/interface/CastorDbRecord.h"
 
-
 #include "CondFormats/CastorObjects/interface/AllObjects.h"
 
 #include "CastorDbProducer.h"
 
-CastorDbProducer::CastorDbProducer( const edm::ParameterSet& fConfig)
-  : ESProducer(),
-    mDumpRequest (),
-    mDumpStream(nullptr)
-{
+CastorDbProducer::CastorDbProducer(const edm::ParameterSet& fConfig)
+    : ESProducer(), mDumpRequest(), mDumpStream(nullptr) {
   //the following line is needed to tell the framework what
   // data is being produced
   setWhatProduced(this);
 
   //now do what ever other initialization is needed
 
-  mDumpRequest = fConfig.getUntrackedParameter <std::vector <std::string> > ("dump", std::vector<std::string>());
+  mDumpRequest = fConfig.getUntrackedParameter<std::vector<std::string> >("dump", std::vector<std::string>());
   if (!mDumpRequest.empty()) {
-    std::string otputFile = fConfig.getUntrackedParameter <std::string> ("file", "");
-    mDumpStream = otputFile.empty () ? &std::cout : new std::ofstream (otputFile.c_str());
+    std::string otputFile = fConfig.getUntrackedParameter<std::string>("file", "");
+    mDumpStream = otputFile.empty() ? &std::cout : new std::ofstream(otputFile.c_str());
   }
 }
 
-
-CastorDbProducer::~CastorDbProducer()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-  if (mDumpStream != &std::cout) delete mDumpStream;
+CastorDbProducer::~CastorDbProducer() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
+  if (mDumpStream != &std::cout)
+    delete mDumpStream;
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-std::shared_ptr<CastorDbService> CastorDbProducer::produce( const CastorDbRecord& record)
-{
-  auto host = holder_.makeOrGet([]() {
-    return new HostType;
-  });
+std::shared_ptr<CastorDbService> CastorDbProducer::produce(const CastorDbRecord& record) {
+  auto host = holder_.makeOrGet([]() { return new HostType; });
 
   bool needBuildCalibrations = false;
   bool needBuildCalibWidths = false;
 
-  host->ifRecordChanges<CastorElectronicsMapRcd>(record,
-                                                 [this, h=host.get()](auto const& rec) {
-    setupElectronicsMap(rec, h);
-  });
-  host->ifRecordChanges<CastorChannelQualityRcd>(record,
-                                                 [this, h=host.get()](auto const& rec) {
-    setupChannelQuality(rec, h);
-  });
-  host->ifRecordChanges<CastorGainWidthsRcd>(record,
-                                             [this, h=host.get(),
-                                              &needBuildCalibWidths](auto const& rec) {
+  host->ifRecordChanges<CastorElectronicsMapRcd>(
+      record, [this, h = host.get()](auto const& rec) { setupElectronicsMap(rec, h); });
+  host->ifRecordChanges<CastorChannelQualityRcd>(
+      record, [this, h = host.get()](auto const& rec) { setupChannelQuality(rec, h); });
+  host->ifRecordChanges<CastorGainWidthsRcd>(record, [this, h = host.get(), &needBuildCalibWidths](auto const& rec) {
     setupGainWidths(rec, h);
     needBuildCalibWidths = true;
   });
-  host->ifRecordChanges<CastorQIEDataRcd>(record,
-                                          [this, h=host.get(),
-                                           &needBuildCalibrations,
-                                           &needBuildCalibWidths](auto const& rec) {
-    setupQIEData(rec, h);
-    needBuildCalibrations = true;
-    needBuildCalibWidths = true;
-  });
+  host->ifRecordChanges<CastorQIEDataRcd>(
+      record, [this, h = host.get(), &needBuildCalibrations, &needBuildCalibWidths](auto const& rec) {
+        setupQIEData(rec, h);
+        needBuildCalibrations = true;
+        needBuildCalibWidths = true;
+      });
   host->ifRecordChanges<CastorPedestalWidthsRcd>(record,
-                                                 [this, h=host.get(),
-                                                  &needBuildCalibWidths](auto const& rec) {
-    setupPedestalWidths(rec, h);
-    needBuildCalibWidths = true;
-  });
-  host->ifRecordChanges<CastorGainsRcd>(record,
-                                        [this, h=host.get(),
-                                         &needBuildCalibrations](auto const& rec) {
+                                                 [this, h = host.get(), &needBuildCalibWidths](auto const& rec) {
+                                                   setupPedestalWidths(rec, h);
+                                                   needBuildCalibWidths = true;
+                                                 });
+  host->ifRecordChanges<CastorGainsRcd>(record, [this, h = host.get(), &needBuildCalibrations](auto const& rec) {
     setupGains(rec, h);
     needBuildCalibrations = true;
   });
-  host->ifRecordChanges<CastorPedestalsRcd>(record,
-                                            [this, h=host.get(),
-                                             &needBuildCalibrations](auto const& rec) {
+  host->ifRecordChanges<CastorPedestalsRcd>(record, [this, h = host.get(), &needBuildCalibrations](auto const& rec) {
     setupPedestals(rec, h);
     needBuildCalibrations = true;
   });
@@ -124,86 +100,76 @@ std::shared_ptr<CastorDbService> CastorDbProducer::produce( const CastorDbRecord
     host->buildCalibrations();
   }
 
-  return host; // automatically converts to std::shared_ptr<CastorDbService>
+  return host;  // automatically converts to std::shared_ptr<CastorDbService>
 }
 
-void CastorDbProducer::setupPedestals(const CastorPedestalsRcd& fRecord,
-                                      CastorDbService* service) {
-
-  edm::ESHandle <CastorPedestals> item;
-  fRecord.get (item);
+void CastorDbProducer::setupPedestals(const CastorPedestalsRcd& fRecord, CastorDbService* service) {
+  edm::ESHandle<CastorPedestals> item;
+  fRecord.get(item);
 
   service->setData(item.product());
-  if (std::find (mDumpRequest.begin(), mDumpRequest.end(), std::string ("Pedestals")) != mDumpRequest.end()) {
+  if (std::find(mDumpRequest.begin(), mDumpRequest.end(), std::string("Pedestals")) != mDumpRequest.end()) {
     *mDumpStream << "New HCAL/CASTOR Pedestals set" << std::endl;
-    CastorDbASCIIIO::dumpObject (*mDumpStream, *(item.product ()));
+    CastorDbASCIIIO::dumpObject(*mDumpStream, *(item.product()));
   }
 }
 
-void CastorDbProducer::setupPedestalWidths(const CastorPedestalWidthsRcd& fRecord,
-                                           CastorDbService* service) {
-  edm::ESHandle <CastorPedestalWidths> item;
-  fRecord.get (item);
+void CastorDbProducer::setupPedestalWidths(const CastorPedestalWidthsRcd& fRecord, CastorDbService* service) {
+  edm::ESHandle<CastorPedestalWidths> item;
+  fRecord.get(item);
   service->setData(item.product());
-  if (std::find (mDumpRequest.begin(), mDumpRequest.end(), std::string ("PedestalWidths")) != mDumpRequest.end()) {
+  if (std::find(mDumpRequest.begin(), mDumpRequest.end(), std::string("PedestalWidths")) != mDumpRequest.end()) {
     *mDumpStream << "New HCAL/CASTOR Pedestals set" << std::endl;
-    CastorDbASCIIIO::dumpObject (*mDumpStream, *(item.product ()));
+    CastorDbASCIIIO::dumpObject(*mDumpStream, *(item.product()));
   }
 }
 
-
-void CastorDbProducer::setupGains(const CastorGainsRcd& fRecord,
-                                  CastorDbService* service) {
-  edm::ESHandle <CastorGains> item;
-  fRecord.get (item);
+void CastorDbProducer::setupGains(const CastorGainsRcd& fRecord, CastorDbService* service) {
+  edm::ESHandle<CastorGains> item;
+  fRecord.get(item);
   service->setData(item.product());
-  if (std::find (mDumpRequest.begin(), mDumpRequest.end(), std::string ("Gains")) != mDumpRequest.end()) {
+  if (std::find(mDumpRequest.begin(), mDumpRequest.end(), std::string("Gains")) != mDumpRequest.end()) {
     *mDumpStream << "New HCAL/CASTOR Gains set" << std::endl;
-    CastorDbASCIIIO::dumpObject (*mDumpStream, *(item.product ()));
+    CastorDbASCIIIO::dumpObject(*mDumpStream, *(item.product()));
   }
 }
 
-
-void CastorDbProducer::setupGainWidths(const CastorGainWidthsRcd& fRecord,
-                                       CastorDbService* service) {
-  edm::ESHandle <CastorGainWidths> item;
-  fRecord.get (item);
+void CastorDbProducer::setupGainWidths(const CastorGainWidthsRcd& fRecord, CastorDbService* service) {
+  edm::ESHandle<CastorGainWidths> item;
+  fRecord.get(item);
   service->setData(item.product());
-  if (std::find (mDumpRequest.begin(), mDumpRequest.end(), std::string ("GainWidths")) != mDumpRequest.end()) {
+  if (std::find(mDumpRequest.begin(), mDumpRequest.end(), std::string("GainWidths")) != mDumpRequest.end()) {
     *mDumpStream << "New HCAL/CASTOR GainWidths set" << std::endl;
-    CastorDbASCIIIO::dumpObject (*mDumpStream, *(item.product ()));
+    CastorDbASCIIIO::dumpObject(*mDumpStream, *(item.product()));
   }
 }
 
-void CastorDbProducer::setupQIEData(const CastorQIEDataRcd& fRecord,
-                                    CastorDbService* service) {
-  edm::ESHandle <CastorQIEData> item;
-  fRecord.get (item);
+void CastorDbProducer::setupQIEData(const CastorQIEDataRcd& fRecord, CastorDbService* service) {
+  edm::ESHandle<CastorQIEData> item;
+  fRecord.get(item);
   service->setData(item.product());
-  if (std::find (mDumpRequest.begin(), mDumpRequest.end(), std::string ("QIEData")) != mDumpRequest.end()) {
+  if (std::find(mDumpRequest.begin(), mDumpRequest.end(), std::string("QIEData")) != mDumpRequest.end()) {
     *mDumpStream << "New HCAL/CASTOR QIEData set" << std::endl;
-    CastorDbASCIIIO::dumpObject (*mDumpStream, *(item.product ()));
+    CastorDbASCIIIO::dumpObject(*mDumpStream, *(item.product()));
   }
 }
 
-void CastorDbProducer::setupChannelQuality(const CastorChannelQualityRcd& fRecord,
-                                           CastorDbService* service) {
-  edm::ESHandle <CastorChannelQuality> item;
-  fRecord.get (item);
+void CastorDbProducer::setupChannelQuality(const CastorChannelQualityRcd& fRecord, CastorDbService* service) {
+  edm::ESHandle<CastorChannelQuality> item;
+  fRecord.get(item);
   service->setData(item.product());
-  if (std::find (mDumpRequest.begin(), mDumpRequest.end(), std::string ("ChannelQuality")) != mDumpRequest.end()) {
+  if (std::find(mDumpRequest.begin(), mDumpRequest.end(), std::string("ChannelQuality")) != mDumpRequest.end()) {
     *mDumpStream << "New HCAL/CASTOR ChannelQuality set" << std::endl;
-    CastorDbASCIIIO::dumpObject (*mDumpStream, *(item.product ()));
+    CastorDbASCIIIO::dumpObject(*mDumpStream, *(item.product()));
   }
 }
 
-void CastorDbProducer::setupElectronicsMap(const CastorElectronicsMapRcd& fRecord,
-                                           CastorDbService* service) {
-  edm::ESHandle <CastorElectronicsMap> item;
-  fRecord.get (item);
+void CastorDbProducer::setupElectronicsMap(const CastorElectronicsMapRcd& fRecord, CastorDbService* service) {
+  edm::ESHandle<CastorElectronicsMap> item;
+  fRecord.get(item);
   service->setData(item.product());
-  if (std::find (mDumpRequest.begin(), mDumpRequest.end(), std::string ("ElectronicsMap")) != mDumpRequest.end()) {
+  if (std::find(mDumpRequest.begin(), mDumpRequest.end(), std::string("ElectronicsMap")) != mDumpRequest.end()) {
     *mDumpStream << "New HCAL/CASTOR Electronics Map set" << std::endl;
-    CastorDbASCIIIO::dumpObject (*mDumpStream, *(item.product ()));
+    CastorDbASCIIIO::dumpObject(*mDumpStream, *(item.product()));
   }
 }
diff --git a/CalibCalorimetry/CastorCalib/plugins/CastorDbProducer.h b/CalibCalorimetry/CastorCalib/plugins/CastorDbProducer.h
index 392180a74648b..97bff7edbd85c 100644
--- a/CalibCalorimetry/CastorCalib/plugins/CastorDbProducer.h
+++ b/CalibCalorimetry/CastorCalib/plugins/CastorDbProducer.h
@@ -11,19 +11,19 @@ class CastorDbService;
 class CastorDbRecord;
 
 #include "CondFormats/DataRecord/interface/CastorChannelQualityRcd.h"
-#include "CondFormats/DataRecord/interface/CastorElectronicsMapRcd.h"  	 
+#include "CondFormats/DataRecord/interface/CastorElectronicsMapRcd.h"
 #include "CondFormats/DataRecord/interface/CastorGainWidthsRcd.h"
 #include "CondFormats/DataRecord/interface/CastorGainsRcd.h"
 #include "CondFormats/DataRecord/interface/CastorPedestalWidthsRcd.h"
-#include "CondFormats/DataRecord/interface/CastorPedestalsRcd.h" 
+#include "CondFormats/DataRecord/interface/CastorPedestalsRcd.h"
 #include "CondFormats/DataRecord/interface/CastorQIEDataRcd.h"
 
 class CastorDbProducer : public edm::ESProducer {
 public:
-  CastorDbProducer( const edm::ParameterSet& );
+  CastorDbProducer(const edm::ParameterSet&);
   ~CastorDbProducer() override;
-  
-  std::shared_ptr<CastorDbService> produce( const CastorDbRecord& );
+
+  std::shared_ptr<CastorDbService> produce(const CastorDbRecord&);
 
 private:
   // ----------member data ---------------------------
diff --git a/CalibCalorimetry/CastorCalib/plugins/CastorHardcodeCalibrations.cc b/CalibCalorimetry/CastorCalib/plugins/CastorHardcodeCalibrations.cc
index bcbedec32ad50..ef7426c62de47 100644
--- a/CalibCalorimetry/CastorCalib/plugins/CastorHardcodeCalibrations.cc
+++ b/CalibCalorimetry/CastorCalib/plugins/CastorHardcodeCalibrations.cc
@@ -35,170 +35,171 @@ using namespace cms;
 
 namespace {
 
-std::vector<HcalGenericDetId> allCells (bool h2_mode) {
-  static std::vector<HcalGenericDetId> result;
-  if (result.empty()) {
-
-    CastorTopology castortopology;
-    HcalCastorDetId cell;
-    HcalCastorDetId::Section section  = HcalCastorDetId::EM;
-
-    for(int sector=1; sector<17; sector++) {
-      for(int module=1; module<3; module++) {
-	cell = HcalCastorDetId(section, true, sector, module);
-    if (castortopology.valid(cell)) result.push_back(cell);
-    cell = HcalCastorDetId(section, false, sector, module);
-    if (castortopology.valid(cell)) result.push_back(cell);
+  std::vector<HcalGenericDetId> allCells(bool h2_mode) {
+    static std::vector<HcalGenericDetId> result;
+    if (result.empty()) {
+      CastorTopology castortopology;
+      HcalCastorDetId cell;
+      HcalCastorDetId::Section section = HcalCastorDetId::EM;
+
+      for (int sector = 1; sector < 17; sector++) {
+        for (int module = 1; module < 3; module++) {
+          cell = HcalCastorDetId(section, true, sector, module);
+          if (castortopology.valid(cell))
+            result.push_back(cell);
+          cell = HcalCastorDetId(section, false, sector, module);
+          if (castortopology.valid(cell))
+            result.push_back(cell);
+        }
+      }
+
+      section = HcalCastorDetId::HAD;
+      for (int sector = 1; sector < 17; sector++) {
+        for (int module = 3; module < 15; module++) {
+          cell = HcalCastorDetId(section, true, sector, module);
+          if (castortopology.valid(cell))
+            result.push_back(cell);
+          cell = HcalCastorDetId(section, false, sector, module);
+          if (castortopology.valid(cell))
+            result.push_back(cell);
+        }
+      }
     }
-   }
-
-   section = HcalCastorDetId::HAD;
-    for(int sector= 1; sector < 17; sector++){
-     for(int module=3; module<15; module++) {
-      cell = HcalCastorDetId(section, true, sector, module);
-      if(castortopology.valid(cell)) result.push_back(cell);
-      cell = HcalCastorDetId(section, false, sector, module);
-      if(castortopology.valid(cell)) result.push_back(cell);
-     }
-   }
-
-}
-  return result;
+    return result;
+  }
+}  // namespace
 
- }
-}
+CastorHardcodeCalibrations::CastorHardcodeCalibrations(const edm::ParameterSet& iConfig)
 
-CastorHardcodeCalibrations::CastorHardcodeCalibrations ( const edm::ParameterSet& iConfig ) 
-  
 {
   edm::LogInfo("HCAL") << "CastorHardcodeCalibrations::CastorHardcodeCalibrations->...";
   //parsing record parameters
-  h2mode_=iConfig.getUntrackedParameter<bool>("H2Mode",false);
-  std::vector <std::string> toGet = iConfig.getUntrackedParameter <std::vector <std::string> > ("toGet");
-  for(std::vector <std::string>::iterator objectName = toGet.begin(); objectName != toGet.end(); ++objectName ) {
+  h2mode_ = iConfig.getUntrackedParameter<bool>("H2Mode", false);
+  std::vector<std::string> toGet = iConfig.getUntrackedParameter<std::vector<std::string> >("toGet");
+  for (std::vector<std::string>::iterator objectName = toGet.begin(); objectName != toGet.end(); ++objectName) {
     bool all = *objectName == "all";
     if ((*objectName == "Pedestals") || all) {
-      setWhatProduced (this, &CastorHardcodeCalibrations::producePedestals);
-      findingRecord <CastorPedestalsRcd> ();
+      setWhatProduced(this, &CastorHardcodeCalibrations::producePedestals);
+      findingRecord<CastorPedestalsRcd>();
     }
     if ((*objectName == "PedestalWidths") || all) {
-      setWhatProduced (this, &CastorHardcodeCalibrations::producePedestalWidths);
-      findingRecord <CastorPedestalWidthsRcd> ();
+      setWhatProduced(this, &CastorHardcodeCalibrations::producePedestalWidths);
+      findingRecord<CastorPedestalWidthsRcd>();
     }
     if ((*objectName == "Gains") || all) {
-      setWhatProduced (this, &CastorHardcodeCalibrations::produceGains);
-      findingRecord <CastorGainsRcd> ();
+      setWhatProduced(this, &CastorHardcodeCalibrations::produceGains);
+      findingRecord<CastorGainsRcd>();
     }
     if ((*objectName == "GainWidths") || all) {
-      setWhatProduced (this, &CastorHardcodeCalibrations::produceGainWidths);
-      findingRecord <CastorGainWidthsRcd> ();
+      setWhatProduced(this, &CastorHardcodeCalibrations::produceGainWidths);
+      findingRecord<CastorGainWidthsRcd>();
     }
     if ((*objectName == "QIEData") || all) {
-      setWhatProduced (this, &CastorHardcodeCalibrations::produceQIEData);
-      findingRecord <CastorQIEDataRcd> ();
+      setWhatProduced(this, &CastorHardcodeCalibrations::produceQIEData);
+      findingRecord<CastorQIEDataRcd>();
     }
     if ((*objectName == "ChannelQuality") || (*objectName == "channelQuality") || all) {
-      setWhatProduced (this, &CastorHardcodeCalibrations::produceChannelQuality);
-      findingRecord <CastorChannelQualityRcd> ();
+      setWhatProduced(this, &CastorHardcodeCalibrations::produceChannelQuality);
+      findingRecord<CastorChannelQualityRcd>();
     }
     if ((*objectName == "ElectronicsMap") || (*objectName == "electronicsMap") || all) {
-      setWhatProduced (this, &CastorHardcodeCalibrations::produceElectronicsMap);
-      findingRecord <CastorElectronicsMapRcd> ();
+      setWhatProduced(this, &CastorHardcodeCalibrations::produceElectronicsMap);
+      findingRecord<CastorElectronicsMapRcd>();
     }
     if ((*objectName == "RecoParams") || all) {
-      setWhatProduced (this, &CastorHardcodeCalibrations::produceRecoParams);
-      findingRecord <CastorRecoParamsRcd> ();
+      setWhatProduced(this, &CastorHardcodeCalibrations::produceRecoParams);
+      findingRecord<CastorRecoParamsRcd>();
     }
     if ((*objectName == "SaturationCorrs") || all) {
-      setWhatProduced (this, &CastorHardcodeCalibrations::produceSaturationCorrs);
-      findingRecord <CastorSaturationCorrsRcd> ();
+      setWhatProduced(this, &CastorHardcodeCalibrations::produceSaturationCorrs);
+      findingRecord<CastorSaturationCorrsRcd>();
     }
   }
 }
 
-
-CastorHardcodeCalibrations::~CastorHardcodeCalibrations()
-{
-}
-
+CastorHardcodeCalibrations::~CastorHardcodeCalibrations() {}
 
 //
 // member functions
 //
-void 
-CastorHardcodeCalibrations::setIntervalFor( const edm::eventsetup::EventSetupRecordKey& iKey, const edm::IOVSyncValue& iTime, edm::ValidityInterval& oInterval ) {
-  std::string record = iKey.name ();
-  edm::LogInfo("HCAL") << "CastorHardcodeCalibrations::setIntervalFor-> key: " << record << " time: " << iTime.eventID() << '/' << iTime.time ().value ();
-  oInterval = edm::ValidityInterval (edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime()); //infinite
+void CastorHardcodeCalibrations::setIntervalFor(const edm::eventsetup::EventSetupRecordKey& iKey,
+                                                const edm::IOVSyncValue& iTime,
+                                                edm::ValidityInterval& oInterval) {
+  std::string record = iKey.name();
+  edm::LogInfo("HCAL") << "CastorHardcodeCalibrations::setIntervalFor-> key: " << record << " time: " << iTime.eventID()
+                       << '/' << iTime.time().value();
+  oInterval = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());  //infinite
 }
 
-std::unique_ptr<CastorPedestals> CastorHardcodeCalibrations::producePedestals (const CastorPedestalsRcd&) {
+std::unique_ptr<CastorPedestals> CastorHardcodeCalibrations::producePedestals(const CastorPedestalsRcd&) {
   edm::LogInfo("HCAL") << "CastorHardcodeCalibrations::producePedestals-> ...";
   auto result = std::make_unique<CastorPedestals>(false);
-  std::vector <HcalGenericDetId> cells = allCells(h2mode_);
-  for (std::vector <HcalGenericDetId>::const_iterator cell = cells.begin (); cell != cells.end (); ++cell) {
-    CastorPedestal item = CastorDbHardcode::makePedestal (*cell);
+  std::vector<HcalGenericDetId> cells = allCells(h2mode_);
+  for (std::vector<HcalGenericDetId>::const_iterator cell = cells.begin(); cell != cells.end(); ++cell) {
+    CastorPedestal item = CastorDbHardcode::makePedestal(*cell);
     result->addValues(item);
   }
   return result;
 }
 
-std::unique_ptr<CastorPedestalWidths> CastorHardcodeCalibrations::producePedestalWidths (const CastorPedestalWidthsRcd&) {
+std::unique_ptr<CastorPedestalWidths> CastorHardcodeCalibrations::producePedestalWidths(const CastorPedestalWidthsRcd&) {
   edm::LogInfo("HCAL") << "CastorHardcodeCalibrations::producePedestalWidths-> ...";
   auto result = std::make_unique<CastorPedestalWidths>(false);
-  std::vector <HcalGenericDetId> cells = allCells(h2mode_);
-  for (std::vector <HcalGenericDetId>::const_iterator cell = cells.begin (); cell != cells.end (); ++cell) {
-    CastorPedestalWidth item = CastorDbHardcode::makePedestalWidth (*cell);
+  std::vector<HcalGenericDetId> cells = allCells(h2mode_);
+  for (std::vector<HcalGenericDetId>::const_iterator cell = cells.begin(); cell != cells.end(); ++cell) {
+    CastorPedestalWidth item = CastorDbHardcode::makePedestalWidth(*cell);
     result->addValues(item);
   }
   return result;
 }
 
-std::unique_ptr<CastorGains> CastorHardcodeCalibrations::produceGains (const CastorGainsRcd&) {
+std::unique_ptr<CastorGains> CastorHardcodeCalibrations::produceGains(const CastorGainsRcd&) {
   edm::LogInfo("HCAL") << "CastorHardcodeCalibrations::produceGains-> ...";
   auto result = std::make_unique<CastorGains>();
-  std::vector <HcalGenericDetId> cells = allCells(h2mode_);
-  for (std::vector <HcalGenericDetId>::const_iterator cell = cells.begin (); cell != cells.end (); ++cell) {
-    CastorGain item = CastorDbHardcode::makeGain (*cell);
+  std::vector<HcalGenericDetId> cells = allCells(h2mode_);
+  for (std::vector<HcalGenericDetId>::const_iterator cell = cells.begin(); cell != cells.end(); ++cell) {
+    CastorGain item = CastorDbHardcode::makeGain(*cell);
     result->addValues(item);
   }
   return result;
 }
 
-std::unique_ptr<CastorGainWidths> CastorHardcodeCalibrations::produceGainWidths (const CastorGainWidthsRcd&) {
+std::unique_ptr<CastorGainWidths> CastorHardcodeCalibrations::produceGainWidths(const CastorGainWidthsRcd&) {
   edm::LogInfo("HCAL") << "CastorHardcodeCalibrations::produceGainWidths-> ...";
   auto result = std::make_unique<CastorGainWidths>();
-  std::vector <HcalGenericDetId> cells = allCells(h2mode_);
-  for (std::vector <HcalGenericDetId>::const_iterator cell = cells.begin (); cell != cells.end (); ++cell) {
-    CastorGainWidth item = CastorDbHardcode::makeGainWidth (*cell);
+  std::vector<HcalGenericDetId> cells = allCells(h2mode_);
+  for (std::vector<HcalGenericDetId>::const_iterator cell = cells.begin(); cell != cells.end(); ++cell) {
+    CastorGainWidth item = CastorDbHardcode::makeGainWidth(*cell);
     result->addValues(item);
   }
   return result;
 }
 
-std::unique_ptr<CastorQIEData> CastorHardcodeCalibrations::produceQIEData (const CastorQIEDataRcd& rcd) {
+std::unique_ptr<CastorQIEData> CastorHardcodeCalibrations::produceQIEData(const CastorQIEDataRcd& rcd) {
   edm::LogInfo("HCAL") << "CastorHardcodeCalibrations::produceQIEData-> ...";
   auto result = std::make_unique<CastorQIEData>();
-  std::vector <HcalGenericDetId> cells = allCells(h2mode_);
-  for (std::vector <HcalGenericDetId>::const_iterator cell = cells.begin (); cell != cells.end (); ++cell) {
-    CastorQIECoder coder = CastorDbHardcode::makeQIECoder (*cell);
+  std::vector<HcalGenericDetId> cells = allCells(h2mode_);
+  for (std::vector<HcalGenericDetId>::const_iterator cell = cells.begin(); cell != cells.end(); ++cell) {
+    CastorQIECoder coder = CastorDbHardcode::makeQIECoder(*cell);
     result->addCoder(coder);
   }
   return result;
 }
 
-std::unique_ptr<CastorChannelQuality> CastorHardcodeCalibrations::produceChannelQuality (const CastorChannelQualityRcd& rcd) {
+std::unique_ptr<CastorChannelQuality> CastorHardcodeCalibrations::produceChannelQuality(
+    const CastorChannelQualityRcd& rcd) {
   edm::LogInfo("HCAL") << "CastorHardcodeCalibrations::produceChannelQuality-> ...";
   auto result = std::make_unique<CastorChannelQuality>();
-  std::vector <HcalGenericDetId> cells = allCells(h2mode_);
-  for (std::vector <HcalGenericDetId>::const_iterator cell = cells.begin (); cell != cells.end (); ++cell) {
-    CastorChannelStatus item(cell->rawId(),CastorChannelStatus::GOOD);
+  std::vector<HcalGenericDetId> cells = allCells(h2mode_);
+  for (std::vector<HcalGenericDetId>::const_iterator cell = cells.begin(); cell != cells.end(); ++cell) {
+    CastorChannelStatus item(cell->rawId(), CastorChannelStatus::GOOD);
     result->addValues(item);
   }
   return result;
 }
 
-std::unique_ptr<CastorElectronicsMap> CastorHardcodeCalibrations::produceElectronicsMap (const CastorElectronicsMapRcd& rcd) {
+std::unique_ptr<CastorElectronicsMap> CastorHardcodeCalibrations::produceElectronicsMap(
+    const CastorElectronicsMapRcd& rcd) {
   edm::LogInfo("HCAL") << "CastorHardcodeCalibrations::produceElectronicsMap-> ...";
 
   auto result = std::make_unique<CastorElectronicsMap>();
@@ -206,24 +207,25 @@ std::unique_ptr<CastorElectronicsMap> CastorHardcodeCalibrations::produceElectro
   return result;
 }
 
-std::unique_ptr<CastorRecoParams> CastorHardcodeCalibrations::produceRecoParams (const CastorRecoParamsRcd& rcd) {
-	edm::LogInfo("HCAL") << "CastorHardcodeCalibrations::produceRecoParams-> ...";
-        auto result = std::make_unique<CastorRecoParams>();
-	std::vector <HcalGenericDetId> cells = allCells(h2mode_);
-	for (std::vector <HcalGenericDetId>::const_iterator cell = cells.begin (); cell != cells.end (); ++cell) {
-		CastorRecoParam item = CastorDbHardcode::makeRecoParam (*cell);
-		result->addValues(item);
-	}
-	return result;
+std::unique_ptr<CastorRecoParams> CastorHardcodeCalibrations::produceRecoParams(const CastorRecoParamsRcd& rcd) {
+  edm::LogInfo("HCAL") << "CastorHardcodeCalibrations::produceRecoParams-> ...";
+  auto result = std::make_unique<CastorRecoParams>();
+  std::vector<HcalGenericDetId> cells = allCells(h2mode_);
+  for (std::vector<HcalGenericDetId>::const_iterator cell = cells.begin(); cell != cells.end(); ++cell) {
+    CastorRecoParam item = CastorDbHardcode::makeRecoParam(*cell);
+    result->addValues(item);
+  }
+  return result;
 }
 
-std::unique_ptr<CastorSaturationCorrs> CastorHardcodeCalibrations::produceSaturationCorrs (const CastorSaturationCorrsRcd& rcd) {
-	edm::LogInfo("HCAL") << "CastorHardcodeCalibrations::produceSaturationCorrs-> ...";
-        auto result = std::make_unique<CastorSaturationCorrs>();
-	std::vector <HcalGenericDetId> cells = allCells(h2mode_);
-	for (std::vector <HcalGenericDetId>::const_iterator cell = cells.begin (); cell != cells.end (); ++cell) {
-		CastorSaturationCorr item = CastorDbHardcode::makeSaturationCorr (*cell);
-		result->addValues(item);
-	}
-	return result;
+std::unique_ptr<CastorSaturationCorrs> CastorHardcodeCalibrations::produceSaturationCorrs(
+    const CastorSaturationCorrsRcd& rcd) {
+  edm::LogInfo("HCAL") << "CastorHardcodeCalibrations::produceSaturationCorrs-> ...";
+  auto result = std::make_unique<CastorSaturationCorrs>();
+  std::vector<HcalGenericDetId> cells = allCells(h2mode_);
+  for (std::vector<HcalGenericDetId>::const_iterator cell = cells.begin(); cell != cells.end(); ++cell) {
+    CastorSaturationCorr item = CastorDbHardcode::makeSaturationCorr(*cell);
+    result->addValues(item);
+  }
+  return result;
 }
diff --git a/CalibCalorimetry/CastorCalib/plugins/CastorHardcodeCalibrations.h b/CalibCalorimetry/CastorCalib/plugins/CastorHardcodeCalibrations.h
index 2d8bc63921552..c7f2e9aff2779 100644
--- a/CalibCalorimetry/CastorCalib/plugins/CastorHardcodeCalibrations.h
+++ b/CalibCalorimetry/CastorCalib/plugins/CastorHardcodeCalibrations.h
@@ -1,4 +1,4 @@
-// ESSource to generate default HCAL/CASTOR calibration objects 
+// ESSource to generate default HCAL/CASTOR calibration objects
 //
 #include <map>
 #include <string>
@@ -20,29 +20,26 @@ class CastorElectronicsMapRcd;
 class CastorRecoParamsRcd;
 class CastorSaturationCorrsRcd;
 
-class CastorHardcodeCalibrations : public edm::ESProducer,
-		       public edm::EventSetupRecordIntervalFinder
-{
+class CastorHardcodeCalibrations : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
 public:
-  CastorHardcodeCalibrations (const edm::ParameterSet& );
-  ~CastorHardcodeCalibrations () override;
+  CastorHardcodeCalibrations(const edm::ParameterSet&);
+  ~CastorHardcodeCalibrations() override;
+
+  void produce(){};
 
-  void produce () {};
-  
 protected:
   void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
-			      const edm::IOVSyncValue& , 
-			      edm::ValidityInterval&) override ;
+                      const edm::IOVSyncValue&,
+                      edm::ValidityInterval&) override;
 
-  std::unique_ptr<CastorPedestals> producePedestals (const CastorPedestalsRcd& rcd);
-  std::unique_ptr<CastorPedestalWidths> producePedestalWidths (const CastorPedestalWidthsRcd& rcd);
-  std::unique_ptr<CastorGains> produceGains (const CastorGainsRcd& rcd);
-  std::unique_ptr<CastorGainWidths> produceGainWidths (const CastorGainWidthsRcd& rcd);
-  std::unique_ptr<CastorQIEData> produceQIEData (const CastorQIEDataRcd& rcd);
-  std::unique_ptr<CastorChannelQuality> produceChannelQuality (const CastorChannelQualityRcd& rcd);
-  std::unique_ptr<CastorElectronicsMap> produceElectronicsMap (const CastorElectronicsMapRcd& rcd);
-  std::unique_ptr<CastorRecoParams> produceRecoParams (const CastorRecoParamsRcd& rcd);
-  std::unique_ptr<CastorSaturationCorrs> produceSaturationCorrs (const CastorSaturationCorrsRcd& rcd);
+  std::unique_ptr<CastorPedestals> producePedestals(const CastorPedestalsRcd& rcd);
+  std::unique_ptr<CastorPedestalWidths> producePedestalWidths(const CastorPedestalWidthsRcd& rcd);
+  std::unique_ptr<CastorGains> produceGains(const CastorGainsRcd& rcd);
+  std::unique_ptr<CastorGainWidths> produceGainWidths(const CastorGainWidthsRcd& rcd);
+  std::unique_ptr<CastorQIEData> produceQIEData(const CastorQIEDataRcd& rcd);
+  std::unique_ptr<CastorChannelQuality> produceChannelQuality(const CastorChannelQualityRcd& rcd);
+  std::unique_ptr<CastorElectronicsMap> produceElectronicsMap(const CastorElectronicsMapRcd& rcd);
+  std::unique_ptr<CastorRecoParams> produceRecoParams(const CastorRecoParamsRcd& rcd);
+  std::unique_ptr<CastorSaturationCorrs> produceSaturationCorrs(const CastorSaturationCorrsRcd& rcd);
   bool h2mode_;
 };
-
diff --git a/CalibCalorimetry/CastorCalib/plugins/CastorPedestalsAnalysis.cc b/CalibCalorimetry/CastorCalib/plugins/CastorPedestalsAnalysis.cc
index 92c58772a5a70..46dd00ddbe90d 100644
--- a/CalibCalorimetry/CastorCalib/plugins/CastorPedestalsAnalysis.cc
+++ b/CalibCalorimetry/CastorCalib/plugins/CastorPedestalsAnalysis.cc
@@ -1,42 +1,37 @@
 // Original Author:  Steven Won
 // Original Author:  Alan Campbell for castor
 //         Created:  Fri May  2 15:34:43 CEST 2008
-// Written to replace the combination of HcalPedestalAnalyzer and HcalPedestalAnalysis 
+// Written to replace the combination of HcalPedestalAnalyzer and HcalPedestalAnalysis
 // This code runs 1000x faster and produces all outputs from a single run
 // (ADC, fC in .txt plus an .xml file)
 //
 #include <memory>
 #include "CalibCalorimetry/CastorCalib/interface/CastorPedestalsAnalysis.h"
 
-CastorPedestalsAnalysis::CastorPedestalsAnalysis(const edm::ParameterSet& ps) :
-   castorDigiCollectionTag(ps.getParameter<edm::InputTag>("castorDigiCollectionTag"))
-{
-   hiSaveFlag = ps.getUntrackedParameter<bool>("hiSaveFlag", false);
-   dumpXML = ps.getUntrackedParameter<bool>("dumpXML", false);
-   verboseflag = ps.getUntrackedParameter<bool>("verbose", false);
-   firstTS = ps.getUntrackedParameter<int>("firstTS", 0);
-   lastTS = ps.getUntrackedParameter<int>("lastTS", 9);   
-   firsttime = true;
+CastorPedestalsAnalysis::CastorPedestalsAnalysis(const edm::ParameterSet& ps)
+    : castorDigiCollectionTag(ps.getParameter<edm::InputTag>("castorDigiCollectionTag")) {
+  hiSaveFlag = ps.getUntrackedParameter<bool>("hiSaveFlag", false);
+  dumpXML = ps.getUntrackedParameter<bool>("dumpXML", false);
+  verboseflag = ps.getUntrackedParameter<bool>("verbose", false);
+  firstTS = ps.getUntrackedParameter<int>("firstTS", 0);
+  lastTS = ps.getUntrackedParameter<int>("lastTS", 9);
+  firsttime = true;
 }
 
-
-CastorPedestalsAnalysis::~CastorPedestalsAnalysis()
-{
-   CastorPedestals* rawPedsItem = new CastorPedestals(true);
-   CastorPedestalWidths* rawWidthsItem = new CastorPedestalWidths(true);
-   CastorPedestals* rawPedsItemfc = new CastorPedestals(false);
-   CastorPedestalWidths* rawWidthsItemfc = new CastorPedestalWidths(false);
-
-   //Calculate pedestal constants
-   std::cout << "Calculating Pedestal constants...\n";
-   std::vector<NewPedBunch>::iterator bunch_it;
-   for(bunch_it=Bunches.begin(); bunch_it != Bunches.end(); ++bunch_it)
-   {
-      if(bunch_it->usedflag){
-
-      if(verboseflag) std::cout << "Analyzing channel sector= " << bunch_it->detid.sector() 
-        << " module = " << bunch_it->detid.module() 
-        << std::endl;
+CastorPedestalsAnalysis::~CastorPedestalsAnalysis() {
+  CastorPedestals* rawPedsItem = new CastorPedestals(true);
+  CastorPedestalWidths* rawWidthsItem = new CastorPedestalWidths(true);
+  CastorPedestals* rawPedsItemfc = new CastorPedestals(false);
+  CastorPedestalWidths* rawWidthsItemfc = new CastorPedestalWidths(false);
+
+  //Calculate pedestal constants
+  std::cout << "Calculating Pedestal constants...\n";
+  std::vector<NewPedBunch>::iterator bunch_it;
+  for (bunch_it = Bunches.begin(); bunch_it != Bunches.end(); ++bunch_it) {
+    if (bunch_it->usedflag) {
+      if (verboseflag)
+        std::cout << "Analyzing channel sector= " << bunch_it->detid.sector()
+                  << " module = " << bunch_it->detid.module() << std::endl;
       //pedestal constant is the mean
       bunch_it->cap[0] /= bunch_it->num[0][0];
       bunch_it->cap[1] /= bunch_it->num[1][1];
@@ -47,155 +42,182 @@ CastorPedestalsAnalysis::~CastorPedestalsAnalysis()
       bunch_it->capfc[2] /= bunch_it->num[2][2];
       bunch_it->capfc[3] /= bunch_it->num[3][3];
       //widths are the covariance matrix--assumed symmetric
-      bunch_it->sig[0][0] = (bunch_it->prod[0][0]/bunch_it->num[0][0])-(bunch_it->cap[0]*bunch_it->cap[0]);
-      bunch_it->sig[0][1] = (bunch_it->prod[0][1]/bunch_it->num[0][1])-(bunch_it->cap[0]*bunch_it->cap[1]);
-      bunch_it->sig[0][2] = (bunch_it->prod[0][2]/bunch_it->num[0][2])-(bunch_it->cap[0]*bunch_it->cap[2]);
-      bunch_it->sig[0][3] = (bunch_it->prod[0][3]/bunch_it->num[0][3])-(bunch_it->cap[0]*bunch_it->cap[3]);
-      bunch_it->sig[1][0] = (bunch_it->prod[1][0]/bunch_it->num[1][0])-(bunch_it->cap[1]*bunch_it->cap[0]);
-      bunch_it->sig[1][1] = (bunch_it->prod[1][1]/bunch_it->num[1][1])-(bunch_it->cap[1]*bunch_it->cap[1]);
-      bunch_it->sig[1][2] = (bunch_it->prod[1][2]/bunch_it->num[1][2])-(bunch_it->cap[1]*bunch_it->cap[2]);
-      bunch_it->sig[1][3] = (bunch_it->prod[1][3]/bunch_it->num[1][3])-(bunch_it->cap[1]*bunch_it->cap[3]);
-      bunch_it->sig[2][0] = (bunch_it->prod[2][0]/bunch_it->num[2][0])-(bunch_it->cap[2]*bunch_it->cap[0]);
-      bunch_it->sig[2][1] = (bunch_it->prod[2][1]/bunch_it->num[2][1])-(bunch_it->cap[2]*bunch_it->cap[1]);
-      bunch_it->sig[2][2] = (bunch_it->prod[2][2]/bunch_it->num[2][2])-(bunch_it->cap[2]*bunch_it->cap[2]);
-      bunch_it->sig[2][3] = (bunch_it->prod[2][3]/bunch_it->num[2][3])-(bunch_it->cap[2]*bunch_it->cap[3]);
-      bunch_it->sig[3][0] = (bunch_it->prod[3][0]/bunch_it->num[3][0])-(bunch_it->cap[3]*bunch_it->cap[0]);
-      bunch_it->sig[3][1] = (bunch_it->prod[3][1]/bunch_it->num[3][1])-(bunch_it->cap[3]*bunch_it->cap[1]);
-      bunch_it->sig[3][2] = (bunch_it->prod[3][2]/bunch_it->num[3][2])-(bunch_it->cap[3]*bunch_it->cap[2]);
-      bunch_it->sig[3][3] = (bunch_it->prod[3][3]/bunch_it->num[3][3])-(bunch_it->cap[3]*bunch_it->cap[3]);
-
-      bunch_it->sigfc[0][0] = (bunch_it->prodfc[0][0]/bunch_it->num[0][0])-(bunch_it->capfc[0]*bunch_it->capfc[0]);
-      bunch_it->sigfc[0][1] = (bunch_it->prodfc[0][1]/bunch_it->num[0][1])-(bunch_it->capfc[0]*bunch_it->capfc[1]);
-      bunch_it->sigfc[0][2] = (bunch_it->prodfc[0][2]/bunch_it->num[0][2])-(bunch_it->capfc[0]*bunch_it->capfc[2]);
-      bunch_it->sigfc[0][3] = (bunch_it->prodfc[0][3]/bunch_it->num[0][3])-(bunch_it->capfc[0]*bunch_it->capfc[3]);
-      bunch_it->sigfc[1][0] = (bunch_it->prodfc[1][0]/bunch_it->num[1][0])-(bunch_it->capfc[1]*bunch_it->capfc[0]);
-      bunch_it->sigfc[1][1] = (bunch_it->prodfc[1][1]/bunch_it->num[1][1])-(bunch_it->capfc[1]*bunch_it->capfc[1]);
-      bunch_it->sigfc[1][2] = (bunch_it->prodfc[1][2]/bunch_it->num[1][2])-(bunch_it->capfc[1]*bunch_it->capfc[2]);
-      bunch_it->sigfc[1][3] = (bunch_it->prodfc[1][3]/bunch_it->num[1][3])-(bunch_it->capfc[1]*bunch_it->capfc[3]);
-      bunch_it->sigfc[2][0] = (bunch_it->prodfc[2][0]/bunch_it->num[2][0])-(bunch_it->capfc[2]*bunch_it->capfc[0]);
-      bunch_it->sigfc[2][1] = (bunch_it->prodfc[2][1]/bunch_it->num[2][1])-(bunch_it->capfc[2]*bunch_it->capfc[1]);
-      bunch_it->sigfc[2][2] = (bunch_it->prodfc[2][2]/bunch_it->num[2][2])-(bunch_it->capfc[2]*bunch_it->capfc[2]);
-      bunch_it->sigfc[2][3] = (bunch_it->prodfc[2][3]/bunch_it->num[2][3])-(bunch_it->capfc[2]*bunch_it->capfc[3]);
-      bunch_it->sigfc[3][0] = (bunch_it->prodfc[3][0]/bunch_it->num[3][0])-(bunch_it->capfc[3]*bunch_it->capfc[0]);
-      bunch_it->sigfc[3][1] = (bunch_it->prodfc[3][1]/bunch_it->num[3][1])-(bunch_it->capfc[3]*bunch_it->capfc[1]);
-      bunch_it->sigfc[3][2] = (bunch_it->prodfc[3][2]/bunch_it->num[3][2])-(bunch_it->capfc[3]*bunch_it->capfc[2]);
-      bunch_it->sigfc[3][3] = (bunch_it->prodfc[3][3]/bunch_it->num[3][3])-(bunch_it->capfc[3]*bunch_it->capfc[3]);
-
-        for(int i = 0; i != 3; i++){
-            CASTORMeans->Fill(bunch_it->cap[i]);
-            CASTORWidths->Fill(bunch_it->sig[i][i]);
-         }
+      bunch_it->sig[0][0] = (bunch_it->prod[0][0] / bunch_it->num[0][0]) - (bunch_it->cap[0] * bunch_it->cap[0]);
+      bunch_it->sig[0][1] = (bunch_it->prod[0][1] / bunch_it->num[0][1]) - (bunch_it->cap[0] * bunch_it->cap[1]);
+      bunch_it->sig[0][2] = (bunch_it->prod[0][2] / bunch_it->num[0][2]) - (bunch_it->cap[0] * bunch_it->cap[2]);
+      bunch_it->sig[0][3] = (bunch_it->prod[0][3] / bunch_it->num[0][3]) - (bunch_it->cap[0] * bunch_it->cap[3]);
+      bunch_it->sig[1][0] = (bunch_it->prod[1][0] / bunch_it->num[1][0]) - (bunch_it->cap[1] * bunch_it->cap[0]);
+      bunch_it->sig[1][1] = (bunch_it->prod[1][1] / bunch_it->num[1][1]) - (bunch_it->cap[1] * bunch_it->cap[1]);
+      bunch_it->sig[1][2] = (bunch_it->prod[1][2] / bunch_it->num[1][2]) - (bunch_it->cap[1] * bunch_it->cap[2]);
+      bunch_it->sig[1][3] = (bunch_it->prod[1][3] / bunch_it->num[1][3]) - (bunch_it->cap[1] * bunch_it->cap[3]);
+      bunch_it->sig[2][0] = (bunch_it->prod[2][0] / bunch_it->num[2][0]) - (bunch_it->cap[2] * bunch_it->cap[0]);
+      bunch_it->sig[2][1] = (bunch_it->prod[2][1] / bunch_it->num[2][1]) - (bunch_it->cap[2] * bunch_it->cap[1]);
+      bunch_it->sig[2][2] = (bunch_it->prod[2][2] / bunch_it->num[2][2]) - (bunch_it->cap[2] * bunch_it->cap[2]);
+      bunch_it->sig[2][3] = (bunch_it->prod[2][3] / bunch_it->num[2][3]) - (bunch_it->cap[2] * bunch_it->cap[3]);
+      bunch_it->sig[3][0] = (bunch_it->prod[3][0] / bunch_it->num[3][0]) - (bunch_it->cap[3] * bunch_it->cap[0]);
+      bunch_it->sig[3][1] = (bunch_it->prod[3][1] / bunch_it->num[3][1]) - (bunch_it->cap[3] * bunch_it->cap[1]);
+      bunch_it->sig[3][2] = (bunch_it->prod[3][2] / bunch_it->num[3][2]) - (bunch_it->cap[3] * bunch_it->cap[2]);
+      bunch_it->sig[3][3] = (bunch_it->prod[3][3] / bunch_it->num[3][3]) - (bunch_it->cap[3] * bunch_it->cap[3]);
+
+      bunch_it->sigfc[0][0] =
+          (bunch_it->prodfc[0][0] / bunch_it->num[0][0]) - (bunch_it->capfc[0] * bunch_it->capfc[0]);
+      bunch_it->sigfc[0][1] =
+          (bunch_it->prodfc[0][1] / bunch_it->num[0][1]) - (bunch_it->capfc[0] * bunch_it->capfc[1]);
+      bunch_it->sigfc[0][2] =
+          (bunch_it->prodfc[0][2] / bunch_it->num[0][2]) - (bunch_it->capfc[0] * bunch_it->capfc[2]);
+      bunch_it->sigfc[0][3] =
+          (bunch_it->prodfc[0][3] / bunch_it->num[0][3]) - (bunch_it->capfc[0] * bunch_it->capfc[3]);
+      bunch_it->sigfc[1][0] =
+          (bunch_it->prodfc[1][0] / bunch_it->num[1][0]) - (bunch_it->capfc[1] * bunch_it->capfc[0]);
+      bunch_it->sigfc[1][1] =
+          (bunch_it->prodfc[1][1] / bunch_it->num[1][1]) - (bunch_it->capfc[1] * bunch_it->capfc[1]);
+      bunch_it->sigfc[1][2] =
+          (bunch_it->prodfc[1][2] / bunch_it->num[1][2]) - (bunch_it->capfc[1] * bunch_it->capfc[2]);
+      bunch_it->sigfc[1][3] =
+          (bunch_it->prodfc[1][3] / bunch_it->num[1][3]) - (bunch_it->capfc[1] * bunch_it->capfc[3]);
+      bunch_it->sigfc[2][0] =
+          (bunch_it->prodfc[2][0] / bunch_it->num[2][0]) - (bunch_it->capfc[2] * bunch_it->capfc[0]);
+      bunch_it->sigfc[2][1] =
+          (bunch_it->prodfc[2][1] / bunch_it->num[2][1]) - (bunch_it->capfc[2] * bunch_it->capfc[1]);
+      bunch_it->sigfc[2][2] =
+          (bunch_it->prodfc[2][2] / bunch_it->num[2][2]) - (bunch_it->capfc[2] * bunch_it->capfc[2]);
+      bunch_it->sigfc[2][3] =
+          (bunch_it->prodfc[2][3] / bunch_it->num[2][3]) - (bunch_it->capfc[2] * bunch_it->capfc[3]);
+      bunch_it->sigfc[3][0] =
+          (bunch_it->prodfc[3][0] / bunch_it->num[3][0]) - (bunch_it->capfc[3] * bunch_it->capfc[0]);
+      bunch_it->sigfc[3][1] =
+          (bunch_it->prodfc[3][1] / bunch_it->num[3][1]) - (bunch_it->capfc[3] * bunch_it->capfc[1]);
+      bunch_it->sigfc[3][2] =
+          (bunch_it->prodfc[3][2] / bunch_it->num[3][2]) - (bunch_it->capfc[3] * bunch_it->capfc[2]);
+      bunch_it->sigfc[3][3] =
+          (bunch_it->prodfc[3][3] / bunch_it->num[3][3]) - (bunch_it->capfc[3] * bunch_it->capfc[3]);
+
+      for (int i = 0; i != 3; i++) {
+        CASTORMeans->Fill(bunch_it->cap[i]);
+        CASTORWidths->Fill(bunch_it->sig[i][i]);
+      }
 
       //if(bunch_it->detid.subdet() == 1){
- 
-
 
       int fillphi = bunch_it->detid.sector();
       //if (bunch_it->detid.depth()==4) fillphi++;
 
-  //    dephist[bunch_it->detid.module()-1]->Fill(bunch_it->detid.ieta(),fillphi,
-   //             (bunch_it->cap[0]+bunch_it->cap[1]+bunch_it->cap[2]+bunch_it->cap[3])/4);
-      dephist->Fill( bunch_it->detid.module(),fillphi,
-                (bunch_it->cap[0]+bunch_it->cap[1]+bunch_it->cap[2]+bunch_it->cap[3])/4);
-
-      const CastorPedestal item(bunch_it->detid, bunch_it->cap[0], bunch_it->cap[1], bunch_it->cap[2], bunch_it->cap[3],
-                              bunch_it->sig[0][0], bunch_it->sig[1][1], bunch_it->sig[2][2], bunch_it->sig[3][3]);
+      //    dephist[bunch_it->detid.module()-1]->Fill(bunch_it->detid.ieta(),fillphi,
+      //             (bunch_it->cap[0]+bunch_it->cap[1]+bunch_it->cap[2]+bunch_it->cap[3])/4);
+      dephist->Fill(bunch_it->detid.module(),
+                    fillphi,
+                    (bunch_it->cap[0] + bunch_it->cap[1] + bunch_it->cap[2] + bunch_it->cap[3]) / 4);
+
+      const CastorPedestal item(bunch_it->detid,
+                                bunch_it->cap[0],
+                                bunch_it->cap[1],
+                                bunch_it->cap[2],
+                                bunch_it->cap[3],
+                                bunch_it->sig[0][0],
+                                bunch_it->sig[1][1],
+                                bunch_it->sig[2][2],
+                                bunch_it->sig[3][3]);
       rawPedsItem->addValues(item);
       CastorPedestalWidth widthsp(bunch_it->detid);
-      widthsp.setSigma(0,0,bunch_it->sig[0][0]);
-      widthsp.setSigma(0,1,bunch_it->sig[0][1]);
-      widthsp.setSigma(0,2,bunch_it->sig[0][2]);
-      widthsp.setSigma(0,3,bunch_it->sig[0][3]);
-      widthsp.setSigma(1,0,bunch_it->sig[1][0]);
-      widthsp.setSigma(1,1,bunch_it->sig[1][1]);
-      widthsp.setSigma(1,2,bunch_it->sig[1][2]);
-      widthsp.setSigma(1,3,bunch_it->sig[1][3]);
-      widthsp.setSigma(2,0,bunch_it->sig[2][0]);
-      widthsp.setSigma(2,1,bunch_it->sig[2][1]);
-      widthsp.setSigma(2,2,bunch_it->sig[2][2]);
-      widthsp.setSigma(2,3,bunch_it->sig[2][3]);
-      widthsp.setSigma(3,0,bunch_it->sig[3][0]);
-      widthsp.setSigma(3,1,bunch_it->sig[3][1]);
-      widthsp.setSigma(3,2,bunch_it->sig[3][2]);
-      widthsp.setSigma(3,3,bunch_it->sig[3][3]);
+      widthsp.setSigma(0, 0, bunch_it->sig[0][0]);
+      widthsp.setSigma(0, 1, bunch_it->sig[0][1]);
+      widthsp.setSigma(0, 2, bunch_it->sig[0][2]);
+      widthsp.setSigma(0, 3, bunch_it->sig[0][3]);
+      widthsp.setSigma(1, 0, bunch_it->sig[1][0]);
+      widthsp.setSigma(1, 1, bunch_it->sig[1][1]);
+      widthsp.setSigma(1, 2, bunch_it->sig[1][2]);
+      widthsp.setSigma(1, 3, bunch_it->sig[1][3]);
+      widthsp.setSigma(2, 0, bunch_it->sig[2][0]);
+      widthsp.setSigma(2, 1, bunch_it->sig[2][1]);
+      widthsp.setSigma(2, 2, bunch_it->sig[2][2]);
+      widthsp.setSigma(2, 3, bunch_it->sig[2][3]);
+      widthsp.setSigma(3, 0, bunch_it->sig[3][0]);
+      widthsp.setSigma(3, 1, bunch_it->sig[3][1]);
+      widthsp.setSigma(3, 2, bunch_it->sig[3][2]);
+      widthsp.setSigma(3, 3, bunch_it->sig[3][3]);
       rawWidthsItem->addValues(widthsp);
 
-      const CastorPedestal itemfc(bunch_it->detid, bunch_it->capfc[0], bunch_it->capfc[1], bunch_it->capfc[2], bunch_it->capfc[3],
-                              bunch_it->sigfc[0][0], bunch_it->sigfc[1][1], bunch_it->sigfc[2][2], bunch_it->sigfc[3][3]);
+      const CastorPedestal itemfc(bunch_it->detid,
+                                  bunch_it->capfc[0],
+                                  bunch_it->capfc[1],
+                                  bunch_it->capfc[2],
+                                  bunch_it->capfc[3],
+                                  bunch_it->sigfc[0][0],
+                                  bunch_it->sigfc[1][1],
+                                  bunch_it->sigfc[2][2],
+                                  bunch_it->sigfc[3][3]);
       rawPedsItemfc->addValues(itemfc);
       CastorPedestalWidth widthspfc(bunch_it->detid);
-      widthspfc.setSigma(0,0,bunch_it->sigfc[0][0]);
-      widthspfc.setSigma(0,1,bunch_it->sigfc[0][1]);
-      widthspfc.setSigma(0,2,bunch_it->sigfc[0][2]);
-      widthspfc.setSigma(0,3,bunch_it->sigfc[0][3]);
-      widthspfc.setSigma(1,0,bunch_it->sigfc[1][0]);      
-      widthspfc.setSigma(1,1,bunch_it->sigfc[1][1]);
-      widthspfc.setSigma(1,2,bunch_it->sigfc[1][2]);
-      widthspfc.setSigma(1,3,bunch_it->sigfc[1][3]);
-      widthspfc.setSigma(2,0,bunch_it->sigfc[2][0]);
-      widthspfc.setSigma(2,1,bunch_it->sigfc[2][1]);
-      widthspfc.setSigma(2,2,bunch_it->sigfc[2][2]);
-      widthspfc.setSigma(2,3,bunch_it->sigfc[2][3]);
-      widthspfc.setSigma(3,0,bunch_it->sigfc[3][0]);
-      widthspfc.setSigma(3,1,bunch_it->sigfc[3][1]);
-      widthspfc.setSigma(3,2,bunch_it->sigfc[3][2]);
-      widthspfc.setSigma(3,3,bunch_it->sigfc[3][3]);
+      widthspfc.setSigma(0, 0, bunch_it->sigfc[0][0]);
+      widthspfc.setSigma(0, 1, bunch_it->sigfc[0][1]);
+      widthspfc.setSigma(0, 2, bunch_it->sigfc[0][2]);
+      widthspfc.setSigma(0, 3, bunch_it->sigfc[0][3]);
+      widthspfc.setSigma(1, 0, bunch_it->sigfc[1][0]);
+      widthspfc.setSigma(1, 1, bunch_it->sigfc[1][1]);
+      widthspfc.setSigma(1, 2, bunch_it->sigfc[1][2]);
+      widthspfc.setSigma(1, 3, bunch_it->sigfc[1][3]);
+      widthspfc.setSigma(2, 0, bunch_it->sigfc[2][0]);
+      widthspfc.setSigma(2, 1, bunch_it->sigfc[2][1]);
+      widthspfc.setSigma(2, 2, bunch_it->sigfc[2][2]);
+      widthspfc.setSigma(2, 3, bunch_it->sigfc[2][3]);
+      widthspfc.setSigma(3, 0, bunch_it->sigfc[3][0]);
+      widthspfc.setSigma(3, 1, bunch_it->sigfc[3][1]);
+      widthspfc.setSigma(3, 2, bunch_it->sigfc[3][2]);
+      widthspfc.setSigma(3, 3, bunch_it->sigfc[3][3]);
       rawWidthsItemfc->addValues(widthspfc);
-
-      }
-   }
-
-    // dump the resulting list of pedestals into a file
-    std::ofstream outStream1(pedsADCfilename.c_str());
-    CastorDbASCIIIO::dumpObject (outStream1, (*rawPedsItem) );
-    std::ofstream outStream2(widthsADCfilename.c_str());
-    CastorDbASCIIIO::dumpObject (outStream2, (*rawWidthsItem) );
-
-    std::ofstream outStream3(pedsfCfilename.c_str());
-    CastorDbASCIIIO::dumpObject (outStream3, (*rawPedsItemfc) );
-    std::ofstream outStream4(widthsfCfilename.c_str());
-    CastorDbASCIIIO::dumpObject (outStream4, (*rawWidthsItemfc) );
-
-    if(dumpXML){
-       std::ofstream outStream5(XMLfilename.c_str());
-     //  CastorCondXML::dumpObject (outStream5, runnum, runnum, runnum, XMLtag, 1, (*rawPedsItem), (*rawWidthsItem)); 
-    }
-
-    if(hiSaveFlag){
-       theFile->Write();
-    }else{
-       theFile->cd();
-       theFile->cd("CASTOR");
-       CASTORMeans->Write();
-       CASTORWidths->Write();
- 
     }
+  }
+
+  // dump the resulting list of pedestals into a file
+  std::ofstream outStream1(pedsADCfilename.c_str());
+  CastorDbASCIIIO::dumpObject(outStream1, (*rawPedsItem));
+  std::ofstream outStream2(widthsADCfilename.c_str());
+  CastorDbASCIIIO::dumpObject(outStream2, (*rawWidthsItem));
+
+  std::ofstream outStream3(pedsfCfilename.c_str());
+  CastorDbASCIIIO::dumpObject(outStream3, (*rawPedsItemfc));
+  std::ofstream outStream4(widthsfCfilename.c_str());
+  CastorDbASCIIIO::dumpObject(outStream4, (*rawWidthsItemfc));
+
+  if (dumpXML) {
+    std::ofstream outStream5(XMLfilename.c_str());
+    //  CastorCondXML::dumpObject (outStream5, runnum, runnum, runnum, XMLtag, 1, (*rawPedsItem), (*rawWidthsItem));
+  }
+
+  if (hiSaveFlag) {
+    theFile->Write();
+  } else {
     theFile->cd();
-        dephist->Write();
-        dephist->SetDrawOption("colz");
-        dephist->GetXaxis()->SetTitle("module");
-        dephist->GetYaxis()->SetTitle("sector");
-    
-    //for (int n=0; n!= 4; n++) 
-    //{
-         //dephist[n]->Write();
-         //dephist[n]->SetDrawOption("colz");
-         //dephist[n]->GetXaxis()->SetTitle("i#eta");
-         //dephist[n]->GetYaxis()->SetTitle("i#phi");
-    //}
-
-    std::stringstream tempstringout;
-    tempstringout << runnum;
-    std::string name1 = tempstringout.str() + "_pedplots_1d.png";
-    std::string name2 = tempstringout.str() + "_pedplots_2d.png";
-
-    TStyle *theStyle = new TStyle("style","null");
-    theStyle->SetPalette(1,nullptr);
-    theStyle->SetCanvasDefH(1200); //Height of canvas
-    theStyle->SetCanvasDefW(1600); //Width of canvas
-
-    gStyle = theStyle;
-/*
+    theFile->cd("CASTOR");
+    CASTORMeans->Write();
+    CASTORWidths->Write();
+  }
+  theFile->cd();
+  dephist->Write();
+  dephist->SetDrawOption("colz");
+  dephist->GetXaxis()->SetTitle("module");
+  dephist->GetYaxis()->SetTitle("sector");
+
+  //for (int n=0; n!= 4; n++)
+  //{
+  //dephist[n]->Write();
+  //dephist[n]->SetDrawOption("colz");
+  //dephist[n]->GetXaxis()->SetTitle("i#eta");
+  //dephist[n]->GetYaxis()->SetTitle("i#phi");
+  //}
+
+  std::stringstream tempstringout;
+  tempstringout << runnum;
+  std::string name1 = tempstringout.str() + "_pedplots_1d.png";
+  std::string name2 = tempstringout.str() + "_pedplots_2d.png";
+
+  TStyle* theStyle = new TStyle("style", "null");
+  theStyle->SetPalette(1, nullptr);
+  theStyle->SetCanvasDefH(1200);  //Height of canvas
+  theStyle->SetCanvasDefW(1600);  //Width of canvas
+
+  gStyle = theStyle;
+  /*
     TCanvas * c1 = new TCanvas("c1","graph",1);
     c1->Divide(2,2);
     c1->cd(1);
@@ -221,130 +243,125 @@ CastorPedestalsAnalysis::~CastorPedestalsAnalysis()
     //dephist[3]->SetDrawOption("colz");
     c2->SaveAs(name2.c_str());
 */
-    std::cout << "Writing ROOT file... ";
-    theFile->Close();
-    std::cout << "ROOT file closed.\n";
+  std::cout << "Writing ROOT file... ";
+  theFile->Close();
+  std::cout << "ROOT file closed.\n";
 }
 
 // ------------ method called to for each event  ------------
-void
-CastorPedestalsAnalysis::analyze(const edm::Event& e, const edm::EventSetup& iSetup)
-{
-   using namespace edm;
-   using namespace std;
-
-   edm::Handle<CastorDigiCollection> castor;
-   e.getByLabel(castorDigiCollectionTag, castor);
-
-   edm::ESHandle<CastorDbService> conditions;
-   iSetup.get<CastorDbRecord>().get(conditions);
-
-   const CastorQIEShape* shape = conditions->getCastorShape();
-
-   if(firsttime)
-   {
-      runnum = e.id().run();
-      std::string runnum_string;
-      std::stringstream tempstringout;
-      tempstringout << runnum;
-      runnum_string = tempstringout.str();
-      ROOTfilename = runnum_string + "-peds_ADC.root";
-      pedsADCfilename = runnum_string + "-peds_ADC.txt";
-      pedsfCfilename = runnum_string + "-peds_fC.txt";
-      widthsADCfilename = runnum_string + "-widths_ADC.txt";
-      widthsfCfilename = runnum_string + "-widths_fC.txt";
-      XMLfilename = runnum_string + "-peds_ADC_complete.xml"; 
-      XMLtag = "Castor_pedestals_" + runnum_string;
-
-      theFile = new TFile(ROOTfilename.c_str(), "RECREATE");
-      theFile->cd();
-      // Create sub-directories
-      theFile->mkdir("CASTOR"); 
-      theFile->cd();
-
-      CASTORMeans = new TH1F("All Ped Means CASTOR","All Ped Means CASTOR", 100, 0, 9);
-      CASTORWidths = new TH1F("All Ped Widths CASTOR","All Ped Widths CASTOR", 100, 0, 3);
-
-      dephist = new TH2F("Pedestals (ADC)","All Castor",14, 0., 14.5, 16, .5, 16.5);
-     // dephist[0] = new TH2F("Pedestals (ADC)","Depth 1",89, -44, 44, 72, .5, 72.5);
-     // dephist[1] = new TH2F("Pedestals (ADC)","Depth 2",89, -44, 44, 72, .5, 72.5);
-     // dephist[2] = new TH2F("Pedestals (ADC)","Depth 3",89, -44, 44, 72, .5, 72.5);
-     // dephist[3] = new TH2F("Pedestals (ADC)","Depth 4",89, -44, 44, 72, .5, 72.5);
-
-      edm::ESHandle<CastorElectronicsMap> refEMap;
-      iSetup.get<CastorElectronicsMapRcd>().get(refEMap);
-      const CastorElectronicsMap* myRefEMap = refEMap.product();
-      std::vector<HcalGenericDetId> listEMap = myRefEMap->allPrecisionId();
-      for (std::vector<HcalGenericDetId>::const_iterator it = listEMap.begin(); it != listEMap.end(); ++it)
-      {     
-         HcalGenericDetId mygenid(it->rawId());
-         if(mygenid.isHcalCastorDetId())
-         {
-            NewPedBunch a;
-            HcalCastorDetId chanid(mygenid.rawId());
-            a.detid = chanid;
-            a.usedflag = false;
-            string type;
-			type = "CASTOR";
-            for(int i = 0; i != 4; i++)
-            {
-               a.cap[i] = 0;
-               a.capfc[i] = 0;
-               for(int j = 0; j != 4; j++)
-               {
-                  a.sig[i][j] = 0;
-                  a.sigfc[i][j] = 0;
-                  a.prod[i][j] = 0;
-                  a.prodfc[i][j] = 0;
-                  a.num[i][j] = 0;
-               }
-            }
-            Bunches.push_back(a);
-         }
+void CastorPedestalsAnalysis::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
+  using namespace edm;
+  using namespace std;
+
+  edm::Handle<CastorDigiCollection> castor;
+  e.getByLabel(castorDigiCollectionTag, castor);
+
+  edm::ESHandle<CastorDbService> conditions;
+  iSetup.get<CastorDbRecord>().get(conditions);
+
+  const CastorQIEShape* shape = conditions->getCastorShape();
+
+  if (firsttime) {
+    runnum = e.id().run();
+    std::string runnum_string;
+    std::stringstream tempstringout;
+    tempstringout << runnum;
+    runnum_string = tempstringout.str();
+    ROOTfilename = runnum_string + "-peds_ADC.root";
+    pedsADCfilename = runnum_string + "-peds_ADC.txt";
+    pedsfCfilename = runnum_string + "-peds_fC.txt";
+    widthsADCfilename = runnum_string + "-widths_ADC.txt";
+    widthsfCfilename = runnum_string + "-widths_fC.txt";
+    XMLfilename = runnum_string + "-peds_ADC_complete.xml";
+    XMLtag = "Castor_pedestals_" + runnum_string;
+
+    theFile = new TFile(ROOTfilename.c_str(), "RECREATE");
+    theFile->cd();
+    // Create sub-directories
+    theFile->mkdir("CASTOR");
+    theFile->cd();
+
+    CASTORMeans = new TH1F("All Ped Means CASTOR", "All Ped Means CASTOR", 100, 0, 9);
+    CASTORWidths = new TH1F("All Ped Widths CASTOR", "All Ped Widths CASTOR", 100, 0, 3);
+
+    dephist = new TH2F("Pedestals (ADC)", "All Castor", 14, 0., 14.5, 16, .5, 16.5);
+    // dephist[0] = new TH2F("Pedestals (ADC)","Depth 1",89, -44, 44, 72, .5, 72.5);
+    // dephist[1] = new TH2F("Pedestals (ADC)","Depth 2",89, -44, 44, 72, .5, 72.5);
+    // dephist[2] = new TH2F("Pedestals (ADC)","Depth 3",89, -44, 44, 72, .5, 72.5);
+    // dephist[3] = new TH2F("Pedestals (ADC)","Depth 4",89, -44, 44, 72, .5, 72.5);
+
+    edm::ESHandle<CastorElectronicsMap> refEMap;
+    iSetup.get<CastorElectronicsMapRcd>().get(refEMap);
+    const CastorElectronicsMap* myRefEMap = refEMap.product();
+    std::vector<HcalGenericDetId> listEMap = myRefEMap->allPrecisionId();
+    for (std::vector<HcalGenericDetId>::const_iterator it = listEMap.begin(); it != listEMap.end(); ++it) {
+      HcalGenericDetId mygenid(it->rawId());
+      if (mygenid.isHcalCastorDetId()) {
+        NewPedBunch a;
+        HcalCastorDetId chanid(mygenid.rawId());
+        a.detid = chanid;
+        a.usedflag = false;
+        string type;
+        type = "CASTOR";
+        for (int i = 0; i != 4; i++) {
+          a.cap[i] = 0;
+          a.capfc[i] = 0;
+          for (int j = 0; j != 4; j++) {
+            a.sig[i][j] = 0;
+            a.sigfc[i][j] = 0;
+            a.prod[i][j] = 0;
+            a.prodfc[i][j] = 0;
+            a.num[i][j] = 0;
+          }
+        }
+        Bunches.push_back(a);
       }
-      firsttime = false;
-   }
-
-   std::vector<NewPedBunch>::iterator bunch_it;
-
-   for(CastorDigiCollection::const_iterator j = castor->begin(); j != castor->end(); ++j)
-   {
-      const CastorDataFrame digi = (const CastorDataFrame)(*j);
-      for(bunch_it = Bunches.begin(); bunch_it != Bunches.end(); ++bunch_it)
-         if(bunch_it->detid.rawId() == digi.id().rawId()) break;
-      bunch_it->usedflag = true;
-      for(int ts = firstTS; ts != lastTS+1; ts++)
-      {
-         const CastorQIECoder* coder = conditions->getCastorCoder(digi.id().rawId());
-         bunch_it->num[digi.sample(ts).capid()][digi.sample(ts).capid()] += 1;
-         bunch_it->cap[digi.sample(ts).capid()] += digi.sample(ts).adc();
-         double charge1 = coder->charge(*shape, digi.sample(ts).adc(), digi.sample(ts).capid());
-         bunch_it->capfc[digi.sample(ts).capid()] += charge1;
-         bunch_it->prod[digi.sample(ts).capid()][digi.sample(ts).capid()] += (digi.sample(ts).adc() * digi.sample(ts).adc());
-         bunch_it->prodfc[digi.sample(ts).capid()][digi.sample(ts).capid()] += charge1 * charge1;
-         if((ts+1 < digi.size()) && (ts+1 < lastTS)){
-            bunch_it->prod[digi.sample(ts).capid()][digi.sample(ts+1).capid()] += digi.sample(ts).adc()*digi.sample(ts+1).adc();
-            double charge2 = coder->charge(*shape, digi.sample(ts+1).adc(), digi.sample(ts+1).capid());
-            bunch_it->prodfc[digi.sample(ts).capid()][digi.sample(ts+1).capid()] += charge1*charge2;
-            bunch_it->num[digi.sample(ts).capid()][digi.sample(ts+1).capid()] += 1;
-         }
-         if((ts+2 < digi.size()) && (ts+2 < lastTS)){
-            bunch_it->prod[digi.sample(ts).capid()][digi.sample(ts+2).capid()] += digi.sample(ts).adc()*digi.sample(ts+2).adc();
-            double charge2 = coder->charge(*shape, digi.sample(ts+2).adc(), digi.sample(ts+2).capid());
-            bunch_it->prodfc[digi.sample(ts).capid()][digi.sample(ts+2).capid()] += charge1*charge2;
-            bunch_it->num[digi.sample(ts).capid()][digi.sample(ts+2).capid()] += 1;
-         }
-         if((ts+3 < digi.size()) && (ts+3 < lastTS)){
-            bunch_it->prod[digi.sample(ts).capid()][digi.sample(ts+3).capid()] += digi.sample(ts).adc()*digi.sample(ts+3).adc();
-            double charge2 = coder->charge(*shape, digi.sample(ts+3).adc(), digi.sample(ts+3).capid());
-            bunch_it->prodfc[digi.sample(ts).capid()][digi.sample(ts+3).capid()] += charge1*charge2;
-            bunch_it->num[digi.sample(ts).capid()][digi.sample(ts+3).capid()] += 1;
-         }
+    }
+    firsttime = false;
+  }
+
+  std::vector<NewPedBunch>::iterator bunch_it;
+
+  for (CastorDigiCollection::const_iterator j = castor->begin(); j != castor->end(); ++j) {
+    const CastorDataFrame digi = (const CastorDataFrame)(*j);
+    for (bunch_it = Bunches.begin(); bunch_it != Bunches.end(); ++bunch_it)
+      if (bunch_it->detid.rawId() == digi.id().rawId())
+        break;
+    bunch_it->usedflag = true;
+    for (int ts = firstTS; ts != lastTS + 1; ts++) {
+      const CastorQIECoder* coder = conditions->getCastorCoder(digi.id().rawId());
+      bunch_it->num[digi.sample(ts).capid()][digi.sample(ts).capid()] += 1;
+      bunch_it->cap[digi.sample(ts).capid()] += digi.sample(ts).adc();
+      double charge1 = coder->charge(*shape, digi.sample(ts).adc(), digi.sample(ts).capid());
+      bunch_it->capfc[digi.sample(ts).capid()] += charge1;
+      bunch_it->prod[digi.sample(ts).capid()][digi.sample(ts).capid()] +=
+          (digi.sample(ts).adc() * digi.sample(ts).adc());
+      bunch_it->prodfc[digi.sample(ts).capid()][digi.sample(ts).capid()] += charge1 * charge1;
+      if ((ts + 1 < digi.size()) && (ts + 1 < lastTS)) {
+        bunch_it->prod[digi.sample(ts).capid()][digi.sample(ts + 1).capid()] +=
+            digi.sample(ts).adc() * digi.sample(ts + 1).adc();
+        double charge2 = coder->charge(*shape, digi.sample(ts + 1).adc(), digi.sample(ts + 1).capid());
+        bunch_it->prodfc[digi.sample(ts).capid()][digi.sample(ts + 1).capid()] += charge1 * charge2;
+        bunch_it->num[digi.sample(ts).capid()][digi.sample(ts + 1).capid()] += 1;
       }
-   }
-
+      if ((ts + 2 < digi.size()) && (ts + 2 < lastTS)) {
+        bunch_it->prod[digi.sample(ts).capid()][digi.sample(ts + 2).capid()] +=
+            digi.sample(ts).adc() * digi.sample(ts + 2).adc();
+        double charge2 = coder->charge(*shape, digi.sample(ts + 2).adc(), digi.sample(ts + 2).capid());
+        bunch_it->prodfc[digi.sample(ts).capid()][digi.sample(ts + 2).capid()] += charge1 * charge2;
+        bunch_it->num[digi.sample(ts).capid()][digi.sample(ts + 2).capid()] += 1;
+      }
+      if ((ts + 3 < digi.size()) && (ts + 3 < lastTS)) {
+        bunch_it->prod[digi.sample(ts).capid()][digi.sample(ts + 3).capid()] +=
+            digi.sample(ts).adc() * digi.sample(ts + 3).adc();
+        double charge2 = coder->charge(*shape, digi.sample(ts + 3).adc(), digi.sample(ts + 3).capid());
+        bunch_it->prodfc[digi.sample(ts).capid()][digi.sample(ts + 3).capid()] += charge1 * charge2;
+        bunch_it->num[digi.sample(ts).capid()][digi.sample(ts + 3).capid()] += 1;
+      }
+    }
+  }
 
-//this is the last brace
+  //this is the last brace
 }
 
 //define this as a plug-in
diff --git a/CalibCalorimetry/CastorCalib/plugins/CastorTextCalibrations.cc b/CalibCalorimetry/CastorCalib/plugins/CastorTextCalibrations.cc
index 980c398240ec0..e6dcdab50acbb 100644
--- a/CalibCalorimetry/CastorCalib/plugins/CastorTextCalibrations.cc
+++ b/CalibCalorimetry/CastorCalib/plugins/CastorTextCalibrations.cc
@@ -34,125 +34,113 @@
 
 using namespace cms;
 
-CastorTextCalibrations::CastorTextCalibrations ( const edm::ParameterSet& iConfig ) 
-  
+CastorTextCalibrations::CastorTextCalibrations(const edm::ParameterSet& iConfig)
+
 {
   //parsing parameters
   std::vector<edm::ParameterSet> data = iConfig.getParameter<std::vector<edm::ParameterSet> >("input");
-  std::vector<edm::ParameterSet>::iterator request = data.begin ();
-  for (; request != data.end (); ++request) {
-    std::string objectName = request->getParameter<std::string> ("object");
+  std::vector<edm::ParameterSet>::iterator request = data.begin();
+  for (; request != data.end(); ++request) {
+    std::string objectName = request->getParameter<std::string>("object");
     edm::FileInPath fp = request->getParameter<edm::FileInPath>("file");
-    mInputs [objectName] = fp.fullPath();
+    mInputs[objectName] = fp.fullPath();
     if (objectName == "Pedestals") {
-      setWhatProduced (this, &CastorTextCalibrations::producePedestals);
-      findingRecord <CastorPedestalsRcd> ();
-    }
-    else if (objectName == "PedestalWidths") {
-      setWhatProduced (this, &CastorTextCalibrations::producePedestalWidths);
-      findingRecord <CastorPedestalWidthsRcd> ();
-    }
-    else if (objectName == "Gains") {
-      setWhatProduced (this, &CastorTextCalibrations::produceGains);
-      findingRecord <CastorGainsRcd> ();
-    }
-    else if (objectName == "GainWidths") {
-      setWhatProduced (this, &CastorTextCalibrations::produceGainWidths);
-      findingRecord <CastorGainWidthsRcd> ();
-    }
-    else if (objectName == "QIEData") {
-      setWhatProduced (this, &CastorTextCalibrations::produceQIEData);
-      findingRecord <CastorQIEDataRcd> ();
-    }
-    else if (objectName == "ChannelQuality") {
-      setWhatProduced (this, &CastorTextCalibrations::produceChannelQuality);
-      findingRecord <CastorChannelQualityRcd> ();
-    }
-    else if (objectName == "ElectronicsMap") {
-      setWhatProduced (this, &CastorTextCalibrations::produceElectronicsMap);
-      findingRecord <CastorElectronicsMapRcd> ();
-    }
-    else if (objectName == "RecoParams") {
-      setWhatProduced (this, &CastorTextCalibrations::produceRecoParams);
-      findingRecord <CastorRecoParamsRcd> ();
-    }
-    else if (objectName == "SaturationCorrs") {
-      setWhatProduced (this, &CastorTextCalibrations::produceSaturationCorrs);
-      findingRecord <CastorSaturationCorrsRcd> ();
-    }
-    else {
-      std::cerr << "CastorTextCalibrations-> Unknown object name '" << objectName 
-		<< "', known names are: "
-		<< "Pedestals PedestalWidths Gains GainWidths QIEData ChannelQuality ElectronicsMap RecoParams SaturationCorrs"
-		<< std::endl;
+      setWhatProduced(this, &CastorTextCalibrations::producePedestals);
+      findingRecord<CastorPedestalsRcd>();
+    } else if (objectName == "PedestalWidths") {
+      setWhatProduced(this, &CastorTextCalibrations::producePedestalWidths);
+      findingRecord<CastorPedestalWidthsRcd>();
+    } else if (objectName == "Gains") {
+      setWhatProduced(this, &CastorTextCalibrations::produceGains);
+      findingRecord<CastorGainsRcd>();
+    } else if (objectName == "GainWidths") {
+      setWhatProduced(this, &CastorTextCalibrations::produceGainWidths);
+      findingRecord<CastorGainWidthsRcd>();
+    } else if (objectName == "QIEData") {
+      setWhatProduced(this, &CastorTextCalibrations::produceQIEData);
+      findingRecord<CastorQIEDataRcd>();
+    } else if (objectName == "ChannelQuality") {
+      setWhatProduced(this, &CastorTextCalibrations::produceChannelQuality);
+      findingRecord<CastorChannelQualityRcd>();
+    } else if (objectName == "ElectronicsMap") {
+      setWhatProduced(this, &CastorTextCalibrations::produceElectronicsMap);
+      findingRecord<CastorElectronicsMapRcd>();
+    } else if (objectName == "RecoParams") {
+      setWhatProduced(this, &CastorTextCalibrations::produceRecoParams);
+      findingRecord<CastorRecoParamsRcd>();
+    } else if (objectName == "SaturationCorrs") {
+      setWhatProduced(this, &CastorTextCalibrations::produceSaturationCorrs);
+      findingRecord<CastorSaturationCorrsRcd>();
+    } else {
+      std::cerr << "CastorTextCalibrations-> Unknown object name '" << objectName << "', known names are: "
+                << "Pedestals PedestalWidths Gains GainWidths QIEData ChannelQuality ElectronicsMap RecoParams "
+                   "SaturationCorrs"
+                << std::endl;
     }
   }
   //  setWhatProduced(this);
 }
 
-
-CastorTextCalibrations::~CastorTextCalibrations()
-{
-}
-
+CastorTextCalibrations::~CastorTextCalibrations() {}
 
 //
 // member functions
 //
-void 
-CastorTextCalibrations::setIntervalFor( const edm::eventsetup::EventSetupRecordKey& iKey, const edm::IOVSyncValue& iTime, edm::ValidityInterval& oInterval ) {
-  std::string record = iKey.name ();
-  oInterval = edm::ValidityInterval (edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime()); //infinite
+void CastorTextCalibrations::setIntervalFor(const edm::eventsetup::EventSetupRecordKey& iKey,
+                                            const edm::IOVSyncValue& iTime,
+                                            edm::ValidityInterval& oInterval) {
+  std::string record = iKey.name();
+  oInterval = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());  //infinite
 }
 
 template <class T>
-std::unique_ptr<T> produce_impl (const std::string& fFile) {
-  std::unique_ptr<T> result (new T ());
-  std::ifstream inStream (fFile.c_str ());
-  if (!inStream.good ()) {
+std::unique_ptr<T> produce_impl(const std::string& fFile) {
+  std::unique_ptr<T> result(new T());
+  std::ifstream inStream(fFile.c_str());
+  if (!inStream.good()) {
     std::cerr << "CastorTextCalibrations-> Unable to open file '" << fFile << "'" << std::endl;
     throw cms::Exception("FileNotFound") << "Unable to open '" << fFile << "'" << std::endl;
   }
-  if (!CastorDbASCIIIO::getObject (inStream, *result)) {
+  if (!CastorDbASCIIIO::getObject(inStream, *result)) {
     std::cerr << "CastorTextCalibrations-> Can not read object from file '" << fFile << "'" << std::endl;
     throw cms::Exception("ReadError") << "Can not read object from file '" << fFile << "'" << std::endl;
   }
   return result;
 }
 
-
-std::unique_ptr<CastorPedestals> CastorTextCalibrations::producePedestals (const CastorPedestalsRcd&) {
-  return produce_impl<CastorPedestals> (mInputs ["Pedestals"]);
+std::unique_ptr<CastorPedestals> CastorTextCalibrations::producePedestals(const CastorPedestalsRcd&) {
+  return produce_impl<CastorPedestals>(mInputs["Pedestals"]);
 }
 
-std::unique_ptr<CastorPedestalWidths> CastorTextCalibrations::producePedestalWidths (const CastorPedestalWidthsRcd&) {
-  return produce_impl<CastorPedestalWidths> (mInputs ["PedestalWidths"]);
+std::unique_ptr<CastorPedestalWidths> CastorTextCalibrations::producePedestalWidths(const CastorPedestalWidthsRcd&) {
+  return produce_impl<CastorPedestalWidths>(mInputs["PedestalWidths"]);
 }
 
-std::unique_ptr<CastorGains> CastorTextCalibrations::produceGains (const CastorGainsRcd&) {
-  return produce_impl<CastorGains> (mInputs ["Gains"]);
+std::unique_ptr<CastorGains> CastorTextCalibrations::produceGains(const CastorGainsRcd&) {
+  return produce_impl<CastorGains>(mInputs["Gains"]);
 }
 
-std::unique_ptr<CastorGainWidths> CastorTextCalibrations::produceGainWidths (const CastorGainWidthsRcd&) {
-  return produce_impl<CastorGainWidths> (mInputs ["GainWidths"]);
+std::unique_ptr<CastorGainWidths> CastorTextCalibrations::produceGainWidths(const CastorGainWidthsRcd&) {
+  return produce_impl<CastorGainWidths>(mInputs["GainWidths"]);
 }
 
-std::unique_ptr<CastorQIEData> CastorTextCalibrations::produceQIEData (const CastorQIEDataRcd& rcd) {
-  return produce_impl<CastorQIEData> (mInputs ["QIEData"]);
+std::unique_ptr<CastorQIEData> CastorTextCalibrations::produceQIEData(const CastorQIEDataRcd& rcd) {
+  return produce_impl<CastorQIEData>(mInputs["QIEData"]);
 }
 
-std::unique_ptr<CastorChannelQuality> CastorTextCalibrations::produceChannelQuality (const CastorChannelQualityRcd& rcd) {
-  return produce_impl<CastorChannelQuality> (mInputs ["ChannelQuality"]);
+std::unique_ptr<CastorChannelQuality> CastorTextCalibrations::produceChannelQuality(const CastorChannelQualityRcd& rcd) {
+  return produce_impl<CastorChannelQuality>(mInputs["ChannelQuality"]);
 }
 
-std::unique_ptr<CastorElectronicsMap> CastorTextCalibrations::produceElectronicsMap (const CastorElectronicsMapRcd& rcd) {
-  return produce_impl<CastorElectronicsMap> (mInputs ["ElectronicsMap"]);
+std::unique_ptr<CastorElectronicsMap> CastorTextCalibrations::produceElectronicsMap(const CastorElectronicsMapRcd& rcd) {
+  return produce_impl<CastorElectronicsMap>(mInputs["ElectronicsMap"]);
 }
 
-std::unique_ptr<CastorRecoParams> CastorTextCalibrations::produceRecoParams (const CastorRecoParamsRcd& rcd) {
-  return produce_impl<CastorRecoParams> (mInputs ["RecoParams"]);
+std::unique_ptr<CastorRecoParams> CastorTextCalibrations::produceRecoParams(const CastorRecoParamsRcd& rcd) {
+  return produce_impl<CastorRecoParams>(mInputs["RecoParams"]);
 }
 
-std::unique_ptr<CastorSaturationCorrs> CastorTextCalibrations::produceSaturationCorrs (const CastorSaturationCorrsRcd& rcd) {
-  return produce_impl<CastorSaturationCorrs> (mInputs ["SaturationCorrs"]);
+std::unique_ptr<CastorSaturationCorrs> CastorTextCalibrations::produceSaturationCorrs(
+    const CastorSaturationCorrsRcd& rcd) {
+  return produce_impl<CastorSaturationCorrs>(mInputs["SaturationCorrs"]);
 }
diff --git a/CalibCalorimetry/CastorCalib/plugins/CastorTextCalibrations.h b/CalibCalorimetry/CastorCalib/plugins/CastorTextCalibrations.h
index 38f71c64f4205..a8206fcb7cefb 100644
--- a/CalibCalorimetry/CastorCalib/plugins/CastorTextCalibrations.h
+++ b/CalibCalorimetry/CastorCalib/plugins/CastorTextCalibrations.h
@@ -30,31 +30,28 @@ class CastorChannelQuality;
 class CastorRecoParams;
 class CastorSaturationCorrs;
 
-class CastorTextCalibrations : public edm::ESProducer,
-		       public edm::EventSetupRecordIntervalFinder
-{
+class CastorTextCalibrations : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
 public:
-  CastorTextCalibrations (const edm::ParameterSet& );
-  ~CastorTextCalibrations () override;
+  CastorTextCalibrations(const edm::ParameterSet&);
+  ~CastorTextCalibrations() override;
+
+  void produce(){};
 
-  void produce () {};
-  
 protected:
   void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
-			      const edm::IOVSyncValue& , 
-			      edm::ValidityInterval&) override ;
-
-  std::unique_ptr<CastorPedestals> producePedestals (const CastorPedestalsRcd& rcd);
-  std::unique_ptr<CastorPedestalWidths> producePedestalWidths (const CastorPedestalWidthsRcd& rcd);
-  std::unique_ptr<CastorGains> produceGains (const CastorGainsRcd& rcd);
-  std::unique_ptr<CastorGainWidths> produceGainWidths (const CastorGainWidthsRcd& rcd);
-  std::unique_ptr<CastorQIEData> produceQIEData (const CastorQIEDataRcd& rcd);
-  std::unique_ptr<CastorChannelQuality> produceChannelQuality (const CastorChannelQualityRcd& rcd);
-  std::unique_ptr<CastorElectronicsMap> produceElectronicsMap (const CastorElectronicsMapRcd& rcd);
-  std::unique_ptr<CastorRecoParams> produceRecoParams (const CastorRecoParamsRcd& rcd);
-  std::unique_ptr<CastorSaturationCorrs> produceSaturationCorrs (const CastorSaturationCorrsRcd& rcd);
-
- private:
-  std::map <std::string, std::string> mInputs;
+                      const edm::IOVSyncValue&,
+                      edm::ValidityInterval&) override;
+
+  std::unique_ptr<CastorPedestals> producePedestals(const CastorPedestalsRcd& rcd);
+  std::unique_ptr<CastorPedestalWidths> producePedestalWidths(const CastorPedestalWidthsRcd& rcd);
+  std::unique_ptr<CastorGains> produceGains(const CastorGainsRcd& rcd);
+  std::unique_ptr<CastorGainWidths> produceGainWidths(const CastorGainWidthsRcd& rcd);
+  std::unique_ptr<CastorQIEData> produceQIEData(const CastorQIEDataRcd& rcd);
+  std::unique_ptr<CastorChannelQuality> produceChannelQuality(const CastorChannelQualityRcd& rcd);
+  std::unique_ptr<CastorElectronicsMap> produceElectronicsMap(const CastorElectronicsMapRcd& rcd);
+  std::unique_ptr<CastorRecoParams> produceRecoParams(const CastorRecoParamsRcd& rcd);
+  std::unique_ptr<CastorSaturationCorrs> produceSaturationCorrs(const CastorSaturationCorrsRcd& rcd);
+
+private:
+  std::map<std::string, std::string> mInputs;
 };
-
diff --git a/CalibCalorimetry/CastorCalib/plugins/SealModule.cc b/CalibCalorimetry/CastorCalib/plugins/SealModule.cc
index d8a8f247c1082..acd045f7af1c5 100644
--- a/CalibCalorimetry/CastorCalib/plugins/SealModule.cc
+++ b/CalibCalorimetry/CastorCalib/plugins/SealModule.cc
@@ -5,7 +5,6 @@
 #include "CastorHardcodeCalibrations.h"
 #include "CastorTextCalibrations.h"
 
-
 DEFINE_FWK_EVENTSETUP_MODULE(CastorDbProducer);
 DEFINE_FWK_EVENTSETUP_SOURCE(CastorHardcodeCalibrations);
 DEFINE_FWK_EVENTSETUP_SOURCE(CastorTextCalibrations);
diff --git a/CalibCalorimetry/CastorCalib/src/CastorAlgoUtils.cc b/CalibCalorimetry/CastorCalib/src/CastorAlgoUtils.cc
index af3822161570a..69f8dd3a431a5 100644
--- a/CalibCalorimetry/CastorCalib/src/CastorAlgoUtils.cc
+++ b/CalibCalorimetry/CastorCalib/src/CastorAlgoUtils.cc
@@ -4,32 +4,39 @@
 namespace reco {
   namespace castor {
 
-    void getLinearizedADC(const CastorQIEShape& shape,
-		      const CastorQIECoder* coder,
-		      int bins,int capid,
-		      float& lo,
-		      float& hi){
-  
-      float low = coder->charge(shape,0,capid); 
-      float high = coder->charge(shape,bins-1,capid);
-      float step = (high-low)/(bins-1);
-      low -= step/2.0; high += step/2.0;
-      lo = low; hi = high;
+    void getLinearizedADC(
+        const CastorQIEShape& shape, const CastorQIECoder* coder, int bins, int capid, float& lo, float& hi) {
+      float low = coder->charge(shape, 0, capid);
+      float high = coder->charge(shape, bins - 1, capid);
+      float step = (high - low) / (bins - 1);
+      low -= step / 2.0;
+      high += step / 2.0;
+      lo = low;
+      hi = high;
       return;
     }
 
-    float maxDiff(float one, float two, float three, float four){
-      float max=-1000; float min = 1000;
-      if(one>max) max = one;
-      if(one<min) min = one;
-      if(two>max) max = two;
-      if(two<min) min = two;
-      if(three>max) max = three;
-      if(three<min) min = three;
-      if(four>max) max = four;
-      if(four<min) min = four;
-      return fabs(max-min);
+    float maxDiff(float one, float two, float three, float four) {
+      float max = -1000;
+      float min = 1000;
+      if (one > max)
+        max = one;
+      if (one < min)
+        min = one;
+      if (two > max)
+        max = two;
+      if (two < min)
+        min = two;
+      if (three > max)
+        max = three;
+      if (three < min)
+        min = three;
+      if (four > max)
+        max = four;
+      if (four < min)
+        min = four;
+      return fabs(max - min);
     }
 
-  }
-}
+  }  // namespace castor
+}  // namespace reco
diff --git a/CalibCalorimetry/CastorCalib/src/CastorDbASCIIIO.cc b/CalibCalorimetry/CastorCalib/src/CastorDbASCIIIO.cc
index 040a84594b396..366e77e4a1809 100644
--- a/CalibCalorimetry/CastorCalib/src/CastorDbASCIIIO.cc
+++ b/CalibCalorimetry/CastorCalib/src/CastorDbASCIIIO.cc
@@ -16,779 +16,931 @@
 namespace CastorDbASCIIIO {
   class DetIdLess {
   public:
-    bool operator () (DetId fFirst, DetId fSecond) const {
-      HcalGenericDetId first (fFirst);
-      HcalGenericDetId second (fSecond);
-      if (first.genericSubdet () != second.genericSubdet ()) return first.genericSubdet () < second.genericSubdet ();
-      if (first.isHcalDetId ()) {
-	HcalDetId f1 (first);
-	HcalDetId s1 (second);
-	return	f1.zside () != s1.zside () ? f1.zside () < s1.zside () :
-	  f1.iphi () != s1.iphi () ? f1.iphi () < s1.iphi () :
-	  f1.ietaAbs () != s1.ietaAbs () ? f1.ietaAbs () < s1.ietaAbs () :
-	  f1.depth () < s1.depth ();
-      }
-      else {
-	return first.rawId() < second.rawId();
+    bool operator()(DetId fFirst, DetId fSecond) const {
+      HcalGenericDetId first(fFirst);
+      HcalGenericDetId second(fSecond);
+      if (first.genericSubdet() != second.genericSubdet())
+        return first.genericSubdet() < second.genericSubdet();
+      if (first.isHcalDetId()) {
+        HcalDetId f1(first);
+        HcalDetId s1(second);
+        return f1.zside() != s1.zside()
+                   ? f1.zside() < s1.zside()
+                   : f1.iphi() != s1.iphi()
+                         ? f1.iphi() < s1.iphi()
+                         : f1.ietaAbs() != s1.ietaAbs() ? f1.ietaAbs() < s1.ietaAbs() : f1.depth() < s1.depth();
+      } else {
+        return first.rawId() < second.rawId();
       }
     }
   };
   class CastorElectronicsIdLess {
   public:
-    bool operator () (CastorElectronicsId first, CastorElectronicsId second) const {
-      return
-	first.readoutVMECrateId () != second.readoutVMECrateId () ? first.readoutVMECrateId () < second.readoutVMECrateId () :
-	first.htrSlot () != second.htrSlot () ? first.htrSlot () < second.htrSlot () :
-	first.htrTopBottom () != second.htrTopBottom () ? first.htrTopBottom () < second.htrTopBottom () :
-	first.fiberIndex () != second.fiberIndex () ? first.fiberIndex () < second.fiberIndex () :
-	first.fiberChanId () < second.fiberChanId ();
+    bool operator()(CastorElectronicsId first, CastorElectronicsId second) const {
+      return first.readoutVMECrateId() != second.readoutVMECrateId()
+                 ? first.readoutVMECrateId() < second.readoutVMECrateId()
+                 : first.htrSlot() != second.htrSlot()
+                       ? first.htrSlot() < second.htrSlot()
+                       : first.htrTopBottom() != second.htrTopBottom()
+                             ? first.htrTopBottom() < second.htrTopBottom()
+                             : first.fiberIndex() != second.fiberIndex() ? first.fiberIndex() < second.fiberIndex()
+                                                                         : first.fiberChanId() < second.fiberChanId();
     }
   };
 
-std::vector <std::string> splitString (const std::string& fLine) {
-  std::vector <std::string> result;
-  int start = 0;
-  bool empty = true;
-  for (unsigned i = 0; i <= fLine.size (); i++) {
-    if (fLine [i] == ' ' || i == fLine.size ()) {
-      if (!empty) {
-	std::string item (fLine, start, i-start);
-	result.push_back (item);
-	empty = true;
+  std::vector<std::string> splitString(const std::string& fLine) {
+    std::vector<std::string> result;
+    int start = 0;
+    bool empty = true;
+    for (unsigned i = 0; i <= fLine.size(); i++) {
+      if (fLine[i] == ' ' || i == fLine.size()) {
+        if (!empty) {
+          std::string item(fLine, start, i - start);
+          result.push_back(item);
+          empty = true;
+        }
+        start = i + 1;
+      } else {
+        if (empty)
+          empty = false;
       }
-      start = i+1;
-    }
-    else {
-      if (empty) empty = false;
     }
+    return result;
+  }
+
+  DetId getId(const std::vector<std::string>& items) {
+    CastorText2DetIdConverter converter(items[3], items[0], items[1], items[2]);
+    return converter.getId();
+  }
+
+  void dumpId(std::ostream& fOutput, DetId id) {
+    CastorText2DetIdConverter converter(id);
+    char buffer[1024];
+    sprintf(buffer,
+            "  %15s %15s %15s %15s",
+            converter.getField1().c_str(),
+            converter.getField2().c_str(),
+            converter.getField3().c_str(),
+            converter.getFlavor().c_str());
+    fOutput << buffer;
   }
-  return result;
-}
-
-DetId getId (const std::vector <std::string> & items) {
-  CastorText2DetIdConverter converter (items [3], items [0], items [1], items [2]);
-  return converter.getId ();
-}
-
-void dumpId (std::ostream& fOutput, DetId id) {
-  CastorText2DetIdConverter converter (id);
-  char buffer [1024];
-  sprintf (buffer, "  %15s %15s %15s %15s",
-	   converter.getField1 ().c_str (), converter.getField2 ().c_str (), converter.getField3 ().c_str (),converter.getFlavor ().c_str ());  
-  fOutput << buffer;
-}
-
-template <class S,class T> 
-bool getCastorObject (std::istream& fInput, T& fObject) {
-  char buffer [1024];
-  while (fInput.getline(buffer, 1024)) {
-    if (buffer [0] == '#') continue; //ignore comment
-    std::vector <std::string> items = splitString (std::string (buffer));
-    if (items.empty()) continue; // blank line
-    if (items.size () < 8) {
-      edm::LogWarning("Format Error") << "Bad line: " << buffer << "\n line must contain 8 items: eta, phi, depth, subdet, 4x values" << std::endl;
-      continue;
+
+  template <class S, class T>
+  bool getCastorObject(std::istream& fInput, T& fObject) {
+    char buffer[1024];
+    while (fInput.getline(buffer, 1024)) {
+      if (buffer[0] == '#')
+        continue;  //ignore comment
+      std::vector<std::string> items = splitString(std::string(buffer));
+      if (items.empty())
+        continue;  // blank line
+      if (items.size() < 8) {
+        edm::LogWarning("Format Error") << "Bad line: " << buffer
+                                        << "\n line must contain 8 items: eta, phi, depth, subdet, 4x values"
+                                        << std::endl;
+        continue;
+      }
+      DetId id = getId(items);
+
+      //    if (fObject->exists(id) )
+      //      edm::LogWarning("Redefining Channel") << "line: " << buffer << "\n attempts to redefine data. Ignored" << std::endl;
+      //    else
+      //      {
+      S fCondObject(id, atof(items[4].c_str()), atof(items[5].c_str()), atof(items[6].c_str()), atof(items[7].c_str()));
+      fObject.addValues(fCondObject);
+      //      }
     }
-    DetId id = getId (items);
-    
-//    if (fObject->exists(id) )
-//      edm::LogWarning("Redefining Channel") << "line: " << buffer << "\n attempts to redefine data. Ignored" << std::endl;
-//    else
-//      {
-    S fCondObject(id, atof (items [4].c_str()), atof (items [5].c_str()), atof (items [6].c_str()), atof (items [7].c_str()));
-    fObject.addValues(fCondObject);
-	//      }
+
+    return true;
   }
 
-  return true;
-}
-
-template <class T>
-bool dumpCastorObject (std::ostream& fOutput, const T& fObject) {
-  char buffer [1024];
-  sprintf (buffer, "# %15s %15s %15s %15s %8s %8s %8s %8s %10s\n", "eta", "phi", "dep", "det", "cap0", "cap1", "cap2", "cap3", "DetId");
-  fOutput << buffer;
-  std::vector<DetId> channels = fObject.getAllChannels ();
-  //std::sort (channels.begin(), channels.end(), DetIdLess ());
-  for (std::vector<DetId>::iterator channel = channels.begin ();
-       channel !=  channels.end ();
-       ++channel) {
-    const float* values = fObject.getValues (*channel)->getValues ();
-    if (values) {
-      dumpId (fOutput, *channel);
-      sprintf (buffer, " %8.5f %8.5f %8.5f %8.5f %10X\n",
-	       values[0], values[1], values[2], values[3], channel->rawId ());
-      fOutput << buffer;
+  template <class T>
+  bool dumpCastorObject(std::ostream& fOutput, const T& fObject) {
+    char buffer[1024];
+    sprintf(buffer,
+            "# %15s %15s %15s %15s %8s %8s %8s %8s %10s\n",
+            "eta",
+            "phi",
+            "dep",
+            "det",
+            "cap0",
+            "cap1",
+            "cap2",
+            "cap3",
+            "DetId");
+    fOutput << buffer;
+    std::vector<DetId> channels = fObject.getAllChannels();
+    //std::sort (channels.begin(), channels.end(), DetIdLess ());
+    for (std::vector<DetId>::iterator channel = channels.begin(); channel != channels.end(); ++channel) {
+      const float* values = fObject.getValues(*channel)->getValues();
+      if (values) {
+        dumpId(fOutput, *channel);
+        sprintf(
+            buffer, " %8.5f %8.5f %8.5f %8.5f %10X\n", values[0], values[1], values[2], values[3], channel->rawId());
+        fOutput << buffer;
+      }
     }
+    return true;
   }
-  return true;
-}
-
-template <class S,class T> 
-bool getCastorSingleFloatObject (std::istream& fInput, T& fObject) {
-  char buffer [1024];
-  while (fInput.getline(buffer, 1024)) {
-    if (buffer [0] == '#') continue; //ignore comment
-    std::vector <std::string> items = splitString (std::string (buffer));
-    if (items.empty()) continue; // blank line
-    if (items.size () < 5) {
-      edm::LogWarning("Format Error") << "Bad line: " << buffer << "\n line must contain 5 items: eta, phi, depth, subdet, value" << std::endl;
-      continue;
+
+  template <class S, class T>
+  bool getCastorSingleFloatObject(std::istream& fInput, T& fObject) {
+    char buffer[1024];
+    while (fInput.getline(buffer, 1024)) {
+      if (buffer[0] == '#')
+        continue;  //ignore comment
+      std::vector<std::string> items = splitString(std::string(buffer));
+      if (items.empty())
+        continue;  // blank line
+      if (items.size() < 5) {
+        edm::LogWarning("Format Error") << "Bad line: " << buffer
+                                        << "\n line must contain 5 items: eta, phi, depth, subdet, value" << std::endl;
+        continue;
+      }
+      DetId id = getId(items);
+
+      //    if (fObject->exists(id) )
+      //      edm::LogWarning("Redefining Channel") << "line: " << buffer << "\n attempts to redefine data. Ignored" << std::endl;
+      //    else
+      //      {
+      S fCondObject(id, atof(items[4].c_str()));
+      fObject.addValues(fCondObject);
+      //      }
     }
-    DetId id = getId (items);
-    
-//    if (fObject->exists(id) )
-//      edm::LogWarning("Redefining Channel") << "line: " << buffer << "\n attempts to redefine data. Ignored" << std::endl;
-//    else
-//      {
-    S fCondObject(id, atof (items [4].c_str()) );
-    fObject.addValues(fCondObject);
-    //      }
+    return true;
   }
-  return true;
-}
-
-template <class T>
-bool dumpCastorSingleFloatObject (std::ostream& fOutput, const T& fObject) {
-  char buffer [1024];
-  sprintf (buffer, "# %15s %15s %15s %15s %8s %10s\n", "eta", "phi", "dep", "det", "value", "DetId");
-  fOutput << buffer;
-  std::vector<DetId> channels = fObject.getAllChannels ();
-  std::sort (channels.begin(), channels.end(), DetIdLess ());
-  for (std::vector<DetId>::iterator channel = channels.begin ();
-       channel !=  channels.end ();
-       ++channel) {
-    const float value = fObject.getValues (*channel)->getValue ();
-    dumpId (fOutput, *channel);
-    sprintf (buffer, " %8.5f %10X\n",
-	     value, channel->rawId ());
+
+  template <class T>
+  bool dumpCastorSingleFloatObject(std::ostream& fOutput, const T& fObject) {
+    char buffer[1024];
+    sprintf(buffer, "# %15s %15s %15s %15s %8s %10s\n", "eta", "phi", "dep", "det", "value", "DetId");
     fOutput << buffer;
+    std::vector<DetId> channels = fObject.getAllChannels();
+    std::sort(channels.begin(), channels.end(), DetIdLess());
+    for (std::vector<DetId>::iterator channel = channels.begin(); channel != channels.end(); ++channel) {
+      const float value = fObject.getValues(*channel)->getValue();
+      dumpId(fOutput, *channel);
+      sprintf(buffer, " %8.5f %10X\n", value, channel->rawId());
+      fOutput << buffer;
+    }
+    return true;
   }
-  return true;
-}
-
-template <class S,class T> 
-bool getCastorSingleIntObject (std::istream& fInput, T& fObject, S* fCondObject) {
-  char buffer [1024];
-  while (fInput.getline(buffer, 1024)) {
-    if (buffer [0] == '#') continue; //ignore comment
-    std::vector <std::string> items = splitString (std::string (buffer));
-    if (items.empty()) continue; // blank line
-    if (items.size () < 5) {
-      edm::LogWarning("Format Error") << "Bad line: " << buffer << "\n line must contain 5 items: eta, phi, depth, subdet, value" << std::endl;
-      continue;
+
+  template <class S, class T>
+  bool getCastorSingleIntObject(std::istream& fInput, T& fObject, S* fCondObject) {
+    char buffer[1024];
+    while (fInput.getline(buffer, 1024)) {
+      if (buffer[0] == '#')
+        continue;  //ignore comment
+      std::vector<std::string> items = splitString(std::string(buffer));
+      if (items.empty())
+        continue;  // blank line
+      if (items.size() < 5) {
+        edm::LogWarning("Format Error") << "Bad line: " << buffer
+                                        << "\n line must contain 5 items: eta, phi, depth, subdet, value" << std::endl;
+        continue;
+      }
+      DetId id = getId(items);
+
+      //    if (fObject->exists(id) )
+      //      edm::LogWarning("Redefining Channel") << "line: " << buffer << "\n attempts to redefine data. Ignored" << std::endl;
+      //    else
+      //      {
+      fCondObject = new S(id, atoi(items[4].c_str()));
+      fObject.addValues(*fCondObject);
+      delete fCondObject;
+      //      }
     }
-    DetId id = getId (items);
-    
-//    if (fObject->exists(id) )
-//      edm::LogWarning("Redefining Channel") << "line: " << buffer << "\n attempts to redefine data. Ignored" << std::endl;
-//    else
-//      {
-	fCondObject = new S(id, atoi (items [4].c_str()) );
-	fObject.addValues(*fCondObject);
-	delete fCondObject;
-	//      }
+    return true;
   }
-  return true;
-}
-
-template <class T>
-bool dumpCastorSingleIntObject (std::ostream& fOutput, const T& fObject) {
-  char buffer [1024];
-  sprintf (buffer, "# %15s %15s %15s %15s %8s %10s\n", "eta", "phi", "dep", "det", "value", "DetId");
-  fOutput << buffer;
-  std::vector<DetId> channels = fObject.getAllChannels ();
-  std::sort (channels.begin(), channels.end(), DetIdLess ());
-  for (std::vector<DetId>::iterator channel = channels.begin ();
-       channel !=  channels.end ();
-       ++channel) {
-    const int value = fObject.getValues (*channel)->getValue ();
-    dumpId (fOutput, *channel);
-    sprintf (buffer, " %15d %10X\n",
-	     value, channel->rawId ());
+
+  template <class T>
+  bool dumpCastorSingleIntObject(std::ostream& fOutput, const T& fObject) {
+    char buffer[1024];
+    sprintf(buffer, "# %15s %15s %15s %15s %8s %10s\n", "eta", "phi", "dep", "det", "value", "DetId");
     fOutput << buffer;
-  }
-  return true;
-}
-
-
-bool getObject (std::istream& fInput, CastorGains& fObject) {return getCastorObject<CastorGain> (fInput, fObject);}
-bool dumpObject (std::ostream& fOutput, const CastorGains& fObject) {return dumpCastorObject (fOutput, fObject);}
-bool getObject (std::istream& fInput, CastorGainWidths& fObject) {return getCastorObject<CastorGainWidth> (fInput, fObject);}
-bool dumpObject (std::ostream& fOutput, const CastorGainWidths& fObject) {return dumpCastorObject (fOutput, fObject);}
-
-bool getObject (std::istream& fInput, CastorSaturationCorrs& fObject) {return getCastorSingleFloatObject<CastorSaturationCorr> (fInput, fObject);}
-bool dumpObject (std::ostream& fOutput, const CastorSaturationCorrs& fObject) {return dumpCastorSingleFloatObject (fOutput, fObject);}
-
-
-
-// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-bool getObject (std::istream& fInput, CastorPedestals& fObject) {
-  char buffer [1024];
-
-  while (fInput.getline(buffer, 1024)) {
-    std::vector <std::string> items = splitString (std::string (buffer));
-    if (items.empty()) continue; // blank line
-    else {
-      if (items[0] == "#U")
-	{
-	  if (items[1] == (std::string)"ADC") fObject.setUnitADC(true);
-	    else if (items[1] == (std::string)"fC") fObject.setUnitADC(false);
-	  else 
-	    {
-	      edm::LogWarning("Pedestal Unit Error") << "Unrecognized unit for pedestals. Assuming fC." << std::endl;
-	      fObject.setUnitADC(false);
-	    }
-	  break;
-	}
-      else
-	{
-	  edm::LogWarning("Pedestal Unit Missing") << "The unit for the pedestals is missing in the txt file." << std::endl;
-	  return false;
-	}
+    std::vector<DetId> channels = fObject.getAllChannels();
+    std::sort(channels.begin(), channels.end(), DetIdLess());
+    for (std::vector<DetId>::iterator channel = channels.begin(); channel != channels.end(); ++channel) {
+      const int value = fObject.getValues(*channel)->getValue();
+      dumpId(fOutput, *channel);
+      sprintf(buffer, " %15d %10X\n", value, channel->rawId());
+      fOutput << buffer;
     }
+    return true;
+  }
+
+  bool getObject(std::istream& fInput, CastorGains& fObject) { return getCastorObject<CastorGain>(fInput, fObject); }
+  bool dumpObject(std::ostream& fOutput, const CastorGains& fObject) { return dumpCastorObject(fOutput, fObject); }
+  bool getObject(std::istream& fInput, CastorGainWidths& fObject) {
+    return getCastorObject<CastorGainWidth>(fInput, fObject);
+  }
+  bool dumpObject(std::ostream& fOutput, const CastorGainWidths& fObject) { return dumpCastorObject(fOutput, fObject); }
+
+  bool getObject(std::istream& fInput, CastorSaturationCorrs& fObject) {
+    return getCastorSingleFloatObject<CastorSaturationCorr>(fInput, fObject);
+  }
+  bool dumpObject(std::ostream& fOutput, const CastorSaturationCorrs& fObject) {
+    return dumpCastorSingleFloatObject(fOutput, fObject);
   }
-  while (fInput.getline(buffer, 1024)) {
-    if (buffer [0] == '#') continue;
-    std::vector <std::string> items = splitString (std::string (buffer));
-    if (items.empty()) continue; // blank line
-    if (items.size () < 8) {
-      edm::LogWarning("Format Error") << "Bad line: " << buffer << "\n line must contain 8 items: eta, phi, depth, subdet, 4x values" 
-				      << " or 12 items: eta, phi, depth, subdet, 4x values for mean, 4x values for width"
-				      << std::endl;
-      continue;
+
+  // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+  bool getObject(std::istream& fInput, CastorPedestals& fObject) {
+    char buffer[1024];
+
+    while (fInput.getline(buffer, 1024)) {
+      std::vector<std::string> items = splitString(std::string(buffer));
+      if (items.empty())
+        continue;  // blank line
+      else {
+        if (items[0] == "#U") {
+          if (items[1] == (std::string) "ADC")
+            fObject.setUnitADC(true);
+          else if (items[1] == (std::string) "fC")
+            fObject.setUnitADC(false);
+          else {
+            edm::LogWarning("Pedestal Unit Error") << "Unrecognized unit for pedestals. Assuming fC." << std::endl;
+            fObject.setUnitADC(false);
+          }
+          break;
+        } else {
+          edm::LogWarning("Pedestal Unit Missing")
+              << "The unit for the pedestals is missing in the txt file." << std::endl;
+          return false;
+        }
+      }
     }
-    DetId id = getId (items);
-    
-//    if (fObject.exists(id) )
-//      edm::LogWarning("Redefining Channel") << "line: " << buffer << "\n attempts to redefine data. Ignored" << std::endl;
-//    else
-//      {
-
-    if (items.size() < 12) // old format without widths
-      {
-	CastorPedestal fCondObject(id, atof (items [4].c_str()), atof (items [5].c_str()), 
-                                   atof (items [6].c_str()), atof (items [7].c_str()), 
-                                   0., 0., 0., 0. );
-	fObject.addValues(fCondObject);
+    while (fInput.getline(buffer, 1024)) {
+      if (buffer[0] == '#')
+        continue;
+      std::vector<std::string> items = splitString(std::string(buffer));
+      if (items.empty())
+        continue;  // blank line
+      if (items.size() < 8) {
+        edm::LogWarning("Format Error")
+            << "Bad line: " << buffer << "\n line must contain 8 items: eta, phi, depth, subdet, 4x values"
+            << " or 12 items: eta, phi, depth, subdet, 4x values for mean, 4x values for width" << std::endl;
+        continue;
       }
-    else // new format with widths
+      DetId id = getId(items);
+
+      //    if (fObject.exists(id) )
+      //      edm::LogWarning("Redefining Channel") << "line: " << buffer << "\n attempts to redefine data. Ignored" << std::endl;
+      //    else
+      //      {
+
+      if (items.size() < 12)  // old format without widths
+      {
+        CastorPedestal fCondObject(id,
+                                   atof(items[4].c_str()),
+                                   atof(items[5].c_str()),
+                                   atof(items[6].c_str()),
+                                   atof(items[7].c_str()),
+                                   0.,
+                                   0.,
+                                   0.,
+                                   0.);
+        fObject.addValues(fCondObject);
+      } else  // new format with widths
       {
-	CastorPedestal fCondObject(id, atof (items [4].c_str()), atof (items [5].c_str()), 
-                                   atof (items [6].c_str()), atof (items [7].c_str()), 
-                                   atof (items [8].c_str()), atof (items [9].c_str()),
-                                   atof (items [10].c_str()), atof (items [11].c_str()) );
-	fObject.addValues(fCondObject);
+        CastorPedestal fCondObject(id,
+                                   atof(items[4].c_str()),
+                                   atof(items[5].c_str()),
+                                   atof(items[6].c_str()),
+                                   atof(items[7].c_str()),
+                                   atof(items[8].c_str()),
+                                   atof(items[9].c_str()),
+                                   atof(items[10].c_str()),
+                                   atof(items[11].c_str()));
+        fObject.addValues(fCondObject);
       }
 
-	//      }
-  }
-  return true;
-}
-
-
-bool dumpObject (std::ostream& fOutput, const CastorPedestals& fObject) {
-  char buffer [1024];
-  if (fObject.isADC() ) sprintf (buffer, "#U ADC  << this is the unit \n");
-  else  sprintf (buffer, "#U fC  << this is the unit \n");
-  fOutput << buffer;
-
-  sprintf (buffer, "# %15s %15s %15s %15s %8s %8s %8s %8s %8s %8s %8s %8s %10s\n", "eta", "phi", "dep", "det", "cap0", "cap1", "cap2", "cap3", "widthcap0", "widthcap1", "widthcap2", "widthcap3", "DetId");
-  fOutput << buffer;
-
-  std::vector<DetId> channels = fObject.getAllChannels ();
-  std::sort (channels.begin(), channels.end(), DetIdLess ());
-  for (std::vector<DetId>::iterator channel = channels.begin ();
-       channel !=  channels.end ();
-       ++channel) {
-    const float* values = fObject.getValues (*channel)->getValues ();
-    if (values) {
-      dumpId (fOutput, *channel);
-      sprintf (buffer, " %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %10X\n",
-	       values[0], values[1], values[2], values[3], values[4], values[5], values[6], values[7], channel->rawId ());
-      fOutput << buffer;
+      //      }
     }
+    return true;
   }
-  return true;
-}
-
-
-// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-bool getObject (std::istream& fInput, CastorChannelQuality& fObject) 
-{
-  char buffer [1024];
-  while (fInput.getline(buffer, 1024)) {
-    if (buffer [0] == '#') continue; //ignore comment
-    std::vector <std::string> items = splitString (std::string (buffer));
-    if (items.empty()) continue; // blank line
-    if (items.size () < 5) {
-      edm::LogWarning("Format Error") << "Bad line: " << buffer << "\n line must contain 5 items: eta, phi, depth, subdet, GOOD/BAD/HOT/DEAD" << std::endl;
-      continue;
-    }
-    DetId id = getId (items);
-    
-    if (fObject.exists(id) ) {
-      edm::LogWarning("Redefining Channel") << "line: " << buffer << "\n attempts to redefine data. Ignored" << std::endl;
-      continue;
-    }
-//    else
-//      {
-    uint32_t mystatus;
-    std::unique_ptr<CastorChannelStatus> fCondObject;
-    if (items[4].substr(0,2)=="0x") {
-       sscanf(items[4].c_str(),"%X", &mystatus);
-       fCondObject = std::make_unique<CastorChannelStatus>(id,mystatus);
-    }
-    else if (isalpha(items[4].c_str()[0])) {
-       fCondObject = std::make_unique<CastorChannelStatus>(id, items[4]);
+
+  bool dumpObject(std::ostream& fOutput, const CastorPedestals& fObject) {
+    char buffer[1024];
+    if (fObject.isADC())
+      sprintf(buffer, "#U ADC  << this is the unit \n");
+    else
+      sprintf(buffer, "#U fC  << this is the unit \n");
+    fOutput << buffer;
+
+    sprintf(buffer,
+            "# %15s %15s %15s %15s %8s %8s %8s %8s %8s %8s %8s %8s %10s\n",
+            "eta",
+            "phi",
+            "dep",
+            "det",
+            "cap0",
+            "cap1",
+            "cap2",
+            "cap3",
+            "widthcap0",
+            "widthcap1",
+            "widthcap2",
+            "widthcap3",
+            "DetId");
+    fOutput << buffer;
+
+    std::vector<DetId> channels = fObject.getAllChannels();
+    std::sort(channels.begin(), channels.end(), DetIdLess());
+    for (std::vector<DetId>::iterator channel = channels.begin(); channel != channels.end(); ++channel) {
+      const float* values = fObject.getValues(*channel)->getValues();
+      if (values) {
+        dumpId(fOutput, *channel);
+        sprintf(buffer,
+                " %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %10X\n",
+                values[0],
+                values[1],
+                values[2],
+                values[3],
+                values[4],
+                values[5],
+                values[6],
+                values[7],
+                channel->rawId());
+        fOutput << buffer;
+      }
     }
-    else {
-       sscanf(items[4].c_str(),"%u", &mystatus);
-       fCondObject = std::make_unique<CastorChannelStatus>(id,mystatus);
+    return true;
+  }
+
+  // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+  bool getObject(std::istream& fInput, CastorChannelQuality& fObject) {
+    char buffer[1024];
+    while (fInput.getline(buffer, 1024)) {
+      if (buffer[0] == '#')
+        continue;  //ignore comment
+      std::vector<std::string> items = splitString(std::string(buffer));
+      if (items.empty())
+        continue;  // blank line
+      if (items.size() < 5) {
+        edm::LogWarning("Format Error") << "Bad line: " << buffer
+                                        << "\n line must contain 5 items: eta, phi, depth, subdet, GOOD/BAD/HOT/DEAD"
+                                        << std::endl;
+        continue;
+      }
+      DetId id = getId(items);
+
+      if (fObject.exists(id)) {
+        edm::LogWarning("Redefining Channel")
+            << "line: " << buffer << "\n attempts to redefine data. Ignored" << std::endl;
+        continue;
+      }
+      //    else
+      //      {
+      uint32_t mystatus;
+      std::unique_ptr<CastorChannelStatus> fCondObject;
+      if (items[4].substr(0, 2) == "0x") {
+        sscanf(items[4].c_str(), "%X", &mystatus);
+        fCondObject = std::make_unique<CastorChannelStatus>(id, mystatus);
+      } else if (isalpha(items[4].c_str()[0])) {
+        fCondObject = std::make_unique<CastorChannelStatus>(id, items[4]);
+      } else {
+        sscanf(items[4].c_str(), "%u", &mystatus);
+        fCondObject = std::make_unique<CastorChannelStatus>(id, mystatus);
+      }
+      fObject.addValues(*fCondObject);
+      //      }
     }
-    fObject.addValues(*fCondObject);
-	//      }
+    return true;
   }
-  return true;
-}
-
-
-bool dumpObject (std::ostream& fOutput, const CastorChannelQuality& fObject) {
-  char buffer [1024];
-  sprintf (buffer, "# %15s %15s %15s %15s %15s %10s\n", "eta", "phi", "dep", "det", "value", "DetId");
-  fOutput << buffer;
-  std::vector<DetId> channels = fObject.getAllChannels ();
-  std::sort (channels.begin(), channels.end(), DetIdLess ());
-  for (std::vector<DetId>::iterator channel = channels.begin ();
-       channel !=  channels.end ();
-       ++channel) {
-    const int value = fObject.getValues (*channel)->getValue ();
-    dumpId (fOutput, *channel);
-    sprintf (buffer, " %15X %10X\n",
-	     value, channel->rawId ());
+
+  bool dumpObject(std::ostream& fOutput, const CastorChannelQuality& fObject) {
+    char buffer[1024];
+    sprintf(buffer, "# %15s %15s %15s %15s %15s %10s\n", "eta", "phi", "dep", "det", "value", "DetId");
     fOutput << buffer;
-  }
-  return true;
-}
-
-
-// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-bool getObject (std::istream& fInput, CastorPedestalWidths& fObject) {
-  char buffer [1024];
-  int linecounter = 0;
-
-  while (fInput.getline(buffer, 1024)) {
-    linecounter++;
-    std::vector <std::string> items = splitString (std::string (buffer));
-    if (items.empty()) continue; // blank line
-    else {
-      if (items[0] == (std::string)"#U")
-	{
-	  if (items[1] == (std::string)"ADC") fObject.setUnitADC(true); 
-	  else if (items[1] == (std::string)"fC") fObject.setUnitADC(false);
-	  else 
-	    {
-	      edm::LogWarning("Pedestal Width Unit Error") << "Unrecognized unit for pedestal widths. Assuming fC." << std::endl;
-	      fObject.setUnitADC(false);
-	    }
-	  break;
-	}
-      else
-	{
-	  edm::LogWarning("Pedestal Width Unit Missing") << "The unit for the pedestal widths is missing in the txt file." << std::endl;
-	  return false;
-	}
+    std::vector<DetId> channels = fObject.getAllChannels();
+    std::sort(channels.begin(), channels.end(), DetIdLess());
+    for (std::vector<DetId>::iterator channel = channels.begin(); channel != channels.end(); ++channel) {
+      const int value = fObject.getValues(*channel)->getValue();
+      dumpId(fOutput, *channel);
+      sprintf(buffer, " %15X %10X\n", value, channel->rawId());
+      fOutput << buffer;
     }
+    return true;
   }
 
-  while (fInput.getline(buffer, 1024)) {
-    linecounter++;
-    if (buffer [0] == '#') continue; //ignore comment
-    std::vector <std::string> items = splitString (std::string (buffer));
-    if (items.empty()) continue; // blank line
-    if (items.size () < 14) {
-      edm::LogWarning("Format Error") << "Bad line: " << buffer << "\n line number: " << linecounter << "\n line must contain 14 items: eta, phi, depth, subdet, 10x correlations" 
-				      << " or 20 items: eta, phi, depth, subdet, 16x correlations" 
-				      << std::endl;
-      continue;
+  // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+  bool getObject(std::istream& fInput, CastorPedestalWidths& fObject) {
+    char buffer[1024];
+    int linecounter = 0;
+
+    while (fInput.getline(buffer, 1024)) {
+      linecounter++;
+      std::vector<std::string> items = splitString(std::string(buffer));
+      if (items.empty())
+        continue;  // blank line
+      else {
+        if (items[0] == (std::string) "#U") {
+          if (items[1] == (std::string) "ADC")
+            fObject.setUnitADC(true);
+          else if (items[1] == (std::string) "fC")
+            fObject.setUnitADC(false);
+          else {
+            edm::LogWarning("Pedestal Width Unit Error")
+                << "Unrecognized unit for pedestal widths. Assuming fC." << std::endl;
+            fObject.setUnitADC(false);
+          }
+          break;
+        } else {
+          edm::LogWarning("Pedestal Width Unit Missing")
+              << "The unit for the pedestal widths is missing in the txt file." << std::endl;
+          return false;
+        }
+      }
     }
-    DetId id = getId (items);
 
-//    if (fObject.exists(id) )
-//      edm::LogWarning("Redefining Channel") << "line: " << buffer << "\n attempts to redefine data. Ignored" << std::endl;
-//    else
-//      {
+    while (fInput.getline(buffer, 1024)) {
+      linecounter++;
+      if (buffer[0] == '#')
+        continue;  //ignore comment
+      std::vector<std::string> items = splitString(std::string(buffer));
+      if (items.empty())
+        continue;  // blank line
+      if (items.size() < 14) {
+        edm::LogWarning("Format Error") << "Bad line: " << buffer << "\n line number: " << linecounter
+                                        << "\n line must contain 14 items: eta, phi, depth, subdet, 10x correlations"
+                                        << " or 20 items: eta, phi, depth, subdet, 16x correlations" << std::endl;
+        continue;
+      }
+      DetId id = getId(items);
+
+      //    if (fObject.exists(id) )
+      //      edm::LogWarning("Redefining Channel") << "line: " << buffer << "\n attempts to redefine data. Ignored" << std::endl;
+      //    else
+      //      {
 
-    if (items.size() < 20) //old format
+      if (items.size() < 20)  //old format
       {
-	CastorPedestalWidth values(id);
-	values.setSigma (0, 0, atof (items [4].c_str()));
-	values.setSigma (1, 0, atof (items [5].c_str()));
-	values.setSigma (1, 1, atof (items [6].c_str()));
-	values.setSigma (2, 0, atof (items [7].c_str()));
-	values.setSigma (2, 1, atof (items [8].c_str()));
-	values.setSigma (2, 2, atof (items [9].c_str()));
-	values.setSigma (3, 0, atof (items [10].c_str()));
-	values.setSigma (3, 1, atof (items [11].c_str()));
-	values.setSigma (3, 2, atof (items [12].c_str()));
-	values.setSigma (3, 3, atof (items [13].c_str()));
-	values.setSigma (0, 1, 0.);
-	values.setSigma (0, 2, 0.);
-	values.setSigma (0, 3, 0.);
-	values.setSigma (1, 2, 0.);
-	values.setSigma (1, 3, 0.);
-	values.setSigma (2, 3, 0.);
-	fObject.addValues(values);	
-      }
-    else // new format
+        CastorPedestalWidth values(id);
+        values.setSigma(0, 0, atof(items[4].c_str()));
+        values.setSigma(1, 0, atof(items[5].c_str()));
+        values.setSigma(1, 1, atof(items[6].c_str()));
+        values.setSigma(2, 0, atof(items[7].c_str()));
+        values.setSigma(2, 1, atof(items[8].c_str()));
+        values.setSigma(2, 2, atof(items[9].c_str()));
+        values.setSigma(3, 0, atof(items[10].c_str()));
+        values.setSigma(3, 1, atof(items[11].c_str()));
+        values.setSigma(3, 2, atof(items[12].c_str()));
+        values.setSigma(3, 3, atof(items[13].c_str()));
+        values.setSigma(0, 1, 0.);
+        values.setSigma(0, 2, 0.);
+        values.setSigma(0, 3, 0.);
+        values.setSigma(1, 2, 0.);
+        values.setSigma(1, 3, 0.);
+        values.setSigma(2, 3, 0.);
+        fObject.addValues(values);
+      } else  // new format
       {
-	CastorPedestalWidth values(id);
-	values.setSigma (0, 0, atof (items [4].c_str()) );
-	values.setSigma (0, 1, atof (items [5].c_str()) );
-	values.setSigma (0, 2, atof (items [6].c_str()) );
-	values.setSigma (0, 3, atof (items [7].c_str()) );
-	values.setSigma (1, 0, atof (items [8].c_str()) );
-	values.setSigma (1, 1, atof (items [9].c_str()) );
-	values.setSigma (1, 2, atof (items [10].c_str()) );
-	values.setSigma (1, 3, atof (items [11].c_str()) );
-	values.setSigma (2, 0, atof (items [12].c_str()) );
-	values.setSigma (2, 1, atof (items [13].c_str()) );
-	values.setSigma (2, 2, atof (items [14].c_str()) );
-	values.setSigma (2, 3, atof (items [15].c_str()) );
-	values.setSigma (3, 0, atof (items [16].c_str()) );
-	values.setSigma (3, 1, atof (items [17].c_str()) );
-	values.setSigma (3, 2, atof (items [18].c_str()) );
-	values.setSigma (3, 3, atof (items [19].c_str()) );
-	fObject.addValues(values);	
+        CastorPedestalWidth values(id);
+        values.setSigma(0, 0, atof(items[4].c_str()));
+        values.setSigma(0, 1, atof(items[5].c_str()));
+        values.setSigma(0, 2, atof(items[6].c_str()));
+        values.setSigma(0, 3, atof(items[7].c_str()));
+        values.setSigma(1, 0, atof(items[8].c_str()));
+        values.setSigma(1, 1, atof(items[9].c_str()));
+        values.setSigma(1, 2, atof(items[10].c_str()));
+        values.setSigma(1, 3, atof(items[11].c_str()));
+        values.setSigma(2, 0, atof(items[12].c_str()));
+        values.setSigma(2, 1, atof(items[13].c_str()));
+        values.setSigma(2, 2, atof(items[14].c_str()));
+        values.setSigma(2, 3, atof(items[15].c_str()));
+        values.setSigma(3, 0, atof(items[16].c_str()));
+        values.setSigma(3, 1, atof(items[17].c_str()));
+        values.setSigma(3, 2, atof(items[18].c_str()));
+        values.setSigma(3, 3, atof(items[19].c_str()));
+        fObject.addValues(values);
       }
 
-	//      }
-  }
-  return true;
-}
-
-bool dumpObject (std::ostream& fOutput, const CastorPedestalWidths& fObject) {
-  char buffer [1024];
-  if (fObject.isADC() ) sprintf (buffer, "#U ADC  << this is the unit \n");
-  else  sprintf (buffer, "#U fC  << this is the unit \n");
-  fOutput << buffer;
-
-  sprintf (buffer, "# %15s %15s %15s %15s %8s %8s %8s %8s %8s %8s %8s %8s %8s %8s %8s %8s %8s %8s %8s %8s %10s\n", 
-	   "eta", "phi", "dep", "det", 
-	   "cov_0_0", "cov_0_1", "cov_0_2", "cov_0_3", "cov_1_0", "cov_1_1", "cov_1_2", "cov_1_3", "cov_2_0", "cov_2_1", "cov_2_2", "cov_2_3", "cov_3_0", "cov_3_1", "cov_3_2", "cov_3_3", 
-	   "DetId");
-  fOutput << buffer;
-  std::vector<DetId> channels = fObject.getAllChannels ();
-  std::sort (channels.begin(), channels.end(), DetIdLess ());
-  for (std::vector<DetId>::iterator channel = channels.begin ();
-       channel !=  channels.end ();
-       ++channel) {
-    const CastorPedestalWidth* item = fObject.getValues (*channel);
-    if (item) {
-      dumpId (fOutput, *channel);
-      sprintf (buffer, " %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %10X\n",
-	       item->getSigma (0,0), item->getSigma (0,1), item->getSigma (0,2), item->getSigma (0,3), 
-	       item->getSigma (1,0), item->getSigma (1,1), item->getSigma (1,2), item->getSigma (1,3),
-	       item->getSigma (2,0), item->getSigma (2,1), item->getSigma (2,2), item->getSigma (2,3),
-	       item->getSigma (3,0), item->getSigma (3,1), item->getSigma (3,2), item->getSigma (3,3), channel->rawId ());
-      fOutput << buffer;
+      //      }
     }
+    return true;
   }
-  return true;
-}
-
-
-// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-bool getObject (std::istream& fInput, CastorQIEData& fObject) {
-  char buffer [1024];
-  while (fInput.getline(buffer, 1024)) {
-    if (buffer [0] == '#') continue; //ignore comment
-    std::vector <std::string> items = splitString (std::string (buffer));
-    if (items.empty()) continue;
-    if (items [0] == "SHAPE") { // basic shape
-      if (items.size () < 33) {
-	edm::LogWarning("Format Error") << "Bad line: " << buffer << "\n line must contain 33 items: SHAPE  32 x low QIE edges for first 32 bins" << std::endl;
-	continue;
+
+  bool dumpObject(std::ostream& fOutput, const CastorPedestalWidths& fObject) {
+    char buffer[1024];
+    if (fObject.isADC())
+      sprintf(buffer, "#U ADC  << this is the unit \n");
+    else
+      sprintf(buffer, "#U fC  << this is the unit \n");
+    fOutput << buffer;
+
+    sprintf(buffer,
+            "# %15s %15s %15s %15s %8s %8s %8s %8s %8s %8s %8s %8s %8s %8s %8s %8s %8s %8s %8s %8s %10s\n",
+            "eta",
+            "phi",
+            "dep",
+            "det",
+            "cov_0_0",
+            "cov_0_1",
+            "cov_0_2",
+            "cov_0_3",
+            "cov_1_0",
+            "cov_1_1",
+            "cov_1_2",
+            "cov_1_3",
+            "cov_2_0",
+            "cov_2_1",
+            "cov_2_2",
+            "cov_2_3",
+            "cov_3_0",
+            "cov_3_1",
+            "cov_3_2",
+            "cov_3_3",
+            "DetId");
+    fOutput << buffer;
+    std::vector<DetId> channels = fObject.getAllChannels();
+    std::sort(channels.begin(), channels.end(), DetIdLess());
+    for (std::vector<DetId>::iterator channel = channels.begin(); channel != channels.end(); ++channel) {
+      const CastorPedestalWidth* item = fObject.getValues(*channel);
+      if (item) {
+        dumpId(fOutput, *channel);
+        sprintf(
+            buffer,
+            " %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %8.5f %10X\n",
+            item->getSigma(0, 0),
+            item->getSigma(0, 1),
+            item->getSigma(0, 2),
+            item->getSigma(0, 3),
+            item->getSigma(1, 0),
+            item->getSigma(1, 1),
+            item->getSigma(1, 2),
+            item->getSigma(1, 3),
+            item->getSigma(2, 0),
+            item->getSigma(2, 1),
+            item->getSigma(2, 2),
+            item->getSigma(2, 3),
+            item->getSigma(3, 0),
+            item->getSigma(3, 1),
+            item->getSigma(3, 2),
+            item->getSigma(3, 3),
+            channel->rawId());
+        fOutput << buffer;
       }
-      //float lowEdges [32];
-      //int i = 32;
-      //while (--i >= 0) lowEdges [i] = atof (items [i+1].c_str ());
-      //      fObject.setShape (lowEdges);
     }
-    else { // QIE parameters
-      if (items.size () < 36) {
-	edm::LogWarning("Format Error") << "Bad line: " << buffer << "\n line must contain 36 items: eta, phi, depth, subdet, 4 capId x 4 Ranges x offsets, 4 capId x 4 Ranges x slopes" << std::endl;
-	continue;
+    return true;
+  }
+
+  // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+  bool getObject(std::istream& fInput, CastorQIEData& fObject) {
+    char buffer[1024];
+    while (fInput.getline(buffer, 1024)) {
+      if (buffer[0] == '#')
+        continue;  //ignore comment
+      std::vector<std::string> items = splitString(std::string(buffer));
+      if (items.empty())
+        continue;
+      if (items[0] == "SHAPE") {  // basic shape
+        if (items.size() < 33) {
+          edm::LogWarning("Format Error")
+              << "Bad line: " << buffer << "\n line must contain 33 items: SHAPE  32 x low QIE edges for first 32 bins"
+              << std::endl;
+          continue;
+        }
+        //float lowEdges [32];
+        //int i = 32;
+        //while (--i >= 0) lowEdges [i] = atof (items [i+1].c_str ());
+        //      fObject.setShape (lowEdges);
+      } else {  // QIE parameters
+        if (items.size() < 36) {
+          edm::LogWarning("Format Error") << "Bad line: " << buffer
+                                          << "\n line must contain 36 items: eta, phi, depth, subdet, 4 capId x 4 "
+                                             "Ranges x offsets, 4 capId x 4 Ranges x slopes"
+                                          << std::endl;
+          continue;
+        }
+        DetId id = getId(items);
+        fObject.sort();
+        //      try {
+        //      fObject.getCoder (id);
+        //      edm::LogWarning("Redefining Channel") << "line: " << buffer << "\n attempts to redefine data. Ignored" << std::endl;
+        //      }
+        //      catch (cms::Exception& e) {
+        CastorQIECoder coder(id.rawId());
+        int index = 4;
+        for (unsigned capid = 0; capid < 4; capid++) {
+          for (unsigned range = 0; range < 4; range++) {
+            coder.setOffset(capid, range, atof(items[index++].c_str()));
+          }
+        }
+        for (unsigned capid = 0; capid < 4; capid++) {
+          for (unsigned range = 0; range < 4; range++) {
+            coder.setSlope(capid, range, atof(items[index++].c_str()));
+          }
+        }
+        fObject.addCoder(coder);
+        //      }
       }
-      DetId id = getId (items);
-      fObject.sort ();
-      //      try {
-      //      fObject.getCoder (id);
-      //      edm::LogWarning("Redefining Channel") << "line: " << buffer << "\n attempts to redefine data. Ignored" << std::endl;
-	//      }
-//      catch (cms::Exception& e) {
-	CastorQIECoder coder (id.rawId ());
-	int index = 4;
-	for (unsigned capid = 0; capid < 4; capid++) {
-	  for (unsigned range = 0; range < 4; range++) {
-	    coder.setOffset (capid, range, atof (items [index++].c_str ()));
-	  }
-	}
-	for (unsigned capid = 0; capid < 4; capid++) {
-	  for (unsigned range = 0; range < 4; range++) {
-	    coder.setSlope (capid, range, atof (items [index++].c_str ()));
-	  }
-	}
-	fObject.addCoder (coder);
-//      }
     }
+    fObject.sort();
+    return true;
   }
-  fObject.sort ();
-  return true;
-}
-
-bool dumpObject (std::ostream& fOutput, const CastorQIEData& fObject) {
-  char buffer [1024];
-  fOutput << "# QIE basic shape: SHAPE 32 x low edge values for first 32 channels" << std::endl;
-  sprintf (buffer, "SHAPE ");
-  fOutput << buffer;
-  for (unsigned bin = 0; bin < 32; bin++) {
-    sprintf (buffer, " %8.5f", fObject.getShape ().lowEdge (bin));
+
+  bool dumpObject(std::ostream& fOutput, const CastorQIEData& fObject) {
+    char buffer[1024];
+    fOutput << "# QIE basic shape: SHAPE 32 x low edge values for first 32 channels" << std::endl;
+    sprintf(buffer, "SHAPE ");
     fOutput << buffer;
-  }
-  fOutput << std::endl;
-
-  fOutput << "# QIE data" << std::endl;
-  sprintf (buffer, "# %15s %15s %15s %15s %36s %36s %36s %36s %36s %36s %36s %36s\n", 
-	   "eta", "phi", "dep", "det", 
-	   "4 x offsets cap0", "4 x offsets cap1", "4 x offsets cap2", "4 x offsets cap3",
-	   "4 x slopes cap0", "4 x slopes cap1", "4 x slopes cap2", "4 x slopes cap3");
-  fOutput << buffer;
-  std::vector<DetId> channels = fObject.getAllChannels ();
-  std::sort (channels.begin(), channels.end(), DetIdLess ());
-  for (std::vector<DetId>::iterator channel = channels.begin ();
-       channel !=  channels.end ();
-       ++channel) {
-    const CastorQIECoder* coder = fObject.getCoder (*channel);
-    dumpId (fOutput, *channel);
-    for (unsigned capid = 0; capid < 4; capid++) {
-      for (unsigned range = 0; range < 4; range++) {
-	sprintf (buffer, " %8.5f", coder->offset (capid, range));
-	fOutput << buffer;
-      }
+    for (unsigned bin = 0; bin < 32; bin++) {
+      sprintf(buffer, " %8.5f", fObject.getShape().lowEdge(bin));
+      fOutput << buffer;
     }
-    for (unsigned capid = 0; capid < 4; capid++) {
-      for (unsigned range = 0; range < 4; range++) {
-	sprintf (buffer, " %8.5f", coder->slope (capid, range));
-	fOutput << buffer;
+    fOutput << std::endl;
+
+    fOutput << "# QIE data" << std::endl;
+    sprintf(buffer,
+            "# %15s %15s %15s %15s %36s %36s %36s %36s %36s %36s %36s %36s\n",
+            "eta",
+            "phi",
+            "dep",
+            "det",
+            "4 x offsets cap0",
+            "4 x offsets cap1",
+            "4 x offsets cap2",
+            "4 x offsets cap3",
+            "4 x slopes cap0",
+            "4 x slopes cap1",
+            "4 x slopes cap2",
+            "4 x slopes cap3");
+    fOutput << buffer;
+    std::vector<DetId> channels = fObject.getAllChannels();
+    std::sort(channels.begin(), channels.end(), DetIdLess());
+    for (std::vector<DetId>::iterator channel = channels.begin(); channel != channels.end(); ++channel) {
+      const CastorQIECoder* coder = fObject.getCoder(*channel);
+      dumpId(fOutput, *channel);
+      for (unsigned capid = 0; capid < 4; capid++) {
+        for (unsigned range = 0; range < 4; range++) {
+          sprintf(buffer, " %8.5f", coder->offset(capid, range));
+          fOutput << buffer;
+        }
+      }
+      for (unsigned capid = 0; capid < 4; capid++) {
+        for (unsigned range = 0; range < 4; range++) {
+          sprintf(buffer, " %8.5f", coder->slope(capid, range));
+          fOutput << buffer;
+        }
       }
+      fOutput << std::endl;
     }
-    fOutput << std::endl;
+    return true;
   }
-  return true;
-}
-
-// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-bool getObject (std::istream& fInput, CastorCalibrationQIEData& fObject) {
-  char buffer [1024];
-  while (fInput.getline(buffer, 1024)) {
-    if (buffer [0] == '#') continue; //ignore comment
-    std::vector <std::string> items = splitString (std::string (buffer));
-    if (items.size () < 36) {
-      edm::LogWarning("Format Error") << "Bad line: " << buffer << "\n line must contain 36 items: eta, phi, depth, subdet, 32 bin values" << std::endl;
-      continue;
-    }
-    DetId id = getId (items);
-    fObject.sort ();
-    //    try {
-    //    fObject.getCoder (id);
-    //    edm::LogWarning("Redefining Channel") << "line: " << buffer << "\n attempts to redefine data. Ignored" << std::endl;
+
+  // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+  bool getObject(std::istream& fInput, CastorCalibrationQIEData& fObject) {
+    char buffer[1024];
+    while (fInput.getline(buffer, 1024)) {
+      if (buffer[0] == '#')
+        continue;  //ignore comment
+      std::vector<std::string> items = splitString(std::string(buffer));
+      if (items.size() < 36) {
+        edm::LogWarning("Format Error") << "Bad line: " << buffer
+                                        << "\n line must contain 36 items: eta, phi, depth, subdet, 32 bin values"
+                                        << std::endl;
+        continue;
+      }
+      DetId id = getId(items);
+      fObject.sort();
+      //    try {
+      //    fObject.getCoder (id);
+      //    edm::LogWarning("Redefining Channel") << "line: " << buffer << "\n attempts to redefine data. Ignored" << std::endl;
       //    }
-//    catch (cms::Exception& e) {
-      CastorCalibrationQIECoder coder (id.rawId ());
+      //    catch (cms::Exception& e) {
+      CastorCalibrationQIECoder coder(id.rawId());
       int index = 4;
-      float values [32];
+      float values[32];
       for (unsigned bin = 0; bin < 32; bin++) {
-	values[bin] = atof (items [index++].c_str ());
+        values[bin] = atof(items[index++].c_str());
       }
-      coder.setMinCharges (values);
-      fObject.addCoder (coder);
-//    }
+      coder.setMinCharges(values);
+      fObject.addCoder(coder);
+      //    }
+    }
+    fObject.sort();
+    return true;
   }
-  fObject.sort ();
-  return true;
-}
-
-bool dumpObject (std::ostream& fOutput, const CastorCalibrationQIEData& fObject) {
-  char buffer [1024];
-  fOutput << "# QIE data in calibration mode" << std::endl;
-  sprintf (buffer, "# %15s %15s %15s %15s %288s\n", 
-	   "eta", "phi", "dep", "det", "32 x charges");
-  fOutput << buffer;
-  std::vector<DetId> channels = fObject.getAllChannels ();
-  std::sort (channels.begin(), channels.end(), DetIdLess ());
-  for (std::vector<DetId>::iterator channel = channels.begin ();
-       channel !=  channels.end ();
-       ++channel) {
-    const CastorCalibrationQIECoder* coder = fObject.getCoder (*channel);
-    if (coder) {
-      dumpId (fOutput, *channel);
-      const float* lowEdge = coder->minCharges ();
-      for (unsigned bin = 0; bin < 32; bin++) {
-	sprintf (buffer, " %8.5f", lowEdge [bin]);
-	fOutput << buffer;
+
+  bool dumpObject(std::ostream& fOutput, const CastorCalibrationQIEData& fObject) {
+    char buffer[1024];
+    fOutput << "# QIE data in calibration mode" << std::endl;
+    sprintf(buffer, "# %15s %15s %15s %15s %288s\n", "eta", "phi", "dep", "det", "32 x charges");
+    fOutput << buffer;
+    std::vector<DetId> channels = fObject.getAllChannels();
+    std::sort(channels.begin(), channels.end(), DetIdLess());
+    for (std::vector<DetId>::iterator channel = channels.begin(); channel != channels.end(); ++channel) {
+      const CastorCalibrationQIECoder* coder = fObject.getCoder(*channel);
+      if (coder) {
+        dumpId(fOutput, *channel);
+        const float* lowEdge = coder->minCharges();
+        for (unsigned bin = 0; bin < 32; bin++) {
+          sprintf(buffer, " %8.5f", lowEdge[bin]);
+          fOutput << buffer;
+        }
+        fOutput << std::endl;
       }
-      fOutput << std::endl;
     }
+    return true;
   }
-  return true;
-}
-
-
-// >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
-bool getObject (std::istream& fInput, CastorElectronicsMap& fObject) {
-  char buffer [1024];
-  while (fInput.getline(buffer, 1024)) {
-    if (buffer [0] == '#') continue; //ignore comment
-    std::vector <std::string> items = splitString (std::string (buffer));
-    if (items.size () < 12) {
-      if (items.empty()) continue; // no warning here
-      if (items.size()<9) {
-	edm::LogError("MapFormat") << "CastorElectronicsMap-> line too short: " << buffer;
-	continue;
+
+  // >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+  bool getObject(std::istream& fInput, CastorElectronicsMap& fObject) {
+    char buffer[1024];
+    while (fInput.getline(buffer, 1024)) {
+      if (buffer[0] == '#')
+        continue;  //ignore comment
+      std::vector<std::string> items = splitString(std::string(buffer));
+      if (items.size() < 12) {
+        if (items.empty())
+          continue;  // no warning here
+        if (items.size() < 9) {
+          edm::LogError("MapFormat") << "CastorElectronicsMap-> line too short: " << buffer;
+          continue;
+        }
+        if (items[8] == "NA" || items[8] == "NT") {
+          while (items.size() < 12)
+            items.push_back("");  // don't worry here
+        } else if (items[8] == "HT") {
+          if (items.size() == 11)
+            items.push_back("");
+          else {
+            edm::LogError("MapFormat") << "CastorElectronicsMap-> Bad line: " << buffer
+                                       << "\n HT line must contain at least 11 items: i  cr sl tb dcc spigot fiber "
+                                          "fiberchan subdet=HT ieta iphi";
+            continue;
+          }
+        } else {
+          edm::LogError("MapFormat")
+              << "CastorElectronicsMap-> Bad line: " << buffer
+              << "\n line must contain 12 items: i  cr sl tb dcc spigot fiber fiberchan subdet ieta iphi depth";
+          continue;
+        }
       }
-      if (items[8]=="NA" || items[8]=="NT") {
-	while (items.size()<12) items.push_back(""); // don't worry here
-      } else if (items[8]=="HT") {
-	if (items.size()==11) items.push_back("");
-	else {
-	  edm::LogError("MapFormat") << "CastorElectronicsMap-> Bad line: " << buffer 
-				     << "\n HT line must contain at least 11 items: i  cr sl tb dcc spigot fiber fiberchan subdet=HT ieta iphi";
-	  continue;
-	}
+      //    std::cout << "CastorElectronicsMap-> processing line: " << buffer << std::endl;
+      int crate = atoi(items[1].c_str());
+      int slot = atoi(items[2].c_str());
+      int top = 1;
+      if (items[3] == "b")
+        top = 0;
+      int dcc = atoi(items[4].c_str());
+      int spigot = atoi(items[5].c_str());
+      CastorElectronicsId elId;
+      if (items[8] == "HT" || items[8] == "NT") {
+        int slb = atoi(items[6].c_str());
+        int slbCh = atoi(items[7].c_str());
+        elId = CastorElectronicsId(slbCh, slb, spigot, dcc, crate, slot, top);
       } else {
-	edm::LogError("MapFormat") << "CastorElectronicsMap-> Bad line: " << buffer 
-				   << "\n line must contain 12 items: i  cr sl tb dcc spigot fiber fiberchan subdet ieta iphi depth";
-	continue;
-      }
-    }
-    //    std::cout << "CastorElectronicsMap-> processing line: " << buffer << std::endl;
-    int crate = atoi (items [1].c_str());
-    int slot = atoi (items [2].c_str());
-    int top = 1;
-    if (items [3] == "b") top = 0;
-    int dcc = atoi (items [4].c_str());
-    int spigot = atoi (items [5].c_str());
-    CastorElectronicsId elId;
-    if (items[8] == "HT" || items[8] == "NT") {
-      int slb = atoi (items [6].c_str());
-      int slbCh = atoi (items [7].c_str());
-      elId=CastorElectronicsId(slbCh, slb, spigot, dcc,crate,slot,top);
-    } else {
-      int fiber = atoi (items [6].c_str());
-      int fiberCh = atoi (items [7].c_str());
-
-      elId=CastorElectronicsId(fiberCh, fiber, spigot, dcc);
-      elId.setHTR (crate, slot, top);
-    }
+        int fiber = atoi(items[6].c_str());
+        int fiberCh = atoi(items[7].c_str());
 
-    // first, handle undefined cases
-    if (items [8] == "NA") { // undefined channel
-      fObject.mapEId2chId (elId, DetId (HcalDetId::Undefined));
-    } else if (items [8] == "NT") { // undefined trigger channel
-      fObject.mapEId2tId (elId, DetId (HcalTrigTowerDetId::Undefined));
-    } else {
-      CastorText2DetIdConverter converter (items [8], items [9], items [10], items [11]);
-      if (converter.isHcalCastorDetId ()) { 
-	fObject.mapEId2chId (elId, converter.getId ());
+        elId = CastorElectronicsId(fiberCh, fiber, spigot, dcc);
+        elId.setHTR(crate, slot, top);
       }
-      else {
-	edm::LogWarning("Format Error") << "CastorElectronicsMap-> Unknown subdetector: " 
-		  << items [8] << '/' << items [9] << '/' << items [10] << '/' << items [11] << std::endl; 
+
+      // first, handle undefined cases
+      if (items[8] == "NA") {  // undefined channel
+        fObject.mapEId2chId(elId, DetId(HcalDetId::Undefined));
+      } else if (items[8] == "NT") {  // undefined trigger channel
+        fObject.mapEId2tId(elId, DetId(HcalTrigTowerDetId::Undefined));
+      } else {
+        CastorText2DetIdConverter converter(items[8], items[9], items[10], items[11]);
+        if (converter.isHcalCastorDetId()) {
+          fObject.mapEId2chId(elId, converter.getId());
+        } else {
+          edm::LogWarning("Format Error") << "CastorElectronicsMap-> Unknown subdetector: " << items[8] << '/'
+                                          << items[9] << '/' << items[10] << '/' << items[11] << std::endl;
+        }
       }
     }
+    fObject.sort();
+    return true;
   }
-  fObject.sort ();
-  return true;
-}
-
-bool dumpObject (std::ostream& fOutput, const CastorElectronicsMap& fObject) {
-  std::vector<CastorElectronicsId> eids = fObject.allElectronicsId ();
-  char buf [1024];
-  // changes by Jared, 6.03.09/(included 25.03.09)
-  //  sprintf (buf, "#%10s %6s %6s %6s %6s %6s %6s %6s %15s %15s %15s %15s",
-  sprintf (buf, "# %7s %3s %3s %3s %4s %7s %10s %14s %7s %5s %5s %6s",
-	   "i", "cr", "sl", "tb", "dcc", "spigot", "fiber/slb", "fibcha/slbcha", "subdet", "ieta", "iphi", "depth");
-  fOutput << buf << std::endl;
-
-  for (unsigned i = 0; i < eids.size (); i++) {
-    CastorElectronicsId eid = eids[i];
-    if (eid.isTriggerChainId()) {
-      DetId trigger = fObject.lookupTrigger (eid);
-      if (trigger.rawId ()) {
-	CastorText2DetIdConverter converter (trigger);
-	// changes by Jared, 6.03.09/(included 25.03.09)
-	//	sprintf (buf, " %10X %6d %6d %6c %6d %6d %6d %6d %15s %15s %15s %15s",
-	sprintf (buf, " %7X %3d %3d %3c %4d %7d %10d %14d %7s %5s %5s %6s",
-		 //		 i,
-		 converter.getId().rawId(),
-		 // changes by Jared, 6.03.09/(included 25.03.09)
-		 //		 eid.readoutVMECrateId(), eid.htrSlot(), eid.htrTopBottom()>0?'t':'b', eid.dccid(), eid.spigot(), eid.fiberIndex(), eid.fiberChanId(),
-		 eid.readoutVMECrateId(), eid.htrSlot(), eid.htrTopBottom()>0?'t':'b', eid.dccid(), eid.spigot(), eid.slbSiteNumber(), eid.slbChannelIndex(),
-		 converter.getFlavor ().c_str (), converter.getField1 ().c_str (), converter.getField2 ().c_str (), converter.getField3 ().c_str ()
-		 );
-	fOutput << buf << std::endl;
+
+  bool dumpObject(std::ostream& fOutput, const CastorElectronicsMap& fObject) {
+    std::vector<CastorElectronicsId> eids = fObject.allElectronicsId();
+    char buf[1024];
+    // changes by Jared, 6.03.09/(included 25.03.09)
+    //  sprintf (buf, "#%10s %6s %6s %6s %6s %6s %6s %6s %15s %15s %15s %15s",
+    sprintf(buf,
+            "# %7s %3s %3s %3s %4s %7s %10s %14s %7s %5s %5s %6s",
+            "i",
+            "cr",
+            "sl",
+            "tb",
+            "dcc",
+            "spigot",
+            "fiber/slb",
+            "fibcha/slbcha",
+            "subdet",
+            "ieta",
+            "iphi",
+            "depth");
+    fOutput << buf << std::endl;
+
+    for (unsigned i = 0; i < eids.size(); i++) {
+      CastorElectronicsId eid = eids[i];
+      if (eid.isTriggerChainId()) {
+        DetId trigger = fObject.lookupTrigger(eid);
+        if (trigger.rawId()) {
+          CastorText2DetIdConverter converter(trigger);
+          // changes by Jared, 6.03.09/(included 25.03.09)
+          //	sprintf (buf, " %10X %6d %6d %6c %6d %6d %6d %6d %15s %15s %15s %15s",
+          sprintf(
+              buf,
+              " %7X %3d %3d %3c %4d %7d %10d %14d %7s %5s %5s %6s",
+              //		 i,
+              converter.getId().rawId(),
+              // changes by Jared, 6.03.09/(included 25.03.09)
+              //		 eid.readoutVMECrateId(), eid.htrSlot(), eid.htrTopBottom()>0?'t':'b', eid.dccid(), eid.spigot(), eid.fiberIndex(), eid.fiberChanId(),
+              eid.readoutVMECrateId(),
+              eid.htrSlot(),
+              eid.htrTopBottom() > 0 ? 't' : 'b',
+              eid.dccid(),
+              eid.spigot(),
+              eid.slbSiteNumber(),
+              eid.slbChannelIndex(),
+              converter.getFlavor().c_str(),
+              converter.getField1().c_str(),
+              converter.getField2().c_str(),
+              converter.getField3().c_str());
+          fOutput << buf << std::endl;
+        }
+      } else {
+        DetId channel = fObject.lookup(eid);
+        if (channel.rawId()) {
+          CastorText2DetIdConverter converter(channel);
+          // changes by Jared, 6.03.09/(included 25.03.09)
+          //	sprintf (buf, " %10X %6d %6d %6c %6d %6d %6d %6d %15s %15s %15s %15s",
+          sprintf(buf,
+                  " %7X %3d %3d %3c %4d %7d %10d %14d %7s %5s %5s %6s",
+                  //		 i,
+                  converter.getId().rawId(),
+                  eid.readoutVMECrateId(),
+                  eid.htrSlot(),
+                  eid.htrTopBottom() > 0 ? 't' : 'b',
+                  eid.dccid(),
+                  eid.spigot(),
+                  eid.fiberIndex(),
+                  eid.fiberChanId(),
+                  converter.getFlavor().c_str(),
+                  converter.getField1().c_str(),
+                  converter.getField2().c_str(),
+                  converter.getField3().c_str());
+          fOutput << buf << std::endl;
+        }
       }
-    } else {
-      DetId channel = fObject.lookup (eid);
-      if (channel.rawId()) {
-	CastorText2DetIdConverter converter (channel);
-	// changes by Jared, 6.03.09/(included 25.03.09)
-	//	sprintf (buf, " %10X %6d %6d %6c %6d %6d %6d %6d %15s %15s %15s %15s",
-	sprintf (buf, " %7X %3d %3d %3c %4d %7d %10d %14d %7s %5s %5s %6s",
-		 //		 i,
-		 converter.getId().rawId(),
-		 eid.readoutVMECrateId(), eid.htrSlot(), eid.htrTopBottom()>0?'t':'b', eid.dccid(), eid.spigot(), eid.fiberIndex(), eid.fiberChanId(),
-		 converter.getFlavor ().c_str (), converter.getField1 ().c_str (), converter.getField2 ().c_str (), converter.getField3 ().c_str ()
-	       );
-	fOutput << buf << std::endl;
+    }
+    return true;
+  }
+
+  bool getObject(std::istream& fInput, CastorRecoParams& fObject) {
+    char buffer[1024];
+    while (fInput.getline(buffer, 1024)) {
+      if (buffer[0] == '#')
+        continue;  //ignore comment
+      std::vector<std::string> items = splitString(std::string(buffer));
+      if (items.empty())
+        continue;  // blank line
+      if (items.size() < 6) {
+        edm::LogWarning("Format Error")
+            << "Bad line: " << buffer
+            << "\n line must contain 6 items: eta, phi, depth, subdet, firstSample, samplesToAdd" << std::endl;
+        continue;
       }
+      DetId id = getId(items);
+
+      CastorRecoParam fCondObject(id, atoi(items[4].c_str()), atoi(items[5].c_str()));
+      fObject.addValues(fCondObject);
     }
+    return true;
   }
-  return true;
-}
-
-bool getObject (std::istream& fInput, CastorRecoParams& fObject) {
-	char buffer [1024];
-	while (fInput.getline(buffer, 1024)) {
-		if (buffer [0] == '#') continue; //ignore comment
-		std::vector <std::string> items = splitString (std::string (buffer));
-		if (items.empty()) continue; // blank line
-		if (items.size () < 6) {
-			edm::LogWarning("Format Error") << "Bad line: " << buffer << "\n line must contain 6 items: eta, phi, depth, subdet, firstSample, samplesToAdd" << std::endl;
-		    	continue;
-		}
-		DetId id = getId (items);
-	      
-		CastorRecoParam fCondObject(id, atoi (items [4].c_str()), atoi (items [5].c_str()) );
-		fObject.addValues(fCondObject);
-	}
-	return true;
-}
-
-bool dumpObject (std::ostream& fOutput, const CastorRecoParams& fObject) {
-	char buffer [1024];
-	sprintf (buffer, "# %15s %15s %15s %15s %18s %15s %10s\n", "eta", "phi", "dep", "det", "firstSample", "samplesToAdd", "DetId");
-	fOutput << buffer;
-	std::vector<DetId> channels = fObject.getAllChannels ();
-	std::sort (channels.begin(), channels.end(), DetIdLess ());
-	for (std::vector<DetId>::iterator channel = channels.begin();channel != channels.end();++channel) {
-		dumpId (fOutput, *channel);
-		sprintf (buffer, " %15d %15d %16X\n",
-		fObject.getValues (*channel)->firstSample(), fObject.getValues (*channel)->samplesToAdd(), channel->rawId ());
-		fOutput << buffer;
-	}
-	return true;
-}
-
-}
+
+  bool dumpObject(std::ostream& fOutput, const CastorRecoParams& fObject) {
+    char buffer[1024];
+    sprintf(buffer,
+            "# %15s %15s %15s %15s %18s %15s %10s\n",
+            "eta",
+            "phi",
+            "dep",
+            "det",
+            "firstSample",
+            "samplesToAdd",
+            "DetId");
+    fOutput << buffer;
+    std::vector<DetId> channels = fObject.getAllChannels();
+    std::sort(channels.begin(), channels.end(), DetIdLess());
+    for (std::vector<DetId>::iterator channel = channels.begin(); channel != channels.end(); ++channel) {
+      dumpId(fOutput, *channel);
+      sprintf(buffer,
+              " %15d %15d %16X\n",
+              fObject.getValues(*channel)->firstSample(),
+              fObject.getValues(*channel)->samplesToAdd(),
+              channel->rawId());
+      fOutput << buffer;
+    }
+    return true;
+  }
+
+}  // namespace CastorDbASCIIIO
diff --git a/CalibCalorimetry/CastorCalib/src/CastorDbHardcode.cc b/CalibCalorimetry/CastorCalib/src/CastorDbHardcode.cc
index ffff05b5a8456..555268e1b5c40 100644
--- a/CalibCalorimetry/CastorCalib/src/CastorDbHardcode.cc
+++ b/CalibCalorimetry/CastorCalib/src/CastorDbHardcode.cc
@@ -9,24 +9,23 @@
 #include "CondFormats/CastorObjects/interface/CastorElectronicsMap.h"
 #include "CalibCalorimetry/CastorCalib/interface/CastorDbHardcode.h"
 
-
-CastorPedestal CastorDbHardcode::makePedestal (HcalGenericDetId fId, bool fSmear) {
-  CastorPedestalWidth width = makePedestalWidth (fId);
+CastorPedestal CastorDbHardcode::makePedestal(HcalGenericDetId fId, bool fSmear) {
+  CastorPedestalWidth width = makePedestalWidth(fId);
   float value0 = fId.genericSubdet() == HcalGenericDetId::HcalGenForward ? 11. : 4.;  // fC
-  float value [4] = {value0, value0, value0, value0};
+  float value[4] = {value0, value0, value0, value0};
   if (fSmear) {
     for (int i = 0; i < 4; i++) {
-      value [i] = CLHEP::RandGauss::shoot (value0, width.getWidth (i) / 100.); // ignore correlations, assume 10K pedestal run 
-      while (value [i] <= 0) value [i] = CLHEP::RandGauss::shoot (value0, width.getWidth (i));
+      value[i] =
+          CLHEP::RandGauss::shoot(value0, width.getWidth(i) / 100.);  // ignore correlations, assume 10K pedestal run
+      while (value[i] <= 0)
+        value[i] = CLHEP::RandGauss::shoot(value0, width.getWidth(i));
     }
   }
-  CastorPedestal result (fId.rawId (), 
-		       value[0], value[1], value[2], value[3]
-		       );
+  CastorPedestal result(fId.rawId(), value[0], value[1], value[2], value[3]);
   return result;
 }
 
-CastorPedestalWidth CastorDbHardcode::makePedestalWidth (HcalGenericDetId fId) {
+CastorPedestalWidth CastorDbHardcode::makePedestalWidth(HcalGenericDetId fId) {
   float value = 0;
   /*
   if (fId.genericSubdet() == HcalGenericDetId::HcalGenBarrel || 
@@ -35,69 +34,73 @@ CastorPedestalWidth CastorDbHardcode::makePedestalWidth (HcalGenericDetId fId) {
   else if (fId.genericSubdet() == HcalGenericDetId::HcalGenForward) value = 2.5;
   */
   // everything in fC
-  CastorPedestalWidth result (fId.rawId ());
+  CastorPedestalWidth result(fId.rawId());
   for (int i = 0; i < 4; i++) {
     double width = value;
     for (int j = 0; j < 4; j++) {
-      result.setSigma (i, j, i == j ? width * width : 0);
+      result.setSigma(i, j, i == j ? width * width : 0);
     }
-  } 
+  }
   return result;
 }
 
-CastorGain CastorDbHardcode::makeGain (HcalGenericDetId fId, bool fSmear) {
-  CastorGainWidth width = makeGainWidth (fId);
+CastorGain CastorDbHardcode::makeGain(HcalGenericDetId fId, bool fSmear) {
+  CastorGainWidth width = makeGainWidth(fId);
   float value0 = 0;
-  if (fId.genericSubdet() != HcalGenericDetId::HcalGenForward) value0 = 0.177;  // GeV/fC
+  if (fId.genericSubdet() != HcalGenericDetId::HcalGenForward)
+    value0 = 0.177;  // GeV/fC
   else {
-    if (HcalDetId(fId).depth() == 1) value0 = 0.2146;
-    else if (HcalDetId(fId).depth() == 2) value0 = 0.3375;
+    if (HcalDetId(fId).depth() == 1)
+      value0 = 0.2146;
+    else if (HcalDetId(fId).depth() == 2)
+      value0 = 0.3375;
   }
-  float value [4] = {value0, value0, value0, value0};
-  if (fSmear) for (int i = 0; i < 4; i++) value [i] = CLHEP::RandGauss::shoot (value0, width.getValue (i)); 
-  CastorGain result (fId.rawId (), value[0], value[1], value[2], value[3]);
+  float value[4] = {value0, value0, value0, value0};
+  if (fSmear)
+    for (int i = 0; i < 4; i++)
+      value[i] = CLHEP::RandGauss::shoot(value0, width.getValue(i));
+  CastorGain result(fId.rawId(), value[0], value[1], value[2], value[3]);
   return result;
 }
 
-CastorGainWidth CastorDbHardcode::makeGainWidth (HcalGenericDetId fId) {
+CastorGainWidth CastorDbHardcode::makeGainWidth(HcalGenericDetId fId) {
   float value = 0;
-  CastorGainWidth result (fId.rawId (), value, value, value, value);
+  CastorGainWidth result(fId.rawId(), value, value, value, value);
   return result;
 }
 
-CastorQIECoder CastorDbHardcode::makeQIECoder (HcalGenericDetId fId) {
-  CastorQIECoder result (fId.rawId ());
+CastorQIECoder CastorDbHardcode::makeQIECoder(HcalGenericDetId fId) {
+  CastorQIECoder result(fId.rawId());
   float offset = 0;
-  float slope = fId.genericSubdet () == HcalGenericDetId::HcalGenForward ? 0.36 : 0.92;  // ADC/fC
+  float slope = fId.genericSubdet() == HcalGenericDetId::HcalGenForward ? 0.36 : 0.92;  // ADC/fC
   for (unsigned range = 0; range < 4; range++) {
     for (unsigned capid = 0; capid < 4; capid++) {
-      result.setOffset (capid, range, offset);
-      result.setSlope (capid, range, slope);
+      result.setOffset(capid, range, offset);
+      result.setSlope(capid, range, slope);
     }
   }
   return result;
 }
 
-CastorCalibrationQIECoder CastorDbHardcode::makeCalibrationQIECoder (HcalGenericDetId fId) {
-  CastorCalibrationQIECoder result (fId.rawId ());
-  float lowEdges [32];
-  for (int i = 0; i < 32; i++) lowEdges[i] = -1.5 + i*0.35;
-  result.setMinCharges (lowEdges);
+CastorCalibrationQIECoder CastorDbHardcode::makeCalibrationQIECoder(HcalGenericDetId fId) {
+  CastorCalibrationQIECoder result(fId.rawId());
+  float lowEdges[32];
+  for (int i = 0; i < 32; i++)
+    lowEdges[i] = -1.5 + i * 0.35;
+  result.setMinCharges(lowEdges);
   return result;
 }
 
-CastorQIEShape CastorDbHardcode::makeQIEShape () {
-  return CastorQIEShape ();
-}
+CastorQIEShape CastorDbHardcode::makeQIEShape() { return CastorQIEShape(); }
 
-CastorRecoParam CastorDbHardcode::makeRecoParam (HcalGenericDetId fId) {
-	CastorRecoParam result(fId.rawId(), 4, 2);
-	return result;
+CastorRecoParam CastorDbHardcode::makeRecoParam(HcalGenericDetId fId) {
+  CastorRecoParam result(fId.rawId(), 4, 2);
+  return result;
 }
 
-CastorSaturationCorr CastorDbHardcode::makeSaturationCorr (HcalGenericDetId fId) {
-	CastorSaturationCorr result(fId.rawId(), 1);
-	return result;
+CastorSaturationCorr CastorDbHardcode::makeSaturationCorr(HcalGenericDetId fId) {
+  CastorSaturationCorr result(fId.rawId(), 1);
+  return result;
 }
 
 #define EMAP_NHBHECR 9
@@ -112,279 +115,288 @@ CastorSaturationCorr CastorDbHardcode::makeSaturationCorr (HcalGenericDetId fId)
 #define EMAP_NHSETSHO 3
 
 void CastorDbHardcode::makeHardcodeMap(CastorElectronicsMap& emap) {
-
   /* HBHE crate numbering */
-  int hbhecrate[EMAP_NHBHECR]={0,1,4,5,10,11,14,15,17};
+  int hbhecrate[EMAP_NHBHECR] = {0, 1, 4, 5, 10, 11, 14, 15, 17};
   /* HF crate numbering */
-  int hfcrate[EMAP_NHFCR]={2,9,12};
+  int hfcrate[EMAP_NHFCR] = {2, 9, 12};
   /* HO crate numbering */
-  int hocrate[EMAP_NHOCR]={3,7,6,13};
+  int hocrate[EMAP_NHOCR] = {3, 7, 6, 13};
   /* HBHE FED numbering of DCCs */
-  int fedhbhenum[EMAP_NHBHECR][2]={{702,703},{704,705},{700,701},
-				   {706,707},{716,717},{708,709},
-				   {714,715},{710,711},{712,713}};
+  int fedhbhenum[EMAP_NHBHECR][2] = {
+      {702, 703}, {704, 705}, {700, 701}, {706, 707}, {716, 717}, {708, 709}, {714, 715}, {710, 711}, {712, 713}};
   /* HF FED numbering of DCCs */
-  int fedhfnum[EMAP_NHFCR][2]={{718,719},{720,721},{722,723}};
+  int fedhfnum[EMAP_NHFCR][2] = {{718, 719}, {720, 721}, {722, 723}};
   /* HO FED numbering of DCCs */
-  int fedhonum[EMAP_NHOCR][2]={{724,725},{726,727},{728,729},{730,731}};
+  int fedhonum[EMAP_NHOCR][2] = {{724, 725}, {726, 727}, {728, 729}, {730, 731}};
   /* HBHE/HF htr slot offsets for set of three htrs */
-  int ihslot[EMAP_NHSETS]={2,5,13,16};
+  int ihslot[EMAP_NHSETS] = {2, 5, 13, 16};
   /* HO htr slot offsets for three sets of four htrs */
-  int ihslotho[EMAP_NHSETSHO][EMAP_NHTRSHO]={{2,3,4,5},{6,7,13,14},{15,16,17,18}};
+  int ihslotho[EMAP_NHSETSHO][EMAP_NHTRSHO] = {{2, 3, 4, 5}, {6, 7, 13, 14}, {15, 16, 17, 18}};
   /* iphi (lower) starting index for each HBHE crate */
-  int ihbhephis[EMAP_NHBHECR]={11,19,3,27,67,35,59,43,51};
+  int ihbhephis[EMAP_NHBHECR] = {11, 19, 3, 27, 67, 35, 59, 43, 51};
   /* iphi (lower) starting index for each HF crate */
-  int ihfphis[EMAP_NHFCR]={3,27,51};
+  int ihfphis[EMAP_NHFCR] = {3, 27, 51};
   /* iphi (lower) starting index for each HO crate */
-  int ihophis[EMAP_NHOCR]={71,17,35,53};
+  int ihophis[EMAP_NHOCR] = {71, 17, 35, 53};
   /* ihbheetadepth - unique HBHE {eta,depth} assignments per fiber and fiber channel */
-  int ihbheetadepth[EMAP_NHTRS][EMAP_NTOPBOT][EMAP_NFBR][EMAP_NFCH][2]={
-    {{{{11,1},{ 7,1},{ 3,1}},  /* htr 0 (HB) -bot(+top) */
-      {{ 5,1},{ 1,1},{ 9,1}},
-      {{11,1},{ 7,1},{ 3,1}},
-      {{ 5,1},{ 1,1},{ 9,1}},
-      {{10,1},{ 6,1},{ 2,1}},
-      {{ 8,1},{ 4,1},{12,1}},
-      {{10,1},{ 6,1},{ 2,1}},
-      {{ 8,1},{ 4,1},{12,1}}},
-     {{{11,1},{ 7,1},{ 3,1}},  /* htr 0 (HB) +bot(-top) */
-      {{ 5,1},{ 1,1},{ 9,1}},
-      {{11,1},{ 7,1},{ 3,1}},
-      {{ 5,1},{ 1,1},{ 9,1}},
-      {{10,1},{ 6,1},{ 2,1}},
-      {{ 8,1},{ 4,1},{12,1}},
-      {{10,1},{ 6,1},{ 2,1}},
-      {{ 8,1},{ 4,1},{12,1}}}},
-    {{{{16,2},{15,2},{14,1}},  /* htr 1 (HBHE) -bot(+top) */
-      {{15,1},{13,1},{16,1}},
-      {{16,2},{15,2},{14,1}},
-      {{15,1},{13,1},{16,1}},
-      {{17,1},{16,3},{26,1}},
-      {{18,1},{18,2},{26,2}},
-      {{17,1},{16,3},{25,1}},
-      {{18,1},{18,2},{25,2}}},
-     {{{16,2},{15,2},{14,1}},  /* htr 1 (HBHE) +bot(-top) */
-      {{15,1},{13,1},{16,1}},
-      {{16,2},{15,2},{14,1}},
-      {{15,1},{13,1},{16,1}},
-      {{17,1},{16,3},{25,1}},
-      {{18,1},{18,2},{25,2}},
-      {{17,1},{16,3},{26,1}},
-      {{18,1},{18,2},{26,2}}}},
-    {{{{28,1},{28,2},{29,1}},  /* htr 2 (HE) -bot(+top) */
-      {{28,3},{24,2},{24,1}},
-      {{27,1},{27,2},{29,2}},
-      {{27,3},{23,2},{23,1}},
-      {{19,2},{20,1},{22,2}},
-      {{19,1},{20,2},{22,1}},
-      {{19,2},{20,1},{21,2}},
-      {{19,1},{20,2},{21,1}}},
-     {{{27,1},{27,2},{29,2}},  /* htr 2 (HE) +bot(-top) */
-      {{27,3},{23,2},{23,1}},
-      {{28,1},{28,2},{29,1}},
-      {{28,3},{24,2},{24,1}},
-      {{19,2},{20,1},{21,2}},
-      {{19,1},{20,2},{21,1}},
-      {{19,2},{20,1},{22,2}},
-      {{19,1},{20,2},{22,1}}}}
-  };
+  int ihbheetadepth[EMAP_NHTRS][EMAP_NTOPBOT][EMAP_NFBR][EMAP_NFCH][2] = {
+      {{{{11, 1}, {7, 1}, {3, 1}}, /* htr 0 (HB) -bot(+top) */
+        {{5, 1}, {1, 1}, {9, 1}},
+        {{11, 1}, {7, 1}, {3, 1}},
+        {{5, 1}, {1, 1}, {9, 1}},
+        {{10, 1}, {6, 1}, {2, 1}},
+        {{8, 1}, {4, 1}, {12, 1}},
+        {{10, 1}, {6, 1}, {2, 1}},
+        {{8, 1}, {4, 1}, {12, 1}}},
+       {{{11, 1}, {7, 1}, {3, 1}}, /* htr 0 (HB) +bot(-top) */
+        {{5, 1}, {1, 1}, {9, 1}},
+        {{11, 1}, {7, 1}, {3, 1}},
+        {{5, 1}, {1, 1}, {9, 1}},
+        {{10, 1}, {6, 1}, {2, 1}},
+        {{8, 1}, {4, 1}, {12, 1}},
+        {{10, 1}, {6, 1}, {2, 1}},
+        {{8, 1}, {4, 1}, {12, 1}}}},
+      {{{{16, 2}, {15, 2}, {14, 1}}, /* htr 1 (HBHE) -bot(+top) */
+        {{15, 1}, {13, 1}, {16, 1}},
+        {{16, 2}, {15, 2}, {14, 1}},
+        {{15, 1}, {13, 1}, {16, 1}},
+        {{17, 1}, {16, 3}, {26, 1}},
+        {{18, 1}, {18, 2}, {26, 2}},
+        {{17, 1}, {16, 3}, {25, 1}},
+        {{18, 1}, {18, 2}, {25, 2}}},
+       {{{16, 2}, {15, 2}, {14, 1}}, /* htr 1 (HBHE) +bot(-top) */
+        {{15, 1}, {13, 1}, {16, 1}},
+        {{16, 2}, {15, 2}, {14, 1}},
+        {{15, 1}, {13, 1}, {16, 1}},
+        {{17, 1}, {16, 3}, {25, 1}},
+        {{18, 1}, {18, 2}, {25, 2}},
+        {{17, 1}, {16, 3}, {26, 1}},
+        {{18, 1}, {18, 2}, {26, 2}}}},
+      {{{{28, 1}, {28, 2}, {29, 1}}, /* htr 2 (HE) -bot(+top) */
+        {{28, 3}, {24, 2}, {24, 1}},
+        {{27, 1}, {27, 2}, {29, 2}},
+        {{27, 3}, {23, 2}, {23, 1}},
+        {{19, 2}, {20, 1}, {22, 2}},
+        {{19, 1}, {20, 2}, {22, 1}},
+        {{19, 2}, {20, 1}, {21, 2}},
+        {{19, 1}, {20, 2}, {21, 1}}},
+       {{{27, 1}, {27, 2}, {29, 2}}, /* htr 2 (HE) +bot(-top) */
+        {{27, 3}, {23, 2}, {23, 1}},
+        {{28, 1}, {28, 2}, {29, 1}},
+        {{28, 3}, {24, 2}, {24, 1}},
+        {{19, 2}, {20, 1}, {21, 2}},
+        {{19, 1}, {20, 2}, {21, 1}},
+        {{19, 2}, {20, 1}, {22, 2}},
+        {{19, 1}, {20, 2}, {22, 1}}}}};
   /* ihfetadepth - unique HF {eta,depth} assignments per fiber and fiber channel */
-  int ihfetadepth[EMAP_NTOPBOT][EMAP_NFBR][EMAP_NFCH][2]={
-    {{{33,1},{31,1},{29,1}},  /* top */
-     {{32,1},{30,1},{34,1}},
-     {{33,2},{31,2},{29,2}},
-     {{32,2},{30,2},{34,2}},
-     {{34,2},{32,2},{30,2}},
-     {{31,2},{29,2},{33,2}},
-     {{34,1},{32,1},{30,1}},
-     {{31,1},{29,1},{33,1}}},
-    {{{41,1},{37,1},{35,1}},  /* bot */
-     {{38,1},{36,1},{39,1}},
-     {{41,2},{37,2},{35,2}},
-     {{38,2},{36,2},{39,2}},
-     {{40,2},{38,2},{36,2}},
-     {{37,2},{35,2},{39,2}},
-     {{40,1},{38,1},{36,1}},
-     {{37,1},{35,1},{39,1}}}
-  };
+  int ihfetadepth[EMAP_NTOPBOT][EMAP_NFBR][EMAP_NFCH][2] = {{{{33, 1}, {31, 1}, {29, 1}}, /* top */
+                                                             {{32, 1}, {30, 1}, {34, 1}},
+                                                             {{33, 2}, {31, 2}, {29, 2}},
+                                                             {{32, 2}, {30, 2}, {34, 2}},
+                                                             {{34, 2}, {32, 2}, {30, 2}},
+                                                             {{31, 2}, {29, 2}, {33, 2}},
+                                                             {{34, 1}, {32, 1}, {30, 1}},
+                                                             {{31, 1}, {29, 1}, {33, 1}}},
+                                                            {{{41, 1}, {37, 1}, {35, 1}}, /* bot */
+                                                             {{38, 1}, {36, 1}, {39, 1}},
+                                                             {{41, 2}, {37, 2}, {35, 2}},
+                                                             {{38, 2}, {36, 2}, {39, 2}},
+                                                             {{40, 2}, {38, 2}, {36, 2}},
+                                                             {{37, 2}, {35, 2}, {39, 2}},
+                                                             {{40, 1}, {38, 1}, {36, 1}},
+                                                             {{37, 1}, {35, 1}, {39, 1}}}};
   /* ihoetasidephi - unique HO {eta,side,phi} assignments per fiber and fiber channel */
-  int ihoetasidephi[EMAP_NHTRSHO][EMAP_NTOPBOT][EMAP_NFBR][EMAP_NFCH][3]={
-    {{{{ 1,-1,0},{ 2,-1,0},{ 3,-1,0}},  /* htr 0 (HO) top */
-      {{ 1,-1,1},{ 2,-1,1},{ 3,-1,1}},
-      {{ 1,-1,2},{ 2,-1,2},{ 3,-1,2}},
-      {{ 1,-1,3},{ 2,-1,3},{ 3,-1,3}},
-      {{ 1,-1,4},{ 2,-1,4},{ 3,-1,4}},
-      {{ 1,-1,5},{ 2,-1,5},{ 3,-1,5}},
-      {{14, 1,0},{14, 1,1},{14, 1,2}},
-      {{14, 1,3},{14, 1,4},{14, 1,5}}},
-     {{{ 1, 1,0},{ 2, 1,0},{ 3, 1,0}},  /* htr 0 (HO) bot */
-      {{ 1, 1,1},{ 2, 1,1},{ 3, 1,1}},
-      {{ 1, 1,2},{ 2, 1,2},{ 3, 1,2}},
-      {{ 1, 1,3},{ 2, 1,3},{ 3, 1,3}},
-      {{ 1, 1,4},{ 2, 1,4},{ 3, 1,4}},
-      {{ 1, 1,5},{ 2, 1,5},{ 3, 1,5}},
-      {{15, 1,0},{15, 1,1},{15, 1,2}},
-      {{15, 1,3},{15, 1,4},{15, 1,5}}}},
-    {{{{ 6, 1,0},{ 6, 1,1},{ 6, 1,2}},  /* htr 1 (HO) top */
-      {{ 6, 1,3},{ 6, 1,4},{ 6, 1,5}},
-      {{ 7, 1,0},{ 7, 1,1},{ 7, 1,2}},
-      {{ 7, 1,3},{ 7, 1,4},{ 7, 1,5}},
-      {{ 8, 1,0},{ 8, 1,1},{ 8, 1,2}},
-      {{ 8, 1,3},{ 8, 1,4},{ 8, 1,5}},
-      {{ 9, 1,0},{ 9, 1,1},{ 9, 1,2}},
-      {{ 9, 1,3},{ 9, 1,4},{ 9, 1,5}}},
-     {{{10, 1,0},{10, 1,1},{10, 1,2}},  /* htr 1 (HO) bot */
-      {{10, 1,3},{10, 1,4},{10, 1,5}},
-      {{11, 1,0},{11, 1,1},{11, 1,2}},
-      {{11, 1,3},{11, 1,4},{11, 1,5}},
-      {{12, 1,0},{12, 1,1},{12, 1,2}},
-      {{12, 1,3},{12, 1,4},{12, 1,5}},
-      {{13, 1,0},{13, 1,1},{13, 1,2}},
-      {{13, 1,3},{13, 1,4},{13, 1,5}}}},
-    {{{{ 4,-1,0},{ 4,-1,1},{ 0, 0,0}},  /* htr 2 (HO) top */
-      {{ 4,-1,2},{ 4,-1,3},{ 0, 0,0}},
-      {{ 4,-1,4},{ 4,-1,5},{ 0, 0,0}},
-      {{ 0, 0,0},{ 0, 0,0},{ 0, 0,0}},
-      {{ 5,-1,0},{ 5,-1,1},{ 5,-1,2}},
-      {{ 5,-1,3},{ 5,-1,4},{ 5,-1,5}},
-      {{14,-1,0},{14,-1,1},{14,-1,2}},
-      {{14,-1,3},{14,-1,4},{14,-1,5}}},
-     {{{ 4, 1,0},{ 4, 1,1},{ 0, 0,0}},  /* htr 2 (HO) bot */
-      {{ 4, 1,2},{ 4, 1,3},{ 0, 0,0}},
-      {{ 4, 1,4},{ 4, 1,5},{ 0, 0,0}},
-      {{ 0, 0,0},{ 0, 0,0},{ 0, 0,0}},
-      {{ 5, 1,0},{ 5, 1,1},{ 5, 1,2}},
-      {{ 5, 1,3},{ 5, 1,4},{ 5, 1,5}},
-      {{15,-1,0},{15,-1,1},{15,-1,2}},
-      {{15,-1,3},{15,-1,4},{15,-1,5}}}},
-    {{{{ 6,-1,0},{ 6,-1,1},{ 6,-1,2}},  /* htr 3 (HO) top */
-      {{ 6,-1,3},{ 6,-1,4},{ 6,-1,5}},
-      {{ 7,-1,0},{ 7,-1,1},{ 7,-1,2}},
-      {{ 7,-1,3},{ 7,-1,4},{ 7,-1,5}},
-      {{ 8,-1,0},{ 8,-1,1},{ 8,-1,2}},
-      {{ 8,-1,3},{ 8,-1,4},{ 8,-1,5}},
-      {{ 9,-1,0},{ 9,-1,1},{ 9,-1,2}},
-      {{ 9,-1,3},{ 9,-1,4},{ 9,-1,5}}},
-     {{{10,-1,0},{10,-1,1},{10,-1,2}},  /* htr 3 (HO) bot */
-      {{10,-1,3},{10,-1,4},{10,-1,5}},
-      {{11,-1,0},{11,-1,1},{11,-1,2}},
-      {{11,-1,3},{11,-1,4},{11,-1,5}},
-      {{12,-1,0},{12,-1,1},{12,-1,2}},
-      {{12,-1,3},{12,-1,4},{12,-1,5}},
-      {{13,-1,0},{13,-1,1},{13,-1,2}},
-      {{13,-1,3},{13,-1,4},{13,-1,5}}}} 
-  };
-  int ic,is,ih,itb,ifb,ifc,ifwtb,iphi_loc;
-  int iside,ieta,iphi,idepth,icrate,ihtr,ihtr_fi,ifi_ch,ispigot,idcc,/*idcc_sl,*/ifed;
+  int ihoetasidephi[EMAP_NHTRSHO][EMAP_NTOPBOT][EMAP_NFBR][EMAP_NFCH][3] = {
+      {{{{1, -1, 0}, {2, -1, 0}, {3, -1, 0}}, /* htr 0 (HO) top */
+        {{1, -1, 1}, {2, -1, 1}, {3, -1, 1}},
+        {{1, -1, 2}, {2, -1, 2}, {3, -1, 2}},
+        {{1, -1, 3}, {2, -1, 3}, {3, -1, 3}},
+        {{1, -1, 4}, {2, -1, 4}, {3, -1, 4}},
+        {{1, -1, 5}, {2, -1, 5}, {3, -1, 5}},
+        {{14, 1, 0}, {14, 1, 1}, {14, 1, 2}},
+        {{14, 1, 3}, {14, 1, 4}, {14, 1, 5}}},
+       {{{1, 1, 0}, {2, 1, 0}, {3, 1, 0}}, /* htr 0 (HO) bot */
+        {{1, 1, 1}, {2, 1, 1}, {3, 1, 1}},
+        {{1, 1, 2}, {2, 1, 2}, {3, 1, 2}},
+        {{1, 1, 3}, {2, 1, 3}, {3, 1, 3}},
+        {{1, 1, 4}, {2, 1, 4}, {3, 1, 4}},
+        {{1, 1, 5}, {2, 1, 5}, {3, 1, 5}},
+        {{15, 1, 0}, {15, 1, 1}, {15, 1, 2}},
+        {{15, 1, 3}, {15, 1, 4}, {15, 1, 5}}}},
+      {{{{6, 1, 0}, {6, 1, 1}, {6, 1, 2}}, /* htr 1 (HO) top */
+        {{6, 1, 3}, {6, 1, 4}, {6, 1, 5}},
+        {{7, 1, 0}, {7, 1, 1}, {7, 1, 2}},
+        {{7, 1, 3}, {7, 1, 4}, {7, 1, 5}},
+        {{8, 1, 0}, {8, 1, 1}, {8, 1, 2}},
+        {{8, 1, 3}, {8, 1, 4}, {8, 1, 5}},
+        {{9, 1, 0}, {9, 1, 1}, {9, 1, 2}},
+        {{9, 1, 3}, {9, 1, 4}, {9, 1, 5}}},
+       {{{10, 1, 0}, {10, 1, 1}, {10, 1, 2}}, /* htr 1 (HO) bot */
+        {{10, 1, 3}, {10, 1, 4}, {10, 1, 5}},
+        {{11, 1, 0}, {11, 1, 1}, {11, 1, 2}},
+        {{11, 1, 3}, {11, 1, 4}, {11, 1, 5}},
+        {{12, 1, 0}, {12, 1, 1}, {12, 1, 2}},
+        {{12, 1, 3}, {12, 1, 4}, {12, 1, 5}},
+        {{13, 1, 0}, {13, 1, 1}, {13, 1, 2}},
+        {{13, 1, 3}, {13, 1, 4}, {13, 1, 5}}}},
+      {{{{4, -1, 0}, {4, -1, 1}, {0, 0, 0}}, /* htr 2 (HO) top */
+        {{4, -1, 2}, {4, -1, 3}, {0, 0, 0}},
+        {{4, -1, 4}, {4, -1, 5}, {0, 0, 0}},
+        {{0, 0, 0}, {0, 0, 0}, {0, 0, 0}},
+        {{5, -1, 0}, {5, -1, 1}, {5, -1, 2}},
+        {{5, -1, 3}, {5, -1, 4}, {5, -1, 5}},
+        {{14, -1, 0}, {14, -1, 1}, {14, -1, 2}},
+        {{14, -1, 3}, {14, -1, 4}, {14, -1, 5}}},
+       {{{4, 1, 0}, {4, 1, 1}, {0, 0, 0}}, /* htr 2 (HO) bot */
+        {{4, 1, 2}, {4, 1, 3}, {0, 0, 0}},
+        {{4, 1, 4}, {4, 1, 5}, {0, 0, 0}},
+        {{0, 0, 0}, {0, 0, 0}, {0, 0, 0}},
+        {{5, 1, 0}, {5, 1, 1}, {5, 1, 2}},
+        {{5, 1, 3}, {5, 1, 4}, {5, 1, 5}},
+        {{15, -1, 0}, {15, -1, 1}, {15, -1, 2}},
+        {{15, -1, 3}, {15, -1, 4}, {15, -1, 5}}}},
+      {{{{6, -1, 0}, {6, -1, 1}, {6, -1, 2}}, /* htr 3 (HO) top */
+        {{6, -1, 3}, {6, -1, 4}, {6, -1, 5}},
+        {{7, -1, 0}, {7, -1, 1}, {7, -1, 2}},
+        {{7, -1, 3}, {7, -1, 4}, {7, -1, 5}},
+        {{8, -1, 0}, {8, -1, 1}, {8, -1, 2}},
+        {{8, -1, 3}, {8, -1, 4}, {8, -1, 5}},
+        {{9, -1, 0}, {9, -1, 1}, {9, -1, 2}},
+        {{9, -1, 3}, {9, -1, 4}, {9, -1, 5}}},
+       {{{10, -1, 0}, {10, -1, 1}, {10, -1, 2}}, /* htr 3 (HO) bot */
+        {{10, -1, 3}, {10, -1, 4}, {10, -1, 5}},
+        {{11, -1, 0}, {11, -1, 1}, {11, -1, 2}},
+        {{11, -1, 3}, {11, -1, 4}, {11, -1, 5}},
+        {{12, -1, 0}, {12, -1, 1}, {12, -1, 2}},
+        {{12, -1, 3}, {12, -1, 4}, {12, -1, 5}},
+        {{13, -1, 0}, {13, -1, 1}, {13, -1, 2}},
+        {{13, -1, 3}, {13, -1, 4}, {13, -1, 5}}}}};
+  int ic, is, ih, itb, ifb, ifc, ifwtb, iphi_loc;
+  int iside, ieta, iphi, idepth, icrate, ihtr, ihtr_fi, ifi_ch, ispigot, idcc, /*idcc_sl,*/ ifed;
   std::string det;
   std::string fpga;
   // printf("      side       eta       phi     depth       det     crate       htr      fpga    htr_fi     fi_ch     spigo       dcc    dcc_sl     fedid\n");
   /* all HBHE crates */
-  for(ic=0; ic<EMAP_NHBHECR; ic++){
+  for (ic = 0; ic < EMAP_NHBHECR; ic++) {
     /* four sets of three htrs per crate */
-    for(is=0; is<EMAP_NHSETS; is++){
+    for (is = 0; is < EMAP_NHSETS; is++) {
       /* three htrs per set */
-      for(ih=0; ih<EMAP_NHTRS; ih++){
-	/* top and bottom */
-	for(itb=0; itb<EMAP_NTOPBOT; itb++){
-	  /* eight fibers per HTR FPGA */
-	  for(ifb=0; ifb<EMAP_NFBR; ifb++){
-	    /* three channels per fiber */
-	    for(ifc=0; ifc<EMAP_NFCH; ifc++){
-	      icrate=hbhecrate[ic];
-	      iside=is<EMAP_NHSETS/2?-1:1;
-	      ifwtb=(is/2+itb+1)%2;
-	      ieta=ihbheetadepth[ih][ifwtb][ifb][ifc][0];
-	      idepth=ihbheetadepth[ih][ifwtb][ifb][ifc][1];
-	      ihtr=ihslot[is]+ih;
-	      det=((ieta>16||idepth>2)?("HE"):("HB"));
-	      fpga=((itb%2)==1)?("bot"):("top");
-	      ihtr_fi=ifb+1;
-	      ifi_ch=ifc;
-	      iphi=(ieta>20)?(ihbhephis[ic]+(is%2)*4+itb*2-1)%72+1:(ihbhephis[ic]+(is%2)*4+itb*2+(ifb/2+is/2+1)%2-1)%72+1;
-	      ispigot=(is%2)*6+ih*2+itb;
-	      idcc=is<EMAP_NHSETS/2?1:2;
-	      //idcc_sl=idcc==1?9:19;
-	      ifed=fedhbhenum[ic][idcc-1];
-	      /// load map
-	      CastorElectronicsId elId(ifi_ch, ihtr_fi, ispigot, ifed-700);
-	      elId.setHTR(icrate, ihtr, (fpga=="top")?(1):(0));
-	      HcalDetId hId((det=="HB")?(HcalBarrel):(HcalEndcap),ieta*iside,iphi,idepth);
-	      emap.mapEId2chId(elId,hId);
-	      
-	      //	      printf(" %9d %9d %9d %9d %9s %9d %9d %9s %9d %9d %9d %9d %9d %9d\n",iside,ieta,iphi,idepth,&det,icrate,ihtr,&fpga,ihtr_fi,ifi_ch,ispigot,idcc,idcc_sl,ifed);
-	    }}}}}}
+      for (ih = 0; ih < EMAP_NHTRS; ih++) {
+        /* top and bottom */
+        for (itb = 0; itb < EMAP_NTOPBOT; itb++) {
+          /* eight fibers per HTR FPGA */
+          for (ifb = 0; ifb < EMAP_NFBR; ifb++) {
+            /* three channels per fiber */
+            for (ifc = 0; ifc < EMAP_NFCH; ifc++) {
+              icrate = hbhecrate[ic];
+              iside = is < EMAP_NHSETS / 2 ? -1 : 1;
+              ifwtb = (is / 2 + itb + 1) % 2;
+              ieta = ihbheetadepth[ih][ifwtb][ifb][ifc][0];
+              idepth = ihbheetadepth[ih][ifwtb][ifb][ifc][1];
+              ihtr = ihslot[is] + ih;
+              det = ((ieta > 16 || idepth > 2) ? ("HE") : ("HB"));
+              fpga = ((itb % 2) == 1) ? ("bot") : ("top");
+              ihtr_fi = ifb + 1;
+              ifi_ch = ifc;
+              iphi = (ieta > 20) ? (ihbhephis[ic] + (is % 2) * 4 + itb * 2 - 1) % 72 + 1
+                                 : (ihbhephis[ic] + (is % 2) * 4 + itb * 2 + (ifb / 2 + is / 2 + 1) % 2 - 1) % 72 + 1;
+              ispigot = (is % 2) * 6 + ih * 2 + itb;
+              idcc = is < EMAP_NHSETS / 2 ? 1 : 2;
+              //idcc_sl=idcc==1?9:19;
+              ifed = fedhbhenum[ic][idcc - 1];
+              /// load map
+              CastorElectronicsId elId(ifi_ch, ihtr_fi, ispigot, ifed - 700);
+              elId.setHTR(icrate, ihtr, (fpga == "top") ? (1) : (0));
+              HcalDetId hId((det == "HB") ? (HcalBarrel) : (HcalEndcap), ieta * iside, iphi, idepth);
+              emap.mapEId2chId(elId, hId);
+
+              //	      printf(" %9d %9d %9d %9d %9s %9d %9d %9s %9d %9d %9d %9d %9d %9d\n",iside,ieta,iphi,idepth,&det,icrate,ihtr,&fpga,ihtr_fi,ifi_ch,ispigot,idcc,idcc_sl,ifed);
+            }
+          }
+        }
+      }
+    }
+  }
   /* all HF crates */
-  for(ic=0; ic<EMAP_NHFCR; ic++){
+  for (ic = 0; ic < EMAP_NHFCR; ic++) {
     /* four sets of three htrs per crate */
-    for(is=0; is<EMAP_NHSETS; is++){
+    for (is = 0; is < EMAP_NHSETS; is++) {
       /* three htrs per set */
-      for(ih=0; ih<EMAP_NHTRS; ih++){
-	/* top and bottom */
-	for(itb=0; itb<EMAP_NTOPBOT; itb++){
-	  /* eight fibers per HTR FPGA */
-	  for(ifb=0; ifb<EMAP_NFBR; ifb++){
-	    /* three channels per fiber */
-	    for(ifc=0; ifc<EMAP_NFCH; ifc++){
-	      icrate=hfcrate[ic];
-	      iside=is<EMAP_NHSETS/2?-1:1;
-	      ieta=ihfetadepth[itb][ifb][ifc][0];
-	      idepth=ihfetadepth[itb][ifb][ifc][1];
-	      ihtr=ihslot[is]+ih;
-	      det="HF";
-	      fpga=((itb%2)==1)?("bot"):("top");
-	      ihtr_fi=ifb+1;
-	      ifi_ch=ifc;
-	      iphi=(ieta>39)?(ihfphis[ic]+(is%2)*12+ih*4-3)%72+1:(ihfphis[ic]+(is%2)*12+ih*4+(ifb/4)*2-1)%72+1;
-	      ispigot=(is%2)*6+ih*2+itb;
-	      idcc=is<EMAP_NHSETS/2?1:2;
-	      //idcc_sl=idcc==1?9:19;
-	      ifed=fedhfnum[ic][idcc-1];
-	      CastorElectronicsId elId(ifi_ch, ihtr_fi, ispigot, ifed-700);
-	      elId.setHTR(icrate, ihtr, (fpga=="top")?(1):(0));
-	      HcalDetId hId(HcalForward,ieta*iside,iphi,idepth);
-	      emap.mapEId2chId(elId,hId);
-	      // printf(" %9d %9d %9d %9d %9s %9d %9d %9s %9d %9d %9d %9d %9d %9d\n",iside,ieta,iphi,idepth,&det,icrate,ihtr,&fpga,ihtr_fi,ifi_ch,ispigot,idcc,idcc_sl,ifed);
-	    }}}}}}
+      for (ih = 0; ih < EMAP_NHTRS; ih++) {
+        /* top and bottom */
+        for (itb = 0; itb < EMAP_NTOPBOT; itb++) {
+          /* eight fibers per HTR FPGA */
+          for (ifb = 0; ifb < EMAP_NFBR; ifb++) {
+            /* three channels per fiber */
+            for (ifc = 0; ifc < EMAP_NFCH; ifc++) {
+              icrate = hfcrate[ic];
+              iside = is < EMAP_NHSETS / 2 ? -1 : 1;
+              ieta = ihfetadepth[itb][ifb][ifc][0];
+              idepth = ihfetadepth[itb][ifb][ifc][1];
+              ihtr = ihslot[is] + ih;
+              det = "HF";
+              fpga = ((itb % 2) == 1) ? ("bot") : ("top");
+              ihtr_fi = ifb + 1;
+              ifi_ch = ifc;
+              iphi = (ieta > 39) ? (ihfphis[ic] + (is % 2) * 12 + ih * 4 - 3) % 72 + 1
+                                 : (ihfphis[ic] + (is % 2) * 12 + ih * 4 + (ifb / 4) * 2 - 1) % 72 + 1;
+              ispigot = (is % 2) * 6 + ih * 2 + itb;
+              idcc = is < EMAP_NHSETS / 2 ? 1 : 2;
+              //idcc_sl=idcc==1?9:19;
+              ifed = fedhfnum[ic][idcc - 1];
+              CastorElectronicsId elId(ifi_ch, ihtr_fi, ispigot, ifed - 700);
+              elId.setHTR(icrate, ihtr, (fpga == "top") ? (1) : (0));
+              HcalDetId hId(HcalForward, ieta * iside, iphi, idepth);
+              emap.mapEId2chId(elId, hId);
+              // printf(" %9d %9d %9d %9d %9s %9d %9d %9s %9d %9d %9d %9d %9d %9d\n",iside,ieta,iphi,idepth,&det,icrate,ihtr,&fpga,ihtr_fi,ifi_ch,ispigot,idcc,idcc_sl,ifed);
+            }
+          }
+        }
+      }
+    }
+  }
   /* all HO crates */
-  for(ic=0; ic<EMAP_NHOCR; ic++){
+  for (ic = 0; ic < EMAP_NHOCR; ic++) {
     /* three sets of four htrs per crate */
-    for(is=0; is<EMAP_NHSETSHO; is++){
+    for (is = 0; is < EMAP_NHSETSHO; is++) {
       /* four htrs per set */
-      for(ih=0; ih<EMAP_NHTRSHO; ih++){
-	/* top and bottom */
-	for(itb=0; itb<EMAP_NTOPBOT; itb++){
-	  /* eight fibers per HTR FPGA */
-	  for(ifb=0; ifb<EMAP_NFBR; ifb++){
-	    /* three channels per fiber */
-	    for(ifc=0; ifc<EMAP_NFCH; ifc++){
-	      icrate=hocrate[ic];
-	      idepth=1;
-	      ieta=ihoetasidephi[ih][itb][ifb][ifc][0];
-	      iside=ihoetasidephi[ih][itb][ifb][ifc][1];
-	      iphi_loc=ihoetasidephi[ih][itb][ifb][ifc][2];
-	      ihtr=ihslotho[is][ih];
-	      det="HO";
-	      fpga=((itb%2)==1)?("bot"):("top");
-	      ihtr_fi=ifb+1;
-	      ifi_ch=ifc;
-	      iphi=(ihophis[ic]+is*6+iphi_loc-1)%72+1;
-	      ispigot=ihtr<9?(ihtr-2)*2+itb:(ihtr-13)*2+itb;
-	      idcc=ihtr<9?1:2;
-	      //idcc_sl=idcc==1?9:19;
-	      ifed=fedhonum[ic][idcc-1];
-	      CastorElectronicsId elId(ifi_ch, ihtr_fi, ispigot, ifed-700);
-	      elId.setHTR(icrate, ihtr, (fpga=="top")?(1):(0));
-	      if (ieta==0) { // unmapped 
-		emap.mapEId2chId(elId,DetId(HcalDetId::Undefined));
-	      } else {
-		HcalDetId hId(HcalOuter,ieta*iside,iphi,4); // HO is officially "depth=4"
-		emap.mapEId2chId(elId,hId);
-	      }
-	      // printf(" %9d %9d %9d %9d %9s %9d %9d %9s %9d %9d %9d %9d %9d %9d\n",iside,ieta,iphi,idepth,&det,icrate,ihtr,&fpga,ihtr_fi,ifi_ch,ispigot,idcc,idcc_sl,ifed);
-	    }}}}}}
-  
+      for (ih = 0; ih < EMAP_NHTRSHO; ih++) {
+        /* top and bottom */
+        for (itb = 0; itb < EMAP_NTOPBOT; itb++) {
+          /* eight fibers per HTR FPGA */
+          for (ifb = 0; ifb < EMAP_NFBR; ifb++) {
+            /* three channels per fiber */
+            for (ifc = 0; ifc < EMAP_NFCH; ifc++) {
+              icrate = hocrate[ic];
+              idepth = 1;
+              ieta = ihoetasidephi[ih][itb][ifb][ifc][0];
+              iside = ihoetasidephi[ih][itb][ifb][ifc][1];
+              iphi_loc = ihoetasidephi[ih][itb][ifb][ifc][2];
+              ihtr = ihslotho[is][ih];
+              det = "HO";
+              fpga = ((itb % 2) == 1) ? ("bot") : ("top");
+              ihtr_fi = ifb + 1;
+              ifi_ch = ifc;
+              iphi = (ihophis[ic] + is * 6 + iphi_loc - 1) % 72 + 1;
+              ispigot = ihtr < 9 ? (ihtr - 2) * 2 + itb : (ihtr - 13) * 2 + itb;
+              idcc = ihtr < 9 ? 1 : 2;
+              //idcc_sl=idcc==1?9:19;
+              ifed = fedhonum[ic][idcc - 1];
+              CastorElectronicsId elId(ifi_ch, ihtr_fi, ispigot, ifed - 700);
+              elId.setHTR(icrate, ihtr, (fpga == "top") ? (1) : (0));
+              if (ieta == 0) {  // unmapped
+                emap.mapEId2chId(elId, DetId(HcalDetId::Undefined));
+              } else {
+                HcalDetId hId(HcalOuter, ieta * iside, iphi, 4);  // HO is officially "depth=4"
+                emap.mapEId2chId(elId, hId);
+              }
+              // printf(" %9d %9d %9d %9d %9s %9d %9d %9s %9d %9d %9d %9d %9d %9d\n",iside,ieta,iphi,idepth,&det,icrate,ihtr,&fpga,ihtr_fi,ifi_ch,ispigot,idcc,idcc_sl,ifed);
+            }
+          }
+        }
+      }
+    }
+  }
 
   emap.sort();
-
 }
diff --git a/CalibCalorimetry/CastorCalib/src/CastorDbXml.cc b/CalibCalorimetry/CastorCalib/src/CastorDbXml.cc
index 7088d96da27c4..a3c13b36b72ab 100644
--- a/CalibCalorimetry/CastorCalib/src/CastorDbXml.cc
+++ b/CalibCalorimetry/CastorCalib/src/CastorDbXml.cc
@@ -4,124 +4,129 @@
 #include <vector>
 #include <string>
 
-
 #include "CalibFormats/CastorObjects/interface/CastorText2DetIdConverter.h"
 
 #include "CondFormats/CastorObjects/interface/AllObjects.h"
 #include "CalibCalorimetry/CastorCalib/interface/CastorDbXml.h"
 
 namespace {
-  void dumpProlog (std::ostream& fOutput) {
+  void dumpProlog(std::ostream& fOutput) {
     fOutput << "<?xml version='1.0' encoding='UTF-8'?>" << std::endl;
     fOutput << "<!DOCTYPE root []>" << std::endl;
     fOutput << "<ROOT>" << std::endl;
   }
 
-  void dumpRun (std::ostream& fOutput, unsigned fRun) {
-    fOutput << "<RUN>"<< std::endl;
-    fOutput << "   <RUN_TYPE>" << "CastorDbXml" << "</RUN_TYPE>"<< std::endl;
-    fOutput << "   <RUN_NUMBER>" << fRun << "</RUN_NUMBER>"<< std::endl;
+  void dumpRun(std::ostream& fOutput, unsigned fRun) {
+    fOutput << "<RUN>" << std::endl;
+    fOutput << "   <RUN_TYPE>"
+            << "CastorDbXml"
+            << "</RUN_TYPE>" << std::endl;
+    fOutput << "   <RUN_NUMBER>" << fRun << "</RUN_NUMBER>" << std::endl;
     fOutput << "</RUN>" << std::endl;
   }
 
-  void dumpHeader (std::ostream& fOutput, unsigned fRun, const std::string& fTableName, const std::string& fTypeName) {
+  void dumpHeader(std::ostream& fOutput, unsigned fRun, const std::string& fTableName, const std::string& fTypeName) {
     fOutput << "  <HEADER>" << std::endl;
     fOutput << "    <TYPE>" << std::endl;
     fOutput << "      <EXTENSION_TABLE_NAME>" << fTableName << "</EXTENSION_TABLE_NAME>" << std::endl;
     fOutput << "      <NAME>" << fTypeName << "</NAME>" << std::endl;
     fOutput << "    </TYPE>" << std::endl;
-    dumpRun (fOutput, fRun);
+    dumpRun(fOutput, fRun);
     fOutput << "  </HEADER>" << std::endl;
   }
 
-  void dumpFooter (std::ostream& fOutput) {
-    fOutput << "</ROOT>" << std::endl;
-  }
+  void dumpFooter(std::ostream& fOutput) { fOutput << "</ROOT>" << std::endl; }
 
-  void dumpChannelId (std::ostream& fOutput, DetId fChannel) {
-    CastorText2DetIdConverter converter (fChannel);
-    fOutput << "<CHANNEL> "<< std::endl;
-    fOutput << "   <EXTENSION_TABLE_NAME>HCAL_CHANNELS</EXTENSION_TABLE_NAME> "<< std::endl;
-    fOutput << "   <ETA>" << abs (converter.getField (1)) << "</ETA>"<< std::endl;
-    fOutput << "   <PHI>" << converter.getField (2) << "</PHI> "<< std::endl;
-    fOutput << "   <DEPTH>" << converter.getField (3) << "</DEPTH> "<< std::endl;
-    fOutput << "   <Z>" << (converter.getField (1) > 0 ? "1" : "-1") << "</Z> "<< std::endl;
-    fOutput << "   <DETECTOR_NAME>" << converter.getFlavor () << "</DETECTOR_NAME> "<< std::endl;
-    fOutput << "   <HCAL_CHANNEL_ID>" << converter.getId().rawId () << "</HCAL_CHANNEL_ID> "<< std::endl;
-    fOutput << "</CHANNEL>"<< std::endl;
+  void dumpChannelId(std::ostream& fOutput, DetId fChannel) {
+    CastorText2DetIdConverter converter(fChannel);
+    fOutput << "<CHANNEL> " << std::endl;
+    fOutput << "   <EXTENSION_TABLE_NAME>HCAL_CHANNELS</EXTENSION_TABLE_NAME> " << std::endl;
+    fOutput << "   <ETA>" << abs(converter.getField(1)) << "</ETA>" << std::endl;
+    fOutput << "   <PHI>" << converter.getField(2) << "</PHI> " << std::endl;
+    fOutput << "   <DEPTH>" << converter.getField(3) << "</DEPTH> " << std::endl;
+    fOutput << "   <Z>" << (converter.getField(1) > 0 ? "1" : "-1") << "</Z> " << std::endl;
+    fOutput << "   <DETECTOR_NAME>" << converter.getFlavor() << "</DETECTOR_NAME> " << std::endl;
+    fOutput << "   <HCAL_CHANNEL_ID>" << converter.getId().rawId() << "</HCAL_CHANNEL_ID> " << std::endl;
+    fOutput << "</CHANNEL>" << std::endl;
     fOutput << std::endl;
   }
 
-  void dumpData (std::ostream& fOutput, const float* fValues, const CastorPedestalWidth& fErrors) {
-    fOutput << "<DATA> "<< std::endl;
-    fOutput << "   <CAPACITOR_0_VALUE>" << fValues [0] << "</CAPACITOR_0_VALUE> "<< std::endl;
-    fOutput << "   <CAPACITOR_1_VALUE>" << fValues [1] << "</CAPACITOR_1_VALUE> "<< std::endl;
-    fOutput << "   <CAPACITOR_2_VALUE>" << fValues [2] << "</CAPACITOR_2_VALUE> "<< std::endl;	
-    fOutput << "   <CAPACITOR_3_VALUE>" << fValues [3] << "</CAPACITOR_3_VALUE> "<< std::endl;
-    fOutput << "   <SIGMA_0_0>" << fErrors.getSigma (0,0) << "</SIGMA_0_0> "<< std::endl;	
-    fOutput << "   <SIGMA_1_1>" << fErrors.getSigma (1,1) << "</SIGMA_1_1> "<< std::endl;	
-    fOutput << "   <SIGMA_2_2>" << fErrors.getSigma (2,2) << "</SIGMA_2_2> "<< std::endl;	
-    fOutput << "   <SIGMA_3_3>" << fErrors.getSigma (3,3) << "</SIGMA_3_3> "<< std::endl;	
-    fOutput << "   <SIGMA_0_1>" << fErrors.getSigma (1,0) << "</SIGMA_0_1> "<< std::endl;	
-    fOutput << "   <SIGMA_0_2>" << fErrors.getSigma (2,0) << "</SIGMA_0_2> "<< std::endl;	
-    fOutput << "   <SIGMA_0_3>" << fErrors.getSigma (3,0) << "</SIGMA_0_3> "<< std::endl;	
-    fOutput << "   <SIGMA_1_2>" << fErrors.getSigma (2,1) << "</SIGMA_1_2> "<< std::endl;	
-    fOutput << "   <SIGMA_1_3>" << fErrors.getSigma (3,1) << "</SIGMA_1_3> "<< std::endl;	
-    fOutput << "   <SIGMA_2_3>" << fErrors.getSigma (3,2) << "</SIGMA_2_3> "<< std::endl;	
+  void dumpData(std::ostream& fOutput, const float* fValues, const CastorPedestalWidth& fErrors) {
+    fOutput << "<DATA> " << std::endl;
+    fOutput << "   <CAPACITOR_0_VALUE>" << fValues[0] << "</CAPACITOR_0_VALUE> " << std::endl;
+    fOutput << "   <CAPACITOR_1_VALUE>" << fValues[1] << "</CAPACITOR_1_VALUE> " << std::endl;
+    fOutput << "   <CAPACITOR_2_VALUE>" << fValues[2] << "</CAPACITOR_2_VALUE> " << std::endl;
+    fOutput << "   <CAPACITOR_3_VALUE>" << fValues[3] << "</CAPACITOR_3_VALUE> " << std::endl;
+    fOutput << "   <SIGMA_0_0>" << fErrors.getSigma(0, 0) << "</SIGMA_0_0> " << std::endl;
+    fOutput << "   <SIGMA_1_1>" << fErrors.getSigma(1, 1) << "</SIGMA_1_1> " << std::endl;
+    fOutput << "   <SIGMA_2_2>" << fErrors.getSigma(2, 2) << "</SIGMA_2_2> " << std::endl;
+    fOutput << "   <SIGMA_3_3>" << fErrors.getSigma(3, 3) << "</SIGMA_3_3> " << std::endl;
+    fOutput << "   <SIGMA_0_1>" << fErrors.getSigma(1, 0) << "</SIGMA_0_1> " << std::endl;
+    fOutput << "   <SIGMA_0_2>" << fErrors.getSigma(2, 0) << "</SIGMA_0_2> " << std::endl;
+    fOutput << "   <SIGMA_0_3>" << fErrors.getSigma(3, 0) << "</SIGMA_0_3> " << std::endl;
+    fOutput << "   <SIGMA_1_2>" << fErrors.getSigma(2, 1) << "</SIGMA_1_2> " << std::endl;
+    fOutput << "   <SIGMA_1_3>" << fErrors.getSigma(3, 1) << "</SIGMA_1_3> " << std::endl;
+    fOutput << "   <SIGMA_2_3>" << fErrors.getSigma(3, 2) << "</SIGMA_2_3> " << std::endl;
     fOutput << "</DATA> " << std::endl;
   }
 
-  void dumpData (std::ostream& fOutput, const float* fValues, const float* fErrors) {
-    fOutput << "<DATA> "<< std::endl;
-    fOutput << "   <CAPACITOR_0_VALUE>" << fValues [0] << "</CAPACITOR_0_VALUE> "<< std::endl;
-    fOutput << "   <CAPACITOR_1_VALUE>" << fValues [1] << "</CAPACITOR_1_VALUE> "<< std::endl;
-    fOutput << "   <CAPACITOR_2_VALUE>" << fValues [2] << "</CAPACITOR_2_VALUE> "<< std::endl;
-    fOutput << "   <CAPACITOR_3_VALUE>" << fValues [3] << "</CAPACITOR_3_VALUE> "<< std::endl;
-    fOutput << "   <CAPACITOR_0_ERROR>" << fErrors [0] << "</CAPACITOR_0_ERROR> "<< std::endl;
-    fOutput << "   <CAPACITOR_1_ERROR>" << fErrors [1] << "</CAPACITOR_1_ERROR> "<< std::endl;
-    fOutput << "   <CAPACITOR_2_ERROR>" << fErrors [2] << "</CAPACITOR_2_ERROR> "<< std::endl;
-    fOutput << "   <CAPACITOR_3_ERROR>" << fErrors [3] << "</CAPACITOR_3_ERROR> "<< std::endl;
+  void dumpData(std::ostream& fOutput, const float* fValues, const float* fErrors) {
+    fOutput << "<DATA> " << std::endl;
+    fOutput << "   <CAPACITOR_0_VALUE>" << fValues[0] << "</CAPACITOR_0_VALUE> " << std::endl;
+    fOutput << "   <CAPACITOR_1_VALUE>" << fValues[1] << "</CAPACITOR_1_VALUE> " << std::endl;
+    fOutput << "   <CAPACITOR_2_VALUE>" << fValues[2] << "</CAPACITOR_2_VALUE> " << std::endl;
+    fOutput << "   <CAPACITOR_3_VALUE>" << fValues[3] << "</CAPACITOR_3_VALUE> " << std::endl;
+    fOutput << "   <CAPACITOR_0_ERROR>" << fErrors[0] << "</CAPACITOR_0_ERROR> " << std::endl;
+    fOutput << "   <CAPACITOR_1_ERROR>" << fErrors[1] << "</CAPACITOR_1_ERROR> " << std::endl;
+    fOutput << "   <CAPACITOR_2_ERROR>" << fErrors[2] << "</CAPACITOR_2_ERROR> " << std::endl;
+    fOutput << "   <CAPACITOR_3_ERROR>" << fErrors[3] << "</CAPACITOR_3_ERROR> " << std::endl;
     fOutput << "</DATA> " << std::endl;
   }
 
-  void dumpDataset (std::ostream& fOutput, unsigned fVersion = 0, const std::string& fFileName = "", const std::string& fDescription = "") {
+  void dumpDataset(std::ostream& fOutput,
+                   unsigned fVersion = 0,
+                   const std::string& fFileName = "",
+                   const std::string& fDescription = "") {
     fOutput << "<DATA_SET>" << std::endl;
     fOutput << "   <VERSION>" << fVersion << "</VERSION>" << std::endl;
-    if (!fFileName.empty ()) 
+    if (!fFileName.empty())
       fOutput << "      <DATA_FILE_NAME>" << fFileName << "</DATA_FILE_NAME>" << std::endl;
-    if (!fDescription.empty ())
+    if (!fDescription.empty())
       fOutput << "      <COMMENT_DESCRIPTION>" << fDescription << "</COMMENT_DESCRIPTION>" << std::endl;
   }
 
-  void endDataset (std::ostream& fOutput) {
-    fOutput << "</DATA_SET>" << std::endl;
-  }
+  void endDataset(std::ostream& fOutput) { fOutput << "</DATA_SET>" << std::endl; }
 
-  void dumpMapping (std::ostream& fOutput, unsigned fRun, const std::string& fKind, 
-		    unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, 
-		    const std::string& fTag, unsigned fVersion, const std::vector<DetId>& fChannels) {
+  void dumpMapping(std::ostream& fOutput,
+                   unsigned fRun,
+                   const std::string& fKind,
+                   unsigned long fGMTIOVBegin,
+                   unsigned long fGMTIOVEnd,
+                   const std::string& fTag,
+                   unsigned fVersion,
+                   const std::vector<DetId>& fChannels) {
     const std::string IOV_ID = "IOV_ID";
     const std::string TAG_ID = "TAG_ID";
     fOutput << "<ELEMENTS>" << std::endl;
     // set channels affected
-    int i = fChannels.size ();
+    int i = fChannels.size();
     while (--i >= 0) {
       fOutput << "<DATA_SET id=\"" << i << "\">" << std::endl;
-      dumpRun (fOutput, fRun);
+      dumpRun(fOutput, fRun);
       fOutput << "<KIND_OF_CONDITION><NAME>" << fKind << "</NAME></KIND_OF_CONDITION>" << std::endl;
-      dumpChannelId (fOutput, fChannels[i]);
+      dumpChannelId(fOutput, fChannels[i]);
       fOutput << "<VERSION>" << fVersion << "</VERSION>" << std::endl;
       fOutput << "</DATA_SET>" << std::endl;
     }
     // set IOV
     fOutput << "<IOV id=\"" << IOV_ID << "\">";
-    fOutput << "   <INTERVAL_OF_VALIDITY_BEGIN>" << fGMTIOVBegin << "</INTERVAL_OF_VALIDITY_BEGIN>"<< std::endl;
-    fOutput << "   <INTERVAL_OF_VALIDITY_END>" << fGMTIOVEnd << "</INTERVAL_OF_VALIDITY_END>"<< std::endl;
+    fOutput << "   <INTERVAL_OF_VALIDITY_BEGIN>" << fGMTIOVBegin << "</INTERVAL_OF_VALIDITY_BEGIN>" << std::endl;
+    fOutput << "   <INTERVAL_OF_VALIDITY_END>" << fGMTIOVEnd << "</INTERVAL_OF_VALIDITY_END>" << std::endl;
     fOutput << "</IOV>" << std::endl;
     // set TAG
-    fOutput << "<TAG id=\"" << TAG_ID << "\" mode=\"create\">"<< std::endl;
-    fOutput << "   <TAG_NAME>" << fTag << "</TAG_NAME>"<< std::endl;
-    fOutput << "   <DETECTOR_NAME>HCAL</DETECTOR_NAME>"<< std::endl;
+    fOutput << "<TAG id=\"" << TAG_ID << "\" mode=\"create\">" << std::endl;
+    fOutput << "   <TAG_NAME>" << fTag << "</TAG_NAME>" << std::endl;
+    fOutput << "   <DETECTOR_NAME>HCAL</DETECTOR_NAME>" << std::endl;
     fOutput << "   <COMMENT_DESCRIPTION>Automatically created by CastorDbXml</COMMENT_DESCRIPTION>" << std::endl;
     fOutput << "</TAG>" << std::endl;
 
@@ -131,7 +136,7 @@ namespace {
     fOutput << "<MAPS>" << std::endl;
     fOutput << "<TAG idref=\"" << TAG_ID << "\">" << std::endl;
     fOutput << "<IOV idref=\"" << IOV_ID << "\">" << std::endl;
-    i = fChannels.size ();
+    i = fChannels.size();
     while (--i >= 0) {
       fOutput << "<DATA_SET idref=\"" << i << "\"/>" << std::endl;
     }
@@ -139,113 +144,124 @@ namespace {
     fOutput << "</TAG>" << std::endl;
     fOutput << "</MAPS>" << std::endl;
   }
-}
-
-
+}  // namespace
 
-bool CastorDbXml::dumpObject (std::ostream& fOutput, 
-			    unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, const std::string& fTag, unsigned fVersion, 
-			    const CastorPedestals& fObject) {
+bool CastorDbXml::dumpObject(std::ostream& fOutput,
+                             unsigned fRun,
+                             unsigned long fGMTIOVBegin,
+                             unsigned long fGMTIOVEnd,
+                             const std::string& fTag,
+                             unsigned fVersion,
+                             const CastorPedestals& fObject) {
   float dummyError = 0.0001;
   std::cout << "CastorDbXml::dumpObject-> set default errors: 0.0001, 0.0001, 0.0001, 0.0001" << std::endl;
-  CastorPedestalWidths widths(fObject.isADC() );
-  std::vector<DetId> channels = fObject.getAllChannels ();
-  for (std::vector<DetId>::iterator channel = channels.begin ();
-       channel !=  channels.end ();
-       ++channel) {
-
+  CastorPedestalWidths widths(fObject.isADC());
+  std::vector<DetId> channels = fObject.getAllChannels();
+  for (std::vector<DetId>::iterator channel = channels.begin(); channel != channels.end(); ++channel) {
     CastorPedestalWidth item(*channel);
     for (int iCapId = 1; iCapId <= 4; iCapId++) {
-      item.setSigma (iCapId, iCapId, dummyError*dummyError);
+      item.setSigma(iCapId, iCapId, dummyError * dummyError);
     }
     widths.addValues(item);
-
   }
-  return dumpObject (fOutput, fRun, fGMTIOVBegin, fGMTIOVEnd, fTag, fVersion, fObject, widths);
+  return dumpObject(fOutput, fRun, fGMTIOVBegin, fGMTIOVEnd, fTag, fVersion, fObject, widths);
 }
 
-bool CastorDbXml::dumpObject (std::ostream& fOutput, 
-			    unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, const std::string& fTag, unsigned fVersion, 
-			    const CastorPedestals& fObject, const CastorPedestalWidths& fError) {
+bool CastorDbXml::dumpObject(std::ostream& fOutput,
+                             unsigned fRun,
+                             unsigned long fGMTIOVBegin,
+                             unsigned long fGMTIOVEnd,
+                             const std::string& fTag,
+                             unsigned fVersion,
+                             const CastorPedestals& fObject,
+                             const CastorPedestalWidths& fError) {
   const std::string KIND = "HCAL_PEDESTALS_V2";
 
-  dumpProlog (fOutput);
-  dumpHeader (fOutput, fRun, KIND, KIND);
+  dumpProlog(fOutput);
+  dumpHeader(fOutput, fRun, KIND, KIND);
 
-  std::vector<DetId> channels = fObject.getAllChannels ();
-  for (std::vector<DetId>::iterator channel = channels.begin ();
-       channel !=  channels.end ();
-       ++channel) {
+  std::vector<DetId> channels = fObject.getAllChannels();
+  for (std::vector<DetId>::iterator channel = channels.begin(); channel != channels.end(); ++channel) {
     DetId chId = *channel;
-    const float* values = fObject.getValues (chId)->getValues ();
-    const CastorPedestalWidth* errors = fError.getValues (chId);
+    const float* values = fObject.getValues(chId)->getValues();
+    const CastorPedestalWidth* errors = fError.getValues(chId);
     if (!values) {
-      std::cerr << "CastorDbXml::dumpObject-> Can not get data for channel " << CastorText2DetIdConverter(chId).toString () << std::endl;
+      std::cerr << "CastorDbXml::dumpObject-> Can not get data for channel "
+                << CastorText2DetIdConverter(chId).toString() << std::endl;
       continue;
     }
     if (!errors) {
-      std::cerr << "CastorDbXml::dumpObject-> Can not get errors for channel " << CastorText2DetIdConverter(chId).toString () <<  ". Use defaults" << std::endl;
+      std::cerr << "CastorDbXml::dumpObject-> Can not get errors for channel "
+                << CastorText2DetIdConverter(chId).toString() << ". Use defaults" << std::endl;
       continue;
     }
-    dumpDataset (fOutput, fVersion, "", "");
-    dumpChannelId (fOutput,chId); 
-    dumpData (fOutput, values, *errors);
-    endDataset (fOutput);
+    dumpDataset(fOutput, fVersion, "", "");
+    dumpChannelId(fOutput, chId);
+    dumpData(fOutput, values, *errors);
+    endDataset(fOutput);
   }
-  dumpMapping (fOutput, fRun, KIND, fGMTIOVBegin, fGMTIOVEnd, fTag, fVersion, channels);
+  dumpMapping(fOutput, fRun, KIND, fGMTIOVBegin, fGMTIOVEnd, fTag, fVersion, channels);
 
-  dumpFooter (fOutput);
+  dumpFooter(fOutput);
   return true;
 }
 
-bool CastorDbXml::dumpObject (std::ostream& fOutput, 
-			    unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, const std::string& fTag, unsigned fVersion,
-			    const CastorGains& fObject) {
-  float dummyErrors [4] = {0., 0., 0., 0.};
+bool CastorDbXml::dumpObject(std::ostream& fOutput,
+                             unsigned fRun,
+                             unsigned long fGMTIOVBegin,
+                             unsigned long fGMTIOVEnd,
+                             const std::string& fTag,
+                             unsigned fVersion,
+                             const CastorGains& fObject) {
+  float dummyErrors[4] = {0., 0., 0., 0.};
   std::cout << "CastorDbXml::dumpObject-> set default errors: 4 x 0.0" << std::endl;
 
   CastorGainWidths widths;
-  std::vector<DetId> channels = fObject.getAllChannels ();
-  for (std::vector<DetId>::iterator channel = channels.begin (); channel !=  channels.end (); ++channel) 
-    {
-      CastorGainWidth item(*channel,dummyErrors[0],dummyErrors[1],dummyErrors[2],dummyErrors[3]);
-      widths.addValues(item);
-    }
+  std::vector<DetId> channels = fObject.getAllChannels();
+  for (std::vector<DetId>::iterator channel = channels.begin(); channel != channels.end(); ++channel) {
+    CastorGainWidth item(*channel, dummyErrors[0], dummyErrors[1], dummyErrors[2], dummyErrors[3]);
+    widths.addValues(item);
+  }
 
-  return dumpObject (fOutput, fRun, fGMTIOVBegin, fGMTIOVEnd, fTag, fVersion, fObject, widths);
+  return dumpObject(fOutput, fRun, fGMTIOVBegin, fGMTIOVEnd, fTag, fVersion, fObject, widths);
 }
 
-bool CastorDbXml::dumpObject (std::ostream& fOutput, 
-			    unsigned fRun, unsigned long fGMTIOVBegin, unsigned long fGMTIOVEnd, const std::string& fTag, unsigned fVersion,
-			    const CastorGains& fObject, const CastorGainWidths& fError) {
+bool CastorDbXml::dumpObject(std::ostream& fOutput,
+                             unsigned fRun,
+                             unsigned long fGMTIOVBegin,
+                             unsigned long fGMTIOVEnd,
+                             const std::string& fTag,
+                             unsigned fVersion,
+                             const CastorGains& fObject,
+                             const CastorGainWidths& fError) {
   const std::string KIND = "HCAL Gains";
   const std::string TABLE = "HCAL_GAIN_PEDSTL_CALIBRATIONS";
 
-  dumpProlog (fOutput);
-  dumpHeader (fOutput, fRun, TABLE, KIND);
+  dumpProlog(fOutput);
+  dumpHeader(fOutput, fRun, TABLE, KIND);
 
-  std::vector<DetId> channels = fObject.getAllChannels ();
-  for (std::vector<DetId>::iterator channel = channels.begin ();
-       channel !=  channels.end ();
-       ++channel) {
+  std::vector<DetId> channels = fObject.getAllChannels();
+  for (std::vector<DetId>::iterator channel = channels.begin(); channel != channels.end(); ++channel) {
     DetId chId = *channel;
-    const float* values = fObject.getValues (chId)->getValues ();
-    const float* errors = fError.getValues (chId)->getValues ();
+    const float* values = fObject.getValues(chId)->getValues();
+    const float* errors = fError.getValues(chId)->getValues();
     if (!values) {
-      std::cerr << "CastorDbXml::dumpObject-> Can not get data for channel " << CastorText2DetIdConverter(chId).toString () << std::endl;
+      std::cerr << "CastorDbXml::dumpObject-> Can not get data for channel "
+                << CastorText2DetIdConverter(chId).toString() << std::endl;
       continue;
     }
     if (!errors) {
-      std::cerr << "CastorDbXml::dumpObject-> Can not get errors for channel " << CastorText2DetIdConverter(chId).toString () <<  ". Use defaults" << std::endl;
+      std::cerr << "CastorDbXml::dumpObject-> Can not get errors for channel "
+                << CastorText2DetIdConverter(chId).toString() << ". Use defaults" << std::endl;
       continue;
     }
-    dumpDataset (fOutput, fVersion, "", "");
-    dumpChannelId (fOutput,chId); 
-    dumpData (fOutput, values, errors);
-    endDataset (fOutput);
+    dumpDataset(fOutput, fVersion, "", "");
+    dumpChannelId(fOutput, chId);
+    dumpData(fOutput, values, errors);
+    endDataset(fOutput);
   }
-  dumpMapping (fOutput, fRun, KIND, fGMTIOVBegin, fGMTIOVEnd, fTag, fVersion, channels);
+  dumpMapping(fOutput, fRun, KIND, fGMTIOVBegin, fGMTIOVEnd, fTag, fVersion, channels);
 
-  dumpFooter (fOutput);
+  dumpFooter(fOutput);
   return true;
 }
diff --git a/CalibCalorimetry/CastorCalib/src/CastorLedAnalysis.cc b/CalibCalorimetry/CastorCalib/src/CastorLedAnalysis.cc
index 0373c81311b2b..8e420fd9b7172 100644
--- a/CalibCalorimetry/CastorCalib/src/CastorLedAnalysis.cc
+++ b/CalibCalorimetry/CastorCalib/src/CastorLedAnalysis.cc
@@ -13,48 +13,53 @@
 
 using namespace std;
 
-
-CastorLedAnalysis::CastorLedAnalysis(const edm::ParameterSet& ps)
-{
+CastorLedAnalysis::CastorLedAnalysis(const edm::ParameterSet& ps) {
   // init
-  evt=0;
-  sample=0;
-  m_file=nullptr;
+  evt = 0;
+  sample = 0;
+  m_file = nullptr;
   char output[100]{0};
   // output files
-  for(int k=0;k<4;k++) state.push_back(true); // 4 cap-ids (do we care?)
+  for (int k = 0; k < 4; k++)
+    state.push_back(true);  // 4 cap-ids (do we care?)
   m_outputFileText = ps.getUntrackedParameter<string>("outputFileText", "");
-  m_outputFileX = ps.getUntrackedParameter<string>("outputFileXML","");
-  if ( !m_outputFileText.empty() ) {
+  m_outputFileX = ps.getUntrackedParameter<string>("outputFileXML", "");
+  if (!m_outputFileText.empty()) {
     cout << "Castor LED results will be saved to " << m_outputFileText.c_str() << endl;
     m_outFile.open(m_outputFileText.c_str());
-  } 
+  }
   m_outputFileROOT = ps.getUntrackedParameter<string>("outputFileHist", "");
-  if ( !m_outputFileROOT.empty() ) {
+  if (!m_outputFileROOT.empty()) {
     cout << "Castor LED histograms will be saved to " << m_outputFileROOT.c_str() << endl;
   }
 
-  m_nevtsample = ps.getUntrackedParameter<int>("nevtsample",9999999);
-  if(m_nevtsample<1)m_nevtsample=9999999;
-  m_hiSaveflag = ps.getUntrackedParameter<int>("hiSaveflag",0);
-  if(m_hiSaveflag<0)m_hiSaveflag=0;
-  if(m_hiSaveflag>0)m_hiSaveflag=1;
-  m_fitflag = ps.getUntrackedParameter<int>("analysisflag",2);
-  if(m_fitflag<0)m_fitflag=0;
-  if(m_fitflag>4)m_fitflag=4;
+  m_nevtsample = ps.getUntrackedParameter<int>("nevtsample", 9999999);
+  if (m_nevtsample < 1)
+    m_nevtsample = 9999999;
+  m_hiSaveflag = ps.getUntrackedParameter<int>("hiSaveflag", 0);
+  if (m_hiSaveflag < 0)
+    m_hiSaveflag = 0;
+  if (m_hiSaveflag > 0)
+    m_hiSaveflag = 1;
+  m_fitflag = ps.getUntrackedParameter<int>("analysisflag", 2);
+  if (m_fitflag < 0)
+    m_fitflag = 0;
+  if (m_fitflag > 4)
+    m_fitflag = 4;
   m_startTS = ps.getUntrackedParameter<int>("firstTS", 0);
-  if(m_startTS<0) m_startTS=0;
+  if (m_startTS < 0)
+    m_startTS = 0;
   m_endTS = ps.getUntrackedParameter<int>("lastTS", 9);
-  m_usecalib = ps.getUntrackedParameter<bool>("usecalib",false);
+  m_usecalib = ps.getUntrackedParameter<bool>("usecalib", false);
   m_logFile.open("CastorLedAnalysis.log");
 
-  int runNum = ps.getUntrackedParameter<int>("runNumber",999999);
+  int runNum = ps.getUntrackedParameter<int>("runNumber", 999999);
 
   // histogram booking
-  castorHists.ALLLEDS = new TH1F("Castor All LEDs","HF All Leds",10,0,9);
-  castorHists.LEDRMS= new TH1F("Castor All LED RMS","HF All LED RMS",100,0,3);
-  castorHists.LEDMEAN= new TH1F("Castor All LED Means","HF All LED Means",100,0,9);
-  castorHists.CHI2= new TH1F("Castor Chi2 by ndf for Landau fit","HF Chi2/ndf Landau",200,0.,50.);
+  castorHists.ALLLEDS = new TH1F("Castor All LEDs", "HF All Leds", 10, 0, 9);
+  castorHists.LEDRMS = new TH1F("Castor All LED RMS", "HF All LED RMS", 100, 0, 3);
+  castorHists.LEDMEAN = new TH1F("Castor All LED Means", "HF All LED Means", 100, 0, 9);
+  castorHists.CHI2 = new TH1F("Castor Chi2 by ndf for Landau fit", "HF Chi2/ndf Landau", 200, 0., 50.);
 
   //XML file header
   m_outputFileXML.open(m_outputFileX.c_str());
@@ -126,16 +131,15 @@ CastorLedAnalysis::CastorLedAnalysis(const edm::ParameterSet& ps)
   m_outputFileXML << output << endl;
   snprintf(output, sizeof output, "  </MAPS>");
   m_outputFileXML << output << endl;
-
-
 }
 
 //-----------------------------------------------------------------------------
-CastorLedAnalysis::~CastorLedAnalysis(){
+CastorLedAnalysis::~CastorLedAnalysis() {
   ///All done, clean up!!
 
-  for(_meol=castorHists.LEDTRENDS.begin(); _meol!=castorHists.LEDTRENDS.end(); _meol++){
-    for(int i=0; i<15; i++) _meol->second[i].first->Delete();
+  for (_meol = castorHists.LEDTRENDS.begin(); _meol != castorHists.LEDTRENDS.end(); _meol++) {
+    for (int i = 0; i < 15; i++)
+      _meol->second[i].first->Delete();
   }
 
   castorHists.ALLLEDS->Delete();
@@ -147,87 +151,102 @@ CastorLedAnalysis::~CastorLedAnalysis(){
 //-----------------------------------------------------------------------------
 void CastorLedAnalysis::LedSetup(const std::string& m_outputFileROOT) {
   // open the histogram file, create directories within
-  m_file=new TFile(m_outputFileROOT.c_str(),"RECREATE");
+  m_file = new TFile(m_outputFileROOT.c_str(), "RECREATE");
   m_file->mkdir("Castor");
   m_file->cd();
 }
 
 //-----------------------------------------------------------------------------
-void CastorLedAnalysis::GetLedConst(map<HcalDetId, map<int,LEDBUNCH> > &toolT){
-  double time2=0; double time1=0; double time3=0; double time4=0;
-  double dtime2=0; double dtime1=0; double dtime3=0; double dtime4=0;
+void CastorLedAnalysis::GetLedConst(map<HcalDetId, map<int, LEDBUNCH> >& toolT) {
+  double time2 = 0;
+  double time1 = 0;
+  double time3 = 0;
+  double time4 = 0;
+  double dtime2 = 0;
+  double dtime1 = 0;
+  double dtime3 = 0;
+  double dtime4 = 0;
   char output[100]{0};
 
-  if (m_outputFileText!=""){
-    if(m_fitflag==0 || m_fitflag==2) m_outFile<<"Det Eta,Phi,D   Mean    Error"<<std::endl;
-    else if(m_fitflag==1 || m_fitflag==3) m_outFile<<"Det Eta,Phi,D   Peak    Error"<<std::endl;
-    else if(m_fitflag==4) m_outFile<<"Det Eta,Phi,D   Mean    Error      Peak    Error       MeanEv  Error       PeakEv  Error"<<std::endl;
+  if (!m_outputFileText.empty()) {
+    if (m_fitflag == 0 || m_fitflag == 2)
+      m_outFile << "Det Eta,Phi,D   Mean    Error" << std::endl;
+    else if (m_fitflag == 1 || m_fitflag == 3)
+      m_outFile << "Det Eta,Phi,D   Peak    Error" << std::endl;
+    else if (m_fitflag == 4)
+      m_outFile << "Det Eta,Phi,D   Mean    Error      Peak    Error       MeanEv  Error       PeakEv  Error"
+                << std::endl;
   }
-  for(_meol=toolT.begin(); _meol!=toolT.end(); _meol++){
-// scale the LED pulse to 1 event
-    _meol->second[10].first->Scale(1./evt_curr);
-    if(m_fitflag==0 || m_fitflag==4){
+  for (_meol = toolT.begin(); _meol != toolT.end(); _meol++) {
+    // scale the LED pulse to 1 event
+    _meol->second[10].first->Scale(1. / evt_curr);
+    if (m_fitflag == 0 || m_fitflag == 4) {
       time1 = _meol->second[10].first->GetMean();
-      dtime1 = _meol->second[10].first->GetRMS()/sqrt((float)evt_curr*(m_endTS-m_startTS+1));
+      dtime1 = _meol->second[10].first->GetRMS() / sqrt((float)evt_curr * (m_endTS - m_startTS + 1));
     }
-    if(m_fitflag==1 || m_fitflag==4){
-// put proper errors
-      for(int j=0; j<10; j++) _meol->second[10].first->SetBinError(j+1,_meol->second[j].first->GetRMS()/sqrt((float)evt_curr));
+    if (m_fitflag == 1 || m_fitflag == 4) {
+      // put proper errors
+      for (int j = 0; j < 10; j++)
+        _meol->second[10].first->SetBinError(j + 1, _meol->second[j].first->GetRMS() / sqrt((float)evt_curr));
     }
-    if(m_fitflag==1 || m_fitflag==3 || m_fitflag==4){
-      _meol->second[10].first->Fit("landau","Q");
-//      _meol->second[10].first->Fit("gaus","Q");
-      TF1 *fit = _meol->second[10].first->GetFunction("landau");
-//      TF1 *fit = _meol->second[10].first->GetFunction("gaus");
-      time2=fit->GetParameter(1);
-      dtime2=fit->GetParError(1);
+    if (m_fitflag == 1 || m_fitflag == 3 || m_fitflag == 4) {
+      _meol->second[10].first->Fit("landau", "Q");
+      //      _meol->second[10].first->Fit("gaus","Q");
+      TF1* fit = _meol->second[10].first->GetFunction("landau");
+      //      TF1 *fit = _meol->second[10].first->GetFunction("gaus");
+      time2 = fit->GetParameter(1);
+      dtime2 = fit->GetParError(1);
     }
-    if(m_fitflag==2 || m_fitflag==4){
+    if (m_fitflag == 2 || m_fitflag == 4) {
       time3 = _meol->second[12].first->GetMean();
-      dtime3 = _meol->second[12].first->GetRMS()/sqrt((float)_meol->second[12].first->GetEntries());
+      dtime3 = _meol->second[12].first->GetRMS() / sqrt((float)_meol->second[12].first->GetEntries());
     }
-    if(m_fitflag==3 || m_fitflag==4){
+    if (m_fitflag == 3 || m_fitflag == 4) {
       time4 = _meol->second[13].first->GetMean();
-      dtime4 = _meol->second[13].first->GetRMS()/sqrt((float)_meol->second[13].first->GetEntries());
+      dtime4 = _meol->second[13].first->GetRMS() / sqrt((float)_meol->second[13].first->GetEntries());
     }
-    for (int i=0; i<10; i++){
+    for (int i = 0; i < 10; i++) {
       _meol->second[i].first->GetXaxis()->SetTitle("Pulse height (fC)");
       _meol->second[i].first->GetYaxis()->SetTitle("Counts");
-//      if(m_hiSaveflag>0)_meol->second[i].first->Write();
+      //      if(m_hiSaveflag>0)_meol->second[i].first->Write();
     }
     _meol->second[10].first->GetXaxis()->SetTitle("Time slice");
     _meol->second[10].first->GetYaxis()->SetTitle("Averaged pulse (fC)");
-    if(m_hiSaveflag>0)_meol->second[10].first->Write();
+    if (m_hiSaveflag > 0)
+      _meol->second[10].first->Write();
     _meol->second[10].second.first[0].push_back(time1);
     _meol->second[10].second.first[1].push_back(dtime1);
     _meol->second[11].second.first[0].push_back(time2);
     _meol->second[11].second.first[1].push_back(dtime2);
     _meol->second[12].first->GetXaxis()->SetTitle("Mean TS");
     _meol->second[12].first->GetYaxis()->SetTitle("Counts");
-    if(m_fitflag==2 && m_hiSaveflag>0)_meol->second[12].first->Write();
+    if (m_fitflag == 2 && m_hiSaveflag > 0)
+      _meol->second[12].first->Write();
     _meol->second[12].second.first[0].push_back(time3);
     _meol->second[12].second.first[1].push_back(dtime3);
     _meol->second[13].first->GetXaxis()->SetTitle("Peak TS");
     _meol->second[13].first->GetYaxis()->SetTitle("Counts");
-    if(m_fitflag>2 && m_hiSaveflag>0)_meol->second[13].first->Write();
+    if (m_fitflag > 2 && m_hiSaveflag > 0)
+      _meol->second[13].first->Write();
     _meol->second[13].second.first[0].push_back(time4);
     _meol->second[13].second.first[1].push_back(dtime4);
     _meol->second[14].first->GetXaxis()->SetTitle("Peak TS error");
     _meol->second[14].first->GetYaxis()->SetTitle("Counts");
-    if(m_fitflag>2 && m_hiSaveflag>0)_meol->second[14].first->Write();
+    if (m_fitflag > 2 && m_hiSaveflag > 0)
+      _meol->second[14].first->Write();
     _meol->second[15].first->GetXaxis()->SetTitle("Chi2/NDF");
     _meol->second[15].first->GetYaxis()->SetTitle("Counts");
-    if(m_fitflag>2 && m_hiSaveflag>0)_meol->second[15].first->Write();
+    if (m_fitflag > 2 && m_hiSaveflag > 0)
+      _meol->second[15].first->Write();
     _meol->second[16].first->GetXaxis()->SetTitle("Integrated Signal");
     _meol->second[16].first->Write();
 
-
-// Ascii printout (need to modify to include new info)
+    // Ascii printout (need to modify to include new info)
     HcalDetId detid = _meol->first;
 
-    if (m_outputFileText!=""){
-      if(m_fitflag==0) {
-	m_outFile<<detid<<"   "<<time1<<" "<<dtime1<<std::endl;
+    if (!m_outputFileText.empty()) {
+      if (m_fitflag == 0) {
+        m_outFile << detid << "   " << time1 << " " << dtime1 << std::endl;
         snprintf(output, sizeof output, "  <DATA_SET>");
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "    <VERSION>version:1</VERSION>");
@@ -236,20 +255,24 @@ void CastorLedAnalysis::GetLedConst(map<HcalDetId, map<int,LEDBUNCH> > &toolT){
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "      <EXTENSION_TABLE_NAME>HCAL_CHANNELS</EXTENSION_TABLE_NAME>");
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <ETA>%2i</ETA>", detid.ietaAbs() );
+        snprintf(output, sizeof output, "      <ETA>%2i</ETA>", detid.ietaAbs());
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <PHI>%2i</PHI>", detid.iphi() );
+        snprintf(output, sizeof output, "      <PHI>%2i</PHI>", detid.iphi());
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <DEPTH>%2i</DEPTH>", detid.depth() );
+        snprintf(output, sizeof output, "      <DEPTH>%2i</DEPTH>", detid.depth());
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <Z>%2i</Z>", detid.zside() );
+        snprintf(output, sizeof output, "      <Z>%2i</Z>", detid.zside());
         m_outputFileXML << output << endl;
-        if(detid.subdet() == 1) snprintf(output, sizeof output, "      <DETECTOR_NAME>HB</DETECTOR_NAME>");
-        if(detid.subdet() == 2) snprintf(output, sizeof output, "      <DETECTOR_NAME>HE</DETECTOR_NAME>");
-        if(detid.subdet() == 3) snprintf(output, sizeof output, "      <DETECTOR_NAME>HO</DETECTOR_NAME>");
-        if(detid.subdet() == 4) snprintf(output, sizeof output, "      <DETECTOR_NAME>HF</DETECTOR_NAME>");
+        if (detid.subdet() == 1)
+          snprintf(output, sizeof output, "      <DETECTOR_NAME>HB</DETECTOR_NAME>");
+        if (detid.subdet() == 2)
+          snprintf(output, sizeof output, "      <DETECTOR_NAME>HE</DETECTOR_NAME>");
+        if (detid.subdet() == 3)
+          snprintf(output, sizeof output, "      <DETECTOR_NAME>HO</DETECTOR_NAME>");
+        if (detid.subdet() == 4)
+          snprintf(output, sizeof output, "      <DETECTOR_NAME>HF</DETECTOR_NAME>");
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <HCAL_CHANNEL_ID>%10i</HCAL_CHANNEL_ID>", detid.rawId() );
+        snprintf(output, sizeof output, "      <HCAL_CHANNEL_ID>%10i</HCAL_CHANNEL_ID>", detid.rawId());
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "    </CHANNEL>");
         m_outputFileXML << output << endl;
@@ -261,7 +284,7 @@ void CastorLedAnalysis::GetLedConst(map<HcalDetId, map<int,LEDBUNCH> > &toolT){
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "      <ERROR_STAT>%7f</ERROR_STAT>", dtime1);
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <ANALYSIS_FLAG>%2i</ANALYSIS_FLAG>", m_fitflag+1);
+        snprintf(output, sizeof output, "      <ANALYSIS_FLAG>%2i</ANALYSIS_FLAG>", m_fitflag + 1);
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "      <STATUS_WORD>  0</STATUS_WORD>");
         m_outputFileXML << output << endl;
@@ -270,9 +293,8 @@ void CastorLedAnalysis::GetLedConst(map<HcalDetId, map<int,LEDBUNCH> > &toolT){
         snprintf(output, sizeof output, "  </DATA_SET>");
         m_outputFileXML << output << endl;
 
-	}
-      else if(m_fitflag==1){
-	m_outFile<<detid<<"   "<<time2<<" "<<dtime2<<std::endl;
+      } else if (m_fitflag == 1) {
+        m_outFile << detid << "   " << time2 << " " << dtime2 << std::endl;
         snprintf(output, sizeof output, "  <DATA_SET>");
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "    <VERSION>version:1</VERSION>");
@@ -281,20 +303,24 @@ void CastorLedAnalysis::GetLedConst(map<HcalDetId, map<int,LEDBUNCH> > &toolT){
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "      <EXTENSION_TABLE_NAME>HCAL_CHANNELS</EXTENSION_TABLE_NAME>");
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <ETA>%2i</ETA>", detid.ietaAbs() );
+        snprintf(output, sizeof output, "      <ETA>%2i</ETA>", detid.ietaAbs());
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <PHI>%2i</PHI>", detid.iphi() );
+        snprintf(output, sizeof output, "      <PHI>%2i</PHI>", detid.iphi());
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <DEPTH>%2i</DEPTH>", detid.depth() );
+        snprintf(output, sizeof output, "      <DEPTH>%2i</DEPTH>", detid.depth());
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <Z>%2i</Z>", detid.zside() );
+        snprintf(output, sizeof output, "      <Z>%2i</Z>", detid.zside());
         m_outputFileXML << output << endl;
-        if(detid.subdet() == 1) snprintf(output, sizeof output, "      <DETECTOR_NAME>HB</DETECTOR_NAME>");
-        if(detid.subdet() == 2) snprintf(output, sizeof output, "      <DETECTOR_NAME>HE</DETECTOR_NAME>");
-        if(detid.subdet() == 3) snprintf(output, sizeof output, "      <DETECTOR_NAME>HO</DETECTOR_NAME>");
-        if(detid.subdet() == 4) snprintf(output, sizeof output, "      <DETECTOR_NAME>HF</DETECTOR_NAME>");
+        if (detid.subdet() == 1)
+          snprintf(output, sizeof output, "      <DETECTOR_NAME>HB</DETECTOR_NAME>");
+        if (detid.subdet() == 2)
+          snprintf(output, sizeof output, "      <DETECTOR_NAME>HE</DETECTOR_NAME>");
+        if (detid.subdet() == 3)
+          snprintf(output, sizeof output, "      <DETECTOR_NAME>HO</DETECTOR_NAME>");
+        if (detid.subdet() == 4)
+          snprintf(output, sizeof output, "      <DETECTOR_NAME>HF</DETECTOR_NAME>");
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <HCAL_CHANNEL_ID>%10i</HCAL_CHANNEL_ID>", detid.rawId() );
+        snprintf(output, sizeof output, "      <HCAL_CHANNEL_ID>%10i</HCAL_CHANNEL_ID>", detid.rawId());
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "    </CHANNEL>");
         m_outputFileXML << output << endl;
@@ -306,7 +332,7 @@ void CastorLedAnalysis::GetLedConst(map<HcalDetId, map<int,LEDBUNCH> > &toolT){
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "      <ERROR_STAT>%7f</ERROR_STAT>", dtime2);
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <ANALYSIS_FLAG>%2i</ANALYSIS_FLAG>", m_fitflag+1);
+        snprintf(output, sizeof output, "      <ANALYSIS_FLAG>%2i</ANALYSIS_FLAG>", m_fitflag + 1);
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "      <STATUS_WORD>  0</STATUS_WORD>");
         m_outputFileXML << output << endl;
@@ -314,10 +340,10 @@ void CastorLedAnalysis::GetLedConst(map<HcalDetId, map<int,LEDBUNCH> > &toolT){
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "  </DATA_SET>");
         m_outputFileXML << output << endl;
-        }
+      }
 
-      else if(m_fitflag==2){
-	m_outFile<<detid<<"   "<<time3<<" "<<dtime3<<std::endl;
+      else if (m_fitflag == 2) {
+        m_outFile << detid << "   " << time3 << " " << dtime3 << std::endl;
         snprintf(output, sizeof output, "  <DATA_SET>");
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "    <VERSION>version:1</VERSION>");
@@ -326,20 +352,24 @@ void CastorLedAnalysis::GetLedConst(map<HcalDetId, map<int,LEDBUNCH> > &toolT){
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "      <EXTENSION_TABLE_NAME>HCAL_CHANNELS</EXTENSION_TABLE_NAME>");
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <ETA>%2i</ETA>", detid.ietaAbs() );
+        snprintf(output, sizeof output, "      <ETA>%2i</ETA>", detid.ietaAbs());
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <PHI>%2i</PHI>", detid.iphi() );
+        snprintf(output, sizeof output, "      <PHI>%2i</PHI>", detid.iphi());
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <DEPTH>%2i</DEPTH>", detid.depth() );
+        snprintf(output, sizeof output, "      <DEPTH>%2i</DEPTH>", detid.depth());
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <Z>%2i</Z>", detid.zside() );
+        snprintf(output, sizeof output, "      <Z>%2i</Z>", detid.zside());
         m_outputFileXML << output << endl;
-	if(detid.subdet() == 1) snprintf(output, sizeof output, "      <DETECTOR_NAME>HB</DETECTOR_NAME>");
-        if(detid.subdet() == 2) snprintf(output, sizeof output, "      <DETECTOR_NAME>HE</DETECTOR_NAME>");
-        if(detid.subdet() == 3) snprintf(output, sizeof output, "      <DETECTOR_NAME>HO</DETECTOR_NAME>");
-        if(detid.subdet() == 4) snprintf(output, sizeof output, "      <DETECTOR_NAME>HF</DETECTOR_NAME>");
+        if (detid.subdet() == 1)
+          snprintf(output, sizeof output, "      <DETECTOR_NAME>HB</DETECTOR_NAME>");
+        if (detid.subdet() == 2)
+          snprintf(output, sizeof output, "      <DETECTOR_NAME>HE</DETECTOR_NAME>");
+        if (detid.subdet() == 3)
+          snprintf(output, sizeof output, "      <DETECTOR_NAME>HO</DETECTOR_NAME>");
+        if (detid.subdet() == 4)
+          snprintf(output, sizeof output, "      <DETECTOR_NAME>HF</DETECTOR_NAME>");
         m_outputFileXML << output << endl;
-	snprintf(output, sizeof output, "      <HCAL_CHANNEL_ID>%10i</HCAL_CHANNEL_ID>", detid.rawId() );
+        snprintf(output, sizeof output, "      <HCAL_CHANNEL_ID>%10i</HCAL_CHANNEL_ID>", detid.rawId());
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "    </CHANNEL>");
         m_outputFileXML << output << endl;
@@ -351,17 +381,16 @@ void CastorLedAnalysis::GetLedConst(map<HcalDetId, map<int,LEDBUNCH> > &toolT){
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "      <ERROR_STAT>%7f</ERROR_STAT>", dtime3);
         m_outputFileXML << output << endl;
-	snprintf(output, sizeof output, "      <ANALYSIS_FLAG>%2i</ANALYSIS_FLAG>", m_fitflag+1);
-	m_outputFileXML << output << endl;
-  	snprintf(output, sizeof output, "      <STATUS_WORD>  0</STATUS_WORD>");
-  	m_outputFileXML << output << endl;
+        snprintf(output, sizeof output, "      <ANALYSIS_FLAG>%2i</ANALYSIS_FLAG>", m_fitflag + 1);
+        m_outputFileXML << output << endl;
+        snprintf(output, sizeof output, "      <STATUS_WORD>  0</STATUS_WORD>");
+        m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "    </DATA>");
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "  </DATA_SET>");
         m_outputFileXML << output << endl;
-        }
-      else if(m_fitflag==3){
-	m_outFile<<detid<<"   "<<time4<<" "<<dtime4<<std::endl;
+      } else if (m_fitflag == 3) {
+        m_outFile << detid << "   " << time4 << " " << dtime4 << std::endl;
         snprintf(output, sizeof output, "  <DATA_SET>");
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "    <VERSION>version:1</VERSION>");
@@ -370,20 +399,24 @@ void CastorLedAnalysis::GetLedConst(map<HcalDetId, map<int,LEDBUNCH> > &toolT){
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "      <EXTENSION_TABLE_NAME>HCAL_CHANNELS</EXTENSION_TABLE_NAME>");
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <ETA>%2i</ETA>", detid.ietaAbs() );
+        snprintf(output, sizeof output, "      <ETA>%2i</ETA>", detid.ietaAbs());
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <PHI>%2i</PHI>", detid.iphi() );
+        snprintf(output, sizeof output, "      <PHI>%2i</PHI>", detid.iphi());
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <DEPTH>%2i</DEPTH>", detid.depth() );
+        snprintf(output, sizeof output, "      <DEPTH>%2i</DEPTH>", detid.depth());
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <Z>%2i</Z>", detid.zside() );
+        snprintf(output, sizeof output, "      <Z>%2i</Z>", detid.zside());
         m_outputFileXML << output << endl;
-        if(detid.subdet() == 1) snprintf(output, sizeof output, "      <DETECTOR_NAME>HB</DETECTOR_NAME>");
-        if(detid.subdet() == 2) snprintf(output, sizeof output, "      <DETECTOR_NAME>HE</DETECTOR_NAME>");
-        if(detid.subdet() == 3) snprintf(output, sizeof output, "      <DETECTOR_NAME>HO</DETECTOR_NAME>");
-        if(detid.subdet() == 4) snprintf(output, sizeof output, "      <DETECTOR_NAME>HF</DETECTOR_NAME>");
+        if (detid.subdet() == 1)
+          snprintf(output, sizeof output, "      <DETECTOR_NAME>HB</DETECTOR_NAME>");
+        if (detid.subdet() == 2)
+          snprintf(output, sizeof output, "      <DETECTOR_NAME>HE</DETECTOR_NAME>");
+        if (detid.subdet() == 3)
+          snprintf(output, sizeof output, "      <DETECTOR_NAME>HO</DETECTOR_NAME>");
+        if (detid.subdet() == 4)
+          snprintf(output, sizeof output, "      <DETECTOR_NAME>HF</DETECTOR_NAME>");
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <HCAL_CHANNEL_ID>%10i</HCAL_CHANNEL_ID>", detid.rawId() );
+        snprintf(output, sizeof output, "      <HCAL_CHANNEL_ID>%10i</HCAL_CHANNEL_ID>", detid.rawId());
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "    </CHANNEL>");
         m_outputFileXML << output << endl;
@@ -395,7 +428,7 @@ void CastorLedAnalysis::GetLedConst(map<HcalDetId, map<int,LEDBUNCH> > &toolT){
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "      <ERROR_STAT>%7f</ERROR_STAT>", dtime4);
         m_outputFileXML << output << endl;
-        snprintf(output, sizeof output, "      <ANALYSIS_FLAG>%2i</ANALYSIS_FLAG>", m_fitflag+1);
+        snprintf(output, sizeof output, "      <ANALYSIS_FLAG>%2i</ANALYSIS_FLAG>", m_fitflag + 1);
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "      <STATUS_WORD>  0</STATUS_WORD>");
         m_outputFileXML << output << endl;
@@ -403,70 +436,70 @@ void CastorLedAnalysis::GetLedConst(map<HcalDetId, map<int,LEDBUNCH> > &toolT){
         m_outputFileXML << output << endl;
         snprintf(output, sizeof output, "  </DATA_SET>");
         m_outputFileXML << output << endl;
-        }
+      }
 
-      else if(m_fitflag==4){
-	m_outFile<<detid<<"   "<<time1<<" "<<dtime1<<"   "<<time2<<" "<<dtime2<<"   "<<time3<<" "<<dtime3<<"   "<<time4<<" "<<dtime4<<std::endl;
-	}
+      else if (m_fitflag == 4) {
+        m_outFile << detid << "   " << time1 << " " << dtime1 << "   " << time2 << " " << dtime2 << "   " << time3
+                  << " " << dtime3 << "   " << time4 << " " << dtime4 << std::endl;
+      }
     }
   }
 }
 
 //-----------------------------------------------------------------------------
-void CastorLedAnalysis::LedSampleAnalysis(){
+void CastorLedAnalysis::LedSampleAnalysis() {
   // it is called every m_nevtsample events (a sample) and the end of run
   char LedSampleNum[20];
 
-  sprintf(LedSampleNum,"LedSample_%d",sample);
+  sprintf(LedSampleNum, "LedSample_%d", sample);
   m_file->cd();
   m_file->mkdir(LedSampleNum);
   m_file->cd(LedSampleNum);
 
-// Compute LED constants
+  // Compute LED constants
   GetLedConst(castorHists.LEDTRENDS);
 }
 
 //-----------------------------------------------------------------------------
-void CastorLedAnalysis::LedTrendings(map<HcalDetId, map<int,LEDBUNCH> > &toolT)
-{
-
-  for(_meol=toolT.begin(); _meol!=toolT.end(); _meol++){
+void CastorLedAnalysis::LedTrendings(map<HcalDetId, map<int, LEDBUNCH> >& toolT) {
+  for (_meol = toolT.begin(); _meol != toolT.end(); _meol++) {
     char name[1024];
     HcalDetId detid = _meol->first;
-    sprintf(name,"LED timing trend, eta=%d phi=%d depth=%d",detid.ieta(),detid.iphi(),detid.depth());
-    int bins = _meol->second[10+m_fitflag].second.first[0].size();
-    float lo =0.5;
-    float hi = (float)bins+0.5;
-    _meol->second[10+m_fitflag].second.second.push_back(new TH1F(name,name,bins,lo,hi));
+    sprintf(name, "LED timing trend, eta=%d phi=%d depth=%d", detid.ieta(), detid.iphi(), detid.depth());
+    int bins = _meol->second[10 + m_fitflag].second.first[0].size();
+    float lo = 0.5;
+    float hi = (float)bins + 0.5;
+    _meol->second[10 + m_fitflag].second.second.push_back(new TH1F(name, name, bins, lo, hi));
 
     std::vector<double>::iterator sample_it;
-// LED timing - put content and errors
-    int j=0;
-    for(sample_it=_meol->second[10+m_fitflag].second.first[0].begin();
-        sample_it!=_meol->second[10+m_fitflag].second.first[0].end();++sample_it){
-      _meol->second[10+m_fitflag].second.second[0]->SetBinContent(++j,*sample_it);
+    // LED timing - put content and errors
+    int j = 0;
+    for (sample_it = _meol->second[10 + m_fitflag].second.first[0].begin();
+         sample_it != _meol->second[10 + m_fitflag].second.first[0].end();
+         ++sample_it) {
+      _meol->second[10 + m_fitflag].second.second[0]->SetBinContent(++j, *sample_it);
     }
-    j=0;
-    for(sample_it=_meol->second[10+m_fitflag].second.first[1].begin();
-        sample_it!=_meol->second[10+m_fitflag].second.first[1].end();++sample_it){
-      _meol->second[10+m_fitflag].second.second[0]->SetBinError(++j,*sample_it);
+    j = 0;
+    for (sample_it = _meol->second[10 + m_fitflag].second.first[1].begin();
+         sample_it != _meol->second[10 + m_fitflag].second.first[1].end();
+         ++sample_it) {
+      _meol->second[10 + m_fitflag].second.second[0]->SetBinError(++j, *sample_it);
     }
-    sprintf(name,"Sample (%d events)",m_nevtsample);
-    _meol->second[10+m_fitflag].second.second[0]->GetXaxis()->SetTitle(name);
-    _meol->second[10+m_fitflag].second.second[0]->GetYaxis()->SetTitle("Peak position");
-    _meol->second[10+m_fitflag].second.second[0]->Write();
+    sprintf(name, "Sample (%d events)", m_nevtsample);
+    _meol->second[10 + m_fitflag].second.second[0]->GetXaxis()->SetTitle(name);
+    _meol->second[10 + m_fitflag].second.second[0]->GetYaxis()->SetTitle("Peak position");
+    _meol->second[10 + m_fitflag].second.second[0]->Write();
   }
 }
 
 //-----------------------------------------------------------------------------
-void CastorLedAnalysis::LedDone() 
-{
+void CastorLedAnalysis::LedDone() {
+  // First process the last sample (remaining events).
+  if (evt % m_nevtsample != 0)
+    LedSampleAnalysis();
 
-// First process the last sample (remaining events).
-  if(evt%m_nevtsample!=0) LedSampleAnalysis();
-
-// Now do the end of run analysis: trending histos
-  if(sample>1 && m_fitflag!=4){
+  // Now do the end of run analysis: trending histos
+  if (sample > 1 && m_fitflag != 4) {
     m_file->cd();
     m_file->cd("Castor");
     LedTrendings(castorHists.LEDTRENDS);
@@ -480,84 +513,95 @@ void CastorLedAnalysis::LedDone()
   castorHists.LEDMEAN->Write();
 
   // Write the histo file and close it
-//  m_file->Write();
+  //  m_file->Write();
   m_file->Close();
   cout << "Castor histograms written to " << m_outputFileROOT.c_str() << endl;
 }
 
 //-----------------------------------------------------------------------------
-void CastorLedAnalysis::processLedEvent(const CastorDigiCollection& castor,
-					const CastorDbService& cond)
-{
+void CastorLedAnalysis::processLedEvent(const CastorDigiCollection& castor, const CastorDbService& cond) {
   evt++;
-  sample = (evt-1)/m_nevtsample +1;
-  evt_curr = evt%m_nevtsample;
-  if(evt_curr==0)evt_curr=m_nevtsample;
+  sample = (evt - 1) / m_nevtsample + 1;
+  evt_curr = evt % m_nevtsample;
+  if (evt_curr == 0)
+    evt_curr = m_nevtsample;
 
   // HF/Castor
-  try{
-    if(castor.empty()) throw (int)castor.size();
-    for (CastorDigiCollection::const_iterator j=castor.begin(); j!=castor.end(); ++j){
+  try {
+    if (castor.empty())
+      throw(int) castor.size();
+    for (CastorDigiCollection::const_iterator j = castor.begin(); j != castor.end(); ++j) {
       const CastorDataFrame digi = (const CastorDataFrame)(*j);
       _meol = castorHists.LEDTRENDS.find(digi.id());
-      if (_meol==castorHists.LEDTRENDS.end()){
-        SetupLEDHists(2,digi.id(),castorHists.LEDTRENDS);
+      if (_meol == castorHists.LEDTRENDS.end()) {
+        SetupLEDHists(2, digi.id(), castorHists.LEDTRENDS);
       }
-      LedCastorHists(digi.id(),digi,castorHists.LEDTRENDS,cond);
+      LedCastorHists(digi.id(), digi, castorHists.LEDTRENDS, cond);
     }
-  } 
-  catch (int i ) {
-//    m_logFile << "Event with " << i<<" Castor Digis passed." << std::endl;
-  } 
+  } catch (int i) {
+    //    m_logFile << "Event with " << i<<" Castor Digis passed." << std::endl;
+  }
 
   // Call the function every m_nevtsample events
-  if(evt%m_nevtsample==0) LedSampleAnalysis();
-
+  if (evt % m_nevtsample == 0)
+    LedSampleAnalysis();
 }
 //----------------------------------------------------------------------------
-void CastorLedAnalysis::SetupLEDHists(int id, const HcalDetId detid, map<HcalDetId, map<int,LEDBUNCH> > &toolT) {
-
+void CastorLedAnalysis::SetupLEDHists(int id, const HcalDetId detid, map<HcalDetId, map<int, LEDBUNCH> >& toolT) {
   string type = "HBHE";
-  if(id==1) type = "HO";
-  if(id==2) type = "HF";
+  if (id == 1)
+    type = "HO";
+  if (id == 2)
+    type = "HF";
 
   _meol = toolT.find(detid);
-  if (_meol==toolT.end()){
-// if histos for this channel do not exist, create them
-    map<int,LEDBUNCH> insert;
+  if (_meol == toolT.end()) {
+    // if histos for this channel do not exist, create them
+    map<int, LEDBUNCH> insert;
     char name[1024];
-    for(int i=0; i<10; i++){
-      sprintf(name,"%s Pulse height, eta=%d phi=%d depth=%d TS=%d",type.c_str(),detid.ieta(),detid.iphi(),detid.depth(),i);
-      insert[i].first =  new TH1F(name,name,200,0.,2000.);
+    for (int i = 0; i < 10; i++) {
+      sprintf(name,
+              "%s Pulse height, eta=%d phi=%d depth=%d TS=%d",
+              type.c_str(),
+              detid.ieta(),
+              detid.iphi(),
+              detid.depth(),
+              i);
+      insert[i].first = new TH1F(name, name, 200, 0., 2000.);
     }
-    sprintf(name,"%s LED Mean pulse, eta=%d phi=%d depth=%d",type.c_str(),detid.ieta(),detid.iphi(),detid.depth());
-    insert[10].first =  new TH1F(name,name,10,-0.5,9.5);
-    sprintf(name,"%s LED Pulse, eta=%d phi=%d depth=%d",type.c_str(),detid.ieta(),detid.iphi(),detid.depth());
-    insert[11].first =  new TH1F(name,name,10,-0.5,9.5);
-    sprintf(name,"%s Mean TS, eta=%d phi=%d depth=%d",type.c_str(),detid.ieta(),detid.iphi(),detid.depth());
-    insert[12].first =  new TH1F(name,name,200,0.,10.);
-    sprintf(name,"%s Peak TS, eta=%d phi=%d depth=%d",type.c_str(),detid.ieta(),detid.iphi(),detid.depth());
-    insert[13].first =  new TH1F(name,name,200,0.,10.);
-    sprintf(name,"%s Peak TS error, eta=%d phi=%d depth=%d",type.c_str(),detid.ieta(),detid.iphi(),detid.depth());
-    insert[14].first =  new TH1F(name,name,200,0.,0.05);
-    sprintf(name,"%s Fit chi2, eta=%d phi=%d depth=%d",type.c_str(),detid.ieta(),detid.iphi(),detid.depth());
-    insert[15].first =  new TH1F(name,name,100,0.,50.);
-    sprintf(name,"%s Integrated Signal, eta=%d phi=%d depth=%d",type.c_str(),detid.ieta(),detid.iphi(),detid.depth());
-    insert[16].first =  new TH1F(name,name,500,0.,5000.);
+    sprintf(name, "%s LED Mean pulse, eta=%d phi=%d depth=%d", type.c_str(), detid.ieta(), detid.iphi(), detid.depth());
+    insert[10].first = new TH1F(name, name, 10, -0.5, 9.5);
+    sprintf(name, "%s LED Pulse, eta=%d phi=%d depth=%d", type.c_str(), detid.ieta(), detid.iphi(), detid.depth());
+    insert[11].first = new TH1F(name, name, 10, -0.5, 9.5);
+    sprintf(name, "%s Mean TS, eta=%d phi=%d depth=%d", type.c_str(), detid.ieta(), detid.iphi(), detid.depth());
+    insert[12].first = new TH1F(name, name, 200, 0., 10.);
+    sprintf(name, "%s Peak TS, eta=%d phi=%d depth=%d", type.c_str(), detid.ieta(), detid.iphi(), detid.depth());
+    insert[13].first = new TH1F(name, name, 200, 0., 10.);
+    sprintf(name, "%s Peak TS error, eta=%d phi=%d depth=%d", type.c_str(), detid.ieta(), detid.iphi(), detid.depth());
+    insert[14].first = new TH1F(name, name, 200, 0., 0.05);
+    sprintf(name, "%s Fit chi2, eta=%d phi=%d depth=%d", type.c_str(), detid.ieta(), detid.iphi(), detid.depth());
+    insert[15].first = new TH1F(name, name, 100, 0., 50.);
+    sprintf(
+        name, "%s Integrated Signal, eta=%d phi=%d depth=%d", type.c_str(), detid.ieta(), detid.iphi(), detid.depth());
+    insert[16].first = new TH1F(name, name, 500, 0., 5000.);
 
     toolT[detid] = insert;
   }
 }
 //-----------------------------------------------------------------------------
-void CastorLedAnalysis::LedCastorHists(const HcalDetId& detid, const CastorDataFrame& ledDigi, map<HcalDetId, map<int,LEDBUNCH> > &toolT, const CastorDbService& cond) {
-
-  map<int,LEDBUNCH> _mei;
+void CastorLedAnalysis::LedCastorHists(const HcalDetId& detid,
+                                       const CastorDataFrame& ledDigi,
+                                       map<HcalDetId, map<int, LEDBUNCH> >& toolT,
+                                       const CastorDbService& cond) {
+  map<int, LEDBUNCH> _mei;
   _meol = toolT.find(detid);
   _mei = _meol->second;
   // Rest the histos if we're at the end of a 'bunch'
-  if((evt-1)%m_nevtsample==0 && state[0]){
-    for(int k=0; k<(int)state.size();k++) state[k]=false;
-    for(int i=0; i<16; i++) _mei[i].first->Reset();
+  if ((evt - 1) % m_nevtsample == 0 && state[0]) {
+    for (int k = 0; k < (int)state.size(); k++)
+      state[k] = false;
+    for (int i = 0; i < 16; i++)
+      _mei[i].first->Reset();
   }
 
   // now we have the signal in fC, let's get rid of that darn pedestal
@@ -569,25 +613,28 @@ void CastorLedAnalysis::LedCastorHists(const HcalDetId& detid, const CastorDataF
   m_ped = cond.getPedestal(detid);
   m_shape = cond.getCastorShape();
   //cout << "New Digi!!!!!!!!!!!!!!!!!!!!!!" << endl;
-  for (int TS = m_startTS; TS < m_endTS && TS < ledDigi.size(); TS++){
+  for (int TS = m_startTS; TS < m_endTS && TS < ledDigi.size(); TS++) {
     int capid = ledDigi[TS].capid();
     // BE CAREFUL: this is assuming peds are stored in ADCs
     int adc = (int)(ledDigi[TS].adc() - m_ped->getValue(capid));
-    if (adc < 0){ adc = 0; }  // to prevent negative adcs after ped subtraction, which should really only happen
-                              // if you're using the wrong peds.
-    double fC = m_coder->charge(*m_shape,adc,capid);
+    if (adc < 0) {
+      adc = 0;
+    }  // to prevent negative adcs after ped subtraction, which should really only happen
+       // if you're using the wrong peds.
+    double fC = m_coder->charge(*m_shape, adc, capid);
     //ta = (fC - m_ped->getValue(capid));
     ta = fC;
     //cout << "DetID: " << detid << "  CapID: " << capid << "  ADC: " << adc << "  Ped: " << m_ped->getValue(capid) << "  fC: " << fC << endl;
     _mei[TS].first->Fill(ta);
-    _mei[10].first->AddBinContent(TS+1,ta);  // This is average pulse, could probably do better (Profile?)
-    if(m_fitflag>1){
-      if(TS==m_startTS)_mei[11].first->Reset();
-      _mei[11].first->SetBinContent(TS+1,ta);
+    _mei[10].first->AddBinContent(TS + 1, ta);  // This is average pulse, could probably do better (Profile?)
+    if (m_fitflag > 1) {
+      if (TS == m_startTS)
+        _mei[11].first->Reset();
+      _mei[11].first->SetBinContent(TS + 1, ta);
     }
 
     // keep track of max TS and max amplitude (in fC)
-    if (ta > max_fC){
+    if (ta > max_fC) {
       max_fC = ta;
     }
   }
@@ -597,68 +644,66 @@ void CastorLedAnalysis::LedCastorHists(const HcalDetId& detid, const CastorDataF
   // we now want to use Phil's timing correction.  This is not necessary
   // if we are performing a Landau fit (m_fitflag = 3)
 
-  float sum=0.;
-  for(int i=0; i<10; i++)sum=sum+_mei[11].first->GetBinContent(i+1);
-  if(sum>100){
-    if(m_fitflag==2 || m_fitflag==4){
-      float timmean=_mei[11].first->GetMean();  // let's use Phil's way instead
-      float timmeancorr=BinsizeCorr(timmean);
+  float sum = 0.;
+  for (int i = 0; i < 10; i++)
+    sum = sum + _mei[11].first->GetBinContent(i + 1);
+  if (sum > 100) {
+    if (m_fitflag == 2 || m_fitflag == 4) {
+      float timmean = _mei[11].first->GetMean();  // let's use Phil's way instead
+      float timmeancorr = BinsizeCorr(timmean);
       _mei[12].first->Fill(timmeancorr);
     }
-    _mei[16].first->Fill(_mei[11].first->Integral()); // Integrated charge (may be more usfull to convert to Energy first?)
-    if(m_fitflag==3 || m_fitflag==4){
-      _mei[11].first->Fit("landau","Q");
-      TF1 *fit = _mei[11].first->GetFunction("landau");
+    _mei[16].first->Fill(
+        _mei[11].first->Integral());  // Integrated charge (may be more usfull to convert to Energy first?)
+    if (m_fitflag == 3 || m_fitflag == 4) {
+      _mei[11].first->Fit("landau", "Q");
+      TF1* fit = _mei[11].first->GetFunction("landau");
       _mei[13].first->Fill(fit->GetParameter(1));
       _mei[14].first->Fill(fit->GetParError(1));
-      _mei[15].first->Fill(fit->GetChisquare()/fit->GetNDF());
+      _mei[15].first->Fill(fit->GetChisquare() / fit->GetNDF());
     }
   }
-
-
-
 }
 
-
 //-----------------------------------------------------------------------------
 float CastorLedAnalysis::BinsizeCorr(float time) {
-
-// this is the bin size correction to be applied for laser data (from Andy),
-// it comes from a pulse shape measured from TB04 data (from Jordan)
-// This should eventually be replaced with the more thorough treatment from Phil
-
-  float corrtime=0.;
-  static const float tstrue[32]={0.003, 0.03425, 0.06548, 0.09675, 0.128,
- 0.15925, 0.1905, 0.22175, 0.253, 0.28425, 0.3155, 0.34675, 0.378, 0.40925,
- 0.4405, 0.47175, 0.503, 0.53425, 0.5655, 0.59675, 0.628, 0.65925, 0.6905,
- 0.72175, 0.753, 0.78425, 0.8155, 0.84675, 0.878, 0.90925, 0.9405, 0.97175};
-  static const float tsreco[32]={-0.00422, 0.01815, 0.04409, 0.07346, 0.09799,
- 0.12192, 0.15072, 0.18158, 0.21397, 0.24865, 0.28448, 0.31973, 0.35449,
- 0.39208, 0.43282, 0.47244, 0.5105, 0.55008, 0.58827, 0.62828, 0.6717, 0.70966,
- 0.74086, 0.77496, 0.80843, 0.83472, 0.86044, 0.8843, 0.90674, 0.92982,
- 0.95072, 0.9726};
-
- int inttime=(int)time;
- float restime=time-inttime;
- for(int i=0; i<=32; i++) {
-   float lolim=0.; float uplim=1.; float tsdown; float tsup;
-   if(i>0){
-     lolim=tsreco[i-1];
-     tsdown=tstrue[i-1];
-   }
-   else tsdown=tstrue[31]-1.;
-   if(i<32){
-     uplim=tsreco[i];
-     tsup=tstrue[i];
-   }
-   else tsup=tstrue[0]+1.;
-   if(restime>=lolim && restime<uplim){
-      corrtime=(tsdown*(uplim-restime)+tsup*(restime-lolim)) / (uplim-lolim);
+  // this is the bin size correction to be applied for laser data (from Andy),
+  // it comes from a pulse shape measured from TB04 data (from Jordan)
+  // This should eventually be replaced with the more thorough treatment from Phil
+
+  float corrtime = 0.;
+  static const float tstrue[32] = {0.003, 0.03425, 0.06548, 0.09675, 0.128, 0.15925, 0.1905, 0.22175,
+                                   0.253, 0.28425, 0.3155,  0.34675, 0.378, 0.40925, 0.4405, 0.47175,
+                                   0.503, 0.53425, 0.5655,  0.59675, 0.628, 0.65925, 0.6905, 0.72175,
+                                   0.753, 0.78425, 0.8155,  0.84675, 0.878, 0.90925, 0.9405, 0.97175};
+  static const float tsreco[32] = {-0.00422, 0.01815, 0.04409, 0.07346, 0.09799, 0.12192, 0.15072, 0.18158,
+                                   0.21397,  0.24865, 0.28448, 0.31973, 0.35449, 0.39208, 0.43282, 0.47244,
+                                   0.5105,   0.55008, 0.58827, 0.62828, 0.6717,  0.70966, 0.74086, 0.77496,
+                                   0.80843,  0.83472, 0.86044, 0.8843,  0.90674, 0.92982, 0.95072, 0.9726};
+
+  int inttime = (int)time;
+  float restime = time - inttime;
+  for (int i = 0; i <= 32; i++) {
+    float lolim = 0.;
+    float uplim = 1.;
+    float tsdown;
+    float tsup;
+    if (i > 0) {
+      lolim = tsreco[i - 1];
+      tsdown = tstrue[i - 1];
+    } else
+      tsdown = tstrue[31] - 1.;
+    if (i < 32) {
+      uplim = tsreco[i];
+      tsup = tstrue[i];
+    } else
+      tsup = tstrue[0] + 1.;
+    if (restime >= lolim && restime < uplim) {
+      corrtime = (tsdown * (uplim - restime) + tsup * (restime - lolim)) / (uplim - lolim);
     }
   }
-  corrtime+=inttime;
+  corrtime += inttime;
 
- return corrtime;
+  return corrtime;
 }
 //-----------------------------------------------------------------------------
-
diff --git a/CalibCalorimetry/CastorCalib/src/CastorPedestalAnalysis.cc b/CalibCalorimetry/CastorCalib/src/CastorPedestalAnalysis.cc
index 526b34e573907..d9fa4f47c10c8 100644
--- a/CalibCalorimetry/CastorCalib/src/CastorPedestalAnalysis.cc
+++ b/CalibCalorimetry/CastorCalib/src/CastorPedestalAnalysis.cc
@@ -13,63 +13,69 @@
 using namespace std;
 
 CastorPedestalAnalysis::CastorPedestalAnalysis(const edm::ParameterSet& ps)
-  : fRefPedestals (nullptr),
-    fRefPedestalWidths (nullptr),
-    fRawPedestals (nullptr),
-    fRawPedestalWidths (nullptr),
-    fValPedestals (nullptr),
-    fValPedestalWidths (nullptr)
-{
-  evt=0;
-  sample=0;
-  m_file=nullptr;
-  m_AllPedsOK=0;
-  for(int i=0; i<4; i++) m_stat[i]=0;
-  for(int k=0;k<4;k++) state.push_back(true);
-
-// user cfg parameters
+    : fRefPedestals(nullptr),
+      fRefPedestalWidths(nullptr),
+      fRawPedestals(nullptr),
+      fRawPedestalWidths(nullptr),
+      fValPedestals(nullptr),
+      fValPedestalWidths(nullptr) {
+  evt = 0;
+  sample = 0;
+  m_file = nullptr;
+  m_AllPedsOK = 0;
+  for (int i = 0; i < 4; i++)
+    m_stat[i] = 0;
+  for (int k = 0; k < 4; k++)
+    state.push_back(true);
+
+  // user cfg parameters
   m_outputFileMean = ps.getUntrackedParameter<string>("outputFileMeans", "");
-  if ( !m_outputFileMean.empty() ) {
+  if (!m_outputFileMean.empty()) {
     cout << "Castor pedestal means will be saved to " << m_outputFileMean.c_str() << endl;
-  } 
+  }
   m_outputFileWidth = ps.getUntrackedParameter<string>("outputFileWidths", "");
-  if ( !m_outputFileWidth.empty() ) {
+  if (!m_outputFileWidth.empty()) {
     cout << "Castor pedestal widths will be saved to " << m_outputFileWidth.c_str() << endl;
-  } 
+  }
   m_outputFileROOT = ps.getUntrackedParameter<string>("outputFileHist", "");
-  if ( !m_outputFileROOT.empty() ) {
+  if (!m_outputFileROOT.empty()) {
     cout << "Castor pedestal histograms will be saved to " << m_outputFileROOT.c_str() << endl;
-  } 
-  m_nevtsample = ps.getUntrackedParameter<int>("nevtsample",0);
-// for compatibility with previous versions
-  if(m_nevtsample==9999999) m_nevtsample=0;
-  m_pedsinADC = ps.getUntrackedParameter<int>("pedsinADC",0);
-  m_hiSaveflag = ps.getUntrackedParameter<int>("hiSaveflag",0);
-  m_pedValflag = ps.getUntrackedParameter<int>("pedValflag",0);
-  if(m_pedValflag<0) m_pedValflag=0;
-  if (m_nevtsample>0 && m_pedValflag>0) {
-    cout<<"WARNING - incompatible cfg options: nevtsample = "<<m_nevtsample<<", pedValflag = "<<m_pedValflag<<endl;
-    cout<<"Setting pedValflag = 0"<<endl;
-    m_pedValflag=0;
   }
-  if(m_pedValflag>1) m_pedValflag=1;
+  m_nevtsample = ps.getUntrackedParameter<int>("nevtsample", 0);
+  // for compatibility with previous versions
+  if (m_nevtsample == 9999999)
+    m_nevtsample = 0;
+  m_pedsinADC = ps.getUntrackedParameter<int>("pedsinADC", 0);
+  m_hiSaveflag = ps.getUntrackedParameter<int>("hiSaveflag", 0);
+  m_pedValflag = ps.getUntrackedParameter<int>("pedValflag", 0);
+  if (m_pedValflag < 0)
+    m_pedValflag = 0;
+  if (m_nevtsample > 0 && m_pedValflag > 0) {
+    cout << "WARNING - incompatible cfg options: nevtsample = " << m_nevtsample << ", pedValflag = " << m_pedValflag
+         << endl;
+    cout << "Setting pedValflag = 0" << endl;
+    m_pedValflag = 0;
+  }
+  if (m_pedValflag > 1)
+    m_pedValflag = 1;
   m_startTS = ps.getUntrackedParameter<int>("firstTS", 0);
-  if(m_startTS<0) m_startTS=0;
+  if (m_startTS < 0)
+    m_startTS = 0;
   m_endTS = ps.getUntrackedParameter<int>("lastTS", 9);
 
-//  m_logFile.open("CastorPedestalAnalysis.log");
+  //  m_logFile.open("CastorPedestalAnalysis.log");
 
-  castorHists.ALLPEDS = new TH1F("Castor All Pedestals","HF All Peds",10,0,9);
-  castorHists.PEDRMS= new TH1F("Castor All Pedestal Widths","HF All Pedestal RMS",100,0,3);
-  castorHists.PEDMEAN= new TH1F("Castor All Pedestal Means","HF All Pedestal Means",100,0,9);
-  castorHists.CHI2= new TH1F("Castor Chi2/ndf for whole range Gauss fit","HF Chi2/ndf Gauss",200,0.,50.);
+  castorHists.ALLPEDS = new TH1F("Castor All Pedestals", "HF All Peds", 10, 0, 9);
+  castorHists.PEDRMS = new TH1F("Castor All Pedestal Widths", "HF All Pedestal RMS", 100, 0, 3);
+  castorHists.PEDMEAN = new TH1F("Castor All Pedestal Means", "HF All Pedestal Means", 100, 0, 9);
+  castorHists.CHI2 = new TH1F("Castor Chi2/ndf for whole range Gauss fit", "HF Chi2/ndf Gauss", 200, 0., 50.);
 }
 
 //-----------------------------------------------------------------------------
-CastorPedestalAnalysis::~CastorPedestalAnalysis(){
-
-  for(_meot=castorHists.PEDTRENDS.begin(); _meot!=castorHists.PEDTRENDS.end(); _meot++){
-    for(int i=0; i<16; i++) _meot->second[i].first->Delete();
+CastorPedestalAnalysis::~CastorPedestalAnalysis() {
+  for (_meot = castorHists.PEDTRENDS.begin(); _meot != castorHists.PEDTRENDS.end(); _meot++) {
+    for (int i = 0; i < 16; i++)
+      _meot->second[i].first->Delete();
   }
 
   castorHists.ALLPEDS->Delete();
@@ -81,63 +87,76 @@ CastorPedestalAnalysis::~CastorPedestalAnalysis(){
 //-----------------------------------------------------------------------------
 void CastorPedestalAnalysis::setup(const std::string& m_outputFileROOT) {
   // open the histogram file, create directories within
-  m_file=new TFile(m_outputFileROOT.c_str(),"RECREATE");
+  m_file = new TFile(m_outputFileROOT.c_str(), "RECREATE");
   m_file->mkdir("Castor");
   m_file->cd();
 }
 
 //-----------------------------------------------------------------------------
-void CastorPedestalAnalysis::processEvent(const CastorDigiCollection& castor,
-					const CastorDbService& cond)
-{
+void CastorPedestalAnalysis::processEvent(const CastorDigiCollection& castor, const CastorDbService& cond) {
   evt++;
-  sample=1;
-  evt_curr=evt;
-  if(m_nevtsample>0) {
-    sample = (evt-1)/m_nevtsample +1;
-    evt_curr = evt%m_nevtsample;
-    if(evt_curr==0)evt_curr=m_nevtsample;
+  sample = 1;
+  evt_curr = evt;
+  if (m_nevtsample > 0) {
+    sample = (evt - 1) / m_nevtsample + 1;
+    evt_curr = evt % m_nevtsample;
+    if (evt_curr == 0)
+      evt_curr = m_nevtsample;
   }
 
   m_shape = cond.getCastorShape();
   // HF
-  try{
-    if(castor.empty()) throw (int)castor.size();
-    for (CastorDigiCollection::const_iterator j=castor.begin(); j!=castor.end(); ++j){
+  try {
+    if (castor.empty())
+      throw(int) castor.size();
+    for (CastorDigiCollection::const_iterator j = castor.begin(); j != castor.end(); ++j) {
       const CastorDataFrame digi = (const CastorDataFrame)(*j);
       m_coder = cond.getCastorCoder(digi.id());
-      for (int i=m_startTS; i<digi.size() && i<=m_endTS; i++) {
-        for(int flag=0; flag<4; flag++){
-          if(i+flag<digi.size() && i+flag<=m_endTS){
-            per2CapsHists(flag,2,digi.id(),digi.sample(i),digi.sample(i+flag),castorHists.PEDTRENDS,cond);
+      for (int i = m_startTS; i < digi.size() && i <= m_endTS; i++) {
+        for (int flag = 0; flag < 4; flag++) {
+          if (i + flag < digi.size() && i + flag <= m_endTS) {
+            per2CapsHists(flag, 2, digi.id(), digi.sample(i), digi.sample(i + flag), castorHists.PEDTRENDS, cond);
           }
         }
       }
-      if(m_startTS==0 && m_endTS>4){
-        AllChanHists(digi.id(),digi.sample(0),digi.sample(1),digi.sample(2),digi.sample(3),digi.sample(4),digi.sample(5),castorHists.PEDTRENDS);
+      if (m_startTS == 0 && m_endTS > 4) {
+        AllChanHists(digi.id(),
+                     digi.sample(0),
+                     digi.sample(1),
+                     digi.sample(2),
+                     digi.sample(3),
+                     digi.sample(4),
+                     digi.sample(5),
+                     castorHists.PEDTRENDS);
       }
     }
-  } 
-  catch (int i ) {
-//    m_logFile << "Event with " << i<<" Castor Digis passed." << std::endl;
-  } 
+  } catch (int i) {
+    //    m_logFile << "Event with " << i<<" Castor Digis passed." << std::endl;
+  }
   // Call the function every m_nevtsample events
-  if(m_nevtsample>0) {
-    if(evt%m_nevtsample==0) SampleAnalysis();
+  if (m_nevtsample > 0) {
+    if (evt % m_nevtsample == 0)
+      SampleAnalysis();
   }
 }
 
 //-----------------------------------------------------------------------------
-void CastorPedestalAnalysis::per2CapsHists(int flag, int id, const HcalDetId detid, const HcalQIESample& qie1, const HcalQIESample& qie2, map<HcalDetId, map<int,PEDBUNCH> > &toolT, const CastorDbService& cond) {
-
-// this function is due to be called for every time slice, it fills either a charge
-// histo for a single capID (flag=0) or a product histo for two capIDs (flag>0)
-
-  static const int bins=10;
-  static const int bins2=100;
-  float lo=-0.5; float hi=9.5;
-  map<int,PEDBUNCH> _mei;
-  static map<HcalDetId, map<int,float> > QieCalibMap;
+void CastorPedestalAnalysis::per2CapsHists(int flag,
+                                           int id,
+                                           const HcalDetId detid,
+                                           const HcalQIESample& qie1,
+                                           const HcalQIESample& qie2,
+                                           map<HcalDetId, map<int, PEDBUNCH> >& toolT,
+                                           const CastorDbService& cond) {
+  // this function is due to be called for every time slice, it fills either a charge
+  // histo for a single capID (flag=0) or a product histo for two capIDs (flag>0)
+
+  static const int bins = 10;
+  static const int bins2 = 100;
+  float lo = -0.5;
+  float hi = 9.5;
+  map<int, PEDBUNCH> _mei;
+  static map<HcalDetId, map<int, float> > QieCalibMap;
   string type = "Castor";
 
   /*
@@ -155,79 +174,109 @@ void CastorPedestalAnalysis::per2CapsHists(int flag, int id, const HcalDetId det
 
   _meot = toolT.find(detid);
 
-// if histos for the current channel do not exist, first create them,
-  if (_meot==toolT.end()){
-    map<int,PEDBUNCH> insert;
-    map<int,float> qiecalib;
+  // if histos for the current channel do not exist, first create them,
+  if (_meot == toolT.end()) {
+    map<int, PEDBUNCH> insert;
+    map<int, float> qiecalib;
     char name[1024];
-    for(int i=0; i<4; i++){
-      lo=-0.5;
+    for (int i = 0; i < 4; i++) {
+      lo = -0.5;
       // fix from Andy: if you convert to fC and then bin in units of 1, you may 'skip' a bin while
       // filling, since the ADCs are quantized
-      if (m_pedsinADC) hi=9.5;
-      else hi = 11.5;
-      sprintf(name,"%s Pedestal, eta=%d phi=%d d=%d cap=%d",type.c_str(),detid.ieta(),detid.iphi(),detid.depth(),i);  
-      insert[i].first =  new TH1F(name,name,bins,lo,hi);
-      sprintf(name,"%s Product, eta=%d phi=%d d=%d caps=%d*%d",type.c_str(),detid.ieta(),detid.iphi(),detid.depth(),i,(i+1)%4);  
-      insert[4+i].first = new TH1F(name,name,bins2,0.,100.);
-      sprintf(name,"%s Product, eta=%d phi=%d d=%d caps=%d*%d",type.c_str(),detid.ieta(),detid.iphi(),detid.depth(),i,(i+2)%4);  
-      insert[8+i].first = new TH1F(name,name,bins2,0.,100.);
-      sprintf(name,"%s Product, eta=%d phi=%d d=%d caps=%d*%d",type.c_str(),detid.ieta(),detid.iphi(),detid.depth(),i,(i+3)%4);  
-      insert[12+i].first = new TH1F(name,name,bins2,0.,100.);
+      if (m_pedsinADC)
+        hi = 9.5;
+      else
+        hi = 11.5;
+      sprintf(
+          name, "%s Pedestal, eta=%d phi=%d d=%d cap=%d", type.c_str(), detid.ieta(), detid.iphi(), detid.depth(), i);
+      insert[i].first = new TH1F(name, name, bins, lo, hi);
+      sprintf(name,
+              "%s Product, eta=%d phi=%d d=%d caps=%d*%d",
+              type.c_str(),
+              detid.ieta(),
+              detid.iphi(),
+              detid.depth(),
+              i,
+              (i + 1) % 4);
+      insert[4 + i].first = new TH1F(name, name, bins2, 0., 100.);
+      sprintf(name,
+              "%s Product, eta=%d phi=%d d=%d caps=%d*%d",
+              type.c_str(),
+              detid.ieta(),
+              detid.iphi(),
+              detid.depth(),
+              i,
+              (i + 2) % 4);
+      insert[8 + i].first = new TH1F(name, name, bins2, 0., 100.);
+      sprintf(name,
+              "%s Product, eta=%d phi=%d d=%d caps=%d*%d",
+              type.c_str(),
+              detid.ieta(),
+              detid.iphi(),
+              detid.depth(),
+              i,
+              (i + 3) % 4);
+      insert[12 + i].first = new TH1F(name, name, bins2, 0., 100.);
     }
-    sprintf(name,"%s Signal in TS 4+5, eta=%d phi=%d d=%d",type.c_str(),detid.ieta(),detid.iphi(),detid.depth());  
-    insert[16].first = new TH1F(name,name,21,-0.5,20.5);
-    sprintf(name,"%s Signal in TS 4+5-2-3, eta=%d phi=%d d=%d",type.c_str(),detid.ieta(),detid.iphi(),detid.depth());  
-    insert[17].first = new TH1F(name,name,21,-10.5,10.5);
-    sprintf(name,"%s Signal in TS 4+5-(0+1+2+3)/2., eta=%d phi=%d d=%d",type.c_str(),detid.ieta(),detid.iphi(),detid.depth());  
-    insert[18].first = new TH1F(name,name,21,-10.5,10.5);
+    sprintf(name, "%s Signal in TS 4+5, eta=%d phi=%d d=%d", type.c_str(), detid.ieta(), detid.iphi(), detid.depth());
+    insert[16].first = new TH1F(name, name, 21, -0.5, 20.5);
+    sprintf(
+        name, "%s Signal in TS 4+5-2-3, eta=%d phi=%d d=%d", type.c_str(), detid.ieta(), detid.iphi(), detid.depth());
+    insert[17].first = new TH1F(name, name, 21, -10.5, 10.5);
+    sprintf(name,
+            "%s Signal in TS 4+5-(0+1+2+3)/2., eta=%d phi=%d d=%d",
+            type.c_str(),
+            detid.ieta(),
+            detid.iphi(),
+            detid.depth());
+    insert[18].first = new TH1F(name, name, 21, -10.5, 10.5);
     toolT[detid] = insert;
     _meot = toolT.find(detid);
-// store QIE calibrations in a map for later reuse
-    QieCalibMap[detid]=qiecalib;
+    // store QIE calibrations in a map for later reuse
+    QieCalibMap[detid] = qiecalib;
   }
 
   _mei = _meot->second;
 
   const CastorQIECoder* coder = cond.getCastorCoder(detid);
   const CastorQIEShape* shape = cond.getCastorShape();
-  float charge1 = coder->charge(*shape,qie1.adc(),qie1.capid());
-  float charge2 = coder->charge(*shape,qie2.adc(),qie2.capid());
-
-// fill single capID histo
-  if(flag==0){
-    if(m_nevtsample>0) {
-      if((evt-1)%m_nevtsample==0 && state[qie1.capid()]){
-        state[qie1.capid()]=false; 
+  float charge1 = coder->charge(*shape, qie1.adc(), qie1.capid());
+  float charge2 = coder->charge(*shape, qie2.adc(), qie2.capid());
+
+  // fill single capID histo
+  if (flag == 0) {
+    if (m_nevtsample > 0) {
+      if ((evt - 1) % m_nevtsample == 0 && state[qie1.capid()]) {
+        state[qie1.capid()] = false;
         _mei[qie1.capid()].first->Reset();
-        _mei[qie1.capid()+4].first->Reset();
-        _mei[qie1.capid()+8].first->Reset();
-        _mei[qie1.capid()+12].first->Reset();
+        _mei[qie1.capid() + 4].first->Reset();
+        _mei[qie1.capid() + 8].first->Reset();
+        _mei[qie1.capid() + 12].first->Reset();
       }
     }
-    if (qie1.adc()<bins){
-      if (m_pedsinADC) _mei[qie1.capid()].first->Fill(qie1.adc());
-      else _mei[qie1.capid()].first->Fill(charge1); 
-    }
-    else if(qie1.adc()>=bins){
-      _mei[qie1.capid()].first->AddBinContent(bins+1,1);
+    if (qie1.adc() < bins) {
+      if (m_pedsinADC)
+        _mei[qie1.capid()].first->Fill(qie1.adc());
+      else
+        _mei[qie1.capid()].first->Fill(charge1);
+    } else if (qie1.adc() >= bins) {
+      _mei[qie1.capid()].first->AddBinContent(bins + 1, 1);
     }
   }
 
-// fill 2 capID histo
-  if(flag>0){
-    map<int,float> qiecalib = QieCalibMap[detid];
+  // fill 2 capID histo
+  if (flag > 0) {
+    map<int, float> qiecalib = QieCalibMap[detid];
     //float charge1=(qie1.adc()-qiecalib[qie1.capid()+4])/qiecalib[qie1.capid()];
     //float charge2=(qie2.adc()-qiecalib[qie2.capid()+4])/qiecalib[qie2.capid()];
-    if (charge1*charge2<bins2){
-      _mei[qie1.capid()+4*flag].first->Fill(charge1*charge2);
-    }
-    else{
-      _mei[qie1.capid()+4*flag].first->Fill(bins2);
+    if (charge1 * charge2 < bins2) {
+      _mei[qie1.capid() + 4 * flag].first->Fill(charge1 * charge2);
+    } else {
+      _mei[qie1.capid() + 4 * flag].first->Fill(bins2);
     }
   }
 
-  if(flag==0){
+  if (flag == 0) {
     //    if(id==0) hbHists.ALLPEDS->Fill(qie1.adc());
     //   else if(id==1) hoHists.ALLPEDS->Fill(qie1.adc());
     //   else if(id==2) castorHists.ALLPEDS->Fill(qie1.adc());
@@ -236,77 +285,87 @@ void CastorPedestalAnalysis::per2CapsHists(int flag, int id, const HcalDetId det
 }
 
 //-----------------------------------------------------------------------------
-void CastorPedestalAnalysis::AllChanHists(const HcalDetId detid, const HcalQIESample& qie0, const HcalQIESample& qie1, const HcalQIESample& qie2, const HcalQIESample& qie3, const HcalQIESample& qie4, const HcalQIESample& qie5, map<HcalDetId, map<int,PEDBUNCH> > &toolT) { 
-
-// this function is due to be called for every channel
+void CastorPedestalAnalysis::AllChanHists(const HcalDetId detid,
+                                          const HcalQIESample& qie0,
+                                          const HcalQIESample& qie1,
+                                          const HcalQIESample& qie2,
+                                          const HcalQIESample& qie3,
+                                          const HcalQIESample& qie4,
+                                          const HcalQIESample& qie5,
+                                          map<HcalDetId, map<int, PEDBUNCH> >& toolT) {
+  // this function is due to be called for every channel
 
   _meot = toolT.find(detid);
-  map<int,PEDBUNCH> _mei = _meot->second;
-  _mei[16].first->Fill(qie4.adc()+qie5.adc()-1.);
-  _mei[17].first->Fill(qie4.adc()+qie5.adc()-qie2.adc()-qie3.adc());
-  _mei[18].first->Fill(qie4.adc()+qie5.adc()-(qie0.adc()+qie1.adc()+qie2.adc()+qie3.adc())/2.);
+  map<int, PEDBUNCH> _mei = _meot->second;
+  _mei[16].first->Fill(qie4.adc() + qie5.adc() - 1.);
+  _mei[17].first->Fill(qie4.adc() + qie5.adc() - qie2.adc() - qie3.adc());
+  _mei[18].first->Fill(qie4.adc() + qie5.adc() - (qie0.adc() + qie1.adc() + qie2.adc() + qie3.adc()) / 2.);
 }
 
 //-----------------------------------------------------------------------------
-void CastorPedestalAnalysis::SampleAnalysis(){
+void CastorPedestalAnalysis::SampleAnalysis() {
   // it is called every m_nevtsample events (a sample) and the end of run
   char PedSampleNum[20];
 
-// Compute pedestal constants for each HBHE, HO, HF
-  sprintf(PedSampleNum,"Castor_Sample%d",sample);
+  // Compute pedestal constants for each HBHE, HO, HF
+  sprintf(PedSampleNum, "Castor_Sample%d", sample);
   m_file->cd();
   m_file->mkdir(PedSampleNum);
   m_file->cd(PedSampleNum);
-  GetPedConst(castorHists.PEDTRENDS,castorHists.PEDMEAN,castorHists.PEDRMS);
+  GetPedConst(castorHists.PEDTRENDS, castorHists.PEDMEAN, castorHists.PEDRMS);
 }
 
 //-----------------------------------------------------------------------------
-void CastorPedestalAnalysis::GetPedConst(map<HcalDetId, map<int,PEDBUNCH> > &toolT, TH1F* PedMeans, TH1F* PedWidths)
-{
-// Completely rewritten version oct 2006
-// Compute pedestal constants and fill into CastorPedestals and CastorPedestalWidths objects
-  float cap[4]; float sig[4][4]; float dcap[4]; float dsig[4][4]; float chi2[4];
-
-  for(_meot=toolT.begin(); _meot!=toolT.end(); _meot++){
+void CastorPedestalAnalysis::GetPedConst(map<HcalDetId, map<int, PEDBUNCH> >& toolT, TH1F* PedMeans, TH1F* PedWidths) {
+  // Completely rewritten version oct 2006
+  // Compute pedestal constants and fill into CastorPedestals and CastorPedestalWidths objects
+  float cap[4];
+  float sig[4][4];
+  float dcap[4];
+  float dsig[4][4];
+  float chi2[4];
+
+  for (_meot = toolT.begin(); _meot != toolT.end(); _meot++) {
     HcalDetId detid = _meot->first;
 
-// take mean and width from a Gaussian fit or directly from the histo
-    if(fitflag>0){
-      for (int i=0; i<4; i++) {
-        TF1 *fit = _meot->second[i].first->GetFunction("gaus");
-        chi2[i]=0;
-        if(fit->GetNDF()!=0) chi2[i]=fit->GetChisquare()/fit->GetNDF();
-        cap[i]=fit->GetParameter(1);
-        sig[i][i]=fit->GetParameter(2);
-        dcap[i]=fit->GetParError(1);
-        dsig[i][i]=fit->GetParError(2);
+    // take mean and width from a Gaussian fit or directly from the histo
+    if (fitflag > 0) {
+      for (int i = 0; i < 4; i++) {
+        TF1* fit = _meot->second[i].first->GetFunction("gaus");
+        chi2[i] = 0;
+        if (fit->GetNDF() != 0)
+          chi2[i] = fit->GetChisquare() / fit->GetNDF();
+        cap[i] = fit->GetParameter(1);
+        sig[i][i] = fit->GetParameter(2);
+        dcap[i] = fit->GetParError(1);
+        dsig[i][i] = fit->GetParError(2);
       }
-    }
-    else{
-      for (int i=0; i<4; i++) {
-        cap[i]=_meot->second[i].first->GetMean();
-        sig[i][i]=_meot->second[i].first->GetRMS();
-        m_stat[i]=0;
-
-        for(int j=m_startTS; j<m_endTS+1; j++){
-          m_stat[i]+=_meot->second[i].first->GetBinContent(j+1);
+    } else {
+      for (int i = 0; i < 4; i++) {
+        cap[i] = _meot->second[i].first->GetMean();
+        sig[i][i] = _meot->second[i].first->GetRMS();
+        m_stat[i] = 0;
+
+        for (int j = m_startTS; j < m_endTS + 1; j++) {
+          m_stat[i] += _meot->second[i].first->GetBinContent(j + 1);
         }
-        dcap[i] = sig[i][i]/sqrt(m_stat[i]);
-//        dsig[i][i] = dcap[i]*sig[i][i]/cap[i];
-        dsig[i][i] = sig[i][i]/sqrt(2.*m_stat[i]);
-        chi2[i]=0.;
+        dcap[i] = sig[i][i] / sqrt(m_stat[i]);
+        //        dsig[i][i] = dcap[i]*sig[i][i]/cap[i];
+        dsig[i][i] = sig[i][i] / sqrt(2. * m_stat[i]);
+        chi2[i] = 0.;
       }
     }
 
-    for (int i=0; i<4; i++) {
-      if(m_hiSaveflag>0) {
+    for (int i = 0; i < 4; i++) {
+      if (m_hiSaveflag > 0) {
         if (m_pedsinADC)
-        _meot->second[i].first->GetXaxis()->SetTitle("ADC");
-        else _meot->second[i].first->GetXaxis()->SetTitle("Charge, fC");
+          _meot->second[i].first->GetXaxis()->SetTitle("ADC");
+        else
+          _meot->second[i].first->GetXaxis()->SetTitle("Charge, fC");
         _meot->second[i].first->GetYaxis()->SetTitle("CapID samplings");
         _meot->second[i].first->Write();
       }
-      if(m_nevtsample>0) {
+      if (m_nevtsample > 0) {
         _meot->second[i].second.first[0].push_back(cap[i]);
         _meot->second[i].second.first[1].push_back(dcap[i]);
         _meot->second[i].second.first[2].push_back(sig[i][i]);
@@ -317,93 +376,97 @@ void CastorPedestalAnalysis::GetPedConst(map<HcalDetId, map<int,PEDBUNCH> > &too
       PedWidths->Fill(sig[i][i]);
     }
 
-// special histos for Shuichi
-    if(m_hiSaveflag==-100){
-      for(int i=16; i<19; i++){
+    // special histos for Shuichi
+    if (m_hiSaveflag == -100) {
+      for (int i = 16; i < 19; i++) {
         if (m_pedsinADC)
-        _meot->second[i].first->GetXaxis()->SetTitle("ADC");
-        else _meot->second[i].first->GetXaxis()->SetTitle("Charge, fC");
+          _meot->second[i].first->GetXaxis()->SetTitle("ADC");
+        else
+          _meot->second[i].first->GetXaxis()->SetTitle("Charge, fC");
         _meot->second[i].first->GetYaxis()->SetTitle("Events");
         _meot->second[i].first->Write();
       }
     }
 
-// diagonal sigma is width squared
-    sig[0][0]=sig[0][0]*sig[0][0];
-    sig[1][1]=sig[1][1]*sig[1][1];
-    sig[2][2]=sig[2][2]*sig[2][2];
-    sig[3][3]=sig[3][3]*sig[3][3];
-
-// off diagonal sigmas (correlations) are computed from 3 histograms
-// here we still have all 4*3=12 combinations
-    sig[0][1]= _meot->second[4].first->GetMean()-cap[0]*cap[1];
-    sig[0][2]= _meot->second[8].first->GetMean()-cap[0]*cap[2];
-    sig[1][2]= _meot->second[5].first->GetMean()-cap[1]*cap[2];
-    sig[1][3]= _meot->second[9].first->GetMean()-cap[1]*cap[3];
-    sig[2][3]= _meot->second[6].first->GetMean()-cap[2]*cap[3];
-    sig[0][3]= _meot->second[12].first->GetMean()-cap[0]*cap[3];
-    sig[1][0]= _meot->second[13].first->GetMean()-cap[1]*cap[0];
-    sig[2][0]= _meot->second[10].first->GetMean()-cap[2]*cap[0];
-    sig[2][1]= _meot->second[14].first->GetMean()-cap[2]*cap[1];
-    sig[3][1]= _meot->second[11].first->GetMean()-cap[3]*cap[1];
-    sig[3][2]= _meot->second[15].first->GetMean()-cap[3]*cap[2];
-    sig[3][0]= _meot->second[7].first->GetMean()-cap[3]*cap[0];
-
-// there is no proper error calculation for the correlation coefficients
-    for(int i=0; i<4; i++){
-      if(m_nevtsample>0) {
-        _meot->second[i].second.first[5].push_back(sig[i][(i+1)%4]);
-        _meot->second[i].second.first[6].push_back(2*sig[i][i]*dsig[i][i]);
-        _meot->second[i].second.first[7].push_back(sig[i][(i+2)%4]);
-        _meot->second[i].second.first[8].push_back(2*sig[i][i]*dsig[i][i]);
-        _meot->second[i].second.first[9].push_back(sig[i][(i+3)%4]);
-        _meot->second[i].second.first[10].push_back(2*sig[i][i]*dsig[i][i]);
+    // diagonal sigma is width squared
+    sig[0][0] = sig[0][0] * sig[0][0];
+    sig[1][1] = sig[1][1] * sig[1][1];
+    sig[2][2] = sig[2][2] * sig[2][2];
+    sig[3][3] = sig[3][3] * sig[3][3];
+
+    // off diagonal sigmas (correlations) are computed from 3 histograms
+    // here we still have all 4*3=12 combinations
+    sig[0][1] = _meot->second[4].first->GetMean() - cap[0] * cap[1];
+    sig[0][2] = _meot->second[8].first->GetMean() - cap[0] * cap[2];
+    sig[1][2] = _meot->second[5].first->GetMean() - cap[1] * cap[2];
+    sig[1][3] = _meot->second[9].first->GetMean() - cap[1] * cap[3];
+    sig[2][3] = _meot->second[6].first->GetMean() - cap[2] * cap[3];
+    sig[0][3] = _meot->second[12].first->GetMean() - cap[0] * cap[3];
+    sig[1][0] = _meot->second[13].first->GetMean() - cap[1] * cap[0];
+    sig[2][0] = _meot->second[10].first->GetMean() - cap[2] * cap[0];
+    sig[2][1] = _meot->second[14].first->GetMean() - cap[2] * cap[1];
+    sig[3][1] = _meot->second[11].first->GetMean() - cap[3] * cap[1];
+    sig[3][2] = _meot->second[15].first->GetMean() - cap[3] * cap[2];
+    sig[3][0] = _meot->second[7].first->GetMean() - cap[3] * cap[0];
+
+    // there is no proper error calculation for the correlation coefficients
+    for (int i = 0; i < 4; i++) {
+      if (m_nevtsample > 0) {
+        _meot->second[i].second.first[5].push_back(sig[i][(i + 1) % 4]);
+        _meot->second[i].second.first[6].push_back(2 * sig[i][i] * dsig[i][i]);
+        _meot->second[i].second.first[7].push_back(sig[i][(i + 2) % 4]);
+        _meot->second[i].second.first[8].push_back(2 * sig[i][i] * dsig[i][i]);
+        _meot->second[i].second.first[9].push_back(sig[i][(i + 3) % 4]);
+        _meot->second[i].second.first[10].push_back(2 * sig[i][i] * dsig[i][i]);
       }
-// save product histos if desired
-      if(m_hiSaveflag>10) {
+      // save product histos if desired
+      if (m_hiSaveflag > 10) {
         if (m_pedsinADC)
-        _meot->second[i+4].first->GetXaxis()->SetTitle("ADC^2");
-        else _meot->second[i+4].first->GetXaxis()->SetTitle("Charge^2, fC^2");
-        _meot->second[i+4].first->GetYaxis()->SetTitle("2-CapID samplings");
-        _meot->second[i+4].first->Write();
+          _meot->second[i + 4].first->GetXaxis()->SetTitle("ADC^2");
+        else
+          _meot->second[i + 4].first->GetXaxis()->SetTitle("Charge^2, fC^2");
+        _meot->second[i + 4].first->GetYaxis()->SetTitle("2-CapID samplings");
+        _meot->second[i + 4].first->Write();
         if (m_pedsinADC)
-        _meot->second[i+8].first->GetXaxis()->SetTitle("ADC^2");
-        else _meot->second[i+8].first->GetXaxis()->SetTitle("Charge^2, fC^2");
-        _meot->second[i+8].first->GetYaxis()->SetTitle("2-CapID samplings");
-        _meot->second[i+8].first->Write();
+          _meot->second[i + 8].first->GetXaxis()->SetTitle("ADC^2");
+        else
+          _meot->second[i + 8].first->GetXaxis()->SetTitle("Charge^2, fC^2");
+        _meot->second[i + 8].first->GetYaxis()->SetTitle("2-CapID samplings");
+        _meot->second[i + 8].first->Write();
         if (m_pedsinADC)
-        _meot->second[i+12].first->GetXaxis()->SetTitle("ADC^2");
-        else _meot->second[i+12].first->GetXaxis()->SetTitle("Charge^2, fC^2");
-        _meot->second[i+12].first->GetYaxis()->SetTitle("2-CapID samplings");
-        _meot->second[i+12].first->Write();
+          _meot->second[i + 12].first->GetXaxis()->SetTitle("ADC^2");
+        else
+          _meot->second[i + 12].first->GetXaxis()->SetTitle("Charge^2, fC^2");
+        _meot->second[i + 12].first->GetYaxis()->SetTitle("2-CapID samplings");
+        _meot->second[i + 12].first->Write();
       }
     }
 
-// fill the objects - at this point only close and medium correlations are stored
-// and the matrix is assumed symmetric
-    if (m_nevtsample<1) {
-      sig[1][0]=sig[0][1];
-      sig[2][0]=sig[0][2];
-      sig[2][1]=sig[1][2];
-      sig[3][1]=sig[1][3];
-      sig[3][2]=sig[2][3];
-      sig[0][3]=sig[3][0];
+    // fill the objects - at this point only close and medium correlations are stored
+    // and the matrix is assumed symmetric
+    if (m_nevtsample < 1) {
+      sig[1][0] = sig[0][1];
+      sig[2][0] = sig[0][2];
+      sig[2][1] = sig[1][2];
+      sig[3][1] = sig[1][3];
+      sig[3][2] = sig[2][3];
+      sig[0][3] = sig[3][0];
       if (fRawPedestals) {
-	  CastorPedestal item(detid,cap[0],cap[1],cap[2],cap[3]);
-          fRawPedestals->addValues(item);
+        CastorPedestal item(detid, cap[0], cap[1], cap[2], cap[3]);
+        fRawPedestals->addValues(item);
       }
       if (fRawPedestalWidths) {
         CastorPedestalWidth widthsp(detid);
-        widthsp.setSigma(0,0,sig[0][0]);
-        widthsp.setSigma(0,1,sig[0][1]);
-        widthsp.setSigma(0,2,sig[0][2]);
-        widthsp.setSigma(1,1,sig[1][1]);
-        widthsp.setSigma(1,2,sig[1][2]);
-        widthsp.setSigma(1,3,sig[1][3]);
-        widthsp.setSigma(2,2,sig[2][2]);
-        widthsp.setSigma(2,3,sig[2][3]);
-        widthsp.setSigma(3,3,sig[3][3]);
-        widthsp.setSigma(3,0,sig[0][3]);
+        widthsp.setSigma(0, 0, sig[0][0]);
+        widthsp.setSigma(0, 1, sig[0][1]);
+        widthsp.setSigma(0, 2, sig[0][2]);
+        widthsp.setSigma(1, 1, sig[1][1]);
+        widthsp.setSigma(1, 2, sig[1][2]);
+        widthsp.setSigma(1, 3, sig[1][3]);
+        widthsp.setSigma(2, 2, sig[2][2]);
+        widthsp.setSigma(2, 3, sig[2][3]);
+        widthsp.setSigma(3, 3, sig[3][3]);
+        widthsp.setSigma(3, 0, sig[0][3]);
         fRawPedestalWidths->addValues(widthsp);
       }
     }
@@ -411,64 +474,67 @@ void CastorPedestalAnalysis::GetPedConst(map<HcalDetId, map<int,PEDBUNCH> > &too
 }
 
 //-----------------------------------------------------------------------------
-int CastorPedestalAnalysis::done(const CastorPedestals* fInputPedestals, 
-				const CastorPedestalWidths* fInputPedestalWidths,
-				CastorPedestals* fOutputPedestals, 
-				CastorPedestalWidths* fOutputPedestalWidths)
-{
-   int nstat[4];
-
-// Pedestal objects
+int CastorPedestalAnalysis::done(const CastorPedestals* fInputPedestals,
+                                 const CastorPedestalWidths* fInputPedestalWidths,
+                                 CastorPedestals* fOutputPedestals,
+                                 CastorPedestalWidths* fOutputPedestalWidths) {
+  int nstat[4];
+
+  // Pedestal objects
   // inputs...
   fRefPedestals = fInputPedestals;
   fRefPedestalWidths = fInputPedestalWidths;
-  
+
   // outputs...
-  if(m_pedValflag>0) {
+  if (m_pedValflag > 0) {
     fValPedestals = fOutputPedestals;
     fValPedestalWidths = fOutputPedestalWidths;
     fRawPedestals = new CastorPedestals();
     fRawPedestalWidths = new CastorPedestalWidths();
-  }
-  else {
+  } else {
     fRawPedestals = fOutputPedestals;
     fRawPedestalWidths = fOutputPedestalWidths;
     fValPedestals = new CastorPedestals();
     fValPedestalWidths = new CastorPedestalWidths();
   }
 
-// compute pedestal constants
-  if(m_nevtsample<1) SampleAnalysis();
-  if(m_nevtsample>0) {
-    if(evt%m_nevtsample!=0) SampleAnalysis();
+  // compute pedestal constants
+  if (m_nevtsample < 1)
+    SampleAnalysis();
+  if (m_nevtsample > 0) {
+    if (evt % m_nevtsample != 0)
+      SampleAnalysis();
   }
 
-// trending histos
-  if(m_nevtsample>0){
+  // trending histos
+  if (m_nevtsample > 0) {
     m_file->cd();
     m_file->cd("Castor");
-    Trendings(castorHists.PEDTRENDS,castorHists.CHI2,castorHists.CAPID_AVERAGE,castorHists.CAPID_CHI2);
+    Trendings(castorHists.PEDTRENDS, castorHists.CHI2, castorHists.CAPID_AVERAGE, castorHists.CAPID_CHI2);
   }
 
-  if (m_nevtsample<1) {
-
-// pedestal validation: m_AllPedsOK=-1 means not validated,
-//                                   0 everything OK,
-//                                   N>0 : mod(N,100000) drifts + width changes
-//                                         int(N/100000) missing channels
-    m_AllPedsOK=-1;
-    if(m_pedValflag>0) {
-      for (int i=0; i<4; i++) nstat[i]=(int)m_stat[i];
-      int NPedErrors=CastorPedVal(nstat,fRefPedestals,fRefPedestalWidths,
-                            fRawPedestals,fRawPedestalWidths,
-                            fValPedestals,fValPedestalWidths);
-      m_AllPedsOK=NPedErrors;
+  if (m_nevtsample < 1) {
+    // pedestal validation: m_AllPedsOK=-1 means not validated,
+    //                                   0 everything OK,
+    //                                   N>0 : mod(N,100000) drifts + width changes
+    //                                         int(N/100000) missing channels
+    m_AllPedsOK = -1;
+    if (m_pedValflag > 0) {
+      for (int i = 0; i < 4; i++)
+        nstat[i] = (int)m_stat[i];
+      int NPedErrors = CastorPedVal(nstat,
+                                    fRefPedestals,
+                                    fRefPedestalWidths,
+                                    fRawPedestals,
+                                    fRawPedestalWidths,
+                                    fValPedestals,
+                                    fValPedestalWidths);
+      m_AllPedsOK = NPedErrors;
     }
-// setting m_AllPedsOK=-2 will inhibit writing pedestals out
-//    if(m_pedValflag==1){
-//      if(evt<100)m_AllPedsOK=-2;
-//    }
-
+    // setting m_AllPedsOK=-2 will inhibit writing pedestals out
+    //    if(m_pedValflag==1){
+    //      if(evt<100)m_AllPedsOK=-2;
+    //    }
   }
 
   // Write other histograms.
@@ -486,30 +552,38 @@ int CastorPedestalAnalysis::done(const CastorPedestals* fInputPedestals,
 }
 
 //-----------------------------------------------------------------------------
-void CastorPedestalAnalysis::Trendings(map<HcalDetId, map<int,PEDBUNCH> > &toolT, TH1F* Chi2, TH1F* CapidAverage, TH1F* CapidChi2){
-
-// check stability of pedestal constants in a single long run
+void CastorPedestalAnalysis::Trendings(map<HcalDetId, map<int, PEDBUNCH> >& toolT,
+                                       TH1F* Chi2,
+                                       TH1F* CapidAverage,
+                                       TH1F* CapidChi2) {
+  // check stability of pedestal constants in a single long run
 
   map<int, std::vector<double> > AverageValues;
 
-  for(_meot=toolT.begin(); _meot!=toolT.end(); _meot++){
-    for(int i=0; i<4; i++){
+  for (_meot = toolT.begin(); _meot != toolT.end(); _meot++) {
+    for (int i = 0; i < 4; i++) {
       char name[1024];
       HcalDetId detid = _meot->first;
-      sprintf(name,"Pedestal trend, eta=%d phi=%d d=%d cap=%d",detid.ieta(),detid.iphi(),detid.depth(),i);
+      sprintf(name, "Pedestal trend, eta=%d phi=%d d=%d cap=%d", detid.ieta(), detid.iphi(), detid.depth(), i);
       int bins = _meot->second[i].second.first[0].size();
-      float lo =0.5;
-      float hi = (float)bins+0.5;
-      _meot->second[i].second.second.push_back(new TH1F(name,name,bins,lo,hi));
-      sprintf(name,"Width trend, eta=%d phi=%d d=%d cap=%d",detid.ieta(),detid.iphi(),detid.depth(),i);
+      float lo = 0.5;
+      float hi = (float)bins + 0.5;
+      _meot->second[i].second.second.push_back(new TH1F(name, name, bins, lo, hi));
+      sprintf(name, "Width trend, eta=%d phi=%d d=%d cap=%d", detid.ieta(), detid.iphi(), detid.depth(), i);
       bins = _meot->second[i].second.first[2].size();
-      hi = (float)bins+0.5;
-      _meot->second[i].second.second.push_back(new TH1F(name,name,bins,lo,hi));
-      sprintf(name,"Correlation trend, eta=%d phi=%d d=%d caps=%d*%d",detid.ieta(),detid.iphi(),detid.depth(),i,(i+1)%4);
+      hi = (float)bins + 0.5;
+      _meot->second[i].second.second.push_back(new TH1F(name, name, bins, lo, hi));
+      sprintf(name,
+              "Correlation trend, eta=%d phi=%d d=%d caps=%d*%d",
+              detid.ieta(),
+              detid.iphi(),
+              detid.depth(),
+              i,
+              (i + 1) % 4);
       bins = _meot->second[i].second.first[5].size();
-      hi = (float)bins+0.5;
-      _meot->second[i].second.second.push_back(new TH1F(name,name,bins,lo,hi));
-/*      sprintf(name,"Correlation trend, eta=%d phi=%d d=%d caps=%d*%d",detid.ieta(),detid.iphi(),detid.depth(),i,(i+2)%4);
+      hi = (float)bins + 0.5;
+      _meot->second[i].second.second.push_back(new TH1F(name, name, bins, lo, hi));
+      /*      sprintf(name,"Correlation trend, eta=%d phi=%d d=%d caps=%d*%d",detid.ieta(),detid.iphi(),detid.depth(),i,(i+2)%4);
       bins = _meot->second[i].second.first[7].size();
       hi = (float)bins+0.5;
       _meot->second[i].second.second.push_back(new TH1F(name,name,bins,lo,hi));
@@ -520,58 +594,58 @@ void CastorPedestalAnalysis::Trendings(map<HcalDetId, map<int,PEDBUNCH> > &toolT
 
       std::vector<double>::iterator sample_it;
       // Pedestal mean - put content and errors
-      int j=0;
-      for(sample_it=_meot->second[i].second.first[0].begin();
-          sample_it!=_meot->second[i].second.first[0].end();++sample_it){
-        _meot->second[i].second.second[0]->SetBinContent(++j,*sample_it);
+      int j = 0;
+      for (sample_it = _meot->second[i].second.first[0].begin(); sample_it != _meot->second[i].second.first[0].end();
+           ++sample_it) {
+        _meot->second[i].second.second[0]->SetBinContent(++j, *sample_it);
       }
-      j=0;
-      for(sample_it=_meot->second[i].second.first[1].begin();
-          sample_it!=_meot->second[i].second.first[1].end();++sample_it){
-        _meot->second[i].second.second[0]->SetBinError(++j,*sample_it);
+      j = 0;
+      for (sample_it = _meot->second[i].second.first[1].begin(); sample_it != _meot->second[i].second.first[1].end();
+           ++sample_it) {
+        _meot->second[i].second.second[0]->SetBinError(++j, *sample_it);
       }
       // fit with a constant - extract parameters
-      _meot->second[i].second.second[0]->Fit("pol0","Q");
-      TF1 *fit = _meot->second[i].second.second[0]->GetFunction("pol0");
+      _meot->second[i].second.second[0]->Fit("pol0", "Q");
+      TF1* fit = _meot->second[i].second.second[0]->GetFunction("pol0");
       AverageValues[0].push_back(fit->GetParameter(0));
       AverageValues[1].push_back(fit->GetParError(0));
-      if(sample>1)
-      AverageValues[2].push_back(fit->GetChisquare()/fit->GetNDF());
+      if (sample > 1)
+        AverageValues[2].push_back(fit->GetChisquare() / fit->GetNDF());
       else
-      AverageValues[2].push_back(fit->GetChisquare());
-      sprintf(name,"Sample (%d events)",m_nevtsample);
+        AverageValues[2].push_back(fit->GetChisquare());
+      sprintf(name, "Sample (%d events)", m_nevtsample);
       _meot->second[i].second.second[0]->GetXaxis()->SetTitle(name);
       _meot->second[i].second.second[0]->GetYaxis()->SetTitle("Pedestal value");
       _meot->second[i].second.second[0]->Write();
       // Pedestal width - put content and errors
-      j=0;
-      for(sample_it=_meot->second[i].second.first[2].begin();
-          sample_it!=_meot->second[i].second.first[2].end();++sample_it){
-        _meot->second[i].second.second[1]->SetBinContent(++j,*sample_it);
+      j = 0;
+      for (sample_it = _meot->second[i].second.first[2].begin(); sample_it != _meot->second[i].second.first[2].end();
+           ++sample_it) {
+        _meot->second[i].second.second[1]->SetBinContent(++j, *sample_it);
       }
-      j=0;
-      for(sample_it=_meot->second[i].second.first[3].begin();
-          sample_it!=_meot->second[i].second.first[3].end();++sample_it){
-        _meot->second[i].second.second[1]->SetBinError(++j,*sample_it);
+      j = 0;
+      for (sample_it = _meot->second[i].second.first[3].begin(); sample_it != _meot->second[i].second.first[3].end();
+           ++sample_it) {
+        _meot->second[i].second.second[1]->SetBinError(++j, *sample_it);
       }
       _meot->second[i].second.second[1]->GetXaxis()->SetTitle(name);
       _meot->second[i].second.second[1]->GetYaxis()->SetTitle("Pedestal width");
       _meot->second[i].second.second[1]->Write();
       // Correlation coeffs - put contents and errors
-      j=0;
-      for(sample_it=_meot->second[i].second.first[5].begin();
-          sample_it!=_meot->second[i].second.first[5].end();++sample_it){
-        _meot->second[i].second.second[2]->SetBinContent(++j,*sample_it);
+      j = 0;
+      for (sample_it = _meot->second[i].second.first[5].begin(); sample_it != _meot->second[i].second.first[5].end();
+           ++sample_it) {
+        _meot->second[i].second.second[2]->SetBinContent(++j, *sample_it);
       }
-      j=0;
-      for(sample_it=_meot->second[i].second.first[6].begin();
-          sample_it!=_meot->second[i].second.first[6].end();++sample_it){
-        _meot->second[i].second.second[2]->SetBinError(++j,*sample_it);
+      j = 0;
+      for (sample_it = _meot->second[i].second.first[6].begin(); sample_it != _meot->second[i].second.first[6].end();
+           ++sample_it) {
+        _meot->second[i].second.second[2]->SetBinError(++j, *sample_it);
       }
       _meot->second[i].second.second[2]->GetXaxis()->SetTitle(name);
       _meot->second[i].second.second[2]->GetYaxis()->SetTitle("Close correlation");
       _meot->second[i].second.second[2]->Write();
- /*     j=0;
+      /*     j=0;
       for(sample_it=_meot->second[i].second.first[7].begin();
           sample_it!=_meot->second[i].second.first[7].end();sample_it++){
         _meot->second[i].second.second[3]->SetBinContent(++j,*sample_it);
@@ -598,34 +672,32 @@ void CastorPedestalAnalysis::Trendings(map<HcalDetId, map<int,PEDBUNCH> > &toolT
       _meot->second[i].second.second[4]->GetYaxis()->SetTitle("Distant correlation");
       _meot->second[i].second.second[4]->Write(); */
       // chi2
-      j=0;
-      for(sample_it=_meot->second[i].second.first[4].begin();
-          sample_it!=_meot->second[i].second.first[4].end();++sample_it){
+      j = 0;
+      for (sample_it = _meot->second[i].second.first[4].begin(); sample_it != _meot->second[i].second.first[4].end();
+           ++sample_it) {
         Chi2->Fill(*sample_it);
       }
     }
   }
-  CapidAverage= new TH1F("Constant fit: Pedestal Values",
-                         "Constant fit: Pedestal Values",
-                         AverageValues[0].size(),0.,AverageValues[0].size());
+  CapidAverage = new TH1F("Constant fit: Pedestal Values",
+                          "Constant fit: Pedestal Values",
+                          AverageValues[0].size(),
+                          0.,
+                          AverageValues[0].size());
   std::vector<double>::iterator sample_it;
-  int j=0;
-  for(sample_it=AverageValues[0].begin();
-      sample_it!=AverageValues[0].end();++sample_it){
-    CapidAverage->SetBinContent(++j,*sample_it);
+  int j = 0;
+  for (sample_it = AverageValues[0].begin(); sample_it != AverageValues[0].end(); ++sample_it) {
+    CapidAverage->SetBinContent(++j, *sample_it);
   }
-  j=0;
-  for(sample_it=AverageValues[1].begin();
-      sample_it!=AverageValues[1].end();++sample_it){
-    CapidAverage->SetBinError(++j,*sample_it);
+  j = 0;
+  for (sample_it = AverageValues[1].begin(); sample_it != AverageValues[1].end(); ++sample_it) {
+    CapidAverage->SetBinError(++j, *sample_it);
   }
-  CapidChi2= new TH1F("Constant fit: Chi2/ndf",
-                      "Constant fit: Chi2/ndf",
-                      AverageValues[2].size(),0.,AverageValues[2].size());
-  j=0;
-  for(sample_it=AverageValues[2].begin();
-      sample_it!=AverageValues[2].end();++sample_it){
-    CapidChi2->SetBinContent(++j,*sample_it);
+  CapidChi2 = new TH1F(
+      "Constant fit: Chi2/ndf", "Constant fit: Chi2/ndf", AverageValues[2].size(), 0., AverageValues[2].size());
+  j = 0;
+  for (sample_it = AverageValues[2].begin(); sample_it != AverageValues[2].end(); ++sample_it) {
+    CapidChi2->SetBinContent(++j, *sample_it);
     //CapidChi2->SetBinError(++j,0);
   }
   Chi2->GetXaxis()->SetTitle("Chi2/ndf");
@@ -637,170 +709,184 @@ void CastorPedestalAnalysis::Trendings(map<HcalDetId, map<int,PEDBUNCH> > &toolT
   CapidChi2->GetYaxis()->SetTitle("Chi2/ndf");
   CapidChi2->GetXaxis()->SetTitle("(16+2) x 4 x 4 `events`");
   CapidChi2->Write();
-
 }
 
 //-----------------------------------------------------------------------------
-int CastorPedestalAnalysis::CastorPedVal(int nstat[4], const CastorPedestals* fRefPedestals, 
-				const CastorPedestalWidths* fRefPedestalWidths,
-                                CastorPedestals* fRawPedestals,
-                                CastorPedestalWidths* fRawPedestalWidths,
-				CastorPedestals* fValPedestals, 
-				CastorPedestalWidths* fValPedestalWidths)
-{
-// new version of pedestal validation - it is designed to be as independent of
-// all the rest as possible - you only need to provide valid pedestal objects
-// and a vector of statistics per capID to use this as standalone code
+int CastorPedestalAnalysis::CastorPedVal(int nstat[4],
+                                         const CastorPedestals* fRefPedestals,
+                                         const CastorPedestalWidths* fRefPedestalWidths,
+                                         CastorPedestals* fRawPedestals,
+                                         CastorPedestalWidths* fRawPedestalWidths,
+                                         CastorPedestals* fValPedestals,
+                                         CastorPedestalWidths* fValPedestalWidths) {
+  // new version of pedestal validation - it is designed to be as independent of
+  // all the rest as possible - you only need to provide valid pedestal objects
+  // and a vector of statistics per capID to use this as standalone code
   HcalDetId detid;
-  float RefPedVals[4]; float RefPedSigs[4][4];
-  float RawPedVals[4]; float RawPedSigs[4][4];
-  map<HcalDetId,bool> isinRaw;
-  map<HcalDetId,bool> isinRef;
-  std::vector<DetId> RefChanns=fRefPedestals->getAllChannels();
-  std::vector<DetId> RawChanns=fRawPedestals->getAllChannels();
+  float RefPedVals[4];
+  float RefPedSigs[4][4];
+  float RawPedVals[4];
+  float RawPedSigs[4][4];
+  map<HcalDetId, bool> isinRaw;
+  map<HcalDetId, bool> isinRef;
+  std::vector<DetId> RefChanns = fRefPedestals->getAllChannels();
+  std::vector<DetId> RawChanns = fRawPedestals->getAllChannels();
   std::ofstream PedValLog;
   PedValLog.open("CastorPedVal.log");
 
-  if(nstat[0]+nstat[1]+nstat[2]+nstat[3]<2500) PedValLog<<"CastorPedVal: warning - low statistics"<<std::endl;
-// find complete list of channels in current data and reference
-  for (int i=0; i<(int)RawChanns.size(); i++){
-    isinRef[HcalDetId(RawChanns[i])]=false;
+  if (nstat[0] + nstat[1] + nstat[2] + nstat[3] < 2500)
+    PedValLog << "CastorPedVal: warning - low statistics" << std::endl;
+  // find complete list of channels in current data and reference
+  for (int i = 0; i < (int)RawChanns.size(); i++) {
+    isinRef[HcalDetId(RawChanns[i])] = false;
   }
-  for (int i=0; i<(int)RefChanns.size(); i++){
-    detid=HcalDetId(RefChanns[i]);
-    isinRaw[detid]=false;
-    isinRef[detid]=true;
+  for (int i = 0; i < (int)RefChanns.size(); i++) {
+    detid = HcalDetId(RefChanns[i]);
+    isinRaw[detid] = false;
+    isinRef[detid] = true;
   }
-  for (int i=0; i<(int)RawChanns.size(); i++){
-    detid=HcalDetId(RawChanns[i]);
-    isinRaw[detid]=true;
-    if (isinRef[detid]==false) {
-      PedValLog<<"CastorPedVal: channel "<<detid<<" not found in reference set"<<std::endl;
-      std::cerr<<"CastorPedVal: channel "<<detid<<" not found in reference set"<<std::endl;
+  for (int i = 0; i < (int)RawChanns.size(); i++) {
+    detid = HcalDetId(RawChanns[i]);
+    isinRaw[detid] = true;
+    if (isinRef[detid] == false) {
+      PedValLog << "CastorPedVal: channel " << detid << " not found in reference set" << std::endl;
+      std::cerr << "CastorPedVal: channel " << detid << " not found in reference set" << std::endl;
     }
   }
 
-// main loop over channels
-  int erflag=0;
-  for (int i=0; i<(int)RefChanns.size(); i++){
-    detid=HcalDetId(RefChanns[i]);
-    for (int icap=0; icap<4; icap++) {
-      RefPedVals[icap]=fRefPedestals->getValues(detid)->getValue(icap);
-      for (int icap2=icap; icap2<4; icap2++) {
-        RefPedSigs[icap][icap2]=fRefPedestalWidths->getValues(detid)->getSigma(icap,icap2);
-        if(icap2!=icap)RefPedSigs[icap2][icap]=RefPedSigs[icap][icap2];
+  // main loop over channels
+  int erflag = 0;
+  for (int i = 0; i < (int)RefChanns.size(); i++) {
+    detid = HcalDetId(RefChanns[i]);
+    for (int icap = 0; icap < 4; icap++) {
+      RefPedVals[icap] = fRefPedestals->getValues(detid)->getValue(icap);
+      for (int icap2 = icap; icap2 < 4; icap2++) {
+        RefPedSigs[icap][icap2] = fRefPedestalWidths->getValues(detid)->getSigma(icap, icap2);
+        if (icap2 != icap)
+          RefPedSigs[icap2][icap] = RefPedSigs[icap][icap2];
       }
     }
 
-// read new raw values
-    if(isinRaw[detid]) {
-      for (int icap=0; icap<4; icap++) {
-        RawPedVals[icap]=fRawPedestals->getValues(detid)->getValue(icap);
-        for (int icap2=icap; icap2<4; icap2++) {
-          RawPedSigs[icap][icap2]=fRawPedestalWidths->getValues(detid)->getSigma(icap,icap2);
-          if(icap2!=icap)RawPedSigs[icap2][icap]=RawPedSigs[icap][icap2];
+    // read new raw values
+    if (isinRaw[detid]) {
+      for (int icap = 0; icap < 4; icap++) {
+        RawPedVals[icap] = fRawPedestals->getValues(detid)->getValue(icap);
+        for (int icap2 = icap; icap2 < 4; icap2++) {
+          RawPedSigs[icap][icap2] = fRawPedestalWidths->getValues(detid)->getSigma(icap, icap2);
+          if (icap2 != icap)
+            RawPedSigs[icap2][icap] = RawPedSigs[icap][icap2];
         }
       }
 
-// first quick check if raw values make sense: if not, the channel is treated like absent
-      for (int icap=0; icap<4; icap++) {
-        if(RawPedVals[icap]<1. || RawPedSigs[icap][icap]<0.01) isinRaw[detid]=false;
-        for (int icap2=icap; icap2<4; icap2++){
-          if(fabs(RawPedSigs[icap][icap2]/sqrt(RawPedSigs[icap][icap]*RawPedSigs[icap2][icap2]))>1.) isinRaw[detid]=false;
+      // first quick check if raw values make sense: if not, the channel is treated like absent
+      for (int icap = 0; icap < 4; icap++) {
+        if (RawPedVals[icap] < 1. || RawPedSigs[icap][icap] < 0.01)
+          isinRaw[detid] = false;
+        for (int icap2 = icap; icap2 < 4; icap2++) {
+          if (fabs(RawPedSigs[icap][icap2] / sqrt(RawPedSigs[icap][icap] * RawPedSigs[icap2][icap2])) > 1.)
+            isinRaw[detid] = false;
         }
       }
     }
 
-// check raw values against reference
-    if(isinRaw[detid]) {
-      for (int icap=0; icap<4; icap++) {
-        int icap2=(icap+1)%4;
-        float width=sqrt(RawPedSigs[icap][icap]);
-        float erof1=width/sqrt((float)nstat[icap]);
-        float erof2=sqrt(erof1*erof1+RawPedSigs[icap][icap]/(float)nstat[icap]);
-        float erofwidth=width/sqrt(2.*nstat[icap]);
-        float diffof1=RawPedVals[icap]-RefPedVals[icap];
-        float diffof2=RawPedVals[icap]+RawPedVals[icap2]-RefPedVals[icap]-RefPedVals[icap2];
-        float diffofw=width-sqrt(RefPedSigs[icap][icap]);
-
-// validation in 2 TS for HB, HE, HO, in 1 TS for HF
-        int nTS=2;
-        if(detid.subdet()==HcalForward) nTS=1;
-        if(nTS==1 && fabs(diffof1)>0.5+erof1) { 
-          erflag+=1;
-          PedValLog<<"HcalPedVal: drift in channel "<<detid<<" cap "<<icap<<": "<<RawPedVals[icap]<<" - "<<RefPedVals[icap]<<" = "<<diffof1<<std::endl;
+    // check raw values against reference
+    if (isinRaw[detid]) {
+      for (int icap = 0; icap < 4; icap++) {
+        int icap2 = (icap + 1) % 4;
+        float width = sqrt(RawPedSigs[icap][icap]);
+        float erof1 = width / sqrt((float)nstat[icap]);
+        float erof2 = sqrt(erof1 * erof1 + RawPedSigs[icap][icap] / (float)nstat[icap]);
+        float erofwidth = width / sqrt(2. * nstat[icap]);
+        float diffof1 = RawPedVals[icap] - RefPedVals[icap];
+        float diffof2 = RawPedVals[icap] + RawPedVals[icap2] - RefPedVals[icap] - RefPedVals[icap2];
+        float diffofw = width - sqrt(RefPedSigs[icap][icap]);
+
+        // validation in 2 TS for HB, HE, HO, in 1 TS for HF
+        int nTS = 2;
+        if (detid.subdet() == HcalForward)
+          nTS = 1;
+        if (nTS == 1 && fabs(diffof1) > 0.5 + erof1) {
+          erflag += 1;
+          PedValLog << "HcalPedVal: drift in channel " << detid << " cap " << icap << ": " << RawPedVals[icap] << " - "
+                    << RefPedVals[icap] << " = " << diffof1 << std::endl;
         }
-        if(nTS==2 && fabs(diffof2)>0.5+erof2) { 
-          erflag+=1;
-          PedValLog<<"HcalPedVal: drift in channel "<<detid<<" caps "<<icap<<"+"<<icap2<<": "<<RawPedVals[icap]<<"+"<<RawPedVals[icap2]<<" - "<<RefPedVals[icap]<<"+"<<RefPedVals[icap2]<<" = "<<diffof2<<std::endl;
+        if (nTS == 2 && fabs(diffof2) > 0.5 + erof2) {
+          erflag += 1;
+          PedValLog << "HcalPedVal: drift in channel " << detid << " caps " << icap << "+" << icap2 << ": "
+                    << RawPedVals[icap] << "+" << RawPedVals[icap2] << " - " << RefPedVals[icap] << "+"
+                    << RefPedVals[icap2] << " = " << diffof2 << std::endl;
         }
-        if(fabs(diffofw)>0.15*width+erofwidth) {
-          erflag+=1;
-          PedValLog<<"HcalPedVal: width changed in channel "<<detid<<" cap "<<icap<<": "<<width<<" - "<<sqrt(RefPedSigs[icap][icap])<<" = "<<diffofw<<std::endl;
+        if (fabs(diffofw) > 0.15 * width + erofwidth) {
+          erflag += 1;
+          PedValLog << "HcalPedVal: width changed in channel " << detid << " cap " << icap << ": " << width << " - "
+                    << sqrt(RefPedSigs[icap][icap]) << " = " << diffofw << std::endl;
         }
       }
     }
 
-// for disconnected/bad channels restore reference values
+    // for disconnected/bad channels restore reference values
     else {
-      PedValLog<<"HcalPedVal: no valid data from channel "<<detid<<std::endl;
-      erflag+=100000;
-      CastorPedestal item(detid,RefPedVals[0],RefPedVals[1],RefPedVals[2],RefPedVals[3]);
+      PedValLog << "HcalPedVal: no valid data from channel " << detid << std::endl;
+      erflag += 100000;
+      CastorPedestal item(detid, RefPedVals[0], RefPedVals[1], RefPedVals[2], RefPedVals[3]);
       fValPedestals->addValues(item);
       CastorPedestalWidth widthsp(detid);
-      for (int icap=0; icap<4; icap++) {
-        for (int icap2=icap; icap2<4; icap2++) widthsp.setSigma(icap2,icap,RefPedSigs[icap2][icap]);
+      for (int icap = 0; icap < 4; icap++) {
+        for (int icap2 = icap; icap2 < 4; icap2++)
+          widthsp.setSigma(icap2, icap, RefPedSigs[icap2][icap]);
       }
       fValPedestalWidths->addValues(widthsp);
     }
 
-// end of channel loop
+    // end of channel loop
   }
 
-  if(erflag==0) PedValLog<<"HcalPedVal: all pedestals checked OK"<<std::endl;
+  if (erflag == 0)
+    PedValLog << "HcalPedVal: all pedestals checked OK" << std::endl;
 
-// now construct the remaining part of the validated objects
-// if nothing changed outside tolerance, validated set = reference set
-  if(erflag%100000 == 0) {
-    for (int i=0; i<(int)RefChanns.size(); i++){
-      detid=HcalDetId(RefChanns[i]);
+  // now construct the remaining part of the validated objects
+  // if nothing changed outside tolerance, validated set = reference set
+  if (erflag % 100000 == 0) {
+    for (int i = 0; i < (int)RefChanns.size(); i++) {
+      detid = HcalDetId(RefChanns[i]);
       if (isinRaw[detid]) {
         CastorPedestalWidth widthsp(detid);
-        for (int icap=0; icap<4; icap++) {
-          RefPedVals[icap]=fRefPedestals->getValues(detid)->getValue(icap);
-          for (int icap2=icap; icap2<4; icap2++) {
-            RefPedSigs[icap][icap2]=fRefPedestalWidths->getValues(detid)->getSigma(icap,icap2);
-            if(icap2!=icap)RefPedSigs[icap2][icap]=RefPedSigs[icap][icap2];
-            widthsp.setSigma(icap2,icap,RefPedSigs[icap2][icap]);
+        for (int icap = 0; icap < 4; icap++) {
+          RefPedVals[icap] = fRefPedestals->getValues(detid)->getValue(icap);
+          for (int icap2 = icap; icap2 < 4; icap2++) {
+            RefPedSigs[icap][icap2] = fRefPedestalWidths->getValues(detid)->getSigma(icap, icap2);
+            if (icap2 != icap)
+              RefPedSigs[icap2][icap] = RefPedSigs[icap][icap2];
+            widthsp.setSigma(icap2, icap, RefPedSigs[icap2][icap]);
           }
         }
-	fValPedestalWidths->addValues(widthsp);
-	CastorPedestal item(detid,RefPedVals[0],RefPedVals[1],RefPedVals[2],RefPedVals[3]);
+        fValPedestalWidths->addValues(widthsp);
+        CastorPedestal item(detid, RefPedVals[0], RefPedVals[1], RefPedVals[2], RefPedVals[3]);
         fValPedestals->addValues(item);
       }
     }
   }
 
-// if anything changed, validated set = raw set + reference for missing/bad channels
+  // if anything changed, validated set = raw set + reference for missing/bad channels
   else {
-    for (int i=0; i<(int)RawChanns.size(); i++){
-      detid=HcalDetId(RawChanns[i]);
+    for (int i = 0; i < (int)RawChanns.size(); i++) {
+      detid = HcalDetId(RawChanns[i]);
       if (isinRaw[detid]) {
         CastorPedestalWidth widthsp(detid);
-        for (int icap=0; icap<4; icap++) {
-          RawPedVals[icap]=fRawPedestals->getValues(detid)->getValue(icap);
-          for (int icap2=icap; icap2<4; icap2++) {
-            RawPedSigs[icap][icap2]=fRawPedestalWidths->getValues(detid)->getSigma(icap,icap2);
-            if(icap2!=icap)RawPedSigs[icap2][icap]=RawPedSigs[icap][icap2];
-            widthsp.setSigma(icap2,icap,RawPedSigs[icap2][icap]);
+        for (int icap = 0; icap < 4; icap++) {
+          RawPedVals[icap] = fRawPedestals->getValues(detid)->getValue(icap);
+          for (int icap2 = icap; icap2 < 4; icap2++) {
+            RawPedSigs[icap][icap2] = fRawPedestalWidths->getValues(detid)->getSigma(icap, icap2);
+            if (icap2 != icap)
+              RawPedSigs[icap2][icap] = RawPedSigs[icap][icap2];
+            widthsp.setSigma(icap2, icap, RawPedSigs[icap2][icap]);
           }
         }
-	fValPedestalWidths->addValues(widthsp);
-	CastorPedestal item(detid,RawPedVals[0],RawPedVals[1],RawPedVals[2],RawPedVals[3]);
+        fValPedestalWidths->addValues(widthsp);
+        CastorPedestal item(detid, RawPedVals[0], RawPedVals[1], RawPedVals[2], RawPedVals[3]);
         fValPedestals->addValues(item);
       }
     }
   }
   return erflag;
 }
-
diff --git a/CalibCalorimetry/CastorCalib/src/CastorPulseContainmentCorrection.cc b/CalibCalorimetry/CastorCalib/src/CastorPulseContainmentCorrection.cc
index 314c5af8f8e2b..13e4f98b1efad 100644
--- a/CalibCalorimetry/CastorCalib/src/CastorPulseContainmentCorrection.cc
+++ b/CalibCalorimetry/CastorCalib/src/CastorPulseContainmentCorrection.cc
@@ -2,37 +2,34 @@
 #include "CalibCalorimetry/CastorCalib/interface/CastorTimeSlew.h"
 #include "CalibCalorimetry/CastorCalib/interface/CastorPulseShapes.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include <algorithm> // for "max","min"
+#include <algorithm>  // for "max","min"
 #include <cmath>
 #include <iostream>
 
 #include "CalibCalorimetry/HcalAlgos/interface/genlkupmap.h"
 
-
-template<>
-RecoFCcorFactorAlgo<CastorPulseShapes::Shape>::RecoFCcorFactorAlgo(int num_samples, double fixedphase_ns)
-{
+template <>
+RecoFCcorFactorAlgo<CastorPulseShapes::Shape>::RecoFCcorFactorAlgo(int num_samples, double fixedphase_ns) {
   fixedphasens_ = fixedphase_ns;
   CastorPulseShapes shapes;
-  shape_=shapes.castorShape();
+  shape_ = shapes.castorShape();
   const int binsize_ns = 25;
 
   // First set up controlling parameters for calculating the correction factor:
   // Integration window size...
   //
-  integrationwindowns_ = (double)(binsize_ns*num_samples);
+  integrationwindowns_ = (double)(binsize_ns * num_samples);
 
   // First find the point at which time bin "1" exceeds time bin "0",
   // and call that point "time 0".
   //
-  for (int shift_ns=0; shift_ns<binsize_ns; shift_ns++) {
-
+  for (int shift_ns = 0; shift_ns < binsize_ns; shift_ns++) {
     // Digitize by integrating to find all time sample
     // bin values for this shift.
     //
-    double tmin    = -(double)shift_ns;
-    double bin0val = (double)shape_.integrate(tmin, tmin+binsize_ns);
-    double bin1val = (double)shape_.integrate(tmin+binsize_ns, tmin+2*binsize_ns);
+    double tmin = -(double)shift_ns;
+    double bin0val = (double)shape_.integrate(tmin, tmin + binsize_ns);
+    double bin1val = (double)shape_.integrate(tmin + binsize_ns, tmin + 2 * binsize_ns);
 
 #if 0
     char s[80];
@@ -52,18 +49,16 @@ RecoFCcorFactorAlgo<CastorPulseShapes::Shape>::RecoFCcorFactorAlgo(int num_sampl
 }
 
 template <>
-std::pair<double,double> RecoFCcorFactorAlgo<CastorPulseShapes::Shape>::calcpair(double truefc)
-{
-  double timeslew_ns = CastorTimeSlew::delay(std::max(0.0,(double)truefc),
-                                           CastorTimeSlew::Medium);
-  double shift_ns  = fixedphasens_ - time0shiftns_ + timeslew_ns;
+std::pair<double, double> RecoFCcorFactorAlgo<CastorPulseShapes::Shape>::calcpair(double truefc) {
+  double timeslew_ns = CastorTimeSlew::delay(std::max(0.0, (double)truefc), CastorTimeSlew::Medium);
+  double shift_ns = fixedphasens_ - time0shiftns_ + timeslew_ns;
 
-  double tmin      = -shift_ns;
-  double tmax      = tmin+integrationwindowns_;
+  double tmin = -shift_ns;
+  double tmax = tmin + integrationwindowns_;
 
-  double integral  = shape_.integrate( tmin, tmax );
-  double corfactor = 1.0/integral;
-  double recofc    = (double)truefc * integral;
+  double integral = shape_.integrate(tmin, tmax);
+  double corfactor = 1.0 / integral;
+  double recofc = (double)truefc * integral;
 
 #if 0
   char s[80];
@@ -72,34 +67,32 @@ std::pair<double,double> RecoFCcorFactorAlgo<CastorPulseShapes::Shape>::calcpair
   cout << s;
 #endif
 
-  std::pair<double,double> thepair(recofc,corfactor);
+  std::pair<double, double> thepair(recofc, corfactor);
   return thepair;
 }
 
 ///Generate energy correction factors based on a predetermined phase of the hit + time slew
 //
 CastorPulseContainmentCorrection::CastorPulseContainmentCorrection(int num_samples,
-                                                               float fixedphase_ns,
-                                                               float max_fracerror)
-{
+                                                                   float fixedphase_ns,
+                                                                   float max_fracerror) {
   RecoFCcorFactorAlgo<CastorPulseShapes::Shape> corFalgo(num_samples, (double)fixedphase_ns);
 
   // Generate lookup map for the correction function, never exceeding
   // a maximum fractional error for lookups.
   //
-  genlkupmap< RecoFCcorFactorAlgo<CastorPulseShapes::Shape> > (1.0, 5000.0f,  // generation domain
-                                     max_fracerror,     // maximum fractional error
-                                     1.0,   // min_xstep = minimum true fC increment
-                                     corFalgo,
-                                     mCorFactors_);     // return lookup map
+  genlkupmap<RecoFCcorFactorAlgo<CastorPulseShapes::Shape> >(1.0,
+                                                             5000.0f,        // generation domain
+                                                             max_fracerror,  // maximum fractional error
+                                                             1.0,            // min_xstep = minimum true fC increment
+                                                             corFalgo,
+                                                             mCorFactors_);  // return lookup map
 }
 
-
-double CastorPulseContainmentCorrection::getCorrection(double fc_ampl) const
-{
+double CastorPulseContainmentCorrection::getCorrection(double fc_ampl) const {
   double correction;
 
-  std::map<double,double>::const_iterator fcupper,fclower;
+  std::map<double, double>::const_iterator fcupper, fclower;
 
   fcupper = mCorFactors_.upper_bound(fc_ampl);
   fclower = fcupper;
@@ -107,13 +100,10 @@ double CastorPulseContainmentCorrection::getCorrection(double fc_ampl) const
 
   if (fcupper == mCorFactors_.end()) {
     correction = fclower->second;
-  }
-  else if (fcupper == mCorFactors_.begin()) {
+  } else if (fcupper == mCorFactors_.begin()) {
     correction = fcupper->second;
-  }
-  else {
-    if (fabs(fclower->first - fc_ampl) <
-	fabs(fcupper->first - fc_ampl) )
+  } else {
+    if (fabs(fclower->first - fc_ampl) < fabs(fcupper->first - fc_ampl))
       correction = fclower->second;
     else
       correction = fcupper->second;
diff --git a/CalibCalorimetry/CastorCalib/src/CastorPulseShapes.cc b/CalibCalorimetry/CastorCalib/src/CastorPulseShapes.cc
index 3a934d58288c6..adaede55a737b 100644
--- a/CalibCalorimetry/CastorCalib/src/CastorPulseShapes.cc
+++ b/CalibCalorimetry/CastorCalib/src/CastorPulseShapes.cc
@@ -6,74 +6,75 @@ CastorPulseShapes::CastorPulseShapes() {
   computeCastorShape(castorShape_);
 }
 
-
 void CastorPulseShapes::computeCastorShape(CastorPulseShapes::Shape& sh) {
-
   //  cout << endl << " ===== computeShapeHF  !!! " << endl << endl;
 
-  const float ts = 3.0;           // time constant in   t * exp(-(t/ts)**2)
+  const float ts = 3.0;  // time constant in   t * exp(-(t/ts)**2)
 
   // first create pulse shape over a range of time 0 ns to 255 ns in 1 ns steps
   int nbin = 256;
   sh.setNBin(nbin);
-  std::vector<float> ntmp(nbin,0.0);  // 
+  std::vector<float> ntmp(nbin, 0.0);  //
 
   int j;
   float norm;
 
   // CASTOR SHAPE
   norm = 0.0;
-  for( j = 0; j < 3 * ts && j < nbin; j++){
-    ntmp[j] = ((float)j)*exp(-((float)(j*j))/(ts*ts));
+  for (j = 0; j < 3 * ts && j < nbin; j++) {
+    ntmp[j] = ((float)j) * exp(-((float)(j * j)) / (ts * ts));
     norm += ntmp[j];
   }
   // normalize pulse area to 1.0
-  for( j = 0; j < 3 * ts && j < nbin; j++){
+  for (j = 0; j < 3 * ts && j < nbin; j++) {
     ntmp[j] /= norm;
 
     //    cout << " nt [" << j << "] = " <<  ntmp[j] << endl;
-    sh.setShapeBin(j,ntmp[j]);
+    sh.setShapeBin(j, ntmp[j]);
   }
 }
 
 CastorPulseShapes::Shape::Shape() {
-  nbin_=0;
-  tpeak_=0;
+  nbin_ = 0;
+  tpeak_ = 0;
 }
 
 void CastorPulseShapes::Shape::setNBin(int n) {
-  nbin_=n;
-  shape_=std::vector<float>(n,0.0f);
+  nbin_ = n;
+  shape_ = std::vector<float>(n, 0.0f);
 }
 
 void CastorPulseShapes::Shape::setShapeBin(int i, float f) {
-  if (i>=0 && i<nbin_) shape_[i]=f;
+  if (i >= 0 && i < nbin_)
+    shape_[i] = f;
 }
 
 float CastorPulseShapes::Shape::operator()(double t) const {
   // shape is in 1 ns steps
-  int i=(int)(t+0.5);
-  float rv=0;
-  if (i>=0 && i<nbin_) rv=shape_[i];
+  int i = (int)(t + 0.5);
+  float rv = 0;
+  if (i >= 0 && i < nbin_)
+    rv = shape_[i];
   return rv;
 }
 
 float CastorPulseShapes::Shape::at(double t) const {
   // shape is in 1 ns steps
-  int i=(int)(t+0.5);
-  float rv=0;
-  if (i>=0 && i<nbin_) rv=shape_[i];
+  int i = (int)(t + 0.5);
+  float rv = 0;
+  if (i >= 0 && i < nbin_)
+    rv = shape_[i];
   return rv;
 }
 
 float CastorPulseShapes::Shape::integrate(double t1, double t2) const {
-  static const float int_delta_ns = 0.05f; 
+  static const float int_delta_ns = 0.05f;
   double intval = 0.0;
 
-  for (double t = t1; t < t2; t+= int_delta_ns) {
+  for (double t = t1; t < t2; t += int_delta_ns) {
     float loedge = at(t);
-    float hiedge = at(t+int_delta_ns);
-    intval += (loedge+hiedge)*int_delta_ns/2.0;
+    float hiedge = at(t + int_delta_ns);
+    intval += (loedge + hiedge) * int_delta_ns / 2.0;
   }
 
   return (float)intval;
diff --git a/CalibCalorimetry/CastorCalib/src/CastorTimeSlew.cc b/CalibCalorimetry/CastorCalib/src/CastorTimeSlew.cc
index 8ffa1059d9199..48d3bbf8258ab 100644
--- a/CalibCalorimetry/CastorCalib/src/CastorTimeSlew.cc
+++ b/CalibCalorimetry/CastorCalib/src/CastorTimeSlew.cc
@@ -1,12 +1,12 @@
 #include "CalibCalorimetry/CastorCalib/interface/CastorTimeSlew.h"
 #include <cmath>
 
-// NOTE check these numbers 
-static const double tzero[3]= {23.960177, 13.307784, 9.109694};
-static const double slope[3] = {-3.178648,  -1.556668, -1.075824 };
-static const double tmax[3] = {16.00, 10.00, 6.25 };
+// NOTE check these numbers
+static const double tzero[3] = {23.960177, 13.307784, 9.109694};
+static const double slope[3] = {-3.178648, -1.556668, -1.075824};
+static const double tmax[3] = {16.00, 10.00, 6.25};
 
 double CastorTimeSlew::delay(double fC, BiasSetting bias) {
-  double rawDelay=tzero[bias]+slope[bias]*log(fC);
-  return (rawDelay<0)?(0):((rawDelay>tmax[bias])?(tmax[bias]):(rawDelay));			   
+  double rawDelay = tzero[bias] + slope[bias] * log(fC);
+  return (rawDelay < 0) ? (0) : ((rawDelay > tmax[bias]) ? (tmax[bias]) : (rawDelay));
 }
diff --git a/CalibCalorimetry/EcalCorrectionModules/src/EcalGlobalShowerContainmentCorrectionsVsEtaESProducer.cc b/CalibCalorimetry/EcalCorrectionModules/src/EcalGlobalShowerContainmentCorrectionsVsEtaESProducer.cc
index af83ed365e2b9..06841c39c5a4b 100644
--- a/CalibCalorimetry/EcalCorrectionModules/src/EcalGlobalShowerContainmentCorrectionsVsEtaESProducer.cc
+++ b/CalibCalorimetry/EcalCorrectionModules/src/EcalGlobalShowerContainmentCorrectionsVsEtaESProducer.cc
@@ -2,13 +2,15 @@
 //
 // Package:    EcalGlobalShowerContainmentCorrectionsVsEtaESProducer
 // Class:      EcalGlobalShowerContainmentCorrectionsVsEtaESProducer
-// 
-/**\class EcalGlobalShowerContainmentCorrectionsVsEtaESProducer EcalGlobalShowerContainmentCorrectionsVsEtaESProducer.h User/EcalGlobalShowerContainmentCorrectionsVsEtaESProducer/interface/EcalGlobalShowerContainmentCorrectionsVsEtaESProducer.h
+//
+/**\class EcalGlobalShowerContainmentCorrectionsVsEtaESProducer
+ EcalGlobalShowerContainmentCorrectionsVsEtaESProducer.h
+ User/EcalGlobalShowerContainmentCorrectionsVsEtaESProducer/interface/EcalGlobalShowerContainmentCorrectionsVsEtaESProducer.h
 
  Description: Trivial ESProducer to provide EventSetup with (hard coded)
               global shower containment corrections as a function of eta
 
-     
+
  \author  Paolo Meridiani
 */
 
@@ -16,69 +18,62 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/ModuleFactory.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
 
-#include "CondFormats/EcalCorrections/interface/EcalGlobalShowerContainmentCorrectionsVsEta.h"
 #include "CondFormats/DataRecord/interface/EcalGlobalShowerContainmentCorrectionsVsEtaRcd.h"
+#include "CondFormats/EcalCorrections/interface/EcalGlobalShowerContainmentCorrectionsVsEta.h"
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
 
-
-
 class EcalGlobalShowerContainmentCorrectionsVsEtaESProducer : public edm::ESProducer {
+public:
+  EcalGlobalShowerContainmentCorrectionsVsEtaESProducer(const edm::ParameterSet &);
+  ~EcalGlobalShowerContainmentCorrectionsVsEtaESProducer() override;
 
-   public:
-      EcalGlobalShowerContainmentCorrectionsVsEtaESProducer(const edm::ParameterSet&);
-     ~EcalGlobalShowerContainmentCorrectionsVsEtaESProducer() override;
-
-      typedef std::unique_ptr<EcalGlobalShowerContainmentCorrectionsVsEta> ReturnType;
+  typedef std::unique_ptr<EcalGlobalShowerContainmentCorrectionsVsEta> ReturnType;
 
-      ReturnType produce(const EcalGlobalShowerContainmentCorrectionsVsEtaRcd&);
-   private:
-  
+  ReturnType produce(const EcalGlobalShowerContainmentCorrectionsVsEtaRcd &);
 
+private:
 };
 
-
-EcalGlobalShowerContainmentCorrectionsVsEtaESProducer::EcalGlobalShowerContainmentCorrectionsVsEtaESProducer(const edm::ParameterSet& iConfig)
-{   
-   setWhatProduced(this);
+EcalGlobalShowerContainmentCorrectionsVsEtaESProducer::EcalGlobalShowerContainmentCorrectionsVsEtaESProducer(
+    const edm::ParameterSet &iConfig) {
+  setWhatProduced(this);
 }
 
-
-EcalGlobalShowerContainmentCorrectionsVsEtaESProducer::~EcalGlobalShowerContainmentCorrectionsVsEtaESProducer(){ }
-
+EcalGlobalShowerContainmentCorrectionsVsEtaESProducer::~EcalGlobalShowerContainmentCorrectionsVsEtaESProducer() {}
 
 //
 // member functions
 //
 
 EcalGlobalShowerContainmentCorrectionsVsEtaESProducer::ReturnType
-EcalGlobalShowerContainmentCorrectionsVsEtaESProducer::produce(const EcalGlobalShowerContainmentCorrectionsVsEtaRcd& iRecord)
-{
-
-   using namespace edm::es;
-   using namespace std;
-
-   auto pEcalGlobalShowerContainmentCorrectionsVsEta = std::make_unique<EcalGlobalShowerContainmentCorrectionsVsEta>();
-   
-   double values[] = {   43.77,       // 3x3 
-			 1.,	  
-			 -3.97e-006,
-			 43.77,       // 5x5 
-			 1.,	  
-			 -3.97e-006,
-   };
-   
-   const size_t size = sizeof values / sizeof values[0];
-   EcalGlobalShowerContainmentCorrectionsVsEta::Coefficients coeff;
-   std::copy(values,values+size,coeff.data);
-   pEcalGlobalShowerContainmentCorrectionsVsEta->fillCorrectionCoefficients(coeff);
-   
-   return pEcalGlobalShowerContainmentCorrectionsVsEta ;
+EcalGlobalShowerContainmentCorrectionsVsEtaESProducer::produce(
+    const EcalGlobalShowerContainmentCorrectionsVsEtaRcd &iRecord) {
+  using namespace edm::es;
+  using namespace std;
+
+  auto pEcalGlobalShowerContainmentCorrectionsVsEta = std::make_unique<EcalGlobalShowerContainmentCorrectionsVsEta>();
+
+  double values[] = {
+      43.77,  // 3x3
+      1.,
+      -3.97e-006,
+      43.77,  // 5x5
+      1.,
+      -3.97e-006,
+  };
+
+  const size_t size = sizeof values / sizeof values[0];
+  EcalGlobalShowerContainmentCorrectionsVsEta::Coefficients coeff;
+  std::copy(values, values + size, coeff.data);
+  pEcalGlobalShowerContainmentCorrectionsVsEta->fillCorrectionCoefficients(coeff);
+
+  return pEcalGlobalShowerContainmentCorrectionsVsEta;
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_EVENTSETUP_MODULE(EcalGlobalShowerContainmentCorrectionsVsEtaESProducer);
diff --git a/CalibCalorimetry/EcalCorrectionModules/src/EcalShowerContainmentCorrectionsESProducer.cc b/CalibCalorimetry/EcalCorrectionModules/src/EcalShowerContainmentCorrectionsESProducer.cc
index 316ec14c054a7..b99c8c768e666 100644
--- a/CalibCalorimetry/EcalCorrectionModules/src/EcalShowerContainmentCorrectionsESProducer.cc
+++ b/CalibCalorimetry/EcalCorrectionModules/src/EcalShowerContainmentCorrectionsESProducer.cc
@@ -2,13 +2,15 @@
 //
 // Package:    EcalShowerContainmentCorrectionsESProducer
 // Class:      EcalShowerContainmentCorrectionsESProducer
-// 
-/**\class EcalShowerContainmentCorrectionsESProducer EcalShowerContainmentCorrectionsESProducer.h User/EcalShowerContainmentCorrectionsESProducer/interface/EcalShowerContainmentCorrectionsESProducer.h
+//
+/**\class EcalShowerContainmentCorrectionsESProducer
+ EcalShowerContainmentCorrectionsESProducer.h
+ User/EcalShowerContainmentCorrectionsESProducer/interface/EcalShowerContainmentCorrectionsESProducer.h
 
  Description: Trivial ESProducer to provide EventSetup with (hard coded)
               shower containment corrections
 
-     
+
  \author  Stefano Argiro
          Created:  Mon Mar  5 08:39:12 CET 2007
 */
@@ -17,112 +19,100 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/ModuleFactory.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
 
-#include "CondFormats/EcalCorrections/interface/EcalShowerContainmentCorrections.h"
 #include "CondFormats/DataRecord/interface/EcalShowerContainmentCorrectionsRcd.h"
+#include "CondFormats/EcalCorrections/interface/EcalShowerContainmentCorrections.h"
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
 
-
-
 class EcalShowerContainmentCorrectionsESProducer : public edm::ESProducer {
+public:
+  EcalShowerContainmentCorrectionsESProducer(const edm::ParameterSet &);
+  ~EcalShowerContainmentCorrectionsESProducer() override;
 
-   public:
-      EcalShowerContainmentCorrectionsESProducer(const edm::ParameterSet&);
-     ~EcalShowerContainmentCorrectionsESProducer() override;
-
-      typedef std::unique_ptr<EcalShowerContainmentCorrections> ReturnType;
+  typedef std::unique_ptr<EcalShowerContainmentCorrections> ReturnType;
 
-      ReturnType produce(const EcalShowerContainmentCorrectionsRcd&);
-   private:
-  
+  ReturnType produce(const EcalShowerContainmentCorrectionsRcd &);
 
+private:
 };
 
-
-EcalShowerContainmentCorrectionsESProducer::EcalShowerContainmentCorrectionsESProducer(const edm::ParameterSet& iConfig)
-{   
-   setWhatProduced(this);
+EcalShowerContainmentCorrectionsESProducer::EcalShowerContainmentCorrectionsESProducer(
+    const edm::ParameterSet &iConfig) {
+  setWhatProduced(this);
 }
 
-
-EcalShowerContainmentCorrectionsESProducer::~EcalShowerContainmentCorrectionsESProducer(){ }
-
+EcalShowerContainmentCorrectionsESProducer::~EcalShowerContainmentCorrectionsESProducer() {}
 
 //
 // member functions
 //
 
-EcalShowerContainmentCorrectionsESProducer::ReturnType
-EcalShowerContainmentCorrectionsESProducer::produce(const EcalShowerContainmentCorrectionsRcd& iRecord)
-{
-
-   using namespace edm::es;
-   using namespace std;
-
-   auto pEcalShowerContainmentCorrections = std::make_unique<EcalShowerContainmentCorrections>();
-   int sm=1; // in testbeam data sw believes we always are on sm01
-
-   // where is the n of xtals per sm coded ?
-   for (int xtal=1; xtal<=1700 ; ++xtal){
-
-     //     // from  /afs/cern.ch/user/h/h4ecal/h4ana/data/gapCorrections/parametres_pol6_X204_2_1.out
-
- // corrections computed on module3 - (sm16, 1run)
-
-     double values[] = {   0.998959,       // 3x3 x right	  
-			   0.00124547,	  
-			  -0.000348259,
-			   6.04065e-006,  
-			   0.999032,       // 3x3 x left
-			   7.90628e-005,
-			  -0.000175699,
-			   -2.60715e-007,
-                           //
-			   0.999983,       // 3x3 y right
-			 -0.000132085,
-			  2.04773e-005,
-			 -1.21629e-005,
-			   1.00002,        // 3x3 y left 
-			  0.00016518,
-			  5.36343e-005,
-			  1.32094e-005, 
-			   //
-			   0.998944,	  // 5x5
-			   0.00100987,
-			   -0.000223207,
-			   2.15615e-006,
-			   0.999127,   
-			   0.000253437,
-			   -9.80656e-005, 
-			   1.48651e-006,
-			   1.00006,
-			   -0.000179675,
-			   8.15627e-005,
-			   -1.21549e-005,
-			   1.00022,
-			   0.000363728,
-			   0.000128066,
-			   1.54473e-005 };
-
-
-
-
-     const size_t size = sizeof values / sizeof values[0];
-     EcalShowerContainmentCorrections::Coefficients coeff;
-     std::copy(values,values+size,coeff.data);
-
-     EBDetId id(sm,xtal,EBDetId::SMCRYSTALMODE);
-     
-     // we are filling always the same group ...
-     pEcalShowerContainmentCorrections->fillCorrectionCoefficients(id,3,coeff);
-   }
-
-   return pEcalShowerContainmentCorrections ;
+EcalShowerContainmentCorrectionsESProducer::ReturnType EcalShowerContainmentCorrectionsESProducer::produce(
+    const EcalShowerContainmentCorrectionsRcd &iRecord) {
+  using namespace edm::es;
+  using namespace std;
+
+  auto pEcalShowerContainmentCorrections = std::make_unique<EcalShowerContainmentCorrections>();
+  int sm = 1;  // in testbeam data sw believes we always are on sm01
+
+  // where is the n of xtals per sm coded ?
+  for (int xtal = 1; xtal <= 1700; ++xtal) {
+    //     // from
+    //     /afs/cern.ch/user/h/h4ecal/h4ana/data/gapCorrections/parametres_pol6_X204_2_1.out
+
+    // corrections computed on module3 - (sm16, 1run)
+
+    double values[] = {0.998959,  // 3x3 x right
+                       0.00124547,
+                       -0.000348259,
+                       6.04065e-006,
+                       0.999032,  // 3x3 x left
+                       7.90628e-005,
+                       -0.000175699,
+                       -2.60715e-007,
+                       //
+                       0.999983,  // 3x3 y right
+                       -0.000132085,
+                       2.04773e-005,
+                       -1.21629e-005,
+                       1.00002,  // 3x3 y left
+                       0.00016518,
+                       5.36343e-005,
+                       1.32094e-005,
+                       //
+                       0.998944,  // 5x5
+                       0.00100987,
+                       -0.000223207,
+                       2.15615e-006,
+                       0.999127,
+                       0.000253437,
+                       -9.80656e-005,
+                       1.48651e-006,
+                       1.00006,
+                       -0.000179675,
+                       8.15627e-005,
+                       -1.21549e-005,
+                       1.00022,
+                       0.000363728,
+                       0.000128066,
+                       1.54473e-005};
+
+    const size_t size = sizeof values / sizeof values[0];
+    EcalShowerContainmentCorrections::Coefficients coeff;
+    std::copy(values, values + size, coeff.data);
+
+    EBDetId id(sm, xtal, EBDetId::SMCRYSTALMODE);
+
+    // we are filling always the same group ...
+    pEcalShowerContainmentCorrections->fillCorrectionCoefficients(id, 3, coeff);
+  }
+
+  return pEcalShowerContainmentCorrections;
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_EVENTSETUP_MODULE(EcalShowerContainmentCorrectionsESProducer);
diff --git a/CalibCalorimetry/EcalCorrectionModules/test/stubs/EcalContainmentCorrectionAnalyzer.cc b/CalibCalorimetry/EcalCorrectionModules/test/stubs/EcalContainmentCorrectionAnalyzer.cc
index 420e91fa2e977..8b4a9a3de0b45 100644
--- a/CalibCalorimetry/EcalCorrectionModules/test/stubs/EcalContainmentCorrectionAnalyzer.cc
+++ b/CalibCalorimetry/EcalCorrectionModules/test/stubs/EcalContainmentCorrectionAnalyzer.cc
@@ -1,10 +1,10 @@
 /**
  * \file EcalContainmentCorrectionAnalyzer
- * 
+ *
  * Analyzer to test Shower Containment Corrections
- *   
  *
-*/
+ *
+ */
 
 #include <iostream>
 
@@ -12,51 +12,39 @@
 #include <FWCore/Framework/interface/Event.h>
 #include <FWCore/Framework/interface/MakerMacros.h>
 
-#include "CondFormats/EcalCorrections/interface/EcalGlobalShowerContainmentCorrectionsVsEta.h"
 #include "CondFormats/DataRecord/interface/EcalGlobalShowerContainmentCorrectionsVsEtaRcd.h"
+#include "CondFormats/EcalCorrections/interface/EcalGlobalShowerContainmentCorrectionsVsEta.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
- 
-class EcalContainmentCorrectionAnalyzer: public edm::EDAnalyzer{
-  
+
+class EcalContainmentCorrectionAnalyzer : public edm::EDAnalyzer {
 public:
-  EcalContainmentCorrectionAnalyzer(const edm::ParameterSet& ps);
+  EcalContainmentCorrectionAnalyzer(const edm::ParameterSet &ps);
   ~EcalContainmentCorrectionAnalyzer();
-  
-protected:
-  
-  void analyze( edm::Event const & iEvent, const  edm::EventSetup& iSetup);
 
+protected:
+  void analyze(edm::Event const &iEvent, const edm::EventSetup &iSetup);
 };
 
 DEFINE_FWK_MODULE(EcalContainmentCorrectionAnalyzer);
- 
-EcalContainmentCorrectionAnalyzer::EcalContainmentCorrectionAnalyzer(const edm::ParameterSet& ps){
-}
 
-EcalContainmentCorrectionAnalyzer::~EcalContainmentCorrectionAnalyzer(){
- 
-}
+EcalContainmentCorrectionAnalyzer::EcalContainmentCorrectionAnalyzer(const edm::ParameterSet &ps) {}
 
-void EcalContainmentCorrectionAnalyzer::analyze( edm::Event const & iEvent, 
-					     const  edm::EventSetup& iSetup){
+EcalContainmentCorrectionAnalyzer::~EcalContainmentCorrectionAnalyzer() {}
 
+void EcalContainmentCorrectionAnalyzer::analyze(edm::Event const &iEvent, const edm::EventSetup &iSetup) {
   using namespace edm;
   using namespace std;
- 
+
   ESHandle<EcalGlobalShowerContainmentCorrectionsVsEta> pCorr;
   iSetup.get<EcalGlobalShowerContainmentCorrectionsVsEtaRcd>().get(pCorr);
 
-  for (int i=1;i<86;i++)
-    {
-      EBDetId aId(i,1,EBDetId::ETAPHIMODE);
-      double e3x3 = pCorr->correction3x3(aId);
-      double e5x5 = pCorr->correction5x5(aId);
-      std::cout << "ieta " << aId.ieta() << " " << e3x3 << " " << e5x5 << std::endl; 
-    }
+  for (int i = 1; i < 86; i++) {
+    EBDetId aId(i, 1, EBDetId::ETAPHIMODE);
+    double e3x3 = pCorr->correction3x3(aId);
+    double e5x5 = pCorr->correction5x5(aId);
+    std::cout << "ieta " << aId.ieta() << " " << e3x3 << " " << e5x5 << std::endl;
+  }
 }
-
-
-
diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/interface/EcnaAnalyzer.h b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/interface/EcnaAnalyzer.h
index 2e8d71d7a0cba..5d0272d45b438 100644
--- a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/interface/EcnaAnalyzer.h
+++ b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/interface/EcnaAnalyzer.h
@@ -5,8 +5,9 @@
 //
 // Package:    EcalCorrelatedNoiseAnalysisModules
 // Class:      EcnaAnalyzer
-// 
-/**\class EcnaAnalyzer EcnaAnalyzer.cc CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc
+//
+/**\class EcnaAnalyzer EcnaAnalyzer.cc
+ CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc
 
  Description: <one line class summary>
 
@@ -21,44 +22,44 @@
 //
 
 // system include files
-#include <memory>
-#include <iostream>
+#include "Riostream.h"
+#include <ctime>
 #include <fstream>
 #include <iomanip>
+#include <iostream>
+#include <memory>
 #include <string>
 #include <vector>
-#include <ctime>
-#include "Riostream.h"
 
-#include <sys/time.h>
 #include <csignal>
+#include <sys/time.h>
 
 // ROOT include files
 #include "TObject.h"
-#include "TSystem.h"
 #include "TString.h"
-#include "TVectorD.h"
+#include "TSystem.h"
 #include "TTreeIndex.h"
+#include "TVectorD.h"
 
 // CMSSW include files
+#include "CondCore/CondDB/interface/Time.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "CondCore/CondDB/interface/Time.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
+#include "DataFormats/EcalDetId/interface/EBDetId.h"
+#include "DataFormats/EcalDetId/interface/EEDetId.h"
 #include "DataFormats/EcalDigi/interface/EBDataFrame.h"
-#include "DataFormats/EcalDigi/interface/EcalMGPASample.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
+#include "DataFormats/EcalDigi/interface/EcalMGPASample.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 #include "DataFormats/Provenance/interface/EventID.h"
-#include "DataFormats/EcalDetId/interface/EBDetId.h"
-#include "DataFormats/EcalDetId/interface/EEDetId.h"
 
 #include "DataFormats/Provenance/interface/Timestamp.h"
 //#include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h"
@@ -68,11 +69,11 @@
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 
 // user include files
+#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaNumbering.h"
 #include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaObject.h"
-#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaRun.h"
-#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParPaths.h"
 #include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParEcal.h"
-#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaNumbering.h"
+#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaParPaths.h"
+#include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos/interface/TEcnaRun.h"
 
 ///-----------------------------------------------------------
 ///   EcnaAnalyzer.h
@@ -86,10 +87,11 @@
 ///     cna_new/Correlated_Noise_Analysis/ECNA_cna_1.htm
 ///-----------------------------------------------------------
 ///
-///----------------------------------- Analysis name codes ------------------------------------------
-///   
+///----------------------------------- Analysis name codes
+///------------------------------------------
+///
 ///      TString  AnalysisName: code for the analysis. According to this code,
-///                             the analyzer selects the event type 
+///                             the analyzer selects the event type
 ///                             (PEDESTAL_STD, PEDESTAL_GAP, LASER_STD, etc...)
 ///                             and some other event characteristics
 ///                             (example: the gain in pedestal runs:
@@ -97,7 +99,8 @@
 ///                             The string AnalysisName is automatically
 ///                             included in the name of the results files
 ///
-///                  AnalysisName  RunType         Gain    DBLS (Dynamic BaseLine Substraction)
+///                  AnalysisName  RunType         Gain    DBLS (Dynamic
+///                  BaseLine Substraction)
 ///                  ..........................................
 ///
 ///                  AdcAny        any run type       0    No
@@ -130,71 +133,69 @@
 //
 
 class EcnaAnalyzer : public edm::EDAnalyzer {
-
- public:
-  
+public:
   enum { kChannels = 1700, kGains = 3, kFirstGainId = 1 };
-  
-  explicit EcnaAnalyzer(const edm::ParameterSet&);
-  ~EcnaAnalyzer() override;  
-  
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  TString runtype(const Int_t&);
-  Int_t   gainvalue(const Int_t&);
-  void    CheckMsg(const Int_t&, const Int_t&);
-  void    CheckMsg(const Int_t&);
-  Bool_t  AnalysisOutcome(const TString&);
-
- private:
-
-  Int_t   fgMaxCar;   // Max nb of caracters for char*
+
+  explicit EcnaAnalyzer(const edm::ParameterSet &);
+  ~EcnaAnalyzer() override;
+
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  TString runtype(const Int_t &);
+  Int_t gainvalue(const Int_t &);
+  void CheckMsg(const Int_t &, const Int_t &);
+  void CheckMsg(const Int_t &);
+  Bool_t AnalysisOutcome(const TString &);
+
+private:
+  Int_t fgMaxCar;  // Max nb of caracters for char*
   TString fTTBELL;
 
   // ----------member data ---------------------------
   unsigned int verbosity_;
-  Int_t  nChannels_;
-  Int_t  iEvent_; // should be removed when we can access class EventID
+  Int_t nChannels_;
+  Int_t iEvent_;  // should be removed when we can access class EventID
   std::string eventHeaderProducer_;
   std::string digiProducer_;
   std::string eventHeaderCollection_;
   std::string EBdigiCollection_;
   std::string EEdigiCollection_;
 
-  TString  sAnalysisName_;
-  TString  sNbOfSamples_;
-  TString  sFirstReqEvent_;
-  TString  sLastReqEvent_;
-  TString  sReqNbOfEvts_;
-  TString  sStexName_;
-  TString  sStexNumber_;
+  TString sAnalysisName_;
+  TString sNbOfSamples_;
+  TString sFirstReqEvent_;
+  TString sLastReqEvent_;
+  TString sReqNbOfEvts_;
+  TString sStexName_;
+  TString sStexNumber_;
 
-  Bool_t   fOutcomeError;
+  Bool_t fOutcomeError;
 
-  Int_t   fEvtNumber;
-  Int_t   fEvtNumberMemo;
-  Int_t   fRecNumber;
-  Int_t   fCurrentEventNumber;
-  Int_t   fNbOfSelectedEvents;
+  Int_t fEvtNumber;
+  Int_t fEvtNumberMemo;
+  Int_t fRecNumber;
+  Int_t fCurrentEventNumber;
+  Int_t fNbOfSelectedEvents;
 
-  Int_t*   fBuildEventDistribBad;
-  Int_t*   fBuildEventDistribGood;
+  Int_t *fBuildEventDistribBad;
+  Int_t *fBuildEventDistribGood;
 
-  TString  fCfgAnalyzerParametersFilePath;  // absolute path for the analyzer parameters files (/afs/etc...)
-  TString  fCfgAnalyzerParametersFileName;  // name of the analyzer parameters file 
+  TString fCfgAnalyzerParametersFilePath;  // absolute path for the analyzer
+                                           // parameters files (/afs/etc...)
+  TString fCfgAnalyzerParametersFileName;  // name of the analyzer parameters file
   std::ifstream fFcin_f;
 
   TString fAnalysisName;
-  Int_t   fChozenGainNumber;     // determined from fAnalysisName
-  Int_t   fChozenRunTypeNumber;  // determined from fAnalysisName
-  TString fDynBaseLineSub;       // determined from fAnalysisName
-
-  Int_t   fNbOfSamples;
-  Int_t   fRunNumber;
-  Int_t   fRunTypeNumber;
-  Int_t   fFirstReqEvent;
-  Int_t   fLastReqEvent;
+  Int_t fChozenGainNumber;     // determined from fAnalysisName
+  Int_t fChozenRunTypeNumber;  // determined from fAnalysisName
+  TString fDynBaseLineSub;     // determined from fAnalysisName
+
+  Int_t fNbOfSamples;
+  Int_t fRunNumber;
+  Int_t fRunTypeNumber;
+  Int_t fFirstReqEvent;
+  Int_t fLastReqEvent;
   TString fStexName;
-  Int_t   fStexNumber;
+  Int_t fStexNumber;
 
   Int_t fReqNbOfEvts;
   Int_t fMgpaGainNumber;
@@ -206,32 +207,31 @@ class EcnaAnalyzer : public edm::EDAnalyzer {
   Int_t fStexIndexBegin;
   Int_t fStexIndexStop;
 
-  Int_t    fFedTcc;
-  Int_t*   fSMFromFedTcc;
-  Int_t*   fESFromFedTcc;
-  Int_t*   fDeeFromFedTcc;
-  Int_t    fTreatedFedOrder;
-  Int_t*   fFedStatusOrder;
-  Int_t    fFedId;
-  TString* fDeeNumberString;
-
-  Int_t  fMaxTreatedStexCounter;
-  Int_t  fDeeDS5Memo1;
-  Int_t  fDeeDS5Memo2;
-  Int_t* fStexDigiOK;
-  Int_t* fStexNbOfTreatedEvents;
-  Int_t* fStexStatus;
-
-  Int_t  fMaxFedUnitCounter;
-  Int_t* fFedStatus;
-  Int_t* fFedDigiOK;
-  Int_t* fFedNbOfTreatedEvents;
-
-  Int_t  fMemoCutOK;
-  Int_t  fNbOfTreatedStexs;
-  Int_t* fNbOfTreatedFedsInDee;
-  Int_t* fNbOfTreatedFedsInStex;
-
+  Int_t fFedTcc;
+  Int_t *fSMFromFedTcc;
+  Int_t *fESFromFedTcc;
+  Int_t *fDeeFromFedTcc;
+  Int_t fTreatedFedOrder;
+  Int_t *fFedStatusOrder;
+  Int_t fFedId;
+  TString *fDeeNumberString;
+
+  Int_t fMaxTreatedStexCounter;
+  Int_t fDeeDS5Memo1;
+  Int_t fDeeDS5Memo2;
+  Int_t *fStexDigiOK;
+  Int_t *fStexNbOfTreatedEvents;
+  Int_t *fStexStatus;
+
+  Int_t fMaxFedUnitCounter;
+  Int_t *fFedStatus;
+  Int_t *fFedDigiOK;
+  Int_t *fFedNbOfTreatedEvents;
+
+  Int_t fMemoCutOK;
+  Int_t fNbOfTreatedStexs;
+  Int_t *fNbOfTreatedFedsInDee;
+  Int_t *fNbOfTreatedFedsInStex;
 
   Int_t fANY_RUN;
   Int_t fPEDESTAL_STD;
@@ -240,39 +240,39 @@ class EcnaAnalyzer : public edm::EDAnalyzer {
   Int_t fPHYSICS_GLOBAL;
   Int_t fPEDSIM;
 
-  time_t*  fTimeFirst;
-  time_t*  fTimeLast;  
-  TString* fDateFirst;
-  TString* fDateLast;
+  time_t *fTimeFirst;
+  time_t *fTimeLast;
+  TString *fDateFirst;
+  TString *fDateLast;
 
-  Int_t* fMemoDateFirstEvent;
+  Int_t *fMemoDateFirstEvent;
 
-  TEcnaObject* fMyEcnaEBObjectManager;
-  TEcnaObject* fMyEcnaEEObjectManager;
+  TEcnaObject *fMyEcnaEBObjectManager;
+  TEcnaObject *fMyEcnaEEObjectManager;
 
-  TEcnaRun** fMyCnaEBSM;
-  TEcnaRun** fMyCnaEEDee;
+  TEcnaRun **fMyCnaEBSM;
+  TEcnaRun **fMyCnaEEDee;
 
-  TEcnaNumbering* fMyEBNumbering; 
-  TEcnaParEcal*   fMyEBEcal;
+  TEcnaNumbering *fMyEBNumbering;
+  TEcnaParEcal *fMyEBEcal;
 
-  TEcnaNumbering* fMyEENumbering; 
-  TEcnaParEcal*   fMyEEEcal; 
+  TEcnaNumbering *fMyEENumbering;
+  TEcnaParEcal *fMyEEEcal;
 
-  //  Int_t** fT2d_LastEvt; // 2D array[channel][sample] max nb of evts read for a given (channel,sample) 
-  //  Int_t*  fT1d_LastEvt;
+  //  Int_t** fT2d_LastEvt; // 2D array[channel][sample] max nb of evts read for
+  //  a given (channel,sample) Int_t*  fT1d_LastEvt;
 
-  Int_t  fMaxRunTypeCounter;
-  Int_t* fRunTypeCounter;
+  Int_t fMaxRunTypeCounter;
+  Int_t *fRunTypeCounter;
 
-  Int_t  fMaxMgpaGainCounter;
-  Int_t* fMgpaGainCounter;
+  Int_t fMaxMgpaGainCounter;
+  Int_t *fMgpaGainCounter;
 
-  Int_t  fMaxFedIdCounter;
-  Int_t* fFedIdCounter;
+  Int_t fMaxFedIdCounter;
+  Int_t *fFedIdCounter;
 
-  Int_t  fMaxCounterQuad;
-  Int_t* fCounterQuad;
+  Int_t fMaxCounterQuad;
+  Int_t *fCounterQuad;
 };
 
 #endif
diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc
index c3c0969198e03..0eff18b2c0632 100644
--- a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc
+++ b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/EcnaAnalyzer.cc
@@ -16,7 +16,7 @@
 //         Created:  Fri Jun  2 10:27:01 CEST 2006
 // $Id: EcnaAnalyzer.cc,v 1.4 2013/04/05 20:17:20 wmtan Exp $
 //
-//          Update: 21/07/2011  
+//          Update: 21/07/2011
 
 // CMSSW include files
 
@@ -41,11 +41,9 @@
 //
 // constructors and destructor
 //
-EcnaAnalyzer::EcnaAnalyzer(const edm::ParameterSet& pSet) : 
-  verbosity_(pSet.getUntrackedParameter("verbosity", 1U)),
-  nChannels_(0), iEvent_(0)
-{
-  //now do what ever initialization is needed
+EcnaAnalyzer::EcnaAnalyzer(const edm::ParameterSet &pSet)
+    : verbosity_(pSet.getUntrackedParameter("verbosity", 1U)), nChannels_(0), iEvent_(0) {
+  // now do what ever initialization is needed
 
   using namespace edm;
   using namespace std;
@@ -53,31 +51,30 @@ EcnaAnalyzer::EcnaAnalyzer(const edm::ParameterSet& pSet) :
   fMyEcnaEBObjectManager = new TEcnaObject();
   fMyEcnaEEObjectManager = new TEcnaObject();
 
-  TEcnaParPaths* myPathEB = new TEcnaParPaths(fMyEcnaEBObjectManager);
-  TEcnaParPaths* myPathEE = new TEcnaParPaths(fMyEcnaEEObjectManager);
+  TEcnaParPaths *myPathEB = new TEcnaParPaths(fMyEcnaEBObjectManager);
+  TEcnaParPaths *myPathEE = new TEcnaParPaths(fMyEcnaEEObjectManager);
 
   std::cout << "*EcnaAnalyzer-constructor> Check path for resultsq Root files." << std::endl;
 
-  if( myPathEB->GetPathForResultsRootFiles() == kFALSE )
-    {
-      std::cout << "*EcnaAnalyzer-constructor> *** ERROR *** Path for result files not found." << std::endl;
-      kill(getpid(),SIGUSR2);
-    }
-  else
-    {
-      std::cout << "*EcnaAnalyzer-constructor> Path for result files found = " << myPathEB->ResultsRootFilePath() << std::endl;
-    }
-
-  if( myPathEE->GetPathForResultsRootFiles() == kFALSE )
-    {
-      std::cout << "*EcnaAnalyzer-constructor> *** ERROR *** Path for result files not found." << std::endl;
-      kill(getpid(),SIGUSR2);
-    }
-  else
-    {
-      std::cout << "*EcnaAnalyzer-constructor> Path for result files found = " << myPathEE->ResultsRootFilePath() << std::endl;
-    }
+  if (myPathEB->GetPathForResultsRootFiles() == kFALSE) {
+    std::cout << "*EcnaAnalyzer-constructor> *** ERROR *** Path for result "
+                 "files not found."
+              << std::endl;
+    kill(getpid(), SIGUSR2);
+  } else {
+    std::cout << "*EcnaAnalyzer-constructor> Path for result files found = " << myPathEB->ResultsRootFilePath()
+              << std::endl;
+  }
 
+  if (myPathEE->GetPathForResultsRootFiles() == kFALSE) {
+    std::cout << "*EcnaAnalyzer-constructor> *** ERROR *** Path for result "
+                 "files not found."
+              << std::endl;
+    kill(getpid(), SIGUSR2);
+  } else {
+    std::cout << "*EcnaAnalyzer-constructor> Path for result files found = " << myPathEE->ResultsRootFilePath()
+              << std::endl;
+  }
 
   std::cout << "*EcnaAnalyzer-constructor> Parameter initialization." << std::endl;
 
@@ -85,61 +82,70 @@ EcnaAnalyzer::EcnaAnalyzer(const edm::ParameterSet& pSet) :
   fTTBELL = '\007';
   fOutcomeError = kFALSE;
 
-  fMyEBEcal      = new TEcnaParEcal(fMyEcnaEBObjectManager, "EB");
+  fMyEBEcal = new TEcnaParEcal(fMyEcnaEBObjectManager, "EB");
   fMyEBNumbering = new TEcnaNumbering(fMyEcnaEBObjectManager, "EB");
 
-  fMyEEEcal      = new TEcnaParEcal(fMyEcnaEEObjectManager, "EE");
+  fMyEEEcal = new TEcnaParEcal(fMyEcnaEEObjectManager, "EE");
   fMyEENumbering = new TEcnaNumbering(fMyEcnaEEObjectManager, "EE");
 
-  //========================================================================================== 
+  //==========================================================================================
   //.................................. Get parameter values from python file
-  eventHeaderProducer_   = pSet.getParameter<std::string>("eventHeaderProducer");
-  digiProducer_          = pSet.getParameter<std::string>("digiProducer");
+  eventHeaderProducer_ = pSet.getParameter<std::string>("eventHeaderProducer");
+  digiProducer_ = pSet.getParameter<std::string>("digiProducer");
 
   eventHeaderCollection_ = pSet.getParameter<std::string>("eventHeaderCollection");
-  EBdigiCollection_      = pSet.getParameter<std::string>("EBdigiCollection");
-  EEdigiCollection_      = pSet.getParameter<std::string>("EEdigiCollection");
+  EBdigiCollection_ = pSet.getParameter<std::string>("EBdigiCollection");
+  EEdigiCollection_ = pSet.getParameter<std::string>("EEdigiCollection");
 
-  sAnalysisName_  = pSet.getParameter<std::string>("sAnalysisName");
-  sNbOfSamples_   = pSet.getParameter<std::string>("sNbOfSamples");
+  sAnalysisName_ = pSet.getParameter<std::string>("sAnalysisName");
+  sNbOfSamples_ = pSet.getParameter<std::string>("sNbOfSamples");
   sFirstReqEvent_ = pSet.getParameter<std::string>("sFirstReqEvent");
-  sLastReqEvent_  = pSet.getParameter<std::string>("sLastReqEvent");
-  sReqNbOfEvts_   = pSet.getParameter<std::string>("sReqNbOfEvts");
-  sStexName_      = pSet.getParameter<std::string>("sStexName");
-  sStexNumber_    = pSet.getParameter<std::string>("sStexNumber");
+  sLastReqEvent_ = pSet.getParameter<std::string>("sLastReqEvent");
+  sReqNbOfEvts_ = pSet.getParameter<std::string>("sReqNbOfEvts");
+  sStexName_ = pSet.getParameter<std::string>("sStexName");
+  sStexNumber_ = pSet.getParameter<std::string>("sStexNumber");
 
-  fAnalysisName  = sAnalysisName_.Data();
-  fNbOfSamples   = atoi(sNbOfSamples_.Data());
+  fAnalysisName = sAnalysisName_.Data();
+  fNbOfSamples = atoi(sNbOfSamples_.Data());
   fFirstReqEvent = atoi(sFirstReqEvent_.Data());
-  fLastReqEvent  = atoi(sLastReqEvent_.Data());
-  fReqNbOfEvts   = atoi(sReqNbOfEvts_.Data());
-  fStexName      = sStexName_.Data();
-  fStexNumber    = atoi(sStexNumber_.Data());
+  fLastReqEvent = atoi(sLastReqEvent_.Data());
+  fReqNbOfEvts = atoi(sReqNbOfEvts_.Data());
+  fStexName = sStexName_.Data();
+  fStexNumber = atoi(sStexNumber_.Data());
 
   //------------------------------- ERRORS in requested evts numbers
-  if( fFirstReqEvent < 1 )
-    {fOutcomeError = AnalysisOutcome("ERR_FNEG");}
+  if (fFirstReqEvent < 1) {
+    fOutcomeError = AnalysisOutcome("ERR_FNEG");
+  }
 
-  if( (fLastReqEvent >= fFirstReqEvent) && (fReqNbOfEvts > fLastReqEvent - fFirstReqEvent + 1 ) )
-    {fOutcomeError = AnalysisOutcome("ERR_LREQ");}
+  if ((fLastReqEvent >= fFirstReqEvent) && (fReqNbOfEvts > fLastReqEvent - fFirstReqEvent + 1)) {
+    fOutcomeError = AnalysisOutcome("ERR_LREQ");
+  }
 
-  if( fOutcomeError == kTRUE )return;
+  if (fOutcomeError == kTRUE)
+    return;
   //===========================================================================================
 
   fRunTypeCounter = nullptr;
   fMaxRunTypeCounter = 26;
   fRunTypeCounter = new Int_t[fMaxRunTypeCounter];
-  for(Int_t i=0; i<fMaxRunTypeCounter; i++){fRunTypeCounter[i] = 0;}
+  for (Int_t i = 0; i < fMaxRunTypeCounter; i++) {
+    fRunTypeCounter[i] = 0;
+  }
 
   fMgpaGainCounter = nullptr;
   fMaxMgpaGainCounter = 4;  // Because chozen gain = 0,1,2,3
   fMgpaGainCounter = new Int_t[fMaxMgpaGainCounter];
-  for(Int_t i=0; i<fMaxMgpaGainCounter; i++){fMgpaGainCounter[i] = 0;}
+  for (Int_t i = 0; i < fMaxMgpaGainCounter; i++) {
+    fMgpaGainCounter[i] = 0;
+  }
 
   fFedIdCounter = nullptr;
   fMaxFedIdCounter = 54;
   fFedIdCounter = new Int_t[fMaxFedIdCounter];
-  for(Int_t i=0; i<fMaxFedIdCounter; i++){fFedIdCounter[i] = 0;}
+  for (Int_t i = 0; i < fMaxFedIdCounter; i++) {
+    fFedIdCounter[i] = 0;
+  }
 
   fEvtNumber = 0;
   fEvtNumberMemo = -1;
@@ -156,45 +162,58 @@ EcnaAnalyzer::EcnaAnalyzer(const edm::ParameterSet& pSet) :
   fNbOfTreatedStexs = 0;
 
   //-------------- Fed
-  if( fStexName == "SM"  ){fMaxFedUnitCounter = fMyEBEcal->MaxSMInEB();}  // EB: FED Unit = SM
-  if( fStexName == "Dee" ){fMaxFedUnitCounter = fMyEEEcal->MaxDSInEE();}  // EE: FED Unit = Data Sector
+  if (fStexName == "SM") {
+    fMaxFedUnitCounter = fMyEBEcal->MaxSMInEB();
+  }  // EB: FED Unit = SM
+  if (fStexName == "Dee") {
+    fMaxFedUnitCounter = fMyEEEcal->MaxDSInEE();
+  }  // EE: FED Unit = Data Sector
 
   fFedDigiOK = new Int_t[fMaxFedUnitCounter];
-  for(Int_t i=0; i<fMaxFedUnitCounter; i++){fFedDigiOK[i] = 0;}
+  for (Int_t i = 0; i < fMaxFedUnitCounter; i++) {
+    fFedDigiOK[i] = 0;
+  }
 
   fFedNbOfTreatedEvents = new Int_t[fMaxFedUnitCounter];
-  for(Int_t i=0; i<fMaxFedUnitCounter; i++){fFedNbOfTreatedEvents[i] = 0;}
+  for (Int_t i = 0; i < fMaxFedUnitCounter; i++) {
+    fFedNbOfTreatedEvents[i] = 0;
+  }
 
   fFedStatus = new Int_t[fMaxFedUnitCounter];
-  for(Int_t i=0; i<fMaxFedUnitCounter; i++){fFedStatus[i] = 0;}
+  for (Int_t i = 0; i < fMaxFedUnitCounter; i++) {
+    fFedStatus[i] = 0;
+  }
 
   fFedStatusOrder = new Int_t[fMaxFedUnitCounter];
-  for(Int_t i=0; i<fMaxFedUnitCounter; i++){fFedStatusOrder[i] = 0;}
+  for (Int_t i = 0; i < fMaxFedUnitCounter; i++) {
+    fFedStatusOrder[i] = 0;
+  }
 
   fDeeNumberString = new TString[fMaxFedUnitCounter];
-  for(Int_t i=0; i<fMaxFedUnitCounter; i++){fDeeNumberString[i] = "SM";}
-
-  if( fStexName == "Dee" )
-    { 
-      fDeeNumberString[ 0] = "Sector1 Dee4";
-      fDeeNumberString[ 1] = "Sector2 Dee4";
-      fDeeNumberString[ 2] = "Sector3 Dee4";
-      fDeeNumberString[ 3] = "Sector4 Dee4";
-      fDeeNumberString[ 4] = "Sector5 Dee4-Dee3";
-      fDeeNumberString[ 5] = "Sector6 Dee3";
-      fDeeNumberString[ 6] = "Sector7 Dee3";
-      fDeeNumberString[ 7] = "Sector8 Dee3";
-      fDeeNumberString[ 8] = "Sector9 Dee3";
-      fDeeNumberString[ 9] = "Sector1 Dee1";
-      fDeeNumberString[10] = "Sector2 Dee1";
-      fDeeNumberString[11] = "Sector3 Dee1";
-      fDeeNumberString[12] = "Sector4 Dee1";
-      fDeeNumberString[13] = "Sector5 Dee1-Dee2";
-      fDeeNumberString[14] = "Sector6 Dee2";
-      fDeeNumberString[15] = "Sector7 Dee2";
-      fDeeNumberString[16] = "Sector8 Dee2";
-      fDeeNumberString[17] = "Sector9 Dee2";
-    }
+  for (Int_t i = 0; i < fMaxFedUnitCounter; i++) {
+    fDeeNumberString[i] = "SM";
+  }
+
+  if (fStexName == "Dee") {
+    fDeeNumberString[0] = "Sector1 Dee4";
+    fDeeNumberString[1] = "Sector2 Dee4";
+    fDeeNumberString[2] = "Sector3 Dee4";
+    fDeeNumberString[3] = "Sector4 Dee4";
+    fDeeNumberString[4] = "Sector5 Dee4-Dee3";
+    fDeeNumberString[5] = "Sector6 Dee3";
+    fDeeNumberString[6] = "Sector7 Dee3";
+    fDeeNumberString[7] = "Sector8 Dee3";
+    fDeeNumberString[8] = "Sector9 Dee3";
+    fDeeNumberString[9] = "Sector1 Dee1";
+    fDeeNumberString[10] = "Sector2 Dee1";
+    fDeeNumberString[11] = "Sector3 Dee1";
+    fDeeNumberString[12] = "Sector4 Dee1";
+    fDeeNumberString[13] = "Sector5 Dee1-Dee2";
+    fDeeNumberString[14] = "Sector6 Dee2";
+    fDeeNumberString[15] = "Sector7 Dee2";
+    fDeeNumberString[16] = "Sector8 Dee2";
+    fDeeNumberString[17] = "Sector9 Dee2";
+  }
   //............................... arrays fSMFromFedDcc and fESFromFedTcc
   //
   //  FED-TCC:   1   2   3   4   5   6   7   8   9
@@ -202,90 +221,133 @@ EcnaAnalyzer::EcnaAnalyzer(const edm::ParameterSet& pSet) :
   //       DS:   7   8   9   1   2   3   4   5   6
   //       ES:   7   8   9   1   2   3   4   5   6  (ES = DS)
   //
-  //  FED-TCC:  10  11  12  13  14  15  16  17  18  19  20  21  22  23  24  25  26  27
-  //       SM:  19  20  21  22  23  24  25  26  27  28  29  30  31  32  33  34  35  36
-  //       SM:  -1  -2  -3  -4  -5  -6  -7  -8  -9 -10 -11 -12 -13 -14 -15 -16 -17 -18
+  //  FED-TCC:  10  11  12  13  14  15  16  17  18  19  20  21  22  23  24  25
+  //  26  27
+  //       SM:  19  20  21  22  23  24  25  26  27  28  29  30  31  32  33  34
+  //       35  36 SM:  -1  -2  -3  -4  -5  -6  -7  -8  -9 -10 -11 -12 -13 -14
+  //       -15 -16 -17 -18
   //
-  //  FED-TCC:  28  29  30  31  32  33  34  35  36  37  38  39  40  41  42  43  44  45
-  //       SM:   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15  16  17  18
+  //  FED-TCC:  28  29  30  31  32  33  34  35  36  37  38  39  40  41  42  43
+  //  44  45
+  //       SM:   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15  16
+  //       17  18
   //
   //  FED-TCC:  46  47  48  49  50  51  52  53  54
   //      Dee:   2   2   2   1   1   1   1  1-2  2
   //       DS:   7   8   9   1   2   3   4   5   6
   //       ES:  16  17  18  10  11  12  13  14  15  (ES = DS + 9)
-  
-  Int_t MaxSMAndDS = fMyEBEcal->MaxSMInEB()+fMyEEEcal->MaxDSInEE();
+
+  Int_t MaxSMAndDS = fMyEBEcal->MaxSMInEB() + fMyEEEcal->MaxDSInEE();
 
   fSMFromFedTcc = new Int_t[MaxSMAndDS];
   fESFromFedTcc = new Int_t[MaxSMAndDS];
-  for(Int_t nFedTcc= 1; nFedTcc<=MaxSMAndDS; nFedTcc++){fESFromFedTcc[nFedTcc-1] = -1;}
-
-  for(Int_t nFedTcc= 1;nFedTcc<= 3;nFedTcc++){fESFromFedTcc[nFedTcc-1]=nFedTcc+ 6;} // Dee3, ES 7,8,9
-  for(Int_t nFedTcc= 4;nFedTcc<= 9;nFedTcc++){fESFromFedTcc[nFedTcc-1]=nFedTcc- 3;} // Dee4, ES 1,2,3,4,5; Dee3, DS 5,6
-
-  for(Int_t nFedTcc=10;nFedTcc<=27;nFedTcc++){fSMFromFedTcc[nFedTcc-1]=nFedTcc+ 9;} // EB-  SM 19 to 36
-  for(Int_t nFedTcc=28;nFedTcc<=45;nFedTcc++){fSMFromFedTcc[nFedTcc-1]=nFedTcc-27;} // EB+  SM  1 to 18
-
-  for(Int_t nFedTcc=46;nFedTcc<=48;nFedTcc++){fESFromFedTcc[nFedTcc-1]=nFedTcc-30;} // Dee2, ES 16,17,18
-  for(Int_t nFedTcc=49;nFedTcc<=54;nFedTcc++){fESFromFedTcc[nFedTcc-1]=nFedTcc-39;} // Dee1, ES 10,11,12,13,14; Dee2, ES 14,15
+  for (Int_t nFedTcc = 1; nFedTcc <= MaxSMAndDS; nFedTcc++) {
+    fESFromFedTcc[nFedTcc - 1] = -1;
+  }
 
-  //............................... Nb of treated events for "AdcPeg12" and "AdcSPeg12" analysis
+  for (Int_t nFedTcc = 1; nFedTcc <= 3; nFedTcc++) {
+    fESFromFedTcc[nFedTcc - 1] = nFedTcc + 6;
+  }  // Dee3, ES 7,8,9
+  for (Int_t nFedTcc = 4; nFedTcc <= 9; nFedTcc++) {
+    fESFromFedTcc[nFedTcc - 1] = nFedTcc - 3;
+  }  // Dee4, ES 1,2,3,4,5; Dee3, DS 5,6
+
+  for (Int_t nFedTcc = 10; nFedTcc <= 27; nFedTcc++) {
+    fSMFromFedTcc[nFedTcc - 1] = nFedTcc + 9;
+  }  // EB-  SM 19 to 36
+  for (Int_t nFedTcc = 28; nFedTcc <= 45; nFedTcc++) {
+    fSMFromFedTcc[nFedTcc - 1] = nFedTcc - 27;
+  }  // EB+  SM  1 to 18
+
+  for (Int_t nFedTcc = 46; nFedTcc <= 48; nFedTcc++) {
+    fESFromFedTcc[nFedTcc - 1] = nFedTcc - 30;
+  }  // Dee2, ES 16,17,18
+  for (Int_t nFedTcc = 49; nFedTcc <= 54; nFedTcc++) {
+    fESFromFedTcc[nFedTcc - 1] = nFedTcc - 39;
+  }  // Dee1, ES 10,11,12,13,14; Dee2, ES 14,15
+
+  //............................... Nb of treated events for "AdcPeg12" and
+  //"AdcSPeg12" analysis
   //-------------- Stex
-  if( fStexName == "SM"  ){fMaxTreatedStexCounter = fMyEBEcal->MaxSMInEB();}  // EB: Stex = SM
-  if( fStexName == "Dee" ){fMaxTreatedStexCounter = fMyEEEcal->MaxDeeInEE();} // EE: Stex = Dee
+  if (fStexName == "SM") {
+    fMaxTreatedStexCounter = fMyEBEcal->MaxSMInEB();
+  }  // EB: Stex = SM
+  if (fStexName == "Dee") {
+    fMaxTreatedStexCounter = fMyEEEcal->MaxDeeInEE();
+  }  // EE: Stex = Dee
 
   fStexNbOfTreatedEvents = new Int_t[fMaxTreatedStexCounter];
-  for(Int_t i=0; i<fMaxTreatedStexCounter; i++){fStexNbOfTreatedEvents[i] = 0;}
+  for (Int_t i = 0; i < fMaxTreatedStexCounter; i++) {
+    fStexNbOfTreatedEvents[i] = 0;
+  }
 
   fTimeFirst = new time_t[fMaxTreatedStexCounter];
-  for(Int_t i=0; i<fMaxTreatedStexCounter; i++){fTimeFirst[i] = 0;}
+  for (Int_t i = 0; i < fMaxTreatedStexCounter; i++) {
+    fTimeFirst[i] = 0;
+  }
   fTimeLast = new time_t[fMaxTreatedStexCounter];
-  for(Int_t i=0; i<fMaxTreatedStexCounter; i++){fTimeLast[i] = 0;}
+  for (Int_t i = 0; i < fMaxTreatedStexCounter; i++) {
+    fTimeLast[i] = 0;
+  }
 
-  fMemoDateFirstEvent = new Int_t[fMaxTreatedStexCounter];;
-  for(Int_t i=0; i<fMaxTreatedStexCounter; i++){fMemoDateFirstEvent[i] = 0;}
+  fMemoDateFirstEvent = new Int_t[fMaxTreatedStexCounter];
+  ;
+  for (Int_t i = 0; i < fMaxTreatedStexCounter; i++) {
+    fMemoDateFirstEvent[i] = 0;
+  }
 
-  Int_t MaxCar = fgMaxCar; 
+  Int_t MaxCar = fgMaxCar;
   fDateFirst = new TString[fMaxTreatedStexCounter];
-  for(Int_t i=0; i<fMaxTreatedStexCounter; i++)
-    {
-      fDateFirst[i].Resize(MaxCar);
-      fDateFirst[i] = "*1st event date not found*";
-    }
+  for (Int_t i = 0; i < fMaxTreatedStexCounter; i++) {
+    fDateFirst[i].Resize(MaxCar);
+    fDateFirst[i] = "*1st event date not found*";
+  }
 
-  MaxCar = fgMaxCar; 
+  MaxCar = fgMaxCar;
   fDateLast = new TString[fMaxTreatedStexCounter];
-  for(Int_t i=0; i<fMaxTreatedStexCounter; i++)
-    {
-      fDateLast[i].Resize(MaxCar);
-      fDateLast[i] = "*last event date not found*";
-    }
+  for (Int_t i = 0; i < fMaxTreatedStexCounter; i++) {
+    fDateLast[i].Resize(MaxCar);
+    fDateLast[i] = "*last event date not found*";
+  }
 
   fStexStatus = new Int_t[fMaxTreatedStexCounter];
-  for(Int_t i=0; i<fMaxTreatedStexCounter; i++){fStexStatus[i] = 0;}
+  for (Int_t i = 0; i < fMaxTreatedStexCounter; i++) {
+    fStexStatus[i] = 0;
+  }
 
   fStexDigiOK = new Int_t[fMaxTreatedStexCounter];
-  for(Int_t i=0; i<fMaxTreatedStexCounter; i++){fStexDigiOK[i] = 0;}
+  for (Int_t i = 0; i < fMaxTreatedStexCounter; i++) {
+    fStexDigiOK[i] = 0;
+  }
 
   fNbOfTreatedFedsInDee = new Int_t[fMaxTreatedStexCounter];
-  for(Int_t i=0; i<fMaxTreatedStexCounter; i++){fNbOfTreatedFedsInDee[i] = 0;}
+  for (Int_t i = 0; i < fMaxTreatedStexCounter; i++) {
+    fNbOfTreatedFedsInDee[i] = 0;
+  }
 
   fNbOfTreatedFedsInStex = new Int_t[fMaxTreatedStexCounter];
-  for(Int_t i=0; i<fMaxTreatedStexCounter; i++){fNbOfTreatedFedsInStex[i] = 0;}
-
+  for (Int_t i = 0; i < fMaxTreatedStexCounter; i++) {
+    fNbOfTreatedFedsInStex[i] = 0;
+  }
 
   //.......................... counters of events for GetSampleAdcValues
   fBuildEventDistribBad = nullptr;
   fBuildEventDistribBad = new Int_t[fMaxTreatedStexCounter];
-  for(Int_t i=0; i<fMaxTreatedStexCounter; i++){fBuildEventDistribBad[i] = 0;}
+  for (Int_t i = 0; i < fMaxTreatedStexCounter; i++) {
+    fBuildEventDistribBad[i] = 0;
+  }
 
   fBuildEventDistribGood = nullptr;
   fBuildEventDistribGood = new Int_t[fMaxTreatedStexCounter];
-  for(Int_t i=0; i<fMaxTreatedStexCounter; i++){fBuildEventDistribGood[i] = 0;}
+  for (Int_t i = 0; i < fMaxTreatedStexCounter; i++) {
+    fBuildEventDistribGood[i] = 0;
+  }
 
-  //----------------------------------- Analysis name codes ------------------------------------------
-  //   
-  //                  AnalysisName  RunType         Gain    DBLS (Dynamic BaseLine Substraction)
+  //----------------------------------- Analysis name codes
+  //------------------------------------------
+  //
+  //                  AnalysisName  RunType         Gain    DBLS (Dynamic
+  //                  BaseLine Substraction)
   //
   //                  AdcAny        any run type       0    no
   //
@@ -314,90 +376,124 @@ EcnaAnalyzer::EcnaAnalyzer(const edm::ParameterSet& pSet) :
 
   //................ Run type list
 
-  fLASER_STD      =  4;
-  fPEDESTAL_STD   =  9;
+  fLASER_STD = 4;
+  fPEDESTAL_STD = 9;
   fPHYSICS_GLOBAL = 13;
-  fPEDESTAL_GAP   = 18;
-  fPEDSIM         = 24;
+  fPEDESTAL_GAP = 18;
+  fPEDSIM = 24;
+
+  fANY_RUN = 25;
 
-  fANY_RUN        = 25;
- 
   //................ Chozen run type from analysis name
-  fChozenRunTypeNumber = fANY_RUN;   // default
-  if( fAnalysisName == "AdcAny"  ){fChozenRunTypeNumber = fANY_RUN;}
-  if( fAnalysisName == "AdcPed1"  || fAnalysisName == "AdcPed6"  || fAnalysisName == "AdcPed12" ||
-      fAnalysisName == "AdcSPed1" || fAnalysisName == "AdcSPed6" || fAnalysisName == "AdcSPed12" )
-    {fChozenRunTypeNumber = fPEDESTAL_STD;}
-  if( fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" )
-    {fChozenRunTypeNumber = fPEDESTAL_GAP;}
-  if( fAnalysisName == "AdcLaser"  || fAnalysisName == "AdcSLaser"  ){fChozenRunTypeNumber = fLASER_STD;}
-  if( fAnalysisName == "AdcPhys" ){fChozenRunTypeNumber = fPHYSICS_GLOBAL;}
-  if( fAnalysisName == "AdcPes12 " || fAnalysisName == "AdcSPes12 " ){fChozenRunTypeNumber = fPEDSIM;}
+  fChozenRunTypeNumber = fANY_RUN;  // default
+  if (fAnalysisName == "AdcAny") {
+    fChozenRunTypeNumber = fANY_RUN;
+  }
+  if (fAnalysisName == "AdcPed1" || fAnalysisName == "AdcPed6" || fAnalysisName == "AdcPed12" ||
+      fAnalysisName == "AdcSPed1" || fAnalysisName == "AdcSPed6" || fAnalysisName == "AdcSPed12") {
+    fChozenRunTypeNumber = fPEDESTAL_STD;
+  }
+  if (fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12") {
+    fChozenRunTypeNumber = fPEDESTAL_GAP;
+  }
+  if (fAnalysisName == "AdcLaser" || fAnalysisName == "AdcSLaser") {
+    fChozenRunTypeNumber = fLASER_STD;
+  }
+  if (fAnalysisName == "AdcPhys") {
+    fChozenRunTypeNumber = fPHYSICS_GLOBAL;
+  }
+  if (fAnalysisName == "AdcPes12 " || fAnalysisName == "AdcSPes12 ") {
+    fChozenRunTypeNumber = fPEDSIM;
+  }
 
   //................ Gains from analysis name
-  fChozenGainNumber = 0;   // default => event always accepted if fChozenGainNumber = 0 ( see USER's Analysis cut in ::analyze(...) )
-  if( fAnalysisName == "AdcAny" ){fChozenGainNumber = 0;}
-  if( fAnalysisName == "AdcPed1"   || fAnalysisName == "AdcSPed1"  ){fChozenGainNumber = 3;}
-  if( fAnalysisName == "AdcPed6"   || fAnalysisName == "AdcSPed6"  ){fChozenGainNumber = 2;}
-  if( fAnalysisName == "AdcPed12"  || fAnalysisName == "AdcSPed12" ){fChozenGainNumber = 1;}
-  if( fAnalysisName == "AdcPeg12"  || fAnalysisName == "AdcSPeg12" ){fChozenGainNumber = 0;}
-  if( fAnalysisName == "AdcLaser"  || fAnalysisName == "AdcSLaser" ){fChozenGainNumber = 0;}
-  if( fAnalysisName == "AdcPes12 " || fAnalysisName == "AdcSPes12 "){fChozenGainNumber = 0;}
-  if( fAnalysisName == "AdcPhys" ){fChozenGainNumber = 0;}
+  fChozenGainNumber = 0;  // default => event always accepted if fChozenGainNumber = 0 ( see
+                          // USER's Analysis cut in ::analyze(...) )
+  if (fAnalysisName == "AdcAny") {
+    fChozenGainNumber = 0;
+  }
+  if (fAnalysisName == "AdcPed1" || fAnalysisName == "AdcSPed1") {
+    fChozenGainNumber = 3;
+  }
+  if (fAnalysisName == "AdcPed6" || fAnalysisName == "AdcSPed6") {
+    fChozenGainNumber = 2;
+  }
+  if (fAnalysisName == "AdcPed12" || fAnalysisName == "AdcSPed12") {
+    fChozenGainNumber = 1;
+  }
+  if (fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12") {
+    fChozenGainNumber = 0;
+  }
+  if (fAnalysisName == "AdcLaser" || fAnalysisName == "AdcSLaser") {
+    fChozenGainNumber = 0;
+  }
+  if (fAnalysisName == "AdcPes12 " || fAnalysisName == "AdcSPes12 ") {
+    fChozenGainNumber = 0;
+  }
+  if (fAnalysisName == "AdcPhys") {
+    fChozenGainNumber = 0;
+  }
 
   //............... Flag for Dynamic BaseLine Substraction from analysis name
-  fDynBaseLineSub = "no";   // default
-  if( fAnalysisName == "AdcAny"   ||
-      fAnalysisName == "AdcPed1"  || fAnalysisName == "AdcPed6"  || fAnalysisName == "AdcPed12"  ||
-      fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcLaser" ||
-      fAnalysisName == "AdcPhys"  || fAnalysisName == "AdcPes12 " )
-    {fDynBaseLineSub = "no";}
-  if( fAnalysisName == "AdcSPed1"  || fAnalysisName == "AdcSPed6"  || fAnalysisName == "AdcSPed12" ||
-      fAnalysisName == "AdcSPeg12" || fAnalysisName == "AdcSLaser" || fAnalysisName == "AdcSPes12 " )
-    {fDynBaseLineSub = "yes";}
-
-  //....................... Index range for ECNA init and for loop on GetSampleAdcValues calls
-  if( fStexNumber == 0 )
-    {
-      if( fStexName == "SM"  )
-	{
-	  fSMIndexBegin   = 0;             fSMIndexStop   = fMyEBEcal->MaxSMInEB();
-	  fStexIndexBegin = fSMIndexBegin; fStexIndexStop = fSMIndexStop;
-	  fDeeIndexBegin  = 0;             fDeeIndexStop  = 0;
-	}
-      if( fStexName == "Dee"  )
-	{
-	  fSMIndexBegin   = 0;              fSMIndexStop   = 0;
-	  fDeeIndexBegin  = 0;              fDeeIndexStop  = fMyEEEcal->MaxDeeInEE();
-	  fStexIndexBegin = fDeeIndexBegin; fStexIndexStop = fDeeIndexStop;
-	}
+  fDynBaseLineSub = "no";  // default
+  if (fAnalysisName == "AdcAny" || fAnalysisName == "AdcPed1" || fAnalysisName == "AdcPed6" ||
+      fAnalysisName == "AdcPed12" || fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcLaser" ||
+      fAnalysisName == "AdcPhys" || fAnalysisName == "AdcPes12 ") {
+    fDynBaseLineSub = "no";
+  }
+  if (fAnalysisName == "AdcSPed1" || fAnalysisName == "AdcSPed6" || fAnalysisName == "AdcSPed12" ||
+      fAnalysisName == "AdcSPeg12" || fAnalysisName == "AdcSLaser" || fAnalysisName == "AdcSPes12 ") {
+    fDynBaseLineSub = "yes";
+  }
+
+  //....................... Index range for ECNA init and for loop on
+  // GetSampleAdcValues calls
+  if (fStexNumber == 0) {
+    if (fStexName == "SM") {
+      fSMIndexBegin = 0;
+      fSMIndexStop = fMyEBEcal->MaxSMInEB();
+      fStexIndexBegin = fSMIndexBegin;
+      fStexIndexStop = fSMIndexStop;
+      fDeeIndexBegin = 0;
+      fDeeIndexStop = 0;
     }
-  else
-    {
-      if( fStexName == "SM"  )
-	{
-	  fSMIndexBegin   = fStexNumber-1; fSMIndexStop   = fStexNumber;
-	  fStexIndexBegin = fSMIndexBegin; fStexIndexStop = fSMIndexStop;
-	  fDeeIndexBegin  = 0;             fDeeIndexStop  = 0;
-	}
-      if( fStexName == "Dee" )
-	{
-	  fSMIndexBegin   = 0;              fSMIndexStop   = 0;
-	  fDeeIndexBegin  = fStexNumber-1;  fDeeIndexStop  = fStexNumber;
-	  fStexIndexBegin = fDeeIndexBegin; fStexIndexStop = fDeeIndexStop;
-	}
+    if (fStexName == "Dee") {
+      fSMIndexBegin = 0;
+      fSMIndexStop = 0;
+      fDeeIndexBegin = 0;
+      fDeeIndexStop = fMyEEEcal->MaxDeeInEE();
+      fStexIndexBegin = fDeeIndexBegin;
+      fStexIndexStop = fDeeIndexStop;
     }
+  } else {
+    if (fStexName == "SM") {
+      fSMIndexBegin = fStexNumber - 1;
+      fSMIndexStop = fStexNumber;
+      fStexIndexBegin = fSMIndexBegin;
+      fStexIndexStop = fSMIndexStop;
+      fDeeIndexBegin = 0;
+      fDeeIndexStop = 0;
+    }
+    if (fStexName == "Dee") {
+      fSMIndexBegin = 0;
+      fSMIndexStop = 0;
+      fDeeIndexBegin = fStexNumber - 1;
+      fDeeIndexStop = fStexNumber;
+      fStexIndexBegin = fDeeIndexBegin;
+      fStexIndexStop = fDeeIndexStop;
+    }
+  }
 
   //......... DATA DEPENDENT PARAMETERS
-  fRunNumber  = 0;
+  fRunNumber = 0;
 
-  fMyCnaEBSM  = nullptr;
+  fMyCnaEBSM = nullptr;
   fMyCnaEEDee = nullptr;
 
-  fRunTypeNumber  = -1;
+  fRunTypeNumber = -1;
   fMgpaGainNumber = -1;
 
-  fFedId  = -1;
+  fFedId = -1;
   fFedTcc = -1;
 
   std::cout << "*EcnaAnalyzer::EcnaAnalyzer-constructor> fAnalysisName        = " << fAnalysisName << std::endl;
@@ -408,14 +504,14 @@ EcnaAnalyzer::EcnaAnalyzer(const edm::ParameterSet& pSet) :
   std::cout << "*EcnaAnalyzer::EcnaAnalyzer-constructor> fStexName            = " << fStexName << std::endl;
   std::cout << "*EcnaAnalyzer::EcnaAnalyzer-constructor> fStexNumber          = " << fStexNumber << std::endl;
   std::cout << "*EcnaAnalyzer::EcnaAnalyzer-constructor> fChozenRunTypeNumber = " << fChozenRunTypeNumber << std::endl;
-  std::cout << "*EcnaAnalyzer::EcnaAnalyzer-constructor> fChozenGainNumber    = " << fChozenGainNumber  << std::endl << std::endl;
+  std::cout << "*EcnaAnalyzer::EcnaAnalyzer-constructor> fChozenGainNumber    = " << fChozenGainNumber << std::endl
+            << std::endl;
 
   std::cout << "*EcnaAnalyzer::EcnaAnalyzer-constructor> Init done. " << std::endl;
 }
 // end of constructor
 
-EcnaAnalyzer::~EcnaAnalyzer()
-{
+EcnaAnalyzer::~EcnaAnalyzer() {
   // do anything here that needs to be done at destruction time
   // (e.g. close files, deallocate resources etc.)
 
@@ -430,153 +526,146 @@ EcnaAnalyzer::~EcnaAnalyzer()
 
   std::cout << "EcnaAnalyzer::~EcnaAnalyzer()> destructor is going to be executed." << std::endl;
 
-  if( fOutcomeError == kTRUE )return;
+  if (fOutcomeError == kTRUE)
+    return;
 
   //-------------------------------------------------------------------------------
 
   //....................................................... EB (SM)
-  if( fMyCnaEBSM == nullptr && fStexName == "SM" )
-    {
-      std::cout << std::endl << "!EcnaAnalyzer-destructor> **** ERROR **** fMyCnaEBSM = " << fMyCnaEBSM
-		<< ". !===> ECNA HAS NOT BEEN INITIALIZED." << std::endl
-		<< "  Last event run type = " << runtype(fRunTypeNumber)
-		<< ", fRunTypeNumber = " << fRunTypeNumber
-		<< ", last event Mgpa gain = " << gainvalue(fMgpaGainNumber)
-		<< ", fMgpaGainNumber = " << fMgpaGainNumber
-		<< ", last event fFedId(+601) = " << fFedId+601 << std::endl << std::endl;
-    }
-  else
-    {
-      for(Int_t iSM = fSMIndexBegin; iSM < fSMIndexStop; iSM++)
-	{
-	  if( fMyCnaEBSM[iSM] != nullptr )
-	    {
-	      //........................................ register dates 1 and 2
-	      fMyCnaEBSM[iSM]->StartStopDate(fDateFirst[iSM], fDateLast[iSM]);
-	      fMyCnaEBSM[iSM]->StartStopTime(fTimeFirst[iSM], fTimeLast[iSM]);
-	      
-	      //........................................ Init .root file
-	      fMyCnaEBSM[iSM]->GetReadyToCompute();
-	      fMyCnaEBSM[iSM]->SampleValues();
-	      
-	      //........................................ write the sample values in .root file
-	      if( fMyCnaEBSM[iSM]->WriteRootFile() == kFALSE )
-		{
-		  std::cout << "!EcnaAnalyzer-destructor> PROBLEM with write ROOT file for SM" << iSM+1
-			    << fTTBELL << std::endl;
-		}
-	    }
-	  else
-	    {
-	      std::cout << "*EcnaAnalyzer-destructor> Calculations and writing on file already done for SM "
-			<< iSM+1 << std::endl;
-	    }
-	}
-      delete fMyCnaEBSM;
+  if (fMyCnaEBSM == nullptr && fStexName == "SM") {
+    std::cout << std::endl
+              << "!EcnaAnalyzer-destructor> **** ERROR **** fMyCnaEBSM = " << fMyCnaEBSM
+              << ". !===> ECNA HAS NOT BEEN INITIALIZED." << std::endl
+              << "  Last event run type = " << runtype(fRunTypeNumber) << ", fRunTypeNumber = " << fRunTypeNumber
+              << ", last event Mgpa gain = " << gainvalue(fMgpaGainNumber) << ", fMgpaGainNumber = " << fMgpaGainNumber
+              << ", last event fFedId(+601) = " << fFedId + 601 << std::endl
+              << std::endl;
+  } else {
+    for (Int_t iSM = fSMIndexBegin; iSM < fSMIndexStop; iSM++) {
+      if (fMyCnaEBSM[iSM] != nullptr) {
+        //........................................ register dates 1 and 2
+        fMyCnaEBSM[iSM]->StartStopDate(fDateFirst[iSM], fDateLast[iSM]);
+        fMyCnaEBSM[iSM]->StartStopTime(fTimeFirst[iSM], fTimeLast[iSM]);
+
+        //........................................ Init .root file
+        fMyCnaEBSM[iSM]->GetReadyToCompute();
+        fMyCnaEBSM[iSM]->SampleValues();
+
+        //........................................ write the sample values in
+        //.root file
+        if (fMyCnaEBSM[iSM]->WriteRootFile() == kFALSE) {
+          std::cout << "!EcnaAnalyzer-destructor> PROBLEM with write ROOT file for SM" << iSM + 1 << fTTBELL
+                    << std::endl;
+        }
+      } else {
+        std::cout << "*EcnaAnalyzer-destructor> Calculations and writing on "
+                     "file already done for SM "
+                  << iSM + 1 << std::endl;
+      }
     }
+    delete fMyCnaEBSM;
+  }
   //....................................................... EE (Dee)
 
-  if( fMyCnaEEDee == nullptr && fStexName == "Dee" )
-    {
-      std::cout << std::endl << "!EcnaAnalyzer-destructor> **** ERROR **** fMyCnaEEDee = " << fMyCnaEEDee
-		<< ". !===> ECNA HAS NOT BEEN INITIALIZED." << std::endl
-		<< "  Last event run type = " << runtype(fRunTypeNumber)
-		<< ", fRunTypeNumber = " << fRunTypeNumber
-		<< ", last event Mgpa gain = " << gainvalue(fMgpaGainNumber)
-		<< ", fMgpaGainNumber = " << fMgpaGainNumber
-		<< ", last event fFedId(+601) = " << fFedId+601 << std::endl << std::endl;
-    }
-  else
-    {
-      for(Int_t iDee = fDeeIndexBegin; iDee < fDeeIndexStop; iDee++)
-	{
-	  if( fMyCnaEEDee[iDee] != nullptr )
-	    {
-	      //........................................ register dates 1 and 2
-	      fMyCnaEEDee[iDee]->StartStopDate(fDateFirst[iDee], fDateLast[iDee]);
-	      fMyCnaEEDee[iDee]->StartStopTime(fTimeFirst[iDee], fTimeLast[iDee]);
-	      
-	      //........................................ Init .root file
-	      fMyCnaEEDee[iDee]->GetReadyToCompute();
-	      fMyCnaEEDee[iDee]->SampleValues();
-	      
-	      //........................................ write the sample values in .root file
-	      if(fMyCnaEEDee[iDee]->WriteRootFile() == kFALSE )
-		{
-		  std::cout << "!EcnaAnalyzer-destructor> PROBLEM with write ROOT file for Dee" << iDee+1
-			    << fTTBELL << std::endl;
-		}
-	    }
-	  else
-	    {
-	      std::cout << "*EcnaAnalyzer-destructor> Calculations and writing on file already done for Dee "
-			<< iDee+1 << std::endl;
-	    }
-	}
-      delete fMyCnaEEDee;
+  if (fMyCnaEEDee == nullptr && fStexName == "Dee") {
+    std::cout << std::endl
+              << "!EcnaAnalyzer-destructor> **** ERROR **** fMyCnaEEDee = " << fMyCnaEEDee
+              << ". !===> ECNA HAS NOT BEEN INITIALIZED." << std::endl
+              << "  Last event run type = " << runtype(fRunTypeNumber) << ", fRunTypeNumber = " << fRunTypeNumber
+              << ", last event Mgpa gain = " << gainvalue(fMgpaGainNumber) << ", fMgpaGainNumber = " << fMgpaGainNumber
+              << ", last event fFedId(+601) = " << fFedId + 601 << std::endl
+              << std::endl;
+  } else {
+    for (Int_t iDee = fDeeIndexBegin; iDee < fDeeIndexStop; iDee++) {
+      if (fMyCnaEEDee[iDee] != nullptr) {
+        //........................................ register dates 1 and 2
+        fMyCnaEEDee[iDee]->StartStopDate(fDateFirst[iDee], fDateLast[iDee]);
+        fMyCnaEEDee[iDee]->StartStopTime(fTimeFirst[iDee], fTimeLast[iDee]);
+
+        //........................................ Init .root file
+        fMyCnaEEDee[iDee]->GetReadyToCompute();
+        fMyCnaEEDee[iDee]->SampleValues();
+
+        //........................................ write the sample values in
+        //.root file
+        if (fMyCnaEEDee[iDee]->WriteRootFile() == kFALSE) {
+          std::cout << "!EcnaAnalyzer-destructor> PROBLEM with write ROOT file "
+                       "for Dee"
+                    << iDee + 1 << fTTBELL << std::endl;
+        }
+      } else {
+        std::cout << "*EcnaAnalyzer-destructor> Calculations and writing on "
+                     "file already done for Dee "
+                  << iDee + 1 << std::endl;
+      }
     }
-  std::cout <<endl;
+    delete fMyCnaEEDee;
+  }
+  std::cout << endl;
 
   //-----------------------------------------------------------------------------------
 
-  std::cout << "*EcnaAnalyzer-destructor> Status of events returned by GetSampleAdcValues(): "
-	    << std::endl;
+  std::cout << "*EcnaAnalyzer-destructor> Status of events returned by "
+               "GetSampleAdcValues(): "
+            << std::endl;
 
-  for(Int_t i0Stex=fStexIndexBegin; i0Stex<fStexIndexStop; i0Stex++ )
-    {
-      std::cout << fStexName << i0Stex+1 << "> Status OK: " << fBuildEventDistribGood[i0Stex]
-		<< " / ERROR(S): " << fBuildEventDistribBad[i0Stex];
-      if( fBuildEventDistribBad[i0Stex] > 0 )
-	{std::cout << " <=== SHOULD BE EQUAL TO ZERO ! " << fTTBELL;}
-      std::cout << std::endl;
+  for (Int_t i0Stex = fStexIndexBegin; i0Stex < fStexIndexStop; i0Stex++) {
+    std::cout << fStexName << i0Stex + 1 << "> Status OK: " << fBuildEventDistribGood[i0Stex]
+              << " / ERROR(S): " << fBuildEventDistribBad[i0Stex];
+    if (fBuildEventDistribBad[i0Stex] > 0) {
+      std::cout << " <=== SHOULD BE EQUAL TO ZERO ! " << fTTBELL;
     }
+    std::cout << std::endl;
+  }
 
-  std::cout << std::endl<< "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - " <<  std::endl;
-  
-  std::cout << "*EcnaAnalyzer-destructor> Run types seen in event headers before selection:" << std::endl;
+  std::cout << std::endl << "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - " << std::endl;
 
-  for(Int_t i=0; i<fMaxRunTypeCounter; i++)
-    {
-      std::cout << " => " << std::setw(10) << fRunTypeCounter[i]
-		<< " event header(s) with run type " << runtype(i) << std::endl; 
-    }
+  std::cout << "*EcnaAnalyzer-destructor> Run types seen in event headers "
+               "before selection:"
+            << std::endl;
 
-  std::cout << std::endl<< "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - " <<  std::endl;
+  for (Int_t i = 0; i < fMaxRunTypeCounter; i++) {
+    std::cout << " => " << std::setw(10) << fRunTypeCounter[i] << " event header(s) with run type " << runtype(i)
+              << std::endl;
+  }
 
-  std::cout << "*EcnaAnalyzer-destructor> Mgpa gains seen in event headers before selection:" << std::endl;
+  std::cout << std::endl << "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - " << std::endl;
 
-  for(Int_t i=0; i<fMaxMgpaGainCounter; i++)
-    {
-      std::cout << " => " << std::setw(10) << fMgpaGainCounter[i]
-		<< " event header(s) with gain " << gainvalue(i) << std::endl; 
-    }
+  std::cout << "*EcnaAnalyzer-destructor> Mgpa gains seen in event headers "
+               "before selection:"
+            << std::endl;
 
-  std::cout << std::endl<< "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - " <<  std::endl;
+  for (Int_t i = 0; i < fMaxMgpaGainCounter; i++) {
+    std::cout << " => " << std::setw(10) << fMgpaGainCounter[i] << " event header(s) with gain " << gainvalue(i)
+              << std::endl;
+  }
+
+  std::cout << std::endl << "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - " << std::endl;
 
   std::cout << "*EcnaAnalyzer-destructor> Numbers of selected events for each FED:" << std::endl;
 
-  for(Int_t i=0; i<fMaxFedIdCounter; i++)
-    {
-	  std::cout << " => FedId " << i+601 << ": "
-		    << std::setw(10) << fFedIdCounter[i] << " events" << std::endl;
-    }
+  for (Int_t i = 0; i < fMaxFedIdCounter; i++) {
+    std::cout << " => FedId " << i + 601 << ": " << std::setw(10) << fFedIdCounter[i] << " events" << std::endl;
+  }
 
-  std::cout << std::endl<< "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - " <<  std::endl;
+  std::cout << std::endl << "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - " << std::endl;
 
-  if( fStexNumber == 0 )
-    {
-      // std::cout << "*EcnaAnalyzer-destructor> fDateFirst = " << fDateFirst[0] << std::endl
-      //           << "                          fDateLast  = " << fDateLast[fMaxTreatedStexCounter-1] << std::endl << std::endl;
-    }
-  if( fStexNumber > 0 )
-    {
-      std::cout << "*EcnaAnalyzer-destructor> fDateFirst = " << fDateFirst[fStexNumber-1] << std::endl
-		<< "                          fDateLast  = " << fDateLast[fStexNumber-1] << std::endl << std::endl;
-    }
+  if (fStexNumber == 0) {
+    // std::cout << "*EcnaAnalyzer-destructor> fDateFirst = " << fDateFirst[0]
+    // << std::endl
+    //           << "                          fDateLast  = " <<
+    //           fDateLast[fMaxTreatedStexCounter-1] << std::endl << std::endl;
+  }
+  if (fStexNumber > 0) {
+    std::cout << "*EcnaAnalyzer-destructor> fDateFirst = " << fDateFirst[fStexNumber - 1] << std::endl
+              << "                          fDateLast  = " << fDateLast[fStexNumber - 1] << std::endl
+              << std::endl;
+  }
 
-  std::cout << std::endl<< "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - " <<  std::endl;
+  std::cout << std::endl << "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - " << std::endl;
 
-  Int_t n0 =0; CheckMsg(n0);
+  Int_t n0 = 0;
+  CheckMsg(n0);
 
   delete fMyEBNumbering;
   delete fMyEENumbering;
@@ -588,14 +677,12 @@ EcnaAnalyzer::~EcnaAnalyzer()
 }
 // end of destructor
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void EcnaAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void EcnaAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace std;
   //..................................... format numerical values
   std::cout << std::setiosflags(std::ios::showpoint | std::ios::uppercase);
@@ -607,539 +694,592 @@ void EcnaAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSet
 
   using namespace edm;
 
-  fRecNumber++; 
+  fRecNumber++;
 
-  Int_t iFreq = (fLastReqEvent - fFirstReqEvent + 1)/5;
-  if( iFreq <= 0 ){iFreq = 10000;}
+  Int_t iFreq = (fLastReqEvent - fFirstReqEvent + 1) / 5;
+  if (iFreq <= 0) {
+    iFreq = 10000;
+  }
 
-  Int_t MaxSMAndDS = fMyEBEcal->MaxSMInEB()+fMyEEEcal->MaxDSInEE();
+  Int_t MaxSMAndDS = fMyEBEcal->MaxSMInEB() + fMyEEEcal->MaxDSInEE();
 
-  //********************************************* EVENT TREATMENT ********************************
+  //********************************************* EVENT TREATMENT
+  //********************************
   Handle<EcalRawDataCollection> pEventHeader;
-  const EcalRawDataCollection* myEventHeader = nullptr;
-  try{
+  const EcalRawDataCollection *myEventHeader = nullptr;
+  try {
     iEvent.getByLabel(eventHeaderProducer_, eventHeaderCollection_, pEventHeader);
     myEventHeader = pEventHeader.product();
-  }catch (std::exception& ex ){
+  } catch (std::exception &ex) {
     std::cerr << "Error! can't get the product " << eventHeaderCollection_.c_str() << std::endl;
   }
   //........... Decode myEventHeader infos
-  for(EcalRawDataCollection::const_iterator headerItr=myEventHeader->begin();
-      headerItr != myEventHeader->end();++headerItr)
-    {
-      //===> fRunNumber, fRunTypeNumber, fMgpaGainNumber, fFedId, fEvtNumber
-      //     will be used in AnalysisOutcome(...) below
-      fRunNumber = (Int_t)headerItr->getRunNumber();
-      if( fRunNumber <= 0 ){fRunNumber = (Int_t)iEvent.id().run();}
-      fRunTypeNumber  = (Int_t)headerItr->getRunType();
-      fMgpaGainNumber = (Int_t)headerItr->getMgpaGain();
-      fFedId = (Int_t)headerItr->fedId() - 601;   // 1st Fed = 601, FedId = Fed number - 1 
-      fEvtNumber = (Int_t)headerItr->getLV1(); 
-      if( fEvtNumber <= 0 ){fEvtNumber = (Int_t)iEvent.id().event();}
-
-      if( fEvtNumber != fEvtNumberMemo )
-	{
-	  fEvtNumberMemo = fEvtNumber;
-
-	  //============================================
-	  //  cmsRun INTERRUPTION if analysis complete
-	  //  or if fCurrentEventNumber >= LastReqEvent
-	  //============================================
-	  if( AnalysisOutcome("EVT") == kTRUE ){return;}
-
-	  // no interruption => event has to be analyzed
-
-	  fCurrentEventNumber++;
-
-	  if( fRecNumber ==   1 || fRecNumber ==   50 || fRecNumber == 100 ||
-	      fRecNumber == 500 || fRecNumber == 1000 || fRecNumber%iFreq == 0 ){Int_t n1 =1; CheckMsg(n1);}
-  
-	  if( fCurrentEventNumber < fFirstReqEvent )return; // skip events before fFirstReqEvent
-	}
-
-      //.................. Increment Run type and MgpaGain counters
-      if( fRunTypeNumber  >= 0 && fRunTypeNumber  < fMaxRunTypeCounter  ){fRunTypeCounter[fRunTypeNumber]++;}
-      if( fMgpaGainNumber >= 0 && fMgpaGainNumber < fMaxMgpaGainCounter ){fMgpaGainCounter[fMgpaGainNumber]++;}
-
-      //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% User's analysis cut %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-      
-      if( !(
-	    fRunNumber > 0 &&
-	    ( fRunTypeNumber  == fChozenRunTypeNumber || fChozenRunTypeNumber == fANY_RUN ) &&
-	    ( fMgpaGainNumber == fChozenGainNumber    || fChozenGainNumber    == 0 )
-	    )
-	  ) return;
-      
-      //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-      if( fMemoCutOK == 0 ){fMemoCutOK = 1;}
-
-      //---- Accelerating selection with "FED-TCC" number [ from headerItr->getDccInTCCCommand() ]
-      //     Arrays fSMFromFedTcc[] and fESFromFedTcc[] are initialised in Init()
-
-      if( fAnalysisName == "AdcPeg12"  || fAnalysisName == "AdcSPeg12" ||
-	  fAnalysisName == "AdcPhys"   || fAnalysisName == "AdcAny" )
-	{
-	  fFedTcc = (Int_t)headerItr->getDccInTCCCommand();
-
-	  if( fFedTcc >= 1 && fFedTcc <= MaxSMAndDS )
-	    {
-	      if( fStexName == "SM" )
-		{
-		  if( fFedTcc < 10 || fFedTcc > 45 )return;
-		  
-		  if( fSMFromFedTcc[fFedTcc-1] >= 1 && fSMFromFedTcc[fFedTcc-1] <= fMyEBEcal->MaxSMInEB() &&
-		      fStexNbOfTreatedEvents[fSMFromFedTcc[fFedTcc-1]-1] >= fReqNbOfEvts )return;
-		}
-	      
-	      if( fStexName == "Dee" )
-		{
-		  if( fFedTcc >= 10 && fFedTcc <= 45 )return;
-		  
-		  if( fESFromFedTcc[fFedTcc-1] >= 1 && fESFromFedTcc[fFedTcc-1] <= fMyEEEcal->MaxDSInEE() &&
-		      fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1] >= fReqNbOfEvts )return;
-		}
-	    } // end of if( fFedTcc >= 1 && fFedTcc <= MaxSMAndDS )
-	} // end of if( fAnalysisName == "AdcPeg12"  || fAnalysisName == "AdcSPeg12"  ...)
-      
-      //.................. Increment FedId counters     
-      if( fFedId >= 0 && fFedId < fMaxFedIdCounter ){fFedIdCounter[fFedId]++;}
-      
-    } // end of for(EcalRawDataCollection::const_iterator headerItr=myEventHeader->begin();
-      // headerItr != myEventHeader->end();++headerItr)
-  
-  if( fMemoCutOK == 0 )return;   // return if no event passed the user's analysis cut
+  for (EcalRawDataCollection::const_iterator headerItr = myEventHeader->begin(); headerItr != myEventHeader->end();
+       ++headerItr) {
+    //===> fRunNumber, fRunTypeNumber, fMgpaGainNumber, fFedId, fEvtNumber
+    //     will be used in AnalysisOutcome(...) below
+    fRunNumber = (Int_t)headerItr->getRunNumber();
+    if (fRunNumber <= 0) {
+      fRunNumber = (Int_t)iEvent.id().run();
+    }
+    fRunTypeNumber = (Int_t)headerItr->getRunType();
+    fMgpaGainNumber = (Int_t)headerItr->getMgpaGain();
+    fFedId = (Int_t)headerItr->fedId() - 601;  // 1st Fed = 601, FedId = Fed number - 1
+    fEvtNumber = (Int_t)headerItr->getLV1();
+    if (fEvtNumber <= 0) {
+      fEvtNumber = (Int_t)iEvent.id().event();
+    }
+
+    if (fEvtNumber != fEvtNumberMemo) {
+      fEvtNumberMemo = fEvtNumber;
+
+      //============================================
+      //  cmsRun INTERRUPTION if analysis complete
+      //  or if fCurrentEventNumber >= LastReqEvent
+      //============================================
+      if (AnalysisOutcome("EVT") == kTRUE) {
+        return;
+      }
+
+      // no interruption => event has to be analyzed
+
+      fCurrentEventNumber++;
+
+      if (fRecNumber == 1 || fRecNumber == 50 || fRecNumber == 100 || fRecNumber == 500 || fRecNumber == 1000 ||
+          fRecNumber % iFreq == 0) {
+        Int_t n1 = 1;
+        CheckMsg(n1);
+      }
+
+      if (fCurrentEventNumber < fFirstReqEvent)
+        return;  // skip events before fFirstReqEvent
+    }
+
+    //.................. Increment Run type and MgpaGain counters
+    if (fRunTypeNumber >= 0 && fRunTypeNumber < fMaxRunTypeCounter) {
+      fRunTypeCounter[fRunTypeNumber]++;
+    }
+    if (fMgpaGainNumber >= 0 && fMgpaGainNumber < fMaxMgpaGainCounter) {
+      fMgpaGainCounter[fMgpaGainNumber]++;
+    }
+
+    //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% User's analysis cut
+    //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+    if (!(fRunNumber > 0 && (fRunTypeNumber == fChozenRunTypeNumber || fChozenRunTypeNumber == fANY_RUN) &&
+          (fMgpaGainNumber == fChozenGainNumber || fChozenGainNumber == 0)))
+      return;
+
+    //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+    if (fMemoCutOK == 0) {
+      fMemoCutOK = 1;
+    }
+
+    //---- Accelerating selection with "FED-TCC" number [ from
+    // headerItr->getDccInTCCCommand() ]
+    //     Arrays fSMFromFedTcc[] and fESFromFedTcc[] are initialised in Init()
+
+    if (fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" || fAnalysisName == "AdcPhys" ||
+        fAnalysisName == "AdcAny") {
+      fFedTcc = (Int_t)headerItr->getDccInTCCCommand();
+
+      if (fFedTcc >= 1 && fFedTcc <= MaxSMAndDS) {
+        if (fStexName == "SM") {
+          if (fFedTcc < 10 || fFedTcc > 45)
+            return;
+
+          if (fSMFromFedTcc[fFedTcc - 1] >= 1 && fSMFromFedTcc[fFedTcc - 1] <= fMyEBEcal->MaxSMInEB() &&
+              fStexNbOfTreatedEvents[fSMFromFedTcc[fFedTcc - 1] - 1] >= fReqNbOfEvts)
+            return;
+        }
+
+        if (fStexName == "Dee") {
+          if (fFedTcc >= 10 && fFedTcc <= 45)
+            return;
+
+          if (fESFromFedTcc[fFedTcc - 1] >= 1 && fESFromFedTcc[fFedTcc - 1] <= fMyEEEcal->MaxDSInEE() &&
+              fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc - 1] - 1] >= fReqNbOfEvts)
+            return;
+        }
+      }  // end of if( fFedTcc >= 1 && fFedTcc <= MaxSMAndDS )
+    }    // end of if( fAnalysisName == "AdcPeg12"  || fAnalysisName == "AdcSPeg12"
+    // ...)
+
+    //.................. Increment FedId counters
+    if (fFedId >= 0 && fFedId < fMaxFedIdCounter) {
+      fFedIdCounter[fFedId]++;
+    }
+
+  }  // end of for(EcalRawDataCollection::const_iterator
+  // headerItr=myEventHeader->begin(); headerItr !=
+  // myEventHeader->end();++headerItr)
+
+  if (fMemoCutOK == 0)
+    return;  // return if no event passed the user's analysis cut
 
   //========================== SELECTED EVENTS ================================
   fNbOfSelectedEvents++;
-  if( fNbOfSelectedEvents == 1 ){Int_t n2 = 2; CheckMsg(n2);}
+  if (fNbOfSelectedEvents == 1) {
+    Int_t n2 = 2;
+    CheckMsg(n2);
+  }
 
-  //============================ Ecna init for the pointers array =================================
+  //============================ Ecna init for the pointers array
+  //=================================
   //.................................................................. EB (SM)
-  if( fMyCnaEBSM == nullptr && fStexName == "SM" )
-    {
-      fMyCnaEBSM = new TEcnaRun*[fMyEBEcal->MaxSMInEB()];
-      for(Int_t i0SM = 0; i0SM < fMyEBEcal->MaxSMInEB(); i0SM++)
-	{fMyCnaEBSM[i0SM] = nullptr;}
+  if (fMyCnaEBSM == nullptr && fStexName == "SM") {
+    fMyCnaEBSM = new TEcnaRun *[fMyEBEcal->MaxSMInEB()];
+    for (Int_t i0SM = 0; i0SM < fMyEBEcal->MaxSMInEB(); i0SM++) {
+      fMyCnaEBSM[i0SM] = nullptr;
     }
+  }
   //.................................................................. EE (Dee)
-  if( fMyCnaEEDee == nullptr && fStexName == "Dee" )
-    {
-      fMyCnaEEDee = new TEcnaRun*[fMyEEEcal->MaxDeeInEE()];
-      for(Int_t iDee = 0; iDee < fMyEEEcal->MaxDeeInEE(); iDee++)
-	{fMyCnaEEDee[iDee] = nullptr;}
+  if (fMyCnaEEDee == nullptr && fStexName == "Dee") {
+    fMyCnaEEDee = new TEcnaRun *[fMyEEEcal->MaxDeeInEE()];
+    for (Int_t iDee = 0; iDee < fMyEEEcal->MaxDeeInEE(); iDee++) {
+      fMyCnaEEDee[iDee] = nullptr;
     }
-  
+  }
+
   //============================ EVENT TREATMENT ==============================
   Int_t MaxNbOfStex = 0;
-  if( fStexName == "SM"  ){MaxNbOfStex = fMyEBEcal->MaxSMInEB();}
-  if( fStexName == "Dee" ){MaxNbOfStex = fMyEEEcal->MaxDeeInEE();}
-
-  if( (fStexNumber > 0 && fNbOfTreatedStexs == 0) || (fStexNumber == 0 && fNbOfTreatedStexs < MaxNbOfStex) )
-    {
-      //================================================================= Record type EB (SM)
-      if( fStexName == "SM" && fSMIndexBegin < fSMIndexStop )
-	{
-	  //......................................... Get digisEB
-	  Handle<EBDigiCollection> pdigisEB;
-	  const EBDigiCollection* digisEB = nullptr;
-	  try{
-	    iEvent.getByLabel(digiProducer_, EBdigiCollection_, pdigisEB); 
-	    digisEB = pdigisEB.product();
-	  }catch (std::exception& ex ){
-	    std::cerr << "Error! can't get the product " << EBdigiCollection_.c_str() << std::endl;
-	  }
-	  
-	  // Initialize vectors if not already done
-	  if ( int(digisEB->size()) > nChannels_ ){nChannels_ = digisEB->size();}
-	  
-	  //Int_t print_count = 0;
-	  if( Int_t(digisEB->end()-digisEB->begin()) >= 0 &&
-	      Int_t(digisEB->end()-digisEB->begin()) <=  Int_t(digisEB->size()) )
-	    {
-	      //..........................................EB
-	      //===============================================================================
-	      //
-	      //                    Loop over Ecal barrel digisEB (Xtals)
-	      //
-	      //===============================================================================
-
-	      for(EBDigiCollection::const_iterator digiItr = digisEB->begin(); digiItr != digisEB->end(); ++digiItr)
-		{
-		  EBDetId id_crystal(digiItr->id());
-		  // Int_t HashedIndex = id_crystal.hashedIndex();
-		  
-		  Int_t i0SM = id_crystal.ism() - 1;    //   <============== GET the SM number - 1 here
-		  
-		  if( i0SM >= 0 && i0SM<fMaxTreatedStexCounter )
-		    {
-		      if( fMyCnaEBSM[i0SM] == nullptr && fStexStatus[i0SM] != 2 )
-			{
-			  //=============================== Init Ecna EB ===============================
-			  fMyCnaEBSM[i0SM] = new TEcnaRun(fMyEcnaEBObjectManager, "EB", fNbOfSamples);
-			  fMyCnaEBSM[i0SM]->GetReadyToReadData(fAnalysisName,  fRunNumber,
-							       fFirstReqEvent, fLastReqEvent, fReqNbOfEvts,
-							       i0SM+1,         fRunTypeNumber);
-		      
-			  std::cout << "*EcnaAnalyzer::analyze(...)> ********* INIT ECNA EB ********* " << std::endl
-				    << "                                   fAnalysisName = " << fAnalysisName << std::endl
-				    << "                                      fRunNumber = " << fRunNumber << std::endl
-				    << "                                  fFirstReqEvent = " << fFirstReqEvent << std::endl
-				    << "                                   fLastReqEvent = " << fLastReqEvent << std::endl
-				    << "                                    fReqNbOfEvts = " << fReqNbOfEvts << std::endl
-				    << "                                              SM = " << i0SM+1 << std::endl
-				    << "                                        run type = " << runtype(fRunTypeNumber)
-				    << std::endl;
-			  //============================================================================
-			}
-		      
-		      if( fStexStatus[i0SM] < 2 )  // nothing to do if status=2 reached
-			{
-			  fStexDigiOK[i0SM]++;
-			  if( fStexDigiOK[i0SM] == 1 ){fStexNbOfTreatedEvents[i0SM]++;}
-			  
-			  if( fStexNbOfTreatedEvents[i0SM] >= 1 && fStexNbOfTreatedEvents[i0SM] <= fReqNbOfEvts )
-			    {
-			      //......................................... date of first event (in real time)
-			      edm::Timestamp Time = iEvent.time();
-			      edm::TimeValue_t t_current_ev_time = (cond::Time_t)Time.value();
-			      time_t         i_current_ev_time = (time_t)(t_current_ev_time>>32);
-			      const time_t*  p_current_ev_time = &i_current_ev_time;
-			      char*          astime            = ctime(p_current_ev_time);
-
-			      if( fStexDigiOK[i0SM] == 1 && fStexNbOfTreatedEvents[i0SM] == 1 &&
-				  ( fStexNumber == 0 || i0SM+1 == fStexNumber )
-				  )
-				{
-				  fTimeFirst[i0SM] = i_current_ev_time;
-				  fDateFirst[i0SM] = astime;
-				  fTimeLast[i0SM]  = i_current_ev_time;
-				  fDateLast[i0SM]  = astime;
-				  std::cout << "*----> beginning of analysis for " << fStexName << i0SM+1
-					    << ". First analyzed event date : " << astime << std::endl;
-				  //      << " t_current_ev_time = " << t_current_ev_time  << std::endl
-				  //      << " i_current_ev_time = " << i_current_ev_time  << std::endl
-				  //      << " p_current_ev_time = " << p_current_ev_time  << std::endl
-				}
-
-			      if( i_current_ev_time < fTimeFirst[i0SM] )
-				{ fTimeFirst[i0SM] = i_current_ev_time; fDateFirst[i0SM] = astime;}
-			      if( i_current_ev_time > fTimeLast[i0SM] )
-				{ fTimeLast[i0SM] = i_current_ev_time; fDateLast[i0SM] = astime;}
-			      
-			      //=============================================> CUT on i0SM value
-			      if( (fStexNumber > 0 && i0SM == fStexNumber-1) || (fStexNumber == 0) )
-				{ 
-				  Int_t iEta = id_crystal.ietaSM(); // ietaSM() : range = [1,85]
-				  Int_t iPhi = id_crystal.iphiSM(); // iphiSM() : range = [1,20]
-				  
-				  Int_t n1SMCrys  =
-				    (iEta-1)*(fMyEBEcal->MaxTowPhiInSM()*fMyEBEcal->MaxCrysPhiInTow())+iPhi; // range = [1,1700]
-				  Int_t n1SMTow   = fMyEBNumbering->Get1SMTowFrom1SMCrys(n1SMCrys);          // range = [1,68]
-				  Int_t i0TowEcha = fMyEBNumbering->Get0TowEchaFrom1SMCrys(n1SMCrys);        // range = [0,24]
-				  
-				  Int_t NbOfSamplesFromDigis = digiItr->size();
-				  
-				  EBDataFrame df( *digiItr );
-				  
-				  if( NbOfSamplesFromDigis > 0 && NbOfSamplesFromDigis <= fMyEBEcal->MaxSampADC() )
-				    {
-				      Double_t adcDBLS = (Double_t)0;
-				      // Three 1st samples mean value for Dynamic Base Line Substraction (DBLS)
-				      if( fDynBaseLineSub == "yes" )
-					{
-					  for (Int_t i0Sample=0; i0Sample<3; i0Sample++)  
-					    {adcDBLS += (Double_t)(df.sample(i0Sample).adc());}
-					  adcDBLS /= (Double_t)3;
-					}
-				      // Loop over the samples
-				      for (Int_t i0Sample=0; i0Sample<fNbOfSamples; i0Sample++)  
-					{
-					  Double_t adc = (Double_t)(df.sample(i0Sample).adc()) - adcDBLS;
-					  //................................................. Calls to GetSampleAdcValues
-					  if( fMyCnaEBSM[i0SM]->GetSampleAdcValues
-					      (fStexNbOfTreatedEvents[i0SM],n1SMTow,i0TowEcha,i0Sample,adc) == kTRUE )
-					    {
-					      fBuildEventDistribGood[i0SM]++;
-					    }
-					  else
-					    {
-					      fBuildEventDistribBad[i0SM]++;
-					    }
-					}
-				    }
-				  else
-				    {
-				      std::cout << "EcnaAnalyzer::analyze(...)> NbOfSamplesFromDigis out of bounds = "
-						<< NbOfSamplesFromDigis << std::endl;
-				    }
-				} // end of if( (fStexNumber > 0 && i0SM == fStexNumber-1) || (fStexNumber == 0) )
-			    } // end of if( fStexNbOfTreatedEvents[i0SM] >= 1 && fStexNbOfTreatedEvents[i0SM] <= fReqNbOfEvts )
-			} // end of if( fStexStatus[i0SM] < 2 )
-		    } // end of if( i0SM >= 0 && i0SM<fMaxTreatedStexCounter  )	  
-		} // end of for (EBDigiCollection::const_iterator digiItr = digisEB->begin();
-	          //             digiItr != digisEB->end(); ++digiItr)
-	      
-	      for(Int_t i0SM=0; i0SM<fMaxTreatedStexCounter; i0SM++)
-		{
-		  fStexDigiOK[i0SM] = 0;  // reset fStexDigiOK[i0SM] after loop on digis
-		}
-	      
-	    } // end of if( Int_t(digisEB->end()-digisEB->begin()) >= 0 &&
-	      // Int_t(digisEB->end()-digisEB->begin()) <=  Int_t(digisEB->size()) )
-	} // end of if( fStexName == "SM" && fSMIndexBegin < fSMIndexStop )
-      
-      //=============================================================== Record type EE (Dee)
-      if( fStexName == "Dee" && fDeeIndexBegin < fDeeIndexStop )
-	{
-	  //......................................... Get digisEE
-	  Handle<EEDigiCollection> pdigisEE;
-	  const EEDigiCollection* digisEE = nullptr;
-	  try{
-	    iEvent.getByLabel(digiProducer_, EEdigiCollection_, pdigisEE); 
-	    digisEE = pdigisEE.product();
-	  }catch (std::exception& ex ){
-	    std::cerr << "Error! can't get the product " << EEdigiCollection_.c_str() << std::endl;
-	  }
-      
-	  // Initialize vectors if not already done
-	  if( int(digisEE->size()) > nChannels_ ){nChannels_ = digisEE->size();}
-      
-	  //Int_t print_count = 0;
-	  if( Int_t(digisEE->end()-digisEE->begin()) >= 0 &&
-	      Int_t(digisEE->end()-digisEE->begin()) <= Int_t(digisEE->size()) )
-	    {
-	      //======================================================================================
-	      //
-	      //                           Loop over Ecal endcap digisEE (Xtals)
-	      //
-	      //======================================================================================
-
-	      for (EEDigiCollection::const_iterator digiItr = digisEE->begin(); digiItr != digisEE->end(); ++digiItr) 
-		{	  
-		  EEDetId id_crystal(digiItr->id());
-
-		  Int_t iX_data = id_crystal.ix();        // iX_data : range = [1,100]
-		  Int_t iY_data = id_crystal.iy();        // iY_data : range = [1,100] 
-		  Int_t i_quad  = id_crystal.iquadrant(); // iquadrant() : range = [1,4]
-		  Int_t i_sgnZ  = id_crystal.zside();     //     zside() : values = -1,+1    
-		    
-		  Int_t iX = iX_data;
-		  Int_t iY = iY_data; // iY : range = [1,100]
-
-		  //.......... See CMSSW/DataFormats/EcalDetId/src/EEDetId.cc::ixQuadrantOne()  [ in which ix() = iX_data ]
-		  if( i_quad == 1 || i_quad == 4 ){iX = iX_data - 50;} // iX_data : range = [51,100], iX : range = [1,50]
-		  if( i_quad == 3 || i_quad == 2 ){iX = 51 - iX_data;} // iX_data : range = [50,1],   iX : range = [1,50]
-		  		    
-		  Int_t n1DeeCrys =
-		    (iX-1)*(fMyEEEcal->MaxSCIYInDee()*fMyEEEcal->MaxCrysIYInSC()) + iY; // n1DeeCrys: range = [1,5000]
-
-		  Int_t n1DeeNumber = 0;
-		  if( i_quad == 1 && i_sgnZ ==  1 ){n1DeeNumber = 2;}
-		  if( i_quad == 1 && i_sgnZ == -1 ){n1DeeNumber = 3;}
-		  if( i_quad == 2 && i_sgnZ ==  1 ){n1DeeNumber = 1;}
-		  if( i_quad == 2 && i_sgnZ == -1 ){n1DeeNumber = 4;}
-		  if( i_quad == 3 && i_sgnZ ==  1 ){n1DeeNumber = 1;}
-		  if( i_quad == 3 && i_sgnZ == -1 ){n1DeeNumber = 4;}
-		  if( i_quad == 4 && i_sgnZ ==  1 ){n1DeeNumber = 2;}
-		  if( i_quad == 4 && i_sgnZ == -1 ){n1DeeNumber = 3;}
-
-		  Int_t i0Dee = n1DeeNumber-1;   //   <============== GET the Dee number - 1 here
-
-		  if( i0Dee >= 0 && i0Dee<fMaxTreatedStexCounter )
-		    {
-		      if( fMyCnaEEDee[i0Dee] == nullptr  && fStexStatus[i0Dee] != 2 )
-			{
-			  //=============================== Init Ecna EE ===============================
-			  fMyCnaEEDee[i0Dee] = new TEcnaRun(fMyEcnaEEObjectManager, "EE", fNbOfSamples);
-			  fMyCnaEEDee[i0Dee]->GetReadyToReadData(fAnalysisName,  fRunNumber,
-								 fFirstReqEvent, fLastReqEvent, fReqNbOfEvts,
-								 i0Dee+1,         fRunTypeNumber);
-			  
-			  std::cout << "*EcnaAnalyzer::analyze(...)> ********* INIT ECNA EE ********* " << std::endl
-				    << "                                   fAnalysisName = " << fAnalysisName << std::endl
-				    << "                                      fRunNumber = " << fRunNumber << std::endl
-				    << "                                  fFirstReqEvent = " << fFirstReqEvent << std::endl
-				    << "                                   fLastReqEvent = " << fLastReqEvent << std::endl
-				    << "                                    fReqNbOfEvts = " << fReqNbOfEvts << std::endl
-				    << "                                             Dee = " << i0Dee+1 << std::endl
-				    << "                                        run type = " << runtype(fRunTypeNumber)
-				    << std::endl;
-			  //============================================================================
-			}
-
-		      if( fStexStatus[i0Dee] < 2 ) // nothing to do if status=2 reached
-			{
-			  Bool_t cOKForTreatment = kFALSE;
-
-			  if( fAnalysisName == "AdcPeg12"  || fAnalysisName == "AdcSPeg12"  ||
-			      fAnalysisName == "AdcPhys"   || fAnalysisName == "AdcAny" )
-			    {
-			      if( fFedTcc >= 1 && fFedTcc <= MaxSMAndDS )
-				{
-				  fFedDigiOK[fESFromFedTcc[fFedTcc-1]-1]++;
-
-				  if( !(fESFromFedTcc[fFedTcc-1] == 5 || fESFromFedTcc[fFedTcc-1] == 14) )
-				    {  
-				      if( fFedDigiOK[fESFromFedTcc[fFedTcc-1]-1] == 1 )
-					{
-					  fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1]++;
-					}
-				      if( fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1] >= 1 &&
-					  fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1] <= fReqNbOfEvts )
-					{
-					  fStexNbOfTreatedEvents[i0Dee] = fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1];
-					  cOKForTreatment = kTRUE;
-					}
-				    }
-				  if( fESFromFedTcc[fFedTcc-1] == 5 || fESFromFedTcc[fFedTcc-1] == 14 )
-				    {
-				      if( fFedDigiOK[fESFromFedTcc[fFedTcc-1]-1] == 1 )
-					{
-					  fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1]++;
-					  fDeeDS5Memo1 = n1DeeNumber;
-					  fStexNbOfTreatedEvents[i0Dee] = fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1];
-					}
-				      else
-					{
-					  if( fDeeDS5Memo2 == 0 )
-					    {
-					      if( n1DeeNumber != fDeeDS5Memo1 )
-						{
-						  // change of Dee in Data sector 5
-						  fDeeDS5Memo2 = n1DeeNumber;
-						  fStexNbOfTreatedEvents[i0Dee] =
-						    fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1];
-						}
-					    }
-					}
-				      if( fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1] >= 1 &&
-					  fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1] <= fReqNbOfEvts )
-					{
-					  cOKForTreatment = kTRUE;
-					}
-				    }
-				} // end of if( fFedTcc >= 1 && fFedTcc <= MaxSMAndDS )
-			    } // end of if( fAnalysisName == "AdcPeg12"  || fAnalysisName == "AdcSPeg12" .... )
-			  else
-			    {
-			      fStexDigiOK[i0Dee]++;
-			      if( fStexDigiOK[i0Dee] == 1 ){fStexNbOfTreatedEvents[i0Dee]++;}
-			      if( fStexNbOfTreatedEvents[i0Dee] >= 1 &&
-				  fStexNbOfTreatedEvents[i0Dee] <= fReqNbOfEvts )
-				{cOKForTreatment = kTRUE;}
-			    }
-
-			  if( cOKForTreatment== kTRUE )
-			    {
-			      //......................................... date of first event (in real time)
-			      edm::Timestamp Time = iEvent.time();
-			      edm::TimeValue_t t_current_ev_time = (cond::Time_t)Time.value();
-			      time_t         i_current_ev_time = (time_t)(t_current_ev_time>>32);
-			      const time_t*  p_current_ev_time = &i_current_ev_time;
-			      char*          astime            = ctime(p_current_ev_time);
-
-			      if( ( !(fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" ||
-				      fAnalysisName == "AdcPhys"  || fAnalysisName == "AdcAny" ) &&
-				    fStexDigiOK[i0Dee] == 1 &&
-				    fStexNbOfTreatedEvents[i0Dee] == 1 ) ||
-				  (  (fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" ||
-				      fAnalysisName == "AdcPhys"  || fAnalysisName == "AdcAny" ) && 
-				     fFedDigiOK[fESFromFedTcc[fFedTcc-1]-1] == 1 &&
-				     fStexNbOfTreatedEvents[i0Dee] == 1 &&
-				     fMemoDateFirstEvent[i0Dee] == 0 ) )
-				{
-				  fTimeFirst[i0Dee] = i_current_ev_time;
-				  fDateFirst[i0Dee] = astime;
-				  fTimeLast[i0Dee]  = i_current_ev_time;
-				  fDateLast[i0Dee]  = astime;
-				  std::cout << "----- beginning of analysis for " << fStexName << i0Dee+1 << "-------"  << std::endl
-				    //<< " t_current_ev_time = " << t_current_ev_time  << std::endl
-				    //<< " i_current_ev_time = " << i_current_ev_time  << std::endl
-				    //<< " p_current_ev_time = " << p_current_ev_time  << std::endl
-					    << " First event date  = " << astime << std::endl
-					    << " Nb of selected evts = " << fNbOfSelectedEvents << std::endl
-					    << "---------------------------------------------------------------"  << std::endl;
-				  fMemoDateFirstEvent[i0Dee]++;
-				}
-
-			      if( i_current_ev_time < fTimeFirst[i0Dee] )
-				{ fTimeFirst[i0Dee] = i_current_ev_time; fDateFirst[i0Dee] = astime;}
-			      if( i_current_ev_time > fTimeLast[i0Dee] )
-				{ fTimeLast[i0Dee] = i_current_ev_time; fDateLast[i0Dee] = astime;}
-			      
-			      //=============================================> cut on i0Dee value
-			      if( (fStexNumber > 0 && i0Dee == fStexNumber-1) || (fStexNumber == 0) )
-				{
-				  TString sDir = fMyEENumbering->GetDeeDirViewedFromIP(n1DeeNumber);
-				  Int_t n1DeeSCEcna = fMyEENumbering->Get1DeeSCEcnaFrom1DeeCrys(n1DeeCrys, sDir);
-				  Int_t i0SCEcha = fMyEENumbering->Get1SCEchaFrom1DeeCrys(n1DeeCrys, sDir) - 1;
-			      
-				  Int_t NbOfSamplesFromDigis = digiItr->size();
-			      
-				  EEDataFrame df( *digiItr );
-			      
-				  if( NbOfSamplesFromDigis > 0 && NbOfSamplesFromDigis <= fMyEEEcal->MaxSampADC() )
-				    {
-				      Double_t adcDBLS = (Double_t)0;
-				      // Three 1st samples mean value for Dynamic Base Line Substraction (DBLS)
-				      if( fDynBaseLineSub == "yes" )
-					{
-					  for (Int_t i0Sample=0; i0Sample<3; i0Sample++)  
-					    {adcDBLS += (Double_t)(df.sample(i0Sample).adc());}
-					  adcDBLS /= (Double_t)3;
-					}
-				      // Loop over the samples
-				      for (Int_t i0Sample = 0; i0Sample < fNbOfSamples; i0Sample++)  
-					{
-					  Double_t adc = (Double_t)(df.sample(i0Sample).adc()) - adcDBLS;
-					  //................................................. Calls to GetSampleAdcValues
-					  if( fMyCnaEEDee[i0Dee]->GetSampleAdcValues
-					      (fStexNbOfTreatedEvents[i0Dee],n1DeeSCEcna,i0SCEcha,i0Sample,adc) == kTRUE )
-					    {
-					      fBuildEventDistribGood[i0Dee]++;
-					    }
-					  else
-					    {
-					      fBuildEventDistribBad[i0Dee]++;
-					    }
-					}
-				    }
-				  else
-				    {
-				      std::cout << "EcnaAnalyzer::analyze(...)> NbOfSamplesFromDigis out of bounds = "
-						<< NbOfSamplesFromDigis << std::endl;
-				    }
-				} // end of if( (fStexNumber > 0 && i0Dee == fStexNumber-1) || (fStexNumber == 0) )
-			    } // end of if( fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1] >= 1 &&
-			  // fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1] <= fReqNbOfEvts )
-			} // end of if( fStexStatus[i0Dee] < 2 )
-		    } // end of if( i0Dee >= 0 && i0Dee<fMaxTreatedStexCounter )
-		} // end of for (EBDigiCollection::const_iterator digiItr = digisEB->begin();
-                  //             digiItr != digisEB->end(); ++digiItr)
-
-	      // reset fStexDigiOK[i0Dee] or fFedDigiOK[i0Dee] to zero after loop on digis
-	      if( fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" ||
-		  fAnalysisName == "AdcPhys"  || fAnalysisName == "AdcAny"  )
-		{
-		  for(Int_t i0FedES=0; i0FedES<fMaxFedUnitCounter; i0FedES++)
-		    {fFedDigiOK[i0FedES] = 0;}
-		  
-		  // reset fDeeDS5Memo1 and fDeeDS5Memo2 (for Data sector 5 versus Dee number  management)
-		  fDeeDS5Memo1 = 0;
-		  fDeeDS5Memo2 = 0;
-		}
-	      else
-		{
-		  for(Int_t i0Dee=0; i0Dee<fMaxTreatedStexCounter; i0Dee++)
-		    {fStexDigiOK[i0Dee] = 0;}
-		}
-	      
-	    } // end of if( Int_t(digisEB->end()-digisEB->begin()) >= 0 &&
-	      // Int_t(digisEB->end()-digisEB->begin()) <=  Int_t(digisEB->size()) )
-
-	} // end of if( fStexName == "Dee" && fDeeIndexBegin < fDeeIndexStop )
-    }  // end of if( (fStexNumber > 0 && fNbOfTreatedStexs == 0) || (fStexNumber == 0 && fNbOfTreatedStexs < MaxNbOfStex) )
+  if (fStexName == "SM") {
+    MaxNbOfStex = fMyEBEcal->MaxSMInEB();
+  }
+  if (fStexName == "Dee") {
+    MaxNbOfStex = fMyEEEcal->MaxDeeInEE();
+  }
+
+  if ((fStexNumber > 0 && fNbOfTreatedStexs == 0) || (fStexNumber == 0 && fNbOfTreatedStexs < MaxNbOfStex)) {
+    //================================================================= Record
+    // type EB (SM)
+    if (fStexName == "SM" && fSMIndexBegin < fSMIndexStop) {
+      //......................................... Get digisEB
+      Handle<EBDigiCollection> pdigisEB;
+      const EBDigiCollection *digisEB = nullptr;
+      try {
+        iEvent.getByLabel(digiProducer_, EBdigiCollection_, pdigisEB);
+        digisEB = pdigisEB.product();
+      } catch (std::exception &ex) {
+        std::cerr << "Error! can't get the product " << EBdigiCollection_.c_str() << std::endl;
+      }
+
+      // Initialize vectors if not already done
+      if (int(digisEB->size()) > nChannels_) {
+        nChannels_ = digisEB->size();
+      }
+
+      // Int_t print_count = 0;
+      if (Int_t(digisEB->end() - digisEB->begin()) >= 0 &&
+          Int_t(digisEB->end() - digisEB->begin()) <= Int_t(digisEB->size())) {
+        //..........................................EB
+        //===============================================================================
+        //
+        //                    Loop over Ecal barrel digisEB (Xtals)
+        //
+        //===============================================================================
+
+        for (EBDigiCollection::const_iterator digiItr = digisEB->begin(); digiItr != digisEB->end(); ++digiItr) {
+          EBDetId id_crystal(digiItr->id());
+          // Int_t HashedIndex = id_crystal.hashedIndex();
+
+          Int_t i0SM = id_crystal.ism() - 1;  //   <============== GET the SM number - 1 here
+
+          if (i0SM >= 0 && i0SM < fMaxTreatedStexCounter) {
+            if (fMyCnaEBSM[i0SM] == nullptr && fStexStatus[i0SM] != 2) {
+              //=============================== Init Ecna EB
+              //===============================
+              fMyCnaEBSM[i0SM] = new TEcnaRun(fMyEcnaEBObjectManager, "EB", fNbOfSamples);
+              fMyCnaEBSM[i0SM]->GetReadyToReadData(
+                  fAnalysisName, fRunNumber, fFirstReqEvent, fLastReqEvent, fReqNbOfEvts, i0SM + 1, fRunTypeNumber);
+
+              std::cout << "*EcnaAnalyzer::analyze(...)> ********* INIT ECNA "
+                           "EB ********* "
+                        << std::endl
+                        << "                                   fAnalysisName = " << fAnalysisName << std::endl
+                        << "                                      fRunNumber = " << fRunNumber << std::endl
+                        << "                                  fFirstReqEvent = " << fFirstReqEvent << std::endl
+                        << "                                   fLastReqEvent = " << fLastReqEvent << std::endl
+                        << "                                    fReqNbOfEvts = " << fReqNbOfEvts << std::endl
+                        << "                                              SM = " << i0SM + 1 << std::endl
+                        << "                                        run type = " << runtype(fRunTypeNumber)
+                        << std::endl;
+              //============================================================================
+            }
+
+            if (fStexStatus[i0SM] < 2)  // nothing to do if status=2 reached
+            {
+              fStexDigiOK[i0SM]++;
+              if (fStexDigiOK[i0SM] == 1) {
+                fStexNbOfTreatedEvents[i0SM]++;
+              }
+
+              if (fStexNbOfTreatedEvents[i0SM] >= 1 && fStexNbOfTreatedEvents[i0SM] <= fReqNbOfEvts) {
+                //......................................... date of first event
+                //(in real time)
+                edm::Timestamp Time = iEvent.time();
+                edm::TimeValue_t t_current_ev_time = (cond::Time_t)Time.value();
+                time_t i_current_ev_time = (time_t)(t_current_ev_time >> 32);
+                const time_t *p_current_ev_time = &i_current_ev_time;
+                char *astime = ctime(p_current_ev_time);
+
+                if (fStexDigiOK[i0SM] == 1 && fStexNbOfTreatedEvents[i0SM] == 1 &&
+                    (fStexNumber == 0 || i0SM + 1 == fStexNumber)) {
+                  fTimeFirst[i0SM] = i_current_ev_time;
+                  fDateFirst[i0SM] = astime;
+                  fTimeLast[i0SM] = i_current_ev_time;
+                  fDateLast[i0SM] = astime;
+                  std::cout << "*----> beginning of analysis for " << fStexName << i0SM + 1
+                            << ". First analyzed event date : " << astime << std::endl;
+                  //      << " t_current_ev_time = " << t_current_ev_time  <<
+                  //      std::endl
+                  //      << " i_current_ev_time = " << i_current_ev_time  <<
+                  //      std::endl
+                  //      << " p_current_ev_time = " << p_current_ev_time  <<
+                  //      std::endl
+                }
+
+                if (i_current_ev_time < fTimeFirst[i0SM]) {
+                  fTimeFirst[i0SM] = i_current_ev_time;
+                  fDateFirst[i0SM] = astime;
+                }
+                if (i_current_ev_time > fTimeLast[i0SM]) {
+                  fTimeLast[i0SM] = i_current_ev_time;
+                  fDateLast[i0SM] = astime;
+                }
+
+                //=============================================> CUT on i0SM
+                // value
+                if ((fStexNumber > 0 && i0SM == fStexNumber - 1) || (fStexNumber == 0)) {
+                  Int_t iEta = id_crystal.ietaSM();  // ietaSM() : range = [1,85]
+                  Int_t iPhi = id_crystal.iphiSM();  // iphiSM() : range = [1,20]
+
+                  Int_t n1SMCrys = (iEta - 1) * (fMyEBEcal->MaxTowPhiInSM() * fMyEBEcal->MaxCrysPhiInTow()) +
+                                   iPhi;                                               // range = [1,1700]
+                  Int_t n1SMTow = fMyEBNumbering->Get1SMTowFrom1SMCrys(n1SMCrys);      // range = [1,68]
+                  Int_t i0TowEcha = fMyEBNumbering->Get0TowEchaFrom1SMCrys(n1SMCrys);  // range = [0,24]
+
+                  Int_t NbOfSamplesFromDigis = digiItr->size();
+
+                  EBDataFrame df(*digiItr);
+
+                  if (NbOfSamplesFromDigis > 0 && NbOfSamplesFromDigis <= fMyEBEcal->MaxSampADC()) {
+                    Double_t adcDBLS = (Double_t)0;
+                    // Three 1st samples mean value for Dynamic Base Line
+                    // Substraction (DBLS)
+                    if (fDynBaseLineSub == "yes") {
+                      for (Int_t i0Sample = 0; i0Sample < 3; i0Sample++) {
+                        adcDBLS += (Double_t)(df.sample(i0Sample).adc());
+                      }
+                      adcDBLS /= (Double_t)3;
+                    }
+                    // Loop over the samples
+                    for (Int_t i0Sample = 0; i0Sample < fNbOfSamples; i0Sample++) {
+                      Double_t adc = (Double_t)(df.sample(i0Sample).adc()) - adcDBLS;
+                      //................................................. Calls
+                      // to GetSampleAdcValues
+                      if (fMyCnaEBSM[i0SM]->GetSampleAdcValues(
+                              fStexNbOfTreatedEvents[i0SM], n1SMTow, i0TowEcha, i0Sample, adc) == kTRUE) {
+                        fBuildEventDistribGood[i0SM]++;
+                      } else {
+                        fBuildEventDistribBad[i0SM]++;
+                      }
+                    }
+                  } else {
+                    std::cout << "EcnaAnalyzer::analyze(...)> "
+                                 "NbOfSamplesFromDigis out of bounds = "
+                              << NbOfSamplesFromDigis << std::endl;
+                  }
+                }  // end of if( (fStexNumber > 0 && i0SM == fStexNumber-1) ||
+                   // (fStexNumber == 0) )
+              }    // end of if( fStexNbOfTreatedEvents[i0SM] >= 1 &&
+                   // fStexNbOfTreatedEvents[i0SM] <= fReqNbOfEvts )
+            }      // end of if( fStexStatus[i0SM] < 2 )
+          }        // end of if( i0SM >= 0 && i0SM<fMaxTreatedStexCounter  )
+        }          // end of for (EBDigiCollection::const_iterator digiItr =
+                   // digisEB->begin();
+                   //             digiItr != digisEB->end(); ++digiItr)
+
+        for (Int_t i0SM = 0; i0SM < fMaxTreatedStexCounter; i0SM++) {
+          fStexDigiOK[i0SM] = 0;  // reset fStexDigiOK[i0SM] after loop on digis
+        }
+
+      }  // end of if( Int_t(digisEB->end()-digisEB->begin()) >= 0 &&
+         // Int_t(digisEB->end()-digisEB->begin()) <=  Int_t(digisEB->size()) )
+    }    // end of if( fStexName == "SM" && fSMIndexBegin < fSMIndexStop )
+
+    //=============================================================== Record
+    // type EE (Dee)
+    if (fStexName == "Dee" && fDeeIndexBegin < fDeeIndexStop) {
+      //......................................... Get digisEE
+      Handle<EEDigiCollection> pdigisEE;
+      const EEDigiCollection *digisEE = nullptr;
+      try {
+        iEvent.getByLabel(digiProducer_, EEdigiCollection_, pdigisEE);
+        digisEE = pdigisEE.product();
+      } catch (std::exception &ex) {
+        std::cerr << "Error! can't get the product " << EEdigiCollection_.c_str() << std::endl;
+      }
+
+      // Initialize vectors if not already done
+      if (int(digisEE->size()) > nChannels_) {
+        nChannels_ = digisEE->size();
+      }
+
+      // Int_t print_count = 0;
+      if (Int_t(digisEE->end() - digisEE->begin()) >= 0 &&
+          Int_t(digisEE->end() - digisEE->begin()) <= Int_t(digisEE->size())) {
+        //======================================================================================
+        //
+        //                           Loop over Ecal endcap digisEE (Xtals)
+        //
+        //======================================================================================
+
+        for (EEDigiCollection::const_iterator digiItr = digisEE->begin(); digiItr != digisEE->end(); ++digiItr) {
+          EEDetId id_crystal(digiItr->id());
+
+          Int_t iX_data = id_crystal.ix();        // iX_data : range = [1,100]
+          Int_t iY_data = id_crystal.iy();        // iY_data : range = [1,100]
+          Int_t i_quad = id_crystal.iquadrant();  // iquadrant() : range = [1,4]
+          Int_t i_sgnZ = id_crystal.zside();      //     zside() : values = -1,+1
+
+          Int_t iX = iX_data;
+          Int_t iY = iY_data;  // iY : range = [1,100]
+
+          //.......... See
+          // CMSSW/DataFormats/EcalDetId/src/EEDetId.cc::ixQuadrantOne()  [ in
+          // which ix() = iX_data ]
+          if (i_quad == 1 || i_quad == 4) {
+            iX = iX_data - 50;
+          }  // iX_data : range = [51,100], iX : range = [1,50]
+          if (i_quad == 3 || i_quad == 2) {
+            iX = 51 - iX_data;
+          }  // iX_data : range = [50,1],   iX : range = [1,50]
+
+          Int_t n1DeeCrys =
+              (iX - 1) * (fMyEEEcal->MaxSCIYInDee() * fMyEEEcal->MaxCrysIYInSC()) + iY;  // n1DeeCrys: range = [1,5000]
+
+          Int_t n1DeeNumber = 0;
+          if (i_quad == 1 && i_sgnZ == 1) {
+            n1DeeNumber = 2;
+          }
+          if (i_quad == 1 && i_sgnZ == -1) {
+            n1DeeNumber = 3;
+          }
+          if (i_quad == 2 && i_sgnZ == 1) {
+            n1DeeNumber = 1;
+          }
+          if (i_quad == 2 && i_sgnZ == -1) {
+            n1DeeNumber = 4;
+          }
+          if (i_quad == 3 && i_sgnZ == 1) {
+            n1DeeNumber = 1;
+          }
+          if (i_quad == 3 && i_sgnZ == -1) {
+            n1DeeNumber = 4;
+          }
+          if (i_quad == 4 && i_sgnZ == 1) {
+            n1DeeNumber = 2;
+          }
+          if (i_quad == 4 && i_sgnZ == -1) {
+            n1DeeNumber = 3;
+          }
+
+          Int_t i0Dee = n1DeeNumber - 1;  //   <============== GET the Dee number - 1 here
+
+          if (i0Dee >= 0 && i0Dee < fMaxTreatedStexCounter) {
+            if (fMyCnaEEDee[i0Dee] == nullptr && fStexStatus[i0Dee] != 2) {
+              //=============================== Init Ecna EE
+              //===============================
+              fMyCnaEEDee[i0Dee] = new TEcnaRun(fMyEcnaEEObjectManager, "EE", fNbOfSamples);
+              fMyCnaEEDee[i0Dee]->GetReadyToReadData(
+                  fAnalysisName, fRunNumber, fFirstReqEvent, fLastReqEvent, fReqNbOfEvts, i0Dee + 1, fRunTypeNumber);
+
+              std::cout << "*EcnaAnalyzer::analyze(...)> ********* INIT ECNA "
+                           "EE ********* "
+                        << std::endl
+                        << "                                   fAnalysisName = " << fAnalysisName << std::endl
+                        << "                                      fRunNumber = " << fRunNumber << std::endl
+                        << "                                  fFirstReqEvent = " << fFirstReqEvent << std::endl
+                        << "                                   fLastReqEvent = " << fLastReqEvent << std::endl
+                        << "                                    fReqNbOfEvts = " << fReqNbOfEvts << std::endl
+                        << "                                             Dee = " << i0Dee + 1 << std::endl
+                        << "                                        run type = " << runtype(fRunTypeNumber)
+                        << std::endl;
+              //============================================================================
+            }
+
+            if (fStexStatus[i0Dee] < 2)  // nothing to do if status=2 reached
+            {
+              Bool_t cOKForTreatment = kFALSE;
+
+              if (fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" || fAnalysisName == "AdcPhys" ||
+                  fAnalysisName == "AdcAny") {
+                if (fFedTcc >= 1 && fFedTcc <= MaxSMAndDS) {
+                  fFedDigiOK[fESFromFedTcc[fFedTcc - 1] - 1]++;
+
+                  if (!(fESFromFedTcc[fFedTcc - 1] == 5 || fESFromFedTcc[fFedTcc - 1] == 14)) {
+                    if (fFedDigiOK[fESFromFedTcc[fFedTcc - 1] - 1] == 1) {
+                      fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc - 1] - 1]++;
+                    }
+                    if (fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc - 1] - 1] >= 1 &&
+                        fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc - 1] - 1] <= fReqNbOfEvts) {
+                      fStexNbOfTreatedEvents[i0Dee] = fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc - 1] - 1];
+                      cOKForTreatment = kTRUE;
+                    }
+                  }
+                  if (fESFromFedTcc[fFedTcc - 1] == 5 || fESFromFedTcc[fFedTcc - 1] == 14) {
+                    if (fFedDigiOK[fESFromFedTcc[fFedTcc - 1] - 1] == 1) {
+                      fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc - 1] - 1]++;
+                      fDeeDS5Memo1 = n1DeeNumber;
+                      fStexNbOfTreatedEvents[i0Dee] = fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc - 1] - 1];
+                    } else {
+                      if (fDeeDS5Memo2 == 0) {
+                        if (n1DeeNumber != fDeeDS5Memo1) {
+                          // change of Dee in Data sector 5
+                          fDeeDS5Memo2 = n1DeeNumber;
+                          fStexNbOfTreatedEvents[i0Dee] = fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc - 1] - 1];
+                        }
+                      }
+                    }
+                    if (fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc - 1] - 1] >= 1 &&
+                        fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc - 1] - 1] <= fReqNbOfEvts) {
+                      cOKForTreatment = kTRUE;
+                    }
+                  }
+                }  // end of if( fFedTcc >= 1 && fFedTcc <= MaxSMAndDS )
+              }    // end of if( fAnalysisName == "AdcPeg12"  || fAnalysisName ==
+                   // "AdcSPeg12" .... )
+              else {
+                fStexDigiOK[i0Dee]++;
+                if (fStexDigiOK[i0Dee] == 1) {
+                  fStexNbOfTreatedEvents[i0Dee]++;
+                }
+                if (fStexNbOfTreatedEvents[i0Dee] >= 1 && fStexNbOfTreatedEvents[i0Dee] <= fReqNbOfEvts) {
+                  cOKForTreatment = kTRUE;
+                }
+              }
+
+              if (cOKForTreatment == kTRUE) {
+                //......................................... date of first event
+                //(in real time)
+                edm::Timestamp Time = iEvent.time();
+                edm::TimeValue_t t_current_ev_time = (cond::Time_t)Time.value();
+                time_t i_current_ev_time = (time_t)(t_current_ev_time >> 32);
+                const time_t *p_current_ev_time = &i_current_ev_time;
+                char *astime = ctime(p_current_ev_time);
+
+                if ((!(fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" || fAnalysisName == "AdcPhys" ||
+                       fAnalysisName == "AdcAny") &&
+                     fStexDigiOK[i0Dee] == 1 && fStexNbOfTreatedEvents[i0Dee] == 1) ||
+                    ((fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" || fAnalysisName == "AdcPhys" ||
+                      fAnalysisName == "AdcAny") &&
+                     fFedDigiOK[fESFromFedTcc[fFedTcc - 1] - 1] == 1 && fStexNbOfTreatedEvents[i0Dee] == 1 &&
+                     fMemoDateFirstEvent[i0Dee] == 0)) {
+                  fTimeFirst[i0Dee] = i_current_ev_time;
+                  fDateFirst[i0Dee] = astime;
+                  fTimeLast[i0Dee] = i_current_ev_time;
+                  fDateLast[i0Dee] = astime;
+                  std::cout << "----- beginning of analysis for " << fStexName << i0Dee + 1 << "-------"
+                            << std::endl
+                            //<< " t_current_ev_time = " << t_current_ev_time <<
+                            // std::endl
+                            //<< " i_current_ev_time = " << i_current_ev_time <<
+                            // std::endl
+                            //<< " p_current_ev_time = " << p_current_ev_time <<
+                            // std::endl
+                            << " First event date  = " << astime << std::endl
+                            << " Nb of selected evts = " << fNbOfSelectedEvents << std::endl
+                            << "-----------------------------------------------"
+                               "----------------"
+                            << std::endl;
+                  fMemoDateFirstEvent[i0Dee]++;
+                }
+
+                if (i_current_ev_time < fTimeFirst[i0Dee]) {
+                  fTimeFirst[i0Dee] = i_current_ev_time;
+                  fDateFirst[i0Dee] = astime;
+                }
+                if (i_current_ev_time > fTimeLast[i0Dee]) {
+                  fTimeLast[i0Dee] = i_current_ev_time;
+                  fDateLast[i0Dee] = astime;
+                }
+
+                //=============================================> cut on i0Dee
+                // value
+                if ((fStexNumber > 0 && i0Dee == fStexNumber - 1) || (fStexNumber == 0)) {
+                  TString sDir = fMyEENumbering->GetDeeDirViewedFromIP(n1DeeNumber);
+                  Int_t n1DeeSCEcna = fMyEENumbering->Get1DeeSCEcnaFrom1DeeCrys(n1DeeCrys, sDir);
+                  Int_t i0SCEcha = fMyEENumbering->Get1SCEchaFrom1DeeCrys(n1DeeCrys, sDir) - 1;
+
+                  Int_t NbOfSamplesFromDigis = digiItr->size();
+
+                  EEDataFrame df(*digiItr);
+
+                  if (NbOfSamplesFromDigis > 0 && NbOfSamplesFromDigis <= fMyEEEcal->MaxSampADC()) {
+                    Double_t adcDBLS = (Double_t)0;
+                    // Three 1st samples mean value for Dynamic Base Line
+                    // Substraction (DBLS)
+                    if (fDynBaseLineSub == "yes") {
+                      for (Int_t i0Sample = 0; i0Sample < 3; i0Sample++) {
+                        adcDBLS += (Double_t)(df.sample(i0Sample).adc());
+                      }
+                      adcDBLS /= (Double_t)3;
+                    }
+                    // Loop over the samples
+                    for (Int_t i0Sample = 0; i0Sample < fNbOfSamples; i0Sample++) {
+                      Double_t adc = (Double_t)(df.sample(i0Sample).adc()) - adcDBLS;
+                      //................................................. Calls
+                      // to GetSampleAdcValues
+                      if (fMyCnaEEDee[i0Dee]->GetSampleAdcValues(
+                              fStexNbOfTreatedEvents[i0Dee], n1DeeSCEcna, i0SCEcha, i0Sample, adc) == kTRUE) {
+                        fBuildEventDistribGood[i0Dee]++;
+                      } else {
+                        fBuildEventDistribBad[i0Dee]++;
+                      }
+                    }
+                  } else {
+                    std::cout << "EcnaAnalyzer::analyze(...)> "
+                                 "NbOfSamplesFromDigis out of bounds = "
+                              << NbOfSamplesFromDigis << std::endl;
+                  }
+                }  // end of if( (fStexNumber > 0 && i0Dee == fStexNumber-1) ||
+                   // (fStexNumber == 0) )
+              }    // end of if( fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1]
+                   // >= 1 &&
+              // fFedNbOfTreatedEvents[fESFromFedTcc[fFedTcc-1]-1] <=
+              // fReqNbOfEvts )
+            }  // end of if( fStexStatus[i0Dee] < 2 )
+          }    // end of if( i0Dee >= 0 && i0Dee<fMaxTreatedStexCounter )
+        }      // end of for (EBDigiCollection::const_iterator digiItr =
+               // digisEB->begin();
+               //             digiItr != digisEB->end(); ++digiItr)
+
+        // reset fStexDigiOK[i0Dee] or fFedDigiOK[i0Dee] to zero after loop on
+        // digis
+        if (fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" || fAnalysisName == "AdcPhys" ||
+            fAnalysisName == "AdcAny") {
+          for (Int_t i0FedES = 0; i0FedES < fMaxFedUnitCounter; i0FedES++) {
+            fFedDigiOK[i0FedES] = 0;
+          }
+
+          // reset fDeeDS5Memo1 and fDeeDS5Memo2 (for Data sector 5 versus Dee
+          // number  management)
+          fDeeDS5Memo1 = 0;
+          fDeeDS5Memo2 = 0;
+        } else {
+          for (Int_t i0Dee = 0; i0Dee < fMaxTreatedStexCounter; i0Dee++) {
+            fStexDigiOK[i0Dee] = 0;
+          }
+        }
+
+      }  // end of if( Int_t(digisEB->end()-digisEB->begin()) >= 0 &&
+         // Int_t(digisEB->end()-digisEB->begin()) <=  Int_t(digisEB->size()) )
+
+    }  // end of if( fStexName == "Dee" && fDeeIndexBegin < fDeeIndexStop )
+  }    // end of if( (fStexNumber > 0 && fNbOfTreatedStexs == 0) || (fStexNumber ==
+  // 0 && fNbOfTreatedStexs < MaxNbOfStex) )
 
   //=============================================================================================
   //
@@ -1147,398 +1287,540 @@ void EcnaAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSet
   //
   //=============================================================================================
 
-  // (take into account the "Accelerating selection with FED number" section - see above -)
-  if( fStexName == "SM" ||
-      ( fStexName == "Dee" && !( fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" ||
-				 fAnalysisName == "AdcPhys"  || fAnalysisName == "AdcAny" ) )
-      )  // one FED = one SM = one Stex
-    {
-      for(Int_t i0Stex=fStexIndexBegin; i0Stex<fStexIndexStop; i0Stex++)
-	{
-	  if( fStexStatus[i0Stex] != 2 )  // do not change fStexStatus[i0Stex] if already set to 2
-	    // even if fStexNbOfTreatedEvents[i0Stex] == fReqNbOfEvts 
-	    {
-	      if( fStexNbOfTreatedEvents[i0Stex] == fReqNbOfEvts ){fStexStatus[i0Stex] = 1;}
-	      if( fStexNbOfTreatedEvents[i0Stex] >  fReqNbOfEvts ){fStexStatus[i0Stex] = 2;}
-	    }
-	}
+  // (take into account the "Accelerating selection with FED number" section -
+  // see above -)
+  if (fStexName == "SM" || (fStexName == "Dee" &&
+                            !(fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" ||
+                              fAnalysisName == "AdcPhys" || fAnalysisName == "AdcAny")))  // one FED = one SM = one Stex
+  {
+    for (Int_t i0Stex = fStexIndexBegin; i0Stex < fStexIndexStop; i0Stex++) {
+      if (fStexStatus[i0Stex] != 2)  // do not change fStexStatus[i0Stex] if already set to 2
+                                     // even if fStexNbOfTreatedEvents[i0Stex] == fReqNbOfEvts
+      {
+        if (fStexNbOfTreatedEvents[i0Stex] == fReqNbOfEvts) {
+          fStexStatus[i0Stex] = 1;
+        }
+        if (fStexNbOfTreatedEvents[i0Stex] > fReqNbOfEvts) {
+          fStexStatus[i0Stex] = 2;
+        }
+      }
     }
+  }
 
   // one FED = one Data Sector (DS or ES)
-  if( fStexName == "Dee" &&
-      ( fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" ||
-	fAnalysisName == "AdcPhys"  || fAnalysisName == "AdcAny" ) )
-    {
-      for(Int_t i0FedES=0; i0FedES<fMaxFedUnitCounter; i0FedES++)
-	{
-	  if( fFedStatus[i0FedES] != 2 )  // do not change fFedStatus[i0FedES] if already set to 2
-	    // even if fFedNbOfTreatedEvents[i0FedES] == fReqNbOfEvts 
-	    {
-	      if( fFedNbOfTreatedEvents[i0FedES] == fReqNbOfEvts )
-		{
-		  fFedStatus[i0FedES] = 1;
-		  fTreatedFedOrder++; fFedStatusOrder[i0FedES] = fTreatedFedOrder;
-		}
-	      if( fFedNbOfTreatedEvents[i0FedES] > fReqNbOfEvts ){fFedStatus[i0FedES] = 2;}
-	    }
-	}
-    
-      Int_t j0Fed = 4;
-      //..................................................... Dee 4 (DS 1,2,3,4 ; ES 1,2,3,4)
-      for( Int_t i0FedES= 0; i0FedES<= 3; i0FedES++ )
-	{if( fFedStatus[i0FedES] == 1 ){fNbOfTreatedFedsInDee[3]++; fFedStatus[i0FedES] = 2;}}
-    
-      //..................................................... Dee 3, Dee 4 (DS 5 ; ES 5)
-      j0Fed = 4;
-      if( fFedStatus[j0Fed] == 1 )
-	{fNbOfTreatedFedsInDee[3]++; fNbOfTreatedFedsInDee[2]++; fFedStatus[j0Fed] = 2;}
-    
-       //.................................................... Dee 3 (DS 6,7,8,9 ; ES 6,7,8,9)
-      for( Int_t i0FedES= 5; i0FedES<= 8; i0FedES++ )
-	{if( fFedStatus[i0FedES] == 1 ){fNbOfTreatedFedsInDee[2]++; fFedStatus[i0FedES] = 2;}}
-    
-      //..................................................... Dee 1 (DS 1,2,3,4 ; ES 10,11,12,13)
-      for( Int_t i0FedES= 9; i0FedES<=12; i0FedES++ )
-	{if( fFedStatus[i0FedES] == 1 ){fNbOfTreatedFedsInDee[0]++; fFedStatus[i0FedES] = 2;}}
-    
-      //..................................................... Dee 1, Dee 2 (DS 5 ; ES 5)
-      j0Fed = 13;
-      if( fFedStatus[j0Fed] == 1 )
-	{fNbOfTreatedFedsInDee[0]++; fNbOfTreatedFedsInDee[1]++; fFedStatus[j0Fed] = 2;}
-    
-      //..................................................... Dee 2 (DS 6,7,8,9 ; ES 15,16,17,18)
-      for( Int_t i0FedES=14; i0FedES<=17; i0FedES++ )
-	{if( fFedStatus[i0FedES] == 1 ){fNbOfTreatedFedsInDee[1]++; fFedStatus[i0FedES] = 2;}}
-    
-      //-----------------------------------------------------
-      for( Int_t i0Dee=0; i0Dee<4; i0Dee++ )
-	{
-	  if( fNbOfTreatedFedsInStex[i0Dee] >= 0 && fNbOfTreatedFedsInStex[i0Dee] < 5 )
-	    {fNbOfTreatedFedsInStex[i0Dee] = fNbOfTreatedFedsInDee[i0Dee];}
-	  if( fNbOfTreatedFedsInDee[i0Dee] == 5 )
-	    {fStexStatus[i0Dee] = 1; fNbOfTreatedFedsInDee[i0Dee] = 0;}
-	}
-    
-    } // end of if( fStexName == "Dee" &&
-      // ( fAnalysisName == "AdcPeg12"  || fAnalysisName == "AdcSPeg12" ... ) )
+  if (fStexName == "Dee" && (fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" ||
+                             fAnalysisName == "AdcPhys" || fAnalysisName == "AdcAny")) {
+    for (Int_t i0FedES = 0; i0FedES < fMaxFedUnitCounter; i0FedES++) {
+      if (fFedStatus[i0FedES] != 2)  // do not change fFedStatus[i0FedES] if already set to 2
+                                     // even if fFedNbOfTreatedEvents[i0FedES] == fReqNbOfEvts
+      {
+        if (fFedNbOfTreatedEvents[i0FedES] == fReqNbOfEvts) {
+          fFedStatus[i0FedES] = 1;
+          fTreatedFedOrder++;
+          fFedStatusOrder[i0FedES] = fTreatedFedOrder;
+        }
+        if (fFedNbOfTreatedEvents[i0FedES] > fReqNbOfEvts) {
+          fFedStatus[i0FedES] = 2;
+        }
+      }
+    }
+
+    Int_t j0Fed = 4;
+    //..................................................... Dee 4 (DS 1,2,3,4 ;
+    // ES 1,2,3,4)
+    for (Int_t i0FedES = 0; i0FedES <= 3; i0FedES++) {
+      if (fFedStatus[i0FedES] == 1) {
+        fNbOfTreatedFedsInDee[3]++;
+        fFedStatus[i0FedES] = 2;
+      }
+    }
+
+    //..................................................... Dee 3, Dee 4 (DS 5 ;
+    // ES 5)
+    j0Fed = 4;
+    if (fFedStatus[j0Fed] == 1) {
+      fNbOfTreatedFedsInDee[3]++;
+      fNbOfTreatedFedsInDee[2]++;
+      fFedStatus[j0Fed] = 2;
+    }
+
+    //.................................................... Dee 3 (DS 6,7,8,9 ;
+    // ES 6,7,8,9)
+    for (Int_t i0FedES = 5; i0FedES <= 8; i0FedES++) {
+      if (fFedStatus[i0FedES] == 1) {
+        fNbOfTreatedFedsInDee[2]++;
+        fFedStatus[i0FedES] = 2;
+      }
+    }
+
+    //..................................................... Dee 1 (DS 1,2,3,4 ;
+    // ES 10,11,12,13)
+    for (Int_t i0FedES = 9; i0FedES <= 12; i0FedES++) {
+      if (fFedStatus[i0FedES] == 1) {
+        fNbOfTreatedFedsInDee[0]++;
+        fFedStatus[i0FedES] = 2;
+      }
+    }
+
+    //..................................................... Dee 1, Dee 2 (DS 5 ;
+    // ES 5)
+    j0Fed = 13;
+    if (fFedStatus[j0Fed] == 1) {
+      fNbOfTreatedFedsInDee[0]++;
+      fNbOfTreatedFedsInDee[1]++;
+      fFedStatus[j0Fed] = 2;
+    }
+
+    //..................................................... Dee 2 (DS 6,7,8,9 ;
+    // ES 15,16,17,18)
+    for (Int_t i0FedES = 14; i0FedES <= 17; i0FedES++) {
+      if (fFedStatus[i0FedES] == 1) {
+        fNbOfTreatedFedsInDee[1]++;
+        fFedStatus[i0FedES] = 2;
+      }
+    }
+
+    //-----------------------------------------------------
+    for (Int_t i0Dee = 0; i0Dee < 4; i0Dee++) {
+      if (fNbOfTreatedFedsInStex[i0Dee] >= 0 && fNbOfTreatedFedsInStex[i0Dee] < 5) {
+        fNbOfTreatedFedsInStex[i0Dee] = fNbOfTreatedFedsInDee[i0Dee];
+      }
+      if (fNbOfTreatedFedsInDee[i0Dee] == 5) {
+        fStexStatus[i0Dee] = 1;
+        fNbOfTreatedFedsInDee[i0Dee] = 0;
+      }
+    }
+
+  }  // end of if( fStexName == "Dee" &&
+  // ( fAnalysisName == "AdcPeg12"  || fAnalysisName == "AdcSPeg12" ... ) )
 
   //----------------------------------------------------------------------------------------------
-  for(Int_t i0Stex=fStexIndexBegin; i0Stex<fStexIndexStop; i0Stex++)
-    {
-      if( fStexStatus[i0Stex] == 1 )
-	{
-	  fNbOfTreatedStexs++; // increase nb of treated Stex's only if fStexStatus[i0Stex] == 1
-	  //....................................................... date of last event
-	  //edm::Timestamp Time = iEvent.time();
-	  //edm::TimeValue_t t_current_ev_time = (cond::Time_t)Time.value();
-	  //time_t         i_current_ev_time = (time_t)(t_current_ev_time>>32);
-	  //const time_t*  p_current_ev_time = &i_current_ev_time;
-	  //char*          astime            = ctime(p_current_ev_time);
-	  //fTimeLast[i0Stex] = i_current_ev_time;
-	  //fDateLast[i0Stex] = astime;
-
-	  //if( i_current_ev_time > fTimeLast[i0Stex] )
-	  // {fTimeLast[i0Stex] = i_current_ev_time; fDateLast[i0Stex] = astime;}
-	  
-	  std::cout << "---------- End of analysis for " << fStexName << i0Stex+1 << " -----------" << std::endl;
-	  Int_t n3 = 3; CheckMsg(n3, i0Stex);
-	  // std::cout 	   << " t_current_ev_time = " << t_current_ev_time  << std::endl
-	  //<< " i_current_ev_time = " << i_current_ev_time  << std::endl
-	  //<< " p_current_ev_time = " << p_current_ev_time  << std::endl
-	  // std::cout 	    << " Last analyzed event date  = " << astime << std::endl;
-	  std::cout 	    << " Number of selected events = " << fNbOfSelectedEvents << std::endl;
-	  std::cout << std::endl << fNbOfTreatedStexs << " " << fStexName
-		    << "'s with " << fReqNbOfEvts << " events analyzed." << std::endl
-		    << "---------------------------------------------------------"  << std::endl;
-	  
-	  //================================= WRITE RESULTS FILE
-	  if( fStexName == "SM" )
-	    {
-	      if( fMyCnaEBSM[i0Stex] != nullptr )
-		{
-		  //........................................ register dates 1 and 2
-		  fMyCnaEBSM[i0Stex]->StartStopDate(fDateFirst[i0Stex], fDateLast[i0Stex]);
-		  fMyCnaEBSM[i0Stex]->StartStopTime(fTimeFirst[i0Stex], fTimeLast[i0Stex]);
-		  
-		  //........................................ Init .root file
-		  fMyCnaEBSM[i0Stex]->GetReadyToCompute();
-		  fMyCnaEBSM[i0Stex]->SampleValues();
-		  
-		  //........................................ write the sample values in .root file
-		  if( fMyCnaEBSM[i0Stex]->WriteRootFile() == kFALSE )
-		    {
-		      std::cout << "!EcnaAnalyzer::analyze> PROBLEM with write ROOT file for SM" << i0Stex+1
-				<< fTTBELL << std::endl;
-		    }
-		}
-	      // set pointer to zero in order to avoid recalculation and rewriting at the destructor level
-	      delete fMyCnaEBSM[i0Stex];  fMyCnaEBSM[i0Stex] = nullptr;
-	      std::cout << "!EcnaAnalyzer::analyze> Set memory free: delete done for SM " << i0Stex+1 << std::endl;
-	    }
-
-	  if( fStexName == "Dee" )
-	    {
-	      if( fMyCnaEEDee[i0Stex] != nullptr )
-		{
-		  //........................................ register dates 1 and 2
-		  fMyCnaEEDee[i0Stex]->StartStopDate(fDateFirst[i0Stex], fDateLast[i0Stex]);
-		  fMyCnaEEDee[i0Stex]->StartStopTime(fTimeFirst[i0Stex], fTimeLast[i0Stex]);
-		  
-		  //........................................ Init .root file
-		  fMyCnaEEDee[i0Stex]->GetReadyToCompute();
-		  fMyCnaEEDee[i0Stex]->SampleValues();
-
-		  //........................................ write the sample values in .root file
-		  if(fMyCnaEEDee[i0Stex]->WriteRootFile() == kFALSE )
-		    {
-		      std::cout << "!EcnaAnalyzer::analyze> PROBLEM with write ROOT file for Dee" << i0Stex+1
-				<< fTTBELL << std::endl;
-		    }
-		}
-	      // set pointer to zero in order to avoid recalculation and rewriting at the destructor level
-	      delete fMyCnaEEDee[i0Stex]; fMyCnaEEDee[i0Stex] = nullptr;
-	      std::cout << "!EcnaAnalyzer::analyze> Set memory free: delete done for Dee " << i0Stex+1 << std::endl;
-	    }
-
-	  fStexStatus[i0Stex] = 2;        // set fStexStatus[i0Stex] to 2 definitively
-	  std::cout << "*---------------------------------------------------------------------------- " << std::endl;
-
-	} // end of if( fStexStatus[i0Stex] == 1 )
-    } // end of for(Int_t i0Stex=fStexIndexBegin; i0Stex<fStexIndexStop; i0Stex++)
+  for (Int_t i0Stex = fStexIndexBegin; i0Stex < fStexIndexStop; i0Stex++) {
+    if (fStexStatus[i0Stex] == 1) {
+      fNbOfTreatedStexs++;  // increase nb of treated Stex's only if
+                            // fStexStatus[i0Stex] == 1
+      //....................................................... date of last
+      // event edm::Timestamp Time = iEvent.time(); edm::TimeValue_t
+      // t_current_ev_time = (cond::Time_t)Time.value(); time_t
+      // i_current_ev_time = (time_t)(t_current_ev_time>>32); const time_t*
+      // p_current_ev_time = &i_current_ev_time; char*          astime =
+      // ctime(p_current_ev_time); fTimeLast[i0Stex] = i_current_ev_time;
+      // fDateLast[i0Stex] = astime;
+
+      // if( i_current_ev_time > fTimeLast[i0Stex] )
+      // {fTimeLast[i0Stex] = i_current_ev_time; fDateLast[i0Stex] = astime;}
+
+      std::cout << "---------- End of analysis for " << fStexName << i0Stex + 1 << " -----------" << std::endl;
+      Int_t n3 = 3;
+      CheckMsg(n3, i0Stex);
+      // std::cout 	   << " t_current_ev_time = " << t_current_ev_time  <<
+      // std::endl
+      //<< " i_current_ev_time = " << i_current_ev_time  << std::endl
+      //<< " p_current_ev_time = " << p_current_ev_time  << std::endl
+      // std::cout 	    << " Last analyzed event date  = " << astime <<
+      // std::endl;
+      std::cout << " Number of selected events = " << fNbOfSelectedEvents << std::endl;
+      std::cout << std::endl
+                << fNbOfTreatedStexs << " " << fStexName << "'s with " << fReqNbOfEvts << " events analyzed."
+                << std::endl
+                << "---------------------------------------------------------" << std::endl;
+
+      //================================= WRITE RESULTS FILE
+      if (fStexName == "SM") {
+        if (fMyCnaEBSM[i0Stex] != nullptr) {
+          //........................................ register dates 1 and 2
+          fMyCnaEBSM[i0Stex]->StartStopDate(fDateFirst[i0Stex], fDateLast[i0Stex]);
+          fMyCnaEBSM[i0Stex]->StartStopTime(fTimeFirst[i0Stex], fTimeLast[i0Stex]);
+
+          //........................................ Init .root file
+          fMyCnaEBSM[i0Stex]->GetReadyToCompute();
+          fMyCnaEBSM[i0Stex]->SampleValues();
+
+          //........................................ write the sample values in
+          //.root file
+          if (fMyCnaEBSM[i0Stex]->WriteRootFile() == kFALSE) {
+            std::cout << "!EcnaAnalyzer::analyze> PROBLEM with write ROOT file for SM" << i0Stex + 1 << fTTBELL
+                      << std::endl;
+          }
+        }
+        // set pointer to zero in order to avoid recalculation and rewriting at
+        // the destructor level
+        delete fMyCnaEBSM[i0Stex];
+        fMyCnaEBSM[i0Stex] = nullptr;
+        std::cout << "!EcnaAnalyzer::analyze> Set memory free: delete done for SM " << i0Stex + 1 << std::endl;
+      }
+
+      if (fStexName == "Dee") {
+        if (fMyCnaEEDee[i0Stex] != nullptr) {
+          //........................................ register dates 1 and 2
+          fMyCnaEEDee[i0Stex]->StartStopDate(fDateFirst[i0Stex], fDateLast[i0Stex]);
+          fMyCnaEEDee[i0Stex]->StartStopTime(fTimeFirst[i0Stex], fTimeLast[i0Stex]);
+
+          //........................................ Init .root file
+          fMyCnaEEDee[i0Stex]->GetReadyToCompute();
+          fMyCnaEEDee[i0Stex]->SampleValues();
+
+          //........................................ write the sample values in
+          //.root file
+          if (fMyCnaEEDee[i0Stex]->WriteRootFile() == kFALSE) {
+            std::cout << "!EcnaAnalyzer::analyze> PROBLEM with write ROOT file "
+                         "for Dee"
+                      << i0Stex + 1 << fTTBELL << std::endl;
+          }
+        }
+        // set pointer to zero in order to avoid recalculation and rewriting at
+        // the destructor level
+        delete fMyCnaEEDee[i0Stex];
+        fMyCnaEEDee[i0Stex] = nullptr;
+        std::cout << "!EcnaAnalyzer::analyze> Set memory free: delete done for Dee " << i0Stex + 1 << std::endl;
+      }
+
+      fStexStatus[i0Stex] = 2;  // set fStexStatus[i0Stex] to 2 definitively
+      std::cout << "*----------------------------------------------------------"
+                   "------------------ "
+                << std::endl;
+
+    }  // end of if( fStexStatus[i0Stex] == 1 )
+  }    // end of for(Int_t i0Stex=fStexIndexBegin; i0Stex<fStexIndexStop; i0Stex++)
 }
 // end of EcnaAnalyzer::analyse(...)
 
-Bool_t EcnaAnalyzer::AnalysisOutcome(const TString& s_opt)
-{
+Bool_t EcnaAnalyzer::AnalysisOutcome(const TString &s_opt) {
   //---- STOP if end of analysis
 
   Bool_t result = kFALSE;
 
-  if( s_opt == "EVT" )
-    {
-      Int_t MaxNbOfStex = 0;
-      if( fStexName == "SM"  ){MaxNbOfStex = fMyEBEcal->MaxSMInEB();}
-      if( fStexName == "Dee" ){MaxNbOfStex = fMyEEEcal->MaxDeeInEE();}
-
-      if( ( (fStexNumber > 0 && fNbOfTreatedStexs == 1) ||
-	    (fStexNumber == 0 && fNbOfTreatedStexs == MaxNbOfStex) ) &&
-	  ( (fLastReqEvent < fFirstReqEvent) ||
-	    (fLastReqEvent >= fFirstReqEvent && fCurrentEventNumber <= fLastReqEvent) )
-	  )
-	{
-	  std::cout << std::endl
-		    << "**************************** ANALYSIS REPORT > OK **************************************" << std::endl
-		    << "*EcnaAnalyzer::AnalysisOutcome(...)> The maximum requested number of events and the maximum" << std::endl
-		    << "                                     number of treated " << fStexName
-		    << "'s have been reached." << std::endl
-		    << "                                     Analysis successfully ended from EcnaAnalyzer " << std::endl
-		    << "                                     by SIGNAL: kill(getpid(),SIGUSR2)." << std::endl
-		    << "                                     Number of selected events   = " << fNbOfSelectedEvents << std::endl
-		    << "                                     Last requested event number = " << fLastReqEvent << std::endl
-		    << "                                     Current event number        = " << fCurrentEventNumber << std::endl;
-
-	  Int_t n0 = 0; CheckMsg(n0);
-
-	  std::cout << "****************************************************************************************" << std::endl
-		    << std::endl;
-
-	  result = kTRUE;
-	  kill(getpid(),SIGUSR2);
-	}
-
-      if( fLastReqEvent >= fFirstReqEvent && fCurrentEventNumber > fLastReqEvent &&
-	  ! ( (fStexNumber > 0 && fNbOfTreatedStexs == 1) ||
-	      (fStexNumber == 0 && fNbOfTreatedStexs == MaxNbOfStex) ) )
-	{
-	  std::cout << std::endl
-		    << "**************************** ANALYSIS REPORT >>> *** WARNING *** WARNING *** WARNING ***" << std::endl
-		    << "*EcnaAnalyzer::AnalysisOutcome(...)> Last event reached before completion of analysis." << std::endl
-		    << "                                     Analysis ended from EcnaAnalyzer " << std::endl
-		    << "                                     by SIGNAL: kill(getpid(),SIGUSR2)." << std::endl
-		    << "                                     Number of selected events   = " << fNbOfSelectedEvents << std::endl
-		    << "                                     Last requested event number = " << fLastReqEvent << std::endl
-		    << "                                     Current event number        = " << fCurrentEventNumber << std::endl;
-
-	  Int_t n0 = 0; CheckMsg(n0);
-
-	  std::cout << "****************************************************************************************" << std::endl
-		    << std::endl;
-      
-	  result = kTRUE;
-	  kill(getpid(),SIGUSR2);
-	}
+  if (s_opt == "EVT") {
+    Int_t MaxNbOfStex = 0;
+    if (fStexName == "SM") {
+      MaxNbOfStex = fMyEBEcal->MaxSMInEB();
     }
-  else
-    {
-      if( s_opt == "ERR_FNEG" )
-	{
-	  std::cout << std::endl
-		    << "**************************** ANALYSIS REPORT >>> **** ERROR **** ERROR **** ERROR ******" << std::endl
-		    << "*EcnaAnalyzer::AnalysisOutcome(...)> First event number = " << fFirstReqEvent
-		    << ". Should be strictly potitive." << std::endl
-		    << "                             Analysis ended from EcnaAnalyzer " << std::endl
-		    << "                             by SIGNAL: kill(getpid(),SIGUSR2)." << std::endl;
-
-	  std::cout << "****************************************************************************************" << std::endl
-		    << std::endl;
-
-	  result = kTRUE;
-	  kill(getpid(),SIGUSR2);
-	}
-      if( s_opt == "ERR_LREQ" )
-	{
-	  std::cout << std::endl
-		    << "**************************** ANALYSIS REPORT >>> **** ERROR **** ERROR **** ERROR ******" << std::endl
-		    << "*EcnaAnalyzer::analyze(...)> Requested number of events = " << fReqNbOfEvts << "." << std::endl
-		    << "                             Too large compared to the event range: "
-		    << fFirstReqEvent << " - " << fLastReqEvent << std::endl
-		    << "                             Analysis ended from EcnaAnalyzer " << std::endl
-		    << "                             by SIGNAL: kill(getpid(),SIGUSR2)." << std::endl;
-
-	  std::cout << "****************************************************************************************" << std::endl
-		    << std::endl;
-
-	  result = kTRUE;
-	  kill(getpid(),SIGUSR2);
-	}
+    if (fStexName == "Dee") {
+      MaxNbOfStex = fMyEEEcal->MaxDeeInEE();
     }
+
+    if (((fStexNumber > 0 && fNbOfTreatedStexs == 1) || (fStexNumber == 0 && fNbOfTreatedStexs == MaxNbOfStex)) &&
+        ((fLastReqEvent < fFirstReqEvent) ||
+         (fLastReqEvent >= fFirstReqEvent && fCurrentEventNumber <= fLastReqEvent))) {
+      std::cout << std::endl
+                << "**************************** ANALYSIS REPORT > OK "
+                   "**************************************"
+                << std::endl
+                << "*EcnaAnalyzer::AnalysisOutcome(...)> The maximum requested "
+                   "number of events and the maximum"
+                << std::endl
+                << "                                     number of treated " << fStexName << "'s have been reached."
+                << std::endl
+                << "                                     Analysis successfully "
+                   "ended from EcnaAnalyzer "
+                << std::endl
+                << "                                     by SIGNAL: "
+                   "kill(getpid(),SIGUSR2)."
+                << std::endl
+                << "                                     Number of selected "
+                   "events   = "
+                << fNbOfSelectedEvents << std::endl
+                << "                                     Last requested event "
+                   "number = "
+                << fLastReqEvent << std::endl
+                << "                                     Current event number  "
+                   "      = "
+                << fCurrentEventNumber << std::endl;
+
+      Int_t n0 = 0;
+      CheckMsg(n0);
+
+      std::cout << "***********************************************************"
+                   "*****************************"
+                << std::endl
+                << std::endl;
+
+      result = kTRUE;
+      kill(getpid(), SIGUSR2);
+    }
+
+    if (fLastReqEvent >= fFirstReqEvent && fCurrentEventNumber > fLastReqEvent &&
+        !((fStexNumber > 0 && fNbOfTreatedStexs == 1) || (fStexNumber == 0 && fNbOfTreatedStexs == MaxNbOfStex))) {
+      std::cout << std::endl
+                << "**************************** ANALYSIS REPORT >>> *** "
+                   "WARNING *** WARNING *** WARNING ***"
+                << std::endl
+                << "*EcnaAnalyzer::AnalysisOutcome(...)> Last event reached "
+                   "before completion of analysis."
+                << std::endl
+                << "                                     Analysis ended from "
+                   "EcnaAnalyzer "
+                << std::endl
+                << "                                     by SIGNAL: "
+                   "kill(getpid(),SIGUSR2)."
+                << std::endl
+                << "                                     Number of selected "
+                   "events   = "
+                << fNbOfSelectedEvents << std::endl
+                << "                                     Last requested event "
+                   "number = "
+                << fLastReqEvent << std::endl
+                << "                                     Current event number  "
+                   "      = "
+                << fCurrentEventNumber << std::endl;
+
+      Int_t n0 = 0;
+      CheckMsg(n0);
+
+      std::cout << "***********************************************************"
+                   "*****************************"
+                << std::endl
+                << std::endl;
+
+      result = kTRUE;
+      kill(getpid(), SIGUSR2);
+    }
+  } else {
+    if (s_opt == "ERR_FNEG") {
+      std::cout << std::endl
+                << "**************************** ANALYSIS REPORT >>> **** ERROR **** "
+                   "ERROR **** ERROR ******"
+                << std::endl
+                << "*EcnaAnalyzer::AnalysisOutcome(...)> First event number = " << fFirstReqEvent
+                << ". Should be strictly potitive." << std::endl
+                << "                             Analysis ended from EcnaAnalyzer " << std::endl
+                << "                             by SIGNAL: kill(getpid(),SIGUSR2)." << std::endl;
+
+      std::cout << "***********************************************************"
+                   "*****************************"
+                << std::endl
+                << std::endl;
+
+      result = kTRUE;
+      kill(getpid(), SIGUSR2);
+    }
+    if (s_opt == "ERR_LREQ") {
+      std::cout << std::endl
+                << "**************************** ANALYSIS REPORT >>> **** ERROR **** "
+                   "ERROR **** ERROR ******"
+                << std::endl
+                << "*EcnaAnalyzer::analyze(...)> Requested number of events = " << fReqNbOfEvts << "." << std::endl
+                << "                             Too large compared to the event "
+                   "range: "
+                << fFirstReqEvent << " - " << fLastReqEvent << std::endl
+                << "                             Analysis ended from EcnaAnalyzer " << std::endl
+                << "                             by SIGNAL: kill(getpid(),SIGUSR2)." << std::endl;
+
+      std::cout << "***********************************************************"
+                   "*****************************"
+                << std::endl
+                << std::endl;
+
+      result = kTRUE;
+      kill(getpid(), SIGUSR2);
+    }
+  }
   return result;
-} // end of EcnaAnalyzer::AnalysisOutcome(const Int_t& n_option)
+}  // end of EcnaAnalyzer::AnalysisOutcome(const Int_t& n_option)
 
-void EcnaAnalyzer::CheckMsg(const Int_t& MsgNum)
-{Int_t nm1 = -1; CheckMsg(MsgNum, nm1);}
+void EcnaAnalyzer::CheckMsg(const Int_t &MsgNum) {
+  Int_t nm1 = -1;
+  CheckMsg(MsgNum, nm1);
+}
 
-void EcnaAnalyzer::CheckMsg(const Int_t& MsgNum, const Int_t& i0Stex)
-{
+void EcnaAnalyzer::CheckMsg(const Int_t &MsgNum, const Int_t &i0Stex) {
   //------ Cross-check messages
 
-  if( MsgNum == 1 )
-    {std::cout << "---------------- CROSS-CHECK A ------------------ " << std::endl
-	       << "**************** CURRENT EVENT ****************** " << std::endl;}
-  if( MsgNum == 2 )
-    {std::cout << "---------------- CROSS-CHECK B ------------------ " << std::endl
-	       << "**** FIRST EVENT PASSING USER'S ANALYSIS CUT **** " << std::endl;}
-  if( MsgNum == 3 )
-    {std::cout << "---------------- CROSS-CHECK C ------------------ " << std::endl
-	       << "*** CURRENT VALUES BEFORE RESULT FILE WRITING *** " << std::endl;}
-  if( MsgNum == 3 || MsgNum == 4 )
-    {std::cout << "          fRecNumber = " << fRecNumber << std::endl
-	       << "          fEvtNumber = " << fEvtNumber << std::endl;}
-  
+  if (MsgNum == 1) {
+    std::cout << "---------------- CROSS-CHECK A ------------------ " << std::endl
+              << "**************** CURRENT EVENT ****************** " << std::endl;
+  }
+  if (MsgNum == 2) {
+    std::cout << "---------------- CROSS-CHECK B ------------------ " << std::endl
+              << "**** FIRST EVENT PASSING USER'S ANALYSIS CUT **** " << std::endl;
+  }
+  if (MsgNum == 3) {
+    std::cout << "---------------- CROSS-CHECK C ------------------ " << std::endl
+              << "*** CURRENT VALUES BEFORE RESULT FILE WRITING *** " << std::endl;
+  }
+  if (MsgNum == 3 || MsgNum == 4) {
+    std::cout << "          fRecNumber = " << fRecNumber << std::endl
+              << "          fEvtNumber = " << fEvtNumber << std::endl;
+  }
+
   std::cout << " fCurrentEventNumber = " << fCurrentEventNumber << std::endl
-	    << " fNbOfSelectedEvents = " << fNbOfSelectedEvents << std::endl
-	    << "          fRunNumber = " << fRunNumber << std::endl
-	    << "     Chozen run type = " << runtype(fChozenRunTypeNumber) << std::endl
-	    << "            Run type = " << runtype(fRunTypeNumber) << std::endl
-	    << "             fFedTcc = " << fFedTcc << std::endl
-	    << "        fFedId(+601) = " << fFedId+601 << std::endl
-	    << "           fStexName = " << fStexName << std::endl
-	    << "         Chozen gain = " << gainvalue(fChozenGainNumber) << std::endl 
-	    << "           Mgpa Gain = " << gainvalue(fMgpaGainNumber) << std::endl << std::endl;
-	  
-  if( fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" ||
-      fAnalysisName == "AdcPhys"  || fAnalysisName == "AdcAny" )
-    {
-      if( fStexName == "SM" )
-	{
-	  for(Int_t j0Stex=fStexIndexBegin; j0Stex<fStexIndexStop; j0Stex++)
-	    {
-	      Int_t nStexNbOfTreatedEvents = fStexNbOfTreatedEvents[j0Stex];
-	      if( fStexStatus[j0Stex] == 1 ){nStexNbOfTreatedEvents = fStexNbOfTreatedEvents[j0Stex];}
-	      if( fStexStatus[j0Stex] == 2 ){nStexNbOfTreatedEvents = fStexNbOfTreatedEvents[j0Stex];}
-	      
-	      std::cout << fStexName << std::setw(3) << j0Stex+1 << ": "
-			<< std::setw(5) << nStexNbOfTreatedEvents << " events. "
-			<< fStexName << " status: " << fStexStatus[j0Stex];
-	      if( j0Stex == i0Stex ){std::cout << " (going to write file for this " << fStexName << ").";}
-	      std::cout << std::endl; 
-	    }
-	}
-
-      if( fStexName == "Dee" )
-	{
-	  for(Int_t i0FedES=0; i0FedES<fMaxFedUnitCounter; i0FedES++)
-	    {
-	      Int_t nFedNbOfTreatedEvents = fFedNbOfTreatedEvents[i0FedES];
-	      if( fFedStatus[i0FedES] == 1 ){nFedNbOfTreatedEvents = fFedNbOfTreatedEvents[i0FedES];}
-	      if( fFedStatus[i0FedES] == 2 ){nFedNbOfTreatedEvents = fFedNbOfTreatedEvents[i0FedES];}
-	      
-	      std::cout << "Fed (ES) " << std::setw(3) << i0FedES+1 << ": "
-			<< std::setw(5) << nFedNbOfTreatedEvents << " events."
-			<< " Fed status: " << fFedStatus[i0FedES]
-			<< ", order: " << std::setw(3) << fFedStatusOrder[i0FedES]
-			<< " (" << fDeeNumberString[i0FedES] << ")" << std::endl;
-	    }
-	  
-	  for(Int_t j0Stex=fStexIndexBegin; j0Stex<fStexIndexStop; j0Stex++)
-	    {
-	      std::cout << fStexName << std::setw(3) << j0Stex+1 << ": "
-			<< std::setw(5) << fNbOfTreatedFedsInStex[j0Stex] << " analyzed Fed(s). "
-			<< fStexName << " status: " << fStexStatus[j0Stex];
-	      if( j0Stex == i0Stex ){std::cout << " (going to write file for this " << fStexName << ").";}
-	      std::cout << std::endl; 
-	    }
-	}
-
-      std::cout << "Number of " << fStexName << "'s with "
-		<< fReqNbOfEvts << " events analyzed: " << fNbOfTreatedStexs << std::endl;
+            << " fNbOfSelectedEvents = " << fNbOfSelectedEvents << std::endl
+            << "          fRunNumber = " << fRunNumber << std::endl
+            << "     Chozen run type = " << runtype(fChozenRunTypeNumber) << std::endl
+            << "            Run type = " << runtype(fRunTypeNumber) << std::endl
+            << "             fFedTcc = " << fFedTcc << std::endl
+            << "        fFedId(+601) = " << fFedId + 601 << std::endl
+            << "           fStexName = " << fStexName << std::endl
+            << "         Chozen gain = " << gainvalue(fChozenGainNumber) << std::endl
+            << "           Mgpa Gain = " << gainvalue(fMgpaGainNumber) << std::endl
+            << std::endl;
+
+  if (fAnalysisName == "AdcPeg12" || fAnalysisName == "AdcSPeg12" || fAnalysisName == "AdcPhys" ||
+      fAnalysisName == "AdcAny") {
+    if (fStexName == "SM") {
+      for (Int_t j0Stex = fStexIndexBegin; j0Stex < fStexIndexStop; j0Stex++) {
+        Int_t nStexNbOfTreatedEvents = fStexNbOfTreatedEvents[j0Stex];
+        if (fStexStatus[j0Stex] == 1) {
+          nStexNbOfTreatedEvents = fStexNbOfTreatedEvents[j0Stex];
+        }
+        if (fStexStatus[j0Stex] == 2) {
+          nStexNbOfTreatedEvents = fStexNbOfTreatedEvents[j0Stex];
+        }
+
+        std::cout << fStexName << std::setw(3) << j0Stex + 1 << ": " << std::setw(5) << nStexNbOfTreatedEvents
+                  << " events. " << fStexName << " status: " << fStexStatus[j0Stex];
+        if (j0Stex == i0Stex) {
+          std::cout << " (going to write file for this " << fStexName << ").";
+        }
+        std::cout << std::endl;
+      }
     }
-  
-  if( MsgNum == 1 || MsgNum == 2 )
-    {std::cout << "*---------------------------------------------------------------------------- " << std::endl;}
-  if( MsgNum == 3 )
-    {std::cout << "*............................................................................ " << std::endl;}
 
-} // end of EcnaAnalyzer::CheckMsg(const Int_t& MsgNum, const Int_t& i0Stex)
+    if (fStexName == "Dee") {
+      for (Int_t i0FedES = 0; i0FedES < fMaxFedUnitCounter; i0FedES++) {
+        Int_t nFedNbOfTreatedEvents = fFedNbOfTreatedEvents[i0FedES];
+        if (fFedStatus[i0FedES] == 1) {
+          nFedNbOfTreatedEvents = fFedNbOfTreatedEvents[i0FedES];
+        }
+        if (fFedStatus[i0FedES] == 2) {
+          nFedNbOfTreatedEvents = fFedNbOfTreatedEvents[i0FedES];
+        }
+
+        std::cout << "Fed (ES) " << std::setw(3) << i0FedES + 1 << ": " << std::setw(5) << nFedNbOfTreatedEvents
+                  << " events."
+                  << " Fed status: " << fFedStatus[i0FedES] << ", order: " << std::setw(3) << fFedStatusOrder[i0FedES]
+                  << " (" << fDeeNumberString[i0FedES] << ")" << std::endl;
+      }
+
+      for (Int_t j0Stex = fStexIndexBegin; j0Stex < fStexIndexStop; j0Stex++) {
+        std::cout << fStexName << std::setw(3) << j0Stex + 1 << ": " << std::setw(5) << fNbOfTreatedFedsInStex[j0Stex]
+                  << " analyzed Fed(s). " << fStexName << " status: " << fStexStatus[j0Stex];
+        if (j0Stex == i0Stex) {
+          std::cout << " (going to write file for this " << fStexName << ").";
+        }
+        std::cout << std::endl;
+      }
+    }
+
+    std::cout << "Number of " << fStexName << "'s with " << fReqNbOfEvts << " events analyzed: " << fNbOfTreatedStexs
+              << std::endl;
+  }
+
+  if (MsgNum == 1 || MsgNum == 2) {
+    std::cout << "*------------------------------------------------------------"
+                 "---------------- "
+              << std::endl;
+  }
+  if (MsgNum == 3) {
+    std::cout << "*............................................................"
+                 "................ "
+              << std::endl;
+  }
+
+}  // end of EcnaAnalyzer::CheckMsg(const Int_t& MsgNum, const Int_t& i0Stex)
 
-TString EcnaAnalyzer::runtype(const Int_t& numtype)
-{
+TString EcnaAnalyzer::runtype(const Int_t &numtype) {
   TString cType = "?";
 
-  if( numtype ==  0 ){cType = "COSMICS";}
-  if( numtype ==  1 ){cType = "BEAMH4";}
-  if( numtype ==  2 ){cType = "BEAMH2";}
-  if( numtype ==  3 ){cType = "MTCC";}
-  if( numtype ==  4 ){cType = "LASER_STD";}
-  if( numtype ==  5 ){cType = "LASER_POWER_SCAN";}
-  if( numtype ==  6 ){cType = "LASER_DELAY_SCAN";}
-  if( numtype ==  7 ){cType = "TESTPULSE_SCAN_MEM";}
-  if( numtype ==  8 ){cType = "TESTPULSE_MGPA";}
-  if( numtype ==  9 ){cType = "PEDESTAL_STD";}
-  if( numtype == 10 ){cType = "PEDESTAL_OFFSET_SCAN";}
-  if( numtype == 11 ){cType = "PEDESTAL_25NS_SCAN";}
-  if( numtype == 12 ){cType = "LED_STD";}
-
-  if( numtype == 13 ){cType = "PHYSICS_GLOBAL";}
-  if( numtype == 14 ){cType = "COSMICS_GLOBAL";}
-  if( numtype == 15 ){cType = "HALO_GLOBAL";}
-
-  if( numtype == 16 ){cType = "LASER_GAP";}
-  if( numtype == 17 ){cType = "TESTPULSE_GAP";}
-  if( numtype == 18 ){cType = "PEDESTAL_GAP";}
-  if( numtype == 19 ){cType = "LED_GAP";}
-
-  if( numtype == 20 ){cType = "PHYSICS_LOCAL";}
-  if( numtype == 21 ){cType = "COSMICS_LOCAL";}
-  if( numtype == 22 ){cType = "HALO_LOCAL";}
-  if( numtype == 23 ){cType = "CALIB_LOCAL";}
+  if (numtype == 0) {
+    cType = "COSMICS";
+  }
+  if (numtype == 1) {
+    cType = "BEAMH4";
+  }
+  if (numtype == 2) {
+    cType = "BEAMH2";
+  }
+  if (numtype == 3) {
+    cType = "MTCC";
+  }
+  if (numtype == 4) {
+    cType = "LASER_STD";
+  }
+  if (numtype == 5) {
+    cType = "LASER_POWER_SCAN";
+  }
+  if (numtype == 6) {
+    cType = "LASER_DELAY_SCAN";
+  }
+  if (numtype == 7) {
+    cType = "TESTPULSE_SCAN_MEM";
+  }
+  if (numtype == 8) {
+    cType = "TESTPULSE_MGPA";
+  }
+  if (numtype == 9) {
+    cType = "PEDESTAL_STD";
+  }
+  if (numtype == 10) {
+    cType = "PEDESTAL_OFFSET_SCAN";
+  }
+  if (numtype == 11) {
+    cType = "PEDESTAL_25NS_SCAN";
+  }
+  if (numtype == 12) {
+    cType = "LED_STD";
+  }
+
+  if (numtype == 13) {
+    cType = "PHYSICS_GLOBAL";
+  }
+  if (numtype == 14) {
+    cType = "COSMICS_GLOBAL";
+  }
+  if (numtype == 15) {
+    cType = "HALO_GLOBAL";
+  }
+
+  if (numtype == 16) {
+    cType = "LASER_GAP";
+  }
+  if (numtype == 17) {
+    cType = "TESTPULSE_GAP";
+  }
+  if (numtype == 18) {
+    cType = "PEDESTAL_GAP";
+  }
+  if (numtype == 19) {
+    cType = "LED_GAP";
+  }
+
+  if (numtype == 20) {
+    cType = "PHYSICS_LOCAL";
+  }
+  if (numtype == 21) {
+    cType = "COSMICS_LOCAL";
+  }
+  if (numtype == 22) {
+    cType = "HALO_LOCAL";
+  }
+  if (numtype == 23) {
+    cType = "CALIB_LOCAL";
+  }
 
   //.......................................... non-CMS types
-  if( numtype == 24 ){cType = "PEDSIM";}     // SIMULATION
-  if( numtype == 25 ){cType = "ANY_RUN";}    // ANY RUN (ALL TYPES ACCEPTED)
+  if (numtype == 24) {
+    cType = "PEDSIM";
+  }  // SIMULATION
+  if (numtype == 25) {
+    cType = "ANY_RUN";
+  }  // ANY RUN (ALL TYPES ACCEPTED)
 
   return cType;
 }
 
-Int_t EcnaAnalyzer::gainvalue(const Int_t& numgain)
-{
+Int_t EcnaAnalyzer::gainvalue(const Int_t &numgain) {
   Int_t value = 0;
 
-  if( numgain == 1 ){value = 12;}
-  if( numgain == 2 ){value =  6;}
-  if( numgain == 3 ){value =  1;}
+  if (numgain == 1) {
+    value = 12;
+  }
+  if (numgain == 2) {
+    value = 6;
+  }
+  if (numgain == 3) {
+    value = 1;
+  }
 
   return value;
 }
-
-
diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/SealModule.cc b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/SealModule.cc
index 9e56eb89395b3..219db365a4f35 100644
--- a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/SealModule.cc
+++ b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/src/SealModule.cc
@@ -1,5 +1,4 @@
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/interface/EcnaAnalyzer.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 
 DEFINE_FWK_MODULE(EcnaAnalyzer);
-
diff --git a/CalibCalorimetry/EcalLaserSorting/interface/LaserSorter.h b/CalibCalorimetry/EcalLaserSorting/interface/LaserSorter.h
index 8b4e056d72085..5a6e403e83235 100644
--- a/CalibCalorimetry/EcalLaserSorting/interface/LaserSorter.h
+++ b/CalibCalorimetry/EcalLaserSorting/interface/LaserSorter.h
@@ -44,43 +44,41 @@
 class LaserSorter : public edm::EDAnalyzer {
   //inner classes
 private:
-  struct IndexRecord{
+  struct IndexRecord {
     uint32_t orbit;
     uint32_t filePos;
     bool operator<(const IndexRecord& i) const { return orbit < i.orbit; }
   };
-  
-  class OutStreamRecord{
+
+  class OutStreamRecord {
   public:
     //default ctor
     OutStreamRecord(int fedId__,
-		    edm::LuminosityBlockNumber_t startingLumiBlock__,
-		    std::ofstream* out__,
-		    std::string& tmpFileName__,
-		    std::string& finalFileName__):
-      fedId_(fedId__),
-      startingLumiBlock_(startingLumiBlock__),
-      out_(out__),
-      tmpFileName_(tmpFileName__), finalFileName_(finalFileName__),
-      indexError_(false){
+                    edm::LuminosityBlockNumber_t startingLumiBlock__,
+                    std::ofstream* out__,
+                    std::string& tmpFileName__,
+                    std::string& finalFileName__)
+        : fedId_(fedId__),
+          startingLumiBlock_(startingLumiBlock__),
+          out_(out__),
+          tmpFileName_(tmpFileName__),
+          finalFileName_(finalFileName__),
+          indexError_(false) {
       indices_.reserve(indexReserve_);
     }
-    
+
     int fedId() const { return fedId_; }
-    edm::LuminosityBlockNumber_t startingLumiBlock() const{
-      return startingLumiBlock_; 
-    } 
+    edm::LuminosityBlockNumber_t startingLumiBlock() const { return startingLumiBlock_; }
     std::ofstream* out() const { return out_.get(); }
     std::string finalFileName() const { return finalFileName_; }
     std::string tmpFileName() const { return tmpFileName_; }
-    std::vector<IndexRecord> * indices() { return &indices_; }
- 
-    
+    std::vector<IndexRecord>* indices() { return &indices_; }
+
     /** Gets the list of orbits to skip. Used to update an existing file:
      * orbits of events already present in the file are excluded.
      * @return the list of orbits to skip.
      */
-    std::set<uint32_t>&  excludedOrbit() { return excludedOrbit_; }   
+    std::set<uint32_t>& excludedOrbit() { return excludedOrbit_; }
 
   private:
     int fedId_;
@@ -99,8 +97,8 @@ class LaserSorter : public edm::EDAnalyzer {
     /** List of orbits to skip. Used to update an existing file: orbits
      * of events already present in the file are excluded. 
      */
-    std::set<uint32_t> excludedOrbit_; 
-    
+    std::set<uint32_t> excludedOrbit_;
+
     /** Used to invalidate index table in case a problem preventing
      * indexing is encountered: in principle non unicity of the orbit id.
      */
@@ -109,19 +107,17 @@ class LaserSorter : public edm::EDAnalyzer {
     /** Initial memory allocation for index table (see vector::reserve()).
      */
     static const size_t indexReserve_;
-
   };
 
   //typedefs:
 private:
   typedef boost::ptr_list<OutStreamRecord> OutStreamList;
-  
+
   //ctors/dtors
 public:
   LaserSorter(const edm::ParameterSet&);
   ~LaserSorter() override;
 
-
   //methods
 public:
   void analyze(const edm::Event&, const edm::EventSetup&) override;
@@ -148,8 +144,7 @@ class LaserSorter : public edm::EDAnalyzer {
    * blocks, -1 is returned otherwise. If event does not contain any ECAL data
    * -2 is returned.
    */
-  int getDetailedTriggerType(const edm::Handle<FEDRawDataCollection>& rawdata,
-                             double* proba = nullptr);
+  int getDetailedTriggerType(const edm::Handle<FEDRawDataCollection>& rawdata, double* proba = nullptr);
 
   /** Closes output stream 2 lumi block older than the input 'lumiBlock' ID.
    * @param lumiBlock ID of the reference luminosity block.
@@ -160,15 +155,13 @@ class LaserSorter : public edm::EDAnalyzer {
    */
   void closeAllStreams();
 
-  
   /** Gets and eventually creates the output stream for writing the events 
    * of a given FED and luminosity block.
    * @param fedId ID of the FED the event is issued from
    * @param lumiBlock luminositu block of the event
    * @return pointer of the output stream record or null if not found.
    */
-  OutStreamRecord* getStream(int fedId,
-			     edm::LuminosityBlockNumber_t lumiBlock);
+  OutStreamRecord* getStream(int fedId, edm::LuminosityBlockNumber_t lumiBlock);
 
   /** Writes a monitoring events to an output stream.
    * @param out stream to write the event out
@@ -179,17 +172,17 @@ class LaserSorter : public edm::EDAnalyzer {
    * @return true on success, false on failure
    * @see getStream(int, edm::LuminosityBlockNumber_t)
    */
-  bool writeEvent(OutStreamRecord& out, const edm::Event& event,
-		  int detailedTriggerType,
-		  const FEDRawDataCollection& data);
-  
+  bool writeEvent(OutStreamRecord& out,
+                  const edm::Event& event,
+                  int detailedTriggerType,
+                  const FEDRawDataCollection& data);
+
   /** Writes out data of a FED
    * @param out stream to write the event out
    * @param data FED data
    * @return true on success, false on failure
    */
-  bool writeFedBlock(std::ofstream& out,
-                     const FEDRawData& data);
+  bool writeFedBlock(std::ofstream& out, const FEDRawData& data);
 
   /** Closes an output stream and removed it from opened stream records.
    * Beware: this methode modifies outStreamList_.
@@ -206,8 +199,7 @@ class LaserSorter : public edm::EDAnalyzer {
    * @return iterator to the new stream record. outStreamList_.end() in case
    * of failure.
    */
-  OutStreamList::iterator createOutStream(int fedId, 
-					  edm::LuminosityBlockNumber_t lumiBlock);
+  OutStreamList::iterator createOutStream(int fedId, edm::LuminosityBlockNumber_t lumiBlock);
 
   /** Writing file header for an LMF binary file
    * @param out stream of the output file
@@ -219,12 +211,8 @@ class LaserSorter : public edm::EDAnalyzer {
    * @param evt event
    * @return false in case of write failure
    */
-  bool writeEventHeader(std::ofstream& out,
-                        const edm::Event& evt,
-                        int fedId,
-                        unsigned nFeds);
+  bool writeEventHeader(std::ofstream& out, const edm::Event& evt, int fedId, unsigned nFeds);
 
-  
   /** Builds the file names for the group of event corresponding
    * to a FED and a starting lumi block.
    * @param fedId FED ID of the event set
@@ -232,9 +220,7 @@ class LaserSorter : public edm::EDAnalyzer {
    * @param [out] tmpName name of the file to use when filling it.
    * @param [out] finalName name of the file once completed.
    */
-  void streamFileName(int fedId, edm::LuminosityBlockNumber_t lumiBlock, 
-                      std::string& tmpName, std::string& finalName);
-
+  void streamFileName(int fedId, edm::LuminosityBlockNumber_t lumiBlock, std::string& tmpName, std::string& finalName);
 
   /** Checks if an ECAL DCC event is empty. It is considered as
    * empty if it does not contains FE data ("tower" block). So
@@ -245,16 +231,13 @@ class LaserSorter : public edm::EDAnalyzer {
    * @nTowerBlocks if not null, filled with number of tower blocks
    * @return true if event is empty, false otherwise
    */
-  bool isDccEventEmpty(const FEDRawData& data, size_t* dccLen = nullptr,
-		       int* nTowerBlocks = nullptr) const;
-  
+  bool isDccEventEmpty(const FEDRawData& data, size_t* dccLen = nullptr, int* nTowerBlocks = nullptr) const;
+
   /** Computes the list of FEDs which data must be written out.
    * @param data CMS raw event
    * @param fedIds [out] list of FEDs to keep
    */
-  void getOutputFedList(const edm::Event& event,
-                        const FEDRawDataCollection& data,
-                        std::vector<unsigned>& fedIds) const;
+  void getOutputFedList(const edm::Event& event, const FEDRawDataCollection& data, std::vector<unsigned>& fedIds) const;
 
   /** Read index table of an LMF file.
    * @param in LMF file whose index table must be read.
@@ -264,28 +247,23 @@ class LaserSorter : public edm::EDAnalyzer {
    * @param err if not nul, in case of failure filled with the error message.
    * @return true in case of success, false otherwise
    */
-  bool readIndexTable(std::ifstream& in, std::string& inName,
-                      OutStreamRecord& outRcd, std::string* err);
+  bool readIndexTable(std::ifstream& in, std::string& inName, OutStreamRecord& outRcd, std::string* err);
 
   /** Writes index table in LMF output file. stream must be positionned
    * to the place for the index table (end of file).
    * @param out stream of output file.
    * @param indices index table
    */
-  bool writeIndexTable(std::ofstream& out,
-		       std::vector<IndexRecord>& indices);
+  bool writeIndexTable(std::ofstream& out, std::vector<IndexRecord>& indices);
 
-  bool renameAsBackup(const std::string& fileName,
-                      std::string& newFileName);
-  
+  bool renameAsBackup(const std::string& fileName, std::string& newFileName);
 
   /** Gets format version of an LMF file. Position of file is preserved.
    * @param in stream to read the file
    * @param fileName name of the file. Used in error message.
    * @return version or -1 in case of error.
    */
-  int readFormatVersion(std::ifstream& in,
-                        const std::string& fileName);
+  int readFormatVersion(std::ifstream& in, const std::string& fileName);
 
   /** Help function to format a date
    */
@@ -304,7 +282,7 @@ class LaserSorter : public edm::EDAnalyzer {
    * @return FED ids.
    */
   std::vector<int> getFullyReadoutDccs(const FEDRawDataCollection& data) const;
-  
+
   //fields
 private:
   /** Lower bound of ECAL DCC FED ID
@@ -383,7 +361,7 @@ class LaserSorter : public edm::EDAnalyzer {
   /** Debugging message verbosity level
    */
   int verbosity_;
-  
+
   /** stream where list of output file is listed to
    */
   std::ofstream outputList_;
@@ -411,11 +389,9 @@ class LaserSorter : public edm::EDAnalyzer {
    */
   int iNoFullReadoutDccError_;
 
-
   /** Maximum number of "No fully readout DCC error" message in a run
    */
-  int maxFullReadoutDccError_;  
-
+  int maxFullReadoutDccError_;
 
   /** number of "ECAL DCC data" message in a run
    */
@@ -452,7 +428,7 @@ class LaserSorter : public edm::EDAnalyzer {
   /** Limit of number of events to prevent exhausting memory
    * with indexTable_ in case of file corruption.
    */
-  static const unsigned maxEvents_ = 1<<20;
+  static const unsigned maxEvents_ = 1 << 20;
 
   /** Statistics on event processing
    */
@@ -474,8 +450,7 @@ class LaserSorter : public edm::EDAnalyzer {
 
   /** Switch to recompute and overwrite the lumi block ID
    */
-  bool overWriteLumiBlockId_; 
-
+  bool overWriteLumiBlockId_;
 
   /** Length of a lumi block in number of orbits used when
    * overWriteLumiBlockId is set to true;
@@ -493,7 +468,6 @@ class LaserSorter : public edm::EDAnalyzer {
    * Calibration event time = orbitZeroTime_ + orbit_ * (89.1 microsec).
    */
   struct timeval orbitZeroTime_;
-
 };
-  
-#endif //EVENT_SELECT_H not defined
+
+#endif  //EVENT_SELECT_H not defined
diff --git a/CalibCalorimetry/EcalLaserSorting/interface/LmfSource.h b/CalibCalorimetry/EcalLaserSorting/interface/LmfSource.h
index 00bb5611802a8..cb0a43db12611 100644
--- a/CalibCalorimetry/EcalLaserSorting/interface/LmfSource.h
+++ b/CalibCalorimetry/EcalLaserSorting/interface/LmfSource.h
@@ -11,32 +11,33 @@
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 #include "DataFormats/Provenance/interface/Timestamp.h"
 
-class LmfSource: public edm::ProducerSourceBase{
+class LmfSource : public edm::ProducerSourceBase {
 private:
-  struct IndexRecord{
+  struct IndexRecord {
     uint32_t orbit;
     uint32_t filePos;
     //    bool operator<(const IndexRecord& i) const { return orbit < i.orbit; }
   };
-  
+
 public:
-  LmfSource(const edm::ParameterSet& pset,
-	       const edm::InputSourceDescription& isd);
-  ~LmfSource() override{}
-  
+  LmfSource(const edm::ParameterSet& pset, const edm::InputSourceDescription& isd);
+  ~LmfSource() override {}
+
 private:
   /** Called by the framework after setRunAndEventInfo()
    */
-  void produce(edm::Event &e) override;
+  void produce(edm::Event& e) override;
 
   /** Callback funtion to set run and event information
    * (lumi block, run number, event number, timestamp)
    * Called by the framework before produce()
    */
-  bool setRunAndEventInfo(edm::EventID& id, edm::TimeValue_t& time, edm::EventAuxiliary::ExperimentType& eType) override;
+  bool setRunAndEventInfo(edm::EventID& id,
+                          edm::TimeValue_t& time,
+                          edm::EventAuxiliary::ExperimentType& eType) override;
 
   bool openFile(int iFile);
-  
+
   bool readFileHeader();
 
   /** Read event from current opened file. Called by readEvent, which
@@ -46,14 +47,13 @@ class LmfSource: public edm::ProducerSourceBase{
    * @return true iff succeeded
    */
   bool readEventWithinFile(bool doSkip);
-  
+
   /** timeval to string conversion
    * @param t timestamp
    * @return human readable character string
    */
   std::string toString(edm::TimeValue_t& t) const;
 
-  
 private:
   /** List of names of the input files
    */
@@ -66,7 +66,7 @@ class LmfSource: public edm::ProducerSourceBase{
   /** Buffer for FED block collection
    */
   FEDRawDataCollection fedColl_;
-  
+
   /** empty fed block
    */
   FEDRawData emptyFedBlock_;
@@ -81,16 +81,15 @@ class LmfSource: public edm::ProducerSourceBase{
   std::vector<uint32_t> header_;
 
   static const unsigned fileHeaderSize;
-  
+
   /** Buffer for file header readout
    */
   std::vector<uint32_t> fileHeader_;
 
-
   /** Minimal LMF data format version supported.
    */
   static const unsigned char minDataFormatVersion_;
-  
+
   /** Maximal LMF data format version supported.
    */
   static const unsigned char maxDataFormatVersion_;
@@ -111,7 +110,7 @@ class LmfSource: public edm::ProducerSourceBase{
    * @return false in case of failure (end of file)
    */
   bool nextEventWithinFile();
-  
+
   /** Checks paths specified in fileNames_ and remove eventual
    * file: prefix.
    * @throw cms::Exception in case of a non valid path
@@ -122,14 +121,14 @@ class LmfSource: public edm::ProducerSourceBase{
    * must be called beforehand.
    */
   void readIndexTable();
-  
+
   uint64_t timeStamp_;
   uint32_t lumiBlock_;
   uint32_t runNum_;
   uint32_t bx_;
   uint32_t eventNum_;
   uint32_t orbitNum_;
-  
+
   unsigned char dataFormatVers_;
 
   std::ifstream in_;
@@ -151,7 +150,7 @@ class LmfSource: public edm::ProducerSourceBase{
   uint32_t indexTablePos_;
 
   int calibTrig_;
-  
+
   int nFeds_;
 
   /** Table with file position of each event order by event time
@@ -162,13 +161,13 @@ class LmfSource: public edm::ProducerSourceBase{
   /** Limit of number of events to prevent exhausting memory
    * with indexTable_ in case of file corruption.
    */
-  static const unsigned maxEvents_ = 1<<20;
+  static const unsigned maxEvents_ = 1 << 20;
 
   /** Limit on event size to prevent exhausting memory
    * in case of error in the event size read from file.
    */
-  static const unsigned maxEventSize_ = 1<<20; //1MB. (full DCC event is 49kB)
-  
+  static const unsigned maxEventSize_ = 1 << 20;  //1MB. (full DCC event is 49kB)
+
   /** Switch for enabling reading event in ordered using
    * event index table
    */
@@ -201,5 +200,4 @@ class LmfSource: public edm::ProducerSourceBase{
    */
   int verbosity_;
 };
-#endif //SourceModule_H not defined
-
+#endif  //SourceModule_H not defined
diff --git a/CalibCalorimetry/EcalLaserSorting/interface/WatcherSource.h b/CalibCalorimetry/EcalLaserSorting/interface/WatcherSource.h
index 4251824e77089..45cbeb8190ef7 100644
--- a/CalibCalorimetry/EcalLaserSorting/interface/WatcherSource.h
+++ b/CalibCalorimetry/EcalLaserSorting/interface/WatcherSource.h
@@ -6,6 +6,4 @@
 
 typedef edm::StreamerInputModule<WatcherStreamFileReader> WatcherSource;
 
-
-#endif //WatcherSourceModule_H not defined
-
+#endif  //WatcherSourceModule_H not defined
diff --git a/CalibCalorimetry/EcalLaserSorting/interface/WatcherStreamFileReader.h b/CalibCalorimetry/EcalLaserSorting/interface/WatcherStreamFileReader.h
index 3455e5f1bb96e..709b8cbfec531 100644
--- a/CalibCalorimetry/EcalLaserSorting/interface/WatcherStreamFileReader.h
+++ b/CalibCalorimetry/EcalLaserSorting/interface/WatcherStreamFileReader.h
@@ -19,37 +19,36 @@
  * This protection is obviously not full proof, especially to transfer lag.
  */
 
-namespace edm{
+namespace edm {
   class StreamerInputFile;
 }
 
-class WatcherStreamFileReader{
+class WatcherStreamFileReader {
 public:
   WatcherStreamFileReader(edm::ParameterSet const& pset);
   ~WatcherStreamFileReader();
 
-  const InitMsgView* getHeader(); 
+  const InitMsgView* getHeader();
   const EventMsgView* getNextEvent();
-  const bool newHeader(); 
+  const bool newHeader();
 
   edm::StreamerInputFile* getInputFile();
 
   void closeFile();
-  
+
 private:
   /** Directory to look for streamer files
    */
   std::string inputDir_;
-  
+
   /** Streamer file name pattern list
    */
-  std::vector<std::string> filePatterns_; 
+  std::vector<std::string> filePatterns_;
 
   /** Directory where file are moved during processing
    */
   std::string inprocessDir_;
 
-
   /** Directory where file must be moved once processed
    */
   std::string processedDir_;
@@ -57,7 +56,7 @@ class WatcherStreamFileReader{
   /** Directory where file must be moved if file is unreadble (e.g empty size)
    */
   std::string corruptedDir_;
-  
+
   /** Cached input file stream
    */
   std::unique_ptr<edm::StreamerInputFile> streamerInputFile_;
@@ -67,18 +66,16 @@ class WatcherStreamFileReader{
   std::string tokenFile_;
 
   int timeOut_;
-  
+
   std::deque<std::string> filesInQueue_;
 
   bool end_;
-  
+
   int verbosity_;
 
   std::string fileListCmd_;
 
   std::string curDir_;
-
 };
 
 #endif
-
diff --git a/CalibCalorimetry/EcalLaserSorting/src/LaserSorter.cc b/CalibCalorimetry/EcalLaserSorting/src/LaserSorter.cc
index ba7d909393729..dff77f734f757 100644
--- a/CalibCalorimetry/EcalLaserSorting/src/LaserSorter.cc
+++ b/CalibCalorimetry/EcalLaserSorting/src/LaserSorter.cc
@@ -6,7 +6,6 @@
  *        completion of partial output file        * 
  ***************************************************/
 
-
 #include "CalibCalorimetry/EcalLaserSorting/interface/LaserSorter.h"
 #include "CalibCalorimetry/EcalLaserSorting/src/Majority.h"
 
@@ -43,156 +42,136 @@ const size_t LaserSorter::OutStreamRecord::indexReserve_ = 2000;
 static const struct timeval nullTime = {0, 0};
 
 static const char* const detailedTrigNames[] = {
-  "Inv0",//000
-  "Inv1",//001
-  "Inv2",//010
-  "Inv3",//011
-  "Las", //100
-  "Led", //101
-  "TP",  //110
-  "Ped"  //111
+    "Inv0",  //000
+    "Inv1",  //001
+    "Inv2",  //010
+    "Inv3",  //011
+    "Las",   //100
+    "Led",   //101
+    "TP",    //110
+    "Ped"    //111
 };
 
-static const char* const colorNames[] = {
-  "Blue",
-  "Green",
-  "Red",
-  "IR"
-};
+static const char* const colorNames[] = {"Blue", "Green", "Red", "IR"};
 
 const LaserSorter::stats_t LaserSorter::stats_init = {0, 0, 0, 0, 0};
 const int LaserSorter::indexOffset32_ = 1;
 
-static std::string now(){
+static std::string now() {
   struct timeval t;
   gettimeofday(&t, nullptr);
- 
+
   char buf[256];
   strftime(buf, sizeof(buf), "%F %R %S s", localtime(&t.tv_sec));
-  buf[sizeof(buf)-1] = 0;
+  buf[sizeof(buf) - 1] = 0;
 
   stringstream buf2;
-  buf2 << buf << " " << ((t.tv_usec+500)/1000)  << " ms";
+  buf2 << buf << " " << ((t.tv_usec + 500) / 1000) << " ms";
 
   return buf2.str();
 }
 
 LaserSorter::LaserSorter(const edm::ParameterSet& pset)
-  : lumiBlock_(0),
-    lumiBlockPrev_(0),
-    formatVersion_(5),
-    outputDir_(pset.getParameter<std::string>("outputDir")),
-    fedSubDirs_(pset.getParameter<std::vector<std::string> >("fedSubDirs")),
-    timeLogFile_(pset.getUntrackedParameter<std::string>("timeLogFile", "")),
-    disableOutput_(pset.getUntrackedParameter<bool>("disableOutput", false)),
-    runNumber_(0),
-    outputListFile_(pset.getUntrackedParameter<string>("outputListFile", "")),
-    doOutputList_(false),
-    verbosity_(pset.getUntrackedParameter<int>("verbosity", 0)),
-    iNoFullReadoutDccError_(0),
-    maxFullReadoutDccError_(pset.getParameter<int>("maxFullReadoutDccError")),
-    iNoEcalDataMess_(0),
-    maxNoEcalDataMess_(pset.getParameter<int>("maxNoEcalDataMess")),
-    lumiBlockSpan_(pset.getParameter<int>("lumiBlockSpan")),
-    fedRawDataCollectionTag_(pset.getParameter<edm::InputTag>("fedRawDataCollectionTag")),
-    stats_(stats_init),
-    overWriteLumiBlockId_(pset.getParameter<bool>("overWriteLumiBlockId")),
-    orbitCountInALumiBlock_(pset.getParameter<int>("orbitCountInALumiBlock")),
-    orbit_(-1),
-    orbitZeroTime_(nullTime)
-{
-
+    : lumiBlock_(0),
+      lumiBlockPrev_(0),
+      formatVersion_(5),
+      outputDir_(pset.getParameter<std::string>("outputDir")),
+      fedSubDirs_(pset.getParameter<std::vector<std::string> >("fedSubDirs")),
+      timeLogFile_(pset.getUntrackedParameter<std::string>("timeLogFile", "")),
+      disableOutput_(pset.getUntrackedParameter<bool>("disableOutput", false)),
+      runNumber_(0),
+      outputListFile_(pset.getUntrackedParameter<string>("outputListFile", "")),
+      doOutputList_(false),
+      verbosity_(pset.getUntrackedParameter<int>("verbosity", 0)),
+      iNoFullReadoutDccError_(0),
+      maxFullReadoutDccError_(pset.getParameter<int>("maxFullReadoutDccError")),
+      iNoEcalDataMess_(0),
+      maxNoEcalDataMess_(pset.getParameter<int>("maxNoEcalDataMess")),
+      lumiBlockSpan_(pset.getParameter<int>("lumiBlockSpan")),
+      fedRawDataCollectionTag_(pset.getParameter<edm::InputTag>("fedRawDataCollectionTag")),
+      stats_(stats_init),
+      overWriteLumiBlockId_(pset.getParameter<bool>("overWriteLumiBlockId")),
+      orbitCountInALumiBlock_(pset.getParameter<int>("orbitCountInALumiBlock")),
+      orbit_(-1),
+      orbitZeroTime_(nullTime) {
   gettimeofday(&timer_, nullptr);
-  logFile_.open("eventSelect.log", ios::app | ios::out); 
-  
-  const unsigned nEcalFeds= 54;
-  if(fedSubDirs_.size()!= nEcalFeds+1){
-    throw cms::Exception("LaserSorter") 
-      << "Configuration error: "
-      << "fedSubDirs parameter must be a vector "
-      << " of " << nEcalFeds << " strings"
-      << " (subdirectory for unknown triggered FED followed by "
-      "subdirectories for FED ID 601 "
-      "to FED ID 654 in increasing FED ID order)";
+  logFile_.open("eventSelect.log", ios::app | ios::out);
+
+  const unsigned nEcalFeds = 54;
+  if (fedSubDirs_.size() != nEcalFeds + 1) {
+    throw cms::Exception("LaserSorter") << "Configuration error: "
+                                        << "fedSubDirs parameter must be a vector "
+                                        << " of " << nEcalFeds << " strings"
+                                        << " (subdirectory for unknown triggered FED followed by "
+                                           "subdirectories for FED ID 601 "
+                                           "to FED ID 654 in increasing FED ID order)";
   }
 
   fedRawDataCollectionToken_ = consumes<FEDRawDataCollection>(fedRawDataCollectionTag_);
-  
-  if(!outputListFile_.empty()){
+
+  if (!outputListFile_.empty()) {
     outputList_.open(outputListFile_.c_str(), ios::app);
-    if(outputList_.bad()){
-      throw cms::Exception("FileOpen")
-	<< "Failed to open file '" << outputListFile_
-	<< "' for logging of output file path list.";
+    if (outputList_.bad()) {
+      throw cms::Exception("FileOpen") << "Failed to open file '" << outputListFile_
+                                       << "' for logging of output file path list.";
     }
     doOutputList_ = true;
   }
-  
-  if(!timeLogFile_.empty()){
+
+  if (!timeLogFile_.empty()) {
     timeLog_.open(timeLogFile_.c_str());
-    if(timeLog_.fail()){
+    if (timeLog_.fail()) {
       cout << "[LaserSorter " << now() << "] "
            << "Failed to open file " << timeLogFile_ << " to log timing.\n";
       timing_ = false;
-    } else{
+    } else {
       timing_ = true;
     }
   }
 
   struct stat fileStat;
-  if(0==stat(outputDir_.c_str(), &fileStat)){
-    if(!S_ISDIR(fileStat.st_mode)){
-      throw cms::Exception("[LaserSorter]")
-        << "File " << outputDir_ << " exists but is not a directory "
-        << " as expected.";
+  if (0 == stat(outputDir_.c_str(), &fileStat)) {
+    if (!S_ISDIR(fileStat.st_mode)) {
+      throw cms::Exception("[LaserSorter]") << "File " << outputDir_ << " exists but is not a directory "
+                                            << " as expected.";
     }
-  } else {//directory does not exists, let's try to create it
-    if(0!=mkdir(outputDir_.c_str(), 0755)){
-      throw cms::Exception("[LaserSorter]")
-        << "Failed to create directory " << outputDir_
-        << " for writing data.";
+  } else {  //directory does not exists, let's try to create it
+    if (0 != mkdir(outputDir_.c_str(), 0755)) {
+      throw cms::Exception("[LaserSorter]") << "Failed to create directory " << outputDir_ << " for writing data.";
     }
   }
 
   logFile_ << "# "
-    "run\t"
-    "LB\t" 
-    "event\t" 
-    "trigType\t"
-    "FED\t"
-    "side\t"
-    "LB out\t"
-    "Written\t"
-    "ECAL data\n";
+              "run\t"
+              "LB\t"
+              "event\t"
+              "trigType\t"
+              "FED\t"
+              "side\t"
+              "LB out\t"
+              "Written\t"
+              "ECAL data\n";
 }
 
-LaserSorter::~LaserSorter(){
-  logFile_ << "Summary. Event count: "
-           << stats_.nRead << " processed, "
-           << stats_.nWritten << " written, "
-           << stats_.nInvalidDccStrict << " with errors in DCC ID values, "
-           << stats_.nInvalidDccWeak << " with unusable DCC ID values, "
-           << stats_.nRestoredDcc << " restored DCC ID based on DCC block size\n";
+LaserSorter::~LaserSorter() {
+  logFile_ << "Summary. Event count: " << stats_.nRead << " processed, " << stats_.nWritten << " written, "
+           << stats_.nInvalidDccStrict << " with errors in DCC ID values, " << stats_.nInvalidDccWeak
+           << " with unusable DCC ID values, " << stats_.nRestoredDcc << " restored DCC ID based on DCC block size\n";
 }
 
-
 // ------------ method called to analyze the data  ------------
-void
-LaserSorter::analyze(const edm::Event& event, const edm::EventSetup& es){
-  if(timing_){
+void LaserSorter::analyze(const edm::Event& event, const edm::EventSetup& es) {
+  if (timing_) {
     timeval t;
     gettimeofday(&t, nullptr);
-    timeLog_ << t.tv_sec << "."
-             << setfill('0') << setw(3) << (t.tv_usec+500)/1000 << setfill(' ')
-             << "\t"
-             << (t.tv_usec - timer_.tv_usec)*1. 
-      + (t.tv_sec - timer_.tv_sec)*1.e6 << "\t";
+    timeLog_ << t.tv_sec << "." << setfill('0') << setw(3) << (t.tv_usec + 500) / 1000 << setfill(' ') << "\t"
+             << (t.tv_usec - timer_.tv_usec) * 1. + (t.tv_sec - timer_.tv_sec) * 1.e6 << "\t";
     timer_ = t;
-  } 
+  }
 
   ++stats_.nRead;
-  
-  if(event.id().run()!=runNumber_){//run changed or first event
+
+  if (event.id().run() != runNumber_) {  //run changed or first event
     //for a new run, starts with a new output stream set.
     closeAllStreams();
     runNumber_ = event.id().run();
@@ -201,9 +180,9 @@ LaserSorter::analyze(const edm::Event& event, const edm::EventSetup& es){
     lumiBlockPrev_ = 0;
     lumiBlock_ = 0;
   }
-  
+
   edm::Handle<FEDRawDataCollection> rawdata;
-  event.getByToken(fedRawDataCollectionToken_, rawdata);  
+  event.getByToken(fedRawDataCollectionToken_, rawdata);
 
   //orbit number
   //FIXME: orbit from edm Event is currently wrong. Forcing to use of CMS orbit until
@@ -216,361 +195,353 @@ LaserSorter::analyze(const edm::Event& event, const edm::EventSetup& es){
 
   //  std::cerr << "Orbit ID CMS, ECAL: " << orbit_ << "\t" << getOrbitFromDcc(rawdata) << "\n";
 
-  if(orbit_ < 0){ //For local run CMSSW failed to find the orbit number
+  if (orbit_ < 0) {  //For local run CMSSW failed to find the orbit number
     //    cout << "Look for orbit from DCC headers....\n";
     orbit_ = getOrbitFromDcc(rawdata);
   }
 
-  
   //The "detailed trigger type DCC field content:
   double dttProba = 0;
   int dtt = getDetailedTriggerType(rawdata, &dttProba);
 
-  if(overWriteLumiBlockId_){
+  if (overWriteLumiBlockId_) {
     edm::LuminosityBlockNumber_t lb = lumiBlock_;
     lumiBlock_ = orbit_ / orbitCountInALumiBlock_;
-    if(lb!=lumiBlock_){
-      std::cout << "[LaserSorter " << now() << "] Overwrite LB mode. LB number changed from: " << lb << " to " <<lumiBlock_<< "\n";
+    if (lb != lumiBlock_) {
+      std::cout << "[LaserSorter " << now() << "] Overwrite LB mode. LB number changed from: " << lb << " to "
+                << lumiBlock_ << "\n";
     }
-  } else{
+  } else {
     edm::LuminosityBlockNumber_t lb = lumiBlock_;
     lumiBlock_ = event.luminosityBlock();
-    if(lb!=lumiBlock_){
-      std::cout << "[LaserSorter " << now() << "] Standard LB mode. LB number changed from: " << lb << " to " <<lumiBlock_<< "\n";
-     }
+    if (lb != lumiBlock_) {
+      std::cout << "[LaserSorter " << now() << "] Standard LB mode. LB number changed from: " << lb << " to "
+                << lumiBlock_ << "\n";
+    }
   }
 
   detailedTrigType_ = dtt;
-  const int trigType =   (detailedTrigType_ >>8 ) & 0x7;
-  const int color    =   (detailedTrigType_ >>6 ) & 0x3;
-  const int dccId    =   (detailedTrigType_ >>0 ) & 0x3F;
-  int triggeredFedId =   (detailedTrigType_ == -2) ? -1 : (600 + dccId);
-  const int side     =   (detailedTrigType_ >>11) & 0x1;
+  const int trigType = (detailedTrigType_ >> 8) & 0x7;
+  const int color = (detailedTrigType_ >> 6) & 0x3;
+  const int dccId = (detailedTrigType_ >> 0) & 0x3F;
+  int triggeredFedId = (detailedTrigType_ == -2) ? -1 : (600 + dccId);
+  const int side = (detailedTrigType_ >> 11) & 0x1;
   //monitoring region extended id:
   //  const int lme = dcc2Lme(dccId, side);
 
-  if(detailedTrigType_ > -2){
-    if(dttProba < 1. || triggeredFedId < ecalDccFedIdMin_
-       || triggeredFedId > ecalDccFedIdMax_){
+  if (detailedTrigType_ > -2) {
+    if (dttProba < 1. || triggeredFedId < ecalDccFedIdMin_ || triggeredFedId > ecalDccFedIdMax_) {
       ++stats_.nInvalidDccStrict;
     }
 
-    if(triggeredFedId<ecalDccFedIdMin_ || triggeredFedId > ecalDccFedIdMax_){
-      if(verbosity_) cout <<  "[LaserSorter " << now() << "] " << "DCC ID (" << dccId
-                          << ") found in trigger type is out of range.";
+    if (triggeredFedId < ecalDccFedIdMin_ || triggeredFedId > ecalDccFedIdMax_) {
+      if (verbosity_)
+        cout << "[LaserSorter " << now() << "] "
+             << "DCC ID (" << dccId << ") found in trigger type is out of range.";
       ++stats_.nInvalidDccWeak;
       vector<int> ids = getFullyReadoutDccs(*rawdata);
-      if(ids.empty()){
-        if(verbosity_ && iNoFullReadoutDccError_ < maxFullReadoutDccError_){
+      if (ids.empty()) {
+        if (verbosity_ && iNoFullReadoutDccError_ < maxFullReadoutDccError_) {
           cout << " No fully read-out DCC found\n";
           ++iNoFullReadoutDccError_;
         }
-      } else if(ids.size()==1){
+      } else if (ids.size() == 1) {
         triggeredFedId = ids[0];
-        if(verbosity_) cout << " ID guessed from DCC payloads\n";
+        if (verbosity_)
+          cout << " ID guessed from DCC payloads\n";
         ++stats_.nRestoredDcc;
-      } else{ //ids.size()>1
-        if(verbosity_){
+      } else {  //ids.size()>1
+        if (verbosity_) {
           cout << " Several fully read-out Dccs:";
-          for(unsigned i=0; i < ids.size(); ++i) cout << " " << ids[i];
+          for (unsigned i = 0; i < ids.size(); ++i)
+            cout << " " << ids[i];
           cout << "\n";
         }
       }
     }
-  
-    if(verbosity_>1) cout << "\n----------------------------------------------------------------------\n"
-                          << "Event id: " 
-                          << " " << event.id() << "\n"
-                          << "Lumin block: " << lumiBlock_ << "\n"
-                          << "TrigType: " << detailedTrigNames[trigType&0x7]
-                          << " Color: " << colorNames[color&0x3]
-                          <<  " FED: " << triggeredFedId
-                          << " side:" << side << "\n"
-                          << "\n----------------------------------------------------------------------\n";
-    
-  } else{ //NO ECAL DATA
-    if(verbosity_>1) cout << "\n----------------------------------------------------------------------\n"
-                          << "Event id: " 
-                          << " " << event.id() << "\n"
-                          << "Lumin block: " << lumiBlock_ << "\n"
-                          << "No ECAL data\n"
-                          << "\n----------------------------------------------------------------------\n";
+
+    if (verbosity_ > 1)
+      cout << "\n----------------------------------------------------------------------\n"
+           << "Event id: "
+           << " " << event.id() << "\n"
+           << "Lumin block: " << lumiBlock_ << "\n"
+           << "TrigType: " << detailedTrigNames[trigType & 0x7] << " Color: " << colorNames[color & 0x3]
+           << " FED: " << triggeredFedId << " side:" << side << "\n"
+           << "\n----------------------------------------------------------------------\n";
+
+  } else {  //NO ECAL DATA
+    if (verbosity_ > 1)
+      cout << "\n----------------------------------------------------------------------\n"
+           << "Event id: "
+           << " " << event.id() << "\n"
+           << "Lumin block: " << lumiBlock_ << "\n"
+           << "No ECAL data\n"
+           << "\n----------------------------------------------------------------------\n";
   }
-  
-  logFile_ << event.id().run() << "\t"
-           << lumiBlock_ << "\t" 
-           << event.id().event() << "\t" 
-           << trigType << "\t"
-           << triggeredFedId << "\t"
-           << side;
-    
+
+  logFile_ << event.id().run() << "\t" << lumiBlock_ << "\t" << event.id().event() << "\t" << trigType << "\t"
+           << triggeredFedId << "\t" << side;
+
   bool written = false;
   int assignedLB = -1;
-  
-  if(lumiBlock_!=lumiBlockPrev_){
+
+  if (lumiBlock_ != lumiBlockPrev_) {
     //lumi block change => need for stream garbage collection
     const int lb = lumiBlock_;
     closeOldStreams(lb);
     int minLumi = lumiBlock_ - lumiBlockSpan_;
     int maxLumi = lumiBlock_ + lumiBlockSpan_;
-    for(int lb1 = minLumi; lb1 <= maxLumi; ++lb1){
+    for (int lb1 = minLumi; lb1 <= maxLumi; ++lb1) {
       restoreStreamsOfLumiBlock(lb1);
     }
   }
-    
-//     if(lumiBlock_ < lumiBlockPrev_){
-//       throw cms::Exception("LaserSorter") 
-//         << "Process event has a lumi block (" << lumiBlock_ << ")"
-//         << "older than previous one (" << lumiBlockPrev_ << "). "
-//         << "This can be due by wrong input file ordering or bad luminosity "
-//         << "block indication is the event header. "
-//         << "Event cannot be processed";
-//     }
-
-    if(disableOutput_){
-      /* NO OP*/
-    } else{
-      OutStreamRecord* out = getStream(triggeredFedId, lumiBlock_);
-
-      if(out!=nullptr){
-        assignedLB = out->startingLumiBlock();
-        if(out->excludedOrbit().find(orbit_)
-           ==out->excludedOrbit().end()){
-          if(verbosity_ > 1) cout << "[LaserSorter " << now() << "] "
-                              << "Writing out event from FED " << triggeredFedId 
-                              << " LB " << lumiBlock_
-                              << " orbit " << orbit_ << "\n";
-          int dtt = (detailedTrigType_ >=0) ? detailedTrigType_ : -1; //shall we use -1 or 0 for undefined value?
-          written = written
-            || writeEvent(*out, event, dtt, *rawdata);
-          ++stats_.nWritten;
-        } else{
-          if(verbosity_) cout << "[LaserSorter " << now() << "] "
-                              << "File " << out->finalFileName() << " "
-                              << "already contains calibration event from FED "
-                              << triggeredFedId << ", LB = "
-                              << lumiBlock_
-                              << " with orbit ID "
-                              << orbit_ << ". Event skipped.\n";
-        }
+
+  //     if(lumiBlock_ < lumiBlockPrev_){
+  //       throw cms::Exception("LaserSorter")
+  //         << "Process event has a lumi block (" << lumiBlock_ << ")"
+  //         << "older than previous one (" << lumiBlockPrev_ << "). "
+  //         << "This can be due by wrong input file ordering or bad luminosity "
+  //         << "block indication is the event header. "
+  //         << "Event cannot be processed";
+  //     }
+
+  if (disableOutput_) {
+    /* NO OP*/
+  } else {
+    OutStreamRecord* out = getStream(triggeredFedId, lumiBlock_);
+
+    if (out != nullptr) {
+      assignedLB = out->startingLumiBlock();
+      if (out->excludedOrbit().find(orbit_) == out->excludedOrbit().end()) {
+        if (verbosity_ > 1)
+          cout << "[LaserSorter " << now() << "] "
+               << "Writing out event from FED " << triggeredFedId << " LB " << lumiBlock_ << " orbit " << orbit_
+               << "\n";
+        int dtt = (detailedTrigType_ >= 0) ? detailedTrigType_ : -1;  //shall we use -1 or 0 for undefined value?
+        written = written || writeEvent(*out, event, dtt, *rawdata);
+        ++stats_.nWritten;
+      } else {
+        if (verbosity_)
+          cout << "[LaserSorter " << now() << "] "
+               << "File " << out->finalFileName() << " "
+               << "already contains calibration event from FED " << triggeredFedId << ", LB = " << lumiBlock_
+               << " with orbit ID " << orbit_ << ". Event skipped.\n";
       }
     }
-    lumiBlockPrev_ = lumiBlock_;
-    
-    logFile_ << "\t";
-    if(assignedLB>=0) logFile_ << assignedLB; else logFile_ << "-";
-    logFile_ << "\t" << (written?"Y":"N") << "\n"; 
-    logFile_  << "\t" << (detailedTrigType_==-2?"N":"Y") << "\n";
-    
-    if(timing_){
-      timeval t;
-      gettimeofday(&t, nullptr);
-      timeLog_ << (t.tv_usec - timer_.tv_usec)*1. 
-        + (t.tv_sec - timer_.tv_sec)*1.e6 << "\n";
-      timer_ = t;
-    }
+  }
+  lumiBlockPrev_ = lumiBlock_;
+
+  logFile_ << "\t";
+  if (assignedLB >= 0)
+    logFile_ << assignedLB;
+  else
+    logFile_ << "-";
+  logFile_ << "\t" << (written ? "Y" : "N") << "\n";
+  logFile_ << "\t" << (detailedTrigType_ == -2 ? "N" : "Y") << "\n";
+
+  if (timing_) {
+    timeval t;
+    gettimeofday(&t, nullptr);
+    timeLog_ << (t.tv_usec - timer_.tv_usec) * 1. + (t.tv_sec - timer_.tv_sec) * 1.e6 << "\n";
+    timer_ = t;
+  }
 }
 
-int LaserSorter::dcc2Lme(int dcc, int side){
-  int fedid = (dcc%600) + 600; //to handle both FED and DCC id.
+int LaserSorter::dcc2Lme(int dcc, int side) {
+  int fedid = (dcc % 600) + 600;  //to handle both FED and DCC id.
   vector<int> lmes;
   // EE -
-  if( fedid <= 609 ) {
-    if ( fedid <= 607 ) {
-      lmes.push_back(fedid-601+83);
-    } else if ( fedid == 608 ) {
+  if (fedid <= 609) {
+    if (fedid <= 607) {
+      lmes.push_back(fedid - 601 + 83);
+    } else if (fedid == 608) {
       lmes.push_back(90);
       lmes.push_back(91);
-    } else if ( fedid == 609 ) {
+    } else if (fedid == 609) {
       lmes.push_back(92);
     }
-  } //EB
-  else if ( fedid >= 610  && fedid <= 645 ) {
-    lmes.push_back(2*(fedid-610)+1);
-    lmes.push_back(lmes[0]+1);
-  } // EE+ 
-  else if ( fedid >= 646 ) {
-    if ( fedid <= 652 ) {
-      lmes.push_back(fedid-646+73);
-    } else if ( fedid == 653 ) {
+  }  //EB
+  else if (fedid >= 610 && fedid <= 645) {
+    lmes.push_back(2 * (fedid - 610) + 1);
+    lmes.push_back(lmes[0] + 1);
+  }  // EE+
+  else if (fedid >= 646) {
+    if (fedid <= 652) {
+      lmes.push_back(fedid - 646 + 73);
+    } else if (fedid == 653) {
       lmes.push_back(80);
       lmes.push_back(81);
-    } else if ( fedid == 654 ) {
+    } else if (fedid == 654) {
       lmes.push_back(82);
     }
   }
-  return lmes.empty()?-1:lmes[min(lmes.size(), (size_t)side)];
+  return lmes.empty() ? -1 : lmes[min(lmes.size(), (size_t)side)];
 }
 
-int LaserSorter::getOrbitFromDcc(const edm::Handle<FEDRawDataCollection>& rawdata) const{
+int LaserSorter::getOrbitFromDcc(const edm::Handle<FEDRawDataCollection>& rawdata) const {
   const int orbit32 = 6;
-  for(int id=ecalDccFedIdMin_; id<=ecalDccFedIdMax_; ++id){
-    if(!FEDNumbering::inRange(id)) continue;
+  for (int id = ecalDccFedIdMin_; id <= ecalDccFedIdMax_; ++id) {
+    if (!FEDNumbering::inRange(id))
+      continue;
     const FEDRawData& data = rawdata->FEDData(id);
-    if(data.size() >= 4*(orbit32+1)){
-      const uint32_t* pData32 = (const uint32_t*) data.data();
-//      cout << "Found a DCC header: "
-//           << pData32[0] << " "
-//           << pData32[1] << " "
-//           << pData32[2] << " "
-//           << pData32[3] << " "
-//           << pData32[4] << " "
-//           << pData32[5] << " "
-//           << pData32[6] << " "
-//           << "\n";
+    if (data.size() >= 4 * (orbit32 + 1)) {
+      const uint32_t* pData32 = (const uint32_t*)data.data();
+      //      cout << "Found a DCC header: "
+      //           << pData32[0] << " "
+      //           << pData32[1] << " "
+      //           << pData32[2] << " "
+      //           << pData32[3] << " "
+      //           << pData32[4] << " "
+      //           << pData32[5] << " "
+      //           << pData32[6] << " "
+      //           << "\n";
       return pData32[orbit32];
     }
   }
   return -1;
 }
 
-int LaserSorter::getDetailedTriggerType(const edm::Handle<FEDRawDataCollection>& rawdata,
-                                        double* proba){  
+int LaserSorter::getDetailedTriggerType(const edm::Handle<FEDRawDataCollection>& rawdata, double* proba) {
   Majority<int> stat;
   bool ecalData = false;
-  for(int id=ecalDccFedIdMin_; id<=ecalDccFedIdMax_; ++id){
-    if(!FEDNumbering::inRange(id)) continue;
+  for (int id = ecalDccFedIdMin_; id <= ecalDccFedIdMax_; ++id) {
+    if (!FEDNumbering::inRange(id))
+      continue;
     const FEDRawData& data = rawdata->FEDData(id);
     const int detailedTrigger32 = 5;
-    if(verbosity_>3) cout << "[LaserSorter " << now() << "] " 
-                          << "FED " << id << " data size: "  
-                          << data.size() << "\n"; 
-    if(data.size()>=4*(detailedTrigger32+1)){
+    if (verbosity_ > 3)
+      cout << "[LaserSorter " << now() << "] "
+           << "FED " << id << " data size: " << data.size() << "\n";
+    if (data.size() >= 4 * (detailedTrigger32 + 1)) {
       ecalData = true;
-      const uint32_t* pData32 = (const uint32_t*) data.data();
+      const uint32_t* pData32 = (const uint32_t*)data.data();
       int tType = pData32[detailedTrigger32] & 0xFFF;
-      if(verbosity_>3) cout << "[LaserSorter " << now() << "] "
-                            << "Trigger type " << tType << "\n";
+      if (verbosity_ > 3)
+        cout << "[LaserSorter " << now() << "] "
+             << "Trigger type " << tType << "\n";
       stat.add(tType);
     }
   }
-  if(!ecalData) return -2;
+  if (!ecalData)
+    return -2;
   double p;
   int tType = stat.result(&p);
-  if(p<0){
+  if (p < 0) {
     //throw cms::Exception("NotFound") << "No ECAL DCC data found\n";
-    if(iNoEcalDataMess_ < maxNoEcalDataMess_){
-      edm::LogWarning("NotFound")  << "No ECAL DCC data found. "
-        "(This warning will be disabled for the current run after "
-                                   << maxNoEcalDataMess_ << " occurences.)";
+    if (iNoEcalDataMess_ < maxNoEcalDataMess_) {
+      edm::LogWarning("NotFound") << "No ECAL DCC data found. "
+                                     "(This warning will be disabled for the current run after "
+                                  << maxNoEcalDataMess_ << " occurences.)";
       ++iNoEcalDataMess_;
     }
     tType = -1;
-  } else if(p<.8){
+  } else if (p < .8) {
     //throw cms::Exception("EventCorruption") << "Inconsitency in detailed trigger type indicated in ECAL DCC data headers\n";
     edm::LogWarning("EventCorruption") << "Inconsitency in detailed trigger type indicated in ECAL DCC data headers\n";
     tType = -1;
   }
-  if(proba) *proba = p;
+  if (proba)
+    *proba = p;
   return tType;
 }
 
-void LaserSorter::closeAllStreams(){
-  for(OutStreamList::iterator it = outStreamList_.begin();
-      it != outStreamList_.end();/*NOOP*/){
+void LaserSorter::closeAllStreams() {
+  for (OutStreamList::iterator it = outStreamList_.begin(); it != outStreamList_.end(); /*NOOP*/) {
     it = closeOutStream(it);
   }
 }
 
-void LaserSorter::closeOldStreams(edm::LuminosityBlockNumber_t lumiBlock){
+void LaserSorter::closeOldStreams(edm::LuminosityBlockNumber_t lumiBlock) {
   const edm::LuminosityBlockNumber_t minLumiBlock = lumiBlock - lumiBlockSpan_;
   const edm::LuminosityBlockNumber_t maxLumiBlock = lumiBlock + lumiBlockSpan_;
   //If container type is ever changed, beware that
   //closeOutStream call in the loop removes it from outStreamList
-  for(boost::ptr_list<OutStreamRecord>::iterator it = outStreamList_.begin();
-      it != outStreamList_.end();
-      /*NOOP*/){
-    if(it->startingLumiBlock() < minLumiBlock
-       || it->startingLumiBlock() > maxLumiBlock){
+  for (boost::ptr_list<OutStreamRecord>::iterator it = outStreamList_.begin(); it != outStreamList_.end();
+       /*NOOP*/) {
+    if (it->startingLumiBlock() < minLumiBlock || it->startingLumiBlock() > maxLumiBlock) {
       //event older than 2 lumi block => stream can be closed
-      if(verbosity_) cout << "[LaserSorter " << now() << "] "
-                       << "Closing file for "
-                       << "FED " 
-                       << it->fedId()
-                       << " LB " << it->startingLumiBlock()
-                       << "\n";
+      if (verbosity_)
+        cout << "[LaserSorter " << now() << "] "
+             << "Closing file for "
+             << "FED " << it->fedId() << " LB " << it->startingLumiBlock() << "\n";
       it = closeOutStream(it);
-    } else{
+    } else {
       ++it;
     }
   }
 }
 
-LaserSorter::OutStreamRecord*
-LaserSorter::getStream(int fedId, 
-                       edm::LuminosityBlockNumber_t lumiBlock){
+LaserSorter::OutStreamRecord* LaserSorter::getStream(int fedId, edm::LuminosityBlockNumber_t lumiBlock) {
+  if ((fedId != -1) && (fedId < ecalDccFedIdMin_ || fedId > ecalDccFedIdMax_))
+    fedId = -1;
 
-  if((fedId != -1) &&
-     (fedId < ecalDccFedIdMin_ || fedId > ecalDccFedIdMax_)) fedId = -1;
-  
-  if(verbosity_>1) cout << "[LaserSorter " << now() << "] "
-       << "Looking for an opened output file for FED " 
-       << fedId << " LB " << lumiBlock
-       << "\n";
+  if (verbosity_ > 1)
+    cout << "[LaserSorter " << now() << "] "
+         << "Looking for an opened output file for FED " << fedId << " LB " << lumiBlock << "\n";
 
   //first look if stream is already open:
-  for(OutStreamList::iterator it = outStreamList_.begin();
-      it != outStreamList_.end();
-      ++it){
-    if(it->fedId()==fedId && 
-       (abs((int)it->startingLumiBlock()-(int)lumiBlock)<=lumiBlockSpan_)){
+  for (OutStreamList::iterator it = outStreamList_.begin(); it != outStreamList_.end(); ++it) {
+    if (it->fedId() == fedId && (abs((int)it->startingLumiBlock() - (int)lumiBlock) <= lumiBlockSpan_)) {
       //stream found!
       return &(*it);
     }
   }
   //stream was not found. Let's create one
 
-  if(verbosity_) cout << "[LaserSorter " << now() << "] "
-                      << "File not yet opened. Opening it.\n";
+  if (verbosity_)
+    cout << "[LaserSorter " << now() << "] "
+         << "File not yet opened. Opening it.\n";
 
   OutStreamList::iterator streamRecord = createOutStream(fedId, lumiBlock);
-  return streamRecord!=outStreamList_.end()?&(*streamRecord):nullptr;
+  return streamRecord != outStreamList_.end() ? &(*streamRecord) : nullptr;
 }
 
-bool LaserSorter::writeEvent(OutStreamRecord& outRcd, const edm::Event& event,
+bool LaserSorter::writeEvent(OutStreamRecord& outRcd,
+                             const edm::Event& event,
                              int dtt,
-                             const FEDRawDataCollection& data){
-
+                             const FEDRawDataCollection& data) {
   ofstream& out = *outRcd.out();
   bool rc = true;
   vector<unsigned> fedIds;
   getOutputFedList(event, data, fedIds);
-  
+
   out.clear();
   uint32_t evtStart = out.tellp();
-  if(out.bad()) evtStart = 0;
+  if (out.bad())
+    evtStart = 0;
   rc &= writeEventHeader(out, event, dtt, fedIds.size());
-  
-  if(orbitZeroTime_.tv_sec==0 && data.FEDData(matacqFedId_).size()!=0){
+
+  if (orbitZeroTime_.tv_sec == 0 && data.FEDData(matacqFedId_).size() != 0) {
     struct timeval ts = {0, 0};
     MatacqRawEvent mre(data.FEDData(matacqFedId_).data(), data.FEDData(matacqFedId_).size());
     mre.getTimeStamp(ts);
     uint32_t orb = mre.getOrbitId();
-      if(ts.tv_sec!=0){
-        div_t dt = div(orb * 89.1, 1000*1000); //an orbit lasts 89.1 microseconds
-        orbitZeroTime_.tv_sec = ts.tv_sec - dt.quot;
-        orbitZeroTime_.tv_usec = ts.tv_usec - dt.rem;
-        if(orbitZeroTime_.tv_usec < 0){
-          orbitZeroTime_.tv_usec += 1000*1000;
-          orbitZeroTime_.tv_sec -= 1;
-        }
+    if (ts.tv_sec != 0) {
+      div_t dt = div(orb * 89.1, 1000 * 1000);  //an orbit lasts 89.1 microseconds
+      orbitZeroTime_.tv_sec = ts.tv_sec - dt.quot;
+      orbitZeroTime_.tv_usec = ts.tv_usec - dt.rem;
+      if (orbitZeroTime_.tv_usec < 0) {
+        orbitZeroTime_.tv_usec += 1000 * 1000;
+        orbitZeroTime_.tv_sec -= 1;
       }
+    }
   }
 
-  for(unsigned iFed = 0; iFed < fedIds.size() && rc; ++iFed){
-    if(verbosity_>3) cout << "[LaserSorter " << now() << "] " 
-                          << "Writing data block of FED " << fedIds[iFed] << ". Data size: "  
-                          <<  data.FEDData(fedIds[iFed]).size() << "\n"; 
-    rc  &= writeFedBlock(out, data.FEDData(fedIds[iFed]));
+  for (unsigned iFed = 0; iFed < fedIds.size() && rc; ++iFed) {
+    if (verbosity_ > 3)
+      cout << "[LaserSorter " << now() << "] "
+           << "Writing data block of FED " << fedIds[iFed] << ". Data size: " << data.FEDData(fedIds[iFed]).size()
+           << "\n";
+    rc &= writeFedBlock(out, data.FEDData(fedIds[iFed]));
   }
 
-  if(rc){
+  if (rc) {
     //update index table for this file:
     vector<IndexRecord>& indices = *outRcd.indices();
-    if(verbosity_ > 2){
-      std::cout << "Event " << " written successfully. "
-                << "Orbit: " << orbit_
-                << "\tFile index: " << evtStart << "\n";
+    if (verbosity_ > 2) {
+      std::cout << "Event "
+                << " written successfully. "
+                << "Orbit: " << orbit_ << "\tFile index: " << evtStart << "\n";
     }
     IndexRecord indexRcd = {(uint32_t)orbit_, evtStart};
     indices.push_back(indexRcd);
@@ -578,69 +549,67 @@ bool LaserSorter::writeEvent(OutStreamRecord& outRcd, const edm::Event& event,
   return rc;
 }
 
-bool LaserSorter::writeFedBlock(std::ofstream& out,
-                                const FEDRawData& data){
+bool LaserSorter::writeFedBlock(std::ofstream& out, const FEDRawData& data) {
   bool rc = false;
-  if (data.size()>4){
-    const uint32_t * pData
-      = reinterpret_cast<const uint32_t*>(data.data());
-    
-    uint32_t dccLen64 = pData[2] & 0x00FFFFFF; //in 32-byte unit
-
-    if(data.size() != dccLen64*sizeof(uint64_t)){
-//       throw cms::Exception("Bug") << "Bug found in "
-//                                   << __FILE__ << ":" << __LINE__ << ".";
-      throw cms::Exception("LaserSorter")
-        << "Mismatch between FED fragment size indicated in header "
-        << "(" << dccLen64 << "*8 Byte) "
-        << "and actual size (" <<  data.size() << " Byte) "
-        << "for FED ID " <<  ((pData[0] >>8) & 0xFFF) << "!\n";
+  if (data.size() > 4) {
+    const uint32_t* pData = reinterpret_cast<const uint32_t*>(data.data());
+
+    uint32_t dccLen64 = pData[2] & 0x00FFFFFF;  //in 32-byte unit
+
+    if (data.size() != dccLen64 * sizeof(uint64_t)) {
+      //       throw cms::Exception("Bug") << "Bug found in "
+      //                                   << __FILE__ << ":" << __LINE__ << ".";
+      throw cms::Exception("LaserSorter") << "Mismatch between FED fragment size indicated in header "
+                                          << "(" << dccLen64 << "*8 Byte) "
+                                          << "and actual size (" << data.size() << " Byte) "
+                                          << "for FED ID " << ((pData[0] >> 8) & 0xFFF) << "!\n";
     }
-    
-    if(verbosity_>3) cout << "[LaserSorter " << now() << "] " << "Event fragment size: "
-                          << data.size() << " Byte"
-                          << "\t From Dcc header: " << dccLen64*8 << " Byte\n";
-    
+
+    if (verbosity_ > 3)
+      cout << "[LaserSorter " << now() << "] "
+           << "Event fragment size: " << data.size() << " Byte"
+           << "\t From Dcc header: " << dccLen64 * 8 << " Byte\n";
+
     const size_t nBytes = data.size();
-    //       cout << "[LaserSorter " << now() << "] " 
-    //            << "Writing " << nBytes << " byte from adress " 
+    //       cout << "[LaserSorter " << now() << "] "
+    //            << "Writing " << nBytes << " byte from adress "
     //            << (void*) data.data() << " to file.\n";
-    if(out.fail()) cout << "[LaserSorter " << now() << "] " << "Problem with stream!\n";
+    if (out.fail())
+      cout << "[LaserSorter " << now() << "] "
+           << "Problem with stream!\n";
     out.write((char*)data.data(), nBytes);
     rc = true;
-  } else{
-    throw cms::Exception("Bug") << "Bug found in "
-                                << __FILE__ << ":" << __LINE__ << ".\n";
+  } else {
+    throw cms::Exception("Bug") << "Bug found in " << __FILE__ << ":" << __LINE__ << ".\n";
   }
   return rc;
 }
 
-bool LaserSorter::renameAsBackup(const std::string& fileName,
-                                 std::string& newFileName){
+bool LaserSorter::renameAsBackup(const std::string& fileName, std::string& newFileName) {
   int i = 0;
   int err;
   //  static int maxTries = 100;
   int maxTries = 20;
   stringstream newFileName_;
-  do{
+  do {
     newFileName_.str("");
     newFileName_ << fileName << "~";
-    if(i>0) newFileName_ << i;
+    if (i > 0)
+      newFileName_ << i;
     err = link(fileName.c_str(), newFileName_.str().c_str());
-    if(err==0){
+    if (err == 0) {
       newFileName = newFileName_.str();
       err = unlink(fileName.c_str());
     }
     ++i;
-  } while((err!=0) && (errno == EEXIST) && (i < maxTries));
-  return err==0;
+  } while ((err != 0) && (errno == EEXIST) && (i < maxTries));
+  return err == 0;
 }
 
-LaserSorter::OutStreamList::iterator 
-LaserSorter::createOutStream(int fedId, 
-                             edm::LuminosityBlockNumber_t lumiBlock){
-  if(verbosity_) cout << "[LaserSorter " << now() << "] " << "Creating a stream for FED " << fedId
-                      << " lumi block " << lumiBlock << ".\n";
+LaserSorter::OutStreamList::iterator LaserSorter::createOutStream(int fedId, edm::LuminosityBlockNumber_t lumiBlock) {
+  if (verbosity_)
+    cout << "[LaserSorter " << now() << "] "
+         << "Creating a stream for FED " << fedId << " lumi block " << lumiBlock << ".\n";
   std::string tmpName;
   std::string finalName;
 
@@ -649,99 +618,88 @@ LaserSorter::createOutStream(int fedId,
   errno = 0;
 
   //checks if a file with tmpName name already exists:
-  ofstream* out = new ofstream(tmpName.c_str(), ios::out | ios::in);  
-  if(out->is_open()){//temporary file already exists. Making a backup:
+  ofstream* out = new ofstream(tmpName.c_str(), ios::out | ios::in);
+  if (out->is_open()) {  //temporary file already exists. Making a backup:
     string newName;
-    if(!renameAsBackup(tmpName, newName)){
-      throw cms::Exception("LaserSorter")
-        << "Failed to rename file " << tmpName
-        << "  to " << newName << "\n";
+    if (!renameAsBackup(tmpName, newName)) {
+      throw cms::Exception("LaserSorter") << "Failed to rename file " << tmpName << "  to " << newName << "\n";
     }
-    if(verbosity_) cout << "[LaserSorter " << now() << "] "
-                        << "Already existing File " << tmpName
-                        << " renamed to "
-                        << newName << "\n";
+    if (verbosity_)
+      cout << "[LaserSorter " << now() << "] "
+           << "Already existing File " << tmpName << " renamed to " << newName << "\n";
     out->close();
   }
 
   out->clear();
   out->open(tmpName.c_str(), ios::out | ios::trunc);
-  
-  if(out->fail()){//failed to create file
+
+  if (out->fail()) {  //failed to create file
     delete out;
-    throw cms::Exception("LaserSorter")
-      << "Failed to create file " 
-      << tmpName << " for writing event from FED " << fedId
-      << " lumi block " << lumiBlock
-      << ": "  << strerror(errno) << "\n.";
+    throw cms::Exception("LaserSorter") << "Failed to create file " << tmpName << " for writing event from FED "
+                                        << fedId << " lumi block " << lumiBlock << ": " << strerror(errno) << "\n.";
   }
-  
+
   ifstream in(finalName.c_str());
   bool newFile = true;
-  if(in.good()){//file already exists with final name.
-    if(verbosity_) cout << "[LaserSorter " << now() << "] " << "File "
-                        << finalName
-                        << " already exists. It will be updated if needed.\n";
+  if (in.good()) {  //file already exists with final name.
+    if (verbosity_)
+      cout << "[LaserSorter " << now() << "] "
+           << "File " << finalName << " already exists. It will be updated if needed.\n";
     //Copying its contents:
     char buffer[256];
     streamsize nread = -1;
     int vers = readFormatVersion(in, finalName);
-    if(vers==-1){
-      edm::LogWarning("LaserSorter") << "File " << tmpName.c_str()
-                                     << " is not an LMF file despite its extension or "
+    if (vers == -1) {
+      edm::LogWarning("LaserSorter") << "File " << tmpName.c_str() << " is not an LMF file despite its extension or "
                                      << "it is corrupted.\n";
-    } else if(vers!=formatVersion_){
-      edm::LogWarning("LaserSorter") << "Cannot include events already in file "
-                                     << tmpName.c_str()
+    } else if (vers != formatVersion_) {
+      edm::LogWarning("LaserSorter") << "Cannot include events already in file " << tmpName.c_str()
                                      << " because of version "
-                                     << "mismatch (found version "
-                                     << (int)vers << " while "
-                                     << "only version "
-                                     << (int)formatVersion_
-                                     << " is supported).\n";
-    } else{
+                                     << "mismatch (found version " << (int)vers << " while "
+                                     << "only version " << (int)formatVersion_ << " is supported).\n";
+    } else {
       newFile = false;
       //read index table offset value:
-      const int indexTableOffsetPos8 = 1*sizeof(uint32_t);
+      const int indexTableOffsetPos8 = 1 * sizeof(uint32_t);
       uint32_t indexTableOffsetValue = 0;
       in.clear();
       in.seekg(indexTableOffsetPos8, ios::beg);
-      in.read((char*) &indexTableOffsetValue,
-              sizeof(indexTableOffsetValue));
-      if(in.fail()){
-        cout << "[LaserSorter " << now() << "] " << "Failed to read offset of index table "
-          " in the existing file " << finalName << "\n";
-      } else{
-        if(verbosity_>2) cout << "[LaserSorter " << now() << "] " << "Index table offset of "
-                           "original file " << finalName << ": 0x"
-                              << hex << setfill('0')
-                              << setw(8) << indexTableOffsetValue
-                              << dec << setfill(' ') << "\n";
+      in.read((char*)&indexTableOffsetValue, sizeof(indexTableOffsetValue));
+      if (in.fail()) {
+        cout << "[LaserSorter " << now() << "] "
+             << "Failed to read offset of index table "
+                " in the existing file "
+             << finalName << "\n";
+      } else {
+        if (verbosity_ > 2)
+          cout << "[LaserSorter " << now() << "] "
+               << "Index table offset of "
+                  "original file "
+               << finalName << ": 0x" << hex << setfill('0') << setw(8) << indexTableOffsetValue << dec << setfill(' ')
+               << "\n";
       }
       in.clear();
       in.seekg(0, ios::beg);
 
       //copy legacy file contents except the index table
       uint32_t toRead = indexTableOffsetValue;
-      cout << "[LaserSorter " << now() << "] " << "Copying " << finalName << " to " << tmpName << endl;
-      while(!in.eof()
-            && (toRead > 0)
-            && (nread=in.readsome(buffer, min(toRead, (uint32_t)sizeof(buffer))))!=0){
+      cout << "[LaserSorter " << now() << "] "
+           << "Copying " << finalName << " to " << tmpName << endl;
+      while (!in.eof() && (toRead > 0) && (nread = in.readsome(buffer, min(toRead, (uint32_t)sizeof(buffer)))) != 0) {
         //         cout << "Writing " << nread << " bytes to file "
         //              << tmpName.c_str() << "\n";
         toRead -= nread;
         // out->seekp(0, ios::end);
         out->write(buffer, nread);
-        if(out->bad()){
-          throw cms::Exception("LaserSorter") << "Error while writing to file "
-                                              << tmpName
-                                              << ". Check if there is enough "
-                                              << "space on the device.\n";
+        if (out->bad()) {
+          throw cms::Exception("LaserSorter")
+              << "Error while writing to file " << tmpName << ". Check if there is enough "
+              << "space on the device.\n";
         }
       }
 
       //resets index table offset field:
-      indexTableOffsetValue = 0 ;
+      indexTableOffsetValue = 0;
       out->clear();
       out->seekp(indexTableOffsetPos8, ios::beg);
       out->write((char*)&indexTableOffsetValue, sizeof(uint32_t));
@@ -756,16 +714,14 @@ LaserSorter::createOutStream(int fedId,
   char c;
   cin >> c;
 #endif
-  
-  OutStreamRecord* outRcd = new OutStreamRecord(fedId, lumiBlock,
-                                                out,
-                                                tmpName, finalName);
-  
-  if(newFile){
+
+  OutStreamRecord* outRcd = new OutStreamRecord(fedId, lumiBlock, out, tmpName, finalName);
+
+  if (newFile) {
     writeFileHeader(*out);
-  } else{
+  } else {
     std::string errMsg;
-    if(!readIndexTable(in, finalName, *outRcd, &errMsg)){
+    if (!readIndexTable(in, finalName, *outRcd, &errMsg)) {
       throw cms::Exception("LaserSorter") << errMsg << "\n";
     }
   }
@@ -773,10 +729,10 @@ LaserSorter::createOutStream(int fedId,
   return outStreamList_.insert(outStreamList_.end(), outRcd);
 }
 
-void LaserSorter::writeFileHeader(std::ofstream& out){
+void LaserSorter::writeFileHeader(std::ofstream& out) {
   out.clear();
-  
-  uint32_t id = 'L' | ('M' <<8) | ('F' <<16) | (formatVersion_<<24);
+
+  uint32_t id = 'L' | ('M' << 8) | ('F' << 16) | (formatVersion_ << 24);
 
   out.write((char*)&id, sizeof(uint32_t));
 
@@ -784,149 +740,135 @@ void LaserSorter::writeFileHeader(std::ofstream& out){
   uint32_t zero = 0;
   out.write((char*)&zero, sizeof(uint32_t));
 
-  if(out.fail()){
-    throw cms::Exception("LaserSorter")
-      << "Failed to write file header.\n";
+  if (out.fail()) {
+    throw cms::Exception("LaserSorter") << "Failed to write file header.\n";
   }
 }
 
-bool LaserSorter::writeEventHeader(std::ofstream& out,
-                                   const edm::Event& evt,
-                                   int dtt,
-                                   unsigned nFeds){
+bool LaserSorter::writeEventHeader(std::ofstream& out, const edm::Event& evt, int dtt, unsigned nFeds) {
   uint32_t data[10];
   timeval tt = {0, 0};
-  if((evt.time().value() >>32)){
+  if ((evt.time().value() >> 32)) {
     tt.tv_usec = evt.time().value() & 0xFFFFFFFF;
-    tt.tv_sec = evt.time().value() >>32;
-  } else if(orbitZeroTime_.tv_sec){
-    div_t dt = div(orbit_*89.1, 1000*1000); //one orbit lasts 89.1 microseconds
+    tt.tv_sec = evt.time().value() >> 32;
+  } else if (orbitZeroTime_.tv_sec) {
+    div_t dt = div(orbit_ * 89.1, 1000 * 1000);  //one orbit lasts 89.1 microseconds
     tt.tv_sec = orbitZeroTime_.tv_sec + dt.quot;
     tt.tv_usec = orbitZeroTime_.tv_usec + dt.rem;
-    if(tt.tv_usec > 1000*1000){
-      tt.tv_usec -= 1000*1000;
+    if (tt.tv_usec > 1000 * 1000) {
+      tt.tv_usec -= 1000 * 1000;
       tt.tv_sec += 1;
     }
   }
-    
+
   data[0] = tt.tv_usec;
   data[1] = tt.tv_sec;
   data[2] = evt.luminosityBlock();
-  data[3] = evt.run();     
+  data[3] = evt.run();
   data[4] = orbit_;
   data[5] = evt.bunchCrossing();
   data[6] = evt.id().event();
   data[7] = dtt;
   data[8] = nFeds;
-  data[9] = 0; //reserved (to be aligned on 64-bits)
-
-  if(verbosity_>1){
-    cout << "[LaserSorter " << now() << "] " << "Write header of event: "
-         << "Time: " << toString(evt.time().value())
-         << ", LB: " << evt.luminosityBlock()
-         << ", Run: " << evt.run()
-         << ", Bx: " << evt.bunchCrossing()
-         << ", Event ID: " << evt.id().event()
-         << ", Detailed trigger type: 0x" << hex << dtt << dec
-         << " (" << detailedTrigNames[(dtt>>8)&0x7]  << ", "
-         << colorNames[(dtt>>6)&0x3] << ", DCC " << (dtt&0x3f)
-         << ", side " << ((dtt>>10) &0x1) << ")"
+  data[9] = 0;  //reserved (to be aligned on 64-bits)
+
+  if (verbosity_ > 1) {
+    cout << "[LaserSorter " << now() << "] "
+         << "Write header of event: "
+         << "Time: " << toString(evt.time().value()) << ", LB: " << evt.luminosityBlock() << ", Run: " << evt.run()
+         << ", Bx: " << evt.bunchCrossing() << ", Event ID: " << evt.id().event() << ", Detailed trigger type: 0x"
+         << hex << dtt << dec << " (" << detailedTrigNames[(dtt >> 8) & 0x7] << ", " << colorNames[(dtt >> 6) & 0x3]
+         << ", DCC " << (dtt & 0x3f) << ", side " << ((dtt >> 10) & 0x1) << ")"
          << ", number of FEDs: "
          << "\n";
   }
-    
+
   out.clear();
   out.write((char*)data, sizeof(data));
   return !out.bad();
 }
 
-void LaserSorter::streamFileName(int fedId, 
-                                 edm::LuminosityBlockNumber_t lumiBlock, 
-                                 std::string& tmpName, std::string& finalName){
+void LaserSorter::streamFileName(int fedId,
+                                 edm::LuminosityBlockNumber_t lumiBlock,
+                                 std::string& tmpName,
+                                 std::string& finalName) {
   int iFed;
-  if(fedId >= ecalDccFedIdMin_ && fedId <= ecalDccFedIdMax_){
+  if (fedId >= ecalDccFedIdMin_ && fedId <= ecalDccFedIdMax_) {
     iFed = fedId - ecalDccFedIdMin_ + 1;
-  } else if(fedId < 0){
-    iFed = -1; //event w/o ECAL data
+  } else if (fedId < 0) {
+    iFed = -1;  //event w/o ECAL data
   } else {
     iFed = 0;
   }
-  if(iFed < -1 || iFed >= (int)fedSubDirs_.size()){
-    throw cms::Exception("LaserSorter")
-      << "Bug found at " << __FILE__ << ":" << __LINE__ 
-      << ". FED ID is out of index!";
+  if (iFed < -1 || iFed >= (int)fedSubDirs_.size()) {
+    throw cms::Exception("LaserSorter") << "Bug found at " << __FILE__ << ":" << __LINE__
+                                        << ". FED ID is out of index!";
   }
 
-  
   struct stat fileStat;
 
   stringstream buf;
-  buf << outputDir_ << "/"
-      << (iFed<0 ? "Empty" : fedSubDirs_[iFed]);
+  buf << outputDir_ << "/" << (iFed < 0 ? "Empty" : fedSubDirs_[iFed]);
 
   string dir = buf.str();
-  if(0==stat(dir.c_str(), &fileStat)){
-    if(!S_ISDIR(fileStat.st_mode)){
-      throw cms::Exception("[LaserSorter]")
-        << "File " << dir << " exists but is not a directory "
-        << " as expected.";
+  if (0 == stat(dir.c_str(), &fileStat)) {
+    if (!S_ISDIR(fileStat.st_mode)) {
+      throw cms::Exception("[LaserSorter]") << "File " << dir << " exists but is not a directory "
+                                            << " as expected.";
     }
-  } else {//directory does not exists, let's try to create it
-    if(0!=mkdir(dir.c_str(), 0755)){
-      throw cms::Exception("[LaserSorter]")
-        << "Failed to create directory " << dir
-        << " for writing data.";
+  } else {  //directory does not exists, let's try to create it
+    if (0 != mkdir(dir.c_str(), 0755)) {
+      throw cms::Exception("[LaserSorter]") << "Failed to create directory " << dir << " for writing data.";
     }
   }
 
   buf.str("");
-  buf << "Run" << runNumber_
-      << "_LB" << setfill('0') << setw(4) << lumiBlock
-      << ".lmf";
+  buf << "Run" << runNumber_ << "_LB" << setfill('0') << setw(4) << lumiBlock << ".lmf";
   string fileName = buf.str();
   string tmpFileName = fileName + ".part";
 
   finalName = dir + "/" + fileName;
   tmpName = dir + "/" + tmpFileName;
 
-  if(verbosity_>3) cout << "[LaserSorter " << now() << "] " << "File path: "
-                        << finalName << "\n";
+  if (verbosity_ > 3)
+    cout << "[LaserSorter " << now() << "] "
+         << "File path: " << finalName << "\n";
 }
 
-LaserSorter::OutStreamList::iterator
-LaserSorter::closeOutStream(LaserSorter::OutStreamList::iterator
-                            streamRecord){
-  if(streamRecord==outStreamList_.end()) return outStreamList_.end();
-  
-  if(verbosity_) cout << "[LaserSorter " << now() << "] " << "Writing Index table of file "
-                      << streamRecord->finalFileName() << "\n";
+LaserSorter::OutStreamList::iterator LaserSorter::closeOutStream(LaserSorter::OutStreamList::iterator streamRecord) {
+  if (streamRecord == outStreamList_.end())
+    return outStreamList_.end();
+
+  if (verbosity_)
+    cout << "[LaserSorter " << now() << "] "
+         << "Writing Index table of file " << streamRecord->finalFileName() << "\n";
   ofstream& out = *streamRecord->out();
   out.clear();
-  if(!writeIndexTable(out, *streamRecord->indices())){
-    cout << "Error while writing index table for file "
-         << streamRecord->finalFileName() << ". "
+  if (!writeIndexTable(out, *streamRecord->indices())) {
+    cout << "Error while writing index table for file " << streamRecord->finalFileName() << ". "
          << "Resulting file might be corrupted. "
          << "The error can be due to a lack of disk space.";
   }
-  
-  if(verbosity_) cout << "[LaserSorter " << now() << "] " << "Closing file " 
-                      << streamRecord->finalFileName() << ".\n";
+
+  if (verbosity_)
+    cout << "[LaserSorter " << now() << "] "
+         << "Closing file " << streamRecord->finalFileName() << ".\n";
   out.close();
-  
+
   const std::string& tmpFileName = streamRecord->tmpFileName();
   const std::string& finalFileName = streamRecord->finalFileName();
 
-  if(verbosity_) cout << "[LaserSorter " << now() << "] " << "Renaming " << tmpFileName
-                      << " to "    << finalFileName << ".\n";
+  if (verbosity_)
+    cout << "[LaserSorter " << now() << "] "
+         << "Renaming " << tmpFileName << " to " << finalFileName << ".\n";
 
-  if(0!=rename(tmpFileName.c_str(), finalFileName.c_str())){
+  if (0 != rename(tmpFileName.c_str(), finalFileName.c_str())) {
     cout << "[LaserSorter " << now() << "] "
-         << " Failed to rename output file from "
-         << tmpFileName << " to "    << finalFileName
-         << ". " << strerror(errno) << "\n";
+         << " Failed to rename output file from " << tmpFileName << " to " << finalFileName << ". " << strerror(errno)
+         << "\n";
   }
 
-  if(doOutputList_){
+  if (doOutputList_) {
     char buf[256];
     time_t t = time(nullptr);
     strftime(buf, sizeof(buf), "%F %R:%S", localtime(&t));
@@ -934,52 +876,52 @@ LaserSorter::closeOutStream(LaserSorter::OutStreamList::iterator
     ifstream f(".watcherfile");
     string inputFile;
     f >> inputFile;
-    outputList_ << finalFileName << "\t" << buf
-                << "\t" << inputFile
-                << endl;
+    outputList_ << finalFileName << "\t" << buf << "\t" << inputFile << endl;
   }
-  
+
   return outStreamList_.erase(streamRecord);
 }
 
-void LaserSorter::endJob(){
+void LaserSorter::endJob() {
   //TODO: better treatement of last files:
   //they might be imcomplete...
   closeAllStreams();
 }
 
-void LaserSorter::beginJob(){
-}
+void LaserSorter::beginJob() {}
 
-bool LaserSorter::isDccEventEmpty(const FEDRawData& data, size_t* dccLen,
-                                  int* nTowerBlocks) const{
-  if(nTowerBlocks) *nTowerBlocks = 0;
+bool LaserSorter::isDccEventEmpty(const FEDRawData& data, size_t* dccLen, int* nTowerBlocks) const {
+  if (nTowerBlocks)
+    *nTowerBlocks = 0;
   //DCC event is considered empty if it does not contains any Tower block
   //( = FE data)
   bool rc = true;
-  if(dccLen) *dccLen = 0;
-  const unsigned nWord32 = data.size()/sizeof(uint32_t);
-  if(nWord32==0){
+  if (dccLen)
+    *dccLen = 0;
+  const unsigned nWord32 = data.size() / sizeof(uint32_t);
+  if (nWord32 == 0) {
     //cout << "[LaserSorter " << now() << "] " << "FED block completly empty\n";
     return true;
   }
-  for(unsigned iWord32 = 0; iWord32 < nWord32; iWord32 += 2){
+  for (unsigned iWord32 = 0; iWord32 < nWord32; iWord32 += 2) {
     const uint32_t* data32 = ((const uint32_t*)(data.data())) + iWord32;
-    int dataType = (data32[1] >>28) & 0xF;
+    int dataType = (data32[1] >> 28) & 0xF;
     //     cout << hex << "0x" << setfill('0')
     //          << setw(8) << data32[1] << "'" << setw(8) << data32[0]
-    //          << " dataType: 0x" << dataType 
+    //          << " dataType: 0x" << dataType
     //          << dec << setfill(' ') << "\n";
-    if(0==(dataType>>2)){//in DCC header
-      const int dccHeaderId = (data32[1] >>24) & 0x3F;
-      if(dccHeaderId==1){
-        if(dccLen) *dccLen=((data32[0] >>0 ) & 0xFFFFFF);
+    if (0 == (dataType >> 2)) {  //in DCC header
+      const int dccHeaderId = (data32[1] >> 24) & 0x3F;
+      if (dccHeaderId == 1) {
+        if (dccLen)
+          *dccLen = ((data32[0] >> 0) & 0xFFFFFF);
       }
-    } if((dataType>>2)==3){//Tower block
+    }
+    if ((dataType >> 2) == 3) {  //Tower block
       rc = false;
-      if(nTowerBlocks){//number of tower block must be counted
+      if (nTowerBlocks) {  //number of tower block must be counted
         ++(*nTowerBlocks);
-      } else{
+      } else {
         break;
       }
     }
@@ -996,77 +938,76 @@ bool LaserSorter::isDccEventEmpty(const FEDRawData& data, size_t* dccLen,
 
 void LaserSorter::getOutputFedList(const edm::Event& event,
                                    const FEDRawDataCollection& data,
-                                   std::vector<unsigned>& fedIds) const{
+                                   std::vector<unsigned>& fedIds) const {
   fedIds.erase(fedIds.begin(), fedIds.end());
-  for(int id = ecalDccFedIdMin_; id <= ecalDccFedIdMax_; ++id){
+  for (int id = ecalDccFedIdMin_; id <= ecalDccFedIdMax_; ++id) {
     size_t dccLen;
     const FEDRawData& dccEvent = data.FEDData(id);
-    if(!isDccEventEmpty(dccEvent, &dccLen)){
+    if (!isDccEventEmpty(dccEvent, &dccLen)) {
       fedIds.push_back(id);
     }
-    if(dccLen*sizeof(uint64_t)!=dccEvent.size()){
-      edm::LogWarning("LaserSorter")
-        << "Length error in data of FED " << id
-        << " in event " << event.id() 
-        << ", Data of this FED dropped.";
+    if (dccLen * sizeof(uint64_t) != dccEvent.size()) {
+      edm::LogWarning("LaserSorter") << "Length error in data of FED " << id << " in event " << event.id()
+                                     << ", Data of this FED dropped.";
     }
   }
   //   cout << __FILE__ << ":" << __LINE__ << ": "
   //        <<  "data.FEDData(" << matacqFedId_ << ").size() = "
   //        <<  data.FEDData(matacqFedId_).size() << "\n";
-  if(data.FEDData(matacqFedId_).size()>4){//matacq block present
+  if (data.FEDData(matacqFedId_).size() > 4) {  //matacq block present
     //    cout << __FILE__ << ":" << __LINE__ << ": "
     //     <<  "Adding matacq to list of FEDs\n";
     fedIds.push_back(matacqFedId_);
   }
 }
 
-std::vector<int>
-LaserSorter::getFullyReadoutDccs(const FEDRawDataCollection& data) const{
+std::vector<int> LaserSorter::getFullyReadoutDccs(const FEDRawDataCollection& data) const {
   int nTowers;
   vector<int> result;
-  for(int fed = ecalDccFedIdMin_; fed <= ecalDccFedIdMax_; ++fed){
+  for (int fed = ecalDccFedIdMin_; fed <= ecalDccFedIdMax_; ++fed) {
     const FEDRawData& fedData = data.FEDData(fed);
     isDccEventEmpty(fedData, nullptr, &nTowers);
-    if(nTowers>=68) result.push_back(fed);
+    if (nTowers >= 68)
+      result.push_back(fed);
   }
   return result;
 }
 
-
-bool LaserSorter::writeIndexTable(std::ofstream& out,
-                                  std::vector<IndexRecord>& indices){
+bool LaserSorter::writeIndexTable(std::ofstream& out, std::vector<IndexRecord>& indices) {
   uint32_t indexTablePos = out.tellp();
   uint32_t nevts = indices.size();
-  
+
   out.clear();
   out.write((char*)&nevts, sizeof(nevts));
   const uint32_t reserved = 0;
   out.write((const char*)&reserved, sizeof(reserved));
-  
-  if(out.bad()) return false;
+
+  if (out.bad())
+    return false;
 
   sort(indices.begin(), indices.end());
 
-  for(unsigned i = 0; i < indices.size(); ++i){
+  for (unsigned i = 0; i < indices.size(); ++i) {
     uint32_t data[2];
     data[0] = indices[i].orbit;
     data[1] = indices[i].filePos;
     out.write((char*)data, sizeof(data));
   }
 
-  if(out.bad()) return false; //intial 0 valur for index table position
+  if (out.bad())
+    return false;  //intial 0 valur for index table position
   //                            is left to indicate corrupted table.
-  
+
   //writes index table position:x
   out.clear();
-  out.seekp(indexOffset32_*sizeof(uint32_t));
+  out.seekp(indexOffset32_ * sizeof(uint32_t));
   //   cout << "[LaserSorter] Index table position: 0x" << hex << indexTablePos
-  //        << dec << "\n"; 
-  if(!out.bad()) out.write((char*)&indexTablePos, sizeof(uint32_t));
+  //        << dec << "\n";
+  if (!out.bad())
+    out.write((char*)&indexTablePos, sizeof(uint32_t));
 
   bool rc = !out.bad();
-  
+
   //reposition pointer to eof:
   out.seekp(0, ios::end);
 
@@ -1074,146 +1015,144 @@ bool LaserSorter::writeIndexTable(std::ofstream& out,
 }
 
 //beware this method change the pointer position in the ifstream in
-bool LaserSorter::readIndexTable(std::ifstream& in,
-                                 std::string& inName,
-                                 OutStreamRecord& outRcd,
-                                 std::string* err){
+bool LaserSorter::readIndexTable(std::ifstream& in, std::string& inName, OutStreamRecord& outRcd, std::string* err) {
   stringstream errMsg;
 
   ifstream* s = &in;
-  
+
   //streampos pos = s->tellg();
   s->clear();
   s->seekg(0);
-  
+
   uint32_t fileHeader[2];
   s->read((char*)&fileHeader[0], sizeof(fileHeader));
-  uint32_t indexTablePos = fileHeader[1]; 
-  
-  if(s->eof()){
+  uint32_t indexTablePos = fileHeader[1];
+
+  if (s->eof()) {
     s->clear();
     s->seekg(0);
-    errMsg << "Failed to read header of file " << inName
-           << ".";
-    if(err) *err = errMsg.str();
+    errMsg << "Failed to read header of file " << inName << ".";
+    if (err)
+      *err = errMsg.str();
     return false;
   }
-  
+
   s->seekg(indexTablePos);
 
   uint32_t nevts = 0;
   s->read((char*)&nevts, sizeof(nevts));
-  s->ignore(4);  
-  if(s->bad()){
-    errMsg << "Failed to read index table from file "
-           << inName << ".";
-    if(err) *err = errMsg.str();
+  s->ignore(4);
+  if (s->bad()) {
+    errMsg << "Failed to read index table from file " << inName << ".";
+    if (err)
+      *err = errMsg.str();
     return false;
   }
-  if(nevts>maxEvents_){
-    errMsg << "Number of events indicated in event index of file "
-           << inName << " (" << nevts << ") "
+  if (nevts > maxEvents_) {
+    errMsg << "Number of events indicated in event index of file " << inName << " (" << nevts << ") "
            << "is unexpectively large.";
-    if(err) *err = errMsg.str();
+    if (err)
+      *err = errMsg.str();
     return false;
   }
   outRcd.indices()->resize(nevts);
-  s->read((char*)&(*outRcd.indices())[0], nevts*sizeof(IndexRecord));
-  if(s->bad()){
+  s->read((char*)&(*outRcd.indices())[0], nevts * sizeof(IndexRecord));
+  if (s->bad()) {
     outRcd.indices()->clear();
-    errMsg << "Failed to read index table from file "
-           << inName << ".";
-    if(err) *err = errMsg.str();
+    errMsg << "Failed to read index table from file " << inName << ".";
+    if (err)
+      *err = errMsg.str();
     return false;
   }
-  if(nevts>maxEvents_){
-    errMsg << "Number of events indicated in event index of file "
-           << inName << " is unexpectively large.";
-    if(err) *err = errMsg.str();
+  if (nevts > maxEvents_) {
+    errMsg << "Number of events indicated in event index of file " << inName << " is unexpectively large.";
+    if (err)
+      *err = errMsg.str();
     outRcd.indices()->clear();
     return false;
   }
 
-  if(verbosity_ > 1) cout << "[LaserSorter " << now() << "] " << "Orbit IDs of events "
-                          << "already contained in the file "
-                          << inName << ":";
-  for(unsigned i = 0; i < outRcd.indices()->size(); ++i){
-    if(verbosity_>1){
-      cout << " "  << setw(9) << (*outRcd.indices())[i].orbit;
+  if (verbosity_ > 1)
+    cout << "[LaserSorter " << now() << "] "
+         << "Orbit IDs of events "
+         << "already contained in the file " << inName << ":";
+  for (unsigned i = 0; i < outRcd.indices()->size(); ++i) {
+    if (verbosity_ > 1) {
+      cout << " " << setw(9) << (*outRcd.indices())[i].orbit;
     }
     outRcd.excludedOrbit().insert((*outRcd.indices())[i].orbit);
   }
-  if(verbosity_>1) cout << "\n";
+  if (verbosity_ > 1)
+    cout << "\n";
 
   return true;
 }
 
-int LaserSorter::readFormatVersion(std::ifstream& in,
-                                   const std::string& fileName){
+int LaserSorter::readFormatVersion(std::ifstream& in, const std::string& fileName) {
   int vers = -1;
   streampos p = in.tellg();
 
   uint32_t data;
 
   in.read((char*)&data, sizeof(data));
-  
+
   char magic[4];
-  
+
   magic[0] = data & 0xFF;
-  magic[1] = (data >>8) & 0xFF;
-  magic[2] = (data >>16) & 0xFF;
+  magic[1] = (data >> 8) & 0xFF;
+  magic[2] = (data >> 16) & 0xFF;
   magic[3] = 0;
 
-
   const string lmf = string("LMF");
-  
-  if(in.good() && lmf==magic){
-    vers = (data >>24) & 0xFF;
+
+  if (in.good() && lmf == magic) {
+    vers = (data >> 24) & 0xFF;
   }
 
-  if(lmf!=magic){
-    edm::LogWarning("LaserSorter") << "File " << fileName
-                                   << "is not an LMF file.\n";
+  if (lmf != magic) {
+    edm::LogWarning("LaserSorter") << "File " << fileName << "is not an LMF file.\n";
   }
-  
+
   in.clear();
   in.seekg(p);
   return vers;
 }
- 
-std::string LaserSorter::toString(uint64_t t){
+
+std::string LaserSorter::toString(uint64_t t) {
   char buf[256];
-  
-  time_t tsec = t>>32;
-  
+
+  time_t tsec = t >> 32;
+
   uint32_t tusec = t & 0xFFFFFFFF;
   strftime(buf, sizeof(buf), "%F %R %S s", localtime(&tsec));
-  buf[sizeof(buf)-1] = 0;
-  
+  buf[sizeof(buf) - 1] = 0;
+
   stringstream buf2;
-  buf2 << (tusec+500)/1000;
+  buf2 << (tusec + 500) / 1000;
 
   return string(buf) + " " + buf2.str() + " ms";
 }
- 
-void LaserSorter::restoreStreamsOfLumiBlock(int lumiBlock){
+
+void LaserSorter::restoreStreamsOfLumiBlock(int lumiBlock) {
   string dummy;
   string fileName;
-  
-  for(int fedId = ecalDccFedIdMin_-2; fedId <= ecalDccFedIdMax_; ++fedId){
+
+  for (int fedId = ecalDccFedIdMin_ - 2; fedId <= ecalDccFedIdMax_; ++fedId) {
     int fedId_;
-    if(fedId == ecalDccFedIdMin_-2) fedId_ = -1; //stream for event w/o ECAL data
-    else fedId_ = fedId;
+    if (fedId == ecalDccFedIdMin_ - 2)
+      fedId_ = -1;  //stream for event w/o ECAL data
+    else
+      fedId_ = fedId;
     streamFileName(fedId_, lumiBlock, dummy, fileName);
     struct stat s;
     //TODO: could be optimized by adding an option to get stream
     //to open only existing file: would avoid double call to streamFileName.
-    if(stat(fileName.c_str(), &s)==0){//file exists
+    if (stat(fileName.c_str(), &s) == 0) {  //file exists
       getStream(fedId_, lumiBlock);
     }
   }
 }
 
-void LaserSorter::beginRun(edm::Run const& run, edm::EventSetup const& es){
+void LaserSorter::beginRun(edm::Run const& run, edm::EventSetup const& es) {
   //  cout << "Run starts at :" << run.runAuxiliary().beginTime().value() << "\n";
 }
diff --git a/CalibCalorimetry/EcalLaserSorting/src/LmfSource.cc b/CalibCalorimetry/EcalLaserSorting/src/LmfSource.cc
index 98d5db080f5fa..73893dbe87f53 100644
--- a/CalibCalorimetry/EcalLaserSorting/src/LmfSource.cc
+++ b/CalibCalorimetry/EcalLaserSorting/src/LmfSource.cc
@@ -20,101 +20,97 @@ const unsigned char LmfSource::minDataFormatVersion_ = 4;
 const unsigned char LmfSource::maxDataFormatVersion_ = 5;
 const unsigned LmfSource::fileHeaderSize = 2;
 
-
-LmfSource::LmfSource(const ParameterSet& pset,
-		     const InputSourceDescription& desc) :
-  ProducerSourceBase(pset, desc, true),
-  fileNames_(pset.getParameter<vector<string> >("fileNames")),
-  iFile_ (-1),
-  fedId_(-1),
-  fileHeader_(fileHeaderSize),
-  dataFormatVers_(5),
-  rcRead_(false),
-  preScale_(pset.getParameter<unsigned>("preScale")),
-  iEvent_(0),
-  iEventInFile_(0),
-  indexTablePos_(0),
-  orderedRead_(pset.getParameter<bool>("orderedRead")),
-  watchFileList_(pset.getParameter<bool>("watchFileList")),
-  fileListName_(pset.getParameter<std::string>("fileListName")),
-  inputDir_(pset.getParameter<std::string>("inputDir")),
-  nSecondsToSleep_(pset.getParameter<int>("nSecondsToSleep")),
-  verbosity_(pset.getUntrackedParameter<int>("verbosity"))
-{
-  if(preScale_==0) preScale_ = 1;
+LmfSource::LmfSource(const ParameterSet& pset, const InputSourceDescription& desc)
+    : ProducerSourceBase(pset, desc, true),
+      fileNames_(pset.getParameter<vector<string> >("fileNames")),
+      iFile_(-1),
+      fedId_(-1),
+      fileHeader_(fileHeaderSize),
+      dataFormatVers_(5),
+      rcRead_(false),
+      preScale_(pset.getParameter<unsigned>("preScale")),
+      iEvent_(0),
+      iEventInFile_(0),
+      indexTablePos_(0),
+      orderedRead_(pset.getParameter<bool>("orderedRead")),
+      watchFileList_(pset.getParameter<bool>("watchFileList")),
+      fileListName_(pset.getParameter<std::string>("fileListName")),
+      inputDir_(pset.getParameter<std::string>("inputDir")),
+      nSecondsToSleep_(pset.getParameter<int>("nSecondsToSleep")),
+      verbosity_(pset.getUntrackedParameter<int>("verbosity")) {
+  if (preScale_ == 0)
+    preScale_ = 1;
   produces<FEDRawDataCollection>();
   // open fileListName
   if (watchFileList_) {
-    fileList_.open( fileListName_.c_str() );
+    fileList_.open(fileListName_.c_str());
     if (fileList_.fail()) {
-      throw cms::Exception("FileListOpenError")
-        << "Failed to open input file " << fileListName_ << "\n";
+      throw cms::Exception("FileListOpenError") << "Failed to open input file " << fileListName_ << "\n";
     }
   } else {
-  //throws a cms exception if error in fileNames parameter
-  checkFileNames();
+    //throws a cms exception if error in fileNames parameter
+    checkFileNames();
   }
 }
 
-bool LmfSource::readFileHeader(){
-  if(iFile_==-1) return false; //no file open
+bool LmfSource::readFileHeader() {
+  if (iFile_ == -1)
+    return false;  //no file open
+
+  if (verbosity_)
+    cout << "[LmfSource]"
+         << "Opening file #" << (iFile_ + 1) << " '" << currentFileName_ << "'\n";
 
-  if(verbosity_) cout << "[LmfSource]"
-                   << "Opening file #" << (iFile_+1) << " '"
-                   << currentFileName_ << "'\n";
-  
-  in_.read((char*)&fileHeader_[0], fileHeaderSize*sizeof(uint32_t));
+  in_.read((char*)&fileHeader_[0], fileHeaderSize * sizeof(uint32_t));
 
-  if(in_.eof()) return false;
-  
-  if(verbosity_){
+  if (in_.eof())
+    return false;
+
+  if (verbosity_) {
     cout << "[LmfSource]"
          << "File header (in hex):" << hex;
-    for(unsigned i=0; i < fileHeaderSize; ++i){ 
-      if(i%8==0) cout << "\n";
+    for (unsigned i = 0; i < fileHeaderSize; ++i) {
+      if (i % 8 == 0)
+        cout << "\n";
       cout << setw(8) << fileHeader_[i] << " ";
     }
     cout << dec << "\n";
   }
 
-
   char id[4];
 
   id[0] = fileHeader_[0] & 0xFF;
-  id[1] = (fileHeader_[0] >>8) & 0xFF;
-  id[2] = (fileHeader_[0] >>16) & 0xFF;
-  id[3] = (fileHeader_[0] >>24) & 0xFF;
-  
-  if(!(id[0]=='L' && id[1] == 'M'
-       && id[2] == 'F')){
-    throw cms::Exception("FileReadError")
-      << currentFileName_ << " is not a file in LMF format!";
+  id[1] = (fileHeader_[0] >> 8) & 0xFF;
+  id[2] = (fileHeader_[0] >> 16) & 0xFF;
+  id[3] = (fileHeader_[0] >> 24) & 0xFF;
+
+  if (!(id[0] == 'L' && id[1] == 'M' && id[2] == 'F')) {
+    throw cms::Exception("FileReadError") << currentFileName_ << " is not a file in LMF format!";
   }
   dataFormatVers_ = id[3];
-  if(verbosity_) cout << "[LmfSource]"
-                   << "LMF format: " << (int)dataFormatVers_ << "\n";
-  
-  if(dataFormatVers_ > maxDataFormatVersion_
-     || dataFormatVers_ < minDataFormatVersion_){
-    throw cms::Exception("FileReadError")
-      << currentFileName_ << ": LMF format version " << (int) dataFormatVers_
-      << " is not supported by this release of LmfSource module";
+  if (verbosity_)
+    cout << "[LmfSource]"
+         << "LMF format: " << (int)dataFormatVers_ << "\n";
+
+  if (dataFormatVers_ > maxDataFormatVersion_ || dataFormatVers_ < minDataFormatVersion_) {
+    throw cms::Exception("FileReadError") << currentFileName_ << ": LMF format version " << (int)dataFormatVers_
+                                          << " is not supported by this release of LmfSource module";
   }
 
   indexTablePos_ = fileHeader_[1];
 
-  if(verbosity_) cout << "[LmfSource] File position of index table: 0x"
-                   << setfill('0') << hex << setw(8) << indexTablePos_
-                   << setfill(' ') << dec << "\n";
-  
-  if(dataFormatVers_ < 5){
+  if (verbosity_)
+    cout << "[LmfSource] File position of index table: 0x" << setfill('0') << hex << setw(8) << indexTablePos_
+         << setfill(' ') << dec << "\n";
+
+  if (dataFormatVers_ < 5) {
     in_.ignore(4);
   }
-    
+
   return true;
 }
 
-void LmfSource::produce(edm::Event& evt){
+void LmfSource::produce(edm::Event& evt) {
   //   bool rc;
   //   while(!((rc = readFileHeader()) & readEventPayload())){
   //     if(openFile(++iFile_)==false){//no more files
@@ -125,14 +121,15 @@ void LmfSource::produce(edm::Event& evt){
   //   }
   auto coll = std::make_unique<FEDRawDataCollection>();
   coll->swap(fedColl_);
-  if(verbosity_) cout << "[LmfSource] Putting FEDRawDataCollection in event\n";
+  if (verbosity_)
+    cout << "[LmfSource] Putting FEDRawDataCollection in event\n";
   evt.put(std::move(coll));
 }
 
-bool LmfSource::openFile(int iFile){
+bool LmfSource::openFile(int iFile) {
   iEventInFile_ = 0;
-  if(watchFileList_) {
-    for ( ;; ) {
+  if (watchFileList_) {
+    for (;;) {
       // read the first field of the line, which must be the filename
       fileList_ >> currentFileName_;
       currentFileName_ = inputDir_ + "/" + currentFileName_;
@@ -140,344 +137,335 @@ bool LmfSource::openFile(int iFile){
         // skip the rest of the line
         std::string tmp_buffer;
         std::getline(fileList_, tmp_buffer);
-        if(verbosity_) cout << "[LmfSource]"
-          << "Opening file " << currentFileName_ << "\n";
+        if (verbosity_)
+          cout << "[LmfSource]"
+               << "Opening file " << currentFileName_ << "\n";
         in_.open(currentFileName_.c_str());
         if (!in_.fail()) {
           // file was successfully open
           return true;
         } else {
           // skip file
-          edm::LogError("FileOpenError")
-            << "Failed to open input file " << currentFileName_ << ". Skipping file\n";
+          edm::LogError("FileOpenError") << "Failed to open input file " << currentFileName_ << ". Skipping file\n";
           in_.close();
           in_.clear();
         }
       }
       // if here, no new file is available: sleep and retry later
-      if (verbosity_) std::cout << "[LmfSource]"
-        << " going to sleep 5 seconds\n";
+      if (verbosity_)
+        std::cout << "[LmfSource]"
+                  << " going to sleep 5 seconds\n";
       sleep(nSecondsToSleep_);
       fileList_.clear();
     }
   } else {
-    if(iFile > (int)fileNames_.size()-1) return false;
+    if (iFile > (int)fileNames_.size() - 1)
+      return false;
     currentFileName_ = fileNames_[iFile];
-    if(verbosity_) cout << "[LmfSource]"
-      << "Opening file " << currentFileName_ << "\n";
+    if (verbosity_)
+      cout << "[LmfSource]"
+           << "Opening file " << currentFileName_ << "\n";
     in_.open(currentFileName_.c_str());
-    if(in_.fail()){
-      throw cms::Exception("FileOpenError")
-        << "Failed to open input file " << currentFileName_ << "\n";
+    if (in_.fail()) {
+      throw cms::Exception("FileOpenError") << "Failed to open input file " << currentFileName_ << "\n";
     }
   }
   return true;
 }
 
-bool LmfSource::nextEventWithinFile(){
-  if(iFile_<0) return false; //no file opened.
-  if(orderedRead_){
-    if(iEventInFile_>=indexTable_.size()) return false;
-    if(verbosity_){
-      cout << "[LmfSource] move to event with orbit Id "
-           << indexTable_[iEventInFile_].orbit
-           << " at file position 0x"
-           << hex << setfill('0')
-           << setw(8) << indexTable_[iEventInFile_].filePos
-           << setfill(' ') << dec << "\n";
+bool LmfSource::nextEventWithinFile() {
+  if (iFile_ < 0)
+    return false;  //no file opened.
+  if (orderedRead_) {
+    if (iEventInFile_ >= indexTable_.size())
+      return false;
+    if (verbosity_) {
+      cout << "[LmfSource] move to event with orbit Id " << indexTable_[iEventInFile_].orbit << " at file position 0x"
+           << hex << setfill('0') << setw(8) << indexTable_[iEventInFile_].filePos << setfill(' ') << dec << "\n";
     }
     const streampos pos = indexTable_[iEventInFile_].filePos;
     in_.clear();
     in_.seekg(pos);
-    if(in_.bad()){
-      cout << "[LmfSource] Problem while reading file "
-           << currentFileName_ << ". Problem with event index table?\n";
+    if (in_.bad()) {
+      cout << "[LmfSource] Problem while reading file " << currentFileName_ << ". Problem with event index table?\n";
       return false;
     }
     ++iEventInFile_;
     return true;
-  } else{
+  } else {
     return true;
   }
 }
-               
-bool LmfSource::readEvent(bool doSkip){
-  while(!(nextEventWithinFile() && readEventWithinFile(doSkip))){
+
+bool LmfSource::readEvent(bool doSkip) {
+  while (!(nextEventWithinFile() && readEventWithinFile(doSkip))) {
     //failed to read event. Let's look for next file:
     in_.close();
     in_.clear();
     bool rcOpen = openFile(++iFile_);
-    if(rcOpen==false){//no more files
-      if(verbosity_) cout << "[LmfSource]"
-		       << "No more input file";
+    if (rcOpen == false) {  //no more files
+      if (verbosity_)
+        cout << "[LmfSource]"
+             << "No more input file";
       rcRead_ = false;
       return rcRead_;
     }
     rcRead_ = readFileHeader();
-    if(verbosity_) cout << "File header readout "
-		     << (rcRead_?"succeeded":"failed") << "\n";
-    if(rcRead_ && orderedRead_) readIndexTable();
+    if (verbosity_)
+      cout << "File header readout " << (rcRead_ ? "succeeded" : "failed") << "\n";
+    if (rcRead_ && orderedRead_)
+      readIndexTable();
   }
   return rcRead_;
 }
- 
-bool LmfSource::setRunAndEventInfo(EventID& id, TimeValue_t& time, edm::EventAuxiliary::ExperimentType& eType){
+
+bool LmfSource::setRunAndEventInfo(EventID& id, TimeValue_t& time, edm::EventAuxiliary::ExperimentType& eType) {
   //empties collection:
-  if(fedId_>0){
+  if (fedId_ > 0) {
     fedColl_.FEDData(fedId_).resize(0);
   }
-  if(verbosity_) cout << "[LmfSource]"
-		   << "About to read event...\n";
+  if (verbosity_)
+    cout << "[LmfSource]"
+         << "About to read event...\n";
 
   bool rc;
-  for(;;){
-    if(filter()){//event to read
+  for (;;) {
+    if (filter()) {  //event to read
       rc = readEvent();
-      break;    //either event is read or no more event
-    } else { //event to skip
+      break;  //either event is read or no more event
+    } else {  //event to skip
       rc = readEvent(true);
-      if(rc==false){//no more events
-	break;
+      if (rc == false) {  //no more events
+        break;
       }
     }
   }
 
-  if(!rc) return false; //event readout failed
-    
-  if(verbosity_) cout << "[LmfSource]"
-		   << "Setting event time to "
-		   << /*toString(*/timeStamp_/*)*/ << ", "
-		   << "Run number to " << runNum_ << ","
-		   << "Event number to " << eventNum_ << "\n";
+  if (!rc)
+    return false;  //event readout failed
+
+  if (verbosity_)
+    cout << "[LmfSource]"
+         << "Setting event time to " << /*toString(*/ timeStamp_ /*)*/ << ", "
+         << "Run number to " << runNum_ << ","
+         << "Event number to " << eventNum_ << "\n";
 
   time = timeStamp_;
   id = EventID(runNum_, lumiBlock_, eventNum_);
-  return true; 
+  return true;
 }
 
-bool LmfSource::readEventWithinFile(bool doSkip){
-  if(iFile_==-1 || !rcRead_) return false; //no file open
+bool LmfSource::readEventWithinFile(bool doSkip) {
+  if (iFile_ == -1 || !rcRead_)
+    return false;  //no file open
   //                                         or header reading failed
   //number of 32-bit word to read first to get the event size
   //field
-  const int timeStamp32[]      = {0, 0}; //timestamp is 64-bit long
-  const int lumiBlock32[]      = {2, 2};
-  const int runNum32[]         = {3, 3};
-  const int orbitNum32[]       = {4, 4};
-  const int bx32[]             = {5, 5};
-  const int eventNum32[]       = {6, 6};
-  const int activeFedId32[]    = {7,-1};
-  const int calibTrig32[]      = {-1,7};
-  const int nFeds32[]          = {-1,8};
+  const int timeStamp32[] = {0, 0};  //timestamp is 64-bit long
+  const int lumiBlock32[] = {2, 2};
+  const int runNum32[] = {3, 3};
+  const int orbitNum32[] = {4, 4};
+  const int bx32[] = {5, 5};
+  const int eventNum32[] = {6, 6};
+  const int activeFedId32[] = {7, -1};
+  const int calibTrig32[] = {-1, 7};
+  const int nFeds32[] = {-1, 8};
   // const int reserved32[]       = {-1,9};
-  const int evtHeadSize32[]    = {8,10};
-  
-  const unsigned char iv = dataFormatVers_-minDataFormatVersion_;
-  assert(iv<=sizeof(timeStamp32)/sizeof(timeStamp32[0]));
-  
-  if((int)header_.size() < evtHeadSize32[iv]) header_.resize(evtHeadSize32[iv]);
+  const int evtHeadSize32[] = {8, 10};
+
+  const unsigned char iv = dataFormatVers_ - minDataFormatVersion_;
+  assert(iv <= sizeof(timeStamp32) / sizeof(timeStamp32[0]));
 
+  if ((int)header_.size() < evtHeadSize32[iv])
+    header_.resize(evtHeadSize32[iv]);
 
-  if(verbosity_) cout << "[LmfSource]"
-		   << "Reading event header\n";
+  if (verbosity_)
+    cout << "[LmfSource]"
+         << "Reading event header\n";
 
-  in_.read((char*)&header_[0], evtHeadSize32[iv]*4);
-  if(in_.bad()){//reading error other than eof
-    throw cms::Exception("FileReadError")
-      << "Error while reading from file " << currentFileName_;
+  in_.read((char*)&header_[0], evtHeadSize32[iv] * 4);
+  if (in_.bad()) {  //reading error other than eof
+    throw cms::Exception("FileReadError") << "Error while reading from file " << currentFileName_;
   }
-  if(in_.eof()) return false;
+  if (in_.eof())
+    return false;
 
-  if(verbosity_){
+  if (verbosity_) {
     cout << "[LmfSource]"
-	 << "Event header (in hex):" << hex << setfill('0');
-    for(int i=0; i < evtHeadSize32[iv]; ++i){ 
-      if(i%8==0) cout << "\n";
+         << "Event header (in hex):" << hex << setfill('0');
+    for (int i = 0; i < evtHeadSize32[iv]; ++i) {
+      if (i % 8 == 0)
+        cout << "\n";
       cout << setw(8) << header_[i] << " ";
     }
     cout << dec << setfill(' ') << "\n";
   }
-  
-  timeStamp_   = *(uint64_t*)&header_[timeStamp32[iv]];
-  lumiBlock_   = header_[lumiBlock32[iv]];
-  runNum_      = header_[runNum32[iv]];
-  orbitNum_    = header_[orbitNum32[iv]];
-  eventNum_    = header_[eventNum32[iv]];
-  bx_          = header_[bx32[iv]];
-  calibTrig_   = calibTrig32[iv]>=0?header_[calibTrig32[iv]]:0;
-  int activeFedId = activeFedId32[iv]>=0?
-    header_[activeFedId32[iv]]:
-    ((calibTrig_ & 0x3F) + 600);
-  nFeds_       = nFeds32[iv] < 0 ? 1 : header_[nFeds32[iv]];
-  
-  if(verbosity_){
-    time_t t = time_t(timeStamp_ >>32);
+
+  timeStamp_ = *(uint64_t*)&header_[timeStamp32[iv]];
+  lumiBlock_ = header_[lumiBlock32[iv]];
+  runNum_ = header_[runNum32[iv]];
+  orbitNum_ = header_[orbitNum32[iv]];
+  eventNum_ = header_[eventNum32[iv]];
+  bx_ = header_[bx32[iv]];
+  calibTrig_ = calibTrig32[iv] >= 0 ? header_[calibTrig32[iv]] : 0;
+  int activeFedId = activeFedId32[iv] >= 0 ? header_[activeFedId32[iv]] : ((calibTrig_ & 0x3F) + 600);
+  nFeds_ = nFeds32[iv] < 0 ? 1 : header_[nFeds32[iv]];
+
+  if (verbosity_) {
+    time_t t = time_t(timeStamp_ >> 32);
     div_t t_ms_us = div(timeStamp_ & 0xFFFFFFFF, 1000);
     char tbuf[256];
     strftime(tbuf, sizeof(tbuf), "%F %T", localtime(&t));
-    tbuf[sizeof(tbuf)-1] = 0;
+    tbuf[sizeof(tbuf) - 1] = 0;
     cout << "[LmfSource] "
-	 << "timeStamp:          " << /*toString(timeStamp_)*/ timeStamp_ 
-	 << " (" << tbuf << " " << t_ms_us.quot << " ms " << t_ms_us.rem   << " us)\n"
-	 << "lumiBlock:          " << lumiBlock_ << "\n"
-	 << "runNum:             " << runNum_ << "\n"
-	 << "orbitNum:           " << orbitNum_ << "\n"
-	 << "eventNum:           " << eventNum_ << "\n"
-	 << "bx:                 " << bx_ << "\n"
-	 << "activeFedId:        " << activeFedId << "\n"
-         << "Calib trigger type: " << ((calibTrig_ >>8) & 0x3) << "\n"
-         << "Color:              " << ((calibTrig_ >>6) & 0x3) << "\n"
-	 << "Side:               " << ((calibTrig_ >>11) & 0x1) << "\n"
+         << "timeStamp:          " << /*toString(timeStamp_)*/ timeStamp_ << " (" << tbuf << " " << t_ms_us.quot
+         << " ms " << t_ms_us.rem << " us)\n"
+         << "lumiBlock:          " << lumiBlock_ << "\n"
+         << "runNum:             " << runNum_ << "\n"
+         << "orbitNum:           " << orbitNum_ << "\n"
+         << "eventNum:           " << eventNum_ << "\n"
+         << "bx:                 " << bx_ << "\n"
+         << "activeFedId:        " << activeFedId << "\n"
+         << "Calib trigger type: " << ((calibTrig_ >> 8) & 0x3) << "\n"
+         << "Color:              " << ((calibTrig_ >> 6) & 0x3) << "\n"
+         << "Side:               " << ((calibTrig_ >> 11) & 0x1) << "\n"
          << "nFeds:              " << nFeds_ << "\n";
   }
 
   const int dccLenOffset32 = 2;
-  const int fedIdOffset32  = 0; 
-  const int nPreRead32     = 3;
+  const int fedIdOffset32 = 0;
+  const int nPreRead32 = 3;
   vector<int32_t> buf(nPreRead32);
-  for(int iFed = 0; iFed < nFeds_; ++iFed){  
-    in_.read((char*) &buf[0], nPreRead32*sizeof(uint32_t));
+  for (int iFed = 0; iFed < nFeds_; ++iFed) {
+    in_.read((char*)&buf[0], nPreRead32 * sizeof(uint32_t));
 
-    if(verbosity_){
+    if (verbosity_) {
       cout << "[LmfSource] " << nPreRead32 << " first 32-bit words of "
            << "FED block: " << hex << setfill('0');
-      for(unsigned i = 0; i< buf.size(); ++i){
+      for (unsigned i = 0; i < buf.size(); ++i) {
         cout << "0x" << setw(8) << buf[i] << " ";
       }
       cout << dec << setfill(' ');
     }
-        
-    
-    if(in_.bad()) return false;
-    
-    const unsigned eventSize64 = buf[dccLenOffset32] &  0x00FFFFFF;
-    const unsigned eventSize32 = eventSize64*2;
-    const unsigned eventSize8  = eventSize64*8;
-    const unsigned fedId_      = (buf[fedIdOffset32] >>8) & 0xFFF;
-
-    if(eventSize8 > maxEventSize_){
+
+    if (in_.bad())
+      return false;
+
+    const unsigned eventSize64 = buf[dccLenOffset32] & 0x00FFFFFF;
+    const unsigned eventSize32 = eventSize64 * 2;
+    const unsigned eventSize8 = eventSize64 * 8;
+    const unsigned fedId_ = (buf[fedIdOffset32] >> 8) & 0xFFF;
+
+    if (eventSize8 > maxEventSize_) {
       throw cms::Exception("FileReadError")
-        << "Size of event fragment (FED block) read from "
-        << " data of file " << currentFileName_
-        << "is unexpctively large (" << (eventSize8 >>10)
-        << " kByte). "
-        << "This must be an error (corrupted file?)\n";
+          << "Size of event fragment (FED block) read from "
+          << " data of file " << currentFileName_ << "is unexpctively large (" << (eventSize8 >> 10) << " kByte). "
+          << "This must be an error (corrupted file?)\n";
     }
-    
-    if(!FEDNumbering::inRange(fedId_)){
-      throw cms::Exception("FileReadError")
-        << "Invalid FED number read from data file.";
+
+    if (!FEDNumbering::inRange(fedId_)) {
+      throw cms::Exception("FileReadError") << "Invalid FED number read from data file.";
     }
 
-    int32_t toRead8 = (eventSize32-nPreRead32)*sizeof(int32_t);
+    int32_t toRead8 = (eventSize32 - nPreRead32) * sizeof(int32_t);
 
-    if(toRead8<0){
+    if (toRead8 < 0) {
       throw cms::Exception("FileReadError")
-        << "Event size error while reading an event from file "
-        << currentFileName_ << "\n";
+          << "Event size error while reading an event from file " << currentFileName_ << "\n";
     }
-    
-    if(doSkip){//event to skip
-      if(verbosity_) cout << "[LmfSource] "
-                       << "Skipping on event. Move file pointer "
-                       << toRead8 << " ahead.\n";
+
+    if (doSkip) {  //event to skip
+      if (verbosity_)
+        cout << "[LmfSource] "
+             << "Skipping on event. Move file pointer " << toRead8 << " ahead.\n";
       in_.seekg(toRead8, ios::cur);
-      if(in_.bad()){//reading error other than eof
-        throw cms::Exception("FileReadError")
-          << "Error while reading from file " << currentFileName_;
+      if (in_.bad()) {  //reading error other than eof
+        throw cms::Exception("FileReadError") << "Error while reading from file " << currentFileName_;
       }
-    } else{
+    } else {
       //reads FED data:
       FEDRawData& data_ = fedColl_.FEDData(fedId_);
       data_.resize(eventSize8);
-      
+
       //copy already read data:
       copy(buf.begin(), buf.end(), (int32_t*)data_.data());
-      
-      in_.read((char*)(data_.data()) + nPreRead32*4,
-               toRead8);
-      
-      if(in_.bad()){//reading error other than eof
-        throw cms::Exception("FileReadError")
-          << "Error while reading from file " << currentFileName_;
+
+      in_.read((char*)(data_.data()) + nPreRead32 * 4, toRead8);
+
+      if (in_.bad()) {  //reading error other than eof
+        throw cms::Exception("FileReadError") << "Error while reading from file " << currentFileName_;
       }
-    
-      if(verbosity_ && data_.size()>16){
+
+      if (verbosity_ && data_.size() > 16) {
         cout << "[LmfSource]"
              << "Head of DCC data (in hex):" << hex;
-        for(int i=0; i < 16; ++i){ 
-          if(i%8==0) cout << "\n";
+        for (int i = 0; i < 16; ++i) {
+          if (i % 8 == 0)
+            cout << "\n";
           cout << setw(8) << ((uint32_t*)data_.data())[i] << " ";
         }
         cout << dec << "\n";
       }
 
-      if(dataFormatVers_<=4){//calib trigger in not in event header.
+      if (dataFormatVers_ <= 4) {  //calib trigger in not in event header.
         //                    gets it from DCC block
-        calibTrig_ = (((uint32_t*)data_.data())[5] & 0xFC0)
-          | ((activeFedId-600) &  0x3F);
-        if(verbosity_){
+        calibTrig_ = (((uint32_t*)data_.data())[5] & 0xFC0) | ((activeFedId - 600) & 0x3F);
+        if (verbosity_) {
           cout << "[LmfSource] Old data format. "
-            "Uses information read from FED block to retrieve calibration "
-            "trigger type. Value is: 0x"
-               << hex << setfill('0') << setw(3) << calibTrig_
-               << setfill(' ') << dec << "\n";
+                  "Uses information read from FED block to retrieve calibration "
+                  "trigger type. Value is: 0x"
+               << hex << setfill('0') << setw(3) << calibTrig_ << setfill(' ') << dec << "\n";
         }
       }
     }
-    if(in_.eof()) return false;
+    if (in_.eof())
+      return false;
   }
   ++iEvent_;
   return true;
 }
 
-bool LmfSource::filter() const{
-  return (iEvent_%preScale_==0);
-}
-	    
-std::string LmfSource::toString(TimeValue_t& t) const{
+bool LmfSource::filter() const { return (iEvent_ % preScale_ == 0); }
+
+std::string LmfSource::toString(TimeValue_t& t) const {
   char buf[256];
-  const int secTousec = 1000*1000;
-  time_t tsec = t/secTousec;
-  uint32_t tusec = (uint32_t)(t-tsec);
+  const int secTousec = 1000 * 1000;
+  time_t tsec = t / secTousec;
+  uint32_t tusec = (uint32_t)(t - tsec);
   strftime(buf, sizeof(buf), "%F %R %S s", localtime(&tsec));
-  buf[sizeof(buf)-1] = 0;
+  buf[sizeof(buf) - 1] = 0;
   stringstream buf2;
-  buf2 << (tusec+500)/1000;
+  buf2 << (tusec + 500) / 1000;
   return string(buf) + " " + buf2.str() + " ms";
 }
 
-void LmfSource::checkFileNames(){
-  for(unsigned i = 0; i < fileNames_.size(); ++i){
+void LmfSource::checkFileNames() {
+  for (unsigned i = 0; i < fileNames_.size(); ++i) {
     std::string& fileName = fileNames_[i];
     const char s[] = "file:";
-    if(fileName.compare(0, sizeof(s)-1, s)==0){ //file: prefix => to strip
-      fileName.erase(fileName.begin(),
-		     fileName.begin() + sizeof(s)-1);
+    if (fileName.compare(0, sizeof(s) - 1, s) == 0) {  //file: prefix => to strip
+      fileName.erase(fileName.begin(), fileName.begin() + sizeof(s) - 1);
     }
-    if(fileName.find_first_of(":")!=string::npos){
-      throw cms::Exception("LmfSource")
-	<< "Character ':' is not allowed in paths specified fileNames "
-	<< "parameter. Please note only local file (or NFS, AFS)"
-	<< " is supported (no rfio, no /store)";
+    if (fileName.find_first_of(":") != string::npos) {
+      throw cms::Exception("LmfSource") << "Character ':' is not allowed in paths specified fileNames "
+                                        << "parameter. Please note only local file (or NFS, AFS)"
+                                        << " is supported (no rfio, no /store)";
     }
     const char s1[] = "/store";
-    if(fileName.compare(0, sizeof(s1)-1, s1)==0){
-      throw cms::Exception("LmfSource")
-	<< "CMSSW /store not supported by LmfSource. Only local file "
-	<< "(or NFS/AFS) allowed. Path starting with /store not permitted";
+    if (fileName.compare(0, sizeof(s1) - 1, s1) == 0) {
+      throw cms::Exception("LmfSource") << "CMSSW /store not supported by LmfSource. Only local file "
+                                        << "(or NFS/AFS) allowed. Path starting with /store not permitted";
     }
   }
 }
 
-void LmfSource::readIndexTable(){
-
+void LmfSource::readIndexTable() {
   stringstream errMsg;
-  errMsg << "Error while reading event index table of file "
-         << currentFileName_ << ". Try to read it with "
+  errMsg << "Error while reading event index table of file " << currentFileName_ << ". Try to read it with "
          << "option orderedRead disabled.\n";
 
-  if(indexTablePos_==0) throw cms::Exception("LmfSource") << errMsg.str();
+  if (indexTablePos_ == 0)
+    throw cms::Exception("LmfSource") << errMsg.str();
 
   in_.clear();
   in_.seekg(indexTablePos_);
@@ -485,15 +473,15 @@ void LmfSource::readIndexTable(){
   uint32_t nevts = 0;
   in_.read((char*)&nevts, sizeof(nevts));
   in_.ignore(4);
-  if(nevts>maxEvents_){
-    throw cms::Exception("LmfSource")
-      << "Number of events indicated in event index of file "
-      << currentFileName_ << " is unexpectively large. File cannot be "
-      << "read in time-ordered event mode. See orderedRead parmater of "
-      << "LmfSource module.\n";
+  if (nevts > maxEvents_) {
+    throw cms::Exception("LmfSource") << "Number of events indicated in event index of file " << currentFileName_
+                                      << " is unexpectively large. File cannot be "
+                                      << "read in time-ordered event mode. See orderedRead parmater of "
+                                      << "LmfSource module.\n";
   }
   //if(in_.bad()) throw cms::Exception("LmfSource") << errMsg.str();
-  if(in_.bad()) throw cms::Exception("LmfSource") << errMsg.str();
+  if (in_.bad())
+    throw cms::Exception("LmfSource") << errMsg.str();
   indexTable_.resize(nevts);
-  in_.read((char*)&indexTable_[0], nevts*sizeof(IndexRecord));
+  in_.read((char*)&indexTable_[0], nevts * sizeof(IndexRecord));
 }
diff --git a/CalibCalorimetry/EcalLaserSorting/src/Majority.h b/CalibCalorimetry/EcalLaserSorting/src/Majority.h
index 7c5aa7d1c5f19..909ebf6cdbbd0 100644
--- a/CalibCalorimetry/EcalLaserSorting/src/Majority.h
+++ b/CalibCalorimetry/EcalLaserSorting/src/Majority.h
@@ -5,44 +5,41 @@
 #define MAJORITY_H
 
 #include <map>
-  
+
 /**
  */
-template<class T>
+template <class T>
 class Majority {
   //constructor(s) and destructor(s)
 public:
   /** Constructs a Majority
    */
-  Majority(): n_(0){}
+  Majority() : n_(0) {}
 
   /**Destructor
    */
-  virtual ~Majority(){}
-  
-  void
-  add(const T& value){
+  virtual ~Majority() {}
+
+  void add(const T& value) {
     votes_[value] += 1.;
     n_ += 1.;
   }
-  
-  T result(double* proba) const{
+
+  T result(double* proba) const {
     std::pair<T, double> m(T(), -1.);
-    for(typename std::map<T, double>::const_iterator it = votes_.begin();
-	it != votes_.end();
-	++it){
-      if(it->second > m.second){
-	m = *it;
+    for (typename std::map<T, double>::const_iterator it = votes_.begin(); it != votes_.end(); ++it) {
+      if (it->second > m.second) {
+        m = *it;
       }
     }
-    if(proba) *proba = n_>0?m.second/n_:-1;
+    if (proba)
+      *proba = n_ > 0 ? m.second / n_ : -1;
     return m.first;
   }
 
   //method(s)
 public:
 private:
-
   //attribute(s)
 protected:
 private:
@@ -50,4 +47,4 @@ class Majority {
   double n_;
 };
 
-#endif //MAJORITY_H not defined
+#endif  //MAJORITY_H not defined
diff --git a/CalibCalorimetry/EcalLaserSorting/src/SealModules.cc b/CalibCalorimetry/EcalLaserSorting/src/SealModules.cc
index 15b653ec0fbb7..bd19c7460fdde 100644
--- a/CalibCalorimetry/EcalLaserSorting/src/SealModules.cc
+++ b/CalibCalorimetry/EcalLaserSorting/src/SealModules.cc
@@ -5,7 +5,6 @@
 #include "CalibCalorimetry/EcalLaserSorting/interface/LaserSorter.h"
 #include "CalibCalorimetry/EcalLaserSorting/interface/LmfSource.h"
 
-
 DEFINE_FWK_INPUT_SOURCE(WatcherSource);
 DEFINE_FWK_MODULE(LaserSorter);
 DEFINE_FWK_INPUT_SOURCE(LmfSource);
diff --git a/CalibCalorimetry/EcalLaserSorting/src/WatcherStreamFileReader.cc b/CalibCalorimetry/EcalLaserSorting/src/WatcherStreamFileReader.cc
index 831d9b55b3553..4e506b8bbe1cb 100644
--- a/CalibCalorimetry/EcalLaserSorting/src/WatcherStreamFileReader.cc
+++ b/CalibCalorimetry/EcalLaserSorting/src/WatcherStreamFileReader.cc
@@ -21,123 +21,111 @@ using namespace std;
 
 //std::string WatcherStreamFileReader::fileName_;
 
-
 #if !defined(__linux__) && !(defined(__APPLE__) && __DARWIN_C_LEVEL >= 200809L)
 /* getline implementation is copied from glibc. */
 
 #ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
+#define SIZE_MAX ((size_t)-1)
 #endif
 #ifndef SSIZE_MAX
-# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
+#define SSIZE_MAX ((ssize_t)(SIZE_MAX / 2))
 #endif
 namespace {
-ssize_t getline (char **lineptr, size_t *n, FILE *fp)
-{
+  ssize_t getline(char** lineptr, size_t* n, FILE* fp) {
     ssize_t result = -1;
     size_t cur_len = 0;
 
-    if (lineptr == NULL || n == NULL || fp == NULL)
-    {
-        errno = EINVAL;
-        return -1;
-   }
-
-    if (*lineptr == NULL || *n == 0)
-    {
-        *n = 120;
-        *lineptr = (char *) malloc (*n);
-        if (*lineptr == NULL)
-        {
-            result = -1;
-            goto end;
-        }
+    if (lineptr == NULL || n == NULL || fp == NULL) {
+      errno = EINVAL;
+      return -1;
     }
 
-    for (;;)
-    {
-        int i;
+    if (*lineptr == NULL || *n == 0) {
+      *n = 120;
+      *lineptr = (char*)malloc(*n);
+      if (*lineptr == NULL) {
+        result = -1;
+        goto end;
+      }
+    }
 
-        i = getc (fp);
-        if (i == EOF)
-        {
-            result = -1;
-            break;
-        }
+    for (;;) {
+      int i;
 
-        /* Make enough space for len+1 (for final NUL) bytes.  */
-        if (cur_len + 1 >= *n)
-        {
-            size_t needed_max =
-                SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX;
-            size_t needed = 2 * *n + 1;   /* Be generous. */
-            char *new_lineptr;
-
-            if (needed_max < needed)
-                needed = needed_max;
-            if (cur_len + 1 >= needed)
-            {
-                result = -1;
-                goto end;
-            }
+      i = getc(fp);
+      if (i == EOF) {
+        result = -1;
+        break;
+      }
 
-            new_lineptr = (char *) realloc (*lineptr, needed);
-            if (new_lineptr == NULL)
-            {
-                result = -1;
-                goto end;
-            }
+      /* Make enough space for len+1 (for final NUL) bytes.  */
+      if (cur_len + 1 >= *n) {
+        size_t needed_max = SSIZE_MAX < SIZE_MAX ? (size_t)SSIZE_MAX + 1 : SIZE_MAX;
+        size_t needed = 2 * *n + 1; /* Be generous. */
+        char* new_lineptr;
+
+        if (needed_max < needed)
+          needed = needed_max;
+        if (cur_len + 1 >= needed) {
+          result = -1;
+          goto end;
+        }
 
-            *lineptr = new_lineptr;
-            *n = needed;
+        new_lineptr = (char*)realloc(*lineptr, needed);
+        if (new_lineptr == NULL) {
+          result = -1;
+          goto end;
         }
 
-        (*lineptr)[cur_len] = i;
-        cur_len++;
+        *lineptr = new_lineptr;
+        *n = needed;
+      }
 
-        if (i == '\n')
-            break;
+      (*lineptr)[cur_len] = i;
+      cur_len++;
+
+      if (i == '\n')
+        break;
     }
     (*lineptr)[cur_len] = '\0';
-    result = cur_len ? (ssize_t) cur_len : result;
+    result = cur_len ? (ssize_t)cur_len : result;
 
-end:
+  end:
     return result;
-}
-}
+  }
+}  // namespace
 #endif
 
-static std::string now(){
+static std::string now() {
   struct timeval t;
   gettimeofday(&t, nullptr);
- 
+
   char buf[256];
   strftime(buf, sizeof(buf), "%F %R %S s", localtime(&t.tv_sec));
-  buf[sizeof(buf)-1] = 0;
+  buf[sizeof(buf) - 1] = 0;
 
   stringstream buf2;
-  buf2 << buf << " " << ((t.tv_usec+500)/1000)  << " ms";
+  buf2 << buf << " " << ((t.tv_usec + 500) / 1000) << " ms";
 
   return buf2.str();
 }
 
-WatcherStreamFileReader::WatcherStreamFileReader(edm::ParameterSet const& pset):
-  inputDir_(pset.getParameter<std::string>("inputDir")),
-  filePatterns_(pset.getParameter<std::vector<std::string> >("filePatterns")),
-  inprocessDir_(pset.getParameter<std::string>("inprocessDir")),
-  processedDir_(pset.getParameter<std::string>("processedDir")),
-  corruptedDir_(pset.getParameter<std::string>("corruptedDir")),
-  tokenFile_(pset.getUntrackedParameter<std::string>("tokenFile",
-						     "watcherSourceToken")),
-  timeOut_(pset.getParameter<int>("timeOutInSec")),
-  end_(false),
-  verbosity_(pset.getUntrackedParameter<int>("verbosity", 0)){
+WatcherStreamFileReader::WatcherStreamFileReader(edm::ParameterSet const& pset)
+    : inputDir_(pset.getParameter<std::string>("inputDir")),
+      filePatterns_(pset.getParameter<std::vector<std::string> >("filePatterns")),
+      inprocessDir_(pset.getParameter<std::string>("inprocessDir")),
+      processedDir_(pset.getParameter<std::string>("processedDir")),
+      corruptedDir_(pset.getParameter<std::string>("corruptedDir")),
+      tokenFile_(pset.getUntrackedParameter<std::string>("tokenFile", "watcherSourceToken")),
+      timeOut_(pset.getParameter<int>("timeOutInSec")),
+      end_(false),
+      verbosity_(pset.getUntrackedParameter<int>("verbosity", 0)) {
   struct stat buf;
-  if(stat(tokenFile_.c_str(), &buf)){
+  if (stat(tokenFile_.c_str(), &buf)) {
     FILE* f = fopen(tokenFile_.c_str(), "w");
-    if(f){
+    if (f) {
       fclose(f);
-    } else{
+    } else {
       throw cms::Exception("WatcherSource") << "Failed to create token file.";
     }
   }
@@ -145,282 +133,277 @@ WatcherStreamFileReader::WatcherStreamFileReader(edm::ParameterSet const& pset):
   dirs.push_back(inprocessDir_);
   dirs.push_back(processedDir_);
   dirs.push_back(corruptedDir_);
-  
-  for(unsigned i = 0; i < dirs.size(); ++i){
+
+  for (unsigned i = 0; i < dirs.size(); ++i) {
     const string& dir = dirs[i];
     struct stat fileStat;
-    if(0==stat(dir.c_str(), &fileStat)){
-      if(!S_ISDIR(fileStat.st_mode)){
-	throw cms::Exception("[WatcherSource]")
-	  << "File " << dir << " exists but is not a directory "
-	  << " as expected.";
+    if (0 == stat(dir.c_str(), &fileStat)) {
+      if (!S_ISDIR(fileStat.st_mode)) {
+        throw cms::Exception("[WatcherSource]") << "File " << dir << " exists but is not a directory "
+                                                << " as expected.";
       }
-    } else {//directory does not exists, let's try to create it
-      if(0!=mkdir(dir.c_str(), 0755)){
-	throw cms::Exception("[WatcherSource]")
-	  << "Failed to create directory " << dir
-	  << " for writing data.";
+    } else {  //directory does not exists, let's try to create it
+      if (0 != mkdir(dir.c_str(), 0755)) {
+        throw cms::Exception("[WatcherSource]") << "Failed to create directory " << dir << " for writing data.";
       }
     }
   }
 
-    std::stringstream fileListCmdBuf;
-    fileListCmdBuf.str("");
-    //    fileListCmdBuf << "/bin/ls -rt " << inputDir_ << " | egrep '(";
-    //by default ls will sort the file alphabetically which will results
-    //in ordering the files in increasing LB number, which is the desired
-    //order.
-    //    fileListCmdBuf << "/bin/ls " << inputDir_ << " | egrep '(";
-    fileListCmdBuf << "/bin/find " << inputDir_ << " -maxdepth 2 -print | egrep '(";
-    //TODO: validate patternDir (see ;, &&, ||) and escape special character
-    if(filePatterns_.empty()) throw cms::Exception("WacherSource", "filePatterns parameter is empty");
-    char curDir[PATH_MAX>0?PATH_MAX:4096];
-    if(getcwd(curDir, sizeof(curDir))==nullptr){
-      throw cms::Exception("WatcherSource")
-	<< "Failed to retreived working directory path: "
-	<< strerror(errno);
-    }
-    curDir_ = curDir;
-    
-    for(unsigned i = 0 ; i < filePatterns_.size(); ++i){
-      if(i>0) fileListCmdBuf << "|";
-      //     if(filePatterns_[i].size()>0 && filePatterns_[0] != "/"){//relative path
-      //       fileListCmdBuf << curDir << "/";
-      //     }
-      fileListCmdBuf << filePatterns_[i];
-    }
-    fileListCmdBuf << ")' | sort";
+  std::stringstream fileListCmdBuf;
+  fileListCmdBuf.str("");
+  //    fileListCmdBuf << "/bin/ls -rt " << inputDir_ << " | egrep '(";
+  //by default ls will sort the file alphabetically which will results
+  //in ordering the files in increasing LB number, which is the desired
+  //order.
+  //    fileListCmdBuf << "/bin/ls " << inputDir_ << " | egrep '(";
+  fileListCmdBuf << "/bin/find " << inputDir_ << " -maxdepth 2 -print | egrep '(";
+  //TODO: validate patternDir (see ;, &&, ||) and escape special character
+  if (filePatterns_.empty())
+    throw cms::Exception("WacherSource", "filePatterns parameter is empty");
+  char curDir[PATH_MAX > 0 ? PATH_MAX : 4096];
+  if (getcwd(curDir, sizeof(curDir)) == nullptr) {
+    throw cms::Exception("WatcherSource") << "Failed to retreived working directory path: " << strerror(errno);
+  }
+  curDir_ = curDir;
+
+  for (unsigned i = 0; i < filePatterns_.size(); ++i) {
+    if (i > 0)
+      fileListCmdBuf << "|";
+    //     if(filePatterns_[i].size()>0 && filePatterns_[0] != "/"){//relative path
+    //       fileListCmdBuf << curDir << "/";
+    //     }
+    fileListCmdBuf << filePatterns_[i];
+  }
+  fileListCmdBuf << ")' | sort";
 
-    fileListCmd_ = fileListCmdBuf.str();
-    
-    cout << "[WatcherSource " << now() << "]" 
-	 << " Command to retrieve input files: "
-	 << fileListCmd_ << "\n";
+  fileListCmd_ = fileListCmdBuf.str();
 
+  cout << "[WatcherSource " << now() << "]"
+       << " Command to retrieve input files: " << fileListCmd_ << "\n";
 }
 
-WatcherStreamFileReader::~WatcherStreamFileReader(){
-}
+WatcherStreamFileReader::~WatcherStreamFileReader() {}
 
 const bool WatcherStreamFileReader::newHeader() {
   edm::StreamerInputFile* inputFile = getInputFile();
-  return inputFile?inputFile->newHeader():false;
+  return inputFile ? inputFile->newHeader() : false;
 }
 
-const InitMsgView* WatcherStreamFileReader::getHeader(){
-
+const InitMsgView* WatcherStreamFileReader::getHeader() {
   edm::StreamerInputFile* inputFile = getInputFile();
 
   //TODO: shall better send an exception...
-  if(inputFile==nullptr){
+  if (inputFile == nullptr) {
     throw cms::Exception("WatcherSource") << "No input file found.";
   }
-  
+
   const InitMsgView* header = inputFile->startMessage();
-  
-  if(header->code() != Header::INIT) //INIT Msg
-    throw cms::Exception("readHeader","WatcherStreamFileReader")
-      << "received wrong message type: expected INIT, got "
-      << header->code() << "\n";
-    
+
+  if (header->code() != Header::INIT)  //INIT Msg
+    throw cms::Exception("readHeader", "WatcherStreamFileReader")
+        << "received wrong message type: expected INIT, got " << header->code() << "\n";
+
   return header;
 }
-  
-const EventMsgView* WatcherStreamFileReader::getNextEvent(){
-  if(end_){ closeFile(); return nullptr;}
-  
+
+const EventMsgView* WatcherStreamFileReader::getNextEvent() {
+  if (end_) {
+    closeFile();
+    return nullptr;
+  }
+
   edm::StreamerInputFile* inputFile;
 
   //go to next input file, till no new event is found
-  while((inputFile=getInputFile())!=nullptr
-	&& inputFile->next()==0){
+  while ((inputFile = getInputFile()) != nullptr && inputFile->next() == 0) {
     closeFile();
   }
 
-  return inputFile==nullptr?nullptr:inputFile->currentRecord();
+  return inputFile == nullptr ? nullptr : inputFile->currentRecord();
 }
 
-edm::StreamerInputFile* WatcherStreamFileReader::getInputFile(){
+edm::StreamerInputFile* WatcherStreamFileReader::getInputFile() {
   char* lineptr = nullptr;
   size_t n = 0;
 
   struct stat buf;
-  
-  if(stat(tokenFile_.c_str(), &buf)!=0){ 
-    end_ = true; 
+
+  if (stat(tokenFile_.c_str(), &buf) != 0) {
+    end_ = true;
   }
-  
+
   bool waiting = false;
   static bool firstWait = true;
   timeval waitStart;
   //if no cached input file, look for new files until one is found:
-  if(!end_ && streamerInputFile_.get()==nullptr){
+  if (!end_ && streamerInputFile_.get() == nullptr) {
     fileName_.assign("");
-    
+
     //check if we have file in the queue, if not look for new files:
-    while(filesInQueue_.empty()){
-      if(stat(tokenFile_.c_str(), &buf)!=0){ 
-	end_ = true; 
-	break;
+    while (filesInQueue_.empty()) {
+      if (stat(tokenFile_.c_str(), &buf) != 0) {
+        end_ = true;
+        break;
       }
       FILE* s = popen(fileListCmd_.c_str(), "r");
-      if(s==nullptr){
-	throw cms::Exception("WatcherSource")
-	  << "Failed to retrieve list of input file: " << strerror(errno);
+      if (s == nullptr) {
+        throw cms::Exception("WatcherSource") << "Failed to retrieve list of input file: " << strerror(errno);
       }
-      
+
       ssize_t len;
-      while(!feof(s)){
-	if((len=getline(&lineptr, &n, s))>0){
-	  //remove end-of-line character:
-	  lineptr[len-1] = 0;
-	  string fileName;
-	  if(lineptr[0] != '/'){
-	    if(!inputDir_.empty() && inputDir_[0] != '/'){//relative path
-	      fileName.assign(curDir_);
-	      fileName.append("/");
-	      fileName.append(inputDir_);
-	    } else{
-	      fileName.assign(inputDir_);
-	    }
-	    fileName.append("/");
-	  }
-	  fileName.append(lineptr);
-	  filesInQueue_.push_back(fileName);
-	  if(verbosity_) cout << "[WatcherSource " << now() << "]" 
-			      << " File to process: '"
-			      << fileName << "'\n";
-	}
+      while (!feof(s)) {
+        if ((len = getline(&lineptr, &n, s)) > 0) {
+          //remove end-of-line character:
+          lineptr[len - 1] = 0;
+          string fileName;
+          if (lineptr[0] != '/') {
+            if (!inputDir_.empty() && inputDir_[0] != '/') {  //relative path
+              fileName.assign(curDir_);
+              fileName.append("/");
+              fileName.append(inputDir_);
+            } else {
+              fileName.assign(inputDir_);
+            }
+            fileName.append("/");
+          }
+          fileName.append(lineptr);
+          filesInQueue_.push_back(fileName);
+          if (verbosity_)
+            cout << "[WatcherSource " << now() << "]"
+                 << " File to process: '" << fileName << "'\n";
+        }
       }
-      while(!feof(s)) fgetc(s);
+      while (!feof(s))
+        fgetc(s);
       pclose(s);
-      if(filesInQueue_.empty()){
-	if(!waiting){
-	  cout << "[WatcherSource " << now() << "]" 
-	       << " No file found. Waiting for new file...\n";
-	  cout << flush;
-	  waiting = true;
-	  gettimeofday(&waitStart, nullptr);
-	} else if(!firstWait){
-	  timeval t;
-	  gettimeofday(&t, nullptr);
-	  float dt = (t.tv_sec-waitStart.tv_sec) * 1.
-	    + (t.tv_usec-waitStart.tv_usec) * 1.e-6;
-	  if((timeOut_ >= 0) && (dt > timeOut_)){
-	    cout << "[WatcherSource " << now() << "]"
-		 << " Having waited for new file for " << (int)dt << " sec. "
-		 << "Timeout exceeded. Exits.\n";
-	    //remove(tokenFile_.c_str()); //we do not delete the token, otherwise sorting process on the monitoring farm will not be restarted by the runloop.sh script.
-	    end_ = true;
-	    break;
-	  }
-	}
+      if (filesInQueue_.empty()) {
+        if (!waiting) {
+          cout << "[WatcherSource " << now() << "]"
+               << " No file found. Waiting for new file...\n";
+          cout << flush;
+          waiting = true;
+          gettimeofday(&waitStart, nullptr);
+        } else if (!firstWait) {
+          timeval t;
+          gettimeofday(&t, nullptr);
+          float dt = (t.tv_sec - waitStart.tv_sec) * 1. + (t.tv_usec - waitStart.tv_usec) * 1.e-6;
+          if ((timeOut_ >= 0) && (dt > timeOut_)) {
+            cout << "[WatcherSource " << now() << "]"
+                 << " Having waited for new file for " << (int)dt << " sec. "
+                 << "Timeout exceeded. Exits.\n";
+            //remove(tokenFile_.c_str()); //we do not delete the token, otherwise sorting process on the monitoring farm will not be restarted by the runloop.sh script.
+            end_ = true;
+            break;
+          }
+        }
       }
       sleep(1);
-    } //end of file queue update
+    }  //end of file queue update
     firstWait = false;
-    free(lineptr); lineptr=nullptr;
-    
-    while(streamerInputFile_.get()==nullptr && !filesInQueue_.empty()){
+    free(lineptr);
+    lineptr = nullptr;
 
+    while (streamerInputFile_.get() == nullptr && !filesInQueue_.empty()) {
       fileName_ = filesInQueue_.front();
       filesInQueue_.pop_front();
       int fd = open(fileName_.c_str(), 0);
-      if(fd!=0){
-	struct stat buf;
-	off_t size = -1;
-	//check that file transfer is finished, by monitoring its size:
-	time_t t = time(nullptr);
-	for(;;){
-	  fstat(fd, &buf);
-	  if(verbosity_) cout << "file size: " << buf.st_size << ", prev size: "  << size << "\n";
-	  if(buf.st_size==size) break; else size = buf.st_size;
-	  if(difftime(t,buf.st_mtime)>60) break; //file older then 1 min=> tansfer must be finished
-	  sleep(1);
-	}
-
-	if(fd!=0 && buf.st_size == 0){//file is empty. streamer reader 
-	  //                   does not like empty file=> skip it
-	  stringstream c;
-	  c << "/bin/mv -f \"" << fileName_ << "\" \"" << corruptedDir_
-	    << "/.\"";
-	  if(verbosity_) cout << "[WatcherSource " << now() << "]" 
-			      << " Excuting "
-			      << c.str() << "\n"; 
-	  int i = system(c.str().c_str());
-	  if(i!=0){
-	    //throw cms::Exception("WatcherSource")
-	    cout << "[WatcherSource " << now() << "] "
-		 << "Failed to move empty file '" << fileName_ << "'"
-		 << " to corrupted directory '" << corruptedDir_ << "'\n";
-	  }
-	  continue;
-	}
-	
-	close(fd);
-
-	vector<char> buf1(fileName_.size()+1);
-	copy(fileName_.begin(), fileName_.end(), buf1.begin());
-	buf1[buf1.size()-1] = 0;
-	
-	vector<char> buf2(fileName_.size()+1);
-	copy(fileName_.begin(), fileName_.end(), buf2.begin());
-	buf2[buf1.size()-1] = 0;
-	
-	string dirnam(dirname(&buf1[0]));
-	string filenam(basename(&buf2[0]));
-	
-	string dest  = inprocessDir_ + "/" + filenam;
-	
-	if(verbosity_) cout << "[WatcherSource " << now() << "]" 
-			    << " Moving file "
-			    << fileName_ << " to " << dest << "\n";
-	
-	stringstream c;
-	c << "/bin/mv -f \"" << fileName_ << "\" \"" << dest
-	  << "/.\"";
-	
-
-	if(0!=rename(fileName_.c_str(), dest.c_str())){
-	  //if(0!=system(c.str().c_str())){
-	  throw cms::Exception("WatcherSource")
-	    << "Failed to move file '" << fileName_ << "' "
-	    << "to processing directory " << inprocessDir_
-	    << ": " << strerror(errno);
-	}
-	
-	fileName_ = dest;
-
-	cout << "[WatcherSource " << now() << "]" 
-	     << " Opening file " << fileName_ << "\n" << flush;
-	streamerInputFile_
-	  = unique_ptr<edm::StreamerInputFile>(new edm::StreamerInputFile(fileName_));
-
-	ofstream f(".watcherfile");
-	f << fileName_;	
-      } else{
-	cout << "[WatcherSource " << now() << "]" 
-	     << " Failed to open file " << fileName_ << endl;
+      if (fd != 0) {
+        struct stat buf;
+        off_t size = -1;
+        //check that file transfer is finished, by monitoring its size:
+        time_t t = time(nullptr);
+        for (;;) {
+          fstat(fd, &buf);
+          if (verbosity_)
+            cout << "file size: " << buf.st_size << ", prev size: " << size << "\n";
+          if (buf.st_size == size)
+            break;
+          else
+            size = buf.st_size;
+          if (difftime(t, buf.st_mtime) > 60)
+            break;  //file older then 1 min=> tansfer must be finished
+          sleep(1);
+        }
+
+        if (fd != 0 && buf.st_size == 0) {  //file is empty. streamer reader
+          //                   does not like empty file=> skip it
+          stringstream c;
+          c << "/bin/mv -f \"" << fileName_ << "\" \"" << corruptedDir_ << "/.\"";
+          if (verbosity_)
+            cout << "[WatcherSource " << now() << "]"
+                 << " Excuting " << c.str() << "\n";
+          int i = system(c.str().c_str());
+          if (i != 0) {
+            //throw cms::Exception("WatcherSource")
+            cout << "[WatcherSource " << now() << "] "
+                 << "Failed to move empty file '" << fileName_ << "'"
+                 << " to corrupted directory '" << corruptedDir_ << "'\n";
+          }
+          continue;
+        }
+
+        close(fd);
+
+        vector<char> buf1(fileName_.size() + 1);
+        copy(fileName_.begin(), fileName_.end(), buf1.begin());
+        buf1[buf1.size() - 1] = 0;
+
+        vector<char> buf2(fileName_.size() + 1);
+        copy(fileName_.begin(), fileName_.end(), buf2.begin());
+        buf2[buf1.size() - 1] = 0;
+
+        string dirnam(dirname(&buf1[0]));
+        string filenam(basename(&buf2[0]));
+
+        string dest = inprocessDir_ + "/" + filenam;
+
+        if (verbosity_)
+          cout << "[WatcherSource " << now() << "]"
+               << " Moving file " << fileName_ << " to " << dest << "\n";
+
+        stringstream c;
+        c << "/bin/mv -f \"" << fileName_ << "\" \"" << dest << "/.\"";
+
+        if (0 != rename(fileName_.c_str(), dest.c_str())) {
+          //if(0!=system(c.str().c_str())){
+          throw cms::Exception("WatcherSource")
+              << "Failed to move file '" << fileName_ << "' "
+              << "to processing directory " << inprocessDir_ << ": " << strerror(errno);
+        }
+
+        fileName_ = dest;
+
+        cout << "[WatcherSource " << now() << "]"
+             << " Opening file " << fileName_ << "\n"
+             << flush;
+        streamerInputFile_ = unique_ptr<edm::StreamerInputFile>(new edm::StreamerInputFile(fileName_));
+
+        ofstream f(".watcherfile");
+        f << fileName_;
+      } else {
+        cout << "[WatcherSource " << now() << "]"
+             << " Failed to open file " << fileName_ << endl;
       }
-    } //loop on file queue to find one file which opening succeeded
+    }  //loop on file queue to find one file which opening succeeded
   }
   return streamerInputFile_.get();
 }
 
-void WatcherStreamFileReader::closeFile(){
-  if(streamerInputFile_.get()==nullptr) return;
+void WatcherStreamFileReader::closeFile() {
+  if (streamerInputFile_.get() == nullptr)
+    return;
   //delete the streamer input file:
   streamerInputFile_.reset();
   stringstream cmd;
   //TODO: validation of processDir
   cmd << "/bin/mv -f \"" << fileName_ << "\" \"" << processedDir_ << "/.\"";
-  if(verbosity_) cout << "[WatcherSource " << now() << "]" 
-		      << " Excuting " << cmd.str() << "\n"; 
+  if (verbosity_)
+    cout << "[WatcherSource " << now() << "]"
+         << " Excuting " << cmd.str() << "\n";
   int i = system(cmd.str().c_str());
-  if(i!=0){
-    throw cms::Exception("WatcherSource")
-      << "Failed to move processed file '" << fileName_ << "'"
-      << " to processed directory '" << processedDir_ << "'\n";
+  if (i != 0) {
+    throw cms::Exception("WatcherSource") << "Failed to move processed file '" << fileName_ << "'"
+                                          << " to processed directory '" << processedDir_ << "'\n";
     //Stop further processing to prevent endless loop:
     end_ = true;
   }
diff --git a/CalibCalorimetry/EcalPedestalOffsets/interface/EcalPedOffset.h b/CalibCalorimetry/EcalPedestalOffsets/interface/EcalPedOffset.h
index 230fdc8485567..1d381dfcfcd48 100644
--- a/CalibCalorimetry/EcalPedestalOffsets/interface/EcalPedOffset.h
+++ b/CalibCalorimetry/EcalPedestalOffsets/interface/EcalPedOffset.h
@@ -7,103 +7,97 @@
  * \brief calculate the best DAC value to obtain a pedestal = 200
  * \author P. Govoni (pietro.govoni@cernNOSPAM.ch)
  *
-*/
+ */
 
 #include <map>
 #include <string>
 
+#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 
-#include "CalibCalorimetry/EcalPedestalOffsets/interface/TPedValues.h"
 #include "CalibCalorimetry/EcalPedestalOffsets/interface/TPedResult.h"
+#include "CalibCalorimetry/EcalPedestalOffsets/interface/TPedValues.h"
 
 class EBDigiCollection;
 class EEDigiCollection;
 
 class EcalElectronicsMapping;
 
-class EcalPedOffset: public edm::EDAnalyzer
-{
-
-  public:
-    
-    //! Constructor
-    EcalPedOffset(const edm::ParameterSet& ps);
-    
-    //! Destructor
-    ~EcalPedOffset() override;
-   
-    ///! Analyze
-    void analyze(edm::Event const& event, edm::EventSetup const& eventSetup) override;
-    
-    //! BeginRun
-    void beginRun(edm::Run const &, edm::EventSetup const& eventSetup) override;
-    
-    //! EndJob
-    void endJob(void) override;
-    
-    //! write the results into xml format
-    void writeXMLFiles(std::string fileName);
-    
-    //! WriteDB
-    void writeDb();
-    
-    //! create the plots of the DAC pedestal trend
-    void makePlots();
-
-
-  private:
-
-    const EcalElectronicsMapping* ecalElectronicsMap_;
-
-    std::string intToString(int num);
-    void readDACs(const edm::Handle<EBDigiCollection>& pDigis, const std::map<int,int>& DACvalues);
-    void readDACs(const edm::Handle<EEDigiCollection>& pDigis, const std::map<int,int>& DACvalues);
-    
-    edm::InputTag m_barrelDigiCollection; //!< secondary name given to collection of digis
-    edm::InputTag m_endcapDigiCollection; //!< secondary name given to collection of digis
-    edm::InputTag m_headerCollection; //!< name of module/plugin/producer making headers
-
-    std::string m_xmlFile;        //!< name of the xml file to be saved
-
-    std::map<int,TPedValues*> m_pedValues;
-    std::map<int,TPedResult*> m_pedResult;
-     
-    int m_DACmin;
-    int m_DACmax;
-    double m_RMSmax;
-    int m_bestPed;
-    
-    //! database host name
-    std::string m_dbHostName;
-    //! database name
-    std::string m_dbName;
-    //! database user name
-    std::string m_dbUserName;
-    //! database user password
-    std::string m_dbPassword;
-    //! database 
-    int m_dbHostPort;
-    //!allow the creation of a new moniov if not existing in the DB
-    //!by default it is false.
-    bool m_create_moniov;
-    // used to retrieve the run_iov 
-    std::string m_location;
-    //! run number
-    int m_run;
-    
-    //! the root file where to store the detail plots
-    std::string m_plotting;
-    //! max slope (in magnitude) allowed for linearity test
-    double m_maxSlopeAllowed_;
-    //! min slope (in magnitude) allowed for linearity test
-    double m_minSlopeAllowed_;
-    //! max chi2/ndf allowed for linearity test
-    double m_maxChi2OverNDFAllowed_;
-    
-} ; 
+class EcalPedOffset : public edm::EDAnalyzer {
+public:
+  //! Constructor
+  EcalPedOffset(const edm::ParameterSet &ps);
+
+  //! Destructor
+  ~EcalPedOffset() override;
+
+  ///! Analyze
+  void analyze(edm::Event const &event, edm::EventSetup const &eventSetup) override;
+
+  //! BeginRun
+  void beginRun(edm::Run const &, edm::EventSetup const &eventSetup) override;
+
+  //! EndJob
+  void endJob(void) override;
+
+  //! write the results into xml format
+  void writeXMLFiles(std::string fileName);
+
+  //! WriteDB
+  void writeDb();
+
+  //! create the plots of the DAC pedestal trend
+  void makePlots();
+
+private:
+  const EcalElectronicsMapping *ecalElectronicsMap_;
+
+  std::string intToString(int num);
+  void readDACs(const edm::Handle<EBDigiCollection> &pDigis, const std::map<int, int> &DACvalues);
+  void readDACs(const edm::Handle<EEDigiCollection> &pDigis, const std::map<int, int> &DACvalues);
+
+  edm::InputTag m_barrelDigiCollection;  //!< secondary name given to collection of digis
+  edm::InputTag m_endcapDigiCollection;  //!< secondary name given to collection of digis
+  edm::InputTag m_headerCollection;      //!< name of module/plugin/producer making headers
+
+  std::string m_xmlFile;  //!< name of the xml file to be saved
+
+  std::map<int, TPedValues *> m_pedValues;
+  std::map<int, TPedResult *> m_pedResult;
+
+  int m_DACmin;
+  int m_DACmax;
+  double m_RMSmax;
+  int m_bestPed;
+
+  //! database host name
+  std::string m_dbHostName;
+  //! database name
+  std::string m_dbName;
+  //! database user name
+  std::string m_dbUserName;
+  //! database user password
+  std::string m_dbPassword;
+  //! database
+  int m_dbHostPort;
+  //! allow the creation of a new moniov if not existing in the DB
+  //! by default it is false.
+  bool m_create_moniov;
+  // used to retrieve the run_iov
+  std::string m_location;
+  //! run number
+  int m_run;
+
+  //! the root file where to store the detail plots
+  std::string m_plotting;
+  //! max slope (in magnitude) allowed for linearity test
+  double m_maxSlopeAllowed_;
+  //! min slope (in magnitude) allowed for linearity test
+  double m_minSlopeAllowed_;
+  //! max chi2/ndf allowed for linearity test
+  double m_maxChi2OverNDFAllowed_;
+};
 
 #endif
diff --git a/CalibCalorimetry/EcalPedestalOffsets/interface/TPedResult.h b/CalibCalorimetry/EcalPedestalOffsets/interface/TPedResult.h
index a1f40654af520..78136a5e2c58a 100644
--- a/CalibCalorimetry/EcalPedestalOffsets/interface/TPedResult.h
+++ b/CalibCalorimetry/EcalPedestalOffsets/interface/TPedResult.h
@@ -2,30 +2,27 @@
 #define TPedResult_h
 
 /**
-* \file TPedResult.h 
-* \brief Transient container
-* right DAC values for each crystal and each gain
-* $Date:
-* $Revision:
-* \author P. Govoni (pietro.govoni@cernNOSPAM.ch)
-*/
+ * \file TPedResult.h
+ * \brief Transient container
+ * right DAC values for each crystal and each gain
+ * $Date:
+ * $Revision:
+ * \author P. Govoni (pietro.govoni@cernNOSPAM.ch)
+ */
 
 #include <vector>
 
-class TPedResult
-{
-  public:
+class TPedResult {
+public:
+  TPedResult() { reset(); }
 
-    TPedResult () { reset () ; }
+  void reset() {
+    for (int gainId = 1; gainId < 4; ++gainId)
+      for (int crystal = 0; crystal < 1700; ++crystal)
+        m_DACvalue[gainId - 1][crystal] = 0;
+  }
 
-    void reset () 
-      {
-        for (int gainId = 1 ; gainId < 4 ; ++gainId)
-          for (int crystal = 0 ; crystal < 1700 ; ++crystal)
-            m_DACvalue[gainId-1][crystal] = 0 ;
-      }
-  
-    int m_DACvalue[3][1700] ;
-} ;
+  int m_DACvalue[3][1700];
+};
 
 #endif
diff --git a/CalibCalorimetry/EcalPedestalOffsets/interface/TPedValues.h b/CalibCalorimetry/EcalPedestalOffsets/interface/TPedValues.h
index 358a5a0e2d255..e45497300a5dc 100644
--- a/CalibCalorimetry/EcalPedestalOffsets/interface/TPedValues.h
+++ b/CalibCalorimetry/EcalPedestalOffsets/interface/TPedValues.h
@@ -2,63 +2,58 @@
 #define TPedValues_h
 
 /**
-* \file TPedValues.h 
-* \brief Transient container
-* Store all the pedestal values depending on the gain and pedestal offset
-* $Date:
-* $Revision:
-* \author P. Govoni (pietro.govoni@cernNOSPAM.ch)
-*/
+ * \file TPedValues.h
+ * \brief Transient container
+ * Store all the pedestal values depending on the gain and pedestal offset
+ * $Date:
+ * $Revision:
+ * \author P. Govoni (pietro.govoni@cernNOSPAM.ch)
+ */
 
 #include <vector>
 
 #include "TFile.h"
-#include "TSinglePedEntry.h"
 #include "TPedResult.h"
+#include "TSinglePedEntry.h"
 
-class TPedValues
-{
-  public:
-  
-    //! ctor
-    TPedValues (double RMSmax = 2 , int bestPedestal = 200) ;
-
-    //! copy ctor
-    TPedValues (const TPedValues & orig) ;
-
-    //! dtor
-    ~TPedValues () ;
-  
-    //! add a single value
-    void insert (const int gainId, 
-                 const int crystal, 
-                 const int DAC, 
-                 const int pedestal,
-                 const int endcapIndex) ;
-    
-    //! calculate the offset values for all the containers
-    TPedResult terminate (const int & DACstart = 0, const int & DACend = 256) const ;
-
-    //! check whether the scan was complete in the range
-    int checkEntries (const int & DACstart = 0, const int & DACend = 256) const ;
-     
-    //! create a plot of the DAC pedestal trend
-    int makePlots (TFile * rootFile, const std::string & dirName, const double maxSlopeAllowed, 
-        const double minSlopeAllowed, const double maxChi2OverNDF) const ;
-    
-    //! return the index from the table
-    int getCrystalNumber(int xtal) const;
-    
-  private:
-    
-    TSinglePedEntry m_entries[3][1700][256] ;
-    // 1,305,600 elements
-    int m_bestPedestal ;
-    double m_RMSmax ;
-    // store the EE index as 100*elecId.towerId()+5*(elecId.stripId()-1)+elecId.xtalId()
-    int endcapCrystalNumbers[1700];
-
-} ;
-
+class TPedValues {
+public:
+  //! ctor
+  TPedValues(double RMSmax = 2, int bestPedestal = 200);
+
+  //! copy ctor
+  TPedValues(const TPedValues &orig);
+
+  //! dtor
+  ~TPedValues();
+
+  //! add a single value
+  void insert(const int gainId, const int crystal, const int DAC, const int pedestal, const int endcapIndex);
+
+  //! calculate the offset values for all the containers
+  TPedResult terminate(const int &DACstart = 0, const int &DACend = 256) const;
+
+  //! check whether the scan was complete in the range
+  int checkEntries(const int &DACstart = 0, const int &DACend = 256) const;
+
+  //! create a plot of the DAC pedestal trend
+  int makePlots(TFile *rootFile,
+                const std::string &dirName,
+                const double maxSlopeAllowed,
+                const double minSlopeAllowed,
+                const double maxChi2OverNDF) const;
+
+  //! return the index from the table
+  int getCrystalNumber(int xtal) const;
+
+private:
+  TSinglePedEntry m_entries[3][1700][256];
+  // 1,305,600 elements
+  int m_bestPedestal;
+  double m_RMSmax;
+  // store the EE index as
+  // 100*elecId.towerId()+5*(elecId.stripId()-1)+elecId.xtalId()
+  int endcapCrystalNumbers[1700];
+};
 
 #endif
diff --git a/CalibCalorimetry/EcalPedestalOffsets/interface/TSinglePedEntry.h b/CalibCalorimetry/EcalPedestalOffsets/interface/TSinglePedEntry.h
index 78627d447a602..984fb71aae27c 100644
--- a/CalibCalorimetry/EcalPedestalOffsets/interface/TSinglePedEntry.h
+++ b/CalibCalorimetry/EcalPedestalOffsets/interface/TSinglePedEntry.h
@@ -2,43 +2,39 @@
 #define TSinglePedEntry_h
 
 /**
-* \file TSinglePedEntry.h 
-* \brief Transient container for a single entry in pedestal offset studies 
-*
-* $Date:
-* $Revision:
-* \author P. Govoni (pietro.govoni@cernNOSPAM.ch)
-*/
+ * \file TSinglePedEntry.h
+ * \brief Transient container for a single entry in pedestal offset studies
+ *
+ * $Date:
+ * $Revision:
+ * \author P. Govoni (pietro.govoni@cernNOSPAM.ch)
+ */
 
-class TSinglePedEntry
-{
-  public:
-  
-    //! ctor 
-    TSinglePedEntry () ;    
-    //! copy ctor
-    TSinglePedEntry (const TSinglePedEntry & orig) ;     
-    //! dtor
-    ~TSinglePedEntry () ;
-  
-    //! add a single value
-    void insert (const int & pedestal) ;
-    //! get the average of the inserted values
-    double average () const ;
-    //! get the RMS of the inserted values
-    double RMS () const ;
-    //! get the squared RMS of the inserted values
-    double RMSSq () const ;
+class TSinglePedEntry {
+public:
+  //! ctor
+  TSinglePedEntry();
+  //! copy ctor
+  TSinglePedEntry(const TSinglePedEntry &orig);
+  //! dtor
+  ~TSinglePedEntry();
 
-  private:
+  //! add a single value
+  void insert(const int &pedestal);
+  //! get the average of the inserted values
+  double average() const;
+  //! get the RMS of the inserted values
+  double RMS() const;
+  //! get the squared RMS of the inserted values
+  double RMSSq() const;
 
-    //! squared sum of entries
-    int m_pedestalSqSum ;
-    //! sum of entries
-    int m_pedestalSum ;
-    //! number of entries
-    int m_entries ;
-    
-} ;
+private:
+  //! squared sum of entries
+  int m_pedestalSqSum;
+  //! sum of entries
+  int m_pedestalSum;
+  //! number of entries
+  int m_entries;
+};
 
 #endif
diff --git a/CalibCalorimetry/EcalPedestalOffsets/interface/testChannel.h b/CalibCalorimetry/EcalPedestalOffsets/interface/testChannel.h
index cb07c66e68e02..c20e1d8a47712 100644
--- a/CalibCalorimetry/EcalPedestalOffsets/interface/testChannel.h
+++ b/CalibCalorimetry/EcalPedestalOffsets/interface/testChannel.h
@@ -7,15 +7,15 @@
  * \brief calculate the best DAC value to obtain a pedestal = 200
  * \author P. Govoni (testChannel.govoni@cernNOSPAM.ch)
  *
-*/
+ */
 
-#include <map>
+#include "CalibCalorimetry/EcalPedestalOffsets/interface/TPedResult.h"
+#include "CalibCalorimetry/EcalPedestalOffsets/interface/TPedValues.h"
+#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
-#include "CalibCalorimetry/EcalPedestalOffsets/interface/TPedValues.h"
-#include "CalibCalorimetry/EcalPedestalOffsets/interface/TPedResult.h"
+#include <map>
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
@@ -27,59 +27,54 @@
 #include "TH2.h"
 #include "TProfile.h"
 
-#include <memory>
-#include <iostream>
 #include <fstream>
-#include <vector>
+#include <iostream>
+#include <memory>
 #include <string>
+#include <vector>
+
+class testChannel : public edm::EDAnalyzer {
+public:
+  //! Constructor
+  testChannel(const edm::ParameterSet &ps);
+
+  //! Destructor
+  ~testChannel() override;
+
+  //! Subscribe/Unsubscribe to Monitoring Elements
+  void subscribe(void);
+  void subscribeNew(void);
+  void unsubscribe(void);
+
+  ///! Analyze
+  void analyze(edm::Event const &event, edm::EventSetup const &eventSetup) override;
+
+  //! BeginJob
+  void beginJob() override;
+
+  //! EndJob
+  void endJob(void) override;
+
+private:
+  int getHeaderSMId(const int headerId);
+
+  std::string m_digiCollection;  //! secondary name given to collection of digis
+  std::string m_digiProducer;    //! name of module/plugin/producer making digis
+  std::string m_headerProducer;  //! name of module/plugin/producer making headers
+
+  std::string m_xmlFile;  //! name of the xml file to be saved
+
+  int m_DACmin;
+  int m_DACmax;
+  double m_RMSmax;
+  int m_bestPed;
+
+  int m_xtal;
 
-class testChannel: public edm::EDAnalyzer
-{
-
-  public:
-    
-    //! Constructor
-    testChannel (const edm::ParameterSet& ps) ;
-    
-    //! Destructor
-    ~testChannel () override ;
-    
-    //! Subscribe/Unsubscribe to Monitoring Elements
-    void subscribe (void) ;
-    void subscribeNew (void) ;
-    void unsubscribe (void) ;
-    
-    ///! Analyze
-    void analyze (edm::Event const& event, edm::EventSetup const& eventSetup) override ;
-    
-    //! BeginJob
-    void beginJob () override ;
-    
-    //! EndJob
-    void endJob (void) override ;
-        
-  private:
- 
-    int getHeaderSMId (const int headerId) ;
-    
-    std::string m_digiCollection ; //! secondary name given to collection of digis
-    std::string m_digiProducer ;   //! name of module/plugin/producer making digis
-    std::string m_headerProducer ; //! name of module/plugin/producer making headers
-
-    std::string m_xmlFile ;        //! name of the xml file to be saved
-
-    int m_DACmin ;
-    int m_DACmax ;
-    double m_RMSmax ;
-    int m_bestPed ;
-    
-    int m_xtal ;
-
-    TH2F m_pedVSDAC ;
-    TH2F m_singlePedVSDAC_1 ;
-    TH2F m_singlePedVSDAC_2 ;
-    TH2F m_singlePedVSDAC_3 ;
-    
-} ; 
+  TH2F m_pedVSDAC;
+  TH2F m_singlePedVSDAC_1;
+  TH2F m_singlePedVSDAC_2;
+  TH2F m_singlePedVSDAC_3;
+};
 
 #endif
diff --git a/CalibCalorimetry/EcalPedestalOffsets/src/EcalPedOffset.cc b/CalibCalorimetry/EcalPedestalOffsets/src/EcalPedOffset.cc
index e308b2627be34..398c70eafa0b2 100644
--- a/CalibCalorimetry/EcalPedestalOffsets/src/EcalPedOffset.cc
+++ b/CalibCalorimetry/EcalPedestalOffsets/src/EcalPedOffset.cc
@@ -1,4 +1,4 @@
-//TODO: fix header here?
+// TODO: fix header here?
 /**
  * \file EcalPedOffset.cc
  *
@@ -6,21 +6,21 @@
  * \author S. Cooper (seth.cooper@cernNOSPAM.ch)
  * Last updated: @DATE@ @AUTHOR@
  *
-*/
+ */
 
-#include <memory>
-#include <iostream>
 #include <fstream>
+#include <iostream>
+#include <memory>
 
 #include "CalibCalorimetry/EcalPedestalOffsets/interface/EcalPedOffset.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "OnlineDB/EcalCondDB/interface/EcalCondDBInterface.h"
-#include "OnlineDB/EcalCondDB/interface/RunTag.h"
-#include "OnlineDB/EcalCondDB/interface/RunIOV.h"
-#include "OnlineDB/EcalCondDB/interface/MonRunIOV.h"
 #include "OnlineDB/EcalCondDB/interface/MonPedestalOffsetsDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonRunIOV.h"
+#include "OnlineDB/EcalCondDB/interface/RunIOV.h"
+#include "OnlineDB/EcalCondDB/interface/RunTag.h"
 
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 
@@ -35,94 +35,74 @@ using namespace cms;
 using namespace edm;
 
 //! ctor
-EcalPedOffset::EcalPedOffset (const ParameterSet& paramSet) :
-  m_barrelDigiCollection (paramSet.getParameter<edm::InputTag> ("EBdigiCollection")),
-  m_endcapDigiCollection (paramSet.getParameter<edm::InputTag> ("EEdigiCollection")),
-  m_headerCollection (paramSet.getParameter<edm::InputTag> ("headerCollection")),
-  m_xmlFile (paramSet.getParameter<std::string> ("xmlFile")),
-  m_DACmin (paramSet.getUntrackedParameter<int> ("DACmin",0)),
-  m_DACmax (paramSet.getUntrackedParameter<int> ("DACmax",256)),
-  m_RMSmax (paramSet.getUntrackedParameter<double> ("RMSmax",2)),
-  m_bestPed (paramSet.getUntrackedParameter<int> ("bestPed",200)), 
-  m_dbHostName (paramSet.getUntrackedParameter<std::string> ("dbHostName","0")),
-  m_dbName (paramSet.getUntrackedParameter<std::string> ("dbName","0")),
-  m_dbUserName (paramSet.getUntrackedParameter<std::string> ("dbUserName")),
-  m_dbPassword (paramSet.getUntrackedParameter<std::string> ("dbPassword")),
-  m_dbHostPort (paramSet.getUntrackedParameter<int> ("dbHostPort",1521)),
-  m_create_moniov (paramSet.getUntrackedParameter<bool>("createMonIOV", false)),
-  m_location (paramSet.getUntrackedParameter<std::string>("location", "H4")),
-  m_run(-1),
-  m_plotting (paramSet.getParameter<std::string> ("plotting")),
-  m_maxSlopeAllowed_ (paramSet.getUntrackedParameter<double> ("maxSlopeAllowed",-29)),
-  m_minSlopeAllowed_ (paramSet.getUntrackedParameter<double> ("minSlopeAllowed",-18)),
-  m_maxChi2OverNDFAllowed_ (paramSet.getUntrackedParameter<double> ("maxChi2OverNDF",5))
-{
-  edm::LogInfo ("EcalPedOffset") << " reading "
-    << " m_DACmin: " << m_DACmin
-    << " m_DACmax: " << m_DACmax
-    << " m_RMSmax: " << m_RMSmax
-    << " m_bestPed: " << m_bestPed ;
+EcalPedOffset::EcalPedOffset(const ParameterSet &paramSet)
+    : m_barrelDigiCollection(paramSet.getParameter<edm::InputTag>("EBdigiCollection")),
+      m_endcapDigiCollection(paramSet.getParameter<edm::InputTag>("EEdigiCollection")),
+      m_headerCollection(paramSet.getParameter<edm::InputTag>("headerCollection")),
+      m_xmlFile(paramSet.getParameter<std::string>("xmlFile")),
+      m_DACmin(paramSet.getUntrackedParameter<int>("DACmin", 0)),
+      m_DACmax(paramSet.getUntrackedParameter<int>("DACmax", 256)),
+      m_RMSmax(paramSet.getUntrackedParameter<double>("RMSmax", 2)),
+      m_bestPed(paramSet.getUntrackedParameter<int>("bestPed", 200)),
+      m_dbHostName(paramSet.getUntrackedParameter<std::string>("dbHostName", "0")),
+      m_dbName(paramSet.getUntrackedParameter<std::string>("dbName", "0")),
+      m_dbUserName(paramSet.getUntrackedParameter<std::string>("dbUserName")),
+      m_dbPassword(paramSet.getUntrackedParameter<std::string>("dbPassword")),
+      m_dbHostPort(paramSet.getUntrackedParameter<int>("dbHostPort", 1521)),
+      m_create_moniov(paramSet.getUntrackedParameter<bool>("createMonIOV", false)),
+      m_location(paramSet.getUntrackedParameter<std::string>("location", "H4")),
+      m_run(-1),
+      m_plotting(paramSet.getParameter<std::string>("plotting")),
+      m_maxSlopeAllowed_(paramSet.getUntrackedParameter<double>("maxSlopeAllowed", -29)),
+      m_minSlopeAllowed_(paramSet.getUntrackedParameter<double>("minSlopeAllowed", -18)),
+      m_maxChi2OverNDFAllowed_(paramSet.getUntrackedParameter<double>("maxChi2OverNDF", 5)) {
+  edm::LogInfo("EcalPedOffset") << " reading "
+                                << " m_DACmin: " << m_DACmin << " m_DACmax: " << m_DACmax << " m_RMSmax: " << m_RMSmax
+                                << " m_bestPed: " << m_bestPed;
 }
 
-
 // -----------------------------------------------------------------------------
 
-
 //! dtor
-EcalPedOffset::~EcalPedOffset ()
-{
-  for (std::map<int,TPedValues*>::iterator mapIt = m_pedValues.begin ();
-      mapIt != m_pedValues.end ();
-      ++mapIt)
-    delete mapIt->second ; 
-  for (std::map<int,TPedResult*>::iterator mapIt = m_pedResult.begin ();
-      mapIt != m_pedResult.end ();
-      ++mapIt)
-    delete mapIt->second ; 
+EcalPedOffset::~EcalPedOffset() {
+  for (std::map<int, TPedValues *>::iterator mapIt = m_pedValues.begin(); mapIt != m_pedValues.end(); ++mapIt)
+    delete mapIt->second;
+  for (std::map<int, TPedResult *>::iterator mapIt = m_pedResult.begin(); mapIt != m_pedResult.end(); ++mapIt)
+    delete mapIt->second;
 }
 
-
 // -----------------------------------------------------------------------------
 
-
 //! begin the run
-void EcalPedOffset::beginRun (Run const &, EventSetup const& eventSetup)
-{
-  LogDebug ("EcalPedOffset") << "entering beginRun..." ;
+void EcalPedOffset::beginRun(Run const &, EventSetup const &eventSetup) {
+  LogDebug("EcalPedOffset") << "entering beginRun...";
 
-  edm::ESHandle< EcalElectronicsMapping > handle;
-  eventSetup.get< EcalMappingRcd >().get(handle);
+  edm::ESHandle<EcalElectronicsMapping> handle;
+  eventSetup.get<EcalMappingRcd>().get(handle);
   ecalElectronicsMap_ = handle.product();
-
 }
 
-
 // -----------------------------------------------------------------------------
 
-
 //! perform the analysis
-void EcalPedOffset::analyze (Event const& event, 
-    EventSetup const& eventSetup) 
-{
-  LogDebug ("EcalPedOffset") << "entering analyze ...";
+void EcalPedOffset::analyze(Event const &event, EventSetup const &eventSetup) {
+  LogDebug("EcalPedOffset") << "entering analyze ...";
 
   // get the headers
   // (one header for each supermodule)
   edm::Handle<EcalRawDataCollection> DCCHeaders;
   event.getByLabel(m_headerCollection, DCCHeaders);
 
-  std::map <int,int> DACvalues;
+  std::map<int, int> DACvalues;
 
-  if(m_run==-1)
+  if (m_run == -1)
     m_run = event.id().run();
 
   // loop over the headers
-  for (EcalRawDataCollection::const_iterator headerItr= DCCHeaders->begin();
-      headerItr != DCCHeaders->end (); 
-      ++headerItr) 
-  {
+  for (EcalRawDataCollection::const_iterator headerItr = DCCHeaders->begin(); headerItr != DCCHeaders->end();
+       ++headerItr) {
     EcalDCCHeaderBlock::EcalDCCEventSettings settings = headerItr->getEventSettings();
-    int FEDid = 600+headerItr->id();
+    int FEDid = 600 + headerItr->id();
     DACvalues[FEDid] = settings.ped_offset;
     LogDebug("EcalPedOffset") << "Found FED: " << FEDid << " in DCC header";
   }
@@ -133,17 +113,15 @@ void EcalPedOffset::analyze (Event const& event,
   // (one digi for each crystal)
   Handle<EBDigiCollection> barrelDigis;
   event.getByLabel(m_barrelDigiCollection, barrelDigis);
-  if(!barrelDigis.isValid())
-  {
-    edm::LogError ("EcalPedOffset") << "Error! can't get the product " 
-      << m_barrelDigiCollection << "; not reading barrel digis";
+  if (!barrelDigis.isValid()) {
+    edm::LogError("EcalPedOffset") << "Error! can't get the product " << m_barrelDigiCollection
+                                   << "; not reading barrel digis";
     barrelDigisFound = false;
   }
 
-  if(barrelDigis->empty()) 
-  {
+  if (barrelDigis->empty()) {
     edm::LogInfo("EcalPedOffset") << "Size of EBDigiCollection is zero;"
-      << " not reading barrel digis";
+                                  << " not reading barrel digis";
     barrelDigisFound = false;
   }
 
@@ -151,213 +129,172 @@ void EcalPedOffset::analyze (Event const& event,
   // (one digi for each crystal)
   Handle<EEDigiCollection> endcapDigis;
   event.getByLabel(m_endcapDigiCollection, endcapDigis);
-  if(!endcapDigis.isValid())
-  {
-    edm::LogError ("EcalPedOffset") << "Error! can't get the product " 
-      << m_endcapDigiCollection << "; not reading endcap digis";
+  if (!endcapDigis.isValid()) {
+    edm::LogError("EcalPedOffset") << "Error! can't get the product " << m_endcapDigiCollection
+                                   << "; not reading endcap digis";
     endcapDigisFound = false;
   }
 
-  if(endcapDigis->empty()) 
-  {
+  if (endcapDigis->empty()) {
     edm::LogInfo("EcalPedOffset") << "Size of EEDigiCollection is zero;"
-      << " not reading endcap digis";
+                                  << " not reading endcap digis";
     endcapDigisFound = false;
   }
 
-  
-  if(barrelDigisFound)
+  if (barrelDigisFound)
     readDACs(barrelDigis, DACvalues);
-  if(endcapDigisFound)
+  if (endcapDigisFound)
     readDACs(endcapDigis, DACvalues);
-  if(!barrelDigisFound && !endcapDigisFound)
-    edm::LogError ("EcalPedOffset") << "No digis found in the event!";
-  
+  if (!barrelDigisFound && !endcapDigisFound)
+    edm::LogError("EcalPedOffset") << "No digis found in the event!";
 }
 
-
 // -----------------------------------------------------------------------------
 
-
-void EcalPedOffset::readDACs(const edm::Handle<EBDigiCollection>& pDigis,
-                             const std::map<int,int>& _DACvalues)
-{
-  std::map<int,int> DACvalues = _DACvalues;
+void EcalPedOffset::readDACs(const edm::Handle<EBDigiCollection> &pDigis, const std::map<int, int> &_DACvalues) {
+  std::map<int, int> DACvalues = _DACvalues;
   // loop over the digis
-  for (EBDigiCollection::const_iterator itdigi = pDigis->begin(); 
-      itdigi != pDigis->end(); 
-      ++itdigi)
-  {
+  for (EBDigiCollection::const_iterator itdigi = pDigis->begin(); itdigi != pDigis->end(); ++itdigi) {
     int gainId = ((EBDataFrame)(*itdigi)).sample(0).gainId();
     EBDetId detId = EBDetId(itdigi->id());
     EcalElectronicsId elecId = ecalElectronicsMap_->getElectronicsId(detId);
-    int FEDid = 600+elecId.dccId();
+    int FEDid = 600 + elecId.dccId();
     int crystalId = detId.ic();
 
-    //TODO: Behavior here
-    if(DACvalues.find(FEDid)==DACvalues.end())
-    {
-      edm::LogError("EcalPedOffset")
-        << "Error! EB DCCid of digi does not match any DCCid found in DCC headers" << FEDid;
+    // TODO: Behavior here
+    if (DACvalues.find(FEDid) == DACvalues.end()) {
+      edm::LogError("EcalPedOffset") << "Error! EB DCCid of digi does not "
+                                        "match any DCCid found in DCC headers"
+                                     << FEDid;
     }
 
-    if (!m_pedValues.count(FEDid))
-    {
+    if (!m_pedValues.count(FEDid)) {
       LogDebug("EcalPedOffset") << "Inserting new TPedValues object for FED:" << FEDid;
-      m_pedValues[FEDid] = new TPedValues(m_RMSmax,m_bestPed);
+      m_pedValues[FEDid] = new TPedValues(m_RMSmax, m_bestPed);
     }
 
     // loop over the samples
-    for (int iSample = 0; iSample < EcalDataFrame::MAXSAMPLES; ++iSample) 
-    {
-      m_pedValues[FEDid]->insert(gainId,
-          crystalId,
-          DACvalues[FEDid],
-          ((EBDataFrame)(*itdigi)).sample(iSample).adc(),
-          crystalId);
+    for (int iSample = 0; iSample < EcalDataFrame::MAXSAMPLES; ++iSample) {
+      m_pedValues[FEDid]->insert(
+          gainId, crystalId, DACvalues[FEDid], ((EBDataFrame)(*itdigi)).sample(iSample).adc(), crystalId);
     }
-    
-  } //end loop over digis
+
+  }  // end loop over digis
 }
 
 // -----------------------------------------------------------------------------
 
-
-void EcalPedOffset::readDACs(const edm::Handle<EEDigiCollection>& pDigis,
-                             const std::map<int,int>& _DACvalues)
-{
-  std::map<int,int> DACvalues = _DACvalues;
+void EcalPedOffset::readDACs(const edm::Handle<EEDigiCollection> &pDigis, const std::map<int, int> &_DACvalues) {
+  std::map<int, int> DACvalues = _DACvalues;
   // loop over the digis
-  for (EEDigiCollection::const_iterator itdigi = pDigis->begin(); 
-      itdigi != pDigis->end(); 
-      ++itdigi)
-  {
+  for (EEDigiCollection::const_iterator itdigi = pDigis->begin(); itdigi != pDigis->end(); ++itdigi) {
     int gainId = ((EEDataFrame)(*itdigi)).sample(0).gainId();
-    //int gainId = itdigi->sample(0).gainId();
+    // int gainId = itdigi->sample(0).gainId();
     EEDetId detId = EEDetId(itdigi->id());
     EcalElectronicsId elecId = ecalElectronicsMap_->getElectronicsId(detId);
-    int FEDid = 600+elecId.dccId();
-    int crystalId = 25*elecId.towerId()+5*elecId.stripId()+elecId.xtalId();
-    int endcapCrystalId = 100*elecId.towerId()+5*(elecId.stripId()-1)+elecId.xtalId();
-    
-    //TODO: Behavior here
-    if(DACvalues.find(FEDid)==DACvalues.end())
-    {
-      edm::LogError("EcalPedOffset")
-        << "Error! EE DCCid of digi does not match any DCCid found in DCC headers: " << FEDid;
+    int FEDid = 600 + elecId.dccId();
+    int crystalId = 25 * elecId.towerId() + 5 * elecId.stripId() + elecId.xtalId();
+    int endcapCrystalId = 100 * elecId.towerId() + 5 * (elecId.stripId() - 1) + elecId.xtalId();
+
+    // TODO: Behavior here
+    if (DACvalues.find(FEDid) == DACvalues.end()) {
+      edm::LogError("EcalPedOffset") << "Error! EE DCCid of digi does not "
+                                        "match any DCCid found in DCC headers: "
+                                     << FEDid;
     }
 
-    if (!m_pedValues.count(FEDid))
-    {
+    if (!m_pedValues.count(FEDid)) {
       LogDebug("EcalPedOffset") << "Inserting new TPedValues object for FED:" << FEDid;
-      m_pedValues[FEDid] = new TPedValues(m_RMSmax,m_bestPed);
+      m_pedValues[FEDid] = new TPedValues(m_RMSmax, m_bestPed);
     }
-    
+
     // loop over the samples
-    for (int iSample = 0; iSample < EcalDataFrame::MAXSAMPLES; ++iSample) 
-    {
-      m_pedValues[FEDid]->insert(gainId,
-          crystalId,
-          DACvalues[FEDid],
-          ((EEDataFrame)(*itdigi)).sample(iSample).adc(),
-          endcapCrystalId);
+    for (int iSample = 0; iSample < EcalDataFrame::MAXSAMPLES; ++iSample) {
+      m_pedValues[FEDid]->insert(
+          gainId, crystalId, DACvalues[FEDid], ((EEDataFrame)(*itdigi)).sample(iSample).adc(), endcapCrystalId);
     }
-    
-  } //end loop over digis
+
+  }  // end loop over digis
 }
 
 // -----------------------------------------------------------------------------
 
-
 //! perform the minimization and write results
-void EcalPedOffset::endJob () 
-{
-  for (std::map<int,TPedValues*>::const_iterator smPeds = m_pedValues.begin ();
-      smPeds != m_pedValues.end (); 
-      ++smPeds)
-  {
-    m_pedResult[smPeds->first] = 
-      new TPedResult ((smPeds->second)->terminate (m_DACmin, m_DACmax));
-  } 
-  edm::LogInfo ("EcalPedOffset") << " results map size " 
-    << m_pedResult.size ();
+void EcalPedOffset::endJob() {
+  for (std::map<int, TPedValues *>::const_iterator smPeds = m_pedValues.begin(); smPeds != m_pedValues.end();
+       ++smPeds) {
+    m_pedResult[smPeds->first] = new TPedResult((smPeds->second)->terminate(m_DACmin, m_DACmax));
+  }
+  edm::LogInfo("EcalPedOffset") << " results map size " << m_pedResult.size();
   writeXMLFiles(m_xmlFile);
 
-  if (m_plotting != '0') makePlots ();
-  if (m_dbHostName != '0') writeDb ();       
+  if (m_plotting != '0')
+    makePlots();
+  if (m_dbHostName != '0')
+    writeDb();
 }
 
-
 // -----------------------------------------------------------------------------
 
-
 //! write the m_pedResult in the DB
-//!FIXME divide into sub-tasks
-void EcalPedOffset::writeDb () 
-{
-  LogDebug ("EcalPedOffset") << " entering writeDb ..." ;
+//! FIXME divide into sub-tasks
+void EcalPedOffset::writeDb() {
+  LogDebug("EcalPedOffset") << " entering writeDb ...";
 
   // connect to the database
-  EcalCondDBInterface* DBconnection ;
-  try
-  {
+  EcalCondDBInterface *DBconnection;
+  try {
     LogInfo("EcalPedOffset") << "Opening DB connection with TNS_ADMIN ...";
     DBconnection = new EcalCondDBInterface(m_dbName, m_dbUserName, m_dbPassword);
   } catch (std::runtime_error &e) {
     LogError("EcalPedOffset") << e.what();
-    if ( !m_dbHostName.empty() )
-    {
-      try
-      {
+    if (!m_dbHostName.empty()) {
+      try {
         LogInfo("EcalPedOffset") << "Opening DB connection without TNS_ADMIN ...";
-        DBconnection = new EcalCondDBInterface(m_dbHostName, m_dbName, 
-            m_dbUserName, m_dbPassword, m_dbHostPort);
+        DBconnection = new EcalCondDBInterface(m_dbHostName, m_dbName, m_dbUserName, m_dbPassword, m_dbHostPort);
       } catch (std::runtime_error &e) {
         LogError("EcalPedOffset") << e.what();
         return;
       }
-    }
-    else
+    } else
       return;
   }
 
   // define the query for RunIOV to get the right place in the database
-  RunTag runtag ;  
-  LocationDef locdef ;
-  RunTypeDef rundef ;
-  locdef.setLocation (m_location);
-
-  runtag.setGeneralTag ("PEDESTAL-OFFSET");
-  rundef.setRunType ("PEDESTAL-OFFSET");
-  //rundef.setRunType ("TEST");
-  //runtag.setGeneralTag ("TEST");
+  RunTag runtag;
+  LocationDef locdef;
+  RunTypeDef rundef;
+  locdef.setLocation(m_location);
 
-  runtag.setLocationDef (locdef);
-  runtag.setRunTypeDef (rundef);
+  runtag.setGeneralTag("PEDESTAL-OFFSET");
+  rundef.setRunType("PEDESTAL-OFFSET");
+  // rundef.setRunType ("TEST");
+  // runtag.setGeneralTag ("TEST");
 
+  runtag.setLocationDef(locdef);
+  runtag.setRunTypeDef(rundef);
 
-  run_t run = m_run ; //FIXME dal config file
-  //RunIOV runiov = DBconnection->fetchRunIOV (&runtag, run);
+  run_t run = m_run;  // FIXME dal config file
+  // RunIOV runiov = DBconnection->fetchRunIOV (&runtag, run);
   RunIOV runiov = DBconnection->fetchRunIOV(m_location, run);
-  
+
   // MonRunIOV
-  MonVersionDef monverdef ;  
-  monverdef.setMonitoringVersion ("test01");
-  MonRunTag montag ;
-  montag.setMonVersionDef (monverdef);
-  montag.setGeneralTag ("CMSSW");
+  MonVersionDef monverdef;
+  monverdef.setMonitoringVersion("test01");
+  MonRunTag montag;
+  montag.setMonVersionDef(monverdef);
+  montag.setGeneralTag("CMSSW");
 
-  subrun_t subrun = 1 ; //hardcoded!
+  subrun_t subrun = 1;  // hardcoded!
 
-  MonRunIOV moniov ;
+  MonRunIOV moniov;
 
-  try{
+  try {
     runtag = runiov.getRunTag();
     moniov = DBconnection->fetchMonRunIOV(&runtag, &montag, run, subrun);
-  } 
-  catch (std::runtime_error &e) {
-    if(m_create_moniov){
-      //if not already in the DB create a new MonRunIOV
+  } catch (std::runtime_error &e) {
+    if (m_create_moniov) {
+      // if not already in the DB create a new MonRunIOV
       Tm startSubRun;
       startSubRun.setToCurrentGMTime();
       // setup the MonIOV
@@ -365,116 +302,99 @@ void EcalPedOffset::writeDb ()
       moniov.setSubRunNumber(subrun);
       moniov.setSubRunStart(startSubRun);
       moniov.setMonRunTag(montag);
-      LogDebug ("EcalPedOffset") <<" creating a new MonRunIOV" ;
-    }
-    else{
-      edm::LogError ("EcalPedOffset") << " no MonRunIOV existing in the DB" ;
-      edm::LogError ("EcalPedOffset") << " the result will not be stored into the DB" ;
-      if ( DBconnection ) {delete DBconnection;}
+      LogDebug("EcalPedOffset") << " creating a new MonRunIOV";
+    } else {
+      edm::LogError("EcalPedOffset") << " no MonRunIOV existing in the DB";
+      edm::LogError("EcalPedOffset") << " the result will not be stored into the DB";
+      if (DBconnection) {
+        delete DBconnection;
+      }
       return;
     }
   }
 
   // create the table to be filled and the map to be inserted
-  EcalLogicID ecid ;
-  std::map<EcalLogicID, MonPedestalOffsetsDat> DBdataset ;
-  MonPedestalOffsetsDat DBtable ;
+  EcalLogicID ecid;
+  std::map<EcalLogicID, MonPedestalOffsetsDat> DBdataset;
+  MonPedestalOffsetsDat DBtable;
 
   // fill the table
 
   // loop over the super-modules
-  for (std::map<int,TPedResult*>::const_iterator result = m_pedResult.begin ();
-      result != m_pedResult.end ();
-      ++result)
-  {
+  for (std::map<int, TPedResult *>::const_iterator result = m_pedResult.begin(); result != m_pedResult.end();
+       ++result) {
     // loop over the crystals
-    for (int xtal = 0 ; xtal<1700 ; ++xtal)
-    {
-      DBtable.setDACG1 (result->second->m_DACvalue[2][xtal]);
-      DBtable.setDACG6 (result->second->m_DACvalue[1][xtal]);
-      DBtable.setDACG12 (result->second->m_DACvalue[0][xtal]);
-      DBtable.setTaskStatus (true); //FIXME to be set correctly
+    for (int xtal = 0; xtal < 1700; ++xtal) {
+      DBtable.setDACG1(result->second->m_DACvalue[2][xtal]);
+      DBtable.setDACG6(result->second->m_DACvalue[1][xtal]);
+      DBtable.setDACG12(result->second->m_DACvalue[0][xtal]);
+      DBtable.setTaskStatus(true);  // FIXME to be set correctly
 
       // fill the table
-      if ( DBconnection ) 
-      {
-        try 
-        {
+      if (DBconnection) {
+        try {
           int fedid = result->first;
           int eid = m_pedValues[fedid]->getCrystalNumber(xtal);
           // If eid is zero, that crystal was not present in digis
-          if(eid==0)
+          if (eid == 0)
             continue;
 
-          if (fedid >= 601 && fedid <= 609)
-          {
+          if (fedid >= 601 && fedid <= 609) {
             // Add the FEDid part in for DB
-            eid = eid+10000*(fedid-600);
+            eid = eid + 10000 * (fedid - 600);
             ecid = DBconnection->getEcalLogicID("EE_elec_crystal_number", eid);
-          }
-          else if (fedid >= 610 && fedid <= 627)
-          {
-            ecid = DBconnection->getEcalLogicID("EB_crystal_number", fedid-610+19,
-                eid);
-          } 
-          else if (fedid >= 628 && fedid <= 645)
-          {
-            ecid = DBconnection->getEcalLogicID("EB_crystal_number", fedid-628+1, 
-                eid);
-          }
-          else if (fedid >= 646 && fedid <= 654)
-          {
+          } else if (fedid >= 610 && fedid <= 627) {
+            ecid = DBconnection->getEcalLogicID("EB_crystal_number", fedid - 610 + 19, eid);
+          } else if (fedid >= 628 && fedid <= 645) {
+            ecid = DBconnection->getEcalLogicID("EB_crystal_number", fedid - 628 + 1, eid);
+          } else if (fedid >= 646 && fedid <= 654) {
             // Add the FEDid part in for DB
-            eid = eid+10000*(fedid-600);
+            eid = eid + 10000 * (fedid - 600);
             ecid = DBconnection->getEcalLogicID("EE_elec_crystal_number", eid);
-          }
-          else
+          } else
             LogError("EcalPedOffset") << "FEDid is out of range 601-654";
 
-          DBdataset[ecid] = DBtable ;
+          DBdataset[ecid] = DBtable;
         } catch (std::runtime_error &e) {
-          edm::LogError ("EcalPedOffset") << e.what();
+          edm::LogError("EcalPedOffset") << e.what();
         }
       }
-    } // loop over the crystals
-  } // loop over the super-modules
+    }  // loop over the crystals
+  }    // loop over the super-modules
 
   // insert the map of tables in the database
-  if ( DBconnection ) {
+  if (DBconnection) {
     try {
-      LogDebug ("EcalPedOffset") << "Inserting dataset ... " << std::flush;
-      if ( !DBdataset.empty() ) DBconnection->insertDataSet (&DBdataset, &moniov);
-      LogDebug ("EcalPedOffset") << "done." ;
+      LogDebug("EcalPedOffset") << "Inserting dataset ... " << std::flush;
+      if (!DBdataset.empty())
+        DBconnection->insertDataSet(&DBdataset, &moniov);
+      LogDebug("EcalPedOffset") << "done.";
     } catch (std::runtime_error &e) {
-      edm::LogError ("EcalPedOffset") << e.what ();
+      edm::LogError("EcalPedOffset") << e.what();
     }
   }
 
-  if ( DBconnection ) {delete DBconnection;}
+  if (DBconnection) {
+    delete DBconnection;
+  }
 }
 
-
 // -----------------------------------------------------------------------------
 
-
 //! write the m_pedResults to XML files
-void EcalPedOffset::writeXMLFiles(std::string fileName)
-{
+void EcalPedOffset::writeXMLFiles(std::string fileName) {
   // loop over the super-modules
-  for (std::map<int,TPedResult*>::const_iterator smRes = m_pedResult.begin();
-      smRes != m_pedResult.end(); 
-      ++smRes)
-  {
+  for (std::map<int, TPedResult *>::const_iterator smRes = m_pedResult.begin(); smRes != m_pedResult.end(); ++smRes) {
     std::string thisSMFileName = fileName;
     // open the output stream
-    thisSMFileName+="_";
-    thisSMFileName+=intToString(smRes->first);
-    thisSMFileName+=".xml";
+    thisSMFileName += "_";
+    thisSMFileName += intToString(smRes->first);
+    thisSMFileName += ".xml";
     std::ofstream xml_outfile;
     xml_outfile.open(thisSMFileName.c_str());
 
     // write the header file
-    xml_outfile<<"<offsets>"<<std::endl;
+    xml_outfile << "<offsets>" << std::endl;
     xml_outfile << "<PEDESTAL_OFFSET_RELEASE VERSION_ID = \"SM1_VER1\"> \n";
     xml_outfile << "  <RELEASE_ID>RELEASE_1</RELEASE_ID>\n";
     xml_outfile << "  <SUPERMODULE>";
@@ -483,73 +403,61 @@ void EcalPedOffset::writeXMLFiles(std::string fileName)
     xml_outfile << "  <TIME_STAMP> 070705 </TIME_STAMP>" << std::endl;
 
     // loop over the crystals
-    for (int xtal = 0 ; xtal < 1700 ; ++xtal) 
-    {
+    for (int xtal = 0; xtal < 1700; ++xtal) {
       int crystalNumber = m_pedValues[smRes->first]->getCrystalNumber(xtal);
-      if(crystalNumber==0)
+      if (crystalNumber == 0)
         continue;
       xml_outfile << "  <PEDESTAL_OFFSET>\n";
       xml_outfile << "    <HIGH>" << ((smRes->second)->m_DACvalue)[0][xtal] << "</HIGH>\n";
       xml_outfile << "    <MED>" << ((smRes->second)->m_DACvalue)[1][xtal] << "</MED>\n";
       xml_outfile << "    <LOW>" << ((smRes->second)->m_DACvalue)[2][xtal] << "</LOW>\n";
-      xml_outfile << "    <CRYSTAL> "<< crystalNumber << " </CRYSTAL>\n";
-      xml_outfile << "  </PEDESTAL_OFFSET>" << std::endl;            
-    } 
+      xml_outfile << "    <CRYSTAL> " << crystalNumber << " </CRYSTAL>\n";
+      xml_outfile << "  </PEDESTAL_OFFSET>" << std::endl;
+    }
 
-    // close the open tags  
+    // close the open tags
     xml_outfile << " </PEDESTAL_OFFSET_RELEASE>" << std::endl;
     xml_outfile << "</offsets>" << std::endl;
-    xml_outfile.close ();
-  } // loop over the super-modules
-
-
+    xml_outfile.close();
+  }  // loop over the super-modules
 }
 
-
 // -----------------------------------------------------------------------------
 
-
 //! create the plots of the DAC pedestal trend
-void EcalPedOffset::makePlots () 
-{
-  LogDebug ("EcalPedOffset") << " entering makePlots ..." ;
+void EcalPedOffset::makePlots() {
+  LogDebug("EcalPedOffset") << " entering makePlots ...";
 
-  edm::LogInfo ("EcalPedOffset") << " map size: " 
-    << m_pedValues.size();
+  edm::LogInfo("EcalPedOffset") << " map size: " << m_pedValues.size();
 
   // create the ROOT file
-  m_plotting+=".root";
+  m_plotting += ".root";
 
-  TFile * rootFile = new TFile(m_plotting.c_str(),"RECREATE");
+  TFile *rootFile = new TFile(m_plotting.c_str(), "RECREATE");
 
   // loop over the supermodules
-  for (std::map<int,TPedValues*>::const_iterator smPeds = m_pedValues.begin();
-      smPeds != m_pedValues.end(); 
-      ++smPeds)
-  {
+  for (std::map<int, TPedValues *>::const_iterator smPeds = m_pedValues.begin(); smPeds != m_pedValues.end();
+       ++smPeds) {
     // make a folder in the ROOT file
-    char folderName[120] ;
-    sprintf (folderName,"FED%02d",smPeds->first);
+    char folderName[120];
+    sprintf(folderName, "FED%02d", smPeds->first);
     rootFile->mkdir(folderName);
-    smPeds->second->makePlots(rootFile,folderName,m_maxSlopeAllowed_,
-        m_minSlopeAllowed_,m_maxChi2OverNDFAllowed_);
+    smPeds->second->makePlots(rootFile, folderName, m_maxSlopeAllowed_, m_minSlopeAllowed_, m_maxChi2OverNDFAllowed_);
   }
 
   rootFile->Close();
   delete rootFile;
 
-  LogDebug ("EcalPedOffset") << " DONE"; 
+  LogDebug("EcalPedOffset") << " DONE";
 }
 
 // -----------------------------------------------------------------------------
 
 // convert an int to a string
-std::string EcalPedOffset::intToString(int num)
-{
-
+std::string EcalPedOffset::intToString(int num) {
   // outputs the number into the string stream and then flushes
   // the buffer (makes sure the output is put into the stream)
   std::ostringstream myStream;
   myStream << num << std::flush;
-  return(myStream.str()); //returns the string form of the stringstream object
+  return (myStream.str());  // returns the string form of the stringstream object
 }
diff --git a/CalibCalorimetry/EcalPedestalOffsets/src/SealModule.cc b/CalibCalorimetry/EcalPedestalOffsets/src/SealModule.cc
index cdb7fe563450f..53763afc5825a 100644
--- a/CalibCalorimetry/EcalPedestalOffsets/src/SealModule.cc
+++ b/CalibCalorimetry/EcalPedestalOffsets/src/SealModule.cc
@@ -1,14 +1,13 @@
 /*
  *  \author  P. Govoni Univ Milano Bicocca - INFN Milano
  */
- 
+
 #include "FWCore/Framework/interface/MakerMacros.h"
- 
+
 #include "CalibCalorimetry/EcalPedestalOffsets/interface/EcalPedOffset.h"
 
-DEFINE_FWK_MODULE (EcalPedOffset) ;
+DEFINE_FWK_MODULE(EcalPedOffset);
 
 #include "CalibCalorimetry/EcalPedestalOffsets/interface/testChannel.h"
 
-DEFINE_FWK_MODULE (testChannel) ;
- 
+DEFINE_FWK_MODULE(testChannel);
diff --git a/CalibCalorimetry/EcalPedestalOffsets/src/TPedValues.cc b/CalibCalorimetry/EcalPedestalOffsets/src/TPedValues.cc
index 62f49b44bdf74..c522afa28b4da 100644
--- a/CalibCalorimetry/EcalPedestalOffsets/src/TPedValues.cc
+++ b/CalibCalorimetry/EcalPedestalOffsets/src/TPedValues.cc
@@ -1,280 +1,247 @@
 #include "CalibCalorimetry/EcalPedestalOffsets/interface/TPedValues.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include <cmath>
-#include <iostream>
-#include <cassert>
-#include "TGraphErrors.h"
 #include "TAxis.h"
 #include "TF1.h"
+#include "TGraphErrors.h"
+#include <cassert>
+#include <cmath>
+#include <iostream>
 
-void reset (double vett[256]) 
-{
-   for (int i=0 ; i<256; ++i) vett[i] = 0. ; 
+void reset(double vett[256]) {
+  for (int i = 0; i < 256; ++i)
+    vett[i] = 0.;
 }
 
-
-TPedValues::TPedValues (double RMSmax, int bestPedestal) :
-  m_bestPedestal (bestPedestal) ,
-  m_RMSmax (RMSmax) 
-{
-  LogDebug ("EcalPedOffset") << "entering TPedValues ctor ..." ;
-  for(int i=0; i<1700;++i)
+TPedValues::TPedValues(double RMSmax, int bestPedestal) : m_bestPedestal(bestPedestal), m_RMSmax(RMSmax) {
+  LogDebug("EcalPedOffset") << "entering TPedValues ctor ...";
+  for (int i = 0; i < 1700; ++i)
     endcapCrystalNumbers[i] = 0;
 }
 
+TPedValues::TPedValues(const TPedValues &orig) {
+  LogDebug("EcalPedOffset") << "entering TPedValues copyctor ...";
+  m_bestPedestal = orig.m_bestPedestal;
+  m_RMSmax = orig.m_RMSmax;
 
-TPedValues::TPedValues (const TPedValues & orig) 
-{
-  LogDebug ("EcalPedOffset") << "entering TPedValues copyctor ..." ;
-  m_bestPedestal = orig.m_bestPedestal ;
-  m_RMSmax = orig.m_RMSmax ;
+  for (int gain = 0; gain < 3; ++gain)
+    for (int crystal = 0; crystal < 1700; ++crystal)
+      for (int DAC = 0; DAC < 256; ++DAC)
+        m_entries[gain][crystal][DAC] = orig.m_entries[gain][crystal][DAC];
 
-  for (int gain = 0 ; gain < 3 ; ++gain)
-    for (int crystal = 0 ; crystal < 1700 ; ++crystal)
-        for (int DAC = 0 ; DAC < 256 ; ++DAC)
-          m_entries[gain][crystal][DAC] = orig.m_entries[gain][crystal][DAC] ;
-
-  for(int i=0; i<1700;++i)
+  for (int i = 0; i < 1700; ++i)
     endcapCrystalNumbers[i] = orig.endcapCrystalNumbers[i];
 }
 
-
-
-TPedValues::~TPedValues () {}
-  
-
-void TPedValues::insert (const int gainId, 
-                         const int crystal, 
-                         const int DAC, 
-                         const int pedestal,
-                         const int endcapIndex) 
-{
-//  assert (gainId > 0) ;
-//  assert (gainId < 4) ;
-  if (gainId <= 0 || gainId >= 4)
-    {
-      edm::LogWarning ("EcalPedOffset") << "WARNING : TPedValues : gainId " << gainId
-                                        << " does not exist, entry skipped" ;
-      return ;    
-    }
-//  assert (crystal > 0) ;
-//  assert (crystal <= 1700) ;
-  if (crystal <= 0 || crystal > 1700)
-    {
-      edm::LogWarning ("EcalPedOffset") << "WARNING : TPedValues : crystal " << crystal
-                                        << " does not exist, entry skipped" ;
-      return ;    
-    }
-//  assert (DAC >= 0) ; 
-//  assert (DAC < 256) ;
-  if (DAC < 0 || DAC >= 256)
-    {
-      edm::LogWarning ("EcalPedOffset") << "WARNING : TPedValues : DAC value " << DAC
-                                        << " is out range, entry skipped" ;
-      return ;    
-    }
-  m_entries[gainId-1][crystal-1][DAC].insert (pedestal) ;
-  endcapCrystalNumbers[crystal-1] = endcapIndex;
-  return ;
+TPedValues::~TPedValues() {}
+
+void TPedValues::insert(const int gainId, const int crystal, const int DAC, const int pedestal, const int endcapIndex) {
+  //  assert (gainId > 0) ;
+  //  assert (gainId < 4) ;
+  if (gainId <= 0 || gainId >= 4) {
+    edm::LogWarning("EcalPedOffset") << "WARNING : TPedValues : gainId " << gainId << " does not exist, entry skipped";
+    return;
+  }
+  //  assert (crystal > 0) ;
+  //  assert (crystal <= 1700) ;
+  if (crystal <= 0 || crystal > 1700) {
+    edm::LogWarning("EcalPedOffset") << "WARNING : TPedValues : crystal " << crystal
+                                     << " does not exist, entry skipped";
+    return;
+  }
+  //  assert (DAC >= 0) ;
+  //  assert (DAC < 256) ;
+  if (DAC < 0 || DAC >= 256) {
+    edm::LogWarning("EcalPedOffset") << "WARNING : TPedValues : DAC value " << DAC << " is out range, entry skipped";
+    return;
+  }
+  m_entries[gainId - 1][crystal - 1][DAC].insert(pedestal);
+  endcapCrystalNumbers[crystal - 1] = endcapIndex;
+  return;
 }
-    
 
-TPedResult TPedValues::terminate (const int & DACstart, const int & DACend) const
-{
-  assert (DACstart >= 0) ;
-  assert (DACend <= 256) ;
-//  checkEntries (DACstart, DACend) ;
+TPedResult TPedValues::terminate(const int &DACstart, const int &DACend) const {
+  assert(DACstart >= 0);
+  assert(DACend <= 256);
+  //  checkEntries (DACstart, DACend) ;
 
-  TPedResult bestDAC ;
+  TPedResult bestDAC;
   //! loop over gains
-  for (int gainId = 1 ; gainId < 4 ; ++gainId)
-    {
-      //! loop over crystals
-      for (int crystal = 0 ; crystal < 1700 ; ++crystal)
-        {
-          //! find the DAC value with the average pedestal nearest to 200
-          double delta = 1000 ;
-          int dummyBestDAC = -1 ;
-          bool hasDigis = false;
-          //! loop over DAC values
-          for (int DAC = DACstart ; DAC < DACend ; ++DAC)
-            {
-              double average = m_entries[gainId-1][crystal][DAC].average () ;
-              if (average == -1) continue ;
-              hasDigis = true;
-              if (m_entries[gainId-1][crystal][DAC].RMSSq () > m_RMSmax * m_RMSmax) continue ;
-              if (fabs (average - m_bestPedestal) < delta &&   average>1 ) 
-                {
-                  delta = fabs (average - m_bestPedestal) ;
-                  dummyBestDAC = DAC ;
-                }
-            } //! loop over DAC values
-
-          bestDAC.m_DACvalue[gainId-1][crystal] = dummyBestDAC ;
-	  
-	  if ((dummyBestDAC == (DACend-1) || dummyBestDAC == -1) && hasDigis)
-          {
-	    int gainHuman;
-	    if      (gainId ==1) gainHuman =12;
-	    else if (gainId ==2) gainHuman =6;
-	    else if (gainId ==3) gainHuman =1;
-	    else                 gainHuman =-1;
-	    edm::LogError("EcalPedOffset")
-              << " TPedValues :  cannot find best DAC value for channel: "
-              << endcapCrystalNumbers[crystal]
-	      << " gain: " << gainHuman;
-	  }
-	  
-        } // loop over crystals
-    } // loop over gains
-  return bestDAC ;
+  for (int gainId = 1; gainId < 4; ++gainId) {
+    //! loop over crystals
+    for (int crystal = 0; crystal < 1700; ++crystal) {
+      //! find the DAC value with the average pedestal nearest to 200
+      double delta = 1000;
+      int dummyBestDAC = -1;
+      bool hasDigis = false;
+      //! loop over DAC values
+      for (int DAC = DACstart; DAC < DACend; ++DAC) {
+        double average = m_entries[gainId - 1][crystal][DAC].average();
+        if (average == -1)
+          continue;
+        hasDigis = true;
+        if (m_entries[gainId - 1][crystal][DAC].RMSSq() > m_RMSmax * m_RMSmax)
+          continue;
+        if (fabs(average - m_bestPedestal) < delta && average > 1) {
+          delta = fabs(average - m_bestPedestal);
+          dummyBestDAC = DAC;
+        }
+      }  //! loop over DAC values
+
+      bestDAC.m_DACvalue[gainId - 1][crystal] = dummyBestDAC;
+
+      if ((dummyBestDAC == (DACend - 1) || dummyBestDAC == -1) && hasDigis) {
+        int gainHuman;
+        if (gainId == 1)
+          gainHuman = 12;
+        else if (gainId == 2)
+          gainHuman = 6;
+        else if (gainId == 3)
+          gainHuman = 1;
+        else
+          gainHuman = -1;
+        edm::LogError("EcalPedOffset") << " TPedValues :  cannot find best DAC value for channel: "
+                                       << endcapCrystalNumbers[crystal] << " gain: " << gainHuman;
+      }
+
+    }  // loop over crystals
+  }    // loop over gains
+  return bestDAC;
 }
-    
 
-int TPedValues::checkEntries (const int & DACstart, const int & DACend) const
-{
-  assert (DACstart >= 0) ;
-  assert (DACend <= 256) ;
-  int returnCode = 0 ;
+int TPedValues::checkEntries(const int &DACstart, const int &DACend) const {
+  assert(DACstart >= 0);
+  assert(DACend <= 256);
+  int returnCode = 0;
   //! loop over gains
-  for (int gainId = 1 ; gainId < 4 ; ++gainId)
-    {
-      //! loop over crystals
-      for (int crystal = 0 ; crystal < 1700 ; ++crystal)
-        {
-          //! loop over DAC values
-          for (int DAC = DACstart ; DAC < DACend ; ++DAC)
-            {
-              double average = m_entries[gainId-1][crystal][DAC].average () ;
-              if (average == -1) 
-                {
-                  ++returnCode ;
-                  //! do something!
-/*
-                  std::cerr << "[TPedValues][checkEntries] WARNING!"
-                            << "\tgainId " << gainId
-                            << "\tcrystal " << crystal+1
-                            << "\tDAC " << DAC
-                            << " : pedestal measurement missing" 
-                            << std::endl ;
-*/
-                }
-/*
-              std::cout << "[pietro][RMS]: " << m_entries[gainId-1][crystal][DAC].RMS ()     //FIXME
-                        << "\t" << m_entries[gainId-1][crystal][DAC].RMSSq () //FIXME
-                        << "\t" << DAC //FIXME
-                        << "\t" << gainId //FIXME
-                        << "\t" << crystal << std::endl ; //FIXME
-*/              
-            } //! loop over DAC values
-        } // loop over crystals
-    } // loop over gains
-  return returnCode ;
+  for (int gainId = 1; gainId < 4; ++gainId) {
+    //! loop over crystals
+    for (int crystal = 0; crystal < 1700; ++crystal) {
+      //! loop over DAC values
+      for (int DAC = DACstart; DAC < DACend; ++DAC) {
+        double average = m_entries[gainId - 1][crystal][DAC].average();
+        if (average == -1) {
+          ++returnCode;
+          //! do something!
+          /*
+                            std::cerr << "[TPedValues][checkEntries] WARNING!"
+                                      << "\tgainId " << gainId
+                                      << "\tcrystal " << crystal+1
+                                      << "\tDAC " << DAC
+                                      << " : pedestal measurement missing"
+                                      << std::endl ;
+          */
+        }
+        /*
+                      std::cout << "[pietro][RMS]: " <<
+           m_entries[gainId-1][crystal][DAC].RMS ()     //FIXME
+                                << "\t" <<
+           m_entries[gainId-1][crystal][DAC].RMSSq () //FIXME
+                                << "\t" << DAC //FIXME
+                                << "\t" << gainId //FIXME
+                                << "\t" << crystal << std::endl ; //FIXME
+        */
+      }  //! loop over DAC values
+    }    // loop over crystals
+  }      // loop over gains
+  return returnCode;
 }
 
-
 //! create a plot of the DAC pedestal trend
-int TPedValues::makePlots (TFile * rootFile, const std::string & dirName,
-     const double maxSlope, const double minSlope, const double maxChi2OverNDF) const 
-{
+int TPedValues::makePlots(TFile *rootFile,
+                          const std::string &dirName,
+                          const double maxSlope,
+                          const double minSlope,
+                          const double maxChi2OverNDF) const {
   using namespace std;
   // prepare the ROOT file
-  if (!rootFile->cd (dirName.c_str ())) 
-    {
-      rootFile->mkdir (dirName.c_str ()) ;
-      rootFile->cd (dirName.c_str ()) ;
-    }
-  
+  if (!rootFile->cd(dirName.c_str())) {
+    rootFile->mkdir(dirName.c_str());
+    rootFile->cd(dirName.c_str());
+  }
+
   // loop over the crystals
-  for (int xtl=0 ; xtl<1700 ; ++xtl)
-  {
+  for (int xtl = 0; xtl < 1700; ++xtl) {
     // loop over the gains
-    for (int gain=0 ; gain<3 ; ++gain)
-      {
-        vector<double> asseX;
-        vector<double> sigmaX;
-        vector<double> asseY;
-        vector<double> sigmaY;
-        asseX.reserve(256);
-        sigmaX.reserve(256);
-        asseY.reserve(256);
-        sigmaY.reserve(256);
-        // loop over DAC values
-        for (int dac=0 ; dac<256 ; ++dac)
-          {
-            double average = m_entries[gain][xtl][dac].average();
-            if(average > -1)
-            {
-              double rms = m_entries[gain][xtl][dac].RMS();
-              asseX.push_back(dac);
-              sigmaX.push_back(0);
-              asseY.push_back(average);
-              sigmaY.push_back(rms);
-            }
-          } // loop over DAC values
-        if(!asseX.empty())
-        {
-          int lastBin = 0;
-          while(lastBin<(int)asseX.size()-1 && asseY[lastBin+1]>0
-              && (asseY[lastBin+1]-asseY[lastBin+2])!=0)
-            lastBin++;
-          
-          int fitRangeEnd = (int)asseX[lastBin];
-          int kinkPt = 64;
-          if(fitRangeEnd < 66)
-            kinkPt = fitRangeEnd-4;
-          TGraphErrors graph(asseX.size(),&(*asseX.begin()),&(*asseY.begin()),
-              &(*sigmaX.begin()),&(*sigmaY.begin()));
-          char funct[120];
-          sprintf(funct,"(x<%d)*([0]*x+[1])+(x>=%d)*([2]*x+[3])",kinkPt,kinkPt);
-          TF1 fitFunction("fitFunction",funct,asseX[0],fitRangeEnd);
-          fitFunction.SetLineColor(2);
-          
-          char name[120] ;
-          int gainHuman;
-          if      (gain ==0) gainHuman =12;
-          else if (gain ==1) gainHuman =6;
-          else if (gain ==2) gainHuman =1;
-          else               gainHuman =-1;
-          sprintf (name,"XTL%04d_GAIN%02d",endcapCrystalNumbers[xtl],gainHuman) ;
-          graph.GetXaxis()->SetTitle("DAC value");
-          graph.GetYaxis()->SetTitle("Average pedestal ADC");
-          graph.Fit(&fitFunction,"RWQ");
-          graph.Write (name);
-          
-          double slope1 = fitFunction.GetParameter(0);
-          double slope2 = fitFunction.GetParameter(2);
-
-          if(fitFunction.GetChisquare()/fitFunction.GetNDF()>maxChi2OverNDF ||
-              fitFunction.GetChisquare()/fitFunction.GetNDF()<0 ||
-              slope1>0 || slope2>0 ||
-              ((slope1<-29 || slope1>-18) && slope1<0) || 
-              ((slope2<-29 || slope2>-18) && slope2<0))
-          {
-            edm::LogError("EcalPedOffset") << "TPedValues : TGraph for channel:" << 
-              endcapCrystalNumbers[xtl] << 
-              " gain:" << gainHuman << " is not linear;" << "  slope of line1:" << 
-              fitFunction.GetParameter(0) << " slope of line2:" << 
-              fitFunction.GetParameter(2) << " reduced chi-squared:" << 
-              fitFunction.GetChisquare()/fitFunction.GetNDF();
-          }
-          //LogDebug("EcalPedOffset") << "TPedValues : TGraph for channel:" << xtl+1 << " gain:"
-          //  << gainHuman << " has " << asseX.size() << " points...back is:" << asseX.back() 
-          //  << " and front+1 is:" << asseX.front()+1;
-          if((asseX.back()-asseX.front()+1)!=asseX.size())
-            edm::LogError("EcalPedOffset") << "TPedValues : Pedestal average not found " <<
-              "for all DAC values scanned in channel:" << endcapCrystalNumbers[xtl]
-              << " gain:" << gainHuman;
+    for (int gain = 0; gain < 3; ++gain) {
+      vector<double> asseX;
+      vector<double> sigmaX;
+      vector<double> asseY;
+      vector<double> sigmaY;
+      asseX.reserve(256);
+      sigmaX.reserve(256);
+      asseY.reserve(256);
+      sigmaY.reserve(256);
+      // loop over DAC values
+      for (int dac = 0; dac < 256; ++dac) {
+        double average = m_entries[gain][xtl][dac].average();
+        if (average > -1) {
+          double rms = m_entries[gain][xtl][dac].RMS();
+          asseX.push_back(dac);
+          sigmaX.push_back(0);
+          asseY.push_back(average);
+          sigmaY.push_back(rms);
         }
-      } // loop over the gains
-  }     // (loop over the crystals)
-  
-  return 0 ;
+      }  // loop over DAC values
+      if (!asseX.empty()) {
+        int lastBin = 0;
+        while (lastBin < (int)asseX.size() - 1 && asseY[lastBin + 1] > 0 &&
+               (asseY[lastBin + 1] - asseY[lastBin + 2]) != 0)
+          lastBin++;
+
+        int fitRangeEnd = (int)asseX[lastBin];
+        int kinkPt = 64;
+        if (fitRangeEnd < 66)
+          kinkPt = fitRangeEnd - 4;
+        TGraphErrors graph(asseX.size(), &(*asseX.begin()), &(*asseY.begin()), &(*sigmaX.begin()), &(*sigmaY.begin()));
+        char funct[120];
+        sprintf(funct, "(x<%d)*([0]*x+[1])+(x>=%d)*([2]*x+[3])", kinkPt, kinkPt);
+        TF1 fitFunction("fitFunction", funct, asseX[0], fitRangeEnd);
+        fitFunction.SetLineColor(2);
+
+        char name[120];
+        int gainHuman;
+        if (gain == 0)
+          gainHuman = 12;
+        else if (gain == 1)
+          gainHuman = 6;
+        else if (gain == 2)
+          gainHuman = 1;
+        else
+          gainHuman = -1;
+        sprintf(name, "XTL%04d_GAIN%02d", endcapCrystalNumbers[xtl], gainHuman);
+        graph.GetXaxis()->SetTitle("DAC value");
+        graph.GetYaxis()->SetTitle("Average pedestal ADC");
+        graph.Fit(&fitFunction, "RWQ");
+        graph.Write(name);
+
+        double slope1 = fitFunction.GetParameter(0);
+        double slope2 = fitFunction.GetParameter(2);
+
+        if (fitFunction.GetChisquare() / fitFunction.GetNDF() > maxChi2OverNDF ||
+            fitFunction.GetChisquare() / fitFunction.GetNDF() < 0 || slope1 > 0 || slope2 > 0 ||
+            ((slope1 < -29 || slope1 > -18) && slope1 < 0) || ((slope2 < -29 || slope2 > -18) && slope2 < 0)) {
+          edm::LogError("EcalPedOffset") << "TPedValues : TGraph for channel:" << endcapCrystalNumbers[xtl]
+                                         << " gain:" << gainHuman << " is not linear;"
+                                         << "  slope of line1:" << fitFunction.GetParameter(0)
+                                         << " slope of line2:" << fitFunction.GetParameter(2) << " reduced chi-squared:"
+                                         << fitFunction.GetChisquare() / fitFunction.GetNDF();
+        }
+        // LogDebug("EcalPedOffset") << "TPedValues : TGraph for channel:" <<
+        // xtl+1 << " gain:"
+        //  << gainHuman << " has " << asseX.size() << " points...back is:" <<
+        //  asseX.back()
+        //  << " and front+1 is:" << asseX.front()+1;
+        if ((asseX.back() - asseX.front() + 1) != asseX.size())
+          edm::LogError("EcalPedOffset") << "TPedValues : Pedestal average not found "
+                                         << "for all DAC values scanned in channel:" << endcapCrystalNumbers[xtl]
+                                         << " gain:" << gainHuman;
+      }
+    }  // loop over the gains
+  }    // (loop over the crystals)
+
+  return 0;
 }
 
 // Look up the crystal number in the EE schema and return it
-int TPedValues::getCrystalNumber(int xtal) const
-{
-  return endcapCrystalNumbers[xtal];
-}
+int TPedValues::getCrystalNumber(int xtal) const { return endcapCrystalNumbers[xtal]; }
diff --git a/CalibCalorimetry/EcalPedestalOffsets/src/TSinglePedEntry.cc b/CalibCalorimetry/EcalPedestalOffsets/src/TSinglePedEntry.cc
index 454bca57e2315..2de5a0d98869f 100644
--- a/CalibCalorimetry/EcalPedestalOffsets/src/TSinglePedEntry.cc
+++ b/CalibCalorimetry/EcalPedestalOffsets/src/TSinglePedEntry.cc
@@ -1,61 +1,47 @@
 
 #include "CalibCalorimetry/EcalPedestalOffsets/interface/TSinglePedEntry.h"
-#include <iostream>
 #include <cmath>
+#include <iostream>
 
-TSinglePedEntry::TSinglePedEntry () : 
-  m_pedestalSqSum (0),
-  m_pedestalSum (0),
-  m_entries (0)
-{
-//  std::cout << "[TSinglePedEntry][ctor]" << std::endl ;
+TSinglePedEntry::TSinglePedEntry() : m_pedestalSqSum(0), m_pedestalSum(0), m_entries(0) {
+  //  std::cout << "[TSinglePedEntry][ctor]" << std::endl ;
 }
 
+TSinglePedEntry::~TSinglePedEntry() {}
 
-TSinglePedEntry::~TSinglePedEntry ()
-{}
-
-
-TSinglePedEntry::TSinglePedEntry (const TSinglePedEntry & orig) 
-{
-  m_pedestalSqSum = orig.m_pedestalSqSum ;
-  m_pedestalSum = orig.m_pedestalSum ;
-  m_entries = orig.m_entries ;
-} 
-  
-
-void TSinglePedEntry::insert (const int & pedestal) 
-{
-  m_pedestalSqSum += pedestal * pedestal ;
-  m_pedestalSum += pedestal ;
-  ++m_entries ;
+TSinglePedEntry::TSinglePedEntry(const TSinglePedEntry &orig) {
+  m_pedestalSqSum = orig.m_pedestalSqSum;
+  m_pedestalSum = orig.m_pedestalSum;
+  m_entries = orig.m_entries;
 }
 
-
-double TSinglePedEntry::average () const
-{
-  if (!m_entries) return -1;
-  return static_cast<double>(m_pedestalSum) / m_entries ;
+void TSinglePedEntry::insert(const int &pedestal) {
+  m_pedestalSqSum += pedestal * pedestal;
+  m_pedestalSum += pedestal;
+  ++m_entries;
 }
 
-
-double TSinglePedEntry::RMS () const
-{
-  if (!m_entries) return -1;
-  return sqrt (RMSSq ())  ;
+double TSinglePedEntry::average() const {
+  if (!m_entries)
+    return -1;
+  return static_cast<double>(m_pedestalSum) / m_entries;
 }
 
-double TSinglePedEntry::RMSSq () const
-{
-/*
-  std::cout << "[TSinglePedEntry][minchia] " << m_pedestalSum
-            << "\t" << m_pedestalSum
-            << "\t" << m_entries << std::endl ;   // FIXME
-*/            
-  if (!m_entries) return -1;
-  double num = 1./static_cast<double>(m_entries) ;
-  double output = m_pedestalSqSum * num - m_pedestalSum * num * m_pedestalSum * num ;
-  return output ;
+double TSinglePedEntry::RMS() const {
+  if (!m_entries)
+    return -1;
+  return sqrt(RMSSq());
 }
 
-
+double TSinglePedEntry::RMSSq() const {
+  /*
+    std::cout << "[TSinglePedEntry][minchia] " << m_pedestalSum
+              << "\t" << m_pedestalSum
+              << "\t" << m_entries << std::endl ;   // FIXME
+  */
+  if (!m_entries)
+    return -1;
+  double num = 1. / static_cast<double>(m_entries);
+  double output = m_pedestalSqSum * num - m_pedestalSum * num * m_pedestalSum * num;
+  return output;
+}
diff --git a/CalibCalorimetry/EcalPedestalOffsets/src/testChannel.cc b/CalibCalorimetry/EcalPedestalOffsets/src/testChannel.cc
index a0c428b0ab71a..21ad06f65fcf8 100644
--- a/CalibCalorimetry/EcalPedestalOffsets/src/testChannel.cc
+++ b/CalibCalorimetry/EcalPedestalOffsets/src/testChannel.cc
@@ -3,8 +3,7 @@
  *
  * \author P. Govoni (pietro.govoni@cernNOSPAM.ch)
  *
-*/
-
+ */
 
 #include "DataFormats/EcalRawData/interface/EcalDCCHeaderBlock.h"
 #include "DataFormats/EcalRawData/interface/EcalRawDataCollections.h"
@@ -15,155 +14,142 @@
 #include "CalibCalorimetry/EcalPedestalOffsets/interface/testChannel.h"
 
 //! ctor
-testChannel::testChannel (const edm::ParameterSet& paramSet) :
-  m_digiCollection (paramSet.getParameter<std::string> ("digiCollection")) ,
-  m_digiProducer (paramSet.getParameter<std::string> ("digiProducer")) ,
-  m_headerProducer (paramSet.getParameter<std::string> ("headerProducer")) ,
-  m_xmlFile (paramSet.getParameter<std::string> ("xmlFile")) ,
-  m_DACmin (paramSet.getParameter<int> ("DACmin")) ,
-  m_DACmax (paramSet.getParameter<int> ("DACmax")) ,
-  m_RMSmax (paramSet.getParameter<double> ("RMSmax")) ,
-  m_bestPed (paramSet.getParameter<int> ("bestPed")) ,
-  m_xtal (paramSet.getParameter<int> ("xtal")) ,
-  m_pedVSDAC ("pedVSDAC","pedVSDAC",100,150,250,m_DACmax-m_DACmin,m_DACmin,m_DACmax) ,
-  m_singlePedVSDAC_1 ("singlePedVSDAC_1","pedVSDAC (g1) for xtal "+TString(m_xtal),100,150,250,m_DACmax-m_DACmin,m_DACmin,m_DACmax) ,
-  m_singlePedVSDAC_2 ("singlePedVSDAC_2","pedVSDAC (g2) for xtal "+TString(m_xtal),100,150,250,m_DACmax-m_DACmin,m_DACmin,m_DACmax) ,
-  m_singlePedVSDAC_3 ("singlePedVSDAC_3","pedVSDAC (g3) for xtal "+TString(m_xtal),100,150,250,m_DACmax-m_DACmin,m_DACmin,m_DACmax)
-{
-  edm::LogInfo ("testChannel") << " reading "
-                               << " m_DACmin: " << m_DACmin
-                               << " m_DACmax: " << m_DACmax
-                               << " m_RMSmax: " << m_RMSmax
-                               << " m_bestPed: " << m_bestPed ;
+testChannel::testChannel(const edm::ParameterSet &paramSet)
+    : m_digiCollection(paramSet.getParameter<std::string>("digiCollection")),
+      m_digiProducer(paramSet.getParameter<std::string>("digiProducer")),
+      m_headerProducer(paramSet.getParameter<std::string>("headerProducer")),
+      m_xmlFile(paramSet.getParameter<std::string>("xmlFile")),
+      m_DACmin(paramSet.getParameter<int>("DACmin")),
+      m_DACmax(paramSet.getParameter<int>("DACmax")),
+      m_RMSmax(paramSet.getParameter<double>("RMSmax")),
+      m_bestPed(paramSet.getParameter<int>("bestPed")),
+      m_xtal(paramSet.getParameter<int>("xtal")),
+      m_pedVSDAC("pedVSDAC", "pedVSDAC", 100, 150, 250, m_DACmax - m_DACmin, m_DACmin, m_DACmax),
+      m_singlePedVSDAC_1("singlePedVSDAC_1",
+                         "pedVSDAC (g1) for xtal " + TString(m_xtal),
+                         100,
+                         150,
+                         250,
+                         m_DACmax - m_DACmin,
+                         m_DACmin,
+                         m_DACmax),
+      m_singlePedVSDAC_2("singlePedVSDAC_2",
+                         "pedVSDAC (g2) for xtal " + TString(m_xtal),
+                         100,
+                         150,
+                         250,
+                         m_DACmax - m_DACmin,
+                         m_DACmin,
+                         m_DACmax),
+      m_singlePedVSDAC_3("singlePedVSDAC_3",
+                         "pedVSDAC (g3) for xtal " + TString(m_xtal),
+                         100,
+                         150,
+                         250,
+                         m_DACmax - m_DACmin,
+                         m_DACmin,
+                         m_DACmax) {
+  edm::LogInfo("testChannel") << " reading "
+                              << " m_DACmin: " << m_DACmin << " m_DACmax: " << m_DACmax << " m_RMSmax: " << m_RMSmax
+                              << " m_bestPed: " << m_bestPed;
 }
 
-
 //! dtor
-testChannel::~testChannel ()
-{
-}
-
+testChannel::~testChannel() {}
 
 //! begin the job
-void testChannel::beginJob ()
-{
-   LogDebug ("testChannel") << "entering beginJob ..." ;
-}
-
+void testChannel::beginJob() { LogDebug("testChannel") << "entering beginJob ..."; }
 
 //! perform te analysis
-void testChannel::analyze (edm::Event const& event, 
-                           edm::EventSetup const& eventSetup) 
-{
-   LogDebug ("testChannel") << "entering analyze ..." ;
-
-   // get the headers
-   // (one header for each supermodule)
-   edm::Handle<EcalRawDataCollection> DCCHeaders ;
-   event.getByLabel (m_headerProducer, DCCHeaders) ;
-   if(!DCCHeaders.isValid())
-   {
-     edm::LogError ("testChannel") << "Error! can't get the product " 
-                                   << m_headerProducer.c_str () ;
-   }
-
-   std::map <int,int> DACvalues ;
-   
-   // loop over the headers
-   for ( EcalRawDataCollection::const_iterator headerItr= DCCHeaders->begin () ;
-         headerItr != DCCHeaders->end () ; 
-	     ++headerItr ) 
-     {
-       EcalDCCHeaderBlock::EcalDCCEventSettings settings = headerItr->getEventSettings () ;
-       DACvalues[getHeaderSMId (headerItr->id ())] = settings.ped_offset ;
-//       std::cout << "DCCid: " << headerItr->id () << "" ;
-//       std::cout << "Ped offset DAC: " << settings.ped_offset << "" ;
-     } //! loop over the headers
-
-   // get the digis
-   // (one digi for each crystal)
-   edm::Handle<EBDigiCollection> pDigis;
-   event.getByLabel (m_digiProducer, pDigis) ;
-   if(!pDigis.isValid())
-   {
-     edm::LogError ("testChannel") << "Error! can't get the product " 
-                                   << m_digiCollection.c_str () ;
-   }
-   
-   // loop over the digis
-   for (EBDigiCollection::const_iterator itdigi = pDigis->begin () ; 
-        itdigi != pDigis->end () ; 
-        ++itdigi) 
-    {    
-       EBDataFrame df( *itdigi );
-       int gainId = df.sample (0).gainId () ;
-       int crystalId = EBDetId(itdigi->id ()).ic () ;
-       int smId = EBDetId(itdigi->id ()).ism () ;
-
-       edm::LogInfo ("testChannel") << "channel " << event.id ()  
-                                    << "\tcry: " << crystalId 
-                                    << "\tG: " << gainId 
-                                    << "\tDAC: " << DACvalues[smId] ;
-
-       // loop over the samples
-       for (int iSample = 0; iSample < EBDataFrame::MAXSAMPLES ; ++iSample) 
-         {
-            edm::LogInfo ("testChannel") << "\t`-->" << df.sample (iSample).adc () ;
-            m_pedVSDAC.Fill (df.sample (iSample).adc (),DACvalues[smId]) ;
-            if (crystalId == m_xtal)
-              { 
-                if (gainId == 1) m_singlePedVSDAC_1.Fill (df.sample (iSample).adc (),DACvalues[smId]) ;
-                if (gainId == 2) m_singlePedVSDAC_2.Fill (df.sample (iSample).adc (),DACvalues[smId]) ;
-                if (gainId == 3) m_singlePedVSDAC_3.Fill (df.sample (iSample).adc (),DACvalues[smId]) ;
-              }
-         } // loop over the samples
-    } // loop over the digis
-
+void testChannel::analyze(edm::Event const &event, edm::EventSetup const &eventSetup) {
+  LogDebug("testChannel") << "entering analyze ...";
+
+  // get the headers
+  // (one header for each supermodule)
+  edm::Handle<EcalRawDataCollection> DCCHeaders;
+  event.getByLabel(m_headerProducer, DCCHeaders);
+  if (!DCCHeaders.isValid()) {
+    edm::LogError("testChannel") << "Error! can't get the product " << m_headerProducer.c_str();
+  }
+
+  std::map<int, int> DACvalues;
+
+  // loop over the headers
+  for (EcalRawDataCollection::const_iterator headerItr = DCCHeaders->begin(); headerItr != DCCHeaders->end();
+       ++headerItr) {
+    EcalDCCHeaderBlock::EcalDCCEventSettings settings = headerItr->getEventSettings();
+    DACvalues[getHeaderSMId(headerItr->id())] = settings.ped_offset;
+    //       std::cout << "DCCid: " << headerItr->id () << "" ;
+    //       std::cout << "Ped offset DAC: " << settings.ped_offset << "" ;
+  }  //! loop over the headers
+
+  // get the digis
+  // (one digi for each crystal)
+  edm::Handle<EBDigiCollection> pDigis;
+  event.getByLabel(m_digiProducer, pDigis);
+  if (!pDigis.isValid()) {
+    edm::LogError("testChannel") << "Error! can't get the product " << m_digiCollection.c_str();
+  }
+
+  // loop over the digis
+  for (EBDigiCollection::const_iterator itdigi = pDigis->begin(); itdigi != pDigis->end(); ++itdigi) {
+    EBDataFrame df(*itdigi);
+    int gainId = df.sample(0).gainId();
+    int crystalId = EBDetId(itdigi->id()).ic();
+    int smId = EBDetId(itdigi->id()).ism();
+
+    edm::LogInfo("testChannel") << "channel " << event.id() << "\tcry: " << crystalId << "\tG: " << gainId
+                                << "\tDAC: " << DACvalues[smId];
+
+    // loop over the samples
+    for (int iSample = 0; iSample < EBDataFrame::MAXSAMPLES; ++iSample) {
+      edm::LogInfo("testChannel") << "\t`-->" << df.sample(iSample).adc();
+      m_pedVSDAC.Fill(df.sample(iSample).adc(), DACvalues[smId]);
+      if (crystalId == m_xtal) {
+        if (gainId == 1)
+          m_singlePedVSDAC_1.Fill(df.sample(iSample).adc(), DACvalues[smId]);
+        if (gainId == 2)
+          m_singlePedVSDAC_2.Fill(df.sample(iSample).adc(), DACvalues[smId]);
+        if (gainId == 3)
+          m_singlePedVSDAC_3.Fill(df.sample(iSample).adc(), DACvalues[smId]);
+      }
+    }  // loop over the samples
+  }    // loop over the digis
 }
 
 //! perform the minimiation and write results
-void testChannel::endJob () 
-{
-  char ccout[80] ;
-  sprintf (ccout,"out_%d.root",m_xtal) ;
-  TFile out (ccout,"RECREATE") ;
-  out.cd () ;
-  m_pedVSDAC.Write () ;
-  m_singlePedVSDAC_1.Write () ;
-  m_singlePedVSDAC_2.Write () ;
-  m_singlePedVSDAC_3.Write () ;
-  TProfile * profilo1 = m_singlePedVSDAC_1.ProfileX () ;
-  TProfile * profilo2 = m_singlePedVSDAC_2.ProfileX () ;
-  TProfile * profilo3 = m_singlePedVSDAC_3.ProfileX () ;
-  profilo1->Write ("singleProfile_1") ;
-  profilo2->Write ("singleProfile_2") ;
-  profilo3->Write ("singleProfile_3") ;
-  out.Close () ;
+void testChannel::endJob() {
+  char ccout[80];
+  sprintf(ccout, "out_%d.root", m_xtal);
+  TFile out(ccout, "RECREATE");
+  out.cd();
+  m_pedVSDAC.Write();
+  m_singlePedVSDAC_1.Write();
+  m_singlePedVSDAC_2.Write();
+  m_singlePedVSDAC_3.Write();
+  TProfile *profilo1 = m_singlePedVSDAC_1.ProfileX();
+  TProfile *profilo2 = m_singlePedVSDAC_2.ProfileX();
+  TProfile *profilo3 = m_singlePedVSDAC_3.ProfileX();
+  profilo1->Write("singleProfile_1");
+  profilo2->Write("singleProfile_2");
+  profilo3->Write("singleProfile_3");
+  out.Close();
 }
 
 /*
-void testChannel::writeDb (EcalCondDBInterface* econn, 
-                           MonRunIOV* moniov) 
+void testChannel::writeDb (EcalCondDBInterface* econn,
+                           MonRunIOV* moniov)
 {}
 */
 
-int testChannel::getHeaderSMId (const int headerId) 
-{
-  //PG FIXME temporary solution
-  //PG FIXME check it is consistent with the TB!
-  return 1 ;
+int testChannel::getHeaderSMId(const int headerId) {
+  // PG FIXME temporary solution
+  // PG FIXME check it is consistent with the TB!
+  return 1;
 }
 
+void testChannel::subscribe() {}
 
+void testChannel::subscribeNew() {}
 
-
-void testChannel::subscribe ()
-{}
-
-void testChannel::subscribeNew ()
-{}
-
-void testChannel::unsubscribe ()
-{}
-
-
+void testChannel::unsubscribe() {}
diff --git a/CalibCalorimetry/EcalSRTools/interface/EcalDccWeightBuilder.h b/CalibCalorimetry/EcalSRTools/interface/EcalDccWeightBuilder.h
index 239cc31689f4c..d5078129be939 100644
--- a/CalibCalorimetry/EcalSRTools/interface/EcalDccWeightBuilder.h
+++ b/CalibCalorimetry/EcalSRTools/interface/EcalDccWeightBuilder.h
@@ -4,7 +4,6 @@
 #ifndef ECALDCCWEIGHTBUILDER_CC
 #define ECALDCCWEIGHTBUILDER_CC
 
-
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EBShape.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EEShape.h"
@@ -24,24 +23,23 @@ class EcalElectronicsMapping;
 
 /**
  */
-class EcalDccWeightBuilder: public edm::EDAnalyzer {
+class EcalDccWeightBuilder : public edm::EDAnalyzer {
 private:
-  enum mode_t { WEIGHTS_FROM_CONFIG, COMPUTE_WEIGHTS};
-  
+  enum mode_t { WEIGHTS_FROM_CONFIG, COMPUTE_WEIGHTS };
+
   //constructor(s) and destructor(s)
 public:
   /** Constructs an EcalDccWeightBuilder
    * @param ps CMSSW mondule configuration
    */
   EcalDccWeightBuilder(edm::ParameterSet const& ps);
-  
+
   /**Destructor
    */
   ~EcalDccWeightBuilder() override{};
 
   //method(s)
 public:
-
   /** Analyze method called by the event loop.
    * @param event CMSSW event
    * @param es event setup
@@ -49,7 +47,6 @@ class EcalDccWeightBuilder: public edm::EDAnalyzer {
   void analyze(const edm::Event& event, const edm::EventSetup& es) override;
 
 private:
-
   /** Weight computation
    * @param shape signal shape to use for weight computation
    * @param binOfMax time bin which shall contain the pulse peak
@@ -63,34 +60,34 @@ class EcalDccWeightBuilder: public edm::EDAnalyzer {
    * @param result [out] vector filled with computed weights. The vector is
    * resized to the number of weights
    */
-  void
-  computeWeights(const EcalShapeBase& shape,
-		 int binOfMax, double timePhase, 
-		 int iFirst0, int nWeights, int iSkip0,
-                 std::vector<double>& result);
+  void computeWeights(const EcalShapeBase& shape,
+                      int binOfMax,
+                      double timePhase,
+                      int iFirst0,
+                      int nWeights,
+                      int iSkip0,
+                      std::vector<double>& result);
 
   void computeAllWeights(bool withIntercalib, const edm::EventSetup& es);
-  
+
   int encodeWeight(double w);
 
   double decodeWeight(int W);
 
-  void unbiasWeights(std::vector<double>& weights,
-                     std::vector<int32_t>* encodedWeigths);
+  void unbiasWeights(std::vector<double>& weights, std::vector<int32_t>* encodedWeigths);
 
   /** Retrieve intercalibration coefficent for channel detId.
    * @param detId ID of the channel the intercalibration coef. must be
    * retrieved for.
    */
   double intercalib(const DetId& detId);
-  
+
   void writeWeightToAsciiFile();
-  void writeWeightToRootFile();   
+  void writeWeightToRootFile();
   void writeWeightToDB();
 
   //converts DetId to IDs used by DB:
-  void dbId(const DetId& detId, int& fedId, int& smId, int& ruId,
-           int& xtalId) const;
+  void dbId(const DetId& detId, int& fedId, int& smId, int& ruId, int& xtalId) const;
 
   /** Vector index sorting.
    * @param vector of values
@@ -98,12 +95,9 @@ class EcalDccWeightBuilder: public edm::EDAnalyzer {
    * @param decreasingOrder switch to use decreasing order instead of
    * default increasing order
    */
-  template<class T>
-  void sort(const std::vector<T>& a,
-	    std::vector<int>& s,
-	    bool decreasingOrder = false);
+  template <class T>
+  void sort(const std::vector<T>& a, std::vector<int>& s, bool decreasingOrder = false);
 
-  
   //attribute(s)
 protected:
 private:
@@ -127,9 +121,9 @@ class EcalDccWeightBuilder: public edm::EDAnalyzer {
   std::string dbTag_;
   int dbVersion_;
   bool sqlMode_;
-  
+
   edm::ESHandle<CaloGeometry> geom_;
-  
+
   EcalIntercalibConstantMap& calibMap_;
   EcalIntercalibConstantMap emptyCalibMap_;
   std::map<DetId, std::vector<int> > encodedWeights_;
@@ -139,7 +133,7 @@ class EcalDccWeightBuilder: public edm::EDAnalyzer {
 
   static const int ecalDccFedIdMin = 601;
   static const int ecalDccFedIdMax = 654;
-  static const int nDccs = ecalDccFedIdMax-ecalDccFedIdMin+1;
+  static const int nDccs = ecalDccFedIdMax - ecalDccFedIdMin + 1;
 };
 
-#endif //ECALDCCWEIGHTBUILDER_CC not defined
+#endif  //ECALDCCWEIGHTBUILDER_CC not defined
diff --git a/CalibCalorimetry/EcalSRTools/src/EcalDccWeightBuilder.cc b/CalibCalorimetry/EcalSRTools/src/EcalDccWeightBuilder.cc
index 27d231133a863..c27a662b64eb2 100644
--- a/CalibCalorimetry/EcalSRTools/src/EcalDccWeightBuilder.cc
+++ b/CalibCalorimetry/EcalSRTools/src/EcalDccWeightBuilder.cc
@@ -28,9 +28,9 @@
 #include "DataFormats/EcalDetId/interface/EEDetId.h"
 
 #ifdef DB_WRITE_SUPPORT
-#  include "OnlineDB/EcalCondDB/interface/EcalCondDBInterface.h"
-#  include "OnlineDB/EcalCondDB/interface/ODWeightsDat.h"
-#endif //DB_WRITE_SUPPORT defined
+#include "OnlineDB/EcalCondDB/interface/EcalCondDBInterface.h"
+#include "OnlineDB/EcalCondDB/interface/ODWeightsDat.h"
+#endif  //DB_WRITE_SUPPORT defined
 
 #include "CalibCalorimetry/EcalSRTools/src/PasswordReader.h"
 
@@ -39,59 +39,51 @@ using namespace edm;
 
 const double EcalDccWeightBuilder::weightScale_ = 1024.;
 
-
 //TODO: handling case of weight encoding saturation: weights shall be downscaled to prevent saturation
 
-EcalDccWeightBuilder::EcalDccWeightBuilder(edm::ParameterSet const& ps):
-  dcc1stSample_(ps.getParameter<int>("dcc1stSample")),
-  sampleToSkip_(ps.getParameter<int>("sampleToSkip")),
-  nDccWeights_(ps.getParameter<int>("nDccWeights")),
-  inputWeights_(ps.getParameter<vector<double> >("inputWeights")),
-  mode_(ps.getParameter<string>("mode")),
-  dccWeightsWithIntercalib_(ps.getParameter<bool>("dccWeightsWithIntercalib")),
-  writeToDB_(ps.getParameter<bool>("writeToDB")),
-  writeToAsciiFile_(ps.getParameter<bool>("writeToAsciiFile")),
-  writeToRootFile_(ps.getParameter<bool>("writeToRootFile")),
-  asciiOutputFileName_(ps.getParameter<string>("asciiOutputFileName")),
-  rootOutputFileName_(ps.getParameter<string>("rootOutputFileName")),
-  dbSid_(ps.getParameter<string>("dbSid")),
-  dbUser_(ps.getParameter<string>("dbUser")),
-  dbPassword_(ps.getUntrackedParameter<string>("dbPassword","")),
-  dbTag_(ps.getParameter<string>("dbTag")),
-  dbVersion_(ps.getParameter<int>("dbVersion")),
-  sqlMode_(ps.getParameter<bool>("sqlMode")),
-  calibMap_(emptyCalibMap_)
-{
-  if(mode_=="weightsFromConfig"){
+EcalDccWeightBuilder::EcalDccWeightBuilder(edm::ParameterSet const& ps)
+    : dcc1stSample_(ps.getParameter<int>("dcc1stSample")),
+      sampleToSkip_(ps.getParameter<int>("sampleToSkip")),
+      nDccWeights_(ps.getParameter<int>("nDccWeights")),
+      inputWeights_(ps.getParameter<vector<double> >("inputWeights")),
+      mode_(ps.getParameter<string>("mode")),
+      dccWeightsWithIntercalib_(ps.getParameter<bool>("dccWeightsWithIntercalib")),
+      writeToDB_(ps.getParameter<bool>("writeToDB")),
+      writeToAsciiFile_(ps.getParameter<bool>("writeToAsciiFile")),
+      writeToRootFile_(ps.getParameter<bool>("writeToRootFile")),
+      asciiOutputFileName_(ps.getParameter<string>("asciiOutputFileName")),
+      rootOutputFileName_(ps.getParameter<string>("rootOutputFileName")),
+      dbSid_(ps.getParameter<string>("dbSid")),
+      dbUser_(ps.getParameter<string>("dbUser")),
+      dbPassword_(ps.getUntrackedParameter<string>("dbPassword", "")),
+      dbTag_(ps.getParameter<string>("dbTag")),
+      dbVersion_(ps.getParameter<int>("dbVersion")),
+      sqlMode_(ps.getParameter<bool>("sqlMode")),
+      calibMap_(emptyCalibMap_) {
+  if (mode_ == "weightsFromConfig") {
     imode_ = WEIGHTS_FROM_CONFIG;
-    if(inputWeights_.size()!=(unsigned)nDccWeights_){
-      throw cms::Exception("Config")
-        << "Inconsistent configuration. 'nDccWeights' parameters indicated "
-        << nDccWeights_ << " weights while parameter 'inputWeights_' contains "
-        << inputWeights_.size() << " weight values!\n";
+    if (inputWeights_.size() != (unsigned)nDccWeights_) {
+      throw cms::Exception("Config") << "Inconsistent configuration. 'nDccWeights' parameters indicated "
+                                     << nDccWeights_ << " weights while parameter 'inputWeights_' contains "
+                                     << inputWeights_.size() << " weight values!\n";
     }
-  } else if(mode_=="computeWeights"){
+  } else if (mode_ == "computeWeights") {
     imode_ = COMPUTE_WEIGHTS;
-  } else{
-    throw cms::Exception("Config")
-      << "Invalid value ('" << mode_ << "') for parameter mode. "
-      << "Valid values are: 'weightsFromConfig' and 'computeWeights'\n";
+  } else {
+    throw cms::Exception("Config") << "Invalid value ('" << mode_ << "') for parameter mode. "
+                                   << "Valid values are: 'weightsFromConfig' and 'computeWeights'\n";
   }
 }
 
-
-void
-EcalDccWeightBuilder::analyze(const edm::Event& event,
-                              const edm::EventSetup& es){
-
+void EcalDccWeightBuilder::analyze(const edm::Event& event, const edm::EventSetup& es) {
   edm::ESHandle<EcalElectronicsMapping> handle;
   es.get<EcalMappingRcd>().get(handle);
   ecalElectronicsMap_ = handle.product();
-  
+
   // Retrieval of intercalib constants
-  if(dccWeightsWithIntercalib_){
-    ESHandle<EcalIntercalibConstants> hIntercalib ;
-    es.get<EcalIntercalibConstantsRcd>().get(hIntercalib) ;
+  if (dccWeightsWithIntercalib_) {
+    ESHandle<EcalIntercalibConstants> hIntercalib;
+    es.get<EcalIntercalibConstantsRcd>().get(hIntercalib);
     const EcalIntercalibConstants* intercalib = hIntercalib.product();
     calibMap_ = intercalib->getMap();
   }
@@ -99,55 +91,51 @@ EcalDccWeightBuilder::analyze(const edm::Event& event,
   //gets geometry
   es.get<CaloGeometryRecord>().get(geom_);
 
-  
   //computes the weights:
   computeAllWeights(dccWeightsWithIntercalib_, es);
 
   //Writing out weights.
-  if(writeToAsciiFile_) writeWeightToAsciiFile();
-  if(writeToRootFile_)  writeWeightToRootFile();
-  if(writeToDB_)        writeWeightToDB();
+  if (writeToAsciiFile_)
+    writeWeightToAsciiFile();
+  if (writeToRootFile_)
+    writeWeightToRootFile();
+  if (writeToDB_)
+    writeWeightToDB();
 }
 
-void EcalDccWeightBuilder::computeAllWeights(bool withIntercalib, const edm::EventSetup& es){
+void EcalDccWeightBuilder::computeAllWeights(bool withIntercalib, const edm::EventSetup& es) {
   const int nw = nDccWeights_;
-  int iSkip0_ = sampleToSkip_>=0?(sampleToSkip_-dcc1stSample_):-1;
+  int iSkip0_ = sampleToSkip_ >= 0 ? (sampleToSkip_ - dcc1stSample_) : -1;
 
   EcalSimParameterMap parameterMap;
-  const vector<DetId>& ebDetIds
-    = geom_->getValidDetIds(DetId::Ecal, EcalBarrel);
+  const vector<DetId>& ebDetIds = geom_->getValidDetIds(DetId::Ecal, EcalBarrel);
 
   //   cout << __FILE__ << ":" << __LINE__ << ": "
   //        <<  "Number of EB det IDs: " << ebDetIds.size() << "\n";
-  
-  const vector<DetId>& eeDetIds
-    = geom_->getValidDetIds(DetId::Ecal, EcalEndcap);
+
+  const vector<DetId>& eeDetIds = geom_->getValidDetIds(DetId::Ecal, EcalEndcap);
 
   //  cout << __FILE__ << ":" << __LINE__ << ": "
   //        <<  "Number of EE det IDs: " << eeDetIds.size() << "\n";
-  
-  
-  vector<DetId> detIds(ebDetIds.size()+eeDetIds.size());
+
+  vector<DetId> detIds(ebDetIds.size() + eeDetIds.size());
   copy(ebDetIds.begin(), ebDetIds.end(), detIds.begin());
-  copy(eeDetIds.begin(), eeDetIds.end(), detIds.begin()+ebDetIds.size());
-  
-  vector<double> baseWeights(nw); //weight obtained from signal shape
-  vector<double> w(nw); //weight*intercalib
-  vector<int> W(nw);    //weight in hw encoding (integrer)
-  double prevPhase = numeric_limits<double>::min();
+  copy(eeDetIds.begin(), eeDetIds.end(), detIds.begin() + ebDetIds.size());
 
+  vector<double> baseWeights(nw);  //weight obtained from signal shape
+  vector<double> w(nw);            //weight*intercalib
+  vector<int> W(nw);               //weight in hw encoding (integrer)
+  double prevPhase = numeric_limits<double>::min();
 
-  if(imode_==WEIGHTS_FROM_CONFIG){
-    assert(inputWeights_.size()==baseWeights.size());
+  if (imode_ == WEIGHTS_FROM_CONFIG) {
+    assert(inputWeights_.size() == baseWeights.size());
     copy(inputWeights_.begin(), inputWeights_.end(), baseWeights.begin());
   }
-  
-  for(vector<DetId>::const_iterator it = detIds.begin();
-      it != detIds.end(); ++it){
-    
+
+  for (vector<DetId>::const_iterator it = detIds.begin(); it != detIds.end(); ++it) {
     double phase = parameterMap.simParameters(*it).timePhase();
     int binOfMax = parameterMap.simParameters(*it).binOfMaximum();
-    
+
 #if 0
     //for debugging...
     cout << __FILE__ << ":" << __LINE__ << ": ";
@@ -167,132 +155,123 @@ void EcalDccWeightBuilder::computeAllWeights(bool withIntercalib, const edm::Eve
     cout << " -> phase: "  << phase << "\n";
     cout << " -> binOfMax: " << binOfMax << "\n";
 #endif
-    
-    try{
+
+    try {
       bool useDBShape = true;
-      EBShape ebShape(useDBShape);  
-      EEShape eeShape(useDBShape); 
-      EcalShapeBase* pShape;      
-
-      if(it->subdetId()==EcalBarrel){
-	pShape = &ebShape;
-      } else if(it->subdetId()==EcalEndcap){
-	pShape = &eeShape;
-      } else{
-	throw cms::Exception("EcalDccWeightBuilder")
-	  << "Bug found in " << __FILE__ << ":" << __LINE__ << ": "
-	  << "Got a detId which is neither tagged as ECAL Barrel "
-	  << "not ECAL endcap while looping on ECAL cell detIds\n";
+      EBShape ebShape(useDBShape);
+      EEShape eeShape(useDBShape);
+      EcalShapeBase* pShape;
+
+      if (it->subdetId() == EcalBarrel) {
+        pShape = &ebShape;
+      } else if (it->subdetId() == EcalEndcap) {
+        pShape = &eeShape;
+      } else {
+        throw cms::Exception("EcalDccWeightBuilder") << "Bug found in " << __FILE__ << ":" << __LINE__ << ": "
+                                                     << "Got a detId which is neither tagged as ECAL Barrel "
+                                                     << "not ECAL endcap while looping on ECAL cell detIds\n";
       }
-      
-      if(phase!=prevPhase){
-        if(imode_==COMPUTE_WEIGHTS){
-	  if(it->subdetId()==EcalBarrel){
-	    computeWeights(*pShape, binOfMax, phase, 
-			   dcc1stSample_-1, nDccWeights_, iSkip0_,
-			   baseWeights);
-	  } 
-	  prevPhase = phase;
-	}
+
+      if (phase != prevPhase) {
+        if (imode_ == COMPUTE_WEIGHTS) {
+          if (it->subdetId() == EcalBarrel) {
+            computeWeights(*pShape, binOfMax, phase, dcc1stSample_ - 1, nDccWeights_, iSkip0_, baseWeights);
+          }
+          prevPhase = phase;
+        }
       }
-      for(int i = 0; i < nw; ++i){
-	w[i] = baseWeights[i];
-	if(withIntercalib) w[i]*= intercalib(*it);
+      for (int i = 0; i < nw; ++i) {
+        w[i] = baseWeights[i];
+        if (withIntercalib)
+          w[i] *= intercalib(*it);
       }
       unbiasWeights(w, &W);
       encodedWeights_[*it] = W;
-    } catch(std::exception& e){
+    } catch (std::exception& e) {
       cout << __FILE__ << ":" << __LINE__ << ": ";
-      if(it->subdetId()==EcalBarrel){
-	cout << "ieta = " << setw(4) << ((EBDetId)(*it)).ieta()
-	     << " iphi = " << setw(4) << ((EBDetId)(*it)).iphi() << " ";
-      } else if(it->subdetId()==EcalEndcap){
-	cout << "ix = " << setw(3) << ((EEDetId)(*it)).ix()
-	     << " iy = " << setw(3) << ((EEDetId)(*it)).iy()
-	     << " iz = " << setw(1) << ((EEDetId)(*it)).iy() << " ";
-      } else{
-	cout << "DetId " << (uint32_t) (*it);
+      if (it->subdetId() == EcalBarrel) {
+        cout << "ieta = " << setw(4) << ((EBDetId)(*it)).ieta() << " iphi = " << setw(4) << ((EBDetId)(*it)).iphi()
+             << " ";
+      } else if (it->subdetId() == EcalEndcap) {
+        cout << "ix = " << setw(3) << ((EEDetId)(*it)).ix() << " iy = " << setw(3) << ((EEDetId)(*it)).iy()
+             << " iz = " << setw(1) << ((EEDetId)(*it)).iy() << " ";
+      } else {
+        cout << "DetId " << (uint32_t)(*it);
       }
-      cout <<  "phase: "  << phase << "\n";
+      cout << "phase: " << phase << "\n";
       throw;
     }
   }
 }
 
-void
-EcalDccWeightBuilder::computeWeights(const EcalShapeBase& shape,
-				     int binOfMax,
-				     double timePhase,
-				     int iFirst,
-				     int nWeights, int iSkip,
-				     vector<double>& result){
+void EcalDccWeightBuilder::computeWeights(const EcalShapeBase& shape,
+                                          int binOfMax,
+                                          double timePhase,
+                                          int iFirst,
+                                          int nWeights,
+                                          int iSkip,
+                                          vector<double>& result) {
   double sum2 = 0.;
   double sum = 0;
   result.resize(nWeights);
 
   int nActualWeights = 0;
 
-  const double tzero = -(binOfMax-1)*25+timePhase + shape.timeToRise();//ns
+  const double tzero = -(binOfMax - 1) * 25 + timePhase + shape.timeToRise();  //ns
 
-  for(int i=0; i<nWeights; ++i){
-    double t_ns = tzero+(iFirst+i)*25;
+  for (int i = 0; i < nWeights; ++i) {
+    double t_ns = tzero + (iFirst + i) * 25;
     double s = shape(t_ns);
-    if(i==iSkip){
+    if (i == iSkip) {
       continue;
     }
     result[i] = s;
     sum += s;
-    sum2 += s*s;
+    sum2 += s * s;
     ++nActualWeights;
   }
-  for(int i=0; i<nWeights; ++i){
-    if(i==iSkip){
+  for (int i = 0; i < nWeights; ++i) {
+    if (i == iSkip) {
       result[i] = 0;
-    } else{
-      result[i] = (result[i]-sum/nActualWeights)/(sum2-sum*sum/nActualWeights);
+    } else {
+      result[i] = (result[i] - sum / nActualWeights) / (sum2 - sum * sum / nActualWeights);
     }
   }
 }
 
-int EcalDccWeightBuilder::encodeWeight(double w){
-  return lround(w * weightScale_);
-}
-
-double EcalDccWeightBuilder::decodeWeight(int W){
-  return ((double) W) / weightScale_;
-}
+int EcalDccWeightBuilder::encodeWeight(double w) { return lround(w * weightScale_); }
 
+double EcalDccWeightBuilder::decodeWeight(int W) { return ((double)W) / weightScale_; }
 
-template<class T>
-void EcalDccWeightBuilder::sort(const std::vector<T>& a,
-				std::vector<int>& s,
-				bool decreasingOrder){
+template <class T>
+void EcalDccWeightBuilder::sort(const std::vector<T>& a, std::vector<int>& s, bool decreasingOrder) {
   //   cout << __FILE__ << ":" << __LINE__ << ": "
   //        << "sort input array:" ;
   //   for(unsigned i=0; i<a.size(); ++i){
   //     cout << "\t" << a[i];
   //   }
   //   cout << "\n";
-  
+
   //performs a bubble sort: adjacent elements are successively swapped 2 by 2
   //until the list is finally sorted.
   bool changed = false;
   s.resize(a.size());
-  for(unsigned i=0; i<a.size(); ++i) s[i] = i;
-  if(a.empty()) return;
+  for (unsigned i = 0; i < a.size(); ++i)
+    s[i] = i;
+  if (a.empty())
+    return;
   do {
     changed = false;
-    for(unsigned i = 0; i < a.size()-1; ++i){
+    for (unsigned i = 0; i < a.size() - 1; ++i) {
       const int j = s[i];
-      const int nextj = s[i+1];
-      if((decreasingOrder && (a[j] < a[nextj]))
-	 || (!decreasingOrder && (a[j] > a[nextj]))){
-	std::swap(s[i], s[i+1]);
-	changed = true;
+      const int nextj = s[i + 1];
+      if ((decreasingOrder && (a[j] < a[nextj])) || (!decreasingOrder && (a[j] > a[nextj]))) {
+        std::swap(s[i], s[i + 1]);
+        changed = true;
       }
     }
-  } while(changed);
-  
+  } while (changed);
+
   //   cout << __FILE__ << ":" << __LINE__ << ": "
   //        << "sorted list of indices:" ;
   //   for(unsigned i=0; i < s.size(); ++i){
@@ -300,29 +279,28 @@ void EcalDccWeightBuilder::sort(const std::vector<T>& a,
   //   }
   //   cout << "\n";
 }
-  
-void EcalDccWeightBuilder::unbiasWeights(std::vector<double>& weights,
-					 std::vector<int>* encodedWeights){
+
+void EcalDccWeightBuilder::unbiasWeights(std::vector<double>& weights, std::vector<int>* encodedWeights) {
   const unsigned nw = weights.size();
-  
+
   //computes integer weights, weights residuals and weight sum residual:
-  vector<double> dw(nw); //weight residuals due to interger encoding
-  vector<int> W(nw); //integer weights
+  vector<double> dw(nw);  //weight residuals due to interger encoding
+  vector<int> W(nw);      //integer weights
   int wsum = 0;
-  for(unsigned i = 0; i < nw; ++i){
+  for (unsigned i = 0; i < nw; ++i) {
     W[i] = encodeWeight(weights[i]);
     dw[i] = decodeWeight(W[i]) - weights[i];
     wsum += W[i];
   }
 
-//   cout << __FILE__ << ":" << __LINE__ << ": "
-//        <<  "weights before bias correction: ";
-//   for(unsigned i=0; i<weights.size(); ++i){
-//     const double w = weights[i];
-//     cout << "\t" << encodeWeight(w) << "(" << w << ", dw = " << dw[i] << ")";
-//   }
-//   cout << "\t sum: " << wsum << "\n";
-  
+  //   cout << __FILE__ << ":" << __LINE__ << ": "
+  //        <<  "weights before bias correction: ";
+  //   for(unsigned i=0; i<weights.size(); ++i){
+  //     const double w = weights[i];
+  //     cout << "\t" << encodeWeight(w) << "(" << w << ", dw = " << dw[i] << ")";
+  //   }
+  //   cout << "\t sum: " << wsum << "\n";
+
   //sorts weight residuals in decreasing order:
   vector<int> iw(nw);
   sort(dw, iw, true);
@@ -333,50 +311,52 @@ void EcalDccWeightBuilder::unbiasWeights(std::vector<double>& weights,
   // is positive (wsum<0)
   // 2) the weight with the maximal signed residual if the correction
   // is negative (wsum>0)
-  int wsumSign = wsum>0?1:-1;
-  int i = wsum>0?0:(nw-1);
-  while(wsum!=0){
+  int wsumSign = wsum > 0 ? 1 : -1;
+  int i = wsum > 0 ? 0 : (nw - 1);
+  while (wsum != 0) {
     W[iw[i]] -= wsumSign;
     wsum -= wsumSign;
     i += wsumSign;
-    if(i<0 || i>=(int)nw){ //recompute the residuals if a second iteration is
-      // needed (in principle, it is not expected with usual input weights), : 
-      for(unsigned i = 0; i < nw; ++i){
-	dw[i] = decodeWeight(W[i]) - weights[i];
-	sort(dw, iw, true);
+    if (i < 0 || i >= (int)nw) {  //recompute the residuals if a second iteration is
+      // needed (in principle, it is not expected with usual input weights), :
+      for (unsigned i = 0; i < nw; ++i) {
+        dw[i] = decodeWeight(W[i]) - weights[i];
+        sort(dw, iw, true);
       }
     }
-    if(i<0) i = nw-1;
-    if(i>=(int)nw) i = 0;
+    if (i < 0)
+      i = nw - 1;
+    if (i >= (int)nw)
+      i = 0;
   }
 
-//   cout << __FILE__ << ":" << __LINE__ << ": "
-//        <<  "weights after bias correction: ";
-//   for(unsigned i=0; i<weights.size(); ++i){
-//     cout << "\t" << W[i] << "(" << decodeWeight(W[i]) << ", dw = "
-// 	 << (decodeWeight(W[i])-weights[i]) << ")";
-//   }
-//   cout << "\n";
-  
+  //   cout << __FILE__ << ":" << __LINE__ << ": "
+  //        <<  "weights after bias correction: ";
+  //   for(unsigned i=0; i<weights.size(); ++i){
+  //     cout << "\t" << W[i] << "(" << decodeWeight(W[i]) << ", dw = "
+  // 	 << (decodeWeight(W[i])-weights[i]) << ")";
+  //   }
+  //   cout << "\n";
+
   //copy result
-  if(encodedWeights!=nullptr) encodedWeights->resize(nw);
-  for(unsigned i = 0; i < nw; ++i){
+  if (encodedWeights != nullptr)
+    encodedWeights->resize(nw);
+  for (unsigned i = 0; i < nw; ++i) {
     weights[i] = decodeWeight(W[i]);
-    if(encodedWeights) (*encodedWeights)[i] = W[i];
+    if (encodedWeights)
+      (*encodedWeights)[i] = W[i];
   }
 }
 
-double EcalDccWeightBuilder::intercalib(const DetId& detId){
+double EcalDccWeightBuilder::intercalib(const DetId& detId) {
   // get current intercalibration coeff
   double coef;
-  EcalIntercalibConstantMap::const_iterator itCalib
-    = calibMap_.find(detId.rawId());
-  if(itCalib != calibMap_.end()){
+  EcalIntercalibConstantMap::const_iterator itCalib = calibMap_.find(detId.rawId());
+  if (itCalib != calibMap_.end()) {
     coef = (*itCalib);
-  } else{
+  } else {
     coef = 1.;
-    std::cout << (uint32_t) detId
-	      << " not found in EcalIntercalibConstantMap"<<std::endl ;
+    std::cout << (uint32_t)detId << " not found in EcalIntercalibConstantMap" << std::endl;
   }
 #if 0
   cout << __FILE__ << ":" << __LINE__ << ": ";
@@ -393,104 +373,98 @@ double EcalDccWeightBuilder::intercalib(const DetId& detId){
   return coef;
 }
 
-void EcalDccWeightBuilder::writeWeightToAsciiFile(){
-  string fName = !asciiOutputFileName_.empty()?
-    asciiOutputFileName_.c_str()
-    :"dccWeights.txt";
+void EcalDccWeightBuilder::writeWeightToAsciiFile() {
+  string fName = !asciiOutputFileName_.empty() ? asciiOutputFileName_.c_str() : "dccWeights.txt";
   ofstream file(fName.c_str());
-  if(!file.good()){
-    throw cms::Exception("Output")
-      << "Failed to open file '"
-      << fName
-      << "'for writing DCC weights\n";
+  if (!file.good()) {
+    throw cms::Exception("Output") << "Failed to open file '" << fName << "'for writing DCC weights\n";
   }
 
-  const char* comment = sqlMode_?"-- ":"# ";
-  
+  const char* comment = sqlMode_ ? "-- " : "# ";
+
   file << comment << "List of weights for amplitude estimation to be used in DCC for\n"
        << comment << "zero suppresssion.\n\n";
-  if(!sqlMode_){
+  if (!sqlMode_) {
     file << comment << "Note: RU: trigger tower in EB, supercrystal in EE\n"
-	 << comment << "      xtl: crystal electronic channel id in RU, from 1 to 25\n\n"
-	 << comment << " DetId    SM  FED RU xtl weights[0..5]...\n";
+         << comment << "      xtl: crystal electronic channel id in RU, from 1 to 25\n\n"
+         << comment << " DetId    SM  FED RU xtl weights[0..5]...\n";
   }
-  
-  if(sqlMode_){
+
+  if (sqlMode_) {
     file << "variable recid number;\n"
-      "exec select COND2CONF_INFO_SQ.NextVal into :recid from DUAL;\n"
-      "insert into weights_info (rec_id,tag,version) values (:recid,'"
-	 << dbTag_ << "'," << dbVersion_ << ");\n";
-    file << "\n" << comment
-	 << "index of first sample used in the weighting sum\n"
-      "begin\n"
-      "  for fedid in " << ecalDccFedIdMin << ".." << ecalDccFedIdMax
-	 << " loop\n"
-      "    insert into dcc_weightsample_dat (rec_id, logic_id, sample_id, \n"
-      "    weight_number)\n"
-      "    values(:recid,fedid," << dcc1stSample_ << ",1);\n"
-      "  end loop;\n"
-      "end;\n"
-      "/\n";
-  } else{
+            "exec select COND2CONF_INFO_SQ.NextVal into :recid from DUAL;\n"
+            "insert into weights_info (rec_id,tag,version) values (:recid,'"
+         << dbTag_ << "'," << dbVersion_ << ");\n";
+    file << "\n"
+         << comment
+         << "index of first sample used in the weighting sum\n"
+            "begin\n"
+            "  for fedid in "
+         << ecalDccFedIdMin << ".." << ecalDccFedIdMax
+         << " loop\n"
+            "    insert into dcc_weightsample_dat (rec_id, logic_id, sample_id, \n"
+            "    weight_number)\n"
+            "    values(:recid,fedid,"
+         << dcc1stSample_
+         << ",1);\n"
+            "  end loop;\n"
+            "end;\n"
+            "/\n";
+  } else {
     file << "1st DCC sample: " << dcc1stSample_ << "\n";
   }
 
   file << "\n" << comment << "list of weights per crystal channel\n";
-  
-  for(map<DetId, std::vector<int32_t> >::const_iterator it
-	= encodedWeights_.begin();
-      it !=  encodedWeights_.end();
-      ++it){
+
+  for (map<DetId, std::vector<int32_t> >::const_iterator it = encodedWeights_.begin(); it != encodedWeights_.end();
+       ++it) {
     const DetId& detId = it->first;
-    
+
     int fedId;
     int smId;
     int ruId;
     int xtalId;
-    
+
     //detId ->  fedId, smId, ruId, xtalId
     dbId(detId, fedId, smId, ruId, xtalId);
 
-    char delim = sqlMode_?',':' ';
+    char delim = sqlMode_ ? ',' : ' ';
+
+    if (sqlMode_)
+      file << "-- detId " << detId.rawId() << "\n"
+           << "insert into dcc_weights_dat(rec_id,sm_id,fed_id,"
+              "tt_id, cry_id,\n"
+              "weight_0,weight_1,weight_2,weight_3,weight_4,weight_5) \n"
+              "values ("
+              ":recid";
 
-    if(sqlMode_) file << "-- detId " << detId.rawId() << "\n"
-		      << "insert into dcc_weights_dat(rec_id,sm_id,fed_id,"
-		   "tt_id, cry_id,\n"
-		   "weight_0,weight_1,weight_2,weight_3,weight_4,weight_5) \n"
-		   "values ("
-		   ":recid";
-    
     const vector<int>& weights = it->second;
-    if(!sqlMode_) file << setw(10) << detId.rawId();
+    if (!sqlMode_)
+      file << setw(10) << detId.rawId();
     file << delim << setw(2) << smId;
     file << delim << setw(3) << fedId;
     file << delim << setw(2) << ruId;
     file << delim << setw(2) << xtalId;
-      
-    for(unsigned i=0; i<weights.size(); ++i){
+
+    for (unsigned i = 0; i < weights.size(); ++i) {
       file << delim << setw(5) << weights[i];
     }
-    if(sqlMode_) file << ");";
+    if (sqlMode_)
+      file << ");";
     file << "\n";
   }
-  if(!file.good()){
-    throw cms::Exception("Output") << "Error while writing DCC weights to '"
-				   << fName << "' file.";
+  if (!file.good()) {
+    throw cms::Exception("Output") << "Error while writing DCC weights to '" << fName << "' file.";
   }
 }
-void EcalDccWeightBuilder::writeWeightToRootFile(){
-  string fName = !rootOutputFileName_.empty()?
-    rootOutputFileName_.c_str()
-    :"dccWeights.root";
+void EcalDccWeightBuilder::writeWeightToRootFile() {
+  string fName = !rootOutputFileName_.empty() ? rootOutputFileName_.c_str() : "dccWeights.root";
   TFile file(fName.c_str(), "RECREATE");
-  if(file.IsZombie()){
-    throw cms::Exception("Output")
-      << "Failed to open file '"
-      << fName
-      << "'for writing DCC weights\n";
+  if (file.IsZombie()) {
+    throw cms::Exception("Output") << "Failed to open file '" << fName << "'for writing DCC weights\n";
   }
   TTree t("dccWeights", "Weights for DCC ZS filter");
-  const int nWeightMax = 20; //normally n_weights = 6. A different might be used
+  const int nWeightMax = 20;  //normally n_weights = 6. A different might be used
   //                           used for test purposes.
   struct {
     Int_t detId;
@@ -501,30 +475,26 @@ void EcalDccWeightBuilder::writeWeightToRootFile(){
     Int_t n_weights;
     Int_t weights[nWeightMax];
   } buf;
-  t.Branch("weights", &buf,
-	   "rawDetId/I:"
-	   "feId/I:"
-	   "smSlotId/I:"
-	   "ruId/I:"
-	   "xtalInRuId/I:"
-	   "n_weights/I:"
-	   "weights[n_weights]/I");
-  for(map<DetId, std::vector<int32_t> >::const_iterator it
-	= encodedWeights_.begin();
-      it !=  encodedWeights_.end();
-      ++it){
+  t.Branch("weights",
+           &buf,
+           "rawDetId/I:"
+           "feId/I:"
+           "smSlotId/I:"
+           "ruId/I:"
+           "xtalInRuId/I:"
+           "n_weights/I:"
+           "weights[n_weights]/I");
+  for (map<DetId, std::vector<int32_t> >::const_iterator it = encodedWeights_.begin(); it != encodedWeights_.end();
+       ++it) {
     buf.detId = it->first.rawId();
     buf.n_weights = it->second.size();
 
     //detId ->  fedId, smId, ruId, xtalId
     dbId(buf.detId, buf.fedId, buf.smId, buf.ruId, buf.xtalId);
 
-    if(buf.n_weights>nWeightMax){
-      throw cms::Exception("EcalDccWeight")
-	<< "Number of weights (" << buf.n_weights
-	<< ") for DetId " << buf.detId
-	<< " exceeded maximum limit (" << nWeightMax
-	<< ") of root output format. ";
+    if (buf.n_weights > nWeightMax) {
+      throw cms::Exception("EcalDccWeight") << "Number of weights (" << buf.n_weights << ") for DetId " << buf.detId
+                                            << " exceeded maximum limit (" << nWeightMax << ") of root output format. ";
     }
     copy(it->second.begin(), it->second.end(), buf.weights);
     t.Fill();
@@ -534,21 +504,21 @@ void EcalDccWeightBuilder::writeWeightToRootFile(){
 }
 
 #ifndef DB_WRITE_SUPPORT
-void EcalDccWeightBuilder::writeWeightToDB(){
-  throw cms::Exception("DccWeight")
-    << "Code was compiled without support for writing dcc weights directly "
-    " into configuration DB. Configurable writeToDB must be set to False. "
-    "sqlMode can be used to produce an SQL*PLUS script to fill the DB\n";
+void EcalDccWeightBuilder::writeWeightToDB() {
+  throw cms::Exception("DccWeight") << "Code was compiled without support for writing dcc weights directly "
+                                       " into configuration DB. Configurable writeToDB must be set to False. "
+                                       "sqlMode can be used to produce an SQL*PLUS script to fill the DB\n";
 }
-#else //DB_WRITE_SUPPORT defined
-void EcalDccWeightBuilder::writeWeightToDB(){
-  cout << "going to write to the online DB "<<dbSid_<<" user "<<dbUser_<<endl;;
+#else   //DB_WRITE_SUPPORT defined
+void EcalDccWeightBuilder::writeWeightToDB() {
+  cout << "going to write to the online DB " << dbSid_ << " user " << dbUser_ << endl;
+  ;
   EcalCondDBInterface* econn;
 
   try {
     cout << "Making connection..." << flush;
     const string& filePrefix = string("file:");
-    if(dbPassword_.find(filePrefix)==0){ //password must be read for a file
+    if (dbPassword_.find(filePrefix) == 0) {  //password must be read for a file
       string fileName = dbPassword_.substr(filePrefix.size());
       //substitute dbPassword_ value by the password read from the file
       PasswordReader pr;
@@ -558,48 +528,46 @@ void EcalDccWeightBuilder::writeWeightToDB(){
     //     cout << __FILE__ << ":" << __LINE__ << ": "
     //           <<  "Password: " << dbPassword_ << "\n";
 
-    econn = new EcalCondDBInterface( dbSid_, dbUser_, dbPassword_ );
+    econn = new EcalCondDBInterface(dbSid_, dbUser_, dbPassword_);
     cout << "Done." << endl;
-  } catch (runtime_error &e) {
+  } catch (runtime_error& e) {
     cerr << e.what() << endl;
     exit(-1);
   }
-  
+
   ODFEWeightsInfo weight_info;
   weight_info.setConfigTag(dbTag_);
   weight_info.setVersion(dbVersion_);
   cout << "Inserting in DB..." << endl;
 
   econn->insertConfigSet(&weight_info);
-  
-  int weight_id=weight_info.getId();
-  cout << "WeightInfo inserted with ID "<< weight_id<< endl;
+
+  int weight_id = weight_info.getId();
+  cout << "WeightInfo inserted with ID " << weight_id << endl;
 
   vector<ODWeightsDat> datadel;
   datadel.reserve(encodedWeights_.size());
 
   vector<ODWeightsSamplesDat> dcc1stSampleConfig(nDccs);
-  for(int i = ecalDccFedIdMin; i <= ecalDccFedIdMax; ++i){
+  for (int i = ecalDccFedIdMin; i <= ecalDccFedIdMax; ++i) {
     dcc1stSampleConfig[i].setId(weight_id);
-    dcc1stSampleConfig[i].setFedId(601+i);
+    dcc1stSampleConfig[i].setFedId(601 + i);
     dcc1stSampleConfig[i].setSampleId(dcc1stSample_);
-    dcc1stSampleConfig[i].setWeightNumber(-1); //not used.
+    dcc1stSampleConfig[i].setWeightNumber(-1);  //not used.
   }
   econn->insertConfigDataArraySet(dcc1stSampleConfig, &weight_info);
-  
-  for(map<DetId, std::vector<int32_t> >::const_iterator it
-	= encodedWeights_.begin();
-      it !=  encodedWeights_.end();
-      ++it){
+
+  for (map<DetId, std::vector<int32_t> >::const_iterator it = encodedWeights_.begin(); it != encodedWeights_.end();
+       ++it) {
     const DetId& detId = it->first;
     const unsigned nWeights = 6;
     vector<int> weights(nWeights);
 
-    for(unsigned i=0; i<weights.size(); ++i){
+    for (unsigned i = 0; i < weights.size(); ++i) {
       //completing the weight vector with zeros in case it has
       //less than 6 elements:
       const vector<int>& w = it->second;
-      weights[i] = i<w.size()?w[i]:0;
+      weights[i] = i < w.size() ? w[i] : 0;
     }
 
     ODWeightsDat one_dat;
@@ -609,49 +577,45 @@ void EcalDccWeightBuilder::writeWeightToDB(){
     int smId;
     int ruId;
     int xtalId;
-    
+
     //detId ->  fedId, smId, ruId, xtalId
     dbId(detId, fedId, smId, ruId, xtalId);
-      
+
     one_dat.setSMId(smId);
     one_dat.setFedId(fedId);
     one_dat.setTTId(ruId);
     one_dat.setCrystalId(xtalId);
-    
+
     one_dat.setWeight0(weights[0]);
     one_dat.setWeight1(weights[1]);
     one_dat.setWeight2(weights[2]);
     one_dat.setWeight3(weights[3]);
     one_dat.setWeight4(weights[4]);
     one_dat.setWeight5(weights[5]);
-    
+
     datadel.push_back(one_dat);
   }
-  econn->insertConfigDataArraySet(datadel,&weight_info);
-  std::cout<< " .. done insertion in DB "<< endl;
+  econn->insertConfigDataArraySet(datadel, &weight_info);
+  std::cout << " .. done insertion in DB " << endl;
   delete econn;
-  cout<< "closed DB connection ... done"  << endl;
+  cout << "closed DB connection ... done" << endl;
 }
-#endif //DB_WRITE_SUPPORT not defined
+#endif  //DB_WRITE_SUPPORT not defined
 
+void EcalDccWeightBuilder::dbId(const DetId& detId, int& fedId, int& smId, int& ruId, int& xtalId) const {
+  const EcalElectronicsId& elecId = ecalElectronicsMap_->getElectronicsId(detId);
 
-void EcalDccWeightBuilder::dbId(const DetId& detId, int& fedId, int& smId,
-				int& ruId,
-				int& xtalId) const{
-  const EcalElectronicsId& elecId
-    = ecalElectronicsMap_->getElectronicsId(detId);
-  
   fedId = 600 + elecId.dccId();
-  ruId =  ecalElectronicsMap_->getElectronicsId(detId).towerId();
-  
-  if(detId.subdetId()==EcalBarrel) {
-    smId=((EBDetId)detId).ism();
-  } else{
-    smId = 10000-fedId; //no SM in EE. Use some unique value to satisfy
+  ruId = ecalElectronicsMap_->getElectronicsId(detId).towerId();
+
+  if (detId.subdetId() == EcalBarrel) {
+    smId = ((EBDetId)detId).ism();
+  } else {
+    smId = 10000 - fedId;  //no SM in EE. Use some unique value to satisfy
     //              current DB PK constraints.
   }
-  const int stripLength = 5; //1 strip = 5 crystals in a row
-  xtalId = (elecId.stripId()-1)*stripLength  + elecId.xtalId();
+  const int stripLength = 5;  //1 strip = 5 crystals in a row
+  xtalId = (elecId.stripId() - 1) * stripLength + elecId.xtalId();
 
 #if 0
   cout << __FILE__ << ":" << __LINE__ << ": FED ID "
diff --git a/CalibCalorimetry/EcalSRTools/src/PasswordReader.cc b/CalibCalorimetry/EcalSRTools/src/PasswordReader.cc
index d737877e2bb3c..09ecd73111197 100644
--- a/CalibCalorimetry/EcalSRTools/src/PasswordReader.cc
+++ b/CalibCalorimetry/EcalSRTools/src/PasswordReader.cc
@@ -8,74 +8,69 @@
 
 using namespace std;
 
-void PasswordReader::readPassword(const std::string& fileName,
-                                  const std::string& user,
-                                  std::string& password){
+void PasswordReader::readPassword(const std::string& fileName, const std::string& user, std::string& password) {
   ifstream f(fileName.c_str());
-  if(!f.good()){
-    throw cms::Exception("File")
-      << "Failed to open file " << fileName << " for reading condition "
-      "database password\n";
+  if (!f.good()) {
+    throw cms::Exception("File") << "Failed to open file " << fileName
+                                 << " for reading condition "
+                                    "database password\n";
   }
   string line;
   bool found = false;
-  int nstatements = 0; //number of lines other than empty and comment lines
-  while(f.good() && !found){
+  int nstatements = 0;  //number of lines other than empty and comment lines
+  while (f.good() && !found) {
     size_t pos = 0;
     getline(f, line);
     trim(line, " \t");
-    if(line[0]=='#' || line.empty()){//comment line
+    if (line[0] == '#' || line.empty()) {  //comment line
       continue;
     }
     ++nstatements;
     string u = tokenize(line, ":/ \t", pos);
-    if(u == user){//user found
+    if (u == user) {  //user found
       password = tokenize(line, ":/ \t", pos);
       found = true;
     }
   }
-  if(!found && nstatements==1){//login not found in the file
+  if (!found && nstatements == 1) {  //login not found in the file
     //let's check if file does not contain a single password, w/o login
     f.clear();
     f.seekg(0, ios::beg);
-    getline(f,line);
+    getline(f, line);
     trim(line, " \t");
-    if(line.find_first_of(": \t")==string::npos){//no login/password delimiter
+    if (line.find_first_of(": \t") == string::npos) {  //no login/password delimiter
       //looks like a single password file
       password = line;
       found = true;
     }
   }
-  if(!found){
-    throw cms::Exception("Database")
-      << " Password for condition database user '" << user << "' not found in"
-      << " password file " << fileName << "\n";
+  if (!found) {
+    throw cms::Exception("Database") << " Password for condition database user '" << user << "' not found in"
+                                     << " password file " << fileName << "\n";
   }
 }
 
-std::string PasswordReader::tokenize(const string& s,
-                                     const string& delim,
-                                     size_t& pos) const{
+std::string PasswordReader::tokenize(const string& s, const string& delim, size_t& pos) const {
   size_t pos0 = pos;
   size_t len = s.size();
   //eats delimeters at beginning of the string
-  while(pos0<s.size() && find(delim.begin(), delim.end(), s[pos0])!=delim.end()){
+  while (pos0 < s.size() && find(delim.begin(), delim.end(), s[pos0]) != delim.end()) {
     ++pos0;
   }
-  if(pos0>=len || pos0==string::npos) return "";
+  if (pos0 >= len || pos0 == string::npos)
+    return "";
   pos = s.find_first_of(delim, pos0);
-  return s.substr(pos0, (pos>0?pos:s.size())-pos0);
+  return s.substr(pos0, (pos > 0 ? pos : s.size()) - pos0);
 }
 
-std::string PasswordReader::trim(const std::string& s,
-                                 const std::string& chars) const{
+std::string PasswordReader::trim(const std::string& s, const std::string& chars) const {
   std::string::size_type pos0 = s.find_first_not_of(chars);
-  if(pos0==std::string::npos){
-    pos0=0;
+  if (pos0 == std::string::npos) {
+    pos0 = 0;
   }
-  string::size_type pos1 = s.find_last_not_of(chars)+1;
-  if(pos1==std::string::npos){
+  string::size_type pos1 = s.find_last_not_of(chars) + 1;
+  if (pos1 == std::string::npos) {
     pos1 = pos0;
   }
-  return s.substr(pos0, pos1-pos0);
+  return s.substr(pos0, pos1 - pos0);
 }
diff --git a/CalibCalorimetry/EcalSRTools/src/PasswordReader.h b/CalibCalorimetry/EcalSRTools/src/PasswordReader.h
index e8bc201a4794d..a7c083804db37 100644
--- a/CalibCalorimetry/EcalSRTools/src/PasswordReader.h
+++ b/CalibCalorimetry/EcalSRTools/src/PasswordReader.h
@@ -3,7 +3,7 @@
 
 #include <string>
 
-class PasswordReader{
+class PasswordReader {
 public:
   /** Read data password from a local file. File can contain password for
    * several user. The format is one record by line. Line must start with the
@@ -15,10 +15,7 @@ class PasswordReader{
    * @throw cms::Exception if file cannot be read or if the password was not
    * found
    */
-  void readPassword(const std::string& fileName,
-                    const std::string& user,
-                    std::string& password);
-
+  void readPassword(const std::string& fileName, const std::string& user, std::string& password);
 
   /** Function to split a string into tokens. Usage:
    * <pre>
@@ -34,9 +31,7 @@ class PasswordReader{
    * @param list of delimiters
    * @param [in,out] pos current scan position in the string
    */
-  std::string tokenize(const std::string& s,
-                       const std::string& delim,
-                       size_t& pos) const;
+  std::string tokenize(const std::string& s, const std::string& delim, size_t& pos) const;
 
   /** Trims unwanted characters (e.g. spaces) at start and end of a string.
    * @param s [in,out] input string
@@ -44,5 +39,5 @@ class PasswordReader{
    */
   std::string trim(const std::string& s, const std::string& chars) const;
 };
-  
-#endif //PASSWORDREADER_H not defined
+
+#endif  //PASSWORDREADER_H not defined
diff --git a/CalibCalorimetry/EcalSRTools/src/SealModules.cc b/CalibCalorimetry/EcalSRTools/src/SealModules.cc
index eaac68565e5ef..2a948aade3cc9 100644
--- a/CalibCalorimetry/EcalSRTools/src/SealModules.cc
+++ b/CalibCalorimetry/EcalSRTools/src/SealModules.cc
@@ -1,6 +1,5 @@
- #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 
- #include "CalibCalorimetry/EcalSRTools/interface/EcalDccWeightBuilder.h"
+#include "CalibCalorimetry/EcalSRTools/interface/EcalDccWeightBuilder.h"
 
- 
- DEFINE_FWK_MODULE(EcalDccWeightBuilder);
+DEFINE_FWK_MODULE(EcalDccWeightBuilder);
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/EBAlignment_2010.txt b/CalibCalorimetry/EcalTrivialCondModules/data/EBAlignment_2010.txt
deleted file mode 100644
index 48b8eaac410fe..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/EBAlignment_2010.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
-0 0 0 0 0 0
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/EEAlignment_2010.txt b/CalibCalorimetry/EcalTrivialCondModules/data/EEAlignment_2010.txt
deleted file mode 100644
index a14c61625d217..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/EEAlignment_2010.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-0 0 0 -0.02 -0.81 -0.94
-0 0 0 -0.02 -0.81 -0.94
-0 0 0  0.52 -0.81  0.81
-0 0 0  0.52 -0.81  0.81
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/EEMap.txt b/CalibCalorimetry/EcalTrivialCondModules/data/EEMap.txt
deleted file mode 100644
index 8c3d221568328..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/EEMap.txt
+++ /dev/null
@@ -1,14648 +0,0 @@
-100 60 -1 1 1 2 4 1 20 1 1 1
-100 59 -1 6 1 2 1 1 19 4 10 1
-100 58 -1 11 1 2 1 2 19 4 10 1
-100 57 -1 16 1 2 1 3 19 4 10 1
-100 56 -1 21 1 2 1 4 19 4 10 1
-100 55 -1 1 1 9 1 1 19 3 7 1
-100 54 -1 6 1 9 1 2 19 3 7 1
-100 53 -1 11 1 9 1 3 19 3 7 1
-100 52 -1 16 1 9 1 4 19 3 7 1
-100 51 -1 21 1 9 1 5 19 3 7 1
-100 50 -1 5 1 17 1 5 19 2 4 1
-100 49 -1 4 1 17 1 4 19 2 4 1
-100 48 -1 3 1 17 1 3 19 2 4 1
-100 47 -1 2 1 17 1 2 19 2 4 1
-100 46 -1 1 1 17 1 1 19 2 4 1
-100 45 -1 5 1 24 1 5 19 1 1 1
-100 44 -1 4 1 24 1 4 19 1 1 1
-100 43 -1 3 1 24 1 3 19 1 1 1
-100 42 -1 2 1 24 1 2 19 1 1 1
-100 41 -1 1 1 24 4 5 36 4 6 1
-99 60 -1 2 1 2 4 2 20 1 1 1
-99 59 -1 7 1 2 2 1 19 4 11 2
-99 58 -1 12 1 2 2 2 19 4 11 2
-99 57 -1 17 1 2 2 3 19 4 11 2
-99 56 -1 22 1 2 1 5 19 4 10 1
-99 55 -1 2 1 9 2 1 19 3 8 2
-99 54 -1 7 1 9 2 2 19 3 8 2
-99 53 -1 12 1 9 2 3 19 3 8 2
-99 52 -1 17 1 9 2 4 19 3 8 2
-99 51 -1 22 1 9 2 5 19 3 8 2
-99 50 -1 10 1 17 2 5 19 2 5 2
-99 49 -1 9 1 17 2 4 19 2 5 2
-99 48 -1 8 1 17 2 3 19 2 5 2
-99 47 -1 7 1 17 2 2 19 2 5 2
-99 46 -1 6 1 17 2 1 19 2 5 2
-99 45 -1 10 1 24 2 5 19 1 2 2
-99 44 -1 9 1 24 2 4 19 1 2 2
-99 43 -1 8 1 24 2 3 19 1 2 2
-99 42 -1 7 1 24 1 1 19 1 1 1
-99 41 -1 6 1 24 4 4 36 4 6 1
-98 60 -1 3 1 2 4 3 20 1 1 1
-98 59 -1 8 1 2 3 1 19 4 12 3
-98 58 -1 13 1 2 3 4 19 4 12 3
-98 57 -1 18 1 2 2 4 19 4 11 2
-98 56 -1 23 1 2 2 5 19 4 11 2
-98 55 -1 3 1 9 3 1 19 3 9 3
-98 54 -1 8 1 9 3 2 19 3 9 3
-98 53 -1 13 1 9 3 3 19 3 9 3
-98 52 -1 18 1 9 3 4 19 3 9 3
-98 51 -1 23 1 9 3 5 19 3 9 3
-98 50 -1 15 1 17 3 5 19 2 6 3
-98 49 -1 14 1 17 3 4 19 2 6 3
-98 48 -1 13 1 17 3 3 19 2 6 3
-98 47 -1 12 1 17 3 2 19 2 6 3
-98 46 -1 11 1 17 3 1 19 2 6 3
-98 45 -1 15 1 24 3 5 19 1 3 3
-98 44 -1 14 1 24 3 4 19 1 3 3
-98 43 -1 13 1 24 2 2 19 1 2 2
-98 42 -1 12 1 24 2 1 19 1 2 2
-98 41 -1 11 1 24 4 3 36 4 6 1
-97 65 -1 4 2 25 3 1 20 2 3 1
-97 64 -1 9 2 25 3 3 20 2 3 1
-97 63 -1 14 2 25 3 5 20 2 3 1
-97 62 -1 19 2 25 4 2 20 1 2 2
-97 61 -1 24 2 25 4 4 20 1 2 2
-97 60 -1 4 1 2 4 4 20 1 1 1
-97 59 -1 9 1 2 3 2 19 4 12 3
-97 58 -1 14 1 2 3 5 19 4 12 3
-97 57 -1 19 1 2 5 2 19 8 22 1
-97 56 -1 24 1 2 5 4 19 8 22 1
-97 55 -1 4 1 9 4 1 19 7 19 1
-97 54 -1 9 1 9 4 2 19 7 19 1
-97 53 -1 14 1 9 4 3 19 7 19 1
-97 52 -1 19 1 9 4 4 19 7 19 1
-97 51 -1 24 1 9 4 5 19 7 19 1
-97 50 -1 20 1 17 4 5 19 6 16 1
-97 49 -1 19 1 17 4 4 19 6 16 1
-97 48 -1 18 1 17 4 3 19 6 16 1
-97 47 -1 17 1 17 4 2 19 6 16 1
-97 46 -1 16 1 17 4 1 19 6 16 1
-97 45 -1 20 1 24 5 5 19 5 13 1
-97 44 -1 19 1 24 5 3 19 5 13 1
-97 43 -1 18 1 24 3 3 19 1 3 3
-97 42 -1 17 1 24 3 2 19 1 3 3
-97 41 -1 16 1 24 4 2 36 4 6 1
-97 40 -1 20 1 34 2 5 36 4 7 2
-97 39 -1 19 1 34 2 3 36 4 7 2
-97 38 -1 18 1 34 1 5 36 3 5 1
-97 37 -1 17 1 34 1 4 36 3 5 1
-97 36 -1 16 1 34 1 2 36 3 5 1
-96 65 -1 5 2 25 3 2 20 2 3 1
-96 64 -1 10 2 25 3 4 20 2 3 1
-96 63 -1 15 2 25 4 1 20 1 2 2
-96 62 -1 20 2 25 4 3 20 1 2 2
-96 61 -1 25 2 25 4 5 20 1 2 2
-96 60 -1 5 1 2 4 5 20 1 1 1
-96 59 -1 10 1 2 3 3 19 4 12 3
-96 58 -1 15 1 2 5 1 19 8 22 1
-96 57 -1 20 1 2 5 3 19 8 22 1
-96 56 -1 25 1 2 5 5 19 8 22 1
-96 55 -1 5 1 9 5 1 19 7 20 2
-96 54 -1 10 1 9 5 2 19 7 20 2
-96 53 -1 15 1 9 5 3 19 7 20 2
-96 52 -1 20 1 9 5 4 19 7 20 2
-96 51 -1 25 1 9 5 5 19 7 20 2
-96 50 -1 25 1 17 5 5 19 6 17 2
-96 49 -1 24 1 17 5 4 19 6 17 2
-96 48 -1 23 1 17 5 3 19 6 17 2
-96 47 -1 22 1 17 5 2 19 6 17 2
-96 46 -1 21 1 17 5 1 19 6 17 2
-96 45 -1 25 1 24 5 4 19 5 13 1
-96 44 -1 24 1 24 5 2 19 5 13 1
-96 43 -1 23 1 24 5 1 19 5 13 1
-96 42 -1 22 1 24 3 1 19 1 3 3
-96 41 -1 21 1 24 4 1 36 4 6 1
-96 40 -1 25 1 34 2 4 36 4 7 2
-96 39 -1 24 1 34 2 2 36 4 7 2
-96 38 -1 23 1 34 2 1 36 4 7 2
-96 37 -1 22 1 34 1 3 36 3 5 1
-96 36 -1 21 1 34 1 1 36 3 5 1
-95 75 -1 1 2 11 1 1 20 4 5 1
-95 74 -1 6 2 11 1 2 20 4 5 1
-95 73 -1 11 2 11 1 3 20 4 5 1
-95 72 -1 16 2 11 1 4 20 4 5 1
-95 71 -1 21 2 11 1 5 20 4 5 1
-95 70 -1 1 2 17 1 1 20 3 4 1
-95 69 -1 6 2 17 1 3 20 3 4 1
-95 68 -1 11 2 17 1 5 20 3 4 1
-95 67 -1 16 2 17 2 1 20 6 10 1
-95 66 -1 21 2 17 2 2 20 6 10 1
-95 65 -1 1 2 24 1 1 20 6 11 2
-95 64 -1 6 2 24 1 2 20 6 11 2
-95 63 -1 11 2 24 1 4 20 6 11 2
-95 62 -1 16 2 24 2 1 20 5 8 1
-95 61 -1 21 2 24 2 3 20 5 8 1
-95 60 -1 1 1 1 2 1 20 5 9 2
-95 59 -1 6 1 1 2 4 20 5 9 2
-95 58 -1 11 1 1 1 1 19 8 23 2
-95 57 -1 16 1 1 1 2 19 8 23 2
-95 56 -1 21 1 1 1 4 19 8 23 2
-95 55 -1 1 1 8 2 1 19 8 24 3
-95 54 -1 6 1 8 2 4 19 8 24 3
-95 53 -1 11 1 8 1 1 19 7 21 3
-95 52 -1 16 1 8 1 3 19 7 21 3
-95 51 -1 21 1 8 1 5 19 7 21 3
-95 50 -1 5 1 16 1 5 19 6 18 3
-95 49 -1 4 1 16 1 4 19 6 18 3
-95 48 -1 3 1 16 1 2 19 6 18 3
-95 47 -1 2 1 16 2 5 19 5 14 2
-95 46 -1 1 1 16 2 3 19 5 14 2
-95 45 -1 5 1 23 1 5 19 5 15 3
-95 44 -1 4 1 23 1 3 19 5 15 3
-95 43 -1 3 1 23 1 1 19 5 15 3
-95 42 -1 2 1 23 2 5 36 8 17 1
-95 41 -1 1 1 23 2 3 36 8 17 1
-95 40 -1 5 1 29 2 5 36 8 18 2
-95 39 -1 4 1 29 2 2 36 8 18 2
-95 38 -1 3 1 29 1 5 36 7 14 1
-95 37 -1 2 1 29 1 4 36 7 14 1
-95 36 -1 1 1 29 1 2 36 7 14 1
-95 35 -1 5 1 30 2 5 36 7 15 2
-95 34 -1 4 1 30 2 1 36 7 15 2
-95 33 -1 3 1 30 1 5 36 2 4 1
-95 32 -1 2 1 30 1 4 36 2 4 1
-95 31 -1 1 1 30 1 2 36 2 4 1
-95 30 -1 5 1 33 1 5 36 1 1 1
-95 29 -1 4 1 33 1 4 36 1 1 1
-95 28 -1 3 1 33 1 3 36 1 1 1
-95 27 -1 2 1 33 1 2 36 1 1 1
-95 26 -1 1 1 33 1 1 36 1 1 1
-94 75 -1 2 2 11 2 1 20 4 6 2
-94 74 -1 7 2 11 2 2 20 4 6 2
-94 73 -1 12 2 11 2 3 20 4 6 2
-94 72 -1 17 2 11 2 4 20 4 6 2
-94 71 -1 22 2 11 2 5 20 4 6 2
-94 70 -1 2 2 17 1 2 20 3 4 1
-94 69 -1 7 2 17 1 4 20 3 4 1
-94 68 -1 12 2 17 3 2 20 7 13 1
-94 67 -1 17 2 17 3 4 20 7 13 1
-94 66 -1 22 2 17 2 3 20 6 10 1
-94 65 -1 2 2 24 3 1 20 6 12 3
-94 64 -1 7 2 24 1 3 20 6 11 2
-94 63 -1 12 2 24 1 5 20 6 11 2
-94 62 -1 17 2 24 2 2 20 5 8 1
-94 61 -1 22 2 24 2 4 20 5 8 1
-94 60 -1 2 1 1 2 2 20 5 9 2
-94 59 -1 7 1 1 2 5 20 5 9 2
-94 58 -1 12 1 1 3 1 19 12 35 1
-94 57 -1 17 1 1 1 3 19 8 23 2
-94 56 -1 22 1 1 1 5 19 8 23 2
-94 55 -1 2 1 8 2 2 19 8 24 3
-94 54 -1 7 1 8 2 5 19 8 24 3
-94 53 -1 12 1 8 1 2 19 7 21 3
-94 52 -1 17 1 8 1 4 19 7 21 3
-94 51 -1 22 1 8 3 3 19 11 32 1
-94 50 -1 10 1 16 3 5 19 10 29 1
-94 49 -1 9 1 16 1 3 19 6 18 3
-94 48 -1 8 1 16 1 1 19 6 18 3
-94 47 -1 7 1 16 2 4 19 5 14 2
-94 46 -1 6 1 16 2 2 19 5 14 2
-94 45 -1 10 1 23 1 4 19 5 15 3
-94 44 -1 9 1 23 1 2 19 5 15 3
-94 43 -1 8 1 23 3 3 19 9 25 1
-94 42 -1 7 1 23 2 4 36 8 17 1
-94 41 -1 6 1 23 2 2 36 8 17 1
-94 40 -1 10 1 29 2 4 36 8 18 2
-94 39 -1 9 1 29 2 1 36 8 18 2
-94 38 -1 8 1 29 3 5 36 7 16 3
-94 37 -1 7 1 29 1 3 36 7 14 1
-94 36 -1 6 1 29 1 1 36 7 14 1
-94 35 -1 10 1 30 2 4 36 7 15 2
-94 34 -1 9 1 30 3 5 36 6 11 1
-94 33 -1 8 1 30 3 4 36 6 11 1
-94 32 -1 7 1 30 1 3 36 2 4 1
-94 31 -1 6 1 30 1 1 36 2 4 1
-94 30 -1 10 1 33 2 5 36 1 2 2
-94 29 -1 9 1 33 2 4 36 1 2 2
-94 28 -1 8 1 33 2 3 36 1 2 2
-94 27 -1 7 1 33 2 2 36 1 2 2
-94 26 -1 6 1 33 2 1 36 1 2 2
-93 75 -1 3 2 11 3 1 20 4 7 3
-93 74 -1 8 2 11 3 4 20 4 7 3
-93 73 -1 13 2 11 3 5 20 4 7 3
-93 72 -1 18 2 11 4 2 20 8 16 1
-93 71 -1 23 2 11 4 4 20 8 16 1
-93 70 -1 3 2 17 4 1 20 7 14 2
-93 69 -1 8 2 17 3 1 20 7 13 1
-93 68 -1 13 2 17 3 3 20 7 13 1
-93 67 -1 18 2 17 3 5 20 7 13 1
-93 66 -1 23 2 17 2 4 20 6 10 1
-93 65 -1 3 2 24 3 2 20 6 12 3
-93 64 -1 8 2 24 3 3 20 6 12 3
-93 63 -1 13 2 24 3 5 20 6 12 3
-93 62 -1 18 2 24 4 1 20 9 19 1
-93 61 -1 23 2 24 2 5 20 5 8 1
-93 60 -1 3 1 1 2 3 20 5 9 2
-93 59 -1 8 1 1 4 3 20 9 20 2
-93 58 -1 13 1 1 3 2 19 12 35 1
-93 57 -1 18 1 1 3 3 19 12 35 1
-93 56 -1 23 1 1 3 4 19 12 35 1
-93 55 -1 3 1 8 2 3 19 8 24 3
-93 54 -1 8 1 8 4 3 19 12 36 2
-93 53 -1 13 1 8 3 1 19 11 32 1
-93 52 -1 18 1 8 3 2 19 11 32 1
-93 51 -1 23 1 8 3 4 19 11 32 1
-93 50 -1 15 1 16 3 4 19 10 29 1
-93 49 -1 14 1 16 3 3 19 10 29 1
-93 48 -1 13 1 16 3 2 19 10 29 1
-93 47 -1 12 1 16 4 5 19 9 26 2
-93 46 -1 11 1 16 2 1 19 5 14 2
-93 45 -1 15 1 23 3 5 19 9 25 1
-93 44 -1 14 1 23 3 4 19 9 25 1
-93 43 -1 13 1 23 3 2 19 9 25 1
-93 42 -1 12 1 23 4 5 36 12 27 1
-93 41 -1 11 1 23 2 1 36 8 17 1
-93 40 -1 15 1 29 2 3 36 8 18 2
-93 39 -1 14 1 29 4 3 36 12 28 2
-93 38 -1 13 1 29 3 4 36 7 16 3
-93 37 -1 12 1 29 3 3 36 7 16 3
-93 36 -1 11 1 29 3 1 36 7 16 3
-93 35 -1 15 1 30 2 3 36 7 15 2
-93 34 -1 14 1 30 4 5 36 6 12 2
-93 33 -1 13 1 30 3 3 36 6 11 1
-93 32 -1 12 1 30 3 2 36 6 11 1
-93 31 -1 11 1 30 3 1 36 6 11 1
-93 30 -1 15 1 33 4 5 36 5 8 2
-93 29 -1 14 1 33 4 4 36 5 8 2
-93 28 -1 13 1 33 3 5 36 1 3 3
-93 27 -1 12 1 33 3 4 36 1 3 3
-93 26 -1 11 1 33 3 3 36 1 3 3
-92 80 -1 4 2 25 2 1 21 2 2 1
-92 79 -1 9 2 25 2 3 21 2 2 1
-92 78 -1 14 2 25 1 1 21 1 1 1
-92 77 -1 19 2 25 1 2 21 1 1 1
-92 76 -1 24 2 25 1 4 21 1 1 1
-92 75 -1 4 2 11 3 2 20 4 7 3
-92 74 -1 9 2 11 5 1 20 8 17 2
-92 73 -1 14 2 11 4 1 20 8 16 1
-92 72 -1 19 2 11 4 3 20 8 16 1
-92 71 -1 24 2 11 4 5 20 8 16 1
-92 70 -1 4 2 17 4 2 20 7 14 2
-92 69 -1 9 2 17 4 3 20 7 14 2
-92 68 -1 14 2 17 4 4 20 7 14 2
-92 67 -1 19 2 17 4 5 20 7 14 2
-92 66 -1 24 2 17 2 5 20 6 10 1
-92 65 -1 4 2 24 5 1 20 10 22 1
-92 64 -1 9 2 24 3 4 20 6 12 3
-92 63 -1 14 2 24 5 4 20 10 22 1
-92 62 -1 19 2 24 4 2 20 9 19 1
-92 61 -1 24 2 24 4 4 20 9 19 1
-92 60 -1 4 1 1 4 1 20 9 20 2
-92 59 -1 9 1 1 4 4 20 9 20 2
-92 58 -1 14 1 1 5 1 19 12 37 3
-92 57 -1 19 1 1 5 3 19 12 37 3
-92 56 -1 24 1 1 3 5 19 12 35 1
-92 55 -1 4 1 8 4 1 19 12 36 2
-92 54 -1 9 1 8 4 4 19 12 36 2
-92 53 -1 14 1 8 5 1 19 11 33 2
-92 52 -1 19 1 8 5 3 19 11 33 2
-92 51 -1 24 1 8 3 5 19 11 32 1
-92 50 -1 20 1 16 5 5 19 10 30 2
-92 49 -1 19 1 16 5 3 19 10 30 2
-92 48 -1 18 1 16 3 1 19 10 29 1
-92 47 -1 17 1 16 4 4 19 9 26 2
-92 46 -1 16 1 16 4 2 19 9 26 2
-92 45 -1 20 1 23 5 5 19 9 27 3
-92 44 -1 19 1 23 5 3 19 9 27 3
-92 43 -1 18 1 23 3 1 19 9 25 1
-92 42 -1 17 1 23 4 4 36 12 27 1
-92 41 -1 16 1 23 4 2 36 12 27 1
-92 40 -1 20 1 29 4 5 36 12 28 2
-92 39 -1 19 1 29 4 2 36 12 28 2
-92 38 -1 18 1 29 5 5 36 11 24 1
-92 37 -1 17 1 29 3 2 36 7 16 3
-92 36 -1 16 1 29 5 2 36 11 24 1
-92 35 -1 20 1 30 2 2 36 7 15 2
-92 34 -1 19 1 30 4 4 36 6 12 2
-92 33 -1 18 1 30 4 3 36 6 12 2
-92 32 -1 17 1 30 4 2 36 6 12 2
-92 31 -1 16 1 30 4 1 36 6 12 2
-92 30 -1 20 1 33 5 5 36 5 9 3
-92 29 -1 19 1 33 4 3 36 5 8 2
-92 28 -1 18 1 33 4 2 36 5 8 2
-92 27 -1 17 1 33 4 1 36 5 8 2
-92 26 -1 16 1 33 3 2 36 1 3 3
-92 25 -1 20 9 14 2 5 35 4 5 1
-92 24 -1 19 9 14 2 3 35 4 5 1
-92 23 -1 18 9 14 2 1 35 4 5 1
-92 22 -1 17 9 14 3 4 35 3 3 1
-92 21 -1 16 9 14 3 2 35 3 3 1
-91 80 -1 5 2 25 2 2 21 2 2 1
-91 79 -1 10 2 25 2 4 21 2 2 1
-91 78 -1 15 2 25 2 5 21 2 2 1
-91 77 -1 20 2 25 1 3 21 1 1 1
-91 76 -1 25 2 25 1 5 21 1 1 1
-91 75 -1 5 2 11 3 3 20 4 7 3
-91 74 -1 10 2 11 5 2 20 8 17 2
-91 73 -1 15 2 11 5 3 20 8 17 2
-91 72 -1 20 2 11 5 4 20 8 17 2
-91 71 -1 25 2 11 5 5 20 8 17 2
-91 70 -1 5 2 17 5 1 20 7 15 3
-91 69 -1 10 2 17 5 2 20 7 15 3
-91 68 -1 15 2 17 5 3 20 7 15 3
-91 67 -1 20 2 17 5 4 20 7 15 3
-91 66 -1 25 2 17 5 5 20 7 15 3
-91 65 -1 5 2 24 5 2 20 10 22 1
-91 64 -1 10 2 24 5 3 20 10 22 1
-91 63 -1 15 2 24 5 5 20 10 22 1
-91 62 -1 20 2 24 4 3 20 9 19 1
-91 61 -1 25 2 24 4 5 20 9 19 1
-91 60 -1 5 1 1 4 2 20 9 20 2
-91 59 -1 10 1 1 4 5 20 9 20 2
-91 58 -1 15 1 1 5 2 19 12 37 3
-91 57 -1 20 1 1 5 4 19 12 37 3
-91 56 -1 25 1 1 5 5 19 12 37 3
-91 55 -1 5 1 8 4 2 19 12 36 2
-91 54 -1 10 1 8 4 5 19 12 36 2
-91 53 -1 15 1 8 5 2 19 11 33 2
-91 52 -1 20 1 8 5 4 19 11 33 2
-91 51 -1 25 1 8 5 5 19 11 33 2
-91 50 -1 25 1 16 5 4 19 10 30 2
-91 49 -1 24 1 16 5 2 19 10 30 2
-91 48 -1 23 1 16 5 1 19 10 30 2
-91 47 -1 22 1 16 4 3 19 9 26 2
-91 46 -1 21 1 16 4 1 19 9 26 2
-91 45 -1 25 1 23 5 4 19 9 27 3
-91 44 -1 24 1 23 5 2 19 9 27 3
-91 43 -1 23 1 23 5 1 19 9 27 3
-91 42 -1 22 1 23 4 3 36 12 27 1
-91 41 -1 21 1 23 4 1 36 12 27 1
-91 40 -1 25 1 29 4 4 36 12 28 2
-91 39 -1 24 1 29 4 1 36 12 28 2
-91 38 -1 23 1 29 5 4 36 11 24 1
-91 37 -1 22 1 29 5 3 36 11 24 1
-91 36 -1 21 1 29 5 1 36 11 24 1
-91 35 -1 25 1 30 5 5 36 6 13 3
-91 34 -1 24 1 30 5 4 36 6 13 3
-91 33 -1 23 1 30 5 3 36 6 13 3
-91 32 -1 22 1 30 5 2 36 6 13 3
-91 31 -1 21 1 30 5 1 36 6 13 3
-91 30 -1 25 1 33 5 4 36 5 9 3
-91 29 -1 24 1 33 5 3 36 5 9 3
-91 28 -1 23 1 33 5 2 36 5 9 3
-91 27 -1 22 1 33 5 1 36 5 9 3
-91 26 -1 21 1 33 3 1 36 1 3 3
-91 25 -1 25 9 14 2 4 35 4 5 1
-91 24 -1 24 9 14 2 2 35 4 5 1
-91 23 -1 23 9 14 3 5 35 3 3 1
-91 22 -1 22 9 14 3 3 35 3 3 1
-91 21 -1 21 9 14 3 1 35 3 3 1
-90 80 -1 1 2 6 1 1 21 2 3 2
-90 79 -1 6 2 6 1 4 21 2 3 2
-90 78 -1 11 2 6 1 5 21 2 3 2
-90 77 -1 16 2 6 2 1 21 5 6 1
-90 76 -1 21 2 6 2 3 21 5 6 1
-90 75 -1 1 2 10 2 1 21 5 7 2
-90 74 -1 6 2 10 2 3 21 5 7 2
-90 73 -1 11 2 10 1 1 20 8 18 3
-90 72 -1 16 2 10 1 2 20 8 18 3
-90 71 -1 21 2 10 1 4 20 8 18 3
-90 70 -1 1 2 16 2 1 20 12 27 1
-90 69 -1 6 2 16 1 1 20 11 25 1
-90 68 -1 11 2 16 1 2 20 11 25 1
-90 67 -1 16 2 16 1 3 20 11 25 1
-90 66 -1 21 2 16 1 4 20 11 25 1
-90 65 -1 1 2 23 1 1 20 10 23 2
-90 64 -1 6 2 23 1 2 20 10 23 2
-90 63 -1 11 2 23 1 3 20 10 23 2
-90 62 -1 16 2 23 1 4 20 10 23 2
-90 61 -1 21 2 23 1 5 20 10 23 2
-90 60 -1 1 2 31 2 1 20 9 21 3
-90 59 -1 6 2 31 2 3 20 9 21 3
-90 58 -1 11 2 31 1 1 19 12 38 4
-90 57 -1 16 2 31 1 2 19 12 38 4
-90 56 -1 21 2 31 1 4 19 12 38 4
-90 55 -1 1 1 7 1 1 19 11 34 3
-90 54 -1 6 1 7 1 2 19 11 34 3
-90 53 -1 11 1 7 1 3 19 11 34 3
-90 52 -1 16 1 7 1 4 19 11 34 3
-90 51 -1 21 1 7 1 5 19 11 34 3
-90 50 -1 5 1 15 1 5 19 10 31 3
-90 49 -1 4 1 15 1 4 19 10 31 3
-90 48 -1 3 1 15 1 3 19 10 31 3
-90 47 -1 2 1 15 1 2 19 10 31 3
-90 46 -1 1 1 15 1 1 19 10 31 3
-90 45 -1 5 1 22 1 5 19 9 28 4
-90 44 -1 4 1 22 1 3 19 9 28 4
-90 43 -1 3 1 22 1 1 19 9 28 4
-90 42 -1 2 1 22 2 4 36 12 29 3
-90 41 -1 1 1 22 2 2 36 12 29 3
-90 40 -1 5 1 28 1 5 36 11 25 2
-90 39 -1 4 1 28 1 4 36 11 25 2
-90 38 -1 3 1 28 1 3 36 11 25 2
-90 37 -1 2 1 28 1 2 36 11 25 2
-90 36 -1 1 1 28 1 1 36 11 25 2
-90 35 -1 5 1 32 1 5 36 10 22 1
-90 34 -1 4 1 32 1 4 36 10 22 1
-90 33 -1 3 1 32 1 3 36 10 22 1
-90 32 -1 2 1 32 1 1 36 10 22 1
-90 31 -1 1 1 32 2 3 36 9 19 1
-90 30 -1 5 9 13 1 5 36 5 10 1
-90 29 -1 4 9 13 1 3 36 5 10 1
-90 28 -1 3 9 13 1 1 36 5 10 1
-90 27 -1 2 9 13 2 4 35 8 19 1
-90 26 -1 1 9 13 2 2 35 8 19 1
-90 25 -1 5 9 20 2 5 35 8 20 2
-90 24 -1 4 9 20 2 2 35 8 20 2
-90 23 -1 3 9 20 1 5 35 3 4 2
-90 22 -1 2 9 20 1 4 35 3 4 2
-90 21 -1 1 9 20 1 3 35 3 4 2
-89 80 -1 2 2 6 1 2 21 2 3 2
-89 79 -1 7 2 6 3 1 21 6 9 4
-89 78 -1 12 2 6 3 3 21 6 9 4
-89 77 -1 17 2 6 2 2 21 5 6 1
-89 76 -1 22 2 6 2 4 21 5 6 1
-89 75 -1 2 2 10 2 2 21 5 7 2
-89 74 -1 7 2 10 2 4 21 5 7 2
-89 73 -1 12 2 10 2 5 21 5 7 2
-89 72 -1 17 2 10 1 3 20 8 18 3
-89 71 -1 22 2 10 1 5 20 8 18 3
-89 70 -1 2 2 16 2 2 20 12 27 1
-89 69 -1 7 2 16 2 4 20 12 27 1
-89 68 -1 12 2 16 3 1 20 11 26 2
-89 67 -1 17 2 16 3 3 20 11 26 2
-89 66 -1 22 2 16 1 5 20 11 25 1
-89 65 -1 2 2 23 2 1 20 10 24 3
-89 64 -1 7 2 23 2 2 20 10 24 3
-89 63 -1 12 2 23 2 3 20 10 24 3
-89 62 -1 17 2 23 2 4 20 10 24 3
-89 61 -1 22 2 23 2 5 20 10 24 3
-89 60 -1 2 2 31 2 2 20 9 21 3
-89 59 -1 7 2 31 2 4 20 9 21 3
-89 58 -1 12 2 31 2 5 20 9 21 3
-89 57 -1 17 2 31 1 3 19 12 38 4
-89 56 -1 22 2 31 1 5 19 12 38 4
-89 55 -1 2 1 7 4 1 19 16 45 1
-89 54 -1 7 1 7 2 1 19 15 43 1
-89 53 -1 12 1 7 2 2 19 15 43 1
-89 52 -1 17 1 7 2 3 19 15 43 1
-89 51 -1 22 1 7 2 4 19 15 43 1
-89 50 -1 10 1 15 2 5 19 14 41 1
-89 49 -1 9 1 15 2 4 19 14 41 1
-89 48 -1 8 1 15 2 3 19 14 41 1
-89 47 -1 7 1 15 2 2 19 14 41 1
-89 46 -1 6 1 15 4 4 19 13 39 1
-89 45 -1 10 1 22 1 4 19 9 28 4
-89 44 -1 9 1 22 1 2 19 9 28 4
-89 43 -1 8 1 22 2 5 36 12 29 3
-89 42 -1 7 1 22 2 3 36 12 29 3
-89 41 -1 6 1 22 2 1 36 12 29 3
-89 40 -1 10 1 28 2 5 36 11 26 3
-89 39 -1 9 1 28 2 4 36 11 26 3
-89 38 -1 8 1 28 2 3 36 11 26 3
-89 37 -1 7 1 28 2 2 36 11 26 3
-89 36 -1 6 1 28 2 1 36 11 26 3
-89 35 -1 10 1 32 3 5 36 10 23 2
-89 34 -1 9 1 32 3 3 36 10 23 2
-89 33 -1 8 1 32 1 2 36 10 22 1
-89 32 -1 7 1 32 2 5 36 9 19 1
-89 31 -1 6 1 32 2 2 36 9 19 1
-89 30 -1 10 9 13 1 4 36 5 10 1
-89 29 -1 9 9 13 1 2 36 5 10 1
-89 28 -1 8 9 13 2 5 35 8 19 1
-89 27 -1 7 9 13 2 3 35 8 19 1
-89 26 -1 6 9 13 2 1 35 8 19 1
-89 25 -1 10 9 20 2 4 35 8 20 2
-89 24 -1 9 9 20 2 1 35 8 20 2
-89 23 -1 8 9 20 3 4 35 7 15 1
-89 22 -1 7 9 20 3 2 35 7 15 1
-89 21 -1 6 9 20 1 2 35 3 4 2
-88 80 -1 3 2 6 1 3 21 2 3 2
-88 79 -1 8 2 6 3 2 21 6 9 4
-88 78 -1 13 2 6 3 4 21 6 9 4
-88 77 -1 18 2 6 3 5 21 6 9 4
-88 76 -1 23 2 6 2 5 21 5 6 1
-88 75 -1 3 2 10 3 1 21 5 8 3
-88 74 -1 8 2 10 3 3 21 5 8 3
-88 73 -1 13 2 10 3 5 21 5 8 3
-88 72 -1 18 2 10 4 1 20 12 28 2
-88 71 -1 23 2 10 4 3 20 12 28 2
-88 70 -1 3 2 16 2 3 20 12 27 1
-88 69 -1 8 2 16 2 5 20 12 27 1
-88 68 -1 13 2 16 3 2 20 11 26 2
-88 67 -1 18 2 16 3 4 20 11 26 2
-88 66 -1 23 2 16 3 5 20 11 26 2
-88 65 -1 3 2 23 4 1 20 15 34 1
-88 64 -1 8 2 23 4 4 20 15 34 1
-88 63 -1 13 2 23 3 1 20 14 32 1
-88 62 -1 18 2 23 3 2 20 14 32 1
-88 61 -1 23 2 23 3 4 20 14 32 1
-88 60 -1 3 2 31 3 1 20 13 30 1
-88 59 -1 8 2 31 3 2 20 13 30 1
-88 58 -1 13 2 31 3 4 20 13 30 1
-88 57 -1 18 2 31 4 1 19 16 46 2
-88 56 -1 23 2 31 4 3 19 16 46 2
-88 55 -1 3 1 7 4 2 19 16 45 1
-88 54 -1 8 1 7 3 1 19 15 44 2
-88 53 -1 13 1 7 3 2 19 15 44 2
-88 52 -1 18 1 7 3 4 19 15 44 2
-88 51 -1 23 1 7 2 5 19 15 43 1
-88 50 -1 15 1 15 3 5 19 14 42 2
-88 49 -1 14 1 15 3 4 19 14 42 2
-88 48 -1 13 1 15 3 2 19 14 42 2
-88 47 -1 12 1 15 2 1 19 14 41 1
-88 46 -1 11 1 15 4 3 19 13 39 1
-88 45 -1 15 1 22 4 5 19 13 40 2
-88 44 -1 14 1 22 4 2 19 13 40 2
-88 43 -1 13 1 22 3 5 36 16 38 1
-88 42 -1 12 1 22 3 4 36 16 38 1
-88 41 -1 11 1 22 3 2 36 16 38 1
-88 40 -1 15 1 28 3 5 36 15 36 1
-88 39 -1 14 1 28 3 4 36 15 36 1
-88 38 -1 13 1 28 3 3 36 15 36 1
-88 37 -1 12 1 28 4 5 36 14 33 1
-88 36 -1 11 1 28 4 3 36 14 33 1
-88 35 -1 15 1 32 3 4 36 10 23 2
-88 34 -1 14 1 32 3 2 36 10 23 2
-88 33 -1 13 1 32 3 1 36 10 23 2
-88 32 -1 12 1 32 2 4 36 9 19 1
-88 31 -1 11 1 32 2 1 36 9 19 1
-88 30 -1 15 9 13 4 5 36 9 20 2
-88 29 -1 14 9 13 4 2 36 9 20 2
-88 28 -1 13 9 13 3 5 35 8 21 3
-88 27 -1 12 9 13 3 4 35 8 21 3
-88 26 -1 11 9 13 3 2 35 8 21 3
-88 25 -1 15 9 20 2 3 35 8 20 2
-88 24 -1 14 9 20 3 5 35 7 15 1
-88 23 -1 13 9 20 3 3 35 7 15 1
-88 22 -1 12 9 20 3 1 35 7 15 1
-88 21 -1 11 9 20 1 1 35 3 4 2
-87 85 -1 4 2 3 3 1 21 3 4 1
-87 84 -1 9 2 3 3 3 21 3 4 1
-87 83 -1 14 2 3 3 5 21 3 4 1
-87 82 -1 19 2 3 4 2 21 7 13 1
-87 81 -1 24 2 3 4 4 21 7 13 1
-87 80 -1 4 2 6 4 1 21 6 10 1
-87 79 -1 9 2 6 4 2 21 6 10 1
-87 78 -1 14 2 6 4 3 21 6 10 1
-87 77 -1 19 2 6 4 4 21 6 10 1
-87 76 -1 24 2 6 4 5 21 6 10 1
-87 75 -1 4 2 10 3 2 21 5 8 3
-87 74 -1 9 2 10 3 4 21 5 8 3
-87 73 -1 14 2 10 5 3 21 9 22 1
-87 72 -1 19 2 10 4 2 20 12 28 2
-87 71 -1 24 2 10 4 4 20 12 28 2
-87 70 -1 4 2 16 4 1 20 12 29 3
-87 69 -1 9 2 16 4 3 20 12 29 3
-87 68 -1 14 2 16 4 5 20 12 29 3
-87 67 -1 19 2 16 5 2 20 15 35 2
-87 66 -1 24 2 16 5 4 20 15 35 2
-87 65 -1 4 2 23 4 2 20 15 34 1
-87 64 -1 9 2 23 5 1 20 14 33 2
-87 63 -1 14 2 23 5 2 20 14 33 2
-87 62 -1 19 2 23 3 3 20 14 32 1
-87 61 -1 24 2 23 3 5 20 14 32 1
-87 60 -1 4 2 31 5 1 20 13 31 2
-87 59 -1 9 2 31 3 3 20 13 30 1
-87 58 -1 14 2 31 3 5 20 13 30 1
-87 57 -1 19 2 31 4 2 19 16 46 2
-87 56 -1 24 2 31 4 4 19 16 46 2
-87 55 -1 4 1 7 4 3 19 16 45 1
-87 54 -1 9 1 7 4 5 19 16 45 1
-87 53 -1 14 1 7 3 3 19 15 44 2
-87 52 -1 19 1 7 3 5 19 15 44 2
-87 51 -1 24 1 7 5 4 1 3 5 1
-87 50 -1 20 1 15 5 5 1 2 3 1
-87 49 -1 19 1 15 3 3 19 14 42 2
-87 48 -1 18 1 15 3 1 19 14 42 2
-87 47 -1 17 1 15 4 5 19 13 39 1
-87 46 -1 16 1 15 4 2 19 13 39 1
-87 45 -1 20 1 22 4 4 19 13 40 2
-87 44 -1 19 1 22 4 1 19 13 40 2
-87 43 -1 18 1 22 5 4 36 16 39 2
-87 42 -1 17 1 22 3 3 36 16 38 1
-87 41 -1 16 1 22 3 1 36 16 38 1
-87 40 -1 20 1 28 5 5 36 15 37 2
-87 39 -1 19 1 28 5 3 36 15 37 2
-87 38 -1 18 1 28 3 2 36 15 36 1
-87 37 -1 17 1 28 3 1 36 15 36 1
-87 36 -1 16 1 28 4 2 36 14 33 1
-87 35 -1 20 1 32 5 5 36 14 34 2
-87 34 -1 19 1 32 5 3 36 14 34 2
-87 33 -1 18 1 32 4 5 36 9 21 3
-87 32 -1 17 1 32 4 4 36 9 21 3
-87 31 -1 16 1 32 4 2 36 9 21 3
-87 30 -1 20 9 13 4 4 36 9 20 2
-87 29 -1 19 9 13 4 1 36 9 20 2
-87 28 -1 18 9 13 5 4 35 12 30 1
-87 27 -1 17 9 13 3 3 35 8 21 3
-87 26 -1 16 9 13 3 1 35 8 21 3
-87 25 -1 20 9 20 4 5 35 7 16 2
-87 24 -1 19 9 20 4 4 35 7 16 2
-87 23 -1 18 9 20 4 3 35 7 16 2
-87 22 -1 17 9 20 4 2 35 7 16 2
-87 21 -1 16 9 20 4 1 35 7 16 2
-87 20 -1 20 9 14 5 5 35 6 10 1
-87 19 -1 19 9 14 5 3 35 6 10 1
-87 18 -1 18 9 14 4 5 35 2 2 1
-87 17 -1 17 9 14 4 4 35 2 2 1
-87 16 -1 16 9 14 4 2 35 2 2 1
-86 85 -1 5 2 3 3 2 21 3 4 1
-86 84 -1 10 2 3 3 4 21 3 4 1
-86 83 -1 15 2 3 4 1 21 7 13 1
-86 82 -1 20 2 3 4 3 21 7 13 1
-86 81 -1 25 2 3 4 5 21 7 13 1
-86 80 -1 5 2 6 5 1 21 6 11 2
-86 79 -1 10 2 6 5 2 21 6 11 2
-86 78 -1 15 2 6 5 3 21 6 11 2
-86 77 -1 20 2 6 5 4 21 6 11 2
-86 76 -1 25 2 6 5 5 21 6 11 2
-86 75 -1 5 2 10 5 1 21 9 22 1
-86 74 -1 10 2 10 5 2 21 9 22 1
-86 73 -1 15 2 10 5 4 21 9 22 1
-86 72 -1 20 2 10 5 5 21 9 22 1
-86 71 -1 25 2 10 4 5 20 12 28 2
-86 70 -1 5 2 16 4 2 20 12 29 3
-86 69 -1 10 2 16 4 4 20 12 29 3
-86 68 -1 15 2 16 5 1 20 15 35 2
-86 67 -1 20 2 16 5 3 20 15 35 2
-86 66 -1 25 2 16 5 5 20 15 35 2
-86 65 -1 5 2 23 4 3 20 15 34 1
-86 64 -1 10 2 23 4 5 20 15 34 1
-86 63 -1 15 2 23 5 3 20 14 33 2
-86 62 -1 20 2 23 5 4 20 14 33 2
-86 61 -1 25 2 23 5 5 20 14 33 2
-86 60 -1 5 2 31 5 2 20 13 31 2
-86 59 -1 10 2 31 5 3 20 13 31 2
-86 58 -1 15 2 31 5 4 20 13 31 2
-86 57 -1 20 2 31 5 5 20 13 31 2
-86 56 -1 25 2 31 4 5 19 16 46 2
-86 55 -1 5 1 7 4 4 19 16 45 1
-86 54 -1 10 1 7 5 1 1 3 5 1
-86 53 -1 15 1 7 5 2 1 3 5 1
-86 52 -1 20 1 7 5 3 1 3 5 1
-86 51 -1 25 1 7 5 5 1 3 5 1
-86 50 -1 25 1 15 5 4 1 2 3 1
-86 49 -1 24 1 15 5 3 1 2 3 1
-86 48 -1 23 1 15 5 2 1 2 3 1
-86 47 -1 22 1 15 5 1 1 2 3 1
-86 46 -1 21 1 15 4 1 19 13 39 1
-86 45 -1 25 1 22 4 3 19 13 40 2
-86 44 -1 24 1 22 5 5 36 16 39 2
-86 43 -1 23 1 22 5 3 36 16 39 2
-86 42 -1 22 1 22 5 2 36 16 39 2
-86 41 -1 21 1 22 5 1 36 16 39 2
-86 40 -1 25 1 28 5 4 36 15 37 2
-86 39 -1 24 1 28 5 2 36 15 37 2
-86 38 -1 23 1 28 5 1 36 15 37 2
-86 37 -1 22 1 28 4 4 36 14 33 1
-86 36 -1 21 1 28 4 1 36 14 33 1
-86 35 -1 25 1 32 5 4 36 14 34 2
-86 34 -1 24 1 32 5 2 36 14 34 2
-86 33 -1 23 1 32 5 1 36 14 34 2
-86 32 -1 22 1 32 4 3 36 9 21 3
-86 31 -1 21 1 32 4 1 36 9 21 3
-86 30 -1 25 9 13 4 3 36 9 20 2
-86 29 -1 24 9 13 5 5 35 12 30 1
-86 28 -1 23 9 13 5 3 35 12 30 1
-86 27 -1 22 9 13 5 2 35 12 30 1
-86 26 -1 21 9 13 5 1 35 12 30 1
-86 25 -1 25 9 20 5 5 35 7 17 3
-86 24 -1 24 9 20 5 4 35 7 17 3
-86 23 -1 23 9 20 5 3 35 7 17 3
-86 22 -1 22 9 20 5 2 35 7 17 3
-86 21 -1 21 9 20 5 1 35 7 17 3
-86 20 -1 25 9 14 5 4 35 6 10 1
-86 19 -1 24 9 14 5 2 35 6 10 1
-86 18 -1 23 9 14 5 1 35 6 10 1
-86 17 -1 22 9 14 4 3 35 2 2 1
-86 16 -1 21 9 14 4 1 35 2 2 1
-85 87 -1 16 2 3 1 1 21 4 5 1
-85 86 -1 21 2 3 1 4 21 4 5 1
-85 85 -1 1 2 2 2 1 21 8 17 1
-85 84 -1 6 2 2 1 1 21 7 14 2
-85 83 -1 11 2 2 1 2 21 7 14 2
-85 82 -1 16 2 2 1 3 21 7 14 2
-85 81 -1 21 2 2 1 4 21 7 14 2
-85 80 -1 1 2 5 3 1 21 7 15 3
-85 79 -1 6 2 5 1 1 21 6 12 3
-85 78 -1 11 2 5 1 3 21 6 12 3
-85 77 -1 16 2 5 1 5 21 6 12 3
-85 76 -1 21 2 5 2 3 21 10 25 1
-85 75 -1 1 2 9 3 1 21 10 26 2
-85 74 -1 6 2 9 1 1 21 9 23 2
-85 73 -1 11 2 9 1 2 21 9 23 2
-85 72 -1 16 2 9 1 3 21 9 23 2
-85 71 -1 21 2 9 1 4 21 9 23 2
-85 70 -1 1 2 15 1 1 20 16 37 1
-85 69 -1 6 2 15 1 2 20 16 37 1
-85 68 -1 11 2 15 1 3 20 16 37 1
-85 67 -1 16 2 15 1 4 20 16 37 1
-85 66 -1 21 2 15 1 5 20 16 37 1
-85 65 -1 1 2 22 1 1 20 15 36 3
-85 64 -1 6 2 22 1 3 20 15 36 3
-85 63 -1 11 2 22 1 5 20 15 36 3
-85 62 -1 16 2 22 2 2 2 2 3 1
-85 61 -1 21 2 22 2 4 2 2 3 1
-85 60 -1 1 2 30 3 1 2 2 4 2
-85 59 -1 6 2 30 2 1 2 1 1 1
-85 58 -1 11 2 30 2 3 2 1 1 1
-85 57 -1 16 2 30 1 1 1 4 7 1
-85 56 -1 21 2 30 1 3 1 4 7 1
-85 55 -1 1 1 6 2 1 1 4 8 2
-85 54 -1 6 1 6 2 4 1 4 8 2
-85 53 -1 11 1 6 1 1 1 3 6 2
-85 52 -1 16 1 6 1 2 1 3 6 2
-85 51 -1 21 1 6 1 4 1 3 6 2
-85 50 -1 5 1 14 1 5 1 2 4 2
-85 49 -1 4 1 14 1 3 1 2 4 2
-85 48 -1 3 1 14 1 1 1 2 4 2
-85 47 -1 2 1 14 2 5 1 1 1 1
-85 46 -1 1 1 14 2 3 1 1 1 1
-85 45 -1 5 1 21 2 5 1 1 2 2
-85 44 -1 4 1 21 2 2 1 1 2 2
-85 43 -1 3 1 21 1 5 18 4 8 1
-85 42 -1 2 1 21 1 3 18 4 8 1
-85 41 -1 1 1 21 3 5 18 3 5 1
-85 40 -1 5 1 27 2 5 18 3 6 2
-85 39 -1 4 1 27 2 3 18 3 6 2
-85 38 -1 3 1 27 1 5 36 14 35 3
-85 37 -1 2 1 27 1 4 36 14 35 3
-85 36 -1 1 1 27 1 2 36 14 35 3
-85 35 -1 5 1 31 1 5 36 13 30 1
-85 34 -1 4 1 31 1 4 36 13 30 1
-85 33 -1 3 1 31 1 3 36 13 30 1
-85 32 -1 2 1 31 1 2 36 13 30 1
-85 31 -1 1 1 31 1 1 36 13 30 1
-85 30 -1 5 9 12 1 5 35 12 31 2
-85 29 -1 4 9 12 1 4 35 12 31 2
-85 28 -1 3 9 12 1 3 35 12 31 2
-85 27 -1 2 9 12 1 2 35 12 31 2
-85 26 -1 1 9 12 3 4 35 11 28 1
-85 25 -1 5 9 19 2 5 35 11 29 2
-85 24 -1 4 9 19 1 5 35 7 18 4
-85 23 -1 3 9 19 1 4 35 7 18 4
-85 22 -1 2 9 19 1 2 35 7 18 4
-85 21 -1 1 9 19 3 4 35 6 11 2
-85 20 -1 5 9 26 1 5 35 6 12 3
-85 19 -1 4 9 26 1 4 35 6 12 3
-85 18 -1 3 9 26 1 3 35 6 12 3
-85 17 -1 2 9 26 1 2 35 6 12 3
-85 16 -1 1 9 26 1 1 35 6 12 3
-85 15 -1 5 9 21 2 5 35 1 1 1
-85 14 -1 4 9 21 2 3 35 1 1 1
-84 87 -1 17 2 3 1 2 21 4 5 1
-84 86 -1 22 2 3 1 5 21 4 5 1
-84 85 -1 2 2 2 2 2 21 8 17 1
-84 84 -1 7 2 2 2 4 21 8 17 1
-84 83 -1 12 2 2 3 1 21 7 16 4
-84 82 -1 17 2 2 3 3 21 7 16 4
-84 81 -1 22 2 2 1 5 21 7 14 2
-84 80 -1 2 2 5 3 2 21 7 15 3
-84 79 -1 7 2 5 1 2 21 6 12 3
-84 78 -1 12 2 5 1 4 21 6 12 3
-84 77 -1 17 2 5 2 1 21 10 25 1
-84 76 -1 22 2 5 2 4 21 10 25 1
-84 75 -1 2 2 9 3 2 21 10 26 2
-84 74 -1 7 2 9 2 1 21 9 24 3
-84 73 -1 12 2 9 2 2 21 9 24 3
-84 72 -1 17 2 9 2 4 21 9 24 3
-84 71 -1 22 2 9 1 5 21 9 23 2
-84 70 -1 2 2 15 4 1 21 13 33 1
-84 69 -1 7 2 15 2 1 20 16 38 2
-84 68 -1 12 2 15 2 2 20 16 38 2
-84 67 -1 17 2 15 2 3 20 16 38 2
-84 66 -1 22 2 15 2 4 20 16 38 2
-84 65 -1 2 2 22 1 2 20 15 36 3
-84 64 -1 7 2 22 1 4 20 15 36 3
-84 63 -1 12 2 22 2 1 2 2 3 1
-84 62 -1 17 2 22 2 3 2 2 3 1
-84 61 -1 22 2 22 2 5 2 2 3 1
-84 60 -1 2 2 30 3 2 2 2 4 2
-84 59 -1 7 2 30 2 2 2 1 1 1
-84 58 -1 12 2 30 2 4 2 1 1 1
-84 57 -1 17 2 30 1 2 1 4 7 1
-84 56 -1 22 2 30 1 4 1 4 7 1
-84 55 -1 2 1 6 2 2 1 4 8 2
-84 54 -1 7 1 6 2 5 1 4 8 2
-84 53 -1 12 1 6 3 1 1 7 14 1
-84 52 -1 17 1 6 1 3 1 3 6 2
-84 51 -1 22 1 6 1 5 1 3 6 2
-84 50 -1 10 1 14 1 4 1 2 4 2
-84 49 -1 9 1 14 1 2 1 2 4 2
-84 48 -1 8 1 14 3 3 1 6 11 1
-84 47 -1 7 1 14 2 4 1 1 1 1
-84 46 -1 6 1 14 2 2 1 1 1 1
-84 45 -1 10 1 21 2 4 1 1 2 2
-84 44 -1 9 1 21 2 1 1 1 2 2
-84 43 -1 8 1 21 1 4 18 4 8 1
-84 42 -1 7 1 21 1 2 18 4 8 1
-84 41 -1 6 1 21 3 4 18 3 5 1
-84 40 -1 10 1 27 2 4 18 3 6 2
-84 39 -1 9 1 27 2 2 18 3 6 2
-84 38 -1 8 1 27 2 1 18 3 6 2
-84 37 -1 7 1 27 1 3 36 14 35 3
-84 36 -1 6 1 27 1 1 36 14 35 3
-84 35 -1 10 1 31 2 5 36 13 31 2
-84 34 -1 9 1 31 2 4 36 13 31 2
-84 33 -1 8 1 31 2 3 36 13 31 2
-84 32 -1 7 1 31 2 2 36 13 31 2
-84 31 -1 6 1 31 4 4 35 16 40 1
-84 30 -1 10 9 12 2 5 35 12 32 3
-84 29 -1 9 9 12 2 4 35 12 32 3
-84 28 -1 8 9 12 2 2 35 12 32 3
-84 27 -1 7 9 12 1 1 35 12 31 2
-84 26 -1 6 9 12 3 3 35 11 28 1
-84 25 -1 10 9 19 2 4 35 11 29 2
-84 24 -1 9 9 19 2 2 35 11 29 2
-84 23 -1 8 9 19 1 3 35 7 18 4
-84 22 -1 7 9 19 1 1 35 7 18 4
-84 21 -1 6 9 19 3 3 35 6 11 2
-84 20 -1 10 9 26 2 5 35 6 13 4
-84 19 -1 9 9 26 2 4 35 6 13 4
-84 18 -1 8 9 26 2 2 35 6 13 4
-84 17 -1 7 9 26 2 1 35 6 13 4
-84 16 -1 6 9 26 3 3 35 5 9 4
-84 15 -1 10 9 21 2 4 35 1 1 1
-84 14 -1 9 9 21 2 2 35 1 1 1
-83 87 -1 18 2 3 1 3 21 4 5 1
-83 86 -1 23 2 3 2 3 21 8 18 2
-83 85 -1 3 2 2 2 3 21 8 17 1
-83 84 -1 8 2 2 2 5 21 8 17 1
-83 83 -1 13 2 2 3 2 21 7 16 4
-83 82 -1 18 2 2 3 4 21 7 16 4
-83 81 -1 23 2 2 3 5 21 7 16 4
-83 80 -1 3 2 5 3 3 21 7 15 3
-83 79 -1 8 2 5 3 5 21 7 15 3
-83 78 -1 13 2 5 4 2 21 11 27 1
-83 77 -1 18 2 5 2 2 21 10 25 1
-83 76 -1 23 2 5 2 5 21 10 25 1
-83 75 -1 3 2 9 3 3 21 10 26 2
-83 74 -1 8 2 9 3 5 21 10 26 2
-83 73 -1 13 2 9 2 3 21 9 24 3
-83 72 -1 18 2 9 2 5 21 9 24 3
-83 71 -1 23 2 9 4 3 21 13 34 2
-83 70 -1 3 2 15 4 2 21 13 33 1
-83 69 -1 8 2 15 3 1 20 16 39 3
-83 68 -1 13 2 15 3 2 20 16 39 3
-83 67 -1 18 2 15 3 4 20 16 39 3
-83 66 -1 23 2 15 2 5 20 16 38 2
-83 65 -1 3 2 22 3 1 2 3 6 1
-83 64 -1 8 2 22 3 2 2 3 6 1
-83 63 -1 13 2 22 3 4 2 3 6 1
-83 62 -1 18 2 22 4 1 2 2 5 3
-83 61 -1 23 2 22 4 3 2 2 5 3
-83 60 -1 3 2 30 3 3 2 2 4 2
-83 59 -1 8 2 30 4 1 2 1 2 2
-83 58 -1 13 2 30 4 3 2 1 2 2
-83 57 -1 18 2 30 2 5 2 1 1 1
-83 56 -1 23 2 30 1 5 1 4 7 1
-83 55 -1 3 1 6 2 3 1 4 8 2
-83 54 -1 8 1 6 4 3 1 8 17 1
-83 53 -1 13 1 6 3 2 1 7 14 1
-83 52 -1 18 1 6 3 3 1 7 14 1
-83 51 -1 23 1 6 3 4 1 7 14 1
-83 50 -1 15 1 14 3 5 1 6 11 1
-83 49 -1 14 1 14 3 4 1 6 11 1
-83 48 -1 13 1 14 3 2 1 6 11 1
-83 47 -1 12 1 14 4 5 1 5 9 2
-83 46 -1 11 1 14 2 1 1 1 1 1
-83 45 -1 15 1 21 2 3 1 1 2 2
-83 44 -1 14 1 21 4 5 18 4 9 2
-83 43 -1 13 1 21 4 3 18 4 9 2
-83 42 -1 12 1 21 1 1 18 4 8 1
-83 41 -1 11 1 21 3 3 18 3 5 1
-83 40 -1 15 1 27 4 5 18 3 7 3
-83 39 -1 14 1 27 4 2 18 3 7 3
-83 38 -1 13 1 27 3 5 18 2 3 1
-83 37 -1 12 1 27 3 4 18 2 3 1
-83 36 -1 11 1 27 3 2 18 2 3 1
-83 35 -1 15 1 31 3 5 36 13 32 3
-83 34 -1 14 1 31 3 4 36 13 32 3
-83 33 -1 13 1 31 3 2 36 13 32 3
-83 32 -1 12 1 31 2 1 36 13 31 2
-83 31 -1 11 1 31 4 3 35 16 40 1
-83 30 -1 15 9 12 4 5 35 16 41 2
-83 29 -1 14 9 12 2 3 35 12 32 3
-83 28 -1 13 9 12 2 1 35 12 32 3
-83 27 -1 12 9 12 3 5 35 11 28 1
-83 26 -1 11 9 12 3 2 35 11 28 1
-83 25 -1 15 9 19 2 3 35 11 29 2
-83 24 -1 14 9 19 2 1 35 11 29 2
-83 23 -1 13 9 19 4 3 35 10 25 1
-83 22 -1 12 9 19 3 5 35 6 11 2
-83 21 -1 11 9 19 3 2 35 6 11 2
-83 20 -1 15 9 26 4 5 35 6 14 5
-83 19 -1 14 9 26 2 3 35 6 13 4
-83 18 -1 13 9 26 3 5 35 5 9 4
-83 17 -1 12 9 26 3 4 35 5 9 4
-83 16 -1 11 9 26 3 2 35 5 9 4
-83 15 -1 15 9 21 3 5 35 5 8 3
-83 14 -1 14 9 21 2 1 35 1 1 1
-82 87 -1 19 2 3 2 1 21 8 18 2
-82 86 -1 24 2 3 2 4 21 8 18 2
-82 85 -1 4 2 2 4 1 21 8 19 3
-82 84 -1 9 2 2 4 2 21 8 19 3
-82 83 -1 14 2 2 4 3 21 8 19 3
-82 82 -1 19 2 2 4 4 21 8 19 3
-82 81 -1 24 2 2 4 5 21 8 19 3
-82 80 -1 4 2 5 3 4 21 7 15 3
-82 79 -1 9 2 5 4 1 21 11 27 1
-82 78 -1 14 2 5 4 3 21 11 27 1
-82 77 -1 19 2 5 4 4 21 11 27 1
-82 76 -1 24 2 5 4 5 21 11 27 1
-82 75 -1 4 2 9 3 4 21 10 26 2
-82 74 -1 9 2 9 5 2 21 14 35 1
-82 73 -1 14 2 9 5 4 21 14 35 1
-82 72 -1 19 2 9 4 1 21 13 34 2
-82 71 -1 24 2 9 4 4 21 13 34 2
-82 70 -1 4 2 15 4 3 21 13 33 1
-82 69 -1 9 2 15 4 5 21 13 33 1
-82 68 -1 14 2 15 3 3 20 16 39 3
-82 67 -1 19 2 15 3 5 20 16 39 3
-82 66 -1 24 2 15 5 4 2 4 8 1
-82 65 -1 4 2 22 5 1 2 3 7 2
-82 64 -1 9 2 22 3 3 2 3 6 1
-82 63 -1 14 2 22 3 5 2 3 6 1
-82 62 -1 19 2 22 4 2 2 2 5 3
-82 61 -1 24 2 22 4 4 2 2 5 3
-82 60 -1 4 2 30 3 4 2 2 4 2
-82 59 -1 9 2 30 4 2 2 1 2 2
-82 58 -1 14 2 30 4 4 2 1 2 2
-82 57 -1 19 2 30 4 5 2 1 2 2
-82 56 -1 24 2 30 5 4 2 5 10 1
-82 55 -1 4 1 6 4 1 1 8 17 1
-82 54 -1 9 1 6 4 4 1 8 17 1
-82 53 -1 14 1 6 5 1 1 7 15 2
-82 52 -1 19 1 6 5 3 1 7 15 2
-82 51 -1 24 1 6 3 5 1 7 14 1
-82 50 -1 20 1 14 5 5 1 6 12 2
-82 49 -1 19 1 14 5 3 1 6 12 2
-82 48 -1 18 1 14 3 1 1 6 11 1
-82 47 -1 17 1 14 4 4 1 5 9 2
-82 46 -1 16 1 14 4 2 1 5 9 2
-82 45 -1 20 1 21 5 5 18 8 15 1
-82 44 -1 19 1 21 4 4 18 4 9 2
-82 43 -1 18 1 21 4 2 18 4 9 2
-82 42 -1 17 1 21 4 1 18 4 9 2
-82 41 -1 16 1 21 3 2 18 3 5 1
-82 40 -1 20 1 27 4 4 18 3 7 3
-82 39 -1 19 1 27 4 1 18 3 7 3
-82 38 -1 18 1 27 5 4 18 2 4 2
-82 37 -1 17 1 27 3 3 18 2 3 1
-82 36 -1 16 1 27 3 1 18 2 3 1
-82 35 -1 20 1 31 5 5 18 1 1 1
-82 34 -1 19 1 31 3 3 36 13 32 3
-82 33 -1 18 1 31 3 1 36 13 32 3
-82 32 -1 17 1 31 4 5 35 16 40 1
-82 31 -1 16 1 31 4 2 35 16 40 1
-82 30 -1 20 9 12 4 4 35 16 41 2
-82 29 -1 19 9 12 4 2 35 16 41 2
-82 28 -1 18 9 12 5 5 35 15 38 1
-82 27 -1 17 9 12 5 3 35 15 38 1
-82 26 -1 16 9 12 3 1 35 11 28 1
-82 25 -1 20 9 19 4 5 35 10 25 1
-82 24 -1 19 9 19 4 4 35 10 25 1
-82 23 -1 18 9 19 4 2 35 10 25 1
-82 22 -1 17 9 19 4 1 35 10 25 1
-82 21 -1 16 9 19 3 1 35 6 11 2
-82 20 -1 20 9 26 4 4 35 6 14 5
-82 19 -1 19 9 26 4 2 35 6 14 5
-82 18 -1 18 9 26 5 5 35 5 7 2
-82 17 -1 17 9 26 5 3 35 5 7 2
-82 16 -1 16 9 26 3 1 35 5 9 4
-82 15 -1 20 9 21 3 4 35 5 8 3
-82 14 -1 19 9 21 3 2 35 5 8 3
-81 87 -1 20 2 3 2 2 21 8 18 2
-81 86 -1 25 2 3 2 5 21 8 18 2
-81 85 -1 5 2 2 5 1 21 8 20 4
-81 84 -1 10 2 2 5 2 21 8 20 4
-81 83 -1 15 2 2 5 3 21 8 20 4
-81 82 -1 20 2 2 5 4 21 8 20 4
-81 81 -1 25 2 2 5 5 21 8 20 4
-81 80 -1 5 2 5 5 1 21 11 28 2
-81 79 -1 10 2 5 5 2 21 11 28 2
-81 78 -1 15 2 5 5 3 21 11 28 2
-81 77 -1 20 2 5 5 4 21 11 28 2
-81 76 -1 25 2 5 5 5 21 11 28 2
-81 75 -1 5 2 9 5 1 21 14 35 1
-81 74 -1 10 2 9 5 3 21 14 35 1
-81 73 -1 15 2 9 5 5 21 14 35 1
-81 72 -1 20 2 9 4 2 21 13 34 2
-81 71 -1 25 2 9 4 5 21 13 34 2
-81 70 -1 5 2 15 4 4 21 13 33 1
-81 69 -1 10 2 15 5 1 2 4 8 1
-81 68 -1 15 2 15 5 2 2 4 8 1
-81 67 -1 20 2 15 5 3 2 4 8 1
-81 66 -1 25 2 15 5 5 2 4 8 1
-81 65 -1 5 2 22 5 2 2 3 7 2
-81 64 -1 10 2 22 5 3 2 3 7 2
-81 63 -1 15 2 22 5 4 2 3 7 2
-81 62 -1 20 2 22 5 5 2 3 7 2
-81 61 -1 25 2 22 4 5 2 2 5 3
-81 60 -1 5 2 30 3 5 2 2 4 2
-81 59 -1 10 2 30 5 1 2 5 10 1
-81 58 -1 15 2 30 5 2 2 5 10 1
-81 57 -1 20 2 30 5 3 2 5 10 1
-81 56 -1 25 2 30 5 5 2 5 10 1
-81 55 -1 5 1 6 4 2 1 8 17 1
-81 54 -1 10 1 6 4 5 1 8 17 1
-81 53 -1 15 1 6 5 2 1 7 15 2
-81 52 -1 20 1 6 5 4 1 7 15 2
-81 51 -1 25 1 6 5 5 1 7 15 2
-81 50 -1 25 1 14 5 4 1 6 12 2
-81 49 -1 24 1 14 5 2 1 6 12 2
-81 48 -1 23 1 14 5 1 1 6 12 2
-81 47 -1 22 1 14 4 3 1 5 9 2
-81 46 -1 21 1 14 4 1 1 5 9 2
-81 45 -1 25 1 21 5 4 18 8 15 1
-81 44 -1 24 1 21 5 3 18 8 15 1
-81 43 -1 23 1 21 5 2 18 8 15 1
-81 42 -1 22 1 21 5 1 18 8 15 1
-81 41 -1 21 1 21 3 1 18 3 5 1
-81 40 -1 25 1 27 4 3 18 3 7 3
-81 39 -1 24 1 27 5 5 18 2 4 2
-81 38 -1 23 1 27 5 3 18 2 4 2
-81 37 -1 22 1 27 5 2 18 2 4 2
-81 36 -1 21 1 27 5 1 18 2 4 2
-81 35 -1 25 1 31 5 4 18 1 1 1
-81 34 -1 24 1 31 5 3 18 1 1 1
-81 33 -1 23 1 31 5 2 18 1 1 1
-81 32 -1 22 1 31 5 1 18 1 1 1
-81 31 -1 21 1 31 4 1 35 16 40 1
-81 30 -1 25 9 12 4 3 35 16 41 2
-81 29 -1 24 9 12 4 1 35 16 41 2
-81 28 -1 23 9 12 5 4 35 15 38 1
-81 27 -1 22 9 12 5 2 35 15 38 1
-81 26 -1 21 9 12 5 1 35 15 38 1
-81 25 -1 25 9 19 5 5 35 10 26 2
-81 24 -1 24 9 19 5 4 35 10 26 2
-81 23 -1 23 9 19 5 3 35 10 26 2
-81 22 -1 22 9 19 5 2 35 10 26 2
-81 21 -1 21 9 19 5 1 35 10 26 2
-81 20 -1 25 9 26 4 3 35 6 14 5
-81 19 -1 24 9 26 4 1 35 6 14 5
-81 18 -1 23 9 26 5 4 35 5 7 2
-81 17 -1 22 9 26 5 2 35 5 7 2
-81 16 -1 21 9 26 5 1 35 5 7 2
-81 15 -1 25 9 21 3 3 35 5 8 3
-81 14 -1 24 9 21 3 1 35 5 8 3
-80 92 -1 16 3 30 3 1 22 1 1 1
-80 91 -1 21 3 30 3 3 22 1 1 1
-80 90 -1 1 3 23 1 1 22 1 2 2
-80 89 -1 6 3 23 1 4 22 1 2 2
-80 88 -1 11 3 23 1 5 22 1 2 2
-80 87 -1 16 3 23 2 2 22 5 8 3
-80 86 -1 21 3 23 2 4 22 5 8 3
-80 85 -1 1 2 1 1 1 21 8 21 5
-80 84 -1 6 2 1 1 2 21 8 21 5
-80 83 -1 11 2 1 1 3 21 8 21 5
-80 82 -1 16 2 1 1 5 21 8 21 5
-80 81 -1 21 2 1 2 3 21 12 30 1
-80 80 -1 1 2 4 1 1 21 11 29 3
-80 79 -1 6 2 4 1 2 21 11 29 3
-80 78 -1 11 2 4 1 3 21 11 29 3
-80 77 -1 16 2 4 1 5 21 11 29 3
-80 76 -1 21 2 4 2 3 21 15 37 1
-80 75 -1 1 2 8 1 1 21 14 36 2
-80 74 -1 6 2 8 1 2 21 14 36 2
-80 73 -1 11 2 8 1 3 21 14 36 2
-80 72 -1 16 2 8 1 5 21 14 36 2
-80 71 -1 21 2 8 2 3 3 2 3 1
-80 70 -1 1 2 14 2 1 3 1 1 1
-80 69 -1 6 2 14 2 3 3 1 1 1
-80 68 -1 11 2 14 1 1 2 4 9 2
-80 67 -1 16 2 14 1 2 2 4 9 2
-80 66 -1 21 2 14 1 4 2 4 9 2
-80 65 -1 1 2 21 2 1 2 8 15 1
-80 64 -1 6 2 21 1 1 2 7 13 1
-80 63 -1 11 2 21 1 2 2 7 13 1
-80 62 -1 16 2 21 1 3 2 7 13 1
-80 61 -1 21 2 21 1 4 2 7 13 1
-80 60 -1 1 2 29 2 1 2 6 12 1
-80 59 -1 6 2 29 2 3 2 6 12 1
-80 58 -1 11 2 29 1 1 2 5 11 2
-80 57 -1 16 2 29 1 2 2 5 11 2
-80 56 -1 21 2 29 1 4 2 5 11 2
-80 55 -1 1 1 5 2 1 1 8 18 2
-80 54 -1 6 1 5 2 3 1 8 18 2
-80 53 -1 11 1 5 1 1 1 7 16 3
-80 52 -1 16 1 5 1 2 1 7 16 3
-80 51 -1 21 1 5 1 4 1 7 16 3
-80 50 -1 5 1 13 1 5 1 6 13 3
-80 49 -1 4 1 13 1 3 1 6 13 3
-80 48 -1 3 1 13 1 1 1 6 13 3
-80 47 -1 2 1 13 2 4 1 5 10 1
-80 46 -1 1 1 13 2 2 1 5 10 1
-80 45 -1 5 1 20 1 5 18 8 16 2
-80 44 -1 4 1 20 1 3 18 8 16 2
-80 43 -1 3 1 20 1 1 18 8 16 2
-80 42 -1 2 1 20 2 4 18 7 14 1
-80 41 -1 1 1 20 2 2 18 7 14 1
-80 40 -1 5 1 26 1 5 18 6 12 1
-80 39 -1 4 1 26 1 4 18 6 12 1
-80 38 -1 3 1 26 1 3 18 6 12 1
-80 37 -1 2 1 26 1 1 18 6 12 1
-80 36 -1 1 1 26 2 3 18 5 10 1
-80 35 -1 5 9 7 1 5 18 1 2 2
-80 34 -1 4 9 7 1 3 18 1 2 2
-80 33 -1 3 9 7 1 1 18 1 2 2
-80 32 -1 2 9 7 2 4 17 4 7 1
-80 31 -1 1 9 7 2 2 17 4 7 1
-80 30 -1 5 9 11 2 5 17 3 5 1
-80 29 -1 4 9 11 1 5 35 15 39 2
-80 28 -1 3 9 11 1 4 35 15 39 2
-80 27 -1 2 9 11 1 2 35 15 39 2
-80 26 -1 1 9 11 1 1 35 15 39 2
-80 25 -1 5 9 18 2 5 35 14 36 1
-80 24 -1 4 9 18 1 5 35 10 27 3
-80 23 -1 3 9 18 1 4 35 10 27 3
-80 22 -1 2 9 18 1 2 35 10 27 3
-80 21 -1 1 9 18 3 4 35 9 23 2
-80 20 -1 5 9 25 2 5 35 9 24 3
-80 19 -1 4 9 25 1 5 35 5 6 1
-80 18 -1 3 9 25 1 4 35 5 6 1
-80 17 -1 2 9 25 1 2 35 5 6 1
-80 16 -1 1 9 25 1 1 35 5 6 1
-80 15 -1 5 9 27 2 5 34 8 20 4
-80 14 -1 4 9 27 2 4 34 8 20 4
-80 13 -1 3 9 27 1 5 34 4 6 1
-80 12 -1 2 9 27 1 4 34 4 6 1
-80 11 -1 1 9 27 1 3 34 4 6 1
-80 10 -1 5 9 21 4 5 34 4 7 2
-80 9 -1 4 9 21 4 2 34 4 7 2
-79 92 -1 17 3 30 3 2 22 1 1 1
-79 91 -1 22 3 30 3 4 22 1 1 1
-79 90 -1 2 3 23 1 2 22 1 2 2
-79 89 -1 7 3 23 3 1 22 5 9 4
-79 88 -1 12 3 23 2 1 22 5 8 3
-79 87 -1 17 3 23 2 3 22 5 8 3
-79 86 -1 22 3 23 2 5 22 5 8 3
-79 85 -1 2 2 1 3 1 22 5 10 1
-79 84 -1 7 2 1 3 4 22 5 10 1
-79 83 -1 12 2 1 1 4 21 8 21 5
-79 82 -1 17 2 1 2 1 21 12 30 1
-79 81 -1 22 2 1 2 4 21 12 30 1
-79 80 -1 2 2 4 3 1 21 12 31 2
-79 79 -1 7 2 4 3 4 21 12 31 2
-79 78 -1 12 2 4 1 4 21 11 29 3
-79 77 -1 17 2 4 2 1 21 15 37 1
-79 76 -1 22 2 4 2 4 21 15 37 1
-79 75 -1 2 2 8 3 1 21 15 38 2
-79 74 -1 7 2 8 3 4 21 15 38 2
-79 73 -1 12 2 8 1 4 21 14 36 2
-79 72 -1 17 2 8 2 1 3 2 3 1
-79 71 -1 22 2 8 2 4 3 2 3 1
-79 70 -1 2 2 14 2 2 3 1 1 1
-79 69 -1 7 2 14 2 4 3 1 1 1
-79 68 -1 12 2 14 2 5 3 1 1 1
-79 67 -1 17 2 14 1 3 2 4 9 2
-79 66 -1 22 2 14 1 5 2 4 9 2
-79 65 -1 2 2 21 2 2 2 8 15 1
-79 64 -1 7 2 21 2 4 2 8 15 1
-79 63 -1 12 2 21 3 1 2 7 14 2
-79 62 -1 17 2 21 3 3 2 7 14 2
-79 61 -1 22 2 21 1 5 2 7 13 1
-79 60 -1 2 2 29 2 2 2 6 12 1
-79 59 -1 7 2 29 2 4 2 6 12 1
-79 58 -1 12 2 29 2 5 2 6 12 1
-79 57 -1 17 2 29 1 3 2 5 11 2
-79 56 -1 22 2 29 1 5 2 5 11 2
-79 55 -1 2 1 5 2 2 1 8 18 2
-79 54 -1 7 1 5 2 4 1 8 18 2
-79 53 -1 12 1 5 2 5 1 8 18 2
-79 52 -1 17 1 5 1 3 1 7 16 3
-79 51 -1 22 1 5 1 5 1 7 16 3
-79 50 -1 10 1 13 1 4 1 6 13 3
-79 49 -1 9 1 13 1 2 1 6 13 3
-79 48 -1 8 1 13 2 5 1 5 10 1
-79 47 -1 7 1 13 2 3 1 5 10 1
-79 46 -1 6 1 13 2 1 1 5 10 1
-79 45 -1 10 1 20 1 4 18 8 16 2
-79 44 -1 9 1 20 1 2 18 8 16 2
-79 43 -1 8 1 20 2 5 18 7 14 1
-79 42 -1 7 1 20 2 3 18 7 14 1
-79 41 -1 6 1 20 2 1 18 7 14 1
-79 40 -1 10 1 26 3 5 18 6 13 2
-79 39 -1 9 1 26 3 3 18 6 13 2
-79 38 -1 8 1 26 1 2 18 6 12 1
-79 37 -1 7 1 26 2 5 18 5 10 1
-79 36 -1 6 1 26 2 2 18 5 10 1
-79 35 -1 10 9 7 1 4 18 1 2 2
-79 34 -1 9 9 7 1 2 18 1 2 2
-79 33 -1 8 9 7 2 5 17 4 7 1
-79 32 -1 7 9 7 2 3 17 4 7 1
-79 31 -1 6 9 7 2 1 17 4 7 1
-79 30 -1 10 9 11 2 4 17 3 5 1
-79 29 -1 9 9 11 2 3 17 3 5 1
-79 28 -1 8 9 11 1 3 35 15 39 2
-79 27 -1 7 9 11 3 5 35 14 37 2
-79 26 -1 6 9 11 3 3 35 14 37 2
-79 25 -1 10 9 18 2 4 35 14 36 1
-79 24 -1 9 9 18 2 2 35 14 36 1
-79 23 -1 8 9 18 1 3 35 10 27 3
-79 22 -1 7 9 18 1 1 35 10 27 3
-79 21 -1 6 9 18 3 3 35 9 23 2
-79 20 -1 10 9 25 2 4 35 9 24 3
-79 19 -1 9 9 25 2 3 35 9 24 3
-79 18 -1 8 9 25 1 3 35 5 6 1
-79 17 -1 7 9 25 3 5 34 8 18 2
-79 16 -1 6 9 25 3 3 34 8 18 2
-79 15 -1 10 9 27 3 5 34 8 19 3
-79 14 -1 9 9 27 2 3 34 8 20 4
-79 13 -1 8 9 27 2 2 34 8 20 4
-79 12 -1 7 9 27 2 1 34 8 20 4
-79 11 -1 6 9 27 1 2 34 4 6 1
-79 10 -1 10 9 21 4 4 34 4 7 2
-79 9 -1 9 9 21 4 1 34 4 7 2
-78 92 -1 18 3 30 4 1 22 2 3 1
-78 91 -1 23 3 30 3 5 22 1 1 1
-78 90 -1 3 3 23 1 3 22 1 2 2
-78 89 -1 8 3 23 3 2 22 5 9 4
-78 88 -1 13 3 23 3 3 22 5 9 4
-78 87 -1 18 3 23 3 4 22 5 9 4
-78 86 -1 23 3 23 3 5 22 5 9 4
-78 85 -1 3 2 1 3 2 22 5 10 1
-78 84 -1 8 2 1 3 5 22 5 10 1
-78 83 -1 13 2 1 4 1 21 12 32 3
-78 82 -1 18 2 1 2 2 21 12 30 1
-78 81 -1 23 2 1 2 5 21 12 30 1
-78 80 -1 3 2 4 3 2 21 12 31 2
-78 79 -1 8 2 4 3 5 21 12 31 2
-78 78 -1 13 2 4 4 1 21 15 39 3
-78 77 -1 18 2 4 2 2 21 15 37 1
-78 76 -1 23 2 4 2 5 21 15 37 1
-78 75 -1 3 2 8 3 2 21 15 38 2
-78 74 -1 8 2 8 3 5 21 15 38 2
-78 73 -1 13 2 8 4 1 3 2 4 2
-78 72 -1 18 2 8 2 2 3 2 3 1
-78 71 -1 23 2 8 2 5 3 2 3 1
-78 70 -1 3 2 14 3 1 3 1 2 2
-78 69 -1 8 2 14 3 2 3 1 2 2
-78 68 -1 13 2 14 3 3 3 1 2 2
-78 67 -1 18 2 14 3 5 3 1 2 2
-78 66 -1 23 2 14 4 3 3 5 9 1
-78 65 -1 3 2 21 2 3 2 8 15 1
-78 64 -1 8 2 21 2 5 2 8 15 1
-78 63 -1 13 2 21 3 2 2 7 14 2
-78 62 -1 18 2 21 3 4 2 7 14 2
-78 61 -1 23 2 21 3 5 2 7 14 2
-78 60 -1 3 2 29 3 1 2 10 18 1
-78 59 -1 8 2 29 3 2 2 10 18 1
-78 58 -1 13 2 29 3 4 2 10 18 1
-78 57 -1 18 2 29 4 1 2 9 17 1
-78 56 -1 23 2 29 4 3 2 9 17 1
-78 55 -1 3 1 5 3 1 1 12 23 1
-78 54 -1 8 1 5 3 2 1 12 23 1
-78 53 -1 13 1 5 3 4 1 12 23 1
-78 52 -1 18 1 5 4 1 1 11 22 1
-78 51 -1 23 1 5 4 3 1 11 22 1
-78 50 -1 15 1 13 4 5 1 10 21 1
-78 49 -1 14 1 13 4 2 1 10 21 1
-78 48 -1 13 1 13 3 5 1 9 19 1
-78 47 -1 12 1 13 3 4 1 9 19 1
-78 46 -1 11 1 13 3 2 1 9 19 1
-78 45 -1 15 1 20 4 5 18 12 22 1
-78 44 -1 14 1 20 4 2 18 12 22 1
-78 43 -1 13 1 20 3 5 18 11 20 1
-78 42 -1 12 1 20 3 4 18 11 20 1
-78 41 -1 11 1 20 3 2 18 11 20 1
-78 40 -1 15 1 26 3 4 18 6 13 2
-78 39 -1 14 1 26 3 2 18 6 13 2
-78 38 -1 13 1 26 3 1 18 6 13 2
-78 37 -1 12 1 26 2 4 18 5 10 1
-78 36 -1 11 1 26 2 1 18 5 10 1
-78 35 -1 15 9 7 4 5 17 8 14 1
-78 34 -1 14 9 7 3 5 17 4 8 2
-78 33 -1 13 9 7 3 4 17 4 8 2
-78 32 -1 12 9 7 3 2 17 4 8 2
-78 31 -1 11 9 7 3 1 17 4 8 2
-78 30 -1 15 9 11 4 5 17 3 6 2
-78 29 -1 14 9 11 2 2 17 3 5 1
-78 28 -1 13 9 11 2 1 17 3 5 1
-78 27 -1 12 9 11 3 4 35 14 37 2
-78 26 -1 11 9 11 3 2 35 14 37 2
-78 25 -1 15 9 18 2 3 35 14 36 1
-78 24 -1 14 9 18 2 1 35 14 36 1
-78 23 -1 13 9 18 4 3 35 13 35 3
-78 22 -1 12 9 18 3 5 35 9 23 2
-78 21 -1 11 9 18 3 2 35 9 23 2
-78 20 -1 15 9 25 4 5 35 9 22 1
-78 19 -1 14 9 25 2 2 35 9 24 3
-78 18 -1 13 9 25 2 1 35 9 24 3
-78 17 -1 12 9 25 3 4 34 8 18 2
-78 16 -1 11 9 25 3 2 34 8 18 2
-78 15 -1 15 9 27 3 4 34 8 19 3
-78 14 -1 14 9 27 3 3 34 8 19 3
-78 13 -1 13 9 27 3 2 34 8 19 3
-78 12 -1 12 9 27 3 1 34 8 19 3
-78 11 -1 11 9 27 1 1 34 4 6 1
-78 10 -1 15 9 21 4 3 34 4 7 2
-78 9 -1 14 9 21 5 3 34 3 5 1
-77 92 -1 19 3 30 4 2 22 2 3 1
-77 91 -1 24 3 30 4 4 22 2 3 1
-77 90 -1 4 3 23 5 1 22 6 12 1
-77 89 -1 9 3 23 5 3 22 6 12 1
-77 88 -1 14 3 23 4 1 22 5 11 2
-77 87 -1 19 3 23 4 2 22 5 11 2
-77 86 -1 24 3 23 4 4 22 5 11 2
-77 85 -1 4 2 1 3 3 22 5 10 1
-77 84 -1 9 2 1 5 2 22 9 21 1
-77 83 -1 14 2 1 5 4 22 9 21 1
-77 82 -1 19 2 1 4 2 21 12 32 3
-77 81 -1 24 2 1 4 4 21 12 32 3
-77 80 -1 4 2 4 3 3 21 12 31 2
-77 79 -1 9 2 4 5 2 21 16 40 1
-77 78 -1 14 2 4 5 4 21 16 40 1
-77 77 -1 19 2 4 4 2 21 15 39 3
-77 76 -1 24 2 4 4 4 21 15 39 3
-77 75 -1 4 2 8 3 3 21 15 38 2
-77 74 -1 9 2 8 5 2 3 3 5 1
-77 73 -1 14 2 8 4 2 3 2 4 2
-77 72 -1 19 2 8 4 3 3 2 4 2
-77 71 -1 24 2 8 4 4 3 2 4 2
-77 70 -1 4 2 14 5 1 3 6 10 1
-77 69 -1 9 2 14 5 3 3 6 10 1
-77 68 -1 14 2 14 3 4 3 1 2 2
-77 67 -1 19 2 14 4 1 3 5 9 1
-77 66 -1 24 2 14 4 4 3 5 9 1
-77 65 -1 4 2 21 4 1 2 8 16 2
-77 64 -1 9 2 21 4 3 2 8 16 2
-77 63 -1 14 2 21 4 5 2 8 16 2
-77 62 -1 19 2 21 5 2 2 11 20 1
-77 61 -1 24 2 21 5 4 2 11 20 1
-77 60 -1 4 2 29 5 1 2 10 19 2
-77 59 -1 9 2 29 3 3 2 10 18 1
-77 58 -1 14 2 29 3 5 2 10 18 1
-77 57 -1 19 2 29 4 2 2 9 17 1
-77 56 -1 24 2 29 4 4 2 9 17 1
-77 55 -1 4 1 5 5 1 1 12 24 2
-77 54 -1 9 1 5 3 3 1 12 23 1
-77 53 -1 14 1 5 3 5 1 12 23 1
-77 52 -1 19 1 5 4 2 1 11 22 1
-77 51 -1 24 1 5 4 4 1 11 22 1
-77 50 -1 20 1 13 4 4 1 10 21 1
-77 49 -1 19 1 13 4 1 1 10 21 1
-77 48 -1 18 1 13 5 4 1 9 20 2
-77 47 -1 17 1 13 3 3 1 9 19 1
-77 46 -1 16 1 13 3 1 1 9 19 1
-77 45 -1 20 1 20 4 4 18 12 22 1
-77 44 -1 19 1 20 4 1 18 12 22 1
-77 43 -1 18 1 20 5 4 18 11 21 2
-77 42 -1 17 1 20 3 3 18 11 20 1
-77 41 -1 16 1 20 3 1 18 11 20 1
-77 40 -1 20 1 26 5 5 18 10 18 1
-77 39 -1 19 1 26 5 3 18 10 18 1
-77 38 -1 18 1 26 4 5 18 5 11 2
-77 37 -1 17 1 26 4 4 18 5 11 2
-77 36 -1 16 1 26 4 2 18 5 11 2
-77 35 -1 20 9 7 4 4 17 8 14 1
-77 34 -1 19 9 7 4 2 17 8 14 1
-77 33 -1 18 9 7 3 3 17 4 8 2
-77 32 -1 17 9 7 5 4 17 7 12 1
-77 31 -1 16 9 7 5 2 17 7 12 1
-77 30 -1 20 9 11 4 4 17 3 6 2
-77 29 -1 19 9 11 4 2 17 3 6 2
-77 28 -1 18 9 11 4 1 17 3 6 2
-77 27 -1 17 9 11 5 3 17 2 3 1
-77 26 -1 16 9 11 3 1 35 14 37 2
-77 25 -1 20 9 18 4 5 35 13 35 3
-77 24 -1 19 9 18 4 4 35 13 35 3
-77 23 -1 18 9 18 4 2 35 13 35 3
-77 22 -1 17 9 18 4 1 35 13 35 3
-77 21 -1 16 9 18 3 1 35 9 23 2
-77 20 -1 20 9 25 4 4 35 9 22 1
-77 19 -1 19 9 25 4 2 35 9 22 1
-77 18 -1 18 9 25 5 5 34 12 30 2
-77 17 -1 17 9 25 5 3 34 12 30 2
-77 16 -1 16 9 25 3 1 34 8 18 2
-77 15 -1 20 9 27 4 5 34 8 17 1
-77 14 -1 19 9 27 4 3 34 8 17 1
-77 13 -1 18 9 27 4 1 34 8 17 1
-77 12 -1 17 9 27 5 4 34 7 16 3
-77 11 -1 16 9 27 5 2 34 7 16 3
-77 10 -1 20 9 21 5 5 34 3 5 1
-77 9 -1 19 9 21 5 2 34 3 5 1
-76 92 -1 20 3 30 4 3 22 2 3 1
-76 91 -1 25 3 30 4 5 22 2 3 1
-76 90 -1 5 3 23 5 2 22 6 12 1
-76 89 -1 10 3 23 5 4 22 6 12 1
-76 88 -1 15 3 23 5 5 22 6 12 1
-76 87 -1 20 3 23 4 3 22 5 11 2
-76 86 -1 25 3 23 4 5 22 5 11 2
-76 85 -1 5 2 1 5 1 22 9 21 1
-76 84 -1 10 2 1 5 3 22 9 21 1
-76 83 -1 15 2 1 5 5 22 9 21 1
-76 82 -1 20 2 1 4 3 21 12 32 3
-76 81 -1 25 2 1 4 5 21 12 32 3
-76 80 -1 5 2 4 5 1 21 16 40 1
-76 79 -1 10 2 4 5 3 21 16 40 1
-76 78 -1 15 2 4 5 5 21 16 40 1
-76 77 -1 20 2 4 4 3 21 15 39 3
-76 76 -1 25 2 4 4 5 21 15 39 3
-76 75 -1 5 2 8 5 1 3 3 5 1
-76 74 -1 10 2 8 5 3 3 3 5 1
-76 73 -1 15 2 8 5 4 3 3 5 1
-76 72 -1 20 2 8 5 5 3 3 5 1
-76 71 -1 25 2 8 4 5 3 2 4 2
-76 70 -1 5 2 14 5 2 3 6 10 1
-76 69 -1 10 2 14 5 4 3 6 10 1
-76 68 -1 15 2 14 5 5 3 6 10 1
-76 67 -1 20 2 14 4 2 3 5 9 1
-76 66 -1 25 2 14 4 5 3 5 9 1
-76 65 -1 5 2 21 4 2 2 8 16 2
-76 64 -1 10 2 21 4 4 2 8 16 2
-76 63 -1 15 2 21 5 1 2 11 20 1
-76 62 -1 20 2 21 5 3 2 11 20 1
-76 61 -1 25 2 21 5 5 2 11 20 1
-76 60 -1 5 2 29 5 2 2 10 19 2
-76 59 -1 10 2 29 5 3 2 10 19 2
-76 58 -1 15 2 29 5 4 2 10 19 2
-76 57 -1 20 2 29 5 5 2 10 19 2
-76 56 -1 25 2 29 4 5 2 9 17 1
-76 55 -1 5 1 5 5 2 1 12 24 2
-76 54 -1 10 1 5 5 3 1 12 24 2
-76 53 -1 15 1 5 5 4 1 12 24 2
-76 52 -1 20 1 5 5 5 1 12 24 2
-76 51 -1 25 1 5 4 5 1 11 22 1
-76 50 -1 25 1 13 4 3 1 10 21 1
-76 49 -1 24 1 13 5 5 1 9 20 2
-76 48 -1 23 1 13 5 3 1 9 20 2
-76 47 -1 22 1 13 5 2 1 9 20 2
-76 46 -1 21 1 13 5 1 1 9 20 2
-76 45 -1 25 1 20 4 3 18 12 22 1
-76 44 -1 24 1 20 5 5 18 11 21 2
-76 43 -1 23 1 20 5 3 18 11 21 2
-76 42 -1 22 1 20 5 2 18 11 21 2
-76 41 -1 21 1 20 5 1 18 11 21 2
-76 40 -1 25 1 26 5 4 18 10 18 1
-76 39 -1 24 1 26 5 2 18 10 18 1
-76 38 -1 23 1 26 5 1 18 10 18 1
-76 37 -1 22 1 26 4 3 18 5 11 2
-76 36 -1 21 1 26 4 1 18 5 11 2
-76 35 -1 25 9 7 4 3 17 8 14 1
-76 34 -1 24 9 7 4 1 17 8 14 1
-76 33 -1 23 9 7 5 5 17 7 12 1
-76 32 -1 22 9 7 5 3 17 7 12 1
-76 31 -1 21 9 7 5 1 17 7 12 1
-76 30 -1 25 9 11 4 3 17 3 6 2
-76 29 -1 24 9 11 5 5 17 2 3 1
-76 28 -1 23 9 11 5 4 17 2 3 1
-76 27 -1 22 9 11 5 2 17 2 3 1
-76 26 -1 21 9 11 5 1 17 2 3 1
-76 25 -1 25 9 18 5 5 35 13 34 2
-76 24 -1 24 9 18 5 4 35 13 34 2
-76 23 -1 23 9 18 5 3 35 13 34 2
-76 22 -1 22 9 18 5 2 35 13 34 2
-76 21 -1 21 9 18 5 1 35 13 34 2
-76 20 -1 25 9 25 4 3 35 9 22 1
-76 19 -1 24 9 25 4 1 35 9 22 1
-76 18 -1 23 9 25 5 4 34 12 30 2
-76 17 -1 22 9 25 5 2 34 12 30 2
-76 16 -1 21 9 25 5 1 34 12 30 2
-76 15 -1 25 9 27 4 4 34 8 17 1
-76 14 -1 24 9 27 4 2 34 8 17 1
-76 13 -1 23 9 27 5 5 34 7 16 3
-76 12 -1 22 9 27 5 3 34 7 16 3
-76 11 -1 21 9 27 5 1 34 7 16 3
-76 10 -1 25 9 21 5 4 34 3 5 1
-76 9 -1 24 9 21 5 1 34 3 5 1
-75 95 -1 1 3 19 1 1 22 3 4 1
-75 94 -1 6 3 19 1 2 22 3 4 1
-75 93 -1 11 3 19 1 3 22 3 4 1
-75 92 -1 16 3 19 1 4 22 3 4 1
-75 91 -1 21 3 19 1 5 22 3 4 1
-75 90 -1 1 3 22 1 1 22 6 13 2
-75 89 -1 6 3 22 1 2 22 6 13 2
-75 88 -1 11 3 22 1 3 22 6 13 2
-75 87 -1 16 3 22 1 4 22 6 13 2
-75 86 -1 21 3 22 3 2 22 10 23 1
-75 85 -1 1 3 26 1 1 22 9 22 2
-75 84 -1 6 3 26 1 2 22 9 22 2
-75 83 -1 11 3 26 1 3 22 9 22 2
-75 82 -1 16 3 26 1 5 22 9 22 2
-75 81 -1 21 3 26 2 3 22 13 31 1
-75 80 -1 1 3 29 3 1 22 13 32 2
-75 79 -1 6 3 29 1 1 21 16 41 2
-75 78 -1 11 3 29 1 3 21 16 41 2
-75 77 -1 16 3 29 1 5 21 16 41 2
-75 76 -1 21 3 29 2 2 3 4 7 1
-75 75 -1 1 2 7 1 1 3 3 6 2
-75 74 -1 6 2 7 1 2 3 3 6 2
-75 73 -1 11 2 7 1 4 3 3 6 2
-75 72 -1 16 2 7 2 1 3 7 12 1
-75 71 -1 21 2 7 2 3 3 7 12 1
-75 70 -1 1 2 13 1 1 3 6 11 2
-75 69 -1 6 2 13 1 3 3 6 11 2
-75 68 -1 11 2 13 1 5 3 6 11 2
-75 67 -1 16 2 13 2 2 3 9 15 1
-75 66 -1 21 2 13 2 4 3 9 15 1
-75 65 -1 1 2 20 3 1 3 9 16 2
-75 64 -1 6 2 20 2 1 2 12 22 1
-75 63 -1 11 2 20 2 3 2 12 22 1
-75 62 -1 16 2 20 1 1 2 11 21 2
-75 61 -1 21 2 20 1 3 2 11 21 2
-75 60 -1 1 2 28 2 1 2 15 27 1
-75 59 -1 6 2 28 1 1 2 14 25 1
-75 58 -1 11 2 28 1 2 2 14 25 1
-75 57 -1 16 2 28 1 4 2 14 25 1
-75 56 -1 21 2 28 4 1 2 13 23 1
-75 55 -1 1 1 4 3 1 2 13 24 2
-75 54 -1 6 1 4 2 1 1 16 28 1
-75 53 -1 11 1 4 2 3 1 16 28 1
-75 52 -1 16 1 4 1 1 1 15 27 1
-75 51 -1 21 1 4 1 3 1 15 27 1
-75 50 -1 5 1 12 2 5 1 14 26 1
-75 49 -1 4 1 12 2 2 1 14 26 1
-75 48 -1 3 1 12 1 5 1 13 25 1
-75 47 -1 2 1 12 1 2 1 13 25 1
-75 46 -1 1 1 12 3 4 18 16 28 1
-75 45 -1 5 1 19 4 5 18 16 29 2
-75 44 -1 4 1 19 1 5 18 15 26 1
-75 43 -1 3 1 19 1 3 18 15 26 1
-75 42 -1 2 1 19 1 1 18 15 26 1
-75 41 -1 1 1 19 2 3 18 14 24 1
-75 40 -1 5 1 25 2 5 18 10 19 2
-75 39 -1 4 1 25 2 2 18 10 19 2
-75 38 -1 3 1 25 1 5 18 9 17 1
-75 37 -1 2 1 25 1 2 18 9 17 1
-75 36 -1 1 1 25 3 4 17 12 21 1
-75 35 -1 5 9 6 2 5 17 12 22 2
-75 34 -1 4 9 6 2 3 17 12 22 2
-75 33 -1 3 9 6 1 5 17 7 13 2
-75 32 -1 2 9 6 1 4 17 7 13 2
-75 31 -1 1 9 6 1 2 17 7 13 2
-75 30 -1 5 9 10 3 5 17 6 11 1
-75 29 -1 4 9 10 1 5 17 2 4 2
-75 28 -1 3 9 10 1 3 17 2 4 2
-75 27 -1 2 9 10 1 1 17 2 4 2
-75 26 -1 1 9 10 2 3 17 1 2 2
-75 25 -1 5 9 17 2 5 17 1 1 1
-75 24 -1 4 9 17 1 5 35 13 33 1
-75 23 -1 3 9 17 1 4 35 13 33 1
-75 22 -1 2 9 17 1 2 35 13 33 1
-75 21 -1 1 9 17 3 4 34 16 39 1
-75 20 -1 5 9 24 2 5 34 16 40 2
-75 19 -1 4 9 24 1 5 34 12 29 1
-75 18 -1 3 9 24 1 4 34 12 29 1
-75 17 -1 2 9 24 1 2 34 12 29 1
-75 16 -1 1 9 24 1 1 34 12 29 1
-75 15 -1 5 9 30 3 5 34 11 27 2
-75 14 -1 4 9 30 1 5 34 7 15 2
-75 13 -1 3 9 30 1 4 34 7 15 2
-75 12 -1 2 9 30 1 3 34 7 15 2
-75 11 -1 1 9 30 1 2 34 7 15 2
-75 10 -1 5 9 31 1 5 34 2 4 3
-75 9 -1 4 9 31 1 4 34 2 4 3
-75 8 -1 3 9 31 1 3 34 2 4 3
-75 7 -1 2 9 31 1 2 34 2 4 3
-75 6 -1 1 9 31 1 1 34 2 4 3
-74 95 -1 2 3 19 2 1 22 3 5 2
-74 94 -1 7 3 19 2 2 22 3 5 2
-74 93 -1 12 3 19 2 4 22 3 5 2
-74 92 -1 17 3 19 3 1 22 7 15 1
-74 91 -1 22 3 19 3 3 22 7 15 1
-74 90 -1 2 3 22 2 1 22 6 14 3
-74 89 -1 7 3 22 2 2 22 6 14 3
-74 88 -1 12 3 22 2 4 22 6 14 3
-74 87 -1 17 3 22 1 5 22 6 13 2
-74 86 -1 22 3 22 3 3 22 10 23 1
-74 85 -1 2 3 26 3 1 22 10 24 2
-74 84 -1 7 3 26 3 3 22 10 24 2
-74 83 -1 12 3 26 1 4 22 9 22 2
-74 82 -1 17 3 26 2 1 22 13 31 1
-74 81 -1 22 3 26 2 4 22 13 31 1
-74 80 -1 2 3 29 3 2 22 13 32 2
-74 79 -1 7 3 29 1 2 21 16 41 2
-74 78 -1 12 3 29 1 4 21 16 41 2
-74 77 -1 17 3 29 2 1 3 4 7 1
-74 76 -1 22 3 29 2 3 3 4 7 1
-74 75 -1 2 2 7 3 1 3 4 8 2
-74 74 -1 7 2 7 1 3 3 3 6 2
-74 73 -1 12 2 7 1 5 3 3 6 2
-74 72 -1 17 2 7 2 2 3 7 12 1
-74 71 -1 22 2 7 2 4 3 7 12 1
-74 70 -1 2 2 13 1 2 3 6 11 2
-74 69 -1 7 2 13 1 4 3 6 11 2
-74 68 -1 12 2 13 2 1 3 9 15 1
-74 67 -1 17 2 13 2 3 3 9 15 1
-74 66 -1 22 2 13 2 5 3 9 15 1
-74 65 -1 2 2 20 3 2 3 9 16 2
-74 64 -1 7 2 20 2 2 2 12 22 1
-74 63 -1 12 2 20 2 4 2 12 22 1
-74 62 -1 17 2 20 1 2 2 11 21 2
-74 61 -1 22 2 20 1 4 2 11 21 2
-74 60 -1 2 2 28 2 2 2 15 27 1
-74 59 -1 7 2 28 2 4 2 15 27 1
-74 58 -1 12 2 28 1 3 2 14 25 1
-74 57 -1 17 2 28 1 5 2 14 25 1
-74 56 -1 22 2 28 4 2 2 13 23 1
-74 55 -1 2 1 4 3 2 2 13 24 2
-74 54 -1 7 1 4 2 2 1 16 28 1
-74 53 -1 12 1 4 2 4 1 16 28 1
-74 52 -1 17 1 4 1 2 1 15 27 1
-74 51 -1 22 1 4 1 4 1 15 27 1
-74 50 -1 10 1 12 2 4 1 14 26 1
-74 49 -1 9 1 12 2 1 1 14 26 1
-74 48 -1 8 1 12 1 4 1 13 25 1
-74 47 -1 7 1 12 1 1 1 13 25 1
-74 46 -1 6 1 12 3 3 18 16 28 1
-74 45 -1 10 1 19 4 4 18 16 29 2
-74 44 -1 9 1 19 1 4 18 15 26 1
-74 43 -1 8 1 19 1 2 18 15 26 1
-74 42 -1 7 1 19 2 5 18 14 24 1
-74 41 -1 6 1 19 2 2 18 14 24 1
-74 40 -1 10 1 25 2 4 18 10 19 2
-74 39 -1 9 1 25 2 1 18 10 19 2
-74 38 -1 8 1 25 1 4 18 9 17 1
-74 37 -1 7 1 25 1 1 18 9 17 1
-74 36 -1 6 1 25 3 3 17 12 21 1
-74 35 -1 10 9 6 2 4 17 12 22 2
-74 34 -1 9 9 6 2 2 17 12 22 2
-74 33 -1 8 9 6 2 1 17 12 22 2
-74 32 -1 7 9 6 1 3 17 7 13 2
-74 31 -1 6 9 6 1 1 17 7 13 2
-74 30 -1 10 9 10 3 4 17 6 11 1
-74 29 -1 9 9 10 1 4 17 2 4 2
-74 28 -1 8 9 10 1 2 17 2 4 2
-74 27 -1 7 9 10 2 5 17 1 2 2
-74 26 -1 6 9 10 2 2 17 1 2 2
-74 25 -1 10 9 17 2 4 17 1 1 1
-74 24 -1 9 9 17 2 1 17 1 1 1
-74 23 -1 8 9 17 1 3 35 13 33 1
-74 22 -1 7 9 17 1 1 35 13 33 1
-74 21 -1 6 9 17 3 3 34 16 39 1
-74 20 -1 10 9 24 2 4 34 16 40 2
-74 19 -1 9 9 24 2 2 34 16 40 2
-74 18 -1 8 9 24 1 3 34 12 29 1
-74 17 -1 7 9 24 3 4 34 11 28 3
-74 16 -1 6 9 24 3 2 34 11 28 3
-74 15 -1 10 9 30 3 4 34 11 27 2
-74 14 -1 9 9 30 2 5 34 7 14 1
-74 13 -1 8 9 30 2 4 34 7 14 1
-74 12 -1 7 9 30 2 2 34 7 14 1
-74 11 -1 6 9 30 1 1 34 7 15 2
-74 10 -1 10 9 31 3 5 34 6 13 3
-74 9 -1 9 9 31 3 3 34 6 13 3
-74 8 -1 8 9 31 2 5 34 2 3 2
-74 7 -1 7 9 31 2 4 34 2 3 2
-74 6 -1 6 9 31 2 2 34 2 3 2
-73 95 -1 3 3 19 4 1 22 3 6 3
-73 94 -1 8 3 19 2 3 22 3 5 2
-73 93 -1 13 3 19 2 5 22 3 5 2
-73 92 -1 18 3 19 3 2 22 7 15 1
-73 91 -1 23 3 19 3 4 22 7 15 1
-73 90 -1 3 3 22 4 1 22 7 16 2
-73 89 -1 8 3 22 2 3 22 6 14 3
-73 88 -1 13 3 22 2 5 22 6 14 3
-73 87 -1 18 3 22 3 1 22 10 23 1
-73 86 -1 23 3 22 3 4 22 10 23 1
-73 85 -1 3 3 26 3 2 22 10 24 2
-73 84 -1 8 3 26 3 4 22 10 24 2
-73 83 -1 13 3 26 3 5 22 10 24 2
-73 82 -1 18 3 26 2 2 22 13 31 1
-73 81 -1 23 3 26 2 5 22 13 31 1
-73 80 -1 3 3 29 3 3 22 13 32 2
-73 79 -1 8 3 29 3 5 22 13 32 2
-73 78 -1 13 3 29 4 2 4 1 1 1
-73 77 -1 18 3 29 4 4 4 1 1 1
-73 76 -1 23 3 29 2 4 3 4 7 1
-73 75 -1 3 2 7 3 2 3 4 8 2
-73 74 -1 8 2 7 3 4 3 4 8 2
-73 73 -1 13 2 7 5 3 3 8 14 1
-73 72 -1 18 2 7 4 1 3 7 13 2
-73 71 -1 23 2 7 2 5 3 7 12 1
-73 70 -1 3 2 13 4 1 3 11 19 1
-73 69 -1 8 2 13 3 1 3 10 17 1
-73 68 -1 13 2 13 3 2 3 10 17 1
-73 67 -1 18 2 13 3 3 3 10 17 1
-73 66 -1 23 2 13 3 4 3 10 17 1
-73 65 -1 3 2 20 3 3 3 9 16 2
-73 64 -1 8 2 20 3 5 3 9 16 2
-73 63 -1 13 2 20 2 5 2 12 22 1
-73 62 -1 18 2 20 4 1 2 16 29 1
-73 61 -1 23 2 20 1 5 2 11 21 2
-73 60 -1 3 2 28 2 3 2 15 27 1
-73 59 -1 8 2 28 2 5 2 15 27 1
-73 58 -1 13 2 28 3 1 2 14 26 2
-73 57 -1 18 2 28 3 3 2 14 26 2
-73 56 -1 23 2 28 4 3 2 13 23 1
-73 55 -1 3 1 4 3 3 2 13 24 2
-73 54 -1 8 1 4 3 5 2 13 24 2
-73 53 -1 13 1 4 2 5 1 16 28 1
-73 52 -1 18 1 4 4 1 1 19 33 1
-73 51 -1 23 1 4 1 5 1 15 27 1
-73 50 -1 15 1 12 2 3 1 14 26 1
-73 49 -1 14 1 12 4 3 1 18 31 1
-73 48 -1 13 1 12 1 3 1 13 25 1
-73 47 -1 12 1 12 3 5 18 16 28 1
-73 46 -1 11 1 12 3 2 18 16 28 1
-73 45 -1 15 1 19 4 3 18 16 29 2
-73 44 -1 14 1 19 3 5 18 15 27 2
-73 43 -1 13 1 19 3 2 18 15 27 2
-73 42 -1 12 1 19 2 4 18 14 24 1
-73 41 -1 11 1 19 2 1 18 14 24 1
-73 40 -1 15 1 25 2 3 18 10 19 2
-73 39 -1 14 1 25 4 3 18 13 23 1
-73 38 -1 13 1 25 1 3 18 9 17 1
-73 37 -1 12 1 25 3 5 17 12 21 1
-73 36 -1 11 1 25 3 2 17 12 21 1
-73 35 -1 15 9 6 3 5 17 11 19 1
-73 34 -1 14 9 6 3 4 17 11 19 1
-73 33 -1 13 9 6 3 3 17 11 19 1
-73 32 -1 12 9 6 3 1 17 11 19 1
-73 31 -1 11 9 6 4 3 17 10 17 1
-73 30 -1 15 9 10 3 3 17 6 11 1
-73 29 -1 14 9 10 3 2 17 6 11 1
-73 28 -1 13 9 10 3 1 17 6 11 1
-73 27 -1 12 9 10 2 4 17 1 2 2
-73 26 -1 11 9 10 2 1 17 1 2 2
-73 25 -1 15 9 17 2 3 17 1 1 1
-73 24 -1 14 9 17 4 5 16 4 8 2
-73 23 -1 13 9 17 4 3 16 4 8 2
-73 22 -1 12 9 17 3 5 34 16 39 1
-73 21 -1 11 9 17 3 2 34 16 39 1
-73 20 -1 15 9 24 2 3 34 16 40 2
-73 19 -1 14 9 24 2 1 34 16 40 2
-73 18 -1 13 9 24 3 5 34 11 28 3
-73 17 -1 12 9 24 3 3 34 11 28 3
-73 16 -1 11 9 24 3 1 34 11 28 3
-73 15 -1 15 9 30 3 3 34 11 27 2
-73 14 -1 14 9 30 3 1 34 11 27 2
-73 13 -1 13 9 30 2 3 34 7 14 1
-73 12 -1 12 9 30 2 1 34 7 14 1
-73 11 -1 11 9 30 4 3 34 6 11 1
-73 10 -1 15 9 31 3 4 34 6 13 3
-73 9 -1 14 9 31 3 2 34 6 13 3
-73 8 -1 13 9 31 4 5 34 2 2 1
-73 7 -1 12 9 31 2 3 34 2 3 2
-73 6 -1 11 9 31 2 1 34 2 3 2
-72 95 -1 4 3 19 4 2 22 3 6 3
-72 94 -1 9 3 19 4 4 22 3 6 3
-72 93 -1 14 3 19 5 1 22 7 17 3
-72 92 -1 19 3 19 5 3 22 7 17 3
-72 91 -1 24 3 19 3 5 22 7 15 1
-72 90 -1 4 3 22 4 2 22 7 16 2
-72 89 -1 9 3 22 4 4 22 7 16 2
-72 88 -1 14 3 22 5 1 22 11 26 1
-72 87 -1 19 3 22 5 3 22 11 26 1
-72 86 -1 24 3 22 3 5 22 10 23 1
-72 85 -1 4 3 26 4 1 22 10 25 3
-72 84 -1 9 3 26 4 3 22 10 25 3
-72 83 -1 14 3 26 4 5 22 10 25 3
-72 82 -1 19 3 26 5 2 22 14 33 1
-72 81 -1 24 3 26 5 4 22 14 33 1
-72 80 -1 4 3 29 3 4 22 13 32 2
-72 79 -1 9 3 29 4 1 4 1 1 1
-72 78 -1 14 3 29 4 3 4 1 1 1
-72 77 -1 19 3 29 4 5 4 1 1 1
-72 76 -1 24 3 29 2 5 3 4 7 1
-72 75 -1 4 2 7 3 3 3 4 8 2
-72 74 -1 9 2 7 3 5 3 4 8 2
-72 73 -1 14 2 7 5 4 3 8 14 1
-72 72 -1 19 2 7 4 2 3 7 13 2
-72 71 -1 24 2 7 4 4 3 7 13 2
-72 70 -1 4 2 13 4 2 3 11 19 1
-72 69 -1 9 2 13 4 4 3 11 19 1
-72 68 -1 14 2 13 5 1 3 10 18 2
-72 67 -1 19 2 13 5 3 3 10 18 2
-72 66 -1 24 2 13 3 5 3 10 17 1
-72 65 -1 4 2 20 3 4 3 9 16 2
-72 64 -1 9 2 20 5 2 3 13 23 1
-72 63 -1 14 2 20 5 4 3 13 23 1
-72 62 -1 19 2 20 4 2 2 16 29 1
-72 61 -1 24 2 20 4 4 2 16 29 1
-72 60 -1 4 2 28 5 1 2 15 28 2
-72 59 -1 9 2 28 5 3 2 15 28 2
-72 58 -1 14 2 28 3 2 2 14 26 2
-72 57 -1 19 2 28 3 4 2 14 26 2
-72 56 -1 24 2 28 4 4 2 13 23 1
-72 55 -1 4 1 4 3 4 2 13 24 2
-72 54 -1 9 1 4 5 2 1 20 35 1
-72 53 -1 14 1 4 5 4 1 20 35 1
-72 52 -1 19 1 4 4 2 1 19 33 1
-72 51 -1 24 1 4 4 4 1 19 33 1
-72 50 -1 20 1 12 4 5 1 18 31 1
-72 49 -1 19 1 12 4 2 1 18 31 1
-72 48 -1 18 1 12 5 5 1 17 29 1
-72 47 -1 17 1 12 5 3 1 17 29 1
-72 46 -1 16 1 12 3 1 18 16 28 1
-72 45 -1 20 1 19 4 2 18 16 29 2
-72 44 -1 19 1 19 3 4 18 15 27 2
-72 43 -1 18 1 19 3 1 18 15 27 2
-72 42 -1 17 1 19 5 4 18 14 25 2
-72 41 -1 16 1 19 5 2 18 14 25 2
-72 40 -1 20 1 25 4 5 18 13 23 1
-72 39 -1 19 1 25 4 2 18 13 23 1
-72 38 -1 18 1 25 5 5 17 16 27 1
-72 37 -1 17 1 25 5 3 17 16 27 1
-72 36 -1 16 1 25 3 1 17 12 21 1
-72 35 -1 20 9 6 5 5 17 11 20 2
-72 34 -1 19 9 6 5 3 17 11 20 2
-72 33 -1 18 9 6 3 2 17 11 19 1
-72 32 -1 17 9 6 4 5 17 10 17 1
-72 31 -1 16 9 6 4 2 17 10 17 1
-72 30 -1 20 9 10 4 5 17 5 10 1
-72 29 -1 19 9 10 4 4 17 5 10 1
-72 28 -1 18 9 10 4 3 17 5 10 1
-72 27 -1 17 9 10 4 2 17 5 10 1
-72 26 -1 16 9 10 4 1 17 5 10 1
-72 25 -1 20 9 17 2 2 17 1 1 1
-72 24 -1 19 9 17 4 4 16 4 8 2
-72 23 -1 18 9 17 4 2 16 4 8 2
-72 22 -1 17 9 17 4 1 16 4 8 2
-72 21 -1 16 9 17 3 1 34 16 39 1
-72 20 -1 20 9 24 5 5 34 15 38 2
-72 19 -1 19 9 24 5 3 34 15 38 2
-72 18 -1 18 9 24 4 5 34 11 26 1
-72 17 -1 17 9 24 4 4 34 11 26 1
-72 16 -1 16 9 24 4 2 34 11 26 1
-72 15 -1 20 9 30 3 2 34 11 27 2
-72 14 -1 19 9 30 5 4 34 10 25 3
-72 13 -1 18 9 30 5 2 34 10 25 3
-72 12 -1 17 9 30 4 5 34 6 11 1
-72 11 -1 16 9 30 4 2 34 6 11 1
-72 10 -1 20 9 31 5 5 34 6 12 2
-72 9 -1 19 9 31 5 3 34 6 12 2
-72 8 -1 18 9 31 3 1 34 6 13 3
-72 7 -1 17 9 31 4 4 34 2 2 1
-72 6 -1 16 9 31 4 2 34 2 2 1
-71 95 -1 5 3 19 4 3 22 3 6 3
-71 94 -1 10 3 19 4 5 22 3 6 3
-71 93 -1 15 3 19 5 2 22 7 17 3
-71 92 -1 20 3 19 5 4 22 7 17 3
-71 91 -1 25 3 19 5 5 22 7 17 3
-71 90 -1 5 3 22 4 3 22 7 16 2
-71 89 -1 10 3 22 4 5 22 7 16 2
-71 88 -1 15 3 22 5 2 22 11 26 1
-71 87 -1 20 3 22 5 4 22 11 26 1
-71 86 -1 25 3 22 5 5 22 11 26 1
-71 85 -1 5 3 26 4 2 22 10 25 3
-71 84 -1 10 3 26 4 4 22 10 25 3
-71 83 -1 15 3 26 5 1 22 14 33 1
-71 82 -1 20 3 26 5 3 22 14 33 1
-71 81 -1 25 3 26 5 5 22 14 33 1
-71 80 -1 5 3 29 5 1 4 1 2 2
-71 79 -1 10 3 29 5 2 4 1 2 2
-71 78 -1 15 3 29 5 3 4 1 2 2
-71 77 -1 20 3 29 5 4 4 1 2 2
-71 76 -1 25 3 29 5 5 4 1 2 2
-71 75 -1 5 2 7 5 1 3 8 14 1
-71 74 -1 10 2 7 5 2 3 8 14 1
-71 73 -1 15 2 7 5 5 3 8 14 1
-71 72 -1 20 2 7 4 3 3 7 13 2
-71 71 -1 25 2 7 4 5 3 7 13 2
-71 70 -1 5 2 13 4 3 3 11 19 1
-71 69 -1 10 2 13 4 5 3 11 19 1
-71 68 -1 15 2 13 5 2 3 10 18 2
-71 67 -1 20 2 13 5 4 3 10 18 2
-71 66 -1 25 2 13 5 5 3 10 18 2
-71 65 -1 5 2 20 5 1 3 13 23 1
-71 64 -1 10 2 20 5 3 3 13 23 1
-71 63 -1 15 2 20 5 5 3 13 23 1
-71 62 -1 20 2 20 4 3 2 16 29 1
-71 61 -1 25 2 20 4 5 2 16 29 1
-71 60 -1 5 2 28 5 2 2 15 28 2
-71 59 -1 10 2 28 5 4 2 15 28 2
-71 58 -1 15 2 28 5 5 2 15 28 2
-71 57 -1 20 2 28 3 5 2 14 26 2
-71 56 -1 25 2 28 4 5 2 13 23 1
-71 55 -1 5 1 4 5 1 1 20 35 1
-71 54 -1 10 1 4 5 3 1 20 35 1
-71 53 -1 15 1 4 5 5 1 20 35 1
-71 52 -1 20 1 4 4 3 1 19 33 1
-71 51 -1 25 1 4 4 5 1 19 33 1
-71 50 -1 25 1 12 4 4 1 18 31 1
-71 49 -1 24 1 12 4 1 1 18 31 1
-71 48 -1 23 1 12 5 4 1 17 29 1
-71 47 -1 22 1 12 5 2 1 17 29 1
-71 46 -1 21 1 12 5 1 1 17 29 1
-71 45 -1 25 1 19 4 1 18 16 29 2
-71 44 -1 24 1 19 3 3 18 15 27 2
-71 43 -1 23 1 19 5 5 18 14 25 2
-71 42 -1 22 1 19 5 3 18 14 25 2
-71 41 -1 21 1 19 5 1 18 14 25 2
-71 40 -1 25 1 25 4 4 18 13 23 1
-71 39 -1 24 1 25 4 1 18 13 23 1
-71 38 -1 23 1 25 5 4 17 16 27 1
-71 37 -1 22 1 25 5 2 17 16 27 1
-71 36 -1 21 1 25 5 1 17 16 27 1
-71 35 -1 25 9 6 5 4 17 11 20 2
-71 34 -1 24 9 6 5 2 17 11 20 2
-71 33 -1 23 9 6 5 1 17 11 20 2
-71 32 -1 22 9 6 4 4 17 10 17 1
-71 31 -1 21 9 6 4 1 17 10 17 1
-71 30 -1 25 9 10 5 5 17 5 9 2
-71 29 -1 24 9 10 5 4 17 5 9 2
-71 28 -1 23 9 10 5 3 17 5 9 2
-71 27 -1 22 9 10 5 2 17 5 9 2
-71 26 -1 21 9 10 5 1 17 5 9 2
-71 25 -1 25 9 17 5 5 16 4 7 1
-71 24 -1 24 9 17 5 4 16 4 7 1
-71 23 -1 23 9 17 5 3 16 4 7 1
-71 22 -1 22 9 17 5 2 16 4 7 1
-71 21 -1 21 9 17 5 1 16 4 7 1
-71 20 -1 25 9 24 5 4 34 15 38 2
-71 19 -1 24 9 24 5 2 34 15 38 2
-71 18 -1 23 9 24 5 1 34 15 38 2
-71 17 -1 22 9 24 4 3 34 11 26 1
-71 16 -1 21 9 24 4 1 34 11 26 1
-71 15 -1 25 9 30 5 5 34 10 25 3
-71 14 -1 24 9 30 5 3 34 10 25 3
-71 13 -1 23 9 30 5 1 34 10 25 3
-71 12 -1 22 9 30 4 4 34 6 11 1
-71 11 -1 21 9 30 4 1 34 6 11 1
-71 10 -1 25 9 31 5 4 34 6 12 2
-71 9 -1 24 9 31 5 2 34 6 12 2
-71 8 -1 23 9 31 5 1 34 6 12 2
-71 7 -1 22 9 31 4 3 34 2 2 1
-71 6 -1 21 9 31 4 1 34 2 2 1
-70 95 -1 1 3 18 2 1 22 4 7 1
-70 94 -1 6 3 18 2 4 22 4 7 1
-70 93 -1 11 3 18 1 1 22 8 18 1
-70 92 -1 16 3 18 1 2 22 8 18 1
-70 91 -1 21 3 18 1 4 22 8 18 1
-70 90 -1 1 3 21 1 1 22 11 27 2
-70 89 -1 6 3 21 1 2 22 11 27 2
-70 88 -1 11 3 21 1 3 22 11 27 2
-70 87 -1 16 3 21 1 4 22 11 27 2
-70 86 -1 21 3 21 1 5 22 11 27 2
-70 85 -1 1 3 25 2 1 22 15 35 1
-70 84 -1 6 3 25 1 1 22 14 34 2
-70 83 -1 11 3 25 1 2 22 14 34 2
-70 82 -1 16 3 25 1 3 22 14 34 2
-70 81 -1 21 3 25 1 5 22 14 34 2
-70 80 -1 1 3 28 1 1 4 2 3 1
-70 79 -1 6 3 28 1 2 4 2 3 1
-70 78 -1 11 3 28 1 4 4 2 3 1
-70 77 -1 16 3 28 2 1 4 5 9 2
-70 76 -1 21 3 28 2 3 4 5 9 2
-70 75 -1 1 3 32 2 1 4 5 10 1
-70 74 -1 6 3 32 2 4 4 5 10 1
-70 73 -1 11 3 32 1 1 3 12 21 1
-70 72 -1 16 3 32 1 2 3 12 21 1
-70 71 -1 21 3 32 1 4 3 12 21 1
-70 70 -1 1 2 12 1 1 3 11 20 2
-70 69 -1 6 2 12 1 2 3 11 20 2
-70 68 -1 11 2 12 1 3 3 11 20 2
-70 67 -1 16 2 12 1 5 3 11 20 2
-70 66 -1 21 2 12 2 3 3 15 26 1
-70 65 -1 1 2 19 2 1 3 14 25 1
-70 64 -1 6 2 19 1 1 3 13 24 2
-70 63 -1 11 2 19 1 2 3 13 24 2
-70 62 -1 16 2 19 1 4 3 13 24 2
-70 61 -1 21 2 19 3 2 3 17 29 1
-70 60 -1 1 2 27 3 1 2 20 33 1
-70 59 -1 6 2 27 2 1 2 19 32 1
-70 58 -1 11 2 27 2 3 2 19 32 1
-70 57 -1 16 2 27 1 1 2 18 31 1
-70 56 -1 21 2 27 1 3 2 18 31 1
-70 55 -1 1 1 3 3 1 2 17 30 1
-70 54 -1 6 1 3 3 4 2 17 30 1
-70 53 -1 11 1 3 2 2 1 20 36 2
-70 52 -1 16 1 3 1 1 1 19 34 2
-70 51 -1 21 1 3 1 3 1 19 34 2
-70 50 -1 5 1 11 3 5 1 18 32 2
-70 49 -1 4 1 11 3 2 1 18 32 2
-70 48 -1 3 1 11 2 4 1 17 30 2
-70 47 -1 2 1 11 1 5 18 20 33 1
-70 46 -1 1 1 11 1 3 18 20 33 1
-70 45 -1 5 1 18 2 5 18 19 32 1
-70 44 -1 4 1 18 2 2 18 19 32 1
-70 43 -1 3 1 18 1 5 18 18 31 1
-70 42 -1 2 1 18 1 2 18 18 31 1
-70 41 -1 1 1 18 3 3 18 17 30 1
-70 40 -1 5 9 3 3 5 17 20 34 1
-70 39 -1 4 9 3 1 5 17 16 28 2
-70 38 -1 3 9 3 1 3 17 16 28 2
-70 37 -1 2 9 3 1 1 17 16 28 2
-70 36 -1 1 9 3 2 3 17 15 26 1
-70 35 -1 5 9 5 2 5 17 14 25 1
-70 34 -1 4 9 5 1 5 17 10 18 2
-70 33 -1 3 9 5 1 4 17 10 18 2
-70 32 -1 2 9 5 1 2 17 10 18 2
-70 31 -1 1 9 5 3 4 17 9 15 1
-70 30 -1 5 9 9 1 5 17 9 16 2
-70 29 -1 4 9 9 1 3 17 9 16 2
-70 28 -1 3 9 9 1 1 17 9 16 2
-70 27 -1 2 9 9 2 5 16 8 14 1
-70 26 -1 1 9 9 2 3 16 8 14 1
-70 25 -1 5 9 16 2 5 16 8 15 2
-70 24 -1 4 9 16 2 2 16 8 15 2
-70 23 -1 3 9 16 1 5 16 3 6 2
-70 22 -1 2 9 16 1 4 16 3 6 2
-70 21 -1 1 9 16 1 2 16 3 6 2
-70 20 -1 5 9 23 1 5 34 15 37 1
-70 19 -1 4 9 23 1 4 34 15 37 1
-70 18 -1 3 9 23 1 2 34 15 37 1
-70 17 -1 2 9 23 1 1 34 15 37 1
-70 16 -1 1 9 23 2 3 34 14 36 3
-70 15 -1 5 9 28 1 5 34 10 24 2
-70 14 -1 4 9 28 1 4 34 10 24 2
-70 13 -1 3 9 28 1 3 34 10 24 2
-70 12 -1 2 9 28 1 2 34 10 24 2
-70 11 -1 1 9 28 1 1 34 10 24 2
-70 10 -1 5 9 29 1 5 34 5 10 1
-70 9 -1 4 9 29 1 4 34 5 10 1
-70 8 -1 3 9 29 1 2 34 5 10 1
-70 7 -1 2 9 29 2 5 34 1 1 1
-70 6 -1 1 9 29 2 3 34 1 1 1
-69 95 -1 2 3 18 2 2 22 4 7 1
-69 94 -1 7 3 18 2 5 22 4 7 1
-69 93 -1 12 3 18 3 2 22 8 19 2
-69 92 -1 17 3 18 1 3 22 8 18 1
-69 91 -1 22 3 18 1 5 22 8 18 1
-69 90 -1 2 3 21 3 1 22 12 29 1
-69 89 -1 7 3 21 2 1 22 11 28 3
-69 88 -1 12 3 21 2 2 22 11 28 3
-69 87 -1 17 3 21 2 3 22 11 28 3
-69 86 -1 22 3 21 2 5 22 11 28 3
-69 85 -1 2 3 25 2 2 22 15 35 1
-69 84 -1 7 3 25 2 3 22 15 35 1
-69 83 -1 12 3 25 2 4 22 15 35 1
-69 82 -1 17 3 25 1 4 22 14 34 2
-69 81 -1 22 3 25 4 2 4 3 5 1
-69 80 -1 2 3 28 3 1 4 2 4 2
-69 79 -1 7 3 28 1 3 4 2 3 1
-69 78 -1 12 3 28 1 5 4 2 3 1
-69 77 -1 17 3 28 2 2 4 5 9 2
-69 76 -1 22 3 28 2 4 4 5 9 2
-69 75 -1 2 3 32 2 2 4 5 10 1
-69 74 -1 7 3 32 2 5 4 5 10 1
-69 73 -1 12 3 32 3 1 4 9 16 1
-69 72 -1 17 3 32 1 3 3 12 21 1
-69 71 -1 22 3 32 1 5 3 12 21 1
-69 70 -1 2 2 12 3 1 3 12 22 2
-69 69 -1 7 2 12 3 4 3 12 22 2
-69 68 -1 12 2 12 1 4 3 11 20 2
-69 67 -1 17 2 12 2 1 3 15 26 1
-69 66 -1 22 2 12 2 4 3 15 26 1
-69 65 -1 2 2 19 2 2 3 14 25 1
-69 64 -1 7 2 19 2 4 3 14 25 1
-69 63 -1 12 2 19 1 3 3 13 24 2
-69 62 -1 17 2 19 1 5 3 13 24 2
-69 61 -1 22 2 19 3 3 3 17 29 1
-69 60 -1 2 2 27 3 2 2 20 33 1
-69 59 -1 7 2 27 2 2 2 19 32 1
-69 58 -1 12 2 27 2 4 2 19 32 1
-69 57 -1 17 2 27 1 2 2 18 31 1
-69 56 -1 22 2 27 1 4 2 18 31 1
-69 55 -1 2 1 3 3 2 2 17 30 1
-69 54 -1 7 1 3 3 5 2 17 30 1
-69 53 -1 12 1 3 2 3 1 20 36 2
-69 52 -1 17 1 3 2 5 1 20 36 2
-69 51 -1 22 1 3 1 4 1 19 34 2
-69 50 -1 10 1 11 3 4 1 18 32 2
-69 49 -1 9 1 11 2 5 1 17 30 2
-69 48 -1 8 1 11 2 3 1 17 30 2
-69 47 -1 7 1 11 1 4 18 20 33 1
-69 46 -1 6 1 11 1 2 18 20 33 1
-69 45 -1 10 1 18 2 4 18 19 32 1
-69 44 -1 9 1 18 2 1 18 19 32 1
-69 43 -1 8 1 18 1 4 18 18 31 1
-69 42 -1 7 1 18 1 1 18 18 31 1
-69 41 -1 6 1 18 3 2 18 17 30 1
-69 40 -1 10 9 3 3 4 17 20 34 1
-69 39 -1 9 9 3 1 4 17 16 28 2
-69 38 -1 8 9 3 1 2 17 16 28 2
-69 37 -1 7 9 3 2 5 17 15 26 1
-69 36 -1 6 9 3 2 2 17 15 26 1
-69 35 -1 10 9 5 2 4 17 14 25 1
-69 34 -1 9 9 5 2 1 17 14 25 1
-69 33 -1 8 9 5 1 3 17 10 18 2
-69 32 -1 7 9 5 1 1 17 10 18 2
-69 31 -1 6 9 5 3 3 17 9 15 1
-69 30 -1 10 9 9 1 4 17 9 16 2
-69 29 -1 9 9 9 1 2 17 9 16 2
-69 28 -1 8 9 9 3 3 16 12 22 2
-69 27 -1 7 9 9 2 4 16 8 14 1
-69 26 -1 6 9 9 2 2 16 8 14 1
-69 25 -1 10 9 16 2 4 16 8 15 2
-69 24 -1 9 9 16 2 1 16 8 15 2
-69 23 -1 8 9 16 3 4 16 3 5 1
-69 22 -1 7 9 16 1 3 16 3 6 2
-69 21 -1 6 9 16 1 1 16 3 6 2
-69 20 -1 10 9 23 4 5 16 2 4 2
-69 19 -1 9 9 23 1 3 34 15 37 1
-69 18 -1 8 9 23 2 5 34 14 36 3
-69 17 -1 7 9 23 2 4 34 14 36 3
-69 16 -1 6 9 23 2 2 34 14 36 3
-69 15 -1 10 9 28 2 5 34 10 23 1
-69 14 -1 9 9 28 2 4 34 10 23 1
-69 13 -1 8 9 28 2 2 34 10 23 1
-69 12 -1 7 9 28 2 1 34 10 23 1
-69 11 -1 6 9 28 3 3 34 9 22 2
-69 10 -1 10 9 29 3 5 34 5 9 3
-69 9 -1 9 9 29 1 3 34 5 10 1
-69 8 -1 8 9 29 1 1 34 5 10 1
-69 7 -1 7 9 29 2 4 34 1 1 1
-69 6 -1 6 9 29 2 2 34 1 1 1
-68 95 -1 3 3 18 2 3 22 4 7 1
-68 94 -1 8 3 18 3 1 22 8 19 2
-68 93 -1 13 3 18 3 3 22 8 19 2
-68 92 -1 18 3 18 3 4 22 8 19 2
-68 91 -1 23 3 18 3 5 22 8 19 2
-68 90 -1 3 3 21 3 2 22 12 29 1
-68 89 -1 8 3 21 3 3 22 12 29 1
-68 88 -1 13 3 21 3 4 22 12 29 1
-68 87 -1 18 3 21 2 4 22 11 28 3
-68 86 -1 23 3 21 4 3 22 16 38 1
-68 85 -1 3 3 25 3 1 22 15 36 2
-68 84 -1 8 3 25 3 2 22 15 36 2
-68 83 -1 13 3 25 3 3 22 15 36 2
-68 82 -1 18 3 25 2 5 22 15 35 1
-68 81 -1 23 3 25 4 3 4 3 5 1
-68 80 -1 3 3 28 4 1 4 3 6 2
-68 79 -1 8 3 28 3 2 4 2 4 2
-68 78 -1 13 3 28 3 3 4 2 4 2
-68 77 -1 18 3 28 3 5 4 2 4 2
-68 76 -1 23 3 28 2 5 4 5 9 2
-68 75 -1 3 3 32 2 3 4 5 10 1
-68 74 -1 8 3 32 4 3 4 10 18 1
-68 73 -1 13 3 32 3 2 4 9 16 1
-68 72 -1 18 3 32 3 3 4 9 16 1
-68 71 -1 23 3 32 3 4 4 9 16 1
-68 70 -1 3 2 12 3 2 3 12 22 2
-68 69 -1 8 2 12 3 5 3 12 22 2
-68 68 -1 13 2 12 4 1 3 15 27 2
-68 67 -1 18 2 12 2 2 3 15 26 1
-68 66 -1 23 2 12 2 5 3 15 26 1
-68 65 -1 3 2 19 2 3 3 14 25 1
-68 64 -1 8 2 19 2 5 3 14 25 1
-68 63 -1 13 2 19 4 1 3 18 30 1
-68 62 -1 18 2 19 3 1 3 17 29 1
-68 61 -1 23 2 19 3 4 3 17 29 1
-68 60 -1 3 2 27 3 3 2 20 33 1
-68 59 -1 8 2 27 3 4 2 20 33 1
-68 58 -1 13 2 27 2 5 2 19 32 1
-68 57 -1 18 2 27 4 3 2 24 35 1
-68 56 -1 23 2 27 1 5 2 18 31 1
-68 55 -1 3 1 3 3 3 2 17 30 1
-68 54 -1 8 1 3 2 1 1 20 36 2
-68 53 -1 13 1 3 2 4 1 20 36 2
-68 52 -1 18 1 3 1 2 1 19 34 2
-68 51 -1 23 1 3 1 5 1 19 34 2
-68 50 -1 15 1 11 3 3 1 18 32 2
-68 49 -1 14 1 11 3 1 1 18 32 2
-68 48 -1 13 1 11 2 2 1 17 30 2
-68 47 -1 12 1 11 2 1 1 17 30 2
-68 46 -1 11 1 11 1 1 18 20 33 1
-68 45 -1 15 1 18 2 3 18 19 32 1
-68 44 -1 14 1 18 4 4 18 22 34 1
-68 43 -1 13 1 18 1 3 18 18 31 1
-68 42 -1 12 1 18 3 5 18 17 30 1
-68 41 -1 11 1 18 3 1 18 17 30 1
-68 40 -1 15 9 3 3 3 17 20 34 1
-68 39 -1 14 9 3 3 1 17 20 34 1
-68 38 -1 13 9 3 4 2 17 19 33 1
-68 37 -1 12 9 3 2 4 17 15 26 1
-68 36 -1 11 9 3 2 1 17 15 26 1
-68 35 -1 15 9 5 2 3 17 14 25 1
-68 34 -1 14 9 5 4 5 17 13 24 2
-68 33 -1 13 9 5 4 3 17 13 24 2
-68 32 -1 12 9 5 3 5 17 9 15 1
-68 31 -1 11 9 5 3 2 17 9 15 1
-68 30 -1 15 9 9 3 5 16 12 22 2
-68 29 -1 14 9 9 3 4 16 12 22 2
-68 28 -1 13 9 9 3 2 16 12 22 2
-68 27 -1 12 9 9 4 5 16 11 20 2
-68 26 -1 11 9 9 2 1 16 8 14 1
-68 25 -1 15 9 16 2 3 16 8 15 2
-68 24 -1 14 9 16 3 5 16 3 5 1
-68 23 -1 13 9 16 3 3 16 3 5 1
-68 22 -1 12 9 16 3 1 16 3 5 1
-68 21 -1 11 9 16 4 3 16 2 3 1
-68 20 -1 15 9 23 4 4 16 2 4 2
-68 19 -1 14 9 23 3 5 34 14 35 2
-68 18 -1 13 9 23 3 4 34 14 35 2
-68 17 -1 12 9 23 3 3 34 14 35 2
-68 16 -1 11 9 23 2 1 34 14 36 3
-68 15 -1 15 9 28 4 5 34 13 33 3
-68 14 -1 14 9 28 2 3 34 10 23 1
-68 13 -1 13 9 28 3 5 34 9 22 2
-68 12 -1 12 9 28 3 4 34 9 22 2
-68 11 -1 11 9 28 3 2 34 9 22 2
-68 10 -1 15 9 29 3 4 34 5 9 3
-68 9 -1 14 9 29 3 3 34 5 9 3
-68 8 -1 13 9 29 3 2 34 5 9 3
-68 7 -1 12 9 29 3 1 34 5 9 3
-68 6 -1 11 9 29 2 1 34 1 1 1
-67 95 -1 4 3 18 5 1 23 5 10 1
-67 94 -1 9 3 18 4 1 22 8 20 3
-67 93 -1 14 3 18 4 2 22 8 20 3
-67 92 -1 19 3 18 4 3 22 8 20 3
-67 91 -1 24 3 18 4 4 22 8 20 3
-67 90 -1 4 3 21 5 1 22 12 30 2
-67 89 -1 9 3 21 5 3 22 12 30 2
-67 88 -1 14 3 21 3 5 22 12 29 1
-67 87 -1 19 3 21 4 1 22 16 38 1
-67 86 -1 24 3 21 4 4 22 16 38 1
-67 85 -1 4 3 25 5 1 22 15 37 3
-67 84 -1 9 3 25 5 3 22 15 37 3
-67 83 -1 14 3 25 3 4 22 15 36 2
-67 82 -1 19 3 25 3 5 22 15 36 2
-67 81 -1 24 3 25 4 4 4 3 5 1
-67 80 -1 4 3 28 4 2 4 3 6 2
-67 79 -1 9 3 28 4 4 4 3 6 2
-67 78 -1 14 3 28 3 4 4 2 4 2
-67 77 -1 19 3 28 5 2 4 6 11 1
-67 76 -1 24 3 28 5 4 4 6 11 1
-67 75 -1 4 3 32 4 1 4 10 18 1
-67 74 -1 9 3 32 4 4 4 10 18 1
-67 73 -1 14 3 32 5 1 4 9 17 2
-67 72 -1 19 3 32 5 3 4 9 17 2
-67 71 -1 24 3 32 3 5 4 9 16 1
-67 70 -1 4 2 12 3 3 3 12 22 2
-67 69 -1 9 2 12 5 2 3 16 28 1
-67 68 -1 14 2 12 4 2 3 15 27 2
-67 67 -1 19 2 12 4 3 3 15 27 2
-67 66 -1 24 2 12 4 4 3 15 27 2
-67 65 -1 4 2 19 5 1 3 19 31 1
-67 64 -1 9 2 19 5 3 3 19 31 1
-67 63 -1 14 2 19 4 2 3 18 30 1
-67 62 -1 19 2 19 4 3 3 18 30 1
-67 61 -1 24 2 19 3 5 3 17 29 1
-67 60 -1 4 2 27 4 1 2 24 35 1
-67 59 -1 9 2 27 3 5 2 20 33 1
-67 58 -1 14 2 27 4 2 2 24 35 1
-67 57 -1 19 2 27 4 4 2 24 35 1
-67 56 -1 24 2 27 4 5 2 24 35 1
-67 55 -1 4 1 3 5 1 2 22 34 1
-67 54 -1 9 1 3 5 3 2 22 34 1
-67 53 -1 14 1 3 4 1 1 24 38 1
-67 52 -1 19 1 3 4 2 1 24 38 1
-67 51 -1 24 1 3 4 4 1 24 38 1
-67 50 -1 20 1 11 4 5 1 22 37 1
-67 49 -1 19 1 11 4 3 1 22 37 1
-67 48 -1 18 1 11 4 1 1 22 37 1
-67 47 -1 17 1 11 5 4 18 24 37 1
-67 46 -1 16 1 11 5 2 18 24 37 1
-67 45 -1 20 1 18 4 5 18 22 34 1
-67 44 -1 19 1 18 4 3 18 22 34 1
-67 43 -1 18 1 18 4 2 18 22 34 1
-67 42 -1 17 1 18 3 4 18 17 30 1
-67 41 -1 16 1 18 4 1 18 22 34 1
-67 40 -1 20 9 3 3 2 17 20 34 1
-67 39 -1 19 9 3 4 4 17 19 33 1
-67 38 -1 18 9 3 4 1 17 19 33 1
-67 37 -1 17 9 3 5 4 17 18 31 1
-67 36 -1 16 9 3 5 2 17 18 31 1
-67 35 -1 20 9 5 2 2 17 14 25 1
-67 34 -1 19 9 5 4 4 17 13 24 2
-67 33 -1 18 9 5 4 2 17 13 24 2
-67 32 -1 17 9 5 4 1 17 13 24 2
-67 31 -1 16 9 5 3 1 17 9 15 1
-67 30 -1 20 9 9 5 5 16 12 21 1
-67 29 -1 19 9 9 5 3 16 12 21 1
-67 28 -1 18 9 9 3 1 16 12 22 2
-67 27 -1 17 9 9 4 4 16 11 20 2
-67 26 -1 16 9 9 4 2 16 11 20 2
-67 25 -1 20 9 16 5 5 16 7 13 1
-67 24 -1 19 9 16 5 3 16 7 13 1
-67 23 -1 18 9 16 3 2 16 3 5 1
-67 22 -1 17 9 16 4 5 16 2 3 1
-67 21 -1 16 9 16 4 2 16 2 3 1
-67 20 -1 20 9 23 4 3 16 2 4 2
-67 19 -1 19 9 23 5 5 34 14 34 1
-67 18 -1 18 9 23 5 4 34 14 34 1
-67 17 -1 17 9 23 3 2 34 14 35 2
-67 16 -1 16 9 23 3 1 34 14 35 2
-67 15 -1 20 9 28 4 4 34 13 33 3
-67 14 -1 19 9 28 4 2 34 13 33 3
-67 13 -1 18 9 28 5 5 34 9 21 1
-67 12 -1 17 9 28 5 3 34 9 21 1
-67 11 -1 16 9 28 3 1 34 9 22 2
-67 10 -1 20 9 29 4 5 34 5 8 2
-67 9 -1 19 9 29 4 3 34 5 8 2
-67 8 -1 18 9 29 4 2 34 5 8 2
-67 7 -1 17 9 29 4 1 34 5 8 2
-67 6 -1 16 9 29 5 2 33 8 20 3
-66 95 -1 5 3 18 5 2 23 5 10 1
-66 94 -1 10 3 18 5 3 23 5 10 1
-66 93 -1 15 3 18 5 4 23 5 10 1
-66 92 -1 20 3 18 5 5 23 5 10 1
-66 91 -1 25 3 18 4 5 22 8 20 3
-66 90 -1 5 3 21 5 2 22 12 30 2
-66 89 -1 10 3 21 5 4 22 12 30 2
-66 88 -1 15 3 21 5 5 22 12 30 2
-66 87 -1 20 3 21 4 2 22 16 38 1
-66 86 -1 25 3 21 4 5 22 16 38 1
-66 85 -1 5 3 25 5 2 22 15 37 3
-66 84 -1 10 3 25 5 4 22 15 37 3
-66 83 -1 15 3 25 5 5 22 15 37 3
-66 82 -1 20 3 25 4 1 4 3 5 1
-66 81 -1 25 3 25 4 5 4 3 5 1
-66 80 -1 5 3 28 4 3 4 3 6 2
-66 79 -1 10 3 28 4 5 4 3 6 2
-66 78 -1 15 3 28 5 1 4 6 11 1
-66 77 -1 20 3 28 5 3 4 6 11 1
-66 76 -1 25 3 28 5 5 4 6 11 1
-66 75 -1 5 3 32 4 2 4 10 18 1
-66 74 -1 10 3 32 4 5 4 10 18 1
-66 73 -1 15 3 32 5 2 4 9 17 2
-66 72 -1 20 3 32 5 4 4 9 17 2
-66 71 -1 25 3 32 5 5 4 9 17 2
-66 70 -1 5 2 12 5 1 3 16 28 1
-66 69 -1 10 2 12 5 3 3 16 28 1
-66 68 -1 15 2 12 5 4 3 16 28 1
-66 67 -1 20 2 12 5 5 3 16 28 1
-66 66 -1 25 2 12 4 5 3 15 27 2
-66 65 -1 5 2 19 5 2 3 19 31 1
-66 64 -1 10 2 19 5 4 3 19 31 1
-66 63 -1 15 2 19 5 5 3 19 31 1
-66 62 -1 20 2 19 4 4 3 18 30 1
-66 61 -1 25 2 19 4 5 3 18 30 1
-66 60 -1 5 2 27 5 1 2 24 36 2
-66 59 -1 10 2 27 5 2 2 24 36 2
-66 58 -1 15 2 27 5 3 2 24 36 2
-66 57 -1 20 2 27 5 4 2 24 36 2
-66 56 -1 25 2 27 5 5 2 24 36 2
-66 55 -1 5 1 3 5 2 2 22 34 1
-66 54 -1 10 1 3 5 4 2 22 34 1
-66 53 -1 15 1 3 5 5 2 22 34 1
-66 52 -1 20 1 3 4 3 1 24 38 1
-66 51 -1 25 1 3 4 5 1 24 38 1
-66 50 -1 25 1 11 4 4 1 22 37 1
-66 49 -1 24 1 11 4 2 1 22 37 1
-66 48 -1 23 1 11 5 5 18 24 37 1
-66 47 -1 22 1 11 5 3 18 24 37 1
-66 46 -1 21 1 11 5 1 18 24 37 1
-66 45 -1 25 1 18 5 5 18 22 35 2
-66 44 -1 24 1 18 5 4 18 22 35 2
-66 43 -1 23 1 18 5 3 18 22 35 2
-66 42 -1 22 1 18 5 2 18 22 35 2
-66 41 -1 21 1 18 5 1 18 22 35 2
-66 40 -1 25 9 3 4 5 17 19 33 1
-66 39 -1 24 9 3 4 3 17 19 33 1
-66 38 -1 23 9 3 5 5 17 18 31 1
-66 37 -1 22 9 3 5 3 17 18 31 1
-66 36 -1 21 9 3 5 1 17 18 31 1
-66 35 -1 25 9 5 5 5 17 13 23 1
-66 34 -1 24 9 5 5 4 17 13 23 1
-66 33 -1 23 9 5 5 3 17 13 23 1
-66 32 -1 22 9 5 5 2 17 13 23 1
-66 31 -1 21 9 5 5 1 17 13 23 1
-66 30 -1 25 9 9 5 4 16 12 21 1
-66 29 -1 24 9 9 5 2 16 12 21 1
-66 28 -1 23 9 9 5 1 16 12 21 1
-66 27 -1 22 9 9 4 3 16 11 20 2
-66 26 -1 21 9 9 4 1 16 11 20 2
-66 25 -1 25 9 16 5 4 16 7 13 1
-66 24 -1 24 9 16 5 2 16 7 13 1
-66 23 -1 23 9 16 5 1 16 7 13 1
-66 22 -1 22 9 16 4 4 16 2 3 1
-66 21 -1 21 9 16 4 1 16 2 3 1
-66 20 -1 25 9 23 4 2 16 2 4 2
-66 19 -1 24 9 23 4 1 16 2 4 2
-66 18 -1 23 9 23 5 3 34 14 34 1
-66 17 -1 22 9 23 5 2 34 14 34 1
-66 16 -1 21 9 23 5 1 34 14 34 1
-66 15 -1 25 9 28 4 3 34 13 33 3
-66 14 -1 24 9 28 4 1 34 13 33 3
-66 13 -1 23 9 28 5 4 34 9 21 1
-66 12 -1 22 9 28 5 2 34 9 21 1
-66 11 -1 21 9 28 5 1 34 9 21 1
-66 10 -1 25 9 29 4 4 34 5 8 2
-66 9 -1 24 9 29 5 5 33 8 20 3
-66 8 -1 23 9 29 5 4 33 8 20 3
-66 7 -1 22 9 29 5 3 33 8 20 3
-66 6 -1 21 9 29 5 1 33 8 20 3
-65 97 -1 16 3 30 1 1 23 1 1 1
-65 96 -1 21 3 30 1 4 23 1 1 1
-65 95 -1 1 3 17 1 1 23 5 11 2
-65 94 -1 6 3 17 1 2 23 5 11 2
-65 93 -1 11 3 17 1 3 23 5 11 2
-65 92 -1 16 3 17 2 1 23 9 21 1
-65 91 -1 21 3 17 2 3 23 9 21 1
-65 90 -1 1 3 20 2 1 23 9 22 2
-65 89 -1 6 3 20 2 3 23 9 22 2
-65 88 -1 11 3 20 1 1 22 16 39 2
-65 87 -1 16 3 20 1 3 22 16 39 2
-65 86 -1 21 3 20 1 4 22 16 39 2
-65 85 -1 1 3 24 2 1 22 16 40 3
-65 84 -1 6 3 24 2 4 22 16 40 3
-65 83 -1 11 3 24 1 1 4 4 7 1
-65 82 -1 16 3 24 1 2 4 4 7 1
-65 81 -1 21 3 24 1 4 4 4 7 1
-65 80 -1 1 3 27 1 1 4 7 12 1
-65 79 -1 6 3 27 1 2 4 7 12 1
-65 78 -1 11 3 27 1 3 4 7 12 1
-65 77 -1 16 3 27 1 4 4 7 12 1
-65 76 -1 21 3 27 1 5 4 7 12 1
-65 75 -1 1 3 31 1 1 4 10 19 2
-65 74 -1 6 3 31 1 2 4 10 19 2
-65 73 -1 11 3 31 1 3 4 10 19 2
-65 72 -1 16 3 31 1 5 4 10 19 2
-65 71 -1 21 3 31 2 3 4 14 24 1
-65 70 -1 1 3 33 1 1 4 13 23 1
-65 69 -1 6 3 33 1 2 4 13 23 1
-65 68 -1 11 3 33 1 4 4 13 23 1
-65 67 -1 16 3 33 2 1 3 20 33 1
-65 66 -1 21 3 33 2 3 3 20 33 1
-65 65 -1 1 2 18 2 1 3 20 34 2
-65 64 -1 6 2 18 1 1 3 19 32 2
-65 63 -1 11 2 18 1 2 3 19 32 2
-65 62 -1 16 2 18 1 4 3 19 32 2
-65 61 -1 21 2 18 3 3 3 24 36 1
-65 60 -1 1 2 26 2 1 3 22 35 1
-65 59 -1 6 2 26 2 3 3 22 35 1
-65 58 -1 11 2 26 1 1 2 24 37 3
-65 57 -1 16 2 26 1 3 2 24 37 3
-65 56 -1 21 2 26 1 5 2 24 37 3
-65 55 -1 1 2 32 2 1 2 26 38 1
-65 54 -1 6 2 32 2 3 2 26 38 1
-65 53 -1 11 2 32 1 1 1 28 41 1
-65 52 -1 16 2 32 1 2 1 28 41 1
-65 51 -1 21 2 32 1 4 1 28 41 1
-65 50 -1 5 1 10 1 5 1 26 39 1
-65 49 -1 4 1 10 1 4 1 26 39 1
-65 48 -1 3 1 10 1 2 1 26 39 1
-65 47 -1 2 1 10 2 5 18 28 39 1
-65 46 -1 1 1 10 2 3 18 28 39 1
-65 45 -1 5 9 1 1 5 18 22 36 3
-65 44 -1 4 9 1 1 4 18 22 36 3
-65 43 -1 3 9 1 1 2 18 22 36 3
-65 42 -1 2 9 1 2 5 17 24 37 1
-65 41 -1 1 9 1 2 2 17 24 37 1
-65 40 -1 5 9 2 2 5 17 24 38 2
-65 39 -1 4 9 2 2 2 17 24 38 2
-65 38 -1 3 9 2 1 5 17 18 32 2
-65 37 -1 2 9 2 1 3 17 18 32 2
-65 36 -1 1 9 2 1 1 17 18 32 2
-65 35 -1 5 9 4 2 5 17 17 30 2
-65 34 -1 4 9 4 2 2 17 17 30 2
-65 33 -1 3 9 4 1 5 16 16 28 1
-65 32 -1 2 9 4 1 3 16 16 28 1
-65 31 -1 1 9 4 1 1 16 16 28 1
-65 30 -1 5 9 8 2 5 16 15 27 2
-65 29 -1 4 9 8 1 5 16 11 19 1
-65 28 -1 3 9 8 1 4 16 11 19 1
-65 27 -1 2 9 8 1 2 16 11 19 1
-65 26 -1 1 9 8 1 1 16 11 19 1
-65 25 -1 5 9 15 1 5 16 6 12 2
-65 24 -1 4 9 15 1 4 16 6 12 2
-65 23 -1 3 9 15 1 3 16 6 12 2
-65 22 -1 2 9 15 1 2 16 6 12 2
-65 21 -1 1 9 15 1 1 16 6 12 2
-65 20 -1 5 9 22 1 5 16 1 2 2
-65 19 -1 4 9 22 1 4 16 1 2 2
-65 18 -1 3 9 22 1 2 16 1 2 2
-65 17 -1 2 9 22 2 5 34 13 31 1
-65 16 -1 1 9 22 2 3 34 13 31 1
-65 15 -1 5 8 18 1 5 34 13 32 2
-65 14 -1 4 8 18 1 3 34 13 32 2
-65 13 -1 3 8 18 1 2 34 13 32 2
-65 12 -1 2 8 18 2 5 33 12 32 2
-65 11 -1 1 8 18 2 3 33 12 32 2
-65 10 -1 5 8 19 2 5 33 12 33 3
-65 9 -1 4 8 19 2 2 33 12 33 3
-65 8 -1 3 8 19 1 5 33 8 19 2
-65 7 -1 2 8 19 1 4 33 8 19 2
-65 6 -1 1 8 19 1 2 33 8 19 2
-65 5 -1 5 8 20 1 5 33 4 9 1
-65 4 -1 4 8 20 1 3 33 4 9 1
-64 97 -1 17 3 30 1 2 23 1 1 1
-64 96 -1 22 3 30 1 5 23 1 1 1
-64 95 -1 2 3 17 3 1 23 5 12 3
-64 94 -1 7 3 17 3 3 23 5 12 3
-64 93 -1 12 3 17 1 4 23 5 11 2
-64 92 -1 17 3 17 1 5 23 5 11 2
-64 91 -1 22 3 17 2 4 23 9 21 1
-64 90 -1 2 3 20 2 2 23 9 22 2
-64 89 -1 7 3 20 2 4 23 9 22 2
-64 88 -1 12 3 20 1 2 22 16 39 2
-64 87 -1 17 3 20 3 2 23 13 34 1
-64 86 -1 22 3 20 1 5 22 16 39 2
-64 85 -1 2 3 24 2 2 22 16 40 3
-64 84 -1 7 3 24 2 5 22 16 40 3
-64 83 -1 12 3 24 3 1 4 4 8 2
-64 82 -1 17 3 24 1 3 4 4 7 1
-64 81 -1 22 3 24 1 5 4 4 7 1
-64 80 -1 2 3 27 3 1 4 8 14 1
-64 79 -1 7 3 27 2 1 4 7 13 2
-64 78 -1 12 3 27 2 2 4 7 13 2
-64 77 -1 17 3 27 2 3 4 7 13 2
-64 76 -1 22 3 27 2 5 4 7 13 2
-64 75 -1 2 3 31 3 1 4 11 20 1
-64 74 -1 7 3 31 3 3 4 11 20 1
-64 73 -1 12 3 31 1 4 4 10 19 2
-64 72 -1 17 3 31 2 1 4 14 24 1
-64 71 -1 22 3 31 2 4 4 14 24 1
-64 70 -1 2 3 33 3 1 4 14 25 2
-64 69 -1 7 3 33 1 3 4 13 23 1
-64 68 -1 12 3 33 1 5 4 13 23 1
-64 67 -1 17 3 33 2 2 3 20 33 1
-64 66 -1 22 3 33 2 4 3 20 33 1
-64 65 -1 2 2 18 2 2 3 20 34 2
-64 64 -1 7 2 18 2 4 3 20 34 2
-64 63 -1 12 2 18 1 3 3 19 32 2
-64 62 -1 17 2 18 1 5 3 19 32 2
-64 61 -1 22 2 18 3 4 3 24 36 1
-64 60 -1 2 2 26 2 2 3 22 35 1
-64 59 -1 7 2 26 2 4 3 22 35 1
-64 58 -1 12 2 26 1 2 2 24 37 3
-64 57 -1 17 2 26 1 4 2 24 37 3
-64 56 -1 22 2 26 4 2 2 28 40 1
-64 55 -1 2 2 32 2 2 2 26 38 1
-64 54 -1 7 2 32 2 4 2 26 38 1
-64 53 -1 12 2 32 3 1 1 28 42 2
-64 52 -1 17 2 32 1 3 1 28 41 1
-64 51 -1 22 2 32 1 5 1 28 41 1
-64 50 -1 10 1 10 3 5 1 26 40 2
-64 49 -1 9 1 10 1 3 1 26 39 1
-64 48 -1 8 1 10 1 1 1 26 39 1
-64 47 -1 7 1 10 2 4 18 28 39 1
-64 46 -1 6 1 10 2 2 18 28 39 1
-64 45 -1 10 9 1 4 5 18 26 38 1
-64 44 -1 9 9 1 1 3 18 22 36 3
-64 43 -1 8 9 1 1 1 18 22 36 3
-64 42 -1 7 9 1 2 4 17 24 37 1
-64 41 -1 6 9 1 2 1 17 24 37 1
-64 40 -1 10 9 2 2 4 17 24 38 2
-64 39 -1 9 9 2 2 1 17 24 38 2
-64 38 -1 8 9 2 1 4 17 18 32 2
-64 37 -1 7 9 2 1 2 17 18 32 2
-64 36 -1 6 9 2 3 3 17 17 29 1
-64 35 -1 10 9 4 2 4 17 17 30 2
-64 34 -1 9 9 4 2 1 17 17 30 2
-64 33 -1 8 9 4 1 4 16 16 28 1
-64 32 -1 7 9 4 1 2 16 16 28 1
-64 31 -1 6 9 4 3 3 16 15 26 1
-64 30 -1 10 9 8 2 4 16 15 27 2
-64 29 -1 9 9 8 2 2 16 15 27 2
-64 28 -1 8 9 8 1 3 16 11 19 1
-64 27 -1 7 9 8 3 4 16 10 18 1
-64 26 -1 6 9 8 3 2 16 10 18 1
-64 25 -1 10 9 15 2 5 16 6 11 1
-64 24 -1 9 9 15 2 4 16 6 11 1
-64 23 -1 8 9 15 2 2 16 6 11 1
-64 22 -1 7 9 15 2 1 16 6 11 1
-64 21 -1 6 9 15 3 3 16 5 10 1
-64 20 -1 10 9 22 3 5 16 1 1 1
-64 19 -1 9 9 22 1 3 16 1 2 2
-64 18 -1 8 9 22 1 1 16 1 2 2
-64 17 -1 7 9 22 2 4 34 13 31 1
-64 16 -1 6 9 22 2 2 34 13 31 1
-64 15 -1 10 8 18 1 4 34 13 32 2
-64 14 -1 9 8 18 3 4 33 16 41 2
-64 13 -1 8 8 18 1 1 34 13 32 2
-64 12 -1 7 8 18 2 4 33 12 32 2
-64 11 -1 6 8 18 2 2 33 12 32 2
-64 10 -1 10 8 19 2 4 33 12 33 3
-64 9 -1 9 8 19 3 5 33 8 18 1
-64 8 -1 8 8 19 3 4 33 8 18 1
-64 7 -1 7 8 19 1 3 33 8 19 2
-64 6 -1 6 8 19 1 1 33 8 19 2
-64 5 -1 10 8 20 1 4 33 4 9 1
-64 4 -1 9 8 20 1 2 33 4 9 1
-63 97 -1 18 3 30 1 3 23 1 1 1
-63 96 -1 23 3 30 2 3 23 2 2 1
-63 95 -1 3 3 17 3 2 23 5 12 3
-63 94 -1 8 3 17 3 4 23 5 12 3
-63 93 -1 13 3 17 3 5 23 5 12 3
-63 92 -1 18 3 17 2 2 23 9 21 1
-63 91 -1 23 3 17 2 5 23 9 21 1
-63 90 -1 3 3 20 4 1 23 9 23 3
-63 89 -1 8 3 20 2 5 23 9 22 2
-63 88 -1 13 3 20 3 1 23 13 34 1
-63 87 -1 18 3 20 3 3 23 13 34 1
-63 86 -1 23 3 20 3 4 23 13 34 1
-63 85 -1 3 3 24 2 3 22 16 40 3
-63 84 -1 8 3 24 4 2 5 1 1 1
-63 83 -1 13 3 24 3 2 4 4 8 2
-63 82 -1 18 3 24 3 3 4 4 8 2
-63 81 -1 23 3 24 3 4 4 4 8 2
-63 80 -1 3 3 27 3 2 4 8 14 1
-63 79 -1 8 3 27 3 3 4 8 14 1
-63 78 -1 13 3 27 3 4 4 8 14 1
-63 77 -1 18 3 27 2 4 4 7 13 2
-63 76 -1 23 3 27 4 3 4 12 21 1
-63 75 -1 3 3 31 3 2 4 11 20 1
-63 74 -1 8 3 31 3 4 4 11 20 1
-63 73 -1 13 3 31 3 5 4 11 20 1
-63 72 -1 18 3 31 2 2 4 14 24 1
-63 71 -1 23 3 31 2 5 4 14 24 1
-63 70 -1 3 3 33 3 2 4 14 25 2
-63 69 -1 8 3 33 3 4 4 14 25 2
-63 68 -1 13 3 33 4 1 4 17 29 1
-63 67 -1 18 3 33 4 2 4 17 29 1
-63 66 -1 23 3 33 2 5 3 20 33 1
-63 65 -1 3 2 18 2 3 3 20 34 2
-63 64 -1 8 2 18 2 5 3 20 34 2
-63 63 -1 13 2 18 3 1 3 24 36 1
-63 62 -1 18 2 18 3 2 3 24 36 1
-63 61 -1 23 2 18 3 5 3 24 36 1
-63 60 -1 3 2 26 3 1 3 26 38 1
-63 59 -1 8 2 26 2 5 3 22 35 1
-63 58 -1 13 2 26 3 2 3 26 38 1
-63 57 -1 18 2 26 3 4 3 26 38 1
-63 56 -1 23 2 26 4 3 2 28 40 1
-63 55 -1 3 2 32 4 1 2 26 39 2
-63 54 -1 8 2 32 4 3 2 26 39 2
-63 53 -1 13 2 32 2 5 2 26 38 1
-63 52 -1 18 2 32 3 2 1 28 42 2
-63 51 -1 23 2 32 3 4 1 28 42 2
-63 50 -1 15 1 10 3 4 1 26 40 2
-63 49 -1 14 1 10 3 2 1 26 40 2
-63 48 -1 13 1 10 4 5 18 28 40 2
-63 47 -1 12 1 10 4 3 18 28 40 2
-63 46 -1 11 1 10 2 1 18 28 39 1
-63 45 -1 15 9 1 4 4 18 26 38 1
-63 44 -1 14 9 1 3 5 17 28 40 1
-63 43 -1 13 9 1 3 4 17 28 40 1
-63 42 -1 12 9 1 2 3 17 24 37 1
-63 41 -1 11 9 1 3 2 17 28 40 1
-63 40 -1 15 9 2 2 3 17 24 38 2
-63 39 -1 14 9 2 4 4 17 22 35 1
-63 38 -1 13 9 2 4 2 17 22 35 1
-63 37 -1 12 9 2 3 5 17 17 29 1
-63 36 -1 11 9 2 3 2 17 17 29 1
-63 35 -1 15 9 4 2 3 17 17 30 2
-63 34 -1 14 9 4 4 3 16 20 32 1
-63 33 -1 13 9 4 4 1 16 20 32 1
-63 32 -1 12 9 4 3 5 16 15 26 1
-63 31 -1 11 9 4 3 2 16 15 26 1
-63 30 -1 15 9 8 2 3 16 15 27 2
-63 29 -1 14 9 8 2 1 16 15 27 2
-63 28 -1 13 9 8 3 5 16 10 18 1
-63 27 -1 12 9 8 3 3 16 10 18 1
-63 26 -1 11 9 8 3 1 16 10 18 1
-63 25 -1 15 9 15 4 5 16 9 17 2
-63 24 -1 14 9 15 2 3 16 6 11 1
-63 23 -1 13 9 15 3 5 16 5 10 1
-63 22 -1 12 9 15 3 4 16 5 10 1
-63 21 -1 11 9 15 3 2 16 5 10 1
-63 20 -1 15 9 22 3 4 16 1 1 1
-63 19 -1 14 9 22 3 2 16 1 1 1
-63 18 -1 13 9 22 3 1 16 1 1 1
-63 17 -1 12 9 22 4 3 15 4 9 3
-63 16 -1 11 9 22 2 1 34 13 31 1
-63 15 -1 15 8 18 3 5 33 16 41 2
-63 14 -1 14 8 18 3 3 33 16 41 2
-63 13 -1 13 8 18 3 2 33 16 41 2
-63 12 -1 12 8 18 4 5 33 12 31 1
-63 11 -1 11 8 18 2 1 33 12 32 2
-63 10 -1 15 8 19 2 3 33 12 33 3
-63 9 -1 14 8 19 2 1 33 12 33 3
-63 8 -1 13 8 19 3 3 33 8 18 1
-63 7 -1 12 8 19 3 2 33 8 18 1
-63 6 -1 11 8 19 3 1 33 8 18 1
-63 5 -1 15 8 20 2 5 33 3 8 2
-63 4 -1 14 8 20 1 1 33 4 9 1
-62 97 -1 19 3 30 2 1 23 2 2 1
-62 96 -1 24 3 30 2 4 23 2 2 1
-62 95 -1 4 3 17 5 1 23 6 13 1
-62 94 -1 9 3 17 5 3 23 6 13 1
-62 93 -1 14 3 17 4 1 23 10 24 1
-62 92 -1 19 3 17 4 2 23 10 24 1
-62 91 -1 24 3 17 4 4 23 10 24 1
-62 90 -1 4 3 20 4 2 23 9 23 3
-62 89 -1 9 3 20 4 4 23 9 23 3
-62 88 -1 14 3 20 5 1 23 13 35 2
-62 87 -1 19 3 20 5 3 23 13 35 2
-62 86 -1 24 3 20 3 5 23 13 34 1
-62 85 -1 4 3 24 4 1 5 1 1 1
-62 84 -1 9 3 24 4 3 5 1 1 1
-62 83 -1 14 3 24 4 4 5 1 1 1
-62 82 -1 19 3 24 4 5 5 1 1 1
-62 81 -1 24 3 24 3 5 4 4 8 2
-62 80 -1 4 3 27 5 1 4 8 15 2
-62 79 -1 9 3 27 5 3 4 8 15 2
-62 78 -1 14 3 27 3 5 4 8 14 1
-62 77 -1 19 3 27 4 1 4 12 21 1
-62 76 -1 24 3 27 4 4 4 12 21 1
-62 75 -1 4 3 31 5 1 4 12 22 2
-62 74 -1 9 3 31 5 3 4 12 22 2
-62 73 -1 14 3 31 4 1 4 15 26 1
-62 72 -1 19 3 31 4 2 4 15 26 1
-62 71 -1 24 3 31 4 4 4 15 26 1
-62 70 -1 4 3 33 3 3 4 14 25 2
-62 69 -1 9 3 33 3 5 4 14 25 2
-62 68 -1 14 3 33 5 3 4 18 30 1
-62 67 -1 19 3 33 4 3 4 17 29 1
-62 66 -1 24 3 33 4 4 4 17 29 1
-62 65 -1 4 2 18 5 1 4 22 33 1
-62 64 -1 9 2 18 5 3 4 22 33 1
-62 63 -1 14 2 18 4 1 3 24 37 2
-62 62 -1 19 2 18 4 2 3 24 37 2
-62 61 -1 24 2 18 4 4 3 24 37 2
-62 60 -1 4 2 26 5 1 3 26 39 2
-62 59 -1 9 2 26 5 3 3 26 39 2
-62 58 -1 14 2 26 3 3 3 26 38 1
-62 57 -1 19 2 26 3 5 3 26 38 1
-62 56 -1 24 2 26 4 4 2 28 40 1
-62 55 -1 4 2 32 4 2 2 26 39 2
-62 54 -1 9 2 32 4 4 2 26 39 2
-62 53 -1 14 2 32 4 5 2 26 39 2
-62 52 -1 19 2 32 3 3 1 28 42 2
-62 51 -1 24 2 32 3 5 1 28 42 2
-62 50 -1 20 1 10 3 3 1 26 40 2
-62 49 -1 19 1 10 3 1 1 26 40 2
-62 48 -1 18 1 10 4 4 18 28 40 2
-62 47 -1 17 1 10 4 2 18 28 40 2
-62 46 -1 16 1 10 4 1 18 28 40 2
-62 45 -1 20 9 1 4 3 18 26 38 1
-62 44 -1 19 9 1 5 5 17 28 41 2
-62 43 -1 18 9 1 5 4 17 28 41 2
-62 42 -1 17 9 1 3 3 17 28 40 1
-62 41 -1 16 9 1 3 1 17 28 40 1
-62 40 -1 20 9 2 4 5 17 22 35 1
-62 39 -1 19 9 2 4 3 17 22 35 1
-62 38 -1 18 9 2 4 1 17 22 35 1
-62 37 -1 17 9 2 3 4 17 17 29 1
-62 36 -1 16 9 2 3 1 17 17 29 1
-62 35 -1 20 9 4 4 5 16 20 32 1
-62 34 -1 19 9 4 4 2 16 20 32 1
-62 33 -1 18 9 4 5 4 16 19 31 1
-62 32 -1 17 9 4 3 4 16 15 26 1
-62 31 -1 16 9 4 3 1 16 15 26 1
-62 30 -1 20 9 8 4 5 16 14 25 1
-62 29 -1 19 9 8 4 3 16 14 25 1
-62 28 -1 18 9 8 4 1 16 14 25 1
-62 27 -1 17 9 8 5 4 16 9 16 1
-62 26 -1 16 9 8 5 2 16 9 16 1
-62 25 -1 20 9 15 4 4 16 9 17 2
-62 24 -1 19 9 15 4 2 16 9 17 2
-62 23 -1 18 9 15 5 5 16 5 9 2
-62 22 -1 17 9 15 5 3 16 5 9 2
-62 21 -1 16 9 15 3 1 16 5 10 1
-62 20 -1 20 9 22 3 3 16 1 1 1
-62 19 -1 19 9 22 4 5 15 4 9 3
-62 18 -1 18 9 22 4 4 15 4 9 3
-62 17 -1 17 9 22 4 2 15 4 9 3
-62 16 -1 16 9 22 4 1 15 4 9 3
-62 15 -1 20 8 18 5 5 33 16 40 1
-62 14 -1 19 8 18 5 3 33 16 40 1
-62 13 -1 18 8 18 3 1 33 16 41 2
-62 12 -1 17 8 18 4 4 33 12 31 1
-62 11 -1 16 8 18 4 2 33 12 31 1
-62 10 -1 20 8 19 4 5 33 11 30 3
-62 9 -1 19 8 19 4 3 33 11 30 3
-62 8 -1 18 8 19 4 1 33 11 30 3
-62 7 -1 17 8 19 5 4 33 7 17 2
-62 6 -1 16 8 19 5 2 33 7 17 2
-62 5 -1 20 8 20 2 4 33 3 8 2
-62 4 -1 19 8 20 2 2 33 3 8 2
-61 97 -1 20 3 30 2 2 23 2 2 1
-61 96 -1 25 3 30 2 5 23 2 2 1
-61 95 -1 5 3 17 5 2 23 6 13 1
-61 94 -1 10 3 17 5 4 23 6 13 1
-61 93 -1 15 3 17 5 5 23 6 13 1
-61 92 -1 20 3 17 4 3 23 10 24 1
-61 91 -1 25 3 17 4 5 23 10 24 1
-61 90 -1 5 3 20 4 3 23 9 23 3
-61 89 -1 10 3 20 4 5 23 9 23 3
-61 88 -1 15 3 20 5 2 23 13 35 2
-61 87 -1 20 3 20 5 4 23 13 35 2
-61 86 -1 25 3 20 5 5 23 13 35 2
-61 85 -1 5 3 24 5 1 5 1 2 2
-61 84 -1 10 3 24 5 2 5 1 2 2
-61 83 -1 15 3 24 5 3 5 1 2 2
-61 82 -1 20 3 24 5 4 5 1 2 2
-61 81 -1 25 3 24 5 5 5 1 2 2
-61 80 -1 5 3 27 5 2 4 8 15 2
-61 79 -1 10 3 27 5 4 4 8 15 2
-61 78 -1 15 3 27 5 5 4 8 15 2
-61 77 -1 20 3 27 4 2 4 12 21 1
-61 76 -1 25 3 27 4 5 4 12 21 1
-61 75 -1 5 3 31 5 2 4 12 22 2
-61 74 -1 10 3 31 5 4 4 12 22 2
-61 73 -1 15 3 31 5 5 4 12 22 2
-61 72 -1 20 3 31 4 3 4 15 26 1
-61 71 -1 25 3 31 4 5 4 15 26 1
-61 70 -1 5 3 33 5 1 4 18 30 1
-61 69 -1 10 3 33 5 2 4 18 30 1
-61 68 -1 15 3 33 5 4 4 18 30 1
-61 67 -1 20 3 33 5 5 4 18 30 1
-61 66 -1 25 3 33 4 5 4 17 29 1
-61 65 -1 5 2 18 5 2 4 22 33 1
-61 64 -1 10 2 18 5 4 4 22 33 1
-61 63 -1 15 2 18 5 5 4 22 33 1
-61 62 -1 20 2 18 4 3 3 24 37 2
-61 61 -1 25 2 18 4 5 3 24 37 2
-61 60 -1 5 2 26 5 2 3 26 39 2
-61 59 -1 10 2 26 5 4 3 26 39 2
-61 58 -1 15 2 26 5 5 3 26 39 2
-61 57 -1 20 2 26 4 1 2 28 40 1
-61 56 -1 25 2 26 4 5 2 28 40 1
-61 45 -1 25 9 1 4 2 18 26 38 1
-61 44 -1 24 9 1 4 1 18 26 38 1
-61 43 -1 23 9 1 5 3 17 28 41 2
-61 42 -1 22 9 1 5 2 17 28 41 2
-61 41 -1 21 9 1 5 1 17 28 41 2
-61 40 -1 25 9 2 5 5 17 22 36 2
-61 39 -1 24 9 2 5 4 17 22 36 2
-61 38 -1 23 9 2 5 3 17 22 36 2
-61 37 -1 22 9 2 5 2 17 22 36 2
-61 36 -1 21 9 2 5 1 17 22 36 2
-61 35 -1 25 9 4 4 4 16 20 32 1
-61 34 -1 24 9 4 5 5 16 19 31 1
-61 33 -1 23 9 4 5 3 16 19 31 1
-61 32 -1 22 9 4 5 2 16 19 31 1
-61 31 -1 21 9 4 5 1 16 19 31 1
-61 30 -1 25 9 8 4 4 16 14 25 1
-61 29 -1 24 9 8 4 2 16 14 25 1
-61 28 -1 23 9 8 5 5 16 9 16 1
-61 27 -1 22 9 8 5 3 16 9 16 1
-61 26 -1 21 9 8 5 1 16 9 16 1
-61 25 -1 25 9 15 4 3 16 9 17 2
-61 24 -1 24 9 15 4 1 16 9 17 2
-61 23 -1 23 9 15 5 4 16 5 9 2
-61 22 -1 22 9 15 5 2 16 5 9 2
-61 21 -1 21 9 15 5 1 16 5 9 2
-61 20 -1 25 9 22 5 5 15 4 8 2
-61 19 -1 24 9 22 5 4 15 4 8 2
-61 18 -1 23 9 22 5 3 15 4 8 2
-61 17 -1 22 9 22 5 2 15 4 8 2
-61 16 -1 21 9 22 5 1 15 4 8 2
-61 15 -1 25 8 18 5 4 33 16 40 1
-61 14 -1 24 8 18 5 2 33 16 40 1
-61 13 -1 23 8 18 5 1 33 16 40 1
-61 12 -1 22 8 18 4 3 33 12 31 1
-61 11 -1 21 8 18 4 1 33 12 31 1
-61 10 -1 25 8 19 4 4 33 11 30 3
-61 9 -1 24 8 19 4 2 33 11 30 3
-61 8 -1 23 8 19 5 5 33 7 17 2
-61 7 -1 22 8 19 5 3 33 7 17 2
-61 6 -1 21 8 19 5 1 33 7 17 2
-61 5 -1 25 8 20 2 3 33 3 8 2
-61 4 -1 24 8 20 2 1 33 3 8 2
-60 100 -1 1 3 5 1 1 23 2 3 2
-60 99 -1 6 3 5 1 2 23 2 3 2
-60 98 -1 11 3 5 1 3 23 2 3 2
-60 97 -1 16 3 5 1 4 23 2 3 2
-60 96 -1 21 3 5 1 5 23 2 3 2
-60 95 -1 1 3 6 1 1 23 6 14 2
-60 94 -1 6 3 6 1 3 23 6 14 2
-60 93 -1 11 3 6 1 5 23 6 14 2
-60 92 -1 16 3 6 2 2 23 10 25 2
-60 91 -1 21 3 6 2 4 23 10 25 2
-60 90 -1 1 3 7 2 1 23 10 26 3
-60 89 -1 6 3 7 2 3 23 10 26 3
-60 88 -1 11 3 7 1 1 23 14 36 1
-60 87 -1 16 3 7 1 2 23 14 36 1
-60 86 -1 21 3 7 1 4 23 14 36 1
-60 85 -1 1 3 8 1 1 5 1 3 3
-60 84 -1 6 3 8 1 2 5 1 3 3
-60 83 -1 11 3 8 1 3 5 1 3 3
-60 82 -1 16 3 8 1 4 5 1 3 3
-60 81 -1 21 3 8 1 5 5 1 3 3
-60 80 -1 1 3 13 2 1 5 5 10 1
-60 79 -1 6 3 13 2 3 5 5 10 1
-60 78 -1 11 3 13 1 1 5 9 18 1
-60 77 -1 16 3 13 1 2 5 9 18 1
-60 76 -1 21 3 13 1 4 5 9 18 1
-60 75 -1 1 3 14 1 1 4 16 27 1
-60 74 -1 6 3 14 1 2 4 16 27 1
-60 73 -1 11 3 14 1 3 4 16 27 1
-60 72 -1 16 3 14 1 4 4 16 27 1
-60 71 -1 21 3 14 1 5 4 16 27 1
-60 70 -1 1 3 15 1 1 4 19 31 1
-60 69 -1 6 3 15 1 2 4 19 31 1
-60 68 -1 11 3 15 1 3 4 19 31 1
-60 67 -1 16 3 15 2 1 4 24 35 1
-60 66 -1 21 3 15 2 3 4 24 35 1
-60 65 -1 1 3 16 2 1 4 22 34 2
-60 64 -1 6 3 16 2 3 4 22 34 2
-60 63 -1 11 3 16 1 1 4 26 38 1
-60 62 -1 16 3 16 1 2 4 26 38 1
-60 61 -1 21 3 16 1 4 4 26 38 1
-60 60 -1 1 2 25 5 2 3 28 41 1
-60 59 -1 6 2 25 5 1 3 28 41 1
-60 58 -1 11 2 3 5 1 3 26 40 3
-60 43 -1 3 9 14 1 3 17 26 39 1
-60 42 -1 2 9 14 1 4 17 26 39 1
-60 41 -1 1 9 14 1 5 17 26 39 1
-60 40 -1 5 9 32 1 5 16 28 40 3
-60 39 -1 4 9 32 1 3 16 28 40 3
-60 38 -1 3 9 32 1 1 16 28 40 3
-60 37 -1 2 9 32 2 4 16 24 36 1
-60 36 -1 1 9 32 2 2 16 24 36 1
-60 35 -1 5 9 33 2 5 16 22 35 3
-60 34 -1 4 9 33 2 2 16 22 35 3
-60 33 -1 3 9 33 1 4 16 18 30 1
-60 32 -1 2 9 33 1 2 16 18 30 1
-60 31 -1 1 9 33 1 1 16 18 30 1
-60 30 -1 5 8 21 1 5 16 13 24 2
-60 29 -1 4 8 21 1 4 16 13 24 2
-60 28 -1 3 8 21 1 3 16 13 24 2
-60 27 -1 2 8 21 1 2 16 13 24 2
-60 26 -1 1 8 21 1 1 16 13 24 2
-60 25 -1 5 8 22 1 5 15 12 23 2
-60 24 -1 4 8 22 1 4 15 12 23 2
-60 23 -1 3 8 22 1 2 15 12 23 2
-60 22 -1 2 8 22 2 5 15 8 17 1
-60 21 -1 1 8 22 2 2 15 8 17 1
-60 20 -1 5 8 27 1 5 15 4 7 1
-60 19 -1 4 8 27 1 4 15 4 7 1
-60 18 -1 3 8 27 1 3 15 4 7 1
-60 17 -1 2 8 27 1 2 15 4 7 1
-60 16 -1 1 8 27 1 1 15 4 7 1
-60 15 -1 5 8 28 1 5 33 15 39 2
-60 14 -1 4 8 28 1 4 33 15 39 2
-60 13 -1 3 8 28 1 2 33 15 39 2
-60 12 -1 2 8 28 2 5 33 11 28 1
-60 11 -1 1 8 28 2 2 33 11 28 1
-60 10 -1 5 8 29 2 5 33 11 29 2
-60 9 -1 4 8 29 2 3 33 11 29 2
-60 8 -1 3 8 29 1 5 33 7 16 1
-60 7 -1 2 8 29 1 4 33 7 16 1
-60 6 -1 1 8 29 1 2 33 7 16 1
-60 5 -1 5 8 30 1 5 33 3 7 1
-60 4 -1 4 8 30 1 4 33 3 7 1
-60 3 -1 3 8 30 1 3 33 3 7 1
-60 2 -1 2 8 30 1 2 33 3 7 1
-60 1 -1 1 8 30 1 1 33 3 7 1
-59 100 -1 2 3 5 2 1 23 3 4 1
-59 99 -1 7 3 5 2 2 23 3 4 1
-59 98 -1 12 3 5 2 3 23 3 4 1
-59 97 -1 17 3 5 2 4 23 3 4 1
-59 96 -1 22 3 5 2 5 23 3 4 1
-59 95 -1 2 3 6 1 2 23 6 14 2
-59 94 -1 7 3 6 1 4 23 6 14 2
-59 93 -1 12 3 6 2 1 23 10 25 2
-59 92 -1 17 3 6 2 3 23 10 25 2
-59 91 -1 22 3 6 2 5 23 10 25 2
-59 90 -1 2 3 7 2 2 23 10 26 3
-59 89 -1 7 3 7 2 4 23 10 26 3
-59 88 -1 12 3 7 3 1 23 14 37 2
-59 87 -1 17 3 7 1 3 23 14 36 1
-59 86 -1 22 3 7 1 5 23 14 36 1
-59 85 -1 2 3 8 2 1 5 2 4 1
-59 84 -1 7 3 8 2 2 5 2 4 1
-59 83 -1 12 3 8 2 3 5 2 4 1
-59 82 -1 17 3 8 2 4 5 2 4 1
-59 81 -1 22 3 8 4 2 5 6 11 1
-59 80 -1 2 3 13 2 2 5 5 10 1
-59 79 -1 7 3 13 2 4 5 5 10 1
-59 78 -1 12 3 13 3 1 5 9 19 2
-59 77 -1 17 3 13 1 3 5 9 18 1
-59 76 -1 22 3 13 1 5 5 9 18 1
-59 75 -1 2 3 14 3 1 5 13 24 1
-59 74 -1 7 3 14 2 1 4 16 28 2
-59 73 -1 12 3 14 2 2 4 16 28 2
-59 72 -1 17 3 14 2 3 4 16 28 2
-59 71 -1 22 3 14 2 4 4 16 28 2
-59 70 -1 2 3 15 3 1 4 20 32 1
-59 69 -1 7 3 15 3 3 4 20 32 1
-59 68 -1 12 3 15 1 4 4 19 31 1
-59 67 -1 17 3 15 1 5 4 19 31 1
-59 66 -1 22 3 15 2 4 4 24 35 1
-59 65 -1 2 3 16 2 2 4 22 34 2
-59 64 -1 7 3 16 2 4 4 22 34 2
-59 63 -1 12 3 16 2 5 4 22 34 2
-59 62 -1 17 3 16 1 3 4 26 38 1
-59 61 -1 22 3 16 1 5 4 26 38 1
-59 60 -1 2 2 25 5 4 3 28 41 1
-59 59 -1 7 2 25 5 3 3 28 41 1
-59 42 -1 7 9 14 1 1 17 26 39 1
-59 41 -1 6 9 14 1 2 17 26 39 1
-59 40 -1 10 9 32 1 4 16 28 40 3
-59 39 -1 9 9 32 1 2 16 28 40 3
-59 38 -1 8 9 32 2 5 16 24 36 1
-59 37 -1 7 9 32 2 3 16 24 36 1
-59 36 -1 6 9 32 2 1 16 24 36 1
-59 35 -1 10 9 33 2 4 16 22 35 3
-59 34 -1 9 9 33 1 5 16 18 30 1
-59 33 -1 8 9 33 1 3 16 18 30 1
-59 32 -1 7 9 33 3 4 16 17 29 1
-59 31 -1 6 9 33 3 2 16 17 29 1
-59 30 -1 10 8 21 2 5 16 13 23 1
-59 29 -1 9 8 21 2 3 16 13 23 1
-59 28 -1 8 8 21 2 2 16 13 23 1
-59 27 -1 7 8 21 2 1 16 13 23 1
-59 26 -1 6 8 21 3 2 15 16 29 2
-59 25 -1 10 8 22 3 5 15 12 22 1
-59 24 -1 9 8 22 1 3 15 12 23 2
-59 23 -1 8 8 22 1 1 15 12 23 2
-59 22 -1 7 8 22 2 4 15 8 17 1
-59 21 -1 6 8 22 2 1 15 8 17 1
-59 20 -1 10 8 27 4 5 15 7 16 2
-59 19 -1 9 8 27 2 5 15 3 6 2
-59 18 -1 8 8 27 2 4 15 3 6 2
-59 17 -1 7 8 27 2 3 15 3 6 2
-59 16 -1 6 8 27 2 2 15 3 6 2
-59 15 -1 10 8 28 3 5 33 15 38 1
-59 14 -1 9 8 28 1 3 33 15 39 2
-59 13 -1 8 8 28 1 1 33 15 39 2
-59 12 -1 7 8 28 2 4 33 11 28 1
-59 11 -1 6 8 28 2 1 33 11 28 1
-59 10 -1 10 8 29 2 4 33 11 29 2
-59 9 -1 9 8 29 2 2 33 11 29 2
-59 8 -1 8 8 29 2 1 33 11 29 2
-59 7 -1 7 8 29 1 3 33 7 16 1
-59 6 -1 6 8 29 1 1 33 7 16 1
-59 5 -1 10 8 30 2 5 33 2 6 3
-59 4 -1 9 8 30 2 4 33 2 6 3
-59 3 -1 8 8 30 2 3 33 2 6 3
-59 2 -1 7 8 30 2 2 33 2 6 3
-59 1 -1 6 8 30 2 1 33 2 6 3
-58 100 -1 3 3 5 3 1 23 3 5 2
-58 99 -1 8 3 5 3 2 23 3 5 2
-58 98 -1 13 3 5 3 3 23 3 5 2
-58 97 -1 18 3 5 3 5 23 3 5 2
-58 96 -1 23 3 5 4 3 23 7 15 1
-58 95 -1 3 3 6 4 1 23 7 16 2
-58 94 -1 8 3 6 3 1 23 11 27 1
-58 93 -1 13 3 6 3 2 23 11 27 1
-58 92 -1 18 3 6 3 3 23 11 27 1
-58 91 -1 23 3 6 3 4 23 11 27 1
-58 90 -1 3 3 7 4 1 23 11 28 2
-58 89 -1 8 3 7 2 5 23 10 26 3
-58 88 -1 13 3 7 3 2 23 14 37 2
-58 87 -1 18 3 7 3 3 23 14 37 2
-58 86 -1 23 3 7 3 4 23 14 37 2
-58 85 -1 3 3 8 3 1 5 2 5 2
-58 84 -1 8 3 8 3 2 5 2 5 2
-58 83 -1 13 3 8 3 3 5 2 5 2
-58 82 -1 18 3 8 2 5 5 2 4 1
-58 81 -1 23 3 8 4 3 5 6 11 1
-58 80 -1 3 3 13 4 1 5 6 12 2
-58 79 -1 8 3 13 2 5 5 5 10 1
-58 78 -1 13 3 13 3 2 5 9 19 2
-58 77 -1 18 3 13 3 3 5 9 19 2
-58 76 -1 23 3 13 3 4 5 9 19 2
-58 75 -1 3 3 14 3 2 5 13 24 1
-58 74 -1 8 3 14 3 3 5 13 24 1
-58 73 -1 13 3 14 3 4 5 13 24 1
-58 72 -1 18 3 14 3 5 5 13 24 1
-58 71 -1 23 3 14 2 5 4 16 28 2
-58 70 -1 3 3 15 3 2 4 20 32 1
-58 69 -1 8 3 15 3 4 4 20 32 1
-58 68 -1 13 3 15 3 5 4 20 32 1
-58 67 -1 18 3 15 2 2 4 24 35 1
-58 66 -1 23 3 15 2 5 4 24 35 1
-58 65 -1 3 3 16 4 1 4 24 36 2
-58 64 -1 8 3 16 4 4 4 24 36 2
-58 63 -1 13 3 16 3 1 4 26 39 2
-58 62 -1 18 3 16 3 3 4 26 39 2
-58 61 -1 23 3 16 3 5 4 26 39 2
-58 60 -1 3 2 25 5 5 3 28 41 1
-58 41 -1 11 9 21 1 1 16 28 39 2
-58 40 -1 15 9 32 3 5 16 28 38 1
-58 39 -1 14 9 32 3 4 16 28 38 1
-58 38 -1 13 9 32 3 2 16 28 38 1
-58 37 -1 12 9 32 4 5 16 22 33 1
-58 36 -1 11 9 32 4 3 16 22 33 1
-58 35 -1 15 9 33 2 3 16 22 35 3
-58 34 -1 14 9 33 2 1 16 22 35 3
-58 33 -1 13 9 33 3 5 16 17 29 1
-58 32 -1 12 9 33 3 3 16 17 29 1
-58 31 -1 11 9 33 3 1 16 17 29 1
-58 30 -1 15 8 21 2 4 16 13 23 1
-58 29 -1 14 8 21 3 5 15 16 29 2
-58 28 -1 13 8 21 3 4 15 16 29 2
-58 27 -1 12 8 21 3 3 15 16 29 2
-58 26 -1 11 8 21 3 1 15 16 29 2
-58 25 -1 15 8 22 3 4 15 12 22 1
-58 24 -1 14 8 22 3 2 15 12 22 1
-58 23 -1 13 8 22 3 1 15 12 22 1
-58 22 -1 12 8 22 2 3 15 8 17 1
-58 21 -1 11 8 22 4 3 15 7 15 1
-58 20 -1 15 8 27 4 4 15 7 16 2
-58 19 -1 14 8 27 3 5 15 3 5 1
-58 18 -1 13 8 27 3 3 15 3 5 1
-58 17 -1 12 8 27 3 1 15 3 5 1
-58 16 -1 11 8 27 2 1 15 3 6 2
-58 15 -1 15 8 28 3 4 33 15 38 1
-58 14 -1 14 8 28 3 2 33 15 38 1
-58 13 -1 13 8 28 3 1 33 15 38 1
-58 12 -1 12 8 28 2 3 33 11 28 1
-58 11 -1 11 8 28 4 3 33 10 25 2
-58 10 -1 15 8 29 3 5 33 10 27 4
-58 9 -1 14 8 29 3 4 33 10 27 4
-58 8 -1 13 8 29 3 3 33 10 27 4
-58 7 -1 12 8 29 3 1 33 10 27 4
-58 6 -1 11 8 29 4 3 33 6 14 2
-58 5 -1 15 8 30 4 5 33 6 15 3
-58 4 -1 14 8 30 3 5 33 2 5 2
-58 3 -1 13 8 30 3 4 33 2 5 2
-58 2 -1 12 8 30 3 3 33 2 5 2
-58 1 -1 11 8 30 3 2 33 2 5 2
-57 100 -1 4 3 5 5 1 23 3 6 3
-57 99 -1 9 3 5 5 3 23 3 6 3
-57 98 -1 14 3 5 3 4 23 3 5 2
-57 97 -1 19 3 5 4 1 23 7 15 1
-57 96 -1 24 3 5 4 4 23 7 15 1
-57 95 -1 4 3 6 4 2 23 7 16 2
-57 94 -1 9 3 6 4 4 23 7 16 2
-57 93 -1 14 3 6 5 1 23 11 29 3
-57 92 -1 19 3 6 5 3 23 11 29 3
-57 91 -1 24 3 6 3 5 23 11 27 1
-57 90 -1 4 3 7 4 2 23 11 28 2
-57 89 -1 9 3 7 4 4 23 11 28 2
-57 88 -1 14 3 7 5 1 23 15 38 1
-57 87 -1 19 3 7 5 3 23 15 38 1
-57 86 -1 24 3 7 3 5 23 14 37 2
-57 85 -1 4 3 8 5 1 5 3 6 1
-57 84 -1 9 3 8 5 3 5 3 6 1
-57 83 -1 14 3 8 3 4 5 2 5 2
-57 82 -1 19 3 8 3 5 5 2 5 2
-57 81 -1 24 3 8 4 4 5 6 11 1
-57 80 -1 4 3 13 4 2 5 6 12 2
-57 79 -1 9 3 13 4 4 5 6 12 2
-57 78 -1 14 3 13 5 1 5 10 20 1
-57 77 -1 19 3 13 5 3 5 10 20 1
-57 76 -1 24 3 13 3 5 5 9 19 2
-57 75 -1 4 3 14 4 1 5 13 25 2
-57 74 -1 9 3 14 4 2 5 13 25 2
-57 73 -1 14 3 14 4 3 5 13 25 2
-57 72 -1 19 3 14 4 4 5 13 25 2
-57 71 -1 24 3 14 4 5 5 13 25 2
-57 70 -1 4 3 15 5 1 5 17 30 1
-57 69 -1 9 3 15 5 3 5 17 30 1
-57 68 -1 14 3 15 4 1 4 24 37 3
-57 67 -1 19 3 15 4 2 4 24 37 3
-57 66 -1 24 3 15 4 4 4 24 37 3
-57 65 -1 4 3 16 4 2 4 24 36 2
-57 64 -1 9 3 16 4 5 4 24 36 2
-57 63 -1 14 3 16 3 2 4 26 39 2
-57 62 -1 19 3 16 3 4 4 26 39 2
-57 61 -1 24 3 16 5 4 4 28 40 1
-57 40 -1 20 9 32 5 5 16 26 37 1
-57 39 -1 19 9 32 3 3 16 28 38 1
-57 38 -1 18 9 32 3 1 16 28 38 1
-57 37 -1 17 9 32 4 4 16 22 33 1
-57 36 -1 16 9 32 4 2 16 22 33 1
-57 35 -1 20 9 33 4 5 16 22 34 2
-57 34 -1 19 9 33 4 3 16 22 34 2
-57 33 -1 18 9 33 4 1 16 22 34 2
-57 32 -1 17 9 33 5 4 15 20 35 1
-57 31 -1 16 9 33 5 2 15 20 35 1
-57 30 -1 20 8 21 4 5 15 16 28 1
-57 29 -1 19 8 21 4 4 15 16 28 1
-57 28 -1 18 8 21 4 3 15 16 28 1
-57 27 -1 17 8 21 4 2 15 16 28 1
-57 26 -1 16 8 21 4 1 15 16 28 1
-57 25 -1 20 8 22 3 3 15 12 22 1
-57 24 -1 19 8 22 5 4 15 11 21 1
-57 23 -1 18 8 22 5 2 15 11 21 1
-57 22 -1 17 8 22 4 5 15 7 15 1
-57 21 -1 16 8 22 4 2 15 7 15 1
-57 20 -1 20 8 27 4 3 15 7 16 2
-57 19 -1 19 8 27 3 4 15 3 5 1
-57 18 -1 18 8 27 3 2 15 3 5 1
-57 17 -1 17 8 27 5 4 15 2 4 2
-57 16 -1 16 8 27 5 2 15 2 4 2
-57 15 -1 20 8 28 3 3 33 15 38 1
-57 14 -1 19 8 28 5 4 33 14 37 2
-57 13 -1 18 8 28 5 2 33 14 37 2
-57 12 -1 17 8 28 4 5 33 10 25 2
-57 11 -1 16 8 28 4 2 33 10 25 2
-57 10 -1 20 8 29 5 5 33 10 26 3
-57 9 -1 19 8 29 5 3 33 10 26 3
-57 8 -1 18 8 29 3 2 33 10 27 4
-57 7 -1 17 8 29 4 5 33 6 14 2
-57 6 -1 16 8 29 4 2 33 6 14 2
-57 5 -1 20 8 30 4 4 33 6 15 3
-57 4 -1 19 8 30 4 2 33 6 15 3
-57 3 -1 18 8 30 5 5 33 2 4 1
-57 2 -1 17 8 30 5 3 33 2 4 1
-57 1 -1 16 8 30 3 1 33 2 5 2
-56 100 -1 5 3 5 5 2 23 3 6 3
-56 99 -1 10 3 5 5 4 23 3 6 3
-56 98 -1 15 3 5 5 5 23 3 6 3
-56 97 -1 20 3 5 4 2 23 7 15 1
-56 96 -1 25 3 5 4 5 23 7 15 1
-56 95 -1 5 3 6 4 3 23 7 16 2
-56 94 -1 10 3 6 4 5 23 7 16 2
-56 93 -1 15 3 6 5 2 23 11 29 3
-56 92 -1 20 3 6 5 4 23 11 29 3
-56 91 -1 25 3 6 5 5 23 11 29 3
-56 90 -1 5 3 7 4 3 23 11 28 2
-56 89 -1 10 3 7 4 5 23 11 28 2
-56 88 -1 15 3 7 5 2 23 15 38 1
-56 87 -1 20 3 7 5 4 23 15 38 1
-56 86 -1 25 3 7 5 5 23 15 38 1
-56 85 -1 5 3 8 5 2 5 3 6 1
-56 84 -1 10 3 8 5 4 5 3 6 1
-56 83 -1 15 3 8 5 5 5 3 6 1
-56 82 -1 20 3 8 4 1 5 6 11 1
-56 81 -1 25 3 8 4 5 5 6 11 1
-56 80 -1 5 3 13 4 3 5 6 12 2
-56 79 -1 10 3 13 4 5 5 6 12 2
-56 78 -1 15 3 13 5 2 5 10 20 1
-56 77 -1 20 3 13 5 4 5 10 20 1
-56 76 -1 25 3 13 5 5 5 10 20 1
-56 75 -1 5 3 14 5 1 5 14 26 1
-56 74 -1 10 3 14 5 2 5 14 26 1
-56 73 -1 15 3 14 5 3 5 14 26 1
-56 72 -1 20 3 14 5 4 5 14 26 1
-56 71 -1 25 3 14 5 5 5 14 26 1
-56 70 -1 5 3 15 5 2 5 17 30 1
-56 69 -1 10 3 15 5 4 5 17 30 1
-56 68 -1 15 3 15 5 5 5 17 30 1
-56 67 -1 20 3 15 4 3 4 24 37 3
-56 66 -1 25 3 15 4 5 4 24 37 3
-56 65 -1 5 3 16 4 3 4 24 36 2
-56 64 -1 10 3 16 5 1 4 28 40 1
-56 63 -1 15 3 16 5 2 4 28 40 1
-56 62 -1 20 3 16 5 3 4 28 40 1
-56 61 -1 25 3 16 5 5 4 28 40 1
-56 40 -1 25 9 32 5 4 16 26 37 1
-56 39 -1 24 9 32 5 3 16 26 37 1
-56 38 -1 23 9 32 5 2 16 26 37 1
-56 37 -1 22 9 32 5 1 16 26 37 1
-56 36 -1 21 9 32 4 1 16 22 33 1
-56 35 -1 25 9 33 4 4 16 22 34 2
-56 34 -1 24 9 33 4 2 16 22 34 2
-56 33 -1 23 9 33 5 5 15 20 35 1
-56 32 -1 22 9 33 5 3 15 20 35 1
-56 31 -1 21 9 33 5 1 15 20 35 1
-56 30 -1 25 8 21 5 5 15 15 27 2
-56 29 -1 24 8 21 5 4 15 15 27 2
-56 28 -1 23 8 21 5 3 15 15 27 2
-56 27 -1 22 8 21 5 2 15 15 27 2
-56 26 -1 21 8 21 5 1 15 15 27 2
-56 25 -1 25 8 22 5 5 15 11 21 1
-56 24 -1 24 8 22 5 3 15 11 21 1
-56 23 -1 23 8 22 5 1 15 11 21 1
-56 22 -1 22 8 22 4 4 15 7 15 1
-56 21 -1 21 8 22 4 1 15 7 15 1
-56 20 -1 25 8 27 4 2 15 7 16 2
-56 19 -1 24 8 27 4 1 15 7 16 2
-56 18 -1 23 8 27 5 5 15 2 4 2
-56 17 -1 22 8 27 5 3 15 2 4 2
-56 16 -1 21 8 27 5 1 15 2 4 2
-56 15 -1 25 8 28 5 5 33 14 37 2
-56 14 -1 24 8 28 5 3 33 14 37 2
-56 13 -1 23 8 28 5 1 33 14 37 2
-56 12 -1 22 8 28 4 4 33 10 25 2
-56 11 -1 21 8 28 4 1 33 10 25 2
-56 10 -1 25 8 29 5 4 33 10 26 3
-56 9 -1 24 8 29 5 2 33 10 26 3
-56 8 -1 23 8 29 5 1 33 10 26 3
-56 7 -1 22 8 29 4 4 33 6 14 2
-56 6 -1 21 8 29 4 1 33 6 14 2
-56 5 -1 25 8 30 4 3 33 6 15 3
-56 4 -1 24 8 30 4 1 33 6 15 3
-56 3 -1 23 8 30 5 4 33 2 4 1
-56 2 -1 22 8 30 5 2 33 2 4 1
-56 1 -1 21 8 30 5 1 33 2 4 1
-55 100 -1 1 3 1 1 1 23 4 7 1
-55 99 -1 6 3 1 1 2 23 4 7 1
-55 98 -1 11 3 1 1 4 23 4 7 1
-55 97 -1 16 3 1 2 1 23 8 18 1
-55 96 -1 21 3 1 2 3 23 8 18 1
-55 95 -1 1 3 2 1 1 23 7 17 3
-55 94 -1 6 3 2 1 3 23 7 17 3
-55 93 -1 11 3 2 1 5 23 7 17 3
-55 92 -1 16 3 2 2 2 23 11 30 4
-55 91 -1 21 3 2 2 4 23 11 30 4
-55 90 -1 1 3 3 2 1 23 12 31 1
-55 89 -1 6 3 3 1 1 23 15 39 2
-55 88 -1 11 3 3 1 2 23 15 39 2
-55 87 -1 16 3 3 1 3 23 15 39 2
-55 86 -1 21 3 3 1 5 23 15 39 2
-55 85 -1 1 3 4 1 1 5 3 7 2
-55 84 -1 6 3 4 1 3 5 3 7 2
-55 83 -1 11 3 4 1 5 5 3 7 2
-55 82 -1 16 3 4 2 2 5 7 13 1
-55 81 -1 21 3 4 2 4 5 7 13 1
-55 80 -1 1 3 9 2 1 5 7 14 2
-55 79 -1 6 3 9 2 3 5 7 14 2
-55 78 -1 11 3 9 1 1 5 11 21 1
-55 77 -1 16 3 9 1 2 5 11 21 1
-55 76 -1 21 3 9 1 4 5 11 21 1
-55 75 -1 1 3 10 1 1 5 14 27 2
-55 74 -1 6 3 10 1 2 5 14 27 2
-55 73 -1 11 3 10 1 3 5 14 27 2
-55 72 -1 16 3 10 1 5 5 14 27 2
-55 71 -1 21 3 10 2 3 5 19 32 1
-55 70 -1 1 3 11 1 1 5 18 31 1
-55 69 -1 6 3 11 1 3 5 18 31 1
-55 68 -1 11 3 11 1 5 5 18 31 1
-55 67 -1 16 3 11 2 1 5 22 36 1
-55 66 -1 21 3 11 2 3 5 22 36 1
-55 65 -1 1 3 12 1 1 5 26 38 1
-55 64 -1 6 3 12 1 2 5 26 38 1
-55 63 -1 11 3 12 1 3 5 26 38 1
-55 62 -1 16 3 12 1 4 5 26 38 1
-55 39 -1 4 8 23 1 5 15 28 41 2
-55 38 -1 3 8 23 1 4 15 28 41 2
-55 37 -1 2 8 23 1 3 15 28 41 2
-55 36 -1 1 8 23 1 2 15 28 41 2
-55 35 -1 5 8 24 2 5 15 24 37 1
-55 34 -1 4 8 24 2 2 15 24 37 1
-55 33 -1 3 8 24 1 5 15 19 34 1
-55 32 -1 2 8 24 1 4 15 19 34 1
-55 31 -1 1 8 24 1 2 15 19 34 1
-55 30 -1 5 8 25 2 5 15 18 33 2
-55 29 -1 4 8 25 1 5 15 15 26 1
-55 28 -1 3 8 25 1 4 15 15 26 1
-55 27 -1 2 8 25 1 2 15 15 26 1
-55 26 -1 1 8 25 1 1 15 15 26 1
-55 25 -1 5 8 26 1 5 15 10 20 2
-55 24 -1 4 8 26 1 4 15 10 20 2
-55 23 -1 3 8 26 1 2 15 10 20 2
-55 22 -1 2 8 26 2 5 15 6 13 1
-55 21 -1 1 8 26 2 2 15 6 13 1
-55 20 -1 5 8 31 2 5 15 6 14 2
-55 19 -1 4 8 31 2 3 15 6 14 2
-55 18 -1 3 8 31 1 5 15 2 3 1
-55 17 -1 2 8 31 1 4 15 2 3 1
-55 16 -1 1 8 31 1 2 15 2 3 1
-55 15 -1 5 8 32 1 5 33 14 36 1
-55 14 -1 4 8 32 1 4 33 14 36 1
-55 13 -1 3 8 32 1 2 33 14 36 1
-55 12 -1 2 8 32 1 1 33 14 36 1
-55 11 -1 1 8 32 2 5 33 9 21 1
-55 10 -1 5 8 33 2 5 33 10 24 1
-55 9 -1 4 8 33 2 3 33 10 24 1
-55 8 -1 3 8 33 1 5 33 6 13 1
-55 7 -1 2 8 33 1 4 33 6 13 1
-55 6 -1 1 8 33 1 2 33 6 13 1
-55 5 -1 5 8 34 2 5 33 5 12 3
-55 4 -1 4 8 34 2 3 33 5 12 3
-55 3 -1 3 8 34 1 5 33 1 3 3
-55 2 -1 2 8 34 1 4 33 1 3 3
-55 1 -1 1 8 34 1 2 33 1 3 3
-54 100 -1 2 3 1 3 1 23 4 8 2
-54 99 -1 7 3 1 1 3 23 4 7 1
-54 98 -1 12 3 1 1 5 23 4 7 1
-54 97 -1 17 3 1 2 2 23 8 18 1
-54 96 -1 22 3 1 2 4 23 8 18 1
-54 95 -1 2 3 2 1 2 23 7 17 3
-54 94 -1 7 3 2 1 4 23 7 17 3
-54 93 -1 12 3 2 2 1 23 11 30 4
-54 92 -1 17 3 2 2 3 23 11 30 4
-54 91 -1 22 3 2 2 5 23 11 30 4
-54 90 -1 2 3 3 2 2 23 12 31 1
-54 89 -1 7 3 3 3 1 23 16 40 1
-54 88 -1 12 3 3 3 3 23 16 40 1
-54 87 -1 17 3 3 1 4 23 15 39 2
-54 86 -1 22 3 3 5 2 5 4 8 1
-54 85 -1 2 3 4 1 2 5 3 7 2
-54 84 -1 7 3 4 1 4 5 3 7 2
-54 83 -1 12 3 4 2 1 5 7 13 1
-54 82 -1 17 3 4 2 3 5 7 13 1
-54 81 -1 22 3 4 2 5 5 7 13 1
-54 80 -1 2 3 9 2 2 5 7 14 2
-54 79 -1 7 3 9 2 4 5 7 14 2
-54 78 -1 12 3 9 3 1 5 11 22 2
-54 77 -1 17 3 9 1 3 5 11 21 1
-54 76 -1 22 3 9 1 5 5 11 21 1
-54 75 -1 2 3 10 3 1 5 15 28 1
-54 74 -1 7 3 10 3 3 5 15 28 1
-54 73 -1 12 3 10 1 4 5 14 27 2
-54 72 -1 17 3 10 2 1 5 19 32 1
-54 71 -1 22 3 10 2 4 5 19 32 1
-54 70 -1 2 3 11 1 2 5 18 31 1
-54 69 -1 7 3 11 1 4 5 18 31 1
-54 68 -1 12 3 11 3 4 5 19 33 2
-54 67 -1 17 3 11 2 2 5 22 36 1
-54 66 -1 22 3 11 2 4 5 22 36 1
-54 65 -1 2 3 12 2 1 5 26 39 2
-54 64 -1 7 3 12 2 2 5 26 39 2
-54 63 -1 12 3 12 2 3 5 26 39 2
-54 62 -1 17 3 12 1 5 5 26 38 1
-54 39 -1 9 8 23 2 5 15 28 40 1
-54 38 -1 8 8 23 2 3 15 28 40 1
-54 37 -1 7 8 23 2 1 15 28 40 1
-54 36 -1 6 8 23 1 1 15 28 41 2
-54 35 -1 10 8 24 2 4 15 24 37 1
-54 34 -1 9 8 24 2 1 15 24 37 1
-54 33 -1 8 8 24 3 5 15 18 32 1
-54 32 -1 7 8 24 1 3 15 19 34 1
-54 31 -1 6 8 24 1 1 15 19 34 1
-54 30 -1 10 8 25 2 4 15 18 33 2
-54 29 -1 9 8 25 2 2 15 18 33 2
-54 28 -1 8 8 25 1 3 15 15 26 1
-54 27 -1 7 8 25 3 4 15 14 25 1
-54 26 -1 6 8 25 3 2 15 14 25 1
-54 25 -1 10 8 26 3 5 15 10 19 1
-54 24 -1 9 8 26 1 3 15 10 20 2
-54 23 -1 8 8 26 1 1 15 10 20 2
-54 22 -1 7 8 26 2 4 15 6 13 1
-54 21 -1 6 8 26 2 1 15 6 13 1
-54 20 -1 10 8 31 2 4 15 6 14 2
-54 19 -1 9 8 31 2 2 15 6 14 2
-54 18 -1 8 8 31 2 1 15 6 14 2
-54 17 -1 7 8 31 1 3 15 2 3 1
-54 16 -1 6 8 31 1 1 15 2 3 1
-54 15 -1 10 8 32 5 5 15 1 2 2
-54 14 -1 9 8 32 1 3 33 14 36 1
-54 13 -1 8 8 32 3 4 33 13 35 2
-54 12 -1 7 8 32 3 2 33 13 35 2
-54 11 -1 6 8 32 2 4 33 9 21 1
-54 10 -1 10 8 33 2 4 33 10 24 1
-54 9 -1 9 8 33 2 2 33 10 24 1
-54 8 -1 8 8 33 2 1 33 10 24 1
-54 7 -1 7 8 33 1 3 33 6 13 1
-54 6 -1 6 8 33 1 1 33 6 13 1
-54 5 -1 10 8 34 2 4 33 5 12 3
-54 4 -1 9 8 34 2 2 33 5 12 3
-54 3 -1 8 8 34 3 5 33 1 2 2
-54 2 -1 7 8 34 1 3 33 1 3 3
-54 1 -1 6 8 34 1 1 33 1 3 3
-53 100 -1 3 3 1 3 2 23 4 8 2
-53 99 -1 8 3 1 3 3 23 4 8 2
-53 98 -1 13 3 1 3 4 23 4 8 2
-53 97 -1 18 3 1 4 1 23 8 19 2
-53 96 -1 23 3 1 2 5 23 8 18 1
-53 95 -1 3 3 2 4 1 23 8 20 3
-53 94 -1 8 3 2 4 4 23 8 20 3
-53 93 -1 13 3 2 3 1 23 12 32 2
-53 92 -1 18 3 2 3 2 23 12 32 2
-53 91 -1 23 3 2 3 4 23 12 32 2
-53 90 -1 3 3 3 2 3 23 12 31 1
-53 89 -1 8 3 3 3 2 23 16 40 1
-53 88 -1 13 3 3 3 4 23 16 40 1
-53 87 -1 18 3 3 3 5 23 16 40 1
-53 86 -1 23 3 3 5 3 5 4 8 1
-53 85 -1 3 3 4 4 1 5 4 9 2
-53 84 -1 8 3 4 3 1 5 8 15 1
-53 83 -1 13 3 4 3 2 5 8 15 1
-53 82 -1 18 3 4 3 3 5 8 15 1
-53 81 -1 23 3 4 3 4 5 8 15 1
-53 80 -1 3 3 9 4 1 5 8 16 2
-53 79 -1 8 3 9 2 5 5 7 14 2
-53 78 -1 13 3 9 3 2 5 11 22 2
-53 77 -1 18 3 9 3 3 5 11 22 2
-53 76 -1 23 3 9 3 4 5 11 22 2
-53 75 -1 3 3 10 3 2 5 15 28 1
-53 74 -1 8 3 10 3 4 5 15 28 1
-53 73 -1 13 3 10 3 5 5 15 28 1
-53 72 -1 18 3 10 2 2 5 19 32 1
-53 71 -1 23 3 10 2 5 5 19 32 1
-53 70 -1 3 3 11 3 1 5 19 33 2
-53 69 -1 8 3 11 3 2 5 19 33 2
-53 68 -1 13 3 11 3 5 5 19 33 2
-53 67 -1 18 3 11 4 1 5 24 37 1
-53 66 -1 23 3 11 2 5 5 22 36 1
-53 65 -1 3 3 12 3 1 5 28 40 1
-53 64 -1 8 3 12 3 2 5 28 40 1
-53 63 -1 13 3 12 2 4 5 26 39 2
-53 62 -1 18 3 12 2 5 5 26 39 2
-53 39 -1 14 8 23 2 4 15 28 40 1
-53 38 -1 13 8 23 2 2 15 28 40 1
-53 37 -1 12 8 23 3 4 15 26 39 2
-53 36 -1 11 8 23 3 2 15 26 39 2
-53 35 -1 15 8 24 2 3 15 24 37 1
-53 34 -1 14 8 24 4 3 15 22 36 1
-53 33 -1 13 8 24 3 4 15 18 32 1
-53 32 -1 12 8 24 3 3 15 18 32 1
-53 31 -1 11 8 24 3 1 15 18 32 1
-53 30 -1 15 8 25 2 3 15 18 33 2
-53 29 -1 14 8 25 2 1 15 18 33 2
-53 28 -1 13 8 25 3 5 15 14 25 1
-53 27 -1 12 8 25 3 3 15 14 25 1
-53 26 -1 11 8 25 3 1 15 14 25 1
-53 25 -1 15 8 26 3 4 15 10 19 1
-53 24 -1 14 8 26 3 2 15 10 19 1
-53 23 -1 13 8 26 3 1 15 10 19 1
-53 22 -1 12 8 26 2 3 15 6 13 1
-53 21 -1 11 8 26 4 3 15 5 10 1
-53 20 -1 15 8 31 3 5 15 5 12 3
-53 19 -1 14 8 31 3 4 15 5 12 3
-53 18 -1 13 8 31 3 3 15 5 12 3
-53 17 -1 12 8 31 3 1 15 5 12 3
-53 16 -1 11 8 31 4 3 15 1 1 1
-53 15 -1 15 8 32 5 4 15 1 2 2
-53 14 -1 14 8 32 3 5 33 13 35 2
-53 13 -1 13 8 32 3 3 33 13 35 2
-53 12 -1 12 8 32 3 1 33 13 35 2
-53 11 -1 11 8 32 2 3 33 9 21 1
-53 10 -1 15 8 33 3 5 33 9 23 3
-53 9 -1 14 8 33 3 4 33 9 23 3
-53 8 -1 13 8 33 3 2 33 9 23 3
-53 7 -1 12 8 33 4 5 33 5 10 1
-53 6 -1 11 8 33 4 3 33 5 10 1
-53 5 -1 15 8 34 4 5 33 5 11 2
-53 4 -1 14 8 34 2 1 33 5 12 3
-53 3 -1 13 8 34 3 4 33 1 2 2
-53 2 -1 12 8 34 3 3 33 1 2 2
-53 1 -1 11 8 34 3 2 33 1 2 2
-52 100 -1 4 3 1 5 1 23 4 9 3
-52 99 -1 9 3 1 5 3 23 4 9 3
-52 98 -1 14 3 1 3 5 23 4 8 2
-52 97 -1 19 3 1 4 2 23 8 19 2
-52 96 -1 24 3 1 4 4 23 8 19 2
-52 95 -1 4 3 2 4 2 23 8 20 3
-52 94 -1 9 3 2 4 5 23 8 20 3
-52 93 -1 14 3 2 5 2 23 12 33 3
-52 92 -1 19 3 2 3 3 23 12 32 2
-52 91 -1 24 3 2 3 5 23 12 32 2
-52 90 -1 4 3 3 2 4 23 12 31 1
-52 89 -1 9 3 3 4 1 23 16 41 2
-52 88 -1 14 3 3 4 3 23 16 41 2
-52 87 -1 19 3 3 4 5 23 16 41 2
-52 86 -1 24 3 3 5 4 5 4 8 1
-52 85 -1 4 3 4 4 2 5 4 9 2
-52 84 -1 9 3 4 4 4 5 4 9 2
-52 83 -1 14 3 4 5 1 5 8 17 3
-52 82 -1 19 3 4 5 3 5 8 17 3
-52 81 -1 24 3 4 3 5 5 8 15 1
-52 80 -1 4 3 9 4 2 5 8 16 2
-52 79 -1 9 3 9 4 4 5 8 16 2
-52 78 -1 14 3 9 5 1 5 12 23 1
-52 77 -1 19 3 9 5 3 5 12 23 1
-52 76 -1 24 3 9 3 5 5 11 22 2
-52 75 -1 4 3 10 5 1 5 16 29 1
-52 74 -1 9 3 10 5 3 5 16 29 1
-52 73 -1 14 3 10 4 1 5 20 34 1
-52 72 -1 19 3 10 4 2 5 20 34 1
-52 71 -1 24 3 10 4 4 5 20 34 1
-52 70 -1 4 3 11 5 1 5 20 35 2
-52 69 -1 9 3 11 3 3 5 19 33 2
-52 68 -1 14 3 11 5 4 5 20 35 2
-52 67 -1 19 3 11 4 2 5 24 37 1
-52 66 -1 24 3 11 4 4 5 24 37 1
-52 65 -1 4 3 12 4 1 5 28 41 2
-52 64 -1 9 3 12 3 3 5 28 40 1
-52 63 -1 14 3 12 3 4 5 28 40 1
-52 62 -1 19 3 12 3 5 5 28 40 1
-52 39 -1 19 8 23 4 5 15 26 38 1
-52 38 -1 18 8 23 3 5 15 26 39 2
-52 37 -1 17 8 23 3 3 15 26 39 2
-52 36 -1 16 8 23 3 1 15 26 39 2
-52 35 -1 20 8 24 4 5 15 22 36 1
-52 34 -1 19 8 24 4 2 15 22 36 1
-52 33 -1 18 8 24 5 5 15 17 30 1
-52 32 -1 17 8 24 3 2 15 18 32 1
-52 31 -1 16 8 24 5 2 15 17 30 1
-52 30 -1 20 8 25 4 5 15 17 31 2
-52 29 -1 19 8 25 4 3 15 17 31 2
-52 28 -1 18 8 25 4 1 15 17 31 2
-52 27 -1 17 8 25 5 4 15 13 24 1
-52 26 -1 16 8 25 5 2 15 13 24 1
-52 25 -1 20 8 26 3 3 15 10 19 1
-52 24 -1 19 8 26 5 4 15 9 18 1
-52 23 -1 18 8 26 5 2 15 9 18 1
-52 22 -1 17 8 26 4 5 15 5 10 1
-52 21 -1 16 8 26 4 2 15 5 10 1
-52 20 -1 20 8 31 5 5 15 5 11 2
-52 19 -1 19 8 31 5 3 15 5 11 2
-52 18 -1 18 8 31 3 2 15 5 12 3
-52 17 -1 17 8 31 4 5 15 1 1 1
-52 16 -1 16 8 31 4 2 15 1 1 1
-52 15 -1 20 8 32 5 3 15 1 2 2
-52 14 -1 19 8 32 4 5 33 13 34 1
-52 13 -1 18 8 32 4 4 33 13 34 1
-52 12 -1 17 8 32 4 2 33 13 34 1
-52 11 -1 16 8 32 2 2 33 9 21 1
-52 10 -1 20 8 33 5 5 33 9 22 2
-52 9 -1 19 8 33 3 3 33 9 23 3
-52 8 -1 18 8 33 3 1 33 9 23 3
-52 7 -1 17 8 33 4 4 33 5 10 1
-52 6 -1 16 8 33 4 2 33 5 10 1
-52 5 -1 20 8 34 4 4 33 5 11 2
-52 4 -1 19 8 34 4 2 33 5 11 2
-52 3 -1 18 8 34 5 5 33 1 1 1
-52 2 -1 17 8 34 5 3 33 1 1 1
-52 1 -1 16 8 34 3 1 33 1 2 2
-51 100 -1 5 3 1 5 2 23 4 9 3
-51 99 -1 10 3 1 5 4 23 4 9 3
-51 98 -1 15 3 1 5 5 23 4 9 3
-51 97 -1 20 3 1 4 3 23 8 19 2
-51 96 -1 25 3 1 4 5 23 8 19 2
-51 95 -1 5 3 2 4 3 23 8 20 3
-51 94 -1 10 3 2 5 1 23 12 33 3
-51 93 -1 15 3 2 5 3 23 12 33 3
-51 92 -1 20 3 2 5 4 23 12 33 3
-51 91 -1 25 3 2 5 5 23 12 33 3
-51 90 -1 5 3 3 2 5 23 12 31 1
-51 89 -1 10 3 3 4 2 23 16 41 2
-51 88 -1 15 3 3 4 4 23 16 41 2
-51 87 -1 20 3 3 5 1 5 4 8 1
-51 86 -1 25 3 3 5 5 5 4 8 1
-51 85 -1 5 3 4 4 3 5 4 9 2
-51 84 -1 10 3 4 4 5 5 4 9 2
-51 83 -1 15 3 4 5 2 5 8 17 3
-51 82 -1 20 3 4 5 4 5 8 17 3
-51 81 -1 25 3 4 5 5 5 8 17 3
-51 80 -1 5 3 9 4 3 5 8 16 2
-51 79 -1 10 3 9 4 5 5 8 16 2
-51 78 -1 15 3 9 5 2 5 12 23 1
-51 77 -1 20 3 9 5 4 5 12 23 1
-51 76 -1 25 3 9 5 5 5 12 23 1
-51 75 -1 5 3 10 5 2 5 16 29 1
-51 74 -1 10 3 10 5 4 5 16 29 1
-51 73 -1 15 3 10 5 5 5 16 29 1
-51 72 -1 20 3 10 4 3 5 20 34 1
-51 71 -1 25 3 10 4 5 5 20 34 1
-51 70 -1 5 3 11 5 2 5 20 35 2
-51 69 -1 10 3 11 5 3 5 20 35 2
-51 68 -1 15 3 11 5 5 5 20 35 2
-51 67 -1 20 3 11 4 3 5 24 37 1
-51 66 -1 25 3 11 4 5 5 24 37 1
-51 65 -1 5 3 12 4 2 5 28 41 2
-51 64 -1 10 3 12 4 3 5 28 41 2
-51 63 -1 15 3 12 4 4 5 28 41 2
-51 62 -1 20 3 12 4 5 5 28 41 2
-51 39 -1 24 8 23 4 4 15 26 38 1
-51 38 -1 23 8 23 4 3 15 26 38 1
-51 37 -1 22 8 23 4 2 15 26 38 1
-51 36 -1 21 8 23 4 1 15 26 38 1
-51 35 -1 25 8 24 4 4 15 22 36 1
-51 34 -1 24 8 24 4 1 15 22 36 1
-51 33 -1 23 8 24 5 4 15 17 30 1
-51 32 -1 22 8 24 5 3 15 17 30 1
-51 31 -1 21 8 24 5 1 15 17 30 1
-51 30 -1 25 8 25 4 4 15 17 31 2
-51 29 -1 24 8 25 4 2 15 17 31 2
-51 28 -1 23 8 25 5 5 15 13 24 1
-51 27 -1 22 8 25 5 3 15 13 24 1
-51 26 -1 21 8 25 5 1 15 13 24 1
-51 25 -1 25 8 26 5 5 15 9 18 1
-51 24 -1 24 8 26 5 3 15 9 18 1
-51 23 -1 23 8 26 5 1 15 9 18 1
-51 22 -1 22 8 26 4 4 15 5 10 1
-51 21 -1 21 8 26 4 1 15 5 10 1
-51 20 -1 25 8 31 5 4 15 5 11 2
-51 19 -1 24 8 31 5 2 15 5 11 2
-51 18 -1 23 8 31 5 1 15 5 11 2
-51 17 -1 22 8 31 4 4 15 1 1 1
-51 16 -1 21 8 31 4 1 15 1 1 1
-51 15 -1 25 8 32 5 2 15 1 2 2
-51 14 -1 24 8 32 5 1 15 1 2 2
-51 13 -1 23 8 32 4 3 33 13 34 1
-51 12 -1 22 8 32 4 1 33 13 34 1
-51 11 -1 21 8 32 2 1 33 9 21 1
-51 10 -1 25 8 33 5 4 33 9 22 2
-51 9 -1 24 8 33 5 3 33 9 22 2
-51 8 -1 23 8 33 5 2 33 9 22 2
-51 7 -1 22 8 33 5 1 33 9 22 2
-51 6 -1 21 8 33 4 1 33 5 10 1
-51 5 -1 25 8 34 4 3 33 5 11 2
-51 4 -1 24 8 34 4 1 33 5 11 2
-51 3 -1 23 8 34 5 4 33 1 1 1
-51 2 -1 22 8 34 5 2 33 1 1 1
-51 1 -1 21 8 34 5 1 33 1 1 1
-50 100 -1 21 4 1 5 1 24 1 1 1
-50 99 -1 22 4 1 5 2 24 1 1 1
-50 98 -1 23 4 1 5 4 24 1 1 1
-50 97 -1 24 4 1 4 1 24 5 10 1
-50 96 -1 25 4 1 4 3 24 5 10 1
-50 95 -1 21 4 2 4 1 24 5 11 2
-50 94 -1 22 4 2 5 1 24 9 21 1
-50 93 -1 23 4 2 5 2 24 9 21 1
-50 92 -1 24 4 2 5 3 24 9 21 1
-50 91 -1 25 4 2 5 4 24 9 21 1
-50 90 -1 21 4 3 2 1 24 9 22 2
-50 89 -1 22 4 3 4 1 24 13 34 1
-50 88 -1 23 4 3 4 3 24 13 34 1
-50 87 -1 24 4 3 5 1 6 1 1 1
-50 86 -1 25 4 3 5 2 6 1 1 1
-50 85 -1 21 4 4 4 1 6 1 2 2
-50 84 -1 22 4 4 4 4 6 1 2 2
-50 83 -1 23 4 4 5 1 6 5 10 1
-50 82 -1 24 4 4 5 2 6 5 10 1
-50 81 -1 25 4 4 5 4 6 5 10 1
-50 80 -1 21 4 9 4 1 6 5 11 2
-50 79 -1 22 4 9 4 4 6 5 11 2
-50 78 -1 23 4 9 5 1 6 9 18 1
-50 77 -1 24 4 9 5 3 6 9 18 1
-50 76 -1 25 4 9 5 5 6 9 18 1
-50 75 -1 21 4 10 5 1 6 13 24 1
-50 74 -1 22 4 10 5 3 6 13 24 1
-50 73 -1 23 4 10 5 5 6 13 24 1
-50 72 -1 24 4 10 4 2 6 17 30 1
-50 71 -1 25 4 10 4 4 6 17 30 1
-50 70 -1 21 4 11 5 1 6 17 31 2
-50 69 -1 22 4 11 5 3 6 17 31 2
-50 68 -1 23 4 11 5 4 6 17 31 2
-50 67 -1 24 4 11 4 1 6 22 36 1
-50 66 -1 25 4 11 4 4 6 22 36 1
-50 65 -1 21 4 12 4 1 6 26 38 1
-50 64 -1 22 4 12 4 2 6 26 38 1
-50 63 -1 23 4 12 4 3 6 26 38 1
-50 62 -1 24 4 12 4 4 6 26 38 1
-50 39 -1 20 8 6 4 5 14 28 41 2
-50 38 -1 15 8 6 4 4 14 28 41 2
-50 37 -1 10 8 6 4 3 14 28 41 2
-50 36 -1 5 8 6 4 2 14 28 41 2
-50 35 -1 25 8 7 4 5 14 24 37 1
-50 34 -1 20 8 7 4 3 14 24 37 1
-50 33 -1 15 8 7 5 5 14 20 34 1
-50 32 -1 10 8 7 5 3 14 20 34 1
-50 31 -1 5 8 7 5 2 14 20 34 1
-50 30 -1 25 8 8 4 5 14 20 35 2
-50 29 -1 20 8 8 4 3 14 20 35 2
-50 28 -1 15 8 8 5 5 14 16 29 1
-50 27 -1 10 8 8 5 4 14 16 29 1
-50 26 -1 5 8 8 5 2 14 16 29 1
-50 25 -1 25 8 9 5 5 14 12 23 1
-50 24 -1 20 8 9 5 4 14 12 23 1
-50 23 -1 15 8 9 5 2 14 12 23 1
-50 22 -1 10 8 9 4 5 14 8 15 1
-50 21 -1 5 8 9 4 3 14 8 15 1
-50 20 -1 25 8 14 5 5 14 8 17 3
-50 19 -1 20 8 14 5 4 14 8 17 3
-50 18 -1 15 8 14 5 2 14 8 17 3
-50 17 -1 10 8 14 4 5 14 4 9 2
-50 16 -1 5 8 14 4 3 14 4 9 2
-50 15 -1 25 8 15 5 5 14 4 8 1
-50 14 -1 20 8 15 5 1 14 4 8 1
-50 13 -1 15 8 15 4 4 32 16 41 2
-50 12 -1 10 8 15 4 2 32 16 41 2
-50 11 -1 5 8 15 2 5 32 12 31 1
-50 10 -1 25 8 16 5 5 32 12 33 3
-50 9 -1 20 8 16 5 4 32 12 33 3
-50 8 -1 15 8 16 5 3 32 12 33 3
-50 7 -1 10 8 16 5 1 32 12 33 3
-50 6 -1 5 8 16 4 3 32 8 19 2
-50 5 -1 25 8 17 4 5 32 8 20 3
-50 4 -1 20 8 17 4 3 32 8 20 3
-50 3 -1 15 8 17 5 5 32 4 9 3
-50 2 -1 10 8 17 5 4 32 4 9 3
-50 1 -1 5 8 17 5 2 32 4 9 3
-49 100 -1 16 4 1 3 1 24 1 2 2
-49 99 -1 17 4 1 5 3 24 1 1 1
-49 98 -1 18 4 1 5 5 24 1 1 1
-49 97 -1 19 4 1 4 2 24 5 10 1
-49 96 -1 20 4 1 4 4 24 5 10 1
-49 95 -1 16 4 2 4 2 24 5 11 2
-49 94 -1 17 4 2 4 4 24 5 11 2
-49 93 -1 18 4 2 3 1 24 9 23 3
-49 92 -1 19 4 2 3 3 24 9 23 3
-49 91 -1 20 4 2 5 5 24 9 21 1
-49 90 -1 16 4 3 2 2 24 9 22 2
-49 89 -1 17 4 3 4 2 24 13 34 1
-49 88 -1 18 4 3 4 4 24 13 34 1
-49 87 -1 19 4 3 4 5 24 13 34 1
-49 86 -1 20 4 3 5 3 6 1 1 1
-49 85 -1 16 4 4 4 2 6 1 2 2
-49 84 -1 17 4 4 4 5 6 1 2 2
-49 83 -1 18 4 4 3 2 6 5 12 3
-49 82 -1 19 4 4 5 3 6 5 10 1
-49 81 -1 20 4 4 5 5 6 5 10 1
-49 80 -1 16 4 9 4 2 6 5 11 2
-49 79 -1 17 4 9 4 5 6 5 11 2
-49 78 -1 18 4 9 5 2 6 9 18 1
-49 77 -1 19 4 9 5 4 6 9 18 1
-49 76 -1 20 4 9 3 3 6 10 19 1
-49 75 -1 16 4 10 5 2 6 13 24 1
-49 74 -1 17 4 10 5 4 6 13 24 1
-49 73 -1 18 4 10 4 1 6 17 30 1
-49 72 -1 19 4 10 4 3 6 17 30 1
-49 71 -1 20 4 10 4 5 6 17 30 1
-49 70 -1 16 4 11 5 2 6 17 31 2
-49 69 -1 17 4 11 3 2 6 18 32 1
-49 68 -1 18 4 11 5 5 6 17 31 2
-49 67 -1 19 4 11 4 2 6 22 36 1
-49 66 -1 20 4 11 4 5 6 22 36 1
-49 65 -1 16 4 12 3 1 6 26 39 2
-49 64 -1 17 4 12 3 3 6 26 39 2
-49 63 -1 18 4 12 3 5 6 26 39 2
-49 62 -1 19 4 12 4 5 6 26 38 1
-49 39 -1 19 8 6 3 5 14 28 40 1
-49 38 -1 14 8 6 3 4 14 28 40 1
-49 37 -1 9 8 6 3 3 14 28 40 1
-49 36 -1 4 8 6 4 1 14 28 41 2
-49 35 -1 24 8 7 4 4 14 24 37 1
-49 34 -1 19 8 7 4 2 14 24 37 1
-49 33 -1 14 8 7 5 4 14 20 34 1
-49 32 -1 9 8 7 3 3 14 19 33 2
-49 31 -1 4 8 7 5 1 14 20 34 1
-49 30 -1 24 8 8 4 4 14 20 35 2
-49 29 -1 19 8 8 4 2 14 20 35 2
-49 28 -1 14 8 8 4 1 14 20 35 2
-49 27 -1 9 8 8 5 3 14 16 29 1
-49 26 -1 4 8 8 5 1 14 16 29 1
-49 25 -1 24 8 9 3 5 14 11 22 2
-49 24 -1 19 8 9 5 3 14 12 23 1
-49 23 -1 14 8 9 5 1 14 12 23 1
-49 22 -1 9 8 9 4 4 14 8 15 1
-49 21 -1 4 8 9 4 2 14 8 15 1
-49 20 -1 24 8 14 3 5 14 8 16 2
-49 19 -1 19 8 14 5 3 14 8 17 3
-49 18 -1 14 8 14 5 1 14 8 17 3
-49 17 -1 9 8 14 4 4 14 4 9 2
-49 16 -1 4 8 14 4 2 14 4 9 2
-49 15 -1 24 8 15 5 4 14 4 8 1
-49 14 -1 19 8 15 4 5 32 16 41 2
-49 13 -1 14 8 15 4 3 32 16 41 2
-49 12 -1 9 8 15 4 1 32 16 41 2
-49 11 -1 4 8 15 2 4 32 12 31 1
-49 10 -1 24 8 16 3 5 32 12 32 2
-49 9 -1 19 8 16 3 3 32 12 32 2
-49 8 -1 14 8 16 5 2 32 12 33 3
-49 7 -1 9 8 16 4 5 32 8 19 2
-49 6 -1 4 8 16 4 2 32 8 19 2
-49 5 -1 24 8 17 4 4 32 8 20 3
-49 4 -1 19 8 17 4 2 32 8 20 3
-49 3 -1 14 8 17 3 5 32 4 8 2
-49 2 -1 9 8 17 5 3 32 4 9 3
-49 1 -1 4 8 17 5 1 32 4 9 3
-48 100 -1 11 4 1 3 2 24 1 2 2
-48 99 -1 12 4 1 3 3 24 1 2 2
-48 98 -1 13 4 1 3 4 24 1 2 2
-48 97 -1 14 4 1 2 1 24 5 12 3
-48 96 -1 15 4 1 4 5 24 5 10 1
-48 95 -1 11 4 2 4 3 24 5 11 2
-48 94 -1 12 4 2 4 5 24 5 11 2
-48 93 -1 13 4 2 3 2 24 9 23 3
-48 92 -1 14 4 2 3 4 24 9 23 3
-48 91 -1 15 4 2 3 5 24 9 23 3
-48 90 -1 11 4 3 2 3 24 9 22 2
-48 89 -1 12 4 3 3 1 24 13 35 2
-48 88 -1 13 4 3 3 3 24 13 35 2
-48 87 -1 14 4 3 3 5 24 13 35 2
-48 86 -1 15 4 3 5 4 6 1 1 1
-48 85 -1 11 4 4 4 3 6 1 2 2
-48 84 -1 12 4 4 3 1 6 5 12 3
-48 83 -1 13 4 4 3 3 6 5 12 3
-48 82 -1 14 4 4 3 4 6 5 12 3
-48 81 -1 15 4 4 3 5 6 5 12 3
-48 80 -1 11 4 9 4 3 6 5 11 2
-48 79 -1 12 4 9 2 3 6 6 13 1
-48 78 -1 13 4 9 3 1 6 10 19 1
-48 77 -1 14 4 9 3 2 6 10 19 1
-48 76 -1 15 4 9 3 4 6 10 19 1
-48 75 -1 11 4 10 3 1 6 14 25 1
-48 74 -1 12 4 10 3 3 6 14 25 1
-48 73 -1 13 4 10 3 5 6 14 25 1
-48 72 -1 14 4 10 2 1 6 18 33 2
-48 71 -1 15 4 10 2 3 6 18 33 2
-48 70 -1 11 4 11 3 1 6 18 32 1
-48 69 -1 12 4 11 3 3 6 18 32 1
-48 68 -1 13 4 11 3 4 6 18 32 1
-48 67 -1 14 4 11 4 3 6 22 36 1
-48 66 -1 15 4 11 2 3 6 24 37 1
-48 65 -1 11 4 12 3 2 6 26 39 2
-48 64 -1 12 4 12 3 4 6 26 39 2
-48 63 -1 13 4 12 2 2 6 28 40 1
-48 62 -1 14 4 12 2 4 6 28 40 1
-48 39 -1 18 8 6 2 5 14 26 39 2
-48 38 -1 13 8 6 2 4 14 26 39 2
-48 37 -1 8 8 6 3 2 14 28 40 1
-48 36 -1 3 8 6 3 1 14 28 40 1
-48 35 -1 23 8 7 2 5 14 22 36 1
-48 34 -1 18 8 7 4 1 14 24 37 1
-48 33 -1 13 8 7 3 5 14 19 33 2
-48 32 -1 8 8 7 3 2 14 19 33 2
-48 31 -1 3 8 7 3 1 14 19 33 2
-48 30 -1 23 8 8 2 5 14 19 32 1
-48 29 -1 18 8 8 2 2 14 19 32 1
-48 28 -1 13 8 8 3 5 14 15 28 1
-48 27 -1 8 8 8 3 4 14 15 28 1
-48 26 -1 3 8 8 3 2 14 15 28 1
-48 25 -1 23 8 9 3 4 14 11 22 2
-48 24 -1 18 8 9 3 3 14 11 22 2
-48 23 -1 13 8 9 3 2 14 11 22 2
-48 22 -1 8 8 9 2 5 14 7 13 1
-48 21 -1 3 8 9 4 1 14 8 15 1
-48 20 -1 23 8 14 3 4 14 8 16 2
-48 19 -1 18 8 14 3 3 14 8 16 2
-48 18 -1 13 8 14 3 2 14 8 16 2
-48 17 -1 8 8 14 3 1 14 8 16 2
-48 16 -1 3 8 14 4 1 14 4 9 2
-48 15 -1 23 8 15 5 3 14 4 8 1
-48 14 -1 18 8 15 3 5 32 16 40 1
-48 13 -1 13 8 15 3 4 32 16 40 1
-48 12 -1 8 8 15 3 2 32 16 40 1
-48 11 -1 3 8 15 2 3 32 12 31 1
-48 10 -1 23 8 16 3 4 32 12 32 2
-48 9 -1 18 8 16 3 2 32 12 32 2
-48 8 -1 13 8 16 3 1 32 12 32 2
-48 7 -1 8 8 16 4 4 32 8 19 2
-48 6 -1 3 8 16 4 1 32 8 19 2
-48 5 -1 23 8 17 2 5 32 8 18 1
-48 4 -1 18 8 17 4 1 32 8 20 3
-48 3 -1 13 8 17 3 4 32 4 8 2
-48 2 -1 8 8 17 3 3 32 4 8 2
-48 1 -1 3 8 17 3 2 32 4 8 2
-47 100 -1 6 4 1 1 1 24 1 3 3
-47 99 -1 7 4 1 1 3 24 1 3 3
-47 98 -1 8 4 1 3 5 24 1 2 2
-47 97 -1 9 4 1 2 2 24 5 12 3
-47 96 -1 10 4 1 2 4 24 5 12 3
-47 95 -1 6 4 2 1 1 24 6 13 1
-47 94 -1 7 4 2 1 3 24 6 13 1
-47 93 -1 8 4 2 2 1 24 10 24 1
-47 92 -1 9 4 2 2 2 24 10 24 1
-47 91 -1 10 4 2 2 4 24 10 24 1
-47 90 -1 6 4 3 2 4 24 9 22 2
-47 89 -1 7 4 3 3 2 24 13 35 2
-47 88 -1 8 4 3 3 4 24 13 35 2
-47 87 -1 9 4 3 1 3 24 14 36 1
-47 86 -1 10 4 3 5 5 6 1 1 1
-47 85 -1 6 4 4 1 1 6 2 3 1
-47 84 -1 7 4 4 1 3 6 2 3 1
-47 83 -1 8 4 4 2 1 6 6 14 2
-47 82 -1 9 4 4 2 2 6 6 14 2
-47 81 -1 10 4 4 2 4 6 6 14 2
-47 80 -1 6 4 9 2 1 6 6 13 1
-47 79 -1 7 4 9 2 4 6 6 13 1
-47 78 -1 8 4 9 1 1 6 10 20 2
-47 77 -1 9 4 9 1 3 6 10 20 2
-47 76 -1 10 4 9 3 5 6 10 19 1
-47 75 -1 6 4 10 3 2 6 14 25 1
-47 74 -1 7 4 10 3 4 6 14 25 1
-47 73 -1 8 4 10 1 3 6 15 26 1
-47 72 -1 9 4 10 2 2 6 18 33 2
-47 71 -1 10 4 10 2 4 6 18 33 2
-47 70 -1 6 4 11 1 1 6 19 34 1
-47 69 -1 7 4 11 1 3 6 19 34 1
-47 68 -1 8 4 11 3 5 6 18 32 1
-47 67 -1 9 4 11 2 1 6 24 37 1
-47 66 -1 10 4 11 2 4 6 24 37 1
-47 65 -1 6 4 12 1 1 6 28 41 2
-47 64 -1 7 4 12 2 1 6 28 40 1
-47 63 -1 8 4 12 2 3 6 28 40 1
-47 62 -1 9 4 12 2 5 6 28 40 1
-47 39 -1 17 8 6 1 5 14 26 38 1
-47 38 -1 12 8 6 2 3 14 26 39 2
-47 37 -1 7 8 6 2 2 14 26 39 2
-47 36 -1 2 8 6 2 1 14 26 39 2
-47 35 -1 22 8 7 2 4 14 22 36 1
-47 34 -1 17 8 7 2 2 14 22 36 1
-47 33 -1 12 8 7 3 4 14 19 33 2
-47 32 -1 7 8 7 1 4 14 18 31 1
-47 31 -1 2 8 7 1 2 14 18 31 1
-47 30 -1 22 8 8 2 4 14 19 32 1
-47 29 -1 17 8 8 2 1 14 19 32 1
-47 28 -1 12 8 8 1 4 14 14 27 2
-47 27 -1 7 8 8 3 3 14 15 28 1
-47 26 -1 2 8 8 3 1 14 15 28 1
-47 25 -1 22 8 9 1 5 14 11 21 1
-47 24 -1 17 8 9 1 3 14 11 21 1
-47 23 -1 12 8 9 3 1 14 11 22 2
-47 22 -1 7 8 9 2 4 14 7 13 1
-47 21 -1 2 8 9 2 2 14 7 13 1
-47 20 -1 22 8 14 2 5 14 7 14 2
-47 19 -1 17 8 14 2 3 14 7 14 2
-47 18 -1 12 8 14 2 1 14 7 14 2
-47 17 -1 7 8 14 1 4 14 3 7 2
-47 16 -1 2 8 14 1 2 14 3 7 2
-47 15 -1 22 8 15 5 2 14 4 8 1
-47 14 -1 17 8 15 1 4 32 15 39 2
-47 13 -1 12 8 15 3 3 32 16 40 1
-47 12 -1 7 8 15 3 1 32 16 40 1
-47 11 -1 2 8 15 2 2 32 12 31 1
-47 10 -1 22 8 16 2 5 32 11 30 4
-47 9 -1 17 8 16 2 3 32 11 30 4
-47 8 -1 12 8 16 2 1 32 11 30 4
-47 7 -1 7 8 16 1 4 32 7 17 3
-47 6 -1 2 8 16 1 2 32 7 17 3
-47 5 -1 22 8 17 2 4 32 8 18 1
-47 4 -1 17 8 17 2 2 32 8 18 1
-47 3 -1 12 8 17 1 5 32 4 7 1
-47 2 -1 7 8 17 1 3 32 4 7 1
-47 1 -1 2 8 17 3 1 32 4 8 2
-46 100 -1 1 4 1 1 2 24 1 3 3
-46 99 -1 2 4 1 1 4 24 1 3 3
-46 98 -1 3 4 1 1 5 24 1 3 3
-46 97 -1 4 4 1 2 3 24 5 12 3
-46 96 -1 5 4 1 2 5 24 5 12 3
-46 95 -1 1 4 2 1 2 24 6 13 1
-46 94 -1 2 4 2 1 4 24 6 13 1
-46 93 -1 3 4 2 1 5 24 6 13 1
-46 92 -1 4 4 2 2 3 24 10 24 1
-46 91 -1 5 4 2 2 5 24 10 24 1
-46 90 -1 1 4 3 2 5 24 9 22 2
-46 89 -1 2 4 3 1 1 24 14 36 1
-46 88 -1 3 4 3 1 2 24 14 36 1
-46 87 -1 4 4 3 1 4 24 14 36 1
-46 86 -1 5 4 3 1 5 24 14 36 1
-46 85 -1 1 4 4 1 2 6 2 3 1
-46 84 -1 2 4 4 1 4 6 2 3 1
-46 83 -1 3 4 4 1 5 6 2 3 1
-46 82 -1 4 4 4 2 3 6 6 14 2
-46 81 -1 5 4 4 2 5 6 6 14 2
-46 80 -1 1 4 9 2 2 6 6 13 1
-46 79 -1 2 4 9 2 5 6 6 13 1
-46 78 -1 3 4 9 1 2 6 10 20 2
-46 77 -1 4 4 9 1 4 6 10 20 2
-46 76 -1 5 4 9 1 5 6 10 20 2
-46 75 -1 1 4 10 1 1 6 15 26 1
-46 74 -1 2 4 10 1 2 6 15 26 1
-46 73 -1 3 4 10 1 4 6 15 26 1
-46 72 -1 4 4 10 1 5 6 15 26 1
-46 71 -1 5 4 10 2 5 6 18 33 2
-46 70 -1 1 4 11 1 2 6 19 34 1
-46 69 -1 2 4 11 1 4 6 19 34 1
-46 68 -1 3 4 11 1 5 6 19 34 1
-46 67 -1 4 4 11 2 2 6 24 37 1
-46 66 -1 5 4 11 2 5 6 24 37 1
-46 65 -1 1 4 12 1 2 6 28 41 2
-46 64 -1 2 4 12 1 3 6 28 41 2
-46 63 -1 3 4 12 1 4 6 28 41 2
-46 62 -1 4 4 12 1 5 6 28 41 2
-46 39 -1 16 8 6 1 4 14 26 38 1
-46 38 -1 11 8 6 1 3 14 26 38 1
-46 37 -1 6 8 6 1 2 14 26 38 1
-46 36 -1 1 8 6 1 1 14 26 38 1
-46 35 -1 21 8 7 2 3 14 22 36 1
-46 34 -1 16 8 7 2 1 14 22 36 1
-46 33 -1 11 8 7 1 5 14 18 31 1
-46 32 -1 6 8 7 1 3 14 18 31 1
-46 31 -1 1 8 7 1 1 14 18 31 1
-46 30 -1 21 8 8 2 3 14 19 32 1
-46 29 -1 16 8 8 1 5 14 14 27 2
-46 28 -1 11 8 8 1 3 14 14 27 2
-46 27 -1 6 8 8 1 2 14 14 27 2
-46 26 -1 1 8 8 1 1 14 14 27 2
-46 25 -1 21 8 9 1 4 14 11 21 1
-46 24 -1 16 8 9 1 2 14 11 21 1
-46 23 -1 11 8 9 1 1 14 11 21 1
-46 22 -1 6 8 9 2 3 14 7 13 1
-46 21 -1 1 8 9 2 1 14 7 13 1
-46 20 -1 21 8 14 2 4 14 7 14 2
-46 19 -1 16 8 14 2 2 14 7 14 2
-46 18 -1 11 8 14 1 5 14 3 7 2
-46 17 -1 6 8 14 1 3 14 3 7 2
-46 16 -1 1 8 14 1 1 14 3 7 2
-46 15 -1 21 8 15 1 5 32 15 39 2
-46 14 -1 16 8 15 1 3 32 15 39 2
-46 13 -1 11 8 15 1 2 32 15 39 2
-46 12 -1 6 8 15 1 1 32 15 39 2
-46 11 -1 1 8 15 2 1 32 12 31 1
-46 10 -1 21 8 16 2 4 32 11 30 4
-46 9 -1 16 8 16 2 2 32 11 30 4
-46 8 -1 11 8 16 1 5 32 7 17 3
-46 7 -1 6 8 16 1 3 32 7 17 3
-46 6 -1 1 8 16 1 1 32 7 17 3
-46 5 -1 21 8 17 2 3 32 8 18 1
-46 4 -1 16 8 17 2 1 32 8 18 1
-46 3 -1 11 8 17 1 4 32 4 7 1
-46 2 -1 6 8 17 1 2 32 4 7 1
-46 1 -1 1 8 17 1 1 32 4 7 1
-45 100 -1 21 4 5 5 1 24 2 4 1
-45 99 -1 22 4 5 5 2 24 2 4 1
-45 98 -1 23 4 5 5 4 24 2 4 1
-45 97 -1 24 4 5 4 1 24 6 14 2
-45 96 -1 25 4 5 4 3 24 6 14 2
-45 95 -1 21 4 6 4 1 24 6 15 3
-45 94 -1 22 4 6 4 4 24 6 15 3
-45 93 -1 23 4 6 5 1 24 10 25 2
-45 92 -1 24 4 6 5 2 24 10 25 2
-45 91 -1 25 4 6 5 4 24 10 25 2
-45 90 -1 21 4 7 4 1 24 10 26 3
-45 89 -1 22 4 7 4 4 24 10 26 3
-45 88 -1 23 4 7 5 1 24 14 37 2
-45 87 -1 24 4 7 5 3 24 14 37 2
-45 86 -1 25 4 7 5 5 24 14 37 2
-45 85 -1 21 4 8 5 1 6 2 4 2
-45 84 -1 22 4 8 5 3 6 2 4 2
-45 83 -1 23 4 8 5 5 6 2 4 2
-45 82 -1 24 4 8 4 1 6 7 15 1
-45 81 -1 25 4 8 4 2 6 7 15 1
-45 80 -1 21 4 13 4 1 6 7 16 2
-45 79 -1 22 4 13 4 4 6 7 16 2
-45 78 -1 23 4 13 5 1 6 11 21 1
-45 77 -1 24 4 13 5 3 6 11 21 1
-45 76 -1 25 4 13 5 5 6 11 21 1
-45 75 -1 21 4 14 5 1 6 15 27 2
-45 74 -1 22 4 14 5 2 6 15 27 2
-45 73 -1 23 4 14 5 3 6 15 27 2
-45 72 -1 24 4 14 5 4 6 15 27 2
-45 71 -1 25 4 14 5 5 6 15 27 2
-45 70 -1 21 4 15 5 1 6 20 35 1
-45 69 -1 22 4 15 5 3 6 20 35 1
-45 68 -1 23 4 15 5 5 6 20 35 1
-45 67 -1 24 4 15 4 2 7 22 33 1
-45 66 -1 25 4 15 4 4 7 22 33 1
-45 65 -1 21 4 16 4 1 7 22 34 2
-45 64 -1 22 4 16 5 1 7 26 37 1
-45 63 -1 23 4 16 5 2 7 26 37 1
-45 62 -1 24 4 16 5 3 7 26 37 1
-45 61 -1 25 4 16 5 4 7 26 37 1
-45 40 -1 25 7 32 5 5 13 28 40 1
-45 39 -1 20 7 32 5 3 13 28 40 1
-45 38 -1 15 7 32 5 2 13 28 40 1
-45 37 -1 10 7 32 5 1 13 28 40 1
-45 36 -1 5 7 32 4 3 13 24 36 2
-45 35 -1 25 7 33 4 5 13 24 37 3
-45 34 -1 20 7 33 4 3 13 24 37 3
-45 33 -1 15 7 33 5 5 14 17 30 1
-45 32 -1 10 7 33 5 4 14 17 30 1
-45 31 -1 5 7 33 5 2 14 17 30 1
-45 30 -1 25 8 4 5 5 14 14 26 1
-45 29 -1 20 8 4 5 4 14 14 26 1
-45 28 -1 15 8 4 5 3 14 14 26 1
-45 27 -1 10 8 4 5 2 14 14 26 1
-45 26 -1 5 8 4 5 1 14 14 26 1
-45 25 -1 25 8 5 5 5 14 10 20 1
-45 24 -1 20 8 5 5 4 14 10 20 1
-45 23 -1 15 8 5 5 2 14 10 20 1
-45 22 -1 10 8 5 4 5 14 6 12 2
-45 21 -1 5 8 5 4 3 14 6 12 2
-45 20 -1 25 8 10 4 5 14 6 11 1
-45 19 -1 20 8 10 4 1 14 6 11 1
-45 18 -1 15 8 10 5 5 14 3 6 1
-45 17 -1 10 8 10 5 4 14 3 6 1
-45 16 -1 5 8 10 5 2 14 3 6 1
-45 15 -1 25 8 11 5 5 32 15 38 1
-45 14 -1 20 8 11 5 4 32 15 38 1
-45 13 -1 15 8 11 5 2 32 15 38 1
-45 12 -1 10 8 11 4 5 32 11 27 1
-45 11 -1 5 8 11 4 3 32 11 27 1
-45 10 -1 25 8 12 5 5 32 11 29 3
-45 9 -1 20 8 12 5 4 32 11 29 3
-45 8 -1 15 8 12 5 2 32 11 29 3
-45 7 -1 10 8 12 4 5 32 7 15 1
-45 6 -1 5 8 12 4 3 32 7 15 1
-45 5 -1 25 8 13 4 5 32 7 16 2
-45 4 -1 20 8 13 4 2 32 7 16 2
-45 3 -1 15 8 13 5 5 32 3 6 3
-45 2 -1 10 8 13 5 4 32 3 6 3
-45 1 -1 5 8 13 5 2 32 3 6 3
-44 100 -1 16 4 5 3 1 24 2 5 2
-44 99 -1 17 4 5 5 3 24 2 4 1
-44 98 -1 18 4 5 5 5 24 2 4 1
-44 97 -1 19 4 5 4 2 24 6 14 2
-44 96 -1 20 4 5 4 4 24 6 14 2
-44 95 -1 16 4 6 4 2 24 6 15 3
-44 94 -1 17 4 6 4 5 24 6 15 3
-44 93 -1 18 4 6 3 2 24 10 27 4
-44 92 -1 19 4 6 5 3 24 10 25 2
-44 91 -1 20 4 6 5 5 24 10 25 2
-44 90 -1 16 4 7 4 2 24 10 26 3
-44 89 -1 17 4 7 4 5 24 10 26 3
-44 88 -1 18 4 7 5 2 24 14 37 2
-44 87 -1 19 4 7 5 4 24 14 37 2
-44 86 -1 20 4 7 3 3 24 15 38 1
-44 85 -1 16 4 8 5 2 6 2 4 2
-44 84 -1 17 4 8 5 4 6 2 4 2
-44 83 -1 18 4 8 3 2 6 3 5 1
-44 82 -1 19 4 8 3 4 6 3 5 1
-44 81 -1 20 4 8 4 3 6 7 15 1
-44 80 -1 16 4 13 4 2 6 7 16 2
-44 79 -1 17 4 13 4 5 6 7 16 2
-44 78 -1 18 4 13 5 2 6 11 21 1
-44 77 -1 19 4 13 5 4 6 11 21 1
-44 76 -1 20 4 13 3 3 6 12 22 1
-44 75 -1 16 4 14 4 1 6 16 28 1
-44 74 -1 17 4 14 4 2 6 16 28 1
-44 73 -1 18 4 14 4 3 6 16 28 1
-44 72 -1 19 4 14 4 4 6 16 28 1
-44 71 -1 20 4 14 4 5 6 16 28 1
-44 70 -1 16 4 15 5 2 6 20 35 1
-44 69 -1 17 4 15 5 4 6 20 35 1
-44 68 -1 18 4 15 4 1 7 22 33 1
-44 67 -1 19 4 15 4 3 7 22 33 1
-44 66 -1 20 4 15 4 5 7 22 33 1
-44 65 -1 16 4 16 4 2 7 22 34 2
-44 64 -1 17 4 16 4 4 7 22 34 2
-44 63 -1 18 4 16 3 1 7 28 38 1
-44 62 -1 19 4 16 3 3 7 28 38 1
-44 61 -1 20 4 16 5 5 7 26 37 1
-44 40 -1 24 7 32 5 4 13 28 40 1
-44 39 -1 19 7 32 3 4 13 26 39 2
-44 38 -1 14 7 32 3 2 13 26 39 2
-44 37 -1 9 7 32 4 5 13 24 36 2
-44 36 -1 4 7 32 4 2 13 24 36 2
-44 35 -1 24 7 33 4 4 13 24 37 3
-44 34 -1 19 7 33 4 2 13 24 37 3
-44 33 -1 14 7 33 4 1 13 24 37 3
-44 32 -1 9 7 33 5 3 14 17 30 1
-44 31 -1 4 7 33 5 1 14 17 30 1
-44 30 -1 24 8 4 4 5 14 13 25 2
-44 29 -1 19 8 4 4 4 14 13 25 2
-44 28 -1 14 8 4 4 3 14 13 25 2
-44 27 -1 9 8 4 4 2 14 13 25 2
-44 26 -1 4 8 4 4 1 14 13 25 2
-44 25 -1 24 8 5 3 5 14 9 19 2
-44 24 -1 19 8 5 5 3 14 10 20 1
-44 23 -1 14 8 5 5 1 14 10 20 1
-44 22 -1 9 8 5 4 4 14 6 12 2
-44 21 -1 4 8 5 4 2 14 6 12 2
-44 20 -1 24 8 10 4 4 14 6 11 1
-44 19 -1 19 8 10 3 5 14 2 5 2
-44 18 -1 14 8 10 3 4 14 2 5 2
-44 17 -1 9 8 10 5 3 14 3 6 1
-44 16 -1 4 8 10 5 1 14 3 6 1
-44 15 -1 24 8 11 3 5 32 14 37 2
-44 14 -1 19 8 11 5 3 32 15 38 1
-44 13 -1 14 8 11 5 1 32 15 38 1
-44 12 -1 9 8 11 4 4 32 11 27 1
-44 11 -1 4 8 11 4 2 32 11 27 1
-44 10 -1 24 8 12 3 5 32 11 28 2
-44 9 -1 19 8 12 5 3 32 11 29 3
-44 8 -1 14 8 12 5 1 32 11 29 3
-44 7 -1 9 8 12 4 4 32 7 15 1
-44 6 -1 4 8 12 4 2 32 7 15 1
-44 5 -1 24 8 13 4 4 32 7 16 2
-44 4 -1 19 8 13 4 1 32 7 16 2
-44 3 -1 14 8 13 3 4 32 3 5 2
-44 2 -1 9 8 13 5 3 32 3 6 3
-44 1 -1 4 8 13 5 1 32 3 6 3
-43 100 -1 11 4 5 3 2 24 2 5 2
-43 99 -1 12 4 5 3 3 24 2 5 2
-43 98 -1 13 4 5 3 4 24 2 5 2
-43 97 -1 14 4 5 3 5 24 2 5 2
-43 96 -1 15 4 5 4 5 24 6 14 2
-43 95 -1 11 4 6 4 3 24 6 15 3
-43 94 -1 12 4 6 3 1 24 10 27 4
-43 93 -1 13 4 6 3 3 24 10 27 4
-43 92 -1 14 4 6 3 4 24 10 27 4
-43 91 -1 15 4 6 3 5 24 10 27 4
-43 90 -1 11 4 7 4 3 24 10 26 3
-43 89 -1 12 4 7 2 3 24 11 28 1
-43 88 -1 13 4 7 3 1 24 15 38 1
-43 87 -1 14 4 7 3 2 24 15 38 1
-43 86 -1 15 4 7 3 4 24 15 38 1
-43 85 -1 11 4 8 2 1 6 3 6 2
-43 84 -1 12 4 8 3 1 6 3 5 1
-43 83 -1 13 4 8 3 3 6 3 5 1
-43 82 -1 14 4 8 3 5 6 3 5 1
-43 81 -1 15 4 8 4 4 6 7 15 1
-43 80 -1 11 4 13 4 3 6 7 16 2
-43 79 -1 12 4 13 2 3 6 8 17 1
-43 78 -1 13 4 13 3 1 6 12 22 1
-43 77 -1 14 4 13 3 2 6 12 22 1
-43 76 -1 15 4 13 3 4 6 12 22 1
-43 75 -1 11 4 14 3 1 6 16 29 2
-43 74 -1 12 4 14 3 3 6 16 29 2
-43 73 -1 13 4 14 3 4 6 16 29 2
-43 72 -1 14 4 14 3 5 6 16 29 2
-43 71 -1 15 4 14 2 4 7 13 23 1
-43 70 -1 11 4 15 3 1 7 17 29 1
-43 69 -1 12 4 15 3 3 7 17 29 1
-43 68 -1 13 4 15 3 5 7 17 29 1
-43 67 -1 14 4 15 2 1 7 22 35 3
-43 66 -1 15 4 15 2 3 7 22 35 3
-43 65 -1 11 4 16 4 3 7 22 34 2
-43 64 -1 12 4 16 4 5 7 22 34 2
-43 63 -1 13 4 16 3 2 7 28 38 1
-43 62 -1 14 4 16 3 4 7 28 38 1
-43 61 -1 15 4 16 3 5 7 28 38 1
-43 60 -1 11 5 3 5 1 7 28 39 2
-43 41 -1 3 7 14 1 5 12 28 41 1
-43 40 -1 23 7 32 3 5 13 26 39 2
-43 39 -1 18 7 32 3 3 13 26 39 2
-43 38 -1 13 7 32 3 1 13 26 39 2
-43 37 -1 8 7 32 4 4 13 24 36 2
-43 36 -1 3 7 32 4 1 13 24 36 2
-43 35 -1 23 7 33 2 5 13 24 35 1
-43 34 -1 18 7 33 2 2 13 24 35 1
-43 33 -1 13 7 33 3 5 13 20 32 1
-43 32 -1 8 7 33 3 4 13 20 32 1
-43 31 -1 3 7 33 3 2 13 20 32 1
-43 30 -1 23 8 4 2 5 13 16 28 2
-43 29 -1 18 8 4 3 5 14 13 24 1
-43 28 -1 13 8 4 3 4 14 13 24 1
-43 27 -1 8 8 4 3 3 14 13 24 1
-43 26 -1 3 8 4 3 2 14 13 24 1
-43 25 -1 23 8 5 3 4 14 9 19 2
-43 24 -1 18 8 5 3 3 14 9 19 2
-43 23 -1 13 8 5 3 2 14 9 19 2
-43 22 -1 8 8 5 2 5 14 5 10 1
-43 21 -1 3 8 5 4 1 14 6 12 2
-43 20 -1 23 8 10 4 3 14 6 11 1
-43 19 -1 18 8 10 2 5 14 2 4 1
-43 18 -1 13 8 10 3 3 14 2 5 2
-43 17 -1 8 8 10 3 2 14 2 5 2
-43 16 -1 3 8 10 3 1 14 2 5 2
-43 15 -1 23 8 11 3 4 32 14 37 2
-43 14 -1 18 8 11 3 3 32 14 37 2
-43 13 -1 13 8 11 3 2 32 14 37 2
-43 12 -1 8 8 11 2 5 32 10 25 2
-43 11 -1 3 8 11 4 1 32 11 27 1
-43 10 -1 23 8 12 3 4 32 11 28 2
-43 9 -1 18 8 12 3 3 32 11 28 2
-43 8 -1 13 8 12 3 2 32 11 28 2
-43 7 -1 8 8 12 3 1 32 11 28 2
-43 6 -1 3 8 12 4 1 32 7 15 1
-43 5 -1 23 8 13 4 3 32 7 16 2
-43 4 -1 18 8 13 3 5 32 3 5 2
-43 3 -1 13 8 13 3 3 32 3 5 2
-43 2 -1 8 8 13 3 2 32 3 5 2
-43 1 -1 3 8 13 3 1 32 3 5 2
-42 100 -1 6 4 5 2 1 24 2 6 3
-42 99 -1 7 4 5 2 2 24 2 6 3
-42 98 -1 8 4 5 2 3 24 2 6 3
-42 97 -1 9 4 5 2 4 24 2 6 3
-42 96 -1 10 4 5 2 5 24 2 6 3
-42 95 -1 6 4 6 1 1 24 7 16 1
-42 94 -1 7 4 6 1 3 24 7 16 1
-42 93 -1 8 4 6 2 1 24 11 29 2
-42 92 -1 9 4 6 2 2 24 11 29 2
-42 91 -1 10 4 6 2 4 24 11 29 2
-42 90 -1 6 4 7 2 1 24 11 28 1
-42 89 -1 7 4 7 2 4 24 11 28 1
-42 88 -1 8 4 7 1 1 24 15 39 2
-42 87 -1 9 4 7 1 3 24 15 39 2
-42 86 -1 10 4 7 3 5 24 15 38 1
-42 85 -1 6 4 8 2 2 6 3 6 2
-42 84 -1 7 4 8 2 3 6 3 6 2
-42 83 -1 8 4 8 2 4 6 3 6 2
-42 82 -1 9 4 8 2 5 6 3 6 2
-42 81 -1 10 4 8 4 5 6 7 15 1
-42 80 -1 6 4 13 2 1 6 8 17 1
-42 79 -1 7 4 13 2 4 6 8 17 1
-42 78 -1 8 4 13 1 1 6 12 23 2
-42 77 -1 9 4 13 1 3 6 12 23 2
-42 76 -1 10 4 13 3 5 6 12 22 1
-42 75 -1 6 4 14 3 2 6 16 29 2
-42 74 -1 7 4 14 2 1 7 13 23 1
-42 73 -1 8 4 14 2 2 7 13 23 1
-42 72 -1 9 4 14 2 3 7 13 23 1
-42 71 -1 10 4 14 2 5 7 13 23 1
-42 70 -1 6 4 15 3 2 7 17 29 1
-42 69 -1 7 4 15 3 4 7 17 29 1
-42 68 -1 8 4 15 1 3 7 18 30 1
-42 67 -1 9 4 15 1 5 7 18 30 1
-42 66 -1 10 4 15 2 4 7 22 35 3
-42 65 -1 6 4 16 2 1 7 24 36 1
-42 64 -1 7 4 16 2 3 7 24 36 1
-42 63 -1 8 4 16 2 5 7 24 36 1
-42 62 -1 9 4 16 1 2 7 28 40 3
-42 61 -1 10 4 16 1 4 7 28 40 3
-42 60 -1 6 5 25 5 2 8 26 39 1
-42 59 -1 7 5 25 5 1 8 26 39 1
-42 42 -1 7 7 14 1 3 12 28 41 1
-42 41 -1 2 7 14 1 4 12 28 41 1
-42 40 -1 22 7 32 1 5 13 26 38 1
-42 39 -1 17 7 32 1 3 13 26 38 1
-42 38 -1 12 7 32 2 5 13 22 34 2
-42 37 -1 7 7 32 2 4 13 22 34 2
-42 36 -1 2 7 32 2 2 13 22 34 2
-42 35 -1 22 7 33 2 4 13 24 35 1
-42 34 -1 17 7 33 1 5 13 19 31 1
-42 33 -1 12 7 33 1 4 13 19 31 1
-42 32 -1 7 7 33 3 3 13 20 32 1
-42 31 -1 2 7 33 3 1 13 20 32 1
-42 30 -1 22 8 4 2 4 13 16 28 2
-42 29 -1 17 8 4 2 3 13 16 28 2
-42 28 -1 12 8 4 2 2 13 16 28 2
-42 27 -1 7 8 4 2 1 13 16 28 2
-42 26 -1 2 8 4 3 1 14 13 24 1
-42 25 -1 22 8 5 1 5 14 9 18 1
-42 24 -1 17 8 5 1 3 14 9 18 1
-42 23 -1 12 8 5 3 1 14 9 19 2
-42 22 -1 7 8 5 2 4 14 5 10 1
-42 21 -1 2 8 5 2 2 14 5 10 1
-42 20 -1 22 8 10 4 2 14 6 11 1
-42 19 -1 17 8 10 2 4 14 2 4 1
-42 18 -1 12 8 10 2 3 14 2 4 1
-42 17 -1 7 8 10 2 2 14 2 4 1
-42 16 -1 2 8 10 2 1 14 2 4 1
-42 15 -1 22 8 11 1 5 32 14 36 1
-42 14 -1 17 8 11 1 3 32 14 36 1
-42 13 -1 12 8 11 3 1 32 14 37 2
-42 12 -1 7 8 11 2 4 32 10 25 2
-42 11 -1 2 8 11 2 2 32 10 25 2
-42 10 -1 22 8 12 2 5 32 10 26 3
-42 9 -1 17 8 12 2 3 32 10 26 3
-42 8 -1 12 8 12 2 1 32 10 26 3
-42 7 -1 7 8 12 1 4 32 6 14 2
-42 6 -1 2 8 12 1 2 32 6 14 2
-42 5 -1 22 8 13 2 5 32 3 4 1
-42 4 -1 17 8 13 2 4 32 3 4 1
-42 3 -1 12 8 13 2 3 32 3 4 1
-42 2 -1 7 8 13 2 2 32 3 4 1
-42 1 -1 2 8 13 2 1 32 3 4 1
-41 100 -1 1 4 5 1 1 24 3 7 1
-41 99 -1 2 4 5 1 2 24 3 7 1
-41 98 -1 3 4 5 1 3 24 3 7 1
-41 97 -1 4 4 5 1 4 24 3 7 1
-41 96 -1 5 4 5 1 5 24 3 7 1
-41 95 -1 1 4 6 1 2 24 7 16 1
-41 94 -1 2 4 6 1 4 24 7 16 1
-41 93 -1 3 4 6 1 5 24 7 16 1
-41 92 -1 4 4 6 2 3 24 11 29 2
-41 91 -1 5 4 6 2 5 24 11 29 2
-41 90 -1 1 4 7 2 2 24 11 28 1
-41 89 -1 2 4 7 2 5 24 11 28 1
-41 88 -1 3 4 7 1 2 24 15 39 2
-41 87 -1 4 4 7 1 4 24 15 39 2
-41 86 -1 5 4 7 1 5 24 15 39 2
-41 85 -1 1 4 8 1 1 6 4 7 1
-41 84 -1 2 4 8 1 2 6 4 7 1
-41 83 -1 3 4 8 1 3 6 4 7 1
-41 82 -1 4 4 8 1 4 6 4 7 1
-41 81 -1 5 4 8 1 5 6 4 7 1
-41 80 -1 1 4 13 2 2 6 8 17 1
-41 79 -1 2 4 13 2 5 6 8 17 1
-41 78 -1 3 4 13 1 2 6 12 23 2
-41 77 -1 4 4 13 1 4 6 12 23 2
-41 76 -1 5 4 13 1 5 6 12 23 2
-41 75 -1 1 4 14 1 1 7 13 24 2
-41 74 -1 2 4 14 1 2 7 13 24 2
-41 73 -1 3 4 14 1 3 7 13 24 2
-41 72 -1 4 4 14 1 4 7 13 24 2
-41 71 -1 5 4 14 1 5 7 13 24 2
-41 70 -1 1 4 15 1 1 7 18 30 1
-41 69 -1 2 4 15 1 2 7 18 30 1
-41 68 -1 3 4 15 1 4 7 18 30 1
-41 67 -1 4 4 15 2 2 7 22 35 3
-41 66 -1 5 4 15 2 5 7 22 35 3
-41 65 -1 1 4 16 2 2 7 24 36 1
-41 64 -1 2 4 16 2 4 7 24 36 1
-41 63 -1 3 4 16 1 1 7 28 40 3
-41 62 -1 4 4 16 1 3 7 28 40 3
-41 61 -1 5 4 16 1 5 7 28 40 3
-41 60 -1 1 5 25 5 5 8 26 39 1
-41 59 -1 2 5 25 5 4 8 26 39 1
-41 58 -1 3 5 25 5 3 8 26 39 1
-41 43 -1 11 7 21 1 1 12 26 40 3
-41 42 -1 6 7 14 1 1 12 28 41 1
-41 41 -1 1 7 14 1 2 12 28 41 1
-41 40 -1 21 7 32 1 4 13 26 38 1
-41 39 -1 16 7 32 1 2 13 26 38 1
-41 38 -1 11 7 32 1 1 13 26 38 1
-41 37 -1 6 7 32 2 3 13 22 34 2
-41 36 -1 1 7 32 2 1 13 22 34 2
-41 35 -1 21 7 33 2 3 13 24 35 1
-41 34 -1 16 7 33 2 1 13 24 35 1
-41 33 -1 11 7 33 1 3 13 19 31 1
-41 32 -1 6 7 33 1 2 13 19 31 1
-41 31 -1 1 7 33 1 1 13 19 31 1
-41 30 -1 21 8 4 1 5 13 16 27 1
-41 29 -1 16 8 4 1 4 13 16 27 1
-41 28 -1 11 8 4 1 3 13 16 27 1
-41 27 -1 6 8 4 1 2 13 16 27 1
-41 26 -1 1 8 4 1 1 13 16 27 1
-41 25 -1 21 8 5 1 4 14 9 18 1
-41 24 -1 16 8 5 1 2 14 9 18 1
-41 23 -1 11 8 5 1 1 14 9 18 1
-41 22 -1 6 8 5 2 3 14 5 10 1
-41 21 -1 1 8 5 2 1 14 5 10 1
-41 20 -1 21 8 10 1 5 14 1 3 3
-41 19 -1 16 8 10 1 4 14 1 3 3
-41 18 -1 11 8 10 1 3 14 1 3 3
-41 17 -1 6 8 10 1 2 14 1 3 3
-41 16 -1 1 8 10 1 1 14 1 3 3
-41 15 -1 21 8 11 1 4 32 14 36 1
-41 14 -1 16 8 11 1 2 32 14 36 1
-41 13 -1 11 8 11 1 1 32 14 36 1
-41 12 -1 6 8 11 2 3 32 10 25 2
-41 11 -1 1 8 11 2 1 32 10 25 2
-41 10 -1 21 8 12 2 4 32 10 26 3
-41 9 -1 16 8 12 2 2 32 10 26 3
-41 8 -1 11 8 12 1 5 32 6 14 2
-41 7 -1 6 8 12 1 3 32 6 14 2
-41 6 -1 1 8 12 1 1 32 6 14 2
-41 5 -1 21 8 13 1 5 32 2 3 2
-41 4 -1 16 8 13 1 4 32 2 3 2
-41 3 -1 11 8 13 1 3 32 2 3 2
-41 2 -1 6 8 13 1 2 32 2 3 2
-41 1 -1 1 8 13 1 1 32 2 3 2
-40 97 -1 24 4 30 2 1 24 3 8 2
-40 96 -1 25 4 30 2 3 24 3 8 2
-40 95 -1 21 4 17 5 1 24 7 17 2
-40 94 -1 22 4 17 5 3 24 7 17 2
-40 93 -1 23 4 17 5 5 24 7 17 2
-40 92 -1 24 4 17 4 2 24 11 30 3
-40 91 -1 25 4 17 4 4 24 11 30 3
-40 90 -1 21 4 20 4 1 24 12 31 1
-40 89 -1 22 4 20 4 3 24 12 31 1
-40 88 -1 23 4 20 5 1 24 16 40 1
-40 87 -1 24 4 20 5 2 24 16 40 1
-40 86 -1 25 4 20 5 4 24 16 40 1
-40 85 -1 21 4 24 5 1 6 4 8 2
-40 84 -1 22 4 24 5 2 6 4 8 2
-40 83 -1 23 4 24 5 3 6 4 8 2
-40 82 -1 24 4 24 5 4 6 4 8 2
-40 81 -1 25 4 24 5 5 6 4 8 2
-40 80 -1 21 4 27 5 1 7 5 9 2
-40 79 -1 22 4 27 5 2 7 5 9 2
-40 78 -1 23 4 27 5 4 7 5 9 2
-40 77 -1 24 4 27 4 1 7 9 16 1
-40 76 -1 25 4 27 4 3 7 9 16 1
-40 75 -1 21 4 31 5 1 7 9 17 2
-40 74 -1 22 4 31 5 3 7 9 17 2
-40 73 -1 23 4 31 5 5 7 9 17 2
-40 72 -1 24 4 31 4 2 7 14 25 1
-40 71 -1 25 4 31 4 4 7 14 25 1
-40 70 -1 21 4 33 5 1 7 19 31 1
-40 69 -1 22 4 33 5 2 7 19 31 1
-40 68 -1 23 4 33 5 3 7 19 31 1
-40 67 -1 24 4 33 5 5 7 19 31 1
-40 66 -1 25 4 33 4 4 7 20 32 1
-40 65 -1 21 5 18 5 1 8 22 36 2
-40 64 -1 22 5 18 5 2 8 22 36 2
-40 63 -1 23 5 18 5 3 8 22 36 2
-40 62 -1 24 5 18 5 4 8 22 36 2
-40 61 -1 25 5 18 5 5 8 22 36 2
-40 60 -1 21 5 26 5 1 8 28 41 2
-40 59 -1 22 5 26 5 2 8 28 41 2
-40 58 -1 23 5 26 5 3 8 28 41 2
-40 57 -1 24 5 26 4 1 9 26 38 1
-40 56 -1 25 5 26 4 2 9 26 38 1
-40 45 -1 25 7 1 4 5 11 28 40 1
-40 44 -1 20 7 1 4 1 11 28 40 1
-40 43 -1 15 7 1 5 5 12 26 39 2
-40 42 -1 10 7 1 5 4 12 26 39 2
-40 41 -1 5 7 1 5 2 12 26 39 2
-40 40 -1 25 7 2 4 5 12 24 37 2
-40 39 -1 20 7 2 4 3 12 24 37 2
-40 38 -1 15 7 2 5 5 13 22 33 1
-40 37 -1 10 7 2 5 4 13 22 33 1
-40 36 -1 5 7 2 5 2 13 22 33 1
-40 35 -1 25 7 4 4 5 13 17 29 1
-40 34 -1 20 7 4 5 5 13 18 30 1
-40 33 -1 15 7 4 5 4 13 18 30 1
-40 32 -1 10 7 4 5 2 13 18 30 1
-40 31 -1 5 7 4 5 1 13 18 30 1
-40 30 -1 25 7 8 4 5 13 15 26 1
-40 29 -1 20 7 8 4 3 13 15 26 1
-40 28 -1 15 7 8 5 5 13 12 22 2
-40 27 -1 10 7 8 5 4 13 12 22 2
-40 26 -1 5 7 8 5 2 13 12 22 2
-40 25 -1 25 7 15 4 5 13 12 21 1
-40 24 -1 20 7 15 4 2 13 12 21 1
-40 23 -1 15 7 15 5 5 13 8 15 2
-40 22 -1 10 7 15 5 4 13 8 15 2
-40 21 -1 5 7 15 5 2 13 8 15 2
-40 20 -1 25 7 22 5 5 14 1 2 2
-40 19 -1 20 7 22 5 4 14 1 2 2
-40 18 -1 15 7 22 5 3 14 1 2 2
-40 17 -1 10 7 22 5 2 14 1 2 2
-40 16 -1 5 7 22 5 1 14 1 2 2
-40 15 -1 25 8 1 5 5 32 13 35 2
-40 14 -1 20 8 1 5 4 32 13 35 2
-40 13 -1 15 8 1 5 2 32 13 35 2
-40 12 -1 10 8 1 4 5 32 9 23 3
-40 11 -1 5 8 1 4 3 32 9 23 3
-40 10 -1 25 8 2 4 5 32 10 24 1
-40 9 -1 20 8 2 4 3 32 10 24 1
-40 8 -1 15 8 2 5 5 32 6 13 1
-40 7 -1 10 8 2 5 4 32 6 13 1
-40 6 -1 5 8 2 5 2 32 6 13 1
-40 5 -1 25 8 3 2 5 32 2 2 1
-40 4 -1 20 8 3 2 2 32 2 2 1
-39 97 -1 19 4 30 2 2 24 3 8 2
-39 96 -1 20 4 30 2 4 24 3 8 2
-39 95 -1 16 4 17 5 2 24 7 17 2
-39 94 -1 17 4 17 5 4 24 7 17 2
-39 93 -1 18 4 17 4 1 24 11 30 3
-39 92 -1 19 4 17 4 3 24 11 30 3
-39 91 -1 20 4 17 4 5 24 11 30 3
-39 90 -1 16 4 20 4 2 24 12 31 1
-39 89 -1 17 4 20 4 4 24 12 31 1
-39 88 -1 18 4 20 3 1 24 16 41 2
-39 87 -1 19 4 20 5 3 24 16 40 1
-39 86 -1 20 4 20 5 5 24 16 40 1
-39 85 -1 16 4 24 4 1 6 4 9 3
-39 84 -1 17 4 24 4 2 6 4 9 3
-39 83 -1 18 4 24 4 4 6 4 9 3
-39 82 -1 19 4 24 4 5 6 4 9 3
-39 81 -1 20 4 24 3 3 7 1 1 1
-39 80 -1 16 4 27 3 1 7 5 10 1
-39 79 -1 17 4 27 5 3 7 5 9 2
-39 78 -1 18 4 27 5 5 7 5 9 2
-39 77 -1 19 4 27 4 2 7 9 16 1
-39 76 -1 20 4 27 4 4 7 9 16 1
-39 75 -1 16 4 31 5 2 7 9 17 2
-39 74 -1 17 4 31 5 4 7 9 17 2
-39 73 -1 18 4 31 4 1 7 14 25 1
-39 72 -1 19 4 31 4 3 7 14 25 1
-39 71 -1 20 4 31 4 5 7 14 25 1
-39 70 -1 16 4 33 3 1 7 15 26 1
-39 69 -1 17 4 33 3 4 7 15 26 1
-39 68 -1 18 4 33 5 4 7 19 31 1
-39 67 -1 19 4 33 4 2 7 20 32 1
-39 66 -1 20 4 33 4 5 7 20 32 1
-39 65 -1 16 5 18 3 1 8 17 29 1
-39 64 -1 17 5 18 3 4 8 17 29 1
-39 63 -1 18 5 18 4 1 8 22 35 1
-39 62 -1 19 5 18 4 3 8 22 35 1
-39 61 -1 20 5 18 4 5 8 22 35 1
-39 60 -1 16 5 26 3 1 8 28 40 1
-39 59 -1 17 5 26 3 3 8 28 40 1
-39 58 -1 18 5 26 5 4 8 28 41 2
-39 57 -1 19 5 26 5 5 8 28 41 2
-39 56 -1 20 5 26 4 3 9 26 38 1
-39 55 -1 16 5 32 4 1 9 28 40 2
-39 54 -1 17 5 32 4 2 9 28 40 2
-39 53 -1 18 5 32 4 4 9 28 40 2
-39 52 -1 19 5 32 3 1 10 26 40 2
-39 51 -1 20 5 32 3 3 10 26 40 2
-39 50 -1 24 6 10 3 5 10 28 42 2
-39 49 -1 19 6 10 3 3 10 28 42 2
-39 48 -1 14 6 10 4 5 11 26 39 2
-39 47 -1 9 6 10 4 4 11 26 39 2
-39 46 -1 4 6 10 4 2 11 26 39 2
-39 45 -1 24 7 1 4 4 11 28 40 1
-39 44 -1 19 7 1 3 5 12 26 38 1
-39 43 -1 14 7 1 3 3 12 26 38 1
-39 42 -1 9 7 1 5 3 12 26 39 2
-39 41 -1 4 7 1 5 1 12 26 39 2
-39 40 -1 24 7 2 4 4 12 24 37 2
-39 39 -1 19 7 2 4 2 12 24 37 2
-39 38 -1 14 7 2 4 1 12 24 37 2
-39 37 -1 9 7 2 5 3 13 22 33 1
-39 36 -1 4 7 2 5 1 13 22 33 1
-39 35 -1 24 7 4 4 4 13 17 29 1
-39 34 -1 19 7 4 4 3 13 17 29 1
-39 33 -1 14 7 4 5 3 13 18 30 1
-39 32 -1 9 7 4 3 5 13 14 25 2
-39 31 -1 4 7 4 3 3 13 14 25 2
-39 30 -1 24 7 8 4 4 13 15 26 1
-39 29 -1 19 7 8 4 2 13 15 26 1
-39 28 -1 14 7 8 4 1 13 15 26 1
-39 27 -1 9 7 8 5 3 13 12 22 2
-39 26 -1 4 7 8 5 1 13 12 22 2
-39 25 -1 24 7 15 4 4 13 12 21 1
-39 24 -1 19 7 15 4 1 13 12 21 1
-39 23 -1 14 7 15 3 5 13 8 14 1
-39 22 -1 9 7 15 5 3 13 8 15 2
-39 21 -1 4 7 15 5 1 13 8 15 2
-39 20 -1 24 7 22 3 5 13 4 8 2
-39 19 -1 19 7 22 4 5 14 1 1 1
-39 18 -1 14 7 22 4 4 14 1 1 1
-39 17 -1 9 7 22 4 3 14 1 1 1
-39 16 -1 4 7 22 4 1 14 1 1 1
-39 15 -1 24 8 1 3 5 32 13 34 1
-39 14 -1 19 8 1 5 3 32 13 35 2
-39 13 -1 14 8 1 5 1 32 13 35 2
-39 12 -1 9 8 1 4 4 32 9 23 3
-39 11 -1 4 8 1 4 2 32 9 23 3
-39 10 -1 24 8 2 4 4 32 10 24 1
-39 9 -1 19 8 2 4 2 32 10 24 1
-39 8 -1 14 8 2 4 1 32 10 24 1
-39 7 -1 9 8 2 5 3 32 6 13 1
-39 6 -1 4 8 2 5 1 32 6 13 1
-39 5 -1 24 8 3 2 4 32 2 2 1
-39 4 -1 19 8 3 2 1 32 2 2 1
-38 97 -1 14 4 30 1 1 24 4 9 1
-38 96 -1 15 4 30 2 5 24 3 8 2
-38 95 -1 11 4 17 3 1 24 8 18 1
-38 94 -1 12 4 17 3 2 24 8 18 1
-38 93 -1 13 4 17 3 3 24 8 18 1
-38 92 -1 14 4 17 2 1 24 12 32 2
-38 91 -1 15 4 17 2 3 24 12 32 2
-38 90 -1 11 4 20 2 1 24 12 33 3
-38 89 -1 12 4 20 4 5 24 12 31 1
-38 88 -1 13 4 20 3 2 24 16 41 2
-38 87 -1 14 4 20 3 3 24 16 41 2
-38 86 -1 15 4 20 3 5 24 16 41 2
-38 85 -1 11 4 24 2 1 25 13 31 1
-38 84 -1 12 4 24 4 3 6 4 9 3
-38 83 -1 13 4 24 3 1 7 1 1 1
-38 82 -1 14 4 24 3 2 7 1 1 1
-38 81 -1 15 4 24 3 4 7 1 1 1
-38 80 -1 11 4 27 3 2 7 5 10 1
-38 79 -1 12 4 27 3 4 7 5 10 1
-38 78 -1 13 4 27 3 5 7 5 10 1
-38 77 -1 14 4 27 2 3 7 6 11 1
-38 76 -1 15 4 27 4 5 7 9 16 1
-38 75 -1 11 4 31 3 1 7 10 18 1
-38 74 -1 12 4 31 3 3 7 10 18 1
-38 73 -1 13 4 31 3 5 7 10 18 1
-38 72 -1 14 4 31 2 1 7 15 27 2
-38 71 -1 15 4 31 2 3 7 15 27 2
-38 70 -1 11 4 33 3 2 7 15 26 1
-38 69 -1 12 4 33 3 5 7 15 26 1
-38 68 -1 13 4 33 4 1 7 20 32 1
-38 67 -1 14 4 33 4 3 7 20 32 1
-38 66 -1 15 4 33 2 3 8 17 30 2
-38 65 -1 11 5 18 3 2 8 17 29 1
-38 64 -1 12 5 18 3 5 8 17 29 1
-38 63 -1 13 5 18 4 2 8 22 35 1
-38 62 -1 14 5 18 4 4 8 22 35 1
-38 61 -1 15 5 18 2 3 8 24 37 1
-38 60 -1 11 5 26 3 2 8 28 40 1
-38 59 -1 12 5 26 2 3 8 24 38 2
-38 58 -1 13 5 26 3 4 8 28 40 1
-38 57 -1 14 5 26 3 5 8 28 40 1
-38 56 -1 15 5 26 4 4 9 26 38 1
-38 55 -1 11 5 32 2 1 9 28 39 1
-38 54 -1 12 5 32 4 3 9 28 40 2
-38 53 -1 13 5 32 4 5 9 28 40 2
-38 52 -1 14 5 32 3 2 10 26 40 2
-38 51 -1 15 5 32 3 4 10 26 40 2
-38 50 -1 23 6 10 3 4 10 28 42 2
-38 49 -1 18 6 10 3 2 10 28 42 2
-38 48 -1 13 6 10 2 5 11 26 38 1
-38 47 -1 8 6 10 4 3 11 26 39 2
-38 46 -1 3 6 10 4 1 11 26 39 2
-38 45 -1 23 7 1 4 3 11 28 40 1
-38 44 -1 18 7 1 3 4 12 26 38 1
-38 43 -1 13 7 1 3 2 12 26 38 1
-38 42 -1 8 7 1 2 5 12 22 35 1
-38 41 -1 3 7 1 3 1 12 26 38 1
-38 40 -1 23 7 2 3 5 12 24 36 1
-38 39 -1 18 7 2 3 2 12 24 36 1
-38 38 -1 13 7 2 3 1 12 24 36 1
-38 37 -1 8 7 2 2 5 12 20 33 1
-38 36 -1 3 7 2 2 3 12 20 33 1
-38 35 -1 23 7 4 2 5 12 20 34 2
-38 34 -1 18 7 4 4 2 13 17 29 1
-38 33 -1 13 7 4 4 1 13 17 29 1
-38 32 -1 8 7 4 3 4 13 14 25 2
-38 31 -1 3 7 4 3 2 13 14 25 2
-38 30 -1 23 7 8 2 5 13 14 24 1
-38 29 -1 18 7 8 2 2 13 14 24 1
-38 28 -1 13 7 8 3 5 13 11 20 1
-38 27 -1 8 7 8 3 4 13 11 20 1
-38 26 -1 3 7 8 3 2 13 11 20 1
-38 25 -1 23 7 15 4 3 13 12 21 1
-38 24 -1 18 7 15 2 4 13 7 13 2
-38 23 -1 13 7 15 3 4 13 8 14 1
-38 22 -1 8 7 15 3 3 13 8 14 1
-38 21 -1 3 7 15 3 2 13 8 14 1
-38 20 -1 23 7 22 3 4 13 4 8 2
-38 19 -1 18 7 22 3 3 13 4 8 2
-38 18 -1 13 7 22 3 2 13 4 8 2
-38 17 -1 8 7 22 4 2 14 1 1 1
-38 16 -1 3 7 22 2 3 31 16 39 2
-38 15 -1 23 8 1 3 4 32 13 34 1
-38 14 -1 18 8 1 3 3 32 13 34 1
-38 13 -1 13 8 1 3 1 32 13 34 1
-38 12 -1 8 8 1 2 5 32 9 21 1
-38 11 -1 3 8 1 4 1 32 9 23 3
-38 10 -1 23 8 2 2 5 32 9 22 2
-38 9 -1 18 8 2 2 2 32 9 22 2
-38 8 -1 13 8 2 3 5 32 5 12 3
-38 7 -1 8 8 2 3 4 32 5 12 3
-38 6 -1 3 8 2 3 2 32 5 12 3
-38 5 -1 23 8 3 2 3 32 2 2 1
-38 4 -1 18 8 3 1 3 32 1 1 1
-37 97 -1 9 4 30 1 2 24 4 9 1
-37 96 -1 10 4 30 1 4 24 4 9 1
-37 95 -1 6 4 17 1 1 24 8 19 2
-37 94 -1 7 4 17 1 3 24 8 19 2
-37 93 -1 8 4 17 3 4 24 8 18 1
-37 92 -1 9 4 17 3 5 24 8 18 1
-37 91 -1 10 4 17 2 4 24 12 32 2
-37 90 -1 6 4 20 2 2 24 12 33 3
-37 89 -1 7 4 20 2 4 24 12 33 3
-37 88 -1 8 4 20 1 1 25 13 32 2
-37 87 -1 9 4 20 3 4 24 16 41 2
-37 86 -1 10 4 20 1 4 25 13 32 2
-37 85 -1 6 4 24 2 2 25 13 31 1
-37 84 -1 7 4 24 2 4 25 13 31 1
-37 83 -1 8 4 24 1 1 7 1 2 2
-37 82 -1 9 4 24 1 3 7 1 2 2
-37 81 -1 10 4 24 3 5 7 1 1 1
-37 80 -1 6 4 27 3 3 7 5 10 1
-37 79 -1 7 4 27 2 1 7 6 11 1
-37 78 -1 8 4 27 2 2 7 6 11 1
-37 77 -1 9 4 27 2 4 7 6 11 1
-37 76 -1 10 4 27 2 5 7 6 11 1
-37 75 -1 6 4 31 3 2 7 10 18 1
-37 74 -1 7 4 31 3 4 7 10 18 1
-37 73 -1 8 4 31 1 3 7 11 19 1
-37 72 -1 9 4 31 2 2 7 15 27 2
-37 71 -1 10 4 31 2 4 7 15 27 2
-37 70 -1 6 4 33 3 3 7 15 26 1
-37 69 -1 7 4 33 1 2 7 16 28 1
-37 68 -1 8 4 33 1 4 7 16 28 1
-37 67 -1 9 4 33 2 1 8 17 30 2
-37 66 -1 10 4 33 2 4 8 17 30 2
-37 65 -1 6 5 18 3 3 8 17 29 1
-37 64 -1 7 5 18 1 2 8 18 32 2
-37 63 -1 8 5 18 1 4 8 18 32 2
-37 62 -1 9 5 18 2 1 8 24 37 1
-37 61 -1 10 5 18 2 4 8 24 37 1
-37 60 -1 6 5 26 2 1 8 24 38 2
-37 59 -1 7 5 26 2 4 8 24 38 2
-37 58 -1 8 5 26 1 1 9 22 36 3
-37 57 -1 9 5 26 1 3 9 22 36 3
-37 56 -1 10 5 26 4 5 9 26 38 1
-37 55 -1 6 5 32 2 2 9 28 39 1
-37 54 -1 7 5 32 2 4 9 28 39 1
-37 53 -1 8 5 32 1 1 10 26 39 1
-37 52 -1 9 5 32 1 3 10 26 39 1
-37 51 -1 10 5 32 3 5 10 26 40 2
-37 50 -1 22 6 10 1 5 10 28 41 1
-37 49 -1 17 6 10 1 3 10 28 41 1
-37 48 -1 12 6 10 3 1 10 28 42 2
-37 47 -1 7 6 10 2 4 11 26 38 1
-37 46 -1 2 6 10 2 2 11 26 38 1
-37 45 -1 22 7 1 4 2 11 28 40 1
-37 44 -1 17 7 1 1 4 11 24 37 3
-37 43 -1 12 7 1 1 2 11 24 37 3
-37 42 -1 7 7 1 2 4 12 22 35 1
-37 41 -1 2 7 1 2 2 12 22 35 1
-37 40 -1 22 7 2 3 4 12 24 36 1
-37 39 -1 17 7 2 1 5 12 19 32 2
-37 38 -1 12 7 2 1 3 12 19 32 2
-37 37 -1 7 7 2 2 4 12 20 33 1
-37 36 -1 2 7 2 2 2 12 20 33 1
-37 35 -1 22 7 4 2 4 12 20 34 2
-37 34 -1 17 7 4 2 2 12 20 34 2
-37 33 -1 12 7 4 1 5 13 13 23 1
-37 32 -1 7 7 4 1 3 13 13 23 1
-37 31 -1 2 7 4 3 1 13 14 25 2
-37 30 -1 22 7 8 2 4 13 14 24 1
-37 29 -1 17 7 8 2 1 13 14 24 1
-37 28 -1 12 7 8 1 4 13 10 19 2
-37 27 -1 7 7 8 3 3 13 11 20 1
-37 26 -1 2 7 8 3 1 13 11 20 1
-37 25 -1 22 7 15 2 5 13 7 13 2
-37 24 -1 17 7 15 2 3 13 7 13 2
-37 23 -1 12 7 15 2 2 13 7 13 2
-37 22 -1 7 7 15 2 1 13 7 13 2
-37 21 -1 2 7 15 3 1 13 8 14 1
-37 20 -1 22 7 22 1 5 13 4 7 1
-37 19 -1 17 7 22 1 3 13 4 7 1
-37 18 -1 12 7 22 3 1 13 4 8 2
-37 17 -1 7 7 22 2 5 31 16 39 2
-37 16 -1 2 7 22 2 2 31 16 39 2
-37 15 -1 22 8 1 1 5 31 16 40 3
-37 14 -1 17 8 1 3 2 32 13 34 1
-37 13 -1 12 8 1 1 2 31 16 40 3
-37 12 -1 7 8 1 2 4 32 9 21 1
-37 11 -1 2 8 1 2 2 32 9 21 1
-37 10 -1 22 8 2 2 4 32 9 22 2
-37 9 -1 17 8 2 1 5 32 5 11 2
-37 8 -1 12 8 2 1 4 32 5 11 2
-37 7 -1 7 8 2 3 3 32 5 12 3
-37 6 -1 2 8 2 3 1 32 5 12 3
-37 5 -1 22 8 3 1 5 32 1 1 1
-37 4 -1 17 8 3 1 2 32 1 1 1
-36 97 -1 4 4 30 1 3 24 4 9 1
-36 96 -1 5 4 30 1 5 24 4 9 1
-36 95 -1 1 4 17 1 2 24 8 19 2
-36 94 -1 2 4 17 1 4 24 8 19 2
-36 93 -1 3 4 17 1 5 24 8 19 2
-36 92 -1 4 4 17 2 2 24 12 32 2
-36 91 -1 5 4 17 2 5 24 12 32 2
-36 90 -1 1 4 20 2 3 24 12 33 3
-36 89 -1 2 4 20 2 5 24 12 33 3
-36 88 -1 3 4 20 1 2 25 13 32 2
-36 87 -1 4 4 20 1 3 25 13 32 2
-36 86 -1 5 4 20 1 5 25 13 32 2
-36 85 -1 1 4 24 2 3 25 13 31 1
-36 84 -1 2 4 24 2 5 25 13 31 1
-36 83 -1 3 4 24 1 2 7 1 2 2
-36 82 -1 4 4 24 1 4 7 1 2 2
-36 81 -1 5 4 24 1 5 7 1 2 2
-36 80 -1 1 4 27 1 1 7 6 12 2
-36 79 -1 2 4 27 1 2 7 6 12 2
-36 78 -1 3 4 27 1 3 7 6 12 2
-36 77 -1 4 4 27 1 4 7 6 12 2
-36 76 -1 5 4 27 1 5 7 6 12 2
-36 75 -1 1 4 31 1 1 7 11 19 1
-36 74 -1 2 4 31 1 2 7 11 19 1
-36 73 -1 3 4 31 1 4 7 11 19 1
-36 72 -1 4 4 31 1 5 7 11 19 1
-36 71 -1 5 4 31 2 5 7 15 27 2
-36 70 -1 1 4 33 1 1 7 16 28 1
-36 69 -1 2 4 33 1 3 7 16 28 1
-36 68 -1 3 4 33 1 5 7 16 28 1
-36 67 -1 4 4 33 2 2 8 17 30 2
-36 66 -1 5 4 33 2 5 8 17 30 2
-36 65 -1 1 5 18 1 1 8 18 32 2
-36 64 -1 2 5 18 1 3 8 18 32 2
-36 63 -1 3 5 18 1 5 8 18 32 2
-36 62 -1 4 5 18 2 2 8 24 37 1
-36 61 -1 5 5 18 2 5 8 24 37 1
-36 60 -1 1 5 26 2 2 8 24 38 2
-36 59 -1 2 5 26 2 5 8 24 38 2
-36 58 -1 3 5 26 1 2 9 22 36 3
-36 57 -1 4 5 26 1 4 9 22 36 3
-36 56 -1 5 5 26 1 5 9 22 36 3
-36 55 -1 1 5 32 2 3 9 28 39 1
-36 54 -1 2 5 32 2 5 9 28 39 1
-36 53 -1 3 5 32 1 2 10 26 39 1
-36 52 -1 4 5 32 1 4 10 26 39 1
-36 51 -1 5 5 32 1 5 10 26 39 1
-36 50 -1 21 6 10 1 4 10 28 41 1
-36 49 -1 16 6 10 1 2 10 28 41 1
-36 48 -1 11 6 10 1 1 10 28 41 1
-36 47 -1 6 6 10 2 3 11 26 38 1
-36 46 -1 1 6 10 2 1 11 26 38 1
-36 45 -1 21 7 1 1 5 11 24 37 3
-36 44 -1 16 7 1 1 3 11 24 37 3
-36 43 -1 11 7 1 1 1 11 24 37 3
-36 42 -1 6 7 1 2 3 12 22 35 1
-36 41 -1 1 7 1 2 1 12 22 35 1
-36 40 -1 21 7 2 3 3 12 24 36 1
-36 39 -1 16 7 2 1 4 12 19 32 2
-36 38 -1 11 7 2 1 2 12 19 32 2
-36 37 -1 6 7 2 1 1 12 19 32 2
-36 36 -1 1 7 2 2 1 12 20 33 1
-36 35 -1 21 7 4 2 3 12 20 34 2
-36 34 -1 16 7 4 2 1 12 20 34 2
-36 33 -1 11 7 4 1 4 13 13 23 1
-36 32 -1 6 7 4 1 2 13 13 23 1
-36 31 -1 1 7 4 1 1 13 13 23 1
-36 30 -1 21 7 8 2 3 13 14 24 1
-36 29 -1 16 7 8 1 5 13 10 19 2
-36 28 -1 11 7 8 1 3 13 10 19 2
-36 27 -1 6 7 8 1 2 13 10 19 2
-36 26 -1 1 7 8 1 1 13 10 19 2
-36 25 -1 21 7 15 1 5 13 7 12 1
-36 24 -1 16 7 15 1 4 13 7 12 1
-36 23 -1 11 7 15 1 3 13 7 12 1
-36 22 -1 6 7 15 1 2 13 7 12 1
-36 21 -1 1 7 15 1 1 13 7 12 1
-36 20 -1 21 7 22 1 4 13 4 7 1
-36 19 -1 16 7 22 1 2 13 4 7 1
-36 18 -1 11 7 22 1 1 13 4 7 1
-36 17 -1 6 7 22 2 4 31 16 39 2
-36 16 -1 1 7 22 2 1 31 16 39 2
-36 15 -1 21 8 1 1 4 31 16 40 3
-36 14 -1 16 8 1 1 3 31 16 40 3
-36 13 -1 11 8 1 1 1 31 16 40 3
-36 12 -1 6 8 1 2 3 32 9 21 1
-36 11 -1 1 8 1 2 1 32 9 21 1
-36 10 -1 21 8 2 2 3 32 9 22 2
-36 9 -1 16 8 2 2 1 32 9 22 2
-36 8 -1 11 8 2 1 3 32 5 11 2
-36 7 -1 6 8 2 1 2 32 5 11 2
-36 6 -1 1 8 2 1 1 32 5 11 2
-36 5 -1 21 8 3 1 4 32 1 1 1
-36 4 -1 16 8 3 1 1 32 1 1 1
-35 95 -1 21 4 18 5 1 24 8 20 3
-35 94 -1 22 4 18 5 3 24 8 20 3
-35 93 -1 23 4 18 5 4 24 8 20 3
-35 92 -1 24 4 18 5 5 24 8 20 3
-35 91 -1 25 4 18 4 4 25 5 8 2
-35 90 -1 21 4 21 5 1 25 9 21 1
-35 89 -1 22 4 21 5 2 25 9 21 1
-35 88 -1 23 4 21 5 4 25 9 21 1
-35 87 -1 24 4 21 4 1 25 13 33 3
-35 86 -1 25 4 21 4 3 25 13 33 3
-35 85 -1 21 4 25 5 1 25 14 34 1
-35 84 -1 22 4 25 5 2 25 14 34 1
-35 83 -1 23 4 25 5 3 25 14 34 1
-35 82 -1 24 4 25 4 1 7 2 3 1
-35 81 -1 25 4 25 4 2 7 2 3 1
-35 80 -1 21 4 28 4 1 7 2 4 2
-35 79 -1 22 4 28 4 4 7 2 4 2
-35 78 -1 23 4 28 5 1 7 7 13 1
-35 77 -1 24 4 28 5 2 7 7 13 1
-35 76 -1 25 4 28 5 4 7 7 13 1
-35 75 -1 21 4 32 4 1 7 11 20 2
-35 74 -1 22 4 32 4 3 7 11 20 2
-35 73 -1 23 4 32 5 1 7 12 21 1
-35 72 -1 24 4 32 5 2 7 12 21 1
-35 71 -1 25 4 32 5 4 7 12 21 1
-35 70 -1 21 5 12 5 1 8 13 23 1
-35 69 -1 22 5 12 5 2 8 13 23 1
-35 68 -1 23 5 12 5 3 8 13 23 1
-35 67 -1 24 5 12 5 4 8 13 23 1
-35 66 -1 25 5 12 5 5 8 13 23 1
-35 65 -1 21 5 19 5 1 8 18 31 1
-35 64 -1 22 5 19 5 3 8 18 31 1
-35 63 -1 23 5 19 5 5 8 18 31 1
-35 62 -1 24 5 19 4 3 8 19 33 1
-35 61 -1 25 5 19 4 5 8 19 33 1
-35 60 -1 21 5 27 5 1 9 22 35 2
-35 59 -1 22 5 27 5 2 9 22 35 2
-35 58 -1 23 5 27 5 3 9 22 35 2
-35 57 -1 24 5 27 5 4 9 22 35 2
-35 56 -1 25 5 27 5 5 9 22 35 2
-35 55 -1 21 6 3 5 1 9 24 37 1
-35 54 -1 22 6 3 5 3 9 24 37 1
-35 53 -1 23 6 3 5 5 9 24 37 1
-35 52 -1 24 6 3 4 2 10 22 37 1
-35 51 -1 25 6 3 4 4 10 22 37 1
-35 50 -1 25 6 11 4 5 10 24 38 1
-35 49 -1 20 6 11 4 3 10 24 38 1
-35 48 -1 15 6 11 5 5 11 22 34 1
-35 47 -1 10 6 11 5 4 11 22 34 1
-35 46 -1 5 6 11 5 2 11 22 34 1
-35 45 -1 25 6 18 5 5 11 24 36 2
-35 44 -1 20 6 18 5 4 11 24 36 2
-35 43 -1 15 6 18 5 3 11 24 36 2
-35 42 -1 10 6 18 5 2 11 24 36 2
-35 41 -1 5 6 18 5 1 11 24 36 2
-35 40 -1 25 7 3 4 5 12 18 30 1
-35 39 -1 20 7 3 4 4 12 18 30 1
-35 38 -1 15 7 3 5 5 12 19 31 1
-35 37 -1 10 7 3 5 4 12 19 31 1
-35 36 -1 5 7 3 5 2 12 19 31 1
-35 35 -1 25 7 5 4 5 12 15 27 2
-35 34 -1 20 7 5 5 5 12 16 28 1
-35 33 -1 15 7 5 5 4 12 16 28 1
-35 32 -1 10 7 5 5 3 12 16 28 1
-35 31 -1 5 7 5 5 1 12 16 28 1
-35 30 -1 25 7 9 5 5 13 9 17 2
-35 29 -1 20 7 9 5 4 13 9 17 2
-35 28 -1 15 7 9 5 2 13 9 17 2
-35 27 -1 10 7 9 4 5 13 10 18 1
-35 26 -1 5 7 9 4 2 13 10 18 1
-35 25 -1 25 7 16 5 5 13 6 11 1
-35 24 -1 20 7 16 5 3 13 6 11 1
-35 23 -1 15 7 16 5 1 13 6 11 1
-35 22 -1 10 7 16 4 5 13 3 6 2
-35 21 -1 5 7 16 4 3 13 3 6 2
-35 20 -1 25 7 23 4 5 13 3 5 1
-35 19 -1 20 7 23 4 1 13 3 5 1
-35 18 -1 15 7 23 5 5 31 15 37 3
-35 17 -1 10 7 23 5 4 31 15 37 3
-35 16 -1 5 7 23 5 2 31 15 37 3
-35 15 -1 25 7 28 4 5 31 16 38 1
-35 14 -1 20 7 28 4 2 31 16 38 1
-35 13 -1 15 7 28 5 5 31 12 30 2
-35 12 -1 10 7 28 5 4 31 12 30 2
-35 11 -1 5 7 28 5 2 31 12 30 2
-35 10 -1 25 7 29 4 5 31 8 20 3
-35 9 -1 20 7 29 5 5 32 5 10 1
-35 8 -1 15 7 29 5 4 32 5 10 1
-35 7 -1 10 7 29 5 3 32 5 10 1
-35 6 -1 5 7 29 5 2 32 5 10 1
-34 95 -1 16 4 18 5 2 24 8 20 3
-34 94 -1 17 4 18 4 1 25 5 8 2
-34 93 -1 18 4 18 4 2 25 5 8 2
-34 92 -1 19 4 18 4 3 25 5 8 2
-34 91 -1 20 4 18 4 5 25 5 8 2
-34 90 -1 16 4 21 3 1 25 9 22 2
-34 89 -1 17 4 21 5 3 25 9 21 1
-34 88 -1 18 4 21 5 5 25 9 21 1
-34 87 -1 19 4 21 4 2 25 13 33 3
-34 86 -1 20 4 21 4 4 25 13 33 3
-34 85 -1 16 4 25 3 1 25 14 35 2
-34 84 -1 17 4 25 3 2 25 14 35 2
-34 83 -1 18 4 25 5 4 25 14 34 1
-34 82 -1 19 4 25 5 5 25 14 34 1
-34 81 -1 20 4 25 4 3 7 2 3 1
-34 80 -1 16 4 28 4 2 7 2 4 2
-34 79 -1 17 4 28 4 5 7 2 4 2
-34 78 -1 18 4 28 3 2 7 3 5 1
-34 77 -1 19 4 28 5 3 7 7 13 1
-34 76 -1 20 4 28 5 5 7 7 13 1
-34 75 -1 16 4 32 4 2 7 11 20 2
-34 74 -1 17 4 32 4 4 7 11 20 2
-34 73 -1 18 4 32 3 1 7 12 22 2
-34 72 -1 19 4 32 5 3 7 12 21 1
-34 71 -1 20 4 32 5 5 7 12 21 1
-34 70 -1 16 5 12 3 1 8 9 15 1
-34 69 -1 17 5 12 4 1 8 13 24 2
-34 68 -1 18 5 12 4 2 8 13 24 2
-34 67 -1 19 5 12 4 4 8 13 24 2
-34 66 -1 20 5 12 2 2 8 14 25 1
-34 65 -1 16 5 19 5 2 8 18 31 1
-34 64 -1 17 5 19 5 4 8 18 31 1
-34 63 -1 18 5 19 4 1 8 19 33 1
-34 62 -1 19 5 19 4 4 8 19 33 1
-34 61 -1 20 5 19 3 2 8 20 34 1
-34 60 -1 16 5 27 4 1 9 22 34 1
-34 59 -1 17 5 27 3 4 9 17 30 1
-34 58 -1 18 5 27 4 2 9 22 34 1
-34 57 -1 19 5 27 4 3 9 22 34 1
-34 56 -1 20 5 27 4 5 9 22 34 1
-34 55 -1 16 6 3 5 2 9 24 37 1
-34 54 -1 17 6 3 5 4 9 24 37 1
-34 53 -1 18 6 3 4 1 10 22 37 1
-34 52 -1 19 6 3 4 3 10 22 37 1
-34 51 -1 20 6 3 4 5 10 22 37 1
-34 50 -1 24 6 11 4 4 10 24 38 1
-34 49 -1 19 6 11 4 2 10 24 38 1
-34 48 -1 14 6 11 4 1 10 24 38 1
-34 47 -1 9 6 11 5 3 11 22 34 1
-34 46 -1 4 6 11 5 1 11 22 34 1
-34 45 -1 24 6 18 4 5 11 24 35 1
-34 44 -1 19 6 18 4 4 11 24 35 1
-34 43 -1 14 6 18 4 2 11 24 35 1
-34 42 -1 9 6 18 3 5 11 20 33 1
-34 41 -1 4 6 18 4 1 11 24 35 1
-34 40 -1 24 7 3 3 5 12 17 29 1
-34 39 -1 19 7 3 4 3 12 18 30 1
-34 38 -1 14 7 3 4 2 12 18 30 1
-34 37 -1 9 7 3 5 3 12 19 31 1
-34 36 -1 4 7 3 5 1 12 19 31 1
-34 35 -1 24 7 5 4 4 12 15 27 2
-34 34 -1 19 7 5 4 3 12 15 27 2
-34 33 -1 14 7 5 4 2 12 15 27 2
-34 32 -1 9 7 5 5 2 12 16 28 1
-34 31 -1 4 7 5 3 3 12 12 22 2
-34 30 -1 24 7 9 3 5 13 9 16 1
-34 29 -1 19 7 9 5 3 13 9 17 2
-34 28 -1 14 7 9 5 1 13 9 17 2
-34 27 -1 9 7 9 4 4 13 10 18 1
-34 26 -1 4 7 9 4 1 13 10 18 1
-34 25 -1 24 7 16 5 4 13 6 11 1
-34 24 -1 19 7 16 5 2 13 6 11 1
-34 23 -1 14 7 16 3 4 13 2 4 2
-34 22 -1 9 7 16 4 4 13 3 6 2
-34 21 -1 4 7 16 4 2 13 3 6 2
-34 20 -1 24 7 23 4 4 13 3 5 1
-34 19 -1 19 7 23 3 5 31 15 36 2
-34 18 -1 14 7 23 3 4 31 15 36 2
-34 17 -1 9 7 23 5 3 31 15 37 3
-34 16 -1 4 7 23 5 1 31 15 37 3
-34 15 -1 24 7 28 4 4 31 16 38 1
-34 14 -1 19 7 28 4 1 31 16 38 1
-34 13 -1 14 7 28 3 5 31 12 29 1
-34 12 -1 9 7 28 5 3 31 12 30 2
-34 11 -1 4 7 28 5 1 31 12 30 2
-34 10 -1 24 7 29 4 4 31 8 20 3
-34 9 -1 19 7 29 4 3 31 8 20 3
-34 8 -1 14 7 29 4 2 31 8 20 3
-34 7 -1 9 7 29 4 1 31 8 20 3
-34 6 -1 4 7 29 5 1 32 5 10 1
-33 95 -1 11 4 18 2 1 25 1 1 1
-33 94 -1 12 4 18 3 1 25 5 9 3
-33 93 -1 13 4 18 3 2 25 5 9 3
-33 92 -1 14 4 18 3 3 25 5 9 3
-33 91 -1 15 4 18 3 4 25 5 9 3
-33 90 -1 11 4 21 3 2 25 9 22 2
-33 89 -1 12 4 21 3 4 25 9 22 2
-33 88 -1 13 4 21 3 5 25 9 22 2
-33 87 -1 14 4 21 2 3 25 10 23 1
-33 86 -1 15 4 21 4 5 25 13 33 3
-33 85 -1 11 4 25 2 1 25 14 36 3
-33 84 -1 12 4 25 3 3 25 14 35 2
-33 83 -1 13 4 25 3 4 25 14 35 2
-33 82 -1 14 4 25 3 5 25 14 35 2
-33 81 -1 15 4 25 4 4 7 2 3 1
-33 80 -1 11 4 28 4 3 7 2 4 2
-33 79 -1 12 4 28 3 1 7 3 5 1
-33 78 -1 13 4 28 3 3 7 3 5 1
-33 77 -1 14 4 28 3 5 7 3 5 1
-33 76 -1 15 4 28 2 3 7 8 14 1
-33 75 -1 11 4 32 2 1 7 8 15 2
-33 74 -1 12 4 32 4 5 7 11 20 2
-33 73 -1 13 4 32 3 2 7 12 22 2
-33 72 -1 14 4 32 3 4 7 12 22 2
-33 71 -1 15 4 32 3 5 7 12 22 2
-33 70 -1 11 5 12 3 2 8 9 15 1
-33 69 -1 12 5 12 3 5 8 9 15 1
-33 68 -1 13 5 12 4 3 8 13 24 2
-33 67 -1 14 5 12 4 5 8 13 24 2
-33 66 -1 15 5 12 2 3 8 14 25 1
-33 65 -1 11 5 19 2 1 8 15 26 1
-33 64 -1 12 5 19 2 4 8 15 26 1
-33 63 -1 13 5 19 4 2 8 19 33 1
-33 62 -1 14 5 19 3 1 8 20 34 1
-33 61 -1 15 5 19 3 3 8 20 34 1
-33 60 -1 11 5 27 3 1 9 17 30 1
-33 59 -1 12 5 27 3 5 9 17 30 1
-33 58 -1 13 5 27 1 3 9 18 31 1
-33 57 -1 14 5 27 4 4 9 22 34 1
-33 56 -1 15 5 27 2 3 9 19 32 1
-33 55 -1 11 6 3 1 1 9 20 33 1
-33 54 -1 12 6 3 2 1 10 17 30 2
-33 53 -1 13 6 3 2 2 10 17 30 2
-33 52 -1 14 6 3 3 1 10 18 32 2
-33 51 -1 15 6 3 3 3 10 18 32 2
-33 50 -1 23 6 11 1 5 10 19 34 2
-33 49 -1 18 6 11 1 2 10 19 34 2
-33 48 -1 13 6 11 2 4 10 20 36 2
-33 47 -1 8 6 11 2 1 10 20 36 2
-33 46 -1 3 6 11 3 3 11 17 30 1
-33 45 -1 23 6 18 1 5 11 18 31 1
-33 44 -1 18 6 18 4 3 11 24 35 1
-33 43 -1 13 6 18 2 5 11 19 32 1
-33 42 -1 8 6 18 3 4 11 20 33 1
-33 41 -1 3 6 18 3 3 11 20 33 1
-33 40 -1 23 7 3 3 4 12 17 29 1
-33 39 -1 18 7 3 3 1 12 17 29 1
-33 38 -1 13 7 3 4 1 12 18 30 1
-33 37 -1 8 7 3 2 5 12 14 25 1
-33 36 -1 3 7 3 2 3 12 14 25 1
-33 35 -1 23 7 5 2 5 12 15 26 1
-33 34 -1 18 7 5 2 2 12 15 26 1
-33 33 -1 13 7 5 4 1 12 15 27 2
-33 32 -1 8 7 5 3 5 12 12 22 2
-33 31 -1 3 7 5 3 2 12 12 22 2
-33 30 -1 23 7 9 3 4 13 9 16 1
-33 29 -1 18 7 9 3 3 13 9 16 1
-33 28 -1 13 7 9 3 2 13 9 16 1
-33 27 -1 8 7 9 4 3 13 10 18 1
-33 26 -1 3 7 9 2 3 13 5 9 2
-33 25 -1 23 7 16 2 5 13 5 10 1
-33 24 -1 18 7 16 3 5 13 2 4 2
-33 23 -1 13 7 16 3 3 13 2 4 2
-33 22 -1 8 7 16 3 2 13 2 4 2
-33 21 -1 3 7 16 4 1 13 3 6 2
-33 20 -1 23 7 23 4 3 13 3 5 1
-33 19 -1 18 7 23 2 5 31 15 35 1
-33 18 -1 13 7 23 3 3 31 15 36 2
-33 17 -1 8 7 23 3 2 31 15 36 2
-33 16 -1 3 7 23 3 1 31 15 36 2
-33 15 -1 23 7 28 4 3 31 16 38 1
-33 14 -1 18 7 28 2 4 31 11 28 3
-33 13 -1 13 7 28 3 4 31 12 29 1
-33 12 -1 8 7 28 3 3 31 12 29 1
-33 11 -1 3 7 28 3 2 31 12 29 1
-33 10 -1 23 7 29 3 5 31 8 19 2
-33 9 -1 18 7 29 3 4 31 8 19 2
-33 8 -1 13 7 29 3 3 31 8 19 2
-33 7 -1 8 7 29 3 1 31 8 19 2
-33 6 -1 3 7 29 2 3 31 4 7 1
-32 95 -1 6 4 18 2 2 25 1 1 1
-32 94 -1 7 4 18 2 4 25 1 1 1
-32 93 -1 8 4 18 1 1 25 5 10 1
-32 92 -1 9 4 18 1 3 25 5 10 1
-32 91 -1 10 4 18 3 5 25 5 9 3
-32 90 -1 6 4 21 3 3 25 9 22 2
-32 89 -1 7 4 21 2 1 25 10 23 1
-32 88 -1 8 4 21 2 2 25 10 23 1
-32 87 -1 9 4 21 2 4 25 10 23 1
-32 86 -1 10 4 21 2 5 25 10 23 1
-32 85 -1 6 4 25 2 2 25 14 36 3
-32 84 -1 7 4 25 2 4 25 14 36 3
-32 83 -1 8 4 25 2 5 25 14 36 3
-32 82 -1 9 4 25 1 3 25 15 37 1
-32 81 -1 10 4 25 4 5 7 2 3 1
-32 80 -1 6 4 28 1 1 7 3 6 2
-32 79 -1 7 4 28 1 3 7 3 6 2
-32 78 -1 8 4 28 3 4 7 3 5 1
-32 77 -1 9 4 28 2 1 7 8 14 1
-32 76 -1 10 4 28 2 4 7 8 14 1
-32 75 -1 6 4 32 2 2 7 8 15 2
-32 74 -1 7 4 32 2 4 7 8 15 2
-32 73 -1 8 4 32 3 3 7 12 22 2
-32 72 -1 9 4 32 1 2 8 9 16 2
-32 71 -1 10 4 32 1 4 8 9 16 2
-32 70 -1 6 5 12 3 3 8 9 15 1
-32 69 -1 7 5 12 1 1 8 10 18 2
-32 68 -1 8 5 12 1 3 8 10 18 2
-32 67 -1 9 5 12 2 1 8 14 25 1
-32 66 -1 10 5 12 2 4 8 14 25 1
-32 65 -1 6 5 19 2 2 8 15 26 1
-32 64 -1 7 5 19 2 5 8 15 26 1
-32 63 -1 8 5 19 1 2 8 16 28 2
-32 62 -1 9 5 19 1 4 8 16 28 2
-32 61 -1 10 5 19 3 4 8 20 34 1
-32 60 -1 6 5 27 3 2 9 17 30 1
-32 59 -1 7 5 27 1 1 9 18 31 1
-32 58 -1 8 5 27 1 4 9 18 31 1
-32 57 -1 9 5 27 2 1 9 19 32 1
-32 56 -1 10 5 27 2 4 9 19 32 1
-32 55 -1 6 6 3 1 2 9 20 33 1
-32 54 -1 7 6 3 1 4 9 20 33 1
-32 53 -1 8 6 3 2 3 10 17 30 2
-32 52 -1 9 6 3 2 5 10 17 30 2
-32 51 -1 10 6 3 3 4 10 18 32 2
-32 50 -1 22 6 11 1 4 10 19 34 2
-32 49 -1 17 6 11 2 5 10 20 36 2
-32 48 -1 12 6 11 2 3 10 20 36 2
-32 47 -1 7 6 11 3 5 11 17 30 1
-32 46 -1 2 6 11 3 2 11 17 30 1
-32 45 -1 22 6 18 1 4 11 18 31 1
-32 44 -1 17 6 18 1 2 11 18 31 1
-32 43 -1 12 6 18 2 4 11 19 32 1
-32 42 -1 7 6 18 2 2 11 19 32 1
-32 41 -1 2 6 18 3 2 11 20 33 1
-32 40 -1 22 7 3 3 3 12 17 29 1
-32 39 -1 17 7 3 1 5 12 13 24 2
-32 38 -1 12 7 3 1 3 12 13 24 2
-32 37 -1 7 7 3 2 4 12 14 25 1
-32 36 -1 2 7 3 2 2 12 14 25 1
-32 35 -1 22 7 5 2 4 12 15 26 1
-32 34 -1 17 7 5 2 1 12 15 26 1
-32 33 -1 12 7 5 1 4 12 11 20 2
-32 32 -1 7 7 5 3 4 12 12 22 2
-32 31 -1 2 7 5 3 1 12 12 22 2
-32 30 -1 22 7 9 1 5 12 12 21 1
-32 29 -1 17 7 9 1 3 12 12 21 1
-32 28 -1 12 7 9 3 1 13 9 16 1
-32 27 -1 7 7 9 2 5 13 5 9 2
-32 26 -1 2 7 9 2 2 13 5 9 2
-32 25 -1 22 7 16 2 4 13 5 10 1
-32 24 -1 17 7 16 2 2 13 5 10 1
-32 23 -1 12 7 16 1 5 13 2 3 1
-32 22 -1 7 7 16 1 3 13 2 3 1
-32 21 -1 2 7 16 3 1 13 2 4 2
-32 20 -1 22 7 23 4 2 13 3 5 1
-32 19 -1 17 7 23 1 4 31 14 34 2
-32 18 -1 12 7 23 2 4 31 15 35 1
-32 17 -1 7 7 23 2 3 31 15 35 1
-32 16 -1 2 7 23 2 2 31 15 35 1
-32 15 -1 22 7 28 2 5 31 11 28 3
-32 14 -1 17 7 28 2 3 31 11 28 3
-32 13 -1 12 7 28 2 2 31 11 28 3
-32 12 -1 7 7 28 2 1 31 11 28 3
-32 11 -1 2 7 28 3 1 31 12 29 1
-32 10 -1 22 7 29 1 5 31 8 18 1
-32 9 -1 17 7 29 1 3 31 8 18 1
-32 8 -1 12 7 29 3 2 31 8 19 2
-32 7 -1 7 7 29 2 5 31 4 7 1
-32 6 -1 2 7 29 2 2 31 4 7 1
-31 95 -1 1 4 18 2 3 25 1 1 1
-31 94 -1 2 4 18 2 5 25 1 1 1
-31 93 -1 3 4 18 1 2 25 5 10 1
-31 92 -1 4 4 18 1 4 25 5 10 1
-31 91 -1 5 4 18 1 5 25 5 10 1
-31 90 -1 1 4 21 1 1 25 10 24 2
-31 89 -1 2 4 21 1 2 25 10 24 2
-31 88 -1 3 4 21 1 3 25 10 24 2
-31 87 -1 4 4 21 1 4 25 10 24 2
-31 86 -1 5 4 21 1 5 25 10 24 2
-31 85 -1 1 4 25 2 3 25 14 36 3
-31 84 -1 2 4 25 1 1 25 15 37 1
-31 83 -1 3 4 25 1 2 25 15 37 1
-31 82 -1 4 4 25 1 4 25 15 37 1
-31 81 -1 5 4 25 1 5 25 15 37 1
-31 80 -1 1 4 28 1 2 7 3 6 2
-31 79 -1 2 4 28 1 4 7 3 6 2
-31 78 -1 3 4 28 1 5 7 3 6 2
-31 77 -1 4 4 28 2 2 7 8 14 1
-31 76 -1 5 4 28 2 5 7 8 14 1
-31 75 -1 1 4 32 2 3 7 8 15 2
-31 74 -1 2 4 32 2 5 7 8 15 2
-31 73 -1 3 4 32 1 1 8 9 16 2
-31 72 -1 4 4 32 1 3 8 9 16 2
-31 71 -1 5 4 32 1 5 8 9 16 2
-31 70 -1 1 5 12 3 4 8 9 15 1
-31 69 -1 2 5 12 1 2 8 10 18 2
-31 68 -1 3 5 12 1 4 8 10 18 2
-31 67 -1 4 5 12 1 5 8 10 18 2
-31 66 -1 5 5 12 2 5 8 14 25 1
-31 65 -1 1 5 19 2 3 8 15 26 1
-31 64 -1 2 5 19 1 1 8 16 28 2
-31 63 -1 3 5 19 1 3 8 16 28 2
-31 62 -1 4 5 19 1 5 8 16 28 2
-31 61 -1 5 5 19 3 5 8 20 34 1
-31 60 -1 1 5 27 3 3 9 17 30 1
-31 59 -1 2 5 27 1 2 9 18 31 1
-31 58 -1 3 5 27 1 5 9 18 31 1
-31 57 -1 4 5 27 2 2 9 19 32 1
-31 56 -1 5 5 27 2 5 9 19 32 1
-31 55 -1 1 6 3 1 3 9 20 33 1
-31 54 -1 2 6 3 1 5 9 20 33 1
-31 53 -1 3 6 3 2 4 10 17 30 2
-31 52 -1 4 6 3 3 2 10 18 32 2
-31 51 -1 5 6 3 3 5 10 18 32 2
-31 50 -1 21 6 11 1 3 10 19 34 2
-31 49 -1 16 6 11 1 1 10 19 34 2
-31 48 -1 11 6 11 2 2 10 20 36 2
-31 47 -1 6 6 11 3 4 11 17 30 1
-31 46 -1 1 6 11 3 1 11 17 30 1
-31 45 -1 21 6 18 1 3 11 18 31 1
-31 44 -1 16 6 18 1 1 11 18 31 1
-31 43 -1 11 6 18 2 3 11 19 32 1
-31 42 -1 6 6 18 2 1 11 19 32 1
-31 41 -1 1 6 18 3 1 11 20 33 1
-31 40 -1 21 7 3 3 2 12 17 29 1
-31 39 -1 16 7 3 1 4 12 13 24 2
-31 38 -1 11 7 3 1 2 12 13 24 2
-31 37 -1 6 7 3 1 1 12 13 24 2
-31 36 -1 1 7 3 2 1 12 14 25 1
-31 35 -1 21 7 5 2 3 12 15 26 1
-31 34 -1 16 7 5 1 5 12 11 20 2
-31 33 -1 11 7 5 1 3 12 11 20 2
-31 32 -1 6 7 5 1 2 12 11 20 2
-31 31 -1 1 7 5 1 1 12 11 20 2
-31 30 -1 21 7 9 1 4 12 12 21 1
-31 29 -1 16 7 9 1 2 12 12 21 1
-31 28 -1 11 7 9 1 1 12 12 21 1
-31 27 -1 6 7 9 2 4 13 5 9 2
-31 26 -1 1 7 9 2 1 13 5 9 2
-31 25 -1 21 7 16 2 3 13 5 10 1
-31 24 -1 16 7 16 2 1 13 5 10 1
-31 23 -1 11 7 16 1 4 13 2 3 1
-31 22 -1 6 7 16 1 2 13 2 3 1
-31 21 -1 1 7 16 1 1 13 2 3 1
-31 20 -1 21 7 23 1 5 31 14 34 2
-31 19 -1 16 7 23 1 3 31 14 34 2
-31 18 -1 11 7 23 1 2 31 14 34 2
-31 17 -1 6 7 23 1 1 31 14 34 2
-31 16 -1 1 7 23 2 1 31 15 35 1
-31 15 -1 21 7 28 1 5 31 11 27 2
-31 14 -1 16 7 28 1 4 31 11 27 2
-31 13 -1 11 7 28 1 3 31 11 27 2
-31 12 -1 6 7 28 1 2 31 11 27 2
-31 11 -1 1 7 28 1 1 31 11 27 2
-31 10 -1 21 7 29 1 4 31 8 18 1
-31 9 -1 16 7 29 1 2 31 8 18 1
-31 8 -1 11 7 29 1 1 31 8 18 1
-31 7 -1 6 7 29 2 4 31 4 7 1
-31 6 -1 1 7 29 2 1 31 4 7 1
-30 95 -1 21 4 19 4 1 25 2 2 1
-30 94 -1 22 4 19 4 3 25 2 2 1
-30 93 -1 23 4 19 5 1 25 6 11 1
-30 92 -1 24 4 19 5 2 25 6 11 1
-30 91 -1 25 4 19 5 4 25 6 11 1
-30 90 -1 21 4 22 4 1 25 6 12 2
-30 89 -1 22 4 22 4 4 25 6 12 2
-30 88 -1 23 4 22 5 1 25 10 25 3
-30 87 -1 24 4 22 5 3 25 10 25 3
-30 86 -1 25 4 22 5 5 25 10 25 3
-30 85 -1 21 4 26 4 1 25 11 26 1
-30 84 -1 22 4 26 4 3 25 11 26 1
-30 83 -1 23 4 26 5 1 25 15 38 2
-30 82 -1 24 4 26 5 2 25 15 38 2
-30 81 -1 25 4 26 5 4 25 15 38 2
-30 80 -1 21 4 29 5 1 7 4 7 1
-30 79 -1 22 4 29 5 2 7 4 7 1
-30 78 -1 23 4 29 5 3 7 4 7 1
-30 77 -1 24 4 29 5 4 7 4 7 1
-30 76 -1 25 4 29 5 5 7 4 7 1
-30 75 -1 21 5 7 5 1 8 5 9 2
-30 74 -1 22 5 7 5 2 8 5 9 2
-30 73 -1 23 5 7 5 3 8 5 9 2
-30 72 -1 24 5 7 5 4 8 5 9 2
-30 71 -1 25 5 7 5 5 8 5 9 2
-30 70 -1 21 5 13 4 1 8 10 17 1
-30 69 -1 22 5 13 4 4 8 10 17 1
-30 68 -1 23 5 13 5 1 8 11 20 2
-30 67 -1 24 5 13 5 2 8 11 20 2
-30 66 -1 25 5 13 5 4 8 11 20 2
-30 65 -1 21 5 20 5 1 8 16 27 1
-30 64 -1 22 5 20 5 2 8 16 27 1
-30 63 -1 23 5 20 5 4 8 16 27 1
-30 62 -1 24 5 20 4 1 9 13 23 1
-30 61 -1 25 5 20 4 4 9 13 23 1
-30 60 -1 21 5 28 5 1 9 14 25 2
-30 59 -1 22 5 28 5 3 9 14 25 2
-30 58 -1 23 5 28 5 5 9 14 25 2
-30 57 -1 24 5 28 3 3 9 15 27 2
-30 56 -1 25 5 28 4 1 9 16 28 1
-30 55 -1 21 6 4 5 1 10 17 29 1
-30 54 -1 22 6 4 5 2 10 17 29 1
-30 53 -1 23 6 4 5 4 10 17 29 1
-30 52 -1 24 6 4 4 1 10 18 31 1
-30 51 -1 25 6 4 4 4 10 18 31 1
-30 50 -1 25 6 12 4 5 10 19 33 1
-30 49 -1 20 6 12 4 3 10 19 33 1
-30 48 -1 15 6 12 5 5 10 20 35 1
-30 47 -1 10 6 12 5 3 10 20 35 1
-30 46 -1 5 6 12 5 1 10 20 35 1
-30 45 -1 25 6 19 4 5 11 13 24 2
-30 44 -1 20 6 19 3 5 11 14 26 2
-30 43 -1 15 6 19 5 5 11 15 28 2
-30 42 -1 10 6 19 5 4 11 15 28 2
-30 41 -1 5 6 19 5 2 11 15 28 2
-30 40 -1 25 6 25 4 5 11 16 29 1
-30 39 -1 20 6 25 4 3 11 16 29 1
-30 38 -1 15 6 25 5 5 12 13 23 1
-30 37 -1 10 6 25 5 3 12 13 23 1
-30 36 -1 5 6 25 5 1 12 13 23 1
-30 35 -1 25 7 6 5 5 12 10 18 2
-30 34 -1 20 7 6 5 4 12 10 18 2
-30 33 -1 15 7 6 5 2 12 10 18 2
-30 32 -1 10 7 6 4 5 12 11 19 1
-30 31 -1 5 7 6 4 3 12 11 19 1
-30 30 -1 25 7 10 4 5 12 7 13 2
-30 29 -1 20 7 10 4 3 12 7 13 2
-30 28 -1 15 7 10 5 5 12 8 14 1
-30 27 -1 10 7 10 5 2 12 8 14 1
-30 26 -1 5 7 10 5 1 12 8 14 1
-30 25 -1 25 7 17 5 5 13 1 2 2
-30 24 -1 20 7 17 5 4 13 1 2 2
-30 23 -1 15 7 17 5 3 13 1 2 2
-30 22 -1 10 7 17 5 2 13 1 2 2
-30 21 -1 5 7 17 5 1 13 1 2 2
-30 20 -1 25 7 24 5 5 31 14 33 1
-30 19 -1 20 7 24 5 3 31 14 33 1
-30 18 -1 15 7 24 5 1 31 14 33 1
-30 17 -1 10 7 24 4 4 31 10 25 3
-30 16 -1 5 7 24 4 2 31 10 25 3
-30 15 -1 25 7 30 5 5 31 11 26 1
-30 14 -1 20 7 30 5 4 31 11 26 1
-30 13 -1 15 7 30 5 2 31 11 26 1
-30 12 -1 10 7 30 4 5 31 7 16 2
-30 11 -1 5 7 30 4 3 31 7 16 2
-30 10 -1 25 7 31 5 5 31 7 17 3
-30 9 -1 20 7 31 5 4 31 7 17 3
-30 8 -1 15 7 31 5 2 31 7 17 3
-30 7 -1 10 7 31 4 5 31 3 6 3
-30 6 -1 5 7 31 4 3 31 3 6 3
-29 95 -1 16 4 19 4 2 25 2 2 1
-29 94 -1 17 4 19 4 4 25 2 2 1
-29 93 -1 18 4 19 3 1 25 6 13 3
-29 92 -1 19 4 19 5 3 25 6 11 1
-29 91 -1 20 4 19 5 5 25 6 11 1
-29 90 -1 16 4 22 4 2 25 6 12 2
-29 89 -1 17 4 22 4 5 25 6 12 2
-29 88 -1 18 4 22 5 2 25 10 25 3
-29 87 -1 19 4 22 5 4 25 10 25 3
-29 86 -1 20 4 22 3 2 25 11 27 2
-29 85 -1 16 4 26 4 2 25 11 26 1
-29 84 -1 17 4 26 4 4 25 11 26 1
-29 83 -1 18 4 26 4 5 25 11 26 1
-29 82 -1 19 4 26 5 3 25 15 38 2
-29 81 -1 20 4 26 5 5 25 15 38 2
-29 80 -1 16 4 29 3 1 25 16 39 1
-29 79 -1 17 4 29 4 1 7 4 8 2
-29 78 -1 18 4 29 4 2 7 4 8 2
-29 77 -1 19 4 29 4 4 7 4 8 2
-29 76 -1 20 4 29 2 2 8 1 1 1
-29 75 -1 16 5 7 4 1 8 5 10 1
-29 74 -1 17 5 7 4 2 8 5 10 1
-29 73 -1 18 5 7 4 3 8 5 10 1
-29 72 -1 19 5 7 4 4 8 5 10 1
-29 71 -1 20 5 7 4 5 8 5 10 1
-29 70 -1 16 5 13 4 2 8 10 17 1
-29 69 -1 17 5 13 4 5 8 10 17 1
-29 68 -1 18 5 13 3 2 8 11 19 1
-29 67 -1 19 5 13 5 3 8 11 20 2
-29 66 -1 20 5 13 5 5 8 11 20 2
-29 65 -1 16 5 20 3 1 8 12 22 2
-29 64 -1 17 5 20 5 3 8 16 27 1
-29 63 -1 18 5 20 5 5 8 16 27 1
-29 62 -1 19 5 20 4 2 9 13 23 1
-29 61 -1 20 5 20 4 5 9 13 23 1
-29 60 -1 16 5 28 5 2 9 14 25 2
-29 59 -1 17 5 28 5 4 9 14 25 2
-29 58 -1 18 5 28 3 1 9 15 27 2
-29 57 -1 19 5 28 3 4 9 15 27 2
-29 56 -1 20 5 28 4 2 9 16 28 1
-29 55 -1 16 6 4 3 1 9 16 29 2
-29 54 -1 17 6 4 5 3 10 17 29 1
-29 53 -1 18 6 4 5 5 10 17 29 1
-29 52 -1 19 6 4 4 2 10 18 31 1
-29 51 -1 20 6 4 4 5 10 18 31 1
-29 50 -1 24 6 12 4 4 10 19 33 1
-29 49 -1 19 6 12 4 2 10 19 33 1
-29 48 -1 14 6 12 5 4 10 20 35 1
-29 47 -1 9 6 12 5 2 10 20 35 1
-29 46 -1 4 6 12 3 4 11 13 23 1
-29 45 -1 24 6 19 4 4 11 13 24 2
-29 44 -1 19 6 19 3 4 11 14 26 2
-29 43 -1 14 6 19 3 2 11 14 26 2
-29 42 -1 9 6 19 5 3 11 15 28 2
-29 41 -1 4 6 19 5 1 11 15 28 2
-29 40 -1 24 6 25 4 4 11 16 29 1
-29 39 -1 19 6 25 4 2 11 16 29 1
-29 38 -1 14 6 25 5 4 12 13 23 1
-29 37 -1 9 6 25 5 2 12 13 23 1
-29 36 -1 4 6 25 3 4 12 9 15 1
-29 35 -1 24 7 6 3 5 12 10 17 1
-29 34 -1 19 7 6 5 3 12 10 18 2
-29 33 -1 14 7 6 5 1 12 10 18 2
-29 32 -1 9 7 6 4 4 12 11 19 1
-29 31 -1 4 7 6 4 2 12 11 19 1
-29 30 -1 24 7 10 4 4 12 7 13 2
-29 29 -1 19 7 10 4 2 12 7 13 2
-29 28 -1 14 7 10 5 4 12 8 14 1
-29 27 -1 9 7 10 3 5 12 4 8 2
-29 26 -1 4 7 10 3 3 12 4 8 2
-29 25 -1 24 7 17 2 5 12 4 7 1
-29 24 -1 19 7 17 4 5 13 1 1 1
-29 23 -1 14 7 17 4 3 13 1 1 1
-29 22 -1 9 7 17 4 1 13 1 1 1
-29 21 -1 4 7 17 3 4 31 13 31 1
-29 20 -1 24 7 24 5 4 31 14 33 1
-29 19 -1 19 7 24 5 2 31 14 33 1
-29 18 -1 14 7 24 4 5 31 10 25 3
-29 17 -1 9 7 24 4 3 31 10 25 3
-29 16 -1 4 7 24 4 1 31 10 25 3
-29 15 -1 24 7 30 3 5 31 10 23 1
-29 14 -1 19 7 30 5 3 31 11 26 1
-29 13 -1 14 7 30 5 1 31 11 26 1
-29 12 -1 9 7 30 4 4 31 7 16 2
-29 11 -1 4 7 30 4 2 31 7 16 2
-29 10 -1 24 7 31 3 5 31 7 15 1
-29 9 -1 19 7 31 5 3 31 7 17 3
-29 8 -1 14 7 31 5 1 31 7 17 3
-29 7 -1 9 7 31 4 4 31 3 6 3
-29 6 -1 4 7 31 4 2 31 3 6 3
-28 95 -1 11 4 19 2 1 25 2 3 2
-28 94 -1 12 4 19 2 3 25 2 3 2
-28 93 -1 13 4 19 4 5 25 2 2 1
-28 92 -1 14 4 19 3 2 25 6 13 3
-28 91 -1 15 4 19 3 4 25 6 13 3
-28 90 -1 11 4 22 4 3 25 6 12 2
-28 89 -1 12 4 22 2 1 25 7 14 1
-28 88 -1 13 4 22 2 3 25 7 14 1
-28 87 -1 14 4 22 3 1 25 11 27 2
-28 86 -1 15 4 22 3 3 25 11 27 2
-28 85 -1 11 4 26 3 1 25 11 28 3
-28 84 -1 12 4 26 3 3 25 11 28 3
-28 83 -1 13 4 26 3 5 25 11 28 3
-28 82 -1 14 4 26 2 1 25 16 40 2
-28 81 -1 15 4 26 2 3 25 16 40 2
-28 80 -1 11 4 29 3 2 25 16 39 1
-28 79 -1 12 4 29 3 5 25 16 39 1
-28 78 -1 13 4 29 4 3 7 4 8 2
-28 77 -1 14 4 29 4 5 7 4 8 2
-28 76 -1 15 4 29 2 3 8 1 1 1
-28 75 -1 11 5 7 2 1 8 1 2 2
-28 74 -1 12 5 7 2 4 8 1 2 2
-28 73 -1 13 5 7 3 1 8 6 11 1
-28 72 -1 14 5 7 3 2 8 6 11 1
-28 71 -1 15 5 7 3 3 8 6 11 1
-28 70 -1 11 5 13 4 3 8 10 17 1
-28 69 -1 12 5 13 3 1 8 11 19 1
-28 68 -1 13 5 13 3 3 8 11 19 1
-28 67 -1 14 5 13 3 4 8 11 19 1
-28 66 -1 15 5 13 3 5 8 11 19 1
-28 65 -1 11 5 20 3 2 8 12 22 2
-28 64 -1 12 5 20 3 5 8 12 22 2
-28 63 -1 13 5 20 1 3 9 9 17 1
-28 62 -1 14 5 20 4 3 9 13 23 1
-28 61 -1 15 5 20 2 3 9 10 19 2
-28 60 -1 11 5 28 2 1 9 14 24 1
-28 59 -1 12 5 28 2 4 9 14 24 1
-28 58 -1 13 5 28 3 2 9 15 27 2
-28 57 -1 14 5 28 3 5 9 15 27 2
-28 56 -1 15 5 28 4 3 9 16 28 1
-28 55 -1 11 6 4 3 2 9 16 29 2
-28 54 -1 12 6 4 3 5 9 16 29 2
-28 53 -1 13 6 4 1 3 10 13 25 1
-28 52 -1 14 6 4 4 3 10 18 31 1
-28 51 -1 15 6 4 2 3 10 14 26 1
-28 50 -1 23 6 12 1 5 10 15 27 1
-28 49 -1 18 6 12 4 1 10 19 33 1
-28 48 -1 13 6 12 2 5 10 16 28 1
-28 47 -1 8 6 12 3 5 11 13 23 1
-28 46 -1 3 6 12 3 3 11 13 23 1
-28 45 -1 23 6 19 4 3 11 13 24 2
-28 44 -1 18 6 19 3 3 11 14 26 2
-28 43 -1 13 6 19 3 1 11 14 26 2
-28 42 -1 8 6 19 2 5 11 15 27 1
-28 41 -1 3 6 19 2 3 11 15 27 1
-28 40 -1 23 6 25 1 5 11 11 21 2
-28 39 -1 18 6 25 4 1 11 16 29 1
-28 38 -1 13 6 25 2 5 11 12 22 1
-28 37 -1 8 6 25 3 5 12 9 15 1
-28 36 -1 3 6 25 3 3 12 9 15 1
-28 35 -1 23 7 6 3 4 12 10 17 1
-28 34 -1 18 7 6 3 3 12 10 17 1
-28 33 -1 13 7 6 3 2 12 10 17 1
-28 32 -1 8 7 6 3 1 12 10 17 1
-28 31 -1 3 7 6 4 1 12 11 19 1
-28 30 -1 23 7 10 2 5 12 7 12 1
-28 29 -1 18 7 10 4 1 12 7 13 2
-28 28 -1 13 7 10 5 3 12 8 14 1
-28 27 -1 8 7 10 3 4 12 4 8 2
-28 26 -1 3 7 10 3 2 12 4 8 2
-28 25 -1 23 7 17 2 4 12 4 7 1
-28 24 -1 18 7 17 4 4 13 1 1 1
-28 23 -1 13 7 17 4 2 13 1 1 1
-28 22 -1 8 7 17 3 5 31 13 31 1
-28 21 -1 3 7 17 3 3 31 13 31 1
-28 20 -1 23 7 24 2 5 31 13 32 2
-28 19 -1 18 7 24 2 2 31 13 32 2
-28 18 -1 13 7 24 3 5 31 10 24 2
-28 17 -1 8 7 24 3 4 31 10 24 2
-28 16 -1 3 7 24 3 2 31 10 24 2
-28 15 -1 23 7 30 3 4 31 10 23 1
-28 14 -1 18 7 30 3 1 31 10 23 1
-28 13 -1 13 7 30 2 5 31 6 14 3
-28 12 -1 8 7 30 2 3 31 6 14 3
-28 11 -1 3 7 30 4 1 31 7 16 2
-28 10 -1 23 7 31 3 4 31 7 15 1
-28 9 -1 18 7 31 3 2 31 7 15 1
-28 8 -1 13 7 31 2 5 31 3 5 2
-28 7 -1 8 7 31 2 3 31 3 5 2
-28 6 -1 3 7 31 4 1 31 3 6 3
-27 95 -1 6 4 19 2 2 25 2 3 2
-27 94 -1 7 4 19 2 4 25 2 3 2
-27 93 -1 8 4 19 2 5 25 2 3 2
-27 92 -1 9 4 19 3 3 25 6 13 3
-27 91 -1 10 4 19 3 5 25 6 13 3
-27 90 -1 6 4 22 1 1 25 7 15 2
-27 89 -1 7 4 22 2 2 25 7 14 1
-27 88 -1 8 4 22 2 4 25 7 14 1
-27 87 -1 9 4 22 2 5 25 7 14 1
-27 86 -1 10 4 22 3 4 25 11 27 2
-27 85 -1 6 4 26 3 2 25 11 28 3
-27 84 -1 7 4 26 3 4 25 11 28 3
-27 83 -1 8 4 26 1 3 25 12 29 1
-27 82 -1 9 4 26 2 2 25 16 40 2
-27 81 -1 10 4 26 2 4 25 16 40 2
-27 80 -1 6 4 29 3 3 25 16 39 1
-27 79 -1 7 4 29 1 1 26 13 33 1
-27 78 -1 8 4 29 1 3 26 13 33 1
-27 77 -1 9 4 29 2 1 8 1 1 1
-27 76 -1 10 4 29 2 4 8 1 1 1
-27 75 -1 6 5 7 2 2 8 1 2 2
-27 74 -1 7 5 7 2 5 8 1 2 2
-27 73 -1 8 5 7 1 2 8 2 4 2
-27 72 -1 9 5 7 1 4 8 2 4 2
-27 71 -1 10 5 7 3 4 8 6 11 1
-27 70 -1 6 5 13 1 1 8 7 13 2
-27 69 -1 7 5 13 1 3 8 7 13 2
-27 68 -1 8 5 13 2 1 8 12 21 1
-27 67 -1 9 5 13 2 2 8 12 21 1
-27 66 -1 10 5 13 2 4 8 12 21 1
-27 65 -1 6 5 20 3 3 8 12 22 2
-27 64 -1 7 5 20 1 1 9 9 17 1
-27 63 -1 8 5 20 1 4 9 9 17 1
-27 62 -1 9 5 20 2 1 9 10 19 2
-27 61 -1 10 5 20 2 4 9 10 19 2
-27 60 -1 6 5 28 2 2 9 14 24 1
-27 59 -1 7 5 28 2 5 9 14 24 1
-27 58 -1 8 5 28 1 2 9 15 26 1
-27 57 -1 9 5 28 1 4 9 15 26 1
-27 56 -1 10 5 28 4 4 9 16 28 1
-27 55 -1 6 6 4 3 3 9 16 29 2
-27 54 -1 7 6 4 1 1 10 13 25 1
-27 53 -1 8 6 4 1 4 10 13 25 1
-27 52 -1 9 6 4 2 1 10 14 26 1
-27 51 -1 10 6 4 2 4 10 14 26 1
-27 50 -1 22 6 12 1 4 10 15 27 1
-27 49 -1 17 6 12 1 2 10 15 27 1
-27 48 -1 12 6 12 2 4 10 16 28 1
-27 47 -1 7 6 12 2 2 10 16 28 1
-27 46 -1 2 6 12 3 2 11 13 23 1
-27 45 -1 22 6 19 4 2 11 13 24 2
-27 44 -1 17 6 19 1 5 11 14 25 1
-27 43 -1 12 6 19 1 3 11 14 25 1
-27 42 -1 7 6 19 2 4 11 15 27 1
-27 41 -1 2 6 19 2 2 11 15 27 1
-27 40 -1 22 6 25 1 4 11 11 21 2
-27 39 -1 17 6 25 1 2 11 11 21 2
-27 38 -1 12 6 25 2 4 11 12 22 1
-27 37 -1 7 6 25 2 2 11 12 22 1
-27 36 -1 2 6 25 3 2 12 9 15 1
-27 35 -1 22 7 6 2 5 12 9 16 2
-27 34 -1 17 7 6 2 3 12 9 16 2
-27 33 -1 12 7 6 2 1 12 9 16 2
-27 32 -1 7 7 6 1 4 12 6 11 2
-27 31 -1 2 7 6 1 2 12 6 11 2
-27 30 -1 22 7 10 2 4 12 7 12 1
-27 29 -1 17 7 10 2 2 12 7 12 1
-27 28 -1 12 7 10 1 5 12 3 6 2
-27 27 -1 7 7 10 1 3 12 3 6 2
-27 26 -1 2 7 10 3 1 12 4 8 2
-27 25 -1 22 7 17 2 3 12 4 7 1
-27 24 -1 17 7 17 2 1 12 4 7 1
-27 23 -1 12 7 17 1 4 30 16 41 2
-27 22 -1 7 7 17 1 2 30 16 41 2
-27 21 -1 2 7 17 3 2 31 13 31 1
-27 20 -1 22 7 24 2 4 31 13 32 2
-27 19 -1 17 7 24 2 1 31 13 32 2
-27 18 -1 12 7 24 1 4 31 9 22 2
-27 17 -1 7 7 24 3 3 31 10 24 2
-27 16 -1 2 7 24 3 1 31 10 24 2
-27 15 -1 22 7 30 3 3 31 10 23 1
-27 14 -1 17 7 30 1 5 31 6 13 2
-27 13 -1 12 7 30 2 4 31 6 14 3
-27 12 -1 7 7 30 2 2 31 6 14 3
-27 11 -1 2 7 30 2 1 31 6 14 3
-27 10 -1 22 7 31 3 3 31 7 15 1
-27 9 -1 17 7 31 3 1 31 7 15 1
-27 8 -1 12 7 31 2 4 31 3 5 2
-27 7 -1 7 7 31 2 2 31 3 5 2
-27 6 -1 2 7 31 2 1 31 3 5 2
-26 95 -1 1 4 19 1 1 25 2 4 3
-26 94 -1 2 4 19 1 2 25 2 4 3
-26 93 -1 3 4 19 1 3 25 2 4 3
-26 92 -1 4 4 19 1 4 25 2 4 3
-26 91 -1 5 4 19 1 5 25 2 4 3
-26 90 -1 1 4 22 1 2 25 7 15 2
-26 89 -1 2 4 22 1 3 25 7 15 2
-26 88 -1 3 4 22 1 4 25 7 15 2
-26 87 -1 4 4 22 1 5 25 7 15 2
-26 86 -1 5 4 22 3 5 25 11 27 2
-26 85 -1 1 4 26 1 1 25 12 29 1
-26 84 -1 2 4 26 1 2 25 12 29 1
-26 83 -1 3 4 26 1 4 25 12 29 1
-26 82 -1 4 4 26 1 5 25 12 29 1
-26 81 -1 5 4 26 2 5 25 16 40 2
-26 80 -1 1 4 29 3 4 25 16 39 1
-26 79 -1 2 4 29 1 2 26 13 33 1
-26 78 -1 3 4 29 1 4 26 13 33 1
-26 77 -1 4 4 29 1 5 26 13 33 1
-26 76 -1 5 4 29 2 5 8 1 1 1
-26 75 -1 1 5 7 2 3 8 1 2 2
-26 74 -1 2 5 7 1 1 8 2 4 2
-26 73 -1 3 5 7 1 3 8 2 4 2
-26 72 -1 4 5 7 1 5 8 2 4 2
-26 71 -1 5 5 7 3 5 8 6 11 1
-26 70 -1 1 5 13 1 2 8 7 13 2
-26 69 -1 2 5 13 1 4 8 7 13 2
-26 68 -1 3 5 13 1 5 8 7 13 2
-26 67 -1 4 5 13 2 3 8 12 21 1
-26 66 -1 5 5 13 2 5 8 12 21 1
-26 65 -1 1 5 20 3 4 8 12 22 2
-26 64 -1 2 5 20 1 2 9 9 17 1
-26 63 -1 3 5 20 1 5 9 9 17 1
-26 62 -1 4 5 20 2 2 9 10 19 2
-26 61 -1 5 5 20 2 5 9 10 19 2
-26 60 -1 1 5 28 2 3 9 14 24 1
-26 59 -1 2 5 28 1 1 9 15 26 1
-26 58 -1 3 5 28 1 3 9 15 26 1
-26 57 -1 4 5 28 1 5 9 15 26 1
-26 56 -1 5 5 28 4 5 9 16 28 1
-26 55 -1 1 6 4 3 4 9 16 29 2
-26 54 -1 2 6 4 1 2 10 13 25 1
-26 53 -1 3 6 4 1 5 10 13 25 1
-26 52 -1 4 6 4 2 2 10 14 26 1
-26 51 -1 5 6 4 2 5 10 14 26 1
-26 50 -1 21 6 12 1 3 10 15 27 1
-26 49 -1 16 6 12 1 1 10 15 27 1
-26 48 -1 11 6 12 2 3 10 16 28 1
-26 47 -1 6 6 12 2 1 10 16 28 1
-26 46 -1 1 6 12 3 1 11 13 23 1
-26 45 -1 21 6 19 4 1 11 13 24 2
-26 44 -1 16 6 19 1 4 11 14 25 1
-26 43 -1 11 6 19 1 2 11 14 25 1
-26 42 -1 6 6 19 1 1 11 14 25 1
-26 41 -1 1 6 19 2 1 11 15 27 1
-26 40 -1 21 6 25 1 3 11 11 21 2
-26 39 -1 16 6 25 1 1 11 11 21 2
-26 38 -1 11 6 25 2 3 11 12 22 1
-26 37 -1 6 6 25 2 1 11 12 22 1
-26 36 -1 1 6 25 3 1 12 9 15 1
-26 35 -1 21 7 6 2 4 12 9 16 2
-26 34 -1 16 7 6 2 2 12 9 16 2
-26 33 -1 11 7 6 1 5 12 6 11 2
-26 32 -1 6 7 6 1 3 12 6 11 2
-26 31 -1 1 7 6 1 1 12 6 11 2
-26 30 -1 21 7 10 2 3 12 7 12 1
-26 29 -1 16 7 10 2 1 12 7 12 1
-26 28 -1 11 7 10 1 4 12 3 6 2
-26 27 -1 6 7 10 1 2 12 3 6 2
-26 26 -1 1 7 10 1 1 12 3 6 2
-26 25 -1 21 7 17 2 2 12 4 7 1
-26 24 -1 16 7 17 1 5 30 16 41 2
-26 23 -1 11 7 17 1 3 30 16 41 2
-26 22 -1 6 7 17 1 1 30 16 41 2
-26 21 -1 1 7 17 3 1 31 13 31 1
-26 20 -1 21 7 24 2 3 31 13 32 2
-26 19 -1 16 7 24 1 5 31 9 22 2
-26 18 -1 11 7 24 1 3 31 9 22 2
-26 17 -1 6 7 24 1 2 31 9 22 2
-26 16 -1 1 7 24 1 1 31 9 22 2
-26 15 -1 21 7 30 3 2 31 10 23 1
-26 14 -1 16 7 30 1 4 31 6 13 2
-26 13 -1 11 7 30 1 3 31 6 13 2
-26 12 -1 6 7 30 1 2 31 6 13 2
-26 11 -1 1 7 30 1 1 31 6 13 2
-26 10 -1 21 7 31 1 5 31 3 4 1
-26 9 -1 16 7 31 1 4 31 3 4 1
-26 8 -1 11 7 31 1 3 31 3 4 1
-26 7 -1 6 7 31 1 2 31 3 4 1
-26 6 -1 1 7 31 1 1 31 3 4 1
-25 92 -1 24 4 30 4 1 25 3 5 1
-25 91 -1 25 4 30 4 4 25 3 5 1
-25 90 -1 21 4 23 5 1 25 7 16 3
-25 89 -1 22 4 23 5 3 25 7 16 3
-25 88 -1 23 4 23 5 5 25 7 16 3
-25 87 -1 24 4 23 4 2 25 8 17 1
-25 86 -1 25 4 23 4 4 25 8 17 1
-25 85 -1 21 5 1 5 1 25 12 30 2
-25 84 -1 22 5 1 5 2 25 12 30 2
-25 83 -1 23 5 1 5 4 25 12 30 2
-25 82 -1 24 5 1 4 1 26 9 22 1
-25 81 -1 25 5 1 4 3 26 9 22 1
-25 80 -1 21 5 4 5 1 26 13 34 2
-25 79 -1 22 5 4 5 2 26 13 34 2
-25 78 -1 23 5 4 5 3 26 13 34 2
-25 77 -1 24 5 4 5 4 26 13 34 2
-25 76 -1 25 5 4 5 5 26 13 34 2
-25 75 -1 21 5 8 5 1 8 2 3 1
-25 74 -1 22 5 8 5 2 8 2 3 1
-25 73 -1 23 5 8 5 4 8 2 3 1
-25 72 -1 24 5 8 5 5 8 2 3 1
-25 71 -1 25 5 8 4 3 8 3 6 2
-25 70 -1 21 5 14 5 1 8 7 12 1
-25 69 -1 22 5 14 5 3 8 7 12 1
-25 68 -1 23 5 14 5 5 8 7 12 1
-25 67 -1 24 5 14 4 1 8 8 14 1
-25 66 -1 25 5 14 4 3 8 8 14 1
-25 65 -1 21 5 21 4 1 9 5 11 2
-25 64 -1 22 5 21 4 3 9 5 11 2
-25 63 -1 23 5 21 5 1 9 10 18 1
-25 62 -1 24 5 21 5 2 9 10 18 1
-25 61 -1 25 5 21 5 4 9 10 18 1
-25 60 -1 21 5 29 5 1 9 11 21 2
-25 59 -1 22 5 29 5 2 9 11 21 2
-25 58 -1 23 5 29 5 3 9 11 21 2
-25 57 -1 24 5 29 5 5 9 11 21 2
-25 56 -1 25 5 29 4 3 9 12 22 1
-25 55 -1 21 6 5 5 1 10 9 20 2
-25 54 -1 22 6 5 5 2 10 9 20 2
-25 53 -1 23 6 5 5 3 10 9 20 2
-25 52 -1 24 6 5 5 5 10 9 20 2
-25 51 -1 25 6 5 4 3 10 10 21 1
-25 50 -1 25 6 13 4 5 10 11 22 1
-25 49 -1 20 6 13 5 5 10 12 24 2
-25 48 -1 15 6 13 5 4 10 12 24 2
-25 47 -1 10 6 13 5 3 10 12 24 2
-25 46 -1 5 6 13 5 2 10 12 24 2
-25 45 -1 25 6 20 4 5 11 9 17 1
-25 44 -1 20 6 20 5 5 11 10 19 2
-25 43 -1 15 6 20 5 4 11 10 19 2
-25 42 -1 10 6 20 5 3 11 10 19 2
-25 41 -1 5 6 20 5 2 11 10 19 2
-25 40 -1 25 6 26 5 5 11 11 20 1
-25 39 -1 20 6 26 5 3 11 11 20 1
-25 38 -1 15 6 26 5 1 11 11 20 1
-25 37 -1 10 6 26 4 4 11 8 16 2
-25 36 -1 5 6 26 4 2 11 8 16 2
-25 35 -1 25 7 7 4 5 12 5 9 1
-25 34 -1 20 7 7 4 2 12 5 9 1
-25 33 -1 15 7 7 5 5 12 6 10 1
-25 32 -1 10 7 7 5 4 12 6 10 1
-25 31 -1 5 7 7 5 2 12 6 10 1
-25 30 -1 25 7 11 4 5 12 2 4 2
-25 29 -1 20 7 11 5 5 12 3 5 1
-25 28 -1 15 7 11 5 4 12 3 5 1
-25 27 -1 10 7 11 5 3 12 3 5 1
-25 26 -1 5 7 11 5 1 12 3 5 1
-25 25 -1 25 7 18 4 5 30 15 39 3
-25 24 -1 20 7 18 4 3 30 15 39 3
-25 23 -1 15 7 18 5 5 30 16 40 1
-25 22 -1 10 7 18 5 3 30 16 40 1
-25 21 -1 5 7 18 5 1 30 16 40 1
-25 20 -1 25 7 25 4 5 30 12 32 3
-25 19 -1 20 7 25 4 3 30 12 32 3
-25 18 -1 15 7 25 5 5 31 9 21 1
-25 17 -1 10 7 25 5 3 31 9 21 1
-25 16 -1 5 7 25 5 1 31 9 21 1
-25 15 -1 25 7 27 4 5 31 5 11 2
-25 14 -1 20 7 27 4 3 31 5 11 2
-25 13 -1 15 7 27 5 5 31 6 12 1
-25 12 -1 10 7 27 5 4 31 6 12 1
-25 11 -1 5 7 27 5 2 31 6 12 1
-25 10 -1 25 7 21 5 5 31 2 3 1
-25 9 -1 20 7 21 5 3 31 2 3 1
-24 92 -1 19 4 30 4 2 25 3 5 1
-24 91 -1 20 4 30 4 5 25 3 5 1
-24 90 -1 16 4 23 5 2 25 7 16 3
-24 89 -1 17 4 23 5 4 25 7 16 3
-24 88 -1 18 4 23 4 1 25 8 17 1
-24 87 -1 19 4 23 4 3 25 8 17 1
-24 86 -1 20 4 23 4 5 25 8 17 1
-24 85 -1 16 5 1 3 1 25 8 18 2
-24 84 -1 17 5 1 5 3 25 12 30 2
-24 83 -1 18 5 1 5 5 25 12 30 2
-24 82 -1 19 5 1 4 2 26 9 22 1
-24 81 -1 20 5 1 4 4 26 9 22 1
-24 80 -1 16 5 4 3 1 26 9 23 2
-24 79 -1 17 5 4 4 1 26 13 35 3
-24 78 -1 18 5 4 4 2 26 13 35 3
-24 77 -1 19 5 4 4 4 26 13 35 3
-24 76 -1 20 5 4 4 5 26 13 35 3
-24 75 -1 16 5 8 3 1 26 14 37 2
-24 74 -1 17 5 8 5 3 8 2 3 1
-24 73 -1 18 5 8 4 1 8 3 6 2
-24 72 -1 19 5 8 4 2 8 3 6 2
-24 71 -1 20 5 8 4 4 8 3 6 2
-24 70 -1 16 5 14 5 2 8 7 12 1
-24 69 -1 17 5 14 5 4 8 7 12 1
-24 68 -1 18 5 14 3 3 8 4 8 2
-24 67 -1 19 5 14 4 2 8 8 14 1
-24 66 -1 20 5 14 4 4 8 8 14 1
-24 65 -1 16 5 21 4 2 9 5 11 2
-24 64 -1 17 5 21 4 4 9 5 11 2
-24 63 -1 18 5 21 4 5 9 5 11 2
-24 62 -1 19 5 21 5 3 9 10 18 1
-24 61 -1 20 5 21 5 5 9 10 18 1
-24 60 -1 16 5 29 3 1 9 11 20 1
-24 59 -1 17 5 29 3 3 9 11 20 1
-24 58 -1 18 5 29 5 4 9 11 21 2
-24 57 -1 19 5 29 4 1 9 12 22 1
-24 56 -1 20 5 29 4 4 9 12 22 1
-24 55 -1 16 6 5 3 1 10 9 19 1
-24 54 -1 17 6 5 3 3 10 9 19 1
-24 53 -1 18 6 5 5 4 10 9 20 2
-24 52 -1 19 6 5 4 1 10 10 21 1
-24 51 -1 20 6 5 4 4 10 10 21 1
-24 50 -1 24 6 13 4 4 10 11 22 1
-24 49 -1 19 6 13 4 2 10 11 22 1
-24 48 -1 14 6 13 3 5 10 12 23 1
-24 47 -1 9 6 13 3 3 10 12 23 1
-24 46 -1 4 6 13 5 1 10 12 24 2
-24 45 -1 24 6 20 4 4 11 9 17 1
-24 44 -1 19 6 20 4 2 11 9 17 1
-24 43 -1 14 6 20 3 5 11 10 18 1
-24 42 -1 9 6 20 3 3 11 10 18 1
-24 41 -1 4 6 20 5 1 11 10 19 2
-24 40 -1 24 6 26 5 4 11 11 20 1
-24 39 -1 19 6 26 5 2 11 11 20 1
-24 38 -1 14 6 26 4 5 11 8 16 2
-24 37 -1 9 6 26 4 3 11 8 16 2
-24 36 -1 4 6 26 4 1 11 8 16 2
-24 35 -1 24 7 7 4 4 12 5 9 1
-24 34 -1 19 7 7 4 1 12 5 9 1
-24 33 -1 14 7 7 3 4 12 1 2 2
-24 32 -1 9 7 7 5 3 12 6 10 1
-24 31 -1 4 7 7 5 1 12 6 10 1
-24 30 -1 24 7 11 4 4 12 2 4 2
-24 29 -1 19 7 11 4 3 12 2 4 2
-24 28 -1 14 7 11 4 2 12 2 4 2
-24 27 -1 9 7 11 5 2 12 3 5 1
-24 26 -1 4 7 11 3 3 30 15 38 2
-24 25 -1 24 7 18 4 4 30 15 39 3
-24 24 -1 19 7 18 4 2 30 15 39 3
-24 23 -1 14 7 18 5 4 30 16 40 1
-24 22 -1 9 7 18 5 2 30 16 40 1
-24 21 -1 4 7 18 3 3 30 12 31 2
-24 20 -1 24 7 25 4 4 30 12 32 3
-24 19 -1 19 7 25 4 2 30 12 32 3
-24 18 -1 14 7 25 5 4 31 9 21 1
-24 17 -1 9 7 25 5 2 31 9 21 1
-24 16 -1 4 7 25 3 3 31 5 9 4
-24 15 -1 24 7 27 4 4 31 5 11 2
-24 14 -1 19 7 27 4 2 31 5 11 2
-24 13 -1 14 7 27 4 1 31 5 11 2
-24 12 -1 9 7 27 5 3 31 6 12 1
-24 11 -1 4 7 27 5 1 31 6 12 1
-24 10 -1 24 7 21 5 4 31 2 3 1
-24 9 -1 19 7 21 5 2 31 2 3 1
-23 92 -1 14 4 30 4 3 25 3 5 1
-23 91 -1 15 4 30 3 3 25 4 6 1
-23 90 -1 11 4 23 1 1 25 4 7 2
-23 89 -1 12 4 23 3 1 25 8 19 3
-23 88 -1 13 4 23 3 2 25 8 19 3
-23 87 -1 14 4 23 3 3 25 8 19 3
-23 86 -1 15 4 23 3 4 25 8 19 3
-23 85 -1 11 5 1 3 2 25 8 18 2
-23 84 -1 12 5 1 3 4 25 8 18 2
-23 83 -1 13 5 1 2 1 26 9 24 3
-23 82 -1 14 5 1 2 2 26 9 24 3
-23 81 -1 15 5 1 4 5 26 9 22 1
-23 80 -1 11 5 4 3 2 26 9 23 2
-23 79 -1 12 5 4 3 5 26 9 23 2
-23 78 -1 13 5 4 4 3 26 13 35 3
-23 77 -1 14 5 4 2 1 26 14 36 1
-23 76 -1 15 5 4 2 3 26 14 36 1
-23 75 -1 11 5 8 3 2 26 14 37 2
-23 74 -1 12 5 8 3 4 26 14 37 2
-23 73 -1 13 5 8 2 1 8 3 5 1
-23 72 -1 14 5 8 2 2 8 3 5 1
-23 71 -1 15 5 8 4 5 8 3 6 2
-23 70 -1 11 5 14 3 1 8 4 8 2
-23 69 -1 12 5 14 3 2 8 4 8 2
-23 68 -1 13 5 14 3 4 8 4 8 2
-23 67 -1 14 5 14 3 5 8 4 8 2
-23 66 -1 15 5 14 4 5 8 8 14 1
-23 65 -1 11 5 21 2 1 9 5 10 1
-23 64 -1 12 5 21 2 4 9 5 10 1
-23 63 -1 13 5 21 3 1 9 6 13 2
-23 62 -1 14 5 21 3 2 9 6 13 2
-23 61 -1 15 5 21 3 4 9 6 13 2
-23 60 -1 11 5 29 3 2 9 11 20 1
-23 59 -1 12 5 29 3 4 9 11 20 1
-23 58 -1 13 5 29 3 5 9 11 20 1
-23 57 -1 14 5 29 4 2 9 12 22 1
-23 56 -1 15 5 29 4 5 9 12 22 1
-23 55 -1 11 6 5 3 2 10 9 19 1
-23 54 -1 12 6 5 3 4 10 9 19 1
-23 53 -1 13 6 5 3 5 10 9 19 1
-23 52 -1 14 6 5 4 2 10 10 21 1
-23 51 -1 15 6 5 4 5 10 10 21 1
-23 50 -1 23 6 13 4 3 10 11 22 1
-23 49 -1 18 6 13 4 1 10 11 22 1
-23 48 -1 13 6 13 3 4 10 12 23 1
-23 47 -1 8 6 13 3 2 10 12 23 1
-23 46 -1 3 6 13 3 1 10 12 23 1
-23 45 -1 23 6 20 4 3 11 9 17 1
-23 44 -1 18 6 20 4 1 11 9 17 1
-23 43 -1 13 6 20 3 4 11 10 18 1
-23 42 -1 8 6 20 3 2 11 10 18 1
-23 41 -1 3 6 20 3 1 11 10 18 1
-23 40 -1 23 6 26 3 5 11 7 14 2
-23 39 -1 18 6 26 3 4 11 7 14 2
-23 38 -1 13 6 26 3 2 11 7 14 2
-23 37 -1 8 6 26 2 5 11 8 15 1
-23 36 -1 3 6 26 2 3 11 8 15 1
-23 35 -1 23 7 7 4 3 12 5 9 1
-23 34 -1 18 7 7 3 5 12 1 2 2
-23 33 -1 13 7 7 3 3 12 1 2 2
-23 32 -1 8 7 7 3 2 12 1 2 2
-23 31 -1 3 7 7 3 1 12 1 2 2
-23 30 -1 23 7 11 2 5 12 2 3 1
-23 29 -1 18 7 11 2 2 12 2 3 1
-23 28 -1 13 7 11 4 1 12 2 4 2
-23 27 -1 8 7 11 3 5 30 15 38 2
-23 26 -1 3 7 11 3 2 30 15 38 2
-23 25 -1 23 7 18 2 5 30 15 37 1
-23 24 -1 18 7 18 2 2 30 15 37 1
-23 23 -1 13 7 18 4 1 30 15 39 3
-23 22 -1 8 7 18 3 5 30 12 31 2
-23 21 -1 3 7 18 3 2 30 12 31 2
-23 20 -1 23 7 25 2 5 30 12 30 1
-23 19 -1 18 7 25 2 2 30 12 30 1
-23 18 -1 13 7 25 4 1 30 12 32 3
-23 17 -1 8 7 25 3 5 31 5 9 4
-23 16 -1 3 7 25 3 2 31 5 9 4
-23 15 -1 23 7 27 3 5 31 5 10 1
-23 14 -1 18 7 27 3 4 31 5 10 1
-23 13 -1 13 7 27 3 3 31 5 10 1
-23 12 -1 8 7 27 3 2 31 5 10 1
-23 11 -1 3 7 27 1 3 31 1 1 1
-23 10 -1 23 7 21 4 5 31 1 2 2
-23 9 -1 18 7 21 5 1 31 2 3 1
-22 92 -1 9 4 30 3 1 25 4 6 1
-22 91 -1 10 4 30 3 4 25 4 6 1
-22 90 -1 6 4 23 1 2 25 4 7 2
-22 89 -1 7 4 23 2 1 25 8 20 4
-22 88 -1 8 4 23 2 2 25 8 20 4
-22 87 -1 9 4 23 2 3 25 8 20 4
-22 86 -1 10 4 23 3 5 25 8 19 3
-22 85 -1 6 5 1 3 3 25 8 18 2
-22 84 -1 7 5 1 3 5 25 8 18 2
-22 83 -1 8 5 1 1 3 26 5 6 1
-22 82 -1 9 5 1 2 3 26 9 24 3
-22 81 -1 10 5 1 2 4 26 9 24 3
-22 80 -1 6 5 4 3 3 26 9 23 2
-22 79 -1 7 5 4 1 1 26 10 27 3
-22 78 -1 8 5 4 1 3 26 10 27 3
-22 77 -1 9 5 4 2 2 26 14 36 1
-22 76 -1 10 5 4 2 4 26 14 36 1
-22 75 -1 6 5 8 3 3 26 14 37 2
-22 74 -1 7 5 8 3 5 26 14 37 2
-22 73 -1 8 5 8 1 3 26 15 39 2
-22 72 -1 9 5 8 2 3 8 3 5 1
-22 71 -1 10 5 8 2 4 8 3 5 1
-22 70 -1 6 5 14 2 1 8 4 7 1
-22 69 -1 7 5 14 2 3 8 4 7 1
-22 68 -1 8 5 14 2 5 8 4 7 1
-22 67 -1 9 5 14 1 2 9 1 2 2
-22 66 -1 10 5 14 1 4 9 1 2 2
-22 65 -1 6 5 21 2 2 9 5 10 1
-22 64 -1 7 5 21 2 5 9 5 10 1
-22 63 -1 8 5 21 1 2 9 6 12 1
-22 62 -1 9 5 21 3 3 9 6 13 2
-22 61 -1 10 5 21 3 5 9 6 13 2
-22 60 -1 6 5 29 2 1 9 7 14 1
-22 59 -1 7 5 29 2 3 9 7 14 1
-22 58 -1 8 5 29 2 5 9 7 14 1
-22 57 -1 9 5 29 1 2 9 8 16 2
-22 56 -1 10 5 29 1 4 9 8 16 2
-22 55 -1 6 6 5 2 1 10 5 10 1
-22 54 -1 7 6 5 2 3 10 5 10 1
-22 53 -1 8 6 5 2 5 10 5 10 1
-22 52 -1 9 6 5 1 2 10 6 13 3
-22 51 -1 10 6 5 1 4 10 6 13 3
-22 50 -1 22 6 13 1 5 10 7 16 3
-22 49 -1 17 6 13 1 3 10 7 16 3
-22 48 -1 12 6 13 2 5 10 8 18 2
-22 47 -1 7 6 13 2 4 10 8 18 2
-22 46 -1 2 6 13 2 2 10 8 18 2
-22 45 -1 22 6 20 1 5 11 5 11 2
-22 44 -1 17 6 20 1 3 11 5 11 2
-22 43 -1 12 6 20 2 5 11 6 12 1
-22 42 -1 7 6 20 2 4 11 6 12 1
-22 41 -1 2 6 20 2 2 11 6 12 1
-22 40 -1 22 6 26 1 5 11 7 13 1
-22 39 -1 17 6 26 3 3 11 7 14 2
-22 38 -1 12 6 26 3 1 11 7 14 2
-22 37 -1 7 6 26 2 4 11 8 15 1
-22 36 -1 2 6 26 2 2 11 8 15 1
-22 35 -1 22 7 7 1 5 11 4 9 2
-22 34 -1 17 7 7 1 3 11 4 9 2
-22 33 -1 12 7 7 2 5 12 1 1 1
-22 32 -1 7 7 7 2 4 12 1 1 1
-22 31 -1 2 7 7 2 2 12 1 1 1
-22 30 -1 22 7 11 2 4 12 2 3 1
-22 29 -1 17 7 11 2 1 12 2 3 1
-22 28 -1 12 7 11 1 4 30 14 36 2
-22 27 -1 7 7 11 3 4 30 15 38 2
-22 26 -1 2 7 11 3 1 30 15 38 2
-22 25 -1 22 7 18 2 4 30 15 37 1
-22 24 -1 17 7 18 2 1 30 15 37 1
-22 23 -1 12 7 18 1 4 30 11 29 3
-22 22 -1 7 7 18 3 4 30 12 31 2
-22 21 -1 2 7 18 3 1 30 12 31 2
-22 20 -1 22 7 25 2 4 30 12 30 1
-22 19 -1 17 7 25 2 1 30 12 30 1
-22 18 -1 12 7 25 1 4 30 8 21 5
-22 17 -1 7 7 25 3 4 31 5 9 4
-22 16 -1 2 7 25 3 1 31 5 9 4
-22 15 -1 22 7 27 2 5 31 5 8 3
-22 14 -1 17 7 27 2 3 31 5 8 3
-22 13 -1 12 7 27 2 1 31 5 8 3
-22 12 -1 7 7 27 3 1 31 5 10 1
-22 11 -1 2 7 27 1 2 31 1 1 1
-22 10 -1 22 7 21 4 4 31 1 2 2
-22 9 -1 17 7 21 4 2 31 1 2 2
-21 92 -1 4 4 30 3 2 25 4 6 1
-21 91 -1 5 4 30 3 5 25 4 6 1
-21 90 -1 1 4 23 1 3 25 4 7 2
-21 89 -1 2 4 23 1 4 25 4 7 2
-21 88 -1 3 4 23 1 5 25 4 7 2
-21 87 -1 4 4 23 2 4 25 8 20 4
-21 86 -1 5 4 23 2 5 25 8 20 4
-21 85 -1 1 5 1 1 1 26 5 6 1
-21 84 -1 2 5 1 1 2 26 5 6 1
-21 83 -1 3 5 1 1 4 26 5 6 1
-21 82 -1 4 5 1 1 5 26 5 6 1
-21 81 -1 5 5 1 2 5 26 9 24 3
-21 80 -1 1 5 4 3 4 26 9 23 2
-21 79 -1 2 5 4 1 2 26 10 27 3
-21 78 -1 3 5 4 1 4 26 10 27 3
-21 77 -1 4 5 4 1 5 26 10 27 3
-21 76 -1 5 5 4 2 5 26 14 36 1
-21 75 -1 1 5 8 1 1 26 15 39 2
-21 74 -1 2 5 8 1 2 26 15 39 2
-21 73 -1 3 5 8 1 4 26 15 39 2
-21 72 -1 4 5 8 1 5 26 15 39 2
-21 71 -1 5 5 8 2 5 8 3 5 1
-21 70 -1 1 5 14 2 2 8 4 7 1
-21 69 -1 2 5 14 2 4 8 4 7 1
-21 68 -1 3 5 14 1 1 9 1 2 2
-21 67 -1 4 5 14 1 3 9 1 2 2
-21 66 -1 5 5 14 1 5 9 1 2 2
-21 65 -1 1 5 21 2 3 9 5 10 1
-21 64 -1 2 5 21 1 1 9 6 12 1
-21 63 -1 3 5 21 1 3 9 6 12 1
-21 62 -1 4 5 21 1 4 9 6 12 1
-21 61 -1 5 5 21 1 5 9 6 12 1
-21 60 -1 1 5 29 2 2 9 7 14 1
-21 59 -1 2 5 29 2 4 9 7 14 1
-21 58 -1 3 5 29 1 1 9 8 16 2
-21 57 -1 4 5 29 1 3 9 8 16 2
-21 56 -1 5 5 29 1 5 9 8 16 2
-21 55 -1 1 6 5 2 2 10 5 10 1
-21 54 -1 2 6 5 2 4 10 5 10 1
-21 53 -1 3 6 5 1 1 10 6 13 3
-21 52 -1 4 6 5 1 3 10 6 13 3
-21 51 -1 5 6 5 1 5 10 6 13 3
-21 50 -1 21 6 13 1 4 10 7 16 3
-21 49 -1 16 6 13 1 2 10 7 16 3
-21 48 -1 11 6 13 1 1 10 7 16 3
-21 47 -1 6 6 13 2 3 10 8 18 2
-21 46 -1 1 6 13 2 1 10 8 18 2
-21 45 -1 21 6 20 1 4 11 5 11 2
-21 44 -1 16 6 20 1 2 11 5 11 2
-21 43 -1 11 6 20 1 1 11 5 11 2
-21 42 -1 6 6 20 2 3 11 6 12 1
-21 41 -1 1 6 20 2 1 11 6 12 1
-21 40 -1 21 6 26 1 4 11 7 13 1
-21 39 -1 16 6 26 1 3 11 7 13 1
-21 38 -1 11 6 26 1 2 11 7 13 1
-21 37 -1 6 6 26 1 1 11 7 13 1
-21 36 -1 1 6 26 2 1 11 8 15 1
-21 35 -1 21 7 7 1 4 11 4 9 2
-21 34 -1 16 7 7 1 2 11 4 9 2
-21 33 -1 11 7 7 1 1 11 4 9 2
-21 32 -1 6 7 7 2 3 12 1 1 1
-21 31 -1 1 7 7 2 1 12 1 1 1
-21 30 -1 21 7 11 2 3 12 2 3 1
-21 29 -1 16 7 11 1 5 30 14 36 2
-21 28 -1 11 7 11 1 3 30 14 36 2
-21 27 -1 6 7 11 1 2 30 14 36 2
-21 26 -1 1 7 11 1 1 30 14 36 2
-21 25 -1 21 7 18 2 3 30 15 37 1
-21 24 -1 16 7 18 1 5 30 11 29 3
-21 23 -1 11 7 18 1 3 30 11 29 3
-21 22 -1 6 7 18 1 2 30 11 29 3
-21 21 -1 1 7 18 1 1 30 11 29 3
-21 20 -1 21 7 25 2 3 30 12 30 1
-21 19 -1 16 7 25 1 5 30 8 21 5
-21 18 -1 11 7 25 1 3 30 8 21 5
-21 17 -1 6 7 25 1 2 30 8 21 5
-21 16 -1 1 7 25 1 1 30 8 21 5
-21 15 -1 21 7 27 2 4 31 5 8 3
-21 14 -1 16 7 27 2 2 31 5 8 3
-21 13 -1 11 7 27 1 5 31 1 1 1
-21 12 -1 6 7 27 1 4 31 1 1 1
-21 11 -1 1 7 27 1 1 31 1 1 1
-21 10 -1 21 7 21 4 3 31 1 2 2
-21 9 -1 16 7 21 4 1 31 1 2 2
-20 87 -1 24 5 3 2 1 26 5 7 2
-20 86 -1 25 5 3 2 3 26 5 7 2
-20 85 -1 21 5 2 5 1 26 5 8 3
-20 84 -1 22 5 2 5 2 26 5 8 3
-20 83 -1 23 5 2 5 4 26 5 8 3
-20 82 -1 24 5 2 4 1 26 6 14 5
-20 81 -1 25 5 2 4 3 26 6 14 5
-20 80 -1 21 5 5 5 1 26 10 26 2
-20 79 -1 22 5 5 5 2 26 10 26 2
-20 78 -1 23 5 5 5 3 26 10 26 2
-20 77 -1 24 5 5 5 4 26 10 26 2
-20 76 -1 25 5 5 5 5 26 10 26 2
-20 75 -1 21 5 9 5 1 26 15 38 1
-20 74 -1 22 5 9 5 2 26 15 38 1
-20 73 -1 23 5 9 5 4 26 15 38 1
-20 72 -1 24 5 9 4 1 26 16 41 2
-20 71 -1 25 5 9 4 3 26 16 41 2
-20 70 -1 21 5 15 4 1 26 16 40 1
-20 69 -1 22 5 15 5 1 9 1 1 1
-20 68 -1 23 5 15 5 2 9 1 1 1
-20 67 -1 24 5 15 5 3 9 1 1 1
-20 66 -1 25 5 15 5 4 9 1 1 1
-20 65 -1 21 5 22 5 1 9 2 4 2
-20 64 -1 22 5 22 5 2 9 2 4 2
-20 63 -1 23 5 22 5 3 9 2 4 2
-20 62 -1 24 5 22 5 5 9 2 4 2
-20 61 -1 25 5 22 4 3 9 3 7 3
-20 60 -1 21 5 30 3 1 9 3 6 2
-20 59 -1 22 5 30 5 1 9 8 15 1
-20 58 -1 23 5 30 5 2 9 8 15 1
-20 57 -1 24 5 30 5 3 9 8 15 1
-20 56 -1 25 5 30 5 4 9 8 15 1
-20 55 -1 21 6 6 4 1 10 5 9 2
-20 54 -1 22 6 6 4 3 10 5 9 2
-20 53 -1 23 6 6 5 1 10 6 12 2
-20 52 -1 24 6 6 5 2 10 6 12 2
-20 51 -1 25 6 6 5 4 10 6 12 2
-20 50 -1 25 6 14 5 5 10 7 15 2
-20 49 -1 20 6 14 5 4 10 7 15 2
-20 48 -1 15 6 14 5 2 10 7 15 2
-20 47 -1 10 6 14 4 5 10 8 17 1
-20 46 -1 5 6 14 4 2 10 8 17 1
-20 45 -1 25 6 21 5 5 11 5 10 1
-20 44 -1 20 6 21 5 3 11 5 10 1
-20 43 -1 15 6 21 5 2 11 5 10 1
-20 42 -1 10 6 21 5 1 11 5 10 1
-20 41 -1 5 6 21 3 5 11 2 3 1
-20 40 -1 25 6 27 4 5 11 2 5 3
-20 39 -1 20 6 27 5 5 11 3 7 2
-20 38 -1 15 6 27 5 4 11 3 7 2
-20 37 -1 10 6 27 5 3 11 3 7 2
-20 36 -1 5 6 27 5 2 11 3 7 2
-20 35 -1 25 6 31 5 5 11 4 8 1
-20 34 -1 20 6 31 5 3 11 4 8 1
-20 33 -1 15 6 31 5 2 11 4 8 1
-20 32 -1 10 6 31 5 1 11 4 8 1
-20 31 -1 5 6 31 4 4 30 13 33 1
-20 30 -1 25 7 12 4 5 30 13 34 2
-20 29 -1 20 7 12 4 2 30 13 34 2
-20 28 -1 15 7 12 5 5 30 14 35 1
-20 27 -1 10 7 12 5 3 30 14 35 1
-20 26 -1 5 7 12 5 1 30 14 35 1
-20 25 -1 25 7 19 5 5 30 11 28 2
-20 24 -1 20 7 19 5 4 30 11 28 2
-20 23 -1 15 7 19 5 3 30 11 28 2
-20 22 -1 10 7 19 5 2 30 11 28 2
-20 21 -1 5 7 19 5 1 30 11 28 2
-20 20 -1 25 7 26 5 5 30 8 20 4
-20 19 -1 20 7 26 5 4 30 8 20 4
-20 18 -1 15 7 26 5 3 30 8 20 4
-20 17 -1 10 7 26 5 2 30 8 20 4
-20 16 -1 5 7 26 5 1 30 8 20 4
-20 15 -1 25 7 21 3 5 30 8 18 2
-20 14 -1 20 7 21 3 2 30 8 18 2
-19 87 -1 19 5 3 2 2 26 5 7 2
-19 86 -1 20 5 3 2 4 26 5 7 2
-19 85 -1 16 5 2 3 1 26 5 9 4
-19 84 -1 17 5 2 5 3 26 5 8 3
-19 83 -1 18 5 2 5 5 26 5 8 3
-19 82 -1 19 5 2 4 2 26 6 14 5
-19 81 -1 20 5 2 4 4 26 6 14 5
-19 80 -1 16 5 5 3 1 26 6 12 3
-19 79 -1 17 5 5 4 1 26 10 25 1
-19 78 -1 18 5 5 4 2 26 10 25 1
-19 77 -1 19 5 5 4 4 26 10 25 1
-19 76 -1 20 5 5 4 5 26 10 25 1
-19 75 -1 16 5 9 3 1 26 11 29 2
-19 74 -1 17 5 9 5 3 26 15 38 1
-19 73 -1 18 5 9 5 5 26 15 38 1
-19 72 -1 19 5 9 4 2 26 16 41 2
-19 71 -1 20 5 9 4 4 26 16 41 2
-19 70 -1 16 5 15 4 2 26 16 40 1
-19 69 -1 17 5 15 4 5 26 16 40 1
-19 68 -1 18 5 15 3 1 27 13 32 3
-19 67 -1 19 5 15 3 3 27 13 32 3
-19 66 -1 20 5 15 5 5 9 1 1 1
-19 65 -1 16 5 22 3 1 9 2 3 1
-19 64 -1 17 5 22 3 3 9 2 3 1
-19 63 -1 18 5 22 5 4 9 2 4 2
-19 62 -1 19 5 22 4 1 9 3 7 3
-19 61 -1 20 5 22 4 4 9 3 7 3
-19 60 -1 16 5 30 3 2 9 3 6 2
-19 59 -1 17 5 30 4 1 9 4 9 2
-19 58 -1 18 5 30 4 2 9 4 9 2
-19 57 -1 19 5 30 4 4 9 4 9 2
-19 56 -1 20 5 30 5 5 9 8 15 1
-19 55 -1 16 6 6 4 2 10 5 9 2
-19 54 -1 17 6 6 4 4 10 5 9 2
-19 53 -1 18 6 6 3 1 10 6 11 1
-19 52 -1 19 6 6 5 3 10 6 12 2
-19 51 -1 20 6 6 5 5 10 6 12 2
-19 50 -1 24 6 14 3 5 10 7 14 1
-19 49 -1 19 6 14 5 3 10 7 15 2
-19 48 -1 14 6 14 5 1 10 7 15 2
-19 47 -1 9 6 14 4 4 10 8 17 1
-19 46 -1 4 6 14 4 1 10 8 17 1
-19 45 -1 24 6 21 5 4 11 5 10 1
-19 44 -1 19 6 21 4 5 11 1 2 2
-19 43 -1 14 6 21 4 4 11 1 2 2
-19 42 -1 9 6 21 4 2 11 1 2 2
-19 41 -1 4 6 21 3 4 11 2 3 1
-19 40 -1 24 6 27 4 4 11 2 5 3
-19 39 -1 19 6 27 4 2 11 2 5 3
-19 38 -1 14 6 27 3 5 11 3 6 1
-19 37 -1 9 6 27 3 3 11 3 6 1
-19 36 -1 4 6 27 5 1 11 3 7 2
-19 35 -1 24 6 31 5 4 11 4 8 1
-19 34 -1 19 6 31 3 5 29 16 39 3
-19 33 -1 14 6 31 3 3 29 16 39 3
-19 32 -1 9 6 31 4 5 30 13 33 1
-19 31 -1 4 6 31 4 3 30 13 33 1
-19 30 -1 24 7 12 4 4 30 13 34 2
-19 29 -1 19 7 12 4 1 30 13 34 2
-19 28 -1 14 7 12 5 4 30 14 35 1
-19 27 -1 9 7 12 5 2 30 14 35 1
-19 26 -1 4 7 12 3 4 30 10 25 1
-19 25 -1 24 7 19 4 5 30 11 27 1
-19 24 -1 19 7 19 4 4 30 11 27 1
-19 23 -1 14 7 19 4 3 30 11 27 1
-19 22 -1 9 7 19 4 1 30 11 27 1
-19 21 -1 4 7 19 3 4 30 7 14 2
-19 20 -1 24 7 26 4 5 30 8 19 3
-19 19 -1 19 7 26 4 4 30 8 19 3
-19 18 -1 14 7 26 4 3 30 8 19 3
-19 17 -1 9 7 26 4 2 30 8 19 3
-19 16 -1 4 7 26 4 1 30 8 19 3
-19 15 -1 24 7 21 3 4 30 8 18 2
-19 14 -1 19 7 21 3 1 30 8 18 2
-18 87 -1 14 5 3 1 1 26 1 1 1
-18 86 -1 15 5 3 2 5 26 5 7 2
-18 85 -1 11 5 2 3 2 26 5 9 4
-18 84 -1 12 5 2 3 4 26 5 9 4
-18 83 -1 13 5 2 3 5 26 5 9 4
-18 82 -1 14 5 2 2 3 26 6 13 4
-18 81 -1 15 5 2 4 5 26 6 14 5
-18 80 -1 11 5 5 3 2 26 6 12 3
-18 79 -1 12 5 5 3 5 26 6 12 3
-18 78 -1 13 5 5 4 3 26 10 25 1
-18 77 -1 14 5 5 2 1 26 11 28 1
-18 76 -1 15 5 5 2 3 26 11 28 1
-18 75 -1 11 5 9 3 2 26 11 29 2
-18 74 -1 12 5 9 3 5 26 11 29 2
-18 73 -1 13 5 9 2 1 26 12 32 3
-18 72 -1 14 5 9 2 3 26 12 32 3
-18 71 -1 15 5 9 4 5 26 16 41 2
-18 70 -1 11 5 15 4 3 26 16 40 1
-18 69 -1 12 5 15 2 1 27 13 31 2
-18 68 -1 13 5 15 3 2 27 13 32 3
-18 67 -1 14 5 15 3 4 27 13 32 3
-18 66 -1 15 5 15 3 5 27 13 32 3
-18 65 -1 11 5 22 3 2 9 2 3 1
-18 64 -1 12 5 22 3 4 9 2 3 1
-18 63 -1 13 5 22 3 5 9 2 3 1
-18 62 -1 14 5 22 4 2 9 3 7 3
-18 61 -1 15 5 22 4 5 9 3 7 3
-18 60 -1 11 5 30 3 3 9 3 6 2
-18 59 -1 12 5 30 1 1 9 4 8 1
-18 58 -1 13 5 30 4 3 9 4 9 2
-18 57 -1 14 5 30 4 5 9 4 9 2
-18 56 -1 15 5 30 2 3 10 1 1 1
-18 55 -1 11 6 6 2 1 10 1 2 2
-18 54 -1 12 6 6 4 5 10 5 9 2
-18 53 -1 13 6 6 3 2 10 6 11 1
-18 52 -1 14 6 6 3 4 10 6 11 1
-18 51 -1 15 6 6 3 5 10 6 11 1
-18 50 -1 23 6 14 3 4 10 7 14 1
-18 49 -1 18 6 14 3 3 10 7 14 1
-18 48 -1 13 6 14 3 2 10 7 14 1
-18 47 -1 8 6 14 4 3 10 8 17 1
-18 46 -1 3 6 14 2 3 10 4 7 1
-18 45 -1 23 6 21 1 5 10 4 8 2
-18 44 -1 18 6 21 2 5 11 1 1 1
-18 43 -1 13 6 21 4 3 11 1 2 2
-18 42 -1 8 6 21 4 1 11 1 2 2
-18 41 -1 3 6 21 3 3 11 2 3 1
-18 40 -1 23 6 27 4 3 11 2 5 3
-18 39 -1 18 6 27 4 1 11 2 5 3
-18 38 -1 13 6 27 3 4 11 3 6 1
-18 37 -1 8 6 27 3 2 11 3 6 1
-18 36 -1 3 6 27 3 1 11 3 6 1
-18 35 -1 23 6 31 2 5 29 16 38 2
-18 34 -1 18 6 31 3 4 29 16 39 3
-18 33 -1 13 6 31 3 2 29 16 39 3
-18 32 -1 8 6 31 3 1 29 16 39 3
-18 31 -1 3 6 31 4 2 30 13 33 1
-18 30 -1 23 7 12 4 3 30 13 34 2
-18 29 -1 18 7 12 2 5 30 9 24 3
-18 28 -1 13 7 12 2 3 30 9 24 3
-18 27 -1 8 7 12 3 5 30 10 25 1
-18 26 -1 3 7 12 3 3 30 10 25 1
-18 25 -1 23 7 19 2 5 30 10 26 2
-18 24 -1 18 7 19 2 2 30 10 26 2
-18 23 -1 13 7 19 4 2 30 11 27 1
-18 22 -1 8 7 19 3 5 30 7 14 2
-18 21 -1 3 7 19 3 3 30 7 14 2
-18 20 -1 23 7 26 3 5 30 7 16 4
-18 19 -1 18 7 26 3 4 30 7 16 4
-18 18 -1 13 7 26 3 2 30 7 16 4
-18 17 -1 8 7 26 2 5 30 8 17 1
-18 16 -1 3 7 26 2 3 30 8 17 1
-18 15 -1 23 7 21 3 3 30 8 18 2
-18 14 -1 18 7 21 2 3 30 4 5 1
-17 87 -1 9 5 3 1 2 26 1 1 1
-17 86 -1 10 5 3 1 4 26 1 1 1
-17 85 -1 6 5 2 3 3 26 5 9 4
-17 84 -1 7 5 2 2 1 26 6 13 4
-17 83 -1 8 5 2 2 2 26 6 13 4
-17 82 -1 9 5 2 2 4 26 6 13 4
-17 81 -1 10 5 2 2 5 26 6 13 4
-17 80 -1 6 5 5 3 3 26 6 12 3
-17 79 -1 7 5 5 1 1 26 7 18 4
-17 78 -1 8 5 5 1 3 26 7 18 4
-17 77 -1 9 5 5 2 2 26 11 28 1
-17 76 -1 10 5 5 2 4 26 11 28 1
-17 75 -1 6 5 9 3 3 26 11 29 2
-17 74 -1 7 5 9 1 1 26 12 31 2
-17 73 -1 8 5 9 2 2 26 12 32 3
-17 72 -1 9 5 9 2 4 26 12 32 3
-17 71 -1 10 5 9 2 5 26 12 32 3
-17 70 -1 6 5 15 4 4 26 16 40 1
-17 69 -1 7 5 15 2 2 27 13 31 2
-17 68 -1 8 5 15 2 3 27 13 31 2
-17 67 -1 9 5 15 2 4 27 13 31 2
-17 66 -1 10 5 15 2 5 27 13 31 2
-17 65 -1 6 5 22 1 1 27 14 35 3
-17 64 -1 7 5 22 1 3 27 14 35 3
-17 63 -1 8 5 22 2 1 9 3 5 1
-17 62 -1 9 5 22 2 2 9 3 5 1
-17 61 -1 10 5 22 2 4 9 3 5 1
-17 60 -1 6 5 30 3 4 9 3 6 2
-17 59 -1 7 5 30 1 2 9 4 8 1
-17 58 -1 8 5 30 1 4 9 4 8 1
-17 57 -1 9 5 30 2 1 10 1 1 1
-17 56 -1 10 5 30 2 4 10 1 1 1
-17 55 -1 6 6 6 2 2 10 1 2 2
-17 54 -1 7 6 6 2 4 10 1 2 2
-17 53 -1 8 6 6 3 3 10 6 11 1
-17 52 -1 9 6 6 1 2 10 2 4 2
-17 51 -1 10 6 6 1 4 10 2 4 2
-17 50 -1 22 6 14 1 5 10 3 6 2
-17 49 -1 17 6 14 1 3 10 3 6 2
-17 48 -1 12 6 14 3 1 10 7 14 1
-17 47 -1 7 6 14 2 5 10 4 7 1
-17 46 -1 2 6 14 2 2 10 4 7 1
-17 45 -1 22 6 21 1 4 10 4 8 2
-17 44 -1 17 6 21 1 2 10 4 8 2
-17 43 -1 12 6 21 2 4 11 1 1 1
-17 42 -1 7 6 21 2 2 11 1 1 1
-17 41 -1 2 6 21 3 2 11 2 3 1
-17 40 -1 22 6 27 2 5 11 2 4 2
-17 39 -1 17 6 27 2 3 11 2 4 2
-17 38 -1 12 6 27 2 1 11 2 4 2
-17 37 -1 7 6 27 1 4 29 15 36 3
-17 36 -1 2 6 27 1 2 29 15 36 3
-17 35 -1 22 6 31 2 4 29 16 38 2
-17 34 -1 17 6 31 2 3 29 16 38 2
-17 33 -1 12 6 31 2 2 29 16 38 2
-17 32 -1 7 6 31 2 1 29 16 38 2
-17 31 -1 2 6 31 4 1 30 13 33 1
-17 30 -1 22 7 12 1 5 30 9 23 2
-17 29 -1 17 7 12 2 4 30 9 24 3
-17 28 -1 12 7 12 2 2 30 9 24 3
-17 27 -1 7 7 12 2 1 30 9 24 3
-17 26 -1 2 7 12 3 2 30 10 25 1
-17 25 -1 22 7 19 2 4 30 10 26 2
-17 24 -1 17 7 19 2 1 30 10 26 2
-17 23 -1 12 7 19 1 4 30 6 12 3
-17 22 -1 7 7 19 1 2 30 6 12 3
-17 21 -1 2 7 19 3 2 30 7 14 2
-17 20 -1 22 7 26 1 5 30 7 15 3
-17 19 -1 17 7 26 3 3 30 7 16 4
-17 18 -1 12 7 26 3 1 30 7 16 4
-17 17 -1 7 7 26 2 4 30 8 17 1
-17 16 -1 2 7 26 2 2 30 8 17 1
-17 15 -1 22 7 21 2 5 30 4 5 1
-17 14 -1 17 7 21 2 2 30 4 5 1
-16 87 -1 4 5 3 1 3 26 1 1 1
-16 86 -1 5 5 3 1 5 26 1 1 1
-16 85 -1 1 5 2 1 1 26 6 11 2
-16 84 -1 2 5 2 1 2 26 6 11 2
-16 83 -1 3 5 2 1 3 26 6 11 2
-16 82 -1 4 5 2 1 4 26 6 11 2
-16 81 -1 5 5 2 1 5 26 6 11 2
-16 80 -1 1 5 5 3 4 26 6 12 3
-16 79 -1 2 5 5 1 2 26 7 18 4
-16 78 -1 3 5 5 1 4 26 7 18 4
-16 77 -1 4 5 5 1 5 26 7 18 4
-16 76 -1 5 5 5 2 5 26 11 28 1
-16 75 -1 1 5 9 3 4 26 11 29 2
-16 74 -1 2 5 9 1 2 26 12 31 2
-16 73 -1 3 5 9 1 3 26 12 31 2
-16 72 -1 4 5 9 1 4 26 12 31 2
-16 71 -1 5 5 9 1 5 26 12 31 2
-16 70 -1 1 5 15 1 1 27 13 30 1
-16 69 -1 2 5 15 1 2 27 13 30 1
-16 68 -1 3 5 15 1 3 27 13 30 1
-16 67 -1 4 5 15 1 4 27 13 30 1
-16 66 -1 5 5 15 1 5 27 13 30 1
-16 65 -1 1 5 22 1 2 27 14 35 3
-16 64 -1 2 5 22 1 4 27 14 35 3
-16 63 -1 3 5 22 1 5 27 14 35 3
-16 62 -1 4 5 22 2 3 9 3 5 1
-16 61 -1 5 5 22 2 5 9 3 5 1
-16 60 -1 1 5 30 3 5 9 3 6 2
-16 59 -1 2 5 30 1 3 9 4 8 1
-16 58 -1 3 5 30 1 5 9 4 8 1
-16 57 -1 4 5 30 2 2 10 1 1 1
-16 56 -1 5 5 30 2 5 10 1 1 1
-16 55 -1 1 6 6 2 3 10 1 2 2
-16 54 -1 2 6 6 2 5 10 1 2 2
-16 53 -1 3 6 6 1 1 10 2 4 2
-16 52 -1 4 6 6 1 3 10 2 4 2
-16 51 -1 5 6 6 1 5 10 2 4 2
-16 50 -1 21 6 14 1 4 10 3 6 2
-16 49 -1 16 6 14 1 2 10 3 6 2
-16 48 -1 11 6 14 1 1 10 3 6 2
-16 47 -1 6 6 14 2 4 10 4 7 1
-16 46 -1 1 6 14 2 1 10 4 7 1
-16 45 -1 21 6 21 1 3 10 4 8 2
-16 44 -1 16 6 21 1 1 10 4 8 2
-16 43 -1 11 6 21 2 3 11 1 1 1
-16 42 -1 6 6 21 2 1 11 1 1 1
-16 41 -1 1 6 21 3 1 11 2 3 1
-16 40 -1 21 6 27 2 4 11 2 4 2
-16 39 -1 16 6 27 2 2 11 2 4 2
-16 38 -1 11 6 27 1 5 29 15 36 3
-16 37 -1 6 6 27 1 3 29 15 36 3
-16 36 -1 1 6 27 1 1 29 15 36 3
-16 35 -1 21 6 31 1 5 29 16 37 1
-16 34 -1 16 6 31 1 4 29 16 37 1
-16 33 -1 11 6 31 1 3 29 16 37 1
-16 32 -1 6 6 31 1 2 29 16 37 1
-16 31 -1 1 6 31 1 1 29 16 37 1
-16 30 -1 21 7 12 1 4 30 9 23 2
-16 29 -1 16 7 12 1 3 30 9 23 2
-16 28 -1 11 7 12 1 2 30 9 23 2
-16 27 -1 6 7 12 1 1 30 9 23 2
-16 26 -1 1 7 12 3 1 30 10 25 1
-16 25 -1 21 7 19 2 3 30 10 26 2
-16 24 -1 16 7 19 1 5 30 6 12 3
-16 23 -1 11 7 19 1 3 30 6 12 3
-16 22 -1 6 7 19 1 1 30 6 12 3
-16 21 -1 1 7 19 3 1 30 7 14 2
-16 20 -1 21 7 26 1 4 30 7 15 3
-16 19 -1 16 7 26 1 3 30 7 15 3
-16 18 -1 11 7 26 1 2 30 7 15 3
-16 17 -1 6 7 26 1 1 30 7 15 3
-16 16 -1 1 7 26 2 1 30 8 17 1
-16 15 -1 21 7 21 2 4 30 4 5 1
-16 14 -1 16 7 21 2 1 30 4 5 1
-15 85 -1 21 5 3 3 1 26 2 2 1
-15 84 -1 22 5 3 3 3 26 2 2 1
-15 83 -1 23 5 3 4 1 26 6 10 1
-15 82 -1 24 5 3 4 2 26 6 10 1
-15 81 -1 25 5 3 4 4 26 6 10 1
-15 80 -1 21 5 6 5 1 26 7 17 3
-15 79 -1 22 5 6 5 2 26 7 17 3
-15 78 -1 23 5 6 5 3 26 7 17 3
-15 77 -1 24 5 6 5 4 26 7 17 3
-15 76 -1 25 5 6 5 5 26 7 17 3
-15 75 -1 21 5 10 5 1 26 12 30 1
-15 74 -1 22 5 10 5 2 26 12 30 1
-15 73 -1 23 5 10 5 3 26 12 30 1
-15 72 -1 24 5 10 5 5 26 12 30 1
-15 71 -1 25 5 10 4 3 27 9 20 2
-15 70 -1 21 5 16 4 1 27 9 21 3
-15 69 -1 22 5 16 4 3 27 9 21 3
-15 68 -1 23 5 16 5 1 27 14 34 2
-15 67 -1 24 5 16 5 2 27 14 34 2
-15 66 -1 25 5 16 5 4 27 14 34 2
-15 65 -1 21 5 23 4 1 27 14 33 1
-15 64 -1 22 5 23 4 4 27 14 33 1
-15 63 -1 23 5 23 5 1 27 15 37 2
-15 62 -1 24 5 23 5 2 27 15 37 2
-15 61 -1 25 5 23 5 4 27 15 37 2
-15 60 -1 21 5 31 5 1 27 16 39 2
-15 59 -1 22 5 31 5 2 27 16 39 2
-15 58 -1 23 5 31 5 3 27 16 39 2
-15 57 -1 24 5 31 5 5 27 16 39 2
-15 56 -1 25 5 31 4 3 28 13 40 2
-15 55 -1 21 6 7 4 1 28 13 39 1
-15 54 -1 22 6 7 5 1 10 2 3 1
-15 53 -1 23 6 7 5 2 10 2 3 1
-15 52 -1 24 6 7 5 3 10 2 3 1
-15 51 -1 25 6 7 5 4 10 2 3 1
-15 50 -1 25 6 15 5 5 10 3 5 1
-15 49 -1 20 6 15 5 3 10 3 5 1
-15 48 -1 15 6 15 5 2 10 3 5 1
-15 47 -1 10 6 15 5 1 10 3 5 1
-15 46 -1 5 6 15 4 4 28 16 45 1
-15 45 -1 25 6 22 4 5 28 16 46 2
-15 44 -1 20 6 22 5 5 29 13 31 2
-15 43 -1 15 6 22 5 4 29 13 31 2
-15 42 -1 10 6 22 5 3 29 13 31 2
-15 41 -1 5 6 22 5 2 29 13 31 2
-15 40 -1 25 6 28 5 5 29 14 33 2
-15 39 -1 20 6 28 5 4 29 14 33 2
-15 38 -1 15 6 28 5 3 29 14 33 2
-15 37 -1 10 6 28 4 5 29 15 34 1
-15 36 -1 5 6 28 4 3 29 15 34 1
-15 35 -1 25 6 32 5 5 29 15 35 2
-15 34 -1 20 6 32 5 3 29 15 35 2
-15 33 -1 15 6 32 5 1 29 15 35 2
-15 32 -1 10 6 32 4 4 29 12 29 3
-15 31 -1 5 6 32 4 2 29 12 29 3
-15 30 -1 25 7 13 4 5 29 12 28 2
-15 29 -1 20 7 13 5 5 30 9 22 1
-15 28 -1 15 7 13 5 4 30 9 22 1
-15 27 -1 10 7 13 5 2 30 9 22 1
-15 26 -1 5 7 13 5 1 30 9 22 1
-15 25 -1 25 7 20 5 5 30 6 11 2
-15 24 -1 20 7 20 5 4 30 6 11 2
-15 23 -1 15 7 20 5 3 30 6 11 2
-15 22 -1 10 7 20 5 2 30 6 11 2
-15 21 -1 5 7 20 5 1 30 6 11 2
-15 20 -1 25 7 14 5 5 30 7 13 1
-15 19 -1 20 7 14 5 3 30 7 13 1
-15 18 -1 15 7 14 5 1 30 7 13 1
-15 17 -1 10 7 14 4 4 30 3 4 1
-15 16 -1 5 7 14 4 2 30 3 4 1
-14 85 -1 16 5 3 3 2 26 2 2 1
-14 84 -1 17 5 3 3 4 26 2 2 1
-14 83 -1 18 5 3 3 5 26 2 2 1
-14 82 -1 19 5 3 4 3 26 6 10 1
-14 81 -1 20 5 3 4 5 26 6 10 1
-14 80 -1 16 5 6 4 1 26 7 16 2
-14 79 -1 17 5 6 4 2 26 7 16 2
-14 78 -1 18 5 6 4 3 26 7 16 2
-14 77 -1 19 5 6 4 4 26 7 16 2
-14 76 -1 20 5 6 4 5 26 7 16 2
-14 75 -1 16 5 10 3 1 26 8 21 3
-14 74 -1 17 5 10 3 3 26 8 21 3
-14 73 -1 18 5 10 5 4 26 12 30 1
-14 72 -1 19 5 10 4 1 27 9 20 2
-14 71 -1 20 5 10 4 4 27 9 20 2
-14 70 -1 16 5 16 4 2 27 9 21 3
-14 69 -1 17 5 16 4 4 27 9 21 3
-14 68 -1 18 5 16 4 5 27 9 21 3
-14 67 -1 19 5 16 5 3 27 14 34 2
-14 66 -1 20 5 16 5 5 27 14 34 2
-14 65 -1 16 5 23 4 2 27 14 33 1
-14 64 -1 17 5 23 3 1 27 15 36 1
-14 63 -1 18 5 23 3 2 27 15 36 1
-14 62 -1 19 5 23 5 3 27 15 37 2
-14 61 -1 20 5 23 5 5 27 15 37 2
-14 60 -1 16 5 31 3 1 27 16 38 1
-14 59 -1 17 5 31 3 3 27 16 38 1
-14 58 -1 18 5 31 5 4 27 16 39 2
-14 57 -1 19 5 31 4 1 28 13 40 2
-14 56 -1 20 5 31 4 4 28 13 40 2
-14 55 -1 16 6 7 4 2 28 13 39 1
-14 54 -1 17 6 7 4 5 28 13 39 1
-14 53 -1 18 6 7 3 1 28 14 42 2
-14 52 -1 19 6 7 3 3 28 14 42 2
-14 51 -1 20 6 7 5 5 10 2 3 1
-14 50 -1 24 6 15 5 4 10 3 5 1
-14 49 -1 19 6 15 3 5 28 15 44 2
-14 48 -1 14 6 15 3 3 28 15 44 2
-14 47 -1 9 6 15 4 5 28 16 45 1
-14 46 -1 4 6 15 4 3 28 16 45 1
-14 45 -1 24 6 22 4 4 28 16 46 2
-14 44 -1 19 6 22 4 2 28 16 46 2
-14 43 -1 14 6 22 3 5 29 13 30 1
-14 42 -1 9 6 22 3 3 29 13 30 1
-14 41 -1 4 6 22 5 1 29 13 31 2
-14 40 -1 24 6 28 3 5 29 14 32 1
-14 39 -1 19 6 28 3 3 29 14 32 1
-14 38 -1 14 6 28 5 2 29 14 33 2
-14 37 -1 9 6 28 5 1 29 14 33 2
-14 36 -1 4 6 28 4 2 29 15 34 1
-14 35 -1 24 6 32 5 4 29 15 35 2
-14 34 -1 19 6 32 5 2 29 15 35 2
-14 33 -1 14 6 32 4 5 29 12 29 3
-14 32 -1 9 6 32 4 3 29 12 29 3
-14 31 -1 4 6 32 4 1 29 12 29 3
-14 30 -1 24 7 13 4 4 29 12 28 2
-14 29 -1 19 7 13 4 2 29 12 28 2
-14 28 -1 14 7 13 5 3 30 9 22 1
-14 27 -1 9 7 13 3 4 30 5 8 3
-14 26 -1 4 7 13 3 2 30 5 8 3
-14 25 -1 24 7 20 4 5 30 6 10 1
-14 24 -1 19 7 20 4 4 30 6 10 1
-14 23 -1 14 7 20 4 3 30 6 10 1
-14 22 -1 9 7 20 4 2 30 6 10 1
-14 21 -1 4 7 20 4 1 30 6 10 1
-14 20 -1 24 7 14 5 4 30 7 13 1
-14 19 -1 19 7 14 5 2 30 7 13 1
-14 18 -1 14 7 14 4 5 30 3 4 1
-14 17 -1 9 7 14 4 3 30 3 4 1
-14 16 -1 4 7 14 4 1 30 3 4 1
-13 80 -1 11 5 6 1 1 26 3 4 2
-13 79 -1 12 5 6 3 1 26 7 15 1
-13 78 -1 13 5 6 3 3 26 7 15 1
-13 77 -1 14 5 6 3 5 26 7 15 1
-13 76 -1 15 5 6 2 3 26 8 19 1
-13 75 -1 11 5 10 3 2 26 8 21 3
-13 74 -1 12 5 10 3 4 26 8 21 3
-13 73 -1 13 5 10 3 5 26 8 21 3
-13 72 -1 14 5 10 4 2 27 9 20 2
-13 71 -1 15 5 10 4 5 27 9 20 2
-13 70 -1 11 5 16 2 1 27 9 19 1
-13 69 -1 12 5 16 2 4 27 9 19 1
-13 68 -1 13 5 16 3 1 27 10 23 2
-13 67 -1 14 5 16 3 2 27 10 23 2
-13 66 -1 15 5 16 3 4 27 10 23 2
-13 65 -1 11 5 23 4 3 27 14 33 1
-13 64 -1 12 5 23 4 5 27 14 33 1
-13 63 -1 13 5 23 3 3 27 15 36 1
-13 62 -1 14 5 23 3 4 27 15 36 1
-13 61 -1 15 5 23 3 5 27 15 36 1
-13 60 -1 11 5 31 3 2 27 16 38 1
-13 59 -1 12 5 31 3 4 27 16 38 1
-13 58 -1 13 5 31 3 5 27 16 38 1
-13 57 -1 14 5 31 4 2 28 13 40 2
-13 56 -1 15 5 31 4 5 28 13 40 2
-13 55 -1 11 6 7 4 3 28 13 39 1
-13 54 -1 12 6 7 2 1 28 14 41 1
-13 53 -1 13 6 7 3 2 28 14 42 2
-13 52 -1 14 6 7 3 4 28 14 42 2
-13 51 -1 15 6 7 3 5 28 14 42 2
-13 50 -1 23 6 15 2 5 28 15 43 1
-13 49 -1 18 6 15 3 4 28 15 44 2
-13 48 -1 13 6 15 3 2 28 15 44 2
-13 47 -1 8 6 15 3 1 28 15 44 2
-13 46 -1 3 6 15 4 2 28 16 45 1
-13 45 -1 23 6 22 4 3 28 16 46 2
-13 44 -1 18 6 22 4 1 28 16 46 2
-13 43 -1 13 6 22 3 4 29 13 30 1
-13 42 -1 8 6 22 3 2 29 13 30 1
-13 41 -1 3 6 22 3 1 29 13 30 1
-13 40 -1 23 6 28 3 4 29 14 32 1
-13 39 -1 18 6 28 3 2 29 14 32 1
-13 38 -1 13 6 28 3 1 29 14 32 1
-13 37 -1 8 6 28 4 4 29 15 34 1
-13 36 -1 3 6 28 4 1 29 15 34 1
-13 35 -1 23 6 32 3 5 29 11 26 2
-13 34 -1 18 6 32 3 4 29 11 26 2
-13 33 -1 13 6 32 3 2 29 11 26 2
-13 32 -1 8 6 32 2 5 29 12 27 1
-13 31 -1 3 6 32 2 3 29 12 27 1
-13 30 -1 23 7 13 4 3 29 12 28 2
-13 29 -1 18 7 13 4 1 29 12 28 2
-13 28 -1 13 7 13 3 5 30 5 8 3
-13 27 -1 8 7 13 3 3 30 5 8 3
-13 26 -1 3 7 13 3 1 30 5 8 3
-13 25 -1 23 7 20 2 5 30 5 7 2
-13 24 -1 18 7 20 3 5 30 6 9 4
-13 23 -1 13 7 20 3 4 30 6 9 4
-13 22 -1 8 7 20 3 2 30 6 9 4
-13 21 -1 3 7 20 1 3 30 2 3 2
-12 80 -1 6 5 6 1 2 26 3 4 2
-12 79 -1 7 5 6 3 2 26 7 15 1
-12 78 -1 8 5 6 3 4 26 7 15 1
-12 77 -1 9 5 6 2 1 26 8 19 1
-12 76 -1 10 5 6 2 4 26 8 19 1
-12 75 -1 6 5 10 2 1 26 8 20 2
-12 74 -1 7 5 10 2 3 26 8 20 2
-12 73 -1 8 5 10 2 5 26 8 20 2
-12 72 -1 9 5 10 1 2 27 5 10 1
-12 71 -1 10 5 10 1 4 27 5 10 1
-12 70 -1 6 5 16 2 2 27 9 19 1
-12 69 -1 7 5 16 2 5 27 9 19 1
-12 68 -1 8 5 16 1 2 27 10 22 1
-12 67 -1 9 5 16 3 3 27 10 23 2
-12 66 -1 10 5 16 3 5 27 10 23 2
-12 65 -1 6 5 23 2 1 27 11 26 3
-12 64 -1 7 5 23 2 2 27 11 26 3
-12 63 -1 8 5 23 2 3 27 11 26 3
-12 62 -1 9 5 23 2 4 27 11 26 3
-12 61 -1 10 5 23 2 5 27 11 26 3
-12 60 -1 6 5 31 2 1 27 12 29 3
-12 59 -1 7 5 31 2 3 27 12 29 3
-12 58 -1 8 5 31 2 5 27 12 29 3
-12 57 -1 9 5 31 1 2 28 9 28 4
-12 56 -1 10 5 31 1 4 28 9 28 4
-12 55 -1 6 6 7 4 4 28 13 39 1
-12 54 -1 7 6 7 2 2 28 14 41 1
-12 53 -1 8 6 7 2 3 28 14 41 1
-12 52 -1 9 6 7 2 4 28 14 41 1
-12 51 -1 10 6 7 2 5 28 14 41 1
-12 50 -1 22 6 15 2 4 28 15 43 1
-12 49 -1 17 6 15 2 3 28 15 43 1
-12 48 -1 12 6 15 2 2 28 15 43 1
-12 47 -1 7 6 15 2 1 28 15 43 1
-12 46 -1 2 6 15 4 1 28 16 45 1
-12 45 -1 22 6 22 1 5 28 12 38 4
-12 44 -1 17 6 22 1 3 28 12 38 4
-12 43 -1 12 6 22 2 5 29 9 21 3
-12 42 -1 7 6 22 2 4 29 9 21 3
-12 41 -1 2 6 22 2 2 29 9 21 3
-12 40 -1 22 6 28 2 5 29 10 24 3
-12 39 -1 17 6 28 2 4 29 10 24 3
-12 38 -1 12 6 28 2 3 29 10 24 3
-12 37 -1 7 6 28 2 2 29 10 24 3
-12 36 -1 2 6 28 2 1 29 10 24 3
-12 35 -1 22 6 32 1 5 29 11 25 1
-12 34 -1 17 6 32 3 3 29 11 26 2
-12 33 -1 12 6 32 3 1 29 11 26 2
-12 32 -1 7 6 32 2 4 29 12 27 1
-12 31 -1 2 6 32 2 2 29 12 27 1
-12 30 -1 22 7 13 1 5 29 8 18 3
-12 29 -1 17 7 13 1 3 29 8 18 3
-12 28 -1 12 7 13 2 5 30 5 6 1
-12 27 -1 7 7 13 2 4 30 5 6 1
-12 26 -1 2 7 13 2 2 30 5 6 1
-12 25 -1 22 7 20 2 4 30 5 7 2
-12 24 -1 17 7 20 2 2 30 5 7 2
-12 23 -1 12 7 20 3 3 30 6 9 4
-12 22 -1 7 7 20 3 1 30 6 9 4
-12 21 -1 2 7 20 1 2 30 2 3 2
-11 80 -1 1 5 6 1 3 26 3 4 2
-11 79 -1 2 5 6 1 4 26 3 4 2
-11 78 -1 3 5 6 1 5 26 3 4 2
-11 77 -1 4 5 6 2 2 26 8 19 1
-11 76 -1 5 5 6 2 5 26 8 19 1
-11 75 -1 1 5 10 2 2 26 8 20 2
-11 74 -1 2 5 10 2 4 26 8 20 2
-11 73 -1 3 5 10 1 1 27 5 10 1
-11 72 -1 4 5 10 1 3 27 5 10 1
-11 71 -1 5 5 10 1 5 27 5 10 1
-11 70 -1 1 5 16 2 3 27 9 19 1
-11 69 -1 2 5 16 1 1 27 10 22 1
-11 68 -1 3 5 16 1 3 27 10 22 1
-11 67 -1 4 5 16 1 4 27 10 22 1
-11 66 -1 5 5 16 1 5 27 10 22 1
-11 65 -1 1 5 23 1 1 27 11 25 2
-11 64 -1 2 5 23 1 2 27 11 25 2
-11 63 -1 3 5 23 1 3 27 11 25 2
-11 62 -1 4 5 23 1 4 27 11 25 2
-11 61 -1 5 5 23 1 5 27 11 25 2
-11 60 -1 1 5 31 2 2 27 12 29 3
-11 59 -1 2 5 31 2 4 27 12 29 3
-11 58 -1 3 5 31 1 1 28 9 28 4
-11 57 -1 4 5 31 1 3 28 9 28 4
-11 56 -1 5 5 31 1 5 28 9 28 4
-11 55 -1 1 6 7 1 1 28 10 31 3
-11 54 -1 2 6 7 1 2 28 10 31 3
-11 53 -1 3 6 7 1 3 28 10 31 3
-11 52 -1 4 6 7 1 4 28 10 31 3
-11 51 -1 5 6 7 1 5 28 10 31 3
-11 50 -1 21 6 15 1 5 28 11 34 3
-11 49 -1 16 6 15 1 4 28 11 34 3
-11 48 -1 11 6 15 1 3 28 11 34 3
-11 47 -1 6 6 15 1 2 28 11 34 3
-11 46 -1 1 6 15 1 1 28 11 34 3
-11 45 -1 21 6 22 1 4 28 12 38 4
-11 44 -1 16 6 22 1 2 28 12 38 4
-11 43 -1 11 6 22 1 1 28 12 38 4
-11 42 -1 6 6 22 2 3 29 9 21 3
-11 41 -1 1 6 22 2 1 29 9 21 3
-11 40 -1 21 6 28 1 5 29 10 23 2
-11 39 -1 16 6 28 1 4 29 10 23 2
-11 38 -1 11 6 28 1 3 29 10 23 2
-11 37 -1 6 6 28 1 2 29 10 23 2
-11 36 -1 1 6 28 1 1 29 10 23 2
-11 35 -1 21 6 32 1 4 29 11 25 1
-11 34 -1 16 6 32 1 3 29 11 25 1
-11 33 -1 11 6 32 1 2 29 11 25 1
-11 32 -1 6 6 32 1 1 29 11 25 1
-11 31 -1 1 6 32 2 1 29 12 27 1
-11 30 -1 21 7 13 1 4 29 8 18 3
-11 29 -1 16 7 13 1 2 29 8 18 3
-11 28 -1 11 7 13 1 1 29 8 18 3
-11 27 -1 6 7 13 2 3 30 5 6 1
-11 26 -1 1 7 13 2 1 30 5 6 1
-11 25 -1 21 7 20 2 3 30 5 7 2
-11 24 -1 16 7 20 2 1 30 5 7 2
-11 23 -1 11 7 20 1 5 30 2 3 2
-11 22 -1 6 7 20 1 4 30 2 3 2
-11 21 -1 1 7 20 1 1 30 2 3 2
-10 80 -1 21 5 25 2 1 26 3 3 1
-10 79 -1 22 5 25 2 3 26 3 3 1
-10 78 -1 23 5 25 2 5 26 3 3 1
-10 77 -1 24 5 25 1 2 26 4 5 1
-10 76 -1 25 5 25 1 4 26 4 5 1
-10 75 -1 21 5 11 3 1 27 1 3 3
-10 74 -1 22 5 11 5 1 27 5 9 3
-10 73 -1 23 5 11 5 2 27 5 9 3
-10 72 -1 24 5 11 5 3 27 5 9 3
-10 71 -1 25 5 11 5 4 27 5 9 3
-10 70 -1 21 5 17 5 1 27 6 13 3
-10 69 -1 22 5 17 5 2 27 6 13 3
-10 68 -1 23 5 17 5 3 27 6 13 3
-10 67 -1 24 5 17 5 4 27 6 13 3
-10 66 -1 25 5 17 5 5 27 6 13 3
-10 65 -1 21 5 24 5 1 27 11 24 1
-10 64 -1 22 5 24 5 3 27 11 24 1
-10 63 -1 23 5 24 5 4 27 11 24 1
-10 62 -1 24 5 24 4 1 27 12 27 1
-10 61 -1 25 5 24 4 4 27 12 27 1
-10 60 -1 21 6 1 4 1 27 12 28 2
-10 59 -1 22 6 1 4 3 27 12 28 2
-10 58 -1 23 6 1 5 1 28 9 27 3
-10 57 -1 24 6 1 5 2 28 9 27 3
-10 56 -1 25 6 1 5 4 28 9 27 3
-10 55 -1 21 6 8 4 1 28 9 26 2
-10 54 -1 22 6 8 4 3 28 9 26 2
-10 53 -1 23 6 8 5 1 28 10 30 2
-10 52 -1 24 6 8 5 2 28 10 30 2
-10 51 -1 25 6 8 5 4 28 10 30 2
-10 50 -1 25 6 16 5 5 28 11 33 2
-10 49 -1 20 6 16 5 4 28 11 33 2
-10 48 -1 15 6 16 5 2 28 11 33 2
-10 47 -1 10 6 16 4 5 28 12 36 2
-10 46 -1 5 6 16 4 2 28 12 36 2
-10 45 -1 25 6 23 5 5 28 12 37 3
-10 44 -1 20 6 23 5 4 28 12 37 3
-10 43 -1 15 6 23 5 2 28 12 37 3
-10 42 -1 10 6 23 4 5 29 9 19 1
-10 41 -1 5 6 23 4 2 29 9 19 1
-10 40 -1 25 6 29 4 5 29 9 20 2
-10 39 -1 20 6 29 4 3 29 9 20 2
-10 38 -1 15 6 29 5 5 29 10 22 1
-10 37 -1 10 6 29 5 3 29 10 22 1
-10 36 -1 5 6 29 5 2 29 10 22 1
-10 35 -1 25 6 30 5 5 29 7 15 3
-10 34 -1 20 6 30 5 4 29 7 15 3
-10 33 -1 15 6 30 5 3 29 7 15 3
-10 32 -1 10 6 30 5 2 29 7 15 3
-10 31 -1 5 6 30 5 1 29 7 15 3
-10 30 -1 25 6 33 5 5 29 8 17 2
-10 29 -1 20 6 33 5 4 29 8 17 2
-10 28 -1 15 6 33 5 3 29 8 17 2
-10 27 -1 10 6 33 5 2 29 8 17 2
-10 26 -1 5 6 33 3 3 29 4 7 3
-10 25 -1 25 7 14 2 5 30 1 1 1
-10 24 -1 20 7 14 2 3 30 1 1 1
-10 23 -1 15 7 14 3 5 30 2 2 1
-10 22 -1 10 7 14 3 4 30 2 2 1
-10 21 -1 5 7 14 3 2 30 2 2 1
-9 80 -1 16 5 25 2 2 26 3 3 1
-9 79 -1 17 5 25 2 4 26 3 3 1
-9 78 -1 18 5 25 1 1 26 4 5 1
-9 77 -1 19 5 25 1 3 26 4 5 1
-9 76 -1 20 5 25 1 5 26 4 5 1
-9 75 -1 16 5 11 3 2 27 1 3 3
-9 74 -1 17 5 11 4 1 27 5 8 2
-9 73 -1 18 5 11 4 2 27 5 8 2
-9 72 -1 19 5 11 4 3 27 5 8 2
-9 71 -1 20 5 11 5 5 27 5 9 3
-9 70 -1 16 5 17 4 1 27 6 12 2
-9 69 -1 17 5 17 4 2 27 6 12 2
-9 68 -1 18 5 17 4 3 27 6 12 2
-9 67 -1 19 5 17 4 4 27 6 12 2
-9 66 -1 20 5 17 2 2 27 7 14 1
-9 65 -1 16 5 24 5 2 27 11 24 1
-9 64 -1 17 5 24 3 2 27 7 16 3
-9 63 -1 18 5 24 5 5 27 11 24 1
-9 62 -1 19 5 24 4 2 27 12 27 1
-9 61 -1 20 5 24 4 5 27 12 27 1
-9 60 -1 16 6 1 4 2 27 12 28 2
-9 59 -1 17 6 1 4 4 27 12 28 2
-9 58 -1 18 6 1 3 1 28 9 25 1
-9 57 -1 19 6 1 5 3 28 9 27 3
-9 56 -1 20 6 1 5 5 28 9 27 3
-9 55 -1 16 6 8 4 2 28 9 26 2
-9 54 -1 17 6 8 4 4 28 9 26 2
-9 53 -1 18 6 8 3 1 28 10 29 1
-9 52 -1 19 6 8 5 3 28 10 30 2
-9 51 -1 20 6 8 5 5 28 10 30 2
-9 50 -1 24 6 16 3 5 28 11 32 1
-9 49 -1 19 6 16 5 3 28 11 33 2
-9 48 -1 14 6 16 5 1 28 11 33 2
-9 47 -1 9 6 16 4 4 28 12 36 2
-9 46 -1 4 6 16 4 1 28 12 36 2
-9 45 -1 24 6 23 3 5 28 12 35 1
-9 44 -1 19 6 23 5 3 28 12 37 3
-9 43 -1 14 6 23 5 1 28 12 37 3
-9 42 -1 9 6 23 4 4 29 9 19 1
-9 41 -1 4 6 23 4 1 29 9 19 1
-9 40 -1 24 6 29 4 4 29 9 20 2
-9 39 -1 19 6 29 4 2 29 9 20 2
-9 38 -1 14 6 29 5 4 29 10 22 1
-9 37 -1 9 6 29 3 4 29 6 12 3
-9 36 -1 4 6 29 5 1 29 10 22 1
-9 35 -1 24 6 30 2 5 29 6 11 2
-9 34 -1 19 6 30 4 5 29 7 14 2
-9 33 -1 14 6 30 4 4 29 7 14 2
-9 32 -1 9 6 30 4 3 29 7 14 2
-9 31 -1 4 6 30 4 2 29 7 14 2
-9 30 -1 24 6 33 4 5 29 8 16 1
-9 29 -1 19 6 33 4 3 29 8 16 1
-9 28 -1 14 6 33 4 1 29 8 16 1
-9 27 -1 9 6 33 5 1 29 8 17 2
-9 26 -1 4 6 33 3 2 29 4 7 3
-9 25 -1 24 7 14 2 4 30 1 1 1
-9 24 -1 19 7 14 2 2 30 1 1 1
-9 23 -1 14 7 14 2 1 30 1 1 1
-9 22 -1 9 7 14 3 3 30 2 2 1
-9 21 -1 4 7 14 3 1 30 2 2 1
-8 75 -1 11 5 11 3 3 27 1 3 3
-8 74 -1 12 5 11 3 4 27 1 3 3
-8 73 -1 13 5 11 3 5 27 1 3 3
-8 72 -1 14 5 11 4 4 27 5 8 2
-8 71 -1 15 5 11 4 5 27 5 8 2
-8 70 -1 11 5 17 3 1 27 6 11 1
-8 69 -1 12 5 17 3 2 27 6 11 1
-8 68 -1 13 5 17 3 3 27 6 11 1
-8 67 -1 14 5 17 4 5 27 6 12 2
-8 66 -1 15 5 17 2 3 27 7 14 1
-8 65 -1 11 5 24 3 1 27 7 16 3
-8 64 -1 12 5 24 3 3 27 7 16 3
-8 63 -1 13 5 24 3 4 27 7 16 3
-8 62 -1 14 5 24 4 3 27 12 27 1
-8 61 -1 15 5 24 2 3 27 8 17 1
-8 60 -1 11 6 1 2 1 27 8 18 2
-8 59 -1 12 6 1 4 5 27 12 28 2
-8 58 -1 13 6 1 3 2 28 9 25 1
-8 57 -1 14 6 1 3 4 28 9 25 1
-8 56 -1 15 6 1 3 5 28 9 25 1
-8 55 -1 11 6 8 2 1 28 5 15 3
-8 54 -1 12 6 8 4 5 28 9 26 2
-8 53 -1 13 6 8 3 2 28 10 29 1
-8 52 -1 14 6 8 3 3 28 10 29 1
-8 51 -1 15 6 8 3 4 28 10 29 1
-8 50 -1 23 6 16 3 4 28 11 32 1
-8 49 -1 18 6 16 3 2 28 11 32 1
-8 48 -1 13 6 16 3 1 28 11 32 1
-8 47 -1 8 6 16 4 3 28 12 36 2
-8 46 -1 3 6 16 2 3 28 8 23 2
-8 45 -1 23 6 23 3 4 28 12 35 1
-8 44 -1 18 6 23 3 3 28 12 35 1
-8 43 -1 13 6 23 3 2 28 12 35 1
-8 42 -1 8 6 23 4 3 29 9 19 1
-8 41 -1 3 6 23 2 3 29 5 8 1
-8 40 -1 23 6 29 2 5 29 5 9 2
-8 39 -1 18 6 29 4 1 29 9 20 2
-8 38 -1 13 6 29 3 5 29 6 12 3
-8 37 -1 8 6 29 3 3 29 6 12 3
-8 36 -1 3 6 29 3 2 29 6 12 3
-8 35 -1 23 6 30 2 4 29 6 11 2
-8 34 -1 18 6 30 3 5 29 7 13 1
-8 33 -1 13 6 30 3 3 29 7 13 1
-8 32 -1 8 6 30 3 1 29 7 13 1
-8 31 -1 3 6 30 4 1 29 7 14 2
-8 30 -1 23 6 33 4 4 29 8 16 1
-8 29 -1 18 6 33 4 2 29 8 16 1
-8 28 -1 13 6 33 3 5 29 4 7 3
-8 27 -1 8 6 33 3 4 29 4 7 3
-8 26 -1 3 6 33 3 1 29 4 7 3
-7 75 -1 6 5 11 2 1 27 1 2 2
-7 74 -1 7 5 11 2 2 27 1 2 2
-7 73 -1 8 5 11 2 3 27 1 2 2
-7 72 -1 9 5 11 2 4 27 1 2 2
-7 71 -1 10 5 11 2 5 27 1 2 2
-7 70 -1 6 5 17 1 1 27 2 4 1
-7 69 -1 7 5 17 1 3 27 2 4 1
-7 68 -1 8 5 17 3 4 27 6 11 1
-7 67 -1 9 5 17 3 5 27 6 11 1
-7 66 -1 10 5 17 2 4 27 7 14 1
-7 65 -1 6 5 24 1 1 27 7 15 2
-7 64 -1 7 5 24 1 3 27 7 15 2
-7 63 -1 8 5 24 3 5 27 7 16 3
-7 62 -1 9 5 24 2 1 27 8 17 1
-7 61 -1 10 5 24 2 4 27 8 17 1
-7 60 -1 6 6 1 2 2 27 8 18 2
-7 59 -1 7 6 1 2 4 27 8 18 2
-7 58 -1 8 6 1 3 3 28 9 25 1
-7 57 -1 9 6 1 1 2 28 5 14 2
-7 56 -1 10 6 1 1 4 28 5 14 2
-7 55 -1 6 6 8 2 2 28 5 15 3
-7 54 -1 7 6 8 2 4 28 5 15 3
-7 53 -1 8 6 8 1 1 28 6 18 3
-7 52 -1 9 6 8 1 3 28 6 18 3
-7 51 -1 10 6 8 3 5 28 10 29 1
-7 50 -1 22 6 16 3 3 28 11 32 1
-7 49 -1 17 6 16 1 4 28 7 21 3
-7 48 -1 12 6 16 1 2 28 7 21 3
-7 47 -1 7 6 16 2 5 28 8 23 2
-7 46 -1 2 6 16 2 2 28 8 23 2
-7 45 -1 22 6 23 1 5 28 8 24 3
-7 44 -1 17 6 23 1 3 28 8 24 3
-7 43 -1 12 6 23 3 1 28 12 35 1
-7 42 -1 7 6 23 2 5 29 5 8 1
-7 41 -1 2 6 23 2 2 29 5 8 1
-7 40 -1 22 6 29 2 4 29 5 9 2
-7 39 -1 17 6 29 2 2 29 5 9 2
-7 38 -1 12 6 29 1 5 29 6 10 1
-7 37 -1 7 6 29 1 3 29 6 10 1
-7 36 -1 2 6 29 3 1 29 6 12 3
-7 35 -1 22 6 30 2 3 29 6 11 2
-7 34 -1 17 6 30 3 4 29 7 13 1
-7 33 -1 12 6 30 3 2 29 7 13 1
-7 32 -1 7 6 30 1 4 29 3 4 1
-7 31 -1 2 6 30 1 2 29 3 4 1
-7 30 -1 22 6 33 2 5 29 4 6 2
-7 29 -1 17 6 33 2 4 29 4 6 2
-7 28 -1 12 6 33 2 3 29 4 6 2
-7 27 -1 7 6 33 2 2 29 4 6 2
-7 26 -1 2 6 33 2 1 29 4 6 2
-6 75 -1 1 5 11 1 1 27 1 1 1
-6 74 -1 2 5 11 1 2 27 1 1 1
-6 73 -1 3 5 11 1 3 27 1 1 1
-6 72 -1 4 5 11 1 4 27 1 1 1
-6 71 -1 5 5 11 1 5 27 1 1 1
-6 70 -1 1 5 17 1 2 27 2 4 1
-6 69 -1 2 5 17 1 4 27 2 4 1
-6 68 -1 3 5 17 1 5 27 2 4 1
-6 67 -1 4 5 17 2 1 27 7 14 1
-6 66 -1 5 5 17 2 5 27 7 14 1
-6 65 -1 1 5 24 1 2 27 7 15 2
-6 64 -1 2 5 24 1 4 27 7 15 2
-6 63 -1 3 5 24 1 5 27 7 15 2
-6 62 -1 4 5 24 2 2 27 8 17 1
-6 61 -1 5 5 24 2 5 27 8 17 1
-6 60 -1 1 6 1 2 3 27 8 18 2
-6 59 -1 2 6 1 2 5 27 8 18 2
-6 58 -1 3 6 1 1 1 28 5 14 2
-6 57 -1 4 6 1 1 3 28 5 14 2
-6 56 -1 5 6 1 1 5 28 5 14 2
-6 55 -1 1 6 8 2 3 28 5 15 3
-6 54 -1 2 6 8 2 5 28 5 15 3
-6 53 -1 3 6 8 1 2 28 6 18 3
-6 52 -1 4 6 8 1 4 28 6 18 3
-6 51 -1 5 6 8 1 5 28 6 18 3
-6 50 -1 21 6 16 1 5 28 7 21 3
-6 49 -1 16 6 16 1 3 28 7 21 3
-6 48 -1 11 6 16 1 1 28 7 21 3
-6 47 -1 6 6 16 2 4 28 8 23 2
-6 46 -1 1 6 16 2 1 28 8 23 2
-6 45 -1 21 6 23 1 4 28 8 24 3
-6 44 -1 16 6 23 1 2 28 8 24 3
-6 43 -1 11 6 23 1 1 28 8 24 3
-6 42 -1 6 6 23 2 4 29 5 8 1
-6 41 -1 1 6 23 2 1 29 5 8 1
-6 40 -1 21 6 29 2 3 29 5 9 2
-6 39 -1 16 6 29 2 1 29 5 9 2
-6 38 -1 11 6 29 1 4 29 6 10 1
-6 37 -1 6 6 29 1 2 29 6 10 1
-6 36 -1 1 6 29 1 1 29 6 10 1
-6 35 -1 21 6 30 2 2 29 6 11 2
-6 34 -1 16 6 30 2 1 29 6 11 2
-6 33 -1 11 6 30 1 5 29 3 4 1
-6 32 -1 6 6 30 1 3 29 3 4 1
-6 31 -1 1 6 30 1 1 29 3 4 1
-6 30 -1 21 6 33 1 5 29 4 5 1
-6 29 -1 16 6 33 1 4 29 4 5 1
-6 28 -1 11 6 33 1 3 29 4 5 1
-6 27 -1 6 6 33 1 2 29 4 5 1
-6 26 -1 1 6 33 1 1 29 4 5 1
-5 65 -1 21 5 25 3 1 27 3 5 1
-5 64 -1 22 5 25 3 3 27 3 5 1
-5 63 -1 23 5 25 4 1 27 4 7 2
-5 62 -1 24 5 25 4 2 27 4 7 2
-5 61 -1 25 5 25 4 4 27 4 7 2
-5 60 -1 21 6 2 4 1 27 4 6 1
-5 59 -1 22 6 2 3 1 28 1 3 3
-5 58 -1 23 6 2 5 1 28 5 13 1
-5 57 -1 24 6 2 5 2 28 5 13 1
-5 56 -1 25 6 2 5 4 28 5 13 1
-5 55 -1 21 6 9 5 1 28 6 17 2
-5 54 -1 22 6 9 5 2 28 6 17 2
-5 53 -1 23 6 9 5 3 28 6 17 2
-5 52 -1 24 6 9 5 4 28 6 17 2
-5 51 -1 25 6 9 5 5 28 6 17 2
-5 50 -1 25 6 17 5 5 28 7 20 2
-5 49 -1 20 6 17 5 4 28 7 20 2
-5 48 -1 15 6 17 5 3 28 7 20 2
-5 47 -1 10 6 17 5 2 28 7 20 2
-5 46 -1 5 6 17 5 1 28 7 20 2
-5 45 -1 25 6 24 5 5 28 8 22 1
-5 44 -1 20 6 24 5 3 28 8 22 1
-5 43 -1 15 6 24 5 1 28 8 22 1
-5 42 -1 10 6 24 3 3 28 4 12 3
-5 41 -1 5 6 24 4 5 29 1 1 1
-5 40 -1 25 6 34 2 5 29 1 2 2
-5 39 -1 20 6 34 2 3 29 1 2 2
-5 38 -1 15 6 34 2 1 29 1 2 2
-5 37 -1 10 6 34 1 4 29 2 3 1
-5 36 -1 5 6 34 1 2 29 2 3 1
-4 65 -1 16 5 25 3 2 27 3 5 1
-4 64 -1 17 5 25 3 4 27 3 5 1
-4 63 -1 18 5 25 3 5 27 3 5 1
-4 62 -1 19 5 25 4 3 27 4 7 2
-4 61 -1 20 5 25 4 5 27 4 7 2
-4 60 -1 16 6 2 4 2 27 4 6 1
-4 59 -1 17 6 2 3 2 28 1 3 3
-4 58 -1 18 6 2 3 3 28 1 3 3
-4 57 -1 19 6 2 5 3 28 5 13 1
-4 56 -1 20 6 2 5 5 28 5 13 1
-4 55 -1 16 6 9 4 1 28 6 16 1
-4 54 -1 17 6 9 4 2 28 6 16 1
-4 53 -1 18 6 9 4 3 28 6 16 1
-4 52 -1 19 6 9 4 4 28 6 16 1
-4 51 -1 20 6 9 4 5 28 6 16 1
-4 50 -1 24 6 17 4 5 28 7 19 1
-4 49 -1 19 6 17 4 4 28 7 19 1
-4 48 -1 14 6 17 4 3 28 7 19 1
-4 47 -1 9 6 17 4 2 28 7 19 1
-4 46 -1 4 6 17 4 1 28 7 19 1
-4 45 -1 24 6 24 5 4 28 8 22 1
-4 44 -1 19 6 24 5 2 28 8 22 1
-4 43 -1 14 6 24 3 5 28 4 12 3
-4 42 -1 9 6 24 3 2 28 4 12 3
-4 41 -1 4 6 24 4 4 29 1 1 1
-4 40 -1 24 6 34 2 4 29 1 2 2
-4 39 -1 19 6 34 2 2 29 1 2 2
-4 38 -1 14 6 34 1 5 29 2 3 1
-4 37 -1 9 6 34 1 3 29 2 3 1
-4 36 -1 4 6 34 1 1 29 2 3 1
-3 60 -1 11 6 2 4 3 27 4 6 1
-3 59 -1 12 6 2 2 1 28 1 2 2
-3 58 -1 13 6 2 2 2 28 1 2 2
-3 57 -1 14 6 2 3 4 28 1 3 3
-3 56 -1 15 6 2 3 5 28 1 3 3
-3 55 -1 11 6 9 3 1 28 2 6 3
-3 54 -1 12 6 9 3 2 28 2 6 3
-3 53 -1 13 6 9 3 3 28 2 6 3
-3 52 -1 14 6 9 3 4 28 2 6 3
-3 51 -1 15 6 9 3 5 28 2 6 3
-3 50 -1 23 6 17 3 5 28 3 9 3
-3 49 -1 18 6 17 3 4 28 3 9 3
-3 48 -1 13 6 17 3 3 28 3 9 3
-3 47 -1 8 6 17 3 2 28 3 9 3
-3 46 -1 3 6 17 3 1 28 3 9 3
-3 45 -1 23 6 24 2 5 28 4 11 2
-3 44 -1 18 6 24 2 4 28 4 11 2
-3 43 -1 13 6 24 3 4 28 4 12 3
-3 42 -1 8 6 24 3 1 28 4 12 3
-3 41 -1 3 6 24 4 3 29 1 1 1
-2 60 -1 6 6 2 4 4 27 4 6 1
-2 59 -1 7 6 2 1 1 28 1 1 1
-2 58 -1 8 6 2 2 3 28 1 2 2
-2 57 -1 9 6 2 2 4 28 1 2 2
-2 56 -1 10 6 2 2 5 28 1 2 2
-2 55 -1 6 6 9 2 1 28 2 5 2
-2 54 -1 7 6 9 2 2 28 2 5 2
-2 53 -1 8 6 9 2 3 28 2 5 2
-2 52 -1 9 6 9 2 4 28 2 5 2
-2 51 -1 10 6 9 2 5 28 2 5 2
-2 50 -1 22 6 17 2 5 28 3 8 2
-2 49 -1 17 6 17 2 4 28 3 8 2
-2 48 -1 12 6 17 2 3 28 3 8 2
-2 47 -1 7 6 17 2 2 28 3 8 2
-2 46 -1 2 6 17 2 1 28 3 8 2
-2 45 -1 22 6 24 1 5 28 4 10 1
-2 44 -1 17 6 24 2 3 28 4 11 2
-2 43 -1 12 6 24 2 2 28 4 11 2
-2 42 -1 7 6 24 2 1 28 4 11 2
-2 41 -1 2 6 24 4 2 29 1 1 1
-1 60 -1 1 6 2 4 5 27 4 6 1
-1 59 -1 2 6 2 1 2 28 1 1 1
-1 58 -1 3 6 2 1 3 28 1 1 1
-1 57 -1 4 6 2 1 4 28 1 1 1
-1 56 -1 5 6 2 1 5 28 1 1 1
-1 55 -1 1 6 9 1 1 28 2 4 1
-1 54 -1 2 6 9 1 2 28 2 4 1
-1 53 -1 3 6 9 1 3 28 2 4 1
-1 52 -1 4 6 9 1 4 28 2 4 1
-1 51 -1 5 6 9 1 5 28 2 4 1
-1 50 -1 21 6 17 1 5 28 3 7 1
-1 49 -1 16 6 17 1 4 28 3 7 1
-1 48 -1 11 6 17 1 3 28 3 7 1
-1 47 -1 6 6 17 1 2 28 3 7 1
-1 46 -1 1 6 17 1 1 28 3 7 1
-1 45 -1 21 6 24 1 4 28 4 10 1
-1 44 -1 16 6 24 1 3 28 4 10 1
-1 43 -1 11 6 24 1 2 28 4 10 1
-1 42 -1 6 6 24 1 1 28 4 10 1
-1 41 -1 1 6 24 4 1 29 1 1 1
-100 60 1 1 46 2 4 5 74 1 1 1
-100 59 1 2 46 2 1 2 73 4 10 1
-100 58 1 3 46 2 1 3 73 4 10 1
-100 57 1 4 46 2 1 4 73 4 10 1
-100 56 1 5 46 2 1 5 73 4 10 1
-100 55 1 1 46 9 1 1 73 3 7 1
-100 54 1 2 46 9 1 2 73 3 7 1
-100 53 1 3 46 9 1 3 73 3 7 1
-100 52 1 4 46 9 1 4 73 3 7 1
-100 51 1 5 46 9 1 5 73 3 7 1
-100 50 1 21 46 17 1 5 73 2 4 1
-100 49 1 16 46 17 1 4 73 2 4 1
-100 48 1 11 46 17 1 3 73 2 4 1
-100 47 1 6 46 17 1 2 73 2 4 1
-100 46 1 1 46 17 1 1 73 2 4 1
-100 45 1 21 46 24 1 4 73 1 1 1
-100 44 1 16 46 24 1 3 73 1 1 1
-100 43 1 11 46 24 1 2 73 1 1 1
-100 42 1 6 46 24 1 1 73 1 1 1
-100 41 1 1 46 24 4 1 90 4 6 1
-99 60 1 6 46 2 4 4 74 1 1 1
-99 59 1 7 46 2 1 1 73 4 10 1
-99 58 1 8 46 2 2 3 73 4 11 2
-99 57 1 9 46 2 2 4 73 4 11 2
-99 56 1 10 46 2 2 5 73 4 11 2
-99 55 1 6 46 9 2 1 73 3 8 2
-99 54 1 7 46 9 2 2 73 3 8 2
-99 53 1 8 46 9 2 3 73 3 8 2
-99 52 1 9 46 9 2 4 73 3 8 2
-99 51 1 10 46 9 2 5 73 3 8 2
-99 50 1 22 46 17 2 5 73 2 5 2
-99 49 1 17 46 17 2 4 73 2 5 2
-99 48 1 12 46 17 2 3 73 2 5 2
-99 47 1 7 46 17 2 2 73 2 5 2
-99 46 1 2 46 17 2 1 73 2 5 2
-99 45 1 22 46 24 1 5 73 1 1 1
-99 44 1 17 46 24 2 3 73 1 2 2
-99 43 1 12 46 24 2 2 73 1 2 2
-99 42 1 7 46 24 2 1 73 1 2 2
-99 41 1 2 46 24 4 2 90 4 6 1
-98 60 1 11 46 2 4 3 74 1 1 1
-98 59 1 12 46 2 2 1 73 4 11 2
-98 58 1 13 46 2 2 2 73 4 11 2
-98 57 1 14 46 2 3 4 73 4 12 3
-98 56 1 15 46 2 3 5 73 4 12 3
-98 55 1 11 46 9 3 1 73 3 9 3
-98 54 1 12 46 9 3 2 73 3 9 3
-98 53 1 13 46 9 3 3 73 3 9 3
-98 52 1 14 46 9 3 4 73 3 9 3
-98 51 1 15 46 9 3 5 73 3 9 3
-98 50 1 23 46 17 3 5 73 2 6 3
-98 49 1 18 46 17 3 4 73 2 6 3
-98 48 1 13 46 17 3 3 73 2 6 3
-98 47 1 8 46 17 3 2 73 2 6 3
-98 46 1 3 46 17 3 1 73 2 6 3
-98 45 1 23 46 24 2 5 73 1 2 2
-98 44 1 18 46 24 2 4 73 1 2 2
-98 43 1 13 46 24 3 4 73 1 3 3
-98 42 1 8 46 24 3 1 73 1 3 3
-98 41 1 3 46 24 4 3 90 4 6 1
-97 65 1 16 47 25 3 2 74 2 3 1
-97 64 1 17 47 25 3 4 74 2 3 1
-97 63 1 18 47 25 3 5 74 2 3 1
-97 62 1 19 47 25 4 3 74 1 2 2
-97 61 1 20 47 25 4 5 74 1 2 2
-97 60 1 16 46 2 4 2 74 1 1 1
-97 59 1 17 46 2 3 2 73 4 12 3
-97 58 1 18 46 2 3 3 73 4 12 3
-97 57 1 19 46 2 5 3 73 8 22 1
-97 56 1 20 46 2 5 5 73 8 22 1
-97 55 1 16 46 9 4 1 73 7 19 1
-97 54 1 17 46 9 4 2 73 7 19 1
-97 53 1 18 46 9 4 3 73 7 19 1
-97 52 1 19 46 9 4 4 73 7 19 1
-97 51 1 20 46 9 4 5 73 7 19 1
-97 50 1 24 46 17 4 5 73 6 16 1
-97 49 1 19 46 17 4 4 73 6 16 1
-97 48 1 14 46 17 4 3 73 6 16 1
-97 47 1 9 46 17 4 2 73 6 16 1
-97 46 1 4 46 17 4 1 73 6 16 1
-97 45 1 24 46 24 5 4 73 5 13 1
-97 44 1 19 46 24 5 2 73 5 13 1
-97 43 1 14 46 24 3 5 73 1 3 3
-97 42 1 9 46 24 3 2 73 1 3 3
-97 41 1 4 46 24 4 4 90 4 6 1
-97 40 1 24 46 34 2 4 90 4 7 2
-97 39 1 19 46 34 2 2 90 4 7 2
-97 38 1 14 46 34 1 5 90 3 5 1
-97 37 1 9 46 34 1 3 90 3 5 1
-97 36 1 4 46 34 1 1 90 3 5 1
-96 65 1 21 47 25 3 1 74 2 3 1
-96 64 1 22 47 25 3 3 74 2 3 1
-96 63 1 23 47 25 4 1 74 1 2 2
-96 62 1 24 47 25 4 2 74 1 2 2
-96 61 1 25 47 25 4 4 74 1 2 2
-96 60 1 21 46 2 4 1 74 1 1 1
-96 59 1 22 46 2 3 1 73 4 12 3
-96 58 1 23 46 2 5 1 73 8 22 1
-96 57 1 24 46 2 5 2 73 8 22 1
-96 56 1 25 46 2 5 4 73 8 22 1
-96 55 1 21 46 9 5 1 73 7 20 2
-96 54 1 22 46 9 5 2 73 7 20 2
-96 53 1 23 46 9 5 3 73 7 20 2
-96 52 1 24 46 9 5 4 73 7 20 2
-96 51 1 25 46 9 5 5 73 7 20 2
-96 50 1 25 46 17 5 5 73 6 17 2
-96 49 1 20 46 17 5 4 73 6 17 2
-96 48 1 15 46 17 5 3 73 6 17 2
-96 47 1 10 46 17 5 2 73 6 17 2
-96 46 1 5 46 17 5 1 73 6 17 2
-96 45 1 25 46 24 5 5 73 5 13 1
-96 44 1 20 46 24 5 3 73 5 13 1
-96 43 1 15 46 24 5 1 73 5 13 1
-96 42 1 10 46 24 3 3 73 1 3 3
-96 41 1 5 46 24 4 5 90 4 6 1
-96 40 1 25 46 34 2 5 90 4 7 2
-96 39 1 20 46 34 2 3 90 4 7 2
-96 38 1 15 46 34 2 1 90 4 7 2
-96 37 1 10 46 34 1 4 90 3 5 1
-96 36 1 5 46 34 1 2 90 3 5 1
-95 75 1 1 47 11 1 1 74 4 5 1
-95 74 1 2 47 11 1 2 74 4 5 1
-95 73 1 3 47 11 1 3 74 4 5 1
-95 72 1 4 47 11 1 4 74 4 5 1
-95 71 1 5 47 11 1 5 74 4 5 1
-95 70 1 1 47 17 1 2 74 3 4 1
-95 69 1 2 47 17 1 4 74 3 4 1
-95 68 1 3 47 17 1 5 74 3 4 1
-95 67 1 4 47 17 2 1 74 6 10 1
-95 66 1 5 47 17 2 5 74 6 10 1
-95 65 1 1 47 24 1 2 74 6 11 2
-95 64 1 2 47 24 1 4 74 6 11 2
-95 63 1 3 47 24 1 5 74 6 11 2
-95 62 1 4 47 24 2 2 74 5 8 1
-95 61 1 5 47 24 2 5 74 5 8 1
-95 60 1 1 46 1 2 3 74 5 9 2
-95 59 1 2 46 1 2 5 74 5 9 2
-95 58 1 3 46 1 1 1 73 8 23 2
-95 57 1 4 46 1 1 3 73 8 23 2
-95 56 1 5 46 1 1 5 73 8 23 2
-95 55 1 1 46 8 2 3 73 8 24 3
-95 54 1 2 46 8 2 5 73 8 24 3
-95 53 1 3 46 8 1 2 73 7 21 3
-95 52 1 4 46 8 1 4 73 7 21 3
-95 51 1 5 46 8 1 5 73 7 21 3
-95 50 1 21 46 16 1 5 73 6 18 3
-95 49 1 16 46 16 1 3 73 6 18 3
-95 48 1 11 46 16 1 1 73 6 18 3
-95 47 1 6 46 16 2 4 73 5 14 2
-95 46 1 1 46 16 2 1 73 5 14 2
-95 45 1 21 46 23 1 4 73 5 15 3
-95 44 1 16 46 23 1 2 73 5 15 3
-95 43 1 11 46 23 1 1 73 5 15 3
-95 42 1 6 46 23 2 4 90 8 17 1
-95 41 1 1 46 23 2 1 90 8 17 1
-95 40 1 21 46 29 2 3 90 8 18 2
-95 39 1 16 46 29 2 1 90 8 18 2
-95 38 1 11 46 29 1 4 90 7 14 1
-95 37 1 6 46 29 1 2 90 7 14 1
-95 36 1 1 46 29 1 1 90 7 14 1
-95 35 1 21 46 30 2 2 90 7 15 2
-95 34 1 16 46 30 2 1 90 7 15 2
-95 33 1 11 46 30 1 5 90 2 4 1
-95 32 1 6 46 30 1 3 90 2 4 1
-95 31 1 1 46 30 1 1 90 2 4 1
-95 30 1 21 46 33 1 5 90 1 1 1
-95 29 1 16 46 33 1 4 90 1 1 1
-95 28 1 11 46 33 1 3 90 1 1 1
-95 27 1 6 46 33 1 2 90 1 1 1
-95 26 1 1 46 33 1 1 90 1 1 1
-94 75 1 6 47 11 2 1 74 4 6 2
-94 74 1 7 47 11 2 2 74 4 6 2
-94 73 1 8 47 11 2 3 74 4 6 2
-94 72 1 9 47 11 2 4 74 4 6 2
-94 71 1 10 47 11 2 5 74 4 6 2
-94 70 1 6 47 17 1 1 74 3 4 1
-94 69 1 7 47 17 1 3 74 3 4 1
-94 68 1 8 47 17 3 4 74 7 13 1
-94 67 1 9 47 17 3 5 74 7 13 1
-94 66 1 10 47 17 2 4 74 6 10 1
-94 65 1 6 47 24 1 1 74 6 11 2
-94 64 1 7 47 24 1 3 74 6 11 2
-94 63 1 8 47 24 3 5 74 6 12 3
-94 62 1 9 47 24 2 1 74 5 8 1
-94 61 1 10 47 24 2 4 74 5 8 1
-94 60 1 6 46 1 2 2 74 5 9 2
-94 59 1 7 46 1 2 4 74 5 9 2
-94 58 1 8 46 1 3 3 73 12 35 1
-94 57 1 9 46 1 1 2 73 8 23 2
-94 56 1 10 46 1 1 4 73 8 23 2
-94 55 1 6 46 8 2 2 73 8 24 3
-94 54 1 7 46 8 2 4 73 8 24 3
-94 53 1 8 46 8 1 1 73 7 21 3
-94 52 1 9 46 8 1 3 73 7 21 3
-94 51 1 10 46 8 3 5 73 11 32 1
-94 50 1 22 46 16 3 3 73 10 29 1
-94 49 1 17 46 16 1 4 73 6 18 3
-94 48 1 12 46 16 1 2 73 6 18 3
-94 47 1 7 46 16 2 5 73 5 14 2
-94 46 1 2 46 16 2 2 73 5 14 2
-94 45 1 22 46 23 1 5 73 5 15 3
-94 44 1 17 46 23 1 3 73 5 15 3
-94 43 1 12 46 23 3 1 73 9 25 1
-94 42 1 7 46 23 2 5 90 8 17 1
-94 41 1 2 46 23 2 2 90 8 17 1
-94 40 1 22 46 29 2 4 90 8 18 2
-94 39 1 17 46 29 2 2 90 8 18 2
-94 38 1 12 46 29 1 5 90 7 14 1
-94 37 1 7 46 29 1 3 90 7 14 1
-94 36 1 2 46 29 3 1 90 7 16 3
-94 35 1 22 46 30 2 3 90 7 15 2
-94 34 1 17 46 30 3 4 90 6 11 1
-94 33 1 12 46 30 3 2 90 6 11 1
-94 32 1 7 46 30 1 4 90 2 4 1
-94 31 1 2 46 30 1 2 90 2 4 1
-94 30 1 22 46 33 2 5 90 1 2 2
-94 29 1 17 46 33 2 4 90 1 2 2
-94 28 1 12 46 33 2 3 90 1 2 2
-94 27 1 7 46 33 2 2 90 1 2 2
-94 26 1 2 46 33 2 1 90 1 2 2
-93 75 1 11 47 11 3 3 74 4 7 3
-93 74 1 12 47 11 3 4 74 4 7 3
-93 73 1 13 47 11 3 5 74 4 7 3
-93 72 1 14 47 11 4 4 74 8 16 1
-93 71 1 15 47 11 4 5 74 8 16 1
-93 70 1 11 47 17 3 1 74 7 13 1
-93 69 1 12 47 17 3 2 74 7 13 1
-93 68 1 13 47 17 3 3 74 7 13 1
-93 67 1 14 47 17 4 5 74 7 14 2
-93 66 1 15 47 17 2 3 74 6 10 1
-93 65 1 11 47 24 3 1 74 6 12 3
-93 64 1 12 47 24 3 3 74 6 12 3
-93 63 1 13 47 24 3 4 74 6 12 3
-93 62 1 14 47 24 4 3 74 9 19 1
-93 61 1 15 47 24 2 3 74 5 8 1
-93 60 1 11 46 1 2 1 74 5 9 2
-93 59 1 12 46 1 4 5 74 9 20 2
-93 58 1 13 46 1 3 2 73 12 35 1
-93 57 1 14 46 1 3 4 73 12 35 1
-93 56 1 15 46 1 3 5 73 12 35 1
-93 55 1 11 46 8 2 1 73 8 24 3
-93 54 1 12 46 8 4 5 73 12 36 2
-93 53 1 13 46 8 3 2 73 11 32 1
-93 52 1 14 46 8 3 3 73 11 32 1
-93 51 1 15 46 8 3 4 73 11 32 1
-93 50 1 23 46 16 3 4 73 10 29 1
-93 49 1 18 46 16 3 2 73 10 29 1
-93 48 1 13 46 16 3 1 73 10 29 1
-93 47 1 8 46 16 4 3 73 9 26 2
-93 46 1 3 46 16 2 3 73 5 14 2
-93 45 1 23 46 23 3 4 73 9 25 1
-93 44 1 18 46 23 3 3 73 9 25 1
-93 43 1 13 46 23 3 2 73 9 25 1
-93 42 1 8 46 23 4 3 90 12 27 1
-93 41 1 3 46 23 2 3 90 8 17 1
-93 40 1 23 46 29 2 5 90 8 18 2
-93 39 1 18 46 29 4 1 90 12 28 2
-93 38 1 13 46 29 3 5 90 7 16 3
-93 37 1 8 46 29 3 3 90 7 16 3
-93 36 1 3 46 29 3 2 90 7 16 3
-93 35 1 23 46 30 2 4 90 7 15 2
-93 34 1 18 46 30 3 5 90 6 11 1
-93 33 1 13 46 30 3 3 90 6 11 1
-93 32 1 8 46 30 3 1 90 6 11 1
-93 31 1 3 46 30 4 1 90 6 12 2
-93 30 1 23 46 33 4 4 90 5 8 2
-93 29 1 18 46 33 4 2 90 5 8 2
-93 28 1 13 46 33 3 5 90 1 3 3
-93 27 1 8 46 33 3 4 90 1 3 3
-93 26 1 3 46 33 3 1 90 1 3 3
-92 80 1 16 47 25 2 2 75 2 2 1
-92 79 1 17 47 25 2 4 75 2 2 1
-92 78 1 18 47 25 1 1 75 1 1 1
-92 77 1 19 47 25 1 3 75 1 1 1
-92 76 1 20 47 25 1 5 75 1 1 1
-92 75 1 16 47 11 3 2 74 4 7 3
-92 74 1 17 47 11 4 1 74 8 16 1
-92 73 1 18 47 11 4 2 74 8 16 1
-92 72 1 19 47 11 4 3 74 8 16 1
-92 71 1 20 47 11 5 5 74 8 17 2
-92 70 1 16 47 17 4 1 74 7 14 2
-92 69 1 17 47 17 4 2 74 7 14 2
-92 68 1 18 47 17 4 3 74 7 14 2
-92 67 1 19 47 17 4 4 74 7 14 2
-92 66 1 20 47 17 2 2 74 6 10 1
-92 65 1 16 47 24 5 2 74 10 22 1
-92 64 1 17 47 24 3 2 74 6 12 3
-92 63 1 18 47 24 5 5 74 10 22 1
-92 62 1 19 47 24 4 2 74 9 19 1
-92 61 1 20 47 24 4 5 74 9 19 1
-92 60 1 16 46 1 4 2 74 9 20 2
-92 59 1 17 46 1 4 4 74 9 20 2
-92 58 1 18 46 1 3 1 73 12 35 1
-92 57 1 19 46 1 5 3 73 12 37 3
-92 56 1 20 46 1 5 5 73 12 37 3
-92 55 1 16 46 8 4 2 73 12 36 2
-92 54 1 17 46 8 4 4 73 12 36 2
-92 53 1 18 46 8 3 1 73 11 32 1
-92 52 1 19 46 8 5 3 73 11 33 2
-92 51 1 20 46 8 5 5 73 11 33 2
-92 50 1 24 46 16 3 5 73 10 29 1
-92 49 1 19 46 16 5 3 73 10 30 2
-92 48 1 14 46 16 5 1 73 10 30 2
-92 47 1 9 46 16 4 4 73 9 26 2
-92 46 1 4 46 16 4 1 73 9 26 2
-92 45 1 24 46 23 3 5 73 9 25 1
-92 44 1 19 46 23 5 3 73 9 27 3
-92 43 1 14 46 23 5 1 73 9 27 3
-92 42 1 9 46 23 4 4 90 12 27 1
-92 41 1 4 46 23 4 1 90 12 27 1
-92 40 1 24 46 29 4 4 90 12 28 2
-92 39 1 19 46 29 4 2 90 12 28 2
-92 38 1 14 46 29 5 4 90 11 24 1
-92 37 1 9 46 29 3 4 90 7 16 3
-92 36 1 4 46 29 5 1 90 11 24 1
-92 35 1 24 46 30 2 5 90 7 15 2
-92 34 1 19 46 30 4 5 90 6 12 2
-92 33 1 14 46 30 4 4 90 6 12 2
-92 32 1 9 46 30 4 3 90 6 12 2
-92 31 1 4 46 30 4 2 90 6 12 2
-92 30 1 24 46 33 4 5 90 5 8 2
-92 29 1 19 46 33 4 3 90 5 8 2
-92 28 1 14 46 33 4 1 90 5 8 2
-92 27 1 9 46 33 5 1 90 5 9 3
-92 26 1 4 46 33 3 2 90 1 3 3
-92 25 1 24 54 14 2 4 89 4 5 1
-92 24 1 19 54 14 2 2 89 4 5 1
-92 23 1 14 54 14 2 1 89 4 5 1
-92 22 1 9 54 14 3 3 89 3 3 1
-92 21 1 4 54 14 3 1 89 3 3 1
-91 80 1 21 47 25 2 1 75 2 2 1
-91 79 1 22 47 25 2 3 75 2 2 1
-91 78 1 23 47 25 2 5 75 2 2 1
-91 77 1 24 47 25 1 2 75 1 1 1
-91 76 1 25 47 25 1 4 75 1 1 1
-91 75 1 21 47 11 3 1 74 4 7 3
-91 74 1 22 47 11 5 1 74 8 17 2
-91 73 1 23 47 11 5 2 74 8 17 2
-91 72 1 24 47 11 5 3 74 8 17 2
-91 71 1 25 47 11 5 4 74 8 17 2
-91 70 1 21 47 17 5 1 74 7 15 3
-91 69 1 22 47 17 5 2 74 7 15 3
-91 68 1 23 47 17 5 3 74 7 15 3
-91 67 1 24 47 17 5 4 74 7 15 3
-91 66 1 25 47 17 5 5 74 7 15 3
-91 65 1 21 47 24 5 1 74 10 22 1
-91 64 1 22 47 24 5 3 74 10 22 1
-91 63 1 23 47 24 5 4 74 10 22 1
-91 62 1 24 47 24 4 1 74 9 19 1
-91 61 1 25 47 24 4 4 74 9 19 1
-91 60 1 21 46 1 4 1 74 9 20 2
-91 59 1 22 46 1 4 3 74 9 20 2
-91 58 1 23 46 1 5 1 73 12 37 3
-91 57 1 24 46 1 5 2 73 12 37 3
-91 56 1 25 46 1 5 4 73 12 37 3
-91 55 1 21 46 8 4 1 73 12 36 2
-91 54 1 22 46 8 4 3 73 12 36 2
-91 53 1 23 46 8 5 1 73 11 33 2
-91 52 1 24 46 8 5 2 73 11 33 2
-91 51 1 25 46 8 5 4 73 11 33 2
-91 50 1 25 46 16 5 5 73 10 30 2
-91 49 1 20 46 16 5 4 73 10 30 2
-91 48 1 15 46 16 5 2 73 10 30 2
-91 47 1 10 46 16 4 5 73 9 26 2
-91 46 1 5 46 16 4 2 73 9 26 2
-91 45 1 25 46 23 5 5 73 9 27 3
-91 44 1 20 46 23 5 4 73 9 27 3
-91 43 1 15 46 23 5 2 73 9 27 3
-91 42 1 10 46 23 4 5 90 12 27 1
-91 41 1 5 46 23 4 2 90 12 27 1
-91 40 1 25 46 29 4 5 90 12 28 2
-91 39 1 20 46 29 4 3 90 12 28 2
-91 38 1 15 46 29 5 5 90 11 24 1
-91 37 1 10 46 29 5 3 90 11 24 1
-91 36 1 5 46 29 5 2 90 11 24 1
-91 35 1 25 46 30 5 5 90 6 13 3
-91 34 1 20 46 30 5 4 90 6 13 3
-91 33 1 15 46 30 5 3 90 6 13 3
-91 32 1 10 46 30 5 2 90 6 13 3
-91 31 1 5 46 30 5 1 90 6 13 3
-91 30 1 25 46 33 5 5 90 5 9 3
-91 29 1 20 46 33 5 4 90 5 9 3
-91 28 1 15 46 33 5 3 90 5 9 3
-91 27 1 10 46 33 5 2 90 5 9 3
-91 26 1 5 46 33 3 3 90 1 3 3
-91 25 1 25 54 14 2 5 89 4 5 1
-91 24 1 20 54 14 2 3 89 4 5 1
-91 23 1 15 54 14 3 5 89 3 3 1
-91 22 1 10 54 14 3 4 89 3 3 1
-91 21 1 5 54 14 3 2 89 3 3 1
-90 80 1 1 47 6 1 3 75 2 3 2
-90 79 1 2 47 6 1 4 75 2 3 2
-90 78 1 3 47 6 1 5 75 2 3 2
-90 77 1 4 47 6 2 2 75 5 6 1
-90 76 1 5 47 6 2 5 75 5 6 1
-90 75 1 1 47 10 2 2 75 5 7 2
-90 74 1 2 47 10 2 4 75 5 7 2
-90 73 1 3 47 10 1 1 74 8 18 3
-90 72 1 4 47 10 1 3 74 8 18 3
-90 71 1 5 47 10 1 5 74 8 18 3
-90 70 1 1 47 16 2 3 74 12 27 1
-90 69 1 2 47 16 1 1 74 11 25 1
-90 68 1 3 47 16 1 3 74 11 25 1
-90 67 1 4 47 16 1 4 74 11 25 1
-90 66 1 5 47 16 1 5 74 11 25 1
-90 65 1 1 47 23 1 1 74 10 23 2
-90 64 1 2 47 23 1 2 74 10 23 2
-90 63 1 3 47 23 1 3 74 10 23 2
-90 62 1 4 47 23 1 4 74 10 23 2
-90 61 1 5 47 23 1 5 74 10 23 2
-90 60 1 1 47 31 2 2 74 9 21 3
-90 59 1 2 47 31 2 4 74 9 21 3
-90 58 1 3 47 31 1 1 73 12 38 4
-90 57 1 4 47 31 1 3 73 12 38 4
-90 56 1 5 47 31 1 5 73 12 38 4
-90 55 1 1 46 7 1 1 73 11 34 3
-90 54 1 2 46 7 1 2 73 11 34 3
-90 53 1 3 46 7 1 3 73 11 34 3
-90 52 1 4 46 7 1 4 73 11 34 3
-90 51 1 5 46 7 1 5 73 11 34 3
-90 50 1 21 46 15 1 5 73 10 31 3
-90 49 1 16 46 15 1 4 73 10 31 3
-90 48 1 11 46 15 1 3 73 10 31 3
-90 47 1 6 46 15 1 2 73 10 31 3
-90 46 1 1 46 15 1 1 73 10 31 3
-90 45 1 21 46 22 1 4 73 9 28 4
-90 44 1 16 46 22 1 2 73 9 28 4
-90 43 1 11 46 22 1 1 73 9 28 4
-90 42 1 6 46 22 2 3 90 12 29 3
-90 41 1 1 46 22 2 1 90 12 29 3
-90 40 1 21 46 28 1 5 90 11 25 2
-90 39 1 16 46 28 1 4 90 11 25 2
-90 38 1 11 46 28 1 3 90 11 25 2
-90 37 1 6 46 28 1 2 90 11 25 2
-90 36 1 1 46 28 1 1 90 11 25 2
-90 35 1 21 46 32 1 4 90 10 22 1
-90 34 1 16 46 32 1 3 90 10 22 1
-90 33 1 11 46 32 1 2 90 10 22 1
-90 32 1 6 46 32 1 1 90 10 22 1
-90 31 1 1 46 32 2 1 90 9 19 1
-90 30 1 21 54 13 1 4 90 5 10 1
-90 29 1 16 54 13 1 2 90 5 10 1
-90 28 1 11 54 13 1 1 90 5 10 1
-90 27 1 6 54 13 2 3 89 8 19 1
-90 26 1 1 54 13 2 1 89 8 19 1
-90 25 1 21 54 20 2 3 89 8 20 2
-90 24 1 16 54 20 2 1 89 8 20 2
-90 23 1 11 54 20 1 5 89 3 4 2
-90 22 1 6 54 20 1 4 89 3 4 2
-90 21 1 1 54 20 1 1 89 3 4 2
-89 80 1 6 47 6 1 2 75 2 3 2
-89 79 1 7 47 6 3 2 75 6 9 4
-89 78 1 8 47 6 3 4 75 6 9 4
-89 77 1 9 47 6 2 1 75 5 6 1
-89 76 1 10 47 6 2 4 75 5 6 1
-89 75 1 6 47 10 2 1 75 5 7 2
-89 74 1 7 47 10 2 3 75 5 7 2
-89 73 1 8 47 10 2 5 75 5 7 2
-89 72 1 9 47 10 1 2 74 8 18 3
-89 71 1 10 47 10 1 4 74 8 18 3
-89 70 1 6 47 16 2 2 74 12 27 1
-89 69 1 7 47 16 2 5 74 12 27 1
-89 68 1 8 47 16 1 2 74 11 25 1
-89 67 1 9 47 16 3 3 74 11 26 2
-89 66 1 10 47 16 3 5 74 11 26 2
-89 65 1 6 47 23 2 1 74 10 24 3
-89 64 1 7 47 23 2 2 74 10 24 3
-89 63 1 8 47 23 2 3 74 10 24 3
-89 62 1 9 47 23 2 4 74 10 24 3
-89 61 1 10 47 23 2 5 74 10 24 3
-89 60 1 6 47 31 2 1 74 9 21 3
-89 59 1 7 47 31 2 3 74 9 21 3
-89 58 1 8 47 31 2 5 74 9 21 3
-89 57 1 9 47 31 1 2 73 12 38 4
-89 56 1 10 47 31 1 4 73 12 38 4
-89 55 1 6 46 7 4 4 73 16 45 1
-89 54 1 7 46 7 2 2 73 15 43 1
-89 53 1 8 46 7 2 3 73 15 43 1
-89 52 1 9 46 7 2 4 73 15 43 1
-89 51 1 10 46 7 2 5 73 15 43 1
-89 50 1 22 46 15 2 4 73 14 41 1
-89 49 1 17 46 15 2 3 73 14 41 1
-89 48 1 12 46 15 2 2 73 14 41 1
-89 47 1 7 46 15 2 1 73 14 41 1
-89 46 1 2 46 15 4 1 73 13 39 1
-89 45 1 22 46 22 1 5 73 9 28 4
-89 44 1 17 46 22 1 3 73 9 28 4
-89 43 1 12 46 22 2 5 90 12 29 3
-89 42 1 7 46 22 2 4 90 12 29 3
-89 41 1 2 46 22 2 2 90 12 29 3
-89 40 1 22 46 28 2 5 90 11 26 3
-89 39 1 17 46 28 2 4 90 11 26 3
-89 38 1 12 46 28 2 3 90 11 26 3
-89 37 1 7 46 28 2 2 90 11 26 3
-89 36 1 2 46 28 2 1 90 11 26 3
-89 35 1 22 46 32 1 5 90 10 22 1
-89 34 1 17 46 32 3 3 90 10 23 2
-89 33 1 12 46 32 3 1 90 10 23 2
-89 32 1 7 46 32 2 4 90 9 19 1
-89 31 1 2 46 32 2 2 90 9 19 1
-89 30 1 22 54 13 1 5 90 5 10 1
-89 29 1 17 54 13 1 3 90 5 10 1
-89 28 1 12 54 13 2 5 89 8 19 1
-89 27 1 7 54 13 2 4 89 8 19 1
-89 26 1 2 54 13 2 2 89 8 19 1
-89 25 1 22 54 20 2 4 89 8 20 2
-89 24 1 17 54 20 2 2 89 8 20 2
-89 23 1 12 54 20 3 3 89 7 15 1
-89 22 1 7 54 20 3 1 89 7 15 1
-89 21 1 2 54 20 1 2 89 3 4 2
-88 80 1 11 47 6 1 1 75 2 3 2
-88 79 1 12 47 6 3 1 75 6 9 4
-88 78 1 13 47 6 3 3 75 6 9 4
-88 77 1 14 47 6 3 5 75 6 9 4
-88 76 1 15 47 6 2 3 75 5 6 1
-88 75 1 11 47 10 3 2 75 5 8 3
-88 74 1 12 47 10 3 4 75 5 8 3
-88 73 1 13 47 10 3 5 75 5 8 3
-88 72 1 14 47 10 4 2 74 12 28 2
-88 71 1 15 47 10 4 5 74 12 28 2
-88 70 1 11 47 16 2 1 74 12 27 1
-88 69 1 12 47 16 2 4 74 12 27 1
-88 68 1 13 47 16 3 1 74 11 26 2
-88 67 1 14 47 16 3 2 74 11 26 2
-88 66 1 15 47 16 3 4 74 11 26 2
-88 65 1 11 47 23 4 3 74 15 34 1
-88 64 1 12 47 23 4 5 74 15 34 1
-88 63 1 13 47 23 3 3 74 14 32 1
-88 62 1 14 47 23 3 4 74 14 32 1
-88 61 1 15 47 23 3 5 74 14 32 1
-88 60 1 11 47 31 3 2 74 13 30 1
-88 59 1 12 47 31 3 4 74 13 30 1
-88 58 1 13 47 31 3 5 74 13 30 1
-88 57 1 14 47 31 4 2 73 16 46 2
-88 56 1 15 47 31 4 5 73 16 46 2
-88 55 1 11 46 7 4 3 73 16 45 1
-88 54 1 12 46 7 2 1 73 15 43 1
-88 53 1 13 46 7 3 2 73 15 44 2
-88 52 1 14 46 7 3 4 73 15 44 2
-88 51 1 15 46 7 3 5 73 15 44 2
-88 50 1 23 46 15 2 5 73 14 41 1
-88 49 1 18 46 15 3 4 73 14 42 2
-88 48 1 13 46 15 3 2 73 14 42 2
-88 47 1 8 46 15 3 1 73 14 42 2
-88 46 1 3 46 15 4 2 73 13 39 1
-88 45 1 23 46 22 4 3 73 13 40 2
-88 44 1 18 46 22 4 1 73 13 40 2
-88 43 1 13 46 22 3 4 90 16 38 1
-88 42 1 8 46 22 3 2 90 16 38 1
-88 41 1 3 46 22 3 1 90 16 38 1
-88 40 1 23 46 28 3 4 90 15 36 1
-88 39 1 18 46 28 3 2 90 15 36 1
-88 38 1 13 46 28 3 1 90 15 36 1
-88 37 1 8 46 28 4 4 90 14 33 1
-88 36 1 3 46 28 4 1 90 14 33 1
-88 35 1 23 46 32 3 5 90 10 23 2
-88 34 1 18 46 32 3 4 90 10 23 2
-88 33 1 13 46 32 3 2 90 10 23 2
-88 32 1 8 46 32 2 5 90 9 19 1
-88 31 1 3 46 32 2 3 90 9 19 1
-88 30 1 23 54 13 4 3 90 9 20 2
-88 29 1 18 54 13 4 1 90 9 20 2
-88 28 1 13 54 13 3 5 89 8 21 3
-88 27 1 8 54 13 3 3 89 8 21 3
-88 26 1 3 54 13 3 1 89 8 21 3
-88 25 1 23 54 20 2 5 89 8 20 2
-88 24 1 18 54 20 3 5 89 7 15 1
-88 23 1 13 54 20 3 4 89 7 15 1
-88 22 1 8 54 20 3 2 89 7 15 1
-88 21 1 3 54 20 1 3 89 3 4 2
-87 85 1 16 47 3 3 2 75 3 4 1
-87 84 1 17 47 3 3 4 75 3 4 1
-87 83 1 18 47 3 3 5 75 3 4 1
-87 82 1 19 47 3 4 3 75 7 13 1
-87 81 1 20 47 3 4 5 75 7 13 1
-87 80 1 16 47 6 4 1 75 6 10 1
-87 79 1 17 47 6 4 2 75 6 10 1
-87 78 1 18 47 6 4 3 75 6 10 1
-87 77 1 19 47 6 4 4 75 6 10 1
-87 76 1 20 47 6 4 5 75 6 10 1
-87 75 1 16 47 10 3 1 75 5 8 3
-87 74 1 17 47 10 3 3 75 5 8 3
-87 73 1 18 47 10 5 4 75 9 22 1
-87 72 1 19 47 10 4 1 74 12 28 2
-87 71 1 20 47 10 4 4 74 12 28 2
-87 70 1 16 47 16 4 2 74 12 29 3
-87 69 1 17 47 16 4 4 74 12 29 3
-87 68 1 18 47 16 4 5 74 12 29 3
-87 67 1 19 47 16 5 3 74 15 35 2
-87 66 1 20 47 16 5 5 74 15 35 2
-87 65 1 16 47 23 4 2 74 15 34 1
-87 64 1 17 47 23 3 1 74 14 32 1
-87 63 1 18 47 23 3 2 74 14 32 1
-87 62 1 19 47 23 5 3 74 14 33 2
-87 61 1 20 47 23 5 5 74 14 33 2
-87 60 1 16 47 31 3 1 74 13 30 1
-87 59 1 17 47 31 3 3 74 13 30 1
-87 58 1 18 47 31 5 4 74 13 31 2
-87 57 1 19 47 31 4 1 73 16 46 2
-87 56 1 20 47 31 4 4 73 16 46 2
-87 55 1 16 46 7 4 2 73 16 45 1
-87 54 1 17 46 7 4 5 73 16 45 1
-87 53 1 18 46 7 3 1 73 15 44 2
-87 52 1 19 46 7 3 3 73 15 44 2
-87 51 1 20 46 7 5 5 91 3 5 1
-87 50 1 24 46 15 5 4 91 2 3 1
-87 49 1 19 46 15 3 5 73 14 42 2
-87 48 1 14 46 15 3 3 73 14 42 2
-87 47 1 9 46 15 4 5 73 13 39 1
-87 46 1 4 46 15 4 3 73 13 39 1
-87 45 1 24 46 22 4 4 73 13 40 2
-87 44 1 19 46 22 4 2 73 13 40 2
-87 43 1 14 46 22 3 5 90 16 38 1
-87 42 1 9 46 22 3 3 90 16 38 1
-87 41 1 4 46 22 5 1 90 16 39 2
-87 40 1 24 46 28 3 5 90 15 36 1
-87 39 1 19 46 28 3 3 90 15 36 1
-87 38 1 14 46 28 5 2 90 15 37 2
-87 37 1 9 46 28 5 1 90 15 37 2
-87 36 1 4 46 28 4 2 90 14 33 1
-87 35 1 24 46 32 5 4 90 14 34 2
-87 34 1 19 46 32 5 2 90 14 34 2
-87 33 1 14 46 32 4 5 90 9 21 3
-87 32 1 9 46 32 4 3 90 9 21 3
-87 31 1 4 46 32 4 1 90 9 21 3
-87 30 1 24 54 13 4 4 90 9 20 2
-87 29 1 19 54 13 4 2 90 9 20 2
-87 28 1 14 54 13 5 3 89 12 30 1
-87 27 1 9 54 13 3 4 89 8 21 3
-87 26 1 4 54 13 3 2 89 8 21 3
-87 25 1 24 54 20 4 5 89 7 16 2
-87 24 1 19 54 20 4 4 89 7 16 2
-87 23 1 14 54 20 4 3 89 7 16 2
-87 22 1 9 54 20 4 2 89 7 16 2
-87 21 1 4 54 20 4 1 89 7 16 2
-87 20 1 24 54 14 5 4 89 6 11 1
-87 19 1 19 54 14 5 2 89 6 11 1
-87 18 1 14 54 14 4 5 89 2 2 1
-87 17 1 9 54 14 4 3 89 2 2 1
-87 16 1 4 54 14 4 1 89 2 2 1
-86 85 1 21 47 3 3 1 75 3 4 1
-86 84 1 22 47 3 3 3 75 3 4 1
-86 83 1 23 47 3 4 1 75 7 13 1
-86 82 1 24 47 3 4 2 75 7 13 1
-86 81 1 25 47 3 4 4 75 7 13 1
-86 80 1 21 47 6 5 1 75 6 11 2
-86 79 1 22 47 6 5 2 75 6 11 2
-86 78 1 23 47 6 5 3 75 6 11 2
-86 77 1 24 47 6 5 4 75 6 11 2
-86 76 1 25 47 6 5 5 75 6 11 2
-86 75 1 21 47 10 5 1 75 9 22 1
-86 74 1 22 47 10 5 2 75 9 22 1
-86 73 1 23 47 10 5 3 75 9 22 1
-86 72 1 24 47 10 5 5 75 9 22 1
-86 71 1 25 47 10 4 3 74 12 28 2
-86 70 1 21 47 16 4 1 74 12 29 3
-86 69 1 22 47 16 4 3 74 12 29 3
-86 68 1 23 47 16 5 1 74 15 35 2
-86 67 1 24 47 16 5 2 74 15 35 2
-86 66 1 25 47 16 5 4 74 15 35 2
-86 65 1 21 47 23 4 1 74 15 34 1
-86 64 1 22 47 23 4 4 74 15 34 1
-86 63 1 23 47 23 5 1 74 14 33 2
-86 62 1 24 47 23 5 2 74 14 33 2
-86 61 1 25 47 23 5 4 74 14 33 2
-86 60 1 21 47 31 5 1 74 13 31 2
-86 59 1 22 47 31 5 2 74 13 31 2
-86 58 1 23 47 31 5 3 74 13 31 2
-86 57 1 24 47 31 5 5 74 13 31 2
-86 56 1 25 47 31 4 3 73 16 46 2
-86 55 1 21 46 7 4 1 73 16 45 1
-86 54 1 22 46 7 5 1 91 3 5 1
-86 53 1 23 46 7 5 2 91 3 5 1
-86 52 1 24 46 7 5 3 91 3 5 1
-86 51 1 25 46 7 5 4 91 3 5 1
-86 50 1 25 46 15 5 5 91 2 3 1
-86 49 1 20 46 15 5 3 91 2 3 1
-86 48 1 15 46 15 5 2 91 2 3 1
-86 47 1 10 46 15 5 1 91 2 3 1
-86 46 1 5 46 15 4 4 73 13 39 1
-86 45 1 25 46 22 4 5 73 13 40 2
-86 44 1 20 46 22 5 5 90 16 39 2
-86 43 1 15 46 22 5 4 90 16 39 2
-86 42 1 10 46 22 5 3 90 16 39 2
-86 41 1 5 46 22 5 2 90 16 39 2
-86 40 1 25 46 28 5 5 90 15 37 2
-86 39 1 20 46 28 5 4 90 15 37 2
-86 38 1 15 46 28 5 3 90 15 37 2
-86 37 1 10 46 28 4 5 90 14 33 1
-86 36 1 5 46 28 4 3 90 14 33 1
-86 35 1 25 46 32 5 5 90 14 34 2
-86 34 1 20 46 32 5 3 90 14 34 2
-86 33 1 15 46 32 5 1 90 14 34 2
-86 32 1 10 46 32 4 4 90 9 21 3
-86 31 1 5 46 32 4 2 90 9 21 3
-86 30 1 25 54 13 4 5 90 9 20 2
-86 29 1 20 54 13 5 5 89 12 30 1
-86 28 1 15 54 13 5 4 89 12 30 1
-86 27 1 10 54 13 5 2 89 12 30 1
-86 26 1 5 54 13 5 1 89 12 30 1
-86 25 1 25 54 20 5 5 89 7 17 3
-86 24 1 20 54 20 5 4 89 7 17 3
-86 23 1 15 54 20 5 3 89 7 17 3
-86 22 1 10 54 20 5 2 89 7 17 3
-86 21 1 5 54 20 5 1 89 7 17 3
-86 20 1 25 54 14 5 5 89 6 11 1
-86 19 1 20 54 14 5 3 89 6 11 1
-86 18 1 15 54 14 5 1 89 6 11 1
-86 17 1 10 54 14 4 4 89 2 2 1
-86 16 1 5 54 14 4 2 89 2 2 1
-85 87 1 4 47 3 1 3 75 4 5 1
-85 86 1 5 47 3 1 5 75 4 5 1
-85 85 1 1 47 2 1 1 75 7 14 2
-85 84 1 2 47 2 1 2 75 7 14 2
-85 83 1 3 47 2 1 3 75 7 14 2
-85 82 1 4 47 2 1 4 75 7 14 2
-85 81 1 5 47 2 1 5 75 7 14 2
-85 80 1 1 47 5 3 4 75 7 15 3
-85 79 1 2 47 5 1 2 75 6 12 3
-85 78 1 3 47 5 1 4 75 6 12 3
-85 77 1 4 47 5 1 5 75 6 12 3
-85 76 1 5 47 5 2 5 75 10 25 1
-85 75 1 1 47 9 3 4 75 10 26 2
-85 74 1 2 47 9 1 2 75 9 23 2
-85 73 1 3 47 9 1 3 75 9 23 2
-85 72 1 4 47 9 1 4 75 9 23 2
-85 71 1 5 47 9 1 5 75 9 23 2
-85 70 1 1 47 15 1 1 74 16 37 1
-85 69 1 2 47 15 1 2 74 16 37 1
-85 68 1 3 47 15 1 3 74 16 37 1
-85 67 1 4 47 15 1 4 74 16 37 1
-85 66 1 5 47 15 1 5 74 16 37 1
-85 65 1 1 47 22 1 2 74 15 36 3
-85 64 1 2 47 22 1 4 74 15 36 3
-85 63 1 3 47 22 1 5 74 15 36 3
-85 62 1 4 47 22 2 3 92 2 3 1
-85 61 1 5 47 22 2 5 92 2 3 1
-85 60 1 1 47 30 3 5 92 2 4 2
-85 59 1 2 47 30 1 3 92 1 1 1
-85 58 1 3 47 30 1 5 92 1 1 1
-85 57 1 4 47 30 2 2 91 4 7 1
-85 56 1 5 47 30 2 5 91 4 7 1
-85 55 1 1 46 6 2 3 91 4 8 2
-85 54 1 2 46 6 2 5 91 4 8 2
-85 53 1 3 46 6 1 1 91 3 6 2
-85 52 1 4 46 6 1 3 91 3 6 2
-85 51 1 5 46 6 1 5 91 3 6 2
-85 50 1 21 46 14 1 4 91 2 4 2
-85 49 1 16 46 14 1 2 91 2 4 2
-85 48 1 11 46 14 1 1 91 2 4 2
-85 47 1 6 46 14 2 4 91 1 1 1
-85 46 1 1 46 14 2 1 91 1 1 1
-85 45 1 21 46 21 1 3 91 1 2 2
-85 44 1 16 46 21 1 1 91 1 2 2
-85 43 1 11 46 21 2 3 108 4 8 1
-85 42 1 6 46 21 2 1 108 4 8 1
-85 41 1 1 46 21 3 1 108 3 5 1
-85 40 1 21 46 27 2 4 108 3 6 2
-85 39 1 16 46 27 2 2 108 3 6 2
-85 38 1 11 46 27 1 5 90 14 35 3
-85 37 1 6 46 27 1 3 90 14 35 3
-85 36 1 1 46 27 1 1 90 14 35 3
-85 35 1 21 46 31 1 5 90 13 30 1
-85 34 1 16 46 31 1 4 90 13 30 1
-85 33 1 11 46 31 1 3 90 13 30 1
-85 32 1 6 46 31 1 2 90 13 30 1
-85 31 1 1 46 31 1 1 90 13 30 1
-85 30 1 21 54 12 1 4 89 12 31 2
-85 29 1 16 54 12 1 3 89 12 31 2
-85 28 1 11 54 12 1 2 89 12 31 2
-85 27 1 6 54 12 1 1 89 12 31 2
-85 26 1 1 54 12 3 1 89 11 28 1
-85 25 1 21 54 19 2 3 89 11 29 2
-85 24 1 16 54 19 1 5 89 7 18 4
-85 23 1 11 54 19 1 3 89 7 18 4
-85 22 1 6 54 19 1 1 89 7 18 4
-85 21 1 1 54 19 3 1 89 6 12 2
-85 20 1 21 54 26 1 4 89 6 13 3
-85 19 1 16 54 26 1 3 89 6 13 3
-85 18 1 11 54 26 1 2 89 6 13 3
-85 17 1 6 54 26 1 1 89 6 13 3
-85 16 1 1 54 26 2 1 89 5 10 1
-85 15 1 21 54 21 2 4 89 1 1 1
-85 14 1 16 54 21 2 1 89 1 1 1
-84 87 1 9 47 3 1 2 75 4 5 1
-84 86 1 10 47 3 1 4 75 4 5 1
-84 85 1 6 47 2 3 3 75 8 18 1
-84 84 1 7 47 2 2 1 75 7 16 4
-84 83 1 8 47 2 2 2 75 7 16 4
-84 82 1 9 47 2 2 4 75 7 16 4
-84 81 1 10 47 2 2 5 75 7 16 4
-84 80 1 6 47 5 3 3 75 7 15 3
-84 79 1 7 47 5 1 1 75 6 12 3
-84 78 1 8 47 5 1 3 75 6 12 3
-84 77 1 9 47 5 2 2 75 10 25 1
-84 76 1 10 47 5 2 4 75 10 25 1
-84 75 1 6 47 9 3 3 75 10 26 2
-84 74 1 7 47 9 1 1 75 9 23 2
-84 73 1 8 47 9 2 2 75 9 24 3
-84 72 1 9 47 9 2 4 75 9 24 3
-84 71 1 10 47 9 2 5 75 9 24 3
-84 70 1 6 47 15 4 4 75 13 33 1
-84 69 1 7 47 15 2 2 74 16 38 2
-84 68 1 8 47 15 2 3 74 16 38 2
-84 67 1 9 47 15 2 4 74 16 38 2
-84 66 1 10 47 15 2 5 74 16 38 2
-84 65 1 6 47 22 1 1 74 15 36 3
-84 64 1 7 47 22 1 3 74 15 36 3
-84 63 1 8 47 22 2 1 92 2 3 1
-84 62 1 9 47 22 2 2 92 2 3 1
-84 61 1 10 47 22 2 4 92 2 3 1
-84 60 1 6 47 30 3 4 92 2 4 2
-84 59 1 7 47 30 1 2 92 1 1 1
-84 58 1 8 47 30 1 4 92 1 1 1
-84 57 1 9 47 30 2 1 91 4 7 1
-84 56 1 10 47 30 2 4 91 4 7 1
-84 55 1 6 46 6 2 2 91 4 8 2
-84 54 1 7 46 6 2 4 91 4 8 2
-84 53 1 8 46 6 3 3 91 7 14 1
-84 52 1 9 46 6 1 2 91 3 6 2
-84 51 1 10 46 6 1 4 91 3 6 2
-84 50 1 22 46 14 1 5 91 2 4 2
-84 49 1 17 46 14 1 3 91 2 4 2
-84 48 1 12 46 14 3 1 91 6 11 1
-84 47 1 7 46 14 2 5 91 1 1 1
-84 46 1 2 46 14 2 2 91 1 1 1
-84 45 1 22 46 21 1 4 91 1 2 2
-84 44 1 17 46 21 1 2 91 1 2 2
-84 43 1 12 46 21 2 4 108 4 8 1
-84 42 1 7 46 21 2 2 108 4 8 1
-84 41 1 2 46 21 3 2 108 3 5 1
-84 40 1 22 46 27 2 5 108 3 6 2
-84 39 1 17 46 27 2 3 108 3 6 2
-84 38 1 12 46 27 2 1 108 3 6 2
-84 37 1 7 46 27 1 4 90 14 35 3
-84 36 1 2 46 27 1 2 90 14 35 3
-84 35 1 22 46 31 2 4 90 13 31 2
-84 34 1 17 46 31 2 3 90 13 31 2
-84 33 1 12 46 31 2 2 90 13 31 2
-84 32 1 7 46 31 2 1 90 13 31 2
-84 31 1 2 46 31 4 1 89 16 40 1
-84 30 1 22 54 12 1 5 89 12 31 2
-84 29 1 17 54 12 2 4 89 12 32 3
-84 28 1 12 54 12 2 2 89 12 32 3
-84 27 1 7 54 12 2 1 89 12 32 3
-84 26 1 2 54 12 3 2 89 11 28 1
-84 25 1 22 54 19 2 4 89 11 29 2
-84 24 1 17 54 19 2 1 89 11 29 2
-84 23 1 12 54 19 1 4 89 7 18 4
-84 22 1 7 54 19 1 2 89 7 18 4
-84 21 1 2 54 19 3 2 89 6 12 2
-84 20 1 22 54 26 1 5 89 6 13 3
-84 19 1 17 54 26 3 3 89 6 14 4
-84 18 1 12 54 26 3 1 89 6 14 4
-84 17 1 7 54 26 2 4 89 5 10 1
-84 16 1 2 54 26 2 2 89 5 10 1
-84 15 1 22 54 21 2 5 89 1 1 1
-84 14 1 17 54 21 2 2 89 1 1 1
-83 87 1 14 47 3 1 1 75 4 5 1
-83 86 1 15 47 3 2 5 75 8 19 2
-83 85 1 11 47 2 3 2 75 8 18 1
-83 84 1 12 47 2 3 4 75 8 18 1
-83 83 1 13 47 2 3 5 75 8 18 1
-83 82 1 14 47 2 2 3 75 7 16 4
-83 81 1 15 47 2 4 5 75 7 17 5
-83 80 1 11 47 5 3 2 75 7 15 3
-83 79 1 12 47 5 3 5 75 7 15 3
-83 78 1 13 47 5 4 3 75 11 27 1
-83 77 1 14 47 5 2 1 75 10 25 1
-83 76 1 15 47 5 2 3 75 10 25 1
-83 75 1 11 47 9 3 2 75 10 26 2
-83 74 1 12 47 9 3 5 75 10 26 2
-83 73 1 13 47 9 2 1 75 9 24 3
-83 72 1 14 47 9 2 3 75 9 24 3
-83 71 1 15 47 9 4 5 75 13 34 2
-83 70 1 11 47 15 4 3 75 13 33 1
-83 69 1 12 47 15 2 1 74 16 38 2
-83 68 1 13 47 15 3 2 74 16 39 3
-83 67 1 14 47 15 3 4 74 16 39 3
-83 66 1 15 47 15 3 5 74 16 39 3
-83 65 1 11 47 22 3 2 92 3 6 1
-83 64 1 12 47 22 3 4 92 3 6 1
-83 63 1 13 47 22 3 5 92 3 6 1
-83 62 1 14 47 22 4 2 92 2 5 3
-83 61 1 15 47 22 4 5 92 2 5 3
-83 60 1 11 47 30 3 3 92 2 4 2
-83 59 1 12 47 30 1 1 92 1 1 1
-83 58 1 13 47 30 4 3 92 1 2 2
-83 57 1 14 47 30 4 5 92 1 2 2
-83 56 1 15 47 30 2 3 91 4 7 1
-83 55 1 11 46 6 2 1 91 4 8 2
-83 54 1 12 46 6 4 5 91 8 17 1
-83 53 1 13 46 6 3 2 91 7 14 1
-83 52 1 14 46 6 3 4 91 7 14 1
-83 51 1 15 46 6 3 5 91 7 14 1
-83 50 1 23 46 14 3 4 91 6 11 1
-83 49 1 18 46 14 3 3 91 6 11 1
-83 48 1 13 46 14 3 2 91 6 11 1
-83 47 1 8 46 14 4 3 91 5 9 2
-83 46 1 3 46 14 2 3 91 1 1 1
-83 45 1 23 46 21 1 5 91 1 2 2
-83 44 1 18 46 21 2 5 108 4 8 1
-83 43 1 13 46 21 4 3 108 4 9 2
-83 42 1 8 46 21 4 1 108 4 9 2
-83 41 1 3 46 21 3 3 108 3 5 1
-83 40 1 23 46 27 4 3 108 3 7 3
-83 39 1 18 46 27 4 1 108 3 7 3
-83 38 1 13 46 27 3 4 108 2 3 1
-83 37 1 8 46 27 3 2 108 2 3 1
-83 36 1 3 46 27 3 1 108 2 3 1
-83 35 1 23 46 31 2 5 90 13 31 2
-83 34 1 18 46 31 3 4 90 13 32 3
-83 33 1 13 46 31 3 2 90 13 32 3
-83 32 1 8 46 31 3 1 90 13 32 3
-83 31 1 3 46 31 4 2 89 16 40 1
-83 30 1 23 54 12 4 3 89 16 41 2
-83 29 1 18 54 12 2 5 89 12 32 3
-83 28 1 13 54 12 2 3 89 12 32 3
-83 27 1 8 54 12 3 5 89 11 28 1
-83 26 1 3 54 12 3 3 89 11 28 1
-83 25 1 23 54 19 2 5 89 11 29 2
-83 24 1 18 54 19 2 2 89 11 29 2
-83 23 1 13 54 19 4 2 89 10 25 1
-83 22 1 8 54 19 3 5 89 6 12 2
-83 21 1 3 54 19 3 3 89 6 12 2
-83 20 1 23 54 26 3 5 89 6 14 4
-83 19 1 18 54 26 3 4 89 6 14 4
-83 18 1 13 54 26 3 2 89 6 14 4
-83 17 1 8 54 26 2 5 89 5 10 1
-83 16 1 3 54 26 2 3 89 5 10 1
-83 15 1 23 54 21 3 3 89 5 8 4
-83 14 1 18 54 21 2 3 89 1 1 1
-82 87 1 19 47 3 2 2 75 8 19 2
-82 86 1 20 47 3 2 4 75 8 19 2
-82 85 1 16 47 2 3 1 75 8 18 1
-82 84 1 17 47 2 5 3 75 8 20 3
-82 83 1 18 47 2 5 5 75 8 20 3
-82 82 1 19 47 2 4 2 75 7 17 5
-82 81 1 20 47 2 4 4 75 7 17 5
-82 80 1 16 47 5 3 1 75 7 15 3
-82 79 1 17 47 5 4 1 75 11 27 1
-82 78 1 18 47 5 4 2 75 11 27 1
-82 77 1 19 47 5 4 4 75 11 27 1
-82 76 1 20 47 5 4 5 75 11 27 1
-82 75 1 16 47 9 3 1 75 10 26 2
-82 74 1 17 47 9 5 3 75 14 35 1
-82 73 1 18 47 9 5 5 75 14 35 1
-82 72 1 19 47 9 4 2 75 13 34 2
-82 71 1 20 47 9 4 4 75 13 34 2
-82 70 1 16 47 15 4 2 75 13 33 1
-82 69 1 17 47 15 4 5 75 13 33 1
-82 68 1 18 47 15 3 1 74 16 39 3
-82 67 1 19 47 15 3 3 74 16 39 3
-82 66 1 20 47 15 5 5 92 4 8 1
-82 65 1 16 47 22 3 1 92 3 6 1
-82 64 1 17 47 22 3 3 92 3 6 1
-82 63 1 18 47 22 5 4 92 3 7 2
-82 62 1 19 47 22 4 1 92 2 5 3
-82 61 1 20 47 22 4 4 92 2 5 3
-82 60 1 16 47 30 3 2 92 2 4 2
-82 59 1 17 47 30 4 1 92 1 2 2
-82 58 1 18 47 30 4 2 92 1 2 2
-82 57 1 19 47 30 4 4 92 1 2 2
-82 56 1 20 47 30 5 5 92 5 10 1
-82 55 1 16 46 6 4 2 91 8 17 1
-82 54 1 17 46 6 4 4 91 8 17 1
-82 53 1 18 46 6 3 1 91 7 14 1
-82 52 1 19 46 6 5 3 91 7 15 2
-82 51 1 20 46 6 5 5 91 7 15 2
-82 50 1 24 46 14 3 5 91 6 11 1
-82 49 1 19 46 14 5 3 91 6 12 2
-82 48 1 14 46 14 5 1 91 6 12 2
-82 47 1 9 46 14 4 4 91 5 9 2
-82 46 1 4 46 14 4 1 91 5 9 2
-82 45 1 24 46 21 5 4 108 8 15 1
-82 44 1 19 46 21 4 5 108 4 9 2
-82 43 1 14 46 21 4 4 108 4 9 2
-82 42 1 9 46 21 4 2 108 4 9 2
-82 41 1 4 46 21 3 4 108 3 5 1
-82 40 1 24 46 27 4 4 108 3 7 3
-82 39 1 19 46 27 4 2 108 3 7 3
-82 38 1 14 46 27 3 5 108 2 3 1
-82 37 1 9 46 27 3 3 108 2 3 1
-82 36 1 4 46 27 5 1 108 2 4 2
-82 35 1 24 46 31 5 4 108 1 1 1
-82 34 1 19 46 31 3 5 90 13 32 3
-82 33 1 14 46 31 3 3 90 13 32 3
-82 32 1 9 46 31 4 5 89 16 40 1
-82 31 1 4 46 31 4 3 89 16 40 1
-82 30 1 24 54 12 4 4 89 16 41 2
-82 29 1 19 54 12 4 1 89 16 41 2
-82 28 1 14 54 12 5 4 89 15 38 1
-82 27 1 9 54 12 5 2 89 15 38 1
-82 26 1 4 54 12 3 4 89 11 28 1
-82 25 1 24 54 19 4 5 89 10 25 1
-82 24 1 19 54 19 4 4 89 10 25 1
-82 23 1 14 54 19 4 3 89 10 25 1
-82 22 1 9 54 19 4 1 89 10 25 1
-82 21 1 4 54 19 3 4 89 6 12 2
-82 20 1 24 54 26 4 5 89 5 9 5
-82 19 1 19 54 26 4 4 89 5 9 5
-82 18 1 14 54 26 4 3 89 5 9 5
-82 17 1 9 54 26 4 2 89 5 9 5
-82 16 1 4 54 26 4 1 89 5 9 5
-82 15 1 24 54 21 3 4 89 5 8 4
-82 14 1 19 54 21 3 1 89 5 8 4
-81 87 1 24 47 3 2 1 75 8 19 2
-81 86 1 25 47 3 2 3 75 8 19 2
-81 85 1 21 47 2 5 1 75 8 20 3
-81 84 1 22 47 2 5 2 75 8 20 3
-81 83 1 23 47 2 5 4 75 8 20 3
-81 82 1 24 47 2 4 1 75 7 17 5
-81 81 1 25 47 2 4 3 75 7 17 5
-81 80 1 21 47 5 5 1 75 11 28 2
-81 79 1 22 47 5 5 2 75 11 28 2
-81 78 1 23 47 5 5 3 75 11 28 2
-81 77 1 24 47 5 5 4 75 11 28 2
-81 76 1 25 47 5 5 5 75 11 28 2
-81 75 1 21 47 9 5 1 75 14 35 1
-81 74 1 22 47 9 5 2 75 14 35 1
-81 73 1 23 47 9 5 4 75 14 35 1
-81 72 1 24 47 9 4 1 75 13 34 2
-81 71 1 25 47 9 4 3 75 13 34 2
-81 70 1 21 47 15 4 1 75 13 33 1
-81 69 1 22 47 15 5 1 92 4 8 1
-81 68 1 23 47 15 5 2 92 4 8 1
-81 67 1 24 47 15 5 3 92 4 8 1
-81 66 1 25 47 15 5 4 92 4 8 1
-81 65 1 21 47 22 5 1 92 3 7 2
-81 64 1 22 47 22 5 2 92 3 7 2
-81 63 1 23 47 22 5 3 92 3 7 2
-81 62 1 24 47 22 5 5 92 3 7 2
-81 61 1 25 47 22 4 3 92 2 5 3
-81 60 1 21 47 30 3 1 92 2 4 2
-81 59 1 22 47 30 5 1 92 5 10 1
-81 58 1 23 47 30 5 2 92 5 10 1
-81 57 1 24 47 30 5 3 92 5 10 1
-81 56 1 25 47 30 5 4 92 5 10 1
-81 55 1 21 46 6 4 1 91 8 17 1
-81 54 1 22 46 6 4 3 91 8 17 1
-81 53 1 23 46 6 5 1 91 7 15 2
-81 52 1 24 46 6 5 2 91 7 15 2
-81 51 1 25 46 6 5 4 91 7 15 2
-81 50 1 25 46 14 5 5 91 6 12 2
-81 49 1 20 46 14 5 4 91 6 12 2
-81 48 1 15 46 14 5 2 91 6 12 2
-81 47 1 10 46 14 4 5 91 5 9 2
-81 46 1 5 46 14 4 2 91 5 9 2
-81 45 1 25 46 21 5 5 108 8 15 1
-81 44 1 20 46 21 5 3 108 8 15 1
-81 43 1 15 46 21 5 2 108 8 15 1
-81 42 1 10 46 21 5 1 108 8 15 1
-81 41 1 5 46 21 3 5 108 3 5 1
-81 40 1 25 46 27 4 5 108 3 7 3
-81 39 1 20 46 27 5 5 108 2 4 2
-81 38 1 15 46 27 5 4 108 2 4 2
-81 37 1 10 46 27 5 3 108 2 4 2
-81 36 1 5 46 27 5 2 108 2 4 2
-81 35 1 25 46 31 5 5 108 1 1 1
-81 34 1 20 46 31 5 3 108 1 1 1
-81 33 1 15 46 31 5 2 108 1 1 1
-81 32 1 10 46 31 5 1 108 1 1 1
-81 31 1 5 46 31 4 4 89 16 40 1
-81 30 1 25 54 12 4 5 89 16 41 2
-81 29 1 20 54 12 4 2 89 16 41 2
-81 28 1 15 54 12 5 5 89 15 38 1
-81 27 1 10 54 12 5 3 89 15 38 1
-81 26 1 5 54 12 5 1 89 15 38 1
-81 25 1 25 54 19 5 5 89 10 26 2
-81 24 1 20 54 19 5 4 89 10 26 2
-81 23 1 15 54 19 5 3 89 10 26 2
-81 22 1 10 54 19 5 2 89 10 26 2
-81 21 1 5 54 19 5 1 89 10 26 2
-81 20 1 25 54 26 5 5 89 5 7 3
-81 19 1 20 54 26 5 4 89 5 7 3
-81 18 1 15 54 26 5 3 89 5 7 3
-81 17 1 10 54 26 5 2 89 5 7 3
-81 16 1 5 54 26 5 1 89 5 7 3
-81 15 1 25 54 21 3 5 89 5 8 4
-81 14 1 20 54 21 3 2 89 5 8 4
-80 92 1 4 48 30 3 2 76 1 1 1
-80 91 1 5 48 30 3 5 76 1 1 1
-80 90 1 1 48 23 1 3 76 1 2 2
-80 89 1 2 48 23 1 4 76 1 2 2
-80 88 1 3 48 23 1 5 76 1 2 2
-80 87 1 4 48 23 2 4 76 5 8 3
-80 86 1 5 48 23 2 5 76 5 8 3
-80 85 1 1 47 1 1 1 75 8 21 4
-80 84 1 2 47 1 1 2 75 8 21 4
-80 83 1 3 47 1 1 4 75 8 21 4
-80 82 1 4 47 1 1 5 75 8 21 4
-80 81 1 5 47 1 2 5 75 12 30 1
-80 80 1 1 47 4 3 4 75 12 31 2
-80 79 1 2 47 4 1 2 75 11 29 3
-80 78 1 3 47 4 1 4 75 11 29 3
-80 77 1 4 47 4 1 5 75 11 29 3
-80 76 1 5 47 4 2 5 75 15 37 1
-80 75 1 1 47 8 1 1 75 14 36 2
-80 74 1 2 47 8 1 2 75 14 36 2
-80 73 1 3 47 8 1 4 75 14 36 2
-80 72 1 4 47 8 1 5 75 14 36 2
-80 71 1 5 47 8 2 5 93 2 3 1
-80 70 1 1 47 14 2 2 93 1 1 1
-80 69 1 2 47 14 2 4 93 1 1 1
-80 68 1 3 47 14 1 1 92 4 9 2
-80 67 1 4 47 14 1 3 92 4 9 2
-80 66 1 5 47 14 1 5 92 4 9 2
-80 65 1 1 47 21 2 3 92 8 15 1
-80 64 1 2 47 21 1 1 92 7 13 1
-80 63 1 3 47 21 1 3 92 7 13 1
-80 62 1 4 47 21 1 4 92 7 13 1
-80 61 1 5 47 21 1 5 92 7 13 1
-80 60 1 1 47 29 2 2 92 6 12 1
-80 59 1 2 47 29 2 4 92 6 12 1
-80 58 1 3 47 29 1 1 92 5 11 2
-80 57 1 4 47 29 1 3 92 5 11 2
-80 56 1 5 47 29 1 5 92 5 11 2
-80 55 1 1 46 5 2 2 91 8 18 2
-80 54 1 2 46 5 2 4 91 8 18 2
-80 53 1 3 46 5 1 1 91 7 16 3
-80 52 1 4 46 5 1 3 91 7 16 3
-80 51 1 5 46 5 1 5 91 7 16 3
-80 50 1 21 46 13 1 4 91 6 13 3
-80 49 1 16 46 13 1 2 91 6 13 3
-80 48 1 11 46 13 1 1 91 6 13 3
-80 47 1 6 46 13 2 3 91 5 10 1
-80 46 1 1 46 13 2 1 91 5 10 1
-80 45 1 21 46 20 1 4 108 8 16 2
-80 44 1 16 46 20 1 2 108 8 16 2
-80 43 1 11 46 20 1 1 108 8 16 2
-80 42 1 6 46 20 2 3 108 7 14 1
-80 41 1 1 46 20 2 1 108 7 14 1
-80 40 1 21 46 26 1 4 108 6 12 1
-80 39 1 16 46 26 1 3 108 6 12 1
-80 38 1 11 46 26 1 2 108 6 12 1
-80 37 1 6 46 26 1 1 108 6 12 1
-80 36 1 1 46 26 2 1 108 5 10 1
-80 35 1 21 54 7 1 4 108 1 2 2
-80 34 1 16 54 7 1 2 108 1 2 2
-80 33 1 11 54 7 1 1 108 1 2 2
-80 32 1 6 54 7 2 3 107 4 7 1
-80 31 1 1 54 7 2 1 107 4 7 1
-80 30 1 21 54 11 2 3 107 3 5 1
-80 29 1 16 54 11 1 5 89 15 39 2
-80 28 1 11 54 11 1 3 89 15 39 2
-80 27 1 6 54 11 1 2 89 15 39 2
-80 26 1 1 54 11 1 1 89 15 39 2
-80 25 1 21 54 18 2 3 89 14 35 1
-80 24 1 16 54 18 1 5 89 10 27 3
-80 23 1 11 54 18 1 3 89 10 27 3
-80 22 1 6 54 18 1 2 89 10 27 3
-80 21 1 1 54 18 1 1 89 10 27 3
-80 20 1 21 54 25 2 3 89 9 24 3
-80 19 1 16 54 25 1 5 89 5 6 2
-80 18 1 11 54 25 1 3 89 5 6 2
-80 17 1 6 54 25 1 2 89 5 6 2
-80 16 1 1 54 25 1 1 89 5 6 2
-80 15 1 21 54 27 2 4 88 8 20 4
-80 14 1 16 54 27 2 2 88 8 20 4
-80 13 1 11 54 27 1 5 88 4 6 1
-80 12 1 6 54 27 1 4 88 4 6 1
-80 11 1 1 54 27 1 1 88 4 6 1
-80 10 1 21 54 21 4 3 88 4 7 2
-80 9 1 16 54 21 4 1 88 4 7 2
-79 92 1 9 48 30 3 1 76 1 1 1
-79 91 1 10 48 30 3 4 76 1 1 1
-79 90 1 6 48 23 1 2 76 1 2 2
-79 89 1 7 48 23 2 1 76 5 8 3
-79 88 1 8 48 23 2 2 76 5 8 3
-79 87 1 9 48 23 2 3 76 5 8 3
-79 86 1 10 48 23 3 5 76 5 9 4
-79 85 1 6 47 1 3 3 76 5 10 1
-79 84 1 7 47 1 3 5 76 5 10 1
-79 83 1 8 47 1 1 3 75 8 21 4
-79 82 1 9 47 1 2 3 75 12 30 1
-79 81 1 10 47 1 2 4 75 12 30 1
-79 80 1 6 47 4 3 3 75 12 31 2
-79 79 1 7 47 4 1 1 75 11 29 3
-79 78 1 8 47 4 1 3 75 11 29 3
-79 77 1 9 47 4 2 2 75 15 37 1
-79 76 1 10 47 4 2 4 75 15 37 1
-79 75 1 6 47 8 3 3 75 15 38 2
-79 74 1 7 47 8 3 5 75 15 38 2
-79 73 1 8 47 8 1 3 75 14 36 2
-79 72 1 9 47 8 2 3 93 2 3 1
-79 71 1 10 47 8 2 4 93 2 3 1
-79 70 1 6 47 14 2 1 93 1 1 1
-79 69 1 7 47 14 2 3 93 1 1 1
-79 68 1 8 47 14 2 5 93 1 1 1
-79 67 1 9 47 14 1 2 92 4 9 2
-79 66 1 10 47 14 1 4 92 4 9 2
-79 65 1 6 47 21 2 2 92 8 15 1
-79 64 1 7 47 21 2 5 92 8 15 1
-79 63 1 8 47 21 1 2 92 7 13 1
-79 62 1 9 47 21 3 3 92 7 14 2
-79 61 1 10 47 21 3 5 92 7 14 2
-79 60 1 6 47 29 2 1 92 6 12 1
-79 59 1 7 47 29 2 3 92 6 12 1
-79 58 1 8 47 29 2 5 92 6 12 1
-79 57 1 9 47 29 1 2 92 5 11 2
-79 56 1 10 47 29 1 4 92 5 11 2
-79 55 1 6 46 5 2 1 91 8 18 2
-79 54 1 7 46 5 2 3 91 8 18 2
-79 53 1 8 46 5 2 5 91 8 18 2
-79 52 1 9 46 5 1 2 91 7 16 3
-79 51 1 10 46 5 1 4 91 7 16 3
-79 50 1 22 46 13 1 5 91 6 13 3
-79 49 1 17 46 13 1 3 91 6 13 3
-79 48 1 12 46 13 2 5 91 5 10 1
-79 47 1 7 46 13 2 4 91 5 10 1
-79 46 1 2 46 13 2 2 91 5 10 1
-79 45 1 22 46 20 1 5 108 8 16 2
-79 44 1 17 46 20 1 3 108 8 16 2
-79 43 1 12 46 20 2 5 108 7 14 1
-79 42 1 7 46 20 2 4 108 7 14 1
-79 41 1 2 46 20 2 2 108 7 14 1
-79 40 1 22 46 26 1 5 108 6 12 1
-79 39 1 17 46 26 3 3 108 6 13 2
-79 38 1 12 46 26 3 1 108 6 13 2
-79 37 1 7 46 26 2 4 108 5 10 1
-79 36 1 2 46 26 2 2 108 5 10 1
-79 35 1 22 54 7 1 5 108 1 2 2
-79 34 1 17 54 7 1 3 108 1 2 2
-79 33 1 12 54 7 2 5 107 4 7 1
-79 32 1 7 54 7 2 4 107 4 7 1
-79 31 1 2 54 7 2 2 107 4 7 1
-79 30 1 22 54 11 2 4 107 3 5 1
-79 29 1 17 54 11 2 1 107 3 5 1
-79 28 1 12 54 11 1 4 89 15 39 2
-79 27 1 7 54 11 3 4 89 14 36 2
-79 26 1 2 54 11 3 1 89 14 36 2
-79 25 1 22 54 18 2 4 89 14 35 1
-79 24 1 17 54 18 2 1 89 14 35 1
-79 23 1 12 54 18 1 4 89 10 27 3
-79 22 1 7 54 18 3 4 89 9 23 2
-79 21 1 2 54 18 3 1 89 9 23 2
-79 20 1 22 54 25 2 4 89 9 24 3
-79 19 1 17 54 25 2 1 89 9 24 3
-79 18 1 12 54 25 1 4 89 5 6 2
-79 17 1 7 54 25 3 4 88 8 18 2
-79 16 1 2 54 25 3 1 88 8 18 2
-79 15 1 22 54 27 2 5 88 8 20 4
-79 14 1 17 54 27 2 3 88 8 20 4
-79 13 1 12 54 27 2 1 88 8 20 4
-79 12 1 7 54 27 3 1 88 8 19 3
-79 11 1 2 54 27 1 2 88 4 6 1
-79 10 1 22 54 21 4 4 88 4 7 2
-79 9 1 17 54 21 4 2 88 4 7 2
-78 92 1 14 48 30 4 3 76 2 3 1
-78 91 1 15 48 30 3 3 76 1 1 1
-78 90 1 11 48 23 1 1 76 1 2 2
-78 89 1 12 48 23 3 1 76 5 9 4
-78 88 1 13 48 23 3 2 76 5 9 4
-78 87 1 14 48 23 3 3 76 5 9 4
-78 86 1 15 48 23 3 4 76 5 9 4
-78 85 1 11 47 1 3 2 76 5 10 1
-78 84 1 12 47 1 3 4 76 5 10 1
-78 83 1 13 47 1 2 1 75 12 30 1
-78 82 1 14 47 1 2 2 75 12 30 1
-78 81 1 15 47 1 4 5 75 12 32 3
-78 80 1 11 47 4 3 2 75 12 31 2
-78 79 1 12 47 4 3 5 75 12 31 2
-78 78 1 13 47 4 4 3 75 16 39 1
-78 77 1 14 47 4 2 1 75 15 37 1
-78 76 1 15 47 4 2 3 75 15 37 1
-78 75 1 11 47 8 3 2 75 15 38 2
-78 74 1 12 47 8 3 4 75 15 38 2
-78 73 1 13 47 8 2 1 93 2 3 1
-78 72 1 14 47 8 2 2 93 2 3 1
-78 71 1 15 47 8 4 5 93 2 4 2
-78 70 1 11 47 14 3 1 93 1 2 2
-78 69 1 12 47 14 3 2 93 1 2 2
-78 68 1 13 47 14 3 4 93 1 2 2
-78 67 1 14 47 14 3 5 93 1 2 2
-78 66 1 15 47 14 4 5 93 5 9 1
-78 65 1 11 47 21 2 1 92 8 15 1
-78 64 1 12 47 21 2 4 92 8 15 1
-78 63 1 13 47 21 3 1 92 7 14 2
-78 62 1 14 47 21 3 2 92 7 14 2
-78 61 1 15 47 21 3 4 92 7 14 2
-78 60 1 11 47 29 3 2 92 10 18 1
-78 59 1 12 47 29 3 4 92 10 18 1
-78 58 1 13 47 29 3 5 92 10 18 1
-78 57 1 14 47 29 4 2 92 9 17 1
-78 56 1 15 47 29 4 5 92 9 17 1
-78 55 1 11 46 5 3 2 91 12 23 1
-78 54 1 12 46 5 3 4 91 12 23 1
-78 53 1 13 46 5 3 5 91 12 23 1
-78 52 1 14 46 5 4 2 91 11 22 1
-78 51 1 15 46 5 4 5 91 11 22 1
-78 50 1 23 46 13 4 3 91 10 21 1
-78 49 1 18 46 13 4 1 91 10 21 1
-78 48 1 13 46 13 3 4 91 9 19 1
-78 47 1 8 46 13 3 2 91 9 19 1
-78 46 1 3 46 13 3 1 91 9 19 1
-78 45 1 23 46 20 4 3 108 12 22 1
-78 44 1 18 46 20 4 1 108 12 22 1
-78 43 1 13 46 20 3 4 108 11 20 1
-78 42 1 8 46 20 3 2 108 11 20 1
-78 41 1 3 46 20 3 1 108 11 20 1
-78 40 1 23 46 26 3 5 108 6 13 2
-78 39 1 18 46 26 3 4 108 6 13 2
-78 38 1 13 46 26 3 2 108 6 13 2
-78 37 1 8 46 26 2 5 108 5 10 1
-78 36 1 3 46 26 2 3 108 5 10 1
-78 35 1 23 54 7 4 3 107 8 14 1
-78 34 1 18 54 7 3 5 107 4 8 2
-78 33 1 13 54 7 3 3 107 4 8 2
-78 32 1 8 54 7 3 2 107 4 8 2
-78 31 1 3 54 7 3 1 107 4 8 2
-78 30 1 23 54 11 2 5 107 3 5 1
-78 29 1 18 54 11 2 2 107 3 5 1
-78 28 1 13 54 11 4 1 107 3 6 2
-78 27 1 8 54 11 3 5 89 14 36 2
-78 26 1 3 54 11 3 2 89 14 36 2
-78 25 1 23 54 18 2 5 89 14 35 1
-78 24 1 18 54 18 2 2 89 14 35 1
-78 23 1 13 54 18 4 1 89 14 37 3
-78 22 1 8 54 18 3 5 89 9 23 2
-78 21 1 3 54 18 3 2 89 9 23 2
-78 20 1 23 54 25 2 5 89 9 24 3
-78 19 1 18 54 25 2 2 89 9 24 3
-78 18 1 13 54 25 4 1 89 9 22 1
-78 17 1 8 54 25 3 5 88 8 18 2
-78 16 1 3 54 25 3 2 88 8 18 2
-78 15 1 23 54 27 3 5 88 8 19 3
-78 14 1 18 54 27 3 4 88 8 19 3
-78 13 1 13 54 27 3 3 88 8 19 3
-78 12 1 8 54 27 3 2 88 8 19 3
-78 11 1 3 54 27 1 3 88 4 6 1
-78 10 1 23 54 21 4 5 88 4 7 2
-78 9 1 18 54 21 5 1 88 3 5 1
-77 92 1 19 48 30 4 2 76 2 3 1
-77 91 1 20 48 30 4 5 76 2 3 1
-77 90 1 16 48 23 5 2 76 6 12 1
-77 89 1 17 48 23 5 4 76 6 12 1
-77 88 1 18 48 23 4 1 76 5 11 2
-77 87 1 19 48 23 4 3 76 5 11 2
-77 86 1 20 48 23 4 5 76 5 11 2
-77 85 1 16 47 1 3 1 76 5 10 1
-77 84 1 17 47 1 5 3 76 9 21 1
-77 83 1 18 47 1 5 5 76 9 21 1
-77 82 1 19 47 1 4 2 75 12 32 3
-77 81 1 20 47 1 4 4 75 12 32 3
-77 80 1 16 47 4 3 1 75 12 31 2
-77 79 1 17 47 4 4 1 75 16 39 1
-77 78 1 18 47 4 4 2 75 16 39 1
-77 77 1 19 47 4 4 4 75 16 39 1
-77 76 1 20 47 4 4 5 75 16 39 1
-77 75 1 16 47 8 3 1 75 15 38 2
-77 74 1 17 47 8 5 3 93 3 5 1
-77 73 1 18 47 8 4 1 93 2 4 2
-77 72 1 19 47 8 4 2 93 2 4 2
-77 71 1 20 47 8 4 4 93 2 4 2
-77 70 1 16 47 14 5 2 93 6 10 1
-77 69 1 17 47 14 5 4 93 6 10 1
-77 68 1 18 47 14 3 3 93 1 2 2
-77 67 1 19 47 14 4 2 93 5 9 1
-77 66 1 20 47 14 4 4 93 5 9 1
-77 65 1 16 47 21 4 2 92 8 16 2
-77 64 1 17 47 21 4 4 92 8 16 2
-77 63 1 18 47 21 4 5 92 8 16 2
-77 62 1 19 47 21 5 3 92 11 20 1
-77 61 1 20 47 21 5 5 92 11 20 1
-77 60 1 16 47 29 3 1 92 10 18 1
-77 59 1 17 47 29 3 3 92 10 18 1
-77 58 1 18 47 29 5 4 92 10 19 2
-77 57 1 19 47 29 4 1 92 9 17 1
-77 56 1 20 47 29 4 4 92 9 17 1
-77 55 1 16 46 5 3 1 91 12 23 1
-77 54 1 17 46 5 3 3 91 12 23 1
-77 53 1 18 46 5 5 4 91 12 24 2
-77 52 1 19 46 5 4 1 91 11 22 1
-77 51 1 20 46 5 4 4 91 11 22 1
-77 50 1 24 46 13 4 4 91 10 21 1
-77 49 1 19 46 13 4 2 91 10 21 1
-77 48 1 14 46 13 3 5 91 9 19 1
-77 47 1 9 46 13 3 3 91 9 19 1
-77 46 1 4 46 13 5 1 91 9 20 2
-77 45 1 24 46 20 4 4 108 12 22 1
-77 44 1 19 46 20 4 2 108 12 22 1
-77 43 1 14 46 20 3 5 108 11 20 1
-77 42 1 9 46 20 3 3 108 11 20 1
-77 41 1 4 46 20 5 1 108 11 21 2
-77 40 1 24 46 26 5 4 108 10 18 1
-77 39 1 19 46 26 5 2 108 10 18 1
-77 38 1 14 46 26 4 5 108 5 11 2
-77 37 1 9 46 26 4 3 108 5 11 2
-77 36 1 4 46 26 4 1 108 5 11 2
-77 35 1 24 54 7 4 4 107 8 14 1
-77 34 1 19 54 7 4 1 107 8 14 1
-77 33 1 14 54 7 3 4 107 4 8 2
-77 32 1 9 54 7 5 3 107 7 12 1
-77 31 1 4 54 7 5 1 107 7 12 1
-77 30 1 24 54 11 4 4 107 3 6 2
-77 29 1 19 54 11 4 3 107 3 6 2
-77 28 1 14 54 11 4 2 107 3 6 2
-77 27 1 9 54 11 5 2 107 2 3 1
-77 26 1 4 54 11 3 3 89 14 36 2
-77 25 1 24 54 18 4 4 89 14 37 3
-77 24 1 19 54 18 4 2 89 14 37 3
-77 23 1 14 54 18 5 4 89 13 34 2
-77 22 1 9 54 18 5 2 89 13 34 2
-77 21 1 4 54 18 3 3 89 9 23 2
-77 20 1 24 54 25 4 4 89 9 22 1
-77 19 1 19 54 25 4 2 89 9 22 1
-77 18 1 14 54 25 5 4 88 12 30 2
-77 17 1 9 54 25 5 2 88 12 30 2
-77 16 1 4 54 25 3 3 88 8 18 2
-77 15 1 24 54 27 4 4 88 8 17 1
-77 14 1 19 54 27 4 2 88 8 17 1
-77 13 1 14 54 27 4 1 88 8 17 1
-77 12 1 9 54 27 5 3 88 7 16 3
-77 11 1 4 54 27 5 1 88 7 16 3
-77 10 1 24 54 21 5 4 88 3 5 1
-77 9 1 19 54 21 5 2 88 3 5 1
-76 92 1 24 48 30 4 1 76 2 3 1
-76 91 1 25 48 30 4 4 76 2 3 1
-76 90 1 21 48 23 5 1 76 6 12 1
-76 89 1 22 48 23 5 3 76 6 12 1
-76 88 1 23 48 23 5 5 76 6 12 1
-76 87 1 24 48 23 4 2 76 5 11 2
-76 86 1 25 48 23 4 4 76 5 11 2
-76 85 1 21 47 1 5 1 76 9 21 1
-76 84 1 22 47 1 5 2 76 9 21 1
-76 83 1 23 47 1 5 4 76 9 21 1
-76 82 1 24 47 1 4 1 75 12 32 3
-76 81 1 25 47 1 4 3 75 12 32 3
-76 80 1 21 47 4 5 1 75 16 40 2
-76 79 1 22 47 4 5 2 75 16 40 2
-76 78 1 23 47 4 5 3 75 16 40 2
-76 77 1 24 47 4 5 4 75 16 40 2
-76 76 1 25 47 4 5 5 75 16 40 2
-76 75 1 21 47 8 5 1 93 3 5 1
-76 74 1 22 47 8 5 2 93 3 5 1
-76 73 1 23 47 8 5 4 93 3 5 1
-76 72 1 24 47 8 5 5 93 3 5 1
-76 71 1 25 47 8 4 3 93 2 4 2
-76 70 1 21 47 14 5 1 93 6 10 1
-76 69 1 22 47 14 5 3 93 6 10 1
-76 68 1 23 47 14 5 5 93 6 10 1
-76 67 1 24 47 14 4 1 93 5 9 1
-76 66 1 25 47 14 4 3 93 5 9 1
-76 65 1 21 47 21 4 1 92 8 16 2
-76 64 1 22 47 21 4 3 92 8 16 2
-76 63 1 23 47 21 5 1 92 11 20 1
-76 62 1 24 47 21 5 2 92 11 20 1
-76 61 1 25 47 21 5 4 92 11 20 1
-76 60 1 21 47 29 5 1 92 10 19 2
-76 59 1 22 47 29 5 2 92 10 19 2
-76 58 1 23 47 29 5 3 92 10 19 2
-76 57 1 24 47 29 5 5 92 10 19 2
-76 56 1 25 47 29 4 3 92 9 17 1
-76 55 1 21 46 5 5 1 91 12 24 2
-76 54 1 22 46 5 5 2 91 12 24 2
-76 53 1 23 46 5 5 3 91 12 24 2
-76 52 1 24 46 5 5 5 91 12 24 2
-76 51 1 25 46 5 4 3 91 11 22 1
-76 50 1 25 46 13 4 5 91 10 21 1
-76 49 1 20 46 13 5 5 91 9 20 2
-76 48 1 15 46 13 5 4 91 9 20 2
-76 47 1 10 46 13 5 3 91 9 20 2
-76 46 1 5 46 13 5 2 91 9 20 2
-76 45 1 25 46 20 4 5 108 12 22 1
-76 44 1 20 46 20 5 5 108 11 21 2
-76 43 1 15 46 20 5 4 108 11 21 2
-76 42 1 10 46 20 5 3 108 11 21 2
-76 41 1 5 46 20 5 2 108 11 21 2
-76 40 1 25 46 26 5 5 108 10 18 1
-76 39 1 20 46 26 5 3 108 10 18 1
-76 38 1 15 46 26 5 1 108 10 18 1
-76 37 1 10 46 26 4 4 108 5 11 2
-76 36 1 5 46 26 4 2 108 5 11 2
-76 35 1 25 54 7 4 5 107 8 14 1
-76 34 1 20 54 7 4 2 107 8 14 1
-76 33 1 15 54 7 5 5 107 7 12 1
-76 32 1 10 54 7 5 4 107 7 12 1
-76 31 1 5 54 7 5 2 107 7 12 1
-76 30 1 25 54 11 4 5 107 3 6 2
-76 29 1 20 54 11 5 5 107 2 3 1
-76 28 1 15 54 11 5 4 107 2 3 1
-76 27 1 10 54 11 5 3 107 2 3 1
-76 26 1 5 54 11 5 1 107 2 3 1
-76 25 1 25 54 18 4 5 89 14 37 3
-76 24 1 20 54 18 4 3 89 14 37 3
-76 23 1 15 54 18 5 5 89 13 34 2
-76 22 1 10 54 18 5 3 89 13 34 2
-76 21 1 5 54 18 5 1 89 13 34 2
-76 20 1 25 54 25 4 5 89 9 22 1
-76 19 1 20 54 25 4 3 89 9 22 1
-76 18 1 15 54 25 5 5 88 12 30 2
-76 17 1 10 54 25 5 3 88 12 30 2
-76 16 1 5 54 25 5 1 88 12 30 2
-76 15 1 25 54 27 4 5 88 8 17 1
-76 14 1 20 54 27 4 3 88 8 17 1
-76 13 1 15 54 27 5 5 88 7 16 3
-76 12 1 10 54 27 5 4 88 7 16 3
-76 11 1 5 54 27 5 2 88 7 16 3
-76 10 1 25 54 21 5 5 88 3 5 1
-76 9 1 20 54 21 5 3 88 3 5 1
-75 95 1 1 48 19 1 1 76 3 4 1
-75 94 1 2 48 19 1 2 76 3 4 1
-75 93 1 3 48 19 1 3 76 3 4 1
-75 92 1 4 48 19 1 4 76 3 4 1
-75 91 1 5 48 19 1 5 76 3 4 1
-75 90 1 1 48 22 1 2 76 6 13 2
-75 89 1 2 48 22 1 3 76 6 13 2
-75 88 1 3 48 22 1 4 76 6 13 2
-75 87 1 4 48 22 1 5 76 6 13 2
-75 86 1 5 48 22 3 5 76 10 23 1
-75 85 1 1 48 26 1 1 76 9 22 2
-75 84 1 2 48 26 1 2 76 9 22 2
-75 83 1 3 48 26 1 4 76 9 22 2
-75 82 1 4 48 26 1 5 76 9 22 2
-75 81 1 5 48 26 2 5 76 13 31 1
-75 80 1 1 48 29 3 4 76 13 32 2
-75 79 1 2 48 29 1 2 75 16 41 3
-75 78 1 3 48 29 1 4 75 16 41 3
-75 77 1 4 48 29 1 5 75 16 41 3
-75 76 1 5 48 29 2 5 93 4 7 1
-75 75 1 1 47 7 2 3 93 4 8 2
-75 74 1 2 47 7 1 1 93 3 6 2
-75 73 1 3 47 7 1 3 93 3 6 2
-75 72 1 4 47 7 1 5 93 3 6 2
-75 71 1 5 47 7 3 5 93 7 12 1
-75 70 1 1 47 13 1 2 93 6 11 2
-75 69 1 2 47 13 1 4 93 6 11 2
-75 68 1 3 47 13 1 5 93 6 11 2
-75 67 1 4 47 13 2 3 93 9 15 1
-75 66 1 5 47 13 2 5 93 9 15 1
-75 65 1 1 47 20 3 4 93 9 16 2
-75 64 1 2 47 20 1 2 92 12 22 1
-75 63 1 3 47 20 1 5 92 12 22 1
-75 62 1 4 47 20 2 2 92 11 21 2
-75 61 1 5 47 20 2 5 92 11 21 2
-75 60 1 1 47 28 2 3 92 15 27 1
-75 59 1 2 47 28 1 1 92 14 25 1
-75 58 1 3 47 28 1 3 92 14 25 1
-75 57 1 4 47 28 1 5 92 14 25 1
-75 56 1 5 47 28 4 5 92 13 23 1
-75 55 1 1 46 4 3 4 92 13 24 2
-75 54 1 2 46 4 1 2 91 16 28 1
-75 53 1 3 46 4 1 5 91 16 28 1
-75 52 1 4 46 4 2 2 91 15 27 1
-75 51 1 5 46 4 2 5 91 15 27 1
-75 50 1 21 46 12 1 3 91 14 26 1
-75 49 1 16 46 12 1 1 91 14 26 1
-75 48 1 11 46 12 2 3 91 13 25 1
-75 47 1 6 46 12 2 1 91 13 25 1
-75 46 1 1 46 12 3 1 108 16 28 1
-75 45 1 21 46 19 4 1 108 16 29 2
-75 44 1 16 46 19 1 4 108 15 26 1
-75 43 1 11 46 19 1 2 108 15 26 1
-75 42 1 6 46 19 1 1 108 15 26 1
-75 41 1 1 46 19 2 1 108 14 24 1
-75 40 1 21 46 25 1 3 108 10 19 2
-75 39 1 16 46 25 1 1 108 10 19 2
-75 38 1 11 46 25 2 3 108 9 17 1
-75 37 1 6 46 25 2 1 108 9 17 1
-75 36 1 1 46 25 3 1 107 12 21 1
-75 35 1 21 54 6 2 4 107 12 22 2
-75 34 1 16 54 6 2 2 107 12 22 2
-75 33 1 11 54 6 1 5 107 7 13 2
-75 32 1 6 54 6 1 3 107 7 13 2
-75 31 1 1 54 6 1 1 107 7 13 2
-75 30 1 21 54 10 2 3 107 6 10 1
-75 29 1 16 54 10 2 1 107 6 10 1
-75 28 1 11 54 10 1 4 107 2 4 2
-75 27 1 6 54 10 1 2 107 2 4 2
-75 26 1 1 54 10 1 1 107 2 4 2
-75 25 1 21 54 17 2 2 107 1 2 2
-75 24 1 16 54 17 1 5 89 13 33 1
-75 23 1 11 54 17 1 3 89 13 33 1
-75 22 1 6 54 17 1 1 89 13 33 1
-75 21 1 1 54 17 3 1 88 16 39 1
-75 20 1 21 54 24 2 3 88 16 40 2
-75 19 1 16 54 24 1 5 88 12 29 1
-75 18 1 11 54 24 1 3 88 12 29 1
-75 17 1 6 54 24 1 2 88 12 29 1
-75 16 1 1 54 24 1 1 88 12 29 1
-75 15 1 21 54 30 3 2 88 11 27 2
-75 14 1 16 54 30 1 4 88 7 15 2
-75 13 1 11 54 30 1 3 88 7 15 2
-75 12 1 6 54 30 1 2 88 7 15 2
-75 11 1 1 54 30 1 1 88 7 15 2
-75 10 1 21 54 31 1 5 88 2 4 3
-75 9 1 16 54 31 1 4 88 2 4 3
-75 8 1 11 54 31 1 3 88 2 4 3
-75 7 1 6 54 31 1 2 88 2 4 3
-75 6 1 1 54 31 1 1 88 2 4 3
-74 95 1 6 48 19 2 2 76 3 5 2
-74 94 1 7 48 19 2 4 76 3 5 2
-74 93 1 8 48 19 2 5 76 3 5 2
-74 92 1 9 48 19 3 3 76 7 15 1
-74 91 1 10 48 19 3 5 76 7 15 1
-74 90 1 6 48 22 1 1 76 6 13 2
-74 89 1 7 48 22 2 2 76 6 14 3
-74 88 1 8 48 22 2 4 76 6 14 3
-74 87 1 9 48 22 2 5 76 6 14 3
-74 86 1 10 48 22 3 4 76 10 23 1
-74 85 1 6 48 26 3 2 76 10 24 2
-74 84 1 7 48 26 3 4 76 10 24 2
-74 83 1 8 48 26 1 3 76 9 22 2
-74 82 1 9 48 26 2 2 76 13 31 1
-74 81 1 10 48 26 2 4 76 13 31 1
-74 80 1 6 48 29 3 3 76 13 32 2
-74 79 1 7 48 29 1 1 75 16 41 3
-74 78 1 8 48 29 1 3 75 16 41 3
-74 77 1 9 48 29 2 1 93 4 7 1
-74 76 1 10 48 29 2 4 93 4 7 1
-74 75 1 6 47 7 2 2 93 4 8 2
-74 74 1 7 47 7 2 5 93 4 8 2
-74 73 1 8 47 7 1 2 93 3 6 2
-74 72 1 9 47 7 1 4 93 3 6 2
-74 71 1 10 47 7 3 4 93 7 12 1
-74 70 1 6 47 13 1 1 93 6 11 2
-74 69 1 7 47 13 1 3 93 6 11 2
-74 68 1 8 47 13 2 1 93 9 15 1
-74 67 1 9 47 13 2 2 93 9 15 1
-74 66 1 10 47 13 2 4 93 9 15 1
-74 65 1 6 47 20 3 3 93 9 16 2
-74 64 1 7 47 20 1 1 92 12 22 1
-74 63 1 8 47 20 1 4 92 12 22 1
-74 62 1 9 47 20 2 1 92 11 21 2
-74 61 1 10 47 20 2 4 92 11 21 2
-74 60 1 6 47 28 2 2 92 15 27 1
-74 59 1 7 47 28 2 5 92 15 27 1
-74 58 1 8 47 28 1 2 92 14 25 1
-74 57 1 9 47 28 1 4 92 14 25 1
-74 56 1 10 47 28 4 4 92 13 23 1
-74 55 1 6 46 4 3 3 92 13 24 2
-74 54 1 7 46 4 1 1 91 16 28 1
-74 53 1 8 46 4 1 4 91 16 28 1
-74 52 1 9 46 4 2 1 91 15 27 1
-74 51 1 10 46 4 2 4 91 15 27 1
-74 50 1 22 46 12 1 4 91 14 26 1
-74 49 1 17 46 12 1 2 91 14 26 1
-74 48 1 12 46 12 2 4 91 13 25 1
-74 47 1 7 46 12 2 2 91 13 25 1
-74 46 1 2 46 12 3 2 108 16 28 1
-74 45 1 22 46 19 4 2 108 16 29 2
-74 44 1 17 46 19 1 5 108 15 26 1
-74 43 1 12 46 19 1 3 108 15 26 1
-74 42 1 7 46 19 2 4 108 14 24 1
-74 41 1 2 46 19 2 2 108 14 24 1
-74 40 1 22 46 25 1 4 108 10 19 2
-74 39 1 17 46 25 1 2 108 10 19 2
-74 38 1 12 46 25 2 4 108 9 17 1
-74 37 1 7 46 25 2 2 108 9 17 1
-74 36 1 2 46 25 3 2 107 12 21 1
-74 35 1 22 54 6 2 5 107 12 22 2
-74 34 1 17 54 6 2 3 107 12 22 2
-74 33 1 12 54 6 2 1 107 12 22 2
-74 32 1 7 54 6 1 4 107 7 13 2
-74 31 1 2 54 6 1 2 107 7 13 2
-74 30 1 22 54 10 2 4 107 6 10 1
-74 29 1 17 54 10 2 2 107 6 10 1
-74 28 1 12 54 10 1 5 107 2 4 2
-74 27 1 7 54 10 1 3 107 2 4 2
-74 26 1 2 54 10 3 1 107 1 1 1
-74 25 1 22 54 17 2 3 107 1 2 2
-74 24 1 17 54 17 2 1 107 1 2 2
-74 23 1 12 54 17 1 4 89 13 33 1
-74 22 1 7 54 17 1 2 89 13 33 1
-74 21 1 2 54 17 3 2 88 16 39 1
-74 20 1 22 54 24 2 4 88 16 40 2
-74 19 1 17 54 24 2 1 88 16 40 2
-74 18 1 12 54 24 1 4 88 12 29 1
-74 17 1 7 54 24 3 3 88 11 28 3
-74 16 1 2 54 24 3 1 88 11 28 3
-74 15 1 22 54 30 3 3 88 11 27 2
-74 14 1 17 54 30 1 5 88 7 15 2
-74 13 1 12 54 30 2 4 88 7 14 1
-74 12 1 7 54 30 2 2 88 7 14 1
-74 11 1 2 54 30 2 1 88 7 14 1
-74 10 1 22 54 31 3 3 88 6 13 3
-74 9 1 17 54 31 3 1 88 6 13 3
-74 8 1 12 54 31 2 4 88 2 3 2
-74 7 1 7 54 31 2 2 88 2 3 2
-74 6 1 2 54 31 2 1 88 2 3 2
-73 95 1 11 48 19 2 1 76 3 5 2
-73 94 1 12 48 19 2 3 76 3 5 2
-73 93 1 13 48 19 4 5 76 3 6 3
-73 92 1 14 48 19 3 2 76 7 15 1
-73 91 1 15 48 19 3 4 76 7 15 1
-73 90 1 11 48 22 4 3 76 7 16 2
-73 89 1 12 48 22 2 1 76 6 14 3
-73 88 1 13 48 22 2 3 76 6 14 3
-73 87 1 14 48 22 3 1 76 10 23 1
-73 86 1 15 48 22 3 3 76 10 23 1
-73 85 1 11 48 26 3 1 76 10 24 2
-73 84 1 12 48 26 3 3 76 10 24 2
-73 83 1 13 48 26 3 5 76 10 24 2
-73 82 1 14 48 26 2 1 76 13 31 1
-73 81 1 15 48 26 2 3 76 13 31 1
-73 80 1 11 48 29 3 2 76 13 32 2
-73 79 1 12 48 29 3 5 76 13 32 2
-73 78 1 13 48 29 4 3 94 1 1 1
-73 77 1 14 48 29 4 5 94 1 1 1
-73 76 1 15 48 29 2 3 93 4 7 1
-73 75 1 11 47 7 2 1 93 4 8 2
-73 74 1 12 47 7 2 4 93 4 8 2
-73 73 1 13 47 7 3 1 93 7 12 1
-73 72 1 14 47 7 3 2 93 7 12 1
-73 71 1 15 47 7 3 3 93 7 12 1
-73 70 1 11 47 13 4 3 93 11 19 1
-73 69 1 12 47 13 3 1 93 10 17 1
-73 68 1 13 47 13 3 3 93 10 17 1
-73 67 1 14 47 13 3 4 93 10 17 1
-73 66 1 15 47 13 3 5 93 10 17 1
-73 65 1 11 47 20 3 2 93 9 16 2
-73 64 1 12 47 20 3 5 93 9 16 2
-73 63 1 13 47 20 1 3 92 12 22 1
-73 62 1 14 47 20 4 3 92 16 29 1
-73 61 1 15 47 20 2 3 92 11 21 2
-73 60 1 11 47 28 2 1 92 15 27 1
-73 59 1 12 47 28 2 4 92 15 27 1
-73 58 1 13 47 28 3 2 92 14 26 2
-73 57 1 14 47 28 3 5 92 14 26 2
-73 56 1 15 47 28 4 3 92 13 23 1
-73 55 1 11 46 4 3 2 92 13 24 2
-73 54 1 12 46 4 3 5 92 13 24 2
-73 53 1 13 46 4 1 3 91 16 28 1
-73 52 1 14 46 4 4 3 91 19 33 1
-73 51 1 15 46 4 2 3 91 15 27 1
-73 50 1 23 46 12 1 5 91 14 26 1
-73 49 1 18 46 12 4 1 91 18 31 1
-73 48 1 13 46 12 2 5 91 13 25 1
-73 47 1 8 46 12 3 5 108 16 28 1
-73 46 1 3 46 12 3 3 108 16 28 1
-73 45 1 23 46 19 4 3 108 16 29 2
-73 44 1 18 46 19 3 3 108 15 27 2
-73 43 1 13 46 19 3 1 108 15 27 2
-73 42 1 8 46 19 2 5 108 14 24 1
-73 41 1 3 46 19 2 3 108 14 24 1
-73 40 1 23 46 25 1 5 108 10 19 2
-73 39 1 18 46 25 4 1 108 13 23 1
-73 38 1 13 46 25 2 5 108 9 17 1
-73 37 1 8 46 25 3 5 107 12 21 1
-73 36 1 3 46 25 3 3 107 12 21 1
-73 35 1 23 54 6 3 4 107 11 19 1
-73 34 1 18 54 6 3 3 107 11 19 1
-73 33 1 13 54 6 3 2 107 11 19 1
-73 32 1 8 54 6 3 1 107 11 19 1
-73 31 1 3 54 6 4 1 107 10 17 1
-73 30 1 23 54 10 2 5 107 6 10 1
-73 29 1 18 54 10 4 1 107 6 11 2
-73 28 1 13 54 10 5 3 107 5 9 1
-73 27 1 8 54 10 3 4 107 1 1 1
-73 26 1 3 54 10 3 2 107 1 1 1
-73 25 1 23 54 17 2 4 107 1 2 2
-73 24 1 18 54 17 4 4 106 4 8 2
-73 23 1 13 54 17 4 2 106 4 8 2
-73 22 1 8 54 17 3 5 88 16 39 1
-73 21 1 3 54 17 3 3 88 16 39 1
-73 20 1 23 54 24 2 5 88 16 40 2
-73 19 1 18 54 24 2 2 88 16 40 2
-73 18 1 13 54 24 3 5 88 11 28 3
-73 17 1 8 54 24 3 4 88 11 28 3
-73 16 1 3 54 24 3 2 88 11 28 3
-73 15 1 23 54 30 3 4 88 11 27 2
-73 14 1 18 54 30 3 1 88 11 27 2
-73 13 1 13 54 30 2 5 88 7 14 1
-73 12 1 8 54 30 2 3 88 7 14 1
-73 11 1 3 54 30 4 1 88 6 11 1
-73 10 1 23 54 31 3 4 88 6 13 3
-73 9 1 18 54 31 3 2 88 6 13 3
-73 8 1 13 54 31 2 5 88 2 3 2
-73 7 1 8 54 31 2 3 88 2 3 2
-73 6 1 3 54 31 4 1 88 2 2 1
-72 95 1 16 48 19 4 2 76 3 6 3
-72 94 1 17 48 19 4 4 76 3 6 3
-72 93 1 18 48 19 3 1 76 7 15 1
-72 92 1 19 48 19 5 3 76 7 17 3
-72 91 1 20 48 19 5 5 76 7 17 3
-72 90 1 16 48 22 4 2 76 7 16 2
-72 89 1 17 48 22 4 5 76 7 16 2
-72 88 1 18 48 22 5 2 76 11 26 1
-72 87 1 19 48 22 5 4 76 11 26 1
-72 86 1 20 48 22 3 2 76 10 23 1
-72 85 1 16 48 26 4 2 76 10 25 3
-72 84 1 17 48 26 4 4 76 10 25 3
-72 83 1 18 48 26 4 5 76 10 25 3
-72 82 1 19 48 26 5 3 76 14 33 1
-72 81 1 20 48 26 5 5 76 14 33 1
-72 80 1 16 48 29 3 1 76 13 32 2
-72 79 1 17 48 29 4 1 94 1 1 1
-72 78 1 18 48 29 4 2 94 1 1 1
-72 77 1 19 48 29 4 4 94 1 1 1
-72 76 1 20 48 29 2 2 93 4 7 1
-72 75 1 16 47 7 4 1 93 8 13 1
-72 74 1 17 47 7 4 2 93 8 13 1
-72 73 1 18 47 7 4 3 93 8 13 1
-72 72 1 19 47 7 4 4 93 8 13 1
-72 71 1 20 47 7 4 5 93 8 13 1
-72 70 1 16 47 13 4 2 93 11 19 1
-72 69 1 17 47 13 4 5 93 11 19 1
-72 68 1 18 47 13 3 2 93 10 17 1
-72 67 1 19 47 13 5 3 93 10 18 2
-72 66 1 20 47 13 5 5 93 10 18 2
-72 65 1 16 47 20 3 1 93 9 16 2
-72 64 1 17 47 20 5 3 93 13 23 1
-72 63 1 18 47 20 5 5 93 13 23 1
-72 62 1 19 47 20 4 2 92 16 29 1
-72 61 1 20 47 20 4 5 92 16 29 1
-72 60 1 16 47 28 5 2 92 15 28 2
-72 59 1 17 47 28 5 4 92 15 28 2
-72 58 1 18 47 28 3 1 92 14 26 2
-72 57 1 19 47 28 3 4 92 14 26 2
-72 56 1 20 47 28 4 2 92 13 23 1
-72 55 1 16 46 4 3 1 92 13 24 2
-72 54 1 17 46 4 5 3 91 20 35 1
-72 53 1 18 46 4 5 5 91 20 35 1
-72 52 1 19 46 4 4 2 91 19 33 1
-72 51 1 20 46 4 4 5 91 19 33 1
-72 50 1 24 46 12 4 4 91 18 31 1
-72 49 1 19 46 12 4 2 91 18 31 1
-72 48 1 14 46 12 5 4 91 17 29 1
-72 47 1 9 46 12 5 2 91 17 29 1
-72 46 1 4 46 12 3 4 108 16 28 1
-72 45 1 24 46 19 4 4 108 16 29 2
-72 44 1 19 46 19 3 4 108 15 27 2
-72 43 1 14 46 19 3 2 108 15 27 2
-72 42 1 9 46 19 5 3 108 14 25 2
-72 41 1 4 46 19 5 1 108 14 25 2
-72 40 1 24 46 25 4 4 108 13 23 1
-72 39 1 19 46 25 4 2 108 13 23 1
-72 38 1 14 46 25 5 4 107 16 27 1
-72 37 1 9 46 25 5 2 107 16 27 1
-72 36 1 4 46 25 3 4 107 12 21 1
-72 35 1 24 54 6 3 5 107 11 19 1
-72 34 1 19 54 6 5 3 107 11 20 2
-72 33 1 14 54 6 5 1 107 11 20 2
-72 32 1 9 54 6 4 4 107 10 17 1
-72 31 1 4 54 6 4 2 107 10 17 1
-72 30 1 24 54 10 4 4 107 6 11 2
-72 29 1 19 54 10 4 2 107 6 11 2
-72 28 1 14 54 10 5 4 107 5 9 1
-72 27 1 9 54 10 3 5 107 1 1 1
-72 26 1 4 54 10 3 3 107 1 1 1
-72 25 1 24 54 17 2 5 107 1 2 2
-72 24 1 19 54 17 4 5 106 4 8 2
-72 23 1 14 54 17 4 3 106 4 8 2
-72 22 1 9 54 17 4 1 106 4 8 2
-72 21 1 4 54 17 3 4 88 16 39 1
-72 20 1 24 54 24 5 4 88 15 38 2
-72 19 1 19 54 24 5 2 88 15 38 2
-72 18 1 14 54 24 4 5 88 11 26 1
-72 17 1 9 54 24 4 3 88 11 26 1
-72 16 1 4 54 24 4 1 88 11 26 1
-72 15 1 24 54 30 3 5 88 11 27 2
-72 14 1 19 54 30 5 3 88 10 25 3
-72 13 1 14 54 30 5 1 88 10 25 3
-72 12 1 9 54 30 4 4 88 6 11 1
-72 11 1 4 54 30 4 2 88 6 11 1
-72 10 1 24 54 31 3 5 88 6 13 3
-72 9 1 19 54 31 5 3 88 6 12 2
-72 8 1 14 54 31 5 1 88 6 12 2
-72 7 1 9 54 31 4 4 88 2 2 1
-72 6 1 4 54 31 4 2 88 2 2 1
-71 95 1 21 48 19 4 1 76 3 6 3
-71 94 1 22 48 19 4 3 76 3 6 3
-71 93 1 23 48 19 5 1 76 7 17 3
-71 92 1 24 48 19 5 2 76 7 17 3
-71 91 1 25 48 19 5 4 76 7 17 3
-71 90 1 21 48 22 4 1 76 7 16 2
-71 89 1 22 48 22 4 4 76 7 16 2
-71 88 1 23 48 22 5 1 76 11 26 1
-71 87 1 24 48 22 5 3 76 11 26 1
-71 86 1 25 48 22 5 5 76 11 26 1
-71 85 1 21 48 26 4 1 76 10 25 3
-71 84 1 22 48 26 4 3 76 10 25 3
-71 83 1 23 48 26 5 1 76 14 33 1
-71 82 1 24 48 26 5 2 76 14 33 1
-71 81 1 25 48 26 5 4 76 14 33 1
-71 80 1 21 48 29 5 1 94 1 2 2
-71 79 1 22 48 29 5 2 94 1 2 2
-71 78 1 23 48 29 5 3 94 1 2 2
-71 77 1 24 48 29 5 4 94 1 2 2
-71 76 1 25 48 29 5 5 94 1 2 2
-71 75 1 21 47 7 5 1 93 8 14 2
-71 74 1 22 47 7 5 2 93 8 14 2
-71 73 1 23 47 7 5 3 93 8 14 2
-71 72 1 24 47 7 5 4 93 8 14 2
-71 71 1 25 47 7 5 5 93 8 14 2
-71 70 1 21 47 13 4 1 93 11 19 1
-71 69 1 22 47 13 4 4 93 11 19 1
-71 68 1 23 47 13 5 1 93 10 18 2
-71 67 1 24 47 13 5 2 93 10 18 2
-71 66 1 25 47 13 5 4 93 10 18 2
-71 65 1 21 47 20 5 1 93 13 23 1
-71 64 1 22 47 20 5 2 93 13 23 1
-71 63 1 23 47 20 5 4 93 13 23 1
-71 62 1 24 47 20 4 1 92 16 29 1
-71 61 1 25 47 20 4 4 92 16 29 1
-71 60 1 21 47 28 5 1 92 15 28 2
-71 59 1 22 47 28 5 3 92 15 28 2
-71 58 1 23 47 28 5 5 92 15 28 2
-71 57 1 24 47 28 3 3 92 14 26 2
-71 56 1 25 47 28 4 1 92 13 23 1
-71 55 1 21 46 4 5 1 91 20 35 1
-71 54 1 22 46 4 5 2 91 20 35 1
-71 53 1 23 46 4 5 4 91 20 35 1
-71 52 1 24 46 4 4 1 91 19 33 1
-71 51 1 25 46 4 4 4 91 19 33 1
-71 50 1 25 46 12 4 5 91 18 31 1
-71 49 1 20 46 12 4 3 91 18 31 1
-71 48 1 15 46 12 5 5 91 17 29 1
-71 47 1 10 46 12 5 3 91 17 29 1
-71 46 1 5 46 12 5 1 91 17 29 1
-71 45 1 25 46 19 4 5 108 16 29 2
-71 44 1 20 46 19 3 5 108 15 27 2
-71 43 1 15 46 19 5 5 108 14 25 2
-71 42 1 10 46 19 5 4 108 14 25 2
-71 41 1 5 46 19 5 2 108 14 25 2
-71 40 1 25 46 25 4 5 108 13 23 1
-71 39 1 20 46 25 4 3 108 13 23 1
-71 38 1 15 46 25 5 5 107 16 27 1
-71 37 1 10 46 25 5 3 107 16 27 1
-71 36 1 5 46 25 5 1 107 16 27 1
-71 35 1 25 54 6 5 5 107 11 20 2
-71 34 1 20 54 6 5 4 107 11 20 2
-71 33 1 15 54 6 5 2 107 11 20 2
-71 32 1 10 54 6 4 5 107 10 17 1
-71 31 1 5 54 6 4 3 107 10 17 1
-71 30 1 25 54 10 4 5 107 6 11 2
-71 29 1 20 54 10 4 3 107 6 11 2
-71 28 1 15 54 10 5 5 107 5 9 1
-71 27 1 10 54 10 5 2 107 5 9 1
-71 26 1 5 54 10 5 1 107 5 9 1
-71 25 1 25 54 17 5 5 106 4 7 1
-71 24 1 20 54 17 5 4 106 4 7 1
-71 23 1 15 54 17 5 3 106 4 7 1
-71 22 1 10 54 17 5 2 106 4 7 1
-71 21 1 5 54 17 5 1 106 4 7 1
-71 20 1 25 54 24 5 5 88 15 38 2
-71 19 1 20 54 24 5 3 88 15 38 2
-71 18 1 15 54 24 5 1 88 15 38 2
-71 17 1 10 54 24 4 4 88 11 26 1
-71 16 1 5 54 24 4 2 88 11 26 1
-71 15 1 25 54 30 5 5 88 10 25 3
-71 14 1 20 54 30 5 4 88 10 25 3
-71 13 1 15 54 30 5 2 88 10 25 3
-71 12 1 10 54 30 4 5 88 6 11 1
-71 11 1 5 54 30 4 3 88 6 11 1
-71 10 1 25 54 31 5 5 88 6 12 2
-71 9 1 20 54 31 5 4 88 6 12 2
-71 8 1 15 54 31 5 2 88 6 12 2
-71 7 1 10 54 31 4 5 88 2 2 1
-71 6 1 5 54 31 4 3 88 2 2 1
-70 95 1 1 48 18 2 3 76 4 7 1
-70 94 1 2 48 18 2 5 76 4 7 1
-70 93 1 3 48 18 1 2 76 8 18 1
-70 92 1 4 48 18 1 4 76 8 18 1
-70 91 1 5 48 18 1 5 76 8 18 1
-70 90 1 1 48 21 1 1 76 11 27 2
-70 89 1 2 48 21 1 2 76 11 27 2
-70 88 1 3 48 21 1 3 76 11 27 2
-70 87 1 4 48 21 1 4 76 11 27 2
-70 86 1 5 48 21 1 5 76 11 27 2
-70 85 1 1 48 25 2 3 76 15 35 1
-70 84 1 2 48 25 1 1 76 14 34 2
-70 83 1 3 48 25 1 2 76 14 34 2
-70 82 1 4 48 25 1 4 76 14 34 2
-70 81 1 5 48 25 1 5 76 14 34 2
-70 80 1 1 48 28 1 2 94 2 3 1
-70 79 1 2 48 28 1 4 94 2 3 1
-70 78 1 3 48 28 1 5 94 2 3 1
-70 77 1 4 48 28 2 2 94 5 9 2
-70 76 1 5 48 28 2 5 94 5 9 2
-70 75 1 1 48 32 2 3 94 5 10 1
-70 74 1 2 48 32 2 5 94 5 10 1
-70 73 1 3 48 32 1 1 93 12 21 1
-70 72 1 4 48 32 1 3 93 12 21 1
-70 71 1 5 48 32 1 5 93 12 21 1
-70 70 1 1 47 12 3 4 93 12 22 2
-70 69 1 2 47 12 1 2 93 11 20 2
-70 68 1 3 47 12 1 4 93 11 20 2
-70 67 1 4 47 12 1 5 93 11 20 2
-70 66 1 5 47 12 2 5 93 15 26 1
-70 65 1 1 47 19 2 3 93 14 25 1
-70 64 1 2 47 19 1 1 93 13 24 2
-70 63 1 3 47 19 1 3 93 13 24 2
-70 62 1 4 47 19 1 5 93 13 24 2
-70 61 1 5 47 19 3 5 93 17 29 1
-70 60 1 1 47 27 3 3 92 20 33 1
-70 59 1 2 47 27 1 2 92 19 32 1
-70 58 1 3 47 27 1 5 92 19 32 1
-70 57 1 4 47 27 2 2 92 18 31 1
-70 56 1 5 47 27 2 5 92 18 31 1
-70 55 1 1 46 3 1 3 92 17 30 1
-70 54 1 2 46 3 1 5 92 17 30 1
-70 53 1 3 46 3 2 4 91 20 36 2
-70 52 1 4 46 3 3 2 91 19 34 2
-70 51 1 5 46 3 3 5 91 19 34 2
-70 50 1 21 46 11 1 3 91 18 32 2
-70 49 1 16 46 11 1 1 91 18 32 2
-70 48 1 11 46 11 2 2 91 17 30 2
-70 47 1 6 46 11 3 4 108 20 33 1
-70 46 1 1 46 11 3 1 108 20 33 1
-70 45 1 21 46 18 1 3 108 19 32 1
-70 44 1 16 46 18 1 1 108 19 32 1
-70 43 1 11 46 18 2 3 108 18 31 1
-70 42 1 6 46 18 2 1 108 18 31 1
-70 41 1 1 46 18 3 1 108 17 30 1
-70 40 1 21 54 3 3 2 107 20 34 1
-70 39 1 16 54 3 1 4 107 16 28 2
-70 38 1 11 54 3 1 2 107 16 28 2
-70 37 1 6 54 3 1 1 107 16 28 2
-70 36 1 1 54 3 2 1 107 15 26 1
-70 35 1 21 54 5 2 3 107 14 24 1
-70 34 1 16 54 5 1 5 107 10 18 2
-70 33 1 11 54 5 1 3 107 10 18 2
-70 32 1 6 54 5 1 2 107 10 18 2
-70 31 1 1 54 5 1 1 107 10 18 2
-70 30 1 21 54 9 1 4 107 9 16 2
-70 29 1 16 54 9 1 2 107 9 16 2
-70 28 1 11 54 9 1 1 107 9 16 2
-70 27 1 6 54 9 2 4 106 8 14 1
-70 26 1 1 54 9 2 1 106 8 14 1
-70 25 1 21 54 16 2 3 106 8 15 2
-70 24 1 16 54 16 2 1 106 8 15 2
-70 23 1 11 54 16 1 4 106 3 6 2
-70 22 1 6 54 16 1 2 106 3 6 2
-70 21 1 1 54 16 1 1 106 3 6 2
-70 20 1 21 54 23 1 5 88 15 37 1
-70 19 1 16 54 23 1 3 88 15 37 1
-70 18 1 11 54 23 1 2 88 15 37 1
-70 17 1 6 54 23 1 1 88 15 37 1
-70 16 1 1 54 23 2 1 88 14 36 3
-70 15 1 21 54 28 1 5 88 10 24 2
-70 14 1 16 54 28 1 4 88 10 24 2
-70 13 1 11 54 28 1 3 88 10 24 2
-70 12 1 6 54 28 1 2 88 10 24 2
-70 11 1 1 54 28 1 1 88 10 24 2
-70 10 1 21 54 29 1 4 88 5 10 1
-70 9 1 16 54 29 1 2 88 5 10 1
-70 8 1 11 54 29 1 1 88 5 10 1
-70 7 1 6 54 29 2 4 88 1 1 1
-70 6 1 1 54 29 2 1 88 1 1 1
-69 95 1 6 48 18 2 2 76 4 7 1
-69 94 1 7 48 18 2 4 76 4 7 1
-69 93 1 8 48 18 1 1 76 8 18 1
-69 92 1 9 48 18 1 3 76 8 18 1
-69 91 1 10 48 18 3 5 76 8 19 2
-69 90 1 6 48 21 3 3 76 12 29 1
-69 89 1 7 48 21 2 1 76 11 28 3
-69 88 1 8 48 21 2 2 76 11 28 3
-69 87 1 9 48 21 2 4 76 11 28 3
-69 86 1 10 48 21 2 5 76 11 28 3
-69 85 1 6 48 25 2 2 76 15 35 1
-69 84 1 7 48 25 2 4 76 15 35 1
-69 83 1 8 48 25 2 5 76 15 35 1
-69 82 1 9 48 25 1 3 76 14 34 2
-69 81 1 10 48 25 4 5 94 3 5 1
-69 80 1 6 48 28 1 1 94 2 3 1
-69 79 1 7 48 28 1 3 94 2 3 1
-69 78 1 8 48 28 3 4 94 2 4 2
-69 77 1 9 48 28 2 1 94 5 9 2
-69 76 1 10 48 28 2 4 94 5 9 2
-69 75 1 6 48 32 2 2 94 5 10 1
-69 74 1 7 48 32 2 4 94 5 10 1
-69 73 1 8 48 32 3 3 94 9 16 1
-69 72 1 9 48 32 1 2 93 12 21 1
-69 71 1 10 48 32 1 4 93 12 21 1
-69 70 1 6 47 12 3 3 93 12 22 2
-69 69 1 7 47 12 1 1 93 11 20 2
-69 68 1 8 47 12 1 3 93 11 20 2
-69 67 1 9 47 12 2 1 93 15 26 1
-69 66 1 10 47 12 2 4 93 15 26 1
-69 65 1 6 47 19 2 2 93 14 25 1
-69 64 1 7 47 19 2 5 93 14 25 1
-69 63 1 8 47 19 1 2 93 13 24 2
-69 62 1 9 47 19 1 4 93 13 24 2
-69 61 1 10 47 19 3 4 93 17 29 1
-69 60 1 6 47 27 3 2 92 20 33 1
-69 59 1 7 47 27 1 1 92 19 32 1
-69 58 1 8 47 27 1 4 92 19 32 1
-69 57 1 9 47 27 2 1 92 18 31 1
-69 56 1 10 47 27 2 4 92 18 31 1
-69 55 1 6 46 3 1 2 92 17 30 1
-69 54 1 7 46 3 1 4 92 17 30 1
-69 53 1 8 46 3 2 3 91 20 36 2
-69 52 1 9 46 3 2 5 91 20 36 2
-69 51 1 10 46 3 3 4 91 19 34 2
-69 50 1 22 46 11 1 4 91 18 32 2
-69 49 1 17 46 11 2 5 91 17 30 2
-69 48 1 12 46 11 2 3 91 17 30 2
-69 47 1 7 46 11 3 5 108 20 33 1
-69 46 1 2 46 11 3 2 108 20 33 1
-69 45 1 22 46 18 1 4 108 19 32 1
-69 44 1 17 46 18 1 2 108 19 32 1
-69 43 1 12 46 18 2 4 108 18 31 1
-69 42 1 7 46 18 2 2 108 18 31 1
-69 41 1 2 46 18 3 2 108 17 30 1
-69 40 1 22 54 3 3 3 107 20 34 1
-69 39 1 17 54 3 1 5 107 16 28 2
-69 38 1 12 54 3 1 3 107 16 28 2
-69 37 1 7 54 3 2 4 107 15 26 1
-69 36 1 2 54 3 2 2 107 15 26 1
-69 35 1 22 54 5 2 4 107 14 24 1
-69 34 1 17 54 5 2 1 107 14 24 1
-69 33 1 12 54 5 1 4 107 10 18 2
-69 32 1 7 54 5 3 4 107 9 15 1
-69 31 1 2 54 5 3 1 107 9 15 1
-69 30 1 22 54 9 1 5 107 9 16 2
-69 29 1 17 54 9 1 3 107 9 16 2
-69 28 1 12 54 9 3 1 106 12 22 2
-69 27 1 7 54 9 2 5 106 8 14 1
-69 26 1 2 54 9 2 2 106 8 14 1
-69 25 1 22 54 16 2 4 106 8 15 2
-69 24 1 17 54 16 2 2 106 8 15 2
-69 23 1 12 54 16 1 5 106 3 6 2
-69 22 1 7 54 16 1 3 106 3 6 2
-69 21 1 2 54 16 3 1 106 3 5 1
-69 20 1 22 54 23 4 2 106 2 4 2
-69 19 1 17 54 23 1 4 88 15 37 1
-69 18 1 12 54 23 2 4 88 14 36 3
-69 17 1 7 54 23 2 3 88 14 36 3
-69 16 1 2 54 23 2 2 88 14 36 3
-69 15 1 22 54 28 2 5 88 10 23 1
-69 14 1 17 54 28 2 3 88 10 23 1
-69 13 1 12 54 28 2 2 88 10 23 1
-69 12 1 7 54 28 2 1 88 10 23 1
-69 11 1 2 54 28 3 1 88 9 22 2
-69 10 1 22 54 29 1 5 88 5 10 1
-69 9 1 17 54 29 1 3 88 5 10 1
-69 8 1 12 54 29 3 2 88 5 9 3
-69 7 1 7 54 29 2 5 88 1 1 1
-69 6 1 2 54 29 2 2 88 1 1 1
-68 95 1 11 48 18 2 1 76 4 7 1
-68 94 1 12 48 18 3 1 76 8 19 2
-68 93 1 13 48 18 3 2 76 8 19 2
-68 92 1 14 48 18 3 3 76 8 19 2
-68 91 1 15 48 18 3 4 76 8 19 2
-68 90 1 11 48 21 3 2 76 12 29 1
-68 89 1 12 48 21 3 4 76 12 29 1
-68 88 1 13 48 21 3 5 76 12 29 1
-68 87 1 14 48 21 2 3 76 11 28 3
-68 86 1 15 48 21 4 5 76 16 38 1
-68 85 1 11 48 25 2 1 76 15 35 1
-68 84 1 12 48 25 3 3 76 15 36 2
-68 83 1 13 48 25 3 4 76 15 36 2
-68 82 1 14 48 25 3 5 76 15 36 2
-68 81 1 15 48 25 4 4 94 3 5 1
-68 80 1 11 48 28 4 3 94 3 6 2
-68 79 1 12 48 28 3 1 94 2 4 2
-68 78 1 13 48 28 3 3 94 2 4 2
-68 77 1 14 48 28 3 5 94 2 4 2
-68 76 1 15 48 28 2 3 94 5 9 2
-68 75 1 11 48 32 2 1 94 5 10 1
-68 74 1 12 48 32 4 5 94 10 18 1
-68 73 1 13 48 32 3 2 94 9 16 1
-68 72 1 14 48 32 3 4 94 9 16 1
-68 71 1 15 48 32 3 5 94 9 16 1
-68 70 1 11 47 12 3 2 93 12 22 2
-68 69 1 12 47 12 3 5 93 12 22 2
-68 68 1 13 47 12 4 3 93 16 27 1
-68 67 1 14 47 12 4 5 93 16 27 1
-68 66 1 15 47 12 2 3 93 15 26 1
-68 65 1 11 47 19 2 1 93 14 25 1
-68 64 1 12 47 19 2 4 93 14 25 1
-68 63 1 13 47 19 4 2 93 18 30 1
-68 62 1 14 47 19 3 1 93 17 29 1
-68 61 1 15 47 19 3 3 93 17 29 1
-68 60 1 11 47 27 3 1 92 20 33 1
-68 59 1 12 47 27 3 5 92 20 33 1
-68 58 1 13 47 27 1 3 92 19 32 1
-68 57 1 14 47 27 4 4 92 23 35 1
-68 56 1 15 47 27 2 3 92 18 31 1
-68 55 1 11 46 3 1 1 92 17 30 1
-68 54 1 12 46 3 2 1 91 20 36 2
-68 53 1 13 46 3 2 2 91 20 36 2
-68 52 1 14 46 3 3 1 91 19 34 2
-68 51 1 15 46 3 3 3 91 19 34 2
-68 50 1 23 46 11 1 5 91 18 32 2
-68 49 1 18 46 11 1 2 91 18 32 2
-68 48 1 13 46 11 2 4 91 17 30 2
-68 47 1 8 46 11 2 1 91 17 30 2
-68 46 1 3 46 11 3 3 108 20 33 1
-68 45 1 23 46 18 1 5 108 19 32 1
-68 44 1 18 46 18 4 3 108 21 34 1
-68 43 1 13 46 18 2 5 108 18 31 1
-68 42 1 8 46 18 3 4 108 17 30 1
-68 41 1 3 46 18 3 3 108 17 30 1
-68 40 1 23 54 3 3 4 107 20 34 1
-68 39 1 18 54 3 3 1 107 20 34 1
-68 38 1 13 54 3 4 1 107 19 33 1
-68 37 1 8 54 3 2 5 107 15 26 1
-68 36 1 3 54 3 2 3 107 15 26 1
-68 35 1 23 54 5 2 5 107 14 24 1
-68 34 1 18 54 5 2 2 107 14 24 1
-68 33 1 13 54 5 4 1 107 14 25 2
-68 32 1 8 54 5 3 5 107 9 15 1
-68 31 1 3 54 5 3 2 107 9 15 1
-68 30 1 23 54 9 3 4 106 12 22 2
-68 29 1 18 54 9 3 3 106 12 22 2
-68 28 1 13 54 9 3 2 106 12 22 2
-68 27 1 8 54 9 4 3 106 11 20 2
-68 26 1 3 54 9 2 3 106 8 14 1
-68 25 1 23 54 16 2 5 106 8 15 2
-68 24 1 18 54 16 3 5 106 3 5 1
-68 23 1 13 54 16 3 3 106 3 5 1
-68 22 1 8 54 16 3 2 106 3 5 1
-68 21 1 3 54 16 4 1 106 2 3 1
-68 20 1 23 54 23 4 3 106 2 4 2
-68 19 1 18 54 23 2 5 88 14 36 3
-68 18 1 13 54 23 3 3 88 14 35 2
-68 17 1 8 54 23 3 2 88 14 35 2
-68 16 1 3 54 23 3 1 88 14 35 2
-68 15 1 23 54 28 4 3 88 13 33 3
-68 14 1 18 54 28 2 4 88 10 23 1
-68 13 1 13 54 28 3 4 88 9 22 2
-68 12 1 8 54 28 3 3 88 9 22 2
-68 11 1 3 54 28 3 2 88 9 22 2
-68 10 1 23 54 29 3 5 88 5 9 3
-68 9 1 18 54 29 3 4 88 5 9 3
-68 8 1 13 54 29 3 3 88 5 9 3
-68 7 1 8 54 29 3 1 88 5 9 3
-68 6 1 3 54 29 2 3 88 1 1 1
-67 95 1 16 48 18 5 2 77 5 10 1
-67 94 1 17 48 18 4 1 76 8 20 3
-67 93 1 18 48 18 4 2 76 8 20 3
-67 92 1 19 48 18 4 3 76 8 20 3
-67 91 1 20 48 18 4 5 76 8 20 3
-67 90 1 16 48 21 3 1 76 12 29 1
-67 89 1 17 48 21 5 3 76 12 30 2
-67 88 1 18 48 21 5 5 76 12 30 2
-67 87 1 19 48 21 4 2 76 16 38 1
-67 86 1 20 48 21 4 4 76 16 38 1
-67 85 1 16 48 25 3 1 76 15 36 2
-67 84 1 17 48 25 3 2 76 15 36 2
-67 83 1 18 48 25 5 4 76 15 37 3
-67 82 1 19 48 25 5 5 76 15 37 3
-67 81 1 20 48 25 4 3 94 3 5 1
-67 80 1 16 48 28 4 2 94 3 6 2
-67 79 1 17 48 28 4 5 94 3 6 2
-67 78 1 18 48 28 3 2 94 2 4 2
-67 77 1 19 48 28 5 3 94 6 11 1
-67 76 1 20 48 28 5 5 94 6 11 1
-67 75 1 16 48 32 4 2 94 10 18 1
-67 74 1 17 48 32 4 4 94 10 18 1
-67 73 1 18 48 32 3 1 94 9 16 1
-67 72 1 19 48 32 5 3 94 9 17 2
-67 71 1 20 48 32 5 5 94 9 17 2
-67 70 1 16 47 12 3 1 93 12 22 2
-67 69 1 17 47 12 4 1 93 16 27 1
-67 68 1 18 47 12 4 2 93 16 27 1
-67 67 1 19 47 12 4 4 93 16 27 1
-67 66 1 20 47 12 2 2 93 15 26 1
-67 65 1 16 47 19 5 2 93 19 31 1
-67 64 1 17 47 19 5 4 93 19 31 1
-67 63 1 18 47 19 4 1 93 18 30 1
-67 62 1 19 47 19 4 4 93 18 30 1
-67 61 1 20 47 19 3 2 93 17 29 1
-67 60 1 16 47 27 4 1 92 23 35 1
-67 59 1 17 47 27 3 4 92 20 33 1
-67 58 1 18 47 27 4 2 92 23 35 1
-67 57 1 19 47 27 4 3 92 23 35 1
-67 56 1 20 47 27 4 5 92 23 35 1
-67 55 1 16 46 3 5 2 92 21 34 1
-67 54 1 17 46 3 5 4 92 21 34 1
-67 53 1 18 46 3 4 1 91 23 38 1
-67 52 1 19 46 3 4 3 91 23 38 1
-67 51 1 20 46 3 4 5 91 23 38 1
-67 50 1 24 46 11 4 4 91 21 37 1
-67 49 1 19 46 11 4 2 91 21 37 1
-67 48 1 14 46 11 4 1 91 21 37 1
-67 47 1 9 46 11 5 3 108 23 37 1
-67 46 1 4 46 11 5 1 108 23 37 1
-67 45 1 24 46 18 4 5 108 21 34 1
-67 44 1 19 46 18 4 4 108 21 34 1
-67 43 1 14 46 18 4 2 108 21 34 1
-67 42 1 9 46 18 3 5 108 17 30 1
-67 41 1 4 46 18 4 1 108 21 34 1
-67 40 1 24 54 3 3 5 107 20 34 1
-67 39 1 19 54 3 4 3 107 19 33 1
-67 38 1 14 54 3 4 2 107 19 33 1
-67 37 1 9 54 3 5 3 107 18 31 1
-67 36 1 4 54 3 5 1 107 18 31 1
-67 35 1 24 54 5 4 4 107 14 25 2
-67 34 1 19 54 5 4 3 107 14 25 2
-67 33 1 14 54 5 4 2 107 14 25 2
-67 32 1 9 54 5 5 2 107 13 23 1
-67 31 1 4 54 5 3 3 107 9 15 1
-67 30 1 24 54 9 3 5 106 12 22 2
-67 29 1 19 54 9 5 3 106 12 21 1
-67 28 1 14 54 9 5 1 106 12 21 1
-67 27 1 9 54 9 4 4 106 11 20 2
-67 26 1 4 54 9 4 1 106 11 20 2
-67 25 1 24 54 16 5 4 106 7 13 1
-67 24 1 19 54 16 5 2 106 7 13 1
-67 23 1 14 54 16 3 4 106 3 5 1
-67 22 1 9 54 16 4 4 106 2 3 1
-67 21 1 4 54 16 4 2 106 2 3 1
-67 20 1 24 54 23 4 4 106 2 4 2
-67 19 1 19 54 23 3 5 88 14 35 2
-67 18 1 14 54 23 3 4 88 14 35 2
-67 17 1 9 54 23 5 3 88 14 34 1
-67 16 1 4 54 23 5 1 88 14 34 1
-67 15 1 24 54 28 4 4 88 13 33 3
-67 14 1 19 54 28 4 1 88 13 33 3
-67 13 1 14 54 28 3 5 88 9 22 2
-67 12 1 9 54 28 5 3 88 9 21 1
-67 11 1 4 54 28 5 1 88 9 21 1
-67 10 1 24 54 29 4 4 88 5 8 2
-67 9 1 19 54 29 4 3 88 5 8 2
-67 8 1 14 54 29 4 2 88 5 8 2
-67 7 1 9 54 29 4 1 88 5 8 2
-67 6 1 4 54 29 5 1 87 8 20 3
-66 95 1 21 48 18 5 1 77 5 10 1
-66 94 1 22 48 18 5 3 77 5 10 1
-66 93 1 23 48 18 5 4 77 5 10 1
-66 92 1 24 48 18 5 5 77 5 10 1
-66 91 1 25 48 18 4 4 76 8 20 3
-66 90 1 21 48 21 5 1 76 12 30 2
-66 89 1 22 48 21 5 2 76 12 30 2
-66 88 1 23 48 21 5 4 76 12 30 2
-66 87 1 24 48 21 4 1 76 16 38 1
-66 86 1 25 48 21 4 3 76 16 38 1
-66 85 1 21 48 25 5 1 76 15 37 3
-66 84 1 22 48 25 5 2 76 15 37 3
-66 83 1 23 48 25 5 3 76 15 37 3
-66 82 1 24 48 25 4 1 94 3 5 1
-66 81 1 25 48 25 4 2 94 3 5 1
-66 80 1 21 48 28 4 1 94 3 6 2
-66 79 1 22 48 28 4 4 94 3 6 2
-66 78 1 23 48 28 5 1 94 6 11 1
-66 77 1 24 48 28 5 2 94 6 11 1
-66 76 1 25 48 28 5 4 94 6 11 1
-66 75 1 21 48 32 4 1 94 10 18 1
-66 74 1 22 48 32 4 3 94 10 18 1
-66 73 1 23 48 32 5 1 94 9 17 2
-66 72 1 24 48 32 5 2 94 9 17 2
-66 71 1 25 48 32 5 4 94 9 17 2
-66 70 1 21 47 12 5 1 93 16 28 2
-66 69 1 22 47 12 5 2 93 16 28 2
-66 68 1 23 47 12 5 3 93 16 28 2
-66 67 1 24 47 12 5 4 93 16 28 2
-66 66 1 25 47 12 5 5 93 16 28 2
-66 65 1 21 47 19 5 1 93 19 31 1
-66 64 1 22 47 19 5 3 93 19 31 1
-66 63 1 23 47 19 5 5 93 19 31 1
-66 62 1 24 47 19 4 3 93 18 30 1
-66 61 1 25 47 19 4 5 93 18 30 1
-66 60 1 21 47 27 5 1 92 23 36 2
-66 59 1 22 47 27 5 2 92 23 36 2
-66 58 1 23 47 27 5 3 92 23 36 2
-66 57 1 24 47 27 5 4 92 23 36 2
-66 56 1 25 47 27 5 5 92 23 36 2
-66 55 1 21 46 3 5 1 92 21 34 1
-66 54 1 22 46 3 5 3 92 21 34 1
-66 53 1 23 46 3 5 5 92 21 34 1
-66 52 1 24 46 3 4 2 91 23 38 1
-66 51 1 25 46 3 4 4 91 23 38 1
-66 50 1 25 46 11 4 5 91 21 37 1
-66 49 1 20 46 11 4 3 91 21 37 1
-66 48 1 15 46 11 5 5 108 23 37 1
-66 47 1 10 46 11 5 4 108 23 37 1
-66 46 1 5 46 11 5 2 108 23 37 1
-66 45 1 25 46 18 5 5 108 21 35 2
-66 44 1 20 46 18 5 4 108 21 35 2
-66 43 1 15 46 18 5 3 108 21 35 2
-66 42 1 10 46 18 5 2 108 21 35 2
-66 41 1 5 46 18 5 1 108 21 35 2
-66 40 1 25 54 3 4 5 107 19 33 1
-66 39 1 20 54 3 4 4 107 19 33 1
-66 38 1 15 54 3 5 5 107 18 31 1
-66 37 1 10 54 3 5 4 107 18 31 1
-66 36 1 5 54 3 5 2 107 18 31 1
-66 35 1 25 54 5 4 5 107 14 25 2
-66 34 1 20 54 5 5 5 107 13 23 1
-66 33 1 15 54 5 5 4 107 13 23 1
-66 32 1 10 54 5 5 3 107 13 23 1
-66 31 1 5 54 5 5 1 107 13 23 1
-66 30 1 25 54 9 5 5 106 12 21 1
-66 29 1 20 54 9 5 4 106 12 21 1
-66 28 1 15 54 9 5 2 106 12 21 1
-66 27 1 10 54 9 4 5 106 11 20 2
-66 26 1 5 54 9 4 2 106 11 20 2
-66 25 1 25 54 16 5 5 106 7 13 1
-66 24 1 20 54 16 5 3 106 7 13 1
-66 23 1 15 54 16 5 1 106 7 13 1
-66 22 1 10 54 16 4 5 106 2 3 1
-66 21 1 5 54 16 4 3 106 2 3 1
-66 20 1 25 54 23 4 5 106 2 4 2
-66 19 1 20 54 23 4 1 106 2 4 2
-66 18 1 15 54 23 5 5 88 14 34 1
-66 17 1 10 54 23 5 4 88 14 34 1
-66 16 1 5 54 23 5 2 88 14 34 1
-66 15 1 25 54 28 4 5 88 13 33 3
-66 14 1 20 54 28 4 2 88 13 33 3
-66 13 1 15 54 28 5 5 88 9 21 1
-66 12 1 10 54 28 5 4 88 9 21 1
-66 11 1 5 54 28 5 2 88 9 21 1
-66 10 1 25 54 29 4 5 88 5 8 2
-66 9 1 20 54 29 5 5 87 8 20 3
-66 8 1 15 54 29 5 4 87 8 20 3
-66 7 1 10 54 29 5 3 87 8 20 3
-66 6 1 5 54 29 5 2 87 8 20 3
-65 97 1 4 48 30 1 3 77 1 1 1
-65 96 1 5 48 30 1 5 77 1 1 1
-65 95 1 1 48 17 1 2 77 5 11 2
-65 94 1 2 48 17 1 4 77 5 11 2
-65 93 1 3 48 17 1 5 77 5 11 2
-65 92 1 4 48 17 2 2 77 9 21 1
-65 91 1 5 48 17 2 5 77 9 21 1
-65 90 1 1 48 20 2 3 77 9 22 2
-65 89 1 2 48 20 2 5 77 9 22 2
-65 88 1 3 48 20 1 2 76 16 39 2
-65 87 1 4 48 20 1 3 76 16 39 2
-65 86 1 5 48 20 1 5 76 16 39 2
-65 85 1 1 48 24 2 3 76 16 40 3
-65 84 1 2 48 24 2 5 76 16 40 3
-65 83 1 3 48 24 1 2 94 4 7 1
-65 82 1 4 48 24 1 4 94 4 7 1
-65 81 1 5 48 24 1 5 94 4 7 1
-65 80 1 1 48 27 1 1 94 7 12 1
-65 79 1 2 48 27 1 2 94 7 12 1
-65 78 1 3 48 27 1 3 94 7 12 1
-65 77 1 4 48 27 1 4 94 7 12 1
-65 76 1 5 48 27 1 5 94 7 12 1
-65 75 1 1 48 31 1 1 94 10 19 2
-65 74 1 2 48 31 1 2 94 10 19 2
-65 73 1 3 48 31 1 4 94 10 19 2
-65 72 1 4 48 31 1 5 94 10 19 2
-65 71 1 5 48 31 2 5 94 14 24 1
-65 70 1 1 48 33 1 1 94 13 23 1
-65 69 1 2 48 33 1 3 94 13 23 1
-65 68 1 3 48 33 1 5 94 13 23 1
-65 67 1 4 48 33 2 2 93 20 33 1
-65 66 1 5 48 33 2 5 93 20 33 1
-65 65 1 1 47 18 1 1 93 19 32 2
-65 64 1 2 47 18 1 3 93 19 32 2
-65 63 1 3 47 18 1 5 93 19 32 2
-65 62 1 4 47 18 2 2 93 21 35 1
-65 61 1 5 47 18 2 5 93 21 35 1
-65 60 1 1 47 26 2 2 93 21 36 2
-65 59 1 2 47 26 2 5 93 21 36 2
-65 58 1 3 47 26 1 2 92 23 37 3
-65 57 1 4 47 26 1 4 92 23 37 3
-65 56 1 5 47 26 1 5 92 23 37 3
-65 55 1 1 47 32 2 3 92 25 38 1
-65 54 1 2 47 32 2 5 92 25 38 1
-65 53 1 3 47 32 1 2 91 27 41 1
-65 52 1 4 47 32 1 4 91 27 41 1
-65 51 1 5 47 32 1 5 91 27 41 1
-65 50 1 21 46 10 1 4 91 25 39 1
-65 49 1 16 46 10 1 2 91 25 39 1
-65 48 1 11 46 10 1 1 91 25 39 1
-65 47 1 6 46 10 2 3 108 27 39 1
-65 46 1 1 46 10 2 1 108 27 39 1
-65 45 1 21 54 1 1 5 108 21 36 3
-65 44 1 16 54 1 1 3 108 21 36 3
-65 43 1 11 54 1 1 1 108 21 36 3
-65 42 1 6 54 1 2 3 107 23 37 1
-65 41 1 1 54 1 2 1 107 23 37 1
-65 40 1 21 54 2 3 3 107 21 36 2
-65 39 1 16 54 2 1 4 107 18 32 2
-65 38 1 11 54 2 1 2 107 18 32 2
-65 37 1 6 54 2 1 1 107 18 32 2
-65 36 1 1 54 2 2 1 107 17 29 1
-65 35 1 21 54 4 2 3 107 17 30 2
-65 34 1 16 54 4 2 1 107 17 30 2
-65 33 1 11 54 4 1 4 106 16 28 1
-65 32 1 6 54 4 1 2 106 16 28 1
-65 31 1 1 54 4 1 1 106 16 28 1
-65 30 1 21 54 8 2 3 106 15 27 2
-65 29 1 16 54 8 1 5 106 11 19 1
-65 28 1 11 54 8 1 3 106 11 19 1
-65 27 1 6 54 8 1 2 106 11 19 1
-65 26 1 1 54 8 1 1 106 11 19 1
-65 25 1 21 54 15 1 5 106 6 12 2
-65 24 1 16 54 15 1 4 106 6 12 2
-65 23 1 11 54 15 1 3 106 6 12 2
-65 22 1 6 54 15 1 2 106 6 12 2
-65 21 1 1 54 15 1 1 106 6 12 2
-65 20 1 21 54 22 1 4 106 1 2 2
-65 19 1 16 54 22 1 2 106 1 2 2
-65 18 1 11 54 22 1 1 106 1 2 2
-65 17 1 6 54 22 2 4 88 13 31 1
-65 16 1 1 54 22 2 1 88 13 31 1
-65 15 1 21 53 1 1 4 88 13 32 2
-65 14 1 16 53 1 1 3 88 13 32 2
-65 13 1 11 53 1 1 1 88 13 32 2
-65 12 1 6 53 1 2 3 87 12 32 2
-65 11 1 1 53 1 2 1 87 12 32 2
-65 10 1 21 53 2 2 3 87 12 33 3
-65 9 1 16 53 2 2 1 87 12 33 3
-65 8 1 11 53 2 1 3 87 8 19 2
-65 7 1 6 53 2 1 2 87 8 19 2
-65 6 1 1 53 2 1 1 87 8 19 2
-65 5 1 21 53 3 1 4 87 4 9 1
-65 4 1 16 53 3 1 1 87 4 9 1
-64 97 1 9 48 30 1 2 77 1 1 1
-64 96 1 10 48 30 1 4 77 1 1 1
-64 95 1 6 48 17 1 1 77 5 11 2
-64 94 1 7 48 17 1 3 77 5 11 2
-64 93 1 8 48 17 3 4 77 5 12 3
-64 92 1 9 48 17 3 5 77 5 12 3
-64 91 1 10 48 17 2 4 77 9 21 1
-64 90 1 6 48 20 2 2 77 9 22 2
-64 89 1 7 48 20 2 4 77 9 22 2
-64 88 1 8 48 20 1 1 76 16 39 2
-64 87 1 9 48 20 3 4 77 13 34 1
-64 86 1 10 48 20 1 4 76 16 39 2
-64 85 1 6 48 24 2 2 76 16 40 3
-64 84 1 7 48 24 2 4 76 16 40 3
-64 83 1 8 48 24 1 1 94 4 7 1
-64 82 1 9 48 24 1 3 94 4 7 1
-64 81 1 10 48 24 3 5 94 4 8 2
-64 80 1 6 48 27 3 3 94 8 14 1
-64 79 1 7 48 27 2 1 94 7 13 2
-64 78 1 8 48 27 2 2 94 7 13 2
-64 77 1 9 48 27 2 4 94 7 13 2
-64 76 1 10 48 27 2 5 94 7 13 2
-64 75 1 6 48 31 3 2 94 11 20 1
-64 74 1 7 48 31 3 4 94 11 20 1
-64 73 1 8 48 31 1 3 94 10 19 2
-64 72 1 9 48 31 2 2 94 14 24 1
-64 71 1 10 48 31 2 4 94 14 24 1
-64 70 1 6 48 33 3 3 94 14 25 2
-64 69 1 7 48 33 1 2 94 13 23 1
-64 68 1 8 48 33 1 4 94 13 23 1
-64 67 1 9 48 33 2 1 93 20 33 1
-64 66 1 10 48 33 2 4 93 20 33 1
-64 65 1 6 47 18 3 3 93 20 34 2
-64 64 1 7 47 18 1 2 93 19 32 2
-64 63 1 8 47 18 1 4 93 19 32 2
-64 62 1 9 47 18 2 1 93 21 35 1
-64 61 1 10 47 18 2 4 93 21 35 1
-64 60 1 6 47 26 2 1 93 21 36 2
-64 59 1 7 47 26 2 4 93 21 36 2
-64 58 1 8 47 26 1 1 92 23 37 3
-64 57 1 9 47 26 1 3 92 23 37 3
-64 56 1 10 47 26 4 5 92 27 40 1
-64 55 1 6 47 32 2 2 92 25 38 1
-64 54 1 7 47 32 2 4 92 25 38 1
-64 53 1 8 47 32 1 1 91 27 41 1
-64 52 1 9 47 32 1 3 91 27 41 1
-64 51 1 10 47 32 3 5 91 27 42 2
-64 50 1 22 46 10 1 5 91 25 39 1
-64 49 1 17 46 10 1 3 91 25 39 1
-64 48 1 12 46 10 3 1 91 25 40 2
-64 47 1 7 46 10 2 4 108 27 39 1
-64 46 1 2 46 10 2 2 108 27 39 1
-64 45 1 22 54 1 4 2 108 25 38 1
-64 44 1 17 54 1 1 4 108 21 36 3
-64 43 1 12 54 1 1 2 108 21 36 3
-64 42 1 7 54 1 2 4 107 23 37 1
-64 41 1 2 54 1 2 2 107 23 37 1
-64 40 1 22 54 2 3 4 107 21 36 2
-64 39 1 17 54 2 1 5 107 18 32 2
-64 38 1 12 54 2 1 3 107 18 32 2
-64 37 1 7 54 2 2 4 107 17 29 1
-64 36 1 2 54 2 2 2 107 17 29 1
-64 35 1 22 54 4 2 4 107 17 30 2
-64 34 1 17 54 4 2 2 107 17 30 2
-64 33 1 12 54 4 1 5 106 16 28 1
-64 32 1 7 54 4 1 3 106 16 28 1
-64 31 1 2 54 4 3 1 106 15 26 1
-64 30 1 22 54 8 2 4 106 15 27 2
-64 29 1 17 54 8 2 1 106 15 27 2
-64 28 1 12 54 8 1 4 106 11 19 1
-64 27 1 7 54 8 3 3 106 10 18 1
-64 26 1 2 54 8 3 1 106 10 18 1
-64 25 1 22 54 15 2 5 106 6 11 1
-64 24 1 17 54 15 2 3 106 6 11 1
-64 23 1 12 54 15 2 2 106 6 11 1
-64 22 1 7 54 15 2 1 106 6 11 1
-64 21 1 2 54 15 3 1 106 5 10 1
-64 20 1 22 54 22 1 5 106 1 2 2
-64 19 1 17 54 22 1 3 106 1 2 2
-64 18 1 12 54 22 3 1 106 1 1 1
-64 17 1 7 54 22 2 5 88 13 31 1
-64 16 1 2 54 22 2 2 88 13 31 1
-64 15 1 22 53 1 1 5 88 13 32 2
-64 14 1 17 53 1 3 2 87 16 41 2
-64 13 1 12 53 1 1 2 88 13 32 2
-64 12 1 7 53 1 2 4 87 12 32 2
-64 11 1 2 53 1 2 2 87 12 32 2
-64 10 1 22 53 2 2 4 87 12 33 3
-64 9 1 17 53 2 1 5 87 8 19 2
-64 8 1 12 53 2 1 4 87 8 19 2
-64 7 1 7 53 2 3 3 87 8 18 1
-64 6 1 2 53 2 3 1 87 8 18 1
-64 5 1 22 53 3 1 5 87 4 9 1
-64 4 1 17 53 3 1 2 87 4 9 1
-63 97 1 14 48 30 1 1 77 1 1 1
-63 96 1 15 48 30 2 5 77 2 2 1
-63 95 1 11 48 17 3 1 77 5 12 3
-63 94 1 12 48 17 3 2 77 5 12 3
-63 93 1 13 48 17 3 3 77 5 12 3
-63 92 1 14 48 17 2 1 77 9 21 1
-63 91 1 15 48 17 2 3 77 9 21 1
-63 90 1 11 48 20 2 1 77 9 22 2
-63 89 1 12 48 20 4 5 77 9 23 3
-63 88 1 13 48 20 3 2 77 13 34 1
-63 87 1 14 48 20 3 3 77 13 34 1
-63 86 1 15 48 20 3 5 77 13 34 1
-63 85 1 11 48 24 2 1 76 16 40 3
-63 84 1 12 48 24 4 3 95 1 1 1
-63 83 1 13 48 24 3 1 94 4 8 2
-63 82 1 14 48 24 3 2 94 4 8 2
-63 81 1 15 48 24 3 4 94 4 8 2
-63 80 1 11 48 27 3 2 94 8 14 1
-63 79 1 12 48 27 3 4 94 8 14 1
-63 78 1 13 48 27 3 5 94 8 14 1
-63 77 1 14 48 27 2 3 94 7 13 2
-63 76 1 15 48 27 4 5 94 12 21 1
-63 75 1 11 48 31 3 1 94 11 20 1
-63 74 1 12 48 31 3 3 94 11 20 1
-63 73 1 13 48 31 3 5 94 11 20 1
-63 72 1 14 48 31 2 1 94 14 24 1
-63 71 1 15 48 31 2 3 94 14 24 1
-63 70 1 11 48 33 3 2 94 14 25 2
-63 69 1 12 48 33 3 5 94 14 25 2
-63 68 1 13 48 33 4 1 94 17 29 1
-63 67 1 14 48 33 4 3 94 17 29 1
-63 66 1 15 48 33 2 3 93 20 33 1
-63 65 1 11 47 18 3 2 93 20 34 2
-63 64 1 12 47 18 3 5 93 20 34 2
-63 63 1 13 47 18 4 2 93 23 37 1
-63 62 1 14 47 18 4 4 93 23 37 1
-63 61 1 15 47 18 2 3 93 21 35 1
-63 60 1 11 47 26 3 2 93 25 39 1
-63 59 1 12 47 26 2 3 93 21 36 2
-63 58 1 13 47 26 3 4 93 25 39 1
-63 57 1 14 47 26 3 5 93 25 39 1
-63 56 1 15 47 26 4 4 92 27 40 1
-63 55 1 11 47 32 2 1 92 25 38 1
-63 54 1 12 47 32 4 3 92 25 39 2
-63 53 1 13 47 32 4 5 92 25 39 2
-63 52 1 14 47 32 3 2 91 27 42 2
-63 51 1 15 47 32 3 4 91 27 42 2
-63 50 1 23 46 10 3 4 91 25 40 2
-63 49 1 18 46 10 3 2 91 25 40 2
-63 48 1 13 46 10 2 5 108 27 39 1
-63 47 1 8 46 10 4 3 108 27 40 2
-63 46 1 3 46 10 4 1 108 27 40 2
-63 45 1 23 54 1 4 3 108 25 38 1
-63 44 1 18 54 1 3 4 107 27 39 1
-63 43 1 13 54 1 3 2 107 27 39 1
-63 42 1 8 54 1 2 5 107 23 37 1
-63 41 1 3 54 1 3 1 107 27 39 1
-63 40 1 23 54 2 3 5 107 21 36 2
-63 39 1 18 54 2 3 2 107 21 36 2
-63 38 1 13 54 2 3 1 107 21 36 2
-63 37 1 8 54 2 2 5 107 17 29 1
-63 36 1 3 54 2 2 3 107 17 29 1
-63 35 1 23 54 4 2 5 107 17 30 2
-63 34 1 18 54 4 4 2 106 20 32 1
-63 33 1 13 54 4 4 1 106 20 32 1
-63 32 1 8 54 4 3 4 106 15 26 1
-63 31 1 3 54 4 3 2 106 15 26 1
-63 30 1 23 54 8 2 5 106 15 27 2
-63 29 1 18 54 8 2 2 106 15 27 2
-63 28 1 13 54 8 3 5 106 10 18 1
-63 27 1 8 54 8 3 4 106 10 18 1
-63 26 1 3 54 8 3 2 106 10 18 1
-63 25 1 23 54 15 4 3 106 9 17 2
-63 24 1 18 54 15 2 4 106 6 11 1
-63 23 1 13 54 15 3 4 106 5 10 1
-63 22 1 8 54 15 3 3 106 5 10 1
-63 21 1 3 54 15 3 2 106 5 10 1
-63 20 1 23 54 22 3 4 106 1 1 1
-63 19 1 18 54 22 3 3 106 1 1 1
-63 18 1 13 54 22 3 2 106 1 1 1
-63 17 1 8 54 22 4 2 105 4 9 3
-63 16 1 3 54 22 2 3 88 13 31 1
-63 15 1 23 53 1 3 4 87 16 41 2
-63 14 1 18 53 1 3 3 87 16 41 2
-63 13 1 13 53 1 3 1 87 16 41 2
-63 12 1 8 53 1 2 5 87 12 32 2
-63 11 1 3 53 1 4 1 87 12 31 1
-63 10 1 23 53 2 2 5 87 12 33 3
-63 9 1 18 53 2 2 2 87 12 33 3
-63 8 1 13 53 2 3 5 87 8 18 1
-63 7 1 8 53 2 3 4 87 8 18 1
-63 6 1 3 53 2 3 2 87 8 18 1
-63 5 1 23 53 3 2 3 87 3 8 2
-63 4 1 18 53 3 1 3 87 4 9 1
-62 97 1 19 48 30 2 2 77 2 2 1
-62 96 1 20 48 30 2 4 77 2 2 1
-62 95 1 16 48 17 5 2 77 6 13 1
-62 94 1 17 48 17 5 4 77 6 13 1
-62 93 1 18 48 17 4 1 77 10 24 1
-62 92 1 19 48 17 4 3 77 10 24 1
-62 91 1 20 48 17 4 5 77 10 24 1
-62 90 1 16 48 20 4 2 77 9 23 3
-62 89 1 17 48 20 4 4 77 9 23 3
-62 88 1 18 48 20 3 1 77 13 34 1
-62 87 1 19 48 20 5 3 77 13 35 2
-62 86 1 20 48 20 5 5 77 13 35 2
-62 85 1 16 48 24 4 1 95 1 1 1
-62 84 1 17 48 24 4 2 95 1 1 1
-62 83 1 18 48 24 4 4 95 1 1 1
-62 82 1 19 48 24 4 5 95 1 1 1
-62 81 1 20 48 24 3 3 94 4 8 2
-62 80 1 16 48 27 3 1 94 8 14 1
-62 79 1 17 48 27 5 3 94 8 15 2
-62 78 1 18 48 27 5 5 94 8 15 2
-62 77 1 19 48 27 4 2 94 12 21 1
-62 76 1 20 48 27 4 4 94 12 21 1
-62 75 1 16 48 31 5 2 94 12 22 2
-62 74 1 17 48 31 5 4 94 12 22 2
-62 73 1 18 48 31 4 1 94 15 26 1
-62 72 1 19 48 31 4 3 94 15 26 1
-62 71 1 20 48 31 4 5 94 15 26 1
-62 70 1 16 48 33 3 1 94 14 25 2
-62 69 1 17 48 33 3 4 94 14 25 2
-62 68 1 18 48 33 5 4 94 18 30 1
-62 67 1 19 48 33 4 2 94 17 29 1
-62 66 1 20 48 33 4 5 94 17 29 1
-62 65 1 16 47 18 3 1 93 20 34 2
-62 64 1 17 47 18 3 4 93 20 34 2
-62 63 1 18 47 18 4 1 93 23 37 1
-62 62 1 19 47 18 4 3 93 23 37 1
-62 61 1 20 47 18 4 5 93 23 37 1
-62 60 1 16 47 26 3 1 93 25 39 1
-62 59 1 17 47 26 3 3 93 25 39 1
-62 58 1 18 47 26 5 4 93 25 40 2
-62 57 1 19 47 26 5 5 93 25 40 2
-62 56 1 20 47 26 4 3 92 27 40 1
-62 55 1 16 47 32 4 1 92 25 39 2
-62 54 1 17 47 32 4 2 92 25 39 2
-62 53 1 18 47 32 4 4 92 25 39 2
-62 52 1 19 47 32 3 1 91 27 42 2
-62 51 1 20 47 32 3 3 91 27 42 2
-62 50 1 24 46 10 3 5 91 25 40 2
-62 49 1 19 46 10 3 3 91 25 40 2
-62 48 1 14 46 10 4 5 108 27 40 2
-62 47 1 9 46 10 4 4 108 27 40 2
-62 46 1 4 46 10 4 2 108 27 40 2
-62 45 1 24 54 1 4 4 108 25 38 1
-62 44 1 19 54 1 3 5 107 27 39 1
-62 43 1 14 54 1 3 3 107 27 39 1
-62 42 1 9 54 1 5 3 107 27 40 2
-62 41 1 4 54 1 5 1 107 27 40 2
-62 40 1 24 54 2 4 4 107 21 35 1
-62 39 1 19 54 2 4 2 107 21 35 1
-62 38 1 14 54 2 4 1 107 21 35 1
-62 37 1 9 54 2 5 3 106 23 37 2
-62 36 1 4 54 2 5 1 106 23 37 2
-62 35 1 24 54 4 4 4 106 20 32 1
-62 34 1 19 54 4 4 3 106 20 32 1
-62 33 1 14 54 4 5 3 106 19 31 1
-62 32 1 9 54 4 3 5 106 15 26 1
-62 31 1 4 54 4 3 3 106 15 26 1
-62 30 1 24 54 8 4 4 106 14 25 1
-62 29 1 19 54 8 4 2 106 14 25 1
-62 28 1 14 54 8 4 1 106 14 25 1
-62 27 1 9 54 8 5 3 106 9 16 1
-62 26 1 4 54 8 5 1 106 9 16 1
-62 25 1 24 54 15 4 4 106 9 17 2
-62 24 1 19 54 15 4 1 106 9 17 2
-62 23 1 14 54 15 3 5 106 5 10 1
-62 22 1 9 54 15 5 3 106 5 9 2
-62 21 1 4 54 15 5 1 106 5 9 2
-62 20 1 24 54 22 3 5 106 1 1 1
-62 19 1 19 54 22 4 5 105 4 9 3
-62 18 1 14 54 22 4 4 105 4 9 3
-62 17 1 9 54 22 4 3 105 4 9 3
-62 16 1 4 54 22 4 1 105 4 9 3
-62 15 1 24 53 1 3 5 87 16 41 2
-62 14 1 19 53 1 5 3 87 16 40 1
-62 13 1 14 53 1 5 1 87 16 40 1
-62 12 1 9 53 1 4 4 87 12 31 1
-62 11 1 4 53 1 4 2 87 12 31 1
-62 10 1 24 53 2 4 4 87 11 30 3
-62 9 1 19 53 2 4 2 87 11 30 3
-62 8 1 14 53 2 4 1 87 11 30 3
-62 7 1 9 53 2 5 3 87 7 17 2
-62 6 1 4 53 2 5 1 87 7 17 2
-62 5 1 24 53 3 2 4 87 3 8 2
-62 4 1 19 53 3 2 1 87 3 8 2
-61 97 1 24 48 30 2 1 77 2 2 1
-61 96 1 25 48 30 2 3 77 2 2 1
-61 95 1 21 48 17 5 1 77 6 13 1
-61 94 1 22 48 17 5 3 77 6 13 1
-61 93 1 23 48 17 5 5 77 6 13 1
-61 92 1 24 48 17 4 2 77 10 24 1
-61 91 1 25 48 17 4 4 77 10 24 1
-61 90 1 21 48 20 4 1 77 9 23 3
-61 89 1 22 48 20 4 3 77 9 23 3
-61 88 1 23 48 20 5 1 77 13 35 2
-61 87 1 24 48 20 5 2 77 13 35 2
-61 86 1 25 48 20 5 4 77 13 35 2
-61 85 1 21 48 24 5 1 95 1 2 2
-61 84 1 22 48 24 5 2 95 1 2 2
-61 83 1 23 48 24 5 3 95 1 2 2
-61 82 1 24 48 24 5 4 95 1 2 2
-61 81 1 25 48 24 5 5 95 1 2 2
-61 80 1 21 48 27 5 1 94 8 15 2
-61 79 1 22 48 27 5 2 94 8 15 2
-61 78 1 23 48 27 5 4 94 8 15 2
-61 77 1 24 48 27 4 1 94 12 21 1
-61 76 1 25 48 27 4 3 94 12 21 1
-61 75 1 21 48 31 5 1 94 12 22 2
-61 74 1 22 48 31 5 3 94 12 22 2
-61 73 1 23 48 31 5 5 94 12 22 2
-61 72 1 24 48 31 4 2 94 15 26 1
-61 71 1 25 48 31 4 4 94 15 26 1
-61 70 1 21 48 33 5 1 94 18 30 1
-61 69 1 22 48 33 5 2 94 18 30 1
-61 68 1 23 48 33 5 3 94 18 30 1
-61 67 1 24 48 33 5 5 94 18 30 1
-61 66 1 25 48 33 4 4 94 17 29 1
-61 65 1 21 47 18 5 1 93 23 38 2
-61 64 1 22 47 18 5 2 93 23 38 2
-61 63 1 23 47 18 5 3 93 23 38 2
-61 62 1 24 47 18 5 4 93 23 38 2
-61 61 1 25 47 18 5 5 93 23 38 2
-61 60 1 21 47 26 5 1 93 25 40 2
-61 59 1 22 47 26 5 2 93 25 40 2
-61 58 1 23 47 26 5 3 93 25 40 2
-61 57 1 24 47 26 4 1 92 27 40 1
-61 56 1 25 47 26 4 2 92 27 40 1
-61 45 1 25 54 1 4 5 108 25 38 1
-61 44 1 20 54 1 4 1 108 25 38 1
-61 43 1 15 54 1 5 5 107 27 40 2
-61 42 1 10 54 1 5 4 107 27 40 2
-61 41 1 5 54 1 5 2 107 27 40 2
-61 40 1 25 54 2 4 5 107 21 35 1
-61 39 1 20 54 2 4 3 107 21 35 1
-61 38 1 15 54 2 5 5 106 23 37 2
-61 37 1 10 54 2 5 4 106 23 37 2
-61 36 1 5 54 2 5 2 106 23 37 2
-61 35 1 25 54 4 4 5 106 20 32 1
-61 34 1 20 54 4 5 5 106 19 31 1
-61 33 1 15 54 4 5 4 106 19 31 1
-61 32 1 10 54 4 5 2 106 19 31 1
-61 31 1 5 54 4 5 1 106 19 31 1
-61 30 1 25 54 8 4 5 106 14 25 1
-61 29 1 20 54 8 4 3 106 14 25 1
-61 28 1 15 54 8 5 5 106 9 16 1
-61 27 1 10 54 8 5 4 106 9 16 1
-61 26 1 5 54 8 5 2 106 9 16 1
-61 25 1 25 54 15 4 5 106 9 17 2
-61 24 1 20 54 15 4 2 106 9 17 2
-61 23 1 15 54 15 5 5 106 5 9 2
-61 22 1 10 54 15 5 4 106 5 9 2
-61 21 1 5 54 15 5 2 106 5 9 2
-61 20 1 25 54 22 5 5 105 4 8 2
-61 19 1 20 54 22 5 4 105 4 8 2
-61 18 1 15 54 22 5 3 105 4 8 2
-61 17 1 10 54 22 5 2 105 4 8 2
-61 16 1 5 54 22 5 1 105 4 8 2
-61 15 1 25 53 1 5 5 87 16 40 1
-61 14 1 20 53 1 5 4 87 16 40 1
-61 13 1 15 53 1 5 2 87 16 40 1
-61 12 1 10 53 1 4 5 87 12 31 1
-61 11 1 5 53 1 4 3 87 12 31 1
-61 10 1 25 53 2 4 5 87 11 30 3
-61 9 1 20 53 2 4 3 87 11 30 3
-61 8 1 15 53 2 5 5 87 7 17 2
-61 7 1 10 53 2 5 4 87 7 17 2
-61 6 1 5 53 2 5 2 87 7 17 2
-61 5 1 25 53 3 2 5 87 3 8 2
-61 4 1 20 53 3 2 2 87 3 8 2
-60 100 1 1 48 5 1 1 77 2 3 2
-60 99 1 2 48 5 1 2 77 2 3 2
-60 98 1 3 48 5 1 3 77 2 3 2
-60 97 1 4 48 5 1 4 77 2 3 2
-60 96 1 5 48 5 1 5 77 2 3 2
-60 95 1 1 48 6 1 2 77 6 14 2
-60 94 1 2 48 6 1 4 77 6 14 2
-60 93 1 3 48 6 1 5 77 6 14 2
-60 92 1 4 48 6 2 3 77 10 25 2
-60 91 1 5 48 6 2 5 77 10 25 2
-60 90 1 1 48 7 2 2 77 10 26 3
-60 89 1 2 48 7 2 5 77 10 26 3
-60 88 1 3 48 7 1 2 77 14 36 1
-60 87 1 4 48 7 1 4 77 14 36 1
-60 86 1 5 48 7 1 5 77 14 36 1
-60 85 1 1 48 8 1 1 95 1 3 3
-60 84 1 2 48 8 1 2 95 1 3 3
-60 83 1 3 48 8 1 3 95 1 3 3
-60 82 1 4 48 8 1 4 95 1 3 3
-60 81 1 5 48 8 1 5 95 1 3 3
-60 80 1 1 48 13 2 2 95 5 10 1
-60 79 1 2 48 13 2 5 95 5 10 1
-60 78 1 3 48 13 1 2 95 9 18 1
-60 77 1 4 48 13 1 4 95 9 18 1
-60 76 1 5 48 13 1 5 95 9 18 1
-60 75 1 1 48 14 1 1 94 16 27 1
-60 74 1 2 48 14 1 2 94 16 27 1
-60 73 1 3 48 14 1 3 94 16 27 1
-60 72 1 4 48 14 1 4 94 16 27 1
-60 71 1 5 48 14 1 5 94 16 27 1
-60 70 1 1 48 15 1 1 94 19 31 1
-60 69 1 2 48 15 1 2 94 19 31 1
-60 68 1 3 48 15 1 4 94 19 31 1
-60 67 1 4 48 15 2 2 94 23 34 1
-60 66 1 5 48 15 2 5 94 23 34 1
-60 65 1 1 48 16 2 2 94 21 33 1
-60 64 1 2 48 16 2 4 94 21 33 1
-60 63 1 3 48 16 1 1 94 25 37 1
-60 62 1 4 48 16 1 3 94 25 37 1
-60 61 1 5 48 16 1 5 94 25 37 1
-60 60 1 1 47 25 5 5 93 27 41 1
-60 59 1 2 47 25 5 4 93 27 41 1
-60 58 1 3 47 25 5 3 93 27 41 1
-60 43 1 11 54 21 1 1 107 27 41 3
-60 42 1 6 54 14 1 1 107 25 38 1
-60 41 1 1 54 14 1 2 107 25 38 1
-60 40 1 21 54 32 1 4 106 27 40 2
-60 39 1 16 54 32 1 2 106 27 40 2
-60 38 1 11 54 32 1 1 106 27 40 2
-60 37 1 6 54 32 2 3 106 23 36 1
-60 36 1 1 54 32 2 1 106 23 36 1
-60 35 1 21 54 33 2 3 106 21 35 3
-60 34 1 16 54 33 2 1 106 21 35 3
-60 33 1 11 54 33 1 3 106 18 30 1
-60 32 1 6 54 33 1 2 106 18 30 1
-60 31 1 1 54 33 1 1 106 18 30 1
-60 30 1 21 53 4 1 5 106 13 24 2
-60 29 1 16 53 4 1 4 106 13 24 2
-60 28 1 11 53 4 1 3 106 13 24 2
-60 27 1 6 53 4 1 2 106 13 24 2
-60 26 1 1 53 4 1 1 106 13 24 2
-60 25 1 21 53 5 1 4 105 12 23 2
-60 24 1 16 53 5 1 2 105 12 23 2
-60 23 1 11 53 5 1 1 105 12 23 2
-60 22 1 6 53 5 2 3 105 8 17 1
-60 21 1 1 53 5 2 1 105 8 17 1
-60 20 1 21 53 10 1 5 105 4 7 1
-60 19 1 16 53 10 1 4 105 4 7 1
-60 18 1 11 53 10 1 3 105 4 7 1
-60 17 1 6 53 10 1 2 105 4 7 1
-60 16 1 1 53 10 1 1 105 4 7 1
-60 15 1 21 53 11 1 4 87 15 39 2
-60 14 1 16 53 11 1 2 87 15 39 2
-60 13 1 11 53 11 1 1 87 15 39 2
-60 12 1 6 53 11 2 3 87 11 28 1
-60 11 1 1 53 11 2 1 87 11 28 1
-60 10 1 21 53 12 2 4 87 11 29 2
-60 9 1 16 53 12 2 2 87 11 29 2
-60 8 1 11 53 12 1 5 87 7 16 1
-60 7 1 6 53 12 1 3 87 7 16 1
-60 6 1 1 53 12 1 1 87 7 16 1
-60 5 1 21 53 13 1 5 87 3 7 1
-60 4 1 16 53 13 1 4 87 3 7 1
-60 3 1 11 53 13 1 3 87 3 7 1
-60 2 1 6 53 13 1 2 87 3 7 1
-60 1 1 1 53 13 1 1 87 3 7 1
-59 100 1 6 48 5 2 1 77 3 4 1
-59 99 1 7 48 5 2 2 77 3 4 1
-59 98 1 8 48 5 2 3 77 3 4 1
-59 97 1 9 48 5 2 4 77 3 4 1
-59 96 1 10 48 5 2 5 77 3 4 1
-59 95 1 6 48 6 1 1 77 6 14 2
-59 94 1 7 48 6 1 3 77 6 14 2
-59 93 1 8 48 6 2 1 77 10 25 2
-59 92 1 9 48 6 2 2 77 10 25 2
-59 91 1 10 48 6 2 4 77 10 25 2
-59 90 1 6 48 7 2 1 77 10 26 3
-59 89 1 7 48 7 2 4 77 10 26 3
-59 88 1 8 48 7 1 1 77 14 36 1
-59 87 1 9 48 7 1 3 77 14 36 1
-59 86 1 10 48 7 3 5 77 14 37 2
-59 85 1 6 48 8 2 2 95 2 4 1
-59 84 1 7 48 8 2 3 95 2 4 1
-59 83 1 8 48 8 2 4 95 2 4 1
-59 82 1 9 48 8 2 5 95 2 4 1
-59 81 1 10 48 8 4 5 95 6 11 1
-59 80 1 6 48 13 2 1 95 5 10 1
-59 79 1 7 48 13 2 4 95 5 10 1
-59 78 1 8 48 13 1 1 95 9 18 1
-59 77 1 9 48 13 1 3 95 9 18 1
-59 76 1 10 48 13 3 5 95 9 19 2
-59 75 1 6 48 14 3 2 95 13 24 1
-59 74 1 7 48 14 2 1 94 16 28 2
-59 73 1 8 48 14 2 2 94 16 28 2
-59 72 1 9 48 14 2 3 94 16 28 2
-59 71 1 10 48 14 2 5 94 16 28 2
-59 70 1 6 48 15 3 2 94 20 32 1
-59 69 1 7 48 15 3 4 94 20 32 1
-59 68 1 8 48 15 1 3 94 19 31 1
-59 67 1 9 48 15 1 5 94 19 31 1
-59 66 1 10 48 15 2 4 94 23 34 1
-59 65 1 6 48 16 2 1 94 21 33 1
-59 64 1 7 48 16 2 3 94 21 33 1
-59 63 1 8 48 16 2 5 94 21 33 1
-59 62 1 9 48 16 1 2 94 25 37 1
-59 61 1 10 48 16 1 4 94 25 37 1
-59 60 1 6 47 25 5 2 93 27 41 1
-59 59 1 7 47 25 5 1 93 27 41 1
-59 42 1 7 54 14 1 3 107 25 38 1
-59 41 1 2 54 14 1 4 107 25 38 1
-59 40 1 22 54 32 1 5 106 27 40 2
-59 39 1 17 54 32 1 3 106 27 40 2
-59 38 1 12 54 32 2 5 106 23 36 1
-59 37 1 7 54 32 2 4 106 23 36 1
-59 36 1 2 54 32 2 2 106 23 36 1
-59 35 1 22 54 33 2 4 106 21 35 3
-59 34 1 17 54 33 1 5 106 18 30 1
-59 33 1 12 54 33 1 4 106 18 30 1
-59 32 1 7 54 33 3 3 106 17 29 1
-59 31 1 2 54 33 3 1 106 17 29 1
-59 30 1 22 53 4 2 4 106 13 23 1
-59 29 1 17 53 4 2 3 106 13 23 1
-59 28 1 12 53 4 2 2 106 13 23 1
-59 27 1 7 53 4 2 1 106 13 23 1
-59 26 1 2 53 4 3 1 105 16 29 2
-59 25 1 22 53 5 1 5 105 12 23 2
-59 24 1 17 53 5 1 3 105 12 23 2
-59 23 1 12 53 5 3 1 105 12 22 1
-59 22 1 7 53 5 2 4 105 8 17 1
-59 21 1 2 53 5 2 2 105 8 17 1
-59 20 1 22 53 10 4 2 105 7 16 2
-59 19 1 17 53 10 2 4 105 3 6 2
-59 18 1 12 53 10 2 3 105 3 6 2
-59 17 1 7 53 10 2 2 105 3 6 2
-59 16 1 2 53 10 2 1 105 3 6 2
-59 15 1 22 53 11 1 5 87 15 39 2
-59 14 1 17 53 11 1 3 87 15 39 2
-59 13 1 12 53 11 3 1 87 15 38 1
-59 12 1 7 53 11 2 4 87 11 28 1
-59 11 1 2 53 11 2 2 87 11 28 1
-59 10 1 22 53 12 2 5 87 11 29 2
-59 9 1 17 53 12 2 3 87 11 29 2
-59 8 1 12 53 12 2 1 87 11 29 2
-59 7 1 7 53 12 1 4 87 7 16 1
-59 6 1 2 53 12 1 2 87 7 16 1
-59 5 1 22 53 13 2 5 87 2 6 3
-59 4 1 17 53 13 2 4 87 2 6 3
-59 3 1 12 53 13 2 3 87 2 6 3
-59 2 1 7 53 13 2 2 87 2 6 3
-59 1 1 2 53 13 2 1 87 2 6 3
-58 100 1 11 48 5 3 2 77 3 5 2
-58 99 1 12 48 5 3 3 77 3 5 2
-58 98 1 13 48 5 3 4 77 3 5 2
-58 97 1 14 48 5 3 5 77 3 5 2
-58 96 1 15 48 5 4 5 77 7 15 1
-58 95 1 11 48 6 4 3 77 7 16 2
-58 94 1 12 48 6 3 1 77 11 27 1
-58 93 1 13 48 6 3 3 77 11 27 1
-58 92 1 14 48 6 3 4 77 11 27 1
-58 91 1 15 48 6 3 5 77 11 27 1
-58 90 1 11 48 7 4 3 77 11 28 2
-58 89 1 12 48 7 2 3 77 10 26 3
-58 88 1 13 48 7 3 1 77 14 37 2
-58 87 1 14 48 7 3 2 77 14 37 2
-58 86 1 15 48 7 3 4 77 14 37 2
-58 85 1 11 48 8 2 1 95 2 4 1
-58 84 1 12 48 8 3 1 95 2 5 2
-58 83 1 13 48 8 3 3 95 2 5 2
-58 82 1 14 48 8 3 5 95 2 5 2
-58 81 1 15 48 8 4 4 95 6 11 1
-58 80 1 11 48 13 4 3 95 6 12 2
-58 79 1 12 48 13 2 3 95 5 10 1
-58 78 1 13 48 13 3 1 95 9 19 2
-58 77 1 14 48 13 3 2 95 9 19 2
-58 76 1 15 48 13 3 4 95 9 19 2
-58 75 1 11 48 14 3 1 95 13 24 1
-58 74 1 12 48 14 3 3 95 13 24 1
-58 73 1 13 48 14 3 4 95 13 24 1
-58 72 1 14 48 14 3 5 95 13 24 1
-58 71 1 15 48 14 2 4 94 16 28 2
-58 70 1 11 48 15 3 1 94 20 32 1
-58 69 1 12 48 15 3 3 94 20 32 1
-58 68 1 13 48 15 3 5 94 20 32 1
-58 67 1 14 48 15 2 1 94 23 34 1
-58 66 1 15 48 15 2 3 94 23 34 1
-58 65 1 11 48 16 4 3 94 23 35 2
-58 64 1 12 48 16 4 5 94 23 35 2
-58 63 1 13 48 16 3 2 94 25 38 2
-58 62 1 14 48 16 3 4 94 25 38 2
-58 61 1 15 48 16 3 5 94 25 38 2
-58 60 1 11 47 3 5 1 94 25 39 3
-58 41 1 3 54 14 1 5 107 25 38 1
-58 40 1 23 54 32 3 5 106 27 39 1
-58 39 1 18 54 32 3 3 106 27 39 1
-58 38 1 13 54 32 3 1 106 27 39 1
-58 37 1 8 54 32 4 4 106 21 33 1
-58 36 1 3 54 32 4 1 106 21 33 1
-58 35 1 23 54 33 2 5 106 21 35 3
-58 34 1 18 54 33 2 2 106 21 35 3
-58 33 1 13 54 33 3 5 106 17 29 1
-58 32 1 8 54 33 3 4 106 17 29 1
-58 31 1 3 54 33 3 2 106 17 29 1
-58 30 1 23 53 4 2 5 106 13 23 1
-58 29 1 18 53 4 3 5 105 16 29 2
-58 28 1 13 53 4 3 4 105 16 29 2
-58 27 1 8 53 4 3 3 105 16 29 2
-58 26 1 3 53 4 3 2 105 16 29 2
-58 25 1 23 53 5 3 4 105 12 22 1
-58 24 1 18 53 5 3 3 105 12 22 1
-58 23 1 13 53 5 3 2 105 12 22 1
-58 22 1 8 53 5 2 5 105 8 17 1
-58 21 1 3 53 5 4 1 105 7 15 1
-58 20 1 23 53 10 4 3 105 7 16 2
-58 19 1 18 53 10 2 5 105 3 6 2
-58 18 1 13 53 10 3 3 105 3 5 1
-58 17 1 8 53 10 3 2 105 3 5 1
-58 16 1 3 53 10 3 1 105 3 5 1
-58 15 1 23 53 11 3 4 87 15 38 1
-58 14 1 18 53 11 3 3 87 15 38 1
-58 13 1 13 53 11 3 2 87 15 38 1
-58 12 1 8 53 11 2 5 87 11 28 1
-58 11 1 3 53 11 4 1 87 10 25 2
-58 10 1 23 53 12 3 4 87 10 27 4
-58 9 1 18 53 12 3 3 87 10 27 4
-58 8 1 13 53 12 3 2 87 10 27 4
-58 7 1 8 53 12 3 1 87 10 27 4
-58 6 1 3 53 12 4 1 87 6 14 2
-58 5 1 23 53 13 4 3 87 6 15 3
-58 4 1 18 53 13 3 5 87 2 5 2
-58 3 1 13 53 13 3 3 87 2 5 2
-58 2 1 8 53 13 3 2 87 2 5 2
-58 1 1 3 53 13 3 1 87 2 5 2
-57 100 1 16 48 5 3 1 77 3 5 2
-57 99 1 17 48 5 5 3 77 3 6 3
-57 98 1 18 48 5 5 5 77 3 6 3
-57 97 1 19 48 5 4 2 77 7 15 1
-57 96 1 20 48 5 4 4 77 7 15 1
-57 95 1 16 48 6 4 2 77 7 16 2
-57 94 1 17 48 6 4 5 77 7 16 2
-57 93 1 18 48 6 3 2 77 11 27 1
-57 92 1 19 48 6 5 3 77 11 29 3
-57 91 1 20 48 6 5 5 77 11 29 3
-57 90 1 16 48 7 4 2 77 11 28 2
-57 89 1 17 48 7 4 5 77 11 28 2
-57 88 1 18 48 7 5 2 77 15 38 1
-57 87 1 19 48 7 5 4 77 15 38 1
-57 86 1 20 48 7 3 3 77 14 37 2
-57 85 1 16 48 8 5 2 95 3 6 1
-57 84 1 17 48 8 5 4 95 3 6 1
-57 83 1 18 48 8 3 2 95 2 5 2
-57 82 1 19 48 8 3 4 95 2 5 2
-57 81 1 20 48 8 4 3 95 6 11 1
-57 80 1 16 48 13 4 2 95 6 12 2
-57 79 1 17 48 13 4 5 95 6 12 2
-57 78 1 18 48 13 5 2 95 10 20 1
-57 77 1 19 48 13 5 4 95 10 20 1
-57 76 1 20 48 13 3 3 95 9 19 2
-57 75 1 16 48 14 4 1 95 13 25 2
-57 74 1 17 48 14 4 2 95 13 25 2
-57 73 1 18 48 14 4 3 95 13 25 2
-57 72 1 19 48 14 4 4 95 13 25 2
-57 71 1 20 48 14 4 5 95 13 25 2
-57 70 1 16 48 15 5 2 95 17 30 1
-57 69 1 17 48 15 5 4 95 17 30 1
-57 68 1 18 48 15 4 1 94 23 36 3
-57 67 1 19 48 15 4 3 94 23 36 3
-57 66 1 20 48 15 4 5 94 23 36 3
-57 65 1 16 48 16 4 2 94 23 35 2
-57 64 1 17 48 16 4 4 94 23 35 2
-57 63 1 18 48 16 3 1 94 25 38 2
-57 62 1 19 48 16 3 3 94 25 38 2
-57 61 1 20 48 16 5 5 94 27 40 1
-57 40 1 24 54 32 5 4 106 25 38 1
-57 39 1 19 54 32 3 4 106 27 39 1
-57 38 1 14 54 32 3 2 106 27 39 1
-57 37 1 9 54 32 4 5 106 21 33 1
-57 36 1 4 54 32 4 2 106 21 33 1
-57 35 1 24 54 33 4 4 106 21 34 2
-57 34 1 19 54 33 4 2 106 21 34 2
-57 33 1 14 54 33 4 1 106 21 34 2
-57 32 1 9 54 33 5 3 105 20 35 1
-57 31 1 4 54 33 5 1 105 20 35 1
-57 30 1 24 53 4 4 5 105 16 28 1
-57 29 1 19 53 4 4 4 105 16 28 1
-57 28 1 14 53 4 4 3 105 16 28 1
-57 27 1 9 53 4 4 2 105 16 28 1
-57 26 1 4 53 4 4 1 105 16 28 1
-57 25 1 24 53 5 3 5 105 12 22 1
-57 24 1 19 53 5 5 3 105 11 21 1
-57 23 1 14 53 5 5 1 105 11 21 1
-57 22 1 9 53 5 4 4 105 7 15 1
-57 21 1 4 53 5 4 2 105 7 15 1
-57 20 1 24 53 10 4 4 105 7 16 2
-57 19 1 19 53 10 3 5 105 3 5 1
-57 18 1 14 53 10 3 4 105 3 5 1
-57 17 1 9 53 10 5 3 105 2 4 2
-57 16 1 4 53 10 5 1 105 2 4 2
-57 15 1 24 53 11 3 5 87 15 38 1
-57 14 1 19 53 11 5 3 87 14 37 2
-57 13 1 14 53 11 5 1 87 14 37 2
-57 12 1 9 53 11 4 4 87 10 25 2
-57 11 1 4 53 11 4 2 87 10 25 2
-57 10 1 24 53 12 3 5 87 10 27 4
-57 9 1 19 53 12 5 3 87 10 26 3
-57 8 1 14 53 12 5 1 87 10 26 3
-57 7 1 9 53 12 4 4 87 6 14 2
-57 6 1 4 53 12 4 2 87 6 14 2
-57 5 1 24 53 13 4 4 87 6 15 3
-57 4 1 19 53 13 4 1 87 6 15 3
-57 3 1 14 53 13 3 4 87 2 5 2
-57 2 1 9 53 13 5 3 87 2 4 1
-57 1 1 4 53 13 5 1 87 2 4 1
-56 100 1 21 48 5 5 1 77 3 6 3
-56 99 1 22 48 5 5 2 77 3 6 3
-56 98 1 23 48 5 5 4 77 3 6 3
-56 97 1 24 48 5 4 1 77 7 15 1
-56 96 1 25 48 5 4 3 77 7 15 1
-56 95 1 21 48 6 4 1 77 7 16 2
-56 94 1 22 48 6 4 4 77 7 16 2
-56 93 1 23 48 6 5 1 77 11 29 3
-56 92 1 24 48 6 5 2 77 11 29 3
-56 91 1 25 48 6 5 4 77 11 29 3
-56 90 1 21 48 7 4 1 77 11 28 2
-56 89 1 22 48 7 4 4 77 11 28 2
-56 88 1 23 48 7 5 1 77 15 38 1
-56 87 1 24 48 7 5 3 77 15 38 1
-56 86 1 25 48 7 5 5 77 15 38 1
-56 85 1 21 48 8 5 1 95 3 6 1
-56 84 1 22 48 8 5 3 95 3 6 1
-56 83 1 23 48 8 5 5 95 3 6 1
-56 82 1 24 48 8 4 1 95 6 11 1
-56 81 1 25 48 8 4 2 95 6 11 1
-56 80 1 21 48 13 4 1 95 6 12 2
-56 79 1 22 48 13 4 4 95 6 12 2
-56 78 1 23 48 13 5 1 95 10 20 1
-56 77 1 24 48 13 5 3 95 10 20 1
-56 76 1 25 48 13 5 5 95 10 20 1
-56 75 1 21 48 14 5 1 95 14 26 1
-56 74 1 22 48 14 5 2 95 14 26 1
-56 73 1 23 48 14 5 3 95 14 26 1
-56 72 1 24 48 14 5 4 95 14 26 1
-56 71 1 25 48 14 5 5 95 14 26 1
-56 70 1 21 48 15 5 1 95 17 30 1
-56 69 1 22 48 15 5 3 95 17 30 1
-56 68 1 23 48 15 5 5 95 17 30 1
-56 67 1 24 48 15 4 2 94 23 36 3
-56 66 1 25 48 15 4 4 94 23 36 3
-56 65 1 21 48 16 4 1 94 23 35 2
-56 64 1 22 48 16 5 1 94 27 40 1
-56 63 1 23 48 16 5 2 94 27 40 1
-56 62 1 24 48 16 5 3 94 27 40 1
-56 61 1 25 48 16 5 4 94 27 40 1
-56 40 1 25 54 32 5 5 106 25 38 1
-56 39 1 20 54 32 5 3 106 25 38 1
-56 38 1 15 54 32 5 2 106 25 38 1
-56 37 1 10 54 32 5 1 106 25 38 1
-56 36 1 5 54 32 4 3 106 21 33 1
-56 35 1 25 54 33 4 5 106 21 34 2
-56 34 1 20 54 33 4 3 106 21 34 2
-56 33 1 15 54 33 5 5 105 20 35 1
-56 32 1 10 54 33 5 4 105 20 35 1
-56 31 1 5 54 33 5 2 105 20 35 1
-56 30 1 25 53 4 5 5 105 15 27 2
-56 29 1 20 53 4 5 4 105 15 27 2
-56 28 1 15 53 4 5 3 105 15 27 2
-56 27 1 10 53 4 5 2 105 15 27 2
-56 26 1 5 53 4 5 1 105 15 27 2
-56 25 1 25 53 5 5 5 105 11 21 1
-56 24 1 20 53 5 5 4 105 11 21 1
-56 23 1 15 53 5 5 2 105 11 21 1
-56 22 1 10 53 5 4 5 105 7 15 1
-56 21 1 5 53 5 4 3 105 7 15 1
-56 20 1 25 53 10 4 5 105 7 16 2
-56 19 1 20 53 10 4 1 105 7 16 2
-56 18 1 15 53 10 5 5 105 2 4 2
-56 17 1 10 53 10 5 4 105 2 4 2
-56 16 1 5 53 10 5 2 105 2 4 2
-56 15 1 25 53 11 5 5 87 14 37 2
-56 14 1 20 53 11 5 4 87 14 37 2
-56 13 1 15 53 11 5 2 87 14 37 2
-56 12 1 10 53 11 4 5 87 10 25 2
-56 11 1 5 53 11 4 3 87 10 25 2
-56 10 1 25 53 12 5 5 87 10 26 3
-56 9 1 20 53 12 5 4 87 10 26 3
-56 8 1 15 53 12 5 2 87 10 26 3
-56 7 1 10 53 12 4 5 87 6 14 2
-56 6 1 5 53 12 4 3 87 6 14 2
-56 5 1 25 53 13 4 5 87 6 15 3
-56 4 1 20 53 13 4 2 87 6 15 3
-56 3 1 15 53 13 5 5 87 2 4 1
-56 2 1 10 53 13 5 4 87 2 4 1
-56 1 1 5 53 13 5 2 87 2 4 1
-55 100 1 1 48 1 1 2 77 4 7 1
-55 99 1 2 48 1 1 4 77 4 7 1
-55 98 1 3 48 1 1 5 77 4 7 1
-55 97 1 4 48 1 2 3 77 8 18 1
-55 96 1 5 48 1 2 5 77 8 18 1
-55 95 1 1 48 2 1 2 77 7 17 3
-55 94 1 2 48 2 1 4 77 7 17 3
-55 93 1 3 48 2 1 5 77 7 17 3
-55 92 1 4 48 2 2 3 77 11 30 4
-55 91 1 5 48 2 2 5 77 11 30 4
-55 90 1 1 48 3 2 5 77 12 31 1
-55 89 1 2 48 3 1 1 77 15 39 2
-55 88 1 3 48 3 1 2 77 15 39 2
-55 87 1 4 48 3 1 4 77 15 39 2
-55 86 1 5 48 3 1 5 77 15 39 2
-55 85 1 1 48 4 1 2 95 3 7 2
-55 84 1 2 48 4 1 4 95 3 7 2
-55 83 1 3 48 4 1 5 95 3 7 2
-55 82 1 4 48 4 2 3 95 7 13 1
-55 81 1 5 48 4 2 5 95 7 13 1
-55 80 1 1 48 9 2 2 95 7 14 2
-55 79 1 2 48 9 2 5 95 7 14 2
-55 78 1 3 48 9 1 2 95 11 21 1
-55 77 1 4 48 9 1 4 95 11 21 1
-55 76 1 5 48 9 1 5 95 11 21 1
-55 75 1 1 48 10 1 1 95 14 27 2
-55 74 1 2 48 10 1 2 95 14 27 2
-55 73 1 3 48 10 1 4 95 14 27 2
-55 72 1 4 48 10 1 5 95 14 27 2
-55 71 1 5 48 10 2 5 95 19 32 1
-55 70 1 1 48 11 1 2 95 18 31 1
-55 69 1 2 48 11 1 4 95 18 31 1
-55 68 1 3 48 11 1 5 95 18 31 1
-55 67 1 4 48 11 2 2 95 21 36 1
-55 66 1 5 48 11 2 5 95 21 36 1
-55 65 1 1 48 12 1 2 95 25 38 1
-55 64 1 2 48 12 1 3 95 25 38 1
-55 63 1 3 48 12 1 4 95 25 38 1
-55 62 1 4 48 12 1 5 95 25 38 1
-55 39 1 16 53 6 1 4 105 27 41 2
-55 38 1 11 53 6 1 3 105 27 41 2
-55 37 1 6 53 6 1 2 105 27 41 2
-55 36 1 1 53 6 1 1 105 27 41 2
-55 35 1 21 53 7 2 3 105 23 37 1
-55 34 1 16 53 7 2 1 105 23 37 1
-55 33 1 11 53 7 1 5 105 19 34 1
-55 32 1 6 53 7 1 3 105 19 34 1
-55 31 1 1 53 7 1 1 105 19 34 1
-55 30 1 21 53 8 2 3 105 18 33 2
-55 29 1 16 53 8 1 5 105 15 26 1
-55 28 1 11 53 8 1 3 105 15 26 1
-55 27 1 6 53 8 1 2 105 15 26 1
-55 26 1 1 53 8 1 1 105 15 26 1
-55 25 1 21 53 9 1 4 105 10 20 2
-55 24 1 16 53 9 1 2 105 10 20 2
-55 23 1 11 53 9 1 1 105 10 20 2
-55 22 1 6 53 9 2 3 105 6 13 1
-55 21 1 1 53 9 2 1 105 6 13 1
-55 20 1 21 53 14 2 4 105 6 14 2
-55 19 1 16 53 14 2 2 105 6 14 2
-55 18 1 11 53 14 1 5 105 2 3 1
-55 17 1 6 53 14 1 3 105 2 3 1
-55 16 1 1 53 14 1 1 105 2 3 1
-55 15 1 21 53 15 1 5 87 14 36 1
-55 14 1 16 53 15 1 3 87 14 36 1
-55 13 1 11 53 15 1 2 87 14 36 1
-55 12 1 6 53 15 1 1 87 14 36 1
-55 11 1 1 53 15 2 1 87 9 21 1
-55 10 1 21 53 16 2 4 87 10 24 1
-55 9 1 16 53 16 2 2 87 10 24 1
-55 8 1 11 53 16 1 5 87 6 13 1
-55 7 1 6 53 16 1 3 87 6 13 1
-55 6 1 1 53 16 1 1 87 6 13 1
-55 5 1 21 53 17 2 3 87 5 12 3
-55 4 1 16 53 17 2 1 87 5 12 3
-55 3 1 11 53 17 1 4 87 1 3 3
-55 2 1 6 53 17 1 2 87 1 3 3
-55 1 1 1 53 17 1 1 87 1 3 3
-54 100 1 6 48 1 1 1 77 4 7 1
-54 99 1 7 48 1 1 3 77 4 7 1
-54 98 1 8 48 1 3 5 77 4 8 2
-54 97 1 9 48 1 2 2 77 8 18 1
-54 96 1 10 48 1 2 4 77 8 18 1
-54 95 1 6 48 2 1 1 77 7 17 3
-54 94 1 7 48 2 1 3 77 7 17 3
-54 93 1 8 48 2 2 1 77 11 30 4
-54 92 1 9 48 2 2 2 77 11 30 4
-54 91 1 10 48 2 2 4 77 11 30 4
-54 90 1 6 48 3 2 4 77 12 31 1
-54 89 1 7 48 3 3 2 77 16 40 1
-54 88 1 8 48 3 3 4 77 16 40 1
-54 87 1 9 48 3 1 3 77 15 39 2
-54 86 1 10 48 3 5 5 95 4 8 1
-54 85 1 6 48 4 1 1 95 3 7 2
-54 84 1 7 48 4 1 3 95 3 7 2
-54 83 1 8 48 4 2 1 95 7 13 1
-54 82 1 9 48 4 2 2 95 7 13 1
-54 81 1 10 48 4 2 4 95 7 13 1
-54 80 1 6 48 9 2 1 95 7 14 2
-54 79 1 7 48 9 2 4 95 7 14 2
-54 78 1 8 48 9 1 1 95 11 21 1
-54 77 1 9 48 9 1 3 95 11 21 1
-54 76 1 10 48 9 3 5 95 11 22 2
-54 75 1 6 48 10 3 2 95 15 28 1
-54 74 1 7 48 10 3 4 95 15 28 1
-54 73 1 8 48 10 1 3 95 14 27 2
-54 72 1 9 48 10 2 2 95 19 32 1
-54 71 1 10 48 10 2 4 95 19 32 1
-54 70 1 6 48 11 1 1 95 18 31 1
-54 69 1 7 48 11 1 3 95 18 31 1
-54 68 1 8 48 11 3 5 95 19 33 2
-54 67 1 9 48 11 2 1 95 21 36 1
-54 66 1 10 48 11 2 4 95 21 36 1
-54 65 1 6 48 12 1 1 95 25 38 1
-54 64 1 7 48 12 2 1 95 25 39 2
-54 63 1 8 48 12 2 3 95 25 39 2
-54 62 1 9 48 12 2 5 95 25 39 2
-54 39 1 17 53 6 1 5 105 27 41 2
-54 38 1 12 53 6 2 3 105 27 40 1
-54 37 1 7 53 6 2 2 105 27 40 1
-54 36 1 2 53 6 2 1 105 27 40 1
-54 35 1 22 53 7 2 4 105 23 37 1
-54 34 1 17 53 7 2 2 105 23 37 1
-54 33 1 12 53 7 3 4 105 18 32 1
-54 32 1 7 53 7 1 4 105 19 34 1
-54 31 1 2 53 7 1 2 105 19 34 1
-54 30 1 22 53 8 2 4 105 18 33 2
-54 29 1 17 53 8 2 1 105 18 33 2
-54 28 1 12 53 8 1 4 105 15 26 1
-54 27 1 7 53 8 3 3 105 14 25 1
-54 26 1 2 53 8 3 1 105 14 25 1
-54 25 1 22 53 9 1 5 105 10 20 2
-54 24 1 17 53 9 1 3 105 10 20 2
-54 23 1 12 53 9 3 1 105 10 19 1
-54 22 1 7 53 9 2 4 105 6 13 1
-54 21 1 2 53 9 2 2 105 6 13 1
-54 20 1 22 53 14 2 5 105 6 14 2
-54 19 1 17 53 14 2 3 105 6 14 2
-54 18 1 12 53 14 2 1 105 6 14 2
-54 17 1 7 53 14 1 4 105 2 3 1
-54 16 1 2 53 14 1 2 105 2 3 1
-54 15 1 22 53 15 5 2 105 1 2 2
-54 14 1 17 53 15 1 4 87 14 36 1
-54 13 1 12 53 15 3 3 87 13 35 2
-54 12 1 7 53 15 3 1 87 13 35 2
-54 11 1 2 53 15 2 2 87 9 21 1
-54 10 1 22 53 16 2 5 87 10 24 1
-54 9 1 17 53 16 2 3 87 10 24 1
-54 8 1 12 53 16 2 1 87 10 24 1
-54 7 1 7 53 16 1 4 87 6 13 1
-54 6 1 2 53 16 1 2 87 6 13 1
-54 5 1 22 53 17 2 4 87 5 12 3
-54 4 1 17 53 17 2 2 87 5 12 3
-54 3 1 12 53 17 1 5 87 1 3 3
-54 2 1 7 53 17 1 3 87 1 3 3
-54 1 1 2 53 17 3 1 87 1 2 2
-53 100 1 11 48 1 3 2 77 4 8 2
-53 99 1 12 48 1 3 3 77 4 8 2
-53 98 1 13 48 1 3 4 77 4 8 2
-53 97 1 14 48 1 2 1 77 8 18 1
-53 96 1 15 48 1 4 5 77 8 19 2
-53 95 1 11 48 2 4 3 77 8 20 3
-53 94 1 12 48 2 4 5 77 8 20 3
-53 93 1 13 48 2 3 2 77 12 32 2
-53 92 1 14 48 2 3 4 77 12 32 2
-53 91 1 15 48 2 3 5 77 12 32 2
-53 90 1 11 48 3 2 3 77 12 31 1
-53 89 1 12 48 3 3 1 77 16 40 1
-53 88 1 13 48 3 3 3 77 16 40 1
-53 87 1 14 48 3 3 5 77 16 40 1
-53 86 1 15 48 3 5 4 95 4 8 1
-53 85 1 11 48 4 4 3 95 4 9 2
-53 84 1 12 48 4 3 1 95 8 15 1
-53 83 1 13 48 4 3 3 95 8 15 1
-53 82 1 14 48 4 3 4 95 8 15 1
-53 81 1 15 48 4 3 5 95 8 15 1
-53 80 1 11 48 9 4 3 95 8 16 2
-53 79 1 12 48 9 2 3 95 7 14 2
-53 78 1 13 48 9 3 1 95 11 22 2
-53 77 1 14 48 9 3 2 95 11 22 2
-53 76 1 15 48 9 3 4 95 11 22 2
-53 75 1 11 48 10 3 1 95 15 28 1
-53 74 1 12 48 10 3 3 95 15 28 1
-53 73 1 13 48 10 3 5 95 15 28 1
-53 72 1 14 48 10 2 1 95 19 32 1
-53 71 1 15 48 10 2 3 95 19 32 1
-53 70 1 11 48 11 3 1 95 19 33 2
-53 69 1 12 48 11 3 3 95 19 33 2
-53 68 1 13 48 11 3 4 95 19 33 2
-53 67 1 14 48 11 4 3 95 23 37 1
-53 66 1 15 48 11 2 3 95 21 36 1
-53 65 1 11 48 12 3 2 95 27 40 1
-53 64 1 12 48 12 3 4 95 27 40 1
-53 63 1 13 48 12 2 2 95 25 39 2
-53 62 1 14 48 12 2 4 95 25 39 2
-53 39 1 18 53 6 2 5 105 27 40 1
-53 38 1 13 53 6 2 4 105 27 40 1
-53 37 1 8 53 6 3 2 105 25 39 2
-53 36 1 3 53 6 3 1 105 25 39 2
-53 35 1 23 53 7 2 5 105 23 37 1
-53 34 1 18 53 7 4 1 105 21 36 1
-53 33 1 13 53 7 3 5 105 18 32 1
-53 32 1 8 53 7 3 2 105 18 32 1
-53 31 1 3 53 7 3 1 105 18 32 1
-53 30 1 23 53 8 2 5 105 18 33 2
-53 29 1 18 53 8 2 2 105 18 33 2
-53 28 1 13 53 8 3 5 105 14 25 1
-53 27 1 8 53 8 3 4 105 14 25 1
-53 26 1 3 53 8 3 2 105 14 25 1
-53 25 1 23 53 9 3 4 105 10 19 1
-53 24 1 18 53 9 3 3 105 10 19 1
-53 23 1 13 53 9 3 2 105 10 19 1
-53 22 1 8 53 9 2 5 105 6 13 1
-53 21 1 3 53 9 4 1 105 5 10 1
-53 20 1 23 53 14 3 4 105 5 12 3
-53 19 1 18 53 14 3 3 105 5 12 3
-53 18 1 13 53 14 3 2 105 5 12 3
-53 17 1 8 53 14 3 1 105 5 12 3
-53 16 1 3 53 14 4 1 105 1 1 1
-53 15 1 23 53 15 5 3 105 1 2 2
-53 14 1 18 53 15 3 5 87 13 35 2
-53 13 1 13 53 15 3 4 87 13 35 2
-53 12 1 8 53 15 3 2 87 13 35 2
-53 11 1 3 53 15 2 3 87 9 21 1
-53 10 1 23 53 16 3 4 87 9 23 3
-53 9 1 18 53 16 3 2 87 9 23 3
-53 8 1 13 53 16 3 1 87 9 23 3
-53 7 1 8 53 16 4 4 87 5 10 1
-53 6 1 3 53 16 4 1 87 5 10 1
-53 5 1 23 53 17 2 5 87 5 12 3
-53 4 1 18 53 17 4 1 87 5 11 2
-53 3 1 13 53 17 3 4 87 1 2 2
-53 2 1 8 53 17 3 3 87 1 2 2
-53 1 1 3 53 17 3 2 87 1 2 2
-52 100 1 16 48 1 3 1 77 4 8 2
-52 99 1 17 48 1 5 3 77 4 9 3
-52 98 1 18 48 1 5 5 77 4 9 3
-52 97 1 19 48 1 4 2 77 8 19 2
-52 96 1 20 48 1 4 4 77 8 19 2
-52 95 1 16 48 2 4 2 77 8 20 3
-52 94 1 17 48 2 4 4 77 8 20 3
-52 93 1 18 48 2 3 1 77 12 32 2
-52 92 1 19 48 2 3 3 77 12 32 2
-52 91 1 20 48 2 5 5 77 12 33 3
-52 90 1 16 48 3 2 2 77 12 31 1
-52 89 1 17 48 3 4 2 77 16 41 2
-52 88 1 18 48 3 4 4 77 16 41 2
-52 87 1 19 48 3 4 5 77 16 41 2
-52 86 1 20 48 3 5 3 95 4 8 1
-52 85 1 16 48 4 4 2 95 4 9 2
-52 84 1 17 48 4 4 5 95 4 9 2
-52 83 1 18 48 4 3 2 95 8 15 1
-52 82 1 19 48 4 5 3 95 8 17 3
-52 81 1 20 48 4 5 5 95 8 17 3
-52 80 1 16 48 9 4 2 95 8 16 2
-52 79 1 17 48 9 4 5 95 8 16 2
-52 78 1 18 48 9 5 2 95 12 23 1
-52 77 1 19 48 9 5 4 95 12 23 1
-52 76 1 20 48 9 3 3 95 11 22 2
-52 75 1 16 48 10 5 2 95 16 29 1
-52 74 1 17 48 10 5 4 95 16 29 1
-52 73 1 18 48 10 4 1 95 20 34 1
-52 72 1 19 48 10 4 3 95 20 34 1
-52 71 1 20 48 10 4 5 95 20 34 1
-52 70 1 16 48 11 5 2 95 20 35 2
-52 69 1 17 48 11 3 2 95 19 33 2
-52 68 1 18 48 11 5 5 95 20 35 2
-52 67 1 19 48 11 4 2 95 23 37 1
-52 66 1 20 48 11 4 5 95 23 37 1
-52 65 1 16 48 12 3 1 95 27 40 1
-52 64 1 17 48 12 3 3 95 27 40 1
-52 63 1 18 48 12 3 5 95 27 40 1
-52 62 1 19 48 12 4 5 95 27 41 2
-52 39 1 19 53 6 3 5 105 25 39 2
-52 38 1 14 53 6 3 4 105 25 39 2
-52 37 1 9 53 6 3 3 105 25 39 2
-52 36 1 4 53 6 4 1 105 25 38 1
-52 35 1 24 53 7 4 4 105 21 36 1
-52 34 1 19 53 7 4 2 105 21 36 1
-52 33 1 14 53 7 5 4 105 17 30 1
-52 32 1 9 53 7 3 3 105 18 32 1
-52 31 1 4 53 7 5 1 105 17 30 1
-52 30 1 24 53 8 4 4 105 17 31 2
-52 29 1 19 53 8 4 2 105 17 31 2
-52 28 1 14 53 8 4 1 105 17 31 2
-52 27 1 9 53 8 5 3 105 13 24 1
-52 26 1 4 53 8 5 1 105 13 24 1
-52 25 1 24 53 9 3 5 105 10 19 1
-52 24 1 19 53 9 5 3 105 9 18 1
-52 23 1 14 53 9 5 1 105 9 18 1
-52 22 1 9 53 9 4 4 105 5 10 1
-52 21 1 4 53 9 4 2 105 5 10 1
-52 20 1 24 53 14 3 5 105 5 12 3
-52 19 1 19 53 14 5 3 105 5 11 2
-52 18 1 14 53 14 5 1 105 5 11 2
-52 17 1 9 53 14 4 4 105 1 1 1
-52 16 1 4 53 14 4 2 105 1 1 1
-52 15 1 24 53 15 5 4 105 1 2 2
-52 14 1 19 53 15 4 5 87 13 34 1
-52 13 1 14 53 15 4 3 87 13 34 1
-52 12 1 9 53 15 4 1 87 13 34 1
-52 11 1 4 53 15 2 4 87 9 21 1
-52 10 1 24 53 16 3 5 87 9 23 3
-52 9 1 19 53 16 3 3 87 9 23 3
-52 8 1 14 53 16 5 2 87 9 22 2
-52 7 1 9 53 16 4 5 87 5 10 1
-52 6 1 4 53 16 4 2 87 5 10 1
-52 5 1 24 53 17 4 4 87 5 11 2
-52 4 1 19 53 17 4 2 87 5 11 2
-52 3 1 14 53 17 3 5 87 1 2 2
-52 2 1 9 53 17 5 3 87 1 1 1
-52 1 1 4 53 17 5 1 87 1 1 1
-51 100 1 21 48 1 5 1 77 4 9 3
-51 99 1 22 48 1 5 2 77 4 9 3
-51 98 1 23 48 1 5 4 77 4 9 3
-51 97 1 24 48 1 4 1 77 8 19 2
-51 96 1 25 48 1 4 3 77 8 19 2
-51 95 1 21 48 2 4 1 77 8 20 3
-51 94 1 22 48 2 5 1 77 12 33 3
-51 93 1 23 48 2 5 2 77 12 33 3
-51 92 1 24 48 2 5 3 77 12 33 3
-51 91 1 25 48 2 5 4 77 12 33 3
-51 90 1 21 48 3 2 1 77 12 31 1
-51 89 1 22 48 3 4 1 77 16 41 2
-51 88 1 23 48 3 4 3 77 16 41 2
-51 87 1 24 48 3 5 1 95 4 8 1
-51 86 1 25 48 3 5 2 95 4 8 1
-51 85 1 21 48 4 4 1 95 4 9 2
-51 84 1 22 48 4 4 4 95 4 9 2
-51 83 1 23 48 4 5 1 95 8 17 3
-51 82 1 24 48 4 5 2 95 8 17 3
-51 81 1 25 48 4 5 4 95 8 17 3
-51 80 1 21 48 9 4 1 95 8 16 2
-51 79 1 22 48 9 4 4 95 8 16 2
-51 78 1 23 48 9 5 1 95 12 23 1
-51 77 1 24 48 9 5 3 95 12 23 1
-51 76 1 25 48 9 5 5 95 12 23 1
-51 75 1 21 48 10 5 1 95 16 29 1
-51 74 1 22 48 10 5 3 95 16 29 1
-51 73 1 23 48 10 5 5 95 16 29 1
-51 72 1 24 48 10 4 2 95 20 34 1
-51 71 1 25 48 10 4 4 95 20 34 1
-51 70 1 21 48 11 5 1 95 20 35 2
-51 69 1 22 48 11 5 3 95 20 35 2
-51 68 1 23 48 11 5 4 95 20 35 2
-51 67 1 24 48 11 4 1 95 23 37 1
-51 66 1 25 48 11 4 4 95 23 37 1
-51 65 1 21 48 12 4 1 95 27 41 2
-51 64 1 22 48 12 4 2 95 27 41 2
-51 63 1 23 48 12 4 3 95 27 41 2
-51 62 1 24 48 12 4 4 95 27 41 2
-51 39 1 20 53 6 4 5 105 25 38 1
-51 38 1 15 53 6 4 4 105 25 38 1
-51 37 1 10 53 6 4 3 105 25 38 1
-51 36 1 5 53 6 4 2 105 25 38 1
-51 35 1 25 53 7 4 5 105 21 36 1
-51 34 1 20 53 7 4 3 105 21 36 1
-51 33 1 15 53 7 5 5 105 17 30 1
-51 32 1 10 53 7 5 3 105 17 30 1
-51 31 1 5 53 7 5 2 105 17 30 1
-51 30 1 25 53 8 4 5 105 17 31 2
-51 29 1 20 53 8 4 3 105 17 31 2
-51 28 1 15 53 8 5 5 105 13 24 1
-51 27 1 10 53 8 5 4 105 13 24 1
-51 26 1 5 53 8 5 2 105 13 24 1
-51 25 1 25 53 9 5 5 105 9 18 1
-51 24 1 20 53 9 5 4 105 9 18 1
-51 23 1 15 53 9 5 2 105 9 18 1
-51 22 1 10 53 9 4 5 105 5 10 1
-51 21 1 5 53 9 4 3 105 5 10 1
-51 20 1 25 53 14 5 5 105 5 11 2
-51 19 1 20 53 14 5 4 105 5 11 2
-51 18 1 15 53 14 5 2 105 5 11 2
-51 17 1 10 53 14 4 5 105 1 1 1
-51 16 1 5 53 14 4 3 105 1 1 1
-51 15 1 25 53 15 5 5 105 1 2 2
-51 14 1 20 53 15 5 1 105 1 2 2
-51 13 1 15 53 15 4 4 87 13 34 1
-51 12 1 10 53 15 4 2 87 13 34 1
-51 11 1 5 53 15 2 5 87 9 21 1
-51 10 1 25 53 16 5 5 87 9 22 2
-51 9 1 20 53 16 5 4 87 9 22 2
-51 8 1 15 53 16 5 3 87 9 22 2
-51 7 1 10 53 16 5 1 87 9 22 2
-51 6 1 5 53 16 4 3 87 5 10 1
-51 5 1 25 53 17 4 5 87 5 11 2
-51 4 1 20 53 17 4 3 87 5 11 2
-51 3 1 15 53 17 5 5 87 1 1 1
-51 2 1 10 53 17 5 4 87 1 1 1
-51 1 1 5 53 17 5 2 87 1 1 1
-50 100 1 5 49 1 5 2 78 1 1 1
-50 99 1 10 49 1 5 4 78 1 1 1
-50 98 1 15 49 1 5 5 78 1 1 1
-50 97 1 20 49 1 4 3 78 5 10 1
-50 96 1 25 49 1 4 5 78 5 10 1
-50 95 1 5 49 2 4 3 78 5 11 2
-50 94 1 10 49 2 5 1 78 9 21 1
-50 93 1 15 49 2 5 3 78 9 21 1
-50 92 1 20 49 2 5 4 78 9 21 1
-50 91 1 25 49 2 5 5 78 9 21 1
-50 90 1 5 49 3 2 5 78 9 22 2
-50 89 1 10 49 3 4 2 78 13 34 1
-50 88 1 15 49 3 4 4 78 13 34 1
-50 87 1 20 49 3 5 1 96 1 1 1
-50 86 1 25 49 3 5 5 96 1 1 1
-50 85 1 5 49 4 4 3 96 1 2 2
-50 84 1 10 49 4 4 5 96 1 2 2
-50 83 1 15 49 4 5 2 96 5 10 1
-50 82 1 20 49 4 5 4 96 5 10 1
-50 81 1 25 49 4 5 5 96 5 10 1
-50 80 1 5 49 9 4 3 96 5 11 2
-50 79 1 10 49 9 4 5 96 5 11 2
-50 78 1 15 49 9 5 2 96 9 18 1
-50 77 1 20 49 9 5 4 96 9 18 1
-50 76 1 25 49 9 5 5 96 9 18 1
-50 75 1 5 49 10 5 2 96 13 24 1
-50 74 1 10 49 10 5 4 96 13 24 1
-50 73 1 15 49 10 5 5 96 13 24 1
-50 72 1 20 49 10 4 3 96 17 30 1
-50 71 1 25 49 10 4 5 96 17 30 1
-50 70 1 5 49 11 5 2 96 17 31 2
-50 69 1 10 49 11 5 3 96 17 31 2
-50 68 1 15 49 11 5 5 96 17 31 2
-50 67 1 20 49 11 4 3 96 21 36 1
-50 66 1 25 49 11 4 5 96 21 36 1
-50 65 1 5 49 12 4 2 96 25 38 1
-50 64 1 10 49 12 4 3 96 25 38 1
-50 63 1 15 49 12 4 4 96 25 38 1
-50 62 1 20 49 12 4 5 96 25 38 1
-50 39 1 24 53 23 4 4 104 27 41 2
-50 38 1 23 53 23 4 3 104 27 41 2
-50 37 1 22 53 23 4 2 104 27 41 2
-50 36 1 21 53 23 4 1 104 27 41 2
-50 35 1 25 53 24 4 4 104 23 37 1
-50 34 1 24 53 24 4 1 104 23 37 1
-50 33 1 23 53 24 5 4 104 20 34 1
-50 32 1 22 53 24 5 3 104 20 34 1
-50 31 1 21 53 24 5 1 104 20 34 1
-50 30 1 25 53 25 4 4 104 20 35 2
-50 29 1 24 53 25 4 2 104 20 35 2
-50 28 1 23 53 25 5 5 104 16 29 1
-50 27 1 22 53 25 5 3 104 16 29 1
-50 26 1 21 53 25 5 1 104 16 29 1
-50 25 1 25 53 26 5 5 104 12 23 1
-50 24 1 24 53 26 5 3 104 12 23 1
-50 23 1 23 53 26 5 1 104 12 23 1
-50 22 1 22 53 26 4 4 104 8 15 1
-50 21 1 21 53 26 4 1 104 8 15 1
-50 20 1 25 53 31 5 4 104 8 17 3
-50 19 1 24 53 31 5 2 104 8 17 3
-50 18 1 23 53 31 5 1 104 8 17 3
-50 17 1 22 53 31 4 4 104 4 9 2
-50 16 1 21 53 31 4 1 104 4 9 2
-50 15 1 25 53 32 5 2 104 4 8 1
-50 14 1 24 53 32 5 1 104 4 8 1
-50 13 1 23 53 32 4 3 86 16 41 2
-50 12 1 22 53 32 4 1 86 16 41 2
-50 11 1 21 53 32 2 1 86 12 31 1
-50 10 1 25 53 33 5 4 86 12 33 3
-50 9 1 24 53 33 5 3 86 12 33 3
-50 8 1 23 53 33 5 2 86 12 33 3
-50 7 1 22 53 33 5 1 86 12 33 3
-50 6 1 21 53 33 4 1 86 8 19 2
-50 5 1 25 53 34 4 3 86 8 20 3
-50 4 1 24 53 34 4 1 86 8 20 3
-50 3 1 23 53 34 5 4 86 4 9 3
-50 2 1 22 53 34 5 2 86 4 9 3
-50 1 1 21 53 34 5 1 86 4 9 3
-49 100 1 4 49 1 5 1 78 1 1 1
-49 99 1 9 49 1 5 3 78 1 1 1
-49 98 1 14 49 1 3 5 78 1 2 2
-49 97 1 19 49 1 4 2 78 5 10 1
-49 96 1 24 49 1 4 4 78 5 10 1
-49 95 1 4 49 2 4 2 78 5 11 2
-49 94 1 9 49 2 4 5 78 5 11 2
-49 93 1 14 49 2 5 2 78 9 21 1
-49 92 1 19 49 2 3 3 78 9 23 3
-49 91 1 24 49 2 3 5 78 9 23 3
-49 90 1 4 49 3 2 4 78 9 22 2
-49 89 1 9 49 3 4 1 78 13 34 1
-49 88 1 14 49 3 4 3 78 13 34 1
-49 87 1 19 49 3 4 5 78 13 34 1
-49 86 1 24 49 3 5 4 96 1 1 1
-49 85 1 4 49 4 4 2 96 1 2 2
-49 84 1 9 49 4 4 4 96 1 2 2
-49 83 1 14 49 4 5 1 96 5 10 1
-49 82 1 19 49 4 5 3 96 5 10 1
-49 81 1 24 49 4 3 5 96 5 12 3
-49 80 1 4 49 9 4 2 96 5 11 2
-49 79 1 9 49 9 4 4 96 5 11 2
-49 78 1 14 49 9 5 1 96 9 18 1
-49 77 1 19 49 9 5 3 96 9 18 1
-49 76 1 24 49 9 3 5 96 10 19 1
-49 75 1 4 49 10 5 1 96 13 24 1
-49 74 1 9 49 10 5 3 96 13 24 1
-49 73 1 14 49 10 4 1 96 17 30 1
-49 72 1 19 49 10 4 2 96 17 30 1
-49 71 1 24 49 10 4 4 96 17 30 1
-49 70 1 4 49 11 5 1 96 17 31 2
-49 69 1 9 49 11 3 3 96 18 32 1
-49 68 1 14 49 11 5 4 96 17 31 2
-49 67 1 19 49 11 4 2 96 21 36 1
-49 66 1 24 49 11 4 4 96 21 36 1
-49 65 1 4 49 12 4 1 96 25 38 1
-49 64 1 9 49 12 3 3 96 25 39 2
-49 63 1 14 49 12 3 4 96 25 39 2
-49 62 1 19 49 12 3 5 96 25 39 2
-49 39 1 19 53 23 4 5 104 27 41 2
-49 38 1 18 53 23 3 5 104 27 40 1
-49 37 1 17 53 23 3 3 104 27 40 1
-49 36 1 16 53 23 3 1 104 27 40 1
-49 35 1 20 53 24 4 5 104 23 37 1
-49 34 1 19 53 24 4 2 104 23 37 1
-49 33 1 18 53 24 5 5 104 20 34 1
-49 32 1 17 53 24 3 2 104 19 33 2
-49 31 1 16 53 24 5 2 104 20 34 1
-49 30 1 20 53 25 4 5 104 20 35 2
-49 29 1 19 53 25 4 3 104 20 35 2
-49 28 1 18 53 25 4 1 104 20 35 2
-49 27 1 17 53 25 5 4 104 16 29 1
-49 26 1 16 53 25 5 2 104 16 29 1
-49 25 1 20 53 26 3 3 104 11 22 2
-49 24 1 19 53 26 5 4 104 12 23 1
-49 23 1 18 53 26 5 2 104 12 23 1
-49 22 1 17 53 26 4 5 104 8 15 1
-49 21 1 16 53 26 4 2 104 8 15 1
-49 20 1 20 53 31 5 5 104 8 17 3
-49 19 1 19 53 31 5 3 104 8 17 3
-49 18 1 18 53 31 3 2 104 8 16 2
-49 17 1 17 53 31 4 5 104 4 9 2
-49 16 1 16 53 31 4 2 104 4 9 2
-49 15 1 20 53 32 5 3 104 4 8 1
-49 14 1 19 53 32 4 5 86 16 41 2
-49 13 1 18 53 32 4 4 86 16 41 2
-49 12 1 17 53 32 4 2 86 16 41 2
-49 11 1 16 53 32 2 2 86 12 31 1
-49 10 1 20 53 33 5 5 86 12 33 3
-49 9 1 19 53 33 3 3 86 12 32 2
-49 8 1 18 53 33 3 1 86 12 32 2
-49 7 1 17 53 33 4 4 86 8 19 2
-49 6 1 16 53 33 4 2 86 8 19 2
-49 5 1 20 53 34 4 4 86 8 20 3
-49 4 1 19 53 34 4 2 86 8 20 3
-49 3 1 18 53 34 5 5 86 4 9 3
-49 2 1 17 53 34 5 3 86 4 9 3
-49 1 1 16 53 34 3 1 86 4 8 2
-48 100 1 3 49 1 3 2 78 1 2 2
-48 99 1 8 49 1 3 3 78 1 2 2
-48 98 1 13 49 1 3 4 78 1 2 2
-48 97 1 18 49 1 4 1 78 5 10 1
-48 96 1 23 49 1 2 5 78 5 12 3
-48 95 1 3 49 2 4 1 78 5 11 2
-48 94 1 8 49 2 4 4 78 5 11 2
-48 93 1 13 49 2 3 1 78 9 23 3
-48 92 1 18 49 2 3 2 78 9 23 3
-48 91 1 23 49 2 3 4 78 9 23 3
-48 90 1 3 49 3 2 3 78 9 22 2
-48 89 1 8 49 3 3 2 78 13 35 2
-48 88 1 13 49 3 3 4 78 13 35 2
-48 87 1 18 49 3 3 5 78 13 35 2
-48 86 1 23 49 3 5 3 96 1 1 1
-48 85 1 3 49 4 4 1 96 1 2 2
-48 84 1 8 49 4 3 1 96 5 12 3
-48 83 1 13 49 4 3 2 96 5 12 3
-48 82 1 18 49 4 3 3 96 5 12 3
-48 81 1 23 49 4 3 4 96 5 12 3
-48 80 1 3 49 9 4 1 96 5 11 2
-48 79 1 8 49 9 2 5 96 6 13 1
-48 78 1 13 49 9 3 2 96 10 19 1
-48 77 1 18 49 9 3 3 96 10 19 1
-48 76 1 23 49 9 3 4 96 10 19 1
-48 75 1 3 49 10 3 2 96 14 25 1
-48 74 1 8 49 10 3 4 96 14 25 1
-48 73 1 13 49 10 3 5 96 14 25 1
-48 72 1 18 49 10 2 2 96 18 33 2
-48 71 1 23 49 10 2 5 96 18 33 2
-48 70 1 3 49 11 3 1 96 18 32 1
-48 69 1 8 49 11 3 2 96 18 32 1
-48 68 1 13 49 11 3 5 96 18 32 1
-48 67 1 18 49 11 4 1 96 21 36 1
-48 66 1 23 49 11 2 5 96 23 37 1
-48 65 1 3 49 12 3 1 96 25 39 2
-48 64 1 8 49 12 3 2 96 25 39 2
-48 63 1 13 49 12 2 4 96 27 40 1
-48 62 1 18 49 12 2 5 96 27 40 1
-48 39 1 14 53 23 2 4 104 25 39 2
-48 38 1 13 53 23 2 2 104 25 39 2
-48 37 1 12 53 23 3 4 104 27 40 1
-48 36 1 11 53 23 3 2 104 27 40 1
-48 35 1 15 53 24 2 3 104 21 36 1
-48 34 1 14 53 24 4 3 104 23 37 1
-48 33 1 13 53 24 3 4 104 19 33 2
-48 32 1 12 53 24 3 3 104 19 33 2
-48 31 1 11 53 24 3 1 104 19 33 2
-48 30 1 15 53 25 2 3 104 19 32 1
-48 29 1 14 53 25 2 1 104 19 32 1
-48 28 1 13 53 25 3 5 104 15 28 1
-48 27 1 12 53 25 3 3 104 15 28 1
-48 26 1 11 53 25 3 1 104 15 28 1
-48 25 1 15 53 26 3 4 104 11 22 2
-48 24 1 14 53 26 3 2 104 11 22 2
-48 23 1 13 53 26 3 1 104 11 22 2
-48 22 1 12 53 26 2 3 104 7 13 1
-48 21 1 11 53 26 4 3 104 8 15 1
-48 20 1 15 53 31 3 5 104 8 16 2
-48 19 1 14 53 31 3 4 104 8 16 2
-48 18 1 13 53 31 3 3 104 8 16 2
-48 17 1 12 53 31 3 1 104 8 16 2
-48 16 1 11 53 31 4 3 104 4 9 2
-48 15 1 15 53 32 5 4 104 4 8 1
-48 14 1 14 53 32 3 5 86 16 40 1
-48 13 1 13 53 32 3 3 86 16 40 1
-48 12 1 12 53 32 3 1 86 16 40 1
-48 11 1 11 53 32 2 3 86 12 31 1
-48 10 1 15 53 33 3 5 86 12 32 2
-48 9 1 14 53 33 3 4 86 12 32 2
-48 8 1 13 53 33 3 2 86 12 32 2
-48 7 1 12 53 33 4 5 86 8 19 2
-48 6 1 11 53 33 4 3 86 8 19 2
-48 5 1 15 53 34 4 5 86 8 20 3
-48 4 1 14 53 34 2 1 86 8 18 1
-48 3 1 13 53 34 3 4 86 4 8 2
-48 2 1 12 53 34 3 3 86 4 8 2
-48 1 1 11 53 34 3 2 86 4 8 2
-47 100 1 2 49 1 3 1 78 1 2 2
-47 99 1 7 49 1 1 3 78 1 3 3
-47 98 1 12 49 1 1 5 78 1 3 3
-47 97 1 17 49 1 2 2 78 5 12 3
-47 96 1 22 49 1 2 4 78 5 12 3
-47 95 1 2 49 2 1 2 78 6 13 1
-47 94 1 7 49 2 1 4 78 6 13 1
-47 93 1 12 49 2 2 1 78 10 24 1
-47 92 1 17 49 2 2 3 78 10 24 1
-47 91 1 22 49 2 2 5 78 10 24 1
-47 90 1 2 49 3 2 2 78 9 22 2
-47 89 1 7 49 3 3 1 78 13 35 2
-47 88 1 12 49 3 3 3 78 13 35 2
-47 87 1 17 49 3 1 4 78 14 36 1
-47 86 1 22 49 3 5 2 96 1 1 1
-47 85 1 2 49 4 1 2 96 2 3 1
-47 84 1 7 49 4 1 4 96 2 3 1
-47 83 1 12 49 4 2 1 96 6 14 2
-47 82 1 17 49 4 2 3 96 6 14 2
-47 81 1 22 49 4 2 5 96 6 14 2
-47 80 1 2 49 9 2 2 96 6 13 1
-47 79 1 7 49 9 2 4 96 6 13 1
-47 78 1 12 49 9 3 1 96 10 19 1
-47 77 1 17 49 9 1 3 96 10 20 2
-47 76 1 22 49 9 1 5 96 10 20 2
-47 75 1 2 49 10 3 1 96 14 25 1
-47 74 1 7 49 10 3 3 96 14 25 1
-47 73 1 12 49 10 1 4 96 15 26 1
-47 72 1 17 49 10 2 1 96 18 33 2
-47 71 1 22 49 10 2 4 96 18 33 2
-47 70 1 2 49 11 1 2 96 19 34 1
-47 69 1 7 49 11 1 4 96 19 34 1
-47 68 1 12 49 11 3 4 96 18 32 1
-47 67 1 17 49 11 2 2 96 23 37 1
-47 66 1 22 49 11 2 4 96 23 37 1
-47 65 1 2 49 12 2 1 96 27 40 1
-47 64 1 7 49 12 2 2 96 27 40 1
-47 63 1 12 49 12 2 3 96 27 40 1
-47 62 1 17 49 12 1 5 96 27 41 2
-47 39 1 9 53 23 2 5 104 25 39 2
-47 38 1 8 53 23 2 3 104 25 39 2
-47 37 1 7 53 23 2 1 104 25 39 2
-47 36 1 6 53 23 1 1 104 25 38 1
-47 35 1 10 53 24 2 4 104 21 36 1
-47 34 1 9 53 24 2 1 104 21 36 1
-47 33 1 8 53 24 3 5 104 19 33 2
-47 32 1 7 53 24 1 3 104 18 31 1
-47 31 1 6 53 24 1 1 104 18 31 1
-47 30 1 10 53 25 2 4 104 19 32 1
-47 29 1 9 53 25 2 2 104 19 32 1
-47 28 1 8 53 25 1 3 104 14 27 2
-47 27 1 7 53 25 3 4 104 15 28 1
-47 26 1 6 53 25 3 2 104 15 28 1
-47 25 1 10 53 26 3 5 104 11 22 2
-47 24 1 9 53 26 1 3 104 11 21 1
-47 23 1 8 53 26 1 1 104 11 21 1
-47 22 1 7 53 26 2 4 104 7 13 1
-47 21 1 6 53 26 2 1 104 7 13 1
-47 20 1 10 53 31 2 4 104 7 14 2
-47 19 1 9 53 31 2 2 104 7 14 2
-47 18 1 8 53 31 2 1 104 7 14 2
-47 17 1 7 53 31 1 3 104 3 7 2
-47 16 1 6 53 31 1 1 104 3 7 2
-47 15 1 10 53 32 5 5 104 4 8 1
-47 14 1 9 53 32 1 3 86 15 39 2
-47 13 1 8 53 32 3 4 86 16 40 1
-47 12 1 7 53 32 3 2 86 16 40 1
-47 11 1 6 53 32 2 4 86 12 31 1
-47 10 1 10 53 33 2 4 86 11 30 4
-47 9 1 9 53 33 2 2 86 11 30 4
-47 8 1 8 53 33 2 1 86 11 30 4
-47 7 1 7 53 33 1 3 86 7 17 3
-47 6 1 6 53 33 1 1 86 7 17 3
-47 5 1 10 53 34 2 4 86 8 18 1
-47 4 1 9 53 34 2 2 86 8 18 1
-47 3 1 8 53 34 3 5 86 4 8 2
-47 2 1 7 53 34 1 3 86 4 7 1
-47 1 1 6 53 34 1 1 86 4 7 1
-46 100 1 1 49 1 1 1 78 1 3 3
-46 99 1 6 49 1 1 2 78 1 3 3
-46 98 1 11 49 1 1 4 78 1 3 3
-46 97 1 16 49 1 2 1 78 5 12 3
-46 96 1 21 49 1 2 3 78 5 12 3
-46 95 1 1 49 2 1 1 78 6 13 1
-46 94 1 6 49 2 1 3 78 6 13 1
-46 93 1 11 49 2 1 5 78 6 13 1
-46 92 1 16 49 2 2 2 78 10 24 1
-46 91 1 21 49 2 2 4 78 10 24 1
-46 90 1 1 49 3 2 1 78 9 22 2
-46 89 1 6 49 3 1 1 78 14 36 1
-46 88 1 11 49 3 1 2 78 14 36 1
-46 87 1 16 49 3 1 3 78 14 36 1
-46 86 1 21 49 3 1 5 78 14 36 1
-46 85 1 1 49 4 1 1 96 2 3 1
-46 84 1 6 49 4 1 3 96 2 3 1
-46 83 1 11 49 4 1 5 96 2 3 1
-46 82 1 16 49 4 2 2 96 6 14 2
-46 81 1 21 49 4 2 4 96 6 14 2
-46 80 1 1 49 9 2 1 96 6 13 1
-46 79 1 6 49 9 2 3 96 6 13 1
-46 78 1 11 49 9 1 1 96 10 20 2
-46 77 1 16 49 9 1 2 96 10 20 2
-46 76 1 21 49 9 1 4 96 10 20 2
-46 75 1 1 49 10 1 1 96 15 26 1
-46 74 1 6 49 10 1 2 96 15 26 1
-46 73 1 11 49 10 1 3 96 15 26 1
-46 72 1 16 49 10 1 5 96 15 26 1
-46 71 1 21 49 10 2 3 96 18 33 2
-46 70 1 1 49 11 1 1 96 19 34 1
-46 69 1 6 49 11 1 3 96 19 34 1
-46 68 1 11 49 11 1 5 96 19 34 1
-46 67 1 16 49 11 2 1 96 23 37 1
-46 66 1 21 49 11 2 3 96 23 37 1
-46 65 1 1 49 12 1 1 96 27 41 2
-46 64 1 6 49 12 1 2 96 27 41 2
-46 63 1 11 49 12 1 3 96 27 41 2
-46 62 1 16 49 12 1 4 96 27 41 2
-46 39 1 4 53 23 1 5 104 25 38 1
-46 38 1 3 53 23 1 4 104 25 38 1
-46 37 1 2 53 23 1 3 104 25 38 1
-46 36 1 1 53 23 1 2 104 25 38 1
-46 35 1 5 53 24 2 5 104 21 36 1
-46 34 1 4 53 24 2 2 104 21 36 1
-46 33 1 3 53 24 1 5 104 18 31 1
-46 32 1 2 53 24 1 4 104 18 31 1
-46 31 1 1 53 24 1 2 104 18 31 1
-46 30 1 5 53 25 2 5 104 19 32 1
-46 29 1 4 53 25 1 5 104 14 27 2
-46 28 1 3 53 25 1 4 104 14 27 2
-46 27 1 2 53 25 1 2 104 14 27 2
-46 26 1 1 53 25 1 1 104 14 27 2
-46 25 1 5 53 26 1 5 104 11 21 1
-46 24 1 4 53 26 1 4 104 11 21 1
-46 23 1 3 53 26 1 2 104 11 21 1
-46 22 1 2 53 26 2 5 104 7 13 1
-46 21 1 1 53 26 2 2 104 7 13 1
-46 20 1 5 53 31 2 5 104 7 14 2
-46 19 1 4 53 31 2 3 104 7 14 2
-46 18 1 3 53 31 1 5 104 3 7 2
-46 17 1 2 53 31 1 4 104 3 7 2
-46 16 1 1 53 31 1 2 104 3 7 2
-46 15 1 5 53 32 1 5 86 15 39 2
-46 14 1 4 53 32 1 4 86 15 39 2
-46 13 1 3 53 32 1 2 86 15 39 2
-46 12 1 2 53 32 1 1 86 15 39 2
-46 11 1 1 53 32 2 5 86 12 31 1
-46 10 1 5 53 33 2 5 86 11 30 4
-46 9 1 4 53 33 2 3 86 11 30 4
-46 8 1 3 53 33 1 5 86 7 17 3
-46 7 1 2 53 33 1 4 86 7 17 3
-46 6 1 1 53 33 1 2 86 7 17 3
-46 5 1 5 53 34 2 5 86 8 18 1
-46 4 1 4 53 34 2 3 86 8 18 1
-46 3 1 3 53 34 1 5 86 4 7 1
-46 2 1 2 53 34 1 4 86 4 7 1
-46 1 1 1 53 34 1 2 86 4 7 1
-45 100 1 5 49 5 5 2 78 2 4 1
-45 99 1 10 49 5 5 4 78 2 4 1
-45 98 1 15 49 5 5 5 78 2 4 1
-45 97 1 20 49 5 4 2 78 6 14 2
-45 96 1 25 49 5 4 5 78 6 14 2
-45 95 1 5 49 6 4 3 78 6 15 3
-45 94 1 10 49 6 4 5 78 6 15 3
-45 93 1 15 49 6 5 2 78 10 25 2
-45 92 1 20 49 6 5 4 78 10 25 2
-45 91 1 25 49 6 5 5 78 10 25 2
-45 90 1 5 49 7 4 3 78 10 26 3
-45 89 1 10 49 7 4 5 78 10 26 3
-45 88 1 15 49 7 5 2 78 14 37 2
-45 87 1 20 49 7 5 4 78 14 37 2
-45 86 1 25 49 7 5 5 78 14 37 2
-45 85 1 5 49 8 5 2 96 2 4 2
-45 84 1 10 49 8 5 4 96 2 4 2
-45 83 1 15 49 8 5 5 96 2 4 2
-45 82 1 20 49 8 4 1 96 7 15 1
-45 81 1 25 49 8 4 5 96 7 15 1
-45 80 1 5 49 13 4 3 96 7 16 2
-45 79 1 10 49 13 4 5 96 7 16 2
-45 78 1 15 49 13 5 2 96 11 21 1
-45 77 1 20 49 13 5 4 96 11 21 1
-45 76 1 25 49 13 5 5 96 11 21 1
-45 75 1 5 49 14 5 1 96 15 27 2
-45 74 1 10 49 14 5 2 96 15 27 2
-45 73 1 15 49 14 5 3 96 15 27 2
-45 72 1 20 49 14 5 4 96 15 27 2
-45 71 1 25 49 14 5 5 96 15 27 2
-45 70 1 5 49 15 5 2 96 20 35 1
-45 69 1 10 49 15 5 4 96 20 35 1
-45 68 1 15 49 15 5 5 96 20 35 1
-45 67 1 20 49 15 4 3 97 21 33 1
-45 66 1 25 49 15 4 5 97 21 33 1
-45 65 1 5 49 16 4 3 97 21 34 2
-45 64 1 10 49 16 5 1 97 25 38 1
-45 63 1 15 49 16 5 2 97 25 38 1
-45 62 1 20 49 16 5 3 97 25 38 1
-45 61 1 25 49 16 5 5 97 25 38 1
-45 40 1 25 52 32 5 4 103 27 40 1
-45 39 1 24 52 32 5 3 103 27 40 1
-45 38 1 23 52 32 5 2 103 27 40 1
-45 37 1 22 52 32 5 1 103 27 40 1
-45 36 1 21 52 32 4 1 103 23 35 2
-45 35 1 25 52 33 4 4 103 23 36 3
-45 34 1 24 52 33 4 2 103 23 36 3
-45 33 1 23 52 33 5 5 104 17 30 1
-45 32 1 22 52 33 5 3 104 17 30 1
-45 31 1 21 52 33 5 1 104 17 30 1
-45 30 1 25 53 21 5 5 104 14 26 1
-45 29 1 24 53 21 5 4 104 14 26 1
-45 28 1 23 53 21 5 3 104 14 26 1
-45 27 1 22 53 21 5 2 104 14 26 1
-45 26 1 21 53 21 5 1 104 14 26 1
-45 25 1 25 53 22 5 5 104 10 20 1
-45 24 1 24 53 22 5 3 104 10 20 1
-45 23 1 23 53 22 5 1 104 10 20 1
-45 22 1 22 53 22 4 4 104 6 12 2
-45 21 1 21 53 22 4 1 104 6 12 2
-45 20 1 25 53 27 4 2 104 6 11 1
-45 19 1 24 53 27 4 1 104 6 11 1
-45 18 1 23 53 27 5 5 104 3 6 1
-45 17 1 22 53 27 5 3 104 3 6 1
-45 16 1 21 53 27 5 1 104 3 6 1
-45 15 1 25 53 28 5 5 86 15 38 1
-45 14 1 24 53 28 5 3 86 15 38 1
-45 13 1 23 53 28 5 1 86 15 38 1
-45 12 1 22 53 28 4 4 86 11 27 1
-45 11 1 21 53 28 4 1 86 11 27 1
-45 10 1 25 53 29 5 4 86 11 29 3
-45 9 1 24 53 29 5 2 86 11 29 3
-45 8 1 23 53 29 5 1 86 11 29 3
-45 7 1 22 53 29 4 4 86 7 15 1
-45 6 1 21 53 29 4 1 86 7 15 1
-45 5 1 25 53 30 4 3 86 7 16 2
-45 4 1 24 53 30 4 1 86 7 16 2
-45 3 1 23 53 30 5 4 86 3 6 3
-45 2 1 22 53 30 5 2 86 3 6 3
-45 1 1 21 53 30 5 1 86 3 6 3
-44 100 1 4 49 5 5 1 78 2 4 1
-44 99 1 9 49 5 5 3 78 2 4 1
-44 98 1 14 49 5 3 4 78 2 5 2
-44 97 1 19 49 5 4 1 78 6 14 2
-44 96 1 24 49 5 4 4 78 6 14 2
-44 95 1 4 49 6 4 2 78 6 15 3
-44 94 1 9 49 6 4 4 78 6 15 3
-44 93 1 14 49 6 5 1 78 10 25 2
-44 92 1 19 49 6 5 3 78 10 25 2
-44 91 1 24 49 6 3 5 78 10 27 4
-44 90 1 4 49 7 4 2 78 10 26 3
-44 89 1 9 49 7 4 4 78 10 26 3
-44 88 1 14 49 7 5 1 78 14 37 2
-44 87 1 19 49 7 5 3 78 14 37 2
-44 86 1 24 49 7 3 5 78 15 38 1
-44 85 1 4 49 8 5 1 96 2 4 2
-44 84 1 9 49 8 5 3 96 2 4 2
-44 83 1 14 49 8 3 4 96 3 5 1
-44 82 1 19 49 8 3 5 96 3 5 1
-44 81 1 24 49 8 4 4 96 7 15 1
-44 80 1 4 49 13 4 2 96 7 16 2
-44 79 1 9 49 13 4 4 96 7 16 2
-44 78 1 14 49 13 5 1 96 11 21 1
-44 77 1 19 49 13 5 3 96 11 21 1
-44 76 1 24 49 13 3 5 96 12 22 1
-44 75 1 4 49 14 4 1 96 16 28 1
-44 74 1 9 49 14 4 2 96 16 28 1
-44 73 1 14 49 14 4 3 96 16 28 1
-44 72 1 19 49 14 4 4 96 16 28 1
-44 71 1 24 49 14 4 5 96 16 28 1
-44 70 1 4 49 15 5 1 96 20 35 1
-44 69 1 9 49 15 5 3 96 20 35 1
-44 68 1 14 49 15 4 1 97 21 33 1
-44 67 1 19 49 15 4 2 97 21 33 1
-44 66 1 24 49 15 4 4 97 21 33 1
-44 65 1 4 49 16 4 2 97 21 34 2
-44 64 1 9 49 16 4 5 97 21 34 2
-44 63 1 14 49 16 3 2 97 27 39 1
-44 62 1 19 49 16 3 4 97 27 39 1
-44 61 1 24 49 16 5 4 97 25 38 1
-44 40 1 20 52 32 5 5 103 27 40 1
-44 39 1 19 52 32 3 3 103 25 39 3
-44 38 1 18 52 32 3 1 103 25 39 3
-44 37 1 17 52 32 4 4 103 23 35 2
-44 36 1 16 52 32 4 2 103 23 35 2
-44 35 1 20 52 33 4 5 103 23 36 3
-44 34 1 19 52 33 4 3 103 23 36 3
-44 33 1 18 52 33 4 1 103 23 36 3
-44 32 1 17 52 33 5 4 104 17 30 1
-44 31 1 16 52 33 5 2 104 17 30 1
-44 30 1 20 53 21 4 5 104 13 25 2
-44 29 1 19 53 21 4 4 104 13 25 2
-44 28 1 18 53 21 4 3 104 13 25 2
-44 27 1 17 53 21 4 2 104 13 25 2
-44 26 1 16 53 21 4 1 104 13 25 2
-44 25 1 20 53 22 3 3 104 9 19 2
-44 24 1 19 53 22 5 4 104 10 20 1
-44 23 1 18 53 22 5 2 104 10 20 1
-44 22 1 17 53 22 4 5 104 6 12 2
-44 21 1 16 53 22 4 2 104 6 12 2
-44 20 1 20 53 27 4 3 104 6 11 1
-44 19 1 19 53 27 3 4 104 2 5 2
-44 18 1 18 53 27 3 2 104 2 5 2
-44 17 1 17 53 27 5 4 104 3 6 1
-44 16 1 16 53 27 5 2 104 3 6 1
-44 15 1 20 53 28 3 3 86 14 37 2
-44 14 1 19 53 28 5 4 86 15 38 1
-44 13 1 18 53 28 5 2 86 15 38 1
-44 12 1 17 53 28 4 5 86 11 27 1
-44 11 1 16 53 28 4 2 86 11 27 1
-44 10 1 20 53 29 5 5 86 11 29 3
-44 9 1 19 53 29 5 3 86 11 29 3
-44 8 1 18 53 29 3 2 86 11 28 2
-44 7 1 17 53 29 4 5 86 7 15 1
-44 6 1 16 53 29 4 2 86 7 15 1
-44 5 1 20 53 30 4 4 86 7 16 2
-44 4 1 19 53 30 4 2 86 7 16 2
-44 3 1 18 53 30 5 5 86 3 6 3
-44 2 1 17 53 30 5 3 86 3 6 3
-44 1 1 16 53 30 3 1 86 3 5 2
-43 100 1 3 49 5 3 1 78 2 5 2
-43 99 1 8 49 5 3 2 78 2 5 2
-43 98 1 13 49 5 3 3 78 2 5 2
-43 97 1 18 49 5 3 5 78 2 5 2
-43 96 1 23 49 5 4 3 78 6 14 2
-43 95 1 3 49 6 4 1 78 6 15 3
-43 94 1 8 49 6 3 1 78 10 27 4
-43 93 1 13 49 6 3 2 78 10 27 4
-43 92 1 18 49 6 3 3 78 10 27 4
-43 91 1 23 49 6 3 4 78 10 27 4
-43 90 1 3 49 7 4 1 78 10 26 3
-43 89 1 8 49 7 2 5 78 11 28 1
-43 88 1 13 49 7 3 2 78 15 38 1
-43 87 1 18 49 7 3 3 78 15 38 1
-43 86 1 23 49 7 3 4 78 15 38 1
-43 85 1 3 49 8 3 1 96 3 5 1
-43 84 1 8 49 8 3 2 96 3 5 1
-43 83 1 13 49 8 3 3 96 3 5 1
-43 82 1 18 49 8 2 5 96 3 6 2
-43 81 1 23 49 8 4 3 96 7 15 1
-43 80 1 3 49 13 4 1 96 7 16 2
-43 79 1 8 49 13 2 5 96 8 17 1
-43 78 1 13 49 13 3 2 96 12 22 1
-43 77 1 18 49 13 3 3 96 12 22 1
-43 76 1 23 49 13 3 4 96 12 22 1
-43 75 1 3 49 14 3 2 96 16 29 2
-43 74 1 8 49 14 3 3 96 16 29 2
-43 73 1 13 49 14 3 4 96 16 29 2
-43 72 1 18 49 14 3 5 96 16 29 2
-43 71 1 23 49 14 2 5 97 13 23 1
-43 70 1 3 49 15 3 2 97 17 29 1
-43 69 1 8 49 15 3 4 97 17 29 1
-43 68 1 13 49 15 3 5 97 17 29 1
-43 67 1 18 49 15 2 2 97 21 35 3
-43 66 1 23 49 15 2 5 97 21 35 3
-43 65 1 3 49 16 4 1 97 21 34 2
-43 64 1 8 49 16 4 4 97 21 34 2
-43 63 1 13 49 16 3 1 97 27 39 1
-43 62 1 18 49 16 3 3 97 27 39 1
-43 61 1 23 49 16 3 5 97 27 39 1
-43 60 1 3 50 25 5 5 98 25 38 1
-43 41 1 11 52 21 1 1 103 25 38 2
-43 40 1 15 52 32 3 5 103 25 39 3
-43 39 1 14 52 32 3 4 103 25 39 3
-43 38 1 13 52 32 3 2 103 25 39 3
-43 37 1 12 52 32 4 5 103 23 35 2
-43 36 1 11 52 32 4 3 103 23 35 2
-43 35 1 15 52 33 2 3 103 23 34 1
-43 34 1 14 52 33 2 1 103 23 34 1
-43 33 1 13 52 33 3 5 103 20 32 1
-43 32 1 12 52 33 3 3 103 20 32 1
-43 31 1 11 52 33 3 1 103 20 32 1
-43 30 1 15 53 21 2 4 103 16 28 2
-43 29 1 14 53 21 3 5 104 13 24 1
-43 28 1 13 53 21 3 4 104 13 24 1
-43 27 1 12 53 21 3 3 104 13 24 1
-43 26 1 11 53 21 3 1 104 13 24 1
-43 25 1 15 53 22 3 4 104 9 19 2
-43 24 1 14 53 22 3 2 104 9 19 2
-43 23 1 13 53 22 3 1 104 9 19 2
-43 22 1 12 53 22 2 3 104 5 10 1
-43 21 1 11 53 22 4 3 104 6 12 2
-43 20 1 15 53 27 4 4 104 6 11 1
-43 19 1 14 53 27 3 5 104 2 5 2
-43 18 1 13 53 27 3 3 104 2 5 2
-43 17 1 12 53 27 3 1 104 2 5 2
-43 16 1 11 53 27 2 1 104 2 4 1
-43 15 1 15 53 28 3 4 86 14 37 2
-43 14 1 14 53 28 3 2 86 14 37 2
-43 13 1 13 53 28 3 1 86 14 37 2
-43 12 1 12 53 28 2 3 86 10 25 2
-43 11 1 11 53 28 4 3 86 11 27 1
-43 10 1 15 53 29 3 5 86 11 28 2
-43 9 1 14 53 29 3 4 86 11 28 2
-43 8 1 13 53 29 3 3 86 11 28 2
-43 7 1 12 53 29 3 1 86 11 28 2
-43 6 1 11 53 29 4 3 86 7 15 1
-43 5 1 15 53 30 4 5 86 7 16 2
-43 4 1 14 53 30 3 5 86 3 5 2
-43 3 1 13 53 30 3 4 86 3 5 2
-43 2 1 12 53 30 3 3 86 3 5 2
-43 1 1 11 53 30 3 2 86 3 5 2
-42 100 1 2 49 5 2 1 78 2 6 3
-42 99 1 7 49 5 2 2 78 2 6 3
-42 98 1 12 49 5 2 3 78 2 6 3
-42 97 1 17 49 5 2 4 78 2 6 3
-42 96 1 22 49 5 2 5 78 2 6 3
-42 95 1 2 49 6 1 2 78 7 16 1
-42 94 1 7 49 6 1 4 78 7 16 1
-42 93 1 12 49 6 2 1 78 11 29 2
-42 92 1 17 49 6 2 3 78 11 29 2
-42 91 1 22 49 6 2 5 78 11 29 2
-42 90 1 2 49 7 2 2 78 11 28 1
-42 89 1 7 49 7 2 4 78 11 28 1
-42 88 1 12 49 7 3 1 78 15 38 1
-42 87 1 17 49 7 1 3 78 15 39 2
-42 86 1 22 49 7 1 5 78 15 39 2
-42 85 1 2 49 8 2 1 96 3 6 2
-42 84 1 7 49 8 2 2 96 3 6 2
-42 83 1 12 49 8 2 3 96 3 6 2
-42 82 1 17 49 8 2 4 96 3 6 2
-42 81 1 22 49 8 4 2 96 7 15 1
-42 80 1 2 49 13 2 2 96 8 17 1
-42 79 1 7 49 13 2 4 96 8 17 1
-42 78 1 12 49 13 3 1 96 12 22 1
-42 77 1 17 49 13 1 3 96 12 23 2
-42 76 1 22 49 13 1 5 96 12 23 2
-42 75 1 2 49 14 3 1 96 16 29 2
-42 74 1 7 49 14 2 1 97 13 23 1
-42 73 1 12 49 14 2 2 97 13 23 1
-42 72 1 17 49 14 2 3 97 13 23 1
-42 71 1 22 49 14 2 4 97 13 23 1
-42 70 1 2 49 15 3 1 97 17 29 1
-42 69 1 7 49 15 3 3 97 17 29 1
-42 68 1 12 49 15 1 4 97 18 30 1
-42 67 1 17 49 15 1 5 97 18 30 1
-42 66 1 22 49 15 2 4 97 21 35 3
-42 65 1 2 49 16 2 2 97 23 36 1
-42 64 1 7 49 16 2 4 97 23 36 1
-42 63 1 12 49 16 2 5 97 23 36 1
-42 62 1 17 49 16 1 3 97 27 40 2
-42 61 1 22 49 16 1 5 97 27 40 2
-42 60 1 2 50 25 5 4 98 25 38 1
-42 59 1 7 50 25 5 3 98 25 38 1
-42 42 1 7 52 14 1 1 102 27 41 1
-42 41 1 6 52 14 1 2 102 27 41 1
-42 40 1 10 52 32 1 4 103 25 37 1
-42 39 1 9 52 32 1 2 103 25 37 1
-42 38 1 8 52 32 2 5 103 21 33 1
-42 37 1 7 52 32 2 3 103 21 33 1
-42 36 1 6 52 32 2 1 103 21 33 1
-42 35 1 10 52 33 2 4 103 23 34 1
-42 34 1 9 52 33 1 5 103 19 31 1
-42 33 1 8 52 33 1 3 103 19 31 1
-42 32 1 7 52 33 3 4 103 20 32 1
-42 31 1 6 52 33 3 2 103 20 32 1
-42 30 1 10 53 21 2 5 103 16 28 2
-42 29 1 9 53 21 2 3 103 16 28 2
-42 28 1 8 53 21 2 2 103 16 28 2
-42 27 1 7 53 21 2 1 103 16 28 2
-42 26 1 6 53 21 3 2 104 13 24 1
-42 25 1 10 53 22 3 5 104 9 19 2
-42 24 1 9 53 22 1 3 104 9 18 1
-42 23 1 8 53 22 1 1 104 9 18 1
-42 22 1 7 53 22 2 4 104 5 10 1
-42 21 1 6 53 22 2 1 104 5 10 1
-42 20 1 10 53 27 4 5 104 6 11 1
-42 19 1 9 53 27 2 5 104 2 4 1
-42 18 1 8 53 27 2 4 104 2 4 1
-42 17 1 7 53 27 2 3 104 2 4 1
-42 16 1 6 53 27 2 2 104 2 4 1
-42 15 1 10 53 28 3 5 86 14 37 2
-42 14 1 9 53 28 1 3 86 14 36 1
-42 13 1 8 53 28 1 1 86 14 36 1
-42 12 1 7 53 28 2 4 86 10 25 2
-42 11 1 6 53 28 2 1 86 10 25 2
-42 10 1 10 53 29 2 4 86 10 26 3
-42 9 1 9 53 29 2 2 86 10 26 3
-42 8 1 8 53 29 2 1 86 10 26 3
-42 7 1 7 53 29 1 3 86 6 14 2
-42 6 1 6 53 29 1 1 86 6 14 2
-42 5 1 10 53 30 2 5 86 3 4 1
-42 4 1 9 53 30 2 4 86 3 4 1
-42 3 1 8 53 30 2 3 86 3 4 1
-42 2 1 7 53 30 2 2 86 3 4 1
-42 1 1 6 53 30 2 1 86 3 4 1
-41 100 1 1 49 5 1 1 78 3 7 1
-41 99 1 6 49 5 1 2 78 3 7 1
-41 98 1 11 49 5 1 3 78 3 7 1
-41 97 1 16 49 5 1 4 78 3 7 1
-41 96 1 21 49 5 1 5 78 3 7 1
-41 95 1 1 49 6 1 1 78 7 16 1
-41 94 1 6 49 6 1 3 78 7 16 1
-41 93 1 11 49 6 1 5 78 7 16 1
-41 92 1 16 49 6 2 2 78 11 29 2
-41 91 1 21 49 6 2 4 78 11 29 2
-41 90 1 1 49 7 2 1 78 11 28 1
-41 89 1 6 49 7 2 3 78 11 28 1
-41 88 1 11 49 7 1 1 78 15 39 2
-41 87 1 16 49 7 1 2 78 15 39 2
-41 86 1 21 49 7 1 4 78 15 39 2
-41 85 1 1 49 8 1 1 96 4 7 1
-41 84 1 6 49 8 1 2 96 4 7 1
-41 83 1 11 49 8 1 3 96 4 7 1
-41 82 1 16 49 8 1 4 96 4 7 1
-41 81 1 21 49 8 1 5 96 4 7 1
-41 80 1 1 49 13 2 1 96 8 17 1
-41 79 1 6 49 13 2 3 96 8 17 1
-41 78 1 11 49 13 1 1 96 12 23 2
-41 77 1 16 49 13 1 2 96 12 23 2
-41 76 1 21 49 13 1 4 96 12 23 2
-41 75 1 1 49 14 1 1 97 13 24 2
-41 74 1 6 49 14 1 2 97 13 24 2
-41 73 1 11 49 14 1 3 97 13 24 2
-41 72 1 16 49 14 1 4 97 13 24 2
-41 71 1 21 49 14 1 5 97 13 24 2
-41 70 1 1 49 15 1 1 97 18 30 1
-41 69 1 6 49 15 1 2 97 18 30 1
-41 68 1 11 49 15 1 3 97 18 30 1
-41 67 1 16 49 15 2 1 97 21 35 3
-41 66 1 21 49 15 2 3 97 21 35 3
-41 65 1 1 49 16 2 1 97 23 36 1
-41 64 1 6 49 16 2 3 97 23 36 1
-41 63 1 11 49 16 1 1 97 27 40 2
-41 62 1 16 49 16 1 2 97 27 40 2
-41 61 1 21 49 16 1 4 97 27 40 2
-41 60 1 1 50 25 5 2 98 25 38 1
-41 59 1 6 50 25 5 1 98 25 38 1
-41 58 1 11 50 3 5 1 98 27 41 3
-41 43 1 3 52 14 1 3 102 27 41 1
-41 42 1 2 52 14 1 4 102 27 41 1
-41 41 1 1 52 14 1 5 102 27 41 1
-41 40 1 5 52 32 1 5 103 25 37 1
-41 39 1 4 52 32 1 3 103 25 37 1
-41 38 1 3 52 32 1 1 103 25 37 1
-41 37 1 2 52 32 2 4 103 21 33 1
-41 36 1 1 52 32 2 2 103 21 33 1
-41 35 1 5 52 33 2 5 103 23 34 1
-41 34 1 4 52 33 2 2 103 23 34 1
-41 33 1 3 52 33 1 4 103 19 31 1
-41 32 1 2 52 33 1 2 103 19 31 1
-41 31 1 1 52 33 1 1 103 19 31 1
-41 30 1 5 53 21 1 5 103 16 27 1
-41 29 1 4 53 21 1 4 103 16 27 1
-41 28 1 3 53 21 1 3 103 16 27 1
-41 27 1 2 53 21 1 2 103 16 27 1
-41 26 1 1 53 21 1 1 103 16 27 1
-41 25 1 5 53 22 1 5 104 9 18 1
-41 24 1 4 53 22 1 4 104 9 18 1
-41 23 1 3 53 22 1 2 104 9 18 1
-41 22 1 2 53 22 2 5 104 5 10 1
-41 21 1 1 53 22 2 2 104 5 10 1
-41 20 1 5 53 27 1 5 104 1 3 3
-41 19 1 4 53 27 1 4 104 1 3 3
-41 18 1 3 53 27 1 3 104 1 3 3
-41 17 1 2 53 27 1 2 104 1 3 3
-41 16 1 1 53 27 1 1 104 1 3 3
-41 15 1 5 53 28 1 5 86 14 36 1
-41 14 1 4 53 28 1 4 86 14 36 1
-41 13 1 3 53 28 1 2 86 14 36 1
-41 12 1 2 53 28 2 5 86 10 25 2
-41 11 1 1 53 28 2 2 86 10 25 2
-41 10 1 5 53 29 2 5 86 10 26 3
-41 9 1 4 53 29 2 3 86 10 26 3
-41 8 1 3 53 29 1 5 86 6 14 2
-41 7 1 2 53 29 1 4 86 6 14 2
-41 6 1 1 53 29 1 2 86 6 14 2
-41 5 1 5 53 30 1 5 86 2 3 2
-41 4 1 4 53 30 1 4 86 2 3 2
-41 3 1 3 53 30 1 3 86 2 3 2
-41 2 1 2 53 30 1 2 86 2 3 2
-41 1 1 1 53 30 1 1 86 2 3 2
-40 97 1 20 49 30 2 2 78 3 8 2
-40 96 1 25 49 30 2 5 78 3 8 2
-40 95 1 5 49 17 5 2 78 7 17 2
-40 94 1 10 49 17 5 4 78 7 17 2
-40 93 1 15 49 17 5 5 78 7 17 2
-40 92 1 20 49 17 4 3 78 11 30 3
-40 91 1 25 49 17 4 5 78 11 30 3
-40 90 1 5 49 20 4 3 78 12 31 1
-40 89 1 10 49 20 4 5 78 12 31 1
-40 88 1 15 49 20 5 2 78 16 40 1
-40 87 1 20 49 20 5 4 78 16 40 1
-40 86 1 25 49 20 5 5 78 16 40 1
-40 85 1 5 49 24 5 1 96 4 8 2
-40 84 1 10 49 24 5 2 96 4 8 2
-40 83 1 15 49 24 5 3 96 4 8 2
-40 82 1 20 49 24 5 4 96 4 8 2
-40 81 1 25 49 24 5 5 96 4 8 2
-40 80 1 5 49 27 5 2 97 5 9 2
-40 79 1 10 49 27 5 4 97 5 9 2
-40 78 1 15 49 27 5 5 97 5 9 2
-40 77 1 20 49 27 4 2 97 9 16 1
-40 76 1 25 49 27 4 5 97 9 16 1
-40 75 1 5 49 31 5 2 97 9 17 2
-40 74 1 10 49 31 5 4 97 9 17 2
-40 73 1 15 49 31 5 5 97 9 17 2
-40 72 1 20 49 31 4 3 97 14 25 1
-40 71 1 25 49 31 4 5 97 14 25 1
-40 70 1 5 49 33 5 1 97 19 31 1
-40 69 1 10 49 33 5 2 97 19 31 1
-40 68 1 15 49 33 5 4 97 19 31 1
-40 67 1 20 49 33 5 5 97 19 31 1
-40 66 1 25 49 33 4 5 97 20 32 1
-40 65 1 5 50 18 5 2 97 23 37 2
-40 64 1 10 50 18 5 4 97 23 37 2
-40 63 1 15 50 18 5 5 97 23 37 2
-40 62 1 20 50 18 4 3 98 21 35 1
-40 61 1 25 50 18 4 5 98 21 35 1
-40 60 1 5 50 26 5 2 98 27 40 2
-40 59 1 10 50 26 5 4 98 27 40 2
-40 58 1 15 50 26 5 5 98 27 40 2
-40 57 1 20 50 26 4 1 99 25 38 1
-40 56 1 25 50 26 4 5 99 25 38 1
-40 45 1 25 52 1 4 2 101 27 40 1
-40 44 1 24 52 1 4 1 101 27 40 1
-40 43 1 23 52 1 5 3 102 25 40 2
-40 42 1 22 52 1 5 2 102 25 40 2
-40 41 1 21 52 1 5 1 102 25 40 2
-40 40 1 25 52 2 5 5 102 23 38 2
-40 39 1 24 52 2 5 4 102 23 38 2
-40 38 1 23 52 2 5 3 102 23 38 2
-40 37 1 22 52 2 5 2 102 23 38 2
-40 36 1 21 52 2 5 1 102 23 38 2
-40 35 1 25 52 4 4 4 103 17 29 1
-40 34 1 24 52 4 5 5 103 18 30 1
-40 33 1 23 52 4 5 3 103 18 30 1
-40 32 1 22 52 4 5 2 103 18 30 1
-40 31 1 21 52 4 5 1 103 18 30 1
-40 30 1 25 52 8 4 4 103 15 26 1
-40 29 1 24 52 8 4 2 103 15 26 1
-40 28 1 23 52 8 5 5 103 12 22 2
-40 27 1 22 52 8 5 3 103 12 22 2
-40 26 1 21 52 8 5 1 103 12 22 2
-40 25 1 25 52 15 4 3 103 12 21 1
-40 24 1 24 52 15 4 1 103 12 21 1
-40 23 1 23 52 15 5 4 103 8 15 2
-40 22 1 22 52 15 5 2 103 8 15 2
-40 21 1 21 52 15 5 1 103 8 15 2
-40 20 1 25 52 22 5 5 104 1 2 2
-40 19 1 24 52 22 5 4 104 1 2 2
-40 18 1 23 52 22 5 3 104 1 2 2
-40 17 1 22 52 22 5 2 104 1 2 2
-40 16 1 21 52 22 5 1 104 1 2 2
-40 15 1 25 53 18 5 4 86 13 35 2
-40 14 1 24 53 18 5 2 86 13 35 2
-40 13 1 23 53 18 5 1 86 13 35 2
-40 12 1 22 53 18 4 3 86 9 23 3
-40 11 1 21 53 18 4 1 86 9 23 3
-40 10 1 25 53 19 4 4 86 10 24 1
-40 9 1 24 53 19 4 2 86 10 24 1
-40 8 1 23 53 19 5 5 86 6 13 1
-40 7 1 22 53 19 5 3 86 6 13 1
-40 6 1 21 53 19 5 1 86 6 13 1
-40 5 1 25 53 20 2 3 86 2 2 1
-40 4 1 24 53 20 2 1 86 2 2 1
-39 97 1 19 49 30 2 1 78 3 8 2
-39 96 1 24 49 30 2 4 78 3 8 2
-39 95 1 4 49 17 5 1 78 7 17 2
-39 94 1 9 49 17 5 3 78 7 17 2
-39 93 1 14 49 17 4 1 78 11 30 3
-39 92 1 19 49 17 4 2 78 11 30 3
-39 91 1 24 49 17 4 4 78 11 30 3
-39 90 1 4 49 20 4 2 78 12 31 1
-39 89 1 9 49 20 4 4 78 12 31 1
-39 88 1 14 49 20 5 1 78 16 40 1
-39 87 1 19 49 20 5 3 78 16 40 1
-39 86 1 24 49 20 3 5 78 16 41 2
-39 85 1 4 49 24 4 1 96 4 9 3
-39 84 1 9 49 24 4 3 96 4 9 3
-39 83 1 14 49 24 4 4 96 4 9 3
-39 82 1 19 49 24 4 5 96 4 9 3
-39 81 1 24 49 24 3 5 97 1 1 1
-39 80 1 4 49 27 5 1 97 5 9 2
-39 79 1 9 49 27 5 3 97 5 9 2
-39 78 1 14 49 27 3 5 97 5 10 1
-39 77 1 19 49 27 4 1 97 9 16 1
-39 76 1 24 49 27 4 4 97 9 16 1
-39 75 1 4 49 31 5 1 97 9 17 2
-39 74 1 9 49 31 5 3 97 9 17 2
-39 73 1 14 49 31 4 1 97 14 25 1
-39 72 1 19 49 31 4 2 97 14 25 1
-39 71 1 24 49 31 4 4 97 14 25 1
-39 70 1 4 49 33 3 3 97 15 26 1
-39 69 1 9 49 33 3 5 97 15 26 1
-39 68 1 14 49 33 5 3 97 19 31 1
-39 67 1 19 49 33 4 3 97 20 32 1
-39 66 1 24 49 33 4 4 97 20 32 1
-39 65 1 4 50 18 5 1 97 23 37 2
-39 64 1 9 50 18 5 3 97 23 37 2
-39 63 1 14 50 18 4 1 98 21 35 1
-39 62 1 19 50 18 4 2 98 21 35 1
-39 61 1 24 50 18 4 4 98 21 35 1
-39 60 1 4 50 26 5 1 98 27 40 2
-39 59 1 9 50 26 5 3 98 27 40 2
-39 58 1 14 50 26 3 3 98 27 39 1
-39 57 1 19 50 26 3 5 98 27 39 1
-39 56 1 24 50 26 4 4 99 25 38 1
-39 55 1 4 50 32 4 2 99 27 40 2
-39 54 1 9 50 32 4 4 99 27 40 2
-39 53 1 14 50 32 4 5 99 27 40 2
-39 52 1 19 50 32 3 3 100 25 40 2
-39 51 1 24 50 32 3 5 100 25 40 2
-39 50 1 20 51 10 3 3 100 27 42 2
-39 49 1 19 51 10 3 1 100 27 42 2
-39 48 1 18 51 10 4 4 101 25 39 2
-39 47 1 17 51 10 4 2 101 25 39 2
-39 46 1 16 51 10 4 1 101 25 39 2
-39 45 1 20 52 1 4 3 101 27 40 1
-39 44 1 19 52 1 5 5 102 25 40 2
-39 43 1 18 52 1 5 4 102 25 40 2
-39 42 1 17 52 1 3 3 102 25 39 1
-39 41 1 16 52 1 3 1 102 25 39 1
-39 40 1 20 52 2 4 5 102 23 37 1
-39 39 1 19 52 2 4 3 102 23 37 1
-39 38 1 18 52 2 4 1 102 23 37 1
-39 37 1 17 52 2 3 4 102 20 34 2
-39 36 1 16 52 2 3 1 102 20 34 2
-39 35 1 20 52 4 4 5 103 17 29 1
-39 34 1 19 52 4 4 2 103 17 29 1
-39 33 1 18 52 4 5 4 103 18 30 1
-39 32 1 17 52 4 3 4 103 14 25 2
-39 31 1 16 52 4 3 1 103 14 25 2
-39 30 1 20 52 8 4 5 103 15 26 1
-39 29 1 19 52 8 4 3 103 15 26 1
-39 28 1 18 52 8 4 1 103 15 26 1
-39 27 1 17 52 8 5 4 103 12 22 2
-39 26 1 16 52 8 5 2 103 12 22 2
-39 25 1 20 52 15 4 4 103 12 21 1
-39 24 1 19 52 15 4 2 103 12 21 1
-39 23 1 18 52 15 5 5 103 8 15 2
-39 22 1 17 52 15 5 3 103 8 15 2
-39 21 1 16 52 15 3 1 103 8 14 1
-39 20 1 20 52 22 3 3 103 4 8 2
-39 19 1 19 52 22 4 5 104 1 1 1
-39 18 1 18 52 22 4 4 104 1 1 1
-39 17 1 17 52 22 4 2 104 1 1 1
-39 16 1 16 52 22 4 1 104 1 1 1
-39 15 1 20 53 18 5 5 86 13 35 2
-39 14 1 19 53 18 5 3 86 13 35 2
-39 13 1 18 53 18 3 1 86 13 34 1
-39 12 1 17 53 18 4 4 86 9 23 3
-39 11 1 16 53 18 4 2 86 9 23 3
-39 10 1 20 53 19 4 5 86 10 24 1
-39 9 1 19 53 19 4 3 86 10 24 1
-39 8 1 18 53 19 4 1 86 10 24 1
-39 7 1 17 53 19 5 4 86 6 13 1
-39 6 1 16 53 19 5 2 86 6 13 1
-39 5 1 20 53 20 2 4 86 2 2 1
-39 4 1 19 53 20 2 2 86 2 2 1
-38 97 1 18 49 30 1 3 78 4 9 1
-38 96 1 23 49 30 2 3 78 3 8 2
-38 95 1 3 49 17 3 2 78 8 18 1
-38 94 1 8 49 17 3 4 78 8 18 1
-38 93 1 13 49 17 3 5 78 8 18 1
-38 92 1 18 49 17 2 2 78 12 32 2
-38 91 1 23 49 17 2 5 78 12 32 2
-38 90 1 3 49 20 4 1 78 12 31 1
-38 89 1 8 49 20 2 5 78 12 33 3
-38 88 1 13 49 20 3 1 78 16 41 2
-38 87 1 18 49 20 3 3 78 16 41 2
-38 86 1 23 49 20 3 4 78 16 41 2
-38 85 1 3 49 24 2 3 79 13 31 1
-38 84 1 8 49 24 4 2 96 4 9 3
-38 83 1 13 49 24 3 2 97 1 1 1
-38 82 1 18 49 24 3 3 97 1 1 1
-38 81 1 23 49 24 3 4 97 1 1 1
-38 80 1 3 49 27 3 2 97 5 10 1
-38 79 1 8 49 27 3 3 97 5 10 1
-38 78 1 13 49 27 3 4 97 5 10 1
-38 77 1 18 49 27 2 4 97 6 11 1
-38 76 1 23 49 27 4 3 97 9 16 1
-38 75 1 3 49 31 3 2 97 10 18 1
-38 74 1 8 49 31 3 4 97 10 18 1
-38 73 1 13 49 31 3 5 97 10 18 1
-38 72 1 18 49 31 2 2 97 15 27 2
-38 71 1 23 49 31 2 5 97 15 27 2
-38 70 1 3 49 33 3 2 97 15 26 1
-38 69 1 8 49 33 3 4 97 15 26 1
-38 68 1 13 49 33 4 1 97 20 32 1
-38 67 1 18 49 33 4 2 97 20 32 1
-38 66 1 23 49 33 2 5 98 17 29 1
-38 65 1 3 50 18 2 3 98 17 30 2
-38 64 1 8 50 18 2 5 98 17 30 2
-38 63 1 13 50 18 3 1 98 21 36 2
-38 62 1 18 50 18 3 2 98 21 36 2
-38 61 1 23 50 18 3 5 98 21 36 2
-38 60 1 3 50 26 3 1 98 27 39 1
-38 59 1 8 50 26 2 5 98 23 37 1
-38 58 1 13 50 26 3 2 98 27 39 1
-38 57 1 18 50 26 3 4 98 27 39 1
-38 56 1 23 50 26 4 3 99 25 38 1
-38 55 1 3 50 32 4 1 99 27 40 2
-38 54 1 8 50 32 4 3 99 27 40 2
-38 53 1 13 50 32 2 5 99 27 39 1
-38 52 1 18 50 32 3 2 100 25 40 2
-38 51 1 23 50 32 3 4 100 25 40 2
-38 50 1 15 51 10 3 4 100 27 42 2
-38 49 1 14 51 10 3 2 100 27 42 2
-38 48 1 13 51 10 4 5 101 25 39 2
-38 47 1 12 51 10 4 3 101 25 39 2
-38 46 1 11 51 10 2 1 101 25 38 1
-38 45 1 15 52 1 4 4 101 27 40 1
-38 44 1 14 52 1 3 5 102 25 39 1
-38 43 1 13 52 1 3 4 102 25 39 1
-38 42 1 12 52 1 2 3 102 21 35 1
-38 41 1 11 52 1 3 2 102 25 39 1
-38 40 1 15 52 2 2 3 102 21 36 2
-38 39 1 14 52 2 4 4 102 23 37 1
-38 38 1 13 52 2 4 2 102 23 37 1
-38 37 1 12 52 2 3 5 102 20 34 2
-38 36 1 11 52 2 3 2 102 20 34 2
-38 35 1 15 52 4 2 3 102 20 33 1
-38 34 1 14 52 4 4 3 103 17 29 1
-38 33 1 13 52 4 4 1 103 17 29 1
-38 32 1 12 52 4 3 5 103 14 25 2
-38 31 1 11 52 4 3 2 103 14 25 2
-38 30 1 15 52 8 2 3 103 14 24 1
-38 29 1 14 52 8 2 1 103 14 24 1
-38 28 1 13 52 8 3 5 103 11 20 1
-38 27 1 12 52 8 3 3 103 11 20 1
-38 26 1 11 52 8 3 1 103 11 20 1
-38 25 1 15 52 15 4 5 103 12 21 1
-38 24 1 14 52 15 2 3 103 7 13 2
-38 23 1 13 52 15 3 5 103 8 14 1
-38 22 1 12 52 15 3 4 103 8 14 1
-38 21 1 11 52 15 3 2 103 8 14 1
-38 20 1 15 52 22 3 4 103 4 8 2
-38 19 1 14 52 22 3 2 103 4 8 2
-38 18 1 13 52 22 3 1 103 4 8 2
-38 17 1 12 52 22 4 3 104 1 1 1
-38 16 1 11 52 22 2 1 85 16 39 2
-38 15 1 15 53 18 3 5 86 13 34 1
-38 14 1 14 53 18 3 3 86 13 34 1
-38 13 1 13 53 18 3 2 86 13 34 1
-38 12 1 12 53 18 4 5 86 9 23 3
-38 11 1 11 53 18 2 1 86 9 21 1
-38 10 1 15 53 19 2 3 86 9 22 2
-38 9 1 14 53 19 2 1 86 9 22 2
-38 8 1 13 53 19 3 3 86 5 12 3
-38 7 1 12 53 19 3 2 86 5 12 3
-38 6 1 11 53 19 3 1 86 5 12 3
-38 5 1 15 53 20 2 5 86 2 2 1
-38 4 1 14 53 20 1 1 86 1 1 1
-37 97 1 17 49 30 1 2 78 4 9 1
-37 96 1 22 49 30 1 5 78 4 9 1
-37 95 1 2 49 17 3 1 78 8 18 1
-37 94 1 7 49 17 3 3 78 8 18 1
-37 93 1 12 49 17 1 4 78 8 19 2
-37 92 1 17 49 17 1 5 78 8 19 2
-37 91 1 22 49 17 2 4 78 12 32 2
-37 90 1 2 49 20 2 2 78 12 33 3
-37 89 1 7 49 20 2 4 78 12 33 3
-37 88 1 12 49 20 1 2 79 13 32 2
-37 87 1 17 49 20 3 2 78 16 41 2
-37 86 1 22 49 20 1 5 79 13 32 2
-37 85 1 2 49 24 2 2 79 13 31 1
-37 84 1 7 49 24 2 5 79 13 31 1
-37 83 1 12 49 24 3 1 97 1 1 1
-37 82 1 17 49 24 1 3 97 1 2 2
-37 81 1 22 49 24 1 5 97 1 2 2
-37 80 1 2 49 27 3 1 97 5 10 1
-37 79 1 7 49 27 2 1 97 6 11 1
-37 78 1 12 49 27 2 2 97 6 11 1
-37 77 1 17 49 27 2 3 97 6 11 1
-37 76 1 22 49 27 2 5 97 6 11 1
-37 75 1 2 49 31 3 1 97 10 18 1
-37 74 1 7 49 31 3 3 97 10 18 1
-37 73 1 12 49 31 1 4 97 11 19 1
-37 72 1 17 49 31 2 1 97 15 27 2
-37 71 1 22 49 31 2 4 97 15 27 2
-37 70 1 2 49 33 3 1 97 15 26 1
-37 69 1 7 49 33 1 3 97 16 28 1
-37 68 1 12 49 33 1 5 97 16 28 1
-37 67 1 17 49 33 2 2 98 17 29 1
-37 66 1 22 49 33 2 4 98 17 29 1
-37 65 1 2 50 18 2 2 98 17 30 2
-37 64 1 7 50 18 2 4 98 17 30 2
-37 63 1 12 50 18 1 3 98 18 32 2
-37 62 1 17 50 18 1 5 98 18 32 2
-37 61 1 22 50 18 3 4 98 21 36 2
-37 60 1 2 50 26 2 2 98 23 37 1
-37 59 1 7 50 26 2 4 98 23 37 1
-37 58 1 12 50 26 1 2 99 21 36 3
-37 57 1 17 50 26 1 4 99 21 36 3
-37 56 1 22 50 26 4 2 99 25 38 1
-37 55 1 2 50 32 2 2 99 27 39 1
-37 54 1 7 50 32 2 4 99 27 39 1
-37 53 1 12 50 32 3 1 100 25 40 2
-37 52 1 17 50 32 1 3 100 25 39 1
-37 51 1 22 50 32 1 5 100 25 39 1
-37 50 1 10 51 10 3 5 100 27 42 2
-37 49 1 9 51 10 1 3 100 27 41 1
-37 48 1 8 51 10 1 1 100 27 41 1
-37 47 1 7 51 10 2 4 101 25 38 1
-37 46 1 6 51 10 2 2 101 25 38 1
-37 45 1 10 52 1 4 5 101 27 40 1
-37 44 1 9 52 1 1 3 101 23 37 3
-37 43 1 8 52 1 1 1 101 23 37 3
-37 42 1 7 52 1 2 4 102 21 35 1
-37 41 1 6 52 1 2 1 102 21 35 1
-37 40 1 10 52 2 2 4 102 21 36 2
-37 39 1 9 52 2 2 1 102 21 36 2
-37 38 1 8 52 2 1 4 102 19 32 2
-37 37 1 7 52 2 1 2 102 19 32 2
-37 36 1 6 52 2 3 3 102 20 34 2
-37 35 1 10 52 4 2 4 102 20 33 1
-37 34 1 9 52 4 2 1 102 20 33 1
-37 33 1 8 52 4 1 4 103 13 23 1
-37 32 1 7 52 4 1 2 103 13 23 1
-37 31 1 6 52 4 3 3 103 14 25 2
-37 30 1 10 52 8 2 4 103 14 24 1
-37 29 1 9 52 8 2 2 103 14 24 1
-37 28 1 8 52 8 1 3 103 10 19 2
-37 27 1 7 52 8 3 4 103 11 20 1
-37 26 1 6 52 8 3 2 103 11 20 1
-37 25 1 10 52 15 2 5 103 7 13 2
-37 24 1 9 52 15 2 4 103 7 13 2
-37 23 1 8 52 15 2 2 103 7 13 2
-37 22 1 7 52 15 2 1 103 7 13 2
-37 21 1 6 52 15 3 3 103 8 14 1
-37 20 1 10 52 22 3 5 103 4 8 2
-37 19 1 9 52 22 1 3 103 4 7 1
-37 18 1 8 52 22 1 1 103 4 7 1
-37 17 1 7 52 22 2 4 85 16 39 2
-37 16 1 6 52 22 2 2 85 16 39 2
-37 15 1 10 53 18 1 4 85 16 40 3
-37 14 1 9 53 18 3 4 86 13 34 1
-37 13 1 8 53 18 1 1 85 16 40 3
-37 12 1 7 53 18 2 4 86 9 21 1
-37 11 1 6 53 18 2 2 86 9 21 1
-37 10 1 10 53 19 2 4 86 9 22 2
-37 9 1 9 53 19 3 5 86 5 12 3
-37 8 1 8 53 19 3 4 86 5 12 3
-37 7 1 7 53 19 1 3 86 5 11 2
-37 6 1 6 53 19 1 1 86 5 11 2
-37 5 1 10 53 20 1 4 86 1 1 1
-37 4 1 9 53 20 1 2 86 1 1 1
-36 97 1 16 49 30 1 1 78 4 9 1
-36 96 1 21 49 30 1 4 78 4 9 1
-36 95 1 1 49 17 1 1 78 8 19 2
-36 94 1 6 49 17 1 2 78 8 19 2
-36 93 1 11 49 17 1 3 78 8 19 2
-36 92 1 16 49 17 2 1 78 12 32 2
-36 91 1 21 49 17 2 3 78 12 32 2
-36 90 1 1 49 20 2 1 78 12 33 3
-36 89 1 6 49 20 2 3 78 12 33 3
-36 88 1 11 49 20 1 1 79 13 32 2
-36 87 1 16 49 20 1 3 79 13 32 2
-36 86 1 21 49 20 1 4 79 13 32 2
-36 85 1 1 49 24 2 1 79 13 31 1
-36 84 1 6 49 24 2 4 79 13 31 1
-36 83 1 11 49 24 1 1 97 1 2 2
-36 82 1 16 49 24 1 2 97 1 2 2
-36 81 1 21 49 24 1 4 97 1 2 2
-36 80 1 1 49 27 1 1 97 6 12 2
-36 79 1 6 49 27 1 2 97 6 12 2
-36 78 1 11 49 27 1 3 97 6 12 2
-36 77 1 16 49 27 1 4 97 6 12 2
-36 76 1 21 49 27 1 5 97 6 12 2
-36 75 1 1 49 31 1 1 97 11 19 1
-36 74 1 6 49 31 1 2 97 11 19 1
-36 73 1 11 49 31 1 3 97 11 19 1
-36 72 1 16 49 31 1 5 97 11 19 1
-36 71 1 21 49 31 2 3 97 15 27 2
-36 70 1 1 49 33 1 1 97 16 28 1
-36 69 1 6 49 33 1 2 97 16 28 1
-36 68 1 11 49 33 1 4 97 16 28 1
-36 67 1 16 49 33 2 1 98 17 29 1
-36 66 1 21 49 33 2 3 98 17 29 1
-36 65 1 1 50 18 2 1 98 17 30 2
-36 64 1 6 50 18 1 1 98 18 32 2
-36 63 1 11 50 18 1 2 98 18 32 2
-36 62 1 16 50 18 1 4 98 18 32 2
-36 61 1 21 50 18 3 3 98 21 36 2
-36 60 1 1 50 26 2 1 98 23 37 1
-36 59 1 6 50 26 2 3 98 23 37 1
-36 58 1 11 50 26 1 1 99 21 36 3
-36 57 1 16 50 26 1 3 99 21 36 3
-36 56 1 21 50 26 1 5 99 21 36 3
-36 55 1 1 50 32 2 1 99 27 39 1
-36 54 1 6 50 32 2 3 99 27 39 1
-36 53 1 11 50 32 1 1 100 25 39 1
-36 52 1 16 50 32 1 2 100 25 39 1
-36 51 1 21 50 32 1 4 100 25 39 1
-36 50 1 5 51 10 1 5 100 27 41 1
-36 49 1 4 51 10 1 4 100 27 41 1
-36 48 1 3 51 10 1 2 100 27 41 1
-36 47 1 2 51 10 2 5 101 25 38 1
-36 46 1 1 51 10 2 3 101 25 38 1
-36 45 1 5 52 1 1 5 101 23 37 3
-36 44 1 4 52 1 1 4 101 23 37 3
-36 43 1 3 52 1 1 2 101 23 37 3
-36 42 1 2 52 1 2 5 102 21 35 1
-36 41 1 1 52 1 2 2 102 21 35 1
-36 40 1 5 52 2 2 5 102 21 36 2
-36 39 1 4 52 2 2 2 102 21 36 2
-36 38 1 3 52 2 1 5 102 19 32 2
-36 37 1 2 52 2 1 3 102 19 32 2
-36 36 1 1 52 2 1 1 102 19 32 2
-36 35 1 5 52 4 2 5 102 20 33 1
-36 34 1 4 52 4 2 2 102 20 33 1
-36 33 1 3 52 4 1 5 103 13 23 1
-36 32 1 2 52 4 1 3 103 13 23 1
-36 31 1 1 52 4 1 1 103 13 23 1
-36 30 1 5 52 8 2 5 103 14 24 1
-36 29 1 4 52 8 1 5 103 10 19 2
-36 28 1 3 52 8 1 4 103 10 19 2
-36 27 1 2 52 8 1 2 103 10 19 2
-36 26 1 1 52 8 1 1 103 10 19 2
-36 25 1 5 52 15 1 5 103 7 12 1
-36 24 1 4 52 15 1 4 103 7 12 1
-36 23 1 3 52 15 1 3 103 7 12 1
-36 22 1 2 52 15 1 2 103 7 12 1
-36 21 1 1 52 15 1 1 103 7 12 1
-36 20 1 5 52 22 1 5 103 4 7 1
-36 19 1 4 52 22 1 4 103 4 7 1
-36 18 1 3 52 22 1 2 103 4 7 1
-36 17 1 2 52 22 2 5 85 16 39 2
-36 16 1 1 52 22 2 3 85 16 39 2
-36 15 1 5 53 18 1 5 85 16 40 3
-36 14 1 4 53 18 1 3 85 16 40 3
-36 13 1 3 53 18 1 2 85 16 40 3
-36 12 1 2 53 18 2 5 86 9 21 1
-36 11 1 1 53 18 2 3 86 9 21 1
-36 10 1 5 53 19 2 5 86 9 22 2
-36 9 1 4 53 19 2 2 86 9 22 2
-36 8 1 3 53 19 1 5 86 5 11 2
-36 7 1 2 53 19 1 4 86 5 11 2
-36 6 1 1 53 19 1 2 86 5 11 2
-36 5 1 5 53 20 1 5 86 1 1 1
-36 4 1 4 53 20 1 3 86 1 1 1
-35 95 1 5 49 18 5 2 78 8 20 3
-35 94 1 10 49 18 5 3 78 8 20 3
-35 93 1 15 49 18 5 4 78 8 20 3
-35 92 1 20 49 18 5 5 78 8 20 3
-35 91 1 25 49 18 4 5 79 5 8 2
-35 90 1 5 49 21 5 2 79 9 21 1
-35 89 1 10 49 21 5 4 79 9 21 1
-35 88 1 15 49 21 5 5 79 9 21 1
-35 87 1 20 49 21 4 2 79 13 33 3
-35 86 1 25 49 21 4 5 79 13 33 3
-35 85 1 5 49 25 5 2 79 14 34 1
-35 84 1 10 49 25 5 4 79 14 34 1
-35 83 1 15 49 25 5 5 79 14 34 1
-35 82 1 20 49 25 4 1 97 2 3 1
-35 81 1 25 49 25 4 5 97 2 3 1
-35 80 1 5 49 28 4 3 97 2 4 2
-35 79 1 10 49 28 4 5 97 2 4 2
-35 78 1 15 49 28 5 1 97 7 13 1
-35 77 1 20 49 28 5 3 97 7 13 1
-35 76 1 25 49 28 5 5 97 7 13 1
-35 75 1 5 49 32 4 2 97 11 20 2
-35 74 1 10 49 32 4 5 97 11 20 2
-35 73 1 15 49 32 5 2 97 12 21 1
-35 72 1 20 49 32 5 4 97 12 21 1
-35 71 1 25 49 32 5 5 97 12 21 1
-35 70 1 5 50 12 5 1 98 13 23 1
-35 69 1 10 50 12 5 3 98 13 23 1
-35 68 1 15 50 12 5 4 98 13 23 1
-35 67 1 20 50 12 5 5 98 13 23 1
-35 66 1 25 50 12 4 5 98 14 25 2
-35 65 1 5 50 19 5 2 98 18 31 1
-35 64 1 10 50 19 5 4 98 18 31 1
-35 63 1 15 50 19 5 5 98 18 31 1
-35 62 1 20 50 19 4 4 98 19 33 1
-35 61 1 25 50 19 4 5 98 19 33 1
-35 60 1 5 50 27 5 1 99 21 35 2
-35 59 1 10 50 27 5 2 99 21 35 2
-35 58 1 15 50 27 5 3 99 21 35 2
-35 57 1 20 50 27 5 4 99 21 35 2
-35 56 1 25 50 27 5 5 99 21 35 2
-35 55 1 5 51 3 5 2 99 23 37 1
-35 54 1 10 51 3 5 4 99 23 37 1
-35 53 1 15 51 3 5 5 99 23 37 1
-35 52 1 20 51 3 4 3 100 21 37 1
-35 51 1 25 51 3 4 5 100 21 37 1
-35 50 1 25 51 11 4 4 100 23 38 1
-35 49 1 24 51 11 4 2 100 23 38 1
-35 48 1 23 51 11 5 5 101 21 34 1
-35 47 1 22 51 11 5 3 101 21 34 1
-35 46 1 21 51 11 5 1 101 21 34 1
-35 45 1 25 51 18 5 5 101 23 36 2
-35 44 1 24 51 18 5 4 101 23 36 2
-35 43 1 23 51 18 5 3 101 23 36 2
-35 42 1 22 51 18 5 2 101 23 36 2
-35 41 1 21 51 18 5 1 101 23 36 2
-35 40 1 25 52 3 4 5 102 18 30 1
-35 39 1 24 52 3 4 3 102 18 30 1
-35 38 1 23 52 3 5 5 102 19 31 1
-35 37 1 22 52 3 5 3 102 19 31 1
-35 36 1 21 52 3 5 1 102 19 31 1
-35 35 1 25 52 5 5 5 102 16 28 2
-35 34 1 24 52 5 5 4 102 16 28 2
-35 33 1 23 52 5 5 3 102 16 28 2
-35 32 1 22 52 5 5 2 102 16 28 2
-35 31 1 21 52 5 5 1 102 16 28 2
-35 30 1 25 52 9 5 4 103 9 17 2
-35 29 1 24 52 9 5 2 103 9 17 2
-35 28 1 23 52 9 5 1 103 9 17 2
-35 27 1 22 52 9 4 3 103 10 18 1
-35 26 1 21 52 9 4 1 103 10 18 1
-35 25 1 25 52 16 5 4 103 6 11 1
-35 24 1 24 52 16 5 2 103 6 11 1
-35 23 1 23 52 16 5 1 103 6 11 1
-35 22 1 22 52 16 4 4 103 3 6 2
-35 21 1 21 52 16 4 1 103 3 6 2
-35 20 1 25 52 23 4 2 103 3 5 1
-35 19 1 24 52 23 4 1 103 3 5 1
-35 18 1 23 52 23 5 3 85 15 37 3
-35 17 1 22 52 23 5 2 85 15 37 3
-35 16 1 21 52 23 5 1 85 15 37 3
-35 15 1 25 52 28 4 3 85 16 38 1
-35 14 1 24 52 28 4 1 85 16 38 1
-35 13 1 23 52 28 5 4 85 12 30 2
-35 12 1 22 52 28 5 2 85 12 30 2
-35 11 1 21 52 28 5 1 85 12 30 2
-35 10 1 25 52 29 4 4 85 8 20 3
-35 9 1 24 52 29 5 5 86 5 10 1
-35 8 1 23 52 29 5 4 86 5 10 1
-35 7 1 22 52 29 5 3 86 5 10 1
-35 6 1 21 52 29 5 1 86 5 10 1
-34 95 1 4 49 18 5 1 78 8 20 3
-34 94 1 9 49 18 4 1 79 5 8 2
-34 93 1 14 49 18 4 2 79 5 8 2
-34 92 1 19 49 18 4 3 79 5 8 2
-34 91 1 24 49 18 4 4 79 5 8 2
-34 90 1 4 49 21 5 1 79 9 21 1
-34 89 1 9 49 21 5 3 79 9 21 1
-34 88 1 14 49 21 3 5 79 9 22 2
-34 87 1 19 49 21 4 1 79 13 33 3
-34 86 1 24 49 21 4 4 79 13 33 3
-34 85 1 4 49 25 5 1 79 14 34 1
-34 84 1 9 49 25 5 3 79 14 34 1
-34 83 1 14 49 25 3 4 79 14 35 2
-34 82 1 19 49 25 3 5 79 14 35 2
-34 81 1 24 49 25 4 4 97 2 3 1
-34 80 1 4 49 28 4 2 97 2 4 2
-34 79 1 9 49 28 4 4 97 2 4 2
-34 78 1 14 49 28 3 4 97 3 5 1
-34 77 1 19 49 28 5 2 97 7 13 1
-34 76 1 24 49 28 5 4 97 7 13 1
-34 75 1 4 49 32 4 1 97 11 20 2
-34 74 1 9 49 32 4 4 97 11 20 2
-34 73 1 14 49 32 5 1 97 12 21 1
-34 72 1 19 49 32 5 3 97 12 21 1
-34 71 1 24 49 32 3 5 97 12 22 2
-34 70 1 4 50 12 3 3 98 9 15 1
-34 69 1 9 50 12 5 2 98 13 23 1
-34 68 1 14 50 12 4 2 98 14 25 2
-34 67 1 19 50 12 4 3 98 14 25 2
-34 66 1 24 50 12 4 4 98 14 25 2
-34 65 1 4 50 19 5 1 98 18 31 1
-34 64 1 9 50 19 5 3 98 18 31 1
-34 63 1 14 50 19 4 2 98 19 33 1
-34 62 1 19 50 19 4 3 98 19 33 1
-34 61 1 24 50 19 3 5 98 20 34 1
-34 60 1 4 50 27 4 1 99 21 34 1
-34 59 1 9 50 27 3 5 99 17 30 1
-34 58 1 14 50 27 4 2 99 21 34 1
-34 57 1 19 50 27 4 4 99 21 34 1
-34 56 1 24 50 27 4 5 99 21 34 1
-34 55 1 4 51 3 5 1 99 23 37 1
-34 54 1 9 51 3 5 3 99 23 37 1
-34 53 1 14 51 3 4 1 100 21 37 1
-34 52 1 19 51 3 4 2 100 21 37 1
-34 51 1 24 51 3 4 4 100 21 37 1
-34 50 1 20 51 11 4 5 100 23 38 1
-34 49 1 19 51 11 4 3 100 23 38 1
-34 48 1 18 51 11 4 1 100 23 38 1
-34 47 1 17 51 11 5 4 101 21 34 1
-34 46 1 16 51 11 5 2 101 21 34 1
-34 45 1 20 51 18 4 5 101 23 35 1
-34 44 1 19 51 18 4 3 101 23 35 1
-34 43 1 18 51 18 4 2 101 23 35 1
-34 42 1 17 51 18 3 4 101 20 33 1
-34 41 1 16 51 18 4 1 101 23 35 1
-34 40 1 20 52 3 3 2 102 17 29 1
-34 39 1 19 52 3 4 4 102 18 30 1
-34 38 1 18 52 3 4 1 102 18 30 1
-34 37 1 17 52 3 5 4 102 19 31 1
-34 36 1 16 52 3 5 2 102 19 31 1
-34 35 1 20 52 5 2 2 102 15 26 1
-34 34 1 19 52 5 4 4 102 16 27 1
-34 33 1 18 52 5 4 2 102 16 27 1
-34 32 1 17 52 5 4 1 102 16 27 1
-34 31 1 16 52 5 3 1 102 12 21 1
-34 30 1 20 52 9 5 5 103 9 17 2
-34 29 1 19 52 9 5 3 103 9 17 2
-34 28 1 18 52 9 3 1 103 9 16 1
-34 27 1 17 52 9 4 4 103 10 18 1
-34 26 1 16 52 9 4 2 103 10 18 1
-34 25 1 20 52 16 5 5 103 6 11 1
-34 24 1 19 52 16 5 3 103 6 11 1
-34 23 1 18 52 16 3 2 103 2 4 2
-34 22 1 17 52 16 4 5 103 3 6 2
-34 21 1 16 52 16 4 2 103 3 6 2
-34 20 1 20 52 23 4 3 103 3 5 1
-34 19 1 19 52 23 5 5 85 15 37 3
-34 18 1 18 52 23 5 4 85 15 37 3
-34 17 1 17 52 23 3 2 85 15 36 2
-34 16 1 16 52 23 3 1 85 15 36 2
-34 15 1 20 52 28 4 4 85 16 38 1
-34 14 1 19 52 28 4 2 85 16 38 1
-34 13 1 18 52 28 5 5 85 12 30 2
-34 12 1 17 52 28 5 3 85 12 30 2
-34 11 1 16 52 28 3 1 85 12 29 1
-34 10 1 20 52 29 4 5 85 8 20 3
-34 9 1 19 52 29 4 3 85 8 20 3
-34 8 1 18 52 29 4 2 85 8 20 3
-34 7 1 17 52 29 4 1 85 8 20 3
-34 6 1 16 52 29 5 2 86 5 10 1
-33 95 1 3 49 18 2 3 79 1 1 1
-33 94 1 8 49 18 3 1 79 5 9 3
-33 93 1 13 49 18 3 3 79 5 9 3
-33 92 1 18 49 18 3 4 79 5 9 3
-33 91 1 23 49 18 3 5 79 5 9 3
-33 90 1 3 49 21 3 2 79 9 22 2
-33 89 1 8 49 21 3 3 79 9 22 2
-33 88 1 13 49 21 3 4 79 9 22 2
-33 87 1 18 49 21 2 4 79 10 23 1
-33 86 1 23 49 21 4 3 79 13 33 3
-33 85 1 3 49 25 3 1 79 14 35 2
-33 84 1 8 49 25 3 2 79 14 35 2
-33 83 1 13 49 25 3 3 79 14 35 2
-33 82 1 18 49 25 2 5 79 14 36 3
-33 81 1 23 49 25 4 3 97 2 3 1
-33 80 1 3 49 28 4 1 97 2 4 2
-33 79 1 8 49 28 3 2 97 3 5 1
-33 78 1 13 49 28 3 3 97 3 5 1
-33 77 1 18 49 28 3 5 97 3 5 1
-33 76 1 23 49 28 2 5 97 8 14 1
-33 75 1 3 49 32 2 3 97 8 15 2
-33 74 1 8 49 32 4 3 97 11 20 2
-33 73 1 13 49 32 3 2 97 12 22 2
-33 72 1 18 49 32 3 3 97 12 22 2
-33 71 1 23 49 32 3 4 97 12 22 2
-33 70 1 3 50 12 3 2 98 9 15 1
-33 69 1 8 50 12 3 5 98 9 15 1
-33 68 1 13 50 12 4 1 98 14 25 2
-33 67 1 18 50 12 2 2 98 14 24 1
-33 66 1 23 50 12 2 5 98 14 24 1
-33 65 1 3 50 19 2 3 98 15 26 1
-33 64 1 8 50 19 2 5 98 15 26 1
-33 63 1 13 50 19 4 1 98 19 33 1
-33 62 1 18 50 19 3 1 98 20 34 1
-33 61 1 23 50 19 3 4 98 20 34 1
-33 60 1 3 50 27 3 3 99 17 30 1
-33 59 1 8 50 27 3 4 99 17 30 1
-33 58 1 13 50 27 2 5 99 18 31 1
-33 57 1 18 50 27 4 3 99 21 34 1
-33 56 1 23 50 27 1 5 99 19 32 1
-33 55 1 3 51 3 3 3 99 20 33 1
-33 54 1 8 51 3 2 1 100 17 30 2
-33 53 1 13 51 3 2 4 100 17 30 2
-33 52 1 18 51 3 1 2 100 18 32 2
-33 51 1 23 51 3 1 5 100 18 32 2
-33 50 1 15 51 11 3 3 100 19 34 2
-33 49 1 14 51 11 3 1 100 19 34 2
-33 48 1 13 51 11 2 2 100 20 36 2
-33 47 1 12 51 11 2 1 100 20 36 2
-33 46 1 11 51 11 1 1 101 17 30 1
-33 45 1 15 51 18 2 3 101 18 31 1
-33 44 1 14 51 18 4 4 101 23 35 1
-33 43 1 13 51 18 1 3 101 19 32 1
-33 42 1 12 51 18 3 5 101 20 33 1
-33 41 1 11 51 18 3 1 101 20 33 1
-33 40 1 15 52 3 3 3 102 17 29 1
-33 39 1 14 52 3 3 1 102 17 29 1
-33 38 1 13 52 3 4 2 102 18 30 1
-33 37 1 12 52 3 2 4 102 14 25 1
-33 36 1 11 52 3 2 1 102 14 25 1
-33 35 1 15 52 5 2 3 102 15 26 1
-33 34 1 14 52 5 4 5 102 16 27 1
-33 33 1 13 52 5 4 3 102 16 27 1
-33 32 1 12 52 5 3 5 102 12 21 1
-33 31 1 11 52 5 3 2 102 12 21 1
-33 30 1 15 52 9 3 5 103 9 16 1
-33 29 1 14 52 9 3 4 103 9 16 1
-33 28 1 13 52 9 3 2 103 9 16 1
-33 27 1 12 52 9 4 5 103 10 18 1
-33 26 1 11 52 9 2 1 103 5 9 2
-33 25 1 15 52 16 2 3 103 5 10 1
-33 24 1 14 52 16 3 5 103 2 4 2
-33 23 1 13 52 16 3 3 103 2 4 2
-33 22 1 12 52 16 3 1 103 2 4 2
-33 21 1 11 52 16 4 3 103 3 6 2
-33 20 1 15 52 23 4 4 103 3 5 1
-33 19 1 14 52 23 3 5 85 15 36 2
-33 18 1 13 52 23 3 4 85 15 36 2
-33 17 1 12 52 23 3 3 85 15 36 2
-33 16 1 11 52 23 2 1 85 15 35 1
-33 15 1 15 52 28 4 5 85 16 38 1
-33 14 1 14 52 28 2 3 85 11 28 3
-33 13 1 13 52 28 3 5 85 12 29 1
-33 12 1 12 52 28 3 4 85 12 29 1
-33 11 1 11 52 28 3 2 85 12 29 1
-33 10 1 15 52 29 3 4 85 8 19 2
-33 9 1 14 52 29 3 3 85 8 19 2
-33 8 1 13 52 29 3 2 85 8 19 2
-33 7 1 12 52 29 3 1 85 8 19 2
-33 6 1 11 52 29 2 1 85 4 7 1
-32 95 1 2 49 18 2 2 79 1 1 1
-32 94 1 7 49 18 2 5 79 1 1 1
-32 93 1 12 49 18 3 2 79 5 9 3
-32 92 1 17 49 18 1 3 79 5 10 1
-32 91 1 22 49 18 1 5 79 5 10 1
-32 90 1 2 49 21 3 1 79 9 22 2
-32 89 1 7 49 21 2 1 79 10 23 1
-32 88 1 12 49 21 2 2 79 10 23 1
-32 87 1 17 49 21 2 3 79 10 23 1
-32 86 1 22 49 21 2 5 79 10 23 1
-32 85 1 2 49 25 2 2 79 14 36 3
-32 84 1 7 49 25 2 3 79 14 36 3
-32 83 1 12 49 25 2 4 79 14 36 3
-32 82 1 17 49 25 1 4 79 15 37 1
-32 81 1 22 49 25 4 2 97 2 3 1
-32 80 1 2 49 28 3 1 97 3 5 1
-32 79 1 7 49 28 1 3 97 3 6 2
-32 78 1 12 49 28 1 5 97 3 6 2
-32 77 1 17 49 28 2 2 97 8 14 1
-32 76 1 22 49 28 2 4 97 8 14 1
-32 75 1 2 49 32 2 2 97 8 15 2
-32 74 1 7 49 32 2 5 97 8 15 2
-32 73 1 12 49 32 3 1 97 12 22 2
-32 72 1 17 49 32 1 3 98 9 16 2
-32 71 1 22 49 32 1 5 98 9 16 2
-32 70 1 2 50 12 3 1 98 9 15 1
-32 69 1 7 50 12 3 4 98 9 15 1
-32 68 1 12 50 12 1 4 98 10 18 2
-32 67 1 17 50 12 2 1 98 14 24 1
-32 66 1 22 50 12 2 4 98 14 24 1
-32 65 1 2 50 19 2 2 98 15 26 1
-32 64 1 7 50 19 2 4 98 15 26 1
-32 63 1 12 50 19 1 3 98 16 28 2
-32 62 1 17 50 19 1 5 98 16 28 2
-32 61 1 22 50 19 3 3 98 20 34 1
-32 60 1 2 50 27 3 2 99 17 30 1
-32 59 1 7 50 27 2 2 99 18 31 1
-32 58 1 12 50 27 2 4 99 18 31 1
-32 57 1 17 50 27 1 2 99 19 32 1
-32 56 1 22 50 27 1 4 99 19 32 1
-32 55 1 2 51 3 3 2 99 20 33 1
-32 54 1 7 51 3 3 5 99 20 33 1
-32 53 1 12 51 3 2 3 100 17 30 2
-32 52 1 17 51 3 2 5 100 17 30 2
-32 51 1 22 51 3 1 4 100 18 32 2
-32 50 1 10 51 11 3 4 100 19 34 2
-32 49 1 9 51 11 2 5 100 20 36 2
-32 48 1 8 51 11 2 3 100 20 36 2
-32 47 1 7 51 11 1 4 101 17 30 1
-32 46 1 6 51 11 1 2 101 17 30 1
-32 45 1 10 51 18 2 4 101 18 31 1
-32 44 1 9 51 18 2 1 101 18 31 1
-32 43 1 8 51 18 1 4 101 19 32 1
-32 42 1 7 51 18 1 1 101 19 32 1
-32 41 1 6 51 18 3 2 101 20 33 1
-32 40 1 10 52 3 3 4 102 17 29 1
-32 39 1 9 52 3 1 4 102 13 24 2
-32 38 1 8 52 3 1 2 102 13 24 2
-32 37 1 7 52 3 2 5 102 14 25 1
-32 36 1 6 52 3 2 2 102 14 25 1
-32 35 1 10 52 5 2 4 102 15 26 1
-32 34 1 9 52 5 2 1 102 15 26 1
-32 33 1 8 52 5 1 3 102 11 20 2
-32 32 1 7 52 5 1 1 102 11 20 2
-32 31 1 6 52 5 3 3 102 12 21 1
-32 30 1 10 52 9 1 4 102 12 22 2
-32 29 1 9 52 9 1 2 102 12 22 2
-32 28 1 8 52 9 3 3 103 9 16 1
-32 27 1 7 52 9 2 4 103 5 9 2
-32 26 1 6 52 9 2 2 103 5 9 2
-32 25 1 10 52 16 2 4 103 5 10 1
-32 24 1 9 52 16 2 1 103 5 10 1
-32 23 1 8 52 16 3 4 103 2 4 2
-32 22 1 7 52 16 1 3 103 2 3 1
-32 21 1 6 52 16 1 1 103 2 3 1
-32 20 1 10 52 23 4 5 103 3 5 1
-32 19 1 9 52 23 1 3 85 14 34 2
-32 18 1 8 52 23 2 5 85 15 35 1
-32 17 1 7 52 23 2 4 85 15 35 1
-32 16 1 6 52 23 2 2 85 15 35 1
-32 15 1 10 52 28 2 5 85 11 28 3
-32 14 1 9 52 28 2 4 85 11 28 3
-32 13 1 8 52 28 2 2 85 11 28 3
-32 12 1 7 52 28 2 1 85 11 28 3
-32 11 1 6 52 28 3 3 85 12 29 1
-32 10 1 10 52 29 3 5 85 8 19 2
-32 9 1 9 52 29 1 3 85 8 18 1
-32 8 1 8 52 29 1 1 85 8 18 1
-32 7 1 7 52 29 2 4 85 4 7 1
-32 6 1 6 52 29 2 2 85 4 7 1
-31 95 1 1 49 18 2 1 79 1 1 1
-31 94 1 6 49 18 2 4 79 1 1 1
-31 93 1 11 49 18 1 1 79 5 10 1
-31 92 1 16 49 18 1 2 79 5 10 1
-31 91 1 21 49 18 1 4 79 5 10 1
-31 90 1 1 49 21 1 1 79 10 24 2
-31 89 1 6 49 21 1 2 79 10 24 2
-31 88 1 11 49 21 1 3 79 10 24 2
-31 87 1 16 49 21 1 4 79 10 24 2
-31 86 1 21 49 21 1 5 79 10 24 2
-31 85 1 1 49 25 2 1 79 14 36 3
-31 84 1 6 49 25 1 1 79 15 37 1
-31 83 1 11 49 25 1 2 79 15 37 1
-31 82 1 16 49 25 1 3 79 15 37 1
-31 81 1 21 49 25 1 5 79 15 37 1
-31 80 1 1 49 28 1 1 97 3 6 2
-31 79 1 6 49 28 1 2 97 3 6 2
-31 78 1 11 49 28 1 4 97 3 6 2
-31 77 1 16 49 28 2 1 97 8 14 1
-31 76 1 21 49 28 2 3 97 8 14 1
-31 75 1 1 49 32 2 1 97 8 15 2
-31 74 1 6 49 32 2 4 97 8 15 2
-31 73 1 11 49 32 1 1 98 9 16 2
-31 72 1 16 49 32 1 2 98 9 16 2
-31 71 1 21 49 32 1 4 98 9 16 2
-31 70 1 1 50 12 1 1 98 10 18 2
-31 69 1 6 50 12 1 2 98 10 18 2
-31 68 1 11 50 12 1 3 98 10 18 2
-31 67 1 16 50 12 1 5 98 10 18 2
-31 66 1 21 50 12 2 3 98 14 24 1
-31 65 1 1 50 19 2 1 98 15 26 1
-31 64 1 6 50 19 1 1 98 16 28 2
-31 63 1 11 50 19 1 2 98 16 28 2
-31 62 1 16 50 19 1 4 98 16 28 2
-31 61 1 21 50 19 3 2 98 20 34 1
-31 60 1 1 50 27 3 1 99 17 30 1
-31 59 1 6 50 27 2 1 99 18 31 1
-31 58 1 11 50 27 2 3 99 18 31 1
-31 57 1 16 50 27 1 1 99 19 32 1
-31 56 1 21 50 27 1 3 99 19 32 1
-31 55 1 1 51 3 3 1 99 20 33 1
-31 54 1 6 51 3 3 4 99 20 33 1
-31 53 1 11 51 3 2 2 100 17 30 2
-31 52 1 16 51 3 1 1 100 18 32 2
-31 51 1 21 51 3 1 3 100 18 32 2
-31 50 1 5 51 11 3 5 100 19 34 2
-31 49 1 4 51 11 3 2 100 19 34 2
-31 48 1 3 51 11 2 4 100 20 36 2
-31 47 1 2 51 11 1 5 101 17 30 1
-31 46 1 1 51 11 1 3 101 17 30 1
-31 45 1 5 51 18 2 5 101 18 31 1
-31 44 1 4 51 18 2 2 101 18 31 1
-31 43 1 3 51 18 1 5 101 19 32 1
-31 42 1 2 51 18 1 2 101 19 32 1
-31 41 1 1 51 18 3 3 101 20 33 1
-31 40 1 5 52 3 3 5 102 17 29 1
-31 39 1 4 52 3 1 5 102 13 24 2
-31 38 1 3 52 3 1 3 102 13 24 2
-31 37 1 2 52 3 1 1 102 13 24 2
-31 36 1 1 52 3 2 3 102 14 25 1
-31 35 1 5 52 5 2 5 102 15 26 1
-31 34 1 4 52 5 1 5 102 11 20 2
-31 33 1 3 52 5 1 4 102 11 20 2
-31 32 1 2 52 5 1 2 102 11 20 2
-31 31 1 1 52 5 3 4 102 12 21 1
-31 30 1 5 52 9 1 5 102 12 22 2
-31 29 1 4 52 9 1 3 102 12 22 2
-31 28 1 3 52 9 1 1 102 12 22 2
-31 27 1 2 52 9 2 5 103 5 9 2
-31 26 1 1 52 9 2 3 103 5 9 2
-31 25 1 5 52 16 2 5 103 5 10 1
-31 24 1 4 52 16 2 2 103 5 10 1
-31 23 1 3 52 16 1 5 103 2 3 1
-31 22 1 2 52 16 1 4 103 2 3 1
-31 21 1 1 52 16 1 2 103 2 3 1
-31 20 1 5 52 23 1 5 85 14 34 2
-31 19 1 4 52 23 1 4 85 14 34 2
-31 18 1 3 52 23 1 2 85 14 34 2
-31 17 1 2 52 23 1 1 85 14 34 2
-31 16 1 1 52 23 2 3 85 15 35 1
-31 15 1 5 52 28 1 5 85 11 27 2
-31 14 1 4 52 28 1 4 85 11 27 2
-31 13 1 3 52 28 1 3 85 11 27 2
-31 12 1 2 52 28 1 2 85 11 27 2
-31 11 1 1 52 28 1 1 85 11 27 2
-31 10 1 5 52 29 1 5 85 8 18 1
-31 9 1 4 52 29 1 4 85 8 18 1
-31 8 1 3 52 29 1 2 85 8 18 1
-31 7 1 2 52 29 2 5 85 4 7 1
-31 6 1 1 52 29 2 3 85 4 7 1
-30 95 1 5 49 19 4 3 79 2 2 1
-30 94 1 10 49 19 4 5 79 2 2 1
-30 93 1 15 49 19 5 2 79 6 11 1
-30 92 1 20 49 19 5 4 79 6 11 1
-30 91 1 25 49 19 5 5 79 6 11 1
-30 90 1 5 49 22 4 3 79 6 12 2
-30 89 1 10 49 22 4 5 79 6 12 2
-30 88 1 15 49 22 5 2 79 10 25 3
-30 87 1 20 49 22 5 4 79 10 25 3
-30 86 1 25 49 22 5 5 79 10 25 3
-30 85 1 5 49 26 4 2 79 11 26 1
-30 84 1 10 49 26 4 4 79 11 26 1
-30 83 1 15 49 26 5 1 79 15 38 2
-30 82 1 20 49 26 5 3 79 15 38 2
-30 81 1 25 49 26 5 5 79 15 38 2
-30 80 1 5 49 29 5 1 97 4 7 1
-30 79 1 10 49 29 5 2 97 4 7 1
-30 78 1 15 49 29 5 3 97 4 7 1
-30 77 1 20 49 29 5 4 97 4 7 1
-30 76 1 25 49 29 5 5 97 4 7 1
-30 75 1 5 50 7 5 1 98 5 9 1
-30 74 1 10 50 7 5 2 98 5 9 1
-30 73 1 15 50 7 5 5 98 5 9 1
-30 72 1 20 50 7 4 3 98 6 11 2
-30 71 1 25 50 7 4 5 98 6 11 2
-30 70 1 5 50 13 4 3 98 10 17 1
-30 69 1 10 50 13 4 5 98 10 17 1
-30 68 1 15 50 13 5 2 98 11 20 2
-30 67 1 20 50 13 5 4 98 11 20 2
-30 66 1 25 50 13 5 5 98 11 20 2
-30 65 1 5 50 20 5 1 98 16 27 1
-30 64 1 10 50 20 5 3 98 16 27 1
-30 63 1 15 50 20 5 5 98 16 27 1
-30 62 1 20 50 20 4 3 99 13 23 1
-30 61 1 25 50 20 4 5 99 13 23 1
-30 60 1 5 50 28 5 2 99 14 25 2
-30 59 1 10 50 28 5 4 99 14 25 2
-30 58 1 15 50 28 5 5 99 14 25 2
-30 57 1 20 50 28 3 5 99 15 27 2
-30 56 1 25 50 28 4 5 99 16 28 1
-30 55 1 5 51 4 5 1 100 17 29 1
-30 54 1 10 51 4 5 3 100 17 29 1
-30 53 1 15 51 4 5 5 100 17 29 1
-30 52 1 20 51 4 4 3 100 18 31 1
-30 51 1 25 51 4 4 5 100 18 31 1
-30 50 1 25 51 12 4 4 100 19 33 1
-30 49 1 24 51 12 4 1 100 19 33 1
-30 48 1 23 51 12 5 4 100 20 35 1
-30 47 1 22 51 12 5 2 100 20 35 1
-30 46 1 21 51 12 5 1 100 20 35 1
-30 45 1 25 51 19 4 1 101 13 24 2
-30 44 1 24 51 19 3 3 101 14 26 2
-30 43 1 23 51 19 5 5 101 15 28 2
-30 42 1 22 51 19 5 3 101 15 28 2
-30 41 1 21 51 19 5 1 101 15 28 2
-30 40 1 25 51 25 4 4 101 16 29 1
-30 39 1 24 51 25 4 1 101 16 29 1
-30 38 1 23 51 25 5 4 102 13 23 1
-30 37 1 22 51 25 5 2 102 13 23 1
-30 36 1 21 51 25 5 1 102 13 23 1
-30 35 1 25 52 6 5 4 102 10 18 2
-30 34 1 24 52 6 5 2 102 10 18 2
-30 33 1 23 52 6 5 1 102 10 18 2
-30 32 1 22 52 6 4 4 102 11 19 1
-30 31 1 21 52 6 4 1 102 11 19 1
-30 30 1 25 52 10 5 5 102 8 14 2
-30 29 1 24 52 10 5 4 102 8 14 2
-30 28 1 23 52 10 5 3 102 8 14 2
-30 27 1 22 52 10 5 2 102 8 14 2
-30 26 1 21 52 10 5 1 102 8 14 2
-30 25 1 25 52 17 5 5 103 1 2 2
-30 24 1 24 52 17 5 4 103 1 2 2
-30 23 1 23 52 17 5 3 103 1 2 2
-30 22 1 22 52 17 5 2 103 1 2 2
-30 21 1 21 52 17 5 1 103 1 2 2
-30 20 1 25 52 24 5 4 85 14 33 1
-30 19 1 24 52 24 5 2 85 14 33 1
-30 18 1 23 52 24 5 1 85 14 33 1
-30 17 1 22 52 24 4 3 85 10 25 3
-30 16 1 21 52 24 4 1 85 10 25 3
-30 15 1 25 52 30 5 5 85 11 26 1
-30 14 1 24 52 30 5 3 85 11 26 1
-30 13 1 23 52 30 5 1 85 11 26 1
-30 12 1 22 52 30 4 4 85 7 16 2
-30 11 1 21 52 30 4 1 85 7 16 2
-30 10 1 25 52 31 5 4 85 7 17 3
-30 9 1 24 52 31 5 2 85 7 17 3
-30 8 1 23 52 31 5 1 85 7 17 3
-30 7 1 22 52 31 4 3 85 3 6 3
-30 6 1 21 52 31 4 1 85 3 6 3
-29 95 1 4 49 19 4 2 79 2 2 1
-29 94 1 9 49 19 4 4 79 2 2 1
-29 93 1 14 49 19 5 1 79 6 11 1
-29 92 1 19 49 19 5 3 79 6 11 1
-29 91 1 24 49 19 3 5 79 6 13 3
-29 90 1 4 49 22 4 2 79 6 12 2
-29 89 1 9 49 22 4 4 79 6 12 2
-29 88 1 14 49 22 5 1 79 10 25 3
-29 87 1 19 49 22 5 3 79 10 25 3
-29 86 1 24 49 22 3 5 79 11 27 2
-29 85 1 4 49 26 4 1 79 11 26 1
-29 84 1 9 49 26 4 3 79 11 26 1
-29 83 1 14 49 26 4 5 79 11 26 1
-29 82 1 19 49 26 5 2 79 15 38 2
-29 81 1 24 49 26 5 4 79 15 38 2
-29 80 1 4 49 29 3 4 79 16 39 1
-29 79 1 9 49 29 4 1 97 4 8 2
-29 78 1 14 49 29 4 3 97 4 8 2
-29 77 1 19 49 29 4 5 97 4 8 2
-29 76 1 24 49 29 2 5 98 1 1 1
-29 75 1 4 50 7 3 3 98 1 2 2
-29 74 1 9 50 7 3 5 98 1 2 2
-29 73 1 14 50 7 5 4 98 5 9 1
-29 72 1 19 50 7 4 2 98 6 11 2
-29 71 1 24 50 7 4 4 98 6 11 2
-29 70 1 4 50 13 4 2 98 10 17 1
-29 69 1 9 50 13 4 4 98 10 17 1
-29 68 1 14 50 13 5 1 98 11 20 2
-29 67 1 19 50 13 5 3 98 11 20 2
-29 66 1 24 50 13 3 5 98 11 19 1
-29 65 1 4 50 20 3 4 98 12 22 2
-29 64 1 9 50 20 5 2 98 16 27 1
-29 63 1 14 50 20 5 4 98 16 27 1
-29 62 1 19 50 20 4 2 99 13 23 1
-29 61 1 24 50 20 4 4 99 13 23 1
-29 60 1 4 50 28 5 1 99 14 25 2
-29 59 1 9 50 28 5 3 99 14 25 2
-29 58 1 14 50 28 3 2 99 15 27 2
-29 57 1 19 50 28 3 4 99 15 27 2
-29 56 1 24 50 28 4 4 99 16 28 1
-29 55 1 4 51 4 3 4 99 16 29 2
-29 54 1 9 51 4 5 2 100 17 29 1
-29 53 1 14 51 4 5 4 100 17 29 1
-29 52 1 19 51 4 4 2 100 18 31 1
-29 51 1 24 51 4 4 4 100 18 31 1
-29 50 1 20 51 12 4 5 100 19 33 1
-29 49 1 19 51 12 4 2 100 19 33 1
-29 48 1 18 51 12 5 5 100 20 35 1
-29 47 1 17 51 12 5 3 100 20 35 1
-29 46 1 16 51 12 3 1 101 13 23 1
-29 45 1 20 51 19 4 2 101 13 24 2
-29 44 1 19 51 19 3 4 101 14 26 2
-29 43 1 18 51 19 3 1 101 14 26 2
-29 42 1 17 51 19 5 4 101 15 28 2
-29 41 1 16 51 19 5 2 101 15 28 2
-29 40 1 20 51 25 4 5 101 16 29 1
-29 39 1 19 51 25 4 2 101 16 29 1
-29 38 1 18 51 25 5 5 102 13 23 1
-29 37 1 17 51 25 5 3 102 13 23 1
-29 36 1 16 51 25 3 1 102 9 15 1
-29 35 1 20 52 6 5 5 102 10 18 2
-29 34 1 19 52 6 5 3 102 10 18 2
-29 33 1 18 52 6 3 2 102 10 17 1
-29 32 1 17 52 6 4 5 102 11 19 1
-29 31 1 16 52 6 4 2 102 11 19 1
-29 30 1 20 52 10 4 5 102 8 13 1
-29 29 1 19 52 10 4 4 102 8 13 1
-29 28 1 18 52 10 4 3 102 8 13 1
-29 27 1 17 52 10 4 2 102 8 13 1
-29 26 1 16 52 10 4 1 102 8 13 1
-29 25 1 20 52 17 2 2 102 4 8 2
-29 24 1 19 52 17 4 4 103 1 1 1
-29 23 1 18 52 17 4 2 103 1 1 1
-29 22 1 17 52 17 4 1 103 1 1 1
-29 21 1 16 52 17 3 1 85 13 31 1
-29 20 1 20 52 24 5 5 85 14 33 1
-29 19 1 19 52 24 5 3 85 14 33 1
-29 18 1 18 52 24 4 5 85 10 25 3
-29 17 1 17 52 24 4 4 85 10 25 3
-29 16 1 16 52 24 4 2 85 10 25 3
-29 15 1 20 52 30 3 2 85 10 23 1
-29 14 1 19 52 30 5 4 85 11 26 1
-29 13 1 18 52 30 5 2 85 11 26 1
-29 12 1 17 52 30 4 5 85 7 16 2
-29 11 1 16 52 30 4 2 85 7 16 2
-29 10 1 20 52 31 5 5 85 7 17 3
-29 9 1 19 52 31 5 3 85 7 17 3
-29 8 1 18 52 31 3 1 85 7 15 1
-29 7 1 17 52 31 4 4 85 3 6 3
-29 6 1 16 52 31 4 2 85 3 6 3
-28 95 1 3 49 19 4 1 79 2 2 1
-28 94 1 8 49 19 2 3 79 2 3 2
-28 93 1 13 49 19 2 5 79 2 3 2
-28 92 1 18 49 19 3 2 79 6 13 3
-28 91 1 23 49 19 3 4 79 6 13 3
-28 90 1 3 49 22 4 1 79 6 12 2
-28 89 1 8 49 22 2 3 79 7 14 1
-28 88 1 13 49 22 2 5 79 7 14 1
-28 87 1 18 49 22 3 1 79 11 27 2
-28 86 1 23 49 22 3 4 79 11 27 2
-28 85 1 3 49 26 3 2 79 11 28 3
-28 84 1 8 49 26 3 4 79 11 28 3
-28 83 1 13 49 26 3 5 79 11 28 3
-28 82 1 18 49 26 2 2 79 16 40 2
-28 81 1 23 49 26 2 5 79 16 40 2
-28 80 1 3 49 29 3 3 79 16 39 1
-28 79 1 8 49 29 3 5 79 16 39 1
-28 78 1 13 49 29 4 2 97 4 8 2
-28 77 1 18 49 29 4 4 97 4 8 2
-28 76 1 23 49 29 2 4 98 1 1 1
-28 75 1 3 50 7 3 2 98 1 2 2
-28 74 1 8 50 7 3 4 98 1 2 2
-28 73 1 13 50 7 5 3 98 5 9 1
-28 72 1 18 50 7 4 1 98 6 11 2
-28 71 1 23 50 7 2 5 98 6 10 1
-28 70 1 3 50 13 4 1 98 10 17 1
-28 69 1 8 50 13 3 1 98 11 19 1
-28 68 1 13 50 13 3 2 98 11 19 1
-28 67 1 18 50 13 3 3 98 11 19 1
-28 66 1 23 50 13 3 4 98 11 19 1
-28 65 1 3 50 20 3 3 98 12 22 2
-28 64 1 8 50 20 3 5 98 12 22 2
-28 63 1 13 50 20 2 5 99 9 17 1
-28 62 1 18 50 20 4 1 99 13 23 1
-28 61 1 23 50 20 1 5 99 10 19 2
-28 60 1 3 50 28 2 3 99 14 24 1
-28 59 1 8 50 28 2 5 99 14 24 1
-28 58 1 13 50 28 3 1 99 15 27 2
-28 57 1 18 50 28 3 3 99 15 27 2
-28 56 1 23 50 28 4 3 99 16 28 1
-28 55 1 3 51 4 3 3 99 16 29 2
-28 54 1 8 51 4 3 5 99 16 29 2
-28 53 1 13 51 4 2 5 100 13 25 1
-28 52 1 18 51 4 4 1 100 18 31 1
-28 51 1 23 51 4 1 5 100 14 26 1
-28 50 1 15 51 12 2 3 100 15 27 1
-28 49 1 14 51 12 4 3 100 19 33 1
-28 48 1 13 51 12 1 3 100 16 28 1
-28 47 1 12 51 12 3 5 101 13 23 1
-28 46 1 11 51 12 3 2 101 13 23 1
-28 45 1 15 51 19 4 3 101 13 24 2
-28 44 1 14 51 19 3 5 101 14 26 2
-28 43 1 13 51 19 3 2 101 14 26 2
-28 42 1 12 51 19 2 4 101 15 27 1
-28 41 1 11 51 19 2 1 101 15 27 1
-28 40 1 15 51 25 2 3 101 11 21 2
-28 39 1 14 51 25 4 3 101 16 29 1
-28 38 1 13 51 25 1 3 101 12 22 1
-28 37 1 12 51 25 3 5 102 9 15 1
-28 36 1 11 51 25 3 2 102 9 15 1
-28 35 1 15 52 6 3 5 102 10 17 1
-28 34 1 14 52 6 3 4 102 10 17 1
-28 33 1 13 52 6 3 3 102 10 17 1
-28 32 1 12 52 6 3 1 102 10 17 1
-28 31 1 11 52 6 4 3 102 11 19 1
-28 30 1 15 52 10 3 3 102 7 12 1
-28 29 1 14 52 10 3 2 102 7 12 1
-28 28 1 13 52 10 3 1 102 7 12 1
-28 27 1 12 52 10 2 4 102 4 7 1
-28 26 1 11 52 10 2 1 102 4 7 1
-28 25 1 15 52 17 2 3 102 4 8 2
-28 24 1 14 52 17 4 5 103 1 1 1
-28 23 1 13 52 17 4 3 103 1 1 1
-28 22 1 12 52 17 3 5 85 13 31 1
-28 21 1 11 52 17 3 2 85 13 31 1
-28 20 1 15 52 24 2 3 85 13 32 2
-28 19 1 14 52 24 2 1 85 13 32 2
-28 18 1 13 52 24 3 5 85 10 24 2
-28 17 1 12 52 24 3 3 85 10 24 2
-28 16 1 11 52 24 3 1 85 10 24 2
-28 15 1 15 52 30 3 3 85 10 23 1
-28 14 1 14 52 30 3 1 85 10 23 1
-28 13 1 13 52 30 2 3 85 6 14 3
-28 12 1 12 52 30 2 1 85 6 14 3
-28 11 1 11 52 30 4 3 85 7 16 2
-28 10 1 15 52 31 3 4 85 7 15 1
-28 9 1 14 52 31 3 2 85 7 15 1
-28 8 1 13 52 31 4 5 85 3 6 3
-28 7 1 12 52 31 2 3 85 3 5 2
-28 6 1 11 52 31 2 1 85 3 5 2
-27 95 1 2 49 19 2 1 79 2 3 2
-27 94 1 7 49 19 2 2 79 2 3 2
-27 93 1 12 49 19 2 4 79 2 3 2
-27 92 1 17 49 19 3 1 79 6 13 3
-27 91 1 22 49 19 3 3 79 6 13 3
-27 90 1 2 49 22 2 1 79 7 14 1
-27 89 1 7 49 22 2 2 79 7 14 1
-27 88 1 12 49 22 2 4 79 7 14 1
-27 87 1 17 49 22 1 5 79 7 15 2
-27 86 1 22 49 22 3 3 79 11 27 2
-27 85 1 2 49 26 3 1 79 11 28 3
-27 84 1 7 49 26 3 3 79 11 28 3
-27 83 1 12 49 26 1 4 79 12 29 1
-27 82 1 17 49 26 2 1 79 16 40 2
-27 81 1 22 49 26 2 4 79 16 40 2
-27 80 1 2 49 29 3 2 79 16 39 1
-27 79 1 7 49 29 1 2 80 13 33 1
-27 78 1 12 49 29 1 4 80 13 33 1
-27 77 1 17 49 29 2 1 98 1 1 1
-27 76 1 22 49 29 2 3 98 1 1 1
-27 75 1 2 50 7 3 1 98 1 2 2
-27 74 1 7 50 7 1 3 98 2 4 2
-27 73 1 12 50 7 1 5 98 2 4 2
-27 72 1 17 50 7 2 2 98 6 10 1
-27 71 1 22 50 7 2 4 98 6 10 1
-27 70 1 2 50 13 1 2 98 7 13 2
-27 69 1 7 50 13 1 4 98 7 13 2
-27 68 1 12 50 13 2 1 98 12 21 1
-27 67 1 17 50 13 2 3 98 12 21 1
-27 66 1 22 50 13 2 5 98 12 21 1
-27 65 1 2 50 20 3 2 98 12 22 2
-27 64 1 7 50 20 2 2 99 9 17 1
-27 63 1 12 50 20 2 4 99 9 17 1
-27 62 1 17 50 20 1 2 99 10 19 2
-27 61 1 22 50 20 1 4 99 10 19 2
-27 60 1 2 50 28 2 2 99 14 24 1
-27 59 1 7 50 28 2 4 99 14 24 1
-27 58 1 12 50 28 1 3 99 15 26 1
-27 57 1 17 50 28 1 5 99 15 26 1
-27 56 1 22 50 28 4 2 99 16 28 1
-27 55 1 2 51 4 3 2 99 16 29 2
-27 54 1 7 51 4 2 2 100 13 25 1
-27 53 1 12 51 4 2 4 100 13 25 1
-27 52 1 17 51 4 1 2 100 14 26 1
-27 51 1 22 51 4 1 4 100 14 26 1
-27 50 1 10 51 12 2 4 100 15 27 1
-27 49 1 9 51 12 2 1 100 15 27 1
-27 48 1 8 51 12 1 4 100 16 28 1
-27 47 1 7 51 12 1 1 100 16 28 1
-27 46 1 6 51 12 3 3 101 13 23 1
-27 45 1 10 51 19 4 4 101 13 24 2
-27 44 1 9 51 19 1 4 101 14 25 1
-27 43 1 8 51 19 1 2 101 14 25 1
-27 42 1 7 51 19 2 5 101 15 27 1
-27 41 1 6 51 19 2 2 101 15 27 1
-27 40 1 10 51 25 2 4 101 11 21 2
-27 39 1 9 51 25 2 1 101 11 21 2
-27 38 1 8 51 25 1 4 101 12 22 1
-27 37 1 7 51 25 1 1 101 12 22 1
-27 36 1 6 51 25 3 3 102 9 15 1
-27 35 1 10 52 6 2 4 102 9 16 2
-27 34 1 9 52 6 2 2 102 9 16 2
-27 33 1 8 52 6 2 1 102 9 16 2
-27 32 1 7 52 6 1 3 102 6 11 2
-27 31 1 6 52 6 1 1 102 6 11 2
-27 30 1 10 52 10 3 4 102 7 12 1
-27 29 1 9 52 10 1 4 102 3 6 2
-27 28 1 8 52 10 1 2 102 3 6 2
-27 27 1 7 52 10 2 5 102 4 7 1
-27 26 1 6 52 10 2 2 102 4 7 1
-27 25 1 10 52 17 2 4 102 4 8 2
-27 24 1 9 52 17 2 1 102 4 8 2
-27 23 1 8 52 17 1 3 84 16 41 3
-27 22 1 7 52 17 1 1 84 16 41 3
-27 21 1 6 52 17 3 3 85 13 31 1
-27 20 1 10 52 24 2 4 85 13 32 2
-27 19 1 9 52 24 2 2 85 13 32 2
-27 18 1 8 52 24 1 3 85 9 22 2
-27 17 1 7 52 24 3 4 85 10 24 2
-27 16 1 6 52 24 3 2 85 10 24 2
-27 15 1 10 52 30 3 4 85 10 23 1
-27 14 1 9 52 30 2 5 85 6 14 3
-27 13 1 8 52 30 2 4 85 6 14 3
-27 12 1 7 52 30 2 2 85 6 14 3
-27 11 1 6 52 30 1 1 85 6 13 2
-27 10 1 10 52 31 3 5 85 7 15 1
-27 9 1 9 52 31 3 3 85 7 15 1
-27 8 1 8 52 31 2 5 85 3 5 2
-27 7 1 7 52 31 2 4 85 3 5 2
-27 6 1 6 52 31 2 2 85 3 5 2
-26 95 1 1 49 19 1 1 79 2 4 3
-26 94 1 6 49 19 1 2 79 2 4 3
-26 93 1 11 49 19 1 3 79 2 4 3
-26 92 1 16 49 19 1 4 79 2 4 3
-26 91 1 21 49 19 1 5 79 2 4 3
-26 90 1 1 49 22 1 1 79 7 15 2
-26 89 1 6 49 22 1 2 79 7 15 2
-26 88 1 11 49 22 1 3 79 7 15 2
-26 87 1 16 49 22 1 4 79 7 15 2
-26 86 1 21 49 22 3 2 79 11 27 2
-26 85 1 1 49 26 1 1 79 12 29 1
-26 84 1 6 49 26 1 2 79 12 29 1
-26 83 1 11 49 26 1 3 79 12 29 1
-26 82 1 16 49 26 1 5 79 12 29 1
-26 81 1 21 49 26 2 3 79 16 40 2
-26 80 1 1 49 29 3 1 79 16 39 1
-26 79 1 6 49 29 1 1 80 13 33 1
-26 78 1 11 49 29 1 3 80 13 33 1
-26 77 1 16 49 29 1 5 80 13 33 1
-26 76 1 21 49 29 2 2 98 1 1 1
-26 75 1 1 50 7 1 1 98 2 4 2
-26 74 1 6 50 7 1 2 98 2 4 2
-26 73 1 11 50 7 1 4 98 2 4 2
-26 72 1 16 50 7 2 1 98 6 10 1
-26 71 1 21 50 7 2 3 98 6 10 1
-26 70 1 1 50 13 1 1 98 7 13 2
-26 69 1 6 50 13 1 3 98 7 13 2
-26 68 1 11 50 13 1 5 98 7 13 2
-26 67 1 16 50 13 2 2 98 12 21 1
-26 66 1 21 50 13 2 4 98 12 21 1
-26 65 1 1 50 20 3 1 98 12 22 2
-26 64 1 6 50 20 2 1 99 9 17 1
-26 63 1 11 50 20 2 3 99 9 17 1
-26 62 1 16 50 20 1 1 99 10 19 2
-26 61 1 21 50 20 1 3 99 10 19 2
-26 60 1 1 50 28 2 1 99 14 24 1
-26 59 1 6 50 28 1 1 99 15 26 1
-26 58 1 11 50 28 1 2 99 15 26 1
-26 57 1 16 50 28 1 4 99 15 26 1
-26 56 1 21 50 28 4 1 99 16 28 1
-26 55 1 1 51 4 3 1 99 16 29 2
-26 54 1 6 51 4 2 1 100 13 25 1
-26 53 1 11 51 4 2 3 100 13 25 1
-26 52 1 16 51 4 1 1 100 14 26 1
-26 51 1 21 51 4 1 3 100 14 26 1
-26 50 1 5 51 12 2 5 100 15 27 1
-26 49 1 4 51 12 2 2 100 15 27 1
-26 48 1 3 51 12 1 5 100 16 28 1
-26 47 1 2 51 12 1 2 100 16 28 1
-26 46 1 1 51 12 3 4 101 13 23 1
-26 45 1 5 51 19 4 5 101 13 24 2
-26 44 1 4 51 19 1 5 101 14 25 1
-26 43 1 3 51 19 1 3 101 14 25 1
-26 42 1 2 51 19 1 1 101 14 25 1
-26 41 1 1 51 19 2 3 101 15 27 1
-26 40 1 5 51 25 2 5 101 11 21 2
-26 39 1 4 51 25 2 2 101 11 21 2
-26 38 1 3 51 25 1 5 101 12 22 1
-26 37 1 2 51 25 1 2 101 12 22 1
-26 36 1 1 51 25 3 4 102 9 15 1
-26 35 1 5 52 6 2 5 102 9 16 2
-26 34 1 4 52 6 2 3 102 9 16 2
-26 33 1 3 52 6 1 5 102 6 11 2
-26 32 1 2 52 6 1 4 102 6 11 2
-26 31 1 1 52 6 1 2 102 6 11 2
-26 30 1 5 52 10 3 5 102 7 12 1
-26 29 1 4 52 10 1 5 102 3 6 2
-26 28 1 3 52 10 1 3 102 3 6 2
-26 27 1 2 52 10 1 1 102 3 6 2
-26 26 1 1 52 10 2 3 102 4 7 1
-26 25 1 5 52 17 2 5 102 4 8 2
-26 24 1 4 52 17 1 5 84 16 41 3
-26 23 1 3 52 17 1 4 84 16 41 3
-26 22 1 2 52 17 1 2 84 16 41 3
-26 21 1 1 52 17 3 4 85 13 31 1
-26 20 1 5 52 24 2 5 85 13 32 2
-26 19 1 4 52 24 1 5 85 9 22 2
-26 18 1 3 52 24 1 4 85 9 22 2
-26 17 1 2 52 24 1 2 85 9 22 2
-26 16 1 1 52 24 1 1 85 9 22 2
-26 15 1 5 52 30 3 5 85 10 23 1
-26 14 1 4 52 30 1 5 85 6 13 2
-26 13 1 3 52 30 1 4 85 6 13 2
-26 12 1 2 52 30 1 3 85 6 13 2
-26 11 1 1 52 30 1 2 85 6 13 2
-26 10 1 5 52 31 1 5 85 3 4 1
-26 9 1 4 52 31 1 4 85 3 4 1
-26 8 1 3 52 31 1 3 85 3 4 1
-26 7 1 2 52 31 1 2 85 3 4 1
-26 6 1 1 52 31 1 1 85 3 4 1
-25 92 1 20 49 30 4 3 79 3 5 1
-25 91 1 25 49 30 4 5 79 3 5 1
-25 90 1 5 49 23 5 2 79 7 16 3
-25 89 1 10 49 23 5 4 79 7 16 3
-25 88 1 15 49 23 5 5 79 7 16 3
-25 87 1 20 49 23 4 3 79 8 17 1
-25 86 1 25 49 23 4 5 79 8 17 1
-25 85 1 5 50 1 5 1 79 12 30 2
-25 84 1 10 50 1 5 3 79 12 30 2
-25 83 1 15 50 1 5 5 79 12 30 2
-25 82 1 20 50 1 4 3 80 9 22 1
-25 81 1 25 50 1 4 5 80 9 22 1
-25 80 1 5 50 4 5 1 80 13 34 2
-25 79 1 10 50 4 5 3 80 13 34 2
-25 78 1 15 50 4 5 5 80 13 34 2
-25 77 1 20 50 4 4 3 80 14 37 3
-25 76 1 25 50 4 4 5 80 14 37 3
-25 75 1 5 50 8 5 1 98 2 3 1
-25 74 1 10 50 8 5 3 98 2 3 1
-25 73 1 15 50 8 5 4 98 2 3 1
-25 72 1 20 50 8 5 5 98 2 3 1
-25 71 1 25 50 8 4 5 98 3 6 2
-25 70 1 5 50 14 5 2 98 7 12 1
-25 69 1 10 50 14 5 4 98 7 12 1
-25 68 1 15 50 14 5 5 98 7 12 1
-25 67 1 20 50 14 4 2 98 8 14 1
-25 66 1 25 50 14 4 5 98 8 14 1
-25 65 1 5 50 21 4 2 99 5 11 2
-25 64 1 10 50 21 4 4 99 5 11 2
-25 63 1 15 50 21 5 1 99 10 18 1
-25 62 1 20 50 21 5 3 99 10 18 1
-25 61 1 25 50 21 5 5 99 10 18 1
-25 60 1 5 50 29 5 2 99 11 21 2
-25 59 1 10 50 29 5 3 99 11 21 2
-25 58 1 15 50 29 5 4 99 11 21 2
-25 57 1 20 50 29 5 5 99 11 21 2
-25 56 1 25 50 29 4 5 99 12 22 1
-25 55 1 5 51 5 5 2 100 9 20 2
-25 54 1 10 51 5 5 3 100 9 20 2
-25 53 1 15 51 5 5 4 100 9 20 2
-25 52 1 20 51 5 5 5 100 9 20 2
-25 51 1 25 51 5 4 5 100 10 21 1
-25 50 1 25 51 13 4 3 100 11 22 1
-25 49 1 24 51 13 5 5 100 12 24 2
-25 48 1 23 51 13 5 3 100 12 24 2
-25 47 1 22 51 13 5 2 100 12 24 2
-25 46 1 21 51 13 5 1 100 12 24 2
-25 45 1 25 51 20 4 3 101 9 17 1
-25 44 1 24 51 20 5 5 101 10 19 2
-25 43 1 23 51 20 5 3 101 10 19 2
-25 42 1 22 51 20 5 2 101 10 19 2
-25 41 1 21 51 20 5 1 101 10 19 2
-25 40 1 25 51 26 5 4 101 11 20 1
-25 39 1 24 51 26 5 2 101 11 20 1
-25 38 1 23 51 26 5 1 101 11 20 1
-25 37 1 22 51 26 4 3 101 8 16 2
-25 36 1 21 51 26 4 1 101 8 16 2
-25 35 1 25 52 7 4 3 102 5 9 1
-25 34 1 24 52 7 4 1 102 5 9 1
-25 33 1 23 52 7 5 5 102 6 10 1
-25 32 1 22 52 7 5 3 102 6 10 1
-25 31 1 21 52 7 5 1 102 6 10 1
-25 30 1 25 52 11 4 3 102 2 4 2
-25 29 1 24 52 11 5 5 102 3 5 1
-25 28 1 23 52 11 5 4 102 3 5 1
-25 27 1 22 52 11 5 2 102 3 5 1
-25 26 1 21 52 11 5 1 102 3 5 1
-25 25 1 25 52 18 5 5 84 16 40 2
-25 24 1 24 52 18 5 4 84 16 40 2
-25 23 1 23 52 18 5 3 84 16 40 2
-25 22 1 22 52 18 5 2 84 16 40 2
-25 21 1 21 52 18 5 1 84 16 40 2
-25 20 1 25 52 25 4 3 84 12 32 3
-25 19 1 24 52 25 4 1 84 12 32 3
-25 18 1 23 52 25 5 4 85 9 21 1
-25 17 1 22 52 25 5 2 85 9 21 1
-25 16 1 21 52 25 5 1 85 9 21 1
-25 15 1 25 52 27 4 4 85 5 11 2
-25 14 1 24 52 27 4 2 85 5 11 2
-25 13 1 23 52 27 5 5 85 6 12 1
-25 12 1 22 52 27 5 3 85 6 12 1
-25 11 1 21 52 27 5 1 85 6 12 1
-25 10 1 25 52 21 5 4 85 2 3 1
-25 9 1 24 52 21 5 1 85 2 3 1
-24 92 1 19 49 30 4 2 79 3 5 1
-24 91 1 24 49 30 4 4 79 3 5 1
-24 90 1 4 49 23 5 1 79 7 16 3
-24 89 1 9 49 23 5 3 79 7 16 3
-24 88 1 14 49 23 4 1 79 8 17 1
-24 87 1 19 49 23 4 2 79 8 17 1
-24 86 1 24 49 23 4 4 79 8 17 1
-24 85 1 4 50 1 3 3 79 8 18 2
-24 84 1 9 50 1 5 2 79 12 30 2
-24 83 1 14 50 1 5 4 79 12 30 2
-24 82 1 19 50 1 4 2 80 9 22 1
-24 81 1 24 50 1 4 4 80 9 22 1
-24 80 1 4 50 4 3 3 80 9 23 2
-24 79 1 9 50 4 5 2 80 13 34 2
-24 78 1 14 50 4 5 4 80 13 34 2
-24 77 1 19 50 4 4 2 80 14 37 3
-24 76 1 24 50 4 4 4 80 14 37 3
-24 75 1 4 50 8 3 3 80 14 36 2
-24 74 1 9 50 8 5 2 98 2 3 1
-24 73 1 14 50 8 4 2 98 3 6 2
-24 72 1 19 50 8 4 3 98 3 6 2
-24 71 1 24 50 8 4 4 98 3 6 2
-24 70 1 4 50 14 5 1 98 7 12 1
-24 69 1 9 50 14 5 3 98 7 12 1
-24 68 1 14 50 14 3 4 98 4 8 2
-24 67 1 19 50 14 4 1 98 8 14 1
-24 66 1 24 50 14 4 4 98 8 14 1
-24 65 1 4 50 21 4 1 99 5 11 2
-24 64 1 9 50 21 4 3 99 5 11 2
-24 63 1 14 50 21 4 5 99 5 11 2
-24 62 1 19 50 21 5 2 99 10 18 1
-24 61 1 24 50 21 5 4 99 10 18 1
-24 60 1 4 50 29 5 1 99 11 21 2
-24 59 1 9 50 29 3 3 99 11 20 1
-24 58 1 14 50 29 3 5 99 11 20 1
-24 57 1 19 50 29 4 2 99 12 22 1
-24 56 1 24 50 29 4 4 99 12 22 1
-24 55 1 4 51 5 5 1 100 9 20 2
-24 54 1 9 51 5 3 3 100 9 19 1
-24 53 1 14 51 5 3 5 100 9 19 1
-24 52 1 19 51 5 4 2 100 10 21 1
-24 51 1 24 51 5 4 4 100 10 21 1
-24 50 1 20 51 13 4 4 100 11 22 1
-24 49 1 19 51 13 4 1 100 11 22 1
-24 48 1 18 51 13 5 4 100 12 24 2
-24 47 1 17 51 13 3 3 100 12 23 1
-24 46 1 16 51 13 3 1 100 12 23 1
-24 45 1 20 51 20 4 4 101 9 17 1
-24 44 1 19 51 20 4 1 101 9 17 1
-24 43 1 18 51 20 5 4 101 10 19 2
-24 42 1 17 51 20 3 3 101 10 18 1
-24 41 1 16 51 20 3 1 101 10 18 1
-24 40 1 20 51 26 5 5 101 11 20 1
-24 39 1 19 51 26 5 3 101 11 20 1
-24 38 1 18 51 26 4 5 101 8 16 2
-24 37 1 17 51 26 4 4 101 8 16 2
-24 36 1 16 51 26 4 2 101 8 16 2
-24 35 1 20 52 7 4 4 102 5 9 1
-24 34 1 19 52 7 4 2 102 5 9 1
-24 33 1 18 52 7 3 3 102 1 2 2
-24 32 1 17 52 7 5 4 102 6 10 1
-24 31 1 16 52 7 5 2 102 6 10 1
-24 30 1 20 52 11 4 4 102 2 4 2
-24 29 1 19 52 11 4 2 102 2 4 2
-24 28 1 18 52 11 4 1 102 2 4 2
-24 27 1 17 52 11 5 3 102 3 5 1
-24 26 1 16 52 11 3 1 84 15 38 2
-24 25 1 20 52 18 4 5 84 16 39 1
-24 24 1 19 52 18 4 4 84 16 39 1
-24 23 1 18 52 18 4 2 84 16 39 1
-24 22 1 17 52 18 4 1 84 16 39 1
-24 21 1 16 52 18 3 1 84 12 30 1
-24 20 1 20 52 25 4 4 84 12 32 3
-24 19 1 19 52 25 4 2 84 12 32 3
-24 18 1 18 52 25 5 5 85 9 21 1
-24 17 1 17 52 25 5 3 85 9 21 1
-24 16 1 16 52 25 3 1 85 5 9 4
-24 15 1 20 52 27 4 5 85 5 11 2
-24 14 1 19 52 27 4 3 85 5 11 2
-24 13 1 18 52 27 4 1 85 5 11 2
-24 12 1 17 52 27 5 4 85 6 12 1
-24 11 1 16 52 27 5 2 85 6 12 1
-24 10 1 20 52 21 5 5 85 2 3 1
-24 9 1 19 52 21 5 2 85 2 3 1
-23 92 1 18 49 30 4 1 79 3 5 1
-23 91 1 23 49 30 3 5 79 4 6 1
-23 90 1 3 49 23 1 3 79 4 7 2
-23 89 1 8 49 23 3 2 79 8 19 3
-23 88 1 13 49 23 3 3 79 8 19 3
-23 87 1 18 49 23 3 4 79 8 19 3
-23 86 1 23 49 23 3 5 79 8 19 3
-23 85 1 3 50 1 3 2 79 8 18 2
-23 84 1 8 50 1 3 5 79 8 18 2
-23 83 1 13 50 1 4 1 80 9 22 1
-23 82 1 18 50 1 2 2 80 9 24 3
-23 81 1 23 50 1 2 5 80 9 24 3
-23 80 1 3 50 4 3 2 80 9 23 2
-23 79 1 8 50 4 3 5 80 9 23 2
-23 78 1 13 50 4 4 1 80 14 37 3
-23 77 1 18 50 4 2 2 80 14 35 1
-23 76 1 23 50 4 2 5 80 14 35 1
-23 75 1 3 50 8 3 2 80 14 36 2
-23 74 1 8 50 8 3 5 80 14 36 2
-23 73 1 13 50 8 4 1 98 3 6 2
-23 72 1 18 50 8 2 2 98 3 5 1
-23 71 1 23 50 8 2 5 98 3 5 1
-23 70 1 3 50 14 3 1 98 4 8 2
-23 69 1 8 50 14 3 2 98 4 8 2
-23 68 1 13 50 14 3 3 98 4 8 2
-23 67 1 18 50 14 3 5 98 4 8 2
-23 66 1 23 50 14 4 3 98 8 14 1
-23 65 1 3 50 21 2 3 99 5 10 1
-23 64 1 8 50 21 2 5 99 5 10 1
-23 63 1 13 50 21 3 2 99 6 13 2
-23 62 1 18 50 21 3 4 99 6 13 2
-23 61 1 23 50 21 3 5 99 6 13 2
-23 60 1 3 50 29 3 1 99 11 20 1
-23 59 1 8 50 29 3 2 99 11 20 1
-23 58 1 13 50 29 3 4 99 11 20 1
-23 57 1 18 50 29 4 1 99 12 22 1
-23 56 1 23 50 29 4 3 99 12 22 1
-23 55 1 3 51 5 3 1 100 9 19 1
-23 54 1 8 51 5 3 2 100 9 19 1
-23 53 1 13 51 5 3 4 100 9 19 1
-23 52 1 18 51 5 4 1 100 10 21 1
-23 51 1 23 51 5 4 3 100 10 21 1
-23 50 1 15 51 13 4 5 100 11 22 1
-23 49 1 14 51 13 4 2 100 11 22 1
-23 48 1 13 51 13 3 5 100 12 23 1
-23 47 1 12 51 13 3 4 100 12 23 1
-23 46 1 11 51 13 3 2 100 12 23 1
-23 45 1 15 51 20 4 5 101 9 17 1
-23 44 1 14 51 20 4 2 101 9 17 1
-23 43 1 13 51 20 3 5 101 10 18 1
-23 42 1 12 51 20 3 4 101 10 18 1
-23 41 1 11 51 20 3 2 101 10 18 1
-23 40 1 15 51 26 3 4 101 7 14 2
-23 39 1 14 51 26 3 2 101 7 14 2
-23 38 1 13 51 26 3 1 101 7 14 2
-23 37 1 12 51 26 2 4 101 8 15 1
-23 36 1 11 51 26 2 1 101 8 15 1
-23 35 1 15 52 7 4 5 102 5 9 1
-23 34 1 14 52 7 3 5 102 1 2 2
-23 33 1 13 52 7 3 4 102 1 2 2
-23 32 1 12 52 7 3 2 102 1 2 2
-23 31 1 11 52 7 3 1 102 1 2 2
-23 30 1 15 52 11 4 5 102 2 4 2
-23 29 1 14 52 11 2 2 102 2 3 1
-23 28 1 13 52 11 2 1 102 2 3 1
-23 27 1 12 52 11 3 4 84 15 38 2
-23 26 1 11 52 11 3 2 84 15 38 2
-23 25 1 15 52 18 2 3 84 15 37 1
-23 24 1 14 52 18 2 1 84 15 37 1
-23 23 1 13 52 18 4 3 84 16 39 1
-23 22 1 12 52 18 3 5 84 12 30 1
-23 21 1 11 52 18 3 2 84 12 30 1
-23 20 1 15 52 25 4 5 84 12 32 3
-23 19 1 14 52 25 2 2 84 12 31 2
-23 18 1 13 52 25 2 1 84 12 31 2
-23 17 1 12 52 25 3 4 85 5 9 4
-23 16 1 11 52 25 3 2 85 5 9 4
-23 15 1 15 52 27 3 4 85 5 10 1
-23 14 1 14 52 27 3 3 85 5 10 1
-23 13 1 13 52 27 3 2 85 5 10 1
-23 12 1 12 52 27 3 1 85 5 10 1
-23 11 1 11 52 27 1 1 85 1 1 1
-23 10 1 15 52 21 4 3 85 1 2 2
-23 9 1 14 52 21 5 3 85 2 3 1
-22 92 1 17 49 30 3 2 79 4 6 1
-22 91 1 22 49 30 3 4 79 4 6 1
-22 90 1 2 49 23 1 2 79 4 7 2
-22 89 1 7 49 23 3 1 79 8 19 3
-22 88 1 12 49 23 2 1 79 8 20 4
-22 87 1 17 49 23 2 3 79 8 20 4
-22 86 1 22 49 23 2 5 79 8 20 4
-22 85 1 2 50 1 3 1 79 8 18 2
-22 84 1 7 50 1 3 4 79 8 18 2
-22 83 1 12 50 1 1 4 80 5 6 2
-22 82 1 17 50 1 2 1 80 9 24 3
-22 81 1 22 50 1 2 4 80 9 24 3
-22 80 1 2 50 4 3 1 80 9 23 2
-22 79 1 7 50 4 3 4 80 9 23 2
-22 78 1 12 50 4 1 4 80 10 27 3
-22 77 1 17 50 4 2 1 80 14 35 1
-22 76 1 22 50 4 2 4 80 14 35 1
-22 75 1 2 50 8 3 1 80 14 36 2
-22 74 1 7 50 8 3 4 80 14 36 2
-22 73 1 12 50 8 1 4 80 15 39 2
-22 72 1 17 50 8 2 1 98 3 5 1
-22 71 1 22 50 8 2 4 98 3 5 1
-22 70 1 2 50 14 2 2 98 4 7 1
-22 69 1 7 50 14 2 4 98 4 7 1
-22 68 1 12 50 14 2 5 98 4 7 1
-22 67 1 17 50 14 1 3 99 1 2 2
-22 66 1 22 50 14 1 5 99 1 2 2
-22 65 1 2 50 21 2 2 99 5 10 1
-22 64 1 7 50 21 2 4 99 5 10 1
-22 63 1 12 50 21 3 1 99 6 13 2
-22 62 1 17 50 21 3 3 99 6 13 2
-22 61 1 22 50 21 1 5 99 6 12 1
-22 60 1 2 50 29 2 2 99 7 14 1
-22 59 1 7 50 29 2 4 99 7 14 1
-22 58 1 12 50 29 2 5 99 7 14 1
-22 57 1 17 50 29 1 3 99 8 16 2
-22 56 1 22 50 29 1 5 99 8 16 2
-22 55 1 2 51 5 2 2 100 5 10 1
-22 54 1 7 51 5 2 4 100 5 10 1
-22 53 1 12 51 5 2 5 100 5 10 1
-22 52 1 17 51 5 1 3 100 6 13 3
-22 51 1 22 51 5 1 5 100 6 13 3
-22 50 1 10 51 13 1 4 100 7 16 3
-22 49 1 9 51 13 1 2 100 7 16 3
-22 48 1 8 51 13 2 5 100 8 18 2
-22 47 1 7 51 13 2 3 100 8 18 2
-22 46 1 6 51 13 2 1 100 8 18 2
-22 45 1 10 51 20 1 4 101 5 11 2
-22 44 1 9 51 20 1 2 101 5 11 2
-22 43 1 8 51 20 2 5 101 6 12 1
-22 42 1 7 51 20 2 3 101 6 12 1
-22 41 1 6 51 20 2 1 101 6 12 1
-22 40 1 10 51 26 3 5 101 7 14 2
-22 39 1 9 51 26 3 3 101 7 14 2
-22 38 1 8 51 26 1 2 101 7 13 1
-22 37 1 7 51 26 2 5 101 8 15 1
-22 36 1 6 51 26 2 2 101 8 15 1
-22 35 1 10 52 7 1 4 101 4 9 2
-22 34 1 9 52 7 1 2 101 4 9 2
-22 33 1 8 52 7 2 5 102 1 1 1
-22 32 1 7 52 7 2 3 102 1 1 1
-22 31 1 6 52 7 2 1 102 1 1 1
-22 30 1 10 52 11 2 4 102 2 3 1
-22 29 1 9 52 11 2 3 102 2 3 1
-22 28 1 8 52 11 1 3 84 14 36 2
-22 27 1 7 52 11 3 5 84 15 38 2
-22 26 1 6 52 11 3 3 84 15 38 2
-22 25 1 10 52 18 2 4 84 15 37 1
-22 24 1 9 52 18 2 2 84 15 37 1
-22 23 1 8 52 18 1 3 84 11 29 3
-22 22 1 7 52 18 1 1 84 11 29 3
-22 21 1 6 52 18 3 3 84 12 30 1
-22 20 1 10 52 25 2 4 84 12 31 2
-22 19 1 9 52 25 2 3 84 12 31 2
-22 18 1 8 52 25 1 3 84 8 21 4
-22 17 1 7 52 25 3 5 85 5 9 4
-22 16 1 6 52 25 3 3 85 5 9 4
-22 15 1 10 52 27 3 5 85 5 10 1
-22 14 1 9 52 27 2 3 85 5 8 3
-22 13 1 8 52 27 2 2 85 5 8 3
-22 12 1 7 52 27 2 1 85 5 8 3
-22 11 1 6 52 27 1 2 85 1 1 1
-22 10 1 10 52 21 4 4 85 1 2 2
-22 9 1 9 52 21 4 1 85 1 2 2
-21 92 1 16 49 30 3 1 79 4 6 1
-21 91 1 21 49 30 3 3 79 4 6 1
-21 90 1 1 49 23 1 1 79 4 7 2
-21 89 1 6 49 23 1 4 79 4 7 2
-21 88 1 11 49 23 1 5 79 4 7 2
-21 87 1 16 49 23 2 2 79 8 20 4
-21 86 1 21 49 23 2 4 79 8 20 4
-21 85 1 1 50 1 1 1 80 5 6 2
-21 84 1 6 50 1 1 2 80 5 6 2
-21 83 1 11 50 1 1 3 80 5 6 2
-21 82 1 16 50 1 1 5 80 5 6 2
-21 81 1 21 50 1 2 3 80 9 24 3
-21 80 1 1 50 4 1 1 80 10 27 3
-21 79 1 6 50 4 1 2 80 10 27 3
-21 78 1 11 50 4 1 3 80 10 27 3
-21 77 1 16 50 4 1 5 80 10 27 3
-21 76 1 21 50 4 2 3 80 14 35 1
-21 75 1 1 50 8 1 1 80 15 39 2
-21 74 1 6 50 8 1 2 80 15 39 2
-21 73 1 11 50 8 1 3 80 15 39 2
-21 72 1 16 50 8 1 5 80 15 39 2
-21 71 1 21 50 8 2 3 98 3 5 1
-21 70 1 1 50 14 2 1 98 4 7 1
-21 69 1 6 50 14 2 3 98 4 7 1
-21 68 1 11 50 14 1 1 99 1 2 2
-21 67 1 16 50 14 1 2 99 1 2 2
-21 66 1 21 50 14 1 4 99 1 2 2
-21 65 1 1 50 21 2 1 99 5 10 1
-21 64 1 6 50 21 1 1 99 6 12 1
-21 63 1 11 50 21 1 2 99 6 12 1
-21 62 1 16 50 21 1 3 99 6 12 1
-21 61 1 21 50 21 1 4 99 6 12 1
-21 60 1 1 50 29 2 1 99 7 14 1
-21 59 1 6 50 29 2 3 99 7 14 1
-21 58 1 11 50 29 1 1 99 8 16 2
-21 57 1 16 50 29 1 2 99 8 16 2
-21 56 1 21 50 29 1 4 99 8 16 2
-21 55 1 1 51 5 2 1 100 5 10 1
-21 54 1 6 51 5 2 3 100 5 10 1
-21 53 1 11 51 5 1 1 100 6 13 3
-21 52 1 16 51 5 1 2 100 6 13 3
-21 51 1 21 51 5 1 4 100 6 13 3
-21 50 1 5 51 13 1 5 100 7 16 3
-21 49 1 4 51 13 1 3 100 7 16 3
-21 48 1 3 51 13 1 1 100 7 16 3
-21 47 1 2 51 13 2 4 100 8 18 2
-21 46 1 1 51 13 2 2 100 8 18 2
-21 45 1 5 51 20 1 5 101 5 11 2
-21 44 1 4 51 20 1 3 101 5 11 2
-21 43 1 3 51 20 1 1 101 5 11 2
-21 42 1 2 51 20 2 4 101 6 12 1
-21 41 1 1 51 20 2 2 101 6 12 1
-21 40 1 5 51 26 1 5 101 7 13 1
-21 39 1 4 51 26 1 4 101 7 13 1
-21 38 1 3 51 26 1 3 101 7 13 1
-21 37 1 2 51 26 1 1 101 7 13 1
-21 36 1 1 51 26 2 3 101 8 15 1
-21 35 1 5 52 7 1 5 101 4 9 2
-21 34 1 4 52 7 1 3 101 4 9 2
-21 33 1 3 52 7 1 1 101 4 9 2
-21 32 1 2 52 7 2 4 102 1 1 1
-21 31 1 1 52 7 2 2 102 1 1 1
-21 30 1 5 52 11 2 5 102 2 3 1
-21 29 1 4 52 11 1 5 84 14 36 2
-21 28 1 3 52 11 1 4 84 14 36 2
-21 27 1 2 52 11 1 2 84 14 36 2
-21 26 1 1 52 11 1 1 84 14 36 2
-21 25 1 5 52 18 2 5 84 15 37 1
-21 24 1 4 52 18 1 5 84 11 29 3
-21 23 1 3 52 18 1 4 84 11 29 3
-21 22 1 2 52 18 1 2 84 11 29 3
-21 21 1 1 52 18 3 4 84 12 30 1
-21 20 1 5 52 25 2 5 84 12 31 2
-21 19 1 4 52 25 1 5 84 8 21 4
-21 18 1 3 52 25 1 4 84 8 21 4
-21 17 1 2 52 25 1 2 84 8 21 4
-21 16 1 1 52 25 1 1 84 8 21 4
-21 15 1 5 52 27 2 5 85 5 8 3
-21 14 1 4 52 27 2 4 85 5 8 3
-21 13 1 3 52 27 1 5 85 1 1 1
-21 12 1 2 52 27 1 4 85 1 1 1
-21 11 1 1 52 27 1 3 85 1 1 1
-21 10 1 5 52 21 4 5 85 1 2 2
-21 9 1 4 52 21 4 2 85 1 2 2
-20 87 1 20 50 3 2 2 80 5 7 3
-20 86 1 25 50 3 2 5 80 5 7 3
-20 85 1 5 50 2 5 1 80 5 8 4
-20 84 1 10 50 2 5 2 80 5 8 4
-20 83 1 15 50 2 5 3 80 5 8 4
-20 82 1 20 50 2 5 4 80 5 8 4
-20 81 1 25 50 2 5 5 80 5 8 4
-20 80 1 5 50 5 5 1 80 10 26 2
-20 79 1 10 50 5 5 2 80 10 26 2
-20 78 1 15 50 5 5 3 80 10 26 2
-20 77 1 20 50 5 5 4 80 10 26 2
-20 76 1 25 50 5 5 5 80 10 26 2
-20 75 1 5 50 9 5 1 80 15 38 1
-20 74 1 10 50 9 5 3 80 15 38 1
-20 73 1 15 50 9 5 5 80 15 38 1
-20 72 1 20 50 9 4 2 80 16 41 2
-20 71 1 25 50 9 4 5 80 16 41 2
-20 70 1 5 50 15 4 4 80 16 40 1
-20 69 1 10 50 15 5 1 99 1 1 1
-20 68 1 15 50 15 5 2 99 1 1 1
-20 67 1 20 50 15 5 3 99 1 1 1
-20 66 1 25 50 15 5 5 99 1 1 1
-20 65 1 5 50 22 5 2 99 2 4 2
-20 64 1 10 50 22 5 3 99 2 4 2
-20 63 1 15 50 22 5 4 99 2 4 2
-20 62 1 20 50 22 5 5 99 2 4 2
-20 61 1 25 50 22 4 5 99 3 7 3
-20 60 1 5 50 30 3 5 99 3 6 2
-20 59 1 10 50 30 5 1 99 8 15 1
-20 58 1 15 50 30 5 2 99 8 15 1
-20 57 1 20 50 30 5 3 99 8 15 1
-20 56 1 25 50 30 5 5 99 8 15 1
-20 55 1 5 51 6 4 2 100 5 9 2
-20 54 1 10 51 6 4 5 100 5 9 2
-20 53 1 15 51 6 5 2 100 6 12 2
-20 52 1 20 51 6 5 4 100 6 12 2
-20 51 1 25 51 6 5 5 100 6 12 2
-20 50 1 25 51 14 5 4 100 7 15 2
-20 49 1 24 51 14 5 2 100 7 15 2
-20 48 1 23 51 14 5 1 100 7 15 2
-20 47 1 22 51 14 4 3 100 8 17 1
-20 46 1 21 51 14 4 1 100 8 17 1
-20 45 1 25 51 21 5 4 101 5 10 1
-20 44 1 24 51 21 5 3 101 5 10 1
-20 43 1 23 51 21 5 2 101 5 10 1
-20 42 1 22 51 21 5 1 101 5 10 1
-20 41 1 21 51 21 3 1 101 2 3 1
-20 40 1 25 51 27 4 3 101 2 5 3
-20 39 1 24 51 27 5 5 101 3 7 2
-20 38 1 23 51 27 5 3 101 3 7 2
-20 37 1 22 51 27 5 2 101 3 7 2
-20 36 1 21 51 27 5 1 101 3 7 2
-20 35 1 25 51 31 5 4 101 4 8 1
-20 34 1 24 51 31 5 3 101 4 8 1
-20 33 1 23 51 31 5 2 101 4 8 1
-20 32 1 22 51 31 5 1 101 4 8 1
-20 31 1 21 51 31 4 1 84 13 33 1
-20 30 1 25 52 12 4 3 84 13 34 2
-20 29 1 24 52 12 4 1 84 13 34 2
-20 28 1 23 52 12 5 4 84 14 35 1
-20 27 1 22 52 12 5 2 84 14 35 1
-20 26 1 21 52 12 5 1 84 14 35 1
-20 25 1 25 52 19 5 5 84 11 28 2
-20 24 1 24 52 19 5 4 84 11 28 2
-20 23 1 23 52 19 5 3 84 11 28 2
-20 22 1 22 52 19 5 2 84 11 28 2
-20 21 1 21 52 19 5 1 84 11 28 2
-20 20 1 25 52 26 4 3 84 7 17 5
-20 19 1 24 52 26 4 1 84 7 17 5
-20 18 1 23 52 26 5 4 84 8 20 3
-20 17 1 22 52 26 5 2 84 8 20 3
-20 16 1 21 52 26 5 1 84 8 20 3
-20 15 1 25 52 21 3 3 84 8 19 2
-20 14 1 24 52 21 3 1 84 8 19 2
-19 87 1 19 50 3 2 1 80 5 7 3
-19 86 1 24 50 3 2 4 80 5 7 3
-19 85 1 4 50 2 4 1 80 5 9 5
-19 84 1 9 50 2 4 2 80 5 9 5
-19 83 1 14 50 2 4 3 80 5 9 5
-19 82 1 19 50 2 4 4 80 5 9 5
-19 81 1 24 50 2 4 5 80 5 9 5
-19 80 1 4 50 5 3 4 80 6 13 3
-19 79 1 9 50 5 4 1 80 10 25 1
-19 78 1 14 50 5 4 3 80 10 25 1
-19 77 1 19 50 5 4 4 80 10 25 1
-19 76 1 24 50 5 4 5 80 10 25 1
-19 75 1 4 50 9 3 4 80 11 29 2
-19 74 1 9 50 9 5 2 80 15 38 1
-19 73 1 14 50 9 5 4 80 15 38 1
-19 72 1 19 50 9 4 1 80 16 41 2
-19 71 1 24 50 9 4 4 80 16 41 2
-19 70 1 4 50 15 4 3 80 16 40 1
-19 69 1 9 50 15 4 5 80 16 40 1
-19 68 1 14 50 15 3 3 81 13 32 3
-19 67 1 19 50 15 3 5 81 13 32 3
-19 66 1 24 50 15 5 4 99 1 1 1
-19 65 1 4 50 22 5 1 99 2 4 2
-19 64 1 9 50 22 3 3 99 2 3 1
-19 63 1 14 50 22 3 5 99 2 3 1
-19 62 1 19 50 22 4 2 99 3 7 3
-19 61 1 24 50 22 4 4 99 3 7 3
-19 60 1 4 50 30 3 4 99 3 6 2
-19 59 1 9 50 30 4 2 99 4 9 2
-19 58 1 14 50 30 4 4 99 4 9 2
-19 57 1 19 50 30 4 5 99 4 9 2
-19 56 1 24 50 30 5 4 99 8 15 1
-19 55 1 4 51 6 4 1 100 5 9 2
-19 54 1 9 51 6 4 4 100 5 9 2
-19 53 1 14 51 6 5 1 100 6 12 2
-19 52 1 19 51 6 5 3 100 6 12 2
-19 51 1 24 51 6 3 5 100 6 11 1
-19 50 1 20 51 14 5 5 100 7 15 2
-19 49 1 19 51 14 5 3 100 7 15 2
-19 48 1 18 51 14 3 1 100 7 14 1
-19 47 1 17 51 14 4 4 100 8 17 1
-19 46 1 16 51 14 4 2 100 8 17 1
-19 45 1 20 51 21 5 5 101 5 10 1
-19 44 1 19 51 21 4 4 101 1 2 2
-19 43 1 18 51 21 4 2 101 1 2 2
-19 42 1 17 51 21 4 1 101 1 2 2
-19 41 1 16 51 21 3 2 101 2 3 1
-19 40 1 20 51 27 4 4 101 2 5 3
-19 39 1 19 51 27 4 1 101 2 5 3
-19 38 1 18 51 27 5 4 101 3 7 2
-19 37 1 17 51 27 3 3 101 3 6 1
-19 36 1 16 51 27 3 1 101 3 6 1
-19 35 1 20 51 31 5 5 101 4 8 1
-19 34 1 19 51 31 3 3 83 16 39 3
-19 33 1 18 51 31 3 1 83 16 39 3
-19 32 1 17 51 31 4 5 84 13 33 1
-19 31 1 16 51 31 4 2 84 13 33 1
-19 30 1 20 52 12 4 4 84 13 34 2
-19 29 1 19 52 12 4 2 84 13 34 2
-19 28 1 18 52 12 5 5 84 14 35 1
-19 27 1 17 52 12 5 3 84 14 35 1
-19 26 1 16 52 12 3 1 84 10 25 1
-19 25 1 20 52 19 4 5 84 11 27 1
-19 24 1 19 52 19 4 4 84 11 27 1
-19 23 1 18 52 19 4 2 84 11 27 1
-19 22 1 17 52 19 4 1 84 11 27 1
-19 21 1 16 52 19 3 1 84 7 14 2
-19 20 1 20 52 26 4 4 84 7 17 5
-19 19 1 19 52 26 4 2 84 7 17 5
-19 18 1 18 52 26 5 5 84 8 20 3
-19 17 1 17 52 26 5 3 84 8 20 3
-19 16 1 16 52 26 3 1 84 8 18 1
-19 15 1 20 52 21 3 4 84 8 19 2
-19 14 1 19 52 21 3 2 84 8 19 2
-18 87 1 18 50 3 1 3 80 1 1 1
-18 86 1 23 50 3 2 3 80 5 7 3
-18 85 1 3 50 2 2 3 80 5 10 1
-18 84 1 8 50 2 2 5 80 5 10 1
-18 83 1 13 50 2 3 2 80 6 14 4
-18 82 1 18 50 2 3 4 80 6 14 4
-18 81 1 23 50 2 3 5 80 6 14 4
-18 80 1 3 50 5 3 3 80 6 13 3
-18 79 1 8 50 5 3 5 80 6 13 3
-18 78 1 13 50 5 4 2 80 10 25 1
-18 77 1 18 50 5 2 2 80 11 28 1
-18 76 1 23 50 5 2 5 80 11 28 1
-18 75 1 3 50 9 3 3 80 11 29 2
-18 74 1 8 50 9 3 5 80 11 29 2
-18 73 1 13 50 9 2 3 80 12 32 3
-18 72 1 18 50 9 2 5 80 12 32 3
-18 71 1 23 50 9 4 3 80 16 41 2
-18 70 1 3 50 15 4 2 80 16 40 1
-18 69 1 8 50 15 3 1 81 13 32 3
-18 68 1 13 50 15 3 2 81 13 32 3
-18 67 1 18 50 15 3 4 81 13 32 3
-18 66 1 23 50 15 2 5 81 13 31 2
-18 65 1 3 50 22 3 1 99 2 3 1
-18 64 1 8 50 22 3 2 99 2 3 1
-18 63 1 13 50 22 3 4 99 2 3 1
-18 62 1 18 50 22 4 1 99 3 7 3
-18 61 1 23 50 22 4 3 99 3 7 3
-18 60 1 3 50 30 3 3 99 3 6 2
-18 59 1 8 50 30 4 1 99 4 9 2
-18 58 1 13 50 30 4 3 99 4 9 2
-18 57 1 18 50 30 2 5 99 4 8 1
-18 56 1 23 50 30 1 5 100 1 1 1
-18 55 1 3 51 6 2 3 100 1 2 2
-18 54 1 8 51 6 4 3 100 5 9 2
-18 53 1 13 51 6 3 2 100 6 11 1
-18 52 1 18 51 6 3 3 100 6 11 1
-18 51 1 23 51 6 3 4 100 6 11 1
-18 50 1 15 51 14 3 5 100 7 14 1
-18 49 1 14 51 14 3 4 100 7 14 1
-18 48 1 13 51 14 3 2 100 7 14 1
-18 47 1 12 51 14 4 5 100 8 17 1
-18 46 1 11 51 14 2 1 100 4 7 1
-18 45 1 15 51 21 2 3 100 4 8 2
-18 44 1 14 51 21 4 5 101 1 2 2
-18 43 1 13 51 21 4 3 101 1 2 2
-18 42 1 12 51 21 1 1 101 1 1 1
-18 41 1 11 51 21 3 3 101 2 3 1
-18 40 1 15 51 27 4 5 101 2 5 3
-18 39 1 14 51 27 4 2 101 2 5 3
-18 38 1 13 51 27 3 5 101 3 6 1
-18 37 1 12 51 27 3 4 101 3 6 1
-18 36 1 11 51 27 3 2 101 3 6 1
-18 35 1 15 51 31 3 5 83 16 39 3
-18 34 1 14 51 31 3 4 83 16 39 3
-18 33 1 13 51 31 3 2 83 16 39 3
-18 32 1 12 51 31 2 1 83 16 38 2
-18 31 1 11 51 31 4 3 84 13 33 1
-18 30 1 15 52 12 4 5 84 13 34 2
-18 29 1 14 52 12 2 3 84 9 24 3
-18 28 1 13 52 12 2 1 84 9 24 3
-18 27 1 12 52 12 3 5 84 10 25 1
-18 26 1 11 52 12 3 2 84 10 25 1
-18 25 1 15 52 19 2 3 84 10 26 2
-18 24 1 14 52 19 2 1 84 10 26 2
-18 23 1 13 52 19 4 3 84 11 27 1
-18 22 1 12 52 19 3 5 84 7 14 2
-18 21 1 11 52 19 3 2 84 7 14 2
-18 20 1 15 52 26 4 5 84 7 17 5
-18 19 1 14 52 26 2 3 84 7 16 4
-18 18 1 13 52 26 3 5 84 8 18 1
-18 17 1 12 52 26 3 4 84 8 18 1
-18 16 1 11 52 26 3 2 84 8 18 1
-18 15 1 15 52 21 3 5 84 8 19 2
-18 14 1 14 52 21 2 1 84 4 5 1
-17 87 1 17 50 3 1 2 80 1 1 1
-17 86 1 22 50 3 1 5 80 1 1 1
-17 85 1 2 50 2 2 2 80 5 10 1
-17 84 1 7 50 2 2 4 80 5 10 1
-17 83 1 12 50 2 3 1 80 6 14 4
-17 82 1 17 50 2 3 3 80 6 14 4
-17 81 1 22 50 2 1 5 80 6 12 2
-17 80 1 2 50 5 3 2 80 6 13 3
-17 79 1 7 50 5 1 2 80 7 18 4
-17 78 1 12 50 5 1 4 80 7 18 4
-17 77 1 17 50 5 2 1 80 11 28 1
-17 76 1 22 50 5 2 4 80 11 28 1
-17 75 1 2 50 9 3 2 80 11 29 2
-17 74 1 7 50 9 2 1 80 12 32 3
-17 73 1 12 50 9 2 2 80 12 32 3
-17 72 1 17 50 9 2 4 80 12 32 3
-17 71 1 22 50 9 1 5 80 12 31 2
-17 70 1 2 50 15 4 1 80 16 40 1
-17 69 1 7 50 15 2 1 81 13 31 2
-17 68 1 12 50 15 2 2 81 13 31 2
-17 67 1 17 50 15 2 3 81 13 31 2
-17 66 1 22 50 15 2 4 81 13 31 2
-17 65 1 2 50 22 1 2 81 14 35 3
-17 64 1 7 50 22 1 4 81 14 35 3
-17 63 1 12 50 22 2 1 99 3 5 1
-17 62 1 17 50 22 2 3 99 3 5 1
-17 61 1 22 50 22 2 5 99 3 5 1
-17 60 1 2 50 30 3 2 99 3 6 2
-17 59 1 7 50 30 2 2 99 4 8 1
-17 58 1 12 50 30 2 4 99 4 8 1
-17 57 1 17 50 30 1 2 100 1 1 1
-17 56 1 22 50 30 1 4 100 1 1 1
-17 55 1 2 51 6 2 2 100 1 2 2
-17 54 1 7 51 6 2 5 100 1 2 2
-17 53 1 12 51 6 3 1 100 6 11 1
-17 52 1 17 51 6 1 3 100 2 4 2
-17 51 1 22 51 6 1 5 100 2 4 2
-17 50 1 10 51 14 1 4 100 3 6 2
-17 49 1 9 51 14 1 2 100 3 6 2
-17 48 1 8 51 14 3 3 100 7 14 1
-17 47 1 7 51 14 2 4 100 4 7 1
-17 46 1 6 51 14 2 2 100 4 7 1
-17 45 1 10 51 21 2 4 100 4 8 2
-17 44 1 9 51 21 2 1 100 4 8 2
-17 43 1 8 51 21 1 4 101 1 1 1
-17 42 1 7 51 21 1 2 101 1 1 1
-17 41 1 6 51 21 3 4 101 2 3 1
-17 40 1 10 51 27 2 4 101 2 4 2
-17 39 1 9 51 27 2 2 101 2 4 2
-17 38 1 8 51 27 2 1 101 2 4 2
-17 37 1 7 51 27 1 3 83 15 36 3
-17 36 1 6 51 27 1 1 83 15 36 3
-17 35 1 10 51 31 2 5 83 16 38 2
-17 34 1 9 51 31 2 4 83 16 38 2
-17 33 1 8 51 31 2 3 83 16 38 2
-17 32 1 7 51 31 2 2 83 16 38 2
-17 31 1 6 51 31 4 4 84 13 33 1
-17 30 1 10 52 12 2 5 84 9 24 3
-17 29 1 9 52 12 2 4 84 9 24 3
-17 28 1 8 52 12 2 2 84 9 24 3
-17 27 1 7 52 12 1 1 84 9 23 2
-17 26 1 6 52 12 3 3 84 10 25 1
-17 25 1 10 52 19 2 4 84 10 26 2
-17 24 1 9 52 19 2 2 84 10 26 2
-17 23 1 8 52 19 1 3 84 6 12 3
-17 22 1 7 52 19 1 1 84 6 12 3
-17 21 1 6 52 19 3 3 84 7 14 2
-17 20 1 10 52 26 2 5 84 7 16 4
-17 19 1 9 52 26 2 4 84 7 16 4
-17 18 1 8 52 26 2 2 84 7 16 4
-17 17 1 7 52 26 2 1 84 7 16 4
-17 16 1 6 52 26 3 3 84 8 18 1
-17 15 1 10 52 21 2 4 84 4 5 1
-17 14 1 9 52 21 2 2 84 4 5 1
-16 87 1 16 50 3 1 1 80 1 1 1
-16 86 1 21 50 3 1 4 80 1 1 1
-16 85 1 1 50 2 2 1 80 5 10 1
-16 84 1 6 50 2 1 1 80 6 12 2
-16 83 1 11 50 2 1 2 80 6 12 2
-16 82 1 16 50 2 1 3 80 6 12 2
-16 81 1 21 50 2 1 4 80 6 12 2
-16 80 1 1 50 5 3 1 80 6 13 3
-16 79 1 6 50 5 1 1 80 7 18 4
-16 78 1 11 50 5 1 3 80 7 18 4
-16 77 1 16 50 5 1 5 80 7 18 4
-16 76 1 21 50 5 2 3 80 11 28 1
-16 75 1 1 50 9 3 1 80 11 29 2
-16 74 1 6 50 9 1 1 80 12 31 2
-16 73 1 11 50 9 1 2 80 12 31 2
-16 72 1 16 50 9 1 3 80 12 31 2
-16 71 1 21 50 9 1 4 80 12 31 2
-16 70 1 1 50 15 1 1 81 13 30 1
-16 69 1 6 50 15 1 2 81 13 30 1
-16 68 1 11 50 15 1 3 81 13 30 1
-16 67 1 16 50 15 1 4 81 13 30 1
-16 66 1 21 50 15 1 5 81 13 30 1
-16 65 1 1 50 22 1 1 81 14 35 3
-16 64 1 6 50 22 1 3 81 14 35 3
-16 63 1 11 50 22 1 5 81 14 35 3
-16 62 1 16 50 22 2 2 99 3 5 1
-16 61 1 21 50 22 2 4 99 3 5 1
-16 60 1 1 50 30 3 1 99 3 6 2
-16 59 1 6 50 30 2 1 99 4 8 1
-16 58 1 11 50 30 2 3 99 4 8 1
-16 57 1 16 50 30 1 1 100 1 1 1
-16 56 1 21 50 30 1 3 100 1 1 1
-16 55 1 1 51 6 2 1 100 1 2 2
-16 54 1 6 51 6 2 4 100 1 2 2
-16 53 1 11 51 6 1 1 100 2 4 2
-16 52 1 16 51 6 1 2 100 2 4 2
-16 51 1 21 51 6 1 4 100 2 4 2
-16 50 1 5 51 14 1 5 100 3 6 2
-16 49 1 4 51 14 1 3 100 3 6 2
-16 48 1 3 51 14 1 1 100 3 6 2
-16 47 1 2 51 14 2 5 100 4 7 1
-16 46 1 1 51 14 2 3 100 4 7 1
-16 45 1 5 51 21 2 5 100 4 8 2
-16 44 1 4 51 21 2 2 100 4 8 2
-16 43 1 3 51 21 1 5 101 1 1 1
-16 42 1 2 51 21 1 3 101 1 1 1
-16 41 1 1 51 21 3 5 101 2 3 1
-16 40 1 5 51 27 2 5 101 2 4 2
-16 39 1 4 51 27 2 3 101 2 4 2
-16 38 1 3 51 27 1 5 83 15 36 3
-16 37 1 2 51 27 1 4 83 15 36 3
-16 36 1 1 51 27 1 2 83 15 36 3
-16 35 1 5 51 31 1 5 83 16 37 1
-16 34 1 4 51 31 1 4 83 16 37 1
-16 33 1 3 51 31 1 3 83 16 37 1
-16 32 1 2 51 31 1 2 83 16 37 1
-16 31 1 1 51 31 1 1 83 16 37 1
-16 30 1 5 52 12 1 5 84 9 23 2
-16 29 1 4 52 12 1 4 84 9 23 2
-16 28 1 3 52 12 1 3 84 9 23 2
-16 27 1 2 52 12 1 2 84 9 23 2
-16 26 1 1 52 12 3 4 84 10 25 1
-16 25 1 5 52 19 2 5 84 10 26 2
-16 24 1 4 52 19 1 5 84 6 12 3
-16 23 1 3 52 19 1 4 84 6 12 3
-16 22 1 2 52 19 1 2 84 6 12 3
-16 21 1 1 52 19 3 4 84 7 14 2
-16 20 1 5 52 26 1 5 84 7 15 3
-16 19 1 4 52 26 1 4 84 7 15 3
-16 18 1 3 52 26 1 3 84 7 15 3
-16 17 1 2 52 26 1 2 84 7 15 3
-16 16 1 1 52 26 1 1 84 7 15 3
-16 15 1 5 52 21 2 5 84 4 5 1
-16 14 1 4 52 21 2 3 84 4 5 1
-15 85 1 5 50 3 3 2 80 2 2 1
-15 84 1 10 50 3 3 4 80 2 2 1
-15 83 1 15 50 3 4 1 80 6 11 1
-15 82 1 20 50 3 4 3 80 6 11 1
-15 81 1 25 50 3 4 5 80 6 11 1
-15 80 1 5 50 6 5 1 80 7 17 3
-15 79 1 10 50 6 5 2 80 7 17 3
-15 78 1 15 50 6 5 3 80 7 17 3
-15 77 1 20 50 6 5 4 80 7 17 3
-15 76 1 25 50 6 5 5 80 7 17 3
-15 75 1 5 50 10 5 1 80 12 30 1
-15 74 1 10 50 10 5 2 80 12 30 1
-15 73 1 15 50 10 5 4 80 12 30 1
-15 72 1 20 50 10 5 5 80 12 30 1
-15 71 1 25 50 10 4 5 81 9 20 2
-15 70 1 5 50 16 4 2 81 9 21 3
-15 69 1 10 50 16 4 4 81 9 21 3
-15 68 1 15 50 16 5 1 81 14 34 2
-15 67 1 20 50 16 5 3 81 14 34 2
-15 66 1 25 50 16 5 5 81 14 34 2
-15 65 1 5 50 23 4 3 81 14 33 1
-15 64 1 10 50 23 4 5 81 14 33 1
-15 63 1 15 50 23 5 3 81 15 37 2
-15 62 1 20 50 23 5 4 81 15 37 2
-15 61 1 25 50 23 5 5 81 15 37 2
-15 60 1 5 50 31 5 2 81 16 39 2
-15 59 1 10 50 31 5 3 81 16 39 2
-15 58 1 15 50 31 5 4 81 16 39 2
-15 57 1 20 50 31 5 5 81 16 39 2
-15 56 1 25 50 31 4 5 82 13 40 2
-15 55 1 5 51 7 4 4 82 13 39 1
-15 54 1 10 51 7 5 1 100 2 3 1
-15 53 1 15 51 7 5 2 100 2 3 1
-15 52 1 20 51 7 5 3 100 2 3 1
-15 51 1 25 51 7 5 5 100 2 3 1
-15 50 1 25 51 15 5 4 100 3 5 1
-15 49 1 24 51 15 5 3 100 3 5 1
-15 48 1 23 51 15 5 2 100 3 5 1
-15 47 1 22 51 15 5 1 100 3 5 1
-15 46 1 21 51 15 4 1 82 16 45 1
-15 45 1 25 51 22 4 3 82 16 46 2
-15 44 1 24 51 22 5 5 83 13 31 2
-15 43 1 23 51 22 5 3 83 13 31 2
-15 42 1 22 51 22 5 2 83 13 31 2
-15 41 1 21 51 22 5 1 83 13 31 2
-15 40 1 25 51 28 5 4 83 14 33 2
-15 39 1 24 51 28 5 2 83 14 33 2
-15 38 1 23 51 28 5 1 83 14 33 2
-15 37 1 22 51 28 4 4 83 15 34 1
-15 36 1 21 51 28 4 1 83 15 34 1
-15 35 1 25 51 32 5 4 83 15 35 2
-15 34 1 24 51 32 5 2 83 15 35 2
-15 33 1 23 51 32 5 1 83 15 35 2
-15 32 1 22 51 32 4 3 83 12 29 3
-15 31 1 21 51 32 4 1 83 12 29 3
-15 30 1 25 52 13 4 3 83 12 28 2
-15 29 1 24 52 13 5 5 84 9 22 1
-15 28 1 23 52 13 5 3 84 9 22 1
-15 27 1 22 52 13 5 2 84 9 22 1
-15 26 1 21 52 13 5 1 84 9 22 1
-15 25 1 25 52 20 5 5 84 6 11 2
-15 24 1 24 52 20 5 4 84 6 11 2
-15 23 1 23 52 20 5 3 84 6 11 2
-15 22 1 22 52 20 5 2 84 6 11 2
-15 21 1 21 52 20 5 1 84 6 11 2
-15 20 1 25 52 14 5 4 84 7 13 1
-15 19 1 24 52 14 5 2 84 7 13 1
-15 18 1 23 52 14 5 1 84 7 13 1
-15 17 1 22 52 14 4 3 84 3 4 1
-15 16 1 21 52 14 4 1 84 3 4 1
-14 85 1 4 50 3 3 1 80 2 2 1
-14 84 1 9 50 3 3 3 80 2 2 1
-14 83 1 14 50 3 3 5 80 2 2 1
-14 82 1 19 50 3 4 2 80 6 11 1
-14 81 1 24 50 3 4 4 80 6 11 1
-14 80 1 4 50 6 4 1 80 7 16 2
-14 79 1 9 50 6 4 2 80 7 16 2
-14 78 1 14 50 6 4 3 80 7 16 2
-14 77 1 19 50 6 4 4 80 7 16 2
-14 76 1 24 50 6 4 5 80 7 16 2
-14 75 1 4 50 10 3 2 80 8 21 3
-14 74 1 9 50 10 3 4 80 8 21 3
-14 73 1 14 50 10 5 3 80 12 30 1
-14 72 1 19 50 10 4 2 81 9 20 2
-14 71 1 24 50 10 4 4 81 9 20 2
-14 70 1 4 50 16 4 1 81 9 21 3
-14 69 1 9 50 16 4 3 81 9 21 3
-14 68 1 14 50 16 4 5 81 9 21 3
-14 67 1 19 50 16 5 2 81 14 34 2
-14 66 1 24 50 16 5 4 81 14 34 2
-14 65 1 4 50 23 4 2 81 14 33 1
-14 64 1 9 50 23 5 1 81 15 37 2
-14 63 1 14 50 23 5 2 81 15 37 2
-14 62 1 19 50 23 3 3 81 15 36 1
-14 61 1 24 50 23 3 5 81 15 36 1
-14 60 1 4 50 31 5 1 81 16 39 2
-14 59 1 9 50 31 3 3 81 16 38 1
-14 58 1 14 50 31 3 5 81 16 38 1
-14 57 1 19 50 31 4 2 82 13 40 2
-14 56 1 24 50 31 4 4 82 13 40 2
-14 55 1 4 51 7 4 3 82 13 39 1
-14 54 1 9 51 7 4 5 82 13 39 1
-14 53 1 14 51 7 3 3 82 14 42 2
-14 52 1 19 51 7 3 5 82 14 42 2
-14 51 1 24 51 7 5 4 100 2 3 1
-14 50 1 20 51 15 5 5 100 3 5 1
-14 49 1 19 51 15 3 3 82 15 44 2
-14 48 1 18 51 15 3 1 82 15 44 2
-14 47 1 17 51 15 4 5 82 16 45 1
-14 46 1 16 51 15 4 2 82 16 45 1
-14 45 1 20 51 22 4 4 82 16 46 2
-14 44 1 19 51 22 4 1 82 16 46 2
-14 43 1 18 51 22 5 4 83 13 31 2
-14 42 1 17 51 22 3 3 83 13 30 1
-14 41 1 16 51 22 3 1 83 13 30 1
-14 40 1 20 51 28 5 5 83 14 33 2
-14 39 1 19 51 28 5 3 83 14 33 2
-14 38 1 18 51 28 3 2 83 14 32 1
-14 37 1 17 51 28 3 1 83 14 32 1
-14 36 1 16 51 28 4 2 83 15 34 1
-14 35 1 20 51 32 5 5 83 15 35 2
-14 34 1 19 51 32 5 3 83 15 35 2
-14 33 1 18 51 32 4 5 83 12 29 3
-14 32 1 17 51 32 4 4 83 12 29 3
-14 31 1 16 51 32 4 2 83 12 29 3
-14 30 1 20 52 13 4 4 83 12 28 2
-14 29 1 19 52 13 4 1 83 12 28 2
-14 28 1 18 52 13 5 4 84 9 22 1
-14 27 1 17 52 13 3 3 84 5 8 3
-14 26 1 16 52 13 3 1 84 5 8 3
-14 25 1 20 52 20 4 5 84 6 10 1
-14 24 1 19 52 20 4 4 84 6 10 1
-14 23 1 18 52 20 4 3 84 6 10 1
-14 22 1 17 52 20 4 2 84 6 10 1
-14 21 1 16 52 20 4 1 84 6 10 1
-14 20 1 20 52 14 5 5 84 7 13 1
-14 19 1 19 52 14 5 3 84 7 13 1
-14 18 1 18 52 14 4 5 84 3 4 1
-14 17 1 17 52 14 4 4 84 3 4 1
-14 16 1 16 52 14 4 2 84 3 4 1
-13 80 1 3 50 6 1 3 80 3 4 2
-13 79 1 8 50 6 3 2 80 7 15 1
-13 78 1 13 50 6 3 4 80 7 15 1
-13 77 1 18 50 6 3 5 80 7 15 1
-13 76 1 23 50 6 2 5 80 8 19 1
-13 75 1 3 50 10 3 1 80 8 21 3
-13 74 1 8 50 10 3 3 80 8 21 3
-13 73 1 13 50 10 3 5 80 8 21 3
-13 72 1 18 50 10 4 1 81 9 20 2
-13 71 1 23 50 10 4 3 81 9 20 2
-13 70 1 3 50 16 2 3 81 9 19 1
-13 69 1 8 50 16 2 5 81 9 19 1
-13 68 1 13 50 16 3 2 81 10 23 2
-13 67 1 18 50 16 3 4 81 10 23 2
-13 66 1 23 50 16 3 5 81 10 23 2
-13 65 1 3 50 23 4 1 81 14 33 1
-13 64 1 8 50 23 4 4 81 14 33 1
-13 63 1 13 50 23 3 1 81 15 36 1
-13 62 1 18 50 23 3 2 81 15 36 1
-13 61 1 23 50 23 3 4 81 15 36 1
-13 60 1 3 50 31 3 1 81 16 38 1
-13 59 1 8 50 31 3 2 81 16 38 1
-13 58 1 13 50 31 3 4 81 16 38 1
-13 57 1 18 50 31 4 1 82 13 40 2
-13 56 1 23 50 31 4 3 82 13 40 2
-13 55 1 3 51 7 4 2 82 13 39 1
-13 54 1 8 51 7 3 1 82 14 42 2
-13 53 1 13 51 7 3 2 82 14 42 2
-13 52 1 18 51 7 3 4 82 14 42 2
-13 51 1 23 51 7 2 5 82 14 41 1
-13 50 1 15 51 15 3 5 82 15 44 2
-13 49 1 14 51 15 3 4 82 15 44 2
-13 48 1 13 51 15 3 2 82 15 44 2
-13 47 1 12 51 15 2 1 82 15 43 1
-13 46 1 11 51 15 4 3 82 16 45 1
-13 45 1 15 51 22 4 5 82 16 46 2
-13 44 1 14 51 22 4 2 82 16 46 2
-13 43 1 13 51 22 3 5 83 13 30 1
-13 42 1 12 51 22 3 4 83 13 30 1
-13 41 1 11 51 22 3 2 83 13 30 1
-13 40 1 15 51 28 3 5 83 14 32 1
-13 39 1 14 51 28 3 4 83 14 32 1
-13 38 1 13 51 28 3 3 83 14 32 1
-13 37 1 12 51 28 4 5 83 15 34 1
-13 36 1 11 51 28 4 3 83 15 34 1
-13 35 1 15 51 32 3 4 83 11 26 2
-13 34 1 14 51 32 3 2 83 11 26 2
-13 33 1 13 51 32 3 1 83 11 26 2
-13 32 1 12 51 32 2 4 83 12 27 1
-13 31 1 11 51 32 2 1 83 12 27 1
-13 30 1 15 52 13 4 5 83 12 28 2
-13 29 1 14 52 13 4 2 83 12 28 2
-13 28 1 13 52 13 3 5 84 5 8 3
-13 27 1 12 52 13 3 4 84 5 8 3
-13 26 1 11 52 13 3 2 84 5 8 3
-13 25 1 15 52 20 2 3 84 5 7 2
-13 24 1 14 52 20 3 5 84 6 9 4
-13 23 1 13 52 20 3 3 84 6 9 4
-13 22 1 12 52 20 3 1 84 6 9 4
-13 21 1 11 52 20 1 1 84 2 3 2
-12 80 1 2 50 6 1 2 80 3 4 2
-12 79 1 7 50 6 3 1 80 7 15 1
-12 78 1 12 50 6 3 3 80 7 15 1
-12 77 1 17 50 6 2 2 80 8 19 1
-12 76 1 22 50 6 2 4 80 8 19 1
-12 75 1 2 50 10 2 2 80 8 20 2
-12 74 1 7 50 10 2 4 80 8 20 2
-12 73 1 12 50 10 2 5 80 8 20 2
-12 72 1 17 50 10 1 3 81 5 10 1
-12 71 1 22 50 10 1 5 81 5 10 1
-12 70 1 2 50 16 2 2 81 9 19 1
-12 69 1 7 50 16 2 4 81 9 19 1
-12 68 1 12 50 16 3 1 81 10 23 2
-12 67 1 17 50 16 3 3 81 10 23 2
-12 66 1 22 50 16 1 5 81 10 22 1
-12 65 1 2 50 23 2 1 81 11 26 3
-12 64 1 7 50 23 2 2 81 11 26 3
-12 63 1 12 50 23 2 3 81 11 26 3
-12 62 1 17 50 23 2 4 81 11 26 3
-12 61 1 22 50 23 2 5 81 11 26 3
-12 60 1 2 50 31 2 2 81 12 29 3
-12 59 1 7 50 31 2 4 81 12 29 3
-12 58 1 12 50 31 2 5 81 12 29 3
-12 57 1 17 50 31 1 3 82 9 28 4
-12 56 1 22 50 31 1 5 82 9 28 4
-12 55 1 2 51 7 4 1 82 13 39 1
-12 54 1 7 51 7 2 1 82 14 41 1
-12 53 1 12 51 7 2 2 82 14 41 1
-12 52 1 17 51 7 2 3 82 14 41 1
-12 51 1 22 51 7 2 4 82 14 41 1
-12 50 1 10 51 15 2 5 82 15 43 1
-12 49 1 9 51 15 2 4 82 15 43 1
-12 48 1 8 51 15 2 3 82 15 43 1
-12 47 1 7 51 15 2 2 82 15 43 1
-12 46 1 6 51 15 4 4 82 16 45 1
-12 45 1 10 51 22 1 4 82 12 38 4
-12 44 1 9 51 22 1 2 82 12 38 4
-12 43 1 8 51 22 2 5 83 9 21 3
-12 42 1 7 51 22 2 3 83 9 21 3
-12 41 1 6 51 22 2 1 83 9 21 3
-12 40 1 10 51 28 2 5 83 10 24 3
-12 39 1 9 51 28 2 4 83 10 24 3
-12 38 1 8 51 28 2 3 83 10 24 3
-12 37 1 7 51 28 2 2 83 10 24 3
-12 36 1 6 51 28 2 1 83 10 24 3
-12 35 1 10 51 32 3 5 83 11 26 2
-12 34 1 9 51 32 3 3 83 11 26 2
-12 33 1 8 51 32 1 2 83 11 25 1
-12 32 1 7 51 32 2 5 83 12 27 1
-12 31 1 6 51 32 2 2 83 12 27 1
-12 30 1 10 52 13 1 4 83 8 18 3
-12 29 1 9 52 13 1 2 83 8 18 3
-12 28 1 8 52 13 2 5 84 5 6 1
-12 27 1 7 52 13 2 3 84 5 6 1
-12 26 1 6 52 13 2 1 84 5 6 1
-12 25 1 10 52 20 2 4 84 5 7 2
-12 24 1 9 52 20 2 1 84 5 7 2
-12 23 1 8 52 20 3 4 84 6 9 4
-12 22 1 7 52 20 3 2 84 6 9 4
-12 21 1 6 52 20 1 2 84 2 3 2
-11 80 1 1 50 6 1 1 80 3 4 2
-11 79 1 6 50 6 1 4 80 3 4 2
-11 78 1 11 50 6 1 5 80 3 4 2
-11 77 1 16 50 6 2 1 80 8 19 1
-11 76 1 21 50 6 2 3 80 8 19 1
-11 75 1 1 50 10 2 1 80 8 20 2
-11 74 1 6 50 10 2 3 80 8 20 2
-11 73 1 11 50 10 1 1 81 5 10 1
-11 72 1 16 50 10 1 2 81 5 10 1
-11 71 1 21 50 10 1 4 81 5 10 1
-11 70 1 1 50 16 2 1 81 9 19 1
-11 69 1 6 50 16 1 1 81 10 22 1
-11 68 1 11 50 16 1 2 81 10 22 1
-11 67 1 16 50 16 1 3 81 10 22 1
-11 66 1 21 50 16 1 4 81 10 22 1
-11 65 1 1 50 23 1 1 81 11 25 2
-11 64 1 6 50 23 1 2 81 11 25 2
-11 63 1 11 50 23 1 3 81 11 25 2
-11 62 1 16 50 23 1 4 81 11 25 2
-11 61 1 21 50 23 1 5 81 11 25 2
-11 60 1 1 50 31 2 1 81 12 29 3
-11 59 1 6 50 31 2 3 81 12 29 3
-11 58 1 11 50 31 1 1 82 9 28 4
-11 57 1 16 50 31 1 2 82 9 28 4
-11 56 1 21 50 31 1 4 82 9 28 4
-11 55 1 1 51 7 1 1 82 10 31 3
-11 54 1 6 51 7 1 2 82 10 31 3
-11 53 1 11 51 7 1 3 82 10 31 3
-11 52 1 16 51 7 1 4 82 10 31 3
-11 51 1 21 51 7 1 5 82 10 31 3
-11 50 1 5 51 15 1 5 82 11 34 3
-11 49 1 4 51 15 1 4 82 11 34 3
-11 48 1 3 51 15 1 3 82 11 34 3
-11 47 1 2 51 15 1 2 82 11 34 3
-11 46 1 1 51 15 1 1 82 11 34 3
-11 45 1 5 51 22 1 5 82 12 38 4
-11 44 1 4 51 22 1 3 82 12 38 4
-11 43 1 3 51 22 1 1 82 12 38 4
-11 42 1 2 51 22 2 4 83 9 21 3
-11 41 1 1 51 22 2 2 83 9 21 3
-11 40 1 5 51 28 1 5 83 10 23 2
-11 39 1 4 51 28 1 4 83 10 23 2
-11 38 1 3 51 28 1 3 83 10 23 2
-11 37 1 2 51 28 1 2 83 10 23 2
-11 36 1 1 51 28 1 1 83 10 23 2
-11 35 1 5 51 32 1 5 83 11 25 1
-11 34 1 4 51 32 1 4 83 11 25 1
-11 33 1 3 51 32 1 3 83 11 25 1
-11 32 1 2 51 32 1 1 83 11 25 1
-11 31 1 1 51 32 2 3 83 12 27 1
-11 30 1 5 52 13 1 5 83 8 18 3
-11 29 1 4 52 13 1 3 83 8 18 3
-11 28 1 3 52 13 1 1 83 8 18 3
-11 27 1 2 52 13 2 4 84 5 6 1
-11 26 1 1 52 13 2 2 84 5 6 1
-11 25 1 5 52 20 2 5 84 5 7 2
-11 24 1 4 52 20 2 2 84 5 7 2
-11 23 1 3 52 20 1 5 84 2 3 2
-11 22 1 2 52 20 1 4 84 2 3 2
-11 21 1 1 52 20 1 3 84 2 3 2
-10 80 1 5 50 25 2 2 80 3 3 1
-10 79 1 10 50 25 2 4 80 3 3 1
-10 78 1 15 50 25 2 5 80 3 3 1
-10 77 1 20 50 25 1 3 80 4 5 1
-10 76 1 25 50 25 1 5 80 4 5 1
-10 75 1 5 50 11 3 3 81 1 3 3
-10 74 1 10 50 11 5 2 81 5 9 3
-10 73 1 15 50 11 5 3 81 5 9 3
-10 72 1 20 50 11 5 4 81 5 9 3
-10 71 1 25 50 11 5 5 81 5 9 3
-10 70 1 5 50 17 5 1 81 6 13 3
-10 69 1 10 50 17 5 2 81 6 13 3
-10 68 1 15 50 17 5 3 81 6 13 3
-10 67 1 20 50 17 5 4 81 6 13 3
-10 66 1 25 50 17 5 5 81 6 13 3
-10 65 1 5 50 24 5 2 81 11 24 1
-10 64 1 10 50 24 5 3 81 11 24 1
-10 63 1 15 50 24 5 5 81 11 24 1
-10 62 1 20 50 24 4 3 81 12 27 1
-10 61 1 25 50 24 4 5 81 12 27 1
-10 60 1 5 51 1 4 2 81 12 28 2
-10 59 1 10 51 1 4 5 81 12 28 2
-10 58 1 15 51 1 5 2 82 9 27 3
-10 57 1 20 51 1 5 4 82 9 27 3
-10 56 1 25 51 1 5 5 82 9 27 3
-10 55 1 5 51 8 4 2 82 9 26 2
-10 54 1 10 51 8 4 5 82 9 26 2
-10 53 1 15 51 8 5 2 82 10 30 2
-10 52 1 20 51 8 5 4 82 10 30 2
-10 51 1 25 51 8 5 5 82 10 30 2
-10 50 1 25 51 16 5 4 82 11 33 2
-10 49 1 24 51 16 5 2 82 11 33 2
-10 48 1 23 51 16 5 1 82 11 33 2
-10 47 1 22 51 16 4 3 82 12 36 2
-10 46 1 21 51 16 4 1 82 12 36 2
-10 45 1 25 51 23 5 4 82 12 37 3
-10 44 1 24 51 23 5 2 82 12 37 3
-10 43 1 23 51 23 5 1 82 12 37 3
-10 42 1 22 51 23 4 3 83 9 19 1
-10 41 1 21 51 23 4 1 83 9 19 1
-10 40 1 25 51 29 4 4 83 9 20 2
-10 39 1 24 51 29 4 1 83 9 20 2
-10 38 1 23 51 29 5 4 83 10 22 1
-10 37 1 22 51 29 5 3 83 10 22 1
-10 36 1 21 51 29 5 1 83 10 22 1
-10 35 1 25 51 30 5 5 83 7 15 3
-10 34 1 24 51 30 5 4 83 7 15 3
-10 33 1 23 51 30 5 3 83 7 15 3
-10 32 1 22 51 30 5 2 83 7 15 3
-10 31 1 21 51 30 5 1 83 7 15 3
-10 30 1 25 51 33 5 4 83 8 17 2
-10 29 1 24 51 33 5 3 83 8 17 2
-10 28 1 23 51 33 5 2 83 8 17 2
-10 27 1 22 51 33 5 1 83 8 17 2
-10 26 1 21 51 33 3 1 83 4 7 3
-10 25 1 25 52 14 2 4 84 1 1 1
-10 24 1 24 52 14 2 2 84 1 1 1
-10 23 1 23 52 14 3 5 84 2 2 1
-10 22 1 22 52 14 3 3 84 2 2 1
-10 21 1 21 52 14 3 1 84 2 2 1
-9 80 1 4 50 25 2 1 80 3 3 1
-9 79 1 9 50 25 2 3 80 3 3 1
-9 78 1 14 50 25 1 1 80 4 5 1
-9 77 1 19 50 25 1 2 80 4 5 1
-9 76 1 24 50 25 1 4 80 4 5 1
-9 75 1 4 50 11 3 2 81 1 3 3
-9 74 1 9 50 11 5 1 81 5 9 3
-9 73 1 14 50 11 4 1 81 5 8 2
-9 72 1 19 50 11 4 3 81 5 8 2
-9 71 1 24 50 11 4 5 81 5 8 2
-9 70 1 4 50 17 4 2 81 6 12 2
-9 69 1 9 50 17 4 3 81 6 12 2
-9 68 1 14 50 17 4 4 81 6 12 2
-9 67 1 19 50 17 4 5 81 6 12 2
-9 66 1 24 50 17 2 5 81 7 14 1
-9 65 1 4 50 24 5 1 81 11 24 1
-9 64 1 9 50 24 3 4 81 7 16 3
-9 63 1 14 50 24 5 4 81 11 24 1
-9 62 1 19 50 24 4 2 81 12 27 1
-9 61 1 24 50 24 4 4 81 12 27 1
-9 60 1 4 51 1 4 1 81 12 28 2
-9 59 1 9 51 1 4 4 81 12 28 2
-9 58 1 14 51 1 5 1 82 9 27 3
-9 57 1 19 51 1 5 3 82 9 27 3
-9 56 1 24 51 1 3 5 82 9 25 1
-9 55 1 4 51 8 4 1 82 9 26 2
-9 54 1 9 51 8 4 4 82 9 26 2
-9 53 1 14 51 8 5 1 82 10 30 2
-9 52 1 19 51 8 5 3 82 10 30 2
-9 51 1 24 51 8 3 5 82 10 29 1
-9 50 1 20 51 16 5 5 82 11 33 2
-9 49 1 19 51 16 5 3 82 11 33 2
-9 48 1 18 51 16 3 1 82 11 32 1
-9 47 1 17 51 16 4 4 82 12 36 2
-9 46 1 16 51 16 4 2 82 12 36 2
-9 45 1 20 51 23 5 5 82 12 37 3
-9 44 1 19 51 23 5 3 82 12 37 3
-9 43 1 18 51 23 3 1 82 12 35 1
-9 42 1 17 51 23 4 4 83 9 19 1
-9 41 1 16 51 23 4 2 83 9 19 1
-9 40 1 20 51 29 4 5 83 9 20 2
-9 39 1 19 51 29 4 2 83 9 20 2
-9 38 1 18 51 29 5 5 83 10 22 1
-9 37 1 17 51 29 3 2 83 6 12 3
-9 36 1 16 51 29 5 2 83 10 22 1
-9 35 1 20 51 30 2 2 83 6 11 2
-9 34 1 19 51 30 4 4 83 7 14 2
-9 33 1 18 51 30 4 3 83 7 14 2
-9 32 1 17 51 30 4 2 83 7 14 2
-9 31 1 16 51 30 4 1 83 7 14 2
-9 30 1 20 51 33 5 5 83 8 17 2
-9 29 1 19 51 33 4 3 83 8 16 1
-9 28 1 18 51 33 4 2 83 8 16 1
-9 27 1 17 51 33 4 1 83 8 16 1
-9 26 1 16 51 33 3 2 83 4 7 3
-9 25 1 20 52 14 2 5 84 1 1 1
-9 24 1 19 52 14 2 3 84 1 1 1
-9 23 1 18 52 14 2 1 84 1 1 1
-9 22 1 17 52 14 3 4 84 2 2 1
-9 21 1 16 52 14 3 2 84 2 2 1
-8 75 1 3 50 11 3 1 81 1 3 3
-8 74 1 8 50 11 3 4 81 1 3 3
-8 73 1 13 50 11 3 5 81 1 3 3
-8 72 1 18 50 11 4 2 81 5 8 2
-8 71 1 23 50 11 4 4 81 5 8 2
-8 70 1 3 50 17 4 1 81 6 12 2
-8 69 1 8 50 17 3 1 81 6 11 1
-8 68 1 13 50 17 3 3 81 6 11 1
-8 67 1 18 50 17 3 5 81 6 11 1
-8 66 1 23 50 17 2 4 81 7 14 1
-8 65 1 3 50 24 3 2 81 7 16 3
-8 64 1 8 50 24 3 3 81 7 16 3
-8 63 1 13 50 24 3 5 81 7 16 3
-8 62 1 18 50 24 4 1 81 12 27 1
-8 61 1 23 50 24 2 5 81 8 17 1
-8 60 1 3 51 1 2 3 81 8 18 2
-8 59 1 8 51 1 4 3 81 12 28 2
-8 58 1 13 51 1 3 2 82 9 25 1
-8 57 1 18 51 1 3 3 82 9 25 1
-8 56 1 23 51 1 3 4 82 9 25 1
-8 55 1 3 51 8 2 3 82 5 15 3
-8 54 1 8 51 8 4 3 82 9 26 2
-8 53 1 13 51 8 3 1 82 10 29 1
-8 52 1 18 51 8 3 2 82 10 29 1
-8 51 1 23 51 8 3 4 82 10 29 1
-8 50 1 15 51 16 3 4 82 11 32 1
-8 49 1 14 51 16 3 3 82 11 32 1
-8 48 1 13 51 16 3 2 82 11 32 1
-8 47 1 12 51 16 4 5 82 12 36 2
-8 46 1 11 51 16 2 1 82 8 23 2
-8 45 1 15 51 23 3 5 82 12 35 1
-8 44 1 14 51 23 3 4 82 12 35 1
-8 43 1 13 51 23 3 2 82 12 35 1
-8 42 1 12 51 23 4 5 83 9 19 1
-8 41 1 11 51 23 2 1 83 5 8 1
-8 40 1 15 51 29 2 3 83 5 9 2
-8 39 1 14 51 29 4 3 83 9 20 2
-8 38 1 13 51 29 3 4 83 6 12 3
-8 37 1 12 51 29 3 3 83 6 12 3
-8 36 1 11 51 29 3 1 83 6 12 3
-8 35 1 15 51 30 2 3 83 6 11 2
-8 34 1 14 51 30 4 5 83 7 14 2
-8 33 1 13 51 30 3 3 83 7 13 1
-8 32 1 12 51 30 3 2 83 7 13 1
-8 31 1 11 51 30 3 1 83 7 13 1
-8 30 1 15 51 33 4 5 83 8 16 1
-8 29 1 14 51 33 4 4 83 8 16 1
-8 28 1 13 51 33 3 5 83 4 7 3
-8 27 1 12 51 33 3 4 83 4 7 3
-8 26 1 11 51 33 3 3 83 4 7 3
-7 75 1 2 50 11 2 1 81 1 2 2
-7 74 1 7 50 11 2 2 81 1 2 2
-7 73 1 12 50 11 2 3 81 1 2 2
-7 72 1 17 50 11 2 4 81 1 2 2
-7 71 1 22 50 11 2 5 81 1 2 2
-7 70 1 2 50 17 1 2 81 2 4 1
-7 69 1 7 50 17 1 4 81 2 4 1
-7 68 1 12 50 17 3 2 81 6 11 1
-7 67 1 17 50 17 3 4 81 6 11 1
-7 66 1 22 50 17 2 3 81 7 14 1
-7 65 1 2 50 24 3 1 81 7 16 3
-7 64 1 7 50 24 1 3 81 7 15 2
-7 63 1 12 50 24 1 5 81 7 15 2
-7 62 1 17 50 24 2 2 81 8 17 1
-7 61 1 22 50 24 2 4 81 8 17 1
-7 60 1 2 51 1 2 2 81 8 18 2
-7 59 1 7 51 1 2 5 81 8 18 2
-7 58 1 12 51 1 3 1 82 9 25 1
-7 57 1 17 51 1 1 3 82 5 14 2
-7 56 1 22 51 1 1 5 82 5 14 2
-7 55 1 2 51 8 2 2 82 5 15 3
-7 54 1 7 51 8 2 5 82 5 15 3
-7 53 1 12 51 8 1 2 82 6 18 3
-7 52 1 17 51 8 1 4 82 6 18 3
-7 51 1 22 51 8 3 3 82 10 29 1
-7 50 1 10 51 16 3 5 82 11 32 1
-7 49 1 9 51 16 1 3 82 7 21 3
-7 48 1 8 51 16 1 1 82 7 21 3
-7 47 1 7 51 16 2 4 82 8 23 2
-7 46 1 6 51 16 2 2 82 8 23 2
-7 45 1 10 51 23 1 4 82 8 24 3
-7 44 1 9 51 23 1 2 82 8 24 3
-7 43 1 8 51 23 3 3 82 12 35 1
-7 42 1 7 51 23 2 4 83 5 8 1
-7 41 1 6 51 23 2 2 83 5 8 1
-7 40 1 10 51 29 2 4 83 5 9 2
-7 39 1 9 51 29 2 1 83 5 9 2
-7 38 1 8 51 29 3 5 83 6 12 3
-7 37 1 7 51 29 1 3 83 6 10 1
-7 36 1 6 51 29 1 1 83 6 10 1
-7 35 1 10 51 30 2 4 83 6 11 2
-7 34 1 9 51 30 3 5 83 7 13 1
-7 33 1 8 51 30 3 4 83 7 13 1
-7 32 1 7 51 30 1 3 83 3 4 1
-7 31 1 6 51 30 1 1 83 3 4 1
-7 30 1 10 51 33 2 5 83 4 6 2
-7 29 1 9 51 33 2 4 83 4 6 2
-7 28 1 8 51 33 2 3 83 4 6 2
-7 27 1 7 51 33 2 2 83 4 6 2
-7 26 1 6 51 33 2 1 83 4 6 2
-6 75 1 1 50 11 1 1 81 1 1 1
-6 74 1 6 50 11 1 2 81 1 1 1
-6 73 1 11 50 11 1 3 81 1 1 1
-6 72 1 16 50 11 1 4 81 1 1 1
-6 71 1 21 50 11 1 5 81 1 1 1
-6 70 1 1 50 17 1 1 81 2 4 1
-6 69 1 6 50 17 1 3 81 2 4 1
-6 68 1 11 50 17 1 5 81 2 4 1
-6 67 1 16 50 17 2 1 81 7 14 1
-6 66 1 21 50 17 2 2 81 7 14 1
-6 65 1 1 50 24 1 1 81 7 15 2
-6 64 1 6 50 24 1 2 81 7 15 2
-6 63 1 11 50 24 1 4 81 7 15 2
-6 62 1 16 50 24 2 1 81 8 17 1
-6 61 1 21 50 24 2 3 81 8 17 1
-6 60 1 1 51 1 2 1 81 8 18 2
-6 59 1 6 51 1 2 4 81 8 18 2
-6 58 1 11 51 1 1 1 82 5 14 2
-6 57 1 16 51 1 1 2 82 5 14 2
-6 56 1 21 51 1 1 4 82 5 14 2
-6 55 1 1 51 8 2 1 82 5 15 3
-6 54 1 6 51 8 2 4 82 5 15 3
-6 53 1 11 51 8 1 1 82 6 18 3
-6 52 1 16 51 8 1 3 82 6 18 3
-6 51 1 21 51 8 1 5 82 6 18 3
-6 50 1 5 51 16 1 5 82 7 21 3
-6 49 1 4 51 16 1 4 82 7 21 3
-6 48 1 3 51 16 1 2 82 7 21 3
-6 47 1 2 51 16 2 5 82 8 23 2
-6 46 1 1 51 16 2 3 82 8 23 2
-6 45 1 5 51 23 1 5 82 8 24 3
-6 44 1 4 51 23 1 3 82 8 24 3
-6 43 1 3 51 23 1 1 82 8 24 3
-6 42 1 2 51 23 2 5 83 5 8 1
-6 41 1 1 51 23 2 3 83 5 8 1
-6 40 1 5 51 29 2 5 83 5 9 2
-6 39 1 4 51 29 2 2 83 5 9 2
-6 38 1 3 51 29 1 5 83 6 10 1
-6 37 1 2 51 29 1 4 83 6 10 1
-6 36 1 1 51 29 1 2 83 6 10 1
-6 35 1 5 51 30 2 5 83 6 11 2
-6 34 1 4 51 30 2 1 83 6 11 2
-6 33 1 3 51 30 1 5 83 3 4 1
-6 32 1 2 51 30 1 4 83 3 4 1
-6 31 1 1 51 30 1 2 83 3 4 1
-6 30 1 5 51 33 1 5 83 4 5 1
-6 29 1 4 51 33 1 4 83 4 5 1
-6 28 1 3 51 33 1 3 83 4 5 1
-6 27 1 2 51 33 1 2 83 4 5 1
-6 26 1 1 51 33 1 1 83 4 5 1
-5 65 1 5 50 25 3 2 81 3 5 1
-5 64 1 10 50 25 3 4 81 3 5 1
-5 63 1 15 50 25 4 1 81 4 7 2
-5 62 1 20 50 25 4 3 81 4 7 2
-5 61 1 25 50 25 4 5 81 4 7 2
-5 60 1 5 51 2 4 5 81 4 6 1
-5 59 1 10 51 2 3 3 82 1 3 3
-5 58 1 15 51 2 5 1 82 5 13 1
-5 57 1 20 51 2 5 3 82 5 13 1
-5 56 1 25 51 2 5 5 82 5 13 1
-5 55 1 5 51 9 5 1 82 6 17 2
-5 54 1 10 51 9 5 2 82 6 17 2
-5 53 1 15 51 9 5 3 82 6 17 2
-5 52 1 20 51 9 5 4 82 6 17 2
-5 51 1 25 51 9 5 5 82 6 17 2
-5 50 1 25 51 17 5 5 82 7 20 2
-5 49 1 24 51 17 5 4 82 7 20 2
-5 48 1 23 51 17 5 3 82 7 20 2
-5 47 1 22 51 17 5 2 82 7 20 2
-5 46 1 21 51 17 5 1 82 7 20 2
-5 45 1 25 51 24 5 4 82 8 22 1
-5 44 1 24 51 24 5 2 82 8 22 1
-5 43 1 23 51 24 5 1 82 8 22 1
-5 42 1 22 51 24 3 1 82 4 12 3
-5 41 1 21 51 24 4 1 83 1 1 1
-5 40 1 25 51 34 2 4 83 1 2 2
-5 39 1 24 51 34 2 2 83 1 2 2
-5 38 1 23 51 34 2 1 83 1 2 2
-5 37 1 22 51 34 1 3 83 2 3 1
-5 36 1 21 51 34 1 1 83 2 3 1
-4 65 1 4 50 25 3 1 81 3 5 1
-4 64 1 9 50 25 3 3 81 3 5 1
-4 63 1 14 50 25 3 5 81 3 5 1
-4 62 1 19 50 25 4 2 81 4 7 2
-4 61 1 24 50 25 4 4 81 4 7 2
-4 60 1 4 51 2 4 4 81 4 6 1
-4 59 1 9 51 2 3 2 82 1 3 3
-4 58 1 14 51 2 3 5 82 1 3 3
-4 57 1 19 51 2 5 2 82 5 13 1
-4 56 1 24 51 2 5 4 82 5 13 1
-4 55 1 4 51 9 4 1 82 6 16 1
-4 54 1 9 51 9 4 2 82 6 16 1
-4 53 1 14 51 9 4 3 82 6 16 1
-4 52 1 19 51 9 4 4 82 6 16 1
-4 51 1 24 51 9 4 5 82 6 16 1
-4 50 1 20 51 17 4 5 82 7 19 1
-4 49 1 19 51 17 4 4 82 7 19 1
-4 48 1 18 51 17 4 3 82 7 19 1
-4 47 1 17 51 17 4 2 82 7 19 1
-4 46 1 16 51 17 4 1 82 7 19 1
-4 45 1 20 51 24 5 5 82 8 22 1
-4 44 1 19 51 24 5 3 82 8 22 1
-4 43 1 18 51 24 3 3 82 4 12 3
-4 42 1 17 51 24 3 2 82 4 12 3
-4 41 1 16 51 24 4 2 83 1 1 1
-4 40 1 20 51 34 2 5 83 1 2 2
-4 39 1 19 51 34 2 3 83 1 2 2
-4 38 1 18 51 34 1 5 83 2 3 1
-4 37 1 17 51 34 1 4 83 2 3 1
-4 36 1 16 51 34 1 2 83 2 3 1
-3 60 1 3 51 2 4 3 81 4 6 1
-3 59 1 8 51 2 3 1 82 1 3 3
-3 58 1 13 51 2 3 4 82 1 3 3
-3 57 1 18 51 2 2 4 82 1 2 2
-3 56 1 23 51 2 2 5 82 1 2 2
-3 55 1 3 51 9 3 1 82 2 6 3
-3 54 1 8 51 9 3 2 82 2 6 3
-3 53 1 13 51 9 3 3 82 2 6 3
-3 52 1 18 51 9 3 4 82 2 6 3
-3 51 1 23 51 9 3 5 82 2 6 3
-3 50 1 15 51 17 3 5 82 3 9 3
-3 49 1 14 51 17 3 4 82 3 9 3
-3 48 1 13 51 17 3 3 82 3 9 3
-3 47 1 12 51 17 3 2 82 3 9 3
-3 46 1 11 51 17 3 1 82 3 9 3
-3 45 1 15 51 24 3 5 82 4 12 3
-3 44 1 14 51 24 3 4 82 4 12 3
-3 43 1 13 51 24 2 2 82 4 11 2
-3 42 1 12 51 24 2 1 82 4 11 2
-3 41 1 11 51 24 4 3 83 1 1 1
-2 60 1 2 51 2 4 2 81 4 6 1
-2 59 1 7 51 2 2 1 82 1 2 2
-2 58 1 12 51 2 2 2 82 1 2 2
-2 57 1 17 51 2 2 3 82 1 2 2
-2 56 1 22 51 2 1 5 82 1 1 1
-2 55 1 2 51 9 2 1 82 2 5 2
-2 54 1 7 51 9 2 2 82 2 5 2
-2 53 1 12 51 9 2 3 82 2 5 2
-2 52 1 17 51 9 2 4 82 2 5 2
-2 51 1 22 51 9 2 5 82 2 5 2
-2 50 1 10 51 17 2 5 82 3 8 2
-2 49 1 9 51 17 2 4 82 3 8 2
-2 48 1 8 51 17 2 3 82 3 8 2
-2 47 1 7 51 17 2 2 82 3 8 2
-2 46 1 6 51 17 2 1 82 3 8 2
-2 45 1 10 51 24 2 5 82 4 11 2
-2 44 1 9 51 24 2 4 82 4 11 2
-2 43 1 8 51 24 2 3 82 4 11 2
-2 42 1 7 51 24 1 1 82 4 10 1
-2 41 1 6 51 24 4 4 83 1 1 1
-1 60 1 1 51 2 4 1 81 4 6 1
-1 59 1 6 51 2 1 1 82 1 1 1
-1 58 1 11 51 2 1 2 82 1 1 1
-1 57 1 16 51 2 1 3 82 1 1 1
-1 56 1 21 51 2 1 4 82 1 1 1
-1 55 1 1 51 9 1 1 82 2 4 1
-1 54 1 6 51 9 1 2 82 2 4 1
-1 53 1 11 51 9 1 3 82 2 4 1
-1 52 1 16 51 9 1 4 82 2 4 1
-1 51 1 21 51 9 1 5 82 2 4 1
-1 50 1 5 51 17 1 5 82 3 7 1
-1 49 1 4 51 17 1 4 82 3 7 1
-1 48 1 3 51 17 1 3 82 3 7 1
-1 47 1 2 51 17 1 2 82 3 7 1
-1 46 1 1 51 17 1 1 82 3 7 1
-1 45 1 5 51 24 1 5 82 4 10 1
-1 44 1 4 51 24 1 4 82 4 10 1
-1 43 1 3 51 24 1 3 82 4 10 1
-1 42 1 2 51 24 1 2 82 4 10 1
-1 41 1 1 51 24 4 5 83 1 1 1
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/ESAlignment_2010.txt b/CalibCalorimetry/EcalTrivialCondModules/data/ESAlignment_2010.txt
deleted file mode 100644
index 3c7f29c5ccec0..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/ESAlignment_2010.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-0 0 0 -0.02 -0.81 -0.94
-0 0 0 -0.02 -0.81 -0.94
-0 0 0 -0.02 -0.81 -0.94
-0 0 0 -0.02 -0.81 -0.94
-0 0 0  0.52 -0.81  0.81
-0 0 0  0.52 -0.81  0.81
-0 0 0  0.52 -0.81  0.81
-0 0 0  0.52 -0.81  0.81
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/ampWeightsAfterGainSwitch_CMS.txt b/CalibCalorimetry/EcalTrivialCondModules/data/ampWeightsAfterGainSwitch_CMS.txt
deleted file mode 100644
index 89fbb19d3affc..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/ampWeightsAfterGainSwitch_CMS.txt
+++ /dev/null
@@ -1 +0,0 @@
-         0          0          0          0          0          1          0          0          0          0 
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/ampWeightsAfterGainSwitch_TB.txt b/CalibCalorimetry/EcalTrivialCondModules/data/ampWeightsAfterGainSwitch_TB.txt
deleted file mode 100644
index a1f3fadf7fd37..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/ampWeightsAfterGainSwitch_TB.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-         0          0          0          0          0  0.3284995    0.33056    0.26536  0.1924975  0.1320604 
-         0          0          0          0          0  0.3334231  0.3314907  0.2647257  0.1913318  0.1310585 
-         0          0          0          0          0  0.3404184  0.3336056   0.264299  0.1903705   0.130107 
-         0          0          0          0          0  0.3441611  0.3344088  0.2637909  0.1896032  0.1294431 
-         0          0          0          0          0  0.3490711  0.3348735  0.2626309  0.1883613  0.1282652 
-         0          0          0          0          0  0.3549366  0.3366834  0.2627405  0.1878934  0.1278116 
-         0          0          0          0          0  0.3603595  0.3380975  0.2625565  0.1872545  0.1272162 
-         0          0          0          0          0  0.3641417  0.3383819   0.261776  0.1863267  0.1263998 
-         0          0          0          0          0   0.370002  0.3403027  0.2622611  0.1860801  0.1261072 
-         0          0          0          0          0  0.3743537  0.3412292  0.2618798  0.1854807  0.1255168 
-         0          0          0          0          0  0.3810421  0.3433307  0.2621588  0.1851912  0.1251092 
-         0          0          0          0          0  0.3852243  0.3444737  0.2621012   0.184834  0.1246824 
-         0          0          0          0          0  0.3914841  0.3462211   0.262314  0.1846119  0.1243146 
-         0          0          0          0          0  0.3973062  0.3481044  0.2628958  0.1846256  0.1240361 
-         0          0          0          0          0  0.4031544  0.3500497  0.2632382  0.1843459  0.1237492 
-         0          0          0          0          0  0.4071215  0.3510521  0.2632677   0.184123   0.123418 
-         0          0          0          0          0  0.4123373  0.3527568  0.2635849  0.1839281  0.1230909 
-         0          0          0          0          0  0.4195829  0.3553701  0.2644269  0.1842014  0.1231271 
-         0          0          0          0          0  0.4246644  0.3573882  0.2652961  0.1844491  0.1231522 
-         0          0          0          0          0  0.4305294   0.359435  0.2658421  0.1843721  0.1229629 
-         0          0          0          0          0    0.43739  0.3625168  0.2671447  0.1850936  0.1232396 
-         0          0          0          0          0  0.4430676  0.3647931  0.2680159  0.1852103  0.1232015 
-         0          0          0          0          0  0.4487655  0.3671344  0.2688131  0.1857354   0.123289 
-         0          0          0          0          0  0.4540173  0.3692107  0.2696989  0.1858262  0.1232697 
-         0          0          0          0          0   0.460665  0.3721084  0.2707668  0.1860999  0.1230775 
-         0          0          0          0  0.1154701  0.3328303   0.334918  0.2688584  0.1950353          0 
-         0          0          0          0  0.1271631  0.3344993  0.3325607  0.2655802  0.1919494          0 
-         0          0          0          0  0.1465225  0.3354556  0.3287422  0.2604459  0.1875952          0 
-         0          0          0          0  0.1575364    0.33522  0.3257211  0.2569378  0.1846775          0 
-         0          0          0          0  0.1701632  0.3349125  0.3212907  0.2519784  0.1807212          0 
-         0          0          0          0  0.1836566  0.3348869  0.3176648  0.2478988  0.1772797          0 
-         0          0          0          0  0.1946809  0.3349004  0.3142112  0.2440071  0.1740251          0 
-         0          0          0          0  0.2046062   0.333194  0.3096235  0.2395281  0.1704912          0 
-         0          0          0          0  0.2157415   0.332752  0.3060428   0.235858  0.1673465          0 
-         0          0          0          0  0.2250062   0.331173  0.3018693  0.2316726   0.164086          0 
-         0          0          0          0  0.2361516  0.3303897  0.2976913  0.2273097  0.1605735          0 
-         0          0          0          0  0.2433612  0.3292542  0.2944243  0.2240199  0.1579791          0 
-         0          0          0          0  0.2522048  0.3287018  0.2906976  0.2202467  0.1550057          0 
-         0          0          0          0  0.2602875  0.3279947  0.2873763  0.2170326   0.152417          0 
-         0          0          0          0  0.2678034  0.3273605  0.2842396  0.2137488  0.1496885          0 
-         0          0          0          0  0.2726848  0.3267652  0.2817626  0.2113048  0.1477814          0 
-         0          0          0          0  0.2788928   0.326086  0.2789684  0.2084492  0.1454546          0 
-         0          0          0          0  0.2859728  0.3267729  0.2767637  0.2059368  0.1434568          0 
-         0          0          0          0  0.2916403  0.3263194  0.2746232  0.2038581  0.1417338          0 
-         0          0          0          0  0.2970928  0.3265458  0.2726225  0.2016346  0.1398416          0 
-         0          0          0          0   0.303723  0.3268482  0.2708977  0.1996291  0.1383148          0 
-         0          0          0          0  0.3088484  0.3270405  0.2692639    0.19783  0.1367089          0 
-         0          0          0          0  0.3131766  0.3283558  0.2686274   0.196687  0.1359002          0 
-         0          0          0          0  0.3178205  0.3283567  0.2670224   0.195053  0.1343941          0 
-         0          0          0          0  0.3229595  0.3293357  0.2660254  0.1935749  0.1330454          0 
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/ampWeightsES b/CalibCalorimetry/EcalTrivialCondModules/data/ampWeightsES
deleted file mode 100644
index 8872409aee1cc..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/ampWeightsES
+++ /dev/null
@@ -1 +0,0 @@
-0. 1. 0. 0. 1. 0. 
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/ampWeightsES_CMS.txt b/CalibCalorimetry/EcalTrivialCondModules/data/ampWeightsES_CMS.txt
deleted file mode 100644
index 8872409aee1cc..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/ampWeightsES_CMS.txt
+++ /dev/null
@@ -1 +0,0 @@
-0. 1. 0. 0. 1. 0. 
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/ampWeights_CMS.txt b/CalibCalorimetry/EcalTrivialCondModules/data/ampWeights_CMS.txt
deleted file mode 100644
index f822783a89ce5..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/ampWeights_CMS.txt
+++ /dev/null
@@ -1 +0,0 @@
--0.3812788 -0.3812788 -0.3812788          0   0.235699  0.4228363  0.3298652  0.1575187 -0.002082776          0 
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/ampWeights_TB.txt b/CalibCalorimetry/EcalTrivialCondModules/data/ampWeights_TB.txt
deleted file mode 100644
index 618db40dd2635..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/ampWeights_TB.txt
+++ /dev/null
@@ -1,50 +0,0 @@
--0.3550228 -0.3550228 -0.3550228          0 -0.09205024  0.4029674  0.4077219  0.2572773 0.08915202          0 
--0.3605403 -0.3605403 -0.3605403          0 -0.06752773  0.4102221  0.4057551  0.2514168 0.08175464          0 
--0.3692936 -0.3692936 -0.3692936          0 -0.02540123  0.4180304  0.4022737  0.2419804 0.07099769          0 
--0.3732241 -0.3732241 -0.3732241          0 5.879649e-05  0.4210806  0.3985729  0.2355906 0.06436958          0 
--0.3764706 -0.3764706 -0.3764706          0 0.03057039   0.424661   0.392077  0.2262774 0.05582587          0 
--0.3804191 -0.3804191 -0.3804191          0 0.06268993  0.4275638  0.3860119  0.2176873 0.04730432          0 
--0.3826197 -0.3826197 -0.3826197          0 0.08964073  0.4297879  0.3795996  0.2092973  0.0395336          0 
--0.3830421 -0.3830421 -0.3830421          0  0.1155749  0.4289379  0.3714974  0.2006781 0.03243784          0 
--0.3844273 -0.3844273 -0.3844273          0  0.1431023  0.4292155  0.3639062  0.1922908 0.02476718          0 
--0.3839771 -0.3839771 -0.3839771          0  0.1672862   0.427394  0.3556001  0.1836189 0.01803226          0 
--0.3836795 -0.3836795 -0.3836795          0  0.1952224  0.4262376  0.3460808  0.1735474 0.009950358          0 
--0.3825895 -0.3825895 -0.3825895          0  0.2137568  0.4242338  0.3388848  0.1663618 0.004531481          0 
--0.3812788 -0.3812788 -0.3812788          0   0.235699  0.4228363  0.3298652  0.1575187 -0.002082776          0 
- -0.379944  -0.379944  -0.379944          0  0.2554686   0.420755  0.3215976  0.1498751 -0.007864308          0 
- -0.378062  -0.378062  -0.378062          0  0.2736468   0.418581  0.3136449  0.1421032 -0.01378992          0 
--0.3763315 -0.3763315 -0.3763315          0  0.2855727  0.4168453  0.3076078  0.1365814 -0.01761286          0 
--0.3742432 -0.3742432 -0.3742432          0  0.3003047  0.4144494  0.3004877  0.1299253 -0.02243731          0 
--0.3728704 -0.3728704 -0.3728704          0  0.3156794  0.4139156  0.2935063   0.122973 -0.02746293          0 
--0.3713157 -0.3713157 -0.3713157          0  0.3283633  0.4115626  0.2875374  0.1177636 -0.03127976          0 
--0.3695197 -0.3695197 -0.3695197          0  0.3400439   0.410388     0.2816  0.1120555 -0.03552807          0 
--0.3682894 -0.3682894 -0.3682894          0  0.3537168  0.4086897   0.275685  0.1062661 -0.03948933          0 
--0.3667372 -0.3667372 -0.3667372          0  0.3641942  0.4072483  0.2705122  0.1014542 -0.04319723          0 
--0.3662989 -0.3662989 -0.3662989          0  0.3721701  0.4079624  0.2671232 0.09748807 -0.04584699          0 
--0.3646816 -0.3646816 -0.3646816          0  0.3814887  0.4062255  0.2622265 0.09325869 -0.04915462          0 
--0.3635788 -0.3635788 -0.3635788          0  0.3909708  0.4058681  0.2579524 0.08868195 -0.05273683          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/barrel_ly.txt b/CalibCalorimetry/EcalTrivialCondModules/data/barrel_ly.txt
deleted file mode 100644
index b97322795faf4..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/barrel_ly.txt
+++ /dev/null
@@ -1,62900 +0,0 @@
-         0          1 33101    466 1L   6        
-         0          2 33101    406 1R   6        
-         0          3 33101    472 1L   6        
-         0          4 33101    411 1R   6        
-         0          5 33101    477 1L   6        
-         0          6 33101    416 1R   6        
-         0          7 33101    487 1L   6        
-         0          8 33101    421 1R   6        
-         0          9 33101    492 1L   6        
-         0         10 33101    426 1R   6        
-         0         11 33101    459 1L   6        
-         0         12 33101    431 1R   6        
-         0         13 33101    498 1L   6        
-         0         14 33101    436 1R   6        
-         0         15 33101   1466 1L   8        
-         0         16 33101    441 1R   6        
-         0         17 33101   1471 1L   8        
-         0         18 33101    446 1R   6        
-         0         19 33101   1476 1L   8        
-         0         20 33101    401 1R   6        
-         0         21 33101    465 1L   6        
-         0         22 33101    405 1R   6        
-         0         23 33101    471 1L   6        
-         0         24 33101    410 1R   6        
-         0         25 33101    476 1L   6        
-         0         26 33101    415 1R   6        
-         0         27 33101    484 1L   6        
-         0         28 33101    420 1R   6        
-         0         29 33101    491 1L   6        
-         0         30 33101    425 1R   6        
-         0         31 33101    454 1L   6        
-         0         32 33101    430 1R   6        
-         0         33 33101    497 1L   6        
-         0         34 33101    435 1R   6        
-         0         35 33101    503 1L   6        
-         0         36 33101    440 1R   6        
-         0         37 33101   1470 1L   8        
-         0         38 33101    445 1R   6        
-         0         39 33101   1475 1L   8        
-         0         40 33101    451 1R   6        
-         0         41 33101    464 1L   6        
-         0         42 33101    404 1R   6        
-         0         43 33101    469 1L   6        
-         0         44 33101    409 1R   6        
-         0         45 33101    475 1L   6        
-         0         46 33101    414 1R   6        
-         0         47 33101    483 1L   6        
-         0         48 33101    419 1R   6        
-         0         49 33101    490 1L   6        
-         0         50 33101    424 1R   6        
-         0         51 33101    456 1L   6        
-         0         52 33101    429 1R   6        
-         0         53 33101    496 1L   6        
-         0         54 33101    434 1R   6        
-         0         55 33101    502 1L   6        
-         0         56 33101    439 1R   6        
-         0         57 33101   1469 1L   8        
-         0         58 33101    444 1R   6        
-         0         59 33101   1474 1L   8        
-         0         60 33101    450 1R   6        
-         0         61 33101    463 1L   6        
-         0         62 33101    403 1R   6        
-         0         63 33101    468 1L   6        
-         0         64 33101    408 1R   6        
-         0         65 33101    474 1L   6        
-         0         66 33101    413 1R   6        
-         0         67 33101    481 1L   6        
-         0         68 33101    418 1R   6        
-         0         69 33101    489 1L   6        
-         0         70 33101    423 1R   6        
-         0         71 33101    455 1L   6        
-         0         72 33101    428 1R   6        
-         0         73 33101    494 1L   6        
-         0         74 33101    433 1R   6        
-         0         75 33101    501 1L   6        
-         0         76 33101    438 1R   6        
-         0         77 33101   1468 1L   8        
-         0         78 33101    443 1R   6        
-         0         79 33101   1473 1L   8        
-         0         80 33101    449 1R   6        
-         0         81 33101    460 1L   6        
-         0         82 33101    402 1R   6        
-         0         83 33101    467 1L   6        
-         0         84 33101    407 1R   6        
-         0         85 33101    473 1L   6        
-         0         86 33101    412 1R   6        
-         0         87 33101    480 1L   6        
-         0         88 33101    417 1R   6        
-         0         89 33101    488 1L   6        
-         0         90 33101    422 1R   6        
-         0         91 33101    453 1L   6        
-         0         92 33101    427 1R   6        
-         0         93 33101    493 1L   6        
-         0         94 33101    432 1R   6        
-         0         95 33101    500 1L   6        
-         0         96 33101    437 1R   6        
-         0         97 33101   1467 1L   8        
-         0         98 33101    442 1R   6        
-         0         99 33101   1472 1L   8        
-         0        100 33101    447 1R   6        
-         0        101 33101    560 2L   6        
-         0        102 33101    509 2R   6        
-         0        103 33101    570 2L   6        
-         0        104 33101    514 2R   6        
-         0        105 33101    572 2L   6        
-         0        106 33101    520 2R   6        
-         0        107 33101    584 2L   6        
-         0        108 33101    526 2R   6        
-         0        109 33101    593 2L   6        
-         0        110 33101    532 2R   6        
-         0        111 33101   1499 2L   8        
-         0        112 33101    538 2R   6        
-         0        113 33101    588 2L   6        
-         0        114 33101    543 2R   6        
-         0        115 33101   1504 2L   8        
-         0        116 33101    548 2R   6        
-         0        117 33101   1509 2L   8        
-         0        118 33101    553 2R   6        
-         0        119 33101   2405 2L   9        
-         0        120 33101   1484 2R   8        
-         0        121 33101    559 2L   6        
-         0        122 33101    508 2R   6        
-         0        123 33101    569 2L   6        
-         0        124 33101    513 2R   6        
-         0        125 33101    576 2L   6        
-         0        126 33101    518 2R   6        
-         0        127 33101    582 2L   6        
-         0        128 33101    525 2R   6        
-         0        129 33101    592 2L   6        
-         0        130 33101    530 2R   6        
-         0        131 33101   1498 2L   8        
-         0        132 33101    537 2R   6        
-         0        133 33101    587 2L   6        
-         0        134 33101    542 2R   6        
-         0        135 33101   1503 2L   8        
-         0        136 33101    547 2R   6        
-         0        137 33101   1508 2L   8        
-         0        138 33101    552 2R   6        
-         0        139 33101   2404 2L   9        
-         0        140 33101   1483 2R   8        
-         0        141 33101    558 2L   6        
-         0        142 33101    507 2R   6        
-         0        143 33101    564 2L   6        
-         0        144 33101    512 2R   6        
-         0        145 33101    575 2L   6        
-         0        146 33101    517 2R   6        
-         0        147 33101    581 2L   6        
-         0        148 33101    524 2R   6        
-         0        149 33101    591 2L   6        
-         0        150 33101    529 2R   6        
-         0        151 33101   1497 2L   8        
-         0        152 33101    535 2R   6        
-         0        153 33101    586 2L   6        
-         0        154 33101    541 2R   6        
-         0        155 33101   1502 2L   8        
-         0        156 33101    546 2R   6        
-         0        157 33101   1507 2L   8        
-         0        158 33101    551 2R   6        
-         0        159 33101   2401 2L   9        
-         0        160 33101   1482 2R   8        
-         0        161 33101    557 2L   6        
-         0        162 33101    506 2R   6        
-         0        163 33101    563 2L   6        
-         0        164 33101    511 2R   6        
-         0        165 33101    574 2L   6        
-         0        166 33101    516 2R   6        
-         0        167 33101    580 2L   6        
-         0        168 33101    523 2R   6        
-         0        169 33101    590 2L   6        
-         0        170 33101    528 2R   6        
-         0        171 33101   1496 2L   8        
-         0        172 33101    534 2R   6        
-         0        173 33101    585 2L   6        
-         0        174 33101    540 2R   6        
-         0        175 33101   1501 2L   8        
-         0        176 33101    545 2R   6        
-         0        177 33101   1506 2L   8        
-         0        178 33101    550 2R   6        
-         0        179 33101     11 2L   5        
-         0        180 33101   1481 2R   8        
-         0        181 33101    561 2L   6        
-         0        182 33101    504 2R   6        
-         0        183 33101    562 2L   6        
-         0        184 33101    510 2R   6        
-         0        185 33101    573 2L   6        
-         0        186 33101    515 2R   6        
-         0        187 33101    578 2L   6        
-         0        188 33101    522 2R   6        
-         0        189 33101    589 2L   6        
-         0        190 33101    527 2R   6        
-         0        191 33101    594 2L   6        
-         0        192 33101    533 2R   6        
-         0        193 33101    568 2L   6        
-         0        194 33101    539 2R   6        
-         0        195 33101   1500 2L   8        
-         0        196 33101    544 2R   6        
-         0        197 33101   1505 2L   8        
-         0        198 33101    549 2R   6        
-         0        199 33101   1510 2L   8        
-         0        200 33101    555 2R   6        
-         0        201 33101    682 3L   6        
-         0        202 33101    632 3R   6        
-         0        203 33101    687 3L   6        
-         0        204 33101    638 3R   6        
-         0        205 33101    692 3L   6        
-         0        206 33101    643 3R   6        
-         0        207 33101   1526 3L   8        
-         0        208 33101   1514 3R   8        
-         0        209 33101   1530 3L   8        
-         0        210 33101   1515 3R   8        
-         0        211 33101    662 3L   6        
-         0        212 33101    599 3R   6        
-         0        213 33101    667 3L   6        
-         0        214 33101    605 3R   6        
-         0        215 33101    677 3L   6        
-         0        216 33101    610 3R   6        
-         0        217 33101    656 3L   6        
-         0        218 33101    615 3R   6        
-         0        219 33101    672 3L   6        
-         0        220 33101    626 3R   6        
-         0        221 33101    681 3L   6        
-         0        222 33101    631 3R   6        
-         0        223 33101    686 3L   6        
-         0        224 33101    636 3R   6        
-         0        225 33101    691 3L   6        
-         0        226 33101    642 3R   6        
-         0        227 33101    696 3L   6        
-         0        228 33101   1513 3R   8        
-         0        229 33101   1529 3L   8        
-         0        230 33101    620 3R   6        
-         0        231 33101    661 3L   6        
-         0        232 33101    598 3R   6        
-         0        233 33101    666 3L   6        
-         0        234 33101    604 3R   6        
-         0        235 33101    676 3L   6        
-         0        236 33101    609 3R   6        
-         0        237 33101    655 3L   6        
-         0        238 33101    614 3R   6        
-         0        239 33101    671 3L   6        
-         0        240 33101    625 3R   6        
-         0        241 33101    680 3L   6        
-         0        242 33101    630 3R   6        
-         0        243 33101    685 3L   6        
-         0        244 33101    635 3R   6        
-         0        245 33101    690 3L   6        
-         0        246 33101    641 3R   6        
-         0        247 33101    695 3L   6        
-         0        248 33101   1512 3R   8        
-         0        249 33101   1528 3L   8        
-         0        250 33101    619 3R   6        
-         0        251 33101    660 3L   6        
-         0        252 33101    597 3R   6        
-         0        253 33101    665 3L   6        
-         0        254 33101    603 3R   6        
-         0        255 33101    675 3L   6        
-         0        256 33101    608 3R   6        
-         0        257 33101    654 3L   6        
-         0        258 33101    613 3R   6        
-         0        259 33101   1531 3L   8        
-         0        260 33101    624 3R   6        
-         0        261 33101    679 3L   6        
-         0        262 33101    629 3R   6        
-         0        263 33101    684 3L   6        
-         0        264 33101    634 3R   6        
-         0        265 33101    689 3L   6        
-         0        266 33101    640 3R   6        
-         0        267 33101    694 3L   6        
-         0        268 33101   1511 3R   8        
-         0        269 33101   1527 3L   8        
-         0        270 33101    618 3R   6        
-         0        271 33101    659 3L   6        
-         0        272 33101    596 3R   6        
-         0        273 33101    664 3L   6        
-         0        274 33101    601 3R   6        
-         0        275 33101    674 3L   6        
-         0        276 33101    607 3R   6        
-         0        277 33101    653 3L   6        
-         0        278 33101    612 3R   6        
-         0        279 33101    669 3L   6        
-         0        280 33101    623 3R   6        
-         0        281 33101    678 3L   6        
-         0        282 33101    628 3R   6        
-         0        283 33101    683 3L   6        
-         0        284 33101    633 3R   6        
-         0        285 33101    688 3L   6        
-         0        286 33101    639 3R   6        
-         0        287 33101    693 3L   6        
-         0        288 33101    645 3R   6        
-         0        289 33101   1532 3L   8        
-         0        290 33101    616 3R   6        
-         0        291 33101    658 3L   6        
-         0        292 33101    595 3R   6        
-         0        293 33101    663 3L   6        
-         0        294 33101    600 3R   6        
-         0        295 33101    673 3L   6        
-         0        296 33101    606 3R   6        
-         0        297 33101    648 3L   6        
-         0        298 33101    611 3R   6        
-         0        299 33101    649 3L   6        
-         0        300 33101    622 3R   6        
-         0        301 33101    752 4L   6        
-         0        302 33101    701 4R   6        
-         0        303 33101    760 4L   6        
-         0        304 33101    706 4R   6        
-         0        305 33101    767 4L   6        
-         0        306 33101    712 4R   6        
-         0        307 33101    772 4L   6        
-         0        308 33101    717 4R   6        
-         0        309 33101    778 4L   6        
-         0        310 33101    724 4R   6        
-         0        311 33101    782 4L   6        
-         0        312 33101    727 4R   6        
-         0        313 33101   1565 4L   8        
-         0        314 33101    737 4R   6        
-         0        315 33101    787 4L   6        
-         0        316 33101    732 4R   6        
-         0        317 33101   1557 4L   8        
-         0        318 33101    743 4R   6        
-         0        319 33101   1562 4L   8        
-         0        320 33101   1542 4R   8        
-         0        321 33101    751 4L   6        
-         0        322 33101    700 4R   6        
-         0        323 33101    757 4L   6        
-         0        324 33101    705 4R   6        
-         0        325 33101    766 4L   6        
-         0        326 33101    710 4R   6        
-         0        327 33101    771 4L   6        
-         0        328 33101    716 4R   6        
-         0        329 33101    777 4L   6        
-         0        330 33101    722 4R   6        
-         0        331 33101    781 4L   6        
-         0        332 33101    726 4R   6        
-         0        333 33101    791 4L   6        
-         0        334 33101    736 4R   6        
-         0        335 33101    786 4L   6        
-         0        336 33101    731 4R   6        
-         0        337 33101    797 4L   6        
-         0        338 33101    742 4R   6        
-         0        339 33101   1561 4L   8        
-         0        340 33101   1541 4R   8        
-         0        341 33101    750 4L   6        
-         0        342 33101    699 4R   6        
-         0        343 33101    756 4L   6        
-         0        344 33101    704 4R   6        
-         0        345 33101    765 4L   6        
-         0        346 33101    709 4R   6        
-         0        347 33101    770 4L   6        
-         0        348 33101    715 4R   6        
-         0        349 33101    776 4L   6        
-         0        350 33101    721 4R   6        
-         0        351 33101    780 4L   6        
-         0        352 33101    725 4R   6        
-         0        353 33101    790 4L   6        
-         0        354 33101    735 4R   6        
-         0        355 33101    785 4L   6        
-         0        356 33101    730 4R   6        
-         0        357 33101    796 4L   6        
-         0        358 33101    740 4R   6        
-         0        359 33101   1560 4L   8        
-         0        360 33101    747 4R   6        
-         0        361 33101   1563 4L   8        
-         0        362 33101    698 4R   6        
-         0        363 33101    755 4L   6        
-         0        364 33101    703 4R   6        
-         0        365 33101    764 4L   6        
-         0        366 33101    708 4R   6        
-         0        367 33101    769 4L   6        
-         0        368 33101    714 4R   6        
-         0        369 33101    775 4L   6        
-         0        370 33101    720 4R   6        
-         0        371 33101    779 4L   6        
-         0        372 33101    723 4R   6        
-         0        373 33101    789 4L   6        
-         0        374 33101    734 4R   6        
-         0        375 33101   1556 4L   8        
-         0        376 33101    729 4R   6        
-         0        377 33101    795 4L   6        
-         0        378 33101    739 4R   6        
-         0        379 33101   1559 4L   8        
-         0        380 33101    745 4R   6        
-         0        381 33101    748 4L   6        
-         0        382 33101    697 4R   6        
-         0        383 33101    753 4L   6        
-         0        384 33101    702 4R   6        
-         0        385 33101    763 4L   6        
-         0        386 33101    707 4R   6        
-         0        387 33101    761 4L   6        
-         0        388 33101    713 4R   6        
-         0        389 33101    762 4L   6        
-         0        390 33101    718 4R   6        
-         0        391 33101    758 4L   6        
-         0        392 33101    711 4R   6        
-         0        393 33101    788 4L   6        
-         0        394 33101   1544 4R   8        
-         0        395 33101    783 4L   6        
-         0        396 33101    728 4R   6        
-         0        397 33101    793 4L   6        
-         0        398 33101    738 4R   6        
-         0        399 33101   1558 4L   8        
-         0        400 33101    744 4R   6        
-         0        401 33101    854 5L   6        
-         0        402 33101    804 5R   6        
-         0        403 33101    859 5L   6        
-         0        404 33101    809 5R   6        
-         0        405 33101    865 5L   6        
-         0        406 33101    814 5R   6        
-         0        407 33101    870 5L   6        
-         0        408 33101    815 5R   6        
-         0        409 33101    875 5L   6        
-         0        410 33101    826 5R   6        
-         0        411 33101    876 5L   6        
-         0        412 33101    827 5R   6        
-         0        413 33101    883 5L   6        
-         0        414 33101    832 5R   6        
-         0        415 33101    888 5L   6        
-         0        416 33101    839 5R   6        
-         0        417 33101    893 5L   6        
-         0        418 33101    844 5R   6        
-         0        419 33101    898 5L   6        
-         0        420 33101    820 5R   6        
-         0        421 33101    853 5L   6        
-         0        422 33101    802 5R   6        
-         0        423 33101    858 5L   6        
-         0        424 33101    808 5R   6        
-         0        425 33101    863 5L   6        
-         0        426 33101    813 5R   6        
-         0        427 33101    869 5L   6        
-         0        428 33101    816 5R   6        
-         0        429 33101    874 5L   6        
-         0        430 33101    825 5R   6        
-         0        431 33101    877 5L   6        
-         0        432 33101    828 5R   6        
-         0        433 33101    884 5L   6        
-         0        434 33101    833 5R   6        
-         0        435 33101    889 5L   6        
-         0        436 33101    840 5R   6        
-         0        437 33101    894 5L   6        
-         0        438 33101    845 5R   6        
-         0        439 33101    899 5L   6        
-         0        440 33101    849 5R   6        
-         0        441 33101    852 5L   6        
-         0        442 33101    801 5R   6        
-         0        443 33101    857 5L   6        
-         0        444 33101    807 5R   6        
-         0        445 33101    862 5L   6        
-         0        446 33101    812 5R   6        
-         0        447 33101    868 5L   6        
-         0        448 33101    817 5R   6        
-         0        449 33101    873 5L   6        
-         0        450 33101    824 5R   6        
-         0        451 33101    878 5L   6        
-         0        452 33101    829 5R   6        
-         0        453 33101    885 5L   6        
-         0        454 33101    834 5R   6        
-         0        455 33101    890 5L   6        
-         0        456 33101    841 5R   6        
-         0        457 33101    895 5L   6        
-         0        458 33101    846 5R   6        
-         0        459 33101    900 5L   6        
-         0        460 33101   1571 5R   8        
-         0        461 33101    851 5L   6        
-         0        462 33101    800 5R   6        
-         0        463 33101    856 5L   6        
-         0        464 33101    806 5R   6        
-         0        465 33101    861 5L   6        
-         0        466 33101    811 5R   6        
-         0        467 33101    867 5L   6        
-         0        468 33101    818 5R   6        
-         0        469 33101    872 5L   6        
-         0        470 33101    823 5R   6        
-         0        471 33101    879 5L   6        
-         0        472 33101    830 5R   6        
-         0        473 33101    886 5L   6        
-         0        474 33101    835 5R   6        
-         0        475 33101    891 5L   6        
-         0        476 33101    842 5R   6        
-         0        477 33101    896 5L   6        
-         0        478 33101    847 5R   6        
-         0        479 33101   1586 5L   8        
-         0        480 33101   1572 5R   8        
-         0        481 33101    880 5L   6        
-         0        482 33101    799 5R   6        
-         0        483 33101    855 5L   6        
-         0        484 33101    805 5R   6        
-         0        485 33101    860 5L   6        
-         0        486 33101    810 5R   6        
-         0        487 33101    866 5L   6        
-         0        488 33101    819 5R   6        
-         0        489 33101    871 5L   6        
-         0        490 33101    822 5R   6        
-         0        491 33101    881 5L   6        
-         0        492 33101    831 5R   6        
-         0        493 33101    887 5L   6        
-         0        494 33101    838 5R   6        
-         0        495 33101    892 5L   6        
-         0        496 33101    843 5R   6        
-         0        497 33101    897 5L   6        
-         0        498 33101    848 5R   6        
-         0        499 33101   1587 5L   8        
-         0        500 33101   1574 5R   8        
-         0        501 33101     89 6L   5        
-         0        502 33101     13 6R   5        
-         0        503 33101    100 6L   5        
-         0        504 33101     37 6R   5        
-         0        505 33101    122 6L   5        
-         0        506 33101     58 6R   5        
-         0        507 33101     69 6L   5        
-         0        508 33101     19 6R   5        
-         0        509 33101    110 6L   5        
-         0        510 33101   1621 6R   8        
-         0        511 33101     93 6L   5        
-         0        512 30301    514 6R   4        
-         0        513 33101    115 6L   5        
-         0        514 30301    513 6R   4        
-         0        515 33101   1635 6L   8        
-         0        516 33101   3162 6R   10       
-         0        517 33101    119 6L   5        
-         0        518 33101   3168 6R   10       
-         0        519 33101   3266 6L   10       
-         0        520 33101   1606 6R   8        
-         0        521 33101     94 6L   5        
-         0        522 33101   3160 6R   10       
-         0        523 33101     80 6L   5        
-         0        524 33101     45 6R   5        
-         0        525 33101    117 6L   5        
-         0        526 33101     59 6R   5        
-         0        527 33101     70 6L   5        
-         0        528 33101     29 6R   5        
-         0        529 33101    105 6L   5        
-         0        530 33101   3165 6R   10       
-         0        531 33101    108 6L   5        
-         0        532 30301    515 6R   4        
-         0        533 33101     68 6L   5        
-         0        534 33101     14 6R   5        
-         0        535 33101   1640 6L   8        
-         0        536 33101   3164 6R   10       
-         0        537 33101    123 6L   5        
-         0        538 33101   3175 6R   10       
-         0        539 33101   3267 6L   10       
-         0        540 33101   3169 6R   10       
-         0        541 33101     92 6L   5        
-         0        542 33101     42 6R   5        
-         0        543 33101     77 6L   5        
-         0        544 33101     55 6R   5        
-         0        545 33101    116 6L   5        
-         0        546 33101     63 6R   5        
-         0        547 33101     72 6L   5        
-         0        548 33101     46 6R   5        
-         0        549 33101    104 6L   5        
-         0        550 33101   3158 6R   10       
-         0        551 33101    109 6L   5        
-         0        552 33101     18 6R   5        
-         0        553 33101    113 6L   5        
-         0        554 33101     28 6R   5        
-         0        555 33101   1642 6L   8        
-         0        556 33101   3166 6R   10       
-         0        557 33101   3263 6L   10       
-         0        558 33101   3179 6R   10       
-         0        559 33101   3268 6L   10       
-         0        560 33101   3170 6R   10       
-         0        561 33101     81 6L   5        
-         0        562 33101     39 6R   5        
-         0        563 33101     73 6L   5        
-         0        564 33101     56 6R   5        
-         0        565 33101    107 6L   5        
-         0        566 33101     60 6R   5        
-         0        567 33101     74 6L   5        
-         0        568 33101     47 6R   5        
-         0        569 33101    102 6L   5        
-         0        570 33101     48 6R   5        
-         0        571 33101    114 6L   5        
-         0        572 33101     21 6R   5        
-         0        573 33101    111 6L   5        
-         0        574 33101     35 6R   5        
-         0        575 33101   3259 6L   10       
-         0        576 33101   3167 6R   10       
-         0        577 33101   3265 6L   10       
-         0        578 33101   3171 6R   10       
-         0        579 33101   3269 6L   10       
-         0        580 33101     25 6R   5        
-         0        581 33101     90 6L   5        
-         0        582 33101     23 6R   5        
-         0        583 33101     67 6L   5        
-         0        584 33101     57 6R   5        
-         0        585 33101    101 6L   5        
-         0        586 33101     64 6R   5        
-         0        587 33101     91 6L   5        
-         0        588 33101     50 6R   5        
-         0        589 33101     76 6L   5        
-         0        590 33101   3157 6R   10       
-         0        591 33101    121 6L   5        
-         0        592 33101     22 6R   5        
-         0        593 33101    112 6L   5        
-         0        594 33101     53 6R   5        
-         0        595 33101   3260 6L   10       
-         0        596 33101     32 6R   5        
-         0        597 33101   3252 6L   10       
-         0        598 33101   3159 6R   10       
-         0        599 33101   3270 6L   10       
-         0        600 33101   3176 6R   10       
-         0        601 33101    215 7L   5        
-         0        602 33101    125 7R   5        
-         0        603 33101    197 7L   5        
-         0        604 33101    165 7R   5        
-         0        605 33101    209 7L   5        
-         0        606 33101    131 7R   5        
-         0        607 33101    231 7L   5        
-         0        608 33101    142 7R   5        
-         0        609 33101   3461 7L   11       
-         0        610 33101    135 7R   5        
-         0        611 33101    185 7L   5        
-         0        612 33101    132 7R   5        
-         0        613 33101    188 7L   5        
-         0        614 33101    159 7R   5        
-         0        615 33101    190 7L   5        
-         0        616 33101    146 7R   5        
-         0        617 33101   3473 7L   11       
-         0        618 33101   3411 7R   11       
-         0        619 33101    216 7L   5        
-         0        620 33101    143 7R   5        
-         0        621 33101    226 7L   5        
-         0        622 33101    126 7R   5        
-         0        623 33101    198 7L   5        
-         0        624 33101    166 7R   5        
-         0        625 33101    210 7L   5        
-         0        626 33101    136 7R   5        
-         0        627 33101    233 7L   5        
-         0        628 33101    144 7R   5        
-         0        629 33101   3456 7L   11       
-         0        630 33101    145 7R   5        
-         0        631 33101    186 7L   5        
-         0        632 33101    134 7R   5        
-         0        633 33101    237 7L   5        
-         0        634 33101    162 7R   5        
-         0        635 33101    193 7L   5        
-         0        636 33101    147 7R   5        
-         0        637 33101   3474 7L   11       
-         0        638 33101   3412 7R   11       
-         0        639 33101    217 7L   5        
-         0        640 33101    158 7R   5        
-         0        641 33101    227 7L   5        
-         0        642 33101    128 7R   5        
-         0        643 33101    201 7L   5        
-         0        644 33101    168 7R   5        
-         0        645 33101    221 7L   5        
-         0        646 33101    137 7R   5        
-         0        647 33101    234 7L   5        
-         0        648 33101    153 7R   5        
-         0        649 33101   3457 7L   11       
-         0        650 33101    182 7R   5        
-         0        651 33101    205 7L   5        
-         0        652 33101    138 7R   5        
-         0        653 33101    192 7L   5        
-         0        654 33101    167 7R   5        
-         0        655 33101    195 7L   5        
-         0        656 33101    149 7R   5        
-         0        657 33101   3459 7L   11       
-         0        658 33101    181 7R   5        
-         0        659 33101    218 7L   5        
-         0        660 33101    160 7R   5        
-         0        661 33101    228 7L   5        
-         0        662 33101    129 7R   5        
-         0        663 33101    213 7L   5        
-         0        664 33101    172 7R   5        
-         0        665 33101    239 7L   5        
-         0        666 33101    140 7R   5        
-         0        667 33101    235 7L   5        
-         0        668 33101    154 7R   5        
-         0        669 33101   3458 7L   11       
-         0        670 33101   3407 7R   11       
-         0        671 33101    241 7L   5        
-         0        672 33101    139 7R   5        
-         0        673 33101    194 7L   5        
-         0        674 33101    169 7R   5        
-         0        675 33101    202 7L   5        
-         0        676 33101    150 7R   5        
-         0        677 33101   3371 7L   10       
-         0        678 33101   3408 7R   11       
-         0        679 33101    219 7L   5        
-         0        680 33101    163 7R   5        
-         0        681 33101    229 7L   5        
-         0        682 33101    130 7R   5        
-         0        683 33101    214 7L   5        
-         0        684 33101    176 7R   5        
-         0        685 30301    554 7L   4        
-         0        686 33101    141 7R   5        
-         0        687 33101    236 7L   5        
-         0        688 33101    157 7R   5        
-         0        689 33101   3453 7L   11       
-         0        690 33101   3406 7R   11       
-         0        691 30301    556 7L   4        
-         0        692 33101    155 7R   5        
-         0        693 33101    196 7L   5        
-         0        694 33101    184 7R   5        
-         0        695 33101    207 7L   5        
-         0        696 33101    151 7R   5        
-         0        697 33101   3472 7L   11       
-         0        698 33101   1661 7R   8        
-         0        699 33101    220 7L   5        
-         0        700 33101    164 7R   5        
-         0        701 33101    304 8L   5        
-         0        702 33101    247 8R   5        
-         0        703 30301    588 8L   4        
-         0        704 33101    271 8R   5        
-         0        705 33101    309 8L   5        
-         0        706 33101    259 8R   5        
-         0        707 33101    333 8L   5        
-         0        708 33101    253 8R   5        
-         0        709 33101    299 8L   5        
-         0        710 33101    269 8R   5        
-         0        711 33101    312 8L   5        
-         0        712 33101    262 8R   5        
-         0        713 33101    343 8L   5        
-         0        714 33101   3542 8R   11       
-         0        715 33101    334 8L   5        
-         0        716 33101    281 8R   5        
-         0        717 30301    582 8L   4        
-         0        718 33101    255 8R   5        
-         0        719 33101   3673 8L   11       
-         0        720 33101   3548 8R   11       
-         0        721 33101    305 8L   5        
-         0        722 33101    249 8R   5        
-         0        723 33101    325 8L   5        
-         0        724 33101    272 8R   5        
-         0        725 33101    310 8L   5        
-         0        726 30301    629 8R   4        
-         0        727 33101    332 8L   5        
-         0        728 30301    632 8R   4        
-         0        729 33101    302 8L   5        
-         0        730 30301    626 8R   4        
-         0        731 33101   3667 8L   11       
-         0        732 33101    265 8R   5        
-         0        733 33101    344 8L   5        
-         0        734 33101   3511 8R   11       
-         0        735 33101    336 8L   5        
-         0        736 33101    282 8R   5        
-         0        737 30301    583 8L   4        
-         0        738 33101    246 8R   5        
-         0        739 33101   3674 8L   11       
-         0        740 33101   3549 8R   11       
-         0        741 33101    307 8L   5        
-         0        742 33101    248 8R   5        
-         0        743 30301    584 8L   4        
-         0        744 33101    273 8R   5        
-         0        745 33101    320 8L   5        
-         0        746 30301    630 8R   4        
-         0        747 33101    331 8L   5        
-         0        748 33101    252 8R   5        
-         0        749 33101    313 8L   5        
-         0        750 33101    277 8R   5        
-         0        751 33101   3671 8L   11       
-         0        752 33101   3552 8R   11       
-         0        753 33101    345 8L   5        
-         0        754 33101   3520 8R   11       
-         0        755 33101    339 8L   5        
-         0        756 33101    284 8R   5        
-         0        757 30301    587 8L   4        
-         0        758 33101    256 8R   5        
-         0        759 33101   3675 8L   11       
-         0        760 33101   3553 8R   11       
-         0        761 33101    308 8L   5        
-         0        762 33101    251 8R   5        
-         0        763 33101    335 8L   5        
-         0        764 33101    274 8R   5        
-         0        765 33101    321 8L   5        
-         0        766 30301    631 8R   4        
-         0        767 33101    330 8L   5        
-         0        768 33101    279 8R   5        
-         0        769 33101    318 8L   5        
-         0        770 33101    278 8R   5        
-         0        771 33101   3605 8L   11       
-         0        772 33101   3556 8R   11       
-         0        773 30301    575 8L   4        
-         0        774 33101   3531 8R   11       
-         0        775 30301    585 8L   4        
-         0        776 33101    285 8R   5        
-         0        777 33101    287 8L   5        
-         0        778 33101    258 8R   5        
-         0        779 33101   3676 8L   11       
-         0        780 33101   3554 8R   11       
-         0        781 33101    306 8L   5        
-         0        782 33101    254 8R   5        
-         0        783 33101    338 8L   5        
-         0        784 33101    268 8R   5        
-         0        785 30301    586 8L   4        
-         0        786 33101    257 8R   5        
-         0        787 33101    329 8L   5        
-         0        788 30301    627 8R   4        
-         0        789 33101    341 8L   5        
-         0        790 33101    280 8R   5        
-         0        791 33101   3626 8L   11       
-         0        792 33101   3558 8R   11       
-         0        793 33101    297 8L   5        
-         0        794 33101   3540 8R   11       
-         0        795 33101    328 8L   5        
-         0        796 33101    286 8R   5        
-         0        797 33101    298 8L   5        
-         0        798 33101    275 8R   5        
-         0        799 33101   3677 8L   11       
-         0        800 33101   3555 8R   11       
-         0        801 30301    679 9L   4        
-         0        802 33101    346 9R   5        
-         0        803 33101    375 9L   5        
-         0        804 30301    656 9R   4        
-         0        805 30301    693 9L   4        
-         0        806 30301    640 9R   4        
-         0        807 33101    387 9L   5        
-         0        808 30301    638 9R   4        
-         0        809 30301    682 9L   4        
-         0        810 33101   3770 9R   11       
-         0        811 30301    675 9L   4        
-         0        812 30301    649 9R   4        
-         0        813 30301    617 9L   4        
-         0        814 33101   3781 9R   11       
-         0        815 33101    376 9L   5        
-         0        816 33101    371 9R   5        
-         0        817 30301    688 9L   4        
-         0        818 33101    358 9R   5        
-         0        819 33101    384 9L   5        
-         0        820 30301    600 9R   4        
-         0        821 30301    680 9L   4        
-         0        822 33101    347 9R   5        
-         0        823 33101    377 9L   5        
-         0        824 30301    658 9R   4        
-         0        825 30301    695 9L   4        
-         0        826 30301    660 9R   4        
-         0        827 30301    684 9L   4        
-         0        828 30301    637 9R   4        
-         0        829 33101   3870 9L   11       
-         0        830 33101   3771 9R   11       
-         0        831 30301    673 9L   4        
-         0        832 30301    646 9R   4        
-         0        833 30301    670 9L   4        
-         0        834 33101   3782 9R   11       
-         0        835 33101    385 9L   5        
-         0        836 30301    636 9R   4        
-         0        837 30301    687 9L   4        
-         0        838 30301    601 9R   4        
-         0        839 33101    386 9L   5        
-         0        840 30301    645 9R   4        
-         0        841 30301    681 9L   4        
-         0        842 33101    348 9R   5        
-         0        843 33101    381 9L   5        
-         0        844 33101    353 9R   5        
-         0        845 30301    697 9L   4        
-         0        846 30301    662 9R   4        
-         0        847 30301    692 9L   4        
-         0        848 30301    639 9R   4        
-         0        849 30301    609 9L   4        
-         0        850 33101   3773 9R   11       
-         0        851 30301    691 9L   4        
-         0        852 30301    602 9R   4        
-         0        853 30301    674 9L   4        
-         0        854 33101   3784 9R   11       
-         0        855 33101    393 9L   5        
-         0        856 33101    354 9R   5        
-         0        857 30301    686 9L   4        
-         0        858 33101    352 9R   5        
-         0        859 33101    388 9L   5        
-         0        860 30301    647 9R   4        
-         0        861 33101    399 9L   5        
-         0        862 33101    349 9R   5        
-         0        863 33101    382 9L   5        
-         0        864 33101    355 9R   5        
-         0        865 30301    698 9L   4        
-         0        866 30301    663 9R   4        
-         0        867 30301    676 9L   4        
-         0        868 30301    635 9R   4        
-         0        869 33101    379 9L   5        
-         0        870 33101   3774 9R   11       
-         0        871 30301    690 9L   4        
-         0        872 30301    603 9R   4        
-         0        873 30301    683 9L   4        
-         0        874 33101   3786 9R   11       
-         0        875 33101    398 9L   5        
-         0        876 30301    641 9R   4        
-         0        877 30301    685 9L   4        
-         0        878 33101    366 9R   5        
-         0        879 33101    396 9L   5        
-         0        880 30301    648 9R   4        
-         0        881 33101    400 9L   5        
-         0        882 33101    351 9R   5        
-         0        883 33101    383 9L   5        
-         0        884 33101    362 9R   5        
-         0        885 30301    699 9L   4        
-         0        886 30301    665 9R   4        
-         0        887 30301    700 9L   4        
-         0        888 30301    634 9R   4        
-         0        889 33101    395 9L   5        
-         0        890 33101   3775 9R   11       
-         0        891 30301    672 9L   4        
-         0        892 30301    633 9R   4        
-         0        893 33101   3869 9L   11       
-         0        894 33101    361 9R   5        
-         0        895 30301    616 9L   4        
-         0        896 30301    644 9R   4        
-         0        897 30301    689 9L   4        
-         0        898 33101   3768 9R   11       
-         0        899 33101    397 9L   5        
-         0        900 30301    650 9R   4        
-         0        901 33101   1803 10L  8        
-         0        902 33101   1738 10R  8        
-         0        903 33101   1778 10L  8        
-         0        904 33101   1725 10R  8        
-         0        905 33101   1772 10L  8        
-         0        906 33101   1717 10R  8        
-         0        907 33101   1756 10L  8        
-         0        908 33101   1704 10R  8        
-         0        909 33101   1751 10L  8        
-         0        910 33101   1691 10R  8        
-         0        911 33101   1758 10L  8        
-         0        912 33101   3939 10R  12       
-         0        913 33101   1791 10L  8        
-         0        914 33101   1699 10R  8        
-         0        915 33101   1787 10L  8        
-         0        916 33101   1733 10R  8        
-         0        917 33101   1765 10L  8        
-         0        918 33101   1712 10R  8        
-         0        919 33101   1760 10L  8        
-         0        920 33101   1693 10R  8        
-         0        921 33101   1804 10L  8        
-         0        922 33101   1741 10R  8        
-         0        923 33101   1779 10L  8        
-         0        924 33101   1729 10R  8        
-         0        925 33101   1773 10L  8        
-         0        926 33101   1719 10R  8        
-         0        927 33101   1757 10L  8        
-         0        928 33101   1707 10R  8        
-         0        929 33101   1752 10L  8        
-         0        930 33101   1692 10R  8        
-         0        931 33101   1767 10L  8        
-         0        932 33101   3940 10R  12       
-         0        933 33101   1796 10L  8        
-         0        934 33101   1728 10R  8        
-         0        935 33101   1788 10L  8        
-         0        936 33101   1736 10R  8        
-         0        937 33101   1766 10L  8        
-         0        938 33101   1697 10R  8        
-         0        939 33101   1761 10L  8        
-         0        940 33101   1727 10R  8        
-         0        941 33101   1808 10L  8        
-         0        942 33101   1743 10R  8        
-         0        943 33101   1780 10L  8        
-         0        944 33101   1732 10R  8        
-         0        945 33101   1774 10L  8        
-         0        946 33101   1721 10R  8        
-         0        947 33101   1769 10L  8        
-         0        948 33101   1709 10R  8        
-         0        949 33101   1753 10L  8        
-         0        950 33101   1698 10R  8        
-         0        951 33101   1777 10L  8        
-         0        952 33101   3941 10R  12       
-         0        953 33101   1799 10L  8        
-         0        954 33101   1701 10R  8        
-         0        955 33101   1792 10L  8        
-         0        956 33101   1749 10R  8        
-         0        957 33101   1768 10L  8        
-         0        958 33101   1720 10R  8        
-         0        959 33101   1762 10L  8        
-         0        960 33101   1695 10R  8        
-         0        961 33101   1809 10L  8        
-         0        962 33101   1748 10R  8        
-         0        963 33101   1781 10L  8        
-         0        964 33101   1734 10R  8        
-         0        965 33101   1775 10L  8        
-         0        966 33101   1722 10R  8        
-         0        967 33101   1770 10L  8        
-         0        968 33101   1711 10R  8        
-         0        969 33101   1754 10L  8        
-         0        970 33101   1702 10R  8        
-         0        971 33101   1797 10L  8        
-         0        972 33101   3942 10R  12       
-         0        973 33101   1801 10L  8        
-         0        974 33101   1705 10R  8        
-         0        975 33101   1794 10L  8        
-         0        976 33101   1744 10R  8        
-         0        977 33101   1784 10L  8        
-         0        978 33101   1723 10R  8        
-         0        979 33101   1763 10L  8        
-         0        980 33101   1696 10R  8        
-         0        981 33101   1810 10L  8        
-         0        982 33101   3938 10R  12       
-         0        983 33101   1782 10L  8        
-         0        984 33101   1735 10R  8        
-         0        985 33101   1776 10L  8        
-         0        986 33101   1724 10R  8        
-         0        987 33101   1771 10L  8        
-         0        988 33101   1715 10R  8        
-         0        989 33101   1755 10L  8        
-         0        990 33101   1703 10R  8        
-         0        991 33101   1800 10L  8        
-         0        992 33101   3943 10R  12       
-         0        993 33101   1802 10L  8        
-         0        994 33101   1710 10R  8        
-         0        995 33101   1795 10L  8        
-         0        996 33101   1747 10R  8        
-         0        997 33101   1785 10L  8        
-         0        998 33101   1726 10R  8        
-         0        999 33101   1764 10L  8        
-         0       1000 33101   1718 10R  8        
-         0       1001 33101   4225 11L  12       
-         0       1002 33101   4130 11R  12       
-         0       1003 33101   4235 11L  12       
-         0       1004 33101   4145 11R  12       
-         0       1005 33101   4230 11L  12       
-         0       1006 33101   4136 11R  12       
-         0       1007 33101   1910 11L  8        
-         0       1008 33101   4123 11R  12       
-         0       1009 33101   1896 11L  8        
-         0       1010 33101   1861 11R  8        
-         0       1011 33101   1890 11L  8        
-         0       1012 33101   1855 11R  8        
-         0       1013 33101   1902 11L  8        
-         0       1014 33101   1841 11R  8        
-         0       1015 33101   1915 11L  8        
-         0       1016 33101   4118 11R  12       
-         0       1017 33101   1883 11L  8        
-         0       1018 33101   1843 11R  8        
-         0       1019 33101   1871 11L  8        
-         0       1020 33101   1818 11R  8        
-         0       1021 33101   4226 11L  12       
-         0       1022 33101   4131 11R  12       
-         0       1023 33101   4236 11L  12       
-         0       1024 33101   4146 11R  12       
-         0       1025 33101   4231 11L  12       
-         0       1026 33101   4137 11R  12       
-         0       1027 33101   1913 11L  8        
-         0       1028 33101   4124 11R  12       
-         0       1029 33101   1898 11L  8        
-         0       1030 33101   1863 11R  8        
-         0       1031 33101   1892 11L  8        
-         0       1032 33101   1856 11R  8        
-         0       1033 33101   1903 11L  8        
-         0       1034 33101   1848 11R  8        
-         0       1035 33101   1917 11L  8        
-         0       1036 33101   4119 11R  12       
-         0       1037 33101   1884 11L  8        
-         0       1038 33101   1845 11R  8        
-         0       1039 33101   1874 11L  8        
-         0       1040 33101   1822 11R  8        
-         0       1041 33101   4227 11L  12       
-         0       1042 33101   4132 11R  12       
-         0       1043 33101   4237 11L  12       
-         0       1044 33101   4148 11R  12       
-         0       1045 33101   4232 11L  12       
-         0       1046 33101   4140 11R  12       
-         0       1047 33101   1914 11L  8        
-         0       1048 33101   4125 11R  12       
-         0       1049 33101   1899 11L  8        
-         0       1050 33101   4139 11R  12       
-         0       1051 33101   1893 11L  8        
-         0       1052 33101   1857 11R  8        
-         0       1053 33101   1904 11L  8        
-         0       1054 33101   1852 11R  8        
-         0       1055 33101   1919 11L  8        
-         0       1056 33101   4120 11R  12       
-         0       1057 33101   1885 11L  8        
-         0       1058 33101   1847 11R  8        
-         0       1059 33101   1876 11L  8        
-         0       1060 33101   1834 11R  8        
-         0       1061 33101   4228 11L  12       
-         0       1062 33101   4134 11R  12       
-         0       1063 33101   4238 11L  12       
-         0       1064 33101   4149 11R  12       
-         0       1065 33101   4233 11L  12       
-         0       1066 33101   4141 11R  12       
-         0       1067 33101   4223 11L  12       
-         0       1068 33101   4126 11R  12       
-         0       1069 33101   1900 11L  8        
-         0       1070 33101   4143 11R  12       
-         0       1071 33101   1894 11L  8        
-         0       1072 33101   1859 11R  8        
-         0       1073 33101   1905 11L  8        
-         0       1074 33101   1853 11R  8        
-         0       1075 33101   1918 11L  8        
-         0       1076 33101   4121 11R  12       
-         0       1077 33101   1886 11L  8        
-         0       1078 33101   1850 11R  8        
-         0       1079 33101   1877 11L  8        
-         0       1080 33101   1835 11R  8        
-         0       1081 33101   4229 11L  12       
-         0       1082 33101   4135 11R  12       
-         0       1083 33101   4239 11L  12       
-         0       1084 33101   4150 11R  12       
-         0       1085 33101   4234 11L  12       
-         0       1086 33101   4142 11R  12       
-         0       1087 33101   4224 11L  12       
-         0       1088 33101   4127 11R  12       
-         0       1089 33101   1901 11L  8        
-         0       1090 33101   4144 11R  12       
-         0       1091 33101   1895 11L  8        
-         0       1092 33101   1860 11R  8        
-         0       1093 33101   1909 11L  8        
-         0       1094 33101   1858 11R  8        
-         0       1095 33101   1916 11L  8        
-         0       1096 33101   4122 11R  12       
-         0       1097 33101   1888 11L  8        
-         0       1098 33101   1851 11R  8        
-         0       1099 33101   1879 11L  8        
-         0       1100 33101   1842 11R  8        
-         0       1101 33101   2040 12L  8        
-         0       1102 33101   4320 12R  12       
-         0       1103 33101   2036 12L  8        
-         0       1104 33101   4325 12R  12       
-         0       1105 33101   2029 12L  8        
-         0       1106 33101   4330 12R  12       
-         0       1107 33101   2005 12L  8        
-         0       1108 33101   1970 12R  8        
-         0       1109 33101   2007 12L  8        
-         0       1110 33101   1931 12R  8        
-         0       1111 33101   2000 12L  8        
-         0       1112 33101   1953 12R  8        
-         0       1113 33101   2024 12L  8        
-         0       1114 33101   1951 12R  8        
-         0       1115 33101   2018 12L  8        
-         0       1116 33101   1945 12R  8        
-         0       1117 33101   2012 12L  8        
-         0       1118 33101   1939 12R  8        
-         0       1119 33101   1991 12L  8        
-         0       1120 33101   1935 12R  8        
-         0       1121 33101   2041 12L  8        
-         0       1122 33101   4321 12R  12       
-         0       1123 33101   2038 12L  8        
-         0       1124 33101   4326 12R  12       
-         0       1125 33101   2030 12L  8        
-         0       1126 33101   4331 12R  12       
-         0       1127 33101   2006 12L  8        
-         0       1128 33101   1971 12R  8        
-         0       1129 33101   2008 12L  8        
-         0       1130 33101   1958 12R  8        
-         0       1131 33101   2001 12L  8        
-         0       1132 33101   1954 12R  8        
-         0       1133 33101   2025 12L  8        
-         0       1134 33101   1955 12R  8        
-         0       1135 33101   2019 12L  8        
-         0       1136 33101   1946 12R  8        
-         0       1137 33101   2016 12L  8        
-         0       1138 33101   1942 12R  8        
-         0       1139 33101   1996 12L  8        
-         0       1140 33101   1975 12R  8        
-         0       1141 33101   4390 12L  12       
-         0       1142 33101   4322 12R  12       
-         0       1143 33101   2039 12L  8        
-         0       1144 33101   4327 12R  12       
-         0       1145 33101   2031 12L  8        
-         0       1146 33101   4332 12R  12       
-         0       1147 33101   2033 12L  8        
-         0       1148 33101   1972 12R  8        
-         0       1149 33101   2009 12L  8        
-         0       1150 33101   1959 12R  8        
-         0       1151 33101   2002 12L  8        
-         0       1152 33101   1964 12R  8        
-         0       1153 33101   2026 12L  8        
-         0       1154 33101   1956 12R  8        
-         0       1155 33101   2020 12L  8        
-         0       1156 33101   1947 12R  8        
-         0       1157 33101   2014 12L  8        
-         0       1158 33101   1943 12R  8        
-         0       1159 33101   1994 12L  8        
-         0       1160 33101   1976 12R  8        
-         0       1161 33101   4391 12L  12       
-         0       1162 33101   4323 12R  12       
-         0       1163 33101   1997 12L  8        
-         0       1164 33101   4328 12R  12       
-         0       1165 33101   2032 12L  8        
-         0       1166 33101   4334 12R  12       
-         0       1167 33101   2043 12L  8        
-         0       1168 33101   1973 12R  8        
-         0       1169 33101   2010 12L  8        
-         0       1170 33101   1960 12R  8        
-         0       1171 33101   2003 12L  8        
-         0       1172 33101   1966 12R  8        
-         0       1173 33101   2027 12L  8        
-         0       1174 33101   1963 12R  8        
-         0       1175 33101   2021 12L  8        
-         0       1176 33101   1949 12R  8        
-         0       1177 33101   2015 12L  8        
-         0       1178 33101   1944 12R  8        
-         0       1179 33101   1995 12L  8        
-         0       1180 33101   1979 12R  8        
-         0       1181 33101   4392 12L  12       
-         0       1182 33101   4324 12R  12       
-         0       1183 33101   1998 12L  8        
-         0       1184 33101   4329 12R  12       
-         0       1185 33101   2034 12L  8        
-         0       1186 33101   4335 12R  12       
-         0       1187 33101   2046 12L  8        
-         0       1188 33101   1932 12R  8        
-         0       1189 33101   2011 12L  8        
-         0       1190 33101   1962 12R  8        
-         0       1191 33101   2004 12L  8        
-         0       1192 33101   1967 12R  8        
-         0       1193 33101   2028 12L  8        
-         0       1194 33101   1968 12R  8        
-         0       1195 33101   2022 12L  8        
-         0       1196 33101   1950 12R  8        
-         0       1197 33101   2013 12L  8        
-         0       1198 33101   1974 12R  8        
-         0       1199 33101   1992 12L  8        
-         0       1200 33101   1980 12R  8        
-         0       1201 33101   4499 13L  13       
-         0       1202 33101    930 13R  7        
-         0       1203 33101    947 13L  7        
-         0       1204 33101    908 13R  7        
-         0       1205 33101   2098 13L  8        
-         0       1206 33101    913 13R  7        
-         0       1207 33101   2089 13L  8        
-         0       1208 33101   4439 13R  13       
-         0       1209 33101   2083 13L  8        
-         0       1210 33101    901 13R  7        
-         0       1211 33101    964 13L  7        
-         0       1212 33101   2057 13R  8        
-         0       1213 33101    958 13L  7        
-         0       1214 33101    935 13R  7        
-         0       1215 33101    952 13L  7        
-         0       1216 33101    926 13R  7        
-         0       1217 33101    942 13L  7        
-         0       1218 33101    918 13R  7        
-         0       1219 33101    936 13L  7        
-         0       1220 33101    902 13R  7        
-         0       1221 33101   4500 13L  13       
-         0       1222 33101   2052 13R  8        
-         0       1223 33101    969 13L  7        
-         0       1224 33101    909 13R  7        
-         0       1225 33101   2078 13L  8        
-         0       1226 33101    914 13R  7        
-         0       1227 33101   2090 13L  8        
-         0       1228 33101   4438 13R  13       
-         0       1229 33101   2084 13L  8        
-         0       1230 33101    924 13R  7        
-         0       1231 33101    966 13L  7        
-         0       1232 33101   2059 13R  8        
-         0       1233 33101    959 13L  7        
-         0       1234 33101   2051 13R  8        
-         0       1235 33101    953 13L  7        
-         0       1236 33101    931 13R  7        
-         0       1237 33101    943 13L  7        
-         0       1238 33101    919 13R  7        
-         0       1239 33101    937 13L  7        
-         0       1240 33101    903 13R  7        
-         0       1241 33101   7143 13L  P1       
-         0       1242 33101   2053 13R  8        
-         0       1243 33101   2076 13L  8        
-         0       1244 33101    910 13R  7        
-         0       1245 33101   2088 13L  8        
-         0       1246 33101    915 13R  7        
-         0       1247 33101   2092 13L  8        
-         0       1248 33101   4413 13R  13       
-         0       1249 33101   2085 13L  8        
-         0       1250 33101    927 13R  7        
-         0       1251 33101    967 13L  7        
-         0       1252 33101   2060 13R  8        
-         0       1253 33101    960 13L  7        
-         0       1254 33101   2062 13R  8        
-         0       1255 33101    954 13L  7        
-         0       1256 33101    932 13R  7        
-         0       1257 33101    944 13L  7        
-         0       1258 33101    921 13R  7        
-         0       1259 33101    938 13L  7        
-         0       1260 33101    905 13R  7        
-         0       1261 33101   7144 13L  P1       
-         0       1262 33101   2054 13R  8        
-         0       1263 33101   2091 13L  8        
-         0       1264 33101    911 13R  7        
-         0       1265 33101   2080 13L  8        
-         0       1266 33101    916 13R  7        
-         0       1267 33101   2095 13L  8        
-         0       1268 33101   4409 13R  13       
-         0       1269 33101   2086 13L  8        
-         0       1270 33101   2056 13R  8        
-         0       1271 33101    970 13L  7        
-         0       1272 33101   2066 13R  8        
-         0       1273 33101    961 13L  7        
-         0       1274 33101   2063 13R  8        
-         0       1275 33101    955 13L  7        
-         0       1276 33101    933 13R  7        
-         0       1277 33101    946 13L  7        
-         0       1278 33101    922 13R  7        
-         0       1279 33101    940 13L  7        
-         0       1280 33101    906 13R  7        
-         0       1281 33101   7145 13L  P1       
-         0       1282 33101   2058 13R  8        
-         0       1283 33101   2096 13L  8        
-         0       1284 33101    912 13R  7        
-         0       1285 33101   4475 13L  13       
-         0       1286 33101    923 13R  7        
-         0       1287 33101   2097 13L  8        
-         0       1288 33101   4407 13R  13       
-         0       1289 33101   2087 13L  8        
-         0       1290 33101    929 13R  7        
-         0       1291 33101   2082 13L  8        
-         0       1292 33101   2061 13R  8        
-         0       1293 33101    963 13L  7        
-         0       1294 33101   2064 13R  8        
-         0       1295 33101    956 13L  7        
-         0       1296 33101    934 13R  7        
-         0       1297 33101    949 13L  7        
-         0       1298 33101    925 13R  7        
-         0       1299 33101    941 13L  7        
-         0       1300 33101    907 13R  7        
-         0       1301 33101   1035 14L  7        
-         0       1302 33101    976 14R  7        
-         0       1303 33101   1040 14L  7        
-         0       1304 33101    981 14R  7        
-         0       1305 33101   1045 14L  7        
-         0       1306 33101    986 14R  7        
-         0       1307 33101   1050 14L  7        
-         0       1308 33101   1022 14R  7        
-         0       1309 33101   1056 14L  7        
-         0       1310 33101    996 14R  7        
-         0       1311 33101   1062 14L  7        
-         0       1312 33101   1001 14R  7        
-         0       1313 33101   1068 14L  7        
-         0       1314 33101   1006 14R  7        
-         0       1315 33101   1073 14L  7        
-         0       1316 33101   1011 14R  7        
-         0       1317 33101   1078 14L  7        
-         0       1318 33101   1016 14R  7        
-         0       1319 33101   1083 14L  7        
-         0       1320 33101   1021 14R  7        
-         0       1321 33101   1034 14L  7        
-         0       1322 33101    974 14R  7        
-         0       1323 33101   1039 14L  7        
-         0       1324 33101    980 14R  7        
-         0       1325 33101   1044 14L  7        
-         0       1326 33101    985 14R  7        
-         0       1327 33101   1049 14L  7        
-         0       1328 33101    990 14R  7        
-         0       1329 33101   1055 14L  7        
-         0       1330 33101    995 14R  7        
-         0       1331 33101   1061 14L  7        
-         0       1332 33101   1000 14R  7        
-         0       1333 33101   1066 14L  7        
-         0       1334 33101   1005 14R  7        
-         0       1335 33101   1072 14L  7        
-         0       1336 33101   1010 14R  7        
-         0       1337 33101   1077 14L  7        
-         0       1338 33101   1015 14R  7        
-         0       1339 33101   1082 14L  7        
-         0       1340 33101   1020 14R  7        
-         0       1341 33101   1033 14L  7        
-         0       1342 33101    973 14R  7        
-         0       1343 33101   1038 14L  7        
-         0       1344 33101    979 14R  7        
-         0       1345 33101   1043 14L  7        
-         0       1346 33101    984 14R  7        
-         0       1347 33101   1048 14L  7        
-         0       1348 33101    989 14R  7        
-         0       1349 33101   1054 14L  7        
-         0       1350 33101    994 14R  7        
-         0       1351 33101   1060 14L  7        
-         0       1352 33101    999 14R  7        
-         0       1353 33101   1065 14L  7        
-         0       1354 33101   1004 14R  7        
-         0       1355 33101   1084 14L  7        
-         0       1356 33101   1009 14R  7        
-         0       1357 33101   1076 14L  7        
-         0       1358 33101   1014 14R  7        
-         0       1359 33101   1081 14L  7        
-         0       1360 33101   1019 14R  7        
-         0       1361 33101   1032 14L  7        
-         0       1362 33101    972 14R  7        
-         0       1363 33101   1037 14L  7        
-         0       1364 33101    978 14R  7        
-         0       1365 33101   1042 14L  7        
-         0       1366 33101    983 14R  7        
-         0       1367 33101   1047 14L  7        
-         0       1368 33101    988 14R  7        
-         0       1369 33101   1052 14L  7        
-         0       1370 33101    993 14R  7        
-         0       1371 33101   1058 14L  7        
-         0       1372 33101    998 14R  7        
-         0       1373 33101   1064 14L  7        
-         0       1374 33101   1003 14R  7        
-         0       1375 33101   1070 14L  7        
-         0       1376 33101   1008 14R  7        
-         0       1377 33101   1075 14L  7        
-         0       1378 33101   1013 14R  7        
-         0       1379 33101   1080 14L  7        
-         0       1380 33101   1018 14R  7        
-         0       1381 33101   1031 14L  7        
-         0       1382 33101    971 14R  7        
-         0       1383 33101   1036 14L  7        
-         0       1384 33101    977 14R  7        
-         0       1385 33101   1041 14L  7        
-         0       1386 33101    982 14R  7        
-         0       1387 33101   1046 14L  7        
-         0       1388 33101    987 14R  7        
-         0       1389 33101   1051 14L  7        
-         0       1390 33101    992 14R  7        
-         0       1391 33101   1057 14L  7        
-         0       1392 33101    997 14R  7        
-         0       1393 33101   1063 14L  7        
-         0       1394 33101   1002 14R  7        
-         0       1395 33101   1069 14L  7        
-         0       1396 33101   1007 14R  7        
-         0       1397 33101   1074 14L  7        
-         0       1398 33101   1012 14R  7        
-         0       1399 33101   1079 14L  7        
-         0       1400 33101   1017 14R  7        
-         0       1401 33101   1155 15L  7        
-         0       1402 33101   1095 15R  7        
-         0       1403 33101   1160 15L  7        
-         0       1404 33101   1100 15R  7        
-         0       1405 33101   1165 15L  7        
-         0       1406 33101   1105 15R  7        
-         0       1407 33101   1170 15L  7        
-         0       1408 33101   1110 15R  7        
-         0       1409 33101   1175 15L  7        
-         0       1410 33101   1115 15R  7        
-         0       1411 33101   1180 15L  7        
-         0       1412 33101   1120 15R  7        
-         0       1413 33101   1186 15L  7        
-         0       1414 33101   1125 15R  7        
-         0       1415 33101   1191 15L  7        
-         0       1416 33101   1130 15R  7        
-         0       1417 33101   1196 15L  7        
-         0       1418 33101   1135 15R  7        
-         0       1419 33101   1152 15L  7        
-         0       1420 33101   1140 15R  7        
-         0       1421 33101   1154 15L  7        
-         0       1422 33101   1094 15R  7        
-         0       1423 33101   1159 15L  7        
-         0       1424 33101   1099 15R  7        
-         0       1425 33101   1164 15L  7        
-         0       1426 33101   1104 15R  7        
-         0       1427 33101   1169 15L  7        
-         0       1428 33101   1109 15R  7        
-         0       1429 33101   1204 15L  7        
-         0       1430 33101   1114 15R  7        
-         0       1431 33101   1179 15L  7        
-         0       1432 33101   1119 15R  7        
-         0       1433 33101   1185 15L  7        
-         0       1434 33101   1124 15R  7        
-         0       1435 33101   1190 15L  7        
-         0       1436 33101   1129 15R  7        
-         0       1437 33101   1195 15L  7        
-         0       1438 33101   1134 15R  7        
-         0       1439 33101   1201 15L  7        
-         0       1440 33101   1139 15R  7        
-         0       1441 33101   1153 15L  7        
-         0       1442 33101   1093 15R  7        
-         0       1443 33101   1158 15L  7        
-         0       1444 33101   1098 15R  7        
-         0       1445 33101   1163 15L  7        
-         0       1446 33101   1103 15R  7        
-         0       1447 33101   1168 15L  7        
-         0       1448 33101   1108 15R  7        
-         0       1449 33101   1173 15L  7        
-         0       1450 33101   1113 15R  7        
-         0       1451 33101   1178 15L  7        
-         0       1452 33101   1118 15R  7        
-         0       1453 33101   1184 15L  7        
-         0       1454 33101   1123 15R  7        
-         0       1455 33101   1189 15L  7        
-         0       1456 33101   1128 15R  7        
-         0       1457 33101   1194 15L  7        
-         0       1458 33101   1133 15R  7        
-         0       1459 33101   1199 15L  7        
-         0       1460 33101   1138 15R  7        
-         0       1461 33101   1203 15L  7        
-         0       1462 33101   1092 15R  7        
-         0       1463 33101   1157 15L  7        
-         0       1464 33101   1097 15R  7        
-         0       1465 33101   1162 15L  7        
-         0       1466 33101   1102 15R  7        
-         0       1467 33101   1167 15L  7        
-         0       1468 33101   1107 15R  7        
-         0       1469 33101   1172 15L  7        
-         0       1470 33101   1112 15R  7        
-         0       1471 33101   1177 15L  7        
-         0       1472 33101   1117 15R  7        
-         0       1473 33101   1183 15L  7        
-         0       1474 33101   1122 15R  7        
-         0       1475 33101   1188 15L  7        
-         0       1476 33101   1127 15R  7        
-         0       1477 33101   1193 15L  7        
-         0       1478 33101   1132 15R  7        
-         0       1479 33101   1198 15L  7        
-         0       1480 33101   1137 15R  7        
-         0       1481 33101   1151 15L  7        
-         0       1482 33101   1091 15R  7        
-         0       1483 33101   1156 15L  7        
-         0       1484 33101   1096 15R  7        
-         0       1485 33101   1161 15L  7        
-         0       1486 33101   1101 15R  7        
-         0       1487 33101   1166 15L  7        
-         0       1488 33101   1106 15R  7        
-         0       1489 33101   1171 15L  7        
-         0       1490 33101   1111 15R  7        
-         0       1491 33101   1176 15L  7        
-         0       1492 33101   1116 15R  7        
-         0       1493 33101   1181 15L  7        
-         0       1494 33101   1121 15R  7        
-         0       1495 33101   1187 15L  7        
-         0       1496 33101   1126 15R  7        
-         0       1497 33101   1192 15L  7        
-         0       1498 33101   1131 15R  7        
-         0       1499 33101   1197 15L  7        
-         0       1500 33101   1136 15R  7        
-         0       1501 33101   1274 16L  7        
-         0       1502 33101   1216 16R  7        
-         0       1503 33101   1279 16L  7        
-         0       1504 33101   1221 16R  7        
-         0       1505 33101   1284 16L  7        
-         0       1506 33101   1226 16R  7        
-         0       1507 33101   1289 16L  7        
-         0       1508 33101   1232 16R  7        
-         0       1509 33101   1322 16L  7        
-         0       1510 33101   1238 16R  7        
-         0       1511 33101   1300 16L  7        
-         0       1512 33101   1243 16R  7        
-         0       1513 33101   1306 16L  7        
-         0       1514 33101   1248 16R  7        
-         0       1515 33101   1311 16L  7        
-         0       1516 33101   1253 16R  7        
-         0       1517 33101   1316 16L  7        
-         0       1518 33101   1259 16R  7        
-         0       1519 33101   1321 16L  7        
-         0       1520 33101   1237 16R  7        
-         0       1521 33101   1273 16L  7        
-         0       1522 33101   1214 16R  7        
-         0       1523 33101   1278 16L  7        
-         0       1524 33101   1220 16R  7        
-         0       1525 33101   1283 16L  7        
-         0       1526 33101   1225 16R  7        
-         0       1527 33101   1288 16L  7        
-         0       1528 33101   1231 16R  7        
-         0       1529 33101   1293 16L  7        
-         0       1530 33101   1265 16R  7        
-         0       1531 33101   1299 16L  7        
-         0       1532 33101   1242 16R  7        
-         0       1533 33101   1305 16L  7        
-         0       1534 33101   1247 16R  7        
-         0       1535 33101   1310 16L  7        
-         0       1536 33101   1252 16R  7        
-         0       1537 33101   1315 16L  7        
-         0       1538 33101   1258 16R  7        
-         0       1539 33101   1320 16L  7        
-         0       1540 33101   1263 16R  7        
-         0       1541 33101   1272 16L  7        
-         0       1542 33101   1213 16R  7        
-         0       1543 33101   1277 16L  7        
-         0       1544 33101   1219 16R  7        
-         0       1545 33101   1282 16L  7        
-         0       1546 33101   1224 16R  7        
-         0       1547 33101   1287 16L  7        
-         0       1548 33101   1229 16R  7        
-         0       1549 33101   1292 16L  7        
-         0       1550 33101   1236 16R  7        
-         0       1551 33101   1297 16L  7        
-         0       1552 33101   1241 16R  7        
-         0       1553 33101   1304 16L  7        
-         0       1554 33101   1246 16R  7        
-         0       1555 33101   1309 16L  7        
-         0       1556 33101   1251 16R  7        
-         0       1557 33101   1314 16L  7        
-         0       1558 33101   1256 16R  7        
-         0       1559 33101   1319 16L  7        
-         0       1560 33101   1262 16R  7        
-         0       1561 33101   1271 16L  7        
-         0       1562 33101   1212 16R  7        
-         0       1563 33101   1276 16L  7        
-         0       1564 33101   1218 16R  7        
-         0       1565 33101   1281 16L  7        
-         0       1566 33101   1223 16R  7        
-         0       1567 33101   1286 16L  7        
-         0       1568 33101   1228 16R  7        
-         0       1569 33101   1291 16L  7        
-         0       1570 33101   1234 16R  7        
-         0       1571 33101   1296 16L  7        
-         0       1572 33101   1240 16R  7        
-         0       1573 33101   1303 16L  7        
-         0       1574 33101   1245 16R  7        
-         0       1575 33101   1308 16L  7        
-         0       1576 33101   1250 16R  7        
-         0       1577 33101   1313 16L  7        
-         0       1578 33101   1255 16R  7        
-         0       1579 33101   1318 16L  7        
-         0       1580 33101   1261 16R  7        
-         0       1581 33101   1270 16L  7        
-         0       1582 33101   1211 16R  7        
-         0       1583 33101   1275 16L  7        
-         0       1584 33101   1217 16R  7        
-         0       1585 33101   1280 16L  7        
-         0       1586 33101   1222 16R  7        
-         0       1587 33101   1285 16L  7        
-         0       1588 33101   1227 16R  7        
-         0       1589 33101   1290 16L  7        
-         0       1590 33101   1233 16R  7        
-         0       1591 33101   1295 16L  7        
-         0       1592 33101   1239 16R  7        
-         0       1593 33101   1302 16L  7        
-         0       1594 33101   1244 16R  7        
-         0       1595 33101   1307 16L  7        
-         0       1596 33101   1249 16R  7        
-         0       1597 33101   1312 16L  7        
-         0       1598 33101   1254 16R  7        
-         0       1599 33101   1317 16L  7        
-         0       1600 33101   1260 16R  7        
-         0       1601 33101   1404 17L  7        
-         0       1602 33101   1338 17R  7        
-         0       1603 33101   1409 17L  7        
-         0       1604 33101   1343 17R  7        
-         0       1605 33101   1414 17L  7        
-         0       1606 33101   1350 17R  7        
-         0       1607 33101   1420 17L  7        
-         0       1608 33101   1355 17R  7        
-         0       1609 33101   1426 17L  7        
-         0       1610 33101   1360 17R  7        
-         0       1611 33101   1398 17L  7        
-         0       1612 33101   1366 17R  7        
-         0       1613 33101   1431 17L  7        
-         0       1614 33101   1371 17R  7        
-         0       1615 33101   1437 17L  7        
-         0       1616 33101   1376 17R  7        
-         0       1617 33101   1442 17L  7        
-         0       1618 33101   1381 17R  7        
-         0       1619 33101   1392 17L  7        
-         0       1620 33101   1331 17R  7        
-         0       1621 33101   1403 17L  7        
-         0       1622 33101   1337 17R  7        
-         0       1623 33101   1408 17L  7        
-         0       1624 33101   1342 17R  7        
-         0       1625 33101   1413 17L  7        
-         0       1626 33101   1349 17R  7        
-         0       1627 33101   1419 17L  7        
-         0       1628 33101   1354 17R  7        
-         0       1629 33101   1425 17L  7        
-         0       1630 33101   1359 17R  7        
-         0       1631 33101   1397 17L  7        
-         0       1632 33101   1365 17R  7        
-         0       1633 33101   1430 17L  7        
-         0       1634 33101   1370 17R  7        
-         0       1635 33101   1436 17L  7        
-         0       1636 33101   1375 17R  7        
-         0       1637 33101   1441 17L  7        
-         0       1638 33101   1380 17R  7        
-         0       1639 33101   1446 17L  7        
-         0       1640 33101   1385 17R  7        
-         0       1641 33101   1401 17L  7        
-         0       1642 33101   1336 17R  7        
-         0       1643 33101   1407 17L  7        
-         0       1644 33101   1341 17R  7        
-         0       1645 33101   1412 17L  7        
-         0       1646 33101   1347 17R  7        
-         0       1647 33101   1418 17L  7        
-         0       1648 33101   1353 17R  7        
-         0       1649 33101   1424 17L  7        
-         0       1650 33101   1358 17R  7        
-         0       1651 33101   1396 17L  7        
-         0       1652 33101   1364 17R  7        
-         0       1653 33101   1429 17L  7        
-         0       1654 33101   1369 17R  7        
-         0       1655 33101   1435 17L  7        
-         0       1656 33101   1374 17R  7        
-         0       1657 33101   1440 17L  7        
-         0       1658 33101   1379 17R  7        
-         0       1659 33101   1445 17L  7        
-         0       1660 33101   1384 17R  7        
-         0       1661 33101   1400 17L  7        
-         0       1662 33101   1334 17R  7        
-         0       1663 33101   1406 17L  7        
-         0       1664 33101   1340 17R  7        
-         0       1665 33101   1411 17L  7        
-         0       1666 33101   1345 17R  7        
-         0       1667 33101   1417 17L  7        
-         0       1668 33101   1352 17R  7        
-         0       1669 33101   1423 17L  7        
-         0       1670 33101   1357 17R  7        
-         0       1671 33101   1395 17L  7        
-         0       1672 33101   1362 17R  7        
-         0       1673 33101   1428 17L  7        
-         0       1674 33101   1368 17R  7        
-         0       1675 33101   1434 17L  7        
-         0       1676 33101   1373 17R  7        
-         0       1677 33101   1439 17L  7        
-         0       1678 33101   1378 17R  7        
-         0       1679 33101   1444 17L  7        
-         0       1680 33101   1383 17R  7        
-         0       1681 33101   1399 17L  7        
-         0       1682 33101   1333 17R  7        
-         0       1683 33101   1405 17L  7        
-         0       1684 33101   1339 17R  7        
-         0       1685 33101   1410 17L  7        
-         0       1686 33101   1344 17R  7        
-         0       1687 33101   1415 17L  7        
-         0       1688 33101   1351 17R  7        
-         0       1689 33101   1422 17L  7        
-         0       1690 33101   1356 17R  7        
-         0       1691 33101   1393 17L  7        
-         0       1692 33101   1361 17R  7        
-         0       1693 33101   1427 17L  7        
-         0       1694 33101   1367 17R  7        
-         0       1695 33101   1433 17L  7        
-         0       1696 33101   1372 17R  7        
-         0       1697 33101   1438 17L  7        
-         0       1698 33101   1377 17R  7        
-         0       1699 33101   1443 17L  7        
-         0       1700 33101   1382 17R  7        
-         1          1 33101    485 1L   6        
-         1          2 33101    452 1R   6        
-         1          3 33101   1480 1L   8        
-         1          4 33101   1455 1R   8        
-         1          5 33101   2205 1L   9        
-         1          6 33101   1460 1R   8        
-         1          7 33101   2210 1L   9        
-         1          8 33101   2101 1R   9        
-         1          9 33101   2215 1L   9        
-         1         10 33101   2107 1R   9        
-         1         11 33101   2221 1L   9        
-         1         12 33101   2113 1R   9        
-         1         13 33101   2226 1L   9        
-         1         14 33101   2118 1R   9        
-         1         15 33101   2232 1L   9        
-         1         16 33101   2123 1R   9        
-         1         17 33101   2237 1L   9        
-         1         18 33101   2129 1R   9        
-         1         19 33101   2242 1L   9        
-         1         20 33101   2134 1R   9        
-         1         21 33101    486 1L   6        
-         1         22 33101   1451 1R   8        
-         1         23 33101   2201 1L   9        
-         1         24 33101   1456 1R   8        
-         1         25 33101   2206 1L   9        
-         1         26 33101   1461 1R   8        
-         1         27 33101   2211 1L   9        
-         1         28 33101   2124 1R   9        
-         1         29 33101   2216 1L   9        
-         1         30 33101   2108 1R   9        
-         1         31 33101   2222 1L   9        
-         1         32 33101   2114 1R   9        
-         1         33 33101   2227 1L   9        
-         1         34 33101   2119 1R   9        
-         1         35 33101   2233 1L   9        
-         1         36 33101   2102 1R   9        
-         1         37 33101   2238 1L   9        
-         1         38 33101   2130 1R   9        
-         1         39 33101   2243 1L   9        
-         1         40 33101   2135 1R   9        
-         1         41 33101   1477 1L   8        
-         1         42 33101   1452 1R   8        
-         1         43 33101   2202 1L   9        
-         1         44 33101   1457 1R   8        
-         1         45 33101   2207 1L   9        
-         1         46 33101   1462 1R   8        
-         1         47 33101   2212 1L   9        
-         1         48 33101   2103 1R   9        
-         1         49 33101   2217 1L   9        
-         1         50 33101   2109 1R   9        
-         1         51 33101   2223 1L   9        
-         1         52 33101   2115 1R   9        
-         1         53 33101   2228 1L   9        
-         1         54 33101   2120 1R   9        
-         1         55 33101   2234 1L   9        
-         1         56 33101   2125 1R   9        
-         1         57 33101   2239 1L   9        
-         1         58 33101   2131 1R   9        
-         1         59 33101   2245 1L   9        
-         1         60 33101   2136 1R   9        
-         1         61 33101   1478 1L   8        
-         1         62 33101   1453 1R   8        
-         1         63 33101   2203 1L   9        
-         1         64 33101   1458 1R   8        
-         1         65 33101   2208 1L   9        
-         1         66 33101   1463 1R   8        
-         1         67 33101   2213 1L   9        
-         1         68 33101   2104 1R   9        
-         1         69 33101   2218 1L   9        
-         1         70 33101   2111 1R   9        
-         1         71 33101   2224 1L   9        
-         1         72 33101   2116 1R   9        
-         1         73 33101   2229 1L   9        
-         1         74 33101   2121 1R   9        
-         1         75 33101   2235 1L   9        
-         1         76 33101   2126 1R   9        
-         1         77 33101   2240 1L   9        
-         1         78 33101   2132 1R   9        
-         1         79 33101   2246 1L   9        
-         1         80 33101   2137 1R   9        
-         1         81 33101   1479 1L   8        
-         1         82 33101   1454 1R   8        
-         1         83 33101   2204 1L   9        
-         1         84 33101   1459 1R   8        
-         1         85 33101   2209 1L   9        
-         1         86 33101   1465 1R   8        
-         1         87 33101   2214 1L   9        
-         1         88 33101   2106 1R   9        
-         1         89 33101   2219 1L   9        
-         1         90 33101   2112 1R   9        
-         1         91 33101   2225 1L   9        
-         1         92 33101   2117 1R   9        
-         1         93 33101   2231 1L   9        
-         1         94 33101   2122 1R   9        
-         1         95 33101   2236 1L   9        
-         1         96 33101   2128 1R   9        
-         1         97 33101   2241 1L   9        
-         1         98 33101   2133 1R   9        
-         1         99 33101   2247 1L   9        
-         1        100 33101   2138 1R   9        
-         1        101 33101   2412 2L   9        
-         1        102 33101   1492 2R   8        
-         1        103 33101   2421 2L   9        
-         1        104 33101   2304 2R   9        
-         1        105 33101   2426 2L   9        
-         1        106 33101   2309 2R   9        
-         1        107 33101   2432 2L   9        
-         1        108 33101   2314 2R   9        
-         1        109 33101   2437 2L   9        
-         1        110 33101   2319 2R   9        
-         1        111 33101   2442 2L   9        
-         1        112 33101   2325 2R   9        
-         1        113 33101   2447 2L   9        
-         1        114 33101   2332 2R   9        
-         1        115 33101   2452 2L   9        
-         1        116 33101   2338 2R   9        
-         1        117 33101   2460 2L   9        
-         1        118 33101   2344 2R   9        
-         1        119 33101   2465 2L   9        
-         1        120 33101   2350 2R   9        
-         1        121 33101   2415 2L   9        
-         1        122 33101   1494 2R   8        
-         1        123 33101   2422 2L   9        
-         1        124 33101   2305 2R   9        
-         1        125 33101   2428 2L   9        
-         1        126 33101   2310 2R   9        
-         1        127 33101   2433 2L   9        
-         1        128 33101   2315 2R   9        
-         1        129 33101   2438 2L   9        
-         1        130 33101   2320 2R   9        
-         1        131 33101   2443 2L   9        
-         1        132 33101   2326 2R   9        
-         1        133 33101   2448 2L   9        
-         1        134 33101   2333 2R   9        
-         1        135 33101   2454 2L   9        
-         1        136 33101   2339 2R   9        
-         1        137 33101   2461 2L   9        
-         1        138 33101   2345 2R   9        
-         1        139 33101   2466 2L   9        
-         1        140 33101   2351 2R   9        
-         1        141 33101   2416 2L   9        
-         1        142 33101   1495 2R   8        
-         1        143 33101   2423 2L   9        
-         1        144 33101   2306 2R   9        
-         1        145 33101   2429 2L   9        
-         1        146 33101   2311 2R   9        
-         1        147 33101   2434 2L   9        
-         1        148 33101   2316 2R   9        
-         1        149 33101   2439 2L   9        
-         1        150 33101   2322 2R   9        
-         1        151 33101   2444 2L   9        
-         1        152 33101   2328 2R   9        
-         1        153 33101   2449 2L   9        
-         1        154 33101   2334 2R   9        
-         1        155 33101   2455 2L   9        
-         1        156 33101   2340 2R   9        
-         1        157 33101   2462 2L   9        
-         1        158 33101   2347 2R   9        
-         1        159 33101   2467 2L   9        
-         1        160 33101   2352 2R   9        
-         1        161 33101   2419 2L   9        
-         1        162 33101   2301 2R   9        
-         1        163 33101   2424 2L   9        
-         1        164 33101   2307 2R   9        
-         1        165 33101   2430 2L   9        
-         1        166 33101   2312 2R   9        
-         1        167 33101   2435 2L   9        
-         1        168 33101   2317 2R   9        
-         1        169 33101   2440 2L   9        
-         1        170 33101   2323 2R   9        
-         1        171 33101   2445 2L   9        
-         1        172 33101   2329 2R   9        
-         1        173 33101   2450 2L   9        
-         1        174 33101   2336 2R   9        
-         1        175 33101   2456 2L   9        
-         1        176 33101   2341 2R   9        
-         1        177 33101   2463 2L   9        
-         1        178 33101   2348 2R   9        
-         1        179 33101   2468 2L   9        
-         1        180 33101   2353 2R   9        
-         1        181 33101   2420 2L   9        
-         1        182 33101   2302 2R   9        
-         1        183 33101   2425 2L   9        
-         1        184 33101   2308 2R   9        
-         1        185 33101   2431 2L   9        
-         1        186 33101   2313 2R   9        
-         1        187 33101   2436 2L   9        
-         1        188 33101   2318 2R   9        
-         1        189 33101   2441 2L   9        
-         1        190 33101   2324 2R   9        
-         1        191 33101   2446 2L   9        
-         1        192 33101   2330 2R   9        
-         1        193 33101   2451 2L   9        
-         1        194 33101   2337 2R   9        
-         1        195 33101   2457 2L   9        
-         1        196 33101   2342 2R   9        
-         1        197 33101   2464 2L   9        
-         1        198 33101   2349 2R   9        
-         1        199 33101   2469 2L   9        
-         1        200 33101   2354 2R   9        
-         1        201 33101    647 3L   6        
-         1        202 33101   1516 3R   8        
-         1        203 33101   1536 3L   8        
-         1        204 33101   1523 3R   8        
-         1        205 33101   2601 3L   9        
-         1        206 33101   2504 3R   9        
-         1        207 33101   2606 3L   9        
-         1        208 33101   2510 3R   9        
-         1        209 33101   2611 3L   9        
-         1        210 33101   2517 3R   9        
-         1        211 33101   2623 3L   9        
-         1        212 33101   2523 3R   9        
-         1        213 33101   2617 3L   9        
-         1        214 33101   2528 3R   9        
-         1        215 33101   2628 3L   9        
-         1        216 33101   2534 3R   9        
-         1        217 33101   2634 3L   9        
-         1        218 33101   2539 3R   9        
-         1        219 33101   2639 3L   9        
-         1        220 33101   2544 3R   9        
-         1        221 33101    652 3L   6        
-         1        222 33101   1517 3R   8        
-         1        223 33101   1537 3L   8        
-         1        224 33101   1524 3R   8        
-         1        225 33101   2602 3L   9        
-         1        226 33101   2505 3R   9        
-         1        227 33101   2607 3L   9        
-         1        228 33101   2511 3R   9        
-         1        229 33101   2612 3L   9        
-         1        230 33101   2518 3R   9        
-         1        231 33101   2624 3L   9        
-         1        232 33101   2524 3R   9        
-         1        233 33101   2618 3L   9        
-         1        234 33101   2529 3R   9        
-         1        235 33101   2629 3L   9        
-         1        236 33101   2535 3R   9        
-         1        237 33101   2635 3L   9        
-         1        238 33101   2540 3R   9        
-         1        239 33101   2640 3L   9        
-         1        240 33101   2545 3R   9        
-         1        241 33101   1533 3L   8        
-         1        242 33101   1518 3R   8        
-         1        243 33101   1538 3L   8        
-         1        244 33101   2501 3R   9        
-         1        245 33101   2603 3L   9        
-         1        246 33101   2506 3R   9        
-         1        247 33101   2608 3L   9        
-         1        248 33101   2512 3R   9        
-         1        249 33101   2613 3L   9        
-         1        250 33101   2519 3R   9        
-         1        251 33101   2625 3L   9        
-         1        252 33101   2525 3R   9        
-         1        253 33101   2619 3L   9        
-         1        254 33101   2530 3R   9        
-         1        255 33101   2630 3L   9        
-         1        256 33101   2536 3R   9        
-         1        257 33101   2636 3L   9        
-         1        258 33101   2541 3R   9        
-         1        259 33101   2641 3L   9        
-         1        260 33101   2546 3R   9        
-         1        261 33101   1534 3L   8        
-         1        262 33101   1520 3R   8        
-         1        263 33101   1539 3L   8        
-         1        264 33101   2502 3R   9        
-         1        265 33101   2604 3L   9        
-         1        266 33101   2508 3R   9        
-         1        267 33101   2609 3L   9        
-         1        268 33101   2513 3R   9        
-         1        269 33101   2614 3L   9        
-         1        270 33101   2520 3R   9        
-         1        271 33101   2626 3L   9        
-         1        272 33101   2526 3R   9        
-         1        273 33101   2620 3L   9        
-         1        274 33101   2532 3R   9        
-         1        275 33101   2631 3L   9        
-         1        276 33101   2537 3R   9        
-         1        277 33101   2637 3L   9        
-         1        278 33101   2542 3R   9        
-         1        279 33101   2642 3L   9        
-         1        280 33101   2547 3R   9        
-         1        281 33101   1535 3L   8        
-         1        282 33101   1522 3R   8        
-         1        283 33101   1540 3L   8        
-         1        284 33101   2503 3R   9        
-         1        285 33101   2605 3L   9        
-         1        286 33101   2509 3R   9        
-         1        287 33101   2610 3L   9        
-         1        288 33101   2515 3R   9        
-         1        289 33101   2615 3L   9        
-         1        290 33101   2522 3R   9        
-         1        291 33101   2627 3L   9        
-         1        292 33101   2527 3R   9        
-         1        293 33101   2622 3L   9        
-         1        294 33101   2533 3R   9        
-         1        295 33101   2632 3L   9        
-         1        296 33101   2538 3R   9        
-         1        297 33101   2638 3L   9        
-         1        298 33101   2543 3R   9        
-         1        299 33101   2643 3L   9        
-         1        300 33101   2548 3R   9        
-         1        301 33101   1566 4L   8        
-         1        302 33101   1545 4R   8        
-         1        303 33101   2801 4L   9        
-         1        304 33101   1550 4R   8        
-         1        305 33101   2806 4L   9        
-         1        306 33101   2702 4R   9        
-         1        307 33101   2811 4L   9        
-         1        308 33101   2707 4R   9        
-         1        309 33101   2816 4L   9        
-         1        310 33101   2713 4R   9        
-         1        311 33101   2822 4L   9        
-         1        312 33101   2718 4R   9        
-         1        313 33101   2828 4L   9        
-         1        314 33101   2724 4R   9        
-         1        315 33101   2833 4L   9        
-         1        316 33101   2729 4R   9        
-         1        317 33101   2838 4L   9        
-         1        318 33101   2735 4R   9        
-         1        319 33101   2843 4L   9        
-         1        320 33101   2740 4R   9        
-         1        321 33101   1567 4L   8        
-         1        322 33101   1546 4R   8        
-         1        323 33101   2802 4L   9        
-         1        324 33101   1551 4R   8        
-         1        325 33101   2807 4L   9        
-         1        326 33101   2703 4R   9        
-         1        327 33101   2812 4L   9        
-         1        328 33101   2708 4R   9        
-         1        329 33101   2817 4L   9        
-         1        330 33101   2714 4R   9        
-         1        331 33101   2823 4L   9        
-         1        332 33101   2719 4R   9        
-         1        333 33101   2829 4L   9        
-         1        334 33101   2725 4R   9        
-         1        335 33101   2834 4L   9        
-         1        336 33101   2730 4R   9        
-         1        337 33101   2839 4L   9        
-         1        338 33101   2736 4R   9        
-         1        339 33101   2844 4L   9        
-         1        340 33101   2741 4R   9        
-         1        341 33101   1568 4L   8        
-         1        342 33101   1547 4R   8        
-         1        343 33101   2803 4L   9        
-         1        344 33101   1553 4R   8        
-         1        345 33101   2808 4L   9        
-         1        346 33101   2704 4R   9        
-         1        347 33101   2813 4L   9        
-         1        348 33101   2709 4R   9        
-         1        349 33101   2818 4L   9        
-         1        350 33101   2715 4R   9        
-         1        351 33101   2825 4L   9        
-         1        352 33101   2720 4R   9        
-         1        353 33101   2830 4L   9        
-         1        354 33101   2726 4R   9        
-         1        355 33101   2835 4L   9        
-         1        356 33101   2731 4R   9        
-         1        357 33101   2840 4L   9        
-         1        358 33101   2737 4R   9        
-         1        359 33101   2845 4L   9        
-         1        360 33101   2743 4R   9        
-         1        361 33101   1569 4L   8        
-         1        362 33101   1548 4R   8        
-         1        363 33101   2804 4L   9        
-         1        364 33101   1554 4R   8        
-         1        365 33101   2809 4L   9        
-         1        366 33101   2705 4R   9        
-         1        367 33101   2814 4L   9        
-         1        368 33101   2710 4R   9        
-         1        369 33101   2819 4L   9        
-         1        370 33101   2716 4R   9        
-         1        371 33101   2826 4L   9        
-         1        372 33101   2722 4R   9        
-         1        373 33101   2831 4L   9        
-         1        374 33101   2727 4R   9        
-         1        375 33101   2836 4L   9        
-         1        376 33101   2732 4R   9        
-         1        377 33101   2841 4L   9        
-         1        378 33101   2738 4R   9        
-         1        379 33101   2846 4L   9        
-         1        380 33101   2744 4R   9        
-         1        381 33101   1570 4L   8        
-         1        382 33101   1549 4R   8        
-         1        383 33101   2805 4L   9        
-         1        384 33101   1555 4R   8        
-         1        385 33101   2810 4L   9        
-         1        386 33101   2706 4R   9        
-         1        387 33101   2815 4L   9        
-         1        388 33101   2712 4R   9        
-         1        389 33101   2820 4L   9        
-         1        390 33101   2717 4R   9        
-         1        391 33101   2827 4L   9        
-         1        392 33101   2723 4R   9        
-         1        393 33101   2832 4L   9        
-         1        394 33101   2728 4R   9        
-         1        395 33101   2837 4L   9        
-         1        396 33101   2733 4R   9        
-         1        397 33101   2842 4L   9        
-         1        398 33101   2739 4R   9        
-         1        399 33101   2848 4L   9        
-         1        400 33101   2745 4R   9        
-         1        401 33101   1588 5L   8        
-         1        402 33101   1575 5R   8        
-         1        403 33101   1593 5L   8        
-         1        404 33101   1580 5R   8        
-         1        405 33101   1599 5L   8        
-         1        406 33101   1585 5R   8        
-         1        407 33101   3004 5L   10       
-         1        408 33101   2906 5R   10       
-         1        409 33101   3009 5L   10       
-         1        410 33101   2911 5R   10       
-         1        411 33101   3014 5L   10       
-         1        412 33101   2916 5R   10       
-         1        413 33101   3020 5L   10       
-         1        414 33101   2924 5R   10       
-         1        415 33101   3027 5L   10       
-         1        416 33101   2930 5R   10       
-         1        417 33101   3032 5L   10       
-         1        418 33101   2936 5R   10       
-         1        419 33101   3037 5L   10       
-         1        420 33101   2941 5R   10       
-         1        421 33101   1589 5L   8        
-         1        422 33101   1576 5R   8        
-         1        423 33101   1595 5L   8        
-         1        424 33101   1581 5R   8        
-         1        425 33101   1600 5L   8        
-         1        426 33101   2902 5R   10       
-         1        427 33101   3005 5L   10       
-         1        428 33101   2907 5R   10       
-         1        429 33101   3010 5L   10       
-         1        430 33101   2912 5R   10       
-         1        431 33101   3015 5L   10       
-         1        432 33101   2918 5R   10       
-         1        433 33101   3022 5L   10       
-         1        434 33101   2925 5R   10       
-         1        435 33101   3028 5L   10       
-         1        436 33101   2932 5R   10       
-         1        437 33101   3033 5L   10       
-         1        438 33101   2937 5R   10       
-         1        439 33101   3038 5L   10       
-         1        440 33101   2943 5R   10       
-         1        441 33101   1590 5L   8        
-         1        442 33101   1577 5R   8        
-         1        443 33101   1596 5L   8        
-         1        444 33101   1582 5R   8        
-         1        445 33101   3001 5L   10       
-         1        446 33101   2903 5R   10       
-         1        447 33101   3006 5L   10       
-         1        448 33101   2908 5R   10       
-         1        449 33101   3011 5L   10       
-         1        450 33101   2913 5R   10       
-         1        451 33101   3016 5L   10       
-         1        452 33101   2919 5R   10       
-         1        453 33101   3023 5L   10       
-         1        454 33101   2926 5R   10       
-         1        455 33101   3029 5L   10       
-         1        456 33101   2933 5R   10       
-         1        457 33101   3034 5L   10       
-         1        458 33101   2938 5R   10       
-         1        459 33101   3039 5L   10       
-         1        460 33101   2944 5R   10       
-         1        461 33101   1591 5L   8        
-         1        462 33101   1578 5R   8        
-         1        463 33101   1597 5L   8        
-         1        464 33101   1583 5R   8        
-         1        465 33101   3002 5L   10       
-         1        466 33101   2904 5R   10       
-         1        467 33101   3007 5L   10       
-         1        468 33101   2909 5R   10       
-         1        469 33101   3012 5L   10       
-         1        470 33101   2914 5R   10       
-         1        471 33101   3017 5L   10       
-         1        472 33101   2922 5R   10       
-         1        473 33101   3024 5L   10       
-         1        474 33101   2928 5R   10       
-         1        475 33101   3030 5L   10       
-         1        476 33101   2934 5R   10       
-         1        477 33101   3035 5L   10       
-         1        478 33101   2939 5R   10       
-         1        479 33101   3040 5L   10       
-         1        480 33101   2945 5R   10       
-         1        481 33101   1592 5L   8        
-         1        482 33101   1579 5R   8        
-         1        483 33101   1598 5L   8        
-         1        484 33101   1584 5R   8        
-         1        485 33101   3003 5L   10       
-         1        486 33101   2905 5R   10       
-         1        487 33101   3008 5L   10       
-         1        488 33101   2910 5R   10       
-         1        489 33101   3013 5L   10       
-         1        490 33101   2915 5R   10       
-         1        491 33101   3019 5L   10       
-         1        492 33101   2923 5R   10       
-         1        493 33101   3026 5L   10       
-         1        494 33101   2929 5R   10       
-         1        495 33101   3031 5L   10       
-         1        496 33101   2935 5R   10       
-         1        497 33101   3036 5L   10       
-         1        498 33101   2940 5R   10       
-         1        499 33101   3041 5L   10       
-         1        500 33101   2946 5R   10       
-         1        501 33101   7313 6L   P2       
-         1        502 33101   7212 6R   P2       
-         1        503 33101   7328 6L   P2       
-         1        504 33101   7253 6R   P2       
-         1        505 33101   7318 6L   P2       
-         1        506 33101   7258 6R   P2       
-         1        507 33101   7298 6L   P2       
-         1        508 33101   3198 6R   10       
-         1        509 33101   7323 6L   P2       
-         1        510 33101   7244 6R   P2       
-         1        511 33101   3271 6L   10       
-         1        512 33101   3180 6R   10       
-         1        513 33101   3283 6L   10       
-         1        514 33101   7208 6R   P2       
-         1        515 33101   3291 6L   10       
-         1        516 33101   3172 6R   10       
-         1        517 33101   7283 6L   P2       
-         1        518 33101   7218 6R   P2       
-         1        519 33101   3298 6L   10       
-         1        520 33101   1616 6R   8        
-         1        521 33101   7314 6L   P2       
-         1        522 33101   7249 6R   P2       
-         1        523 33101   7329 6L   P2       
-         1        524 33101   7254 6R   P2       
-         1        525 33101   7319 6L   P2       
-         1        526 33101   7259 6R   P2       
-         1        527 33101   7299 6L   P2       
-         1        528 33101   3199 6R   10       
-         1        529 33101   7324 6L   P2       
-         1        530 33101   7245 6R   P2       
-         1        531 33101   3272 6L   10       
-         1        532 33101   3181 6R   10       
-         1        533 33101   3284 6L   10       
-         1        534 33101   7209 6R   P2       
-         1        535 33101   7288 6L   P2       
-         1        536 33101   7217 6R   P2       
-         1        537 33101   7284 6L   P2       
-         1        538 33101   7219 6R   P2       
-         1        539 33101   3299 6L   10       
-         1        540 33101   3161 6R   10       
-         1        541 33101   7315 6L   P2       
-         1        542 33101   7250 6R   P2       
-         1        543 33101   7330 6L   P2       
-         1        544 33101   7255 6R   P2       
-         1        545 33101   7320 6L   P2       
-         1        546 33101   7260 6R   P2       
-         1        547 33101   7300 6L   P2       
-         1        548 33101   3200 6R   10       
-         1        549 33101   7325 6L   P2       
-         1        550 33101   7246 6R   P2       
-         1        551 33101   3273 6L   10       
-         1        552 33101   3182 6R   10       
-         1        553 33101   3285 6L   10       
-         1        554 33101   7210 6R   P2       
-         1        555 33101   7290 6L   P2       
-         1        556 33101   7216 6R   P2       
-         1        557 33101   7285 6L   P2       
-         1        558 33101   7220 6R   P2       
-         1        559 33101   3300 6L   10       
-         1        560 33101   3173 6R   10       
-         1        561 33101   7316 6L   P2       
-         1        562 33101   7251 6R   P2       
-         1        563 33101   7331 6L   P2       
-         1        564 33101   7256 6R   P2       
-         1        565 33101   7321 6L   P2       
-         1        566 33101   7261 6R   P2       
-         1        567 33101   7301 6L   P2       
-         1        568 33101   7201 6R   P2       
-         1        569 33101   7326 6L   P2       
-         1        570 33101   7247 6R   P2       
-         1        571 33101   3274 6L   10       
-         1        572 33101   3183 6R   10       
-         1        573 33101   3286 6L   10       
-         1        574 33101   7211 6R   P2       
-         1        575 33101   1648 6L   8        
-         1        576 33101   3192 6R   10       
-         1        577 33101   3288 6L   10       
-         1        578 33101   7221 6R   P2       
-         1        579 33101   7281 6L   P2       
-         1        580 33101   3174 6R   10       
-         1        581 33101   7317 6L   P2       
-         1        582 33101   7252 6R   P2       
-         1        583 33101   7332 6L   P2       
-         1        584 33101   7257 6R   P2       
-         1        585 33101   7322 6L   P2       
-         1        586 33101   7262 6R   P2       
-         1        587 33101   7302 6L   P2       
-         1        588 33101   7202 6R   P2       
-         1        589 33101   7327 6L   P2       
-         1        590 33101   7248 6R   P2       
-         1        591 33101   3275 6L   10       
-         1        592 33101   3185 6R   10       
-         1        593 33101   3258 6L   10       
-         1        594 33101   7204 6R   P2       
-         1        595 33101   1652 6L   8        
-         1        596 33101   3191 6R   10       
-         1        597 33101   3290 6L   10       
-         1        598 33101   7222 6R   P2       
-         1        599 33101   7282 6L   P2       
-         1        600 33101   3178 6R   10       
-         1        601 33101   3490 7L   11       
-         1        602 33101   7402 7R   P2       
-         1        603 33101   7442 7L   P2       
-         1        604 33101   7397 7R   P2       
-         1        605 33101   3495 7L   11       
-         1        606 33101    170 7R   5        
-         1        607 33101   7426 7L   P2       
-         1        608 33101    133 7R   5        
-         1        609 33101   7462 7L   P2       
-         1        610 33101   7372 7R   P2       
-         1        611 33101   7457 7L   P2       
-         1        612 33101   7367 7R   P2       
-         1        613 33101   3485 7L   11       
-         1        614 33101   3442 7R   11       
-         1        615 33101   7437 7L   P2       
-         1        616 33101   3432 7R   11       
-         1        617 33101   7432 7L   P2       
-         1        618 33101   7387 7R   P2       
-         1        619 30301    552 7L   4        
-         1        620 33101   7382 7R   P2       
-         1        621 33101   3491 7L   11       
-         1        622 33101   7403 7R   P2       
-         1        623 33101   7443 7L   P2       
-         1        624 33101   7398 7R   P2       
-         1        625 33101   3496 7L   11       
-         1        626 33101   7378 7R   P2       
-         1        627 33101   7427 7L   P2       
-         1        628 33101    179 7R   5        
-         1        629 33101   7463 7L   P2       
-         1        630 33101   3445 7R   11       
-         1        631 33101   7458 7L   P2       
-         1        632 33101   7368 7R   P2       
-         1        633 33101   3486 7L   11       
-         1        634 33101   3438 7R   11       
-         1        635 33101   7438 7L   P2       
-         1        636 33101   3433 7R   11       
-         1        637 33101   7433 7L   P2       
-         1        638 33101   7388 7R   P2       
-         1        639 33101    189 7L   5        
-         1        640 33101   7383 7R   P2       
-         1        641 33101   3492 7L   11       
-         1        642 33101   7404 7R   P2       
-         1        643 33101   7444 7L   P2       
-         1        644 33101   7399 7R   P2       
-         1        645 33101   3498 7L   11       
-         1        646 33101   7379 7R   P2       
-         1        647 33101   7428 7L   P2       
-         1        648 33101    183 7R   5        
-         1        649 33101   7464 7L   P2       
-         1        650 33101   7374 7R   P2       
-         1        651 33101   7459 7L   P2       
-         1        652 33101   7369 7R   P2       
-         1        653 33101   3487 7L   11       
-         1        654 33101   3439 7R   11       
-         1        655 33101   7439 7L   P2       
-         1        656 33101   3434 7R   11       
-         1        657 33101   7434 7L   P2       
-         1        658 33101   7389 7R   P2       
-         1        659 33101    191 7L   5        
-         1        660 33101   7384 7R   P2       
-         1        661 33101   3460 7L   11       
-         1        662 33101   7405 7R   P2       
-         1        663 33101   7445 7L   P2       
-         1        664 33101   7400 7R   P2       
-         1        665 33101   3499 7L   11       
-         1        666 33101   3332 7R   10       
-         1        667 33101   7429 7L   P2       
-         1        668 33101   3409 7R   11       
-         1        669 33101   7465 7L   P2       
-         1        670 33101   7375 7R   P2       
-         1        671 33101   7460 7L   P2       
-         1        672 33101   7370 7R   P2       
-         1        673 33101   3488 7L   11       
-         1        674 33101   3440 7R   11       
-         1        675 33101   7440 7L   P2       
-         1        676 33101   3435 7R   11       
-         1        677 33101   7435 7L   P2       
-         1        678 33101   7390 7R   P2       
-         1        679 33101    200 7L   5        
-         1        680 33101   7385 7R   P2       
-         1        681 30301    553 7L   4        
-         1        682 33101   7406 7R   P2       
-         1        683 33101   7446 7L   P2       
-         1        684 33101   7401 7R   P2       
-         1        685 33101   3500 7L   11       
-         1        686 33101   3437 7R   11       
-         1        687 33101   7431 7L   P2       
-         1        688 33101   3448 7R   11       
-         1        689 33101   7466 7L   P2       
-         1        690 33101   7376 7R   P2       
-         1        691 33101   7461 7L   P2       
-         1        692 33101   7371 7R   P2       
-         1        693 33101   3489 7L   11       
-         1        694 33101   3441 7R   11       
-         1        695 33101   7441 7L   P2       
-         1        696 33101   3436 7R   11       
-         1        697 33101   7436 7L   P2       
-         1        698 33101   7391 7R   P2       
-         1        699 33101    203 7L   5        
-         1        700 33101   7386 7R   P2       
-         1        701 33101   7725 8L   P2_2     
-         1        702 33101   7635 8R   P2_2     
-         1        703 33101   7719 8L   P2_2     
-         1        704 33101   7630 8R   P2_2     
-         1        705 33101   3678 8L   11       
-         1        706 33101   3574 8R   11       
-         1        707 33101   3693 8L   11       
-         1        708 33101   3579 8R   11       
-         1        709 33101   3688 8L   11       
-         1        710 33101   3597 8R   11       
-         1        711 33101   7703 8L   P2_2     
-         1        712 33101   7609 8R   P2_2     
-         1        713 33101   3698 8L   11       
-         1        714 33101   7614 8R   P2_2     
-         1        715 33101   3683 8L   11       
-         1        716 33101   7610 8R   P2_2     
-         1        717 33101   7708 8L   P2_2     
-         1        718 33101   3583 8R   11       
-         1        719 33101   3662 8L   11       
-         1        720 33101   3561 8R   11       
-         1        721 33101   7726 8L   P2_2     
-         1        722 33101   7636 8R   P2_2     
-         1        723 33101   7720 8L   P2_2     
-         1        724 33101   7631 8R   P2_2     
-         1        725 33101   3668 8L   11       
-         1        726 33101   3575 8R   11       
-         1        727 33101   3694 8L   11       
-         1        728 33101   3580 8R   11       
-         1        729 33101   3689 8L   11       
-         1        730 33101   3599 8R   11       
-         1        731 33101   7704 8L   P2_2     
-         1        732 33101   7604 8R   P2_2     
-         1        733 33101   3699 8L   11       
-         1        734 33101   7615 8R   P2_2     
-         1        735 33101   3684 8L   11       
-         1        736 33101   7611 8R   P2_2     
-         1        737 33101   7709 8L   P2_2     
-         1        738 33101   3593 8R   11       
-         1        739 33101    294 8L   5        
-         1        740 33101   3562 8R   11       
-         1        741 33101   7727 8L   P2_2     
-         1        742 33101   7637 8R   P2_2     
-         1        743 33101   7721 8L   P2_2     
-         1        744 33101   7632 8R   P2_2     
-         1        745 33101   3670 8L   11       
-         1        746 33101   3576 8R   11       
-         1        747 33101   3695 8L   11       
-         1        748 33101   3581 8R   11       
-         1        749 33101   3690 8L   11       
-         1        750 33101   7601 8R   P2_2     
-         1        751 33101   7705 8L   P2_2     
-         1        752 33101   7605 8R   P2_2     
-         1        753 33101   3700 8L   11       
-         1        754 33101   7616 8R   P2_2     
-         1        755 33101   3685 8L   11       
-         1        756 33101   7606 8R   P2_2     
-         1        757 33101   7710 8L   P2_2     
-         1        758 33101   3594 8R   11       
-         1        759 33101   3664 8L   11       
-         1        760 33101   3563 8R   11       
-         1        761 33101   7728 8L   P2_2     
-         1        762 33101   7638 8R   P2_2     
-         1        763 33101   7722 8L   P2_2     
-         1        764 33101   7633 8R   P2_2     
-         1        765 33101   3672 8L   11       
-         1        766 33101   3577 8R   11       
-         1        767 33101   3696 8L   11       
-         1        768 33101   3582 8R   11       
-         1        769 33101   3691 8L   11       
-         1        770 33101   3585 8R   11       
-         1        771 33101   7706 8L   P2_2     
-         1        772 33101   7612 8R   P2_2     
-         1        773 33101   3680 8L   11       
-         1        774 33101   7617 8R   P2_2     
-         1        775 33101   3686 8L   11       
-         1        776 33101   7607 8R   P2_2     
-         1        777 33101   7711 8L   P2_2     
-         1        778 33101   3595 8R   11       
-         1        779 33101   3665 8L   11       
-         1        780 33101   3564 8R   11       
-         1        781 33101   7729 8L   P2_2     
-         1        782 33101   7639 8R   P2_2     
-         1        783 33101   7723 8L   P2_2     
-         1        784 33101   7634 8R   P2_2     
-         1        785 33101   3663 8L   11       
-         1        786 33101   3578 8R   11       
-         1        787 33101   3697 8L   11       
-         1        788 33101   3592 8R   11       
-         1        789 33101   3692 8L   11       
-         1        790 33101   3587 8R   11       
-         1        791 33101   7707 8L   P2_2     
-         1        792 33101   7613 8R   P2_2     
-         1        793 33101    301 8L   5        
-         1        794 33101   7618 8R   P2_2     
-         1        795 33101   3687 8L   11       
-         1        796 33101   7608 8R   P2_2     
-         1        797 33101   7712 8L   P2_2     
-         1        798 33101   3596 8R   11       
-         1        799 33101   3666 8L   11       
-         1        800 33101   3565 8R   11       
-         1        801 33101   3885 9L   11       
-         1        802 33101   3793 9R   11       
-         1        803 33101   3880 9L   11       
-         1        804 33101   3794 9R   11       
-         1        805 33101   3875 9L   11       
-         1        806 33101   3725 9R   11       
-         1        807 33101   7910 9L   P2_2     
-         1        808 33101   7820 9R   P2_2     
-         1        809 33101   7920 9L   P2_2     
-         1        810 33101   7814 9R   P2_2     
-         1        811 33101   3858 9L   11       
-         1        812 33101   7805 9R   P2_2     
-         1        813 33101   7905 9L   P2_2     
-         1        814 33101   3792 9R   11       
-         1        815 33101   3822 9L   11       
-         1        816 33101   3800 9R   11       
-         1        817 33101   3895 9L   11       
-         1        818 33101   7810 9R   P2_2     
-         1        819 33101   3890 9L   11       
-         1        820 30301    643 9R   4        
-         1        821 33101   3886 9L   11       
-         1        822 33101   3796 9R   11       
-         1        823 33101   3881 9L   11       
-         1        824 30301    653 9R   4        
-         1        825 33101   3876 9L   11       
-         1        826 33101   3728 9R   11       
-         1        827 33101   7911 9L   P2_2     
-         1        828 33101   7821 9R   P2_2     
-         1        829 33101   7921 9L   P2_2     
-         1        830 33101    365 9R   5        
-         1        831 33101   3859 9L   11       
-         1        832 33101   7806 9R   P2_2     
-         1        833 33101   7906 9L   P2_2     
-         1        834 33101   3791 9R   11       
-         1        835 33101   3901 9L   12       
-         1        836 33101   7801 9R   P2_2     
-         1        837 33101   3896 9L   11       
-         1        838 33101   7816 9R   P2_2     
-         1        839 33101   3891 9L   11       
-         1        840 33101    356 9R   5        
-         1        841 33101   3887 9L   11       
-         1        842 33101   3788 9R   11       
-         1        843 33101   3882 9L   11       
-         1        844 33101   7813 9R   P2_2     
-         1        845 33101   3877 9L   11       
-         1        846 33101   3732 9R   11       
-         1        847 33101   7912 9L   P2_2     
-         1        848 33101   7822 9R   P2_2     
-         1        849 33101   7922 9L   P2_2     
-         1        850 33101    369 9R   5        
-         1        851 33101   3863 9L   11       
-         1        852 33101   7808 9R   P2_2     
-         1        853 33101   7907 9L   P2_2     
-         1        854 33101   3789 9R   11       
-         1        855 33101   7901 9L   P2_2     
-         1        856 33101   7802 9R   P2_2     
-         1        857 33101   3897 9L   11       
-         1        858 33101   7817 9R   P2_2     
-         1        859 33101   3892 9L   11       
-         1        860 33101    357 9R   5        
-         1        861 33101   3888 9L   11       
-         1        862 33101   3787 9R   11       
-         1        863 33101   3883 9L   11       
-         1        864 33101   7815 9R   P2_2     
-         1        865 33101   3878 9L   11       
-         1        866 33101   3737 9R   11       
-         1        867 33101   7913 9L   P2_2     
-         1        868 33101   7823 9R   P2_2     
-         1        869 33101   7923 9L   P2_2     
-         1        870 33101    360 9R   5        
-         1        871 33101   3864 9L   11       
-         1        872 33101   7809 9R   P2_2     
-         1        873 33101   7908 9L   P2_2     
-         1        874 33101   3795 9R   11       
-         1        875 33101   7902 9L   P2_2     
-         1        876 33101   7803 9R   P2_2     
-         1        877 33101   3898 9L   11       
-         1        878 33101   7818 9R   P2_2     
-         1        879 33101   3893 9L   11       
-         1        880 33101    363 9R   5        
-         1        881 33101   3889 9L   11       
-         1        882 33101   3799 9R   11       
-         1        883 33101   3884 9L   11       
-         1        884 33101   3797 9R   11       
-         1        885 33101   3879 9L   11       
-         1        886 33101   3738 9R   11       
-         1        887 33101   7914 9L   P2_2     
-         1        888 33101   7824 9R   P2_2     
-         1        889 33101   7924 9L   P2_2     
-         1        890 33101    359 9R   5        
-         1        891 33101   3865 9L   11       
-         1        892 33101   7812 9R   P2_2     
-         1        893 33101   7909 9L   P2_2     
-         1        894 33101   7811 9R   P2_2     
-         1        895 33101   7904 9L   P2_2     
-         1        896 33101   7804 9R   P2_2     
-         1        897 33101   3899 9L   11       
-         1        898 33101   7819 9R   P2_2     
-         1        899 33101   3894 9L   11       
-         1        900 33101    364 9R   5        
-         1        901 33101   4049 10L  12       
-         1        902 33101   3944 10R  12       
-         1        903 33101   4042 10L  12       
-         1        904 33101   1694 10R  8        
-         1        905 33101   4037 10L  12       
-         1        906 33101   3932 10R  12       
-         1        907 33101   4029 10L  12       
-         1        908 33101   1714 10R  8        
-         1        909 33101   4025 10L  12       
-         1        910 33101   3927 10R  12       
-         1        911 33101   4020 10L  12       
-         1        912 33101   3922 10R  12       
-         1        913 33101   4015 10L  12       
-         1        914 33101   3917 10R  12       
-         1        915 33101   1793 10L  8        
-         1        916 33101   3912 10R  12       
-         1        917 33101   4010 10L  12       
-         1        918 33101   3907 10R  12       
-         1        919 33101   4005 10L  12       
-         1        920 33101   3902 10R  12       
-         1        921 33101   4058 10L  12       
-         1        922 33101   3946 10R  12       
-         1        923 33101   4043 10L  12       
-         1        924 33101   1700 10R  8        
-         1        925 33101   4038 10L  12       
-         1        926 33101   3933 10R  12       
-         1        927 33101   4031 10L  12       
-         1        928 33101   1716 10R  8        
-         1        929 33101   4026 10L  12       
-         1        930 33101   3928 10R  12       
-         1        931 33101   4021 10L  12       
-         1        932 33101   3923 10R  12       
-         1        933 33101   4016 10L  12       
-         1        934 33101   3918 10R  12       
-         1        935 33101   1798 10L  8        
-         1        936 33101   3913 10R  12       
-         1        937 33101   4011 10L  12       
-         1        938 33101   3908 10R  12       
-         1        939 33101   4006 10L  12       
-         1        940 33101   3903 10R  12       
-         1        941 33101   4055 10L  12       
-         1        942 33101   3952 10R  12       
-         1        943 33101   4044 10L  12       
-         1        944 33101   1745 10R  8        
-         1        945 33101   4039 10L  12       
-         1        946 33101   3934 10R  12       
-         1        947 33101   4033 10L  12       
-         1        948 33101   1730 10R  8        
-         1        949 33101   4027 10L  12       
-         1        950 33101   3929 10R  12       
-         1        951 33101   4022 10L  12       
-         1        952 33101   3924 10R  12       
-         1        953 33101   4017 10L  12       
-         1        954 33101   3919 10R  12       
-         1        955 33101   1759 10L  8        
-         1        956 33101   3914 10R  12       
-         1        957 33101   4013 10L  12       
-         1        958 33101   3909 10R  12       
-         1        959 33101   4007 10L  12       
-         1        960 33101   3904 10R  12       
-         1        961 33101   4053 10L  12       
-         1        962 33101   3950 10R  12       
-         1        963 33101   4045 10L  12       
-         1        964 33101   1746 10R  8        
-         1        965 33101   4040 10L  12       
-         1        966 33101   3935 10R  12       
-         1        967 33101   4034 10L  12       
-         1        968 33101   1731 10R  8        
-         1        969 33101   4028 10L  12       
-         1        970 33101   3930 10R  12       
-         1        971 33101   4023 10L  12       
-         1        972 33101   3925 10R  12       
-         1        973 33101   4018 10L  12       
-         1        974 33101   3920 10R  12       
-         1        975 33101   1805 10L  8        
-         1        976 33101   3915 10R  12       
-         1        977 33101   4014 10L  12       
-         1        978 33101   3910 10R  12       
-         1        979 33101   4008 10L  12       
-         1        980 33101   3905 10R  12       
-         1        981 33101   4051 10L  12       
-         1        982 33101   3948 10R  12       
-         1        983 33101   4047 10L  12       
-         1        984 33101   1742 10R  8        
-         1        985 33101   4041 10L  12       
-         1        986 33101   3936 10R  12       
-         1        987 33101   4035 10L  12       
-         1        988 33101   1739 10R  8        
-         1        989 33101   4032 10L  12       
-         1        990 33101   3931 10R  12       
-         1        991 33101   4024 10L  12       
-         1        992 33101   3937 10R  12       
-         1        993 33101   4019 10L  12       
-         1        994 33101   3921 10R  12       
-         1        995 33101   1806 10L  8        
-         1        996 33101   3916 10R  12       
-         1        997 33101   1790 10L  8        
-         1        998 33101   3911 10R  12       
-         1        999 33101   4009 10L  12       
-         1       1000 33101   3906 10R  12       
-         1       1001 33101   9302 11L  P4_1     
-         1       1002 33101   4111 11R  12       
-         1       1003 33101   4294 11L  12       
-         1       1004 33101   4105 11R  12       
-         1       1005 33101   1875 11L  8        
-         1       1006 33101   1868 11R  8        
-         1       1007 33101   4218 11L  12       
-         1       1008 33101   1864 11R  8        
-         1       1009 33101   1928 11L  8        
-         1       1010 33101   1814 11R  8        
-         1       1011 33101   1921 11L  8        
-         1       1012 33101   4100 11R  12       
-         1       1013 33101   4208 11L  12       
-         1       1014 33101   1812 11R  8        
-         1       1015 33101   4203 11L  12       
-         1       1016 33101   1820 11R  8        
-         1       1017 33101   1873 11L  8        
-         1       1018 33101   1829 11R  8        
-         1       1019 33101   4213 11L  12       
-         1       1020 33101   1811 11R  8        
-         1       1021 33101   9303 11L  P4_1     
-         1       1022 33101   4112 11R  12       
-         1       1023 33101   4296 11L  12       
-         1       1024 33101   4107 11R  12       
-         1       1025 33101   1881 11L  8        
-         1       1026 33101   1837 11R  8        
-         1       1027 33101   4219 11L  12       
-         1       1028 33101   1865 11R  8        
-         1       1029 33101   1929 11L  8        
-         1       1030 33101   1823 11R  8        
-         1       1031 33101   1922 11L  8        
-         1       1032 33101   4101 11R  12       
-         1       1033 33101   4209 11L  12       
-         1       1034 33101   1815 11R  8        
-         1       1035 33101   4204 11L  12       
-         1       1036 33101   1821 11R  8        
-         1       1037 33101   1878 11L  8        
-         1       1038 33101   1836 11R  8        
-         1       1039 33101   4214 11L  12       
-         1       1040 33101   1849 11R  8        
-         1       1041 33101   9304 11L  P4_1     
-         1       1042 33101   4113 11R  12       
-         1       1043 33101   4297 11L  12       
-         1       1044 33101   4108 11R  12       
-         1       1045 33101   1887 11L  8        
-         1       1046 33101   1870 11R  8        
-         1       1047 33101   4220 11L  12       
-         1       1048 33101   1866 11R  8        
-         1       1049 33101   4200 11L  12       
-         1       1050 33101   1824 11R  8        
-         1       1051 33101   1923 11L  8        
-         1       1052 33101   4102 11R  12       
-         1       1053 33101   4210 11L  12       
-         1       1054 33101   1816 11R  8        
-         1       1055 33101   4205 11L  12       
-         1       1056 33101   1825 11R  8        
-         1       1057 33101   1880 11L  8        
-         1       1058 33101   1838 11R  8        
-         1       1059 33101   4215 11L  12       
-         1       1060 33101   1830 11R  8        
-         1       1061 33101   9305 11L  P4_1     
-         1       1062 33101   4114 11R  12       
-         1       1063 33101   7003 11L  P1       
-         1       1064 33101   4109 11R  12       
-         1       1065 33101   1907 11L  8        
-         1       1066 33101   4117 11R  12       
-         1       1067 33101   4221 11L  12       
-         1       1068 33101   1854 11R  8        
-         1       1069 33101   4201 11L  12       
-         1       1070 33101   1828 11R  8        
-         1       1071 33101   1924 11L  8        
-         1       1072 33101   4103 11R  12       
-         1       1073 33101   4211 11L  12       
-         1       1074 33101   1817 11R  8        
-         1       1075 33101   4206 11L  12       
-         1       1076 33101   1826 11R  8        
-         1       1077 33101   1891 11L  8        
-         1       1078 33101   1839 11R  8        
-         1       1079 33101   4216 11L  12       
-         1       1080 33101   1832 11R  8        
-         1       1081 33101   9306 11L  P4_1     
-         1       1082 33101   4116 11R  12       
-         1       1083 33101   9301 11L  P4_1     
-         1       1084 33101   4110 11R  12       
-         1       1085 33101   1911 11L  8        
-         1       1086 33101   4128 11R  12       
-         1       1087 33101   4222 11L  12       
-         1       1088 33101   1827 11R  8        
-         1       1089 33101   4202 11L  12       
-         1       1090 33101   1833 11R  8        
-         1       1091 33101   1927 11L  8        
-         1       1092 33101   4104 11R  12       
-         1       1093 33101   4212 11L  12       
-         1       1094 33101   1819 11R  8        
-         1       1095 33101   4207 11L  12       
-         1       1096 33101   1846 11R  8        
-         1       1097 33101   1930 11L  8        
-         1       1098 33101   1840 11R  8        
-         1       1099 33101   4217 11L  12       
-         1       1100 33101   1813 11R  8        
-         1       1101 33101   9455 12L  P4_1     
-         1       1102 33101   7007 12R  P1       
-         1       1103 33101   7095 12L  P1       
-         1       1104 33101   4314 12R  12       
-         1       1105 33101   4377 12L  12       
-         1       1106 33101   7014 12R  P1       
-         1       1107 33101   2049 12L  8        
-         1       1108 33101   4315 12R  12       
-         1       1109 33101   4372 12L  12       
-         1       1110 33101   1986 12R  8        
-         1       1111 33101   4387 12L  12       
-         1       1112 33101   4341 12R  12       
-         1       1113 33101   4349 12L  12       
-         1       1114 33101   4305 12R  12       
-         1       1115 33101   4362 12L  12       
-         1       1116 33101   4310 12R  12       
-         1       1117 33101   4367 12L  12       
-         1       1118 33101   1933 12R  8        
-         1       1119 33101   2042 12L  8        
-         1       1120 33101   1981 12R  8        
-         1       1121 33101   9451 12L  P4_1     
-         1       1122 33101   7009 12R  P1       
-         1       1123 33101   7096 12L  P1       
-         1       1124 33101   4319 12R  12       
-         1       1125 33101   4378 12L  12       
-         1       1126 33101   7012 12R  P1       
-         1       1127 33101   2050 12L  8        
-         1       1128 33101   4316 12R  12       
-         1       1129 33101   4373 12L  12       
-         1       1130 33101   1988 12R  8        
-         1       1131 33101   4386 12L  12       
-         1       1132 33101   4340 12R  12       
-         1       1133 33101   4365 12L  12       
-         1       1134 33101   4306 12R  12       
-         1       1135 33101   4363 12L  12       
-         1       1136 33101   4311 12R  12       
-         1       1137 33101   4368 12L  12       
-         1       1138 33101   1937 12R  8        
-         1       1139 33101   2044 12L  8        
-         1       1140 33101   1982 12R  8        
-         1       1141 33101   9454 12L  P4_1     
-         1       1142 33101   7015 12R  P1       
-         1       1143 33101   7097 12L  P1       
-         1       1144 33101   4304 12R  12       
-         1       1145 33101   4379 12L  12       
-         1       1146 33101   7006 12R  P1       
-         1       1147 33101   4355 12L  12       
-         1       1148 33101   4317 12R  12       
-         1       1149 33101   4374 12L  12       
-         1       1150 33101   1989 12R  8        
-         1       1151 33101   4385 12L  12       
-         1       1152 33101   4338 12R  12       
-         1       1153 33101   4354 12L  12       
-         1       1154 33101   4307 12R  12       
-         1       1155 33101   4364 12L  12       
-         1       1156 33101   4312 12R  12       
-         1       1157 33101   4369 12L  12       
-         1       1158 33101   1987 12R  8        
-         1       1159 33101   2045 12L  8        
-         1       1160 33101   1983 12R  8        
-         1       1161 33101   9452 12L  P4_1     
-         1       1162 33101   7013 12R  P1       
-         1       1163 33101   7098 12L  P1       
-         1       1164 33101   1961 12R  8        
-         1       1165 33101   4380 12L  12       
-         1       1166 33101   7008 12R  P1       
-         1       1167 33101   4350 12L  12       
-         1       1168 33101   4318 12R  12       
-         1       1169 33101   4375 12L  12       
-         1       1170 33101   1990 12R  8        
-         1       1171 33101   4383 12L  12       
-         1       1172 33101   4336 12R  12       
-         1       1173 33101   4353 12L  12       
-         1       1174 33101   4308 12R  12       
-         1       1175 33101   4356 12L  12       
-         1       1176 33101   4313 12R  12       
-         1       1177 33101   4370 12L  12       
-         1       1178 33101   1940 12R  8        
-         1       1179 33101   2047 12L  8        
-         1       1180 33101   1984 12R  8        
-         1       1181 33101   9453 12L  P4_1     
-         1       1182 33101   7011 12R  P1       
-         1       1183 33101   7099 12L  P1       
-         1       1184 33101   1952 12R  8        
-         1       1185 33101   4381 12L  12       
-         1       1186 33101   7010 12R  P1       
-         1       1187 33101   4351 12L  12       
-         1       1188 33101   1938 12R  8        
-         1       1189 33101   4376 12L  12       
-         1       1190 33101   4299 12R  12       
-         1       1191 33101   4382 12L  12       
-         1       1192 33101   4333 12R  12       
-         1       1193 33101   4352 12L  12       
-         1       1194 33101   4309 12R  12       
-         1       1195 33101   4366 12L  12       
-         1       1196 33101   1957 12R  8        
-         1       1197 33101   4371 12L  12       
-         1       1198 33101   1965 12R  8        
-         1       1199 33101   2048 12L  8        
-         1       1200 33101   1985 12R  8        
-         1       1201 33101   2081 13L  8        
-         1       1202 33101   4427 13R  13       
-         1       1203 33101   7177 13L  P1       
-         1       1204 33101   4437 13R  13       
-         1       1205 33101   4491 13L  13       
-         1       1206 33101   4450 13R  13       
-         1       1207 33101    957 13L  7        
-         1       1208 33101   4445 13R  13       
-         1       1209 33101   4483 13L  13       
-         1       1210 33101   4423 13R  13       
-         1       1211 33101   4478 13L  13       
-         1       1212 33101   4418 13R  13       
-         1       1213 33101   4472 13L  13       
-         1       1214 33101   4411 13R  13       
-         1       1215 33101   4465 13L  13       
-         1       1216 33101   4403 13R  13       
-         1       1217 33101   4467 13L  13       
-         1       1218 33101   2072 13R  8        
-         1       1219 33101   2099 13L  8        
-         1       1220 33101   2067 13R  8        
-         1       1221 33101    948 13L  7        
-         1       1222 33101   4428 13R  13       
-         1       1223 33101   7179 13L  P1       
-         1       1224 33101   4440 13R  13       
-         1       1225 33101   4492 13L  13       
-         1       1226 33101   4452 13R  13       
-         1       1227 33101    965 13L  7        
-         1       1228 33101   4446 13R  13       
-         1       1229 33101   4485 13L  13       
-         1       1230 33101   4424 13R  13       
-         1       1231 33101   4479 13L  13       
-         1       1232 33101   4419 13R  13       
-         1       1233 33101   4473 13L  13       
-         1       1234 33101   4412 13R  13       
-         1       1235 33101   4466 13L  13       
-         1       1236 33101   4404 13R  13       
-         1       1237 33101   4468 13L  13       
-         1       1238 33101   2073 13R  8        
-         1       1239 33101   4462 13L  13       
-         1       1240 33101   2068 13R  8        
-         1       1241 33101    951 13L  7        
-         1       1242 33101   4429 13R  13       
-         1       1243 33101   7185 13L  P1       
-         1       1244 33101   4441 13R  13       
-         1       1245 33101   4493 13L  13       
-         1       1246 33101   7139 13R  P1       
-         1       1247 33101   7147 13L  P1       
-         1       1248 33101   4447 13R  13       
-         1       1249 33101   4486 13L  13       
-         1       1250 33101   4425 13R  13       
-         1       1251 33101   4480 13L  13       
-         1       1252 33101   4420 13R  13       
-         1       1253 33101   4464 13L  13       
-         1       1254 33101   4402 13R  13       
-         1       1255 33101   4474 13L  13       
-         1       1256 33101   4405 13R  13       
-         1       1257 33101   4469 13L  13       
-         1       1258 33101   2074 13R  8        
-         1       1259 33101   4459 13L  13       
-         1       1260 33101   2069 13R  8        
-         1       1261 33101    968 13L  7        
-         1       1262 33101   4430 13R  13       
-         1       1263 33101   7183 13L  P1       
-         1       1264 33101   4444 13R  13       
-         1       1265 33101   4494 13L  13       
-         1       1266 33101   7141 13R  P1       
-         1       1267 33101   4489 13L  13       
-         1       1268 33101   4448 13R  13       
-         1       1269 33101   4487 13L  13       
-         1       1270 33101   4426 13R  13       
-         1       1271 33101   4481 13L  13       
-         1       1272 33101   4421 13R  13       
-         1       1273 33101   2079 13L  8        
-         1       1274 33101   4408 13R  13       
-         1       1275 33101   4476 13L  13       
-         1       1276 33101   4406 13R  13       
-         1       1277 33101   4470 13L  13       
-         1       1278 33101   4417 13R  13       
-         1       1279 33101   4460 13L  13       
-         1       1280 33101   2070 13R  8        
-         1       1281 33101   4496 13L  13       
-         1       1282 33101   4431 13R  13       
-         1       1283 33101   7181 13L  P1       
-         1       1284 33101   4443 13R  13       
-         1       1285 33101   4495 13L  13       
-         1       1286 33101   7142 13R  P1       
-         1       1287 33101   4490 13L  13       
-         1       1288 33101   4449 13R  13       
-         1       1289 33101   4488 13L  13       
-         1       1290 33101   4454 13R  13       
-         1       1291 33101   4482 13L  13       
-         1       1292 33101   4422 13R  13       
-         1       1293 33101   2100 13L  8        
-         1       1294 33101   4416 13R  13       
-         1       1295 33101   4477 13L  13       
-         1       1296 33101   4414 13R  13       
-         1       1297 33101   4471 13L  13       
-         1       1298 33101   4415 13R  13       
-         1       1299 33101   4461 13L  13       
-         1       1300 33101   2071 13R  8        
-         1       1301 33101   1085 14L  7        
-         1       1302 33101   1023 14R  7        
-         1       1303 33101   1090 14L  7        
-         1       1304 33101   1028 14R  7        
-         1       1305 33101   4605 14L  13       
-         1       1306 33101   4503 14R  13       
-         1       1307 33101   4610 14L  13       
-         1       1308 33101   4509 14R  13       
-         1       1309 33101   4615 14L  13       
-         1       1310 33101   4514 14R  13       
-         1       1311 33101   4620 14L  13       
-         1       1312 33101   4519 14R  13       
-         1       1313 33101   4625 14L  13       
-         1       1314 33101   4525 14R  13       
-         1       1315 33101   4630 14L  13       
-         1       1316 33101   4530 14R  13       
-         1       1317 33101   4635 14L  13       
-         1       1318 33101   4535 14R  13       
-         1       1319 33101   4640 14L  13       
-         1       1320 33101   4541 14R  13       
-         1       1321 33101   1086 14L  7        
-         1       1322 33101   1024 14R  7        
-         1       1323 33101   4601 14L  13       
-         1       1324 33101   1029 14R  7        
-         1       1325 33101   4606 14L  13       
-         1       1326 33101   4504 14R  13       
-         1       1327 33101   4611 14L  13       
-         1       1328 33101   4510 14R  13       
-         1       1329 33101   4616 14L  13       
-         1       1330 33101   4515 14R  13       
-         1       1331 33101   4621 14L  13       
-         1       1332 33101   4520 14R  13       
-         1       1333 33101   4626 14L  13       
-         1       1334 33101   4526 14R  13       
-         1       1335 33101   4631 14L  13       
-         1       1336 33101   4531 14R  13       
-         1       1337 33101   4636 14L  13       
-         1       1338 33101   4536 14R  13       
-         1       1339 33101   4641 14L  13       
-         1       1340 33101   4542 14R  13       
-         1       1341 33101   1087 14L  7        
-         1       1342 33101   1025 14R  7        
-         1       1343 33101   4602 14L  13       
-         1       1344 33101   1030 14R  7        
-         1       1345 33101   4607 14L  13       
-         1       1346 33101   4505 14R  13       
-         1       1347 33101   4612 14L  13       
-         1       1348 33101   4511 14R  13       
-         1       1349 33101   4617 14L  13       
-         1       1350 33101   4516 14R  13       
-         1       1351 33101   4622 14L  13       
-         1       1352 33101   4522 14R  13       
-         1       1353 33101   4627 14L  13       
-         1       1354 33101   4527 14R  13       
-         1       1355 33101   4632 14L  13       
-         1       1356 33101   4532 14R  13       
-         1       1357 33101   4637 14L  13       
-         1       1358 33101   4538 14R  13       
-         1       1359 33101   4642 14L  13       
-         1       1360 33101   4543 14R  13       
-         1       1361 33101   1088 14L  7        
-         1       1362 33101   1026 14R  7        
-         1       1363 33101   4603 14L  13       
-         1       1364 33101   4501 14R  13       
-         1       1365 33101   4608 14L  13       
-         1       1366 33101   4507 14R  13       
-         1       1367 33101   4613 14L  13       
-         1       1368 33101   4512 14R  13       
-         1       1369 33101   4618 14L  13       
-         1       1370 33101   4517 14R  13       
-         1       1371 33101   4623 14L  13       
-         1       1372 33101   4523 14R  13       
-         1       1373 33101   4628 14L  13       
-         1       1374 33101   4528 14R  13       
-         1       1375 33101   4633 14L  13       
-         1       1376 33101   4533 14R  13       
-         1       1377 33101   4638 14L  13       
-         1       1378 33101   4539 14R  13       
-         1       1379 33101   4643 14L  13       
-         1       1380 33101   4544 14R  13       
-         1       1381 33101   1089 14L  7        
-         1       1382 33101   1027 14R  7        
-         1       1383 33101   4604 14L  13       
-         1       1384 33101   4502 14R  13       
-         1       1385 33101   4609 14L  13       
-         1       1386 33101   4508 14R  13       
-         1       1387 33101   4614 14L  13       
-         1       1388 33101   4513 14R  13       
-         1       1389 33101   4619 14L  13       
-         1       1390 33101   4518 14R  13       
-         1       1391 33101   4624 14L  13       
-         1       1392 33101   4524 14R  13       
-         1       1393 33101   4629 14L  13       
-         1       1394 33101   4529 14R  13       
-         1       1395 33101   4634 14L  13       
-         1       1396 33101   4534 14R  13       
-         1       1397 33101   4639 14L  13       
-         1       1398 33101   4540 14R  13       
-         1       1399 33101   4644 14L  13       
-         1       1400 33101   4545 14R  13       
-         1       1401 33101   1208 15L  7        
-         1       1402 33101   1147 15R  7        
-         1       1403 33101   1174 15L  7        
-         1       1404 33101   1142 15R  7        
-         1       1405 33101   4808 15L  13       
-         1       1406 33101   4708 15R  13       
-         1       1407 33101   4803 15L  13       
-         1       1408 33101   4702 15R  13       
-         1       1409 33101   4813 15L  13       
-         1       1410 33101   4714 15R  13       
-         1       1411 33101   4818 15L  13       
-         1       1412 33101   4719 15R  13       
-         1       1413 33101   4823 15L  13       
-         1       1414 33101   4724 15R  13       
-         1       1415 33101   4828 15L  13       
-         1       1416 33101   4729 15R  13       
-         1       1417 33101   4833 15L  13       
-         1       1418 33101   4734 15R  13       
-         1       1419 33101   4838 15L  13       
-         1       1420 33101   4739 15R  13       
-         1       1421 33101   1209 15L  7        
-         1       1422 33101   1148 15R  7        
-         1       1423 33101   1202 15L  7        
-         1       1424 33101   1143 15R  7        
-         1       1425 33101   4809 15L  13       
-         1       1426 33101   4709 15R  13       
-         1       1427 33101   4804 15L  13       
-         1       1428 33101   4703 15R  13       
-         1       1429 33101   4814 15L  13       
-         1       1430 33101   4715 15R  13       
-         1       1431 33101   4819 15L  13       
-         1       1432 33101   4720 15R  13       
-         1       1433 33101   4824 15L  13       
-         1       1434 33101   4725 15R  13       
-         1       1435 33101   4829 15L  13       
-         1       1436 33101   4730 15R  13       
-         1       1437 33101   4834 15L  13       
-         1       1438 33101   4735 15R  13       
-         1       1439 33101   4839 15L  13       
-         1       1440 33101   4740 15R  13       
-         1       1441 33101   1210 15L  7        
-         1       1442 33101   1149 15R  7        
-         1       1443 33101   1205 15L  7        
-         1       1444 33101   1144 15R  7        
-         1       1445 33101   4810 15L  13       
-         1       1446 33101   4711 15R  13       
-         1       1447 33101   4805 15L  13       
-         1       1448 33101   4704 15R  13       
-         1       1449 33101   4815 15L  13       
-         1       1450 33101   4716 15R  13       
-         1       1451 33101   4820 15L  13       
-         1       1452 33101   4721 15R  13       
-         1       1453 33101   4825 15L  13       
-         1       1454 33101   4726 15R  13       
-         1       1455 33101   4830 15L  13       
-         1       1456 33101   4731 15R  13       
-         1       1457 33101   4835 15L  13       
-         1       1458 33101   4736 15R  13       
-         1       1459 33101   4840 15L  13       
-         1       1460 33101   4741 15R  13       
-         1       1461 33101   4801 15L  13       
-         1       1462 33101   1150 15R  7        
-         1       1463 33101   1206 15L  7        
-         1       1464 33101   1145 15R  7        
-         1       1465 33101   4811 15L  13       
-         1       1466 33101   4712 15R  13       
-         1       1467 33101   4806 15L  13       
-         1       1468 33101   4706 15R  13       
-         1       1469 33101   4816 15L  13       
-         1       1470 33101   4717 15R  13       
-         1       1471 33101   4821 15L  13       
-         1       1472 33101   4722 15R  13       
-         1       1473 33101   4826 15L  13       
-         1       1474 33101   4727 15R  13       
-         1       1475 33101   4831 15L  13       
-         1       1476 33101   4732 15R  13       
-         1       1477 33101   4836 15L  13       
-         1       1478 33101   4737 15R  13       
-         1       1479 33101   4841 15L  13       
-         1       1480 33101   4742 15R  13       
-         1       1481 33101   4802 15L  13       
-         1       1482 33101   4701 15R  13       
-         1       1483 33101   1207 15L  7        
-         1       1484 33101   1146 15R  7        
-         1       1485 33101   4812 15L  13       
-         1       1486 33101   4713 15R  13       
-         1       1487 33101   4807 15L  13       
-         1       1488 33101   4707 15R  13       
-         1       1489 33101   4817 15L  13       
-         1       1490 33101   4718 15R  13       
-         1       1491 33101   4822 15L  13       
-         1       1492 33101   4723 15R  13       
-         1       1493 33101   4827 15L  13       
-         1       1494 33101   4728 15R  13       
-         1       1495 33101   4832 15L  13       
-         1       1496 33101   4733 15R  13       
-         1       1497 33101   4837 15L  13       
-         1       1498 33101   4738 15R  13       
-         1       1499 33101   4842 15L  13       
-         1       1500 33101   4743 15R  13       
-         1       1501 33101   1328 16L  7        
-         1       1502 33101   4902 16R  14       
-         1       1503 33101   1323 16L  7        
-         1       1504 33101   1264 16R  7        
-         1       1505 33101   5007 16L  14       
-         1       1506 33101   4908 16R  14       
-         1       1507 33101   5012 16L  14       
-         1       1508 33101   4913 16R  14       
-         1       1509 33101   5019 16L  14       
-         1       1510 33101   4918 16R  14       
-         1       1511 33101   5025 16L  14       
-         1       1512 33101   4923 16R  14       
-         1       1513 33101   5033 16L  14       
-         1       1514 33101   4929 16R  13       
-         1       1515 33101   5044 16L  14       
-         1       1516 33101   4939 16R  14       
-         1       1517 33101   5038 16L  14       
-         1       1518 33101   4934 16R  14       
-         1       1519 33101   5049 16L  14       
-         1       1520 33101   4945 16R  14       
-         1       1521 33101   1329 16L  7        
-         1       1522 33101   4903 16R  14       
-         1       1523 33101   1324 16L  7        
-         1       1524 33101   1266 16R  7        
-         1       1525 33101   5008 16L  14       
-         1       1526 33101   4909 16R  14       
-         1       1527 33101   5013 16L  14       
-         1       1528 33101   4914 16R  14       
-         1       1529 33101   5021 16L  14       
-         1       1530 33101   4919 16R  14       
-         1       1531 33101   5026 16L  14       
-         1       1532 33101   4924 16R  14       
-         1       1533 33101   5034 16L  14       
-         1       1534 33101   4930 16R  14       
-         1       1535 33101   5045 16L  14       
-         1       1536 33101   4940 16R  14       
-         1       1537 33101   5039 16L  14       
-         1       1538 33101   4935 16R  14       
-         1       1539 33101   5050 16L  14       
-         1       1540 33101   4946 16R  14       
-         1       1541 33101   1330 16L  7        
-         1       1542 33101   4904 16R  14       
-         1       1543 33101   1325 16L  7        
-         1       1544 33101   1267 16R  7        
-         1       1545 33101   5009 16L  14       
-         1       1546 33101   4910 16R  14       
-         1       1547 33101   5014 16L  14       
-         1       1548 33101   4915 16R  14       
-         1       1549 33101   5022 16L  14       
-         1       1550 33101   4920 16R  14       
-         1       1551 33101   5029 16L  14       
-         1       1552 33101   4925 16R  14       
-         1       1553 33101   5035 16L  14       
-         1       1554 33101   4931 16R  14       
-         1       1555 33101   5046 16L  14       
-         1       1556 33101   4941 16R  14       
-         1       1557 33101   5040 16L  14       
-         1       1558 33101   4936 16R  14       
-         1       1559 33101   5051 16L  14       
-         1       1560 33101   4947 16R  14       
-         1       1561 33101   5001 16L  14       
-         1       1562 33101   4905 16R  14       
-         1       1563 33101   1326 16L  7        
-         1       1564 33101   1269 16R  7        
-         1       1565 33101   5010 16L  14       
-         1       1566 33101   4911 16R  14       
-         1       1567 33101   5016 16L  14       
-         1       1568 33101   4916 16R  14       
-         1       1569 33101   5023 16L  14       
-         1       1570 33101   4921 16R  14       
-         1       1571 33101   5030 16L  14       
-         1       1572 33101   4926 16R  14       
-         1       1573 33101   5036 16L  14       
-         1       1574 33101   4932 16R  14       
-         1       1575 33101   5047 16L  14       
-         1       1576 33101   4943 16R  14       
-         1       1577 33101   5041 16L  14       
-         1       1578 33101   4937 16R  14       
-         1       1579 33101   5052 16L  14       
-         1       1580 33101   4948 16R  14       
-         1       1581 33101   5005 16L  14       
-         1       1582 33101   4906 16R  14       
-         1       1583 33101   1327 16L  7        
-         1       1584 33101   4901 16R  14       
-         1       1585 33101   5011 16L  14       
-         1       1586 33101   4912 16R  14       
-         1       1587 33101   5017 16L  14       
-         1       1588 33101   4917 16R  14       
-         1       1589 33101   5024 16L  14       
-         1       1590 33101   4922 16R  14       
-         1       1591 33101   5032 16L  14       
-         1       1592 33101   4928 16R  14       
-         1       1593 33101   5037 16L  14       
-         1       1594 33101   4933 16R  14       
-         1       1595 33101   5048 16L  14       
-         1       1596 33101   4944 16R  14       
-         1       1597 33101   5042 16L  14       
-         1       1598 33101   4938 16R  14       
-         1       1599 33101   5053 16L  14       
-         1       1600 33101   4949 16R  14       
-         1       1601 33101   1447 17L  7        
-         1       1602 33101   1386 17R  7        
-         1       1603 33101   5254 17L  14       
-         1       1604 33101   5101 17R  14       
-         1       1605 33101   5262 17L  14       
-         1       1606 33101   5106 17R  14       
-         1       1607 33101   5270 17L  14       
-         1       1608 33101   5111 17R  14       
-         1       1609 33101   5275 17L  14       
-         1       1610 33101   5118 17R  14       
-         1       1611 33101   5283 17L  14       
-         1       1612 33101   5123 17R  14       
-         1       1613 33101   5288 17L  14       
-         1       1614 33101   5128 17R  14       
-         1       1615 33101   5293 17L  14       
-         1       1616 33101   5134 17R  14       
-         1       1617 33101   5298 17L  14       
-         1       1618 33101   5139 17R  14       
-         1       1619 33101   5303 17L  14       
-         1       1620 33101   5144 17R  14       
-         1       1621 33101   1448 17L  7        
-         1       1622 33101   1387 17R  7        
-         1       1623 33101   5255 17L  14       
-         1       1624 33101   5102 17R  14       
-         1       1625 33101   5263 17L  14       
-         1       1626 33101   5107 17R  14       
-         1       1627 33101   5271 17L  14       
-         1       1628 33101   5113 17R  14       
-         1       1629 33101   5276 17L  14       
-         1       1630 33101   5119 17R  14       
-         1       1631 33101   5284 17L  14       
-         1       1632 33101   5124 17R  14       
-         1       1633 33101   5289 17L  14       
-         1       1634 33101   5129 17R  14       
-         1       1635 33101   5294 17L  14       
-         1       1636 33101   5135 17R  14       
-         1       1637 33101   5299 17L  14       
-         1       1638 33101   5140 17R  14       
-         1       1639 33101   5304 17L  14       
-         1       1640 33101   5145 17R  14       
-         1       1641 33101   1449 17L  7        
-         1       1642 33101   1388 17R  7        
-         1       1643 33101   5258 17L  14       
-         1       1644 33101   5103 17R  14       
-         1       1645 33101   5265 17L  14       
-         1       1646 33101   5108 17R  14       
-         1       1647 33101   5272 17L  14       
-         1       1648 33101   5115 17R  14       
-         1       1649 33101   5278 17L  14       
-         1       1650 33101   5120 17R  14       
-         1       1651 33101   5285 17L  14       
-         1       1652 33101   5125 17R  14       
-         1       1653 33101   5290 17L  14       
-         1       1654 33101   5130 17R  14       
-         1       1655 33101   5295 17L  14       
-         1       1656 33101   5136 17R  14       
-         1       1657 33101   5300 17L  14       
-         1       1658 33101   5141 17R  14       
-         1       1659 33101   5305 17L  14       
-         1       1660 33101   5146 17R  14       
-         1       1661 33101   1450 17L  7        
-         1       1662 33101   1389 17R  7        
-         1       1663 33101   5259 17L  14       
-         1       1664 33101   5104 17R  14       
-         1       1665 33101   5266 17L  14       
-         1       1666 33101   5109 17R  14       
-         1       1667 33101   5273 17L  14       
-         1       1668 33101   5116 17R  14       
-         1       1669 33101   5279 17L  14       
-         1       1670 33101   5121 17R  14       
-         1       1671 33101   5286 17L  14       
-         1       1672 33101   5126 17R  14       
-         1       1673 33101   5291 17L  14       
-         1       1674 33101   5131 17R  14       
-         1       1675 33101   5296 17L  14       
-         1       1676 33101   5137 17R  14       
-         1       1677 33101   5301 17L  14       
-         1       1678 33101   5142 17R  14       
-         1       1679 33101   5306 17L  14       
-         1       1680 33101   5147 17R  14       
-         1       1681 33101   5252 17L  14       
-         1       1682 33101   1390 17R  7        
-         1       1683 33101   5261 17L  14       
-         1       1684 33101   5105 17R  14       
-         1       1685 33101   5269 17L  14       
-         1       1686 33101   5110 17R  14       
-         1       1687 33101   5274 17L  14       
-         1       1688 33101   5117 17R  14       
-         1       1689 33101   5280 17L  14       
-         1       1690 33101   5122 17R  14       
-         1       1691 33101   5287 17L  14       
-         1       1692 33101   5127 17R  14       
-         1       1693 33101   5292 17L  14       
-         1       1694 33101   5133 17R  14       
-         1       1695 33101   5297 17L  14       
-         1       1696 33101   5138 17R  14       
-         1       1697 33101   5302 17L  14       
-         1       1698 33101   5143 17R  14       
-         1       1699 33101   5307 17L  14       
-         1       1700 33101   5148 17R  14       
-         2          1 33101   2248 1L   9        
-         2          2 33101   2139 1R   9        
-         2          3 33101   2254 1L   9        
-         2          4 33101   2144 1R   9        
-         2          5 33101   2260 1L   9        
-         2          6 33101   2149 1R   9        
-         2          7 33101   2266 1L   9        
-         2          8 33101   2155 1R   9        
-         2          9 33101   2272 1L   9        
-         2         10 33101   2161 1R   9        
-         2         11 33101   2277 1L   9        
-         2         12 33101   2167 1R   9        
-         2         13 33101   2283 1L   9        
-         2         14 33101   2173 1R   9        
-         2         15 33101   2288 1L   9        
-         2         16 33101   2179 1R   9        
-         2         17 33101   2294 1L   9        
-         2         18 33101   2184 1R   9        
-         2         19 33101   2299 1L   9        
-         2         20 33101   2192 1R   9        
-         2         21 33101   2249 1L   9        
-         2         22 33101   2140 1R   9        
-         2         23 33101   2255 1L   9        
-         2         24 33101   2145 1R   9        
-         2         25 33101   2262 1L   9        
-         2         26 33101   2150 1R   9        
-         2         27 33101   2267 1L   9        
-         2         28 33101   2156 1R   9        
-         2         29 33101   2273 1L   9        
-         2         30 33101   2162 1R   9        
-         2         31 33101   2278 1L   9        
-         2         32 33101   2168 1R   9        
-         2         33 33101   2284 1L   9        
-         2         34 33101   2174 1R   9        
-         2         35 33101   2289 1L   9        
-         2         36 33101   2180 1R   9        
-         2         37 33101   2295 1L   9        
-         2         38 33101   2185 1R   9        
-         2         39 33101   2300 1L   9        
-         2         40 33101   2193 1R   9        
-         2         41 33101   2250 1L   9        
-         2         42 33101   2141 1R   9        
-         2         43 33101   2256 1L   9        
-         2         44 33101   2146 1R   9        
-         2         45 33101   2263 1L   9        
-         2         46 33101   2152 1R   9        
-         2         47 33101   2269 1L   9        
-         2         48 33101   2157 1R   9        
-         2         49 33101   2274 1L   9        
-         2         50 33101   2163 1R   9        
-         2         51 33101   2279 1L   9        
-         2         52 33101   2169 1R   9        
-         2         53 33101   2285 1L   9        
-         2         54 33101   2176 1R   9        
-         2         55 33101   2291 1L   9        
-         2         56 33101   2181 1R   9        
-         2         57 33101   2296 1L   9        
-         2         58 33101   2187 1R   9        
-         2         59 33101   2220 1L   9        
-         2         60 33101   2194 1R   9        
-         2         61 33101   2252 1L   9        
-         2         62 33101   2142 1R   9        
-         2         63 33101   2257 1L   9        
-         2         64 33101   2147 1R   9        
-         2         65 33101   2264 1L   9        
-         2         66 33101   2153 1R   9        
-         2         67 33101   2270 1L   9        
-         2         68 33101   2158 1R   9        
-         2         69 33101   2275 1L   9        
-         2         70 33101   2164 1R   9        
-         2         71 33101   2280 1L   9        
-         2         72 33101   2170 1R   9        
-         2         73 33101   2286 1L   9        
-         2         74 33101   2177 1R   9        
-         2         75 33101   2292 1L   9        
-         2         76 33101   2182 1R   9        
-         2         77 33101   2297 1L   9        
-         2         78 33101   2188 1R   9        
-         2         79 33101   2244 1L   9        
-         2         80 33101   2195 1R   9        
-         2         81 33101   2253 1L   9        
-         2         82 33101   2143 1R   8        
-         2         83 33101   2259 1L   9        
-         2         84 33101   2148 1R   9        
-         2         85 33101   2265 1L   9        
-         2         86 33101   2154 1R   9        
-         2         87 33101   2271 1L   9        
-         2         88 33101   2159 1R   9        
-         2         89 33101   2276 1L   9        
-         2         90 33101   2165 1R   9        
-         2         91 33101   2282 1L   9        
-         2         92 33101   2172 1R   9        
-         2         93 33101   2287 1L   9        
-         2         94 33101   2178 1R   9        
-         2         95 33101   2293 1L   9        
-         2         96 33101   2183 1R   9        
-         2         97 33101   2298 1L   9        
-         2         98 33101   2189 1R   9        
-         2         99 33101   2258 1L   9        
-         2        100 33101   2197 1R   9        
-         2        101 33101   2470 2L   9        
-         2        102 33101   2355 2R   9        
-         2        103 33101   2475 2L   9        
-         2        104 33101   2361 2R   9        
-         2        105 33101   2406 2L   9        
-         2        106 33101   1485 2R   8        
-         2        107 33101   2481 2L   9        
-         2        108 33101   2366 2R   9        
-         2        109 33101   2487 2L   9        
-         2        110 33101   2372 2R   9        
-         2        111 33101   2493 2L   9        
-         2        112 33101    554 2R   6        
-         2        113 33101   2498 2L   9        
-         2        114 33101   2380 2R   9        
-         2        115 33101   2417 2L   9        
-         2        116 33101   2384 2R   9        
-         2        117 33101   8303 2L   P3       
-         2        118 33101   2388 2R   9        
-         2        119 33101   8307 2L   P3       
-         2        120 33101   2395 2R   9        
-         2        121 33101   2471 2L   9        
-         2        122 33101   2356 2R   9        
-         2        123 33101   2476 2L   9        
-         2        124 33101   2362 2R   9        
-         2        125 33101   2407 2L   9        
-         2        126 33101   1487 2R   8        
-         2        127 33101   2483 2L   9        
-         2        128 33101   2367 2R   9        
-         2        129 33101   2488 2L   9        
-         2        130 33101   2373 2R   9        
-         2        131 33101   2495 2L   9        
-         2        132 33101    536 2R   6        
-         2        133 33101   2500 2L   9        
-         2        134 33101   1490 2R   8        
-         2        135 33101   2477 2L   9        
-         2        136 33101   1493 2R   8        
-         2        137 33101   8304 2L   P3       
-         2        138 33101   2346 2R   9        
-         2        139 33101   8308 2L   P3       
-         2        140 33101   2378 2R   9        
-         2        141 33101   2472 2L   9        
-         2        142 33101   2357 2R   9        
-         2        143 33101   2478 2L   9        
-         2        144 33101   2363 2R   9        
-         2        145 33101   2409 2L   9        
-         2        146 33101   1488 2R   8        
-         2        147 33101   2484 2L   9        
-         2        148 33101   2369 2R   9        
-         2        149 33101   2490 2L   9        
-         2        150 33101   2374 2R   9        
-         2        151 33101   2496 2L   9        
-         2        152 33101   2327 2R   9        
-         2        153 33101   2413 2L   9        
-         2        154 33101   2381 2R   9        
-         2        155 33101   8301 2L   P3       
-         2        156 33101   2385 2R   9        
-         2        157 33101   8305 2L   P3       
-         2        158 33101   2389 2R   9        
-         2        159 33101   8309 2L   P3       
-         2        160 33101   2392 2R   9        
-         2        161 33101   2473 2L   9        
-         2        162 33101   2358 2R   9        
-         2        163 33101   2479 2L   9        
-         2        164 33101   2364 2R   9        
-         2        165 33101   2410 2L   9        
-         2        166 33101   1489 2R   8        
-         2        167 33101   2485 2L   9        
-         2        168 33101   2370 2R   9        
-         2        169 33101   2491 2L   9        
-         2        170 33101   2375 2R   9        
-         2        171 33101   2497 2L   9        
-         2        172 33101   2335 2R   9        
-         2        173 33101   2414 2L   9        
-         2        174 33101   2382 2R   9        
-         2        175 33101   8302 2L   P3       
-         2        176 33101   2386 2R   9        
-         2        177 33101   8306 2L   P3       
-         2        178 33101   2390 2R   9        
-         2        179 33101   8310 2L   P3       
-         2        180 33101   2393 2R   9        
-         2        181 33101   2474 2L   9        
-         2        182 33101   2359 2R   9        
-         2        183 33101   2480 2L   9        
-         2        184 33101   2365 2R   9        
-         2        185 33101   2411 2L   9        
-         2        186 33101   1491 2R   8        
-         2        187 33101   2486 2L   9        
-         2        188 33101   2371 2R   9        
-         2        189 33101   2492 2L   9        
-         2        190 33101   2379 2R   9        
-         2        191 33101    556 2L   6        
-         2        192 33101   2376 2R   9        
-         2        193 33101    567 2L   6        
-         2        194 33101   2383 2R   9        
-         2        195 33101    571 2L   6        
-         2        196 33101   2387 2R   9        
-         2        197 33101   8311 2L   P3       
-         2        198 33101   2391 2R   9        
-         2        199 33101   2499 2L   9        
-         2        200 33101   2394 2R   9        
-         2        201 33101    650 3L   6        
-         2        202 33101   2550 3R   9        
-         2        203 33101   2647 3L   9        
-         2        204 33101   2555 3R   9        
-         2        205 33101   2652 3L   9        
-         2        206 33101   2560 3R   9        
-         2        207 33101   2658 3L   9        
-         2        208 33101   2565 3R   9        
-         2        209 33101   2663 3L   9        
-         2        210 33101   2570 3R   9        
-         2        211 33101   2668 3L   9        
-         2        212 33101   2575 3R   9        
-         2        213 33101   2673 3L   9        
-         2        214 33101   2581 3R   9        
-         2        215 33101   2678 3L   9        
-         2        216 33101   2586 3R   9        
-         2        217 33101   2683 3L   9        
-         2        218 33101   2592 3R   9        
-         2        219 33101   2688 3L   9        
-         2        220 33101   2598 3R   9        
-         2        221 33101   2616 3L   9        
-         2        222 33101   2551 3R   9        
-         2        223 33101   2648 3L   9        
-         2        224 33101   2556 3R   9        
-         2        225 33101   2653 3L   9        
-         2        226 33101   2561 3R   9        
-         2        227 33101   2659 3L   9        
-         2        228 33101   2566 3R   9        
-         2        229 33101   2664 3L   9        
-         2        230 33101   2571 3R   9        
-         2        231 33101   2669 3L   9        
-         2        232 33101   2577 3R   9        
-         2        233 33101   2674 3L   9        
-         2        234 33101   2582 3R   9        
-         2        235 33101   2679 3L   9        
-         2        236 33101   2587 3R   9        
-         2        237 33101   2684 3L   9        
-         2        238 33101   2593 3R   9        
-         2        239 33101   2689 3L   9        
-         2        240 33101   2599 3R   9        
-         2        241 33101   2644 3L   9        
-         2        242 33101   2552 3R   9        
-         2        243 33101   2649 3L   9        
-         2        244 33101   2557 3R   9        
-         2        245 33101   2654 3L   9        
-         2        246 33101   2562 3R   9        
-         2        247 33101   2660 3L   9        
-         2        248 33101   2567 3R   9        
-         2        249 33101   2665 3L   9        
-         2        250 33101   2572 3R   9        
-         2        251 33101   2670 3L   9        
-         2        252 33101   2578 3R   9        
-         2        253 33101   2675 3L   9        
-         2        254 33101   2583 3R   9        
-         2        255 33101   2680 3L   9        
-         2        256 33101   2588 3R   9        
-         2        257 33101   2685 3L   9        
-         2        258 33101   2594 3R   9        
-         2        259 33101   2690 3L   9        
-         2        260 33101   2600 3R   9        
-         2        261 33101   2645 3L   9        
-         2        262 33101   2553 3R   9        
-         2        263 33101   8493 3L   P3       
-         2        264 33101   2558 3R   9        
-         2        265 33101   2655 3L   9        
-         2        266 33101   2563 3R   9        
-         2        267 33101   2661 3L   9        
-         2        268 33101   2568 3R   9        
-         2        269 33101   2666 3L   9        
-         2        270 33101   2573 3R   9        
-         2        271 33101   2671 3L   9        
-         2        272 33101   2579 3R   9        
-         2        273 33101   2676 3L   9        
-         2        274 33101   2584 3R   9        
-         2        275 33101   2681 3L   9        
-         2        276 33101   2590 3R   9        
-         2        277 33101   2686 3L   9        
-         2        278 33101   2595 3R   9        
-         2        279 33101   2691 3L   9        
-         2        280 33101   1521 3R   8        
-         2        281 33101   2646 3L   9        
-         2        282 33101   2554 3R   9        
-         2        283 33101   2651 3L   9        
-         2        284 33101   2559 3R   9        
-         2        285 33101   2656 3L   9        
-         2        286 33101   2564 3R   9        
-         2        287 33101   2662 3L   9        
-         2        288 33101   2569 3R   9        
-         2        289 33101   2667 3L   9        
-         2        290 33101   2574 3R   9        
-         2        291 33101   2672 3L   9        
-         2        292 33101   2580 3R   9        
-         2        293 33101   2677 3L   9        
-         2        294 33101   2585 3R   9        
-         2        295 33101   2682 3L   9        
-         2        296 33101   2591 3R   9        
-         2        297 33101   2687 3L   9        
-         2        298 33101   2597 3R   9        
-         2        299 33101   2693 3L   9        
-         2        300 33101   8421 3R   P3       
-         2        301 33101   2849 4L   9        
-         2        302 33101   2746 4R   9        
-         2        303 33101   2854 4L   9        
-         2        304 33101   2752 4R   9        
-         2        305 33101   2859 4L   9        
-         2        306 33101   2757 4R   9        
-         2        307 33101   2864 4L   9        
-         2        308 33101   2763 4R   9        
-         2        309 33101   2871 4L   9        
-         2        310 33101   2768 4R   9        
-         2        311 33101   2876 4L   9        
-         2        312 33101   2773 4R   9        
-         2        313 33101   2881 4L   9        
-         2        314 33101   2778 4R   9        
-         2        315 33101   2886 4L   9        
-         2        316 33101   2783 4R   9        
-         2        317 33101   2891 4L   9        
-         2        318 33101   2788 4R   9        
-         2        319 33101   2896 4L   9        
-         2        320 33101   2794 4R   9        
-         2        321 33101   2850 4L   9        
-         2        322 33101   2747 4R   9        
-         2        323 33101   2855 4L   9        
-         2        324 33101   2753 4R   9        
-         2        325 33101   2860 4L   9        
-         2        326 33101   2758 4R   9        
-         2        327 33101   2867 4L   9        
-         2        328 33101   2764 4R   9        
-         2        329 33101   2872 4L   9        
-         2        330 33101   2769 4R   9        
-         2        331 33101   2877 4L   9        
-         2        332 33101   2774 4R   9        
-         2        333 33101   2882 4L   9        
-         2        334 33101   2779 4R   9        
-         2        335 33101   2887 4L   9        
-         2        336 33101   2784 4R   9        
-         2        337 33101   2892 4L   9        
-         2        338 33101   2789 4R   9        
-         2        339 33101   2897 4L   9        
-         2        340 33101   2797 4R   9        
-         2        341 33101   2851 4L   9        
-         2        342 33101   2748 4R   9        
-         2        343 33101   2856 4L   9        
-         2        344 33101   2754 4R   9        
-         2        345 33101   2861 4L   9        
-         2        346 33101   2759 4R   9        
-         2        347 33101   2868 4L   9        
-         2        348 33101   2765 4R   9        
-         2        349 33101   2873 4L   9        
-         2        350 33101   2770 4R   9        
-         2        351 33101   2878 4L   9        
-         2        352 33101   2775 4R   9        
-         2        353 33101   2883 4L   9        
-         2        354 33101   2780 4R   9        
-         2        355 33101   2888 4L   9        
-         2        356 33101   2785 4R   9        
-         2        357 33101   2893 4L   9        
-         2        358 33101   2791 4R   9        
-         2        359 33101   2898 4L   9        
-         2        360 33101   2798 4R   9        
-         2        361 33101   2852 4L   9        
-         2        362 33101   2749 4R   9        
-         2        363 33101   2857 4L   9        
-         2        364 33101   2755 4R   9        
-         2        365 33101   2862 4L   9        
-         2        366 33101   2760 4R   9        
-         2        367 33101   2869 4L   9        
-         2        368 33101   2766 4R   9        
-         2        369 33101   2874 4L   9        
-         2        370 33101   2771 4R   9        
-         2        371 33101   2879 4L   9        
-         2        372 33101   2776 4R   9        
-         2        373 33101   2884 4L   9        
-         2        374 33101   2781 4R   9        
-         2        375 33101   2889 4L   9        
-         2        376 33101   2786 4R   9        
-         2        377 33101   2894 4L   9        
-         2        378 33101   2792 4R   9        
-         2        379 33101   2899 4L   9        
-         2        380 33101   2800 4R   9        
-         2        381 33101   2853 4L   9        
-         2        382 33101   2750 4R   9        
-         2        383 33101   2858 4L   9        
-         2        384 33101   2756 4R   9        
-         2        385 33101   2863 4L   9        
-         2        386 33101   2761 4R   9        
-         2        387 33101   2870 4L   9        
-         2        388 33101   2767 4R   9        
-         2        389 33101   2875 4L   9        
-         2        390 33101   2772 4R   9        
-         2        391 33101   2880 4L   9        
-         2        392 33101   2777 4R   9        
-         2        393 33101   2885 4L   9        
-         2        394 33101   2782 4R   9        
-         2        395 33101   2890 4L   9        
-         2        396 33101   2787 4R   9        
-         2        397 33101   2895 4L   9        
-         2        398 33101   2793 4R   9        
-         2        399 33101   2900 4L   9        
-         2        400 33101   2762 4R   9        
-         2        401 33101   3042 5L   10       
-         2        402 33101   2947 5R   10       
-         2        403 33101   3047 5L   10       
-         2        404 33101   2952 5R   10       
-         2        405 33101   3053 5L   10       
-         2        406 33101   2957 5R   10       
-         2        407 33101   3058 5L   10       
-         2        408 33101   2962 5R   10       
-         2        409 33101   3063 5L   10       
-         2        410 33101   2967 5R   10       
-         2        411 33101   3068 5L   10       
-         2        412 33101   2972 5R   10       
-         2        413 33101   3073 5L   10       
-         2        414 33101   2977 5R   10       
-         2        415 33101   3078 5L   10       
-         2        416 33101   2982 5R   10       
-         2        417 33101   3084 5L   10       
-         2        418 33101   2987 5R   10       
-         2        419 33101   3089 5L   10       
-         2        420 33101   2992 5R   10       
-         2        421 33101   3043 5L   10       
-         2        422 33101   2948 5R   10       
-         2        423 33101   3048 5L   10       
-         2        424 33101   2953 5R   10       
-         2        425 33101   3054 5L   10       
-         2        426 33101   2958 5R   10       
-         2        427 33101   3059 5L   10       
-         2        428 33101   2963 5R   10       
-         2        429 33101   3064 5L   10       
-         2        430 33101   2968 5R   10       
-         2        431 33101   3069 5L   10       
-         2        432 33101   2973 5R   10       
-         2        433 33101   3074 5L   10       
-         2        434 33101   2978 5R   10       
-         2        435 33101   3079 5L   10       
-         2        436 33101   2983 5R   10       
-         2        437 33101   3085 5L   10       
-         2        438 33101   2988 5R   10       
-         2        439 33101   3090 5L   10       
-         2        440 33101   2993 5R   10       
-         2        441 33101   3044 5L   10       
-         2        442 33101   2949 5R   10       
-         2        443 33101   3049 5L   10       
-         2        444 33101   2954 5R   10       
-         2        445 33101   3055 5L   10       
-         2        446 33101   2959 5R   10       
-         2        447 33101   3060 5L   10       
-         2        448 33101   2964 5R   10       
-         2        449 33101   3065 5L   10       
-         2        450 33101   2969 5R   10       
-         2        451 33101   3070 5L   10       
-         2        452 33101   2974 5R   10       
-         2        453 33101   3075 5L   10       
-         2        454 33101   2979 5R   10       
-         2        455 33101   3080 5L   10       
-         2        456 33101   2984 5R   10       
-         2        457 33101   3086 5L   10       
-         2        458 33101   2989 5R   10       
-         2        459 33101   3091 5L   10       
-         2        460 33101   2994 5R   10       
-         2        461 33101   3045 5L   10       
-         2        462 33101   2950 5R   10       
-         2        463 33101   3050 5L   10       
-         2        464 33101   2955 5R   10       
-         2        465 33101   3056 5L   10       
-         2        466 33101   2960 5R   10       
-         2        467 33101   3061 5L   10       
-         2        468 33101   2965 5R   10       
-         2        469 33101   3066 5L   10       
-         2        470 33101   2970 5R   10       
-         2        471 33101   3071 5L   10       
-         2        472 33101   2975 5R   10       
-         2        473 33101   3076 5L   10       
-         2        474 33101   2980 5R   10       
-         2        475 33101   3082 5L   10       
-         2        476 33101   2985 5R   10       
-         2        477 33101   3087 5L   10       
-         2        478 33101   2990 5R   4        
-         2        479 33101   3092 5L   10       
-         2        480 33101   2995 5R   10       
-         2        481 33101   3046 5L   10       
-         2        482 33101   2951 5R   10       
-         2        483 33101   3052 5L   10       
-         2        484 33101   2956 5R   10       
-         2        485 33101   3057 5L   10       
-         2        486 33101   2999 5R   10       
-         2        487 33101   3062 5L   10       
-         2        488 33101   2966 5R   10       
-         2        489 33101   3067 5L   10       
-         2        490 33101   2971 5R   10       
-         2        491 33101   3072 5L   10       
-         2        492 33101   2976 5R   10       
-         2        493 33101   3077 5L   10       
-         2        494 33101   2981 5R   10       
-         2        495 33101   3083 5L   10       
-         2        496 33101   2986 5R   10       
-         2        497 33101   3088 5L   10       
-         2        498 33101   2991 5R   10       
-         2        499 33101   3093 5L   10       
-         2        500 33101   2998 5R   10       
-         2        501 33101   7358 6L   P2       
-         2        502 33101   7504 6R   P2_2     
-         2        503 33101   7293 6L   P2       
-         2        504 33101   7274 6R   P2       
-         2        505 33101   7353 6L   P2       
-         2        506 33101   7238 6R   P2       
-         2        507 33101   7303 6L   P2       
-         2        508 33101   7213 6R   P2       
-         2        509 33101   7308 6L   P2       
-         2        510 33101   3177 6R   10       
-         2        511 33101   7286 6L   P2       
-         2        512 33101   7279 6R   P2       
-         2        513 33101   3276 6L   10       
-         2        514 33101   7233 6R   P2       
-         2        515 33101   3261 6L   10       
-         2        516 33101   7203 6R   P2       
-         2        517 33101   3293 6L   10       
-         2        518 33101   7223 6R   P2       
-         2        519 33101   7291 6L   P2       
-         2        520 33101   7269 6R   P2       
-         2        521 33101   7359 6L   P2       
-         2        522 33101   7505 6R   P2_2     
-         2        523 33101     78 6L   5        
-         2        524 33101   7275 6R   P2       
-         2        525 33101   7354 6L   P2       
-         2        526 33101   7239 6R   P2       
-         2        527 33101   7304 6L   P2       
-         2        528 33101   7214 6R   P2       
-         2        529 30301    530 6L   4        
-         2        530 33101     49 6R   5        
-         2        531 33101   7287 6L   P2       
-         2        532 33101   7280 6R   P2       
-         2        533 33101   3277 6L   10       
-         2        534 33101   7234 6R   P2       
-         2        535 33101   7309 6L   P2       
-         2        536 33101     41 6R   5        
-         2        537 33101   3294 6L   10       
-         2        538 33101   7224 6R   P2       
-         2        539 33101   7292 6L   P2       
-         2        540 33101   7268 6R   P2       
-         2        541 33101   7360 6L   P2       
-         2        542 33101   7506 6R   P2_2     
-         2        543 33101   7295 6L   P2       
-         2        544 33101   7276 6R   P2       
-         2        545 33101   7355 6L   P2       
-         2        546 33101   7240 6R   P2       
-         2        547 33101   7305 6L   P2       
-         2        548 33101   7215 6R   P2       
-         2        549 33101   7310 6L   P2       
-         2        550 33101   3193 6R   10       
-         2        551 33101   3289 6L   10       
-         2        552 33101   7501 6R   P2_2     
-         2        553 33101   3264 6L   10       
-         2        554 33101   7235 6R   P2       
-         2        555 33101   1653 6L   8        
-         2        556 33101   7205 6R   P2       
-         2        557 33101   3295 6L   10       
-         2        558 33101   7225 6R   P2       
-         2        559 33101    118 6L   5        
-         2        560 33101   7270 6R   P2       
-         2        561 33101   7361 6L   P2       
-         2        562 33101   7507 6R   P2_2     
-         2        563 33101   7296 6L   P2       
-         2        564 33101   7277 6R   P2       
-         2        565 33101   7356 6L   P2       
-         2        566 33101   7241 6R   P2       
-         2        567 33101   7306 6L   P2       
-         2        568 33101   1613 6R   8        
-         2        569 33101   7311 6L   P2       
-         2        570 33101   3195 6R   10       
-         2        571 33101   3292 6L   10       
-         2        572 33101   7502 6R   P2_2     
-         2        573 33101   3280 6L   10       
-         2        574 33101   7236 6R   P2       
-         2        575 33101   7289 6L   P2       
-         2        576 33101   7206 6R   P2       
-         2        577 33101   3296 6L   10       
-         2        578 33101   7226 6R   P2       
-         2        579 33101   3253 6L   10       
-         2        580 33101   7271 6R   P2       
-         2        581 33101   7362 6L   P2       
-         2        582 33101   7508 6R   P2_2     
-         2        583 33101   7297 6L   P2       
-         2        584 33101   7278 6R   P2       
-         2        585 33101   7357 6L   P2       
-         2        586 33101   7242 6R   P2       
-         2        587 33101   7307 6L   P2       
-         2        588 33101   7243 6R   P2       
-         2        589 33101   7312 6L   P2       
-         2        590 33101   3196 6R   10       
-         2        591 33101   3262 6L   10       
-         2        592 33101   7503 6R   P2_2     
-         2        593 33101   3278 6L   10       
-         2        594 33101   7237 6R   P2       
-         2        595 33101   3257 6L   10       
-         2        596 33101   7207 6R   P2       
-         2        597 33101   3297 6L   10       
-         2        598 33101   7227 6R   P2       
-         2        599 33101   3282 6L   10       
-         2        600 33101   7273 6R   P2       
-         2        601 33101   7492 7L   P2       
-         2        602 33101   3426 7R   11       
-         2        603 33101   7475 7L   P2       
-         2        604 33101   7573 7R   P2_2     
-         2        605 33101   7421 7L   P2       
-         2        606 33101   7413 7R   P2       
-         2        607 33101   7586 7L   P2_2     
-         2        608 33101   7578 7R   P2_2     
-         2        609 33101   3455 7L   11       
-         2        610 33101   7558 7R   P2_2     
-         2        611 33101   7468 7L   P2       
-         2        612 33101   7568 7R   P2_2     
-         2        613 33101   3494 7L   11       
-         2        614 33101   3446 7R   11       
-         2        615 33101   7452 7L   P2       
-         2        616 33101   7535 7R   P2_2     
-         2        617 33101   3464 7L   11       
-         2        618 33101   7540 7R   P2_2     
-         2        619 33101   3475 7L   11       
-         2        620 33101   7392 7R   P2       
-         2        621 33101   7494 7L   P2       
-         2        622 33101   3427 7R   11       
-         2        623 33101   7476 7L   P2       
-         2        624 33101   7574 7R   P2_2     
-         2        625 33101   3480 7L   11       
-         2        626 33101   7414 7R   P2       
-         2        627 33101   7587 7L   P2_2     
-         2        628 33101   7579 7R   P2_2     
-         2        629 33101   3463 7L   11       
-         2        630 33101   7559 7R   P2_2     
-         2        631 33101   7469 7L   P2       
-         2        632 33101   7569 7R   P2_2     
-         2        633 33101   3493 7L   11       
-         2        634 33101   3449 7R   11       
-         2        635 33101   7453 7L   P2       
-         2        636 33101   7536 7R   P2_2     
-         2        637 33101   3465 7L   11       
-         2        638 33101   7541 7R   P2_2     
-         2        639 33101   3476 7L   11       
-         2        640 33101   7393 7R   P2       
-         2        641 33101   7495 7L   P2       
-         2        642 33101   3428 7R   11       
-         2        643 33101   3454 7L   11       
-         2        644 33101   7575 7R   P2_2     
-         2        645 33101   3482 7L   11       
-         2        646 33101   7415 7R   P2       
-         2        647 33101   7588 7L   P2_2     
-         2        648 33101   7580 7R   P2_2     
-         2        649 33101   7583 7L   P2_2     
-         2        650 33101   7560 7R   P2_2     
-         2        651 33101   7470 7L   P2       
-         2        652 33101   7570 7R   P2_2     
-         2        653 33101   7424 7L   P2       
-         2        654 33101   3450 7R   11       
-         2        655 33101   7454 7L   P2       
-         2        656 33101   7537 7R   P2_2     
-         2        657 33101   3466 7L   11       
-         2        658 33101   7542 7R   P2_2     
-         2        659 33101   3477 7L   11       
-         2        660 33101   7394 7R   P2       
-         2        661 33101   7496 7L   P2       
-         2        662 33101   3430 7R   11       
-         2        663 33101   7478 7L   P2       
-         2        664 33101   7576 7R   P2_2     
-         2        665 33101   3483 7L   11       
-         2        666 33101   7416 7R   P2       
-         2        667 33101   7589 7L   P2_2     
-         2        668 33101   7555 7R   P2_2     
-         2        669 33101   7584 7L   P2_2     
-         2        670 33101   7561 7R   P2_2     
-         2        671 30301    555 7L   4        
-         2        672 33101   7571 7R   P2_2     
-         2        673 33101    187 7L   5        
-         2        674 33101   3447 7R   11       
-         2        675 33101   7455 7L   P2       
-         2        676 33101   7538 7R   P2_2     
-         2        677 33101   3470 7L   11       
-         2        678 33101   7543 7R   P2_2     
-         2        679 33101   3478 7L   11       
-         2        680 33101   7395 7R   P2       
-         2        681 33101   7498 7L   P2       
-         2        682 33101   3431 7R   11       
-         2        683 33101   7479 7L   P2       
-         2        684 33101   7577 7R   P2_2     
-         2        685 33101   3484 7L   11       
-         2        686 33101   7417 7R   P2       
-         2        687 33101   7590 7L   P2_2     
-         2        688 33101   7556 7R   P2_2     
-         2        689 33101   7585 7L   P2_2     
-         2        690 33101   7562 7R   P2_2     
-         2        691 33101   7474 7L   P2       
-         2        692 33101   7572 7R   P2_2     
-         2        693 33101   7423 7L   P2       
-         2        694 33101   7419 7R   P2       
-         2        695 33101   7422 7L   P2       
-         2        696 33101   7539 7R   P2_2     
-         2        697 33101   3471 7L   11       
-         2        698 33101   7567 7R   P2_2     
-         2        699 33101   3479 7L   11       
-         2        700 33101   7396 7R   P2       
-         2        701 33101   7785 8L   P2_2     
-         2        702 33101   7690 8R   P2_2     
-         2        703 33101   7798 8L   P2_2     
-         2        704 33101   3569 8R   11       
-         2        705 33101   7780 8L   P2_2     
-         2        706 33101   7685 8R   P2_2     
-         2        707 33101   3612 8L   11       
-         2        708 33101   7641 8R   P2_2     
-         2        709 33101    315 8L   5        
-         2        710 33101   7657 8R   P2_2     
-         2        711 33101   7730 8L   P2_2     
-         2        712 33101   7619 8R   P2_2     
-         2        713 33101   7738 8L   P2_2     
-         2        714 33101   7651 8R   P2_2     
-         2        715 33101   7713 8L   P2_2     
-         2        716 33101   3550 8R   11       
-         2        717 33101   7735 8L   P2_2     
-         2        718 33101   3600 8R   11       
-         2        719 33101    292 8L   5        
-         2        720 33101   7602 8R   P2_2     
-         2        721 33101   7786 8L   P2_2     
-         2        722 33101   7691 8R   P2_2     
-         2        723 33101   7799 8L   P2_2     
-         2        724 33101   3571 8R   11       
-         2        725 33101   7781 8L   P2_2     
-         2        726 33101   7686 8R   P2_2     
-         2        727 33101   3648 8L   11       
-         2        728 33101   7642 8R   P2_2     
-         2        729 33101    316 8L   5        
-         2        730 33101   7658 8R   P2_2     
-         2        731 33101   7731 8L   P2_2     
-         2        732 33101   7620 8R   P2_2     
-         2        733 33101   7739 8L   P2_2     
-         2        734 33101   7652 8R   P2_2     
-         2        735 33101   7714 8L   P2_2     
-         2        736 33101   3567 8R   11       
-         2        737 33101   7736 8L   P2_2     
-         2        738 33101   7626 8R   P2_2     
-         2        739 33101   3681 8L   11       
-         2        740 33101   7603 8R   P2_2     
-         2        741 33101   7787 8L   P2_2     
-         2        742 33101   7692 8R   P2_2     
-         2        743 33101   7800 8L   P2_2     
-         2        744 33101   7682 8R   P2_2     
-         2        745 33101   7782 8L   P2_2     
-         2        746 33101   7687 8R   P2_2     
-         2        747 33101   3652 8L   11       
-         2        748 33101   7643 8R   P2_2     
-         2        749 33101   7755 8L   P2_2     
-         2        750 33101   7659 8R   P2_2     
-         2        751 33101   7732 8L   P2_2     
-         2        752 33101   7621 8R   P2_2     
-         2        753 33101    324 8L   5        
-         2        754 33101   7653 8R   P2_2     
-         2        755 33101   7715 8L   P2_2     
-         2        756 33101   3557 8R   11       
-         2        757 33101   7737 8L   P2_2     
-         2        758 33101   7627 8R   P2_2     
-         2        759 33101   3679 8L   11       
-         2        760 33101   3588 8R   11       
-         2        761 33101   7788 8L   P2_2     
-         2        762 33101   7693 8R   P2_2     
-         2        763 33101   7778 8L   P2_2     
-         2        764 33101   7683 8R   P2_2     
-         2        765 33101   7783 8L   P2_2     
-         2        766 33101   7688 8R   P2_2     
-         2        767 33101   3655 8L   11       
-         2        768 33101   7644 8R   P2_2     
-         2        769 33101   7756 8L   P2_2     
-         2        770 33101   7660 8R   P2_2     
-         2        771 33101   7733 8L   P2_2     
-         2        772 33101   7622 8R   P2_2     
-         2        773 33101    326 8L   5        
-         2        774 33101   7655 8R   P2_2     
-         2        775 33101   7716 8L   P2_2     
-         2        776 33101   3559 8R   11       
-         2        777 33101    300 8L   5        
-         2        778 33101   7628 8R   P2_2     
-         2        779 33101   7702 8L   P2_2     
-         2        780 33101   3589 8R   11       
-         2        781 33101   7789 8L   P2_2     
-         2        782 33101   7694 8R   P2_2     
-         2        783 33101   7779 8L   P2_2     
-         2        784 33101   7684 8R   P2_2     
-         2        785 33101   7784 8L   P2_2     
-         2        786 33101   7689 8R   P2_2     
-         2        787 33101   3659 8L   11       
-         2        788 33101   3568 8R   11       
-         2        789 33101   7757 8L   P2_2     
-         2        790 33101   7661 8R   P2_2     
-         2        791 33101   7734 8L   P2_2     
-         2        792 33101   7624 8R   P2_2     
-         2        793 33101    337 8L   5        
-         2        794 33101   7656 8R   P2_2     
-         2        795 33101   7718 8L   P2_2     
-         2        796 33101   3560 8R   11       
-         2        797 33101    314 8L   5        
-         2        798 33101   7629 8R   P2_2     
-         2        799 33101   7701 8L   P2_2     
-         2        800 33101   3590 8R   11       
-         2        801 33101   3850 9L   11       
-         2        802 33101   7855 9R   P2_2     
-         2        803 33101   7935 9L   P2_2     
-         2        804 33101   7890 9R   P2_2     
-         2        805 33101   7945 9L   P2_2     
-         2        806 33101   7879 9R   P2_2     
-         2        807 33101   7940 9L   P2_2     
-         2        808 33101   3715 9R   11       
-         2        809 33101    378 9L   5        
-         2        810 33101   3777 9R   11       
-         2        811 33101   3860 9L   11       
-         2        812 33101   7850 9R   P2_2     
-         2        813 33101   7915 9L   P2_2     
-         2        814 33101   7827 9R   P2_2     
-         2        815 33101   3812 9L   11       
-         2        816 33101   7880 9R   P2_2     
-         2        817 33101   7930 9L   P2_2     
-         2        818 33101   7885 9R   P2_2     
-         2        819 30301    669 9L   4        
-         2        820 33101   7860 9R   P2_2     
-         2        821 33101   3851 9L   11       
-         2        822 33101   7856 9R   P2_2     
-         2        823 33101   7936 9L   P2_2     
-         2        824 33101   7891 9R   P2_2     
-         2        825 33101   7946 9L   P2_2     
-         2        826 33101   7897 9R   P2_2     
-         2        827 33101   7941 9L   P2_2     
-         2        828 33101   3745 9R   11       
-         2        829 33101   3819 9L   11       
-         2        830 33101   3780 9R   11       
-         2        831 33101   3871 9L   11       
-         2        832 33101   7851 9R   P2_2     
-         2        833 33101   7916 9L   P2_2     
-         2        834 33101   7828 9R   P2_2     
-         2        835 33101   7926 9L   P2_2     
-         2        836 33101   7881 9R   P2_2     
-         2        837 33101   7931 9L   P2_2     
-         2        838 33101   7886 9R   P2_2     
-         2        839 33101   3855 9L   11       
-         2        840 33101   7861 9R   P2_2     
-         2        841 33101   3852 9L   11       
-         2        842 33101   7857 9R   P2_2     
-         2        843 33101   7937 9L   P2_2     
-         2        844 33101   7892 9R   P2_2     
-         2        845 33101   7947 9L   P2_2     
-         2        846 33101   7898 9R   P2_2     
-         2        847 33101   7942 9L   P2_2     
-         2        848 33101   3769 9R   11       
-         2        849 33101   3831 9L   11       
-         2        850 33101   7807 9R   P2_2     
-         2        851 33101   3872 9L   11       
-         2        852 33101   7852 9R   P2_2     
-         2        853 33101   7917 9L   P2_2     
-         2        854 33101   7829 9R   P2_2     
-         2        855 33101   7927 9L   P2_2     
-         2        856 33101   7882 9R   P2_2     
-         2        857 33101   7932 9L   P2_2     
-         2        858 33101   7887 9R   P2_2     
-         2        859 33101   3856 9L   11       
-         2        860 33101   7862 9R   P2_2     
-         2        861 33101   3853 9L   11       
-         2        862 33101   7858 9R   P2_2     
-         2        863 33101   7938 9L   P2_2     
-         2        864 33101   7893 9R   P2_2     
-         2        865 33101   7948 9L   P2_2     
-         2        866 33101   7899 9R   P2_2     
-         2        867 33101   7943 9L   P2_2     
-         2        868 33101   7877 9R   P2_2     
-         2        869 33101   3866 9L   11       
-         2        870 33101   7825 9R   P2_2     
-         2        871 33101   3873 9L   11       
-         2        872 33101   7853 9R   P2_2     
-         2        873 33101   7918 9L   P2_2     
-         2        874 33101   7865 9R   P2_2     
-         2        875 33101   7928 9L   P2_2     
-         2        876 33101   7883 9R   P2_2     
-         2        877 33101   7925 9L   P2_2     
-         2        878 33101   7888 9R   P2_2     
-         2        879 33101   3857 9L   11       
-         2        880 33101   7863 9R   P2_2     
-         2        881 33101   3854 9L   11       
-         2        882 33101   7859 9R   P2_2     
-         2        883 33101   7939 9L   P2_2     
-         2        884 33101   7894 9R   P2_2     
-         2        885 33101   7949 9L   P2_2     
-         2        886 33101   7900 9R   P2_2     
-         2        887 33101   7944 9L   P2_2     
-         2        888 33101   7878 9R   P2_2     
-         2        889 33101   3868 9L   11       
-         2        890 33101   7826 9R   P2_2     
-         2        891 33101   3874 9L   11       
-         2        892 33101   7854 9R   P2_2     
-         2        893 33101   7919 9L   P2_2     
-         2        894 33101   7866 9R   P2_2     
-         2        895 33101   7929 9L   P2_2     
-         2        896 33101   7884 9R   P2_2     
-         2        897 33101   7934 9L   P2_2     
-         2        898 33101   7889 9R   P2_2     
-         2        899 33101    380 9L   5        
-         2        900 33101   7864 9R   P2_2     
-         2        901 33101   4048 10L  12       
-         2        902 33101   3994 10R  12       
-         2        903 33101   4001 10L  12       
-         2        904 33101   3999 10R  12       
-         2        905 33101   4012 10L  12       
-         2        906 33101   3989 10R  12       
-         2        907 33101   4087 10L  12       
-         2        908 33101   3979 10R  12       
-         2        909 33101   4091 10L  12       
-         2        910 33101   3984 10R  12       
-         2        911 33101   4082 10L  12       
-         2        912 33101   3974 10R  12       
-         2        913 33101   4076 10L  12       
-         2        914 33101   3969 10R  12       
-         2        915 33101   4066 10L  12       
-         2        916 33101   3959 10R  12       
-         2        917 33101   4071 10L  12       
-         2        918 33101   3964 10R  12       
-         2        919 33101   4059 10L  12       
-         2        920 33101   3954 10R  12       
-         2        921 33101   4050 10L  12       
-         2        922 33101   3995 10R  12       
-         2        923 33101   4002 10L  12       
-         2        924 33101   4000 10R  12       
-         2        925 33101   9101 10L  P4_1     
-         2        926 33101   3990 10R  12       
-         2        927 33101   4088 10L  12       
-         2        928 33101   3980 10R  12       
-         2        929 33101   4093 10L  12       
-         2        930 33101   3985 10R  12       
-         2        931 33101   4083 10L  12       
-         2        932 33101   3975 10R  12       
-         2        933 33101   4077 10L  12       
-         2        934 33101   3970 10R  12       
-         2        935 33101   4067 10L  12       
-         2        936 33101   3960 10R  12       
-         2        937 33101   4072 10L  12       
-         2        938 33101   3965 10R  12       
-         2        939 33101   4062 10L  12       
-         2        940 33101   3955 10R  12       
-         2        941 33101   4052 10L  12       
-         2        942 33101   3996 10R  12       
-         2        943 33101   4003 10L  12       
-         2        944 33101   7001 10R  P1       
-         2        945 33101   9102 10L  P4_1     
-         2        946 33101   3991 10R  12       
-         2        947 33101   4089 10L  12       
-         2        948 33101   3981 10R  12       
-         2        949 33101   4095 10L  12       
-         2        950 33101   3986 10R  12       
-         2        951 33101   4084 10L  12       
-         2        952 33101   3976 10R  12       
-         2        953 33101   4078 10L  12       
-         2        954 33101   3971 10R  12       
-         2        955 33101   4068 10L  12       
-         2        956 33101   3961 10R  12       
-         2        957 33101   4073 10L  12       
-         2        958 33101   3966 10R  12       
-         2        959 33101   4063 10L  12       
-         2        960 33101   3956 10R  12       
-         2        961 33101   4054 10L  12       
-         2        962 33101   3997 10R  12       
-         2        963 33101   4004 10L  12       
-         2        964 33101   9001 10R  P4_1     
-         2        965 33101   9103 10L  P4_1     
-         2        966 33101   3992 10R  12       
-         2        967 33101   4090 10L  12       
-         2        968 33101   3982 10R  12       
-         2        969 33101   4098 10L  12       
-         2        970 33101   3987 10R  12       
-         2        971 33101   4085 10L  12       
-         2        972 33101   3977 10R  12       
-         2        973 33101   4080 10L  12       
-         2        974 33101   3972 10R  12       
-         2        975 33101   4069 10L  12       
-         2        976 33101   3962 10R  12       
-         2        977 33101   4074 10L  12       
-         2        978 33101   3967 10R  12       
-         2        979 33101   4064 10L  12       
-         2        980 33101   3957 10R  12       
-         2        981 33101   4056 10L  12       
-         2        982 33101   3998 10R  12       
-         2        983 33101   9871 10L  P6       
-         2        984 33101   9002 10R  P4_1     
-         2        985 33101   9104 10L  P4_1     
-         2        986 33101   3993 10R  12       
-         2        987 33101   4092 10L  12       
-         2        988 33101   3983 10R  12       
-         2        989 33101   4099 10L  12       
-         2        990 33101   3988 10R  12       
-         2        991 33101   4086 10L  12       
-         2        992 33101   3978 10R  12       
-         2        993 33101   4081 10L  12       
-         2        994 33101   3973 10R  12       
-         2        995 33101   4070 10L  12       
-         2        996 33101   3963 10R  12       
-         2        997 33101   4075 10L  12       
-         2        998 33101   3968 10R  12       
-         2        999 33101   4065 10L  12       
-         2       1000 33101   3958 10R  12       
-         2       1001 33101   4278 11L  12       
-         2       1002 33101   4189 11R  12       
-         2       1003 33101   1889 11L  8        
-         2       1004 33101   4152 11R  12       
-         2       1005 33101   1872 11L  8        
-         2       1006 33101   4157 11R  12       
-         2       1007 33101   4241 11L  12       
-         2       1008 33101   4194 11R  12       
-         2       1009 33101   4246 11L  12       
-         2       1010 33101   4199 11R  12       
-         2       1011 33101   4273 11L  12       
-         2       1012 33101   4184 11R  12       
-         2       1013 33101   4251 11L  12       
-         2       1014 33101   4164 11R  12       
-         2       1015 33101   4267 11L  12       
-         2       1016 33101   4179 11R  12       
-         2       1017 33101   4262 11L  12       
-         2       1018 33101   4174 11R  12       
-         2       1019 33101   4256 11L  12       
-         2       1020 33101   4169 11R  12       
-         2       1021 33101   4279 11L  12       
-         2       1022 33101   4190 11R  12       
-         2       1023 33101   1906 11L  8        
-         2       1024 33101   4153 11R  12       
-         2       1025 33101   1882 11L  8        
-         2       1026 33101   4158 11R  12       
-         2       1027 33101   4242 11L  12       
-         2       1028 33101   4195 11R  12       
-         2       1029 33101   4247 11L  12       
-         2       1030 33101   4163 11R  12       
-         2       1031 33101   4274 11L  12       
-         2       1032 33101   4185 11R  12       
-         2       1033 33101   4252 11L  12       
-         2       1034 33101   4165 11R  12       
-         2       1035 33101   4268 11L  12       
-         2       1036 33101   4180 11R  12       
-         2       1037 33101   4263 11L  12       
-         2       1038 33101   4175 11R  12       
-         2       1039 33101   4257 11L  12       
-         2       1040 33101   4170 11R  12       
-         2       1041 33101   4280 11L  12       
-         2       1042 33101   4191 11R  12       
-         2       1043 33101   4240 11L  12       
-         2       1044 33101   4154 11R  12       
-         2       1045 33101   1897 11L  8        
-         2       1046 33101   4159 11R  12       
-         2       1047 33101   4243 11L  12       
-         2       1048 33101   4196 11R  12       
-         2       1049 33101   4248 11L  12       
-         2       1050 33101   9201 11R  P4_1     
-         2       1051 33101   4275 11L  12       
-         2       1052 33101   4186 11R  12       
-         2       1053 33101   4253 11L  12       
-         2       1054 33101   4166 11R  12       
-         2       1055 33101   4269 11L  12       
-         2       1056 33101   4181 11R  12       
-         2       1057 33101   4264 11L  12       
-         2       1058 33101   4176 11R  12       
-         2       1059 33101   4258 11L  12       
-         2       1060 33101   4171 11R  12       
-         2       1061 33101   4281 11L  12       
-         2       1062 33101   4192 11R  12       
-         2       1063 33101   1912 11L  8        
-         2       1064 33101   4155 11R  12       
-         2       1065 33101   1920 11L  8        
-         2       1066 33101   4160 11R  12       
-         2       1067 33101   4244 11L  12       
-         2       1068 33101   4197 11R  12       
-         2       1069 33101   4249 11L  12       
-         2       1070 33101   9202 11R  P4_1     
-         2       1071 33101   4276 11L  12       
-         2       1072 33101   4187 11R  12       
-         2       1073 33101   4254 11L  12       
-         2       1074 33101   4167 11R  12       
-         2       1075 33101   4270 11L  12       
-         2       1076 33101   4182 11R  12       
-         2       1077 33101   4265 11L  12       
-         2       1078 33101   4177 11R  12       
-         2       1079 33101   4259 11L  12       
-         2       1080 33101   4172 11R  12       
-         2       1081 33101   4282 11L  12       
-         2       1082 33101   4193 11R  12       
-         2       1083 33101   1925 11L  8        
-         2       1084 33101   4156 11R  12       
-         2       1085 33101   1926 11L  8        
-         2       1086 33101   4161 11R  12       
-         2       1087 33101   4245 11L  12       
-         2       1088 33101   4198 11R  12       
-         2       1089 33101   4250 11L  12       
-         2       1090 33101   9203 11R  P4_1     
-         2       1091 33101   4277 11L  12       
-         2       1092 33101   4188 11R  12       
-         2       1093 33101   4255 11L  12       
-         2       1094 33101   4168 11R  12       
-         2       1095 33101   4272 11L  12       
-         2       1096 33101   4183 11R  12       
-         2       1097 33101   4266 11L  12       
-         2       1098 33101   4178 11R  12       
-         2       1099 33101   4261 11L  12       
-         2       1100 33101   4173 11R  12       
-         2       1101 33101   7090 12L  P1       
-         2       1102 33101   7051 12R  P1       
-         2       1103 33101   7085 12L  P1       
-         2       1104 33101   7046 12R  P1       
-         2       1105 33101   4393 12L  12       
-         2       1106 33101   7041 12R  P1       
-         2       1107 33101   4357 12L  12       
-         2       1108 33101   7036 12R  P1       
-         2       1109 33101   7080 12L  P1       
-         2       1110 33101   4347 12R  12       
-         2       1111 33101   7065 12L  P1       
-         2       1112 33101   7026 12R  P1       
-         2       1113 33101   7070 12L  P1       
-         2       1114 33101   7031 12R  P1       
-         2       1115 33101   7075 12L  P1       
-         2       1116 33101   4342 12R  12       
-         2       1117 33101   7060 12L  P1       
-         2       1118 33101   7021 12R  P1       
-         2       1119 33101   7054 12L  P1       
-         2       1120 33101   7016 12R  P1       
-         2       1121 33101   7091 12L  P1       
-         2       1122 33101   9401 12R  P4_1     
-         2       1123 33101   7086 12L  P1       
-         2       1124 33101   7047 12R  P1       
-         2       1125 33101   4394 12L  12       
-         2       1126 33101   7042 12R  P1       
-         2       1127 33101   4358 12L  12       
-         2       1128 33101   7037 12R  P1       
-         2       1129 33101   7081 12L  P1       
-         2       1130 33101   4348 12R  12       
-         2       1131 33101   7066 12L  P1       
-         2       1132 33101   7027 12R  P1       
-         2       1133 33101   7071 12L  P1       
-         2       1134 33101   7032 12R  P1       
-         2       1135 33101   7076 12L  P1       
-         2       1136 33101   4343 12R  12       
-         2       1137 33101   7061 12L  P1       
-         2       1138 33101   7022 12R  P1       
-         2       1139 33101   7055 12L  P1       
-         2       1140 33101   7017 12R  P1       
-         2       1141 33101   7092 12L  P1       
-         2       1142 33101   9402 12R  P4_1     
-         2       1143 33101   7087 12L  P1       
-         2       1144 33101   7048 12R  P1       
-         2       1145 33101   4395 12L  12       
-         2       1146 33101   7043 12R  P1       
-         2       1147 33101   4359 12L  12       
-         2       1148 33101   7038 12R  P1       
-         2       1149 33101   7082 12L  P1       
-         2       1150 33101   4401 12R  13       
-         2       1151 33101   7067 12L  P1       
-         2       1152 33101   7028 12R  P1       
-         2       1153 33101   7072 12L  P1       
-         2       1154 33101   7033 12R  P1       
-         2       1155 33101   7077 12L  P1       
-         2       1156 33101   4344 12R  12       
-         2       1157 33101   7062 12L  P1       
-         2       1158 33101   7023 12R  P1       
-         2       1159 33101   7057 12L  P1       
-         2       1160 33101   7018 12R  12       
-         2       1161 33101   7093 12L  P1       
-         2       1162 33101   9403 12R  P4_1     
-         2       1163 33101   7088 12L  P1       
-         2       1164 33101   7049 12R  P1       
-         2       1165 33101   4396 12L  12       
-         2       1166 33101   7044 12R  P1       
-         2       1167 33101   4360 12L  12       
-         2       1168 33101   7039 12R  P1       
-         2       1169 33101   7083 12L  P1       
-         2       1170 33101   7004 12R  P1       
-         2       1171 33101   7068 12L  P1       
-         2       1172 33101   7029 12R  P1       
-         2       1173 33101   7073 12L  P1       
-         2       1174 33101   7034 12R  P1       
-         2       1175 33101   7078 12L  P1       
-         2       1176 33101   4345 12R  12       
-         2       1177 33101   7063 12L  P1       
-         2       1178 33101   7024 12R  P1       
-         2       1179 33101   7058 12L  P1       
-         2       1180 33101   7019 12R  P1       
-         2       1181 33101   7094 12L  P1       
-         2       1182 33101   9404 12R  P4_1     
-         2       1183 33101   7089 12L  P1       
-         2       1184 33101   7050 12R  P1       
-         2       1185 33101   4397 12L  12       
-         2       1186 33101   7045 12R  P1       
-         2       1187 33101   4361 12L  12       
-         2       1188 33101   7040 12R  P1       
-         2       1189 33101   7084 12L  P1       
-         2       1190 33101   7005 12R  P1       
-         2       1191 33101   7069 12L  P1       
-         2       1192 33101   7030 12R  P1       
-         2       1193 33101   7074 12L  P1       
-         2       1194 33101   7035 12R  P1       
-         2       1195 33101   7079 12L  P1       
-         2       1196 33101   4346 12R  12       
-         2       1197 33101   7064 12L  P1       
-         2       1198 33101   7025 12R  P1       
-         2       1199 33101   7059 12L  P1       
-         2       1200 33101   7020 12R  P1       
-         2       1201 33101   7198 13L  P1       
-         2       1202 33101   7138 13R  P1       
-         2       1203 33101   7172 13L  P1       
-         2       1204 33101   7122 13R  P1       
-         2       1205 33101    950 13L  7        
-         2       1206 33101   7133 13R  P1       
-         2       1207 33101   7192 13L  P1       
-         2       1208 33101    904 13R  7        
-         2       1209 33101   7167 13L  P1       
-         2       1210 33101   7117 13R  P1       
-         2       1211 33101    945 13L  7        
-         2       1212 33101   7128 13R  P1       
-         2       1213 33101   7152 13L  P1       
-         2       1214 33101   7101 13R  P1       
-         2       1215 33101   7162 13L  P1       
-         2       1216 33101   7112 13R  P1       
-         2       1217 33101   7157 13L  P1       
-         2       1218 33101   7106 13R  P1       
-         2       1219 33101   7146 13L  P1       
-         2       1220 33101   4455 13R  13       
-         2       1221 33101   7199 13L  P1       
-         2       1222 33101   4434 13R  13       
-         2       1223 33101   7173 13L  P1       
-         2       1224 33101   7124 13R  P1       
-         2       1225 33101   7182 13L  P1       
-         2       1226 33101   7134 13R  P1       
-         2       1227 33101   7193 13L  P1       
-         2       1228 33101    917 13R  7        
-         2       1229 33101   7168 13L  P1       
-         2       1230 33101   7118 13R  P1       
-         2       1231 33101   7178 13L  P1       
-         2       1232 33101   7129 13R  P1       
-         2       1233 33101   7153 13L  P1       
-         2       1234 33101   7102 13R  P1       
-         2       1235 33101   7163 13L  P1       
-         2       1236 33101   7113 13R  P1       
-         2       1237 33101   7158 13L  P1       
-         2       1238 33101   7107 13R  P1       
-         2       1239 33101   7148 13L  P1       
-         2       1240 33101   4456 13R  13       
-         2       1241 33101   7200 13L  P1       
-         2       1242 33101   4435 13R  13       
-         2       1243 33101   7174 13L  P1       
-         2       1244 33101   7125 13R  P1       
-         2       1245 33101   7188 13L  P1       
-         2       1246 33101   7135 13R  P1       
-         2       1247 33101   7195 13L  P1       
-         2       1248 33101    928 13R  7        
-         2       1249 33101   7169 13L  P1       
-         2       1250 33101   7119 13R  P1       
-         2       1251 33101   7180 13L  P1       
-         2       1252 33101   7130 13R  P1       
-         2       1253 33101   7154 13L  P1       
-         2       1254 33101   7103 13R  P1       
-         2       1255 33101   7164 13L  P1       
-         2       1256 33101   7114 13R  P1       
-         2       1257 33101   7159 13L  P1       
-         2       1258 33101   7108 13R  P1       
-         2       1259 33101   7149 13L  P1       
-         2       1260 33101   4457 13R  13       
-         2       1261 33101   4497 13L  13       
-         2       1262 33101   4436 13R  13       
-         2       1263 33101   7175 13L  P1       
-         2       1264 33101   7126 13R  P1       
-         2       1265 33101   7190 13L  P1       
-         2       1266 33101   7136 13R  P1       
-         2       1267 33101   7196 13L  P1       
-         2       1268 33101   2055 13R  8        
-         2       1269 33101   7170 13L  P1       
-         2       1270 33101   7120 13R  P1       
-         2       1271 33101   7184 13L  P1       
-         2       1272 33101   7131 13R  P1       
-         2       1273 33101   7155 13L  P1       
-         2       1274 33101   7104 13R  P1       
-         2       1275 33101   7165 13L  P1       
-         2       1276 33101   7115 13R  P1       
-         2       1277 33101   7160 13L  P1       
-         2       1278 33101   7109 13R  P1       
-         2       1279 33101   7150 13L  P1       
-         2       1280 33101   4458 13R  13       
-         2       1281 33101   4498 13L  13       
-         2       1282 33101   4433 13R  13       
-         2       1283 33101   7176 13L  P1       
-         2       1284 33101   7127 13R  P1       
-         2       1285 33101   7191 13L  P1       
-         2       1286 33101   7137 13R  P1       
-         2       1287 33101   7197 13L  P1       
-         2       1288 33101   2065 13R  8        
-         2       1289 33101   7171 13L  P1       
-         2       1290 33101   7121 13R  P1       
-         2       1291 33101   7186 13L  P1       
-         2       1292 33101   7132 13R  P1       
-         2       1293 33101   7156 13L  P1       
-         2       1294 33101   7105 13R  P1       
-         2       1295 33101   7166 13L  P1       
-         2       1296 33101   7116 13R  P1       
-         2       1297 33101   7161 13L  P1       
-         2       1298 33101   7110 13R  P1       
-         2       1299 33101   7151 13L  P1       
-         2       1300 33101   7100 13R  P1       
-         2       1301 33101   4645 14L  13       
-         2       1302 33101   4546 14R  13       
-         2       1303 33101   4650 14L  13       
-         2       1304 33101   4551 14R  13       
-         2       1305 33101   4655 14L  13       
-         2       1306 33101   4556 14R  13       
-         2       1307 33101   4660 14L  13       
-         2       1308 33101   4561 14R  13       
-         2       1309 33101   4665 14L  13       
-         2       1310 33101   4567 14R  13       
-         2       1311 33101   4670 14L  13       
-         2       1312 33101   4572 14R  13       
-         2       1313 33101   4675 14L  13       
-         2       1314 33101   4577 14R  13       
-         2       1315 33101   4680 14L  13       
-         2       1316 33101   4582 14R  13       
-         2       1317 33101   4685 14L  13       
-         2       1318 33101   4587 14R  13       
-         2       1319 33101   4690 14L  13       
-         2       1320 33101   4592 14R  13       
-         2       1321 33101   4646 14L  13       
-         2       1322 33101   4547 14R  13       
-         2       1323 33101   4651 14L  13       
-         2       1324 33101   4552 14R  13       
-         2       1325 33101   4656 14L  13       
-         2       1326 33101   4557 14R  13       
-         2       1327 33101   4661 14L  13       
-         2       1328 33101   4563 14R  13       
-         2       1329 33101   4666 14L  13       
-         2       1330 33101   4568 14R  13       
-         2       1331 33101   4671 14L  13       
-         2       1332 33101   4573 14R  13       
-         2       1333 33101   4676 14L  13       
-         2       1334 33101   4578 14R  13       
-         2       1335 33101   4681 14L  13       
-         2       1336 33101   4583 14R  13       
-         2       1337 33101   4686 14L  13       
-         2       1338 33101   4588 14R  13       
-         2       1339 33101   4691 14L  13       
-         2       1340 33101   4593 14R  13       
-         2       1341 33101   4647 14L  13       
-         2       1342 33101   4548 14R  13       
-         2       1343 33101   4652 14L  13       
-         2       1344 33101   4553 14R  13       
-         2       1345 33101   4657 14L  13       
-         2       1346 33101   4558 14R  13       
-         2       1347 33101   4662 14L  13       
-         2       1348 33101   4564 14R  13       
-         2       1349 33101   4667 14L  13       
-         2       1350 33101   4569 14R  13       
-         2       1351 33101   4672 14L  13       
-         2       1352 33101   4574 14R  13       
-         2       1353 33101   4677 14L  13       
-         2       1354 33101   4579 14R  13       
-         2       1355 33101   4682 14L  13       
-         2       1356 33101   4584 14R  13       
-         2       1357 33101   4687 14L  13       
-         2       1358 33101   4589 14R  13       
-         2       1359 33101   4692 14L  13       
-         2       1360 33101   4594 14R  13       
-         2       1361 33101   4648 14L  13       
-         2       1362 33101   4549 14R  13       
-         2       1363 33101   4653 14L  13       
-         2       1364 33101   4554 14R  13       
-         2       1365 33101   4658 14L  13       
-         2       1366 33101   4559 14R  13       
-         2       1367 33101   4663 14L  13       
-         2       1368 33101   4565 14R  13       
-         2       1369 33101   4668 14L  13       
-         2       1370 33101   4570 14R  13       
-         2       1371 33101   4673 14L  13       
-         2       1372 33101   4575 14R  13       
-         2       1373 33101   4678 14L  13       
-         2       1374 33101   4580 14R  13       
-         2       1375 33101   4683 14L  13       
-         2       1376 33101   4585 14R  13       
-         2       1377 33101   4688 14L  13       
-         2       1378 33101   4590 14R  13       
-         2       1379 33101   4693 14L  13       
-         2       1380 33101   4595 14R  13       
-         2       1381 33101   4649 14L  13       
-         2       1382 33101   4550 14R  13       
-         2       1383 33101   4654 14L  13       
-         2       1384 33101   4555 14R  13       
-         2       1385 33101   4659 14L  13       
-         2       1386 33101   4560 14R  13       
-         2       1387 33101   4664 14L  13       
-         2       1388 33101   4566 14R  13       
-         2       1389 33101   4669 14L  13       
-         2       1390 33101   4571 14R  13       
-         2       1391 33101   4674 14L  13       
-         2       1392 33101   4576 14R  13       
-         2       1393 33101   4679 14L  13       
-         2       1394 33101   4581 14R  13       
-         2       1395 33101   4684 14L  13       
-         2       1396 33101   4586 14R  13       
-         2       1397 33101   4689 14L  13       
-         2       1398 33101   4591 14R  13       
-         2       1399 33101   4694 14L  13       
-         2       1400 33101   4596 14R  13       
-         2       1401 33101   4843 15L  13       
-         2       1402 33101   4745 15R  13       
-         2       1403 33101   4848 15L  13       
-         2       1404 33101   4750 15R  13       
-         2       1405 33101   4853 15L  13       
-         2       1406 33101   4755 15R  13       
-         2       1407 33101   4858 15L  13       
-         2       1408 33101   4760 15R  13       
-         2       1409 33101   4864 15L  13       
-         2       1410 33101   4765 15R  13       
-         2       1411 33101   4869 15L  13       
-         2       1412 33101   4770 15R  13       
-         2       1413 33101   4875 15L  13       
-         2       1414 33101   4775 15R  13       
-         2       1415 33101   4880 15L  13       
-         2       1416 33101   4780 15R  13       
-         2       1417 33101   4885 15L  13       
-         2       1418 33101   4786 15R  13       
-         2       1419 33101   4890 15L  13       
-         2       1420 33101   4792 15R  13       
-         2       1421 33101   4844 15L  13       
-         2       1422 33101   4746 15R  13       
-         2       1423 33101   4849 15L  13       
-         2       1424 33101   4751 15R  13       
-         2       1425 33101   4854 15L  13       
-         2       1426 33101   4756 15R  13       
-         2       1427 33101   4859 15L  13       
-         2       1428 33101   4761 15R  13       
-         2       1429 33101   4865 15L  13       
-         2       1430 33101   4766 15R  13       
-         2       1431 33101   4870 15L  13       
-         2       1432 33101   4771 15R  13       
-         2       1433 33101   4876 15L  13       
-         2       1434 33101   4776 15R  13       
-         2       1435 33101   4881 15L  13       
-         2       1436 33101   4781 15R  13       
-         2       1437 33101   4886 15L  13       
-         2       1438 33101   4787 15R  13       
-         2       1439 33101   4891 15L  13       
-         2       1440 33101   4793 15R  13       
-         2       1441 33101   4845 15L  13       
-         2       1442 33101   4747 15R  13       
-         2       1443 33101   4850 15L  13       
-         2       1444 33101   4752 15R  13       
-         2       1445 33101   4855 15L  13       
-         2       1446 33101   4757 15R  13       
-         2       1447 33101   4860 15L  13       
-         2       1448 33101   4762 15R  13       
-         2       1449 33101   4866 15L  13       
-         2       1450 33101   4767 15R  13       
-         2       1451 33101   4872 15L  13       
-         2       1452 33101   4772 15R  13       
-         2       1453 33101   4877 15L  13       
-         2       1454 33101   4777 15R  13       
-         2       1455 33101   4882 15L  13       
-         2       1456 33101   4782 15R  13       
-         2       1457 33101   4887 15L  13       
-         2       1458 33101   4788 15R  13       
-         2       1459 33101   4892 15L  13       
-         2       1460 33101   4794 15R  13       
-         2       1461 33101   4846 15L  13       
-         2       1462 33101   4748 15R  13       
-         2       1463 33101   4851 15L  13       
-         2       1464 33101   4753 15R  13       
-         2       1465 33101   4856 15L  13       
-         2       1466 33101   4758 15R  13       
-         2       1467 33101   4861 15L  13       
-         2       1468 33101   4763 15R  13       
-         2       1469 33101   4867 15L  13       
-         2       1470 33101   4768 15R  13       
-         2       1471 33101   4873 15L  13       
-         2       1472 33101   4773 15R  13       
-         2       1473 33101   4878 15L  13       
-         2       1474 33101   4778 15R  13       
-         2       1475 33101   4883 15L  13       
-         2       1476 33101   4784 15R  13       
-         2       1477 33101   4888 15L  13       
-         2       1478 33101   4789 15R  13       
-         2       1479 33101   4893 15L  13       
-         2       1480 33101   4795 15R  13       
-         2       1481 33101   4847 15L  13       
-         2       1482 33101   4749 15R  13       
-         2       1483 33101   4852 15L  13       
-         2       1484 33101   4754 15R  13       
-         2       1485 33101   4857 15L  13       
-         2       1486 33101   4759 15R  13       
-         2       1487 33101   4862 15L  13       
-         2       1488 33101   4764 15R  13       
-         2       1489 33101   4868 15L  13       
-         2       1490 33101   4769 15R  13       
-         2       1491 33101   4874 15L  13       
-         2       1492 33101   4774 15R  13       
-         2       1493 33101   4879 15L  13       
-         2       1494 33101   4779 15R  13       
-         2       1495 33101   4884 15L  13       
-         2       1496 33101   4785 15R  13       
-         2       1497 33101   4889 15L  13       
-         2       1498 33101   4791 15R  13       
-         2       1499 33101   4894 15L  13       
-         2       1500 33101   4796 15R  13       
-         2       1501 33101   5054 16L  14       
-         2       1502 33101   4951 16R  14       
-         2       1503 33101   5060 16L  14       
-         2       1504 33101   4957 16R  14       
-         2       1505 33101   5065 16L  14       
-         2       1506 33101   4962 16R  14       
-         2       1507 33101   5071 16L  14       
-         2       1508 33101   4967 16R  14       
-         2       1509 33101   5077 16L  14       
-         2       1510 33101   4972 16R  14       
-         2       1511 33101   5083 16L  14       
-         2       1512 33101   4979 16R  14       
-         2       1513 33101   5088 16L  14       
-         2       1514 33101   4985 16R  14       
-         2       1515 33101   5093 16L  14       
-         2       1516 33101   4990 16R  14       
-         2       1517 33101   5098 16L  14       
-         2       1518 33101   4995 16R  14       
-         2       1519 33101   5006 16L  14       
-         2       1520 33101   5000 16R  14       
-         2       1521 33101   5055 16L  14       
-         2       1522 33101   4953 16R  14       
-         2       1523 33101   5061 16L  14       
-         2       1524 33101   4958 16R  14       
-         2       1525 33101   5066 16L  14       
-         2       1526 33101   4963 16R  14       
-         2       1527 33101   5072 16L  14       
-         2       1528 33101   4968 16R  14       
-         2       1529 33101   5078 16L  14       
-         2       1530 33101   4973 16R  14       
-         2       1531 33101   5084 16L  14       
-         2       1532 33101   4980 16R  14       
-         2       1533 33101   5089 16L  14       
-         2       1534 33101   4986 16R  14       
-         2       1535 33101   5094 16L  14       
-         2       1536 33101   4991 16R  14       
-         2       1537 33101   5099 16L  14       
-         2       1538 33101   4996 16R  14       
-         2       1539 33101   5020 16L  14       
-         2       1540 33101   4950 16R  14       
-         2       1541 33101   5056 16L  14       
-         2       1542 33101   4954 16R  14       
-         2       1543 33101   5062 16L  14       
-         2       1544 33101   4959 16R  14       
-         2       1545 33101   5067 16L  14       
-         2       1546 33101   4964 16R  14       
-         2       1547 33101   5074 16L  14       
-         2       1548 33101   4969 16R  14       
-         2       1549 33101   5080 16L  14       
-         2       1550 33101   4974 16R  14       
-         2       1551 33101   5085 16L  14       
-         2       1552 33101   4982 16R  14       
-         2       1553 33101   5090 16L  14       
-         2       1554 33101   4987 16R  14       
-         2       1555 33101   5095 16L  14       
-         2       1556 33101   4992 16R  14       
-         2       1557 33101   5100 16L  14       
-         2       1558 33101   4997 16R  14       
-         2       1559 33101   5027 16L  14       
-         2       1560 33101   4952 16R  14       
-         2       1561 33101   5057 16L  14       
-         2       1562 33101   4955 16R  14       
-         2       1563 33101   5063 16L  14       
-         2       1564 33101   4960 16R  14       
-         2       1565 33101   5069 16L  14       
-         2       1566 33101   4965 16R  14       
-         2       1567 33101   5075 16L  14       
-         2       1568 33101   4970 16R  14       
-         2       1569 33101   5081 16L  14       
-         2       1570 33101   4976 16R  14       
-         2       1571 33101   5086 16L  14       
-         2       1572 33101   4983 16R  14       
-         2       1573 33101   5091 16L  14       
-         2       1574 33101   4988 16R  14       
-         2       1575 33101   5096 16L  14       
-         2       1576 33101   4993 16R  14       
-         2       1577 33101   5002 16L  14       
-         2       1578 33101   4998 16R  14       
-         2       1579 33101   5031 16L  14       
-         2       1580 33101   4975 16R  14       
-         2       1581 33101   5058 16L  14       
-         2       1582 33101   4956 16R  14       
-         2       1583 33101   5064 16L  14       
-         2       1584 33101   4961 16R  14       
-         2       1585 33101   5070 16L  14       
-         2       1586 33101   4966 16R  14       
-         2       1587 33101   5076 16L  14       
-         2       1588 33101   4971 16R  14       
-         2       1589 33101   5082 16L  14       
-         2       1590 33101   4977 16R  14       
-         2       1591 33101   5087 16L  14       
-         2       1592 33101   4984 16R  14       
-         2       1593 33101   5092 16L  14       
-         2       1594 33101   4989 16R  14       
-         2       1595 33101   5097 16L  14       
-         2       1596 33101   4994 16R  14       
-         2       1597 33101   5003 16L  14       
-         2       1598 33101   4999 16R  14       
-         2       1599 33101   5059 16L  14       
-         2       1600 33101   4978 16R  14       
-         2       1601 33101   5308 17L  14       
-         2       1602 33101   5149 17R  14       
-         2       1603 33101   5314 17L  14       
-         2       1604 33101   5154 17R  14       
-         2       1605 33101   5319 17L  14       
-         2       1606 33101   5159 17R  14       
-         2       1607 33101   5324 17L  14       
-         2       1608 33101   5164 17R  14       
-         2       1609 33101   5329 17L  14       
-         2       1610 33101   5169 17R  14       
-         2       1611 33101   5334 17L  14       
-         2       1612 33101   5174 17R  14       
-         2       1613 33101   5340 17L  14       
-         2       1614 33101   5179 17R  14       
-         2       1615 33101   5345 17L  14       
-         2       1616 33101   5184 17R  14       
-         2       1617 33101   5351 17L  14       
-         2       1618 33101   5193 17R  14       
-         2       1619 33101   5357 17L  14       
-         2       1620 33101   5198 17R  14       
-         2       1621 33101   5310 17L  14       
-         2       1622 33101   5150 17R  14       
-         2       1623 33101   5315 17L  14       
-         2       1624 33101   5155 17R  14       
-         2       1625 33101   5320 17L  14       
-         2       1626 33101   5160 17R  14       
-         2       1627 33101   5325 17L  14       
-         2       1628 33101   5165 17R  14       
-         2       1629 33101   5330 17L  14       
-         2       1630 33101   5170 17R  14       
-         2       1631 33101   5335 17L  14       
-         2       1632 33101   5175 17R  14       
-         2       1633 33101   5341 17L  14       
-         2       1634 33101   5180 17R  14       
-         2       1635 33101   5347 17L  14       
-         2       1636 33101   5185 17R  14       
-         2       1637 33101   5352 17L  14       
-         2       1638 33101   5194 17R  14       
-         2       1639 33101   5358 17L  14       
-         2       1640 33101   5199 17R  14       
-         2       1641 33101   5311 17L  14       
-         2       1642 33101   5151 17R  14       
-         2       1643 33101   5316 17L  14       
-         2       1644 33101   5156 17R  14       
-         2       1645 33101   5321 17L  14       
-         2       1646 33101   5161 17R  14       
-         2       1647 33101   5326 17L  14       
-         2       1648 33101   5166 17R  14       
-         2       1649 33101   5331 17L  14       
-         2       1650 33101   5171 17R  14       
-         2       1651 33101   5336 17L  14       
-         2       1652 33101   5176 17R  14       
-         2       1653 33101   5342 17L  14       
-         2       1654 33101   5181 17R  14       
-         2       1655 33101   5348 17L  14       
-         2       1656 33101   5187 17R  14       
-         2       1657 33101   5354 17L  14       
-         2       1658 33101   5195 17R  14       
-         2       1659 33101   5253 17L  14       
-         2       1660 33101   5200 17R  14       
-         2       1661 33101   5312 17L  14       
-         2       1662 33101   5152 17R  14       
-         2       1663 33101   5317 17L  14       
-         2       1664 33101   5157 17R  14       
-         2       1665 33101   5322 17L  14       
-         2       1666 33101   5162 17R  14       
-         2       1667 33101   5327 17L  14       
-         2       1668 33101   5167 17R  14       
-         2       1669 33101   5332 17L  14       
-         2       1670 33101   5172 17R  14       
-         2       1671 33101   5337 17L  14       
-         2       1672 33101   5177 17R  14       
-         2       1673 33101   5343 17L  14       
-         2       1674 33101   5182 17R  14       
-         2       1675 33101   5349 17L  14       
-         2       1676 33101   5189 17R  14       
-         2       1677 33101   5355 17L  14       
-         2       1678 33101   5196 17R  14       
-         2       1679 33101   5256 17L  14       
-         2       1680 33101   5201 17R  14       
-         2       1681 33101   5313 17L  14       
-         2       1682 33101   5153 17R  14       
-         2       1683 33101   5318 17L  14       
-         2       1684 33101   5158 17R  14       
-         2       1685 33101   5323 17L  14       
-         2       1686 33101   5163 17R  14       
-         2       1687 33101   5328 17L  14       
-         2       1688 33101   5168 17R  14       
-         2       1689 33101   5333 17L  14       
-         2       1690 33101   5173 17R  14       
-         2       1691 33101   5338 17L  14       
-         2       1692 33101   5178 17R  14       
-         2       1693 33101   5344 17L  14       
-         2       1694 33101   5183 17R  14       
-         2       1695 33101   5350 17L  14       
-         2       1696 33101   5191 17R  14       
-         2       1697 33101   5356 17L  14       
-         2       1698 33101   5197 17R  14       
-         2       1699 33101   5282 17L  14       
-         2       1700 33101   5203 17R  14       
-         3          1 33101   2268 1L   9        
-         3          2 33101   2110 1R   9        
-         3          3 33101   8105 1L   P3       
-         3          4 33101   8002 1R   P3       
-         3          5 33101   8111 1L   P3       
-         3          6 33101   8007 1R   P3       
-         3          7 33101   8117 1L   P3       
-         3          8 33101   8011 1R   P3       
-         3          9 33101   8122 1L   P3       
-         3         10 33101   8016 1R   P3       
-         3         11 33101   8128 1L   P3       
-         3         12 33101   8021 1R   P3       
-         3         13 33101   8137 1L   P3       
-         3         14 33101   8027 1R   P3       
-         3         15 33101   8143 1L   P3       
-         3         16 33101   8032 1R   P3       
-         3         17 33101   8148 1L   P3       
-         3         18 33101   8038 1R   P3       
-         3         19 33101   8154 1L   P3       
-         3         20 33101   8043 1R   P3       
-         3         21 33101   2281 1L   9        
-         3         22 33101   2191 1R   9        
-         3         23 33101   8106 1L   P3       
-         3         24 33101   8003 1R   P3       
-         3         25 33101   8112 1L   P3       
-         3         26 33101   8008 1R   P3       
-         3         27 33101   8118 1L   P3       
-         3         28 33101   8012 1R   P3       
-         3         29 33101   8123 1L   P3       
-         3         30 33101   8017 1R   P3       
-         3         31 33101   8129 1L   P3       
-         3         32 33101   8022 1R   P3       
-         3         33 33101   8139 1L   P3       
-         3         34 33101   8028 1R   P3       
-         3         35 33101   8144 1L   P3       
-         3         36 33101   8033 1R   P3       
-         3         37 33101   8149 1L   P3       
-         3         38 33101   8039 1R   P3       
-         3         39 33101   8157 1L   P3       
-         3         40 33101   8044 1R   P3       
-         3         41 33101   8101 1L   P3       
-         3         42 33101   2198 1R   9        
-         3         43 33101   8107 1L   P3       
-         3         44 33101   8004 1R   P3       
-         3         45 33101   8113 1L   P3       
-         3         46 33101   2199 1R   9        
-         3         47 33101   8119 1L   P3       
-         3         48 33101   8013 1R   P3       
-         3         49 33101   8124 1L   P3       
-         3         50 33101   8018 1R   P3       
-         3         51 33101   8133 1L   P3       
-         3         52 33101   8023 1R   P3       
-         3         53 33101   8140 1L   P3       
-         3         54 33101   8029 1R   P3       
-         3         55 33101   8145 1L   P3       
-         3         56 33101   8034 1R   P3       
-         3         57 33101   8151 1L   P3       
-         3         58 33101   8040 1R   P3       
-         3         59 33101   8158 1L   P3       
-         3         60 33101   8045 1R   P3       
-         3         61 33101   8103 1L   P3       
-         3         62 33101   2200 1R   9        
-         3         63 33101   8109 1L   P3       
-         3         64 33101   8005 1R   P3       
-         3         65 33101   8115 1L   P3       
-         3         66 33101   8009 1R   P3       
-         3         67 33101   8120 1L   P3       
-         3         68 33101   8014 1R   P3       
-         3         69 33101   8125 1L   P3       
-         3         70 33101   8019 1R   P3       
-         3         71 33101   8134 1L   P3       
-         3         72 33101   8024 1R   P3       
-         3         73 33101   8141 1L   P3       
-         3         74 33101   8030 1R   P3       
-         3         75 33101   8146 1L   P3       
-         3         76 33101   8035 1R   P3       
-         3         77 33101   8152 1L   P3       
-         3         78 33101   8041 1R   P3       
-         3         79 33101   8159 1L   P3       
-         3         80 33101   8046 1R   P3       
-         3         81 33101   8104 1L   P3       
-         3         82 33101   8001 1R   P3       
-         3         83 33101   8110 1L   P3       
-         3         84 33101   8006 1R   P3       
-         3         85 33101   8116 1L   P3       
-         3         86 33101   8010 1R   P3       
-         3         87 33101   8121 1L   P3       
-         3         88 33101   8015 1R   P3       
-         3         89 33101   8126 1L   P3       
-         3         90 33101   8020 1R   P3       
-         3         91 33101   8136 1L   P3       
-         3         92 33101   8025 1R   P3       
-         3         93 33101   8142 1L   P3       
-         3         94 33101   8031 1R   P3       
-         3         95 33101   8147 1L   P3       
-         3         96 33101   8036 1R   P3       
-         3         97 33101   8153 1L   P3       
-         3         98 33101   8042 1R   P3       
-         3         99 33101   8160 1L   P3       
-         3        100 33101   8047 1R   P3       
-         3        101 33101    583 2L   6        
-         3        102 33101   2377 2R   9        
-         3        103 33101   8316 2L   P3       
-         3        104 33101   2400 2R   9        
-         3        105 33101   8321 2L   P3       
-         3        106 33101   8205 2R   P3       
-         3        107 33101   8326 2L   P3       
-         3        108 33101   8210 2R   P3       
-         3        109 33101   8331 2L   P3       
-         3        110 33101   8215 2R   P3       
-         3        111 33101   8336 2L   P3       
-         3        112 33101   8221 2R   P3       
-         3        113 33101   8341 2L   P3       
-         3        114 33101   8226 2R   P3       
-         3        115 33101   8346 2L   P3       
-         3        116 33101   8236 2R   P3       
-         3        117 33101   8351 2L   P3       
-         3        118 33101   8231 2R   P3       
-         3        119 33101   8356 2L   P3       
-         3        120 33101   8241 2R   P3       
-         3        121 33101   8312 2L   P3       
-         3        122 33101   2396 2R   9        
-         3        123 33101   8317 2L   P3       
-         3        124 33101   8201 2R   P3       
-         3        125 33101   8322 2L   P3       
-         3        126 33101   8206 2R   P3       
-         3        127 33101   8327 2L   P3       
-         3        128 33101   8211 2R   P3       
-         3        129 33101   8332 2L   P3       
-         3        130 33101   8216 2R   P3       
-         3        131 33101   8337 2L   P3       
-         3        132 33101   8222 2R   P3       
-         3        133 33101   8342 2L   P3       
-         3        134 33101   8227 2R   P3       
-         3        135 33101   8347 2L   P3       
-         3        136 33101   8237 2R   P3       
-         3        137 33101   8352 2L   P3       
-         3        138 33101   8232 2R   P3       
-         3        139 33101   8357 2L   P3       
-         3        140 33101   8242 2R   P3       
-         3        141 33101   8313 2L   P3       
-         3        142 33101   2397 2R   9        
-         3        143 33101   8318 2L   P3       
-         3        144 33101   8202 2R   P3       
-         3        145 33101   8323 2L   P3       
-         3        146 33101   8207 2R   P3       
-         3        147 33101   8328 2L   P3       
-         3        148 33101   8212 2R   P3       
-         3        149 33101   8333 2L   P3       
-         3        150 33101   8217 2R   P3       
-         3        151 33101   8338 2L   P3       
-         3        152 33101   8223 2R   P3       
-         3        153 33101   8343 2L   P3       
-         3        154 33101   8228 2R   P3       
-         3        155 33101   8348 2L   P3       
-         3        156 33101   8238 2R   P3       
-         3        157 33101   8353 2L   P3       
-         3        158 33101   8233 2R   P3       
-         3        159 33101   8358 2L   P3       
-         3        160 33101   8243 2R   P3       
-         3        161 33101   8314 2L   P3       
-         3        162 33101   2398 2R   9        
-         3        163 33101   8319 2L   P3       
-         3        164 33101   8203 2R   P3       
-         3        165 33101   8324 2L   P3       
-         3        166 33101   8208 2R   P3       
-         3        167 33101   8329 2L   P3       
-         3        168 33101   8213 2R   P3       
-         3        169 33101   8334 2L   P3       
-         3        170 33101   8219 2R   P3       
-         3        171 33101   8339 2L   P3       
-         3        172 33101   8224 2R   P3       
-         3        173 33101   8344 2L   P3       
-         3        174 33101   8229 2R   P3       
-         3        175 33101   8349 2L   P3       
-         3        176 33101   8239 2R   P3       
-         3        177 33101   8354 2L   P3       
-         3        178 33101   8234 2R   P3       
-         3        179 33101   8359 2L   P3       
-         3        180 33101   8244 2R   P3       
-         3        181 33101   8315 2L   P3       
-         3        182 33101   2399 2R   9        
-         3        183 33101   8320 2L   P3       
-         3        184 33101   8204 2R   P3       
-         3        185 33101   8325 2L   P3       
-         3        186 33101   8209 2R   P3       
-         3        187 33101   8330 2L   P3       
-         3        188 33101   8214 2R   P3       
-         3        189 33101   8335 2L   P3       
-         3        190 33101   8220 2R   P3       
-         3        191 33101   8340 2L   P3       
-         3        192 33101   8225 2R   P3       
-         3        193 33101   8345 2L   P3       
-         3        194 33101   8230 2R   P3       
-         3        195 33101   8350 2L   P3       
-         3        196 33101   8240 2R   P3       
-         3        197 33101   8355 2L   P3       
-         3        198 33101   8235 2R   P3       
-         3        199 33101   8360 2L   P3       
-         3        200 33101   8271 2R   P3       
-         3        201 33101    651 3L   6        
-         3        202 33101   8401 3R   P3       
-         3        203 33101   2698 3L   9        
-         3        204 33101   8406 3R   P3       
-         3        205 33101   8454 3L   P3       
-         3        206 33101   8411 3R   P3       
-         3        207 33101   8459 3L   P3       
-         3        208 33101   8417 3R   P3       
-         3        209 33101   8464 3L   P3       
-         3        210 33101   8423 3R   P3       
-         3        211 33101   8469 3L   P3       
-         3        212 33101   8428 3R   P3       
-         3        213 33101   8474 3L   P3       
-         3        214 33101   8433 3R   P3       
-         3        215 33101   8479 3L   P3       
-         3        216 33101   8438 3R   P3       
-         3        217 33101   8485 3L   P3       
-         3        218 33101   8444 3R   P3       
-         3        219 33101   8489 3L   P3       
-         3        220 33101   8449 3R   P3       
-         3        221 33101    670 3L   6        
-         3        222 33101   8402 3R   P3       
-         3        223 33101   2699 3L   9        
-         3        224 33101   8407 3R   P3       
-         3        225 33101   8455 3L   P3       
-         3        226 33101   8412 3R   P3       
-         3        227 33101   8460 3L   P3       
-         3        228 33101   8418 3R   P3       
-         3        229 33101   8465 3L   P3       
-         3        230 33101   8424 3R   P3       
-         3        231 33101   8470 3L   P3       
-         3        232 33101   8429 3R   P3       
-         3        233 33101   8475 3L   P3       
-         3        234 33101   8434 3R   P3       
-         3        235 33101   8480 3L   P3       
-         3        236 33101   8439 3R   P3       
-         3        237 33101   8481 3L   P3       
-         3        238 33101   8445 3R   P3       
-         3        239 33101   8491 3L   P3       
-         3        240 33101   8450 3R   P3       
-         3        241 33101   2695 3L   9        
-         3        242 33101   8403 3R   P3       
-         3        243 33101   8451 3L   P3       
-         3        244 33101   8408 3R   P3       
-         3        245 33101   8456 3L   P3       
-         3        246 33101   8413 3R   P3       
-         3        247 33101   8461 3L   P3       
-         3        248 33101   8419 3R   P3       
-         3        249 33101   8466 3L   P3       
-         3        250 33101   8425 3R   P3       
-         3        251 33101   8471 3L   P3       
-         3        252 33101   8430 3R   P3       
-         3        253 33101   8476 3L   P3       
-         3        254 33101   8435 3R   P3       
-         3        255 33101   8482 3L   P3       
-         3        256 33101   8440 3R   P3       
-         3        257 33101   8486 3L   P3       
-         3        258 33101   8446 3R   P3       
-         3        259 33101   8492 3L   P3       
-         3        260 33101   8501 3R   P3_2     
-         3        261 33101   2696 3L   9        
-         3        262 33101   8404 3R   P3       
-         3        263 33101   8452 3L   P3       
-         3        264 33101   8409 3R   P3       
-         3        265 33101   8457 3L   P3       
-         3        266 33101   8415 3R   P3       
-         3        267 33101   8462 3L   P3       
-         3        268 33101   8420 3R   P3       
-         3        269 33101   8467 3L   P3       
-         3        270 33101   8426 3R   P3       
-         3        271 33101   8472 3L   P3       
-         3        272 33101   8431 3R   P3       
-         3        273 33101   8477 3L   P3       
-         3        274 33101   8436 3R   P3       
-         3        275 33101   8483 3L   P3       
-         3        276 33101   8441 3R   P3       
-         3        277 33101   8487 3L   P3       
-         3        278 33101   8447 3R   P3       
-         3        279 33101   2650 3L   9        
-         3        280 33101   8502 3R   P3_2     
-         3        281 33101   2697 3L   9        
-         3        282 33101   8405 3R   P3       
-         3        283 33101   8453 3L   P3       
-         3        284 33101   8410 3R   P3       
-         3        285 33101   8458 3L   P3       
-         3        286 33101   8416 3R   P3       
-         3        287 33101   8463 3L   P3       
-         3        288 33101   8422 3R   P3       
-         3        289 33101   8468 3L   P3       
-         3        290 33101   8427 3R   P3       
-         3        291 33101   8473 3L   P3       
-         3        292 33101   8432 3R   P3       
-         3        293 33101   8478 3L   P3       
-         3        294 33101   8437 3R   P3       
-         3        295 33101   8484 3L   P3       
-         3        296 33101   8443 3R   P3       
-         3        297 33101   8488 3L   P3       
-         3        298 33101   8448 3R   P3       
-         3        299 33101   8494 3L   P3       
-         3        300 33101   8503 3R   P3_2     
-         3        301 33101   8701 4L   P3_2     
-         3        302 33101   8601 4R   P3_2     
-         3        303 33101   8706 4L   P3_2     
-         3        304 33101   8606 4R   P3_2     
-         3        305 33101   8712 4L   P3_2     
-         3        306 33101   8611 4R   P3_2     
-         3        307 33101   8717 4L   P3_2     
-         3        308 33101   8616 4R   P3_2     
-         3        309 33101   8722 4L   P3_2     
-         3        310 33101   8621 4R   P3_2     
-         3        311 33101   8727 4L   P3_2     
-         3        312 33101   8626 4R   P3_2     
-         3        313 33101   8732 4L   P3_2     
-         3        314 33101   8632 4R   P3_2     
-         3        315 33101   8738 4L   P3_2     
-         3        316 33101   8637 4R   P3_2     
-         3        317 33101   8744 4L   P3_2     
-         3        318 33101   8642 4R   P3_2     
-         3        319 33101   8749 4L   P3_2     
-         3        320 33101   8647 4R   P3_2     
-         3        321 33101   8702 4L   P3_2     
-         3        322 33101   8602 4R   P3_2     
-         3        323 33101   8707 4L   P3_2     
-         3        324 33101   8607 4R   P3_2     
-         3        325 33101   8713 4L   P3_2     
-         3        326 33101   8612 4R   P3_2     
-         3        327 33101   8718 4L   P3_2     
-         3        328 33101   8617 4R   P3_2     
-         3        329 33101   8723 4L   P3_2     
-         3        330 33101   8622 4R   P3_2     
-         3        331 33101   8728 4L   P3_2     
-         3        332 33101   8627 4R   P3_2     
-         3        333 33101   8733 4L   P3_2     
-         3        334 33101   8633 4R   P3_2     
-         3        335 33101   8739 4L   P3_2     
-         3        336 33101   8638 4R   P3_2     
-         3        337 33101   8745 4L   P3_2     
-         3        338 33101   8643 4R   P3_2     
-         3        339 33101   8750 4L   P3_2     
-         3        340 33101   8648 4R   P3_2     
-         3        341 33101   8703 4L   P3_2     
-         3        342 33101   8603 4R   P3_2     
-         3        343 33101   8708 4L   P3_2     
-         3        344 33101   8608 4R   P3_2     
-         3        345 33101   8714 4L   P3_2     
-         3        346 33101   8613 4R   P3_2     
-         3        347 33101   8719 4L   P3_2     
-         3        348 33101   8618 4R   P3_2     
-         3        349 33101   8724 4L   P3_2     
-         3        350 33101   8623 4R   P3_2     
-         3        351 33101   8729 4L   P3_2     
-         3        352 33101   8628 4R   P3_2     
-         3        353 33101   8734 4L   P3_2     
-         3        354 33101   8634 4R   P3_2     
-         3        355 33101   8740 4L   P3_2     
-         3        356 33101   8639 4R   P3_2     
-         3        357 33101   8746 4L   P3_2     
-         3        358 33101   8644 4R   P3_2     
-         3        359 33101   8751 4L   P3_2     
-         3        360 33101   8649 4R   P3_2     
-         3        361 33101   8704 4L   P3_2     
-         3        362 33101   8604 4R   P3_2     
-         3        363 33101   8709 4L   P3_2     
-         3        364 33101   8609 4R   P3_2     
-         3        365 33101   8715 4L   P3_2     
-         3        366 33101   8614 4R   P3_2     
-         3        367 33101   8720 4L   P3_2     
-         3        368 33101   8619 4R   P3_2     
-         3        369 33101   8725 4L   P3_2     
-         3        370 33101   8624 4R   P3_2     
-         3        371 33101   8730 4L   P3_2     
-         3        372 33101   8630 4R   P3_2     
-         3        373 33101   8735 4L   P3_2     
-         3        374 33101   8635 4R   P3_2     
-         3        375 33101   8741 4L   P3_2     
-         3        376 33101   8640 4R   P3_2     
-         3        377 33101   8747 4L   P3_2     
-         3        378 33101   8645 4R   P3_2     
-         3        379 33101   8752 4L   P3_2     
-         3        380 33101   8650 4R   P3_2     
-         3        381 33101   8705 4L   P3_2     
-         3        382 33101   8605 4R   P3_2     
-         3        383 33101   8711 4L   P3_2     
-         3        384 33101   8610 4R   P3_2     
-         3        385 33101   8716 4L   P3_2     
-         3        386 33101   8615 4R   P3_2     
-         3        387 33101   8721 4L   P3_2     
-         3        388 33101   8620 4R   P3_2     
-         3        389 33101   8726 4L   P3_2     
-         3        390 33101   8625 4R   P3_2     
-         3        391 33101   8731 4L   P3_2     
-         3        392 33101   8631 4R   P3_2     
-         3        393 33101   8737 4L   P3_2     
-         3        394 33101   8636 4R   P3_2     
-         3        395 33101   8743 4L   P3_2     
-         3        396 33101   8641 4R   P3_2     
-         3        397 33101   8748 4L   P3_2     
-         3        398 33101   8646 4R   P3_2     
-         3        399 33101   8753 4L   P3_2     
-         3        400 33101   8651 4R   P3_2     
-         3        401 33101   3094 5L   10       
-         3        402 33101   3000 5R   10       
-         3        403 33101   3099 5L   10       
-         3        404 33101   8804 5R   P3_2     
-         3        405 33101   8904 5L   P3_2     
-         3        406 33101   8809 5R   P3_2     
-         3        407 33101   8909 5L   P3_2     
-         3        408 33101   8814 5R   P3_2     
-         3        409 33101   8914 5L   P3_2     
-         3        410 33101   8819 5R   P3_2     
-         3        411 33101   8919 5L   P3_2     
-         3        412 33101   8825 5R   P3_2     
-         3        413 33101   8924 5L   P3_2     
-         3        414 33101   8830 5R   P3_2     
-         3        415 33101   8929 5L   P3_2     
-         3        416 33101   8835 5R   P3_2     
-         3        417 33101   8934 5L   P3_2     
-         3        418 33101   8840 5R   P3_2     
-         3        419 33101   8939 5L   P3_2     
-         3        420 33101   8845 5R   P3_2     
-         3        421 33101   3095 5L   10       
-         3        422 33101   2942 5R   10       
-         3        423 33101   3100 5L   10       
-         3        424 33101   8805 5R   P3_2     
-         3        425 33101   8905 5L   P3_2     
-         3        426 33101   8810 5R   P3_2     
-         3        427 33101   8910 5L   P3_2     
-         3        428 33101   8815 5R   P3_2     
-         3        429 33101   8915 5L   P3_2     
-         3        430 33101   8820 5R   P3_2     
-         3        431 33101   8920 5L   P3_2     
-         3        432 33101   8826 5R   P3_2     
-         3        433 33101   8925 5L   P3_2     
-         3        434 33101   8831 5R   P3_2     
-         3        435 33101   8930 5L   P3_2     
-         3        436 33101   8836 5R   P3_2     
-         3        437 33101   8935 5L   P3_2     
-         3        438 33101   8841 5R   P3_2     
-         3        439 33101   8940 5L   P3_2     
-         3        440 33101   8846 5R   P3_2     
-         3        441 33101   3096 5L   10       
-         3        442 33101   8801 5R   P3_2     
-         3        443 33101   8901 5L   P3_2     
-         3        444 33101   8806 5R   P3_2     
-         3        445 33101   8906 5L   P3_2     
-         3        446 33101   8811 5R   P3_2     
-         3        447 33101   8911 5L   P3_2     
-         3        448 33101   8816 5R   P3_2     
-         3        449 33101   8916 5L   P3_2     
-         3        450 33101   8821 5R   P3_2     
-         3        451 33101   8921 5L   P3_2     
-         3        452 33101   8827 5R   P3_2     
-         3        453 33101   8926 5L   P3_2     
-         3        454 33101   8832 5R   P3_2     
-         3        455 33101   8931 5L   P3_2     
-         3        456 33101   8837 5R   P3_2     
-         3        457 33101   8936 5L   P3_2     
-         3        458 33101   8842 5R   P3_2     
-         3        459 33101   8941 5L   P3_2     
-         3        460 33101   8847 5R   P3_2     
-         3        461 33101   3097 5L   10       
-         3        462 33101   8802 5R   P3_2     
-         3        463 33101   8902 5L   P3_2     
-         3        464 33101   8807 5R   P3_2     
-         3        465 33101   8907 5L   P3_2     
-         3        466 33101   8812 5R   P3_2     
-         3        467 33101   8912 5L   P3_2     
-         3        468 33101   8817 5R   P3_2     
-         3        469 33101   8917 5L   P3_2     
-         3        470 33101   8822 5R   P3_2     
-         3        471 33101   8922 5L   P3_2     
-         3        472 33101   8828 5R   P3_2     
-         3        473 33101   8927 5L   P3_2     
-         3        474 33101   8833 5R   P3_2     
-         3        475 33101   8932 5L   P3_2     
-         3        476 33101   8838 5R   P3_2     
-         3        477 33101   8937 5L   P3_2     
-         3        478 33101   8843 5R   P3_2     
-         3        479 33101   8942 5L   P3_2     
-         3        480 33101   8848 5R   P3_2     
-         3        481 33101   3098 5L   10       
-         3        482 33101   8803 5R   P3_2     
-         3        483 33101   8903 5L   P3_2     
-         3        484 33101   8808 5R   P3_2     
-         3        485 33101   8908 5L   P3_2     
-         3        486 33101   8813 5R   P3_2     
-         3        487 33101   8913 5L   P3_2     
-         3        488 33101   8818 5R   P3_2     
-         3        489 33101   8918 5L   P3_2     
-         3        490 33101   8824 5R   P3_2     
-         3        491 33101   8923 5L   P3_2     
-         3        492 33101   8829 5R   P3_2     
-         3        493 33101   8928 5L   P3_2     
-         3        494 33101   8834 5R   P3_2     
-         3        495 33101   8933 5L   P3_2     
-         3        496 33101   8839 5R   P3_2     
-         3        497 33101   8938 5L   P3_2     
-         3        498 33101   8844 5R   P3_2     
-         3        499 33101   8943 5L   P3_2     
-         3        500 33101   8849 5R   P3_2     
-         3        501 33101   7530 6L   P2_2     
-         3        502 33101  11106 6R   S1       
-         3        503 33101  11126 6L   S1       
-         3        504 33101  11096 6R   S1       
-         3        505 33101  11121 6L   S1       
-         3        506 33101  11092 6R   S1       
-         3        507 33101   7526 6L   P2_2     
-         3        508 33101  11111 6R   S1       
-         3        509 33101   7521 6L   P2_2     
-         3        510 33101  11101 6R   S1       
-         3        511 33101   3254 6L   10       
-         3        512 33101   3186 6R   10       
-         3        513 33101   7348 6L   P2       
-         3        514 33101   7514 6R   P2_2     
-         3        515 33101   7341 6L   P2       
-         3        516 33101   7264 6R   P2       
-         3        517 33101   7333 6L   P2       
-         3        518 33101   7228 6R   P2       
-         3        519 33101   7343 6L   P2       
-         3        520 33101   7509 6R   P2_2     
-         3        521 33101   7531 6L   P2_2     
-         3        522 33101  11107 6R   S1       
-         3        523 33101  11127 6L   S1       
-         3        524 33101  11097 6R   S1       
-         3        525 33101  11122 6L   S1       
-         3        526 33101  11091 6R   S1       
-         3        527 33101   7363 6L   P2       
-         3        528 33101  11112 6R   S1       
-         3        529 33101   7522 6L   P2_2     
-         3        530 33101  11102 6R   S1       
-         3        531 33101   3255 6L   10       
-         3        532 33101   3187 6R   10       
-         3        533 33101   7349 6L   P2       
-         3        534 33101   7515 6R   P2_2     
-         3        535 33101   7342 6L   P2       
-         3        536 33101   7266 6R   P2       
-         3        537 33101   7334 6L   P2       
-         3        538 33101   7229 6R   P2       
-         3        539 33101   7344 6L   P2       
-         3        540 33101   7510 6R   P2_2     
-         3        541 33101   7532 6L   P2_2     
-         3        542 33101  11108 6R   S1       
-         3        543 33101  11128 6L   S1       
-         3        544 33101  11098 6R   S1       
-         3        545 33101  11123 6L   S1       
-         3        546 33101  11093 6R   S1       
-         3        547 33101   7364 6L   P2       
-         3        548 33101  11113 6R   S1       
-         3        549 33101   7523 6L   P2_2     
-         3        550 33101  11103 6R   S1       
-         3        551 33101   3256 6L   10       
-         3        552 33101   3188 6R   10       
-         3        553 33101   7350 6L   P2       
-         3        554 33101   7516 6R   P2_2     
-         3        555 33101   7527 6L   P2_2     
-         3        556 33101   7267 6R   P2       
-         3        557 33101   7338 6L   P2       
-         3        558 33101   7230 6R   P2       
-         3        559 33101   7345 6L   P2       
-         3        560 33101   7511 6R   P2_2     
-         3        561 33101   7533 6L   P2_2     
-         3        562 33101  11109 6R   S1       
-         3        563 33101  11129 6L   S1       
-         3        564 33101  11099 6R   S1       
-         3        565 33101  11124 6L   S1       
-         3        566 33101  11094 6R   S1       
-         3        567 33101   7365 6L   P2       
-         3        568 33101  11114 6R   S1       
-         3        569 33101   7524 6L   P2_2     
-         3        570 33101  11104 6R   S1       
-         3        571 33101   3281 6L   10       
-         3        572 33101   3189 6R   10       
-         3        573 33101   7351 6L   P2       
-         3        574 33101   7517 6R   P2_2     
-         3        575 33101   7528 6L   P2_2     
-         3        576 33101     27 6R   5        
-         3        577 33101   7339 6L   P2       
-         3        578 33101   7231 6R   P2       
-         3        579 33101   7346 6L   P2       
-         3        580 33101   7512 6R   P2_2     
-         3        581 33101   7534 6L   P2_2     
-         3        582 33101  11110 6R   S1       
-         3        583 33101  11130 6L   S1       
-         3        584 33101  11100 6R   S1       
-         3        585 33101  11125 6L   S1       
-         3        586 33101  11095 6R   S1       
-         3        587 33101   7366 6L   P2       
-         3        588 33101  11115 6R   S1       
-         3        589 33101   7525 6L   P2_2     
-         3        590 33101  11105 6R   S1       
-         3        591 33101   7294 6L   P2       
-         3        592 33101   3190 6R   10       
-         3        593 33101   7352 6L   P2       
-         3        594 33101   7518 6R   P2_2     
-         3        595 33101   7529 6L   P2_2     
-         3        596 33101     44 6R   5        
-         3        597 33101   7340 6L   P2       
-         3        598 33101   7232 6R   P2       
-         3        599 33101   7347 6L   P2       
-         3        600 33101   7513 6R   P2_2     
-         3        601 33101   9551 7L   P6       
-         3        602 33101   9545 7R   P6       
-         3        603 33101   9576 7L   P6       
-         3        604 33101   7549 7R   P2_2     
-         3        605 33101   7485 7L   P2       
-         3        606 33101   3410 7R   11       
-         3        607 33101   7480 7L   P2       
-         3        608 33101   1670 7R   8        
-         3        609 33101   9566 7L   P6       
-         3        610 33101   7544 7R   P2_2     
-         3        611 33101   3467 7L   11       
-         3        612 33101   9511 7R   P6       
-         3        613 33101   9556 7L   P6       
-         3        614 33101   9521 7R   P6       
-         3        615 33101   9587 7L   P6       
-         3        616 33101   9506 7R   P6       
-         3        617 33101   9594 7L   P6       
-         3        618 33101   9501 7R   P6       
-         3        619 33101   9571 7L   P6       
-         3        620 33101   9531 7R   P6       
-         3        621 33101   9552 7L   P6       
-         3        622 33101   9547 7R   P6       
-         3        623 33101   9577 7L   P6       
-         3        624 33101   7550 7R   P2_2     
-         3        625 33101   7487 7L   P2       
-         3        626 33101   3419 7R   11       
-         3        627 33101   7481 7L   P2       
-         3        628 33101   7373 7R   P2       
-         3        629 33101   9567 7L   P6       
-         3        630 33101   7545 7R   P2_2     
-         3        631 33101   9590 7L   P6       
-         3        632 33101   9512 7R   P6       
-         3        633 33101   9557 7L   P6       
-         3        634 33101   9527 7R   P6       
-         3        635 33101   9588 7L   P6       
-         3        636 33101   9507 7R   P6       
-         3        637 33101   9596 7L   P6       
-         3        638 33101   9537 7R   P6       
-         3        639 33101   9572 7L   P6       
-         3        640 33101   9532 7R   P6       
-         3        641 33101   9553 7L   P6       
-         3        642 33101   9548 7R   P6       
-         3        643 33101   9578 7L   P6       
-         3        644 33101   7552 7R   P2_2     
-         3        645 33101   7488 7L   P2       
-         3        646 33101   3421 7R   11       
-         3        647 33101   7482 7L   P2       
-         3        648 33101   7380 7R   P2       
-         3        649 33101   9568 7L   P6       
-         3        650 33101   7546 7R   P2_2     
-         3        651 33101   9591 7L   P6       
-         3        652 33101   9513 7R   P6       
-         3        653 33101   9558 7L   P6       
-         3        654 33101   9523 7R   P6       
-         3        655 33101   9589 7L   P6       
-         3        656 33101   9508 7R   P6       
-         3        657 33101   9597 7L   P6       
-         3        658 33101   9505 7R   P6       
-         3        659 33101   9573 7L   P6       
-         3        660 33101   9517 7R   P6       
-         3        661 33101   9554 7L   P6       
-         3        662 33101   9549 7R   P6       
-         3        663 33101   9579 7L   P6       
-         3        664 33101   7553 7R   P2_2     
-         3        665 33101   7489 7L   P2       
-         3        666 33101   3423 7R   11       
-         3        667 33101   7483 7L   P2       
-         3        668 33101   7381 7R   P2       
-         3        669 33101   9569 7L   P6       
-         3        670 33101   7547 7R   P2_2     
-         3        671 33101   9595 7L   P6       
-         3        672 33101   9514 7R   P6       
-         3        673 33101   7425 7L   P2       
-         3        674 33101   9524 7R   P6       
-         3        675 33101   9592 7L   P6       
-         3        676 33101   9509 7R   P6       
-         3        677 33101   9598 7L   P6       
-         3        678 33101   9539 7R   P6       
-         3        679 33101   9574 7L   P6       
-         3        680 33101   9534 7R   P6       
-         3        681 33101   9555 7L   P6       
-         3        682 33101   9550 7R   P6       
-         3        683 33101   9580 7L   P6       
-         3        684 33101   7554 7R   P2_2     
-         3        685 33101   7490 7L   P2       
-         3        686 33101   3424 7R   11       
-         3        687 33101   7484 7L   P2       
-         3        688 33101   3405 7R   11       
-         3        689 33101   9570 7L   P6       
-         3        690 33101   7548 7R   P2_2     
-         3        691 33101   9599 7L   P6       
-         3        692 33101   9515 7R   P6       
-         3        693 33101   9560 7L   P6       
-         3        694 33101   9525 7R   P6       
-         3        695 33101   9593 7L   P6       
-         3        696 33101   9510 7R   P6       
-         3        697 33101   9600 7L   P6       
-         3        698 33101   9540 7R   P6       
-         3        699 33101   9575 7L   P6       
-         3        700 33101   9535 7R   P6       
-         3        701 33101   9686 8L   P6       
-         3        702 33101   9631 8R   P6       
-         3        703 33101   9666 8L   P6       
-         3        704 33101   9646 8R   P6       
-         3        705 33101   9711 8L   P6       
-         3        706 33101   7645 8R   P2_2     
-         3        707 33101   9706 8L   P6       
-         3        708 33101   9611 8R   P6       
-         3        709 33101   9716 8L   P6       
-         3        710 33101   9606 8R   P6       
-         3        711 33101   9661 8L   P6       
-         3        712 33101   9651 8R   P6       
-         3        713 33101   9671 8L   P6       
-         3        714 33101   9626 8R   P6       
-         3        715 33101   9701 8L   P6       
-         3        716 33101   9636 8R   P6       
-         3        717 33101   9676 8L   P6       
-         3        718 33101   9621 8R   P6       
-         3        719 33101   9691 8L   P6       
-         3        720 33101   9641 8R   P6       
-         3        721 33101   9687 8L   P6       
-         3        722 33101   9642 8R   P6       
-         3        723 33101   9667 8L   P6       
-         3        724 33101   9647 8R   P6       
-         3        725 33101   9712 8L   P6       
-         3        726 33101   7647 8R   P2_2     
-         3        727 33101   9707 8L   P6       
-         3        728 33101   9612 8R   P6       
-         3        729 33101   9717 8L   P6       
-         3        730 33101   9607 8R   P6       
-         3        731 33101   9662 8L   P6       
-         3        732 33101   9652 8R   P6       
-         3        733 33101   9672 8L   P6       
-         3        734 33101   9627 8R   P6       
-         3        735 33101   9702 8L   P6       
-         3        736 33101   9637 8R   P6       
-         3        737 33101   9677 8L   P6       
-         3        738 33101   9622 8R   P6       
-         3        739 33101   9692 8L   P6       
-         3        740 33101   9617 8R   P6       
-         3        741 33101   9688 8L   P6       
-         3        742 33101   9633 8R   P6       
-         3        743 33101   9668 8L   P6       
-         3        744 33101   9648 8R   P6       
-         3        745 33101   9713 8L   P6       
-         3        746 33101   7648 8R   P2_2     
-         3        747 33101   9708 8L   P6       
-         3        748 33101   9613 8R   P6       
-         3        749 33101   9718 8L   P6       
-         3        750 33101   9609 8R   P6       
-         3        751 33101   9663 8L   P6       
-         3        752 33101   9653 8R   P6       
-         3        753 33101   9673 8L   P6       
-         3        754 33101   9628 8R   P6       
-         3        755 33101   9703 8L   P6       
-         3        756 33101   9638 8R   P6       
-         3        757 33101   9678 8L   P6       
-         3        758 33101   9623 8R   P6       
-         3        759 33101   9693 8L   P6       
-         3        760 33101   9618 8R   P6       
-         3        761 33101   9689 8L   P6       
-         3        762 33101   9634 8R   P6       
-         3        763 33101   9669 8L   P6       
-         3        764 33101   9649 8R   P6       
-         3        765 33101   9714 8L   P6       
-         3        766 33101   7650 8R   P2_2     
-         3        767 33101   9709 8L   P6       
-         3        768 33101   9614 8R   P6       
-         3        769 33101   9719 8L   P6       
-         3        770 33101   9603 8R   P6       
-         3        771 33101   9664 8L   P6       
-         3        772 33101   9654 8R   P6       
-         3        773 33101   9674 8L   P6       
-         3        774 33101   9629 8R   P6       
-         3        775 33101   9704 8L   P6       
-         3        776 33101   9639 8R   P6       
-         3        777 33101   9679 8L   P6       
-         3        778 33101   9624 8R   P6       
-         3        779 33101   9694 8L   P6       
-         3        780 33101   9619 8R   P6       
-         3        781 33101   9690 8L   P6       
-         3        782 33101   9635 8R   P6       
-         3        783 33101   9670 8L   P6       
-         3        784 33101   9650 8R   P6       
-         3        785 33101   9715 8L   P6       
-         3        786 33101   3566 8R   11       
-         3        787 33101   9697 8L   P6       
-         3        788 33101   9615 8R   P6       
-         3        789 33101   9720 8L   P6       
-         3        790 33101   9610 8R   P6       
-         3        791 33101   9665 8L   P6       
-         3        792 33101   9655 8R   P6       
-         3        793 33101   9675 8L   P6       
-         3        794 33101   9630 8R   P6       
-         3        795 33101   9705 8L   P6       
-         3        796 33101   9644 8R   P6       
-         3        797 33101   9680 8L   P6       
-         3        798 33101   9625 8R   P6       
-         3        799 33101   9695 8L   P6       
-         3        800 33101   9620 8R   P6       
-         3        801 33101   7990 9L   P2_2     
-         3        802 33101   9746 9R   P6       
-         3        803 33101   7985 9L   P2_2     
-         3        804 33101   9726 9R   P6       
-         3        805 33101   7975 9L   P2_2     
-         3        806 33101   9741 9R   P6       
-         3        807 33101   7965 9L   P2_2     
-         3        808 33101   7840 9R   P2_2     
-         3        809 33101   7970 9L   P2_2     
-         3        810 33101   9731 9R   P6       
-         3        811 33101   7955 9L   P2_2     
-         3        812 33101   7833 9R   P2_2     
-         3        813 33101   7950 9L   P2_2     
-         3        814 33101   7830 9R   P2_2     
-         3        815 33101   7995 9L   P2_2     
-         3        816 33101   9751 9R   P6       
-         3        817 33101   7960 9L   P2_2     
-         3        818 33101   7835 9R   P2_2     
-         3        819 33101   7980 9L   P2_2     
-         3        820 33101   9721 9R   P6       
-         3        821 33101   7991 9L   P2_2     
-         3        822 33101   9747 9R   P6       
-         3        823 33101   7986 9L   P2_2     
-         3        824 33101   9727 9R   P6       
-         3        825 33101   7976 9L   P2_2     
-         3        826 33101   9742 9R   P6       
-         3        827 33101   7966 9L   P2_2     
-         3        828 33101   7842 9R   P2_2     
-         3        829 33101   7971 9L   P2_2     
-         3        830 33101   9736 9R   P6       
-         3        831 33101   7956 9L   P2_2     
-         3        832 33101   7841 9R   P2_2     
-         3        833 33101   7951 9L   P2_2     
-         3        834 33101   7832 9R   P2_2     
-         3        835 33101   7996 9L   P2_2     
-         3        836 33101   9752 9R   P6       
-         3        837 33101   7961 9L   P2_2     
-         3        838 33101   7838 9R   P2_2     
-         3        839 33101   7981 9L   P2_2     
-         3        840 33101   9722 9R   P6       
-         3        841 33101   7992 9L   P2_2     
-         3        842 33101   9748 9R   P6       
-         3        843 33101   7987 9L   P2_2     
-         3        844 33101   9728 9R   P6       
-         3        845 33101   7977 9L   P2_2     
-         3        846 33101   9743 9R   P6       
-         3        847 33101   7967 9L   P2_2     
-         3        848 33101   3702 9R   11       
-         3        849 33101   7972 9L   P2_2     
-         3        850 33101   9738 9R   P6       
-         3        851 33101   7957 9L   P2_2     
-         3        852 33101   3776 9R   11       
-         3        853 33101   7952 9L   P2_2     
-         3        854 33101   7834 9R   P2_2     
-         3        855 33101   7997 9L   P2_2     
-         3        856 33101   9753 9R   P6       
-         3        857 33101   7962 9L   P2_2     
-         3        858 33101   7839 9R   P2_2     
-         3        859 33101   7982 9L   P2_2     
-         3        860 33101   9723 9R   P6       
-         3        861 33101   7993 9L   P2_2     
-         3        862 33101   9749 9R   P6       
-         3        863 33101   7988 9L   P2_2     
-         3        864 33101   9729 9R   P6       
-         3        865 33101   7978 9L   P2_2     
-         3        866 33101   9744 9R   P6       
-         3        867 33101   7968 9L   P2_2     
-         3        868 33101   7844 9R   P2_2     
-         3        869 33101   7973 9L   P2_2     
-         3        870 33101   9739 9R   P6       
-         3        871 33101   7958 9L   P2_2     
-         3        872 33101   3778 9R   11       
-         3        873 33101   7953 9L   P2_2     
-         3        874 33101   7836 9R   P2_2     
-         3        875 33101   7998 9L   P2_2     
-         3        876 33101   9754 9R   P6       
-         3        877 33101   7963 9L   P2_2     
-         3        878 33101   7843 9R   P2_2     
-         3        879 33101   7983 9L   P2_2     
-         3        880 33101   9724 9R   P6       
-         3        881 33101   7994 9L   P2_2     
-         3        882 33101   9750 9R   P6       
-         3        883 33101   7989 9L   P2_2     
-         3        884 33101   9730 9R   P6       
-         3        885 33101   7979 9L   P2_2     
-         3        886 33101   9745 9R   P6       
-         3        887 33101   7969 9L   P2_2     
-         3        888 33101   7846 9R   P2_2     
-         3        889 33101   7974 9L   P2_2     
-         3        890 33101    370 9R   5        
-         3        891 33101   7959 9L   P2_2     
-         3        892 33101   7831 9R   P2_2     
-         3        893 33101   7954 9L   P2_2     
-         3        894 33101   7837 9R   P2_2     
-         3        895 33101   7999 9L   P2_2     
-         3        896 33101   9755 9R   P6       
-         3        897 33101   7964 9L   P2_2     
-         3        898 33101   7847 9R   P2_2     
-         3        899 33101   7984 9L   P2_2     
-         3        900 33101   9725 9R   P6       
-         3        901 33101   9115 10L  P4_1     
-         3        902 33101   9018 10R  P4_1     
-         3        903 33101   9110 10L  P4_1     
-         3        904 33101   9013 10R  P4_1     
-         3        905 33101   9120 10L  P4_1     
-         3        906 33101   9008 10R  P4_1     
-         3        907 33101   9195 10L  P4_1     
-         3        908 33101   9003 10R  P4_1     
-         3        909 33101   9105 10L  P4_1     
-         3        910 33101   3945 10R  12       
-         3        911 33101   9876 10L  P6       
-         3        912 33101   9866 10R  P6       
-         3        913 33101   9898 10L  P6       
-         3        914 33101   9861 10R  P6       
-         3        915 33101   9881 10L  P6       
-         3        916 33101   9846 10R  P6       
-         3        917 33101   9891 10L  P6       
-         3        918 33101   9841 10R  P6       
-         3        919 33101   9200 10L  P4_1     
-         3        920 33101   9856 10R  P6       
-         3        921 33101   9116 10L  P4_1     
-         3        922 33101   9019 10R  P4_1     
-         3        923 33101   9111 10L  P4_1     
-         3        924 33101   9014 10R  P4_1     
-         3        925 33101   9121 10L  P4_1     
-         3        926 33101   9009 10R  P4_1     
-         3        927 33101   9196 10L  P4_1     
-         3        928 33101   9004 10R  P4_1     
-         3        929 33101   9106 10L  P4_1     
-         3        930 33101   9852 10R  P6       
-         3        931 33101   9877 10L  P6       
-         3        932 33101   9867 10R  P6       
-         3        933 33101   9887 10L  P6       
-         3        934 33101   9862 10R  P6       
-         3        935 33101   9882 10L  P6       
-         3        936 33101   9847 10R  P6       
-         3        937 33101   9892 10L  P6       
-         3        938 33101   9842 10R  P6       
-         3        939 33101   9872 10L  P6       
-         3        940 33101   9857 10R  P6       
-         3        941 33101   9117 10L  P4_1     
-         3        942 33101   9020 10R  P4_1     
-         3        943 33101   9112 10L  P4_1     
-         3        944 33101   9015 10R  P4_1     
-         3        945 33101   9122 10L  P4_1     
-         3        946 33101   9010 10R  P4_1     
-         3        947 33101   9197 10L  P4_1     
-         3        948 33101   9005 10R  P4_1     
-         3        949 33101   9107 10L  P4_1     
-         3        950 33101   9853 10R  P6       
-         3        951 33101   9878 10L  P6       
-         3        952 33101   9868 10R  P6       
-         3        953 33101   9888 10L  P6       
-         3        954 33101   9863 10R  P6       
-         3        955 33101   9883 10L  P6       
-         3        956 33101   9848 10R  P6       
-         3        957 33101   9894 10L  P6       
-         3        958 33101   9843 10R  P6       
-         3        959 33101   9873 10L  P6       
-         3        960 33101   3953 10R  12       
-         3        961 33101   9118 10L  P4_1     
-         3        962 33101   9021 10R  P4_1     
-         3        963 33101   9113 10L  P4_1     
-         3        964 33101   9016 10R  P4_1     
-         3        965 33101   9123 10L  P4_1     
-         3        966 33101   9011 10R  P4_1     
-         3        967 33101   9198 10L  P4_1     
-         3        968 33101   9006 10R  P4_1     
-         3        969 33101   9108 10L  P4_1     
-         3        970 33101   9854 10R  P6       
-         3        971 33101   9879 10L  P6       
-         3        972 33101   9869 10R  P6       
-         3        973 33101   9889 10L  P6       
-         3        974 33101   9864 10R  P6       
-         3        975 33101   9884 10L  P6       
-         3        976 33101   9849 10R  P6       
-         3        977 33101   9896 10L  P6       
-         3        978 33101   9844 10R  P6       
-         3        979 33101   9874 10L  P6       
-         3        980 33101   9859 10R  P6       
-         3        981 33101   9119 10L  P4_1     
-         3        982 33101   9022 10R  P4_1     
-         3        983 33101   9114 10L  P4_1     
-         3        984 33101   9017 10R  P4_1     
-         3        985 33101   9124 10L  P4_1     
-         3        986 33101   9012 10R  P4_1     
-         3        987 33101   9199 10L  P4_1     
-         3        988 33101   9007 10R  P4_1     
-         3        989 33101   9109 10L  P4_1     
-         3        990 33101   9855 10R  P6       
-         3        991 33101   9880 10L  P6       
-         3        992 33101   9870 10R  P6       
-         3        993 33101   9890 10L  P6       
-         3        994 33101   9865 10R  P6       
-         3        995 33101   9885 10L  P6       
-         3        996 33101   9850 10R  P6       
-         3        997 33101   9897 10L  P6       
-         3        998 33101   9845 10R  P6       
-         3        999 33101   9875 10L  P6       
-         3       1000 33101   9860 10R  P6       
-         3       1001 33101   9332 11L  P4_1     
-         3       1002 33101   9293 11R  P4_1     
-         3       1003 33101   9327 11L  P4_1     
-         3       1004 33101   9288 11R  P4_1     
-         3       1005 33101   9353 11L  P4_1     
-         3       1006 33101   9271 11R  P4_1     
-         3       1007 33101   9348 11L  P4_1     
-         3       1008 33101   9266 11R  P4_1     
-         3       1009 33101   9375 11L  P4_1     
-         3       1010 33101   9250 11R  P4_1     
-         3       1011 33101   9370 11L  P4_1     
-         3       1012 33101   9245 11R  P4_1     
-         3       1013 33101   4289 11L  12       
-         3       1014 33101   9215 11R  P4_1     
-         3       1015 33101   4283 11L  12       
-         3       1016 33101   9210 11R  P4_1     
-         3       1017 33101   9312 11L  P4_1     
-         3       1018 33101   9205 11R  P4_1     
-         3       1019 33101   9307 11L  P4_1     
-         3       1020 33101   9220 11R  P4_1     
-         3       1021 33101   9333 11L  P4_1     
-         3       1022 33101   9294 11R  P4_1     
-         3       1023 33101   9328 11L  P4_1     
-         3       1024 33101   9289 11R  P4_1     
-         3       1025 33101   9354 11L  P4_1     
-         3       1026 33101   9272 11R  P4_1     
-         3       1027 33101   9349 11L  P4_1     
-         3       1028 33101   9267 11R  P4_1     
-         3       1029 33101   9376 11L  P4_1     
-         3       1030 33101   9251 11R  P4_1     
-         3       1031 33101   9371 11L  P4_1     
-         3       1032 33101   9246 11R  P4_1     
-         3       1033 33101   4290 11L  12       
-         3       1034 33101   9216 11R  P4_1     
-         3       1035 33101   4284 11L  12       
-         3       1036 33101   9211 11R  P4_1     
-         3       1037 33101   9313 11L  P4_1     
-         3       1038 33101   9206 11R  P4_1     
-         3       1039 33101   9308 11L  P4_1     
-         3       1040 33101   9221 11R  P4_1     
-         3       1041 33101   9334 11L  P4_1     
-         3       1042 33101   9295 11R  P4_1     
-         3       1043 33101   9329 11L  P4_1     
-         3       1044 33101   9290 11R  P4_1     
-         3       1045 33101   9355 11L  P4_1     
-         3       1046 33101   9274 11R  P4_1     
-         3       1047 33101   9350 11L  P4_1     
-         3       1048 33101   9268 11R  P4_1     
-         3       1049 33101   9377 11L  P4_1     
-         3       1050 33101   9252 11R  P4_1     
-         3       1051 33101   9372 11L  P4_1     
-         3       1052 33101   9247 11R  P4_1     
-         3       1053 33101   4291 11L  12       
-         3       1054 33101   9217 11R  P4_1     
-         3       1055 33101   4285 11L  12       
-         3       1056 33101   9212 11R  P4_1     
-         3       1057 33101   9314 11L  P4_1     
-         3       1058 33101   9207 11R  P4_1     
-         3       1059 33101   9309 11L  P4_1     
-         3       1060 33101   9222 11R  P4_1     
-         3       1061 33101   9335 11L  P4_1     
-         3       1062 33101   9296 11R  P4_1     
-         3       1063 33101   9330 11L  P4_1     
-         3       1064 33101   9291 11R  P4_1     
-         3       1065 33101   9356 11L  P4_1     
-         3       1066 33101   9275 11R  P4_1     
-         3       1067 33101   9351 11L  P4_1     
-         3       1068 33101   9269 11R  P4_1     
-         3       1069 33101   9378 11L  P4_1     
-         3       1070 33101   9253 11R  P4_1     
-         3       1071 33101   9373 11L  P4_1     
-         3       1072 33101   9248 11R  P4_1     
-         3       1073 33101   4292 11L  12       
-         3       1074 33101   9218 11R  P4_1     
-         3       1075 33101   4287 11L  12       
-         3       1076 33101   9213 11R  P4_1     
-         3       1077 33101   9315 11L  P4_1     
-         3       1078 33101   9208 11R  P4_1     
-         3       1079 33101   9310 11L  P4_1     
-         3       1080 33101   9223 11R  P4_1     
-         3       1081 33101   9336 11L  P4_1     
-         3       1082 33101   9297 11R  P4_1     
-         3       1083 33101   9331 11L  P4_1     
-         3       1084 33101   9292 11R  P4_1     
-         3       1085 33101   9357 11L  P4_1     
-         3       1086 33101   9276 11R  P4_1     
-         3       1087 33101   9352 11L  P4_1     
-         3       1088 33101   9270 11R  P4_1     
-         3       1089 33101   9379 11L  P4_1     
-         3       1090 33101   9254 11R  P4_1     
-         3       1091 33101   9374 11L  P4_1     
-         3       1092 33101   9249 11R  P4_1     
-         3       1093 33101   4293 11L  12       
-         3       1094 33101   9219 11R  P4_1     
-         3       1095 33101   4288 11L  12       
-         3       1096 33101   9214 11R  P4_1     
-         3       1097 33101   9316 11L  P4_1     
-         3       1098 33101   9209 11R  P4_1     
-         3       1099 33101   9311 11L  P4_1     
-         3       1100 33101   9224 11R  P4_1     
-         3       1101 33101   9496 12L  P4_1     
-         3       1102 33101  11906 12R  S1       
-         3       1103 33101   9491 12L  P4_1     
-         3       1104 33101   9446 12R  P4_1     
-         3       1105 33101   9486 12L  P4_1     
-         3       1106 33101   9441 12R  P4_1     
-         3       1107 33101   9481 12L  P4_1     
-         3       1108 33101   9436 12R  P4_1     
-         3       1109 33101   9476 12L  P4_1     
-         3       1110 33101   9431 12R  P4_1     
-         3       1111 33101   9471 12L  P4_1     
-         3       1112 33101   9425 12R  P4_1     
-         3       1113 33101   9466 12L  P4_1     
-         3       1114 33101   9420 12R  P4_1     
-         3       1115 33101   9461 12L  P4_1     
-         3       1116 33101   9415 12R  P4_1     
-         3       1117 33101   9456 12L  P4_1     
-         3       1118 33101   9410 12R  P4_1     
-         3       1119 33101   4398 12L  12       
-         3       1120 33101   9405 12R  P4_1     
-         3       1121 33101   9497 12L  P4_1     
-         3       1122 33101  11907 12R  S1       
-         3       1123 33101   9492 12L  P4_1     
-         3       1124 33101   9447 12R  P4_1     
-         3       1125 33101   9487 12L  P4_1     
-         3       1126 33101   9442 12R  P4_1     
-         3       1127 33101   9482 12L  P4_1     
-         3       1128 33101   9437 12R  P4_1     
-         3       1129 33101   9477 12L  P4_1     
-         3       1130 33101   9432 12R  P4_1     
-         3       1131 33101   9472 12L  P4_1     
-         3       1132 33101   9426 12R  P4_1     
-         3       1133 33101   9467 12L  P4_1     
-         3       1134 33101   9421 12R  P4_1     
-         3       1135 33101   9462 12L  P4_1     
-         3       1136 33101   9416 12R  P4_1     
-         3       1137 33101   9457 12L  P4_1     
-         3       1138 33101   9411 12R  P4_1     
-         3       1139 33101   4399 12L  12       
-         3       1140 33101   9406 12R  P4_1     
-         3       1141 33101   9498 12L  P4_1     
-         3       1142 33101  11908 12R  S1       
-         3       1143 33101   9493 12L  P4_1     
-         3       1144 33101   9448 12R  P4_1     
-         3       1145 33101   9488 12L  P4_1     
-         3       1146 33101   9443 12R  P4_1     
-         3       1147 33101   9483 12L  P4_1     
-         3       1148 33101   9438 12R  P4_1     
-         3       1149 33101   9478 12L  P4_1     
-         3       1150 33101   9433 12R  P4_1     
-         3       1151 33101   9473 12L  P4_1     
-         3       1152 33101   9427 12R  P4_1     
-         3       1153 33101   9468 12L  P4_1     
-         3       1154 33101   9422 12R  P4_1     
-         3       1155 33101   9463 12L  P4_1     
-         3       1156 33101   9417 12R  P4_1     
-         3       1157 33101   9458 12L  P4_1     
-         3       1158 33101   9412 12R  P4_1     
-         3       1159 33101   4400 12L  12       
-         3       1160 33101   9407 12R  P4_1     
-         3       1161 33101   9499 12L  P4_1     
-         3       1162 33101  11909 12R  S1       
-         3       1163 33101   9494 12L  P4_1     
-         3       1164 33101   9449 12R  P4_1     
-         3       1165 33101   9489 12L  P4_1     
-         3       1166 33101   9444 12R  P4_1     
-         3       1167 33101   9484 12L  P4_1     
-         3       1168 33101   9439 12R  P4_1     
-         3       1169 33101   9479 12L  P4_1     
-         3       1170 33101   9434 12R  P4_1     
-         3       1171 33101   9474 12L  P4_1     
-         3       1172 33101   9428 12R  P4_1     
-         3       1173 33101   9469 12L  P4_1     
-         3       1174 33101   9423 12R  P4_1     
-         3       1175 33101   9464 12L  P4_1     
-         3       1176 33101   9418 12R  P4_1     
-         3       1177 33101   9459 12L  P4_1     
-         3       1178 33101   9413 12R  P4_1     
-         3       1179 33101   7052 12L  P1       
-         3       1180 33101   9408 12R  P4_1     
-         3       1181 33101   9500 12L  P4_1     
-         3       1182 33101  11910 12R  S1       
-         3       1183 33101   9495 12L  P4_1     
-         3       1184 33101   9450 12R  P4_1     
-         3       1185 33101   9490 12L  P4_1     
-         3       1186 33101   9445 12R  P4_1     
-         3       1187 33101   9485 12L  P4_1     
-         3       1188 33101   9440 12R  P4_1     
-         3       1189 33101   9480 12L  P4_1     
-         3       1190 33101   9435 12R  P4_1     
-         3       1191 33101   9475 12L  P4_1     
-         3       1192 33101   9430 12R  P4_1     
-         3       1193 33101   9470 12L  P4_1     
-         3       1194 33101   9424 12R  P4_1     
-         3       1195 33101   9465 12L  P4_1     
-         3       1196 33101   9419 12R  P4_1     
-         3       1197 33101   9460 12L  P4_1     
-         3       1198 33101   9414 12R  P4_1     
-         3       1199 33101   7053 12L  P1       
-         3       1200 33101   9409 12R  P4_1     
-         3       1201 33101  12194 13L  S1       
-         3       1202 33101  12050 13R  S1       
-         3       1203 33101  12053 13L  S1(CX_Reenregistre_Inversion_L/R)
-         3       1204 33101  12045 13R  S1       
-         3       1205 33101  12180 13L  S1       
-         3       1206 33101  12039 13R  S1       
-         3       1207 33101  12149 13L  S1       
-         3       1208 33101  12034 13R  S1       
-         3       1209 33101  12108 13L  S1       
-         3       1210 33101  12006 13R  S1       
-         3       1211 33101  12101 13L  S1       
-         3       1212 33101  12001 13R  S1       
-         3       1213 33101  12142 13L  S1       
-         3       1214 33101  12027 13R  S1       
-         3       1215 33101  12133 13L  S1       
-         3       1216 33101  12022 13R  S1       
-         3       1217 33101  12127 13L  S1       
-         3       1218 33101  12017 13R  S1       
-         3       1219 33101  12118 13L  S1       
-         3       1220 33101  12012 13R  S1       
-         3       1221 33101  12195 13L  S1       
-         3       1222 33101  12076 13R  S1       
-         3       1223 33101  12054 13L  S1(CX_Reenregistre_Inversion_L/R)                                                                                                                                                                                                                                                                                                                                                                                                                                         
-         3       1224 33101  12046 13R  S1       
-         3       1225 33101  12182 13L  S1       
-         3       1226 33101  12040 13R  S1       
-         3       1227 33101  12150 13L  S1       
-         3       1228 33101  12035 13R  S1       
-         3       1229 33101  12109 13L  S1       
-         3       1230 33101  12007 13R  S1       
-         3       1231 33101  12102 13L  S1       
-         3       1232 33101  12002 13R  S1       
-         3       1233 33101  12143 13L  S1       
-         3       1234 33101  12028 13R  S1       
-         3       1235 33101  12136 13L  S1       
-         3       1236 33101  12023 13R  S1       
-         3       1237 33101  12128 13L  S1       
-         3       1238 33101  12018 13R  S1       
-         3       1239 33101  12119 13L  S1       
-         3       1240 33101  12013 13R  S1       
-         3       1241 33101  12197 13L  S1       
-         3       1242 33101  12077 13R  S1       
-         3       1243 33101  12186 13L  S1       
-         3       1244 33101  12047 13R  S1       
-         3       1245 33101  12183 13L  S1       
-         3       1246 33101  12041 13R  S1       
-         3       1247 33101  12176 13L  S1       
-         3       1248 33101  12036 13R  S1       
-         3       1249 33101  12113 13L  S1       
-         3       1250 33101  12008 13R  S1       
-         3       1251 33101  12104 13L  S1       
-         3       1252 33101  12003 13R  S1       
-         3       1253 33101  12144 13L  S1       
-         3       1254 33101  12029 13R  S1       
-         3       1255 33101  12137 13L  S1       
-         3       1256 33101  12024 13R  S1       
-         3       1257 33101  12129 13L  S1       
-         3       1258 33101  12019 13R  S1       
-         3       1259 33101  12121 13L  S1       
-         3       1260 33101  12014 13R  S1       
-         3       1261 33101  12199 13L  S1       
-         3       1262 33101  12078 13R  S1       
-         3       1263 33101  12187 13L  S1       
-         3       1264 33101  12048 13R  S1       
-         3       1265 33101  12184 13L  S1       
-         3       1266 33101  12042 13R  S1       
-         3       1267 33101  12177 13L  S1       
-         3       1268 33101  12037 13R  S1       
-         3       1269 33101  12115 13L  S1       
-         3       1270 33101  12009 13R  S1       
-         3       1271 33101  12105 13L  S1       
-         3       1272 33101  12004 13R  S1       
-         3       1273 33101  12145 13L  S1       
-         3       1274 33101  12030 13R  S1       
-         3       1275 33101  12138 13L  S1       
-         3       1276 33101  12025 13R  S1       
-         3       1277 33101  12131 13L  S1       
-         3       1278 33101  12020 13R  S1       
-         3       1279 33101  12125 13L  S1       
-         3       1280 33101  12015 13R  S1       
-         3       1281 33101  12200 13L  S1       
-         3       1282 33101  12079 13R  S1       
-         3       1283 33101  12192 13L  S1       
-         3       1284 33101  12049 13R  S1       
-         3       1285 33101  12185 13L  S1       
-         3       1286 33101  12043 13R  S1       
-         3       1287 33101  12178 13L  S1       
-         3       1288 33101  12038 13R  S1       
-         3       1289 33101  12117 13L  S1       
-         3       1290 33101  12010 13R  S1       
-         3       1291 33101  12106 13L  S1       
-         3       1292 33101  12005 13R  S1       
-         3       1293 33101  12147 13L  S1       
-         3       1294 33101  12032 13R  S1       
-         3       1295 33101  12139 13L  S1       
-         3       1296 33101  12026 13R  S1       
-         3       1297 33101  12132 13L  S1       
-         3       1298 33101  12021 13R  S1       
-         3       1299 33101  12126 13L  S1       
-         3       1300 33101  12016 13R  S1       
-         3       1301 33101   1059 14L  P3_2     
-         3       1302 33101   4521 14R  13       
-         3       1303 33101   4699 14L  13       
-         3       1304 33101  12201 14R  S1       
-         3       1305 33101  12304 14L  S1       
-         3       1306 33101  12209 14R  S1       
-         3       1307 33101  12309 14L  S1       
-         3       1308 33101  12215 14R  S1       
-         3       1309 33101  12317 14L  S1       
-         3       1310 33101  12224 14R  S1       
-         3       1311 33101  12324 14L  S1       
-         3       1312 33101  12233 14R  S1       
-         3       1313 33101  12330 14L  S1       
-         3       1314 33101  12241 14R  S1       
-         3       1315 33101  12340 14L  S1       
-         3       1316 33101  12248 14R  S1       
-         3       1317 33101  12345 14L  S1       
-         3       1318 33101  12254 14R  S1       
-         3       1319 33101  12351 14L  S1       
-         3       1320 33101  12261 14R  S1       
-         3       1321 33101   4695 14L  13       
-         3       1322 33101   4597 14R  13       
-         3       1323 33101   4700 14L  13       
-         3       1324 33101  12204 14R  S1       
-         3       1325 33101  12305 14L  S1       
-         3       1326 33101  12211 14R  S1       
-         3       1327 33101  12312 14L  S1       
-         3       1328 33101  12216 14R  S1       
-         3       1329 33101  12318 14L  S1       
-         3       1330 33101  12225 14R  S1       
-         3       1331 33101  12326 14L  S1       
-         3       1332 33101  12236 14R  S1       
-         3       1333 33101  12332 14L  S1       
-         3       1334 33101  12243 14R  S1       
-         3       1335 33101  12341 14L  S1       
-         3       1336 33101  12249 14R  S1       
-         3       1337 33101  12346 14L  S1       
-         3       1338 33101  12255 14R  S1       
-         3       1339 33101  12352 14L  S1       
-         3       1340 33101  12262 14R  S1       
-         3       1341 33101   4696 14L  13       
-         3       1342 33101   4598 14R  13       
-         3       1343 33101  12301 14L  S1       
-         3       1344 33101  12205 14R  S1       
-         3       1345 33101  12306 14L  S1       
-         3       1346 33101  12212 14R  S1       
-         3       1347 33101  12314 14L  S1       
-         3       1348 33101  12218 14R  S1       
-         3       1349 33101  12320 14L  S1       
-         3       1350 33101  12226 14R  S1       
-         3       1351 33101  12327 14L  S1       
-         3       1352 33101  12237 14R  S1       
-         3       1353 33101  12333 14L  S1       
-         3       1354 33101  12244 14R  S1       
-         3       1355 33101  12342 14L  S1       
-         3       1356 33101  12251 14R  S1       
-         3       1357 33101  12347 14L  S1       
-         3       1358 33101  12256 14R  S1       
-         3       1359 33101  12355 14L  S1       
-         3       1360 33101  12263 14R  S1       
-         3       1361 33101   4697 14L  13       
-         3       1362 33101   4599 14R  13       
-         3       1363 33101  12302 14L  S1       
-         3       1364 33101  12206 14R  S1       
-         3       1365 33101  12307 14L  S1       
-         3       1366 33101  12213 14R  S1       
-         3       1367 33101  12315 14L  S1       
-         3       1368 33101  12219 14R  S1       
-         3       1369 33101  12321 14L  S1       
-         3       1370 33101  12227 14R  S1       
-         3       1371 33101  12328 14L  S1       
-         3       1372 33101  12238 14R  S1       
-         3       1373 33101  12335 14L  S1       
-         3       1374 33101  12245 14R  S1       
-         3       1375 33101  12343 14L  S1       
-         3       1376 33101  12252 14R  S1       
-         3       1377 33101  12349 14L  S1       
-         3       1378 33101  12259 14R  S1       
-         3       1379 33101  12356 14L  S1       
-         3       1380 33101  12265 14R  S1       
-         3       1381 33101   4698 14L  13       
-         3       1382 33101   4600 14R  13       
-         3       1383 33101  12303 14L  S1       
-         3       1384 33101  12207 14R  S1       
-         3       1385 33101  12308 14L  S1       
-         3       1386 33101  12214 14R  S1       
-         3       1387 33101  12316 14L  S1       
-         3       1388 33101  12221 14R  S1       
-         3       1389 33101  12323 14L  S1       
-         3       1390 33101  12231 14R  S1       
-         3       1391 33101  12329 14L  S1       
-         3       1392 33101  12239 14R  S1       
-         3       1393 33101  12337 14L  S1       
-         3       1394 33101  12246 14R  S1       
-         3       1395 33101  12344 14L  S1       
-         3       1396 33101  12253 14R  S1       
-         3       1397 33101  12350 14L  S1       
-         3       1398 33101  12260 14R  S1       
-         3       1399 33101  12362 14L  S1       
-         3       1400 33101  12267 14R  S1       
-         3       1401 33101   4895 15L  13       
-         3       1402 33101   4744 15R  13       
-         3       1403 33101   4900 15L  13       
-         3       1404 33101  10001 15R  P5_1     
-         3       1405 33101  10105 15L  P5_1     
-         3       1406 33101  10006 15R  P5_1     
-         3       1407 33101  10110 15L  P5_1     
-         3       1408 33101  10011 15R  P5_1     
-         3       1409 33101  10115 15L  P5_1     
-         3       1410 33101  10016 15R  P5_1     
-         3       1411 33101  10120 15L  P5_1     
-         3       1412 33101  10021 15R  P5_1     
-         3       1413 33101  10125 15L  P5_1     
-         3       1414 33101  10026 15R  P5_1     
-         3       1415 33101  10130 15L  P5_1     
-         3       1416 33101  10031 15R  P5_1     
-         3       1417 33101  10135 15L  P5_1     
-         3       1418 33101  10036 15R  P5_1     
-         3       1419 33101  10140 15L  P5_1     
-         3       1420 33101  10041 15R  P5_1     
-         3       1421 33101   4896 15L  13       
-         3       1422 33101   4790 15R  13       
-         3       1423 33101  10101 15L  P5_1     
-         3       1424 33101  10002 15R  P5_1     
-         3       1425 33101  10106 15L  P5_1     
-         3       1426 33101  10007 15R  P5_1     
-         3       1427 33101  10111 15L  P5_1     
-         3       1428 33101  10012 15R  P5_1     
-         3       1429 33101  10116 15L  P5_1     
-         3       1430 33101  10017 15R  P5_1     
-         3       1431 33101  10121 15L  P5_1     
-         3       1432 33101  10022 15R  P5_1     
-         3       1433 33101  10126 15L  P5_1     
-         3       1434 33101  10027 15R  P5_1     
-         3       1435 33101  10131 15L  P5_1     
-         3       1436 33101  10032 15R  P5_1     
-         3       1437 33101  10136 15L  P5_1     
-         3       1438 33101  10037 15R  P5_1     
-         3       1439 33101  10141 15L  P5_1     
-         3       1440 33101  10042 15R  P5_1     
-         3       1441 33101   4897 15L  13       
-         3       1442 33101   4797 15R  13       
-         3       1443 33101  10102 15L  P5_1     
-         3       1444 33101  10003 15R  P5_1     
-         3       1445 33101  10107 15L  P5_1     
-         3       1446 33101  10008 15R  P5_1     
-         3       1447 33101  10112 15L  P5_1     
-         3       1448 33101  10013 15R  P5_1     
-         3       1449 33101  10117 15L  P5_1     
-         3       1450 33101  10018 15R  P5_1     
-         3       1451 33101  10122 15L  P5_1     
-         3       1452 33101  10023 15R  P5_1     
-         3       1453 33101  10127 15L  P5_1     
-         3       1454 33101  10028 15R  P5_1     
-         3       1455 33101  10132 15L  P5_1     
-         3       1456 33101  10033 15R  P5_1     
-         3       1457 33101  10137 15L  P5_1     
-         3       1458 33101  10038 15R  P5_1     
-         3       1459 33101  10142 15L  P5_1     
-         3       1460 33101  10043 15R  P5_1     
-         3       1461 33101   4898 15L  13       
-         3       1462 33101   4798 15R  13       
-         3       1463 33101  10103 15L  P5_1     
-         3       1464 33101  10004 15R  P5_1     
-         3       1465 33101  10108 15L  P5_1     
-         3       1466 33101  10009 15R  P5_1     
-         3       1467 33101  10113 15L  P5_1     
-         3       1468 33101  10014 15R  P5_1     
-         3       1469 33101  10118 15L  P5_1     
-         3       1470 33101  10019 15R  P5_1     
-         3       1471 33101  10123 15L  P5_1     
-         3       1472 33101  10024 15R  P5_1     
-         3       1473 33101  10128 15L  P5_1     
-         3       1474 33101  10029 15R  P5_1     
-         3       1475 33101  10133 15L  P5_1     
-         3       1476 33101  10034 15R  P5_1     
-         3       1477 33101  10138 15L  P5_1     
-         3       1478 33101  10039 15R  P5_1     
-         3       1479 33101  10143 15L  P5_1     
-         3       1480 33101  10044 15R  P5_1     
-         3       1481 33101   4899 15L  13       
-         3       1482 33101   4800 15R  13       
-         3       1483 33101  10104 15L  P5_1     
-         3       1484 33101  10005 15R  P5_1     
-         3       1485 33101  10109 15L  P5_1     
-         3       1486 33101  10010 15R  P5_1     
-         3       1487 33101  10114 15L  P5_1     
-         3       1488 33101  10015 15R  P5_1     
-         3       1489 33101  10119 15L  P5_1     
-         3       1490 33101  10020 15R  P5_1     
-         3       1491 33101  10124 15L  P5_1     
-         3       1492 33101  10025 15R  P5_1     
-         3       1493 33101  10129 15L  P5_1     
-         3       1494 33101  10030 15R  P5_1     
-         3       1495 33101  10134 15L  P5_1     
-         3       1496 33101  10035 15R  P5_1     
-         3       1497 33101  10139 15L  P5_1     
-         3       1498 33101  10040 15R  P5_1     
-         3       1499 33101  10144 15L  P5_1     
-         3       1500 33101  10045 15R  P5_1     
-         3       1501 33101   5068 16L  14       
-         3       1502 33101  12402 16R  S1       
-         3       1503 33101  12504 16L  S1       
-         3       1504 33101  12407 16R  S1       
-         3       1505 33101  12510 16L  S1       
-         3       1506 33101  12413 16R  S1       
-         3       1507 33101  12522 16L  S1       
-         3       1508 33101  12418 16R  S1       
-         3       1509 33101  12531 16L  S1       
-         3       1510 33101  12423 16R  S1       
-         3       1511 33101  12538 16L  S1       
-         3       1512 33101  12429 16R  S1       
-         3       1513 33101  12543 16L  S1       
-         3       1514 33101  12437 16R  S1       
-         3       1515 33101  12549 16L  S1       
-         3       1516 33101  12444 16R  S1       
-         3       1517 33101  12554 16L  S1       
-         3       1518 33101  12450 16R  S1       
-         3       1519 33101  12562 16L  S1       
-         3       1520 33101  12456 16R  S1       
-         3       1521 33101   5073 16L  14       
-         3       1522 33101  12403 16R  S1       
-         3       1523 33101  12505 16L  S1       
-         3       1524 33101  12408 16R  S1       
-         3       1525 33101  12511 16L  S1       
-         3       1526 33101  12414 16R  S1       
-         3       1527 33101  12523 16L  S1       
-         3       1528 33101  12419 16R  S1       
-         3       1529 33101  12533 16L  S1       
-         3       1530 33101  12424 16R  S1       
-         3       1531 33101  12539 16L  S1       
-         3       1532 33101  12432 16R  S1       
-         3       1533 33101  12544 16L  S1       
-         3       1534 33101  12438 16R  S1       
-         3       1535 33101  12550 16L  S1       
-         3       1536 33101  12445 16R  S1       
-         3       1537 33101  12556 16L  S1       
-         3       1538 33101  12451 16R  S1       
-         3       1539 33101  12563 16L  S1       
-         3       1540 33101  12457 16R  S1       
-         3       1541 33101   5079 16L  14       
-         3       1542 33101  12404 16R  S1       
-         3       1543 33101  12506 16L  S1       
-         3       1544 33101  12409 16R  S1       
-         3       1545 33101  12518 16L  S1       
-         3       1546 33101  12415 16R  S1       
-         3       1547 33101  12527 16L  S1       
-         3       1548 33101  12420 16R  S1       
-         3       1549 33101  12535 16L  S1       
-         3       1550 33101  12425 16R  S1       
-         3       1551 33101  12540 16L  S1       
-         3       1552 33101  12433 16R  S1       
-         3       1553 33101  12545 16L  S1       
-         3       1554 33101  12440 16R  S1       
-         3       1555 33101  12551 16L  S1       
-         3       1556 33101  12446 16R  S1       
-         3       1557 33101  12558 16L  S1       
-         3       1558 33101  12452 16R  S1       
-         3       1559 33101  12564 16L  S1       
-         3       1560 33101  12458 16R  S1       
-         3       1561 33101  12502 16L  S1       
-         3       1562 33101  12405 16R  S1       
-         3       1563 33101  12507 16L  S1       
-         3       1564 33101  12410 16R  S1       
-         3       1565 33101  12520 16L  S1       
-         3       1566 33101  12416 16R  S1       
-         3       1567 33101  12528 16L  S1       
-         3       1568 33101  12421 16R  S1       
-         3       1569 33101  12536 16L  S1       
-         3       1570 33101  12426 16R  S1       
-         3       1571 33101  12541 16L  S1       
-         3       1572 33101  12434 16R  S1       
-         3       1573 33101  12546 16L  S1       
-         3       1574 33101  12442 16R  S1       
-         3       1575 33101  12552 16L  S1       
-         3       1576 33101  12447 16R  S1       
-         3       1577 33101  12560 16L  S1       
-         3       1578 33101  12454 16R  S1       
-         3       1579 33101  12566 16L  S1       
-         3       1580 33101  12459 16R  S1       
-         3       1581 33101  12503 16L  S1       
-         3       1582 33101  12406 16R  S1       
-         3       1583 33101  12509 16L  S1       
-         3       1584 33101  12411 16R  S1       
-         3       1585 33101  12521 16L  S1       
-         3       1586 33101  12417 16R  S1       
-         3       1587 33101  12529 16L  S1       
-         3       1588 33101  12422 16R  S1       
-         3       1589 33101  12537 16L  S1       
-         3       1590 33101  12427 16R  S1       
-         3       1591 33101  12542 16L  S1       
-         3       1592 33101  12436 16R  S1       
-         3       1593 33101  12547 16L  S1       
-         3       1594 33101  12443 16R  S1       
-         3       1595 33101  12553 16L  S1       
-         3       1596 33101  12448 16R  S1       
-         3       1597 33101  12561 16L  S1       
-         3       1598 33101  12455 16R  S1       
-         3       1599 33101  12567 16L  S1       
-         3       1600 33101  12460 16R  S1       
-         3       1601 33101   5251 17L  14       
-         3       1602 33101   5112 17R  14       
-         3       1603 33101   5359 17L  14       
-         3       1604 33101   5204 17R  14       
-         3       1605 33101   5365 17L  14       
-         3       1606 33101   5209 17R  14       
-         3       1607 33101   5372 17L  14       
-         3       1608 33101   5214 17R  14       
-         3       1609 33101   5377 17L  14       
-         3       1610 33101   5219 17R  14       
-         3       1611 33101   5384 17L  14       
-         3       1612 33101   5226 17R  14       
-         3       1613 33101   5390 17L  14       
-         3       1614 33101   5234 17R  14       
-         3       1615 33101   5277 17L  14       
-         3       1616 33101   5233 17R  14       
-         3       1617 33101   5396 17L  14       
-         3       1618 33101   5243 17R  14       
-         3       1619 33101  12726 17L  S1       
-         3       1620 33101   5248 17R  14       
-         3       1621 33101   5260 17L  14       
-         3       1622 33101   5114 17R  14       
-         3       1623 33101   5360 17L  14       
-         3       1624 33101   5205 17R  14       
-         3       1625 33101   5367 17L  14       
-         3       1626 33101   5210 17R  14       
-         3       1627 33101   5373 17L  14       
-         3       1628 33101   5215 17R  14       
-         3       1629 33101   5379 17L  14       
-         3       1630 33101   5220 17R  14       
-         3       1631 33101   5386 17L  14       
-         3       1632 33101   5227 17R  14       
-         3       1633 33101   5391 17L  14       
-         3       1634 33101   5235 17R  14       
-         3       1635 33101   5353 17L  14       
-         3       1636 33101   5239 17R  14       
-         3       1637 33101   5399 17L  14       
-         3       1638 33101   5244 17R  14       
-         3       1639 33101  12750 17L  S1       
-         3       1640 33101   5249 17R  14       
-         3       1641 33101   5264 17L  14       
-         3       1642 33101   5132 17R  14       
-         3       1643 33101   5361 17L  14       
-         3       1644 33101   5206 17R  14       
-         3       1645 33101   5369 17L  14       
-         3       1646 33101   5211 17R  14       
-         3       1647 33101   5374 17L  14       
-         3       1648 33101   5216 17R  14       
-         3       1649 33101   5380 17L  14       
-         3       1650 33101   5221 17R  14       
-         3       1651 33101   5387 17L  14       
-         3       1652 33101   5228 17R  14       
-         3       1653 33101   5392 17L  14       
-         3       1654 33101   5236 17R  14       
-         3       1655 33101   5368 17L  14       
-         3       1656 33101   5240 17R  14       
-         3       1657 33101   5400 17L  14       
-         3       1658 33101   5245 17R  14       
-         3       1659 33101  12776 17L  S1       
-         3       1660 33101   5250 17R  14       
-         3       1661 33101   5268 17L  14       
-         3       1662 33101   5188 17R  14       
-         3       1663 33101   5363 17L  14       
-         3       1664 33101   5207 17R  14       
-         3       1665 33101   5370 17L  14       
-         3       1666 33101   5212 17R  14       
-         3       1667 33101   5375 17L  14       
-         3       1668 33101   5217 17R  14       
-         3       1669 33101   5381 17L  14       
-         3       1670 33101   5222 17R  14       
-         3       1671 33101   5388 17L  14       
-         3       1672 33101   5229 17R  14       
-         3       1673 33101   5393 17L  14       
-         3       1674 33101   5237 17R  14       
-         3       1675 33101   5382 17L  14       
-         3       1676 33101   5241 17R  14       
-         3       1677 33101  12746 17L  S1       
-         3       1678 33101   5246 17R  14       
-         3       1679 33101  12777 17L  S1       
-         3       1680 33101  12646 17R  S1       
-         3       1681 33101   5309 17L  14       
-         3       1682 33101   5232 17R  14       
-         3       1683 33101   5364 17L  14       
-         3       1684 33101   5208 17R  14       
-         3       1685 33101   5371 17L  14       
-         3       1686 33101   5213 17R  14       
-         3       1687 33101   5376 17L  14       
-         3       1688 33101   5218 17R  14       
-         3       1689 33101   5383 17L  14       
-         3       1690 33101   5224 17R  14       
-         3       1691 33101   5389 17L  14       
-         3       1692 33101   5230 17R  14       
-         3       1693 33101   5395 17L  14       
-         3       1694 33101   5238 17R  14       
-         3       1695 33101   5394 17L  14       
-         3       1696 33101   5242 17R  14       
-         3       1697 33101  12724 17L  S1       
-         3       1698 33101   5247 17R  14       
-         3       1699 33101  12779 17L  S1       
-         3       1700 33101  12677 17R  S1       
-         4          1 33101   8161 1L   P3       
-         4          2 33101   8048 1R   P3       
-         4          3 33101   8167 1L   P3       
-         4          4 33101   8054 1R   P3       
-         4          5 33101   8174 1L   P3       
-         4          6 33101   8059 1R   P3       
-         4          7 33101   8182 1L   P3       
-         4          8 33101   8064 1R   P3       
-         4          9 33101   8187 1L   P3       
-         4         10 33101   8069 1R   P3       
-         4         11 33101   8193 1L   P3       
-         4         12 33101   8074 1R   P3       
-         4         13 33101   8198 1L   P3       
-         4         14 33101   8079 1R   P3       
-         4         15 33101   8114 1L   P3       
-         4         16 33101   8084 1R   P3       
-         4         17 33101   8135 1L   P3       
-         4         18 33101   8089 1R   P3       
-         4         19 33101   8169 1L   P3       
-         4         20 33101   8094 1R   P3       
-         4         21 33101   8162 1L   P3       
-         4         22 33101   8049 1R   P3       
-         4         23 33101   8168 1L   P3       
-         4         24 33101   8055 1R   P3       
-         4         25 33101   8175 1L   P3       
-         4         26 33101   8060 1R   P3       
-         4         27 33101   8183 1L   P3       
-         4         28 33101   8065 1R   P3       
-         4         29 33101   8188 1L   P3       
-         4         30 33101   8070 1R   P3       
-         4         31 33101   8194 1L   P3       
-         4         32 33101   8075 1R   P3       
-         4         33 33101   8199 1L   P3       
-         4         34 33101   8080 1R   P3       
-         4         35 33101   8127 1L   P3       
-         4         36 33101   8085 1R   P3       
-         4         37 33101   8150 1L   P3       
-         4         38 33101   8090 1R   P3       
-         4         39 33101   8170 1L   P3       
-         4         40 33101   8095 1R   P3       
-         4         41 33101   8163 1L   P3       
-         4         42 33101   8050 1R   P3       
-         4         43 33101   8171 1L   P3       
-         4         44 33101   8056 1R   P3       
-         4         45 33101   8178 1L   P3       
-         4         46 33101   8061 1R   P3       
-         4         47 33101   8184 1L   P3       
-         4         48 33101   8066 1R   P3       
-         4         49 33101   8189 1L   P3       
-         4         50 33101   8071 1R   P3       
-         4         51 33101   8195 1L   P3       
-         4         52 33101   8076 1R   P3       
-         4         53 33101   8200 1L   P3       
-         4         54 33101   8081 1R   P3       
-         4         55 33101   8130 1L   P3       
-         4         56 33101   8086 1R   P3       
-         4         57 33101   8155 1L   P3       
-         4         58 33101   8091 1R   P3       
-         4         59 33101   8177 1L   P3       
-         4         60 33101   8096 1R   P3       
-         4         61 33101   8165 1L   P3       
-         4         62 33101   8052 1R   P3       
-         4         63 33101   8172 1L   P3       
-         4         64 33101   8057 1R   P3       
-         4         65 33101   8179 1L   P3       
-         4         66 33101   8062 1R   P3       
-         4         67 33101   8185 1L   P3       
-         4         68 33101   8067 1R   P3       
-         4         69 33101   8190 1L   P3       
-         4         70 33101   8072 1R   P3       
-         4         71 33101   8196 1L   P3       
-         4         72 33101   8077 1R   P3       
-         4         73 33101   8102 1L   P3       
-         4         74 33101   8082 1R   P3       
-         4         75 33101   8131 1L   P3       
-         4         76 33101   8087 1R   P3       
-         4         77 33101   8156 1L   P3       
-         4         78 33101   8092 1R   P3       
-         4         79 33101   8180 1L   P3       
-         4         80 33101   8097 1R   P3       
-         4         81 33101   8166 1L   P3       
-         4         82 33101   8053 1R   P3       
-         4         83 33101   8173 1L   P3       
-         4         84 33101   8058 1R   P3       
-         4         85 33101   8181 1L   P3       
-         4         86 33101   8063 1R   P3       
-         4         87 33101   8186 1L   P3       
-         4         88 33101   8068 1R   P3       
-         4         89 33101   8192 1L   P3       
-         4         90 33101   8073 1R   P3       
-         4         91 33101   8197 1L   P3       
-         4         92 33101   8078 1R   P3       
-         4         93 33101   8108 1L   P3       
-         4         94 33101   8083 1R   P3       
-         4         95 33101   8132 1L   P3       
-         4         96 33101   8088 1R   P3       
-         4         97 33101   8164 1L   P3       
-         4         98 33101   8093 1R   P3       
-         4         99 33101   8191 1L   P3       
-         4        100 33101   8098 1R   P3       
-         4        101 33101   8361 2L   P3       
-         4        102 33101   8246 2R   P3       
-         4        103 33101   8366 2L   P3       
-         4        104 33101   8251 2R   P3       
-         4        105 33101   8371 2L   P3       
-         4        106 33101   8256 2R   P3       
-         4        107 33101   8376 2L   P3       
-         4        108 33101   8261 2R   P3       
-         4        109 33101   8381 2L   P3       
-         4        110 33101   8267 2R   P3       
-         4        111 33101   8386 2L   P3       
-         4        112 33101   8272 2R   P3       
-         4        113 33101   8391 2L   P3       
-         4        114 33101   8277 2R   P3       
-         4        115 33101   8396 2L   P3       
-         4        116 33101   8282 2R   P3       
-         4        117 33101  10501 2L   S1       
-         4        118 33101   8287 2R   P3       
-         4        119 33101  10506 2L   S1       
-         4        120 33101   8292 2R   P3       
-         4        121 33101   8362 2L   P3       
-         4        122 33101   8247 2R   P3       
-         4        123 33101   8367 2L   P3       
-         4        124 33101   8252 2R   P3       
-         4        125 33101   8372 2L   P3       
-         4        126 33101   8257 2R   P3       
-         4        127 33101   8377 2L   P3       
-         4        128 33101   8262 2R   P3       
-         4        129 33101   8382 2L   P3       
-         4        130 33101   8268 2R   P3       
-         4        131 33101   8387 2L   P3       
-         4        132 33101   8273 2R   P3       
-         4        133 33101   8392 2L   P3       
-         4        134 33101   8278 2R   P3       
-         4        135 33101   8397 2L   P3       
-         4        136 33101   8283 2R   P3       
-         4        137 33101  10502 2L   S1       
-         4        138 33101   8288 2R   P3       
-         4        139 33101  10507 2L   S1       
-         4        140 33101   8293 2R   P3       
-         4        141 33101   8363 2L   P3       
-         4        142 33101   8248 2R   P3       
-         4        143 33101   8368 2L   P3       
-         4        144 33101   8253 2R   P3       
-         4        145 33101   8373 2L   P3       
-         4        146 33101   8258 2R   P3       
-         4        147 33101   8378 2L   P3       
-         4        148 33101   8263 2R   P3       
-         4        149 33101   8383 2L   P3       
-         4        150 33101   8269 2R   P3       
-         4        151 33101   8388 2L   P3       
-         4        152 33101   8274 2R   P3       
-         4        153 33101   8393 2L   P3       
-         4        154 33101   8279 2R   P3       
-         4        155 33101   8398 2L   P3       
-         4        156 33101   8284 2R   P3       
-         4        157 33101  10503 2L   S1       
-         4        158 33101   8289 2R   P3       
-         4        159 33101  10508 2L   S1       
-         4        160 33101   8294 2R   P3       
-         4        161 33101   8364 2L   P3       
-         4        162 33101   8249 2R   P3       
-         4        163 33101   8369 2L   P3       
-         4        164 33101   8254 2R   P3       
-         4        165 33101   8374 2L   P3       
-         4        166 33101   8259 2R   P3       
-         4        167 33101   8379 2L   P3       
-         4        168 33101   8265 2R   P3       
-         4        169 33101   8384 2L   P3       
-         4        170 33101   8270 2R   P3       
-         4        171 33101   8389 2L   P3       
-         4        172 33101   8275 2R   P3       
-         4        173 33101   8394 2L   P3       
-         4        174 33101   8280 2R   P3       
-         4        175 33101   8399 2L   P3       
-         4        176 33101   8285 2R   P3       
-         4        177 33101  10504 2L   S1       
-         4        178 33101   8290 2R   P3       
-         4        179 33101  10509 2L   S1       
-         4        180 33101   8295 2R   P3       
-         4        181 33101   8365 2L   P3       
-         4        182 33101   8250 2R   P3       
-         4        183 33101   8370 2L   P3       
-         4        184 33101   8255 2R   P3       
-         4        185 33101   8375 2L   P3       
-         4        186 33101   8260 2R   P3       
-         4        187 33101   8380 2L   P3       
-         4        188 33101   8266 2R   P3       
-         4        189 33101   8385 2L   P3       
-         4        190 33101   8245 2R   P3       
-         4        191 33101   8390 2L   P3       
-         4        192 33101   8276 2R   P3       
-         4        193 33101   8395 2L   P3       
-         4        194 33101   8281 2R   P3       
-         4        195 33101   8400 2L   P3       
-         4        196 33101   8286 2R   P3       
-         4        197 33101  10505 2L   S1       
-         4        198 33101   8291 2R   P3       
-         4        199 33101  10510 2L   S1       
-         4        200 33101   8296 2R   P3       
-         4        201 33101   8495 3L   P3       
-         4        202 33101   8504 3R   P3_2     
-         4        203 33101   8551 3L   P3_2     
-         4        204 33101   8509 3R   P3_2     
-         4        205 33101   8556 3L   P3_2     
-         4        206 33101   8514 3R   P3_2     
-         4        207 33101   8562 3L   P3_2     
-         4        208 33101   8520 3R   P3_2     
-         4        209 33101   8568 3L   P3_2     
-         4        210 33101   8526 3R   P3_2     
-         4        211 33101   8573 3L   P3_2     
-         4        212 33101   8531 3R   P3_2     
-         4        213 33101   8578 3L   P3_2     
-         4        214 33101   8536 3R   P3_2     
-         4        215 33101   8583 3L   P3_2     
-         4        216 33101   8541 3R   P3_2     
-         4        217 33101   8588 3L   P3_2     
-         4        218 33101   8546 3R   P3_2     
-         4        219 33101   8593 3L   P3_2     
-         4        220 33101  10601 3R   S1       
-         4        221 33101   8497 3L   P3       
-         4        222 33101   8505 3R   P3_2     
-         4        223 33101   8552 3L   P3_2     
-         4        224 33101   8510 3R   P3_2     
-         4        225 33101   8558 3L   P3_2     
-         4        226 33101   8515 3R   P3_2     
-         4        227 33101   8564 3L   P3_2     
-         4        228 33101   8522 3R   P3_2     
-         4        229 33101   8569 3L   P3_2     
-         4        230 33101   8527 3R   P3_2     
-         4        231 33101   8574 3L   P3_2     
-         4        232 33101   8532 3R   P3_2     
-         4        233 33101   8579 3L   P3_2     
-         4        234 33101   8537 3R   P3_2     
-         4        235 33101   8584 3L   P3_2     
-         4        236 33101   8542 3R   P3_2     
-         4        237 33101   8589 3L   P3_2     
-         4        238 33101   8547 3R   P3_2     
-         4        239 33101   8594 3L   P3_2     
-         4        240 33101  10602 3R   S1       
-         4        241 33101   8498 3L   P3       
-         4        242 33101   8506 3R   P3_2     
-         4        243 33101   8553 3L   P3_2     
-         4        244 33101   8511 3R   P3_2     
-         4        245 33101   8559 3L   P3_2     
-         4        246 33101   8516 3R   P3_2     
-         4        247 33101   8565 3L   P3_2     
-         4        248 33101   8523 3R   P3_2     
-         4        249 33101   8570 3L   P3_2     
-         4        250 33101   8528 3R   P3_2     
-         4        251 33101   8575 3L   P3_2     
-         4        252 33101   8533 3R   P3_2     
-         4        253 33101   8580 3L   P3_2     
-         4        254 33101   8538 3R   P3_2     
-         4        255 33101   8585 3L   P3_2     
-         4        256 33101   8543 3R   P3_2     
-         4        257 33101   8590 3L   P3_2     
-         4        258 33101   8548 3R   P3_2     
-         4        259 33101   8595 3L   P3_2     
-         4        260 33101  10603 3R   S1       
-         4        261 33101   8499 3L   P3       
-         4        262 33101   8507 3R   P3_2     
-         4        263 33101   8554 3L   P3_2     
-         4        264 33101   8512 3R   P3_2     
-         4        265 33101   8560 3L   P3_2     
-         4        266 33101   8518 3R   P3_2     
-         4        267 33101   8566 3L   P3_2     
-         4        268 33101   8524 3R   P3_2     
-         4        269 33101   8571 3L   P3_2     
-         4        270 33101   8529 3R   P3_2     
-         4        271 33101   8576 3L   P3_2     
-         4        272 33101   8534 3R   P3_2     
-         4        273 33101   8581 3L   P3_2     
-         4        274 33101   8539 3R   P3_2     
-         4        275 33101   8586 3L   P3_2     
-         4        276 33101   8544 3R   P3_2     
-         4        277 33101   8591 3L   P3_2     
-         4        278 33101   8549 3R   P3_2     
-         4        279 33101   8596 3L   P3_2     
-         4        280 33101  10605 3R   S1       
-         4        281 33101   8500 3L   P3       
-         4        282 33101   8508 3R   P3_2     
-         4        283 33101   8555 3L   P3_2     
-         4        284 33101   8513 3R   P3_2     
-         4        285 33101   8561 3L   P3_2     
-         4        286 33101   8519 3R   P3_2     
-         4        287 33101   8567 3L   P3_2     
-         4        288 33101   8525 3R   P3_2     
-         4        289 33101   8572 3L   P3_2     
-         4        290 33101   8530 3R   P3_2     
-         4        291 33101   8577 3L   P3_2     
-         4        292 33101   8535 3R   P3_2     
-         4        293 33101   8582 3L   P3_2     
-         4        294 33101   8540 3R   P3_2     
-         4        295 33101   8587 3L   P3_2     
-         4        296 33101   8545 3R   P3_2     
-         4        297 33101   8592 3L   P3_2     
-         4        298 33101   8550 3R   P3_2     
-         4        299 33101   8597 3L   P3_2     
-         4        300 33101  10606 3R   S1       
-         4        301 33101   8754 4L   P3_2     
-         4        302 33101   8652 4R   P3_2     
-         4        303 33101   8759 4L   P3_2     
-         4        304 33101   8657 4R   P3_2     
-         4        305 33101   8765 4L   P3_2     
-         4        306 33101   8663 4R   P3_2     
-         4        307 33101   8770 4L   P3_2     
-         4        308 33101   8668 4R   P3_2     
-         4        309 33101   8775 4L   P3_2     
-         4        310 33101   8673 4R   P3_2     
-         4        311 33101   8780 4L   P3_2     
-         4        312 33101   8684 4R   P3_2     
-         4        313 33101   8785 4L   P3_2     
-         4        314 33101   8689 4R   P3_2     
-         4        315 33101   8790 4L   P3_2     
-         4        316 33101   8694 4R   P3_2     
-         4        317 33101   8795 4L   P3_2     
-         4        318 33101   8679 4R   P3_2     
-         4        319 33101   8800 4L   P3_2     
-         4        320 33101   8699 4R   P3_2     
-         4        321 33101   8755 4L   P3_2     
-         4        322 33101   8653 4R   P3_2     
-         4        323 33101   8760 4L   P3_2     
-         4        324 33101   8659 4R   P3_2     
-         4        325 33101   8766 4L   P3_2     
-         4        326 33101   8664 4R   P3_2     
-         4        327 33101   8771 4L   P3_2     
-         4        328 33101   8669 4R   P3_2     
-         4        329 33101   8776 4L   P3_2     
-         4        330 33101   8675 4R   P3_2     
-         4        331 33101   8781 4L   P3_2     
-         4        332 33101   8685 4R   P3_2     
-         4        333 33101   8786 4L   P3_2     
-         4        334 33101   8690 4R   P3_2     
-         4        335 33101   8791 4L   P3_2     
-         4        336 33101   8695 4R   P3_2     
-         4        337 33101   8796 4L   P3_2     
-         4        338 33101   8680 4R   P3_2     
-         4        339 33101   8710 4L   P3_2     
-         4        340 33101   8700 4R   P3_2     
-         4        341 33101   8756 4L   P3_2     
-         4        342 33101   8654 4R   P3_2     
-         4        343 33101   8761 4L   P3_2     
-         4        344 33101   8660 4R   P3_2     
-         4        345 33101   8767 4L   P3_2     
-         4        346 33101   8665 4R   P3_2     
-         4        347 33101   8772 4L   P3_2     
-         4        348 33101   8670 4R   P3_2     
-         4        349 33101   8777 4L   P3_2     
-         4        350 33101   8676 4R   P3_2     
-         4        351 33101   8782 4L   P3_2     
-         4        352 33101   8686 4R   P3_2     
-         4        353 33101   8787 4L   P3_2     
-         4        354 33101   8691 4R   P3_2     
-         4        355 33101   8792 4L   P3_2     
-         4        356 33101   8696 4R   P3_2     
-         4        357 33101   8797 4L   P3_2     
-         4        358 33101   8681 4R   P3_2     
-         4        359 33101  10781 4L   S1       
-         4        360 33101   8629 4R   P3_2     
-         4        361 33101   8757 4L   P3_2     
-         4        362 33101   8655 4R   P3_2     
-         4        363 33101   8763 4L   P3_2     
-         4        364 33101   8661 4R   P3_2     
-         4        365 33101   8768 4L   P3_2     
-         4        366 33101   8666 4R   P3_2     
-         4        367 33101   8773 4L   P3_2     
-         4        368 33101   8671 4R   P3_2     
-         4        369 33101   8778 4L   P3_2     
-         4        370 33101   8677 4R   P3_2     
-         4        371 33101   8783 4L   P3_2     
-         4        372 33101   8687 4R   P3_2     
-         4        373 33101   8788 4L   P3_2     
-         4        374 33101   8692 4R   P3_2     
-         4        375 33101   8793 4L   P3_2     
-         4        376 33101   8697 4R   P3_2     
-         4        377 33101   8798 4L   P3_2     
-         4        378 33101   8682 4R   P3_2     
-         4        379 33101  10782 4L   S1       
-         4        380 33101  10721 4R   S1       
-         4        381 33101   8758 4L   P3_2     
-         4        382 33101   8656 4R   P3_2     
-         4        383 33101   8764 4L   P3_2     
-         4        384 33101   8662 4R   P3_2     
-         4        385 33101   8769 4L   P3_2     
-         4        386 33101   8667 4R   P3_2     
-         4        387 33101   8774 4L   P3_2     
-         4        388 33101   8672 4R   P3_2     
-         4        389 33101   8779 4L   P3_2     
-         4        390 33101   8678 4R   P3_2     
-         4        391 33101   8784 4L   P3_2     
-         4        392 33101   8688 4R   P3_2     
-         4        393 33101   8789 4L   P3_2     
-         4        394 33101   8693 4R   P3_2     
-         4        395 33101   8794 4L   P3_2     
-         4        396 33101   8698 4R   P3_2     
-         4        397 33101   8799 4L   P3_2     
-         4        398 33101   8683 4R   P3_2     
-         4        399 33101  10783 4L   S1       
-         4        400 33101  10722 4R   S1       
-         4        401 33101   8944 5L   P3_2     
-         4        402 33101   8850 5R   P3_2     
-         4        403 33101   8949 5L   P3_2     
-         4        404 33101   8855 5R   P3_2     
-         4        405 33101   8954 5L   P3_2     
-         4        406 33101   8860 5R   P3_2     
-         4        407 33101   8959 5L   P3_2     
-         4        408 33101   8866 5R   P3_2     
-         4        409 33101   8964 5L   P3_2     
-         4        410 33101   8872 5R   P3_2     
-         4        411 33101   8969 5L   P3_2     
-         4        412 33101   8878 5R   P3_2     
-         4        413 33101   8974 5L   P3_2     
-         4        414 33101   8883 5R   P3_2     
-         4        415 33101   8980 5L   P3_2     
-         4        416 33101   8888 5R   P3_2     
-         4        417 33101   8985 5L   P3_2     
-         4        418 33101   8893 5R   P3_2     
-         4        419 33101   8990 5L   P3_2     
-         4        420 33101   8898 5R   P3_2     
-         4        421 33101   8945 5L   P3_2     
-         4        422 33101   8851 5R   P3_2     
-         4        423 33101   8950 5L   P3_2     
-         4        424 33101   8856 5R   P3_2     
-         4        425 33101   8955 5L   P3_2     
-         4        426 33101   8861 5R   P3_2     
-         4        427 33101   8960 5L   P3_2     
-         4        428 33101   8867 5R   P3_2     
-         4        429 33101   8965 5L   P3_2     
-         4        430 33101   8873 5R   P3_2     
-         4        431 33101   8970 5L   P3_2     
-         4        432 33101   8879 5R   P3_2     
-         4        433 33101   8976 5L   P3_2     
-         4        434 33101   8884 5R   P3_2     
-         4        435 33101   8981 5L   P3_2     
-         4        436 33101   8889 5R   P3_2     
-         4        437 33101   8986 5L   P3_2     
-         4        438 33101   8894 5R   P3_2     
-         4        439 33101   8991 5L   P3_2     
-         4        440 33101   8899 5R   P3_2     
-         4        441 33101   8946 5L   P3_2     
-         4        442 33101   8852 5R   P3_2     
-         4        443 33101   8951 5L   P3_2     
-         4        444 33101   8857 5R   P3_2     
-         4        445 33101   8956 5L   P3_2     
-         4        446 33101   8862 5R   P3_2     
-         4        447 33101   8961 5L   P3_2     
-         4        448 33101   8869 5R   P3_2     
-         4        449 33101   8966 5L   P3_2     
-         4        450 33101   8875 5R   P3_2     
-         4        451 33101   8971 5L   P3_2     
-         4        452 33101   8880 5R   P3_2     
-         4        453 33101   8977 5L   P3_2     
-         4        454 33101   8885 5R   P3_2     
-         4        455 33101   8982 5L   P3_2     
-         4        456 33101   8890 5R   P3_2     
-         4        457 33101   8987 5L   P3_2     
-         4        458 33101   8895 5R   P3_2     
-         4        459 33101   8992 5L   P3_2     
-         4        460 33101   8900 5R   P3_2     
-         4        461 33101   8947 5L   P3_2     
-         4        462 33101   8853 5R   P3_2     
-         4        463 33101   8952 5L   P3_2     
-         4        464 33101   8858 5R   P3_2     
-         4        465 33101   8957 5L   P3_2     
-         4        466 33101   8864 5R   P3_2     
-         4        467 33101   8962 5L   P3_2     
-         4        468 33101   8870 5R   P3_2     
-         4        469 33101   8967 5L   P3_2     
-         4        470 33101   8876 5R   P3_2     
-         4        471 33101   8972 5L   P3_2     
-         4        472 33101   8881 5R   P3_2     
-         4        473 33101   8978 5L   P3_2     
-         4        474 33101   8886 5R   P3_2     
-         4        475 33101   8983 5L   P3_2     
-         4        476 33101   8891 5R   P3_2     
-         4        477 33101   8988 5L   P3_2     
-         4        478 33101   8896 5R   P3_2     
-         4        479 33101   8993 5L   P3_2     
-         4        480 33101  10841 5R   S1       
-         4        481 33101   8948 5L   P3_2     
-         4        482 33101   8854 5R   P3_2     
-         4        483 33101   8953 5L   P3_2     
-         4        484 33101   8859 5R   P3_2     
-         4        485 33101   8958 5L   P3_2     
-         4        486 33101   8865 5R   P3_2     
-         4        487 33101   8963 5L   P3_2     
-         4        488 33101   8871 5R   P3_2     
-         4        489 33101   8968 5L   P3_2     
-         4        490 33101   8877 5R   P3_2     
-         4        491 33101   8973 5L   P3_2     
-         4        492 33101   8882 5R   P3_2     
-         4        493 33101   8979 5L   P3_2     
-         4        494 33101   8887 5R   P3_2     
-         4        495 33101   8984 5L   P3_2     
-         4        496 33101   8892 5R   P3_2     
-         4        497 33101   8989 5L   P3_2     
-         4        498 33101   8897 5R   P3_2     
-         4        499 33101   8994 5L   P3_2     
-         4        500 33101  10842 5R   S1       
-         4        501 33101  11248 6L   S1       
-         4        502 33101     40 6R   5        
-         4        503 33101  11260 6L   S1       
-         4        504 33101  11056 6R   S1       
-         4        505 33101  11253 6L   S1       
-         4        506 33101  11051 6R   S1       
-         4        507 33101  11243 6L   S1       
-         4        508 33101  11046 6R   S1       
-         4        509 33101  11237 6L   S1       
-         4        510 33101  11036 6R   S1       
-         4        511 33101  11134 6L   S1       
-         4        512 33101  11001 6R   S1       
-         4        513 33101  11205 6L   S1       
-         4        514 33101  11006 6R   S1       
-         4        515 33101  11217 6L   S1       
-         4        516 33101  11021 6R   S1       
-         4        517 33101  11222 6L   S1       
-         4        518 33101  11026 6R   S1       
-         4        519 33101  11227 6L   S1       
-         4        520 33101  11031 6R   S1       
-         4        521 33101  11249 6L   S1       
-         4        522 33101  11047 6R   S1       
-         4        523 33101  11261 6L   S1       
-         4        524 33101  11057 6R   S1       
-         4        525 33101  11254 6L   S1       
-         4        526 33101  11052 6R   S1       
-         4        527 33101  11244 6L   S1       
-         4        528 33101  11042 6R   S1       
-         4        529 33101  11238 6L   S1       
-         4        530 33101  11037 6R   S1       
-         4        531 33101  11135 6L   S1       
-         4        532 33101  11002 6R   S1       
-         4        533 33101  11206 6L   S1       
-         4        534 33101  11007 6R   S1       
-         4        535 33101  11218 6L   S1       
-         4        536 33101  11022 6R   S1       
-         4        537 33101  11223 6L   S1       
-         4        538 33101  11027 6R   S1       
-         4        539 33101  11228 6L   S1       
-         4        540 33101  11032 6R   S1       
-         4        541 33101  11250 6L   S1       
-         4        542 33101  11048 6R   S1       
-         4        543 33101  11263 6L   S1       
-         4        544 33101  11058 6R   S1       
-         4        545 33101  11255 6L   S1       
-         4        546 33101  11053 6R   S1       
-         4        547 33101  11245 6L   S1       
-         4        548 33101  11043 6R   S1       
-         4        549 33101  11239 6L   S1       
-         4        550 33101  11038 6R   S1       
-         4        551 33101  11136 6L   S1       
-         4        552 33101  11003 6R   S1       
-         4        553 33101  11207 6L   S1       
-         4        554 33101  11008 6R   S1       
-         4        555 33101  11219 6L   S1       
-         4        556 33101  11023 6R   S1       
-         4        557 33101  11224 6L   S1       
-         4        558 33101  11028 6R   S1       
-         4        559 33101  11229 6L   S1       
-         4        560 33101  11033 6R   S1       
-         4        561 33101  11251 6L   S1       
-         4        562 33101  11049 6R   S1       
-         4        563 33101  11264 6L   S1       
-         4        564 33101  11059 6R   S1       
-         4        565 33101  11256 6L   S1       
-         4        566 33101  11054 6R   S1       
-         4        567 33101  11246 6L   S1       
-         4        568 33101  11044 6R   S1       
-         4        569 33101  11240 6L   S1       
-         4        570 33101  11039 6R   S1       
-         4        571 33101  11137 6L   S1       
-         4        572 33101  11004 6R   S1       
-         4        573 33101  11208 6L   S1       
-         4        574 33101  11009 6R   S1       
-         4        575 33101  11220 6L   S1       
-         4        576 33101  11024 6R   S1       
-         4        577 33101  11225 6L   S1       
-         4        578 33101  11029 6R   S1       
-         4        579 33101  11233 6L   S1       
-         4        580 33101  11034 6R   S1       
-         4        581 33101  11252 6L   S1       
-         4        582 33101  11050 6R   S1       
-         4        583 33101  11266 6L   S1       
-         4        584 33101  11060 6R   S1       
-         4        585 33101  11259 6L   S1       
-         4        586 33101  11055 6R   S1       
-         4        587 33101  11247 6L   S1       
-         4        588 33101  11045 6R   S1       
-         4        589 33101  11242 6L   S1       
-         4        590 33101  11040 6R   S1       
-         4        591 33101  11140 6L   S1       
-         4        592 33101  11005 6R   S1       
-         4        593 33101  11209 6L   S1       
-         4        594 33101  11016 6R   S1       
-         4        595 33101  11221 6L   S1       
-         4        596 33101  11025 6R   S1       
-         4        597 33101  11226 6L   S1       
-         4        598 33101  11030 6R   S1       
-         4        599 33101  11234 6L   S1       
-         4        600 33101  11035 6R   S1       
-         4        601 33101  11412 7L   S1       
-         4        602 33101  11375 7R   S1       
-         4        603 33101  11405 7L   S1       
-         4        604 33101  11370 7R   S1       
-         4        605 33101  11399 7L   S1       
-         4        606 33101  11352 7R   S1       
-         4        607 33101  11391 7L   S1       
-         4        608 33101  11347 7R   S1       
-         4        609 33101   7596 7L   P2_2     
-         4        610 33101   3415 7R   11       
-         4        611 33101   9561 7L   P6       
-         4        612 33101   9536 7R   P6       
-         4        613 33101   3462 7L   11       
-         4        614 33101   9526 7R   P6       
-         4        615 33101   3468 7L   11       
-         4        616 33101   1664 7R   8        
-         4        617 33101   7456 7L   P2       
-         4        618 33101   1662 7R   8        
-         4        619 33101   7591 7L   P2_2     
-         4        620 33101   7407 7R   P2       
-         4        621 33101  11413 7L   S1       
-         4        622 33101  11376 7R   S1       
-         4        623 33101  11406 7L   S1       
-         4        624 33101  11371 7R   S1       
-         4        625 33101  11400 7L   S1       
-         4        626 33101  11354 7R   S1       
-         4        627 33101  11392 7L   S1       
-         4        628 33101  11348 7R   S1       
-         4        629 33101   7597 7L   P2_2     
-         4        630 33101   3416 7R   11       
-         4        631 33101   9562 7L   P6       
-         4        632 33101   9502 7R   P6       
-         4        633 33101   7472 7L   P2       
-         4        634 33101   9522 7R   P6       
-         4        635 33101   3481 7L   11       
-         4        636 33101   1665 7R   8        
-         4        637 33101   7499 7L   P2       
-         4        638 33101   1663 7R   8        
-         4        639 33101   7592 7L   P2_2     
-         4        640 33101   7411 7R   P2       
-         4        641 33101  11414 7L   S1       
-         4        642 33101  11377 7R   S1       
-         4        643 33101  11407 7L   S1       
-         4        644 33101  11372 7R   S1       
-         4        645 33101  11401 7L   S1       
-         4        646 33101  11355 7R   S1       
-         4        647 33101  11393 7L   S1       
-         4        648 33101  11349 7R   S1       
-         4        649 33101   7598 7L   P2_2     
-         4        650 33101   3417 7R   11       
-         4        651 33101   9563 7L   P6       
-         4        652 33101   9503 7R   P6       
-         4        653 33101   7477 7L   P2       
-         4        654 33101   9528 7R   P6       
-         4        655 33101   9582 7L   P6       
-         4        656 33101   9518 7R   P6       
-         4        657 33101   7500 7L   P2       
-         4        658 33101   1667 7R   8        
-         4        659 33101   7593 7L   P2_2     
-         4        660 33101   7412 7R   P2       
-         4        661 33101  11415 7L   S1       
-         4        662 33101  11379 7R   S1       
-         4        663 33101  11408 7L   S1       
-         4        664 33101  11373 7R   S1       
-         4        665 33101  11402 7L   S1       
-         4        666 33101  11356 7R   S1       
-         4        667 33101  11395 7L   S1       
-         4        668 33101  11350 7R   S1       
-         4        669 33101   7599 7L   P2_2     
-         4        670 33101   3418 7R   11       
-         4        671 33101   9564 7L   P6       
-         4        672 33101   9504 7R   P6       
-         4        673 33101   9559 7L   P6       
-         4        674 33101   9529 7R   P6       
-         4        675 33101   9583 7L   P6       
-         4        676 33101   9516 7R   P6       
-         4        677 33101   7581 7L   P2_2     
-         4        678 33101   1668 7R   8        
-         4        679 33101   7594 7L   P2_2     
-         4        680 33101   3413 7R   11       
-         4        681 33101  11416 7L   S1       
-         4        682 33101  11380 7R   S1       
-         4        683 33101  11409 7L   S1       
-         4        684 33101  11374 7R   S1       
-         4        685 33101  11403 7L   S1       
-         4        686 33101  11357 7R   S1       
-         4        687 33101  11398 7L   S1       
-         4        688 33101  11351 7R   S1       
-         4        689 33101   7600 7L   P2_2     
-         4        690 33101   3420 7R   11       
-         4        691 33101   9565 7L   P6       
-         4        692 33101   9538 7R   P6       
-         4        693 33101   9586 7L   P6       
-         4        694 33101   9530 7R   P6       
-         4        695 33101   9585 7L   P6       
-         4        696 33101   9520 7R   P6       
-         4        697 33101   7582 7L   P2_2     
-         4        698 33101   1669 7R   8        
-         4        699 33101   7595 7L   P2_2     
-         4        700 33101   3414 7R   11       
-         4        701 33101   9700 8L   P6       
-         4        702 33101   7696 8R   P2_2     
-         4        703 33101   7748 8L   P2_2     
-         4        704 33101   9657 8R   P6       
-         4        705 33101   7740 8L   P2_2     
-         4        706 33101   3572 8R   11       
-         4        707 33101   7793 8L   P2_2     
-         4        708 33101   3586 8R   11       
-         4        709 33101   7745 8L   P2_2     
-         4        710 33101   9601 8R   P6       
-         4        711 33101   9698 8L   P6       
-         4        712 33101   7664 8R   P2_2     
-         4        713 33101   7758 8L   P2_2     
-         4        714 33101   7677 8R   P2_2     
-         4        715 33101   7763 8L   P2_2     
-         4        716 33101  11501 8R   S1       
-         4        717 33101   7773 8L   P2_2     
-         4        718 33101   9616 8R   P6       
-         4        719 33101   7768 8L   P2_2     
-         4        720 33101   7662 8R   P2_2     
-         4        721 33101   9710 8L   P6       
-         4        722 33101   7697 8R   P2_2     
-         4        723 33101   7752 8L   P2_2     
-         4        724 33101   9658 8R   P6       
-         4        725 33101   7741 8L   P2_2     
-         4        726 33101   3573 8R   11       
-         4        727 33101   7794 8L   P2_2     
-         4        728 33101   7673 8R   P2_2     
-         4        729 33101   7746 8L   P2_2     
-         4        730 33101   9602 8R   P6       
-         4        731 33101   9682 8L   P6       
-         4        732 33101   7668 8R   P2_2     
-         4        733 33101   7759 8L   P2_2     
-         4        734 33101   7678 8R   P2_2     
-         4        735 33101   7764 8L   P2_2     
-         4        736 33101  11502 8R   S1       
-         4        737 33101   7774 8L   P2_2     
-         4        738 33101   9632 8R   P6       
-         4        739 33101   7769 8L   P2_2     
-         4        740 33101   7663 8R   P2_2     
-         4        741 33101   7790 8L   P2_2     
-         4        742 33101   7698 8R   P2_2     
-         4        743 33101   7753 8L   P2_2     
-         4        744 33101   9659 8R   P6       
-         4        745 33101   7742 8L   P2_2     
-         4        746 33101   7625 8R   P2_2     
-         4        747 33101   7795 8L   P2_2     
-         4        748 33101   7674 8R   P2_2     
-         4        749 33101   7747 8L   P2_2     
-         4        750 33101   9608 8R   P6       
-         4        751 33101   9683 8L   P6       
-         4        752 33101   7669 8R   P2_2     
-         4        753 33101   7760 8L   P2_2     
-         4        754 33101   7679 8R   P2_2     
-         4        755 33101   7765 8L   P2_2     
-         4        756 33101  11503 8R   S1       
-         4        757 33101   7775 8L   P2_2     
-         4        758 33101   9643 8R   P6       
-         4        759 33101   7770 8L   P2_2     
-         4        760 33101   7667 8R   P2_2     
-         4        761 33101   7791 8L   P2_2     
-         4        762 33101   7699 8R   P2_2     
-         4        763 33101   7754 8L   P2_2     
-         4        764 33101   9660 8R   P6       
-         4        765 33101   7743 8L   P2_2     
-         4        766 33101   7646 8R   P2_2     
-         4        767 33101   7796 8L   P2_2     
-         4        768 33101   7675 8R   P2_2     
-         4        769 33101   7749 8L   P2_2     
-         4        770 33101   9604 8R   P6       
-         4        771 33101   9684 8L   P6       
-         4        772 33101   7670 8R   P2_2     
-         4        773 33101   7761 8L   P2_2     
-         4        774 33101   7680 8R   P2_2     
-         4        775 33101   7766 8L   P2_2     
-         4        776 33101  11504 8R   S1       
-         4        777 33101   7776 8L   P2_2     
-         4        778 33101   9640 8R   P6       
-         4        779 33101   7771 8L   P2_2     
-         4        780 33101   7665 8R   P2_2     
-         4        781 33101   7792 8L   P2_2     
-         4        782 33101   7700 8R   P2_2     
-         4        783 33101   9681 8L   P6       
-         4        784 33101   7695 8R   P2_2     
-         4        785 33101   7744 8L   P2_2     
-         4        786 33101   7649 8R   P2_2     
-         4        787 33101   7797 8L   P2_2     
-         4        788 33101   7676 8R   P2_2     
-         4        789 33101   7751 8L   P2_2     
-         4        790 33101   9605 8R   P6       
-         4        791 33101   9685 8L   P6       
-         4        792 33101   7671 8R   P2_2     
-         4        793 33101   7762 8L   P2_2     
-         4        794 33101   7681 8R   P2_2     
-         4        795 33101   7767 8L   P2_2     
-         4        796 33101  11508 8R   S1       
-         4        797 33101   7777 8L   P2_2     
-         4        798 33101   9645 8R   P6       
-         4        799 33101   7772 8L   P2_2     
-         4        800 33101   7666 8R   P2_2     
-         4        801 33101   9806 9L   P6       
-         4        802 33101  11759 9R   S1       
-         4        803 33101   9816 9L   P6       
-         4        804 33101   7872 9R   P2_2     
-         4        805 33101   9825 9L   P6       
-         4        806 33101   7867 9R   P2_2     
-         4        807 33101   9781 9L   P6       
-         4        808 33101   3742 9R   11       
-         4        809 33101   9796 9L   P6       
-         4        810 33101   9735 9R   P6       
-         4        811 33101   9801 9L   P6       
-         4        812 33101   9761 9R   P6       
-         4        813 33101   9786 9L   P6       
-         4        814 33101   7845 9R   P2_2     
-         4        815 33101   9821 9L   P6       
-         4        816 33101   9756 9R   P6       
-         4        817 33101   9836 9L   P6       
-         4        818 33101   9776 9R   P6       
-         4        819 33101   9791 9L   P6       
-         4        820 33101   9766 9R   P6       
-         4        821 33101   9807 9L   P6       
-         4        822 33101  11760 9R   S1       
-         4        823 33101   9817 9L   P6       
-         4        824 33101   7873 9R   P2_2     
-         4        825 33101   9827 9L   P6       
-         4        826 33101   7868 9R   P2_2     
-         4        827 33101   9832 9L   P6       
-         4        828 33101    350 9R   5        
-         4        829 33101   9797 9L   P6       
-         4        830 33101   9762 9R   P6       
-         4        831 33101   9802 9L   P6       
-         4        832 33101   9734 9R   P6       
-         4        833 33101   9787 9L   P6       
-         4        834 33101   3772 9R   11       
-         4        835 33101   9822 9L   P6       
-         4        836 33101   9757 9R   P6       
-         4        837 33101   9837 9L   P6       
-         4        838 33101   9777 9R   P6       
-         4        839 33101   9831 9L   P6       
-         4        840 33101   9775 9R   P6       
-         4        841 33101   9808 9L   P6       
-         4        842 33101  11761 9R   S1       
-         4        843 33101   9818 9L   P6       
-         4        844 33101   7874 9R   P2_2     
-         4        845 33101   9828 9L   P6       
-         4        846 33101   7869 9R   P2_2     
-         4        847 33101   9833 9L   P6       
-         4        848 33101    367 9R   5        
-         4        849 33101   9798 9L   P6       
-         4        850 33101   9771 9R   P6       
-         4        851 33101   9803 9L   P6       
-         4        852 33101   9763 9R   P6       
-         4        853 33101   9788 9L   P6       
-         4        854 33101   9740 9R   P6       
-         4        855 33101   9823 9L   P6       
-         4        856 33101   9758 9R   P6       
-         4        857 33101   9838 9L   P6       
-         4        858 33101   9778 9R   P6       
-         4        859 33101   9793 9L   P6       
-         4        860 33101   9768 9R   P6       
-         4        861 33101   9809 9L   P6       
-         4        862 33101  11762 9R   S1       
-         4        863 33101   9819 9L   P6       
-         4        864 33101   7875 9R   P2_2     
-         4        865 33101   9829 9L   P6       
-         4        866 33101   7870 9R   P2_2     
-         4        867 33101   9834 9L   P6       
-         4        868 33101   7895 9R   P2_2     
-         4        869 33101   9799 9L   P6       
-         4        870 33101   9773 9R   P6       
-         4        871 33101   9804 9L   P6       
-         4        872 33101   9764 9R   P6       
-         4        873 33101   9789 9L   P6       
-         4        874 33101   7848 9R   P2_2     
-         4        875 33101   9824 9L   P6       
-         4        876 33101   9759 9R   P6       
-         4        877 33101   9839 9L   P6       
-         4        878 33101   9779 9R   P6       
-         4        879 33101   9794 9L   P6       
-         4        880 33101   9769 9R   P6       
-         4        881 33101   9810 9L   P6       
-         4        882 33101  11763 9R   S1       
-         4        883 33101   9820 9L   P6       
-         4        884 33101   7876 9R   P2_2     
-         4        885 33101   9830 9L   P6       
-         4        886 33101   7871 9R   P2_2     
-         4        887 33101   9835 9L   P6       
-         4        888 33101   7896 9R   P2_2     
-         4        889 33101   9800 9L   P6       
-         4        890 33101   9737 9R   P6       
-         4        891 33101   9805 9L   P6       
-         4        892 33101   9765 9R   P6       
-         4        893 33101   9790 9L   P6       
-         4        894 33101   3720 9R   11       
-         4        895 33101   9826 9L   P6       
-         4        896 33101   9733 9R   P6       
-         4        897 33101   9840 9L   P6       
-         4        898 33101   9780 9R   P6       
-         4        899 33101   9795 9L   P6       
-         4        900 33101   9770 9R   P6       
-         4        901 33101   9893 10L  P6       
-         4        902 33101   9068 10R  P4_1     
-         4        903 33101   9165 10L  P4_1     
-         4        904 33101   9063 10R  P4_1     
-         4        905 33101   9160 10L  P4_1     
-         4        906 33101   9058 10R  P4_1     
-         4        907 33101   9155 10L  P4_1     
-         4        908 33101   9053 10R  P4_1     
-         4        909 33101   9150 10L  P4_1     
-         4        910 33101   9048 10R  P4_1     
-         4        911 33101   9145 10L  P4_1     
-         4        912 33101   9043 10R  P4_1     
-         4        913 33101   9140 10L  P4_1     
-         4        914 33101   9038 10R  P4_1     
-         4        915 33101   9135 10L  P4_1     
-         4        916 33101   9033 10R  P4_1     
-         4        917 33101   9130 10L  P4_1     
-         4        918 33101   9028 10R  P4_1     
-         4        919 33101   9125 10L  P4_1     
-         4        920 33101   9023 10R  P4_1     
-         4        921 33101   9895 10L  P6       
-         4        922 33101   9069 10R  P4_1     
-         4        923 33101   9166 10L  P4_1     
-         4        924 33101   9064 10R  P4_1     
-         4        925 33101   9161 10L  P4_1     
-         4        926 33101   9059 10R  P4_1     
-         4        927 33101   9156 10L  P4_1     
-         4        928 33101   9054 10R  P4_1     
-         4        929 33101   9151 10L  P4_1     
-         4        930 33101   9049 10R  P4_1     
-         4        931 33101   9146 10L  P4_1     
-         4        932 33101   9044 10R  P4_1     
-         4        933 33101   9141 10L  P4_1     
-         4        934 33101   9039 10R  P4_1     
-         4        935 33101   9136 10L  P4_1     
-         4        936 33101   9034 10R  P4_1     
-         4        937 33101   9131 10L  P4_1     
-         4        938 33101   9029 10R  P4_1     
-         4        939 33101   9126 10L  P4_1     
-         4        940 33101   9024 10R  P4_1     
-         4        941 33101   9899 10L  P6       
-         4        942 33101   9070 10R  P4_1     
-         4        943 33101   9167 10L  P4_1     
-         4        944 33101   9065 10R  P4_1     
-         4        945 33101   9162 10L  P4_1     
-         4        946 33101   9060 10R  P4_1     
-         4        947 33101   9157 10L  P4_1     
-         4        948 33101   9055 10R  P4_1     
-         4        949 33101   9152 10L  P4_1     
-         4        950 33101   9050 10R  P4_1     
-         4        951 33101   9147 10L  P4_1     
-         4        952 33101   9045 10R  P4_1     
-         4        953 33101   9142 10L  P4_1     
-         4        954 33101   9040 10R  P4_1     
-         4        955 33101   9137 10L  P4_1     
-         4        956 33101   9035 10R  P4_1     
-         4        957 33101   9132 10L  P4_1     
-         4        958 33101   9030 10R  P4_1     
-         4        959 33101   9127 10L  P4_1     
-         4        960 33101   9025 10R  P4_1     
-         4        961 33101   9900 10L  P6       
-         4        962 33101   9071 10R  P4_1     
-         4        963 33101   9168 10L  P4_1     
-         4        964 33101   9066 10R  P4_1     
-         4        965 33101   9163 10L  P4_1     
-         4        966 33101   9061 10R  P4_1     
-         4        967 33101   9158 10L  P4_1     
-         4        968 33101   9056 10R  P4_1     
-         4        969 33101   9153 10L  P4_1     
-         4        970 33101   9051 10R  P4_1     
-         4        971 33101   9148 10L  P4_1     
-         4        972 33101   9046 10R  P4_1     
-         4        973 33101   9143 10L  P4_1     
-         4        974 33101   9041 10R  P4_1     
-         4        975 33101   9138 10L  P4_1     
-         4        976 33101   9036 10R  P4_1     
-         4        977 33101   9133 10L  P4_1     
-         4        978 33101   9031 10R  P4_1     
-         4        979 33101   9128 10L  P4_1     
-         4        980 33101   9026 10R  P4_1     
-         4        981 33101   9886 10L  P6       
-         4        982 33101   9072 10R  P4_1     
-         4        983 33101   9169 10L  P4_1     
-         4        984 33101   9067 10R  P4_1     
-         4        985 33101   9164 10L  P4_1     
-         4        986 33101   9062 10R  P4_1     
-         4        987 33101   9159 10L  P4_1     
-         4        988 33101   9057 10R  P4_1     
-         4        989 33101   9154 10L  P4_1     
-         4        990 33101   9052 10R  P4_1     
-         4        991 33101   9149 10L  P4_1     
-         4        992 33101   9047 10R  P4_1     
-         4        993 33101   9144 10L  P4_1     
-         4        994 33101   9042 10R  P4_1     
-         4        995 33101   9139 10L  P4_1     
-         4        996 33101   9037 10R  P4_1     
-         4        997 33101   9134 10L  P4_1     
-         4        998 33101   9032 10R  P4_1     
-         4        999 33101   9129 10L  P4_1     
-         4       1000 33101   9027 10R  P4_1     
-         4       1001 33101   9390 11L  P4_1     
-         4       1002 33101  14813 11R  S2       
-         4       1003 33101   9395 11L  P4_1     
-         4       1004 33101  14808 11R  S2       
-         4       1005 33101   9380 11L  P4_1     
-         4       1006 33101   9277 11R  P4_1     
-         4       1007 33101   9385 11L  P4_1     
-         4       1008 33101   9282 11R  P4_1     
-         4       1009 33101   9365 11L  P4_1     
-         4       1010 33101   9260 11R  P4_1     
-         4       1011 33101   9358 11L  P4_1     
-         4       1012 33101   9255 11R  P4_1     
-         4       1013 33101   9343 11L  P4_1     
-         4       1014 33101   9240 11R  P4_1     
-         4       1015 33101   9337 11L  P4_1     
-         4       1016 33101   9235 11R  P4_1     
-         4       1017 33101   9322 11L  P4_1     
-         4       1018 33101   9230 11R  P4_1     
-         4       1019 33101   9317 11L  P4_1     
-         4       1020 33101   9225 11R  P4_1     
-         4       1021 33101   9391 11L  P4_1     
-         4       1022 33101  14814 11R  S2       
-         4       1023 33101   9396 11L  P4_1     
-         4       1024 33101  14809 11R  S2       
-         4       1025 33101   9381 11L  P4_1     
-         4       1026 33101   9278 11R  P4_1     
-         4       1027 33101   9386 11L  P4_1     
-         4       1028 33101   9283 11R  P4_1     
-         4       1029 33101   9366 11L  P4_1     
-         4       1030 33101   9261 11R  P4_1     
-         4       1031 33101   9359 11L  P4_1     
-         4       1032 33101   9256 11R  P4_1     
-         4       1033 33101   9344 11L  P4_1     
-         4       1034 33101   9241 11R  P4_1     
-         4       1035 33101   9338 11L  P4_1     
-         4       1036 33101   9236 11R  P4_1     
-         4       1037 33101   9323 11L  P4_1     
-         4       1038 33101   9231 11R  P4_1     
-         4       1039 33101   9318 11L  P4_1     
-         4       1040 33101   9226 11R  P4_1     
-         4       1041 33101   9392 11L  P4_1     
-         4       1042 33101  14815 11R  S2       
-         4       1043 33101   9397 11L  P4_1     
-         4       1044 33101  14810 11R  S2       
-         4       1045 33101   9382 11L  P4_1     
-         4       1046 33101   9279 11R  P4_1     
-         4       1047 33101   9387 11L  P4_1     
-         4       1048 33101   9284 11R  P4_1     
-         4       1049 33101   9367 11L  P4_1     
-         4       1050 33101   9262 11R  P4_1     
-         4       1051 33101   9360 11L  P4_1     
-         4       1052 33101   9257 11R  P4_1     
-         4       1053 33101   9345 11L  P4_1     
-         4       1054 33101   9242 11R  P4_1     
-         4       1055 33101   9340 11L  P4_1     
-         4       1056 33101   9237 11R  P4_1     
-         4       1057 33101   9324 11L  P4_1     
-         4       1058 33101   9232 11R  P4_1     
-         4       1059 33101   9319 11L  P4_1     
-         4       1060 33101   9227 11R  P4_1     
-         4       1061 33101   9393 11L  P4_1     
-         4       1062 33101  14816 11R  S2       
-         4       1063 33101   9398 11L  P4_1     
-         4       1064 33101  14811 11R  S2       
-         4       1065 33101   9383 11L  P4_1     
-         4       1066 33101   9280 11R  P4_1     
-         4       1067 33101   9388 11L  P4_1     
-         4       1068 33101   9286 11R  P4_1     
-         4       1069 33101   9368 11L  P4_1     
-         4       1070 33101   9263 11R  P4_1     
-         4       1071 33101   9361 11L  P4_1     
-         4       1072 33101   9258 11R  P4_1     
-         4       1073 33101   9346 11L  P4_1     
-         4       1074 33101   9243 11R  P4_1     
-         4       1075 33101   9341 11L  P4_1     
-         4       1076 33101   9238 11R  P4_1     
-         4       1077 33101   9325 11L  P4_1     
-         4       1078 33101   9233 11R  P4_1     
-         4       1079 33101   9320 11L  P4_1     
-         4       1080 33101   9228 11R  P4_1     
-         4       1081 33101   9394 11L  P4_1     
-         4       1082 33101  14817 11R  S2       
-         4       1083 33101   9399 11L  P4_1     
-         4       1084 33101  14812 11R  S2       
-         4       1085 33101   9384 11L  P4_1     
-         4       1086 33101   9281 11R  P4_1     
-         4       1087 33101   9389 11L  P4_1     
-         4       1088 33101   9287 11R  P4_1     
-         4       1089 33101   9369 11L  P4_1     
-         4       1090 33101   9265 11R  P4_1     
-         4       1091 33101   9364 11L  P4_1     
-         4       1092 33101   9259 11R  P4_1     
-         4       1093 33101   9347 11L  P4_1     
-         4       1094 33101   9244 11R  P4_1     
-         4       1095 33101   9342 11L  P4_1     
-         4       1096 33101   9239 11R  P4_1     
-         4       1097 33101   9326 11L  P4_1     
-         4       1098 33101   9234 11R  P4_1     
-         4       1099 33101   9321 11L  P4_1     
-         4       1100 33101   9229 11R  P4_1     
-         4       1101 33101  14962 12L  S2       
-         4       1102 33101  15096 12R  S2       
-         4       1103 33101   1999 12L  8        
-         4       1104 33101  15091 12R  S2       
-         4       1105 33101  11961 12L  S1       
-         4       1106 33101   4300 12R  12       
-         4       1107 33101  11991 12L  S1       
-         4       1108 33101  11911 12R  S1       
-         4       1109 33101  11985 12L  S1       
-         4       1110 33101  11944 12R  S1       
-         4       1111 33101  11978 12L  S1       
-         4       1112 33101  11938 12R  S1       
-         4       1113 33101  11971 12L  S1       
-         4       1114 33101  11932 12R  S1       
-         4       1115 33101  11965 12L  S1       
-         4       1116 33101  11926 12R  S1       
-         4       1117 33101  11957 12L  S1       
-         4       1118 33101  11921 12R  S1       
-         4       1119 33101  11952 12L  S1       
-         4       1120 33101  11916 12R  S1       
-         4       1121 33101  14963 12L  S2       
-         4       1122 33101  15097 12R  S2       
-         4       1123 33101   2035 12L  8        
-         4       1124 33101  15092 12R  S2       
-         4       1125 33101  11984 12L  S1       
-         4       1126 33101  11901 12R  S1       
-         4       1127 33101  11992 12L  S1       
-         4       1128 33101  11912 12R  S1       
-         4       1129 33101  11987 12L  S1       
-         4       1130 33101  11945 12R  S1       
-         4       1131 33101  11979 12L  S1       
-         4       1132 33101  11939 12R  S1       
-         4       1133 33101  11973 12L  S1       
-         4       1134 33101  11933 12R  S1       
-         4       1135 33101  11966 12L  S1       
-         4       1136 33101  11927 12R  S1       
-         4       1137 33101  11958 12L  S1       
-         4       1138 33101  11922 12R  S1       
-         4       1139 33101  11953 12L  S1       
-         4       1140 33101  11917 12R  S1       
-         4       1141 33101  14969 12L  S2       
-         4       1142 33101  15102 12R  S2       
-         4       1143 33101   4388 12L  12       
-         4       1144 33101  15093 12R  S2       
-         4       1145 33101  11994 12L  S1       
-         4       1146 33101  11902 12R  S1       
-         4       1147 33101  11993 12L  S1       
-         4       1148 33101  11913 12R  S1       
-         4       1149 33101  11988 12L  S1       
-         4       1150 33101  11946 12R  S1       
-         4       1151 33101  11980 12L  S1       
-         4       1152 33101  11940 12R  S1       
-         4       1153 33101  11974 12L  S1       
-         4       1154 33101  11934 12R  S1       
-         4       1155 33101  11967 12L  S1       
-         4       1156 33101  11929 12R  S1       
-         4       1157 33101  11959 12L  S1       
-         4       1158 33101  11923 12R  S1       
-         4       1159 33101  11954 12L  S1       
-         4       1160 33101  11918 12R  S1       
-         4       1161 33101  14970 12L  S2       
-         4       1162 33101   4301 12R  12       
-         4       1163 33101   4389 12L  12       
-         4       1164 33101  15094 12R  S2       
-         4       1165 33101  11996 12L  S1       
-         4       1166 33101  11903 12R  S1       
-         4       1167 33101  11995 12L  S1       
-         4       1168 33101  11914 12R  S1       
-         4       1169 33101  11989 12L  S1       
-         4       1170 33101  11947 12R  S1       
-         4       1171 33101  11982 12L  S1       
-         4       1172 33101  11941 12R  S1       
-         4       1173 33101  11975 12L  S1       
-         4       1174 33101  11936 12R  S1       
-         4       1175 33101  11969 12L  S1       
-         4       1176 33101  11930 12R  S1       
-         4       1177 33101  11963 12L  S1       
-         4       1178 33101  11924 12R  S1       
-         4       1179 33101  11955 12L  S1       
-         4       1180 33101  11919 12R  S1       
-         4       1181 33101  11960 12L  S1       
-         4       1182 33101   4302 12R  12       
-         4       1183 33101  11951 12L  S1       
-         4       1184 33101  15095 12R  S2       
-         4       1185 33101  12000 12L  S1       
-         4       1186 33101  11904 12R  S1       
-         4       1187 33101  11999 12L  S1       
-         4       1188 33101  11915 12R  S1       
-         4       1189 33101  11990 12L  S1       
-         4       1190 33101  11950 12R  S1       
-         4       1191 33101  11983 12L  S1       
-         4       1192 33101  11942 12R  S1       
-         4       1193 33101  11976 12L  S1       
-         4       1194 33101  11937 12R  S1       
-         4       1195 33101  11970 12L  S1       
-         4       1196 33101  11931 12R  S1       
-         4       1197 33101  11964 12L  S1       
-         4       1198 33101  11925 12R  S1       
-         4       1199 33101  11956 12L  S1       
-         4       1200 33101  11920 12R  S1       
-         4       1201 33101   2093 13L  8        
-         4       1202 33101  15311 13R  S2       
-         4       1203 33101  12123 13L  S1       
-         4       1204 33101  12086 13R  S1       
-         4       1205 33101  12122 13L  S1       
-         4       1206 33101  12080 13R  S1       
-         4       1207 33101  12179 13L  S1       
-         4       1208 33101  12157 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1209 33101  12124 13L  S1       
-         4       1210 33101  12151 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1211 33101  12060 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1212 33101  12167 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1213 33101  12055 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1214 33101  12162 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1215 33101  12051 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1216 33101  12011 13R  S1       
-         4       1217 33101  12070 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1218 33101  12095 13R  S1       
-         4       1219 33101  12065 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1220 33101  12090 13R  S1       
-         4       1221 33101  12198 13L  S1       
-         4       1222 33101  15312 13R  S2       
-         4       1223 33101  12052 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1224 33101  12087 13R  S1       
-         4       1225 33101  12148 13L  S1       
-         4       1226 33101  12081 13R  S1       
-         4       1227 33101  12181 13L  S1       
-         4       1228 33101  12158 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1229 33101  12130 13L  S1       
-         4       1230 33101  12152 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1231 33101  12061 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1232 33101  12168 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1233 33101  12056 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1234 33101  12163 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1235 33101  12114 13L  S1       
-         4       1236 33101  12033 13R  S1       
-         4       1237 33101  12071 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1238 33101  12096 13R  S1       
-         4       1239 33101  12066 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1240 33101   7123 13R  P1       
-         4       1241 33101   4463 13L  13       
-         4       1242 33101  15313 13R  S2       
-         4       1243 33101  12073 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1244 33101  12088 13R  S1       
-         4       1245 33101  12190 13L  S1       
-         4       1246 33101  12082 13R  S1       
-         4       1247 33101  12188 13L  S1       
-         4       1248 33101  12159 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1249 33101  12135 13L  S1       
-         4       1250 33101  12154 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1251 33101  12062 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1252 33101  12169 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1253 33101  12057 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1254 33101  12164 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1255 33101  12116 13L  S1       
-         4       1256 33101  12171 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1257 33101  12072 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1258 33101  12097 13R  S1       
-         4       1259 33101  12067 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1260 33101  12092 13R  S1       
-         4       1261 33101   7189 13L  P1       
-         4       1262 33101  15314 13R  S2       
-         4       1263 33101  12074 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1264 33101  12089 13R  S1       
-         4       1265 33101  12191 13L  S1       
-         4       1266 33101  12083 13R  S1       
-         4       1267 33101  12189 13L  S1       
-         4       1268 33101  12160 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1269 33101  12140 13L  S1       
-         4       1270 33101  12153 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1271 33101  12063 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1272 33101  12172 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1273 33101  12058 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1274 33101  12165 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1275 33101  12120 13L  S1       
-         4       1276 33101  12174 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1277 33101  12075 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1278 33101  12098 13R  S1       
-         4       1279 33101  12068 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1280 33101  12093 13R  S1       
-         4       1281 33101   7194 13L  P1       
-         4       1282 33101  15315 13R  S2       
-         4       1283 33101  12107 13L  S1       
-         4       1284 33101  12091 13R  S1       
-         4       1285 33101  12193 13L  S1       
-         4       1286 33101  12085 13R  S1       
-         4       1287 33101  12196 13L  S1       
-         4       1288 33101  12161 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1289 33101  12141 13L  S1       
-         4       1290 33101  12155 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1291 33101  12064 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1292 33101  12173 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1293 33101  12059 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1294 33101  12166 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1295 33101  12146 13L  S1       
-         4       1296 33101  12175 13R  S1(CX_Reenregistre_Inversion_L/R)
-         4       1297 33101  12110 13L  S1       
-         4       1298 33101  12100 13R  S1       
-         4       1299 33101  12069 13L  S1(CX_Reenregistre_Inversion_L/R)
-         4       1300 33101  12094 13R  S1       
-         4       1301 33101  12364 14L  S1       
-         4       1302 33101  12269 14R  S1       
-         4       1303 33101  12371 14L  S1       
-         4       1304 33101  12277 14R  S1       
-         4       1305 33101  12386 14L  S1       
-         4       1306 33101  12283 14R  S1       
-         4       1307 33101  12394 14L  S1       
-         4       1308 33101  12288 14R  S1       
-         4       1309 33101  12375 14L  S1       
-         4       1310 33101  12296 14R  S1       
-         4       1311 33101  12310 14L  S1       
-         4       1312 33101  12203 14R  S1       
-         4       1313 33101  12325 14L  S1       
-         4       1314 33101  12222 14R  S1       
-         4       1315 33101  12348 14L  S1       
-         4       1316 33101  12232 14R  S1       
-         4       1317 33101  12359 14L  S1       
-         4       1318 33101  12247 14R  S1       
-         4       1319 33101  12383 14L  S1       
-         4       1320 33101  12266 14R  S1       
-         4       1321 33101  12366 14L  S1       
-         4       1322 33101  12270 14R  S1       
-         4       1323 33101  12372 14L  S1       
-         4       1324 33101  12278 14R  S1       
-         4       1325 33101  12387 14L  S1       
-         4       1326 33101  12284 14R  S1       
-         4       1327 33101  12396 14L  S1       
-         4       1328 33101  12289 14R  S1       
-         4       1329 33101  12378 14L  S1       
-         4       1330 33101  12297 14R  S1       
-         4       1331 33101  12311 14L  S1       
-         4       1332 33101  12208 14R  S1       
-         4       1333 33101  12360 14L  S1       
-         4       1334 33101  12223 14R  S1       
-         4       1335 33101  12353 14L  S1       
-         4       1336 33101  12234 14R  S1       
-         4       1337 33101  12361 14L  S1       
-         4       1338 33101  12250 14R  S1       
-         4       1339 33101  12385 14L  S1       
-         4       1340 33101  12268 14R  S1       
-         4       1341 33101  12367 14L  S1       
-         4       1342 33101  12272 14R  S1       
-         4       1343 33101  12373 14L  S1       
-         4       1344 33101  12279 14R  S1       
-         4       1345 33101  12389 14L  S1       
-         4       1346 33101  12285 14R  S1       
-         4       1347 33101  12397 14L  S1       
-         4       1348 33101  12290 14R  S1       
-         4       1349 33101  12376 14L  S1       
-         4       1350 33101  12298 14R  S1       
-         4       1351 33101  12313 14L  S1       
-         4       1352 33101  12210 14R  S1       
-         4       1353 33101  12334 14L  S1       
-         4       1354 33101  12228 14R  S1       
-         4       1355 33101  12354 14L  S1       
-         4       1356 33101  12235 14R  S1       
-         4       1357 33101  12363 14L  S1       
-         4       1358 33101  12257 14R  S1       
-         4       1359 33101  12391 14L  S1       
-         4       1360 33101  12271 14R  S1       
-         4       1361 33101  12369 14L  S1       
-         4       1362 33101  12273 14R  S1       
-         4       1363 33101  12377 14L  S1       
-         4       1364 33101  12281 14R  S1       
-         4       1365 33101  12390 14L  S1       
-         4       1366 33101  12286 14R  S1       
-         4       1367 33101  12399 14L  S1       
-         4       1368 33101  12292 14R  S1       
-         4       1369 33101  12381 14L  S1       
-         4       1370 33101  12299 14R  S1       
-         4       1371 33101  12319 14L  S1       
-         4       1372 33101  12217 14R  S1       
-         4       1373 33101  12336 14L  S1       
-         4       1374 33101  12229 14R  S1       
-         4       1375 33101  12357 14L  S1       
-         4       1376 33101  12240 14R  S1       
-         4       1377 33101  12368 14L  S1       
-         4       1378 33101  12258 14R  S1       
-         4       1379 33101  12395 14L  S1       
-         4       1380 33101  12275 14R  S1       
-         4       1381 33101  12370 14L  S1       
-         4       1382 33101  12274 14R  S1       
-         4       1383 33101  12380 14L  S1       
-         4       1384 33101  12282 14R  S1       
-         4       1385 33101  12392 14L  S1       
-         4       1386 33101  12287 14R  S1       
-         4       1387 33101  12400 14L  S1       
-         4       1388 33101  12293 14R  S1       
-         4       1389 33101  12384 14L  S1       
-         4       1390 33101  12202 14R  S1       
-         4       1391 33101  12322 14L  S1       
-         4       1392 33101  12220 14R  S1       
-         4       1393 33101  12339 14L  S1       
-         4       1394 33101  12230 14R  S1       
-         4       1395 33101  12358 14L  S1       
-         4       1396 33101  12242 14R  S1       
-         4       1397 33101  12374 14L  S1       
-         4       1398 33101  12264 14R  S1       
-         4       1399 33101  12398 14L  S1       
-         4       1400 33101  12276 14R  S1       
-         4       1401 33101  10145 15L  P5_1     
-         4       1402 33101  10046 15R  P5_1     
-         4       1403 33101  10150 15L  P5_1     
-         4       1404 33101  10051 15R  P5_1     
-         4       1405 33101  10155 15L  P5_1     
-         4       1406 33101  10056 15R  P5_1     
-         4       1407 33101  10160 15L  P5_1     
-         4       1408 33101  10061 15R  P5_1     
-         4       1409 33101  10165 15L  P5_1     
-         4       1410 33101  10066 15R  P5_1     
-         4       1411 33101  10170 15L  P5_1     
-         4       1412 33101  10071 15R  P5_1     
-         4       1413 33101  10175 15L  P5_1     
-         4       1414 33101  10076 15R  P5_1     
-         4       1415 33101  10180 15L  P5_1     
-         4       1416 33101  10081 15R  P5_1     
-         4       1417 33101  10185 15L  P5_1     
-         4       1418 33101  10086 15R  P5_1     
-         4       1419 33101  10190 15L  P5_1     
-         4       1420 33101  10091 15R  P5_1     
-         4       1421 33101  10146 15L  P5_1     
-         4       1422 33101  10047 15R  P5_1     
-         4       1423 33101  10151 15L  P5_1     
-         4       1424 33101  10052 15R  P5_1     
-         4       1425 33101  10156 15L  P5_1     
-         4       1426 33101  10057 15R  P5_1     
-         4       1427 33101  10161 15L  P5_1     
-         4       1428 33101  10062 15R  P5_1     
-         4       1429 33101  10166 15L  P5_1     
-         4       1430 33101  10067 15R  P5_1     
-         4       1431 33101  10171 15L  P5_1     
-         4       1432 33101  10072 15R  P5_1     
-         4       1433 33101  10176 15L  P5_1     
-         4       1434 33101  10077 15R  P5_1     
-         4       1435 33101  10181 15L  P5_1     
-         4       1436 33101  10082 15R  P5_1     
-         4       1437 33101  10186 15L  P5_1     
-         4       1438 33101  10087 15R  P5_1     
-         4       1439 33101  10191 15L  P5_1     
-         4       1440 33101  10092 15R  P5_1     
-         4       1441 33101  10147 15L  P5_1     
-         4       1442 33101  10048 15R  P5_1     
-         4       1443 33101  10152 15L  P5_1     
-         4       1444 33101  10053 15R  P5_1     
-         4       1445 33101  10157 15L  P5_1     
-         4       1446 33101  10058 15R  P5_1     
-         4       1447 33101  10162 15L  P5_1     
-         4       1448 33101  10063 15R  P5_1     
-         4       1449 33101  10167 15L  P5_1     
-         4       1450 33101  10068 15R  P5_1     
-         4       1451 33101  10172 15L  P5_1     
-         4       1452 33101  10073 15R  P5_1     
-         4       1453 33101  10177 15L  P5_1     
-         4       1454 33101  10078 15R  P5_1     
-         4       1455 33101  10182 15L  P5_1     
-         4       1456 33101  10083 15R  P5_1     
-         4       1457 33101  10187 15L  P5_1     
-         4       1458 33101  10088 15R  P5_1     
-         4       1459 33101  10192 15L  P5_1     
-         4       1460 33101  10093 15R  P5_1     
-         4       1461 33101  10148 15L  P5_1     
-         4       1462 33101  10049 15R  P5_1     
-         4       1463 33101  10153 15L  P5_1     
-         4       1464 33101  10054 15R  P5_1     
-         4       1465 33101  10158 15L  P5_1     
-         4       1466 33101  10059 15R  P5_1     
-         4       1467 33101  10163 15L  P5_1     
-         4       1468 33101  10064 15R  P5_1     
-         4       1469 33101  10168 15L  P5_1     
-         4       1470 33101  10069 15R  P5_1     
-         4       1471 33101  10173 15L  P5_1     
-         4       1472 33101  10074 15R  P5_1     
-         4       1473 33101  10178 15L  P5_1     
-         4       1474 33101  10079 15R  P5_1     
-         4       1475 33101  10183 15L  P5_1     
-         4       1476 33101  10084 15R  P5_1     
-         4       1477 33101  10188 15L  P5_1     
-         4       1478 33101  10089 15R  P5_1     
-         4       1479 33101  10193 15L  P5_1     
-         4       1480 33101  10094 15R  P5_1     
-         4       1481 33101  10149 15L  P5_1     
-         4       1482 33101  10050 15R  P5_1     
-         4       1483 33101  10154 15L  P5_1     
-         4       1484 33101  10055 15R  P5_1     
-         4       1485 33101  10159 15L  P5_1     
-         4       1486 33101  10060 15R  P5_1     
-         4       1487 33101  10164 15L  P5_1     
-         4       1488 33101  10065 15R  P5_1     
-         4       1489 33101  10169 15L  P5_1     
-         4       1490 33101  10070 15R  P5_1     
-         4       1491 33101  10174 15L  P5_1     
-         4       1492 33101  10075 15R  P5_1     
-         4       1493 33101  10179 15L  P5_1     
-         4       1494 33101  10080 15R  P5_1     
-         4       1495 33101  10184 15L  P5_1     
-         4       1496 33101  10085 15R  P5_1     
-         4       1497 33101  10189 15L  P5_1     
-         4       1498 33101  10090 15R  P5_1     
-         4       1499 33101  10194 15L  P5_1     
-         4       1500 33101  10095 15R  P5_1     
-         4       1501 33101  12568 16L  S1       
-         4       1502 33101  12461 16R  S1       
-         4       1503 33101  12577 16L  S1       
-         4       1504 33101  12466 16R  S1       
-         4       1505 33101  12590 16L  S1       
-         4       1506 33101  12474 16R  S1       
-         4       1507 33101  12597 16L  S1       
-         4       1508 33101  12480 16R  S1       
-         4       1509 33101  12514 16L  S1       
-         4       1510 33101  12487 16R  S1       
-         4       1511 33101  12525 16L  S1       
-         4       1512 33101  12495 16R  S1       
-         4       1513 33101  12555 16L  S1       
-         4       1514 33101   4907 16R  14       
-         4       1515 33101  12574 16L  S1       
-         4       1516 33101  12430 16R  S1       
-         4       1517 33101  12589 16L  S1       
-         4       1518 33101  12449 16R  S1       
-         4       1519 33101  12565 16L  S1       
-         4       1520 33101  12482 16R  S1       
-         4       1521 33101  12571 16L  S1       
-         4       1522 33101  12462 16R  S1       
-         4       1523 33101  12584 16L  S1       
-         4       1524 33101  12467 16R  S1       
-         4       1525 33101  12591 16L  S1       
-         4       1526 33101  12475 16R  S1       
-         4       1527 33101  12598 16L  S1       
-         4       1528 33101  12481 16R  S1       
-         4       1529 33101  12515 16L  S1       
-         4       1530 33101  12491 16R  S1       
-         4       1531 33101  12530 16L  S1       
-         4       1532 33101  12497 16R  S1       
-         4       1533 33101  12559 16L  S1       
-         4       1534 33101   4927 16R  14       
-         4       1535 33101  12578 16L  S1       
-         4       1536 33101  12431 16R  S1       
-         4       1537 33101  12594 16L  S1       
-         4       1538 33101  12453 16R  S1       
-         4       1539 33101  12580 16L  S1       
-         4       1540 33101  12485 16R  S1       
-         4       1541 33101  12573 16L  S1       
-         4       1542 33101  12463 16R  S1       
-         4       1543 33101  12585 16L  S1       
-         4       1544 33101  12468 16R  S1       
-         4       1545 33101  12592 16L  S1       
-         4       1546 33101  12476 16R  S1       
-         4       1547 33101  12501 16L  S1       
-         4       1548 33101  12483 16R  S1       
-         4       1549 33101  12516 16L  S1       
-         4       1550 33101  12492 16R  S1       
-         4       1551 33101  12534 16L  S1       
-         4       1552 33101  12498 16R  S1       
-         4       1553 33101  12569 16L  S1       
-         4       1554 33101  12401 16R  S1       
-         4       1555 33101  12582 16L  S1       
-         4       1556 33101  12435 16R  S1       
-         4       1557 33101  12595 16L  S1       
-         4       1558 33101  12469 16R  S1       
-         4       1559 33101  12524 16L  S1       
-         4       1560 33101  12488 16R  S1       
-         4       1561 33101  12575 16L  S1       
-         4       1562 33101  12464 16R  S1       
-         4       1563 33101  12586 16L  S1       
-         4       1564 33101  12470 16R  S1       
-         4       1565 33101  12593 16L  S1       
-         4       1566 33101  12477 16R  S1       
-         4       1567 33101  12512 16L  S1       
-         4       1568 33101  12484 16R  S1       
-         4       1569 33101  12517 16L  S1       
-         4       1570 33101  12493 16R  S1       
-         4       1571 33101  12548 16L  S1       
-         4       1572 33101  12499 16R  S1       
-         4       1573 33101  12570 16L  S1       
-         4       1574 33101  12412 16R  S1       
-         4       1575 33101  12583 16L  S1       
-         4       1576 33101  12439 16R  S1       
-         4       1577 33101  12599 16L  S1       
-         4       1578 33101  12472 16R  S1       
-         4       1579 33101  12581 16L  S1       
-         4       1580 33101  12489 16R  S1       
-         4       1581 33101  12576 16L  S1       
-         4       1582 33101  12465 16R  S1       
-         4       1583 33101  12588 16L  S1       
-         4       1584 33101  12471 16R  S1       
-         4       1585 33101  12596 16L  S1       
-         4       1586 33101  12478 16R  S1       
-         4       1587 33101  12513 16L  S1       
-         4       1588 33101  12486 16R  S1       
-         4       1589 33101  12519 16L  S1       
-         4       1590 33101  12494 16R  S1       
-         4       1591 33101  12557 16L  S1       
-         4       1592 33101  12500 16R  S1       
-         4       1593 33101  12572 16L  S1       
-         4       1594 33101  12428 16R  S1       
-         4       1595 33101  12587 16L  S1       
-         4       1596 33101  12441 16R  S1       
-         4       1597 33101  12600 16L  S1       
-         4       1598 33101  12479 16R  S1       
-         4       1599 33101  12579 16L  S1       
-         4       1600 33101  12490 16R  S1       
-         4       1601 33101  12774 17L  S1       
-         4       1602 33101  12648 17R  S1       
-         4       1603 33101  12706 17L  S1       
-         4       1604 33101  12606 17R  S1       
-         4       1605 33101  12712 17L  S1       
-         4       1606 33101  12611 17R  S1       
-         4       1607 33101  12720 17L  S1       
-         4       1608 33101  12616 17R  S1       
-         4       1609 33101  12730 17L  S1       
-         4       1610 33101  12621 17R  S1       
-         4       1611 33101  12737 17L  S1       
-         4       1612 33101  12626 17R  S1       
-         4       1613 33101  12751 17L  S1       
-         4       1614 33101  12632 17R  S1       
-         4       1615 33101  12757 17L  S1       
-         4       1616 33101  12637 17R  S1       
-         4       1617 33101  12764 17L  S1       
-         4       1618 33101  12642 17R  S1       
-         4       1619 33101   5267 17L  14       
-         4       1620 33101  12601 17R  S1       
-         4       1621 33101  12778 17L  S1       
-         4       1622 33101  12649 17R  S1       
-         4       1623 33101  12708 17L  S1       
-         4       1624 33101  12607 17R  S1       
-         4       1625 33101  12713 17L  S1       
-         4       1626 33101  12612 17R  S1       
-         4       1627 33101  12722 17L  S1       
-         4       1628 33101  12617 17R  S1       
-         4       1629 33101  12731 17L  S1       
-         4       1630 33101  12622 17R  S1       
-         4       1631 33101  12738 17L  S1       
-         4       1632 33101  12627 17R  S1       
-         4       1633 33101  12753 17L  S1       
-         4       1634 33101  12633 17R  S1       
-         4       1635 33101  12758 17L  S1       
-         4       1636 33101  12638 17R  S1       
-         4       1637 33101  12765 17L  S1       
-         4       1638 33101  12643 17R  S1       
-         4       1639 33101  12702 17L  S1       
-         4       1640 33101  12602 17R  S1       
-         4       1641 33101  12781 17L  S1       
-         4       1642 33101  12650 17R  S1       
-         4       1643 33101  12709 17L  S1       
-         4       1644 33101  12608 17R  S1       
-         4       1645 33101  12714 17L  S1       
-         4       1646 33101  12613 17R  S1       
-         4       1647 33101  12725 17L  S1       
-         4       1648 33101  12618 17R  S1       
-         4       1649 33101  12732 17L  S1       
-         4       1650 33101  12623 17R  S1       
-         4       1651 33101  12740 17L  S1       
-         4       1652 33101  12628 17R  S1       
-         4       1653 33101  12754 17L  S1       
-         4       1654 33101  12634 17R  S1       
-         4       1655 33101  12759 17L  S1       
-         4       1656 33101  12639 17R  S1       
-         4       1657 33101  12768 17L  S1       
-         4       1658 33101  12644 17R  S1       
-         4       1659 33101  12703 17L  S1       
-         4       1660 33101  12603 17R  S1       
-         4       1661 33101  12782 17L  S1       
-         4       1662 33101  12614 17R  S1       
-         4       1663 33101  12710 17L  S1       
-         4       1664 33101  12609 17R  S1       
-         4       1665 33101  12715 17L  S1       
-         4       1666 33101  12651 17R  S1       
-         4       1667 33101  12727 17L  S1       
-         4       1668 33101  12619 17R  S1       
-         4       1669 33101  12733 17L  S1       
-         4       1670 33101  12624 17R  S1       
-         4       1671 33101  12744 17L  S1       
-         4       1672 33101  12629 17R  S1       
-         4       1673 33101  12755 17L  S1       
-         4       1674 33101  12635 17R  S1       
-         4       1675 33101  12760 17L  S1       
-         4       1676 33101  12640 17R  S1       
-         4       1677 33101  12771 17L  S1       
-         4       1678 33101  12645 17R  S1       
-         4       1679 33101  12704 17L  S1       
-         4       1680 33101  12604 17R  S1       
-         4       1681 33101  12785 17L  S1       
-         4       1682 33101  12652 17R  S1       
-         4       1683 33101  12711 17L  S1       
-         4       1684 33101  12610 17R  S1       
-         4       1685 33101  12717 17L  S1       
-         4       1686 33101  12615 17R  S1       
-         4       1687 33101  12728 17L  S1       
-         4       1688 33101  12620 17R  S1       
-         4       1689 33101  12735 17L  S1       
-         4       1690 33101  12625 17R  S1       
-         4       1691 33101  12748 17L  S1       
-         4       1692 33101  12630 17R  S1       
-         4       1693 33101  12756 17L  S1       
-         4       1694 33101  12636 17R  S1       
-         4       1695 33101  12761 17L  S1       
-         4       1696 33101  12641 17R  S1       
-         4       1697 33101  12773 17L  S1       
-         4       1698 33101  12647 17R  S1       
-         4       1699 33101  12705 17L  S1       
-         4       1700 33101  12605 17R  S1       
-         5          1 33101  10379 1L   S1       
-         5          2 33101  10253 1R   S1       
-         5          3 33101  10387 1L   S1       
-         5          4 33101  10254 1R   S1       
-         5          5 33101  10389 1L   S1       
-         5          6 33101  10255 1R   S1       
-         5          7 33101  10390 1L   S1       
-         5          8 33101  10256 1R   S1       
-         5          9 33101  10391 1L   S1       
-         5         10 33101  10258 1R   S1       
-         5         11 33101  10394 1L   S1       
-         5         12 33101  10259 1R   S1       
-         5         13 33101  10345 1L   S1       
-         5         14 33101  10229 1R   S1       
-         5         15 33101  10353 1L   S1       
-         5         16 33101  10235 1R   S1       
-         5         17 33101  10363 1L   S1       
-         5         18 33101  10243 1R   S1       
-         5         19 33101  10372 1L   S1       
-         5         20 33101  10248 1R   S1       
-         5         21 33101   8176 1L   P3       
-         5         22 33101   8100 1R   P3       
-         5         23 33101  10307 1L   S1       
-         5         24 33101  10203 1R   S1       
-         5         25 33101  10313 1L   S1       
-         5         26 33101  10208 1R   S1       
-         5         27 33101  10320 1L   S1       
-         5         28 33101  10213 1R   S1       
-         5         29 33101  10327 1L   S1       
-         5         30 33101  10218 1R   S1       
-         5         31 33101  10336 1L   S1       
-         5         32 33101  10223 1R   S1       
-         5         33 33101  10346 1L   S1       
-         5         34 33101  10230 1R   S1       
-         5         35 33101  10354 1L   S1       
-         5         36 33101  10237 1R   S1       
-         5         37 33101  10367 1L   S1       
-         5         38 33101  10244 1R   S1       
-         5         39 33101  10373 1L   S1       
-         5         40 33101  10249 1R   S1       
-         5         41 33101  10301 1L   S1       
-         5         42 33101   8026 1R   P3       
-         5         43 33101  10308 1L   S1       
-         5         44 33101  10204 1R   S1       
-         5         45 33101  10314 1L   S1       
-         5         46 33101  10209 1R   S1       
-         5         47 33101  10321 1L   S1       
-         5         48 33101  10214 1R   S1       
-         5         49 33101  10329 1L   S1       
-         5         50 33101  10219 1R   S1       
-         5         51 33101  10339 1L   S1       
-         5         52 33101  10225 1R   S1       
-         5         53 33101  10348 1L   S1       
-         5         54 33101  10231 1R   S1       
-         5         55 33101  10355 1L   S1       
-         5         56 33101  10238 1R   S1       
-         5         57 33101  10368 1L   S1       
-         5         58 33101  10245 1R   S1       
-         5         59 33101  10375 1L   S1       
-         5         60 33101  10250 1R   S1       
-         5         61 33101  10303 1L   S1       
-         5         62 33101   8037 1R   P3       
-         5         63 33101  10309 1L   S1       
-         5         64 33101  10205 1R   S1       
-         5         65 33101  10317 1L   S1       
-         5         66 33101  10210 1R   S1       
-         5         67 33101  10323 1L   S1       
-         5         68 33101  10215 1R   S1       
-         5         69 33101  10330 1L   S1       
-         5         70 33101  10220 1R   S1       
-         5         71 33101  10341 1L   S1       
-         5         72 33101  10226 1R   S1       
-         5         73 33101  10351 1L   S1       
-         5         74 33101  10232 1R   S1       
-         5         75 33101  10357 1L   S1       
-         5         76 33101  10239 1R   S1       
-         5         77 33101  10369 1L   S1       
-         5         78 33101  10246 1R   S1       
-         5         79 33101  10376 1L   S1       
-         5         80 33101  10251 1R   S1       
-         5         81 33101  10304 1L   S1       
-         5         82 33101  10201 1R   S1       
-         5         83 33101  10310 1L   S1       
-         5         84 33101  10206 1R   S1       
-         5         85 33101  10318 1L   S1       
-         5         86 33101  10211 1R   S1       
-         5         87 33101  10325 1L   S1       
-         5         88 33101  10216 1R   S1       
-         5         89 33101  10331 1L   S1       
-         5         90 33101  10221 1R   S1       
-         5         91 33101  10344 1L   S1       
-         5         92 33101  10228 1R   S1       
-         5         93 33101  10352 1L   S1       
-         5         94 33101  10234 1R   S1       
-         5         95 33101  10360 1L   S1       
-         5         96 33101  10241 1R   S1       
-         5         97 33101  10371 1L   S1       
-         5         98 33101  10247 1R   S1       
-         5         99 33101  10377 1L   S1       
-         5        100 33101  10252 1R   S1       
-         5        101 33101  10511 2L   S1       
-         5        102 33101   8297 2R   P3       
-         5        103 33101  10517 2L   S1       
-         5        104 33101  10402 2R   S1       
-         5        105 33101  10523 2L   S1       
-         5        106 33101  10407 2R   S1       
-         5        107 33101  10528 2L   S1       
-         5        108 33101  10412 2R   S1       
-         5        109 33101  10534 2L   S1       
-         5        110 33101  10417 2R   S1       
-         5        111 33101  10542 2L   S1       
-         5        112 33101  10422 2R   S1       
-         5        113 33101  10548 2L   S1       
-         5        114 33101  10429 2R   S1       
-         5        115 33101  10555 2L   S1       
-         5        116 33101  10434 2R   S1       
-         5        117 33101  10565 2L   S1       
-         5        118 33101  10441 2R   S1       
-         5        119 33101  10560 2L   S1       
-         5        120 33101  10447 2R   S1       
-         5        121 33101  10512 2L   S1       
-         5        122 33101   8298 2R   P3       
-         5        123 33101  10518 2L   S1       
-         5        124 33101  10403 2R   S1       
-         5        125 33101  10524 2L   S1       
-         5        126 33101  10408 2R   S1       
-         5        127 33101  10529 2L   S1       
-         5        128 33101  10413 2R   S1       
-         5        129 33101  10536 2L   S1       
-         5        130 33101  10418 2R   S1       
-         5        131 33101  10543 2L   S1       
-         5        132 33101  10424 2R   S1       
-         5        133 33101  10549 2L   S1       
-         5        134 33101  10430 2R   S1       
-         5        135 33101  10556 2L   S1       
-         5        136 33101  10435 2R   S1       
-         5        137 33101  10566 2L   S1       
-         5        138 33101  10442 2R   S1       
-         5        139 33101  10561 2L   S1       
-         5        140 33101  10448 2R   S1       
-         5        141 33101  10513 2L   S1       
-         5        142 33101   8299 2R   P3       
-         5        143 33101  10519 2L   S1       
-         5        144 33101  10404 2R   S1       
-         5        145 33101  10525 2L   S1       
-         5        146 33101  10409 2R   S1       
-         5        147 33101  10530 2L   S1       
-         5        148 33101  10414 2R   S1       
-         5        149 33101  10537 2L   S1       
-         5        150 33101  10419 2R   S1       
-         5        151 33101  10544 2L   S1       
-         5        152 33101  10425 2R   S1       
-         5        153 33101  10550 2L   S1       
-         5        154 33101  10431 2R   S1       
-         5        155 33101  10557 2L   S1       
-         5        156 33101  10437 2R   S1       
-         5        157 33101  10567 2L   S1       
-         5        158 33101  10444 2R   S1       
-         5        159 33101  10562 2L   S1       
-         5        160 33101  10450 2R   S1       
-         5        161 33101  10514 2L   S1       
-         5        162 33101   8300 2R   P3       
-         5        163 33101  10520 2L   S1       
-         5        164 33101  10405 2R   S1       
-         5        165 33101  10526 2L   S1       
-         5        166 33101  10410 2R   S1       
-         5        167 33101  10531 2L   S1       
-         5        168 33101  10415 2R   S1       
-         5        169 33101  10538 2L   S1       
-         5        170 33101  10420 2R   S1       
-         5        171 33101  10546 2L   S1       
-         5        172 33101  10426 2R   S1       
-         5        173 33101  10552 2L   S1       
-         5        174 33101  10432 2R   S1       
-         5        175 33101  10558 2L   S1       
-         5        176 33101  10438 2R   S1       
-         5        177 33101  10568 2L   S1       
-         5        178 33101  10445 2R   S1       
-         5        179 33101  10563 2L   S1       
-         5        180 33101  10451 2R   S1       
-         5        181 33101  10515 2L   S1       
-         5        182 33101  10401 2R   S1       
-         5        183 33101  10522 2L   S1       
-         5        184 33101  10406 2R   S1       
-         5        185 33101  10527 2L   S1       
-         5        186 33101  10411 2R   S1       
-         5        187 33101  10532 2L   S1       
-         5        188 33101  10416 2R   S1       
-         5        189 33101  10541 2L   S1       
-         5        190 33101  10421 2R   S1       
-         5        191 33101  10547 2L   S1       
-         5        192 33101  10427 2R   S1       
-         5        193 33101  10554 2L   S1       
-         5        194 33101  10433 2R   S1       
-         5        195 33101  10559 2L   S1       
-         5        196 33101  10440 2R   S1       
-         5        197 33101  10569 2L   S1       
-         5        198 33101  10446 2R   S1       
-         5        199 33101  10564 2L   S1       
-         5        200 33101  10452 2R   S1       
-         5        201 33101   8598 3L   P3_2     
-         5        202 33101  10608 3R   S1       
-         5        203 33101  10664 3L   S1       
-         5        204 33101  10615 3R   S1       
-         5        205 33101  10669 3L   S1       
-         5        206 33101  10622 3R   S1       
-         5        207 33101  10676 3L   S1       
-         5        208 33101  10628 3R   S1       
-         5        209 33101  10682 3L   S1       
-         5        210 33101  10633 3R   S1       
-         5        211 33101  10688 3L   S1       
-         5        212 33101  10638 3R   S1       
-         5        213 33101  10694 3L   S1       
-         5        214 33101  10643 3R   S1       
-         5        215 33101  10699 3L   S1       
-         5        216 33101  10648 3R   S1       
-         5        217 33101  10704 3L   S1       
-         5        218 33101  10655 3R   S1       
-         5        219 33101  10709 3L   S1       
-         5        220 33101  10614 3R   S1       
-         5        221 33101   8599 3L   P3_2     
-         5        222 33101  10609 3R   S1       
-         5        223 33101  10665 3L   S1       
-         5        224 33101  10617 3R   S1       
-         5        225 33101  10670 3L   S1       
-         5        226 33101  10624 3R   S1       
-         5        227 33101  10678 3L   S1       
-         5        228 33101  10629 3R   S1       
-         5        229 33101  10683 3L   S1       
-         5        230 33101  10634 3R   S1       
-         5        231 33101  10690 3L   S1       
-         5        232 33101  10639 3R   S1       
-         5        233 33101  10695 3L   S1       
-         5        234 33101  10644 3R   S1       
-         5        235 33101  10700 3L   S1       
-         5        236 33101  10650 3R   S1       
-         5        237 33101  10705 3L   S1       
-         5        238 33101  10656 3R   S1       
-         5        239 33101  10710 3L   S1       
-         5        240 33101  10616 3R   S1       
-         5        241 33101  10661 3L   S1       
-         5        242 33101  10610 3R   S1       
-         5        243 33101  10666 3L   S1       
-         5        244 33101  10618 3R   S1       
-         5        245 33101  10671 3L   S1       
-         5        246 33101  10625 3R   S1       
-         5        247 33101  10679 3L   S1       
-         5        248 33101  10630 3R   S1       
-         5        249 33101  10684 3L   S1       
-         5        250 33101  10635 3R   S1       
-         5        251 33101  10691 3L   S1       
-         5        252 33101  10640 3R   S1       
-         5        253 33101  10696 3L   S1       
-         5        254 33101  10645 3R   S1       
-         5        255 33101  10701 3L   S1       
-         5        256 33101  10652 3R   S1       
-         5        257 33101  10706 3L   S1       
-         5        258 33101  10657 3R   S1       
-         5        259 33101  10711 3L   S1       
-         5        260 33101  10621 3R   S1       
-         5        261 33101  10662 3L   S1       
-         5        262 33101  10611 3R   S1       
-         5        263 33101  10667 3L   S1       
-         5        264 33101  10619 3R   S1       
-         5        265 33101  10674 3L   S1       
-         5        266 33101  10626 3R   S1       
-         5        267 33101  10680 3L   S1       
-         5        268 33101  10631 3R   S1       
-         5        269 33101  10685 3L   S1       
-         5        270 33101  10636 3R   S1       
-         5        271 33101  10692 3L   S1       
-         5        272 33101  10641 3R   S1       
-         5        273 33101  10697 3L   S1       
-         5        274 33101  10646 3R   S1       
-         5        275 33101  10702 3L   S1       
-         5        276 33101  10653 3R   S1       
-         5        277 33101  10707 3L   S1       
-         5        278 33101  10658 3R   S1       
-         5        279 33101  10712 3L   S1       
-         5        280 33101  10623 3R   S1       
-         5        281 33101  10663 3L   S1       
-         5        282 33101  10612 3R   S1       
-         5        283 33101  10668 3L   S1       
-         5        284 33101  10620 3R   S1       
-         5        285 33101  10675 3L   S1       
-         5        286 33101  10627 3R   S1       
-         5        287 33101  10681 3L   S1       
-         5        288 33101  10632 3R   S1       
-         5        289 33101  10687 3L   S1       
-         5        290 33101  10637 3R   S1       
-         5        291 33101  10693 3L   S1       
-         5        292 33101  10642 3R   S1       
-         5        293 33101  10698 3L   S1       
-         5        294 33101  10647 3R   S1       
-         5        295 33101  10703 3L   S1       
-         5        296 33101  10654 3R   S1       
-         5        297 33101  10708 3L   S1       
-         5        298 33101  10659 3R   S1       
-         5        299 33101  10713 3L   S1       
-         5        300 33101  10649 3R   S1       
-         5        301 33101  10784 4L   S1       
-         5        302 33101  10723 4R   S1       
-         5        303 33101  10789 4L   S1       
-         5        304 33101  10730 4R   S1       
-         5        305 33101  10795 4L   S1       
-         5        306 33101  10735 4R   S1       
-         5        307 33101  10801 4L   S1       
-         5        308 33101  10740 4R   S1       
-         5        309 33101  10807 4L   S1       
-         5        310 33101  10745 4R   S1       
-         5        311 33101  10813 4L   S1       
-         5        312 33101  10750 4R   S1       
-         5        313 33101  10818 4L   S1       
-         5        314 33101  10756 4R   S1       
-         5        315 33101  10825 4L   S1       
-         5        316 33101  10762 4R   S1       
-         5        317 33101  10830 4L   S1       
-         5        318 33101  10767 4R   S1       
-         5        319 33101  10835 4L   S1       
-         5        320 33101  10772 4R   S1       
-         5        321 33101  10785 4L   S1       
-         5        322 33101  10724 4R   S1       
-         5        323 33101  10790 4L   S1       
-         5        324 33101  10731 4R   S1       
-         5        325 33101  10796 4L   S1       
-         5        326 33101  10736 4R   S1       
-         5        327 33101  10803 4L   S1       
-         5        328 33101  10741 4R   S1       
-         5        329 33101  10808 4L   S1       
-         5        330 33101  10746 4R   S1       
-         5        331 33101  10814 4L   S1       
-         5        332 33101  10751 4R   S1       
-         5        333 33101  10819 4L   S1       
-         5        334 33101  10757 4R   S1       
-         5        335 33101  10826 4L   S1       
-         5        336 33101  10763 4R   S1       
-         5        337 33101  10831 4L   S1       
-         5        338 33101  10768 4R   S1       
-         5        339 33101  10836 4L   S1       
-         5        340 33101  10773 4R   S1       
-         5        341 33101  10786 4L   S1       
-         5        342 33101  10726 4R   S1       
-         5        343 33101  10791 4L   S1       
-         5        344 33101  10732 4R   S1       
-         5        345 33101  10797 4L   S1       
-         5        346 33101  10737 4R   S1       
-         5        347 33101  10804 4L   S1       
-         5        348 33101  10742 4R   S1       
-         5        349 33101  10809 4L   S1       
-         5        350 33101  10747 4R   S1       
-         5        351 33101  10815 4L   S1       
-         5        352 33101  10752 4R   S1       
-         5        353 33101  10820 4L   S1       
-         5        354 33101  10759 4R   S1       
-         5        355 33101  10827 4L   S1       
-         5        356 33101  10764 4R   S1       
-         5        357 33101  10832 4L   S1       
-         5        358 33101  10769 4R   S1       
-         5        359 33101  10837 4L   S1       
-         5        360 33101  10774 4R   S1       
-         5        361 33101  10787 4L   S1       
-         5        362 33101  10727 4R   S1       
-         5        363 33101  10793 4L   S1       
-         5        364 33101  10733 4R   S1       
-         5        365 33101  10799 4L   S1       
-         5        366 33101  10738 4R   S1       
-         5        367 33101  10805 4L   S1       
-         5        368 33101  10743 4R   S1       
-         5        369 33101  10810 4L   S1       
-         5        370 33101  10748 4R   S1       
-         5        371 33101  10816 4L   S1       
-         5        372 33101  10753 4R   S1       
-         5        373 33101  10822 4L   S1       
-         5        374 33101  10760 4R   S1       
-         5        375 33101  10828 4L   S1       
-         5        376 33101  10765 4R   S1       
-         5        377 33101  10833 4L   S1       
-         5        378 33101  10770 4R   S1       
-         5        379 33101  10838 4L   S1       
-         5        380 33101  10775 4R   S1       
-         5        381 33101  10788 4L   S1       
-         5        382 33101  10728 4R   S1       
-         5        383 33101  10794 4L   S1       
-         5        384 33101  10734 4R   S1       
-         5        385 33101  10800 4L   S1       
-         5        386 33101  10739 4R   S1       
-         5        387 33101  10806 4L   S1       
-         5        388 33101  10744 4R   S1       
-         5        389 33101  10811 4L   S1       
-         5        390 33101  10749 4R   S1       
-         5        391 33101  10817 4L   S1       
-         5        392 33101  10755 4R   S1       
-         5        393 33101  10823 4L   S1       
-         5        394 33101  10761 4R   S1       
-         5        395 33101  10829 4L   S1       
-         5        396 33101  10766 4R   S1       
-         5        397 33101  10834 4L   S1       
-         5        398 33101  10771 4R   S1       
-         5        399 33101  10840 4L   S1       
-         5        400 33101  10776 4R   S1       
-         5        401 33101   8995 5L   P3_2     
-         5        402 33101  10843 5R   S1       
-         5        403 33101   9000 5L   P3_2     
-         5        404 33101  10848 5R   S1       
-         5        405 33101  10907 5L   S1       
-         5        406 33101  10853 5R   S1       
-         5        407 33101  10913 5L   S1       
-         5        408 33101  10859 5R   S1       
-         5        409 33101  10918 5L   S1       
-         5        410 33101  10864 5R   S1       
-         5        411 33101  10923 5L   S1       
-         5        412 33101  10869 5R   S1       
-         5        413 33101  10930 5L   S1       
-         5        414 33101  10874 5R   S1       
-         5        415 33101  10935 5L   S1       
-         5        416 33101  10879 5R   S1       
-         5        417 33101  10940 5L   S1       
-         5        418 33101  10884 5R   S1       
-         5        419 33101  10945 5L   S1       
-         5        420 33101  10889 5R   S1       
-         5        421 33101   8996 5L   P3_2     
-         5        422 33101  10844 5R   S1       
-         5        423 33101  10902 5L   S1       
-         5        424 33101  10849 5R   S1       
-         5        425 33101  10908 5L   S1       
-         5        426 33101  10854 5R   S1       
-         5        427 33101  10914 5L   S1       
-         5        428 33101  10860 5R   S1       
-         5        429 33101  10919 5L   S1       
-         5        430 33101  10865 5R   S1       
-         5        431 33101  10925 5L   S1       
-         5        432 33101  10870 5R   S1       
-         5        433 33101  10931 5L   S1       
-         5        434 33101  10875 5R   S1       
-         5        435 33101  10936 5L   S1       
-         5        436 33101  10880 5R   S1       
-         5        437 33101  10941 5L   S1       
-         5        438 33101  10885 5R   S1       
-         5        439 33101  10946 5L   S1       
-         5        440 33101  10890 5R   S1       
-         5        441 33101   8997 5L   P3_2     
-         5        442 33101  10845 5R   S1       
-         5        443 33101  10903 5L   S1       
-         5        444 33101  10850 5R   S1       
-         5        445 33101  10909 5L   S1       
-         5        446 33101  10855 5R   S1       
-         5        447 33101  10915 5L   S1       
-         5        448 33101  10861 5R   S1       
-         5        449 33101  10920 5L   S1       
-         5        450 33101  10866 5R   S1       
-         5        451 33101  10926 5L   S1       
-         5        452 33101  10871 5R   S1       
-         5        453 33101  10932 5L   S1       
-         5        454 33101  10876 5R   S1       
-         5        455 33101  10937 5L   S1       
-         5        456 33101  10881 5R   S1       
-         5        457 33101  10942 5L   S1       
-         5        458 33101  10886 5R   S1       
-         5        459 33101  10947 5L   S1       
-         5        460 33101  10891 5R   S1       
-         5        461 33101   8998 5L   P3_2     
-         5        462 33101  10846 5R   S1       
-         5        463 33101  10904 5L   S1       
-         5        464 33101  10851 5R   S1       
-         5        465 33101  10910 5L   S1       
-         5        466 33101  10857 5R   S1       
-         5        467 33101  10916 5L   S1       
-         5        468 33101  10862 5R   S1       
-         5        469 33101  10921 5L   S1       
-         5        470 33101  10867 5R   S1       
-         5        471 33101  10927 5L   S1       
-         5        472 33101  10872 5R   S1       
-         5        473 33101  10933 5L   S1       
-         5        474 33101  10877 5R   S1       
-         5        475 33101  10938 5L   S1       
-         5        476 33101  10882 5R   S1       
-         5        477 33101  10943 5L   S1       
-         5        478 33101  10887 5R   S1       
-         5        479 33101  10948 5L   S1       
-         5        480 33101  10892 5R   S1       
-         5        481 33101   8999 5L   P3_2     
-         5        482 33101  10847 5R   S1       
-         5        483 33101  10906 5L   S1       
-         5        484 33101  10852 5R   S1       
-         5        485 33101  10912 5L   S1       
-         5        486 33101  10858 5R   S1       
-         5        487 33101  10917 5L   S1       
-         5        488 33101  10863 5R   S1       
-         5        489 33101  10922 5L   S1       
-         5        490 33101  10868 5R   S1       
-         5        491 33101  10929 5L   S1       
-         5        492 33101  10873 5R   S1       
-         5        493 33101  10934 5L   S1       
-         5        494 33101  10878 5R   S1       
-         5        495 33101  10939 5L   S1       
-         5        496 33101  10883 5R   S1       
-         5        497 33101  10944 5L   S1       
-         5        498 33101  10888 5R   S1       
-         5        499 33101  10949 5L   S1       
-         5        500 33101  10893 5R   S1       
-         5        501 33101  11271 6L   S1       
-         5        502 33101  11087 6R   S1       
-         5        503 33101  11265 6L   S1       
-         5        504 33101  11082 6R   S1       
-         5        505 33101  11200 6L   S1       
-         5        506 33101  11077 6R   S1       
-         5        507 33101  11195 6L   S1       
-         5        508 33101  11072 6R   S1       
-         5        509 33101  11177 6L   S1       
-         5        510 33101  11067 6R   S1       
-         5        511 33101  11172 6L   S1       
-         5        512 33101  11061 6R   S1       
-         5        513 33101  11154 6L   S1       
-         5        514 33101  11011 6R   S1       
-         5        515 33101  11145 6L   S1       
-         5        516 33101  11010 6R   S1       
-         5        517 33101  11139 6L   S1       
-         5        518 33101  10996 6R   S1       
-         5        519 33101   7335 6L   P2       
-         5        520 33101  10966 6R   S1       
-         5        521 33101  11272 6L   S1       
-         5        522 33101  11088 6R   S1       
-         5        523 33101  11267 6L   S1       
-         5        524 33101  11083 6R   S1       
-         5        525 33101  11201 6L   S1       
-         5        526 33101  11078 6R   S1       
-         5        527 33101  11196 6L   S1       
-         5        528 33101  11073 6R   S1       
-         5        529 33101  11179 6L   S1       
-         5        530 33101  11068 6R   S1       
-         5        531 33101  11173 6L   S1       
-         5        532 33101  11062 6R   S1       
-         5        533 33101  11155 6L   S1       
-         5        534 33101  11017 6R   S1       
-         5        535 33101  11147 6L   S1       
-         5        536 33101  11012 6R   S1       
-         5        537 33101  11141 6L   S1       
-         5        538 33101  10997 6R   S1       
-         5        539 33101   7336 6L   P2       
-         5        540 33101  10967 6R   S1       
-         5        541 33101  11273 6L   S1       
-         5        542 33101  11089 6R   S1       
-         5        543 33101  11268 6L   S1       
-         5        544 33101  11084 6R   S1       
-         5        545 33101  11202 6L   S1       
-         5        546 33101  11079 6R   S1       
-         5        547 33101  11197 6L   S1       
-         5        548 33101  11074 6R   S1       
-         5        549 33101  11180 6L   S1       
-         5        550 33101  11069 6R   S1       
-         5        551 33101  11174 6L   S1       
-         5        552 33101  11063 6R   S1       
-         5        553 33101  11156 6L   S1       
-         5        554 33101  11018 6R   S1       
-         5        555 33101  11150 6L   S1       
-         5        556 33101  11013 6R   S1       
-         5        557 33101  11142 6L   S1       
-         5        558 33101  10998 6R   S1       
-         5        559 33101   7337 6L   P2       
-         5        560 33101  10968 6R   S1       
-         5        561 33101  11274 6L   S1       
-         5        562 33101  11090 6R   S1       
-         5        563 33101  11269 6L   S1       
-         5        564 33101  11085 6R   S1       
-         5        565 33101  11203 6L   S1       
-         5        566 33101  11080 6R   S1       
-         5        567 33101  11198 6L   S1       
-         5        568 33101  11075 6R   S1       
-         5        569 33101  11181 6L   S1       
-         5        570 33101  11070 6R   S1       
-         5        571 33101  11175 6L   S1       
-         5        572 33101  11064 6R   S1       
-         5        573 33101  11157 6L   S1       
-         5        574 33101  11019 6R   S1       
-         5        575 33101  11151 6L   S1       
-         5        576 33101  11014 6R   S1       
-         5        577 33101  11143 6L   S1       
-         5        578 33101  10999 6R   S1       
-         5        579 33101  11131 6L   S1       
-         5        580 33101  10969 6R   S1       
-         5        581 33101  11275 6L   S1       
-         5        582 33101  11120 6R   S1       
-         5        583 33101  11270 6L   S1       
-         5        584 33101  11086 6R   S1       
-         5        585 33101  11204 6L   S1       
-         5        586 33101  11081 6R   S1       
-         5        587 33101  11199 6L   S1       
-         5        588 33101  11076 6R   S1       
-         5        589 33101  11182 6L   S1       
-         5        590 33101  11071 6R   S1       
-         5        591 33101  11176 6L   S1       
-         5        592 33101  11066 6R   S1       
-         5        593 33101  11158 6L   S1       
-         5        594 33101  11020 6R   S1       
-         5        595 33101  11153 6L   S1       
-         5        596 33101  11015 6R   S1       
-         5        597 33101  11144 6L   S1       
-         5        598 33101  11000 6R   S1       
-         5        599 33101  11133 6L   S1       
-         5        600 33101  10970 6R   S1       
-         5        601 33101  11481 7L   S1       
-         5        602 33101  11330 7R   S1       
-         5        603 33101  11474 7L   S1       
-         5        604 33101  11325 7R   S1       
-         5        605 33101  11465 7L   S1       
-         5        606 33101  11319 7R   S1       
-         5        607 33101  11460 7L   S1       
-         5        608 33101  11313 7R   S1       
-         5        609 33101  11454 7L   S1       
-         5        610 33101  11308 7R   S1       
-         5        611 33101  11446 7L   S1       
-         5        612 33101  11303 7R   S1       
-         5        613 33101  11438 7L   S1       
-         5        614 33101  11298 7R   S1       
-         5        615 33101  11430 7L   S1       
-         5        616 33101  11292 7R   S1       
-         5        617 33101  11425 7L   S1       
-         5        618 33101  11287 7R   S1       
-         5        619 33101  11417 7L   S1       
-         5        620 33101  11282 7R   S1       
-         5        621 33101  11482 7L   S1       
-         5        622 33101  11331 7R   S1       
-         5        623 33101  11476 7L   S1       
-         5        624 33101  11326 7R   S1       
-         5        625 33101  11466 7L   S1       
-         5        626 33101  11320 7R   S1       
-         5        627 33101  11461 7L   S1       
-         5        628 33101  11314 7R   S1       
-         5        629 33101  11455 7L   S1       
-         5        630 33101  11309 7R   S1       
-         5        631 33101  11448 7L   S1       
-         5        632 33101  11304 7R   S1       
-         5        633 33101  11439 7L   S1       
-         5        634 33101  11299 7R   S1       
-         5        635 33101  11431 7L   S1       
-         5        636 33101  11294 7R   S1       
-         5        637 33101  11426 7L   S1       
-         5        638 33101  11288 7R   S1       
-         5        639 33101  11421 7L   S1       
-         5        640 33101  11283 7R   S1       
-         5        641 33101  11483 7L   S1       
-         5        642 33101  11332 7R   S1       
-         5        643 33101  11477 7L   S1       
-         5        644 33101  11327 7R   S1       
-         5        645 33101  11467 7L   S1       
-         5        646 33101  11321 7R   S1       
-         5        647 33101  11462 7L   S1       
-         5        648 33101  11315 7R   S1       
-         5        649 33101  11457 7L   S1       
-         5        650 33101  11310 7R   S1       
-         5        651 33101  11449 7L   S1       
-         5        652 33101  11305 7R   S1       
-         5        653 33101  11440 7L   S1       
-         5        654 33101  11300 7R   S1       
-         5        655 33101  11432 7L   S1       
-         5        656 33101  11295 7R   S1       
-         5        657 33101  11427 7L   S1       
-         5        658 33101  11289 7R   S1       
-         5        659 33101  11422 7L   S1       
-         5        660 33101  11284 7R   S1       
-         5        661 33101  11484 7L   S1       
-         5        662 33101  11333 7R   S1       
-         5        663 33101  11478 7L   S1       
-         5        664 33101  11328 7R   S1       
-         5        665 33101  11470 7L   S1       
-         5        666 33101  11322 7R   S1       
-         5        667 33101  11463 7L   S1       
-         5        668 33101  11317 7R   S1       
-         5        669 33101  11458 7L   S1       
-         5        670 33101  11311 7R   S1       
-         5        671 33101  11451 7L   S1       
-         5        672 33101  11306 7R   S1       
-         5        673 33101  11442 7L   S1       
-         5        674 33101  11301 7R   S1       
-         5        675 33101  11434 7L   S1       
-         5        676 33101  11296 7R   S1       
-         5        677 33101  11428 7L   S1       
-         5        678 33101  11290 7R   S1       
-         5        679 33101  11423 7L   S1       
-         5        680 33101  11285 7R   S1       
-         5        681 33101  11485 7L   S1       
-         5        682 33101  11334 7R   S1       
-         5        683 33101  11480 7L   S1       
-         5        684 33101  11329 7R   S1       
-         5        685 33101  11471 7L   S1       
-         5        686 33101  11323 7R   S1       
-         5        687 33101  11464 7L   S1       
-         5        688 33101  11318 7R   S1       
-         5        689 33101  11459 7L   S1       
-         5        690 33101  11312 7R   S1       
-         5        691 33101  11452 7L   S1       
-         5        692 33101  11307 7R   S1       
-         5        693 33101  11444 7L   S1       
-         5        694 33101  11302 7R   S1       
-         5        695 33101  11435 7L   S1       
-         5        696 33101  11297 7R   S1       
-         5        697 33101  11429 7L   S1       
-         5        698 33101  11291 7R   S1       
-         5        699 33101  11424 7L   S1       
-         5        700 33101  11286 7R   S1       
-         5        701 33101  11651 8L   S1       
-         5        702 33101  11560 8R   S1       
-         5        703 33101  11645 8L   S1       
-         5        704 33101  11555 8R   S1       
-         5        705 33101  11638 8L   S1       
-         5        706 33101  11548 8R   S1       
-         5        707 33101  11632 8L   S1       
-         5        708 33101  11543 8R   S1       
-         5        709 33101  11627 8L   S1       
-         5        710 33101  11538 8R   S1       
-         5        711 33101  11622 8L   S1       
-         5        712 33101  11532 8R   S1       
-         5        713 33101  11616 8L   S1       
-         5        714 33101  11527 8R   S1       
-         5        715 33101  11611 8L   S1       
-         5        716 33101  11522 8R   S1       
-         5        717 33101  11606 8L   S1       
-         5        718 33101  11517 8R   S1       
-         5        719 33101  11601 8L   S1       
-         5        720 33101  11512 8R   S1       
-         5        721 33101  11652 8L   S1       
-         5        722 33101  11561 8R   S1       
-         5        723 33101  11646 8L   S1       
-         5        724 33101  11556 8R   S1       
-         5        725 33101  11641 8L   S1       
-         5        726 33101  11550 8R   S1       
-         5        727 33101  11634 8L   S1       
-         5        728 33101  11544 8R   S1       
-         5        729 33101  11628 8L   S1       
-         5        730 33101  11539 8R   S1       
-         5        731 33101  11623 8L   S1       
-         5        732 33101  11533 8R   S1       
-         5        733 33101  11617 8L   S1       
-         5        734 33101  11528 8R   S1       
-         5        735 33101  11612 8L   S1       
-         5        736 33101  11523 8R   S1       
-         5        737 33101  11607 8L   S1       
-         5        738 33101  11518 8R   S1       
-         5        739 33101  11602 8L   S1       
-         5        740 33101  11513 8R   S1       
-         5        741 33101  11653 8L   S1       
-         5        742 33101  11562 8R   S1       
-         5        743 33101  11647 8L   S1       
-         5        744 33101  11557 8R   S1       
-         5        745 33101  11642 8L   S1       
-         5        746 33101  11552 8R   S1       
-         5        747 33101  11635 8L   S1       
-         5        748 33101  11545 8R   S1       
-         5        749 33101  11629 8L   S1       
-         5        750 33101  11540 8R   S1       
-         5        751 33101  11624 8L   S1       
-         5        752 33101  11534 8R   S1       
-         5        753 33101  11618 8L   S1       
-         5        754 33101  11529 8R   S1       
-         5        755 33101  11613 8L   S1       
-         5        756 33101  11524 8R   S1       
-         5        757 33101  11608 8L   S1       
-         5        758 33101  11519 8R   S1       
-         5        759 33101  11603 8L   S1       
-         5        760 33101  11514 8R   S1       
-         5        761 33101  11655 8L   S1       
-         5        762 33101  11563 8R   S1       
-         5        763 33101  11648 8L   S1       
-         5        764 33101  11558 8R   S1       
-         5        765 33101  11643 8L   S1       
-         5        766 33101  11553 8R   S1       
-         5        767 33101  11636 8L   S1       
-         5        768 33101  11546 8R   S1       
-         5        769 33101  11630 8L   S1       
-         5        770 33101  11541 8R   S1       
-         5        771 33101  11625 8L   S1       
-         5        772 33101  11535 8R   S1       
-         5        773 33101  11619 8L   S1       
-         5        774 33101  11530 8R   S1       
-         5        775 33101  11614 8L   S1       
-         5        776 33101  11525 8R   S1       
-         5        777 33101  11609 8L   S1       
-         5        778 33101  11520 8R   S1       
-         5        779 33101  11604 8L   S1       
-         5        780 33101  11515 8R   S1       
-         5        781 33101  11656 8L   S1       
-         5        782 33101  11565 8R   S1       
-         5        783 33101  11650 8L   S1       
-         5        784 33101  11559 8R   S1       
-         5        785 33101  11644 8L   S1       
-         5        786 33101  11554 8R   S1       
-         5        787 33101  11637 8L   S1       
-         5        788 33101  11547 8R   S1       
-         5        789 33101  11631 8L   S1       
-         5        790 33101  11542 8R   S1       
-         5        791 33101  11626 8L   S1       
-         5        792 33101  11537 8R   S1       
-         5        793 33101  11621 8L   S1       
-         5        794 33101  11531 8R   S1       
-         5        795 33101  11615 8L   S1       
-         5        796 33101  11526 8R   S1       
-         5        797 33101  11610 8L   S1       
-         5        798 33101  11521 8R   S1       
-         5        799 33101  11605 8L   S1       
-         5        800 33101  11516 8R   S1       
-         5        801 33101  11850 9L   S1       
-         5        802 33101  11748 9R   S1       
-         5        803 33101  11843 9L   S1       
-         5        804 33101  11743 9R   S1       
-         5        805 33101  11838 9L   S1       
-         5        806 33101  11738 9R   S1       
-         5        807 33101  11833 9L   S1       
-         5        808 33101  11733 9R   S1       
-         5        809 33101  11828 9L   S1       
-         5        810 33101  11728 9R   S1       
-         5        811 33101  11823 9L   S1       
-         5        812 33101  11722 9R   S1       
-         5        813 33101  11817 9L   S1       
-         5        814 33101  11717 9R   S1       
-         5        815 33101  11812 9L   S1       
-         5        816 33101  11711 9R   S1       
-         5        817 33101  11806 9L   S1       
-         5        818 33101  11706 9R   S1       
-         5        819 33101  11801 9L   S1       
-         5        820 33101  11701 9R   S1       
-         5        821 33101  11851 9L   S1       
-         5        822 33101  11749 9R   S1       
-         5        823 33101  11844 9L   S1       
-         5        824 33101  11744 9R   S1       
-         5        825 33101  11839 9L   S1       
-         5        826 33101  11739 9R   S1       
-         5        827 33101  11834 9L   S1       
-         5        828 33101  11734 9R   S1       
-         5        829 33101  11829 9L   S1       
-         5        830 33101  11729 9R   S1       
-         5        831 33101  11824 9L   S1       
-         5        832 33101  11723 9R   S1       
-         5        833 33101  11818 9L   S1       
-         5        834 33101  11718 9R   S1       
-         5        835 33101  11813 9L   S1       
-         5        836 33101  11712 9R   S1       
-         5        837 33101  11808 9L   S1       
-         5        838 33101  11707 9R   S1       
-         5        839 33101  11802 9L   S1       
-         5        840 33101  11702 9R   S1       
-         5        841 33101  11852 9L   S1       
-         5        842 33101  11750 9R   S1       
-         5        843 33101  11845 9L   S1       
-         5        844 33101  11745 9R   S1       
-         5        845 33101  11840 9L   S1       
-         5        846 33101  11740 9R   S1       
-         5        847 33101  11835 9L   S1       
-         5        848 33101  11735 9R   S1       
-         5        849 33101  11830 9L   S1       
-         5        850 33101  11730 9R   S1       
-         5        851 33101  11825 9L   S1       
-         5        852 33101  11724 9R   S1       
-         5        853 33101  11820 9L   S1       
-         5        854 33101  11719 9R   S1       
-         5        855 33101  11814 9L   S1       
-         5        856 33101  11713 9R   S1       
-         5        857 33101  11809 9L   S1       
-         5        858 33101  11708 9R   S1       
-         5        859 33101  11803 9L   S1       
-         5        860 33101  11703 9R   S1       
-         5        861 33101  11853 9L   S1       
-         5        862 33101  11751 9R   S1       
-         5        863 33101  11848 9L   S1       
-         5        864 33101  11746 9R   S1       
-         5        865 33101  11841 9L   S1       
-         5        866 33101  11741 9R   S1       
-         5        867 33101  11836 9L   S1       
-         5        868 33101  11736 9R   S1       
-         5        869 33101  11831 9L   S1       
-         5        870 33101  11731 9R   S1       
-         5        871 33101  11826 9L   S1       
-         5        872 33101  11725 9R   S1       
-         5        873 33101  11821 9L   S1       
-         5        874 33101  11720 9R   S1       
-         5        875 33101  11815 9L   S1       
-         5        876 33101  11714 9R   S1       
-         5        877 33101  11810 9L   S1       
-         5        878 33101  11709 9R   S1       
-         5        879 33101  11804 9L   S1       
-         5        880 33101  11704 9R   S1       
-         5        881 33101  11854 9L   S1       
-         5        882 33101  11752 9R   S1       
-         5        883 33101  11849 9L   S1       
-         5        884 33101  11747 9R   S1       
-         5        885 33101  11842 9L   S1       
-         5        886 33101  11742 9R   S1       
-         5        887 33101  11837 9L   S1       
-         5        888 33101  11737 9R   S1       
-         5        889 33101  11832 9L   S1       
-         5        890 33101  11732 9R   S1       
-         5        891 33101  11827 9L   S1       
-         5        892 33101  11727 9R   S1       
-         5        893 33101  11822 9L   S1       
-         5        894 33101  11721 9R   S1       
-         5        895 33101  11816 9L   S1       
-         5        896 33101  11715 9R   S1       
-         5        897 33101  11811 9L   S1       
-         5        898 33101  11710 9R   S1       
-         5        899 33101  11805 9L   S1       
-         5        900 33101  11705 9R   S1       
-         5        901 33101  14411 10L  S2       
-         5        902 33101  14575 10R  S2       
-         5        903 33101  14405 10L  S2       
-         5        904 33101  14570 10R  S2       
-         5        905 33101  14442 10L  S2       
-         5        906 33101  14560 10R  S2       
-         5        907 33101  14435 10L  S2       
-         5        908 33101  14525 10R  S2       
-         5        909 33101  14427 10L  S2       
-         5        910 33101   3947 10R  12       
-         5        911 33101   9170 10L  P4_1     
-         5        912 33101   9093 10R  P4_1     
-         5        913 33101   9190 10L  P4_1     
-         5        914 33101   9088 10R  P4_1     
-         5        915 33101   9185 10L  P4_1     
-         5        916 33101   9083 10R  P4_1     
-         5        917 33101   9180 10L  P4_1     
-         5        918 33101   9078 10R  P4_1     
-         5        919 33101   9175 10L  P4_1     
-         5        920 33101   9073 10R  P4_1     
-         5        921 33101  14415 10L  S2       
-         5        922 33101  14576 10R  S2       
-         5        923 33101  14406 10L  S2       
-         5        924 33101  14571 10R  S2       
-         5        925 33101  14443 10L  S2       
-         5        926 33101  14561 10R  S2       
-         5        927 33101  14436 10L  S2       
-         5        928 33101  14526 10R  S2       
-         5        929 33101  14428 10L  S2       
-         5        930 33101   3949 10R  12       
-         5        931 33101   9171 10L  P4_1     
-         5        932 33101   9094 10R  P4_1     
-         5        933 33101   9191 10L  P4_1     
-         5        934 33101   9089 10R  P4_1     
-         5        935 33101   9186 10L  P4_1     
-         5        936 33101   9084 10R  P4_1     
-         5        937 33101   9181 10L  P4_1     
-         5        938 33101   9079 10R  P4_1     
-         5        939 33101   9176 10L  P4_1     
-         5        940 33101   9074 10R  P4_1     
-         5        941 33101  14418 10L  S2       
-         5        942 33101  14577 10R  S2       
-         5        943 33101  14407 10L  S2       
-         5        944 33101  14572 10R  S2       
-         5        945 33101  14444 10L  S2       
-         5        946 33101  14563 10R  S2       
-         5        947 33101  14437 10L  S2       
-         5        948 33101  14527 10R  S2       
-         5        949 33101  14432 10L  S2       
-         5        950 33101   9098 10R  P4_1     
-         5        951 33101   9172 10L  P4_1     
-         5        952 33101   9095 10R  P4_1     
-         5        953 33101   9192 10L  P4_1     
-         5        954 33101   9090 10R  P4_1     
-         5        955 33101   9187 10L  P4_1     
-         5        956 33101   9085 10R  P4_1     
-         5        957 33101   9182 10L  P4_1     
-         5        958 33101   9080 10R  P4_1     
-         5        959 33101   9177 10L  P4_1     
-         5        960 33101   9075 10R  P4_1     
-         5        961 33101  14420 10L  S2       
-         5        962 33101  14578 10R  S2       
-         5        963 33101  14408 10L  S2       
-         5        964 33101  14573 10R  S2       
-         5        965 33101  14445 10L  S2       
-         5        966 33101  14564 10R  S2       
-         5        967 33101  14438 10L  S2       
-         5        968 33101  14528 10R  S2       
-         5        969 33101  14433 10L  S2       
-         5        970 33101   9099 10R  P4_1     
-         5        971 33101   9173 10L  P4_1     
-         5        972 33101   9096 10R  P4_1     
-         5        973 33101   9193 10L  P4_1     
-         5        974 33101   9091 10R  P4_1     
-         5        975 33101   9188 10L  P4_1     
-         5        976 33101   9086 10R  P4_1     
-         5        977 33101   9183 10L  P4_1     
-         5        978 33101   9081 10R  P4_1     
-         5        979 33101   9178 10L  P4_1     
-         5        980 33101   9076 10R  P4_1     
-         5        981 33101  14421 10L  S2       
-         5        982 33101  14579 10R  S2       
-         5        983 33101  14410 10L  S2       
-         5        984 33101  14574 10R  S2       
-         5        985 33101  14446 10L  S2       
-         5        986 33101  14565 10R  S2       
-         5        987 33101  14440 10L  S2       
-         5        988 33101  14529 10R  S2       
-         5        989 33101  14434 10L  S2       
-         5        990 33101   9100 10R  P4_1     
-         5        991 33101   9174 10L  P4_1     
-         5        992 33101   9097 10R  P4_1     
-         5        993 33101   9194 10L  P4_1     
-         5        994 33101   9092 10R  P4_1     
-         5        995 33101   9189 10L  P4_1     
-         5        996 33101   9087 10R  P4_1     
-         5        997 33101   9184 10L  P4_1     
-         5        998 33101   9082 10R  P4_1     
-         5        999 33101   9179 10L  P4_1     
-         5       1000 33101   9077 10R  P4_1     
-         5       1001 33101  14712 11L  S2       
-         5       1002 33101  14858 11R  S2       
-         5       1003 33101  14700 11L  S2       
-         5       1004 33101  14842 11R  S2       
-         5       1005 33101  14668 11L  S2       
-         5       1006 33101  14848 11R  S2       
-         5       1007 33101  14656 11L  S2       
-         5       1008 33101  14834 11R  S2       
-         5       1009 33101  14685 11L  S2       
-         5       1010 33101  14828 11R  S2       
-         5       1011 33101  14680 11L  S2       
-         5       1012 33101  14805 11R  S2       
-         5       1013 33101  14672 11L  S2       
-         5       1014 33101  14798 11R  S2       
-         5       1015 33101  14662 11L  S2       
-         5       1016 33101  14793 11R  S2       
-         5       1017 33101  14655 11L  S2       
-         5       1018 33101  14803 11R  S2       
-         5       1019 33101  14650 11L  S2       
-         5       1020 33101  14818 11R  S2       
-         5       1021 33101  14713 11L  S2       
-         5       1022 33101  14859 11R  S2       
-         5       1023 33101  14701 11L  S2       
-         5       1024 33101  14843 11R  S2       
-         5       1025 33101  14669 11L  S2       
-         5       1026 33101  14849 11R  S2       
-         5       1027 33101  14658 11L  S2       
-         5       1028 33101  14836 11R  S2       
-         5       1029 33101  14686 11L  S2       
-         5       1030 33101  14830 11R  S2       
-         5       1031 33101  14681 11L  S2       
-         5       1032 33101  14806 11R  S2       
-         5       1033 33101  14675 11L  S2       
-         5       1034 33101  14799 11R  S2       
-         5       1035 33101  14663 11L  S2       
-         5       1036 33101  14794 11R  S2       
-         5       1037 33101  14657 11L  S2       
-         5       1038 33101  14804 11R  S2       
-         5       1039 33101  14651 11L  S2       
-         5       1040 33101  14819 11R  S2       
-         5       1041 33101  14714 11L  S2       
-         5       1042 33101  14860 11R  S2       
-         5       1043 33101  14702 11L  S2       
-         5       1044 33101  14845 11R  S2       
-         5       1045 33101  14673 11L  S2       
-         5       1046 33101  14850 11R  S2       
-         5       1047 33101  14664 11L  S2       
-         5       1048 33101  14839 11R  S2       
-         5       1049 33101  14688 11L  S2       
-         5       1050 33101  14831 11R  S2       
-         5       1051 33101  14682 11L  S2       
-         5       1052 33101  14823 11R  S2       
-         5       1053 33101  14676 11L  S2       
-         5       1054 33101  14800 11R  S2       
-         5       1055 33101  14667 11L  S2       
-         5       1056 33101  14795 11R  S2       
-         5       1057 33101  14659 11L  S2       
-         5       1058 33101  14807 11R  S2       
-         5       1059 33101  14652 11L  S2       
-         5       1060 33101  14820 11R  S2       
-         5       1061 33101  14687 11L  S2       
-         5       1062 33101  14861 11R  S2       
-         5       1063 33101  14704 11L  S2       
-         5       1064 33101  14846 11R  S2       
-         5       1065 33101  14674 11L  S2       
-         5       1066 33101  14851 11R  S2       
-         5       1067 33101  14665 11L  S2       
-         5       1068 33101  14840 11R  S2       
-         5       1069 33101  14691 11L  S2       
-         5       1070 33101  14832 11R  S2       
-         5       1071 33101  14683 11L  S2       
-         5       1072 33101  14824 11R  S2       
-         5       1073 33101  14677 11L  S2       
-         5       1074 33101  14801 11R  S2       
-         5       1075 33101  14670 11L  S2       
-         5       1076 33101  14796 11R  S2       
-         5       1077 33101  14660 11L  S2       
-         5       1078 33101  14825 11R  S2       
-         5       1079 33101  14653 11L  S2       
-         5       1080 33101  14821 11R  S2       
-         5       1081 33101  14693 11L  S2       
-         5       1082 33101  14862 11R  S2       
-         5       1083 33101  14710 11L  S2       
-         5       1084 33101  14854 11R  S2       
-         5       1085 33101  14678 11L  S2       
-         5       1086 33101  14852 11R  S2       
-         5       1087 33101  14666 11L  S2       
-         5       1088 33101  14841 11R  S2       
-         5       1089 33101  14692 11L  S2       
-         5       1090 33101  14833 11R  S2       
-         5       1091 33101  14684 11L  S2       
-         5       1092 33101  14826 11R  S2       
-         5       1093 33101  14679 11L  S2       
-         5       1094 33101  14802 11R  S2       
-         5       1095 33101  14671 11L  S2       
-         5       1096 33101  14797 11R  S2       
-         5       1097 33101  14661 11L  S2       
-         5       1098 33101  14827 11R  S2       
-         5       1099 33101  14654 11L  S2       
-         5       1100 33101  14822 11R  S2       
-         5       1101 33101  15000 12L  S2       
-         5       1102 33101  15114 12R  S2       
-         5       1103 33101  14998 12L  S2       
-         5       1104 33101  15098 12R  S2       
-         5       1105 33101  15017 12L  S2       
-         5       1106 33101  15146 12R  S2       
-         5       1107 33101  14977 12L  S2       
-         5       1108 33101  15140 12R  S2       
-         5       1109 33101  14982 12L  S2       
-         5       1110 33101  15127 12R  S2       
-         5       1111 33101  15027 12L  S2       
-         5       1112 33101  15131 12R  S2       
-         5       1113 33101  15013 12L  S2       
-         5       1114 33101  15116 12R  S2       
-         5       1115 33101  15007 12L  S2       
-         5       1116 33101  15121 12R  S2       
-         5       1117 33101  15002 12L  S2       
-         5       1118 33101  15081 12R  S2       
-         5       1119 33101  14972 12L  S2       
-         5       1120 33101  15106 12R  S2       
-         5       1121 33101  15047 12L  S2       
-         5       1122 33101  15117 12R  S2       
-         5       1123 33101  15009 12L  S2       
-         5       1124 33101  15099 12R  S2       
-         5       1125 33101  15018 12L  S2       
-         5       1126 33101  15147 12R  S2       
-         5       1127 33101  14978 12L  S2       
-         5       1128 33101  15141 12R  S2       
-         5       1129 33101  14983 12L  S2       
-         5       1130 33101  15129 12R  S2       
-         5       1131 33101  15028 12L  S2       
-         5       1132 33101  15132 12R  S2       
-         5       1133 33101  15014 12L  S2       
-         5       1134 33101  15118 12R  S2       
-         5       1135 33101  15008 12L  S2       
-         5       1136 33101  15122 12R  S2       
-         5       1137 33101  15003 12L  S2       
-         5       1138 33101  15082 12R  S2       
-         5       1139 33101  14973 12L  S2       
-         5       1140 33101  15107 12R  S2       
-         5       1141 33101  15048 12L  S2       
-         5       1142 33101  15128 12R  S2       
-         5       1143 33101  15015 12L  S2       
-         5       1144 33101  15100 12R  S2       
-         5       1145 33101  15019 12L  S2       
-         5       1146 33101  15148 12R  S2       
-         5       1147 33101  14980 12L  S2       
-         5       1148 33101  15143 12R  S2       
-         5       1149 33101  14984 12L  S2       
-         5       1150 33101  15136 12R  S2       
-         5       1151 33101  15029 12L  S2       
-         5       1152 33101  15133 12R  S2       
-         5       1153 33101  15022 12L  S2       
-         5       1154 33101  15119 12R  S2       
-         5       1155 33101  15010 12L  S2       
-         5       1156 33101  15123 12R  S2       
-         5       1157 33101  15004 12L  S2       
-         5       1158 33101  15083 12R  S2       
-         5       1159 33101  14974 12L  S2       
-         5       1160 33101  15108 12R  S2       
-         5       1161 33101  15049 12L  S2       
-         5       1162 33101  15137 12R  S2       
-         5       1163 33101  15024 12L  S2       
-         5       1164 33101  15101 12R  S2       
-         5       1165 33101  15020 12L  S2       
-         5       1166 33101  15149 12R  S2       
-         5       1167 33101  14981 12L  S2       
-         5       1168 33101  15144 12R  S2       
-         5       1169 33101  14985 12L  S2       
-         5       1170 33101  15139 12R  S2       
-         5       1171 33101  15030 12L  S2       
-         5       1172 33101  15134 12R  S2       
-         5       1173 33101  15023 12L  S2       
-         5       1174 33101  15120 12R  S2       
-         5       1175 33101  15011 12L  S2       
-         5       1176 33101  15124 12R  S2       
-         5       1177 33101  15005 12L  S2       
-         5       1178 33101  15089 12R  S2       
-         5       1179 33101  14975 12L  S2       
-         5       1180 33101  15109 12R  S2       
-         5       1181 33101  15051 12L  S2       
-         5       1182 33101  15142 12R  S2       
-         5       1183 33101  15026 12L  S2       
-         5       1184 33101  15111 12R  S2       
-         5       1185 33101  15021 12L  S2       
-         5       1186 33101  15150 12R  S2       
-         5       1187 33101  14987 12L  S2       
-         5       1188 33101  15145 12R  S2       
-         5       1189 33101  14996 12L  S2       
-         5       1190 33101  15138 12R  S2       
-         5       1191 33101  15031 12L  S2       
-         5       1192 33101  15135 12R  S2       
-         5       1193 33101  15025 12L  S2       
-         5       1194 33101  15126 12R  S2       
-         5       1195 33101  15012 12L  S2       
-         5       1196 33101  15125 12R  S2       
-         5       1197 33101  15006 12L  S2       
-         5       1198 33101  15090 12R  S2       
-         5       1199 33101  14976 12L  S2       
-         5       1200 33101  15110 12R  S2       
-         5       1201 33101  15193 13L  S2       
-         5       1202 33101  15345 13R  S2       
-         5       1203 33101  15266 13L  S2       
-         5       1204 33101  15350 13R  S2       
-         5       1205 33101  15263 13L  S2       
-         5       1206 33101  15355 13R  S2       
-         5       1207 33101  15202 13L  S2       
-         5       1208 33101  15360 13R  S2       
-         5       1209 33101  15228 13L  S2       
-         5       1210 33101  15305 13R  S2       
-         5       1211 33101  15252 13L  S2       
-         5       1212 33101  15309 13R  S2       
-         5       1213 33101  15238 13L  S2       
-         5       1214 33101  15300 13R  S2       
-         5       1215 33101  15198 13L  S2       
-         5       1216 33101  15330 13R  S2       
-         5       1217 33101  15223 13L  S2       
-         5       1218 33101  15323 13R  S2       
-         5       1219 33101  15214 13L  S2       
-         5       1220 33101  15317 13R  S2       
-         5       1221 33101  15209 13L  S2       
-         5       1222 33101  15346 13R  S2       
-         5       1223 33101  15231 13L  S2       
-         5       1224 33101  15351 13R  S2       
-         5       1225 33101  15264 13L  S2       
-         5       1226 33101  15356 13R  S2       
-         5       1227 33101  15208 13L  S2       
-         5       1228 33101  15361 13R  S2       
-         5       1229 33101  15229 13L  S2       
-         5       1230 33101  15306 13R  S2       
-         5       1231 33101  15255 13L  S2       
-         5       1232 33101  15310 13R  S2       
-         5       1233 33101  15244 13L  S2       
-         5       1234 33101  15301 13R  S2       
-         5       1235 33101  15199 13L  S2       
-         5       1236 33101  15331 13R  S2       
-         5       1237 33101  15224 13L  S2       
-         5       1238 33101  15324 13R  S2       
-         5       1239 33101  15219 13L  S2       
-         5       1240 33101  15318 13R  S2       
-         5       1241 33101  15212 13L  S2       
-         5       1242 33101  15347 13R  S2       
-         5       1243 33101  15232 13L  S2       
-         5       1244 33101  15352 13R  S2       
-         5       1245 33101  15265 13L  S2       
-         5       1246 33101  15357 13R  S2       
-         5       1247 33101  15216 13L  S2       
-         5       1248 33101  15362 13R  S2       
-         5       1249 33101  15233 13L  S2       
-         5       1250 33101  15307 13R  S2       
-         5       1251 33101  15256 13L  S2       
-         5       1252 33101  15316 13R  S2       
-         5       1253 33101  15245 13L  S2       
-         5       1254 33101  15302 13R  S2       
-         5       1255 33101  15200 13L  S2       
-         5       1256 33101  15332 13R  S2       
-         5       1257 33101  15225 13L  S2       
-         5       1258 33101  15326 13R  S2       
-         5       1259 33101  15220 13L  S2       
-         5       1260 33101  15319 13R  S2       
-         5       1261 33101  15215 13L  S2       
-         5       1262 33101  15348 13R  S2       
-         5       1263 33101  15236 13L  S2       
-         5       1264 33101  15353 13R  S2       
-         5       1265 33101  15241 13L  S2       
-         5       1266 33101  15358 13R  S2       
-         5       1267 33101  15211 13L  S2       
-         5       1268 33101  15363 13R  S2       
-         5       1269 33101  15234 13L  S2       
-         5       1270 33101  15308 13R  S2       
-         5       1271 33101  15257 13L  S2       
-         5       1272 33101  15325 13R  S2       
-         5       1273 33101  15246 13L  S2       
-         5       1274 33101  15303 13R  S2       
-         5       1275 33101  15201 13L  S2       
-         5       1276 33101  15333 13R  S2       
-         5       1277 33101  15226 13L  S2       
-         5       1278 33101  15327 13R  S2       
-         5       1279 33101  15221 13L  S2       
-         5       1280 33101  15320 13R  S2       
-         5       1281 33101  15247 13L  S2       
-         5       1282 33101  15349 13R  S2       
-         5       1283 33101  15237 13L  S2       
-         5       1284 33101  15354 13R  S2       
-         5       1285 33101  15230 13L  S2       
-         5       1286 33101  15359 13R  S2       
-         5       1287 33101  15217 13L  S2       
-         5       1288 33101  15364 13R  S2       
-         5       1289 33101  15235 13L  S2       
-         5       1290 33101  15321 13R  S2       
-         5       1291 33101  15269 13L  S2       
-         5       1292 33101  15329 13R  S2       
-         5       1293 33101  15250 13L  S2       
-         5       1294 33101  15304 13R  S2       
-         5       1295 33101  15213 13L  S2       
-         5       1296 33101  15334 13R  S2       
-         5       1297 33101  15227 13L  S2       
-         5       1298 33101  15328 13R  S2       
-         5       1299 33101  15222 13L  S2       
-         5       1300 33101  15322 13R  S2       
-         5       1301 33101  12393 14L  S1       
-         5       1302 33101  13750 14R  S2       
-         5       1303 33101  13650 14L  S2       
-         5       1304 33101  13755 14R  S2       
-         5       1305 33101  13655 14L  S2       
-         5       1306 33101  12280 14R  S1       
-         5       1307 33101  13660 14L  S2       
-         5       1308 33101  13762 14R  S2       
-         5       1309 33101  13665 14L  S2       
-         5       1310 33101  13767 14R  S2       
-         5       1311 33101  13670 14L  S2       
-         5       1312 33101  13772 14R  S2       
-         5       1313 33101  13675 14L  S2       
-         5       1314 33101  13777 14R  S2       
-         5       1315 33101  13680 14L  S2       
-         5       1316 33101  13782 14R  S2       
-         5       1317 33101  13685 14L  S2       
-         5       1318 33101  13788 14R  S2       
-         5       1319 33101  13690 14L  S2       
-         5       1320 33101  13793 14R  S2       
-         5       1321 33101  12338 14L  S1       
-         5       1322 33101  13751 14R  S2       
-         5       1323 33101  13651 14L  S2       
-         5       1324 33101  13756 14R  S2       
-         5       1325 33101  13656 14L  S2       
-         5       1326 33101  12291 14R  S1       
-         5       1327 33101  13661 14L  S2       
-         5       1328 33101  13763 14R  S2       
-         5       1329 33101  13666 14L  S2       
-         5       1330 33101  13768 14R  S2       
-         5       1331 33101  13671 14L  S2       
-         5       1332 33101  13773 14R  S2       
-         5       1333 33101  13676 14L  S2       
-         5       1334 33101  13778 14R  S2       
-         5       1335 33101  13681 14L  S2       
-         5       1336 33101  13783 14R  S2       
-         5       1337 33101  13686 14L  S2       
-         5       1338 33101  13789 14R  S2       
-         5       1339 33101  13691 14L  S2       
-         5       1340 33101  13795 14R  S2       
-         5       1341 33101  13646 14L  S2       
-         5       1342 33101  13752 14R  S2       
-         5       1343 33101  13652 14L  S2       
-         5       1344 33101  13757 14R  S2       
-         5       1345 33101  13657 14L  S2       
-         5       1346 33101  12294 14R  S1       
-         5       1347 33101  13662 14L  S2       
-         5       1348 33101  13764 14R  S2       
-         5       1349 33101  13667 14L  S2       
-         5       1350 33101  13769 14R  S2       
-         5       1351 33101  13672 14L  S2       
-         5       1352 33101  13774 14R  S2       
-         5       1353 33101  13677 14L  S2       
-         5       1354 33101  13779 14R  S2       
-         5       1355 33101  13682 14L  S2       
-         5       1356 33101  13784 14R  S2       
-         5       1357 33101  13687 14L  S2       
-         5       1358 33101  13790 14R  S2       
-         5       1359 33101  13692 14L  S2       
-         5       1360 33101  13796 14R  S2       
-         5       1361 33101  13647 14L  S2       
-         5       1362 33101  13753 14R  S2       
-         5       1363 33101  13653 14L  S2       
-         5       1364 33101  13758 14R  S2       
-         5       1365 33101  13658 14L  S2       
-         5       1366 33101  12295 14R  S1       
-         5       1367 33101  13663 14L  S2       
-         5       1368 33101  13765 14R  S2       
-         5       1369 33101  13668 14L  S2       
-         5       1370 33101  13770 14R  S2       
-         5       1371 33101  13673 14L  S2       
-         5       1372 33101  13775 14R  S2       
-         5       1373 33101  13678 14L  S2       
-         5       1374 33101  13780 14R  S2       
-         5       1375 33101  13683 14L  S2       
-         5       1376 33101  13785 14R  S2       
-         5       1377 33101  13688 14L  S2       
-         5       1378 33101  13791 14R  S2       
-         5       1379 33101  13693 14L  S2       
-         5       1380 33101  13797 14R  S2       
-         5       1381 33101  13648 14L  S2       
-         5       1382 33101  13754 14R  S2       
-         5       1383 33101  13654 14L  S2       
-         5       1384 33101  13759 14R  S2       
-         5       1385 33101  13659 14L  S2       
-         5       1386 33101  12300 14R  S1       
-         5       1387 33101  13664 14L  S2       
-         5       1388 33101  13766 14R  S2       
-         5       1389 33101  13669 14L  S2       
-         5       1390 33101  13771 14R  S2       
-         5       1391 33101  13674 14L  S2       
-         5       1392 33101  13776 14R  S2       
-         5       1393 33101  13679 14L  S2       
-         5       1394 33101  13781 14R  S2       
-         5       1395 33101  13684 14L  S2       
-         5       1396 33101  13787 14R  S2       
-         5       1397 33101  13689 14L  S2       
-         5       1398 33101  13792 14R  S2       
-         5       1399 33101  13694 14L  S2       
-         5       1400 33101  13798 14R  S2       
-         5       1401 33101  13910 15L  S2       
-         5       1402 33101  14000 15R  S2       
-         5       1403 33101  10200 15L  P5_1     
-         5       1404 33101  13953 15R  S2       
-         5       1405 33101  13868 15L  S2       
-         5       1406 33101  13959 15R  S2       
-         5       1407 33101  13874 15L  S2       
-         5       1408 33101  13964 15R  S2       
-         5       1409 33101  13880 15L  S2       
-         5       1410 33101  13969 15R  S2       
-         5       1411 33101  13885 15L  S2       
-         5       1412 33101  13974 15R  S2       
-         5       1413 33101  13890 15L  S2       
-         5       1414 33101  13980 15R  S2       
-         5       1415 33101  13895 15L  S2       
-         5       1416 33101  13985 15R  S2       
-         5       1417 33101  13900 15L  S2       
-         5       1418 33101  13990 15R  S2       
-         5       1419 33101  13905 15L  S2       
-         5       1420 33101  13995 15R  S2       
-         5       1421 33101  13911 15L  S2       
-         5       1422 33101  14001 15R  S2       
-         5       1423 33101  13863 15L  S2       
-         5       1424 33101  13954 15R  S2       
-         5       1425 33101  13869 15L  S2       
-         5       1426 33101  13960 15R  S2       
-         5       1427 33101  13875 15L  S2       
-         5       1428 33101  13965 15R  S2       
-         5       1429 33101  13881 15L  S2       
-         5       1430 33101  13970 15R  S2       
-         5       1431 33101  13886 15L  S2       
-         5       1432 33101  13975 15R  S2       
-         5       1433 33101  13891 15L  S2       
-         5       1434 33101  13981 15R  S2       
-         5       1435 33101  13896 15L  S2       
-         5       1436 33101  13986 15R  S2       
-         5       1437 33101  13901 15L  S2       
-         5       1438 33101  13991 15R  S2       
-         5       1439 33101  13906 15L  S2       
-         5       1440 33101  13996 15R  S2       
-         5       1441 33101  13912 15L  S2       
-         5       1442 33101  14002 15R  S2       
-         5       1443 33101  13864 15L  S2       
-         5       1444 33101  13955 15R  S2       
-         5       1445 33101  13870 15L  S2       
-         5       1446 33101  13961 15R  S2       
-         5       1447 33101  13876 15L  S2       
-         5       1448 33101  13966 15R  S2       
-         5       1449 33101  13882 15L  S2       
-         5       1450 33101  13971 15R  S2       
-         5       1451 33101  13887 15L  S2       
-         5       1452 33101  13976 15R  S2       
-         5       1453 33101  13892 15L  S2       
-         5       1454 33101  13982 15R  S2       
-         5       1455 33101  13897 15L  S2       
-         5       1456 33101  13987 15R  S2       
-         5       1457 33101  13902 15L  S2       
-         5       1458 33101  13992 15R  S2       
-         5       1459 33101  13907 15L  S2       
-         5       1460 33101  13997 15R  S2       
-         5       1461 33101  13913 15L  S2       
-         5       1462 33101  14003 15R  S2       
-         5       1463 33101  13865 15L  S2       
-         5       1464 33101  13956 15R  S2       
-         5       1465 33101  13871 15L  S2       
-         5       1466 33101  13962 15R  S2       
-         5       1467 33101  13878 15L  S2       
-         5       1468 33101  13967 15R  S2       
-         5       1469 33101  13883 15L  S2       
-         5       1470 33101  13972 15R  S2       
-         5       1471 33101  13888 15L  S2       
-         5       1472 33101  13978 15R  S2       
-         5       1473 33101  13893 15L  S2       
-         5       1474 33101  13983 15R  S2       
-         5       1475 33101  13898 15L  S2       
-         5       1476 33101  13988 15R  S2       
-         5       1477 33101  13903 15L  S2       
-         5       1478 33101  13993 15R  S2       
-         5       1479 33101  13908 15L  S2       
-         5       1480 33101  13998 15R  S2       
-         5       1481 33101  13914 15L  S2       
-         5       1482 33101  14004 15R  S2       
-         5       1483 33101  13867 15L  S2       
-         5       1484 33101  13958 15R  S2       
-         5       1485 33101  13872 15L  S2       
-         5       1486 33101  13963 15R  S2       
-         5       1487 33101  13879 15L  S2       
-         5       1488 33101  13968 15R  S2       
-         5       1489 33101  13884 15L  S2       
-         5       1490 33101  13973 15R  S2       
-         5       1491 33101  13889 15L  S2       
-         5       1492 33101  13979 15R  S2       
-         5       1493 33101  13894 15L  S2       
-         5       1494 33101  13984 15R  S2       
-         5       1495 33101  13899 15L  S2       
-         5       1496 33101  13989 15R  S2       
-         5       1497 33101  13904 15L  S2       
-         5       1498 33101  13994 15R  S2       
-         5       1499 33101  13909 15L  S2       
-         5       1500 33101  13999 15R  S2       
-         5       1501 33101   9901 16L  S1       
-         5       1502 33101  12496 16R  S1       
-         5       1503 33101  14049 16L  S2       
-         5       1504 33101  14142 16R  S2       
-         5       1505 33101  14055 16L  S2       
-         5       1506 33101  14147 16R  S2       
-         5       1507 33101  14060 16L  S2       
-         5       1508 33101  14152 16R  S2       
-         5       1509 33101  14065 16L  S2       
-         5       1510 33101  14157 16R  S2       
-         5       1511 33101  14072 16L  S2       
-         5       1512 33101  14162 16R  S2       
-         5       1513 33101  14078 16L  S2       
-         5       1514 33101  14167 16R  S2       
-         5       1515 33101  14083 16L  S2       
-         5       1516 33101  14173 16R  S2       
-         5       1517 33101  14088 16L  S2       
-         5       1518 33101  14180 16R  S2       
-         5       1519 33101  14095 16L  S2       
-         5       1520 33101  14185 16R  S2       
-         5       1521 33101  12532 16L  S1       
-         5       1522 33101  14138 16R  S2       
-         5       1523 33101  14050 16L  S2       
-         5       1524 33101  14143 16R  S2       
-         5       1525 33101  14056 16L  S2       
-         5       1526 33101  14148 16R  S2       
-         5       1527 33101  14061 16L  S2       
-         5       1528 33101  14153 16R  S2       
-         5       1529 33101  14066 16L  S2       
-         5       1530 33101  14158 16R  S2       
-         5       1531 33101  14073 16L  S2       
-         5       1532 33101  14163 16R  S2       
-         5       1533 33101  14079 16L  S2       
-         5       1534 33101  14168 16R  S2       
-         5       1535 33101  14084 16L  S2       
-         5       1536 33101  14174 16R  S2       
-         5       1537 33101  14091 16L  S2       
-         5       1538 33101  14181 16R  S2       
-         5       1539 33101  14096 16L  S2       
-         5       1540 33101  14186 16R  S2       
-         5       1541 33101  14046 16L  S2       
-         5       1542 33101  14139 16R  S2       
-         5       1543 33101  14051 16L  S2       
-         5       1544 33101  14144 16R  S2       
-         5       1545 33101  14057 16L  S2       
-         5       1546 33101  14149 16R  S2       
-         5       1547 33101  14062 16L  S2       
-         5       1548 33101  14154 16R  S2       
-         5       1549 33101  14067 16L  S2       
-         5       1550 33101  14159 16R  S2       
-         5       1551 33101  14074 16L  S2       
-         5       1552 33101  14164 16R  S2       
-         5       1553 33101  14080 16L  S2       
-         5       1554 33101  14169 16R  S2       
-         5       1555 33101  14085 16L  S2       
-         5       1556 33101  14176 16R  S2       
-         5       1557 33101  14092 16L  S2       
-         5       1558 33101  14182 16R  S2       
-         5       1559 33101  14097 16L  S2       
-         5       1560 33101  14187 16R  S2       
-         5       1561 33101  14047 16L  S2       
-         5       1562 33101  14140 16R  S2       
-         5       1563 33101  14052 16L  S2       
-         5       1564 33101  14145 16R  S2       
-         5       1565 33101  14058 16L  S2       
-         5       1566 33101  14150 16R  S2       
-         5       1567 33101  14063 16L  S2       
-         5       1568 33101  14155 16R  S2       
-         5       1569 33101  14069 16L  S2       
-         5       1570 33101  14160 16R  S2       
-         5       1571 33101  14075 16L  S2       
-         5       1572 33101  14165 16R  S2       
-         5       1573 33101  14081 16L  S2       
-         5       1574 33101  14170 16R  S2       
-         5       1575 33101  14086 16L  S2       
-         5       1576 33101  14178 16R  S2       
-         5       1577 33101  14093 16L  S2       
-         5       1578 33101  14183 16R  S2       
-         5       1579 33101  14098 16L  S2       
-         5       1580 33101  14188 16R  S2       
-         5       1581 33101  14048 16L  S2       
-         5       1582 33101  14141 16R  S2       
-         5       1583 33101  14053 16L  S2       
-         5       1584 33101  14146 16R  S2       
-         5       1585 33101  14059 16L  S2       
-         5       1586 33101  14151 16R  S2       
-         5       1587 33101  14064 16L  S2       
-         5       1588 33101  14156 16R  S2       
-         5       1589 33101  14070 16L  S2       
-         5       1590 33101  14161 16R  S2       
-         5       1591 33101  14077 16L  S2       
-         5       1592 33101  14166 16R  S2       
-         5       1593 33101  14082 16L  S2       
-         5       1594 33101  14171 16R  S2       
-         5       1595 33101  14087 16L  S2       
-         5       1596 33101  14179 16R  S2       
-         5       1597 33101  14094 16L  S2       
-         5       1598 33101  14184 16R  S2       
-         5       1599 33101  14099 16L  S2       
-         5       1600 33101  14189 16R  S2       
-         5       1601 33101  12786 17L  S1       
-         5       1602 33101  12654 17R  S1       
-         5       1603 33101  12792 17L  S1       
-         5       1604 33101  12659 17R  S1       
-         5       1605 33101  12797 17L  S1       
-         5       1606 33101  12664 17R  S1       
-         5       1607 33101  12718 17L  S1       
-         5       1608 33101  12670 17R  S1       
-         5       1609 33101  12739 17L  S1       
-         5       1610 33101  12675 17R  S1       
-         5       1611 33101  14231 17L  S2       
-         5       1612 33101  12682 17R  S1       
-         5       1613 33101  14236 17L  S2       
-         5       1614 33101  12688 17R  S1       
-         5       1615 33101  14241 17L  S2       
-         5       1616 33101  12693 17R  S1       
-         5       1617 33101  14246 17L  S2       
-         5       1618 33101  12698 17R  S1       
-         5       1619 33101  14251 17L  S2       
-         5       1620 33101  14291 17R  S2       
-         5       1621 33101  12787 17L  S1       
-         5       1622 33101  12655 17R  S1       
-         5       1623 33101  12793 17L  S1       
-         5       1624 33101  12660 17R  S1       
-         5       1625 33101  12798 17L  S1       
-         5       1626 33101  12665 17R  S1       
-         5       1627 33101  12719 17L  S1       
-         5       1628 33101  12671 17R  S1       
-         5       1629 33101  12743 17L  S1       
-         5       1630 33101  12676 17R  S1       
-         5       1631 33101  14232 17L  S2       
-         5       1632 33101  12684 17R  S1       
-         5       1633 33101  14237 17L  S2       
-         5       1634 33101  12689 17R  S1       
-         5       1635 33101  14242 17L  S2       
-         5       1636 33101  12694 17R  S1       
-         5       1637 33101  14247 17L  S2       
-         5       1638 33101  12699 17R  S1       
-         5       1639 33101  14253 17L  S2       
-         5       1640 33101  14292 17R  S2       
-         5       1641 33101  12788 17L  S1       
-         5       1642 33101  12656 17R  S1       
-         5       1643 33101  12794 17L  S1       
-         5       1644 33101  12661 17R  S1       
-         5       1645 33101  12799 17L  S1       
-         5       1646 33101  12666 17R  S1       
-         5       1647 33101  12723 17L  S1       
-         5       1648 33101  12672 17R  S1       
-         5       1649 33101  12767 17L  S1       
-         5       1650 33101  12678 17R  S1       
-         5       1651 33101  14233 17L  S2       
-         5       1652 33101  12685 17R  S1       
-         5       1653 33101  14238 17L  S2       
-         5       1654 33101  12690 17R  S1       
-         5       1655 33101  14243 17L  S2       
-         5       1656 33101  12695 17R  S1       
-         5       1657 33101  14248 17L  S2       
-         5       1658 33101  12700 17R  S1       
-         5       1659 33101  14254 17L  S2       
-         5       1660 33101  14293 17R  S2       
-         5       1661 33101  12789 17L  S1       
-         5       1662 33101  12657 17R  S1       
-         5       1663 33101  12795 17L  S1       
-         5       1664 33101  12662 17R  S1       
-         5       1665 33101  12800 17L  S1       
-         5       1666 33101  12668 17R  S1       
-         5       1667 33101  12729 17L  S1       
-         5       1668 33101  12673 17R  S1       
-         5       1669 33101  12780 17L  S1       
-         5       1670 33101  12679 17R  S1       
-         5       1671 33101  14234 17L  S2       
-         5       1672 33101  12686 17R  S1       
-         5       1673 33101  14239 17L  S2       
-         5       1674 33101  12691 17R  S1       
-         5       1675 33101  14244 17L  S2       
-         5       1676 33101  12696 17R  S1       
-         5       1677 33101  14249 17L  S2       
-         5       1678 33101  14289 17R  S2       
-         5       1679 33101  14255 17L  S2       
-         5       1680 33101  14295 17R  S2       
-         5       1681 33101  12790 17L  S1       
-         5       1682 33101  12658 17R  S1       
-         5       1683 33101  12796 17L  S1       
-         5       1684 33101  12663 17R  S1       
-         5       1685 33101  12701 17L  S1       
-         5       1686 33101  12669 17R  S1       
-         5       1687 33101  12734 17L  S1       
-         5       1688 33101  12674 17R  S1       
-         5       1689 33101  12783 17L  S1       
-         5       1690 33101  12680 17R  S1       
-         5       1691 33101  14235 17L  S2       
-         5       1692 33101  12687 17R  S1       
-         5       1693 33101  14240 17L  S2       
-         5       1694 33101  12692 17R  S1       
-         5       1695 33101  14245 17L  S2       
-         5       1696 33101  12697 17R  S1       
-         5       1697 33101  14250 17L  S2       
-         5       1698 33101  14290 17R  S2       
-         5       1699 33101  14257 17L  S2       
-         5       1700 33101  14296 17R  S2       
-         6          1 33101   8138 1L   P3       
-         6          2 33101   8099 1R   P3       
-         6          3 33101  10305 1L   S1       
-         6          4 33101  10202 1R   S1       
-         6          5 33101  10312 1L   S1       
-         6          6 33101  10207 1R   S1       
-         6          7 33101  10319 1L   S1       
-         6          8 33101  10212 1R   S1       
-         6          9 33101  10326 1L   S1       
-         6         10 33101  10217 1R   S1       
-         6         11 33101  10335 1L   S1       
-         6         12 33101  10222 1R   S1       
-         6         13 33101  10378 1L   S1       
-         6         14 33101  10288 1R   S1       
-         6         15 33101  10388 1L   S1       
-         6         16 33101  10295 1R   S1       
-         6         17 33101  12803 1L   S2       
-         6         18 33101  10300 1R   S1       
-         6         19 33101  12811 1L   S2       
-         6         20 33101  10262 1R   S1       
-         6         21 33101  10396 1L   S1       
-         6         22 33101  10260 1R   S1       
-         6         23 33101  10311 1L   S1       
-         6         24 33101  10267 1R   S1       
-         6         25 33101  10328 1L   S1       
-         6         26 33101  10271 1R   S1       
-         6         27 33101  10340 1L   S1       
-         6         28 33101  10275 1R   S1       
-         6         29 33101  10356 1L   S1       
-         6         30 33101  10279 1R   S1       
-         6         31 33101  10365 1L   S1       
-         6         32 33101  10284 1R   S1       
-         6         33 33101  10380 1L   S1       
-         6         34 33101  10289 1R   S1       
-         6         35 33101  10392 1L   S1       
-         6         36 33101  10296 1R   S1       
-         6         37 33101  12804 1L   S2       
-         6         38 33101  10224 1R   S1       
-         6         39 33101  12812 1L   S2       
-         6         40 33101  10263 1R   S1       
-         6         41 33101  10398 1L   S1       
-         6         42 33101  10264 1R   S1       
-         6         43 33101  10315 1L   S1       
-         6         44 33101  10268 1R   S1       
-         6         45 33101  10333 1L   S1       
-         6         46 33101  10272 1R   S1       
-         6         47 33101  10343 1L   S1       
-         6         48 33101  10276 1R   S1       
-         6         49 33101  10359 1L   S1       
-         6         50 33101  10280 1R   S1       
-         6         51 33101  10366 1L   S1       
-         6         52 33101  10285 1R   S1       
-         6         53 33101  10381 1L   S1       
-         6         54 33101  10291 1R   S1       
-         6         55 33101  10395 1L   S1       
-         6         56 33101  10297 1R   S1       
-         6         57 33101  12805 1L   S2       
-         6         58 33101  10236 1R   S1       
-         6         59 33101  12813 1L   S2       
-         6         60 33101  10292 1R   S1       
-         6         61 33101  10400 1L   S1       
-         6         62 33101  10265 1R   S1       
-         6         63 33101  10322 1L   S1       
-         6         64 33101  10269 1R   S1       
-         6         65 33101  10334 1L   S1       
-         6         66 33101  10273 1R   S1       
-         6         67 33101  10347 1L   S1       
-         6         68 33101  10277 1R   S1       
-         6         69 33101  10361 1L   S1       
-         6         70 33101  10281 1R   S1       
-         6         71 33101  10370 1L   S1       
-         6         72 33101  10286 1R   S1       
-         6         73 33101  10383 1L   S1       
-         6         74 33101  10293 1R   S1       
-         6         75 33101  12801 1L   S2       
-         6         76 33101  10298 1R   S1       
-         6         77 33101  12806 1L   S2       
-         6         78 33101  10257 1R   S1       
-         6         79 33101  12814 1L   S2       
-         6         80 33101  12861 1R   S2       
-         6         81 33101  10306 1L   S1       
-         6         82 33101  10266 1R   S1       
-         6         83 33101  10324 1L   S1       
-         6         84 33101  10270 1R   S1       
-         6         85 33101  10337 1L   S1       
-         6         86 33101  10274 1R   S1       
-         6         87 33101  10350 1L   S1       
-         6         88 33101  10278 1R   S1       
-         6         89 33101  10362 1L   S1       
-         6         90 33101  10283 1R   S1       
-         6         91 33101  10374 1L   S1       
-         6         92 33101  10287 1R   S1       
-         6         93 33101  10386 1L   S1       
-         6         94 33101  10294 1R   S1       
-         6         95 33101  12802 1L   S2       
-         6         96 33101  10299 1R   S1       
-         6         97 33101  12810 1L   S2       
-         6         98 33101  10261 1R   S1       
-         6         99 33101  12815 1L   S2       
-         6        100 33101  12862 1R   S2       
-         6        101 33101  10570 2L   S1       
-         6        102 33101  10453 2R   S1       
-         6        103 33101  10577 2L   S1       
-         6        104 33101  10458 2R   S1       
-         6        105 33101  10582 2L   S1       
-         6        106 33101  10463 2R   S1       
-         6        107 33101  10588 2L   S1       
-         6        108 33101  10468 2R   S1       
-         6        109 33101  10593 2L   S1       
-         6        110 33101  10474 2R   S1       
-         6        111 33101  10598 2L   S1       
-         6        112 33101  10479 2R   S1       
-         6        113 33101  10539 2L   S1       
-         6        114 33101  10484 2R   S1       
-         6        115 33101  10576 2L   S1       
-         6        116 33101  10489 2R   S1       
-         6        117 33101  12922 2L   S2       
-         6        118 33101  10494 2R   S1       
-         6        119 33101  12933 2L   S2       
-         6        120 33101  10499 2R   S1       
-         6        121 33101  10571 2L   S1       
-         6        122 33101  10454 2R   S1       
-         6        123 33101  10578 2L   S1       
-         6        124 33101  10459 2R   S1       
-         6        125 33101  10583 2L   S1       
-         6        126 33101  10464 2R   S1       
-         6        127 33101  10589 2L   S1       
-         6        128 33101  10470 2R   S1       
-         6        129 33101  10594 2L   S1       
-         6        130 33101  10475 2R   S1       
-         6        131 33101  10599 2L   S1       
-         6        132 33101  10480 2R   S1       
-         6        133 33101  10540 2L   S1       
-         6        134 33101  10485 2R   S1       
-         6        135 33101  12917 2L   S2       
-         6        136 33101  10490 2R   S1       
-         6        137 33101  12923 2L   S2       
-         6        138 33101  10495 2R   S1       
-         6        139 33101  12934 2L   S2       
-         6        140 33101  10500 2R   S1       
-         6        141 33101  10572 2L   S1       
-         6        142 33101  10455 2R   S1       
-         6        143 33101  10579 2L   S1       
-         6        144 33101  10460 2R   S1       
-         6        145 33101  10585 2L   S1       
-         6        146 33101  10465 2R   S1       
-         6        147 33101  10590 2L   S1       
-         6        148 33101  10471 2R   S1       
-         6        149 33101  10595 2L   S1       
-         6        150 33101  10476 2R   S1       
-         6        151 33101  10600 2L   S1       
-         6        152 33101  10481 2R   S1       
-         6        153 33101  10545 2L   S1       
-         6        154 33101  10486 2R   S1       
-         6        155 33101  12918 2L   S2       
-         6        156 33101  10491 2R   S1       
-         6        157 33101  12926 2L   S2       
-         6        158 33101  10496 2R   S1       
-         6        159 33101  12936 2L   S2       
-         6        160 33101  10439 2R   S1       
-         6        161 33101  10573 2L   S1       
-         6        162 33101  10456 2R   S1       
-         6        163 33101  10580 2L   S1       
-         6        164 33101  10461 2R   S1       
-         6        165 33101  10586 2L   S1       
-         6        166 33101  10466 2R   S1       
-         6        167 33101  10591 2L   S1       
-         6        168 33101  10472 2R   S1       
-         6        169 33101  10596 2L   S1       
-         6        170 33101  10477 2R   S1       
-         6        171 33101  10521 2L   S1       
-         6        172 33101  10482 2R   S1       
-         6        173 33101  10551 2L   S1       
-         6        174 33101  10487 2R   S1       
-         6        175 33101  12920 2L   S2       
-         6        176 33101  10492 2R   S1       
-         6        177 33101  12929 2L   S2       
-         6        178 33101  10497 2R   S1       
-         6        179 33101  12937 2L   S2       
-         6        180 33101  12986 2R   S2       
-         6        181 33101  10575 2L   S1       
-         6        182 33101  10457 2R   S1       
-         6        183 33101  10581 2L   S1       
-         6        184 33101  10462 2R   S1       
-         6        185 33101  10587 2L   S1       
-         6        186 33101  10467 2R   S1       
-         6        187 33101  10592 2L   S1       
-         6        188 33101  10473 2R   S1       
-         6        189 33101  10597 2L   S1       
-         6        190 33101  10478 2R   S1       
-         6        191 33101  10533 2L   S1       
-         6        192 33101  10483 2R   S1       
-         6        193 33101  10553 2L   S1       
-         6        194 33101  10488 2R   S1       
-         6        195 33101  12921 2L   S2       
-         6        196 33101  10493 2R   S1       
-         6        197 33101  12932 2L   S2       
-         6        198 33101  10498 2R   S1       
-         6        199 33101  12939 2L   S2       
-         6        200 33101  12987 2R   S2       
-         6        201 33101  10715 3L   S1       
-         6        202 33101  10660 3R   S1       
-         6        203 33101  10673 3L   S1       
-         6        204 33101  13165 3R   S2       
-         6        205 33101  13044 3L   S2       
-         6        206 33101  13172 3R   S2       
-         6        207 33101  13049 3L   S2       
-         6        208 33101  13178 3R   S2       
-         6        209 33101  13054 3L   S2       
-         6        210 33101  13184 3R   S2       
-         6        211 33101  13059 3L   S2       
-         6        212 33101  13189 3R   S2       
-         6        213 33101  13064 3L   S2       
-         6        214 33101  13195 3R   S2       
-         6        215 33101  13069 3L   S2       
-         6        216 33101  13202 3R   S2       
-         6        217 33101  13075 3L   S2       
-         6        218 33101  13207 3R   S2       
-         6        219 33101  13080 3L   S2       
-         6        220 33101  13213 3R   S2       
-         6        221 33101  10716 3L   S1       
-         6        222 33101  13159 3R   S2       
-         6        223 33101  10719 3L   S1       
-         6        224 33101  13166 3R   S2       
-         6        225 33101  13045 3L   S2       
-         6        226 33101  13173 3R   S2       
-         6        227 33101  13050 3L   S2       
-         6        228 33101  13179 3R   S2       
-         6        229 33101  13055 3L   S2       
-         6        230 33101  13185 3R   S2       
-         6        231 33101  13060 3L   S2       
-         6        232 33101  13190 3R   S2       
-         6        233 33101  13065 3L   S2       
-         6        234 33101  13196 3R   S2       
-         6        235 33101  13071 3L   S2       
-         6        236 33101  13203 3R   S2       
-         6        237 33101  13076 3L   S2       
-         6        238 33101  13208 3R   S2       
-         6        239 33101  13081 3L   S2       
-         6        240 33101  13214 3R   S2       
-         6        241 33101  10717 3L   S1       
-         6        242 33101  13161 3R   S2       
-         6        243 33101  13041 3L   S2       
-         6        244 33101  13167 3R   S2       
-         6        245 33101  13046 3L   S2       
-         6        246 33101  13174 3R   S2       
-         6        247 33101  13051 3L   S2       
-         6        248 33101  13180 3R   S2       
-         6        249 33101  13056 3L   S2       
-         6        250 33101  13186 3R   S2       
-         6        251 33101  13061 3L   S2       
-         6        252 33101  13191 3R   S2       
-         6        253 33101  13066 3L   S2       
-         6        254 33101  13197 3R   S2       
-         6        255 33101  13072 3L   S2       
-         6        256 33101  13204 3R   S2       
-         6        257 33101  13077 3L   S2       
-         6        258 33101  13209 3R   S2       
-         6        259 33101  13082 3L   S2       
-         6        260 33101  13216 3R   S2       
-         6        261 33101  10718 3L   S1       
-         6        262 33101  13162 3R   S2       
-         6        263 33101  13042 3L   S2       
-         6        264 33101  13168 3R   S2       
-         6        265 33101  13047 3L   S2       
-         6        266 33101  13176 3R   S2       
-         6        267 33101  13052 3L   S2       
-         6        268 33101  13181 3R   S2       
-         6        269 33101  13057 3L   S2       
-         6        270 33101  13187 3R   S2       
-         6        271 33101  13062 3L   S2       
-         6        272 33101  13193 3R   S2       
-         6        273 33101  13067 3L   S2       
-         6        274 33101  13198 3R   S2       
-         6        275 33101  13073 3L   S2       
-         6        276 33101  13205 3R   S2       
-         6        277 33101  13078 3L   S2       
-         6        278 33101  13211 3R   S2       
-         6        279 33101  13083 3L   S2       
-         6        280 33101  13217 3R   S2       
-         6        281 33101  10720 3L   S1       
-         6        282 33101  13163 3R   S2       
-         6        283 33101  13043 3L   S2       
-         6        284 33101  13169 3R   S2       
-         6        285 33101  13048 3L   S2       
-         6        286 33101  13177 3R   S2       
-         6        287 33101  13053 3L   S2       
-         6        288 33101  13183 3R   S2       
-         6        289 33101  13058 3L   S2       
-         6        290 33101  13188 3R   S2       
-         6        291 33101  13063 3L   S2       
-         6        292 33101  13194 3R   S2       
-         6        293 33101  13068 3L   S2       
-         6        294 33101  13199 3R   S2       
-         6        295 33101  13074 3L   S2       
-         6        296 33101  13206 3R   S2       
-         6        297 33101  13079 3L   S2       
-         6        298 33101  13212 3R   S2       
-         6        299 33101  13084 3L   S2       
-         6        300 33101  13222 3R   S2       
-         6        301 33101  10812 4L   S1       
-         6        302 33101  10729 4R   S1       
-         6        303 33101  13252 4L   S2       
-         6        304 33101  10780 4R   S1       
-         6        305 33101  13259 4L   S2       
-         6        306 33101  13355 4R   S2       
-         6        307 33101  13266 4L   S2       
-         6        308 33101  13361 4R   S2       
-         6        309 33101  13273 4L   S2       
-         6        310 33101  13367 4R   S2       
-         6        311 33101  13278 4L   S2       
-         6        312 33101  13373 4R   S2       
-         6        313 33101  13285 4L   S2       
-         6        314 33101  13379 4R   S2       
-         6        315 33101  13291 4L   S2       
-         6        316 33101  13384 4R   S2       
-         6        317 33101  13296 4L   S2       
-         6        318 33101  13389 4R   S2       
-         6        319 33101  13304 4L   S2       
-         6        320 33101  13394 4R   S2       
-         6        321 33101  10821 4L   S1       
-         6        322 33101  10758 4R   S1       
-         6        323 33101  13254 4L   S2       
-         6        324 33101  13351 4R   S2       
-         6        325 33101  13260 4L   S2       
-         6        326 33101  13357 4R   S2       
-         6        327 33101  13267 4L   S2       
-         6        328 33101  13362 4R   S2       
-         6        329 33101  13274 4L   S2       
-         6        330 33101  13368 4R   S2       
-         6        331 33101  13281 4L   S2       
-         6        332 33101  13374 4R   S2       
-         6        333 33101  13287 4L   S2       
-         6        334 33101  13380 4R   S2       
-         6        335 33101  13292 4L   S2       
-         6        336 33101  13385 4R   S2       
-         6        337 33101  13297 4L   S2       
-         6        338 33101  13390 4R   S2       
-         6        339 33101  13306 4L   S2       
-         6        340 33101  13395 4R   S2       
-         6        341 33101  10824 4L   S1       
-         6        342 33101  10777 4R   S1       
-         6        343 33101  13256 4L   S2       
-         6        344 33101  13352 4R   S2       
-         6        345 33101  13261 4L   S2       
-         6        346 33101  13358 4R   S2       
-         6        347 33101  13268 4L   S2       
-         6        348 33101  13363 4R   S2       
-         6        349 33101  13275 4L   S2       
-         6        350 33101  13370 4R   S2       
-         6        351 33101  13282 4L   S2       
-         6        352 33101  13375 4R   S2       
-         6        353 33101  13288 4L   S2       
-         6        354 33101  13381 4R   S2       
-         6        355 33101  13293 4L   S2       
-         6        356 33101  13386 4R   S2       
-         6        357 33101  13298 4L   S2       
-         6        358 33101  13391 4R   S2       
-         6        359 33101  13309 4L   S2       
-         6        360 33101  13396 4R   S2       
-         6        361 33101  13248 4L   S2       
-         6        362 33101  10778 4R   S1       
-         6        363 33101  13257 4L   S2       
-         6        364 33101  13353 4R   S2       
-         6        365 33101  13263 4L   S2       
-         6        366 33101  13356 4R   S2       
-         6        367 33101  13270 4L   S2       
-         6        368 33101  13365 4R   S2       
-         6        369 33101  13276 4L   S2       
-         6        370 33101  13371 4R   S2       
-         6        371 33101  13283 4L   S2       
-         6        372 33101  13377 4R   S2       
-         6        373 33101  13289 4L   S2       
-         6        374 33101  13382 4R   S2       
-         6        375 33101  13294 4L   S2       
-         6        376 33101  13387 4R   S2       
-         6        377 33101  13299 4L   S2       
-         6        378 33101  13392 4R   S2       
-         6        379 33101  13310 4L   S2       
-         6        380 33101  13397 4R   S2       
-         6        381 33101  13250 4L   S2       
-         6        382 33101  10779 4R   S1       
-         6        383 33101  13258 4L   S2       
-         6        384 33101  13354 4R   S2       
-         6        385 33101  13265 4L   S2       
-         6        386 33101  13360 4R   S2       
-         6        387 33101  13272 4L   S2       
-         6        388 33101  13366 4R   S2       
-         6        389 33101  13277 4L   S2       
-         6        390 33101  13372 4R   S2       
-         6        391 33101  13284 4L   S2       
-         6        392 33101  13378 4R   S2       
-         6        393 33101  13290 4L   S2       
-         6        394 33101  13383 4R   S2       
-         6        395 33101  13295 4L   S2       
-         6        396 33101  13388 4R   S2       
-         6        397 33101  13301 4L   S2       
-         6        398 33101  13393 4R   S2       
-         6        399 33101  13311 4L   S2       
-         6        400 33101  13398 4R   S2       
-         6        401 33101  10950 5L   S1       
-         6        402 33101  10894 5R   S1       
-         6        403 33101  10901 5L   S1       
-         6        404 33101  10899 5R   S1       
-         6        405 33101  10956 5L   S1       
-         6        406 33101  13558 5R   S2       
-         6        407 33101  13454 5L   S2       
-         6        408 33101  13565 5R   S2       
-         6        409 33101  13464 5L   S2       
-         6        410 33101  13571 5R   S2       
-         6        411 33101  13475 5L   S2       
-         6        412 33101  13578 5R   S2       
-         6        413 33101  13488 5L   S2       
-         6        414 33101  13583 5R   S2       
-         6        415 33101  13507 5L   S2       
-         6        416 33101  13593 5R   S2       
-         6        417 33101  13515 5L   S2       
-         6        418 33101  13599 5R   S2       
-         6        419 33101  13479 5L   S2       
-         6        420 33101  13604 5R   S2       
-         6        421 33101  10951 5L   S1       
-         6        422 33101  10895 5R   S1       
-         6        423 33101  10905 5L   S1       
-         6        424 33101  13548 5R   S2       
-         6        425 33101  10957 5L   S1       
-         6        426 33101  13559 5R   S2       
-         6        427 33101  13455 5L   S2       
-         6        428 33101  13566 5R   S2       
-         6        429 33101  13466 5L   S2       
-         6        430 33101  13573 5R   S2       
-         6        431 33101  13476 5L   S2       
-         6        432 33101  13579 5R   S2       
-         6        433 33101  13492 5L   S2       
-         6        434 33101  13584 5R   S2       
-         6        435 33101  13508 5L   S2       
-         6        436 33101  13594 5R   S2       
-         6        437 33101  13518 5L   S2       
-         6        438 33101  13600 5R   S2       
-         6        439 33101  13485 5L   S2       
-         6        440 33101  13606 5R   S2       
-         6        441 33101  10952 5L   S1       
-         6        442 33101  10896 5R   S1       
-         6        443 33101  10911 5L   S1       
-         6        444 33101  13549 5R   S2       
-         6        445 33101  10958 5L   S1       
-         6        446 33101  13561 5R   S2       
-         6        447 33101  13456 5L   S2       
-         6        448 33101  13568 5R   S2       
-         6        449 33101  13468 5L   S2       
-         6        450 33101  13580 5R   S2       
-         6        451 33101  13480 5L   S2       
-         6        452 33101  13574 5R   S2       
-         6        453 33101  13494 5L   S2       
-         6        454 33101  13585 5R   S2       
-         6        455 33101  13509 5L   S2       
-         6        456 33101  13595 5R   S2       
-         6        457 33101  13521 5L   S2       
-         6        458 33101  13601 5R   S2       
-         6        459 33101  13487 5L   S2       
-         6        460 33101  13608 5R   S2       
-         6        461 33101  10953 5L   S1       
-         6        462 33101  10897 5R   S1       
-         6        463 33101  10924 5L   S1       
-         6        464 33101  13555 5R   S2       
-         6        465 33101  10959 5L   S1       
-         6        466 33101  13563 5R   S2       
-         6        467 33101  13457 5L   S2       
-         6        468 33101  13569 5R   S2       
-         6        469 33101  13470 5L   S2       
-         6        470 33101  13575 5R   S2       
-         6        471 33101  13482 5L   S2       
-         6        472 33101  13581 5R   S2       
-         6        473 33101  13495 5L   S2       
-         6        474 33101  13590 5R   S2       
-         6        475 33101  13510 5L   S2       
-         6        476 33101  13597 5R   S2       
-         6        477 33101  13473 5L   S2       
-         6        478 33101  13602 5R   S2       
-         6        479 33101  13490 5L   S2       
-         6        480 33101  13609 5R   S2       
-         6        481 33101  10954 5L   S1       
-         6        482 33101  10898 5R   S1       
-         6        483 33101  10955 5L   S1       
-         6        484 33101  13556 5R   S2       
-         6        485 33101  10960 5L   S1       
-         6        486 33101  13564 5R   S2       
-         6        487 33101  13460 5L   S2       
-         6        488 33101  13570 5R   S2       
-         6        489 33101  13474 5L   S2       
-         6        490 33101  13576 5R   S2       
-         6        491 33101  13484 5L   S2       
-         6        492 33101  13582 5R   S2       
-         6        493 33101  13499 5L   S2       
-         6        494 33101  13591 5R   S2       
-         6        495 33101  13513 5L   S2       
-         6        496 33101  13598 5R   S2       
-         6        497 33101  13478 5L   S2       
-         6        498 33101  13603 5R   S2       
-         6        499 33101  13514 5L   S2       
-         6        500 33101  13611 5R   S2       
-         6        501 33101  15417 6L   P7       
-         6        502 33101  15466 6R   P7       
-         6        503 33101  15412 6L   P7       
-         6        504 33101  15461 6R   P7       
-         6        505 33101  15407 6L   P7       
-         6        506 33101  15456 6R   P7       
-         6        507 33101  15401 6L   P7       
-         6        508 33101   1602 6R   8        
-         6        509 33101  11188 6L   S1       
-         6        510 33101  10991 6R   S1       
-         6        511 33101  11164 6L   S1       
-         6        512 33101  10986 6R   S1       
-         6        513 33101  11191 6L   S1       
-         6        514 33101  10981 6R   S1       
-         6        515 33101  11183 6L   S1       
-         6        516 33101  10976 6R   S1       
-         6        517 33101  11215 6L   S1       
-         6        518 33101  10961 6R   S1       
-         6        519 33101  11210 6L   S1       
-         6        520 33101  10971 6R   S1       
-         6        521 33101  15419 6L   P7       
-         6        522 33101  15467 6R   P7       
-         6        523 33101  15413 6L   P7       
-         6        524 33101  15462 6R   P7       
-         6        525 33101  15408 6L   P7       
-         6        526 33101  15457 6R   P7       
-         6        527 33101  15402 6L   P7       
-         6        528 33101   7263 6R   P2       
-         6        529 33101  11190 6L   S1       
-         6        530 33101  10992 6R   S1       
-         6        531 33101  11165 6L   S1       
-         6        532 33101  10987 6R   S1       
-         6        533 33101  11192 6L   S1       
-         6        534 33101  10982 6R   S1       
-         6        535 33101  11184 6L   S1       
-         6        536 33101  10977 6R   S1       
-         6        537 33101  11216 6L   S1       
-         6        538 33101  10962 6R   S1       
-         6        539 33101  11211 6L   S1       
-         6        540 33101  10972 6R   S1       
-         6        541 33101  15420 6L   P7       
-         6        542 33101  15468 6R   P7       
-         6        543 33101  15414 6L   P7       
-         6        544 33101  15463 6R   P7       
-         6        545 33101  15409 6L   P7       
-         6        546 33101  15458 6R   P7       
-         6        547 33101  15404 6L   P7       
-         6        548 33101   7265 6R   P2       
-         6        549 33101  11159 6L   S1       
-         6        550 33101  10993 6R   S1       
-         6        551 33101  11166 6L   S1       
-         6        552 33101   3163 6R   10       
-         6        553 33101  11193 6L   S1       
-         6        554 33101  10983 6R   S1       
-         6        555 33101  11185 6L   S1       
-         6        556 33101  10978 6R   S1       
-         6        557 33101  11241 6L   S1       
-         6        558 33101  10963 6R   S1       
-         6        559 33101  11212 6L   S1       
-         6        560 33101  10973 6R   S1       
-         6        561 33101  15421 6L   P7       
-         6        562 33101  15469 6R   P7       
-         6        563 33101  15415 6L   P7       
-         6        564 33101  15464 6R   P7       
-         6        565 33101  15410 6L   P7       
-         6        566 33101  15459 6R   P7       
-         6        567 33101  15405 6L   P7       
-         6        568 33101  11116 6R   S1       
-         6        569 33101  11162 6L   S1       
-         6        570 33101  10994 6R   S1       
-         6        571 33101  11168 6L   S1       
-         6        572 33101  10989 6R   S1       
-         6        573 33101  11160 6L   S1       
-         6        574 33101  10984 6R   S1       
-         6        575 33101  11186 6L   S1       
-         6        576 33101  10979 6R   S1       
-         6        577 33101  11194 6L   S1       
-         6        578 33101  10964 6R   S1       
-         6        579 33101  11213 6L   S1       
-         6        580 33101  10974 6R   S1       
-         6        581 33101  15422 6L   P7       
-         6        582 33101  15470 6R   P7       
-         6        583 33101  15416 6L   P7       
-         6        584 33101  15465 6R   P7       
-         6        585 33101  15411 6L   P7       
-         6        586 33101  15460 6R   P7       
-         6        587 33101  15406 6L   P7       
-         6        588 33101  11117 6R   S1       
-         6        589 33101  11163 6L   S1       
-         6        590 33101  10995 6R   S1       
-         6        591 33101  11169 6L   S1       
-         6        592 33101  10990 6R   S1       
-         6        593 33101  11161 6L   S1       
-         6        594 33101  10985 6R   S1       
-         6        595 33101  11187 6L   S1       
-         6        596 33101  10980 6R   S1       
-         6        597 33101  11277 6L   S1       
-         6        598 33101  10965 6R   S1       
-         6        599 33101  11214 6L   S1       
-         6        600 33101  10975 6R   S1       
-         6        601 33101  15566 7L   P7       
-         6        602 33101  15616 7R   P7       
-         6        603 33101  15556 7L   P7       
-         6        604 33101  15611 7R   P7       
-         6        605 33101  15551 7L   P7       
-         6        606 33101  15601 7R   P7       
-         6        607 33101  15546 7L   P7       
-         6        608 33101  11345 7R   S1       
-         6        609 33101  15531 7L   P7       
-         6        610 33101  11363 7R   S1       
-         6        611 33101  15536 7L   P7       
-         6        612 33101  11335 7R   S1       
-         6        613 33101  15526 7L   P7       
-         6        614 33101  11386 7R   S1       
-         6        615 33101  15521 7L   P7       
-         6        616 33101  11381 7R   S1       
-         6        617 33101  11490 7L   S1       
-         6        618 33101   9519 7R   P6       
-         6        619 33101   9581 7L   P6       
-         6        620 33101   1666 7R   8        
-         6        621 33101  15567 7L   P7       
-         6        622 33101  15617 7R   P7       
-         6        623 33101  15557 7L   P7       
-         6        624 33101  15612 7R   P7       
-         6        625 33101  15552 7L   P7       
-         6        626 33101  15602 7R   P7       
-         6        627 33101  15547 7L   P7       
-         6        628 33101  11346 7R   S1       
-         6        629 33101  15532 7L   P7       
-         6        630 33101  11364 7R   S1       
-         6        631 33101  15537 7L   P7       
-         6        632 33101  11337 7R   S1       
-         6        633 33101  15527 7L   P7       
-         6        634 33101  11387 7R   S1       
-         6        635 33101  15522 7L   P7       
-         6        636 33101  11382 7R   S1       
-         6        637 33101  11491 7L   S1       
-         6        638 33101   9533 7R   P6       
-         6        639 33101   9584 7L   P6       
-         6        640 33101   3422 7R   11       
-         6        641 33101  15569 7L   P7       
-         6        642 33101  15618 7R   P7       
-         6        643 33101  15558 7L   P7       
-         6        644 33101  15613 7R   P7       
-         6        645 33101  15553 7L   P7       
-         6        646 33101  15603 7R   P7       
-         6        647 33101  15548 7L   P7       
-         6        648 33101  11358 7R   S1       
-         6        649 33101  15533 7L   P7       
-         6        650 33101  11365 7R   S1       
-         6        651 33101  15538 7L   P7       
-         6        652 33101  11338 7R   S1       
-         6        653 33101  15528 7L   P7       
-         6        654 33101  11388 7R   S1       
-         6        655 33101  15523 7L   P7       
-         6        656 33101  11383 7R   S1       
-         6        657 33101  11494 7L   S1       
-         6        658 33101   7563 7R   P2_2     
-         6        659 33101  11486 7L   S1       
-         6        660 33101   3444 7R   11       
-         6        661 33101  15572 7L   P7       
-         6        662 33101  15619 7R   P7       
-         6        663 33101  15559 7L   P7       
-         6        664 33101  15614 7R   P7       
-         6        665 33101  15554 7L   P7       
-         6        666 33101  15604 7R   P7       
-         6        667 33101  15549 7L   P7       
-         6        668 33101  11360 7R   S1       
-         6        669 33101  15534 7L   P7       
-         6        670 33101  11366 7R   S1       
-         6        671 33101  15539 7L   P7       
-         6        672 33101  11340 7R   S1       
-         6        673 33101  15529 7L   P7       
-         6        674 33101  11336 7R   S1       
-         6        675 33101  15524 7L   P7       
-         6        676 33101  11384 7R   S1       
-         6        677 33101  11497 7L   S1       
-         6        678 33101   7564 7R   P2_2     
-         6        679 33101  11487 7L   S1       
-         6        680 33101   7408 7R   P2       
-         6        681 33101  15570 7L   P7       
-         6        682 33101  15620 7R   P7       
-         6        683 33101  15560 7L   P7       
-         6        684 33101  15615 7R   P7       
-         6        685 33101  15555 7L   P7       
-         6        686 33101  15605 7R   P7       
-         6        687 33101  15550 7L   P7       
-         6        688 33101  11361 7R   S1       
-         6        689 33101  15541 7L   P7       
-         6        690 33101  11367 7R   S1       
-         6        691 33101  15540 7L   P7       
-         6        692 33101  11343 7R   S1       
-         6        693 33101  15530 7L   P7       
-         6        694 33101  11390 7R   S1       
-         6        695 33101  15525 7L   P7       
-         6        696 33101  11385 7R   S1       
-         6        697 33101  11498 7L   S1       
-         6        698 33101   7565 7R   P2_2     
-         6        699 33101  11488 7L   S1       
-         6        700 33101   7409 7R   P2       
-         6        701 33101  15637 8L   P7       
-         6        702 33101  15686 8R   P7       
-         6        703 33101  15667 8L   P7       
-         6        704 33101  15706 8R   P7       
-         6        705 33101   9699 8L   P6       
-         6        706 33101  15701 8R   P7       
-         6        707 33101  11689 8L   S1       
-         6        708 33101  11572 8R   S1       
-         6        709 33101  11660 8L   S1       
-         6        710 33101  11566 8R   S1       
-         6        711 33101  11678 8L   S1       
-         6        712 33101  11595 8R   S1       
-         6        713 33101  11671 8L   S1       
-         6        714 33101  11590 8R   S1       
-         6        715 33101  11665 8L   S1       
-         6        716 33101  11584 8R   S1       
-         6        717 33101  11658 8L   S1       
-         6        718 33101  11579 8R   S1       
-         6        719 33101  11683 8L   S1       
-         6        720 33101  11505 8R   S1       
-         6        721 33101  15638 8L   P7       
-         6        722 33101  15687 8R   P7       
-         6        723 33101  15668 8L   P7       
-         6        724 33101  15707 8R   P7       
-         6        725 33101  11691 8L   S1       
-         6        726 33101  15702 8R   P7       
-         6        727 33101  11696 8L   S1       
-         6        728 33101  11573 8R   S1       
-         6        729 33101  11677 8L   S1       
-         6        730 33101  11567 8R   S1       
-         6        731 33101  11679 8L   S1       
-         6        732 33101  11596 8R   S1       
-         6        733 33101  11672 8L   S1       
-         6        734 33101  11591 8R   S1       
-         6        735 33101  11666 8L   S1       
-         6        736 33101  11585 8R   S1       
-         6        737 33101  11661 8L   S1       
-         6        738 33101  11580 8R   S1       
-         6        739 33101  11684 8L   S1       
-         6        740 33101  11507 8R   S1       
-         6        741 33101  15639 8L   P7       
-         6        742 33101  15688 8R   P7       
-         6        743 33101  15669 8L   P7       
-         6        744 33101  15708 8R   P7       
-         6        745 33101  11692 8L   S1       
-         6        746 33101  15703 8R   P7       
-         6        747 33101  11698 8L   S1       
-         6        748 33101  11574 8R   S1       
-         6        749 33101  11688 8L   S1       
-         6        750 33101  11568 8R   S1       
-         6        751 33101  11680 8L   S1       
-         6        752 33101  11597 8R   S1       
-         6        753 33101  11673 8L   S1       
-         6        754 33101  11592 8R   S1       
-         6        755 33101  11668 8L   S1       
-         6        756 33101  11586 8R   S1       
-         6        757 33101  11662 8L   S1       
-         6        758 33101  11581 8R   S1       
-         6        759 33101  11685 8L   S1       
-         6        760 33101  11509 8R   S1       
-         6        761 33101  15640 8L   P7       
-         6        762 33101  15689 8R   P7       
-         6        763 33101  15670 8L   P7       
-         6        764 33101  15709 8R   P7       
-         6        765 33101  11693 8L   S1       
-         6        766 33101  15704 8R   P7       
-         6        767 33101  11699 8L   S1       
-         6        768 33101  11575 8R   S1       
-         6        769 33101  11690 8L   S1       
-         6        770 33101  11569 8R   S1       
-         6        771 33101  11681 8L   S1       
-         6        772 33101  11598 8R   S1       
-         6        773 33101  11674 8L   S1       
-         6        774 33101  11593 8R   S1       
-         6        775 33101  11669 8L   S1       
-         6        776 33101  11587 8R   S1       
-         6        777 33101  11663 8L   S1       
-         6        778 33101  11582 8R   S1       
-         6        779 33101  11686 8L   S1       
-         6        780 33101  11510 8R   S1       
-         6        781 33101  15641 8L   P7       
-         6        782 33101  15690 8R   P7       
-         6        783 33101  15671 8L   P7       
-         6        784 33101  15710 8R   P7       
-         6        785 33101  11695 8L   S1       
-         6        786 33101  15705 8R   P7       
-         6        787 33101  11700 8L   S1       
-         6        788 33101   3584 8R   11       
-         6        789 33101  11697 8L   S1       
-         6        790 33101  11570 8R   S1       
-         6        791 33101  11682 8L   S1       
-         6        792 33101  11599 8R   S1       
-         6        793 33101  11676 8L   S1       
-         6        794 33101  11594 8R   S1       
-         6        795 33101  11670 8L   S1       
-         6        796 33101  11589 8R   S1       
-         6        797 33101  11664 8L   S1       
-         6        798 33101  11583 8R   S1       
-         6        799 33101  11687 8L   S1       
-         6        800 33101  11578 8R   S1       
-         6        801 33101  14343 9L   S2       
-         6        802 33101  15785 9R   P7       
-         6        803 33101  11861 9L   S1       
-         6        804 33101  11771 9R   S1       
-         6        805 33101  11858 9L   S1       
-         6        806 33101   9732 9R   P6       
-         6        807 33101   3842 9L   11       
-         6        808 33101  11789 9R   S1       
-         6        809 33101  11855 9L   S1       
-         6        810 33101  11784 9R   S1       
-         6        811 33101  11891 9L   S1       
-         6        812 33101  11778 9R   S1       
-         6        813 33101  11883 9L   S1       
-         6        814 33101  11773 9R   S1       
-         6        815 33101  11877 9L   S1       
-         6        816 33101  11767 9R   S1       
-         6        817 33101   9784 9L   P6       
-         6        818 33101  11757 9R   S1       
-         6        819 33101   7933 9L   P2_2     
-         6        820 33101   7849 9R   P2_2     
-         6        821 33101  14344 9L   S2       
-         6        822 33101  15786 9R   P7       
-         6        823 33101  11862 9L   S1       
-         6        824 33101  11794 9R   S1       
-         6        825 33101  11866 9L   S1       
-         6        826 33101   9760 9R   P6       
-         6        827 33101   3862 9L   11       
-         6        828 33101  11790 9R   S1       
-         6        829 33101  11856 9L   S1       
-         6        830 33101  11785 9R   S1       
-         6        831 33101  11892 9L   S1       
-         6        832 33101  11779 9R   S1       
-         6        833 33101  11884 9L   S1       
-         6        834 33101  11774 9R   S1       
-         6        835 33101  11878 9L   S1       
-         6        836 33101  11768 9R   S1       
-         6        837 33101   8000 9L   P2_2     
-         6        838 33101  11758 9R   S1       
-         6        839 33101   9811 9L   P6       
-         6        840 33101  11753 9R   S1       
-         6        841 33101  14345 9L   S2       
-         6        842 33101  15789 9R   P7       
-         6        843 33101  11865 9L   S1       
-         6        844 33101  11795 9R   S1       
-         6        845 33101  11870 9L   S1       
-         6        846 33101   9772 9R   P6       
-         6        847 33101   3826 9L   11       
-         6        848 33101  11791 9R   S1       
-         6        849 33101  11859 9L   S1       
-         6        850 33101  11786 9R   S1       
-         6        851 33101  11893 9L   S1       
-         6        852 33101  11781 9R   S1       
-         6        853 33101  11886 9L   S1       
-         6        854 33101  11775 9R   S1       
-         6        855 33101  11879 9L   S1       
-         6        856 33101  11769 9R   S1       
-         6        857 33101  11873 9L   S1       
-         6        858 33101  11764 9R   S1       
-         6        859 33101   9812 9L   P6       
-         6        860 33101  11754 9R   S1       
-         6        861 33101  14346 9L   S2       
-         6        862 33101  15791 9R   P7       
-         6        863 33101  11896 9L   S1       
-         6        864 33101  11798 9R   S1       
-         6        865 33101  11871 9L   S1       
-         6        866 33101   9774 9R   P6       
-         6        867 33101   3821 9L   11       
-         6        868 33101  11792 9R   S1       
-         6        869 33101  11860 9L   S1       
-         6        870 33101  11788 9R   S1       
-         6        871 33101  11894 9L   S1       
-         6        872 33101  11782 9R   S1       
-         6        873 33101  11887 9L   S1       
-         6        874 33101  11776 9R   S1       
-         6        875 33101  11880 9L   S1       
-         6        876 33101  11770 9R   S1       
-         6        877 33101  11874 9L   S1       
-         6        878 33101  11765 9R   S1       
-         6        879 33101   9813 9L   P6       
-         6        880 33101  11755 9R   S1       
-         6        881 33101  14347 9L   S2       
-         6        882 33101  15794 9R   P7       
-         6        883 33101  11898 9L   S1       
-         6        884 33101  11799 9R   S1       
-         6        885 33101  11885 9L   S1       
-         6        886 33101   9767 9R   P6       
-         6        887 33101   9785 9L   P6       
-         6        888 33101  11793 9R   S1       
-         6        889 33101  11872 9L   S1       
-         6        890 33101  11800 9R   S1       
-         6        891 33101  11895 9L   S1       
-         6        892 33101  11783 9R   S1       
-         6        893 33101  11889 9L   S1       
-         6        894 33101  11777 9R   S1       
-         6        895 33101  11882 9L   S1       
-         6        896 33101  11772 9R   S1       
-         6        897 33101  11875 9L   S1       
-         6        898 33101  11766 9R   S1       
-         6        899 33101   9783 9L   P6       
-         6        900 33101  11756 9R   S1       
-         6        901 33101  14507 10L  S2       
-         6        902 33101  14550 10R  S2       
-         6        903 33101  14502 10L  S2       
-         6        904 33101  14531 10R  S2       
-         6        905 33101  14399 10L  S2       
-         6        906 33101  14596 10R  S2       
-         6        907 33101  14425 10L  S2       
-         6        908 33101   1737 10R  8        
-         6        909 33101  14413 10L  S2       
-         6        910 33101  14544 10R  S2       
-         6        911 33101  14401 10L  S2       
-         6        912 33101  14535 10R  S2       
-         6        913 33101  14397 10L  S2       
-         6        914 33101  14594 10R  S2       
-         6        915 33101  14392 10L  S2       
-         6        916 33101  14588 10R  S2       
-         6        917 33101  14452 10L  S2       
-         6        918 33101  14566 10R  S2       
-         6        919 33101  14457 10L  S2       
-         6        920 33101  14580 10R  S2       
-         6        921 33101  14508 10L  S2       
-         6        922 33101  14553 10R  S2       
-         6        923 33101  14503 10L  S2       
-         6        924 33101  14537 10R  S2       
-         6        925 33101  14447 10L  S2       
-         6        926 33101  14598 10R  S2       
-         6        927 33101  14426 10L  S2       
-         6        928 33101   1750 10R  8        
-         6        929 33101  14414 10L  S2       
-         6        930 33101  14551 10R  S2       
-         6        931 33101  14403 10L  S2       
-         6        932 33101  14536 10R  S2       
-         6        933 33101  14398 10L  S2       
-         6        934 33101  14530 10R  S2       
-         6        935 33101  14393 10L  S2       
-         6        936 33101  14589 10R  S2       
-         6        937 33101  14453 10L  S2       
-         6        938 33101  14567 10R  S2       
-         6        939 33101  14458 10L  S2       
-         6        940 33101  14581 10R  S2       
-         6        941 33101  14509 10L  S2       
-         6        942 33101  14554 10R  S2       
-         6        943 33101  14504 10L  S2       
-         6        944 33101  14541 10R  S2       
-         6        945 33101  14448 10L  S2       
-         6        946 33101  14602 10R  S2       
-         6        947 33101  14429 10L  S2       
-         6        948 33101   1740 10R  8        
-         6        949 33101  14416 10L  S2       
-         6        950 33101  14556 10R  S2       
-         6        951 33101  14404 10L  S2       
-         6        952 33101  14538 10R  S2       
-         6        953 33101  14400 10L  S2       
-         6        954 33101  14532 10R  S2       
-         6        955 33101  14394 10L  S2       
-         6        956 33101  14591 10R  S2       
-         6        957 33101  14454 10L  S2       
-         6        958 33101  14569 10R  S2       
-         6        959 33101  14459 10L  S2       
-         6        960 33101  14582 10R  S2       
-         6        961 33101  14510 10L  S2       
-         6        962 33101  14555 10R  S2       
-         6        963 33101  14505 10L  S2       
-         6        964 33101  14542 10R  S2       
-         6        965 33101  14449 10L  S2       
-         6        966 33101  14603 10R  S2       
-         6        967 33101  14441 10L  S2       
-         6        968 33101   3951 10R  12       
-         6        969 33101  14417 10L  S2       
-         6        970 33101  14557 10R  S2       
-         6        971 33101  14409 10L  S2       
-         6        972 33101  14539 10R  S2       
-         6        973 33101  14430 10L  S2       
-         6        974 33101  14533 10R  S2       
-         6        975 33101  14395 10L  S2       
-         6        976 33101  14592 10R  S2       
-         6        977 33101  14455 10L  S2       
-         6        978 33101  14586 10R  S2       
-         6        979 33101  14460 10L  S2       
-         6        980 33101  14583 10R  S2       
-         6        981 33101  14511 10L  S2       
-         6        982 33101  14559 10R  S2       
-         6        983 33101  14506 10L  S2       
-         6        984 33101  14543 10R  S2       
-         6        985 33101  14451 10L  S2       
-         6        986 33101  14604 10R  S2       
-         6        987 33101   4046 10L  12       
-         6        988 33101   9851 10R  P6       
-         6        989 33101  14422 10L  S2       
-         6        990 33101  14558 10R  S2       
-         6        991 33101  14412 10L  S2       
-         6        992 33101  14540 10R  S2       
-         6        993 33101  14439 10L  S2       
-         6        994 33101  14534 10R  S2       
-         6        995 33101  14396 10L  S2       
-         6        996 33101  14593 10R  S2       
-         6        997 33101  14456 10L  S2       
-         6        998 33101  14587 10R  S2       
-         6        999 33101  14461 10L  S2       
-         6       1000 33101  14584 10R  S2       
-         6       1001 33101  14735 11L  S2       
-         6       1002 33101  14903 11R  S2       
-         6       1003 33101  14721 11L  S2       
-         6       1004 33101  14893 11R  S2       
-         6       1005 33101  14739 11L  S2       
-         6       1006 33101  14887 11R  S2       
-         6       1007 33101  14740 11L  S2       
-         6       1008 33101  14889 11R  S2       
-         6       1009 33101  14731 11L  S2       
-         6       1010 33101  14888 11R  S2       
-         6       1011 33101  14720 11L  S2       
-         6       1012 33101  14873 11R  S2       
-         6       1013 33101  14715 11L  S2       
-         6       1014 33101  14863 11R  S2       
-         6       1015 33101  14703 11L  S2       
-         6       1016 33101  14868 11R  S2       
-         6       1017 33101  14695 11L  S2       
-         6       1018 33101  14855 11R  S2       
-         6       1019 33101  14705 11L  S2       
-         6       1020 33101  14835 11R  S2       
-         6       1021 33101  14736 11L  S2       
-         6       1022 33101  14904 11R  S2       
-         6       1023 33101  14723 11L  S2       
-         6       1024 33101  14894 11R  S2       
-         6       1025 33101  14783 11L  S2       
-         6       1026 33101  14829 11R  S2       
-         6       1027 33101  14741 11L  S2       
-         6       1028 33101  14890 11R  S2       
-         6       1029 33101  14732 11L  S2       
-         6       1030 33101  14892 11R  S2       
-         6       1031 33101  14722 11L  S2       
-         6       1032 33101  14874 11R  S2       
-         6       1033 33101  14689 11L  S2       
-         6       1034 33101  14864 11R  S2       
-         6       1035 33101  14711 11L  S2       
-         6       1036 33101  14869 11R  S2       
-         6       1037 33101  14696 11L  S2       
-         6       1038 33101  14856 11R  S2       
-         6       1039 33101  14706 11L  S2       
-         6       1040 33101  14837 11R  S2       
-         6       1041 33101  14780 11L  S2       
-         6       1042 33101  14905 11R  S2       
-         6       1043 33101  14727 11L  S2       
-         6       1044 33101  14895 11R  S2       
-         6       1045 33101  14784 11L  S2       
-         6       1046 33101  14847 11R  S2       
-         6       1047 33101  14742 11L  S2       
-         6       1048 33101  14891 11R  S2       
-         6       1049 33101  14733 11L  S2       
-         6       1050 33101  14883 11R  S2       
-         6       1051 33101  14724 11L  S2       
-         6       1052 33101  14875 11R  S2       
-         6       1053 33101  14717 11L  S2       
-         6       1054 33101  14865 11R  S2       
-         6       1055 33101  14716 11L  S2       
-         6       1056 33101  14870 11R  S2       
-         6       1057 33101  14697 11L  S2       
-         6       1058 33101  14857 11R  S2       
-         6       1059 33101  14707 11L  S2       
-         6       1060 33101  14838 11R  S2       
-         6       1061 33101  14781 11L  S2       
-         6       1062 33101  14906 11R  S2       
-         6       1063 33101  14728 11L  S2       
-         6       1064 33101  14896 11R  S2       
-         6       1065 33101  14785 11L  S2       
-         6       1066 33101  14880 11R  S2       
-         6       1067 33101  14743 11L  S2       
-         6       1068 33101  14885 11R  S2       
-         6       1069 33101  14737 11L  S2       
-         6       1070 33101  14884 11R  S2       
-         6       1071 33101  14726 11L  S2       
-         6       1072 33101  14876 11R  S2       
-         6       1073 33101  14718 11L  S2       
-         6       1074 33101  14866 11R  S2       
-         6       1075 33101  14690 11L  S2       
-         6       1076 33101  14871 11R  S2       
-         6       1077 33101  14698 11L  S2       
-         6       1078 33101  14879 11R  S2       
-         6       1079 33101  14708 11L  S2       
-         6       1080 33101  14844 11R  S2       
-         6       1081 33101  14787 11L  S2       
-         6       1082 33101  14907 11R  S2       
-         6       1083 33101  14729 11L  S2       
-         6       1084 33101  14897 11R  S2       
-         6       1085 33101  14786 11L  S2       
-         6       1086 33101  14881 11R  S2       
-         6       1087 33101  14744 11L  S2       
-         6       1088 33101  14886 11R  S2       
-         6       1089 33101  14738 11L  S2       
-         6       1090 33101  14878 11R  S2       
-         6       1091 33101  14730 11L  S2       
-         6       1092 33101  14877 11R  S2       
-         6       1093 33101  14719 11L  S2       
-         6       1094 33101  14867 11R  S2       
-         6       1095 33101  14694 11L  S2       
-         6       1096 33101  14872 11R  S2       
-         6       1097 33101  14699 11L  S2       
-         6       1098 33101  14882 11R  S2       
-         6       1099 33101  14709 11L  S2       
-         6       1100 33101  14853 11R  S2       
-         6       1101 33101  15056 12L  S2       
-         6       1102 33101  15084 12R  S2       
-         6       1103 33101  15059 12L  S2       
-         6       1104 33101  15181 12R  S2       
-         6       1105 33101  15077 12L  S2       
-         6       1106 33101  15176 12R  S2       
-         6       1107 33101  15062 12L  S2       
-         6       1108 33101  15104 12R  S2       
-         6       1109 33101  15052 12L  S2       
-         6       1110 33101  15103 12R  S2       
-         6       1111 33101  15032 12L  S2       
-         6       1112 33101  15105 12R  S2       
-         6       1113 33101  15016 12L  S2       
-         6       1114 33101  15115 12R  S2       
-         6       1115 33101  14989 12L  S2       
-         6       1116 33101   1941 12R  8        
-         6       1117 33101  14979 12L  S2       
-         6       1118 33101  15155 12R  S2       
-         6       1119 33101  15033 12L  S2       
-         6       1120 33101  15161 12R  S2       
-         6       1121 33101  15058 12L  S2       
-         6       1122 33101  15085 12R  S2       
-         6       1123 33101  15067 12L  S2       
-         6       1124 33101  15182 12R  S2       
-         6       1125 33101  15078 12L  S2       
-         6       1126 33101  15177 12R  S2       
-         6       1127 33101  15063 12L  S2       
-         6       1128 33101  15167 12R  S2       
-         6       1129 33101  15053 12L  S2       
-         6       1130 33101  15186 12R  S2       
-         6       1131 33101  15034 12L  S2       
-         6       1132 33101  15172 12R  S2       
-         6       1133 33101  15037 12L  S2       
-         6       1134 33101  15130 12R  S2       
-         6       1135 33101  14991 12L  S2       
-         6       1136 33101  15112 12R  S2       
-         6       1137 33101  14988 12L  S2       
-         6       1138 33101  15156 12R  S2       
-         6       1139 33101  15036 12L  S2       
-         6       1140 33101  15162 12R  S2       
-         6       1141 33101  15070 12L  S2       
-         6       1142 33101  15086 12R  S2       
-         6       1143 33101  15068 12L  S2       
-         6       1144 33101  15183 12R  S2       
-         6       1145 33101  15079 12L  S2       
-         6       1146 33101  15178 12R  S2       
-         6       1147 33101  15064 12L  S2       
-         6       1148 33101  15168 12R  S2       
-         6       1149 33101  15054 12L  S2       
-         6       1150 33101  15187 12R  S2       
-         6       1151 33101  15035 12L  S2       
-         6       1152 33101  15173 12R  S2       
-         6       1153 33101  15038 12L  S2       
-         6       1154 33101  15151 12R  S2       
-         6       1155 33101  14992 12L  S2       
-         6       1156 33101  15113 12R  S2       
-         6       1157 33101  14990 12L  S2       
-         6       1158 33101  15158 12R  S2       
-         6       1159 33101  15042 12L  S2       
-         6       1160 33101  15163 12R  S2       
-         6       1161 33101  15073 12L  S2       
-         6       1162 33101  15087 12R  S2       
-         6       1163 33101  15069 12L  S2       
-         6       1164 33101  15184 12R  S2       
-         6       1165 33101  15080 12L  S2       
-         6       1166 33101  15179 12R  S2       
-         6       1167 33101  15065 12L  S2       
-         6       1168 33101  15169 12R  S2       
-         6       1169 33101  15055 12L  S2       
-         6       1170 33101  15188 12R  S2       
-         6       1171 33101  15043 12L  S2       
-         6       1172 33101  15174 12R  S2       
-         6       1173 33101  15039 12L  S2       
-         6       1174 33101  15154 12R  S2       
-         6       1175 33101  14995 12L  S2       
-         6       1176 33101  15152 12R  S2       
-         6       1177 33101  14993 12L  S2       
-         6       1178 33101  15159 12R  S2       
-         6       1179 33101  15044 12L  S2       
-         6       1180 33101  15164 12R  S2       
-         6       1181 33101  15075 12L  S2       
-         6       1182 33101  15088 12R  S2       
-         6       1183 33101  15071 12L  S2       
-         6       1184 33101  15185 12R  S2       
-         6       1185 33101  14967 12L  S2       
-         6       1186 33101  15180 12R  S2       
-         6       1187 33101  15066 12L  S2       
-         6       1188 33101  15170 12R  S2       
-         6       1189 33101  15057 12L  S2       
-         6       1190 33101  15192 12R  S2       
-         6       1191 33101  15045 12L  S2       
-         6       1192 33101  15175 12R  S2       
-         6       1193 33101  15050 12L  S2       
-         6       1194 33101  15157 12R  S2       
-         6       1195 33101  14986 12L  S2       
-         6       1196 33101  15153 12R  S2       
-         6       1197 33101  14994 12L  S2       
-         6       1198 33101  15160 12R  S2       
-         6       1199 33101  15046 12L  S2       
-         6       1200 33101  15165 12R  S2       
-         6       1201 33101  15248 13L  S2       
-         6       1202 33101   7140 13R  P1       
-         6       1203 33101  15239 13L  S2       
-         6       1204 33101  15372 13R  S2       
-         6       1205 33101  15270 13L  S2       
-         6       1206 33101  15369 13R  S2       
-         6       1207 33101  15194 13L  S2       
-         6       1208 33101  15395 13R  S2       
-         6       1209 33101  15293 13L  S2       
-         6       1210 33101  15365 13R  S2       
-         6       1211 33101  15288 13L  S2       
-         6       1212 33101  15370 13R  S2       
-         6       1213 33101  15283 13L  S2       
-         6       1214 33101  15377 13R  S2       
-         6       1215 33101  15278 13L  S2       
-         6       1216 33101  15384 13R  S2       
-         6       1217 33101  15258 13L  S2       
-         6       1218 33101  15335 13R  S2       
-         6       1219 33101  15203 13L  S2       
-         6       1220 33101  15340 13R  S2       
-         6       1221 33101  15268 13L  S2       
-         6       1222 33101   4453 13R  13       
-         6       1223 33101  15240 13L  S2       
-         6       1224 33101  15376 13R  S2       
-         6       1225 33101  15271 13L  S2       
-         6       1226 33101  15391 13R  S2       
-         6       1227 33101  15195 13L  S2       
-         6       1228 33101  15396 13R  S2       
-         6       1229 33101  15294 13L  S2       
-         6       1230 33101  15366 13R  S2       
-         6       1231 33101  15289 13L  S2       
-         6       1232 33101  15371 13R  S2       
-         6       1233 33101  15284 13L  S2       
-         6       1234 33101  15378 13R  S2       
-         6       1235 33101  15279 13L  S2       
-         6       1236 33101  15385 13R  S2       
-         6       1237 33101  15259 13L  S2       
-         6       1238 33101  15336 13R  S2       
-         6       1239 33101  15204 13L  S2       
-         6       1240 33101  15341 13R  S2       
-         6       1241 33101  15274 13L  S2       
-         6       1242 33101  15390 13R  S2       
-         6       1243 33101  15267 13L  S2       
-         6       1244 33101  15381 13R  S2       
-         6       1245 33101  15272 13L  S2       
-         6       1246 33101  15392 13R  S2       
-         6       1247 33101  15251 13L  S2       
-         6       1248 33101  15397 13R  S2       
-         6       1249 33101  15295 13L  S2       
-         6       1250 33101  15367 13R  S2       
-         6       1251 33101  15290 13L  S2       
-         6       1252 33101  15373 13R  S2       
-         6       1253 33101  15285 13L  S2       
-         6       1254 33101  15379 13R  S2       
-         6       1255 33101  15280 13L  S2       
-         6       1256 33101  15387 13R  S2       
-         6       1257 33101  15260 13L  S2       
-         6       1258 33101  15337 13R  S2       
-         6       1259 33101  15205 13L  S2       
-         6       1260 33101  15342 13R  S2       
-         6       1261 33101  15276 13L  S2       
-         6       1262 33101   4432 13R  13       
-         6       1263 33101  15299 13L  S2       
-         6       1264 33101  15383 13R  S2       
-         6       1265 33101  15273 13L  S2       
-         6       1266 33101  15393 13R  S2       
-         6       1267 33101  15253 13L  S2       
-         6       1268 33101  15398 13R  S2       
-         6       1269 33101  15296 13L  S2       
-         6       1270 33101  15368 13R  S2       
-         6       1271 33101  15291 13L  S2       
-         6       1272 33101  15374 13R  S2       
-         6       1273 33101  15286 13L  S2       
-         6       1274 33101  15380 13R  S2       
-         6       1275 33101  15281 13L  S2       
-         6       1276 33101  15388 13R  S2       
-         6       1277 33101  15261 13L  S2       
-         6       1278 33101  15338 13R  S2       
-         6       1279 33101  15206 13L  S2       
-         6       1280 33101  15343 13R  S2       
-         6       1281 33101  15298 13L  S2       
-         6       1282 33101   2075 13R  8        
-         6       1283 33101  15243 13L  S2       
-         6       1284 33101  15386 13R  S2       
-         6       1285 33101  15275 13L  S2       
-         6       1286 33101  15394 13R  S2       
-         6       1287 33101  15254 13L  S2       
-         6       1288 33101  15399 13R  S2       
-         6       1289 33101  15297 13L  S2       
-         6       1290 33101  15400 13R  S2       
-         6       1291 33101  15292 13L  S2       
-         6       1292 33101  15375 13R  S2       
-         6       1293 33101  15287 13L  S2       
-         6       1294 33101  15382 13R  S2       
-         6       1295 33101  15282 13L  S2       
-         6       1296 33101  15389 13R  S2       
-         6       1297 33101  15262 13L  S2       
-         6       1298 33101  15339 13R  S2       
-         6       1299 33101  15207 13L  S2       
-         6       1300 33101  15344 13R  S2       
-         6       1301 33101  13695 14L  S2       
-         6       1302 33101  13799 14R  S2       
-         6       1303 33101  13700 14L  S2       
-         6       1304 33101  13804 14R  S2       
-         6       1305 33101  13705 14L  S2       
-         6       1306 33101  13810 14R  S2       
-         6       1307 33101  13710 14L  S2       
-         6       1308 33101  13820 14R  S2       
-         6       1309 33101  13716 14L  S2       
-         6       1310 33101  13825 14R  S2       
-         6       1311 33101  13721 14L  S2       
-         6       1312 33101  13831 14R  S2       
-         6       1313 33101  13726 14L  S2       
-         6       1314 33101  13836 14R  S2       
-         6       1315 33101  13732 14L  S2       
-         6       1316 33101  13842 14R  S2       
-         6       1317 33101  13737 14L  S2       
-         6       1318 33101  13848 14R  S2       
-         6       1319 33101  13743 14L  S2       
-         6       1320 33101  13855 14R  S2       
-         6       1321 33101  13696 14L  S2       
-         6       1322 33101  13800 14R  S2       
-         6       1323 33101  13701 14L  S2       
-         6       1324 33101  13805 14R  S2       
-         6       1325 33101  13706 14L  S2       
-         6       1326 33101  13811 14R  S2       
-         6       1327 33101  13712 14L  S2       
-         6       1328 33101  13821 14R  S2       
-         6       1329 33101  13717 14L  S2       
-         6       1330 33101  13826 14R  S2       
-         6       1331 33101  13722 14L  S2       
-         6       1332 33101  13832 14R  S2       
-         6       1333 33101  13727 14L  S2       
-         6       1334 33101  13837 14R  S2       
-         6       1335 33101  13733 14L  S2       
-         6       1336 33101  13843 14R  S2       
-         6       1337 33101  13738 14L  S2       
-         6       1338 33101  13850 14R  S2       
-         6       1339 33101  13744 14L  S2       
-         6       1340 33101  13856 14R  S2       
-         6       1341 33101  13697 14L  S2       
-         6       1342 33101  13801 14R  S2       
-         6       1343 33101  13702 14L  S2       
-         6       1344 33101  13806 14R  S2       
-         6       1345 33101  13707 14L  S2       
-         6       1346 33101  13813 14R  S2       
-         6       1347 33101  13713 14L  S2       
-         6       1348 33101  13822 14R  S2       
-         6       1349 33101  13718 14L  S2       
-         6       1350 33101  13827 14R  S2       
-         6       1351 33101  13723 14L  S2       
-         6       1352 33101  13833 14R  S2       
-         6       1353 33101  13728 14L  S2       
-         6       1354 33101  13838 14R  S2       
-         6       1355 33101  13734 14L  S2       
-         6       1356 33101  13845 14R  S2       
-         6       1357 33101  13739 14L  S2       
-         6       1358 33101  13851 14R  S2       
-         6       1359 33101  13745 14L  S2       
-         6       1360 33101  13857 14R  S2       
-         6       1361 33101  13698 14L  S2       
-         6       1362 33101  13802 14R  S2       
-         6       1363 33101  13703 14L  S2       
-         6       1364 33101  13807 14R  S2       
-         6       1365 33101  13708 14L  S2       
-         6       1366 33101  13815 14R  S2       
-         6       1367 33101  13714 14L  S2       
-         6       1368 33101  13823 14R  S2       
-         6       1369 33101  13719 14L  S2       
-         6       1370 33101  13828 14R  S2       
-         6       1371 33101  13724 14L  S2       
-         6       1372 33101  13834 14R  S2       
-         6       1373 33101  13729 14L  S2       
-         6       1374 33101  13840 14R  S2       
-         6       1375 33101  13735 14L  S2       
-         6       1376 33101  13846 14R  S2       
-         6       1377 33101  13740 14L  S2       
-         6       1378 33101  13852 14R  S2       
-         6       1379 33101  13746 14L  S2       
-         6       1380 33101  13858 14R  S2       
-         6       1381 33101  13699 14L  S2       
-         6       1382 33101  13803 14R  S2       
-         6       1383 33101  13704 14L  S2       
-         6       1384 33101  13808 14R  S2       
-         6       1385 33101  13709 14L  S2       
-         6       1386 33101  13816 14R  S2       
-         6       1387 33101  13715 14L  S2       
-         6       1388 33101  13824 14R  S2       
-         6       1389 33101  13720 14L  S2       
-         6       1390 33101  13830 14R  S2       
-         6       1391 33101  13725 14L  S2       
-         6       1392 33101  13835 14R  S2       
-         6       1393 33101  13730 14L  S2       
-         6       1394 33101  13841 14R  S2       
-         6       1395 33101  13736 14L  S2       
-         6       1396 33101  13847 14R  S2       
-         6       1397 33101  13742 14L  S2       
-         6       1398 33101  13853 14R  S2       
-         6       1399 33101  13747 14L  S2       
-         6       1400 33101  13859 14R  S2       
-         6       1401 33101  10195 15L  P5_1     
-         6       1402 33101  10096 15R  P5_1     
-         6       1403 33101  13915 15L  S2       
-         6       1404 33101  14005 15R  S2       
-         6       1405 33101  13920 15L  S2       
-         6       1406 33101  14010 15R  S2       
-         6       1407 33101  13925 15L  S2       
-         6       1408 33101  14015 15R  S2       
-         6       1409 33101  13930 15L  S2       
-         6       1410 33101  14020 15R  S2       
-         6       1411 33101  13873 15L  S2       
-         6       1412 33101  14025 15R  S2       
-         6       1413 33101  13939 15L  S2       
-         6       1414 33101  14030 15R  S2       
-         6       1415 33101  13944 15L  S2       
-         6       1416 33101  14035 15R  S2       
-         6       1417 33101  17164 15L  S3       
-         6       1418 33101  17234 15R  S3       
-         6       1419 33101  13950 15L  S2       
-         6       1420 33101  14041 15R  S2       
-         6       1421 33101  10196 15L  P5_1     
-         6       1422 33101  10097 15R  P5_1     
-         6       1423 33101  13916 15L  S2       
-         6       1424 33101  14006 15R  S2       
-         6       1425 33101  13921 15L  S2       
-         6       1426 33101  14011 15R  S2       
-         6       1427 33101  13926 15L  S2       
-         6       1428 33101  14016 15R  S2       
-         6       1429 33101  13931 15L  S2       
-         6       1430 33101  14021 15R  S2       
-         6       1431 33101  13877 15L  S2       
-         6       1432 33101  14026 15R  S2       
-         6       1433 33101  13940 15L  S2       
-         6       1434 33101  14031 15R  S2       
-         6       1435 33101  13945 15L  S2       
-         6       1436 33101  14036 15R  S2       
-         6       1437 33101  17165 15L  S3       
-         6       1438 33101  17235 15R  S3       
-         6       1439 33101  13951 15L  S2       
-         6       1440 33101  14042 15R  S2       
-         6       1441 33101  10197 15L  P5_1     
-         6       1442 33101  10098 15R  P5_1     
-         6       1443 33101  13917 15L  S2       
-         6       1444 33101  14007 15R  S2       
-         6       1445 33101  13922 15L  S2       
-         6       1446 33101  14012 15R  S2       
-         6       1447 33101  13927 15L  S2       
-         6       1448 33101  14017 15R  S2       
-         6       1449 33101  13932 15L  S2       
-         6       1450 33101  14022 15R  S2       
-         6       1451 33101  13936 15L  S2       
-         6       1452 33101  14027 15R  S2       
-         6       1453 33101  13941 15L  S2       
-         6       1454 33101  14032 15R  S2       
-         6       1455 33101  13946 15L  S2       
-         6       1456 33101  14037 15R  S2       
-         6       1457 33101  17168 15L  S3       
-         6       1458 33101  17236 15R  S3       
-         6       1459 33101  13952 15L  S2       
-         6       1460 33101  14043 15R  S2       
-         6       1461 33101  10198 15L  P5_1     
-         6       1462 33101  10099 15R  P5_1     
-         6       1463 33101  13918 15L  S2       
-         6       1464 33101  14008 15R  S2       
-         6       1465 33101  13923 15L  S2       
-         6       1466 33101  14013 15R  S2       
-         6       1467 33101  13928 15L  S2       
-         6       1468 33101  14018 15R  S2       
-         6       1469 33101  13934 15L  S2       
-         6       1470 33101  14023 15R  S2       
-         6       1471 33101  13937 15L  S2       
-         6       1472 33101  14028 15R  S2       
-         6       1473 33101  13942 15L  S2       
-         6       1474 33101  14033 15R  S2       
-         6       1475 33101  13947 15L  S2       
-         6       1476 33101  14038 15R  S2       
-         6       1477 33101  17169 15L  S3       
-         6       1478 33101  17237 15R  S3       
-         6       1479 33101  17162 15L  S3       
-         6       1480 33101  14045 15R  S2       
-         6       1481 33101  10199 15L  P5_1     
-         6       1482 33101  10100 15R  P5_1     
-         6       1483 33101  13919 15L  S2       
-         6       1484 33101  14009 15R  S2       
-         6       1485 33101  13924 15L  S2       
-         6       1486 33101  14014 15R  S2       
-         6       1487 33101  13929 15L  S2       
-         6       1488 33101  14019 15R  S2       
-         6       1489 33101  13935 15L  S2       
-         6       1490 33101  14024 15R  S2       
-         6       1491 33101  13938 15L  S2       
-         6       1492 33101  14029 15R  S2       
-         6       1493 33101  13943 15L  S2       
-         6       1494 33101  14034 15R  S2       
-         6       1495 33101  13948 15L  S2       
-         6       1496 33101  14039 15R  S2       
-         6       1497 33101  17170 15L  S3       
-         6       1498 33101  17239 15R  S3       
-         6       1499 33101  17163 15L  S3       
-         6       1500 33101  17231 15R  S3       
-         6       1501 33101  14100 16L  S2       
-         6       1502 33101  14190 16R  S2       
-         6       1503 33101  14105 16L  S2       
-         6       1504 33101  14195 16R  S2       
-         6       1505 33101  14110 16L  S2       
-         6       1506 33101  14200 16R  S2       
-         6       1507 33101  14116 16L  S2       
-         6       1508 33101  14205 16R  S2       
-         6       1509 33101  14121 16L  S2       
-         6       1510 33101  14210 16R  S2       
-         6       1511 33101  14076 16L  S2       
-         6       1512 33101  14172 16R  S2       
-         6       1513 33101  14129 16L  S2       
-         6       1514 33101  14222 16R  S2       
-         6       1515 33101  14134 16L  S2       
-         6       1516 33101  14227 16R  S2       
-         6       1517 33101  17309 16L  S3       
-         6       1518 33101  17390 16R  S3       
-         6       1519 33101  17316 16L  S3       
-         6       1520 33101  17395 16R  S3       
-         6       1521 33101  14101 16L  S2       
-         6       1522 33101  14191 16R  S2       
-         6       1523 33101  14106 16L  S2       
-         6       1524 33101  14196 16R  S2       
-         6       1525 33101  14111 16L  S2       
-         6       1526 33101  14201 16R  S2       
-         6       1527 33101  14117 16L  S2       
-         6       1528 33101  14206 16R  S2       
-         6       1529 33101  14122 16L  S2       
-         6       1530 33101  14212 16R  S2       
-         6       1531 33101  14089 16L  S2       
-         6       1532 33101  14217 16R  S2       
-         6       1533 33101  14130 16L  S2       
-         6       1534 33101  14223 16R  S2       
-         6       1535 33101  14135 16L  S2       
-         6       1536 33101  14229 16R  S2       
-         6       1537 33101  17311 16L  S3       
-         6       1538 33101  17391 16R  S3       
-         6       1539 33101  17317 16L  S3       
-         6       1540 33101  17396 16R  S3       
-         6       1541 33101  14102 16L  S2       
-         6       1542 33101  14192 16R  S2       
-         6       1543 33101  14107 16L  S2       
-         6       1544 33101  14197 16R  S2       
-         6       1545 33101  14113 16L  S2       
-         6       1546 33101  14202 16R  S2       
-         6       1547 33101  14118 16L  S2       
-         6       1548 33101  14207 16R  S2       
-         6       1549 33101  14123 16L  S2       
-         6       1550 33101  14213 16R  S2       
-         6       1551 33101  14112 16L  S2       
-         6       1552 33101  14218 16R  S2       
-         6       1553 33101  14131 16L  S2       
-         6       1554 33101  14224 16R  S2       
-         6       1555 33101  14136 16L  S2       
-         6       1556 33101  17386 16R  S3       
-         6       1557 33101  17312 16L  S3       
-         6       1558 33101  17392 16R  S3       
-         6       1559 33101  17318 16L  S3       
-         6       1560 33101  17397 16R  S3       
-         6       1561 33101  14103 16L  S2       
-         6       1562 33101  14193 16R  S2       
-         6       1563 33101  14108 16L  S2       
-         6       1564 33101  14198 16R  S2       
-         6       1565 33101  14114 16L  S2       
-         6       1566 33101  14203 16R  S2       
-         6       1567 33101  14119 16L  S2       
-         6       1568 33101  14208 16R  S2       
-         6       1569 33101  14124 16L  S2       
-         6       1570 33101  14214 16R  S2       
-         6       1571 33101  14126 16L  S2       
-         6       1572 33101  14220 16R  S2       
-         6       1573 33101  14132 16L  S2       
-         6       1574 33101  14225 16R  S2       
-         6       1575 33101  14137 16L  S2       
-         6       1576 33101  17387 16R  S3       
-         6       1577 33101  17313 16L  S3       
-         6       1578 33101  17393 16R  S3       
-         6       1579 33101  17320 16L  S3       
-         6       1580 33101  17398 16R  S3       
-         6       1581 33101  14104 16L  S2       
-         6       1582 33101  14194 16R  S2       
-         6       1583 33101  14109 16L  S2       
-         6       1584 33101  14199 16R  S2       
-         6       1585 33101  14115 16L  S2       
-         6       1586 33101  14204 16R  S2       
-         6       1587 33101  14120 16L  S2       
-         6       1588 33101  14209 16R  S2       
-         6       1589 33101  14125 16L  S2       
-         6       1590 33101  14215 16R  S2       
-         6       1591 33101  14128 16L  S2       
-         6       1592 33101  14221 16R  S2       
-         6       1593 33101  14133 16L  S2       
-         6       1594 33101  14226 16R  S2       
-         6       1595 33101  17308 16L  S3       
-         6       1596 33101  17389 16R  S3       
-         6       1597 33101  17315 16L  S3       
-         6       1598 33101  17394 16R  S3       
-         6       1599 33101  17321 16L  S3       
-         6       1600 33101  17400 16R  S3       
-         6       1601 33101  14258 17L  S2       
-         6       1602 33101  14297 17R  S2       
-         6       1603 33101  14263 17L  S2       
-         6       1604 33101  14302 17R  S2       
-         6       1605 33101  14270 17L  S2       
-         6       1606 33101  14307 17R  S2       
-         6       1607 33101  14275 17L  S2       
-         6       1608 33101  14313 17R  S2       
-         6       1609 33101  14280 17L  S2       
-         6       1610 33101  14319 17R  S2       
-         6       1611 33101  12736 17L  S1       
-         6       1612 33101  14294 17R  S2       
-         6       1613 33101  17456 17L  S3       
-         6       1614 33101  14329 17R  S2       
-         6       1615 33101  17461 17L  S3       
-         6       1616 33101  14334 17R  S2       
-         6       1617 33101  17467 17L  S3       
-         6       1618 33101  14339 17R  S2       
-         6       1619 33101  17475 17L  S3       
-         6       1620 33101  17543 17R  S3       
-         6       1621 33101  14259 17L  S2       
-         6       1622 33101  14298 17R  S2       
-         6       1623 33101  14264 17L  S2       
-         6       1624 33101  14303 17R  S2       
-         6       1625 33101  14271 17L  S2       
-         6       1626 33101  14308 17R  S2       
-         6       1627 33101  14276 17L  S2       
-         6       1628 33101  14314 17R  S2       
-         6       1629 33101  14281 17L  S2       
-         6       1630 33101  14320 17R  S2       
-         6       1631 33101  14252 17L  S2       
-         6       1632 33101  14315 17R  S2       
-         6       1633 33101  17457 17L  S3       
-         6       1634 33101  14330 17R  S2       
-         6       1635 33101  17462 17L  S3       
-         6       1636 33101  14335 17R  S2       
-         6       1637 33101  17469 17L  S3       
-         6       1638 33101  14341 17R  S2       
-         6       1639 33101  17476 17L  S3       
-         6       1640 33101  17544 17R  S3       
-         6       1641 33101  14260 17L  S2       
-         6       1642 33101  14299 17R  S2       
-         6       1643 33101  14265 17L  S2       
-         6       1644 33101  14304 17R  S2       
-         6       1645 33101  14272 17L  S2       
-         6       1646 33101  14309 17R  S2       
-         6       1647 33101  14277 17L  S2       
-         6       1648 33101  14316 17R  S2       
-         6       1649 33101  14282 17L  S2       
-         6       1650 33101  14321 17R  S2       
-         6       1651 33101  14285 17L  S2       
-         6       1652 33101  14322 17R  S2       
-         6       1653 33101  17458 17L  S3       
-         6       1654 33101  14331 17R  S2       
-         6       1655 33101  17463 17L  S3       
-         6       1656 33101  14336 17R  S2       
-         6       1657 33101  17470 17L  S3       
-         6       1658 33101  14342 17R  S2       
-         6       1659 33101  17478 17L  S3       
-         6       1660 33101  17545 17R  S3       
-         6       1661 33101  14261 17L  S2       
-         6       1662 33101  14300 17R  S2       
-         6       1663 33101  14266 17L  S2       
-         6       1664 33101  14305 17R  S2       
-         6       1665 33101  14273 17L  S2       
-         6       1666 33101  14310 17R  S2       
-         6       1667 33101  14278 17L  S2       
-         6       1668 33101  14317 17R  S2       
-         6       1669 33101  14283 17L  S2       
-         6       1670 33101  14323 17R  S2       
-         6       1671 33101  14287 17L  S2       
-         6       1672 33101  14326 17R  S2       
-         6       1673 33101  17459 17L  S3       
-         6       1674 33101  14332 17R  S2       
-         6       1675 33101  17464 17L  S3       
-         6       1676 33101  14337 17R  S2       
-         6       1677 33101  17471 17L  S3       
-         6       1678 33101  17541 17R  S3       
-         6       1679 33101  17479 17L  S3       
-         6       1680 33101  17546 17R  S3       
-         6       1681 33101  14262 17L  S2       
-         6       1682 33101  14301 17R  S2       
-         6       1683 33101  14267 17L  S2       
-         6       1684 33101  14306 17R  S2       
-         6       1685 33101  14274 17L  S2       
-         6       1686 33101  14312 17R  S2       
-         6       1687 33101  14279 17L  S2       
-         6       1688 33101  14318 17R  S2       
-         6       1689 33101  14284 17L  S2       
-         6       1690 33101  14324 17R  S2       
-         6       1691 33101  14288 17L  S2       
-         6       1692 33101  14328 17R  S2       
-         6       1693 33101  17460 17L  S3       
-         6       1694 33101  14333 17R  S2       
-         6       1695 33101  17465 17L  S3       
-         6       1696 33101  14338 17R  S2       
-         6       1697 33101  17473 17L  S3       
-         6       1698 33101  17542 17R  S3       
-         6       1699 33101  17480 17L  S3       
-         6       1700 33101  17547 17R  S3       
-         7          1 33101  12816 1L   S2       
-         7          2 33101  12863 1R   S2       
-         7          3 33101  12821 1L   S2       
-         7          4 33101  12868 1R   S2       
-         7          5 33101  12826 1L   S2       
-         7          6 33101  12873 1R   S2       
-         7          7 33101  12831 1L   S2       
-         7          8 33101  12879 1R   S2       
-         7          9 33101  12836 1L   S2       
-         7         10 33101  12884 1R   S2       
-         7         11 33101  12842 1L   S2       
-         7         12 33101  12890 1R   S2       
-         7         13 33101  12852 1L   S2       
-         7         14 33101  12895 1R   S2       
-         7         15 33101  12847 1L   S2       
-         7         16 33101  12901 1R   S2       
-         7         17 33101  12857 1L   S2       
-         7         18 33101  12906 1R   S2       
-         7         19 33101  10358 1L   S1       
-         7         20 33101  12911 1R   S2       
-         7         21 33101  12817 1L   S2       
-         7         22 33101  12864 1R   S2       
-         7         23 33101  12822 1L   S2       
-         7         24 33101  12869 1R   S2       
-         7         25 33101  12827 1L   S2       
-         7         26 33101  12874 1R   S2       
-         7         27 33101  12832 1L   S2       
-         7         28 33101  12880 1R   S2       
-         7         29 33101  12837 1L   S2       
-         7         30 33101  12885 1R   S2       
-         7         31 33101  12843 1L   S2       
-         7         32 33101  12891 1R   S2       
-         7         33 33101  12853 1L   S2       
-         7         34 33101  12896 1R   S2       
-         7         35 33101  12848 1L   S2       
-         7         36 33101  12902 1R   S2       
-         7         37 33101  12858 1L   S2       
-         7         38 33101  12907 1R   S2       
-         7         39 33101  10302 1L   S1       
-         7         40 33101  12912 1R   S2       
-         7         41 33101  12818 1L   S2       
-         7         42 33101  12865 1R   S2       
-         7         43 33101  12823 1L   S2       
-         7         44 33101  12870 1R   S2       
-         7         45 33101  12828 1L   S2       
-         7         46 33101  12875 1R   S2       
-         7         47 33101  12833 1L   S2       
-         7         48 33101  12881 1R   S2       
-         7         49 33101  12838 1L   S2       
-         7         50 33101  12886 1R   S2       
-         7         51 33101  12844 1L   S2       
-         7         52 33101  12892 1R   S2       
-         7         53 33101  12854 1L   S2       
-         7         54 33101  12897 1R   S2       
-         7         55 33101  12849 1L   S2       
-         7         56 33101  12903 1R   S2       
-         7         57 33101  12860 1L   S2       
-         7         58 33101  12908 1R   S2       
-         7         59 33101  10364 1L   S1       
-         7         60 33101  12913 1R   S2       
-         7         61 33101  12819 1L   S2       
-         7         62 33101  12866 1R   S2       
-         7         63 33101  12824 1L   S2       
-         7         64 33101  12871 1R   S2       
-         7         65 33101  12829 1L   S2       
-         7         66 33101  12876 1R   S2       
-         7         67 33101  12834 1L   S2       
-         7         68 33101  12882 1R   S2       
-         7         69 33101  12840 1L   S2       
-         7         70 33101  12887 1R   S2       
-         7         71 33101  12845 1L   S2       
-         7         72 33101  12893 1R   S2       
-         7         73 33101  12855 1L   S2       
-         7         74 33101  12898 1R   S2       
-         7         75 33101  12850 1L   S2       
-         7         76 33101  12904 1R   S2       
-         7         77 33101  10332 1L   S1       
-         7         78 33101  12909 1R   S2       
-         7         79 33101  10382 1L   S1       
-         7         80 33101  12914 1R   S2       
-         7         81 33101  12820 1L   S2       
-         7         82 33101  12867 1R   S2       
-         7         83 33101  12825 1L   S2       
-         7         84 33101  12872 1R   S2       
-         7         85 33101  12830 1L   S2       
-         7         86 33101  12878 1R   S2       
-         7         87 33101  12835 1L   S2       
-         7         88 33101  12883 1R   S2       
-         7         89 33101  12841 1L   S2       
-         7         90 33101  12888 1R   S2       
-         7         91 33101  12851 1L   S2       
-         7         92 33101  12894 1R   S2       
-         7         93 33101  12846 1L   S2       
-         7         94 33101  12900 1R   S2       
-         7         95 33101  12856 1L   S2       
-         7         96 33101  12905 1R   S2       
-         7         97 33101  10349 1L   S1       
-         7         98 33101  12910 1R   S2       
-         7         99 33101  10393 1L   S1       
-         7        100 33101  12915 1R   S2       
-         7        101 33101  12941 2L   S2       
-         7        102 33101  12988 2R   S2       
-         7        103 33101  12949 2L   S2       
-         7        104 33101  12993 2R   S2       
-         7        105 33101  12961 2L   S2       
-         7        106 33101  12999 2R   S2       
-         7        107 33101  12968 2L   S2       
-         7        108 33101  13006 2R   S2       
-         7        109 33101  12978 2L   S2       
-         7        110 33101  13012 2R   S2       
-         7        111 33101  12916 2L   S2       
-         7        112 33101  10428 2R   S1       
-         7        113 33101  12931 2L   S2       
-         7        114 33101  13018 2R   S2       
-         7        115 33101  12948 2L   S2       
-         7        116 33101  13023 2R   S2       
-         7        117 33101  12959 2L   S2       
-         7        118 33101  13028 2R   S2       
-         7        119 33101  12974 2L   S2       
-         7        120 33101  13034 2R   S2       
-         7        121 33101  12942 2L   S2       
-         7        122 33101  12989 2R   S2       
-         7        123 33101  12951 2L   S2       
-         7        124 33101  12994 2R   S2       
-         7        125 33101  12962 2L   S2       
-         7        126 33101  13000 2R   S2       
-         7        127 33101  12969 2L   S2       
-         7        128 33101  13007 2R   S2       
-         7        129 33101  12979 2L   S2       
-         7        130 33101  13013 2R   S2       
-         7        131 33101  12919 2L   S2       
-         7        132 33101  13003 2R   S2       
-         7        133 33101  12938 2L   S2       
-         7        134 33101  13019 2R   S2       
-         7        135 33101  12950 2L   S2       
-         7        136 33101  13024 2R   S2       
-         7        137 33101  12960 2L   S2       
-         7        138 33101  13029 2R   S2       
-         7        139 33101  12976 2L   S2       
-         7        140 33101  13035 2R   S2       
-         7        141 33101  12943 2L   S2       
-         7        142 33101  12990 2R   S2       
-         7        143 33101  12952 2L   S2       
-         7        144 33101  12995 2R   S2       
-         7        145 33101  12963 2L   S2       
-         7        146 33101  13001 2R   S2       
-         7        147 33101  12971 2L   S2       
-         7        148 33101  13008 2R   S2       
-         7        149 33101  12981 2L   S2       
-         7        150 33101  13014 2R   S2       
-         7        151 33101  12924 2L   S2       
-         7        152 33101  13005 2R   S2       
-         7        153 33101  12940 2L   S2       
-         7        154 33101  13020 2R   S2       
-         7        155 33101  12954 2L   S2       
-         7        156 33101  13025 2R   S2       
-         7        157 33101  12964 2L   S2       
-         7        158 33101  13030 2R   S2       
-         7        159 33101  12980 2L   S2       
-         7        160 33101  13036 2R   S2       
-         7        161 33101  12945 2L   S2       
-         7        162 33101  12991 2R   S2       
-         7        163 33101  12953 2L   S2       
-         7        164 33101  12996 2R   S2       
-         7        165 33101  12965 2L   S2       
-         7        166 33101  13002 2R   S2       
-         7        167 33101  12973 2L   S2       
-         7        168 33101  13010 2R   S2       
-         7        169 33101  12982 2L   S2       
-         7        170 33101  13015 2R   S2       
-         7        171 33101  12925 2L   S2       
-         7        172 33101  13009 2R   S2       
-         7        173 33101  12944 2L   S2       
-         7        174 33101  13021 2R   S2       
-         7        175 33101  12957 2L   S2       
-         7        176 33101  13026 2R   S2       
-         7        177 33101  12967 2L   S2       
-         7        178 33101  13031 2R   S2       
-         7        179 33101  12983 2L   S2       
-         7        180 33101  13038 2R   S2       
-         7        181 33101  12947 2L   S2       
-         7        182 33101  12992 2R   S2       
-         7        183 33101  12956 2L   S2       
-         7        184 33101  12997 2R   S2       
-         7        185 33101  12966 2L   S2       
-         7        186 33101  13004 2R   S2       
-         7        187 33101  12975 2L   S2       
-         7        188 33101  13011 2R   S2       
-         7        189 33101  12984 2L   S2       
-         7        190 33101  13016 2R   S2       
-         7        191 33101  12930 2L   S2       
-         7        192 33101  13017 2R   S2       
-         7        193 33101  12946 2L   S2       
-         7        194 33101  13022 2R   S2       
-         7        195 33101  12958 2L   S2       
-         7        196 33101  13027 2R   S2       
-         7        197 33101  12970 2L   S2       
-         7        198 33101  13032 2R   S2       
-         7        199 33101  12985 2L   S2       
-         7        200 33101  13039 2R   S2       
-         7        201 33101  13085 3L   S2       
-         7        202 33101  13221 3R   S2       
-         7        203 33101  13091 3L   S2       
-         7        204 33101  13231 3R   S2       
-         7        205 33101  13097 3L   S2       
-         7        206 33101  13237 3R   S2       
-         7        207 33101  13102 3L   S2       
-         7        208 33101  13243 3R   S2       
-         7        209 33101  13108 3L   S2       
-         7        210 33101  13143 3R   S2       
-         7        211 33101  13094 3L   S2       
-         7        212 33101  13148 3R   S2       
-         7        213 33101  13117 3L   S2       
-         7        214 33101  13153 3R   S2       
-         7        215 33101  13122 3L   S2       
-         7        216 33101  13158 3R   S2       
-         7        217 33101  13127 3L   S2       
-         7        218 33101  13200 3R   S2       
-         7        219 33101  13133 3L   S2       
-         7        220 33101  13219 3R   S2       
-         7        221 33101  13086 3L   S2       
-         7        222 33101  13223 3R   S2       
-         7        223 33101  13092 3L   S2       
-         7        224 33101  13232 3R   S2       
-         7        225 33101  13098 3L   S2       
-         7        226 33101  13238 3R   S2       
-         7        227 33101  13103 3L   S2       
-         7        228 33101  13244 3R   S2       
-         7        229 33101  13109 3L   S2       
-         7        230 33101  13144 3R   S2       
-         7        231 33101  13107 3L   S2       
-         7        232 33101  13149 3R   S2       
-         7        233 33101  13118 3L   S2       
-         7        234 33101  13154 3R   S2       
-         7        235 33101  13123 3L   S2       
-         7        236 33101  13160 3R   S2       
-         7        237 33101  13128 3L   S2       
-         7        238 33101  13210 3R   S2       
-         7        239 33101  13134 3L   S2       
-         7        240 33101  13227 3R   S2       
-         7        241 33101  13087 3L   S2       
-         7        242 33101  13225 3R   S2       
-         7        243 33101  13093 3L   S2       
-         7        244 33101  13233 3R   S2       
-         7        245 33101  13099 3L   S2       
-         7        246 33101  13239 3R   S2       
-         7        247 33101  13104 3L   S2       
-         7        248 33101  13245 3R   S2       
-         7        249 33101  13110 3L   S2       
-         7        250 33101  13145 3R   S2       
-         7        251 33101  13113 3L   S2       
-         7        252 33101  13150 3R   S2       
-         7        253 33101  13119 3L   S2       
-         7        254 33101  13155 3R   S2       
-         7        255 33101  13124 3L   S2       
-         7        256 33101  13170 3R   S2       
-         7        257 33101  13130 3L   S2       
-         7        258 33101  13215 3R   S2       
-         7        259 33101  13135 3L   S2       
-         7        260 33101  13229 3R   S2       
-         7        261 33101  13088 3L   S2       
-         7        262 33101  13226 3R   S2       
-         7        263 33101  13095 3L   S2       
-         7        264 33101  13234 3R   S2       
-         7        265 33101  13100 3L   S2       
-         7        266 33101  13241 3R   S2       
-         7        267 33101  13105 3L   S2       
-         7        268 33101  13141 3R   S2       
-         7        269 33101  13111 3L   S2       
-         7        270 33101  13146 3R   S2       
-         7        271 33101  13115 3L   S2       
-         7        272 33101  13151 3R   S2       
-         7        273 33101  13120 3L   S2       
-         7        274 33101  13156 3R   S2       
-         7        275 33101  13125 3L   S2       
-         7        276 33101  13171 3R   S2       
-         7        277 33101  13131 3L   S2       
-         7        278 33101  13218 3R   S2       
-         7        279 33101  13136 3L   S2       
-         7        280 33101  13230 3R   S2       
-         7        281 33101  13090 3L   S2       
-         7        282 33101  13228 3R   S2       
-         7        283 33101  13096 3L   S2       
-         7        284 33101  13236 3R   S2       
-         7        285 33101  13101 3L   S2       
-         7        286 33101  13242 3R   S2       
-         7        287 33101  13106 3L   S2       
-         7        288 33101  13142 3R   S2       
-         7        289 33101  13112 3L   S2       
-         7        290 33101  13147 3R   S2       
-         7        291 33101  13116 3L   S2       
-         7        292 33101  13152 3R   S2       
-         7        293 33101  13121 3L   S2       
-         7        294 33101  13157 3R   S2       
-         7        295 33101  13126 3L   S2       
-         7        296 33101  13175 3R   S2       
-         7        297 33101  13132 3L   S2       
-         7        298 33101  13240 3R   S2       
-         7        299 33101  13137 3L   S2       
-         7        300 33101  13246 3R   S2       
-         7        301 33101  13312 4L   S2       
-         7        302 33101  13399 4R   S2       
-         7        303 33101  13319 4L   S2       
-         7        304 33101  13406 4R   S2       
-         7        305 33101  13327 4L   S2       
-         7        306 33101  13411 4R   S2       
-         7        307 33101  13333 4L   S2       
-         7        308 33101  13416 4R   S2       
-         7        309 33101  13339 4L   S2       
-         7        310 33101  13421 4R   S2       
-         7        311 33101  13251 4L   S2       
-         7        312 33101  13359 4R   S2       
-         7        313 33101  13269 4L   S2       
-         7        314 33101  13425 4R   S2       
-         7        315 33101  13300 4L   S2       
-         7        316 33101  13430 4R   S2       
-         7        317 33101  13324 4L   S2       
-         7        318 33101  13435 4R   S2       
-         7        319 33101  13346 4L   S2       
-         7        320 33101  13440 4R   S2       
-         7        321 33101  13313 4L   S2       
-         7        322 33101  13400 4R   S2       
-         7        323 33101  13320 4L   S2       
-         7        324 33101  13407 4R   S2       
-         7        325 33101  13328 4L   S2       
-         7        326 33101  13412 4R   S2       
-         7        327 33101  13334 4L   S2       
-         7        328 33101  13417 4R   S2       
-         7        329 33101  13340 4L   S2       
-         7        330 33101  13422 4R   S2       
-         7        331 33101  13253 4L   S2       
-         7        332 33101  13364 4R   S2       
-         7        333 33101  13271 4L   S2       
-         7        334 33101  13426 4R   S2       
-         7        335 33101  13302 4L   S2       
-         7        336 33101  13431 4R   S2       
-         7        337 33101  13326 4L   S2       
-         7        338 33101  13436 4R   S2       
-         7        339 33101  13347 4L   S2       
-         7        340 33101  13441 4R   S2       
-         7        341 33101  13314 4L   S2       
-         7        342 33101  13401 4R   S2       
-         7        343 33101  13321 4L   S2       
-         7        344 33101  13408 4R   S2       
-         7        345 33101  13330 4L   S2       
-         7        346 33101  13413 4R   S2       
-         7        347 33101  13335 4L   S2       
-         7        348 33101  13418 4R   S2       
-         7        349 33101  13341 4L   S2       
-         7        350 33101  13423 4R   S2       
-         7        351 33101  13255 4L   S2       
-         7        352 33101  13369 4R   S2       
-         7        353 33101  13279 4L   S2       
-         7        354 33101  13427 4R   S2       
-         7        355 33101  13303 4L   S2       
-         7        356 33101  13432 4R   S2       
-         7        357 33101  13337 4L   S2       
-         7        358 33101  13437 4R   S2       
-         7        359 33101  13348 4L   S2       
-         7        360 33101  13442 4R   S2       
-         7        361 33101  13315 4L   S2       
-         7        362 33101  13402 4R   S2       
-         7        363 33101  13322 4L   S2       
-         7        364 33101  13409 4R   S2       
-         7        365 33101  13331 4L   S2       
-         7        366 33101  13414 4R   S2       
-         7        367 33101  13336 4L   S2       
-         7        368 33101  13419 4R   S2       
-         7        369 33101  13343 4L   S2       
-         7        370 33101  13424 4R   S2       
-         7        371 33101  13262 4L   S2       
-         7        372 33101  13376 4R   S2       
-         7        373 33101  13280 4L   S2       
-         7        374 33101  13428 4R   S2       
-         7        375 33101  13316 4L   S2       
-         7        376 33101  13433 4R   S2       
-         7        377 33101  13342 4L   S2       
-         7        378 33101  13438 4R   S2       
-         7        379 33101  13349 4L   S2       
-         7        380 33101  13443 4R   S2       
-         7        381 33101  13318 4L   S2       
-         7        382 33101  13404 4R   S2       
-         7        383 33101  13325 4L   S2       
-         7        384 33101  13410 4R   S2       
-         7        385 33101  13332 4L   S2       
-         7        386 33101  13415 4R   S2       
-         7        387 33101  13338 4L   S2       
-         7        388 33101  13420 4R   S2       
-         7        389 33101  13344 4L   S2       
-         7        390 33101  13405 4R   S2       
-         7        391 33101  13264 4L   S2       
-         7        392 33101  13403 4R   S2       
-         7        393 33101  13286 4L   S2       
-         7        394 33101  13429 4R   S2       
-         7        395 33101  13323 4L   S2       
-         7        396 33101  13434 4R   S2       
-         7        397 33101  13345 4L   S2       
-         7        398 33101  13439 4R   S2       
-         7        399 33101  13350 4L   S2       
-         7        400 33101  13444 4R   S2       
-         7        401 33101  13461 5L   S2       
-         7        402 33101  13550 5R   S2       
-         7        403 33101  13469 5L   S2       
-         7        404 33101  13560 5R   S2       
-         7        405 33101  13489 5L   S2       
-         7        406 33101  13587 5R   S2       
-         7        407 33101  13500 5L   S2       
-         7        408 33101  13607 5R   S2       
-         7        409 33101  13511 5L   S2       
-         7        410 33101  13615 5R   S2       
-         7        411 33101  13459 5L   S2       
-         7        412 33101  13596 5R   S2       
-         7        413 33101  13523 5L   S2       
-         7        414 33101  13623 5R   S2       
-         7        415 33101  13530 5L   S2       
-         7        416 33101  13629 5R   S2       
-         7        417 33101  13505 5L   S2       
-         7        418 33101  13635 5R   S2       
-         7        419 33101  13539 5L   S2       
-         7        420 33101  13640 5R   S2       
-         7        421 33101  13462 5L   S2       
-         7        422 33101  13551 5R   S2       
-         7        423 33101  13471 5L   S2       
-         7        424 33101  13562 5R   S2       
-         7        425 33101  13491 5L   S2       
-         7        426 33101  13588 5R   S2       
-         7        427 33101  13502 5L   S2       
-         7        428 33101  13610 5R   S2       
-         7        429 33101  13519 5L   S2       
-         7        430 33101  13616 5R   S2       
-         7        431 33101  13483 5L   S2       
-         7        432 33101  13617 5R   S2       
-         7        433 33101  13524 5L   S2       
-         7        434 33101  13624 5R   S2       
-         7        435 33101  13531 5L   S2       
-         7        436 33101  13630 5R   S2       
-         7        437 33101  13535 5L   S2       
-         7        438 33101  13636 5R   S2       
-         7        439 33101  13540 5L   S2       
-         7        440 33101  13641 5R   S2       
-         7        441 33101  13463 5L   S2       
-         7        442 33101  13552 5R   S2       
-         7        443 33101  13472 5L   S2       
-         7        444 33101  13572 5R   S2       
-         7        445 33101  13493 5L   S2       
-         7        446 33101  13589 5R   S2       
-         7        447 33101  13503 5L   S2       
-         7        448 33101  13612 5R   S2       
-         7        449 33101  13520 5L   S2       
-         7        450 33101  13618 5R   S2       
-         7        451 33101  13486 5L   S2       
-         7        452 33101  13620 5R   S2       
-         7        453 33101  13525 5L   S2       
-         7        454 33101  13626 5R   S2       
-         7        455 33101  13532 5L   S2       
-         7        456 33101  13632 5R   S2       
-         7        457 33101  13536 5L   S2       
-         7        458 33101  13637 5R   S2       
-         7        459 33101  13542 5L   S2       
-         7        460 33101  13643 5R   S2       
-         7        461 33101  13465 5L   S2       
-         7        462 33101  13553 5R   S2       
-         7        463 33101  13477 5L   S2       
-         7        464 33101  13577 5R   S2       
-         7        465 33101  13497 5L   S2       
-         7        466 33101  13592 5R   S2       
-         7        467 33101  13504 5L   S2       
-         7        468 33101  13613 5R   S2       
-         7        469 33101  13522 5L   S2       
-         7        470 33101  13619 5R   S2       
-         7        471 33101  13496 5L   S2       
-         7        472 33101  13621 5R   S2       
-         7        473 33101  13526 5L   S2       
-         7        474 33101  13627 5R   S2       
-         7        475 33101  13533 5L   S2       
-         7        476 33101  13633 5R   S2       
-         7        477 33101  13537 5L   S2       
-         7        478 33101  13638 5R   S2       
-         7        479 33101  13543 5L   S2       
-         7        480 33101  13644 5R   S2       
-         7        481 33101  13467 5L   S2       
-         7        482 33101  13554 5R   S2       
-         7        483 33101  13481 5L   S2       
-         7        484 33101  13586 5R   S2       
-         7        485 33101  13498 5L   S2       
-         7        486 33101  13605 5R   S2       
-         7        487 33101  13506 5L   S2       
-         7        488 33101  13614 5R   S2       
-         7        489 33101  13528 5L   S2       
-         7        490 33101  13567 5R   S2       
-         7        491 33101  13517 5L   S2       
-         7        492 33101  13622 5R   S2       
-         7        493 33101  13527 5L   S2       
-         7        494 33101  13628 5R   S2       
-         7        495 33101  13534 5L   S2       
-         7        496 33101  13634 5R   S2       
-         7        497 33101  13538 5L   S2       
-         7        498 33101  13639 5R   S2       
-         7        499 33101  13544 5L   S2       
-         7        500 33101  13645 5R   S2       
-         7        501 33101  17637 6L   S3       
-         7        502 33101  15511 6R   P7       
-         7        503 33101  17632 6L   S3       
-         7        504 33101  15515 6R   P7       
-         7        505 33101  17617 6L   S3       
-         7        506 33101  15503 6R   P7       
-         7        507 33101  17612 6L   S3       
-         7        508 33101  15489 6R   P7       
-         7        509 33101  15448 6L   P7       
-         7        510 33101  15482 6R   P7       
-         7        511 33101  15442 6L   P7       
-         7        512 33101  15501 6R   P7       
-         7        513 33101  15436 6L   P7       
-         7        514 33101  15492 6R   P7       
-         7        515 33101  15403 6L   P7       
-         7        516 33101  15481 6R   P7       
-         7        517 33101  15428 6L   P7       
-         7        518 33101  15476 6R   P7       
-         7        519 33101  15423 6L   P7       
-         7        520 33101  15471 6R   P7       
-         7        521 33101  17638 6L   S3       
-         7        522 33101  15512 6R   P7       
-         7        523 33101  17633 6L   S3       
-         7        524 33101  15517 6R   P7       
-         7        525 33101  17618 6L   S3       
-         7        526 33101  15505 6R   P7       
-         7        527 33101  17613 6L   S3       
-         7        528 33101  15493 6R   P7       
-         7        529 33101  15449 6L   P7       
-         7        530 33101  15483 6R   P7       
-         7        531 33101  15443 6L   P7       
-         7        532 33101  15502 6R   P7       
-         7        533 33101  15437 6L   P7       
-         7        534 33101  15495 6R   P7       
-         7        535 33101  15418 6L   P7       
-         7        536 33101  15485 6R   P7       
-         7        537 33101  15429 6L   P7       
-         7        538 33101  15477 6R   P7       
-         7        539 33101  15424 6L   P7       
-         7        540 33101  15472 6R   P7       
-         7        541 33101  17639 6L   S3       
-         7        542 33101  15513 6R   P7       
-         7        543 33101  17634 6L   S3       
-         7        544 33101  15518 6R   P7       
-         7        545 33101  17619 6L   S3       
-         7        546 33101  15507 6R   P7       
-         7        547 33101  17614 6L   S3       
-         7        548 33101  15494 6R   P7       
-         7        549 33101  15452 6L   P7       
-         7        550 33101  15484 6R   P7       
-         7        551 33101  15444 6L   P7       
-         7        552 33101  15504 6R   P7       
-         7        553 33101  15438 6L   P7       
-         7        554 33101  15496 6R   P7       
-         7        555 33101  15431 6L   P7       
-         7        556 33101  15488 6R   P7       
-         7        557 33101  15430 6L   P7       
-         7        558 33101  15478 6R   P7       
-         7        559 33101  15425 6L   P7       
-         7        560 33101  15473 6R   P7       
-         7        561 33101  17640 6L   S3       
-         7        562 33101  15514 6R   P7       
-         7        563 33101  17635 6L   S3       
-         7        564 33101  15519 6R   P7       
-         7        565 33101  17620 6L   S3       
-         7        566 33101  15509 6R   P7       
-         7        567 33101  17615 6L   S3       
-         7        568 33101  15497 6R   P7       
-         7        569 33101  15453 6L   P7       
-         7        570 33101  15486 6R   P7       
-         7        571 33101  15445 6L   P7       
-         7        572 33101  15506 6R   P7       
-         7        573 33101  15439 6L   P7       
-         7        574 33101  15498 6R   P7       
-         7        575 33101  15434 6L   P7       
-         7        576 33101  15490 6R   P7       
-         7        577 33101  15432 6L   P7       
-         7        578 33101  15479 6R   P7       
-         7        579 33101  15426 6L   P7       
-         7        580 33101  15474 6R   P7       
-         7        581 33101  17641 6L   S3       
-         7        582 33101  15516 6R   P7       
-         7        583 33101  17636 6L   S3       
-         7        584 33101  15520 6R   P7       
-         7        585 33101  17621 6L   S3       
-         7        586 33101  15510 6R   P7       
-         7        587 33101  17616 6L   S3       
-         7        588 33101  15499 6R   P7       
-         7        589 33101  15454 6L   P7       
-         7        590 33101  15487 6R   P7       
-         7        591 33101  15447 6L   P7       
-         7        592 33101  15508 6R   P7       
-         7        593 33101  15440 6L   P7       
-         7        594 33101  15500 6R   P7       
-         7        595 33101  15435 6L   P7       
-         7        596 33101  15491 6R   P7       
-         7        597 33101  15433 6L   P7       
-         7        598 33101  15480 6R   P7       
-         7        599 33101  15427 6L   P7       
-         7        600 33101  15475 6R   P7       
-         7        601 33101  17747 7L   S3       
-         7        602 33101  17825 7R   S3       
-         7        603 33101  17737 7L   S3       
-         7        604 33101  17820 7R   S3       
-         7        605 33101  17757 7L   S3       
-         7        606 33101  17815 7R   S3       
-         7        607 33101  17742 7L   S3       
-         7        608 33101  17810 7R   S3       
-         7        609 33101  17732 7L   S3       
-         7        610 33101  15621 7R   P7       
-         7        611 33101  17727 7L   S3       
-         7        612 33101  15629 7R   P7       
-         7        613 33101  15581 7L   P7       
-         7        614 33101  15606 7R   P7       
-         7        615 33101  15568 7L   P7       
-         7        616 33101  15591 7R   P7       
-         7        617 33101  15575 7L   P7       
-         7        618 33101  15596 7R   P7       
-         7        619 33101  15543 7L   P7       
-         7        620 33101  15586 7R   P7       
-         7        621 33101  17748 7L   S3       
-         7        622 33101  17826 7R   S3       
-         7        623 33101  17738 7L   S3       
-         7        624 33101  17821 7R   S3       
-         7        625 33101  17758 7L   S3       
-         7        626 33101  17816 7R   S3       
-         7        627 33101  17743 7L   S3       
-         7        628 33101  17811 7R   S3       
-         7        629 33101  17733 7L   S3       
-         7        630 33101  15623 7R   P7       
-         7        631 33101  17728 7L   S3       
-         7        632 33101  15630 7R   P7       
-         7        633 33101  15582 7L   P7       
-         7        634 33101  15607 7R   P7       
-         7        635 33101  15571 7L   P7       
-         7        636 33101  15592 7R   P7       
-         7        637 33101  15577 7L   P7       
-         7        638 33101  15597 7R   P7       
-         7        639 33101  15544 7L   P7       
-         7        640 33101  15587 7R   P7       
-         7        641 33101  17749 7L   S3       
-         7        642 33101  17827 7R   S3       
-         7        643 33101  17739 7L   S3       
-         7        644 33101  17822 7R   S3       
-         7        645 33101  17759 7L   S3       
-         7        646 33101  17817 7R   S3       
-         7        647 33101  17744 7L   S3       
-         7        648 33101  17812 7R   S3       
-         7        649 33101  17734 7L   S3       
-         7        650 33101  15624 7R   P7       
-         7        651 33101  17729 7L   S3       
-         7        652 33101  15631 7R   P7       
-         7        653 33101  15583 7L   P7       
-         7        654 33101  15608 7R   P7       
-         7        655 33101  15573 7L   P7       
-         7        656 33101  15593 7R   P7       
-         7        657 33101  15578 7L   P7       
-         7        658 33101  15598 7R   P7       
-         7        659 33101  15545 7L   P7       
-         7        660 33101  15588 7R   P7       
-         7        661 33101  17750 7L   S3       
-         7        662 33101  17828 7R   S3       
-         7        663 33101  17740 7L   S3       
-         7        664 33101  17823 7R   S3       
-         7        665 33101  17760 7L   S3       
-         7        666 33101  17818 7R   S3       
-         7        667 33101  17745 7L   S3       
-         7        668 33101  17813 7R   S3       
-         7        669 33101  17735 7L   S3       
-         7        670 33101  15627 7R   P7       
-         7        671 33101  17730 7L   S3       
-         7        672 33101  15632 7R   P7       
-         7        673 33101  15535 7L   P7       
-         7        674 33101  15609 7R   P7       
-         7        675 33101  15574 7L   P7       
-         7        676 33101  15594 7R   P7       
-         7        677 33101  15579 7L   P7       
-         7        678 33101  15599 7R   P7       
-         7        679 33101  15584 7L   P7       
-         7        680 33101  15589 7R   P7       
-         7        681 33101  17751 7L   S3       
-         7        682 33101  17829 7R   S3       
-         7        683 33101  17741 7L   S3       
-         7        684 33101  17824 7R   S3       
-         7        685 33101  17761 7L   S3       
-         7        686 33101  17819 7R   S3       
-         7        687 33101  17746 7L   S3       
-         7        688 33101  17814 7R   S3       
-         7        689 33101  17736 7L   S3       
-         7        690 33101  15628 7R   P7       
-         7        691 33101  17731 7L   S3       
-         7        692 33101  15634 7R   P7       
-         7        693 33101  15542 7L   P7       
-         7        694 33101  15610 7R   P7       
-         7        695 33101  15576 7L   P7       
-         7        696 33101  15595 7R   P7       
-         7        697 33101  15580 7L   P7       
-         7        698 33101  15600 7R   P7       
-         7        699 33101  15585 7L   P7       
-         7        700 33101  15590 7R   P7       
-         7        701 33101  17870 8L   S3       
-         7        702 33101  15721 8R   P7       
-         7        703 33101  17865 8L   S3       
-         7        704 33101  17949 8R   S3       
-         7        705 33101  17875 8L   S3       
-         7        706 33101  17944 8R   S3       
-         7        707 33101  15677 8L   P7       
-         7        708 33101  17939 8R   S3       
-         7        709 33101  15672 8L   P7       
-         7        710 33101  17934 8R   S3       
-         7        711 33101  15657 8L   P7       
-         7        712 33101  15726 8R   P7       
-         7        713 33101  15649 8L   P7       
-         7        714 33101  15695 8R   P7       
-         7        715 33101  15652 8L   P7       
-         7        716 33101  15713 8R   P7       
-         7        717 33101  15647 8L   P7       
-         7        718 33101  15697 8R   P7       
-         7        719 33101  15642 8L   P7       
-         7        720 33101  15691 8R   P7       
-         7        721 33101  17871 8L   S3       
-         7        722 33101  15722 8R   P7       
-         7        723 33101  17866 8L   S3       
-         7        724 33101  17950 8R   S3       
-         7        725 33101  17876 8L   S3       
-         7        726 33101  17945 8R   S3       
-         7        727 33101  17884 8L   S3       
-         7        728 33101  17940 8R   S3       
-         7        729 33101  15673 8L   P7       
-         7        730 33101  17935 8R   S3       
-         7        731 33101  15658 8L   P7       
-         7        732 33101  15727 8R   P7       
-         7        733 33101  15662 8L   P7       
-         7        734 33101  15699 8R   P7       
-         7        735 33101  15653 8L   P7       
-         7        736 33101  15716 8R   P7       
-         7        737 33101  15648 8L   P7       
-         7        738 33101  15698 8R   P7       
-         7        739 33101  15643 8L   P7       
-         7        740 33101  15692 8R   P7       
-         7        741 33101  17872 8L   S3       
-         7        742 33101  15723 8R   P7       
-         7        743 33101  17867 8L   S3       
-         7        744 33101  17951 8R   S3       
-         7        745 33101  17877 8L   S3       
-         7        746 33101  17946 8R   S3       
-         7        747 33101  15679 8L   P7       
-         7        748 33101  17941 8R   S3       
-         7        749 33101  15674 8L   P7       
-         7        750 33101  17936 8R   S3       
-         7        751 33101  15659 8L   P7       
-         7        752 33101  15728 8R   P7       
-         7        753 33101  15664 8L   P7       
-         7        754 33101  15711 8R   P7       
-         7        755 33101  15654 8L   P7       
-         7        756 33101  15717 8R   P7       
-         7        757 33101  15650 8L   P7       
-         7        758 33101  15700 8R   P7       
-         7        759 33101  15644 8L   P7       
-         7        760 33101  15693 8R   P7       
-         7        761 33101  17873 8L   S3       
-         7        762 33101  15724 8R   P7       
-         7        763 33101  17868 8L   S3       
-         7        764 33101  17952 8R   S3       
-         7        765 33101  17878 8L   S3       
-         7        766 33101  17947 8R   S3       
-         7        767 33101  15680 8L   P7       
-         7        768 33101  17942 8R   S3       
-         7        769 33101  15675 8L   P7       
-         7        770 33101  17937 8R   S3       
-         7        771 33101  15660 8L   P7       
-         7        772 33101  15729 8R   P7       
-         7        773 33101  15665 8L   P7       
-         7        774 33101  15712 8R   P7       
-         7        775 33101  15655 8L   P7       
-         7        776 33101  15718 8R   P7       
-         7        777 33101  15651 8L   P7       
-         7        778 33101  15714 8R   P7       
-         7        779 33101  15645 8L   P7       
-         7        780 33101  15694 8R   P7       
-         7        781 33101  17874 8L   S3       
-         7        782 33101  15725 8R   P7       
-         7        783 33101  17869 8L   S3       
-         7        784 33101  17953 8R   S3       
-         7        785 33101  17879 8L   S3       
-         7        786 33101  17948 8R   S3       
-         7        787 33101  15681 8L   P7       
-         7        788 33101  17943 8R   S3       
-         7        789 33101  15676 8L   P7       
-         7        790 33101  17938 8R   S3       
-         7        791 33101  15661 8L   P7       
-         7        792 33101  15730 8R   P7       
-         7        793 33101  15666 8L   P7       
-         7        794 33101  15719 8R   P7       
-         7        795 33101  15656 8L   P7       
-         7        796 33101  15720 8R   P7       
-         7        797 33101  15663 8L   P7       
-         7        798 33101  15715 8R   P7       
-         7        799 33101  15646 8L   P7       
-         7        800 33101  15696 8R   P7       
-         7        801 33101  18039 9L   S3       
-         7        802 33101  15765 9R   P7       
-         7        803 33101  18034 9L   S3       
-         7        804 33101  15770 9R   P7       
-         7        805 33101  14383 9L   S2       
-         7        806 33101  15760 9R   P7       
-         7        807 33101  14376 9L   S2       
-         7        808 33101  15755 9R   P7       
-         7        809 33101  14366 9L   S2       
-         7        810 33101  15740 9R   P7       
-         7        811 33101  14357 9L   S2       
-         7        812 33101  15780 9R   P7       
-         7        813 33101  14371 9L   S2       
-         7        814 33101  15775 9R   P7       
-         7        815 33101  14353 9L   S2       
-         7        816 33101  15743 9R   P7       
-         7        817 33101  14362 9L   S2       
-         7        818 33101  15748 9R   P7       
-         7        819 33101  14348 9L   S2       
-         7        820 33101  15787 9R   P7       
-         7        821 33101  18040 9L   S3       
-         7        822 33101  15766 9R   P7       
-         7        823 33101  18035 9L   S3       
-         7        824 33101  15771 9R   P7       
-         7        825 33101  14384 9L   S2       
-         7        826 33101  15761 9R   P7       
-         7        827 33101  14377 9L   S2       
-         7        828 33101  15756 9R   P7       
-         7        829 33101  14368 9L   S2       
-         7        830 33101  15741 9R   P7       
-         7        831 33101  14359 9L   S2       
-         7        832 33101  15781 9R   P7       
-         7        833 33101  14372 9L   S2       
-         7        834 33101  15776 9R   P7       
-         7        835 33101  14354 9L   S2       
-         7        836 33101  15744 9R   P7       
-         7        837 33101  14363 9L   S2       
-         7        838 33101  15751 9R   P7       
-         7        839 33101  14349 9L   S2       
-         7        840 33101  15788 9R   P7       
-         7        841 33101  18041 9L   S3       
-         7        842 33101  15767 9R   P7       
-         7        843 33101  18036 9L   S3       
-         7        844 33101  15772 9R   P7       
-         7        845 33101  14385 9L   S2       
-         7        846 33101  15762 9R   P7       
-         7        847 33101  14380 9L   S2       
-         7        848 33101  15757 9R   P7       
-         7        849 33101  14369 9L   S2       
-         7        850 33101  15742 9R   P7       
-         7        851 33101  14360 9L   S2       
-         7        852 33101  15782 9R   P7       
-         7        853 33101  14374 9L   S2       
-         7        854 33101  15779 9R   P7       
-         7        855 33101  14355 9L   S2       
-         7        856 33101  15745 9R   P7       
-         7        857 33101  14365 9L   S2       
-         7        858 33101  15752 9R   P7       
-         7        859 33101  14350 9L   S2       
-         7        860 33101  15790 9R   P7       
-         7        861 33101  18042 9L   S3       
-         7        862 33101  15768 9R   P7       
-         7        863 33101  18037 9L   S3       
-         7        864 33101  15773 9R   P7       
-         7        865 33101  14386 9L   S2       
-         7        866 33101  15763 9R   P7       
-         7        867 33101  14381 9L   S2       
-         7        868 33101  15758 9R   P7       
-         7        869 33101  14373 9L   S2       
-         7        870 33101  15749 9R   P7       
-         7        871 33101  14361 9L   S2       
-         7        872 33101  15783 9R   P7       
-         7        873 33101  14378 9L   S2       
-         7        874 33101  15795 9R   P7       
-         7        875 33101  14356 9L   S2       
-         7        876 33101  15746 9R   P7       
-         7        877 33101  14367 9L   S2       
-         7        878 33101  15753 9R   P7       
-         7        879 33101  14351 9L   S2       
-         7        880 33101  15792 9R   P7       
-         7        881 33101  18043 9L   S3       
-         7        882 33101  15769 9R   P7       
-         7        883 33101  18038 9L   S3       
-         7        884 33101  15774 9R   P7       
-         7        885 33101  14387 9L   S2       
-         7        886 33101  15764 9R   P7       
-         7        887 33101  14382 9L   S2       
-         7        888 33101  15759 9R   P7       
-         7        889 33101  14375 9L   S2       
-         7        890 33101  15750 9R   P7       
-         7        891 33101  14364 9L   S2       
-         7        892 33101  15784 9R   P7       
-         7        893 33101  14379 9L   S2       
-         7        894 33101  15796 9R   P7       
-         7        895 33101  14358 9L   S2       
-         7        896 33101  15747 9R   P7       
-         7        897 33101  14370 9L   S2       
-         7        898 33101  15754 9R   P7       
-         7        899 33101  14352 9L   S2       
-         7        900 33101  15793 9R   P7       
-         7        901 33101  14468 10L  S2       
-         7        902 33101  14630 10R  S2       
-         7        903 33101  14492 10L  S2       
-         7        904 33101  14625 10R  S2       
-         7        905 33101  14487 10L  S2       
-         7        906 33101  14620 10R  S2       
-         7        907 33101  14480 10L  S2       
-         7        908 33101  14615 10R  S2       
-         7        909 33101  14474 10L  S2       
-         7        910 33101  14610 10R  S2       
-         7        911 33101  14462 10L  S2       
-         7        912 33101  14645 10R  S2       
-         7        913 33101  14467 10L  S2       
-         7        914 33101  14595 10R  S2       
-         7        915 33101  14419 10L  S2       
-         7        916 33101  14552 10R  S2       
-         7        917 33101  14450 10L  S2       
-         7        918 33101  14545 10R  S2       
-         7        919 33101  14512 10L  S2       
-         7        920 33101  14605 10R  S2       
-         7        921 33101  14470 10L  S2       
-         7        922 33101  14631 10R  S2       
-         7        923 33101  14493 10L  S2       
-         7        924 33101  14626 10R  S2       
-         7        925 33101  14488 10L  S2       
-         7        926 33101  14621 10R  S2       
-         7        927 33101  14481 10L  S2       
-         7        928 33101  14616 10R  S2       
-         7        929 33101  14476 10L  S2       
-         7        930 33101  14611 10R  S2       
-         7        931 33101  14463 10L  S2       
-         7        932 33101  14646 10R  S2       
-         7        933 33101  14469 10L  S2       
-         7        934 33101  14597 10R  S2       
-         7        935 33101  14423 10L  S2       
-         7        936 33101  14562 10R  S2       
-         7        937 33101  14517 10L  S2       
-         7        938 33101  14546 10R  S2       
-         7        939 33101  14513 10L  S2       
-         7        940 33101  14606 10R  S2       
-         7        941 33101  14471 10L  S2       
-         7        942 33101  14632 10R  S2       
-         7        943 33101  14494 10L  S2       
-         7        944 33101  14627 10R  S2       
-         7        945 33101  14489 10L  S2       
-         7        946 33101  14622 10R  S2       
-         7        947 33101  14483 10L  S2       
-         7        948 33101  14617 10R  S2       
-         7        949 33101  14477 10L  S2       
-         7        950 33101  14612 10R  S2       
-         7        951 33101  14464 10L  S2       
-         7        952 33101  14647 10R  S2       
-         7        953 33101  14475 10L  S2       
-         7        954 33101  14599 10R  S2       
-         7        955 33101  14424 10L  S2       
-         7        956 33101  14585 10R  S2       
-         7        957 33101  14518 10L  S2       
-         7        958 33101  14547 10R  S2       
-         7        959 33101  14514 10L  S2       
-         7        960 33101  14607 10R  S2       
-         7        961 33101  14472 10L  S2       
-         7        962 33101  14633 10R  S2       
-         7        963 33101  14495 10L  S2       
-         7        964 33101  14628 10R  S2       
-         7        965 33101  14490 10L  S2       
-         7        966 33101  14623 10R  S2       
-         7        967 33101  14485 10L  S2       
-         7        968 33101  14618 10R  S2       
-         7        969 33101  14478 10L  S2       
-         7        970 33101  14613 10R  S2       
-         7        971 33101  14465 10L  S2       
-         7        972 33101  14648 10R  S2       
-         7        973 33101  14482 10L  S2       
-         7        974 33101  14600 10R  S2       
-         7        975 33101  14431 10L  S2       
-         7        976 33101  14590 10R  S2       
-         7        977 33101  14519 10L  S2       
-         7        978 33101  14548 10R  S2       
-         7        979 33101  14515 10L  S2       
-         7        980 33101  14608 10R  S2       
-         7        981 33101  14473 10L  S2       
-         7        982 33101  14634 10R  S2       
-         7        983 33101  14496 10L  S2       
-         7        984 33101  14629 10R  S2       
-         7        985 33101  14491 10L  S2       
-         7        986 33101  14624 10R  S2       
-         7        987 33101  14486 10L  S2       
-         7        988 33101  14619 10R  S2       
-         7        989 33101  14479 10L  S2       
-         7        990 33101  14614 10R  S2       
-         7        991 33101  14466 10L  S2       
-         7        992 33101  14649 10R  S2       
-         7        993 33101  14484 10L  S2       
-         7        994 33101  14601 10R  S2       
-         7        995 33101  14521 10L  S2       
-         7        996 33101  14568 10R  S2       
-         7        997 33101  14520 10L  S2       
-         7        998 33101  14549 10R  S2       
-         7        999 33101  14516 10L  S2       
-         7       1000 33101  14609 10R  S2       
-         7       1001 33101  18233 11L  S3       
-         7       1002 33101  14948 11R  S2       
-         7       1003 33101  18248 11L  S3       
-         7       1004 33101  14943 11R  S2       
-         7       1005 33101  18238 11L  S3       
-         7       1006 33101  14938 11R  S2       
-         7       1007 33101  14766 11L  S2       
-         7       1008 33101  14916 11R  S2       
-         7       1009 33101  14755 11L  S2       
-         7       1010 33101  14928 11R  S2       
-         7       1011 33101  14775 11L  S2       
-         7       1012 33101  14933 11R  S2       
-         7       1013 33101  14760 11L  S2       
-         7       1014 33101  14923 11R  S2       
-         7       1015 33101  14750 11L  S2       
-         7       1016 33101  14913 11R  S2       
-         7       1017 33101  14745 11L  S2       
-         7       1018 33101  14908 11R  S2       
-         7       1019 33101  14725 11L  S2       
-         7       1020 33101  14898 11R  S2       
-         7       1021 33101  18234 11L  S3       
-         7       1022 33101  14949 11R  S2       
-         7       1023 33101  18249 11L  S3       
-         7       1024 33101  14944 11R  S2       
-         7       1025 33101  18239 11L  S3       
-         7       1026 33101  14939 11R  S2       
-         7       1027 33101  14767 11L  S2       
-         7       1028 33101  14919 11R  S2       
-         7       1029 33101  14756 11L  S2       
-         7       1030 33101  14929 11R  S2       
-         7       1031 33101  14776 11L  S2       
-         7       1032 33101  14934 11R  S2       
-         7       1033 33101  14761 11L  S2       
-         7       1034 33101  14924 11R  S2       
-         7       1035 33101  14751 11L  S2       
-         7       1036 33101  14914 11R  S2       
-         7       1037 33101  14746 11L  S2       
-         7       1038 33101  14909 11R  S2       
-         7       1039 33101  14734 11L  S2       
-         7       1040 33101  14899 11R  S2       
-         7       1041 33101  18235 11L  S3       
-         7       1042 33101  14950 11R  S2       
-         7       1043 33101  18250 11L  S3       
-         7       1044 33101  14945 11R  S2       
-         7       1045 33101  18240 11L  S3       
-         7       1046 33101  14940 11R  S2       
-         7       1047 33101  14768 11L  S2       
-         7       1048 33101  14920 11R  S2       
-         7       1049 33101  14757 11L  S2       
-         7       1050 33101  14930 11R  S2       
-         7       1051 33101  14777 11L  S2       
-         7       1052 33101  14935 11R  S2       
-         7       1053 33101  14762 11L  S2       
-         7       1054 33101  14925 11R  S2       
-         7       1055 33101  14752 11L  S2       
-         7       1056 33101  14915 11R  S2       
-         7       1057 33101  14747 11L  S2       
-         7       1058 33101  14910 11R  S2       
-         7       1059 33101  14782 11L  S2       
-         7       1060 33101  14900 11R  S2       
-         7       1061 33101  18243 11L  S3       
-         7       1062 33101  14951 11R  S2       
-         7       1063 33101  18251 11L  S3       
-         7       1064 33101  14946 11R  S2       
-         7       1065 33101  18241 11L  S3       
-         7       1066 33101  14941 11R  S2       
-         7       1067 33101  14769 11L  S2       
-         7       1068 33101  14921 11R  S2       
-         7       1069 33101  14758 11L  S2       
-         7       1070 33101  14931 11R  S2       
-         7       1071 33101  14778 11L  S2       
-         7       1072 33101  14936 11R  S2       
-         7       1073 33101  14763 11L  S2       
-         7       1074 33101  14926 11R  S2       
-         7       1075 33101  14753 11L  S2       
-         7       1076 33101  14917 11R  S2       
-         7       1077 33101  14748 11L  S2       
-         7       1078 33101  14911 11R  S2       
-         7       1079 33101  14788 11L  S2       
-         7       1080 33101  14901 11R  S2       
-         7       1081 33101  18244 11L  S3       
-         7       1082 33101  14952 11R  S2       
-         7       1083 33101  18252 11L  S3       
-         7       1084 33101  14947 11R  S2       
-         7       1085 33101  18242 11L  S3       
-         7       1086 33101  14942 11R  S2       
-         7       1087 33101  14770 11L  S2       
-         7       1088 33101  14922 11R  S2       
-         7       1089 33101  14759 11L  S2       
-         7       1090 33101  14932 11R  S2       
-         7       1091 33101  14779 11L  S2       
-         7       1092 33101  14937 11R  S2       
-         7       1093 33101  14764 11L  S2       
-         7       1094 33101  14927 11R  S2       
-         7       1095 33101  14754 11L  S2       
-         7       1096 33101  14918 11R  S2       
-         7       1097 33101  14749 11L  S2       
-         7       1098 33101  14912 11R  S2       
-         7       1099 33101  14789 11L  S2       
-         7       1100 33101  14902 11R  S2       
-         7       1101 33101  18390 12L  P8       
-         7       1102 33101  18525 12R  P8       
-         7       1103 33101  18380 12L  P8       
-         7       1104 33101  18520 12R  P8       
-         7       1105 33101  18375 12L  P8       
-         7       1106 33101  18515 12R  P8       
-         7       1107 33101  18370 12L  P8       
-         7       1108 33101  18510 12R  P8       
-         7       1109 33101  18365 12L  P8       
-         7       1110 33101  18505 12R  P8       
-         7       1111 33101  18360 12L  P8       
-         7       1112 33101  18495 12R  P8       
-         7       1113 33101  18355 12L  P8       
-         7       1114 33101  18490 12R  P8       
-         7       1115 33101  18385 12L  P8       
-         7       1116 33101  18485 12R  P8       
-         7       1117 33101  14997 12L  S2       
-         7       1118 33101  18480 12R  P8       
-         7       1119 33101  15060 12L  S2       
-         7       1120 33101  15166 12R  S2       
-         7       1121 33101  18391 12L  P8       
-         7       1122 33101  18526 12R  P8       
-         7       1123 33101  18381 12L  P8       
-         7       1124 33101  18521 12R  P8       
-         7       1125 33101  18376 12L  P8       
-         7       1126 33101  18516 12R  P8       
-         7       1127 33101  18371 12L  P8       
-         7       1128 33101  18511 12R  P8       
-         7       1129 33101  18366 12L  P8       
-         7       1130 33101  18506 12R  P8       
-         7       1131 33101  18361 12L  P8       
-         7       1132 33101  18496 12R  P8       
-         7       1133 33101  18356 12L  P8       
-         7       1134 33101  18491 12R  P8       
-         7       1135 33101  18386 12L  P8       
-         7       1136 33101  18486 12R  P8       
-         7       1137 33101  14999 12L  S2       
-         7       1138 33101  18481 12R  P8       
-         7       1139 33101  15061 12L  S2       
-         7       1140 33101  15171 12R  S2       
-         7       1141 33101  18392 12L  P8       
-         7       1142 33101  18527 12R  P8       
-         7       1143 33101  18382 12L  P8       
-         7       1144 33101  18522 12R  P8       
-         7       1145 33101  18377 12L  P8       
-         7       1146 33101  18517 12R  P8       
-         7       1147 33101  18372 12L  P8       
-         7       1148 33101  18512 12R  P8       
-         7       1149 33101  18367 12L  P8       
-         7       1150 33101  18507 12R  P8       
-         7       1151 33101  18362 12L  P8       
-         7       1152 33101  18497 12R  P8       
-         7       1153 33101  18357 12L  P8       
-         7       1154 33101  18492 12R  P8       
-         7       1155 33101  18387 12L  P8       
-         7       1156 33101  18487 12R  P8       
-         7       1157 33101  15001 12L  S2       
-         7       1158 33101  18482 12R  P8       
-         7       1159 33101  15072 12L  S2       
-         7       1160 33101  15189 12R  S2       
-         7       1161 33101  18393 12L  P8       
-         7       1162 33101  18528 12R  P8       
-         7       1163 33101  18383 12L  P8       
-         7       1164 33101  18523 12R  P8       
-         7       1165 33101  18378 12L  P8       
-         7       1166 33101  18518 12R  P8       
-         7       1167 33101  18373 12L  P8       
-         7       1168 33101  18513 12R  P8       
-         7       1169 33101  18368 12L  P8       
-         7       1170 33101  18508 12R  P8       
-         7       1171 33101  18363 12L  P8       
-         7       1172 33101  18498 12R  P8       
-         7       1173 33101  18358 12L  P8       
-         7       1174 33101  18493 12R  P8       
-         7       1175 33101  18388 12L  P8       
-         7       1176 33101  18488 12R  P8       
-         7       1177 33101  15040 12L  S2       
-         7       1178 33101  18483 12R  P8       
-         7       1179 33101  15074 12L  S2       
-         7       1180 33101  15190 12R  S2       
-         7       1181 33101  18394 12L  P8       
-         7       1182 33101  18529 12R  P8       
-         7       1183 33101  18384 12L  P8       
-         7       1184 33101  18524 12R  P8       
-         7       1185 33101  18379 12L  P8       
-         7       1186 33101  18519 12R  P8       
-         7       1187 33101  18374 12L  P8       
-         7       1188 33101  18514 12R  P8       
-         7       1189 33101  18369 12L  P8       
-         7       1190 33101  18509 12R  P8       
-         7       1191 33101  18364 12L  P8       
-         7       1192 33101  18499 12R  P8       
-         7       1193 33101  18359 12L  P8       
-         7       1194 33101  18494 12R  P8       
-         7       1195 33101  18389 12L  P8       
-         7       1196 33101  18489 12R  P8       
-         7       1197 33101  15041 12L  S2       
-         7       1198 33101  18484 12R  P8       
-         7       1199 33101  15076 12L  S2       
-         7       1200 33101  15191 12R  S2       
-         7       1201 33101  18622 13L  S3       
-         7       1202 33101  18711 13R  S3       
-         7       1203 33101  18617 13L  S3       
-         7       1204 33101  18742 13R  S3       
-         7       1205 33101  18612 13L  S3       
-         7       1206 33101  18737 13R  S3       
-         7       1207 33101  18607 13L  S3       
-         7       1208 33101  18702 13R  S3       
-         7       1209 33101  18602 13L  S3       
-         7       1210 33101  18697 13R  S3       
-         7       1211 33101  18597 13L  S3       
-         7       1212 33101  18692 13R  S3       
-         7       1213 33101  18592 13L  S3       
-         7       1214 33101  18687 13R  S3       
-         7       1215 33101  18587 13L  S3       
-         7       1216 33101  18732 13R  S3       
-         7       1217 33101  18582 13L  S3       
-         7       1218 33101  18727 13R  S3       
-         7       1219 33101  15196 13L  S2       
-         7       1220 33101  18722 13R  S3       
-         7       1221 33101  18623 13L  S3       
-         7       1222 33101  18712 13R  S3       
-         7       1223 33101  18618 13L  S3       
-         7       1224 33101  18743 13R  S3       
-         7       1225 33101  18613 13L  S3       
-         7       1226 33101  18738 13R  S3       
-         7       1227 33101  18608 13L  S3       
-         7       1228 33101  18703 13R  S3       
-         7       1229 33101  18603 13L  S3       
-         7       1230 33101  18698 13R  S3       
-         7       1231 33101  18598 13L  S3       
-         7       1232 33101  18693 13R  S3       
-         7       1233 33101  18593 13L  S3       
-         7       1234 33101  18688 13R  S3       
-         7       1235 33101  18588 13L  S3       
-         7       1236 33101  18733 13R  S3       
-         7       1237 33101  18583 13L  S3       
-         7       1238 33101  18728 13R  S3       
-         7       1239 33101  15197 13L  S2       
-         7       1240 33101  18723 13R  S3       
-         7       1241 33101  18624 13L  S3       
-         7       1242 33101  18713 13R  S3       
-         7       1243 33101  18619 13L  S3       
-         7       1244 33101  18744 13R  S3       
-         7       1245 33101  18614 13L  S3       
-         7       1246 33101  18739 13R  S3       
-         7       1247 33101  18609 13L  S3       
-         7       1248 33101  18704 13R  S3       
-         7       1249 33101  18604 13L  S3       
-         7       1250 33101  18699 13R  S3       
-         7       1251 33101  18599 13L  S3       
-         7       1252 33101  18694 13R  S3       
-         7       1253 33101  18594 13L  S3       
-         7       1254 33101  18689 13R  S3       
-         7       1255 33101  18589 13L  S3       
-         7       1256 33101  18734 13R  S3       
-         7       1257 33101  18584 13L  S3       
-         7       1258 33101  18729 13R  S3       
-         7       1259 33101  15210 13L  S2       
-         7       1260 33101  18724 13R  S3       
-         7       1261 33101  18625 13L  S3       
-         7       1262 33101  18714 13R  S3       
-         7       1263 33101  18621 13L  S3       
-         7       1264 33101  18745 13R  S3       
-         7       1265 33101  18615 13L  S3       
-         7       1266 33101  18740 13R  S3       
-         7       1267 33101  18610 13L  S3       
-         7       1268 33101  18705 13R  S3       
-         7       1269 33101  18605 13L  S3       
-         7       1270 33101  18700 13R  S3       
-         7       1271 33101  18600 13L  S3       
-         7       1272 33101  18695 13R  S3       
-         7       1273 33101  18595 13L  S3       
-         7       1274 33101  18690 13R  S3       
-         7       1275 33101  18590 13L  S3       
-         7       1276 33101  18735 13R  S3       
-         7       1277 33101  18585 13L  S3       
-         7       1278 33101  18730 13R  S3       
-         7       1279 33101  15249 13L  S2       
-         7       1280 33101  18725 13R  S3       
-         7       1281 33101  18626 13L  S3       
-         7       1282 33101  18716 13R  S3       
-         7       1283 33101  18627 13L  S3       
-         7       1284 33101  18746 13R  S3       
-         7       1285 33101  18616 13L  S3       
-         7       1286 33101  18741 13R  S3       
-         7       1287 33101  18611 13L  S3       
-         7       1288 33101  18706 13R  S3       
-         7       1289 33101  18606 13L  S3       
-         7       1290 33101  18701 13R  S3       
-         7       1291 33101  18601 13L  S3       
-         7       1292 33101  18696 13R  S3       
-         7       1293 33101  18596 13L  S3       
-         7       1294 33101  18707 13R  S3       
-         7       1295 33101  18591 13L  S3       
-         7       1296 33101  18736 13R  S3       
-         7       1297 33101  18586 13L  S3       
-         7       1298 33101  18731 13R  S3       
-         7       1299 33101  15277 13L  S2       
-         7       1300 33101  18726 13R  S3       
-         7       1301 33101  12331 14L  S1       
-         7       1302 33101  13761 14R  S2       
-         7       1303 33101  12379 14L  S1       
-         7       1304 33101  13819 14R  S2       
-         7       1305 33101  13711 14L  S2       
-         7       1306 33101  17113 14R  S3       
-         7       1307 33101  13731 14L  S2       
-         7       1308 33101  17118 14R  S3       
-         7       1309 33101  13741 14L  S2       
-         7       1310 33101  17124 14R  S3       
-         7       1311 33101  17084 14L  S3       
-         7       1312 33101  17129 14R  S3       
-         7       1313 33101  17092 14L  S3       
-         7       1314 33101  17134 14R  S3       
-         7       1315 33101  17097 14L  S3       
-         7       1316 33101  17142 14R  S3       
-         7       1317 33101  17102 14L  S3       
-         7       1318 33101  17148 14R  S3       
-         7       1319 33101  17107 14L  S3       
-         7       1320 33101  17153 14R  S3       
-         7       1321 33101  13649 14L  S2       
-         7       1322 33101  13786 14R  S2       
-         7       1323 33101  17064 14L  S3       
-         7       1324 33101  13844 14R  S2       
-         7       1325 33101  17072 14L  S3       
-         7       1326 33101  17114 14R  S3       
-         7       1327 33101  17077 14L  S3       
-         7       1328 33101  17120 14R  S3       
-         7       1329 33101  17083 14L  S3       
-         7       1330 33101  17125 14R  S3       
-         7       1331 33101  17088 14L  S3       
-         7       1332 33101  17130 14R  S3       
-         7       1333 33101  17093 14L  S3       
-         7       1334 33101  17135 14R  S3       
-         7       1335 33101  17098 14L  S3       
-         7       1336 33101  17143 14R  S3       
-         7       1337 33101  17103 14L  S3       
-         7       1338 33101  17149 14R  S3       
-         7       1339 33101  17108 14L  S3       
-         7       1340 33101  17154 14R  S3       
-         7       1341 33101  13748 14L  S2       
-         7       1342 33101  13812 14R  S2       
-         7       1343 33101  17065 14L  S3       
-         7       1344 33101  13860 14R  S2       
-         7       1345 33101  17073 14L  S3       
-         7       1346 33101  17115 14R  S3       
-         7       1347 33101  17078 14L  S3       
-         7       1348 33101  17121 14R  S3       
-         7       1349 33101  17085 14L  S3       
-         7       1350 33101  17126 14R  S3       
-         7       1351 33101  17089 14L  S3       
-         7       1352 33101  17131 14R  S3       
-         7       1353 33101  17094 14L  S3       
-         7       1354 33101  17137 14R  S3       
-         7       1355 33101  17099 14L  S3       
-         7       1356 33101  17145 14R  S3       
-         7       1357 33101  17104 14L  S3       
-         7       1358 33101  17150 14R  S3       
-         7       1359 33101  17109 14L  S3       
-         7       1360 33101  17155 14R  S3       
-         7       1361 33101  13749 14L  S2       
-         7       1362 33101  13814 14R  S2       
-         7       1363 33101  17066 14L  S3       
-         7       1364 33101  13861 14R  S2       
-         7       1365 33101  17074 14L  S3       
-         7       1366 33101  17116 14R  S3       
-         7       1367 33101  17079 14L  S3       
-         7       1368 33101  17122 14R  S3       
-         7       1369 33101  17086 14L  S3       
-         7       1370 33101  17127 14R  S3       
-         7       1371 33101  17090 14L  S3       
-         7       1372 33101  17132 14R  S3       
-         7       1373 33101  17095 14L  S3       
-         7       1374 33101  17139 14R  S3       
-         7       1375 33101  17100 14L  S3       
-         7       1376 33101  17146 14R  S3       
-         7       1377 33101  17105 14L  S3       
-         7       1378 33101  17151 14R  S3       
-         7       1379 33101  17110 14L  S3       
-         7       1380 33101  17156 14R  S3       
-         7       1381 33101  17063 14L  S3       
-         7       1382 33101  13818 14R  S2       
-         7       1383 33101  17067 14L  S3       
-         7       1384 33101  13862 14R  S2       
-         7       1385 33101  17075 14L  S3       
-         7       1386 33101  17117 14R  S3       
-         7       1387 33101  17080 14L  S3       
-         7       1388 33101  17123 14R  S3       
-         7       1389 33101  17087 14L  S3       
-         7       1390 33101  17128 14R  S3       
-         7       1391 33101  17091 14L  S3       
-         7       1392 33101  17133 14R  S3       
-         7       1393 33101  17096 14L  S3       
-         7       1394 33101  17140 14R  S3       
-         7       1395 33101  17101 14L  S3       
-         7       1396 33101  17147 14R  S3       
-         7       1397 33101  17106 14L  S3       
-         7       1398 33101  17152 14R  S3       
-         7       1399 33101  17111 14L  S3       
-         7       1400 33101  17158 14R  S3       
-         7       1401 33101  17171 15L  S3       
-         7       1402 33101  17242 15R  S3       
-         7       1403 33101  17176 15L  S3       
-         7       1404 33101  17248 15R  S3       
-         7       1405 33101  17181 15L  S3       
-         7       1406 33101  17253 15R  S3       
-         7       1407 33101  17189 15L  S3       
-         7       1408 33101  17261 15R  S3       
-         7       1409 33101  17195 15L  S3       
-         7       1410 33101  17266 15R  S3       
-         7       1411 33101  17200 15L  S3       
-         7       1412 33101  17272 15R  S3       
-         7       1413 33101  17205 15L  S3       
-         7       1414 33101  17279 15R  S3       
-         7       1415 33101  17211 15L  S3       
-         7       1416 33101  17284 15R  S3       
-         7       1417 33101  17216 15L  S3       
-         7       1418 33101  17290 15R  S3       
-         7       1419 33101  17221 15L  S3       
-         7       1420 33101  17297 15R  S3       
-         7       1421 33101  17172 15L  S3       
-         7       1422 33101  17243 15R  S3       
-         7       1423 33101  17177 15L  S3       
-         7       1424 33101  17249 15R  S3       
-         7       1425 33101  17182 15L  S3       
-         7       1426 33101  17254 15R  S3       
-         7       1427 33101  17190 15L  S3       
-         7       1428 33101  17262 15R  S3       
-         7       1429 33101  17196 15L  S3       
-         7       1430 33101  17267 15R  S3       
-         7       1431 33101  17201 15L  S3       
-         7       1432 33101  17273 15R  S3       
-         7       1433 33101  17206 15L  S3       
-         7       1434 33101  17280 15R  S3       
-         7       1435 33101  17212 15L  S3       
-         7       1436 33101  17285 15R  S3       
-         7       1437 33101  17217 15L  S3       
-         7       1438 33101  17291 15R  S3       
-         7       1439 33101  17222 15L  S3       
-         7       1440 33101  17298 15R  S3       
-         7       1441 33101  17173 15L  S3       
-         7       1442 33101  17244 15R  S3       
-         7       1443 33101  17178 15L  S3       
-         7       1444 33101  17250 15R  S3       
-         7       1445 33101  17184 15L  S3       
-         7       1446 33101  17255 15R  S3       
-         7       1447 33101  17191 15L  S3       
-         7       1448 33101  17263 15R  S3       
-         7       1449 33101  17197 15L  S3       
-         7       1450 33101  17268 15R  S3       
-         7       1451 33101  17202 15L  S3       
-         7       1452 33101  17274 15R  S3       
-         7       1453 33101  17207 15L  S3       
-         7       1454 33101  17281 15R  S3       
-         7       1455 33101  17213 15L  S3       
-         7       1456 33101  17286 15R  S3       
-         7       1457 33101  17218 15L  S3       
-         7       1458 33101  17293 15R  S3       
-         7       1459 33101  17224 15L  S3       
-         7       1460 33101  17299 15R  S3       
-         7       1461 33101  17174 15L  S3       
-         7       1462 33101  17245 15R  S3       
-         7       1463 33101  17179 15L  S3       
-         7       1464 33101  17251 15R  S3       
-         7       1465 33101  17186 15L  S3       
-         7       1466 33101  17256 15R  S3       
-         7       1467 33101  17192 15L  S3       
-         7       1468 33101  17264 15R  S3       
-         7       1469 33101  17198 15L  S3       
-         7       1470 33101  17269 15R  S3       
-         7       1471 33101  17203 15L  S3       
-         7       1472 33101  17275 15R  S3       
-         7       1473 33101  17208 15L  S3       
-         7       1474 33101  17282 15R  S3       
-         7       1475 33101  17214 15L  S3       
-         7       1476 33101  17288 15R  S3       
-         7       1477 33101  17219 15L  S3       
-         7       1478 33101  17295 15R  S3       
-         7       1479 33101  17226 15L  S3       
-         7       1480 33101  17301 15R  S3       
-         7       1481 33101  17175 15L  S3       
-         7       1482 33101  17247 15R  S3       
-         7       1483 33101  17180 15L  S3       
-         7       1484 33101  17252 15R  S3       
-         7       1485 33101  17187 15L  S3       
-         7       1486 33101  17259 15R  S3       
-         7       1487 33101  17194 15L  S3       
-         7       1488 33101  17265 15R  S3       
-         7       1489 33101  17199 15L  S3       
-         7       1490 33101  17270 15R  S3       
-         7       1491 33101  17204 15L  S3       
-         7       1492 33101  17278 15R  S3       
-         7       1493 33101  17209 15L  S3       
-         7       1494 33101  17283 15R  S3       
-         7       1495 33101  17215 15L  S3       
-         7       1496 33101  17289 15R  S3       
-         7       1497 33101  17220 15L  S3       
-         7       1498 33101  17296 15R  S3       
-         7       1499 33101  17227 15L  S3       
-         7       1500 33101  17302 15R  S3       
-         7       1501 33101  17322 16L  S3       
-         7       1502 33101  17402 16R  S3       
-         7       1503 33101  17327 16L  S3       
-         7       1504 33101  17408 16R  S3       
-         7       1505 33101  17333 16L  S3       
-         7       1506 33101  17413 16R  S3       
-         7       1507 33101  17338 16L  S3       
-         7       1508 33101  17419 16R  S3       
-         7       1509 33101  17343 16L  S3       
-         7       1510 33101  17425 16R  S3       
-         7       1511 33101  17349 16L  S3       
-         7       1512 33101  17430 16R  S3       
-         7       1513 33101  17356 16L  S3       
-         7       1514 33101  17435 16R  S3       
-         7       1515 33101  17362 16L  S3       
-         7       1516 33101  17440 16R  S3       
-         7       1517 33101  17367 16L  S3       
-         7       1518 33101  17446 16R  S3       
-         7       1519 33101  17373 16L  S3       
-         7       1520 33101  17451 16R  S3       
-         7       1521 33101  17323 16L  S3       
-         7       1522 33101  17403 16R  S3       
-         7       1523 33101  17329 16L  S3       
-         7       1524 33101  17409 16R  S3       
-         7       1525 33101  17334 16L  S3       
-         7       1526 33101  17415 16R  S3       
-         7       1527 33101  17339 16L  S3       
-         7       1528 33101  17421 16R  S3       
-         7       1529 33101  17345 16L  S3       
-         7       1530 33101  17426 16R  S3       
-         7       1531 33101  17350 16L  S3       
-         7       1532 33101  17431 16R  S3       
-         7       1533 33101  17357 16L  S3       
-         7       1534 33101  17436 16R  S3       
-         7       1535 33101  17363 16L  S3       
-         7       1536 33101  17441 16R  S3       
-         7       1537 33101  17368 16L  S3       
-         7       1538 33101  17447 16R  S3       
-         7       1539 33101  17375 16L  S3       
-         7       1540 33101  17452 16R  S3       
-         7       1541 33101  17324 16L  S3       
-         7       1542 33101  17404 16R  S3       
-         7       1543 33101  17330 16L  S3       
-         7       1544 33101  17410 16R  S3       
-         7       1545 33101  17335 16L  S3       
-         7       1546 33101  17416 16R  S3       
-         7       1547 33101  17340 16L  S3       
-         7       1548 33101  17422 16R  S3       
-         7       1549 33101  17346 16L  S3       
-         7       1550 33101  17427 16R  S3       
-         7       1551 33101  17351 16L  S3       
-         7       1552 33101  17432 16R  S3       
-         7       1553 33101  17358 16L  S3       
-         7       1554 33101  17437 16R  S3       
-         7       1555 33101  17364 16L  S3       
-         7       1556 33101  17443 16R  S3       
-         7       1557 33101  17369 16L  S3       
-         7       1558 33101  17448 16R  S3       
-         7       1559 33101  17376 16L  S3       
-         7       1560 33101  17453 16R  S3       
-         7       1561 33101  17325 16L  S3       
-         7       1562 33101  17405 16R  S3       
-         7       1563 33101  17331 16L  S3       
-         7       1564 33101  17411 16R  S3       
-         7       1565 33101  17336 16L  S3       
-         7       1566 33101  17417 16R  S3       
-         7       1567 33101  17341 16L  S3       
-         7       1568 33101  17423 16R  S3       
-         7       1569 33101  17347 16L  S3       
-         7       1570 33101  17428 16R  S3       
-         7       1571 33101  17353 16L  S3       
-         7       1572 33101  17433 16R  S3       
-         7       1573 33101  17359 16L  S3       
-         7       1574 33101  17438 16R  S3       
-         7       1575 33101  17365 16L  S3       
-         7       1576 33101  17444 16R  S3       
-         7       1577 33101  17370 16L  S3       
-         7       1578 33101  17449 16R  S3       
-         7       1579 33101  17377 16L  S3       
-         7       1580 33101  17454 16R  S3       
-         7       1581 33101  17326 16L  S3       
-         7       1582 33101  17406 16R  S3       
-         7       1583 33101  17332 16L  S3       
-         7       1584 33101  17412 16R  S3       
-         7       1585 33101  17337 16L  S3       
-         7       1586 33101  17418 16R  S3       
-         7       1587 33101  17342 16L  S3       
-         7       1588 33101  17424 16R  S3       
-         7       1589 33101  17348 16L  S3       
-         7       1590 33101  17429 16R  S3       
-         7       1591 33101  17354 16L  S3       
-         7       1592 33101  17434 16R  S3       
-         7       1593 33101  17361 16L  S3       
-         7       1594 33101  17439 16R  S3       
-         7       1595 33101  17366 16L  S3       
-         7       1596 33101  17445 16R  S3       
-         7       1597 33101  17372 16L  S3       
-         7       1598 33101  17450 16R  S3       
-         7       1599 33101  17379 16L  S3       
-         7       1600 33101  17420 16R  S3       
-         7       1601 33101  17481 17L  S3       
-         7       1602 33101  17548 17R  S3       
-         7       1603 33101  17487 17L  S3       
-         7       1604 33101  17555 17R  S3       
-         7       1605 33101  17496 17L  S3       
-         7       1606 33101  17560 17R  S3       
-         7       1607 33101  17501 17L  S3       
-         7       1608 33101  17566 17R  S3       
-         7       1609 33101  17507 17L  S3       
-         7       1610 33101  17571 17R  S3       
-         7       1611 33101  17512 17L  S3       
-         7       1612 33101  17576 17R  S3       
-         7       1613 33101  17518 17L  S3       
-         7       1614 33101  17582 17R  S3       
-         7       1615 33101  17524 17L  S3       
-         7       1616 33101  17588 17R  S3       
-         7       1617 33101  17529 17L  S3       
-         7       1618 33101  17593 17R  S3       
-         7       1619 33101  17534 17L  S3       
-         7       1620 33101  17599 17R  S3       
-         7       1621 33101  17482 17L  S3       
-         7       1622 33101  17549 17R  S3       
-         7       1623 33101  17488 17L  S3       
-         7       1624 33101  17556 17R  S3       
-         7       1625 33101  17497 17L  S3       
-         7       1626 33101  17561 17R  S3       
-         7       1627 33101  17502 17L  S3       
-         7       1628 33101  17567 17R  S3       
-         7       1629 33101  17508 17L  S3       
-         7       1630 33101  17572 17R  S3       
-         7       1631 33101  17513 17L  S3       
-         7       1632 33101  17577 17R  S3       
-         7       1633 33101  17519 17L  S3       
-         7       1634 33101  17583 17R  S3       
-         7       1635 33101  17525 17L  S3       
-         7       1636 33101  17589 17R  S3       
-         7       1637 33101  17530 17L  S3       
-         7       1638 33101  17594 17R  S3       
-         7       1639 33101  17535 17L  S3       
-         7       1640 33101  17600 17R  S3       
-         7       1641 33101  17483 17L  S3       
-         7       1642 33101  17550 17R  S3       
-         7       1643 33101  17490 17L  S3       
-         7       1644 33101  17557 17R  S3       
-         7       1645 33101  17498 17L  S3       
-         7       1646 33101  17563 17R  S3       
-         7       1647 33101  17503 17L  S3       
-         7       1648 33101  17568 17R  S3       
-         7       1649 33101  17509 17L  S3       
-         7       1650 33101  17573 17R  S3       
-         7       1651 33101  17514 17L  S3       
-         7       1652 33101  17578 17R  S3       
-         7       1653 33101  17520 17L  S3       
-         7       1654 33101  17585 17R  S3       
-         7       1655 33101  17526 17L  S3       
-         7       1656 33101  17590 17R  S3       
-         7       1657 33101  17531 17L  S3       
-         7       1658 33101  17595 17R  S3       
-         7       1659 33101  17537 17L  S3       
-         7       1660 33101  17601 17R  S3       
-         7       1661 33101  17484 17L  S3       
-         7       1662 33101  17551 17R  S3       
-         7       1663 33101  17494 17L  S3       
-         7       1664 33101  17558 17R  S3       
-         7       1665 33101  17499 17L  S3       
-         7       1666 33101  17564 17R  S3       
-         7       1667 33101  17505 17L  S3       
-         7       1668 33101  17569 17R  S3       
-         7       1669 33101  17510 17L  S3       
-         7       1670 33101  17574 17R  S3       
-         7       1671 33101  17515 17L  S3       
-         7       1672 33101  17579 17R  S3       
-         7       1673 33101  17522 17L  S3       
-         7       1674 33101  17586 17R  S3       
-         7       1675 33101  17527 17L  S3       
-         7       1676 33101  17591 17R  S3       
-         7       1677 33101  17532 17L  S3       
-         7       1678 33101  17596 17R  S3       
-         7       1679 33101  17538 17L  S3       
-         7       1680 33101  17602 17R  S3       
-         7       1681 33101  14256 17L  S2       
-         7       1682 33101  17554 17R  S3       
-         7       1683 33101  17495 17L  S3       
-         7       1684 33101  17559 17R  S3       
-         7       1685 33101  17500 17L  S3       
-         7       1686 33101  17565 17R  S3       
-         7       1687 33101  17506 17L  S3       
-         7       1688 33101  17570 17R  S3       
-         7       1689 33101  17511 17L  S3       
-         7       1690 33101  17575 17R  S3       
-         7       1691 33101  17516 17L  S3       
-         7       1692 33101  17580 17R  S3       
-         7       1693 33101  17523 17L  S3       
-         7       1694 33101  17587 17R  S3       
-         7       1695 33101  17528 17L  S3       
-         7       1696 33101  17592 17R  S3       
-         7       1697 33101  17533 17L  S3       
-         7       1698 33101  17597 17R  S3       
-         7       1699 33101  17539 17L  S3       
-         7       1700 33101  17603 17R  S3       
-         8          1 33101  12807 1L   S2       
-         8          2 33101  10282 1R   S1       
-         8          3 33101  15805 1L   S3       
-         8          4 33101  15970 1R   S3       
-         8          5 33101  15810 1L   S3       
-         8          6 33101  15975 1R   S3       
-         8          7 33101  15815 1L   S3       
-         8          8 33101  15980 1R   S3       
-         8          9 33101  15822 1L   S3       
-         8         10 33101  15986 1R   S3       
-         8         11 33101  15828 1L   S3       
-         8         12 33101  15992 1R   S3       
-         8         13 33101  15834 1L   S3       
-         8         14 33101  15999 1R   S3       
-         8         15 33101  15839 1L   S3       
-         8         16 33101  16004 1R   S3       
-         8         17 33101  15844 1L   S3       
-         8         18 33101  16009 1R   S3       
-         8         19 33101  15849 1L   S3       
-         8         20 33101  16014 1R   S3       
-         8         21 33101  15801 1L   S3       
-         8         22 33101  12889 1R   S2       
-         8         23 33101  15806 1L   S3       
-         8         24 33101  15971 1R   S3       
-         8         25 33101  15811 1L   S3       
-         8         26 33101  15976 1R   S3       
-         8         27 33101  15816 1L   S3       
-         8         28 33101  15981 1R   S3       
-         8         29 33101  15823 1L   S3       
-         8         30 33101  15988 1R   S3       
-         8         31 33101  15829 1L   S3       
-         8         32 33101  15993 1R   S3       
-         8         33 33101  15835 1L   S3       
-         8         34 33101  16000 1R   S3       
-         8         35 33101  15840 1L   S3       
-         8         36 33101  16005 1R   S3       
-         8         37 33101  15845 1L   S3       
-         8         38 33101  16010 1R   S3       
-         8         39 33101  15850 1L   S3       
-         8         40 33101  16015 1R   S3       
-         8         41 33101  15802 1L   S3       
-         8         42 33101  12899 1R   S2       
-         8         43 33101  15807 1L   S3       
-         8         44 33101  15972 1R   S3       
-         8         45 33101  15812 1L   S3       
-         8         46 33101  15977 1R   S3       
-         8         47 33101  15819 1L   S3       
-         8         48 33101  15982 1R   S3       
-         8         49 33101  15825 1L   S3       
-         8         50 33101  15989 1R   S3       
-         8         51 33101  15830 1L   S3       
-         8         52 33101  15994 1R   S3       
-         8         53 33101  15836 1L   S3       
-         8         54 33101  16001 1R   S3       
-         8         55 33101  15841 1L   S3       
-         8         56 33101  16006 1R   S3       
-         8         57 33101  15846 1L   S3       
-         8         58 33101  16011 1R   S3       
-         8         59 33101  15851 1L   S3       
-         8         60 33101  16016 1R   S3       
-         8         61 33101  15803 1L   S3       
-         8         62 33101  15968 1R   S3       
-         8         63 33101  15808 1L   S3       
-         8         64 33101  15973 1R   S3       
-         8         65 33101  15813 1L   S3       
-         8         66 33101  15978 1R   S3       
-         8         67 33101  15820 1L   S3       
-         8         68 33101  15984 1R   S3       
-         8         69 33101  15826 1L   S3       
-         8         70 33101  15990 1R   S3       
-         8         71 33101  15832 1L   S3       
-         8         72 33101  15997 1R   S3       
-         8         73 33101  15837 1L   S3       
-         8         74 33101  16002 1R   S3       
-         8         75 33101  15842 1L   S3       
-         8         76 33101  16007 1R   S3       
-         8         77 33101  15847 1L   S3       
-         8         78 33101  16012 1R   S3       
-         8         79 33101  15852 1L   S3       
-         8         80 33101  16017 1R   S3       
-         8         81 33101  15804 1L   S3       
-         8         82 33101  15969 1R   S3       
-         8         83 33101  15809 1L   S3       
-         8         84 33101  15974 1R   S3       
-         8         85 33101  15814 1L   S3       
-         8         86 33101  15979 1R   S3       
-         8         87 33101  15821 1L   S3       
-         8         88 33101  15985 1R   S3       
-         8         89 33101  15827 1L   S3       
-         8         90 33101  15991 1R   S3       
-         8         91 33101  15833 1L   S3       
-         8         92 33101  15998 1R   S3       
-         8         93 33101  15838 1L   S3       
-         8         94 33101  16003 1R   S3       
-         8         95 33101  15843 1L   S3       
-         8         96 33101  16008 1R   S3       
-         8         97 33101  15848 1L   S3       
-         8         98 33101  16013 1R   S3       
-         8         99 33101  15853 1L   S3       
-         8        100 33101  16018 1R   S3       
-         8        101 33101  10574 2L   S1       
-         8        102 33101  12998 2R   S2       
-         8        103 33101  16133 2L   S3       
-         8        104 33101  16259 2R   S3       
-         8        105 33101  16138 2L   S3       
-         8        106 33101  16264 2R   S3       
-         8        107 33101  16145 2L   S3       
-         8        108 33101  16270 2R   S3       
-         8        109 33101  16151 2L   S3       
-         8        110 33101  16276 2R   S3       
-         8        111 33101  16156 2L   S3       
-         8        112 33101  16281 2R   S3       
-         8        113 33101  16161 2L   S3       
-         8        114 33101  16286 2R   S3       
-         8        115 33101  16169 2L   S3       
-         8        116 33101  16291 2R   S3       
-         8        117 33101  16175 2L   S3       
-         8        118 33101  16296 2R   S3       
-         8        119 33101  16181 2L   S3       
-         8        120 33101  16303 2R   S3       
-         8        121 33101  12955 2L   S2       
-         8        122 33101  13040 2R   S2       
-         8        123 33101  16134 2L   S3       
-         8        124 33101  16260 2R   S3       
-         8        125 33101  16139 2L   S3       
-         8        126 33101  16265 2R   S3       
-         8        127 33101  16146 2L   S3       
-         8        128 33101  16271 2R   S3       
-         8        129 33101  16152 2L   S3       
-         8        130 33101  16277 2R   S3       
-         8        131 33101  16157 2L   S3       
-         8        132 33101  16282 2R   S3       
-         8        133 33101  16164 2L   S3       
-         8        134 33101  16287 2R   S3       
-         8        135 33101  16170 2L   S3       
-         8        136 33101  16292 2R   S3       
-         8        137 33101  16176 2L   S3       
-         8        138 33101  16297 2R   S3       
-         8        139 33101  16182 2L   S3       
-         8        140 33101  16305 2R   S3       
-         8        141 33101  16130 2L   S3       
-         8        142 33101  16254 2R   S3       
-         8        143 33101  16135 2L   S3       
-         8        144 33101  16261 2R   S3       
-         8        145 33101  16142 2L   S3       
-         8        146 33101  16266 2R   S3       
-         8        147 33101  16147 2L   S3       
-         8        148 33101  16273 2R   S3       
-         8        149 33101  16153 2L   S3       
-         8        150 33101  16278 2R   S3       
-         8        151 33101  16158 2L   S3       
-         8        152 33101  16283 2R   S3       
-         8        153 33101  16165 2L   S3       
-         8        154 33101  16288 2R   S3       
-         8        155 33101  16171 2L   S3       
-         8        156 33101  16293 2R   S3       
-         8        157 33101  16177 2L   S3       
-         8        158 33101  16299 2R   S3       
-         8        159 33101  16183 2L   S3       
-         8        160 33101  16306 2R   S3       
-         8        161 33101  16131 2L   S3       
-         8        162 33101  16256 2R   S3       
-         8        163 33101  16136 2L   S3       
-         8        164 33101  16262 2R   S3       
-         8        165 33101  16143 2L   S3       
-         8        166 33101  16268 2R   S3       
-         8        167 33101  16149 2L   S3       
-         8        168 33101  16274 2R   S3       
-         8        169 33101  16154 2L   S3       
-         8        170 33101  16279 2R   S3       
-         8        171 33101  16159 2L   S3       
-         8        172 33101  16284 2R   S3       
-         8        173 33101  16166 2L   S3       
-         8        174 33101  16289 2R   S3       
-         8        175 33101  16173 2L   S3       
-         8        176 33101  16294 2R   S3       
-         8        177 33101  16178 2L   S3       
-         8        178 33101  16301 2R   S3       
-         8        179 33101  16184 2L   S3       
-         8        180 33101  16307 2R   S3       
-         8        181 33101  16132 2L   S3       
-         8        182 33101  16258 2R   S3       
-         8        183 33101  16137 2L   S3       
-         8        184 33101  16263 2R   S3       
-         8        185 33101  16144 2L   S3       
-         8        186 33101  16269 2R   S3       
-         8        187 33101  16150 2L   S3       
-         8        188 33101  16275 2R   S3       
-         8        189 33101  16155 2L   S3       
-         8        190 33101  16280 2R   S3       
-         8        191 33101  16160 2L   S3       
-         8        192 33101  16285 2R   S3       
-         8        193 33101  16168 2L   S3       
-         8        194 33101  16290 2R   S3       
-         8        195 33101  16174 2L   S3       
-         8        196 33101  16295 2R   S3       
-         8        197 33101  16179 2L   S3       
-         8        198 33101  16302 2R   S3       
-         8        199 33101  16185 2L   S3       
-         8        200 33101  16308 2R   S3       
-         8        201 33101  13138 3L   S2       
-         8        202 33101  10651 3R   S1       
-         8        203 33101  16419 3L   S3       
-         8        204 33101  16525 3R   S3       
-         8        205 33101  16426 3L   S3       
-         8        206 33101  16530 3R   S3       
-         8        207 33101  16431 3L   S3       
-         8        208 33101  16535 3R   S3       
-         8        209 33101  16436 3L   S3       
-         8        210 33101  16540 3R   S3       
-         8        211 33101  16441 3L   S3       
-         8        212 33101  16546 3R   S3       
-         8        213 33101  16447 3L   S3       
-         8        214 33101  16551 3R   S3       
-         8        215 33101  16452 3L   S3       
-         8        216 33101  16558 3R   S3       
-         8        217 33101  16458 3L   S3       
-         8        218 33101  16563 3R   S3       
-         8        219 33101  16463 3L   S3       
-         8        220 33101  16570 3R   S3       
-         8        221 33101  13139 3L   S2       
-         8        222 33101  13201 3R   S2       
-         8        223 33101  16422 3L   S3       
-         8        224 33101  16526 3R   S3       
-         8        225 33101  16427 3L   S3       
-         8        226 33101  16531 3R   S3       
-         8        227 33101  16432 3L   S3       
-         8        228 33101  16536 3R   S3       
-         8        229 33101  16437 3L   S3       
-         8        230 33101  16542 3R   S3       
-         8        231 33101  16442 3L   S3       
-         8        232 33101  16547 3R   S3       
-         8        233 33101  16448 3L   S3       
-         8        234 33101  16552 3R   S3       
-         8        235 33101  16453 3L   S3       
-         8        236 33101  16559 3R   S3       
-         8        237 33101  16459 3L   S3       
-         8        238 33101  16564 3R   S3       
-         8        239 33101  16464 3L   S3       
-         8        240 33101  16571 3R   S3       
-         8        241 33101  13140 3L   S2       
-         8        242 33101  13220 3R   S2       
-         8        243 33101  16423 3L   S3       
-         8        244 33101  16527 3R   S3       
-         8        245 33101  16428 3L   S3       
-         8        246 33101  16532 3R   S3       
-         8        247 33101  16433 3L   S3       
-         8        248 33101  16537 3R   S3       
-         8        249 33101  16438 3L   S3       
-         8        250 33101  16543 3R   S3       
-         8        251 33101  16443 3L   S3       
-         8        252 33101  16548 3R   S3       
-         8        253 33101  16449 3L   S3       
-         8        254 33101  16553 3R   S3       
-         8        255 33101  16454 3L   S3       
-         8        256 33101  16560 3R   S3       
-         8        257 33101  16460 3L   S3       
-         8        258 33101  16565 3R   S3       
-         8        259 33101  16465 3L   S3       
-         8        260 33101  16573 3R   S3       
-         8        261 33101  16417 3L   S3       
-         8        262 33101  13247 3R   S2       
-         8        263 33101  16424 3L   S3       
-         8        264 33101  16528 3R   S3       
-         8        265 33101  16429 3L   S3       
-         8        266 33101  16533 3R   S3       
-         8        267 33101  16434 3L   S3       
-         8        268 33101  16538 3R   S3       
-         8        269 33101  16439 3L   S3       
-         8        270 33101  16544 3R   S3       
-         8        271 33101  16444 3L   S3       
-         8        272 33101  16549 3R   S3       
-         8        273 33101  16450 3L   S3       
-         8        274 33101  16555 3R   S3       
-         8        275 33101  16455 3L   S3       
-         8        276 33101  16561 3R   S3       
-         8        277 33101  16461 3L   S3       
-         8        278 33101  16566 3R   S3       
-         8        279 33101  16466 3L   S3       
-         8        280 33101  16574 3R   S3       
-         8        281 33101  16418 3L   S3       
-         8        282 33101  16524 3R   S3       
-         8        283 33101  16425 3L   S3       
-         8        284 33101  16529 3R   S3       
-         8        285 33101  16430 3L   S3       
-         8        286 33101  16534 3R   S3       
-         8        287 33101  16435 3L   S3       
-         8        288 33101  16539 3R   S3       
-         8        289 33101  16440 3L   S3       
-         8        290 33101  16545 3R   S3       
-         8        291 33101  16445 3L   S3       
-         8        292 33101  16550 3R   S3       
-         8        293 33101  16451 3L   S3       
-         8        294 33101  16556 3R   S3       
-         8        295 33101  16456 3L   S3       
-         8        296 33101  16562 3R   S3       
-         8        297 33101  16462 3L   S3       
-         8        298 33101  16568 3R   S3       
-         8        299 33101  16467 3L   S3       
-         8        300 33101  16575 3R   S3       
-         8        301 33101  16632 4L   S3       
-         8        302 33101  13445 4R   S2       
-         8        303 33101  16637 4L   S3       
-         8        304 33101  13450 4R   S2       
-         8        305 33101  16643 4L   S3       
-         8        306 33101  16742 4R   S3       
-         8        307 33101  16648 4L   S3       
-         8        308 33101  16747 4R   S3       
-         8        309 33101  16653 4L   S3       
-         8        310 33101  16753 4R   S3       
-         8        311 33101  16658 4L   S3       
-         8        312 33101  16758 4R   S3       
-         8        313 33101  16663 4L   S3       
-         8        314 33101  16765 4R   S3       
-         8        315 33101  16668 4L   S3       
-         8        316 33101  16770 4R   S3       
-         8        317 33101  16674 4L   S3       
-         8        318 33101  16776 4R   S3       
-         8        319 33101  16679 4L   S3       
-         8        320 33101  16781 4R   S3       
-         8        321 33101  16633 4L   S3       
-         8        322 33101  13446 4R   S2       
-         8        323 33101  16638 4L   S3       
-         8        324 33101  13451 4R   S2       
-         8        325 33101  16644 4L   S3       
-         8        326 33101  16743 4R   S3       
-         8        327 33101  16649 4L   S3       
-         8        328 33101  16749 4R   S3       
-         8        329 33101  16654 4L   S3       
-         8        330 33101  16754 4R   S3       
-         8        331 33101  16659 4L   S3       
-         8        332 33101  16759 4R   S3       
-         8        333 33101  16664 4L   S3       
-         8        334 33101  16766 4R   S3       
-         8        335 33101  16669 4L   S3       
-         8        336 33101  16771 4R   S3       
-         8        337 33101  16675 4L   S3       
-         8        338 33101  16777 4R   S3       
-         8        339 33101  16680 4L   S3       
-         8        340 33101  16782 4R   S3       
-         8        341 33101  16634 4L   S3       
-         8        342 33101  13447 4R   S2       
-         8        343 33101  16639 4L   S3       
-         8        344 33101  13452 4R   S2       
-         8        345 33101  16645 4L   S3       
-         8        346 33101  16744 4R   S3       
-         8        347 33101  16650 4L   S3       
-         8        348 33101  16750 4R   S3       
-         8        349 33101  16655 4L   S3       
-         8        350 33101  16755 4R   S3       
-         8        351 33101  16660 4L   S3       
-         8        352 33101  16760 4R   S3       
-         8        353 33101  16665 4L   S3       
-         8        354 33101  16767 4R   S3       
-         8        355 33101  16671 4L   S3       
-         8        356 33101  16772 4R   S3       
-         8        357 33101  16676 4L   S3       
-         8        358 33101  16778 4R   S3       
-         8        359 33101  16681 4L   S3       
-         8        360 33101  16783 4R   S3       
-         8        361 33101  16635 4L   S3       
-         8        362 33101  13448 4R   S2       
-         8        363 33101  16641 4L   S3       
-         8        364 33101  13453 4R   S2       
-         8        365 33101  16646 4L   S3       
-         8        366 33101  16745 4R   S3       
-         8        367 33101  16651 4L   S3       
-         8        368 33101  16751 4R   S3       
-         8        369 33101  16656 4L   S3       
-         8        370 33101  16756 4R   S3       
-         8        371 33101  16661 4L   S3       
-         8        372 33101  16761 4R   S3       
-         8        373 33101  16666 4L   S3       
-         8        374 33101  16768 4R   S3       
-         8        375 33101  16672 4L   S3       
-         8        376 33101  16773 4R   S3       
-         8        377 33101  16677 4L   S3       
-         8        378 33101  16779 4R   S3       
-         8        379 33101  16682 4L   S3       
-         8        380 33101  16784 4R   S3       
-         8        381 33101  16636 4L   S3       
-         8        382 33101  13449 4R   S2       
-         8        383 33101  16642 4L   S3       
-         8        384 33101  16741 4R   S3       
-         8        385 33101  16647 4L   S3       
-         8        386 33101  16746 4R   S3       
-         8        387 33101  16652 4L   S3       
-         8        388 33101  16752 4R   S3       
-         8        389 33101  16657 4L   S3       
-         8        390 33101  16757 4R   S3       
-         8        391 33101  16662 4L   S3       
-         8        392 33101  16763 4R   S3       
-         8        393 33101  16667 4L   S3       
-         8        394 33101  16769 4R   S3       
-         8        395 33101  16673 4L   S3       
-         8        396 33101  16774 4R   S3       
-         8        397 33101  16678 4L   S3       
-         8        398 33101  16780 4R   S3       
-         8        399 33101  16684 4L   S3       
-         8        400 33101  16785 4R   S3       
-         8        401 33101  16896 5L   S3       
-         8        402 33101  16952 5R   S3       
-         8        403 33101  16847 5L   S3       
-         8        404 33101  16957 5R   S3       
-         8        405 33101  16852 5L   S3       
-         8        406 33101  16962 5R   S3       
-         8        407 33101  16857 5L   S3       
-         8        408 33101  16967 5R   S3       
-         8        409 33101  16862 5L   S3       
-         8        410 33101  16972 5R   S3       
-         8        411 33101  16869 5L   S3       
-         8        412 33101  16977 5R   S3       
-         8        413 33101  16874 5L   S3       
-         8        414 33101  16982 5R   S3       
-         8        415 33101  16880 5L   S3       
-         8        416 33101  16987 5R   S3       
-         8        417 33101  16885 5L   S3       
-         8        418 33101  16992 5R   S3       
-         8        419 33101  16890 5L   S3       
-         8        420 33101  16997 5R   S3       
-         8        421 33101  13545 5L   S2       
-         8        422 33101  16953 5R   S3       
-         8        423 33101  16848 5L   S3       
-         8        424 33101  16958 5R   S3       
-         8        425 33101  16853 5L   S3       
-         8        426 33101  16963 5R   S3       
-         8        427 33101  16858 5L   S3       
-         8        428 33101  16968 5R   S3       
-         8        429 33101  16863 5L   S3       
-         8        430 33101  16973 5R   S3       
-         8        431 33101  16870 5L   S3       
-         8        432 33101  16978 5R   S3       
-         8        433 33101  16876 5L   S3       
-         8        434 33101  16983 5R   S3       
-         8        435 33101  16881 5L   S3       
-         8        436 33101  16988 5R   S3       
-         8        437 33101  16886 5L   S3       
-         8        438 33101  16993 5R   S3       
-         8        439 33101  16891 5L   S3       
-         8        440 33101  16998 5R   S3       
-         8        441 33101  13546 5L   S2       
-         8        442 33101  16954 5R   S3       
-         8        443 33101  16849 5L   S3       
-         8        444 33101  16959 5R   S3       
-         8        445 33101  16854 5L   S3       
-         8        446 33101  16964 5R   S3       
-         8        447 33101  16859 5L   S3       
-         8        448 33101  16969 5R   S3       
-         8        449 33101  16864 5L   S3       
-         8        450 33101  16974 5R   S3       
-         8        451 33101  16871 5L   S3       
-         8        452 33101  16979 5R   S3       
-         8        453 33101  16877 5L   S3       
-         8        454 33101  16984 5R   S3       
-         8        455 33101  16882 5L   S3       
-         8        456 33101  16989 5R   S3       
-         8        457 33101  16887 5L   S3       
-         8        458 33101  16994 5R   S3       
-         8        459 33101  16892 5L   S3       
-         8        460 33101  16999 5R   S3       
-         8        461 33101  13547 5L   S2       
-         8        462 33101  16955 5R   S3       
-         8        463 33101  16850 5L   S3       
-         8        464 33101  16960 5R   S3       
-         8        465 33101  16855 5L   S3       
-         8        466 33101  16965 5R   S3       
-         8        467 33101  16860 5L   S3       
-         8        468 33101  16970 5R   S3       
-         8        469 33101  16865 5L   S3       
-         8        470 33101  16975 5R   S3       
-         8        471 33101  16872 5L   S3       
-         8        472 33101  16980 5R   S3       
-         8        473 33101  16878 5L   S3       
-         8        474 33101  16985 5R   S3       
-         8        475 33101  16883 5L   S3       
-         8        476 33101  16990 5R   S3       
-         8        477 33101  16888 5L   S3       
-         8        478 33101  16995 5R   S3       
-         8        479 33101  16894 5L   S3       
-         8        480 33101  17000 5R   S3       
-         8        481 33101  16846 5L   S3       
-         8        482 33101  16956 5R   S3       
-         8        483 33101  16851 5L   S3       
-         8        484 33101  16961 5R   S3       
-         8        485 33101  16856 5L   S3       
-         8        486 33101  16966 5R   S3       
-         8        487 33101  16861 5L   S3       
-         8        488 33101  16971 5R   S3       
-         8        489 33101  16866 5L   S3       
-         8        490 33101  16976 5R   S3       
-         8        491 33101  16873 5L   S3       
-         8        492 33101  16981 5R   S3       
-         8        493 33101  16879 5L   S3       
-         8        494 33101  16986 5R   S3       
-         8        495 33101  16884 5L   S3       
-         8        496 33101  16991 5R   S3       
-         8        497 33101  16889 5L   S3       
-         8        498 33101  16996 5R   S3       
-         8        499 33101  16895 5L   S3       
-         8        500 33101  17001 5R   S3       
-         8        501 33101  17672 6L   S3       
-         8        502 33101  17712 6R   S3       
-         8        503 33101  17667 6L   S3       
-         8        504 33101  17707 6R   S3       
-         8        505 33101  17662 6L   S3       
-         8        506 33101  17697 6R   S3       
-         8        507 33101  17657 6L   S3       
-         8        508 33101  17692 6R   S3       
-         8        509 33101  17652 6L   S3       
-         8        510 33101  17687 6R   S3       
-         8        511 33101  17647 6L   S3       
-         8        512 33101  17682 6R   S3       
-         8        513 33101  17622 6L   S3       
-         8        514 33101  17677 6R   S3       
-         8        515 33101  15441 6L   P7       
-         8        516 33101  17702 6R   S3       
-         8        517 33101  17642 6L   S3       
-         8        518 33101  17717 6R   S3       
-         8        519 33101  17627 6L   S3       
-         8        520 33101  17722 6R   S3       
-         8        521 33101  17673 6L   S3       
-         8        522 33101  17713 6R   S3       
-         8        523 33101  17668 6L   S3       
-         8        524 33101  17708 6R   S3       
-         8        525 33101  17663 6L   S3       
-         8        526 33101  17698 6R   S3       
-         8        527 33101  17658 6L   S3       
-         8        528 33101  17693 6R   S3       
-         8        529 33101  17653 6L   S3       
-         8        530 33101  17688 6R   S3       
-         8        531 33101  17648 6L   S3       
-         8        532 33101  17683 6R   S3       
-         8        533 33101  17623 6L   S3       
-         8        534 33101  17678 6R   S3       
-         8        535 33101  15446 6L   P7       
-         8        536 33101  17703 6R   S3       
-         8        537 33101  17643 6L   S3       
-         8        538 33101  17718 6R   S3       
-         8        539 33101  17628 6L   S3       
-         8        540 33101  17723 6R   S3       
-         8        541 33101  17674 6L   P8       
-         8        542 33101  17714 6R   S3       
-         8        543 33101  17669 6L   S3       
-         8        544 33101  17709 6R   S3       
-         8        545 33101  17664 6L   S3       
-         8        546 33101  17699 6R   S3       
-         8        547 33101  17659 6L   S3       
-         8        548 33101  17694 6R   S3       
-         8        549 33101  17654 6L   S3       
-         8        550 33101  17689 6R   S3       
-         8        551 33101  17649 6L   S3       
-         8        552 33101  17684 6R   S3       
-         8        553 33101  17624 6L   S3       
-         8        554 33101  17679 6R   S3       
-         8        555 33101  15450 6L   P7       
-         8        556 33101  17704 6R   S3       
-         8        557 33101  17644 6L   S3       
-         8        558 33101  17719 6R   S3       
-         8        559 33101  17629 6L   S3       
-         8        560 33101  17724 6R   S3       
-         8        561 33101  17675 6L   P8       
-         8        562 33101  17715 6R   S3       
-         8        563 33101  17670 6L   S3       
-         8        564 33101  17710 6R   S3       
-         8        565 33101  17665 6L   S3       
-         8        566 33101  17700 6R   S3       
-         8        567 33101  17660 6L   S3       
-         8        568 33101  17695 6R   S3       
-         8        569 33101  17655 6L   S3       
-         8        570 33101  17690 6R   S3       
-         8        571 33101  17650 6L   S3       
-         8        572 33101  17685 6R   S3       
-         8        573 33101  17625 6L   S3       
-         8        574 33101  17680 6R   S3       
-         8        575 33101  15451 6L   P7       
-         8        576 33101  17705 6R   S3       
-         8        577 33101  17645 6L   S3       
-         8        578 33101  17720 6R   S3       
-         8        579 33101  17630 6L   S3       
-         8        580 33101  17725 6R   P8       
-         8        581 33101  17676 6L   P8       
-         8        582 33101  17706 6R   S3       
-         8        583 33101  17671 6L   S3       
-         8        584 33101  17711 6R   S3       
-         8        585 33101  17666 6L   S3       
-         8        586 33101  17701 6R   S3       
-         8        587 33101  17661 6L   S3       
-         8        588 33101  17696 6R   S3       
-         8        589 33101  17656 6L   S3       
-         8        590 33101  17691 6R   S3       
-         8        591 33101  17651 6L   S3       
-         8        592 33101  17686 6R   S3       
-         8        593 33101  17626 6L   S3       
-         8        594 33101  17681 6R   S3       
-         8        595 33101  15455 6L   P7       
-         8        596 33101  17716 6R   S3       
-         8        597 33101  17646 6L   S3       
-         8        598 33101  17721 6R   S3       
-         8        599 33101  17631 6L   S3       
-         8        600 33101  17726 6R   P8       
-         8        601 33101   7493 7L   P2       
-         8        602 33101    171 7R   5        
-         8        603 33101  17777 7L   S3       
-         8        604 33101  17855 7R   S3       
-         8        605 33101  17772 7L   S3       
-         8        606 33101  17850 7R   S3       
-         8        607 33101  17767 7L   S3       
-         8        608 33101  17845 7R   S3       
-         8        609 33101  17762 7L   S3       
-         8        610 33101  17840 7R   S3       
-         8        611 33101  17792 7L   S3       
-         8        612 33101  17835 7R   S3       
-         8        613 33101  17787 7L   S3       
-         8        614 33101   9544 7R   P6       
-         8        615 33101  17782 7L   S3       
-         8        616 33101  17800 7R   S3       
-         8        617 33101  15561 7L   P7       
-         8        618 33101  17801 7R   S3       
-         8        619 33101  17752 7L   S3       
-         8        620 33101  17806 7R   S3       
-         8        621 33101  11495 7L   S1       
-         8        622 33101  15636 7R   P7       
-         8        623 33101  17778 7L   S3       
-         8        624 33101  17856 7R   S3       
-         8        625 33101  17773 7L   S3       
-         8        626 33101  17851 7R   S3       
-         8        627 33101  17768 7L   S3       
-         8        628 33101  17846 7R   S3       
-         8        629 33101  17763 7L   S3       
-         8        630 33101  17841 7R   S3       
-         8        631 33101  17793 7L   S3       
-         8        632 33101  17836 7R   S3       
-         8        633 33101  17788 7L   S3       
-         8        634 33101   9546 7R   P6       
-         8        635 33101  17783 7L   S3       
-         8        636 33101  17807 7R   S3       
-         8        637 33101  15562 7L   P7       
-         8        638 33101  17802 7R   S3       
-         8        639 33101  17753 7L   S3       
-         8        640 33101  17808 7R   S3       
-         8        641 33101  17797 7L   P8       
-         8        642 33101  11344 7R   S1       
-         8        643 33101  17779 7L   S3       
-         8        644 33101  17857 7R   S3       
-         8        645 33101  17774 7L   S3       
-         8        646 33101  17852 7R   S3       
-         8        647 33101  17769 7L   S3       
-         8        648 33101  17847 7R   S3       
-         8        649 33101  17764 7L   S3       
-         8        650 33101  17842 7R   S3       
-         8        651 33101  17794 7L   S3       
-         8        652 33101  17837 7R   S3       
-         8        653 33101  17789 7L   S3       
-         8        654 33101  15626 7R   P7       
-         8        655 33101  17784 7L   S3       
-         8        656 33101  17832 7R   S3       
-         8        657 33101  15563 7L   P7       
-         8        658 33101  17803 7R   S3       
-         8        659 33101  17754 7L   S3       
-         8        660 33101  15622 7R   P7       
-         8        661 33101  17798 7L   P8       
-         8        662 33101  11368 7R   S1       
-         8        663 33101  17780 7L   S3       
-         8        664 33101  17858 7R   S3       
-         8        665 33101  17775 7L   S3       
-         8        666 33101  17853 7R   S3       
-         8        667 33101  17770 7L   S3       
-         8        668 33101  17848 7R   S3       
-         8        669 33101  17765 7L   S3       
-         8        670 33101  17843 7R   S3       
-         8        671 33101  17795 7L   S3       
-         8        672 33101  17838 7R   S3       
-         8        673 33101  17790 7L   S3       
-         8        674 33101  15633 7R   P7       
-         8        675 33101  17785 7L   S3       
-         8        676 33101  17833 7R   S3       
-         8        677 33101  15564 7L   P7       
-         8        678 33101  17804 7R   S3       
-         8        679 33101  17755 7L   S3       
-         8        680 33101  15625 7R   P7       
-         8        681 33101  17799 7L   P8       
-         8        682 33101  11369 7R   S1       
-         8        683 33101  17781 7L   S3       
-         8        684 33101  17859 7R   S3       
-         8        685 33101  17776 7L   S3       
-         8        686 33101  17854 7R   S3       
-         8        687 33101  17771 7L   S3       
-         8        688 33101  17849 7R   S3       
-         8        689 33101  17766 7L   S3       
-         8        690 33101  17844 7R   S3       
-         8        691 33101  17796 7L   S3       
-         8        692 33101  17839 7R   S3       
-         8        693 33101  17791 7L   S3       
-         8        694 33101  15635 7R   P7       
-         8        695 33101  17786 7L   S3       
-         8        696 33101  17834 7R   S3       
-         8        697 33101  15565 7L   P7       
-         8        698 33101  17805 7R   S3       
-         8        699 33101  17756 7L   S3       
-         8        700 33101  17831 7R   S3       
-         8        701 33101  17894 8L   S3       
-         8        702 33101  11576 8R   S1       
-         8        703 33101  17896 8L   S3       
-         8        704 33101  17989 8R   S3       
-         8        705 33101  17900 8L   S3       
-         8        706 33101  11577 8R   S1       
-         8        707 33101  17890 8L   S3       
-         8        708 33101  17954 8R   S3       
-         8        709 33101  17885 8L   S3       
-         8        710 33101  17958 8R   S3       
-         8        711 33101  17927 8L   P8       
-         8        712 33101  17957 8R   S3       
-         8        713 33101  17916 8L   S3       
-         8        714 33101  17984 8R   S3       
-         8        715 33101  17920 8L   S3       
-         8        716 33101  17969 8R   S3       
-         8        717 33101  17910 8L   S3       
-         8        718 33101  17959 8R   S3       
-         8        719 33101  17880 8L   S3       
-         8        720 33101  15731 8R   P7       
-         8        721 33101  17897 8L   S3       
-         8        722 33101  17956 8R   S3       
-         8        723 33101  17898 8L   S3       
-         8        724 33101  17990 8R   S3       
-         8        725 33101  17901 8L   S3       
-         8        726 33101  15736 8R   P7       
-         8        727 33101  17891 8L   S3       
-         8        728 33101  17955 8R   S3       
-         8        729 33101  17886 8L   S3       
-         8        730 33101  17965 8R   S3       
-         8        731 33101  17928 8L   P8       
-         8        732 33101  17974 8R   S3       
-         8        733 33101  17917 8L   S3       
-         8        734 33101  17985 8R   S3       
-         8        735 33101  17921 8L   S3       
-         8        736 33101  17970 8R   S3       
-         8        737 33101  17911 8L   S3       
-         8        738 33101  17960 8R   S3       
-         8        739 33101  17881 8L   S3       
-         8        740 33101  15732 8R   P7       
-         8        741 33101  17899 8L   S3       
-         8        742 33101  17975 8R   S3       
-         8        743 33101  17906 8L   S3       
-         8        744 33101  17991 8R   S3       
-         8        745 33101  17902 8L   S3       
-         8        746 33101  15737 8R   P7       
-         8        747 33101  17892 8L   S3       
-         8        748 33101  17979 8R   S3       
-         8        749 33101  17887 8L   S3       
-         8        750 33101  17966 8R   S3       
-         8        751 33101  17929 8L   P8       
-         8        752 33101  17976 8R   S3       
-         8        753 33101  17918 8L   S3       
-         8        754 33101  17986 8R   S3       
-         8        755 33101  17922 8L   S3       
-         8        756 33101  17971 8R   S3       
-         8        757 33101  17912 8L   S3       
-         8        758 33101  17961 8R   S3       
-         8        759 33101  17882 8L   S3       
-         8        760 33101  15733 8R   P7       
-         8        761 33101  17905 8L   S3       
-         8        762 33101  17980 8R   S3       
-         8        763 33101  17907 8L   S3       
-         8        764 33101  17992 8R   S3       
-         8        765 33101  17903 8L   S3       
-         8        766 33101  15738 8R   P7       
-         8        767 33101  17893 8L   S3       
-         8        768 33101  17981 8R   S3       
-         8        769 33101  17888 8L   S3       
-         8        770 33101  17967 8R   S3       
-         8        771 33101  17931 8L   P8       
-         8        772 33101  17977 8R   S3       
-         8        773 33101  17919 8L   S3       
-         8        774 33101  17987 8R   S3       
-         8        775 33101  17923 8L   S3       
-         8        776 33101  17972 8R   S3       
-         8        777 33101  17913 8L   S3       
-         8        778 33101  17962 8R   S3       
-         8        779 33101  17883 8L   S3       
-         8        780 33101  15734 8R   P7       
-         8        781 33101  17909 8L   S3       
-         8        782 33101  17983 8R   S3       
-         8        783 33101  17908 8L   S3       
-         8        784 33101  17993 8R   P8       
-         8        785 33101  17904 8L   S3       
-         8        786 33101  15739 8R   P7       
-         8        787 33101  17895 8L   S3       
-         8        788 33101  17982 8R   S3       
-         8        789 33101  17889 8L   S3       
-         8        790 33101  17968 8R   S3       
-         8        791 33101  17932 8L   P8       
-         8        792 33101  17978 8R   S3       
-         8        793 33101  17925 8L   S3       
-         8        794 33101  17988 8R   S3       
-         8        795 33101  17924 8L   S3       
-         8        796 33101  17973 8R   S3       
-         8        797 33101  17914 8L   S3       
-         8        798 33101  17963 8R   S3       
-         8        799 33101  15678 8L   P7       
-         8        800 33101  15735 8R   P7       
-         8        801 33101  18064 9L   P8       
-         8        802 33101  18065 9R   S3       
-         8        803 33101  18059 9L   P8       
-         8        804 33101  18110 9R   S3       
-         8        805 33101  18006 9L   S3       
-         8        806 33101  18105 9R   S3       
-         8        807 33101  18029 9L   S3       
-         8        808 33101  18100 9R   S3       
-         8        809 33101  18028 9L   S3       
-         8        810 33101  18095 9R   S3       
-         8        811 33101  17994 9L   S3       
-         8        812 33101  18090 9R   S3       
-         8        813 33101  18001 9L   S3       
-         8        814 33101  18085 9R   S3       
-         8        815 33101  18014 9L   S3       
-         8        816 33101  18079 9R   S3       
-         8        817 33101  18009 9L   S3       
-         8        818 33101  18070 9R   S3       
-         8        819 33101  18044 9L   S3       
-         8        820 33101  15777 9R   P7       
-         8        821 33101  14388 9L   S2       
-         8        822 33101  18066 9R   S3       
-         8        823 33101  18060 9L   P8       
-         8        824 33101  18111 9R   P8       
-         8        825 33101  18008 9L   S3       
-         8        826 33101  18106 9R   S3       
-         8        827 33101  18030 9L   S3       
-         8        828 33101  18101 9R   S3       
-         8        829 33101  18050 9L   S3       
-         8        830 33101  18096 9R   S3       
-         8        831 33101  17995 9L   S3       
-         8        832 33101  18091 9R   S3       
-         8        833 33101  18003 9L   S3       
-         8        834 33101  18086 9R   S3       
-         8        835 33101  18015 9L   S3       
-         8        836 33101  18080 9R   S3       
-         8        837 33101  18010 9L   S3       
-         8        838 33101  18071 9R   S3       
-         8        839 33101  18045 9L   S3       
-         8        840 33101  15778 9R   P7       
-         8        841 33101  14389 9L   S2       
-         8        842 33101  18067 9R   S3       
-         8        843 33101  18061 9L   P8       
-         8        844 33101  18112 9R   P8       
-         8        845 33101  18024 9L   S3       
-         8        846 33101  18107 9R   S3       
-         8        847 33101  18031 9L   S3       
-         8        848 33101  18102 9R   S3       
-         8        849 33101  18051 9L   S3       
-         8        850 33101  18097 9R   S3       
-         8        851 33101  17998 9L   S3       
-         8        852 33101  18092 9R   S3       
-         8        853 33101  18019 9L   S3       
-         8        854 33101  18087 9R   S3       
-         8        855 33101  18016 9L   S3       
-         8        856 33101  18082 9R   S3       
-         8        857 33101  18011 9L   S3       
-         8        858 33101  18072 9R   S3       
-         8        859 33101  18046 9L   S3       
-         8        860 33101  15797 9R   P7       
-         8        861 33101  14390 9L   S2       
-         8        862 33101  18068 9R   S3       
-         8        863 33101  18062 9L   P8       
-         8        864 33101  18113 9R   P8       
-         8        865 33101  18025 9L   S3       
-         8        866 33101  18108 9R   S3       
-         8        867 33101  18032 9L   S3       
-         8        868 33101  18103 9R   S3       
-         8        869 33101  18052 9L   S3       
-         8        870 33101  18098 9R   S3       
-         8        871 33101  17999 9L   S3       
-         8        872 33101  18093 9R   S3       
-         8        873 33101  18020 9L   S3       
-         8        874 33101  18088 9R   S3       
-         8        875 33101  18017 9L   S3       
-         8        876 33101  18083 9R   S3       
-         8        877 33101  18012 9L   S3       
-         8        878 33101  18073 9R   S3       
-         8        879 33101  18047 9L   S3       
-         8        880 33101  15798 9R   P7       
-         8        881 33101  14391 9L   S2       
-         8        882 33101  18069 9R   S3       
-         8        883 33101  18063 9L   P8       
-         8        884 33101  18114 9R   P8       
-         8        885 33101  18027 9L   S3       
-         8        886 33101  18109 9R   S3       
-         8        887 33101  18033 9L   S3       
-         8        888 33101  18104 9R   S3       
-         8        889 33101  18053 9L   S3       
-         8        890 33101  18099 9R   S3       
-         8        891 33101  18000 9L   S3       
-         8        892 33101  18094 9R   S3       
-         8        893 33101  18022 9L   S3       
-         8        894 33101  18089 9R   S3       
-         8        895 33101  18018 9L   S3       
-         8        896 33101  18084 9R   S3       
-         8        897 33101  18013 9L   S3       
-         8        898 33101  18074 9R   S3       
-         8        899 33101  18048 9L   S3       
-         8        900 33101  15799 9R   P7       
-         8        901 33101  18131 10L  S3       
-         8        902 33101  18214 10R  S3       
-         8        903 33101  18126 10L  S3       
-         8        904 33101  18184 10R  S3       
-         8        905 33101  18121 10L  S3       
-         8        906 33101  18179 10R  S3       
-         8        907 33101  18156 10L  P8       
-         8        908 33101  18174 10R  S3       
-         8        909 33101  18151 10L  P8       
-         8        910 33101  18209 10R  S3       
-         8        911 33101  18146 10L  P8       
-         8        912 33101  18199 10R  S3       
-         8        913 33101  18141 10L  S3       
-         8        914 33101  18194 10R  S3       
-         8        915 33101  18171 10L  P8       
-         8        916 33101  18189 10R  S3       
-         8        917 33101  18166 10L  P8       
-         8        918 33101  14635 10R  S2       
-         8        919 33101  14497 10L  S2       
-         8        920 33101  14640 10R  S2       
-         8        921 33101  18132 10L  S3       
-         8        922 33101  18215 10R  S3       
-         8        923 33101  18127 10L  S3       
-         8        924 33101  18185 10R  S3       
-         8        925 33101  18122 10L  S3       
-         8        926 33101  18180 10R  S3       
-         8        927 33101  18157 10L  P8       
-         8        928 33101  18175 10R  S3       
-         8        929 33101  18152 10L  P8       
-         8        930 33101  18210 10R  S3       
-         8        931 33101  18147 10L  P8       
-         8        932 33101  18200 10R  S3       
-         8        933 33101  18142 10L  S3       
-         8        934 33101  18195 10R  S3       
-         8        935 33101  18172 10L  P8       
-         8        936 33101  18190 10R  S3       
-         8        937 33101  18167 10L  P8       
-         8        938 33101  14636 10R  S2       
-         8        939 33101  14498 10L  S2       
-         8        940 33101  14641 10R  S2       
-         8        941 33101  18133 10L  S3       
-         8        942 33101  18216 10R  S3       
-         8        943 33101  18128 10L  S3       
-         8        944 33101  18186 10R  S3       
-         8        945 33101  18123 10L  S3       
-         8        946 33101  18181 10R  S3       
-         8        947 33101  18158 10L  P8       
-         8        948 33101  18176 10R  S3       
-         8        949 33101  18153 10L  P8       
-         8        950 33101  18211 10R  S3       
-         8        951 33101  18148 10L  P8       
-         8        952 33101  18201 10R  S3       
-         8        953 33101  18143 10L  S3       
-         8        954 33101  18196 10R  S3       
-         8        955 33101  18173 10L  P8       
-         8        956 33101  18191 10R  S3       
-         8        957 33101  18168 10L  P8       
-         8        958 33101  14637 10R  S2       
-         8        959 33101  14499 10L  S2       
-         8        960 33101  14642 10R  S2       
-         8        961 33101  18134 10L  S3       
-         8        962 33101  18217 10R  S3       
-         8        963 33101  18129 10L  S3       
-         8        964 33101  18187 10R  S3       
-         8        965 33101  18124 10L  S3       
-         8        966 33101  18182 10R  S3       
-         8        967 33101  18159 10L  P8       
-         8        968 33101  18177 10R  S3       
-         8        969 33101  18154 10L  P8       
-         8        970 33101  18212 10R  S3       
-         8        971 33101  18149 10L  P8       
-         8        972 33101  18202 10R  S3       
-         8        973 33101  18144 10L  S3       
-         8        974 33101  18197 10R  S3       
-         8        975 33101  14522 10L  S2       
-         8        976 33101  18192 10R  S3       
-         8        977 33101  18169 10L  P8       
-         8        978 33101  14638 10R  S2       
-         8        979 33101  14500 10L  S2       
-         8        980 33101  14643 10R  S2       
-         8        981 33101  18135 10L  S3       
-         8        982 33101  18218 10R  S3       
-         8        983 33101  18130 10L  S3       
-         8        984 33101  18188 10R  S3       
-         8        985 33101  18125 10L  S3       
-         8        986 33101  18183 10R  S3       
-         8        987 33101  18160 10L  P8       
-         8        988 33101  18178 10R  S3       
-         8        989 33101  18155 10L  P8       
-         8        990 33101  18213 10R  S3       
-         8        991 33101  18150 10L  P8       
-         8        992 33101  18203 10R  S3       
-         8        993 33101  18145 10L  S3       
-         8        994 33101  18198 10R  S3       
-         8        995 33101  14523 10L  S2       
-         8        996 33101  18193 10R  S3       
-         8        997 33101  18170 10L  P8       
-         8        998 33101  14639 10R  S2       
-         8        999 33101  14501 10L  S2       
-         8       1000 33101  14644 10R  S2       
-         8       1001 33101  14765 11L  S2       
-         8       1002 33101  18332 11R  P8       
-         8       1003 33101  18291 11L  S3       
-         8       1004 33101  18348 11R  P8       
-         8       1005 33101  18286 11L  S3       
-         8       1006 33101  18333 11R  P8       
-         8       1007 33101  18280 11L  S3       
-         8       1008 33101  18323 11R  P8       
-         8       1009 33101  18273 11L  S3       
-         8       1010 33101  18298 11R  P8       
-         8       1011 33101  18268 11L  S3       
-         8       1012 33101  18318 11R  P8       
-         8       1013 33101  18258 11L  S3       
-         8       1014 33101  18313 11R  P8       
-         8       1015 33101  18263 11L  S3       
-         8       1016 33101  18299 11R  P8       
-         8       1017 33101  18253 11L  S3       
-         8       1018 33101  18307 11R  P8       
-         8       1019 33101  18236 11L  S3       
-         8       1020 33101  14953 11R  S2       
-         8       1021 33101  14772 11L  S2       
-         8       1022 33101  18338 11R  P8       
-         8       1023 33101  18293 11L  S3       
-         8       1024 33101  18349 11R  P8       
-         8       1025 33101  18287 11L  S3       
-         8       1026 33101  18334 11R  P8       
-         8       1027 33101  18281 11L  S3       
-         8       1028 33101  18324 11R  P8       
-         8       1029 33101  18274 11L  S3       
-         8       1030 33101  18303 11R  P8       
-         8       1031 33101  18269 11L  S3       
-         8       1032 33101  18319 11R  P8       
-         8       1033 33101  18259 11L  S3       
-         8       1034 33101  18314 11R  P8       
-         8       1035 33101  18264 11L  S3       
-         8       1036 33101  18300 11R  P8       
-         8       1037 33101  18254 11L  S3       
-         8       1038 33101  18309 11R  P8       
-         8       1039 33101  18237 11L  S3       
-         8       1040 33101  14954 11R  S2       
-         8       1041 33101  14773 11L  S2       
-         8       1042 33101  18340 11R  P8       
-         8       1043 33101  18294 11L  S3       
-         8       1044 33101  18350 11R  P8       
-         8       1045 33101  18288 11L  S3       
-         8       1046 33101  18335 11R  P8       
-         8       1047 33101  18282 11L  S3       
-         8       1048 33101  18325 11R  P8       
-         8       1049 33101  18275 11L  S3       
-         8       1050 33101  18305 11R  P8       
-         8       1051 33101  18270 11L  S3       
-         8       1052 33101  18320 11R  P8       
-         8       1053 33101  18260 11L  S3       
-         8       1054 33101  18315 11R  P8       
-         8       1055 33101  18265 11L  S3       
-         8       1056 33101  18301 11R  P8       
-         8       1057 33101  18255 11L  S3       
-         8       1058 33101  18310 11R  P8       
-         8       1059 33101  18245 11L  S3       
-         8       1060 33101  14955 11R  S2       
-         8       1061 33101  14774 11L  S2       
-         8       1062 33101  18341 11R  P8       
-         8       1063 33101  18295 11L  S3       
-         8       1064 33101  18351 11R  P8       
-         8       1065 33101  18289 11L  S3       
-         8       1066 33101  18336 11R  P8       
-         8       1067 33101  18283 11L  S3       
-         8       1068 33101  18326 11R  P8       
-         8       1069 33101  18276 11L  S3       
-         8       1070 33101  18306 11R  P8       
-         8       1071 33101  18271 11L  S3       
-         8       1072 33101  18321 11R  P8       
-         8       1073 33101  18261 11L  S3       
-         8       1074 33101  18316 11R  P8       
-         8       1075 33101  18266 11L  S3       
-         8       1076 33101  18302 11R  P8       
-         8       1077 33101  18256 11L  S3       
-         8       1078 33101  18311 11R  P8       
-         8       1079 33101  18246 11L  S3       
-         8       1080 33101  14956 11R  S2       
-         8       1081 33101  14790 11L  S2       
-         8       1082 33101  18342 11R  P8       
-         8       1083 33101  18296 11L  S3       
-         8       1084 33101  18352 11R  P8       
-         8       1085 33101  18290 11L  S3       
-         8       1086 33101  18337 11R  P8       
-         8       1087 33101  18284 11L  S3       
-         8       1088 33101  18327 11R  P8       
-         8       1089 33101  18277 11L  S3       
-         8       1090 33101  18308 11R  P8       
-         8       1091 33101  18272 11L  S3       
-         8       1092 33101  18322 11R  P8       
-         8       1093 33101  18262 11L  S3       
-         8       1094 33101  18317 11R  P8       
-         8       1095 33101  18267 11L  S3       
-         8       1096 33101  18304 11R  P8       
-         8       1097 33101  18257 11L  S3       
-         8       1098 33101  18312 11R  P8       
-         8       1099 33101  18247 11L  S3       
-         8       1100 33101  14957 11R  S2       
-         8       1101 33101  18447 12L  P8       
-         8       1102 33101  18561 12R  P8       
-         8       1103 33101  18446 12L  P8       
-         8       1104 33101  18568 12R  P8       
-         8       1105 33101  18450 12L  P8       
-         8       1106 33101  18555 12R  P8       
-         8       1107 33101  18471 12L  P8       
-         8       1108 33101  18575 12R  P8       
-         8       1109 33101  18461 12L  P8       
-         8       1110 33101  18550 12R  P8       
-         8       1111 33101  18456 12L  P8       
-         8       1112 33101  18545 12R  P8       
-         8       1113 33101  18395 12L  P8       
-         8       1114 33101  18540 12R  P8       
-         8       1115 33101  18440 12L  P8       
-         8       1116 33101  18500 12R  P8       
-         8       1117 33101  18400 12L  P8       
-         8       1118 33101  18530 12R  P8       
-         8       1119 33101  18397 12L  P8       
-         8       1120 33101  18504 12R  P8       
-         8       1121 33101  18448 12L  P8       
-         8       1122 33101  18563 12R  P8       
-         8       1123 33101  18452 12L  P8       
-         8       1124 33101  18569 12R  P8       
-         8       1125 33101  18467 12L  P8       
-         8       1126 33101  18557 12R  P8       
-         8       1127 33101  18472 12L  P8       
-         8       1128 33101  18576 12R  P8       
-         8       1129 33101  18462 12L  P8       
-         8       1130 33101  18551 12R  P8       
-         8       1131 33101  18457 12L  P8       
-         8       1132 33101  18546 12R  P8       
-         8       1133 33101  18396 12L  P8       
-         8       1134 33101  18541 12R  P8       
-         8       1135 33101  18442 12L  P8       
-         8       1136 33101  18501 12R  P8       
-         8       1137 33101  18432 12L  P8       
-         8       1138 33101  18531 12R  P8       
-         8       1139 33101  18437 12L  P8       
-         8       1140 33101  18535 12R  P8       
-         8       1141 33101  18449 12L  P8       
-         8       1142 33101  18564 12R  P8       
-         8       1143 33101  18453 12L  P8       
-         8       1144 33101  18570 12R  P8       
-         8       1145 33101  18468 12L  P8       
-         8       1146 33101  18558 12R  P8       
-         8       1147 33101  18473 12L  P8       
-         8       1148 33101  18577 12R  P8       
-         8       1149 33101  18463 12L  P8       
-         8       1150 33101  18552 12R  P8       
-         8       1151 33101  18458 12L  P8       
-         8       1152 33101  18547 12R  P8       
-         8       1153 33101  18398 12L  P8       
-         8       1154 33101  18542 12R  P8       
-         8       1155 33101  18443 12L  P8       
-         8       1156 33101  18502 12R  P8       
-         8       1157 33101  18433 12L  P8       
-         8       1158 33101  18532 12R  P8       
-         8       1159 33101  18438 12L  P8       
-         8       1160 33101  18537 12R  P8       
-         8       1161 33101  18451 12L  P8       
-         8       1162 33101  18565 12R  P8       
-         8       1163 33101  18454 12L  P8       
-         8       1164 33101  18571 12R  P8       
-         8       1165 33101  18469 12L  P8       
-         8       1166 33101  18559 12R  P8       
-         8       1167 33101  18474 12L  P8       
-         8       1168 33101  18578 12R  P8       
-         8       1169 33101  18464 12L  P8       
-         8       1170 33101  18553 12R  P8       
-         8       1171 33101  18459 12L  P8       
-         8       1172 33101  18548 12R  P8       
-         8       1173 33101  18399 12L  P8       
-         8       1174 33101  18543 12R  P8       
-         8       1175 33101  18444 12L  P8       
-         8       1176 33101  18503 12R  P8       
-         8       1177 33101  18434 12L  P8       
-         8       1178 33101  18533 12R  P8       
-         8       1179 33101  18439 12L  P8       
-         8       1180 33101  18538 12R  P8       
-         8       1181 33101  18466 12L  P8       
-         8       1182 33101  18566 12R  P8       
-         8       1183 33101  18455 12L  P8       
-         8       1184 33101  18572 12R  P8       
-         8       1185 33101  18470 12L  P8       
-         8       1186 33101  18560 12R  P8       
-         8       1187 33101  18475 12L  P8       
-         8       1188 33101  18579 12R  P8       
-         8       1189 33101  18465 12L  P8       
-         8       1190 33101  18554 12R  P8       
-         8       1191 33101  18460 12L  P8       
-         8       1192 33101  18549 12R  P8       
-         8       1193 33101  18436 12L  P8       
-         8       1194 33101  18544 12R  P8       
-         8       1195 33101  18445 12L  P8       
-         8       1196 33101  18536 12R  P8       
-         8       1197 33101  18435 12L  P8       
-         8       1198 33101  18534 12R  P8       
-         8       1199 33101  18441 12L  P8       
-         8       1200 33101  18539 12R  P8       
-         8       1201 33101  18669 13L  S3       
-         8       1202 33101  18757 13R  S3       
-         8       1203 33101  18682 13L  S3       
-         8       1204 33101  18751 13R  S3       
-         8       1205 33101  18677 13L  S3       
-         8       1206 33101  18789 13R  P8       
-         8       1207 33101  18667 13L  S3       
-         8       1208 33101  18777 13R  P8       
-         8       1209 33101  18661 13L  S3       
-         8       1210 33101  18762 13R  P8       
-         8       1211 33101  18655 13L  S3       
-         8       1212 33101  18772 13R  P8       
-         8       1213 33101  18648 13L  S3       
-         8       1214 33101  18782 13R  P8       
-         8       1215 33101  18642 13L  S3       
-         8       1216 33101  18747 13R  S3       
-         8       1217 33101  18637 13L  S3       
-         8       1218 33101  18691 13R  S3       
-         8       1219 33101  18631 13L  S3       
-         8       1220 33101  18717 13R  S3       
-         8       1221 33101  18673 13L  S3       
-         8       1222 33101  18758 13R  P8       
-         8       1223 33101  18683 13L  S3       
-         8       1224 33101  18752 13R  S3       
-         8       1225 33101  18678 13L  S3       
-         8       1226 33101  18791 13R  P8       
-         8       1227 33101  18668 13L  S3       
-         8       1228 33101  18778 13R  P8       
-         8       1229 33101  18663 13L  S3       
-         8       1230 33101  18763 13R  P8       
-         8       1231 33101  18656 13L  S3       
-         8       1232 33101  18773 13R  P8       
-         8       1233 33101  18649 13L  S3       
-         8       1234 33101  18783 13R  P8       
-         8       1235 33101  18643 13L  S3       
-         8       1236 33101  18748 13R  S3       
-         8       1237 33101  18638 13L  S3       
-         8       1238 33101  18708 13R  S3       
-         8       1239 33101  18632 13L  S3       
-         8       1240 33101  18718 13R  S3       
-         8       1241 33101  18674 13L  S3       
-         8       1242 33101  18759 13R  P8       
-         8       1243 33101  18684 13L  S3       
-         8       1244 33101  18754 13R  S3       
-         8       1245 33101  18679 13L  S3       
-         8       1246 33101  18792 13R  P8       
-         8       1247 33101  18670 13L  S3       
-         8       1248 33101  18780 13R  P8       
-         8       1249 33101  18664 13L  S3       
-         8       1250 33101  18764 13R  P8       
-         8       1251 33101  18658 13L  S3       
-         8       1252 33101  18774 13R  P8       
-         8       1253 33101  18651 13L  S3       
-         8       1254 33101  18784 13R  P8       
-         8       1255 33101  18644 13L  S3       
-         8       1256 33101  18749 13R  S3       
-         8       1257 33101  18639 13L  S3       
-         8       1258 33101  18709 13R  S3       
-         8       1259 33101  18633 13L  S3       
-         8       1260 33101  18719 13R  S3       
-         8       1261 33101  18675 13L  S3       
-         8       1262 33101  18760 13R  P8       
-         8       1263 33101  18685 13L  S3       
-         8       1264 33101  18755 13R  S3       
-         8       1265 33101  18680 13L  S3       
-         8       1266 33101  18793 13R  P8       
-         8       1267 33101  18671 13L  S3       
-         8       1268 33101  18781 13R  P8       
-         8       1269 33101  18665 13L  S3       
-         8       1270 33101  18765 13R  P8       
-         8       1271 33101  18659 13L  S3       
-         8       1272 33101  18775 13R  P8       
-         8       1273 33101  18652 13L  S3       
-         8       1274 33101  18785 13R  P8       
-         8       1275 33101  18646 13L  S3       
-         8       1276 33101  18750 13R  S3       
-         8       1277 33101  18640 13L  S3       
-         8       1278 33101  18710 13R  S3       
-         8       1279 33101  18634 13L  S3       
-         8       1280 33101  18720 13R  S3       
-         8       1281 33101  18676 13L  S3       
-         8       1282 33101  18761 13R  P8       
-         8       1283 33101  18686 13L  S3       
-         8       1284 33101  18756 13R  S3       
-         8       1285 33101  18681 13L  S3       
-         8       1286 33101  18794 13R  P8       
-         8       1287 33101  18672 13L  S3       
-         8       1288 33101  18787 13R  P8       
-         8       1289 33101  18666 13L  S3       
-         8       1290 33101  18766 13R  P8       
-         8       1291 33101  18660 13L  S3       
-         8       1292 33101  18776 13R  P8       
-         8       1293 33101  18653 13L  S3       
-         8       1294 33101  18786 13R  P8       
-         8       1295 33101  18647 13L  S3       
-         8       1296 33101  18753 13R  S3       
-         8       1297 33101  18641 13L  S3       
-         8       1298 33101  18715 13R  S3       
-         8       1299 33101  18635 13L  S3       
-         8       1300 33101  18721 13R  S3       
-         8       1301 33101  18413 14L  P8       
-         8       1302 33101  13760 14R  S2       
-         8       1303 33101  18421 14L  P8       
-         8       1304 33101  17144 14R  S3       
-         8       1305 33101  19145 14L  S4       
-         8       1306 33101  18425 14R  P8       
-         8       1307 33101  19332 14L  S4       
-         8       1308 33101  19148 14R  S4       
-         8       1309 33101  19342 14L  S4       
-         8       1310 33101  19159 14R  S4       
-         8       1311 33101  19351 14L  S4       
-         8       1312 33101  19165 14R  S4       
-         8       1313 33101  19356 14L  S4       
-         8       1314 33101  19175 14R  S4       
-         8       1315 33101  19364 14L  S4       
-         8       1316 33101  19181 14R  S4       
-         8       1317 33101  19373 14L  S4       
-         8       1318 33101  19187 14R  S4       
-         8       1319 33101  19378 14L  S4       
-         8       1320 33101  19192 14R  S4       
-         8       1321 33101  18414 14L  P8       
-         8       1322 33101  13794 14R  S2       
-         8       1323 33101  18422 14L  P8       
-         8       1324 33101  17157 14R  S3       
-         8       1325 33101  19327 14L  S4       
-         8       1326 33101  18426 14R  P8       
-         8       1327 33101  19333 14L  S4       
-         8       1328 33101  19152 14R  S4       
-         8       1329 33101  19344 14L  S4       
-         8       1330 33101  19160 14R  S4       
-         8       1331 33101  19352 14L  S4       
-         8       1332 33101  19166 14R  S4       
-         8       1333 33101  19358 14L  S4       
-         8       1334 33101  19176 14R  S4       
-         8       1335 33101  19366 14L  S4       
-         8       1336 33101  19182 14R  S4       
-         8       1337 33101  19374 14L  S4       
-         8       1338 33101  19188 14R  S4       
-         8       1339 33101  19380 14L  S4       
-         8       1340 33101  19193 14R  S4       
-         8       1341 33101  18417 14L  P8       
-         8       1342 33101  13849 14R  S2       
-         8       1343 33101  18423 14L  P8       
-         8       1344 33101  17159 14R  S3       
-         8       1345 33101  19328 14L  S4       
-         8       1346 33101  18427 14R  P8       
-         8       1347 33101  19334 14L  S4       
-         8       1348 33101  19153 14R  S4       
-         8       1349 33101  19345 14L  S4       
-         8       1350 33101  19162 14R  S4       
-         8       1351 33101  19353 14L  S4       
-         8       1352 33101  19169 14R  S4       
-         8       1353 33101  19359 14L  S4       
-         8       1354 33101  19177 14R  S4       
-         8       1355 33101  19368 14L  S4       
-         8       1356 33101  19183 14R  S4       
-         8       1357 33101  19375 14L  S4       
-         8       1358 33101  19189 14R  S4       
-         8       1359 33101  19381 14L  S4       
-         8       1360 33101  19194 14R  S4       
-         8       1361 33101  18418 14L  P8       
-         8       1362 33101  17119 14R  S3       
-         8       1363 33101  18424 14L  P8       
-         8       1364 33101  17160 14R  S3       
-         8       1365 33101  19329 14L  S4       
-         8       1366 33101  18428 14R  P8       
-         8       1367 33101  19340 14L  S4       
-         8       1368 33101  19156 14R  S4       
-         8       1369 33101  19346 14L  S4       
-         8       1370 33101  19163 14R  S4       
-         8       1371 33101  19354 14L  S4       
-         8       1372 33101  19173 14R  S4       
-         8       1373 33101  19362 14L  S4       
-         8       1374 33101  19178 14R  S4       
-         8       1375 33101  19369 14L  S4       
-         8       1376 33101  19184 14R  S4       
-         8       1377 33101  19376 14L  S4       
-         8       1378 33101  19190 14R  S4       
-         8       1379 33101  19382 14L  S4       
-         8       1380 33101  13854 14R  S2       
-         8       1381 33101  18419 14L  P8       
-         8       1382 33101  17136 14R  S3       
-         8       1383 33101  19144 14L  S4       
-         8       1384 33101  17161 14R  S3       
-         8       1385 33101  19331 14L  S4       
-         8       1386 33101  18429 14R  P8       
-         8       1387 33101  19341 14L  S4       
-         8       1388 33101  19158 14R  S4       
-         8       1389 33101  19348 14L  S4       
-         8       1390 33101  19164 14R  S4       
-         8       1391 33101  19355 14L  S4       
-         8       1392 33101  19174 14R  S4       
-         8       1393 33101  19363 14L  S4       
-         8       1394 33101  19180 14R  S4       
-         8       1395 33101  19371 14L  S4       
-         8       1396 33101  19185 14R  S4       
-         8       1397 33101  19377 14L  S4       
-         8       1398 33101  19191 14R  S4       
-         8       1399 33101  19383 14L  S4       
-         8       1400 33101  19161 14R  S4       
-         8       1401 33101  13933 15L  S2       
-         8       1402 33101  13977 15R  S2       
-         8       1403 33101  17229 15L  S3       
-         8       1404 33101  17260 15R  S3       
-         8       1405 33101  19477 15L  S4       
-         8       1406 33101  17306 15R  S3       
-         8       1407 33101  19484 15L  S4       
-         8       1408 33101  19300 15R  S4       
-         8       1409 33101  19493 15L  S4       
-         8       1410 33101  19307 15R  S4       
-         8       1411 33101  19501 15L  S4       
-         8       1412 33101  19313 15R  S4       
-         8       1413 33101  19508 15L  S4       
-         8       1414 33101  19321 15R  S4       
-         8       1415 33101  19519 15L  S4       
-         8       1416 33101  19622 15R  S4       
-         8       1417 33101  19527 15L  S4       
-         8       1418 33101  19629 15R  S4       
-         8       1419 33101  19534 15L  S4       
-         8       1420 33101  19636 15R  S4       
-         8       1421 33101  17166 15L  S3       
-         8       1422 33101  14044 15R  S2       
-         8       1423 33101  17230 15L  S3       
-         8       1424 33101  17292 15R  S3       
-         8       1425 33101  19479 15L  S4       
-         8       1426 33101  19296 15R  S4       
-         8       1427 33101  19486 15L  S4       
-         8       1428 33101  19301 15R  S4       
-         8       1429 33101  19494 15L  S4       
-         8       1430 33101  19308 15R  S4       
-         8       1431 33101  19502 15L  S4       
-         8       1432 33101  19314 15R  S4       
-         8       1433 33101  19509 15L  S4       
-         8       1434 33101  19322 15R  S4       
-         8       1435 33101  19520 15L  S4       
-         8       1436 33101  19623 15R  S4       
-         8       1437 33101  19529 15L  S4       
-         8       1438 33101  19631 15R  S4       
-         8       1439 33101  19535 15L  S4       
-         8       1440 33101  19637 15R  S4       
-         8       1441 33101  17188 15L  S3       
-         8       1442 33101  17238 15R  S3       
-         8       1443 33101  19472 15L  S4       
-         8       1444 33101  17303 15R  S3       
-         8       1445 33101  19480 15L  S4       
-         8       1446 33101  19297 15R  S4       
-         8       1447 33101  19489 15L  S4       
-         8       1448 33101  19302 15R  S4       
-         8       1449 33101  19495 15L  S4       
-         8       1450 33101  19309 15R  S4       
-         8       1451 33101  19503 15L  S4       
-         8       1452 33101  19315 15R  S4       
-         8       1453 33101  19512 15L  S4       
-         8       1454 33101  19323 15R  S4       
-         8       1455 33101  19523 15L  S4       
-         8       1456 33101  19624 15R  S4       
-         8       1457 33101  19530 15L  S4       
-         8       1458 33101  19632 15R  S4       
-         8       1459 33101  19536 15L  S4       
-         8       1460 33101  19638 15R  S4       
-         8       1461 33101  17223 15L  S3       
-         8       1462 33101  17257 15R  S3       
-         8       1463 33101  19474 15L  S4       
-         8       1464 33101  17304 15R  S3       
-         8       1465 33101  19482 15L  S4       
-         8       1466 33101  19298 15R  S4       
-         8       1467 33101  19490 15L  S4       
-         8       1468 33101  19303 15R  S4       
-         8       1469 33101  19496 15L  S4       
-         8       1470 33101  19310 15R  S4       
-         8       1471 33101  19504 15L  S4       
-         8       1472 33101  19317 15R  S4       
-         8       1473 33101  19515 15L  S4       
-         8       1474 33101  19324 15R  S4       
-         8       1475 33101  19524 15L  S4       
-         8       1476 33101  19625 15R  S4       
-         8       1477 33101  19531 15L  S4       
-         8       1478 33101  19633 15R  S4       
-         8       1479 33101  19537 15L  S4       
-         8       1480 33101  19640 15R  S4       
-         8       1481 33101  17228 15L  S3       
-         8       1482 33101  17258 15R  S3       
-         8       1483 33101  19475 15L  S4       
-         8       1484 33101  17305 15R  S3       
-         8       1485 33101  19483 15L  S4       
-         8       1486 33101  19299 15R  S4       
-         8       1487 33101  19491 15L  S4       
-         8       1488 33101  19305 15R  S4       
-         8       1489 33101  19497 15L  S4       
-         8       1490 33101  19312 15R  S4       
-         8       1491 33101  19506 15L  S4       
-         8       1492 33101  19320 15R  S4       
-         8       1493 33101  19518 15L  S4       
-         8       1494 33101  19325 15R  S4       
-         8       1495 33101  19526 15L  S4       
-         8       1496 33101  19628 15R  S4       
-         8       1497 33101  19532 15L  S4       
-         8       1498 33101  19634 15R  S4       
-         8       1499 33101  19539 15L  S4       
-         8       1500 33101  19641 15R  S4       
-         8       1501 33101  14054 16L  S2       
-         8       1502 33101  14216 16R  S2       
-         8       1503 33101  17381 16L  S3       
-         8       1504 33101  17399 16R  S3       
-         8       1505 33101  19736 16L  S4       
-         8       1506 33101  19878 16R  S4       
-         8       1507 33101  19746 16L  S4       
-         8       1508 33101  19884 16R  S4       
-         8       1509 33101  19753 16L  S4       
-         8       1510 33101  19892 16R  S4       
-         8       1511 33101  19760 16L  S4       
-         8       1512 33101  19900 16R  S4       
-         8       1513 33101  19766 16L  S4       
-         8       1514 33101  19905 16R  S4       
-         8       1515 33101  19776 16L  S4       
-         8       1516 33101  19911 16R  S4       
-         8       1517 33101  19782 16L  S4       
-         8       1518 33101  19917 16R  S4       
-         8       1519 33101  19788 16L  S4       
-         8       1520 33101  19924 16R  S4       
-         8       1521 33101  14127 16L  S2       
-         8       1522 33101  14219 16R  S2       
-         8       1523 33101  17382 16L  S3       
-         8       1524 33101  17401 16R  S3       
-         8       1525 33101  19739 16L  S4       
-         8       1526 33101  19879 16R  S4       
-         8       1527 33101  19747 16L  S4       
-         8       1528 33101  19885 16R  S4       
-         8       1529 33101  19754 16L  S4       
-         8       1530 33101  19893 16R  S4       
-         8       1531 33101  19762 16L  S4       
-         8       1532 33101  19901 16R  S4       
-         8       1533 33101  19767 16L  S4       
-         8       1534 33101  19906 16R  S4       
-         8       1535 33101  19777 16L  S4       
-         8       1536 33101  19913 16R  S4       
-         8       1537 33101  19783 16L  S4       
-         8       1538 33101  19919 16R  S4       
-         8       1539 33101  19791 16L  S4       
-         8       1540 33101  19925 16R  S4       
-         8       1541 33101  17314 16L  S3       
-         8       1542 33101  14228 16R  S2       
-         8       1543 33101  17383 16L  S3       
-         8       1544 33101  17455 16R  S3       
-         8       1545 33101  19741 16L  S4       
-         8       1546 33101  19880 16R  S4       
-         8       1547 33101  19748 16L  S4       
-         8       1548 33101  19886 16R  S4       
-         8       1549 33101  19755 16L  S4       
-         8       1550 33101  19894 16R  S4       
-         8       1551 33101  19763 16L  S4       
-         8       1552 33101  19902 16R  S4       
-         8       1553 33101  19768 16L  S4       
-         8       1554 33101  19907 16R  S4       
-         8       1555 33101  19778 16L  S4       
-         8       1556 33101  19914 16R  S4       
-         8       1557 33101  19784 16L  S4       
-         8       1558 33101  19921 16R  S4       
-         8       1559 33101  19792 16L  S4       
-         8       1560 33101  19926 16R  S4       
-         8       1561 33101  17360 16L  S3       
-         8       1562 33101  14230 16R  S2       
-         8       1563 33101  19732 16L  S4       
-         8       1564 33101  19876 16R  S4       
-         8       1565 33101  19743 16L  S4       
-         8       1566 33101  19882 16R  S4       
-         8       1567 33101  19749 16L  S4       
-         8       1568 33101  19889 16R  S4       
-         8       1569 33101  19757 16L  S4       
-         8       1570 33101  19895 16R  S4       
-         8       1571 33101  19764 16L  S4       
-         8       1572 33101  19903 16R  S4       
-         8       1573 33101  19769 16L  S4       
-         8       1574 33101  19909 16R  S4       
-         8       1575 33101  19779 16L  S4       
-         8       1576 33101  19915 16R  S4       
-         8       1577 33101  19786 16L  S4       
-         8       1578 33101  19922 16R  S4       
-         8       1579 33101  19794 16L  S4       
-         8       1580 33101  19928 16R  S4       
-         8       1581 33101  17380 16L  S3       
-         8       1582 33101  17388 16R  S3       
-         8       1583 33101  19733 16L  S4       
-         8       1584 33101  19877 16R  S4       
-         8       1585 33101  19744 16L  S4       
-         8       1586 33101  19883 16R  S4       
-         8       1587 33101  19750 16L  S4       
-         8       1588 33101  19891 16R  S4       
-         8       1589 33101  19758 16L  S4       
-         8       1590 33101  19899 16R  S4       
-         8       1591 33101  19765 16L  S4       
-         8       1592 33101  19904 16R  S4       
-         8       1593 33101  19774 16L  S4       
-         8       1594 33101  19910 16R  S4       
-         8       1595 33101  19780 16L  S4       
-         8       1596 33101  19916 16R  S4       
-         8       1597 33101  19787 16L  S4       
-         8       1598 33101  19923 16R  S4       
-         8       1599 33101  19795 16L  S4       
-         8       1600 33101  19929 16R  S4       
-         8       1601 33101  14286 17L  S2       
-         8       1602 33101  14311 17R  S2       
-         8       1603 33101  17540 17L  S3       
-         8       1604 33101  17606 17R  S3       
-         8       1605 33101  20029 17L  S4       
-         8       1606 33101  20149 17R  S4       
-         8       1607 33101  20036 17L  S4       
-         8       1608 33101  20158 17R  S4       
-         8       1609 33101  20043 17L  S4       
-         8       1610 33101  20164 17R  S4       
-         8       1611 33101  20054 17L  S4       
-         8       1612 33101  20171 17R  S4       
-         8       1613 33101  20060 17L  S4       
-         8       1614 33101  20178 17R  S4       
-         8       1615 33101  20065 17L  S4       
-         8       1616 33101  20183 17R  S4       
-         8       1617 33101  20071 17L  S4       
-         8       1618 33101  20188 17R  S4       
-         8       1619 33101  20078 17L  S4       
-         8       1620 33101  20195 17R  S4       
-         8       1621 33101  17477 17L  S3       
-         8       1622 33101  14325 17R  S2       
-         8       1623 33101  18431 17L  P8       
-         8       1624 33101  17607 17R  S3       
-         8       1625 33101  20030 17L  S4       
-         8       1626 33101  20152 17R  S4       
-         8       1627 33101  20037 17L  S4       
-         8       1628 33101  20159 17R  S4       
-         8       1629 33101  20044 17L  S4       
-         8       1630 33101  20165 17R  S4       
-         8       1631 33101  20055 17L  S4       
-         8       1632 33101  20172 17R  S4       
-         8       1633 33101  20061 17L  S4       
-         8       1634 33101  20179 17R  S4       
-         8       1635 33101  20066 17L  S4       
-         8       1636 33101  20184 17R  S4       
-         8       1637 33101  20072 17L  S4       
-         8       1638 33101  20190 17R  S4       
-         8       1639 33101  20081 17L  S4       
-         8       1640 33101  20197 17R  S4       
-         8       1641 33101  17504 17L  S3       
-         8       1642 33101  14327 17R  S2       
-         8       1643 33101  20026 17L  S4       
-         8       1644 33101  17608 17R  S3       
-         8       1645 33101  20033 17L  S4       
-         8       1646 33101  20153 17R  S4       
-         8       1647 33101  20040 17L  S4       
-         8       1648 33101  20160 17R  S4       
-         8       1649 33101  20048 17L  S4       
-         8       1650 33101  20167 17R  S4       
-         8       1651 33101  20056 17L  S4       
-         8       1652 33101  20175 17R  S4       
-         8       1653 33101  20062 17L  S4       
-         8       1654 33101  20180 17R  S4       
-         8       1655 33101  20067 17L  S4       
-         8       1656 33101  20185 17R  S4       
-         8       1657 33101  20073 17L  S4       
-         8       1658 33101  20192 17R  S4       
-         8       1659 33101  20085 17L  S4       
-         8       1660 33101  20199 17R  S4       
-         8       1661 33101  17521 17L  S3       
-         8       1662 33101  17604 17R  S3       
-         8       1663 33101  20027 17L  S4       
-         8       1664 33101  17610 17R  S3       
-         8       1665 33101  20034 17L  S4       
-         8       1666 33101  20156 17R  S4       
-         8       1667 33101  20041 17L  S4       
-         8       1668 33101  20161 17R  S4       
-         8       1669 33101  20049 17L  S4       
-         8       1670 33101  20169 17R  S4       
-         8       1671 33101  20058 17L  S4       
-         8       1672 33101  20176 17R  S4       
-         8       1673 33101  20063 17L  S4       
-         8       1674 33101  20181 17R  S4       
-         8       1675 33101  20068 17L  S4       
-         8       1676 33101  20186 17R  S4       
-         8       1677 33101  20075 17L  S4       
-         8       1678 33101  20193 17R  S4       
-         8       1679 33101  20086 17L  S4       
-         8       1680 33101  20200 17R  S4       
-         8       1681 33101  17536 17L  S3       
-         8       1682 33101  17605 17R  S3       
-         8       1683 33101  20028 17L  S4       
-         8       1684 33101  17611 17R  S3       
-         8       1685 33101  20035 17L  S4       
-         8       1686 33101  20157 17R  S4       
-         8       1687 33101  20042 17L  S4       
-         8       1688 33101  20163 17R  S4       
-         8       1689 33101  20053 17L  S4       
-         8       1690 33101  20170 17R  S4       
-         8       1691 33101  20059 17L  S4       
-         8       1692 33101  20177 17R  S4       
-         8       1693 33101  20064 17L  S4       
-         8       1694 33101  20182 17R  S4       
-         8       1695 33101  20069 17L  S4       
-         8       1696 33101  20187 17R  S4       
-         8       1697 33101  20077 17L  S4       
-         8       1698 33101  20194 17R  S4       
-         8       1699 33101  20087 17L  S4       
-         8       1700 33101  20201 17R  S4       
-         9          1 33101  15857 1L   S3       
-         9          2 33101  16019 1R   S3       
-         9          3 33101  15863 1L   S3       
-         9          4 33101  16024 1R   S3       
-         9          5 33101  15868 1L   S3       
-         9          6 33101  16029 1R   S3       
-         9          7 33101  15874 1L   S3       
-         9          8 33101  16034 1R   S3       
-         9          9 33101  15879 1L   S3       
-         9         10 33101  16040 1R   S3       
-         9         11 33101  15885 1L   S3       
-         9         12 33101  16045 1R   S3       
-         9         13 33101  15891 1L   S3       
-         9         14 33101  16050 1R   S3       
-         9         15 33101  15896 1L   S3       
-         9         16 33101  16055 1R   S3       
-         9         17 33101  15901 1L   S3       
-         9         18 33101  16061 1R   S3       
-         9         19 33101  15906 1L   S3       
-         9         20 33101  16066 1R   S3       
-         9         21 33101  15858 1L   S3       
-         9         22 33101  16020 1R   S3       
-         9         23 33101  15864 1L   S3       
-         9         24 33101  16025 1R   S3       
-         9         25 33101  15870 1L   S3       
-         9         26 33101  16030 1R   S3       
-         9         27 33101  15875 1L   S3       
-         9         28 33101  16035 1R   S3       
-         9         29 33101  15880 1L   S3       
-         9         30 33101  16041 1R   S3       
-         9         31 33101  15886 1L   S3       
-         9         32 33101  16046 1R   S3       
-         9         33 33101  15892 1L   S3       
-         9         34 33101  16051 1R   S3       
-         9         35 33101  15897 1L   S3       
-         9         36 33101  16056 1R   S3       
-         9         37 33101  15902 1L   S3       
-         9         38 33101  16062 1R   S3       
-         9         39 33101  15908 1L   S3       
-         9         40 33101  16067 1R   S3       
-         9         41 33101  15860 1L   S3       
-         9         42 33101  16021 1R   S3       
-         9         43 33101  15865 1L   S3       
-         9         44 33101  16026 1R   S3       
-         9         45 33101  15871 1L   S3       
-         9         46 33101  16031 1R   S3       
-         9         47 33101  15876 1L   S3       
-         9         48 33101  16037 1R   S3       
-         9         49 33101  15881 1L   S3       
-         9         50 33101  16042 1R   S3       
-         9         51 33101  15888 1L   S3       
-         9         52 33101  16047 1R   S3       
-         9         53 33101  15893 1L   S3       
-         9         54 33101  16052 1R   S3       
-         9         55 33101  15898 1L   S3       
-         9         56 33101  16057 1R   S3       
-         9         57 33101  15903 1L   S3       
-         9         58 33101  16063 1R   S3       
-         9         59 33101  15909 1L   S3       
-         9         60 33101  16068 1R   S3       
-         9         61 33101  15861 1L   S3       
-         9         62 33101  16022 1R   S3       
-         9         63 33101  15866 1L   S3       
-         9         64 33101  16027 1R   S3       
-         9         65 33101  15872 1L   S3       
-         9         66 33101  16032 1R   S3       
-         9         67 33101  15877 1L   S3       
-         9         68 33101  16038 1R   S3       
-         9         69 33101  15882 1L   S3       
-         9         70 33101  16043 1R   S3       
-         9         71 33101  15889 1L   S3       
-         9         72 33101  16048 1R   S3       
-         9         73 33101  15894 1L   S3       
-         9         74 33101  16053 1R   S3       
-         9         75 33101  15899 1L   S3       
-         9         76 33101  16058 1R   S3       
-         9         77 33101  15904 1L   S3       
-         9         78 33101  16064 1R   S3       
-         9         79 33101  15910 1L   S3       
-         9         80 33101  16069 1R   S3       
-         9         81 33101  15862 1L   S3       
-         9         82 33101  16023 1R   S3       
-         9         83 33101  15867 1L   S3       
-         9         84 33101  16028 1R   S3       
-         9         85 33101  15873 1L   S3       
-         9         86 33101  16033 1R   S3       
-         9         87 33101  15878 1L   S3       
-         9         88 33101  16039 1R   S3       
-         9         89 33101  15884 1L   S3       
-         9         90 33101  16044 1R   S3       
-         9         91 33101  15890 1L   S3       
-         9         92 33101  16049 1R   S3       
-         9         93 33101  15895 1L   S3       
-         9         94 33101  16054 1R   S3       
-         9         95 33101  15900 1L   S3       
-         9         96 33101  16060 1R   S3       
-         9         97 33101  15905 1L   S3       
-         9         98 33101  16065 1R   S3       
-         9         99 33101  15912 1L   S3       
-         9        100 33101  16070 1R   S3       
-         9        101 33101  16186 2L   S3       
-         9        102 33101  16309 2R   S3       
-         9        103 33101  16191 2L   S3       
-         9        104 33101  16315 2R   S3       
-         9        105 33101  16198 2L   S3       
-         9        106 33101  16322 2R   S3       
-         9        107 33101  16203 2L   S3       
-         9        108 33101  16327 2R   S3       
-         9        109 33101  16208 2L   S3       
-         9        110 33101  16332 2R   S3       
-         9        111 33101  16213 2L   S3       
-         9        112 33101  16338 2R   S3       
-         9        113 33101  16220 2L   S3       
-         9        114 33101  16343 2R   S3       
-         9        115 33101  16225 2L   S3       
-         9        116 33101  16349 2R   S3       
-         9        117 33101  16230 2L   S3       
-         9        118 33101  16356 2R   S3       
-         9        119 33101  16235 2L   S3       
-         9        120 33101  16361 2R   S3       
-         9        121 33101  16187 2L   S3       
-         9        122 33101  16310 2R   S3       
-         9        123 33101  16193 2L   S3       
-         9        124 33101  16318 2R   S3       
-         9        125 33101  16199 2L   S3       
-         9        126 33101  16323 2R   S3       
-         9        127 33101  16204 2L   S3       
-         9        128 33101  16328 2R   S3       
-         9        129 33101  16209 2L   S3       
-         9        130 33101  16333 2R   S3       
-         9        131 33101  16215 2L   S3       
-         9        132 33101  16339 2R   S3       
-         9        133 33101  16221 2L   S3       
-         9        134 33101  16344 2R   S3       
-         9        135 33101  16226 2L   S3       
-         9        136 33101  16350 2R   S3       
-         9        137 33101  16231 2L   S3       
-         9        138 33101  16357 2R   S3       
-         9        139 33101  16236 2L   S3       
-         9        140 33101  16362 2R   S3       
-         9        141 33101  16188 2L   S3       
-         9        142 33101  16311 2R   S3       
-         9        143 33101  16195 2L   S3       
-         9        144 33101  16319 2R   S3       
-         9        145 33101  16200 2L   S3       
-         9        146 33101  16324 2R   S3       
-         9        147 33101  16205 2L   S3       
-         9        148 33101  16329 2R   S3       
-         9        149 33101  16210 2L   S3       
-         9        150 33101  16334 2R   S3       
-         9        151 33101  16216 2L   S3       
-         9        152 33101  16340 2R   S3       
-         9        153 33101  16222 2L   S3       
-         9        154 33101  16345 2R   S3       
-         9        155 33101  16227 2L   S3       
-         9        156 33101  16351 2R   S3       
-         9        157 33101  16232 2L   S3       
-         9        158 33101  16358 2R   S3       
-         9        159 33101  16237 2L   S3       
-         9        160 33101  16363 2R   S3       
-         9        161 33101  16189 2L   S3       
-         9        162 33101  16312 2R   S3       
-         9        163 33101  16196 2L   S3       
-         9        164 33101  16320 2R   S3       
-         9        165 33101  16201 2L   S3       
-         9        166 33101  16325 2R   S3       
-         9        167 33101  16206 2L   S3       
-         9        168 33101  16330 2R   S3       
-         9        169 33101  16211 2L   S3       
-         9        170 33101  16336 2R   S3       
-         9        171 33101  16217 2L   S3       
-         9        172 33101  16341 2R   S3       
-         9        173 33101  16223 2L   S3       
-         9        174 33101  16346 2R   S3       
-         9        175 33101  16228 2L   S3       
-         9        176 33101  16354 2R   S3       
-         9        177 33101  16233 2L   S3       
-         9        178 33101  16359 2R   S3       
-         9        179 33101  16238 2L   S3       
-         9        180 33101  16364 2R   S3       
-         9        181 33101  16190 2L   S3       
-         9        182 33101  16313 2R   S3       
-         9        183 33101  16197 2L   S3       
-         9        184 33101  16321 2R   S3       
-         9        185 33101  16202 2L   S3       
-         9        186 33101  16326 2R   S3       
-         9        187 33101  16207 2L   S3       
-         9        188 33101  16331 2R   S3       
-         9        189 33101  16212 2L   S3       
-         9        190 33101  16337 2R   S3       
-         9        191 33101  16218 2L   S3       
-         9        192 33101  16342 2R   S3       
-         9        193 33101  16224 2L   S3       
-         9        194 33101  16347 2R   S3       
-         9        195 33101  16229 2L   S3       
-         9        196 33101  16355 2R   S3       
-         9        197 33101  16234 2L   S3       
-         9        198 33101  16360 2R   S3       
-         9        199 33101  16240 2L   S3       
-         9        200 33101  16365 2R   S3       
-         9        201 33101  16468 3L   S3       
-         9        202 33101  16576 3R   S3       
-         9        203 33101  16473 3L   S3       
-         9        204 33101  16583 3R   S3       
-         9        205 33101  16478 3L   S3       
-         9        206 33101  16588 3R   S3       
-         9        207 33101  16484 3L   S3       
-         9        208 33101  16594 3R   S3       
-         9        209 33101  16490 3L   S3       
-         9        210 33101  16599 3R   S3       
-         9        211 33101  16495 3L   S3       
-         9        212 33101  16605 3R   S3       
-         9        213 33101  16500 3L   S3       
-         9        214 33101  16610 3R   S3       
-         9        215 33101  16505 3L   S3       
-         9        216 33101  16615 3R   S3       
-         9        217 33101  16510 3L   S3       
-         9        218 33101  16620 3R   S3       
-         9        219 33101  16515 3L   S3       
-         9        220 33101  16627 3R   S3       
-         9        221 33101  16469 3L   S3       
-         9        222 33101  16577 3R   S3       
-         9        223 33101  16474 3L   S3       
-         9        224 33101  16584 3R   S3       
-         9        225 33101  16480 3L   S3       
-         9        226 33101  16589 3R   S3       
-         9        227 33101  16485 3L   S3       
-         9        228 33101  16595 3R   S3       
-         9        229 33101  16491 3L   S3       
-         9        230 33101  16600 3R   S3       
-         9        231 33101  16496 3L   S3       
-         9        232 33101  16606 3R   S3       
-         9        233 33101  16501 3L   S3       
-         9        234 33101  16611 3R   S3       
-         9        235 33101  16506 3L   S3       
-         9        236 33101  16616 3R   S3       
-         9        237 33101  16511 3L   S3       
-         9        238 33101  16621 3R   S3       
-         9        239 33101  16516 3L   S3       
-         9        240 33101  16628 3R   S3       
-         9        241 33101  16470 3L   S3       
-         9        242 33101  16578 3R   S3       
-         9        243 33101  16475 3L   S3       
-         9        244 33101  16585 3R   S3       
-         9        245 33101  16481 3L   S3       
-         9        246 33101  16591 3R   S3       
-         9        247 33101  16486 3L   S3       
-         9        248 33101  16596 3R   S3       
-         9        249 33101  16492 3L   S3       
-         9        250 33101  16601 3R   S3       
-         9        251 33101  16497 3L   S3       
-         9        252 33101  16607 3R   S3       
-         9        253 33101  16502 3L   S3       
-         9        254 33101  16612 3R   S3       
-         9        255 33101  16507 3L   S3       
-         9        256 33101  16617 3R   S3       
-         9        257 33101  16512 3L   S3       
-         9        258 33101  16624 3R   S3       
-         9        259 33101  16517 3L   S3       
-         9        260 33101  16630 3R   S3       
-         9        261 33101  16471 3L   S3       
-         9        262 33101  16579 3R   S3       
-         9        263 33101  16476 3L   S3       
-         9        264 33101  16586 3R   S3       
-         9        265 33101  16482 3L   S3       
-         9        266 33101  16592 3R   S3       
-         9        267 33101  16488 3L   S3       
-         9        268 33101  16597 3R   S3       
-         9        269 33101  16493 3L   S3       
-         9        270 33101  16603 3R   S3       
-         9        271 33101  16498 3L   S3       
-         9        272 33101  16608 3R   S3       
-         9        273 33101  16503 3L   S3       
-         9        274 33101  16613 3R   S3       
-         9        275 33101  16508 3L   S3       
-         9        276 33101  16618 3R   S3       
-         9        277 33101  16513 3L   S3       
-         9        278 33101  16625 3R   S3       
-         9        279 33101  16518 3L   S3       
-         9        280 33101  16631 3R   S3       
-         9        281 33101  16472 3L   S3       
-         9        282 33101  16582 3R   S3       
-         9        283 33101  16477 3L   S3       
-         9        284 33101  16587 3R   S3       
-         9        285 33101  16483 3L   S3       
-         9        286 33101  16593 3R   S3       
-         9        287 33101  16489 3L   S3       
-         9        288 33101  16598 3R   S3       
-         9        289 33101  16494 3L   S3       
-         9        290 33101  16604 3R   S3       
-         9        291 33101  16499 3L   S3       
-         9        292 33101  16609 3R   S3       
-         9        293 33101  16504 3L   S3       
-         9        294 33101  16614 3R   S3       
-         9        295 33101  16509 3L   S3       
-         9        296 33101  16619 3R   S3       
-         9        297 33101  16514 3L   S3       
-         9        298 33101  16626 3R   S3       
-         9        299 33101  16519 3L   S3       
-         9        300 33101  16590 3R   S3       
-         9        301 33101  16685 4L   S3       
-         9        302 33101  16786 4R   S3       
-         9        303 33101  16690 4L   S3       
-         9        304 33101  16791 4R   S3       
-         9        305 33101  16696 4L   S3       
-         9        306 33101  16796 4R   S3       
-         9        307 33101  16701 4L   S3       
-         9        308 33101  16801 4R   S3       
-         9        309 33101  16706 4L   S3       
-         9        310 33101  16806 4R   S3       
-         9        311 33101  16711 4L   S3       
-         9        312 33101  16811 4R   S3       
-         9        313 33101  16716 4L   S3       
-         9        314 33101  16816 4R   S3       
-         9        315 33101  16721 4L   S3       
-         9        316 33101  16821 4R   S3       
-         9        317 33101  16726 4L   S3       
-         9        318 33101  16826 4R   S3       
-         9        319 33101  16731 4L   S3       
-         9        320 33101  16831 4R   S3       
-         9        321 33101  16686 4L   S3       
-         9        322 33101  16787 4R   S3       
-         9        323 33101  16691 4L   S3       
-         9        324 33101  16792 4R   S3       
-         9        325 33101  16697 4L   S3       
-         9        326 33101  16797 4R   S3       
-         9        327 33101  16702 4L   S3       
-         9        328 33101  16802 4R   S3       
-         9        329 33101  16707 4L   S3       
-         9        330 33101  16807 4R   S3       
-         9        331 33101  16712 4L   S3       
-         9        332 33101  16812 4R   S3       
-         9        333 33101  16717 4L   S3       
-         9        334 33101  16817 4R   S3       
-         9        335 33101  16722 4L   S3       
-         9        336 33101  16822 4R   S3       
-         9        337 33101  16727 4L   S3       
-         9        338 33101  16827 4R   S3       
-         9        339 33101  16732 4L   S3       
-         9        340 33101  16832 4R   S3       
-         9        341 33101  16687 4L   S3       
-         9        342 33101  16788 4R   S3       
-         9        343 33101  16692 4L   S3       
-         9        344 33101  16793 4R   S3       
-         9        345 33101  16698 4L   S3       
-         9        346 33101  16798 4R   S3       
-         9        347 33101  16703 4L   S3       
-         9        348 33101  16803 4R   S3       
-         9        349 33101  16708 4L   S3       
-         9        350 33101  16808 4R   S3       
-         9        351 33101  16713 4L   S3       
-         9        352 33101  16813 4R   S3       
-         9        353 33101  16718 4L   S3       
-         9        354 33101  16818 4R   S3       
-         9        355 33101  16723 4L   S3       
-         9        356 33101  16823 4R   S3       
-         9        357 33101  16728 4L   S3       
-         9        358 33101  16828 4R   S3       
-         9        359 33101  16733 4L   S3       
-         9        360 33101  16833 4R   S3       
-         9        361 33101  16688 4L   S3       
-         9        362 33101  16789 4R   S3       
-         9        363 33101  16693 4L   S3       
-         9        364 33101  16794 4R   S3       
-         9        365 33101  16699 4L   S3       
-         9        366 33101  16799 4R   S3       
-         9        367 33101  16704 4L   S3       
-         9        368 33101  16804 4R   S3       
-         9        369 33101  16709 4L   S3       
-         9        370 33101  16809 4R   S3       
-         9        371 33101  16714 4L   S3       
-         9        372 33101  16814 4R   S3       
-         9        373 33101  16719 4L   S3       
-         9        374 33101  16819 4R   S3       
-         9        375 33101  16724 4L   S3       
-         9        376 33101  16824 4R   S3       
-         9        377 33101  16729 4L   S3       
-         9        378 33101  16829 4R   S3       
-         9        379 33101  16734 4L   S3       
-         9        380 33101  16834 4R   S3       
-         9        381 33101  16689 4L   S3       
-         9        382 33101  16790 4R   S3       
-         9        383 33101  16695 4L   S3       
-         9        384 33101  16795 4R   S3       
-         9        385 33101  16700 4L   S3       
-         9        386 33101  16800 4R   S3       
-         9        387 33101  16705 4L   S3       
-         9        388 33101  16805 4R   S3       
-         9        389 33101  16710 4L   S3       
-         9        390 33101  16810 4R   S3       
-         9        391 33101  16715 4L   S3       
-         9        392 33101  16815 4R   S3       
-         9        393 33101  16720 4L   S3       
-         9        394 33101  16820 4R   S3       
-         9        395 33101  16725 4L   S3       
-         9        396 33101  16825 4R   S3       
-         9        397 33101  16730 4L   S3       
-         9        398 33101  16830 4R   S3       
-         9        399 33101  16735 4L   S3       
-         9        400 33101  16836 4R   S3       
-         9        401 33101  16949 5L   S3       
-         9        402 33101  17002 5R   S3       
-         9        403 33101  16901 5L   S3       
-         9        404 33101  17007 5R   S3       
-         9        405 33101  16906 5L   S3       
-         9        406 33101  17012 5R   S3       
-         9        407 33101  16912 5L   S3       
-         9        408 33101  17017 5R   S3       
-         9        409 33101  16917 5L   S3       
-         9        410 33101  17022 5R   S3       
-         9        411 33101  16922 5L   S3       
-         9        412 33101  17028 5R   S3       
-         9        413 33101  16927 5L   S3       
-         9        414 33101  17033 5R   S3       
-         9        415 33101  16934 5L   S3       
-         9        416 33101  17039 5R   S3       
-         9        417 33101  16939 5L   S3       
-         9        418 33101  17044 5R   S3       
-         9        419 33101  16944 5L   S3       
-         9        420 33101  17049 5R   S3       
-         9        421 33101  16897 5L   S3       
-         9        422 33101  17003 5R   S3       
-         9        423 33101  16902 5L   S3       
-         9        424 33101  17008 5R   S3       
-         9        425 33101  16907 5L   S3       
-         9        426 33101  17013 5R   S3       
-         9        427 33101  16913 5L   S3       
-         9        428 33101  17018 5R   S3       
-         9        429 33101  16918 5L   S3       
-         9        430 33101  17023 5R   S3       
-         9        431 33101  16923 5L   S3       
-         9        432 33101  17029 5R   S3       
-         9        433 33101  16928 5L   S3       
-         9        434 33101  17035 5R   S3       
-         9        435 33101  16935 5L   S3       
-         9        436 33101  17040 5R   S3       
-         9        437 33101  16940 5L   S3       
-         9        438 33101  17045 5R   S3       
-         9        439 33101  16945 5L   S3       
-         9        440 33101  17050 5R   S3       
-         9        441 33101  16898 5L   S3       
-         9        442 33101  17004 5R   S3       
-         9        443 33101  16903 5L   S3       
-         9        444 33101  17009 5R   S3       
-         9        445 33101  16909 5L   S3       
-         9        446 33101  17014 5R   S3       
-         9        447 33101  16914 5L   S3       
-         9        448 33101  17019 5R   S3       
-         9        449 33101  16919 5L   S3       
-         9        450 33101  17025 5R   S3       
-         9        451 33101  16924 5L   S3       
-         9        452 33101  17030 5R   S3       
-         9        453 33101  16929 5L   S3       
-         9        454 33101  17036 5R   S3       
-         9        455 33101  16936 5L   S3       
-         9        456 33101  17041 5R   S3       
-         9        457 33101  16941 5L   S3       
-         9        458 33101  17046 5R   S3       
-         9        459 33101  16946 5L   S3       
-         9        460 33101  17051 5R   S3       
-         9        461 33101  16899 5L   S3       
-         9        462 33101  17005 5R   S3       
-         9        463 33101  16904 5L   S3       
-         9        464 33101  17010 5R   S3       
-         9        465 33101  16910 5L   S3       
-         9        466 33101  17015 5R   S3       
-         9        467 33101  16915 5L   S3       
-         9        468 33101  17020 5R   S3       
-         9        469 33101  16920 5L   S3       
-         9        470 33101  17026 5R   S3       
-         9        471 33101  16925 5L   S3       
-         9        472 33101  17031 5R   S3       
-         9        473 33101  16930 5L   S3       
-         9        474 33101  17037 5R   S3       
-         9        475 33101  16937 5L   S3       
-         9        476 33101  17042 5R   S3       
-         9        477 33101  16942 5L   S3       
-         9        478 33101  17047 5R   S3       
-         9        479 33101  16947 5L   S3       
-         9        480 33101  17052 5R   S3       
-         9        481 33101  16900 5L   S3       
-         9        482 33101  17006 5R   S3       
-         9        483 33101  16905 5L   S3       
-         9        484 33101  17011 5R   S3       
-         9        485 33101  16911 5L   S3       
-         9        486 33101  17016 5R   S3       
-         9        487 33101  16916 5L   S3       
-         9        488 33101  17021 5R   S3       
-         9        489 33101  16921 5L   S3       
-         9        490 33101  17027 5R   S3       
-         9        491 33101  16926 5L   S3       
-         9        492 33101  17032 5R   S3       
-         9        493 33101  16931 5L   S3       
-         9        494 33101  17038 5R   S3       
-         9        495 33101  16938 5L   S3       
-         9        496 33101  17043 5R   S3       
-         9        497 33101  16943 5L   S3       
-         9        498 33101  17048 5R   S3       
-         9        499 33101  16948 5L   S3       
-         9        500 33101  17053 5R   S3       
-         9        501 33101  20285 6L   S4       
-         9        502 33101  20371 6R   S4       
-         9        503 33101  20302 6L   S4       
-         9        504 33101  20355 6R   S4       
-         9        505 33101  20282 6L   S4       
-         9        506 33101  20370 6R   S4       
-         9        507 33101  20289 6L   S4       
-         9        508 33101  20356 6R   S4       
-         9        509 33101  20277 6L   S4       
-         9        510 33101  20320 6R   S4       
-         9        511 33101  20272 6L   S4       
-         9        512 33101  20350 6R   S4       
-         9        513 33101  20267 6L   S4       
-         9        514 33101  20345 6R   S4       
-         9        515 33101  20307 6L   S4       
-         9        516 33101  20338 6R   S4       
-         9        517 33101  20317 6L   S4       
-         9        518 33101  20324 6R   S4       
-         9        519 33101  20312 6L   S4       
-         9        520 33101  20325 6R   S4       
-         9        521 33101  20287 6L   S4       
-         9        522 33101     52 6R   5        
-         9        523 33101  20303 6L   S4       
-         9        524 33101  20361 6R   S4       
-         9        525 33101  20283 6L   S4       
-         9        526 33101  20330 6R   S4       
-         9        527 33101  20292 6L   S4       
-         9        528 33101  20357 6R   S4       
-         9        529 33101  20278 6L   S4       
-         9        530 33101  20321 6R   S4       
-         9        531 33101  20273 6L   S4       
-         9        532 33101  20351 6R   S4       
-         9        533 33101  20268 6L   S4       
-         9        534 33101  20346 6R   S4       
-         9        535 33101  20308 6L   S4       
-         9        536 33101  20339 6R   S4       
-         9        537 33101  20318 6L   S4       
-         9        538 33101  20331 6R   S4       
-         9        539 33101  20313 6L   S4       
-         9        540 33101  20326 6R   S4       
-         9        541 33101  20290 6L   S4       
-         9        542 33101  11118 6R   S1       
-         9        543 33101  20304 6L   S4       
-         9        544 33101  20362 6R   S4       
-         9        545 33101  20284 6L   S4       
-         9        546 33101  20335 6R   S4       
-         9        547 33101  20293 6L   S4       
-         9        548 33101  20358 6R   S4       
-         9        549 33101  20279 6L   S4       
-         9        550 33101  20322 6R   S4       
-         9        551 33101  20274 6L   S4       
-         9        552 33101  20352 6R   S4       
-         9        553 33101  20269 6L   S4       
-         9        554 33101  20347 6R   S4       
-         9        555 33101  20309 6L   S4       
-         9        556 33101  20340 6R   S4       
-         9        557 33101  20319 6L   S4       
-         9        558 33101  20332 6R   S4       
-         9        559 33101  20314 6L   S4       
-         9        560 33101  20327 6R   S4       
-         9        561 33101  20291 6L   S4       
-         9        562 33101  20366 6R   S4       
-         9        563 33101  20305 6L   S4       
-         9        564 33101  20363 6R   S4       
-         9        565 33101  20286 6L   S4       
-         9        566 33101  20343 6R   S4       
-         9        567 33101  20295 6L   S4       
-         9        568 33101  20359 6R   S4       
-         9        569 33101  20280 6L   S4       
-         9        570 33101  20336 6R   S4       
-         9        571 33101  20275 6L   S4       
-         9        572 33101  20353 6R   S4       
-         9        573 33101  20270 6L   S4       
-         9        574 33101  20348 6R   S4       
-         9        575 33101  20310 6L   S4       
-         9        576 33101  20341 6R   S4       
-         9        577 33101  11276 6L   S1       
-         9        578 33101  20333 6R   S4       
-         9        579 33101  20315 6L   S4       
-         9        580 33101  20328 6R   S4       
-         9        581 33101  20294 6L   S4       
-         9        582 33101  20369 6R   S4       
-         9        583 33101  20271 6L   S4       
-         9        584 33101  20364 6R   S4       
-         9        585 33101  20288 6L   S4       
-         9        586 33101  20344 6R   S4       
-         9        587 33101  20296 6L   S4       
-         9        588 33101  20360 6R   S4       
-         9        589 33101  20281 6L   S4       
-         9        590 33101  20337 6R   S4       
-         9        591 33101  20276 6L   S4       
-         9        592 33101  20354 6R   S4       
-         9        593 33101  20306 6L   S4       
-         9        594 33101  20349 6R   S4       
-         9        595 33101  20311 6L   S4       
-         9        596 33101  20342 6R   S4       
-         9        597 33101  11280 6L   S1       
-         9        598 33101  20334 6R   S4       
-         9        599 33101  20316 6L   S4       
-         9        600 33101  20329 6R   S4       
-         9        601 33101  20392 7L   S4       
-         9        602 33101  20458 7R   S4       
-         9        603 33101  21591 7L   P9       
-         9        604 33101  20452 7R   S4       
-         9        605 33101  20400 7L   S4       
-         9        606 33101  20447 7R   S4       
-         9        607 33101  20399 7L   S4       
-         9        608 33101  20442 7R   S4       
-         9        609 33101  20382 7L   S4       
-         9        610 33101  20462 7R   S4       
-         9        611 33101  20372 7L   S4       
-         9        612 33101  20422 7R   S4       
-         9        613 33101  20377 7L   S4       
-         9        614 33101  20432 7R   S4       
-         9        615 33101  20417 7L   S4       
-         9        616 33101  20437 7R   S4       
-         9        617 33101  20412 7L   S4       
-         9        618 33101  20427 7R   S4       
-         9        619 33101  20407 7L   S4       
-         9        620 33101  17860 7R   S3       
-         9        621 33101  20393 7L   S4       
-         9        622 33101  20459 7R   S4       
-         9        623 33101  21595 7L   P9       
-         9        624 33101  20453 7R   S4       
-         9        625 33101  20403 7L   S4       
-         9        626 33101  20448 7R   S4       
-         9        627 33101  20388 7L   S4       
-         9        628 33101  20443 7R   S4       
-         9        629 33101  20383 7L   S4       
-         9        630 33101  20463 7R   S4       
-         9        631 33101  20373 7L   S4       
-         9        632 33101  20423 7R   S4       
-         9        633 33101  20378 7L   S4       
-         9        634 33101  20433 7R   S4       
-         9        635 33101  20418 7L   S4       
-         9        636 33101  20438 7R   S4       
-         9        637 33101  20413 7L   S4       
-         9        638 33101  20428 7R   S4       
-         9        639 33101  20408 7L   S4       
-         9        640 33101  17861 7R   P8       
-         9        641 33101  20394 7L   S4       
-         9        642 33101  20461 7R   S4       
-         9        643 33101  21596 7L   P9       
-         9        644 33101  20454 7R   S4       
-         9        645 33101  20404 7L   S4       
-         9        646 33101  20449 7R   S4       
-         9        647 33101  20389 7L   S4       
-         9        648 33101  20444 7R   S4       
-         9        649 33101  20384 7L   S4       
-         9        650 33101  20464 7R   S4       
-         9        651 33101  20374 7L   S4       
-         9        652 33101  20424 7R   S4       
-         9        653 33101  20379 7L   S4       
-         9        654 33101  20434 7R   S4       
-         9        655 33101  20419 7L   S4       
-         9        656 33101  20439 7R   S4       
-         9        657 33101  20414 7L   S4       
-         9        658 33101  20429 7R   S4       
-         9        659 33101  20409 7L   S4       
-         9        660 33101  17862 7R   P8       
-         9        661 33101  20395 7L   S4       
-         9        662 33101  20467 7R   S4       
-         9        663 33101  21598 7L   P9       
-         9        664 33101  20455 7R   S4       
-         9        665 33101  20405 7L   S4       
-         9        666 33101  20450 7R   S4       
-         9        667 33101  20390 7L   S4       
-         9        668 33101  20445 7R   S4       
-         9        669 33101  20385 7L   S4       
-         9        670 33101  20465 7R   S4       
-         9        671 33101  20375 7L   S4       
-         9        672 33101  20425 7R   S4       
-         9        673 33101  20380 7L   S4       
-         9        674 33101  20435 7R   S4       
-         9        675 33101  20420 7L   S4       
-         9        676 33101  20440 7R   S4       
-         9        677 33101  20415 7L   S4       
-         9        678 33101  20431 7R   S4       
-         9        679 33101  20410 7L   S4       
-         9        680 33101  17863 7R   P8       
-         9        681 33101  20396 7L   S4       
-         9        682 33101  20468 7R   S4       
-         9        683 33101  21599 7L   P9       
-         9        684 33101  20456 7R   S4       
-         9        685 33101  20406 7L   S4       
-         9        686 33101  20451 7R   S4       
-         9        687 33101  20391 7L   S4       
-         9        688 33101  20446 7R   S4       
-         9        689 33101  20386 7L   S4       
-         9        690 33101  20466 7R   S4       
-         9        691 33101  20376 7L   S4       
-         9        692 33101  20426 7R   S4       
-         9        693 33101  20381 7L   S4       
-         9        694 33101  20436 7R   S4       
-         9        695 33101  20421 7L   S4       
-         9        696 33101  20441 7R   S4       
-         9        697 33101  20416 7L   S4       
-         9        698 33101  20457 7R   S4       
-         9        699 33101  20411 7L   S4       
-         9        700 33101  17864 7R   P8       
-         9        701 33101  20473 8L   S4       
-         9        702 33101  20521 8R   S4       
-         9        703 33101  21692 8L   P9       
-         9        704 33101  20517 8R   S4       
-         9        705 33101  20502 8L   S4       
-         9        706 33101  20552 8R   S4       
-         9        707 33101  20497 8L   S4       
-         9        708 33101  20562 8R   S4       
-         9        709 33101  20483 8L   S4       
-         9        710 33101  20557 8R   S4       
-         9        711 33101  20507 8L   S4       
-         9        712 33101  20547 8R   S4       
-         9        713 33101  20478 8L   S4       
-         9        714 33101  20542 8R   S4       
-         9        715 33101  20482 8L   S4       
-         9        716 33101  20526 8R   S4       
-         9        717 33101  20491 8L   S4       
-         9        718 33101  20527 8R   S4       
-         9        719 33101  17915 8L   S3       
-         9        720 33101  20537 8R   S4       
-         9        721 33101  20481 8L   S4       
-         9        722 33101  20522 8R   S4       
-         9        723 33101  21693 8L   P9       
-         9        724 33101  20518 8R   S4       
-         9        725 33101  20503 8L   S4       
-         9        726 33101  20553 8R   S4       
-         9        727 33101  20498 8L   S4       
-         9        728 33101  20563 8R   S4       
-         9        729 33101  20485 8L   S4       
-         9        730 33101  20558 8R   S4       
-         9        731 33101  20508 8L   S4       
-         9        732 33101  20548 8R   S4       
-         9        733 33101  20479 8L   S4       
-         9        734 33101  20543 8R   S4       
-         9        735 33101  20484 8L   S4       
-         9        736 33101  20532 8R   S4       
-         9        737 33101  20493 8L   S4       
-         9        738 33101  20528 8R   S4       
-         9        739 33101  17926 8L   P8       
-         9        740 33101  20538 8R   S4       
-         9        741 33101  20512 8L   S4       
-         9        742 33101  20524 8R   S4       
-         9        743 33101  21699 8L   P9       
-         9        744 33101  20519 8R   S4       
-         9        745 33101  20505 8L   S4       
-         9        746 33101  20554 8R   S4       
-         9        747 33101  20499 8L   S4       
-         9        748 33101  20564 8R   S4       
-         9        749 33101  20487 8L   S4       
-         9        750 33101  20559 8R   S4       
-         9        751 33101  20509 8L   S4       
-         9        752 33101  20549 8R   S4       
-         9        753 33101  20480 8L   S4       
-         9        754 33101  20544 8R   S4       
-         9        755 33101  20486 8L   S4       
-         9        756 33101  20533 8R   S4       
-         9        757 33101  20494 8L   S4       
-         9        758 33101  20529 8R   S4       
-         9        759 33101  17930 8L   P8       
-         9        760 33101  20539 8R   S4       
-         9        761 33101  20515 8L   S4       
-         9        762 33101  20525 8R   S4       
-         9        763 33101  21700 8L   P9       
-         9        764 33101  20520 8R   S4       
-         9        765 33101  20506 8L   S4       
-         9        766 33101  20555 8R   S4       
-         9        767 33101  20500 8L   S4       
-         9        768 33101  20565 8R   S4       
-         9        769 33101  20488 8L   S4       
-         9        770 33101  20560 8R   S4       
-         9        771 33101  20510 8L   S4       
-         9        772 33101  20550 8R   S4       
-         9        773 33101  20513 8L   S4       
-         9        774 33101  20545 8R   S4       
-         9        775 33101  20489 8L   S4       
-         9        776 33101  20535 8R   S4       
-         9        777 33101  20495 8L   S4       
-         9        778 33101  20530 8R   S4       
-         9        779 33101  17933 8L   P8       
-         9        780 33101  20540 8R   S4       
-         9        781 33101  20504 8L   S4       
-         9        782 33101  20534 8R   S4       
-         9        783 33101  21701 8L   P9       
-         9        784 33101  20523 8R   S4       
-         9        785 33101  20516 8L   S4       
-         9        786 33101  20556 8R   S4       
-         9        787 33101  20501 8L   S4       
-         9        788 33101  20566 8R   S4       
-         9        789 33101  20492 8L   S4       
-         9        790 33101  20561 8R   S4       
-         9        791 33101  20511 8L   S4       
-         9        792 33101  20551 8R   S4       
-         9        793 33101  20514 8L   S4       
-         9        794 33101  20546 8R   S4       
-         9        795 33101  20490 8L   S4       
-         9        796 33101  20536 8R   S4       
-         9        797 33101  20496 8L   S4       
-         9        798 33101  20531 8R   S4       
-         9        799 33101  15682 8L   P7       
-         9        800 33101  20541 8R   S4       
-         9        801 33101  20612 9L   S4       
-         9        802 33101  20615 9R   S4       
-         9        803 33101  20607 9L   S4       
-         9        804 33101  20622 9R   S4       
-         9        805 33101  20602 9L   S4       
-         9        806 33101  20640 9R   S4       
-         9        807 33101  20597 9L   S4       
-         9        808 33101  20635 9R   S4       
-         9        809 33101  20592 9L   S4       
-         9        810 33101  20630 9R   S4       
-         9        811 33101  17996 9L   S3       
-         9        812 33101  18075 9R   S3       
-         9        813 33101  20591 9L   S4       
-         9        814 33101  20660 9R   S4       
-         9        815 33101  20582 9L   S4       
-         9        816 33101  20655 9R   S4       
-         9        817 33101  20577 9L   S4       
-         9        818 33101  20650 9R   S4       
-         9        819 33101  18004 9L   S3       
-         9        820 33101  20645 9R   S4       
-         9        821 33101  20613 9L   S4       
-         9        822 33101  20617 9R   S4       
-         9        823 33101  20608 9L   S4       
-         9        824 33101  20623 9R   S4       
-         9        825 33101  20603 9L   S4       
-         9        826 33101  20641 9R   S4       
-         9        827 33101  20598 9L   S4       
-         9        828 33101  20636 9R   S4       
-         9        829 33101  20593 9L   S4       
-         9        830 33101  20631 9R   S4       
-         9        831 33101  17997 9L   S3       
-         9        832 33101  18076 9R   S3       
-         9        833 33101  18055 9L   P8       
-         9        834 33101  20661 9R   S4       
-         9        835 33101  20583 9L   S4       
-         9        836 33101  20656 9R   S4       
-         9        837 33101  20578 9L   S4       
-         9        838 33101  20651 9R   S4       
-         9        839 33101  18005 9L   S3       
-         9        840 33101  20646 9R   S4       
-         9        841 33101  20614 9L   S4       
-         9        842 33101  20618 9R   S4       
-         9        843 33101  20609 9L   S4       
-         9        844 33101  20624 9R   S4       
-         9        845 33101  20604 9L   S4       
-         9        846 33101  20642 9R   S4       
-         9        847 33101  20599 9L   S4       
-         9        848 33101  20637 9R   S4       
-         9        849 33101  20594 9L   S4       
-         9        850 33101  20632 9R   S4       
-         9        851 33101  18002 9L   S3       
-         9        852 33101  18077 9R   S3       
-         9        853 33101  18056 9L   P8       
-         9        854 33101  20662 9R   S4       
-         9        855 33101  20584 9L   S4       
-         9        856 33101  20657 9R   S4       
-         9        857 33101  20579 9L   S4       
-         9        858 33101  20652 9R   S4       
-         9        859 33101  18007 9L   S3       
-         9        860 33101  20647 9R   S4       
-         9        861 33101  11899 9L   S1       
-         9        862 33101  20619 9R   S4       
-         9        863 33101  20610 9L   S4       
-         9        864 33101  20625 9R   S4       
-         9        865 33101  20605 9L   S4       
-         9        866 33101  20643 9R   S4       
-         9        867 33101  20600 9L   S4       
-         9        868 33101  20638 9R   S4       
-         9        869 33101  20595 9L   S4       
-         9        870 33101  20633 9R   S4       
-         9        871 33101  18021 9L   S3       
-         9        872 33101  18078 9R   S3       
-         9        873 33101  18057 9L   P8       
-         9        874 33101  20663 9R   S4       
-         9        875 33101  20585 9L   S4       
-         9        876 33101  20658 9R   S4       
-         9        877 33101  20580 9L   S4       
-         9        878 33101  20653 9R   S4       
-         9        879 33101  18026 9L   S3       
-         9        880 33101  20648 9R   S4       
-         9        881 33101  11900 9L   S1       
-         9        882 33101  20620 9R   S4       
-         9        883 33101  20611 9L   S4       
-         9        884 33101  20626 9R   S4       
-         9        885 33101  20606 9L   S4       
-         9        886 33101  20644 9R   S4       
-         9        887 33101  20601 9L   S4       
-         9        888 33101  20639 9R   S4       
-         9        889 33101  20596 9L   S4       
-         9        890 33101  20634 9R   S4       
-         9        891 33101  18023 9L   S3       
-         9        892 33101  18081 9R   S3       
-         9        893 33101  18058 9L   P8       
-         9        894 33101  20664 9R   S4       
-         9        895 33101  20586 9L   S4       
-         9        896 33101  20659 9R   S4       
-         9        897 33101  20581 9L   S4       
-         9        898 33101  20654 9R   S4       
-         9        899 33101  18049 9L   S3       
-         9        900 33101  20649 9R   S4       
-         9        901 33101  20675 10L  S4       
-         9        902 33101  20794 10R  S4       
-         9        903 33101  20670 10L  S4       
-         9        904 33101  20785 10R  S4       
-         9        905 33101  20665 10L  S4       
-         9        906 33101  20779 10R  S4       
-         9        907 33101  20685 10L  S4       
-         9        908 33101  20774 10R  S4       
-         9        909 33101  20680 10L  S4       
-         9        910 33101  20769 10R  S4       
-         9        911 33101  20690 10L  S4       
-         9        912 33101  20764 10R  S4       
-         9        913 33101  20695 10L  S4       
-         9        914 33101  20759 10R  S4       
-         9        915 33101  20700 10L  S4       
-         9        916 33101  20754 10R  S4       
-         9        917 33101  18136 10L  S3       
-         9        918 33101  18229 10R  P8       
-         9        919 33101  18116 10L  S3       
-         9        920 33101  18219 10R  S3       
-         9        921 33101  20676 10L  S4       
-         9        922 33101  20795 10R  S4       
-         9        923 33101  20671 10L  S4       
-         9        924 33101  20786 10R  S4       
-         9        925 33101  20666 10L  S4       
-         9        926 33101  20780 10R  S4       
-         9        927 33101  20686 10L  S4       
-         9        928 33101  20775 10R  S4       
-         9        929 33101  20681 10L  S4       
-         9        930 33101  20770 10R  S4       
-         9        931 33101  20691 10L  S4       
-         9        932 33101  20765 10R  S4       
-         9        933 33101  20696 10L  S4       
-         9        934 33101  20760 10R  S4       
-         9        935 33101  20701 10L  S4       
-         9        936 33101  20755 10R  S4       
-         9        937 33101  18137 10L  S3       
-         9        938 33101  18230 10R  P8       
-         9        939 33101  18117 10L  S3       
-         9        940 33101  18220 10R  S3       
-         9        941 33101  20677 10L  S4       
-         9        942 33101  20796 10R  S4       
-         9        943 33101  20672 10L  S4       
-         9        944 33101  20788 10R  S4       
-         9        945 33101  20667 10L  S4       
-         9        946 33101  20781 10R  S4       
-         9        947 33101  20687 10L  S4       
-         9        948 33101  20776 10R  S4       
-         9        949 33101  20682 10L  S4       
-         9        950 33101  20771 10R  S4       
-         9        951 33101  20692 10L  S4       
-         9        952 33101  20766 10R  S4       
-         9        953 33101  20697 10L  S4       
-         9        954 33101  20761 10R  S4       
-         9        955 33101  20702 10L  S4       
-         9        956 33101  20756 10R  S4       
-         9        957 33101  18138 10L  S3       
-         9        958 33101  18231 10R  P8       
-         9        959 33101  18118 10L  S3       
-         9        960 33101  18221 10R  S3       
-         9        961 33101  20678 10L  S4       
-         9        962 33101  20797 10R  S4       
-         9        963 33101  20673 10L  S4       
-         9        964 33101  20789 10R  S4       
-         9        965 33101  20668 10L  S4       
-         9        966 33101  20782 10R  S4       
-         9        967 33101  20688 10L  S4       
-         9        968 33101  20777 10R  S4       
-         9        969 33101  20683 10L  S4       
-         9        970 33101  20772 10R  S4       
-         9        971 33101  20693 10L  S4       
-         9        972 33101  20767 10R  S4       
-         9        973 33101  20698 10L  S4       
-         9        974 33101  20762 10R  S4       
-         9        975 33101  20703 10L  S4       
-         9        976 33101  20757 10R  S4       
-         9        977 33101  18139 10L  S3       
-         9        978 33101  18232 10R  P8       
-         9        979 33101  18119 10L  S3       
-         9        980 33101  18222 10R  S3       
-         9        981 33101  20679 10L  S4       
-         9        982 33101  20798 10R  S4       
-         9        983 33101  20674 10L  S4       
-         9        984 33101  20791 10R  S4       
-         9        985 33101  20669 10L  S4       
-         9        986 33101  20783 10R  S4       
-         9        987 33101  20689 10L  S4       
-         9        988 33101  20778 10R  S4       
-         9        989 33101  20684 10L  S4       
-         9        990 33101  20773 10R  S4       
-         9        991 33101  20694 10L  S4       
-         9        992 33101  20768 10R  S4       
-         9        993 33101  20699 10L  S4       
-         9        994 33101  20763 10R  S4       
-         9        995 33101  20704 10L  S4       
-         9        996 33101  20758 10R  S4       
-         9        997 33101  18140 10L  S3       
-         9        998 33101   9858 10R  P6       
-         9        999 33101  18120 10L  S3       
-         9       1000 33101  18223 10R  S3       
-         9       1001 33101  20850 11L  S4       
-         9       1002 33101  20945 11R  S4       
-         9       1003 33101  20852 11L  S4       
-         9       1004 33101  20967 11R  S4       
-         9       1005 33101  20843 11L  S4       
-         9       1006 33101  20985 11R  S4       
-         9       1007 33101  20856 11L  S4       
-         9       1008 33101  20970 11R  S4       
-         9       1009 33101  20878 11L  S4       
-         9       1010 33101  20978 11R  S4       
-         9       1011 33101  20873 11L  S4       
-         9       1012 33101  20955 11R  S4       
-         9       1013 33101  20868 11L  S4       
-         9       1014 33101  20948 11R  S4       
-         9       1015 33101  20863 11L  S4       
-         9       1016 33101  20940 11R  S4       
-         9       1017 33101  20858 11L  S4       
-         9       1018 33101  20965 11R  S4       
-         9       1019 33101  18278 11L  S3       
-         9       1020 33101  18328 11R  P8       
-         9       1021 33101  20851 11L  S4       
-         9       1022 33101  20946 11R  S4       
-         9       1023 33101  20853 11L  S4       
-         9       1024 33101  18353 11R  P8       
-         9       1025 33101  20844 11L  S4       
-         9       1026 33101  20986 11R  S4       
-         9       1027 33101  20857 11L  S4       
-         9       1028 33101  20972 11R  S4       
-         9       1029 33101  20879 11L  S4       
-         9       1030 33101  20981 11R  S4       
-         9       1031 33101  20874 11L  S4       
-         9       1032 33101  20956 11R  S4       
-         9       1033 33101  20869 11L  S4       
-         9       1034 33101  20949 11R  S4       
-         9       1035 33101  20864 11L  S4       
-         9       1036 33101  20941 11R  S4       
-         9       1037 33101  20859 11L  S4       
-         9       1038 33101  20966 11R  S4       
-         9       1039 33101  18279 11L  S3       
-         9       1040 33101  18329 11R  P8       
-         9       1041 33101  20854 11L  S4       
-         9       1042 33101  20950 11R  S4       
-         9       1043 33101  20867 11L  S4       
-         9       1044 33101  18354 11R  P8       
-         9       1045 33101  20845 11L  S4       
-         9       1046 33101  20987 11R  S4       
-         9       1047 33101  20884 11L  S4       
-         9       1048 33101  20974 11R  S4       
-         9       1049 33101  20880 11L  S4       
-         9       1050 33101  20982 11R  S4       
-         9       1051 33101  20875 11L  S4       
-         9       1052 33101  20957 11R  S4       
-         9       1053 33101  20870 11L  S4       
-         9       1054 33101  20951 11R  S4       
-         9       1055 33101  20865 11L  S4       
-         9       1056 33101  20942 11R  S4       
-         9       1057 33101  20860 11L  S4       
-         9       1058 33101  20968 11R  S4       
-         9       1059 33101  18285 11L  S3       
-         9       1060 33101  18330 11R  P8       
-         9       1061 33101  20888 11L  S4       
-         9       1062 33101  20954 11R  S4       
-         9       1063 33101  20883 11L  S4       
-         9       1064 33101  14959 11R  S2       
-         9       1065 33101  20848 11L  S4       
-         9       1066 33101  20988 11R  S4       
-         9       1067 33101  20886 11L  S4       
-         9       1068 33101  20975 11R  S4       
-         9       1069 33101  20881 11L  S4       
-         9       1070 33101  20983 11R  S4       
-         9       1071 33101  20876 11L  S4       
-         9       1072 33101  20958 11R  S4       
-         9       1073 33101  20871 11L  S4       
-         9       1074 33101  20952 11R  S4       
-         9       1075 33101  20866 11L  S4       
-         9       1076 33101  20943 11R  S4       
-         9       1077 33101  20861 11L  S4       
-         9       1078 33101  20969 11R  S4       
-         9       1079 33101  18292 11L  S3       
-         9       1080 33101  18331 11R  P8       
-         9       1081 33101  20889 11L  S4       
-         9       1082 33101  20979 11R  S4       
-         9       1083 33101  20885 11L  S4       
-         9       1084 33101  14960 11R  S2       
-         9       1085 33101  20849 11L  S4       
-         9       1086 33101  20989 11R  S4       
-         9       1087 33101  20887 11L  S4       
-         9       1088 33101  20976 11R  S4       
-         9       1089 33101  20882 11L  S4       
-         9       1090 33101  20984 11R  S4       
-         9       1091 33101  20877 11L  S4       
-         9       1092 33101  20959 11R  S4       
-         9       1093 33101  20872 11L  S4       
-         9       1094 33101  20953 11R  S4       
-         9       1095 33101  20855 11L  S4       
-         9       1096 33101  20944 11R  S4       
-         9       1097 33101  20862 11L  S4       
-         9       1098 33101  14958 11R  S2       
-         9       1099 33101  18297 11L  S3       
-         9       1100 33101  18339 11R  P8       
-         9       1101 33101  21078 12L  S4       
-         9       1102 33101  21173 12R  S4       
-         9       1103 33101  21057 12L  S4       
-         9       1104 33101  21168 12R  S4       
-         9       1105 33101  21038 12L  S4       
-         9       1106 33101  21163 12R  S4       
-         9       1107 33101  21033 12L  S4       
-         9       1108 33101  21158 12R  S4       
-         9       1109 33101  21053 12L  S4       
-         9       1110 33101  21153 12R  S4       
-         9       1111 33101  21068 12L  S4       
-         9       1112 33101  21148 12R  S4       
-         9       1113 33101  21063 12L  S4       
-         9       1114 33101  21143 12R  S4       
-         9       1115 33101  21058 12L  S4       
-         9       1116 33101  21138 12R  S4       
-         9       1117 33101  21048 12L  S4       
-         9       1118 33101  21128 12R  S4       
-         9       1119 33101  21043 12L  S4       
-         9       1120 33101  18556 12R  P8       
-         9       1121 33101  21079 12L  S4       
-         9       1122 33101  21174 12R  S4       
-         9       1123 33101  21071 12L  S4       
-         9       1124 33101  21169 12R  S4       
-         9       1125 33101  21039 12L  S4       
-         9       1126 33101  21164 12R  S4       
-         9       1127 33101  21034 12L  S4       
-         9       1128 33101  21159 12R  S4       
-         9       1129 33101  21054 12L  S4       
-         9       1130 33101  21154 12R  S4       
-         9       1131 33101  21069 12L  S4       
-         9       1132 33101  21149 12R  S4       
-         9       1133 33101  21064 12L  S4       
-         9       1134 33101  21144 12R  S4       
-         9       1135 33101  21059 12L  S4       
-         9       1136 33101  21134 12R  S4       
-         9       1137 33101  21049 12L  S4       
-         9       1138 33101  21129 12R  S4       
-         9       1139 33101  21044 12L  S4       
-         9       1140 33101  18562 12R  P8       
-         9       1141 33101  21080 12L  S4       
-         9       1142 33101  21175 12R  S4       
-         9       1143 33101  21075 12L  S4       
-         9       1144 33101  21170 12R  S4       
-         9       1145 33101  21040 12L  S4       
-         9       1146 33101  21165 12R  S4       
-         9       1147 33101  21035 12L  S4       
-         9       1148 33101  21160 12R  S4       
-         9       1149 33101  21055 12L  S4       
-         9       1150 33101  21155 12R  S4       
-         9       1151 33101  21070 12L  S4       
-         9       1152 33101  21150 12R  S4       
-         9       1153 33101  21065 12L  S4       
-         9       1154 33101  21145 12R  S4       
-         9       1155 33101  21060 12L  S4       
-         9       1156 33101  21135 12R  S4       
-         9       1157 33101  21050 12L  S4       
-         9       1158 33101  21130 12R  S4       
-         9       1159 33101  21045 12L  S4       
-         9       1160 33101  18567 12R  P8       
-         9       1161 33101  21081 12L  S4       
-         9       1162 33101  21176 12R  S4       
-         9       1163 33101  21076 12L  S4       
-         9       1164 33101  21171 12R  S4       
-         9       1165 33101  21041 12L  S4       
-         9       1166 33101  21166 12R  S4       
-         9       1167 33101  21036 12L  S4       
-         9       1168 33101  21161 12R  S4       
-         9       1169 33101  21056 12L  S4       
-         9       1170 33101  21156 12R  S4       
-         9       1171 33101  21072 12L  S4       
-         9       1172 33101  21151 12R  S4       
-         9       1173 33101  21066 12L  S4       
-         9       1174 33101  21146 12R  S4       
-         9       1175 33101  21061 12L  S4       
-         9       1176 33101  21136 12R  S4       
-         9       1177 33101  21051 12L  S4       
-         9       1178 33101  21131 12R  S4       
-         9       1179 33101  21046 12L  S4       
-         9       1180 33101  18573 12R  P8       
-         9       1181 33101  14964 12L  S2       
-         9       1182 33101  21177 12R  S4       
-         9       1183 33101  21077 12L  S4       
-         9       1184 33101  21172 12R  S4       
-         9       1185 33101  21042 12L  S4       
-         9       1186 33101  21167 12R  S4       
-         9       1187 33101  21037 12L  S4       
-         9       1188 33101  21162 12R  S4       
-         9       1189 33101  21074 12L  S4       
-         9       1190 33101  21157 12R  S4       
-         9       1191 33101  21073 12L  S4       
-         9       1192 33101  21152 12R  S4       
-         9       1193 33101  21067 12L  S4       
-         9       1194 33101  21147 12R  S4       
-         9       1195 33101  21062 12L  S4       
-         9       1196 33101  21137 12R  S4       
-         9       1197 33101  21052 12L  S4       
-         9       1198 33101  21132 12R  S4       
-         9       1199 33101  21047 12L  S4       
-         9       1200 33101  18574 12R  P8       
-         9       1201 33101  21222 13L  S4       
-         9       1202 33101  21347 13R  S4       
-         9       1203 33101  21247 13L  S4       
-         9       1204 33101  21353 13R  S4       
-         9       1205 33101  21256 13L  S4       
-         9       1206 33101  21361 13R  S4       
-         9       1207 33101  21267 13L  S4       
-         9       1208 33101  21362 13R  S4       
-         9       1209 33101  21262 13L  S4       
-         9       1210 33101  21340 13R  S4       
-         9       1211 33101  21257 13L  S4       
-         9       1212 33101  21317 13R  S4       
-         9       1213 33101  21250 13L  S4       
-         9       1214 33101  21332 13R  S4       
-         9       1215 33101  21237 13L  S4       
-         9       1216 33101  21327 13R  S4       
-         9       1217 33101  21232 13L  S4       
-         9       1218 33101  21322 13R  S4       
-         9       1219 33101  21227 13L  S4       
-         9       1220 33101  18779 13R  P8       
-         9       1221 33101  21223 13L  S4       
-         9       1222 33101  21348 13R  S4       
-         9       1223 33101  21248 13L  S4       
-         9       1224 33101  21354 13R  S4       
-         9       1225 33101  21272 13L  S4       
-         9       1226 33101  21368 13R  S4       
-         9       1227 33101  21268 13L  S4       
-         9       1228 33101  21363 13R  S4       
-         9       1229 33101  21263 13L  S4       
-         9       1230 33101  21341 13R  S4       
-         9       1231 33101  21258 13L  S4       
-         9       1232 33101  21319 13R  S4       
-         9       1233 33101  21251 13L  S4       
-         9       1234 33101  21333 13R  S4       
-         9       1235 33101  21238 13L  S4       
-         9       1236 33101  21328 13R  S4       
-         9       1237 33101  21233 13L  S4       
-         9       1238 33101  21323 13R  S4       
-         9       1239 33101  21228 13L  S4       
-         9       1240 33101  18788 13R  P8       
-         9       1241 33101  21226 13L  S4       
-         9       1242 33101  21349 13R  S4       
-         9       1243 33101  21249 13L  S4       
-         9       1244 33101  21355 13R  S4       
-         9       1245 33101  21273 13L  S4       
-         9       1246 33101  21369 13R  S4       
-         9       1247 33101  21269 13L  S4       
-         9       1248 33101  21364 13R  S4       
-         9       1249 33101  21264 13L  S4       
-         9       1250 33101  21344 13R  S4       
-         9       1251 33101  21259 13L  S4       
-         9       1252 33101  21320 13R  S4       
-         9       1253 33101  21252 13L  S4       
-         9       1254 33101  21334 13R  S4       
-         9       1255 33101  21239 13L  S4       
-         9       1256 33101  21329 13R  S4       
-         9       1257 33101  21234 13L  S4       
-         9       1258 33101  21324 13R  S4       
-         9       1259 33101  21229 13L  S4       
-         9       1260 33101  18790 13R  P8       
-         9       1261 33101  21242 13L  S4       
-         9       1262 33101  21350 13R  S4       
-         9       1263 33101  21255 13L  S4       
-         9       1264 33101  21356 13R  S4       
-         9       1265 33101  21275 13L  S4       
-         9       1266 33101  21370 13R  S4       
-         9       1267 33101  21270 13L  S4       
-         9       1268 33101  21365 13R  S4       
-         9       1269 33101  21265 13L  S4       
-         9       1270 33101  21345 13R  S4       
-         9       1271 33101  21260 13L  S4       
-         9       1272 33101  21321 13R  S4       
-         9       1273 33101  21253 13L  S4       
-         9       1274 33101  21335 13R  S4       
-         9       1275 33101  21240 13L  S4       
-         9       1276 33101  21330 13R  S4       
-         9       1277 33101  21235 13L  S4       
-         9       1278 33101  21325 13R  S4       
-         9       1279 33101  21230 13L  S4       
-         9       1280 33101  18795 13R  P8       
-         9       1281 33101  21244 13L  S4       
-         9       1282 33101  21351 13R  S4       
-         9       1283 33101  21274 13L  S4       
-         9       1284 33101  21358 13R  S4       
-         9       1285 33101  21276 13L  S4       
-         9       1286 33101  21371 13R  S4       
-         9       1287 33101  21271 13L  S4       
-         9       1288 33101  21366 13R  S4       
-         9       1289 33101  21266 13L  S4       
-         9       1290 33101  21346 13R  S4       
-         9       1291 33101  21261 13L  S4       
-         9       1292 33101  21337 13R  S4       
-         9       1293 33101  21254 13L  S4       
-         9       1294 33101  21336 13R  S4       
-         9       1295 33101  21241 13L  S4       
-         9       1296 33101  21331 13R  S4       
-         9       1297 33101  21236 13L  S4       
-         9       1298 33101  21326 13R  S4       
-         9       1299 33101  21231 13L  S4       
-         9       1300 33101  18796 13R  P8       
-         9       1301 33101  19147 14L  S4       
-         9       1302 33101  19195 14R  S4       
-         9       1303 33101  19388 14L  S4       
-         9       1304 33101  19202 14R  S4       
-         9       1305 33101  19395 14L  S4       
-         9       1306 33101  19209 14R  S4       
-         9       1307 33101  19401 14L  S4       
-         9       1308 33101  19215 14R  S4       
-         9       1309 33101  19434 14L  S4       
-         9       1310 33101  19221 14R  S4       
-         9       1311 33101  19446 14L  S4       
-         9       1312 33101  19227 14R  S4       
-         9       1313 33101  19453 14L  S4       
-         9       1314 33101  19232 14R  S4       
-         9       1315 33101  19461 14L  S4       
-         9       1316 33101  19238 14R  S4       
-         9       1317 33101  21418 14L  P9       
-         9       1318 33101  19243 14R  S4       
-         9       1319 33101  17071 14L  S3       
-         9       1320 33101  19251 14R  S4       
-         9       1321 33101  19347 14L  S4       
-         9       1322 33101  19197 14R  S4       
-         9       1323 33101  19390 14L  S4       
-         9       1324 33101  19205 14R  S4       
-         9       1325 33101  19397 14L  S4       
-         9       1326 33101  19210 14R  S4       
-         9       1327 33101  19402 14L  S4       
-         9       1328 33101  19217 14R  S4       
-         9       1329 33101  19435 14L  S4       
-         9       1330 33101  19222 14R  S4       
-         9       1331 33101  19447 14L  S4       
-         9       1332 33101  19228 14R  S4       
-         9       1333 33101  19454 14L  S4       
-         9       1334 33101  19233 14R  S4       
-         9       1335 33101  19463 14L  S4       
-         9       1336 33101  19239 14R  S4       
-         9       1337 33101  12365 14L  S1       
-         9       1338 33101  19246 14R  S4       
-         9       1339 33101  17076 14L  S3       
-         9       1340 33101  19252 14R  S4       
-         9       1341 33101  19384 14L  S4       
-         9       1342 33101  19198 14R  S4       
-         9       1343 33101  19392 14L  S4       
-         9       1344 33101  19206 14R  S4       
-         9       1345 33101  19398 14L  S4       
-         9       1346 33101  19211 14R  S4       
-         9       1347 33101  19405 14L  S4       
-         9       1348 33101  19218 14R  S4       
-         9       1349 33101  19437 14L  S4       
-         9       1350 33101  19223 14R  S4       
-         9       1351 33101  19448 14L  S4       
-         9       1352 33101  19229 14R  S4       
-         9       1353 33101  19455 14L  S4       
-         9       1354 33101  19234 14R  S4       
-         9       1355 33101  19464 14L  S4       
-         9       1356 33101  19240 14R  S4       
-         9       1357 33101  12388 14L  S1       
-         9       1358 33101  19247 14R  S4       
-         9       1359 33101  17081 14L  S3       
-         9       1360 33101  19253 14R  S4       
-         9       1361 33101  19385 14L  S4       
-         9       1362 33101  19199 14R  S4       
-         9       1363 33101  19393 14L  S4       
-         9       1364 33101  19207 14R  S4       
-         9       1365 33101  19399 14L  S4       
-         9       1366 33101  19213 14R  S4       
-         9       1367 33101  19431 14L  S4       
-         9       1368 33101  19219 14R  S4       
-         9       1369 33101  19438 14L  S4       
-         9       1370 33101  19225 14R  S4       
-         9       1371 33101  19449 14L  S4       
-         9       1372 33101  19230 14R  S4       
-         9       1373 33101  19456 14L  S4       
-         9       1374 33101  19235 14R  S4       
-         9       1375 33101  19465 14L  S4       
-         9       1376 33101  19241 14R  S4       
-         9       1377 33101  17068 14L  S3       
-         9       1378 33101  19248 14R  S4       
-         9       1379 33101  18415 14L  P8       
-         9       1380 33101  19254 14R  S4       
-         9       1381 33101  19387 14L  S4       
-         9       1382 33101  19201 14R  S4       
-         9       1383 33101  19394 14L  S4       
-         9       1384 33101  19208 14R  S4       
-         9       1385 33101  19400 14L  S4       
-         9       1386 33101  19214 14R  S4       
-         9       1387 33101  19432 14L  S4       
-         9       1388 33101  19220 14R  S4       
-         9       1389 33101  19443 14L  S4       
-         9       1390 33101  19226 14R  S4       
-         9       1391 33101  19452 14L  S4       
-         9       1392 33101  19231 14R  S4       
-         9       1393 33101  19460 14L  S4       
-         9       1394 33101  19237 14R  S4       
-         9       1395 33101  19466 14L  S4       
-         9       1396 33101  19242 14R  S4       
-         9       1397 33101  17070 14L  S3       
-         9       1398 33101  19250 14R  S4       
-         9       1399 33101  19440 14L  S4       
-         9       1400 33101  19255 14R  S4       
-         9       1401 33101  19542 15L  S4       
-         9       1402 33101  19627 15R  S4       
-         9       1403 33101  19550 15L  S4       
-         9       1404 33101  19646 15R  S4       
-         9       1405 33101  19555 15L  S4       
-         9       1406 33101  19653 15R  S4       
-         9       1407 33101  19561 15L  S4       
-         9       1408 33101  19658 15R  S4       
-         9       1409 33101  19568 15L  S4       
-         9       1410 33101  19664 15R  S4       
-         9       1411 33101  19574 15L  S4       
-         9       1412 33101  19670 15R  S4       
-         9       1413 33101  19582 15L  S4       
-         9       1414 33101  19676 15R  S4       
-         9       1415 33101  19588 15L  S4       
-         9       1416 33101  19681 15R  S4       
-         9       1417 33101  19599 15L  S4       
-         9       1418 33101  19688 15R  S4       
-         9       1419 33101  19604 15L  S4       
-         9       1420 33101  19693 15R  S4       
-         9       1421 33101  19544 15L  S4       
-         9       1422 33101  19642 15R  S4       
-         9       1423 33101  19551 15L  S4       
-         9       1424 33101  19650 15R  S4       
-         9       1425 33101  19556 15L  S4       
-         9       1426 33101  19654 15R  S4       
-         9       1427 33101  19563 15L  S4       
-         9       1428 33101  19659 15R  S4       
-         9       1429 33101  19569 15L  S4       
-         9       1430 33101  19665 15R  S4       
-         9       1431 33101  19575 15L  S4       
-         9       1432 33101  19671 15R  S4       
-         9       1433 33101  19583 15L  S4       
-         9       1434 33101  19677 15R  S4       
-         9       1435 33101  19592 15L  S4       
-         9       1436 33101  19683 15R  S4       
-         9       1437 33101  19600 15L  S4       
-         9       1438 33101  19689 15R  S4       
-         9       1439 33101  19605 15L  S4       
-         9       1440 33101  19694 15R  S4       
-         9       1441 33101  19545 15L  S4       
-         9       1442 33101  19643 15R  S4       
-         9       1443 33101  19552 15L  S4       
-         9       1444 33101  19647 15R  S4       
-         9       1445 33101  19557 15L  S4       
-         9       1446 33101  19655 15R  S4       
-         9       1447 33101  19565 15L  S4       
-         9       1448 33101  19660 15R  S4       
-         9       1449 33101  19570 15L  S4       
-         9       1450 33101  19667 15R  S4       
-         9       1451 33101  19576 15L  S4       
-         9       1452 33101  19672 15R  S4       
-         9       1453 33101  19584 15L  S4       
-         9       1454 33101  19678 15R  S4       
-         9       1455 33101  19596 15L  S4       
-         9       1456 33101  19684 15R  S4       
-         9       1457 33101  19601 15L  S4       
-         9       1458 33101  19690 15R  S4       
-         9       1459 33101  19606 15L  S4       
-         9       1460 33101  19696 15R  S4       
-         9       1461 33101  19546 15L  S4       
-         9       1462 33101  19644 15R  S4       
-         9       1463 33101  19553 15L  S4       
-         9       1464 33101  19648 15R  S4       
-         9       1465 33101  19558 15L  S4       
-         9       1466 33101  19656 15R  S4       
-         9       1467 33101  19566 15L  S4       
-         9       1468 33101  19661 15R  S4       
-         9       1469 33101  19571 15L  S4       
-         9       1470 33101  19668 15R  S4       
-         9       1471 33101  19579 15L  S4       
-         9       1472 33101  19674 15R  S4       
-         9       1473 33101  19585 15L  S4       
-         9       1474 33101  19679 15R  S4       
-         9       1475 33101  19597 15L  S4       
-         9       1476 33101  19685 15R  S4       
-         9       1477 33101  19602 15L  S4       
-         9       1478 33101  19691 15R  S4       
-         9       1479 33101  19607 15L  S4       
-         9       1480 33101  19697 15R  S4       
-         9       1481 33101  19548 15L  S4       
-         9       1482 33101  19645 15R  S4       
-         9       1483 33101  19554 15L  S4       
-         9       1484 33101  19651 15R  S4       
-         9       1485 33101  19559 15L  S4       
-         9       1486 33101  19657 15R  S4       
-         9       1487 33101  19567 15L  S4       
-         9       1488 33101  19663 15R  S4       
-         9       1489 33101  19573 15L  S4       
-         9       1490 33101  19669 15R  S4       
-         9       1491 33101  19580 15L  S4       
-         9       1492 33101  19675 15R  S4       
-         9       1493 33101  19586 15L  S4       
-         9       1494 33101  19680 15R  S4       
-         9       1495 33101  19598 15L  S4       
-         9       1496 33101  19687 15R  S4       
-         9       1497 33101  19603 15L  S4       
-         9       1498 33101  19692 15R  S4       
-         9       1499 33101  19608 15L  S4       
-         9       1500 33101  19698 15R  S4       
-         9       1501 33101  19770 16L  S4       
-         9       1502 33101  19930 16R  S4       
-         9       1503 33101  19804 16L  S4       
-         9       1504 33101  19937 16R  S4       
-         9       1505 33101  19812 16L  S4       
-         9       1506 33101  19943 16R  S4       
-         9       1507 33101  19824 16L  S4       
-         9       1508 33101  19950 16R  S4       
-         9       1509 33101  19835 16L  S4       
-         9       1510 33101  19955 16R  S4       
-         9       1511 33101  19841 16L  S4       
-         9       1512 33101  18430 16R  P8       
-         9       1513 33101  19848 16L  S4       
-         9       1514 33101  19966 16R  S4       
-         9       1515 33101  19854 16L  S4       
-         9       1516 33101  19973 16R  S4       
-         9       1517 33101  19864 16L  S4       
-         9       1518 33101  19978 16R  S4       
-         9       1519 33101  19870 16L  S4       
-         9       1520 33101  19983 16R  S4       
-         9       1521 33101  19796 16L  S4       
-         9       1522 33101  19931 16R  S4       
-         9       1523 33101  19806 16L  S4       
-         9       1524 33101  19938 16R  S4       
-         9       1525 33101  19814 16L  S4       
-         9       1526 33101  19944 16R  S4       
-         9       1527 33101  19825 16L  S4       
-         9       1528 33101  19951 16R  S4       
-         9       1529 33101  19836 16L  S4       
-         9       1530 33101  19957 16R  S4       
-         9       1531 33101  19842 16L  S4       
-         9       1532 33101  19962 16R  S4       
-         9       1533 33101  19849 16L  S4       
-         9       1534 33101  19968 16R  S4       
-         9       1535 33101  19855 16L  S4       
-         9       1536 33101  19974 16R  S4       
-         9       1537 33101  19865 16L  S4       
-         9       1538 33101  19979 16R  S4       
-         9       1539 33101  19872 16L  S4       
-         9       1540 33101  19984 16R  S4       
-         9       1541 33101  19799 16L  S4       
-         9       1542 33101  19932 16R  S4       
-         9       1543 33101  19808 16L  S4       
-         9       1544 33101  19939 16R  S4       
-         9       1545 33101  19816 16L  S4       
-         9       1546 33101  19945 16R  S4       
-         9       1547 33101  19827 16L  S4       
-         9       1548 33101  19952 16R  S4       
-         9       1549 33101  19837 16L  S4       
-         9       1550 33101  19958 16R  S4       
-         9       1551 33101  19844 16L  S4       
-         9       1552 33101  19963 16R  S4       
-         9       1553 33101  19851 16L  S4       
-         9       1554 33101  19969 16R  S4       
-         9       1555 33101  19856 16L  S4       
-         9       1556 33101  19975 16R  S4       
-         9       1557 33101  19866 16L  S4       
-         9       1558 33101  19980 16R  S4       
-         9       1559 33101  21430 16L  P9       
-         9       1560 33101  19985 16R  S4       
-         9       1561 33101  19800 16L  S4       
-         9       1562 33101  19934 16R  S4       
-         9       1563 33101  19809 16L  S4       
-         9       1564 33101  19941 16R  S4       
-         9       1565 33101  19818 16L  S4       
-         9       1566 33101  19946 16R  S4       
-         9       1567 33101  19832 16L  S4       
-         9       1568 33101  19953 16R  S4       
-         9       1569 33101  19838 16L  S4       
-         9       1570 33101  19959 16R  S4       
-         9       1571 33101  19845 16L  S4       
-         9       1572 33101  19964 16R  S4       
-         9       1573 33101  19852 16L  S4       
-         9       1574 33101  19970 16R  S4       
-         9       1575 33101  19860 16L  S4       
-         9       1576 33101  19976 16R  S4       
-         9       1577 33101  19868 16L  S4       
-         9       1578 33101  19981 16R  S4       
-         9       1579 33101  19830 16L  S4       
-         9       1580 33101  19986 16R  S4       
-         9       1581 33101  19801 16L  S4       
-         9       1582 33101  19936 16R  S4       
-         9       1583 33101  19811 16L  S4       
-         9       1584 33101  19942 16R  S4       
-         9       1585 33101  19823 16L  S4       
-         9       1586 33101  19948 16R  S4       
-         9       1587 33101  19834 16L  S4       
-         9       1588 33101  19954 16R  S4       
-         9       1589 33101  19839 16L  S4       
-         9       1590 33101  19960 16R  S4       
-         9       1591 33101  19846 16L  S4       
-         9       1592 33101  19965 16R  S4       
-         9       1593 33101  19853 16L  S4       
-         9       1594 33101  19971 16R  S4       
-         9       1595 33101  19861 16L  S4       
-         9       1596 33101  19977 16R  S4       
-         9       1597 33101  19869 16L  S4       
-         9       1598 33101  19982 16R  S4       
-         9       1599 33101  21432 16L  P9       
-         9       1600 33101  19987 16R  S4       
-         9       1601 33101  20088 17L  S4       
-         9       1602 33101  20202 17R  S4       
-         9       1603 33101  20096 17L  S4       
-         9       1604 33101  20208 17R  S4       
-         9       1605 33101  20104 17L  S4       
-         9       1606 33101  20218 17R  S4       
-         9       1607 33101  20114 17L  S4       
-         9       1608 33101  20227 17R  S4       
-         9       1609 33101  20122 17L  S4       
-         9       1610 33101  20232 17R  S4       
-         9       1611 33101  20130 17L  S4       
-         9       1612 33101  17609 17R  S3       
-         9       1613 33101  20141 17L  S4       
-         9       1614 33101  20241 17R  S4       
-         9       1615 33101  21443 17L  P9       
-         9       1616 33101  20246 17R  S4       
-         9       1617 33101  21452 17L  P9       
-         9       1618 33101  20251 17R  S4       
-         9       1619 33101  21458 17L  P9       
-         9       1620 33101  20257 17R  S4       
-         9       1621 33101  20090 17L  S4       
-         9       1622 33101  20204 17R  S4       
-         9       1623 33101  20098 17L  S4       
-         9       1624 33101  20210 17R  S4       
-         9       1625 33101  20107 17L  S4       
-         9       1626 33101  20222 17R  S4       
-         9       1627 33101  20116 17L  S4       
-         9       1628 33101  20228 17R  S4       
-         9       1629 33101  20123 17L  S4       
-         9       1630 33101  20233 17R  S4       
-         9       1631 33101  20131 17L  S4       
-         9       1632 33101  20173 17R  S4       
-         9       1633 33101  20144 17L  S4       
-         9       1634 33101  20242 17R  S4       
-         9       1635 33101  21444 17L  P9       
-         9       1636 33101  20247 17R  S4       
-         9       1637 33101  21453 17L  P9       
-         9       1638 33101  20252 17R  S4       
-         9       1639 33101  21459 17L  P9       
-         9       1640 33101  20259 17R  S4       
-         9       1641 33101  20093 17L  S4       
-         9       1642 33101  20205 17R  S4       
-         9       1643 33101  20099 17L  S4       
-         9       1644 33101  20211 17R  S4       
-         9       1645 33101  20110 17L  S4       
-         9       1646 33101  20223 17R  S4       
-         9       1647 33101  20118 17L  S4       
-         9       1648 33101  20229 17R  S4       
-         9       1649 33101  20127 17L  S4       
-         9       1650 33101  20234 17R  S4       
-         9       1651 33101  20134 17L  S4       
-         9       1652 33101  20238 17R  S4       
-         9       1653 33101  21437 17L  P9       
-         9       1654 33101  20243 17R  S4       
-         9       1655 33101  21447 17L  P9       
-         9       1656 33101  20248 17R  S4       
-         9       1657 33101  21454 17L  P9       
-         9       1658 33101  20253 17R  S4       
-         9       1659 33101  20084 17L  S4       
-         9       1660 33101  20261 17R  S4       
-         9       1661 33101  20094 17L  S4       
-         9       1662 33101  20206 17R  S4       
-         9       1663 33101  20101 17L  S4       
-         9       1664 33101  20216 17R  S4       
-         9       1665 33101  20111 17L  S4       
-         9       1666 33101  20225 17R  S4       
-         9       1667 33101  20119 17L  S4       
-         9       1668 33101  20230 17R  S4       
-         9       1669 33101  20128 17L  S4       
-         9       1670 33101  20235 17R  S4       
-         9       1671 33101  20138 17L  S4       
-         9       1672 33101  20239 17R  S4       
-         9       1673 33101  21440 17L  P9       
-         9       1674 33101  20244 17R  S4       
-         9       1675 33101  21449 17L  P9       
-         9       1676 33101  20249 17R  S4       
-         9       1677 33101  21456 17L  P9       
-         9       1678 33101  20254 17R  S4       
-         9       1679 33101  20070 17L  S4       
-         9       1680 33101  20265 17R  S4       
-         9       1681 33101  20095 17L  S4       
-         9       1682 33101  20207 17R  S4       
-         9       1683 33101  20103 17L  S4       
-         9       1684 33101  20217 17R  S4       
-         9       1685 33101  20113 17L  S4       
-         9       1686 33101  20226 17R  S4       
-         9       1687 33101  20120 17L  S4       
-         9       1688 33101  20231 17R  S4       
-         9       1689 33101  20129 17L  S4       
-         9       1690 33101  20237 17R  S4       
-         9       1691 33101  20139 17L  S4       
-         9       1692 33101  20240 17R  S4       
-         9       1693 33101  21442 17L  P9       
-         9       1694 33101  20245 17R  S4       
-         9       1695 33101  21451 17L  P9       
-         9       1696 33101  20250 17R  S4       
-         9       1697 33101  21457 17L  P9       
-         9       1698 33101  20256 17R  S4       
-         9       1699 33101  21438 17L  P9       
-         9       1700 33101  20266 17R  S4       
-        10          1 33101  15913 1L   S3       
-        10          2 33101  16071 1R   S3       
-        10          3 33101  15918 1L   S3       
-        10          4 33101  16078 1R   S3       
-        10          5 33101  15923 1L   S3       
-        10          6 33101  16083 1R   S3       
-        10          7 33101  15929 1L   S3       
-        10          8 33101  16088 1R   S3       
-        10          9 33101  15934 1L   S3       
-        10         10 33101  16093 1R   S3       
-        10         11 33101  15939 1L   S3       
-        10         12 33101  16098 1R   S3       
-        10         13 33101  15944 1L   S3       
-        10         14 33101  16103 1R   S3       
-        10         15 33101  15949 1L   S3       
-        10         16 33101  16109 1R   S3       
-        10         17 33101  15954 1L   S3       
-        10         18 33101  16114 1R   S3       
-        10         19 33101  15961 1L   S3       
-        10         20 33101  16119 1R   S3       
-        10         21 33101  15914 1L   S3       
-        10         22 33101  16074 1R   S3       
-        10         23 33101  15919 1L   S3       
-        10         24 33101  16079 1R   S3       
-        10         25 33101  15924 1L   S3       
-        10         26 33101  16084 1R   S3       
-        10         27 33101  15930 1L   S3       
-        10         28 33101  16089 1R   S3       
-        10         29 33101  15935 1L   S3       
-        10         30 33101  16094 1R   S3       
-        10         31 33101  15940 1L   S3       
-        10         32 33101  16099 1R   S3       
-        10         33 33101  15945 1L   S3       
-        10         34 33101  16104 1R   S3       
-        10         35 33101  15950 1L   S3       
-        10         36 33101  16110 1R   S3       
-        10         37 33101  15956 1L   S3       
-        10         38 33101  16115 1R   S3       
-        10         39 33101  15963 1L   S3       
-        10         40 33101  16120 1R   S3       
-        10         41 33101  15915 1L   S3       
-        10         42 33101  16075 1R   S3       
-        10         43 33101  15920 1L   S3       
-        10         44 33101  16080 1R   S3       
-        10         45 33101  15925 1L   S3       
-        10         46 33101  16085 1R   S3       
-        10         47 33101  15931 1L   S3       
-        10         48 33101  16090 1R   S3       
-        10         49 33101  15936 1L   S3       
-        10         50 33101  16095 1R   S3       
-        10         51 33101  15941 1L   S3       
-        10         52 33101  16100 1R   S3       
-        10         53 33101  15946 1L   S3       
-        10         54 33101  16105 1R   S3       
-        10         55 33101  15951 1L   S3       
-        10         56 33101  16111 1R   S3       
-        10         57 33101  15957 1L   S3       
-        10         58 33101  16116 1R   S3       
-        10         59 33101  15964 1L   S3       
-        10         60 33101  16121 1R   S3       
-        10         61 33101  15916 1L   S3       
-        10         62 33101  16076 1R   S3       
-        10         63 33101  15921 1L   S3       
-        10         64 33101  16081 1R   S3       
-        10         65 33101  15927 1L   S3       
-        10         66 33101  16086 1R   S3       
-        10         67 33101  15932 1L   S3       
-        10         68 33101  16091 1R   S3       
-        10         69 33101  15937 1L   S3       
-        10         70 33101  16096 1R   S3       
-        10         71 33101  15942 1L   S3       
-        10         72 33101  16101 1R   S3       
-        10         73 33101  15947 1L   S3       
-        10         74 33101  16106 1R   S3       
-        10         75 33101  15952 1L   S3       
-        10         76 33101  16112 1R   S3       
-        10         77 33101  15958 1L   S3       
-        10         78 33101  16117 1R   S3       
-        10         79 33101  15965 1L   S3       
-        10         80 33101  16122 1R   S3       
-        10         81 33101  15917 1L   S3       
-        10         82 33101  16077 1R   S3       
-        10         83 33101  15922 1L   S3       
-        10         84 33101  16082 1R   S3       
-        10         85 33101  15928 1L   S3       
-        10         86 33101  16087 1R   S3       
-        10         87 33101  15933 1L   S3       
-        10         88 33101  16092 1R   S3       
-        10         89 33101  15938 1L   S3       
-        10         90 33101  16097 1R   S3       
-        10         91 33101  15943 1L   S3       
-        10         92 33101  16102 1R   S3       
-        10         93 33101  15948 1L   S3       
-        10         94 33101  16107 1R   S3       
-        10         95 33101  15953 1L   S3       
-        10         96 33101  16113 1R   S3       
-        10         97 33101  15960 1L   S3       
-        10         98 33101  16118 1R   S3       
-        10         99 33101  15966 1L   S3       
-        10        100 33101  16123 1R   S3       
-        10        101 33101  12935 2L   S2       
-        10        102 33101  16255 2R   S3       
-        10        103 33101  16180 2L   S3       
-        10        104 33101  16348 2R   S3       
-        10        105 33101  16241 2L   S3       
-        10        106 33101  16370 2R   S3       
-        10        107 33101  16246 2L   S3       
-        10        108 33101  16375 2R   S3       
-        10        109 33101  16253 2L   S3       
-        10        110 33101  16380 2R   S3       
-        10        111 33101  18802 2L   S4       
-        10        112 33101  16385 2R   S3       
-        10        113 33101  18814 2L   S4       
-        10        114 33101  16390 2R   S3       
-        10        115 33101  18826 2L   S4       
-        10        116 33101  16395 2R   S3       
-        10        117 33101  18835 2L   S4       
-        10        118 33101  16400 2R   S3       
-        10        119 33101  21402 2L   P9       
-        10        120 33101  16405 2R   S3       
-        10        121 33101  16141 2L   S3       
-        10        122 33101  16298 2R   S3       
-        10        123 33101  16192 2L   S3       
-        10        124 33101  16366 2R   S3       
-        10        125 33101  16242 2L   S3       
-        10        126 33101  16371 2R   S3       
-        10        127 33101  16247 2L   S3       
-        10        128 33101  16376 2R   S3       
-        10        129 33101  18827 2L   S4       
-        10        130 33101  16381 2R   S3       
-        10        131 33101  18806 2L   S4       
-        10        132 33101  16386 2R   S3       
-        10        133 33101  18820 2L   S4       
-        10        134 33101  16391 2R   S3       
-        10        135 33101  18828 2L   S4       
-        10        136 33101  16396 2R   S3       
-        10        137 33101  18836 2L   S4       
-        10        138 33101  16401 2R   S3       
-        10        139 33101  21405 2L   P9       
-        10        140 33101  16406 2R   S3       
-        10        141 33101  16148 2L   S3       
-        10        142 33101  16316 2R   S3       
-        10        143 33101  16214 2L   S3       
-        10        144 33101  16367 2R   S3       
-        10        145 33101  16243 2L   S3       
-        10        146 33101  16372 2R   S3       
-        10        147 33101  16249 2L   S3       
-        10        148 33101  16377 2R   S3       
-        10        149 33101  18829 2L   S4       
-        10        150 33101  16382 2R   S3       
-        10        151 33101  18810 2L   S4       
-        10        152 33101  16387 2R   S3       
-        10        153 33101  18821 2L   S4       
-        10        154 33101  16392 2R   S3       
-        10        155 33101  18832 2L   S4       
-        10        156 33101  16397 2R   S3       
-        10        157 33101  10516 2L   S1       
-        10        158 33101  16402 2R   S3       
-        10        159 33101  21408 2L   P9       
-        10        160 33101  16407 2R   S3       
-        10        161 33101  16162 2L   S3       
-        10        162 33101  16317 2R   S3       
-        10        163 33101  16219 2L   S3       
-        10        164 33101  16368 2R   S3       
-        10        165 33101  16244 2L   S3       
-        10        166 33101  16373 2R   S3       
-        10        167 33101  16251 2L   S3       
-        10        168 33101  16378 2R   S3       
-        10        169 33101  18830 2L   S4       
-        10        170 33101  16383 2R   S3       
-        10        171 33101  18811 2L   S4       
-        10        172 33101  16388 2R   S3       
-        10        173 33101  18823 2L   S4       
-        10        174 33101  16393 2R   S3       
-        10        175 33101  18833 2L   S4       
-        10        176 33101  16398 2R   S3       
-        10        177 33101  10584 2L   S1       
-        10        178 33101  16403 2R   S3       
-        10        179 33101  18817 2L   S4       
-        10        180 33101  16408 2R   S3       
-        10        181 33101  16172 2L   S3       
-        10        182 33101  16335 2R   S3       
-        10        183 33101  16239 2L   S3       
-        10        184 33101  16369 2R   S3       
-        10        185 33101  16245 2L   S3       
-        10        186 33101  16374 2R   S3       
-        10        187 33101  16252 2L   S3       
-        10        188 33101  16379 2R   S3       
-        10        189 33101  18831 2L   S4       
-        10        190 33101  16384 2R   S3       
-        10        191 33101  18813 2L   S4       
-        10        192 33101  16389 2R   S3       
-        10        193 33101  18825 2L   S4       
-        10        194 33101  16394 2R   S3       
-        10        195 33101  18834 2L   S4       
-        10        196 33101  16399 2R   S3       
-        10        197 33101  21401 2L   P9       
-        10        198 33101  16404 2R   S3       
-        10        199 33101  18815 2L   S4       
-        10        200 33101  16409 2R   S3       
-        10        201 33101  13070 3L   S2       
-        10        202 33101  16541 3R   S3       
-        10        203 33101  16521 3L   S3       
-        10        204 33101  16572 3R   S3       
-        10        205 33101  18840 3L   S4       
-        10        206 33101  18405 3R   P8       
-        10        207 33101  18848 3L   S4       
-        10        208 33101  18891 3R   S4       
-        10        209 33101  18854 3L   S4       
-        10        210 33101  18897 3R   S4       
-        10        211 33101  18862 3L   S4       
-        10        212 33101  18903 3R   S4       
-        10        213 33101  18868 3L   S4       
-        10        214 33101  18910 3R   S4       
-        10        215 33101  18874 3L   S4       
-        10        216 33101  18915 3R   S4       
-        10        217 33101  18880 3L   S4       
-        10        218 33101  18921 3R   S4       
-        10        219 33101  10714 3L   S1       
-        10        220 33101  18927 3R   S4       
-        10        221 33101  13129 3L   S2       
-        10        222 33101  16554 3R   S3       
-        10        223 33101  16522 3L   S3       
-        10        224 33101  16580 3R   S3       
-        10        225 33101  18842 3L   S4       
-        10        226 33101  18406 3R   P8       
-        10        227 33101  18849 3L   S4       
-        10        228 33101  18893 3R   S4       
-        10        229 33101  18855 3L   S4       
-        10        230 33101  18898 3R   S4       
-        10        231 33101  18863 3L   S4       
-        10        232 33101  18904 3R   S4       
-        10        233 33101  18869 3L   S4       
-        10        234 33101  18911 3R   S4       
-        10        235 33101  18875 3L   S4       
-        10        236 33101  18916 3R   S4       
-        10        237 33101  18882 3L   S4       
-        10        238 33101  18922 3R   S4       
-        10        239 33101  16421 3L   S3       
-        10        240 33101  18928 3R   S4       
-        10        241 33101  16457 3L   S3       
-        10        242 33101  16557 3R   S3       
-        10        243 33101  16523 3L   S3       
-        10        244 33101  16602 3R   S3       
-        10        245 33101  18845 3L   S4       
-        10        246 33101  18407 3R   P8       
-        10        247 33101  18850 3L   S4       
-        10        248 33101  18894 3R   S4       
-        10        249 33101  18856 3L   S4       
-        10        250 33101  18899 3R   S4       
-        10        251 33101  18864 3L   S4       
-        10        252 33101  18906 3R   S4       
-        10        253 33101  18870 3L   S4       
-        10        254 33101  18912 3R   S4       
-        10        255 33101  18876 3L   S4       
-        10        256 33101  18917 3R   S4       
-        10        257 33101  18883 3L   S4       
-        10        258 33101  18923 3R   S4       
-        10        259 33101  16479 3L   S3       
-        10        260 33101  18929 3R   S4       
-        10        261 33101  16487 3L   S3       
-        10        262 33101  16567 3R   S3       
-        10        263 33101  18837 3L   S4       
-        10        264 33101  16623 3R   S3       
-        10        265 33101  18846 3L   S4       
-        10        266 33101  18889 3R   S4       
-        10        267 33101  18851 3L   S4       
-        10        268 33101  18895 3R   S4       
-        10        269 33101  18857 3L   S4       
-        10        270 33101  18901 3R   S4       
-        10        271 33101  18865 3L   S4       
-        10        272 33101  18907 3R   S4       
-        10        273 33101  18872 3L   S4       
-        10        274 33101  18913 3R   S4       
-        10        275 33101  18878 3L   S4       
-        10        276 33101  18918 3R   S4       
-        10        277 33101  18884 3L   S4       
-        10        278 33101  18924 3R   S4       
-        10        279 33101  21409 3L   P9       
-        10        280 33101  18930 3R   S4       
-        10        281 33101  16520 3L   S3       
-        10        282 33101  16569 3R   S3       
-        10        283 33101  18838 3L   S4       
-        10        284 33101  16629 3R   S3       
-        10        285 33101  18847 3L   S4       
-        10        286 33101  18890 3R   S4       
-        10        287 33101  18853 3L   S4       
-        10        288 33101  18896 3R   S4       
-        10        289 33101  18859 3L   S4       
-        10        290 33101  18902 3R   S4       
-        10        291 33101  18867 3L   S4       
-        10        292 33101  18908 3R   S4       
-        10        293 33101  18873 3L   S4       
-        10        294 33101  18914 3R   S4       
-        10        295 33101  18879 3L   S4       
-        10        296 33101  18919 3R   S4       
-        10        297 33101  18886 3L   S4       
-        10        298 33101  18926 3R   S4       
-        10        299 33101  18843 3L   S4       
-        10        300 33101  18932 3R   S4       
-        10        301 33101  16670 4L   S3       
-        10        302 33101  16748 4R   S3       
-        10        303 33101  16739 4L   S3       
-        10        304 33101  16840 4R   S3       
-        10        305 33101  18943 4L   S4       
-        10        306 33101  16845 4R   S3       
-        10        307 33101  18953 4L   S4       
-        10        308 33101  18990 4R   S4       
-        10        309 33101  18959 4L   S4       
-        10        310 33101  18997 4R   S4       
-        10        311 33101  18964 4L   S4       
-        10        312 33101  19002 4R   S4       
-        10        313 33101  18969 4L   S4       
-        10        314 33101  19008 4R   S4       
-        10        315 33101  18974 4L   S4       
-        10        316 33101  19013 4R   S4       
-        10        317 33101  18979 4L   S4       
-        10        318 33101  19018 4R   S4       
-        10        319 33101  18985 4L   S4       
-        10        320 33101  19024 4R   S4       
-        10        321 33101  16683 4L   S3       
-        10        322 33101  16762 4R   S3       
-        10        323 33101  16740 4L   S3       
-        10        324 33101  16841 4R   S3       
-        10        325 33101  18946 4L   S4       
-        10        326 33101  18409 4R   P8       
-        10        327 33101  18952 4L   S4       
-        10        328 33101  18991 4R   S4       
-        10        329 33101  18960 4L   S4       
-        10        330 33101  18998 4R   S4       
-        10        331 33101  18965 4L   S4       
-        10        332 33101  19003 4R   S4       
-        10        333 33101  18970 4L   S4       
-        10        334 33101  19009 4R   S4       
-        10        335 33101  18975 4L   S4       
-        10        336 33101  19014 4R   S4       
-        10        337 33101  18981 4L   S4       
-        10        338 33101  19019 4R   S4       
-        10        339 33101  18987 4L   S4       
-        10        340 33101  19025 4R   S4       
-        10        341 33101  16736 4L   S3       
-        10        342 33101  16837 4R   S3       
-        10        343 33101  18408 4L   P8       
-        10        344 33101  16842 4R   S3       
-        10        345 33101  18947 4L   S4       
-        10        346 33101  18410 4R   P8       
-        10        347 33101  18955 4L   S4       
-        10        348 33101  18994 4R   S4       
-        10        349 33101  18961 4L   S4       
-        10        350 33101  18999 4R   S4       
-        10        351 33101  18966 4L   S4       
-        10        352 33101  19005 4R   S4       
-        10        353 33101  18971 4L   S4       
-        10        354 33101  19010 4R   S4       
-        10        355 33101  18976 4L   S4       
-        10        356 33101  19015 4R   S4       
-        10        357 33101  18982 4L   S4       
-        10        358 33101  19021 4R   S4       
-        10        359 33101  10792 4L   S1       
-        10        360 33101  19027 4R   S4       
-        10        361 33101  16737 4L   S3       
-        10        362 33101  16838 4R   S3       
-        10        363 33101  18938 4L   S4       
-        10        364 33101  16843 4R   S3       
-        10        365 33101  18950 4L   S4       
-        10        366 33101  18988 4R   S4       
-        10        367 33101  18957 4L   S4       
-        10        368 33101  18995 4R   S4       
-        10        369 33101  18962 4L   S4       
-        10        370 33101  19000 4R   S4       
-        10        371 33101  18967 4L   S4       
-        10        372 33101  19006 4R   S4       
-        10        373 33101  18972 4L   S4       
-        10        374 33101  19011 4R   S4       
-        10        375 33101  18977 4L   S4       
-        10        376 33101  19016 4R   S4       
-        10        377 33101  18983 4L   S4       
-        10        378 33101  19022 4R   S4       
-        10        379 33101  10802 4L   S1       
-        10        380 33101  19028 4R   S4       
-        10        381 33101  16738 4L   S3       
-        10        382 33101  16839 4R   S3       
-        10        383 33101  18939 4L   S4       
-        10        384 33101  16844 4R   S3       
-        10        385 33101  18951 4L   S4       
-        10        386 33101  18989 4R   S4       
-        10        387 33101  18958 4L   S4       
-        10        388 33101  18996 4R   S4       
-        10        389 33101  18963 4L   S4       
-        10        390 33101  19001 4R   S4       
-        10        391 33101  18968 4L   S4       
-        10        392 33101  19007 4R   S4       
-        10        393 33101  18973 4L   S4       
-        10        394 33101  19012 4R   S4       
-        10        395 33101  18978 4L   S4       
-        10        396 33101  19017 4R   S4       
-        10        397 33101  18984 4L   S4       
-        10        398 33101  19023 4R   S4       
-        10        399 33101  10839 4L   S1       
-        10        400 33101  19029 4R   S4       
-        10        401 33101  13529 5L   S2       
-        10        402 33101  13625 5R   S2       
-        10        403 33101  16932 5L   S3       
-        10        404 33101  17057 5R   S3       
-        10        405 33101  19043 5L   S4       
-        10        406 33101  18411 5R   P8       
-        10        407 33101  19049 5L   S4       
-        10        408 33101  19098 5R   S4       
-        10        409 33101  19055 5L   S4       
-        10        410 33101  19105 5R   S4       
-        10        411 33101  19062 5L   S4       
-        10        412 33101  19110 5R   S4       
-        10        413 33101  19068 5L   S4       
-        10        414 33101  19115 5R   S4       
-        10        415 33101  19073 5L   S4       
-        10        416 33101  19120 5R   S4       
-        10        417 33101  19080 5L   S4       
-        10        418 33101  19127 5R   S4       
-        10        419 33101  19085 5L   S4       
-        10        420 33101  19132 5R   S4       
-        10        421 33101  13541 5L   S2       
-        10        422 33101  13631 5R   S2       
-        10        423 33101  16933 5L   S3       
-        10        424 33101  17058 5R   S3       
-        10        425 33101  19044 5L   S4       
-        10        426 33101  18412 5R   P8       
-        10        427 33101  19050 5L   S4       
-        10        428 33101  19099 5R   S4       
-        10        429 33101  19056 5L   S4       
-        10        430 33101  19106 5R   S4       
-        10        431 33101  19063 5L   S4       
-        10        432 33101  19111 5R   S4       
-        10        433 33101  19069 5L   S4       
-        10        434 33101  19116 5R   S4       
-        10        435 33101  19075 5L   S4       
-        10        436 33101  19121 5R   S4       
-        10        437 33101  19081 5L   S4       
-        10        438 33101  19128 5R   S4       
-        10        439 33101  19086 5L   S4       
-        10        440 33101  19133 5R   S4       
-        10        441 33101  16867 5L   S3       
-        10        442 33101  13642 5R   S2       
-        10        443 33101  16950 5L   S3       
-        10        444 33101  17059 5R   S3       
-        10        445 33101  19045 5L   S4       
-        10        446 33101  19093 5R   S4       
-        10        447 33101  19052 5L   S4       
-        10        448 33101  19100 5R   S4       
-        10        449 33101  19057 5L   S4       
-        10        450 33101  19107 5R   S4       
-        10        451 33101  19064 5L   S4       
-        10        452 33101  19112 5R   S4       
-        10        453 33101  19070 5L   S4       
-        10        454 33101  19117 5R   S4       
-        10        455 33101  19076 5L   S4       
-        10        456 33101  19122 5R   S4       
-        10        457 33101  19082 5L   S4       
-        10        458 33101  19129 5R   S4       
-        10        459 33101  19092 5L   S4       
-        10        460 33101  19134 5R   S4       
-        10        461 33101  16868 5L   S3       
-        10        462 33101  17054 5R   S3       
-        10        463 33101  16951 5L   S3       
-        10        464 33101  17061 5R   S3       
-        10        465 33101  19047 5L   S4       
-        10        466 33101  19094 5R   S4       
-        10        467 33101  19053 5L   S4       
-        10        468 33101  19102 5R   S4       
-        10        469 33101  19060 5L   S4       
-        10        470 33101  19108 5R   S4       
-        10        471 33101  19065 5L   S4       
-        10        472 33101  19113 5R   S4       
-        10        473 33101  19071 5L   S4       
-        10        474 33101  19118 5R   S4       
-        10        475 33101  19078 5L   S4       
-        10        476 33101  19124 5R   S4       
-        10        477 33101  19083 5L   S4       
-        10        478 33101  19130 5R   S4       
-        10        479 33101  16875 5L   S3       
-        10        480 33101  19136 5R   S4       
-        10        481 33101  16908 5L   S3       
-        10        482 33101  17055 5R   S3       
-        10        483 33101  19040 5L   S4       
-        10        484 33101  17062 5R   S3       
-        10        485 33101  19048 5L   S4       
-        10        486 33101  19096 5R   S4       
-        10        487 33101  19054 5L   S4       
-        10        488 33101  19104 5R   S4       
-        10        489 33101  19061 5L   S4       
-        10        490 33101  19109 5R   S4       
-        10        491 33101  19066 5L   S4       
-        10        492 33101  19114 5R   S4       
-        10        493 33101  19072 5L   S4       
-        10        494 33101  19119 5R   S4       
-        10        495 33101  19079 5L   S4       
-        10        496 33101  19126 5R   S4       
-        10        497 33101  19084 5L   S4       
-        10        498 33101  19131 5R   S4       
-        10        499 33101  21412 5L   P9       
-        10        500 33101  19137 5R   S4       
-        10        501 33101  21524 6L   P9       
-        10        502 33101  21586 6R   P9       
-        10        503 33101  21494 6L   P9       
-        10        504 33101  21581 6R   P9       
-        10        505 33101  21495 6L   P9       
-        10        506 33101  21576 6R   P9       
-        10        507 33101  21502 6L   P9       
-        10        508 33101  21571 6R   P9       
-        10        509 33101  21509 6L   P9       
-        10        510 33101  21566 6R   P9       
-        10        511 33101  21504 6L   P9       
-        10        512 33101  21556 6R   P9       
-        10        513 33101  21529 6L   P9       
-        10        514 33101  21551 6R   P9       
-        10        515 33101  21534 6L   P9       
-        10        516 33101  21546 6R   P9       
-        10        517 33101  21489 6L   P9       
-        10        518 33101  21541 6R   P9       
-        10        519 33101  20297 6L   S4       
-        10        520 33101  20323 6R   S4       
-        10        521 33101  21525 6L   P9       
-        10        522 33101  21587 6R   P9       
-        10        523 33101  21499 6L   P9       
-        10        524 33101  21582 6R   P9       
-        10        525 33101  21496 6L   P9       
-        10        526 33101  21577 6R   P9       
-        10        527 33101  21503 6L   P9       
-        10        528 33101  21572 6R   P9       
-        10        529 33101  21510 6L   P9       
-        10        530 33101  21567 6R   P9       
-        10        531 33101  21505 6L   P9       
-        10        532 33101  21557 6R   P9       
-        10        533 33101  21530 6L   P9       
-        10        534 33101  21552 6R   P9       
-        10        535 33101  21535 6L   P9       
-        10        536 33101  21547 6R   P9       
-        10        537 33101  21490 6L   P9       
-        10        538 33101  21542 6R   P9       
-        10        539 33101  20298 6L   S4       
-        10        540 33101   7519 6R   P2_2     
-        10        541 33101  21526 6L   P9       
-        10        542 33101  21588 6R   P9       
-        10        543 33101  21500 6L   P9       
-        10        544 33101  21583 6R   P9       
-        10        545 33101  21497 6L   P9       
-        10        546 33101  21578 6R   P9       
-        10        547 33101  21514 6L   P9       
-        10        548 33101  21573 6R   P9       
-        10        549 33101  21511 6L   P9       
-        10        550 33101  21568 6R   P9       
-        10        551 33101  21506 6L   P9       
-        10        552 33101  21558 6R   P9       
-        10        553 33101  21531 6L   P9       
-        10        554 33101  21553 6R   P9       
-        10        555 33101  21536 6L   P9       
-        10        556 33101  21548 6R   P9       
-        10        557 33101  21491 6L   P9       
-        10        558 33101  21543 6R   P9       
-        10        559 33101  20299 6L   S4       
-        10        560 33101  20365 6R   S4       
-        10        561 33101  21527 6L   P9       
-        10        562 33101  21589 6R   P9       
-        10        563 33101  21517 6L   P9       
-        10        564 33101  21584 6R   P9       
-        10        565 33101  21498 6L   P9       
-        10        566 33101  21579 6R   P9       
-        10        567 33101  21515 6L   P9       
-        10        568 33101  21574 6R   P9       
-        10        569 33101  21512 6L   P9       
-        10        570 33101  21569 6R   P9       
-        10        571 33101  21507 6L   P9       
-        10        572 33101  21559 6R   P9       
-        10        573 33101  21532 6L   P9       
-        10        574 33101  21554 6R   P9       
-        10        575 33101  21537 6L   P9       
-        10        576 33101  21549 6R   P9       
-        10        577 33101  21492 6L   P9       
-        10        578 33101  21544 6R   P9       
-        10        579 33101  20300 6L   S4       
-        10        580 33101  20367 6R   S4       
-        10        581 33101  21528 6L   P9       
-        10        582 33101  21590 6R   P9       
-        10        583 33101  21518 6L   P9       
-        10        584 33101  21585 6R   P9       
-        10        585 33101  21501 6L   P9       
-        10        586 33101  21580 6R   P9       
-        10        587 33101  21516 6L   P9       
-        10        588 33101  21575 6R   P9       
-        10        589 33101  21513 6L   P9       
-        10        590 33101  21570 6R   P9       
-        10        591 33101  21508 6L   P9       
-        10        592 33101  21560 6R   P9       
-        10        593 33101  21533 6L   P9       
-        10        594 33101  21555 6R   P9       
-        10        595 33101  21538 6L   P9       
-        10        596 33101  21550 6R   P9       
-        10        597 33101  21493 6L   P9       
-        10        598 33101  21545 6R   P9       
-        10        599 33101  20301 6L   S4       
-        10        600 33101  20368 6R   S4       
-        10        601 33101  21641 7L   P9       
-        10        602 33101  21688 7R   P9       
-        10        603 33101  21636 7L   P9       
-        10        604 33101  21683 7R   P9       
-        10        605 33101  21631 7L   P9       
-        10        606 33101  21678 7R   P9       
-        10        607 33101  21626 7L   P9       
-        10        608 33101  21673 7R   P9       
-        10        609 33101  21621 7L   P9       
-        10        610 33101  21663 7R   P9       
-        10        611 33101  21600 7L   P9       
-        10        612 33101  21658 7R   P9       
-        10        613 33101  21606 7L   P9       
-        10        614 33101  21653 7R   P9       
-        10        615 33101  21601 7L   P9       
-        10        616 33101  21648 7R   P9       
-        10        617 33101  20387 7L   S4       
-        10        618 33101  21646 7R   P9       
-        10        619 33101  21611 7L   P9       
-        10        620 33101  21643 7R   P9       
-        10        621 33101  21642 7L   P9       
-        10        622 33101  21689 7R   P9       
-        10        623 33101  21637 7L   P9       
-        10        624 33101  21684 7R   P9       
-        10        625 33101  21632 7L   P9       
-        10        626 33101  21679 7R   P9       
-        10        627 33101  21627 7L   P9       
-        10        628 33101  21674 7R   P9       
-        10        629 33101  21622 7L   P9       
-        10        630 33101  21664 7R   P9       
-        10        631 33101  21616 7L   P9       
-        10        632 33101  21659 7R   P9       
-        10        633 33101  21607 7L   P9       
-        10        634 33101  21654 7R   P9       
-        10        635 33101  21602 7L   P9       
-        10        636 33101  21649 7R   P9       
-        10        637 33101  20397 7L   S4       
-        10        638 33101  21669 7R   P9       
-        10        639 33101  21612 7L   P9       
-        10        640 33101  21644 7R   P9       
-        10        641 33101  21592 7L   P9       
-        10        642 33101  21690 7R   P9       
-        10        643 33101  21638 7L   P9       
-        10        644 33101  21685 7R   P9       
-        10        645 33101  21633 7L   P9       
-        10        646 33101  21680 7R   P9       
-        10        647 33101  21628 7L   P9       
-        10        648 33101  21675 7R   P9       
-        10        649 33101  21623 7L   P9       
-        10        650 33101  21665 7R   P9       
-        10        651 33101  21617 7L   P9       
-        10        652 33101  21660 7R   P9       
-        10        653 33101  21608 7L   P9       
-        10        654 33101  21655 7R   P9       
-        10        655 33101  21603 7L   P9       
-        10        656 33101  21650 7R   P9       
-        10        657 33101  20398 7L   S4       
-        10        658 33101  21670 7R   P9       
-        10        659 33101  21613 7L   P9       
-        10        660 33101  21645 7R   P9       
-        10        661 33101  20401 7L   S4       
-        10        662 33101  21691 7R   P9       
-        10        663 33101  21639 7L   P9       
-        10        664 33101  21686 7R   P9       
-        10        665 33101  21634 7L   P9       
-        10        666 33101  21681 7R   P9       
-        10        667 33101  21629 7L   P9       
-        10        668 33101  21676 7R   P9       
-        10        669 33101  21624 7L   P9       
-        10        670 33101  21666 7R   P9       
-        10        671 33101  21619 7L   P9       
-        10        672 33101  21661 7R   P9       
-        10        673 33101  21609 7L   P9       
-        10        674 33101  21656 7R   P9       
-        10        675 33101  21604 7L   P9       
-        10        676 33101  21651 7R   P9       
-        10        677 33101  20402 7L   S4       
-        10        678 33101  21671 7R   P9       
-        10        679 33101  21614 7L   P9       
-        10        680 33101  21647 7R   P9       
-        10        681 33101  21618 7L   P9       
-        10        682 33101  20430 7R   S4       
-        10        683 33101  21640 7L   P9       
-        10        684 33101  21687 7R   P9       
-        10        685 33101  21635 7L   P9       
-        10        686 33101  21682 7R   P9       
-        10        687 33101  21630 7L   P9       
-        10        688 33101  21677 7R   P9       
-        10        689 33101  21625 7L   P9       
-        10        690 33101  21667 7R   P9       
-        10        691 33101  21620 7L   P9       
-        10        692 33101  21662 7R   P9       
-        10        693 33101  21610 7L   P9       
-        10        694 33101  21657 7R   P9       
-        10        695 33101  21605 7L   P9       
-        10        696 33101  21652 7R   P9       
-        10        697 33101  21593 7L   P9       
-        10        698 33101  21672 7R   P9       
-        10        699 33101  21615 7L   P9       
-        10        700 33101  21668 7R   P9       
-        10        701 33101  21695 8L   P9       
-        10        702 33101  21742 8R   P9       
-        10        703 33101  21702 8L   P9       
-        10        704 33101  21752 8R   P9       
-        10        705 33101  20472 8L   S4       
-        10        706 33101  21757 8R   P9       
-        10        707 33101  15683 8L   P7       
-        10        708 33101  21787 8R   P9       
-        10        709 33101  20476 8L   S4       
-        10        710 33101  21772 8R   P9       
-        10        711 33101  21732 8L   P9       
-        10        712 33101  21777 8R   P9       
-        10        713 33101  21727 8L   P9       
-        10        714 33101  21758 8R   P9       
-        10        715 33101  21717 8L   P9       
-        10        716 33101  21767 8R   P9       
-        10        717 33101  21707 8L   P9       
-        10        718 33101  21743 8R   P9       
-        10        719 33101  21712 8L   P9       
-        10        720 33101  21762 8R   P9       
-        10        721 33101  21696 8L   P9       
-        10        722 33101  21745 8R   P9       
-        10        723 33101  21703 8L   P9       
-        10        724 33101  21753 8R   P9       
-        10        725 33101  20474 8L   S4       
-        10        726 33101  21781 8R   P9       
-        10        727 33101  15684 8L   P7       
-        10        728 33101  21788 8R   P9       
-        10        729 33101  21722 8L   P9       
-        10        730 33101  21773 8R   P9       
-        10        731 33101  21733 8L   P9       
-        10        732 33101  21778 8R   P9       
-        10        733 33101  21728 8L   P9       
-        10        734 33101  21759 8R   P9       
-        10        735 33101  21718 8L   P9       
-        10        736 33101  21768 8R   P9       
-        10        737 33101  21708 8L   P9       
-        10        738 33101  21744 8R   P9       
-        10        739 33101  21713 8L   P9       
-        10        740 33101  21763 8R   P9       
-        10        741 33101  21697 8L   P9       
-        10        742 33101  21749 8R   P9       
-        10        743 33101  21704 8L   P9       
-        10        744 33101  21754 8R   P9       
-        10        745 33101  21706 8L   P9       
-        10        746 33101  21784 8R   P9       
-        10        747 33101  15685 8L   P7       
-        10        748 33101  21789 8R   P9       
-        10        749 33101  21724 8L   P9       
-        10        750 33101  21774 8R   P9       
-        10        751 33101  21734 8L   P9       
-        10        752 33101  21779 8R   P9       
-        10        753 33101  21729 8L   P9       
-        10        754 33101  21760 8R   P9       
-        10        755 33101  21719 8L   P9       
-        10        756 33101  21769 8R   P9       
-        10        757 33101  21709 8L   P9       
-        10        758 33101  21746 8R   P9       
-        10        759 33101  21714 8L   P9       
-        10        760 33101  21764 8R   P9       
-        10        761 33101  21698 8L   P9       
-        10        762 33101  21750 8R   P9       
-        10        763 33101  21705 8L   P9       
-        10        764 33101  21755 8R   P9       
-        10        765 33101  21740 8L   P9       
-        10        766 33101  21785 8R   P9       
-        10        767 33101  21737 8L   P9       
-        10        768 33101  21790 8R   P9       
-        10        769 33101  21725 8L   P9       
-        10        770 33101  21775 8R   P9       
-        10        771 33101  21735 8L   P9       
-        10        772 33101  21780 8R   P9       
-        10        773 33101  21730 8L   P9       
-        10        774 33101  21761 8R   P9       
-        10        775 33101  21720 8L   P9       
-        10        776 33101  21770 8R   P9       
-        10        777 33101  21710 8L   P9       
-        10        778 33101  21747 8R   P9       
-        10        779 33101  21715 8L   P9       
-        10        780 33101  21765 8R   P9       
-        10        781 33101  20477 8L   S4       
-        10        782 33101  21751 8R   P9       
-        10        783 33101  20475 8L   S4       
-        10        784 33101  21756 8R   P9       
-        10        785 33101  21741 8L   P9       
-        10        786 33101  21786 8R   P9       
-        10        787 33101  21738 8L   P9       
-        10        788 33101  21791 8R   P9       
-        10        789 33101  21726 8L   P9       
-        10        790 33101  21776 8R   P9       
-        10        791 33101  21736 8L   P9       
-        10        792 33101  21782 8R   P9       
-        10        793 33101  21731 8L   P9       
-        10        794 33101  21783 8R   P9       
-        10        795 33101  21721 8L   P9       
-        10        796 33101  21771 8R   P9       
-        10        797 33101  21711 8L   P9       
-        10        798 33101  21748 8R   P9       
-        10        799 33101  21716 8L   P9       
-        10        800 33101  21766 8R   P9       
-        10        801 33101  21832 9L   P9       
-        10        802 33101  21887 9R   P9       
-        10        803 33101  21821 9L   P9       
-        10        804 33101  21875 9R   P9       
-        10        805 33101  21812 9L   P9       
-        10        806 33101  21867 9R   P9       
-        10        807 33101  21807 9L   P9       
-        10        808 33101  21857 9R   P9       
-        10        809 33101  21802 9L   P9       
-        10        810 33101  21852 9R   P9       
-        10        811 33101  21800 9L   P9       
-        10        812 33101  21847 9R   P9       
-        10        813 33101  21792 9L   P9       
-        10        814 33101  21862 9R   P9       
-        10        815 33101  21827 9L   P9       
-        10        816 33101  21842 9R   P9       
-        10        817 33101  20572 9L   S4       
-        10        818 33101  21883 9R   P9       
-        10        819 33101  20567 9L   S4       
-        10        820 33101  20616 9R   S4       
-        10        821 33101  21833 9L   P9       
-        10        822 33101  21888 9R   P9       
-        10        823 33101  21822 9L   P9       
-        10        824 33101  21877 9R   P9       
-        10        825 33101  21813 9L   P9       
-        10        826 33101  21868 9R   P9       
-        10        827 33101  21808 9L   P9       
-        10        828 33101  21858 9R   P9       
-        10        829 33101  21803 9L   P9       
-        10        830 33101  21853 9R   P9       
-        10        831 33101  21801 9L   P9       
-        10        832 33101  21848 9R   P9       
-        10        833 33101  21793 9L   P9       
-        10        834 33101  21865 9R   P9       
-        10        835 33101  21828 9L   P9       
-        10        836 33101  21843 9R   P9       
-        10        837 33101  20573 9L   S4       
-        10        838 33101  21892 9R   P9       
-        10        839 33101  20568 9L   S4       
-        10        840 33101  20621 9R   S4       
-        10        841 33101  21834 9L   P9       
-        10        842 33101  21889 9R   P9       
-        10        843 33101  21823 9L   P9       
-        10        844 33101  21878 9R   P9       
-        10        845 33101  21814 9L   P9       
-        10        846 33101  21869 9R   P9       
-        10        847 33101  21809 9L   P9       
-        10        848 33101  21859 9R   P9       
-        10        849 33101  21804 9L   P9       
-        10        850 33101  21854 9R   P9       
-        10        851 33101  21817 9L   P9       
-        10        852 33101  21849 9R   P9       
-        10        853 33101  21794 9L   P9       
-        10        854 33101  21866 9R   P9       
-        10        855 33101  21829 9L   P9       
-        10        856 33101  21844 9R   P9       
-        10        857 33101  20574 9L   S4       
-        10        858 33101  21893 9R   P9       
-        10        859 33101  20569 9L   S4       
-        10        860 33101  20627 9R   S4       
-        10        861 33101  21835 9L   P9       
-        10        862 33101  21891 9R   P9       
-        10        863 33101  21824 9L   P9       
-        10        864 33101  21880 9R   P9       
-        10        865 33101  21815 9L   P9       
-        10        866 33101  21870 9R   P9       
-        10        867 33101  21810 9L   P9       
-        10        868 33101  21860 9R   P9       
-        10        869 33101  21805 9L   P9       
-        10        870 33101  21855 9R   P9       
-        10        871 33101  21818 9L   P9       
-        10        872 33101  21850 9R   P9       
-        10        873 33101  21795 9L   P9       
-        10        874 33101  21872 9R   P9       
-        10        875 33101  21830 9L   P9       
-        10        876 33101  21846 9R   P9       
-        10        877 33101  20575 9L   S4       
-        10        878 33101  21895 9R   P9       
-        10        879 33101  20570 9L   S4       
-        10        880 33101  20628 9R   S4       
-        10        881 33101  21836 9L   P9       
-        10        882 33101  21845 9R   P9       
-        10        883 33101  21826 9L   P9       
-        10        884 33101  21882 9R   P9       
-        10        885 33101  21816 9L   P9       
-        10        886 33101  21871 9R   P9       
-        10        887 33101  21811 9L   P9       
-        10        888 33101  21861 9R   P9       
-        10        889 33101  21806 9L   P9       
-        10        890 33101  21856 9R   P9       
-        10        891 33101  21819 9L   P9       
-        10        892 33101  21851 9R   P9       
-        10        893 33101  21796 9L   P9       
-        10        894 33101  21873 9R   P9       
-        10        895 33101  21831 9L   P9       
-        10        896 33101  21885 9R   P9       
-        10        897 33101  20576 9L   S4       
-        10        898 33101  15800 9R   P7       
-        10        899 33101  20571 9L   S4       
-        10        900 33101  20629 9R   S4       
-        10        901 33101  20725 10L  S4       
-        10        902 33101  18204 10R  S3       
-        10        903 33101  20712 10L  S4       
-        10        904 33101  20819 10R  S4       
-        10        905 33101  20740 10L  S4       
-        10        906 33101  20834 10R  S4       
-        10        907 33101  20708 10L  S4       
-        10        908 33101  20825 10R  S4       
-        10        909 33101  20745 10L  S4       
-        10        910 33101  20820 10R  S4       
-        10        911 33101  20731 10L  S4       
-        10        912 33101  20839 10R  S4       
-        10        913 33101  14524 10L  S2       
-        10        914 33101  20814 10R  S4       
-        10        915 33101  20705 10L  S4       
-        10        916 33101  20804 10R  S4       
-        10        917 33101  20714 10L  S4       
-        10        918 33101  20799 10R  S4       
-        10        919 33101  20720 10L  S4       
-        10        920 33101  20784 10R  S4       
-        10        921 33101  20727 10L  S4       
-        10        922 33101  18205 10R  S3       
-        10        923 33101  20715 10L  S4       
-        10        924 33101  20826 10R  S4       
-        10        925 33101  20741 10L  S4       
-        10        926 33101  20835 10R  S4       
-        10        927 33101  20709 10L  S4       
-        10        928 33101  20827 10R  S4       
-        10        929 33101  20746 10L  S4       
-        10        930 33101  20821 10R  S4       
-        10        931 33101  20732 10L  S4       
-        10        932 33101  20840 10R  S4       
-        10        933 33101  20747 10L  S4       
-        10        934 33101  20815 10R  S4       
-        10        935 33101  20706 10L  S4       
-        10        936 33101  20805 10R  S4       
-        10        937 33101  20717 10L  S4       
-        10        938 33101  20800 10R  S4       
-        10        939 33101  20721 10L  S4       
-        10        940 33101  20787 10R  S4       
-        10        941 33101  20728 10L  S4       
-        10        942 33101  18206 10R  S3       
-        10        943 33101  20716 10L  S4       
-        10        944 33101  20830 10R  S4       
-        10        945 33101  20742 10L  S4       
-        10        946 33101  20836 10R  S4       
-        10        947 33101  20710 10L  S4       
-        10        948 33101  20828 10R  S4       
-        10        949 33101  20749 10L  S4       
-        10        950 33101  20822 10R  S4       
-        10        951 33101  20733 10L  S4       
-        10        952 33101  20841 10R  S4       
-        10        953 33101  20748 10L  S4       
-        10        954 33101  20816 10R  S4       
-        10        955 33101  20707 10L  S4       
-        10        956 33101  20806 10R  S4       
-        10        957 33101  20718 10L  S4       
-        10        958 33101  20801 10R  S4       
-        10        959 33101  20722 10L  S4       
-        10        960 33101  20790 10R  S4       
-        10        961 33101  20729 10L  S4       
-        10        962 33101  18208 10R  S3       
-        10        963 33101  20738 10L  S4       
-        10        964 33101  20832 10R  S4       
-        10        965 33101  20743 10L  S4       
-        10        966 33101  20837 10R  S4       
-        10        967 33101  20734 10L  S4       
-        10        968 33101  20829 10R  S4       
-        10        969 33101  20750 10L  S4       
-        10        970 33101  20823 10R  S4       
-        10        971 33101  20735 10L  S4       
-        10        972 33101  20842 10R  S4       
-        10        973 33101  20751 10L  S4       
-        10        974 33101  20817 10R  S4       
-        10        975 33101  20711 10L  S4       
-        10        976 33101  20807 10R  S4       
-        10        977 33101  20719 10L  S4       
-        10        978 33101  20802 10R  S4       
-        10        979 33101  20723 10L  S4       
-        10        980 33101  20792 10R  S4       
-        10        981 33101  20730 10L  S4       
-        10        982 33101  20813 10R  S4       
-        10        983 33101  20739 10L  S4       
-        10        984 33101  20833 10R  S4       
-        10        985 33101  20744 10L  S4       
-        10        986 33101  20838 10R  S4       
-        10        987 33101  20737 10L  S4       
-        10        988 33101  20831 10R  S4       
-        10        989 33101  20753 10L  S4       
-        10        990 33101  20824 10R  S4       
-        10        991 33101  20736 10L  S4       
-        10        992 33101  21896 10R  P9       
-        10        993 33101  20752 10L  S4       
-        10        994 33101  20818 10R  S4       
-        10        995 33101  20713 10L  S4       
-        10        996 33101  20808 10R  S4       
-        10        997 33101  20726 10L  S4       
-        10        998 33101  20793 10R  S4       
-        10        999 33101  20724 10L  S4       
-        10       1000 33101  20803 10R  S4       
-        10       1001 33101  20919 11L  S4       
-        10       1002 33101  18343 11R  P8       
-        10       1003 33101  20908 11L  S4       
-        10       1004 33101  21015 11R  S4       
-        10       1005 33101  20933 11L  S4       
-        10       1006 33101  20990 11R  S4       
-        10       1007 33101  20918 11L  S4       
-        10       1008 33101  21025 11R  S4       
-        10       1009 33101  20909 11L  S4       
-        10       1010 33101  21010 11R  S4       
-        10       1011 33101  20939 11L  S4       
-        10       1012 33101  21005 11R  S4       
-        10       1013 33101  20898 11L  S4       
-        10       1014 33101  21000 11R  S4       
-        10       1015 33101  14791 11L  S2       
-        10       1016 33101  20995 11R  S4       
-        10       1017 33101  20893 11L  S4       
-        10       1018 33101  20947 11R  S4       
-        10       1019 33101  20846 11L  S4       
-        10       1020 33101  20960 11R  S4       
-        10       1021 33101  20921 11L  S4       
-        10       1022 33101  18344 11R  P8       
-        10       1023 33101  20911 11L  S4       
-        10       1024 33101  21016 11R  S4       
-        10       1025 33101  20904 11L  S4       
-        10       1026 33101  20992 11R  S4       
-        10       1027 33101  20920 11L  S4       
-        10       1028 33101  21026 11R  S4       
-        10       1029 33101  20910 11L  S4       
-        10       1030 33101  21011 11R  S4       
-        10       1031 33101  20929 11L  S4       
-        10       1032 33101  21006 11R  S4       
-        10       1033 33101  20900 11L  S4       
-        10       1034 33101  21001 11R  S4       
-        10       1035 33101  14792 11L  S2       
-        10       1036 33101  20996 11R  S4       
-        10       1037 33101  20894 11L  S4       
-        10       1038 33101  20971 11R  S4       
-        10       1039 33101  20847 11L  S4       
-        10       1040 33101  20961 11R  S4       
-        10       1041 33101  20923 11L  S4       
-        10       1042 33101  18345 11R  P8       
-        10       1043 33101  20913 11L  S4       
-        10       1044 33101  21017 11R  S4       
-        10       1045 33101  20905 11L  S4       
-        10       1046 33101  20993 11R  S4       
-        10       1047 33101  20922 11L  S4       
-        10       1048 33101  21027 11R  S4       
-        10       1049 33101  20912 11L  S4       
-        10       1050 33101  21012 11R  S4       
-        10       1051 33101  20930 11L  S4       
-        10       1052 33101  21007 11R  S4       
-        10       1053 33101  20901 11L  S4       
-        10       1054 33101  21002 11R  S4       
-        10       1055 33101  20935 11L  S4       
-        10       1056 33101  20997 11R  S4       
-        10       1057 33101  20895 11L  S4       
-        10       1058 33101  20973 11R  S4       
-        10       1059 33101  20890 11L  S4       
-        10       1060 33101  20962 11R  S4       
-        10       1061 33101  20926 11L  S4       
-        10       1062 33101  18347 11R  P8       
-        10       1063 33101  20916 11L  S4       
-        10       1064 33101  21019 11R  S4       
-        10       1065 33101  20906 11L  S4       
-        10       1066 33101  20994 11R  S4       
-        10       1067 33101  20924 11L  S4       
-        10       1068 33101  21028 11R  S4       
-        10       1069 33101  20915 11L  S4       
-        10       1070 33101  21013 11R  S4       
-        10       1071 33101  20931 11L  S4       
-        10       1072 33101  21008 11R  S4       
-        10       1073 33101  20902 11L  S4       
-        10       1074 33101  21003 11R  S4       
-        10       1075 33101  20936 11L  S4       
-        10       1076 33101  20998 11R  S4       
-        10       1077 33101  20896 11L  S4       
-        10       1078 33101  20977 11R  S4       
-        10       1079 33101  20891 11L  S4       
-        10       1080 33101  20963 11R  S4       
-        10       1081 33101  21897 11L  P9       
-        10       1082 33101  20991 11R  S4       
-        10       1083 33101  20938 11L  S4       
-        10       1084 33101  21022 11R  S4       
-        10       1085 33101  20907 11L  S4       
-        10       1086 33101  21021 11R  S4       
-        10       1087 33101  20927 11L  S4       
-        10       1088 33101  21029 11R  S4       
-        10       1089 33101  20917 11L  S4       
-        10       1090 33101  21014 11R  S4       
-        10       1091 33101  20932 11L  S4       
-        10       1092 33101  21009 11R  S4       
-        10       1093 33101  20903 11L  S4       
-        10       1094 33101  21004 11R  S4       
-        10       1095 33101  20937 11L  S4       
-        10       1096 33101  20999 11R  S4       
-        10       1097 33101  20897 11L  S4       
-        10       1098 33101  20980 11R  S4       
-        10       1099 33101  20892 11L  S4       
-        10       1100 33101  20964 11R  S4       
-        10       1101 33101  14965 12L  S2       
-        10       1102 33101  21179 12R  S4       
-        10       1103 33101  21118 12L  S4       
-        10       1104 33101  21213 12R  S4       
-        10       1105 33101  21088 12L  S4       
-        10       1106 33101  21218 12R  S4       
-        10       1107 33101  21120 12L  S4       
-        10       1108 33101  21203 12R  S4       
-        10       1109 33101  21108 12L  S4       
-        10       1110 33101  21208 12R  S4       
-        10       1111 33101  21098 12L  S4       
-        10       1112 33101  21198 12R  S4       
-        10       1113 33101  21087 12L  S4       
-        10       1114 33101  21188 12R  S4       
-        10       1115 33101  21083 12L  S4       
-        10       1116 33101  21186 12R  S4       
-        10       1117 33101  21093 12L  S4       
-        10       1118 33101  21178 12R  S4       
-        10       1119 33101  18476 12L  P8       
-        10       1120 33101  21133 12R  S4       
-        10       1121 33101  14966 12L  S2       
-        10       1122 33101  21180 12R  S4       
-        10       1123 33101  21119 12L  S4       
-        10       1124 33101  21214 12R  S4       
-        10       1125 33101  21103 12L  S4       
-        10       1126 33101  21219 12R  S4       
-        10       1127 33101  21121 12L  S4       
-        10       1128 33101  21204 12R  S4       
-        10       1129 33101  21109 12L  S4       
-        10       1130 33101  21209 12R  S4       
-        10       1131 33101  21099 12L  S4       
-        10       1132 33101  21199 12R  S4       
-        10       1133 33101  21089 12L  S4       
-        10       1134 33101  21189 12R  S4       
-        10       1135 33101  21084 12L  S4       
-        10       1136 33101  21187 12R  S4       
-        10       1137 33101  21094 12L  S4       
-        10       1138 33101  21181 12R  S4       
-        10       1139 33101  18477 12L  P8       
-        10       1140 33101  21139 12R  S4       
-        10       1141 33101  21104 12L  S4       
-        10       1142 33101  21185 12R  S4       
-        10       1143 33101  21123 12L  S4       
-        10       1144 33101  21215 12R  S4       
-        10       1145 33101  21111 12L  S4       
-        10       1146 33101  21220 12R  S4       
-        10       1147 33101  21122 12L  S4       
-        10       1148 33101  21205 12R  S4       
-        10       1149 33101  21110 12L  S4       
-        10       1150 33101  21210 12R  S4       
-        10       1151 33101  21100 12L  S4       
-        10       1152 33101  21200 12R  S4       
-        10       1153 33101  21090 12L  S4       
-        10       1154 33101  21190 12R  S4       
-        10       1155 33101  21086 12L  S4       
-        10       1156 33101  21193 12R  S4       
-        10       1157 33101  21095 12L  S4       
-        10       1158 33101  21182 12R  S4       
-        10       1159 33101  18478 12L  P8       
-        10       1160 33101  21140 12R  S4       
-        10       1161 33101  21105 12L  S4       
-        10       1162 33101  21195 12R  S4       
-        10       1163 33101  21124 12L  S4       
-        10       1164 33101  21216 12R  S4       
-        10       1165 33101  21116 12L  S4       
-        10       1166 33101  21221 12R  S4       
-        10       1167 33101  21126 12L  S4       
-        10       1168 33101  21206 12R  S4       
-        10       1169 33101  21112 12L  S4       
-        10       1170 33101  21211 12R  S4       
-        10       1171 33101  21102 12L  S4       
-        10       1172 33101  21201 12R  S4       
-        10       1173 33101  21091 12L  S4       
-        10       1174 33101  21191 12R  S4       
-        10       1175 33101  21106 12L  S4       
-        10       1176 33101  21194 12R  S4       
-        10       1177 33101  21096 12L  S4       
-        10       1178 33101  21183 12R  S4       
-        10       1179 33101  18479 12L  P8       
-        10       1180 33101  21141 12R  S4       
-        10       1181 33101  21114 12L  S4       
-        10       1182 33101  21217 12R  S4       
-        10       1183 33101  21101 12L  S4       
-        10       1184 33101  21196 12R  S4       
-        10       1185 33101  21117 12L  S4       
-        10       1186 33101  21898 12R  P9       
-        10       1187 33101  21127 12L  S4       
-        10       1188 33101  21207 12R  S4       
-        10       1189 33101  21115 12L  S4       
-        10       1190 33101  21212 12R  S4       
-        10       1191 33101  21113 12L  S4       
-        10       1192 33101  21202 12R  S4       
-        10       1193 33101  21092 12L  S4       
-        10       1194 33101  21192 12R  S4       
-        10       1195 33101  21107 12L  S4       
-        10       1196 33101  21197 12R  S4       
-        10       1197 33101  21097 12L  S4       
-        10       1198 33101  21184 12R  S4       
-        10       1199 33101  21082 12L  S4       
-        10       1200 33101  21142 12R  S4       
-        10       1201 33101  18629 13L  S3       
-        10       1202 33101  12031 13R  S1       
-        10       1203 33101  21304 13L  S4       
-        10       1204 33101  21372 13R  S4       
-        10       1205 33101  21306 13L  S4       
-        10       1206 33101  18800 13R  P8       
-        10       1207 33101  21298 13L  S4       
-        10       1208 33101  18797 13R  P8       
-        10       1209 33101  21293 13L  S4       
-        10       1210 33101  21398 13R  S4       
-        10       1211 33101  21284 13L  S4       
-        10       1212 33101  21387 13R  S4       
-        10       1213 33101  21278 13L  S4       
-        10       1214 33101  21373 13R  S4       
-        10       1215 33101  21307 13L  S4       
-        10       1216 33101  21352 13R  S4       
-        10       1217 33101  21224 13L  S4       
-        10       1218 33101  21318 13R  S4       
-        10       1219 33101  18645 13L  S3       
-        10       1220 33101  18767 13R  P8       
-        10       1221 33101  21277 13L  S4       
-        10       1222 33101  12084 13R  S1       
-        10       1223 33101  21283 13L  S4       
-        10       1224 33101  21382 13R  S4       
-        10       1225 33101  21312 13L  S4       
-        10       1226 33101  21378 13R  S4       
-        10       1227 33101  21300 13L  S4       
-        10       1228 33101  18798 13R  P8       
-        10       1229 33101  21294 13L  S4       
-        10       1230 33101  21393 13R  S4       
-        10       1231 33101  21287 13L  S4       
-        10       1232 33101  21388 13R  S4       
-        10       1233 33101  21279 13L  S4       
-        10       1234 33101  21374 13R  S4       
-        10       1235 33101  21308 13L  S4       
-        10       1236 33101  21357 13R  S4       
-        10       1237 33101  21225 13L  S4       
-        10       1238 33101  21338 13R  S4       
-        10       1239 33101  18650 13L  S3       
-        10       1240 33101  18768 13R  P8       
-        10       1241 33101  21292 13L  S4       
-        10       1242 33101  12156 13R  S1       
-        10       1243 33101  21285 13L  S4       
-        10       1244 33101  21384 13R  S4       
-        10       1245 33101  21313 13L  S4       
-        10       1246 33101  21379 13R  S4       
-        10       1247 33101  21301 13L  S4       
-        10       1248 33101  18799 13R  P8       
-        10       1249 33101  21295 13L  S4       
-        10       1250 33101  21394 13R  S4       
-        10       1251 33101  21289 13L  S4       
-        10       1252 33101  21389 13R  S4       
-        10       1253 33101  21280 13L  S4       
-        10       1254 33101  21376 13R  S4       
-        10       1255 33101  21309 13L  S4       
-        10       1256 33101  21360 13R  S4       
-        10       1257 33101  21243 13L  S4       
-        10       1258 33101  21339 13R  S4       
-        10       1259 33101  18654 13L  S3       
-        10       1260 33101  18769 13R  P8       
-        10       1261 33101  21299 13L  S4       
-        10       1262 33101  12170 13R  S1       
-        10       1263 33101  21286 13L  S4       
-        10       1264 33101  21386 13R  S4       
-        10       1265 33101  21315 13L  S4       
-        10       1266 33101  21380 13R  S4       
-        10       1267 33101  21303 13L  S4       
-        10       1268 33101  21377 13R  S4       
-        10       1269 33101  21296 13L  S4       
-        10       1270 33101  21395 13R  S4       
-        10       1271 33101  21290 13L  S4       
-        10       1272 33101  21390 13R  S4       
-        10       1273 33101  21281 13L  S4       
-        10       1274 33101  21383 13R  S4       
-        10       1275 33101  21310 13L  S4       
-        10       1276 33101  21367 13R  S4       
-        10       1277 33101  21245 13L  S4       
-        10       1278 33101  21342 13R  S4       
-        10       1279 33101  18657 13L  S3       
-        10       1280 33101  18770 13R  P8       
-        10       1281 33101  21314 13L  S4       
-        10       1282 33101  21900 13R  P9       
-        10       1283 33101  21288 13L  S4       
-        10       1284 33101  21397 13R  S4       
-        10       1285 33101  21316 13L  S4       
-        10       1286 33101  21381 13R  S4       
-        10       1287 33101  21305 13L  S4       
-        10       1288 33101  21392 13R  S4       
-        10       1289 33101  21297 13L  S4       
-        10       1290 33101  21396 13R  S4       
-        10       1291 33101  21291 13L  S4       
-        10       1292 33101  21391 13R  S4       
-        10       1293 33101  21282 13L  S4       
-        10       1294 33101  21385 13R  S4       
-        10       1295 33101  21311 13L  S4       
-        10       1296 33101  18771 13R  P8       
-        10       1297 33101  18630 13L  S3       
-        10       1298 33101  21343 13R  S4       
-        10       1299 33101  21246 13L  S4       
-        10       1300 33101  21359 13R  S4       
-        10       1301 33101  17069 14L  S3       
-        10       1302 33101  17141 14R  S3       
-        10       1303 33101  19336 14L  S4       
-        10       1304 33101  19168 14R  S4       
-        10       1305 33101  19357 14L  S4       
-        10       1306 33101  19224 14R  S4       
-        10       1307 33101  19372 14L  S4       
-        10       1308 33101  19260 14R  S4       
-        10       1309 33101  19409 14L  S4       
-        10       1310 33101  19266 14R  S4       
-        10       1311 33101  19444 14L  S4       
-        10       1312 33101  19271 14R  S4       
-        10       1313 33101  19458 14L  S4       
-        10       1314 33101  19277 14R  S4       
-        10       1315 33101  19410 14L  S4       
-        10       1316 33101  19282 14R  S4       
-        10       1317 33101  19417 14L  S4       
-        10       1318 33101  19287 14R  S4       
-        10       1319 33101  19422 14L  S4       
-        10       1320 33101  19294 14R  S4       
-        10       1321 33101  19143 14L  S4       
-        10       1322 33101  19149 14R  S4       
-        10       1323 33101  19337 14L  S4       
-        10       1324 33101  19171 14R  S4       
-        10       1325 33101  19360 14L  S4       
-        10       1326 33101  19245 14R  S4       
-        10       1327 33101  19389 14L  S4       
-        10       1328 33101  19261 14R  S4       
-        10       1329 33101  19413 14L  S4       
-        10       1330 33101  19267 14R  S4       
-        10       1331 33101  19445 14L  S4       
-        10       1332 33101  19272 14R  S4       
-        10       1333 33101  19459 14L  S4       
-        10       1334 33101  19278 14R  S4       
-        10       1335 33101  19411 14L  S4       
-        10       1336 33101  19283 14R  S4       
-        10       1337 33101  19418 14L  S4       
-        10       1338 33101  19289 14R  S4       
-        10       1339 33101  19423 14L  S4       
-        10       1340 33101  19295 14R  S4       
-        10       1341 33101  19326 14L  S4       
-        10       1342 33101  19151 14R  S4       
-        10       1343 33101  19338 14L  S4       
-        10       1344 33101  19186 14R  S4       
-        10       1345 33101  19361 14L  S4       
-        10       1346 33101  19257 14R  S4       
-        10       1347 33101  19396 14L  S4       
-        10       1348 33101  19262 14R  S4       
-        10       1349 33101  19416 14L  S4       
-        10       1350 33101  19268 14R  S4       
-        10       1351 33101  19450 14L  S4       
-        10       1352 33101  19273 14R  S4       
-        10       1353 33101  19146 14L  S4       
-        10       1354 33101  19279 14R  S4       
-        10       1355 33101  19412 14L  S4       
-        10       1356 33101  19284 14R  S4       
-        10       1357 33101  19419 14L  S4       
-        10       1358 33101  19290 14R  S4       
-        10       1359 33101  19424 14L  S4       
-        10       1360 33101  19471 14R  S4       
-        10       1361 33101  19330 14L  S4       
-        10       1362 33101  19154 14R  S4       
-        10       1363 33101  19349 14L  S4       
-        10       1364 33101  19203 14R  S4       
-        10       1365 33101  19367 14L  S4       
-        10       1366 33101  19258 14R  S4       
-        10       1367 33101  19403 14L  S4       
-        10       1368 33101  19263 14R  S4       
-        10       1369 33101  19436 14L  S4       
-        10       1370 33101  19269 14R  S4       
-        10       1371 33101  19451 14L  S4       
-        10       1372 33101  19274 14R  S4       
-        10       1373 33101  19407 14L  S4       
-        10       1374 33101  19280 14R  S4       
-        10       1375 33101  19414 14L  S4       
-        10       1376 33101  19285 14R  S4       
-        10       1377 33101  19420 14L  S4       
-        10       1378 33101  19292 14R  S4       
-        10       1379 33101  19425 14L  S4       
-        10       1380 33101  19288 14R  S4       
-        10       1381 33101  19335 14L  S4       
-        10       1382 33101  19157 14R  S4       
-        10       1383 33101  19350 14L  S4       
-        10       1384 33101  19204 14R  S4       
-        10       1385 33101  19370 14L  S4       
-        10       1386 33101  19259 14R  S4       
-        10       1387 33101  19406 14L  S4       
-        10       1388 33101  19264 14R  S4       
-        10       1389 33101  19439 14L  S4       
-        10       1390 33101  19270 14R  S4       
-        10       1391 33101  19457 14L  S4       
-        10       1392 33101  19275 14R  S4       
-        10       1393 33101  19408 14L  S4       
-        10       1394 33101  19281 14R  S4       
-        10       1395 33101  19415 14L  S4       
-        10       1396 33101  19286 14R  S4       
-        10       1397 33101  19421 14L  S4       
-        10       1398 33101  19293 14R  S4       
-        10       1399 33101  19426 14L  S4       
-        10       1400 33101  19467 14R  S4       
-        10       1401 33101  19473 15L  S4       
-        10       1402 33101  19708 15R  S4       
-        10       1403 33101  19498 15L  S4       
-        10       1404 33101  19318 15R  S4       
-        10       1405 33101  19516 15L  S4       
-        10       1406 33101  19649 15R  S4       
-        10       1407 33101  19533 15L  S4       
-        10       1408 33101  19695 15R  S4       
-        10       1409 33101  19560 15L  S4       
-        10       1410 33101  19703 15R  S4       
-        10       1411 33101  19581 15L  S4       
-        10       1412 33101  17246 15R  S3       
-        10       1413 33101  19609 15L  S4       
-        10       1414 33101  19713 15R  S4       
-        10       1415 33101  19614 15L  S4       
-        10       1416 33101  19718 15R  S4       
-        10       1417 33101  19620 15L  S4       
-        10       1418 33101  19723 15R  S4       
-        10       1419 33101  17183 15L  S3       
-        10       1420 33101  19728 15R  S4       
-        10       1421 33101  19476 15L  S4       
-        10       1422 33101  19304 15R  S4       
-        10       1423 33101  19500 15L  S4       
-        10       1424 33101  19319 15R  S4       
-        10       1425 33101  19521 15L  S4       
-        10       1426 33101  19652 15R  S4       
-        10       1427 33101  19538 15L  S4       
-        10       1428 33101  19699 15R  S4       
-        10       1429 33101  19564 15L  S4       
-        10       1430 33101  19704 15R  S4       
-        10       1431 33101  19589 15L  S4       
-        10       1432 33101  19709 15R  S4       
-        10       1433 33101  19610 15L  S4       
-        10       1434 33101  19714 15R  S4       
-        10       1435 33101  19616 15L  S4       
-        10       1436 33101  19719 15R  S4       
-        10       1437 33101  19621 15L  S4       
-        10       1438 33101  19724 15R  S4       
-        10       1439 33101  17185 15L  S3       
-        10       1440 33101  19729 15R  S4       
-        10       1441 33101  19478 15L  S4       
-        10       1442 33101  19306 15R  S4       
-        10       1443 33101  19505 15L  S4       
-        10       1444 33101  19626 15R  S4       
-        10       1445 33101  19522 15L  S4       
-        10       1446 33101  19662 15R  S4       
-        10       1447 33101  19541 15L  S4       
-        10       1448 33101  19700 15R  S4       
-        10       1449 33101  19572 15L  S4       
-        10       1450 33101  19705 15R  S4       
-        10       1451 33101  19591 15L  S4       
-        10       1452 33101  19710 15R  S4       
-        10       1453 33101  19611 15L  S4       
-        10       1454 33101  19715 15R  S4       
-        10       1455 33101  19617 15L  S4       
-        10       1456 33101  19720 15R  S4       
-        10       1457 33101  19499 15L  S4       
-        10       1458 33101  19725 15R  S4       
-        10       1459 33101  17193 15L  S3       
-        10       1460 33101  13957 15R  S2       
-        10       1461 33101  19481 15L  S4       
-        10       1462 33101  19311 15R  S4       
-        10       1463 33101  19513 15L  S4       
-        10       1464 33101  19630 15R  S4       
-        10       1465 33101  19525 15L  S4       
-        10       1466 33101  19682 15R  S4       
-        10       1467 33101  19543 15L  S4       
-        10       1468 33101  19701 15R  S4       
-        10       1469 33101  19577 15L  S4       
-        10       1470 33101  19706 15R  S4       
-        10       1471 33101  19594 15L  S4       
-        10       1472 33101  19711 15R  S4       
-        10       1473 33101  19612 15L  S4       
-        10       1474 33101  19716 15R  S4       
-        10       1475 33101  19618 15L  S4       
-        10       1476 33101  19721 15R  S4       
-        10       1477 33101  13866 15L  S2       
-        10       1478 33101  19726 15R  S4       
-        10       1479 33101  17210 15L  S3       
-        10       1480 33101  14040 15R  S2       
-        10       1481 33101  19492 15L  S4       
-        10       1482 33101  19316 15R  S4       
-        10       1483 33101  19514 15L  S4       
-        10       1484 33101  19639 15R  S4       
-        10       1485 33101  19528 15L  S4       
-        10       1486 33101  19686 15R  S4       
-        10       1487 33101  19547 15L  S4       
-        10       1488 33101  19702 15R  S4       
-        10       1489 33101  19578 15L  S4       
-        10       1490 33101  19707 15R  S4       
-        10       1491 33101  19595 15L  S4       
-        10       1492 33101  19712 15R  S4       
-        10       1493 33101  19613 15L  S4       
-        10       1494 33101  19717 15R  S4       
-        10       1495 33101  19619 15L  S4       
-        10       1496 33101  19722 15R  S4       
-        10       1497 33101  13949 15L  S2       
-        10       1498 33101  19727 15R  S4       
-        10       1499 33101  17225 15L  S3       
-        10       1500 33101  17232 15R  S3       
-        10       1501 33101  14068 16L  S2       
-        10       1502 33101  19881 16R  S4       
-        10       1503 33101  19752 16L  S4       
-        10       1504 33101  19897 16R  S4       
-        10       1505 33101  19773 16L  S4       
-        10       1506 33101  19927 16R  S4       
-        10       1507 33101  19793 16L  S4       
-        10       1508 33101  19967 16R  S4       
-        10       1509 33101  19805 16L  S4       
-        10       1510 33101  20012 16R  S4       
-        10       1511 33101  19817 16L  S4       
-        10       1512 33101  19991 16R  S4       
-        10       1513 33101  19828 16L  S4       
-        10       1514 33101  19997 16R  S4       
-        10       1515 33101  19847 16L  S4       
-        10       1516 33101  20004 16R  S4       
-        10       1517 33101  19867 16L  S4       
-        10       1518 33101  20010 16R  S4       
-        10       1519 33101  19731 16L  S4       
-        10       1520 33101  20016 16R  S4       
-        10       1521 33101  19735 16L  S4       
-        10       1522 33101  19887 16R  S4       
-        10       1523 33101  19756 16L  S4       
-        10       1524 33101  19898 16R  S4       
-        10       1525 33101  19775 16L  S4       
-        10       1526 33101  19940 16R  S4       
-        10       1527 33101  19797 16L  S4       
-        10       1528 33101  19972 16R  S4       
-        10       1529 33101  19807 16L  S4       
-        10       1530 33101  20022 16R  S4       
-        10       1531 33101  19819 16L  S4       
-        10       1532 33101  19992 16R  S4       
-        10       1533 33101  19831 16L  S4       
-        10       1534 33101  19998 16R  S4       
-        10       1535 33101  19850 16L  S4       
-        10       1536 33101  20005 16R  S4       
-        10       1537 33101  19873 16L  S4       
-        10       1538 33101  20011 16R  S4       
-        10       1539 33101  14071 16L  S2       
-        10       1540 33101  20017 16R  S4       
-        10       1541 33101  19737 16L  S4       
-        10       1542 33101  19888 16R  S4       
-        10       1543 33101  19759 16L  S4       
-        10       1544 33101  19912 16R  S4       
-        10       1545 33101  19781 16L  S4       
-        10       1546 33101  19947 16R  S4       
-        10       1547 33101  19798 16L  S4       
-        10       1548 33101  19993 16R  S4       
-        10       1549 33101  19810 16L  S4       
-        10       1550 33101  19988 16R  S4       
-        10       1551 33101  19820 16L  S4       
-        10       1552 33101  19994 16R  S4       
-        10       1553 33101  19833 16L  S4       
-        10       1554 33101  19999 16R  S4       
-        10       1555 33101  19858 16L  S4       
-        10       1556 33101  20006 16R  S4       
-        10       1557 33101  19874 16L  S4       
-        10       1558 33101  20013 16R  S4       
-        10       1559 33101  17310 16L  S3       
-        10       1560 33101  20018 16R  S4       
-        10       1561 33101  19742 16L  S4       
-        10       1562 33101  19890 16R  S4       
-        10       1563 33101  19761 16L  S4       
-        10       1564 33101  19918 16R  S4       
-        10       1565 33101  19785 16L  S4       
-        10       1566 33101  19956 16R  S4       
-        10       1567 33101  19802 16L  S4       
-        10       1568 33101  2   16R  S4       
-        10       1569 33101  19813 16L  S4       
-        10       1570 33101  19989 16R  S4       
-        10       1571 33101  19822 16L  S4       
-        10       1572 33101  19995 16R  S4       
-        10       1573 33101  19840 16L  S4       
-        10       1574 33101  20001 16R  S4       
-        10       1575 33101  19859 16L  S4       
-        10       1576 33101  20007 16R  S4       
-        10       1577 33101  21431 16L  P9       
-        10       1578 33101  20014 16R  S4       
-        10       1579 33101  17319 16L  S3       
-        10       1580 33101  20019 16R  S4       
-        10       1581 33101  19745 16L  S4       
-        10       1582 33101  19896 16R  S4       
-        10       1583 33101  19771 16L  S4       
-        10       1584 33101  19920 16R  S4       
-        10       1585 33101  19790 16L  S4       
-        10       1586 33101  19961 16R  S4       
-        10       1587 33101  19803 16L  S4       
-        10       1588 33101  20002 16R  S4       
-        10       1589 33101  19815 16L  S4       
-        10       1590 33101  19990 16R  S4       
-        10       1591 33101  19826 16L  S4       
-        10       1592 33101  19996 16R  S4       
-        10       1593 33101  19843 16L  S4       
-        10       1594 33101  20003 16R  S4       
-        10       1595 33101  19862 16L  S4       
-        10       1596 33101  20009 16R  S4       
-        10       1597 33101  19730 16L  S4       
-        10       1598 33101  20015 16R  S4       
-        10       1599 33101  17344 16L  S3       
-        10       1600 33101  20020 16R  S4       
-        10       1601 33101  12784 17L  S1       
-        10       1602 33101  20146 17R  S4       
-        10       1603 33101  20038 17L  S4       
-        10       1604 33101  20162 17R  S4       
-        10       1605 33101  20051 17L  S4       
-        10       1606 33101  20198 17R  S4       
-        10       1607 33101  20080 17L  S4       
-        10       1608 33101  20214 17R  S4       
-        10       1609 33101  20100 17L  S4       
-        10       1610 33101  20255 17R  S4       
-        10       1611 33101  20109 17L  S4       
-        10       1612 33101  21465 17R  P9       
-        10       1613 33101  20125 17L  S4       
-        10       1614 33101  21471 17R  P9       
-        10       1615 33101  20136 17L  S4       
-        10       1616 33101  21476 17R  P9       
-        10       1617 33101  20145 17L  S4       
-        10       1618 33101  21481 17R  P9       
-        10       1619 33101  21455 17L  P9       
-        10       1620 33101  21486 17R  P9       
-        10       1621 33101  14269 17L  S2       
-        10       1622 33101  20148 17R  S4       
-        10       1623 33101  20039 17L  S4       
-        10       1624 33101  20166 17R  S4       
-        10       1625 33101  20052 17L  S4       
-        10       1626 33101  20203 17R  S4       
-        10       1627 33101  20082 17L  S4       
-        10       1628 33101  20215 17R  S4       
-        10       1629 33101  20102 17L  S4       
-        10       1630 33101  20260 17R  S4       
-        10       1631 33101  20112 17L  S4       
-        10       1632 33101  21467 17R  P9       
-        10       1633 33101  20126 17L  S4       
-        10       1634 33101  21472 17R  P9       
-        10       1635 33101  20137 17L  S4       
-        10       1636 33101  21477 17R  P9       
-        10       1637 33101  21436 17L  P9       
-        10       1638 33101  21482 17R  P9       
-        10       1639 33101  12763 17L  S1       
-        10       1640 33101  21487 17R  P9       
-        10       1641 33101  21461 17L  P9       
-        10       1642 33101  20150 17R  S4       
-        10       1643 33101  20045 17L  S4       
-        10       1644 33101  20168 17R  S4       
-        10       1645 33101  20074 17L  S4       
-        10       1646 33101  20209 17R  S4       
-        10       1647 33101  20089 17L  S4       
-        10       1648 33101  20219 17R  S4       
-        10       1649 33101  20105 17L  S4       
-        10       1650 33101  20264 17R  S4       
-        10       1651 33101  20117 17L  S4       
-        10       1652 33101  21468 17R  P9       
-        10       1653 33101  20132 17L  S4       
-        10       1654 33101  21473 17R  P9       
-        10       1655 33101  20140 17L  S4       
-        10       1656 33101  21478 17R  P9       
-        10       1657 33101  21441 17L  P9       
-        10       1658 33101  21483 17R  P9       
-        10       1659 33101  12716 17L  S1       
-        10       1660 33101  21488 17R  P9       
-        10       1661 33101  20025 17L  S4       
-        10       1662 33101  20151 17R  S4       
-        10       1663 33101  20047 17L  S4       
-        10       1664 33101  20174 17R  S4       
-        10       1665 33101  20076 17L  S4       
-        10       1666 33101  20212 17R  S4       
-        10       1667 33101  20091 17L  S4       
-        10       1668 33101  20220 17R  S4       
-        10       1669 33101  20106 17L  S4       
-        10       1670 33101  21463 17R  P9       
-        10       1671 33101  20121 17L  S4       
-        10       1672 33101  21469 17R  P9       
-        10       1673 33101  20133 17L  S4       
-        10       1674 33101  21474 17R  P9       
-        10       1675 33101  20142 17L  S4       
-        10       1676 33101  21479 17R  P9       
-        10       1677 33101  21445 17L  P9       
-        10       1678 33101  21484 17R  P9       
-        10       1679 33101  12747 17L  S1       
-        10       1680 33101  12667 17R  S1       
-        10       1681 33101  20031 17L  S4       
-        10       1682 33101  20154 17R  S4       
-        10       1683 33101  20050 17L  S4       
-        10       1684 33101  20189 17R  S4       
-        10       1685 33101  20079 17L  S4       
-        10       1686 33101  20213 17R  S4       
-        10       1687 33101  20092 17L  S4       
-        10       1688 33101  20224 17R  S4       
-        10       1689 33101  20108 17L  S4       
-        10       1690 33101  21464 17R  P9       
-        10       1691 33101  20124 17L  S4       
-        10       1692 33101  21470 17R  P9       
-        10       1693 33101  20135 17L  S4       
-        10       1694 33101  21475 17R  P9       
-        10       1695 33101  20143 17L  S4       
-        10       1696 33101  21480 17R  P9       
-        10       1697 33101  21446 17L  P9       
-        10       1698 33101  21485 17R  P9       
-        10       1699 33101  12762 17L  S1       
-        10       1700 33101  12681 17R  S1       
-        11          1 33101  15967 1L   S3       
-        11          2 33101  15831 1R   S3       
-        11          3 33101  15854 1L   S3       
-        11          4 33101  15962 1R   S3       
-        11          5 33101  15926 1L   S3       
-        11          6 33101  16128 1R   S3       
-        11          7 33101  22776 1L   S5       
-        11          8 33101  15996 1R   S3       
-        11          9 33101  22781 1L   S5       
-        11         10 33101  21907 1R   S5       
-        11         11 33101  22786 1L   S5       
-        11         12 33101  21914 1R   S5       
-        11         13 33101  22791 1L   S5       
-        11         14 33101  21918 1R   S5       
-        11         15 33101  22796 1L   S5       
-        11         16 33101  21923 1R   S5       
-        11         17 33101  22801 1L   S5       
-        11         18 33101  21928 1R   S5       
-        11         19 33101  22806 1L   S5       
-        11         20 33101  21933 1R   S5       
-        11         21 33101  10316 1L   S1       
-        11         22 33101  15883 1R   S3       
-        11         23 33101  15855 1L   S3       
-        11         24 33101  16124 1R   S3       
-        11         25 33101  21901 1L   S5       
-        11         26 33101  16129 1R   S3       
-        11         27 33101  22777 1L   S5       
-        11         28 33101  16036 1R   S3       
-        11         29 33101  22782 1L   S5       
-        11         30 33101  21908 1R   S5       
-        11         31 33101  22787 1L   S5       
-        11         32 33101  21912 1R   S5       
-        11         33 33101  22792 1L   S5       
-        11         34 33101  21919 1R   S5       
-        11         35 33101  22797 1L   S5       
-        11         36 33101  21924 1R   S5       
-        11         37 33101  22802 1L   S5       
-        11         38 33101  21929 1R   S5       
-        11         39 33101  22807 1L   S5       
-        11         40 33101  21935 1R   S5       
-        11         41 33101  12808 1L   S2       
-        11         42 33101  15887 1R   S3       
-        11         43 33101  15859 1L   S3       
-        11         44 33101  16125 1R   S3       
-        11         45 33101  21902 1L   S5       
-        11         46 33101  10290 1R   S1       
-        11         47 33101  22778 1L   S5       
-        11         48 33101  16059 1R   S3       
-        11         49 33101  22783 1L   S5       
-        11         50 33101  21909 1R   S5       
-        11         51 33101  22788 1L   S5       
-        11         52 33101  21915 1R   S5       
-        11         53 33101  22793 1L   S5       
-        11         54 33101  21920 1R   S5       
-        11         55 33101  22798 1L   S5       
-        11         56 33101  21925 1R   S5       
-        11         57 33101  22803 1L   S5       
-        11         58 33101  21930 1R   S5       
-        11         59 33101  22808 1L   S5       
-        11         60 33101  21936 1R   S5       
-        11         61 33101  15817 1L   S3       
-        11         62 33101  15959 1R   S3       
-        11         63 33101  15869 1L   S3       
-        11         64 33101  16126 1R   S3       
-        11         65 33101  21903 1L   S5       
-        11         66 33101  15987 1R   S3       
-        11         67 33101  22779 1L   S5       
-        11         68 33101  18401 1R   P8       
-        11         69 33101  22784 1L   S5       
-        11         70 33101  21910 1R   S5       
-        11         71 33101  22789 1L   S5       
-        11         72 33101  21916 1R   S5       
-        11         73 33101  22794 1L   S5       
-        11         74 33101  21921 1R   S5       
-        11         75 33101  22799 1L   S5       
-        11         76 33101  21926 1R   S5       
-        11         77 33101  22804 1L   S5       
-        11         78 33101  21931 1R   S5       
-        11         79 33101  22809 1L   S5       
-        11         80 33101  21937 1R   S5       
-        11         81 33101  15818 1L   S3       
-        11         82 33101  15907 1R   S3       
-        11         83 33101  15911 1L   S3       
-        11         84 33101  16127 1R   S3       
-        11         85 33101  21904 1L   S5       
-        11         86 33101  15995 1R   S3       
-        11         87 33101  22780 1L   S5       
-        11         88 33101  21905 1R   S5       
-        11         89 33101  22785 1L   S5       
-        11         90 33101  21911 1R   S5       
-        11         91 33101  22790 1L   S5       
-        11         92 33101  21917 1R   S5       
-        11         93 33101  22795 1L   S5       
-        11         94 33101  21922 1R   S5       
-        11         95 33101  22800 1L   S5       
-        11         96 33101  21927 1R   S5       
-        11         97 33101  22805 1L   S5       
-        11         98 33101  21932 1R   S5       
-        11         99 33101  22775 1L   S5       
-        11        100 33101  21938 1R   S5       
-        11        101 33101  18803 2L   S4       
-        11        102 33101   8218 2R   P3       
-        11        103 33101  18809 2L   S4       
-        11        104 33101  16415 2R   S3       
-        11        105 33101  21404 2L   P9       
-        11        106 33101  16267 2R   S3       
-        11        107 33101  16163 2L   S3       
-        11        108 33101  21999 2R   S5       
-        11        109 33101  22096 2L   S5       
-        11        110 33101  22004 2R   S5       
-        11        111 33101  22101 2L   S5       
-        11        112 33101  22009 2R   S5       
-        11        113 33101  22107 2L   S5       
-        11        114 33101  22014 2R   S5       
-        11        115 33101  22112 2L   S5       
-        11        116 33101  22019 2R   S5       
-        11        117 33101  22117 2L   S5       
-        11        118 33101  22024 2R   S5       
-        11        119 33101  22122 2L   S5       
-        11        120 33101  22030 2R   S5       
-        11        121 33101  18804 2L   S4       
-        11        122 33101  16410 2R   S3       
-        11        123 33101  18812 2L   S4       
-        11        124 33101  10423 2R   S1       
-        11        125 33101  10535 2L   S1       
-        11        126 33101  16304 2R   S3       
-        11        127 33101  16167 2L   S3       
-        11        128 33101  22000 2R   S5       
-        11        129 33101  22097 2L   S5       
-        11        130 33101  22005 2R   S5       
-        11        131 33101  22102 2L   S5       
-        11        132 33101  22010 2R   S5       
-        11        133 33101  22108 2L   S5       
-        11        134 33101  22015 2R   S5       
-        11        135 33101  22113 2L   S5       
-        11        136 33101  22020 2R   S5       
-        11        137 33101  22118 2L   S5       
-        11        138 33101  22025 2R   S5       
-        11        139 33101  22123 2L   S5       
-        11        140 33101  22031 2R   S5       
-        11        141 33101  18805 2L   S4       
-        11        142 33101  16411 2R   S3       
-        11        143 33101  18816 2L   S4       
-        11        144 33101  10436 2R   S1       
-        11        145 33101  12928 2L   S2       
-        11        146 33101  18402 2R   P8       
-        11        147 33101  18822 2L   S4       
-        11        148 33101  22001 2R   S5       
-        11        149 33101  22098 2L   S5       
-        11        150 33101  22006 2R   S5       
-        11        151 33101  22103 2L   S5       
-        11        152 33101  22011 2R   S5       
-        11        153 33101  22109 2L   S5       
-        11        154 33101  22016 2R   S5       
-        11        155 33101  22114 2L   S5       
-        11        156 33101  22021 2R   S5       
-        11        157 33101  22119 2L   S5       
-        11        158 33101  22026 2R   S5       
-        11        159 33101  22124 2L   S5       
-        11        160 33101  22032 2R   S5       
-        11        161 33101  18807 2L   S4       
-        11        162 33101  16413 2R   S3       
-        11        163 33101  18818 2L   S4       
-        11        164 33101  10449 2R   S1       
-        11        165 33101  12972 2L   S2       
-        11        166 33101  18403 2R   P8       
-        11        167 33101  18824 2L   S4       
-        11        168 33101  22002 2R   S5       
-        11        169 33101  22099 2L   S5       
-        11        170 33101  22007 2R   S5       
-        11        171 33101  22105 2L   S5       
-        11        172 33101  22012 2R   S5       
-        11        173 33101  22110 2L   S5       
-        11        174 33101  22017 2R   S5       
-        11        175 33101  22115 2L   S5       
-        11        176 33101  22022 2R   S5       
-        11        177 33101  22120 2L   S5       
-        11        178 33101  22028 2R   S5       
-        11        179 33101  22125 2L   S5       
-        11        180 33101  22033 2R   S5       
-        11        181 33101  18808 2L   S4       
-        11        182 33101  16414 2R   S3       
-        11        183 33101  18819 2L   S4       
-        11        184 33101  16257 2R   S3       
-        11        185 33101  16140 2L   S3       
-        11        186 33101  21998 2R   S5       
-        11        187 33101  21403 2L   P9       
-        11        188 33101  22003 2R   S5       
-        11        189 33101  22100 2L   S5       
-        11        190 33101  22008 2R   S5       
-        11        191 33101  22106 2L   S5       
-        11        192 33101  22013 2R   S5       
-        11        193 33101  22111 2L   S5       
-        11        194 33101  22018 2R   S5       
-        11        195 33101  22116 2L   S5       
-        11        196 33101  22023 2R   S5       
-        11        197 33101  22121 2L   S5       
-        11        198 33101  22029 2R   S5       
-        11        199 33101  22126 2L   S5       
-        11        200 33101  22034 2R   S5       
-        11        201 33101   8496 3L   P3       
-        11        202 33101  18892 3R   S4       
-        11        203 33101  18860 3L   S4       
-        11        204 33101  18925 3R   S4       
-        11        205 33101  18881 3L   S4       
-        11        206 33101  18936 3R   S4       
-        11        207 33101  16446 3L   S3       
-        11        208 33101  22187 3R   S5       
-        11        209 33101  22283 3L   S5       
-        11        210 33101  22193 3R   S5       
-        11        211 33101  22290 3L   S5       
-        11        212 33101  22199 3R   S5       
-        11        213 33101  22297 3L   S5       
-        11        214 33101  22204 3R   S5       
-        11        215 33101  22302 3L   S5       
-        11        216 33101  22209 3R   S5       
-        11        217 33101  22307 3L   S5       
-        11        218 33101  22215 3R   S5       
-        11        219 33101  22312 3L   S5       
-        11        220 33101  22220 3R   S5       
-        11        221 33101  18839 3L   S4       
-        11        222 33101  18900 3R   S4       
-        11        223 33101  18861 3L   S4       
-        11        224 33101  18931 3R   S4       
-        11        225 33101  18885 3L   S4       
-        11        226 33101  18937 3R   S4       
-        11        227 33101  22278 3L   S5       
-        11        228 33101  22188 3R   S5       
-        11        229 33101  22284 3L   S5       
-        11        230 33101  22194 3R   S5       
-        11        231 33101  22291 3L   S5       
-        11        232 33101  22200 3R   S5       
-        11        233 33101  22298 3L   S5       
-        11        234 33101  22205 3R   S5       
-        11        235 33101  22303 3L   S5       
-        11        236 33101  22210 3R   S5       
-        11        237 33101  22308 3L   S5       
-        11        238 33101  22216 3R   S5       
-        11        239 33101  22313 3L   S5       
-        11        240 33101  22221 3R   S5       
-        11        241 33101  18841 3L   S4       
-        11        242 33101  18905 3R   S4       
-        11        243 33101  18866 3L   S4       
-        11        244 33101  18933 3R   S4       
-        11        245 33101  18887 3L   S4       
-        11        246 33101  21410 3R   P9       
-        11        247 33101  22279 3L   S5       
-        11        248 33101  22189 3R   S5       
-        11        249 33101  22285 3L   S5       
-        11        250 33101  22196 3R   S5       
-        11        251 33101  22292 3L   S5       
-        11        252 33101  22201 3R   S5       
-        11        253 33101  22299 3L   S5       
-        11        254 33101  22206 3R   S5       
-        11        255 33101  22304 3L   S5       
-        11        256 33101  22211 3R   S5       
-        11        257 33101  22309 3L   S5       
-        11        258 33101  22217 3R   S5       
-        11        259 33101  22315 3L   S5       
-        11        260 33101  22222 3R   S5       
-        11        261 33101  18844 3L   S4       
-        11        262 33101  18909 3R   S4       
-        11        263 33101  18871 3L   S4       
-        11        264 33101  18934 3R   S4       
-        11        265 33101  13089 3L   S2       
-        11        266 33101  16581 3R   S3       
-        11        267 33101  22280 3L   S5       
-        11        268 33101  22191 3R   S5       
-        11        269 33101  22287 3L   S5       
-        11        270 33101  22197 3R   S5       
-        11        271 33101  22294 3L   S5       
-        11        272 33101  22202 3R   S5       
-        11        273 33101  22300 3L   S5       
-        11        274 33101  22207 3R   S5       
-        11        275 33101  22305 3L   S5       
-        11        276 33101  22213 3R   S5       
-        11        277 33101  22310 3L   S5       
-        11        278 33101  22218 3R   S5       
-        11        279 33101  22316 3L   S5       
-        11        280 33101  22223 3R   S5       
-        11        281 33101  18858 3L   S4       
-        11        282 33101  18920 3R   S4       
-        11        283 33101  18877 3L   S4       
-        11        284 33101  18935 3R   S4       
-        11        285 33101  16416 3L   S3       
-        11        286 33101  22186 3R   S5       
-        11        287 33101  22282 3L   S5       
-        11        288 33101  22192 3R   S5       
-        11        289 33101  22288 3L   S5       
-        11        290 33101  22198 3R   S5       
-        11        291 33101  22295 3L   S5       
-        11        292 33101  22203 3R   S5       
-        11        293 33101  22301 3L   S5       
-        11        294 33101  22208 3R   S5       
-        11        295 33101  22306 3L   S5       
-        11        296 33101  22214 3R   S5       
-        11        297 33101  22311 3L   S5       
-        11        298 33101  22219 3R   S5       
-        11        299 33101  22317 3L   S5       
-        11        300 33101  22224 3R   S5       
-        11        301 33101   8736 4L   P3_2     
-        11        302 33101  18992 4R   S4       
-        11        303 33101  18945 4L   S4       
-        11        304 33101  19030 4R   S4       
-        11        305 33101  18980 4L   S4       
-        11        306 33101  19036 4R   S4       
-        11        307 33101  22457 4L   S5       
-        11        308 33101  10725 4R   S1       
-        11        309 33101  22462 4L   S5       
-        11        310 33101  22373 4R   S5       
-        11        311 33101  22468 4L   S5       
-        11        312 33101  22378 4R   S5       
-        11        313 33101  22473 4L   S5       
-        11        314 33101  22384 4R   S5       
-        11        315 33101  22478 4L   S5       
-        11        316 33101  22390 4R   S5       
-        11        317 33101  22484 4L   S5       
-        11        318 33101  22395 4R   S5       
-        11        319 33101  22489 4L   S5       
-        11        320 33101  22400 4R   S5       
-        11        321 33101   8742 4L   P3_2     
-        11        322 33101  18993 4R   S4       
-        11        323 33101  18948 4L   S4       
-        11        324 33101  19032 4R   S4       
-        11        325 33101  13305 4L   S2       
-        11        326 33101  19037 4R   S4       
-        11        327 33101  22458 4L   S5       
-        11        328 33101  10754 4R   S1       
-        11        329 33101  22464 4L   S5       
-        11        330 33101  22374 4R   S5       
-        11        331 33101  22469 4L   S5       
-        11        332 33101  22379 4R   S5       
-        11        333 33101  22474 4L   S5       
-        11        334 33101  22386 4R   S5       
-        11        335 33101  22479 4L   S5       
-        11        336 33101  22391 4R   S5       
-        11        337 33101  22485 4L   S5       
-        11        338 33101  22396 4R   S5       
-        11        339 33101  22490 4L   S5       
-        11        340 33101  22401 4R   S5       
-        11        341 33101  18940 4L   S4       
-        11        342 33101  19004 4R   S4       
-        11        343 33101  18949 4L   S4       
-        11        344 33101  19033 4R   S4       
-        11        345 33101  13317 4L   S2       
-        11        346 33101  19038 4R   S4       
-        11        347 33101  22459 4L   S5       
-        11        348 33101  16764 4R   S3       
-        11        349 33101  22465 4L   S5       
-        11        350 33101  22375 4R   S5       
-        11        351 33101  22470 4L   S5       
-        11        352 33101  22381 4R   S5       
-        11        353 33101  22475 4L   S5       
-        11        354 33101  22387 4R   S5       
-        11        355 33101  22480 4L   S5       
-        11        356 33101  22392 4R   S5       
-        11        357 33101  22486 4L   S5       
-        11        358 33101  22397 4R   S5       
-        11        359 33101  22491 4L   S5       
-        11        360 33101  22402 4R   S5       
-        11        361 33101  18941 4L   S4       
-        11        362 33101  19020 4R   S4       
-        11        363 33101  18954 4L   S4       
-        11        364 33101  19034 4R   S4       
-        11        365 33101  16640 4L   S3       
-        11        366 33101  19039 4R   S4       
-        11        367 33101  22460 4L   S5       
-        11        368 33101  16835 4R   S3       
-        11        369 33101  22466 4L   S5       
-        11        370 33101  22376 4R   S5       
-        11        371 33101  22471 4L   S5       
-        11        372 33101  22382 4R   S5       
-        11        373 33101  22476 4L   S5       
-        11        374 33101  22388 4R   S5       
-        11        375 33101  22482 4L   S5       
-        11        376 33101  22393 4R   S5       
-        11        377 33101  22487 4L   S5       
-        11        378 33101  22398 4R   S5       
-        11        379 33101  22492 4L   S5       
-        11        380 33101  22403 4R   S5       
-        11        381 33101  18944 4L   S4       
-        11        382 33101  19026 4R   S4       
-        11        383 33101  18956 4L   S4       
-        11        384 33101  19035 4R   S4       
-        11        385 33101  22456 4L   S5       
-        11        386 33101  21411 4R   P9       
-        11        387 33101  22461 4L   S5       
-        11        388 33101  22372 4R   S5       
-        11        389 33101  22467 4L   S5       
-        11        390 33101  22377 4R   S5       
-        11        391 33101  22472 4L   S5       
-        11        392 33101  22383 4R   S5       
-        11        393 33101  22477 4L   S5       
-        11        394 33101  22389 4R   S5       
-        11        395 33101  22483 4L   S5       
-        11        396 33101  22394 4R   S5       
-        11        397 33101  22488 4L   S5       
-        11        398 33101  22399 4R   S5       
-        11        399 33101  22493 4L   S5       
-        11        400 33101  22404 4R   S5       
-        11        401 33101  19042 5L   S4       
-        11        402 33101  19097 5R   S4       
-        11        403 33101  19067 5L   S4       
-        11        404 33101  19135 5R   S4       
-        11        405 33101  19089 5L   S4       
-        11        406 33101  21413 5R   P9       
-        11        407 33101  16893 5L   S3       
-        11        408 33101  10856 5R   S1       
-        11        409 33101  22913 5L   S5       
-        11        410 33101  22555 5R   S5       
-        11        411 33101  22653 5L   S5       
-        11        412 33101  22570 5R   S5       
-        11        413 33101  22643 5L   S5       
-        11        414 33101  22560 5R   S5       
-        11        415 33101  22648 5L   S5       
-        11        416 33101  22565 5R   S5       
-        11        417 33101  22658 5L   S5       
-        11        418 33101  22575 5R   S5       
-        11        419 33101  22663 5L   S5       
-        11        420 33101  22580 5R   S5       
-        11        421 33101  19046 5L   S4       
-        11        422 33101  19101 5R   S4       
-        11        423 33101  19074 5L   S4       
-        11        424 33101  19138 5R   S4       
-        11        425 33101  19090 5L   S4       
-        11        426 33101  21414 5R   P9       
-        11        427 33101  22908 5L   S5       
-        11        428 33101  10900 5R   S1       
-        11        429 33101  22914 5L   S5       
-        11        430 33101  22556 5R   S5       
-        11        431 33101  22654 5L   S5       
-        11        432 33101  22571 5R   S5       
-        11        433 33101  22644 5L   S5       
-        11        434 33101  22561 5R   S5       
-        11        435 33101  22649 5L   S5       
-        11        436 33101  22566 5R   S5       
-        11        437 33101  22659 5L   S5       
-        11        438 33101  22576 5R   S5       
-        11        439 33101  22664 5L   S5       
-        11        440 33101  22581 5R   S5       
-        11        441 33101  19051 5L   S4       
-        11        442 33101  19103 5R   S4       
-        11        443 33101  19077 5L   S4       
-        11        444 33101  19139 5R   S4       
-        11        445 33101  19091 5L   S4       
-        11        446 33101  21415 5R   P9       
-        11        447 33101  22909 5L   S5       
-        11        448 33101  17024 5R   S3       
-        11        449 33101  22915 5L   S5       
-        11        450 33101  22557 5R   S5       
-        11        451 33101  22655 5L   S5       
-        11        452 33101  22572 5R   S5       
-        11        453 33101  22645 5L   S5       
-        11        454 33101  22562 5R   S5       
-        11        455 33101  22650 5L   S5       
-        11        456 33101  22567 5R   S5       
-        11        457 33101  22660 5L   S5       
-        11        458 33101  22577 5R   S5       
-        11        459 33101  22666 5L   S5       
-        11        460 33101  22582 5R   S5       
-        11        461 33101  19058 5L   S4       
-        11        462 33101  19123 5R   S4       
-        11        463 33101  19087 5L   S4       
-        11        464 33101  19140 5R   S4       
-        11        465 33101  13512 5L   S2       
-        11        466 33101  21416 5R   P9       
-        11        467 33101  22910 5L   S5       
-        11        468 33101  22553 5R   S5       
-        11        469 33101  22916 5L   S5       
-        11        470 33101  22558 5R   S5       
-        11        471 33101  22656 5L   S5       
-        11        472 33101  22573 5R   S5       
-        11        473 33101  22646 5L   S5       
-        11        474 33101  22563 5R   S5       
-        11        475 33101  22651 5L   S5       
-        11        476 33101  22568 5R   S5       
-        11        477 33101  22661 5L   S5       
-        11        478 33101  22578 5R   S5       
-        11        479 33101  22667 5L   S5       
-        11        480 33101  22583 5R   S5       
-        11        481 33101  19059 5L   S4       
-        11        482 33101  19125 5R   S4       
-        11        483 33101  19088 5L   S4       
-        11        484 33101  19142 5R   S4       
-        11        485 33101  13516 5L   S2       
-        11        486 33101  21417 5R   P9       
-        11        487 33101  22912 5L   S5       
-        11        488 33101  22554 5R   S5       
-        11        489 33101  22641 5L   S5       
-        11        490 33101  22559 5R   S5       
-        11        491 33101  22657 5L   S5       
-        11        492 33101  22574 5R   S5       
-        11        493 33101  22647 5L   S5       
-        11        494 33101  22564 5R   S5       
-        11        495 33101  22652 5L   S5       
-        11        496 33101  22569 5R   S5       
-        11        497 33101  22662 5L   S5       
-        11        498 33101  22579 5R   S5       
-        11        499 33101  22668 5L   S5       
-        11        500 33101  17060 5R   S3       
-        11        501 33101  22931 6L   S5-2     
-        11        502 33101  23020 6R   S5-2     
-        11        503 33101  22926 6L   S5-2     
-        11        504 33101  23036 6R   S5-2     
-        11        505 33101  22895 6L   S5-2     
-        11        506 33101  22996 6R   S5-1     
-        11        507 33101  22890 6L   S5-2     
-        11        508 33101  23031 6R   S5-2     
-        11        509 33101  22875 6L   S5-1     
-        11        510 33101  23026 6R   S5-2     
-        11        511 33101  22921 6L   S5-2     
-        11        512 33101  23021 6R   S5-2     
-        11        513 33101  22900 6L   S5-2     
-        11        514 33101  23009 6R   S5-1     
-        11        515 33101  22885 6L   S5-2     
-        11        516 33101  23000 6R   S5-1     
-        11        517 33101  22880 6L   S5-2     
-        11        518 33101  22991 6R   S5-1     
-        11        519 33101  21519 6L   P9       
-        11        520 33101  21561 6R   P9       
-        11        521 33101  22932 6L   S5-2     
-        11        522 33101  23042 6R   S5-2     
-        11        523 33101  22927 6L   S5-2     
-        11        524 33101  23037 6R   S5-2     
-        11        525 33101  22896 6L   S5-2     
-        11        526 33101  22997 6R   S5-1     
-        11        527 33101  22891 6L   S5-2     
-        11        528 33101  23032 6R   S5-2     
-        11        529 33101  22876 6L   S5-1     
-        11        530 33101  23027 6R   S5-2     
-        11        531 33101  22922 6L   S5-2     
-        11        532 33101  23022 6R   S5-2     
-        11        533 33101  22917 6L   S5-2     
-        11        534 33101  23010 6R   S5-1     
-        11        535 33101  22886 6L   S5-2     
-        11        536 33101  23004 6R   S5-1     
-        11        537 33101  22881 6L   S5-2     
-        11        538 33101  22992 6R   S5-1     
-        11        539 33101  21520 6L   P9       
-        11        540 33101  21562 6R   P9       
-        11        541 33101  22933 6L   S5-2     
-        11        542 33101  23043 6R   S5-2     
-        11        543 33101  22928 6L   S5-2     
-        11        544 33101  23038 6R   S5-2     
-        11        545 33101  22897 6L   S5-2     
-        11        546 33101  22998 6R   S5-1     
-        11        547 33101  22892 6L   S5-2     
-        11        548 33101  23033 6R   S5-2     
-        11        549 33101  22877 6L   S5-1     
-        11        550 33101  23028 6R   S5-2     
-        11        551 33101  22923 6L   S5-2     
-        11        552 33101  23023 6R   S5-2     
-        11        553 33101  22918 6L   S5-2     
-        11        554 33101  23011 6R   S5-2     
-        11        555 33101  22887 6L   S5-2     
-        11        556 33101  23006 6R   S5-1     
-        11        557 33101  22882 6L   S5-2     
-        11        558 33101  22993 6R   S5-1     
-        11        559 33101  21521 6L   P9       
-        11        560 33101  21563 6R   P9       
-        11        561 33101  22934 6L   S5-2     
-        11        562 33101  23044 6R   S5-2     
-        11        563 33101  22929 6L   S5-2     
-        11        564 33101  23039 6R   S5-2     
-        11        565 33101  22898 6L   S5-2     
-        11        566 33101  22999 6R   S5-1     
-        11        567 33101  22893 6L   S5-2     
-        11        568 33101  23034 6R   S5-2     
-        11        569 33101  22878 6L   S5-2     
-        11        570 33101  23029 6R   S5-2     
-        11        571 33101  22924 6L   S5-2     
-        11        572 33101  23024 6R   S5-2     
-        11        573 33101  22919 6L   S5-2     
-        11        574 33101  23012 6R   S5-2     
-        11        575 33101  22888 6L   S5-2     
-        11        576 33101  23007 6R   S5-1     
-        11        577 33101  22883 6L   S5-2     
-        11        578 33101  22994 6R   S5-1     
-        11        579 33101  21522 6L   P9       
-        11        580 33101  21564 6R   P9       
-        11        581 33101  22935 6L   S5-2     
-        11        582 33101  23045 6R   S5-2     
-        11        583 33101  22930 6L   S5-2     
-        11        584 33101  23040 6R   S5-2     
-        11        585 33101  22899 6L   S5-2     
-        11        586 33101  23014 6R   S5-2     
-        11        587 33101  22894 6L   S5-2     
-        11        588 33101  23035 6R   S5-2     
-        11        589 33101  22879 6L   S5-2     
-        11        590 33101  23030 6R   S5-2     
-        11        591 33101  22925 6L   S5-2     
-        11        592 33101  23025 6R   S5-2     
-        11        593 33101  22920 6L   S5-2     
-        11        594 33101  23013 6R   S5-2     
-        11        595 33101  22889 6L   S5-2     
-        11        596 33101  23008 6R   S5-1     
-        11        597 33101  22884 6L   S5-2     
-        11        598 33101  22995 6R   S5-1     
-        11        599 33101  21523 6L   P9       
-        11        600 33101  21565 6R   P9       
-        11        601 33101  21594 7L   P9       
-        11        602 33101  23207 7R   S5-1     
-        11        603 33101  23148 7L   S5-2     
-        11        604 33101  23216 7R   S5-2     
-        11        605 33101  23143 7L   S5-2     
-        11        606 33101  23206 7R   S5-1     
-        11        607 33101  23121 7L   S5-2     
-        11        608 33101  23221 7R   S5-2     
-        11        609 33101  23128 7L   S5-2     
-        11        610 33101  23211 7R   S5-2     
-        11        611 33101  23122 7L   S5-2     
-        11        612 33101  23246 7R   S5-2     
-        11        613 33101  23116 7L   S5-2     
-        11        614 33101  23252 7R   S5-2     
-        11        615 33101  23111 7L   S5-2     
-        11        616 33101  23241 7R   S5-2     
-        11        617 33101  23106 7L   S5-2     
-        11        618 33101  23236 7R   S5-2     
-        11        619 33101  23101 7L   S5-2     
-        11        620 33101  23226 7R   S5-2     
-        11        621 33101  23137 7L   S5-2     
-        11        622 33101  23222 7R   S5-2     
-        11        623 33101  23149 7L   S5-2     
-        11        624 33101  23217 7R   S5-2     
-        11        625 33101  23144 7L   S5-2     
-        11        626 33101  23208 7R   S5-2     
-        11        627 33101  23127 7L   S5-2     
-        11        628 33101  23232 7R   S5-2     
-        11        629 33101  23129 7L   S5-2     
-        11        630 33101  23212 7R   S5-2     
-        11        631 33101  23123 7L   S5-2     
-        11        632 33101  23248 7R   S5-2     
-        11        633 33101  23117 7L   S5-2     
-        11        634 33101  23253 7R   S5-2     
-        11        635 33101  23112 7L   S5-2     
-        11        636 33101  23242 7R   S5-2     
-        11        637 33101  23107 7L   S5-2     
-        11        638 33101  23237 7R   S5-2     
-        11        639 33101  23102 7L   S5-2     
-        11        640 33101  23227 7R   S5-2     
-        11        641 33101  23140 7L   S5-2     
-        11        642 33101  23224 7R   S5-2     
-        11        643 33101  23150 7L   S5-2     
-        11        644 33101  23218 7R   S5-2     
-        11        645 33101  23145 7L   S5-2     
-        11        646 33101  23209 7R   S5-2     
-        11        647 33101  23132 7L   S5-2     
-        11        648 33101  23233 7R   S5-2     
-        11        649 33101  23130 7L   S5-2     
-        11        650 33101  23213 7R   S5-2     
-        11        651 33101  23124 7L   S5-2     
-        11        652 33101  23249 7R   S5-2     
-        11        653 33101  23118 7L   S5-2     
-        11        654 33101  23254 7R   S5-2     
-        11        655 33101  23113 7L   S5-2     
-        11        656 33101  23243 7R   S5-2     
-        11        657 33101  23108 7L   S5-2     
-        11        658 33101  23238 7R   S5-2     
-        11        659 33101  23103 7L   S5-2     
-        11        660 33101  23228 7R   S5-2     
-        11        661 33101  23141 7L   S5-2     
-        11        662 33101  23225 7R   S5-2     
-        11        663 33101  23151 7L   S5-2     
-        11        664 33101  23219 7R   S5-2     
-        11        665 33101  23146 7L   S5-2     
-        11        666 33101  23210 7R   S5-2     
-        11        667 33101  23133 7L   S5-2     
-        11        668 33101  23234 7R   S5-2     
-        11        669 33101  23131 7L   S5-2     
-        11        670 33101  23214 7R   S5-2     
-        11        671 33101  23125 7L   S5-2     
-        11        672 33101  23250 7R   S5-2     
-        11        673 33101  23119 7L   S5-2     
-        11        674 33101  23255 7R   S5-2     
-        11        675 33101  23114 7L   S5-2     
-        11        676 33101  23244 7R   S5-2     
-        11        677 33101  23109 7L   S5-2     
-        11        678 33101  23239 7R   S5-2     
-        11        679 33101  23104 7L   S5-2     
-        11        680 33101  23229 7R   S5-2     
-        11        681 33101  23142 7L   S5-2     
-        11        682 33101  23231 7R   S5-2     
-        11        683 33101  23152 7L   S5-2     
-        11        684 33101  23220 7R   S5-2     
-        11        685 33101  23147 7L   S5-2     
-        11        686 33101  23223 7R   S5-2     
-        11        687 33101  23135 7L   S5-2     
-        11        688 33101  23235 7R   S5-2     
-        11        689 33101  23134 7L   S5-2     
-        11        690 33101  23215 7R   S5-2     
-        11        691 33101  23126 7L   S5-2     
-        11        692 33101  23251 7R   S5-2     
-        11        693 33101  23120 7L   S5-2     
-        11        694 33101  23256 7R   S5-2     
-        11        695 33101  23115 7L   S5-2     
-        11        696 33101  23245 7R   S5-2     
-        11        697 33101  23110 7L   S5-2     
-        11        698 33101  23240 7R   S5-2     
-        11        699 33101  23105 7L   S5-2     
-        11        700 33101  23230 7R   S5-2     
-        11        701 33101  23352 8L   S5-2     
-        11        702 33101  23427 8R   S5-2     
-        11        703 33101  23311 8L   S5-2     
-        11        704 33101  23432 8R   S5-2     
-        11        705 33101  23362 8L   S5-2     
-        11        706 33101  23444 8R   S5-2     
-        11        707 33101  23367 8L   S5-2     
-        11        708 33101  23412 8R   S5-2     
-        11        709 33101  23326 8L   S5-2     
-        11        710 33101  23437 8R   S5-2     
-        11        711 33101  23322 8L   S5-2     
-        11        712 33101  23416 8R   S5-2     
-        11        713 33101  23344 8L   S5-2     
-        11        714 33101  23422 8R   S5-2     
-        11        715 33101  23351 8L   S5-2     
-        11        716 33101  23406 8R   S5-2     
-        11        717 33101  23337 8L   S5-2     
-        11        718 33101  23401 8R   S5-2     
-        11        719 33101  23327 8L   S5-2     
-        11        720 33101  23396 8R   S5-2     
-        11        721 33101  23358 8L   S5-2     
-        11        722 33101  23429 8R   S5-2     
-        11        723 33101  23312 8L   S5-2     
-        11        724 33101  23433 8R   S5-2     
-        11        725 33101  23363 8L   S5-2     
-        11        726 33101  23448 8R   S5-2     
-        11        727 33101  23368 8L   S5-2     
-        11        728 33101  23413 8R   S5-2     
-        11        729 33101  23333 8L   S5-2     
-        11        730 33101  23438 8R   S5-2     
-        11        731 33101  23323 8L   S5-2     
-        11        732 33101  23417 8R   S5-2     
-        11        733 33101  23346 8L   S5-2     
-        11        734 33101  23423 8R   S5-2     
-        11        735 33101  23353 8L   S5-2     
-        11        736 33101  23407 8R   S5-2     
-        11        737 33101  23338 8L   S5-2     
-        11        738 33101  23402 8R   S5-2     
-        11        739 33101  23328 8L   S5-2     
-        11        740 33101  23397 8R   S5-2     
-        11        741 33101  23359 8L   S5-2     
-        11        742 33101  23430 8R   S5-2     
-        11        743 33101  23313 8L   S5-2     
-        11        744 33101  23434 8R   S5-2     
-        11        745 33101  23364 8L   S5-2     
-        11        746 33101  23449 8R   S5-2     
-        11        747 33101  23369 8L   S5-2     
-        11        748 33101  23414 8R   S5-2     
-        11        749 33101  23334 8L   S5-2     
-        11        750 33101  23439 8R   S5-2     
-        11        751 33101  23324 8L   S5-2     
-        11        752 33101  23418 8R   S5-2     
-        11        753 33101  23347 8L   S5-2     
-        11        754 33101  23424 8R   S5-2     
-        11        755 33101  23354 8L   S5-2     
-        11        756 33101  23408 8R   S5-2     
-        11        757 33101  23339 8L   S5-2     
-        11        758 33101  23403 8R   S5-2     
-        11        759 33101  23329 8L   S5-2     
-        11        760 33101  23398 8R   S5-2     
-        11        761 33101  23360 8L   S5-2     
-        11        762 33101  23431 8R   S5-2     
-        11        763 33101  23314 8L   S5-2     
-        11        764 33101  23435 8R   S5-2     
-        11        765 33101  23365 8L   S5-2     
-        11        766 33101  23450 8R   S5-2     
-        11        767 33101  23370 8L   S5-2     
-        11        768 33101  23442 8R   S5-2     
-        11        769 33101  23335 8L   S5-2     
-        11        770 33101  23440 8R   S5-2     
-        11        771 33101  23342 8L   S5-2     
-        11        772 33101  23420 8R   S5-2     
-        11        773 33101  23348 8L   S5-2     
-        11        774 33101  23425 8R   S5-2     
-        11        775 33101  23355 8L   S5-2     
-        11        776 33101  23409 8R   S5-2     
-        11        777 33101  23340 8L   S5-2     
-        11        778 33101  23404 8R   S5-2     
-        11        779 33101  23330 8L   S5-2     
-        11        780 33101  23399 8R   S5-2     
-        11        781 33101  23361 8L   S5-2     
-        11        782 33101  23452 8R   S5-2     
-        11        783 33101  23321 8L   S5-2     
-        11        784 33101  23436 8R   S5-2     
-        11        785 33101  23366 8L   S5-2     
-        11        786 33101  23451 8R   S5-2     
-        11        787 33101  23371 8L   S5-2     
-        11        788 33101  23443 8R   S5-2     
-        11        789 33101  23336 8L   S5-2     
-        11        790 33101  23441 8R   S5-2     
-        11        791 33101  23343 8L   S5-2     
-        11        792 33101  23415 8R   S5-2     
-        11        793 33101  23349 8L   S5-2     
-        11        794 33101  23426 8R   S5-2     
-        11        795 33101  23356 8L   S5-2     
-        11        796 33101  23410 8R   S5-2     
-        11        797 33101  23341 8L   S5-2     
-        11        798 33101  23405 8R   S5-2     
-        11        799 33101  23331 8L   S5-2     
-        11        800 33101  23400 8R   S5-2     
-        11        801 33101  25031 9L   P10      
-        11        802 33101  25118 9R   P10      
-        11        803 33101  25012 9L   P10      
-        11        804 33101  25142 9R   P10      
-        11        805 33101  20590 9L   S4       
-        11        806 33101  23500 9R   S5-1     
-        11        807 33101  25026 9L   P10      
-        11        808 33101  25150 9R   P10      
-        11        809 33101  25021 9L   P10      
-        11        810 33101  25162 9R   P10      
-        11        811 33101  11897 9L   S1       
-        11        812 33101  25135 9R   P10      
-        11        813 33101  11846 9L   S1       
-        11        814 33101  25127 9R   P10      
-        11        815 33101  11807 9L   S1       
-        11        816 33101  25123 9R   P10      
-        11        817 33101  21797 9L   P9       
-        11        818 33101  21874 9R   P9       
-        11        819 33101  21837 9L   P9       
-        11        820 33101  21863 9R   P9       
-        11        821 33101  25032 9L   P10      
-        11        822 33101  25119 9R   P10      
-        11        823 33101  25013 9L   P10      
-        11        824 33101  25143 9R   P10      
-        11        825 33101  11819 9L   S1       
-        11        826 33101  25158 9R   P10      
-        11        827 33101  25027 9L   P10      
-        11        828 33101  25151 9R   P10      
-        11        829 33101  25022 9L   P10      
-        11        830 33101  25163 9R   P10      
-        11        831 33101  11890 9L   S1       
-        11        832 33101  25136 9R   P10      
-        11        833 33101  11868 9L   S1       
-        11        834 33101  25128 9R   P10      
-        11        835 33101  23495 9L   S5-1     
-        11        836 33101  25124 9R   P10      
-        11        837 33101  21798 9L   P9       
-        11        838 33101  21879 9R   P9       
-        11        839 33101  21838 9L   P9       
-        11        840 33101  21864 9R   P9       
-        11        841 33101  25033 9L   P10      
-        11        842 33101  25120 9R   P10      
-        11        843 33101  25014 9L   P10      
-        11        844 33101  25145 9R   P10      
-        11        845 33101  11847 9L   S1       
-        11        846 33101  25159 9R   P10      
-        11        847 33101  25028 9L   P10      
-        11        848 33101  25154 9R   P10      
-        11        849 33101  25023 9L   P10      
-        11        850 33101  25164 9R   P10      
-        11        851 33101  20587 9L   S4       
-        11        852 33101  25139 9R   P10      
-        11        853 33101  11869 9L   S1       
-        11        854 33101  25129 9R   P10      
-        11        855 33101  23496 9L   S5-1     
-        11        856 33101  25126 9R   P10      
-        11        857 33101  21799 9L   P9       
-        11        858 33101  21881 9R   P9       
-        11        859 33101  21839 9L   P9       
-        11        860 33101  21876 9R   P9       
-        11        861 33101  25034 9L   P10      
-        11        862 33101  25121 9R   P10      
-        11        863 33101  25015 9L   P10      
-        11        864 33101  25147 9R   P10      
-        11        865 33101  11857 9L   S1       
-        11        866 33101  25160 9R   P10      
-        11        867 33101  25029 9L   P10      
-        11        868 33101  25155 9R   P10      
-        11        869 33101  25024 9L   P10      
-        11        870 33101  25165 9R   P10      
-        11        871 33101  20588 9L   S4       
-        11        872 33101  25140 9R   P10      
-        11        873 33101  11876 9L   S1       
-        11        874 33101  25130 9R   P10      
-        11        875 33101  23497 9L   S5-2     
-        11        876 33101  25132 9R   P10      
-        11        877 33101  21820 9L   P9       
-        11        878 33101  21890 9R   P9       
-        11        879 33101  21840 9L   P9       
-        11        880 33101  21884 9R   P9       
-        11        881 33101  25035 9L   P10      
-        11        882 33101  25122 9R   P10      
-        11        883 33101  25016 9L   P10      
-        11        884 33101  25149 9R   P10      
-        11        885 33101  11867 9L   S1       
-        11        886 33101  25161 9R   P10      
-        11        887 33101  25030 9L   P10      
-        11        888 33101  25156 9R   P10      
-        11        889 33101  25025 9L   P10      
-        11        890 33101  23499 9R   S5-1     
-        11        891 33101  20589 9L   S4       
-        11        892 33101  25141 9R   P10      
-        11        893 33101  11888 9L   S1       
-        11        894 33101  25131 9R   P10      
-        11        895 33101  23498 9L   S5-2     
-        11        896 33101  25134 9R   P10      
-        11        897 33101  21825 9L   P9       
-        11        898 33101  21894 9R   P9       
-        11        899 33101  21841 9L   P9       
-        11        900 33101  21886 9R   P9       
-        11        901 33101  25232 10L  P10      
-        11        902 33101  25316 10R  P10      
-        11        903 33101  25226 10L  P10      
-        11        904 33101  25308 10R  P10      
-        11        905 33101  25236 10L  P10      
-        11        906 33101  25318 10R  P10      
-        11        907 33101  25254 10L  P10      
-        11        908 33101  25294 10R  P10      
-        11        909 33101  25268 10L  P10      
-        11        910 33101  25340 10R  P10      
-        11        911 33101  25253 10L  P10      
-        11        912 33101  25319 10R  P10      
-        11        913 33101  25265 10L  P10      
-        11        914 33101  25277 10R  P10      
-        11        915 33101  25263 10L  P10      
-        11        916 33101  25288 10R  P10      
-        11        917 33101  25264 10L  P10      
-        11        918 33101  25299 10R  P10      
-        11        919 33101  25233 10L  P10      
-        11        920 33101  25283 10R  P10      
-        11        921 33101  25248 10L  P10      
-        11        922 33101  25281 10R  P10      
-        11        923 33101  25227 10L  P10      
-        11        924 33101  25309 10R  P10      
-        11        925 33101  25237 10L  P10      
-        11        926 33101  25335 10R  P10      
-        11        927 33101  25255 10L  P10      
-        11        928 33101  25325 10R  P10      
-        11        929 33101  25269 10L  P10      
-        11        930 33101  25341 10R  P10      
-        11        931 33101  25257 10L  P10      
-        11        932 33101  25320 10R  P10      
-        11        933 33101  25249 10L  P10      
-        11        934 33101  25278 10R  P10      
-        11        935 33101  25273 10L  P10      
-        11        936 33101  25289 10R  P10      
-        11        937 33101  25235 10L  P10      
-        11        938 33101  25300 10R  P10      
-        11        939 33101  25238 10L  P10      
-        11        940 33101  25284 10R  P10      
-        11        941 33101  25261 10L  P10      
-        11        942 33101  25285 10R  P10      
-        11        943 33101  25228 10L  P10      
-        11        944 33101  25310 10R  P10      
-        11        945 33101  25245 10L  P10      
-        11        946 33101  25336 10R  P10      
-        11        947 33101  25256 10L  P10      
-        11        948 33101  25326 10R  P10      
-        11        949 33101  25270 10L  P10      
-        11        950 33101  25342 10R  P10      
-        11        951 33101  25260 10L  P10      
-        11        952 33101  25321 10R  P10      
-        11        953 33101  25250 10L  P10      
-        11        954 33101  25279 10R  P10      
-        11        955 33101  25275 10L  P10      
-        11        956 33101  25290 10R  P10      
-        11        957 33101  25241 10L  P10      
-        11        958 33101  25302 10R  P10      
-        11        959 33101  25239 10L  P10      
-        11        960 33101  25286 10R  P10      
-        11        961 33101  25266 10L  P10      
-        11        962 33101  25296 10R  P10      
-        11        963 33101  25229 10L  P10      
-        11        964 33101  25311 10R  P10      
-        11        965 33101  25246 10L  P10      
-        11        966 33101  25338 10R  P10      
-        11        967 33101  25258 10L  P10      
-        11        968 33101  25327 10R  P10      
-        11        969 33101  25271 10L  P10      
-        11        970 33101  25343 10R  P10      
-        11        971 33101  25262 10L  P10      
-        11        972 33101  25322 10R  P10      
-        11        973 33101  25251 10L  P10      
-        11        974 33101  25282 10R  P10      
-        11        975 33101  25276 10L  P10      
-        11        976 33101  25291 10R  P10      
-        11        977 33101  25243 10L  P10      
-        11        978 33101  25304 10R  P10      
-        11        979 33101  25240 10L  P10      
-        11        980 33101  25287 10R  P10      
-        11        981 33101  25274 10L  P10      
-        11        982 33101  25297 10R  P10      
-        11        983 33101  25231 10L  P10      
-        11        984 33101  25314 10R  P10      
-        11        985 33101  25247 10L  P10      
-        11        986 33101  25339 10R  P10      
-        11        987 33101  25259 10L  P10      
-        11        988 33101  25328 10R  P10      
-        11        989 33101  25272 10L  P10      
-        11        990 33101  25344 10R  P10      
-        11        991 33101  25267 10L  P10      
-        11        992 33101  25323 10R  P10      
-        11        993 33101  25252 10L  P10      
-        11        994 33101  25293 10R  P10      
-        11        995 33101   4060 10L  12       
-        11        996 33101  25292 10R  P10      
-        11        997 33101  25244 10L  P10      
-        11        998 33101  25305 10R  P10      
-        11        999 33101  25242 10L  P10      
-        11       1000 33101  25295 10R  P10      
-        11       1001 33101  25370 11L  P10      
-        11       1002 33101  25432 11R  P10      
-        11       1003 33101  25351 11L  P10      
-        11       1004 33101  25436 11R  P10      
-        11       1005 33101  25391 11L  P10      
-        11       1006 33101  25426 11R  P10      
-        11       1007 33101  25386 11L  P10      
-        11       1008 33101  25421 11R  P10      
-        11       1009 33101  25381 11L  P10      
-        11       1010 33101  25416 11R  P10      
-        11       1011 33101  25373 11L  P10      
-        11       1012 33101  25411 11R  P10      
-        11       1013 33101  25359 11L  P10      
-        11       1014 33101  25406 11R  P10      
-        11       1015 33101  25361 11L  P10      
-        11       1016 33101  25401 11R  P10      
-        11       1017 33101  25352 11L  P10      
-        11       1018 33101  25396 11R  P10      
-        11       1019 33101  25345 11L  P10      
-        11       1020 33101  21018 11R  S4       
-        11       1021 33101  25371 11L  P10      
-        11       1022 33101  25435 11R  P10      
-        11       1023 33101  25355 11L  P10      
-        11       1024 33101  25437 11R  P10      
-        11       1025 33101  25392 11L  P10      
-        11       1026 33101  25427 11R  P10      
-        11       1027 33101  25387 11L  P10      
-        11       1028 33101  25422 11R  P10      
-        11       1029 33101  25382 11L  P10      
-        11       1030 33101  25417 11R  P10      
-        11       1031 33101  25375 11L  P10      
-        11       1032 33101  25412 11R  P10      
-        11       1033 33101  25360 11L  P10      
-        11       1034 33101  25407 11R  P10      
-        11       1035 33101  25362 11L  P10      
-        11       1036 33101  25402 11R  P10      
-        11       1037 33101  25353 11L  P10      
-        11       1038 33101  25397 11R  P10      
-        11       1039 33101  25346 11L  P10      
-        11       1040 33101  21023 11R  S4       
-        11       1041 33101  25374 11L  P10      
-        11       1042 33101  25442 11R  P10      
-        11       1043 33101  25358 11L  P10      
-        11       1044 33101  25438 11R  P10      
-        11       1045 33101  25394 11L  P10      
-        11       1046 33101  25428 11R  P10      
-        11       1047 33101  25388 11L  P10      
-        11       1048 33101  25423 11R  P10      
-        11       1049 33101  25383 11L  P10      
-        11       1050 33101  25418 11R  P10      
-        11       1051 33101  25377 11L  P10      
-        11       1052 33101  25413 11R  P10      
-        11       1053 33101  25367 11L  P10      
-        11       1054 33101  25408 11R  P10      
-        11       1055 33101  25363 11L  P10      
-        11       1056 33101  25403 11R  P10      
-        11       1057 33101  25354 11L  P10      
-        11       1058 33101  25398 11R  P10      
-        11       1059 33101  25347 11L  P10      
-        11       1060 33101  21024 11R  S4       
-        11       1061 33101  25376 11L  P10      
-        11       1062 33101  25444 11R  P10      
-        11       1063 33101  25366 11L  P10      
-        11       1064 33101  25439 11R  P10      
-        11       1065 33101  25395 11L  P10      
-        11       1066 33101  25429 11R  P10      
-        11       1067 33101  25389 11L  P10      
-        11       1068 33101  25424 11R  P10      
-        11       1069 33101  25384 11L  P10      
-        11       1070 33101  25419 11R  P10      
-        11       1071 33101  25378 11L  P10      
-        11       1072 33101  25414 11R  P10      
-        11       1073 33101  25368 11L  P10      
-        11       1074 33101  25409 11R  P10      
-        11       1075 33101  25364 11L  P10      
-        11       1076 33101  25404 11R  P10      
-        11       1077 33101  25356 11L  P10      
-        11       1078 33101  25399 11R  P10      
-        11       1079 33101  25349 11L  P10      
-        11       1080 33101  21030 11R  S4       
-        11       1081 33101  25379 11L  P10      
-        11       1082 33101  25445 11R  P10      
-        11       1083 33101  20925 11L  S4       
-        11       1084 33101  25440 11R  P10      
-        11       1085 33101  20928 11L  S4       
-        11       1086 33101  25430 11R  P10      
-        11       1087 33101  25390 11L  P10      
-        11       1088 33101  25425 11R  P10      
-        11       1089 33101  25385 11L  P10      
-        11       1090 33101  25420 11R  P10      
-        11       1091 33101  25380 11L  P10      
-        11       1092 33101  25415 11R  P10      
-        11       1093 33101  25369 11L  P10      
-        11       1094 33101  25410 11R  P10      
-        11       1095 33101  25372 11L  P10      
-        11       1096 33101  25405 11R  P10      
-        11       1097 33101  25357 11L  P10      
-        11       1098 33101  25400 11R  P10      
-        11       1099 33101  25350 11L  P10      
-        11       1100 33101  21031 11R  S4       
-        11       1101 33101  25473 12L  P10      
-        11       1102 33101  25510 12R  P10      
-        11       1103 33101  25497 12L  P10      
-        11       1104 33101  25530 12R  P10      
-        11       1105 33101  25482 12L  P10      
-        11       1106 33101  25535 12R  P10      
-        11       1107 33101  25477 12L  P10      
-        11       1108 33101  25545 12R  P10      
-        11       1109 33101  25467 12L  P10      
-        11       1110 33101  25539 12R  P10      
-        11       1111 33101  25457 12L  P10      
-        11       1112 33101  25524 12R  P10      
-        11       1113 33101  25462 12L  P10      
-        11       1114 33101  25515 12R  P10      
-        11       1115 33101  25452 12L  P10      
-        11       1116 33101  25505 12R  P10      
-        11       1117 33101  25447 12L  P10      
-        11       1118 33101  25500 12R  P10      
-        11       1119 33101  11997 12L  S1       
-        11       1120 33101  11905 12R  S1       
-        11       1121 33101  25487 12L  P10      
-        11       1122 33101  25511 12R  P10      
-        11       1123 33101  25498 12L  P10      
-        11       1124 33101  25531 12R  P10      
-        11       1125 33101  25483 12L  P10      
-        11       1126 33101  25538 12R  P10      
-        11       1127 33101  25478 12L  P10      
-        11       1128 33101  25546 12R  P10      
-        11       1129 33101  25468 12L  P10      
-        11       1130 33101  25541 12R  P10      
-        11       1131 33101  25458 12L  P10      
-        11       1132 33101  25526 12R  P10      
-        11       1133 33101  25463 12L  P10      
-        11       1134 33101  25516 12R  P10      
-        11       1135 33101  25453 12L  P10      
-        11       1136 33101  25506 12R  P10      
-        11       1137 33101  25448 12L  P10      
-        11       1138 33101  25501 12R  P10      
-        11       1139 33101  11962 12L  S1       
-        11       1140 33101  11928 12R  S1       
-        11       1141 33101  25488 12L  P10      
-        11       1142 33101  25512 12R  P10      
-        11       1143 33101  25499 12L  P10      
-        11       1144 33101  25532 12R  P10      
-        11       1145 33101  25484 12L  P10      
-        11       1146 33101  25550 12R  P10      
-        11       1147 33101  25479 12L  P10      
-        11       1148 33101  25547 12R  P10      
-        11       1149 33101  25469 12L  P10      
-        11       1150 33101  25542 12R  P10      
-        11       1151 33101  25459 12L  P10      
-        11       1152 33101  25527 12R  P10      
-        11       1153 33101  25464 12L  P10      
-        11       1154 33101  25517 12R  P10      
-        11       1155 33101  25454 12L  P10      
-        11       1156 33101  25507 12R  P10      
-        11       1157 33101  25449 12L  P10      
-        11       1158 33101  25502 12R  P10      
-        11       1159 33101  11968 12L  S1       
-        11       1160 33101  11943 12R  S1       
-        11       1161 33101  25489 12L  P10      
-        11       1162 33101  25513 12R  P10      
-        11       1163 33101  11981 12L  S1       
-        11       1164 33101  25533 12R  P10      
-        11       1165 33101  25485 12L  P10      
-        11       1166 33101  25551 12R  P10      
-        11       1167 33101  25480 12L  P10      
-        11       1168 33101  25548 12R  P10      
-        11       1169 33101  25470 12L  P10      
-        11       1170 33101  25543 12R  P10      
-        11       1171 33101  25461 12L  P10      
-        11       1172 33101  25528 12R  P10      
-        11       1173 33101  25465 12L  P10      
-        11       1174 33101  25518 12R  P10      
-        11       1175 33101  25455 12L  P10      
-        11       1176 33101  25508 12R  P10      
-        11       1177 33101  25450 12L  P10      
-        11       1178 33101  25503 12R  P10      
-        11       1179 33101  11972 12L  S1       
-        11       1180 33101  11948 12R  S1       
-        11       1181 33101  25491 12L  P10      
-        11       1182 33101  25514 12R  P10      
-        11       1183 33101  11998 12L  S1       
-        11       1184 33101  25534 12R  P10      
-        11       1185 33101  25486 12L  P10      
-        11       1186 33101  25552 12R  P10      
-        11       1187 33101  25481 12L  P10      
-        11       1188 33101  25549 12R  P10      
-        11       1189 33101  25471 12L  P10      
-        11       1190 33101  25544 12R  P10      
-        11       1191 33101  25472 12L  P10      
-        11       1192 33101  25529 12R  P10      
-        11       1193 33101  25466 12L  P10      
-        11       1194 33101  25521 12R  P10      
-        11       1195 33101  25456 12L  P10      
-        11       1196 33101  25509 12R  P10      
-        11       1197 33101  25451 12L  P10      
-        11       1198 33101  25504 12R  P10      
-        11       1199 33101  11977 12L  S1       
-        11       1200 33101  11949 12R  S1       
-        11       1201 33101  25582 13L  P10      
-        11       1202 33101  25631 13R  P10      
-        11       1203 33101  25564 13L  P10      
-        11       1204 33101  25623 13R  P10      
-        11       1205 33101  25574 13L  P10      
-        11       1206 33101  25613 13R  P10      
-        11       1207 33101  25604 13L  P10      
-        11       1208 33101  25653 13R  P10      
-        11       1209 33101  25581 13L  P10      
-        11       1210 33101  25655 13R  P10      
-        11       1211 33101  25583 13L  P10      
-        11       1212 33101  25636 13R  P10      
-        11       1213 33101  25599 13L  P10      
-        11       1214 33101  25646 13R  P10      
-        11       1215 33101  25569 13L  P10      
-        11       1216 33101  25610 13R  P10      
-        11       1217 33101  25554 13L  P10      
-        11       1218 33101  25605 13R  P10      
-        11       1219 33101  12103 13L  S1       
-        11       1220 33101  25615 13R  P10      
-        11       1221 33101  25590 13L  P10      
-        11       1222 33101  25642 13R  P10      
-        11       1223 33101  25565 13L  P10      
-        11       1224 33101  25625 13R  P10      
-        11       1225 33101  25575 13L  P10      
-        11       1226 33101  25614 13R  P10      
-        11       1227 33101  25562 13L  P10      
-        11       1228 33101  25632 13R  P10      
-        11       1229 33101  25594 13L  P10      
-        11       1230 33101  25641 13R  P10      
-        11       1231 33101  25585 13L  P10      
-        11       1232 33101  25637 13R  P10      
-        11       1233 33101  25600 13L  P10      
-        11       1234 33101  25647 13R  P10      
-        11       1235 33101  25570 13L  P10      
-        11       1236 33101  25611 13R  P10      
-        11       1237 33101  25555 13L  P10      
-        11       1238 33101  25606 13R  P10      
-        11       1239 33101  12111 13L  S1       
-        11       1240 33101  25617 13R  P10      
-        11       1241 33101  25591 13L  P10      
-        11       1242 33101  25651 13R  P10      
-        11       1243 33101  25566 13L  P10      
-        11       1244 33101  25626 13R  P10      
-        11       1245 33101  25576 13L  P10      
-        11       1246 33101  25616 13R  P10      
-        11       1247 33101  15218 13L  S2       
-        11       1248 33101  25633 13R  P10      
-        11       1249 33101  25595 13L  P10      
-        11       1250 33101  25643 13R  P10      
-        11       1251 33101  25586 13L  P10      
-        11       1252 33101  25638 13R  P10      
-        11       1253 33101  25601 13L  P10      
-        11       1254 33101  25648 13R  P10      
-        11       1255 33101  25571 13L  P10      
-        11       1256 33101  25612 13R  P10      
-        11       1257 33101  25556 13L  P10      
-        11       1258 33101  25607 13R  P10      
-        11       1259 33101  12112 13L  S1       
-        11       1260 33101  25619 13R  P10      
-        11       1261 33101  25592 13L  P10      
-        11       1262 33101  25652 13R  P10      
-        11       1263 33101  25567 13L  P10      
-        11       1264 33101  25627 13R  P10      
-        11       1265 33101  25577 13L  P10      
-        11       1266 33101  25618 13R  P10      
-        11       1267 33101  18628 13L  S3       
-        11       1268 33101  25634 13R  P10      
-        11       1269 33101  25597 13L  P10      
-        11       1270 33101  25644 13R  P10      
-        11       1271 33101  25587 13L  P10      
-        11       1272 33101  25639 13R  P10      
-        11       1273 33101  25602 13L  P10      
-        11       1274 33101  25649 13R  P10      
-        11       1275 33101  25572 13L  P10      
-        11       1276 33101  25628 13R  P10      
-        11       1277 33101  25557 13L  P10      
-        11       1278 33101  25608 13R  P10      
-        11       1279 33101  12134 13L  S1       
-        11       1280 33101  25620 13R  P10      
-        11       1281 33101  25593 13L  P10      
-        11       1282 33101  21399 13R  S4       
-        11       1283 33101  25568 13L  P10      
-        11       1284 33101  25630 13R  P10      
-        11       1285 33101  25578 13L  P10      
-        11       1286 33101  25622 13R  P10      
-        11       1287 33101   7187 13L  P1       
-        11       1288 33101  25635 13R  P10      
-        11       1289 33101  25598 13L  P10      
-        11       1290 33101  25645 13R  P10      
-        11       1291 33101  25588 13L  P10      
-        11       1292 33101  25640 13R  P10      
-        11       1293 33101  25603 13L  P10      
-        11       1294 33101  25650 13R  P10      
-        11       1295 33101  25573 13L  P10      
-        11       1296 33101  25629 13R  P10      
-        11       1297 33101  25558 13L  P10      
-        11       1298 33101  25609 13R  P10      
-        11       1299 33101  21899 13L  P9       
-        11       1300 33101  25621 13R  P10      
-        11       1301 33101  19427 14L  S4       
-        11       1302 33101  19276 14R  S4       
-        11       1303 33101  12382 14L  S1       
-        11       1304 33101  21419 14R  P9       
-        11       1305 33101  24644 14L  P10_1    
-        11       1306 33101  21424 14R  P9       
-        11       1307 33101  24650 14L  P10_1    
-        11       1308 33101  13817 14R  S2       
-        11       1309 33101  24655 14L  P10_1    
-        11       1310 33101  24696 14R  P10_1    
-        11       1311 33101  24660 14L  P10_1    
-        11       1312 33101  24702 14R  P10_1    
-        11       1313 33101  24665 14L  P10_1    
-        11       1314 33101  24707 14R  P10_1    
-        11       1315 33101  24670 14L  P10_1    
-        11       1316 33101  24712 14R  P10_1    
-        11       1317 33101  24675 14L  P10_1    
-        11       1318 33101  24717 14R  P10_1    
-        11       1319 33101  24680 14L  P10_1    
-        11       1320 33101  24723 14R  P10_1    
-        11       1321 33101  19442 14L  S4       
-        11       1322 33101  19179 14R  S4       
-        11       1323 33101  17112 14L  S3       
-        11       1324 33101  21420 14R  P9       
-        11       1325 33101  24645 14L  P10_1    
-        11       1326 33101  21425 14R  P9       
-        11       1327 33101  24651 14L  P10_1    
-        11       1328 33101  13829 14R  S2       
-        11       1329 33101  24656 14L  P10_1    
-        11       1330 33101  24697 14R  P10_1    
-        11       1331 33101  24661 14L  P10_1    
-        11       1332 33101  24703 14R  P10_1    
-        11       1333 33101  24666 14L  P10_1    
-        11       1334 33101  24708 14R  P10_1    
-        11       1335 33101  24671 14L  P10_1    
-        11       1336 33101  24713 14R  P10_1    
-        11       1337 33101  24676 14L  P10_1    
-        11       1338 33101  24718 14R  P10_1    
-        11       1339 33101  24681 14L  P10_1    
-        11       1340 33101  24724 14R  P10_1    
-        11       1341 33101  19428 14L  S4       
-        11       1342 33101  19468 14R  S4       
-        11       1343 33101  18416 14L  P8       
-        11       1344 33101  21421 14R  P9       
-        11       1345 33101  24647 14L  P10_1    
-        11       1346 33101  21426 14R  P9       
-        11       1347 33101  24652 14L  P10_1    
-        11       1348 33101  24693 14R  P10_1    
-        11       1349 33101  24657 14L  P10_1    
-        11       1350 33101  24698 14R  P10_1    
-        11       1351 33101  24662 14L  P10_1    
-        11       1352 33101  24704 14R  P10_1    
-        11       1353 33101  24667 14L  P10_1    
-        11       1354 33101  24709 14R  P10_1    
-        11       1355 33101  24672 14L  P10_1    
-        11       1356 33101  24714 14R  P10_1    
-        11       1357 33101  24677 14L  P10_1    
-        11       1358 33101  24719 14R  P10_1    
-        11       1359 33101  24682 14L  P10_1    
-        11       1360 33101  24725 14R  P10_1    
-        11       1361 33101  19429 14L  S4       
-        11       1362 33101  19469 14R  S4       
-        11       1363 33101  24642 14L  P10_1    
-        11       1364 33101  21422 14R  P9       
-        11       1365 33101  24648 14L  P10_1    
-        11       1366 33101  21427 14R  P9       
-        11       1367 33101  24653 14L  P10_1    
-        11       1368 33101  24694 14R  P10_1    
-        11       1369 33101  24658 14L  P10_1    
-        11       1370 33101  24699 14R  P10_1    
-        11       1371 33101  24663 14L  P10_1    
-        11       1372 33101  24705 14R  P10_1    
-        11       1373 33101  24668 14L  P10_1    
-        11       1374 33101  24710 14R  P10_1    
-        11       1375 33101  24673 14L  P10_1    
-        11       1376 33101  24715 14R  P10_1    
-        11       1377 33101  24678 14L  P10_1    
-        11       1378 33101  24720 14R  P10_1    
-        11       1379 33101  24683 14L  P10_1    
-        11       1380 33101  24726 14R  P10_1    
-        11       1381 33101  19430 14L  S4       
-        11       1382 33101  19470 14R  S4       
-        11       1383 33101  24643 14L  P10_1    
-        11       1384 33101  21423 14R  P9       
-        11       1385 33101  24649 14L  P10_1    
-        11       1386 33101  21428 14R  P9       
-        11       1387 33101  24654 14L  P10_1    
-        11       1388 33101  24695 14R  P10_1    
-        11       1389 33101  24659 14L  P10_1    
-        11       1390 33101  24701 14R  P10_1    
-        11       1391 33101  24664 14L  P10_1    
-        11       1392 33101  24706 14R  P10_1    
-        11       1393 33101  24669 14L  P10_1    
-        11       1394 33101  24711 14R  P10_1    
-        11       1395 33101  24674 14L  P10_1    
-        11       1396 33101  24716 14R  P10_1    
-        11       1397 33101  24679 14L  P10_1    
-        11       1398 33101  24721 14R  P10_1    
-        11       1399 33101  24684 14L  P10_1    
-        11       1400 33101  24728 14R  P10_1    
-        11       1401 33101  19485 15L  S4       
-        11       1402 33101  17233 15R  S3       
-        11       1403 33101  19593 15L  S4       
-        11       1404 33101  17287 15R  S3       
-        11       1405 33101  24750 15L  P10_1    
-        11       1406 33101  24801 15R  P10_1    
-        11       1407 33101  24756 15L  P10_1    
-        11       1408 33101  24806 15R  P10_1    
-        11       1409 33101  24762 15L  P10_1    
-        11       1410 33101  24811 15R  P10_1    
-        11       1411 33101  24767 15L  P10_1    
-        11       1412 33101  24817 15R  P10_1    
-        11       1413 33101  24772 15L  P10_1    
-        11       1414 33101  24822 15R  P10_1    
-        11       1415 33101  24777 15L  P10_1    
-        11       1416 33101  24827 15R  P10_1    
-        11       1417 33101  24784 15L  P10_1    
-        11       1418 33101  24832 15R  P10_1    
-        11       1419 33101  24790 15L  P10_1    
-        11       1420 33101  24838 15R  P10_1    
-        11       1421 33101  19517 15L  S4       
-        11       1422 33101  17240 15R  S3       
-        11       1423 33101  19615 15L  S4       
-        11       1424 33101  17294 15R  S3       
-        11       1425 33101  24751 15L  P10_1    
-        11       1426 33101  24802 15R  P10_1    
-        11       1427 33101  24757 15L  P10_1    
-        11       1428 33101  24807 15R  P10_1    
-        11       1429 33101  24763 15L  P10_1    
-        11       1430 33101  24813 15R  P10_1    
-        11       1431 33101  24768 15L  P10_1    
-        11       1432 33101  24818 15R  P10_1    
-        11       1433 33101  24773 15L  P10_1    
-        11       1434 33101  24823 15R  P10_1    
-        11       1435 33101  24778 15L  P10_1    
-        11       1436 33101  24828 15R  P10_1    
-        11       1437 33101  24786 15L  P10_1    
-        11       1438 33101  24833 15R  P10_1    
-        11       1439 33101  24791 15L  P10_1    
-        11       1440 33101  24839 15R  P10_1    
-        11       1441 33101  19562 15L  S4       
-        11       1442 33101  17241 15R  S3       
-        11       1443 33101  24746 15L  P10_1    
-        11       1444 33101  17300 15R  S3       
-        11       1445 33101  24752 15L  P10_1    
-        11       1446 33101  24803 15R  P10_1    
-        11       1447 33101  24758 15L  P10_1    
-        11       1448 33101  24808 15R  P10_1    
-        11       1449 33101  24764 15L  P10_1    
-        11       1450 33101  24814 15R  P10_1    
-        11       1451 33101  24769 15L  P10_1    
-        11       1452 33101  24819 15R  P10_1    
-        11       1453 33101  24774 15L  P10_1    
-        11       1454 33101  24824 15R  P10_1    
-        11       1455 33101  24779 15L  P10_1    
-        11       1456 33101  24829 15R  P10_1    
-        11       1457 33101  24787 15L  P10_1    
-        11       1458 33101  24834 15R  P10_1    
-        11       1459 33101  24792 15L  P10_1    
-        11       1460 33101  24840 15R  P10_1    
-        11       1461 33101  19587 15L  S4       
-        11       1462 33101  17271 15R  S3       
-        11       1463 33101  24748 15L  P10_1    
-        11       1464 33101  19666 15R  S4       
-        11       1465 33101  24754 15L  P10_1    
-        11       1466 33101  24804 15R  P10_1    
-        11       1467 33101  24759 15L  P10_1    
-        11       1468 33101  24809 15R  P10_1    
-        11       1469 33101  24765 15L  P10_1    
-        11       1470 33101  24815 15R  P10_1    
-        11       1471 33101  24770 15L  P10_1    
-        11       1472 33101  24820 15R  P10_1    
-        11       1473 33101  24775 15L  P10_1    
-        11       1474 33101  24825 15R  P10_1    
-        11       1475 33101  24782 15L  P10_1    
-        11       1476 33101  24830 15R  P10_1    
-        11       1477 33101  24788 15L  P10_1    
-        11       1478 33101  24836 15R  P10_1    
-        11       1479 33101  24793 15L  P10_1    
-        11       1480 33101  24842 15R  P10_1    
-        11       1481 33101  19590 15L  S4       
-        11       1482 33101  17276 15R  S3       
-        11       1483 33101  24749 15L  P10_1    
-        11       1484 33101  24800 15R  P10_1    
-        11       1485 33101  24755 15L  P10_1    
-        11       1486 33101  24805 15R  P10_1    
-        11       1487 33101  24760 15L  P10_1    
-        11       1488 33101  24810 15R  P10_1    
-        11       1489 33101  24766 15L  P10_1    
-        11       1490 33101  24816 15R  P10_1    
-        11       1491 33101  24771 15L  P10_1    
-        11       1492 33101  24821 15R  P10_1    
-        11       1493 33101  24776 15L  P10_1    
-        11       1494 33101  24826 15R  P10_1    
-        11       1495 33101  24783 15L  P10_1    
-        11       1496 33101  24831 15R  P10_1    
-        11       1497 33101  24789 15L  P10_1    
-        11       1498 33101  24837 15R  P10_1    
-        11       1499 33101  24794 15L  P10_1    
-        11       1500 33101  24843 15R  P10_1    
-        11       1501 33101  17352 16L  S3       
-        11       1502 33101  20021 16R  S4       
-        11       1503 33101  19821 16L  S4       
-        11       1504 33101  14175 16R  S2       
-        11       1505 33101  24861 16L  P10_1    
-        11       1506 33101  17442 16R  S3       
-        11       1507 33101  24867 16L  P10_1    
-        11       1508 33101  24914 16R  P10_1    
-        11       1509 33101  24873 16L  P10_1    
-        11       1510 33101  24919 16R  P10_1    
-        11       1511 33101  24878 16L  P10_1    
-        11       1512 33101  24924 16R  P10_1    
-        11       1513 33101  24884 16L  P10_1    
-        11       1514 33101  24931 16R  P10_1    
-        11       1515 33101  24891 16L  P10_1    
-        11       1516 33101  24936 16R  P10_1    
-        11       1517 33101  24898 16L  P10_1    
-        11       1518 33101  24941 16R  P10_1    
-        11       1519 33101  24904 16L  P10_1    
-        11       1520 33101  24946 16R  P10_1    
-        11       1521 33101  17371 16L  S3       
-        11       1522 33101  20023 16R  S4       
-        11       1523 33101  19863 16L  S4       
-        11       1524 33101  14177 16R  S2       
-        11       1525 33101  24862 16L  P10_1    
-        11       1526 33101  24909 16R  P10_1    
-        11       1527 33101  24868 16L  P10_1    
-        11       1528 33101  24915 16R  P10_1    
-        11       1529 33101  24874 16L  P10_1    
-        11       1530 33101  24920 16R  P10_1    
-        11       1531 33101  24879 16L  P10_1    
-        11       1532 33101  24925 16R  P10_1    
-        11       1533 33101  24886 16L  P10_1    
-        11       1534 33101  24932 16R  P10_1    
-        11       1535 33101  24892 16L  P10_1    
-        11       1536 33101  24937 16R  P10_1    
-        11       1537 33101  24900 16L  P10_1    
-        11       1538 33101  24942 16R  P10_1    
-        11       1539 33101  24905 16L  P10_1    
-        11       1540 33101  24947 16R  P10_1    
-        11       1541 33101  17384 16L  S3       
-        11       1542 33101  20024 16R  S4       
-        11       1543 33101  19875 16L  S4       
-        11       1544 33101  17385 16R  S3       
-        11       1545 33101  24863 16L  P10_1    
-        11       1546 33101  24910 16R  P10_1    
-        11       1547 33101  24870 16L  P10_1    
-        11       1548 33101  24916 16R  P10_1    
-        11       1549 33101  24875 16L  P10_1    
-        11       1550 33101  24921 16R  P10_1    
-        11       1551 33101  24881 16L  P10_1    
-        11       1552 33101  24926 16R  P10_1    
-        11       1553 33101  24887 16L  P10_1    
-        11       1554 33101  24933 16R  P10_1    
-        11       1555 33101  24895 16L  P10_1    
-        11       1556 33101  24938 16R  P10_1    
-        11       1557 33101  24901 16L  P10_1    
-        11       1558 33101  24943 16R  P10_1    
-        11       1559 33101  24906 16L  P10_1    
-        11       1560 33101  24948 16R  P10_1    
-        11       1561 33101  19740 16L  S4       
-        11       1562 33101  21433 16R  P9       
-        11       1563 33101  24857 16L  P10_1    
-        11       1564 33101  17407 16R  S3       
-        11       1565 33101  24864 16L  P10_1    
-        11       1566 33101  24912 16R  P10_1    
-        11       1567 33101  24871 16L  P10_1    
-        11       1568 33101  24917 16R  P10_1    
-        11       1569 33101  24876 16L  P10_1    
-        11       1570 33101  24922 16R  P10_1    
-        11       1571 33101  24882 16L  P10_1    
-        11       1572 33101  24928 16R  P10_1    
-        11       1573 33101  24889 16L  P10_1    
-        11       1574 33101  24934 16R  P10_1    
-        11       1575 33101  24896 16L  P10_1    
-        11       1576 33101  24939 16R  P10_1    
-        11       1577 33101  24902 16L  P10_1    
-        11       1578 33101  24944 16R  P10_1    
-        11       1579 33101  24907 16L  P10_1    
-        11       1580 33101  24949 16R  P10_1    
-        11       1581 33101  19789 16L  S4       
-        11       1582 33101  21434 16R  P9       
-        11       1583 33101  24859 16L  P10_1    
-        11       1584 33101  17414 16R  S3       
-        11       1585 33101  24866 16L  P10_1    
-        11       1586 33101  24913 16R  P10_1    
-        11       1587 33101  24872 16L  P10_1    
-        11       1588 33101  24918 16R  P10_1    
-        11       1589 33101  24877 16L  P10_1    
-        11       1590 33101  24923 16R  P10_1    
-        11       1591 33101  24883 16L  P10_1    
-        11       1592 33101  24930 16R  P10_1    
-        11       1593 33101  24890 16L  P10_1    
-        11       1594 33101  24935 16R  P10_1    
-        11       1595 33101  24897 16L  P10_1    
-        11       1596 33101  24940 16R  P10_1    
-        11       1597 33101  24903 16L  P10_1    
-        11       1598 33101  24945 16R  P10_1    
-        11       1599 33101  24908 16L  P10_1    
-        11       1600 33101  24950 16R  P10_1    
-        11       1601 33101  12766 17L  S1       
-        11       1602 33101  12683 17R  S1       
-        11       1603 33101  17486 17L  S3       
-        11       1604 33101  17598 17R  S3       
-        11       1605 33101  17517 17L  S3       
-        11       1606 33101  22727 17R  S5       
-        11       1607 33101  24961 17L  P10_1    
-        11       1608 33101  22732 17R  S5       
-        11       1609 33101  24966 17L  P10_1    
-        11       1610 33101  22738 17R  S5       
-        11       1611 33101  24971 17L  P10_1    
-        11       1612 33101  22743 17R  S5       
-        11       1613 33101  24976 17L  P10_1    
-        11       1614 33101  22751 17R  S5       
-        11       1615 33101  24982 17L  P10_1    
-        11       1616 33101  22757 17R  S5       
-        11       1617 33101  24987 17L  P10_1    
-        11       1618 33101  22762 17R  S5       
-        11       1619 33101  24993 17L  P10_1    
-        11       1620 33101  22767 17R  S5       
-        11       1621 33101  12769 17L  S1       
-        11       1622 33101  17552 17R  S3       
-        11       1623 33101  17489 17L  S3       
-        11       1624 33101  22723 17R  S5       
-        11       1625 33101  22773 17L  S5       
-        11       1626 33101  22728 17R  S5       
-        11       1627 33101  24962 17L  P10_1    
-        11       1628 33101  22733 17R  S5       
-        11       1629 33101  24967 17L  P10_1    
-        11       1630 33101  22739 17R  S5       
-        11       1631 33101  24972 17L  P10_1    
-        11       1632 33101  22744 17R  S5       
-        11       1633 33101  24977 17L  P10_1    
-        11       1634 33101  22752 17R  S5       
-        11       1635 33101  24983 17L  P10_1    
-        11       1636 33101  22758 17R  S5       
-        11       1637 33101  24988 17L  P10_1    
-        11       1638 33101  22763 17R  S5       
-        11       1639 33101  24994 17L  P10_1    
-        11       1640 33101  22768 17R  S5       
-        11       1641 33101  12775 17L  S1       
-        11       1642 33101  17553 17R  S3       
-        11       1643 33101  17491 17L  S3       
-        11       1644 33101  22724 17R  S5       
-        11       1645 33101  24958 17L  P10_1    
-        11       1646 33101  22729 17R  S5       
-        11       1647 33101  24963 17L  P10_1    
-        11       1648 33101  22734 17R  S5       
-        11       1649 33101  24968 17L  P10_1    
-        11       1650 33101  22740 17R  S5       
-        11       1651 33101  24973 17L  P10_1    
-        11       1652 33101  22745 17R  S5       
-        11       1653 33101  24978 17L  P10_1    
-        11       1654 33101  22754 17R  S5       
-        11       1655 33101  24984 17L  P10_1    
-        11       1656 33101  22759 17R  S5       
-        11       1657 33101  24989 17L  P10_1    
-        11       1658 33101  22764 17R  S5       
-        11       1659 33101  24995 17L  P10_1    
-        11       1660 33101  22769 17R  S5       
-        11       1661 33101  17466 17L  S3       
-        11       1662 33101  17562 17R  S3       
-        11       1663 33101  17492 17L  S3       
-        11       1664 33101  22725 17R  S5       
-        11       1665 33101  24959 17L  P10_1    
-        11       1666 33101  22730 17R  S5       
-        11       1667 33101  24964 17L  P10_1    
-        11       1668 33101  22736 17R  S5       
-        11       1669 33101  24969 17L  P10_1    
-        11       1670 33101  22741 17R  S5       
-        11       1671 33101  24974 17L  P10_1    
-        11       1672 33101  22748 17R  S5       
-        11       1673 33101  24979 17L  P10_1    
-        11       1674 33101  22755 17R  S5       
-        11       1675 33101  24985 17L  P10_1    
-        11       1676 33101  22760 17R  S5       
-        11       1677 33101  24990 17L  P10_1    
-        11       1678 33101  22765 17R  S5       
-        11       1679 33101  24996 17L  P10_1    
-        11       1680 33101  22771 17R  S5       
-        11       1681 33101  17474 17L  S3       
-        11       1682 33101  17581 17R  S3       
-        11       1683 33101  17493 17L  S3       
-        11       1684 33101  22726 17R  S5       
-        11       1685 33101  24960 17L  P10_1    
-        11       1686 33101  22731 17R  S5       
-        11       1687 33101  24965 17L  P10_1    
-        11       1688 33101  22737 17R  S5       
-        11       1689 33101  24970 17L  P10_1    
-        11       1690 33101  22742 17R  S5       
-        11       1691 33101  24975 17L  P10_1    
-        11       1692 33101  22750 17R  S5       
-        11       1693 33101  24981 17L  P10_1    
-        11       1694 33101  22756 17R  S5       
-        11       1695 33101  24986 17L  P10_1    
-        11       1696 33101  22761 17R  S5       
-        11       1697 33101  24991 17L  P10_1    
-        11       1698 33101  22766 17R  S5       
-        11       1699 33101  24997 17L  P10_1    
-        11       1700 33101  22772 17R  S5       
-        12          1 33101  22811 1L   S5       
-        12          2 33101  21940 1R   S5       
-        12          3 33101  22816 1L   S5       
-        12          4 33101  21946 1R   S5       
-        12          5 33101  22810 1L   S5       
-        12          6 33101  21951 1R   S5       
-        12          7 33101  22826 1L   S5       
-        12          8 33101  21956 1R   S5       
-        12          9 33101  22831 1L   S5       
-        12         10 33101  21961 1R   S5       
-        12         11 33101  22836 1L   S5       
-        12         12 33101  21966 1R   S5       
-        12         13 33101  22843 1L   S5       
-        12         14 33101  21971 1R   S5       
-        12         15 33101  22848 1L   S5       
-        12         16 33101  21977 1R   S5       
-        12         17 33101  22853 1L   S5       
-        12         18 33101  21981 1R   S5       
-        12         19 33101  22858 1L   S5       
-        12         20 33101  21986 1R   S5       
-        12         21 33101  22812 1L   S5       
-        12         22 33101  21941 1R   S5       
-        12         23 33101  22817 1L   S5       
-        12         24 33101  21947 1R   S5       
-        12         25 33101  22821 1L   S5       
-        12         26 33101  21952 1R   S5       
-        12         27 33101  22827 1L   S5       
-        12         28 33101  21957 1R   S5       
-        12         29 33101  22832 1L   S5       
-        12         30 33101  21962 1R   S5       
-        12         31 33101  22837 1L   S5       
-        12         32 33101  21967 1R   S5       
-        12         33 33101  22844 1L   S5       
-        12         34 33101  21972 1R   S5       
-        12         35 33101  22849 1L   S5       
-        12         36 33101  21976 1R   S5       
-        12         37 33101  22854 1L   S5       
-        12         38 33101  21982 1R   S5       
-        12         39 33101  22859 1L   S5       
-        12         40 33101  21987 1R   S5       
-        12         41 33101  22813 1L   S5       
-        12         42 33101  21942 1R   S5       
-        12         43 33101  22818 1L   S5       
-        12         44 33101  21948 1R   S5       
-        12         45 33101  22823 1L   S5       
-        12         46 33101  21953 1R   S5       
-        12         47 33101  22828 1L   S5       
-        12         48 33101  21958 1R   S5       
-        12         49 33101  22833 1L   S5       
-        12         50 33101  21963 1R   S5       
-        12         51 33101  22839 1L   S5       
-        12         52 33101  21968 1R   S5       
-        12         53 33101  22845 1L   S5       
-        12         54 33101  21973 1R   S5       
-        12         55 33101  22850 1L   S5       
-        12         56 33101  21979 1R   S5       
-        12         57 33101  22855 1L   S5       
-        12         58 33101  21983 1R   S5       
-        12         59 33101  22860 1L   S5       
-        12         60 33101  21988 1R   S5       
-        12         61 33101  22814 1L   S5       
-        12         62 33101  21943 1R   S5       
-        12         63 33101  22819 1L   S5       
-        12         64 33101  21949 1R   S5       
-        12         65 33101  22824 1L   S5       
-        12         66 33101  21954 1R   S5       
-        12         67 33101  22829 1L   S5       
-        12         68 33101  21959 1R   S5       
-        12         69 33101  22834 1L   S5       
-        12         70 33101  21964 1R   S5       
-        12         71 33101  22841 1L   S5       
-        12         72 33101  21969 1R   S5       
-        12         73 33101  22846 1L   S5       
-        12         74 33101  21974 1R   S5       
-        12         75 33101  22851 1L   S5       
-        12         76 33101  21980 1R   S5       
-        12         77 33101  22856 1L   S5       
-        12         78 33101  21984 1R   S5       
-        12         79 33101  22861 1L   S5       
-        12         80 33101  21989 1R   S5       
-        12         81 33101  22815 1L   S5       
-        12         82 33101  21944 1R   S5       
-        12         83 33101  22820 1L   S5       
-        12         84 33101  21950 1R   S5       
-        12         85 33101  22825 1L   S5       
-        12         86 33101  21955 1R   S5       
-        12         87 33101  22830 1L   S5       
-        12         88 33101  21960 1R   S5       
-        12         89 33101  22835 1L   S5       
-        12         90 33101  21965 1R   S5       
-        12         91 33101  22842 1L   S5       
-        12         92 33101  21970 1R   S5       
-        12         93 33101  22847 1L   S5       
-        12         94 33101  21975 1R   S5       
-        12         95 33101  22852 1L   S5       
-        12         96 33101  21945 1R   S5       
-        12         97 33101  22857 1L   S5       
-        12         98 33101  21985 1R   S5       
-        12         99 33101  22863 1L   S5       
-        12        100 33101  21939 1R   S5       
-        12        101 33101  22127 2L   S5       
-        12        102 33101  22035 2R   S5       
-        12        103 33101  22132 2L   S5       
-        12        104 33101  22041 2R   S5       
-        12        105 33101  22137 2L   S5       
-        12        106 33101  22046 2R   S5       
-        12        107 33101  22144 2L   S5       
-        12        108 33101  22051 2R   S5       
-        12        109 33101  22149 2L   S5       
-        12        110 33101  22056 2R   S5       
-        12        111 33101  22154 2L   S5       
-        12        112 33101  22061 2R   S5       
-        12        113 33101  22161 2L   S5       
-        12        114 33101  22066 2R   S5       
-        12        115 33101  22166 2L   S5       
-        12        116 33101  22071 2R   S5       
-        12        117 33101  22171 2L   S5       
-        12        118 33101  22076 2R   S5       
-        12        119 33101  22159 2L   S5       
-        12        120 33101  22081 2R   S5       
-        12        121 33101  22128 2L   S5       
-        12        122 33101  22037 2R   S5       
-        12        123 33101  22133 2L   S5       
-        12        124 33101  22042 2R   S5       
-        12        125 33101  22139 2L   S5       
-        12        126 33101  22047 2R   S5       
-        12        127 33101  22145 2L   S5       
-        12        128 33101  22052 2R   S5       
-        12        129 33101  22150 2L   S5       
-        12        130 33101  22057 2R   S5       
-        12        131 33101  22155 2L   S5       
-        12        132 33101  22062 2R   S5       
-        12        133 33101  22162 2L   S5       
-        12        134 33101  22067 2R   S5       
-        12        135 33101  22167 2L   S5       
-        12        136 33101  22072 2R   S5       
-        12        137 33101  22172 2L   S5       
-        12        138 33101  22077 2R   S5       
-        12        139 33101  22160 2L   S5       
-        12        140 33101  22082 2R   S5       
-        12        141 33101  22129 2L   S5       
-        12        142 33101  22038 2R   S5       
-        12        143 33101  22134 2L   S5       
-        12        144 33101  22043 2R   S5       
-        12        145 33101  22140 2L   S5       
-        12        146 33101  22048 2R   S5       
-        12        147 33101  22146 2L   S5       
-        12        148 33101  22054 2R   S5       
-        12        149 33101  22151 2L   S5       
-        12        150 33101  22058 2R   S5       
-        12        151 33101  22156 2L   S5       
-        12        152 33101  22063 2R   S5       
-        12        153 33101  22163 2L   S5       
-        12        154 33101  22068 2R   S5       
-        12        155 33101  22168 2L   S5       
-        12        156 33101  22073 2R   S5       
-        12        157 33101  22173 2L   S5       
-        12        158 33101  22078 2R   S5       
-        12        159 33101  22176 2L   S5       
-        12        160 33101  22083 2R   S5       
-        12        161 33101  22130 2L   S5       
-        12        162 33101  22039 2R   S5       
-        12        163 33101  22135 2L   S5       
-        12        164 33101  22044 2R   S5       
-        12        165 33101  22141 2L   S5       
-        12        166 33101  22049 2R   S5       
-        12        167 33101  22147 2L   S5       
-        12        168 33101  22055 2R   S5       
-        12        169 33101  22152 2L   S5       
-        12        170 33101  22059 2R   S5       
-        12        171 33101  22157 2L   S5       
-        12        172 33101  22064 2R   S5       
-        12        173 33101  22164 2L   S5       
-        12        174 33101  22069 2R   S5       
-        12        175 33101  22169 2L   S5       
-        12        176 33101  22074 2R   S5       
-        12        177 33101  22174 2L   S5       
-        12        178 33101  22079 2R   S5       
-        12        179 33101  22177 2L   S5       
-        12        180 33101  22084 2R   S5       
-        12        181 33101  22131 2L   S5       
-        12        182 33101  22040 2R   S5       
-        12        183 33101  22136 2L   S5       
-        12        184 33101  22045 2R   S5       
-        12        185 33101  22142 2L   S5       
-        12        186 33101  22050 2R   S5       
-        12        187 33101  22148 2L   S5       
-        12        188 33101  22086 2R   S5       
-        12        189 33101  22153 2L   S5       
-        12        190 33101  22060 2R   S5       
-        12        191 33101  22158 2L   S5       
-        12        192 33101  22065 2R   S5       
-        12        193 33101  22165 2L   S5       
-        12        194 33101  22070 2R   S5       
-        12        195 33101  22170 2L   S5       
-        12        196 33101  22075 2R   S5       
-        12        197 33101  22175 2L   S5       
-        12        198 33101  22080 2R   S5       
-        12        199 33101  22178 2L   S5       
-        12        200 33101  22085 2R   S5       
-        12        201 33101  22318 3L   S5       
-        12        202 33101  22226 3R   S5       
-        12        203 33101  22323 3L   S5       
-        12        204 33101  22231 3R   S5       
-        12        205 33101  22329 3L   S5       
-        12        206 33101  22236 3R   S5       
-        12        207 33101  22335 3L   S5       
-        12        208 33101  22241 3R   S5       
-        12        209 33101  22340 3L   S5       
-        12        210 33101  22225 3R   S5       
-        12        211 33101  22346 3L   S5       
-        12        212 33101  22251 3R   S5       
-        12        213 33101  22351 3L   S5       
-        12        214 33101  22256 3R   S5       
-        12        215 33101  22356 3L   S5       
-        12        216 33101  22261 3R   S5       
-        12        217 33101  22361 3L   S5       
-        12        218 33101  22266 3R   S5       
-        12        219 33101  22367 3L   S5       
-        12        220 33101  22271 3R   S5       
-        12        221 33101  22319 3L   S5       
-        12        222 33101  22227 3R   S5       
-        12        223 33101  22324 3L   S5       
-        12        224 33101  22232 3R   S5       
-        12        225 33101  22330 3L   S5       
-        12        226 33101  22237 3R   S5       
-        12        227 33101  22336 3L   S5       
-        12        228 33101  22242 3R   S5       
-        12        229 33101  22342 3L   S5       
-        12        230 33101  22246 3R   S5       
-        12        231 33101  22347 3L   S5       
-        12        232 33101  22252 3R   S5       
-        12        233 33101  22352 3L   S5       
-        12        234 33101  22257 3R   S5       
-        12        235 33101  22357 3L   S5       
-        12        236 33101  22262 3R   S5       
-        12        237 33101  22362 3L   S5       
-        12        238 33101  22267 3R   S5       
-        12        239 33101  22368 3L   S5       
-        12        240 33101  22272 3R   S5       
-        12        241 33101  22320 3L   S5       
-        12        242 33101  22228 3R   S5       
-        12        243 33101  22325 3L   S5       
-        12        244 33101  22233 3R   S5       
-        12        245 33101  22331 3L   S5       
-        12        246 33101  22238 3R   S5       
-        12        247 33101  22337 3L   S5       
-        12        248 33101  22243 3R   S5       
-        12        249 33101  22343 3L   S5       
-        12        250 33101  22247 3R   S5       
-        12        251 33101  22348 3L   S5       
-        12        252 33101  22253 3R   S5       
-        12        253 33101  22353 3L   S5       
-        12        254 33101  22258 3R   S5       
-        12        255 33101  22358 3L   S5       
-        12        256 33101  22263 3R   S5       
-        12        257 33101  22364 3L   S5       
-        12        258 33101  22268 3R   S5       
-        12        259 33101  22369 3L   S5       
-        12        260 33101  22273 3R   S5       
-        12        261 33101  22321 3L   S5       
-        12        262 33101  22229 3R   S5       
-        12        263 33101  22326 3L   S5       
-        12        264 33101  22234 3R   S5       
-        12        265 33101  22332 3L   S5       
-        12        266 33101  22239 3R   S5       
-        12        267 33101  22338 3L   S5       
-        12        268 33101  22244 3R   S5       
-        12        269 33101  22344 3L   S5       
-        12        270 33101  22249 3R   S5       
-        12        271 33101  22349 3L   S5       
-        12        272 33101  22255 3R   S5       
-        12        273 33101  22354 3L   S5       
-        12        274 33101  22259 3R   S5       
-        12        275 33101  22359 3L   S5       
-        12        276 33101  22264 3R   S5       
-        12        277 33101  22365 3L   S5       
-        12        278 33101  22269 3R   S5       
-        12        279 33101  22370 3L   S5       
-        12        280 33101  22274 3R   S5       
-        12        281 33101  22322 3L   S5       
-        12        282 33101  22230 3R   S5       
-        12        283 33101  22328 3L   S5       
-        12        284 33101  22235 3R   S5       
-        12        285 33101  22333 3L   S5       
-        12        286 33101  22240 3R   S5       
-        12        287 33101  22339 3L   S5       
-        12        288 33101  22245 3R   S5       
-        12        289 33101  22345 3L   S5       
-        12        290 33101  22250 3R   S5       
-        12        291 33101  22350 3L   S5       
-        12        292 33101  22276 3R   S5       
-        12        293 33101  22355 3L   S5       
-        12        294 33101  22260 3R   S5       
-        12        295 33101  22360 3L   S5       
-        12        296 33101  22265 3R   S5       
-        12        297 33101  22366 3L   S5       
-        12        298 33101  22270 3R   S5       
-        12        299 33101  22371 3L   S5       
-        12        300 33101  22275 3R   S5       
-        12        301 33101  22494 4L   S5       
-        12        302 33101  22405 4R   S5       
-        12        303 33101  22501 4L   S5       
-        12        304 33101  22410 4R   S5       
-        12        305 33101  22507 4L   S5       
-        12        306 33101  22415 4R   S5       
-        12        307 33101  22512 4L   S5       
-        12        308 33101  22422 4R   S5       
-        12        309 33101  22517 4L   S5       
-        12        310 33101  22427 4R   S5       
-        12        311 33101  22523 4L   S5       
-        12        312 33101  22432 4R   S5       
-        12        313 33101  22529 4L   S5       
-        12        314 33101  22437 4R   S5       
-        12        315 33101  22534 4L   S5       
-        12        316 33101  22443 4R   S5       
-        12        317 33101  22542 4L   S5       
-        12        318 33101  22448 4R   S5       
-        12        319 33101  22547 4L   S5       
-        12        320 33101  22453 4R   S5       
-        12        321 33101  22497 4L   S5       
-        12        322 33101  22406 4R   S5       
-        12        323 33101  22502 4L   S5       
-        12        324 33101  22411 4R   S5       
-        12        325 33101  22508 4L   S5       
-        12        326 33101  22417 4R   S5       
-        12        327 33101  22513 4L   S5       
-        12        328 33101  22423 4R   S5       
-        12        329 33101  22518 4L   S5       
-        12        330 33101  22428 4R   S5       
-        12        331 33101  22524 4L   S5       
-        12        332 33101  22433 4R   S5       
-        12        333 33101  22530 4L   S5       
-        12        334 33101  22439 4R   S5       
-        12        335 33101  22535 4L   S5       
-        12        336 33101  22444 4R   S5       
-        12        337 33101  22543 4L   S5       
-        12        338 33101  22449 4R   S5       
-        12        339 33101  22548 4L   S5       
-        12        340 33101  22454 4R   S5       
-        12        341 33101  22498 4L   S5       
-        12        342 33101  22407 4R   S5       
-        12        343 33101  22503 4L   S5       
-        12        344 33101  22412 4R   S5       
-        12        345 33101  22509 4L   S5       
-        12        346 33101  22418 4R   S5       
-        12        347 33101  22514 4L   S5       
-        12        348 33101  22424 4R   S5       
-        12        349 33101  22519 4L   S5       
-        12        350 33101  22429 4R   S5       
-        12        351 33101  22525 4L   S5       
-        12        352 33101  22434 4R   S5       
-        12        353 33101  22531 4L   S5       
-        12        354 33101  22440 4R   S5       
-        12        355 33101  22536 4L   S5       
-        12        356 33101  22445 4R   S5       
-        12        357 33101  22544 4L   S5       
-        12        358 33101  22450 4R   S5       
-        12        359 33101  22549 4L   S5       
-        12        360 33101  22455 4R   S5       
-        12        361 33101  22499 4L   S5       
-        12        362 33101  22408 4R   S5       
-        12        363 33101  22504 4L   S5       
-        12        364 33101  22413 4R   S5       
-        12        365 33101  22510 4L   S5       
-        12        366 33101  22419 4R   S5       
-        12        367 33101  22515 4L   S5       
-        12        368 33101  22425 4R   S5       
-        12        369 33101  22520 4L   S5       
-        12        370 33101  22430 4R   S5       
-        12        371 33101  22526 4L   S5       
-        12        372 33101  22435 4R   S5       
-        12        373 33101  22532 4L   S5       
-        12        374 33101  22441 4R   S5       
-        12        375 33101  22538 4L   S5       
-        12        376 33101  22446 4R   S5       
-        12        377 33101  22545 4L   S5       
-        12        378 33101  22451 4R   S5       
-        12        379 33101  22550 4L   S5       
-        12        380 33101  22901 4R   S5       
-        12        381 33101  22500 4L   S5       
-        12        382 33101  22409 4R   S5       
-        12        383 33101  22505 4L   S5       
-        12        384 33101  22414 4R   S5       
-        12        385 33101  22511 4L   S5       
-        12        386 33101  22420 4R   S5       
-        12        387 33101  22516 4L   S5       
-        12        388 33101  22426 4R   S5       
-        12        389 33101  22522 4L   S5       
-        12        390 33101  22431 4R   S5       
-        12        391 33101  22528 4L   S5       
-        12        392 33101  22436 4R   S5       
-        12        393 33101  22533 4L   S5       
-        12        394 33101  22442 4R   S5       
-        12        395 33101  22540 4L   S5       
-        12        396 33101  22447 4R   S5       
-        12        397 33101  22546 4L   S5       
-        12        398 33101  22452 4R   S5       
-        12        399 33101  22551 4L   S5       
-        12        400 33101  16775 4R   S3       
-        12        401 33101  22669 5L   S5       
-        12        402 33101  22584 5R   S5       
-        12        403 33101  22675 5L   S5       
-        12        404 33101  22589 5R   S5       
-        12        405 33101  22680 5L   S5       
-        12        406 33101  22594 5R   S5       
-        12        407 33101  22685 5L   S5       
-        12        408 33101  22600 5R   S5       
-        12        409 33101  22691 5L   S5       
-        12        410 33101  22606 5R   S5       
-        12        411 33101  22696 5L   S5       
-        12        412 33101  22611 5R   S5       
-        12        413 33101  22702 5L   S5       
-        12        414 33101  22617 5R   S5       
-        12        415 33101  22707 5L   S5       
-        12        416 33101  22622 5R   S5       
-        12        417 33101  22712 5L   S5       
-        12        418 33101  22627 5R   S5       
-        12        419 33101  22717 5L   S5       
-        12        420 33101  22633 5R   S5       
-        12        421 33101  22670 5L   S5       
-        12        422 33101  22585 5R   S5       
-        12        423 33101  22676 5L   S5       
-        12        424 33101  22590 5R   S5       
-        12        425 33101  22681 5L   S5       
-        12        426 33101  22595 5R   S5       
-        12        427 33101  22686 5L   S5       
-        12        428 33101  22601 5R   S5       
-        12        429 33101  22692 5L   S5       
-        12        430 33101  22607 5R   S5       
-        12        431 33101  22697 5L   S5       
-        12        432 33101  22612 5R   S5       
-        12        433 33101  22703 5L   S5       
-        12        434 33101  22618 5R   S5       
-        12        435 33101  22708 5L   S5       
-        12        436 33101  22623 5R   S5       
-        12        437 33101  22713 5L   S5       
-        12        438 33101  22628 5R   S5       
-        12        439 33101  22718 5L   S5       
-        12        440 33101  22634 5R   S5       
-        12        441 33101  22671 5L   S5       
-        12        442 33101  22586 5R   S5       
-        12        443 33101  22677 5L   S5       
-        12        444 33101  22591 5R   S5       
-        12        445 33101  22682 5L   S5       
-        12        446 33101  22596 5R   S5       
-        12        447 33101  22687 5L   S5       
-        12        448 33101  22602 5R   S5       
-        12        449 33101  22693 5L   S5       
-        12        450 33101  22608 5R   S5       
-        12        451 33101  22698 5L   S5       
-        12        452 33101  22613 5R   S5       
-        12        453 33101  22704 5L   S5       
-        12        454 33101  22619 5R   S5       
-        12        455 33101  22709 5L   S5       
-        12        456 33101  22624 5R   S5       
-        12        457 33101  22714 5L   S5       
-        12        458 33101  22629 5R   S5       
-        12        459 33101  22719 5L   S5       
-        12        460 33101  22635 5R   S5       
-        12        461 33101  22672 5L   S5       
-        12        462 33101  22587 5R   S5       
-        12        463 33101  22678 5L   S5       
-        12        464 33101  22592 5R   S5       
-        12        465 33101  22683 5L   S5       
-        12        466 33101  22598 5R   S5       
-        12        467 33101  22689 5L   S5       
-        12        468 33101  22604 5R   S5       
-        12        469 33101  22694 5L   S5       
-        12        470 33101  22609 5R   S5       
-        12        471 33101  22700 5L   S5       
-        12        472 33101  22614 5R   S5       
-        12        473 33101  22705 5L   S5       
-        12        474 33101  22620 5R   S5       
-        12        475 33101  22710 5L   S5       
-        12        476 33101  22625 5R   S5       
-        12        477 33101  22715 5L   S5       
-        12        478 33101  22631 5R   S5       
-        12        479 33101  22720 5L   S5       
-        12        480 33101  22636 5R   S5       
-        12        481 33101  22673 5L   S5       
-        12        482 33101  22588 5R   S5       
-        12        483 33101  22679 5L   S5       
-        12        484 33101  22593 5R   S5       
-        12        485 33101  22684 5L   S5       
-        12        486 33101  22599 5R   S5       
-        12        487 33101  22690 5L   S5       
-        12        488 33101  22605 5R   S5       
-        12        489 33101  22695 5L   S5       
-        12        490 33101  22610 5R   S5       
-        12        491 33101  22701 5L   S5       
-        12        492 33101  22615 5R   S5       
-        12        493 33101  22706 5L   S5       
-        12        494 33101  22621 5R   S5       
-        12        495 33101  22711 5L   S5       
-        12        496 33101  22626 5R   S5       
-        12        497 33101  22716 5L   S5       
-        12        498 33101  22632 5R   S5       
-        12        499 33101  22721 5L   S5       
-        12        500 33101  22637 5R   S5       
-        12        501 33101  22969 6L   S5-2     
-        12        502 33101  23005 6R   S5-1     
-        12        503 33101  22963 6L   S5-2     
-        12        504 33101  23052 6R   S5-2     
-        12        505 33101  22974 6L   S5-2     
-        12        506 33101  23092 6R   S5-2     
-        12        507 33101  22958 6L   S5-2     
-        12        508 33101  23087 6R   S5-2     
-        12        509 33101  22953 6L   S5-2     
-        12        510 33101  23067 6R   S5-2     
-        12        511 33101  22948 6L   S5-2     
-        12        512 33101  23062 6R   S5-2     
-        12        513 33101  11167 6L   S1       
-        12        514 33101  23057 6R   S5-2     
-        12        515 33101  11132 6L   S1       
-        12        516 33101  23051 6R   S5-2     
-        12        517 33101  11152 6L   S1       
-        12        518 33101  23046 6R   S5-2     
-        12        519 33101  22936 6L   S5-2     
-        12        520 33101  11119 6R   S1       
-        12        521 33101  22970 6L   S5-2     
-        12        522 33101  23082 6R   S5-2     
-        12        523 33101  22964 6L   S5-2     
-        12        524 33101  23073 6R   S5-2     
-        12        525 33101  22975 6L   S5-2     
-        12        526 33101  23093 6R   S5-2     
-        12        527 33101  22959 6L   S5-2     
-        12        528 33101  23088 6R   S5-2     
-        12        529 33101  22954 6L   S5-2     
-        12        530 33101  23068 6R   S5-2     
-        12        531 33101  22949 6L   S5-2     
-        12        532 33101  23063 6R   S5-2     
-        12        533 33101  11171 6L   S1       
-        12        534 33101  23058 6R   S5-2     
-        12        535 33101  11138 6L   S1       
-        12        536 33101  23053 6R   S5-2     
-        12        537 33101  11258 6L   S1       
-        12        538 33101  23047 6R   S5-2     
-        12        539 33101  22937 6L   S5-2     
-        12        540 33101  10988 6R   S1       
-        12        541 33101  22971 6L   S5-2     
-        12        542 33101  23083 6R   S5-2     
-        12        543 33101  22965 6L   S5-2     
-        12        544 33101  23074 6R   S5-2     
-        12        545 33101  22976 6L   S5-2     
-        12        546 33101  23094 6R   S5-2     
-        12        547 33101  22960 6L   S5-2     
-        12        548 33101  23089 6R   S5-2     
-        12        549 33101  22955 6L   S5-2     
-        12        550 33101  23069 6R   S5-2     
-        12        551 33101  22950 6L   S5-2     
-        12        552 33101  23064 6R   S5-2     
-        12        553 33101  11189 6L   S1       
-        12        554 33101  23059 6R   S5-2     
-        12        555 33101  11146 6L   S1       
-        12        556 33101  23054 6R   S5-2     
-        12        557 33101  11262 6L   S1       
-        12        558 33101  23048 6R   S5-2     
-        12        559 33101  22938 6L   S5-2     
-        12        560 33101  23016 6R   S5-2     
-        12        561 33101  22972 6L   S5-2     
-        12        562 33101  23084 6R   S5-2     
-        12        563 33101  22966 6L   S5-2     
-        12        564 33101  23075 6R   S5-2     
-        12        565 33101  22977 6L   S5-2     
-        12        566 33101  23096 6R   S5-2     
-        12        567 33101  22961 6L   S5-2     
-        12        568 33101  23090 6R   S5-2     
-        12        569 33101  22956 6L   S5-2     
-        12        570 33101  23070 6R   S5-2     
-        12        571 33101  22951 6L   S5-2     
-        12        572 33101  23065 6R   S5-2     
-        12        573 33101  11230 6L   S1       
-        12        574 33101  23060 6R   S5-2     
-        12        575 33101  11149 6L   S1       
-        12        576 33101  23056 6R   S5-2     
-        12        577 33101  11278 6L   S1       
-        12        578 33101  23049 6R   S5-2     
-        12        579 33101  22939 6L   S5-2     
-        12        580 33101  23019 6R   S5-2     
-        12        581 33101  22973 6L   S5-2     
-        12        582 33101  23085 6R   S5-2     
-        12        583 33101  22968 6L   S5-2     
-        12        584 33101  23076 6R   S5-2     
-        12        585 33101  22978 6L   S5-2     
-        12        586 33101  23097 6R   S5-2     
-        12        587 33101  22962 6L   S5-2     
-        12        588 33101  23091 6R   S5-2     
-        12        589 33101  22957 6L   S5-2     
-        12        590 33101  23071 6R   S5-2     
-        12        591 33101  22952 6L   S5-2     
-        12        592 33101  23066 6R   S5-2     
-        12        593 33101  11236 6L   S1       
-        12        594 33101  23061 6R   S5-2     
-        12        595 33101  11257 6L   S1       
-        12        596 33101  23072 6R   S5-2     
-        12        597 33101  21539 6L   P9       
-        12        598 33101  23050 6R   S5-2     
-        12        599 33101  22940 6L   S5-2     
-        12        600 33101  23041 6R   S5-2     
-        12        601 33101  23168 7L   S5-2     
-        12        602 33101  23297 7R   S5-2     
-        12        603 33101  23154 7L   S5-2     
-        12        604 33101  23292 7R   S5-2     
-        12        605 33101  23163 7L   S5-2     
-        12        606 33101  23287 7R   S5-2     
-        12        607 33101  23173 7L   S5-2     
-        12        608 33101  23282 7R   S5-2     
-        12        609 33101  23158 7L   S5-2     
-        12        610 33101  23272 7R   S5-2     
-        12        611 33101  11473 7L   S1       
-        12        612 33101  23267 7R   S5-2     
-        12        613 33101  11443 7L   S1       
-        12        614 33101  23257 7R   S5-2     
-        12        615 33101  11410 7L   S1       
-        12        616 33101  23262 7R   S5-2     
-        12        617 33101  11445 7L   S1       
-        12        618 33101   3443 7R   11       
-        12        619 33101   7471 7L   P2       
-        12        620 33101  11341 7R   S1       
-        12        621 33101  23169 7L   S5-2     
-        12        622 33101  23298 7R   S5-2     
-        12        623 33101  23155 7L   S5-2     
-        12        624 33101  23293 7R   S5-2     
-        12        625 33101  23164 7L   S5-2     
-        12        626 33101  23288 7R   S5-2     
-        12        627 33101  23174 7L   S5-2     
-        12        628 33101  23283 7R   S5-2     
-        12        629 33101  23159 7L   S5-2     
-        12        630 33101  23273 7R   S5-2     
-        12        631 33101  11475 7L   S1       
-        12        632 33101  23268 7R   S5-2     
-        12        633 33101  11453 7L   S1       
-        12        634 33101  23258 7R   S5-2     
-        12        635 33101  11411 7L   S1       
-        12        636 33101  23263 7R   S5-2     
-        12        637 33101  11447 7L   S1       
-        12        638 33101  11281 7R   S1       
-        12        639 33101  11394 7L   S1       
-        12        640 33101  11342 7R   S1       
-        12        641 33101  23170 7L   S5-2     
-        12        642 33101  23299 7R   S5-2     
-        12        643 33101  23156 7L   S5-2     
-        12        644 33101  23294 7R   S5-2     
-        12        645 33101  23165 7L   S5-2     
-        12        646 33101  23289 7R   S5-2     
-        12        647 33101  23175 7L   S5-2     
-        12        648 33101  23284 7R   S5-2     
-        12        649 33101  23160 7L   S5-2     
-        12        650 33101  23274 7R   S5-2     
-        12        651 33101  11479 7L   S1       
-        12        652 33101  23269 7R   S5-2     
-        12        653 33101  11493 7L   S1       
-        12        654 33101  23259 7R   S5-2     
-        12        655 33101  11418 7L   S1       
-        12        656 33101  23264 7R   S5-2     
-        12        657 33101  11456 7L   S1       
-        12        658 33101  11293 7R   S1       
-        12        659 33101  11396 7L   S1       
-        12        660 33101  11353 7R   S1       
-        12        661 33101  23172 7L   S5-2     
-        12        662 33101  23301 7R   S5-2     
-        12        663 33101  23157 7L   S5-2     
-        12        664 33101  23295 7R   S5-2     
-        12        665 33101  23166 7L   S5-2     
-        12        666 33101  23290 7R   S5-2     
-        12        667 33101  23176 7L   S5-2     
-        12        668 33101  23285 7R   S5-2     
-        12        669 33101  23161 7L   S5-2     
-        12        670 33101  23275 7R   S5-2     
-        12        671 33101  11489 7L   S1       
-        12        672 33101  23270 7R   S5-2     
-        12        673 33101  11496 7L   S1       
-        12        674 33101  23260 7R   S5-2     
-        12        675 33101  11419 7L   S1       
-        12        676 33101  23266 7R   S5-2     
-        12        677 33101  11468 7L   S1       
-        12        678 33101  11316 7R   S1       
-        12        679 33101  11397 7L   S1       
-        12        680 33101  11359 7R   S1       
-        12        681 33101  23180 7L   S5-2     
-        12        682 33101  23304 7R   S5-2     
-        12        683 33101  23181 7L   S5-2     
-        12        684 33101  23303 7R   S5-2     
-        12        685 33101  23179 7L   S5-2     
-        12        686 33101  23291 7R   S5-2     
-        12        687 33101  23177 7L   S5-2     
-        12        688 33101  23286 7R   S5-2     
-        12        689 33101  23162 7L   S5-2     
-        12        690 33101  23276 7R   S5-2     
-        12        691 33101  11500 7L   S1       
-        12        692 33101  23271 7R   S5-2     
-        12        693 33101  11499 7L   S1       
-        12        694 33101  23261 7R   S5-2     
-        12        695 33101  11433 7L   S1       
-        12        696 33101  23277 7R   S5-2     
-        12        697 33101  11472 7L   S1       
-        12        698 33101  11339 7R   S1       
-        12        699 33101  11404 7L   S1       
-        12        700 33101  11378 7R   S1       
-        12        701 33101  25678 8L   P10      
-        12        702 33101  11600 8R   S1       
-        12        703 33101  25683 8L   P10      
-        12        704 33101  23470 8R   S5-2     
-        12        705 33101  11649 8L   S1       
-        12        706 33101  25696 8R   P10      
-        12        707 33101  25669 8L   P10      
-        12        708 33101  23467 8R   S5-2     
-        12        709 33101  23372 8L   S5-2     
-        12        710 33101  23477 8R   S5-2     
-        12        711 33101  23379 8L   S5-2     
-        12        712 33101  23462 8R   S5-2     
-        12        713 33101  23382 8L   S5-2     
-        12        714 33101  23457 8R   S5-2     
-        12        715 33101  23325 8L   S5-2     
-        12        716 33101  23428 8R   S5-2     
-        12        717 33101  23315 8L   S5-2     
-        12        718 33101  23411 8R   S5-2     
-        12        719 33101   3682 8L   11       
-        12        720 33101   9656 8R   P6       
-        12        721 33101  25679 8L   P10      
-        12        722 33101  17964 8R   S3       
-        12        723 33101  25684 8L   P10      
-        12        724 33101  23473 8R   S5-2     
-        12        725 33101  11654 8L   S1       
-        12        726 33101  25698 8R   P10      
-        12        727 33101  23393 8L   S5-2     
-        12        728 33101  23468 8R   S5-2     
-        12        729 33101  23374 8L   S5-2     
-        12        730 33101  23478 8R   S5-2     
-        12        731 33101  23380 8L   S5-2     
-        12        732 33101  23463 8R   S5-2     
-        12        733 33101  23383 8L   S5-2     
-        12        734 33101  23458 8R   S5-2     
-        12        735 33101  23332 8L   S5-2     
-        12        736 33101  23447 8R   S5-2     
-        12        737 33101  23316 8L   S5-2     
-        12        738 33101  23421 8R   S5-2     
-        12        739 33101   7724 8L   P2_2     
-        12        740 33101  11506 8R   S1       
-        12        741 33101  25680 8L   P10      
-        12        742 33101  23493 8R   S5-2     
-        12        743 33101  25685 8L   P10      
-        12        744 33101  23474 8R   S5-2     
-        12        745 33101  11657 8L   S1       
-        12        746 33101  25699 8R   P10      
-        12        747 33101  23394 8L   S5-2     
-        12        748 33101  23469 8R   S5-2     
-        12        749 33101  23375 8L   S5-2     
-        12        750 33101  23479 8R   S5-2     
-        12        751 33101  23389 8L   S5-2     
-        12        752 33101  23464 8R   S5-2     
-        12        753 33101  23384 8L   S5-2     
-        12        754 33101  23459 8R   S5-2     
-        12        755 33101  23345 8L   S5-2     
-        12        756 33101  23454 8R   S5-2     
-        12        757 33101  23317 8L   S5-2     
-        12        758 33101  23445 8R   S5-2     
-        12        759 33101   7750 8L   P2_2     
-        12        760 33101  11511 8R   S1       
-        12        761 33101  25681 8L   P10      
-        12        762 33101  23494 8R   S5-2     
-        12        763 33101  25686 8L   P10      
-        12        764 33101  23476 8R   S5-2     
-        12        765 33101  25688 8L   P10      
-        12        766 33101  25700 8R   P10      
-        12        767 33101  23395 8L   S5-2     
-        12        768 33101  23471 8R   S5-2     
-        12        769 33101  23376 8L   S5-2     
-        12        770 33101  23480 8R   S5-2     
-        12        771 33101  23390 8L   S5-2     
-        12        772 33101  23465 8R   S5-2     
-        12        773 33101  23385 8L   S5-2     
-        12        774 33101  23460 8R   S5-2     
-        12        775 33101  23357 8L   S5-2     
-        12        776 33101  23455 8R   S5-2     
-        12        777 33101  23319 8L   S5-2     
-        12        778 33101  23446 8R   S5-2     
-        12        779 33101  11633 8L   S1       
-        12        780 33101  11536 8R   S1       
-        12        781 33101  25682 8L   P10      
-        12        782 33101  25695 8R   P10      
-        12        783 33101  25687 8L   P10      
-        12        784 33101  25692 8R   P10      
-        12        785 33101  25689 8L   P10      
-        12        786 33101  25010 8R   P10      
-        12        787 33101  25690 8L   P10      
-        12        788 33101  23472 8R   S5-2     
-        12        789 33101  23378 8L   S5-2     
-        12        790 33101  23481 8R   S5-2     
-        12        791 33101  23391 8L   S5-2     
-        12        792 33101  23466 8R   S5-2     
-        12        793 33101  23386 8L   S5-2     
-        12        794 33101  23461 8R   S5-2     
-        12        795 33101  21694 8L   P9       
-        12        796 33101  23456 8R   S5-2     
-        12        797 33101  23320 8L   S5-2     
-        12        798 33101  23453 8R   S5-2     
-        12        799 33101  11639 8L   S1       
-        12        800 33101  11551 8R   S1       
-        12        801 33101  25107 9L   P10      
-        12        802 33101  25213 9R   P10      
-        12        803 33101  25102 9L   P10      
-        12        804 33101  25208 9R   P10      
-        12        805 33101  25086 9L   P10      
-        12        806 33101  25203 9R   P10      
-        12        807 33101  25097 9L   P10      
-        12        808 33101  25198 9R   P10      
-        12        809 33101  25087 9L   P10      
-        12        810 33101  25181 9R   P10      
-        12        811 33101  25077 9L   P10      
-        12        812 33101  25173 9R   P10      
-        12        813 33101  25070 9L   P10      
-        12        814 33101  25167 9R   P10      
-        12        815 33101  25065 9L   P10      
-        12        816 33101  18115 9R   P8       
-        12        817 33101  25011 9L   P10      
-        12        818 33101  25117 9R   P10      
-        12        819 33101  25036 9L   P10      
-        12        820 33101  25144 9R   P10      
-        12        821 33101  25108 9L   P10      
-        12        822 33101  25214 9R   P10      
-        12        823 33101  25103 9L   P10      
-        12        824 33101  25209 9R   P10      
-        12        825 33101  25092 9L   P10      
-        12        826 33101  25204 9R   P10      
-        12        827 33101  25098 9L   P10      
-        12        828 33101  25199 9R   P10      
-        12        829 33101  25088 9L   P10      
-        12        830 33101  25184 9R   P10      
-        12        831 33101  25078 9L   P10      
-        12        832 33101  25174 9R   P10      
-        12        833 33101  25072 9L   P10      
-        12        834 33101  25168 9R   P10      
-        12        835 33101  25066 9L   P10      
-        12        836 33101  11787 9R   S1       
-        12        837 33101  25017 9L   P10      
-        12        838 33101  25133 9R   P10      
-        12        839 33101  25037 9L   P10      
-        12        840 33101  25146 9R   P10      
-        12        841 33101  25109 9L   P10      
-        12        842 33101  25215 9R   P10      
-        12        843 33101  25104 9L   P10      
-        12        844 33101  25210 9R   P10      
-        12        845 33101  25093 9L   P10      
-        12        846 33101  25205 9R   P10      
-        12        847 33101  25099 9L   P10      
-        12        848 33101  25200 9R   P10      
-        12        849 33101  25089 9L   P10      
-        12        850 33101  25185 9R   P10      
-        12        851 33101  25079 9L   P10      
-        12        852 33101  25176 9R   P10      
-        12        853 33101  25073 9L   P10      
-        12        854 33101  25169 9R   P10      
-        12        855 33101  25067 9L   P10      
-        12        856 33101  11796 9R   S1       
-        12        857 33101  25018 9L   P10      
-        12        858 33101  25137 9R   P10      
-        12        859 33101  25038 9L   P10      
-        12        860 33101  25148 9R   P10      
-        12        861 33101  25111 9L   P10      
-        12        862 33101  25216 9R   P10      
-        12        863 33101  25105 9L   P10      
-        12        864 33101  25211 9R   P10      
-        12        865 33101  25094 9L   P10      
-        12        866 33101  25206 9R   P10      
-        12        867 33101  25100 9L   P10      
-        12        868 33101  25201 9R   P10      
-        12        869 33101  25090 9L   P10      
-        12        870 33101  25186 9R   P10      
-        12        871 33101  25080 9L   P10      
-        12        872 33101  25178 9R   P10      
-        12        873 33101  25075 9L   P10      
-        12        874 33101  25170 9R   P10      
-        12        875 33101  25068 9L   P10      
-        12        876 33101  25125 9R   P10      
-        12        877 33101  25019 9L   P10      
-        12        878 33101  25138 9R   P10      
-        12        879 33101  25039 9L   P10      
-        12        880 33101  25152 9R   P10      
-        12        881 33101  25112 9L   P10      
-        12        882 33101  25217 9R   P10      
-        12        883 33101  25106 9L   P10      
-        12        884 33101  25212 9R   P10      
-        12        885 33101  25096 9L   P10      
-        12        886 33101  25207 9R   P10      
-        12        887 33101  25101 9L   P10      
-        12        888 33101  25202 9R   P10      
-        12        889 33101  25091 9L   P10      
-        12        890 33101  25189 9R   P10      
-        12        891 33101  25081 9L   P10      
-        12        892 33101  25179 9R   P10      
-        12        893 33101  25076 9L   P10      
-        12        894 33101  25171 9R   P10      
-        12        895 33101  25069 9L   P10      
-        12        896 33101  25166 9R   P10      
-        12        897 33101  25020 9L   P10      
-        12        898 33101  25157 9R   P10      
-        12        899 33101  25040 9L   P10      
-        12        900 33101  25153 9R   P10      
-        12        901 33101  24120 10L  S5-3     
-        12        902 33101  24140 10R  S5-3     
-        12        903 33101  24110 10L  S5-3     
-        12        904 33101  24156 10R  S5-3     
-        12        905 33101  24115 10L  S5-3     
-        12        906 33101  24151 10R  S5-3     
-        12        907 33101  24073 10L  S5-3     
-        12        908 33101  24141 10R  S5-3     
-        12        909 33101  24105 10L  S5-3     
-        12        910 33101  24131 10R  S5-3     
-        12        911 33101  24095 10L  S5-3     
-        12        912 33101  24126 10R  S5-3     
-        12        913 33101  24090 10L  S5-3     
-        12        914 33101  24121 10R  S5-3     
-        12        915 33101  24080 10L  S5-3     
-        12        916 33101  20811 10R  S4       
-        12        917 33101  24074 10L  S5-3     
-        12        918 33101  25298 10R  P10      
-        12        919 33101  24075 10L  S5-3     
-        12        920 33101  25329 10R  P10      
-        12        921 33101  24071 10L  S5-3     
-        12        922 33101  24146 10R  S5-3     
-        12        923 33101  24111 10L  S5-3     
-        12        924 33101  24157 10R  S5-3     
-        12        925 33101  24116 10L  S5-3     
-        12        926 33101  24152 10R  S5-3     
-        12        927 33101  24100 10L  S5-3     
-        12        928 33101  24142 10R  S5-3     
-        12        929 33101  24106 10L  S5-3     
-        12        930 33101  24132 10R  S5-3     
-        12        931 33101  24096 10L  S5-3     
-        12        932 33101  24127 10R  S5-3     
-        12        933 33101  24091 10L  S5-3     
-        12        934 33101  24122 10R  S5-3     
-        12        935 33101  24081 10L  S5-3     
-        12        936 33101  20812 10R  S4       
-        12        937 33101  24085 10L  S5-3     
-        12        938 33101  25301 10R  P10      
-        12        939 33101  24076 10L  S5-3     
-        12        940 33101  25330 10R  P10      
-        12        941 33101  24072 10L  S5-3     
-        12        942 33101  24148 10R  S5-3     
-        12        943 33101  24112 10L  S5-3     
-        12        944 33101  24158 10R  S5-3     
-        12        945 33101  24117 10L  S5-3     
-        12        946 33101  24153 10R  S5-3     
-        12        947 33101  24102 10L  S5-3     
-        12        948 33101  24143 10R  S5-3     
-        12        949 33101  24107 10L  S5-3     
-        12        950 33101  24133 10R  S5-3     
-        12        951 33101  24097 10L  S5-3     
-        12        952 33101  24128 10R  S5-3     
-        12        953 33101  24092 10L  S5-3     
-        12        954 33101  24123 10R  S5-3     
-        12        955 33101  24082 10L  S5-3     
-        12        956 33101  25315 10R  P10      
-        12        957 33101  24086 10L  S5-3     
-        12        958 33101  25303 10R  P10      
-        12        959 33101  24077 10L  S5-3     
-        12        960 33101  25332 10R  P10      
-        12        961 33101  24087 10L  S5-3     
-        12        962 33101  24149 10R  S5-3     
-        12        963 33101  24113 10L  S5-3     
-        12        964 33101  20809 10R  S4       
-        12        965 33101  24118 10L  S5-3     
-        12        966 33101  24154 10R  S5-3     
-        12        967 33101  24103 10L  S5-3     
-        12        968 33101  24144 10R  S5-3     
-        12        969 33101  24108 10L  S5-3     
-        12        970 33101  24134 10R  S5-3     
-        12        971 33101  24098 10L  S5-3     
-        12        972 33101  24129 10R  S5-3     
-        12        973 33101  24093 10L  S5-3     
-        12        974 33101  24124 10R  S5-3     
-        12        975 33101  24083 10L  S5-3     
-        12        976 33101  25317 10R  P10      
-        12        977 33101  24088 10L  S5-3     
-        12        978 33101  25306 10R  P10      
-        12        979 33101  24078 10L  S5-3     
-        12        980 33101  25333 10R  P10      
-        12        981 33101  24101 10L  S5-3     
-        12        982 33101  24150 10R  S5-3     
-        12        983 33101  24114 10L  S5-3     
-        12        984 33101  20810 10R  S4       
-        12        985 33101  24119 10L  S5-3     
-        12        986 33101  24155 10R  S5-3     
-        12        987 33101  24104 10L  S5-3     
-        12        988 33101  24145 10R  S5-3     
-        12        989 33101  24109 10L  S5-3     
-        12        990 33101  24135 10R  S5-3     
-        12        991 33101  24099 10L  S5-3     
-        12        992 33101  24130 10R  S5-3     
-        12        993 33101  24094 10L  S5-3     
-        12        994 33101  24125 10R  S5-3     
-        12        995 33101  24084 10L  S5-3     
-        12        996 33101  25337 10R  P10      
-        12        997 33101  24089 10L  S5-3     
-        12        998 33101  25307 10R  P10      
-        12        999 33101  24079 10L  S5-3     
-        12       1000 33101  25334 10R  P10      
-        12       1001 33101   9400 11L  P4_1     
-        12       1002 33101  24235 11R  S5-3     
-        12       1003 33101  24185 11L  S5-3     
-        12       1004 33101  24210 11R  S5-3     
-        12       1005 33101  24199 11L  S5-3     
-        12       1006 33101  24245 11R  S5-3     
-        12       1007 33101  24194 11L  S5-3     
-        12       1008 33101  24225 11R  S5-3     
-        12       1009 33101  24188 11L  S5-3     
-        12       1010 33101  24239 11R  S5-3     
-        12       1011 33101  24179 11L  S5-3     
-        12       1012 33101  24223 11R  S5-3     
-        12       1013 33101  24174 11L  S5-3     
-        12       1014 33101  24216 11R  S5-3     
-        12       1015 33101  24159 11L  S5-3     
-        12       1016 33101  24211 11R  S5-3     
-        12       1017 33101  24169 11L  S5-3     
-        12       1018 33101   9298 11R  P4_1     
-        12       1019 33101  24164 11L  S5-3     
-        12       1020 33101  25431 11R  P10      
-        12       1021 33101  20914 11L  S4       
-        12       1022 33101  24236 11R  S5-3     
-        12       1023 33101  24186 11L  S5-3     
-        12       1024 33101  24218 11R  S5-3     
-        12       1025 33101  24200 11L  S5-3     
-        12       1026 33101  24246 11R  S5-3     
-        12       1027 33101  24195 11L  S5-3     
-        12       1028 33101  24226 11R  S5-3     
-        12       1029 33101  24189 11L  S5-3     
-        12       1030 33101  24240 11R  S5-3     
-        12       1031 33101  24180 11L  S5-3     
-        12       1032 33101  24230 11R  S5-3     
-        12       1033 33101  24175 11L  S5-3     
-        12       1034 33101  24217 11R  S5-3     
-        12       1035 33101  24160 11L  S5-3     
-        12       1036 33101  24212 11R  S5-3     
-        12       1037 33101  24170 11L  S5-3     
-        12       1038 33101   9299 11R  P4_1     
-        12       1039 33101  24165 11L  S5-3     
-        12       1040 33101  25433 11R  P10      
-        12       1041 33101  24206 11L  S5-3     
-        12       1042 33101  24237 11R  S5-3     
-        12       1043 33101  24187 11L  S5-3     
-        12       1044 33101  24220 11R  S5-3     
-        12       1045 33101  24201 11L  S5-3     
-        12       1046 33101  24247 11R  S5-3     
-        12       1047 33101  24196 11L  S5-3     
-        12       1048 33101  24227 11R  S5-3     
-        12       1049 33101  24190 11L  S5-3     
-        12       1050 33101  24241 11R  S5-3     
-        12       1051 33101  24181 11L  S5-3     
-        12       1052 33101  24231 11R  S5-3     
-        12       1053 33101  24176 11L  S5-3     
-        12       1054 33101  24219 11R  S5-3     
-        12       1055 33101  24161 11L  S5-3     
-        12       1056 33101  24213 11R  S5-3     
-        12       1057 33101  24171 11L  S5-3     
-        12       1058 33101   9300 11R  P4_1     
-        12       1059 33101  24166 11L  S5-3     
-        12       1060 33101  25434 11R  P10      
-        12       1061 33101  24209 11L  S5-3     
-        12       1062 33101  24238 11R  S5-3     
-        12       1063 33101  24192 11L  S5-3     
-        12       1064 33101  24224 11R  S5-3     
-        12       1065 33101  24202 11L  S5-3     
-        12       1066 33101  24248 11R  S5-3     
-        12       1067 33101  24198 11L  S5-3     
-        12       1068 33101  24228 11R  S5-3     
-        12       1069 33101  24191 11L  S5-3     
-        12       1070 33101  24242 11R  S5-3     
-        12       1071 33101  24182 11L  S5-3     
-        12       1072 33101  24233 11R  S5-3     
-        12       1073 33101  24177 11L  S5-3     
-        12       1074 33101  24221 11R  S5-3     
-        12       1075 33101  24162 11L  S5-3     
-        12       1076 33101  24214 11R  S5-3     
-        12       1077 33101  24172 11L  S5-3     
-        12       1078 33101   4129 11R  12       
-        12       1079 33101  24167 11L  S5-3     
-        12       1080 33101  25441 11R  P10      
-        12       1081 33101  25365 11L  P10      
-        12       1082 33101  24244 11R  S5-3     
-        12       1083 33101  24205 11L  S5-3     
-        12       1084 33101  24232 11R  S5-3     
-        12       1085 33101  24203 11L  S5-3     
-        12       1086 33101  24249 11R  S5-3     
-        12       1087 33101  24204 11L  S5-3     
-        12       1088 33101  24229 11R  S5-3     
-        12       1089 33101  24193 11L  S5-3     
-        12       1090 33101  24243 11R  S5-3     
-        12       1091 33101  24183 11L  S5-3     
-        12       1092 33101  24234 11R  S5-3     
-        12       1093 33101  24178 11L  S5-3     
-        12       1094 33101  24222 11R  S5-3     
-        12       1095 33101  24163 11L  S5-3     
-        12       1096 33101  24215 11R  S5-3     
-        12       1097 33101  24173 11L  S5-3     
-        12       1098 33101  18346 11R  P8       
-        12       1099 33101  24168 11L  S5-3     
-        12       1100 33101  25443 11R  P10      
-        12       1101 33101  24286 12L  S5-3     
-        12       1102 33101  24356 12R  S5-3     
-        12       1103 33101  24261 12L  S5-3     
-        12       1104 33101  24327 12R  S5-3     
-        12       1105 33101  24276 12L  S5-3     
-        12       1106 33101  24317 12R  S5-3     
-        12       1107 33101  24296 12L  S5-3     
-        12       1108 33101  24312 12R  S5-3     
-        12       1109 33101  24281 12L  S5-3     
-        12       1110 33101  24350 12R  S5-3     
-        12       1111 33101  24271 12L  S5-3     
-        12       1112 33101  24342 12R  S5-3     
-        12       1113 33101  24266 12L  S5-3     
-        12       1114 33101  24332 12R  S5-3     
-        12       1115 33101  24291 12L  S5-3     
-        12       1116 33101  24337 12R  S5-3     
-        12       1117 33101  21085 12L  S4       
-        12       1118 33101  25536 12R  P10      
-        12       1119 33101  25492 12L  P10      
-        12       1120 33101  25519 12R  P10      
-        12       1121 33101  24287 12L  S5-3     
-        12       1122 33101  24357 12R  S5-3     
-        12       1123 33101  24262 12L  S5-3     
-        12       1124 33101  24328 12R  S5-3     
-        12       1125 33101  24277 12L  S5-3     
-        12       1126 33101  24318 12R  S5-3     
-        12       1127 33101  24297 12L  S5-3     
-        12       1128 33101  24313 12R  S5-3     
-        12       1129 33101  24282 12L  S5-3     
-        12       1130 33101  24351 12R  S5-3     
-        12       1131 33101  24272 12L  S5-3     
-        12       1132 33101  24343 12R  S5-3     
-        12       1133 33101  24267 12L  S5-3     
-        12       1134 33101  24333 12R  S5-3     
-        12       1135 33101  24292 12L  S5-3     
-        12       1136 33101  24338 12R  S5-3     
-        12       1137 33101  21125 12L  S4       
-        12       1138 33101  25537 12R  P10      
-        12       1139 33101  25493 12L  P10      
-        12       1140 33101  25520 12R  P10      
-        12       1141 33101  24288 12L  S5-3     
-        12       1142 33101  24359 12R  S5-3     
-        12       1143 33101  24263 12L  S5-3     
-        12       1144 33101  24329 12R  S5-3     
-        12       1145 33101  24279 12L  S5-3     
-        12       1146 33101  24319 12R  S5-3     
-        12       1147 33101  24298 12L  S5-3     
-        12       1148 33101  24314 12R  S5-3     
-        12       1149 33101  24283 12L  S5-3     
-        12       1150 33101  24352 12R  S5-3     
-        12       1151 33101  24273 12L  S5-3     
-        12       1152 33101  24344 12R  S5-3     
-        12       1153 33101  24268 12L  S5-3     
-        12       1154 33101  24334 12R  S5-3     
-        12       1155 33101  24293 12L  S5-3     
-        12       1156 33101  24339 12R  S5-3     
-        12       1157 33101  25474 12L  P10      
-        12       1158 33101  25540 12R  P10      
-        12       1159 33101  25494 12L  P10      
-        12       1160 33101  25522 12R  P10      
-        12       1161 33101  24289 12L  S5-3     
-        12       1162 33101  24360 12R  S5-3     
-        12       1163 33101  24264 12L  S5-3     
-        12       1164 33101  24330 12R  S5-3     
-        12       1165 33101  24280 12L  S5-3     
-        12       1166 33101  24320 12R  S5-3     
-        12       1167 33101  24299 12L  S5-3     
-        12       1168 33101  24315 12R  S5-3     
-        12       1169 33101  24284 12L  S5-3     
-        12       1170 33101  24353 12R  S5-3     
-        12       1171 33101  24274 12L  S5-3     
-        12       1172 33101  24345 12R  S5-3     
-        12       1173 33101  24269 12L  S5-3     
-        12       1174 33101  24335 12R  S5-3     
-        12       1175 33101  24294 12L  S5-3     
-        12       1176 33101  24340 12R  S5-3     
-        12       1177 33101  25475 12L  P10      
-        12       1178 33101  25553 12R  P10      
-        12       1179 33101  25495 12L  P10      
-        12       1180 33101  25523 12R  P10      
-        12       1181 33101  24290 12L  S5-3     
-        12       1182 33101  24361 12R  S5-3     
-        12       1183 33101  24265 12L  S5-3     
-        12       1184 33101  24331 12R  S5-3     
-        12       1185 33101  24301 12L  S5-3     
-        12       1186 33101  24321 12R  S5-3     
-        12       1187 33101  24300 12L  S5-3     
-        12       1188 33101  24316 12R  S5-3     
-        12       1189 33101  24285 12L  S5-3     
-        12       1190 33101  24354 12R  S5-3     
-        12       1191 33101  24275 12L  S5-3     
-        12       1192 33101  24348 12R  S5-3     
-        12       1193 33101  24270 12L  S5-3     
-        12       1194 33101  24347 12R  S5-3     
-        12       1195 33101  24295 12L  S5-3     
-        12       1196 33101  24341 12R  S5-3     
-        12       1197 33101  25476 12L  P10      
-        12       1198 33101  18581 12R  P8       
-        12       1199 33101  25496 12L  P10      
-        12       1200 33101  25525 12R  P10      
-        12       1201 33101  24378 13L  S5-3     
-        12       1202 33101  24414 13R  S5-3     
-        12       1203 33101  24363 13L  S5-3     
-        12       1204 33101  24418 13R  S5-3     
-        12       1205 33101  24388 13L  S5-3     
-        12       1206 33101  24429 13R  S5-3     
-        12       1207 33101  24393 13L  S5-3     
-        12       1208 33101  24419 13R  S5-3     
-        12       1209 33101  24401 13L  S5-3     
-        12       1210 33101  24434 13R  S5-3     
-        12       1211 33101  24383 13L  S5-3     
-        12       1212 33101  24439 13R  S5-3     
-        12       1213 33101  24373 13L  S5-3     
-        12       1214 33101  24449 13R  S5-3     
-        12       1215 33101  24368 13L  S5-3     
-        12       1216 33101  24444 13R  S5-3     
-        12       1217 33101  25559 13L  P10      
-        12       1218 33101  24454 13R  S5-3     
-        12       1219 33101  25579 13L  P10      
-        12       1220 33101  24459 13R  S5-3     
-        12       1221 33101  24379 13L  S5-3     
-        12       1222 33101  24415 13R  S5-3     
-        12       1223 33101  24364 13L  S5-3     
-        12       1224 33101  24424 13R  S5-3     
-        12       1225 33101  24389 13L  S5-3     
-        12       1226 33101  24430 13R  S5-3     
-        12       1227 33101  24394 13L  S5-3     
-        12       1228 33101  24420 13R  S5-3     
-        12       1229 33101  24403 13L  S5-3     
-        12       1230 33101  24435 13R  S5-3     
-        12       1231 33101  24384 13L  S5-3     
-        12       1232 33101  24440 13R  S5-3     
-        12       1233 33101  24374 13L  S5-3     
-        12       1234 33101  24450 13R  S5-3     
-        12       1235 33101  24369 13L  S5-3     
-        12       1236 33101  24445 13R  S5-3     
-        12       1237 33101  25560 13L  P10      
-        12       1238 33101  24455 13R  S5-3     
-        12       1239 33101  25580 13L  P10      
-        12       1240 33101  24460 13R  S5-3     
-        12       1241 33101  24380 13L  S5-3     
-        12       1242 33101  24416 13R  S5-3     
-        12       1243 33101  24365 13L  S5-3     
-        12       1244 33101  24425 13R  S5-3     
-        12       1245 33101  24390 13L  S5-3     
-        12       1246 33101  24431 13R  S5-3     
-        12       1247 33101  24395 13L  S5-3     
-        12       1248 33101  24421 13R  S5-3     
-        12       1249 33101  24404 13L  S5-3     
-        12       1250 33101  24436 13R  S5-3     
-        12       1251 33101  24385 13L  S5-3     
-        12       1252 33101  24441 13R  S5-3     
-        12       1253 33101  24375 13L  S5-3     
-        12       1254 33101  24451 13R  S5-3     
-        12       1255 33101  24370 13L  S5-3     
-        12       1256 33101  24446 13R  S5-3     
-        12       1257 33101  25561 13L  P10      
-        12       1258 33101  24456 13R  S5-3     
-        12       1259 33101  25584 13L  P10      
-        12       1260 33101  24461 13R  S5-3     
-        12       1261 33101  24381 13L  S5-3     
-        12       1262 33101  24417 13R  S5-3     
-        12       1263 33101  24366 13L  S5-3     
-        12       1264 33101  24427 13R  S5-3     
-        12       1265 33101  24391 13L  S5-3     
-        12       1266 33101  24432 13R  S5-3     
-        12       1267 33101  24396 13L  S5-3     
-        12       1268 33101  24422 13R  S5-3     
-        12       1269 33101  24406 13L  S5-3     
-        12       1270 33101  24437 13R  S5-3     
-        12       1271 33101  24386 13L  S5-3     
-        12       1272 33101  24442 13R  S5-3     
-        12       1273 33101  24376 13L  S5-3     
-        12       1274 33101  24452 13R  S5-3     
-        12       1275 33101  24371 13L  S5-3     
-        12       1276 33101  24447 13R  S5-3     
-        12       1277 33101  25563 13L  P10      
-        12       1278 33101  24457 13R  S5-3     
-        12       1279 33101  25589 13L  P10      
-        12       1280 33101  24462 13R  S5-3     
-        12       1281 33101  24382 13L  S5-3     
-        12       1282 33101  24426 13R  S5-3     
-        12       1283 33101  24367 13L  S5-3     
-        12       1284 33101  24428 13R  S5-3     
-        12       1285 33101  24392 13L  S5-3     
-        12       1286 33101  24433 13R  S5-3     
-        12       1287 33101  24397 13L  S5-3     
-        12       1288 33101  24423 13R  S5-3     
-        12       1289 33101  24407 13L  S5-3     
-        12       1290 33101  24438 13R  S5-3     
-        12       1291 33101  24387 13L  S5-3     
-        12       1292 33101  24443 13R  S5-3     
-        12       1293 33101  24377 13L  S5-3     
-        12       1294 33101  24453 13R  S5-3     
-        12       1295 33101  24372 13L  S5-3     
-        12       1296 33101  24448 13R  S5-3     
-        12       1297 33101  21302 13L  S4       
-        12       1298 33101  24458 13R  S5-3     
-        12       1299 33101  25596 13L  P10      
-        12       1300 33101  24463 13R  S5-3     
-        12       1301 33101  17082 14L  S3       
-        12       1302 33101  19172 14R  S4       
-        12       1303 33101  19462 14L  S4       
-        12       1304 33101  19291 14R  S4       
-        12       1305 33101  24690 14L  P10_1    
-        12       1306 33101  24732 14R  P10_1    
-        12       1307 33101  23865 14L  S5_3     
-        12       1308 33101  24737 14R  P10_1    
-        12       1309 33101  23875 14L  S5_3     
-        12       1310 33101  24742 14R  P10_1    
-        12       1311 33101  23883 14L  S5_3     
-        12       1312 33101  23915 14R  S5_3     
-        12       1313 33101  23890 14L  S5_3     
-        12       1314 33101  23920 14R  S5_3     
-        12       1315 33101  23898 14L  S5_3     
-        12       1316 33101  23925 14R  S5_3     
-        12       1317 33101  23904 14L  S5_3     
-        12       1318 33101  23931 14R  S5_3     
-        12       1319 33101  23909 14L  S5_3     
-        12       1320 33101  23938 14R  S5_3     
-        12       1321 33101  19339 14L  S4       
-        12       1322 33101  19196 14R  S4       
-        12       1323 33101  24685 14L  P10_1    
-        12       1324 33101  24722 14R  P10_1    
-        12       1325 33101  24691 14L  P10_1    
-        12       1326 33101  24733 14R  P10_1    
-        12       1327 33101  23866 14L  S5_3     
-        12       1328 33101  24738 14R  P10_1    
-        12       1329 33101  23876 14L  S5_3     
-        12       1330 33101  24743 14R  P10_1    
-        12       1331 33101  23885 14L  S5_3     
-        12       1332 33101  23916 14R  S5_3     
-        12       1333 33101  23892 14L  S5_3     
-        12       1334 33101  23921 14R  S5_3     
-        12       1335 33101  23899 14L  S5_3     
-        12       1336 33101  23926 14R  S5_3     
-        12       1337 33101  23905 14L  S5_3     
-        12       1338 33101  23933 14R  S5_3     
-        12       1339 33101  23910 14L  S5_3     
-        12       1340 33101  23939 14R  S5_3     
-        12       1341 33101  19379 14L  S4       
-        12       1342 33101  19236 14R  S4       
-        12       1343 33101  24686 14L  P10_1    
-        12       1344 33101  24729 14R  P10_1    
-        12       1345 33101  24692 14L  P10_1    
-        12       1346 33101  24734 14R  P10_1    
-        12       1347 33101  23868 14L  S5_3     
-        12       1348 33101  24739 14R  P10_1    
-        12       1349 33101  23877 14L  S5_3     
-        12       1350 33101  24744 14R  P10_1    
-        12       1351 33101  23886 14L  S5_3     
-        12       1352 33101  23917 14R  S5_3     
-        12       1353 33101  23893 14L  S5_3     
-        12       1354 33101  23922 14R  S5_3     
-        12       1355 33101  23901 14L  S5_3     
-        12       1356 33101  23928 14R  S5_3     
-        12       1357 33101  23906 14L  S5_3     
-        12       1358 33101  23934 14R  S5_3     
-        12       1359 33101  23911 14L  S5_3     
-        12       1360 33101  23940 14R  S5_3     
-        12       1361 33101  19391 14L  S4       
-        12       1362 33101  19249 14R  S4       
-        12       1363 33101  24688 14L  P10_1    
-        12       1364 33101  24730 14R  P10_1    
-        12       1365 33101  23862 14L  S5_3     
-        12       1366 33101  24735 14R  P10_1    
-        12       1367 33101  23870 14L  S5_3     
-        12       1368 33101  24740 14R  P10_1    
-        12       1369 33101  23878 14L  S5_3     
-        12       1370 33101  23913 14R  S5_3     
-        12       1371 33101  23888 14L  S5_3     
-        12       1372 33101  23918 14R  S5_3     
-        12       1373 33101  23894 14L  S5_3     
-        12       1374 33101  23923 14R  S5_3     
-        12       1375 33101  23902 14L  S5_3     
-        12       1376 33101  23929 14R  S5_3     
-        12       1377 33101  23907 14L  S5_3     
-        12       1378 33101  23936 14R  S5_3     
-        12       1379 33101  23912 14L  S5_3     
-        12       1380 33101  23941 14R  S5_3     
-        12       1381 33101  19441 14L  S4       
-        12       1382 33101  19265 14R  S4       
-        12       1383 33101  24689 14L  P10_1    
-        12       1384 33101  24731 14R  P10_1    
-        12       1385 33101  23864 14L  S5_3     
-        12       1386 33101  24736 14R  P10_1    
-        12       1387 33101  23873 14L  S5_3     
-        12       1388 33101  24741 14R  P10_1    
-        12       1389 33101  23881 14L  S5_3     
-        12       1390 33101  23914 14R  S5_3     
-        12       1391 33101  23889 14L  S5_3     
-        12       1392 33101  23919 14R  S5_3     
-        12       1393 33101  23896 14L  S5_3     
-        12       1394 33101  23924 14R  S5_3     
-        12       1395 33101  23903 14L  S5_3     
-        12       1396 33101  23930 14R  S5_3     
-        12       1397 33101  23908 14L  S5_3     
-        12       1398 33101  23937 14R  S5_3     
-        12       1399 33101  23880 14L  S5_3     
-        12       1400 33101  23942 14R  S5_3     
-        12       1401 33101  24747 15L  P10_1    
-        12       1402 33101  24799 15R  P10_1    
-        12       1403 33101  24797 15L  P10_1    
-        12       1404 33101  24849 15R  P10_1    
-        12       1405 33101  23967 15L  S5_3     
-        12       1406 33101  24854 15R  P10_1    
-        12       1407 33101  23972 15L  S5_3     
-        12       1408 33101  24018 15R  S5_3     
-        12       1409 33101  23977 15L  S5_3     
-        12       1410 33101  24023 15R  S5_3     
-        12       1411 33101  23982 15L  S5_3     
-        12       1412 33101  24029 15R  S5_3     
-        12       1413 33101  23987 15L  S5_3     
-        12       1414 33101  24034 15R  S5_3     
-        12       1415 33101  23992 15L  S5_3     
-        12       1416 33101  24039 15R  S5_3     
-        12       1417 33101  23997 15L  S5_3     
-        12       1418 33101  24044 15R  S5_3     
-        12       1419 33101  24002 15L  S5_3     
-        12       1420 33101  24049 15R  S5_3     
-        12       1421 33101  24780 15L  P10_1    
-        12       1422 33101  24844 15R  P10_1    
-        12       1423 33101  24798 15L  P10_1    
-        12       1424 33101  24850 15R  P10_1    
-        12       1425 33101  23968 15L  S5_3     
-        12       1426 33101  24855 15R  P10_1    
-        12       1427 33101  23973 15L  S5_3     
-        12       1428 33101  24019 15R  S5_3     
-        12       1429 33101  23978 15L  S5_3     
-        12       1430 33101  24024 15R  S5_3     
-        12       1431 33101  23983 15L  S5_3     
-        12       1432 33101  24030 15R  S5_3     
-        12       1433 33101  23988 15L  S5_3     
-        12       1434 33101  24035 15R  S5_3     
-        12       1435 33101  23993 15L  S5_3     
-        12       1436 33101  24040 15R  S5_3     
-        12       1437 33101  23998 15L  S5_3     
-        12       1438 33101  24045 15R  S5_3     
-        12       1439 33101  24003 15L  S5_3     
-        12       1440 33101  24050 15R  S5_3     
-        12       1441 33101  24781 15L  P10_1    
-        12       1442 33101  24845 15R  P10_1    
-        12       1443 33101  23964 15L  S5_3     
-        12       1444 33101  24851 15R  P10_1    
-        12       1445 33101  23969 15L  S5_3     
-        12       1446 33101  24856 15R  P10_1    
-        12       1447 33101  23974 15L  S5_3     
-        12       1448 33101  24020 15R  S5_3     
-        12       1449 33101  23979 15L  S5_3     
-        12       1450 33101  24025 15R  S5_3     
-        12       1451 33101  23984 15L  S5_3     
-        12       1452 33101  24031 15R  S5_3     
-        12       1453 33101  23989 15L  S5_3     
-        12       1454 33101  24036 15R  S5_3     
-        12       1455 33101  23994 15L  S5_3     
-        12       1456 33101  24041 15R  S5_3     
-        12       1457 33101  23999 15L  S5_3     
-        12       1458 33101  24046 15R  S5_3     
-        12       1459 33101  24004 15L  S5_3     
-        12       1460 33101  24051 15R  S5_3     
-        12       1461 33101  24795 15L  P10_1    
-        12       1462 33101  24846 15R  P10_1    
-        12       1463 33101  23965 15L  S5_3     
-        12       1464 33101  24852 15R  P10_1    
-        12       1465 33101  23970 15L  S5_3     
-        12       1466 33101  24015 15R  S5_3     
-        12       1467 33101  23975 15L  S5_3     
-        12       1468 33101  24021 15R  S5_3     
-        12       1469 33101  23980 15L  S5_3     
-        12       1470 33101  24026 15R  S5_3     
-        12       1471 33101  23985 15L  S5_3     
-        12       1472 33101  24032 15R  S5_3     
-        12       1473 33101  23990 15L  S5_3     
-        12       1474 33101  24037 15R  S5_3     
-        12       1475 33101  23995 15L  S5_3     
-        12       1476 33101  24042 15R  S5_3     
-        12       1477 33101  24000 15L  S5_3     
-        12       1478 33101  24047 15R  S5_3     
-        12       1479 33101  24006 15L  S5_3     
-        12       1480 33101  24052 15R  S5_3     
-        12       1481 33101  24796 15L  P10_1    
-        12       1482 33101  24848 15R  P10_1    
-        12       1483 33101  23966 15L  S5_3     
-        12       1484 33101  24853 15R  P10_1    
-        12       1485 33101  23971 15L  S5_3     
-        12       1486 33101  24017 15R  S5_3     
-        12       1487 33101  23976 15L  S5_3     
-        12       1488 33101  24022 15R  S5_3     
-        12       1489 33101  23981 15L  S5_3     
-        12       1490 33101  24027 15R  S5_3     
-        12       1491 33101  23986 15L  S5_3     
-        12       1492 33101  24033 15R  S5_3     
-        12       1493 33101  23991 15L  S5_3     
-        12       1494 33101  24038 15R  S5_3     
-        12       1495 33101  23996 15L  S5_3     
-        12       1496 33101  24043 15R  S5_3     
-        12       1497 33101  24001 15L  S5_3     
-        12       1498 33101  24048 15R  S5_3     
-        12       1499 33101  24007 15L  S5_3     
-        12       1500 33101  24053 15R  S5_3     
-        12       1501 33101  24066 16L  S5_3     
-        12       1502 33101  19935 16R  S4       
-        12       1503 33101  24888 16L  P10_1    
-        12       1504 33101  24953 16R  P10_1    
-        12       1505 33101  25726 16L  P10_2    
-        12       1506 33101  25765 16R  P10_2    
-        12       1507 33101  24068 16L  S5_3     
-        12       1508 33101  24956 16R  P10_1    
-        12       1509 33101  25734 16L  P10_2    
-        12       1510 33101  25773 16R  P10_2    
-        12       1511 33101  25739 16L  P10_2    
-        12       1512 33101  25779 16R  P10_2    
-        12       1513 33101  25746 16L  P10_2    
-        12       1514 33101  25784 16R  P10_2    
-        12       1515 33101  25752 16L  P10_2    
-        12       1516 33101  25789 16R  P10_2    
-        12       1517 33101  25757 16L  P10_2    
-        12       1518 33101  25795 16R  P10_2    
-        12       1519 33101  17328 16L  S3       
-        12       1520 33101  25988 16R  P11_1    
-        12       1521 33101  24067 16L  S5_3     
-        12       1522 33101  19949 16R  S4       
-        12       1523 33101  24894 16L  P10_1    
-        12       1524 33101  24954 16R  P10_1    
-        12       1525 33101  25727 16L  P10_2    
-        12       1526 33101  25768 16R  P10_2    
-        12       1527 33101  24860 16L  P10_1    
-        12       1528 33101  25762 16R  P10_2    
-        12       1529 33101  25735 16L  P10_2    
-        12       1530 33101  25775 16R  P10_2    
-        12       1531 33101  25740 16L  P10_2    
-        12       1532 33101  25780 16R  P10_2    
-        12       1533 33101  25747 16L  P10_2    
-        12       1534 33101  25785 16R  P10_2    
-        12       1535 33101  25753 16L  P10_2    
-        12       1536 33101  25790 16R  P10_2    
-        12       1537 33101  25758 16L  P10_2    
-        12       1538 33101  25796 16R  P10_2    
-        12       1539 33101  17374 16L  S3       
-        12       1540 33101  25989 16R  P11_1    
-        12       1541 33101  24069 16L  S5_3     
-        12       1542 33101  21435 16R  P9       
-        12       1543 33101  24899 16L  P10_1    
-        12       1544 33101  24955 16R  P10_1    
-        12       1545 33101  25728 16L  P10_2    
-        12       1546 33101  25769 16R  P10_2    
-        12       1547 33101  25731 16L  P10_2    
-        12       1548 33101  25764 16R  P10_2    
-        12       1549 33101  25736 16L  P10_2    
-        12       1550 33101  25776 16R  P10_2    
-        12       1551 33101  25741 16L  P10_2    
-        12       1552 33101  25781 16R  P10_2    
-        12       1553 33101  25748 16L  P10_2    
-        12       1554 33101  25786 16R  P10_2    
-        12       1555 33101  25754 16L  P10_2    
-        12       1556 33101  25792 16R  P10_2    
-        12       1557 33101  25759 16L  P10_2    
-        12       1558 33101  25797 16R  P10_2    
-        12       1559 33101  17378 16L  S3       
-        12       1560 33101  24929 16R  P10_1    
-        12       1561 33101  24865 16L  P10_1    
-        12       1562 33101  24927 16R  P10_1    
-        12       1563 33101  25724 16L  P10_2    
-        12       1564 33101  25761 16R  P10_2    
-        12       1565 33101  25729 16L  P10_2    
-        12       1566 33101  25770 16R  P10_2    
-        12       1567 33101  25732 16L  P10_2    
-        12       1568 33101  25766 16R  P10_2    
-        12       1569 33101  25737 16L  P10_2    
-        12       1570 33101  25777 16R  P10_2    
-        12       1571 33101  25744 16L  P10_2    
-        12       1572 33101  25782 16R  P10_2    
-        12       1573 33101  25749 16L  P10_2    
-        12       1574 33101  25787 16R  P10_2    
-        12       1575 33101  25755 16L  P10_2    
-        12       1576 33101  25793 16R  P10_2    
-        12       1577 33101  25760 16L  P10_2    
-        12       1578 33101  25798 16R  P10_2    
-        12       1579 33101  19751 16L  S4       
-        12       1580 33101  24952 16R  P10_1    
-        12       1581 33101  24880 16L  P10_1    
-        12       1582 33101  24951 16R  P10_1    
-        12       1583 33101  25725 16L  P10_2    
-        12       1584 33101  25763 16R  P10_2    
-        12       1585 33101  25730 16L  P10_2    
-        12       1586 33101  25771 16R  P10_2    
-        12       1587 33101  25733 16L  P10_2    
-        12       1588 33101  25767 16R  P10_2    
-        12       1589 33101  25738 16L  P10_2    
-        12       1590 33101  25778 16R  P10_2    
-        12       1591 33101  25745 16L  P10_2    
-        12       1592 33101  25783 16R  P10_2    
-        12       1593 33101  25750 16L  P10_2    
-        12       1594 33101  25788 16R  P10_2    
-        12       1595 33101  25756 16L  P10_2    
-        12       1596 33101  25794 16R  P10_2    
-        12       1597 33101  24885 16L  P10_1    
-        12       1598 33101  25799 16R  P10_2    
-        12       1599 33101  19772 16L  S4       
-        12       1600 33101  25772 16R  P10_2    
-        12       1601 33101  20097 17L  S4       
-        12       1602 33101  20236 17R  S4       
-        12       1603 33101  20083 17L  S4       
-        12       1604 33101  25009 17R  P10_1    
-        12       1605 33101  25004 17L  P10_1    
-        12       1606 33101  25843 17R  P10_2    
-        12       1607 33101  25801 17L  P10_2    
-        12       1608 33101  25848 17R  P10_2    
-        12       1609 33101  25806 17L  P10_2    
-        12       1610 33101  25853 17R  P10_2    
-        12       1611 33101  25811 17L  P10_2    
-        12       1612 33101  25858 17R  P10_2    
-        12       1613 33101  25816 17L  P10_2    
-        12       1614 33101  25863 17R  P10_2    
-        12       1615 33101  25821 17L  P10_2    
-        12       1616 33101  25868 17R  P10_2    
-        12       1617 33101  25826 17L  P10_2    
-        12       1618 33101  25873 17R  P10_2    
-        12       1619 33101  25831 17L  P10_2    
-        12       1620 33101  25992 17R  P11_1    
-        12       1621 33101  21448 17L  P9       
-        12       1622 33101  20262 17R  S4       
-        12       1623 33101  25000 17L  P10_1    
-        12       1624 33101  25839 17R  P10_2    
-        12       1625 33101  25005 17L  P10_1    
-        12       1626 33101  25844 17R  P10_2    
-        12       1627 33101  25802 17L  P10_2    
-        12       1628 33101  25849 17R  P10_2    
-        12       1629 33101  25807 17L  P10_2    
-        12       1630 33101  25854 17R  P10_2    
-        12       1631 33101  25812 17L  P10_2    
-        12       1632 33101  25859 17R  P10_2    
-        12       1633 33101  25817 17L  P10_2    
-        12       1634 33101  25864 17R  P10_2    
-        12       1635 33101  25822 17L  P10_2    
-        12       1636 33101  25869 17R  P10_2    
-        12       1637 33101  25827 17L  P10_2    
-        12       1638 33101  25874 17R  P10_2    
-        12       1639 33101  25832 17L  P10_2    
-        12       1640 33101  25993 17R  P11_1    
-        12       1641 33101  21460 17L  P9       
-        12       1642 33101  20263 17R  S4       
-        12       1643 33101  25001 17L  P10_1    
-        12       1644 33101  25840 17R  P10_2    
-        12       1645 33101  25006 17L  P10_1    
-        12       1646 33101  25845 17R  P10_2    
-        12       1647 33101  25803 17L  P10_2    
-        12       1648 33101  25850 17R  P10_2    
-        12       1649 33101  25808 17L  P10_2    
-        12       1650 33101  25855 17R  P10_2    
-        12       1651 33101  25813 17L  P10_2    
-        12       1652 33101  25860 17R  P10_2    
-        12       1653 33101  25818 17L  P10_2    
-        12       1654 33101  25865 17R  P10_2    
-        12       1655 33101  25823 17L  P10_2    
-        12       1656 33101  25870 17R  P10_2    
-        12       1657 33101  25828 17L  P10_2    
-        12       1658 33101  25875 17R  P10_2    
-        12       1659 33101  25833 17L  P10_2    
-        12       1660 33101  25994 17R  P11_1    
-        12       1661 33101  24998 17L  P10_1    
-        12       1662 33101  21462 17R  P9       
-        12       1663 33101  25002 17L  P10_1    
-        12       1664 33101  25841 17R  P10_2    
-        12       1665 33101  25007 17L  P10_1    
-        12       1666 33101  25846 17R  P10_2    
-        12       1667 33101  25804 17L  P10_2    
-        12       1668 33101  25851 17R  P10_2    
-        12       1669 33101  25809 17L  P10_2    
-        12       1670 33101  25856 17R  P10_2    
-        12       1671 33101  25814 17L  P10_2    
-        12       1672 33101  25861 17R  P10_2    
-        12       1673 33101  25819 17L  P10_2    
-        12       1674 33101  25866 17R  P10_2    
-        12       1675 33101  25824 17L  P10_2    
-        12       1676 33101  25871 17R  P10_2    
-        12       1677 33101  25829 17L  P10_2    
-        12       1678 33101  25876 17R  P10_2    
-        12       1679 33101  25834 17L  P10_2    
-        12       1680 33101  25995 17R  P11_1    
-        12       1681 33101  24999 17L  P10_1    
-        12       1682 33101  25008 17R  P10_1    
-        12       1683 33101  25003 17L  P10_1    
-        12       1684 33101  25842 17R  P10_2    
-        12       1685 33101  25800 17L  P10_2    
-        12       1686 33101  25847 17R  P10_2    
-        12       1687 33101  25805 17L  P10_2    
-        12       1688 33101  25852 17R  P10_2    
-        12       1689 33101  25810 17L  P10_2    
-        12       1690 33101  25857 17R  P10_2    
-        12       1691 33101  25815 17L  P10_2    
-        12       1692 33101  25862 17R  P10_2    
-        12       1693 33101  25820 17L  P10_2    
-        12       1694 33101  25867 17R  P10_2    
-        12       1695 33101  25825 17L  P10_2    
-        12       1696 33101  25872 17R  P10_2    
-        12       1697 33101  25830 17L  P10_2    
-        12       1698 33101  25877 17R  P10_2    
-        12       1699 33101  25835 17L  P10_2    
-        12       1700 33101  25996 17R  P11_1    
-        13          1 33101  12859 1L   S2       
-        13          2 33101  12877 1R   S2       
-        13          3 33101  22869 1L   S5       
-        13          4 33101  21991 1R   S5       
-        13          5 33101  22874 1L   S5       
-        13          6 33101  21996 1R   S5       
-        13          7 33101  24505 1L   P10_1    
-        13          8 33101  24551 1R   P10_1    
-        13          9 33101  24510 1L   P10_1    
-        13         10 33101  24556 1R   P10_1    
-        13         11 33101  24515 1L   P10_1    
-        13         12 33101  24561 1R   P10_1    
-        13         13 33101  24521 1L   P10_1    
-        13         14 33101  24566 1R   P10_1    
-        13         15 33101  24527 1L   P10_1    
-        13         16 33101  24571 1R   P10_1    
-        13         17 33101  24533 1L   P10_1    
-        13         18 33101  24576 1R   P10_1    
-        13         19 33101  24538 1L   P10_1    
-        13         20 33101  24581 1R   P10_1    
-        13         21 33101  22862 1L   S5       
-        13         22 33101  16108 1R   S3       
-        13         23 33101  22870 1L   S5       
-        13         24 33101  21992 1R   S5       
-        13         25 33101  24501 1L   P10_1    
-        13         26 33101  21997 1R   S5       
-        13         27 33101  24506 1L   P10_1    
-        13         28 33101  24552 1R   P10_1    
-        13         29 33101  24511 1L   P10_1    
-        13         30 33101  24557 1R   P10_1    
-        13         31 33101  24516 1L   P10_1    
-        13         32 33101  24562 1R   P10_1    
-        13         33 33101  24522 1L   P10_1    
-        13         34 33101  24567 1R   P10_1    
-        13         35 33101  24528 1L   P10_1    
-        13         36 33101  24572 1R   P10_1    
-        13         37 33101  24534 1L   P10_1    
-        13         38 33101  24577 1R   P10_1    
-        13         39 33101  24539 1L   P10_1    
-        13         40 33101  24582 1R   P10_1    
-        13         41 33101  22865 1L   S5       
-        13         42 33101  21913 1R   S5       
-        13         43 33101  22871 1L   S5       
-        13         44 33101  21993 1R   S5       
-        13         45 33101  24502 1L   P10_1    
-        13         46 33101  24548 1R   P10_1    
-        13         47 33101  24507 1L   P10_1    
-        13         48 33101  24553 1R   P10_1    
-        13         49 33101  24512 1L   P10_1    
-        13         50 33101  24558 1R   P10_1    
-        13         51 33101  24518 1L   P10_1    
-        13         52 33101  24563 1R   P10_1    
-        13         53 33101  24524 1L   P10_1    
-        13         54 33101  24568 1R   P10_1    
-        13         55 33101  24530 1L   P10_1    
-        13         56 33101  24573 1R   P10_1    
-        13         57 33101  24535 1L   P10_1    
-        13         58 33101  24578 1R   P10_1    
-        13         59 33101  24540 1L   P10_1    
-        13         60 33101  24583 1R   P10_1    
-        13         61 33101  22866 1L   S5       
-        13         62 33101  21934 1R   S5       
-        13         63 33101  22872 1L   S5       
-        13         64 33101  21994 1R   S5       
-        13         65 33101  24503 1L   P10_1    
-        13         66 33101  24549 1R   P10_1    
-        13         67 33101  24508 1L   P10_1    
-        13         68 33101  24554 1R   P10_1    
-        13         69 33101  24513 1L   P10_1    
-        13         70 33101  24559 1R   P10_1    
-        13         71 33101  24519 1L   P10_1    
-        13         72 33101  24564 1R   P10_1    
-        13         73 33101  24525 1L   P10_1    
-        13         74 33101  24569 1R   P10_1    
-        13         75 33101  24531 1L   P10_1    
-        13         76 33101  24574 1R   P10_1    
-        13         77 33101  24536 1L   P10_1    
-        13         78 33101  24579 1R   P10_1    
-        13         79 33101  24541 1L   P10_1    
-        13         80 33101  24584 1R   P10_1    
-        13         81 33101  22868 1L   S5       
-        13         82 33101  21990 1R   S5       
-        13         83 33101  22873 1L   S5       
-        13         84 33101  21995 1R   S5       
-        13         85 33101  24504 1L   P10_1    
-        13         86 33101  24550 1R   P10_1    
-        13         87 33101  24509 1L   P10_1    
-        13         88 33101  24555 1R   P10_1    
-        13         89 33101  24514 1L   P10_1    
-        13         90 33101  24560 1R   P10_1    
-        13         91 33101  24520 1L   P10_1    
-        13         92 33101  24565 1R   P10_1    
-        13         93 33101  24526 1L   P10_1    
-        13         94 33101  24570 1R   P10_1    
-        13         95 33101  24532 1L   P10_1    
-        13         96 33101  24575 1R   P10_1    
-        13         97 33101  24537 1L   P10_1    
-        13         98 33101  24580 1R   P10_1    
-        13         99 33101  24542 1L   P10_1    
-        13        100 33101  24585 1R   P10_1    
-        13        101 33101  16248 2L   S3       
-        13        102 33101  16412 2R   S3       
-        13        103 33101  22143 2L   S5       
-        13        104 33101  22090 2R   S5       
-        13        105 33101  22183 2L   S5       
-        13        106 33101  22095 2R   S5       
-        13        107 33101  24603 2L   P10_1    
-        13        108 33101  23537 2R   S5_3     
-        13        109 33101  24608 2L   P10_1    
-        13        110 33101  23544 2R   S5_3     
-        13        111 33101  24613 2L   P10_1    
-        13        112 33101  23549 2R   S5_3     
-        13        113 33101  24619 2L   P10_1    
-        13        114 33101  23555 2R   S5_3     
-        13        115 33101  23507 2L   S5_3     
-        13        116 33101  23562 2R   S5_3     
-        13        117 33101  23512 2L   S5_3     
-        13        118 33101  23567 2R   S5_3     
-        13        119 33101  23517 2L   S5_3     
-        13        120 33101  23572 2R   S5_3     
-        13        121 33101  16250 2L   S3       
-        13        122 33101  22036 2R   S5       
-        13        123 33101  22179 2L   S5       
-        13        124 33101  22091 2R   S5       
-        13        125 33101  22184 2L   S5       
-        13        126 33101  24621 2R   P10_1    
-        13        127 33101  24604 2L   P10_1    
-        13        128 33101  23538 2R   S5_3     
-        13        129 33101  24609 2L   P10_1    
-        13        130 33101  23545 2R   S5_3     
-        13        131 33101  24614 2L   P10_1    
-        13        132 33101  23551 2R   S5_3     
-        13        133 33101  24620 2L   P10_1    
-        13        134 33101  23556 2R   S5_3     
-        13        135 33101  23508 2L   S5_3     
-        13        136 33101  23563 2R   S5_3     
-        13        137 33101  23513 2L   S5_3     
-        13        138 33101  23568 2R   S5_3     
-        13        139 33101  23518 2L   S5_3     
-        13        140 33101  23573 2R   S5_3     
-        13        141 33101  18801 2L   S4       
-        13        142 33101  22087 2R   S5       
-        13        143 33101  22180 2L   S5       
-        13        144 33101  22092 2R   S5       
-        13        145 33101  22185 2L   S5       
-        13        146 33101  24622 2R   P10_1    
-        13        147 33101  24605 2L   P10_1    
-        13        148 33101  23541 2R   S5_3     
-        13        149 33101  24610 2L   P10_1    
-        13        150 33101  23546 2R   S5_3     
-        13        151 33101  24615 2L   P10_1    
-        13        152 33101  23552 2R   S5_3     
-        13        153 33101  23504 2L   S5_3     
-        13        154 33101  23557 2R   S5_3     
-        13        155 33101  23509 2L   S5_3     
-        13        156 33101  23564 2R   S5_3     
-        13        157 33101  23514 2L   S5_3     
-        13        158 33101  23569 2R   S5_3     
-        13        159 33101  23519 2L   S5_3     
-        13        160 33101  23574 2R   S5_3     
-        13        161 33101  21406 2L   P9       
-        13        162 33101  22088 2R   S5       
-        13        163 33101  22181 2L   S5       
-        13        164 33101  22093 2R   S5       
-        13        165 33101  24601 2L   P10_1    
-        13        166 33101  24623 2R   P10_1    
-        13        167 33101  24606 2L   P10_1    
-        13        168 33101  23542 2R   S5_3     
-        13        169 33101  24611 2L   P10_1    
-        13        170 33101  23547 2R   S5_3     
-        13        171 33101  24616 2L   P10_1    
-        13        172 33101  23553 2R   S5_3     
-        13        173 33101  23505 2L   S5_3     
-        13        174 33101  23558 2R   S5_3     
-        13        175 33101  23510 2L   S5_3     
-        13        176 33101  23565 2R   S5_3     
-        13        177 33101  23515 2L   S5_3     
-        13        178 33101  23570 2R   S5_3     
-        13        179 33101  23520 2L   S5_3     
-        13        180 33101  23575 2R   S5_3     
-        13        181 33101  24618 2L   P10_1    
-        13        182 33101  22089 2R   S5       
-        13        183 33101  22182 2L   S5       
-        13        184 33101  22094 2R   S5       
-        13        185 33101  24602 2L   P10_1    
-        13        186 33101  23534 2R   S5_3     
-        13        187 33101  24607 2L   P10_1    
-        13        188 33101  23543 2R   S5_3     
-        13        189 33101  24612 2L   P10_1    
-        13        190 33101  23548 2R   S5_3     
-        13        191 33101  24617 2L   P10_1    
-        13        192 33101  23554 2R   S5_3     
-        13        193 33101  23506 2L   S5_3     
-        13        194 33101  23559 2R   S5_3     
-        13        195 33101  23511 2L   S5_3     
-        13        196 33101  23566 2R   S5_3     
-        13        197 33101  23516 2L   S5_3     
-        13        198 33101  23571 2R   S5_3     
-        13        199 33101  23521 2L   S5_3     
-        13        200 33101  23576 2R   S5_3     
-        13        201 33101  18852 3L   S4       
-        13        202 33101  22212 3R   S5       
-        13        203 33101  22334 3L   S5       
-        13        204 33101  24626 3R   P10_1    
-        13        205 33101  23582 3L   S5_3     
-        13        206 33101  23633 3R   S5_3     
-        13        207 33101  23587 3L   S5_3     
-        13        208 33101  23638 3R   S5_3     
-        13        209 33101  23597 3L   S5_3     
-        13        210 33101  23643 3R   S5_3     
-        13        211 33101  23604 3L   S5_3     
-        13        212 33101  23648 3R   S5_3     
-        13        213 33101  23613 3L   S5_3     
-        13        214 33101  23653 3R   S5_3     
-        13        215 33101  23618 3L   S5_3     
-        13        216 33101  23658 3R   S5_3     
-        13        217 33101  23623 3L   S5_3     
-        13        218 33101  23664 3R   S5_3     
-        13        219 33101  23591 3L   S5_3     
-        13        220 33101  23669 3R   S5_3     
-        13        221 33101  18888 3L   S4       
-        13        222 33101  22248 3R   S5       
-        13        223 33101  22341 3L   S5       
-        13        224 33101  23629 3R   S5_3     
-        13        225 33101  23583 3L   S5_3     
-        13        226 33101  23634 3R   S5_3     
-        13        227 33101  23589 3L   S5_3     
-        13        228 33101  23639 3R   S5_3     
-        13        229 33101  23598 3L   S5_3     
-        13        230 33101  23644 3R   S5_3     
-        13        231 33101  23605 3L   S5_3     
-        13        232 33101  23649 3R   S5_3     
-        13        233 33101  23614 3L   S5_3     
-        13        234 33101  23654 3R   S5_3     
-        13        235 33101  23619 3L   S5_3     
-        13        236 33101  23659 3R   S5_3     
-        13        237 33101  23624 3L   S5_3     
-        13        238 33101  23665 3R   S5_3     
-        13        239 33101  23594 3L   S5_3     
-        13        240 33101  23671 3R   S5_3     
-        13        241 33101  22286 3L   S5       
-        13        242 33101  22254 3R   S5       
-        13        243 33101  22363 3L   S5       
-        13        244 33101  23630 3R   S5_3     
-        13        245 33101  23584 3L   S5_3     
-        13        246 33101  23635 3R   S5_3     
-        13        247 33101  23592 3L   S5_3     
-        13        248 33101  23640 3R   S5_3     
-        13        249 33101  23599 3L   S5_3     
-        13        250 33101  23645 3R   S5_3     
-        13        251 33101  23608 3L   S5_3     
-        13        252 33101  23650 3R   S5_3     
-        13        253 33101  23615 3L   S5_3     
-        13        254 33101  23655 3R   S5_3     
-        13        255 33101  23620 3L   S5_3     
-        13        256 33101  23661 3R   S5_3     
-        13        257 33101  23625 3L   S5_3     
-        13        258 33101  23666 3R   S5_3     
-        13        259 33101  23601 3L   S5_3     
-        13        260 33101  23673 3R   S5_3     
-        13        261 33101  22293 3L   S5       
-        13        262 33101  22277 3R   S5       
-        13        263 33101  24624 3L   P10_1    
-        13        264 33101  23631 3R   S5_3     
-        13        265 33101  23585 3L   S5_3     
-        13        266 33101  23636 3R   S5_3     
-        13        267 33101  23593 3L   S5_3     
-        13        268 33101  23641 3R   S5_3     
-        13        269 33101  23600 3L   S5_3     
-        13        270 33101  23646 3R   S5_3     
-        13        271 33101  23609 3L   S5_3     
-        13        272 33101  23651 3R   S5_3     
-        13        273 33101  23616 3L   S5_3     
-        13        274 33101  23656 3R   S5_3     
-        13        275 33101  23621 3L   S5_3     
-        13        276 33101  23662 3R   S5_3     
-        13        277 33101  23626 3L   S5_3     
-        13        278 33101  23667 3R   S5_3     
-        13        279 33101  23607 3L   S5_3     
-        13        280 33101  23674 3R   S5_3     
-        13        281 33101  22327 3L   S5       
-        13        282 33101  24625 3R   P10_1    
-        13        283 33101  23581 3L   S5_3     
-        13        284 33101  23632 3R   S5_3     
-        13        285 33101  23586 3L   S5_3     
-        13        286 33101  23637 3R   S5_3     
-        13        287 33101  23595 3L   S5_3     
-        13        288 33101  23642 3R   S5_3     
-        13        289 33101  23602 3L   S5_3     
-        13        290 33101  23647 3R   S5_3     
-        13        291 33101  23610 3L   S5_3     
-        13        292 33101  23652 3R   S5_3     
-        13        293 33101  23617 3L   S5_3     
-        13        294 33101  23657 3R   S5_3     
-        13        295 33101  23622 3L   S5_3     
-        13        296 33101  23663 3R   S5_3     
-        13        297 33101  23628 3L   S5_3     
-        13        298 33101  23668 3R   S5_3     
-        13        299 33101  23611 3L   S5_3     
-        13        300 33101  23675 3R   S5_3     
-        13        301 33101  18942 4L   S4       
-        13        302 33101  19031 4R   S4       
-        13        303 33101  22541 4L   S5       
-        13        304 33101  22903 4R   S5       
-        13        305 33101  23680 4L   S5_3     
-        13        306 33101  24632 4R   P10_1    
-        13        307 33101  23688 4L   S5_3     
-        13        308 33101  23727 4R   S5_3     
-        13        309 33101  23693 4L   S5_3     
-        13        310 33101  23732 4R   S5_3     
-        13        311 33101  23699 4L   S5_3     
-        13        312 33101  23737 4R   S5_3     
-        13        313 33101  23705 4L   S5_3     
-        13        314 33101  23742 4R   S5_3     
-        13        315 33101  23711 4L   S5_3     
-        13        316 33101  23748 4R   S5_3     
-        13        317 33101  23716 4L   S5_3     
-        13        318 33101  23754 4R   S5_3     
-        13        319 33101  23721 4L   S5_3     
-        13        320 33101  23761 4R   S5_3     
-        13        321 33101  22481 4L   S5       
-        13        322 33101  22380 4R   S5       
-        13        323 33101  22552 4L   S5       
-        13        324 33101  22904 4R   S5       
-        13        325 33101  23681 4L   S5_3     
-        13        326 33101  24633 4R   P10_1    
-        13        327 33101  23689 4L   S5_3     
-        13        328 33101  23728 4R   S5_3     
-        13        329 33101  23694 4L   S5_3     
-        13        330 33101  23733 4R   S5_3     
-        13        331 33101  23700 4L   S5_3     
-        13        332 33101  23738 4R   S5_3     
-        13        333 33101  23706 4L   S5_3     
-        13        334 33101  23743 4R   S5_3     
-        13        335 33101  23712 4L   S5_3     
-        13        336 33101  23750 4R   S5_3     
-        13        337 33101  23717 4L   S5_3     
-        13        338 33101  23755 4R   S5_3     
-        13        339 33101  23678 4L   S5_3     
-        13        340 33101  23762 4R   S5_3     
-        13        341 33101  22496 4L   S5       
-        13        342 33101  22385 4R   S5       
-        13        343 33101  24627 4L   P10_1    
-        13        344 33101  22905 4R   S5       
-        13        345 33101  23683 4L   S5_3     
-        13        346 33101  23724 4R   S5_3     
-        13        347 33101  23690 4L   S5_3     
-        13        348 33101  23729 4R   S5_3     
-        13        349 33101  23695 4L   S5_3     
-        13        350 33101  23734 4R   S5_3     
-        13        351 33101  23701 4L   S5_3     
-        13        352 33101  23739 4R   S5_3     
-        13        353 33101  23707 4L   S5_3     
-        13        354 33101  23744 4R   S5_3     
-        13        355 33101  23713 4L   S5_3     
-        13        356 33101  23751 4R   S5_3     
-        13        357 33101  23718 4L   S5_3     
-        13        358 33101  23756 4R   S5_3     
-        13        359 33101  23684 4L   S5_3     
-        13        360 33101  23763 4R   S5_3     
-        13        361 33101  22506 4L   S5       
-        13        362 33101  22421 4R   S5       
-        13        363 33101  24628 4L   P10_1    
-        13        364 33101  24630 4R   P10_1    
-        13        365 33101  23685 4L   S5_3     
-        13        366 33101  23725 4R   S5_3     
-        13        367 33101  23691 4L   S5_3     
-        13        368 33101  23730 4R   S5_3     
-        13        369 33101  23697 4L   S5_3     
-        13        370 33101  23735 4R   S5_3     
-        13        371 33101  23703 4L   S5_3     
-        13        372 33101  23740 4R   S5_3     
-        13        373 33101  23708 4L   S5_3     
-        13        374 33101  23745 4R   S5_3     
-        13        375 33101  23714 4L   S5_3     
-        13        376 33101  23752 4R   S5_3     
-        13        377 33101  23719 4L   S5_3     
-        13        378 33101  23758 4R   S5_3     
-        13        379 33101  23722 4L   S5_3     
-        13        380 33101  23764 4R   S5_3     
-        13        381 33101  22539 4L   S5       
-        13        382 33101  22902 4R   S5       
-        13        383 33101  24629 4L   P10_1    
-        13        384 33101  24631 4R   P10_1    
-        13        385 33101  23686 4L   S5_3     
-        13        386 33101  23726 4R   S5_3     
-        13        387 33101  23692 4L   S5_3     
-        13        388 33101  23731 4R   S5_3     
-        13        389 33101  23698 4L   S5_3     
-        13        390 33101  23736 4R   S5_3     
-        13        391 33101  23704 4L   S5_3     
-        13        392 33101  23741 4R   S5_3     
-        13        393 33101  23709 4L   S5_3     
-        13        394 33101  23746 4R   S5_3     
-        13        395 33101  23715 4L   S5_3     
-        13        396 33101  23753 4R   S5_3     
-        13        397 33101  23720 4L   S5_3     
-        13        398 33101  23760 4R   S5_3     
-        13        399 33101  23710 4L   S5_3     
-        13        400 33101  23765 4R   S5_3     
-        13        401 33101  19041 5L   S4       
-        13        402 33101  17034 5R   S3       
-        13        403 33101  24634 5L   P10_1    
-        13        404 33101  22638 5R   S5       
-        13        405 33101  23771 5L   S5_3     
-        13        406 33101  23816 5R   S5_3     
-        13        407 33101  23776 5L   S5_3     
-        13        408 33101  23821 5R   S5_3     
-        13        409 33101  23781 5L   S5_3     
-        13        410 33101  24640 5R   P10_1    
-        13        411 33101  23786 5L   S5_3     
-        13        412 33101  23831 5R   S5_3     
-        13        413 33101  23791 5L   S5_3     
-        13        414 33101  23836 5R   S5_3     
-        13        415 33101  23796 5L   S5_3     
-        13        416 33101  23841 5R   S5_3     
-        13        417 33101  23801 5L   S5_3     
-        13        418 33101  23847 5R   S5_3     
-        13        419 33101  23806 5L   S5_3     
-        13        420 33101  23853 5R   S5_3     
-        13        421 33101  22674 5L   S5       
-        13        422 33101  17056 5R   S3       
-        13        423 33101  24635 5L   P10_1    
-        13        424 33101  22639 5R   S5       
-        13        425 33101  23772 5L   S5_3     
-        13        426 33101  23817 5R   S5_3     
-        13        427 33101  23777 5L   S5_3     
-        13        428 33101  23822 5R   S5_3     
-        13        429 33101  23782 5L   S5_3     
-        13        430 33101  23827 5R   S5_3     
-        13        431 33101  23787 5L   S5_3     
-        13        432 33101  23832 5R   S5_3     
-        13        433 33101  23792 5L   S5_3     
-        13        434 33101  23837 5R   S5_3     
-        13        435 33101  23797 5L   S5_3     
-        13        436 33101  23842 5R   S5_3     
-        13        437 33101  23802 5L   S5_3     
-        13        438 33101  23848 5R   S5_3     
-        13        439 33101  23807 5L   S5_3     
-        13        440 33101  23854 5R   S5_3     
-        13        441 33101  22688 5L   S5       
-        13        442 33101  19095 5R   S4       
-        13        443 33101  24636 5L   P10_1    
-        13        444 33101  22640 5R   S5       
-        13        445 33101  23773 5L   S5_3     
-        13        446 33101  23818 5R   S5_3     
-        13        447 33101  23778 5L   S5_3     
-        13        448 33101  23823 5R   S5_3     
-        13        449 33101  23783 5L   S5_3     
-        13        450 33101  23828 5R   S5_3     
-        13        451 33101  23788 5L   S5_3     
-        13        452 33101  23833 5R   S5_3     
-        13        453 33101  23793 5L   S5_3     
-        13        454 33101  23838 5R   S5_3     
-        13        455 33101  23798 5L   S5_3     
-        13        456 33101  23843 5R   S5_3     
-        13        457 33101  23803 5L   S5_3     
-        13        458 33101  23850 5R   S5_3     
-        13        459 33101  23809 5L   S5_3     
-        13        460 33101  23855 5R   S5_3     
-        13        461 33101  22699 5L   S5       
-        13        462 33101  19141 5R   S4       
-        13        463 33101  24637 5L   P10_1    
-        13        464 33101  24638 5R   P10_1    
-        13        465 33101  23774 5L   S5_3     
-        13        466 33101  23819 5R   S5_3     
-        13        467 33101  23779 5L   S5_3     
-        13        468 33101  23824 5R   S5_3     
-        13        469 33101  23784 5L   S5_3     
-        13        470 33101  23829 5R   S5_3     
-        13        471 33101  23789 5L   S5_3     
-        13        472 33101  23834 5R   S5_3     
-        13        473 33101  23794 5L   S5_3     
-        13        474 33101  23839 5R   S5_3     
-        13        475 33101  23799 5L   S5_3     
-        13        476 33101  23844 5R   S5_3     
-        13        477 33101  23804 5L   S5_3     
-        13        478 33101  23851 5R   S5_3     
-        13        479 33101  23811 5L   S5_3     
-        13        480 33101  23856 5R   S5_3     
-        13        481 33101  22722 5L   S5       
-        13        482 33101  22603 5R   S5       
-        13        483 33101  23770 5L   S5_3     
-        13        484 33101  24639 5R   P10_1    
-        13        485 33101  23775 5L   S5_3     
-        13        486 33101  23820 5R   S5_3     
-        13        487 33101  23780 5L   S5_3     
-        13        488 33101  23825 5R   S5_3     
-        13        489 33101  23785 5L   S5_3     
-        13        490 33101  23830 5R   S5_3     
-        13        491 33101  23790 5L   S5_3     
-        13        492 33101  23835 5R   S5_3     
-        13        493 33101  23795 5L   S5_3     
-        13        494 33101  23840 5R   S5_3     
-        13        495 33101  23800 5L   S5_3     
-        13        496 33101  23845 5R   S5_3     
-        13        497 33101  23805 5L   S5_3     
-        13        498 33101  23852 5R   S5_3     
-        13        499 33101  23812 5L   S5_3     
-        13        500 33101  23857 5R   S5_3     
-        13        501 33101  26197 6L   S6       
-        13        502 33101  26125 6R   S6       
-        13        503 33101  26210 6L   S6       
-        13        504 33101  26212 6R   S6       
-        13        505 33101  26176 6L   S6       
-        13        506 33101  24495 6R   S5-3     
-        13        507 33101  26227 6L   S6       
-        13        508 33101  24490 6R   S5-3     
-        13        509 33101  26476 6L   S6       
-        13        510 33101  24485 6R   S5-3     
-        13        511 33101  26381 6L   S6       
-        13        512 33101  24480 6R   S5-3     
-        13        513 33101  22989 6L   S5-2     
-        13        514 33101  24475 6R   S5-3     
-        13        515 33101  22984 6L   S5-2     
-        13        516 33101  23081 6R   S5-2     
-        13        517 33101  22941 6L   S5-2     
-        13        518 33101  24465 6R   S5-3     
-        13        519 33101  22979 6L   S5-2     
-        13        520 33101  23077 6R   S5-2     
-        13        521 33101  26198 6L   S6       
-        13        522 33101  26127 6R   S6       
-        13        523 33101  26312 6L   S6       
-        13        524 33101  26224 6R   S6       
-        13        525 33101  26177 6L   S6       
-        13        526 33101  24496 6R   S5-3     
-        13        527 33101  26231 6L   S6       
-        13        528 33101  24491 6R   S5-3     
-        13        529 33101  26477 6L   S6       
-        13        530 33101  24486 6R   S5-3     
-        13        531 33101  26382 6L   S6       
-        13        532 33101  24481 6R   S5-3     
-        13        533 33101  22990 6L   S5-2     
-        13        534 33101  24476 6R   S5-3     
-        13        535 33101  22985 6L   S5-2     
-        13        536 33101  23098 6R   S5-2     
-        13        537 33101  22944 6L   S5-2     
-        13        538 33101  24466 6R   S5-3     
-        13        539 33101  22980 6L   S5-2     
-        13        540 33101  23078 6R   S5-2     
-        13        541 33101  26199 6L   S6       
-        13        542 33101  26190 6R   S6       
-        13        543 33101  26313 6L   S6       
-        13        544 33101  26234 6R   S6       
-        13        545 33101  26221 6L   S6       
-        13        546 33101  24497 6R   S5-3     
-        13        547 33101  26232 6L   S6       
-        13        548 33101  24492 6R   S5-3     
-        13        549 33101  26487 6L   S6       
-        13        550 33101  24487 6R   S5-3     
-        13        551 33101  26436 6L   S6       
-        13        552 33101  24482 6R   S5-3     
-        13        553 33101  25656 6L   P10      
-        13        554 33101  24477 6R   S5-3     
-        13        555 33101  22986 6L   S5-2     
-        13        556 33101  23099 6R   S5-2     
-        13        557 33101  22945 6L   S5-2     
-        13        558 33101  24467 6R   S5-3     
-        13        559 33101  22981 6L   S5-2     
-        13        560 33101  23079 6R   S5-2     
-        13        561 33101  26208 6L   S6       
-        13        562 33101  26201 6R   S6       
-        13        563 33101  26314 6L   S6       
-        13        564 33101  26294 6R   S6       
-        13        565 33101  26222 6L   S6       
-        13        566 33101  24498 6R   S5-3     
-        13        567 33101  26291 6L   S6       
-        13        568 33101  24493 6R   S5-3     
-        13        569 33101  26499 6L   S6       
-        13        570 33101  24488 6R   S5-3     
-        13        571 33101  26437 6L   S6       
-        13        572 33101  24483 6R   S5-3     
-        13        573 33101  25657 6L   P10      
-        13        574 33101  24478 6R   S5-3     
-        13        575 33101  22987 6L   S5-2     
-        13        576 33101  23100 6R   S5-2     
-        13        577 33101  22946 6L   S5-2     
-        13        578 33101  24468 6R   S5-3     
-        13        579 33101  22982 6L   S5-2     
-        13        580 33101  23080 6R   S5-2     
-        13        581 33101  26209 6L   S6       
-        13        582 33101  26205 6R   S6       
-        13        583 33101  26485 6L   S6       
-        13        584 33101  26310 6R   S6       
-        13        585 33101  26226 6L   S6       
-        13        586 33101  24499 6R   S5-3     
-        13        587 33101  26292 6L   S6       
-        13        588 33101  24494 6R   S5-3     
-        13        589 33101  26500 6L   S6       
-        13        590 33101  24489 6R   S5-3     
-        13        591 33101  26439 6L   S6       
-        13        592 33101  24484 6R   S5-3     
-        13        593 33101  25658 6L   P10      
-        13        594 33101  24479 6R   S5-3     
-        13        595 33101  22988 6L   S5-2     
-        13        596 33101  24474 6R   S5-3     
-        13        597 33101  22947 6L   S5-2     
-        13        598 33101  24469 6R   S5-3     
-        13        599 33101  22983 6L   S5-2     
-        13        600 33101  25659 6R   P10      
-        13        601 33101   3383 7L   10       
-        13        602 33101   3339 7R   10       
-        13        603 33101   3361 7L   10       
-        13        604 33101   3335 7R   10       
-        13        605 33101   3356 7L   10       
-        13        606 33101   3327 7R   10       
-        13        607 33101   3351 7L   10       
-        13        608 33101   3322 7R   10       
-        13        609 33101  23167 7L   S5-2     
-        13        610 33101   3317 7R   10       
-        13        611 33101  23171 7L   S5-2     
-        13        612 33101   3311 7R   10       
-        13        613 33101  23182 7L   S5-2     
-        13        614 33101   3301 7R   10       
-        13        615 33101  21597 7L   P9       
-        13        616 33101  25667 7R   P10      
-        13        617 33101  23203 7L   S5-2     
-        13        618 33101  23306 7R   S5-2     
-        13        619 33101  23183 7L   S5-2     
-        13        620 33101  23296 7R   S5-2     
-        13        621 33101   3384 7L   10       
-        13        622 33101   3340 7R   10       
-        13        623 33101   3362 7L   10       
-        13        624 33101   3336 7R   10       
-        13        625 33101   3357 7L   10       
-        13        626 33101   3328 7R   10       
-        13        627 33101   3352 7L   10       
-        13        628 33101   3323 7R   10       
-        13        629 33101  23189 7L   S5-2     
-        13        630 33101   3318 7R   10       
-        13        631 33101  23194 7L   S5-2     
-        13        632 33101   3313 7R   10       
-        13        633 33101  23198 7L   S5-2     
-        13        634 33101   3302 7R   10       
-        13        635 33101  23202 7L   S5-2     
-        13        636 33101  23265 7R   S5-2     
-        13        637 33101  23204 7L   S5-2     
-        13        638 33101  23307 7R   S5-2     
-        13        639 33101  23184 7L   S5-2     
-        13        640 33101  23300 7R   S5-2     
-        13        641 33101   3385 7L   10       
-        13        642 33101   3341 7R   10       
-        13        643 33101   3363 7L   10       
-        13        644 33101   3338 7R   10       
-        13        645 33101   3358 7L   10       
-        13        646 33101   3330 7R   10       
-        13        647 33101   3353 7L   10       
-        13        648 33101   3324 7R   10       
-        13        649 33101  23190 7L   S5-2     
-        13        650 33101   3319 7R   10       
-        13        651 33101  23195 7L   S5-2     
-        13        652 33101   3314 7R   10       
-        13        653 33101  23199 7L   S5-2     
-        13        654 33101   3303 7R   10       
-        13        655 33101  25662 7L   P10      
-        13        656 33101  23279 7R   S5-2     
-        13        657 33101  23205 7L   S5-2     
-        13        658 33101  23309 7R   S5-2     
-        13        659 33101  23185 7L   S5-2     
-        13        660 33101  23302 7R   S5-2     
-        13        661 33101   3386 7L   10       
-        13        662 33101   3342 7R   10       
-        13        663 33101   3364 7L   10       
-        13        664 33101   3346 7R   10       
-        13        665 33101   3359 7L   10       
-        13        666 33101   3331 7R   10       
-        13        667 33101   3354 7L   10       
-        13        668 33101   3325 7R   10       
-        13        669 33101  23191 7L   S5-2     
-        13        670 33101   3320 7R   10       
-        13        671 33101  23196 7L   S5-2     
-        13        672 33101   3315 7R   10       
-        13        673 33101  23200 7L   S5-2     
-        13        674 33101   3304 7R   10       
-        13        675 33101  25663 7L   P10      
-        13        676 33101  23280 7R   S5-2     
-        13        677 33101  25660 7L   P10      
-        13        678 33101  23310 7R   S5-2     
-        13        679 33101  23186 7L   S5-2     
-        13        680 33101  23305 7R   S5-2     
-        13        681 33101   3387 7L   10       
-        13        682 33101   3343 7R   10       
-        13        683 33101   3365 7L   10       
-        13        684 33101   3347 7R   10       
-        13        685 33101   3360 7L   10       
-        13        686 33101   3334 7R   10       
-        13        687 33101   3355 7L   10       
-        13        688 33101   3326 7R   10       
-        13        689 33101  23192 7L   S5-2     
-        13        690 33101   3321 7R   10       
-        13        691 33101  23197 7L   S5-2     
-        13        692 33101   3316 7R   10       
-        13        693 33101  23201 7L   S5-2     
-        13        694 33101   3305 7R   10       
-        13        695 33101  25665 7L   P10      
-        13        696 33101  23281 7R   S5-2     
-        13        697 33101  25661 7L   P10      
-        13        698 33101  25666 7R   P10      
-        13        699 33101  23187 7L   S5-2     
-        13        700 33101  23308 7R   S5-2     
-        13        701 33101  26319 8L   S6       
-        13        702 33101   3529 8R   11       
-        13        703 33101  26296 8L   S6       
-        13        704 33101   3501 8R   11       
-        13        705 33101  26298 8L   S6       
-        13        706 33101  26479 8R   S6       
-        13        707 33101  26304 8L   S6       
-        13        708 33101  26219 8R   S6       
-        13        709 33101  26275 8L   S6       
-        13        710 33101  26214 8R   S6       
-        13        711 33101  26342 8L   S6       
-        13        712 33101  26170 8R   S6       
-        13        713 33101  26443 8L   S6       
-        13        714 33101  26165 8R   S6       
-        13        715 33101  21739 8L   P9       
-        13        716 33101  23475 8R   S5-2     
-        13        717 33101  23392 8L   S5-2     
-        13        718 33101  23487 8R   S5-2     
-        13        719 33101  25670 8L   P10      
-        13        720 33101  23482 8R   S5-2     
-        13        721 33101  26320 8L   S6       
-        13        722 33101   3530 8R   11       
-        13        723 33101  26297 8L   S6       
-        13        724 33101   3502 8R   11       
-        13        725 33101  26299 8L   S6       
-        13        726 33101  26480 8R   S6       
-        13        727 33101  26305 8L   S6       
-        13        728 33101  26469 8R   S6       
-        13        729 33101  26276 8L   S6       
-        13        730 33101  26215 8R   S6       
-        13        731 33101  26492 8L   S6       
-        13        732 33101  26171 8R   S6       
-        13        733 33101  26444 8L   S6       
-        13        734 33101  26166 8R   S6       
-        13        735 33101  23373 8L   S5-2     
-        13        736 33101  23492 8R   S5-2     
-        13        737 33101  25668 8L   P10      
-        13        738 33101  23488 8R   S5-2     
-        13        739 33101  25672 8L   P10      
-        13        740 33101  23483 8R   S5-2     
-        13        741 33101  26322 8L   S6       
-        13        742 33101   3533 8R   11       
-        13        743 33101  26343 8L   S6       
-        13        744 33101   3503 8R   11       
-        13        745 33101  26301 8L   S6       
-        13        746 33101  26481 8R   S6       
-        13        747 33101  26316 8L   S6       
-        13        748 33101  26470 8R   S6       
-        13        749 33101  26277 8L   S6       
-        13        750 33101  26216 8R   S6       
-        13        751 33101  26493 8L   S6       
-        13        752 33101  26172 8R   S6       
-        13        753 33101  26445 8L   S6       
-        13        754 33101  26167 8R   S6       
-        13        755 33101  23377 8L   S5-2     
-        13        756 33101  25693 8R   P10      
-        13        757 33101  25671 8L   P10      
-        13        758 33101  23489 8R   S5-2     
-        13        759 33101  25673 8L   P10      
-        13        760 33101  23484 8R   S5-2     
-        13        761 33101  26323 8L   S6       
-        13        762 33101   3534 8R   11       
-        13        763 33101  26344 8L   S6       
-        13        764 33101   3504 8R   11       
-        13        765 33101  26286 8L   S6       
-        13        766 33101  26482 8R   S6       
-        13        767 33101  26317 8L   S6       
-        13        768 33101  26471 8R   S6       
-        13        769 33101  26278 8L   S6       
-        13        770 33101  26217 8R   S6       
-        13        771 33101  11640 8L   S1       
-        13        772 33101  26173 8R   S6       
-        13        773 33101  26489 8L   S6       
-        13        774 33101  26168 8R   S6       
-        13        775 33101  23387 8L   S5-2     
-        13        776 33101  25694 8R   P10      
-        13        777 33101  25675 8L   P10      
-        13        778 33101  23490 8R   S5-2     
-        13        779 33101  25674 8L   P10      
-        13        780 33101  23485 8R   S5-2     
-        13        781 33101  26324 8L   S6       
-        13        782 33101   3535 8R   11       
-        13        783 33101  26442 8L   S6       
-        13        784 33101   3505 8R   11       
-        13        785 33101  26303 8L   S6       
-        13        786 33101  26495 8R   S6       
-        13        787 33101  26318 8L   S6       
-        13        788 33101  26472 8R   S6       
-        13        789 33101  26284 8L   S6       
-        13        790 33101  26218 8R   S6       
-        13        791 33101  11675 8L   S1       
-        13        792 33101  26174 8R   S6       
-        13        793 33101  26490 8L   S6       
-        13        794 33101  26169 8R   S6       
-        13        795 33101  23388 8L   S5-2     
-        13        796 33101  25697 8R   P10      
-        13        797 33101  25677 8L   P10      
-        13        798 33101  23491 8R   S5-2     
-        13        799 33101  25676 8L   P10      
-        13        800 33101  23486 8R   S5-2     
-        13        801 33101  26430 9L   S6       
-        13        802 33101  26144 9R   S6       
-        13        803 33101  26425 9L   S6       
-        13        804 33101  26363 9R   S6       
-        13        805 33101  26420 9L   S6       
-        13        806 33101  26149 9R   S6       
-        13        807 33101  26415 9L   S6       
-        13        808 33101  26156 9R   S6       
-        13        809 33101  26410 9L   S6       
-        13        810 33101  26150 9R   S6       
-        13        811 33101  25058 9L   P10      
-        13        812 33101  26358 9R   S6       
-        13        813 33101  25054 9L   P10      
-        13        814 33101  25218 9R   P10      
-        13        815 33101  25041 9L   P10      
-        13        816 33101  25192 9R   P10      
-        13        817 33101  25047 9L   P10      
-        13        818 33101  25183 9R   P10      
-        13        819 33101  25059 9L   P10      
-        13        820 33101  25172 9R   P10      
-        13        821 33101  26431 9L   S6       
-        13        822 33101  26145 9R   S6       
-        13        823 33101  26426 9L   S6       
-        13        824 33101  26364 9R   S6       
-        13        825 33101  26421 9L   S6       
-        13        826 33101  26155 9R   S6       
-        13        827 33101  26416 9L   S6       
-        13        828 33101  26158 9R   S6       
-        13        829 33101  26411 9L   S6       
-        13        830 33101  26151 9R   S6       
-        13        831 33101  25082 9L   P10      
-        13        832 33101  26359 9R   S6       
-        13        833 33101  25055 9L   P10      
-        13        834 33101  25219 9R   P10      
-        13        835 33101  25042 9L   P10      
-        13        836 33101  25193 9R   P10      
-        13        837 33101  25048 9L   P10      
-        13        838 33101  25187 9R   P10      
-        13        839 33101  25061 9L   P10      
-        13        840 33101  25175 9R   P10      
-        13        841 33101  25113 9L   P10      
-        13        842 33101  26146 9R   S6       
-        13        843 33101  26427 9L   S6       
-        13        844 33101  26365 9R   S6       
-        13        845 33101  26422 9L   S6       
-        13        846 33101  26157 9R   S6       
-        13        847 33101  26417 9L   S6       
-        13        848 33101  26159 9R   S6       
-        13        849 33101  26412 9L   S6       
-        13        850 33101  26152 9R   S6       
-        13        851 33101  25084 9L   P10      
-        13        852 33101  26360 9R   S6       
-        13        853 33101  25056 9L   P10      
-        13        854 33101  25220 9R   P10      
-        13        855 33101  25043 9L   P10      
-        13        856 33101  25194 9R   P10      
-        13        857 33101  25051 9L   P10      
-        13        858 33101  25188 9R   P10      
-        13        859 33101  25062 9L   P10      
-        13        860 33101  25177 9R   P10      
-        13        861 33101  25114 9L   P10      
-        13        862 33101  26147 9R   S6       
-        13        863 33101  26428 9L   S6       
-        13        864 33101  26366 9R   S6       
-        13        865 33101  26423 9L   S6       
-        13        866 33101  26160 9R   S6       
-        13        867 33101  26418 9L   S6       
-        13        868 33101  26162 9R   S6       
-        13        869 33101  26413 9L   S6       
-        13        870 33101  26153 9R   S6       
-        13        871 33101  25085 9L   P10      
-        13        872 33101  26361 9R   S6       
-        13        873 33101  25057 9L   P10      
-        13        874 33101  25221 9R   P10      
-        13        875 33101  25044 9L   P10      
-        13        876 33101  25195 9R   P10      
-        13        877 33101  25052 9L   P10      
-        13        878 33101  25190 9R   P10      
-        13        879 33101  25063 9L   P10      
-        13        880 33101  25180 9R   P10      
-        13        881 33101  25115 9L   P10      
-        13        882 33101  26148 9R   S6       
-        13        883 33101  26429 9L   S6       
-        13        884 33101  25223 9R   P10      
-        13        885 33101  26424 9L   S6       
-        13        886 33101  26161 9R   S6       
-        13        887 33101  26419 9L   S6       
-        13        888 33101  26163 9R   S6       
-        13        889 33101  26414 9L   S6       
-        13        890 33101  26154 9R   S6       
-        13        891 33101  25095 9L   P10      
-        13        892 33101  26362 9R   S6       
-        13        893 33101  25083 9L   P10      
-        13        894 33101  25222 9R   P10      
-        13        895 33101  25045 9L   P10      
-        13        896 33101  25197 9R   P10      
-        13        897 33101  25053 9L   P10      
-        13        898 33101  25191 9R   P10      
-        13        899 33101  25064 9L   P10      
-        13        900 33101  25182 9R   P10      
-        13        901 33101  26250 10L  S6       
-        13        902 33101  26348 10R  S6       
-        13        903 33101  26402 10L  S6       
-        13        904 33101  26337 10R  S6       
-        13        905 33101  26392 10L  S6       
-        13        906 33101  26350 10R  S6       
-        13        907 33101  26387 10L  S6       
-        13        908 33101  26327 10R  S6       
-        13        909 33101  26373 10L  S6       
-        13        910 33101  26332 10R  S6       
-        13        911 33101  26251 10L  S6       
-        13        912 33101  26452 10R  S6       
-        13        913 33101  26246 10L  S6       
-        13        914 33101  26447 10R  S6       
-        13        915 33101  26241 10L  S6       
-        13        916 33101  26353 10R  S6       
-        13        917 33101  26236 10L  S6       
-        13        918 33101  24136 10R  S5-3     
-        13        919 33101  26256 10L  S6       
-        13        920 33101  26457 10R  S6       
-        13        921 33101  26254 10L  S6       
-        13        922 33101  26349 10R  S6       
-        13        923 33101  26403 10L  S6       
-        13        924 33101  26338 10R  S6       
-        13        925 33101  26393 10L  S6       
-        13        926 33101  26462 10R  S6       
-        13        927 33101  26388 10L  S6       
-        13        928 33101  26328 10R  S6       
-        13        929 33101  26374 10L  S6       
-        13        930 33101  26333 10R  S6       
-        13        931 33101  26252 10L  S6       
-        13        932 33101  26453 10R  S6       
-        13        933 33101  26247 10L  S6       
-        13        934 33101  26448 10R  S6       
-        13        935 33101  26242 10L  S6       
-        13        936 33101  26354 10R  S6       
-        13        937 33101  26237 10L  S6       
-        13        938 33101  24137 10R  S5-3     
-        13        939 33101  26369 10L  S6       
-        13        940 33101  26458 10R  S6       
-        13        941 33101  26386 10L  S6       
-        13        942 33101  26351 10R  S6       
-        13        943 33101  26404 10L  S6       
-        13        944 33101  26339 10R  S6       
-        13        945 33101  26394 10L  S6       
-        13        946 33101  26464 10R  S6       
-        13        947 33101  26389 10L  S6       
-        13        948 33101  26329 10R  S6       
-        13        949 33101  26384 10L  S6       
-        13        950 33101  26334 10R  S6       
-        13        951 33101  26253 10L  S6       
-        13        952 33101  26454 10R  S6       
-        13        953 33101  26248 10L  S6       
-        13        954 33101  26449 10R  S6       
-        13        955 33101  26243 10L  S6       
-        13        956 33101  26355 10R  S6       
-        13        957 33101  26238 10L  S6       
-        13        958 33101  24138 10R  S5-3     
-        13        959 33101  26370 10L  S6       
-        13        960 33101  26459 10R  S6       
-        13        961 33101  26397 10L  S6       
-        13        962 33101  26352 10R  S6       
-        13        963 33101  26405 10L  S6       
-        13        964 33101  26340 10R  S6       
-        13        965 33101  26395 10L  S6       
-        13        966 33101  26465 10R  S6       
-        13        967 33101  26390 10L  S6       
-        13        968 33101  26330 10R  S6       
-        13        969 33101  26385 10L  S6       
-        13        970 33101  26335 10R  S6       
-        13        971 33101  26255 10L  S6       
-        13        972 33101  26455 10R  S6       
-        13        973 33101  26249 10L  S6       
-        13        974 33101  26450 10R  S6       
-        13        975 33101  26244 10L  S6       
-        13        976 33101  26432 10R  S6       
-        13        977 33101  26239 10L  S6       
-        13        978 33101  24139 10R  S5-3     
-        13        979 33101  26371 10L  S6       
-        13        980 33101  26460 10R  S6       
-        13        981 33101  26399 10L  S6       
-        13        982 33101  26463 10R  S6       
-        13        983 33101  26406 10L  S6       
-        13        984 33101  26347 10R  S6       
-        13        985 33101  26396 10L  S6       
-        13        986 33101  26466 10R  S6       
-        13        987 33101  26391 10L  S6       
-        13        988 33101  26331 10R  S6       
-        13        989 33101  26401 10L  S6       
-        13        990 33101  26336 10R  S6       
-        13        991 33101  26400 10L  S6       
-        13        992 33101  26456 10R  S6       
-        13        993 33101  26398 10L  S6       
-        13        994 33101  26451 10R  S6       
-        13        995 33101  26245 10L  S6       
-        13        996 33101  26433 10R  S6       
-        13        997 33101  26240 10L  S6       
-        13        998 33101  24147 10R  S5-3     
-        13        999 33101  26372 10L  S6       
-        13       1000 33101  26461 10R  S6       
-        13       1001 33101  26949 11L  S6_2     
-        13       1002 33101  27306 11R  S6_2b    
-        13       1003 33101  26959 11L  S6_2     
-        13       1004 33101  28755 11R  P12      
-        13       1005 33101  26944 11L  S6_2     
-        13       1006 33101  27291 11R  S6_2b    
-        13       1007 33101  26964 11L  S6_2     
-        13       1008 33101  28749 11R  P12      
-        13       1009 33101  26934 11L  S6_2     
-        13       1010 33101  28743 11R  P12      
-        13       1011 33101  28898 11L  P12      
-        13       1012 33101  28923 11R  P12      
-        13       1013 33101  28907 11L  P12      
-        13       1014 33101  25889 11R  P10_2    
-        13       1015 33101  28902 11L  P12      
-        13       1016 33101  21020 11R  S4       
-        13       1017 33101  20899 11L  S4       
-        13       1018 33101  24250 11R  S5-3     
-        13       1019 33101  28893 11L  P12      
-        13       1020 33101  14961 11R  S2       
-        13       1021 33101  26950 11L  S6_2     
-        13       1022 33101  27307 11R  S6_2b    
-        13       1023 33101  26960 11L  S6_2     
-        13       1024 33101  28757 11R  P12      
-        13       1025 33101  26945 11L  S6_2     
-        13       1026 33101  27295 11R  S6_2b    
-        13       1027 33101  26965 11L  S6_2     
-        13       1028 33101  28751 11R  P12      
-        13       1029 33101  26935 11L  S6_2     
-        13       1030 33101  28745 11R  P12      
-        13       1031 33101  28900 11L  P12      
-        13       1032 33101  28920 11R  P12      
-        13       1033 33101  28908 11L  P12      
-        13       1034 33101  25890 11R  P10_2    
-        13       1035 33101  28903 11L  P12      
-        13       1036 33101  21032 11R  S4       
-        13       1037 33101  24184 11L  S5-3     
-        13       1038 33101  24251 11R  S5-3     
-        13       1039 33101  28894 11L  P12      
-        13       1040 33101  24256 11R  S5-3     
-        13       1041 33101  26951 11L  S6_2     
-        13       1042 33101  27308 11R  S6_2b    
-        13       1043 33101  26961 11L  S6_2     
-        13       1044 33101  28758 11R  P12      
-        13       1045 33101  26946 11L  S6_2     
-        13       1046 33101  27298 11R  S6_2b    
-        13       1047 33101  26966 11L  S6_2     
-        13       1048 33101  28752 11R  P12      
-        13       1049 33101  26936 11L  S6_2     
-        13       1050 33101  28747 11R  P12      
-        13       1051 33101  28901 11L  P12      
-        13       1052 33101  28925 11R  P12      
-        13       1053 33101  28909 11L  P12      
-        13       1054 33101  25892 11R  P10_2    
-        13       1055 33101  28904 11L  P12      
-        13       1056 33101  24253 11R  S5-3     
-        13       1057 33101  24197 11L  S5-3     
-        13       1058 33101  24252 11R  S5-3     
-        13       1059 33101  28895 11L  P12      
-        13       1060 33101  24257 11R  S5-3     
-        13       1061 33101  26952 11L  S6_2     
-        13       1062 33101  27310 11R  S6_2b    
-        13       1063 33101  28915 11L  P12      
-        13       1064 33101  28759 11R  P12      
-        13       1065 33101  26947 11L  S6_2     
-        13       1066 33101  27299 11R  S6_2b    
-        13       1067 33101  26967 11L  S6_2     
-        13       1068 33101  28754 11R  P12      
-        13       1069 33101  26937 11L  S6_2     
-        13       1070 33101  28748 11R  P12      
-        13       1071 33101  28912 11L  P12      
-        13       1072 33101  28926 11R  P12      
-        13       1073 33101  28910 11L  P12      
-        13       1074 33101  28918 11R  P12      
-        13       1075 33101  28905 11L  P12      
-        13       1076 33101  24255 11R  S5-3     
-        13       1077 33101  24207 11L  S5-3     
-        13       1078 33101  24254 11R  S5-3     
-        13       1079 33101  28896 11L  P12      
-        13       1080 33101  24258 11R  S5-3     
-        13       1081 33101  26953 11L  S6_2     
-        13       1082 33101  27312 11R  S6_2b    
-        13       1083 33101  26963 11L  S6_2     
-        13       1084 33101  25891 11R  P10_2    
-        13       1085 33101  26948 11L  S6_2     
-        13       1086 33101  27300 11R  S6_2b    
-        13       1087 33101  26968 11L  S6_2     
-        13       1088 33101  28765 11R  P12      
-        13       1089 33101  26938 11L  S6_2     
-        13       1090 33101  28764 11R  P12      
-        13       1091 33101  28914 11L  P12      
-        13       1092 33101  28921 11R  P12      
-        13       1093 33101  28911 11L  P12      
-        13       1094 33101  28929 11R  P12      
-        13       1095 33101  28906 11L  P12      
-        13       1096 33101  25446 11R  P10      
-        13       1097 33101  24208 11L  S5-3     
-        13       1098 33101  24260 11R  S5-3     
-        13       1099 33101  28897 11L  P12      
-        13       1100 33101  24259 11R  S5-3     
-        13       1101 33101  26980 12L  S6_2     
-        13       1102 33101  28802 12R  P12      
-        13       1103 33101  26989 12L  S6_2     
-        13       1104 33101  26000 12R  P11      
-        13       1105 33101  28768 12L  P12      
-        13       1106 33101  28799 12R  P12      
-        13       1107 33101  28774 12L  P12      
-        13       1108 33101   1948 12R  8        
-        13       1109 33101  28935 12L  P12      
-        13       1110 33101  28946 12R  P12      
-        13       1111 33101  28940 12L  P12      
-        13       1112 33101  28951 12R  P12      
-        13       1113 33101  28930 12L  P12      
-        13       1114 33101  28961 12R  P12      
-        13       1115 33101  24311 12L  S5-3     
-        13       1116 33101  28956 12R  P12      
-        13       1117 33101  24278 12L  S5-3     
-        13       1118 33101  24322 12R  S5-3     
-        13       1119 33101  24303 12L  S5-3     
-        13       1120 33101  24323 12R  S5-3     
-        13       1121 33101  26982 12L  S6_2     
-        13       1122 33101  28803 12R  P12      
-        13       1123 33101  26990 12L  S6_2     
-        13       1124 33101  28795 12R  P12      
-        13       1125 33101  28770 12L  P12      
-        13       1126 33101  28800 12R  P12      
-        13       1127 33101  28775 12L  P12      
-        13       1128 33101   4303 12R  12       
-        13       1129 33101  28936 12L  P12      
-        13       1130 33101  28947 12R  P12      
-        13       1131 33101  28941 12L  P12      
-        13       1132 33101  28952 12R  P12      
-        13       1133 33101  28931 12L  P12      
-        13       1134 33101  28962 12R  P12      
-        13       1135 33101  25893 12L  P10_2    
-        13       1136 33101  28957 12R  P12      
-        13       1137 33101  24302 12L  S5-3     
-        13       1138 33101  24336 12R  S5-3     
-        13       1139 33101  24306 12L  S5-3     
-        13       1140 33101  24324 12R  S5-3     
-        13       1141 33101  26983 12L  S6_2     
-        13       1142 33101  28804 12R  P12      
-        13       1143 33101  26992 12L  S6_2     
-        13       1144 33101  28798 12R  P12      
-        13       1145 33101  28771 12L  P12      
-        13       1146 33101  28801 12R  P12      
-        13       1147 33101  28776 12L  P12      
-        13       1148 33101  24362 12R  S5-3     
-        13       1149 33101  28937 12L  P12      
-        13       1150 33101  28948 12R  P12      
-        13       1151 33101  28942 12L  P12      
-        13       1152 33101  28953 12R  P12      
-        13       1153 33101  28932 12L  P12      
-        13       1154 33101  18580 12R  P8       
-        13       1155 33101  25894 12L  P10_2    
-        13       1156 33101  28958 12R  P12      
-        13       1157 33101  24304 12L  S5-3     
-        13       1158 33101  24346 12R  S5-3     
-        13       1159 33101  24307 12L  S5-3     
-        13       1160 33101  24325 12R  S5-3     
-        13       1161 33101  26986 12L  S6_2     
-        13       1162 33101  28805 12R  P12      
-        13       1163 33101  26993 12L  S6_2     
-        13       1164 33101  28809 12R  P12      
-        13       1165 33101  28779 12L  P12      
-        13       1166 33101  28807 12R  P12      
-        13       1167 33101  28777 12L  P12      
-        13       1168 33101  28966 12R  P12      
-        13       1169 33101  25460 12L  P10      
-        13       1170 33101  28949 12R  P12      
-        13       1171 33101  28943 12L  P12      
-        13       1172 33101  28954 12R  P12      
-        13       1173 33101  28933 12L  P12      
-        13       1174 33101  28964 12R  P12      
-        13       1175 33101  25895 12L  P10_2    
-        13       1176 33101  28959 12R  P12      
-        13       1177 33101  24305 12L  S5-3     
-        13       1178 33101  24355 12R  S5-3     
-        13       1179 33101  24308 12L  S5-3     
-        13       1180 33101  24326 12R  S5-3     
-        13       1181 33101  26987 12L  S6_2     
-        13       1182 33101  28806 12R  P12      
-        13       1183 33101  26994 12L  S6_2     
-        13       1184 33101  28811 12R  P12      
-        13       1185 33101  28780 12L  P12      
-        13       1186 33101  28810 12R  P12      
-        13       1187 33101  28778 12L  P12      
-        13       1188 33101  28963 12R  P12      
-        13       1189 33101  25490 12L  P10      
-        13       1190 33101  28950 12R  P12      
-        13       1191 33101  28944 12L  P12      
-        13       1192 33101  28955 12R  P12      
-        13       1193 33101  28934 12L  P12      
-        13       1194 33101  28965 12R  P12      
-        13       1195 33101  25999 12L  P10_2    
-        13       1196 33101  28960 12R  P12      
-        13       1197 33101  24310 12L  S5-3     
-        13       1198 33101  24358 12R  S5-3     
-        13       1199 33101  24309 12L  S5-3     
-        13       1200 33101  24349 12R  S5-3     
-        13       1201 33101  27468 13L  S6_2b    
-        13       1202 33101  27481 13R  S6_2b    
-        13       1203 33101  27463 13L  S6_2b    
-        13       1204 33101  27491 13R  S6_2b    
-        13       1205 33101  28984 13L  P12      
-        13       1206 33101  28837 13R  P12      
-        13       1207 33101  27443 13L  S6_2b    
-        13       1208 33101  28851 13R  P12      
-        13       1209 33101  27453 13L  S6_2b    
-        13       1210 33101  28846 13R  P12      
-        13       1211 33101  24398 13L  S5-3     
-        13       1212 33101  28864 13R  P12      
-        13       1213 33101  27448 13L  S6_2b    
-        13       1214 33101  28841 13R  P12      
-        13       1215 33101  28982 13L  P12      
-        13       1216 33101  28996 13R  P12      
-        13       1217 33101  28967 13L  P12      
-        13       1218 33101  28988 13R  P12      
-        13       1219 33101  24408 13L  S5-3     
-        13       1220 33101  24464 13R  S5-3     
-        13       1221 33101  27469 13L  S6_2b    
-        13       1222 33101  27482 13R  S6_2b    
-        13       1223 33101  27464 13L  S6_2b    
-        13       1224 33101  27496 13R  S6_2b    
-        13       1225 33101  28973 13L  P12      
-        13       1226 33101  28839 13R  P12      
-        13       1227 33101  27458 13L  S6_2b    
-        13       1228 33101  28853 13R  P12      
-        13       1229 33101  27454 13L  S6_2b    
-        13       1230 33101  28847 13R  P12      
-        13       1231 33101  24399 13L  S5-3     
-        13       1232 33101  28866 13R  P12      
-        13       1233 33101  27449 13L  S6_2b    
-        13       1234 33101  28842 13R  P12      
-        13       1235 33101  28983 13L  P12      
-        13       1236 33101  28997 13R  P12      
-        13       1237 33101  28968 13L  P12      
-        13       1238 33101  28989 13R  P12      
-        13       1239 33101  24409 13L  S5-3     
-        13       1240 33101  12099 13R  S1       
-        13       1241 33101  27462 13L  S6_2b    
-        13       1242 33101  27483 13R  S6_2b    
-        13       1243 33101  27465 13L  S6_2b    
-        13       1244 33101  27499 13R  S6_2b    
-        13       1245 33101  28980 13L  P12      
-        13       1246 33101  28840 13R  P12      
-        13       1247 33101  27445 13L  S6_2b    
-        13       1248 33101  28855 13R  P12      
-        13       1249 33101  27455 13L  S6_2b    
-        13       1250 33101  28848 13R  P12      
-        13       1251 33101  27460 13L  S6_2b    
-        13       1252 33101  27472 13R  S6_2b    
-        13       1253 33101  27450 13L  S6_2b    
-        13       1254 33101  28843 13R  P12      
-        13       1255 33101  28978 13L  P12      
-        13       1256 33101  28998 13R  P12      
-        13       1257 33101  28970 13L  P12      
-        13       1258 33101  28991 13R  P12      
-        13       1259 33101  24410 13L  S5-3     
-        13       1260 33101  21375 13R  S4       
-        13       1261 33101  27471 13L  S6_2b    
-        13       1262 33101  27485 13R  S6_2b    
-        13       1263 33101  27466 13L  S6_2b    
-        13       1264 33101  28992 13R  P12      
-        13       1265 33101  28975 13L  P12      
-        13       1266 33101  28862 13R  P12      
-        13       1267 33101  27446 13L  S6_2b    
-        13       1268 33101  28858 13R  P12      
-        13       1269 33101  27456 13L  S6_2b    
-        13       1270 33101  28849 13R  P12      
-        13       1271 33101  24402 13L  S5-3     
-        13       1272 33101  27473 13R  S6_2b    
-        13       1273 33101  27451 13L  S6_2b    
-        13       1274 33101  28844 13R  P12      
-        13       1275 33101  28985 13L  P12      
-        13       1276 33101  28999 13R  P12      
-        13       1277 33101  28971 13L  P12      
-        13       1278 33101  28993 13R  P12      
-        13       1279 33101  24411 13L  S5-3     
-        13       1280 33101  21400 13R  S4       
-        13       1281 33101  25624 13L  P10      
-        13       1282 33101  27486 13R  S6_2b    
-        13       1283 33101  27467 13L  S6_2b    
-        13       1284 33101  28995 13R  P12      
-        13       1285 33101  28976 13L  P12      
-        13       1286 33101  28986 13R  P12      
-        13       1287 33101  27447 13L  S6_2b    
-        13       1288 33101  28859 13R  P12      
-        13       1289 33101  27459 13L  S6_2b    
-        13       1290 33101  28850 13R  P12      
-        13       1291 33101  24405 13L  S5-3     
-        13       1292 33101  27474 13R  S6_2b    
-        13       1293 33101  27452 13L  S6_2b    
-        13       1294 33101  28845 13R  P12      
-        13       1295 33101  24413 13L  S5-3     
-        13       1296 33101  29000 13R  P12      
-        13       1297 33101  28972 13L  P12      
-        13       1298 33101  28994 13R  P12      
-        13       1299 33101  24412 13L  S5-3     
-        13       1300 33101  25654 13R  P10      
-        13       1301 33101  23863 14L  S5_3     
-        13       1302 33101  23943 14R  S5_3     
-        13       1303 33101  23879 14L  S5_3     
-        13       1304 33101  23948 14R  S5_3     
-        13       1305 33101  24646 14L  P10_1    
-        13       1306 33101  23953 14R  S5_3     
-        13       1307 33101  27022 14L  S6_2b    
-        13       1308 33101  23958 14R  S5_3     
-        13       1309 33101  27030 14L  S6_2b    
-        13       1310 33101  23963 14R  S5_3     
-        13       1311 33101  28608 14L  P12      
-        13       1312 33101  27040 14R  S6_2b    
-        13       1313 33101  28615 14L  P12      
-        13       1314 33101  28632 14R  P12      
-        13       1315 33101  28620 14L  P12      
-        13       1316 33101  25719 14R  P10_2    
-        13       1317 33101  28629 14L  P12      
-        13       1318 33101  27037 14R  S6_2b    
-        13       1319 33101  23900 14L  S5_3     
-        13       1320 33101  27506 14R  S6_3     
-        13       1321 33101  23867 14L  S5_3     
-        13       1322 33101  23944 14R  S5_3     
-        13       1323 33101  23882 14L  S5_3     
-        13       1324 33101  23949 14R  S5_3     
-        13       1325 33101  25718 14L  P10_2    
-        13       1326 33101  23954 14R  S5_3     
-        13       1327 33101  27024 14L  S6_2b    
-        13       1328 33101  23959 14R  S5_3     
-        13       1329 33101  27031 14L  S6_2b    
-        13       1330 33101  19167 14R  S4       
-        13       1331 33101  28609 14L  P12      
-        13       1332 33101  27041 14R  S6_2b    
-        13       1333 33101  28616 14L  P12      
-        13       1334 33101  28633 14R  P12      
-        13       1335 33101  28622 14L  P12      
-        13       1336 33101  26812 14R  S6_2     
-        13       1337 33101  28630 14L  P12      
-        13       1338 33101  28644 14R  P12      
-        13       1339 33101  27016 14L  S6_2b    
-        13       1340 33101  27509 14R  S6_3     
-        13       1341 33101  23871 14L  S5_3     
-        13       1342 33101  23945 14R  S5_3     
-        13       1343 33101  23884 14L  S5_3     
-        13       1344 33101  23950 14R  S5_3     
-        13       1345 33101  27018 14L  S6_2b    
-        13       1346 33101  23955 14R  S5_3     
-        13       1347 33101  27026 14L  S6_2b    
-        13       1348 33101  23960 14R  S5_3     
-        13       1349 33101  27034 14L  S6_2b    
-        13       1350 33101  23932 14R  S5_3     
-        13       1351 33101  28610 14L  P12      
-        13       1352 33101  27045 14R  S6_2b    
-        13       1353 33101  28617 14L  P12      
-        13       1354 33101  28634 14R  P12      
-        13       1355 33101  28624 14L  P12      
-        13       1356 33101  26813 14R  S6_2     
-        13       1357 33101  23869 14L  S5_3     
-        13       1358 33101  23927 14R  S5_3     
-        13       1359 33101  27025 14L  S6_2b    
-        13       1360 33101  28637 14R  P12      
-        13       1361 33101  23872 14L  S5_3     
-        13       1362 33101  23946 14R  S5_3     
-        13       1363 33101  23887 14L  S5_3     
-        13       1364 33101  23951 14R  S5_3     
-        13       1365 33101  27019 14L  S6_2b    
-        13       1366 33101  23956 14R  S5_3     
-        13       1367 33101  27028 14L  S6_2b    
-        13       1368 33101  23961 14R  S5_3     
-        13       1369 33101  28606 14L  P12      
-        13       1370 33101  24700 14R  P10_1    
-        13       1371 33101  28612 14L  P12      
-        13       1372 33101  27046 14R  S6_2b    
-        13       1373 33101  28618 14L  P12      
-        13       1374 33101  28635 14R  P12      
-        13       1375 33101  28625 14L  P12      
-        13       1376 33101  28638 14R  P12      
-        13       1377 33101  23891 14L  S5_3     
-        13       1378 33101  23935 14R  S5_3     
-        13       1379 33101  27027 14L  S6_2b    
-        13       1380 33101  13839 14R  S2       
-        13       1381 33101  23874 14L  S5_3     
-        13       1382 33101  23947 14R  S5_3     
-        13       1383 33101  23897 14L  S5_3     
-        13       1384 33101  23952 14R  S5_3     
-        13       1385 33101  27021 14L  S6_2b    
-        13       1386 33101  23957 14R  S5_3     
-        13       1387 33101  27029 14L  S6_2b    
-        13       1388 33101  23962 14R  S5_3     
-        13       1389 33101  28607 14L  P12      
-        13       1390 33101  24727 14R  P10_1    
-        13       1391 33101  28613 14L  P12      
-        13       1392 33101  28631 14R  P12      
-        13       1393 33101  28619 14L  P12      
-        13       1394 33101  28636 14R  P12      
-        13       1395 33101  28626 14L  P12      
-        13       1396 33101  28639 14R  P12      
-        13       1397 33101  27501 14L  S6_3     
-        13       1398 33101  27504 14R  S6_3     
-        13       1399 33101  18420 14L  P8       
-        13       1400 33101  17138 14R  S3       
-        13       1401 33101  24008 15L  S5_3     
-        13       1402 33101  24054 15R  S5_3     
-        13       1403 33101  24013 15L  S5_3     
-        13       1404 33101  24060 15R  S5_3     
-        13       1405 33101  27049 15L  S6_2b    
-        13       1406 33101  24065 15R  S5_3     
-        13       1407 33101  27057 15L  S6_2b    
-        13       1408 33101  24841 15R  P10_1    
-        13       1409 33101  27064 15L  S6_2b    
-        13       1410 33101  25723 15R  P10_2    
-        13       1411 33101  27070 15L  S6_2b    
-        13       1412 33101  26054 15R  S06      
-        13       1413 33101  27082 15L  S6_2b    
-        13       1414 33101  27097 15R  S6_2b    
-        13       1415 33101  28115 15L  S6_3b    
-        13       1416 33101  27114 15R  S6_2b    
-        13       1417 33101  24761 15L  P10_1    
-        13       1418 33101  27106 15R  S6_2b    
-        13       1419 33101  28123 15L  S6_3b    
-        13       1420 33101  27122 15R  S6_2b    
-        13       1421 33101  24009 15L  S5_3     
-        13       1422 33101  24055 15R  S5_3     
-        13       1423 33101  24014 15L  S5_3     
-        13       1424 33101  24061 15R  S5_3     
-        13       1425 33101  27050 15L  S6_2b    
-        13       1426 33101  24016 15R  S5_3     
-        13       1427 33101  27060 15L  S6_2b    
-        13       1428 33101  24847 15R  P10_1    
-        13       1429 33101  27066 15L  S6_2b    
-        13       1430 33101  26050 15R  S06      
-        13       1431 33101  27071 15L  S6_2b    
-        13       1432 33101  27092 15R  S6_2b    
-        13       1433 33101  27084 15L  S6_2b    
-        13       1434 33101  27098 15R  S6_2b    
-        13       1435 33101  28118 15L  S6_3b    
-        13       1436 33101  27115 15R  S6_2b    
-        13       1437 33101  27056 15L  S6_2b    
-        13       1438 33101  27107 15R  S6_2b    
-        13       1439 33101  28124 15L  S6_3b    
-        13       1440 33101  27123 15R  S6_2b    
-        13       1441 33101  24010 15L  S5_3     
-        13       1442 33101  24056 15R  S5_3     
-        13       1443 33101  24005 15L  S5_3     
-        13       1444 33101  24062 15R  S5_3     
-        13       1445 33101  27051 15L  S6_2b    
-        13       1446 33101  24028 15R  S5_3     
-        13       1447 33101  27061 15L  S6_2b    
-        13       1448 33101  25720 15R  P10_2    
-        13       1449 33101  27067 15L  S6_2b    
-        13       1450 33101  26051 15R  S06      
-        13       1451 33101  27074 15L  S6_2b    
-        13       1452 33101  27093 15R  S6_2b    
-        13       1453 33101  27085 15L  S6_2b    
-        13       1454 33101  27099 15R  S6_2b    
-        13       1455 33101  28119 15L  S6_3b    
-        13       1456 33101  27117 15R  S6_2b    
-        13       1457 33101  28112 15L  S6_3b    
-        13       1458 33101  27110 15R  S6_2b    
-        13       1459 33101  28125 15L  S6_3b    
-        13       1460 33101  27124 15R  S6_2b    
-        13       1461 33101  24011 15L  S5_3     
-        13       1462 33101  24058 15R  S5_3     
-        13       1463 33101  24753 15L  P10_1    
-        13       1464 33101  24063 15R  S5_3     
-        13       1465 33101  27053 15L  S6_2b    
-        13       1466 33101  24812 15R  P10_1    
-        13       1467 33101  27062 15L  S6_2b    
-        13       1468 33101  25721 15R  P10_2    
-        13       1469 33101  27068 15L  S6_2b    
-        13       1470 33101  26052 15R  S06      
-        13       1471 33101  27075 15L  S6_2b    
-        13       1472 33101  27094 15R  S6_2b    
-        13       1473 33101  27089 15L  S6_2b    
-        13       1474 33101  27100 15R  S6_2b    
-        13       1475 33101  28120 15L  S6_3b    
-        13       1476 33101  27118 15R  S6_2b    
-        13       1477 33101  28113 15L  S6_3b    
-        13       1478 33101  27111 15R  S6_2b    
-        13       1479 33101  28126 15L  S6_3b    
-        13       1480 33101  27125 15R  S6_2b    
-        13       1481 33101  24012 15L  S5_3     
-        13       1482 33101  24059 15R  S5_3     
-        13       1483 33101  27047 15L  S6_2b    
-        13       1484 33101  24064 15R  S5_3     
-        13       1485 33101  27055 15L  S6_2b    
-        13       1486 33101  24835 15R  P10_1    
-        13       1487 33101  27063 15L  S6_2b    
-        13       1488 33101  25722 15R  P10_2    
-        13       1489 33101  27069 15L  S6_2b    
-        13       1490 33101  26053 15R  S06      
-        13       1491 33101  27080 15L  S6_2b    
-        13       1492 33101  27095 15R  S6_2b    
-        13       1493 33101  27090 15L  S6_2b    
-        13       1494 33101  27103 15R  S6_2b    
-        13       1495 33101  28122 15L  S6_3b    
-        13       1496 33101  27121 15R  S6_2b    
-        13       1497 33101  28114 15L  S6_3b    
-        13       1498 33101  27112 15R  S6_2b    
-        13       1499 33101  28128 15L  S6_3b    
-        13       1500 33101  27510 15R  S6_3     
-        13       1501 33101  19738 16L  S4       
-        13       1502 33101  26087 16R  S06      
-        13       1503 33101  26059 16L  S06      
-        13       1504 33101  26093 16R  S06      
-        13       1505 33101  26064 16L  S06      
-        13       1506 33101  26099 16R  S06      
-        13       1507 33101  28673 16L  P12      
-        13       1508 33101  26104 16R  S06      
-        13       1509 33101  26077 16L  S06      
-        13       1510 33101  26110 16R  S06      
-        13       1511 33101  28675 16L  P12      
-        13       1512 33101  26116 16R  S06      
-        13       1513 33101  27127 16L  S6_2b    
-        13       1514 33101  28678 16R  P12      
-        13       1515 33101  28652 16L  P12      
-        13       1516 33101  28684 16R  P12      
-        13       1517 33101  28661 16L  P12      
-        13       1518 33101  28690 16R  P12      
-        13       1519 33101  28668 16L  P12      
-        13       1520 33101  28697 16R  P12      
-        13       1521 33101  26055 16L  S06      
-        13       1522 33101  26088 16R  S06      
-        13       1523 33101  26060 16L  S06      
-        13       1524 33101  26094 16R  S06      
-        13       1525 33101  26065 16L  S06      
-        13       1526 33101  26100 16R  S06      
-        13       1527 33101  26071 16L  S06      
-        13       1528 33101  26105 16R  S06      
-        13       1529 33101  26078 16L  S06      
-        13       1530 33101  26111 16R  S06      
-        13       1531 33101  26083 16L  S06      
-        13       1532 33101  26117 16R  S06      
-        13       1533 33101  27129 16L  S6_2b    
-        13       1534 33101  28679 16R  P12      
-        13       1535 33101  28653 16L  P12      
-        13       1536 33101  28685 16R  P12      
-        13       1537 33101  28663 16L  P12      
-        13       1538 33101  28698 16R  P12      
-        13       1539 33101  28669 16L  P12      
-        13       1540 33101  26091 16R  S06      
-        13       1541 33101  26056 16L  S06      
-        13       1542 33101  26089 16R  S06      
-        13       1543 33101  26061 16L  S06      
-        13       1544 33101  26096 16R  S06      
-        13       1545 33101  26066 16L  S06      
-        13       1546 33101  26101 16R  S06      
-        13       1547 33101  26073 16L  S06      
-        13       1548 33101  26107 16R  S06      
-        13       1549 33101  26079 16L  S06      
-        13       1550 33101  26112 16R  S06      
-        13       1551 33101  26084 16L  S06      
-        13       1552 33101  26118 16R  S06      
-        13       1553 33101  28647 16L  P12      
-        13       1554 33101  28680 16R  P12      
-        13       1555 33101  28654 16L  P12      
-        13       1556 33101  28686 16R  P12      
-        13       1557 33101  28665 16L  P12      
-        13       1558 33101  28692 16R  P12      
-        13       1559 33101  28670 16L  P12      
-        13       1560 33101  26095 16R  S06      
-        13       1561 33101  26057 16L  S06      
-        13       1562 33101  26090 16R  S06      
-        13       1563 33101  26062 16L  S06      
-        13       1564 33101  26097 16R  S06      
-        13       1565 33101  26067 16L  S06      
-        13       1566 33101  26102 16R  S06      
-        13       1567 33101  26074 16L  S06      
-        13       1568 33101  26108 16R  S06      
-        13       1569 33101  26080 16L  S06      
-        13       1570 33101  26113 16R  S06      
-        13       1571 33101  26085 16L  S06      
-        13       1572 33101  26119 16R  S06      
-        13       1573 33101  28648 16L  P12      
-        13       1574 33101  28682 16R  P12      
-        13       1575 33101  28657 16L  P12      
-        13       1576 33101  28687 16R  P12      
-        13       1577 33101  28666 16L  P12      
-        13       1578 33101  28695 16R  P12      
-        13       1579 33101  28671 16L  P12      
-        13       1580 33101  26115 16R  S06      
-        13       1581 33101  26058 16L  S06      
-        13       1582 33101  26092 16R  S06      
-        13       1583 33101  26063 16L  S06      
-        13       1584 33101  26098 16R  S06      
-        13       1585 33101  26068 16L  S06      
-        13       1586 33101  26103 16R  S06      
-        13       1587 33101  26075 16L  S06      
-        13       1588 33101  26109 16R  S06      
-        13       1589 33101  26081 16L  S06      
-        13       1590 33101  26114 16R  S06      
-        13       1591 33101  26086 16L  S06      
-        13       1592 33101  28677 16R  P12      
-        13       1593 33101  28650 16L  P12      
-        13       1594 33101  28683 16R  P12      
-        13       1595 33101  28658 16L  P12      
-        13       1596 33101  28688 16R  P12      
-        13       1597 33101  28667 16L  P12      
-        13       1598 33101  28696 16R  P12      
-        13       1599 33101  28672 16L  P12      
-        13       1600 33101  28676 16R  P12      
-        13       1601 33101  25837 17L  P10_2    
-        13       1602 33101  27178 17R  S6_2b    
-        13       1603 33101  20032 17L  S4       
-        13       1604 33101  20221 17R  S4       
-        13       1605 33101  26121 17L  S06      
-        13       1606 33101  27186 17R  S6_2b    
-        13       1607 33101  27134 17L  S6_2b    
-        13       1608 33101  27194 17R  S6_2b    
-        13       1609 33101  27144 17L  S6_2b    
-        13       1610 33101  27199 17R  S6_2b    
-        13       1611 33101  27152 17L  S6_2b    
-        13       1612 33101  27204 17R  S6_2b    
-        13       1613 33101  27168 17L  S6_2b    
-        13       1614 33101  27209 17R  S6_2b    
-        13       1615 33101  27175 17L  S6_2b    
-        13       1616 33101  27214 17R  S6_2b    
-        13       1617 33101  28350 17L  S6_3b    
-        13       1618 33101  27219 17R  S6_2b    
-        13       1619 33101  28355 17L  S6_3b    
-        13       1620 33101  27225 17R  S6_2b    
-        13       1621 33101  25838 17L  P10_2    
-        13       1622 33101  27180 17R  S6_2b    
-        13       1623 33101  20057 17L  S4       
-        13       1624 33101  22735 17R  S5       
-        13       1625 33101  26122 17L  S06      
-        13       1626 33101  27187 17R  S6_2b    
-        13       1627 33101  27136 17L  S6_2b    
-        13       1628 33101  27195 17R  S6_2b    
-        13       1629 33101  27145 17L  S6_2b    
-        13       1630 33101  27200 17R  S6_2b    
-        13       1631 33101  27153 17L  S6_2b    
-        13       1632 33101  27205 17R  S6_2b    
-        13       1633 33101  27169 17L  S6_2b    
-        13       1634 33101  27210 17R  S6_2b    
-        13       1635 33101  27514 17L  S6_3     
-        13       1636 33101  27215 17R  S6_2b    
-        13       1637 33101  28351 17L  S6_3b    
-        13       1638 33101  27220 17R  S6_2b    
-        13       1639 33101  28356 17L  S6_3b    
-        13       1640 33101  27226 17R  S6_2b    
-        13       1641 33101  25990 17L  P11_1    
-        13       1642 33101  27181 17R  S6_2b    
-        13       1643 33101  22774 17L  S5       
-        13       1644 33101  25997 17R  P11_1    
-        13       1645 33101  26123 17L  S06      
-        13       1646 33101  27188 17R  S6_2b    
-        13       1647 33101  27140 17L  S6_2b    
-        13       1648 33101  27196 17R  S6_2b    
-        13       1649 33101  27147 17L  S6_2b    
-        13       1650 33101  27201 17R  S6_2b    
-        13       1651 33101  27161 17L  S6_2b    
-        13       1652 33101  27206 17R  S6_2b    
-        13       1653 33101  27170 17L  S6_2b    
-        13       1654 33101  27211 17R  S6_2b    
-        13       1655 33101  27516 17L  S6_3     
-        13       1656 33101  27216 17R  S6_2b    
-        13       1657 33101  28352 17L  S6_3b    
-        13       1658 33101  27221 17R  S6_2b    
-        13       1659 33101  28358 17L  S6_3b    
-        13       1660 33101  27228 17R  S6_2b    
-        13       1661 33101  25991 17L  P11_1    
-        13       1662 33101  27182 17R  S6_2b    
-        13       1663 33101  24980 17L  P10_1    
-        13       1664 33101  27176 17R  S6_2b    
-        13       1665 33101  26124 17L  S06      
-        13       1666 33101  27191 17R  S6_2b    
-        13       1667 33101  27141 17L  S6_2b    
-        13       1668 33101  27197 17R  S6_2b    
-        13       1669 33101  27149 17L  S6_2b    
-        13       1670 33101  27202 17R  S6_2b    
-        13       1671 33101  27162 17L  S6_2b    
-        13       1672 33101  27207 17R  S6_2b    
-        13       1673 33101  27172 17L  S6_2b    
-        13       1674 33101  27212 17R  S6_2b    
-        13       1675 33101  28348 17L  S6_3b    
-        13       1676 33101  27217 17R  S6_2b    
-        13       1677 33101  28353 17L  S6_3b    
-        13       1678 33101  27222 17R  S6_2b    
-        13       1679 33101  28359 17L  S6_3b    
-        13       1680 33101  27229 17R  S6_2b    
-        13       1681 33101  26120 17L  S06      
-        13       1682 33101  27184 17R  S6_2b    
-        13       1683 33101  25836 17L  P10_2    
-        13       1684 33101  27177 17R  S6_2b    
-        13       1685 33101  27133 17L  S6_2b    
-        13       1686 33101  27193 17R  S6_2b    
-        13       1687 33101  27142 17L  S6_2b    
-        13       1688 33101  27198 17R  S6_2b    
-        13       1689 33101  27151 17L  S6_2b    
-        13       1690 33101  27203 17R  S6_2b    
-        13       1691 33101  27163 17L  S6_2b    
-        13       1692 33101  27208 17R  S6_2b    
-        13       1693 33101  27173 17L  S6_2b    
-        13       1694 33101  27213 17R  S6_2b    
-        13       1695 33101  28349 17L  S6_3b    
-        13       1696 33101  27218 17R  S6_2b    
-        13       1697 33101  28354 17L  S6_3b    
-        13       1698 33101  27223 17R  S6_2b    
-        13       1699 33101  28360 17L  S6_3b    
-        13       1700 33101  27230 17R  S6_2b    
-        14          1 33101  24543 1L   P10_1    
-        14          2 33101  24586 1R   P10_1    
-        14          3 33101  15955 1L   S3       
-        14          4 33101  24591 1R   P10_1    
-        14          5 33101  23503 1L   S5_3     
-        14          6 33101  24596 1R   P10_1    
-        14          7 33101  25944 1L   P11_1    
-        14          8 33101  10227 1R   S1       
-        14          9 33101  25949 1L   P11_1    
-        14         10 33101  25903 1R   P11_1    
-        14         11 33101  24517 1L   P10_1    
-        14         12 33101  25908 1R   P11_1    
-        14         13 33101  25959 1L   P11_1    
-        14         14 33101  25913 1R   P11_1    
-        14         15 33101  25964 1L   P11_1    
-        14         16 33101  25918 1R   P11_1    
-        14         17 33101  25969 1L   P11_1    
-        14         18 33101  25923 1R   P11_1    
-        14         19 33101  25975 1L   P11_1    
-        14         20 33101  25928 1R   P11_1    
-        14         21 33101  24544 1L   P10_1    
-        14         22 33101  24587 1R   P10_1    
-        14         23 33101  22840 1L   S5       
-        14         24 33101  24592 1R   P10_1    
-        14         25 33101  24523 1L   P10_1    
-        14         26 33101  24597 1R   P10_1    
-        14         27 33101  25945 1L   P11_1    
-        14         28 33101  15983 1R   S3       
-        14         29 33101  25950 1L   P11_1    
-        14         30 33101  25904 1R   P11_1    
-        14         31 33101  25954 1L   P11_1    
-        14         32 33101  25909 1R   P11_1    
-        14         33 33101  25960 1L   P11_1    
-        14         34 33101  25914 1R   P11_1    
-        14         35 33101  25965 1L   P11_1    
-        14         36 33101  25919 1R   P11_1    
-        14         37 33101  25971 1L   P11_1    
-        14         38 33101  25924 1R   P11_1    
-        14         39 33101  25976 1L   P11_1    
-        14         40 33101  25929 1R   P11_1    
-        14         41 33101  24545 1L   P10_1    
-        14         42 33101  24588 1R   P10_1    
-        14         43 33101  22864 1L   S5       
-        14         44 33101  24593 1R   P10_1    
-        14         45 33101  25701 1L   P10_2    
-        14         46 33101  24598 1R   P10_1    
-        14         47 33101  25946 1L   P11_1    
-        14         48 33101  21978 1R   S5       
-        14         49 33101  25951 1L   P11_1    
-        14         50 33101  25905 1R   P11_1    
-        14         51 33101  25955 1L   P11_1    
-        14         52 33101  25910 1R   P11_1    
-        14         53 33101  25961 1L   P11_1    
-        14         54 33101  25915 1R   P11_1    
-        14         55 33101  25966 1L   P11_1    
-        14         56 33101  25920 1R   P11_1    
-        14         57 33101  25972 1L   P11_1    
-        14         58 33101  25925 1R   P11_1    
-        14         59 33101  25977 1L   P11_1    
-        14         60 33101  25930 1R   P11_1    
-        14         61 33101  24546 1L   P10_1    
-        14         62 33101  24589 1R   P10_1    
-        14         63 33101  23501 1L   S5_3     
-        14         64 33101  24594 1R   P10_1    
-        14         65 33101  25942 1L   P11_1    
-        14         66 33101  24599 1R   P10_1    
-        14         67 33101  25947 1L   P11_1    
-        14         68 33101  25901 1R   P11_1    
-        14         69 33101  25952 1L   P11_1    
-        14         70 33101  25906 1R   P11_1    
-        14         71 33101  25956 1L   P11_1    
-        14         72 33101  25911 1R   P11_1    
-        14         73 33101  25962 1L   P11_1    
-        14         74 33101  25916 1R   P11_1    
-        14         75 33101  25967 1L   P11_1    
-        14         76 33101  25921 1R   P11_1    
-        14         77 33101  25973 1L   P11_1    
-        14         78 33101  25926 1R   P11_1    
-        14         79 33101  25978 1L   P11_1    
-        14         80 33101  25931 1R   P11_1    
-        14         81 33101  24547 1L   P10_1    
-        14         82 33101  24590 1R   P10_1    
-        14         83 33101  23502 1L   S5_3     
-        14         84 33101  24595 1R   P10_1    
-        14         85 33101  25943 1L   P11_1    
-        14         86 33101  24600 1R   P10_1    
-        14         87 33101  25948 1L   P11_1    
-        14         88 33101  25902 1R   P11_1    
-        14         89 33101  25953 1L   P11_1    
-        14         90 33101  25907 1R   P11_1    
-        14         91 33101  25958 1L   P11_1    
-        14         92 33101  25912 1R   P11_1    
-        14         93 33101  25963 1L   P11_1    
-        14         94 33101  25917 1R   P11_1    
-        14         95 33101  25968 1L   P11_1    
-        14         96 33101  25922 1R   P11_1    
-        14         97 33101  25974 1L   P11_1    
-        14         98 33101  25927 1R   P11_1    
-        14         99 33101  25979 1L   P11_1    
-        14        100 33101  25932 1R   P11_1    
-        14        101 33101  23522 2L   S5_3     
-        14        102 33101  23577 2R   S5_3     
-        14        103 33101  23527 2L   S5_3     
-        14        104 33101  13037 2R   S2       
-        14        105 33101  25981 2L   P11_1    
-        14        106 33101  25703 2R   P10_2    
-        14        107 33101  23532 2L   S5_3     
-        14        108 33101  26031 2R   S06      
-        14        109 33101  26001 2L   S06      
-        14        110 33101  26036 2R   S06      
-        14        111 33101  26007 2L   S06      
-        14        112 33101  26041 2R   S06      
-        14        113 33101  26012 2L   S06      
-        14        114 33101  26046 2R   S06      
-        14        115 33101  26017 2L   S06      
-        14        116 33101  26516 2R   S6_2     
-        14        117 33101  26023 2L   S06      
-        14        118 33101  26522 2R   S6_2     
-        14        119 33101  26028 2L   S06      
-        14        120 33101  26529 2R   S6_2     
-        14        121 33101  23523 2L   S5_3     
-        14        122 33101  23578 2R   S5_3     
-        14        123 33101  23528 2L   S5_3     
-        14        124 33101  16353 2R   S3       
-        14        125 33101  25982 2L   P11_1    
-        14        126 33101  25704 2R   P10_2    
-        14        127 33101  23533 2L   S5_3     
-        14        128 33101  26032 2R   S06      
-        14        129 33101  26002 2L   S06      
-        14        130 33101  26037 2R   S06      
-        14        131 33101  26008 2L   S06      
-        14        132 33101  26042 2R   S06      
-        14        133 33101  26013 2L   S06      
-        14        134 33101  26047 2R   S06      
-        14        135 33101  26018 2L   S06      
-        14        136 33101  26518 2R   S6_2     
-        14        137 33101  26024 2L   S06      
-        14        138 33101  26523 2R   S6_2     
-        14        139 33101  26029 2L   S06      
-        14        140 33101  26530 2R   S6_2     
-        14        141 33101  23524 2L   S5_3     
-        14        142 33101  23579 2R   S5_3     
-        14        143 33101  23529 2L   S5_3     
-        14        144 33101  22053 2R   S5       
-        14        145 33101  25983 2L   P11_1    
-        14        146 33101  25705 2R   P10_2    
-        14        147 33101  21407 2L   P9       
-        14        148 33101  26033 2R   S06      
-        14        149 33101  26003 2L   S06      
-        14        150 33101  26038 2R   S06      
-        14        151 33101  26009 2L   S06      
-        14        152 33101  26043 2R   S06      
-        14        153 33101  26014 2L   S06      
-        14        154 33101  26048 2R   S06      
-        14        155 33101  26019 2L   S06      
-        14        156 33101  26519 2R   S6_2     
-        14        157 33101  26025 2L   S06      
-        14        158 33101  26526 2R   S6_2     
-        14        159 33101  26030 2L   S06      
-        14        160 33101  26532 2R   S6_2     
-        14        161 33101  23525 2L   S5_3     
-        14        162 33101  23580 2R   S5_3     
-        14        163 33101  23530 2L   S5_3     
-        14        164 33101  23536 2R   S5_3     
-        14        165 33101  25984 2L   P11_1    
-        14        166 33101  25706 2R   P10_2    
-        14        167 33101  25702 2L   P10_2    
-        14        168 33101  26034 2R   S06      
-        14        169 33101  26004 2L   S06      
-        14        170 33101  26039 2R   S06      
-        14        171 33101  26010 2L   S06      
-        14        172 33101  26044 2R   S06      
-        14        173 33101  26015 2L   S06      
-        14        174 33101  26049 2R   S06      
-        14        175 33101  26021 2L   S06      
-        14        176 33101  26520 2R   S6_2     
-        14        177 33101  26026 2L   S06      
-        14        178 33101  26527 2R   S6_2     
-        14        179 33101  26507 2L   S6_2     
-        14        180 33101  26533 2R   S6_2     
-        14        181 33101  23526 2L   S5_3     
-        14        182 33101   8264 2R   P3       
-        14        183 33101  23531 2L   S5_3     
-        14        184 33101  23560 2R   S5_3     
-        14        185 33101  25985 2L   P11_1    
-        14        186 33101  26513 2R   S6_2     
-        14        187 33101  25980 2L   P11_1    
-        14        188 33101  26035 2R   S06      
-        14        189 33101  26006 2L   S06      
-        14        190 33101  26040 2R   S06      
-        14        191 33101  26011 2L   S06      
-        14        192 33101  26045 2R   S06      
-        14        193 33101  26016 2L   S06      
-        14        194 33101  26514 2R   S6_2     
-        14        195 33101  26022 2L   S06      
-        14        196 33101  26521 2R   S6_2     
-        14        197 33101  26027 2L   S06      
-        14        198 33101  26528 2R   S6_2     
-        14        199 33101  26508 2L   S6_2     
-        14        200 33101  23535 2R   S5_3     
-        14        201 33101  22281 3L   S5       
-        14        202 33101  13224 3R   S2       
-        14        203 33101  26538 3L   S6_2     
-        14        204 33101  26592 3R   S6_2     
-        14        205 33101  26544 3L   S6_2     
-        14        206 33101  26598 3R   S6_2     
-        14        207 33101  26554 3L   S6_2     
-        14        208 33101  26607 3R   S6_2     
-        14        209 33101  26562 3L   S6_2     
-        14        210 33101  26615 3R   S6_2     
-        14        211 33101  23590 3L   S5_3     
-        14        212 33101  23660 3R   S5_3     
-        14        213 33101  26552 3L   S6_2     
-        14        214 33101  26606 3R   S6_2     
-        14        215 33101  26571 3L   S6_2     
-        14        216 33101  26625 3R   S6_2     
-        14        217 33101  26578 3L   S6_2     
-        14        218 33101  26631 3R   S6_2     
-        14        219 33101  29002 3L   P13      
-        14        220 33101  29067 3R   P13      
-        14        221 33101  22314 3L   S5       
-        14        222 33101  22195 3R   S5       
-        14        223 33101  26540 3L   S6_2     
-        14        224 33101  26593 3R   S6_2     
-        14        225 33101  26548 3L   S6_2     
-        14        226 33101  26599 3R   S6_2     
-        14        227 33101  26557 3L   S6_2     
-        14        228 33101  26609 3R   S6_2     
-        14        229 33101  26563 3L   S6_2     
-        14        230 33101  26618 3R   S6_2     
-        14        231 33101  23596 3L   S5_3     
-        14        232 33101  23670 3R   S5_3     
-        14        233 33101  26556 3L   S6_2     
-        14        234 33101  26616 3R   S6_2     
-        14        235 33101  26572 3L   S6_2     
-        14        236 33101  26626 3R   S6_2     
-        14        237 33101  26579 3L   S6_2     
-        14        238 33101  26632 3R   S6_2     
-        14        239 33101  29003 3L   P13      
-        14        240 33101  29068 3R   P13      
-        14        241 33101  23627 3L   S5_3     
-        14        242 33101  23676 3R   S5_3     
-        14        243 33101  26541 3L   S6_2     
-        14        244 33101  26594 3R   S6_2     
-        14        245 33101  26549 3L   S6_2     
-        14        246 33101  26600 3R   S6_2     
-        14        247 33101  26559 3L   S6_2     
-        14        248 33101  26610 3R   S6_2     
-        14        249 33101  26566 3L   S6_2     
-        14        250 33101  26619 3R   S6_2     
-        14        251 33101  23606 3L   S5_3     
-        14        252 33101  23672 3R   S5_3     
-        14        253 33101  26558 3L   S6_2     
-        14        254 33101  26622 3R   S6_2     
-        14        255 33101  26573 3L   S6_2     
-        14        256 33101  26628 3R   S6_2     
-        14        257 33101  26580 3L   S6_2     
-        14        258 33101  26633 3R   S6_2     
-        14        259 33101  29004 3L   P13      
-        14        260 33101  29069 3R   P13      
-        14        261 33101  26535 3L   S6_2     
-        14        262 33101  26584 3R   S6_2     
-        14        263 33101  26542 3L   S6_2     
-        14        264 33101  26596 3R   S6_2     
-        14        265 33101  26551 3L   S6_2     
-        14        266 33101  26603 3R   S6_2     
-        14        267 33101  26560 3L   S6_2     
-        14        268 33101  26611 3R   S6_2     
-        14        269 33101  26567 3L   S6_2     
-        14        270 33101  26620 3R   S6_2     
-        14        271 33101  23612 3L   S5_3     
-        14        272 33101  26601 3R   S6_2     
-        14        273 33101  26564 3L   S6_2     
-        14        274 33101  26623 3R   S6_2     
-        14        275 33101  26574 3L   S6_2     
-        14        276 33101  26629 3R   S6_2     
-        14        277 33101  26583 3L   S6_2     
-        14        278 33101  26635 3R   S6_2     
-        14        279 33101  29005 3L   P13      
-        14        280 33101  29070 3R   P13      
-        14        281 33101  26537 3L   S6_2     
-        14        282 33101  26591 3R   S6_2     
-        14        283 33101  26543 3L   S6_2     
-        14        284 33101  26597 3R   S6_2     
-        14        285 33101  26553 3L   S6_2     
-        14        286 33101  26605 3R   S6_2     
-        14        287 33101  26561 3L   S6_2     
-        14        288 33101  26613 3R   S6_2     
-        14        289 33101  26569 3L   S6_2     
-        14        290 33101  26621 3R   S6_2     
-        14        291 33101  26550 3L   S6_2     
-        14        292 33101  26604 3R   S6_2     
-        14        293 33101  26568 3L   S6_2     
-        14        294 33101  26624 3R   S6_2     
-        14        295 33101  26575 3L   S6_2     
-        14        296 33101  26630 3R   S6_2     
-        14        297 33101  29001 3L   P13      
-        14        298 33101  29065 3R   P13      
-        14        299 33101  29006 3L   P13      
-        14        300 33101  29071 3R   P13      
-        14        301 33101  13307 4L   S2       
-        14        302 33101  23766 4R   S5_3     
-        14        303 33101  25708 4L   P10_2    
-        14        304 33101  25712 4R   P10_2    
-        14        305 33101  26639 4L   S6_2     
-        14        306 33101  26688 4R   S6_2     
-        14        307 33101  26651 4L   S6_2     
-        14        308 33101  26699 4R   S6_2     
-        14        309 33101  26658 4L   S6_2     
-        14        310 33101  26707 4R   S6_2     
-        14        311 33101  26641 4L   S6_2     
-        14        312 33101  23747 4R   S5_3     
-        14        313 33101  26670 4L   S6_2     
-        14        314 33101  26694 4R   S6_2     
-        14        315 33101  26679 4L   S6_2     
-        14        316 33101  26711 4R   S6_2     
-        14        317 33101  26637 4L   S6_2     
-        14        318 33101  26724 4R   S6_2     
-        14        319 33101  26668 4L   S6_2     
-        14        320 33101  29167 4R   P13      
-        14        321 33101  13308 4L   S2       
-        14        322 33101  23768 4R   S5_3     
-        14        323 33101  25709 4L   P10_2    
-        14        324 33101  25986 4R   P11_1    
-        14        325 33101  26643 4L   S6_2     
-        14        326 33101  26689 4R   S6_2     
-        14        327 33101  26653 4L   S6_2     
-        14        328 33101  26701 4R   S6_2     
-        14        329 33101  26666 4L   S6_2     
-        14        330 33101  26720 4R   S6_2     
-        14        331 33101  23682 4L   S5_3     
-        14        332 33101  23759 4R   S5_3     
-        14        333 33101  26674 4L   S6_2     
-        14        334 33101  26697 4R   S6_2     
-        14        335 33101  26678 4L   S6_2     
-        14        336 33101  26713 4R   S6_2     
-        14        337 33101  26640 4L   S6_2     
-        14        338 33101  29163 4R   P13      
-        14        339 33101  26671 4L   S6_2     
-        14        340 33101  29168 4R   P13      
-        14        341 33101  16694 4L   S3       
-        14        342 33101  23769 4R   S5_3     
-        14        343 33101  25710 4L   P10_2    
-        14        344 33101  23757 4R   S5_3     
-        14        345 33101  26644 4L   S6_2     
-        14        346 33101  26693 4R   S6_2     
-        14        347 33101  26654 4L   S6_2     
-        14        348 33101  26702 4R   S6_2     
-        14        349 33101  26660 4L   S6_2     
-        14        350 33101  26725 4R   S6_2     
-        14        351 33101  23702 4L   S5_3     
-        14        352 33101  23767 4R   S5_3     
-        14        353 33101  26675 4L   S6_2     
-        14        354 33101  26705 4R   S6_2     
-        14        355 33101  23687 4L   S5_3     
-        14        356 33101  26717 4R   S6_2     
-        14        357 33101  26650 4L   S6_2     
-        14        358 33101  29164 4R   P13      
-        14        359 33101  26673 4L   S6_2     
-        14        360 33101  29169 4R   P13      
-        14        361 33101  22537 4L   S5       
-        14        362 33101   8658 4R   P3_2     
-        14        363 33101  25711 4L   P10_2    
-        14        364 33101  26681 4R   S6_2     
-        14        365 33101  26646 4L   S6_2     
-        14        366 33101  26695 4R   S6_2     
-        14        367 33101  26656 4L   S6_2     
-        14        368 33101  26708 4R   S6_2     
-        14        369 33101  26661 4L   S6_2     
-        14        370 33101  26726 4R   S6_2     
-        14        371 33101  23723 4L   S5_3     
-        14        372 33101  26683 4R   S6_2     
-        14        373 33101  26676 4L   S6_2     
-        14        374 33101  26706 4R   S6_2     
-        14        375 33101  23696 4L   S5_3     
-        14        376 33101  26718 4R   S6_2     
-        14        377 33101  26663 4L   S6_2     
-        14        378 33101  29165 4R   P13      
-        14        379 33101  29123 4L   P13      
-        14        380 33101  29170 4R   P13      
-        14        381 33101  25707 4L   P10_2    
-        14        382 33101  22416 4R   S5       
-        14        383 33101  26638 4L   S6_2     
-        14        384 33101  26682 4R   S6_2     
-        14        385 33101  26649 4L   S6_2     
-        14        386 33101  26698 4R   S6_2     
-        14        387 33101  26657 4L   S6_2     
-        14        388 33101  26712 4R   S6_2     
-        14        389 33101  26662 4L   S6_2     
-        14        390 33101  26729 4R   S6_2     
-        14        391 33101  26667 4L   S6_2     
-        14        392 33101  26692 4R   S6_2     
-        14        393 33101  26677 4L   S6_2     
-        14        394 33101  26710 4R   S6_2     
-        14        395 33101  26636 4L   S6_2     
-        14        396 33101  26723 4R   S6_2     
-        14        397 33101  26664 4L   S6_2     
-        14        398 33101  29166 4R   P13      
-        14        399 33101  29125 4L   P13      
-        14        400 33101  29171 4R   P13      
-        14        401 33101  22642 5L   S5       
-        14        402 33101  23858 5R   S5_3     
-        14        403 33101  23808 5L   S5_3     
-        14        404 33101  25715 5R   P10_2    
-        14        405 33101  26739 5L   S6_2     
-        14        406 33101  26780 5R   S6_2     
-        14        407 33101  26749 5L   S6_2     
-        14        408 33101  26793 5R   S6_2     
-        14        409 33101  26762 5L   S6_2     
-        14        410 33101  26803 5R   S6_2     
-        14        411 33101  23810 5L   S5_3     
-        14        412 33101   8874 5R   P3_2     
-        14        413 33101  26752 5L   S6_2     
-        14        414 33101  26778 5R   S6_2     
-        14        415 33101  26770 5L   S6_2     
-        14        416 33101  26797 5R   S6_2     
-        14        417 33101  27003 5L   S6_2b    
-        14        418 33101  29255 5R   P13      
-        14        419 33101  29226 5L   P13      
-        14        420 33101  29260 5R   P13      
-        14        421 33101  23813 5L   S5_3     
-        14        422 33101  23859 5R   S5_3     
-        14        423 33101  26730 5L   S6_2     
-        14        424 33101  25716 5R   P10_2    
-        14        425 33101  26740 5L   S6_2     
-        14        426 33101  26782 5R   S6_2     
-        14        427 33101  26753 5L   S6_2     
-        14        428 33101  26794 5R   S6_2     
-        14        429 33101  26763 5L   S6_2     
-        14        430 33101  26804 5R   S6_2     
-        14        431 33101  26732 5L   S6_2     
-        14        432 33101  29266 5R   P13      
-        14        433 33101  26755 5L   S6_2     
-        14        434 33101  26785 5R   S6_2     
-        14        435 33101  26771 5L   S6_2     
-        14        436 33101  26799 5R   S6_2     
-        14        437 33101  27006 5L   S6_2b    
-        14        438 33101  29256 5R   P13      
-        14        439 33101  29227 5L   P13      
-        14        440 33101  29261 5R   P13      
-        14        441 33101  23814 5L   S5_3     
-        14        442 33101  23860 5R   S5_3     
-        14        443 33101  26733 5L   S6_2     
-        14        444 33101  25717 5R   P10_2    
-        14        445 33101  26746 5L   S6_2     
-        14        446 33101  26783 5R   S6_2     
-        14        447 33101  26756 5L   S6_2     
-        14        448 33101  26795 5R   S6_2     
-        14        449 33101  26764 5L   S6_2     
-        14        450 33101  26805 5R   S6_2     
-        14        451 33101  26735 5L   S6_2     
-        14        452 33101  29267 5R   P13      
-        14        453 33101  26758 5L   S6_2     
-        14        454 33101  26786 5R   S6_2     
-        14        455 33101  26772 5L   S6_2     
-        14        456 33101  27013 5R   S6_2b    
-        14        457 33101  27009 5L   S6_2b    
-        14        458 33101  29257 5R   P13      
-        14        459 33101  29228 5L   P13      
-        14        460 33101  29262 5R   P13      
-        14        461 33101  23815 5L   S5_3     
-        14        462 33101  23861 5R   S5_3     
-        14        463 33101  26734 5L   S6_2     
-        14        464 33101  26774 5R   S6_2     
-        14        465 33101  26747 5L   S6_2     
-        14        466 33101  26784 5R   S6_2     
-        14        467 33101  26757 5L   S6_2     
-        14        468 33101  26800 5R   S6_2     
-        14        469 33101  26766 5L   S6_2     
-        14        470 33101  26810 5R   S6_2     
-        14        471 33101  26742 5L   S6_2     
-        14        472 33101  23849 5R   S5_3     
-        14        473 33101  26760 5L   S6_2     
-        14        474 33101  26789 5R   S6_2     
-        14        475 33101  26773 5L   S6_2     
-        14        476 33101  27015 5R   S6_2b    
-        14        477 33101  29222 5L   P13      
-        14        478 33101  29258 5R   P13      
-        14        479 33101  29229 5L   P13      
-        14        480 33101  29263 5R   P13      
-        14        481 33101  25987 5L   P11_1    
-        14        482 33101  25714 5R   P10_2    
-        14        483 33101  26737 5L   S6_2     
-        14        484 33101  26777 5R   S6_2     
-        14        485 33101  26748 5L   S6_2     
-        14        486 33101  26790 5R   S6_2     
-        14        487 33101  26761 5L   S6_2     
-        14        488 33101  26802 5R   S6_2     
-        14        489 33101  26768 5L   S6_2     
-        14        490 33101  26811 5R   S6_2     
-        14        491 33101  26751 5L   S6_2     
-        14        492 33101  26775 5R   S6_2     
-        14        493 33101  26765 5L   S6_2     
-        14        494 33101  26796 5R   S6_2     
-        14        495 33101  27002 5L   S6_2b    
-        14        496 33101  29254 5R   P13      
-        14        497 33101  29225 5L   P13      
-        14        498 33101  29259 5R   P13      
-        14        499 33101  29252 5L   P13      
-        14        500 33101  29264 5R   P13      
-        14        501 33101   3250 6L   10       
-        14        502 33101     17 6R   1        
-        14        503 33101   3211 6L   10       
-        14        504 33101   3102 6R   10       
-        14        505 33101   3220 6L   10       
-        14        506 33101   3113 6R   10       
-        14        507 33101   3206 6L   10       
-        14        508 33101   3152 6R   10       
-        14        509 33101   3201 6L   10       
-        14        510 33101   3104 6R   10       
-        14        511 33101   3212 6L   10       
-        14        512 33101   3135 6R   10       
-        14        513 33101   3235 6L   10       
-        14        514 33101   3129 6R   10       
-        14        515 33101   3222 6L   10       
-        14        516 33101   3114 6R   10       
-        14        517 33101   3236 6L   10       
-        14        518 33101   3107 6R   10       
-        14        519 33101  26307 6L   S6       
-        14        520 33101  24470 6R   S5-3     
-        14        521 33101   3251 6L   10       
-        14        522 33101  25878 6R   P10_2    
-        14        523 33101   3232 6L   10       
-        14        524 33101   3123 6R   10       
-        14        525 33101   3228 6L   10       
-        14        526 33101   3120 6R   10       
-        14        527 33101   3207 6L   10       
-        14        528 33101   3153 6R   10       
-        14        529 33101   3202 6L   10       
-        14        530 33101   3105 6R   10       
-        14        531 33101   3213 6L   10       
-        14        532 33101   3136 6R   10       
-        14        533 33101   3242 6L   10       
-        14        534 33101   3131 6R   10       
-        14        535 33101   3223 6L   10       
-        14        536 33101   3115 6R   10       
-        14        537 33101   3238 6L   10       
-        14        538 33101   3108 6R   10       
-        14        539 33101  26308 6L   S6       
-        14        540 33101  24471 6R   S5-3     
-        14        541 33101  28867 6L   P12      
-        14        542 33101  25879 6R   P10_2    
-        14        543 33101   3234 6L   10       
-        14        544 33101   3149 6R   10       
-        14        545 33101   3229 6L   10       
-        14        546 33101   3121 6R   10       
-        14        547 33101   3209 6L   10       
-        14        548 33101   3154 6R   10       
-        14        549 33101   3203 6L   10       
-        14        550 33101   3124 6R   10       
-        14        551 33101   3214 6L   10       
-        14        552 33101   3137 6R   10       
-        14        553 33101   3243 6L   10       
-        14        554 33101   3132 6R   10       
-        14        555 33101   3225 6L   10       
-        14        556 33101   3116 6R   10       
-        14        557 33101   3239 6L   10       
-        14        558 33101   3109 6R   10       
-        14        559 33101  26376 6L   S6       
-        14        560 33101  24472 6R   S5-3     
-        14        561 33101  28868 6L   P12      
-        14        562 33101  25880 6R   P10_2    
-        14        563 33101   3237 6L   10       
-        14        564 33101   3150 6R   10       
-        14        565 33101   3230 6L   10       
-        14        566 33101   3141 6R   10       
-        14        567 33101   3218 6L   10       
-        14        568 33101   3155 6R   10       
-        14        569 33101   3204 6L   10       
-        14        570 33101   3125 6R   10       
-        14        571 33101   3215 6L   10       
-        14        572 33101   3139 6R   10       
-        14        573 33101   3247 6L   10       
-        14        574 33101   3133 6R   10       
-        14        575 33101   3226 6L   10       
-        14        576 33101   3117 6R   10       
-        14        577 33101   3240 6L   10       
-        14        578 33101   3111 6R   10       
-        14        579 33101  26377 6L   S6       
-        14        580 33101  24473 6R   S5-3     
-        14        581 33101  28869 6L   P12      
-        14        582 33101   3101 6R   10       
-        14        583 33101   3244 6L   10       
-        14        584 33101   3151 6R   10       
-        14        585 33101   3231 6L   10       
-        14        586 33101   3143 6R   10       
-        14        587 33101   3219 6L   10       
-        14        588 33101   3156 6R   10       
-        14        589 33101   3233 6L   10       
-        14        590 33101   3126 6R   10       
-        14        591 33101   3216 6L   10       
-        14        592 33101   3140 6R   10       
-        14        593 33101   3249 6L   10       
-        14        594 33101   3134 6R   10       
-        14        595 33101   3227 6L   10       
-        14        596 33101   3118 6R   10       
-        14        597 33101   3241 6L   10       
-        14        598 33101   3112 6R   10       
-        14        599 33101  26379 6L   S6       
-        14        600 33101  24500 6R   S5-3     
-        14        601 33101  26135 7L   S6       
-        14        602 33101  28873 7R   P12      
-        14        603 33101  26181 7L   S6       
-        14        604 33101  26200 7R   S6_1     
-        14        605 33101  26130 7L   S6       
-        14        606 33101   3344 7R   10       
-        14        607 33101   3366 7L   10       
-        14        608 33101   3306 7R   10       
-        14        609 33101   3398 7L   10       
-        14        610 33101  26185 7R   S6       
-        14        611 33101  26140 7L   S6       
-        14        612 33101  26187 7R   S6       
-        14        613 33101   3393 7L   10       
-        14        614 33101  26188 7R   S6       
-        14        615 33101   3388 7L   10       
-        14        616 33101  26186 7R   S6       
-        14        617 33101   3369 7L   10       
-        14        618 33101  26184 7R   S6       
-        14        619 33101   3370 7L   10       
-        14        620 33101   3349 7R   10       
-        14        621 33101  26136 7L   S6       
-        14        622 33101  28874 7R   P12      
-        14        623 33101  26182 7L   S6       
-        14        624 33101  26203 7R   S6_1     
-        14        625 33101  26131 7L   S6       
-        14        626 33101   3345 7R   10       
-        14        627 33101   3367 7L   10       
-        14        628 33101   3307 7R   10       
-        14        629 33101   3399 7L   10       
-        14        630 33101  26193 7R   S6       
-        14        631 33101  26141 7L   S6       
-        14        632 33101  26265 7R   S6       
-        14        633 33101   3394 7L   10       
-        14        634 33101  26271 7R   S6       
-        14        635 33101   3389 7L   10       
-        14        636 33101  26260 7R   S6       
-        14        637 33101   3379 7L   10       
-        14        638 33101  26192 7R   S6       
-        14        639 33101   3374 7L   10       
-        14        640 33101   3401 7R   11       
-        14        641 33101  26137 7L   S6       
-        14        642 33101  28875 7R   P12      
-        14        643 33101  26183 7L   S6       
-        14        644 33101  26204 7R   S6_1     
-        14        645 33101  26132 7L   S6       
-        14        646 33101   3350 7R   10       
-        14        647 33101   3368 7L   10       
-        14        648 33101   3308 7R   10       
-        14        649 33101   3400 7L   10       
-        14        650 33101  26261 7R   S6       
-        14        651 33101  26142 7L   S6       
-        14        652 33101  26266 7R   S6       
-        14        653 33101   3395 7L   10       
-        14        654 33101  26272 7R   S6       
-        14        655 33101   3390 7L   10       
-        14        656 33101  26262 7R   S6       
-        14        657 33101   3380 7L   10       
-        14        658 33101  26194 7R   S6       
-        14        659 33101   3375 7L   10       
-        14        660 33101   3402 7R   11       
-        14        661 33101  26138 7L   S6       
-        14        662 33101  28876 7R   P12      
-        14        663 33101  11437 7L   S1       
-        14        664 33101  26206 7R   S6_1     
-        14        665 33101  26133 7L   S6       
-        14        666 33101  20469 7R   S4       
-        14        667 33101   3373 7L   10       
-        14        668 33101   3309 7R   10       
-        14        669 33101   3451 7L   11       
-        14        670 33101  26267 7R   S6       
-        14        671 33101  26179 7L   S6       
-        14        672 33101  26268 7R   S6       
-        14        673 33101   3396 7L   10       
-        14        674 33101  26273 7R   S6       
-        14        675 33101   3391 7L   10       
-        14        676 33101  26263 7R   S6       
-        14        677 33101   3381 7L   10       
-        14        678 33101  26195 7R   S6       
-        14        679 33101   3376 7L   10       
-        14        680 33101   3403 7R   11       
-        14        681 33101  26139 7L   S6       
-        14        682 33101  28877 7R   P12      
-        14        683 33101  11441 7L   S1       
-        14        684 33101  26220 7R   S6_1     
-        14        685 33101  26134 7L   S6       
-        14        686 33101  20470 7R   S4       
-        14        687 33101   3378 7L   10       
-        14        688 33101   3310 7R   10       
-        14        689 33101   3452 7L   11       
-        14        690 33101  26270 7R   S6       
-        14        691 33101  26180 7L   S6       
-        14        692 33101  26269 7R   S6       
-        14        693 33101   3397 7L   10       
-        14        694 33101  20471 7R   S4       
-        14        695 33101   3392 7L   10       
-        14        696 33101  26264 7R   S6       
-        14        697 33101   3382 7L   10       
-        14        698 33101  26259 7R   S6       
-        14        699 33101   3377 7L   10       
-        14        700 33101   3404 7R   11       
-        14        701 33101   3625 8L   11       
-        14        702 33101  26289 8R   S6_1     
-        14        703 33101   3607 8L   11       
-        14        704 33101  26279 8R   S6_1     
-        14        705 33101   3650 8L   11       
-        14        706 33101   3506 8R   11       
-        14        707 33101   3610 8L   11       
-        14        708 33101   3514 8R   11       
-        14        709 33101   3608 8L   11       
-        14        710 33101   1676 8R   6        
-        14        711 33101   3611 8L   11       
-        14        712 33101   1677 8R   6        
-        14        713 33101   3613 8L   11       
-        14        714 33101   3541 8R   11       
-        14        715 33101   3601 8L   11       
-        14        716 33101   3524 8R   11       
-        14        717 33101   3609 8L   11       
-        14        718 33101   3512 8R   11       
-        14        719 33101  26285 8L   S6       
-        14        720 33101   1671 8R   6        
-        14        721 33101   3651 8L   11       
-        14        722 33101  26290 8R   S6_1     
-        14        723 33101   3615 8L   11       
-        14        724 33101  26280 8R   S6_1     
-        14        725 33101   3657 8L   11       
-        14        726 33101   3507 8R   11       
-        14        727 33101   3635 8L   11       
-        14        728 33101   3516 8R   11       
-        14        729 33101   3644 8L   11       
-        14        730 33101   1680 8R   6        
-        14        731 33101   3630 8L   11       
-        14        732 33101   1678 8R   6        
-        14        733 33101   3616 8L   11       
-        14        734 33101   3544 8R   11       
-        14        735 33101   3602 8L   11       
-        14        736 33101   3525 8R   11       
-        14        737 33101   3619 8L   11       
-        14        738 33101   3519 8R   11       
-        14        739 33101  26302 8L   S6       
-        14        740 33101   1672 8R   6        
-        14        741 33101   3653 8L   11       
-        14        742 33101  26293 8R   S6_1     
-        14        743 33101   3628 8L   11       
-        14        744 33101  26281 8R   S6_1     
-        14        745 33101   3658 8L   11       
-        14        746 33101   3508 8R   11       
-        14        747 33101   3638 8L   11       
-        14        748 33101  28879 8R   P12      
-        14        749 33101   3645 8L   11       
-        14        750 33101   3536 8R   11       
-        14        751 33101   3631 8L   11       
-        14        752 33101   1679 8R   6        
-        14        753 33101   3617 8L   11       
-        14        754 33101   3545 8R   11       
-        14        755 33101   3603 8L   11       
-        14        756 33101   3526 8R   11       
-        14        757 33101   3620 8L   11       
-        14        758 33101   3521 8R   11       
-        14        759 33101  26287 8L   S6       
-        14        760 33101   1673 8R   6        
-        14        761 33101  26258 8L   S6_1     
-        14        762 33101  26300 8R   S6_1     
-        14        763 33101   3629 8L   11       
-        14        764 33101  26283 8R   S6_1     
-        14        765 33101   3660 8L   11       
-        14        766 33101   3518 8R   11       
-        14        767 33101   3640 8L   11       
-        14        768 33101  28880 8R   P12      
-        14        769 33101   3646 8L   11       
-        14        770 33101   3539 8R   11       
-        14        771 33101   3632 8L   11       
-        14        772 33101   3537 8R   11       
-        14        773 33101   3618 8L   11       
-        14        774 33101   3546 8R   11       
-        14        775 33101   3604 8L   11       
-        14        776 33101   3527 8R   11       
-        14        777 33101   3621 8L   11       
-        14        778 33101   3522 8R   11       
-        14        779 33101  26325 8L   S6       
-        14        780 33101   1675 8R   6        
-        14        781 33101  26853 8L   S6_2     
-        14        782 33101  26496 8R   S6       
-        14        783 33101   3643 8L   11       
-        14        784 33101  26288 8R   S6_1     
-        14        785 33101   3661 8L   11       
-        14        786 33101   1674 8R   6        
-        14        787 33101   3641 8L   11       
-        14        788 33101  28881 8R   P12      
-        14        789 33101   3647 8L   11       
-        14        790 33101   3543 8R   11       
-        14        791 33101   3633 8L   11       
-        14        792 33101   3538 8R   11       
-        14        793 33101   3622 8L   11       
-        14        794 33101   3547 8R   11       
-        14        795 33101   3606 8L   11       
-        14        796 33101   3528 8R   11       
-        14        797 33101   3642 8L   11       
-        14        798 33101   3523 8R   11       
-        14        799 33101  26491 8L   S6       
-        14        800 33101   3509 8R   11       
-        14        801 33101   3802 9L   11       
-        14        802 33101  25224 9R   P10      
-        14        803 33101   3835 9L   11       
-        14        804 33101   3721 9R   11       
-        14        805 33101  25116 9L   P10      
-        14        806 33101   3708 9R   11       
-        14        807 33101   3844 9L   11       
-        14        808 33101   3713 9R   11       
-        14        809 33101   3836 9L   11       
-        14        810 33101   3723 9R   11       
-        14        811 33101   3816 9L   11       
-        14        812 33101   3722 9R   11       
-        14        813 33101   1682 9L   6        
-        14        814 33101   3751 9R   11       
-        14        815 33101   1685 9L   6        
-        14        816 33101   3744 9R   11       
-        14        817 33101   3806 9L   11       
-        14        818 33101   3735 9R   11       
-        14        819 33101   3817 9L   11       
-        14        820 33101   3701 9R   11       
-        14        821 33101   3803 9L   11       
-        14        822 33101  26356 9R   S6_1     
-        14        823 33101   3843 9L   11       
-        14        824 33101   3724 9R   11       
-        14        825 33101  26326 9L   S6_1     
-        14        826 33101   3710 9R   11       
-        14        827 33101   3845 9L   11       
-        14        828 33101   3716 9R   11       
-        14        829 33101   3837 9L   11       
-        14        830 33101   3764 9R   11       
-        14        831 33101   3827 9L   11       
-        14        832 33101   3730 9R   11       
-        14        833 33101   1683 9L   6        
-        14        834 33101   3752 9R   11       
-        14        835 33101   1688 9L   6        
-        14        836 33101   3746 9R   11       
-        14        837 33101   3808 9L   11       
-        14        838 33101   3736 9R   11       
-        14        839 33101   3818 9L   11       
-        14        840 33101   3703 9R   11       
-        14        841 33101   3804 9L   11       
-        14        842 33101  26357 9R   S6_1     
-        14        843 33101   3849 9L   11       
-        14        844 33101   3726 9R   11       
-        14        845 33101  26346 9L   S6_1     
-        14        846 33101   3712 9R   11       
-        14        847 33101   3846 9L   11       
-        14        848 33101   3717 9R   11       
-        14        849 33101   3839 9L   11       
-        14        850 33101   3765 9R   11       
-        14        851 33101   3828 9L   11       
-        14        852 33101   3731 9R   11       
-        14        853 33101   1684 9L   6        
-        14        854 33101   3754 9R   11       
-        14        855 33101   1689 9L   6        
-        14        856 33101   3747 9R   11       
-        14        857 33101   3809 9L   11       
-        14        858 33101   3739 9R   11       
-        14        859 33101   3820 9L   11       
-        14        860 33101   3705 9R   11       
-        14        861 33101   3805 9L   11       
-        14        862 33101  26367 9R   S6_1     
-        14        863 33101  11863 9L   S1       
-        14        864 33101   3727 9R   11       
-        14        865 33101  26854 9L   S6_2     
-        14        866 33101   3759 9R   11       
-        14        867 33101   3847 9L   11       
-        14        868 33101   3718 9R   11       
-        14        869 33101   3840 9L   11       
-        14        870 33101   3766 9R   11       
-        14        871 33101   3832 9L   11       
-        14        872 33101   3733 9R   11       
-        14        873 33101   3814 9L   11       
-        14        874 33101   3756 9R   11       
-        14        875 33101   1690 9L   6        
-        14        876 33101   3748 9R   11       
-        14        877 33101   3810 9L   11       
-        14        878 33101   3740 9R   11       
-        14        879 33101   3823 9L   11       
-        14        880 33101   3706 9R   11       
-        14        881 33101   3807 9L   11       
-        14        882 33101  26368 9R   S6_1     
-        14        883 33101  11864 9L   S1       
-        14        884 33101   3763 9R   11       
-        14        885 33101   9792 9L   P6       
-        14        886 33101   3760 9R   11       
-        14        887 33101   3848 9L   11       
-        14        888 33101   3719 9R   11       
-        14        889 33101   3841 9L   11       
-        14        890 33101   3767 9R   11       
-        14        891 33101   3833 9L   11       
-        14        892 33101   3734 9R   11       
-        14        893 33101   3815 9L   11       
-        14        894 33101   3757 9R   11       
-        14        895 33101   3801 9L   11       
-        14        896 33101   3749 9R   11       
-        14        897 33101   3811 9L   11       
-        14        898 33101   3741 9R   11       
-        14        899 33101   3824 9L   11       
-        14        900 33101   3707 9R   11       
-        14        901 33101  26861 10L  S6_2     
-        14        902 33101  26909 10R  S6_2     
-        14        903 33101  27257 10L  S6_2b    
-        14        904 33101  27268 10R  S6_2b    
-        14        905 33101  26893 10L  S6_2     
-        14        906 33101  26925 10R  S6_2     
-        14        907 33101  26875 10L  S6_2     
-        14        908 33101  26930 10R  S6_2     
-        14        909 33101  24070 10L  S5-3     
-        14        910 33101  26913 10R  S6_2     
-        14        911 33101   1807 10L  8        
-        14        912 33101  26906 10R  S6_2     
-        14        913 33101  26876 10L  S6_2     
-        14        914 33101  26896 10R  S6_2     
-        14        915 33101  26866 10L  S6_2     
-        14        916 33101  27272 10R  S6_2b    
-        14        917 33101  25881 10L  P10_2    
-        14        918 33101  27261 10R  S6_2b    
-        14        919 33101  25280 10L  P10_1    
-        14        920 33101  26473 10R  S6_1     
-        14        921 33101  26868 10L  S6_2     
-        14        922 33101  26915 10R  S6_2     
-        14        923 33101  26887 10L  S6_2     
-        14        924 33101  27270 10R  S6_2b    
-        14        925 33101  27258 10L  S6_2b    
-        14        926 33101  26926 10R  S6_2     
-        14        927 33101  26878 10L  S6_2     
-        14        928 33101  25885 10R  P10_2    
-        14        929 33101  26856 10L  S6_2     
-        14        930 33101  26916 10R  S6_2     
-        14        931 33101  26862 10L  S6_2     
-        14        932 33101  26907 10R  S6_2     
-        14        933 33101  26877 10L  S6_2     
-        14        934 33101  26899 10R  S6_2     
-        14        935 33101  26867 10L  S6_2     
-        14        936 33101  27273 10R  S6_2b    
-        14        937 33101  25882 10L  P10_2    
-        14        938 33101  27262 10R  S6_2b    
-        14        939 33101  25312 10L  P10_1    
-        14        940 33101  26474 10R  S6_1     
-        14        941 33101  26870 10L  S6_2     
-        14        942 33101  27259 10R  S6_2b    
-        14        943 33101  26888 10L  S6_2     
-        14        944 33101  27271 10R  S6_2b    
-        14        945 33101  27253 10L  S6_2b    
-        14        946 33101  26928 10R  S6_2     
-        14        947 33101  26879 10L  S6_2     
-        14        948 33101  25886 10R  P10_2    
-        14        949 33101  26857 10L  S6_2     
-        14        950 33101  26918 10R  S6_2     
-        14        951 33101  26863 10L  S6_2     
-        14        952 33101  26908 10R  S6_2     
-        14        953 33101  26881 10L  S6_2     
-        14        954 33101  26900 10R  S6_2     
-        14        955 33101  26869 10L  S6_2     
-        14        956 33101  27274 10R  S6_2b    
-        14        957 33101  25883 10L  P10_2    
-        14        958 33101  27264 10R  S6_2b    
-        14        959 33101  26409 10L  S6_1     
-        14        960 33101  26478 10R  S6_1     
-        14        961 33101  26872 10L  S6_2     
-        14        962 33101  27263 10R  S6_2b    
-        14        963 33101  26889 10L  S6_2     
-        14        964 33101  27278 10R  S6_2b    
-        14        965 33101  27254 10L  S6_2b    
-        14        966 33101  26932 10R  S6_2     
-        14        967 33101  26882 10L  S6_2     
-        14        968 33101  26467 10R  S6       
-        14        969 33101  26858 10L  S6_2     
-        14        970 33101  26922 10R  S6_2     
-        14        971 33101  26864 10L  S6_2     
-        14        972 33101  26910 10R  S6_2     
-        14        973 33101  26883 10L  S6_2     
-        14        974 33101  26901 10R  S6_2     
-        14        975 33101  26873 10L  S6_2     
-        14        976 33101  27275 10R  S6_2b    
-        14        977 33101  25998 10L  P10_2    
-        14        978 33101  27265 10R  S6_2b    
-        14        979 33101  26440 10L  S6_1     
-        14        980 33101  26484 10R  S6_1     
-        14        981 33101  26880 10L  S6_2     
-        14        982 33101  27269 10R  S6_2b    
-        14        983 33101  26890 10L  S6_2     
-        14        984 33101  26904 10R  S6_2     
-        14        985 33101  27255 10L  S6_2b    
-        14        986 33101  26933 10R  S6_2     
-        14        987 33101  26884 10L  S6_2     
-        14        988 33101  26468 10R  P10_2    
-        14        989 33101  26860 10L  S6_2     
-        14        990 33101  26924 10R  S6_2     
-        14        991 33101  26865 10L  S6_2     
-        14        992 33101  26912 10R  S6_2     
-        14        993 33101  28884 10L  P12      
-        14        994 33101  26902 10R  S6_2     
-        14        995 33101  26874 10L  S6_2     
-        14        996 33101  27276 10R  S6_2b    
-        14        997 33101  26407 10L  S6       
-        14        998 33101  27266 10R  S6_2b    
-        14        999 33101  26441 10L  S6_1     
-        14       1000 33101  26486 10R  S6_1     
-        14       1001 33101  27639 11L  S6_3a    
-        14       1002 33101  27289 11R  S6_2b    
-        14       1003 33101  27282 11L  S6_2b    
-        14       1004 33101  27341 11R  S6_2b    
-        14       1005 33101  26971 11L  S6_2     
-        14       1006 33101  27293 11R  S6_2b    
-        14       1007 33101  28723 11L  P12      
-        14       1008 33101  28928 11R  P12      
-        14       1009 33101  27283 11L  S6_2b    
-        14       1010 33101  27303 11R  S6_2b    
-        14       1011 33101  28729 11L  P12      
-        14       1012 33101  27319 11R  S6_2b    
-        14       1013 33101  26969 11L  S6_2     
-        14       1014 33101  27330 11R  S6_2b    
-        14       1015 33101  26973 11L  S6_2     
-        14       1016 33101  27301 11R  S6_2b    
-        14       1017 33101  26954 11L  S6_2     
-        14       1018 33101  27321 11R  S6_2b    
-        14       1019 33101  26939 11L  S6_2     
-        14       1020 33101  27302 11R  S6_2b    
-        14       1021 33101  27640 11L  S6_3a    
-        14       1022 33101  27337 11R  S6_2b    
-        14       1023 33101  28733 11L  P12      
-        14       1024 33101  27342 11R  S6_2b    
-        14       1025 33101  26979 11L  S6_2     
-        14       1026 33101  27297 11R  S6_2b    
-        14       1027 33101  28724 11L  P12      
-        14       1028 33101  27286 11R  S6_2b    
-        14       1029 33101  27284 11L  S6_2b    
-        14       1030 33101  27309 11R  S6_2b    
-        14       1031 33101  28730 11L  P12      
-        14       1032 33101  27328 11R  S6_2b    
-        14       1033 33101  26970 11L  S6_2     
-        14       1034 33101  28753 11R  P12      
-        14       1035 33101  26975 11L  S6_2     
-        14       1036 33101  27313 11R  S6_2b    
-        14       1037 33101  28887 11L  P12      
-        14       1038 33101  27322 11R  S6_2b    
-        14       1039 33101  26940 11L  S6_2     
-        14       1040 33101  27304 11R  S6_2b    
-        14       1041 33101  26962 11L  S6_2     
-        14       1042 33101  27339 11R  S6_2b    
-        14       1043 33101  28734 11L  P12      
-        14       1044 33101  27343 11R  S6_2b    
-        14       1045 33101  27280 11L  S6_2b    
-        14       1046 33101  27336 11R  S6_2b    
-        14       1047 33101  28726 11L  P12      
-        14       1048 33101  27287 11R  S6_2b    
-        14       1049 33101  27285 11L  S6_2b    
-        14       1050 33101  27318 11R  S6_2b    
-        14       1051 33101  28735 11L  P12      
-        14       1052 33101  27331 11R  S6_2b    
-        14       1053 33101  26972 11L  S6_2     
-        14       1054 33101  28756 11R  P12      
-        14       1055 33101  26976 11L  S6_2     
-        14       1056 33101  27314 11R  S6_2b    
-        14       1057 33101  26956 11L  S6_2     
-        14       1058 33101  27323 11R  S6_2b    
-        14       1059 33101  26941 11L  S6_2     
-        14       1060 33101  27305 11R  S6_2b    
-        14       1061 33101  26974 11L  S6_2     
-        14       1062 33101  27340 11R  S6_2b    
-        14       1063 33101  28892 11L  P12      
-        14       1064 33101  27344 11R  S6_2b    
-        14       1065 33101  27281 11L  S6_2b    
-        14       1066 33101  27338 11R  S6_2b    
-        14       1067 33101  28727 11L  P12      
-        14       1068 33101  27290 11R  S6_2b    
-        14       1069 33101  28916 11L  P12      
-        14       1070 33101  27329 11R  S6_2b    
-        14       1071 33101  28736 11L  P12      
-        14       1072 33101  27334 11R  S6_2b    
-        14       1073 33101  28890 11L  P12      
-        14       1074 33101  28761 11R  P12      
-        14       1075 33101  26977 11L  S6_2     
-        14       1076 33101  27315 11R  S6_2b    
-        14       1077 33101  26957 11L  S6_2     
-        14       1078 33101  27326 11R  S6_2b    
-        14       1079 33101  26942 11L  S6_2     
-        14       1080 33101  28919 11R  P12      
-        14       1081 33101  28889 11L  P12      
-        14       1082 33101  28927 11R  P12      
-        14       1083 33101  28913 11L  P12      
-        14       1084 33101  27345 11R  S6_2b    
-        14       1085 33101  28899 11L  P12      
-        14       1086 33101  28924 11R  P12      
-        14       1087 33101  28888 11L  P12      
-        14       1088 33101  27292 11R  S6_2b    
-        14       1089 33101  28917 11L  P12      
-        14       1090 33101  27332 11R  S6_2b    
-        14       1091 33101  28738 11L  P12      
-        14       1092 33101  27335 11R  S6_2b    
-        14       1093 33101  28891 11L  P12      
-        14       1094 33101  28763 11R  P12      
-        14       1095 33101  26978 11L  S6_2     
-        14       1096 33101  27320 11R  S6_2b    
-        14       1097 33101  26958 11L  S6_2     
-        14       1098 33101  27327 11R  S6_2b    
-        14       1099 33101  26943 11L  S6_2     
-        14       1100 33101  28922 11R  P12      
-        14       1101 33101  27360 12L  S6_2b    
-        14       1102 33101   4298 12R  B12      
-        14       1103 33101  14968 12L  S2       
-        14       1104 33101  27428 12R  S6_2b    
-        14       1105 33101  27375 12L  S6_2b    
-        14       1106 33101  27391 12R  S6_2b    
-        14       1107 33101  27371 12L  S6_2b    
-        14       1108 33101  27393 12R  S6_2b    
-        14       1109 33101  27365 12L  S6_2b    
-        14       1110 33101  27405 12R  S6_2b    
-        14       1111 33101  27347 12L  S6_2b    
-        14       1112 33101  27413 12R  S6_2b    
-        14       1113 33101  27377 12L  S6_2b    
-        14       1114 33101  27418 12R  S6_2b    
-        14       1115 33101  27351 12L  S6_2b    
-        14       1116 33101  27429 12R  S6_2b    
-        14       1117 33101  26981 12L  S6_2     
-        14       1118 33101  27433 12R  S6_2b    
-        14       1119 33101  26995 12L  S6_2     
-        14       1120 33101  27383 12R  S6_2b    
-        14       1121 33101  27362 12L  S6_2b    
-        14       1122 33101  27388 12R  S6_2b    
-        14       1123 33101  27350 12L  S6_2b    
-        14       1124 33101  27430 12R  S6_2b    
-        14       1125 33101  27382 12L  S6_2b    
-        14       1126 33101  27431 12R  S6_2b    
-        14       1127 33101  27372 12L  S6_2b    
-        14       1128 33101  27395 12R  S6_2b    
-        14       1129 33101  27366 12L  S6_2b    
-        14       1130 33101  27408 12R  S6_2b    
-        14       1131 33101  27348 12L  S6_2b    
-        14       1132 33101  27414 12R  S6_2b    
-        14       1133 33101  27378 12L  S6_2b    
-        14       1134 33101  27419 12R  S6_2b    
-        14       1135 33101  27353 12L  S6_2b    
-        14       1136 33101  27439 12R  S6_2b    
-        14       1137 33101  26984 12L  S6_2     
-        14       1138 33101  27434 12R  S6_2b    
-        14       1139 33101  26997 12L  S6_2     
-        14       1140 33101  27384 12R  S6_2b    
-        14       1141 33101  27369 12L  S6_2b    
-        14       1142 33101  27389 12R  S6_2b    
-        14       1143 33101  27352 12L  S6_2b    
-        14       1144 33101  27438 12R  S6_2b    
-        14       1145 33101  28772 12L  P12      
-        14       1146 33101  27432 12R  S6_2b    
-        14       1147 33101  26996 12L  S6_2     
-        14       1148 33101  27401 12R  S6_2b    
-        14       1149 33101  27367 12L  S6_2b    
-        14       1150 33101  27410 12R  S6_2b    
-        14       1151 33101  27358 12L  S6_2b    
-        14       1152 33101  27416 12R  S6_2b    
-        14       1153 33101  27379 12L  S6_2b    
-        14       1154 33101  27420 12R  S6_2b    
-        14       1155 33101  27354 12L  S6_2b    
-        14       1156 33101  27440 12R  S6_2b    
-        14       1157 33101  26985 12L  S6_2     
-        14       1158 33101  27435 12R  S6_2b    
-        14       1159 33101  26998 12L  S6_2     
-        14       1160 33101  27386 12R  S6_2b    
-        14       1161 33101  27373 12L  S6_2b    
-        14       1162 33101  27390 12R  S6_2b    
-        14       1163 33101  27357 12L  S6_2b    
-        14       1164 33101  28797 12R  P12      
-        14       1165 33101  28773 12L  P12      
-        14       1166 33101  28794 12R  P12      
-        14       1167 33101  26999 12L  S6_2     
-        14       1168 33101  27402 12R  S6_2b    
-        14       1169 33101  27368 12L  S6_2b    
-        14       1170 33101  27411 12R  S6_2b    
-        14       1171 33101  27361 12L  S6_2b    
-        14       1172 33101  27417 12R  S6_2b    
-        14       1173 33101  27380 12L  S6_2b    
-        14       1174 33101  27421 12R  S6_2b    
-        14       1175 33101  27355 12L  S6_2b    
-        14       1176 33101  27441 12R  S6_2b    
-        14       1177 33101  26988 12L  S6_2     
-        14       1178 33101  27436 12R  S6_2b    
-        14       1179 33101  27000 12L  S6_2     
-        14       1180 33101  27387 12R  S6_2b    
-        14       1181 33101  28786 12L  P12      
-        14       1182 33101  27392 12R  S6_2b    
-        14       1183 33101  27359 12L  S6_2b    
-        14       1184 33101  27385 12R  S6_2b    
-        14       1185 33101  28945 12L  P12      
-        14       1186 33101  28796 12R  P12      
-        14       1187 33101  28793 12L  P12      
-        14       1188 33101  27404 12R  S6_2b    
-        14       1189 33101  27370 12L  S6_2b    
-        14       1190 33101  27412 12R  S6_2b    
-        14       1191 33101  27364 12L  S6_2b    
-        14       1192 33101  27424 12R  S6_2b    
-        14       1193 33101  27381 12L  S6_2b    
-        14       1194 33101  27425 12R  S6_2b    
-        14       1195 33101  27356 12L  S6_2b    
-        14       1196 33101  27442 12R  S6_2b    
-        14       1197 33101  26991 12L  S6_2     
-        14       1198 33101  27437 12R  S6_2b    
-        14       1199 33101  28789 12L  P12      
-        14       1200 33101  25896 12R  P10_2    
-        14       1201 33101  28831 13L  P12      
-        14       1202 33101  27919 13R  S6_3a    
-        14       1203 33101  27852 13L  S6_3a    
-        14       1204 33101  27952 13R  S6_3a    
-        14       1205 33101  27886 13L  S6_3a    
-        14       1206 33101  27942 13R  S6_3a    
-        14       1207 33101  25898 13L  P10_2    
-        14       1208 33101  27931 13R  S6_3a    
-        14       1209 33101  27862 13L  S6_3a    
-        14       1210 33101  27918 13R  S6_3a    
-        14       1211 33101  25897 13L  P10_2    
-        14       1212 33101  27932 13R  S6_3a    
-        14       1213 33101  27877 13L  S6_3a    
-        14       1214 33101  27488 13R  S6_2b    
-        14       1215 33101  27444 13L  S6_2b    
-        14       1216 33101  27475 13R  S6_2b    
-        14       1217 33101  28812 13L  P12      
-        14       1218 33101  28838 13R  P12      
-        14       1219 33101  28977 13L  P12      
-        14       1220 33101  27490 13R  S6_2b    
-        14       1221 33101  27859 13L  S6_3a    
-        14       1222 33101  27922 13R  S6_3a    
-        14       1223 33101  27853 13L  S6_3a    
-        14       1224 33101  27954 13R  S6_3a    
-        14       1225 33101  28823 13L  P12      
-        14       1226 33101  27944 13R  S6_3a    
-        14       1227 33101  27880 13L  S6_3a    
-        14       1228 33101  27936 13R  S6_3a    
-        14       1229 33101  27863 13L  S6_3a    
-        14       1230 33101  27920 13R  S6_3a    
-        14       1231 33101  28832 13L  P12      
-        14       1232 33101  27933 13R  S6_3a    
-        14       1233 33101  27878 13L  S6_3a    
-        14       1234 33101  27489 13R  S6_2b    
-        14       1235 33101  27461 13L  S6_2b    
-        14       1236 33101  27477 13R  S6_2b    
-        14       1237 33101  28814 13L  P12      
-        14       1238 33101  28854 13R  P12      
-        14       1239 33101  28969 13L  P12      
-        14       1240 33101  27492 13R  S6_2b    
-        14       1241 33101  27860 13L  S6_3a    
-        14       1242 33101  27925 13R  S6_3a    
-        14       1243 33101  27854 13L  S6_3a    
-        14       1244 33101  27955 13R  S6_3a    
-        14       1245 33101  28827 13L  P12      
-        14       1246 33101  27945 13R  S6_3a    
-        14       1247 33101  28815 13L  P12      
-        14       1248 33101  27938 13R  S6_3a    
-        14       1249 33101  27864 13L  S6_3a    
-        14       1250 33101  27921 13R  S6_3a    
-        14       1251 33101  28833 13L  P12      
-        14       1252 33101  27940 13R  S6_3a    
-        14       1253 33101  27879 13L  S6_3a    
-        14       1254 33101  28835 13R  P12      
-        14       1255 33101  28819 13L  P12      
-        14       1256 33101  27478 13R  S6_2b    
-        14       1257 33101  27457 13L  S6_2b    
-        14       1258 33101  28860 13R  P12      
-        14       1259 33101  28979 13L  P12      
-        14       1260 33101  27493 13R  S6_2b    
-        14       1261 33101  27861 13L  S6_3a    
-        14       1262 33101  27929 13R  S6_3a    
-        14       1263 33101  27855 13L  S6_3a    
-        14       1264 33101  27964 13R  S6_3a    
-        14       1265 33101  28828 13L  P12      
-        14       1266 33101  27946 13R  S6_3a    
-        14       1267 33101  28820 13L  P12      
-        14       1268 33101  27939 13R  S6_3a    
-        14       1269 33101  27871 13L  S6_3a    
-        14       1270 33101  27923 13R  S6_3a    
-        14       1271 33101  27856 13L  S6_3a    
-        14       1272 33101  27948 13R  S6_3a    
-        14       1273 33101  27881 13L  S6_3a    
-        14       1274 33101  28856 13R  P12      
-        14       1275 33101  28826 13L  P12      
-        14       1276 33101  27479 13R  S6_2b    
-        14       1277 33101  28817 13L  P12      
-        14       1278 33101  28861 13R  P12      
-        14       1279 33101  28974 13L  P12      
-        14       1280 33101  27494 13R  S6_2b    
-        14       1281 33101  27868 13L  S6_3a    
-        14       1282 33101  27937 13R  S6_3a    
-        14       1283 33101  28834 13L  P12      
-        14       1284 33101  27965 13R  S6_3a    
-        14       1285 33101  28830 13L  P12      
-        14       1286 33101  27947 13R  S6_3a    
-        14       1287 33101  27884 13L  S6_3a    
-        14       1288 33101  27941 13R  S6_3a    
-        14       1289 33101  27873 13L  S6_3a    
-        14       1290 33101  27926 13R  S6_3a    
-        14       1291 33101  27857 13L  S6_3a    
-        14       1292 33101  27949 13R  S6_3a    
-        14       1293 33101  27470 13L  S6_2b    
-        14       1294 33101  28990 13R  P12      
-        14       1295 33101  28829 13L  P12      
-        14       1296 33101  27487 13R  S6_2b    
-        14       1297 33101  28818 13L  P12      
-        14       1298 33101  28987 13R  P12      
-        14       1299 33101  28981 13L  P12      
-        14       1300 33101  27498 13R  S6_2b    
-        14       1301 33101  28034 14L  S6_3b    
-        14       1302 33101  28060 14R  S6_3b    
-        14       1303 33101  28008 14L  S6_3b    
-        14       1304 33101  28073 14R  S6_3b    
-        14       1305 33101  28014 14L  S6_3b    
-        14       1306 33101  28083 14R  S6_3b    
-        14       1307 33101  28021 14L  S6_3b    
-        14       1308 33101  28092 14R  S6_3b    
-        14       1309 33101  28028 14L  S6_3b    
-        14       1310 33101  28101 14R  S6_3b    
-        14       1311 33101  23895 14L  S5_3     
-        14       1312 33101  28107 14R  S6_3b    
-        14       1313 33101  28041 14L  S6_3b    
-        14       1314 33101  29302 14R  P13      
-        14       1315 33101  28055 14L  S6_3b    
-        14       1316 33101  29508 14R  R1       
-        14       1317 33101  28049 14L  S6_3b    
-        14       1318 33101  29503 14R  R1       
-        14       1319 33101  28047 14L  S6_3b    
-        14       1320 33101  29514 14R  R1       
-        14       1321 33101  28002 14L  S6_3b    
-        14       1322 33101  28066 14R  S6_3b    
-        14       1323 33101  28009 14L  S6_3b    
-        14       1324 33101  28074 14R  S6_3b    
-        14       1325 33101  28015 14L  S6_3b    
-        14       1326 33101  28086 14R  S6_3b    
-        14       1327 33101  28022 14L  S6_3b    
-        14       1328 33101  28095 14R  S6_3b    
-        14       1329 33101  28029 14L  S6_3b    
-        14       1330 33101  28102 14R  S6_3b    
-        14       1331 33101  28035 14L  S6_3b    
-        14       1332 33101  28108 14R  S6_3b    
-        14       1333 33101  28042 14L  S6_3b    
-        14       1334 33101  19216 14R  S4       
-        14       1335 33101  28056 14L  S6_3b    
-        14       1336 33101  29509 14R  R1       
-        14       1337 33101  28050 14L  S6_3b    
-        14       1338 33101  29504 14R  R1       
-        14       1339 33101  28627 14L  P12      
-        14       1340 33101  29515 14R  R1       
-        14       1341 33101  28004 14L  S6_3b    
-        14       1342 33101  28069 14R  S6_3b    
-        14       1343 33101  28010 14L  S6_3b    
-        14       1344 33101  28075 14R  S6_3b    
-        14       1345 33101  28017 14L  S6_3b    
-        14       1346 33101  28088 14R  S6_3b    
-        14       1347 33101  28023 14L  S6_3b    
-        14       1348 33101  28098 14R  S6_3b    
-        14       1349 33101  28030 14L  S6_3b    
-        14       1350 33101  28103 14R  S6_3b    
-        14       1351 33101  28036 14L  S6_3b    
-        14       1352 33101  28109 14R  S6_3b    
-        14       1353 33101  28045 14L  S6_3b    
-        14       1354 33101  19256 14R  S4       
-        14       1355 33101  28057 14L  S6_3b    
-        14       1356 33101  29510 14R  R1       
-        14       1357 33101  28051 14L  S6_3b    
-        14       1358 33101  29505 14R  R1       
-        14       1359 33101  29297 14L  P13      
-        14       1360 33101  29516 14R  R1       
-        14       1361 33101  28005 14L  S6_3b    
-        14       1362 33101  28070 14R  S6_3b    
-        14       1363 33101  28012 14L  S6_3b    
-        14       1364 33101  28076 14R  S6_3b    
-        14       1365 33101  28018 14L  S6_3b    
-        14       1366 33101  28089 14R  S6_3b    
-        14       1367 33101  28024 14L  S6_3b    
-        14       1368 33101  28099 14R  S6_3b    
-        14       1369 33101  28032 14L  S6_3b    
-        14       1370 33101  28105 14R  S6_3b    
-        14       1371 33101  28037 14L  S6_3b    
-        14       1372 33101  28110 14R  S6_3b    
-        14       1373 33101  28046 14L  S6_3b    
-        14       1374 33101  29501 14R  R1       
-        14       1375 33101  28058 14L  S6_3b    
-        14       1376 33101  29511 14R  R1       
-        14       1377 33101  28053 14L  S6_3b    
-        14       1378 33101  29506 14R  R1       
-        14       1379 33101  29299 14L  P13      
-        14       1380 33101  29518 14R  R1       
-        14       1381 33101  28006 14L  S6_3b    
-        14       1382 33101  28071 14R  S6_3b    
-        14       1383 33101  28013 14L  S6_3b    
-        14       1384 33101  28078 14R  S6_3b    
-        14       1385 33101  28019 14L  S6_3b    
-        14       1386 33101  28091 14R  S6_3b    
-        14       1387 33101  28026 14L  S6_3b    
-        14       1388 33101  28100 14R  S6_3b    
-        14       1389 33101  28033 14L  S6_3b    
-        14       1390 33101  28106 14R  S6_3b    
-        14       1391 33101  28040 14L  S6_3b    
-        14       1392 33101  28111 14R  S6_3b    
-        14       1393 33101  28048 14L  S6_3b    
-        14       1394 33101  29502 14R  R1       
-        14       1395 33101  28611 14L  P12      
-        14       1396 33101  29513 14R  R1       
-        14       1397 33101  28054 14L  S6_3b    
-        14       1398 33101  29507 14R  R1       
-        14       1399 33101  28016 14L  S6_3b    
-        14       1400 33101  29519 14R  R1       
-        14       1401 33101  28117 15L  S6_3b    
-        14       1402 33101  27512 15R  S6_3     
-        14       1403 33101  28133 15L  S6_3b    
-        14       1404 33101  28174 15R  S6_3b    
-        14       1405 33101  28138 15L  S6_3b    
-        14       1406 33101  28180 15R  S6_3b    
-        14       1407 33101  28143 15L  S6_3b    
-        14       1408 33101  28187 15R  S6_3b    
-        14       1409 33101  28149 15L  S6_3b    
-        14       1410 33101  28192 15R  S6_3b    
-        14       1411 33101  28154 15L  S6_3b    
-        14       1412 33101  28201 15R  S6_3b    
-        14       1413 33101  28159 15L  S6_3b    
-        14       1414 33101  28208 15R  S6_3b    
-        14       1415 33101  28165 15L  S6_3b    
-        14       1416 33101  28215 15R  S6_3b    
-        14       1417 33101  28171 15L  S6_3b    
-        14       1418 33101  28220 15R  S6_3b    
-        14       1419 33101  29829 15L  S7_1     
-        14       1420 33101  28226 15R  S6_3b    
-        14       1421 33101  28127 15L  S6_3b    
-        14       1422 33101  28645 15R  P12      
-        14       1423 33101  28134 15L  S6_3b    
-        14       1424 33101  28175 15R  S6_3b    
-        14       1425 33101  28139 15L  S6_3b    
-        14       1426 33101  28181 15R  S6_3b    
-        14       1427 33101  28144 15L  S6_3b    
-        14       1428 33101  28188 15R  S6_3b    
-        14       1429 33101  28150 15L  S6_3b    
-        14       1430 33101  28193 15R  S6_3b    
-        14       1431 33101  28155 15L  S6_3b    
-        14       1432 33101  28204 15R  S6_3b    
-        14       1433 33101  28161 15L  S6_3b    
-        14       1434 33101  28209 15R  S6_3b    
-        14       1435 33101  28166 15L  S6_3b    
-        14       1436 33101  28216 15R  S6_3b    
-        14       1437 33101  29306 15L  P13      
-        14       1438 33101  28222 15R  S6_3b    
-        14       1439 33101  29842 15L  S7_1     
-        14       1440 33101  28227 15R  S6_3b    
-        14       1441 33101  28129 15L  S6_3b    
-        14       1442 33101  28646 15R  P12      
-        14       1443 33101  28135 15L  S6_3b    
-        14       1444 33101  28176 15R  S6_3b    
-        14       1445 33101  28140 15L  S6_3b    
-        14       1446 33101  28183 15R  S6_3b    
-        14       1447 33101  28145 15L  S6_3b    
-        14       1448 33101  28189 15R  S6_3b    
-        14       1449 33101  28151 15L  S6_3b    
-        14       1450 33101  28194 15R  S6_3b    
-        14       1451 33101  28156 15L  S6_3b    
-        14       1452 33101  28205 15R  S6_3b    
-        14       1453 33101  28162 15L  S6_3b    
-        14       1454 33101  28210 15R  S6_3b    
-        14       1455 33101  28168 15L  S6_3b    
-        14       1456 33101  28217 15R  S6_3b    
-        14       1457 33101  29308 15L  P13      
-        14       1458 33101  28223 15R  S6_3b    
-        14       1459 33101  29844 15L  S7_1     
-        14       1460 33101  28228 15R  S6_3b    
-        14       1461 33101  28130 15L  S6_3b    
-        14       1462 33101  28172 15R  S6_3b    
-        14       1463 33101  28136 15L  S6_3b    
-        14       1464 33101  28177 15R  S6_3b    
-        14       1465 33101  28141 15L  S6_3b    
-        14       1466 33101  28184 15R  S6_3b    
-        14       1467 33101  28146 15L  S6_3b    
-        14       1468 33101  28190 15R  S6_3b    
-        14       1469 33101  28152 15L  S6_3b    
-        14       1470 33101  28197 15R  S6_3b    
-        14       1471 33101  28157 15L  S6_3b    
-        14       1472 33101  28206 15R  S6_3b    
-        14       1473 33101  28163 15L  S6_3b    
-        14       1474 33101  28212 15R  S6_3b    
-        14       1475 33101  28169 15L  S6_3b    
-        14       1476 33101  28218 15R  S6_3b    
-        14       1477 33101  29309 15L  P13      
-        14       1478 33101  28224 15R  S6_3b    
-        14       1479 33101  29839 15L  S7_1     
-        14       1480 33101  28198 15R  S6_3b    
-        14       1481 33101  28131 15L  S6_3b    
-        14       1482 33101  28173 15R  S6_3b    
-        14       1483 33101  28137 15L  S6_3b    
-        14       1484 33101  28179 15R  S6_3b    
-        14       1485 33101  28142 15L  S6_3b    
-        14       1486 33101  28185 15R  S6_3b    
-        14       1487 33101  28147 15L  S6_3b    
-        14       1488 33101  28191 15R  S6_3b    
-        14       1489 33101  28153 15L  S6_3b    
-        14       1490 33101  28203 15R  S6_3b    
-        14       1491 33101  28158 15L  S6_3b    
-        14       1492 33101  28207 15R  S6_3b    
-        14       1493 33101  28164 15L  S6_3b    
-        14       1494 33101  28214 15R  S6_3b    
-        14       1495 33101  28170 15L  S6_3b    
-        14       1496 33101  28219 15R  S6_3b    
-        14       1497 33101  29310 15L  P13      
-        14       1498 33101  28225 15R  S6_3b    
-        14       1499 33101  29801 15L  S7_1     
-        14       1500 33101  28221 15R  S6_3b    
-        14       1501 33101  26082 16L  S06      
-        14       1502 33101  28699 16R  P12      
-        14       1503 33101  28233 16L  S6_3b    
-        14       1504 33101  28710 16R  P12      
-        14       1505 33101  28238 16L  S6_3b    
-        14       1506 33101  28293 16R  S6_3b    
-        14       1507 33101  28243 16L  S6_3b    
-        14       1508 33101  28298 16R  S6_3b    
-        14       1509 33101  28248 16L  S6_3b    
-        14       1510 33101  28304 16R  S6_3b    
-        14       1511 33101  28253 16L  S6_3b    
-        14       1512 33101  28310 16R  S6_3b    
-        14       1513 33101  28258 16L  S6_3b    
-        14       1514 33101  28315 16R  S6_3b    
-        14       1515 33101  28263 16L  S6_3b    
-        14       1516 33101  28322 16R  S6_3b    
-        14       1517 33101  28269 16L  S6_3b    
-        14       1518 33101  28330 16R  S6_3b    
-        14       1519 33101  28274 16L  S6_3b    
-        14       1520 33101  28335 16R  S6_3b    
-        14       1521 33101  28662 16L  P12      
-        14       1522 33101  28700 16R  P12      
-        14       1523 33101  28234 16L  S6_3b    
-        14       1524 33101  28711 16R  P12      
-        14       1525 33101  28239 16L  S6_3b    
-        14       1526 33101  28294 16R  S6_3b    
-        14       1527 33101  28244 16L  S6_3b    
-        14       1528 33101  28299 16R  S6_3b    
-        14       1529 33101  28249 16L  S6_3b    
-        14       1530 33101  28305 16R  S6_3b    
-        14       1531 33101  28254 16L  S6_3b    
-        14       1532 33101  28311 16R  S6_3b    
-        14       1533 33101  28259 16L  S6_3b    
-        14       1534 33101  28316 16R  S6_3b    
-        14       1535 33101  28264 16L  S6_3b    
-        14       1536 33101  28326 16R  S6_3b    
-        14       1537 33101  28270 16L  S6_3b    
-        14       1538 33101  28331 16R  S6_3b    
-        14       1539 33101  28275 16L  S6_3b    
-        14       1540 33101  28336 16R  S6_3b    
-        14       1541 33101  28230 16L  S6_3b    
-        14       1542 33101  28702 16R  P12      
-        14       1543 33101  28235 16L  S6_3b    
-        14       1544 33101  28288 16R  S6_3b    
-        14       1545 33101  28240 16L  S6_3b    
-        14       1546 33101  28295 16R  S6_3b    
-        14       1547 33101  28245 16L  S6_3b    
-        14       1548 33101  28300 16R  S6_3b    
-        14       1549 33101  28250 16L  S6_3b    
-        14       1550 33101  28306 16R  S6_3b    
-        14       1551 33101  28255 16L  S6_3b    
-        14       1552 33101  28312 16R  S6_3b    
-        14       1553 33101  28260 16L  S6_3b    
-        14       1554 33101  28318 16R  S6_3b    
-        14       1555 33101  28266 16L  S6_3b    
-        14       1556 33101  28327 16R  S6_3b    
-        14       1557 33101  28271 16L  S6_3b    
-        14       1558 33101  28332 16R  S6_3b    
-        14       1559 33101  28276 16L  S6_3b    
-        14       1560 33101  28337 16R  S6_3b    
-        14       1561 33101  28231 16L  S6_3b    
-        14       1562 33101  28708 16R  P12      
-        14       1563 33101  28236 16L  S6_3b    
-        14       1564 33101  28291 16R  S6_3b    
-        14       1565 33101  28241 16L  S6_3b    
-        14       1566 33101  28296 16R  S6_3b    
-        14       1567 33101  28246 16L  S6_3b    
-        14       1568 33101  28302 16R  S6_3b    
-        14       1569 33101  28251 16L  S6_3b    
-        14       1570 33101  28307 16R  S6_3b    
-        14       1571 33101  28256 16L  S6_3b    
-        14       1572 33101  28313 16R  S6_3b    
-        14       1573 33101  28261 16L  S6_3b    
-        14       1574 33101  28319 16R  S6_3b    
-        14       1575 33101  28267 16L  S6_3b    
-        14       1576 33101  28328 16R  S6_3b    
-        14       1577 33101  28272 16L  S6_3b    
-        14       1578 33101  28333 16R  S6_3b    
-        14       1579 33101  28277 16L  S6_3b    
-        14       1580 33101  28338 16R  S6_3b    
-        14       1581 33101  28232 16L  S6_3b    
-        14       1582 33101  28709 16R  P12      
-        14       1583 33101  28237 16L  S6_3b    
-        14       1584 33101  28292 16R  S6_3b    
-        14       1585 33101  28242 16L  S6_3b    
-        14       1586 33101  28297 16R  S6_3b    
-        14       1587 33101  28247 16L  S6_3b    
-        14       1588 33101  28303 16R  S6_3b    
-        14       1589 33101  28252 16L  S6_3b    
-        14       1590 33101  28308 16R  S6_3b    
-        14       1591 33101  28257 16L  S6_3b    
-        14       1592 33101  28314 16R  S6_3b    
-        14       1593 33101  28262 16L  S6_3b    
-        14       1594 33101  28320 16R  S6_3b    
-        14       1595 33101  28268 16L  S6_3b    
-        14       1596 33101  28329 16R  S6_3b    
-        14       1597 33101  28273 16L  S6_3b    
-        14       1598 33101  28334 16R  S6_3b    
-        14       1599 33101  28278 16L  S6_3b    
-        14       1600 33101  28343 16R  S6_3b    
-        14       1601 33101  24992 17L  P10_1    
-        14       1602 33101  28405 17R  S6_3b    
-        14       1603 33101  28363 17L  S6_3b    
-        14       1604 33101  28410 17R  S6_3b    
-        14       1605 33101  28369 17L  S6_3b    
-        14       1606 33101  28415 17R  S6_3b    
-        14       1607 33101  28374 17L  S6_3b    
-        14       1608 33101  28422 17R  S6_3b    
-        14       1609 33101  28379 17L  S6_3b    
-        14       1610 33101  28427 17R  S6_3b    
-        14       1611 33101  28384 17L  S6_3b    
-        14       1612 33101  28432 17R  S6_3b    
-        14       1613 33101  28390 17L  S6_3b    
-        14       1614 33101  28437 17R  S6_3b    
-        14       1615 33101  28395 17L  S6_3b    
-        14       1616 33101  28442 17R  S6_3b    
-        14       1617 33101  28400 17L  S6_3b    
-        14       1618 33101  28447 17R  S6_3b    
-        14       1619 33101  28713 17L  P12      
-        14       1620 33101  28452 17R  S6_3b    
-        14       1621 33101  27135 17L  S6_2b    
-        14       1622 33101  28406 17R  S6_3b    
-        14       1623 33101  28364 17L  S6_3b    
-        14       1624 33101  28411 17R  S6_3b    
-        14       1625 33101  28370 17L  S6_3b    
-        14       1626 33101  28418 17R  S6_3b    
-        14       1627 33101  28375 17L  S6_3b    
-        14       1628 33101  28423 17R  S6_3b    
-        14       1629 33101  28380 17L  S6_3b    
-        14       1630 33101  28428 17R  S6_3b    
-        14       1631 33101  28385 17L  S6_3b    
-        14       1632 33101  28433 17R  S6_3b    
-        14       1633 33101  28391 17L  S6_3b    
-        14       1634 33101  28438 17R  S6_3b    
-        14       1635 33101  28396 17L  S6_3b    
-        14       1636 33101  28443 17R  S6_3b    
-        14       1637 33101  28401 17L  S6_3b    
-        14       1638 33101  28448 17R  S6_3b    
-        14       1639 33101  28714 17L  P12      
-        14       1640 33101  28453 17R  S6_3b    
-        14       1641 33101  28357 17L  S6_3b    
-        14       1642 33101  28407 17R  S6_3b    
-        14       1643 33101  28365 17L  S6_3b    
-        14       1644 33101  28412 17R  S6_3b    
-        14       1645 33101  28371 17L  S6_3b    
-        14       1646 33101  28417 17R  S6_3b    
-        14       1647 33101  28376 17L  S6_3b    
-        14       1648 33101  28424 17R  S6_3b    
-        14       1649 33101  28381 17L  S6_3b    
-        14       1650 33101  28429 17R  S6_3b    
-        14       1651 33101  28386 17L  S6_3b    
-        14       1652 33101  28434 17R  S6_3b    
-        14       1653 33101  28392 17L  S6_3b    
-        14       1654 33101  28439 17R  S6_3b    
-        14       1655 33101  28397 17L  S6_3b    
-        14       1656 33101  28444 17R  S6_3b    
-        14       1657 33101  28402 17L  S6_3b    
-        14       1658 33101  28449 17R  S6_3b    
-        14       1659 33101  29325 17L  P13      
-        14       1660 33101  28454 17R  S6_3b    
-        14       1661 33101  28361 17L  S6_3b    
-        14       1662 33101  28408 17R  S6_3b    
-        14       1663 33101  28366 17L  S6_3b    
-        14       1664 33101  28413 17R  S6_3b    
-        14       1665 33101  28372 17L  S6_3b    
-        14       1666 33101  28420 17R  S6_3b    
-        14       1667 33101  28377 17L  S6_3b    
-        14       1668 33101  28425 17R  S6_3b    
-        14       1669 33101  28382 17L  S6_3b    
-        14       1670 33101  28430 17R  S6_3b    
-        14       1671 33101  28387 17L  S6_3b    
-        14       1672 33101  28435 17R  S6_3b    
-        14       1673 33101  28393 17L  S6_3b    
-        14       1674 33101  28440 17R  S6_3b    
-        14       1675 33101  28398 17L  S6_3b    
-        14       1676 33101  28445 17R  S6_3b    
-        14       1677 33101  28403 17L  S6_3b    
-        14       1678 33101  28450 17R  S6_3b    
-        14       1679 33101  29326 17L  P13      
-        14       1680 33101  28455 17R  S6_3b    
-        14       1681 33101  28362 17L  S6_3b    
-        14       1682 33101  28409 17R  S6_3b    
-        14       1683 33101  28367 17L  S6_3b    
-        14       1684 33101  28414 17R  S6_3b    
-        14       1685 33101  28373 17L  S6_3b    
-        14       1686 33101  28421 17R  S6_3b    
-        14       1687 33101  28378 17L  S6_3b    
-        14       1688 33101  28426 17R  S6_3b    
-        14       1689 33101  28383 17L  S6_3b    
-        14       1690 33101  28431 17R  S6_3b    
-        14       1691 33101  28389 17L  S6_3b    
-        14       1692 33101  28436 17R  S6_3b    
-        14       1693 33101  28394 17L  S6_3b    
-        14       1694 33101  28441 17R  S6_3b    
-        14       1695 33101  28399 17L  S6_3b    
-        14       1696 33101  28446 17R  S6_3b    
-        14       1697 33101  28404 17L  S6_3b    
-        14       1698 33101  28451 17R  S6_3b    
-        14       1699 33101  27138 17L  S6_2b    
-        14       1700 33101  28458 17R  S6_3b    
-        15          1 33101  25970 1L   P11_1    
-        15          2 33101   8051 1R   P3       
-        15          3 33101  29601 1L   S7_1     
-        15          4 33101  25937 1R   P11_1    
-        15          5 33101  29606 1L   S7_1     
-        15          6 33101  29651 1R   S7_1     
-        15          7 33101  29612 1L   S7_1     
-        15          8 33101  29656 1R   S7_1     
-        15          9 33101  29617 1L   S7_1     
-        15         10 33101  29661 1R   S7_1     
-        15         11 33101  29622 1L   S7_1     
-        15         12 33101  29666 1R   S7_1     
-        15         13 33101  29627 1L   S7_1     
-        15         14 33101  29671 1R   S7_1     
-        15         15 33101  29634 1L   S7_1     
-        15         16 33101  29677 1R   S7_1     
-        15         17 33101  29639 1L   S7_1     
-        15         18 33101  29682 1R   S7_1     
-        15         19 33101  29644 1L   S7_1     
-        15         20 33101  29688 1R   S7_1     
-        15         21 33101  26501 1L   S6_2     
-        15         22 33101  25933 1R   P11_1    
-        15         23 33101  29602 1L   S7_1     
-        15         24 33101  25938 1R   P11_1    
-        15         25 33101  29607 1L   S7_1     
-        15         26 33101  29652 1R   S7_1     
-        15         27 33101  29613 1L   S7_1     
-        15         28 33101  29657 1R   S7_1     
-        15         29 33101  29618 1L   S7_1     
-        15         30 33101  29662 1R   S7_1     
-        15         31 33101  29623 1L   S7_1     
-        15         32 33101  29667 1R   S7_1     
-        15         33 33101  29630 1L   S7_1     
-        15         34 33101  29672 1R   S7_1     
-        15         35 33101  29635 1L   S7_1     
-        15         36 33101  29678 1R   S7_1     
-        15         37 33101  29640 1L   S7_1     
-        15         38 33101  29683 1R   S7_1     
-        15         39 33101  29645 1L   S7_1     
-        15         40 33101  29689 1R   S7_1     
-        15         41 33101  26502 1L   S6_2     
-        15         42 33101  25934 1R   P11_1    
-        15         43 33101  29603 1L   S7_1     
-        15         44 33101  25939 1R   P11_1    
-        15         45 33101  29608 1L   S7_1     
-        15         46 33101  29653 1R   S7_1     
-        15         47 33101  29614 1L   S7_1     
-        15         48 33101  29658 1R   S7_1     
-        15         49 33101  29619 1L   S7_1     
-        15         50 33101  29663 1R   S7_1     
-        15         51 33101  29624 1L   S7_1     
-        15         52 33101  29668 1R   S7_1     
-        15         53 33101  29631 1L   S7_1     
-        15         54 33101  29673 1R   S7_1     
-        15         55 33101  29636 1L   S7_1     
-        15         56 33101  29679 1R   S7_1     
-        15         57 33101  29641 1L   S7_1     
-        15         58 33101  29684 1R   S7_1     
-        15         59 33101  29646 1L   S7_1     
-        15         60 33101  29690 1R   S7_1     
-        15         61 33101  26504 1L   S6_2     
-        15         62 33101  25935 1R   P11_1    
-        15         63 33101  29604 1L   S7_1     
-        15         64 33101  25940 1R   P11_1    
-        15         65 33101  29609 1L   S7_1     
-        15         66 33101  29654 1R   S7_1     
-        15         67 33101  29615 1L   S7_1     
-        15         68 33101  29659 1R   S7_1     
-        15         69 33101  29620 1L   S7_1     
-        15         70 33101  29664 1R   S7_1     
-        15         71 33101  29625 1L   S7_1     
-        15         72 33101  29669 1R   S7_1     
-        15         73 33101  29632 1L   S7_1     
-        15         74 33101  29674 1R   S7_1     
-        15         75 33101  29637 1L   S7_1     
-        15         76 33101  29680 1R   S7_1     
-        15         77 33101  29642 1L   S7_1     
-        15         78 33101  29685 1R   S7_1     
-        15         79 33101  29647 1L   S7_1     
-        15         80 33101  29691 1R   S7_1     
-        15         81 33101  26505 1L   S6_2     
-        15         82 33101  25936 1R   P11_1    
-        15         83 33101  29605 1L   S7_1     
-        15         84 33101  25941 1R   P11_1    
-        15         85 33101  29610 1L   S7_1     
-        15         86 33101  29655 1R   S7_1     
-        15         87 33101  29616 1L   S7_1     
-        15         88 33101  29660 1R   S7_1     
-        15         89 33101  29621 1L   S7_1     
-        15         90 33101  29665 1R   S7_1     
-        15         91 33101  29626 1L   S7_1     
-        15         92 33101  29670 1R   S7_1     
-        15         93 33101  29633 1L   S7_1     
-        15         94 33101  29675 1R   S7_1     
-        15         95 33101  29638 1L   S7_1     
-        15         96 33101  29681 1R   S7_1     
-        15         97 33101  29643 1L   S7_1     
-        15         98 33101  29687 1R   S7_1     
-        15         99 33101  29648 1L   S7_1     
-        15        100 33101  29692 1R   S7_1     
-        15        101 33101  26509 2L   S6_2     
-        15        102 33101  16272 2R   S3       
-        15        103 33101  28602 2L   P12      
-        15        104 33101  23561 2R   S5_3     
-        15        105 33101  30103 2L   S7_2     
-        15        106 33101  30161 2R   S7_2     
-        15        107 33101  30109 2L   S7_2     
-        15        108 33101  30166 2R   S7_2     
-        15        109 33101  30116 2L   S7_2     
-        15        110 33101  30176 2R   S7_2     
-        15        111 33101  30121 2L   S7_2     
-        15        112 33101  30182 2R   S7_2     
-        15        113 33101  30127 2L   S7_2     
-        15        114 33101  30187 2R   S7_2     
-        15        115 33101  30132 2L   S7_2     
-        15        116 33101  30194 2R   S7_2     
-        15        117 33101  30137 2L   S7_2     
-        15        118 33101  30201 2R   S7_2     
-        15        119 33101  30142 2L   S7_2     
-        15        120 33101  30206 2R   S7_2     
-        15        121 33101  26510 2L   S6_2     
-        15        122 33101  26517 2R   S6_2     
-        15        123 33101  28603 2L   P12      
-        15        124 33101  26525 2R   S6_2     
-        15        125 33101  30104 2L   S7_2     
-        15        126 33101  30162 2R   S7_2     
-        15        127 33101  30111 2L   S7_2     
-        15        128 33101  30169 2R   S7_2     
-        15        129 33101  30117 2L   S7_2     
-        15        130 33101  30177 2R   S7_2     
-        15        131 33101  30122 2L   S7_2     
-        15        132 33101  30183 2R   S7_2     
-        15        133 33101  30128 2L   S7_2     
-        15        134 33101  30188 2R   S7_2     
-        15        135 33101  30133 2L   S7_2     
-        15        136 33101  30195 2R   S7_2     
-        15        137 33101  30138 2L   S7_2     
-        15        138 33101  30202 2R   S7_2     
-        15        139 33101  30143 2L   S7_2     
-        15        140 33101  30207 2R   S7_2     
-        15        141 33101  26511 2L   S6_2     
-        15        142 33101  23539 2R   S5_3     
-        15        143 33101  28604 2L   P12      
-        15        144 33101  26531 2R   S6_2     
-        15        145 33101  30105 2L   S7_2     
-        15        146 33101  30163 2R   S7_2     
-        15        147 33101  30112 2L   S7_2     
-        15        148 33101  30170 2R   S7_2     
-        15        149 33101  30118 2L   S7_2     
-        15        150 33101  30178 2R   S7_2     
-        15        151 33101  30123 2L   S7_2     
-        15        152 33101  30184 2R   S7_2     
-        15        153 33101  30129 2L   S7_2     
-        15        154 33101  30189 2R   S7_2     
-        15        155 33101  30134 2L   S7_2     
-        15        156 33101  30196 2R   S7_2     
-        15        157 33101  30139 2L   S7_2     
-        15        158 33101  30203 2R   S7_2     
-        15        159 33101  30144 2L   S7_2     
-        15        160 33101  30208 2R   S7_2     
-        15        161 33101  26512 2L   S6_2     
-        15        162 33101  23540 2R   S5_3     
-        15        163 33101  30101 2L   S7_2     
-        15        164 33101  26534 2R   S6_2     
-        15        165 33101  30106 2L   S7_2     
-        15        166 33101  30164 2R   S7_2     
-        15        167 33101  30113 2L   S7_2     
-        15        168 33101  30173 2R   S7_2     
-        15        169 33101  30119 2L   S7_2     
-        15        170 33101  30179 2R   S7_2     
-        15        171 33101  30125 2L   S7_2     
-        15        172 33101  30185 2R   S7_2     
-        15        173 33101  30130 2L   S7_2     
-        15        174 33101  30190 2R   S7_2     
-        15        175 33101  30135 2L   S7_2     
-        15        176 33101  30198 2R   S7_2     
-        15        177 33101  30140 2L   S7_2     
-        15        178 33101  30204 2R   S7_2     
-        15        179 33101  30145 2L   S7_2     
-        15        180 33101  30209 2R   S7_2     
-        15        181 33101  28601 2L   P12      
-        15        182 33101  23550 2R   S5_3     
-        15        183 33101  30102 2L   S7_2     
-        15        184 33101  28605 2R   P12      
-        15        185 33101  30108 2L   S7_2     
-        15        186 33101  30165 2R   S7_2     
-        15        187 33101  30114 2L   S7_2     
-        15        188 33101  30175 2R   S7_2     
-        15        189 33101  30120 2L   S7_2     
-        15        190 33101  30181 2R   S7_2     
-        15        191 33101  30126 2L   S7_2     
-        15        192 33101  30186 2R   S7_2     
-        15        193 33101  30131 2L   S7_2     
-        15        194 33101  30193 2R   S7_2     
-        15        195 33101  30136 2L   S7_2     
-        15        196 33101  30199 2R   S7_2     
-        15        197 33101  30141 2L   S7_2     
-        15        198 33101  30205 2R   S7_2     
-        15        199 33101  30147 2L   S7_2     
-        15        200 33101  30210 2R   S7_2     
-        15        201 33101  29007 3L   P13      
-        15        202 33101  29072 3R   P13      
-        15        203 33101  29012 3L   P13      
-        15        204 33101  29079 3R   P13      
-        15        205 33101  29023 3L   P13      
-        15        206 33101  29089 3R   P13      
-        15        207 33101  29028 3L   P13      
-        15        208 33101  29096 3R   P13      
-        15        209 33101  29035 3L   P13      
-        15        210 33101  29101 3R   P13      
-        15        211 33101  29042 3L   P13      
-        15        212 33101  29108 3R   P13      
-        15        213 33101  29047 3L   P13      
-        15        214 33101  29114 3R   P13      
-        15        215 33101  29053 3L   P13      
-        15        216 33101  29120 3R   P13      
-        15        217 33101  29060 3L   P13      
-        15        218 33101  30228 3R   S7_2     
-        15        219 33101  30221 3L   S7_2     
-        15        220 33101  30234 3R   S7_2     
-        15        221 33101  29008 3L   P13      
-        15        222 33101  29073 3R   P13      
-        15        223 33101  29013 3L   P13      
-        15        224 33101  29084 3R   P13      
-        15        225 33101  29024 3L   P13      
-        15        226 33101  29091 3R   P13      
-        15        227 33101  29029 3L   P13      
-        15        228 33101  29097 3R   P13      
-        15        229 33101  29036 3L   P13      
-        15        230 33101  29102 3R   P13      
-        15        231 33101  29043 3L   P13      
-        15        232 33101  29109 3R   P13      
-        15        233 33101  29048 3L   P13      
-        15        234 33101  29116 3R   P13      
-        15        235 33101  29055 3L   P13      
-        15        236 33101  29121 3R   P13      
-        15        237 33101  29061 3L   P13      
-        15        238 33101  30230 3R   S7_2     
-        15        239 33101  30222 3L   S7_2     
-        15        240 33101  30235 3R   S7_2     
-        15        241 33101  29009 3L   P13      
-        15        242 33101  29075 3R   P13      
-        15        243 33101  29015 3L   P13      
-        15        244 33101  29085 3R   P13      
-        15        245 33101  29025 3L   P13      
-        15        246 33101  29092 3R   P13      
-        15        247 33101  29030 3L   P13      
-        15        248 33101  29107 3R   P13      
-        15        249 33101  29039 3L   P13      
-        15        250 33101  29103 3R   P13      
-        15        251 33101  29044 3L   P13      
-        15        252 33101  29110 3R   P13      
-        15        253 33101  29049 3L   P13      
-        15        254 33101  29117 3R   P13      
-        15        255 33101  29056 3L   P13      
-        15        256 33101  26587 3R   S6_2     
-        15        257 33101  29062 3L   P13      
-        15        258 33101  30231 3R   S7_2     
-        15        259 33101  30224 3L   S7_2     
-        15        260 33101  30817 3R   S7_3     
-        15        261 33101  29010 3L   P13      
-        15        262 33101  29076 3R   P13      
-        15        263 33101  29016 3L   P13      
-        15        264 33101  29087 3R   P13      
-        15        265 33101  29026 3L   P13      
-        15        266 33101  29093 3R   P13      
-        15        267 33101  29033 3L   P13      
-        15        268 33101  29099 3R   P13      
-        15        269 33101  29040 3L   P13      
-        15        270 33101  29105 3R   P13      
-        15        271 33101  29045 3L   P13      
-        15        272 33101  29111 3R   P13      
-        15        273 33101  29050 3L   P13      
-        15        274 33101  29118 3R   P13      
-        15        275 33101  29057 3L   P13      
-        15        276 33101  26627 3R   S6_2     
-        15        277 33101  29064 3L   P13      
-        15        278 33101  30232 3R   S7_2     
-        15        279 33101  30225 3L   S7_2     
-        15        280 33101  29115 3R   P13      
-        15        281 33101  29011 3L   P13      
-        15        282 33101  29078 3R   P13      
-        15        283 33101  29019 3L   P13      
-        15        284 33101  29088 3R   P13      
-        15        285 33101  29027 3L   P13      
-        15        286 33101  29095 3R   P13      
-        15        287 33101  29034 3L   P13      
-        15        288 33101  29100 3R   P13      
-        15        289 33101  29041 3L   P13      
-        15        290 33101  29106 3R   P13      
-        15        291 33101  29046 3L   P13      
-        15        292 33101  29112 3R   P13      
-        15        293 33101  29052 3L   P13      
-        15        294 33101  29119 3R   P13      
-        15        295 33101  29059 3L   P13      
-        15        296 33101  29080 3R   P13      
-        15        297 33101  29038 3L   P13      
-        15        298 33101  30233 3R   S7_2     
-        15        299 33101  30816 3L   S7_3     
-        15        300 33101  30229 3R   S7_2     
-        15        301 33101  29127 4L   P13      
-        15        302 33101  29172 4R   P13      
-        15        303 33101  29132 4L   P13      
-        15        304 33101  29177 4R   P13      
-        15        305 33101  29137 4L   P13      
-        15        306 33101  29183 4R   P13      
-        15        307 33101  29142 4L   P13      
-        15        308 33101  29189 4R   P13      
-        15        309 33101  29147 4L   P13      
-        15        310 33101  29194 4R   P13      
-        15        311 33101  29152 4L   P13      
-        15        312 33101  29199 4R   P13      
-        15        313 33101  29157 4L   P13      
-        15        314 33101  29209 4R   P13      
-        15        315 33101  22521 4L   S5       
-        15        316 33101  29204 4R   P13      
-        15        317 33101  30240 4L   S7_2     
-        15        318 33101  29214 4R   P13      
-        15        319 33101  30252 4L   S7_2     
-        15        320 33101  26716 4R   S6_2     
-        15        321 33101  29128 4L   P13      
-        15        322 33101  29173 4R   P13      
-        15        323 33101  29133 4L   P13      
-        15        324 33101  29178 4R   P13      
-        15        325 33101  29138 4L   P13      
-        15        326 33101  29184 4R   P13      
-        15        327 33101  29143 4L   P13      
-        15        328 33101  29190 4R   P13      
-        15        329 33101  29148 4L   P13      
-        15        330 33101  29195 4R   P13      
-        15        331 33101  29153 4L   P13      
-        15        332 33101  29200 4R   P13      
-        15        333 33101  29159 4L   P13      
-        15        334 33101  29210 4R   P13      
-        15        335 33101  26669 4L   S6_2     
-        15        336 33101  29205 4R   P13      
-        15        337 33101  30241 4L   S7_2     
-        15        338 33101  29215 4R   P13      
-        15        339 33101  30821 4L   S7_3     
-        15        340 33101  30257 4R   S7_2     
-        15        341 33101  29129 4L   P13      
-        15        342 33101  29174 4R   P13      
-        15        343 33101  29134 4L   P13      
-        15        344 33101  29180 4R   P13      
-        15        345 33101  29139 4L   P13      
-        15        346 33101  29185 4R   P13      
-        15        347 33101  29144 4L   P13      
-        15        348 33101  29191 4R   P13      
-        15        349 33101  29149 4L   P13      
-        15        350 33101  29196 4R   P13      
-        15        351 33101  29154 4L   P13      
-        15        352 33101  29201 4R   P13      
-        15        353 33101  29160 4L   P13      
-        15        354 33101  29211 4R   P13      
-        15        355 33101  30236 4L   S7_2     
-        15        356 33101  29206 4R   P13      
-        15        357 33101  30248 4L   S7_2     
-        15        358 33101  29216 4R   P13      
-        15        359 33101  30824 4L   S7_3     
-        15        360 33101  30258 4R   S7_2     
-        15        361 33101  29130 4L   P13      
-        15        362 33101  29175 4R   P13      
-        15        363 33101  29135 4L   P13      
-        15        364 33101  29181 4R   P13      
-        15        365 33101  29140 4L   P13      
-        15        366 33101  29186 4R   P13      
-        15        367 33101  29145 4L   P13      
-        15        368 33101  29192 4R   P13      
-        15        369 33101  29150 4L   P13      
-        15        370 33101  29197 4R   P13      
-        15        371 33101  29155 4L   P13      
-        15        372 33101  29202 4R   P13      
-        15        373 33101  29161 4L   P13      
-        15        374 33101  29212 4R   P13      
-        15        375 33101  30237 4L   S7_2     
-        15        376 33101  29207 4R   P13      
-        15        377 33101  30249 4L   S7_2     
-        15        378 33101  29217 4R   P13      
-        15        379 33101  30243 4L   S7_2     
-        15        380 33101  30259 4R   S7_2     
-        15        381 33101  29131 4L   P13      
-        15        382 33101  29176 4R   P13      
-        15        383 33101  29136 4L   P13      
-        15        384 33101  29182 4R   P13      
-        15        385 33101  29141 4L   P13      
-        15        386 33101  29188 4R   P13      
-        15        387 33101  29146 4L   P13      
-        15        388 33101  29193 4R   P13      
-        15        389 33101  29126 4L   P13      
-        15        390 33101  29198 4R   P13      
-        15        391 33101  29156 4L   P13      
-        15        392 33101  29203 4R   P13      
-        15        393 33101  29162 4L   P13      
-        15        394 33101  29213 4R   P13      
-        15        395 33101  30239 4L   S7_2     
-        15        396 33101  29208 4R   P13      
-        15        397 33101  30251 4L   S7_2     
-        15        398 33101  29218 4R   P13      
-        15        399 33101  30255 4L   S7_2     
-        15        400 33101  30260 4R   S7_2     
-        15        401 33101  29230 5L   P13      
-        15        402 33101  29269 5R   P13      
-        15        403 33101  29235 5L   P13      
-        15        404 33101  29275 5R   P13      
-        15        405 33101  29240 5L   P13      
-        15        406 33101  29280 5R   P13      
-        15        407 33101  29245 5L   P13      
-        15        408 33101  29285 5R   P13      
-        15        409 33101  29250 5L   P13      
-        15        410 33101  29290 5R   P13      
-        15        411 33101  30271 5L   S7_2     
-        15        412 33101  29296 5R   P13      
-        15        413 33101  30278 5L   S7_2     
-        15        414 33101  26808 5R   S6_2     
-        15        415 33101  30283 5L   S7_2     
-        15        416 33101  30307 5R   S7_2     
-        15        417 33101  30288 5L   S7_2     
-        15        418 33101  30312 5R   S7_2     
-        15        419 33101  30296 5L   S7_2     
-        15        420 33101  30320 5R   S7_2     
-        15        421 33101  29231 5L   P13      
-        15        422 33101  29270 5R   P13      
-        15        423 33101  29236 5L   P13      
-        15        424 33101  29276 5R   P13      
-        15        425 33101  29241 5L   P13      
-        15        426 33101  29281 5R   P13      
-        15        427 33101  29246 5L   P13      
-        15        428 33101  29286 5R   P13      
-        15        429 33101  29251 5L   P13      
-        15        430 33101  29291 5R   P13      
-        15        431 33101  30273 5L   S7_2     
-        15        432 33101  26806 5R   S6_2     
-        15        433 33101  30279 5L   S7_2     
-        15        434 33101  29268 5R   P13      
-        15        435 33101  30284 5L   S7_2     
-        15        436 33101  30308 5R   S7_2     
-        15        437 33101  30290 5L   S7_2     
-        15        438 33101  30314 5R   S7_2     
-        15        439 33101  30298 5L   S7_2     
-        15        440 33101  30322 5R   S7_2     
-        15        441 33101  29232 5L   P13      
-        15        442 33101  29272 5R   P13      
-        15        443 33101  29237 5L   P13      
-        15        444 33101  29277 5R   P13      
-        15        445 33101  29242 5L   P13      
-        15        446 33101  29282 5R   P13      
-        15        447 33101  29247 5L   P13      
-        15        448 33101  29287 5R   P13      
-        15        449 33101  30302 5L   S7_2     
-        15        450 33101  29293 5R   P13      
-        15        451 33101  30274 5L   S7_2     
-        15        452 33101  30317 5R   S7_2     
-        15        453 33101  30280 5L   S7_2     
-        15        454 33101  29292 5R   P13      
-        15        455 33101  30285 5L   S7_2     
-        15        456 33101  30309 5R   S7_2     
-        15        457 33101  30292 5L   S7_2     
-        15        458 33101  30315 5R   S7_2     
-        15        459 33101  30299 5L   S7_2     
-        15        460 33101  30327 5R   S7_2     
-        15        461 33101  29233 5L   P13      
-        15        462 33101  29273 5R   P13      
-        15        463 33101  29238 5L   P13      
-        15        464 33101  29278 5R   P13      
-        15        465 33101  29243 5L   P13      
-        15        466 33101  29283 5R   P13      
-        15        467 33101  29248 5L   P13      
-        15        468 33101  29288 5R   P13      
-        15        469 33101  30268 5L   S7_2     
-        15        470 33101  29294 5R   P13      
-        15        471 33101  30276 5L   S7_2     
-        15        472 33101  26776 5R   S6_2     
-        15        473 33101  30281 5L   S7_2     
-        15        474 33101  30305 5R   S7_2     
-        15        475 33101  30286 5L   S7_2     
-        15        476 33101  30310 5R   S7_2     
-        15        477 33101  30294 5L   S7_2     
-        15        478 33101  30316 5R   S7_2     
-        15        479 33101  30300 5L   S7_2     
-        15        480 33101  22630 5R   S5       
-        15        481 33101  29234 5L   P13      
-        15        482 33101  29274 5R   P13      
-        15        483 33101  29239 5L   P13      
-        15        484 33101  29279 5R   P13      
-        15        485 33101  29244 5L   P13      
-        15        486 33101  29284 5R   P13      
-        15        487 33101  29249 5L   P13      
-        15        488 33101  29289 5R   P13      
-        15        489 33101  30270 5L   S7_2     
-        15        490 33101  29295 5R   P13      
-        15        491 33101  30277 5L   S7_2     
-        15        492 33101  26788 5R   S6_2     
-        15        493 33101  30282 5L   S7_2     
-        15        494 33101  30306 5R   S7_2     
-        15        495 33101  30287 5L   S7_2     
-        15        496 33101  30311 5R   S7_2     
-        15        497 33101  30295 5L   S7_2     
-        15        498 33101  30319 5R   S7_2     
-        15        499 33101  30301 5L   S7_2     
-        15        500 33101  23846 5R   S5_3     
-        15        501 33101  27523 6L   S6_3a    
-        15        502 33101  27529 6R   S6_3a    
-        15        503 33101  28585 6L   S6_3b    
-        15        504 33101  28477 6R   S6_3b    
-        15        505 33101  28592 6L   S6_3b    
-        15        506 33101  27528 6R   S6_3a    
-        15        507 33101  28581 6L   S6_3b    
-        15        508 33101  27527 6R   S6_3a    
-        15        509 33101  27521 6L   S6_3a    
-        15        510 33101  27531 6R   S6_3a    
-        15        511 33101  28565 6L   S6_3b    
-        15        512 33101  27539 6R   S6_3a    
-        15        513 33101  28555 6L   S6_3b    
-        15        514 33101  27552 6R   S6_3a    
-        15        515 33101  21540 6L   P9       
-        15        516 33101  27556 6R   S6_3a    
-        15        517 33101  28560 6L   S6_3b    
-        15        518 33101  27561 6R   S6_3a    
-        15        519 33101   3205 6L   10       
-        15        520 33101  27569 6R   S6_3a    
-        15        521 33101  28575 6L   S6_3b    
-        15        522 33101  27533 6R   S6_3a    
-        15        523 33101  28587 6L   S6_3b    
-        15        524 33101  27534 6R   S6_3a    
-        15        525 33101  28593 6L   S6_3b    
-        15        526 33101  27548 6R   S6_3a    
-        15        527 33101  28582 6L   S6_3b    
-        15        528 33101  27530 6R   S6_3a    
-        15        529 33101  27522 6L   S6_3a    
-        15        530 33101  27532 6R   S6_3a    
-        15        531 33101  28567 6L   S6_3b    
-        15        532 33101  27542 6R   S6_3a    
-        15        533 33101  28556 6L   S6_3b    
-        15        534 33101  27554 6R   S6_3a    
-        15        535 33101  26126 6L   S6_1     
-        15        536 33101  27557 6R   S6_3a    
-        15        537 33101  28561 6L   S6_3b    
-        15        538 33101  27562 6R   S6_3a    
-        15        539 33101   3208 6L   10       
-        15        540 33101  27570 6R   S6_3a    
-        15        541 33101  28579 6L   S6_3b    
-        15        542 33101  27547 6R   S6_3a    
-        15        543 33101  28588 6L   S6_3b    
-        15        544 33101  27537 6R   S6_3a    
-        15        545 33101  28597 6L   P13      
-        15        546 33101  27550 6R   S6_3a    
-        15        547 33101  28583 6L   S6_3b    
-        15        548 33101  28483 6R   S6_3b    
-        15        549 33101  28576 6L   S6_3b    
-        15        550 33101  27535 6R   S6_3a    
-        15        551 33101  28568 6L   S6_3b    
-        15        552 33101  27544 6R   S6_3a    
-        15        553 33101  28557 6L   S6_3b    
-        15        554 33101  27555 6R   S6_3a    
-        15        555 33101  26128 6L   S6_1     
-        15        556 33101  27558 6R   S6_3a    
-        15        557 33101  28562 6L   S6_3b    
-        15        558 33101  27563 6R   S6_3a    
-        15        559 33101   3217 6L   10       
-        15        560 33101  28479 6R   S6_3b    
-        15        561 33101  28591 6L   S6_3b    
-        15        562 33101  27568 6R   S6_3a    
-        15        563 33101  28589 6L   S6_3b    
-        15        564 33101  27540 6R   S6_3a    
-        15        565 33101  28598 6L   P13      
-        15        566 33101  28482 6R   S6_3b    
-        15        567 33101  28572 6L   S6_3b    
-        15        568 33101  28485 6R   S6_3b    
-        15        569 33101  28577 6L   S6_3b    
-        15        570 33101  27536 6R   S6_3a    
-        15        571 33101  28569 6L   S6_3b    
-        15        572 33101  27545 6R   S6_3a    
-        15        573 33101  28558 6L   S6_3b    
-        15        574 33101  28870 6R   P12      
-        15        575 33101  26143 6L   S6_1     
-        15        576 33101  27559 6R   S6_3a    
-        15        577 33101  28563 6L   S6_3b    
-        15        578 33101  27564 6R   S6_3a    
-        15        579 33101   3221 6L   10       
-        15        580 33101  28480 6R   S6_3b    
-        15        581 33101  28595 6L   S6_3b    
-        15        582 33101  28487 6R   S6_3b    
-        15        583 33101  28590 6L   S6_3b    
-        15        584 33101  27541 6R   S6_3a    
-        15        585 33101  28599 6L   P13      
-        15        586 33101  28484 6R   S6_3b    
-        15        587 33101  28573 6L   S6_3b    
-        15        588 33101  28486 6R   S6_3b    
-        15        589 33101  28578 6L   S6_3b    
-        15        590 33101  27538 6R   S6_3a    
-        15        591 33101  28571 6L   S6_3b    
-        15        592 33101  27567 6R   S6_3a    
-        15        593 33101  28559 6L   S6_3b    
-        15        594 33101   3127 6R   10       
-        15        595 33101  27525 6L   S6_3a    
-        15        596 33101  27560 6R   S6_3a    
-        15        597 33101  28564 6L   S6_3b    
-        15        598 33101  27565 6R   S6_3a    
-        15        599 33101   3224 6L   10       
-        15        600 33101  28481 6R   S6_3b    
-        15        601 33101  28501 7L   S6_3b    
-        15        602 33101  28531 7R   S6_3b    
-        15        603 33101  28491 7L   S6_3b    
-        15        604 33101  28543 7R   S6_3b    
-        15        605 33101  28508 7L   S6_3b    
-        15        606 33101  26850 7R   S6_2     
-        15        607 33101  28521 7L   P13      
-        15        608 33101  28547 7R   S6_3b    
-        15        609 33101  30397 7L   S7_2     
-        15        610 33101  28525 7R   S6_3b    
-        15        611 33101  28515 7L   S6_3b    
-        15        612 33101  30382 7R   S7_2     
-        15        613 33101  30402 7L   S7_2     
-        15        614 33101  28540 7R   S6_3b    
-        15        615 33101  28511 7L   S6_3b    
-        15        616 33101  28533 7R   S6_3b    
-        15        617 33101  23153 7L   S5-2     
-        15        618 33101  26851 7R   S6_2     
-        15        619 33101    238 7L   3        
-        15        620 33101  26223 7R   S6_1     
-        15        621 33101  28502 7L   S6_3b    
-        15        622 33101  28532 7R   S6_3b    
-        15        623 33101  28492 7L   S6_3b    
-        15        624 33101  28544 7R   S6_3b    
-        15        625 33101  28497 7L   S6_3b    
-        15        626 33101  26202 7R   S6_1     
-        15        627 33101  28522 7L   P13      
-        15        628 33101  30388 7R   S7_2     
-        15        629 33101  30393 7L   S7_2     
-        15        630 33101  28526 7R   S6_3b    
-        15        631 33101  28517 7L   S6_3b    
-        15        632 33101  27232 7R   S6_2b    
-        15        633 33101  30403 7L   S7_2     
-        15        634 33101  28542 7R   S6_3b    
-        15        635 33101  28512 7L   S6_3b    
-        15        636 33101  28534 7R   S6_3b    
-        15        637 33101  25664 7L   P10      
-        15        638 33101  26207 7R   S6_1     
-        15        639 33101  26178 7L   S6_1     
-        15        640 33101  26225 7R   S6_1     
-        15        641 33101  28503 7L   S6_3b    
-        15        642 33101  28541 7R   S6_3b    
-        15        643 33101  28493 7L   S6_3b    
-        15        644 33101  28545 7R   S6_3b    
-        15        645 33101  28498 7L   S6_3b    
-        15        646 33101  11362 7R   S1       
-        15        647 33101  23139 7L   S5       
-        15        648 33101  30389 7R   S7_2     
-        15        649 33101  30394 7L   S7_2     
-        15        650 33101  28529 7R   S6_3b    
-        15        651 33101  28518 7L   S6_3b    
-        15        652 33101  27233 7R   S6_2b    
-        15        653 33101  30404 7L   S7_2     
-        15        654 33101  28548 7R   S6_3b    
-        15        655 33101  28513 7L   S6_3b    
-        15        656 33101  28535 7R   S6_3b    
-        15        657 33101  26848 7L   S6_2     
-        15        658 33101  26211 7R   S6_1     
-        15        659 33101  26189 7L   S6_1     
-        15        660 33101  26229 7R   S6_1     
-        15        661 33101  28504 7L   S6_3b    
-        15        662 33101  28549 7R   P13      
-        15        663 33101  28494 7L   S6_3b    
-        15        664 33101  28527 7R   S6_3b    
-        15        665 33101  28499 7L   S6_3b    
-        15        666 33101  26230 7R   S6_1     
-        15        667 33101  26196 7L   S6_1     
-        15        668 33101  30390 7R   S7_2     
-        15        669 33101  30395 7L   S7_2     
-        15        670 33101  28530 7R   S6_3b    
-        15        671 33101  28519 7L   P13      
-        15        672 33101  27234 7R   S6_2b    
-        15        673 33101  30405 7L   S7_2     
-        15        674 33101  28551 7R   P13      
-        15        675 33101  28514 7L   S6_3b    
-        15        676 33101  28536 7R   S6_3b    
-        15        677 33101  26849 7L   S6_2     
-        15        678 33101  26228 7R   S6_1     
-        15        679 33101  26191 7L   S6_1     
-        15        680 33101  26233 7R   S6_1     
-        15        681 33101  28505 7L   S6_3b    
-        15        682 33101  27231 7R   S6_2b    
-        15        683 33101  28507 7L   S6_3b    
-        15        684 33101  30387 7R   S7_2     
-        15        685 33101  28500 7L   S6_3b    
-        15        686 33101   3337 7R   10       
-        15        687 33101  26847 7L   S6_2     
-        15        688 33101  30391 7R   S7_2     
-        15        689 33101  30396 7L   S7_2     
-        15        690 33101  28538 7R   S6_3b    
-        15        691 33101  28520 7L   P13      
-        15        692 33101  27571 7R   S6_3a    
-        15        693 33101  30399 7L   S7_2     
-        15        694 33101  30384 7R   S7_2     
-        15        695 33101  28516 7L   S6_3b    
-        15        696 33101  28537 7R   S6_3b    
-        15        697 33101  28872 7L   P12      
-        15        698 33101   3333 7R   10       
-        15        699 33101  28871 7L   P12      
-        15        700 33101  26235 7R   S6_1     
-        15        701 33101  30412 8L   S7_2     
-        15        702 33101  30463 8R   S7_2     
-        15        703 33101  30447 8L   S7_2     
-        15        704 33101   3517 8R   11       
-        15        705 33101  30411 8L   S7_2     
-        15        706 33101  30469 8R   S7_2     
-        15        707 33101  30440 8L   S7_2     
-        15        708 33101  26309 8R   S6_1     
-        15        709 33101  30448 8L   S7_2     
-        15        710 33101  27243 8R   S6_2b    
-        15        711 33101   3623 8L   11       
-        15        712 33101  26295 8R   S06_1    
-        15        713 33101  30446 8L   S7_2     
-        15        714 33101  27240 8R   S6_2b    
-        15        715 33101  30441 8L   S7_2     
-        15        716 33101  30458 8R   S7_2     
-        15        717 33101  30413 8L   S7_2     
-        15        718 33101  27235 8R   S6_2b    
-        15        719 33101  30425 8L   S7_2     
-        15        720 33101  30478 8R   S7_2     
-        15        721 33101  30417 8L   S7_2     
-        15        722 33101  30464 8R   S7_2     
-        15        723 33101  30449 8L   S7_2     
-        15        724 33101  11549 8R   S1       
-        15        725 33101  30415 8L   S7_2     
-        15        726 33101  30471 8R   S7_2     
-        15        727 33101   3654 8L   11       
-        15        728 33101  28721 8R   P12      
-        15        729 33101  30456 8L   S7_2     
-        15        730 33101  25050 8R   P10_1    
-        15        731 33101   3624 8L   11       
-        15        732 33101  26311 8R   S6_1     
-        15        733 33101  30452 8L   S7_2     
-        15        734 33101  27242 8R   S6_2b    
-        15        735 33101  30442 8L   S7_2     
-        15        736 33101  30459 8R   S7_2     
-        15        737 33101  30414 8L   S7_2     
-        15        738 33101  27236 8R   S6_2b    
-        15        739 33101  30428 8L   S7_2     
-        15        740 33101  30479 8R   S7_2     
-        15        741 33101  30423 8L   S7_2     
-        15        742 33101  30473 8R   S7_2     
-        15        743 33101  30450 8L   S7_2     
-        15        744 33101  11588 8R   S1       
-        15        745 33101  30419 8L   S7_2     
-        15        746 33101  30475 8R   S7_2     
-        15        747 33101   9696 8L   P6       
-        15        748 33101  30483 8R   S7_2     
-        15        749 33101  11620 8L   S01      
-        15        750 33101  30466 8R   S7_2     
-        15        751 33101   3627 8L   11       
-        15        752 33101  28720 8R   P12      
-        15        753 33101  30453 8L   S7_2     
-        15        754 33101  30465 8R   S7_2     
-        15        755 33101  30443 8L   S7_2     
-        15        756 33101  30460 8R   S7_2     
-        15        757 33101  30416 8L   S7_2     
-        15        758 33101  27237 8R   S6_2b    
-        15        759 33101  30430 8L   S7_2     
-        15        760 33101  30480 8R   S7_2     
-        15        761 33101  30439 8L   S7_2     
-        15        762 33101  30482 8R   S7_2     
-        15        763 33101  30451 8L   S7_2     
-        15        764 33101  26306 8R   S6_1     
-        15        765 33101  30420 8L   S7_2     
-        15        766 33101  30476 8R   S7_2     
-        15        767 33101  26274 8L   S6_1     
-        15        768 33101  30486 8R   S7_2     
-        15        769 33101  11659 8L   S01      
-        15        770 33101  30467 8R   S7_2     
-        15        771 33101   3637 8L   11       
-        15        772 33101  30484 8R   S7_2     
-        15        773 33101  30454 8L   S7_2     
-        15        774 33101  30470 8R   S7_2     
-        15        775 33101  30444 8L   S7_2     
-        15        776 33101  30461 8R   S7_2     
-        15        777 33101  30418 8L   S7_2     
-        15        778 33101  27238 8R   S6_2b    
-        15        779 33101  30432 8L   S7_2     
-        15        780 33101  30481 8R   S7_2     
-        15        781 33101  30438 8L   S7_2     
-        15        782 33101  30489 8R   S7_2     
-        15        783 33101  30457 8L   S7_2     
-        15        784 33101  28878 8R   P12      
-        15        785 33101  30421 8L   S7_2     
-        15        786 33101  30477 8R   S7_2     
-        15        787 33101  26852 8L   S6_2     
-        15        788 33101  30488 8R   S7_2     
-        15        789 33101  11694 8L   S1       
-        15        790 33101  30468 8R   S7_2     
-        15        791 33101   3649 8L   11       
-        15        792 33101  30485 8R   S7_2     
-        15        793 33101  30455 8L   S7_2     
-        15        794 33101  30474 8R   S7_2     
-        15        795 33101  30435 8L   S7_2     
-        15        796 33101  30462 8R   S7_2     
-        15        797 33101  30422 8L   S7_2     
-        15        798 33101  27239 8R   S6_2b    
-        15        799 33101  30433 8L   S7_2     
-        15        800 33101  30490 8R   S7_2     
-        15        801 33101  27244 9L   S6_2b    
-        15        802 33101   3711 9R   11       
-        15        803 33101  30528 9L   S7_2     
-        15        804 33101  27251 9R   S6_2b    
-        15        805 33101  30496 9L   S7_2     
-        15        806 33101  30573 9R   S7_2     
-        15        807 33101  30532 9L   S7_2     
-        15        808 33101  30572 9R   S7_2     
-        15        809 33101  30493 9L   S7_2     
-        15        810 33101  30578 9R   S7_2     
-        15        811 33101  30517 9L   S7_2     
-        15        812 33101  30548 9R   S7_2     
-        15        813 33101  30494 9L   S7_2     
-        15        814 33101  30566 9R   S7_2     
-        15        815 33101  30503 9L   S7_2     
-        15        816 33101  30559 9R   S7_2     
-        15        817 33101  30508 9L   S7_2     
-        15        818 33101  30543 9R   S7_2     
-        15        819 33101   1681 9L   6        
-        15        820 33101   3758 9R   11       
-        15        821 33101  27245 9L   S6_2b    
-        15        822 33101   3714 9R   11       
-        15        823 33101  30529 9L   S7_2     
-        15        824 33101  27252 9R   S6_2b    
-        15        825 33101  30506 9L   S7_2     
-        15        826 33101  30574 9R   S7_2     
-        15        827 33101  30533 9L   S7_2     
-        15        828 33101  27247 9R   S6_2b    
-        15        829 33101  30498 9L   S7_2     
-        15        830 33101  30579 9R   S7_2     
-        15        831 33101  30518 9L   S7_2     
-        15        832 33101  30549 9R   S7_2     
-        15        833 33101  30495 9L   S7_2     
-        15        834 33101  30567 9R   S7_2     
-        15        835 33101  30504 9L   S7_2     
-        15        836 33101  30560 9R   S7_2     
-        15        837 33101  30509 9L   S7_2     
-        15        838 33101  30544 9R   S7_2     
-        15        839 33101   1686 9L   6        
-        15        840 33101   3762 9R   11       
-        15        841 33101  28553 9L   P13      
-        15        842 33101  25225 9R   P10      
-        15        843 33101  30530 9L   S7_2     
-        15        844 33101  30563 9R   S7_2     
-        15        845 33101  30523 9L   S7_2     
-        15        846 33101  30575 9R   S7_2     
-        15        847 33101  30535 9L   S7_2     
-        15        848 33101  27248 9R   S6_2b    
-        15        849 33101  30499 9L   S7_2     
-        15        850 33101  30580 9R   S7_2     
-        15        851 33101  30521 9L   S7_2     
-        15        852 33101  30550 9R   S7_2     
-        15        853 33101  30500 9L   S7_2     
-        15        854 33101  30568 9R   S7_2     
-        15        855 33101  30505 9L   S7_2     
-        15        856 33101  30561 9R   S7_2     
-        15        857 33101  30510 9L   S7_2     
-        15        858 33101  30546 9R   S7_2     
-        15        859 33101   3834 9L   11       
-        15        860 33101  26380 9R   S6_1     
-        15        861 33101  30519 9L   S7_2     
-        15        862 33101  26375 9R   S6_1     
-        15        863 33101  30541 9L   S7_2     
-        15        864 33101  30565 9R   S7_2     
-        15        865 33101  30524 9L   S7_2     
-        15        866 33101  30576 9R   S7_2     
-        15        867 33101  30536 9L   S7_2     
-        15        868 33101  27249 9R   S6_2b    
-        15        869 33101  30507 9L   S7_2     
-        15        870 33101  30581 9R   S7_2     
-        15        871 33101  30522 9L   S7_2     
-        15        872 33101  30551 9R   S7_2     
-        15        873 33101  30502 9L   S7_2     
-        15        874 33101  30570 9R   S7_2     
-        15        875 33101  30513 9L   S7_2     
-        15        876 33101  30562 9R   S7_2     
-        15        877 33101  30511 9L   S7_2     
-        15        878 33101  30554 9R   S7_2     
-        15        879 33101   3825 9L   11       
-        15        880 33101  26383 9R   S6_1     
-        15        881 33101  30531 9L   S7_2     
-        15        882 33101  30569 9R   S7_2     
-        15        883 33101  30542 9L   S7_2     
-        15        884 33101  30582 9R   S7_2     
-        15        885 33101  30527 9L   S7_2     
-        15        886 33101  30577 9R   S7_2     
-        15        887 33101  30537 9L   S7_2     
-        15        888 33101  27250 9R   S6_2b    
-        15        889 33101  30515 9L   S7_2     
-        15        890 33101  30547 9R   S7_2     
-        15        891 33101  30526 9L   S7_2     
-        15        892 33101  30552 9R   S7_2     
-        15        893 33101  30516 9L   S7_2     
-        15        894 33101  27246 9R   S6_2b    
-        15        895 33101  30514 9L   S7_2     
-        15        896 33101  30564 9R   S7_2     
-        15        897 33101  30520 9L   S7_2     
-        15        898 33101  30557 9R   S7_2     
-        15        899 33101   3830 9L   11       
-        15        900 33101  28883 9R   P12      
-        15        901 33101  28885 10L  P12      
-        15        902 33101  28476 10R  S6_3b    
-        15        903 33101  28462 10L  P13      
-        15        904 33101  27616 10R  S6_3a    
-        15        905 33101  27607 10L  S6_3a    
-        15        906 33101  26921 10R  S6_2     
-        15        907 33101  26408 10L  S6       
-        15        908 33101  27631 10R  S6_3a    
-        15        909 33101  27593 10L  S6_3a    
-        15        910 33101  28472 10R  P13      
-        15        911 33101  27595 10L  S6_3a    
-        15        912 33101  27625 10R  S6_3a    
-        15        913 33101  27572 10L  S6_3a    
-        15        914 33101  27618 10R  S6_3a    
-        15        915 33101  27587 10L  S6_3a    
-        15        916 33101  26903 10R  S6_2     
-        15        917 33101  27594 10L  S6_3a    
-        15        918 33101  26497 10R  S6       
-        15        919 33101  14402 10L  S2       
-        15        920 33101  28886 10R  P12      
-        15        921 33101  27602 10L  S6_3a    
-        15        922 33101  27612 10R  S6_3a    
-        15        923 33101  28463 10L  P13      
-        15        924 33101  27617 10R  S6_3a    
-        15        925 33101  27608 10L  S6_3a    
-        15        926 33101  26905 10R  S6_2     
-        15        927 33101  26438 10L  S6_1     
-        15        928 33101  27632 10R  S6_3a    
-        15        929 33101  27582 10L  S6_3a    
-        15        930 33101  28475 10R  S6_3b    
-        15        931 33101  27597 10L  S6_3a    
-        15        932 33101  27626 10R  S6_3a    
-        15        933 33101  27573 10L  S6_3a    
-        15        934 33101  27619 10R  S6_3a    
-        15        935 33101  27588 10L  S6_3a    
-        15        936 33101  26917 10R  S6_2     
-        15        937 33101  27578 10L  S6_3a    
-        15        938 33101  26927 10R  S6_2     
-        15        939 33101  26892 10L  S6_2     
-        15        940 33101  25884 10R  S6_1     
-        15        941 33101  27603 10L  S6_3a    
-        15        942 33101  27613 10R  S6_3a    
-        15        943 33101  28464 10L  P13      
-        15        944 33101  27621 10R  S6_3a    
-        15        945 33101  27609 10L  S6_3a    
-        15        946 33101  28473 10R  P13      
-        15        947 33101  26871 10L  S6_2     
-        15        948 33101  27633 10R  S6_3a    
-        15        949 33101  27584 10L  S6_3a    
-        15        950 33101  26911 10R  S6_2     
-        15        951 33101  27598 10L  S6_3a    
-        15        952 33101  27627 10R  S6_3a    
-        15        953 33101  27574 10L  S6_3a    
-        15        954 33101  27620 10R  S6_3a    
-        15        955 33101  27589 10L  S6_3a    
-        15        956 33101  26919 10R  S6_2     
-        15        957 33101  27579 10L  S6_3a    
-        15        958 33101  26929 10R  S6_2     
-        15        959 33101  26894 10L  S6_2     
-        15        960 33101  26488 10R  S6_1     
-        15        961 33101  27583 10L  S6_3a    
-        15        962 33101  27614 10R  S6_3a    
-        15        963 33101  28465 10L  P13      
-        15        964 33101  27623 10R  S6_3a    
-        15        965 33101  28461 10L  P13      
-        15        966 33101  28474 10R  P13      
-        15        967 33101  27604 10L  S6_3a    
-        15        968 33101  27634 10R  S6_3a    
-        15        969 33101  27585 10L  S6_3a    
-        15        970 33101  26914 10R  S6_2     
-        15        971 33101  27600 10L  S6_3a    
-        15        972 33101  27628 10R  S6_3a    
-        15        973 33101  27575 10L  S6_3a    
-        15        974 33101  27622 10R  S6_3a    
-        15        975 33101  27590 10L  S6_3a    
-        15        976 33101  26920 10R  S6_2     
-        15        977 33101  27580 10L  S6_3a    
-        15        978 33101  26931 10R  S6_2     
-        15        979 33101  27256 10L  S6_2b    
-        15        980 33101  26494 10R  S6_1     
-        15        981 33101  27592 10L  S6_3a    
-        15        982 33101  27615 10R  S6_3a    
-        15        983 33101  28466 10L  P13      
-        15        984 33101  27630 10R  S6_3a    
-        15        985 33101  28469 10L  S6_3b    
-        15        986 33101  27611 10R  S6_3a    
-        15        987 33101  27605 10L  S6_3a    
-        15        988 33101  27635 10R  S6_3a    
-        15        989 33101  27586 10L  S6_3a    
-        15        990 33101  27277 10R  S6_2b    
-        15        991 33101  27601 10L  S6_3a    
-        15        992 33101  27629 10R  S6_3a    
-        15        993 33101  27576 10L  S6_3a    
-        15        994 33101  27624 10R  S6_3a    
-        15        995 33101  27591 10L  S6_3a    
-        15        996 33101  26923 10R  S6_2     
-        15        997 33101  27581 10L  S6_3a    
-        15        998 33101  27279 10R  S6_2b    
-        15        999 33101  26886 10L  S6_2     
-        15       1000 33101  28722 10R  P12      
-        15       1001 33101  27682 11L  S6_3a    
-        15       1002 33101  27728 11R  S6_3a    
-        15       1003 33101  27653 11L  S6_3a    
-        15       1004 33101  27742 11R  S6_3a    
-        15       1005 33101  27664 11L  S6_3a    
-        15       1006 33101  27707 11R  S6_3a    
-        15       1007 33101  27689 11L  S6_3a    
-        15       1008 33101  27737 11R  S6_3a    
-        15       1009 33101  27679 11L  S6_3a    
-        15       1010 33101  27706 11R  S6_3a    
-        15       1011 33101  27669 11L  S6_3a    
-        15       1012 33101  27346 11R  S6_2b    
-        15       1013 33101  27677 11L  S6_3a    
-        15       1014 33101  27697 11R  S6_3a    
-        15       1015 33101  27654 11L  S6_3a    
-        15       1016 33101  27719 11R  S6_3a    
-        15       1017 33101  27649 11L  S6_3a    
-        15       1018 33101  27712 11R  S6_3a    
-        15       1019 33101  25888 11L  P10_2    
-        15       1020 33101  27721 11R  S6_3a    
-        15       1021 33101  27685 11L  S6_3a    
-        15       1022 33101  27729 11R  S6_3a    
-        15       1023 33101  27641 11L  S6_3a    
-        15       1024 33101  27743 11R  S6_3a    
-        15       1025 33101  27665 11L  S6_3a    
-        15       1026 33101  27708 11R  S6_3a    
-        15       1027 33101  27690 11L  S6_3a    
-        15       1028 33101  27739 11R  S6_3a    
-        15       1029 33101  27683 11L  S6_3a    
-        15       1030 33101  27693 11R  S6_3a    
-        15       1031 33101  27670 11L  S6_3a    
-        15       1032 33101  27692 11R  S6_3a    
-        15       1033 33101  27678 11L  S6_3a    
-        15       1034 33101  27698 11R  S6_3a    
-        15       1035 33101  27656 11L  S6_3a    
-        15       1036 33101  27720 11R  S6_3a    
-        15       1037 33101  27650 11L  S6_3a    
-        15       1038 33101  27714 11R  S6_3a    
-        15       1039 33101  27645 11L  S6_3a    
-        15       1040 33101  27311 11R  S6_2b    
-        15       1041 33101  27688 11L  S6_3a    
-        15       1042 33101  27734 11R  S6_3a    
-        15       1043 33101  27642 11L  S6_3a    
-        15       1044 33101  27744 11R  S6_3a    
-        15       1045 33101  27666 11L  S6_3a    
-        15       1046 33101  27709 11R  S6_3a    
-        15       1047 33101  27691 11L  S6_3a    
-        15       1048 33101  27741 11R  S6_3a    
-        15       1049 33101  27684 11L  S6_3a    
-        15       1050 33101  27694 11R  S6_3a    
-        15       1051 33101  27671 11L  S6_3a    
-        15       1052 33101  27713 11R  S6_3a    
-        15       1053 33101  29378 11L  P13      
-        15       1054 33101  27699 11R  S6_3a    
-        15       1055 33101  27657 11L  S6_3a    
-        15       1056 33101  27722 11R  S6_3a    
-        15       1057 33101  27651 11L  S6_3a    
-        15       1058 33101  27715 11R  S6_3a    
-        15       1059 33101  27646 11L  S6_3a    
-        15       1060 33101  27316 11R  S6_2b    
-        15       1061 33101  27675 11L  S6_3a    
-        15       1062 33101  27735 11R  S6_3a    
-        15       1063 33101  27643 11L  S6_3a    
-        15       1064 33101  29385 11R  P13      
-        15       1065 33101  27667 11L  S6_3a    
-        15       1066 33101  27710 11R  S6_3a    
-        15       1067 33101  29374 11L  P13      
-        15       1068 33101  27705 11R  S6_3a    
-        15       1069 33101  27686 11L  S6_3a    
-        15       1070 33101  27695 11R  S6_3a    
-        15       1071 33101  27672 11L  S6_3a    
-        15       1072 33101  27724 11R  S6_3a    
-        15       1073 33101  29379 11L  P13      
-        15       1074 33101  27700 11R  S6_3a    
-        15       1075 33101  27658 11L  S6_3a    
-        15       1076 33101  27723 11R  S6_3a    
-        15       1077 33101  27652 11L  S6_3a    
-        15       1078 33101  27717 11R  S6_3a    
-        15       1079 33101  27647 11L  S6_3a    
-        15       1080 33101  27325 11R  S6_2b    
-        15       1081 33101  27676 11L  S6_3a    
-        15       1082 33101  27704 11R  S6_3a    
-        15       1083 33101  28725 11L  P12      
-        15       1084 33101  29387 11R  P13      
-        15       1085 33101  27674 11L  S6_3a    
-        15       1086 33101  27727 11R  S6_3a    
-        15       1087 33101  29375 11L  P13      
-        15       1088 33101  28766 11R  P12      
-        15       1089 33101  27687 11L  S6_3a    
-        15       1090 33101  27696 11R  S6_3a    
-        15       1091 33101  27673 11L  S6_3a    
-        15       1092 33101  27725 11R  S6_3a    
-        15       1093 33101  29380 11L  P13      
-        15       1094 33101  27701 11R  S6_3a    
-        15       1095 33101  27660 11L  S6_3a    
-        15       1096 33101  27726 11R  S6_3a    
-        15       1097 33101  27663 11L  S6_3a    
-        15       1098 33101  27718 11R  S6_3a    
-        15       1099 33101  27648 11L  S6_3a    
-        15       1100 33101  28746 11R  P12      
-        15       1101 33101  27751 12L  S6_3a    
-        15       1102 33101  27845 12R  S6_3a    
-        15       1103 33101  29388 12L  S6_3b    
-        15       1104 33101  27817 12R  S6_3a    
-        15       1105 33101  27749 12L  S6_3a    
-        15       1106 33101  27834 12R  S6_3a    
-        15       1107 33101  27791 12L  S6_3a    
-        15       1108 33101  27802 12R  S6_3a    
-        15       1109 33101  27748 12L  S6_3a    
-        15       1110 33101  27807 12R  S6_3a    
-        15       1111 33101  27764 12L  S6_3a    
-        15       1112 33101  27818 12R  S6_3a    
-        15       1113 33101  27763 12L  S6_3a    
-        15       1114 33101  27815 12R  S6_3a    
-        15       1115 33101  27758 12L  S6_3a    
-        15       1116 33101  27816 12R  S6_3a    
-        15       1117 33101  27745 12L  S6_3a    
-        15       1118 33101  27399 12R  S6_2b    
-        15       1119 33101  27795 12L  S6_3a    
-        15       1120 33101  27394 12R  S6_2b    
-        15       1121 33101  27779 12L  S6_3a    
-        15       1122 33101  27846 12R  S6_3a    
-        15       1123 33101  29390 12L  P13      
-        15       1124 33101  27820 12R  S6_3a    
-        15       1125 33101  27756 12L  S6_3a    
-        15       1126 33101  27835 12R  S6_3a    
-        15       1127 33101  27781 12L  S6_3a    
-        15       1128 33101  27822 12R  S6_3a    
-        15       1129 33101  27760 12L  S6_3a    
-        15       1130 33101  27808 12R  S6_3a    
-        15       1131 33101  27766 12L  S6_3a    
-        15       1132 33101  27819 12R  S6_3a    
-        15       1133 33101  27773 12L  S6_3a    
-        15       1134 33101  27798 12R  S6_3a    
-        15       1135 33101  27759 12L  S6_3a    
-        15       1136 33101  27803 12R  S6_3a    
-        15       1137 33101  27750 12L  S6_3a    
-        15       1138 33101  27403 12R  S6_2b    
-        15       1139 33101  27796 12L  S6_3a    
-        15       1140 33101  27396 12R  S6_2b    
-        15       1141 33101  27790 12L  S6_3a    
-        15       1142 33101  27814 12R  S6_3a    
-        15       1143 33101  29391 12L  P13      
-        15       1144 33101  27821 12R  S6_3a    
-        15       1145 33101  27757 12L  S6_3a    
-        15       1146 33101  27838 12R  S6_3a    
-        15       1147 33101  27782 12L  S6_3a    
-        15       1148 33101  27824 12R  S6_3a    
-        15       1149 33101  27785 12L  S6_3a    
-        15       1150 33101  27809 12R  S6_3a    
-        15       1151 33101  27767 12L  S6_3a    
-        15       1152 33101  27828 12R  S6_3a    
-        15       1153 33101  27776 12L  S6_3a    
-        15       1154 33101  27799 12R  S6_3a    
-        15       1155 33101  27761 12L  S6_3a    
-        15       1156 33101  27804 12R  S6_3a    
-        15       1157 33101  27752 12L  S6_3a    
-        15       1158 33101  27406 12R  S6_2b    
-        15       1159 33101  27349 12L  S6_2b    
-        15       1160 33101  27397 12R  S6_2b    
-        15       1161 33101  28783 12L  P12      
-        15       1162 33101  27422 12R  S6_2b    
-        15       1163 33101  29395 12L  P13      
-        15       1164 33101  27827 12R  S6_3a    
-        15       1165 33101  27762 12L  S6_3a    
-        15       1166 33101  27839 12R  S6_3a    
-        15       1167 33101  27783 12L  S6_3a    
-        15       1168 33101  27825 12R  S6_3a    
-        15       1169 33101  27788 12L  S6_3a    
-        15       1170 33101  27810 12R  S6_3a    
-        15       1171 33101  27768 12L  S6_3a    
-        15       1172 33101  27829 12R  S6_3a    
-        15       1173 33101  27777 12L  S6_3a    
-        15       1174 33101  27800 12R  S6_3a    
-        15       1175 33101  27771 12L  S6_3a    
-        15       1176 33101  27805 12R  S6_3a    
-        15       1177 33101  27753 12L  S6_3a    
-        15       1178 33101  27407 12R  S6_2b    
-        15       1179 33101  27376 12L  S6_2b    
-        15       1180 33101  27398 12R  S6_2b    
-        15       1181 33101  28938 12L  P12      
-        15       1182 33101  27797 12R  S6_3a    
-        15       1183 33101  14971 12L  S2       
-        15       1184 33101  27831 12R  S6_3a    
-        15       1185 33101  27793 12L  S6_3a    
-        15       1186 33101  27841 12R  S6_3a    
-        15       1187 33101  27794 12L  S6_3a    
-        15       1188 33101  27826 12R  S6_3a    
-        15       1189 33101  27789 12L  S6_3a    
-        15       1190 33101  27811 12R  S6_3a    
-        15       1191 33101  27769 12L  S6_3a    
-        15       1192 33101  27830 12R  S6_3a    
-        15       1193 33101  27778 12L  S6_3a    
-        15       1194 33101  27801 12R  S6_3a    
-        15       1195 33101  27772 12L  S6_3a    
-        15       1196 33101  27806 12R  S6_3a    
-        15       1197 33101  27755 12L  S6_3a    
-        15       1198 33101  27409 12R  S6_2b    
-        15       1199 33101  27374 12L  S6_2b    
-        15       1200 33101  27400 12R  S6_2b    
-        15       1201 33101  29346 13L  S6_3b    
-        15       1202 33101  27980 13R  S6_3a    
-        15       1203 33101  27885 13L  S6_3a    
-        15       1204 33101  29369 13R  P13      
-        15       1205 33101  27872 13L  S6_3a    
-        15       1206 33101  27484 13R  S6_2b    
-        15       1207 33101  29337 13L  S6_3b    
-        15       1208 33101  25899 13R  P10_2    
-        15       1209 33101  27912 13L  S6_3a    
-        15       1210 33101  27967 13R  S6_3a    
-        15       1211 33101  27907 13L  S6_3a    
-        15       1212 33101  27924 13R  S6_3a    
-        15       1213 33101  27867 13L  S6_3a    
-        15       1214 33101  27934 13R  S6_3a    
-        15       1215 33101  27892 13L  S6_3a    
-        15       1216 33101  27977 13R  S6_3a    
-        15       1217 33101  27870 13L  S6_3a    
-        15       1218 33101  27987 13R  S6_3a    
-        15       1219 33101  27882 13L  S6_3a    
-        15       1220 33101  29364 13R  S6_3b    
-        15       1221 33101  29347 13L  S6_3b    
-        15       1222 33101  27985 13R  S6_3a    
-        15       1223 33101  28821 13L  P12      
-        15       1224 33101  29372 13R  P13      
-        15       1225 33101  27875 13L  S6_3a    
-        15       1226 33101  27495 13R  S6_2b    
-        15       1227 33101  29340 13L  S6_3b    
-        15       1228 33101  25900 13R  P10_2    
-        15       1229 33101  27913 13L  S6_3a    
-        15       1230 33101  27968 13R  S6_3a    
-        15       1231 33101  27908 13L  S6_3a    
-        15       1232 33101  27943 13R  S6_3a    
-        15       1233 33101  27897 13L  S6_3a    
-        15       1234 33101  27951 13R  S6_3a    
-        15       1235 33101  27893 13L  S6_3a    
-        15       1236 33101  27978 13R  S6_3a    
-        15       1237 33101  27902 13L  S6_3a    
-        15       1238 33101  27988 13R  S6_3a    
-        15       1239 33101  27888 13L  S6_3a    
-        15       1240 33101  29367 13R  S6_3b    
-        15       1241 33101  29348 13L  S6_3b    
-        15       1242 33101  27989 13R  S6_3a    
-        15       1243 33101  29351 13L  S6_3b    
-        15       1244 33101  27969 13R  S6_3a    
-        15       1245 33101  27904 13L  S6_3a    
-        15       1246 33101  29370 13R  P13      
-        15       1247 33101  29352 13L  S6_3b    
-        15       1248 33101  27500 13R  S6_2b    
-        15       1249 33101  27915 13L  S6_3a    
-        15       1250 33101  27970 13R  S6_3a    
-        15       1251 33101  27909 13L  S6_3a    
-        15       1252 33101  27950 13R  S6_3a    
-        15       1253 33101  27899 13L  S6_3a    
-        15       1254 33101  27959 13R  S6_3a    
-        15       1255 33101  27894 13L  S6_3a    
-        15       1256 33101  27979 13R  S6_3a    
-        15       1257 33101  27903 13L  S6_3a    
-        15       1258 33101  27990 13R  S6_3a    
-        15       1259 33101  27889 13L  S6_3a    
-        15       1260 33101  29368 13R  S6_3b    
-        15       1261 33101  29349 13L  S6_3b    
-        15       1262 33101  27992 13R  S6_3a    
-        15       1263 33101  29356 13L  P13      
-        15       1264 33101  27973 13R  S6_3a    
-        15       1265 33101  27911 13L  S6_3a    
-        15       1266 33101  29371 13R  P13      
-        15       1267 33101  29353 13L  S6_3b    
-        15       1268 33101  27957 13R  S6_3a    
-        15       1269 33101  27916 13L  S6_3a    
-        15       1270 33101  27971 13R  S6_3a    
-        15       1271 33101  27910 13L  S6_3a    
-        15       1272 33101  27976 13R  S6_3a    
-        15       1273 33101  27900 13L  S6_3a    
-        15       1274 33101  27960 13R  S6_3a    
-        15       1275 33101  27895 13L  S6_3a    
-        15       1276 33101  27981 13R  S6_3a    
-        15       1277 33101  27905 13L  S6_3a    
-        15       1278 33101  27991 13R  S6_3a    
-        15       1279 33101  27890 13L  S6_3a    
-        15       1280 33101  27994 13R  S6_3a    
-        15       1281 33101  29350 13L  S6_3b    
-        15       1282 33101  27996 13R  S6_3a    
-        15       1283 33101  29357 13L  P13      
-        15       1284 33101  27975 13R  S6_3a    
-        15       1285 33101  27914 13L  S6_3a    
-        15       1286 33101  29373 13R  P13      
-        15       1287 33101  29354 13L  S6_3b    
-        15       1288 33101  27974 13R  S6_3a    
-        15       1289 33101  27874 13L  S6_3a    
-        15       1290 33101  27972 13R  S6_3a    
-        15       1291 33101  27866 13L  S6_3a    
-        15       1292 33101  27966 13R  S6_3a    
-        15       1293 33101  27901 13L  S6_3a    
-        15       1294 33101  27961 13R  S6_3a    
-        15       1295 33101  27896 13L  S6_3a    
-        15       1296 33101  27986 13R  S6_3a    
-        15       1297 33101  27906 13L  S6_3a    
-        15       1298 33101  27993 13R  S6_3a    
-        15       1299 33101  27891 13L  S6_3a    
-        15       1300 33101  27997 13R  S6_3a    
-        15       1301 33101  29402 14L  R1       
-        15       1302 33101  29521 14R  R1       
-        15       1303 33101  29408 14L  R1       
-        15       1304 33101  29527 14R  R1       
-        15       1305 33101  29414 14L  R1       
-        15       1306 33101  29533 14R  R1       
-        15       1307 33101  29419 14L  R1       
-        15       1308 33101  29540 14R  R1       
-        15       1309 33101  29424 14L  R1       
-        15       1310 33101  29545 14R  R1       
-        15       1311 33101  29429 14L  R1       
-        15       1312 33101  29551 14R  R1       
-        15       1313 33101  29435 14L  R1       
-        15       1314 33101  29557 14R  R1       
-        15       1315 33101  29440 14L  R1       
-        15       1316 33101  29562 14R  R1       
-        15       1317 33101  29445 14L  R1       
-        15       1318 33101  29567 14R  R1       
-        15       1319 33101  29451 14L  R1       
-        15       1320 33101  29572 14R  R1       
-        15       1321 33101  29403 14L  R1       
-        15       1322 33101  29522 14R  R1       
-        15       1323 33101  29409 14L  R1       
-        15       1324 33101  29529 14R  R1       
-        15       1325 33101  29415 14L  R1       
-        15       1326 33101  29534 14R  R1       
-        15       1327 33101  29420 14L  R1       
-        15       1328 33101  29541 14R  R1       
-        15       1329 33101  29425 14L  R1       
-        15       1330 33101  29546 14R  R1       
-        15       1331 33101  29430 14L  R1       
-        15       1332 33101  29552 14R  R1       
-        15       1333 33101  29436 14L  R1       
-        15       1334 33101  29558 14R  R1       
-        15       1335 33101  29441 14L  R1       
-        15       1336 33101  29563 14R  R1       
-        15       1337 33101  29446 14L  R1       
-        15       1338 33101  29568 14R  R1       
-        15       1339 33101  29452 14L  R1       
-        15       1340 33101  29573 14R  R1       
-        15       1341 33101  29404 14L  R1       
-        15       1342 33101  29523 14R  R1       
-        15       1343 33101  29410 14L  R1       
-        15       1344 33101  29530 14R  R1       
-        15       1345 33101  29416 14L  R1       
-        15       1346 33101  29536 14R  R1       
-        15       1347 33101  29421 14L  R1       
-        15       1348 33101  29542 14R  R1       
-        15       1349 33101  29426 14L  R1       
-        15       1350 33101  29547 14R  R1       
-        15       1351 33101  29431 14L  R1       
-        15       1352 33101  29553 14R  R1       
-        15       1353 33101  29437 14L  R1       
-        15       1354 33101  29559 14R  R1       
-        15       1355 33101  29442 14L  R1       
-        15       1356 33101  29564 14R  R1       
-        15       1357 33101  29447 14L  R1       
-        15       1358 33101  29569 14R  R1       
-        15       1359 33101  29453 14L  R1       
-        15       1360 33101  29574 14R  R1       
-        15       1361 33101  29406 14L  R1       
-        15       1362 33101  29524 14R  R1       
-        15       1363 33101  29411 14L  R1       
-        15       1364 33101  29531 14R  R1       
-        15       1365 33101  29417 14L  R1       
-        15       1366 33101  29537 14R  R1       
-        15       1367 33101  29422 14L  R1       
-        15       1368 33101  29543 14R  R1       
-        15       1369 33101  29427 14L  R1       
-        15       1370 33101  29548 14R  R1       
-        15       1371 33101  29432 14L  R1       
-        15       1372 33101  29554 14R  R1       
-        15       1373 33101  29438 14L  R1       
-        15       1374 33101  29560 14R  R1       
-        15       1375 33101  29443 14L  R1       
-        15       1376 33101  29565 14R  R1       
-        15       1377 33101  29448 14L  R1       
-        15       1378 33101  29570 14R  R1       
-        15       1379 33101  29454 14L  R1       
-        15       1380 33101  29576 14R  R1       
-        15       1381 33101  29407 14L  R1       
-        15       1382 33101  29525 14R  R1       
-        15       1383 33101  29413 14L  R1       
-        15       1384 33101  29532 14R  R1       
-        15       1385 33101  29418 14L  R1       
-        15       1386 33101  29539 14R  R1       
-        15       1387 33101  29423 14L  R1       
-        15       1388 33101  29544 14R  R1       
-        15       1389 33101  29428 14L  R1       
-        15       1390 33101  29549 14R  R1       
-        15       1391 33101  29433 14L  R1       
-        15       1392 33101  29555 14R  R1       
-        15       1393 33101  29439 14L  R1       
-        15       1394 33101  29561 14R  R1       
-        15       1395 33101  29444 14L  R1       
-        15       1396 33101  29566 14R  R1       
-        15       1397 33101  29450 14L  R1       
-        15       1398 33101  29571 14R  R1       
-        15       1399 33101  29455 14L  R1       
-        15       1400 33101  29577 14R  R1       
-        15       1401 33101  29802 15L  S7_1     
-        15       1402 33101  29851 15R  S7_1     
-        15       1403 33101  29808 15L  S7_1     
-        15       1404 33101  29856 15R  S7_1     
-        15       1405 33101  29814 15L  S7_1     
-        15       1406 33101  29862 15R  S7_1     
-        15       1407 33101  29819 15L  S7_1     
-        15       1408 33101  29867 15R  S7_1     
-        15       1409 33101  29824 15L  S7_1     
-        15       1410 33101  29872 15R  S7_1     
-        15       1411 33101  29831 15L  S7_1     
-        15       1412 33101  29878 15R  S7_1     
-        15       1413 33101  29836 15L  S7_1     
-        15       1414 33101  29883 15R  S7_1     
-        15       1415 33101  29846 15L  S7_1     
-        15       1416 33101  29888 15R  S7_1     
-        15       1417 33101  28132 15L  S6_3b    
-        15       1418 33101  29893 15R  S7_1     
-        15       1419 33101  29845 15L  S7_1     
-        15       1420 33101  29898 15R  S7_1     
-        15       1421 33101  29804 15L  S7_1     
-        15       1422 33101  29852 15R  S7_1     
-        15       1423 33101  29809 15L  S7_1     
-        15       1424 33101  29857 15R  S7_1     
-        15       1425 33101  29815 15L  S7_1     
-        15       1426 33101  29863 15R  S7_1     
-        15       1427 33101  29820 15L  S7_1     
-        15       1428 33101  29868 15R  S7_1     
-        15       1429 33101  29826 15L  S7_1     
-        15       1430 33101  29873 15R  S7_1     
-        15       1431 33101  29832 15L  S7_1     
-        15       1432 33101  29879 15R  S7_1     
-        15       1433 33101  29837 15L  S7_1     
-        15       1434 33101  29884 15R  S7_1     
-        15       1435 33101  29848 15L  S7_1     
-        15       1436 33101  29889 15R  S7_1     
-        15       1437 33101  28148 15L  S6_3b    
-        15       1438 33101  29894 15R  S7_1     
-        15       1439 33101  30834 15L  S7_3     
-        15       1440 33101  29899 15R  S7_1     
-        15       1441 33101  29805 15L  S7_1     
-        15       1442 33101  29853 15R  S7_1     
-        15       1443 33101  29810 15L  S7_1     
-        15       1444 33101  29858 15R  S7_1     
-        15       1445 33101  29816 15L  S7_1     
-        15       1446 33101  29864 15R  S7_1     
-        15       1447 33101  29821 15L  S7_1     
-        15       1448 33101  29869 15R  S7_1     
-        15       1449 33101  29827 15L  S7_1     
-        15       1450 33101  29874 15R  S7_1     
-        15       1451 33101  29833 15L  S7_1     
-        15       1452 33101  29880 15R  S7_1     
-        15       1453 33101  29838 15L  S7_1     
-        15       1454 33101  29885 15R  S7_1     
-        15       1455 33101  29849 15L  S7_1     
-        15       1456 33101  29890 15R  S7_1     
-        15       1457 33101  29304 15L  P13      
-        15       1458 33101  29895 15R  S7_1     
-        15       1459 33101  30836 15L  S7_3     
-        15       1460 33101  29900 15R  S7_1     
-        15       1461 33101  29806 15L  S7_1     
-        15       1462 33101  29854 15R  S7_1     
-        15       1463 33101  29812 15L  S7_1     
-        15       1464 33101  29859 15R  S7_1     
-        15       1465 33101  29817 15L  S7_1     
-        15       1466 33101  29865 15R  S7_1     
-        15       1467 33101  29822 15L  S7_1     
-        15       1468 33101  29870 15R  S7_1     
-        15       1469 33101  29828 15L  S7_1     
-        15       1470 33101  29875 15R  S7_1     
-        15       1471 33101  29834 15L  S7_1     
-        15       1472 33101  29881 15R  S7_1     
-        15       1473 33101  29840 15L  S7_1     
-        15       1474 33101  29886 15R  S7_1     
-        15       1475 33101  29850 15L  S7_1     
-        15       1476 33101  29891 15R  S7_1     
-        15       1477 33101  29825 15L  S7_1     
-        15       1478 33101  29896 15R  S7_1     
-        15       1479 33101  30837 15L  S7_3     
-        15       1480 33101  29877 15R  S7_1     
-        15       1481 33101  29807 15L  S7_1     
-        15       1482 33101  29855 15R  S7_1     
-        15       1483 33101  29813 15L  S7_1     
-        15       1484 33101  29860 15R  S7_1     
-        15       1485 33101  29818 15L  S7_1     
-        15       1486 33101  29866 15R  S7_1     
-        15       1487 33101  29823 15L  S7_1     
-        15       1488 33101  29871 15R  S7_1     
-        15       1489 33101  29830 15L  S7_1     
-        15       1490 33101  29876 15R  S7_1     
-        15       1491 33101  29835 15L  S7_1     
-        15       1492 33101  29882 15R  S7_1     
-        15       1493 33101  29843 15L  S7_1     
-        15       1494 33101  29887 15R  S7_1     
-        15       1495 33101  28121 15L  S6_3b    
-        15       1496 33101  29892 15R  S7_1     
-        15       1497 33101  30843 15L  S7_3     
-        15       1498 33101  29897 15R  S7_1     
-        15       1499 33101  30839 15L  S7_3     
-        15       1500 33101  29861 15R  S7_1     
-        15       1501 33101  28279 16L  S6_3b    
-        15       1502 33101  28344 16R  S6_3b    
-        15       1503 33101  28284 16L  S6_3b    
-        15       1504 33101  29953 16R  S7_1     
-        15       1505 33101  29901 16L  S7_1     
-        15       1506 33101  29958 16R  S7_1     
-        15       1507 33101  29910 16L  S7_1     
-        15       1508 33101  29963 16R  S7_1     
-        15       1509 33101  29915 16L  S7_1     
-        15       1510 33101  29970 16R  S7_1     
-        15       1511 33101  29921 16L  S7_1     
-        15       1512 33101  29975 16R  S7_1     
-        15       1513 33101  29928 16L  S7_1     
-        15       1514 33101  29982 16R  S7_1     
-        15       1515 33101  29936 16L  S7_1     
-        15       1516 33101  29987 16R  S7_1     
-        15       1517 33101  29941 16L  S7_1     
-        15       1518 33101  29992 16R  S7_1     
-        15       1519 33101  29946 16L  S7_1     
-        15       1520 33101  29997 16R  S7_1     
-        15       1521 33101  28280 16L  S6_3b    
-        15       1522 33101  28345 16R  S6_3b    
-        15       1523 33101  28285 16L  S6_3b    
-        15       1524 33101  29954 16R  S7_1     
-        15       1525 33101  29903 16L  S7_1     
-        15       1526 33101  29959 16R  S7_1     
-        15       1527 33101  29911 16L  S7_1     
-        15       1528 33101  29964 16R  S7_1     
-        15       1529 33101  29917 16L  S7_1     
-        15       1530 33101  29971 16R  S7_1     
-        15       1531 33101  29924 16L  S7_1     
-        15       1532 33101  29977 16R  S7_1     
-        15       1533 33101  29929 16L  S7_1     
-        15       1534 33101  29983 16R  S7_1     
-        15       1535 33101  29937 16L  S7_1     
-        15       1536 33101  29988 16R  S7_1     
-        15       1537 33101  29942 16L  S7_1     
-        15       1538 33101  29993 16R  S7_1     
-        15       1539 33101  29948 16L  S7_1     
-        15       1540 33101  29998 16R  S7_1     
-        15       1541 33101  28281 16L  S6_3b    
-        15       1542 33101  28346 16R  S6_3b    
-        15       1543 33101  28286 16L  S6_3b    
-        15       1544 33101  29955 16R  S7_1     
-        15       1545 33101  29905 16L  S7_1     
-        15       1546 33101  29960 16R  S7_1     
-        15       1547 33101  29912 16L  S7_1     
-        15       1548 33101  29966 16R  S7_1     
-        15       1549 33101  29918 16L  S7_1     
-        15       1550 33101  29972 16R  S7_1     
-        15       1551 33101  29925 16L  S7_1     
-        15       1552 33101  29978 16R  S7_1     
-        15       1553 33101  29933 16L  S7_1     
-        15       1554 33101  29984 16R  S7_1     
-        15       1555 33101  29938 16L  S7_1     
-        15       1556 33101  29989 16R  S7_1     
-        15       1557 33101  29943 16L  S7_1     
-        15       1558 33101  29994 16R  S7_1     
-        15       1559 33101  29949 16L  S7_1     
-        15       1560 33101  3   16R  S7_1     
-        15       1561 33101  28282 16L  S6_3b    
-        15       1562 33101  28347 16R  S6_3b    
-        15       1563 33101  28287 16L  S6_3b    
-        15       1564 33101  29956 16R  S7_1     
-        15       1565 33101  29906 16L  S7_1     
-        15       1566 33101  29961 16R  S7_1     
-        15       1567 33101  29913 16L  S7_1     
-        15       1568 33101  29968 16R  S7_1     
-        15       1569 33101  29919 16L  S7_1     
-        15       1570 33101  29973 16R  S7_1     
-        15       1571 33101  29926 16L  S7_1     
-        15       1572 33101  29979 16R  S7_1     
-        15       1573 33101  29934 16L  S7_1     
-        15       1574 33101  29985 16R  S7_1     
-        15       1575 33101  29939 16L  S7_1     
-        15       1576 33101  29990 16R  S7_1     
-        15       1577 33101  29944 16L  S7_1     
-        15       1578 33101  29995 16R  S7_1     
-        15       1579 33101  29950 16L  S7_1     
-        15       1580 33101  28340 16R  S6_3b    
-        15       1581 33101  28283 16L  S6_3b    
-        15       1582 33101  29952 16R  S7_1     
-        15       1583 33101  28674 16L  P12      
-        15       1584 33101  29957 16R  S7_1     
-        15       1585 33101  29908 16L  S7_1     
-        15       1586 33101  29962 16R  S7_1     
-        15       1587 33101  29914 16L  S7_1     
-        15       1588 33101  29969 16R  S7_1     
-        15       1589 33101  29920 16L  S7_1     
-        15       1590 33101  29974 16R  S7_1     
-        15       1591 33101  29927 16L  S7_1     
-        15       1592 33101  29981 16R  S7_1     
-        15       1593 33101  29935 16L  S7_1     
-        15       1594 33101  29986 16R  S7_1     
-        15       1595 33101  29940 16L  S7_1     
-        15       1596 33101  29991 16R  S7_1     
-        15       1597 33101  29945 16L  S7_1     
-        15       1598 33101  29996 16R  S7_1     
-        15       1599 33101  29909 16L  S7_1     
-        15       1600 33101  29321 16R  P13      
-        15       1601 33101  30001 17L  S7_1     
-        15       1602 33101  28459 17R  S6_3b    
-        15       1603 33101  30007 17L  S7_1     
-        15       1604 33101  30054 17R  S7_1     
-        15       1605 33101  30013 17L  S7_1     
-        15       1606 33101  30059 17R  S7_1     
-        15       1607 33101  30018 17L  S7_1     
-        15       1608 33101  30065 17R  S7_1     
-        15       1609 33101  30025 17L  S7_1     
-        15       1610 33101  30071 17R  S7_1     
-        15       1611 33101  30031 17L  S7_1     
-        15       1612 33101  30076 17R  S7_1     
-        15       1613 33101  30036 17L  S7_1     
-        15       1614 33101  30082 17R  S7_1     
-        15       1615 33101  30041 17L  S7_1     
-        15       1616 33101  30088 17R  S7_1     
-        15       1617 33101  30046 17L  S7_1     
-        15       1618 33101  30093 17R  S7_1     
-        15       1619 33101  30027 17L  S7_1     
-        15       1620 33101  30098 17R  S7_1     
-        15       1621 33101  30003 17L  S7_1     
-        15       1622 33101  28460 17R  S6_3b    
-        15       1623 33101  30009 17L  S7_1     
-        15       1624 33101  30055 17R  S7_1     
-        15       1625 33101  30014 17L  S7_1     
-        15       1626 33101  30060 17R  S7_1     
-        15       1627 33101  30019 17L  S7_1     
-        15       1628 33101  30066 17R  S7_1     
-        15       1629 33101  30026 17L  S7_1     
-        15       1630 33101  30072 17R  S7_1     
-        15       1631 33101  30032 17L  S7_1     
-        15       1632 33101  30077 17R  S7_1     
-        15       1633 33101  30037 17L  S7_1     
-        15       1634 33101  30083 17R  S7_1     
-        15       1635 33101  30042 17L  S7_1     
-        15       1636 33101  30089 17R  S7_1     
-        15       1637 33101  30047 17L  S7_1     
-        15       1638 33101  30094 17R  S7_1     
-        15       1639 33101  27148 17L  S6_2b    
-        15       1640 33101  30099 17R  S7_1     
-        15       1641 33101  30004 17L  S7_1     
-        15       1642 33101  30051 17R  S7_1     
-        15       1643 33101  30010 17L  S7_1     
-        15       1644 33101  30056 17R  S7_1     
-        15       1645 33101  30015 17L  S7_1     
-        15       1646 33101  30061 17R  S7_1     
-        15       1647 33101  30021 17L  S7_1     
-        15       1648 33101  30067 17R  S7_1     
-        15       1649 33101  30028 17L  S7_1     
-        15       1650 33101  30073 17R  S7_1     
-        15       1651 33101  30033 17L  S7_1     
-        15       1652 33101  30078 17R  S7_1     
-        15       1653 33101  30038 17L  S7_1     
-        15       1654 33101  30085 17R  S7_1     
-        15       1655 33101  30043 17L  S7_1     
-        15       1656 33101  30090 17R  S7_1     
-        15       1657 33101  30048 17L  S7_1     
-        15       1658 33101  30095 17R  S7_1     
-        15       1659 33101  27155 17L  S6_2b    
-        15       1660 33101  30100 17R  S7_1     
-        15       1661 33101  30005 17L  S7_1     
-        15       1662 33101  30052 17R  S7_1     
-        15       1663 33101  30011 17L  S7_1     
-        15       1664 33101  30057 17R  S7_1     
-        15       1665 33101  30016 17L  S7_1     
-        15       1666 33101  30062 17R  S7_1     
-        15       1667 33101  30022 17L  S7_1     
-        15       1668 33101  30068 17R  S7_1     
-        15       1669 33101  30029 17L  S7_1     
-        15       1670 33101  30074 17R  S7_1     
-        15       1671 33101  30034 17L  S7_1     
-        15       1672 33101  30079 17R  S7_1     
-        15       1673 33101  30039 17L  S7_1     
-        15       1674 33101  30086 17R  S7_1     
-        15       1675 33101  30044 17L  S7_1     
-        15       1676 33101  30091 17R  S7_1     
-        15       1677 33101  30049 17L  S7_1     
-        15       1678 33101  30096 17R  S7_1     
-        15       1679 33101  30939 17L  S7_3     
-        15       1680 33101  30069 17R  S7_1     
-        15       1681 33101  30006 17L  S7_1     
-        15       1682 33101  30053 17R  S7_1     
-        15       1683 33101  30012 17L  S7_1     
-        15       1684 33101  30058 17R  S7_1     
-        15       1685 33101  30017 17L  S7_1     
-        15       1686 33101  30063 17R  S7_1     
-        15       1687 33101  30023 17L  S7_1     
-        15       1688 33101  30070 17R  S7_1     
-        15       1689 33101  30030 17L  S7_1     
-        15       1690 33101  30075 17R  S7_1     
-        15       1691 33101  30035 17L  S7_1     
-        15       1692 33101  30081 17R  S7_1     
-        15       1693 33101  30040 17L  S7_1     
-        15       1694 33101  30087 17R  S7_1     
-        15       1695 33101  30045 17L  S7_1     
-        15       1696 33101  30092 17R  S7_1     
-        15       1697 33101  30050 17L  S7_1     
-        15       1698 33101  30097 17R  S7_1     
-        15       1699 33101  30940 17L  S7_3     
-        15       1700 33101  29328 17R  P13      
-        16          1 33101  25957 1L   P11_1    
-        16          2 33101  29693 1R   S7_1     
-        16          3 33101  30802 1L   S7_3     
-        16          4 33101  29698 1R   S7_1     
-        16          5 33101  31303 1L   S07_4    
-        16          6 33101  30808 1R   S7_3     
-        16          7 33101  31801 1L   S07_5    
-        16          8 33101  31311 1R   S07_4    
-        16          9 33101  31808 1L   S07_5    
-        16         10 33101  31316 1R   S07_4    
-        16         11 33101  31813 1L   S07_5    
-        16         12 33101  31852 1R   S07_5    
-        16         13 33101  31820 1L   S07_5    
-        16         14 33101  31857 1R   S07_5    
-        16         15 33101  31826 1L   S07_5    
-        16         16 33101  31863 1R   S07_5    
-        16         17 33101  31834 1L   S07_5    
-        16         18 33101  31869 1R   S07_5    
-        16         19 33101  31839 1L   S07_5    
-        16         20 33101  31875 1R   S07_5    
-        16         21 33101  29611 1L   S7_1     
-        16         22 33101  29694 1R   S7_1     
-        16         23 33101  30803 1L   S7_3     
-        16         24 33101  29699 1R   S7_1     
-        16         25 33101  31304 1L   S07_4    
-        16         26 33101  30809 1R   S7_3     
-        16         27 33101  31804 1L   S07_5    
-        16         28 33101  31312 1R   S07_4    
-        16         29 33101  31809 1L   S07_5    
-        16         30 33101  31317 1R   S07_4    
-        16         31 33101  31814 1L   S07_5    
-        16         32 33101  31853 1R   S07_5    
-        16         33 33101  31821 1L   S07_5    
-        16         34 33101  31858 1R   S07_5    
-        16         35 33101  31830 1L   S07_5    
-        16         36 33101  31864 1R   S07_5    
-        16         37 33101  31835 1L   S07_5    
-        16         38 33101  31870 1R   S07_5    
-        16         39 33101  31840 1L   S07_5    
-        16         40 33101  31876 1R   S07_5    
-        16         41 33101  29628 1L   S7_1     
-        16         42 33101  29695 1R   S7_1     
-        16         43 33101  30804 1L   S7_3     
-        16         44 33101  29700 1R   S7_1     
-        16         45 33101  31305 1L   S07_4    
-        16         46 33101  31308 1R   S07_4    
-        16         47 33101  31805 1L   S07_5    
-        16         48 33101  31313 1R   S07_4    
-        16         49 33101  31810 1L   S07_5    
-        16         50 33101  31845 1R   S07_5    
-        16         51 33101  31815 1L   S07_5    
-        16         52 33101  31854 1R   S07_5    
-        16         53 33101  31822 1L   S07_5    
-        16         54 33101  31860 1R   S07_5    
-        16         55 33101  31831 1L   S07_5    
-        16         56 33101  31865 1R   S07_5    
-        16         57 33101  31836 1L   S07_5    
-        16         58 33101  31871 1R   S07_5    
-        16         59 33101  31842 1L   S07_5    
-        16         60 33101  31877 1R   S07_5    
-        16         61 33101  29649 1L   S7_1     
-        16         62 33101  29696 1R   S7_1     
-        16         63 33101  31301 1L   S07_4    
-        16         64 33101  30806 1R   S7_3     
-        16         65 33101  31306 1L   S07_4    
-        16         66 33101  31309 1R   S07_4    
-        16         67 33101  31806 1L   S07_5    
-        16         68 33101  31314 1R   S07_4    
-        16         69 33101  31811 1L   S07_5    
-        16         70 33101  31847 1R   S07_5    
-        16         71 33101  31817 1L   S07_5    
-        16         72 33101  31855 1R   S07_5    
-        16         73 33101  31823 1L   S07_5    
-        16         74 33101  31861 1R   S07_5    
-        16         75 33101  31832 1L   S07_5    
-        16         76 33101  31866 1R   S07_5    
-        16         77 33101  31837 1L   S07_5    
-        16         78 33101  31873 1R   S07_5    
-        16         79 33101  31843 1L   S07_5    
-        16         80 33101  31878 1R   S07_5    
-        16         81 33101  29650 1L   S7_1     
-        16         82 33101  29697 1R   S7_1     
-        16         83 33101  31302 1L   S07_4    
-        16         84 33101  30807 1R   S7_3     
-        16         85 33101  31307 1L   S07_4    
-        16         86 33101  31310 1R   S07_4    
-        16         87 33101  31807 1L   S07_5    
-        16         88 33101  31315 1R   S07_4    
-        16         89 33101  31812 1L   S07_5    
-        16         90 33101  31851 1R   S07_5    
-        16         91 33101  31819 1L   S07_5    
-        16         92 33101  31856 1R   S07_5    
-        16         93 33101  31824 1L   S07_5    
-        16         94 33101  31862 1R   S07_5    
-        16         95 33101  31833 1L   S07_5    
-        16         96 33101  31867 1R   S07_5    
-        16         97 33101  31838 1L   S07_5    
-        16         98 33101  31874 1R   S07_5    
-        16         99 33101  31844 1L   S07_5    
-        16        100 33101  31879 1R   S07_5    
-        16        101 33101  30151 2L   S7_2     
-        16        102 33101  30211 2R   S7_2     
-        16        103 33101  30159 2L   S7_2     
-        16        104 33101  30200 2R   S7_2     
-        16        105 33101  31886 2L   S07_5    
-        16        106 33101  30701 2R   S7_2     
-        16        107 33101  31891 2L   S07_5    
-        16        108 33101  31941 2R   S07_5    
-        16        109 33101  31901 2L   S07_5    
-        16        110 33101  31948 2R   S07_5    
-        16        111 33101  31906 2L   S07_5    
-        16        112 33101  31956 2R   S07_5    
-        16        113 33101  31911 2L   S07_5    
-        16        114 33101  31966 2R   S07_5    
-        16        115 33101  31916 2L   S07_5    
-        16        116 33101  31967 2R   S07_5    
-        16        117 33101  31921 2L   S07_5    
-        16        118 33101  31974 2R   S07_5    
-        16        119 33101  31926 2L   S07_5    
-        16        120 33101  31986 2R   S07_5    
-        16        121 33101  30152 2L   S7_2     
-        16        122 33101  30212 2R   S7_2     
-        16        123 33101  30160 2L   S7_2     
-        16        124 33101  30217 2R   S7_2     
-        16        125 33101  31887 2L   S07_5    
-        16        126 33101  30702 2R   S7_2     
-        16        127 33101  31892 2L   S07_5    
-        16        128 33101  31943 2R   S07_5    
-        16        129 33101  31902 2L   S07_5    
-        16        130 33101  31950 2R   S07_5    
-        16        131 33101  31907 2L   S07_5    
-        16        132 33101  31957 2R   S07_5    
-        16        133 33101  31912 2L   S07_5    
-        16        134 33101  31962 2R   S07_5    
-        16        135 33101  31917 2L   S07_5    
-        16        136 33101  31968 2R   S07_5    
-        16        137 33101  31922 2L   S07_5    
-        16        138 33101  31976 2R   S07_5    
-        16        139 33101  31927 2L   S07_5    
-        16        140 33101  31982 2R   S07_5    
-        16        141 33101  30153 2L   S7_2     
-        16        142 33101  30213 2R   S7_2     
-        16        143 33101  30148 2L   S7_2     
-        16        144 33101  30218 2R   S7_2     
-        16        145 33101  31888 2L   S07_5    
-        16        146 33101  30812 2R   S7_3     
-        16        147 33101  31895 2L   S07_5    
-        16        148 33101  31944 2R   S07_5    
-        16        149 33101  31903 2L   S07_5    
-        16        150 33101  31952 2R   S07_5    
-        16        151 33101  31908 2L   S07_5    
-        16        152 33101  31958 2R   S07_5    
-        16        153 33101  31913 2L   S07_5    
-        16        154 33101  31963 2R   S07_5    
-        16        155 33101  31918 2L   S07_5    
-        16        156 33101  31969 2R   S07_5    
-        16        157 33101  31923 2L   S07_5    
-        16        158 33101  31977 2R   S07_5    
-        16        159 33101  31928 2L   S07_5    
-        16        160 33101  31983 2R   S07_5    
-        16        161 33101  30154 2L   S7_2     
-        16        162 33101  30214 2R   S7_2     
-        16        163 33101  30149 2L   S7_2     
-        16        164 33101  30219 2R   S7_2     
-        16        165 33101  31889 2L   S07_5    
-        16        166 33101  30814 2R   S7_3     
-        16        167 33101  30810 2L   S7_3     
-        16        168 33101  31946 2R   S07_5    
-        16        169 33101  31904 2L   S07_5    
-        16        170 33101  31953 2R   S07_5    
-        16        171 33101  31909 2L   S07_5    
-        16        172 33101  31959 2R   S07_5    
-        16        173 33101  31914 2L   S07_5    
-        16        174 33101  31964 2R   S07_5    
-        16        175 33101  31920 2L   S07_5    
-        16        176 33101  31971 2R   S07_5    
-        16        177 33101  31925 2L   S07_5    
-        16        178 33101  31980 2R   S07_5    
-        16        179 33101  31930 2L   S07_5    
-        16        180 33101  31984 2R   S07_5    
-        16        181 33101  30155 2L   S7_2     
-        16        182 33101  30215 2R   S7_2     
-        16        183 33101  30150 2L   S7_2     
-        16        184 33101  30220 2R   S7_2     
-        16        185 33101  31890 2L   S07_5    
-        16        186 33101  31940 2R   S07_5    
-        16        187 33101  31885 2L   S07_5    
-        16        188 33101  31947 2R   S07_5    
-        16        189 33101  31905 2L   S07_5    
-        16        190 33101  31955 2R   S07_5    
-        16        191 33101  31910 2L   S07_5    
-        16        192 33101  31961 2R   S07_5    
-        16        193 33101  31896 2L   S07_5    
-        16        194 33101  31965 2R   S07_5    
-        16        195 33101  31899 2L   S07_5    
-        16        196 33101  31973 2R   S07_5    
-        16        197 33101  31900 2L   S07_5    
-        16        198 33101  31981 2R   S07_5    
-        16        199 33101  31931 2L   S07_5    
-        16        200 33101  31985 2R   S07_5    
-        16        201 33101  26555 3L   S6_2     
-        16        202 33101  29082 3R   P13      
-        16        203 33101  31991 3L   S07_5    
-        16        204 33101  32045 3R   S07_5    
-        16        205 33101  31996 3L   S07_5    
-        16        206 33101  32052 3R   S07_5    
-        16        207 33101  32002 3L   S07_5    
-        16        208 33101  32058 3R   S07_5    
-        16        209 33101  32007 3L   S07_5    
-        16        210 33101  32067 3R   S07_5    
-        16        211 33101  32013 3L   S07_5    
-        16        212 33101  32073 3R   S07_5    
-        16        213 33101  32021 3L   S07_5    
-        16        214 33101  32080 3R   S07_5    
-        16        215 33101  32025 3L   S07_5    
-        16        216 33101  32085 3R   S07_5    
-        16        217 33101  32032 3L   S07_5    
-        16        218 33101  32092 3R   S07_5    
-        16        219 33101  32039 3L   S07_5    
-        16        220 33101  32047 3R   S07_5    
-        16        221 33101  29022 3L   P13      
-        16        222 33101  29086 3R   P13      
-        16        223 33101  31992 3L   S07_5    
-        16        224 33101  32046 3R   S07_5    
-        16        225 33101  31997 3L   S07_5    
-        16        226 33101  32053 3R   S07_5    
-        16        227 33101  32003 3L   S07_5    
-        16        228 33101  32059 3R   S07_5    
-        16        229 33101  32008 3L   S07_5    
-        16        230 33101  32068 3R   S07_5    
-        16        231 33101  32014 3L   S07_5    
-        16        232 33101  32075 3R   S07_5    
-        16        233 33101  32019 3L   S07_5    
-        16        234 33101  32081 3R   S07_5    
-        16        235 33101  32026 3L   S07_5    
-        16        236 33101  32087 3R   S07_5    
-        16        237 33101  32033 3L   S07_5    
-        16        238 33101  32093 3R   S07_5    
-        16        239 33101  32040 3L   S07_5    
-        16        240 33101  32065 3R   S07_5    
-        16        241 33101  29058 3L   P13      
-        16        242 33101  30227 3R   S7_2     
-        16        243 33101  31993 3L   S07_5    
-        16        244 33101  32049 3R   S07_5    
-        16        245 33101  31998 3L   S07_5    
-        16        246 33101  32054 3R   S07_5    
-        16        247 33101  32004 3L   S07_5    
-        16        248 33101  32060 3R   S07_5    
-        16        249 33101  32010 3L   S07_5    
-        16        250 33101  32070 3R   S07_5    
-        16        251 33101  32015 3L   S07_5    
-        16        252 33101  32077 3R   S07_5    
-        16        253 33101  32022 3L   S07_5    
-        16        254 33101  32082 3R   S07_5    
-        16        255 33101  32027 3L   S07_5    
-        16        256 33101  32088 3R   S07_5    
-        16        257 33101  32034 3L   S07_5    
-        16        258 33101  32094 3R   S07_5    
-        16        259 33101  32042 3L   S07_5    
-        16        260 33101  26608 3R   S6_2     
-        16        261 33101  30226 3L   S7_2     
-        16        262 33101  32043 3R   S07_5    
-        16        263 33101  31994 3L   S07_5    
-        16        264 33101  32050 3R   S07_5    
-        16        265 33101  32000 3L   S07_5    
-        16        266 33101  32055 3R   S07_5    
-        16        267 33101  32005 3L   S07_5    
-        16        268 33101  32061 3R   S07_5    
-        16        269 33101  32011 3L   S07_5    
-        16        270 33101  32071 3R   S07_5    
-        16        271 33101  32016 3L   S07_5    
-        16        272 33101  32078 3R   S07_5    
-        16        273 33101  32023 3L   S07_5    
-        16        274 33101  32083 3R   S07_5    
-        16        275 33101  32029 3L   S07_5    
-        16        276 33101  32090 3R   S07_5    
-        16        277 33101  32035 3L   S07_5    
-        16        278 33101  32076 3R   S07_5    
-        16        279 33101  32020 3L   S07_5    
-        16        280 33101  29094 3R   P13      
-        16        281 33101  31990 3L   S07_5    
-        16        282 33101  32044 3R   S07_5    
-        16        283 33101  31995 3L   S07_5    
-        16        284 33101  32051 3R   S07_5    
-        16        285 33101  32001 3L   S07_5    
-        16        286 33101  32057 3R   S07_5    
-        16        287 33101  32006 3L   S07_5    
-        16        288 33101  32066 3R   S07_5    
-        16        289 33101  32012 3L   S07_5    
-        16        290 33101  32072 3R   S07_5    
-        16        291 33101  32017 3L   S07_5    
-        16        292 33101  32079 3R   S07_5    
-        16        293 33101  32024 3L   S07_5    
-        16        294 33101  32084 3R   S07_5    
-        16        295 33101  32031 3L   S07_5    
-        16        296 33101  32091 3R   S07_5    
-        16        297 33101  32038 3L   S07_5    
-        16        298 33101  32056 3R   S07_5    
-        16        299 33101  29017 3L   P13      
-        16        300 33101  32325 3R   P14      
-        16        301 33101  30242 4L   S7_2     
-        16        302 33101  30261 4R   S7_2     
-        16        303 33101  32095 4L   S07_5    
-        16        304 33101  29187 4R   P13      
-        16        305 33101  32100 4L   S07_5    
-        16        306 33101  32145 4R   S07_5    
-        16        307 33101  32107 4L   S07_5    
-        16        308 33101  32153 4R   S07_5    
-        16        309 33101  32113 4L   S07_5    
-        16        310 33101  32158 4R   S07_5    
-        16        311 33101  32123 4L   S07_5    
-        16        312 33101  32163 4R   S07_5    
-        16        313 33101  32129 4L   S07_5    
-        16        314 33101  32170 4R   S07_5    
-        16        315 33101  32135 4L   S07_5    
-        16        316 33101  32175 4R   S07_5    
-        16        317 33101  32143 4L   S07_5    
-        16        318 33101  32180 4R   S07_5    
-        16        319 33101  32140 4L   S07_5    
-        16        320 33101  32186 4R   S07_5    
-        16        321 33101  30245 4L   S7_2     
-        16        322 33101  30262 4R   S7_2     
-        16        323 33101  32096 4L   S07_5    
-        16        324 33101  30266 4R   S7_2     
-        16        325 33101  32102 4L   S07_5    
-        16        326 33101  32146 4R   S07_5    
-        16        327 33101  32108 4L   S07_5    
-        16        328 33101  32154 4R   S07_5    
-        16        329 33101  32118 4L   S07_5    
-        16        330 33101  32159 4R   S07_5    
-        16        331 33101  32124 4L   S07_5    
-        16        332 33101  32164 4R   S07_5    
-        16        333 33101  32130 4L   S07_5    
-        16        334 33101  32171 4R   S07_5    
-        16        335 33101  32136 4L   S07_5    
-        16        336 33101  32176 4R   S07_5    
-        16        337 33101  32144 4L   S07_5    
-        16        338 33101  32181 4R   S07_5    
-        16        339 33101  32332 4L   P14      
-        16        340 33101  32187 4R   S07_5    
-        16        341 33101  30250 4L   S7_2     
-        16        342 33101  30263 4R   S7_2     
-        16        343 33101  32097 4L   S07_5    
-        16        344 33101  30267 4R   S7_2     
-        16        345 33101  32103 4L   S07_5    
-        16        346 33101  32147 4R   S07_5    
-        16        347 33101  32110 4L   S07_5    
-        16        348 33101  32155 4R   S07_5    
-        16        349 33101  32119 4L   S07_5    
-        16        350 33101  32160 4R   S07_5    
-        16        351 33101  32125 4L   S07_5    
-        16        352 33101  32165 4R   S07_5    
-        16        353 33101  32131 4L   S07_5    
-        16        354 33101  32172 4R   S07_5    
-        16        355 33101  32137 4L   S07_5    
-        16        356 33101  32177 4R   S07_5    
-        16        357 33101  32128 4L   S07_5    
-        16        358 33101  32183 4R   S07_5    
-        16        359 33101  33371 4L   S8_2     
-        16        360 33101  32188 4R   S07_5    
-        16        361 33101  30254 4L   S7_2     
-        16        362 33101  30264 4R   S7_2     
-        16        363 33101  32098 4L   S07_5    
-        16        364 33101  30825 4R   S7_3     
-        16        365 33101  32105 4L   S07_5    
-        16        366 33101  32149 4R   S07_5    
-        16        367 33101  32111 4L   S07_5    
-        16        368 33101  32156 4R   S07_5    
-        16        369 33101  32120 4L   S07_5    
-        16        370 33101  32161 4R   S07_5    
-        16        371 33101  32126 4L   S07_5    
-        16        372 33101  32166 4R   S07_5    
-        16        373 33101  32132 4L   S07_5    
-        16        374 33101  32173 4R   S07_5    
-        16        375 33101  32139 4L   S07_5    
-        16        376 33101  32178 4R   S07_5    
-        16        377 33101  30238 4L   S7_2     
-        16        378 33101  32184 4R   S07_5    
-        16        379 33101  33372 4L   S8_2     
-        16        380 33101  32189 4R   S07_5    
-        16        381 33101  30256 4L   S7_2     
-        16        382 33101  30265 4R   S7_2     
-        16        383 33101  32099 4L   S07_5    
-        16        384 33101  30826 4R   S7_3     
-        16        385 33101  32106 4L   S07_5    
-        16        386 33101  32152 4R   S07_5    
-        16        387 33101  32112 4L   S07_5    
-        16        388 33101  32157 4R   S07_5    
-        16        389 33101  32121 4L   S07_5    
-        16        390 33101  32162 4R   S07_5    
-        16        391 33101  32127 4L   S07_5    
-        16        392 33101  32169 4R   S07_5    
-        16        393 33101  32133 4L   S07_5    
-        16        394 33101  32174 4R   S07_5    
-        16        395 33101  32141 4L   S07_5    
-        16        396 33101  32179 4R   S07_5    
-        16        397 33101  30823 4L   S7_3     
-        16        398 33101  32185 4R   S07_5    
-        16        399 33101  33375 4L   S8_2     
-        16        400 33101  32190 4R   S07_5    
-        16        401 33101  26731 5L   S6_2     
-        16        402 33101  26791 5R   S6_2     
-        16        403 33101  32196 5L   S07_5    
-        16        404 33101  30324 5R   S7_2     
-        16        405 33101  32203 5L   S07_5    
-        16        406 33101  30832 5R   S7_3     
-        16        407 33101  32209 5L   S07_5    
-        16        408 33101  32253 5R   S07_5    
-        16        409 33101  32215 5L   S07_5    
-        16        410 33101  32259 5R   S07_5    
-        16        411 33101  32220 5L   S07_5    
-        16        412 33101  32266 5R   S07_5    
-        16        413 33101  32226 5L   S07_5    
-        16        414 33101  32272 5R   S07_5    
-        16        415 33101  32231 5L   S07_5    
-        16        416 33101  32277 5R   S07_5    
-        16        417 33101  32236 5L   S07_5    
-        16        418 33101  32283 5R   S07_5    
-        16        419 33101  32241 5L   S07_5    
-        16        420 33101  32288 5R   S07_5    
-        16        421 33101  26745 5L   S6_2     
-        16        422 33101  26792 5R   S6_2     
-        16        423 33101  32197 5L   S07_5    
-        16        424 33101  30328 5R   S7_2     
-        16        425 33101  32205 5L   S07_5    
-        16        426 33101  32248 5R   S07_5    
-        16        427 33101  32210 5L   S07_5    
-        16        428 33101  32254 5R   S07_5    
-        16        429 33101  32216 5L   S07_5    
-        16        430 33101  32260 5R   S07_5    
-        16        431 33101  32221 5L   S07_5    
-        16        432 33101  32267 5R   S07_5    
-        16        433 33101  32227 5L   S07_5    
-        16        434 33101  32273 5R   S07_5    
-        16        435 33101  32232 5L   S07_5    
-        16        436 33101  32278 5R   S07_5    
-        16        437 33101  32237 5L   S07_5    
-        16        438 33101  32284 5R   S07_5    
-        16        439 33101  32242 5L   S07_5    
-        16        440 33101  32289 5R   S07_5    
-        16        441 33101  30293 5L   S7_2     
-        16        442 33101  26807 5R   S6_2     
-        16        443 33101  32198 5L   S07_5    
-        16        444 33101  30329 5R   S7_2     
-        16        445 33101  32206 5L   S07_5    
-        16        446 33101  32249 5R   S07_5    
-        16        447 33101  32211 5L   S07_5    
-        16        448 33101  32255 5R   S07_5    
-        16        449 33101  32217 5L   S07_5    
-        16        450 33101  32261 5R   S07_5    
-        16        451 33101  32222 5L   S07_5    
-        16        452 33101  32268 5R   S07_5    
-        16        453 33101  32228 5L   S07_5    
-        16        454 33101  32274 5R   S07_5    
-        16        455 33101  32233 5L   S07_5    
-        16        456 33101  32279 5R   S07_5    
-        16        457 33101  32238 5L   S07_5    
-        16        458 33101  32285 5R   S07_5    
-        16        459 33101  30829 5L   S7_3     
-        16        460 33101  32291 5R   S07_5    
-        16        461 33101  30303 5L   S7_2     
-        16        462 33101  29271 5R   P13      
-        16        463 33101  32200 5L   S07_5    
-        16        464 33101  30330 5R   S7_2     
-        16        465 33101  32207 5L   S07_5    
-        16        466 33101  32251 5R   S07_5    
-        16        467 33101  32213 5L   S07_5    
-        16        468 33101  32256 5R   S07_5    
-        16        469 33101  32218 5L   S07_5    
-        16        470 33101  32262 5R   S07_5    
-        16        471 33101  32224 5L   S07_5    
-        16        472 33101  32269 5R   S07_5    
-        16        473 33101  32229 5L   S07_5    
-        16        474 33101  32275 5R   S07_5    
-        16        475 33101  32234 5L   S07_5    
-        16        476 33101  32280 5R   S07_5    
-        16        477 33101  32239 5L   S07_5    
-        16        478 33101  32286 5R   S07_5    
-        16        479 33101  30830 5L   S7_3     
-        16        480 33101  32292 5R   S07_5    
-        16        481 33101  30304 5L   S7_2     
-        16        482 33101  30321 5R   S7_2     
-        16        483 33101  32201 5L   S07_5    
-        16        484 33101  30331 5R   S7_2     
-        16        485 33101  32208 5L   S07_5    
-        16        486 33101  32252 5R   S07_5    
-        16        487 33101  32214 5L   S07_5    
-        16        488 33101  32258 5R   S07_5    
-        16        489 33101  32219 5L   S07_5    
-        16        490 33101  32265 5R   S07_5    
-        16        491 33101  32225 5L   S07_5    
-        16        492 33101  32270 5R   S07_5    
-        16        493 33101  32230 5L   S07_5    
-        16        494 33101  32276 5R   S07_5    
-        16        495 33101  32235 5L   S07_5    
-        16        496 33101  32281 5R   S07_5    
-        16        497 33101  32240 5L   S07_5    
-        16        498 33101  32287 5R   S07_5    
-        16        499 33101  30831 5L   S7_3     
-        16        500 33101  32294 5R   S07_5    
-        16        501 33101  30999 6L   S7_3     
-        16        502 33101  31039 6R   S7_3     
-        16        503 33101  31019 6L   S7_3     
-        16        504 33101  31029 6R   S7_3     
-        16        505 33101  30984 6L   S7_3     
-        16        506 33101  31044 6R   S7_3     
-        16        507 33101  30989 6L   S7_3     
-        16        508 33101  31034 6R   S7_3     
-        16        509 33101  30969 6L   S7_3     
-        16        510 33101  31054 6R   S7_3     
-        16        511 33101  31014 6L   S7_3     
-        16        512 33101  31059 6R   S7_3     
-        16        513 33101  30979 6L   S7_3     
-        16        514 33101  31064 6R   S7_3     
-        16        515 33101  30974 6L   S7_3     
-        16        516 33101  31074 6R   S7_3     
-        16        517 33101  28596 6L   S6_3b    
-        16        518 33101   3103 6R   10       
-        16        519 33101  28600 6L   P13      
-        16        520 33101  27526 6R   S6_3a    
-        16        521 33101  31001 6L   S7_3     
-        16        522 33101  31040 6R   S7_3     
-        16        523 33101  31010 6L   S7_3     
-        16        524 33101  31030 6R   S7_3     
-        16        525 33101  30985 6L   S7_3     
-        16        526 33101  31045 6R   S7_3     
-        16        527 33101  30990 6L   S7_3     
-        16        528 33101  31035 6R   S7_3     
-        16        529 33101  30970 6L   S7_3     
-        16        530 33101  31055 6R   S7_3     
-        16        531 33101  31015 6L   S7_3     
-        16        532 33101  31060 6R   S7_3     
-        16        533 33101  30980 6L   S7_3     
-        16        534 33101  31065 6R   S7_3     
-        16        535 33101  30975 6L   S7_3     
-        16        536 33101  31075 6R   S7_3     
-        16        537 33101  28570 6L   S6_3b    
-        16        538 33101   3122 6R   10       
-        16        539 33101  27524 6L   S6_3a    
-        16        540 33101  27546 6R   S6_3a    
-        16        541 33101  31003 6L   S7_3     
-        16        542 33101  31041 6R   S7_3     
-        16        543 33101  31011 6L   S7_3     
-        16        544 33101  31032 6R   S7_3     
-        16        545 33101  30987 6L   S7_3     
-        16        546 33101  31046 6R   S7_3     
-        16        547 33101  30991 6L   S7_3     
-        16        548 33101  31036 6R   S7_3     
-        16        549 33101  30971 6L   S7_3     
-        16        550 33101  31056 6R   S7_3     
-        16        551 33101  31016 6L   S7_3     
-        16        552 33101  31061 6R   S7_3     
-        16        553 33101  30981 6L   S7_3     
-        16        554 33101  31066 6R   S7_3     
-        16        555 33101  30976 6L   S7_3     
-        16        556 33101  31076 6R   S7_3     
-        16        557 33101  28574 6L   S6_3b    
-        16        558 33101  27543 6R   S6_3a    
-        16        559 33101  28580 6L   S6_3b    
-        16        560 33101  27549 6R   S6_3a    
-        16        561 33101  31004 6L   S7_3     
-        16        562 33101  31050 6R   S7_3     
-        16        563 33101  31012 6L   S7_3     
-        16        564 33101  31033 6R   S7_3     
-        16        565 33101  30988 6L   S7_3     
-        16        566 33101  31047 6R   S7_3     
-        16        567 33101  30992 6L   S7_3     
-        16        568 33101  31037 6R   S7_3     
-        16        569 33101  30972 6L   S7_3     
-        16        570 33101  31057 6R   S7_3     
-        16        571 33101  31017 6L   S7_3     
-        16        572 33101  31062 6R   S7_3     
-        16        573 33101  30982 6L   S7_3     
-        16        574 33101  31067 6R   S7_3     
-        16        575 33101  30977 6L   S7_3     
-        16        576 33101  31077 6R   S7_3     
-        16        577 33101  28584 6L   S6_3b    
-        16        578 33101  27553 6R   S6_3a    
-        16        579 33101  28586 6L   S6_3b    
-        16        580 33101  28489 6R   P13      
-        16        581 33101  31008 6L   S7_3     
-        16        582 33101  31051 6R   S7_3     
-        16        583 33101  31013 6L   S7_3     
-        16        584 33101  31053 6R   S7_3     
-        16        585 33101  30995 6L   S7_3     
-        16        586 33101  31048 6R   S7_3     
-        16        587 33101  30996 6L   S7_3     
-        16        588 33101  31038 6R   S7_3     
-        16        589 33101  30994 6L   S7_3     
-        16        590 33101  31058 6R   S7_3     
-        16        591 33101  31018 6L   S7_3     
-        16        592 33101  31063 6R   S7_3     
-        16        593 33101  30983 6L   S7_3     
-        16        594 33101  31069 6R   S7_3     
-        16        595 33101  30978 6L   S7_3     
-        16        596 33101  31078 6R   S7_3     
-        16        597 33101  26164 6L   S6_1     
-        16        598 33101  28488 6R   P13      
-        16        599 33101  28566 6L   S6_3b    
-        16        600 33101  28490 6R   P13      
-        16        601 33101  31567 7L   S7_4     
-        16        602 33101  31584 7R   S7_4     
-        16        603 33101  31558 7L   S7_4     
-        16        604 33101  31598 7R   S7_4     
-        16        605 33101  31538 7L   S7_4     
-        16        606 33101  31571 7R   S7_4     
-        16        607 33101  31548 7L   S7_4     
-        16        608 33101  31581 7R   S7_4     
-        16        609 33101  31545 7L   S7_4     
-        16        610 33101  31120 7R   S7_3     
-        16        611 33101  28506 7L   S6_3b    
-        16        612 33101  31116 7R   S7_3     
-        16        613 33101  31094 7L   S7_3     
-        16        614 33101  31105 7R   S7_3     
-        16        615 33101  31089 7L   S7_3     
-        16        616 33101  31111 7R   S7_3     
-        16        617 33101  31084 7L   S7_3     
-        16        618 33101   9541 7R   P6       
-        16        619 33101  28495 7L   S6_3b    
-        16        620 33101  28523 7R   S6_3b    
-        16        621 33101  31568 7L   S7_4     
-        16        622 33101  31592 7R   S7_4     
-        16        623 33101  31560 7L   S7_4     
-        16        624 33101  31601 7R   S7_4     
-        16        625 33101  31539 7L   S7_4     
-        16        626 33101  31572 7R   S7_4     
-        16        627 33101  31549 7L   S7_4     
-        16        628 33101  31582 7R   S7_4     
-        16        629 33101  31546 7L   S7_4     
-        16        630 33101  31102 7R   S7_3     
-        16        631 33101  31080 7L   S7_3     
-        16        632 33101  31117 7R   S7_3     
-        16        633 33101  31095 7L   S7_3     
-        16        634 33101  31107 7R   S7_3     
-        16        635 33101  31090 7L   S7_3     
-        16        636 33101  31112 7R   S7_3     
-        16        637 33101  31085 7L   S7_3     
-        16        638 33101  23247 7R   S5       
-        16        639 33101  30398 7L   S7_2     
-        16        640 33101  28550 7R   P13      
-        16        641 33101  31570 7L   S7_4     
-        16        642 33101  31593 7R   S7_4     
-        16        643 33101  31561 7L   S7_4     
-        16        644 33101  31603 7R   S7_4     
-        16        645 33101  31540 7L   S7_4     
-        16        646 33101  31575 7R   S7_4     
-        16        647 33101  31550 7L   S7_4     
-        16        648 33101  31583 7R   S7_4     
-        16        649 33101  31553 7L   S7_4     
-        16        650 33101  31103 7R   S7_3     
-        16        651 33101  31081 7L   S7_3     
-        16        652 33101  31118 7R   S7_3     
-        16        653 33101  31096 7L   S7_3     
-        16        654 33101  31108 7R   S7_3     
-        16        655 33101  31091 7L   S7_3     
-        16        656 33101  31113 7R   S7_3     
-        16        657 33101  31086 7L   S7_3     
-        16        658 33101  28524 7R   S6_3b    
-        16        659 33101  30400 7L   S7_2     
-        16        660 33101  28717 7R   P12      
-        16        661 33101  28509 7L   S6_3b    
-        16        662 33101  31594 7R   S7_4     
-        16        663 33101  31562 7L   S7_4     
-        16        664 33101  31604 7R   S7_4     
-        16        665 33101  31541 7L   S7_4     
-        16        666 33101  31577 7R   S7_4     
-        16        667 33101  31551 7L   S7_4     
-        16        668 33101  31587 7R   S7_4     
-        16        669 33101  31555 7L   S7_4     
-        16        670 33101  31104 7R   S7_3     
-        16        671 33101  31082 7L   S7_3     
-        16        672 33101  31119 7R   S7_3     
-        16        673 33101  31097 7L   S7_3     
-        16        674 33101  31109 7R   S7_3     
-        16        675 33101  31092 7L   S7_3     
-        16        676 33101  31114 7R   S7_3     
-        16        677 33101  31087 7L   S7_3     
-        16        678 33101  28528 7R   S6_3b    
-        16        679 33101  30401 7L   S7_2     
-        16        680 33101  30385 7R   S7_2     
-        16        681 33101  28510 7L   S6_3b    
-        16        682 33101  31588 7R   S7_4     
-        16        683 33101  31563 7L   S7_4     
-        16        684 33101  31605 7R   S7_4     
-        16        685 33101  31543 7L   S7_4     
-        16        686 33101  31578 7R   S7_4     
-        16        687 33101  31552 7L   S7_4     
-        16        688 33101  31589 7R   S7_4     
-        16        689 33101  31557 7L   S7_4     
-        16        690 33101  31106 7R   S7_3     
-        16        691 33101  31083 7L   S7_3     
-        16        692 33101  31101 7R   S7_3     
-        16        693 33101  31098 7L   S7_3     
-        16        694 33101  31110 7R   S7_3     
-        16        695 33101  31093 7L   S7_3     
-        16        696 33101  31115 7R   S7_3     
-        16        697 33101  31088 7L   S7_3     
-        16        698 33101  30383 7R   S7_2     
-        16        699 33101  30406 7L   S7_2     
-        16        700 33101  30386 7R   S7_2     
-        16        701 33101  31636 8L   S7_4     
-        16        702 33101  31694 8R   S7_4     
-        16        703 33101  31621 8L   S7_4     
-        16        704 33101  31699 8R   S7_4     
-        16        705 33101  31606 8L   S7_4     
-        16        706 33101  31704 8R   S7_4     
-        16        707 33101  31616 8L   S7_4     
-        16        708 33101  31657 8R   S7_4     
-        16        709 33101  31641 8L   S7_4     
-        16        710 33101  31669 8R   S7_4     
-        16        711 33101  31631 8L   S7_4     
-        16        712 33101  31679 8R   S7_4     
-        16        713 33101  31646 8L   S7_4     
-        16        714 33101  31684 8R   S7_4     
-        16        715 33101  31626 8L   S7_4     
-        16        716 33101  31689 8R   S7_4     
-        16        717 33101  31126 8L   S7_3     
-        16        718 33101  31654 8R   S7_4     
-        16        719 33101  28552 8L   P13      
-        16        720 33101  25046 8R   P10_1    
-        16        721 33101  31637 8L   S7_4     
-        16        722 33101  31695 8R   S7_4     
-        16        723 33101  31622 8L   S7_4     
-        16        724 33101  31700 8R   S7_4     
-        16        725 33101  31607 8L   S7_4     
-        16        726 33101  31705 8R   S7_4     
-        16        727 33101  31617 8L   S7_4     
-        16        728 33101  31662 8R   S7_4     
-        16        729 33101  31642 8L   S7_4     
-        16        730 33101  31670 8R   S7_4     
-        16        731 33101  31632 8L   S7_4     
-        16        732 33101  31680 8R   S7_4     
-        16        733 33101  31647 8L   S7_4     
-        16        734 33101  31685 8R   S7_4     
-        16        735 33101  31612 8L   S7_4     
-        16        736 33101  31690 8R   S7_4     
-        16        737 33101  31127 8L   S7_3     
-        16        738 33101  31655 8R   S7_4     
-        16        739 33101  30426 8L   S7_2     
-        16        740 33101  25049 8R   P10_1    
-        16        741 33101  31638 8L   S7_4     
-        16        742 33101  31696 8R   S7_4     
-        16        743 33101  31623 8L   S7_4     
-        16        744 33101  31701 8R   S7_4     
-        16        745 33101  31609 8L   S7_4     
-        16        746 33101  31666 8R   S7_4     
-        16        747 33101  31618 8L   S7_4     
-        16        748 33101  31663 8R   S7_4     
-        16        749 33101  31643 8L   S7_4     
-        16        750 33101  31671 8R   S7_4     
-        16        751 33101  31633 8L   S7_4     
-        16        752 33101  31681 8R   S7_4     
-        16        753 33101  31648 8L   S7_4     
-        16        754 33101  31686 8R   S7_4     
-        16        755 33101  31613 8L   S7_4     
-        16        756 33101  31691 8R   S7_4     
-        16        757 33101  31123 8L   S7_3     
-        16        758 33101  31656 8R   S7_4     
-        16        759 33101  30427 8L   S7_2     
-        16        760 33101  30492 8R   S7_2     
-        16        761 33101  31639 8L   S7_4     
-        16        762 33101  31698 8R   S7_4     
-        16        763 33101  31624 8L   S7_4     
-        16        764 33101  31702 8R   S7_4     
-        16        765 33101  31610 8L   S7_4     
-        16        766 33101  31667 8R   S7_4     
-        16        767 33101  31619 8L   S7_4     
-        16        768 33101  31677 8R   S7_4     
-        16        769 33101  31644 8L   S7_4     
-        16        770 33101  31665 8R   S7_4     
-        16        771 33101  31615 8L   S7_4     
-        16        772 33101  31682 8R   S7_4     
-        16        773 33101  31649 8L   S7_4     
-        16        774 33101  31687 8R   S7_4     
-        16        775 33101  31629 8L   S7_4     
-        16        776 33101  31692 8R   S7_4     
-        16        777 33101  31124 8L   S7_3     
-        16        778 33101  31658 8R   S7_4     
-        16        779 33101  30434 8L   S7_2     
-        16        780 33101   3513 8R   11       
-        16        781 33101  31640 8L   S7_4     
-        16        782 33101  31672 8R   S7_4     
-        16        783 33101  31625 8L   S7_4     
-        16        784 33101  31703 8R   S7_4     
-        16        785 33101  31611 8L   S7_4     
-        16        786 33101  31668 8R   S7_4     
-        16        787 33101  31620 8L   S7_4     
-        16        788 33101  31678 8R   S7_4     
-        16        789 33101  31645 8L   S7_4     
-        16        790 33101  31675 8R   S7_4     
-        16        791 33101  31635 8L   S7_4     
-        16        792 33101  31683 8R   S7_4     
-        16        793 33101  31121 8L   S7_3     
-        16        794 33101  31688 8R   S7_4     
-        16        795 33101  31630 8L   S7_4     
-        16        796 33101  31693 8R   S7_4     
-        16        797 33101  31125 8L   S7_3     
-        16        798 33101  31659 8R   S7_4     
-        16        799 33101   3656 8L   11       
-        16        800 33101   3515 8R   11       
-        16        801 33101  31736 9L   S7_4     
-        16        802 33101  31769 9R   S7_4     
-        16        803 33101  31724 9L   S7_4     
-        16        804 33101   3761 9R   11       
-        16        805 33101  31723 9L   S7_4     
-        16        806 33101  31780 9R   S7_4     
-        16        807 33101  31706 9L   S7_4     
-        16        808 33101  31782 9R   S7_4     
-        16        809 33101  31716 9L   S7_4     
-        16        810 33101  31779 9R   S7_4     
-        16        811 33101   3838 9L   11       
-        16        812 33101  31762 9R   S7_4     
-        16        813 33101  31746 9L   S7_4     
-        16        814 33101  31771 9R   S7_4     
-        16        815 33101  31731 9L   S7_4     
-        16        816 33101  31757 9R   S7_4     
-        16        817 33101   3813 9L   11       
-        16        818 33101  31135 9R   S7_3     
-        16        819 33101  18054 9L   S3       
-        16        820 33101  31140 9R   S7_3     
-        16        821 33101  31737 9L   S7_4     
-        16        822 33101  31778 9R   S7_4     
-        16        823 33101  31725 9L   S7_4     
-        16        824 33101  31763 9R   S7_4     
-        16        825 33101  31711 9L   S7_4     
-        16        826 33101  31787 9R   S7_4     
-        16        827 33101  31707 9L   S7_4     
-        16        828 33101  31783 9R   S7_4     
-        16        829 33101  31717 9L   S7_4     
-        16        830 33101  31793 9R   S7_4     
-        16        831 33101  31751 9L   S7_4     
-        16        832 33101  31764 9R   S7_4     
-        16        833 33101  31747 9L   S7_4     
-        16        834 33101  31773 9R   S7_4     
-        16        835 33101  31732 9L   S7_4     
-        16        836 33101  31758 9R   S7_4     
-        16        837 33101   9782 9L   P6       
-        16        838 33101  31136 9R   S7_3     
-        16        839 33101  28882 9L   P12      
-        16        840 33101  31141 9R   S7_3     
-        16        841 33101  31738 9L   S7_4     
-        16        842 33101  31781 9R   S7_4     
-        16        843 33101  31726 9L   S7_4     
-        16        844 33101  31768 9R   S7_4     
-        16        845 33101  31713 9L   S7_4     
-        16        846 33101  31789 9R   S7_4     
-        16        847 33101  31708 9L   S7_4     
-        16        848 33101  31784 9R   S7_4     
-        16        849 33101  31718 9L   S7_4     
-        16        850 33101  31794 9R   S7_4     
-        16        851 33101  31752 9L   S7_4     
-        16        852 33101  31765 9R   S7_4     
-        16        853 33101  31748 9L   S7_4     
-        16        854 33101  31774 9R   S7_4     
-        16        855 33101  31733 9L   S7_4     
-        16        856 33101  31759 9R   S7_4     
-        16        857 33101   9815 9L   P6       
-        16        858 33101  31137 9R   S7_3     
-        16        859 33101  30497 9L   S7_2     
-        16        860 33101  31142 9R   S7_3     
-        16        861 33101  31740 9L   S7_4     
-        16        862 33101  31792 9R   S7_4     
-        16        863 33101  31727 9L   S7_4     
-        16        864 33101  31772 9R   S7_4     
-        16        865 33101  31714 9L   S7_4     
-        16        866 33101  31790 9R   S7_4     
-        16        867 33101  31709 9L   S7_4     
-        16        868 33101  31785 9R   S7_4     
-        16        869 33101  31719 9L   S7_4     
-        16        870 33101  31795 9R   S7_4     
-        16        871 33101  31754 9L   S7_4     
-        16        872 33101  31766 9R   S7_4     
-        16        873 33101  31749 9L   S7_4     
-        16        874 33101  31775 9R   S7_4     
-        16        875 33101  31734 9L   S7_4     
-        16        876 33101  31760 9R   S7_4     
-        16        877 33101  26855 9L   S6_2     
-        16        878 33101  31138 9R   S7_3     
-        16        879 33101  30538 9L   S7_2     
-        16        880 33101  30583 9R   S7_2     
-        16        881 33101  31730 9L   S7_4     
-        16        882 33101  31796 9R   S7_4     
-        16        883 33101  31728 9L   S7_4     
-        16        884 33101  31799 9R   S7_4     
-        16        885 33101  31715 9L   S7_4     
-        16        886 33101  31791 9R   S7_4     
-        16        887 33101  31710 9L   S7_4     
-        16        888 33101  31786 9R   S7_4     
-        16        889 33101  31720 9L   S7_4     
-        16        890 33101  31797 9R   S7_4     
-        16        891 33101  31755 9L   S7_4     
-        16        892 33101  31767 9R   S7_4     
-        16        893 33101  31750 9L   S7_4     
-        16        894 33101  31776 9R   S7_4     
-        16        895 33101  31735 9L   S7_4     
-        16        896 33101  31761 9R   S7_4     
-        16        897 33101  30539 9L   S7_2     
-        16        898 33101  31139 9R   S7_3     
-        16        899 33101  30540 9L   S7_2     
-        16        900 33101  30556 9R   S7_2     
-        16        901 33101  30609 10L  S7_2     
-        16        902 33101  31152 10R  S7_3     
-        16        903 33101   4094 10L  B12      
-        16        904 33101  30349 10R  S7_2     
-        16        905 33101  30584 10L  S7_2     
-        16        906 33101  27636 10R  S6_3a    
-        16        907 33101  30589 10L  S7_2     
-        16        908 33101  30357 10R  S7_2     
-        16        909 33101  30604 10L  S7_2     
-        16        910 33101  30365 10R  S7_2     
-        16        911 33101  30617 10L  S7_2     
-        16        912 33101  30372 10R  S7_2     
-        16        913 33101  30594 10L  S7_2     
-        16        914 33101  30337 10R  S7_2     
-        16        915 33101  30598 10L  S7_2     
-        16        916 33101  30342 10R  S7_2     
-        16        917 33101  30614 10L  S7_2     
-        16        918 33101  30352 10R  S7_2     
-        16        919 33101  27610 10L  S6_3a    
-        16        920 33101  30341 10R  S7_2     
-        16        921 33101  30615 10L  S7_2     
-        16        922 33101  30358 10R  S7_2     
-        16        923 33101  30595 10L  S7_2     
-        16        924 33101  30375 10R  S7_2     
-        16        925 33101  30585 10L  S7_2     
-        16        926 33101  27637 10R  S6_3a    
-        16        927 33101  30590 10L  S7_2     
-        16        928 33101  30360 10R  S7_2     
-        16        929 33101  30605 10L  S7_2     
-        16        930 33101  30367 10R  S7_2     
-        16        931 33101  30618 10L  S7_2     
-        16        932 33101  30373 10R  S7_2     
-        16        933 33101  26434 10L  S06_1    
-        16        934 33101  30338 10R  S7_2     
-        16        935 33101  30600 10L  S7_2     
-        16        936 33101  30344 10R  S7_2     
-        16        937 33101  30610 10L  S7_2     
-        16        938 33101  30353 10R  S7_2     
-        16        939 33101  28467 10L  P13      
-        16        940 33101  30332 10R  S7_2     
-        16        941 33101  30616 10L  S7_2     
-        16        942 33101  30359 10R  S7_2     
-        16        943 33101  30596 10L  S7_2     
-        16        944 33101  30376 10R  S7_2     
-        16        945 33101  30586 10L  S7_2     
-        16        946 33101  27638 10R  S6_3a    
-        16        947 33101  30591 10L  S7_2     
-        16        948 33101  30361 10R  S7_2     
-        16        949 33101  30606 10L  S7_2     
-        16        950 33101  30368 10R  S7_2     
-        16        951 33101  30620 10L  S7_2     
-        16        952 33101  30374 10R  S7_2     
-        16        953 33101  26859 10L  S6_2     
-        16        954 33101  30343 10R  S7_2     
-        16        955 33101  30601 10L  S7_2     
-        16        956 33101  30345 10R  S7_2     
-        16        957 33101  30611 10L  S7_2     
-        16        958 33101  30354 10R  S7_2     
-        16        959 33101  28468 10L  S6_3b    
-        16        960 33101  30333 10R  S7_2     
-        16        961 33101  30619 10L  S7_2     
-        16        962 33101  30362 10R  S7_2     
-        16        963 33101  30597 10L  S7_2     
-        16        964 33101  30378 10R  S7_2     
-        16        965 33101  30587 10L  S7_2     
-        16        966 33101  30351 10R  S7_2     
-        16        967 33101  30592 10L  S7_2     
-        16        968 33101  30363 10R  S7_2     
-        16        969 33101  30607 10L  S7_2     
-        16        970 33101  30369 10R  S7_2     
-        16        971 33101  30621 10L  S7_2     
-        16        972 33101  30377 10R  S7_2     
-        16        973 33101  27577 10L  S6_3a    
-        16        974 33101  30348 10R  S7_2     
-        16        975 33101  30602 10L  S7_2     
-        16        976 33101  30346 10R  S7_2     
-        16        977 33101  30612 10L  S7_2     
-        16        978 33101  30355 10R  S7_2     
-        16        979 33101  28470 10L  S6_3b    
-        16        980 33101  30334 10R  S7_2     
-        16        981 33101  30622 10L  S7_2     
-        16        982 33101  30366 10R  S7_2     
-        16        983 33101  30599 10L  S7_2     
-        16        984 33101  30380 10R  S7_2     
-        16        985 33101  30588 10L  S7_2     
-        16        986 33101  30381 10R  S7_2     
-        16        987 33101  30593 10L  S7_2     
-        16        988 33101  30364 10R  S7_2     
-        16        989 33101  30608 10L  S7_2     
-        16        990 33101  30371 10R  S7_2     
-        16        991 33101  30623 10L  S7_2     
-        16        992 33101  30379 10R  S7_2     
-        16        993 33101  27596 10L  S6_3a    
-        16        994 33101  30350 10R  S7_2     
-        16        995 33101  30603 10L  S7_2     
-        16        996 33101  30347 10R  S7_2     
-        16        997 33101  30613 10L  S7_2     
-        16        998 33101  30356 10R  S7_2     
-        16        999 33101  28471 10L  S6_3b    
-        16       1000 33101  30336 10R  S7_2     
-        16       1001 33101  31153 11L  S7_3     
-        16       1002 33101  28767 11R  P12      
-        16       1003 33101  31188 11L  S7_3     
-        16       1004 33101  30635 11R  S7_2     
-        16       1005 33101  31193 11L  S7_3     
-        16       1006 33101  30639 11R  S7_2     
-        16       1007 33101  31154 11L  S7_3     
-        16       1008 33101  30634 11R  S7_2     
-        16       1009 33101  31183 11L  S7_3     
-        16       1010 33101  30648 11R  S7_2     
-        16       1011 33101  31162 11L  S7_3     
-        16       1012 33101  30624 11R  S7_2     
-        16       1013 33101  31178 11L  S7_3     
-        16       1014 33101  30654 11R  S7_2     
-        16       1015 33101  31173 11L  S7_3     
-        16       1016 33101  27702 11R  S6_3a    
-        16       1017 33101  31168 11L  S7_3     
-        16       1018 33101  27711 11R  S6_3a    
-        16       1019 33101  27661 11L  S6_3a    
-        16       1020 33101  27703 11R  S6_3a    
-        16       1021 33101  31155 11L  S7_3     
-        16       1022 33101  30659 11R  S7_2     
-        16       1023 33101  31189 11L  S7_3     
-        16       1024 33101  30637 11R  S7_2     
-        16       1025 33101  31194 11L  S7_3     
-        16       1026 33101  30640 11R  S7_2     
-        16       1027 33101  31156 11L  S7_3     
-        16       1028 33101  30636 11R  S7_2     
-        16       1029 33101  31184 11L  S7_3     
-        16       1030 33101  30649 11R  S7_2     
-        16       1031 33101  31163 11L  S7_3     
-        16       1032 33101  30625 11R  S7_2     
-        16       1033 33101  31179 11L  S7_3     
-        16       1034 33101  30655 11R  S7_2     
-        16       1035 33101  31174 11L  S7_3     
-        16       1036 33101  27733 11R  S6_3a    
-        16       1037 33101  31169 11L  S7_3     
-        16       1038 33101  27730 11R  S6_3a    
-        16       1039 33101  27655 11L  S6_3a    
-        16       1040 33101  27736 11R  S6_3a    
-        16       1041 33101  31158 11L  S7_3     
-        16       1042 33101  30630 11R  S7_2     
-        16       1043 33101  31190 11L  S7_3     
-        16       1044 33101  30638 11R  S7_2     
-        16       1045 33101  31195 11L  S7_3     
-        16       1046 33101  30641 11R  S7_2     
-        16       1047 33101  31157 11L  S7_3     
-        16       1048 33101  30644 11R  S7_2     
-        16       1049 33101  31185 11L  S7_3     
-        16       1050 33101  30650 11R  S7_2     
-        16       1051 33101  31164 11L  S7_3     
-        16       1052 33101  30626 11R  S7_2     
-        16       1053 33101  31180 11L  S7_3     
-        16       1054 33101  30656 11R  S7_2     
-        16       1055 33101  31175 11L  S7_3     
-        16       1056 33101  27740 11R  S6_3a    
-        16       1057 33101  31170 11L  S7_3     
-        16       1058 33101  27731 11R  S6_3a    
-        16       1059 33101  27659 11L  S6_3a    
-        16       1060 33101  29381 11R  P13      
-        16       1061 33101  31198 11L  S7_3     
-        16       1062 33101  30631 11R  S7_2     
-        16       1063 33101  31191 11L  S7_3     
-        16       1064 33101  30646 11R  S7_2     
-        16       1065 33101  31196 11L  S7_3     
-        16       1066 33101  30642 11R  S7_2     
-        16       1067 33101  31159 11L  S7_3     
-        16       1068 33101  30645 11R  S7_2     
-        16       1069 33101  31186 11L  S7_3     
-        16       1070 33101  30651 11R  S7_2     
-        16       1071 33101  31165 11L  S7_3     
-        16       1072 33101  30627 11R  S7_2     
-        16       1073 33101  31181 11L  S7_3     
-        16       1074 33101  30657 11R  S7_2     
-        16       1075 33101  31176 11L  S7_3     
-        16       1076 33101  29383 11R  P13      
-        16       1077 33101  31171 11L  S7_3     
-        16       1078 33101  27732 11R  S6_3a    
-        16       1079 33101  27668 11L  S6_3a    
-        16       1080 33101  29382 11R  P13      
-        16       1081 33101  31199 11L  S7_3     
-        16       1082 33101  30633 11R  S7_2     
-        16       1083 33101  31192 11L  S7_3     
-        16       1084 33101  30653 11R  S7_2     
-        16       1085 33101  31197 11L  S7_3     
-        16       1086 33101  30632 11R  S7_2     
-        16       1087 33101  31160 11L  S7_3     
-        16       1088 33101  30647 11R  S7_2     
-        16       1089 33101  31187 11L  S7_3     
-        16       1090 33101  30652 11R  S7_2     
-        16       1091 33101  31167 11L  S7_3     
-        16       1092 33101  30628 11R  S7_2     
-        16       1093 33101  31182 11L  S7_3     
-        16       1094 33101  30658 11R  S7_2     
-        16       1095 33101  31177 11L  S7_3     
-        16       1096 33101  29386 11R  P13      
-        16       1097 33101  31172 11L  S7_3     
-        16       1098 33101  27738 11R  S6_3a    
-        16       1099 33101  27680 11L  S6_3a    
-        16       1100 33101  29384 11R  P13      
-        16       1101 33101  31210 12L  S7_3     
-        16       1102 33101  31226 12R  S7_3     
-        16       1103 33101  31216 12L  S7_3     
-        16       1104 33101  27837 12R  S6_3a    
-        16       1105 33101  31222 12L  S7_3     
-        16       1106 33101  27423 12R  S6_2b    
-        16       1107 33101  31206 12L  S7_3     
-        16       1108 33101  30681 12R  S7_2     
-        16       1109 33101  31201 12L  S7_3     
-        16       1110 33101  30700 12R  S7_2     
-        16       1111 33101  28939 12L  P12      
-        16       1112 33101  30685 12R  S7_2     
-        16       1113 33101  30660 12L  S7_2     
-        16       1114 33101  30686 12R  S7_2     
-        16       1115 33101  27754 12L  S6_3a    
-        16       1116 33101  30688 12R  S7_2     
-        16       1117 33101  30668 12L  S7_2     
-        16       1118 33101  30678 12R  S7_2     
-        16       1119 33101  27747 12L  S6_3a    
-        16       1120 33101  27823 12R  S6_3a    
-        16       1121 33101  31211 12L  S7_3     
-        16       1122 33101  31227 12R  S7_3     
-        16       1123 33101  31217 12L  S7_3     
-        16       1124 33101  27840 12R  S6_3a    
-        16       1125 33101  31212 12L  S7_3     
-        16       1126 33101  27426 12R  S6_2b    
-        16       1127 33101  31207 12L  S7_3     
-        16       1128 33101  30687 12R  S7_2     
-        16       1129 33101  31202 12L  S7_3     
-        16       1130 33101  30408 12R  S7_2     
-        16       1131 33101  30666 12L  S7_2     
-        16       1132 33101  30690 12R  S7_2     
-        16       1133 33101  30661 12L  S7_2     
-        16       1134 33101  30695 12R  S7_2     
-        16       1135 33101  27765 12L  S6_3a    
-        16       1136 33101  30680 12R  S7_2     
-        16       1137 33101  30669 12L  S7_2     
-        16       1138 33101  27847 12R  S6_3a    
-        16       1139 33101  27780 12L  S6_3a    
-        16       1140 33101  27833 12R  S6_3a    
-        16       1141 33101  31218 12L  S7_3     
-        16       1142 33101  31228 12R  S7_3     
-        16       1143 33101  31219 12L  S7_3     
-        16       1144 33101  27843 12R  S6_3a    
-        16       1145 33101  31213 12L  S7_3     
-        16       1146 33101  27842 12R  S6_3a    
-        16       1147 33101  31208 12L  S7_3     
-        16       1148 33101  30689 12R  S7_2     
-        16       1149 33101  31203 12L  S7_3     
-        16       1150 33101  30409 12R  S7_2     
-        16       1151 33101  30667 12L  S7_2     
-        16       1152 33101  30691 12R  S7_2     
-        16       1153 33101  30662 12L  S7_2     
-        16       1154 33101  30697 12R  S7_2     
-        16       1155 33101  27770 12L  S6_3a    
-        16       1156 33101  30682 12R  S7_2     
-        16       1157 33101  30671 12L  S7_2     
-        16       1158 33101  27849 12R  S6_3a    
-        16       1159 33101  27784 12L  S6_3a    
-        16       1160 33101  29398 12R  P13      
-        16       1161 33101  31224 12L  S7_3     
-        16       1162 33101  31229 12R  S7_3     
-        16       1163 33101  31220 12L  S7_3     
-        16       1164 33101  27844 12R  S6_3a    
-        16       1165 33101  31214 12L  S7_3     
-        16       1166 33101  29396 12R  P13      
-        16       1167 33101  31209 12L  S7_3     
-        16       1168 33101  30696 12R  S7_2     
-        16       1169 33101  31204 12L  S7_3     
-        16       1170 33101  30410 12R  S7_2     
-        16       1171 33101  30670 12L  S7_2     
-        16       1172 33101  30693 12R  S7_2     
-        16       1173 33101  30663 12L  S7_2     
-        16       1174 33101  30698 12R  S7_2     
-        16       1175 33101  27774 12L  S6_3a    
-        16       1176 33101  30683 12R  S7_2     
-        16       1177 33101  30673 12L  S7_2     
-        16       1178 33101  27850 12R  S6_3a    
-        16       1179 33101  27792 12L  S6_3a    
-        16       1180 33101  29399 12R  P13      
-        16       1181 33101  31225 12L  S7_3     
-        16       1182 33101  27812 12R  S6_3a    
-        16       1183 33101  31223 12L  S7_3     
-        16       1184 33101  27848 12R  S6_3a    
-        16       1185 33101  31215 12L  S7_3     
-        16       1186 33101  30676 12R  S7_2     
-        16       1187 33101  31221 12L  S7_3     
-        16       1188 33101  30407 12R  S7_2     
-        16       1189 33101  31205 12L  S7_3     
-        16       1190 33101  30675 12R  S7_2     
-        16       1191 33101  29392 12L  P13      
-        16       1192 33101  30694 12R  S7_2     
-        16       1193 33101  30664 12L  S7_2     
-        16       1194 33101  30699 12R  S7_2     
-        16       1195 33101  27775 12L  S6_3a    
-        16       1196 33101  30684 12R  S7_2     
-        16       1197 33101  30674 12L  S7_2     
-        16       1198 33101  27851 12R  S6_3a    
-        16       1199 33101  29393 12L  P13      
-        16       1200 33101  29400 12R  P13      
-        16       1201 33101  29355 13L  P13      
-        16       1202 33101  31300 13R  S7_3     
-        16       1203 33101  31230 13L  S7_3     
-        16       1204 33101  31265 13R  S7_3     
-        16       1205 33101  31250 13L  S7_3     
-        16       1206 33101  31275 13R  S7_3     
-        16       1207 33101  31260 13L  S7_3     
-        16       1208 33101  31295 13R  S7_3     
-        16       1209 33101  27876 13L  S6_3a    
-        16       1210 33101  31267 13R  S7_3     
-        16       1211 33101  31239 13L  S7_3     
-        16       1212 33101  31280 13R  S7_3     
-        16       1213 33101  27865 13L  S6_3a    
-        16       1214 33101  31274 13R  S7_3     
-        16       1215 33101  31240 13L  S7_3     
-        16       1216 33101  25691 13R  P10_1    
-        16       1217 33101  31231 13L  S7_3     
-        16       1218 33101  27476 13R  S6_2b    
-        16       1219 33101  29336 13L  S6_3b    
-        16       1220 33101  29363 13R  S6_3b    
-        16       1221 33101  29358 13L  P13      
-        16       1222 33101  31273 13R  S7_3     
-        16       1223 33101  31236 13L  S7_3     
-        16       1224 33101  31266 13R  S7_3     
-        16       1225 33101  31251 13L  S7_3     
-        16       1226 33101  31279 13R  S7_3     
-        16       1227 33101  31261 13L  S7_3     
-        16       1228 33101  31296 13R  S7_3     
-        16       1229 33101  27883 13L  S6_3a    
-        16       1230 33101  31268 13R  S7_3     
-        16       1231 33101  31246 13L  S7_3     
-        16       1232 33101  31281 13R  S7_3     
-        16       1233 33101  29341 13L  S6_3b    
-        16       1234 33101  31290 13R  S7_3     
-        16       1235 33101  31241 13L  S7_3     
-        16       1236 33101  27963 13R  S6_3a    
-        16       1237 33101  31232 13L  S7_3     
-        16       1238 33101  27497 13R  S6_2b    
-        16       1239 33101  29342 13L  S6_3b    
-        16       1240 33101  29366 13R  S6_3b    
-        16       1241 33101  31256 13L  S7_3     
-        16       1242 33101  31276 13R  S7_3     
-        16       1243 33101  31245 13L  S7_3     
-        16       1244 33101  31278 13R  S7_3     
-        16       1245 33101  31252 13L  S7_3     
-        16       1246 33101  31286 13R  S7_3     
-        16       1247 33101  31262 13L  S7_3     
-        16       1248 33101  31297 13R  S7_3     
-        16       1249 33101  27887 13L  S6_3a    
-        16       1250 33101  31269 13R  S7_3     
-        16       1251 33101  31247 13L  S7_3     
-        16       1252 33101  31282 13R  S7_3     
-        16       1253 33101  29359 13L  P13      
-        16       1254 33101  31291 13R  S7_3     
-        16       1255 33101  31242 13L  S7_3     
-        16       1256 33101  27982 13R  S6_3a    
-        16       1257 33101  31233 13L  S7_3     
-        16       1258 33101  27928 13R  S6_3a    
-        16       1259 33101  29343 13L  S6_3b    
-        16       1260 33101  27984 13R  S6_3a    
-        16       1261 33101  31257 13L  S7_3     
-        16       1262 33101  31277 13R  S7_3     
-        16       1263 33101  27898 13L  S6_3a    
-        16       1264 33101  31285 13R  S7_3     
-        16       1265 33101  31253 13L  S7_3     
-        16       1266 33101  31287 13R  S7_3     
-        16       1267 33101  31263 13L  S7_3     
-        16       1268 33101  31298 13R  S7_3     
-        16       1269 33101  31237 13L  S7_3     
-        16       1270 33101  31270 13R  S7_3     
-        16       1271 33101  31248 13L  S7_3     
-        16       1272 33101  31283 13R  S7_3     
-        16       1273 33101  29360 13L  P13      
-        16       1274 33101  31292 13R  S7_3     
-        16       1275 33101  31243 13L  S7_3     
-        16       1276 33101  27995 13R  S6_3a    
-        16       1277 33101  31234 13L  S7_3     
-        16       1278 33101  27930 13R  S6_3a    
-        16       1279 33101  29344 13L  S6_3b    
-        16       1280 33101  27998 13R  S6_3a    
-        16       1281 33101  31259 13L  S7_3     
-        16       1282 33101  31271 13R  S7_3     
-        16       1283 33101  29338 13L  S6_3b    
-        16       1284 33101  31289 13R  S7_3     
-        16       1285 33101  31255 13L  S7_3     
-        16       1286 33101  31288 13R  S7_3     
-        16       1287 33101  31264 13L  S7_3     
-        16       1288 33101  31299 13R  S7_3     
-        16       1289 33101  31238 13L  S7_3     
-        16       1290 33101  31272 13R  S7_3     
-        16       1291 33101  31249 13L  S7_3     
-        16       1292 33101  31284 13R  S7_3     
-        16       1293 33101  29362 13L  P13      
-        16       1294 33101  31294 13R  S7_3     
-        16       1295 33101  31244 13L  S7_3     
-        16       1296 33101  28000 13R  S6_3a    
-        16       1297 33101  31235 13L  S7_3     
-        16       1298 33101  27953 13R  S6_3a    
-        16       1299 33101  29345 13L  S6_3b    
-        16       1300 33101  27999 13R  S6_3a    
-        16       1301 33101  29456 14L  R1       
-        16       1302 33101  29580 14R  R1       
-        16       1303 33101  29461 14L  R1       
-        16       1304 33101  29585 14R  R1       
-        16       1305 33101  29466 14L  R1       
-        16       1306 33101  29590 14R  R1       
-        16       1307 33101  29472 14L  R1       
-        16       1308 33101  29595 14R  R1       
-        16       1309 33101  29480 14L  R1       
-        16       1310 33101  29752 14R  S7_1     
-        16       1311 33101  29486 14L  R1       
-        16       1312 33101  29757 14R  S7_1     
-        16       1313 33101  29494 14L  R1       
-        16       1314 33101  29762 14R  S7_1     
-        16       1315 33101  29703 14L  S7_1     
-        16       1316 33101  29767 14R  S7_1     
-        16       1317 33101  29711 14L  S7_1     
-        16       1318 33101  29772 14R  S7_1     
-        16       1319 33101  29716 14L  S7_1     
-        16       1320 33101  29777 14R  S7_1     
-        16       1321 33101  29457 14L  R1       
-        16       1322 33101  29581 14R  R1       
-        16       1323 33101  29462 14L  R1       
-        16       1324 33101  29586 14R  R1       
-        16       1325 33101  29467 14L  R1       
-        16       1326 33101  29591 14R  R1       
-        16       1327 33101  29474 14L  R1       
-        16       1328 33101  29596 14R  R1       
-        16       1329 33101  29481 14L  R1       
-        16       1330 33101  29753 14R  S7_1     
-        16       1331 33101  29487 14L  R1       
-        16       1332 33101  29758 14R  S7_1     
-        16       1333 33101  29495 14L  R1       
-        16       1334 33101  29763 14R  S7_1     
-        16       1335 33101  29704 14L  S7_1     
-        16       1336 33101  29768 14R  S7_1     
-        16       1337 33101  29712 14L  S7_1     
-        16       1338 33101  29773 14R  S7_1     
-        16       1339 33101  29717 14L  S7_1     
-        16       1340 33101  29778 14R  S7_1     
-        16       1341 33101  29458 14L  R1       
-        16       1342 33101  29582 14R  R1       
-        16       1343 33101  29463 14L  R1       
-        16       1344 33101  29587 14R  R1       
-        16       1345 33101  29468 14L  R1       
-        16       1346 33101  29592 14R  R1       
-        16       1347 33101  29476 14L  R1       
-        16       1348 33101  29597 14R  R1       
-        16       1349 33101  29482 14L  R1       
-        16       1350 33101  29754 14R  S7_1     
-        16       1351 33101  29488 14L  R1       
-        16       1352 33101  29759 14R  S7_1     
-        16       1353 33101  29498 14L  R1       
-        16       1354 33101  29764 14R  S7_1     
-        16       1355 33101  29707 14L  S7_1     
-        16       1356 33101  29769 14R  S7_1     
-        16       1357 33101  29713 14L  S7_1     
-        16       1358 33101  29774 14R  S7_1     
-        16       1359 33101  29718 14L  S7_1     
-        16       1360 33101  29779 14R  S7_1     
-        16       1361 33101  29459 14L  R1       
-        16       1362 33101  29583 14R  R1       
-        16       1363 33101  29464 14L  R1       
-        16       1364 33101  29588 14R  R1       
-        16       1365 33101  29469 14L  R1       
-        16       1366 33101  29593 14R  R1       
-        16       1367 33101  29478 14L  R1       
-        16       1368 33101  29599 14R  R1       
-        16       1369 33101  29483 14L  R1       
-        16       1370 33101  29755 14R  S7_1     
-        16       1371 33101  29489 14L  R1       
-        16       1372 33101  29760 14R  S7_1     
-        16       1373 33101  29499 14L  R1       
-        16       1374 33101  29765 14R  S7_1     
-        16       1375 33101  29708 14L  S7_1     
-        16       1376 33101  29770 14R  S7_1     
-        16       1377 33101  29714 14L  S7_1     
-        16       1378 33101  29775 14R  S7_1     
-        16       1379 33101  29720 14L  S7_1     
-        16       1380 33101  29780 14R  S7_1     
-        16       1381 33101  29460 14L  R1       
-        16       1382 33101  29584 14R  R1       
-        16       1383 33101  29465 14L  R1       
-        16       1384 33101  29589 14R  R1       
-        16       1385 33101  29471 14L  R1       
-        16       1386 33101  29594 14R  R1       
-        16       1387 33101  29479 14L  R1       
-        16       1388 33101  29751 14R  S7_1     
-        16       1389 33101  29485 14L  R1       
-        16       1390 33101  29756 14R  S7_1     
-        16       1391 33101  29491 14L  R1       
-        16       1392 33101  29761 14R  S7_1     
-        16       1393 33101  29500 14L  R1       
-        16       1394 33101  29766 14R  S7_1     
-        16       1395 33101  29709 14L  S7_1     
-        16       1396 33101  29771 14R  S7_1     
-        16       1397 33101  29715 14L  S7_1     
-        16       1398 33101  29776 14R  S7_1     
-        16       1399 33101  29721 14L  S7_1     
-        16       1400 33101  29781 14R  S7_1     
-        16       1401 33101  29307 15L  P13      
-        16       1402 33101  27116 15R  S6_2b    
-        16       1403 33101  30844 15L  S7_3     
-        16       1404 33101  29312 15R  P13      
-        16       1405 33101  30859 15L  S7_3     
-        16       1406 33101  30872 15R  S7_3     
-        16       1407 33101  30865 15L  S7_3     
-        16       1408 33101  30877 15R  S7_3     
-        16       1409 33101  30853 15L  S7_3     
-        16       1410 33101  30882 15R  S7_3     
-        16       1411 33101  31321 15L  S07_4    
-        16       1412 33101  30889 15R  S7_3     
-        16       1413 33101  31329 15L  S07_4    
-        16       1414 33101  30894 15R  S7_3     
-        16       1415 33101  31335 15L  S07_4    
-        16       1416 33101  31348 15R  S07_4    
-        16       1417 33101  31340 15L  S07_4    
-        16       1418 33101  31354 15R  S07_4    
-        16       1419 33101  31345 15L  S07_4    
-        16       1420 33101  31359 15R  S07_4    
-        16       1421 33101  29811 15L  S7_1     
-        16       1422 33101  28199 15R  S6_3b    
-        16       1423 33101  30846 15L  S7_3     
-        16       1424 33101  29313 15R  P13      
-        16       1425 33101  30860 15L  S7_3     
-        16       1426 33101  30873 15R  S7_3     
-        16       1427 33101  30866 15L  S7_3     
-        16       1428 33101  30878 15R  S7_3     
-        16       1429 33101  30854 15L  S7_3     
-        16       1430 33101  30884 15R  S7_3     
-        16       1431 33101  31323 15L  S07_4    
-        16       1432 33101  30890 15R  S7_3     
-        16       1433 33101  31330 15L  S07_4    
-        16       1434 33101  30895 15R  S7_3     
-        16       1435 33101  31336 15L  S07_4    
-        16       1436 33101  31350 15R  S07_4    
-        16       1437 33101  31341 15L  S07_4    
-        16       1438 33101  31355 15R  S07_4    
-        16       1439 33101  30842 15L  S7_3     
-        16       1440 33101  31360 15R  S07_4    
-        16       1441 33101  30835 15L  S7_3     
-        16       1442 33101  28200 15R  S6_3b    
-        16       1443 33101  30848 15L  S7_3     
-        16       1444 33101  29314 15R  P13      
-        16       1445 33101  30861 15L  S7_3     
-        16       1446 33101  30874 15R  S7_3     
-        16       1447 33101  30867 15L  S7_3     
-        16       1448 33101  30879 15R  S7_3     
-        16       1449 33101  30855 15L  S7_3     
-        16       1450 33101  30885 15R  S7_3     
-        16       1451 33101  31325 15L  S07_4    
-        16       1452 33101  30891 15R  S7_3     
-        16       1453 33101  31332 15L  S07_4    
-        16       1454 33101  30896 15R  S7_3     
-        16       1455 33101  31337 15L  S07_4    
-        16       1456 33101  31351 15R  S07_4    
-        16       1457 33101  31342 15L  S07_4    
-        16       1458 33101  31356 15R  S07_4    
-        16       1459 33101  30856 15L  S7_3     
-        16       1460 33101  31361 15R  S07_4    
-        16       1461 33101  30838 15L  S7_3     
-        16       1462 33101  28213 15R  S6_3b    
-        16       1463 33101  30850 15L  S7_3     
-        16       1464 33101  30870 15R  S7_3     
-        16       1465 33101  30862 15L  S7_3     
-        16       1466 33101  30875 15R  S7_3     
-        16       1467 33101  30868 15L  S7_3     
-        16       1468 33101  30880 15R  S7_3     
-        16       1469 33101  30857 15L  S7_3     
-        16       1470 33101  30886 15R  S7_3     
-        16       1471 33101  31326 15L  S07_4    
-        16       1472 33101  30892 15R  S7_3     
-        16       1473 33101  31333 15L  S07_4    
-        16       1474 33101  30897 15R  S7_3     
-        16       1475 33101  31338 15L  S07_4    
-        16       1476 33101  31352 15R  S07_4    
-        16       1477 33101  31343 15L  S07_4    
-        16       1478 33101  31357 15R  S07_4    
-        16       1479 33101  30845 15L  S7_3     
-        16       1480 33101  31362 15R  S07_4    
-        16       1481 33101  30840 15L  S7_3     
-        16       1482 33101  29311 15R  P13      
-        16       1483 33101  30852 15L  S7_3     
-        16       1484 33101  30871 15R  S7_3     
-        16       1485 33101  30851 15L  S7_3     
-        16       1486 33101  30876 15R  S7_3     
-        16       1487 33101  31320 15L  S07_4    
-        16       1488 33101  30881 15R  S7_3     
-        16       1489 33101  30858 15L  S7_3     
-        16       1490 33101  30887 15R  S7_3     
-        16       1491 33101  31328 15L  S07_4    
-        16       1492 33101  30893 15R  S7_3     
-        16       1493 33101  31334 15L  S07_4    
-        16       1494 33101  30898 15R  S7_3     
-        16       1495 33101  31339 15L  S07_4    
-        16       1496 33101  31353 15R  S07_4    
-        16       1497 33101  31344 15L  S07_4    
-        16       1498 33101  31358 15R  S07_4    
-        16       1499 33101  30864 15L  S7_3     
-        16       1500 33101  31363 15R  S07_4    
-        16       1501 33101  26070 16L  S06      
-        16       1502 33101  26106 16R  S06      
-        16       1503 33101  29902 16L  S7_1     
-        16       1504 33101  28341 16R  S6_3b    
-        16       1505 33101  30903 16L  S7_3     
-        16       1506 33101  28712 16R  P12      
-        16       1507 33101  30909 16L  S7_3     
-        16       1508 33101  30922 16R  S7_3     
-        16       1509 33101  30914 16L  S7_3     
-        16       1510 33101  30928 16R  S7_3     
-        16       1511 33101  31378 16L  S07_4    
-        16       1512 33101  30933 16R  S7_3     
-        16       1513 33101  31385 16L  S07_4    
-        16       1514 33101  31413 16R  S07_4    
-        16       1515 33101  31391 16L  S07_4    
-        16       1516 33101  31420 16R  S07_4    
-        16       1517 33101  31397 16L  S07_4    
-        16       1518 33101  31428 16R  S07_4    
-        16       1519 33101  31403 16L  S07_4    
-        16       1520 33101  31434 16R  S07_4    
-        16       1521 33101  28265 16L  S6_3b    
-        16       1522 33101  28289 16R  S6_3b    
-        16       1523 33101  29907 16L  S7_1     
-        16       1524 33101  28689 16R  P12      
-        16       1525 33101  30904 16L  S7_3     
-        16       1526 33101  29322 16R  P13      
-        16       1527 33101  30910 16L  S7_3     
-        16       1528 33101  30923 16R  S7_3     
-        16       1529 33101  30915 16L  S7_3     
-        16       1530 33101  30929 16R  S7_3     
-        16       1531 33101  31379 16L  S07_4    
-        16       1532 33101  30934 16R  S7_3     
-        16       1533 33101  31386 16L  S07_4    
-        16       1534 33101  31414 16R  S07_4    
-        16       1535 33101  31392 16L  S07_4    
-        16       1536 33101  31422 16R  S07_4    
-        16       1537 33101  31398 16L  S07_4    
-        16       1538 33101  31430 16R  S07_4    
-        16       1539 33101  31407 16L  S07_4    
-        16       1540 33101  31436 16R  S07_4    
-        16       1541 33101  29316 16L  P13      
-        16       1542 33101  28290 16R  S6_3b    
-        16       1543 33101  29916 16L  S7_1     
-        16       1544 33101  28694 16R  P12      
-        16       1545 33101  30905 16L  S7_3     
-        16       1546 33101  29980 16R  S7_1     
-        16       1547 33101  30911 16L  S7_3     
-        16       1548 33101  30924 16R  S7_3     
-        16       1549 33101  30916 16L  S7_3     
-        16       1550 33101  30930 16R  S7_3     
-        16       1551 33101  31380 16L  S07_4    
-        16       1552 33101  30935 16R  S7_3     
-        16       1553 33101  31387 16L  S07_4    
-        16       1554 33101  31415 16R  S07_4    
-        16       1555 33101  31393 16L  S07_4    
-        16       1556 33101  31423 16R  S07_4    
-        16       1557 33101  31399 16L  S07_4    
-        16       1558 33101  31431 16R  S07_4    
-        16       1559 33101  31408 16L  S07_4    
-        16       1560 33101  31437 16R  S07_4    
-        16       1561 33101  29317 16L  P13      
-        16       1562 33101  28309 16R  S6_3b    
-        16       1563 33101  30900 16L  S7_3     
-        16       1564 33101  28705 16R  P12      
-        16       1565 33101  30906 16L  S7_3     
-        16       1566 33101  30919 16R  S7_3     
-        16       1567 33101  30912 16L  S7_3     
-        16       1568 33101  30926 16R  S7_3     
-        16       1569 33101  30917 16L  S7_3     
-        16       1570 33101  30931 16R  S7_3     
-        16       1571 33101  31381 16L  S07_4    
-        16       1572 33101  30936 16R  S7_3     
-        16       1573 33101  31388 16L  S07_4    
-        16       1574 33101  31416 16R  S07_4    
-        16       1575 33101  31394 16L  S07_4    
-        16       1576 33101  31426 16R  S07_4    
-        16       1577 33101  31400 16L  S07_4    
-        16       1578 33101  31432 16R  S07_4    
-        16       1579 33101  31409 16L  S07_4    
-        16       1580 33101  31438 16R  S07_4    
-        16       1581 33101  29320 16L  P13      
-        16       1582 33101  28323 16R  S6_3b    
-        16       1583 33101  30901 16L  S7_3     
-        16       1584 33101  28706 16R  P12      
-        16       1585 33101  30907 16L  S7_3     
-        16       1586 33101  30921 16R  S7_3     
-        16       1587 33101  30913 16L  S7_3     
-        16       1588 33101  30927 16R  S7_3     
-        16       1589 33101  30918 16L  S7_3     
-        16       1590 33101  30932 16R  S7_3     
-        16       1591 33101  31382 16L  S07_4    
-        16       1592 33101  30938 16R  S7_3     
-        16       1593 33101  31389 16L  S07_4    
-        16       1594 33101  31419 16R  S07_4    
-        16       1595 33101  31395 16L  S07_4    
-        16       1596 33101  31427 16R  S07_4    
-        16       1597 33101  31401 16L  S07_4    
-        16       1598 33101  31433 16R  S07_4    
-        16       1599 33101  29922 16L  S7_1     
-        16       1600 33101  31439 16R  S07_4    
-        16       1601 33101  30008 17L  S7_1     
-        16       1602 33101  27183 17R  S6_2b    
-        16       1603 33101  30947 17L  S7_3     
-        16       1604 33101  28457 17R  S6_3b    
-        16       1605 33101  30953 17L  S7_3     
-        16       1606 33101  29335 17R  P13      
-        16       1607 33101  31453 17L  S07_4    
-        16       1608 33101  30960 17R  S7_3     
-        16       1609 33101  31459 17L  S07_4    
-        16       1610 33101  30967 17R  S7_3     
-        16       1611 33101  31467 17L  S07_4    
-        16       1612 33101  31503 17R  S07_4    
-        16       1613 33101  31473 17L  S07_4    
-        16       1614 33101  31516 17R  S07_4    
-        16       1615 33101  31478 17L  S07_4    
-        16       1616 33101  31523 17R  S07_4    
-        16       1617 33101  31486 17L  S07_4    
-        16       1618 33101  31530 17R  S07_4    
-        16       1619 33101  31491 17L  S07_4    
-        16       1620 33101  31537 17R  S07_4    
-        16       1621 33101  30020 17L  S7_1     
-        16       1622 33101  27227 17R  S6_2b    
-        16       1623 33101  30949 17L  S7_3     
-        16       1624 33101  29331 17R  P13      
-        16       1625 33101  31448 17L  S07_4    
-        16       1626 33101  30955 17R  S7_3     
-        16       1627 33101  31454 17L  S07_4    
-        16       1628 33101  30961 17R  S7_3     
-        16       1629 33101  31460 17L  S07_4    
-        16       1630 33101  31494 17R  S07_4    
-        16       1631 33101  31468 17L  S07_4    
-        16       1632 33101  31508 17R  S07_4    
-        16       1633 33101  31474 17L  S07_4    
-        16       1634 33101  31517 17R  S07_4    
-        16       1635 33101  31481 17L  S07_4    
-        16       1636 33101  31524 17R  S07_4    
-        16       1637 33101  31487 17L  S07_4    
-        16       1638 33101  31531 17R  S07_4    
-        16       1639 33101  31492 17L  S07_4    
-        16       1640 33101  31515 17R  S07_4    
-        16       1641 33101  30942 17L  S7_3     
-        16       1642 33101  27520 17R  S6_3     
-        16       1643 33101  30950 17L  S7_3     
-        16       1644 33101  29332 17R  P13      
-        16       1645 33101  31450 17L  S07_4    
-        16       1646 33101  30956 17R  S7_3     
-        16       1647 33101  31455 17L  S07_4    
-        16       1648 33101  30962 17R  S7_3     
-        16       1649 33101  31462 17L  S07_4    
-        16       1650 33101  31500 17R  S07_4    
-        16       1651 33101  31469 17L  S07_4    
-        16       1652 33101  31510 17R  S07_4    
-        16       1653 33101  31475 17L  S07_4    
-        16       1654 33101  31518 17R  S07_4    
-        16       1655 33101  31482 17L  S07_4    
-        16       1656 33101  31525 17R  S07_4    
-        16       1657 33101  31488 17L  S07_4    
-        16       1658 33101  31534 17R  S07_4    
-        16       1659 33101  30948 17L  S7_3     
-        16       1660 33101  31498 17R  S07_4    
-        16       1661 33101  30944 17L  S7_3     
-        16       1662 33101  28416 17R  S6_3b    
-        16       1663 33101  30951 17L  S7_3     
-        16       1664 33101  29333 17R  P13      
-        16       1665 33101  31451 17L  S07_4    
-        16       1666 33101  30957 17R  S7_3     
-        16       1667 33101  31456 17L  S07_4    
-        16       1668 33101  30963 17R  S7_3     
-        16       1669 33101  31464 17L  S07_4    
-        16       1670 33101  31501 17R  S07_4    
-        16       1671 33101  31470 17L  S07_4    
-        16       1672 33101  31513 17R  S07_4    
-        16       1673 33101  31476 17L  S07_4    
-        16       1674 33101  31521 17R  S07_4    
-        16       1675 33101  31484 17L  S07_4    
-        16       1676 33101  31526 17R  S07_4    
-        16       1677 33101  31489 17L  S07_4    
-        16       1678 33101  31535 17R  S07_4    
-        16       1679 33101  29323 17L  P13      
-        16       1680 33101  30964 17R  S7_3     
-        16       1681 33101  30946 17L  S7_3     
-        16       1682 33101  28419 17R  S6_3b    
-        16       1683 33101  30952 17L  S7_3     
-        16       1684 33101  29334 17R  P13      
-        16       1685 33101  31452 17L  S07_4    
-        16       1686 33101  30958 17R  S7_3     
-        16       1687 33101  31458 17L  S07_4    
-        16       1688 33101  30966 17R  S7_3     
-        16       1689 33101  31465 17L  S07_4    
-        16       1690 33101  31502 17R  S07_4    
-        16       1691 33101  31472 17L  S07_4    
-        16       1692 33101  31514 17R  S07_4    
-        16       1693 33101  31477 17L  S07_4    
-        16       1694 33101  31522 17R  S07_4    
-        16       1695 33101  31485 17L  S07_4    
-        16       1696 33101  31528 17R  S07_4    
-        16       1697 33101  31490 17L  S07_4    
-        16       1698 33101  31536 17R  S07_4    
-        16       1699 33101  30002 17L  S7_1     
-        16       1700 33101  30968 17R  S7_3     
-        17          1 33101  32303 1L   P14      
-        17          2 33101  31868 1R   S07_5    
-        17          3 33101  31816 1L   S07_5    
-        17          4 33101  29676 1R   S7_1     
-        17          5 33101  33801 1L   S8_3     
-        17          6 33101  31884 1R   S07_5    
-        17          7 33101  33806 1L   S8_3     
-        17          8 33101  34301 1R   S8_4     
-        17          9 33101  33817 1L   S8_3     
-        17         10 33101  33857 1R   S8_3     
-        17         11 33101  33811 1L   S8_3     
-        17         12 33101  34307 1R   S8_4     
-        17         13 33101  33823 1L   S8_3     
-        17         14 33101  33863 1R   S8_3     
-        17         15 33101  33830 1L   S8_3     
-        17         16 33101  33866 1R   S8_3     
-        17         17 33101  33837 1L   S8_3     
-        17         18 33101  33871 1R   S8_3     
-        17         19 33101  33843 1L   S8_3     
-        17         20 33101  33876 1R   S8_3     
-        17         21 33101  32304 1L   P14      
-        17         22 33101  31880 1R   S07_5    
-        17         23 33101  31827 1L   S07_5    
-        17         24 33101  29686 1R   S7_1     
-        17         25 33101  33802 1L   S8_3     
-        17         26 33101  32308 1R   P14      
-        17         27 33101  33807 1L   S8_3     
-        17         28 33101  34302 1R   S8_4     
-        17         29 33101  33818 1L   S8_3     
-        17         30 33101  33858 1R   S8_3     
-        17         31 33101  33812 1L   S8_3     
-        17         32 33101  34308 1R   S8_4     
-        17         33 33101  33824 1L   S8_3     
-        17         34 33101  33864 1R   S8_3     
-        17         35 33101  33831 1L   S8_3     
-        17         36 33101  33867 1R   S8_3     
-        17         37 33101  33838 1L   S8_3     
-        17         38 33101  33872 1R   S8_3     
-        17         39 33101  33844 1L   S8_3     
-        17         40 33101  33877 1R   S8_3     
-        17         41 33101  32305 1L   P14      
-        17         42 33101  31881 1R   S07_5    
-        17         43 33101  31841 1L   S07_5    
-        17         44 33101  31846 1R   S07_5    
-        17         45 33101  33803 1L   S8_3     
-        17         46 33101  32309 1R   P14      
-        17         47 33101  33808 1L   S8_3     
-        17         48 33101  34304 1R   S8_4     
-        17         49 33101  33820 1L   S8_3     
-        17         50 33101  33859 1R   S8_3     
-        17         51 33101  33814 1L   S8_3     
-        17         52 33101  34309 1R   S8_4     
-        17         53 33101  33827 1L   S8_3     
-        17         54 33101  33881 1R   S8_3     
-        17         55 33101  33833 1L   S8_3     
-        17         56 33101  33868 1R   S8_3     
-        17         57 33101  33839 1L   S8_3     
-        17         58 33101  33873 1R   S8_3     
-        17         59 33101  33845 1L   S8_3     
-        17         60 33101  33878 1R   S8_3     
-        17         61 33101  32306 1L   P14      
-        17         62 33101  31882 1R   S07_5    
-        17         63 33101  32301 1L   P14      
-        17         64 33101  31850 1R   S07_5    
-        17         65 33101  33804 1L   S8_3     
-        17         66 33101  32310 1R   P14      
-        17         67 33101  33809 1L   S8_3     
-        17         68 33101  34305 1R   S8_4     
-        17         69 33101  33821 1L   S8_3     
-        17         70 33101  33860 1R   S8_3     
-        17         71 33101  33815 1L   S8_3     
-        17         72 33101  34310 1R   S8_4     
-        17         73 33101  33828 1L   S8_3     
-        17         74 33101  33883 1R   S8_3     
-        17         75 33101  33834 1L   S8_3     
-        17         76 33101  33869 1R   S8_3     
-        17         77 33101  33840 1L   S8_3     
-        17         78 33101  33874 1R   S8_3     
-        17         79 33101  33848 1L   S8_3     
-        17         80 33101  33879 1R   S8_3     
-        17         81 33101  32307 1L   P14      
-        17         82 33101  31883 1R   S07_5    
-        17         83 33101  32302 1L   P14      
-        17         84 33101  31859 1R   S07_5    
-        17         85 33101  33805 1L   S8_3     
-        17         86 33101  32311 1R   P14      
-        17         87 33101  33810 1L   S8_3     
-        17         88 33101  34306 1R   S8_4     
-        17         89 33101  33822 1L   S8_3     
-        17         90 33101  33862 1R   S8_3     
-        17         91 33101  33816 1L   S8_3     
-        17         92 33101  33856 1R   S8_3     
-        17         93 33101  33829 1L   S8_3     
-        17         94 33101  33884 1R   S8_3     
-        17         95 33101  33835 1L   S8_3     
-        17         96 33101  33870 1R   S8_3     
-        17         97 33101  33842 1L   S8_3     
-        17         98 33101  33875 1R   S8_3     
-        17         99 33101  33849 1L   S8_3     
-        17        100 33101  33880 1R   S8_3     
-        17        101 33101  31934 2L   S07_5    
-        17        102 33101  33966 2R   S8_3     
-        17        103 33101  30156 2L   S7_2     
-        17        104 33101  31939 2R   S07_5    
-        17        105 33101  32312 2L   P14      
-        17        106 33101  33971 2R   S8_3     
-        17        107 33101  33916 2L   S8_3     
-        17        108 33101  33976 2R   S8_3     
-        17        109 33101  33921 2L   S8_3     
-        17        110 33101  33982 2R   S8_3     
-        17        111 33101  33922 2L   S8_3     
-        17        112 33101  33991 2R   S8_3     
-        17        113 33101  33932 2L   S8_3     
-        17        114 33101  33996 2R   S8_3     
-        17        115 33101  33936 2L   S8_3     
-        17        116 33101  34001 2R   S8_3     
-        17        117 33101  33941 2L   S8_3     
-        17        118 33101  34006 2R   S8_3     
-        17        119 33101  33947 2L   S8_3     
-        17        120 33101  34011 2R   S8_3     
-        17        121 33101  31935 2L   S07_5    
-        17        122 33101  33967 2R   S8_3     
-        17        123 33101  30157 2L   S7_2     
-        17        124 33101  31987 2R   S07_5    
-        17        125 33101  33911 2L   S8_3     
-        17        126 33101  33981 2R   S8_3     
-        17        127 33101  33912 2L   S8_3     
-        17        128 33101  33977 2R   S8_3     
-        17        129 33101  33917 2L   S8_3     
-        17        130 33101  33983 2R   S8_3     
-        17        131 33101  33923 2L   S8_3     
-        17        132 33101  33992 2R   S8_3     
-        17        133 33101  33933 2L   S8_3     
-        17        134 33101  33997 2R   S8_3     
-        17        135 33101  33937 2L   S8_3     
-        17        136 33101  34002 2R   S8_3     
-        17        137 33101  33942 2L   S8_3     
-        17        138 33101  33990 2R   S8_3     
-        17        139 33101  33951 2L   S8_3     
-        17        140 33101  34012 2R   S8_3     
-        17        141 33101  31936 2L   S07_5    
-        17        142 33101  33968 2R   S8_3     
-        17        143 33101  30158 2L   S7_2     
-        17        144 33101  31988 2R   S07_5    
-        17        145 33101  32313 2L   P14      
-        17        146 33101  33973 2R   S8_3     
-        17        147 33101  33913 2L   S8_3     
-        17        148 33101  33978 2R   S8_3     
-        17        149 33101  33918 2L   S8_3     
-        17        150 33101  33985 2R   S8_3     
-        17        151 33101  33926 2L   S8_3     
-        17        152 33101  33989 2R   S8_3     
-        17        153 33101  33934 2L   S8_3     
-        17        154 33101  33998 2R   S8_3     
-        17        155 33101  33938 2L   S8_3     
-        17        156 33101  34003 2R   S8_3     
-        17        157 33101  33943 2L   S8_3     
-        17        158 33101  34008 2R   S8_3     
-        17        159 33101  33952 2L   S8_3     
-        17        160 33101  34013 2R   S8_3     
-        17        161 33101  31937 2L   S07_5    
-        17        162 33101  33969 2R   S8_3     
-        17        163 33101  31932 2L   S07_5    
-        17        164 33101  31989 2R   S07_5    
-        17        165 33101  32314 2L   P14      
-        17        166 33101  33974 2R   S8_3     
-        17        167 33101  33914 2L   S8_3     
-        17        168 33101  33979 2R   S8_3     
-        17        169 33101  33919 2L   S8_3     
-        17        170 33101  33987 2R   S8_3     
-        17        171 33101  33927 2L   S8_3     
-        17        172 33101  33994 2R   S8_3     
-        17        173 33101  33929 2L   S8_3     
-        17        174 33101  33999 2R   S8_3     
-        17        175 33101  33939 2L   S8_3     
-        17        176 33101  34004 2R   S8_3     
-        17        177 33101  33940 2L   S8_3     
-        17        178 33101  34009 2R   S8_3     
-        17        179 33101  33955 2L   S8_3     
-        17        180 33101  34014 2R   S8_3     
-        17        181 33101  31938 2L   S07_5    
-        17        182 33101  33970 2R   S8_3     
-        17        183 33101  31933 2L   S07_5    
-        17        184 33101  32318 2R   P14      
-        17        185 33101  32315 2L   P14      
-        17        186 33101  33975 2R   S8_3     
-        17        187 33101  33915 2L   S8_3     
-        17        188 33101  33980 2R   S8_3     
-        17        189 33101  33920 2L   S8_3     
-        17        190 33101  33988 2R   S8_3     
-        17        191 33101  33928 2L   S8_3     
-        17        192 33101  33995 2R   S8_3     
-        17        193 33101  33930 2L   S8_3     
-        17        194 33101  34000 2R   S8_3     
-        17        195 33101  33935 2L   S8_3     
-        17        196 33101  34005 2R   S8_3     
-        17        197 33101  33945 2L   S8_3     
-        17        198 33101  34010 2R   S8_3     
-        17        199 33101  33956 2L   S8_3     
-        17        200 33101  34015 2R   S8_3     
-        17        201 33101  29031 3L   P13      
-        17        202 33101  33314 3R   S8_2     
-        17        203 33101  33301 3L   S8_2     
-        17        204 33101  33315 3R   S8_2     
-        17        205 33101  33307 3L   S8_2     
-        17        206 33101  33321 3R   S8_2     
-        17        207 33101  34031 3L   S8_3     
-        17        208 33101  33326 3R   S8_2     
-        17        209 33101  34036 3L   S8_3     
-        17        210 33101  33331 3R   S8_2     
-        17        211 33101  34042 3L   S8_3     
-        17        212 33101  33336 3R   S8_2     
-        17        213 33101  34049 3L   S8_3     
-        17        214 33101  33346 3R   S8_2     
-        17        215 33101  34056 3L   S8_3     
-        17        216 33101  33356 3R   S8_2     
-        17        217 33101  34061 3L   S8_3     
-        17        218 33101  33351 3R   S8_2     
-        17        219 33101  34065 3L   S8_3     
-        17        220 33101  33361 3R   S8_2     
-        17        221 33101  29037 3L   P13      
-        17        222 33101  32048 3R   S07_5    
-        17        223 33101  33302 3L   S8_2     
-        17        224 33101  33317 3R   S8_2     
-        17        225 33101  33308 3L   S8_2     
-        17        226 33101  33322 3R   S8_2     
-        17        227 33101  34032 3L   S8_3     
-        17        228 33101  33327 3R   S8_2     
-        17        229 33101  34037 3L   S8_3     
-        17        230 33101  33332 3R   S8_2     
-        17        231 33101  34043 3L   S8_3     
-        17        232 33101  33337 3R   S8_2     
-        17        233 33101  34050 3L   S8_3     
-        17        234 33101  33342 3R   S8_2     
-        17        235 33101  34057 3L   S8_3     
-        17        236 33101  33357 3R   S8_2     
-        17        237 33101  34062 3L   S8_3     
-        17        238 33101  33352 3R   S8_2     
-        17        239 33101  34066 3L   S8_3     
-        17        240 33101  33362 3R   S8_2     
-        17        241 33101  32319 3L   P14      
-        17        242 33101  32062 3R   S07_5    
-        17        243 33101  33303 3L   S8_2     
-        17        244 33101  33318 3R   S8_2     
-        17        245 33101  33310 3L   S8_2     
-        17        246 33101  33323 3R   S8_2     
-        17        247 33101  34033 3L   S8_3     
-        17        248 33101  33328 3R   S8_2     
-        17        249 33101  34039 3L   S8_3     
-        17        250 33101  33333 3R   S8_2     
-        17        251 33101  34044 3L   S8_3     
-        17        252 33101  33338 3R   S8_2     
-        17        253 33101  34051 3L   S8_3     
-        17        254 33101  33343 3R   S8_2     
-        17        255 33101  34058 3L   S8_3     
-        17        256 33101  33358 3R   S8_2     
-        17        257 33101  34063 3L   S8_3     
-        17        258 33101  33353 3R   S8_2     
-        17        259 33101  34067 3L   S8_3     
-        17        260 33101  33365 3R   S8_2     
-        17        261 33101  32320 3L   P14      
-        17        262 33101  32326 3R   P14      
-        17        263 33101  33305 3L   S8_2     
-        17        264 33101  33319 3R   S8_2     
-        17        265 33101  33311 3L   S8_2     
-        17        266 33101  33324 3R   S8_2     
-        17        267 33101  34034 3L   S8_3     
-        17        268 33101  33329 3R   S8_2     
-        17        269 33101  34040 3L   S8_3     
-        17        270 33101  33334 3R   S8_2     
-        17        271 33101  34046 3L   S8_3     
-        17        272 33101  33339 3R   S8_2     
-        17        273 33101  34052 3L   S8_3     
-        17        274 33101  33344 3R   S8_2     
-        17        275 33101  34059 3L   S8_3     
-        17        276 33101  33359 3R   S8_2     
-        17        277 33101  34064 3L   S8_3     
-        17        278 33101  33354 3R   S8_2     
-        17        279 33101  34068 3L   S8_3     
-        17        280 33101  33348 3R   S8_2     
-        17        281 33101  32322 3L   P14      
-        17        282 33101  32327 3R   P14      
-        17        283 33101  33306 3L   S8_2     
-        17        284 33101  33320 3R   S8_2     
-        17        285 33101  33312 3L   S8_2     
-        17        286 33101  33316 3R   S8_2     
-        17        287 33101  33313 3L   S8_2     
-        17        288 33101  33330 3R   S8_2     
-        17        289 33101  34041 3L   S8_3     
-        17        290 33101  33335 3R   S8_2     
-        17        291 33101  34048 3L   S8_3     
-        17        292 33101  33340 3R   S8_2     
-        17        293 33101  34053 3L   S8_3     
-        17        294 33101  33345 3R   S8_2     
-        17        295 33101  34055 3L   S8_3     
-        17        296 33101  33347 3R   S8_2     
-        17        297 33101  34060 3L   S8_3     
-        17        298 33101  33355 3R   S8_2     
-        17        299 33101  34070 3L   S8_3     
-        17        300 33101  33367 3R   S8_2     
-        17        301 33101  33376 4L   S8_2     
-        17        302 33101  32148 4R   S07_5    
-        17        303 33101  33373 4L   S8_2     
-        17        304 33101  32193 4R   S07_5    
-        17        305 33101  33388 4L   S8_2     
-        17        306 33101  33426 4R   S8_2     
-        17        307 33101  33395 4L   S8_2     
-        17        308 33101  33431 4R   S8_2     
-        17        309 33101  33401 4L   S8_2     
-        17        310 33101  33436 4R   S8_2     
-        17        311 33101  34084 4L   S8_3     
-        17        312 33101  32333 4R   P14      
-        17        313 33101  35284 4L   S8_5     
-        17        314 33101  33451 4R   S8_2     
-        17        315 33101  33407 4L   S8_2     
-        17        316 33101  33452 4R   S8_2     
-        17        317 33101  33412 4L   S8_2     
-        17        318 33101  33462 4R   S8_2     
-        17        319 33101  33423 4L   S8_2     
-        17        320 33101  33468 4R   S8_2     
-        17        321 33101  33377 4L   S8_2     
-        17        322 33101  32150 4R   S07_5    
-        17        323 33101  33381 4L   S8_2     
-        17        324 33101  32194 4R   S07_5    
-        17        325 33101  33389 4L   S8_2     
-        17        326 33101  33427 4R   S8_2     
-        17        327 33101  33396 4L   S8_2     
-        17        328 33101  33432 4R   S8_2     
-        17        329 33101  33402 4L   S8_2     
-        17        330 33101  33437 4R   S8_2     
-        17        331 33101  34085 4L   S8_3     
-        17        332 33101  33425 4R   S8_2     
-        17        333 33101  35285 4L   S8_5     
-        17        334 33101  33447 4R   S8_2     
-        17        335 33101  33408 4L   S8_2     
-        17        336 33101  33453 4R   S8_2     
-        17        337 33101  33415 4L   S8_2     
-        17        338 33101  33464 4R   S8_2     
-        17        339 33101  33424 4L   S8_2     
-        17        340 33101  33470 4R   S8_2     
-        17        341 33101  33378 4L   S8_2     
-        17        342 33101  32167 4R   S07_5    
-        17        343 33101  33384 4L   S8_2     
-        17        344 33101  32195 4R   S07_5    
-        17        345 33101  33391 4L   S8_2     
-        17        346 33101  33428 4R   S8_2     
-        17        347 33101  33397 4L   S8_2     
-        17        348 33101  33433 4R   S8_2     
-        17        349 33101  33403 4L   S8_2     
-        17        350 33101  33438 4R   S8_2     
-        17        351 33101  34086 4L   S8_3     
-        17        352 33101  33443 4R   S8_2     
-        17        353 33101  35286 4L   S8_5     
-        17        354 33101  33448 4R   S8_2     
-        17        355 33101  33409 4L   S8_2     
-        17        356 33101  33455 4R   S8_2     
-        17        357 33101  33416 4L   S8_2     
-        17        358 33101  33465 4R   S8_2     
-        17        359 33101  33382 4L   S8_2     
-        17        360 33101  33471 4R   S8_2     
-        17        361 33101  33370 4L   S8_2     
-        17        362 33101  32191 4R   S07_5    
-        17        363 33101  33385 4L   S8_2     
-        17        364 33101  32335 4R   P14      
-        17        365 33101  33392 4L   S8_2     
-        17        366 33101  33429 4R   S8_2     
-        17        367 33101  33399 4L   S8_2     
-        17        368 33101  33434 4R   S8_2     
-        17        369 33101  33404 4L   S8_2     
-        17        370 33101  33439 4R   S8_2     
-        17        371 33101  34087 4L   S8_3     
-        17        372 33101  33444 4R   S8_2     
-        17        373 33101  35287 4L   S8_5     
-        17        374 33101  33449 4R   S8_2     
-        17        375 33101  33410 4L   S8_2     
-        17        376 33101  33456 4R   S8_2     
-        17        377 33101  33417 4L   S8_2     
-        17        378 33101  33466 4R   S8_2     
-        17        379 33101  33413 4L   S8_2     
-        17        380 33101  33472 4R   S8_2     
-        17        381 33101  33380 4L   S8_2     
-        17        382 33101  32192 4R   S07_5    
-        17        383 33101  33387 4L   S8_2     
-        17        384 33101  32336 4R   P14      
-        17        385 33101  33393 4L   S8_2     
-        17        386 33101  33430 4R   S8_2     
-        17        387 33101  33400 4L   S8_2     
-        17        388 33101  33435 4R   S8_2     
-        17        389 33101  33405 4L   S8_2     
-        17        390 33101  33440 4R   S8_2     
-        17        391 33101  34318 4L   S8_4     
-        17        392 33101  33445 4R   S8_2     
-        17        393 33101  35288 4L   S8_5     
-        17        394 33101  33450 4R   S8_2     
-        17        395 33101  33411 4L   S8_2     
-        17        396 33101  33459 4R   S8_2     
-        17        397 33101  33420 4L   S8_2     
-        17        398 33101  33467 4R   S8_2     
-        17        399 33101  34083 4L   S8_3     
-        17        400 33101  33473 4R   S8_2     
-        17        401 33101  30275 5L   S7_2     
-        17        402 33101  30325 5R   S7_2     
-        17        403 33101  32339 5L   P14      
-        17        404 33101  32296 5R   S07_5    
-        17        405 33101  33481 5L   S8_2     
-        17        406 33101  32351 5R   P14      
-        17        407 33101  33497 5L   S8_2     
-        17        408 33101  33510 5R   S8_2     
-        17        409 33101  33508 5L   S8_2     
-        17        410 33101  33515 5R   S8_2     
-        17        411 33101  34093 5L   S8_3     
-        17        412 33101  33520 5R   S8_2     
-        17        413 33101  34099 5L   S8_3     
-        17        414 33101  33525 5R   S8_2     
-        17        415 33101  34319 5L   S8_4     
-        17        416 33101  33531 5R   S8_2     
-        17        417 33101  33486 5L   S8_2     
-        17        418 33101  33537 5R   S8_2     
-        17        419 33101  34109 5L   S8_3     
-        17        420 33101  34121 5R   S8_3     
-        17        421 33101  32243 5L   S07_5    
-        17        422 33101  32250 5R   S07_5    
-        17        423 33101  33487 5L   S8_2     
-        17        424 33101  32297 5R   S07_5    
-        17        425 33101  33482 5L   S8_2     
-        17        426 33101  32352 5R   P14      
-        17        427 33101  33499 5L   S8_2     
-        17        428 33101  33511 5R   S8_2     
-        17        429 33101  33501 5L   S8_2     
-        17        430 33101  33516 5R   S8_2     
-        17        431 33101  34094 5L   S8_3     
-        17        432 33101  33521 5R   S8_2     
-        17        433 33101  34100 5L   S8_3     
-        17        434 33101  33526 5R   S8_2     
-        17        435 33101  34320 5L   S8_4     
-        17        436 33101  33533 5R   S8_2     
-        17        437 33101  33490 5L   S8_2     
-        17        438 33101  33538 5R   S8_2     
-        17        439 33101  34110 5L   S8_3     
-        17        440 33101  34122 5R   S8_3     
-        17        441 33101  32245 5L   S07_5    
-        17        442 33101  32293 5R   S07_5    
-        17        443 33101  32343 5L   P14      
-        17        444 33101  32298 5R   S07_5    
-        17        445 33101  33483 5L   S8_2     
-        17        446 33101  32353 5R   P14      
-        17        447 33101  33488 5L   S8_2     
-        17        448 33101  33512 5R   S8_2     
-        17        449 33101  33503 5L   S8_2     
-        17        450 33101  33517 5R   S8_2     
-        17        451 33101  34095 5L   S8_3     
-        17        452 33101  33522 5R   S8_2     
-        17        453 33101  34101 5L   S8_3     
-        17        454 33101  33527 5R   S8_2     
-        17        455 33101  34321 5L   S8_4     
-        17        456 33101  33534 5R   S8_2     
-        17        457 33101  33509 5L   S8_2     
-        17        458 33101  34323 5R   S8_4     
-        17        459 33101  34112 5L   S8_3     
-        17        460 33101  34123 5R   S8_3     
-        17        461 33101  32246 5L   S07_5    
-        17        462 33101  32295 5R   S07_5    
-        17        463 33101  32344 5L   P14      
-        17        464 33101  32299 5R   S07_5    
-        17        465 33101  33484 5L   S8_2     
-        17        466 33101  32354 5R   P14      
-        17        467 33101  33489 5L   S8_2     
-        17        468 33101  32356 5R   P14      
-        17        469 33101  33505 5L   S8_2     
-        17        470 33101  33518 5R   S8_2     
-        17        471 33101  34096 5L   S8_3     
-        17        472 33101  33523 5R   S8_2     
-        17        473 33101  34102 5L   S8_3     
-        17        474 33101  33528 5R   S8_2     
-        17        475 33101  34322 5L   S8_4     
-        17        476 33101  33535 5R   S8_2     
-        17        477 33101  34107 5L   S8_3     
-        17        478 33101  34324 5R   S8_4     
-        17        479 33101  34113 5L   S8_3     
-        17        480 33101  34124 5R   S8_3     
-        17        481 33101  32247 5L   S07_5    
-        17        482 33101  32347 5R   P14      
-        17        483 33101  32345 5L   P14      
-        17        484 33101  32300 5R   S07_5    
-        17        485 33101  33485 5L   S8_2     
-        17        486 33101  32355 5R   P14      
-        17        487 33101  33491 5L   S8_2     
-        17        488 33101  33514 5R   S8_2     
-        17        489 33101  33507 5L   S8_2     
-        17        490 33101  33519 5R   S8_2     
-        17        491 33101  34098 5L   S8_3     
-        17        492 33101  33524 5R   S8_2     
-        17        493 33101  34104 5L   S8_3     
-        17        494 33101  33530 5R   S8_2     
-        17        495 33101  34105 5L   S8_3     
-        17        496 33101  33536 5R   S8_2     
-        17        497 33101  34108 5L   S8_3     
-        17        498 33101  33539 5R   S8_2     
-        17        499 33101  34114 5L   S8_3     
-        17        500 33101  34120 5R   S8_3     
-        17        501 33101  32928 6L   S8_1     
-        17        502 33101  32661 6R   P14      
-        17        503 33101  32909 6L   S8_1     
-        17        504 33101  31068 6R   S7_3     
-        17        505 33101  32899 6L   S8_1     
-        17        506 33101  32931 6R   S8_1     
-        17        507 33101  32913 6L   S8_1     
-        17        508 33101  32964 6R   S8_1     
-        17        509 33101  32923 6L   S8_1     
-        17        510 33101  32939 6R   S8_1     
-        17        511 33101  32894 6L   S8_1     
-        17        512 33101  32934 6R   S8_1     
-        17        513 33101  32902 6L   S8_1     
-        17        514 33101  32929 6R   S8_1     
-        17        515 33101  30973 6L   S7_3     
-        17        516 33101  32932 6R   S8_1     
-        17        517 33101  30986 6L   S7_3     
-        17        518 33101  32954 6R   S8_1     
-        17        519 33101  31006 6L   S7_3     
-        17        520 33101  31024 6R   S7_3     
-        17        521 33101  32900 6L   S8_1     
-        17        522 33101  32662 6R   P14      
-        17        523 33101  32911 6L   S8_1     
-        17        524 33101  31071 6R   S7_3     
-        17        525 33101  32910 6L   S8_1     
-        17        526 33101  32933 6R   S8_1     
-        17        527 33101  32914 6L   S8_1     
-        17        528 33101  32965 6R   S8_1     
-        17        529 33101  32924 6L   S8_1     
-        17        530 33101  32940 6R   S8_1     
-        17        531 33101  32895 6L   S8_1     
-        17        532 33101  32935 6R   S8_1     
-        17        533 33101  32903 6L   S8_1     
-        17        534 33101  32944 6R   S8_1     
-        17        535 33101  30998 6L   S7_3     
-        17        536 33101  32949 6R   S8_1     
-        17        537 33101  30993 6L   S7_3     
-        17        538 33101  32955 6R   S8_1     
-        17        539 33101  31020 6L   S7_3     
-        17        540 33101  31025 6R   S7_3     
-        17        541 33101  32901 6L   S8_1     
-        17        542 33101  32663 6R   P14      
-        17        543 33101  32912 6L   S8_1     
-        17        544 33101  32956 6R   S8_1     
-        17        545 33101  32919 6L   S8_1     
-        17        546 33101  32938 6R   S8_1     
-        17        547 33101  32915 6L   S8_1     
-        17        548 33101  32951 6R   S8_1     
-        17        549 33101  32925 6L   S8_1     
-        17        550 33101  32941 6R   S8_1     
-        17        551 33101  32896 6L   S8_1     
-        17        552 33101  32936 6R   S8_1     
-        17        553 33101  32904 6L   S8_1     
-        17        554 33101  32946 6R   S8_1     
-        17        555 33101  31002 6L   S7_3     
-        17        556 33101  32950 6R   S8_1     
-        17        557 33101  30997 6L   S7_3     
-        17        558 33101  32957 6R   S8_1     
-        17        559 33101  31021 6L   S7_3     
-        17        560 33101  31026 6R   S7_3     
-        17        561 33101  32908 6L   S8_1     
-        17        562 33101  32664 6R   P14      
-        17        563 33101  32917 6L   S8_1     
-        17        564 33101  32962 6R   S8_1     
-        17        565 33101  32921 6L   S8_1     
-        17        566 33101  32960 6R   S8_1     
-        17        567 33101  32916 6L   S8_1     
-        17        568 33101  31042 6R   S7_3     
-        17        569 33101  32926 6L   S8_1     
-        17        570 33101  32942 6R   S8_1     
-        17        571 33101  32897 6L   S8_1     
-        17        572 33101  32937 6R   S8_1     
-        17        573 33101  32905 6L   S8_1     
-        17        574 33101  32947 6R   S8_1     
-        17        575 33101  31007 6L   S7_3     
-        17        576 33101  32952 6R   S8_1     
-        17        577 33101  31000 6L   S7_3     
-        17        578 33101  32958 6R   S8_1     
-        17        579 33101  31022 6L   S7_3     
-        17        580 33101  31027 6R   S7_3     
-        17        581 33101  32920 6L   S8_1     
-        17        582 33101  32667 6R   P14      
-        17        583 33101  32907 6L   S8_1     
-        17        584 33101  32966 6R   S8_1     
-        17        585 33101  32922 6L   S8_1     
-        17        586 33101  32961 6R   S8_1     
-        17        587 33101  32918 6L   S8_1     
-        17        588 33101  31043 6R   S7_3     
-        17        589 33101  32927 6L   S8_1     
-        17        590 33101  32943 6R   S8_1     
-        17        591 33101  32898 6L   S8_1     
-        17        592 33101  32930 6R   S8_1     
-        17        593 33101  32906 6L   S8_1     
-        17        594 33101  32948 6R   S8_1     
-        17        595 33101  31009 6L   S7_3     
-        17        596 33101  32953 6R   S8_1     
-        17        597 33101  31005 6L   S7_3     
-        17        598 33101  32963 6R   S8_1     
-        17        599 33101  31023 6L   S7_3     
-        17        600 33101  31028 6R   S7_3     
-        17        601 33101  28496 7L   S6_3b    
-        17        602 33101  34272 7R   S8_3     
-        17        603 33101  33003 7L   S8_1     
-        17        604 33101  34267 7R   S8_3     
-        17        605 33101  31569 7L   S7_4     
-        17        606 33101  33042 7R   S8_1     
-        17        607 33101  32972 7L   S8_1     
-        17        608 33101  31595 7R   S7_4     
-        17        609 33101  32967 7L   S8_1     
-        17        610 33101  33011 7R   S8_1     
-        17        611 33101  32984 7L   S8_1     
-        17        612 33101  33006 7R   S8_1     
-        17        613 33101  32977 7L   S8_1     
-        17        614 33101  33029 7R   S8_1     
-        17        615 33101  32993 7L   S8_1     
-        17        616 33101  33020 7R   S8_1     
-        17        617 33101  23136 7L   S5-2     
-        17        618 33101  31596 7R   S7_4     
-        17        619 33101  31542 7L   S7_4     
-        17        620 33101  31573 7R   S7_4     
-        17        621 33101  32981 7L   S8_1     
-        17        622 33101  34273 7R   S8_3     
-        17        623 33101  33004 7L   S8_1     
-        17        624 33101  33041 7R   S8_1     
-        17        625 33101  32983 7L   S8_1     
-        17        626 33101  33017 7R   S8_1     
-        17        627 33101  32973 7L   S8_1     
-        17        628 33101  33031 7R   S8_1     
-        17        629 33101  32968 7L   S8_1     
-        17        630 33101  33012 7R   S8_1     
-        17        631 33101  32985 7L   S8_1     
-        17        632 33101  33007 7R   S8_1     
-        17        633 33101  32978 7L   S8_1     
-        17        634 33101  33030 7R   S8_1     
-        17        635 33101  32994 7L   S8_1     
-        17        636 33101  33023 7R   S8_1     
-        17        637 33101  31079 7L   S7_3     
-        17        638 33101  31597 7R   S7_4     
-        17        639 33101  31544 7L   S7_4     
-        17        640 33101  31574 7R   S7_4     
-        17        641 33101  32992 7L   S8_1     
-        17        642 33101  34274 7R   S8_3     
-        17        643 33101  32998 7L   S8_1     
-        17        644 33101  34269 7R   S8_3     
-        17        645 33101  32989 7L   S8_1     
-        17        646 33101  33018 7R   S8_1     
-        17        647 33101  32974 7L   S8_1     
-        17        648 33101  33036 7R   S8_1     
-        17        649 33101  32969 7L   S8_1     
-        17        650 33101  33013 7R   S8_1     
-        17        651 33101  32986 7L   S8_1     
-        17        652 33101  33008 7R   S8_1     
-        17        653 33101  32979 7L   S8_1     
-        17        654 33101  33033 7R   S8_1     
-        17        655 33101  32996 7L   S8_1     
-        17        656 33101  33024 7R   S8_1     
-        17        657 33101  31559 7L   S7_4     
-        17        658 33101  31599 7R   S7_4     
-        17        659 33101  31547 7L   S7_4     
-        17        660 33101  31576 7R   S7_4     
-        17        661 33101  32995 7L   S8_1     
-        17        662 33101  34275 7R   S8_3     
-        17        663 33101  32999 7L   S8_1     
-        17        664 33101  34270 7R   S8_3     
-        17        665 33101  32990 7L   S8_1     
-        17        666 33101  31586 7R   S7_4     
-        17        667 33101  32975 7L   S8_1     
-        17        668 33101  33039 7R   S8_1     
-        17        669 33101  32970 7L   S8_1     
-        17        670 33101  33014 7R   S8_1     
-        17        671 33101  32987 7L   S8_1     
-        17        672 33101  33009 7R   S8_1     
-        17        673 33101  32980 7L   S8_1     
-        17        674 33101  33034 7R   S8_1     
-        17        675 33101  32997 7L   S8_1     
-        17        676 33101  33025 7R   S8_1     
-        17        677 33101  31565 7L   S7_4     
-        17        678 33101  31600 7R   S7_4     
-        17        679 33101  31554 7L   S7_4     
-        17        680 33101  31579 7R   S7_4     
-        17        681 33101  33002 7L   S8_1     
-        17        682 33101  34276 7R   S8_3     
-        17        683 33101  33000 7L   S8_1     
-        17        684 33101  34271 7R   S8_3     
-        17        685 33101  32991 7L   S8_1     
-        17        686 33101  33021 7R   S8_1     
-        17        687 33101  32976 7L   S8_1     
-        17        688 33101  33040 7R   S8_1     
-        17        689 33101  32971 7L   S8_1     
-        17        690 33101  33015 7R   S8_1     
-        17        691 33101  32988 7L   S8_1     
-        17        692 33101  33010 7R   S8_1     
-        17        693 33101  32982 7L   S8_1     
-        17        694 33101  33035 7R   S8_1     
-        17        695 33101  33001 7L   S8_1     
-        17        696 33101  33026 7R   S8_1     
-        17        697 33101  31566 7L   S7_4     
-        17        698 33101  31602 7R   S7_4     
-        17        699 33101  31100 7L   S7_3     
-        17        700 33101  31580 7R   S7_4     
-        17        701 33101  32686 8L   P14      
-        17        702 33101  34494 8R   S8_4     
-        17        703 33101  32681 8L   P14      
-        17        704 33101  32688 8R   P14      
-        17        705 33101  33068 8L   S8_1     
-        17        706 33101  32689 8R   P14      
-        17        707 33101  33053 8L   S8_1     
-        17        708 33101  33094 8R   S8_1     
-        17        709 33101  33060 8L   S8_1     
-        17        710 33101  33105 8R   S8_1     
-        17        711 33101  33043 8L   S8_1     
-        17        712 33101  33092 8R   S8_1     
-        17        713 33101  33061 8L   S8_1     
-        17        714 33101  33081 8R   S8_1     
-        17        715 33101  33063 8L   S8_1     
-        17        716 33101  33086 8R   S8_1     
-        17        717 33101  31608 8L   S7_4     
-        17        718 33101  33098 8R   S8_1     
-        17        719 33101  31651 8L   S7_4     
-        17        720 33101  33100 8R   S8_1     
-        17        721 33101  32687 8L   P14      
-        17        722 33101  34495 8R   S8_4     
-        17        723 33101  32682 8L   P14      
-        17        724 33101  32691 8R   P14      
-        17        725 33101  33069 8L   S8_1     
-        17        726 33101  32690 8R   P14      
-        17        727 33101  33062 8L   S8_1     
-        17        728 33101  33099 8R   S8_1     
-        17        729 33101  33049 8L   S8_1     
-        17        730 33101  33117 8R   S8_1     
-        17        731 33101  33059 8L   S8_1     
-        17        732 33101  33095 8R   S8_1     
-        17        733 33101  33054 8L   S8_1     
-        17        734 33101  33082 8R   S8_1     
-        17        735 33101  33064 8L   S8_1     
-        17        736 33101  33087 8R   S8_1     
-        17        737 33101  31627 8L   S7_4     
-        17        738 33101  33106 8R   S8_1     
-        17        739 33101  31652 8L   S7_4     
-        17        740 33101  33111 8R   S8_1     
-        17        741 33101  33078 8L   S8_1     
-        17        742 33101  34496 8R   S8_4     
-        17        743 33101  32683 8L   P14      
-        17        744 33101  32693 8R   P14      
-        17        745 33101  33070 8L   S8_1     
-        17        746 33101  32692 8R   P14      
-        17        747 33101  33073 8L   S8_1     
-        17        748 33101  33101 8R   S8_1     
-        17        749 33101  33050 8L   S8_1     
-        17        750 33101  33118 8R   S8_1     
-        17        751 33101  33045 8L   S8_1     
-        17        752 33101  33102 8R   S8_1     
-        17        753 33101  33055 8L   S8_1     
-        17        754 33101  33083 8R   S8_1     
-        17        755 33101  33065 8L   S8_1     
-        17        756 33101  33088 8R   S8_1     
-        17        757 33101  31628 8L   S7_4     
-        17        758 33101  33108 8R   S8_1     
-        17        759 33101  31653 8L   S7_4     
-        17        760 33101  33113 8R   S8_1     
-        17        761 33101  33079 8L   S8_1     
-        17        762 33101  34497 8R   S8_4     
-        17        763 33101  32684 8L   P14      
-        17        764 33101  31128 8R   S7_3     
-        17        765 33101  33071 8L   S8_1     
-        17        766 33101  33091 8R   S8_1     
-        17        767 33101  33074 8L   S8_1     
-        17        768 33101  33107 8R   S8_1     
-        17        769 33101  33051 8L   S8_1     
-        17        770 33101  33119 8R   S8_1     
-        17        771 33101  33046 8L   S8_1     
-        17        772 33101  33104 8R   S8_1     
-        17        773 33101  33056 8L   S8_1     
-        17        774 33101  33084 8R   S8_1     
-        17        775 33101  33066 8L   S8_1     
-        17        776 33101  33089 8R   S8_1     
-        17        777 33101  31614 8L   S7_4     
-        17        778 33101  33109 8R   S8_1     
-        17        779 33101  23318 8L   S5       
-        17        780 33101  33114 8R   S8_1     
-        17        781 33101  33080 8L   S8_1     
-        17        782 33101  34498 8R   S8_4     
-        17        783 33101  32685 8L   P14      
-        17        784 33101  31660 8R   S7_4     
-        17        785 33101  33072 8L   S8_1     
-        17        786 33101  33097 8R   S8_1     
-        17        787 33101  33077 8L   S8_1     
-        17        788 33101  33112 8R   S8_1     
-        17        789 33101  33052 8L   S8_1     
-        17        790 33101  33120 8R   S8_1     
-        17        791 33101  33047 8L   S8_1     
-        17        792 33101  33116 8R   S8_1     
-        17        793 33101  33057 8L   S8_1     
-        17        794 33101  33085 8R   S8_1     
-        17        795 33101  33067 8L   S8_1     
-        17        796 33101  33096 8R   S8_1     
-        17        797 33101  31650 8L   S7_4     
-        17        798 33101  33110 8R   S8_1     
-        17        799 33101  31634 8L   S7_4     
-        17        800 33101  33115 8R   S8_1     
-        17        801 33101  33151 9L   S8_1     
-        17        802 33101  34594 9R   S8_4     
-        17        803 33101  33131 9L   S8_1     
-        17        804 33101  32706 9R   P14      
-        17        805 33101  32704 9L   P14      
-        17        806 33101  33165 9R   S8_1     
-        17        807 33101  33136 9L   S8_1     
-        17        808 33101  33173 9R   S8_1     
-        17        809 33101  33126 9L   S8_1     
-        17        810 33101  33161 9R   S8_1     
-        17        811 33101  33121 9L   S8_1     
-        17        812 33101  33186 9R   S8_1     
-        17        813 33101  33134 9L   S8_1     
-        17        814 33101  33181 9R   S8_1     
-        17        815 33101  33146 9L   S8_1     
-        17        816 33101  33166 9R   S8_1     
-        17        817 33101  31756 9L   S7_4     
-        17        818 33101  33156 9R   S8_1     
-        17        819 33101  31131 9L   S7_3     
-        17        820 33101  33191 9R   S8_1     
-        17        821 33101  33152 9L   S8_1     
-        17        822 33101  34595 9R   S8_4     
-        17        823 33101  33132 9L   S8_1     
-        17        824 33101  32707 9R   P14      
-        17        825 33101  33135 9L   S8_1     
-        17        826 33101  33172 9R   S8_1     
-        17        827 33101  33137 9L   S8_1     
-        17        828 33101  33175 9R   S8_1     
-        17        829 33101  33127 9L   S8_1     
-        17        830 33101  33162 9R   S8_1     
-        17        831 33101  33122 9L   S8_1     
-        17        832 33101  33187 9R   S8_1     
-        17        833 33101  33141 9L   S8_1     
-        17        834 33101  33182 9R   S8_1     
-        17        835 33101  33147 9L   S8_1     
-        17        836 33101  33167 9R   S8_1     
-        17        837 33101  31743 9L   S7_4     
-        17        838 33101  33157 9R   S8_1     
-        17        839 33101  31741 9L   S7_4     
-        17        840 33101  33192 9R   S8_1     
-        17        841 33101  33153 9L   S8_1     
-        17        842 33101  34598 9R   S8_4     
-        17        843 33101  33133 9L   S8_1     
-        17        844 33101  32708 9R   P14      
-        17        845 33101  31722 9L   S7_4     
-        17        846 33101  33174 9R   S8_1     
-        17        847 33101  33138 9L   S8_1     
-        17        848 33101  33177 9R   S8_1     
-        17        849 33101  33128 9L   S8_1     
-        17        850 33101  33163 9R   S8_1     
-        17        851 33101  33123 9L   S8_1     
-        17        852 33101  33188 9R   S8_1     
-        17        853 33101  33142 9L   S8_1     
-        17        854 33101  33183 9R   S8_1     
-        17        855 33101  33148 9L   S8_1     
-        17        856 33101  33168 9R   S8_1     
-        17        857 33101  31132 9L   S7_3     
-        17        858 33101  33158 9R   S8_1     
-        17        859 33101  31742 9L   S7_4     
-        17        860 33101  33193 9R   S8_1     
-        17        861 33101  33154 9L   S8_1     
-        17        862 33101  34601 9R   S8_4     
-        17        863 33101  33144 9L   S8_1     
-        17        864 33101  33176 9R   S8_1     
-        17        865 33101  31729 9L   S7_4     
-        17        866 33101  32705 9R   P14      
-        17        867 33101  33139 9L   S8_1     
-        17        868 33101  33178 9R   S8_1     
-        17        869 33101  33129 9L   S8_1     
-        17        870 33101  33164 9R   S8_1     
-        17        871 33101  33124 9L   S8_1     
-        17        872 33101  33189 9R   S8_1     
-        17        873 33101  33143 9L   S8_1     
-        17        874 33101  33184 9R   S8_1     
-        17        875 33101  33149 9L   S8_1     
-        17        876 33101  33169 9R   S8_1     
-        17        877 33101  31134 9L   S7_3     
-        17        878 33101  33159 9R   S8_1     
-        17        879 33101  31744 9L   S7_4     
-        17        880 33101  33194 9R   S8_1     
-        17        881 33101  33155 9L   S8_1     
-        17        882 33101  34602 9R   S8_4     
-        17        883 33101  31712 9L   S7_4     
-        17        884 33101  33179 9R   S8_1     
-        17        885 33101  31739 9L   S7_4     
-        17        886 33101  34278 9R   S8_3     
-        17        887 33101  33140 9L   S8_1     
-        17        888 33101  33180 9R   S8_1     
-        17        889 33101  33130 9L   S8_1     
-        17        890 33101  33171 9R   S8_1     
-        17        891 33101  33125 9L   S8_1     
-        17        892 33101  33190 9R   S8_1     
-        17        893 33101  33145 9L   S8_1     
-        17        894 33101  33185 9R   S8_1     
-        17        895 33101  33150 9L   S8_1     
-        17        896 33101  33170 9R   S8_1     
-        17        897 33101  31753 9L   S7_4     
-        17        898 33101  33160 9R   S8_1     
-        17        899 33101  31745 9L   S7_4     
-        17        900 33101  33195 9R   S8_1     
-        17        901 33101  31151 10L  S7_3     
-        17        902 33101  33576 10R  S8_2     
-        17        903 33101  33546 10L  S8_2     
-        17        904 33101  33561 10R  S8_2     
-        17        905 33101  32729 10L  P14      
-        17        906 33101  33566 10R  S8_2     
-        17        907 33101  32709 10L  P14      
-        17        908 33101  32755 10R  P14      
-        17        909 33101  32739 10L  P14      
-        17        910 33101  32750 10R  P14      
-        17        911 33101  32744 10L  P14      
-        17        912 33101  32749 10R  P14      
-        17        913 33101  32723 10L  P14      
-        17        914 33101  32751 10R  P14      
-        17        915 33101  32717 10L  P14      
-        17        916 33101  32768 10R  P14      
-        17        917 33101  32710 10L  P14      
-        17        918 33101  32761 10R  P14      
-        17        919 33101  31146 10L  S7_3     
-        17        920 33101  32753 10R  P14      
-        17        921 33101  33541 10L  S8_2     
-        17        922 33101  33577 10R  S8_2     
-        17        923 33101  33547 10L  S8_2     
-        17        924 33101  33562 10R  S8_2     
-        17        925 33101  32730 10L  P14      
-        17        926 33101  33567 10R  S8_2     
-        17        927 33101  32734 10L  P14      
-        17        928 33101  32757 10R  P14      
-        17        929 33101  32740 10L  P14      
-        17        930 33101  33557 10R  S8_2     
-        17        931 33101  32745 10L  P14      
-        17        932 33101  32770 10R  P14      
-        17        933 33101  32725 10L  P14      
-        17        934 33101  32774 10R  P14      
-        17        935 33101  32718 10L  P14      
-        17        936 33101  32769 10R  P14      
-        17        937 33101  32711 10L  P14      
-        17        938 33101  32763 10R  P14      
-        17        939 33101  31147 10L  S7_3     
-        17        940 33101  32754 10R  P14      
-        17        941 33101  33543 10L  S8_2     
-        17        942 33101  34285 10R  S8_3     
-        17        943 33101  33548 10L  S8_2     
-        17        944 33101  33563 10R  S8_2     
-        17        945 33101  32731 10L  P14      
-        17        946 33101  33568 10R  S8_2     
-        17        947 33101  32735 10L  P14      
-        17        948 33101  32762 10R  P14      
-        17        949 33101  32741 10L  P14      
-        17        950 33101  33558 10R  S8_2     
-        17        951 33101  32746 10L  P14      
-        17        952 33101  32772 10R  P14      
-        17        953 33101  32726 10L  P14      
-        17        954 33101  32775 10R  P14      
-        17        955 33101  32719 10L  P14      
-        17        956 33101  32771 10R  P14      
-        17        957 33101  32713 10L  P14      
-        17        958 33101  32765 10R  P14      
-        17        959 33101  31148 10L  S7_3     
-        17        960 33101  32756 10R  P14      
-        17        961 33101  33544 10L  S8_2     
-        17        962 33101  34286 10R  S8_3     
-        17        963 33101  33549 10L  S8_2     
-        17        964 33101  33564 10R  S8_2     
-        17        965 33101  32732 10L  P14      
-        17        966 33101  33569 10R  S8_2     
-        17        967 33101  32737 10L  P14      
-        17        968 33101  32764 10R  P14      
-        17        969 33101  32742 10L  P14      
-        17        970 33101  33559 10R  S8_2     
-        17        971 33101  32747 10L  P14      
-        17        972 33101  32779 10R  P14      
-        17        973 33101  32727 10L  P14      
-        17        974 33101  32776 10R  P14      
-        17        975 33101  32720 10L  P14      
-        17        976 33101  32780 10R  P14      
-        17        977 33101  32714 10L  P14      
-        17        978 33101  32766 10R  P14      
-        17        979 33101  31149 10L  S7_3     
-        17        980 33101  32758 10R  P14      
-        17        981 33101  33545 10L  S8_2     
-        17        982 33101  34287 10R  S8_3     
-        17        983 33101  33550 10L  S8_2     
-        17        984 33101  30340 10R  S7_2     
-        17        985 33101  32733 10L  P14      
-        17        986 33101  32752 10R  P14      
-        17        987 33101  32738 10L  P14      
-        17        988 33101  30339 10R  S7_2     
-        17        989 33101  32743 10L  P14      
-        17        990 33101  33560 10R  S8_2     
-        17        991 33101  32712 10L  P14      
-        17        992 33101  32782 10R  P14      
-        17        993 33101  32728 10L  P14      
-        17        994 33101  32777 10R  P14      
-        17        995 33101  32722 10L  P14      
-        17        996 33101  32781 10R  P14      
-        17        997 33101  32716 10L  P14      
-        17        998 33101  32767 10R  P14      
-        17        999 33101  31150 10L  S7_3     
-        17       1000 33101  32759 10R  P14      
-        17       1001 33101  33623 11L  S8_2     
-        17       1002 33101  33659 11R  S8_2     
-        17       1003 33101  33616 11L  S8_2     
-        17       1004 33101  33664 11R  S8_2     
-        17       1005 33101  33604 11L  S8_2     
-        17       1006 33101  33641 11R  S8_2     
-        17       1007 33101  33594 11L  S8_2     
-        17       1008 33101  33669 11R  S8_2     
-        17       1009 33101  33598 11L  S8_2     
-        17       1010 33101  32787 11R  P14      
-        17       1011 33101  33579 11L  S8_2     
-        17       1012 33101  33644 11R  S8_2     
-        17       1013 33101  33589 11L  S8_2     
-        17       1014 33101  33639 11R  S8_2     
-        17       1015 33101  32783 11L  P14      
-        17       1016 33101  33634 11R  S8_2     
-        17       1017 33101  33584 11L  S8_2     
-        17       1018 33101  33629 11R  S8_2     
-        17       1019 33101  27662 11L  S6_3a    
-        17       1020 33101  33654 11R  S8_2     
-        17       1021 33101  33624 11L  S8_2     
-        17       1022 33101  33661 11R  S8_2     
-        17       1023 33101  33617 11L  S8_2     
-        17       1024 33101  33675 11R  S8_2     
-        17       1025 33101  33605 11L  S8_2     
-        17       1026 33101  33650 11R  S8_2     
-        17       1027 33101  33595 11L  S8_2     
-        17       1028 33101  33670 11R  S8_2     
-        17       1029 33101  33609 11L  S8_2     
-        17       1030 33101  32788 11R  P14      
-        17       1031 33101  33580 11L  S8_2     
-        17       1032 33101  33645 11R  S8_2     
-        17       1033 33101  33590 11L  S8_2     
-        17       1034 33101  33640 11R  S8_2     
-        17       1035 33101  32784 11L  P14      
-        17       1036 33101  33635 11R  S8_2     
-        17       1037 33101  33585 11L  S8_2     
-        17       1038 33101  33630 11R  S8_2     
-        17       1039 33101  31166 11L  S7_3     
-        17       1040 33101  33655 11R  S8_2     
-        17       1041 33101  33626 11L  S8_2     
-        17       1042 33101  33662 11R  S8_2     
-        17       1043 33101  33618 11L  S8_2     
-        17       1044 33101  33676 11R  S8_2     
-        17       1045 33101  33606 11L  S8_2     
-        17       1046 33101  33651 11R  S8_2     
-        17       1047 33101  33596 11L  S8_2     
-        17       1048 33101  33671 11R  S8_2     
-        17       1049 33101  33610 11L  S8_2     
-        17       1050 33101  32789 11R  P14      
-        17       1051 33101  33582 11L  S8_2     
-        17       1052 33101  33646 11R  S8_2     
-        17       1053 33101  33591 11L  S8_2     
-        17       1054 33101  33642 11R  S8_2     
-        17       1055 33101  32785 11L  P14      
-        17       1056 33101  33636 11R  S8_2     
-        17       1057 33101  33586 11L  S8_2     
-        17       1058 33101  33631 11R  S8_2     
-        17       1059 33101  31200 11L  S7_3     
-        17       1060 33101  33656 11R  S8_2     
-        17       1061 33101  34289 11L  S8_3     
-        17       1062 33101  34291 11R  S8_3     
-        17       1063 33101  33620 11L  S8_2     
-        17       1064 33101  33677 11R  S8_2     
-        17       1065 33101  33607 11L  S8_2     
-        17       1066 33101  33652 11R  S8_2     
-        17       1067 33101  33603 11L  S8_2     
-        17       1068 33101  33672 11R  S8_2     
-        17       1069 33101  33612 11L  S8_2     
-        17       1070 33101  33627 11R  S8_2     
-        17       1071 33101  33583 11L  S8_2     
-        17       1072 33101  33647 11R  S8_2     
-        17       1073 33101  33593 11L  S8_2     
-        17       1074 33101  33643 11R  S8_2     
-        17       1075 33101  32786 11L  P14      
-        17       1076 33101  33637 11R  S8_2     
-        17       1077 33101  33587 11L  S8_2     
-        17       1078 33101  33632 11R  S8_2     
-        17       1079 33101  25887 11L  P10_2    
-        17       1080 33101  33657 11R  S8_2     
-        17       1081 33101  27644 11L  S6_3a    
-        17       1082 33101  34292 11R  S8_3     
-        17       1083 33101  33622 11L  S8_2     
-        17       1084 33101  33680 11R  S8_2     
-        17       1085 33101  33608 11L  S8_2     
-        17       1086 33101  33653 11R  S8_2     
-        17       1087 33101  33611 11L  S8_2     
-        17       1088 33101  33673 11R  S8_2     
-        17       1089 33101  33613 11L  S8_2     
-        17       1090 33101  33628 11R  S8_2     
-        17       1091 33101  33602 11L  S8_2     
-        17       1092 33101  33648 11R  S8_2     
-        17       1093 33101  33601 11L  S8_2     
-        17       1094 33101  33649 11R  S8_2     
-        17       1095 33101  33578 11L  S8_2     
-        17       1096 33101  33638 11R  S8_2     
-        17       1097 33101  33588 11L  S8_2     
-        17       1098 33101  33633 11R  S8_2     
-        17       1099 33101  29376 11L  P13      
-        17       1100 33101  33658 11R  S8_2     
-        17       1101 33101  33724 12L  S8_2     
-        17       1102 33101  33774 12R  S8_2     
-        17       1103 33101  33719 12L  S8_2     
-        17       1104 33101  33757 12R  S8_2     
-        17       1105 33101  33709 12L  S8_2     
-        17       1106 33101  33777 12R  S8_2     
-        17       1107 33101  32791 12L  P14      
-        17       1108 33101  33792 12R  S8_2     
-        17       1109 33101  33704 12L  S8_2     
-        17       1110 33101  33751 12R  S8_2     
-        17       1111 33101  33694 12L  S8_2     
-        17       1112 33101  33747 12R  S8_2     
-        17       1113 33101  33690 12L  S8_2     
-        17       1114 33101  33767 12R  S8_2     
-        17       1115 33101  33684 12L  S8_2     
-        17       1116 33101  33762 12R  S8_2     
-        17       1117 33101  32790 12L  P14      
-        17       1118 33101  32793 12R  P14      
-        17       1119 33101  27786 12L  S6_3a    
-        17       1120 33101  33742 12R  S8_2     
-        17       1121 33101  33725 12L  S8_2     
-        17       1122 33101  33787 12R  S8_2     
-        17       1123 33101  33720 12L  S8_2     
-        17       1124 33101  33758 12R  S8_2     
-        17       1125 33101  33710 12L  S8_2     
-        17       1126 33101  33779 12R  S8_2     
-        17       1127 33101  33688 12L  S8_2     
-        17       1128 33101  33793 12R  S8_2     
-        17       1129 33101  33705 12L  S8_2     
-        17       1130 33101  33772 12R  S8_2     
-        17       1131 33101  33695 12L  S8_2     
-        17       1132 33101  33748 12R  S8_2     
-        17       1133 33101  33691 12L  S8_2     
-        17       1134 33101  33768 12R  S8_2     
-        17       1135 33101  33685 12L  S8_2     
-        17       1136 33101  33763 12R  S8_2     
-        17       1137 33101  32792 12L  P14      
-        17       1138 33101  33738 12R  S8_2     
-        17       1139 33101  27787 12L  S6_3a    
-        17       1140 33101  33743 12R  S8_2     
-        17       1141 33101  33726 12L  S8_2     
-        17       1142 33101  33789 12R  S8_2     
-        17       1143 33101  33721 12L  S8_2     
-        17       1144 33101  33759 12R  S8_2     
-        17       1145 33101  33712 12L  S8_2     
-        17       1146 33101  33780 12R  S8_2     
-        17       1147 33101  33689 12L  S8_2     
-        17       1148 33101  33794 12R  S8_2     
-        17       1149 33101  33706 12L  S8_2     
-        17       1150 33101  33773 12R  S8_2     
-        17       1151 33101  33696 12L  S8_2     
-        17       1152 33101  33754 12R  S8_2     
-        17       1153 33101  33692 12L  S8_2     
-        17       1154 33101  33769 12R  S8_2     
-        17       1155 33101  33686 12L  S8_2     
-        17       1156 33101  33764 12R  S8_2     
-        17       1157 33101  33682 12L  S8_2     
-        17       1158 33101  33739 12R  S8_2     
-        17       1159 33101  30672 12L  S7_2     
-        17       1160 33101  33744 12R  S8_2     
-        17       1161 33101  33727 12L  S8_2     
-        17       1162 33101  33790 12R  S8_2     
-        17       1163 33101  33722 12L  S8_2     
-        17       1164 33101  33760 12R  S8_2     
-        17       1165 33101  33713 12L  S8_2     
-        17       1166 33101  33781 12R  S8_2     
-        17       1167 33101  33697 12L  S8_2     
-        17       1168 33101  33795 12R  S8_2     
-        17       1169 33101  33707 12L  S8_2     
-        17       1170 33101  33775 12R  S8_2     
-        17       1171 33101  33698 12L  S8_2     
-        17       1172 33101  33755 12R  S8_2     
-        17       1173 33101  33693 12L  S8_2     
-        17       1174 33101  33770 12R  S8_2     
-        17       1175 33101  33687 12L  S8_2     
-        17       1176 33101  33765 12R  S8_2     
-        17       1177 33101  33683 12L  S8_2     
-        17       1178 33101  33740 12R  S8_2     
-        17       1179 33101  29394 12L  P13      
-        17       1180 33101  33745 12R  S8_2     
-        17       1181 33101  33728 12L  S8_2     
-        17       1182 33101  33791 12R  S8_2     
-        17       1183 33101  33723 12L  S8_2     
-        17       1184 33101  33761 12R  S8_2     
-        17       1185 33101  33714 12L  S8_2     
-        17       1186 33101  33782 12R  S8_2     
-        17       1187 33101  33703 12L  S8_2     
-        17       1188 33101  34298 12R  S8_3     
-        17       1189 33101  33708 12L  S8_2     
-        17       1190 33101  33776 12R  S8_2     
-        17       1191 33101  33702 12L  S8_2     
-        17       1192 33101  33756 12R  S8_2     
-        17       1193 33101  33701 12L  S8_2     
-        17       1194 33101  33771 12R  S8_2     
-        17       1195 33101  33700 12L  S8_2     
-        17       1196 33101  33766 12R  S8_2     
-        17       1197 33101  33699 12L  S8_2     
-        17       1198 33101  33741 12R  S8_2     
-        17       1199 33101  29389 12L  S6_3b    
-        17       1200 33101  33746 12R  S8_2     
-        17       1201 33101  32794 13L  P14      
-        17       1202 33101  27927 13R  S6_3a    
-        17       1203 33101  33241 13L  S8_1     
-        17       1204 33101  33271 13R  S8_1     
-        17       1205 33101  33196 13L  S8_1     
-        17       1206 33101  33251 13R  S8_1     
-        17       1207 33101  33220 13L  S8_1     
-        17       1208 33101  33281 13R  S8_1     
-        17       1209 33101  33231 13L  S8_1     
-        17       1210 33101  33246 13R  S8_1     
-        17       1211 33101  33226 13L  S8_1     
-        17       1212 33101  33296 13R  S8_1     
-        17       1213 33101  33236 13L  S8_1     
-        17       1214 33101  33252 13R  S8_1     
-        17       1215 33101  33206 13L  S8_1     
-        17       1216 33101  33275 13R  S8_1     
-        17       1217 33101  33201 13L  S8_1     
-        17       1218 33101  33272 13R  S8_1     
-        17       1219 33101  33212 13L  S8_1     
-        17       1220 33101  33261 13R  S8_1     
-        17       1221 33101  32795 13L  P14      
-        17       1222 33101  33254 13R  S8_1     
-        17       1223 33101  33242 13L  S8_1     
-        17       1224 33101  33273 13R  S8_1     
-        17       1225 33101  33198 13L  S8_1     
-        17       1226 33101  33260 13R  S8_1     
-        17       1227 33101  33224 13L  S8_1     
-        17       1228 33101  33796 13R  S8_2     
-        17       1229 33101  33232 13L  S8_1     
-        17       1230 33101  33248 13R  S8_1     
-        17       1231 33101  33227 13L  S8_1     
-        17       1232 33101  33297 13R  S8_1     
-        17       1233 33101  33237 13L  S8_1     
-        17       1234 33101  33255 13R  S8_1     
-        17       1235 33101  33207 13L  S8_1     
-        17       1236 33101  33287 13R  S8_1     
-        17       1237 33101  33202 13L  S8_1     
-        17       1238 33101  33277 13R  S8_1     
-        17       1239 33101  33214 13L  S8_1     
-        17       1240 33101  33264 13R  S8_1     
-        17       1241 33101  32796 13L  P14      
-        17       1242 33101  33265 13R  S8_1     
-        17       1243 33101  33243 13L  S8_1     
-        17       1244 33101  33274 13R  S8_1     
-        17       1245 33101  33199 13L  S8_1     
-        17       1246 33101  33262 13R  S8_1     
-        17       1247 33101  33210 13L  S8_1     
-        17       1248 33101  33797 13R  S8_2     
-        17       1249 33101  33233 13L  S8_1     
-        17       1250 33101  33249 13R  S8_1     
-        17       1251 33101  33228 13L  S8_1     
-        17       1252 33101  33298 13R  S8_1     
-        17       1253 33101  33238 13L  S8_1     
-        17       1254 33101  33256 13R  S8_1     
-        17       1255 33101  33208 13L  S8_1     
-        17       1256 33101  33288 13R  S8_1     
-        17       1257 33101  33204 13L  S8_1     
-        17       1258 33101  33278 13R  S8_1     
-        17       1259 33101  33215 13L  S8_1     
-        17       1260 33101  33268 13R  S8_1     
-        17       1261 33101  32797 13L  P14      
-        17       1262 33101  33291 13R  S8_1     
-        17       1263 33101  33244 13L  S8_1     
-        17       1264 33101  33276 13R  S8_1     
-        17       1265 33101  33200 13L  S8_1     
-        17       1266 33101  33263 13R  S8_1     
-        17       1267 33101  33213 13L  S8_1     
-        17       1268 33101  33799 13R  S8_2     
-        17       1269 33101  33234 13L  S8_1     
-        17       1270 33101  33283 13R  S8_1     
-        17       1271 33101  33229 13L  S8_1     
-        17       1272 33101  33299 13R  S8_1     
-        17       1273 33101  33239 13L  S8_1     
-        17       1274 33101  33258 13R  S8_1     
-        17       1275 33101  33209 13L  S8_1     
-        17       1276 33101  33289 13R  S8_1     
-        17       1277 33101  33205 13L  S8_1     
-        17       1278 33101  33279 13R  S8_1     
-        17       1279 33101  33216 13L  S8_1     
-        17       1280 33101  33269 13R  S8_1     
-        17       1281 33101  32798 13L  P14      
-        17       1282 33101  33295 13R  S8_1     
-        17       1283 33101  33211 13L  S8_1     
-        17       1284 33101  33286 13R  S8_1     
-        17       1285 33101  33219 13L  S8_1     
-        17       1286 33101  33266 13R  S8_1     
-        17       1287 33101  33218 13L  S8_1     
-        17       1288 33101  33800 13R  S8_2     
-        17       1289 33101  33235 13L  S8_1     
-        17       1290 33101  33284 13R  S8_1     
-        17       1291 33101  33230 13L  S8_1     
-        17       1292 33101  33300 13R  S8_1     
-        17       1293 33101  33240 13L  S8_1     
-        17       1294 33101  33259 13R  S8_1     
-        17       1295 33101  33223 13L  S8_1     
-        17       1296 33101  33290 13R  S8_1     
-        17       1297 33101  33221 13L  S8_1     
-        17       1298 33101  33280 13R  S8_1     
-        17       1299 33101  33217 13L  S8_1     
-        17       1300 33101  33270 13R  S8_1     
-        17       1301 33101  29722 14L  S7_1     
-        17       1302 33101  28064 14R  S6_3b    
-        17       1303 33101  29727 14L  S7_1     
-        17       1304 33101  29797 14R  S7_1     
-        17       1305 33101  29734 14L  S7_1     
-        17       1306 33101  28072 14R  S6_3b    
-        17       1307 33101  29739 14L  S7_1     
-        17       1308 33101  29786 14R  S7_1     
-        17       1309 33101  29747 14L  S7_1     
-        17       1310 33101  29791 14R  S7_1     
-        17       1311 33101  28614 14L  P12      
-        17       1312 33101  29301 14R  P13      
-        17       1313 33101  29484 14L  R1       
-        17       1314 33101  29538 14R  R1       
-        17       1315 33101  29497 14L  R1       
-        17       1316 33101  29600 14R  R1       
-        17       1317 33101  29412 14L  R1       
-        17       1318 33101  32386 14R  P14      
-        17       1319 33101  29475 14L  R1       
-        17       1320 33101  32385 14R  P14      
-        17       1321 33101  29723 14L  S7_1     
-        17       1322 33101  28077 14R  S6_3b    
-        17       1323 33101  29728 14L  S7_1     
-        17       1324 33101  29798 14R  S7_1     
-        17       1325 33101  29735 14L  S7_1     
-        17       1326 33101  29782 14R  S7_1     
-        17       1327 33101  29740 14L  S7_1     
-        17       1328 33101  29787 14R  S7_1     
-        17       1329 33101  29748 14L  S7_1     
-        17       1330 33101  29792 14R  S7_1     
-        17       1331 33101  28621 14L  P12      
-        17       1332 33101  29517 14R  R1       
-        17       1333 33101  29490 14L  R1       
-        17       1334 33101  29550 14R  R1       
-        17       1335 33101  29710 14L  S7_1     
-        17       1336 33101  29796 14R  S7_1     
-        17       1337 33101  29470 14L  R1       
-        17       1338 33101  32387 14R  P14      
-        17       1339 33101  29473 14L  R1       
-        17       1340 33101  32392 14R  P14      
-        17       1341 33101  29724 14L  S7_1     
-        17       1342 33101  28090 14R  S6_3b    
-        17       1343 33101  29731 14L  S7_1     
-        17       1344 33101  29799 14R  S7_1     
-        17       1345 33101  29736 14L  S7_1     
-        17       1346 33101  29783 14R  S7_1     
-        17       1347 33101  29743 14L  S7_1     
-        17       1348 33101  29788 14R  S7_1     
-        17       1349 33101  29749 14L  S7_1     
-        17       1350 33101  29793 14R  S7_1     
-        17       1351 33101  29298 14L  P13      
-        17       1352 33101  29520 14R  R1       
-        17       1353 33101  29492 14L  R1       
-        17       1354 33101  29556 14R  R1       
-        17       1355 33101  29719 14L  S7_1     
-        17       1356 33101  29598 14R  R1       
-        17       1357 33101  29730 14L  S7_1     
-        17       1358 33101  32388 14R  P14      
-        17       1359 33101  29702 14L  S7_1     
-        17       1360 33101  32393 14R  P14      
-        17       1361 33101  29725 14L  S7_1     
-        17       1362 33101  28094 14R  S6_3b    
-        17       1363 33101  29732 14L  S7_1     
-        17       1364 33101  29800 14R  S7_1     
-        17       1365 33101  29737 14L  S7_1     
-        17       1366 33101  29784 14R  S7_1     
-        17       1367 33101  29744 14L  S7_1     
-        17       1368 33101  29789 14R  S7_1     
-        17       1369 33101  29750 14L  S7_1     
-        17       1370 33101  29794 14R  S7_1     
-        17       1371 33101  29401 14L  R1       
-        17       1372 33101  29526 14R  R1       
-        17       1373 33101  29493 14L  R1       
-        17       1374 33101  29578 14R  R1       
-        17       1375 33101  29729 14L  S7_1     
-        17       1376 33101  29575 14R  R1       
-        17       1377 33101  29741 14L  S7_1     
-        17       1378 33101  32389 14R  P14      
-        17       1379 33101  32357 14L  P14      
-        17       1380 33101  32394 14R  P14      
-        17       1381 33101  29726 14L  S7_1     
-        17       1382 33101  27507 14R  S6_3     
-        17       1383 33101  29733 14L  S7_1     
-        17       1384 33101  28059 14R  S6_3b    
-        17       1385 33101  29738 14L  S7_1     
-        17       1386 33101  29785 14R  S7_1     
-        17       1387 33101  29746 14L  S7_1     
-        17       1388 33101  29790 14R  S7_1     
-        17       1389 33101  29706 14L  S7_1     
-        17       1390 33101  29795 14R  S7_1     
-        17       1391 33101  29405 14L  R1       
-        17       1392 33101  29528 14R  R1       
-        17       1393 33101  29496 14L  R1       
-        17       1394 33101  29579 14R  R1       
-        17       1395 33101  29477 14L  R1       
-        17       1396 33101  29303 14R  P13      
-        17       1397 33101  29745 14L  S7_1     
-        17       1398 33101  32390 14R  P14      
-        17       1399 33101  32358 14L  P14      
-        17       1400 33101  32395 14R  P14      
-        17       1401 33101  32801 15L  S3       
-        17       1402 33101  30888 15R  S7_3     
-        17       1403 33101  32806 15L  S3       
-        17       1404 33101  31371 15R  S07_4    
-        17       1405 33101  32816 15L  S3       
-        17       1406 33101  32851 15R  S3       
-        17       1407 33101  32819 15L  S3       
-        17       1408 33101  32856 15R  S3       
-        17       1409 33101  32826 15L  S3       
-        17       1410 33101  32861 15R  S3       
-        17       1411 33101  32830 15L  S3       
-        17       1412 33101  32871 15R  S3       
-        17       1413 33101  32841 15L  S3       
-        17       1414 33101  32876 15R  S3       
-        17       1415 33101  32840 15L  S3       
-        17       1416 33101  32881 15R  S3       
-        17       1417 33101  32410 15L  P14      
-        17       1418 33101  32887 15R  S3       
-        17       1419 33101  32416 15L  P14      
-        17       1420 33101  32419 15R  P14      
-        17       1421 33101  32802 15L  S3       
-        17       1422 33101  31366 15R  S07_4    
-        17       1423 33101  32807 15L  S3       
-        17       1424 33101  31372 15R  S07_4    
-        17       1425 33101  32818 15L  S3       
-        17       1426 33101  32852 15R  S3       
-        17       1427 33101  32820 15L  S3       
-        17       1428 33101  32857 15R  S3       
-        17       1429 33101  32827 15L  S3       
-        17       1430 33101  32862 15R  S3       
-        17       1431 33101  32831 15L  S3       
-        17       1432 33101  32872 15R  S3       
-        17       1433 33101  32842 15L  S3       
-        17       1434 33101  32877 15R  S3       
-        17       1435 33101  32846 15L  S3       
-        17       1436 33101  32883 15R  S3       
-        17       1437 33101  32412 15L  P14      
-        17       1438 33101  32888 15R  S3       
-        17       1439 33101  32417 15L  P14      
-        17       1440 33101  32867 15R  S3       
-        17       1441 33101  32803 15L  S3       
-        17       1442 33101  31367 15R  S07_4    
-        17       1443 33101  32809 15L  S3       
-        17       1444 33101  31373 15R  S07_4    
-        17       1445 33101  32813 15L  S3       
-        17       1446 33101  32853 15R  S3       
-        17       1447 33101  32821 15L  S3       
-        17       1448 33101  31376 15R  S07_4    
-        17       1449 33101  32828 15L  S3       
-        17       1450 33101  32863 15R  S3       
-        17       1451 33101  32834 15L  S3       
-        17       1452 33101  32873 15R  S3       
-        17       1453 33101  32843 15L  S3       
-        17       1454 33101  32882 15R  S3       
-        17       1455 33101  32848 15L  S3       
-        17       1456 33101  32884 15R  S3       
-        17       1457 33101  32413 15L  P14      
-        17       1458 33101  32889 15R  S3       
-        17       1459 33101  32418 15L  P14      
-        17       1460 33101  31377 15R  S07_4    
-        17       1461 33101  32804 15L  S3       
-        17       1462 33101  31368 15R  S07_4    
-        17       1463 33101  32810 15L  S3       
-        17       1464 33101  31374 15R  S07_4    
-        17       1465 33101  32814 15L  S3       
-        17       1466 33101  32854 15R  S3       
-        17       1467 33101  32822 15L  S3       
-        17       1468 33101  32859 15R  S3       
-        17       1469 33101  32829 15L  S3       
-        17       1470 33101  32864 15R  S3       
-        17       1471 33101  32836 15L  S3       
-        17       1472 33101  32874 15R  S3       
-        17       1473 33101  32844 15L  S3       
-        17       1474 33101  32879 15R  S3       
-        17       1475 33101  32849 15L  S3       
-        17       1476 33101  32885 15R  S3       
-        17       1477 33101  32414 15L  P14      
-        17       1478 33101  32890 15R  S3       
-        17       1479 33101  32838 15L  S3       
-        17       1480 33101  32869 15R  S3       
-        17       1481 33101  29841 15L  S7_1     
-        17       1482 33101  31370 15R  S07_4    
-        17       1483 33101  32812 15L  S3       
-        17       1484 33101  31375 15R  S07_4    
-        17       1485 33101  32815 15L  S3       
-        17       1486 33101  32855 15R  S3       
-        17       1487 33101  32823 15L  S3       
-        17       1488 33101  32860 15R  S3       
-        17       1489 33101  32824 15L  S3       
-        17       1490 33101  32865 15R  S3       
-        17       1491 33101  32837 15L  S3       
-        17       1492 33101  32875 15R  S3       
-        17       1493 33101  32845 15L  S3       
-        17       1494 33101  32880 15R  S3       
-        17       1495 33101  32850 15L  S3       
-        17       1496 33101  32886 15R  S3       
-        17       1497 33101  32415 15L  P14      
-        17       1498 33101  32891 15R  S3       
-        17       1499 33101  32839 15L  S3       
-        17       1500 33101  32870 15R  S3       
-        17       1501 33101  28649 16L  P12      
-        17       1502 33101  28693 16R  P12      
-        17       1503 33101  31396 16L  S07_4    
-        17       1504 33101  30920 16R  S7_3     
-        17       1505 33101  32429 16L  P14      
-        17       1506 33101  31441 16R  S07_4    
-        17       1507 33101  32434 16L  P14      
-        17       1508 33101  31446 16R  S07_4    
-        17       1509 33101  32441 16L  P14      
-        17       1510 33101  32486 16R  P14      
-        17       1511 33101  32447 16L  P14      
-        17       1512 33101  32491 16R  P14      
-        17       1513 33101  32456 16L  P14      
-        17       1514 33101  32501 16R  P14      
-        17       1515 33101  32461 16L  P14      
-        17       1516 33101  32506 16R  P14      
-        17       1517 33101  32455 16L  P14      
-        17       1518 33101  32507 16R  P14      
-        17       1519 33101  32474 16L  P14      
-        17       1520 33101  32513 16R  P14      
-        17       1521 33101  29319 16L  P13      
-        17       1522 33101  28703 16R  P12      
-        17       1523 33101  31402 16L  S07_4    
-        17       1524 33101  30925 16R  S7_3     
-        17       1525 33101  32430 16L  P14      
-        17       1526 33101  31442 16R  S07_4    
-        17       1527 33101  32437 16L  P14      
-        17       1528 33101  31447 16R  S07_4    
-        17       1529 33101  32442 16L  P14      
-        17       1530 33101  32487 16R  P14      
-        17       1531 33101  32448 16L  P14      
-        17       1532 33101  32492 16R  P14      
-        17       1533 33101  32457 16L  P14      
-        17       1534 33101  32497 16R  P14      
-        17       1535 33101  32462 16L  P14      
-        17       1536 33101  32502 16R  P14      
-        17       1537 33101  32466 16L  P14      
-        17       1538 33101  32509 16R  P14      
-        17       1539 33101  32475 16L  P14      
-        17       1540 33101  32514 16R  P14      
-        17       1541 33101  29930 16L  S7_1     
-        17       1542 33101  28704 16R  P12      
-        17       1543 33101  31411 16L  S07_4    
-        17       1544 33101  31417 16R  S07_4    
-        17       1545 33101  32431 16L  P14      
-        17       1546 33101  31443 16R  S07_4    
-        17       1547 33101  32438 16L  P14      
-        17       1548 33101  32483 16R  P14      
-        17       1549 33101  32443 16L  P14      
-        17       1550 33101  32488 16R  P14      
-        17       1551 33101  32449 16L  P14      
-        17       1552 33101  32493 16R  P14      
-        17       1553 33101  32458 16L  P14      
-        17       1554 33101  32498 16R  P14      
-        17       1555 33101  32463 16L  P14      
-        17       1556 33101  32503 16R  P14      
-        17       1557 33101  32468 16L  P14      
-        17       1558 33101  32510 16R  P14      
-        17       1559 33101  32477 16L  P14      
-        17       1560 33101  32515 16R  P14      
-        17       1561 33101  29932 16L  S7_1     
-        17       1562 33101  29967 16R  S7_1     
-        17       1563 33101  31384 16L  S07_4    
-        17       1564 33101  31435 16R  S07_4    
-        17       1565 33101  32432 16L  P14      
-        17       1566 33101  31444 16R  S07_4    
-        17       1567 33101  32439 16L  P14      
-        17       1568 33101  32484 16R  P14      
-        17       1569 33101  32444 16L  P14      
-        17       1570 33101  32489 16R  P14      
-        17       1571 33101  32452 16L  P14      
-        17       1572 33101  32494 16R  P14      
-        17       1573 33101  32459 16L  P14      
-        17       1574 33101  32499 16R  P14      
-        17       1575 33101  32464 16L  P14      
-        17       1576 33101  32504 16R  P14      
-        17       1577 33101  32469 16L  P14      
-        17       1578 33101  32511 16R  P14      
-        17       1579 33101  32479 16L  P14      
-        17       1580 33101  32516 16R  P14      
-        17       1581 33101  30899 16L  S7_3     
-        17       1582 33101  29999 16R  S7_1     
-        17       1583 33101  31390 16L  S07_4    
-        17       1584 33101  31440 16R  S07_4    
-        17       1585 33101  32433 16L  P14      
-        17       1586 33101  31445 16R  S07_4    
-        17       1587 33101  32440 16L  P14      
-        17       1588 33101  32485 16R  P14      
-        17       1589 33101  32445 16L  P14      
-        17       1590 33101  32490 16R  P14      
-        17       1591 33101  32453 16L  P14      
-        17       1592 33101  32495 16R  P14      
-        17       1593 33101  32460 16L  P14      
-        17       1594 33101  32500 16R  P14      
-        17       1595 33101  32465 16L  P14      
-        17       1596 33101  32505 16R  P14      
-        17       1597 33101  32473 16L  P14      
-        17       1598 33101  32512 16R  P14      
-        17       1599 33101  32480 16L  P14      
-        17       1600 33101  32517 16R  P14      
-        17       1601 33101  12707 17L  S1       
-        17       1602 33101  30080 17R  S7_1     
-        17       1603 33101  32545 17L  P14      
-        17       1604 33101  31509 17R  S07_4    
-        17       1605 33101  32553 17L  P14      
-        17       1606 33101  32602 17R  P14      
-        17       1607 33101  32562 17L  P14      
-        17       1608 33101  32608 17R  P14      
-        17       1609 33101  32564 17L  P14      
-        17       1610 33101  32613 17R  P14      
-        17       1611 33101  32576 17L  P14      
-        17       1612 33101  32621 17R  P14      
-        17       1613 33101  32581 17L  P14      
-        17       1614 33101  32626 17R  P14      
-        17       1615 33101  32586 17L  P14      
-        17       1616 33101  32629 17R  P14      
-        17       1617 33101  32588 17L  P14      
-        17       1618 33101  32647 17R  P14      
-        17       1619 33101  32591 17L  P14      
-        17       1620 33101  32641 17R  P14      
-        17       1621 33101  29327 17L  P13      
-        17       1622 33101  30954 17R  S7_3     
-        17       1623 33101  32546 17L  P14      
-        17       1624 33101  14340 17R  S2       
-        17       1625 33101  32554 17L  P14      
-        17       1626 33101  32603 17R  P14      
-        17       1627 33101  32563 17L  P14      
-        17       1628 33101  32609 17R  P14      
-        17       1629 33101  32568 17L  P14      
-        17       1630 33101  32614 17R  P14      
-        17       1631 33101  32572 17L  P14      
-        17       1632 33101  32623 17R  P14      
-        17       1633 33101  32582 17L  P14      
-        17       1634 33101  32627 17R  P14      
-        17       1635 33101  32587 17L  P14      
-        17       1636 33101  32631 17R  P14      
-        17       1637 33101  32590 17L  P14      
-        17       1638 33101  32637 17R  P14      
-        17       1639 33101  32592 17L  P14      
-        17       1640 33101  32642 17R  P14      
-        17       1641 33101  32540 17L  P14      
-        17       1642 33101  31496 17R  S07_4    
-        17       1643 33101  32547 17L  P14      
-        17       1644 33101  31519 17R  S07_4    
-        17       1645 33101  32555 17L  P14      
-        17       1646 33101  32605 17R  P14      
-        17       1647 33101  32558 17L  P14      
-        17       1648 33101  32610 17R  P14      
-        17       1649 33101  32569 17L  P14      
-        17       1650 33101  32615 17R  P14      
-        17       1651 33101  32573 17L  P14      
-        17       1652 33101  32618 17R  P14      
-        17       1653 33101  32583 17L  P14      
-        17       1654 33101  32628 17R  P14      
-        17       1655 33101  32578 17L  P14      
-        17       1656 33101  32632 17R  P14      
-        17       1657 33101  32596 17L  P14      
-        17       1658 33101  32638 17R  P14      
-        17       1659 33101  32593 17L  P14      
-        17       1660 33101  32643 17R  P14      
-        17       1661 33101  32541 17L  P14      
-        17       1662 33101  31499 17R  S07_4    
-        17       1663 33101  32548 17L  P14      
-        17       1664 33101  31520 17R  S07_4    
-        17       1665 33101  32556 17L  P14      
-        17       1666 33101  32606 17R  P14      
-        17       1667 33101  32559 17L  P14      
-        17       1668 33101  32611 17R  P14      
-        17       1669 33101  32570 17L  P14      
-        17       1670 33101  32616 17R  P14      
-        17       1671 33101  32574 17L  P14      
-        17       1672 33101  32619 17R  P14      
-        17       1673 33101  32584 17L  P14      
-        17       1674 33101  32624 17R  P14      
-        17       1675 33101  32579 17L  P14      
-        17       1676 33101  32633 17R  P14      
-        17       1677 33101  32597 17L  P14      
-        17       1678 33101  32639 17R  P14      
-        17       1679 33101  32594 17L  P14      
-        17       1680 33101  32644 17R  P14      
-        17       1681 33101  32542 17L  P14      
-        17       1682 33101  31505 17R  S07_4    
-        17       1683 33101  32549 17L  P14      
-        17       1684 33101  31527 17R  S07_4    
-        17       1685 33101  32557 17L  P14      
-        17       1686 33101  32607 17R  P14      
-        17       1687 33101  32560 17L  P14      
-        17       1688 33101  32612 17R  P14      
-        17       1689 33101  32571 17L  P14      
-        17       1690 33101  32617 17R  P14      
-        17       1691 33101  32575 17L  P14      
-        17       1692 33101  32620 17R  P14      
-        17       1693 33101  32585 17L  P14      
-        17       1694 33101  32625 17R  P14      
-        17       1695 33101  32580 17L  P14      
-        17       1696 33101  32634 17R  P14      
-        17       1697 33101  32598 17L  P14      
-        17       1698 33101  32640 17R  P14      
-        17       1699 33101  32595 17L  P14      
-        17       1700 33101  32645 17R  P14      
-        18          1 33101  33851 1L   S8_3     
-        18          2 33101  33886 1R   S8_3     
-        18          3 33101  33850 1L   S8_3     
-        18          4 33101  33893 1R   S8_3     
-        18          5 33101  35006 1L   S8_5     
-        18          6 33101  33898 1R   S8_3     
-        18          7 33101  35016 1L   S8_5     
-        18          8 33101  33906 1R   S8_3     
-        18          9 33101  35021 1L   S8_5     
-        18         10 33101  35051 1R   S8_5     
-        18         11 33101  35026 1L   S8_5     
-        18         12 33101  33900 1R   S8_3     
-        18         13 33101  35039 1L   S8_5     
-        18         14 33101  35061 1R   S8_5     
-        18         15 33101  35032 1L   S8_5     
-        18         16 33101  35066 1R   S8_5     
-        18         17 33101  33847 1L   S8_3     
-        18         18 33101  35076 1R   S8_5     
-        18         19 33101  35046 1L   S8_5     
-        18         20 33101  35071 1R   S8_5     
-        18         21 33101  33852 1L   S8_3     
-        18         22 33101  33887 1R   S8_3     
-        18         23 33101  35001 1L   S8_5     
-        18         24 33101  33894 1R   S8_3     
-        18         25 33101  35009 1L   S8_5     
-        18         26 33101  33902 1R   S8_3     
-        18         27 33101  35017 1L   S8_5     
-        18         28 33101  33907 1R   S8_3     
-        18         29 33101  35022 1L   S8_5     
-        18         30 33101  33899 1R   S8_3     
-        18         31 33101  35027 1L   S8_5     
-        18         32 33101  35057 1R   S8_5     
-        18         33 33101  35033 1L   S8_5     
-        18         34 33101  35062 1R   S8_5     
-        18         35 33101  35040 1L   S8_5     
-        18         36 33101  35067 1R   S8_5     
-        18         37 33101  33825 1L   S8_3     
-        18         38 33101  35077 1R   S8_5     
-        18         39 33101  35047 1L   S8_5     
-        18         40 33101  35081 1R   S8_5     
-        18         41 33101  33853 1L   S8_3     
-        18         42 33101  33888 1R   S8_3     
-        18         43 33101  35002 1L   S8_5     
-        18         44 33101  33895 1R   S8_3     
-        18         45 33101  35010 1L   S8_5     
-        18         46 33101  33903 1R   S8_3     
-        18         47 33101  35018 1L   S8_5     
-        18         48 33101  33908 1R   S8_3     
-        18         49 33101  35023 1L   S8_5     
-        18         50 33101  35053 1R   S8_5     
-        18         51 33101  35029 1L   S8_5     
-        18         52 33101  35058 1R   S8_5     
-        18         53 33101  35035 1L   S8_5     
-        18         54 33101  35063 1R   S8_5     
-        18         55 33101  35041 1L   S8_5     
-        18         56 33101  35068 1R   S8_5     
-        18         57 33101  33826 1L   S8_3     
-        18         58 33101  35078 1R   S8_5     
-        18         59 33101  35048 1L   S8_5     
-        18         60 33101  35073 1R   S8_5     
-        18         61 33101  33854 1L   S8_3     
-        18         62 33101  33890 1R   S8_3     
-        18         63 33101  35003 1L   S8_5     
-        18         64 33101  33896 1R   S8_3     
-        18         65 33101  35011 1L   S8_5     
-        18         66 33101  33904 1R   S8_3     
-        18         67 33101  35019 1L   S8_5     
-        18         68 33101  33909 1R   S8_3     
-        18         69 33101  35024 1L   S8_5     
-        18         70 33101  35054 1R   S8_5     
-        18         71 33101  35030 1L   S8_5     
-        18         72 33101  35059 1R   S8_5     
-        18         73 33101  35036 1L   S8_5     
-        18         74 33101  35064 1R   S8_5     
-        18         75 33101  35042 1L   S8_5     
-        18         76 33101  35069 1R   S8_5     
-        18         77 33101  33832 1L   S8_3     
-        18         78 33101  35079 1R   S8_5     
-        18         79 33101  35049 1L   S8_5     
-        18         80 33101  35074 1R   S8_5     
-        18         81 33101  33855 1L   S8_3     
-        18         82 33101  33891 1R   S8_3     
-        18         83 33101  35005 1L   S8_5     
-        18         84 33101  33897 1R   S8_3     
-        18         85 33101  35012 1L   S8_5     
-        18         86 33101  33905 1R   S8_3     
-        18         87 33101  35015 1L   S8_5     
-        18         88 33101  33910 1R   S8_3     
-        18         89 33101  35025 1L   S8_5     
-        18         90 33101  35055 1R   S8_5     
-        18         91 33101  35031 1L   S8_5     
-        18         92 33101  35060 1R   S8_5     
-        18         93 33101  35038 1L   S8_5     
-        18         94 33101  35065 1R   S8_5     
-        18         95 33101  35044 1L   S8_5     
-        18         96 33101  35070 1R   S8_5     
-        18         97 33101  33841 1L   S8_3     
-        18         98 33101  35080 1R   S8_5     
-        18         99 33101  35045 1L   S8_5     
-        18        100 33101  35075 1R   S8_5     
-        18        101 33101  33957 2L   S8_3     
-        18        102 33101  34016 2R   S8_3     
-        18        103 33101  33963 2L   S8_3     
-        18        104 33101  34021 2R   S8_3     
-        18        105 33101  35095 2L   S8_5     
-        18        106 33101  34028 2R   S8_3     
-        18        107 33101  35111 2L   S8_5     
-        18        108 33101  35141 2R   S8_5     
-        18        109 33101  35121 2L   S8_5     
-        18        110 33101  35146 2R   S8_5     
-        18        111 33101  35126 2L   S8_5     
-        18        112 33101  35151 2R   S8_5     
-        18        113 33101  35131 2L   S8_5     
-        18        114 33101  35156 2R   S8_5     
-        18        115 33101  35136 2L   S8_5     
-        18        116 33101  35166 2R   S8_5     
-        18        117 33101  33944 2L   S8_3     
-        18        118 33101  35161 2R   S8_5     
-        18        119 33101  31897 2L   S07_5    
-        18        120 33101  35171 2R   S8_5     
-        18        121 33101  33958 2L   S8_3     
-        18        122 33101  34017 2R   S8_3     
-        18        123 33101  33964 2L   S8_3     
-        18        124 33101  34023 2R   S8_3     
-        18        125 33101  35098 2L   S8_5     
-        18        126 33101  34030 2R   S8_3     
-        18        127 33101  35107 2L   S8_5     
-        18        128 33101  35142 2R   S8_5     
-        18        129 33101  35122 2L   S8_5     
-        18        130 33101  35147 2R   S8_5     
-        18        131 33101  35127 2L   S8_5     
-        18        132 33101  35165 2R   S8_5     
-        18        133 33101  35132 2L   S8_5     
-        18        134 33101  35157 2R   S8_5     
-        18        135 33101  35137 2L   S8_5     
-        18        136 33101  35167 2R   S8_5     
-        18        137 33101  33953 2L   S8_3     
-        18        138 33101  35162 2R   S8_5     
-        18        139 33101  35117 2L   S8_5     
-        18        140 33101  35172 2R   S8_5     
-        18        141 33101  33960 2L   S8_3     
-        18        142 33101  34018 2R   S8_3     
-        18        143 33101  33965 2L   S8_3     
-        18        144 33101  34024 2R   S8_3     
-        18        145 33101  35102 2L   S8_5     
-        18        146 33101  34312 2R   S8_4     
-        18        147 33101  35108 2L   S8_5     
-        18        148 33101  35143 2R   S8_5     
-        18        149 33101  35123 2L   S8_5     
-        18        150 33101  35148 2R   S8_5     
-        18        151 33101  35128 2L   S8_5     
-        18        152 33101  35153 2R   S8_5     
-        18        153 33101  35112 2L   S8_5     
-        18        154 33101  35158 2R   S8_5     
-        18        155 33101  35139 2L   S8_5     
-        18        156 33101  35168 2R   S8_5     
-        18        157 33101  31893 2L   S07_5    
-        18        158 33101  35163 2R   S8_5     
-        18        159 33101  35118 2L   S8_5     
-        18        160 33101  35173 2R   S8_5     
-        18        161 33101  33961 2L   S8_3     
-        18        162 33101  34019 2R   S8_3     
-        18        163 33101  35093 2L   S8_5     
-        18        164 33101  34026 2R   S8_3     
-        18        165 33101  35104 2L   S8_5     
-        18        166 33101  34313 2R   S8_4     
-        18        167 33101  35109 2L   S8_5     
-        18        168 33101  35144 2R   S8_5     
-        18        169 33101  35124 2L   S8_5     
-        18        170 33101  35149 2R   S8_5     
-        18        171 33101  35129 2L   S8_5     
-        18        172 33101  35154 2R   S8_5     
-        18        173 33101  35134 2L   S8_5     
-        18        174 33101  35159 2R   S8_5     
-        18        175 33101  35113 2L   S8_5     
-        18        176 33101  35169 2R   S8_5     
-        18        177 33101  31898 2L   S07_5    
-        18        178 33101  34311 2R   S8_4     
-        18        179 33101  35119 2L   S8_5     
-        18        180 33101  35174 2R   S8_5     
-        18        181 33101  33962 2L   S8_3     
-        18        182 33101  34020 2R   S8_3     
-        18        183 33101  35094 2L   S8_5     
-        18        184 33101  34027 2R   S8_3     
-        18        185 33101  35105 2L   S8_5     
-        18        186 33101  34314 2R   S8_4     
-        18        187 33101  35110 2L   S8_5     
-        18        188 33101  35145 2R   S8_5     
-        18        189 33101  35125 2L   S8_5     
-        18        190 33101  35150 2R   S8_5     
-        18        191 33101  35130 2L   S8_5     
-        18        192 33101  35155 2R   S8_5     
-        18        193 33101  35135 2L   S8_5     
-        18        194 33101  35160 2R   S8_5     
-        18        195 33101  35114 2L   S8_5     
-        18        196 33101  35170 2R   S8_5     
-        18        197 33101  33950 2L   S8_3     
-        18        198 33101  34315 2R   S8_4     
-        18        199 33101  35120 2L   S8_5     
-        18        200 33101  35175 2R   S8_5     
-        18        201 33101  34071 3L   S8_3     
-        18        202 33101  33368 3R   S8_2     
-        18        203 33101  35186 3L   S8_5     
-        18        204 33101  35234 3R   S8_5     
-        18        205 33101  35191 3L   S8_5     
-        18        206 33101  35236 3R   S8_5     
-        18        207 33101  35198 3L   S8_5     
-        18        208 33101  35241 3R   S8_5     
-        18        209 33101  35201 3L   S8_5     
-        18        210 33101  35235 3R   S8_5     
-        18        211 33101  35206 3L   S8_5     
-        18        212 33101  35251 3R   S8_5     
-        18        213 33101  35221 3L   S8_5     
-        18        214 33101  35281 3R   S8_5     
-        18        215 33101  35219 3L   S8_5     
-        18        216 33101  35266 3R   S8_5     
-        18        217 33101  35231 3L   S8_5     
-        18        218 33101  35271 3R   S8_5     
-        18        219 33101  35212 3L   S8_5     
-        18        220 33101  35256 3R   S8_5     
-        18        221 33101  34072 3L   S8_3     
-        18        222 33101  33369 3R   S8_2     
-        18        223 33101  35187 3L   S8_5     
-        18        224 33101  34079 3R   S8_3     
-        18        225 33101  35192 3L   S8_5     
-        18        226 33101  35237 3R   S8_5     
-        18        227 33101  35199 3L   S8_5     
-        18        228 33101  35242 3R   S8_5     
-        18        229 33101  35202 3L   S8_5     
-        18        230 33101  35247 3R   S8_5     
-        18        231 33101  35207 3L   S8_5     
-        18        232 33101  35252 3R   S8_5     
-        18        233 33101  35222 3L   S8_5     
-        18        234 33101  35282 3R   S8_5     
-        18        235 33101  35220 3L   S8_5     
-        18        236 33101  35267 3R   S8_5     
-        18        237 33101  35232 3L   S8_5     
-        18        238 33101  35273 3R   S8_5     
-        18        239 33101  35213 3L   S8_5     
-        18        240 33101  35261 3R   S8_5     
-        18        241 33101  34073 3L   S8_3     
-        18        242 33101  33341 3R   S8_2     
-        18        243 33101  35188 3L   S8_5     
-        18        244 33101  34080 3R   S8_3     
-        18        245 33101  35193 3L   S8_5     
-        18        246 33101  35238 3R   S8_5     
-        18        247 33101  34076 3L   S8_3     
-        18        248 33101  35243 3R   S8_5     
-        18        249 33101  35203 3L   S8_5     
-        18        250 33101  35248 3R   S8_5     
-        18        251 33101  35208 3L   S8_5     
-        18        252 33101  35253 3R   S8_5     
-        18        253 33101  35223 3L   S8_5     
-        18        254 33101  33325 3R   S8_2     
-        18        255 33101  35226 3L   S8_5     
-        18        256 33101  35268 3R   S8_5     
-        18        257 33101  32028 3L   S07_5    
-        18        258 33101  35276 3R   S8_5     
-        18        259 33101  36141 3L   S9_1     
-        18        260 33101  35275 3R   S8_5     
-        18        261 33101  34074 3L   S8_3     
-        18        262 33101  33366 3R   S8_2     
-        18        263 33101  35189 3L   S8_5     
-        18        264 33101  34081 3R   S8_3     
-        18        265 33101  35196 3L   S8_5     
-        18        266 33101  35239 3R   S8_5     
-        18        267 33101  34077 3L   S8_3     
-        18        268 33101  35244 3R   S8_5     
-        18        269 33101  35204 3L   S8_5     
-        18        270 33101  35249 3R   S8_5     
-        18        271 33101  35209 3L   S8_5     
-        18        272 33101  35254 3R   S8_5     
-        18        273 33101  35224 3L   S8_5     
-        18        274 33101  35265 3R   S8_5     
-        18        275 33101  35227 3L   S8_5     
-        18        276 33101  35260 3R   S8_5     
-        18        277 33101  32037 3L   S07_5    
-        18        278 33101  35277 3R   S8_5     
-        18        279 33101  35217 3L   S8_5     
-        18        280 33101  35279 3R   S8_5     
-        18        281 33101  34075 3L   S8_3     
-        18        282 33101  34078 3R   S8_3     
-        18        283 33101  35190 3L   S8_5     
-        18        284 33101  34082 3R   S8_3     
-        18        285 33101  35197 3L   S8_5     
-        18        286 33101  35240 3R   S8_5     
-        18        287 33101  34317 3L   S8_4     
-        18        288 33101  35245 3R   S8_5     
-        18        289 33101  35205 3L   S8_5     
-        18        290 33101  35250 3R   S8_5     
-        18        291 33101  35210 3L   S8_5     
-        18        292 33101  35255 3R   S8_5     
-        18        293 33101  35225 3L   S8_5     
-        18        294 33101  32324 3R   P14      
-        18        295 33101  35230 3L   S8_5     
-        18        296 33101  35270 3R   S8_5     
-        18        297 33101  35229 3L   S8_5     
-        18        298 33101  35278 3R   S8_5     
-        18        299 33101  35218 3L   S8_5     
-        18        300 33101  35280 3R   S8_5     
-        18        301 33101  35289 4L   S8_5     
-        18        302 33101  33463 4R   S8_2     
-        18        303 33101  35294 4L   S8_5     
-        18        304 33101  33476 4R   S8_2     
-        18        305 33101  35299 4L   S8_5     
-        18        306 33101  35314 4R   S8_5     
-        18        307 33101  35306 4L   S8_5     
-        18        308 33101  35319 4R   S8_5     
-        18        309 33101  36161 4L   S9_1     
-        18        310 33101  33474 4R   S8_2     
-        18        311 33101  36167 4L   S9_1     
-        18        312 33101  35329 4R   S8_5     
-        18        313 33101  33394 4L   S8_2     
-        18        314 33101  36186 4R   S9_1     
-        18        315 33101  30253 4L   S7_2     
-        18        316 33101  36191 4R   S9_1     
-        18        317 33101  36176 4L   S9_1     
-        18        318 33101  33441 4R   S8_2     
-        18        319 33101  36175 4L   S9_1     
-        18        320 33101  35339 4R   S8_5     
-        18        321 33101  35290 4L   S8_5     
-        18        322 33101  34089 4R   S8_3     
-        18        323 33101  35305 4L   S8_5     
-        18        324 33101  33477 4R   S8_2     
-        18        325 33101  35300 4L   S8_5     
-        18        326 33101  35315 4R   S8_5     
-        18        327 33101  35307 4L   S8_5     
-        18        328 33101  35320 4R   S8_5     
-        18        329 33101  36162 4L   S9_1     
-        18        330 33101  33475 4R   S8_2     
-        18        331 33101  36168 4L   S9_1     
-        18        332 33101  35330 4R   S8_5     
-        18        333 33101  33406 4L   S8_2     
-        18        334 33101  36187 4R   S9_1     
-        18        335 33101  35308 4L   S8_5     
-        18        336 33101  36192 4R   S9_1     
-        18        337 33101  36177 4L   S9_1     
-        18        338 33101  33446 4R   S8_2     
-        18        339 33101  36181 4L   S9_1     
-        18        340 33101  35340 4R   S8_5     
-        18        341 33101  35291 4L   S8_5     
-        18        342 33101  34090 4R   S8_3     
-        18        343 33101  35296 4L   S8_5     
-        18        344 33101  33478 4R   S8_2     
-        18        345 33101  35301 4L   S8_5     
-        18        346 33101  35316 4R   S8_5     
-        18        347 33101  36166 4L   S9_1     
-        18        348 33101  35321 4R   S8_5     
-        18        349 33101  36163 4L   S9_1     
-        18        350 33101  35325 4R   S8_5     
-        18        351 33101  36169 4L   S9_1     
-        18        352 33101  35331 4R   S8_5     
-        18        353 33101  33414 4L   S8_2     
-        18        354 33101  36188 4R   S9_1     
-        18        355 33101  33390 4L   S8_2     
-        18        356 33101  36193 4R   S9_1     
-        18        357 33101  36178 4L   S9_1     
-        18        358 33101  35328 4R   S8_5     
-        18        359 33101  36183 4L   S9_1     
-        18        360 33101  35341 4R   S8_5     
-        18        361 33101  32331 4L   P14      
-        18        362 33101  34091 4R   S8_3     
-        18        363 33101  35297 4L   S8_5     
-        18        364 33101  33479 4R   S8_2     
-        18        365 33101  35302 4L   S8_5     
-        18        366 33101  35317 4R   S8_5     
-        18        367 33101  35309 4L   S8_5     
-        18        368 33101  35322 4R   S8_5     
-        18        369 33101  36164 4L   S9_1     
-        18        370 33101  35326 4R   S8_5     
-        18        371 33101  36172 4L   S9_1     
-        18        372 33101  35332 4R   S8_5     
-        18        373 33101  33422 4L   S8_2     
-        18        374 33101  36189 4R   S9_1     
-        18        375 33101  32117 4L   S07_5    
-        18        376 33101  36194 4R   S9_1     
-        18        377 33101  36179 4L   S9_1     
-        18        378 33101  35335 4R   S8_5     
-        18        379 33101  36184 4L   S9_1     
-        18        380 33101  35342 4R   S8_5     
-        18        381 33101  35293 4L   S8_5     
-        18        382 33101  34092 4R   S8_3     
-        18        383 33101  35298 4L   S8_5     
-        18        384 33101  34088 4R   S8_3     
-        18        385 33101  35303 4L   S8_5     
-        18        386 33101  35318 4R   S8_5     
-        18        387 33101  35310 4L   S8_5     
-        18        388 33101  35323 4R   S8_5     
-        18        389 33101  35311 4L   S8_5     
-        18        390 33101  35327 4R   S8_5     
-        18        391 33101  36174 4L   S9_1     
-        18        392 33101  35333 4R   S8_5     
-        18        393 33101  32116 4L   S07_5    
-        18        394 33101  36190 4R   S9_1     
-        18        395 33101  32109 4L   S07_5    
-        18        396 33101  36195 4R   S9_1     
-        18        397 33101  36180 4L   S9_1     
-        18        398 33101  35338 4R   S8_5     
-        18        399 33101  33383 4L   S8_2     
-        18        400 33101  32151 4R   S07_5    
-        18        401 33101  34116 5L   S8_3     
-        18        402 33101  34126 5R   S8_3     
-        18        403 33101  35343 5L   S8_5     
-        18        404 33101  34131 5R   S8_3     
-        18        405 33101  36216 5L   S9_1     
-        18        406 33101  34136 5R   S8_3     
-        18        407 33101  36226 5L   S9_1     
-        18        408 33101  34125 5R   S8_3     
-        18        409 33101  36231 5L   S9_1     
-        18        410 33101  36261 5R   S9_1     
-        18        411 33101  36236 5L   S9_1     
-        18        412 33101  36266 5R   S9_1     
-        18        413 33101  36221 5L   S9_1     
-        18        414 33101  36271 5R   S9_1     
-        18        415 33101  36241 5L   S9_1     
-        18        416 33101  36276 5R   S9_1     
-        18        417 33101  33494 5L   S8_2     
-        18        418 33101  36281 5R   S9_1     
-        18        419 33101  36251 5L   S9_1     
-        18        420 33101  36286 5R   S9_1     
-        18        421 33101  34117 5L   S8_3     
-        18        422 33101  34127 5R   S8_3     
-        18        423 33101  35344 5L   S8_5     
-        18        424 33101  34132 5R   S8_3     
-        18        425 33101  36217 5L   S9_1     
-        18        426 33101  34137 5R   S8_3     
-        18        427 33101  36227 5L   S9_1     
-        18        428 33101  34141 5R   S8_3     
-        18        429 33101  36232 5L   S9_1     
-        18        430 33101  32350 5R   P14      
-        18        431 33101  36237 5L   S9_1     
-        18        432 33101  36267 5R   S9_1     
-        18        433 33101  36222 5L   S9_1     
-        18        434 33101  36272 5R   S9_1     
-        18        435 33101  36242 5L   S9_1     
-        18        436 33101  36277 5R   S9_1     
-        18        437 33101  33495 5L   S8_2     
-        18        438 33101  36282 5R   S9_1     
-        18        439 33101  36252 5L   S9_1     
-        18        440 33101  36289 5R   S9_1     
-        18        441 33101  34118 5L   S8_3     
-        18        442 33101  34128 5R   S8_3     
-        18        443 33101  36213 5L   S9_1     
-        18        444 33101  34133 5R   S8_3     
-        18        445 33101  35345 5L   S8_5     
-        18        446 33101  34138 5R   S8_3     
-        18        447 33101  36228 5L   S9_1     
-        18        448 33101  34142 5R   S8_3     
-        18        449 33101  36233 5L   S9_1     
-        18        450 33101  36263 5R   S9_1     
-        18        451 33101  36238 5L   S9_1     
-        18        452 33101  36268 5R   S9_1     
-        18        453 33101  36248 5L   S9_1     
-        18        454 33101  36273 5R   S9_1     
-        18        455 33101  36243 5L   S9_1     
-        18        456 33101  36278 5R   S9_1     
-        18        457 33101  33496 5L   S8_2     
-        18        458 33101  36283 5R   S9_1     
-        18        459 33101  36253 5L   S9_1     
-        18        460 33101  36290 5R   S9_1     
-        18        461 33101  34119 5L   S8_3     
-        18        462 33101  34129 5R   S8_3     
-        18        463 33101  36214 5L   S9_1     
-        18        464 33101  34134 5R   S8_3     
-        18        465 33101  36219 5L   S9_1     
-        18        466 33101  34139 5R   S8_3     
-        18        467 33101  36229 5L   S9_1     
-        18        468 33101  35346 5R   S8_5     
-        18        469 33101  36234 5L   S9_1     
-        18        470 33101  36264 5R   S9_1     
-        18        471 33101  36239 5L   S9_1     
-        18        472 33101  36269 5R   S9_1     
-        18        473 33101  36224 5L   S9_1     
-        18        474 33101  36274 5R   S9_1     
-        18        475 33101  36244 5L   S9_1     
-        18        476 33101  36279 5R   S9_1     
-        18        477 33101  33498 5L   S8_2     
-        18        478 33101  36284 5R   S9_1     
-        18        479 33101  36254 5L   S9_1     
-        18        480 33101  36291 5R   S9_1     
-        18        481 33101  34115 5L   S8_3     
-        18        482 33101  34130 5R   S8_3     
-        18        483 33101  36215 5L   S9_1     
-        18        484 33101  34135 5R   S8_3     
-        18        485 33101  36220 5L   S9_1     
-        18        486 33101  34140 5R   S8_3     
-        18        487 33101  36230 5L   S9_1     
-        18        488 33101  32290 5R   S07_5    
-        18        489 33101  36235 5L   S9_1     
-        18        490 33101  36265 5R   S9_1     
-        18        491 33101  36240 5L   S9_1     
-        18        492 33101  36270 5R   S9_1     
-        18        493 33101  36249 5L   S9_1     
-        18        494 33101  36275 5R   S9_1     
-        18        495 33101  33493 5L   S8_2     
-        18        496 33101  36280 5R   S9_1     
-        18        497 33101  34103 5L   S8_3     
-        18        498 33101  36285 5R   S9_1     
-        18        499 33101  36255 5L   S9_1     
-        18        500 33101  35347 5R   S8_5     
-        18        501 33101  34182 6L   S8_3     
-        18        502 33101  34256 6R   P14      
-        18        503 33101  34185 6L   S8_3     
-        18        504 33101  31072 6R   S7_3     
-        18        505 33101  34184 6L   S8_3     
-        18        506 33101  34260 6R   P14      
-        18        507 33101  34171 6L   S8_3     
-        18        508 33101  34251 6R   P14      
-        18        509 33101  32657 6L   P14      
-        18        510 33101  34216 6R   P14      
-        18        511 33101  34206 6L   S8_3     
-        18        512 33101  34221 6R   P14      
-        18        513 33101  34196 6L   S8_3     
-        18        514 33101  34241 6R   P14      
-        18        515 33101  34161 6L   S8_3     
-        18        516 33101  34236 6R   P14      
-        18        517 33101  34176 6L   S8_3     
-        18        518 33101  34231 6R   P14      
-        18        519 33101  34186 6L   S8_3     
-        18        520 33101  34226 6R   P14      
-        18        521 33101  34345 6L   S8_4     
-        18        522 33101  34247 6R   P14      
-        18        523 33101  34192 6L   S8_3     
-        18        524 33101  31073 6R   S7_3     
-        18        525 33101  34201 6L   S8_3     
-        18        526 33101  34261 6R   P14      
-        18        527 33101  34172 6L   S8_3     
-        18        528 33101  34252 6R   P14      
-        18        529 33101  32658 6L   P14      
-        18        530 33101  34217 6R   P14      
-        18        531 33101  34207 6L   S8_3     
-        18        532 33101  34222 6R   P14      
-        18        533 33101  34197 6L   S8_3     
-        18        534 33101  34242 6R   P14      
-        18        535 33101  34162 6L   S8_3     
-        18        536 33101  34237 6R   P14      
-        18        537 33101  34177 6L   S8_3     
-        18        538 33101  34232 6R   P14      
-        18        539 33101  34187 6L   S8_3     
-        18        540 33101  34227 6R   P14      
-        18        541 33101  34347 6L   S8_4     
-        18        542 33101  34248 6R   P14      
-        18        543 33101  34193 6L   S8_3     
-        18        544 33101  32665 6R   P14      
-        18        545 33101  34203 6L   S8_3     
-        18        546 33101  32666 6R   P14      
-        18        547 33101  34173 6L   S8_3     
-        18        548 33101  34253 6R   P14      
-        18        549 33101  34168 6L   S8_3     
-        18        550 33101  34218 6R   P14      
-        18        551 33101  22943 6L   S5       
-        18        552 33101  34223 6R   P14      
-        18        553 33101  34198 6L   S8_3     
-        18        554 33101  34243 6R   P14      
-        18        555 33101  34163 6L   S8_3     
-        18        556 33101  34238 6R   P14      
-        18        557 33101  34178 6L   S8_3     
-        18        558 33101  34233 6R   P14      
-        18        559 33101  34188 6L   S8_3     
-        18        560 33101  34228 6R   P14      
-        18        561 33101  34348 6L   S8_4     
-        18        562 33101  34249 6R   P14      
-        18        563 33101  34194 6L   S8_3     
-        18        564 33101  34209 6R   P14      
-        18        565 33101  34204 6L   S8_3     
-        18        566 33101  34214 6R   P14      
-        18        567 33101  34174 6L   S8_3     
-        18        568 33101  34254 6R   P14      
-        18        569 33101  34169 6L   S8_3     
-        18        570 33101  34219 6R   P14      
-        18        571 33101  23017 6L   S5       
-        18        572 33101  34224 6R   P14      
-        18        573 33101  34199 6L   S8_3     
-        18        574 33101  34244 6R   P14      
-        18        575 33101  34165 6L   S8_3     
-        18        576 33101  34239 6R   P14      
-        18        577 33101  34179 6L   S8_3     
-        18        578 33101  34234 6R   P14      
-        18        579 33101  34189 6L   S8_3     
-        18        580 33101  34229 6R   P14      
-        18        581 33101  34349 6L   S8_4     
-        18        582 33101  34250 6R   P14      
-        18        583 33101  34195 6L   S8_3     
-        18        584 33101  34210 6R   P14      
-        18        585 33101  34205 6L   S8_3     
-        18        586 33101  34215 6R   P14      
-        18        587 33101  34175 6L   S8_3     
-        18        588 33101  34255 6R   P14      
-        18        589 33101  34170 6L   S8_3     
-        18        590 33101  34220 6R   P14      
-        18        591 33101  23018 6L   S5       
-        18        592 33101  34225 6R   P14      
-        18        593 33101  34200 6L   S8_3     
-        18        594 33101  34245 6R   P14      
-        18        595 33101  32655 6L   P14      
-        18        596 33101  34240 6R   P14      
-        18        597 33101  34180 6L   S8_3     
-        18        598 33101  34235 6R   P14      
-        18        599 33101  34190 6L   S8_3     
-        18        600 33101  34230 6R   P14      
-        18        601 33101  34377 7L   S8_4     
-        18        602 33101  34420 7R   S8_4     
-        18        603 33101  34350 7L   S8_4     
-        18        604 33101  34419 7R   S8_4     
-        18        605 33101  34351 7L   S8_4     
-        18        606 33101  34422 7R   S8_4     
-        18        607 33101  34370 7L   S8_4     
-        18        608 33101  34427 7R   S8_4     
-        18        609 33101  34380 7L   S8_4     
-        18        610 33101  34406 7R   S8_4     
-        18        611 33101  34395 7L   S8_4     
-        18        612 33101  34402 7R   S8_4     
-        18        613 33101  34390 7L   S8_4     
-        18        614 33101  34412 7R   S8_4     
-        18        615 33101  34360 7L   S8_4     
-        18        616 33101  33019 7R   S8_1     
-        18        617 33101  34355 7L   S8_4     
-        18        618 33101  32675 7R   P14      
-        18        619 33101  32668 7L   P14      
-        18        620 33101  32680 7R   P14      
-        18        621 33101  34388 7L   S8_4     
-        18        622 33101  34438 7R   S8_4     
-        18        623 33101  34375 7L   S8_4     
-        18        624 33101  34432 7R   S8_4     
-        18        625 33101  34385 7L   S8_4     
-        18        626 33101  34423 7R   S8_4     
-        18        627 33101  34371 7L   S8_4     
-        18        628 33101  34428 7R   S8_4     
-        18        629 33101  34381 7L   S8_4     
-        18        630 33101  34408 7R   S8_4     
-        18        631 33101  34396 7L   S8_4     
-        18        632 33101  34403 7R   S8_4     
-        18        633 33101  34391 7L   S8_4     
-        18        634 33101  34413 7R   S8_4     
-        18        635 33101  34361 7L   S8_4     
-        18        636 33101  33022 7R   S8_1     
-        18        637 33101  34356 7L   S8_4     
-        18        638 33101  32676 7R   P14      
-        18        639 33101  32669 7L   P14      
-        18        640 33101  34263 7R   S8_3     
-        18        641 33101  34352 7L   S8_4     
-        18        642 33101  34439 7R   S8_4     
-        18        643 33101  34376 7L   S8_4     
-        18        644 33101  34433 7R   S8_4     
-        18        645 33101  34386 7L   S8_4     
-        18        646 33101  34424 7R   S8_4     
-        18        647 33101  34372 7L   S8_4     
-        18        648 33101  34429 7R   S8_4     
-        18        649 33101  34382 7L   S8_4     
-        18        650 33101  34409 7R   S8_4     
-        18        651 33101  34397 7L   S8_4     
-        18        652 33101  34404 7R   S8_4     
-        18        653 33101  34392 7L   S8_4     
-        18        654 33101  34414 7R   S8_4     
-        18        655 33101  34362 7L   S8_4     
-        18        656 33101  33032 7R   S8_1     
-        18        657 33101  34357 7L   S8_4     
-        18        658 33101  32677 7R   P14      
-        18        659 33101  32670 7L   P14      
-        18        660 33101  34264 7R   S8_3     
-        18        661 33101  34353 7L   S8_4     
-        18        662 33101  34440 7R   S8_4     
-        18        663 33101  34378 7L   S8_4     
-        18        664 33101  34434 7R   S8_4     
-        18        665 33101  34387 7L   S8_4     
-        18        666 33101  34425 7R   S8_4     
-        18        667 33101  34373 7L   S8_4     
-        18        668 33101  34430 7R   S8_4     
-        18        669 33101  34383 7L   S8_4     
-        18        670 33101  34410 7R   S8_4     
-        18        671 33101  34398 7L   S8_4     
-        18        672 33101  34405 7R   S8_4     
-        18        673 33101  34393 7L   S8_4     
-        18        674 33101  34415 7R   S8_4     
-        18        675 33101  34363 7L   S8_4     
-        18        676 33101  33037 7R   S8_1     
-        18        677 33101  34358 7L   S8_4     
-        18        678 33101  32678 7R   P14      
-        18        679 33101  32671 7L   P14      
-        18        680 33101  34265 7R   S8_3     
-        18        681 33101  34354 7L   S8_4     
-        18        682 33101  34277 7R   S8_3     
-        18        683 33101  34379 7L   S8_4     
-        18        684 33101  34436 7R   S8_4     
-        18        685 33101  34389 7L   S8_4     
-        18        686 33101  34426 7R   S8_4     
-        18        687 33101  34366 7L   S8_4     
-        18        688 33101  34431 7R   S8_4     
-        18        689 33101  34384 7L   S8_4     
-        18        690 33101  34411 7R   S8_4     
-        18        691 33101  34399 7L   S8_4     
-        18        692 33101  34407 7R   S8_4     
-        18        693 33101  34394 7L   S8_4     
-        18        694 33101  34416 7R   S8_4     
-        18        695 33101  34364 7L   S8_4     
-        18        696 33101  34268 7R   S8_3     
-        18        697 33101  34359 7L   S8_4     
-        18        698 33101  32679 7R   P14      
-        18        699 33101  32672 7L   P14      
-        18        700 33101  34266 7R   S8_3     
-        18        701 33101  34481 8L   S8_4     
-        18        702 33101  35665 8R   P15_1    
-        18        703 33101  34476 8L   S8_4     
-        18        704 33101  35935 8R   P15_2    
-        18        705 33101  34461 8L   S8_4     
-        18        706 33101  34524 8R   S8_4     
-        18        707 33101  34441 8L   S8_4     
-        18        708 33101  34514 8R   S8_4     
-        18        709 33101  34451 8L   S8_4     
-        18        710 33101  34534 8R   S8_4     
-        18        711 33101  34471 8L   S8_4     
-        18        712 33101  34529 8R   S8_4     
-        18        713 33101  34446 8L   S8_4     
-        18        714 33101  34539 8R   S8_4     
-        18        715 33101  34486 8L   S8_4     
-        18        716 33101  34505 8R   S8_4     
-        18        717 33101  34465 8L   S8_4     
-        18        718 33101  34504 8R   S8_4     
-        18        719 33101  34456 8L   S8_4     
-        18        720 33101  34499 8R   S8_4     
-        18        721 33101  34482 8L   S8_4     
-        18        722 33101  35666 8R   P15_1    
-        18        723 33101  34477 8L   S8_4     
-        18        724 33101  35936 8R   P15_2    
-        18        725 33101  34462 8L   S8_4     
-        18        726 33101  34525 8R   S8_4     
-        18        727 33101  34442 8L   S8_4     
-        18        728 33101  34515 8R   S8_4     
-        18        729 33101  34452 8L   S8_4     
-        18        730 33101  34535 8R   S8_4     
-        18        731 33101  34472 8L   S8_4     
-        18        732 33101  34530 8R   S8_4     
-        18        733 33101  34447 8L   S8_4     
-        18        734 33101  34519 8R   S8_4     
-        18        735 33101  34487 8L   S8_4     
-        18        736 33101  34507 8R   S8_4     
-        18        737 33101  34467 8L   S8_4     
-        18        738 33101  34510 8R   S8_4     
-        18        739 33101  34457 8L   S8_4     
-        18        740 33101  34500 8R   S8_4     
-        18        741 33101  34483 8L   S8_4     
-        18        742 33101  35667 8R   P15_1    
-        18        743 33101  34478 8L   S8_4     
-        18        744 33101  35937 8R   P15_2    
-        18        745 33101  34463 8L   S8_4     
-        18        746 33101  34526 8R   S8_4     
-        18        747 33101  34443 8L   S8_4     
-        18        748 33101  34516 8R   S8_4     
-        18        749 33101  34453 8L   S8_4     
-        18        750 33101  34536 8R   S8_4     
-        18        751 33101  34473 8L   S8_4     
-        18        752 33101  34531 8R   S8_4     
-        18        753 33101  34448 8L   S8_4     
-        18        754 33101  34520 8R   S8_4     
-        18        755 33101  34488 8L   S8_4     
-        18        756 33101  34508 8R   S8_4     
-        18        757 33101  34468 8L   S8_4     
-        18        758 33101  34511 8R   S8_4     
-        18        759 33101  34458 8L   S8_4     
-        18        760 33101  34501 8R   S8_4     
-        18        761 33101  34484 8L   S8_4     
-        18        762 33101  35668 8R   P15_1    
-        18        763 33101  34479 8L   S8_4     
-        18        764 33101  35938 8R   P15_2    
-        18        765 33101  34464 8L   S8_4     
-        18        766 33101  34527 8R   S8_4     
-        18        767 33101  34444 8L   S8_4     
-        18        768 33101  34517 8R   S8_4     
-        18        769 33101  34454 8L   S8_4     
-        18        770 33101  34537 8R   S8_4     
-        18        771 33101  34474 8L   S8_4     
-        18        772 33101  34532 8R   S8_4     
-        18        773 33101  34449 8L   S8_4     
-        18        774 33101  34522 8R   S8_4     
-        18        775 33101  34489 8L   S8_4     
-        18        776 33101  34509 8R   S8_4     
-        18        777 33101  34469 8L   S8_4     
-        18        778 33101  34512 8R   S8_4     
-        18        779 33101  34459 8L   S8_4     
-        18        780 33101  34502 8R   S8_4     
-        18        781 33101  34485 8L   S8_4     
-        18        782 33101  31676 8R   S7_4     
-        18        783 33101  34480 8L   S8_4     
-        18        784 33101  35939 8R   P15_2    
-        18        785 33101  34466 8L   S8_4     
-        18        786 33101  34523 8R   S8_4     
-        18        787 33101  34445 8L   S8_4     
-        18        788 33101  34521 8R   S8_4     
-        18        789 33101  34455 8L   S8_4     
-        18        790 33101  34538 8R   S8_4     
-        18        791 33101  33058 8L   S8_1     
-        18        792 33101  34533 8R   S8_4     
-        18        793 33101  34450 8L   S8_4     
-        18        794 33101  34528 8R   S8_4     
-        18        795 33101  34490 8L   S8_4     
-        18        796 33101  31674 8R   S7_4     
-        18        797 33101  34470 8L   S8_4     
-        18        798 33101  34506 8R   S8_4     
-        18        799 33101  34460 8L   S8_4     
-        18        800 33101  34503 8R   S8_4     
-        18        801 33101  34553 9L   S8_4     
-        18        802 33101  34639 9R   S8_4     
-        18        803 33101  34588 9L   S8_4     
-        18        804 33101  34630 9R   S8_4     
-        18        805 33101  34548 9L   S8_4     
-        18        806 33101  34619 9R   S8_4     
-        18        807 33101  34543 9L   S8_4     
-        18        808 33101  34614 9R   S8_4     
-        18        809 33101  34558 9L   S8_4     
-        18        810 33101  34624 9R   S8_4     
-        18        811 33101  34583 9L   S8_4     
-        18        812 33101  34623 9R   S8_4     
-        18        813 33101  34568 9L   S8_4     
-        18        814 33101  34644 9R   S8_4     
-        18        815 33101  34578 9L   S8_4     
-        18        816 33101  34604 9R   S8_4     
-        18        817 33101  32694 9L   P14      
-        18        818 33101  34609 9R   S8_4     
-        18        819 33101  32699 9L   P14      
-        18        820 33101  28554 9R   P13      
-        18        821 33101  34554 9L   S8_4     
-        18        822 33101  34640 9R   S8_4     
-        18        823 33101  34589 9L   S8_4     
-        18        824 33101  34635 9R   S8_4     
-        18        825 33101  34549 9L   S8_4     
-        18        826 33101  34620 9R   S8_4     
-        18        827 33101  34544 9L   S8_4     
-        18        828 33101  34615 9R   S8_4     
-        18        829 33101  34559 9L   S8_4     
-        18        830 33101  34625 9R   S8_4     
-        18        831 33101  34584 9L   S8_4     
-        18        832 33101  34632 9R   S8_4     
-        18        833 33101  34569 9L   S8_4     
-        18        834 33101  34645 9R   S8_4     
-        18        835 33101  34579 9L   S8_4     
-        18        836 33101  34605 9R   S8_4     
-        18        837 33101  32695 9L   P14      
-        18        838 33101  34610 9R   S8_4     
-        18        839 33101  32700 9L   P14      
-        18        840 33101  31770 9R   S7_4     
-        18        841 33101  34555 9L   S8_4     
-        18        842 33101  34641 9R   S8_4     
-        18        843 33101  34590 9L   S8_4     
-        18        844 33101  34636 9R   S8_4     
-        18        845 33101  34550 9L   S8_4     
-        18        846 33101  34621 9R   S8_4     
-        18        847 33101  34545 9L   S8_4     
-        18        848 33101  34616 9R   S8_4     
-        18        849 33101  34560 9L   S8_4     
-        18        850 33101  34626 9R   S8_4     
-        18        851 33101  34585 9L   S8_4     
-        18        852 33101  34633 9R   S8_4     
-        18        853 33101  34570 9L   S8_4     
-        18        854 33101  34646 9R   S8_4     
-        18        855 33101  34580 9L   S8_4     
-        18        856 33101  34606 9R   S8_4     
-        18        857 33101  32696 9L   P14      
-        18        858 33101  34611 9R   S8_4     
-        18        859 33101  32701 9L   P14      
-        18        860 33101  34596 9R   S8_4     
-        18        861 33101  34556 9L   S8_4     
-        18        862 33101  34642 9R   S8_4     
-        18        863 33101  34591 9L   S8_4     
-        18        864 33101  34637 9R   S8_4     
-        18        865 33101  34551 9L   S8_4     
-        18        866 33101  34622 9R   S8_4     
-        18        867 33101  34546 9L   S8_4     
-        18        868 33101  34617 9R   S8_4     
-        18        869 33101  34561 9L   S8_4     
-        18        870 33101  34627 9R   S8_4     
-        18        871 33101  34586 9L   S8_4     
-        18        872 33101  34634 9R   S8_4     
-        18        873 33101  34571 9L   S8_4     
-        18        874 33101  34597 9R   S8_4     
-        18        875 33101  34581 9L   S8_4     
-        18        876 33101  34607 9R   S8_4     
-        18        877 33101  32697 9L   P14      
-        18        878 33101  34612 9R   S8_4     
-        18        879 33101  32702 9L   P14      
-        18        880 33101  34599 9R   S8_4     
-        18        881 33101  34557 9L   S8_4     
-        18        882 33101  34631 9R   S8_4     
-        18        883 33101  34592 9L   S8_4     
-        18        884 33101  34638 9R   S8_4     
-        18        885 33101  34552 9L   S8_4     
-        18        886 33101  34629 9R   S8_4     
-        18        887 33101  34547 9L   S8_4     
-        18        888 33101  34618 9R   S8_4     
-        18        889 33101  34562 9L   S8_4     
-        18        890 33101  34628 9R   S8_4     
-        18        891 33101  34587 9L   S8_4     
-        18        892 33101  34643 9R   S8_4     
-        18        893 33101  34572 9L   S8_4     
-        18        894 33101  31143 9R   S7_3     
-        18        895 33101  34582 9L   S8_4     
-        18        896 33101  34608 9R   S8_4     
-        18        897 33101  32698 9L   P14      
-        18        898 33101  34613 9R   S8_4     
-        18        899 33101  32703 9L   P14      
-        18        900 33101  34603 9R   S8_4     
-        18        901 33101  34692 10L  S8_4     
-        18        902 33101  34726 10R  S8_4     
-        18        903 33101  34674 10L  S8_4     
-        18        904 33101  34736 10R  S8_4     
-        18        905 33101  34682 10L  S8_4     
-        18        906 33101  34716 10R  S8_4     
-        18        907 33101  34687 10L  S8_4     
-        18        908 33101  34711 10R  S8_4     
-        18        909 33101  34667 10L  S8_4     
-        18        910 33101  34731 10R  S8_4     
-        18        911 33101  34675 10L  S8_4     
-        18        912 33101  34706 10R  S8_4     
-        18        913 33101  34652 10L  S8_4     
-        18        914 33101  34696 10R  S8_4     
-        18        915 33101  34657 10L  S8_4     
-        18        916 33101  34741 10R  S8_4     
-        18        917 33101  33551 10L  S8_2     
-        18        918 33101  33565 10R  S8_2     
-        18        919 33101  34279 10L  S8_3     
-        18        920 33101  34288 10R  S8_3     
-        18        921 33101  34693 10L  S8_4     
-        18        922 33101  34727 10R  S8_4     
-        18        923 33101  34647 10L  S8_4     
-        18        924 33101  34737 10R  S8_4     
-        18        925 33101  34683 10L  S8_4     
-        18        926 33101  34717 10R  S8_4     
-        18        927 33101  34688 10L  S8_4     
-        18        928 33101  34712 10R  S8_4     
-        18        929 33101  34668 10L  S8_4     
-        18        930 33101  34732 10R  S8_4     
-        18        931 33101  34662 10L  S8_4     
-        18        932 33101  34707 10R  S8_4     
-        18        933 33101  34653 10L  S8_4     
-        18        934 33101  34697 10R  S8_4     
-        18        935 33101  34658 10L  S8_4     
-        18        936 33101  34721 10R  S8_4     
-        18        937 33101  33552 10L  S8_2     
-        18        938 33101  33570 10R  S8_2     
-        18        939 33101  34280 10L  S8_3     
-        18        940 33101  32748 10R  P14      
-        18        941 33101  34694 10L  S8_4     
-        18        942 33101  34728 10R  S8_4     
-        18        943 33101  34649 10L  S8_4     
-        18        944 33101  34738 10R  S8_4     
-        18        945 33101  34684 10L  S8_4     
-        18        946 33101  34718 10R  S8_4     
-        18        947 33101  34689 10L  S8_4     
-        18        948 33101  34713 10R  S8_4     
-        18        949 33101  34669 10L  S8_4     
-        18        950 33101  34733 10R  S8_4     
-        18        951 33101  34664 10L  S8_4     
-        18        952 33101  34708 10R  S8_4     
-        18        953 33101  34654 10L  S8_4     
-        18        954 33101  34698 10R  S8_4     
-        18        955 33101  34659 10L  S8_4     
-        18        956 33101  34723 10R  S8_4     
-        18        957 33101  33553 10L  S8_2     
-        18        958 33101  33572 10R  S8_2     
-        18        959 33101  34281 10L  S8_3     
-        18        960 33101  32773 10R  P14      
-        18        961 33101  34695 10L  S8_4     
-        18        962 33101  34729 10R  S8_4     
-        18        963 33101  34650 10L  S8_4     
-        18        964 33101  34739 10R  S8_4     
-        18        965 33101  34685 10L  S8_4     
-        18        966 33101  34719 10R  S8_4     
-        18        967 33101  34690 10L  S8_4     
-        18        968 33101  34714 10R  S8_4     
-        18        969 33101  34670 10L  S8_4     
-        18        970 33101  34734 10R  S8_4     
-        18        971 33101  34665 10L  S8_4     
-        18        972 33101  34709 10R  S8_4     
-        18        973 33101  34655 10L  S8_4     
-        18        974 33101  34699 10R  S8_4     
-        18        975 33101  34660 10L  S8_4     
-        18        976 33101  34724 10R  S8_4     
-        18        977 33101  33554 10L  S8_2     
-        18        978 33101  33573 10R  S8_2     
-        18        979 33101  34282 10L  S8_3     
-        18        980 33101  33556 10R  S8_2     
-        18        981 33101  34284 10L  S8_3     
-        18        982 33101  34730 10R  S8_4     
-        18        983 33101  34651 10L  S8_4     
-        18        984 33101  34740 10R  S8_4     
-        18        985 33101  34686 10L  S8_4     
-        18        986 33101  34720 10R  S8_4     
-        18        987 33101  34691 10L  S8_4     
-        18        988 33101  34715 10R  S8_4     
-        18        989 33101  34671 10L  S8_4     
-        18        990 33101  34735 10R  S8_4     
-        18        991 33101  34666 10L  S8_4     
-        18        992 33101  34742 10R  S8_4     
-        18        993 33101  34656 10L  S8_4     
-        18        994 33101  34700 10R  S8_4     
-        18        995 33101  34661 10L  S8_4     
-        18        996 33101  34725 10R  S8_4     
-        18        997 33101  33555 10L  S8_2     
-        18        998 33101  33575 10R  S8_2     
-        18        999 33101  34283 10L  S8_3     
-        18       1000 33101  33571 10R  S8_2     
-        18       1001 33101  34755 11L  S8_4     
-        18       1002 33101  34798 11R  S8_4     
-        18       1003 33101  33592 11L  S8_2     
-        18       1004 33101  34813 11R  S8_4     
-        18       1005 33101  34790 11L  S8_4     
-        18       1006 33101  34818 11R  S8_4     
-        18       1007 33101  34760 11L  S8_4     
-        18       1008 33101  34823 11R  S8_4     
-        18       1009 33101  34775 11L  S8_4     
-        18       1010 33101  34838 11R  S8_4     
-        18       1011 33101  34745 11L  S8_4     
-        18       1012 33101  34832 11R  S8_4     
-        18       1013 33101  34785 11L  S8_4     
-        18       1014 33101  34808 11R  S8_4     
-        18       1015 33101  34780 11L  S8_4     
-        18       1016 33101  34803 11R  S8_4     
-        18       1017 33101  34749 11L  S8_4     
-        18       1018 33101  33666 11R  S8_2     
-        18       1019 33101  33597 11L  S8_2     
-        18       1020 33101  34293 11R  S8_3     
-        18       1021 33101  34756 11L  S8_4     
-        18       1022 33101  34799 11R  S8_4     
-        18       1023 33101  34750 11L  S8_4     
-        18       1024 33101  34814 11R  S8_4     
-        18       1025 33101  34791 11L  S8_4     
-        18       1026 33101  34819 11R  S8_4     
-        18       1027 33101  34761 11L  S8_4     
-        18       1028 33101  34824 11R  S8_4     
-        18       1029 33101  34776 11L  S8_4     
-        18       1030 33101  34839 11R  S8_4     
-        18       1031 33101  34746 11L  S8_4     
-        18       1032 33101  34833 11R  S8_4     
-        18       1033 33101  34786 11L  S8_4     
-        18       1034 33101  34809 11R  S8_4     
-        18       1035 33101  34781 11L  S8_4     
-        18       1036 33101  34804 11R  S8_4     
-        18       1037 33101  34751 11L  S8_4     
-        18       1038 33101  33674 11R  S8_2     
-        18       1039 33101  33600 11L  S8_2     
-        18       1040 33101  34294 11R  S8_3     
-        18       1041 33101  34757 11L  S8_4     
-        18       1042 33101  34800 11R  S8_4     
-        18       1043 33101  34752 11L  S8_4     
-        18       1044 33101  34815 11R  S8_4     
-        18       1045 33101  34792 11L  S8_4     
-        18       1046 33101  34820 11R  S8_4     
-        18       1047 33101  34762 11L  S8_4     
-        18       1048 33101  34825 11R  S8_4     
-        18       1049 33101  34777 11L  S8_4     
-        18       1050 33101  34840 11R  S8_4     
-        18       1051 33101  34747 11L  S8_4     
-        18       1052 33101  34834 11R  S8_4     
-        18       1053 33101  34787 11L  S8_4     
-        18       1054 33101  34810 11R  S8_4     
-        18       1055 33101  34782 11L  S8_4     
-        18       1056 33101  34805 11R  S8_4     
-        18       1057 33101  27681 11L  S6_3a    
-        18       1058 33101  33678 11R  S8_2     
-        18       1059 33101  33614 11L  S8_2     
-        18       1060 33101  33663 11R  S8_2     
-        18       1061 33101  34758 11L  S8_4     
-        18       1062 33101  34801 11R  S8_4     
-        18       1063 33101  34753 11L  S8_4     
-        18       1064 33101  34816 11R  S8_4     
-        18       1065 33101  34793 11L  S8_4     
-        18       1066 33101  34821 11R  S8_4     
-        18       1067 33101  34763 11L  S8_4     
-        18       1068 33101  34826 11R  S8_4     
-        18       1069 33101  34778 11L  S8_4     
-        18       1070 33101  34842 11R  S8_4     
-        18       1071 33101  34748 11L  S8_4     
-        18       1072 33101  34836 11R  S8_4     
-        18       1073 33101  34788 11L  S8_4     
-        18       1074 33101  34811 11R  S8_4     
-        18       1075 33101  34783 11L  S8_4     
-        18       1076 33101  34806 11R  S8_4     
-        18       1077 33101  33621 11L  S8_2     
-        18       1078 33101  33679 11R  S8_2     
-        18       1079 33101  33615 11L  S8_2     
-        18       1080 33101  33665 11R  S8_2     
-        18       1081 33101  34759 11L  S8_4     
-        18       1082 33101  33660 11R  S8_2     
-        18       1083 33101  34754 11L  S8_4     
-        18       1084 33101  34817 11R  S8_4     
-        18       1085 33101  34794 11L  S8_4     
-        18       1086 33101  34822 11R  S8_4     
-        18       1087 33101  34764 11L  S8_4     
-        18       1088 33101  34827 11R  S8_4     
-        18       1089 33101  34779 11L  S8_4     
-        18       1090 33101  34829 11R  S8_4     
-        18       1091 33101  34290 11L  S8_3     
-        18       1092 33101  34837 11R  S8_4     
-        18       1093 33101  34789 11L  S8_4     
-        18       1094 33101  34812 11R  S8_4     
-        18       1095 33101  34784 11L  S8_4     
-        18       1096 33101  34807 11R  S8_4     
-        18       1097 33101  33625 11L  S8_2     
-        18       1098 33101  33681 11R  S8_2     
-        18       1099 33101  33619 11L  S8_2     
-        18       1100 33101  33668 11R  S8_2     
-        18       1101 33101  35355 12L  S8_5     
-        18       1102 33101  34881 12R  S8_4     
-        18       1103 33101  35360 12L  S8_5     
-        18       1104 33101  34899 12R  S8_4     
-        18       1105 33101  35370 12L  S8_5     
-        18       1106 33101  34884 12R  S8_4     
-        18       1107 33101  28782 12L  P12      
-        18       1108 33101  34879 12R  S8_4     
-        18       1109 33101  34849 12L  S8_4     
-        18       1110 33101  34894 12R  S8_4     
-        18       1111 33101  34844 12L  S8_4     
-        18       1112 33101  34889 12R  S8_4     
-        18       1113 33101  34859 12L  S8_4     
-        18       1114 33101  33785 12R  S8_2     
-        18       1115 33101  34846 12L  S8_4     
-        18       1116 33101  34914 12R  S8_4     
-        18       1117 33101  33711 12L  S8_2     
-        18       1118 33101  28808 12R  P12      
-        18       1119 33101  33734 12L  S8_2     
-        18       1120 33101  33778 12R  S8_2     
-        18       1121 33101  35356 12L  S8_5     
-        18       1122 33101  34909 12R  S8_4     
-        18       1123 33101  35361 12L  S8_5     
-        18       1124 33101  34900 12R  S8_4     
-        18       1125 33101  35371 12L  S8_5     
-        18       1126 33101  34885 12R  S8_4     
-        18       1127 33101  30665 12L  S7_2     
-        18       1128 33101  34904 12R  S8_4     
-        18       1129 33101  34850 12L  S8_4     
-        18       1130 33101  34895 12R  S8_4     
-        18       1131 33101  34845 12L  S8_4     
-        18       1132 33101  34890 12R  S8_4     
-        18       1133 33101  34860 12L  S8_4     
-        18       1134 33101  34870 12R  S8_4     
-        18       1135 33101  34856 12L  S8_4     
-        18       1136 33101  34915 12R  S8_4     
-        18       1137 33101  33715 12L  S8_2     
-        18       1138 33101  33749 12R  S8_2     
-        18       1139 33101  33735 12L  S8_2     
-        18       1140 33101  33783 12R  S8_2     
-        18       1141 33101  35357 12L  S8_5     
-        18       1142 33101  34910 12R  S8_4     
-        18       1143 33101  35362 12L  S8_5     
-        18       1144 33101  34901 12R  S8_4     
-        18       1145 33101  35372 12L  S8_5     
-        18       1146 33101  34886 12R  S8_4     
-        18       1147 33101  34864 12L  S8_4     
-        18       1148 33101  34905 12R  S8_4     
-        18       1149 33101  34851 12L  S8_4     
-        18       1150 33101  34896 12R  S8_4     
-        18       1151 33101  34847 12L  S8_4     
-        18       1152 33101  34891 12R  S8_4     
-        18       1153 33101  34861 12L  S8_4     
-        18       1154 33101  34871 12R  S8_4     
-        18       1155 33101  34857 12L  S8_4     
-        18       1156 33101  34916 12R  S8_4     
-        18       1157 33101  33717 12L  S8_2     
-        18       1158 33101  33753 12R  S8_2     
-        18       1159 33101  33736 12L  S8_2     
-        18       1160 33101  33784 12R  S8_2     
-        18       1161 33101  35358 12L  S8_5     
-        18       1162 33101  34911 12R  S8_4     
-        18       1163 33101  35363 12L  S8_5     
-        18       1164 33101  34902 12R  S8_4     
-        18       1165 33101  35373 12L  S8_5     
-        18       1166 33101  34887 12R  S8_4     
-        18       1167 33101  34866 12L  S8_4     
-        18       1168 33101  34907 12R  S8_4     
-        18       1169 33101  34853 12L  S8_4     
-        18       1170 33101  34897 12R  S8_4     
-        18       1171 33101  34848 12L  S8_4     
-        18       1172 33101  34892 12R  S8_4     
-        18       1173 33101  34862 12L  S8_4     
-        18       1174 33101  34872 12R  S8_4     
-        18       1175 33101  34865 12L  S8_4     
-        18       1176 33101  27832 12R  S6_3a    
-        18       1177 33101  33718 12L  S8_2     
-        18       1178 33101  34300 12R  S8_3     
-        18       1179 33101  33737 12L  S8_2     
-        18       1180 33101  33786 12R  S8_2     
-        18       1181 33101  35689 12L  P15_1    
-        18       1182 33101  34913 12R  S8_4     
-        18       1183 33101  35364 12L  S8_5     
-        18       1184 33101  34903 12R  S8_4     
-        18       1185 33101  35374 12L  S8_5     
-        18       1186 33101  34888 12R  S8_4     
-        18       1187 33101  34868 12L  S8_4     
-        18       1188 33101  34908 12R  S8_4     
-        18       1189 33101  34855 12L  S8_4     
-        18       1190 33101  34898 12R  S8_4     
-        18       1191 33101  34854 12L  S8_4     
-        18       1192 33101  34893 12R  S8_4     
-        18       1193 33101  34863 12L  S8_4     
-        18       1194 33101  34873 12R  S8_4     
-        18       1195 33101  34867 12L  S8_4     
-        18       1196 33101  27836 12R  S6_3a    
-        18       1197 33101  33729 12L  S8_2     
-        18       1198 33101  34869 12R  S8_4     
-        18       1199 33101  34297 12L  S8_3     
-        18       1200 33101  33788 12R  S8_2     
-        18       1201 33101  34943 13L  S8_4     
-        18       1202 33101  34987 13R  S8_4     
-        18       1203 33101  34957 13L  S8_4     
-        18       1204 33101  27956 13R  S6_3a    
-        18       1205 33101  34952 13L  S8_4     
-        18       1206 33101  35390 13R  S8_5     
-        18       1207 33101  34947 13L  S8_4     
-        18       1208 33101  34972 13R  S8_4     
-        18       1209 33101  34946 13L  S8_4     
-        18       1210 33101  34988 13R  S8_4     
-        18       1211 33101  34932 13L  S8_4     
-        18       1212 33101  34977 13R  S8_4     
-        18       1213 33101  34927 13L  S8_4     
-        18       1214 33101  34982 13R  S8_4     
-        18       1215 33101  34922 13L  S8_4     
-        18       1216 33101  34992 13R  S8_4     
-        18       1217 33101  34917 13L  S8_4     
-        18       1218 33101  34967 13R  S8_4     
-        18       1219 33101  33197 13L  S8_1     
-        18       1220 33101  33247 13R  S8_1     
-        18       1221 33101  34944 13L  S8_4     
-        18       1222 33101  34991 13R  S8_4     
-        18       1223 33101  34958 13L  S8_4     
-        18       1224 33101  27958 13R  S6_3a    
-        18       1225 33101  34953 13L  S8_4     
-        18       1226 33101  35391 13R  S8_5     
-        18       1227 33101  34948 13L  S8_4     
-        18       1228 33101  34973 13R  S8_4     
-        18       1229 33101  34963 13L  S8_4     
-        18       1230 33101  34989 13R  S8_4     
-        18       1231 33101  34933 13L  S8_4     
-        18       1232 33101  34978 13R  S8_4     
-        18       1233 33101  34929 13L  S8_4     
-        18       1234 33101  34983 13R  S8_4     
-        18       1235 33101  34923 13L  S8_4     
-        18       1236 33101  34993 13R  S8_4     
-        18       1237 33101  34918 13L  S8_4     
-        18       1238 33101  34968 13R  S8_4     
-        18       1239 33101  33222 13L  S8_1     
-        18       1240 33101  33250 13R  S8_1     
-        18       1241 33101  34951 13L  S8_4     
-        18       1242 33101  34999 13R  S8_4     
-        18       1243 33101  34959 13L  S8_4     
-        18       1244 33101  27962 13R  S6_3a    
-        18       1245 33101  34954 13L  S8_4     
-        18       1246 33101  35392 13R  S8_5     
-        18       1247 33101  34949 13L  S8_4     
-        18       1248 33101  34974 13R  S8_4     
-        18       1249 33101  34964 13L  S8_4     
-        18       1250 33101  34990 13R  S8_4     
-        18       1251 33101  34935 13L  S8_4     
-        18       1252 33101  34979 13R  S8_4     
-        18       1253 33101  34930 13L  S8_4     
-        18       1254 33101  34984 13R  S8_4     
-        18       1255 33101  34924 13L  S8_4     
-        18       1256 33101  34994 13R  S8_4     
-        18       1257 33101  34919 13L  S8_4     
-        18       1258 33101  34969 13R  S8_4     
-        18       1259 33101  31258 13L  S7_3     
-        18       1260 33101  33282 13R  S8_1     
-        18       1261 33101  34961 13L  S8_4     
-        18       1262 33101  35000 13R  S8_4     
-        18       1263 33101  34960 13L  S8_4     
-        18       1264 33101  33292 13R  S8_1     
-        18       1265 33101  34955 13L  S8_4     
-        18       1266 33101  35393 13R  S8_5     
-        18       1267 33101  34950 13L  S8_4     
-        18       1268 33101  34975 13R  S8_4     
-        18       1269 33101  34965 13L  S8_4     
-        18       1270 33101  34998 13R  S8_4     
-        18       1271 33101  34936 13L  S8_4     
-        18       1272 33101  34980 13R  S8_4     
-        18       1273 33101  34931 13L  S8_4     
-        18       1274 33101  34985 13R  S8_4     
-        18       1275 33101  34926 13L  S8_4     
-        18       1276 33101  34995 13R  S8_4     
-        18       1277 33101  34920 13L  S8_4     
-        18       1278 33101  34971 13R  S8_4     
-        18       1279 33101  33203 13L  S8_1     
-        18       1280 33101  33285 13R  S8_1     
-        18       1281 33101  34962 13L  S8_4     
-        18       1282 33101  34970 13R  S8_4     
-        18       1283 33101  34945 13L  S8_4     
-        18       1284 33101  33293 13R  S8_1     
-        18       1285 33101  34956 13L  S8_4     
-        18       1286 33101  35394 13R  S8_5     
-        18       1287 33101  34942 13L  S8_4     
-        18       1288 33101  34976 13R  S8_4     
-        18       1289 33101  34966 13L  S8_4     
-        18       1290 33101  33253 13R  S8_1     
-        18       1291 33101  34941 13L  S8_4     
-        18       1292 33101  34981 13R  S8_4     
-        18       1293 33101  34940 13L  S8_4     
-        18       1294 33101  34986 13R  S8_4     
-        18       1295 33101  34939 13L  S8_4     
-        18       1296 33101  34996 13R  S8_4     
-        18       1297 33101  34921 13L  S8_4     
-        18       1298 33101  33294 13R  S8_1     
-        18       1299 33101  33245 13L  S8_1     
-        18       1300 33101  33798 13R  S8_2     
-        18       1301 33101  32361 14L  P14      
-        18       1302 33101  32396 14R  P14      
-        18       1303 33101  32366 14L  P14      
-        18       1304 33101  32401 14R  P14      
-        18       1305 33101  32371 14L  P14      
-        18       1306 33101  32406 14R  P14      
-        18       1307 33101  32377 14L  P14      
-        18       1308 33101  36338 14R  S9_1     
-        18       1309 33101  35472 14L  P15_1    
-        18       1310 33101  36340 14R  S9_1     
-        18       1311 33101  35706 14L  P15_2    
-        18       1312 33101  36346 14R  S9_1     
-        18       1313 33101  36311 14L  S9_1     
-        18       1314 33101  36356 14R  S9_1     
-        18       1315 33101  36316 14L  S9_1     
-        18       1316 33101  36351 14R  S9_1     
-        18       1317 33101  36321 14L  S9_1     
-        18       1318 33101  35716 14R  P15_2    
-        18       1319 33101  28025 14L  S6_3b    
-        18       1320 33101  35721 14R  P15_2    
-        18       1321 33101  32362 14L  P14      
-        18       1322 33101  32397 14R  P14      
-        18       1323 33101  32367 14L  P14      
-        18       1324 33101  32402 14R  P14      
-        18       1325 33101  32374 14L  P14      
-        18       1326 33101  32407 14R  P14      
-        18       1327 33101  32378 14L  P14      
-        18       1328 33101  35479 14R  P15_1    
-        18       1329 33101  35473 14L  P15_1    
-        18       1330 33101  36342 14R  S9_1     
-        18       1331 33101  35707 14L  P15_2    
-        18       1332 33101  36347 14R  S9_1     
-        18       1333 33101  36312 14L  S9_1     
-        18       1334 33101  36357 14R  S9_1     
-        18       1335 33101  36317 14L  S9_1     
-        18       1336 33101  36352 14R  S9_1     
-        18       1337 33101  36328 14L  S9_1     
-        18       1338 33101  35727 14R  P15_2    
-        18       1339 33101  32372 14L  P14      
-        18       1340 33101  35722 14R  P15_2    
-        18       1341 33101  32363 14L  P14      
-        18       1342 33101  32398 14R  P14      
-        18       1343 33101  32368 14L  P14      
-        18       1344 33101  32403 14R  P14      
-        18       1345 33101  32375 14L  P14      
-        18       1346 33101  32408 14R  P14      
-        18       1347 33101  32382 14L  P14      
-        18       1348 33101  35480 14R  P15_1    
-        18       1349 33101  35474 14L  P15_1    
-        18       1350 33101  36343 14R  S9_1     
-        18       1351 33101  35708 14L  P15_2    
-        18       1352 33101  36348 14R  S9_1     
-        18       1353 33101  36327 14L  S9_1     
-        18       1354 33101  36358 14R  S9_1     
-        18       1355 33101  36318 14L  S9_1     
-        18       1356 33101  35726 14R  P15_2    
-        18       1357 33101  36323 14L  S9_1     
-        18       1358 33101  35718 14R  P15_2    
-        18       1359 33101  35704 14L  P15_2    
-        18       1360 33101  35723 14R  P15_2    
-        18       1361 33101  32364 14L  P14      
-        18       1362 33101  32399 14R  P14      
-        18       1363 33101  32360 14L  P14      
-        18       1364 33101  32404 14R  P14      
-        18       1365 33101  32380 14L  P14      
-        18       1366 33101  32409 14R  P14      
-        18       1367 33101  32383 14L  P14      
-        18       1368 33101  35481 14R  P15_1    
-        18       1369 33101  35475 14L  P15_1    
-        18       1370 33101  36344 14R  S9_1     
-        18       1371 33101  35709 14L  P15_2    
-        18       1372 33101  36349 14R  S9_1     
-        18       1373 33101  36314 14L  S9_1     
-        18       1374 33101  36359 14R  S9_1     
-        18       1375 33101  36319 14L  S9_1     
-        18       1376 33101  36354 14R  S9_1     
-        18       1377 33101  36329 14L  S9_1     
-        18       1378 33101  35719 14R  P15_2    
-        18       1379 33101  35705 14L  P15_2    
-        18       1380 33101  35724 14R  P15_2    
-        18       1381 33101  32359 14L  P14      
-        18       1382 33101  32400 14R  P14      
-        18       1383 33101  32370 14L  P14      
-        18       1384 33101  32391 14R  P14      
-        18       1385 33101  32381 14L  P14      
-        18       1386 33101  28097 14R  S6_3b    
-        18       1387 33101  29449 14L  R1       
-        18       1388 33101  36339 14R  S9_1     
-        18       1389 33101  35476 14L  P15_1    
-        18       1390 33101  36345 14R  S9_1     
-        18       1391 33101  35710 14L  P15_2    
-        18       1392 33101  36350 14R  S9_1     
-        18       1393 33101  36315 14L  S9_1     
-        18       1394 33101  35715 14R  P15_2    
-        18       1395 33101  36320 14L  S9_1     
-        18       1396 33101  36355 14R  S9_1     
-        18       1397 33101  36325 14L  S9_1     
-        18       1398 33101  35720 14R  P15_2    
-        18       1399 33101  36330 14L  S9_1     
-        18       1400 33101  35725 14R  P15_2    
-        18       1401 33101  32817 15L  S3       
-        18       1402 33101  31364 15R  S07_4    
-        18       1403 33101  32832 15L  S3       
-        18       1404 33101  32858 15R  S3       
-        18       1405 33101  36361 15L  S9_1     
-        18       1406 33101  35488 15R  P15_1    
-        18       1407 33101  36366 15L  S9_1     
-        18       1408 33101  36386 15R  S9_1     
-        18       1409 33101  36371 15L  S9_1     
-        18       1410 33101  36391 15R  S9_1     
-        18       1411 33101  36376 15L  S9_1     
-        18       1412 33101  36396 15R  S9_1     
-        18       1413 33101  36381 15L  S9_1     
-        18       1414 33101  36401 15R  S9_1     
-        18       1415 33101  35746 15L  P15_2    
-        18       1416 33101  36406 15R  S9_1     
-        18       1417 33101  35736 15L  P15_2    
-        18       1418 33101  35756 15R  P15_2    
-        18       1419 33101  35741 15L  P15_2    
-        18       1420 33101  35761 15R  P15_2    
-        18       1421 33101  32825 15L  S3       
-        18       1422 33101  32420 15R  P14      
-        18       1423 33101  35482 15L  P15_1    
-        18       1424 33101  32878 15R  S3       
-        18       1425 33101  36362 15L  S9_1     
-        18       1426 33101  35489 15R  P15_1    
-        18       1427 33101  36367 15L  S9_1     
-        18       1428 33101  36387 15R  S9_1     
-        18       1429 33101  36372 15L  S9_1     
-        18       1430 33101  36392 15R  S9_1     
-        18       1431 33101  36377 15L  S9_1     
-        18       1432 33101  36397 15R  S9_1     
-        18       1433 33101  35486 15L  P15_1    
-        18       1434 33101  36402 15R  S9_1     
-        18       1435 33101  35747 15L  P15_2    
-        18       1436 33101  36407 15R  S9_1     
-        18       1437 33101  35737 15L  P15_2    
-        18       1438 33101  35757 15R  P15_2    
-        18       1439 33101  35742 15L  P15_2    
-        18       1440 33101  35762 15R  P15_2    
-        18       1441 33101  32411 15L  P14      
-        18       1442 33101  32422 15R  P14      
-        18       1443 33101  35483 15L  P15_1    
-        18       1444 33101  34325 15R  S8_4     
-        18       1445 33101  36363 15L  S9_1     
-        18       1446 33101  35490 15R  P15_1    
-        18       1447 33101  36368 15L  S9_1     
-        18       1448 33101  36388 15R  S9_1     
-        18       1449 33101  36373 15L  S9_1     
-        18       1450 33101  36393 15R  S9_1     
-        18       1451 33101  36378 15L  S9_1     
-        18       1452 33101  36398 15R  S9_1     
-        18       1453 33101  36383 15L  S9_1     
-        18       1454 33101  36403 15R  S9_1     
-        18       1455 33101  35733 15L  P15_2    
-        18       1456 33101  36408 15R  S9_1     
-        18       1457 33101  35738 15L  P15_2    
-        18       1458 33101  35758 15R  P15_2    
-        18       1459 33101  35743 15L  P15_2    
-        18       1460 33101  35763 15R  P15_2    
-        18       1461 33101  32808 15L  S3       
-        18       1462 33101  32423 15R  P14      
-        18       1463 33101  35484 15L  P15_1    
-        18       1464 33101  34327 15R  S8_4     
-        18       1465 33101  36364 15L  S9_1     
-        18       1466 33101  35491 15R  P15_1    
-        18       1467 33101  36369 15L  S9_1     
-        18       1468 33101  36389 15R  S9_1     
-        18       1469 33101  36374 15L  S9_1     
-        18       1470 33101  36394 15R  S9_1     
-        18       1471 33101  36379 15L  S9_1     
-        18       1472 33101  36399 15R  S9_1     
-        18       1473 33101  36384 15L  S9_1     
-        18       1474 33101  36404 15R  S9_1     
-        18       1475 33101  35734 15L  P15_2    
-        18       1476 33101  36409 15R  S9_1     
-        18       1477 33101  35739 15L  P15_2    
-        18       1478 33101  35759 15R  P15_2    
-        18       1479 33101  35744 15L  P15_2    
-        18       1480 33101  35764 15R  P15_2    
-        18       1481 33101  32811 15L  S3       
-        18       1482 33101  32426 15R  P14      
-        18       1483 33101  35485 15L  P15_1    
-        18       1484 33101  32421 15R  P14      
-        18       1485 33101  36365 15L  S9_1     
-        18       1486 33101  35492 15R  P15_1    
-        18       1487 33101  36370 15L  S9_1     
-        18       1488 33101  36390 15R  S9_1     
-        18       1489 33101  36375 15L  S9_1     
-        18       1490 33101  35493 15R  P15_1    
-        18       1491 33101  32833 15L  S3       
-        18       1492 33101  35755 15R  P15_2    
-        18       1493 33101  35487 15L  P15_1    
-        18       1494 33101  36405 15R  S9_1     
-        18       1495 33101  35735 15L  P15_2    
-        18       1496 33101  36410 15R  S9_1     
-        18       1497 33101  35740 15L  P15_2    
-        18       1498 33101  35760 15R  P15_2    
-        18       1499 33101  35745 15L  P15_2    
-        18       1500 33101  35765 15R  P15_2    
-        18       1501 33101  32454 16L  P14      
-        18       1502 33101  25774 16R  P10_2    
-        18       1503 33101  32482 16L  P14      
-        18       1504 33101  32521 16R  P14      
-        18       1505 33101  36411 16L  S9_1     
-        18       1506 33101  32526 16R  P14      
-        18       1507 33101  36416 16L  S9_1     
-        18       1508 33101  32531 16R  P14      
-        18       1509 33101  36421 16L  S9_1     
-        18       1510 33101  32536 16R  P14      
-        18       1511 33101  36426 16L  S9_1     
-        18       1512 33101  36466 16R  S9_1     
-        18       1513 33101  36431 16L  S9_1     
-        18       1514 33101  36481 16R  S9_1     
-        18       1515 33101  36436 16L  S9_1     
-        18       1516 33101  36471 16R  S9_1     
-        18       1517 33101  36441 16L  S9_1     
-        18       1518 33101  36476 16R  S9_1     
-        18       1519 33101  36447 16L  S9_1     
-        18       1520 33101  35779 16R  P15_2    
-        18       1521 33101  32467 16L  P14      
-        18       1522 33101  25791 16R  P10_2    
-        18       1523 33101  34143 16L  S8_3     
-        18       1524 33101  32522 16R  P14      
-        18       1525 33101  36412 16L  S9_1     
-        18       1526 33101  32527 16R  P14      
-        18       1527 33101  36417 16L  S9_1     
-        18       1528 33101  32532 16R  P14      
-        18       1529 33101  36422 16L  S9_1     
-        18       1530 33101  32537 16R  P14      
-        18       1531 33101  36427 16L  S9_1     
-        18       1532 33101  35496 16R  P15_1    
-        18       1533 33101  36432 16L  S9_1     
-        18       1534 33101  36482 16R  S9_1     
-        18       1535 33101  36437 16L  S9_1     
-        18       1536 33101  36472 16R  S9_1     
-        18       1537 33101  36442 16L  S9_1     
-        18       1538 33101  36477 16R  S9_1     
-        18       1539 33101  32450 16L  P14      
-        18       1540 33101  36467 16R  S9_1     
-        18       1541 33101  32471 16L  P14      
-        18       1542 33101  32496 16R  P14      
-        18       1543 33101  34144 16L  S8_3     
-        18       1544 33101  32523 16R  P14      
-        18       1545 33101  36413 16L  S9_1     
-        18       1546 33101  32528 16R  P14      
-        18       1547 33101  36418 16L  S9_1     
-        18       1548 33101  32533 16R  P14      
-        18       1549 33101  36423 16L  S9_1     
-        18       1550 33101  32538 16R  P14      
-        18       1551 33101  36428 16L  S9_1     
-        18       1552 33101  35497 16R  P15_1    
-        18       1553 33101  36433 16L  S9_1     
-        18       1554 33101  36483 16R  S9_1     
-        18       1555 33101  36438 16L  S9_1     
-        18       1556 33101  36473 16R  S9_1     
-        18       1557 33101  36444 16L  S9_1     
-        18       1558 33101  36478 16R  S9_1     
-        18       1559 33101  32472 16L  P14      
-        18       1560 33101  36468 16R  S9_1     
-        18       1561 33101  32478 16L  P14      
-        18       1562 33101  32508 16R  P14      
-        18       1563 33101  34145 16L  S8_3     
-        18       1564 33101  32524 16R  P14      
-        18       1565 33101  36414 16L  S9_1     
-        18       1566 33101  32529 16R  P14      
-        18       1567 33101  36419 16L  S9_1     
-        18       1568 33101  32534 16R  P14      
-        18       1569 33101  36424 16L  S9_1     
-        18       1570 33101  32519 16R  P14      
-        18       1571 33101  36429 16L  S9_1     
-        18       1572 33101  35498 16R  P15_1    
-        18       1573 33101  36434 16L  S9_1     
-        18       1574 33101  36484 16R  S9_1     
-        18       1575 33101  36439 16L  S9_1     
-        18       1576 33101  36474 16R  S9_1     
-        18       1577 33101  36445 16L  S9_1     
-        18       1578 33101  36479 16R  S9_1     
-        18       1579 33101  35494 16L  P15_1    
-        18       1580 33101  36469 16R  S9_1     
-        18       1581 33101  32481 16L  P14      
-        18       1582 33101  32518 16R  P14      
-        18       1583 33101  34147 16L  S8_3     
-        18       1584 33101  32525 16R  P14      
-        18       1585 33101  36415 16L  S9_1     
-        18       1586 33101  32530 16R  P14      
-        18       1587 33101  36420 16L  S9_1     
-        18       1588 33101  32535 16R  P14      
-        18       1589 33101  36425 16L  S9_1     
-        18       1590 33101  32520 16R  P14      
-        18       1591 33101  36430 16L  S9_1     
-        18       1592 33101  35499 16R  P15_1    
-        18       1593 33101  36435 16L  S9_1     
-        18       1594 33101  36488 16R  S9_1     
-        18       1595 33101  36440 16L  S9_1     
-        18       1596 33101  36475 16R  S9_1     
-        18       1597 33101  36446 16L  S9_1     
-        18       1598 33101  36489 16R  S9_1     
-        18       1599 33101  36449 16L  S9_1     
-        18       1600 33101  36470 16R  S9_1     
-        18       1601 33101  36516 17L  S9_1     
-        18       1602 33101  32651 17R  P14      
-        18       1603 33101  32543 17L  P14      
-        18       1604 33101  31493 17R  S07_4    
-        18       1605 33101  36496 17L  S9_1     
-        18       1606 33101  34151 17R  S8_3     
-        18       1607 33101  36501 17L  S9_1     
-        18       1608 33101  34150 17R  S8_3     
-        18       1609 33101  36506 17L  S9_1     
-        18       1610 33101  36546 17R  S9_1     
-        18       1611 33101  36511 17L  S9_1     
-        18       1612 33101  36551 17R  S9_1     
-        18       1613 33101  36521 17L  S9_1     
-        18       1614 33101  36561 17R  S9_1     
-        18       1615 33101  36526 17L  S9_1     
-        18       1616 33101  36566 17R  S9_1     
-        18       1617 33101  36531 17L  S9_1     
-        18       1618 33101  36576 17R  S9_1     
-        18       1619 33101  36491 17L  S9_1     
-        18       1620 33101  36581 17R  S9_1     
-        18       1621 33101  36539 17L  S9_1     
-        18       1622 33101  32652 17R  P14      
-        18       1623 33101  32544 17L  P14      
-        18       1624 33101  32601 17R  P14      
-        18       1625 33101  36497 17L  S9_1     
-        18       1626 33101  34149 17R  S8_3     
-        18       1627 33101  36502 17L  S9_1     
-        18       1628 33101  34156 17R  S8_3     
-        18       1629 33101  36507 17L  S9_1     
-        18       1630 33101  36547 17R  S9_1     
-        18       1631 33101  36512 17L  S9_1     
-        18       1632 33101  36552 17R  S9_1     
-        18       1633 33101  36522 17L  S9_1     
-        18       1634 33101  36562 17R  S9_1     
-        18       1635 33101  36527 17L  S9_1     
-        18       1636 33101  36567 17R  S9_1     
-        18       1637 33101  36537 17L  S9_1     
-        18       1638 33101  36557 17R  S9_1     
-        18       1639 33101  36538 17L  S9_1     
-        18       1640 33101  36572 17R  S9_1     
-        18       1641 33101  36518 17L  S9_1     
-        18       1642 33101  32653 17R  P14      
-        18       1643 33101  32565 17L  P14      
-        18       1644 33101  32648 17R  P14      
-        18       1645 33101  36498 17L  S9_1     
-        18       1646 33101  34153 17R  S8_3     
-        18       1647 33101  36503 17L  S9_1     
-        18       1648 33101  34157 17R  S8_3     
-        18       1649 33101  36508 17L  S9_1     
-        18       1650 33101  36548 17R  S9_1     
-        18       1651 33101  36513 17L  S9_1     
-        18       1652 33101  36554 17R  S9_1     
-        18       1653 33101  36523 17L  S9_1     
-        18       1654 33101  36563 17R  S9_1     
-        18       1655 33101  36528 17L  S9_1     
-        18       1656 33101  36568 17R  S9_1     
-        18       1657 33101  36533 17L  S9_1     
-        18       1658 33101  36558 17R  S9_1     
-        18       1659 33101  36493 17L  S9_1     
-        18       1660 33101  36573 17R  S9_1     
-        18       1661 33101  36519 17L  S9_1     
-        18       1662 33101  32650 17R  P14      
-        18       1663 33101  32599 17L  P14      
-        18       1664 33101  32649 17R  P14      
-        18       1665 33101  36499 17L  S9_1     
-        18       1666 33101  34154 17R  S8_3     
-        18       1667 33101  36504 17L  S9_1     
-        18       1668 33101  32646 17R  P14      
-        18       1669 33101  36509 17L  S9_1     
-        18       1670 33101  36550 17R  S9_1     
-        18       1671 33101  36514 17L  S9_1     
-        18       1672 33101  35501 17R  P15_1    
-        18       1673 33101  36524 17L  S9_1     
-        18       1674 33101  36564 17R  S9_1     
-        18       1675 33101  36529 17L  S9_1     
-        18       1676 33101  36569 17R  S9_1     
-        18       1677 33101  36534 17L  S9_1     
-        18       1678 33101  36577 17R  S9_1     
-        18       1679 33101  36494 17L  S9_1     
-        18       1680 33101  36574 17R  S9_1     
-        18       1681 33101  36520 17L  S9_1     
-        18       1682 33101  34148 17R  S8_3     
-        18       1683 33101  32600 17L  P14      
-        18       1684 33101  32635 17R  P14      
-        18       1685 33101  36500 17L  S9_1     
-        18       1686 33101  34155 17R  S8_3     
-        18       1687 33101  36505 17L  S9_1     
-        18       1688 33101  35500 17R  P15_1    
-        18       1689 33101  36510 17L  S9_1     
-        18       1690 33101  36549 17R  S9_1     
-        18       1691 33101  36515 17L  S9_1     
-        18       1692 33101  35502 17R  P15_1    
-        18       1693 33101  36525 17L  S9_1     
-        18       1694 33101  36565 17R  S9_1     
-        18       1695 33101  36530 17L  S9_1     
-        18       1696 33101  36570 17R  S9_1     
-        18       1697 33101  36535 17L  S9_1     
-        18       1698 33101  36560 17R  S9_1     
-        18       1699 33101  36495 17L  S9_1     
-        18       1700 33101  36575 17R  S9_1     
-        19          1 33101  33836 1L   S8_3     
-        19          2 33101  35082 1R   S8_5     
-        19          3 33101  36101 1L   S9_1     
-        19          4 33101  35087 1R   S8_5     
-        19          5 33101  36106 1L   S9_1     
-        19          6 33101  36113 1R   S9_1     
-        19          7 33101  35403 1L   P15_1    
-        19          8 33101  36120 1R   S9_1     
-        19          9 33101  37441 1L   S9_4     
-        19         10 33101  35406 1R   P15_1    
-        19         11 33101  37446 1L   S9_4     
-        19         12 33101  35411 1R   P15_1    
-        19         13 33101  37451 1L   S9_4     
-        19         14 33101  35404 1R   P15_1    
-        19         15 33101  37456 1L   S9_4     
-        19         16 33101  37486 1R   S9_4     
-        19         17 33101  37461 1L   S9_4     
-        19         18 33101  37491 1R   S9_4     
-        19         19 33101  37466 1L   S9_4     
-        19         20 33101  37496 1R   S9_4     
-        19         21 33101  35014 1L   S8_5     
-        19         22 33101  35083 1R   S8_5     
-        19         23 33101  36102 1L   S9_1     
-        19         24 33101  35088 1R   S8_5     
-        19         25 33101  36107 1L   S9_1     
-        19         26 33101  36114 1R   S9_1     
-        19         27 33101  35701 1L   P15_2    
-        19         28 33101  33861 1R   S8_3     
-        19         29 33101  37442 1L   S9_4     
-        19         30 33101  35407 1R   P15_1    
-        19         31 33101  37447 1L   S9_4     
-        19         32 33101  35412 1R   P15_1    
-        19         33 33101  37452 1L   S9_4     
-        19         34 33101  35405 1R   P15_1    
-        19         35 33101  37457 1L   S9_4     
-        19         36 33101  37487 1R   S9_4     
-        19         37 33101  37462 1L   S9_4     
-        19         38 33101  37492 1R   S9_4     
-        19         39 33101  37467 1L   S9_4     
-        19         40 33101  37497 1R   S9_4     
-        19         41 33101  35050 1L   S8_5     
-        19         42 33101  35084 1R   S8_5     
-        19         43 33101  36103 1L   S9_1     
-        19         44 33101  35090 1R   S8_5     
-        19         45 33101  36108 1L   S9_1     
-        19         46 33101  36115 1R   S9_1     
-        19         47 33101  37473 1L   S9_4     
-        19         48 33101  33865 1R   S8_3     
-        19         49 33101  37443 1L   S9_4     
-        19         50 33101  35408 1R   P15_1    
-        19         51 33101  37448 1L   S9_4     
-        19         52 33101  35413 1R   P15_1    
-        19         53 33101  37453 1L   S9_4     
-        19         54 33101  37502 1R   S9_4     
-        19         55 33101  37474 1L   S9_4     
-        19         56 33101  37488 1R   S9_4     
-        19         57 33101  37463 1L   S9_4     
-        19         58 33101  37493 1R   S9_4     
-        19         59 33101  37468 1L   S9_4     
-        19         60 33101  37501 1R   S9_4     
-        19         61 33101  35401 1L   P15_1    
-        19         62 33101  35085 1R   S8_5     
-        19         63 33101  36104 1L   S9_1     
-        19         64 33101  36111 1R   S9_1     
-        19         65 33101  36109 1L   S9_1     
-        19         66 33101  36116 1R   S9_1     
-        19         67 33101  37472 1L   S9_4     
-        19         68 33101  33882 1R   S8_3     
-        19         69 33101  37444 1L   S9_4     
-        19         70 33101  35409 1R   P15_1    
-        19         71 33101  37449 1L   S9_4     
-        19         72 33101  35414 1R   P15_1    
-        19         73 33101  37454 1L   S9_4     
-        19         74 33101  37504 1R   S9_4     
-        19         75 33101  37459 1L   S9_4     
-        19         76 33101  37489 1R   S9_4     
-        19         77 33101  37464 1L   S9_4     
-        19         78 33101  37494 1R   S9_4     
-        19         79 33101  37469 1L   S9_4     
-        19         80 33101  37499 1R   S9_4     
-        19         81 33101  35402 1L   P15_1    
-        19         82 33101  35086 1R   S8_5     
-        19         83 33101  36105 1L   S9_1     
-        19         84 33101  36112 1R   S9_1     
-        19         85 33101  36110 1L   S9_1     
-        19         86 33101  36117 1R   S9_1     
-        19         87 33101  37471 1L   S9_4     
-        19         88 33101  35072 1R   S8_5     
-        19         89 33101  37445 1L   S9_4     
-        19         90 33101  35410 1R   P15_1    
-        19         91 33101  37450 1L   S9_4     
-        19         92 33101  35089 1R   S8_5     
-        19         93 33101  37455 1L   S9_4     
-        19         94 33101  37505 1R   S9_4     
-        19         95 33101  37460 1L   S9_4     
-        19         96 33101  37490 1R   S9_4     
-        19         97 33101  37465 1L   S9_4     
-        19         98 33101  37495 1R   S9_4     
-        19         99 33101  37470 1L   S9_4     
-        19        100 33101  37500 1R   S9_4     
-        19        101 33101  36121 2L   S9_1     
-        19        102 33101  36131 2R   S9_1     
-        19        103 33101  35417 2L   P15_1    
-        19        104 33101  36140 2R   S9_1     
-        19        105 33101  36126 2L   S9_1     
-        19        106 33101  35176 2R   S8_5     
-        19        107 33101  35421 2L   P15_1    
-        19        108 33101  35183 2R   S8_5     
-        19        109 33101  37521 2L   S9_4     
-        19        110 33101  35425 2R   P15_1    
-        19        111 33101  37526 2L   S9_4     
-        19        112 33101  34025 2R   S8_3     
-        19        113 33101  37531 2L   S9_4     
-        19        114 33101  34029 2R   S8_3     
-        19        115 33101  37536 2L   S9_4     
-        19        116 33101  37561 2R   S9_4     
-        19        117 33101  37546 2L   S9_4     
-        19        118 33101  35429 2R   P15_1    
-        19        119 33101  37541 2L   S9_4     
-        19        120 33101  37571 2R   S9_4     
-        19        121 33101  36124 2L   S9_1     
-        19        122 33101  36132 2R   S9_1     
-        19        123 33101  35418 2L   P15_1    
-        19        124 33101  36139 2R   S9_1     
-        19        125 33101  36127 2L   S9_1     
-        19        126 33101  35177 2R   S8_5     
-        19        127 33101  35422 2L   P15_1    
-        19        128 33101  35184 2R   S8_5     
-        19        129 33101  37522 2L   S9_4     
-        19        130 33101  35426 2R   P15_1    
-        19        131 33101  37527 2L   S9_4     
-        19        132 33101  35180 2R   S8_5     
-        19        133 33101  37532 2L   S9_4     
-        19        134 33101  31970 2R   S07_5    
-        19        135 33101  37537 2L   S9_4     
-        19        136 33101  37562 2R   S9_4     
-        19        137 33101  37547 2L   S9_4     
-        19        138 33101  37566 2R   S9_4     
-        19        139 33101  37542 2L   S9_4     
-        19        140 33101  37572 2R   S9_4     
-        19        141 33101  36125 2L   S9_1     
-        19        142 33101  36133 2R   S9_1     
-        19        143 33101  35419 2L   P15_1    
-        19        144 33101  36138 2R   S9_1     
-        19        145 33101  36128 2L   S9_1     
-        19        146 33101  35178 2R   S8_5     
-        19        147 33101  35423 2L   P15_1    
-        19        148 33101  35185 2R   S8_5     
-        19        149 33101  37523 2L   S9_4     
-        19        150 33101  35427 2R   P15_1    
-        19        151 33101  37528 2L   S9_4     
-        19        152 33101  35182 2R   S8_5     
-        19        153 33101  37518 2L   S9_4     
-        19        154 33101  31978 2R   S07_5    
-        19        155 33101  37538 2L   S9_4     
-        19        156 33101  37563 2R   S9_4     
-        19        157 33101  37548 2L   S9_4     
-        19        158 33101  37567 2R   S9_4     
-        19        159 33101  37543 2L   S9_4     
-        19        160 33101  37573 2R   S9_4     
-        19        161 33101  31929 2L   S07_5    
-        19        162 33101  36134 2R   S9_1     
-        19        163 33101  35415 2L   P15_1    
-        19        164 33101  36137 2R   S9_1     
-        19        165 33101  36129 2L   S9_1     
-        19        166 33101  35179 2R   S8_5     
-        19        167 33101  37516 2L   S9_4     
-        19        168 33101  31942 2R   S07_5    
-        19        169 33101  37524 2L   S9_4     
-        19        170 33101  35428 2R   P15_1    
-        19        171 33101  37529 2L   S9_4     
-        19        172 33101  30172 2R   S7_2     
-        19        173 33101  37534 2L   S9_4     
-        19        174 33101  33993 2R   S8_3     
-        19        175 33101  37539 2L   S9_4     
-        19        176 33101  37564 2R   S9_4     
-        19        177 33101  37520 2L   S9_4     
-        19        178 33101  37569 2R   S9_4     
-        19        179 33101  37544 2L   S9_4     
-        19        180 33101  37574 2R   S9_4     
-        19        181 33101  36122 2L   S9_1     
-        19        182 33101  36135 2R   S9_1     
-        19        183 33101  35416 2L   P15_1    
-        19        184 33101  36136 2R   S9_1     
-        19        185 33101  36130 2L   S9_1     
-        19        186 33101  35181 2R   S8_5     
-        19        187 33101  37517 2L   S9_4     
-        19        188 33101  32317 2R   P14      
-        19        189 33101  37525 2L   S9_4     
-        19        190 33101  35424 2R   P15_1    
-        19        191 33101  37530 2L   S9_4     
-        19        192 33101  30216 2R   S7_2     
-        19        193 33101  37535 2L   S9_4     
-        19        194 33101  34007 2R   S8_3     
-        19        195 33101  37540 2L   S9_4     
-        19        196 33101  37565 2R   S9_4     
-        19        197 33101  37550 2L   S9_4     
-        19        198 33101  37570 2R   S9_4     
-        19        199 33101  37545 2L   S9_4     
-        19        200 33101  37575 2R   S9_4     
-        19        201 33101  36144 3L   S9_1     
-        19        202 33101  35257 3R   S8_5     
-        19        203 33101  36150 3L   S9_1     
-        19        204 33101  35264 3R   S8_5     
-        19        205 33101  35431 3L   P15_1    
-        19        206 33101  36156 3R   S9_1     
-        19        207 33101  35436 3L   P15_1    
-        19        208 33101  36153 3R   S9_1     
-        19        209 33101  37586 3L   S9_4     
-        19        210 33101  37626 3R   S9_4     
-        19        211 33101  37591 3L   S9_4     
-        19        212 33101  37631 3R   S9_4     
-        19        213 33101  37596 3L   S9_4     
-        19        214 33101  37636 3R   S9_4     
-        19        215 33101  37606 3L   S9_4     
-        19        216 33101  37646 3R   S9_4     
-        19        217 33101  37601 3L   S9_4     
-        19        218 33101  37641 3R   S9_4     
-        19        219 33101  37611 3L   S9_4     
-        19        220 33101  35442 3R   P15_1    
-        19        221 33101  36145 3L   S9_1     
-        19        222 33101  35258 3R   S8_5     
-        19        223 33101  31999 3L   S07_5    
-        19        224 33101  35269 3R   S8_5     
-        19        225 33101  35432 3L   P15_1    
-        19        226 33101  36157 3R   S9_1     
-        19        227 33101  35437 3L   P15_1    
-        19        228 33101  36154 3R   S9_1     
-        19        229 33101  37587 3L   S9_4     
-        19        230 33101  35447 3R   P15_1    
-        19        231 33101  37592 3L   S9_4     
-        19        232 33101  37632 3R   S9_4     
-        19        233 33101  37598 3L   S9_4     
-        19        234 33101  37637 3R   S9_4     
-        19        235 33101  37607 3L   S9_4     
-        19        236 33101  37647 3R   S9_4     
-        19        237 33101  37602 3L   S9_4     
-        19        238 33101  37642 3R   S9_4     
-        19        239 33101  37612 3L   S9_4     
-        19        240 33101  35443 3R   P15_1    
-        19        241 33101  36146 3L   S9_1     
-        19        242 33101  35259 3R   S8_5     
-        19        243 33101  32018 3L   S07_5    
-        19        244 33101  35274 3R   S8_5     
-        19        245 33101  35433 3L   P15_1    
-        19        246 33101  36158 3R   S9_1     
-        19        247 33101  35438 3L   P15_1    
-        19        248 33101  36155 3R   S9_1     
-        19        249 33101  37588 3L   S9_4     
-        19        250 33101  37628 3R   S9_4     
-        19        251 33101  37593 3L   S9_4     
-        19        252 33101  37633 3R   S9_4     
-        19        253 33101  37599 3L   S9_4     
-        19        254 33101  37638 3R   S9_4     
-        19        255 33101  37608 3L   S9_4     
-        19        256 33101  37648 3R   S9_4     
-        19        257 33101  36148 3L   S9_1     
-        19        258 33101  37643 3R   S9_4     
-        19        259 33101  37613 3L   S9_4     
-        19        260 33101  35444 3R   P15_1    
-        19        261 33101  36147 3L   S9_1     
-        19        262 33101  35262 3R   S8_5     
-        19        263 33101  32321 3L   P14      
-        19        264 33101  35283 3R   S8_5     
-        19        265 33101  35434 3L   P15_1    
-        19        266 33101  36159 3R   S9_1     
-        19        267 33101  35439 3L   P15_1    
-        19        268 33101  29104 3R   P13      
-        19        269 33101  37589 3L   S9_4     
-        19        270 33101  37629 3R   S9_4     
-        19        271 33101  37594 3L   S9_4     
-        19        272 33101  37634 3R   S9_4     
-        19        273 33101  35430 3L   P15_1    
-        19        274 33101  37639 3R   S9_4     
-        19        275 33101  37609 3L   S9_4     
-        19        276 33101  37649 3R   S9_4     
-        19        277 33101  37604 3L   S9_4     
-        19        278 33101  37644 3R   S9_4     
-        19        279 33101  37614 3L   S9_4     
-        19        280 33101  37652 3R   S9_4     
-        19        281 33101  36149 3L   S9_1     
-        19        282 33101  35263 3R   S8_5     
-        19        283 33101  33309 3L   S8_2     
-        19        284 33101  36152 3R   S9_1     
-        19        285 33101  35435 3L   P15_1    
-        19        286 33101  36160 3R   S9_1     
-        19        287 33101  35440 3L   P15_1    
-        19        288 33101  32089 3R   S07_5    
-        19        289 33101  35216 3L   S8_5     
-        19        290 33101  37630 3R   S9_4     
-        19        291 33101  37595 3L   S9_4     
-        19        292 33101  37635 3R   S9_4     
-        19        293 33101  35441 3L   P15_1    
-        19        294 33101  37640 3R   S9_4     
-        19        295 33101  37610 3L   S9_4     
-        19        296 33101  37651 3R   S9_4     
-        19        297 33101  37605 3L   S9_4     
-        19        298 33101  37645 3R   S9_4     
-        19        299 33101  37615 3L   S9_4     
-        19        300 33101  37653 3R   S9_4     
-        19        301 33101  35451 4L   P15_1    
-        19        302 33101  32168 4R   S07_5    
-        19        303 33101  37661 4L   S9_4     
-        19        304 33101  35313 4R   S8_5     
-        19        305 33101  37666 4L   S9_4     
-        19        306 33101  36200 4R   S9_1     
-        19        307 33101  37671 4L   S9_4     
-        19        308 33101  36206 4R   S9_1     
-        19        309 33101  37676 4L   S9_4     
-        19        310 33101  35456 4R   P15_1    
-        19        311 33101  35448 4L   P15_1    
-        19        312 33101  37716 4R   S9_4     
-        19        313 33101  36182 4L   S9_1     
-        19        314 33101  35461 4R   P15_1    
-        19        315 33101  37686 4L   S9_4     
-        19        316 33101  37726 4R   S9_4     
-        19        317 33101  37691 4L   S9_4     
-        19        318 33101  37731 4R   S9_4     
-        19        319 33101  37696 4L   S9_4     
-        19        320 33101  37736 4R   S9_4     
-        19        321 33101  35452 4L   P15_1    
-        19        322 33101  32182 4R   S07_5    
-        19        323 33101  37662 4L   S9_4     
-        19        324 33101  35324 4R   S8_5     
-        19        325 33101  37667 4L   S9_4     
-        19        326 33101  36202 4R   S9_1     
-        19        327 33101  37672 4L   S9_4     
-        19        328 33101  36207 4R   S9_1     
-        19        329 33101  37677 4L   S9_4     
-        19        330 33101  35457 4R   P15_1    
-        19        331 33101  35449 4L   P15_1    
-        19        332 33101  37717 4R   S9_4     
-        19        333 33101  37682 4L   S9_4     
-        19        334 33101  37722 4R   S9_4     
-        19        335 33101  37687 4L   S9_4     
-        19        336 33101  37727 4R   S9_4     
-        19        337 33101  37692 4L   S9_4     
-        19        338 33101  36198 4R   S9_1     
-        19        339 33101  37697 4L   S9_4     
-        19        340 33101  37737 4R   S9_4     
-        19        341 33101  35453 4L   P15_1    
-        19        342 33101  32337 4R   P14      
-        19        343 33101  37663 4L   S9_4     
-        19        344 33101  35336 4R   S8_5     
-        19        345 33101  37668 4L   S9_4     
-        19        346 33101  36203 4R   S9_1     
-        19        347 33101  37673 4L   S9_4     
-        19        348 33101  36208 4R   S9_1     
-        19        349 33101  37678 4L   S9_4     
-        19        350 33101  35458 4R   P15_1    
-        19        351 33101  35450 4L   P15_1    
-        19        352 33101  37718 4R   S9_4     
-        19        353 33101  37683 4L   S9_4     
-        19        354 33101  37723 4R   S9_4     
-        19        355 33101  37688 4L   S9_4     
-        19        356 33101  36201 4R   S9_1     
-        19        357 33101  37693 4L   S9_4     
-        19        358 33101  37733 4R   S9_4     
-        19        359 33101  37698 4L   S9_4     
-        19        360 33101  37738 4R   S9_4     
-        19        361 33101  35454 4L   P15_1    
-        19        362 33101  33442 4R   S8_2     
-        19        363 33101  37664 4L   S9_4     
-        19        364 33101  36196 4R   S9_1     
-        19        365 33101  37669 4L   S9_4     
-        19        366 33101  36204 4R   S9_1     
-        19        367 33101  37674 4L   S9_4     
-        19        368 33101  36209 4R   S9_1     
-        19        369 33101  37679 4L   S9_4     
-        19        370 33101  35459 4R   P15_1    
-        19        371 33101  36171 4L   S9_1     
-        19        372 33101  37719 4R   S9_4     
-        19        373 33101  37684 4L   S9_4     
-        19        374 33101  37724 4R   S9_4     
-        19        375 33101  37689 4L   S9_4     
-        19        376 33101  37729 4R   S9_4     
-        19        377 33101  37694 4L   S9_4     
-        19        378 33101  37734 4R   S9_4     
-        19        379 33101  37699 4L   S9_4     
-        19        380 33101  37739 4R   S9_4     
-        19        381 33101  35455 4L   P15_1    
-        19        382 33101  33469 4R   S8_2     
-        19        383 33101  37665 4L   S9_4     
-        19        384 33101  36197 4R   S9_1     
-        19        385 33101  37670 4L   S9_4     
-        19        386 33101  36205 4R   S9_1     
-        19        387 33101  37675 4L   S9_4     
-        19        388 33101  36210 4R   S9_1     
-        19        389 33101  37680 4L   S9_4     
-        19        390 33101  35460 4R   P15_1    
-        19        391 33101  36173 4L   S9_1     
-        19        392 33101  37720 4R   S9_4     
-        19        393 33101  37685 4L   S9_4     
-        19        394 33101  37725 4R   S9_4     
-        19        395 33101  37690 4L   S9_4     
-        19        396 33101  37730 4R   S9_4     
-        19        397 33101  37695 4L   S9_4     
-        19        398 33101  37735 4R   S9_4     
-        19        399 33101  36185 4L   S9_1     
-        19        400 33101  36199 4R   S9_1     
-        19        401 33101  35463 5L   P15_1    
-        19        402 33101  36296 5R   S9_1     
-        19        403 33101  36256 5L   S9_1     
-        19        404 33101  36306 5R   S9_1     
-        19        405 33101  36247 5L   S9_1     
-        19        406 33101  36301 5R   S9_1     
-        19        407 33101  37751 5L   S9_4     
-        19        408 33101  35467 5R   P15_1    
-        19        409 33101  37761 5L   S9_4     
-        19        410 33101  37801 5R   S9_4     
-        19        411 33101  37771 5L   S9_4     
-        19        412 33101  37806 5R   S9_4     
-        19        413 33101  37776 5L   S9_4     
-        19        414 33101  37811 5R   S9_4     
-        19        415 33101  37781 5L   S9_4     
-        19        416 33101  37821 5R   S9_4     
-        19        417 33101  37766 5L   S9_4     
-        19        418 33101  36310 5R   S9_1     
-        19        419 33101  37756 5L   S9_4     
-        19        420 33101  37816 5R   S9_4     
-        19        421 33101  35464 5L   P15_1    
-        19        422 33101  36297 5R   S9_1     
-        19        423 33101  36257 5L   S9_1     
-        19        424 33101  36292 5R   S9_1     
-        19        425 33101  36218 5L   S9_1     
-        19        426 33101  36302 5R   S9_1     
-        19        427 33101  37752 5L   S9_4     
-        19        428 33101  35468 5R   P15_1    
-        19        429 33101  37762 5L   S9_4     
-        19        430 33101  37802 5R   S9_4     
-        19        431 33101  37772 5L   S9_4     
-        19        432 33101  37807 5R   S9_4     
-        19        433 33101  37777 5L   S9_4     
-        19        434 33101  37812 5R   S9_4     
-        19        435 33101  37782 5L   S9_4     
-        19        436 33101  37822 5R   S9_4     
-        19        437 33101  37786 5L   S9_4     
-        19        438 33101  36307 5R   S9_1     
-        19        439 33101  37788 5L   S9_4     
-        19        440 33101  37817 5R   S9_4     
-        19        441 33101  35465 5L   P15_1    
-        19        442 33101  36298 5R   S9_1     
-        19        443 33101  36258 5L   S9_1     
-        19        444 33101  36293 5R   S9_1     
-        19        445 33101  36223 5L   S9_1     
-        19        446 33101  36303 5R   S9_1     
-        19        447 33101  37753 5L   S9_4     
-        19        448 33101  35469 5R   P15_1    
-        19        449 33101  37763 5L   S9_4     
-        19        450 33101  37803 5R   S9_4     
-        19        451 33101  37773 5L   S9_4     
-        19        452 33101  37808 5R   S9_4     
-        19        453 33101  37778 5L   S9_4     
-        19        454 33101  37813 5R   S9_4     
-        19        455 33101  37783 5L   S9_4     
-        19        456 33101  37823 5R   S9_4     
-        19        457 33101  37768 5L   S9_4     
-        19        458 33101  36262 5R   S9_1     
-        19        459 33101  37758 5L   S9_4     
-        19        460 33101  37818 5R   S9_4     
-        19        461 33101  35466 5L   P15_1    
-        19        462 33101  36299 5R   S9_1     
-        19        463 33101  30297 5L   S7_2     
-        19        464 33101  36294 5R   S9_1     
-        19        465 33101  36225 5L   S9_1     
-        19        466 33101  36304 5R   S9_1     
-        19        467 33101  37754 5L   S9_4     
-        19        468 33101  35470 5R   P15_1    
-        19        469 33101  37764 5L   S9_4     
-        19        470 33101  37804 5R   S9_4     
-        19        471 33101  37774 5L   S9_4     
-        19        472 33101  37809 5R   S9_4     
-        19        473 33101  37779 5L   S9_4     
-        19        474 33101  37814 5R   S9_4     
-        19        475 33101  37784 5L   S9_4     
-        19        476 33101  37824 5R   S9_4     
-        19        477 33101  37769 5L   S9_4     
-        19        478 33101  36309 5R   S9_1     
-        19        479 33101  37759 5L   S9_4     
-        19        480 33101  37819 5R   S9_4     
-        19        481 33101  36211 5L   S9_1     
-        19        482 33101  36300 5R   S9_1     
-        19        483 33101  36260 5L   S9_1     
-        19        484 33101  36295 5R   S9_1     
-        19        485 33101  36245 5L   S9_1     
-        19        486 33101  36305 5R   S9_1     
-        19        487 33101  36250 5L   S9_1     
-        19        488 33101  35471 5R   P15_1    
-        19        489 33101  37765 5L   S9_4     
-        19        490 33101  37805 5R   S9_4     
-        19        491 33101  37775 5L   S9_4     
-        19        492 33101  37810 5R   S9_4     
-        19        493 33101  37780 5L   S9_4     
-        19        494 33101  37815 5R   S9_4     
-        19        495 33101  37785 5L   S9_4     
-        19        496 33101  37825 5R   S9_4     
-        19        497 33101  37787 5L   S9_4     
-        19        498 33101  37826 5R   S9_4     
-        19        499 33101  37760 5L   S9_4     
-        19        500 33101  37827 5R   S9_4     
-        19        501 33101  34160 6L   S8_3     
-        19        502 33101  35578 6R   P15_1    
-        19        503 33101  35523 6L   P15_1    
-        19        504 33101  35588 6R   P15_1    
-        19        505 33101  35533 6L   P15_1    
-        19        506 33101  35567 6R   P15_1    
-        19        507 33101  35528 6L   P15_1    
-        19        508 33101  35564 6R   P15_1    
-        19        509 33101  35508 6L   P15_1    
-        19        510 33101  35598 6R   P15_1    
-        19        511 33101  35538 6L   P15_1    
-        19        512 33101  35603 6R   P15_1    
-        19        513 33101  35543 6L   P15_1    
-        19        514 33101  35565 6R   P15_1    
-        19        515 33101  35518 6L   P15_1    
-        19        516 33101  35613 6R   P15_1    
-        19        517 33101  35513 6L   P15_1    
-        19        518 33101  35608 6R   P15_1    
-        19        519 33101  32659 6L   P14      
-        19        520 33101  34246 6R   P14      
-        19        521 33101  34158 6L   S8_3     
-        19        522 33101  35579 6R   P15_1    
-        19        523 33101  35524 6L   P15_1    
-        19        524 33101  35589 6R   P15_1    
-        19        525 33101  35534 6L   P15_1    
-        19        526 33101  35594 6R   P15_1    
-        19        527 33101  35529 6L   P15_1    
-        19        528 33101  35569 6R   P15_1    
-        19        529 33101  35509 6L   P15_1    
-        19        530 33101  35599 6R   P15_1    
-        19        531 33101  35539 6L   P15_1    
-        19        532 33101  35604 6R   P15_1    
-        19        533 33101  35544 6L   P15_1    
-        19        534 33101  35574 6R   P15_1    
-        19        535 33101  35519 6L   P15_1    
-        19        536 33101  35614 6R   P15_1    
-        19        537 33101  35514 6L   P15_1    
-        19        538 33101  35609 6R   P15_1    
-        19        539 33101  32660 6L   P14      
-        19        540 33101  34257 6R   P14      
-        19        541 33101  34183 6L   S8_3     
-        19        542 33101  35580 6R   P15_1    
-        19        543 33101  35525 6L   P15_1    
-        19        544 33101  35590 6R   P15_1    
-        19        545 33101  35535 6L   P15_1    
-        19        546 33101  35595 6R   P15_1    
-        19        547 33101  35530 6L   P15_1    
-        19        548 33101  35570 6R   P15_1    
-        19        549 33101  35510 6L   P15_1    
-        19        550 33101  35600 6R   P15_1    
-        19        551 33101  35540 6L   P15_1    
-        19        552 33101  35605 6R   P15_1    
-        19        553 33101  35545 6L   P15_1    
-        19        554 33101  35575 6R   P15_1    
-        19        555 33101  35520 6L   P15_1    
-        19        556 33101  35615 6R   P15_1    
-        19        557 33101  35515 6L   P15_1    
-        19        558 33101  35610 6R   P15_1    
-        19        559 33101  34159 6L   S8_3     
-        19        560 33101  34258 6R   P14      
-        19        561 33101  34191 6L   S8_3     
-        19        562 33101  35581 6R   P15_1    
-        19        563 33101  35526 6L   P15_1    
-        19        564 33101  35591 6R   P15_1    
-        19        565 33101  35536 6L   P15_1    
-        19        566 33101  35596 6R   P15_1    
-        19        567 33101  35531 6L   P15_1    
-        19        568 33101  35571 6R   P15_1    
-        19        569 33101  35511 6L   P15_1    
-        19        570 33101  35601 6R   P15_1    
-        19        571 33101  35541 6L   P15_1    
-        19        572 33101  35606 6R   P15_1    
-        19        573 33101  35546 6L   P15_1    
-        19        574 33101  35576 6R   P15_1    
-        19        575 33101  35521 6L   P15_1    
-        19        576 33101  35616 6R   P15_1    
-        19        577 33101  35516 6L   P15_1    
-        19        578 33101  35611 6R   P15_1    
-        19        579 33101  34166 6L   S8_3     
-        19        580 33101  34262 6R   P14      
-        19        581 33101  34202 6L   S8_3     
-        19        582 33101  35584 6R   P15_1    
-        19        583 33101  35527 6L   P15_1    
-        19        584 33101  35592 6R   P15_1    
-        19        585 33101  35537 6L   P15_1    
-        19        586 33101  35597 6R   P15_1    
-        19        587 33101  35532 6L   P15_1    
-        19        588 33101  35572 6R   P15_1    
-        19        589 33101  35512 6L   P15_1    
-        19        590 33101  35602 6R   P15_1    
-        19        591 33101  35542 6L   P15_1    
-        19        592 33101  35607 6R   P15_1    
-        19        593 33101  35547 6L   P15_1    
-        19        594 33101  35577 6R   P15_1    
-        19        595 33101  35522 6L   P15_1    
-        19        596 33101  35617 6R   P15_1    
-        19        597 33101  35517 6L   P15_1    
-        19        598 33101  35612 6R   P15_1    
-        19        599 33101  34181 6L   S8_3     
-        19        600 33101  34211 6R   P14      
-        19        601 33101  35806 7L   P15_2    
-        19        602 33101  34421 7R   S8_4     
-        19        603 33101  35800 7L   P15_2    
-        19        604 33101  35648 7R   P15_1    
-        19        605 33101  35840 7L   P15_2    
-        19        606 33101  35657 7R   P15_1    
-        19        607 33101  35835 7L   P15_2    
-        19        608 33101  35869 7R   P15_2    
-        19        609 33101  35820 7L   P15_2    
-        19        610 33101  35652 7R   P15_1    
-        19        611 33101  35825 7L   P15_2    
-        19        612 33101  35642 7R   P15_1    
-        19        613 33101  34374 7L   S8_4     
-        19        614 33101  35637 7R   P15_1    
-        19        615 33101  35805 7L   P15_2    
-        19        616 33101  35622 7R   P15_1    
-        19        617 33101  34400 7L   S8_4     
-        19        618 33101  35627 7R   P15_1    
-        19        619 33101  35815 7L   P15_2    
-        19        620 33101  35632 7R   P15_1    
-        19        621 33101  35807 7L   P15_2    
-        19        622 33101  34437 7R   S8_4     
-        19        623 33101  35801 7L   P15_2    
-        19        624 33101  35859 7R   P15_2    
-        19        625 33101  35841 7L   P15_2    
-        19        626 33101  35658 7R   P15_1    
-        19        627 33101  35836 7L   P15_2    
-        19        628 33101  35870 7R   P15_2    
-        19        629 33101  35821 7L   P15_2    
-        19        630 33101  35653 7R   P15_1    
-        19        631 33101  35828 7L   P15_2    
-        19        632 33101  35643 7R   P15_1    
-        19        633 33101  34365 7L   S8_4     
-        19        634 33101  35638 7R   P15_1    
-        19        635 33101  35808 7L   P15_2    
-        19        636 33101  35623 7R   P15_1    
-        19        637 33101  34401 7L   S8_4     
-        19        638 33101  35628 7R   P15_1    
-        19        639 33101  35816 7L   P15_2    
-        19        640 33101  35633 7R   P15_1    
-        19        641 33101  35810 7L   P15_2    
-        19        642 33101  35875 7R   P15_2    
-        19        643 33101  35802 7L   P15_2    
-        19        644 33101  35861 7R   P15_2    
-        19        645 33101  35842 7L   P15_2    
-        19        646 33101  35659 7R   P15_1    
-        19        647 33101  35837 7L   P15_2    
-        19        648 33101  35871 7R   P15_2    
-        19        649 33101  35822 7L   P15_2    
-        19        650 33101  35654 7R   P15_1    
-        19        651 33101  35829 7L   P15_2    
-        19        652 33101  35644 7R   P15_1    
-        19        653 33101  34367 7L   S8_4     
-        19        654 33101  35639 7R   P15_1    
-        19        655 33101  35809 7L   P15_2    
-        19        656 33101  35624 7R   P15_1    
-        19        657 33101  32673 7L   P14      
-        19        658 33101  35629 7R   P15_1    
-        19        659 33101  35817 7L   P15_2    
-        19        660 33101  35634 7R   P15_1    
-        19        661 33101  35812 7L   P15_2    
-        19        662 33101  35876 7R   P15_2    
-        19        663 33101  35803 7L   P15_2    
-        19        664 33101  35862 7R   P15_2    
-        19        665 33101  35843 7L   P15_2    
-        19        666 33101  35660 7R   P15_1    
-        19        667 33101  35838 7L   P15_2    
-        19        668 33101  35872 7R   P15_2    
-        19        669 33101  35823 7L   P15_2    
-        19        670 33101  35655 7R   P15_1    
-        19        671 33101  35831 7L   P15_2    
-        19        672 33101  35646 7R   P15_1    
-        19        673 33101  34368 7L   S8_4     
-        19        674 33101  35640 7R   P15_1    
-        19        675 33101  35811 7L   P15_2    
-        19        676 33101  35626 7R   P15_1    
-        19        677 33101  32674 7L   P14      
-        19        678 33101  35630 7R   P15_1    
-        19        679 33101  35818 7L   P15_2    
-        19        680 33101  35635 7R   P15_1    
-        19        681 33101  35814 7L   P15_2    
-        19        682 33101  35877 7R   P15_2    
-        19        683 33101  35804 7L   P15_2    
-        19        684 33101  35863 7R   P15_2    
-        19        685 33101  35846 7L   P15_2    
-        19        686 33101  35868 7R   P15_2    
-        19        687 33101  35839 7L   P15_2    
-        19        688 33101  35873 7R   P15_2    
-        19        689 33101  35824 7L   P15_2    
-        19        690 33101  35656 7R   P15_1    
-        19        691 33101  35833 7L   P15_2    
-        19        692 33101  35647 7R   P15_1    
-        19        693 33101  34369 7L   S8_4     
-        19        694 33101  35641 7R   P15_1    
-        19        695 33101  35813 7L   P15_2    
-        19        696 33101  34417 7R   S8_4     
-        19        697 33101  33005 7L   S8_1     
-        19        698 33101  35631 7R   P15_1    
-        19        699 33101  35819 7L   P15_2    
-        19        700 33101  35636 7R   P15_1    
-        19        701 33101  35893 8L   P15_2    
-        19        702 33101  35980 8R   P15_2    
-        19        703 33101  35883 8L   P15_2    
-        19        704 33101  35975 8R   P15_2    
-        19        705 33101  35898 8L   P15_2    
-        19        706 33101  35970 8R   P15_2    
-        19        707 33101  35928 8L   P15_2    
-        19        708 33101  35965 8R   P15_2    
-        19        709 33101  35923 8L   P15_2    
-        19        710 33101  35960 8R   P15_2    
-        19        711 33101  35918 8L   P15_2    
-        19        712 33101  35955 8R   P15_2    
-        19        713 33101  35913 8L   P15_2    
-        19        714 33101  35940 8R   P15_2    
-        19        715 33101  35908 8L   P15_2    
-        19        716 33101  35950 8R   P15_2    
-        19        717 33101  35903 8L   P15_2    
-        19        718 33101  11564 8R   S1       
-        19        719 33101  34491 8L   S8_4     
-        19        720 33101  35945 8R   P15_2    
-        19        721 33101  35894 8L   P15_2    
-        19        722 33101  35981 8R   P15_2    
-        19        723 33101  35886 8L   P15_2    
-        19        724 33101  35976 8R   P15_2    
-        19        725 33101  35899 8L   P15_2    
-        19        726 33101  35971 8R   P15_2    
-        19        727 33101  35929 8L   P15_2    
-        19        728 33101  35966 8R   P15_2    
-        19        729 33101  35924 8L   P15_2    
-        19        730 33101  35961 8R   P15_2    
-        19        731 33101  35919 8L   P15_2    
-        19        732 33101  35956 8R   P15_2    
-        19        733 33101  35914 8L   P15_2    
-        19        734 33101  35941 8R   P15_2    
-        19        735 33101  35909 8L   P15_2    
-        19        736 33101  35951 8R   P15_2    
-        19        737 33101  35904 8L   P15_2    
-        19        738 33101  34540 8R   S8_4     
-        19        739 33101  34492 8L   S8_4     
-        19        740 33101  35946 8R   P15_2    
-        19        741 33101  35896 8L   P15_2    
-        19        742 33101  35982 8R   P15_2    
-        19        743 33101  35887 8L   P15_2    
-        19        744 33101  35977 8R   P15_2    
-        19        745 33101  35900 8L   P15_2    
-        19        746 33101  35972 8R   P15_2    
-        19        747 33101  35930 8L   P15_2    
-        19        748 33101  35967 8R   P15_2    
-        19        749 33101  35925 8L   P15_2    
-        19        750 33101  35962 8R   P15_2    
-        19        751 33101  35920 8L   P15_2    
-        19        752 33101  35957 8R   P15_2    
-        19        753 33101  35915 8L   P15_2    
-        19        754 33101  35942 8R   P15_2    
-        19        755 33101  35910 8L   P15_2    
-        19        756 33101  35952 8R   P15_2    
-        19        757 33101  35905 8L   P15_2    
-        19        758 33101  34541 8R   S8_4     
-        19        759 33101  34493 8L   S8_4     
-        19        760 33101  35947 8R   P15_2    
-        19        761 33101  35881 8L   P15_2    
-        19        762 33101  35983 8R   P15_2    
-        19        763 33101  35888 8L   P15_2    
-        19        764 33101  35978 8R   P15_2    
-        19        765 33101  35901 8L   P15_2    
-        19        766 33101  35973 8R   P15_2    
-        19        767 33101  35931 8L   P15_2    
-        19        768 33101  35968 8R   P15_2    
-        19        769 33101  35926 8L   P15_2    
-        19        770 33101  35963 8R   P15_2    
-        19        771 33101  35921 8L   P15_2    
-        19        772 33101  35958 8R   P15_2    
-        19        773 33101  35916 8L   P15_2    
-        19        774 33101  35943 8R   P15_2    
-        19        775 33101  35911 8L   P15_2    
-        19        776 33101  35953 8R   P15_2    
-        19        777 33101  35906 8L   P15_2    
-        19        778 33101  34542 8R   S8_4     
-        19        779 33101  33044 8L   S8_1     
-        19        780 33101  35948 8R   P15_2    
-        19        781 33101  35882 8L   P15_2    
-        19        782 33101  35984 8R   P15_2    
-        19        783 33101  35892 8L   P15_2    
-        19        784 33101  35979 8R   P15_2    
-        19        785 33101  35902 8L   P15_2    
-        19        786 33101  35974 8R   P15_2    
-        19        787 33101  35932 8L   P15_2    
-        19        788 33101  35969 8R   P15_2    
-        19        789 33101  35927 8L   P15_2    
-        19        790 33101  35964 8R   P15_2    
-        19        791 33101  35922 8L   P15_2    
-        19        792 33101  35959 8R   P15_2    
-        19        793 33101  35917 8L   P15_2    
-        19        794 33101  35944 8R   P15_2    
-        19        795 33101  35912 8L   P15_2    
-        19        796 33101  35954 8R   P15_2    
-        19        797 33101  35907 8L   P15_2    
-        19        798 33101  35669 8R   P15_1    
-        19        799 33101  34475 8L   S8_4     
-        19        800 33101  35949 8R   P15_2    
-        19        801 33101  36898 9L   S9_2     
-        19        802 33101  36962 9R   S9_2     
-        19        803 33101  36891 9L   S9_2     
-        19        804 33101  35997 9R   P15_2    
-        19        805 33101  36934 9L   S9_2     
-        19        806 33101  35999 9R   P15_2    
-        19        807 33101  36926 9L   S9_2     
-        19        808 33101  36009 9R   P15_2    
-        19        809 33101  36904 9L   S9_2     
-        19        810 33101  35989 9R   P15_2    
-        19        811 33101  36924 9L   S9_2     
-        19        812 33101  36019 9R   P15_2    
-        19        813 33101  36919 9L   S9_2     
-        19        814 33101  35674 9R   P15_1    
-        19        815 33101  36914 9L   S9_2     
-        19        816 33101  35673 9R   P15_1    
-        19        817 33101  34573 9L   S8_4     
-        19        818 33101  36945 9R   S9_2     
-        19        819 33101  34563 9L   S8_4     
-        19        820 33101  36940 9R   S9_2     
-        19        821 33101  36899 9L   S9_2     
-        19        822 33101  31145 9R   S7_3     
-        19        823 33101  36892 9L   S9_2     
-        19        824 33101  35998 9R   P15_2    
-        19        825 33101  36935 9L   S9_2     
-        19        826 33101  36000 9R   P15_2    
-        19        827 33101  36930 9L   S9_2     
-        19        828 33101  36010 9R   P15_2    
-        19        829 33101  36905 9L   S9_2     
-        19        830 33101  35990 9R   P15_2    
-        19        831 33101  36925 9L   S9_2     
-        19        832 33101  36020 9R   P15_2    
-        19        833 33101  36920 9L   S9_2     
-        19        834 33101  36955 9R   S9_2     
-        19        835 33101  36915 9L   S9_2     
-        19        836 33101  36015 9R   P15_2    
-        19        837 33101  34574 9L   S8_4     
-        19        838 33101  36946 9R   S9_2     
-        19        839 33101  34564 9L   S8_4     
-        19        840 33101  36941 9R   S9_2     
-        19        841 33101  36900 9L   S9_2     
-        19        842 33101  35676 9R   P15_1    
-        19        843 33101  36893 9L   S9_2     
-        19        844 33101  36006 9R   P15_2    
-        19        845 33101  36936 9L   S9_2     
-        19        846 33101  36001 9R   P15_2    
-        19        847 33101  36931 9L   S9_2     
-        19        848 33101  36011 9R   P15_2    
-        19        849 33101  36906 9L   S9_2     
-        19        850 33101  35991 9R   P15_2    
-        19        851 33101  36927 9L   S9_2     
-        19        852 33101  36021 9R   P15_2    
-        19        853 33101  36921 9L   S9_2     
-        19        854 33101  36957 9R   S9_2     
-        19        855 33101  36916 9L   S9_2     
-        19        856 33101  36016 9R   P15_2    
-        19        857 33101  34575 9L   S8_4     
-        19        858 33101  36947 9R   S9_2     
-        19        859 33101  34565 9L   S8_4     
-        19        860 33101  36942 9R   S9_2     
-        19        861 33101  36901 9L   S9_2     
-        19        862 33101  36014 9R   P15_2    
-        19        863 33101  36894 9L   S9_2     
-        19        864 33101  36007 9R   P15_2    
-        19        865 33101  36937 9L   S9_2     
-        19        866 33101  36002 9R   P15_2    
-        19        867 33101  36932 9L   S9_2     
-        19        868 33101  36012 9R   P15_2    
-        19        869 33101  36907 9L   S9_2     
-        19        870 33101  35992 9R   P15_2    
-        19        871 33101  36928 9L   S9_2     
-        19        872 33101  36938 9R   S9_2     
-        19        873 33101  36922 9L   S9_2     
-        19        874 33101  36958 9R   S9_2     
-        19        875 33101  36917 9L   S9_2     
-        19        876 33101  36017 9R   P15_2    
-        19        877 33101  34576 9L   S8_4     
-        19        878 33101  36948 9R   S9_2     
-        19        879 33101  34566 9L   S8_4     
-        19        880 33101  36943 9R   S9_2     
-        19        881 33101  36903 9L   S9_2     
-        19        882 33101  36956 9R   S9_2     
-        19        883 33101  36895 9L   S9_2     
-        19        884 33101  36008 9R   P15_2    
-        19        885 33101  34593 9L   S8_4     
-        19        886 33101  36005 9R   P15_2    
-        19        887 33101  36933 9L   S9_2     
-        19        888 33101  36013 9R   P15_2    
-        19        889 33101  36908 9L   S9_2     
-        19        890 33101  35995 9R   P15_2    
-        19        891 33101  36929 9L   S9_2     
-        19        892 33101  36939 9R   S9_2     
-        19        893 33101  36923 9L   S9_2     
-        19        894 33101  36959 9R   S9_2     
-        19        895 33101  36918 9L   S9_2     
-        19        896 33101  36018 9R   P15_2    
-        19        897 33101  34577 9L   S8_4     
-        19        898 33101  36949 9R   S9_2     
-        19        899 33101  34567 9L   S8_4     
-        19        900 33101  36944 9R   S9_2     
-        19        901 33101  37001 10L  S9_2     
-        19        902 33101  36028 10R  P15_2    
-        19        903 33101  36967 10L  S9_2     
-        19        904 33101  36038 10R  P15_2    
-        19        905 33101  36972 10L  S9_2     
-        19        906 33101  36033 10R  P15_2    
-        19        907 33101  35677 10L  P15_1    
-        19        908 33101  37014 10R  S9_2     
-        19        909 33101  36987 10L  S9_2     
-        19        910 33101  36042 10R  P15_2    
-        19        911 33101  36982 10L  S9_2     
-        19        912 33101  37009 10R  S9_2     
-        19        913 33101  36997 10L  S9_2     
-        19        914 33101  36041 10R  P15_2    
-        19        915 33101  36977 10L  S9_2     
-        19        916 33101  34743 10R  S8_4     
-        19        917 33101  34648 10L  S8_4     
-        19        918 33101  34701 10R  S8_4     
-        19        919 33101  34677 10L  S8_4     
-        19        920 33101  35679 10R  P15_1    
-        19        921 33101  37002 10L  S9_2     
-        19        922 33101  36029 10R  P15_2    
-        19        923 33101  36968 10L  S9_2     
-        19        924 33101  36039 10R  P15_2    
-        19        925 33101  36973 10L  S9_2     
-        19        926 33101  36034 10R  P15_2    
-        19        927 33101  36963 10L  S9_2     
-        19        928 33101  37015 10R  S9_2     
-        19        929 33101  36988 10L  S9_2     
-        19        930 33101  36044 10R  P15_2    
-        19        931 33101  36993 10L  S9_2     
-        19        932 33101  37010 10R  S9_2     
-        19        933 33101  36998 10L  S9_2     
-        19        934 33101  37005 10R  S9_2     
-        19        935 33101  36978 10L  S9_2     
-        19        936 33101  34744 10R  S8_4     
-        19        937 33101  34663 10L  S8_4     
-        19        938 33101  34702 10R  S8_4     
-        19        939 33101  34678 10L  S8_4     
-        19        940 33101  35680 10R  P15_1    
-        19        941 33101  37003 10L  S9_2     
-        19        942 33101  36030 10R  P15_2    
-        19        943 33101  36969 10L  S9_2     
-        19        944 33101  36040 10R  P15_2    
-        19        945 33101  36974 10L  S9_2     
-        19        946 33101  36035 10R  P15_2    
-        19        947 33101  36964 10L  S9_2     
-        19        948 33101  37016 10R  S9_2     
-        19        949 33101  36989 10L  S9_2     
-        19        950 33101  36045 10R  P15_2    
-        19        951 33101  36984 10L  S9_2     
-        19        952 33101  37011 10R  S9_2     
-        19        953 33101  36999 10L  S9_2     
-        19        954 33101  37006 10R  S9_2     
-        19        955 33101  36979 10L  S9_2     
-        19        956 33101  36024 10R  P15_2    
-        19        957 33101  34672 10L  S8_4     
-        19        958 33101  34703 10R  S8_4     
-        19        959 33101  34679 10L  S8_4     
-        19        960 33101  35681 10R  P15_1    
-        19        961 33101  32736 10L  P14      
-        19        962 33101  36031 10R  P15_2    
-        19        963 33101  36970 10L  S9_2     
-        19        964 33101  36043 10R  P15_2    
-        19        965 33101  36975 10L  S9_2     
-        19        966 33101  36036 10R  P15_2    
-        19        967 33101  36965 10L  S9_2     
-        19        968 33101  37017 10R  S9_2     
-        19        969 33101  36990 10L  S9_2     
-        19        970 33101  36046 10R  P15_2    
-        19        971 33101  36985 10L  S9_2     
-        19        972 33101  37012 10R  S9_2     
-        19        973 33101  37000 10L  S9_2     
-        19        974 33101  37007 10R  S9_2     
-        19        975 33101  36980 10L  S9_2     
-        19        976 33101  36025 10R  P15_2    
-        19        977 33101  34673 10L  S8_4     
-        19        978 33101  34704 10R  S8_4     
-        19        979 33101  34680 10L  S8_4     
-        19        980 33101  36022 10R  P15_2    
-        19        981 33101  32724 10L  P14      
-        19        982 33101  36032 10R  P15_2    
-        19        983 33101  36971 10L  S9_2     
-        19        984 33101  27267 10R  S6_2b    
-        19        985 33101  36976 10L  S9_2     
-        19        986 33101  36037 10R  P15_2    
-        19        987 33101  36966 10L  S9_2     
-        19        988 33101  37018 10R  S9_2     
-        19        989 33101  36991 10L  S9_2     
-        19        990 33101  36047 10R  P15_2    
-        19        991 33101  36986 10L  S9_2     
-        19        992 33101  37013 10R  S9_2     
-        19        993 33101  37004 10L  S9_2     
-        19        994 33101  37008 10R  S9_2     
-        19        995 33101  36981 10L  S9_2     
-        19        996 33101  36027 10R  P15_2    
-        19        997 33101  34676 10L  S8_4     
-        19        998 33101  34705 10R  S8_4     
-        19        999 33101  34681 10L  S8_4     
-        19       1000 33101  36023 10R  P15_2    
-        19       1001 33101  37156 11L  S9_3     
-        19       1002 33101  37172 11R  S9_3     
-        19       1003 33101  37151 11L  S9_3     
-        19       1004 33101  37173 11R  S9_3     
-        19       1005 33101  37139 11L  S9_3     
-        19       1006 33101  37176 11R  S9_3     
-        19       1007 33101  37121 11L  S9_3     
-        19       1008 33101  37166 11R  S9_3     
-        19       1009 33101  37146 11L  S9_3     
-        19       1010 33101  37187 11R  S9_3     
-        19       1011 33101  37131 11L  S9_3     
-        19       1012 33101  37206 11R  S9_3     
-        19       1013 33101  37126 11L  S9_3     
-        19       1014 33101  37201 11R  S9_3     
-        19       1015 33101  35682 11L  P15_1    
-        19       1016 33101  37181 11R  S9_3     
-        19       1017 33101  34770 11L  S8_4     
-        19       1018 33101  34296 11R  S8_3     
-        19       1019 33101  34765 11L  S8_4     
-        19       1020 33101  34828 11R  S8_4     
-        19       1021 33101  37157 11L  S9_3     
-        19       1022 33101  37188 11R  S9_3     
-        19       1023 33101  37152 11L  S9_3     
-        19       1024 33101  37174 11R  S9_3     
-        19       1025 33101  37140 11L  S9_3     
-        19       1026 33101  37177 11R  S9_3     
-        19       1027 33101  37122 11L  S9_3     
-        19       1028 33101  37167 11R  S9_3     
-        19       1029 33101  37147 11L  S9_3     
-        19       1030 33101  37189 11R  S9_3     
-        19       1031 33101  37132 11L  S9_3     
-        19       1032 33101  37207 11R  S9_3     
-        19       1033 33101  37127 11L  S9_3     
-        19       1034 33101  37202 11R  S9_3     
-        19       1035 33101  35683 11L  P15_1    
-        19       1036 33101  37182 11R  S9_3     
-        19       1037 33101  34771 11L  S8_4     
-        19       1038 33101  34843 11R  S8_4     
-        19       1039 33101  34766 11L  S8_4     
-        19       1040 33101  34830 11R  S8_4     
-        19       1041 33101  37158 11L  S9_3     
-        19       1042 33101  37190 11R  S9_3     
-        19       1043 33101  37153 11L  S9_3     
-        19       1044 33101  37175 11R  S9_3     
-        19       1045 33101  37141 11L  S9_3     
-        19       1046 33101  37178 11R  S9_3     
-        19       1047 33101  37123 11L  S9_3     
-        19       1048 33101  37168 11R  S9_3     
-        19       1049 33101  37148 11L  S9_3     
-        19       1050 33101  37192 11R  S9_3     
-        19       1051 33101  37133 11L  S9_3     
-        19       1052 33101  37208 11R  S9_3     
-        19       1053 33101  37128 11L  S9_3     
-        19       1054 33101  37203 11R  S9_3     
-        19       1055 33101  35684 11L  P15_1    
-        19       1056 33101  37183 11R  S9_3     
-        19       1057 33101  34772 11L  S8_4     
-        19       1058 33101  35686 11R  P15_1    
-        19       1059 33101  34767 11L  S8_4     
-        19       1060 33101  34831 11R  S8_4     
-        19       1061 33101  37159 11L  S9_3     
-        19       1062 33101  37191 11R  S9_3     
-        19       1063 33101  37154 11L  S9_3     
-        19       1064 33101  37213 11R  S9_3     
-        19       1065 33101  37142 11L  S9_3     
-        19       1066 33101  37179 11R  S9_3     
-        19       1067 33101  37125 11L  S9_3     
-        19       1068 33101  37169 11R  S9_3     
-        19       1069 33101  37149 11L  S9_3     
-        19       1070 33101  37194 11R  S9_3     
-        19       1071 33101  37134 11L  S9_3     
-        19       1072 33101  37209 11R  S9_3     
-        19       1073 33101  37129 11L  S9_3     
-        19       1074 33101  37204 11R  S9_3     
-        19       1075 33101  34795 11L  S8_4     
-        19       1076 33101  37184 11R  S9_3     
-        19       1077 33101  34773 11L  S8_4     
-        19       1078 33101  35349 11R  S8_5     
-        19       1079 33101  34768 11L  S8_4     
-        19       1080 33101  34835 11R  S8_4     
-        19       1081 33101  37160 11L  S9_3     
-        19       1082 33101  37193 11R  S9_3     
-        19       1083 33101  37155 11L  S9_3     
-        19       1084 33101  37215 11R  S9_3     
-        19       1085 33101  37145 11L  S9_3     
-        19       1086 33101  37180 11R  S9_3     
-        19       1087 33101  37136 11L  S9_3     
-        19       1088 33101  37170 11R  S9_3     
-        19       1089 33101  37150 11L  S9_3     
-        19       1090 33101  37197 11R  S9_3     
-        19       1091 33101  37135 11L  S9_3     
-        19       1092 33101  37210 11R  S9_3     
-        19       1093 33101  37130 11L  S9_3     
-        19       1094 33101  37205 11R  S9_3     
-        19       1095 33101  34796 11L  S8_4     
-        19       1096 33101  37185 11R  S9_3     
-        19       1097 33101  34774 11L  S8_4     
-        19       1098 33101  35687 11R  P15_1    
-        19       1099 33101  34769 11L  S8_4     
-        19       1100 33101  34841 11R  S8_4     
-        19       1101 33101  37276 12L  S9_3     
-        19       1102 33101  37298 12R  S9_3     
-        19       1103 33101  37242 12L  S9_3     
-        19       1104 33101  37303 12R  S9_3     
-        19       1105 33101  37236 12L  S9_3     
-        19       1106 33101  37313 12R  S9_3     
-        19       1107 33101  37250 12L  S9_3     
-        19       1108 33101  37308 12R  S9_3     
-        19       1109 33101  37231 12L  S9_3     
-        19       1110 33101  37318 12R  S9_3     
-        19       1111 33101  37221 12L  S9_3     
-        19       1112 33101  37283 12R  S9_3     
-        19       1113 33101  37226 12L  S9_3     
-        19       1114 33101  37288 12R  S9_3     
-        19       1115 33101  37216 12L  S9_3     
-        19       1116 33101  37293 12R  S9_3     
-        19       1117 33101  35375 12L  S8_5     
-        19       1118 33101  34883 12R  S8_4     
-        19       1119 33101  35688 12L  P15_1    
-        19       1120 33101  34874 12R  S8_4     
-        19       1121 33101  37277 12L  S9_3     
-        19       1122 33101  37299 12R  S9_3     
-        19       1123 33101  37243 12L  S9_3     
-        19       1124 33101  37304 12R  S9_3     
-        19       1125 33101  37237 12L  S9_3     
-        19       1126 33101  37314 12R  S9_3     
-        19       1127 33101  37251 12L  S9_3     
-        19       1128 33101  37309 12R  S9_3     
-        19       1129 33101  37232 12L  S9_3     
-        19       1130 33101  37319 12R  S9_3     
-        19       1131 33101  37222 12L  S9_3     
-        19       1132 33101  37284 12R  S9_3     
-        19       1133 33101  37227 12L  S9_3     
-        19       1134 33101  37289 12R  S9_3     
-        19       1135 33101  37217 12L  S9_3     
-        19       1136 33101  37294 12R  S9_3     
-        19       1137 33101  35376 12L  S8_5     
-        19       1138 33101  35691 12R  P15_1    
-        19       1139 33101  35359 12L  S8_5     
-        19       1140 33101  34875 12R  S8_4     
-        19       1141 33101  37278 12L  S9_3     
-        19       1142 33101  37300 12R  S9_3     
-        19       1143 33101  37244 12L  S9_3     
-        19       1144 33101  37305 12R  S9_3     
-        19       1145 33101  37238 12L  S9_3     
-        19       1146 33101  37315 12R  S9_3     
-        19       1147 33101  37252 12L  S9_3     
-        19       1148 33101  37310 12R  S9_3     
-        19       1149 33101  37233 12L  S9_3     
-        19       1150 33101  37320 12R  S9_3     
-        19       1151 33101  37223 12L  S9_3     
-        19       1152 33101  37285 12R  S9_3     
-        19       1153 33101  37228 12L  S9_3     
-        19       1154 33101  37290 12R  S9_3     
-        19       1155 33101  37218 12L  S9_3     
-        19       1156 33101  37295 12R  S9_3     
-        19       1157 33101  27363 12L  S6_2b    
-        19       1158 33101  35692 12R  P15_1    
-        19       1159 33101  35367 12L  S8_5     
-        19       1160 33101  34876 12R  S8_4     
-        19       1161 33101  37279 12L  S9_3     
-        19       1162 33101  37302 12R  S9_3     
-        19       1163 33101  37245 12L  S9_3     
-        19       1164 33101  37306 12R  S9_3     
-        19       1165 33101  37246 12L  S9_3     
-        19       1166 33101  37317 12R  S9_3     
-        19       1167 33101  37253 12L  S9_3     
-        19       1168 33101  37311 12R  S9_3     
-        19       1169 33101  37234 12L  S9_3     
-        19       1170 33101  37321 12R  S9_3     
-        19       1171 33101  37224 12L  S9_3     
-        19       1172 33101  37286 12R  S9_3     
-        19       1173 33101  37229 12L  S9_3     
-        19       1174 33101  37291 12R  S9_3     
-        19       1175 33101  37219 12L  S9_3     
-        19       1176 33101  37296 12R  S9_3     
-        19       1177 33101  33731 12L  S8_2     
-        19       1178 33101  35693 12R  P15_1    
-        19       1179 33101  35369 12L  S8_5     
-        19       1180 33101  34877 12R  S8_4     
-        19       1181 33101  37280 12L  S9_3     
-        19       1182 33101  37325 12R  S9_3     
-        19       1183 33101  37249 12L  S9_3     
-        19       1184 33101  37307 12R  S9_3     
-        19       1185 33101  37247 12L  S9_3     
-        19       1186 33101  37324 12R  S9_3     
-        19       1187 33101  37255 12L  S9_3     
-        19       1188 33101  37312 12R  S9_3     
-        19       1189 33101  37235 12L  S9_3     
-        19       1190 33101  37322 12R  S9_3     
-        19       1191 33101  37225 12L  S9_3     
-        19       1192 33101  37287 12R  S9_3     
-        19       1193 33101  37230 12L  S9_3     
-        19       1194 33101  37292 12R  S9_3     
-        19       1195 33101  37220 12L  S9_3     
-        19       1196 33101  37297 12R  S9_3     
-        19       1197 33101  33732 12L  S8_2     
-        19       1198 33101  35694 12R  P15_1    
-        19       1199 33101  35354 12L  S8_5     
-        19       1200 33101  34878 12R  S8_4     
-        19       1201 33101  37360 13L  S9_3     
-        19       1202 33101  37410 13R  S9_3     
-        19       1203 33101  37355 13L  S9_3     
-        19       1204 33101  37415 13R  S9_3     
-        19       1205 33101  37345 13L  S9_3     
-        19       1206 33101  35696 13R  P15_1    
-        19       1207 33101  37340 13L  S9_3     
-        19       1208 33101  37398 13R  S9_3     
-        19       1209 33101  37335 13L  S9_3     
-        19       1210 33101  37405 13R  S9_3     
-        19       1211 33101  37330 13L  S9_3     
-        19       1212 33101  35395 13R  S8_5     
-        19       1213 33101  37366 13L  S9_3     
-        19       1214 33101  37387 13R  S9_3     
-        19       1215 33101  37374 13L  S9_3     
-        19       1216 33101  37380 13R  S9_3     
-        19       1217 33101  36049 13L  P15_2    
-        19       1218 33101  35385 13R  S8_5     
-        19       1219 33101  32799 13L  P14      
-        19       1220 33101  35380 13R  S8_5     
-        19       1221 33101  37361 13L  S9_3     
-        19       1222 33101  37411 13R  S9_3     
-        19       1223 33101  37356 13L  S9_3     
-        19       1224 33101  37416 13R  S9_3     
-        19       1225 33101  37346 13L  S9_3     
-        19       1226 33101  35697 13R  P15_1    
-        19       1227 33101  37341 13L  S9_3     
-        19       1228 33101  37399 13R  S9_3     
-        19       1229 33101  37336 13L  S9_3     
-        19       1230 33101  37406 13R  S9_3     
-        19       1231 33101  37331 13L  S9_3     
-        19       1232 33101  35396 13R  S8_5     
-        19       1233 33101  37367 13L  S9_3     
-        19       1234 33101  37388 13R  S9_3     
-        19       1235 33101  37375 13L  S9_3     
-        19       1236 33101  37381 13R  S9_3     
-        19       1237 33101  36050 13L  P15_2    
-        19       1238 33101  35386 13R  S8_5     
-        19       1239 33101  32800 13L  P14      
-        19       1240 33101  35381 13R  S8_5     
-        19       1241 33101  37362 13L  S9_3     
-        19       1242 33101  37412 13R  S9_3     
-        19       1243 33101  37357 13L  S9_3     
-        19       1244 33101  37417 13R  S9_3     
-        19       1245 33101  37347 13L  S9_3     
-        19       1246 33101  35698 13R  P15_1    
-        19       1247 33101  37342 13L  S9_3     
-        19       1248 33101  37400 13R  S9_3     
-        19       1249 33101  37337 13L  S9_3     
-        19       1250 33101  37407 13R  S9_3     
-        19       1251 33101  37332 13L  S9_3     
-        19       1252 33101  35397 13R  S8_5     
-        19       1253 33101  37368 13L  S9_3     
-        19       1254 33101  37389 13R  S9_3     
-        19       1255 33101  37376 13L  S9_3     
-        19       1256 33101  37382 13R  S9_3     
-        19       1257 33101  35377 13L  S8_5     
-        19       1258 33101  35387 13R  S8_5     
-        19       1259 33101  37373 13L  S9_3     
-        19       1260 33101  35382 13R  S8_5     
-        19       1261 33101  37363 13L  S9_3     
-        19       1262 33101  37413 13R  S9_3     
-        19       1263 33101  37358 13L  S9_3     
-        19       1264 33101  37418 13R  S9_3     
-        19       1265 33101  37348 13L  S9_3     
-        19       1266 33101  35699 13R  P15_1    
-        19       1267 33101  37343 13L  S9_3     
-        19       1268 33101  37403 13R  S9_3     
-        19       1269 33101  37338 13L  S9_3     
-        19       1270 33101  37408 13R  S9_3     
-        19       1271 33101  37333 13L  S9_3     
-        19       1272 33101  35398 13R  S8_5     
-        19       1273 33101  37369 13L  S9_3     
-        19       1274 33101  37390 13R  S9_3     
-        19       1275 33101  37377 13L  S9_3     
-        19       1276 33101  37383 13R  S9_3     
-        19       1277 33101  35379 13L  S8_5     
-        19       1278 33101  35388 13R  S8_5     
-        19       1279 33101  34934 13L  S8_4     
-        19       1280 33101  35383 13R  S8_5     
-        19       1281 33101  37364 13L  S9_3     
-        19       1282 33101  37414 13R  S9_3     
-        19       1283 33101  37359 13L  S9_3     
-        19       1284 33101  37419 13R  S9_3     
-        19       1285 33101  37349 13L  S9_3     
-        19       1286 33101  35700 13R  P15_1    
-        19       1287 33101  37344 13L  S9_3     
-        19       1288 33101  37404 13R  S9_3     
-        19       1289 33101  37339 13L  S9_3     
-        19       1290 33101  37409 13R  S9_3     
-        19       1291 33101  37334 13L  S9_3     
-        19       1292 33101  35399 13R  S8_5     
-        19       1293 33101  37372 13L  S9_3     
-        19       1294 33101  37392 13R  S9_3     
-        19       1295 33101  37379 13L  S9_3     
-        19       1296 33101  37384 13R  S9_3     
-        19       1297 33101  34925 13L  S8_4     
-        19       1298 33101  35389 13R  S8_5     
-        19       1299 33101  34937 13L  S8_4     
-        19       1300 33101  35384 13R  S8_5     
-        19       1301 33101  35711 14L  P15_2    
-        19       1302 33101  36641 14R  S9_2     
-        19       1303 33101  36601 14L  S9_2     
-        19       1304 33101  36646 14R  S9_2     
-        19       1305 33101  36606 14L  S9_2     
-        19       1306 33101  36651 14R  S9_2     
-        19       1307 33101  36611 14L  S9_2     
-        19       1308 33101  36656 14R  S9_2     
-        19       1309 33101  36616 14L  S9_2     
-        19       1310 33101  36661 14R  S9_2     
-        19       1311 33101  36621 14L  S9_2     
-        19       1312 33101  36666 14R  S9_2     
-        19       1313 33101  36626 14L  S9_2     
-        19       1314 33101  36671 14R  S9_2     
-        19       1315 33101  36636 14L  S9_2     
-        19       1316 33101  36676 14R  S9_2     
-        19       1317 33101  36322 14L  S9_1     
-        19       1318 33101  37031 14R  S9_3     
-        19       1319 33101  37021 14L  S9_3     
-        19       1320 33101  36337 14R  S9_1     
-        19       1321 33101  36332 14L  S9_1     
-        19       1322 33101  36642 14R  S9_2     
-        19       1323 33101  36602 14L  S9_2     
-        19       1324 33101  36647 14R  S9_2     
-        19       1325 33101  36607 14L  S9_2     
-        19       1326 33101  36652 14R  S9_2     
-        19       1327 33101  36612 14L  S9_2     
-        19       1328 33101  36657 14R  S9_2     
-        19       1329 33101  36617 14L  S9_2     
-        19       1330 33101  36662 14R  S9_2     
-        19       1331 33101  36622 14L  S9_2     
-        19       1332 33101  36667 14R  S9_2     
-        19       1333 33101  36627 14L  S9_2     
-        19       1334 33101  36672 14R  S9_2     
-        19       1335 33101  36637 14L  S9_2     
-        19       1336 33101  36677 14R  S9_2     
-        19       1337 33101  36632 14L  S9_2     
-        19       1338 33101  37032 14R  S9_3     
-        19       1339 33101  37022 14L  S9_3     
-        19       1340 33101  36670 14R  S9_2     
-        19       1341 33101  36333 14L  S9_1     
-        19       1342 33101  36643 14R  S9_2     
-        19       1343 33101  36603 14L  S9_2     
-        19       1344 33101  36648 14R  S9_2     
-        19       1345 33101  35712 14L  P15_2    
-        19       1346 33101  36653 14R  S9_2     
-        19       1347 33101  36613 14L  S9_2     
-        19       1348 33101  36658 14R  S9_2     
-        19       1349 33101  36618 14L  S9_2     
-        19       1350 33101  36663 14R  S9_2     
-        19       1351 33101  36623 14L  S9_2     
-        19       1352 33101  36668 14R  S9_2     
-        19       1353 33101  36628 14L  S9_2     
-        19       1354 33101  36673 14R  S9_2     
-        19       1355 33101  36638 14L  S9_2     
-        19       1356 33101  36678 14R  S9_2     
-        19       1357 33101  36633 14L  S9_2     
-        19       1358 33101  37033 14R  S9_3     
-        19       1359 33101  37023 14L  S9_3     
-        19       1360 33101  36664 14R  S9_2     
-        19       1361 33101  36334 14L  S9_1     
-        19       1362 33101  36644 14R  S9_2     
-        19       1363 33101  36604 14L  S9_2     
-        19       1364 33101  36649 14R  S9_2     
-        19       1365 33101  36609 14L  S9_2     
-        19       1366 33101  36654 14R  S9_2     
-        19       1367 33101  36614 14L  S9_2     
-        19       1368 33101  36659 14R  S9_2     
-        19       1369 33101  36619 14L  S9_2     
-        19       1370 33101  35728 14R  P15_2    
-        19       1371 33101  36624 14L  S9_2     
-        19       1372 33101  36669 14R  S9_2     
-        19       1373 33101  36629 14L  S9_2     
-        19       1374 33101  36674 14R  S9_2     
-        19       1375 33101  36639 14L  S9_2     
-        19       1376 33101  36679 14R  S9_2     
-        19       1377 33101  36634 14L  S9_2     
-        19       1378 33101  37034 14R  S9_3     
-        19       1379 33101  37024 14L  S9_3     
-        19       1380 33101  37036 14R  S9_3     
-        19       1381 33101  36335 14L  S9_1     
-        19       1382 33101  36645 14R  S9_2     
-        19       1383 33101  36605 14L  S9_2     
-        19       1384 33101  36650 14R  S9_2     
-        19       1385 33101  36610 14L  S9_2     
-        19       1386 33101  36655 14R  S9_2     
-        19       1387 33101  36615 14L  S9_2     
-        19       1388 33101  36660 14R  S9_2     
-        19       1389 33101  36620 14L  S9_2     
-        19       1390 33101  35729 14R  P15_2    
-        19       1391 33101  36625 14L  S9_2     
-        19       1392 33101  36665 14R  S9_2     
-        19       1393 33101  36630 14L  S9_2     
-        19       1394 33101  36675 14R  S9_2     
-        19       1395 33101  36640 14L  S9_2     
-        19       1396 33101  36680 14R  S9_2     
-        19       1397 33101  36635 14L  S9_2     
-        19       1398 33101  37035 14R  S9_3     
-        19       1399 33101  37025 14L  S9_3     
-        19       1400 33101  37037 14R  S9_3     
-        19       1401 33101  36681 15L  S9_2     
-        19       1402 33101  35766 15R  P15_2    
-        19       1403 33101  36686 15L  S9_2     
-        19       1404 33101  35771 15R  P15_2    
-        19       1405 33101  36691 15L  S9_2     
-        19       1406 33101  36711 15R  S9_2     
-        19       1407 33101  36696 15L  S9_2     
-        19       1408 33101  36716 15R  S9_2     
-        19       1409 33101  36701 15L  S9_2     
-        19       1410 33101  36721 15R  S9_2     
-        19       1411 33101  37041 15L  S9_3     
-        19       1412 33101  36726 15R  S9_2     
-        19       1413 33101  37046 15L  S9_3     
-        19       1414 33101  36731 15R  S9_2     
-        19       1415 33101  37051 15L  S9_3     
-        19       1416 33101  36736 15R  S9_2     
-        19       1417 33101  36706 15L  S9_2     
-        19       1418 33101  37061 15R  S9_3     
-        19       1419 33101  37056 15L  S9_3     
-        19       1420 33101  37066 15R  S9_3     
-        19       1421 33101  36682 15L  S9_2     
-        19       1422 33101  35767 15R  P15_2    
-        19       1423 33101  36687 15L  S9_2     
-        19       1424 33101  35772 15R  P15_2    
-        19       1425 33101  36692 15L  S9_2     
-        19       1426 33101  36712 15R  S9_2     
-        19       1427 33101  36697 15L  S9_2     
-        19       1428 33101  36717 15R  S9_2     
-        19       1429 33101  36702 15L  S9_2     
-        19       1430 33101  36722 15R  S9_2     
-        19       1431 33101  37042 15L  S9_3     
-        19       1432 33101  36727 15R  S9_2     
-        19       1433 33101  37047 15L  S9_3     
-        19       1434 33101  36732 15R  S9_2     
-        19       1435 33101  37052 15L  S9_3     
-        19       1436 33101  36737 15R  S9_2     
-        19       1437 33101  36707 15L  S9_2     
-        19       1438 33101  37062 15R  S9_3     
-        19       1439 33101  37057 15L  S9_3     
-        19       1440 33101  37072 15R  S9_3     
-        19       1441 33101  36683 15L  S9_2     
-        19       1442 33101  35768 15R  P15_2    
-        19       1443 33101  36688 15L  S9_2     
-        19       1444 33101  35773 15R  P15_2    
-        19       1445 33101  36693 15L  S9_2     
-        19       1446 33101  36713 15R  S9_2     
-        19       1447 33101  36698 15L  S9_2     
-        19       1448 33101  36718 15R  S9_2     
-        19       1449 33101  36703 15L  S9_2     
-        19       1450 33101  36723 15R  S9_2     
-        19       1451 33101  37043 15L  S9_3     
-        19       1452 33101  36728 15R  S9_2     
-        19       1453 33101  37048 15L  S9_3     
-        19       1454 33101  36733 15R  S9_2     
-        19       1455 33101  37053 15L  S9_3     
-        19       1456 33101  36738 15R  S9_2     
-        19       1457 33101  36705 15L  S9_2     
-        19       1458 33101  37063 15R  S9_3     
-        19       1459 33101  37058 15L  S9_3     
-        19       1460 33101  37068 15R  S9_3     
-        19       1461 33101  36684 15L  S9_2     
-        19       1462 33101  35769 15R  P15_2    
-        19       1463 33101  36689 15L  S9_2     
-        19       1464 33101  35774 15R  P15_2    
-        19       1465 33101  36694 15L  S9_2     
-        19       1466 33101  36714 15R  S9_2     
-        19       1467 33101  36699 15L  S9_2     
-        19       1468 33101  36719 15R  S9_2     
-        19       1469 33101  36704 15L  S9_2     
-        19       1470 33101  36724 15R  S9_2     
-        19       1471 33101  37044 15L  S9_3     
-        19       1472 33101  36729 15R  S9_2     
-        19       1473 33101  37049 15L  S9_3     
-        19       1474 33101  36734 15R  S9_2     
-        19       1475 33101  37054 15L  S9_3     
-        19       1476 33101  35776 15R  P15_2    
-        19       1477 33101  36709 15L  S9_2     
-        19       1478 33101  37064 15R  S9_3     
-        19       1479 33101  37059 15L  S9_3     
-        19       1480 33101  37069 15R  S9_3     
-        19       1481 33101  36685 15L  S9_2     
-        19       1482 33101  35770 15R  P15_2    
-        19       1483 33101  36690 15L  S9_2     
-        19       1484 33101  35775 15R  P15_2    
-        19       1485 33101  36695 15L  S9_2     
-        19       1486 33101  36715 15R  S9_2     
-        19       1487 33101  35748 15L  P15_2    
-        19       1488 33101  36720 15R  S9_2     
-        19       1489 33101  35750 15L  P15_2    
-        19       1490 33101  36725 15R  S9_2     
-        19       1491 33101  37045 15L  S9_3     
-        19       1492 33101  36730 15R  S9_2     
-        19       1493 33101  37050 15L  S9_3     
-        19       1494 33101  36735 15R  S9_2     
-        19       1495 33101  37055 15L  S9_3     
-        19       1496 33101  35777 15R  P15_2    
-        19       1497 33101  36710 15L  S9_2     
-        19       1498 33101  37065 15R  S9_3     
-        19       1499 33101  36700 15L  S9_2     
-        19       1500 33101  37070 15R  S9_3     
-        19       1501 33101  36451 16L  S9_1     
-        19       1502 33101  36781 16R  S9_2     
-        19       1503 33101  36746 16L  S9_2     
-        19       1504 33101  36786 16R  S9_2     
-        19       1505 33101  36761 16L  S9_2     
-        19       1506 33101  35781 16R  P15_2    
-        19       1507 33101  36741 16L  S9_2     
-        19       1508 33101  36796 16R  S9_2     
-        19       1509 33101  36751 16L  S9_2     
-        19       1510 33101  36801 16R  S9_2     
-        19       1511 33101  36456 16L  S9_1     
-        19       1512 33101  36810 16R  S9_2     
-        19       1513 33101  36461 16L  S9_1     
-        19       1514 33101  36816 16R  S9_2     
-        19       1515 33101  36766 16L  S9_2     
-        19       1516 33101  36821 16R  S9_2     
-        19       1517 33101  36771 16L  S9_2     
-        19       1518 33101  36826 16R  S9_2     
-        19       1519 33101  35778 16L  P15_2    
-        19       1520 33101  35495 16R  P15_1    
-        19       1521 33101  36452 16L  S9_1     
-        19       1522 33101  36782 16R  S9_2     
-        19       1523 33101  36747 16L  S9_2     
-        19       1524 33101  36787 16R  S9_2     
-        19       1525 33101  36762 16L  S9_2     
-        19       1526 33101  36792 16R  S9_2     
-        19       1527 33101  36742 16L  S9_2     
-        19       1528 33101  36797 16R  S9_2     
-        19       1529 33101  36758 16L  S9_2     
-        19       1530 33101  36780 16R  S9_2     
-        19       1531 33101  36457 16L  S9_1     
-        19       1532 33101  36811 16R  S9_2     
-        19       1533 33101  36462 16L  S9_1     
-        19       1534 33101  36817 16R  S9_2     
-        19       1535 33101  36767 16L  S9_2     
-        19       1536 33101  36822 16R  S9_2     
-        19       1537 33101  36772 16L  S9_2     
-        19       1538 33101  36827 16R  S9_2     
-        19       1539 33101  36739 16L  S9_2     
-        19       1540 33101  36807 16R  S9_2     
-        19       1541 33101  36453 16L  S9_1     
-        19       1542 33101  36783 16R  S9_2     
-        19       1543 33101  36748 16L  S9_2     
-        19       1544 33101  36788 16R  S9_2     
-        19       1545 33101  36763 16L  S9_2     
-        19       1546 33101  36793 16R  S9_2     
-        19       1547 33101  36743 16L  S9_2     
-        19       1548 33101  36798 16R  S9_2     
-        19       1549 33101  36753 16L  S9_2     
-        19       1550 33101  36803 16R  S9_2     
-        19       1551 33101  36458 16L  S9_1     
-        19       1552 33101  36813 16R  S9_2     
-        19       1553 33101  36463 16L  S9_1     
-        19       1554 33101  36818 16R  S9_2     
-        19       1555 33101  36768 16L  S9_2     
-        19       1556 33101  36823 16R  S9_2     
-        19       1557 33101  36773 16L  S9_2     
-        19       1558 33101  36828 16R  S9_2     
-        19       1559 33101  36740 16L  S9_2     
-        19       1560 33101  36808 16R  S9_2     
-        19       1561 33101  36450 16L  S9_1     
-        19       1562 33101  36784 16R  S9_2     
-        19       1563 33101  36749 16L  S9_2     
-        19       1564 33101  36789 16R  S9_2     
-        19       1565 33101  36764 16L  S9_2     
-        19       1566 33101  36794 16R  S9_2     
-        19       1567 33101  36744 16L  S9_2     
-        19       1568 33101  36799 16R  S9_2     
-        19       1569 33101  36754 16L  S9_2     
-        19       1570 33101  36804 16R  S9_2     
-        19       1571 33101  36459 16L  S9_1     
-        19       1572 33101  36814 16R  S9_2     
-        19       1573 33101  36464 16L  S9_1     
-        19       1574 33101  36819 16R  S9_2     
-        19       1575 33101  36769 16L  S9_2     
-        19       1576 33101  36824 16R  S9_2     
-        19       1577 33101  36776 16L  S9_2     
-        19       1578 33101  36779 16R  S9_2     
-        19       1579 33101  36759 16L  S9_2     
-        19       1580 33101  36809 16R  S9_2     
-        19       1581 33101  36455 16L  S9_1     
-        19       1582 33101  36785 16R  S9_2     
-        19       1583 33101  36750 16L  S9_2     
-        19       1584 33101  36790 16R  S9_2     
-        19       1585 33101  36765 16L  S9_2     
-        19       1586 33101  36795 16R  S9_2     
-        19       1587 33101  36745 16L  S9_2     
-        19       1588 33101  36800 16R  S9_2     
-        19       1589 33101  36755 16L  S9_2     
-        19       1590 33101  36806 16R  S9_2     
-        19       1591 33101  36460 16L  S9_1     
-        19       1592 33101  36815 16R  S9_2     
-        19       1593 33101  36465 16L  S9_1     
-        19       1594 33101  36820 16R  S9_2     
-        19       1595 33101  36770 16L  S9_2     
-        19       1596 33101  36825 16R  S9_2     
-        19       1597 33101  36775 16L  S9_2     
-        19       1598 33101  36812 16R  S9_2     
-        19       1599 33101  36760 16L  S9_2     
-        19       1600 33101  35780 16R  P15_2    
-        19       1601 33101  36541 17L  S9_1     
-        19       1602 33101  36586 17R  S9_1     
-        19       1603 33101  36829 17L  S9_2     
-        19       1604 33101  36591 17R  S9_1     
-        19       1605 33101  36831 17L  S9_2     
-        19       1606 33101  36596 17R  S9_1     
-        19       1607 33101  36836 17L  S9_2     
-        19       1608 33101  36582 17R  S9_1     
-        19       1609 33101  36841 17L  S9_2     
-        19       1610 33101  35791 17R  P15_2    
-        19       1611 33101  36846 17L  S9_2     
-        19       1612 33101  35789 17R  P15_2    
-        19       1613 33101  36851 17L  S9_2     
-        19       1614 33101  36861 17R  S9_2     
-        19       1615 33101  36545 17L  S9_1     
-        19       1616 33101  36866 17R  S9_2     
-        19       1617 33101  37091 17L  S9_3     
-        19       1618 33101  36876 17R  S9_2     
-        19       1619 33101  37096 17L  S9_3     
-        19       1620 33101  36871 17R  S9_2     
-        19       1621 33101  36542 17L  S9_1     
-        19       1622 33101  36587 17R  S9_1     
-        19       1623 33101  35782 17L  P15_2    
-        19       1624 33101  36592 17R  S9_1     
-        19       1625 33101  36832 17L  S9_2     
-        19       1626 33101  36597 17R  S9_1     
-        19       1627 33101  36837 17L  S9_2     
-        19       1628 33101  35787 17R  P15_2    
-        19       1629 33101  36842 17L  S9_2     
-        19       1630 33101  35792 17R  P15_2    
-        19       1631 33101  36847 17L  S9_2     
-        19       1632 33101  36857 17R  S9_2     
-        19       1633 33101  36852 17L  S9_2     
-        19       1634 33101  36862 17R  S9_2     
-        19       1635 33101  36839 17L  S9_2     
-        19       1636 33101  36867 17R  S9_2     
-        19       1637 33101  37092 17L  S9_3     
-        19       1638 33101  36877 17R  S9_2     
-        19       1639 33101  37102 17L  S9_3     
-        19       1640 33101  36872 17R  S9_2     
-        19       1641 33101  36543 17L  S9_1     
-        19       1642 33101  36588 17R  S9_1     
-        19       1643 33101  35783 17L  P15_2    
-        19       1644 33101  36593 17R  S9_1     
-        19       1645 33101  36833 17L  S9_2     
-        19       1646 33101  36598 17R  S9_1     
-        19       1647 33101  36838 17L  S9_2     
-        19       1648 33101  35788 17R  P15_2    
-        19       1649 33101  36843 17L  S9_2     
-        19       1650 33101  35795 17R  P15_2    
-        19       1651 33101  36848 17L  S9_2     
-        19       1652 33101  36858 17R  S9_2     
-        19       1653 33101  36853 17L  S9_2     
-        19       1654 33101  36863 17R  S9_2     
-        19       1655 33101  36517 17L  S9_1     
-        19       1656 33101  36868 17R  S9_2     
-        19       1657 33101  37093 17L  S9_3     
-        19       1658 33101  36878 17R  S9_2     
-        19       1659 33101  37098 17L  S9_3     
-        19       1660 33101  36873 17R  S9_2     
-        19       1661 33101  36544 17L  S9_1     
-        19       1662 33101  36589 17R  S9_1     
-        19       1663 33101  35784 17L  P15_2    
-        19       1664 33101  36594 17R  S9_1     
-        19       1665 33101  36834 17L  S9_2     
-        19       1666 33101  36599 17R  S9_1     
-        19       1667 33101  36830 17L  S9_2     
-        19       1668 33101  36585 17R  S9_1     
-        19       1669 33101  36844 17L  S9_2     
-        19       1670 33101  35796 17R  P15_2    
-        19       1671 33101  36849 17L  S9_2     
-        19       1672 33101  36859 17R  S9_2     
-        19       1673 33101  36854 17L  S9_2     
-        19       1674 33101  36864 17R  S9_2     
-        19       1675 33101  36532 17L  S9_1     
-        19       1676 33101  36869 17R  S9_2     
-        19       1677 33101  37094 17L  S9_3     
-        19       1678 33101  36879 17R  S9_2     
-        19       1679 33101  37099 17L  S9_3     
-        19       1680 33101  36874 17R  S9_2     
-        19       1681 33101  36540 17L  S9_1     
-        19       1682 33101  36590 17R  S9_1     
-        19       1683 33101  35786 17L  P15_2    
-        19       1684 33101  36595 17R  S9_1     
-        19       1685 33101  36835 17L  S9_2     
-        19       1686 33101  36600 17R  S9_1     
-        19       1687 33101  36840 17L  S9_2     
-        19       1688 33101  35790 17R  P15_2    
-        19       1689 33101  36845 17L  S9_2     
-        19       1690 33101  36856 17R  S9_2     
-        19       1691 33101  36850 17L  S9_2     
-        19       1692 33101  36860 17R  S9_2     
-        19       1693 33101  36855 17L  S9_2     
-        19       1694 33101  36865 17R  S9_2     
-        19       1695 33101  36536 17L  S9_1     
-        19       1696 33101  36870 17R  S9_2     
-        19       1697 33101  37095 17L  S9_3     
-        19       1698 33101  36880 17R  S9_2     
-        19       1699 33101  37100 17L  S9_3     
-        19       1700 33101  35794 17R  P15_2    
-        20          1 33101  37476 1L   S9_4     
-        20          2 33101  33885 1R   S8_3     
-        20          3 33101  38291 1L   S9_6     
-        20          4 33101  30805 1R   S7_3     
-        20          5 33101  38701 1L   P016     
-        20          6 33101  38716 1R   P016     
-        20          7 33101  38706 1L   P016     
-        20          8 33101  38722 1R   P016     
-        20          9 33101  38711 1L   P016     
-        20         10 33101  38926 1R   P017     
-        20         11 33101  31818 1L   S07_5    
-        20         12 33101  38294 1R   S9_6     
-        20         13 33101  38281 1L   S9_6     
-        20         14 33101  38302 1R   S9_6     
-        20         15 33101  38286 1L   S9_6     
-        20         16 33101  38309 1R   S9_6     
-        20         17 33101  38909 1L   P017     
-        20         18 33101  33892 1R   S8_3     
-        20         19 33101  38921 1L   P017     
-        20         20 33101  41809 1R   P18      
-        20         21 33101  37477 1L   S9_4     
-        20         22 33101  37507 1R   S9_4     
-        20         23 33101  37482 1L   S9_4     
-        20         24 33101  37512 1R   S9_4     
-        20         25 33101  38702 1L   P016     
-        20         26 33101  38717 1R   P016     
-        20         27 33101  38707 1L   P016     
-        20         28 33101  38723 1R   P016     
-        20         29 33101  38712 1L   P016     
-        20         30 33101  38927 1R   P017     
-        20         31 33101  35008 1L   S8_5     
-        20         32 33101  38295 1R   S9_6     
-        20         33 33101  38282 1L   S9_6     
-        20         34 33101  38304 1R   S9_6     
-        20         35 33101  38287 1L   S9_6     
-        20         36 33101  38310 1R   S9_6     
-        20         37 33101  38917 1L   P017     
-        20         38 33101  35056 1R   S8_5     
-        20         39 33101  41802 1L   P18      
-        20         40 33101  41810 1R   P18      
-        20         41 33101  37478 1L   S9_4     
-        20         42 33101  37508 1R   S9_4     
-        20         43 33101  37483 1L   S9_4     
-        20         44 33101  37513 1R   S9_4     
-        20         45 33101  38703 1L   P016     
-        20         46 33101  38718 1R   P016     
-        20         47 33101  38708 1L   P016     
-        20         48 33101  36119 1R   S9_1     
-        20         49 33101  38713 1L   P016     
-        20         50 33101  38928 1R   P017     
-        20         51 33101  35028 1L   S8_5     
-        20         52 33101  38296 1R   S9_6     
-        20         53 33101  38283 1L   S9_6     
-        20         54 33101  38305 1R   S9_6     
-        20         55 33101  38288 1L   S9_6     
-        20         56 33101  38940 1R   P017     
-        20         57 33101  38918 1L   P017     
-        20         58 33101  41806 1R   P18      
-        20         59 33101  41803 1L   P18      
-        20         60 33101  40531 1R   S10_4    
-        20         61 33101  37475 1L   S9_4     
-        20         62 33101  37509 1R   S9_4     
-        20         63 33101  37484 1L   S9_4     
-        20         64 33101  37514 1R   S9_4     
-        20         65 33101  38704 1L   P016     
-        20         66 33101  36118 1R   S9_1     
-        20         67 33101  38709 1L   P016     
-        20         68 33101  37503 1R   S9_4     
-        20         69 33101  38714 1L   P016     
-        20         70 33101  38924 1R   P017     
-        20         71 33101  35037 1L   S8_5     
-        20         72 33101  38300 1R   S9_6     
-        20         73 33101  38284 1L   S9_6     
-        20         74 33101  38306 1R   S9_6     
-        20         75 33101  38289 1L   S9_6     
-        20         76 33101  38941 1R   P017     
-        20         77 33101  38919 1L   P017     
-        20         78 33101  41807 1R   P18      
-        20         79 33101  41804 1L   P18      
-        20         80 33101  40532 1R   S10_4    
-        20         81 33101  37480 1L   S9_4     
-        20         82 33101  37510 1R   S9_4     
-        20         83 33101  30801 1L   S7_3     
-        20         84 33101  37515 1R   S9_4     
-        20         85 33101  38705 1L   P016     
-        20         86 33101  38720 1R   P016     
-        20         87 33101  38710 1L   P016     
-        20         88 33101  38923 1R   P017     
-        20         89 33101  38901 1L   P017     
-        20         90 33101  38925 1R   P017     
-        20         91 33101  38922 1L   P017     
-        20         92 33101  38301 1R   S9_6     
-        20         93 33101  38285 1L   S9_6     
-        20         94 33101  38308 1R   S9_6     
-        20         95 33101  38290 1L   S9_6     
-        20         96 33101  38942 1R   P017     
-        20         97 33101  38920 1L   P017     
-        20         98 33101  41808 1R   P18      
-        20         99 33101  40501 1L   S10_4    
-        20        100 33101  40534 1R   S10_4    
-        20        101 33101  37551 2L   S9_4     
-        20        102 33101  37576 2R   S9_4     
-        20        103 33101  38726 2L   P016     
-        20        104 33101  38741 2R   P016     
-        20        105 33101  38736 2L   P016     
-        20        106 33101  38956 2R   P017     
-        20        107 33101  38732 2L   P016     
-        20        108 33101  38961 2R   P017     
-        20        109 33101  37556 2L   S9_4     
-        20        110 33101  37581 2R   S9_4     
-        20        111 33101  38311 2L   S9_6     
-        20        112 33101  38330 2R   S9_6     
-        20        113 33101  38317 2L   S9_6     
-        20        114 33101  38339 2R   S9_6     
-        20        115 33101  38323 2L   S9_6     
-        20        116 33101  38971 2R   P017     
-        20        117 33101  38314 2L   S9_6     
-        20        118 33101  30811 2R   S7_3     
-        20        119 33101  35420 2L   P15_1    
-        20        120 33101  38347 2R   S9_6     
-        20        121 33101  37552 2L   S9_4     
-        20        122 33101  37577 2R   S9_4     
-        20        123 33101  38734 2L   P016     
-        20        124 33101  38744 2R   P016     
-        20        125 33101  38737 2L   P016     
-        20        126 33101  38957 2R   P017     
-        20        127 33101  38733 2L   P016     
-        20        128 33101  38962 2R   P017     
-        20        129 33101  37557 2L   S9_4     
-        20        130 33101  37582 2R   S9_4     
-        20        131 33101  38312 2L   S9_6     
-        20        132 33101  38332 2R   S9_6     
-        20        133 33101  38318 2L   S9_6     
-        20        134 33101  38342 2R   S9_6     
-        20        135 33101  38324 2L   S9_6     
-        20        136 33101  38972 2R   P017     
-        20        137 33101  38319 2L   S9_6     
-        20        138 33101  31945 2R   S07_5    
-        20        139 33101  36123 2L   S9_1     
-        20        140 33101  38960 2R   P017     
-        20        141 33101  37553 2L   S9_4     
-        20        142 33101  37578 2R   S9_4     
-        20        143 33101  38728 2L   P016     
-        20        144 33101  38746 2R   P016     
-        20        145 33101  38738 2L   P016     
-        20        146 33101  38958 2R   P017     
-        20        147 33101  38943 2L   P017     
-        20        148 33101  38963 2R   P017     
-        20        149 33101  38325 2L   S9_6     
-        20        150 33101  37583 2R   S9_4     
-        20        151 33101  38313 2L   S9_6     
-        20        152 33101  38333 2R   S9_6     
-        20        153 33101  33925 2L   S8_3     
-        20        154 33101  38343 2R   S9_6     
-        20        155 33101  33954 2L   S8_3     
-        20        156 33101  38973 2R   P017     
-        20        157 33101  38320 2L   S9_6     
-        20        158 33101  31972 2R   S07_5    
-        20        159 33101  33948 2L   S8_3     
-        20        160 33101  38970 2R   P017     
-        20        161 33101  37554 2L   S9_4     
-        20        162 33101  37579 2R   S9_4     
-        20        163 33101  38729 2L   P016     
-        20        164 33101  38747 2R   P016     
-        20        165 33101  38739 2L   P016     
-        20        166 33101  38959 2R   P017     
-        20        167 33101  38944 2L   P017     
-        20        168 33101  38964 2R   P017     
-        20        169 33101  37559 2L   S9_4     
-        20        170 33101  37584 2R   S9_4     
-        20        171 33101  35100 2L   S8_5     
-        20        172 33101  38334 2R   S9_6     
-        20        173 33101  33946 2L   S8_3     
-        20        174 33101  38344 2R   S9_6     
-        20        175 33101  38326 2L   S9_6     
-        20        176 33101  38974 2R   P017     
-        20        177 33101  38328 2L   S9_6     
-        20        178 33101  35152 2R   S8_5     
-        20        179 33101  41812 2L   P18      
-        20        180 33101  38976 2R   P017     
-        20        181 33101  38735 2L   P016     
-        20        182 33101  37580 2R   S9_4     
-        20        183 33101  38730 2L   P016     
-        20        184 33101  38954 2R   P017     
-        20        185 33101  38740 2L   P016     
-        20        186 33101  38955 2R   P017     
-        20        187 33101  38945 2L   P017     
-        20        188 33101  38965 2R   P017     
-        20        189 33101  37560 2L   S9_4     
-        20        190 33101  37585 2R   S9_4     
-        20        191 33101  38315 2L   S9_6     
-        20        192 33101  38335 2R   S9_6     
-        20        193 33101  38321 2L   S9_6     
-        20        194 33101  38345 2R   S9_6     
-        20        195 33101  38327 2L   S9_6     
-        20        196 33101  38975 2R   P017     
-        20        197 33101  38329 2L   S9_6     
-        20        198 33101  35164 2R   S8_5     
-        20        199 33101  40561 2L   S10_4    
-        20        200 33101  30813 2R   S7_3     
-        20        201 33101  30223 3L   S7_2     
-        20        202 33101  32069 3R   S07_5    
-        20        203 33101  37590 3L   S9_4     
-        20        204 33101  37654 3R   S9_4     
-        20        205 33101  37621 3L   S9_4     
-        20        206 33101  37660 3R   S9_4     
-        20        207 33101  38351 3L   S9_6     
-        20        208 33101  39009 3R   P017     
-        20        209 33101  35194 3L   S8_5     
-        20        210 33101  38366 3R   S9_6     
-        20        211 33101  41831 3L   P18      
-        20        212 33101  26617 3R   S6_2     
-        20        213 33101  40001 3L   S10_3    
-        20        214 33101  29081 3R   P13      
-        20        215 33101  40006 3L   S10_3    
-        20        216 33101  41834 3R   P18      
-        20        217 33101  40011 3L   S10_3    
-        20        218 33101  41841 3R   P18      
-        20        219 33101  40016 3L   S10_3    
-        20        220 33101  41846 3R   P18      
-        20        221 33101  32041 3L   S07_5    
-        20        222 33101  32086 3R   S07_5    
-        20        223 33101  37597 3L   S9_4     
-        20        224 33101  37655 3R   S9_4     
-        20        225 33101  37622 3L   S9_4     
-        20        226 33101  38357 3R   S9_6     
-        20        227 33101  38352 3L   S9_6     
-        20        228 33101  38362 3R   S9_6     
-        20        229 33101  35195 3L   S8_5     
-        20        230 33101  38367 3R   S9_6     
-        20        231 33101  41833 3L   P18      
-        20        232 33101  39021 3R   P017     
-        20        233 33101  40002 3L   S10_3    
-        20        234 33101  41836 3R   P18      
-        20        235 33101  40007 3L   S10_3    
-        20        236 33101  41851 3R   P18      
-        20        237 33101  40012 3L   S10_3    
-        20        238 33101  41842 3R   P18      
-        20        239 33101  40017 3L   S10_3    
-        20        240 33101  41847 3R   P18      
-        20        241 33101  33304 3L   S8_2     
-        20        242 33101  35445 3R   P15_1    
-        20        243 33101  37617 3L   S9_4     
-        20        244 33101  37656 3R   S9_4     
-        20        245 33101  37623 3L   S9_4     
-        20        246 33101  38358 3R   S9_6     
-        20        247 33101  38353 3L   S9_6     
-        20        248 33101  38363 3R   S9_6     
-        20        249 33101  36142 3L   S9_1     
-        20        250 33101  39020 3R   P017     
-        20        251 33101  40021 3L   S10_3    
-        20        252 33101  39022 3R   P017     
-        20        253 33101  40003 3L   S10_3    
-        20        254 33101  41837 3R   P18      
-        20        255 33101  40008 3L   S10_3    
-        20        256 33101  41852 3R   P18      
-        20        257 33101  40013 3L   S10_3    
-        20        258 33101  41843 3R   P18      
-        20        259 33101  40018 3L   S10_3    
-        20        260 33101  41848 3R   P18      
-        20        261 33101  38350 3L   S9_6     
-        20        262 33101  37650 3R   S9_4     
-        20        263 33101  37619 3L   S9_4     
-        20        264 33101  37658 3R   S9_4     
-        20        265 33101  37624 3L   S9_4     
-        20        266 33101  38359 3R   S9_6     
-        20        267 33101  38354 3L   S9_6     
-        20        268 33101  38364 3R   S9_6     
-        20        269 33101  36143 3L   S9_1     
-        20        270 33101  39026 3R   P017     
-        20        271 33101  40023 3L   S10_3    
-        20        272 33101  39024 3R   P017     
-        20        273 33101  40004 3L   S10_3    
-        20        274 33101  41838 3R   P18      
-        20        275 33101  40009 3L   S10_3    
-        20        276 33101  41853 3R   P18      
-        20        277 33101  40014 3L   S10_3    
-        20        278 33101  41844 3R   P18      
-        20        279 33101  40019 3L   S10_3    
-        20        280 33101  41849 3R   P18      
-        20        281 33101  38356 3L   S9_6     
-        20        282 33101  32063 3R   S07_5    
-        20        283 33101  37620 3L   S9_4     
-        20        284 33101  35446 3R   P15_1    
-        20        285 33101  37625 3L   S9_4     
-        20        286 33101  38360 3R   S9_6     
-        20        287 33101  38355 3L   S9_6     
-        20        288 33101  38365 3R   S9_6     
-        20        289 33101  35233 3L   S8_5     
-        20        290 33101  39028 3R   P017     
-        20        291 33101  40024 3L   S10_3    
-        20        292 33101  29090 3R   P13      
-        20        293 33101  40005 3L   S10_3    
-        20        294 33101  41839 3R   P18      
-        20        295 33101  40010 3L   S10_3    
-        20        296 33101  41835 3R   P18      
-        20        297 33101  40015 3L   S10_3    
-        20        298 33101  41845 3R   P18      
-        20        299 33101  40020 3L   S10_3    
-        20        300 33101  41850 3R   P18      
-        20        301 33101  37700 4L   S9_4     
-        20        302 33101  37732 4R   S9_4     
-        20        303 33101  38375 4L   S9_6     
-        20        304 33101  39069 4R   P017     
-        20        305 33101  38381 4L   S9_6     
-        20        306 33101  41876 4R   P18      
-        20        307 33101  38372 4L   S9_6     
-        20        308 33101  37746 4R   S9_4     
-        20        309 33101  39051 4L   P017     
-        20        310 33101  40061 4R   S10_3    
-        20        311 33101  37711 4L   S9_4     
-        20        312 33101  40066 4R   S10_3    
-        20        313 33101  30246 4L   S7_2     
-        20        314 33101  40071 4R   S10_3    
-        20        315 33101  40046 4L   S10_3    
-        20        316 33101  40076 4R   S10_3    
-        20        317 33101  40037 4L   S10_3    
-        20        318 33101  40081 4R   S10_3    
-        20        319 33101  40042 4L   S10_3    
-        20        320 33101  40087 4R   S10_3    
-        20        321 33101  37702 4L   S9_4     
-        20        322 33101  37740 4R   S9_4     
-        20        323 33101  38377 4L   S9_6     
-        20        324 33101  39091 4R   P017     
-        20        325 33101  38382 4L   S9_6     
-        20        326 33101  41877 4R   P18      
-        20        327 33101  37707 4L   S9_4     
-        20        328 33101  37747 4R   S9_4     
-        20        329 33101  39052 4L   P017     
-        20        330 33101  40062 4R   S10_3    
-        20        331 33101  37712 4L   S9_4     
-        20        332 33101  40067 4R   S10_3    
-        20        333 33101  38371 4L   S9_6     
-        20        334 33101  40072 4R   S10_3    
-        20        335 33101  40048 4L   S10_3    
-        20        336 33101  40077 4R   S10_3    
-        20        337 33101  40038 4L   S10_3    
-        20        338 33101  40082 4R   S10_3    
-        20        339 33101  40043 4L   S10_3    
-        20        340 33101  40089 4R   S10_3    
-        20        341 33101  37703 4L   S9_4     
-        20        342 33101  37741 4R   S9_4     
-        20        343 33101  38378 4L   S9_6     
-        20        344 33101  39092 4R   P017     
-        20        345 33101  38383 4L   S9_6     
-        20        346 33101  41878 4R   P18      
-        20        347 33101  37708 4L   S9_4     
-        20        348 33101  37748 4R   S9_4     
-        20        349 33101  39053 4L   P017     
-        20        350 33101  40063 4R   S10_3    
-        20        351 33101  37713 4L   S9_4     
-        20        352 33101  40060 4R   S10_3    
-        20        353 33101  35304 4L   S8_5     
-        20        354 33101  40073 4R   S10_3    
-        20        355 33101  40049 4L   S10_3    
-        20        356 33101  40078 4R   S10_3    
-        20        357 33101  40039 4L   S10_3    
-        20        358 33101  40083 4R   S10_3    
-        20        359 33101  40044 4L   S10_3    
-        20        360 33101  40090 4R   S10_3    
-        20        361 33101  37704 4L   S9_4     
-        20        362 33101  37743 4R   S9_4     
-        20        363 33101  38379 4L   S9_6     
-        20        364 33101  33454 4R   S8_2     
-        20        365 33101  38384 4L   S9_6     
-        20        366 33101  41879 4R   P18      
-        20        367 33101  37709 4L   S9_4     
-        20        368 33101  37749 4R   S9_4     
-        20        369 33101  39054 4L   P017     
-        20        370 33101  40065 4R   S10_3    
-        20        371 33101  37714 4L   S9_4     
-        20        372 33101  40069 4R   S10_3    
-        20        373 33101  41871 4L   P18      
-        20        374 33101  40074 4R   S10_3    
-        20        375 33101  40050 4L   S10_3    
-        20        376 33101  40079 4R   S10_3    
-        20        377 33101  40040 4L   S10_3    
-        20        378 33101  40085 4R   S10_3    
-        20        379 33101  40045 4L   S10_3    
-        20        380 33101  40091 4R   S10_3    
-        20        381 33101  33419 4L   S8_2     
-        20        382 33101  37745 4R   S9_4     
-        20        383 33101  38380 4L   S9_6     
-        20        384 33101  41875 4R   P18      
-        20        385 33101  38373 4L   S9_6     
-        20        386 33101  41880 4R   P18      
-        20        387 33101  37710 4L   S9_4     
-        20        388 33101  37750 4R   S9_4     
-        20        389 33101  38385 4L   S9_6     
-        20        390 33101  40059 4R   S10_3    
-        20        391 33101  37715 4L   S9_4     
-        20        392 33101  40070 4R   S10_3    
-        20        393 33101  41872 4L   P18      
-        20        394 33101  40075 4R   S10_3    
-        20        395 33101  40036 4L   S10_3    
-        20        396 33101  40080 4R   S10_3    
-        20        397 33101  40041 4L   S10_3    
-        20        398 33101  40086 4R   S10_3    
-        20        399 33101  40056 4L   S10_3    
-        20        400 33101  40092 4R   S10_3    
-        20        401 33101  30269 5L   S7_2     
-        20        402 33101  27010 5R   S6_2b    
-        20        403 33101  37791 5L   S9_4     
-        20        404 33101  37831 5R   S9_4     
-        20        405 33101  37755 5L   S9_4     
-        20        406 33101  37840 5R   S9_4     
-        20        407 33101  38397 5L   S9_6     
-        20        408 33101  30313 5R   S7_2     
-        20        409 33101  38391 5L   S9_6     
-        20        410 33101  32348 5R   P14      
-        20        411 33101  38401 5L   S9_6     
-        20        412 33101  39144 5R   P017     
-        20        413 33101  38406 5L   S9_6     
-        20        414 33101  40141 5R   S10_3    
-        20        415 33101  39096 5L   P017     
-        20        416 33101  40106 5R   S10_3    
-        20        417 33101  38396 5L   S9_6     
-        20        418 33101  40111 5R   S10_3    
-        20        419 33101  39106 5L   P017     
-        20        420 33101  40121 5R   S10_3    
-        20        421 33101  37767 5L   S9_4     
-        20        422 33101  39142 5R   P017     
-        20        423 33101  37792 5L   S9_4     
-        20        424 33101  37832 5R   S9_4     
-        20        425 33101  37797 5L   S9_4     
-        20        426 33101  37839 5R   S9_4     
-        20        427 33101  38387 5L   S9_6     
-        20        428 33101  26798 5R   S6_2     
-        20        429 33101  38392 5L   S9_6     
-        20        430 33101  32349 5R   P14      
-        20        431 33101  38402 5L   S9_6     
-        20        432 33101  39145 5R   P017     
-        20        433 33101  38407 5L   S9_6     
-        20        434 33101  40102 5R   S10_3    
-        20        435 33101  39097 5L   P017     
-        20        436 33101  40107 5R   S10_3    
-        20        437 33101  39102 5L   P017     
-        20        438 33101  40112 5R   S10_3    
-        20        439 33101  39107 5L   P017     
-        20        440 33101  40122 5R   S10_3    
-        20        441 33101  32342 5L   P14      
-        20        442 33101  37828 5R   S9_4     
-        20        443 33101  37793 5L   S9_4     
-        20        444 33101  37833 5R   S9_4     
-        20        445 33101  37798 5L   S9_4     
-        20        446 33101  37838 5R   S9_4     
-        20        447 33101  38388 5L   S9_6     
-        20        448 33101  32257 5R   S07_5    
-        20        449 33101  38393 5L   S9_6     
-        20        450 33101  35348 5R   S8_5     
-        20        451 33101  38403 5L   S9_6     
-        20        452 33101  40142 5R   S10_3    
-        20        453 33101  38408 5L   S9_6     
-        20        454 33101  40103 5R   S10_3    
-        20        455 33101  39098 5L   P017     
-        20        456 33101  40108 5R   S10_3    
-        20        457 33101  39103 5L   P017     
-        20        458 33101  40113 5R   S10_3    
-        20        459 33101  39108 5L   P017     
-        20        460 33101  40118 5R   S10_3    
-        20        461 33101  37789 5L   S9_4     
-        20        462 33101  37829 5R   S9_4     
-        20        463 33101  37794 5L   S9_4     
-        20        464 33101  37834 5R   S9_4     
-        20        465 33101  37799 5L   S9_4     
-        20        466 33101  37837 5R   S9_4     
-        20        467 33101  38389 5L   S9_6     
-        20        468 33101  32282 5R   S07_5    
-        20        469 33101  38394 5L   S9_6     
-        20        470 33101  35703 5R   P15_2    
-        20        471 33101  38404 5L   S9_6     
-        20        472 33101  40143 5R   S10_3    
-        20        473 33101  33492 5L   S8_2     
-        20        474 33101  40104 5R   S10_3    
-        20        475 33101  39099 5L   P017     
-        20        476 33101  40109 5R   S10_3    
-        20        477 33101  39104 5L   P017     
-        20        478 33101  40114 5R   S10_3    
-        20        479 33101  39110 5L   P017     
-        20        480 33101  40119 5R   S10_3    
-        20        481 33101  37790 5L   S9_4     
-        20        482 33101  37830 5R   S9_4     
-        20        483 33101  37795 5L   S9_4     
-        20        484 33101  37835 5R   S9_4     
-        20        485 33101  37800 5L   S9_4     
-        20        486 33101  37836 5R   S9_4     
-        20        487 33101  38390 5L   S9_6     
-        20        488 33101  32346 5R   P14      
-        20        489 33101  38395 5L   S9_6     
-        20        490 33101  38420 5R   S9_6     
-        20        491 33101  38405 5L   S9_6     
-        20        492 33101  40144 5R   S10_3    
-        20        493 33101  33500 5L   S8_2     
-        20        494 33101  40105 5R   S10_3    
-        20        495 33101  39100 5L   P017     
-        20        496 33101  40110 5R   S10_3    
-        20        497 33101  39105 5L   P017     
-        20        498 33101  40115 5R   S10_3    
-        20        499 33101  39111 5L   P017     
-        20        500 33101  40120 5R   S10_3    
-        20        501 33101  37871 6L   S9_5     
-        20        502 33101  40345 6R   S10_3    
-        20        503 33101  37861 6L   S9_5     
-        20        504 33101  38860 6R   S9_4     
-        20        505 33101  37866 6L   S9_5     
-        20        506 33101  37901 6R   S9_5     
-        20        507 33101  37846 6L   P17      
-        20        508 33101  37896 6R   S9_5     
-        20        509 33101  37841 6L   P17      
-        20        510 33101  37891 6R   S9_5     
-        20        511 33101  35503 6L   P15_1    
-        20        512 33101  38855 6R   S9_4     
-        20        513 33101  37856 6L   S9_4     
-        20        514 33101  38850 6R   P17      
-        20        515 33101  35506 6L   P15_1    
-        20        516 33101  35563 6R   P15_1    
-        20        517 33101  35505 6L   P15_1    
-        20        518 33101  35618 6R   P15_1    
-        20        519 33101  35553 6L   P15_1    
-        20        520 33101  35568 6R   P15_1    
-        20        521 33101  37872 6L   S9_5     
-        20        522 33101  40352 6R   S10_3    
-        20        523 33101  37862 6L   S9_5     
-        20        524 33101  38861 6R   S9_4     
-        20        525 33101  37867 6L   S9_5     
-        20        526 33101  37902 6R   S9_5     
-        20        527 33101  37847 6L   P17      
-        20        528 33101  37897 6R   S9_5     
-        20        529 33101  37842 6L   P17      
-        20        530 33101  37892 6R   S9_5     
-        20        531 33101  35504 6L   P15_1    
-        20        532 33101  38856 6R   S9_4     
-        20        533 33101  37857 6L   S9_4     
-        20        534 33101  38851 6R   P17      
-        20        535 33101  35558 6L   P15_1    
-        20        536 33101  35582 6R   P15_1    
-        20        537 33101  35548 6L   P15_1    
-        20        538 33101  35619 6R   P15_1    
-        20        539 33101  35554 6L   P15_1    
-        20        540 33101  35573 6R   P15_1    
-        20        541 33101  37873 6L   S9_5     
-        20        542 33101  40353 6R   S10_3    
-        20        543 33101  37863 6L   S9_5     
-        20        544 33101  38862 6R   S9_4     
-        20        545 33101  37868 6L   S9_5     
-        20        546 33101  37903 6R   S9_5     
-        20        547 33101  37848 6L   P17      
-        20        548 33101  37898 6R   S9_5     
-        20        549 33101  37843 6L   P17      
-        20        550 33101  37893 6R   S9_5     
-        20        551 33101  35507 6L   P15_1    
-        20        552 33101  38857 6R   S9_4     
-        20        553 33101  37858 6L   S9_4     
-        20        554 33101  38852 6R   P17      
-        20        555 33101  35559 6L   P15_1    
-        20        556 33101  35586 6R   P15_1    
-        20        557 33101  35549 6L   P15_1    
-        20        558 33101  35620 6R   P15_1    
-        20        559 33101  35555 6L   P15_1    
-        20        560 33101  35583 6R   P15_1    
-        20        561 33101  37874 6L   S9_5     
-        20        562 33101  40354 6R   S10_3    
-        20        563 33101  37864 6L   S9_5     
-        20        564 33101  38863 6R   S9_4     
-        20        565 33101  37869 6L   S9_5     
-        20        566 33101  37904 6R   S9_5     
-        20        567 33101  37849 6L   P17      
-        20        568 33101  37899 6R   S9_5     
-        20        569 33101  37844 6L   P17      
-        20        570 33101  37894 6R   S9_5     
-        20        571 33101  35550 6L   P15_1    
-        20        572 33101  38858 6R   S9_4     
-        20        573 33101  37859 6L   S9_4     
-        20        574 33101  38853 6R   P17      
-        20        575 33101  35561 6L   P15_1    
-        20        576 33101  34213 6R   P14      
-        20        577 33101  35551 6L   P15_1    
-        20        578 33101  35621 6R   P15_1    
-        20        579 33101  35556 6L   P15_1    
-        20        580 33101  35585 6R   P15_1    
-        20        581 33101  37875 6L   S9_5     
-        20        582 33101  40355 6R   S10_3    
-        20        583 33101  37865 6L   S9_5     
-        20        584 33101  34259 6R   P14      
-        20        585 33101  37870 6L   S9_5     
-        20        586 33101  37905 6R   S9_5     
-        20        587 33101  37850 6L   P17      
-        20        588 33101  37900 6R   S9_5     
-        20        589 33101  37845 6L   P17      
-        20        590 33101  37895 6R   S9_5     
-        20        591 33101  35560 6L   P15_1    
-        20        592 33101  38859 6R   S9_4     
-        20        593 33101  37860 6L   S9_4     
-        20        594 33101  38854 6R   S9_4     
-        20        595 33101  35562 6L   P15_1    
-        20        596 33101  34212 6R   P14      
-        20        597 33101  35552 6L   P15_1    
-        20        598 33101  35566 6R   P15_1    
-        20        599 33101  35557 6L   P15_1    
-        20        600 33101  35593 6R   P15_1    
-        20        601 33101  37934 7L   S9_5     
-        20        602 33101  41985 7R   P18      
-        20        603 33101  37939 7L   S9_5     
-        20        604 33101  40383 7R   S10_3    
-        20        605 33101  37919 7L   S9_5     
-        20        606 33101  40393 7R   S10_3    
-        20        607 33101  37929 7L   S9_5     
-        20        608 33101  40388 7R   S10_3    
-        20        609 33101  37924 7L   S9_5     
-        20        610 33101  37957 7R   S9_5     
-        20        611 33101  37914 7L   S9_5     
-        20        612 33101  37952 7R   S9_5     
-        20        613 33101  37909 7L   S9_5     
-        20        614 33101  37947 7R   S9_5     
-        20        615 33101  35844 7L   P15_2    
-        20        616 33101  37942 7R   S9_5     
-        20        617 33101  35848 7L   P15_2    
-        20        618 33101  35879 7R   P15_2    
-        20        619 33101  35850 7L   P15_2    
-        20        620 33101  35860 7R   P15_2    
-        20        621 33101  37935 7L   S9_5     
-        20        622 33101  41986 7R   P18      
-        20        623 33101  37940 7L   S9_5     
-        20        624 33101  40384 7R   S10_3    
-        20        625 33101  37920 7L   S9_5     
-        20        626 33101  40394 7R   S10_3    
-        20        627 33101  37930 7L   S9_5     
-        20        628 33101  40389 7R   S10_3    
-        20        629 33101  37925 7L   S9_5     
-        20        630 33101  37958 7R   S9_5     
-        20        631 33101  37915 7L   S9_5     
-        20        632 33101  37953 7R   S9_5     
-        20        633 33101  37910 7L   S9_5     
-        20        634 33101  37948 7R   S9_5     
-        20        635 33101  35845 7L   P15_2    
-        20        636 33101  37943 7R   S9_5     
-        20        637 33101  35827 7L   P15_2    
-        20        638 33101  35880 7R   P15_2    
-        20        639 33101  35851 7L   P15_2    
-        20        640 33101  35864 7R   P15_2    
-        20        641 33101  37936 7L   S9_5     
-        20        642 33101  41987 7R   P18      
-        20        643 33101  37941 7L   S9_5     
-        20        644 33101  40385 7R   S10_3    
-        20        645 33101  37921 7L   S9_5     
-        20        646 33101  40395 7R   S10_3    
-        20        647 33101  37931 7L   S9_5     
-        20        648 33101  40390 7R   S10_3    
-        20        649 33101  37926 7L   S9_5     
-        20        650 33101  37959 7R   S9_5     
-        20        651 33101  37916 7L   S9_5     
-        20        652 33101  37954 7R   S9_5     
-        20        653 33101  37911 7L   S9_5     
-        20        654 33101  37949 7R   S9_5     
-        20        655 33101  35847 7L   P15_2    
-        20        656 33101  37944 7R   S9_5     
-        20        657 33101  35830 7L   P15_2    
-        20        658 33101  35625 7R   P15_1    
-        20        659 33101  35852 7L   P15_2    
-        20        660 33101  35865 7R   P15_2    
-        20        661 33101  37937 7L   S9_5     
-        20        662 33101  41988 7R   P18      
-        20        663 33101  35855 7L   P15_2    
-        20        664 33101  40386 7R   S10_3    
-        20        665 33101  37922 7L   S9_5     
-        20        666 33101  40396 7R   S10_3    
-        20        667 33101  37932 7L   S9_5     
-        20        668 33101  40391 7R   S10_3    
-        20        669 33101  37927 7L   S9_5     
-        20        670 33101  37950 7R   S9_5     
-        20        671 33101  37917 7L   S9_5     
-        20        672 33101  37955 7R   S9_5     
-        20        673 33101  37912 7L   S9_5     
-        20        674 33101  35645 7R   P15_1    
-        20        675 33101  35849 7L   P15_2    
-        20        676 33101  37945 7R   S9_5     
-        20        677 33101  35832 7L   P15_2    
-        20        678 33101  35874 7R   P15_2    
-        20        679 33101  35853 7L   P15_2    
-        20        680 33101  35866 7R   P15_2    
-        20        681 33101  37938 7L   S9_5     
-        20        682 33101  41989 7R   P18      
-        20        683 33101  35856 7L   P15_2    
-        20        684 33101  40387 7R   S10_3    
-        20        685 33101  37923 7L   S9_5     
-        20        686 33101  40397 7R   S10_3    
-        20        687 33101  37933 7L   S9_5     
-        20        688 33101  40392 7R   S10_3    
-        20        689 33101  37928 7L   S9_5     
-        20        690 33101  37951 7R   S9_5     
-        20        691 33101  37918 7L   S9_5     
-        20        692 33101  37956 7R   S9_5     
-        20        693 33101  37913 7L   S9_5     
-        20        694 33101  35649 7R   P15_1    
-        20        695 33101  35826 7L   P15_2    
-        20        696 33101  37946 7R   S9_5     
-        20        697 33101  35834 7L   P15_2    
-        20        698 33101  35878 7R   P15_2    
-        20        699 33101  35854 7L   P15_2    
-        20        700 33101  35867 7R   P15_2    
-        20        701 33101  38000 8L   S9_5     
-        20        702 33101  38031 8R   S9_5     
-        20        703 33101  37995 8L   S9_5     
-        20        704 33101  38033 8R   S9_5     
-        20        705 33101  37990 8L   S9_5     
-        20        706 33101  38032 8R   S9_5     
-        20        707 33101  37980 8L   S9_5     
-        20        708 33101  38048 8R   S9_5     
-        20        709 33101  37985 8L   S9_5     
-        20        710 33101  38043 8R   S9_5     
-        20        711 33101  37975 8L   S9_5     
-        20        712 33101  38023 8R   S9_5     
-        20        713 33101  37970 8L   S9_5     
-        20        714 33101  38013 8R   S9_5     
-        20        715 33101  37960 8L   S9_5     
-        20        716 33101  36887 8R   S9_2     
-        20        717 33101  35662 8L   P15_1    
-        20        718 33101  35985 8R   P15_2    
-        20        719 33101  35884 8L   P15_2    
-        20        720 33101  36882 8R   S9_2     
-        20        721 33101  38001 8L   S9_5     
-        20        722 33101  38053 8R   S9_5     
-        20        723 33101  37996 8L   S9_5     
-        20        724 33101  38034 8R   S9_5     
-        20        725 33101  37991 8L   S9_5     
-        20        726 33101  38038 8R   S9_5     
-        20        727 33101  37981 8L   S9_5     
-        20        728 33101  38049 8R   S9_5     
-        20        729 33101  37986 8L   S9_5     
-        20        730 33101  38044 8R   S9_5     
-        20        731 33101  37976 8L   S9_5     
-        20        732 33101  38024 8R   S9_5     
-        20        733 33101  37971 8L   S9_5     
-        20        734 33101  38014 8R   S9_5     
-        20        735 33101  37961 8L   S9_5     
-        20        736 33101  36888 8R   S9_2     
-        20        737 33101  35663 8L   P15_1    
-        20        738 33101  35986 8R   P15_2    
-        20        739 33101  35885 8L   P15_2    
-        20        740 33101  36883 8R   S9_2     
-        20        741 33101  38002 8L   S9_5     
-        20        742 33101  38054 8R   S9_5     
-        20        743 33101  37997 8L   S9_5     
-        20        744 33101  38035 8R   S9_5     
-        20        745 33101  37992 8L   S9_5     
-        20        746 33101  38039 8R   S9_5     
-        20        747 33101  37982 8L   S9_5     
-        20        748 33101  38050 8R   S9_5     
-        20        749 33101  37987 8L   S9_5     
-        20        750 33101  38045 8R   S9_5     
-        20        751 33101  37977 8L   S9_5     
-        20        752 33101  38025 8R   S9_5     
-        20        753 33101  37972 8L   S9_5     
-        20        754 33101  38015 8R   S9_5     
-        20        755 33101  37962 8L   S9_5     
-        20        756 33101  36889 8R   S9_2     
-        20        757 33101  35664 8L   P15_1    
-        20        758 33101  35987 8R   P15_2    
-        20        759 33101  35889 8L   P15_2    
-        20        760 33101  36884 8R   S9_2     
-        20        761 33101  38003 8L   S9_5     
-        20        762 33101  38056 8R   S9_5     
-        20        763 33101  37998 8L   S9_5     
-        20        764 33101  38036 8R   S9_5     
-        20        765 33101  37993 8L   S9_5     
-        20        766 33101  38041 8R   S9_5     
-        20        767 33101  37983 8L   S9_5     
-        20        768 33101  38051 8R   S9_5     
-        20        769 33101  37988 8L   S9_5     
-        20        770 33101  38046 8R   S9_5     
-        20        771 33101  37978 8L   S9_5     
-        20        772 33101  38026 8R   S9_5     
-        20        773 33101  37973 8L   S9_5     
-        20        774 33101  38016 8R   S9_5     
-        20        775 33101  37963 8L   S9_5     
-        20        776 33101  36890 8R   S9_2     
-        20        777 33101  35895 8L   P15_2    
-        20        778 33101  35988 8R   P15_2    
-        20        779 33101  35890 8L   P15_2    
-        20        780 33101  36885 8R   S9_2     
-        20        781 33101  38004 8L   S9_5     
-        20        782 33101  38057 8R   S9_5     
-        20        783 33101  37999 8L   S9_5     
-        20        784 33101  38037 8R   S9_5     
-        20        785 33101  37994 8L   S9_5     
-        20        786 33101  38042 8R   S9_5     
-        20        787 33101  37984 8L   S9_5     
-        20        788 33101  38052 8R   S9_5     
-        20        789 33101  37989 8L   S9_5     
-        20        790 33101  38047 8R   S9_5     
-        20        791 33101  37979 8L   S9_5     
-        20        792 33101  38027 8R   S9_5     
-        20        793 33101  37974 8L   S9_5     
-        20        794 33101  38017 8R   S9_5     
-        20        795 33101  37964 8L   S9_5     
-        20        796 33101  38864 8R   P16      
-        20        797 33101  35897 8L   P15_2    
-        20        798 33101  36881 8R   S9_2     
-        20        799 33101  35891 8L   P15_2    
-        20        800 33101  36886 8R   S9_2     
-        20        801 33101  42008 9L   P18      
-        20        802 33101  42012 9R   P18      
-        20        803 33101  38059 9L   S9_5     
-        20        804 33101  42027 9R   P18      
-        20        805 33101  38063 9L   S9_5     
-        20        806 33101  38114 9R   S9_5     
-        20        807 33101  38079 9L   S9_5     
-        20        808 33101  38094 9R   S9_5     
-        20        809 33101  38069 9L   S9_5     
-        20        810 33101  38099 9R   S9_5     
-        20        811 33101  38089 9L   S9_5     
-        20        812 33101  38104 9R   S9_5     
-        20        813 33101  38074 9L   S9_5     
-        20        814 33101  38109 9R   S9_5     
-        20        815 33101  38064 9L   S9_5     
-        20        816 33101  30553 9R   S7_2     
-        20        817 33101  36909 9L   S9_2     
-        20        818 33101  36961 9R   S9_2     
-        20        819 33101  38866 9L   P16      
-        20        820 33101  35993 9R   P15_2    
-        20        821 33101  42009 9L   P18      
-        20        822 33101  42013 9R   P18      
-        20        823 33101  38060 9L   S9_5     
-        20        824 33101  40418 9R   S10_3    
-        20        825 33101  38085 9L   S9_5     
-        20        826 33101  38115 9R   S9_5     
-        20        827 33101  38080 9L   S9_5     
-        20        828 33101  38095 9R   S9_5     
-        20        829 33101  38070 9L   S9_5     
-        20        830 33101  38100 9R   S9_5     
-        20        831 33101  38090 9L   S9_5     
-        20        832 33101  38105 9R   S9_5     
-        20        833 33101  38075 9L   S9_5     
-        20        834 33101  38110 9R   S9_5     
-        20        835 33101  38065 9L   S9_5     
-        20        836 33101  30555 9R   S7_2     
-        20        837 33101  36910 9L   S9_2     
-        20        838 33101  36951 9R   S9_2     
-        20        839 33101  38867 9L   P16      
-        20        840 33101  35994 9R   P15_2    
-        20        841 33101  42010 9L   P18      
-        20        842 33101  42014 9R   P18      
-        20        843 33101  38072 9L   S9_5     
-        20        844 33101  40419 9R   S10_3    
-        20        845 33101  38086 9L   S9_5     
-        20        846 33101  38116 9R   S9_5     
-        20        847 33101  38081 9L   S9_5     
-        20        848 33101  38096 9R   S9_5     
-        20        849 33101  38071 9L   S9_5     
-        20        850 33101  38101 9R   S9_5     
-        20        851 33101  38091 9L   S9_5     
-        20        852 33101  38106 9R   S9_5     
-        20        853 33101  38076 9L   S9_5     
-        20        854 33101  38111 9R   S9_5     
-        20        855 33101  38066 9L   S9_5     
-        20        856 33101  36950 9R   S9_2     
-        20        857 33101  36911 9L   S9_2     
-        20        858 33101  36952 9R   S9_2     
-        20        859 33101  38868 9L   P16      
-        20        860 33101  35996 9R   P15_2    
-        20        861 33101  42011 9L   P18      
-        20        862 33101  42015 9R   P18      
-        20        863 33101  38083 9L   S9_5     
-        20        864 33101  40420 9R   S10_3    
-        20        865 33101  38087 9L   S9_5     
-        20        866 33101  38117 9R   S9_5     
-        20        867 33101  38082 9L   S9_5     
-        20        868 33101  38097 9R   S9_5     
-        20        869 33101  38073 9L   S9_5     
-        20        870 33101  38102 9R   S9_5     
-        20        871 33101  38092 9L   S9_5     
-        20        872 33101  38107 9R   S9_5     
-        20        873 33101  38077 9L   S9_5     
-        20        874 33101  38112 9R   S9_5     
-        20        875 33101  38067 9L   S9_5     
-        20        876 33101  36003 9R   P15_2    
-        20        877 33101  36912 9L   S9_2     
-        20        878 33101  36953 9R   S9_2     
-        20        879 33101  36897 9L   S9_2     
-        20        880 33101  36004 9R   P15_2    
-        20        881 33101  40402 9L   S10_3    
-        20        882 33101  42017 9R   P18      
-        20        883 33101  38084 9L   S9_5     
-        20        884 33101  40421 9R   S10_3    
-        20        885 33101  38088 9L   S9_5     
-        20        886 33101  38871 9R   P16      
-        20        887 33101  38062 9L   S9_5     
-        20        888 33101  38098 9R   S9_5     
-        20        889 33101  38061 9L   S9_5     
-        20        890 33101  38103 9R   S9_5     
-        20        891 33101  38093 9L   S9_5     
-        20        892 33101  38108 9R   S9_5     
-        20        893 33101  38078 9L   S9_5     
-        20        894 33101  38113 9R   S9_5     
-        20        895 33101  38068 9L   S9_5     
-        20        896 33101  35675 9R   P15_1    
-        20        897 33101  36902 9L   S9_2     
-        20        898 33101  36954 9R   S9_2     
-        20        899 33101  35670 9L   P15_1    
-        20        900 33101  36960 9R   S9_2     
-        20        901 33101  26819 10L  S6_2a    
-        20        902 33101  39906 10R  S10_2    
-        20        903 33101  39896 10L  S10_2    
-        20        904 33101  40439 10R  S10_3    
-        20        905 33101  40429 10L  S10_3    
-        20        906 33101  40434 10R  S10_3    
-        20        907 33101  42032 10L  P18      
-        20        908 33101  42049 10R  P18      
-        20        909 33101  42038 10L  P18      
-        20        910 33101  42039 10R  P18      
-        20        911 33101  38137 10L  S9_6     
-        20        912 33101  38143 10R  S9_5     
-        20        913 33101  38118 10L  S9_6     
-        20        914 33101  38138 10R  S9_5     
-        20        915 33101  38123 10L  S9_6     
-        20        916 33101  38153 10R  S9_6     
-        20        917 33101  38133 10L  S9_6     
-        20        918 33101  38158 10R  S9_6     
-        20        919 33101  36992 10L  S9_2     
-        20        920 33101  38877 10R  P16      
-        20        921 33101  39901 10L  S10_2    
-        20        922 33101  39907 10R  S10_2    
-        20        923 33101  39897 10L  S10_2    
-        20        924 33101  40440 10R  S10_3    
-        20        925 33101  40430 10L  S10_3    
-        20        926 33101  40435 10R  S10_3    
-        20        927 33101  42033 10L  P18      
-        20        928 33101  42050 10R  P18      
-        20        929 33101  40425 10L  S10_3    
-        20        930 33101  42040 10R  P18      
-        20        931 33101  38129 10L  S9_6     
-        20        932 33101  38144 10R  S9_6     
-        20        933 33101  38119 10L  S9_6     
-        20        934 33101  38139 10R  S9_5     
-        20        935 33101  38124 10L  S9_6     
-        20        936 33101  38154 10R  S9_6     
-        20        937 33101  38134 10L  S9_6     
-        20        938 33101  38159 10R  S9_6     
-        20        939 33101  36983 10L  S9_2     
-        20        940 33101  38878 10R  P16      
-        20        941 33101  39903 10L  S10_2    
-        20        942 33101  39908 10R  S10_2    
-        20        943 33101  39898 10L  S10_2    
-        20        944 33101  38148 10R  S9_6     
-        20        945 33101  26830 10L  S6_2a    
-        20        946 33101  40436 10R  S10_3    
-        20        947 33101  42034 10L  P18      
-        20        948 33101  40431 10R  S10_3    
-        20        949 33101  40426 10L  S10_3    
-        20        950 33101  42041 10R  P18      
-        20        951 33101  38130 10L  S9_6     
-        20        952 33101  38145 10R  S9_6     
-        20        953 33101  38120 10L  S9_6     
-        20        954 33101  38140 10R  S9_5     
-        20        955 33101  38125 10L  S9_6     
-        20        956 33101  38155 10R  S9_6     
-        20        957 33101  38135 10L  S9_6     
-        20        958 33101  38160 10R  S9_6     
-        20        959 33101  36994 10L  S9_2     
-        20        960 33101  38879 10R  P16      
-        20        961 33101  39904 10L  S10_2    
-        20        962 33101  39909 10R  S10_2    
-        20        963 33101  39899 10L  S10_2    
-        20        964 33101  38149 10R  S9_6     
-        20        965 33101  38874 10L  P16      
-        20        966 33101  40437 10R  S10_3    
-        20        967 33101  42036 10L  P18      
-        20        968 33101  40432 10R  S10_3    
-        20        969 33101  40427 10L  S10_3    
-        20        970 33101  42042 10R  P18      
-        20        971 33101  38131 10L  S9_6     
-        20        972 33101  38146 10R  S9_6     
-        20        973 33101  38121 10L  S9_6     
-        20        974 33101  38141 10R  S9_5     
-        20        975 33101  38126 10L  S9_6     
-        20        976 33101  38157 10R  S9_6     
-        20        977 33101  38136 10L  S9_6     
-        20        978 33101  38882 10R  P16      
-        20        979 33101  36995 10L  S9_2     
-        20        980 33101  38880 10R  P16      
-        20        981 33101  39905 10L  S10_2    
-        20        982 33101  39910 10R  S10_2    
-        20        983 33101  39900 10L  S10_2    
-        20        984 33101  38150 10R  S9_6     
-        20        985 33101  38876 10L  P16      
-        20        986 33101  40438 10R  S10_3    
-        20        987 33101  42037 10L  P18      
-        20        988 33101  40433 10R  S10_3    
-        20        989 33101  40428 10L  S10_3    
-        20        990 33101  42043 10R  P18      
-        20        991 33101  38132 10L  S9_6     
-        20        992 33101  38147 10R  S9_6     
-        20        993 33101  38122 10L  S9_6     
-        20        994 33101  38142 10R  S9_5     
-        20        995 33101  38127 10L  S9_6     
-        20        996 33101  37020 10R  S9_2     
-        20        997 33101  38128 10L  S9_6     
-        20        998 33101  37019 10R  S9_2     
-        20        999 33101  36996 10L  S9_2     
-        20       1000 33101  38881 10R  P16      
-        20       1001 33101  42055 11L  P18      
-        20       1002 33101  42061 11R  P18      
-        20       1003 33101  40441 11L  S10_3    
-        20       1004 33101  38183 11R  S9_6     
-        20       1005 33101  40446 11L  S10_3    
-        20       1006 33101  38198 11R  S9_6     
-        20       1007 33101  40461 11L  S10_3    
-        20       1008 33101  38193 11R  S9_6     
-        20       1009 33101  40456 11L  S10_3    
-        20       1010 33101  38203 11R  S9_6     
-        20       1011 33101  40451 11L  S10_3    
-        20       1012 33101  38173 11R  S9_6     
-        20       1013 33101  38161 11L  S9_6     
-        20       1014 33101  38178 11R  S9_6     
-        20       1015 33101  38166 11L  S9_6     
-        20       1016 33101  38890 11R  P16      
-        20       1017 33101  37161 11L  S9_3     
-        20       1018 33101  37195 11R  S9_3     
-        20       1019 33101  37124 11L  S9_3     
-        20       1020 33101  37171 11R  S9_3     
-        20       1021 33101  42057 11L  P18      
-        20       1022 33101  42062 11R  P18      
-        20       1023 33101  40442 11L  S10_3    
-        20       1024 33101  38184 11R  S9_6     
-        20       1025 33101  40447 11L  S10_3    
-        20       1026 33101  38199 11R  S9_6     
-        20       1027 33101  40462 11L  S10_3    
-        20       1028 33101  38194 11R  S9_6     
-        20       1029 33101  40457 11L  S10_3    
-        20       1030 33101  38204 11R  S9_6     
-        20       1031 33101  40452 11L  S10_3    
-        20       1032 33101  38188 11R  S9_6     
-        20       1033 33101  38162 11L  S9_6     
-        20       1034 33101  38179 11R  S9_6     
-        20       1035 33101  38167 11L  S9_6     
-        20       1036 33101  38891 11R  P16      
-        20       1037 33101  37162 11L  S9_3     
-        20       1038 33101  37196 11R  S9_3     
-        20       1039 33101  37137 11L  S9_3     
-        20       1040 33101  37186 11R  S9_3     
-        20       1041 33101  42058 11L  P18      
-        20       1042 33101  42063 11R  P18      
-        20       1043 33101  40444 11L  S10_3    
-        20       1044 33101  38185 11R  S9_6     
-        20       1045 33101  40448 11L  S10_3    
-        20       1046 33101  38200 11R  S9_6     
-        20       1047 33101  40463 11L  S10_3    
-        20       1048 33101  38195 11R  S9_6     
-        20       1049 33101  40458 11L  S10_3    
-        20       1050 33101  38205 11R  S9_6     
-        20       1051 33101  40453 11L  S10_3    
-        20       1052 33101  38190 11R  S9_6     
-        20       1053 33101  38163 11L  S9_6     
-        20       1054 33101  38180 11R  S9_6     
-        20       1055 33101  38168 11L  S9_6     
-        20       1056 33101  38892 11R  P16      
-        20       1057 33101  37163 11L  S9_3     
-        20       1058 33101  37198 11R  S9_3     
-        20       1059 33101  37138 11L  S9_3     
-        20       1060 33101  37211 11R  S9_3     
-        20       1061 33101  42059 11L  P18      
-        20       1062 33101  42064 11R  P18      
-        20       1063 33101  40445 11L  S10_3    
-        20       1064 33101  38186 11R  S9_6     
-        20       1065 33101  40449 11L  S10_3    
-        20       1066 33101  38201 11R  S9_6     
-        20       1067 33101  40464 11L  S10_3    
-        20       1068 33101  38196 11R  S9_6     
-        20       1069 33101  40459 11L  S10_3    
-        20       1070 33101  38174 11R  S9_6     
-        20       1071 33101  40454 11L  S10_3    
-        20       1072 33101  38191 11R  S9_6     
-        20       1073 33101  38164 11L  S9_6     
-        20       1074 33101  38181 11R  S9_6     
-        20       1075 33101  38169 11L  S9_6     
-        20       1076 33101  38893 11R  P17      
-        20       1077 33101  37164 11L  S9_3     
-        20       1078 33101  37199 11R  S9_3     
-        20       1079 33101  37143 11L  S9_3     
-        20       1080 33101  37212 11R  S9_3     
-        20       1081 33101  42060 11L  P18      
-        20       1082 33101  42065 11R  P18      
-        20       1083 33101  42054 11L  P18      
-        20       1084 33101  38187 11R  S9_6     
-        20       1085 33101  42051 11L  P18      
-        20       1086 33101  38202 11R  S9_6     
-        20       1087 33101  40465 11L  S10_3    
-        20       1088 33101  38197 11R  S9_6     
-        20       1089 33101  40460 11L  S10_3    
-        20       1090 33101  38189 11R  S9_6     
-        20       1091 33101  40455 11L  S10_3    
-        20       1092 33101  38192 11R  S9_6     
-        20       1093 33101  38165 11L  S9_6     
-        20       1094 33101  38182 11R  S9_6     
-        20       1095 33101  38170 11L  S9_6     
-        20       1096 33101  35685 11R  P15_1    
-        20       1097 33101  37165 11L  S9_3     
-        20       1098 33101  37200 11R  S9_3     
-        20       1099 33101  37144 11L  S9_3     
-        20       1100 33101  37214 11R  S9_3     
-        20       1101 33101  40467 12L  S10_3    
-        20       1102 33101  35695 12R  P15_1    
-        20       1103 33101  37240 12L  S9_3     
-        20       1104 33101  42072 12R  P18      
-        20       1105 33101  39176 12L  P16      
-        20       1106 33101  38214 12R  S9_6     
-        20       1107 33101  39166 12L  P16      
-        20       1108 33101  38218 12R  S9_6     
-        20       1109 33101  38899 12L  P16      
-        20       1110 33101  38219 12R  S9_6     
-        20       1111 33101  38894 12L  P16      
-        20       1112 33101  38224 12R  S9_6     
-        20       1113 33101  37266 12L  S9_3     
-        20       1114 33101  38229 12R  S9_6     
-        20       1115 33101  37271 12L  S9_3     
-        20       1116 33101  34299 12R  S8_3     
-        20       1117 33101  37256 12L  S9_3     
-        20       1118 33101  37327 12R  S9_3     
-        20       1119 33101  37261 12L  S9_3     
-        20       1120 33101  37316 12R  S9_3     
-        20       1121 33101  40468 12L  S10_3    
-        20       1122 33101  37329 12R  S9_3     
-        20       1123 33101  37241 12L  S9_3     
-        20       1124 33101  42073 12R  P18      
-        20       1125 33101  39177 12L  P16      
-        20       1126 33101  38215 12R  S9_6     
-        20       1127 33101  39167 12L  P16      
-        20       1128 33101  38209 12R  S9_6     
-        20       1129 33101  38900 12L  P16      
-        20       1130 33101  38220 12R  S9_6     
-        20       1131 33101  38895 12L  P16      
-        20       1132 33101  38225 12R  S9_6     
-        20       1133 33101  37267 12L  S9_3     
-        20       1134 33101  38230 12R  S9_6     
-        20       1135 33101  37272 12L  S9_3     
-        20       1136 33101  34880 12R  S8_4     
-        20       1137 33101  37257 12L  S9_3     
-        20       1138 33101  37328 12R  S9_3     
-        20       1139 33101  37262 12L  S9_3     
-        20       1140 33101  39179 12R  P16      
-        20       1141 33101  40469 12L  S10_3    
-        20       1142 33101  42078 12R  P18      
-        20       1143 33101  37248 12L  S9_3     
-        20       1144 33101  42074 12R  P18      
-        20       1145 33101  37281 12L  S9_3     
-        20       1146 33101  38216 12R  S9_6     
-        20       1147 33101  39168 12L  P16      
-        20       1148 33101  38211 12R  S9_6     
-        20       1149 33101  39163 12L  P16      
-        20       1150 33101  38221 12R  S9_6     
-        20       1151 33101  38896 12L  P16      
-        20       1152 33101  38226 12R  S9_6     
-        20       1153 33101  37268 12L  S9_3     
-        20       1154 33101  38231 12R  S9_6     
-        20       1155 33101  37273 12L  S9_3     
-        20       1156 33101  34912 12R  S8_4     
-        20       1157 33101  37258 12L  S9_3     
-        20       1158 33101  39183 12R  P17      
-        20       1159 33101  37263 12L  S9_3     
-        20       1160 33101  39180 12R  P16      
-        20       1161 33101  40470 12L  S10_3    
-        20       1162 33101  42079 12R  P18      
-        20       1163 33101  39173 12L  P16      
-        20       1164 33101  42076 12R  P18      
-        20       1165 33101  37282 12L  S9_3     
-        20       1166 33101  38217 12R  S9_6     
-        20       1167 33101  39169 12L  P16      
-        20       1168 33101  38212 12R  S9_6     
-        20       1169 33101  39164 12L  P16      
-        20       1170 33101  38222 12R  S9_6     
-        20       1171 33101  38897 12L  P16      
-        20       1172 33101  38227 12R  S9_6     
-        20       1173 33101  37269 12L  S9_3     
-        20       1174 33101  38232 12R  S9_6     
-        20       1175 33101  37274 12L  S9_3     
-        20       1176 33101  37301 12R  S9_3     
-        20       1177 33101  37259 12L  S9_3     
-        20       1178 33101  39185 12R  P17      
-        20       1179 33101  37264 12L  S9_3     
-        20       1180 33101  39181 12R  P16      
-        20       1181 33101  40471 12L  S10_3    
-        20       1182 33101  42080 12R  P18      
-        20       1183 33101  39175 12L  P16      
-        20       1184 33101  42077 12R  P18      
-        20       1185 33101  37239 12L  S9_3     
-        20       1186 33101  38210 12R  S9_6     
-        20       1187 33101  39170 12L  P16      
-        20       1188 33101  38213 12R  S9_6     
-        20       1189 33101  39165 12L  P16      
-        20       1190 33101  38223 12R  S9_6     
-        20       1191 33101  38898 12L  P16      
-        20       1192 33101  38228 12R  S9_6     
-        20       1193 33101  37270 12L  S9_3     
-        20       1194 33101  37323 12R  S9_3     
-        20       1195 33101  37275 12L  S9_3     
-        20       1196 33101  37326 12R  S9_3     
-        20       1197 33101  37260 12L  S9_3     
-        20       1198 33101  39186 12R  P17      
-        20       1199 33101  37265 12L  S9_3     
-        20       1200 33101  39182 12R  P16      
-        20       1201 33101  38238 13L  S9_6     
-        20       1202 33101  37435 13R  S9_3     
-        20       1203 33101  39976 13L  S10_2    
-        20       1204 33101  38258 13R  S9_6     
-        20       1205 33101  39971 13L  S10_2    
-        20       1206 33101  38254 13R  S9_6     
-        20       1207 33101  40485 13L  S10_3    
-        20       1208 33101  39194 13R  P16      
-        20       1209 33101  38233 13L  S9_6     
-        20       1210 33101  39189 13R  P16      
-        20       1211 33101  38253 13L  S9_6     
-        20       1212 33101  37420 13R  S9_3     
-        20       1213 33101  38248 13L  S9_6     
-        20       1214 33101  37425 13R  S9_3     
-        20       1215 33101  38243 13L  S9_6     
-        20       1216 33101  35400 13R  S8_5     
-        20       1217 33101  37350 13L  S9_3     
-        20       1218 33101  37385 13R  S9_3     
-        20       1219 33101  39187 13L  P16      
-        20       1220 33101  37430 13R  S9_3     
-        20       1221 33101  38239 13L  S9_6     
-        20       1222 33101  37436 13R  S9_3     
-        20       1223 33101  39977 13L  S10_2    
-        20       1224 33101  38259 13R  S9_6     
-        20       1225 33101  39972 13L  S10_2    
-        20       1226 33101  38255 13R  S9_6     
-        20       1227 33101  40486 13L  S10_3    
-        20       1228 33101  39195 13R  P16      
-        20       1229 33101  38234 13L  S9_6     
-        20       1230 33101  39190 13R  P16      
-        20       1231 33101  18620 13L  S3       
-        20       1232 33101  37421 13R  S9_3     
-        20       1233 33101  38249 13L  S9_6     
-        20       1234 33101  37426 13R  S9_3     
-        20       1235 33101  38244 13L  S9_6     
-        20       1236 33101  37440 13R  S9_3     
-        20       1237 33101  37351 13L  S9_3     
-        20       1238 33101  37386 13R  S9_3     
-        20       1239 33101  39188 13L  P17      
-        20       1240 33101  37431 13R  S9_3     
-        20       1241 33101  38240 13L  S9_6     
-        20       1242 33101  37437 13R  S9_3     
-        20       1243 33101  39978 13L  S10_2    
-        20       1244 33101  38261 13R  S9_6     
-        20       1245 33101  39973 13L  S10_2    
-        20       1246 33101  38256 13R  S9_6     
-        20       1247 33101  40487 13L  S10_3    
-        20       1248 33101  39196 13R  P17      
-        20       1249 33101  38235 13L  S9_6     
-        20       1250 33101  39191 13R  P16      
-        20       1251 33101  27858 13L  S6_3a    
-        20       1252 33101  37422 13R  S9_3     
-        20       1253 33101  38250 13L  S9_6     
-        20       1254 33101  37427 13R  S9_3     
-        20       1255 33101  38245 13L  S9_6     
-        20       1256 33101  37401 13R  S9_3     
-        20       1257 33101  37352 13L  S9_3     
-        20       1258 33101  37391 13R  S9_3     
-        20       1259 33101  37365 13L  S9_3     
-        20       1260 33101  37432 13R  S9_3     
-        20       1261 33101  38241 13L  S9_6     
-        20       1262 33101  37438 13R  S9_3     
-        20       1263 33101  39979 13L  S10_2    
-        20       1264 33101  38262 13R  S9_6     
-        20       1265 33101  39974 13L  S10_2    
-        20       1266 33101  38257 13R  S9_6     
-        20       1267 33101  40488 13L  S10_3    
-        20       1268 33101  39197 13R  P17      
-        20       1269 33101  38237 13L  S9_6     
-        20       1270 33101  39192 13R  P16      
-        20       1271 33101  27869 13L  S6_3a    
-        20       1272 33101  37423 13R  S9_3     
-        20       1273 33101  38251 13L  S9_6     
-        20       1274 33101  37428 13R  S9_3     
-        20       1275 33101  38246 13L  S9_6     
-        20       1276 33101  37393 13R  S9_3     
-        20       1277 33101  37354 13L  S9_3     
-        20       1278 33101  37394 13R  S9_3     
-        20       1279 33101  37370 13L  S9_3     
-        20       1280 33101  37433 13R  S9_3     
-        20       1281 33101  38236 13L  S9_6     
-        20       1282 33101  37439 13R  S9_3     
-        20       1283 33101  39980 13L  S10_2    
-        20       1284 33101  37397 13R  S9_3     
-        20       1285 33101  39975 13L  S10_2    
-        20       1286 33101  38260 13R  S9_6     
-        20       1287 33101  42088 13L  P18      
-        20       1288 33101  39198 13R  P17      
-        20       1289 33101  38242 13L  S9_6     
-        20       1290 33101  39193 13R  P16      
-        20       1291 33101  37353 13L  S9_3     
-        20       1292 33101  37424 13R  S9_3     
-        20       1293 33101  38252 13L  S9_6     
-        20       1294 33101  37429 13R  S9_3     
-        20       1295 33101  38247 13L  S9_6     
-        20       1296 33101  37395 13R  S9_3     
-        20       1297 33101  37378 13L  S9_3     
-        20       1298 33101  37396 13R  S9_3     
-        20       1299 33101  37371 13L  S9_3     
-        20       1300 33101  37434 13R  S9_3     
-        20       1301 33101  38783 14L  P016     
-        20       1302 33101  29512 14R  R1       
-        20       1303 33101  36608 14L  S9_2     
-        20       1304 33101  38426 14R  S9_6     
-        20       1305 33101  39706 14L  S10_2    
-        20       1306 33101  38431 14R  S9_6     
-        20       1307 33101  39711 14L  S10_2    
-        20       1308 33101  38443 14R  S9_6     
-        20       1309 33101  39716 14L  S10_2    
-        20       1310 33101  38473 14R  S9_6     
-        20       1311 33101  39721 14L  S10_2    
-        20       1312 33101  38436 14R  S9_6     
-        20       1313 33101  39726 14L  S10_2    
-        20       1314 33101  38438 14R  S9_6     
-        20       1315 33101  39736 14L  S10_2    
-        20       1316 33101  39247 14R  S10_1    
-        20       1317 33101  39741 14L  S10_2    
-        20       1318 33101  39256 14R  S10_1    
-        20       1319 33101  39201 14L  S10_1    
-        20       1320 33101  39276 14R  S10_1    
-        20       1321 33101  32365 14L  P14      
-        20       1322 33101  37038 14R  S9_3     
-        20       1323 33101  39245 14L  S10_1    
-        20       1324 33101  35478 14R  P15_1    
-        20       1325 33101  39707 14L  S10_2    
-        20       1326 33101  38432 14R  S9_6     
-        20       1327 33101  39712 14L  S10_2    
-        20       1328 33101  38445 14R  S9_6     
-        20       1329 33101  39717 14L  S10_2    
-        20       1330 33101  38788 14R  P016     
-        20       1331 33101  39722 14L  S10_2    
-        20       1332 33101  38452 14R  S9_6     
-        20       1333 33101  39727 14L  S10_2    
-        20       1334 33101  38440 14R  S9_6     
-        20       1335 33101  39737 14L  S10_2    
-        20       1336 33101  39251 14R  S10_1    
-        20       1337 33101  39742 14L  S10_2    
-        20       1338 33101  39257 14R  S10_1    
-        20       1339 33101  39231 14L  S10_1    
-        20       1340 33101  39249 14R  S10_1    
-        20       1341 33101  35477 14L  P15_1    
-        20       1342 33101  38423 14R  S9_6     
-        20       1343 33101  39703 14L  S10_2    
-        20       1344 33101  35713 14R  P15_2    
-        20       1345 33101  39708 14L  S10_2    
-        20       1346 33101  38433 14R  S9_6     
-        20       1347 33101  39713 14L  S10_2    
-        20       1348 33101  38446 14R  S9_6     
-        20       1349 33101  39718 14L  S10_2    
-        20       1350 33101  38790 14R  P016     
-        20       1351 33101  39723 14L  S10_2    
-        20       1352 33101  38463 14R  S9_6     
-        20       1353 33101  39728 14L  S10_2    
-        20       1354 33101  38470 14R  S9_6     
-        20       1355 33101  39738 14L  S10_2    
-        20       1356 33101  39253 14R  S10_1    
-        20       1357 33101  39743 14L  S10_2    
-        20       1358 33101  39259 14R  S10_1    
-        20       1359 33101  39734 14L  S10_2    
-        20       1360 33101  39266 14R  S10_1    
-        20       1361 33101  36313 14L  S9_1     
-        20       1362 33101  38424 14R  S9_6     
-        20       1363 33101  39704 14L  S10_2    
-        20       1364 33101  38429 14R  S9_6     
-        20       1365 33101  39709 14L  S10_2    
-        20       1366 33101  38434 14R  S9_6     
-        20       1367 33101  39714 14L  S10_2    
-        20       1368 33101  38449 14R  S9_6     
-        20       1369 33101  39719 14L  S10_2    
-        20       1370 33101  38791 14R  P016     
-        20       1371 33101  39724 14L  S10_2    
-        20       1372 33101  38464 14R  S9_6     
-        20       1373 33101  39729 14L  S10_2    
-        20       1374 33101  35714 14R  P15_2    
-        20       1375 33101  39739 14L  S10_2    
-        20       1376 33101  39254 14R  S10_1    
-        20       1377 33101  39731 14L  S10_2    
-        20       1378 33101  39261 14R  S10_1    
-        20       1379 33101  39207 14L  S10_1    
-        20       1380 33101  39289 14R  S10_1    
-        20       1381 33101  36324 14L  S9_1     
-        20       1382 33101  38425 14R  S9_6     
-        20       1383 33101  39705 14L  S10_2    
-        20       1384 33101  38430 14R  S9_6     
-        20       1385 33101  39710 14L  S10_2    
-        20       1386 33101  38435 14R  S9_6     
-        20       1387 33101  39715 14L  S10_2    
-        20       1388 33101  38450 14R  S9_6     
-        20       1389 33101  39720 14L  S10_2    
-        20       1390 33101  38792 14R  P016     
-        20       1391 33101  39725 14L  S10_2    
-        20       1392 33101  38465 14R  S9_6     
-        20       1393 33101  39730 14L  S10_2    
-        20       1394 33101  35717 14R  P15_2    
-        20       1395 33101  39740 14L  S10_2    
-        20       1396 33101  39255 14R  S10_1    
-        20       1397 33101  39733 14L  S10_2    
-        20       1398 33101  39262 14R  S10_1    
-        20       1399 33101  39735 14L  S10_2    
-        20       1400 33101  39744 14R  S10_2    
-        20       1401 33101  35730 15L  P15_2    
-        20       1402 33101  30883 15R  S7_3     
-        20       1403 33101  36380 15L  S9_1     
-        20       1404 33101  37075 15R  S9_3     
-        20       1405 33101  38794 15L  P016     
-        20       1406 33101  39756 15R  S10_2    
-        20       1407 33101  30849 15L  S7_3     
-        20       1408 33101  39761 15R  S10_2    
-        20       1409 33101  40166 15L  S10_3    
-        20       1410 33101  39766 15R  S10_2    
-        20       1411 33101  40172 15L  S10_3    
-        20       1412 33101  39771 15R  S10_2    
-        20       1413 33101  40161 15L  S10_3    
-        20       1414 33101  39781 15R  S10_2    
-        20       1415 33101  40181 15L  S10_3    
-        20       1416 33101  39776 15R  S10_2    
-        20       1417 33101  40176 15L  S10_3    
-        20       1418 33101  39786 15R  S10_2    
-        20       1419 33101  40186 15L  S10_3    
-        20       1420 33101  39791 15R  S10_2    
-        20       1421 33101  35753 15L  P15_2    
-        20       1422 33101  31349 15R  S07_4    
-        20       1423 33101  35731 15L  P15_2    
-        20       1424 33101  35754 15R  P15_2    
-        20       1425 33101  38795 15L  P016     
-        20       1426 33101  39757 15R  S10_2    
-        20       1427 33101  39310 15L  S10_1    
-        20       1428 33101  39762 15R  S10_2    
-        20       1429 33101  40168 15L  S10_3    
-        20       1430 33101  39767 15R  S10_2    
-        20       1431 33101  40173 15L  S10_3    
-        20       1432 33101  39772 15R  S10_2    
-        20       1433 33101  40162 15L  S10_3    
-        20       1434 33101  39782 15R  S10_2    
-        20       1435 33101  40182 15L  S10_3    
-        20       1436 33101  39777 15R  S10_2    
-        20       1437 33101  40177 15L  S10_3    
-        20       1438 33101  39787 15R  S10_2    
-        20       1439 33101  40187 15L  S10_3    
-        20       1440 33101  39792 15R  S10_2    
-        20       1441 33101  35732 15L  P15_2    
-        20       1442 33101  31369 15R  S07_4    
-        20       1443 33101  30863 15L  S7_3     
-        20       1444 33101  32427 15R  P14      
-        20       1445 33101  38797 15L  P016     
-        20       1446 33101  39758 15R  S10_2    
-        20       1447 33101  39319 15L  S10_1    
-        20       1448 33101  39763 15R  S10_2    
-        20       1449 33101  40169 15L  S10_3    
-        20       1450 33101  39768 15R  S10_2    
-        20       1451 33101  40158 15L  S10_3    
-        20       1452 33101  39773 15R  S10_2    
-        20       1453 33101  40163 15L  S10_3    
-        20       1454 33101  39783 15R  S10_2    
-        20       1455 33101  40183 15L  S10_3    
-        20       1456 33101  39778 15R  S10_2    
-        20       1457 33101  40178 15L  S10_3    
-        20       1458 33101  39788 15R  S10_2    
-        20       1459 33101  40188 15L  S10_3    
-        20       1460 33101  39351 15R  S10_1    
-        20       1461 33101  35751 15L  P15_2    
-        20       1462 33101  37079 15R  S9_3     
-        20       1463 33101  31346 15L  S07_4    
-        20       1464 33101  32868 15R  S3       
-        20       1465 33101  32835 15L  S3       
-        20       1466 33101  39759 15R  S10_2    
-        20       1467 33101  40174 15L  S10_3    
-        20       1468 33101  39764 15R  S10_2    
-        20       1469 33101  40170 15L  S10_3    
-        20       1470 33101  39769 15R  S10_2    
-        20       1471 33101  40159 15L  S10_3    
-        20       1472 33101  39774 15R  S10_2    
-        20       1473 33101  40164 15L  S10_3    
-        20       1474 33101  39784 15R  S10_2    
-        20       1475 33101  40184 15L  S10_3    
-        20       1476 33101  39779 15R  S10_2    
-        20       1477 33101  40179 15L  S10_3    
-        20       1478 33101  39789 15R  S10_2    
-        20       1479 33101  40189 15L  S10_3    
-        20       1480 33101  39754 15R  S10_2    
-        20       1481 33101  35752 15L  P15_2    
-        20       1482 33101  38799 15R  P016     
-        20       1483 33101  31347 15L  S07_4    
-        20       1484 33101  32425 15R  P14      
-        20       1485 33101  29305 15L  P13      
-        20       1486 33101  39760 15R  S10_2    
-        20       1487 33101  40175 15L  S10_3    
-        20       1488 33101  39765 15R  S10_2    
-        20       1489 33101  40191 15L  S10_3    
-        20       1490 33101  39770 15R  S10_2    
-        20       1491 33101  40160 15L  S10_3    
-        20       1492 33101  39775 15R  S10_2    
-        20       1493 33101  40165 15L  S10_3    
-        20       1494 33101  39785 15R  S10_2    
-        20       1495 33101  40185 15L  S10_3    
-        20       1496 33101  39780 15R  S10_2    
-        20       1497 33101  40180 15L  S10_3    
-        20       1498 33101  39790 15R  S10_2    
-        20       1499 33101  40190 15L  S10_3    
-        20       1500 33101  39793 15R  S10_2    
-        20       1501 33101  30902 16L  S7_3     
-        20       1502 33101  38817 16R  P016     
-        20       1503 33101  32451 16L  P14      
-        20       1504 33101  38816 16R  P016     
-        20       1505 33101  40266 16L  S10_3    
-        20       1506 33101  39806 16R  S10_2    
-        20       1507 33101  40231 16L  S10_3    
-        20       1508 33101  39797 16R  S10_2    
-        20       1509 33101  40236 16L  S10_3    
-        20       1510 33101  39816 16R  S10_2    
-        20       1511 33101  40241 16L  S10_3    
-        20       1512 33101  39826 16R  S10_2    
-        20       1513 33101  40246 16L  S10_3    
-        20       1514 33101  39811 16R  S10_2    
-        20       1515 33101  40251 16L  S10_3    
-        20       1516 33101  39831 16R  S10_2    
-        20       1517 33101  40256 16L  S10_3    
-        20       1518 33101  39836 16R  S10_2    
-        20       1519 33101  40261 16L  S10_3    
-        20       1520 33101  39821 16R  S10_2    
-        20       1521 33101  38800 16L  P016     
-        20       1522 33101  38822 16R  P016     
-        20       1523 33101  29904 16L  S7_1     
-        20       1524 33101  38825 16R  P016     
-        20       1525 33101  40227 16L  S10_3    
-        20       1526 33101  39807 16R  S10_2    
-        20       1527 33101  40232 16L  S10_3    
-        20       1528 33101  39799 16R  S10_2    
-        20       1529 33101  40237 16L  S10_3    
-        20       1530 33101  39817 16R  S10_2    
-        20       1531 33101  40242 16L  S10_3    
-        20       1532 33101  39827 16R  S10_2    
-        20       1533 33101  40247 16L  S10_3    
-        20       1534 33101  39812 16R  S10_2    
-        20       1535 33101  40252 16L  S10_3    
-        20       1536 33101  39832 16R  S10_2    
-        20       1537 33101  40257 16L  S10_3    
-        20       1538 33101  39841 16R  S10_2    
-        20       1539 33101  40262 16L  S10_3    
-        20       1540 33101  39823 16R  S10_2    
-        20       1541 33101  38808 16L  P016     
-        20       1542 33101  38823 16R  P016     
-        20       1543 33101  31406 16L  S07_4    
-        20       1544 33101  31421 16R  S07_4    
-        20       1545 33101  40228 16L  S10_3    
-        20       1546 33101  39808 16R  S10_2    
-        20       1547 33101  40233 16L  S10_3    
-        20       1548 33101  39800 16R  S10_2    
-        20       1549 33101  40238 16L  S10_3    
-        20       1550 33101  39818 16R  S10_2    
-        20       1551 33101  40243 16L  S10_3    
-        20       1552 33101  39828 16R  S10_2    
-        20       1553 33101  40248 16L  S10_3    
-        20       1554 33101  39813 16R  S10_2    
-        20       1555 33101  40253 16L  S10_3    
-        20       1556 33101  39833 16R  S10_2    
-        20       1557 33101  40258 16L  S10_3    
-        20       1558 33101  39838 16R  S10_2    
-        20       1559 33101  40263 16L  S10_3    
-        20       1560 33101  39842 16R  S10_2    
-        20       1561 33101  38809 16L  P016     
-        20       1562 33101  38824 16R  P016     
-        20       1563 33101  32436 16L  P14      
-        20       1564 33101  36487 16R  S9_1     
-        20       1565 33101  40229 16L  S10_3    
-        20       1566 33101  39809 16R  S10_2    
-        20       1567 33101  40234 16L  S10_3    
-        20       1568 33101  39801 16R  S10_2    
-        20       1569 33101  40239 16L  S10_3    
-        20       1570 33101  39819 16R  S10_2    
-        20       1571 33101  40244 16L  S10_3    
-        20       1572 33101  39829 16R  S10_2    
-        20       1573 33101  40249 16L  S10_3    
-        20       1574 33101  39814 16R  S10_2    
-        20       1575 33101  40254 16L  S10_3    
-        20       1576 33101  39834 16R  S10_2    
-        20       1577 33101  40259 16L  S10_3    
-        20       1578 33101  39839 16R  S10_2    
-        20       1579 33101  40264 16L  S10_3    
-        20       1580 33101  39843 16R  S10_2    
-        20       1581 33101  38810 16L  P016     
-        20       1582 33101  38818 16R  P016     
-        20       1583 33101  38801 16L  P016     
-        20       1584 33101  39805 16R  S10_2    
-        20       1585 33101  40230 16L  S10_3    
-        20       1586 33101  39810 16R  S10_2    
-        20       1587 33101  40235 16L  S10_3    
-        20       1588 33101  39803 16R  S10_2    
-        20       1589 33101  40240 16L  S10_3    
-        20       1590 33101  39820 16R  S10_2    
-        20       1591 33101  40245 16L  S10_3    
-        20       1592 33101  39830 16R  S10_2    
-        20       1593 33101  40250 16L  S10_3    
-        20       1594 33101  39815 16R  S10_2    
-        20       1595 33101  40255 16L  S10_3    
-        20       1596 33101  39835 16R  S10_2    
-        20       1597 33101  40260 16L  S10_3    
-        20       1598 33101  39840 16R  S10_2    
-        20       1599 33101  40265 16L  S10_3    
-        20       1600 33101  39804 16R  S10_2    
-        20       1601 33101  28388 17L  S6_3b    
-        20       1602 33101  30965 17R  S7_3     
-        20       1603 33101  32552 17L  P14      
-        20       1604 33101  39159 17R  P017     
-        20       1605 33101  39876 17L  S10_2    
-        20       1606 33101  38839 17R  P016     
-        20       1607 33101  39877 17L  S10_2    
-        20       1608 33101  39162 17R  P017     
-        20       1609 33101  39861 17L  S10_2    
-        20       1610 33101  40291 17R  S10_3    
-        20       1611 33101  39866 17L  S10_2    
-        20       1612 33101  40296 17R  S10_3    
-        20       1613 33101  39871 17L  S10_2    
-        20       1614 33101  40301 17R  S10_3    
-        20       1615 33101  39881 17L  S10_2    
-        20       1616 33101  40306 17R  S10_3    
-        20       1617 33101  39886 17L  S10_2    
-        20       1618 33101  40311 17R  S10_3    
-        20       1619 33101  39891 17L  S10_2    
-        20       1620 33101  40316 17R  S10_3    
-        20       1621 33101  30941 17L  S7_3     
-        20       1622 33101  37113 17R  S9_3     
-        20       1623 33101  35785 17L  P15_2    
-        20       1624 33101  31511 17R  S07_4    
-        20       1625 33101  39852 17L  S10_2    
-        20       1626 33101  37116 17R  S9_3     
-        20       1627 33101  39857 17L  S10_2    
-        20       1628 33101  39506 17R  S10_1    
-        20       1629 33101  39862 17L  S10_2    
-        20       1630 33101  40292 17R  S10_3    
-        20       1631 33101  39867 17L  S10_2    
-        20       1632 33101  40297 17R  S10_3    
-        20       1633 33101  39872 17L  S10_2    
-        20       1634 33101  40302 17R  S10_3    
-        20       1635 33101  39882 17L  S10_2    
-        20       1636 33101  40307 17R  S10_3    
-        20       1637 33101  39887 17L  S10_2    
-        20       1638 33101  40312 17R  S10_3    
-        20       1639 33101  39892 17L  S10_2    
-        20       1640 33101  40317 17R  S10_3    
-        20       1641 33101  31483 17L  S07_4    
-        20       1642 33101  37119 17R  S9_3     
-        20       1643 33101  38832 17L  P016     
-        20       1644 33101  29330 17R  P13      
-        20       1645 33101  39853 17L  S10_2    
-        20       1646 33101  38836 17R  P016     
-        20       1647 33101  39858 17L  S10_2    
-        20       1648 33101  39507 17R  S10_1    
-        20       1649 33101  39863 17L  S10_2    
-        20       1650 33101  40293 17R  S10_3    
-        20       1651 33101  39868 17L  S10_2    
-        20       1652 33101  40298 17R  S10_3    
-        20       1653 33101  39873 17L  S10_2    
-        20       1654 33101  40303 17R  S10_3    
-        20       1655 33101  39883 17L  S10_2    
-        20       1656 33101  40308 17R  S10_3    
-        20       1657 33101  39888 17L  S10_2    
-        20       1658 33101  40313 17R  S10_3    
-        20       1659 33101  39893 17L  S10_2    
-        20       1660 33101  40318 17R  S10_3    
-        20       1661 33101  32577 17L  P14      
-        20       1662 33101  37120 17R  S9_3     
-        20       1663 33101  39878 17L  S10_2    
-        20       1664 33101  32604 17R  P14      
-        20       1665 33101  39854 17L  S10_2    
-        20       1666 33101  39155 17R  P017     
-        20       1667 33101  39859 17L  S10_2    
-        20       1668 33101  39508 17R  S10_1    
-        20       1669 33101  39864 17L  S10_2    
-        20       1670 33101  40294 17R  S10_3    
-        20       1671 33101  39869 17L  S10_2    
-        20       1672 33101  40299 17R  S10_3    
-        20       1673 33101  39874 17L  S10_2    
-        20       1674 33101  40304 17R  S10_3    
-        20       1675 33101  39884 17L  S10_2    
-        20       1676 33101  40309 17R  S10_3    
-        20       1677 33101  39889 17L  S10_2    
-        20       1678 33101  40314 17R  S10_3    
-        20       1679 33101  39894 17L  S10_2    
-        20       1680 33101  40319 17R  S10_3    
-        20       1681 33101  32551 17L  P14      
-        20       1682 33101  38838 17R  P016     
-        20       1683 33101  39880 17L  S10_2    
-        20       1684 33101  38837 17R  P016     
-        20       1685 33101  39855 17L  S10_2    
-        20       1686 33101  39156 17R  P017     
-        20       1687 33101  39860 17L  S10_2    
-        20       1688 33101  40290 17R  S10_3    
-        20       1689 33101  39865 17L  S10_2    
-        20       1690 33101  40295 17R  S10_3    
-        20       1691 33101  39870 17L  S10_2    
-        20       1692 33101  40300 17R  S10_3    
-        20       1693 33101  39875 17L  S10_2    
-        20       1694 33101  40305 17R  S10_3    
-        20       1695 33101  39885 17L  S10_2    
-        20       1696 33101  40310 17R  S10_3    
-        20       1697 33101  39890 17L  S10_2    
-        20       1698 33101  40315 17R  S10_3    
-        20       1699 33101  39895 17L  S10_2    
-        20       1700 33101  40320 17R  S10_3    
-        21          1 33101  40522 1L   S10_4    
-        21          2 33101  40536 1R   S10_4    
-        21          3 33101  40506 1L   S10_4    
-        21          4 33101  40541 1R   S10_4    
-        21          5 33101  40511 1L   S10_4    
-        21          6 33101  40546 1R   S10_4    
-        21          7 33101  40516 1L   S10_4    
-        21          8 33101  40551 1R   S10_4    
-        21          9 33101  40526 1L   S10_4    
-        21         10 33101  40556 1R   S10_4    
-        21         11 33101  41006 1L   S10_5    
-        21         12 33101  41541 1R   S10_6    
-        21         13 33101  42101 1L   P19      
-        21         14 33101  42111 1R   P19      
-        21         15 33101  42106 1L   P19      
-        21         16 33101  42116 1R   P19      
-        21         17 33101  41506 1L   S10_6    
-        21         18 33101  41546 1R   S10_6    
-        21         19 33101  41507 1L   S10_6    
-        21         20 33101  41551 1R   S10_6    
-        21         21 33101  40502 1L   S10_4    
-        21         22 33101  40537 1R   S10_4    
-        21         23 33101  40507 1L   S10_4    
-        21         24 33101  40542 1R   S10_4    
-        21         25 33101  40512 1L   S10_4    
-        21         26 33101  40547 1R   S10_4    
-        21         27 33101  40517 1L   S10_4    
-        21         28 33101  40552 1R   S10_4    
-        21         29 33101  40527 1L   S10_4    
-        21         30 33101  40557 1R   S10_4    
-        21         31 33101  41007 1L   S10_5    
-        21         32 33101  41542 1R   S10_6    
-        21         33 33101  42102 1L   P19      
-        21         34 33101  42112 1R   P19      
-        21         35 33101  42107 1L   P19      
-        21         36 33101  42117 1R   P19      
-        21         37 33101  41502 1L   S10_6    
-        21         38 33101  41547 1R   S10_6    
-        21         39 33101  40530 1L   S10_4    
-        21         40 33101  41552 1R   S10_6    
-        21         41 33101  40503 1L   S10_4    
-        21         42 33101  40538 1R   S10_4    
-        21         43 33101  40508 1L   S10_4    
-        21         44 33101  40543 1R   S10_4    
-        21         45 33101  40513 1L   S10_4    
-        21         46 33101  40548 1R   S10_4    
-        21         47 33101  40518 1L   S10_4    
-        21         48 33101  40553 1R   S10_4    
-        21         49 33101  40528 1L   S10_4    
-        21         50 33101  40535 1R   S10_4    
-        21         51 33101  41008 1L   S10_5    
-        21         52 33101  41543 1R   S10_6    
-        21         53 33101  42103 1L   P19      
-        21         54 33101  42113 1R   P19      
-        21         55 33101  42108 1L   P19      
-        21         56 33101  42118 1R   P19      
-        21         57 33101  41503 1L   S10_6    
-        21         58 33101  41548 1R   S10_6    
-        21         59 33101  41003 1L   S10_5    
-        21         60 33101  41538 1R   S10_6    
-        21         61 33101  40504 1L   S10_4    
-        21         62 33101  40539 1R   S10_4    
-        21         63 33101  40509 1L   S10_4    
-        21         64 33101  40544 1R   S10_4    
-        21         65 33101  40514 1L   S10_4    
-        21         66 33101  40549 1R   S10_4    
-        21         67 33101  40520 1L   S10_4    
-        21         68 33101  40554 1R   S10_4    
-        21         69 33101  40524 1L   S10_4    
-        21         70 33101  40559 1R   S10_4    
-        21         71 33101  41009 1L   S10_5    
-        21         72 33101  41544 1R   S10_6    
-        21         73 33101  42104 1L   P19      
-        21         74 33101  42109 1R   P19      
-        21         75 33101  40521 1L   S10_4    
-        21         76 33101  42119 1R   P19      
-        21         77 33101  41504 1L   S10_6    
-        21         78 33101  41553 1R   S10_6    
-        21         79 33101  41004 1L   S10_5    
-        21         80 33101  41539 1R   S10_6    
-        21         81 33101  40505 1L   S10_4    
-        21         82 33101  40540 1R   S10_4    
-        21         83 33101  40510 1L   S10_4    
-        21         84 33101  40545 1R   S10_4    
-        21         85 33101  40515 1L   S10_4    
-        21         86 33101  40550 1R   S10_4    
-        21         87 33101  40523 1L   S10_4    
-        21         88 33101  40555 1R   S10_4    
-        21         89 33101  40525 1L   S10_4    
-        21         90 33101  40560 1R   S10_4    
-        21         91 33101  41010 1L   S10_5    
-        21         92 33101  41545 1R   S10_6    
-        21         93 33101  42105 1L   P19      
-        21         94 33101  42110 1R   P19      
-        21         95 33101  40529 1L   S10_4    
-        21         96 33101  42120 1R   P19      
-        21         97 33101  41505 1L   S10_6    
-        21         98 33101  41550 1R   S10_6    
-        21         99 33101  41005 1L   S10_5    
-        21        100 33101  41540 1R   S10_6    
-        21        101 33101  40567 2L   S10_4    
-        21        102 33101  31979 2R   S07_5    
-        21        103 33101  40571 2L   S10_4    
-        21        104 33101  41821 2R   P18      
-        21        105 33101  40576 2L   S10_4    
-        21        106 33101  40591 2R   S10_4    
-        21        107 33101  40581 2L   S10_4    
-        21        108 33101  40596 2R   S10_4    
-        21        109 33101  40586 2L   S10_4    
-        21        110 33101  40601 2R   S10_4    
-        21        111 33101  42121 2L   P19      
-        21        112 33101  40606 2R   S10_4    
-        21        113 33101  40590 2L   S10_4    
-        21        114 33101  40608 2R   S10_4    
-        21        115 33101  41596 2L   S10_6    
-        21        116 33101  40615 2R   S10_4    
-        21        117 33101  41590 2L   S10_6    
-        21        118 33101  42131 2R   P19      
-        21        119 33101  41606 2L   S10_6    
-        21        120 33101  41636 2R   S10_6    
-        21        121 33101  40562 2L   S10_4    
-        21        122 33101  34022 2R   S8_3     
-        21        123 33101  40572 2L   S10_4    
-        21        124 33101  41822 2R   P18      
-        21        125 33101  40577 2L   S10_4    
-        21        126 33101  40592 2R   S10_4    
-        21        127 33101  40582 2L   S10_4    
-        21        128 33101  40597 2R   S10_4    
-        21        129 33101  40587 2L   S10_4    
-        21        130 33101  40602 2R   S10_4    
-        21        131 33101  42122 2L   P19      
-        21        132 33101  40607 2R   S10_4    
-        21        133 33101  42126 2L   P19      
-        21        134 33101  40609 2R   S10_4    
-        21        135 33101  41597 2L   S10_6    
-        21        136 33101  40616 2R   S10_4    
-        21        137 33101  41593 2L   S10_6    
-        21        138 33101  42132 2R   P19      
-        21        139 33101  41605 2L   S10_6    
-        21        140 33101  42130 2R   P19      
-        21        141 33101  40563 2L   S10_4    
-        21        142 33101  41819 2R   P18      
-        21        143 33101  40573 2L   S10_4    
-        21        144 33101  41823 2R   P18      
-        21        145 33101  40578 2L   S10_4    
-        21        146 33101  40593 2R   S10_4    
-        21        147 33101  40583 2L   S10_4    
-        21        148 33101  40598 2R   S10_4    
-        21        149 33101  40588 2L   S10_4    
-        21        150 33101  40603 2R   S10_4    
-        21        151 33101  42123 2L   P19      
-        21        152 33101  41639 2R   S10_6    
-        21        153 33101  42127 2L   P19      
-        21        154 33101  40612 2R   S10_4    
-        21        155 33101  41598 2L   S10_6    
-        21        156 33101  40617 2R   S10_4    
-        21        157 33101  41594 2L   S10_6    
-        21        158 33101  42133 2R   P19      
-        21        159 33101  41608 2L   S10_6    
-        21        160 33101  42129 2R   P19      
-        21        161 33101  40564 2L   S10_4    
-        21        162 33101  41826 2R   P18      
-        21        163 33101  40574 2L   S10_4    
-        21        164 33101  41824 2R   P18      
-        21        165 33101  40579 2L   S10_4    
-        21        166 33101  40594 2R   S10_4    
-        21        167 33101  40584 2L   S10_4    
-        21        168 33101  40599 2R   S10_4    
-        21        169 33101  40589 2L   S10_4    
-        21        170 33101  40604 2R   S10_4    
-        21        171 33101  42124 2L   P19      
-        21        172 33101  41641 2R   S10_6    
-        21        173 33101  41588 2L   S10_6    
-        21        174 33101  40613 2R   S10_4    
-        21        175 33101  41599 2L   S10_6    
-        21        176 33101  40618 2R   S10_4    
-        21        177 33101  41601 2L   S10_6    
-        21        178 33101  41634 2R   S10_6    
-        21        179 33101  41609 2L   S10_6    
-        21        180 33101  42128 2R   P19      
-        21        181 33101  40565 2L   S10_4    
-        21        182 33101  41827 2R   P18      
-        21        183 33101  40575 2L   S10_4    
-        21        184 33101  41825 2R   P18      
-        21        185 33101  40580 2L   S10_4    
-        21        186 33101  40595 2R   S10_4    
-        21        187 33101  40585 2L   S10_4    
-        21        188 33101  40600 2R   S10_4    
-        21        189 33101  40570 2L   S10_4    
-        21        190 33101  40605 2R   S10_4    
-        21        191 33101  42125 2L   P19      
-        21        192 33101  41642 2R   S10_6    
-        21        193 33101  41589 2L   S10_6    
-        21        194 33101  40614 2R   S10_4    
-        21        195 33101  41600 2L   S10_6    
-        21        196 33101  40619 2R   S10_4    
-        21        197 33101  41603 2L   S10_6    
-        21        198 33101  41635 2R   S10_6    
-        21        199 33101  41610 2L   S10_6    
-        21        200 33101  40620 2R   S10_4    
-        21        201 33101  40026 3L   S10_3    
-        21        202 33101  41856 3R   P18      
-        21        203 33101  40031 3L   S10_3    
-        21        204 33101  41861 3R   P18      
-        21        205 33101  40621 3L   S10_4    
-        21        206 33101  40646 3R   S10_4    
-        21        207 33101  40626 3L   S10_4    
-        21        208 33101  40651 3R   S10_4    
-        21        209 33101  40631 3L   S10_4    
-        21        210 33101  40656 3R   S10_4    
-        21        211 33101  40637 3L   S10_4    
-        21        212 33101  40661 3R   S10_4    
-        21        213 33101  42136 3L   P19      
-        21        214 33101  40666 3R   S10_4    
-        21        215 33101  42134 3L   P19      
-        21        216 33101  42146 3R   P19      
-        21        217 33101  41671 3L   S10_6    
-        21        218 33101  41012 3R   S10_5    
-        21        219 33101  41678 3L   S10_6    
-        21        220 33101  40660 3R   S10_4    
-        21        221 33101  40027 3L   S10_3    
-        21        222 33101  41857 3R   P18      
-        21        223 33101  40032 3L   S10_3    
-        21        224 33101  41862 3R   P18      
-        21        225 33101  40622 3L   S10_4    
-        21        226 33101  40647 3R   S10_4    
-        21        227 33101  40627 3L   S10_4    
-        21        228 33101  40652 3R   S10_4    
-        21        229 33101  40632 3L   S10_4    
-        21        230 33101  40657 3R   S10_4    
-        21        231 33101  40638 3L   S10_4    
-        21        232 33101  40662 3R   S10_4    
-        21        233 33101  42138 3L   P19      
-        21        234 33101  40667 3R   S10_4    
-        21        235 33101  42135 3L   P19      
-        21        236 33101  42147 3R   P19      
-        21        237 33101  41673 3L   S10_6    
-        21        238 33101  40659 3R   S10_4    
-        21        239 33101  41679 3L   S10_6    
-        21        240 33101  41687 3R   S10_6    
-        21        241 33101  40028 3L   S10_3    
-        21        242 33101  41858 3R   P18      
-        21        243 33101  40033 3L   S10_3    
-        21        244 33101  41863 3R   P18      
-        21        245 33101  40623 3L   S10_4    
-        21        246 33101  40648 3R   S10_4    
-        21        247 33101  40628 3L   S10_4    
-        21        248 33101  40653 3R   S10_4    
-        21        249 33101  40633 3L   S10_4    
-        21        250 33101  40658 3R   S10_4    
-        21        251 33101  40639 3L   S10_4    
-        21        252 33101  40663 3R   S10_4    
-        21        253 33101  42140 3L   P19      
-        21        254 33101  40668 3R   S10_4    
-        21        255 33101  42137 3L   P19      
-        21        256 33101  42148 3R   P19      
-        21        257 33101  41674 3L   S10_6    
-        21        258 33101  41683 3R   S10_6    
-        21        259 33101  41680 3L   S10_6    
-        21        260 33101  41688 3R   S10_6    
-        21        261 33101  40029 3L   S10_3    
-        21        262 33101  41859 3R   P18      
-        21        263 33101  40034 3L   S10_3    
-        21        264 33101  41864 3R   P18      
-        21        265 33101  40624 3L   S10_4    
-        21        266 33101  40649 3R   S10_4    
-        21        267 33101  40629 3L   S10_4    
-        21        268 33101  40654 3R   S10_4    
-        21        269 33101  40635 3L   S10_4    
-        21        270 33101  41855 3R   P18      
-        21        271 33101  40641 3L   S10_4    
-        21        272 33101  40664 3R   S10_4    
-        21        273 33101  42141 3L   P19      
-        21        274 33101  40669 3R   S10_4    
-        21        275 33101  42144 3L   P19      
-        21        276 33101  42149 3R   P19      
-        21        277 33101  41675 3L   S10_6    
-        21        278 33101  41684 3R   S10_6    
-        21        279 33101  41681 3L   S10_6    
-        21        280 33101  41689 3R   S10_6    
-        21        281 33101  40030 3L   S10_3    
-        21        282 33101  41854 3R   P18      
-        21        283 33101  40035 3L   S10_3    
-        21        284 33101  41865 3R   P18      
-        21        285 33101  40625 3L   S10_4    
-        21        286 33101  40650 3R   S10_4    
-        21        287 33101  40630 3L   S10_4    
-        21        288 33101  40655 3R   S10_4    
-        21        289 33101  40025 3L   S10_3    
-        21        290 33101  41866 3R   P18      
-        21        291 33101  40644 3L   S10_4    
-        21        292 33101  40665 3R   S10_4    
-        21        293 33101  42142 3L   P19      
-        21        294 33101  40670 3R   S10_4    
-        21        295 33101  42145 3L   P19      
-        21        296 33101  42150 3R   P19      
-        21        297 33101  41676 3L   S10_6    
-        21        298 33101  41685 3R   S10_6    
-        21        299 33101  41682 3L   S10_6    
-        21        300 33101  41690 3R   S10_6    
-        21        301 33101  40051 4L   S10_3    
-        21        302 33101  40096 4R   S10_3    
-        21        303 33101  40671 4L   S10_4    
-        21        304 33101  40099 4R   S10_3    
-        21        305 33101  40681 4L   S10_4    
-        21        306 33101  40702 4R   S10_4    
-        21        307 33101  40676 4L   S10_4    
-        21        308 33101  40068 4R   S10_3    
-        21        309 33101  42155 4L   P19      
-        21        310 33101  40707 4R   S10_4    
-        21        311 33101  40678 4L   S10_4    
-        21        312 33101  40712 4R   S10_4    
-        21        313 33101  42156 4L   P19      
-        21        314 33101  40719 4R   S10_4    
-        21        315 33101  41727 4L   S10_6    
-        21        316 33101  42161 4R   P19      
-        21        317 33101  41736 4L   S10_6    
-        21        318 33101  42166 4R   P19      
-        21        319 33101  41741 4L   S10_6    
-        21        320 33101  42171 4R   P19      
-        21        321 33101  40052 4L   S10_3    
-        21        322 33101  40098 4R   S10_3    
-        21        323 33101  40672 4L   S10_4    
-        21        324 33101  40100 4R   S10_3    
-        21        325 33101  40682 4L   S10_4    
-        21        326 33101  40703 4R   S10_4    
-        21        327 33101  40677 4L   S10_4    
-        21        328 33101  40698 4R   S10_4    
-        21        329 33101  40686 4L   S10_4    
-        21        330 33101  40708 4R   S10_4    
-        21        331 33101  40691 4L   S10_4    
-        21        332 33101  40713 4R   S10_4    
-        21        333 33101  40693 4L   S10_4    
-        21        334 33101  40720 4R   S10_4    
-        21        335 33101  41728 4L   S10_6    
-        21        336 33101  42162 4R   P19      
-        21        337 33101  41737 4L   S10_6    
-        21        338 33101  42167 4R   P19      
-        21        339 33101  41742 4L   S10_6    
-        21        340 33101  42172 4R   P19      
-        21        341 33101  40053 4L   S10_3    
-        21        342 33101  40093 4R   S10_3    
-        21        343 33101  40673 4L   S10_4    
-        21        344 33101  40101 4R   S10_3    
-        21        345 33101  40683 4L   S10_4    
-        21        346 33101  40704 4R   S10_4    
-        21        347 33101  40680 4L   S10_4    
-        21        348 33101  40699 4R   S10_4    
-        21        349 33101  40688 4L   S10_4    
-        21        350 33101  40709 4R   S10_4    
-        21        351 33101  40692 4L   S10_4    
-        21        352 33101  40714 4R   S10_4    
-        21        353 33101  41723 4L   S10_6    
-        21        354 33101  42157 4R   P19      
-        21        355 33101  41729 4L   S10_6    
-        21        356 33101  42163 4R   P19      
-        21        357 33101  41733 4L   S10_6    
-        21        358 33101  42168 4R   P19      
-        21        359 33101  41743 4L   S10_6    
-        21        360 33101  42173 4R   P19      
-        21        361 33101  40054 4L   S10_3    
-        21        362 33101  40094 4R   S10_3    
-        21        363 33101  40674 4L   S10_4    
-        21        364 33101  40696 4R   S10_4    
-        21        365 33101  40684 4L   S10_4    
-        21        366 33101  40705 4R   S10_4    
-        21        367 33101  41013 4L   S10_5    
-        21        368 33101  40700 4R   S10_4    
-        21        369 33101  40689 4L   S10_4    
-        21        370 33101  40710 4R   S10_4    
-        21        371 33101  40694 4L   S10_4    
-        21        372 33101  40716 4R   S10_4    
-        21        373 33101  41725 4L   S10_6    
-        21        374 33101  42159 4R   P19      
-        21        375 33101  41730 4L   S10_6    
-        21        376 33101  42164 4R   P19      
-        21        377 33101  41734 4L   S10_6    
-        21        378 33101  42169 4R   P19      
-        21        379 33101  41738 4L   S10_6    
-        21        380 33101  42174 4R   P19      
-        21        381 33101  40055 4L   S10_3    
-        21        382 33101  40095 4R   S10_3    
-        21        383 33101  40675 4L   S10_4    
-        21        384 33101  40697 4R   S10_4    
-        21        385 33101  40685 4L   S10_4    
-        21        386 33101  40706 4R   S10_4    
-        21        387 33101  42152 4L   P19      
-        21        388 33101  40701 4R   S10_4    
-        21        389 33101  40690 4L   S10_4    
-        21        390 33101  40711 4R   S10_4    
-        21        391 33101  40695 4L   S10_4    
-        21        392 33101  40718 4R   S10_4    
-        21        393 33101  41873 4L   P18      
-        21        394 33101  42160 4R   P19      
-        21        395 33101  41732 4L   S10_6    
-        21        396 33101  42165 4R   P19      
-        21        397 33101  41735 4L   S10_6    
-        21        398 33101  42170 4R   P19      
-        21        399 33101  41740 4L   S10_6    
-        21        400 33101  42175 4R   P19      
-        21        401 33101  38400 5L   S9_6     
-        21        402 33101  40126 5R   S10_3    
-        21        403 33101  38398 5L   S9_6     
-        21        404 33101  40131 5R   S10_3    
-        21        405 33101  40721 5L   S10_4    
-        21        406 33101  40136 5R   S10_3    
-        21        407 33101  40726 5L   S10_4    
-        21        408 33101  40128 5R   S10_3    
-        21        409 33101  40732 5L   S10_4    
-        21        410 33101  40749 5R   S10_4    
-        21        411 33101  42196 5L   P19      
-        21        412 33101  40754 5R   S10_4    
-        21        413 33101  40741 5L   S10_4    
-        21        414 33101  40759 5R   S10_4    
-        21        415 33101  42195 5L   P19      
-        21        416 33101  42206 5R   P19      
-        21        417 33101  41745 5L   S10_6    
-        21        418 33101  40129 5R   S10_3    
-        21        419 33101  41756 5L   S10_6    
-        21        420 33101  41764 5R   S10_6    
-        21        421 33101  38386 5L   S9_6     
-        21        422 33101  40127 5R   S10_3    
-        21        423 33101  38399 5L   S9_6     
-        21        424 33101  40132 5R   S10_3    
-        21        425 33101  40722 5L   S10_4    
-        21        426 33101  40137 5R   S10_3    
-        21        427 33101  40727 5L   S10_4    
-        21        428 33101  40130 5R   S10_3    
-        21        429 33101  40734 5L   S10_4    
-        21        430 33101  40750 5R   S10_4    
-        21        431 33101  42197 5L   P19      
-        21        432 33101  40755 5R   S10_4    
-        21        433 33101  40742 5L   S10_4    
-        21        434 33101  42201 5R   P19      
-        21        435 33101  41751 5L   S10_6    
-        21        436 33101  42209 5R   P19      
-        21        437 33101  41747 5L   S10_6    
-        21        438 33101  42199 5R   P19      
-        21        439 33101  41757 5L   S10_6    
-        21        440 33101  41765 5R   S10_6    
-        21        441 33101  37757 5L   S9_4     
-        21        442 33101  40123 5R   S10_3    
-        21        443 33101  41883 5L   P18      
-        21        444 33101  40133 5R   S10_3    
-        21        445 33101  40723 5L   S10_4    
-        21        446 33101  40138 5R   S10_3    
-        21        447 33101  40728 5L   S10_4    
-        21        448 33101  40746 5R   S10_4    
-        21        449 33101  40735 5L   S10_4    
-        21        450 33101  40751 5R   S10_4    
-        21        451 33101  42198 5L   P19      
-        21        452 33101  40756 5R   S10_4    
-        21        453 33101  40743 5L   S10_4    
-        21        454 33101  42203 5R   P19      
-        21        455 33101  41753 5L   S10_6    
-        21        456 33101  42210 5R   P19      
-        21        457 33101  41748 5L   S10_6    
-        21        458 33101  42200 5R   P19      
-        21        459 33101  41758 5L   S10_6    
-        21        460 33101  41766 5R   S10_6    
-        21        461 33101  37770 5L   S9_4     
-        21        462 33101  40124 5R   S10_3    
-        21        463 33101  41884 5L   P18      
-        21        464 33101  40134 5R   S10_3    
-        21        465 33101  40724 5L   S10_4    
-        21        466 33101  40139 5R   S10_3    
-        21        467 33101  40729 5L   S10_4    
-        21        468 33101  40747 5R   S10_4    
-        21        469 33101  40736 5L   S10_4    
-        21        470 33101  40752 5R   S10_4    
-        21        471 33101  40739 5L   S10_4    
-        21        472 33101  40757 5R   S10_4    
-        21        473 33101  40744 5L   S10_4    
-        21        474 33101  42204 5R   P19      
-        21        475 33101  41754 5L   S10_6    
-        21        476 33101  42211 5R   P19      
-        21        477 33101  41749 5L   S10_6    
-        21        478 33101  41014 5R   S10_5    
-        21        479 33101  41759 5L   S10_6    
-        21        480 33101  41767 5R   S10_6    
-        21        481 33101  37796 5L   S9_4     
-        21        482 33101  40125 5R   S10_3    
-        21        483 33101  41885 5L   P18      
-        21        484 33101  40135 5R   S10_3    
-        21        485 33101  40725 5L   S10_4    
-        21        486 33101  40140 5R   S10_3    
-        21        487 33101  40731 5L   S10_4    
-        21        488 33101  40748 5R   S10_4    
-        21        489 33101  40738 5L   S10_4    
-        21        490 33101  40753 5R   S10_4    
-        21        491 33101  40740 5L   S10_4    
-        21        492 33101  40758 5R   S10_4    
-        21        493 33101  40745 5L   S10_4    
-        21        494 33101  42205 5R   P19      
-        21        495 33101  41755 5L   S10_6    
-        21        496 33101  42212 5R   P19      
-        21        497 33101  41750 5L   S10_6    
-        21        498 33101  41886 5R   P18      
-        21        499 33101  41760 5L   S10_6    
-        21        500 33101  41768 5R   S10_6    
-        21        501 33101  40781 6L   S10_4    
-        21        502 33101  40806 6R   S10_4    
-        21        503 33101  42353 6L   P19      
-        21        504 33101  40801 6R   S10_4    
-        21        505 33101  40771 6L   S10_4    
-        21        506 33101  40791 6R   S10_4    
-        21        507 33101  40766 6L   S10_4    
-        21        508 33101  41967 6R   P18      
-        21        509 33101  40786 6L   S10_4    
-        21        510 33101  40371 6R   S10_3    
-        21        511 33101  41957 6L   P18      
-        21        512 33101  40366 6R   S10_3    
-        21        513 33101  35797 6L   P15_2    
-        21        514 33101  40361 6R   S10_3    
-        21        515 33101  37876 6L   S9_5     
-        21        516 33101  40356 6R   S10_3    
-        21        517 33101  37886 6L   S9_5     
-        21        518 33101  41962 6R   P18      
-        21        519 33101  37881 6L   S9_5     
-        21        520 33101  40346 6R   S10_3    
-        21        521 33101  40782 6L   S10_4    
-        21        522 33101  40807 6R   S10_4    
-        21        523 33101  42354 6L   P19      
-        21        524 33101  40802 6R   S10_4    
-        21        525 33101  40772 6L   S10_4    
-        21        526 33101  40792 6R   S10_4    
-        21        527 33101  40767 6L   S10_4    
-        21        528 33101  41968 6R   P18      
-        21        529 33101  40787 6L   S10_4    
-        21        530 33101  40372 6R   S10_3    
-        21        531 33101  41958 6L   P18      
-        21        532 33101  40367 6R   S10_3    
-        21        533 33101  35798 6L   P15_2    
-        21        534 33101  40362 6R   S10_3    
-        21        535 33101  37877 6L   S9_5     
-        21        536 33101  40357 6R   S10_3    
-        21        537 33101  37887 6L   S9_5     
-        21        538 33101  41963 6R   P18      
-        21        539 33101  37882 6L   S9_5     
-        21        540 33101  40347 6R   S10_3    
-        21        541 33101  40783 6L   S10_4    
-        21        542 33101  40808 6R   S10_4    
-        21        543 33101  42355 6L   P19      
-        21        544 33101  40803 6R   S10_4    
-        21        545 33101  40773 6L   S10_4    
-        21        546 33101  40793 6R   S10_4    
-        21        547 33101  40768 6L   S10_4    
-        21        548 33101  41969 6R   P18      
-        21        549 33101  40788 6L   S10_4    
-        21        550 33101  37906 6R   S9_5     
-        21        551 33101  41952 6L   P18      
-        21        552 33101  40368 6R   S10_3    
-        21        553 33101  37851 6L   S9_4     
-        21        554 33101  40363 6R   S10_3    
-        21        555 33101  37878 6L   S9_5     
-        21        556 33101  40358 6R   S10_3    
-        21        557 33101  37888 6L   S9_5     
-        21        558 33101  41964 6R   P18      
-        21        559 33101  37883 6L   S9_5     
-        21        560 33101  40348 6R   S10_3    
-        21        561 33101  40784 6L   S10_4    
-        21        562 33101  40809 6R   S10_4    
-        21        563 33101  37853 6L   S9_4     
-        21        564 33101  40804 6R   S10_4    
-        21        565 33101  40774 6L   S10_4    
-        21        566 33101  42365 6R   P19      
-        21        567 33101  40779 6L   S10_4    
-        21        568 33101  41970 6R   P18      
-        21        569 33101  40789 6L   S10_4    
-        21        570 33101  37907 6R   S9_5     
-        21        571 33101  41960 6L   P18      
-        21        572 33101  40369 6R   S10_3    
-        21        573 33101  37854 6L   S9_4     
-        21        574 33101  40364 6R   S10_3    
-        21        575 33101  37879 6L   S9_5     
-        21        576 33101  40359 6R   S10_3    
-        21        577 33101  37889 6L   S9_5     
-        21        578 33101  41965 6R   P18      
-        21        579 33101  37884 6L   S9_5     
-        21        580 33101  40349 6R   S10_3    
-        21        581 33101  40785 6L   S10_4    
-        21        582 33101  40810 6R   S10_4    
-        21        583 33101  42357 6L   P19      
-        21        584 33101  40805 6R   S10_4    
-        21        585 33101  40775 6L   S10_4    
-        21        586 33101  40795 6R   S10_4    
-        21        587 33101  40770 6L   S10_4    
-        21        588 33101  40351 6R   S10_3    
-        21        589 33101  40790 6L   S10_4    
-        21        590 33101  37908 6R   S9_5     
-        21        591 33101  41961 6L   P18      
-        21        592 33101  40370 6R   S10_3    
-        21        593 33101  37855 6L   S9_4     
-        21        594 33101  40365 6R   S10_3    
-        21        595 33101  37880 6L   S9_5     
-        21        596 33101  40360 6R   S10_3    
-        21        597 33101  37890 6L   S9_5     
-        21        598 33101  41966 6R   P18      
-        21        599 33101  37885 6L   S9_5     
-        21        600 33101  40350 6R   S10_3    
-        21        601 33101  41225 7L   S10_5    
-        21        602 33101  42369 7R   P19      
-        21        603 33101  41977 7L   P18      
-        21        604 33101  40856 7R   S10_4    
-        21        605 33101  41976 7L   P18      
-        21        606 33101  40874 7R   S10_4    
-        21        607 33101  40826 7L   S10_4    
-        21        608 33101  42374 7R   P19      
-        21        609 33101  40821 7L   S10_4    
-        21        610 33101  40851 7R   S10_4    
-        21        611 33101  40846 7L   S10_4    
-        21        612 33101  40860 7R   S10_4    
-        21        613 33101  41971 7L   P18      
-        21        614 33101  40866 7R   S10_4    
-        21        615 33101  40831 7L   S10_4    
-        21        616 33101  40871 7R   S10_4    
-        21        617 33101  41980 7L   P18      
-        21        618 33101  40373 7R   S10_3    
-        21        619 33101  40841 7L   S10_4    
-        21        620 33101  40378 7R   S10_3    
-        21        621 33101  41226 7L   S10_5    
-        21        622 33101  42370 7R   P19      
-        21        623 33101  40837 7L   S10_4    
-        21        624 33101  40865 7R   S10_4    
-        21        625 33101  40836 7L   S10_4    
-        21        626 33101  40877 7R   S10_4    
-        21        627 33101  40827 7L   S10_4    
-        21        628 33101  42375 7R   P19      
-        21        629 33101  40822 7L   S10_4    
-        21        630 33101  40858 7R   S10_4    
-        21        631 33101  40847 7L   S10_4    
-        21        632 33101  40862 7R   S10_4    
-        21        633 33101  41972 7L   P18      
-        21        634 33101  40867 7R   S10_4    
-        21        635 33101  40832 7L   S10_4    
-        21        636 33101  40872 7R   S10_4    
-        21        637 33101  41982 7L   P18      
-        21        638 33101  40374 7R   S10_3    
-        21        639 33101  40840 7L   S10_4    
-        21        640 33101  40379 7R   S10_3    
-        21        641 33101  41227 7L   S10_5    
-        21        642 33101  42371 7R   P19      
-        21        643 33101  40848 7L   S10_4    
-        21        644 33101  40852 7R   S10_4    
-        21        645 33101  41978 7L   P18      
-        21        646 33101  40878 7R   S10_4    
-        21        647 33101  40828 7L   S10_4    
-        21        648 33101  42376 7R   P19      
-        21        649 33101  40823 7L   S10_4    
-        21        650 33101  40853 7R   S10_4    
-        21        651 33101  40838 7L   S10_4    
-        21        652 33101  40863 7R   S10_4    
-        21        653 33101  41973 7L   P18      
-        21        654 33101  40880 7R   S10_4    
-        21        655 33101  40833 7L   S10_4    
-        21        656 33101  40873 7R   S10_4    
-        21        657 33101  41983 7L   P18      
-        21        658 33101  40375 7R   S10_3    
-        21        659 33101  40843 7L   S10_4    
-        21        660 33101  40380 7R   S10_3    
-        21        661 33101  41228 7L   S10_6    
-        21        662 33101  42372 7R   P19      
-        21        663 33101  40839 7L   S10_4    
-        21        664 33101  40859 7R   S10_4    
-        21        665 33101  41979 7L   P18      
-        21        666 33101  40879 7R   S10_4    
-        21        667 33101  40829 7L   S10_4    
-        21        668 33101  40398 7R   S10_3    
-        21        669 33101  40824 7L   S10_4    
-        21        670 33101  40854 7R   S10_4    
-        21        671 33101  40849 7L   S10_4    
-        21        672 33101  40864 7R   S10_4    
-        21        673 33101  41974 7L   P18      
-        21        674 33101  40869 7R   S10_4    
-        21        675 33101  40834 7L   S10_4    
-        21        676 33101  40876 7R   S10_4    
-        21        677 33101  41984 7L   P18      
-        21        678 33101  40376 7R   S10_3    
-        21        679 33101  40844 7L   S10_4    
-        21        680 33101  40381 7R   S10_3    
-        21        681 33101  41229 7L   S10_6    
-        21        682 33101  42373 7R   P19      
-        21        683 33101  40842 7L   S10_4    
-        21        684 33101  40861 7R   S10_4    
-        21        685 33101  41981 7L   P18      
-        21        686 33101  40868 7R   S10_4    
-        21        687 33101  40830 7L   S10_4    
-        21        688 33101  40399 7R   S10_3    
-        21        689 33101  40825 7L   S10_4    
-        21        690 33101  40855 7R   S10_4    
-        21        691 33101  40850 7L   S10_4    
-        21        692 33101  40857 7R   S10_4    
-        21        693 33101  41975 7L   P18      
-        21        694 33101  40870 7R   S10_4    
-        21        695 33101  40835 7L   S10_4    
-        21        696 33101  40875 7R   S10_4    
-        21        697 33101  35857 7L   P15_2    
-        21        698 33101  40377 7R   S10_3    
-        21        699 33101  40845 7L   S10_4    
-        21        700 33101  40382 7R   S10_3    
-        21        701 33101  42377 8L   P19      
-        21        702 33101  40931 8R   S10_4    
-        21        703 33101  41995 8L   P18      
-        21        704 33101  40401 8R   S10_3    
-        21        705 33101  40891 8L   S10_4    
-        21        706 33101  40913 8R   S10_4    
-        21        707 33101  40906 8L   S10_4    
-        21        708 33101  40911 8R   S10_4    
-        21        709 33101  40901 8L   S10_4    
-        21        710 33101  40921 8R   S10_4    
-        21        711 33101  40896 8L   S10_4    
-        21        712 33101  40916 8R   S10_4    
-        21        713 33101  41990 8L   P18      
-        21        714 33101  42004 8R   P18      
-        21        715 33101  38005 8L   S9_5     
-        21        716 33101  41999 8R   P18      
-        21        717 33101  38010 8L   S9_5     
-        21        718 33101  38018 8R   S9_5     
-        21        719 33101  37965 8L   S9_5     
-        21        720 33101  38028 8R   S9_5     
-        21        721 33101  42378 8L   P19      
-        21        722 33101  40932 8R   S10_4    
-        21        723 33101  41996 8L   P18      
-        21        724 33101  40937 8R   S10_4    
-        21        725 33101  40892 8L   S10_4    
-        21        726 33101  40927 8R   S10_4    
-        21        727 33101  40907 8L   S10_4    
-        21        728 33101  40912 8R   S10_4    
-        21        729 33101  40902 8L   S10_4    
-        21        730 33101  40922 8R   S10_4    
-        21        731 33101  40897 8L   S10_4    
-        21        732 33101  40917 8R   S10_4    
-        21        733 33101  41991 8L   P18      
-        21        734 33101  42005 8R   P18      
-        21        735 33101  38006 8L   S9_5     
-        21        736 33101  42000 8R   P18      
-        21        737 33101  38011 8L   S9_5     
-        21        738 33101  38019 8R   S9_5     
-        21        739 33101  37966 8L   S9_5     
-        21        740 33101  38029 8R   S9_5     
-        21        741 33101  42379 8L   P19      
-        21        742 33101  40933 8R   S10_4    
-        21        743 33101  41997 8L   P18      
-        21        744 33101  40938 8R   S10_4    
-        21        745 33101  40893 8L   S10_4    
-        21        746 33101  40928 8R   S10_4    
-        21        747 33101  40908 8L   S10_4    
-        21        748 33101  40914 8R   S10_4    
-        21        749 33101  40903 8L   S10_4    
-        21        750 33101  40923 8R   S10_4    
-        21        751 33101  40898 8L   S10_4    
-        21        752 33101  40918 8R   S10_4    
-        21        753 33101  41992 8L   P18      
-        21        754 33101  42006 8R   P18      
-        21        755 33101  38007 8L   S9_5     
-        21        756 33101  42001 8R   P18      
-        21        757 33101  38012 8L   S9_5     
-        21        758 33101  38020 8R   S9_5     
-        21        759 33101  37967 8L   S9_5     
-        21        760 33101  38030 8R   S9_5     
-        21        761 33101  42380 8L   P19      
-        21        762 33101  40934 8R   S10_4    
-        21        763 33101  41998 8L   P18      
-        21        764 33101  40939 8R   S10_4    
-        21        765 33101  40894 8L   S10_4    
-        21        766 33101  40929 8R   S10_4    
-        21        767 33101  40909 8L   S10_4    
-        21        768 33101  40915 8R   S10_4    
-        21        769 33101  40904 8L   S10_4    
-        21        770 33101  40924 8R   S10_4    
-        21        771 33101  40899 8L   S10_4    
-        21        772 33101  40919 8R   S10_4    
-        21        773 33101  41993 8L   P18      
-        21        774 33101  42007 8R   P18      
-        21        775 33101  38008 8L   S9_5     
-        21        776 33101  42002 8R   P18      
-        21        777 33101  35933 8L   P15_2    
-        21        778 33101  38021 8R   S9_5     
-        21        779 33101  37968 8L   S9_5     
-        21        780 33101  38040 8R   S9_5     
-        21        781 33101  42381 8L   P19      
-        21        782 33101  40935 8R   S10_4    
-        21        783 33101  40400 8L   S10_3    
-        21        784 33101  40940 8R   S10_4    
-        21        785 33101  40895 8L   S10_4    
-        21        786 33101  40930 8R   S10_4    
-        21        787 33101  40910 8L   S10_4    
-        21        788 33101  40926 8R   S10_4    
-        21        789 33101  40905 8L   S10_4    
-        21        790 33101  40925 8R   S10_4    
-        21        791 33101  40900 8L   S10_4    
-        21        792 33101  40920 8R   S10_4    
-        21        793 33101  41994 8L   P18      
-        21        794 33101  38058 8R   S9_5     
-        21        795 33101  38009 8L   S9_5     
-        21        796 33101  42003 8R   P18      
-        21        797 33101  35934 8L   P15_2    
-        21        798 33101  38022 8R   S9_5     
-        21        799 33101  37969 8L   S9_5     
-        21        800 33101  38055 8R   S9_5     
-        21        801 33101  42382 9L   P19      
-        21        802 33101  41261 9R   S10_5    
-        21        803 33101  40951 9L   S10_4    
-        21        804 33101  42387 9R   P19      
-        21        805 33101  42386 9L   P19      
-        21        806 33101  40996 9R   S10_4    
-        21        807 33101  40956 9L   S10_4    
-        21        808 33101  40981 9R   S10_4    
-        21        809 33101  40941 9L   S10_4    
-        21        810 33101  40986 9R   S10_4    
-        21        811 33101  40966 9L   S10_4    
-        21        812 33101  40991 9R   S10_4    
-        21        813 33101  40946 9L   S10_4    
-        21        814 33101  40976 9R   S10_4    
-        21        815 33101  40408 9L   S10_3    
-        21        816 33101  40971 9R   S10_4    
-        21        817 33101  40413 9L   S10_3    
-        21        818 33101  40422 9R   S10_3    
-        21        819 33101  40403 9L   S10_3    
-        21        820 33101  42022 9R   P18      
-        21        821 33101  40944 9L   S10_4    
-        21        822 33101  41262 9R   S10_5    
-        21        823 33101  40952 9L   S10_4    
-        21        824 33101  42388 9R   P19      
-        21        825 33101  40962 9L   S10_4    
-        21        826 33101  40997 9R   S10_4    
-        21        827 33101  40957 9L   S10_4    
-        21        828 33101  40982 9R   S10_4    
-        21        829 33101  40942 9L   S10_4    
-        21        830 33101  40987 9R   S10_4    
-        21        831 33101  40967 9L   S10_4    
-        21        832 33101  40992 9R   S10_4    
-        21        833 33101  42385 9L   P19      
-        21        834 33101  40977 9R   S10_4    
-        21        835 33101  40409 9L   S10_3    
-        21        836 33101  40972 9R   S10_4    
-        21        837 33101  40414 9L   S10_3    
-        21        838 33101  40423 9R   S10_3    
-        21        839 33101  40404 9L   S10_3    
-        21        840 33101  42018 9R   P18      
-        21        841 33101  42384 9L   P19      
-        21        842 33101  41263 9R   S10_6    
-        21        843 33101  40953 9L   S10_4    
-        21        844 33101  42389 9R   P19      
-        21        845 33101  40963 9L   S10_4    
-        21        846 33101  40998 9R   S10_4    
-        21        847 33101  40958 9L   S10_4    
-        21        848 33101  40983 9R   S10_4    
-        21        849 33101  40943 9L   S10_4    
-        21        850 33101  40988 9R   S10_4    
-        21        851 33101  40968 9L   S10_4    
-        21        852 33101  40993 9R   S10_4    
-        21        853 33101  40948 9L   S10_4    
-        21        854 33101  42016 9R   P18      
-        21        855 33101  40410 9L   S10_3    
-        21        856 33101  40973 9R   S10_4    
-        21        857 33101  40415 9L   S10_3    
-        21        858 33101  40424 9R   S10_3    
-        21        859 33101  40405 9L   S10_3    
-        21        860 33101  42019 9R   P18      
-        21        861 33101  40947 9L   S10_4    
-        21        862 33101  41264 9R   S10_6    
-        21        863 33101  40954 9L   S10_4    
-        21        864 33101  42390 9R   P19      
-        21        865 33101  40964 9L   S10_4    
-        21        866 33101  40999 9R   S10_4    
-        21        867 33101  40959 9L   S10_4    
-        21        868 33101  40984 9R   S10_4    
-        21        869 33101  42383 9L   P19      
-        21        870 33101  40989 9R   S10_4    
-        21        871 33101  40969 9L   S10_4    
-        21        872 33101  40994 9R   S10_4    
-        21        873 33101  40949 9L   S10_4    
-        21        874 33101  40979 9R   S10_4    
-        21        875 33101  40411 9L   S10_3    
-        21        876 33101  40974 9R   S10_4    
-        21        877 33101  40416 9L   S10_3    
-        21        878 33101  42021 9R   P18      
-        21        879 33101  40406 9L   S10_3    
-        21        880 33101  42020 9R   P18      
-        21        881 33101  40961 9L   S10_4    
-        21        882 33101  41265 9R   S10_6    
-        21        883 33101  40955 9L   S10_4    
-        21        884 33101  42391 9R   P19      
-        21        885 33101  40965 9L   S10_4    
-        21        886 33101  41000 9R   S10_4    
-        21        887 33101  40960 9L   S10_4    
-        21        888 33101  40985 9R   S10_4    
-        21        889 33101  40945 9L   S10_4    
-        21        890 33101  40990 9R   S10_4    
-        21        891 33101  40970 9L   S10_4    
-        21        892 33101  40995 9R   S10_4    
-        21        893 33101  40950 9L   S10_4    
-        21        894 33101  40980 9R   S10_4    
-        21        895 33101  40412 9L   S10_3    
-        21        896 33101  40975 9R   S10_4    
-        21        897 33101  40417 9L   S10_3    
-        21        898 33101  42026 9R   P18      
-        21        899 33101  40407 9L   S10_3    
-        21        900 33101  42024 9R   P18      
-        21        901 33101  41296 10L  S10_5    
-        21        902 33101  41346 10R  S10_5    
-        21        903 33101  41291 10L  S10_5    
-        21        904 33101  41341 10R  S10_5    
-        21        905 33101  41286 10L  S10_5    
-        21        906 33101  41336 10R  S10_5    
-        21        907 33101  41266 10L  S10_5    
-        21        908 33101  41331 10R  S10_5    
-        21        909 33101  41276 10L  S10_5    
-        21        910 33101  41351 10R  S10_5    
-        21        911 33101  41281 10L  S10_5    
-        21        912 33101  41322 10R  S10_5    
-        21        913 33101  41306 10L  S10_5    
-        21        914 33101  41326 10R  S10_5    
-        21        915 33101  42397 10L  P19      
-        21        916 33101  41316 10R  S10_5    
-        21        917 33101  42392 10L  P19      
-        21        918 33101  41311 10R  S10_5    
-        21        919 33101  42028 10L  P18      
-        21        920 33101  39911 10R  S10_2    
-        21        921 33101  41297 10L  S10_5    
-        21        922 33101  41347 10R  S10_5    
-        21        923 33101  41292 10L  S10_5    
-        21        924 33101  41342 10R  S10_5    
-        21        925 33101  41287 10L  S10_5    
-        21        926 33101  41337 10R  S10_5    
-        21        927 33101  41267 10L  S10_5    
-        21        928 33101  41332 10R  S10_5    
-        21        929 33101  41277 10L  S10_5    
-        21        930 33101  41352 10R  S10_6    
-        21        931 33101  41282 10L  S10_5    
-        21        932 33101  42402 10R  P19      
-        21        933 33101  41307 10L  S10_5    
-        21        934 33101  41327 10R  S10_5    
-        21        935 33101  42398 10L  P19      
-        21        936 33101  41317 10R  S10_5    
-        21        937 33101  42393 10L  P19      
-        21        938 33101  41312 10R  S10_5    
-        21        939 33101  42029 10L  P18      
-        21        940 33101  39912 10R  S10_2    
-        21        941 33101  41298 10L  S10_5    
-        21        942 33101  41348 10R  S10_5    
-        21        943 33101  41293 10L  S10_5    
-        21        944 33101  41343 10R  S10_5    
-        21        945 33101  41288 10L  S10_5    
-        21        946 33101  41338 10R  S10_5    
-        21        947 33101  41268 10L  S10_5    
-        21        948 33101  41333 10R  S10_5    
-        21        949 33101  41278 10L  S10_5    
-        21        950 33101  38152 10R  S9_6     
-        21        951 33101  41283 10L  S10_5    
-        21        952 33101  42403 10R  P19      
-        21        953 33101  41308 10L  S10_5    
-        21        954 33101  41328 10R  S10_5    
-        21        955 33101  42399 10L  P19      
-        21        956 33101  41318 10R  S10_5    
-        21        957 33101  42394 10L  P19      
-        21        958 33101  41313 10R  S10_5    
-        21        959 33101  42030 10L  P18      
-        21        960 33101  39913 10R  S10_2    
-        21        961 33101  41299 10L  S10_5    
-        21        962 33101  41325 10R  S10_5    
-        21        963 33101  41294 10L  S10_5    
-        21        964 33101  41344 10R  S10_5    
-        21        965 33101  41289 10L  S10_5    
-        21        966 33101  41339 10R  S10_5    
-        21        967 33101  41269 10L  S10_5    
-        21        968 33101  41334 10R  S10_5    
-        21        969 33101  41279 10L  S10_5    
-        21        970 33101  42046 10R  P18      
-        21        971 33101  41284 10L  S10_5    
-        21        972 33101  41323 10R  S10_5    
-        21        973 33101  41309 10L  S10_5    
-        21        974 33101  41329 10R  S10_5    
-        21        975 33101  42400 10L  P19      
-        21        976 33101  41319 10R  S10_5    
-        21        977 33101  42395 10L  P19      
-        21        978 33101  41314 10R  S10_5    
-        21        979 33101  42031 10L  P18      
-        21        980 33101  39914 10R  S10_2    
-        21        981 33101  41300 10L  S10_5    
-        21        982 33101  41350 10R  S10_5    
-        21        983 33101  41295 10L  S10_5    
-        21        984 33101  41345 10R  S10_5    
-        21        985 33101  41290 10L  S10_5    
-        21        986 33101  41340 10R  S10_5    
-        21        987 33101  41270 10L  S10_5    
-        21        988 33101  41335 10R  S10_5    
-        21        989 33101  41280 10L  S10_5    
-        21        990 33101  42047 10R  P18      
-        21        991 33101  41285 10L  S10_5    
-        21        992 33101  42048 10R  P18      
-        21        993 33101  41310 10L  S10_5    
-        21        994 33101  41330 10R  S10_5    
-        21        995 33101  39902 10L  S10_2    
-        21        996 33101  41320 10R  S10_5    
-        21        997 33101  42396 10L  P19      
-        21        998 33101  41315 10R  S10_5    
-        21        999 33101  42035 10L  P18      
-        21       1000 33101  39915 10R  S10_2    
-        21       1001 33101  41363 11L  S10_5    
-        21       1002 33101  41394 11R  S10_5    
-        21       1003 33101  41368 11L  S10_5    
-        21       1004 33101  41414 11R  S10_5    
-        21       1005 33101  41358 11L  S10_5    
-        21       1006 33101  41404 11R  S10_5    
-        21       1007 33101  41353 11L  S10_5    
-        21       1008 33101  41389 11R  S10_5    
-        21       1009 33101  42410 11L  P19      
-        21       1010 33101  41399 11R  S10_5    
-        21       1011 33101  42405 11L  P19      
-        21       1012 33101  42421 11R  P19      
-        21       1013 33101  42415 11L  P19      
-        21       1014 33101  41379 11R  S10_5    
-        21       1015 33101  34797 11L  S8_4     
-        21       1016 33101  41390 11R  S10_5    
-        21       1017 33101  39921 11L  S10_2    
-        21       1018 33101  39931 11R  S10_2    
-        21       1019 33101  39916 11L  S10_2    
-        21       1020 33101  39926 11R  S10_2    
-        21       1021 33101  41364 11L  S10_5    
-        21       1022 33101  41395 11R  S10_5    
-        21       1023 33101  41369 11L  S10_5    
-        21       1024 33101  41413 11R  S10_5    
-        21       1025 33101  41359 11L  S10_5    
-        21       1026 33101  41405 11R  S10_5    
-        21       1027 33101  41354 11L  S10_5    
-        21       1028 33101  41384 11R  S10_5    
-        21       1029 33101  42411 11L  P19      
-        21       1030 33101  41400 11R  S10_5    
-        21       1031 33101  42406 11L  P19      
-        21       1032 33101  42422 11R  P19      
-        21       1033 33101  42416 11L  P19      
-        21       1034 33101  41380 11R  S10_5    
-        21       1035 33101  42052 11L  P18      
-        21       1036 33101  41385 11R  S10_5    
-        21       1037 33101  39922 11L  S10_2    
-        21       1038 33101  39932 11R  S10_2    
-        21       1039 33101  39917 11L  S10_2    
-        21       1040 33101  39927 11R  S10_2    
-        21       1041 33101  41375 11L  S10_5    
-        21       1042 33101  41396 11R  S10_5    
-        21       1043 33101  41370 11L  S10_5    
-        21       1044 33101  41416 11R  S10_5    
-        21       1045 33101  41360 11L  S10_5    
-        21       1046 33101  41406 11R  S10_5    
-        21       1047 33101  41355 11L  S10_5    
-        21       1048 33101  41391 11R  S10_5    
-        21       1049 33101  42412 11L  P19      
-        21       1050 33101  41401 11R  S10_5    
-        21       1051 33101  42407 11L  P19      
-        21       1052 33101  42423 11R  P19      
-        21       1053 33101  42417 11L  P19      
-        21       1054 33101  41381 11R  S10_5    
-        21       1055 33101  42056 11L  P18      
-        21       1056 33101  41386 11R  S10_5    
-        21       1057 33101  39923 11L  S10_2    
-        21       1058 33101  39933 11R  S10_2    
-        21       1059 33101  39918 11L  S10_2    
-        21       1060 33101  39928 11R  S10_2    
-        21       1061 33101  41366 11L  S10_5    
-        21       1062 33101  41409 11R  S10_5    
-        21       1063 33101  41371 11L  S10_5    
-        21       1064 33101  41417 11R  S10_5    
-        21       1065 33101  41361 11L  S10_5    
-        21       1066 33101  41407 11R  S10_5    
-        21       1067 33101  41356 11L  S10_5    
-        21       1068 33101  42425 11R  P19      
-        21       1069 33101  42413 11L  P19      
-        21       1070 33101  41398 11R  S10_5    
-        21       1071 33101  42408 11L  P19      
-        21       1072 33101  42424 11R  P19      
-        21       1073 33101  42418 11L  P19      
-        21       1074 33101  41382 11R  S10_5    
-        21       1075 33101  40443 11L  S10_3    
-        21       1076 33101  41387 11R  S10_5    
-        21       1077 33101  39924 11L  S10_2    
-        21       1078 33101  39934 11R  S10_2    
-        21       1079 33101  39919 11L  S10_2    
-        21       1080 33101  39929 11R  S10_2    
-        21       1081 33101  41367 11L  S10_5    
-        21       1082 33101  41412 11R  S10_5    
-        21       1083 33101  41372 11L  S10_5    
-        21       1084 33101  41418 11R  S10_5    
-        21       1085 33101  41362 11L  S10_5    
-        21       1086 33101  41408 11R  S10_5    
-        21       1087 33101  41357 11L  S10_5    
-        21       1088 33101  41393 11R  S10_5    
-        21       1089 33101  42414 11L  P19      
-        21       1090 33101  41403 11R  S10_5    
-        21       1091 33101  42409 11L  P19      
-        21       1092 33101  41392 11R  S10_5    
-        21       1093 33101  42419 11L  P19      
-        21       1094 33101  41383 11R  S10_5    
-        21       1095 33101  40450 11L  S10_3    
-        21       1096 33101  41388 11R  S10_5    
-        21       1097 33101  39925 11L  S10_2    
-        21       1098 33101  39935 11R  S10_2    
-        21       1099 33101  39920 11L  S10_2    
-        21       1100 33101  39930 11R  S10_2    
-        21       1101 33101  41424 12L  S10_5    
-        21       1102 33101  41455 12R  S10_5    
-        21       1103 33101  41429 12L  S10_5    
-        21       1104 33101  41450 12R  S10_5    
-        21       1105 33101  42427 12L  P19      
-        21       1106 33101  41445 12R  S10_5    
-        21       1107 33101  42067 12L  P18      
-        21       1108 33101  41475 12R  S10_6    
-        21       1109 33101  39936 12L  S10_2    
-        21       1110 33101  41470 12R  S10_5    
-        21       1111 33101  39946 12L  S10_2    
-        21       1112 33101  41440 12R  S10_5    
-        21       1113 33101  39941 12L  S10_2    
-        21       1114 33101  41435 12R  S10_5    
-        21       1115 33101  40472 12L  S10_3    
-        21       1116 33101  39956 12R  S10_2    
-        21       1117 33101  40477 12L  S10_3    
-        21       1118 33101  39961 12R  S10_2    
-        21       1119 33101  39951 12L  S10_2    
-        21       1120 33101  39966 12R  S10_2    
-        21       1121 33101  41425 12L  S10_5    
-        21       1122 33101  41456 12R  S10_5    
-        21       1123 33101  41430 12L  S10_5    
-        21       1124 33101  41451 12R  S10_5    
-        21       1125 33101  42432 12L  P19      
-        21       1126 33101  41446 12R  S10_5    
-        21       1127 33101  42068 12L  P18      
-        21       1128 33101  42075 12R  P18      
-        21       1129 33101  39937 12L  S10_2    
-        21       1130 33101  41471 12R  S10_5    
-        21       1131 33101  39947 12L  S10_2    
-        21       1132 33101  41441 12R  S10_5    
-        21       1133 33101  39942 12L  S10_2    
-        21       1134 33101  41436 12R  S10_5    
-        21       1135 33101  40473 12L  S10_3    
-        21       1136 33101  39957 12R  S10_2    
-        21       1137 33101  40478 12L  S10_3    
-        21       1138 33101  39962 12R  S10_2    
-        21       1139 33101  39952 12L  S10_2    
-        21       1140 33101  39967 12R  S10_2    
-        21       1141 33101  41426 12L  S10_5    
-        21       1142 33101  41457 12R  S10_5    
-        21       1143 33101  41431 12L  S10_5    
-        21       1144 33101  41452 12R  S10_5    
-        21       1145 33101  42433 12L  P19      
-        21       1146 33101  41447 12R  S10_5    
-        21       1147 33101  42069 12L  P18      
-        21       1148 33101  42081 12R  P18      
-        21       1149 33101  39938 12L  S10_2    
-        21       1150 33101  41468 12R  S10_5    
-        21       1151 33101  39948 12L  S10_2    
-        21       1152 33101  41442 12R  S10_5    
-        21       1153 33101  39943 12L  S10_2    
-        21       1154 33101  41437 12R  S10_5    
-        21       1155 33101  40474 12L  S10_3    
-        21       1156 33101  39958 12R  S10_2    
-        21       1157 33101  40479 12L  S10_3    
-        21       1158 33101  39963 12R  S10_2    
-        21       1159 33101  39953 12L  S10_2    
-        21       1160 33101  39968 12R  S10_2    
-        21       1161 33101  41427 12L  S10_5    
-        21       1162 33101  41458 12R  S10_5    
-        21       1163 33101  41432 12L  S10_5    
-        21       1164 33101  41453 12R  S10_5    
-        21       1165 33101  38207 12L  S9_6     
-        21       1166 33101  41448 12R  S10_5    
-        21       1167 33101  42070 12L  P18      
-        21       1168 33101  42082 12R  P18      
-        21       1169 33101  39939 12L  S10_2    
-        21       1170 33101  41473 12R  S10_5    
-        21       1171 33101  39949 12L  S10_2    
-        21       1172 33101  41443 12R  S10_5    
-        21       1173 33101  39944 12L  S10_2    
-        21       1174 33101  41438 12R  S10_5    
-        21       1175 33101  40475 12L  S10_3    
-        21       1176 33101  39959 12R  S10_2    
-        21       1177 33101  40480 12L  S10_3    
-        21       1178 33101  39964 12R  S10_2    
-        21       1179 33101  39954 12L  S10_2    
-        21       1180 33101  39969 12R  S10_2    
-        21       1181 33101  41428 12L  S10_5    
-        21       1182 33101  41459 12R  S10_5    
-        21       1183 33101  41423 12L  S10_5    
-        21       1184 33101  41454 12R  S10_5    
-        21       1185 33101  38208 12L  S9_6     
-        21       1186 33101  41449 12R  S10_5    
-        21       1187 33101  42071 12L  P18      
-        21       1188 33101  42083 12R  P18      
-        21       1189 33101  39940 12L  S10_2    
-        21       1190 33101  41474 12R  S10_6    
-        21       1191 33101  39950 12L  S10_2    
-        21       1192 33101  41444 12R  S10_5    
-        21       1193 33101  39945 12L  S10_2    
-        21       1194 33101  41439 12R  S10_5    
-        21       1195 33101  40476 12L  S10_3    
-        21       1196 33101  39960 12R  S10_2    
-        21       1197 33101  38206 12L  S9_6     
-        21       1198 33101  39965 12R  S10_2    
-        21       1199 33101  39955 12L  S10_2    
-        21       1200 33101  39970 12R  S10_2    
-        21       1201 33101  41781 13L  S10_5    
-        21       1202 33101  41795 13R  S10_5    
-        21       1203 33101  41486 13L  S10_5    
-        21       1204 33101  42441 13R  P19      
-        21       1205 33101  41481 13L  S10_5    
-        21       1206 33101  41785 13R  S10_5    
-        21       1207 33101  41496 13L  S10_5    
-        21       1208 33101  40500 13R  S10_3    
-        21       1209 33101  41491 13L  S10_5    
-        21       1210 33101  42100 13R  P18      
-        21       1211 33101  42084 13L  P18      
-        21       1212 33101  42446 13R  P19      
-        21       1213 33101  42434 13L  P19      
-        21       1214 33101  39996 13R  S10_2    
-        21       1215 33101  39981 13L  S10_2    
-        21       1216 33101  39986 13R  S10_2    
-        21       1217 33101  42089 13L  P18      
-        21       1218 33101  39991 13R  S10_2    
-        21       1219 33101  42094 13L  P18      
-        21       1220 33101  40495 13R  S10_3    
-        21       1221 33101  41778 13L  S10_5    
-        21       1222 33101  41796 13R  S10_5    
-        21       1223 33101  41487 13L  S10_5    
-        21       1224 33101  42442 13R  P19      
-        21       1225 33101  41482 13L  S10_5    
-        21       1226 33101  41786 13R  S10_5    
-        21       1227 33101  41497 13L  S10_5    
-        21       1228 33101  40493 13R  S10_3    
-        21       1229 33101  41492 13L  S10_5    
-        21       1230 33101  40489 13R  S10_3    
-        21       1231 33101  42085 13L  P18      
-        21       1232 33101  42447 13R  P19      
-        21       1233 33101  42435 13L  P19      
-        21       1234 33101  39997 13R  S10_2    
-        21       1235 33101  39982 13L  S10_2    
-        21       1236 33101  39987 13R  S10_2    
-        21       1237 33101  42090 13L  P18      
-        21       1238 33101  39992 13R  S10_2    
-        21       1239 33101  40481 13L  S10_3    
-        21       1240 33101  42096 13R  P18      
-        21       1241 33101  41783 13L  S10_5    
-        21       1242 33101  41797 13R  S10_5    
-        21       1243 33101  41488 13L  S10_5    
-        21       1244 33101  42443 13R  P19      
-        21       1245 33101  41483 13L  S10_5    
-        21       1246 33101  41787 13R  S10_5    
-        21       1247 33101  41498 13L  S10_5    
-        21       1248 33101  40497 13R  S10_3    
-        21       1249 33101  41493 13L  S10_5    
-        21       1250 33101  40490 13R  S10_3    
-        21       1251 33101  42086 13L  P18      
-        21       1252 33101  42444 13R  P19      
-        21       1253 33101  42436 13L  P19      
-        21       1254 33101  39998 13R  S10_2    
-        21       1255 33101  39983 13L  S10_2    
-        21       1256 33101  39988 13R  S10_2    
-        21       1257 33101  42091 13L  P18      
-        21       1258 33101  39993 13R  S10_2    
-        21       1259 33101  40482 13L  S10_3    
-        21       1260 33101  42097 13R  P18      
-        21       1261 33101  41784 13L  S10_5    
-        21       1262 33101  41798 13R  S10_5    
-        21       1263 33101  41489 13L  S10_5    
-        21       1264 33101  42448 13R  P19      
-        21       1265 33101  41484 13L  S10_5    
-        21       1266 33101  41788 13R  S10_5    
-        21       1267 33101  41478 13L  S10_5    
-        21       1268 33101  40494 13R  S10_3    
-        21       1269 33101  41477 13L  S10_5    
-        21       1270 33101  40491 13R  S10_3    
-        21       1271 33101  42087 13L  P18      
-        21       1272 33101  42449 13R  P19      
-        21       1273 33101  42437 13L  P19      
-        21       1274 33101  39999 13R  S10_2    
-        21       1275 33101  39984 13L  S10_2    
-        21       1276 33101  39989 13R  S10_2    
-        21       1277 33101  42092 13L  P18      
-        21       1278 33101  39994 13R  S10_2    
-        21       1279 33101  40483 13L  S10_3    
-        21       1280 33101  42098 13R  P18      
-        21       1281 33101  42439 13L  P19      
-        21       1282 33101  41799 13R  S10_5    
-        21       1283 33101  41490 13L  S10_5    
-        21       1284 33101  42445 13R  P19      
-        21       1285 33101  41485 13L  S10_5    
-        21       1286 33101  41789 13R  S10_5    
-        21       1287 33101  41500 13L  S10_5    
-        21       1288 33101  40496 13R  S10_3    
-        21       1289 33101  41495 13L  S10_5    
-        21       1290 33101  40492 13R  S10_3    
-        21       1291 33101  18662 13L  S3       
-        21       1292 33101  42450 13R  P19      
-        21       1293 33101  42438 13L  P19      
-        21       1294 33101  4   13R  S10_2    
-        21       1295 33101  39985 13L  S10_2    
-        21       1296 33101  39995 13R  S10_2    
-        21       1297 33101  42093 13L  P18      
-        21       1298 33101  39990 13R  S10_2    
-        21       1299 33101  40484 13L  S10_3    
-        21       1300 33101  42099 13R  P18      
-        21       1301 33101  40145 14L  S10_3    
-        21       1302 33101  41896 14R  P18      
-        21       1303 33101  40151 14L  S10_3    
-        21       1304 33101  41901 14R  P18      
-        21       1305 33101  41890 14L  P18      
-        21       1306 33101  41895 14R  P18      
-        21       1307 33101  41045 14L  S10_5    
-        21       1308 33101  39746 14R  S10_2    
-        21       1309 33101  41016 14L  S10_5    
-        21       1310 33101  39752 14R  S10_2    
-        21       1311 33101  42214 14L  P19      
-        21       1312 33101  41066 14R  S10_5    
-        21       1313 33101  41026 14L  S10_5    
-        21       1314 33101  41061 14R  S10_5    
-        21       1315 33101  41051 14L  S10_5    
-        21       1316 33101  41071 14R  S10_5    
-        21       1317 33101  41046 14L  S10_5    
-        21       1318 33101  41081 14R  S10_5    
-        21       1319 33101  41036 14L  S10_5    
-        21       1320 33101  41057 14R  S10_5    
-        21       1321 33101  40147 14L  S10_3    
-        21       1322 33101  41897 14R  P18      
-        21       1323 33101  40152 14L  S10_3    
-        21       1324 33101  41902 14R  P18      
-        21       1325 33101  41891 14L  P18      
-        21       1326 33101  41907 14R  P18      
-        21       1327 33101  41031 14L  S10_5    
-        21       1328 33101  39747 14R  S10_2    
-        21       1329 33101  41017 14L  S10_5    
-        21       1330 33101  39753 14R  S10_2    
-        21       1331 33101  41022 14L  S10_5    
-        21       1332 33101  41067 14R  S10_5    
-        21       1333 33101  41027 14L  S10_5    
-        21       1334 33101  41062 14R  S10_5    
-        21       1335 33101  41052 14L  S10_5    
-        21       1336 33101  41072 14R  S10_5    
-        21       1337 33101  41047 14L  S10_5    
-        21       1338 33101  41082 14R  S10_5    
-        21       1339 33101  41037 14L  S10_5    
-        21       1340 33101  41059 14R  S10_5    
-        21       1341 33101  40148 14L  S10_3    
-        21       1342 33101  41898 14R  P18      
-        21       1343 33101  40153 14L  S10_3    
-        21       1344 33101  41903 14R  P18      
-        21       1345 33101  41893 14L  P18      
-        21       1346 33101  41908 14R  P18      
-        21       1347 33101  41033 14L  S10_5    
-        21       1348 33101  39748 14R  S10_2    
-        21       1349 33101  41018 14L  S10_5    
-        21       1350 33101  42216 14R  P19      
-        21       1351 33101  41023 14L  S10_5    
-        21       1352 33101  41068 14R  S10_5    
-        21       1353 33101  41028 14L  S10_5    
-        21       1354 33101  41076 14R  S10_5    
-        21       1355 33101  41053 14L  S10_5    
-        21       1356 33101  41089 14R  S10_5    
-        21       1357 33101  41048 14L  S10_5    
-        21       1358 33101  41077 14R  S10_5    
-        21       1359 33101  41041 14L  S10_5    
-        21       1360 33101  41060 14R  S10_5    
-        21       1361 33101  40149 14L  S10_3    
-        21       1362 33101  41899 14R  P18      
-        21       1363 33101  40154 14L  S10_3    
-        21       1364 33101  41904 14R  P18      
-        21       1365 33101  41894 14L  P18      
-        21       1366 33101  41909 14R  P18      
-        21       1367 33101  41034 14L  S10_5    
-        21       1368 33101  39749 14R  S10_2    
-        21       1369 33101  41019 14L  S10_5    
-        21       1370 33101  42218 14R  P19      
-        21       1371 33101  41024 14L  S10_5    
-        21       1372 33101  41069 14R  S10_5    
-        21       1373 33101  42215 14L  P19      
-        21       1374 33101  41064 14R  S10_5    
-        21       1375 33101  41054 14L  S10_5    
-        21       1376 33101  41074 14R  S10_5    
-        21       1377 33101  41049 14L  S10_5    
-        21       1378 33101  41084 14R  S10_5    
-        21       1379 33101  41042 14L  S10_5    
-        21       1380 33101  41086 14R  S10_5    
-        21       1381 33101  40150 14L  S10_3    
-        21       1382 33101  41900 14R  P18      
-        21       1383 33101  40155 14L  S10_3    
-        21       1384 33101  41905 14R  P18      
-        21       1385 33101  40156 14L  S10_3    
-        21       1386 33101  39745 14R  S10_2    
-        21       1387 33101  41015 14L  S10_5    
-        21       1388 33101  39750 14R  S10_2    
-        21       1389 33101  41020 14L  S10_5    
-        21       1390 33101  41056 14R  S10_5    
-        21       1391 33101  41025 14L  S10_5    
-        21       1392 33101  41070 14R  S10_5    
-        21       1393 33101  41030 14L  S10_5    
-        21       1394 33101  41065 14R  S10_5    
-        21       1395 33101  41040 14L  S10_5    
-        21       1396 33101  41075 14R  S10_5    
-        21       1397 33101  41050 14L  S10_5    
-        21       1398 33101  41085 14R  S10_5    
-        21       1399 33101  41044 14L  S10_5    
-        21       1400 33101  41087 14R  S10_5    
-        21       1401 33101  40206 15L  S10_3    
-        21       1402 33101  41922 15R  P18      
-        21       1403 33101  40203 15L  S10_3    
-        21       1404 33101  40216 15R  S10_3    
-        21       1405 33101  40196 15L  S10_3    
-        21       1406 33101  40221 15R  S10_3    
-        21       1407 33101  41911 15L  P18      
-        21       1408 33101  41921 15R  P18      
-        21       1409 33101  40211 15L  S10_3    
-        21       1410 33101  41096 15R  S10_5    
-        21       1411 33101  42221 15L  P19      
-        21       1412 33101  42262 15R  P19      
-        21       1413 33101  42226 15L  P19      
-        21       1414 33101  41101 15R  S10_5    
-        21       1415 33101  42235 15L  P19      
-        21       1416 33101  41106 15R  S10_5    
-        21       1417 33101  42241 15L  P19      
-        21       1418 33101  41116 15R  S10_5    
-        21       1419 33101  42251 15L  P19      
-        21       1420 33101  41111 15R  S10_5    
-        21       1421 33101  40207 15L  S10_3    
-        21       1422 33101  40212 15R  S10_3    
-        21       1423 33101  40192 15L  S10_3    
-        21       1424 33101  40217 15R  S10_3    
-        21       1425 33101  40197 15L  S10_3    
-        21       1426 33101  40222 15R  S10_3    
-        21       1427 33101  41912 15L  P18      
-        21       1428 33101  41918 15R  P18      
-        21       1429 33101  41910 15L  P18      
-        21       1430 33101  41097 15R  S10_5    
-        21       1431 33101  42222 15L  P19      
-        21       1432 33101  42263 15R  P19      
-        21       1433 33101  42219 15L  P19      
-        21       1434 33101  41102 15R  S10_5    
-        21       1435 33101  42237 15L  P19      
-        21       1436 33101  41107 15R  S10_5    
-        21       1437 33101  42242 15L  P19      
-        21       1438 33101  41117 15R  S10_5    
-        21       1439 33101  42252 15L  P19      
-        21       1440 33101  41112 15R  S10_5    
-        21       1441 33101  40208 15L  S10_3    
-        21       1442 33101  40213 15R  S10_3    
-        21       1443 33101  40193 15L  S10_3    
-        21       1444 33101  40218 15R  S10_3    
-        21       1445 33101  40198 15L  S10_3    
-        21       1446 33101  40223 15R  S10_3    
-        21       1447 33101  41913 15L  P18      
-        21       1448 33101  41919 15R  P18      
-        21       1449 33101  40205 15L  S10_3    
-        21       1450 33101  41100 15R  S10_5    
-        21       1451 33101  42223 15L  P19      
-        21       1452 33101  42264 15R  P19      
-        21       1453 33101  42228 15L  P19      
-        21       1454 33101  41103 15R  S10_5    
-        21       1455 33101  42238 15L  P19      
-        21       1456 33101  41108 15R  S10_5    
-        21       1457 33101  42243 15L  P19      
-        21       1458 33101  41118 15R  S10_5    
-        21       1459 33101  42248 15L  P19      
-        21       1460 33101  41113 15R  S10_5    
-        21       1461 33101  40209 15L  S10_3    
-        21       1462 33101  40214 15R  S10_3    
-        21       1463 33101  40194 15L  S10_3    
-        21       1464 33101  40219 15R  S10_3    
-        21       1465 33101  40199 15L  S10_3    
-        21       1466 33101  40224 15R  S10_3    
-        21       1467 33101  41914 15L  P18      
-        21       1468 33101  41920 15R  P18      
-        21       1469 33101  42231 15L  P19      
-        21       1470 33101  41121 15R  S10_5    
-        21       1471 33101  42224 15L  P19      
-        21       1472 33101  42265 15R  P19      
-        21       1473 33101  42229 15L  P19      
-        21       1474 33101  41104 15R  S10_5    
-        21       1475 33101  42239 15L  P19      
-        21       1476 33101  41109 15R  S10_5    
-        21       1477 33101  42244 15L  P19      
-        21       1478 33101  41119 15R  S10_5    
-        21       1479 33101  42249 15L  P19      
-        21       1480 33101  41114 15R  S10_5    
-        21       1481 33101  40210 15L  S10_3    
-        21       1482 33101  40215 15R  S10_3    
-        21       1483 33101  40195 15L  S10_3    
-        21       1484 33101  40220 15R  S10_3    
-        21       1485 33101  40200 15L  S10_3    
-        21       1486 33101  40225 15R  S10_3    
-        21       1487 33101  41915 15L  P18      
-        21       1488 33101  41127 15R  S10_5    
-        21       1489 33101  42232 15L  P19      
-        21       1490 33101  41124 15R  S10_5    
-        21       1491 33101  42225 15L  P19      
-        21       1492 33101  42266 15R  P19      
-        21       1493 33101  42230 15L  P19      
-        21       1494 33101  41105 15R  S10_5    
-        21       1495 33101  42240 15L  P19      
-        21       1496 33101  41126 15R  S10_5    
-        21       1497 33101  42246 15L  P19      
-        21       1498 33101  41120 15R  S10_5    
-        21       1499 33101  42250 15L  P19      
-        21       1500 33101  41125 15R  S10_5    
-        21       1501 33101  40271 16L  S10_3    
-        21       1502 33101  41925 16R  P18      
-        21       1503 33101  40276 16L  S10_3    
-        21       1504 33101  39802 16R  S10_2    
-        21       1505 33101  40267 16L  S10_3    
-        21       1506 33101  39796 16R  S10_2    
-        21       1507 33101  42268 16L  P19      
-        21       1508 33101  39847 16R  S10_2    
-        21       1509 33101  42273 16L  P19      
-        21       1510 33101  41151 16R  S10_5    
-        21       1511 33101  42281 16L  P19      
-        21       1512 33101  41161 16R  S10_5    
-        21       1513 33101  42288 16L  P19      
-        21       1514 33101  41166 16R  S10_5    
-        21       1515 33101  42291 16L  P19      
-        21       1516 33101  41156 16R  S10_5    
-        21       1517 33101  42296 16L  P19      
-        21       1518 33101  41146 16R  S10_5    
-        21       1519 33101  41130 16L  S10_5    
-        21       1520 33101  41172 16R  S10_5    
-        21       1521 33101  40272 16L  S10_3    
-        21       1522 33101  41927 16R  P18      
-        21       1523 33101  40277 16L  S10_3    
-        21       1524 33101  41934 16R  P18      
-        21       1525 33101  40269 16L  S10_3    
-        21       1526 33101  39798 16R  S10_2    
-        21       1527 33101  42269 16L  P19      
-        21       1528 33101  41142 16R  S10_5    
-        21       1529 33101  42275 16L  P19      
-        21       1530 33101  41152 16R  S10_5    
-        21       1531 33101  42282 16L  P19      
-        21       1532 33101  41162 16R  S10_5    
-        21       1533 33101  42290 16L  P19      
-        21       1534 33101  41167 16R  S10_5    
-        21       1535 33101  42292 16L  P19      
-        21       1536 33101  41157 16R  S10_5    
-        21       1537 33101  42297 16L  P19      
-        21       1538 33101  41147 16R  S10_5    
-        21       1539 33101  41131 16L  S10_5    
-        21       1540 33101  42311 16R  P19      
-        21       1541 33101  40281 16L  S10_3    
-        21       1542 33101  41928 16R  P18      
-        21       1543 33101  40278 16L  S10_3    
-        21       1544 33101  39848 16R  S10_2    
-        21       1545 33101  40270 16L  S10_3    
-        21       1546 33101  39824 16R  S10_2    
-        21       1547 33101  42270 16L  P19      
-        21       1548 33101  41143 16R  S10_5    
-        21       1549 33101  42276 16L  P19      
-        21       1550 33101  41153 16R  S10_5    
-        21       1551 33101  42283 16L  P19      
-        21       1552 33101  41163 16R  S10_5    
-        21       1553 33101  42301 16L  P19      
-        21       1554 33101  41168 16R  S10_5    
-        21       1555 33101  42293 16L  P19      
-        21       1556 33101  41158 16R  S10_5    
-        21       1557 33101  42298 16L  P19      
-        21       1558 33101  41148 16R  S10_5    
-        21       1559 33101  41132 16L  S10_5    
-        21       1560 33101  41145 16R  S10_5    
-        21       1561 33101  40274 16L  S10_3    
-        21       1562 33101  41930 16R  P18      
-        21       1563 33101  40279 16L  S10_3    
-        21       1564 33101  39844 16R  S10_2    
-        21       1565 33101  42284 16L  P19      
-        21       1566 33101  39825 16R  S10_2    
-        21       1567 33101  42271 16L  P19      
-        21       1568 33101  41144 16R  S10_5    
-        21       1569 33101  42277 16L  P19      
-        21       1570 33101  41154 16R  S10_5    
-        21       1571 33101  42280 16L  P19      
-        21       1572 33101  41164 16R  S10_5    
-        21       1573 33101  42302 16L  P19      
-        21       1574 33101  42310 16R  P19      
-        21       1575 33101  42294 16L  P19      
-        21       1576 33101  41140 16R  S10_5    
-        21       1577 33101  42299 16L  P19      
-        21       1578 33101  42313 16R  P19      
-        21       1579 33101  41134 16L  S10_5    
-        21       1580 33101  41159 16R  S10_5    
-        21       1581 33101  40275 16L  S10_3    
-        21       1582 33101  41931 16R  P18      
-        21       1583 33101  40280 16L  S10_3    
-        21       1584 33101  39845 16R  S10_2    
-        21       1585 33101  42308 16L  P19      
-        21       1586 33101  39846 16R  S10_2    
-        21       1587 33101  42272 16L  P19      
-        21       1588 33101  41141 16R  S10_5    
-        21       1589 33101  42279 16L  P19      
-        21       1590 33101  41155 16R  S10_5    
-        21       1591 33101  42286 16L  P19      
-        21       1592 33101  41165 16R  S10_5    
-        21       1593 33101  42304 16L  P19      
-        21       1594 33101  41170 16R  S10_5    
-        21       1595 33101  42295 16L  P19      
-        21       1596 33101  41160 16R  S10_5    
-        21       1597 33101  42300 16L  P19      
-        21       1598 33101  41150 16R  S10_5    
-        21       1599 33101  41135 16L  S10_5    
-        21       1600 33101  41171 16R  S10_5    
-        21       1601 33101  40282 17L  S10_3    
-        21       1602 33101  40321 17R  S10_3    
-        21       1603 33101  40285 17L  S10_3    
-        21       1604 33101  40326 17R  S10_3    
-        21       1605 33101  42315 17L  P19      
-        21       1606 33101  40343 17R  S10_3    
-        21       1607 33101  42321 17L  P19      
-        21       1608 33101  40336 17R  S10_3    
-        21       1609 33101  41181 17L  S10_5    
-        21       1610 33101  41947 17R  P18      
-        21       1611 33101  41186 17L  S10_5    
-        21       1612 33101  42346 17R  P19      
-        21       1613 33101  41191 17L  S10_5    
-        21       1614 33101  42326 17R  P19      
-        21       1615 33101  41196 17L  S10_5    
-        21       1616 33101  42331 17R  P19      
-        21       1617 33101  41201 17L  S10_5    
-        21       1618 33101  42322 17R  P19      
-        21       1619 33101  41206 17L  S10_5    
-        21       1620 33101  42341 17R  P19      
-        21       1621 33101  40284 17L  S10_3    
-        21       1622 33101  40322 17R  S10_3    
-        21       1623 33101  40286 17L  S10_3    
-        21       1624 33101  40327 17R  S10_3    
-        21       1625 33101  42316 17L  P19      
-        21       1626 33101  40332 17R  S10_3    
-        21       1627 33101  42314 17L  P19      
-        21       1628 33101  40344 17R  S10_3    
-        21       1629 33101  41182 17L  S10_5    
-        21       1630 33101  41948 17R  P18      
-        21       1631 33101  41187 17L  S10_5    
-        21       1632 33101  42347 17R  P19      
-        21       1633 33101  41192 17L  S10_5    
-        21       1634 33101  42327 17R  P19      
-        21       1635 33101  41197 17L  S10_5    
-        21       1636 33101  42332 17R  P19      
-        21       1637 33101  41202 17L  S10_5    
-        21       1638 33101  42337 17R  P19      
-        21       1639 33101  41207 17L  S10_5    
-        21       1640 33101  42342 17R  P19      
-        21       1641 33101  41942 17L  P18      
-        21       1642 33101  40323 17R  S10_3    
-        21       1643 33101  40287 17L  S10_3    
-        21       1644 33101  40328 17R  S10_3    
-        21       1645 33101  42317 17L  P19      
-        21       1646 33101  40333 17R  S10_3    
-        21       1647 33101  41174 17L  S10_5    
-        21       1648 33101  40338 17R  S10_3    
-        21       1649 33101  41183 17L  S10_5    
-        21       1650 33101  41949 17R  P18      
-        21       1651 33101  41188 17L  S10_5    
-        21       1652 33101  42323 17R  P19      
-        21       1653 33101  41193 17L  S10_5    
-        21       1654 33101  42328 17R  P19      
-        21       1655 33101  41179 17L  S10_5    
-        21       1656 33101  42333 17R  P19      
-        21       1657 33101  41203 17L  S10_5    
-        21       1658 33101  42338 17R  P19      
-        21       1659 33101  41208 17L  S10_5    
-        21       1660 33101  42343 17R  P19      
-        21       1661 33101  41944 17L  P18      
-        21       1662 33101  40324 17R  S10_3    
-        21       1663 33101  40288 17L  S10_3    
-        21       1664 33101  40342 17R  S10_3    
-        21       1665 33101  42319 17L  P19      
-        21       1666 33101  40334 17R  S10_3    
-        21       1667 33101  41175 17L  S10_5    
-        21       1668 33101  40339 17R  S10_3    
-        21       1669 33101  41184 17L  S10_5    
-        21       1670 33101  41950 17R  P18      
-        21       1671 33101  41189 17L  S10_5    
-        21       1672 33101  42324 17R  P19      
-        21       1673 33101  41194 17L  S10_5    
-        21       1674 33101  42329 17R  P19      
-        21       1675 33101  41180 17L  S10_5    
-        21       1676 33101  42334 17R  P19      
-        21       1677 33101  41204 17L  S10_5    
-        21       1678 33101  42339 17R  P19      
-        21       1679 33101  41209 17L  S10_5    
-        21       1680 33101  42344 17R  P19      
-        21       1681 33101  41946 17L  P18      
-        21       1682 33101  40341 17R  S10_3    
-        21       1683 33101  40289 17L  S10_3    
-        21       1684 33101  40330 17R  S10_3    
-        21       1685 33101  42320 17L  P19      
-        21       1686 33101  40335 17R  S10_3    
-        21       1687 33101  41177 17L  S10_5    
-        21       1688 33101  40340 17R  S10_3    
-        21       1689 33101  41185 17L  S10_5    
-        21       1690 33101  42348 17R  P19      
-        21       1691 33101  41190 17L  S10_5    
-        21       1692 33101  42325 17R  P19      
-        21       1693 33101  41195 17L  S10_5    
-        21       1694 33101  42330 17R  P19      
-        21       1695 33101  41200 17L  S10_5    
-        21       1696 33101  42335 17R  P19      
-        21       1697 33101  41205 17L  S10_5    
-        21       1698 33101  42340 17R  P19      
-        21       1699 33101  41210 17L  S10_5    
-        21       1700 33101  42345 17R  P19      
-        22          1 33101  41511 1L   S10_6    
-        22          2 33101  41576 1R   S10_6    
-        22          3 33101  41524 1L   S10_6    
-        22          4 33101  41556 1R   S10_6    
-        22          5 33101  41523 1L   S10_6    
-        22          6 33101  41561 1R   S10_6    
-        22          7 33101  41531 1L   S10_6    
-        22          8 33101  41583 1R   S10_6    
-        22          9 33101  41526 1L   S10_6    
-        22         10 33101  41564 1R   S10_6    
-        22         11 33101  42501 1L   R1_1     
-        22         12 33101  42508 1R   R1_1     
-        22         13 33101  43005 1L   R1_2     
-        22         14 33101  43026 1R   R1_2     
-        22         15 33101  43858 1L   R2_2     
-        22         16 33101  43034 1R   R1_2     
-        22         17 33101  43010 1L   R1_2     
-        22         18 33101  41570 1R   S10_6    
-        22         19 33101  43015 1L   R1_2     
-        22         20 33101  41562 1R   S10_6    
-        22         21 33101  41512 1L   S10_6    
-        22         22 33101  41577 1R   S10_6    
-        22         23 33101  41509 1L   S10_6    
-        22         24 33101  41557 1R   S10_6    
-        22         25 33101  41517 1L   S10_6    
-        22         26 33101  41563 1R   S10_6    
-        22         27 33101  41532 1L   S10_6    
-        22         28 33101  41572 1R   S10_6    
-        22         29 33101  41527 1L   S10_6    
-        22         30 33101  40558 1R   S10_4    
-        22         31 33101  42502 1L   R1_1     
-        22         32 33101  43018 1R   R1_2     
-        22         33 33101  43016 1L   R1_2     
-        22         34 33101  43027 1R   R1_2     
-        22         35 33101  43859 1L   R2_2     
-        22         36 33101  43035 1R   R1_2     
-        22         37 33101  42505 1L   R1_1     
-        22         38 33101  43028 1R   R1_2     
-        22         39 33101  43008 1L   R1_2     
-        22         40 33101  43019 1R   R1_2     
-        22         41 33101  41513 1L   S10_6    
-        22         42 33101  41578 1R   S10_6    
-        22         43 33101  41510 1L   S10_6    
-        22         44 33101  41558 1R   S10_6    
-        22         45 33101  41518 1L   S10_6    
-        22         46 33101  41567 1R   S10_6    
-        22         47 33101  41533 1L   S10_6    
-        22         48 33101  41584 1R   S10_6    
-        22         49 33101  41529 1L   S10_6    
-        22         50 33101  42115 1R   P19      
-        22         51 33101  42506 1L   R1_1     
-        22         52 33101  43020 1R   R1_2     
-        22         53 33101  43017 1L   R1_2     
-        22         54 33101  43029 1R   R1_2     
-        22         55 33101  43003 1L   R1_2     
-        22         56 33101  41581 1R   S10_6    
-        22         57 33101  43002 1L   R1_2     
-        22         58 33101  40533 1R   S10_4    
-        22         59 33101  43856 1L   R2_2     
-        22         60 33101  43864 1R   R2_2     
-        22         61 33101  41514 1L   S10_6    
-        22         62 33101  41579 1R   S10_6    
-        22         63 33101  41536 1L   S10_6    
-        22         64 33101  41554 1R   S10_6    
-        22         65 33101  41519 1L   S10_6    
-        22         66 33101  41568 1R   S10_6    
-        22         67 33101  41534 1L   S10_6    
-        22         68 33101  41574 1R   S10_6    
-        22         69 33101  41530 1L   S10_6    
-        22         70 33101  42509 1R   R1_1     
-        22         71 33101  42507 1L   R1_1     
-        22         72 33101  43021 1R   R1_2     
-        22         73 33101  43852 1L   R2_2     
-        22         74 33101  43030 1R   R1_2     
-        22         75 33101  41516 1L   S10_6    
-        22         76 33101  41586 1R   S10_6    
-        22         77 33101  43004 1L   R1_2     
-        22         78 33101  41585 1R   S10_6    
-        22         79 33101  43014 1L   R1_2     
-        22         80 33101  43032 1R   R1_2     
-        22         81 33101  41515 1L   S10_6    
-        22         82 33101  41580 1R   S10_6    
-        22         83 33101  41522 1L   S10_6    
-        22         84 33101  41560 1R   S10_6    
-        22         85 33101  41520 1L   S10_6    
-        22         86 33101  41555 1R   S10_6    
-        22         87 33101  41535 1L   S10_6    
-        22         88 33101  41575 1R   S10_6    
-        22         89 33101  43007 1L   R1_2     
-        22         90 33101  42510 1R   R1_1     
-        22         91 33101  43001 1L   R1_2     
-        22         92 33101  43025 1R   R1_2     
-        22         93 33101  43855 1L   R2_2     
-        22         94 33101  43031 1R   R1_2     
-        22         95 33101  41521 1L   S10_6    
-        22         96 33101  43023 1R   R1_2     
-        22         97 33101  43012 1L   R1_2     
-        22         98 33101  41582 1R   S10_6    
-        22         99 33101  43011 1L   R1_2     
-        22        100 33101  43022 1R   R1_2     
-        22        101 33101  41611 2L   S10_6    
-        22        102 33101  41646 2R   S10_6    
-        22        103 33101  41616 2L   S10_6    
-        22        104 33101  41651 2R   S10_6    
-        22        105 33101  41621 2L   S10_6    
-        22        106 33101  41656 2R   S10_6    
-        22        107 33101  41626 2L   S10_6    
-        22        108 33101  41662 2R   S10_6    
-        22        109 33101  42514 2L   R1_1     
-        22        110 33101  42523 2R   R1_1     
-        22        111 33101  43865 2L   R2_2     
-        22        112 33101  43042 2R   R1_2     
-        22        113 33101  44511 2L   R3_1     
-        22        114 33101  43046 2R   R1_2     
-        22        115 33101  44516 2L   R3_1     
-        22        116 33101  43051 2R   R1_2     
-        22        117 33101  44530 2L   R3_1     
-        22        118 33101  43873 2R   R2_2     
-        22        119 33101  44521 2L   R3_1     
-        22        120 33101  43041 2R   R1_2     
-        22        121 33101  41612 2L   S10_6    
-        22        122 33101  41647 2R   S10_6    
-        22        123 33101  41617 2L   S10_6    
-        22        124 33101  41644 2R   S10_6    
-        22        125 33101  41622 2L   S10_6    
-        22        126 33101  41657 2R   S10_6    
-        22        127 33101  41627 2L   S10_6    
-        22        128 33101  41664 2R   S10_6    
-        22        129 33101  42515 2L   R1_1     
-        22        130 33101  41011 2R   S10_5    
-        22        131 33101  43866 2L   R2_2     
-        22        132 33101  43043 2R   R1_2     
-        22        133 33101  44512 2L   R3_1     
-        22        134 33101  43047 2R   R1_2     
-        22        135 33101  44517 2L   R3_1     
-        22        136 33101  43054 2R   R1_2     
-        22        137 33101  44526 2L   R3_1     
-        22        138 33101  43040 2R   R1_2     
-        22        139 33101  44522 2L   R3_1     
-        22        140 33101  43044 2R   R1_2     
-        22        141 33101  41613 2L   S10_6    
-        22        142 33101  41648 2R   S10_6    
-        22        143 33101  41618 2L   S10_6    
-        22        144 33101  41653 2R   S10_6    
-        22        145 33101  41623 2L   S10_6    
-        22        146 33101  41658 2R   S10_6    
-        22        147 33101  41628 2L   S10_6    
-        22        148 33101  41665 2R   S10_6    
-        22        149 33101  42516 2L   R1_1     
-        22        150 33101  42520 2R   R1_1     
-        22        151 33101  43867 2L   R2_2     
-        22        152 33101  43045 2R   R1_2     
-        22        153 33101  44513 2L   R3_1     
-        22        154 33101  43048 2R   R1_2     
-        22        155 33101  44518 2L   R3_1     
-        22        156 33101  43055 2R   R1_2     
-        22        157 33101  44527 2L   R3_1     
-        22        158 33101  41820 2R   P18      
-        22        159 33101  44523 2L   R3_1     
-        22        160 33101  43058 2R   R1_2     
-        22        161 33101  41614 2L   S10_6    
-        22        162 33101  41645 2R   S10_6    
-        22        163 33101  41632 2L   S10_6    
-        22        164 33101  41655 2R   S10_6    
-        22        165 33101  41624 2L   S10_6    
-        22        166 33101  41659 2R   S10_6    
-        22        167 33101  41629 2L   S10_6    
-        22        168 33101  41666 2R   S10_6    
-        22        169 33101  42517 2L   R1_1     
-        22        170 33101  42522 2R   R1_1     
-        22        171 33101  43869 2L   R2_2     
-        22        172 33101  42524 2R   R1_1     
-        22        173 33101  44514 2L   R3_1     
-        22        174 33101  43049 2R   R1_2     
-        22        175 33101  44519 2L   R3_1     
-        22        176 33101  43056 2R   R1_2     
-        22        177 33101  44528 2L   R3_1     
-        22        178 33101  41663 2R   S10_6    
-        22        179 33101  44524 2L   R3_1     
-        22        180 33101  41640 2R   S10_6    
-        22        181 33101  42513 2L   R1_1     
-        22        182 33101  41650 2R   S10_6    
-        22        183 33101  41620 2L   S10_6    
-        22        184 33101  41661 2R   S10_6    
-        22        185 33101  41625 2L   S10_6    
-        22        186 33101  41660 2R   S10_6    
-        22        187 33101  41630 2L   S10_6    
-        22        188 33101  41668 2R   S10_6    
-        22        189 33101  43037 2L   R1_2     
-        22        190 33101  40610 2R   S10_4    
-        22        191 33101  43870 2L   R2_2     
-        22        192 33101  42525 2R   R1_1     
-        22        193 33101  44515 2L   R3_1     
-        22        194 33101  43050 2R   R1_2     
-        22        195 33101  44520 2L   R3_1     
-        22        196 33101  43057 2R   R1_2     
-        22        197 33101  44529 2L   R3_1     
-        22        198 33101  41643 2R   S10_6    
-        22        199 33101  44525 2L   R3_1     
-        22        200 33101  40611 2R   S10_4    
-        22        201 33101  40640 3L   S10_4    
-        22        202 33101  41696 3R   S10_6    
-        22        203 33101  42539 3L   R1_1     
-        22        204 33101  41697 3R   S10_6    
-        22        205 33101  42549 3L   R1_1     
-        22        206 33101  41706 3R   S10_6    
-        22        207 33101  43065 3L   R1_2     
-        22        208 33101  41715 3R   S10_6    
-        22        209 33101  43076 3L   R1_2     
-        22        210 33101  41712 3R   S10_6    
-        22        211 33101  42536 3L   R1_1     
-        22        212 33101  42554 3R   R1_1     
-        22        213 33101  42527 3L   R1_1     
-        22        214 33101  42556 3R   R1_1     
-        22        215 33101  40634 3L   S10_4    
-        22        216 33101  42561 3R   R1_1     
-        22        217 33101  43066 3L   R1_2     
-        22        218 33101  41705 3R   S10_6    
-        22        219 33101  42545 3L   R1_1     
-        22        220 33101  42566 3R   R1_1     
-        22        221 33101  42528 3L   R1_1     
-        22        222 33101  41692 3R   S10_6    
-        22        223 33101  42542 3L   R1_1     
-        22        224 33101  41700 3R   S10_6    
-        22        225 33101  42553 3L   R1_1     
-        22        226 33101  41707 3R   S10_6    
-        22        227 33101  43068 3L   R1_2     
-        22        228 33101  41717 3R   S10_6    
-        22        229 33101  43078 3L   R1_2     
-        22        230 33101  41713 3R   S10_6    
-        22        231 33101  42540 3L   R1_1     
-        22        232 33101  42555 3R   R1_1     
-        22        233 33101  42529 3L   R1_1     
-        22        234 33101  42557 3R   R1_1     
-        22        235 33101  40636 3L   S10_4    
-        22        236 33101  42562 3R   R1_1     
-        22        237 33101  43072 3L   R1_2     
-        22        238 33101  43083 3R   R1_2     
-        22        239 33101  42548 3L   R1_1     
-        22        240 33101  42567 3R   R1_1     
-        22        241 33101  42532 3L   R1_1     
-        22        242 33101  41693 3R   S10_6    
-        22        243 33101  42543 3L   R1_1     
-        22        244 33101  41701 3R   S10_6    
-        22        245 33101  43059 3L   R1_2     
-        22        246 33101  41708 3R   S10_6    
-        22        247 33101  43070 3L   R1_2     
-        22        248 33101  41718 3R   S10_6    
-        22        249 33101  43079 3L   R1_2     
-        22        250 33101  41721 3R   S10_6    
-        22        251 33101  42541 3L   R1_1     
-        22        252 33101  42563 3R   R1_1     
-        22        253 33101  42535 3L   R1_1     
-        22        254 33101  42558 3R   R1_1     
-        22        255 33101  42552 3L   R1_1     
-        22        256 33101  42564 3R   R1_1     
-        22        257 33101  40643 3L   S10_4    
-        22        258 33101  43084 3R   R1_2     
-        22        259 33101  42551 3L   R1_1     
-        22        260 33101  42568 3R   R1_1     
-        22        261 33101  42537 3L   R1_1     
-        22        262 33101  41694 3R   S10_6    
-        22        263 33101  42544 3L   R1_1     
-        22        264 33101  41703 3R   S10_6    
-        22        265 33101  43061 3L   R1_2     
-        22        266 33101  41709 3R   S10_6    
-        22        267 33101  43071 3L   R1_2     
-        22        268 33101  41719 3R   S10_6    
-        22        269 33101  43081 3L   R1_2     
-        22        270 33101  41722 3R   S10_6    
-        22        271 33101  42547 3L   R1_1     
-        22        272 33101  42570 3R   R1_1     
-        22        273 33101  43060 3L   R1_2     
-        22        274 33101  43896 3R   R2_2     
-        22        275 33101  43062 3L   R1_2     
-        22        276 33101  42565 3R   R1_1     
-        22        277 33101  41672 3L   S10_6    
-        22        278 33101  43085 3R   R1_2     
-        22        279 33101  43080 3L   R1_2     
-        22        280 33101  42569 3R   R1_1     
-        22        281 33101  42538 3L   R1_1     
-        22        282 33101  41695 3R   S10_6    
-        22        283 33101  42546 3L   R1_1     
-        22        284 33101  41704 3R   S10_6    
-        22        285 33101  43064 3L   R1_2     
-        22        286 33101  41710 3R   S10_6    
-        22        287 33101  43073 3L   R1_2     
-        22        288 33101  41720 3R   S10_6    
-        22        289 33101  42533 3L   R1_1     
-        22        290 33101  42151 3R   P19      
-        22        291 33101  43075 3L   R1_2     
-        22        292 33101  42571 3R   R1_1     
-        22        293 33101  40022 3L   S10_3    
-        22        294 33101  42560 3R   R1_1     
-        22        295 33101  43063 3L   R1_2     
-        22        296 33101  41698 3R   S10_6    
-        22        297 33101  41677 3L   S10_6    
-        22        298 33101  41711 3R   S10_6    
-        22        299 33101  42530 3L   R1_1     
-        22        300 33101  43086 3R   R1_2     
-        22        301 33101  42578 4L   R1_1     
-        22        302 33101  42176 4R   P19      
-        22        303 33101  42588 4L   R1_1     
-        22        304 33101  42181 4R   P19      
-        22        305 33101  43088 4L   R1_2     
-        22        306 33101  42191 4R   P19      
-        22        307 33101  43096 4L   R1_2     
-        22        308 33101  42183 4R   P19      
-        22        309 33101  43109 4L   R1_2     
-        22        310 33101  42601 4R   R1_1     
-        22        311 33101  43092 4L   R1_2     
-        22        312 33101  42614 4R   R1_1     
-        22        313 33101  41726 4L   S10_6    
-        22        314 33101  42613 4R   R1_1     
-        22        315 33101  43110 4L   R1_2     
-        22        316 33101  42621 4R   R1_1     
-        22        317 33101  44646 4L   R3_1     
-        22        318 33101  42616 4R   R1_1     
-        22        319 33101  44644 4L   R3_1     
-        22        320 33101  42626 4R   R1_1     
-        22        321 33101  42579 4L   R1_1     
-        22        322 33101  42177 4R   P19      
-        22        323 33101  42592 4L   R1_1     
-        22        324 33101  42182 4R   P19      
-        22        325 33101  43089 4L   R1_2     
-        22        326 33101  42192 4R   P19      
-        22        327 33101  43098 4L   R1_2     
-        22        328 33101  42186 4R   P19      
-        22        329 33101  42572 4L   R1_1     
-        22        330 33101  42602 4R   R1_1     
-        22        331 33101  43097 4L   R1_2     
-        22        332 33101  42615 4R   R1_1     
-        22        333 33101  42581 4L   R1_1     
-        22        334 33101  42607 4R   R1_1     
-        22        335 33101  43901 4L   R2_2     
-        22        336 33101  42632 4R   R1_1     
-        22        337 33101  44647 4L   R3_1     
-        22        338 33101  42631 4R   R1_1     
-        22        339 33101  44645 4L   R3_1     
-        22        340 33101  42627 4R   R1_1     
-        22        341 33101  42582 4L   R1_1     
-        22        342 33101  42178 4R   P19      
-        22        343 33101  42595 4L   R1_1     
-        22        344 33101  42187 4R   P19      
-        22        345 33101  43091 4L   R1_2     
-        22        346 33101  42193 4R   P19      
-        22        347 33101  43099 4L   R1_2     
-        22        348 33101  42188 4R   P19      
-        22        349 33101  42583 4L   R1_1     
-        22        350 33101  42603 4R   R1_1     
-        22        351 33101  43100 4L   R1_2     
-        22        352 33101  40715 4R   S10_4    
-        22        353 33101  40058 4L   S10_3    
-        22        354 33101  42608 4R   R1_1     
-        22        355 33101  43903 4L   R2_2     
-        22        356 33101  42633 4R   R1_1     
-        22        357 33101  44648 4L   R3_1     
-        22        358 33101  42618 4R   R1_1     
-        22        359 33101  44663 4L   R3_1     
-        22        360 33101  42628 4R   R1_1     
-        22        361 33101  42584 4L   R1_1     
-        22        362 33101  42179 4R   P19      
-        22        363 33101  42596 4L   R1_1     
-        22        364 33101  42184 4R   P19      
-        22        365 33101  43093 4L   R1_2     
-        22        366 33101  42194 4R   P19      
-        22        367 33101  43103 4L   R1_2     
-        22        368 33101  42189 4R   P19      
-        22        369 33101  42597 4L   R1_1     
-        22        370 33101  42604 4R   R1_1     
-        22        371 33101  43102 4L   R1_2     
-        22        372 33101  42598 4R   R1_1     
-        22        373 33101  42576 4L   R1_1     
-        22        374 33101  42609 4R   R1_1     
-        22        375 33101  44641 4L   R3_1     
-        22        376 33101  42624 4R   R1_1     
-        22        377 33101  44649 4L   R3_1     
-        22        378 33101  42619 4R   R1_1     
-        22        379 33101  44651 4L   R3_1     
-        22        380 33101  42629 4R   R1_1     
-        22        381 33101  42585 4L   R1_1     
-        22        382 33101  42180 4R   P19      
-        22        383 33101  43087 4L   R1_2     
-        22        384 33101  42185 4R   P19      
-        22        385 33101  43095 4L   R1_2     
-        22        386 33101  40097 4R   S10_3    
-        22        387 33101  43107 4L   R1_2     
-        22        388 33101  42190 4R   P19      
-        22        389 33101  43090 4L   R1_2     
-        22        390 33101  42606 4R   R1_1     
-        22        391 33101  43104 4L   R1_2     
-        22        392 33101  42600 4R   R1_1     
-        22        393 33101  43105 4L   R1_2     
-        22        394 33101  42610 4R   R1_1     
-        22        395 33101  44642 4L   R3_1     
-        22        396 33101  42625 4R   R1_1     
-        22        397 33101  44650 4L   R3_1     
-        22        398 33101  42620 4R   R1_1     
-        22        399 33101  44652 4L   R3_1     
-        22        400 33101  42630 4R   R1_1     
-        22        401 33101  41761 5L   S10_6    
-        22        402 33101  41769 5R   S10_6    
-        22        403 33101  42646 5L   R1_1     
-        22        404 33101  42207 5R   P19      
-        22        405 33101  42662 5L   R1_1     
-        22        406 33101  42671 5R   R1_1     
-        22        407 33101  43121 5L   R1_2     
-        22        408 33101  42676 5R   R1_1     
-        22        409 33101  43116 5L   R1_2     
-        22        410 33101  42686 5R   R1_1     
-        22        411 33101  43131 5L   R1_2     
-        22        412 33101  42696 5R   R1_1     
-        22        413 33101  42657 5L   R1_1     
-        22        414 33101  42699 5R   R1_1     
-        22        415 33101  42641 5L   R1_1     
-        22        416 33101  43136 5R   R1_2     
-        22        417 33101  43127 5L   R1_2     
-        22        418 33101  42677 5R   R1_1     
-        22        419 33101  44706 5L   R3_1     
-        22        420 33101  42697 5R   R1_1     
-        22        421 33101  41762 5L   S10_6    
-        22        422 33101  41770 5R   S10_6    
-        22        423 33101  42647 5L   R1_1     
-        22        424 33101  42667 5R   R1_1     
-        22        425 33101  42663 5L   R1_1     
-        22        426 33101  42672 5R   R1_1     
-        22        427 33101  43122 5L   R1_2     
-        22        428 33101  42678 5R   R1_1     
-        22        429 33101  43120 5L   R1_2     
-        22        430 33101  42687 5R   R1_1     
-        22        431 33101  42639 5L   R1_1     
-        22        432 33101  42692 5R   R1_1     
-        22        433 33101  42659 5L   R1_1     
-        22        434 33101  43132 5R   R1_2     
-        22        435 33101  42648 5L   R1_1     
-        22        436 33101  43138 5R   R1_2     
-        22        437 33101  41746 5L   S10_6    
-        22        438 33101  42680 5R   R1_1     
-        22        439 33101  44707 5L   R3_1     
-        22        440 33101  43137 5R   R1_2     
-        22        441 33101  41763 5L   S10_6    
-        22        442 33101  41771 5R   S10_6    
-        22        443 33101  42651 5L   R1_1     
-        22        444 33101  42668 5R   R1_1     
-        22        445 33101  42664 5L   R1_1     
-        22        446 33101  42673 5R   R1_1     
-        22        447 33101  43123 5L   R1_2     
-        22        448 33101  42679 5R   R1_1     
-        22        449 33101  43126 5L   R1_2     
-        22        450 33101  42690 5R   R1_1     
-        22        451 33101  42649 5L   R1_1     
-        22        452 33101  42693 5R   R1_1     
-        22        453 33101  42654 5L   R1_1     
-        22        454 33101  43133 5R   R1_2     
-        22        455 33101  42653 5L   R1_1     
-        22        456 33101  43140 5R   R1_2     
-        22        457 33101  41752 5L   S10_6    
-        22        458 33101  43143 5R   R1_2     
-        22        459 33101  44708 5L   R3_1     
-        22        460 33101  43135 5R   R1_2     
-        22        461 33101  40733 5L   S10_4    
-        22        462 33101  40760 5R   S10_4    
-        22        463 33101  42652 5L   R1_1     
-        22        464 33101  42669 5R   R1_1     
-        22        465 33101  42665 5L   R1_1     
-        22        466 33101  42674 5R   R1_1     
-        22        467 33101  43124 5L   R1_2     
-        22        468 33101  42682 5R   R1_1     
-        22        469 33101  43128 5L   R1_2     
-        22        470 33101  42691 5R   R1_1     
-        22        471 33101  43112 5L   R1_2     
-        22        472 33101  42694 5R   R1_1     
-        22        473 33101  42643 5L   R1_1     
-        22        474 33101  43134 5R   R1_2     
-        22        475 33101  42656 5L   R1_1     
-        22        476 33101  43141 5R   R1_2     
-        22        477 33101  43911 5L   R2_2     
-        22        478 33101  43144 5R   R1_2     
-        22        479 33101  44709 5L   R3_1     
-        22        480 33101  43146 5R   R1_2     
-        22        481 33101  42644 5L   R1_1     
-        22        482 33101  42689 5R   R1_1     
-        22        483 33101  42655 5L   R1_1     
-        22        484 33101  42670 5R   R1_1     
-        22        485 33101  42666 5L   R1_1     
-        22        486 33101  42675 5R   R1_1     
-        22        487 33101  43125 5L   R1_2     
-        22        488 33101  42684 5R   R1_1     
-        22        489 33101  43129 5L   R1_2     
-        22        490 33101  42698 5R   R1_1     
-        22        491 33101  42661 5L   R1_1     
-        22        492 33101  42695 5R   R1_1     
-        22        493 33101  43909 5L   R2_2     
-        22        494 33101  42700 5R   R1_1     
-        22        495 33101  43114 5L   R1_2     
-        22        496 33101  43142 5R   R1_2     
-        22        497 33101  43913 5L   R2_2     
-        22        498 33101  42681 5R   R1_1     
-        22        499 33101  44710 5L   R3_1     
-        22        500 33101  43149 5R   R1_2     
-        22        501 33101  42720 6L   R1       
-        22        502 33101  42753 6R   R1       
-        22        503 33101  43191 6L   R1_2     
-        22        504 33101  42758 6R   R1       
-        22        505 33101  42740 6L   R1       
-        22        506 33101  42763 6R   R1       
-        22        507 33101  42715 6L   R1       
-        22        508 33101  42768 6R   R1       
-        22        509 33101  42710 6L   R1       
-        22        510 33101  42748 6R   R1       
-        22        511 33101  42725 6L   R1       
-        22        512 33101  42743 6R   R1       
-        22        513 33101  42730 6L   R1       
-        22        514 33101  42358 6R   P19      
-        22        515 33101  37852 6L   S9_4     
-        22        516 33101  40811 6R   S10_4    
-        22        517 33101  40761 6L   S10_4    
-        22        518 33101  40816 6R   S10_4    
-        22        519 33101  42737 6L   R1       
-        22        520 33101  40796 6R   S10_4    
-        22        521 33101  42721 6L   R1       
-        22        522 33101  42754 6R   R1       
-        22        523 33101  43192 6L   R1_2     
-        22        524 33101  42759 6R   R1       
-        22        525 33101  42741 6L   R1       
-        22        526 33101  42764 6R   R1       
-        22        527 33101  42716 6L   R1       
-        22        528 33101  42769 6R   R1       
-        22        529 33101  42711 6L   R1       
-        22        530 33101  42749 6R   R1       
-        22        531 33101  42726 6L   R1       
-        22        532 33101  42744 6R   R1       
-        22        533 33101  42731 6L   R1       
-        22        534 33101  42359 6R   P19      
-        22        535 33101  41953 6L   P18      
-        22        536 33101  40812 6R   S10_4    
-        22        537 33101  40762 6L   S10_4    
-        22        538 33101  40817 6R   S10_4    
-        22        539 33101  40777 6L   S10_4    
-        22        540 33101  40797 6R   S10_4    
-        22        541 33101  42722 6L   R1       
-        22        542 33101  42755 6R   R1       
-        22        543 33101  43193 6L   R1_2     
-        22        544 33101  42760 6R   R1       
-        22        545 33101  42742 6L   R1       
-        22        546 33101  42765 6R   R1       
-        22        547 33101  42717 6L   R1       
-        22        548 33101  42770 6R   R1       
-        22        549 33101  42712 6L   R1       
-        22        550 33101  42750 6R   R1       
-        22        551 33101  42727 6L   R1       
-        22        552 33101  42745 6R   R1       
-        22        553 33101  42732 6L   R1       
-        22        554 33101  42360 6R   P19      
-        22        555 33101  41954 6L   P18      
-        22        556 33101  40813 6R   S10_4    
-        22        557 33101  40763 6L   S10_4    
-        22        558 33101  40818 6R   S10_4    
-        22        559 33101  40778 6L   S10_4    
-        22        560 33101  40798 6R   S10_4    
-        22        561 33101  42723 6L   R1       
-        22        562 33101  42756 6R   R1       
-        22        563 33101  43194 6L   R1_2     
-        22        564 33101  42761 6R   R1       
-        22        565 33101  42738 6L   R1       
-        22        566 33101  42766 6R   R1       
-        22        567 33101  42718 6L   R1       
-        22        568 33101  42771 6R   R1       
-        22        569 33101  42713 6L   R1       
-        22        570 33101  42751 6R   R1       
-        22        571 33101  42728 6L   R1       
-        22        572 33101  42746 6R   R1       
-        22        573 33101  42733 6L   R1       
-        22        574 33101  42361 6R   P19      
-        22        575 33101  41955 6L   P18      
-        22        576 33101  40814 6R   S10_4    
-        22        577 33101  40764 6L   S10_4    
-        22        578 33101  40819 6R   S10_4    
-        22        579 33101  40769 6L   S10_4    
-        22        580 33101  40799 6R   S10_4    
-        22        581 33101  42724 6L   R1       
-        22        582 33101  42757 6R   R1       
-        22        583 33101  43195 6L   R1_2     
-        22        584 33101  42762 6R   R1       
-        22        585 33101  42739 6L   R1       
-        22        586 33101  42767 6R   R1       
-        22        587 33101  42719 6L   R1       
-        22        588 33101  42772 6R   R1       
-        22        589 33101  42714 6L   R1       
-        22        590 33101  42752 6R   R1       
-        22        591 33101  42729 6L   R1       
-        22        592 33101  42747 6R   R1       
-        22        593 33101  42734 6L   R1       
-        22        594 33101  42362 6R   P19      
-        22        595 33101  41956 6L   P18      
-        22        596 33101  40815 6R   S10_4    
-        22        597 33101  40765 6L   S10_4    
-        22        598 33101  40820 6R   S10_4    
-        22        599 33101  40780 6L   S10_4    
-        22        600 33101  40800 6R   S10_4    
-        22        601 33101  42780 7L   R1       
-        22        602 33101  43206 7R   R1_2     
-        22        603 33101  42799 7L   R1       
-        22        604 33101  43201 7R   R1_2     
-        22        605 33101  42811 7L   R1       
-        22        606 33101  42845 7R   R1       
-        22        607 33101  42795 7L   R1       
-        22        608 33101  42820 7R   R1       
-        22        609 33101  42805 7L   R1       
-        22        610 33101  42825 7R   R1       
-        22        611 33101  42814 7L   R1       
-        22        612 33101  42840 7R   R1       
-        22        613 33101  42790 7L   R1       
-        22        614 33101  42835 7R   R1       
-        22        615 33101  42800 7L   R1       
-        22        616 33101  42830 7R   R1       
-        22        617 33101  41230 7L   S10_6    
-        22        618 33101  41236 7R   S10_5    
-        22        619 33101  41235 7L   S10_6    
-        22        620 33101  41241 7R   S10_6    
-        22        621 33101  42781 7L   R1       
-        22        622 33101  43207 7R   R1_2     
-        22        623 33101  42779 7L   R1       
-        22        624 33101  43202 7R   R1_2     
-        22        625 33101  42776 7L   R1       
-        22        626 33101  42846 7R   R1       
-        22        627 33101  42796 7L   R1       
-        22        628 33101  42821 7R   R1       
-        22        629 33101  42806 7L   R1       
-        22        630 33101  42826 7R   R1       
-        22        631 33101  42816 7L   R1       
-        22        632 33101  42841 7R   R1       
-        22        633 33101  42787 7L   R1       
-        22        634 33101  42836 7R   R1       
-        22        635 33101  42801 7L   R1       
-        22        636 33101  42831 7R   R1       
-        22        637 33101  41231 7L   S10_6    
-        22        638 33101  41237 7R   S10_5    
-        22        639 33101  35858 7L   P15_2    
-        22        640 33101  41242 7R   S10_6    
-        22        641 33101  42782 7L   R1       
-        22        642 33101  43208 7R   R1_2     
-        22        643 33101  42791 7L   R1       
-        22        644 33101  43203 7R   R1_2     
-        22        645 33101  42777 7L   R1       
-        22        646 33101  42847 7R   R1       
-        22        647 33101  42797 7L   R1       
-        22        648 33101  42822 7R   R1       
-        22        649 33101  42807 7L   R1       
-        22        650 33101  42827 7R   R1       
-        22        651 33101  42817 7L   R1       
-        22        652 33101  42848 7R   R1       
-        22        653 33101  42792 7L   R1       
-        22        654 33101  42837 7R   R1       
-        22        655 33101  42802 7L   R1       
-        22        656 33101  42832 7R   R1       
-        22        657 33101  41232 7L   S10_6    
-        22        658 33101  41238 7R   S10_6    
-        22        659 33101  42366 7L   P19      
-        22        660 33101  41243 7R   S10_6    
-        22        661 33101  42783 7L   R1       
-        22        662 33101  43209 7R   R1_2     
-        22        663 33101  42788 7L   R1       
-        22        664 33101  43204 7R   R1_2     
-        22        665 33101  42778 7L   R1       
-        22        666 33101  42842 7R   R1       
-        22        667 33101  42798 7L   R1       
-        22        668 33101  42823 7R   R1       
-        22        669 33101  42808 7L   R1       
-        22        670 33101  42828 7R   R1       
-        22        671 33101  42818 7L   R1       
-        22        672 33101  42843 7R   R1       
-        22        673 33101  42793 7L   R1       
-        22        674 33101  42838 7R   R1       
-        22        675 33101  42803 7L   R1       
-        22        676 33101  42833 7R   R1       
-        22        677 33101  41233 7L   S10_6    
-        22        678 33101  41239 7R   S10_6    
-        22        679 33101  42367 7L   P19      
-        22        680 33101  41244 7R   S10_6    
-        22        681 33101  42784 7L   R1       
-        22        682 33101  43210 7R   R1_2     
-        22        683 33101  42789 7L   R1       
-        22        684 33101  43205 7R   R1_2     
-        22        685 33101  42786 7L   R1       
-        22        686 33101  42849 7R   R1       
-        22        687 33101  42785 7L   R1       
-        22        688 33101  42824 7R   R1       
-        22        689 33101  42809 7L   R1       
-        22        690 33101  42829 7R   R1       
-        22        691 33101  42819 7L   R1       
-        22        692 33101  42844 7R   R1       
-        22        693 33101  42794 7L   R1       
-        22        694 33101  42839 7R   R1       
-        22        695 33101  42804 7L   R1       
-        22        696 33101  42834 7R   R1       
-        22        697 33101  41234 7L   S10_6    
-        22        698 33101  41240 7R   S10_6    
-        22        699 33101  42368 7L   P19      
-        22        700 33101  35650 7R   P15_1    
-        22        701 33101  43214 8L   R1_2     
-        22        702 33101  43234 8R   R1_2     
-        22        703 33101  43219 8L   R1_2     
-        22        704 33101  43229 8R   R1_2     
-        22        705 33101  42876 8L   R1       
-        22        706 33101  42906 8R   R1       
-        22        707 33101  42865 8L   R1       
-        22        708 33101  42904 8R   R1       
-        22        709 33101  42875 8L   R1       
-        22        710 33101  42899 8R   R1       
-        22        711 33101  42868 8L   R1       
-        22        712 33101  42889 8R   R1       
-        22        713 33101  42855 8L   R1       
-        22        714 33101  42894 8R   R1       
-        22        715 33101  42850 8L   R1       
-        22        716 33101  42884 8R   R1       
-        22        717 33101  40881 8L   S10_4    
-        22        718 33101  42879 8R   R1       
-        22        719 33101  40886 8L   S10_4    
-        22        720 33101  41246 8R   S10_5    
-        22        721 33101  43215 8L   R1_2     
-        22        722 33101  43235 8R   R1_2     
-        22        723 33101  43220 8L   R1_2     
-        22        724 33101  43230 8R   R1_2     
-        22        725 33101  42877 8L   R1       
-        22        726 33101  42910 8R   R1       
-        22        727 33101  42866 8L   R1       
-        22        728 33101  42905 8R   R1       
-        22        729 33101  42870 8L   R1       
-        22        730 33101  42900 8R   R1       
-        22        731 33101  42869 8L   R1       
-        22        732 33101  42890 8R   R1       
-        22        733 33101  42856 8L   R1       
-        22        734 33101  42895 8R   R1       
-        22        735 33101  42851 8L   R1       
-        22        736 33101  42885 8R   R1       
-        22        737 33101  40882 8L   S10_4    
-        22        738 33101  42880 8R   R1       
-        22        739 33101  40887 8L   S10_4    
-        22        740 33101  41247 8R   S10_5    
-        22        741 33101  43216 8L   R1_2     
-        22        742 33101  43236 8R   R1_2     
-        22        743 33101  43221 8L   R1_2     
-        22        744 33101  43231 8R   R1_2     
-        22        745 33101  42872 8L   R1       
-        22        746 33101  42911 8R   R1       
-        22        747 33101  42867 8L   R1       
-        22        748 33101  42909 8R   R1       
-        22        749 33101  42871 8L   R1       
-        22        750 33101  42901 8R   R1       
-        22        751 33101  42862 8L   R1       
-        22        752 33101  42891 8R   R1       
-        22        753 33101  42857 8L   R1       
-        22        754 33101  42896 8R   R1       
-        22        755 33101  42852 8L   R1       
-        22        756 33101  42886 8R   R1       
-        22        757 33101  40883 8L   S10_4    
-        22        758 33101  42881 8R   R1       
-        22        759 33101  40888 8L   S10_4    
-        22        760 33101  41248 8R   S10_5    
-        22        761 33101  43217 8L   R1_2     
-        22        762 33101  43237 8R   R1_2     
-        22        763 33101  43222 8L   R1_2     
-        22        764 33101  43232 8R   R1_2     
-        22        765 33101  42873 8L   R1       
-        22        766 33101  42912 8R   R1       
-        22        767 33101  42860 8L   R1       
-        22        768 33101  42907 8R   R1       
-        22        769 33101  42878 8L   R1       
-        22        770 33101  42902 8R   R1       
-        22        771 33101  42863 8L   R1       
-        22        772 33101  42892 8R   R1       
-        22        773 33101  42858 8L   R1       
-        22        774 33101  42897 8R   R1       
-        22        775 33101  42853 8L   R1       
-        22        776 33101  42887 8R   R1       
-        22        777 33101  40884 8L   S10_4    
-        22        778 33101  42882 8R   R1       
-        22        779 33101  40889 8L   S10_4    
-        22        780 33101  41249 8R   S10_5    
-        22        781 33101  43225 8L   R1_2     
-        22        782 33101  43238 8R   R1_2     
-        22        783 33101  43223 8L   R1_2     
-        22        784 33101  43233 8R   R1_2     
-        22        785 33101  42874 8L   R1       
-        22        786 33101  42913 8R   R1       
-        22        787 33101  42861 8L   R1       
-        22        788 33101  42908 8R   R1       
-        22        789 33101  41245 8L   S10_6    
-        22        790 33101  42903 8R   R1       
-        22        791 33101  42864 8L   R1       
-        22        792 33101  42893 8R   R1       
-        22        793 33101  42859 8L   R1       
-        22        794 33101  42898 8R   R1       
-        22        795 33101  42854 8L   R1       
-        22        796 33101  42888 8R   R1       
-        22        797 33101  40885 8L   S10_4    
-        22        798 33101  42883 8R   R1       
-        22        799 33101  40890 8L   S10_4    
-        22        800 33101  41250 8R   S10_6    
-        22        801 33101  43251 9L   R1_2     
-        22        802 33101  42025 9R   P18      
-        22        803 33101  43241 9L   R1_2     
-        22        804 33101  43252 9R   R1_2     
-        22        805 33101  42943 9L   R1       
-        22        806 33101  42968 9R   R1       
-        22        807 33101  42929 9L   R1       
-        22        808 33101  42953 9R   R1       
-        22        809 33101  42934 9L   R1       
-        22        810 33101  42983 9R   R1       
-        22        811 33101  42924 9L   R1       
-        22        812 33101  42963 9R   R1       
-        22        813 33101  42914 9L   R1       
-        22        814 33101  42978 9R   R1       
-        22        815 33101  42919 9L   R1       
-        22        816 33101  42973 9R   R1       
-        22        817 33101  41253 9L   S10_5    
-        22        818 33101  42948 9R   R1       
-        22        819 33101  41258 9L   S10_5    
-        22        820 33101  42958 9R   R1       
-        22        821 33101  42939 9L   R1       
-        22        822 33101  43258 9R   R1_2     
-        22        823 33101  43242 9L   R1_2     
-        22        824 33101  43253 9R   R1_2     
-        22        825 33101  42944 9L   R1       
-        22        826 33101  42984 9R   R1       
-        22        827 33101  42930 9L   R1       
-        22        828 33101  42959 9R   R1       
-        22        829 33101  42935 9L   R1       
-        22        830 33101  42969 9R   R1       
-        22        831 33101  42925 9L   R1       
-        22        832 33101  42964 9R   R1       
-        22        833 33101  42915 9L   R1       
-        22        834 33101  42979 9R   R1       
-        22        835 33101  42920 9L   R1       
-        22        836 33101  42974 9R   R1       
-        22        837 33101  41254 9L   S10_5    
-        22        838 33101  42949 9R   R1       
-        22        839 33101  41259 9L   S10_5    
-        22        840 33101  42954 9R   R1       
-        22        841 33101  42940 9L   R1       
-        22        842 33101  43259 9R   R1_2     
-        22        843 33101  43243 9L   R1_2     
-        22        844 33101  43254 9R   R1_2     
-        22        845 33101  42945 9L   R1       
-        22        846 33101  42985 9R   R1       
-        22        847 33101  42931 9L   R1       
-        22        848 33101  42960 9R   R1       
-        22        849 33101  42936 9L   R1       
-        22        850 33101  42970 9R   R1       
-        22        851 33101  42926 9L   R1       
-        22        852 33101  42965 9R   R1       
-        22        853 33101  42916 9L   R1       
-        22        854 33101  42980 9R   R1       
-        22        855 33101  42921 9L   R1       
-        22        856 33101  42975 9R   R1       
-        22        857 33101  41255 9L   S10_5    
-        22        858 33101  42950 9R   R1       
-        22        859 33101  41260 9L   S10_5    
-        22        860 33101  42955 9R   R1       
-        22        861 33101  42941 9L   R1       
-        22        862 33101  43260 9R   R1_2     
-        22        863 33101  43244 9L   R1_2     
-        22        864 33101  43255 9R   R1_2     
-        22        865 33101  42946 9L   R1       
-        22        866 33101  42986 9R   R1       
-        22        867 33101  42932 9L   R1       
-        22        868 33101  42961 9R   R1       
-        22        869 33101  42937 9L   R1       
-        22        870 33101  42971 9R   R1       
-        22        871 33101  42927 9L   R1       
-        22        872 33101  42966 9R   R1       
-        22        873 33101  42917 9L   R1       
-        22        874 33101  42981 9R   R1       
-        22        875 33101  42922 9L   R1       
-        22        876 33101  42976 9R   R1       
-        22        877 33101  41256 9L   S10_5    
-        22        878 33101  42951 9R   R1       
-        22        879 33101  36913 9L   S9_2     
-        22        880 33101  42956 9R   R1       
-        22        881 33101  42942 9L   R1       
-        22        882 33101  43261 9R   R1_2     
-        22        883 33101  43245 9L   R1_2     
-        22        884 33101  43256 9R   R1_2     
-        22        885 33101  42947 9L   R1       
-        22        886 33101  40978 9R   S10_4    
-        22        887 33101  42933 9L   R1       
-        22        888 33101  42962 9R   R1       
-        22        889 33101  42938 9L   R1       
-        22        890 33101  42972 9R   R1       
-        22        891 33101  42928 9L   R1       
-        22        892 33101  42967 9R   R1       
-        22        893 33101  42918 9L   R1       
-        22        894 33101  42982 9R   R1       
-        22        895 33101  42923 9L   R1       
-        22        896 33101  42977 9R   R1       
-        22        897 33101  41257 9L   S10_5    
-        22        898 33101  42952 9R   R1       
-        22        899 33101  38869 9L   P16      
-        22        900 33101  42957 9R   R1       
-        22        901 33101  43581 10L  R2_1     
-        22        902 33101  43616 10R  R2_1     
-        22        903 33101  43571 10L  R2_1     
-        22        904 33101  43621 10R  R2_1     
-        22        905 33101  43561 10L  R2_1     
-        22        906 33101  43631 10R  R2_1     
-        22        907 33101  43591 10L  R2_1     
-        22        908 33101  43609 10R  R2_1     
-        22        909 33101  43575 10L  R2_1     
-        22        910 33101  43601 10R  R2_1     
-        22        911 33101  43566 10L  R2_1     
-        22        912 33101  43596 10R  R2_1     
-        22        913 33101  42987 10L  R1       
-        22        914 33101  43286 10R  R1_2     
-        22        915 33101  41303 10L  S10_5    
-        22        916 33101  43281 10R  R1_2     
-        22        917 33101  43270 10L  R1_2     
-        22        918 33101  43276 10R  R1_2     
-        22        919 33101  41271 10L  S10_5    
-        22        920 33101  41321 10R  S10_5    
-        22        921 33101  43582 10L  R2_1     
-        22        922 33101  43617 10R  R2_1     
-        22        923 33101  43572 10L  R2_1     
-        22        924 33101  43622 10R  R2_1     
-        22        925 33101  43562 10L  R2_1     
-        22        926 33101  43632 10R  R2_1     
-        22        927 33101  43592 10L  R2_1     
-        22        928 33101  43610 10R  R2_1     
-        22        929 33101  43577 10L  R2_1     
-        22        930 33101  43602 10R  R2_1     
-        22        931 33101  43567 10L  R2_1     
-        22        932 33101  43597 10R  R2_1     
-        22        933 33101  43275 10L  R1_2     
-        22        934 33101  43287 10R  R1_2     
-        22        935 33101  43266 10L  R1_2     
-        22        936 33101  43282 10R  R1_2     
-        22        937 33101  43271 10L  R1_2     
-        22        938 33101  43277 10R  R1_2     
-        22        939 33101  41272 10L  S10_5    
-        22        940 33101  42401 10R  P19      
-        22        941 33101  43583 10L  R2_1     
-        22        942 33101  43618 10R  R2_1     
-        22        943 33101  43573 10L  R2_1     
-        22        944 33101  43623 10R  R2_1     
-        22        945 33101  43563 10L  R2_1     
-        22        946 33101  43633 10R  R2_1     
-        22        947 33101  43593 10L  R2_1     
-        22        948 33101  43613 10R  R2_1     
-        22        949 33101  43578 10L  R2_1     
-        22        950 33101  43603 10R  R2_1     
-        22        951 33101  43568 10L  R2_1     
-        22        952 33101  43598 10R  R2_1     
-        22        953 33101  43265 10L  R1_2     
-        22        954 33101  43288 10R  R1_2     
-        22        955 33101  43267 10L  R1_2     
-        22        956 33101  43283 10R  R1_2     
-        22        957 33101  43272 10L  R1_2     
-        22        958 33101  43278 10R  R1_2     
-        22        959 33101  41273 10L  S10_5    
-        22        960 33101  42404 10R  P19      
-        22        961 33101  43584 10L  R2_1     
-        22        962 33101  43619 10R  R2_1     
-        22        963 33101  43574 10L  R2_1     
-        22        964 33101  43624 10R  R2_1     
-        22        965 33101  43564 10L  R2_1     
-        22        966 33101  43634 10R  R2_1     
-        22        967 33101  43594 10L  R2_1     
-        22        968 33101  43614 10R  R2_1     
-        22        969 33101  43579 10L  R2_1     
-        22        970 33101  43604 10R  R2_1     
-        22        971 33101  43569 10L  R2_1     
-        22        972 33101  43599 10R  R2_1     
-        22        973 33101  43269 10L  R1_2     
-        22        974 33101  42988 10R  R1       
-        22        975 33101  43268 10L  R1_2     
-        22        976 33101  43284 10R  R1_2     
-        22        977 33101  43273 10L  R1_2     
-        22        978 33101  43279 10R  R1_2     
-        22        979 33101  41274 10L  S10_5    
-        22        980 33101  41324 10R  S10_5    
-        22        981 33101  43585 10L  R2_1     
-        22        982 33101  43620 10R  R2_1     
-        22        983 33101  43576 10L  R2_1     
-        22        984 33101  43625 10R  R2_1     
-        22        985 33101  43565 10L  R2_1     
-        22        986 33101  43635 10R  R2_1     
-        22        987 33101  43595 10L  R2_1     
-        22        988 33101  43615 10R  R2_1     
-        22        989 33101  43580 10L  R2_1     
-        22        990 33101  43605 10R  R2_1     
-        22        991 33101  43570 10L  R2_1     
-        22        992 33101  43600 10R  R2_1     
-        22        993 33101  41305 10L  S10_5    
-        22        994 33101  42989 10R  R1       
-        22        995 33101  41304 10L  S10_5    
-        22        996 33101  43285 10R  R1_2     
-        22        997 33101  43274 10L  R1_2     
-        22        998 33101  43280 10R  R1_2     
-        22        999 33101  41275 10L  S10_5    
-        22       1000 33101  41349 10R  S10_5    
-        22       1001 33101  43666 11L  R2_1     
-        22       1002 33101  43692 11R  R2_1     
-        22       1003 33101  43647 11L  R2_1     
-        22       1004 33101  43677 11R  R2_1     
-        22       1005 33101  43656 11L  R2_1     
-        22       1006 33101  43707 11R  R2_1     
-        22       1007 33101  43661 11L  R2_1     
-        22       1008 33101  43687 11R  R2_1     
-        22       1009 33101  43641 11L  R2_1     
-        22       1010 33101  43682 11R  R2_1     
-        22       1011 33101  43636 11L  R2_1     
-        22       1012 33101  43672 11R  R2_1     
-        22       1013 33101  38171 11L  S9_6     
-        22       1014 33101  43304 11R  R1_2     
-        22       1015 33101  43289 11L  R1_2     
-        22       1016 33101  43309 11R  R1_2     
-        22       1017 33101  43294 11L  R1_2     
-        22       1018 33101  42990 11R  R1       
-        22       1019 33101  41373 11L  S10_5    
-        22       1020 33101  41397 11R  S10_5    
-        22       1021 33101  43667 11L  R2_1     
-        22       1022 33101  43693 11R  R2_1     
-        22       1023 33101  43652 11L  R2_1     
-        22       1024 33101  43678 11R  R2_1     
-        22       1025 33101  43657 11L  R2_1     
-        22       1026 33101  43708 11R  R2_1     
-        22       1027 33101  43662 11L  R2_1     
-        22       1028 33101  43688 11R  R2_1     
-        22       1029 33101  43642 11L  R2_1     
-        22       1030 33101  43683 11R  R2_1     
-        22       1031 33101  43637 11L  R2_1     
-        22       1032 33101  43673 11R  R2_1     
-        22       1033 33101  38172 11L  S9_6     
-        22       1034 33101  38177 11R  S9_6     
-        22       1035 33101  43290 11L  R1_2     
-        22       1036 33101  43310 11R  R1_2     
-        22       1037 33101  43295 11L  R1_2     
-        22       1038 33101  42991 11R  R1       
-        22       1039 33101  41374 11L  S10_5    
-        22       1040 33101  41402 11R  S10_5    
-        22       1041 33101  43301 11L  R1_2     
-        22       1042 33101  43694 11R  R2_1     
-        22       1043 33101  43653 11L  R2_1     
-        22       1044 33101  43679 11R  R2_1     
-        22       1045 33101  43658 11L  R2_1     
-        22       1046 33101  43709 11R  R2_1     
-        22       1047 33101  43663 11L  R2_1     
-        22       1048 33101  43689 11R  R2_1     
-        22       1049 33101  43643 11L  R2_1     
-        22       1050 33101  43684 11R  R2_1     
-        22       1051 33101  43638 11L  R2_1     
-        22       1052 33101  43674 11R  R2_1     
-        22       1053 33101  41378 11L  S10_5    
-        22       1054 33101  43306 11R  R1_2     
-        22       1055 33101  43291 11L  R1_2     
-        22       1056 33101  43311 11R  R1_2     
-        22       1057 33101  43296 11L  R1_2     
-        22       1058 33101  42992 11R  R1       
-        22       1059 33101  41365 11L  S10_5    
-        22       1060 33101  41410 11R  S10_5    
-        22       1061 33101  43669 11L  R2_1     
-        22       1062 33101  43695 11R  R2_1     
-        22       1063 33101  43654 11L  R2_1     
-        22       1064 33101  43680 11R  R2_1     
-        22       1065 33101  43659 11L  R2_1     
-        22       1066 33101  43710 11R  R2_1     
-        22       1067 33101  43664 11L  R2_1     
-        22       1068 33101  43690 11R  R2_1     
-        22       1069 33101  43644 11L  R2_1     
-        22       1070 33101  43685 11R  R2_1     
-        22       1071 33101  43639 11L  R2_1     
-        22       1072 33101  43675 11R  R2_1     
-        22       1073 33101  42420 11L  P19      
-        22       1074 33101  43307 11R  R1_2     
-        22       1075 33101  43292 11L  R1_2     
-        22       1076 33101  43312 11R  R1_2     
-        22       1077 33101  43297 11L  R1_2     
-        22       1078 33101  40466 11R  S10_3    
-        22       1079 33101  41376 11L  S10_5    
-        22       1080 33101  41411 11R  S10_5    
-        22       1081 33101  43670 11L  R2_1     
-        22       1082 33101  43696 11R  R2_1     
-        22       1083 33101  43655 11L  R2_1     
-        22       1084 33101  43702 11R  R2_1     
-        22       1085 33101  43660 11L  R2_1     
-        22       1086 33101  43305 11R  R1_2     
-        22       1087 33101  43665 11L  R2_1     
-        22       1088 33101  43691 11R  R2_1     
-        22       1089 33101  43645 11L  R2_1     
-        22       1090 33101  43686 11R  R2_1     
-        22       1091 33101  43640 11L  R2_1     
-        22       1092 33101  43676 11R  R2_1     
-        22       1093 33101  43299 11L  R1_2     
-        22       1094 33101  43308 11R  R1_2     
-        22       1095 33101  43303 11L  R1_2     
-        22       1096 33101  43313 11R  R1_2     
-        22       1097 33101  43298 11L  R1_2     
-        22       1098 33101  42066 11R  P18      
-        22       1099 33101  41377 11L  S10_5    
-        22       1100 33101  41415 11R  S10_5    
-        22       1101 33101  43731 12L  R2_1     
-        22       1102 33101  43759 12R  R2_1     
-        22       1103 33101  43726 12L  R2_1     
-        22       1104 33101  43779 12R  R2_1     
-        22       1105 33101  43721 12L  R2_1     
-        22       1106 33101  43764 12R  R2_1     
-        22       1107 33101  43741 12L  R2_1     
-        22       1108 33101  43760 12R  R2_1     
-        22       1109 33101  43711 12L  R2_1     
-        22       1110 33101  43769 12R  R2_1     
-        22       1111 33101  43716 12L  R2_1     
-        22       1112 33101  43749 12R  R2_1     
-        22       1113 33101  43318 12L  R1_2     
-        22       1114 33101  43331 12R  R1_2     
-        22       1115 33101  43316 12L  R1_2     
-        22       1116 33101  43326 12R  R1_2     
-        22       1117 33101  42426 12L  P19      
-        22       1118 33101  41465 12R  S10_5    
-        22       1119 33101  41419 12L  S10_5    
-        22       1120 33101  41460 12R  S10_5    
-        22       1121 33101  43732 12L  R2_1     
-        22       1122 33101  43754 12R  R2_1     
-        22       1123 33101  43727 12L  R2_1     
-        22       1124 33101  43780 12R  R2_1     
-        22       1125 33101  43722 12L  R2_1     
-        22       1126 33101  43765 12R  R2_1     
-        22       1127 33101  43742 12L  R2_1     
-        22       1128 33101  43755 12R  R2_1     
-        22       1129 33101  43712 12L  R2_1     
-        22       1130 33101  43770 12R  R2_1     
-        22       1131 33101  43717 12L  R2_1     
-        22       1132 33101  43750 12R  R2_1     
-        22       1133 33101  43322 12L  R1_2     
-        22       1134 33101  43332 12R  R1_2     
-        22       1135 33101  43317 12L  R1_2     
-        22       1136 33101  43327 12R  R1_2     
-        22       1137 33101  42431 12L  P19      
-        22       1138 33101  41466 12R  S10_5    
-        22       1139 33101  41420 12L  S10_5    
-        22       1140 33101  41461 12R  S10_5    
-        22       1141 33101  43733 12L  R2_1     
-        22       1142 33101  43761 12R  R2_1     
-        22       1143 33101  43728 12L  R2_1     
-        22       1144 33101  43781 12R  R2_1     
-        22       1145 33101  43723 12L  R2_1     
-        22       1146 33101  43763 12R  R2_1     
-        22       1147 33101  43743 12L  R2_1     
-        22       1148 33101  43756 12R  R2_1     
-        22       1149 33101  43713 12L  R2_1     
-        22       1150 33101  43771 12R  R2_1     
-        22       1151 33101  43718 12L  R2_1     
-        22       1152 33101  43751 12R  R2_1     
-        22       1153 33101  43323 12L  R1_2     
-        22       1154 33101  43333 12R  R1_2     
-        22       1155 33101  43321 12L  R1_2     
-        22       1156 33101  43328 12R  R1_2     
-        22       1157 33101  42428 12L  P19      
-        22       1158 33101  41467 12R  S10_5    
-        22       1159 33101  41421 12L  S10_5    
-        22       1160 33101  41462 12R  S10_5    
-        22       1161 33101  43734 12L  R2_1     
-        22       1162 33101  43762 12R  R2_1     
-        22       1163 33101  43729 12L  R2_1     
-        22       1164 33101  43775 12R  R2_1     
-        22       1165 33101  43724 12L  R2_1     
-        22       1166 33101  43767 12R  R2_1     
-        22       1167 33101  43744 12L  R2_1     
-        22       1168 33101  43757 12R  R2_1     
-        22       1169 33101  43714 12L  R2_1     
-        22       1170 33101  43772 12R  R2_1     
-        22       1171 33101  43719 12L  R2_1     
-        22       1172 33101  43752 12R  R2_1     
-        22       1173 33101  43324 12L  R1_2     
-        22       1174 33101  43334 12R  R1_2     
-        22       1175 33101  43319 12L  R1_2     
-        22       1176 33101  43329 12R  R1_2     
-        22       1177 33101  42429 12L  P19      
-        22       1178 33101  41472 12R  S10_5    
-        22       1179 33101  41422 12L  S10_5    
-        22       1180 33101  41463 12R  S10_5    
-        22       1181 33101  43735 12L  R2_1     
-        22       1182 33101  43778 12R  R2_1     
-        22       1183 33101  43730 12L  R2_1     
-        22       1184 33101  43783 12R  R2_1     
-        22       1185 33101  43725 12L  R2_1     
-        22       1186 33101  43768 12R  R2_1     
-        22       1187 33101  43745 12L  R2_1     
-        22       1188 33101  43758 12R  R2_1     
-        22       1189 33101  43715 12L  R2_1     
-        22       1190 33101  43773 12R  R2_1     
-        22       1191 33101  43720 12L  R2_1     
-        22       1192 33101  43753 12R  R2_1     
-        22       1193 33101  43325 12L  R1_2     
-        22       1194 33101  42993 12R  R1       
-        22       1195 33101  43320 12L  R1_2     
-        22       1196 33101  43330 12R  R1_2     
-        22       1197 33101  42430 12L  P19      
-        22       1198 33101  41469 12R  S10_5    
-        22       1199 33101  41433 12L  S10_5    
-        22       1200 33101  41464 12R  S10_5    
-        22       1201 33101  44427 13L  R2_2     
-        22       1202 33101  43812 13R  R2_1     
-        22       1203 33101  43789 13L  R2_1     
-        22       1204 33101  43817 13R  R2_1     
-        22       1205 33101  43795 13L  R2_1     
-        22       1206 33101  43837 13R  R2_1     
-        22       1207 33101  43790 13L  R2_1     
-        22       1208 33101  43832 13R  R2_1     
-        22       1209 33101  43785 13L  R2_1     
-        22       1210 33101  43827 13R  R2_1     
-        22       1211 33101  43805 13L  R2_1     
-        22       1212 33101  43822 13R  R2_1     
-        22       1213 33101  42440 13L  P19      
-        22       1214 33101  43000 13R  R1       
-        22       1215 33101  43340 13L  R1_2     
-        22       1216 33101  43345 13R  R1_2     
-        22       1217 33101  41476 13L  S10_5    
-        22       1218 33101  41790 13R  S10_5    
-        22       1219 33101  41776 13L  S10_5    
-        22       1220 33101  40498 13R  S10_3    
-        22       1221 33101  44430 13L  R2_2     
-        22       1222 33101  43813 13R  R2_1     
-        22       1223 33101  43801 13L  R2_1     
-        22       1224 33101  43818 13R  R2_1     
-        22       1225 33101  43796 13L  R2_1     
-        22       1226 33101  43838 13R  R2_1     
-        22       1227 33101  43791 13L  R2_1     
-        22       1228 33101  43833 13R  R2_1     
-        22       1229 33101  43787 13L  R2_1     
-        22       1230 33101  43828 13R  R2_1     
-        22       1231 33101  43806 13L  R2_1     
-        22       1232 33101  43823 13R  R2_1     
-        22       1233 33101  42994 13L  R1       
-        22       1234 33101  42996 13R  R1       
-        22       1235 33101  43341 13L  R1_2     
-        22       1236 33101  43346 13R  R1_2     
-        22       1237 33101  41777 13L  S10_5    
-        22       1238 33101  41791 13R  S10_5    
-        22       1239 33101  41494 13L  S10_5    
-        22       1240 33101  40499 13R  S10_3    
-        22       1241 33101  44433 13L  R2_2     
-        22       1242 33101  43814 13R  R2_1     
-        22       1243 33101  43802 13L  R2_1     
-        22       1244 33101  43819 13R  R2_1     
-        22       1245 33101  43797 13L  R2_1     
-        22       1246 33101  43839 13R  R2_1     
-        22       1247 33101  43788 13L  R2_1     
-        22       1248 33101  43834 13R  R2_1     
-        22       1249 33101  43335 13L  R1_2     
-        22       1250 33101  43829 13R  R2_1     
-        22       1251 33101  43807 13L  R2_1     
-        22       1252 33101  43824 13R  R2_1     
-        22       1253 33101  43337 13L  R1_2     
-        22       1254 33101  42997 13R  R1       
-        22       1255 33101  43342 13L  R1_2     
-        22       1256 33101  43347 13R  R1_2     
-        22       1257 33101  41499 13L  S10_5    
-        22       1258 33101  41792 13R  S10_5    
-        22       1259 33101  41782 13L  S10_5    
-        22       1260 33101  41800 13R  S10_5    
-        22       1261 33101  44434 13L  R2_2     
-        22       1262 33101  43815 13R  R2_1     
-        22       1263 33101  43803 13L  R2_1     
-        22       1264 33101  42995 13R  R1       
-        22       1265 33101  43798 13L  R2_1     
-        22       1266 33101  43840 13R  R2_1     
-        22       1267 33101  43793 13L  R2_1     
-        22       1268 33101  43835 13R  R2_1     
-        22       1269 33101  43336 13L  R1_2     
-        22       1270 33101  43830 13R  R2_1     
-        22       1271 33101  43808 13L  R2_1     
-        22       1272 33101  43825 13R  R2_1     
-        22       1273 33101  43338 13L  R1_2     
-        22       1274 33101  42998 13R  R1       
-        22       1275 33101  43343 13L  R1_2     
-        22       1276 33101  43348 13R  R1_2     
-        22       1277 33101  41779 13L  S10_5    
-        22       1278 33101  41793 13R  S10_5    
-        22       1279 33101  41479 13L  S10_5    
-        22       1280 33101  27935 13R  S6_3a    
-        22       1281 33101  44435 13L  R2_2     
-        22       1282 33101  43816 13R  R2_1     
-        22       1283 33101  43804 13L  R2_1     
-        22       1284 33101  43821 13R  R2_1     
-        22       1285 33101  43799 13L  R2_1     
-        22       1286 33101  43841 13R  R2_1     
-        22       1287 33101  43794 13L  R2_1     
-        22       1288 33101  43836 13R  R2_1     
-        22       1289 33101  43810 13L  R2_1     
-        22       1290 33101  43831 13R  R2_1     
-        22       1291 33101  43809 13L  R2_1     
-        22       1292 33101  43826 13R  R2_1     
-        22       1293 33101  43339 13L  R1_2     
-        22       1294 33101  42999 13R  R1       
-        22       1295 33101  43344 13L  R1_2     
-        22       1296 33101  43349 13R  R1_2     
-        22       1297 33101  41480 13L  S10_5    
-        22       1298 33101  41794 13R  S10_5    
-        22       1299 33101  41780 13L  S10_5    
-        22       1300 33101  42095 13R  P18      
-        22       1301 33101  43150 14L  R1_2     
-        22       1302 33101  41058 14R  S10_5    
-        22       1303 33101  41032 14L  S10_5    
-        22       1304 33101  41083 14R  S10_5    
-        22       1305 33101  43151 14L  R1_2     
-        22       1306 33101  43160 14R  R1_2     
-        22       1307 33101  43934 14L  R2_2     
-        22       1308 33101  44004 14R  R2_2     
-        22       1309 33101  43156 14L  R1_2     
-        22       1310 33101  44012 14R  R2_2     
-        22       1311 33101  43944 14L  R2_2     
-        22       1312 33101  44021 14R  R2_2     
-        22       1313 33101  43956 14L  R2_2     
-        22       1314 33101  44026 14R  R2_2     
-        22       1315 33101  43972 14L  R2_2     
-        22       1316 33101  43352 14R  R2_1     
-        22       1317 33101  43935 14L  R2_2     
-        22       1318 33101  44031 14R  R2_2     
-        22       1319 33101  43979 14L  R2_2     
-        22       1320 33101  44041 14R  R2_2     
-        22       1321 33101  43927 14L  R2_2     
-        22       1322 33101  41063 14R  S10_5    
-        22       1323 33101  41039 14L  S10_5    
-        22       1324 33101  41088 14R  S10_5    
-        22       1325 33101  43152 14L  R1_2     
-        22       1326 33101  43161 14R  R1_2     
-        22       1327 33101  43937 14L  R2_2     
-        22       1328 33101  44005 14R  R2_2     
-        22       1329 33101  43157 14L  R1_2     
-        22       1330 33101  44017 14R  R2_2     
-        22       1331 33101  43950 14L  R2_2     
-        22       1332 33101  43164 14R  R1_2     
-        22       1333 33101  43959 14L  R2_2     
-        22       1334 33101  43165 14R  R1_2     
-        22       1335 33101  43973 14L  R2_2     
-        22       1336 33101  43353 14R  R2_1     
-        22       1337 33101  43942 14L  R2_2     
-        22       1338 33101  44034 14R  R2_2     
-        22       1339 33101  43980 14L  R2_2     
-        22       1340 33101  44042 14R  R2_2     
-        22       1341 33101  43929 14L  R2_2     
-        22       1342 33101  41078 14R  S10_5    
-        22       1343 33101  41043 14L  S10_5    
-        22       1344 33101  42702 14R  R1_1     
-        22       1345 33101  43153 14L  R1_2     
-        22       1346 33101  43999 14R  R2_2     
-        22       1347 33101  43939 14L  R2_2     
-        22       1348 33101  44006 14R  R2_2     
-        22       1349 33101  43158 14L  R1_2     
-        22       1350 33101  44018 14R  R2_2     
-        22       1351 33101  43952 14L  R2_2     
-        22       1352 33101  44023 14R  R2_2     
-        22       1353 33101  43962 14L  R2_2     
-        22       1354 33101  44028 14R  R2_2     
-        22       1355 33101  43975 14L  R2_2     
-        22       1356 33101  43354 14R  R2_1     
-        22       1357 33101  43961 14L  R2_2     
-        22       1358 33101  39285 14R  S10_1    
-        22       1359 33101  43948 14L  R2_2     
-        22       1360 33101  44043 14R  R2_2     
-        22       1361 33101  43930 14L  R2_2     
-        22       1362 33101  41079 14R  S10_5    
-        22       1363 33101  41055 14L  S10_5    
-        22       1364 33101  42703 14R  R1_1     
-        22       1365 33101  43154 14L  R1_2     
-        22       1366 33101  44002 14R  R2_2     
-        22       1367 33101  43940 14L  R2_2     
-        22       1368 33101  43162 14R  R1_2     
-        22       1369 33101  43931 14L  R2_2     
-        22       1370 33101  44019 14R  R2_2     
-        22       1371 33101  43953 14L  R2_2     
-        22       1372 33101  44024 14R  R2_2     
-        22       1373 33101  43968 14L  R2_2     
-        22       1374 33101  44029 14R  R2_2     
-        22       1375 33101  43976 14L  R2_2     
-        22       1376 33101  44038 14R  R2_2     
-        22       1377 33101  43964 14L  R2_2     
-        22       1378 33101  44036 14R  R2_2     
-        22       1379 33101  43949 14L  R2_2     
-        22       1380 33101  44044 14R  R2_2     
-        22       1381 33101  43155 14L  R1_2     
-        22       1382 33101  41080 14R  S10_5    
-        22       1383 33101  42213 14L  P19      
-        22       1384 33101  43159 14R  R1_2     
-        22       1385 33101  42701 14L  R1_1     
-        22       1386 33101  44003 14R  R2_2     
-        22       1387 33101  43941 14L  R2_2     
-        22       1388 33101  44011 14R  R2_2     
-        22       1389 33101  43932 14L  R2_2     
-        22       1390 33101  43163 14R  R1_2     
-        22       1391 33101  43954 14L  R2_2     
-        22       1392 33101  44025 14R  R2_2     
-        22       1393 33101  43970 14L  R2_2     
-        22       1394 33101  44030 14R  R2_2     
-        22       1395 33101  43978 14L  R2_2     
-        22       1396 33101  44039 14R  R2_2     
-        22       1397 33101  43969 14L  R2_2     
-        22       1398 33101  44037 14R  R2_2     
-        22       1399 33101  43960 14L  R2_2     
-        22       1400 33101  44045 14R  R2_2     
-        22       1401 33101  41091 15L  S10_5    
-        22       1402 33101  40226 15R  S10_3    
-        22       1403 33101  42234 15L  P19      
-        22       1404 33101  43356 15R  R2_1     
-        22       1405 33101  42256 15L  P19      
-        22       1406 33101  44146 15R  R2_2     
-        22       1407 33101  42254 15L  P19      
-        22       1408 33101  44151 15R  R2_2     
-        22       1409 33101  44072 15L  R2_2     
-        22       1410 33101  44156 15R  R2_2     
-        22       1411 33101  44081 15L  R2_2     
-        22       1412 33101  44161 15R  R2_2     
-        22       1413 33101  44122 15L  R2_2     
-        22       1414 33101  44185 15R  R2_2     
-        22       1415 33101  44116 15L  R2_2     
-        22       1416 33101  44178 15R  R2_2     
-        22       1417 33101  44105 15L  R2_2     
-        22       1418 33101  44168 15R  R2_2     
-        22       1419 33101  44099 15L  R2_2     
-        22       1420 33101  44166 15R  R2_2     
-        22       1421 33101  41092 15L  S10_5    
-        22       1422 33101  41110 15R  S10_5    
-        22       1423 33101  42245 15L  P19      
-        22       1424 33101  44135 15R  R2_2     
-        22       1425 33101  42253 15L  P19      
-        22       1426 33101  44147 15R  R2_2     
-        22       1427 33101  42261 15L  P19      
-        22       1428 33101  44152 15R  R2_2     
-        22       1429 33101  44075 15L  R2_2     
-        22       1430 33101  44157 15R  R2_2     
-        22       1431 33101  44082 15L  R2_2     
-        22       1432 33101  44162 15R  R2_2     
-        22       1433 33101  44126 15L  R2_2     
-        22       1434 33101  44187 15R  R2_2     
-        22       1435 33101  44115 15L  R2_2     
-        22       1436 33101  44179 15R  R2_2     
-        22       1437 33101  44107 15L  R2_2     
-        22       1438 33101  44171 15R  R2_2     
-        22       1439 33101  44092 15L  R2_2     
-        22       1440 33101  44167 15R  R2_2     
-        22       1441 33101  41093 15L  S10_5    
-        22       1442 33101  41115 15R  S10_5    
-        22       1443 33101  42247 15L  P19      
-        22       1444 33101  44138 15R  R2_2     
-        22       1445 33101  42258 15L  P19      
-        22       1446 33101  44148 15R  R2_2     
-        22       1447 33101  44067 15L  R2_2     
-        22       1448 33101  44153 15R  R2_2     
-        22       1449 33101  44076 15L  R2_2     
-        22       1450 33101  44158 15R  R2_2     
-        22       1451 33101  44083 15L  R2_2     
-        22       1452 33101  44163 15R  R2_2     
-        22       1453 33101  44127 15L  R2_2     
-        22       1454 33101  44188 15R  R2_2     
-        22       1455 33101  44118 15L  R2_2     
-        22       1456 33101  44180 15R  R2_2     
-        22       1457 33101  44110 15L  R2_2     
-        22       1458 33101  44173 15R  R2_2     
-        22       1459 33101  44093 15L  R2_2     
-        22       1460 33101  44143 15R  R2_2     
-        22       1461 33101  41095 15L  S10_5    
-        22       1462 33101  41128 15R  S10_5    
-        22       1463 33101  42255 15L  P19      
-        22       1464 33101  44140 15R  R2_2     
-        22       1465 33101  42259 15L  P19      
-        22       1466 33101  44149 15R  R2_2     
-        22       1467 33101  44069 15L  R2_2     
-        22       1468 33101  44154 15R  R2_2     
-        22       1469 33101  44078 15L  R2_2     
-        22       1470 33101  44159 15R  R2_2     
-        22       1471 33101  44086 15L  R2_2     
-        22       1472 33101  44164 15R  R2_2     
-        22       1473 33101  44129 15L  R2_2     
-        22       1474 33101  44189 15R  R2_2     
-        22       1475 33101  44119 15L  R2_2     
-        22       1476 33101  44183 15R  R2_2     
-        22       1477 33101  44111 15L  R2_2     
-        22       1478 33101  44175 15R  R2_2     
-        22       1479 33101  44103 15L  R2_2     
-        22       1480 33101  44144 15R  R2_2     
-        22       1481 33101  41094 15L  S10_5    
-        22       1482 33101  41129 15R  S10_5    
-        22       1483 33101  40201 15L  S10_3    
-        22       1484 33101  44141 15R  R2_2     
-        22       1485 33101  42260 15L  P19      
-        22       1486 33101  44150 15R  R2_2     
-        22       1487 33101  44070 15L  R2_2     
-        22       1488 33101  44155 15R  R2_2     
-        22       1489 33101  44079 15L  R2_2     
-        22       1490 33101  44160 15R  R2_2     
-        22       1491 33101  44087 15L  R2_2     
-        22       1492 33101  44165 15R  R2_2     
-        22       1493 33101  44134 15L  R2_2     
-        22       1494 33101  44190 15R  R2_2     
-        22       1495 33101  44120 15L  R2_2     
-        22       1496 33101  44184 15R  R2_2     
-        22       1497 33101  44114 15L  R2_2     
-        22       1498 33101  44177 15R  R2_2     
-        22       1499 33101  44095 15L  R2_2     
-        22       1500 33101  44145 15R  R2_2     
-        22       1501 33101  40273 16L  S10_3    
-        22       1502 33101  36791 16R  S9_2     
-        22       1503 33101  41136 16L  S10_5    
-        22       1504 33101  41929 16R  P18      
-        22       1505 33101  43166 16L  R1_2     
-        22       1506 33101  43181 16R  R1_2     
-        22       1507 33101  43170 16L  R1_2     
-        22       1508 33101  44259 16R  R2_2     
-        22       1509 33101  44213 16L  R2_2     
-        22       1510 33101  44276 16R  R2_2     
-        22       1511 33101  43357 16L  R2_1     
-        22       1512 33101  44271 16R  R2_2     
-        22       1513 33101  44216 16L  R2_2     
-        22       1514 33101  44281 16R  R2_2     
-        22       1515 33101  44221 16L  R2_2     
-        22       1516 33101  44291 16R  R2_2     
-        22       1517 33101  44231 16L  R2_2     
-        22       1518 33101  44286 16R  R2_2     
-        22       1519 33101  44238 16L  R2_2     
-        22       1520 33101  44297 16R  R2_2     
-        22       1521 33101  42706 16L  R1_1     
-        22       1522 33101  41149 16R  S10_5    
-        22       1523 33101  41137 16L  S10_5    
-        22       1524 33101  43173 16R  R1_2     
-        22       1525 33101  43168 16L  R1_2     
-        22       1526 33101  43177 16R  R1_2     
-        22       1527 33101  43171 16L  R1_2     
-        22       1528 33101  44260 16R  R2_2     
-        22       1529 33101  44207 16L  R2_2     
-        22       1530 33101  44277 16R  R2_2     
-        22       1531 33101  43358 16L  R2_1     
-        22       1532 33101  44272 16R  R2_2     
-        22       1533 33101  44217 16L  R2_2     
-        22       1534 33101  44282 16R  R2_2     
-        22       1535 33101  44211 16L  R2_2     
-        22       1536 33101  44292 16R  R2_2     
-        22       1537 33101  44232 16L  R2_2     
-        22       1538 33101  44268 16R  R2_2     
-        22       1539 33101  44239 16L  R2_2     
-        22       1540 33101  44300 16R  R2_2     
-        22       1541 33101  42707 16L  R1_1     
-        22       1542 33101  41173 16R  S10_5    
-        22       1543 33101  41138 16L  S10_5    
-        22       1544 33101  43174 16R  R1_2     
-        22       1545 33101  43169 16L  R1_2     
-        22       1546 33101  43178 16R  R1_2     
-        22       1547 33101  44203 16L  R2_2     
-        22       1548 33101  44263 16R  R2_2     
-        22       1549 33101  44208 16L  R2_2     
-        22       1550 33101  44278 16R  R2_2     
-        22       1551 33101  43172 16L  R1_2     
-        22       1552 33101  44267 16R  R2_2     
-        22       1553 33101  44218 16L  R2_2     
-        22       1554 33101  44283 16R  R2_2     
-        22       1555 33101  44223 16L  R2_2     
-        22       1556 33101  44293 16R  R2_2     
-        22       1557 33101  44233 16L  R2_2     
-        22       1558 33101  44296 16R  R2_2     
-        22       1559 33101  44228 16L  R2_2     
-        22       1560 33101  44301 16R  R2_2     
-        22       1561 33101  42305 16L  P19      
-        22       1562 33101  41775 16R  S10_6    
-        22       1563 33101  41133 16L  S10_5    
-        22       1564 33101  43175 16R  R1_2     
-        22       1565 33101  42307 16L  P19      
-        22       1566 33101  43179 16R  R1_2     
-        22       1567 33101  44204 16L  R2_2     
-        22       1568 33101  44264 16R  R2_2     
-        22       1569 33101  44209 16L  R2_2     
-        22       1570 33101  44279 16R  R2_2     
-        22       1571 33101  42274 16L  P19      
-        22       1572 33101  44274 16R  R2_2     
-        22       1573 33101  44219 16L  R2_2     
-        22       1574 33101  44284 16R  R2_2     
-        22       1575 33101  44224 16L  R2_2     
-        22       1576 33101  44294 16R  R2_2     
-        22       1577 33101  44234 16L  R2_2     
-        22       1578 33101  44289 16R  R2_2     
-        22       1579 33101  44229 16L  R2_2     
-        22       1580 33101  44302 16R  R2_2     
-        22       1581 33101  42306 16L  P19      
-        22       1582 33101  41926 16R  P18      
-        22       1583 33101  42705 16L  R1_1     
-        22       1584 33101  43176 16R  R1_2     
-        22       1585 33101  42309 16L  P19      
-        22       1586 33101  43180 16R  R1_2     
-        22       1587 33101  44205 16L  R2_2     
-        22       1588 33101  43182 16R  R1_2     
-        22       1589 33101  44214 16L  R2_2     
-        22       1590 33101  44280 16R  R2_2     
-        22       1591 33101  44212 16L  R2_2     
-        22       1592 33101  44275 16R  R2_2     
-        22       1593 33101  44220 16L  R2_2     
-        22       1594 33101  44285 16R  R2_2     
-        22       1595 33101  44215 16L  R2_2     
-        22       1596 33101  44295 16R  R2_2     
-        22       1597 33101  44237 16L  R2_2     
-        22       1598 33101  44290 16R  R2_2     
-        22       1599 33101  44241 16L  R2_2     
-        22       1600 33101  44303 16R  R2_2     
-        22       1601 33106     51 17L  SICEB1_1 
-        22       1602 33106     77 17R  SICEB1_1 
-        22       1603 33106     60 17L  SICEB1_1 
-        22       1604 33106     92 17R  SICEB1_1 
-        22       1605 33106     73 17L  SICEB1_1 
-        22       1606 33106    157 17R  SICEB02  
-        22       1607 33106    111 17L  SICEB02  
-        22       1608 33106    168 17R  SICEB02  
-        22       1609 33106    124 17L  SICEB02  
-        22       1610 33106    175 17R  SICEB02  
-        22       1611 33106    131 17L  SICEB02  
-        22       1612 33106    182 17R  SICEB02  
-        22       1613 33106    136 17L  SICEB02  
-        22       1614 33106    187 17R  SICEB02  
-        22       1615 33106    210 17L  EBP01    
-        22       1616 33106    194 17R  SICEB02  
-        22       1617 33106    217 17L  EBP01    
-        22       1618 33106    258 17R  EBP01    
-        22       1619 33106    229 17L  EBP01    
-        22       1620 33106    263 17R  EBP01    
-        22       1621 33106     52 17L  SICEB1_1 
-        22       1622 33106     78 17R  SICEB1_1 
-        22       1623 33106     64 17L  SICEB1_1 
-        22       1624 33106     95 17R  SICEB1_1 
-        22       1625 33106     74 17L  SICEB1_1 
-        22       1626 33106    158 17R  SICEB02  
-        22       1627 33106    115 17L  SICEB02  
-        22       1628 33106    169 17R  SICEB02  
-        22       1629 33106    125 17L  SICEB02  
-        22       1630 33106    176 17R  SICEB02  
-        22       1631 33106    132 17L  SICEB02  
-        22       1632 33106    183 17R  SICEB02  
-        22       1633 33106    149 17L  SICEB02  
-        22       1634 33106    188 17R  SICEB02  
-        22       1635 33106    211 17L  EBP01    
-        22       1636 33106    195 17R  SICEB02  
-        22       1637 33106    220 17L  EBP01    
-        22       1638 33106    259 17R  EBP01    
-        22       1639 33106    230 17L  EBP01    
-        22       1640 33106    264 17R  EBP01    
-        22       1641 33106     55 17L  SICEB1_1 
-        22       1642 33106     82 17R  SICEB1_1 
-        22       1643 33106     67 17L  SICEB1_1 
-        22       1644 33106     98 17R  SICEB1_1 
-        22       1645 33106    102 17L  SICEB02  
-        22       1646 33106    164 17R  SICEB02  
-        22       1647 33106    117 17L  SICEB02  
-        22       1648 33106    170 17R  SICEB02  
-        22       1649 33106    128 17L  SICEB02  
-        22       1650 33106    178 17R  SICEB02  
-        22       1651 33106    133 17L  SICEB02  
-        22       1652 33106    184 17R  SICEB02  
-        22       1653 33106    150 17L  SICEB02  
-        22       1654 33106    189 17R  SICEB02  
-        22       1655 33106    212 17L  EBP01    
-        22       1656 33106    196 17R  SICEB02  
-        22       1657 33106    225 17L  EBP01    
-        22       1658 33106    260 17R  EBP01    
-        22       1659 33106    231 17L  EBP01    
-        22       1660 33106    266 17R  EBP01    
-        22       1661 33106     57 17L  SICEB1_1 
-        22       1662 33106     87 17R  SICEB1_1 
-        22       1663 33106     69 17L  SICEB1_1 
-        22       1664 33106    151 17R  SICEB02  
-        22       1665 33106    103 17L  SICEB02  
-        22       1666 33106    165 17R  SICEB02  
-        22       1667 33106    118 17L  SICEB02  
-        22       1668 33106    171 17R  SICEB02  
-        22       1669 33106    129 17L  SICEB02  
-        22       1670 33106    179 17R  SICEB02  
-        22       1671 33106    134 17L  SICEB02  
-        22       1672 33106    185 17R  SICEB02  
-        22       1673 33106    203 17L  EBP01    
-        22       1674 33106    192 17R  SICEB02  
-        22       1675 33106    214 17L  EBP01    
-        22       1676 33106    198 17R  SICEB02  
-        22       1677 33106    226 17L  EBP01    
-        22       1678 33106    261 17R  EBP01    
-        22       1679 33106    232 17L  EBP01    
-        22       1680 33106    267 17R  EBP01    
-        22       1681 33106     58 17L  SICEB1_1 
-        22       1682 33106     88 17R  SICEB1_1 
-        22       1683 33106     71 17L  SICEB1_1 
-        22       1684 33106    156 17R  SICEB02  
-        22       1685 33106    107 17L  SICEB02  
-        22       1686 33106    166 17R  SICEB02  
-        22       1687 33106    123 17L  SICEB02  
-        22       1688 33106    172 17R  SICEB02  
-        22       1689 33106    130 17L  SICEB02  
-        22       1690 33106    180 17R  SICEB02  
-        22       1691 33106    135 17L  SICEB02  
-        22       1692 33106    186 17R  SICEB02  
-        22       1693 33106    207 17L  EBP01    
-        22       1694 33106    193 17R  SICEB02  
-        22       1695 33106    215 17L  EBP01    
-        22       1696 33106    257 17R  EBP01    
-        22       1697 33106    227 17L  EBP01    
-        22       1698 33106    262 17R  EBP01    
-        22       1699 33106    234 17L  EBP01    
-        22       1700 33106    268 17R  EBP01    
-        23          1 33101  44456 1L   R3_1     
-        23          2 33101  44481 1R   R3_1     
-        23          3 33101  44451 1L   R3_1     
-        23          4 33101  44486 1R   R3_1     
-        23          5 33101  44461 1L   R3_1     
-        23          6 33101  44491 1R   R3_1     
-        23          7 33101  44466 1L   R3_1     
-        23          8 33101  44496 1R   R3_1     
-        23          9 33101  44471 1L   R3_1     
-        23         10 33101  44501 1R   R3_1     
-        23         11 33101  44460 1L   R3_1     
-        23         12 33101  44506 1R   R3_1     
-        23         13 33101  45001 1L   R3_2     
-        23         14 33101  43862 1R   R2_2     
-        23         15 33101  45006 1L   R3_2     
-        23         16 33101  45031 1R   R3_2     
-        23         17 33101  45011 1L   R3_2     
-        23         18 33101  45036 1R   R3_2     
-        23         19 33101  45016 1L   R3_2     
-        23         20 33101  45041 1R   R3_2     
-        23         21 33101  44457 1L   R3_1     
-        23         22 33101  44482 1R   R3_1     
-        23         23 33101  44452 1L   R3_1     
-        23         24 33101  44487 1R   R3_1     
-        23         25 33101  44462 1L   R3_1     
-        23         26 33101  44492 1R   R3_1     
-        23         27 33101  43860 1L   R2_2     
-        23         28 33101  44497 1R   R3_1     
-        23         29 33101  44472 1L   R3_1     
-        23         30 33101  44502 1R   R3_1     
-        23         31 33101  44463 1L   R3_1     
-        23         32 33101  44507 1R   R3_1     
-        23         33 33101  45002 1L   R3_2     
-        23         34 33101  44499 1R   R3_1     
-        23         35 33101  45007 1L   R3_2     
-        23         36 33101  45032 1R   R3_2     
-        23         37 33101  45012 1L   R3_2     
-        23         38 33101  45037 1R   R3_2     
-        23         39 33101  45017 1L   R3_2     
-        23         40 33101  45042 1R   R3_2     
-        23         41 33101  44458 1L   R3_1     
-        23         42 33101  44483 1R   R3_1     
-        23         43 33101  44453 1L   R3_1     
-        23         44 33101  44488 1R   R3_1     
-        23         45 33101  44464 1L   R3_1     
-        23         46 33101  44493 1R   R3_1     
-        23         47 33101  44468 1L   R3_1     
-        23         48 33101  44498 1R   R3_1     
-        23         49 33101  44474 1L   R3_1     
-        23         50 33101  44503 1R   R3_1     
-        23         51 33101  44477 1L   R3_1     
-        23         52 33101  44508 1R   R3_1     
-        23         53 33101  45003 1L   R3_2     
-        23         54 33101  45028 1R   R3_2     
-        23         55 33101  45008 1L   R3_2     
-        23         56 33101  45033 1R   R3_2     
-        23         57 33101  45013 1L   R3_2     
-        23         58 33101  45038 1R   R3_2     
-        23         59 33101  45018 1L   R3_2     
-        23         60 33101  45043 1R   R3_2     
-        23         61 33101  44459 1L   R3_1     
-        23         62 33101  44484 1R   R3_1     
-        23         63 33101  44454 1L   R3_1     
-        23         64 33101  44489 1R   R3_1     
-        23         65 33101  44465 1L   R3_1     
-        23         66 33101  44494 1R   R3_1     
-        23         67 33101  44469 1L   R3_1     
-        23         68 33101  41566 1R   S10_6    
-        23         69 33101  44475 1L   R3_1     
-        23         70 33101  44504 1R   R3_1     
-        23         71 33101  44478 1L   R3_1     
-        23         72 33101  44509 1R   R3_1     
-        23         73 33101  45004 1L   R3_2     
-        23         74 33101  45029 1R   R3_2     
-        23         75 33101  45009 1L   R3_2     
-        23         76 33101  45034 1R   R3_2     
-        23         77 33101  45014 1L   R3_2     
-        23         78 33101  45039 1R   R3_2     
-        23         79 33101  45019 1L   R3_2     
-        23         80 33101  45044 1R   R3_2     
-        23         81 33101  41002 1L   S10_5    
-        23         82 33101  44485 1R   R3_1     
-        23         83 33101  44455 1L   R3_1     
-        23         84 33101  44490 1R   R3_1     
-        23         85 33101  43857 1L   R2_2     
-        23         86 33101  44495 1R   R3_1     
-        23         87 33101  44470 1L   R3_1     
-        23         88 33101  44500 1R   R3_1     
-        23         89 33101  44476 1L   R3_1     
-        23         90 33101  44505 1R   R3_1     
-        23         91 33101  44479 1L   R3_1     
-        23         92 33101  44510 1R   R3_1     
-        23         93 33101  45005 1L   R3_2     
-        23         94 33101  45030 1R   R3_2     
-        23         95 33101  45010 1L   R3_2     
-        23         96 33101  45035 1R   R3_2     
-        23         97 33101  45015 1L   R3_2     
-        23         98 33101  45040 1R   R3_2     
-        23         99 33101  44480 1L   R3_1     
-        23        100 33101  43863 1R   R2_2     
-        23        101 33101  41595 2L   S10_6    
-        23        102 33101  43878 2R   R2_2     
-        23        103 33101  44531 2L   R3_1     
-        23        104 33101  43872 2R   R2_2     
-        23        105 33101  44537 2L   R3_1     
-        23        106 33101  43884 2R   R2_2     
-        23        107 33101  44541 2L   R3_1     
-        23        108 33101  44551 2R   R3_1     
-        23        109 33101  44547 2L   R3_1     
-        23        110 33101  44556 2R   R3_1     
-        23        111 33101  45056 2L   R3_2     
-        23        112 33101  44561 2R   R3_1     
-        23        113 33101  45061 2L   R3_2     
-        23        114 33101  44566 2R   R3_1     
-        23        115 33101  45066 2L   R3_2     
-        23        116 33101  44571 2R   R3_1     
-        23        117 33101  45076 2L   R3_2     
-        23        118 33101  45084 2R   R3_2     
-        23        119 33101  45071 2L   R3_2     
-        23        120 33101  44576 2R   R3_1     
-        23        121 33101  41607 2L   S10_6    
-        23        122 33101  43879 2R   R2_2     
-        23        123 33101  44532 2L   R3_1     
-        23        124 33101  43874 2R   R2_2     
-        23        125 33101  44538 2L   R3_1     
-        23        126 33101  43885 2R   R2_2     
-        23        127 33101  44542 2L   R3_1     
-        23        128 33101  44552 2R   R3_1     
-        23        129 33101  44548 2L   R3_1     
-        23        130 33101  44557 2R   R3_1     
-        23        131 33101  45057 2L   R3_2     
-        23        132 33101  44562 2R   R3_1     
-        23        133 33101  45062 2L   R3_2     
-        23        134 33101  44567 2R   R3_1     
-        23        135 33101  45067 2L   R3_2     
-        23        136 33101  44572 2R   R3_1     
-        23        137 33101  45077 2L   R3_2     
-        23        138 33101  45085 2R   R3_2     
-        23        139 33101  45072 2L   R3_2     
-        23        140 33101  44577 2R   R3_1     
-        23        141 33101  41633 2L   S10_6    
-        23        142 33101  43880 2R   R2_2     
-        23        143 33101  44533 2L   R3_1     
-        23        144 33101  43875 2R   R2_2     
-        23        145 33101  44539 2L   R3_1     
-        23        146 33101  41638 2R   S10_6    
-        23        147 33101  44544 2L   R3_1     
-        23        148 33101  44553 2R   R3_1     
-        23        149 33101  44550 2L   R3_1     
-        23        150 33101  44558 2R   R3_1     
-        23        151 33101  45058 2L   R3_2     
-        23        152 33101  44563 2R   R3_1     
-        23        153 33101  45063 2L   R3_2     
-        23        154 33101  44568 2R   R3_1     
-        23        155 33101  45068 2L   R3_2     
-        23        156 33101  44573 2R   R3_1     
-        23        157 33101  45079 2L   R3_2     
-        23        158 33101  45086 2R   R3_2     
-        23        159 33101  45073 2L   R3_2     
-        23        160 33101  44578 2R   R3_1     
-        23        161 33101  42519 2L   R1_1     
-        23        162 33101  43881 2R   R2_2     
-        23        163 33101  44534 2L   R3_1     
-        23        164 33101  43876 2R   R2_2     
-        23        165 33101  44540 2L   R3_1     
-        23        166 33101  41654 2R   S10_6    
-        23        167 33101  44545 2L   R3_1     
-        23        168 33101  44554 2R   R3_1     
-        23        169 33101  45055 2L   R3_2     
-        23        170 33101  44559 2R   R3_1     
-        23        171 33101  45059 2L   R3_2     
-        23        172 33101  44564 2R   R3_1     
-        23        173 33101  45064 2L   R3_2     
-        23        174 33101  44569 2R   R3_1     
-        23        175 33101  45069 2L   R3_2     
-        23        176 33101  44574 2R   R3_1     
-        23        177 33101  45080 2L   R3_2     
-        23        178 33101  45087 2R   R3_2     
-        23        179 33101  45074 2L   R3_2     
-        23        180 33101  44579 2R   R3_1     
-        23        181 33101  43036 2L   R1_2     
-        23        182 33101  43883 2R   R2_2     
-        23        183 33101  44535 2L   R3_1     
-        23        184 33101  43877 2R   R2_2     
-        23        185 33101  43039 2L   R1_2     
-        23        186 33101  43053 2R   R1_2     
-        23        187 33101  44546 2L   R3_1     
-        23        188 33101  44555 2R   R3_1     
-        23        189 33101  40569 2L   S10_4    
-        23        190 33101  44560 2R   R3_1     
-        23        191 33101  45060 2L   R3_2     
-        23        192 33101  44565 2R   R3_1     
-        23        193 33101  45065 2L   R3_2     
-        23        194 33101  44570 2R   R3_1     
-        23        195 33101  45070 2L   R3_2     
-        23        196 33101  44575 2R   R3_1     
-        23        197 33101  45081 2L   R3_2     
-        23        198 33101  45088 2R   R3_2     
-        23        199 33101  45075 2L   R3_2     
-        23        200 33101  44580 2R   R3_1     
-        23        201 33101  44581 3L   R3_1     
-        23        202 33101  43890 3R   R2_2     
-        23        203 33101  44586 3L   R3_1     
-        23        204 33101  44611 3R   R3_1     
-        23        205 33101  44591 3L   R3_1     
-        23        206 33101  44616 3R   R3_1     
-        23        207 33101  44596 3L   R3_1     
-        23        208 33101  44621 3R   R3_1     
-        23        209 33101  45111 3L   R3_2     
-        23        210 33101  44627 3R   R3_1     
-        23        211 33101  45121 3L   R3_2     
-        23        212 33101  44631 3R   R3_1     
-        23        213 33101  45116 3L   R3_2     
-        23        214 33101  44636 3R   R3_1     
-        23        215 33101  45126 3L   R3_2     
-        23        216 33101  45146 3R   R3_2     
-        23        217 33101  44606 3L   R3_1     
-        23        218 33101  45141 3R   R3_2     
-        23        219 33101  44602 3L   R3_1     
-        23        220 33101  45151 3R   R3_2     
-        23        221 33101  44582 3L   R3_1     
-        23        222 33101  43893 3R   R2_2     
-        23        223 33101  44587 3L   R3_1     
-        23        224 33101  44612 3R   R3_1     
-        23        225 33101  44592 3L   R3_1     
-        23        226 33101  44617 3R   R3_1     
-        23        227 33101  44597 3L   R3_1     
-        23        228 33101  44622 3R   R3_1     
-        23        229 33101  45112 3L   R3_2     
-        23        230 33101  44628 3R   R3_1     
-        23        231 33101  45122 3L   R3_2     
-        23        232 33101  44632 3R   R3_1     
-        23        233 33101  45117 3L   R3_2     
-        23        234 33101  44637 3R   R3_1     
-        23        235 33101  45127 3L   R3_2     
-        23        236 33101  45147 3R   R3_2     
-        23        237 33101  44607 3L   R3_1     
-        23        238 33101  45148 3R   R3_2     
-        23        239 33101  44603 3L   R3_1     
-        23        240 33101  45152 3R   R3_2     
-        23        241 33101  44583 3L   R3_1     
-        23        242 33101  43894 3R   R2_2     
-        23        243 33101  44588 3L   R3_1     
-        23        244 33101  44613 3R   R3_1     
-        23        245 33101  44593 3L   R3_1     
-        23        246 33101  44618 3R   R3_1     
-        23        247 33101  44598 3L   R3_1     
-        23        248 33101  44623 3R   R3_1     
-        23        249 33101  45113 3L   R3_2     
-        23        250 33101  44629 3R   R3_1     
-        23        251 33101  45123 3L   R3_2     
-        23        252 33101  44633 3R   R3_1     
-        23        253 33101  45118 3L   R3_2     
-        23        254 33101  44638 3R   R3_1     
-        23        255 33101  43074 3L   R1_2     
-        23        256 33101  45138 3R   R3_2     
-        23        257 33101  44608 3L   R3_1     
-        23        258 33101  45143 3R   R3_2     
-        23        259 33101  44604 3L   R3_1     
-        23        260 33101  45153 3R   R3_2     
-        23        261 33101  44584 3L   R3_1     
-        23        262 33101  43895 3R   R2_2     
-        23        263 33101  44589 3L   R3_1     
-        23        264 33101  44614 3R   R3_1     
-        23        265 33101  44594 3L   R3_1     
-        23        266 33101  44619 3R   R3_1     
-        23        267 33101  44599 3L   R3_1     
-        23        268 33101  44624 3R   R3_1     
-        23        269 33101  45114 3L   R3_2     
-        23        270 33101  44630 3R   R3_1     
-        23        271 33101  43069 3L   R1_2     
-        23        272 33101  44634 3R   R3_1     
-        23        273 33101  45119 3L   R3_2     
-        23        274 33101  44639 3R   R3_1     
-        23        275 33101  43886 3L   R2_2     
-        23        276 33101  45139 3R   R3_2     
-        23        277 33101  44609 3L   R3_1     
-        23        278 33101  45144 3R   R3_2     
-        23        279 33101  43888 3L   R2_2     
-        23        280 33101  45154 3R   R3_2     
-        23        281 33101  44585 3L   R3_1     
-        23        282 33101  43897 3R   R2_2     
-        23        283 33101  44590 3L   R3_1     
-        23        284 33101  44615 3R   R3_1     
-        23        285 33101  44595 3L   R3_1     
-        23        286 33101  44620 3R   R3_1     
-        23        287 33101  44601 3L   R3_1     
-        23        288 33101  44625 3R   R3_1     
-        23        289 33101  45115 3L   R3_2     
-        23        290 33101  43898 3R   R2_2     
-        23        291 33101  45125 3L   R3_2     
-        23        292 33101  44635 3R   R3_1     
-        23        293 33101  42143 3L   P19      
-        23        294 33101  44640 3R   R3_1     
-        23        295 33101  43887 3L   R2_2     
-        23        296 33101  45140 3R   R3_2     
-        23        297 33101  44610 3L   R3_1     
-        23        298 33101  45145 3R   R3_2     
-        23        299 33101  43889 3L   R2_2     
-        23        300 33101  45155 3R   R3_2     
-        23        301 33101  42577 4L   R1_1     
-        23        302 33101  40064 4R   S10_3    
-        23        303 33101  44653 4L   R3_1     
-        23        304 33101  40717 4R   S10_4    
-        23        305 33101  45171 4L   R3_2     
-        23        306 33101  45196 4R   R3_2     
-        23        307 33101  45176 4L   R3_2     
-        23        308 33101  42605 4R   R1_1     
-        23        309 33101  45181 4L   R3_2     
-        23        310 33101  43904 4R   R2_2     
-        23        311 33101  45186 4L   R3_2     
-        23        312 33101  44686 4R   R3_1     
-        23        313 33101  45191 4L   R3_2     
-        23        314 33101  44677 4R   R3_1     
-        23        315 33101  44673 4L   R3_1     
-        23        316 33101  44697 4R   R3_1     
-        23        317 33101  45189 4L   R3_2     
-        23        318 33101  44693 4R   R3_1     
-        23        319 33101  44661 4L   R3_1     
-        23        320 33101  44701 4R   R3_1     
-        23        321 33101  42587 4L   R1_1     
-        23        322 33101  45192 4R   R3_2     
-        23        323 33101  44654 4L   R3_1     
-        23        324 33101  42599 4R   R1_1     
-        23        325 33101  45172 4L   R3_2     
-        23        326 33101  45197 4R   R3_2     
-        23        327 33101  45177 4L   R3_2     
-        23        328 33101  42634 4R   R1_1     
-        23        329 33101  45182 4L   R3_2     
-        23        330 33101  43905 4R   R2_2     
-        23        331 33101  45187 4L   R3_2     
-        23        332 33101  44682 4R   R3_1     
-        23        333 33101  44667 4L   R3_1     
-        23        334 33101  44678 4R   R3_1     
-        23        335 33101  44674 4L   R3_1     
-        23        336 33101  44698 4R   R3_1     
-        23        337 33101  45167 4L   R3_2     
-        23        338 33101  44694 4R   R3_1     
-        23        339 33101  44662 4L   R3_1     
-        23        340 33101  44702 4R   R3_1     
-        23        341 33101  42589 4L   R1_1     
-        23        342 33101  45193 4R   R3_2     
-        23        343 33101  44655 4L   R3_1     
-        23        344 33101  44676 4R   R3_1     
-        23        345 33101  45173 4L   R3_2     
-        23        346 33101  45198 4R   R3_2     
-        23        347 33101  45178 4L   R3_2     
-        23        348 33101  44692 4R   R3_1     
-        23        349 33101  45183 4L   R3_2     
-        23        350 33101  43906 4R   R2_2     
-        23        351 33101  45188 4L   R3_2     
-        23        352 33101  44683 4R   R3_1     
-        23        353 33101  44668 4L   R3_1     
-        23        354 33101  44679 4R   R3_1     
-        23        355 33101  44658 4L   R3_1     
-        23        356 33101  44699 4R   R3_1     
-        23        357 33101  45168 4L   R3_2     
-        23        358 33101  44696 4R   R3_1     
-        23        359 33101  44664 4L   R3_1     
-        23        360 33101  44703 4R   R3_1     
-        23        361 33101  43108 4L   R1_2     
-        23        362 33101  45194 4R   R3_2     
-        23        363 33101  44656 4L   R3_1     
-        23        364 33101  44680 4R   R3_1     
-        23        365 33101  45165 4L   R3_2     
-        23        366 33101  45199 4R   R3_2     
-        23        367 33101  45179 4L   R3_2     
-        23        368 33101  44695 4R   R3_1     
-        23        369 33101  45184 4L   R3_2     
-        23        370 33101  43907 4R   R2_2     
-        23        371 33101  44671 4L   R3_1     
-        23        372 33101  44684 4R   R3_1     
-        23        373 33101  44669 4L   R3_1     
-        23        374 33101  44687 4R   R3_1     
-        23        375 33101  44659 4L   R3_1     
-        23        376 33101  44700 4R   R3_1     
-        23        377 33101  45169 4L   R3_2     
-        23        378 33101  45201 4R   R3_2     
-        23        379 33101  44665 4L   R3_1     
-        23        380 33101  44704 4R   R3_1     
-        23        381 33101  43902 4L   R2_2     
-        23        382 33101  45195 4R   R3_2     
-        23        383 33101  44657 4L   R3_1     
-        23        384 33101  44690 4R   R3_1     
-        23        385 33101  45175 4L   R3_2     
-        23        386 33101  45200 4R   R3_2     
-        23        387 33101  45180 4L   R3_2     
-        23        388 33101  42636 4R   R1_1     
-        23        389 33101  45185 4L   R3_2     
-        23        390 33101  43908 4R   R2_2     
-        23        391 33101  45190 4L   R3_2     
-        23        392 33101  44685 4R   R3_1     
-        23        393 33101  44670 4L   R3_1     
-        23        394 33101  44688 4R   R3_1     
-        23        395 33101  44660 4L   R3_1     
-        23        396 33101  44691 4R   R3_1     
-        23        397 33101  45170 4L   R3_2     
-        23        398 33101  45203 4R   R3_2     
-        23        399 33101  45166 4L   R3_2     
-        23        400 33101  44705 4R   R3_1     
-        23        401 33101  42638 5L   R1_1     
-        23        402 33101  40117 5R   S10_3    
-        23        403 33101  44711 5L   R3_1     
-        23        404 33101  43916 5R   R2_2     
-        23        405 33101  44721 5L   R3_1     
-        23        406 33101  43922 5R   R2_2     
-        23        407 33101  44735 5L   R3_1     
-        23        408 33101  44741 5R   R3_1     
-        23        409 33101  44726 5L   R3_1     
-        23        410 33101  44746 5R   R3_1     
-        23        411 33101  44736 5L   R3_1     
-        23        412 33101  44755 5R   R3_1     
-        23        413 33101  45221 5L   R3_2     
-        23        414 33101  44751 5R   R3_1     
-        23        415 33101  45226 5L   R3_2     
-        23        416 33101  44761 5R   R3_1     
-        23        417 33101  45231 5L   R3_2     
-        23        418 33101  45246 5R   R3_2     
-        23        419 33101  45236 5L   R3_2     
-        23        420 33101  44766 5R   R3_1     
-        23        421 33101  42640 5L   R1_1     
-        23        422 33101  42208 5R   P19      
-        23        423 33101  44712 5L   R3_1     
-        23        424 33101  43918 5R   R2_2     
-        23        425 33101  44722 5L   R3_1     
-        23        426 33101  43923 5R   R2_2     
-        23        427 33101  44717 5L   R3_1     
-        23        428 33101  44742 5R   R3_1     
-        23        429 33101  44732 5L   R3_1     
-        23        430 33101  44747 5R   R3_1     
-        23        431 33101  44737 5L   R3_1     
-        23        432 33101  44756 5R   R3_1     
-        23        433 33101  45222 5L   R3_2     
-        23        434 33101  44753 5R   R3_1     
-        23        435 33101  45219 5L   R3_2     
-        23        436 33101  44762 5R   R3_1     
-        23        437 33101  45232 5L   R3_2     
-        23        438 33101  45247 5R   R3_2     
-        23        439 33101  44716 5L   R3_1     
-        23        440 33101  44767 5R   R3_1     
-        23        441 33101  42642 5L   R1_1     
-        23        442 33101  43139 5R   R1_2     
-        23        443 33101  44713 5L   R3_1     
-        23        444 33101  43919 5R   R2_2     
-        23        445 33101  44723 5L   R3_1     
-        23        446 33101  43924 5R   R2_2     
-        23        447 33101  44718 5L   R3_1     
-        23        448 33101  44743 5R   R3_1     
-        23        449 33101  44728 5L   R3_1     
-        23        450 33101  44750 5R   R3_1     
-        23        451 33101  44738 5L   R3_1     
-        23        452 33101  44758 5R   R3_1     
-        23        453 33101  45223 5L   R3_2     
-        23        454 33101  44757 5R   R3_1     
-        23        455 33101  45228 5L   R3_2     
-        23        456 33101  44763 5R   R3_1     
-        23        457 33101  45233 5L   R3_2     
-        23        458 33101  45248 5R   R3_2     
-        23        459 33101  44727 5L   R3_1     
-        23        460 33101  44768 5R   R3_1     
-        23        461 33101  42645 5L   R1_1     
-        23        462 33101  43145 5R   R1_2     
-        23        463 33101  44714 5L   R3_1     
-        23        464 33101  43920 5R   R2_2     
-        23        465 33101  44724 5L   R3_1     
-        23        466 33101  43925 5R   R2_2     
-        23        467 33101  44719 5L   R3_1     
-        23        468 33101  44744 5R   R3_1     
-        23        469 33101  44729 5L   R3_1     
-        23        470 33101  44752 5R   R3_1     
-        23        471 33101  44739 5L   R3_1     
-        23        472 33101  44748 5R   R3_1     
-        23        473 33101  45224 5L   R3_2     
-        23        474 33101  44759 5R   R3_1     
-        23        475 33101  45229 5L   R3_2     
-        23        476 33101  44764 5R   R3_1     
-        23        477 33101  45234 5L   R3_2     
-        23        478 33101  45249 5R   R3_2     
-        23        479 33101  44733 5L   R3_1     
-        23        480 33101  44769 5R   R3_1     
-        23        481 33101  43912 5L   R2_2     
-        23        482 33101  43915 5R   R2_2     
-        23        483 33101  44715 5L   R3_1     
-        23        484 33101  43921 5R   R2_2     
-        23        485 33101  44725 5L   R3_1     
-        23        486 33101  43926 5R   R2_2     
-        23        487 33101  44720 5L   R3_1     
-        23        488 33101  44745 5R   R3_1     
-        23        489 33101  44730 5L   R3_1     
-        23        490 33101  44754 5R   R3_1     
-        23        491 33101  44734 5L   R3_1     
-        23        492 33101  44749 5R   R3_1     
-        23        493 33101  45225 5L   R3_2     
-        23        494 33101  44760 5R   R3_1     
-        23        495 33101  45230 5L   R3_2     
-        23        496 33101  44765 5R   R3_1     
-        23        497 33101  45235 5L   R3_2     
-        23        498 33101  45250 5R   R3_2     
-        23        499 33101  45220 5L   R3_2     
-        23        500 33101  45252 5R   R3_2     
-        23        501 33101  45831 6L   R4_1     
-        23        502 33101  44929 6R   R3_1     
-        23        503 33101  44920 6L   R3_1     
-        23        504 33101  44924 6R   R3_1     
-        23        505 33101  44914 6L   R3_1     
-        23        506 33101  44342 6R   R2_2     
-        23        507 33101  44336 6L   R2_2     
-        23        508 33101  44337 6R   R2_2     
-        23        509 33101  44330 6L   R2_2     
-        23        510 33101  43401 6R   R2_1     
-        23        511 33101  43362 6L   R2_1     
-        23        512 33101  43396 6R   R2_1     
-        23        513 33101  43367 6L   R2_1     
-        23        514 33101  43391 6R   R2_1     
-        23        515 33101  43377 6L   R2_1     
-        23        516 33101  43404 6R   R2_1     
-        23        517 33101  43372 6L   R2_1     
-        23        518 33101  43409 6R   R2_1     
-        23        519 33101  43382 6L   R2_1     
-        23        520 33101  43198 6R   R1_2     
-        23        521 33101  45832 6L   R4_1     
-        23        522 33101  44930 6R   R3_1     
-        23        523 33101  44921 6L   R3_1     
-        23        524 33101  44925 6R   R3_1     
-        23        525 33101  44915 6L   R3_1     
-        23        526 33101  44343 6R   R2_2     
-        23        527 33101  44910 6L   R3_1     
-        23        528 33101  44338 6R   R2_2     
-        23        529 33101  44332 6L   R2_2     
-        23        530 33101  43402 6R   R2_1     
-        23        531 33101  43363 6L   R2_1     
-        23        532 33101  43397 6R   R2_1     
-        23        533 33101  43368 6L   R2_1     
-        23        534 33101  43392 6R   R2_1     
-        23        535 33101  43378 6L   R2_1     
-        23        536 33101  43405 6R   R2_1     
-        23        537 33101  43373 6L   R2_1     
-        23        538 33101  43387 6R   R2_1     
-        23        539 33101  43383 6L   R2_1     
-        23        540 33101  43199 6R   R1_2     
-        23        541 33101  45833 6L   R4_1     
-        23        542 33101  44931 6R   R3_1     
-        23        543 33101  44922 6L   R3_1     
-        23        544 33101  44926 6R   R3_1     
-        23        545 33101  44917 6L   R3_1     
-        23        546 33101  44344 6R   R2_2     
-        23        547 33101  44911 6L   R3_1     
-        23        548 33101  44339 6R   R2_2     
-        23        549 33101  44333 6L   R2_2     
-        23        550 33101  43403 6R   R2_1     
-        23        551 33101  43364 6L   R2_1     
-        23        552 33101  43398 6R   R2_1     
-        23        553 33101  43369 6L   R2_1     
-        23        554 33101  43393 6R   R2_1     
-        23        555 33101  43379 6L   R2_1     
-        23        556 33101  43406 6R   R2_1     
-        23        557 33101  43374 6L   R2_1     
-        23        558 33101  43388 6R   R2_1     
-        23        559 33101  43384 6L   R2_1     
-        23        560 33101  43200 6R   R1_2     
-        23        561 33101  45834 6L   R4_1     
-        23        562 33101  44932 6R   R3_1     
-        23        563 33101  43196 6L   R1_2     
-        23        564 33101  44927 6R   R3_1     
-        23        565 33101  44918 6L   R3_1     
-        23        566 33101  44345 6R   R2_2     
-        23        567 33101  44912 6L   R3_1     
-        23        568 33101  44340 6R   R2_2     
-        23        569 33101  44334 6L   R2_2     
-        23        570 33101  42363 6R   P19      
-        23        571 33101  43365 6L   R2_1     
-        23        572 33101  43399 6R   R2_1     
-        23        573 33101  43370 6L   R2_1     
-        23        574 33101  43394 6R   R2_1     
-        23        575 33101  43380 6L   R2_1     
-        23        576 33101  43407 6R   R2_1     
-        23        577 33101  43375 6L   R2_1     
-        23        578 33101  43389 6R   R2_1     
-        23        579 33101  43385 6L   R2_1     
-        23        580 33101  42773 6R   R1       
-        23        581 33101  45835 6L   R4_1     
-        23        582 33101  44933 6R   R3_1     
-        23        583 33101  43197 6L   R1_2     
-        23        584 33101  44928 6R   R3_1     
-        23        585 33101  44919 6L   R3_1     
-        23        586 33101  44923 6R   R3_1     
-        23        587 33101  44913 6L   R3_1     
-        23        588 33101  44341 6R   R2_2     
-        23        589 33101  44335 6L   R2_2     
-        23        590 33101  42364 6R   P19      
-        23        591 33101  43366 6L   R2_1     
-        23        592 33101  43400 6R   R2_1     
-        23        593 33101  43371 6L   R2_1     
-        23        594 33101  43395 6R   R2_1     
-        23        595 33101  43381 6L   R2_1     
-        23        596 33101  43408 6R   R2_1     
-        23        597 33101  43376 6L   R2_1     
-        23        598 33101  43390 6R   R2_1     
-        23        599 33101  43386 6L   R2_1     
-        23        600 33101  42774 6R   R1       
-        23        601 33101  45861 7L   R4_1     
-        23        602 33101  45882 7R   R4_1     
-        23        603 33101  44939 7L   R3_1     
-        23        604 33101  44950 7R   R3_1     
-        23        605 33101  44346 7L   R2_2     
-        23        606 33101  44354 7R   R2_2     
-        23        607 33101  43420 7L   R2_1     
-        23        608 33101  44349 7R   R2_2     
-        23        609 33101  43435 7L   R2_1     
-        23        610 33101  43440 7R   R2_1     
-        23        611 33101  43430 7L   R2_1     
-        23        612 33101  43465 7R   R2_1     
-        23        613 33101  43410 7L   R2_1     
-        23        614 33101  43455 7R   R2_1     
-        23        615 33101  43425 7L   R2_1     
-        23        616 33101  43445 7R   R2_1     
-        23        617 33101  43415 7L   R2_1     
-        23        618 33101  43450 7R   R2_1     
-        23        619 33101  42810 7L   R1       
-        23        620 33101  43460 7R   R2_1     
-        23        621 33101  45862 7L   R4_1     
-        23        622 33101  45883 7R   R4_1     
-        23        623 33101  44940 7L   R3_1     
-        23        624 33101  44951 7R   R3_1     
-        23        625 33101  44934 7L   R3_1     
-        23        626 33101  44946 7R   R3_1     
-        23        627 33101  43421 7L   R2_1     
-        23        628 33101  44350 7R   R2_2     
-        23        629 33101  43436 7L   R2_1     
-        23        630 33101  43441 7R   R2_1     
-        23        631 33101  43431 7L   R2_1     
-        23        632 33101  43466 7R   R2_1     
-        23        633 33101  43411 7L   R2_1     
-        23        634 33101  43456 7R   R2_1     
-        23        635 33101  43426 7L   R2_1     
-        23        636 33101  43446 7R   R2_1     
-        23        637 33101  43416 7L   R2_1     
-        23        638 33101  43451 7R   R2_1     
-        23        639 33101  42775 7L   R1       
-        23        640 33101  43461 7R   R2_1     
-        23        641 33101  45863 7L   R4_1     
-        23        642 33101  45884 7R   R4_1     
-        23        643 33101  44941 7L   R3_1     
-        23        644 33101  44953 7R   R3_1     
-        23        645 33101  44935 7L   R3_1     
-        23        646 33101  44947 7R   R3_1     
-        23        647 33101  43422 7L   R2_1     
-        23        648 33101  44351 7R   R2_2     
-        23        649 33101  43437 7L   R2_1     
-        23        650 33101  43442 7R   R2_1     
-        23        651 33101  43432 7L   R2_1     
-        23        652 33101  43211 7R   R1_2     
-        23        653 33101  43412 7L   R2_1     
-        23        654 33101  43457 7R   R2_1     
-        23        655 33101  43427 7L   R2_1     
-        23        656 33101  43447 7R   R2_1     
-        23        657 33101  43417 7L   R2_1     
-        23        658 33101  43452 7R   R2_1     
-        23        659 33101  42812 7L   R1       
-        23        660 33101  35651 7R   P15_1    
-        23        661 33101  45864 7L   R4_1     
-        23        662 33101  45885 7R   R4_1     
-        23        663 33101  44942 7L   R3_1     
-        23        664 33101  44954 7R   R3_1     
-        23        665 33101  44936 7L   R3_1     
-        23        666 33101  44948 7R   R3_1     
-        23        667 33101  43423 7L   R2_1     
-        23        668 33101  44352 7R   R2_2     
-        23        669 33101  43438 7L   R2_1     
-        23        670 33101  43443 7R   R2_1     
-        23        671 33101  43433 7L   R2_1     
-        23        672 33101  43212 7R   R1_2     
-        23        673 33101  43413 7L   R2_1     
-        23        674 33101  43458 7R   R2_1     
-        23        675 33101  43428 7L   R2_1     
-        23        676 33101  43448 7R   R2_1     
-        23        677 33101  43418 7L   R2_1     
-        23        678 33101  43453 7R   R2_1     
-        23        679 33101  42813 7L   R1       
-        23        680 33101  43463 7R   R2_1     
-        23        681 33101  45865 7L   R4_1     
-        23        682 33101  45886 7R   R4_1     
-        23        683 33101  44943 7L   R3_1     
-        23        684 33101  44955 7R   R3_1     
-        23        685 33101  44938 7L   R3_1     
-        23        686 33101  44949 7R   R3_1     
-        23        687 33101  43424 7L   R2_1     
-        23        688 33101  44353 7R   R2_2     
-        23        689 33101  43439 7L   R2_1     
-        23        690 33101  43444 7R   R2_1     
-        23        691 33101  43434 7L   R2_1     
-        23        692 33101  43213 7R   R1_2     
-        23        693 33101  43414 7L   R2_1     
-        23        694 33101  43459 7R   R2_1     
-        23        695 33101  43429 7L   R2_1     
-        23        696 33101  43449 7R   R2_1     
-        23        697 33101  43419 7L   R2_1     
-        23        698 33101  43454 7R   R2_1     
-        23        699 33101  42815 7L   R1       
-        23        700 33101  43464 7R   R2_1     
-        23        701 33101  46446 8L   R4_2     
-        23        702 33101  46461 8R   R4_2     
-        23        703 33101  44958 8L   R3_1     
-        23        704 33101  44976 8R   R3_1     
-        23        705 33101  44355 8L   R2_2     
-        23        706 33101  44970 8R   R3_1     
-        23        707 33101  44964 8L   R3_1     
-        23        708 33101  44366 8R   R2_2     
-        23        709 33101  43482 8L   R2_1     
-        23        710 33101  44361 8R   R2_2     
-        23        711 33101  43477 8L   R2_1     
-        23        712 33101  43502 8R   R2_1     
-        23        713 33101  43487 8L   R2_1     
-        23        714 33101  43497 8R   R2_1     
-        23        715 33101  43467 8L   R2_1     
-        23        716 33101  43507 8R   R2_1     
-        23        717 33101  43472 8L   R2_1     
-        23        718 33101  43512 8R   R2_1     
-        23        719 33101  43492 8L   R2_1     
-        23        720 33101  43239 8R   R1_2     
-        23        721 33101  46447 8L   R4_2     
-        23        722 33101  46462 8R   R4_2     
-        23        723 33101  44959 8L   R3_1     
-        23        724 33101  44977 8R   R3_1     
-        23        725 33101  44356 8L   R2_2     
-        23        726 33101  44971 8R   R3_1     
-        23        727 33101  44965 8L   R3_1     
-        23        728 33101  44367 8R   R2_2     
-        23        729 33101  43483 8L   R2_1     
-        23        730 33101  44362 8R   R2_2     
-        23        731 33101  43478 8L   R2_1     
-        23        732 33101  43503 8R   R2_1     
-        23        733 33101  43488 8L   R2_1     
-        23        734 33101  43498 8R   R2_1     
-        23        735 33101  43468 8L   R2_1     
-        23        736 33101  43508 8R   R2_1     
-        23        737 33101  43473 8L   R2_1     
-        23        738 33101  43513 8R   R2_1     
-        23        739 33101  43493 8L   R2_1     
-        23        740 33101  43240 8R   R1_2     
-        23        741 33101  46448 8L   R4_2     
-        23        742 33101  46463 8R   R4_2     
-        23        743 33101  44960 8L   R3_1     
-        23        744 33101  44978 8R   R3_1     
-        23        745 33101  44357 8L   R2_2     
-        23        746 33101  44972 8R   R3_1     
-        23        747 33101  44966 8L   R3_1     
-        23        748 33101  44967 8R   R3_1     
-        23        749 33101  43484 8L   R2_1     
-        23        750 33101  44363 8R   R2_2     
-        23        751 33101  43479 8L   R2_1     
-        23        752 33101  43504 8R   R2_1     
-        23        753 33101  43489 8L   R2_1     
-        23        754 33101  43499 8R   R2_1     
-        23        755 33101  43469 8L   R2_1     
-        23        756 33101  43506 8R   R2_1     
-        23        757 33101  43474 8L   R2_1     
-        23        758 33101  43514 8R   R2_1     
-        23        759 33101  43494 8L   R2_1     
-        23        760 33101  41251 8R   S10_6    
-        23        761 33101  46449 8L   R4_2     
-        23        762 33101  46464 8R   R4_2     
-        23        763 33101  44961 8L   R3_1     
-        23        764 33101  44979 8R   R3_1     
-        23        765 33101  44358 8L   R2_2     
-        23        766 33101  44973 8R   R3_1     
-        23        767 33101  43227 8L   R1_2     
-        23        768 33101  44968 8R   R3_1     
-        23        769 33101  43485 8L   R2_1     
-        23        770 33101  44364 8R   R2_2     
-        23        771 33101  43480 8L   R2_1     
-        23        772 33101  43505 8R   R2_1     
-        23        773 33101  43490 8L   R2_1     
-        23        774 33101  43500 8R   R2_1     
-        23        775 33101  43470 8L   R2_1     
-        23        776 33101  43510 8R   R2_1     
-        23        777 33101  43475 8L   R2_1     
-        23        778 33101  43515 8R   R2_1     
-        23        779 33101  43495 8L   R2_1     
-        23        780 33101  41252 8R   S10_6    
-        23        781 33101  46450 8L   R4_2     
-        23        782 33101  46465 8R   R4_2     
-        23        783 33101  44962 8L   R3_1     
-        23        784 33101  43517 8R   R2_1     
-        23        785 33101  44360 8L   R2_2     
-        23        786 33101  44974 8R   R3_1     
-        23        787 33101  43228 8L   R1_2     
-        23        788 33101  44969 8R   R3_1     
-        23        789 33101  43486 8L   R2_1     
-        23        790 33101  44365 8R   R2_2     
-        23        791 33101  43481 8L   R2_1     
-        23        792 33101  43518 8R   R2_1     
-        23        793 33101  43491 8L   R2_1     
-        23        794 33101  43501 8R   R2_1     
-        23        795 33101  43471 8L   R2_1     
-        23        796 33101  43511 8R   R2_1     
-        23        797 33101  43476 8L   R2_1     
-        23        798 33101  43516 8R   R2_1     
-        23        799 33101  43496 8L   R2_1     
-        23        800 33101  40936 8R   S10_4    
-        23        801 33101  44994 9L   R3_1     
-        23        802 33101  46516 9R   R4_2     
-        23        803 33101  44989 9L   R3_1     
-        23        804 33101  46511 9R   R4_2     
-        23        805 33101  44982 9L   R3_1     
-        23        806 33101  46506 9R   R4_2     
-        23        807 33101  44368 9L   R2_2     
-        23        808 33101  46501 9R   R4_2     
-        23        809 33101  43531 9L   R2_1     
-        23        810 33101  44386 9R   R2_2     
-        23        811 33101  43526 9L   R2_1     
-        23        812 33101  44380 9R   R2_2     
-        23        813 33101  43536 9L   R2_1     
-        23        814 33101  44374 9R   R2_2     
-        23        815 33101  43541 9L   R2_1     
-        23        816 33101  43557 9R   R2_1     
-        23        817 33101  43521 9L   R2_1     
-        23        818 33101  43552 9R   R2_1     
-        23        819 33101  43246 9L   R1_2     
-        23        820 33101  43547 9R   R2_1     
-        23        821 33101  44995 9L   R3_1     
-        23        822 33101  46517 9R   R4_2     
-        23        823 33101  44990 9L   R3_1     
-        23        824 33101  46512 9R   R4_2     
-        23        825 33101  44983 9L   R3_1     
-        23        826 33101  46507 9R   R4_2     
-        23        827 33101  44370 9L   R2_2     
-        23        828 33101  46502 9R   R4_2     
-        23        829 33101  43532 9L   R2_1     
-        23        830 33101  44390 9R   R2_2     
-        23        831 33101  43527 9L   R2_1     
-        23        832 33101  44381 9R   R2_2     
-        23        833 33101  43537 9L   R2_1     
-        23        834 33101  44375 9R   R2_2     
-        23        835 33101  43542 9L   R2_1     
-        23        836 33101  43558 9R   R2_1     
-        23        837 33101  43529 9L   R2_1     
-        23        838 33101  43553 9R   R2_1     
-        23        839 33101  43247 9L   R1_2     
-        23        840 33101  43548 9R   R2_1     
-        23        841 33101  44996 9L   R3_1     
-        23        842 33101  46518 9R   R4_2     
-        23        843 33101  44991 9L   R3_1     
-        23        844 33101  46513 9R   R4_2     
-        23        845 33101  44984 9L   R3_1     
-        23        846 33101  46508 9R   R4_2     
-        23        847 33101  44371 9L   R2_2     
-        23        848 33101  46503 9R   R4_2     
-        23        849 33101  43533 9L   R2_1     
-        23        850 33101  44391 9R   R2_2     
-        23        851 33101  43528 9L   R2_1     
-        23        852 33101  44382 9R   R2_2     
-        23        853 33101  43538 9L   R2_1     
-        23        854 33101  44377 9R   R2_2     
-        23        855 33101  43543 9L   R2_1     
-        23        856 33101  43559 9R   R2_1     
-        23        857 33101  43523 9L   R2_1     
-        23        858 33101  43554 9R   R2_1     
-        23        859 33101  43248 9L   R1_2     
-        23        860 33101  43549 9R   R2_1     
-        23        861 33101  44997 9L   R3_1     
-        23        862 33101  46519 9R   R4_2     
-        23        863 33101  44992 9L   R3_1     
-        23        864 33101  46514 9R   R4_2     
-        23        865 33101  44985 9L   R3_1     
-        23        866 33101  46509 9R   R4_2     
-        23        867 33101  44372 9L   R2_2     
-        23        868 33101  46504 9R   R4_2     
-        23        869 33101  43535 9L   R2_1     
-        23        870 33101  44392 9R   R2_2     
-        23        871 33101  43522 9L   R2_1     
-        23        872 33101  44383 9R   R2_2     
-        23        873 33101  43539 9L   R2_1     
-        23        874 33101  44378 9R   R2_2     
-        23        875 33101  43544 9L   R2_1     
-        23        876 33101  43262 9R   R1_2     
-        23        877 33101  43524 9L   R2_1     
-        23        878 33101  43555 9R   R2_1     
-        23        879 33101  43249 9L   R1_2     
-        23        880 33101  43550 9R   R2_1     
-        23        881 33101  44998 9L   R3_1     
-        23        882 33101  46520 9R   R4_2     
-        23        883 33101  44993 9L   R3_1     
-        23        884 33101  46515 9R   R4_2     
-        23        885 33101  44986 9L   R3_1     
-        23        886 33101  46510 9R   R4_2     
-        23        887 33101  44981 9L   R3_1     
-        23        888 33101  46505 9R   R4_2     
-        23        889 33101  43546 9L   R2_1     
-        23        890 33101  44393 9R   R2_2     
-        23        891 33101  43530 9L   R2_1     
-        23        892 33101  44384 9R   R2_2     
-        23        893 33101  43540 9L   R2_1     
-        23        894 33101  44379 9R   R2_2     
-        23        895 33101  43545 9L   R2_1     
-        23        896 33101  43257 9R   R1_2     
-        23        897 33101  43525 9L   R2_1     
-        23        898 33101  43556 9R   R2_1     
-        23        899 33101  43250 9L   R1_2     
-        23        900 33101  43551 9R   R2_1     
-        23        901 33101  45303 10L  R3_2     
-        23        902 33101  44405 10R  R2_2     
-        23        903 33101  44398 10L  R2_2     
-        23        904 33101   9921 10R  R4_1     
-        23        905 33101   9911 10L  R4_1     
-        23        906 33101   9916 10R  R4_1     
-        23        907 33101   9901 10L  R4_1     
-        23        908 33101   9926 10R  R4_1     
-        23        909 33101   9906 10L  R4_1     
-        23        910 33101  45332 10R  R3_2     
-        23        911 33101  45298 10L  R3_2     
-        23        912 33101  45321 10R  R3_2     
-        23        913 33101  45287 10L  R3_2     
-        23        914 33101  45327 10R  R3_2     
-        23        915 33101  45292 10L  R3_2     
-        23        916 33101  45316 10R  R3_2     
-        23        917 33101  45281 10L  R3_2     
-        23        918 33101  43626 10R  R2_1     
-        23        919 33101  43586 10L  R2_1     
-        23        920 33101  43606 10R  R2_1     
-        23        921 33101  45304 10L  R3_2     
-        23        922 33101  44407 10R  R2_2     
-        23        923 33101  44399 10L  R2_2     
-        23        924 33101   9922 10R  R4_1     
-        23        925 33101   9912 10L  R4_1     
-        23        926 33101   9917 10R  R4_1     
-        23        927 33101   9902 10L  R4_1     
-        23        928 33101   9927 10R  R4_1     
-        23        929 33101   9907 10L  R4_1     
-        23        930 33101  45333 10R  R3_2     
-        23        931 33101  45299 10L  R3_2     
-        23        932 33101  45322 10R  R3_2     
-        23        933 33101  45288 10L  R3_2     
-        23        934 33101  45328 10R  R3_2     
-        23        935 33101  45293 10L  R3_2     
-        23        936 33101  45317 10R  R3_2     
-        23        937 33101  45283 10L  R3_2     
-        23        938 33101  43627 10R  R2_1     
-        23        939 33101  43587 10L  R2_1     
-        23        940 33101  43607 10R  R2_1     
-        23        941 33101  45306 10L  R3_2     
-        23        942 33101  44408 10R  R2_2     
-        23        943 33101  44401 10L  R2_2     
-        23        944 33101   9923 10R  R4_1     
-        23        945 33101   9913 10L  R4_1     
-        23        946 33101   9918 10R  R4_1     
-        23        947 33101   9903 10L  R4_1     
-        23        948 33101   9928 10R  R4_1     
-        23        949 33101   9908 10L  R4_1     
-        23        950 33101  45334 10R  R3_2     
-        23        951 33101  45300 10L  R3_2     
-        23        952 33101  45323 10R  R3_2     
-        23        953 33101  45289 10L  R3_2     
-        23        954 33101  45329 10R  R3_2     
-        23        955 33101  45294 10L  R3_2     
-        23        956 33101  45318 10R  R3_2     
-        23        957 33101  45284 10L  R3_2     
-        23        958 33101  43628 10R  R2_1     
-        23        959 33101  43588 10L  R2_1     
-        23        960 33101  43608 10R  R2_1     
-        23        961 33101  45307 10L  R3_2     
-        23        962 33101  45309 10R  R3_2     
-        23        963 33101  44402 10L  R2_2     
-        23        964 33101   9924 10R  R4_1     
-        23        965 33101   9914 10L  R4_1     
-        23        966 33101   9919 10R  R4_1     
-        23        967 33101   9904 10L  R4_1     
-        23        968 33101   9929 10R  R4_1     
-        23        969 33101   9909 10L  R4_1     
-        23        970 33101  45335 10R  R3_2     
-        23        971 33101  45301 10L  R3_2     
-        23        972 33101  45324 10R  R3_2     
-        23        973 33101  45290 10L  R3_2     
-        23        974 33101  45330 10R  R3_2     
-        23        975 33101  45295 10L  R3_2     
-        23        976 33101  45319 10R  R3_2     
-        23        977 33101  45285 10L  R3_2     
-        23        978 33101  43629 10R  R2_1     
-        23        979 33101  43589 10L  R2_1     
-        23        980 33101  43611 10R  R2_1     
-        23        981 33101  45308 10L  R3_2     
-        23        982 33101  45310 10R  R3_2     
-        23        983 33101  44403 10L  R2_2     
-        23        984 33101   9925 10R  R4_1     
-        23        985 33101   9915 10L  R4_1     
-        23        986 33101   9920 10R  R4_1     
-        23        987 33101   9905 10L  R4_1     
-        23        988 33101   9930 10R  R4_1     
-        23        989 33101   9910 10L  R4_1     
-        23        990 33101  45336 10R  R3_2     
-        23        991 33101  45302 10L  R3_2     
-        23        992 33101  45325 10R  R3_2     
-        23        993 33101  45291 10L  R3_2     
-        23        994 33101  45331 10R  R3_2     
-        23        995 33101  45296 10L  R3_2     
-        23        996 33101  45320 10R  R3_2     
-        23        997 33101  45286 10L  R3_2     
-        23        998 33101  43630 10R  R2_1     
-        23        999 33101  43590 10L  R2_1     
-        23       1000 33101  43612 10R  R2_1     
-        23       1001 33101  44409 11L  R2_2     
-        23       1002 33101   9956 11R  R4_1     
-        23       1003 33101   9931 11L  R4_1     
-        23       1004 33101   9961 11R  R4_1     
-        23       1005 33101   9946 11L  R4_1     
-        23       1006 33101   9951 11R  R4_1     
-        23       1007 33101  43300 11L  R1_2     
-        23       1008 33101   9966 11R  R4_1     
-        23       1009 33101   9936 11L  R4_1     
-        23       1010 33101  44413 11R  R2_2     
-        23       1011 33101  45355 11L  R3_2     
-        23       1012 33101  45389 11R  R3_2     
-        23       1013 33101  45350 11L  R3_2     
-        23       1014 33101  45384 11R  R3_2     
-        23       1015 33101  45366 11L  R3_2     
-        23       1016 33101  45379 11R  R3_2     
-        23       1017 33101  43646 11L  R2_1     
-        23       1018 33101  43681 11R  R2_1     
-        23       1019 33101  45361 11L  R3_2     
-        23       1020 33101  43697 11R  R2_1     
-        23       1021 33101  44410 11L  R2_2     
-        23       1022 33101   9957 11R  R4_1     
-        23       1023 33101   9932 11L  R4_1     
-        23       1024 33101   9962 11R  R4_1     
-        23       1025 33101   9947 11L  R4_1     
-        23       1026 33101   9952 11R  R4_1     
-        23       1027 33101   9942 11L  R4_1     
-        23       1028 33101   9967 11R  R4_1     
-        23       1029 33101   9937 11L  R4_1     
-        23       1030 33101  44414 11R  R2_2     
-        23       1031 33101  45357 11L  R3_2     
-        23       1032 33101  45390 11R  R3_2     
-        23       1033 33101  45351 11L  R3_2     
-        23       1034 33101  45385 11R  R3_2     
-        23       1035 33101  45367 11L  R3_2     
-        23       1036 33101  45380 11R  R3_2     
-        23       1037 33101  43651 11L  R2_1     
-        23       1038 33101  43703 11R  R2_1     
-        23       1039 33101  45362 11L  R3_2     
-        23       1040 33101  38176 11R  S9_6     
-        23       1041 33101  44411 11L  R2_2     
-        23       1042 33101   9958 11R  R4_1     
-        23       1043 33101   9933 11L  R4_1     
-        23       1044 33101   9963 11R  R4_1     
-        23       1045 33101   9948 11L  R4_1     
-        23       1046 33101   9953 11R  R4_1     
-        23       1047 33101   9943 11L  R4_1     
-        23       1048 33101   9968 11R  R4_1     
-        23       1049 33101   9938 11L  R4_1     
-        23       1050 33101  44415 11R  R2_2     
-        23       1051 33101  45358 11L  R3_2     
-        23       1052 33101  45391 11R  R3_2     
-        23       1053 33101  45352 11L  R3_2     
-        23       1054 33101  45386 11R  R3_2     
-        23       1055 33101  45368 11L  R3_2     
-        23       1056 33101  45381 11R  R3_2     
-        23       1057 33101  43648 11L  R2_1     
-        23       1058 33101  43704 11R  R2_1     
-        23       1059 33101  45363 11L  R3_2     
-        23       1060 33101  43699 11R  R2_1     
-        23       1061 33101  44412 11L  R2_2     
-        23       1062 33101   9959 11R  R4_1     
-        23       1063 33101   9934 11L  R4_1     
-        23       1064 33101   9964 11R  R4_1     
-        23       1065 33101   9949 11L  R4_1     
-        23       1066 33101   9954 11R  R4_1     
-        23       1067 33101   9944 11L  R4_1     
-        23       1068 33101   9969 11R  R4_1     
-        23       1069 33101   9939 11L  R4_1     
-        23       1070 33101  45394 11R  R3_2     
-        23       1071 33101  45359 11L  R3_2     
-        23       1072 33101  45392 11R  R3_2     
-        23       1073 33101  45353 11L  R3_2     
-        23       1074 33101  45387 11R  R3_2     
-        23       1075 33101  45369 11L  R3_2     
-        23       1076 33101  45382 11R  R3_2     
-        23       1077 33101  43649 11L  R2_1     
-        23       1078 33101  43705 11R  R2_1     
-        23       1079 33101  45364 11L  R3_2     
-        23       1080 33101  43700 11R  R2_1     
-        23       1081 33101  45343 11L  R3_2     
-        23       1082 33101   9960 11R  R4_1     
-        23       1083 33101   9935 11L  R4_1     
-        23       1084 33101   9965 11R  R4_1     
-        23       1085 33101   9950 11L  R4_1     
-        23       1086 33101   9955 11R  R4_1     
-        23       1087 33101   9945 11L  R4_1     
-        23       1088 33101   9970 11R  R4_1     
-        23       1089 33101   9940 11L  R4_1     
-        23       1090 33101  45395 11R  R3_2     
-        23       1091 33101  45360 11L  R3_2     
-        23       1092 33101  45393 11R  R3_2     
-        23       1093 33101  45354 11L  R3_2     
-        23       1094 33101  45388 11R  R3_2     
-        23       1095 33101  45371 11L  R3_2     
-        23       1096 33101  45383 11R  R3_2     
-        23       1097 33101  43650 11L  R2_1     
-        23       1098 33101  43706 11R  R2_1     
-        23       1099 33101  45365 11L  R3_2     
-        23       1100 33101  43701 11R  R2_1     
-        23       1101 33101  44423 12L  R2_2     
-        23       1102 33101  44424 12R  R2_2     
-        23       1103 33101  45417 12L  R3_2     
-        23       1104 33101  45447 12R  R3_2     
-        23       1105 33101  44417 12L  R2_2     
-        23       1106 33101  45457 12R  R3_2     
-        23       1107 33101   9986 12L  R4_1     
-        23       1108 33101  38476 12R  R4_1     
-        23       1109 33101   9981 12L  R4_1     
-        23       1110 33101  38481 12R  R4_1     
-        23       1111 33101   9976 12L  R4_1     
-        23       1112 33101   9996 12R  R4_1     
-        23       1113 33101   9971 12L  R4_1     
-        23       1114 33101   9991 12R  R4_1     
-        23       1115 33101  45434 12L  R3_2     
-        23       1116 33101  45471 12R  R3_2     
-        23       1117 33101  45428 12L  R3_2     
-        23       1118 33101  45466 12R  R3_2     
-        23       1119 33101  43736 12L  R2_1     
-        23       1120 33101  43774 12R  R2_1     
-        23       1121 33101  45413 12L  R3_2     
-        23       1122 33101  44425 12R  R2_2     
-        23       1123 33101  45418 12L  R3_2     
-        23       1124 33101  45448 12R  R3_2     
-        23       1125 33101  44418 12L  R2_2     
-        23       1126 33101  45458 12R  R3_2     
-        23       1127 33101   9987 12L  R4_1     
-        23       1128 33101  38477 12R  R4_1     
-        23       1129 33101   9982 12L  R4_1     
-        23       1130 33101  38482 12R  R4_1     
-        23       1131 33101   9977 12L  R4_1     
-        23       1132 33101   9997 12R  R4_1     
-        23       1133 33101   9972 12L  R4_1     
-        23       1134 33101   9992 12R  R4_1     
-        23       1135 33101  45435 12L  R3_2     
-        23       1136 33101  45472 12R  R3_2     
-        23       1137 33101  45429 12L  R3_2     
-        23       1138 33101  45467 12R  R3_2     
-        23       1139 33101  43737 12L  R2_1     
-        23       1140 33101  43782 12R  R2_1     
-        23       1141 33101  45414 12L  R3_2     
-        23       1142 33101  44426 12R  R2_2     
-        23       1143 33101  45419 12L  R3_2     
-        23       1144 33101  45449 12R  R3_2     
-        23       1145 33101  44419 12L  R2_2     
-        23       1146 33101  45459 12R  R3_2     
-        23       1147 33101   9988 12L  R4_1     
-        23       1148 33101  38478 12R  R4_1     
-        23       1149 33101   9983 12L  R4_1     
-        23       1150 33101  38483 12R  R4_1     
-        23       1151 33101   9978 12L  R4_1     
-        23       1152 33101   9998 12R  R4_1     
-        23       1153 33101   9973 12L  R4_1     
-        23       1154 33101   9993 12R  R4_1     
-        23       1155 33101  45436 12L  R3_2     
-        23       1156 33101  45473 12R  R3_2     
-        23       1157 33101  45431 12L  R3_2     
-        23       1158 33101  45468 12R  R3_2     
-        23       1159 33101  43738 12L  R2_1     
-        23       1160 33101  43776 12R  R2_1     
-        23       1161 33101  45415 12L  R3_2     
-        23       1162 33101  45445 12R  R3_2     
-        23       1163 33101  45420 12L  R3_2     
-        23       1164 33101  45450 12R  R3_2     
-        23       1165 33101  44421 12L  R2_2     
-        23       1166 33101  45460 12R  R3_2     
-        23       1167 33101   9989 12L  R4_1     
-        23       1168 33101  38479 12R  R4_1     
-        23       1169 33101   9984 12L  R4_1     
-        23       1170 33101  38484 12R  R4_1     
-        23       1171 33101   9979 12L  R4_1     
-        23       1172 33101   9999 12R  R4_1     
-        23       1173 33101   9974 12L  R4_1     
-        23       1174 33101   9994 12R  R4_1     
-        23       1175 33101  45437 12L  R3_2     
-        23       1176 33101  45474 12R  R3_2     
-        23       1177 33101  45432 12L  R3_2     
-        23       1178 33101  45469 12R  R3_2     
-        23       1179 33101  43739 12L  R2_1     
-        23       1180 33101  43784 12R  R2_1     
-        23       1181 33101  45416 12L  R3_2     
-        23       1182 33101  45446 12R  R3_2     
-        23       1183 33101  45421 12L  R3_2     
-        23       1184 33101  45451 12R  R3_2     
-        23       1185 33101  44422 12L  R2_2     
-        23       1186 33101  45461 12R  R3_2     
-        23       1187 33101   9990 12L  R4_1     
-        23       1188 33101  38480 12R  R4_1     
-        23       1189 33101   9985 12L  R4_1     
-        23       1190 33101  38485 12R  R4_1     
-        23       1191 33101   9980 12L  R4_1     
-        23       1192 33101  1   12R  R4_1     
-        23       1193 33101   9975 12L  R4_1     
-        23       1194 33101   9995 12R  R4_1     
-        23       1195 33101  45438 12L  R3_2     
-        23       1196 33101  45475 12R  R3_2     
-        23       1197 33101  45433 12L  R3_2     
-        23       1198 33101  45470 12R  R3_2     
-        23       1199 33101  43748 12L  R2_1     
-        23       1200 33101  43766 12R  R2_1     
-        23       1201 33101  45513 13L  R3_2     
-        23       1202 33101  45533 13R  R3_2     
-        23       1203 33101  45503 13L  R3_2     
-        23       1204 33101  45528 13R  R3_2     
-        23       1205 33101  45496 13L  R3_2     
-        23       1206 33101  45523 13R  R3_2     
-        23       1207 33101  45491 13L  R3_2     
-        23       1208 33101  44449 13R  R2_2     
-        23       1209 33101  45486 13L  R3_2     
-        23       1210 33101  44443 13R  R2_2     
-        23       1211 33101  38496 13L  R4_1     
-        23       1212 33101  38521 13R  R4_1     
-        23       1213 33101  38501 13L  R4_1     
-        23       1214 33101  38516 13R  R4_1     
-        23       1215 33101  38491 13L  R4_1     
-        23       1216 33101  38511 13R  R4_1     
-        23       1217 33101  38486 13L  R4_1     
-        23       1218 33101  38506 13R  R4_1     
-        23       1219 33101  44437 13L  R2_2     
-        23       1220 33101  43842 13R  R2_1     
-        23       1221 33101  45514 13L  R3_2     
-        23       1222 33101  45534 13R  R3_2     
-        23       1223 33101  45504 13L  R3_2     
-        23       1224 33101  45529 13R  R3_2     
-        23       1225 33101  45497 13L  R3_2     
-        23       1226 33101  45524 13R  R3_2     
-        23       1227 33101  45492 13L  R3_2     
-        23       1228 33101  44450 13R  R2_2     
-        23       1229 33101  45487 13L  R3_2     
-        23       1230 33101  44444 13R  R2_2     
-        23       1231 33101  38497 13L  R4_1     
-        23       1232 33101  38522 13R  R4_1     
-        23       1233 33101  38502 13L  R4_1     
-        23       1234 33101  38517 13R  R4_1     
-        23       1235 33101  38492 13L  R4_1     
-        23       1236 33101  38512 13R  R4_1     
-        23       1237 33101  38487 13L  R4_1     
-        23       1238 33101  38507 13R  R4_1     
-        23       1239 33101  44441 13L  R2_2     
-        23       1240 33101  43843 13R  R2_1     
-        23       1241 33101  45515 13L  R3_2     
-        23       1242 33101  45537 13R  R3_2     
-        23       1243 33101  45505 13L  R3_2     
-        23       1244 33101  45530 13R  R3_2     
-        23       1245 33101  45498 13L  R3_2     
-        23       1246 33101  45525 13R  R3_2     
-        23       1247 33101  45493 13L  R3_2     
-        23       1248 33101  45520 13R  R3_2     
-        23       1249 33101  45488 13L  R3_2     
-        23       1250 33101  44445 13R  R2_2     
-        23       1251 33101  38498 13L  R4_1     
-        23       1252 33101  38523 13R  R4_1     
-        23       1253 33101  38503 13L  R4_1     
-        23       1254 33101  38518 13R  R4_1     
-        23       1255 33101  38493 13L  R4_1     
-        23       1256 33101  38513 13R  R4_1     
-        23       1257 33101  38488 13L  R4_1     
-        23       1258 33101  38508 13R  R4_1     
-        23       1259 33101  44442 13L  R2_2     
-        23       1260 33101  43844 13R  R2_1     
-        23       1261 33101  45516 13L  R3_2     
-        23       1262 33101  45538 13R  R3_2     
-        23       1263 33101  45506 13L  R3_2     
-        23       1264 33101  45531 13R  R3_2     
-        23       1265 33101  45499 13L  R3_2     
-        23       1266 33101  45526 13R  R3_2     
-        23       1267 33101  45494 13L  R3_2     
-        23       1268 33101  45521 13R  R3_2     
-        23       1269 33101  45489 13L  R3_2     
-        23       1270 33101  44446 13R  R2_2     
-        23       1271 33101  38499 13L  R4_1     
-        23       1272 33101  38524 13R  R4_1     
-        23       1273 33101  38504 13L  R4_1     
-        23       1274 33101  38519 13R  R4_1     
-        23       1275 33101  38494 13L  R4_1     
-        23       1276 33101  38514 13R  R4_1     
-        23       1277 33101  38489 13L  R4_1     
-        23       1278 33101  38509 13R  R4_1     
-        23       1279 33101  43792 13L  R2_1     
-        23       1280 33101  43845 13R  R2_1     
-        23       1281 33101  45517 13L  R3_2     
-        23       1282 33101  45539 13R  R3_2     
-        23       1283 33101  45507 13L  R3_2     
-        23       1284 33101  45532 13R  R3_2     
-        23       1285 33101  45500 13L  R3_2     
-        23       1286 33101  45527 13R  R3_2     
-        23       1287 33101  45495 13L  R3_2     
-        23       1288 33101  45522 13R  R3_2     
-        23       1289 33101  45490 13L  R3_2     
-        23       1290 33101  44448 13R  R2_2     
-        23       1291 33101  38500 13L  R4_1     
-        23       1292 33101  38525 13R  R4_1     
-        23       1293 33101  38505 13L  R4_1     
-        23       1294 33101  38520 13R  R4_1     
-        23       1295 33101  38495 13L  R4_1     
-        23       1296 33101  38515 13R  R4_1     
-        23       1297 33101  38490 13L  R4_1     
-        23       1298 33101  38510 13R  R4_1     
-        23       1299 33101  43800 13L  R2_1     
-        23       1300 33101  43850 13R  R2_1     
-        23       1301 33101  41021 14L  S10_5    
-        23       1302 33101  44000 14R  R2_2     
-        23       1303 33101  43946 14L  R2_2     
-        23       1304 33101  44048 14R  R2_2     
-        23       1305 33101  43965 14L  R2_2     
-        23       1306 33101  44053 14R  R2_2     
-        23       1307 33101  43985 14L  R2_2     
-        23       1308 33101  44013 14R  R2_2     
-        23       1309 33101  43986 14L  R2_2     
-        23       1310 33101  44032 14R  R2_2     
-        23       1311 33101  43994 14L  R2_2     
-        23       1312 33101  44060 14R  R2_2     
-        23       1313 33101  39202 14L  S10_1    
-        23       1314 33101  39263 14R  S10_1    
-        23       1315 33101  39221 14L  S10_1    
-        23       1316 33101  39271 14R  S10_1    
-        23       1317 33101  39211 14L  S10_1    
-        23       1318 33101  39277 14R  S10_1    
-        23       1319 33101  39216 14L  S10_1    
-        23       1320 33101  44040 14R  R2_2     
-        23       1321 33101  41029 14L  S10_5    
-        23       1322 33101  44001 14R  R2_2     
-        23       1323 33101  43947 14L  R2_2     
-        23       1324 33101  44049 14R  R2_2     
-        23       1325 33101  43977 14L  R2_2     
-        23       1326 33101  44054 14R  R2_2     
-        23       1327 33101  43988 14L  R2_2     
-        23       1328 33101  44014 14R  R2_2     
-        23       1329 33101  43987 14L  R2_2     
-        23       1330 33101  44046 14R  R2_2     
-        23       1331 33101  43996 14L  R2_2     
-        23       1332 33101  44061 14R  R2_2     
-        23       1333 33101  39203 14L  S10_1    
-        23       1334 33101  39267 14R  S10_1    
-        23       1335 33101  39222 14L  S10_1    
-        23       1336 33101  39272 14R  S10_1    
-        23       1337 33101  39212 14L  S10_1    
-        23       1338 33101  39278 14R  S10_1    
-        23       1339 33101  39217 14L  S10_1    
-        23       1340 33101  39258 14R  S10_1    
-        23       1341 33101  43933 14L  R2_2     
-        23       1342 33101  44007 14R  R2_2     
-        23       1343 33101  43951 14L  R2_2     
-        23       1344 33101  44050 14R  R2_2     
-        23       1345 33101  43981 14L  R2_2     
-        23       1346 33101  44055 14R  R2_2     
-        23       1347 33101  43990 14L  R2_2     
-        23       1348 33101  44015 14R  R2_2     
-        23       1349 33101  43989 14L  R2_2     
-        23       1350 33101  44047 14R  R2_2     
-        23       1351 33101  43997 14L  R2_2     
-        23       1352 33101  44062 14R  R2_2     
-        23       1353 33101  39204 14L  S10_1    
-        23       1354 33101  39268 14R  S10_1    
-        23       1355 33101  39208 14L  S10_1    
-        23       1356 33101  39273 14R  S10_1    
-        23       1357 33101  39213 14L  S10_1    
-        23       1358 33101  39279 14R  S10_1    
-        23       1359 33101  39218 14L  S10_1    
-        23       1360 33101  39260 14R  S10_1    
-        23       1361 33101  43943 14L  R2_2     
-        23       1362 33101  44008 14R  R2_2     
-        23       1363 33101  43957 14L  R2_2     
-        23       1364 33101  44051 14R  R2_2     
-        23       1365 33101  43982 14L  R2_2     
-        23       1366 33101  44056 14R  R2_2     
-        23       1367 33101  43991 14L  R2_2     
-        23       1368 33101  44022 14R  R2_2     
-        23       1369 33101  43993 14L  R2_2     
-        23       1370 33101  44058 14R  R2_2     
-        23       1371 33101  43998 14L  R2_2     
-        23       1372 33101  44063 14R  R2_2     
-        23       1373 33101  39205 14L  S10_1    
-        23       1374 33101  39269 14R  S10_1    
-        23       1375 33101  39209 14L  S10_1    
-        23       1376 33101  39274 14R  S10_1    
-        23       1377 33101  39214 14L  S10_1    
-        23       1378 33101  44033 14R  R2_2     
-        23       1379 33101  39219 14L  S10_1    
-        23       1380 33101  39264 14R  S10_1    
-        23       1381 33101  43945 14L  R2_2     
-        23       1382 33101  44010 14R  R2_2     
-        23       1383 33101  43958 14L  R2_2     
-        23       1384 33101  44052 14R  R2_2     
-        23       1385 33101  43984 14L  R2_2     
-        23       1386 33101  44057 14R  R2_2     
-        23       1387 33101  43992 14L  R2_2     
-        23       1388 33101  44027 14R  R2_2     
-        23       1389 33101  43995 14L  R2_2     
-        23       1390 33101  44059 14R  R2_2     
-        23       1391 33101  39223 14L  S10_1    
-        23       1392 33101  44064 14R  R2_2     
-        23       1393 33101  39206 14L  S10_1    
-        23       1394 33101  39270 14R  S10_1    
-        23       1395 33101  39210 14L  S10_1    
-        23       1396 33101  39275 14R  S10_1    
-        23       1397 33101  39215 14L  S10_1    
-        23       1398 33101  44035 14R  R2_2     
-        23       1399 33101  39220 14L  S10_1    
-        23       1400 33101  39265 14R  S10_1    
-        23       1401 33101  44068 15L  R2_2     
-        23       1402 33101  39755 15R  S10_2    
-        23       1403 33101  40204 15L  S10_3    
-        23       1404 33101  44169 15R  R2_2     
-        23       1405 33101  44088 15L  R2_2     
-        23       1406 33101  44191 15R  R2_2     
-        23       1407 33101  44106 15L  R2_2     
-        23       1408 33101  39356 15R  S10_1    
-        23       1409 33101  44096 15L  R2_2     
-        23       1410 33101  44181 15R  R2_2     
-        23       1411 33101  44121 15L  R2_2     
-        23       1412 33101  39366 15R  S10_1    
-        23       1413 33101  39291 15L  S10_1    
-        23       1414 33101  39371 15R  S10_1    
-        23       1415 33101  39296 15L  S10_1    
-        23       1416 33101  39376 15R  S10_1    
-        23       1417 33101  39301 15L  S10_1    
-        23       1418 33101  39382 15R  S10_1    
-        23       1419 33101  39306 15L  S10_1    
-        23       1420 33101  44197 15R  R2_2     
-        23       1421 33101  44071 15L  R2_2     
-        23       1422 33101  41123 15R  S10_5    
-        23       1423 33101  41090 15L  S10_5    
-        23       1424 33101  44170 15R  R2_2     
-        23       1425 33101  44089 15L  R2_2     
-        23       1426 33101  44192 15R  R2_2     
-        23       1427 33101  44108 15L  R2_2     
-        23       1428 33101  39357 15R  S10_1    
-        23       1429 33101  44097 15L  R2_2     
-        23       1430 33101  44182 15R  R2_2     
-        23       1431 33101  44123 15L  R2_2     
-        23       1432 33101  39367 15R  S10_1    
-        23       1433 33101  39292 15L  S10_1    
-        23       1434 33101  39372 15R  S10_1    
-        23       1435 33101  39297 15L  S10_1    
-        23       1436 33101  39377 15R  S10_1    
-        23       1437 33101  39302 15L  S10_1    
-        23       1438 33101  39383 15R  S10_1    
-        23       1439 33101  39307 15L  S10_1    
-        23       1440 33101  44198 15R  R2_2     
-        23       1441 33101  44073 15L  R2_2     
-        23       1442 33101  44136 15R  R2_2     
-        23       1443 33101  44077 15L  R2_2     
-        23       1444 33101  44172 15R  R2_2     
-        23       1445 33101  44091 15L  R2_2     
-        23       1446 33101  44193 15R  R2_2     
-        23       1447 33101  44109 15L  R2_2     
-        23       1448 33101  39358 15R  S10_1    
-        23       1449 33101  44098 15L  R2_2     
-        23       1450 33101  39362 15R  S10_1    
-        23       1451 33101  44124 15L  R2_2     
-        23       1452 33101  39368 15R  S10_1    
-        23       1453 33101  39293 15L  S10_1    
-        23       1454 33101  39373 15R  S10_1    
-        23       1455 33101  39290 15L  S10_1    
-        23       1456 33101  39378 15R  S10_1    
-        23       1457 33101  39303 15L  S10_1    
-        23       1458 33101  39384 15R  S10_1    
-        23       1459 33101  44131 15L  R2_2     
-        23       1460 33101  44199 15R  R2_2     
-        23       1461 33101  44074 15L  R2_2     
-        23       1462 33101  44137 15R  R2_2     
-        23       1463 33101  44080 15L  R2_2     
-        23       1464 33101  44174 15R  R2_2     
-        23       1465 33101  44102 15L  R2_2     
-        23       1466 33101  44194 15R  R2_2     
-        23       1467 33101  44113 15L  R2_2     
-        23       1468 33101  39359 15R  S10_1    
-        23       1469 33101  44094 15L  R2_2     
-        23       1470 33101  39364 15R  S10_1    
-        23       1471 33101  44128 15L  R2_2     
-        23       1472 33101  39369 15R  S10_1    
-        23       1473 33101  39294 15L  S10_1    
-        23       1474 33101  39374 15R  S10_1    
-        23       1475 33101  39299 15L  S10_1    
-        23       1476 33101  39379 15R  S10_1    
-        23       1477 33101  39304 15L  S10_1    
-        23       1478 33101  44186 15R  R2_2     
-        23       1479 33101  44132 15L  R2_2     
-        23       1480 33101  44200 15R  R2_2     
-        23       1481 33101  40157 15L  S10_3    
-        23       1482 33101  44142 15R  R2_2     
-        23       1483 33101  44085 15L  R2_2     
-        23       1484 33101  44176 15R  R2_2     
-        23       1485 33101  44112 15L  R2_2     
-        23       1486 33101  44195 15R  R2_2     
-        23       1487 33101  44117 15L  R2_2     
-        23       1488 33101  39360 15R  S10_1    
-        23       1489 33101  44100 15L  R2_2     
-        23       1490 33101  39365 15R  S10_1    
-        23       1491 33101  44130 15L  R2_2     
-        23       1492 33101  39370 15R  S10_1    
-        23       1493 33101  39295 15L  S10_1    
-        23       1494 33101  39375 15R  S10_1    
-        23       1495 33101  39300 15L  S10_1    
-        23       1496 33101  39380 15R  S10_1    
-        23       1497 33101  39305 15L  S10_1    
-        23       1498 33101  44202 15R  R2_2     
-        23       1499 33101  44133 15L  R2_2     
-        23       1500 33101  44201 15R  R2_2     
-        23       1501 33101  44206 16L  R2_2     
-        23       1502 33101  39795 16R  S10_2    
-        23       1503 33101  44235 16L  R2_2     
-        23       1504 33101  44273 16R  R2_2     
-        23       1505 33101  41923 16L  P18      
-        23       1506 33101  44304 16R  R2_2     
-        23       1507 33101  44246 16L  R2_2     
-        23       1508 33101  44311 16R  R2_2     
-        23       1509 33101  44251 16L  R2_2     
-        23       1510 33101  44316 16R  R2_2     
-        23       1511 33101  39411 16L  S10_1    
-        23       1512 33101  44321 16R  R2_2     
-        23       1513 33101  39401 16L  S10_1    
-        23       1514 33101  39418 16R  S10_1    
-        23       1515 33101  39391 16L  S10_1    
-        23       1516 33101  39419 16R  S10_1    
-        23       1517 33101  39396 16L  S10_1    
-        23       1518 33101  39427 16R  S10_1    
-        23       1519 33101  39406 16L  S10_1    
-        23       1520 33101  39434 16R  S10_1    
-        23       1521 33101  44210 16L  R2_2     
-        23       1522 33101  44261 16R  R2_2     
-        23       1523 33101  44245 16L  R2_2     
-        23       1524 33101  44287 16R  R2_2     
-        23       1525 33101  41924 16L  P18      
-        23       1526 33101  44305 16R  R2_2     
-        23       1527 33101  44247 16L  R2_2     
-        23       1528 33101  44312 16R  R2_2     
-        23       1529 33101  44252 16L  R2_2     
-        23       1530 33101  44317 16R  R2_2     
-        23       1531 33101  39387 16L  S10_1    
-        23       1532 33101  44322 16R  R2_2     
-        23       1533 33101  39402 16L  S10_1    
-        23       1534 33101  44310 16R  R2_2     
-        23       1535 33101  39392 16L  S10_1    
-        23       1536 33101  39420 16R  S10_1    
-        23       1537 33101  39397 16L  S10_1    
-        23       1538 33101  39429 16R  S10_1    
-        23       1539 33101  39407 16L  S10_1    
-        23       1540 33101  39435 16R  S10_1    
-        23       1541 33101  44222 16L  R2_2     
-        23       1542 33101  44265 16R  R2_2     
-        23       1543 33101  44254 16L  R2_2     
-        23       1544 33101  44288 16R  R2_2     
-        23       1545 33101  44236 16L  R2_2     
-        23       1546 33101  44307 16R  R2_2     
-        23       1547 33101  44248 16L  R2_2     
-        23       1548 33101  44313 16R  R2_2     
-        23       1549 33101  44253 16L  R2_2     
-        23       1550 33101  44318 16R  R2_2     
-        23       1551 33101  39388 16L  S10_1    
-        23       1552 33101  44323 16R  R2_2     
-        23       1553 33101  39403 16L  S10_1    
-        23       1554 33101  44326 16R  R2_2     
-        23       1555 33101  39393 16L  S10_1    
-        23       1556 33101  39422 16R  S10_1    
-        23       1557 33101  39398 16L  S10_1    
-        23       1558 33101  39430 16R  S10_1    
-        23       1559 33101  39408 16L  S10_1    
-        23       1560 33101  39436 16R  S10_1    
-        23       1561 33101  44225 16L  R2_2     
-        23       1562 33101  44266 16R  R2_2     
-        23       1563 33101  44256 16L  R2_2     
-        23       1564 33101  44298 16R  R2_2     
-        23       1565 33101  44243 16L  R2_2     
-        23       1566 33101  44308 16R  R2_2     
-        23       1567 33101  44249 16L  R2_2     
-        23       1568 33101  44314 16R  R2_2     
-        23       1569 33101  44255 16L  R2_2     
-        23       1570 33101  44319 16R  R2_2     
-        23       1571 33101  39389 16L  S10_1    
-        23       1572 33101  44324 16R  R2_2     
-        23       1573 33101  39404 16L  S10_1    
-        23       1574 33101  44327 16R  R2_2     
-        23       1575 33101  39394 16L  S10_1    
-        23       1576 33101  39423 16R  S10_1    
-        23       1577 33101  39399 16L  S10_1    
-        23       1578 33101  39431 16R  S10_1    
-        23       1579 33101  39409 16L  S10_1    
-        23       1580 33101  39437 16R  S10_1    
-        23       1581 33101  44226 16L  R2_2     
-        23       1582 33101  44269 16R  R2_2     
-        23       1583 33101  44257 16L  R2_2     
-        23       1584 33101  44299 16R  R2_2     
-        23       1585 33101  44244 16L  R2_2     
-        23       1586 33101  44309 16R  R2_2     
-        23       1587 33101  44250 16L  R2_2     
-        23       1588 33101  44315 16R  R2_2     
-        23       1589 33101  44258 16L  R2_2     
-        23       1590 33101  44320 16R  R2_2     
-        23       1591 33101  39390 16L  S10_1    
-        23       1592 33101  44325 16R  R2_2     
-        23       1593 33101  39405 16L  S10_1    
-        23       1594 33101  44328 16R  R2_2     
-        23       1595 33101  39395 16L  S10_1    
-        23       1596 33101  39424 16R  S10_1    
-        23       1597 33101  39400 16L  S10_1    
-        23       1598 33101  39433 16R  S10_1    
-        23       1599 33101  39410 16L  S10_1    
-        23       1600 33101  39438 16R  S10_1    
-        23       1601 33101  41211 17L  S10_5    
-        23       1602 33101  41216 17R  S10_5    
-        23       1603 33101  43186 17L  R1_2     
-        23       1604 33101  41221 17R  S10_5    
-        23       1605 33101  39856 17L  S10_2    
-        23       1606 33101  44841 17R  R3_1     
-        23       1607 33101  44771 17L  R3_1     
-        23       1608 33101  44851 17R  R3_1     
-        23       1609 33101  44781 17L  R3_1     
-        23       1610 33101  40325 17R  S10_3    
-        23       1611 33101  44776 17L  R3_1     
-        23       1612 33101  44856 17R  R3_1     
-        23       1613 33101  44791 17L  R3_1     
-        23       1614 33101  44866 17R  R3_1     
-        23       1615 33101  44786 17L  R3_1     
-        23       1616 33101  44861 17R  R3_1     
-        23       1617 33101  44796 17L  R3_1     
-        23       1618 33101  44871 17R  R3_1     
-        23       1619 33101  44801 17L  R3_1     
-        23       1620 33101  44876 17R  R3_1     
-        23       1621 33101  41212 17L  S10_5    
-        23       1622 33101  41217 17R  S10_5    
-        23       1623 33101  43187 17L  R1_2     
-        23       1624 33101  41222 17R  S10_5    
-        23       1625 33101  43183 17L  R1_2     
-        23       1626 33101  44842 17R  R3_1     
-        23       1627 33101  44772 17L  R3_1     
-        23       1628 33101  44852 17R  R3_1     
-        23       1629 33101  44782 17L  R3_1     
-        23       1630 33101  42336 17R  P19      
-        23       1631 33101  42709 17L  R1_1     
-        23       1632 33101  44857 17R  R3_1     
-        23       1633 33101  44792 17L  R3_1     
-        23       1634 33101  44867 17R  R3_1     
-        23       1635 33101  44329 17L  R2_2     
-        23       1636 33101  44862 17R  R3_1     
-        23       1637 33101  44797 17L  R3_1     
-        23       1638 33101  44872 17R  R3_1     
-        23       1639 33101  44802 17L  R3_1     
-        23       1640 33101  42351 17R  P19      
-        23       1641 33101  41213 17L  S10_5    
-        23       1642 33101  41218 17R  S10_5    
-        23       1643 33101  43188 17L  R1_2     
-        23       1644 33101  41223 17R  S10_5    
-        23       1645 33101  43184 17L  R1_2     
-        23       1646 33101  44843 17R  R3_1     
-        23       1647 33101  44773 17L  R3_1     
-        23       1648 33101  44853 17R  R3_1     
-        23       1649 33101  44783 17L  R3_1     
-        23       1650 33101  44848 17R  R3_1     
-        23       1651 33101  44778 17L  R3_1     
-        23       1652 33101  44858 17R  R3_1     
-        23       1653 33101  44793 17L  R3_1     
-        23       1654 33101  44868 17R  R3_1     
-        23       1655 33101  44788 17L  R3_1     
-        23       1656 33101  44863 17R  R3_1     
-        23       1657 33101  44798 17L  R3_1     
-        23       1658 33101  44873 17R  R3_1     
-        23       1659 33101  44803 17L  R3_1     
-        23       1660 33101  43360 17R  R2_1     
-        23       1661 33101  41214 17L  S10_5    
-        23       1662 33101  41219 17R  S10_5    
-        23       1663 33101  43189 17L  R1_2     
-        23       1664 33101  41224 17R  S10_5    
-        23       1665 33101  43185 17L  R1_2     
-        23       1666 33101  44844 17R  R3_1     
-        23       1667 33101  44774 17L  R3_1     
-        23       1668 33101  44854 17R  R3_1     
-        23       1669 33101  44784 17L  R3_1     
-        23       1670 33101  44849 17R  R3_1     
-        23       1671 33101  44779 17L  R3_1     
-        23       1672 33101  42350 17R  P19      
-        23       1673 33101  44794 17L  R3_1     
-        23       1674 33101  44869 17R  R3_1     
-        23       1675 33101  44789 17L  R3_1     
-        23       1676 33101  44864 17R  R3_1     
-        23       1677 33101  44799 17L  R3_1     
-        23       1678 33101  44874 17R  R3_1     
-        23       1679 33101  44804 17L  R3_1     
-        23       1680 33101  43361 17R  R2_1     
-        23       1681 33101  41199 17L  S10_5    
-        23       1682 33101  41220 17R  S10_5    
-        23       1683 33101  43190 17L  R1_2     
-        23       1684 33101  41215 17R  S10_5    
-        23       1685 33101  42708 17L  R1_1     
-        23       1686 33101  44845 17R  R3_1     
-        23       1687 33101  44770 17L  R3_1     
-        23       1688 33101  44855 17R  R3_1     
-        23       1689 33101  44785 17L  R3_1     
-        23       1690 33101  44850 17R  R3_1     
-        23       1691 33101  44780 17L  R3_1     
-        23       1692 33101  44860 17R  R3_1     
-        23       1693 33101  44795 17L  R3_1     
-        23       1694 33101  44870 17R  R3_1     
-        23       1695 33101  44790 17L  R3_1     
-        23       1696 33101  44865 17R  R3_1     
-        23       1697 33101  44806 17L  R3_1     
-        23       1698 33101  44875 17R  R3_1     
-        23       1699 33101  44805 17L  R3_1     
-        23       1700 33101  44840 17R  R3_1     
-        24          1 33101  40519 1L   S10_4    
-        24          2 33101  41569 1R   S10_6    
-        24          3 33101  45021 1L   R3_2     
-        24          4 33101  45046 1R   R3_2     
-        24          5 33101  45026 1L   R3_2     
-        24          6 33101  45561 1R   R4_1     
-        24          7 33101  45554 1L   R4_1     
-        24          8 33101  45566 1R   R4_1     
-        24          9 33101  46101 1L   R4_2     
-        24         10 33101  46691 1R   R5_1     
-        24         11 33101  46106 1L   R4_2     
-        24         12 33101  46131 1R   R4_2     
-        24         13 33101  46111 1L   R4_2     
-        24         14 33101  46136 1R   R4_2     
-        24         15 33101  46116 1L   R4_2     
-        24         16 33101  46141 1R   R4_2     
-        24         17 33101  46121 1L   R4_2     
-        24         18 33101  46146 1R   R4_2     
-        24         19 33101  46671 1L   R5_1     
-        24         20 33101  45053 1R   R3_2     
-        24         21 33101  41525 1L   S10_6    
-        24         22 33101  41573 1R   S10_6    
-        24         23 33101  45022 1L   R3_2     
-        24         24 33101  45047 1R   R3_2     
-        24         25 33101  45027 1L   R3_2     
-        24         26 33101  45562 1R   R4_1     
-        24         27 33101  45555 1L   R4_1     
-        24         28 33101  45567 1R   R4_1     
-        24         29 33101  46102 1L   R4_2     
-        24         30 33101  46127 1R   R4_2     
-        24         31 33101  46107 1L   R4_2     
-        24         32 33101  46132 1R   R4_2     
-        24         33 33101  46112 1L   R4_2     
-        24         34 33101  46137 1R   R4_2     
-        24         35 33101  46117 1L   R4_2     
-        24         36 33101  46142 1R   R4_2     
-        24         37 33101  46122 1L   R4_2     
-        24         38 33101  46147 1R   R4_2     
-        24         39 33101  46672 1L   R5_1     
-        24         40 33101  45054 1R   R3_2     
-        24         41 33101  44467 1L   R3_1     
-        24         42 33101  45045 1R   R3_2     
-        24         43 33101  45023 1L   R3_2     
-        24         44 33101  45048 1R   R3_2     
-        24         45 33101  45551 1L   R4_1     
-        24         46 33101  45563 1R   R4_1     
-        24         47 33101  45556 1L   R4_1     
-        24         48 33101  45568 1R   R4_1     
-        24         49 33101  46103 1L   R4_2     
-        24         50 33101  46128 1R   R4_2     
-        24         51 33101  46108 1L   R4_2     
-        24         52 33101  46133 1R   R4_2     
-        24         53 33101  46113 1L   R4_2     
-        24         54 33101  46138 1R   R4_2     
-        24         55 33101  46118 1L   R4_2     
-        24         56 33101  46143 1R   R4_2     
-        24         57 33101  46123 1L   R4_2     
-        24         58 33101  46148 1R   R4_2     
-        24         59 33101  46673 1L   R5_1     
-        24         60 33101  46151 1R   R4_2     
-        24         61 33101  44473 1L   R3_1     
-        24         62 33101  45051 1R   R3_2     
-        24         63 33101  45024 1L   R3_2     
-        24         64 33101  45049 1R   R3_2     
-        24         65 33101  45552 1L   R4_1     
-        24         66 33101  45564 1R   R4_1     
-        24         67 33101  45557 1L   R4_1     
-        24         68 33101  45569 1R   R4_1     
-        24         69 33101  46104 1L   R4_2     
-        24         70 33101  46129 1R   R4_2     
-        24         71 33101  46110 1L   R4_2     
-        24         72 33101  46134 1R   R4_2     
-        24         73 33101  46114 1L   R4_2     
-        24         74 33101  46139 1R   R4_2     
-        24         75 33101  46119 1L   R4_2     
-        24         76 33101  46144 1R   R4_2     
-        24         77 33101  46124 1L   R4_2     
-        24         78 33101  46149 1R   R4_2     
-        24         79 33101  46126 1L   R4_2     
-        24         80 33101  46152 1R   R4_2     
-        24         81 33101  45020 1L   R3_2     
-        24         82 33101  45052 1R   R3_2     
-        24         83 33101  45025 1L   R3_2     
-        24         84 33101  45050 1R   R3_2     
-        24         85 33101  45553 1L   R4_1     
-        24         86 33101  45565 1R   R4_1     
-        24         87 33101  45558 1L   R4_1     
-        24         88 33101  45570 1R   R4_1     
-        24         89 33101  46105 1L   R4_2     
-        24         90 33101  46130 1R   R4_2     
-        24         91 33101  45559 1L   R4_1     
-        24         92 33101  46135 1R   R4_2     
-        24         93 33101  46115 1L   R4_2     
-        24         94 33101  46140 1R   R4_2     
-        24         95 33101  46120 1L   R4_2     
-        24         96 33101  46145 1R   R4_2     
-        24         97 33101  46125 1L   R4_2     
-        24         98 33101  46150 1R   R4_2     
-        24         99 33101  45560 1L   R4_1     
-        24        100 33101  46692 1R   R5_1     
-        24        101 33101  40566 2L   S10_4    
-        24        102 33101  45089 2R   R3_2     
-        24        103 33101  45571 2L   R4_1     
-        24        104 33101  41637 2R   S10_6    
-        24        105 33101  45576 2L   R4_1     
-        24        106 33101  45096 2R   R3_2     
-        24        107 33101  45581 2L   R4_1     
-        24        108 33101  45101 2R   R3_2     
-        24        109 33101  45586 2L   R4_1     
-        24        110 33101  45591 2R   R4_1     
-        24        111 33101  44543 2L   R3_1     
-        24        112 33101  45596 2R   R4_1     
-        24        113 33101  46156 2L   R4_2     
-        24        114 33101  46184 2R   R4_2     
-        24        115 33101  46161 2L   R4_2     
-        24        116 33101  46179 2R   R4_2     
-        24        117 33101  46166 2L   R4_2     
-        24        118 33101  46186 2R   R4_2     
-        24        119 33101  46171 2L   R4_2     
-        24        120 33101  46191 2R   R4_2     
-        24        121 33101  41587 2L   S10_6    
-        24        122 33101  45090 2R   R3_2     
-        24        123 33101  45572 2L   R4_1     
-        24        124 33101  41649 2R   S10_6    
-        24        125 33101  45577 2L   R4_1     
-        24        126 33101  45097 2R   R3_2     
-        24        127 33101  45582 2L   R4_1     
-        24        128 33101  45102 2R   R3_2     
-        24        129 33101  45587 2L   R4_1     
-        24        130 33101  45592 2R   R4_1     
-        24        131 33101  44549 2L   R3_1     
-        24        132 33101  45597 2R   R4_1     
-        24        133 33101  46157 2L   R4_2     
-        24        134 33101  45107 2R   R3_2     
-        24        135 33101  46162 2L   R4_2     
-        24        136 33101  46180 2R   R4_2     
-        24        137 33101  46167 2L   R4_2     
-        24        138 33101  46187 2R   R4_2     
-        24        139 33101  46172 2L   R4_2     
-        24        140 33101  46192 2R   R4_2     
-        24        141 33101  41592 2L   S10_6    
-        24        142 33101  45091 2R   R3_2     
-        24        143 33101  45573 2L   R4_1     
-        24        144 33101  45094 2R   R3_2     
-        24        145 33101  45578 2L   R4_1     
-        24        146 33101  45098 2R   R3_2     
-        24        147 33101  45583 2L   R4_1     
-        24        148 33101  45103 2R   R3_2     
-        24        149 33101  45588 2L   R4_1     
-        24        150 33101  45593 2R   R4_1     
-        24        151 33101  46153 2L   R4_2     
-        24        152 33101  45598 2R   R4_1     
-        24        153 33101  46158 2L   R4_2     
-        24        154 33101  45108 2R   R3_2     
-        24        155 33101  46163 2L   R4_2     
-        24        156 33101  46181 2R   R4_2     
-        24        157 33101  46168 2L   R4_2     
-        24        158 33101  46188 2R   R4_2     
-        24        159 33101  46173 2L   R4_2     
-        24        160 33101  46193 2R   R4_2     
-        24        161 33101  41814 2L   P18      
-        24        162 33101  45092 2R   R3_2     
-        24        163 33101  45574 2L   R4_1     
-        24        164 33101  45095 2R   R3_2     
-        24        165 33101  45579 2L   R4_1     
-        24        166 33101  45100 2R   R3_2     
-        24        167 33101  45584 2L   R4_1     
-        24        168 33101  45104 2R   R3_2     
-        24        169 33101  45589 2L   R4_1     
-        24        170 33101  45594 2R   R4_1     
-        24        171 33101  46154 2L   R4_2     
-        24        172 33101  45599 2R   R4_1     
-        24        173 33101  46159 2L   R4_2     
-        24        174 33101  45109 2R   R3_2     
-        24        175 33101  46164 2L   R4_2     
-        24        176 33101  46182 2R   R4_2     
-        24        177 33101  46169 2L   R4_2     
-        24        178 33101  46189 2R   R4_2     
-        24        179 33101  46174 2L   R4_2     
-        24        180 33101  46194 2R   R4_2     
-        24        181 33101  45082 2L   R3_2     
-        24        182 33101  45093 2R   R3_2     
-        24        183 33101  45575 2L   R4_1     
-        24        184 33101  45099 2R   R3_2     
-        24        185 33101  45580 2L   R4_1     
-        24        186 33101  45106 2R   R3_2     
-        24        187 33101  45585 2L   R4_1     
-        24        188 33101  45105 2R   R3_2     
-        24        189 33101  45590 2L   R4_1     
-        24        190 33101  45595 2R   R4_1     
-        24        191 33101  46155 2L   R4_2     
-        24        192 33101  45600 2R   R4_1     
-        24        193 33101  46160 2L   R4_2     
-        24        194 33101  46185 2R   R4_2     
-        24        195 33101  46165 2L   R4_2     
-        24        196 33101  46183 2R   R4_2     
-        24        197 33101  46170 2L   R4_2     
-        24        198 33101  46190 2R   R4_2     
-        24        199 33101  45083 2L   R3_2     
-        24        200 33101  46195 2R   R4_2     
-        24        201 33101  40642 3L   S10_4    
-        24        202 33101  44626 3R   R3_1     
-        24        203 33101  45120 3L   R3_2     
-        24        204 33101  45156 3R   R3_2     
-        24        205 33101  45131 3L   R3_2     
-        24        206 33101  45161 3R   R3_2     
-        24        207 33101  45601 3L   R4_1     
-        24        208 33101  46772 3R   R5_1     
-        24        209 33101  46205 3L   R4_2     
-        24        210 33101  45616 3R   R4_1     
-        24        211 33101  45606 3L   R4_1     
-        24        212 33101  46236 3R   R4_2     
-        24        213 33101  46211 3L   R4_2     
-        24        214 33101  46231 3R   R4_2     
-        24        215 33101  46216 3L   R4_2     
-        24        216 33101  46241 3R   R4_2     
-        24        217 33101  46221 3L   R4_2     
-        24        218 33101  46246 3R   R4_2     
-        24        219 33101  46226 3L   R4_2     
-        24        220 33101  46251 3R   R4_2     
-        24        221 33101  40645 3L   S10_4    
-        24        222 33101  45149 3R   R3_2     
-        24        223 33101  45124 3L   R3_2     
-        24        224 33101  45157 3R   R3_2     
-        24        225 33101  45132 3L   R3_2     
-        24        226 33101  45162 3R   R3_2     
-        24        227 33101  45602 3L   R4_1     
-        24        228 33101  45611 3R   R4_1     
-        24        229 33101  46206 3L   R4_2     
-        24        230 33101  45617 3R   R4_1     
-        24        231 33101  45607 3L   R4_1     
-        24        232 33101  46237 3R   R4_2     
-        24        233 33101  46212 3L   R4_2     
-        24        234 33101  46232 3R   R4_2     
-        24        235 33101  46217 3L   R4_2     
-        24        236 33101  46242 3R   R4_2     
-        24        237 33101  46222 3L   R4_2     
-        24        238 33101  46247 3R   R4_2     
-        24        239 33101  46227 3L   R4_2     
-        24        240 33101  46252 3R   R4_2     
-        24        241 33101  41828 3L   P18      
-        24        242 33101  45150 3R   R3_2     
-        24        243 33101  45128 3L   R3_2     
-        24        244 33101  45158 3R   R3_2     
-        24        245 33101  45133 3L   R3_2     
-        24        246 33101  45163 3R   R3_2     
-        24        247 33101  45603 3L   R4_1     
-        24        248 33101  45612 3R   R4_1     
-        24        249 33101  46207 3L   R4_2     
-        24        250 33101  45618 3R   R4_1     
-        24        251 33101  45608 3L   R4_1     
-        24        252 33101  46238 3R   R4_2     
-        24        253 33101  46213 3L   R4_2     
-        24        254 33101  46233 3R   R4_2     
-        24        255 33101  46218 3L   R4_2     
-        24        256 33101  46243 3R   R4_2     
-        24        257 33101  46223 3L   R4_2     
-        24        258 33101  46248 3R   R4_2     
-        24        259 33101  46228 3L   R4_2     
-        24        260 33101  46253 3R   R4_2     
-        24        261 33101  41832 3L   P18      
-        24        262 33101  45613 3R   R4_1     
-        24        263 33101  45129 3L   R3_2     
-        24        264 33101  45159 3R   R3_2     
-        24        265 33101  45134 3L   R3_2     
-        24        266 33101  45164 3R   R3_2     
-        24        267 33101  45604 3L   R4_1     
-        24        268 33101  45614 3R   R4_1     
-        24        269 33101  46208 3L   R4_2     
-        24        270 33101  45619 3R   R4_1     
-        24        271 33101  45609 3L   R4_1     
-        24        272 33101  46239 3R   R4_2     
-        24        273 33101  46214 3L   R4_2     
-        24        274 33101  46234 3R   R4_2     
-        24        275 33101  46219 3L   R4_2     
-        24        276 33101  46244 3R   R4_2     
-        24        277 33101  46224 3L   R4_2     
-        24        278 33101  46249 3R   R4_2     
-        24        279 33101  45136 3L   R3_2     
-        24        280 33101  46254 3R   R4_2     
-        24        281 33101  44600 3L   R3_1     
-        24        282 33101  46256 3R   R4_2     
-        24        283 33101  45130 3L   R3_2     
-        24        284 33101  45160 3R   R3_2     
-        24        285 33101  45135 3L   R3_2     
-        24        286 33101  46771 3R   R5_1     
-        24        287 33101  45605 3L   R4_1     
-        24        288 33101  45615 3R   R4_1     
-        24        289 33101  46209 3L   R4_2     
-        24        290 33101  45620 3R   R4_1     
-        24        291 33101  45610 3L   R4_1     
-        24        292 33101  46240 3R   R4_2     
-        24        293 33101  46215 3L   R4_2     
-        24        294 33101  46235 3R   R4_2     
-        24        295 33101  46220 3L   R4_2     
-        24        296 33101  46245 3R   R4_2     
-        24        297 33101  46225 3L   R4_2     
-        24        298 33101  46250 3R   R4_2     
-        24        299 33101  45137 3L   R3_2     
-        24        300 33101  46255 3R   R4_2     
-        24        301 33101  40047 4L   S10_3    
-        24        302 33101  40084 4R   S10_3    
-        24        303 33101  45621 4L   R4_1     
-        24        304 33101  42623 4R   R1_1     
-        24        305 33101  45626 4L   R4_1     
-        24        306 33101  45204 4R   R3_2     
-        24        307 33101  45631 4L   R4_1     
-        24        308 33101  45211 4R   R3_2     
-        24        309 33101  45636 4L   R4_1     
-        24        310 33101  45209 4R   R3_2     
-        24        311 33101  46257 4L   R4_2     
-        24        312 33101  46283 4R   R4_2     
-        24        313 33101  46261 4L   R4_2     
-        24        314 33101  46288 4R   R4_2     
-        24        315 33101  46266 4L   R4_2     
-        24        316 33101  46296 4R   R4_2     
-        24        317 33101  46271 4L   R4_2     
-        24        318 33101  46301 4R   R4_2     
-        24        319 33101  44675 4L   R3_1     
-        24        320 33101  46293 4R   R4_2     
-        24        321 33101  40057 4L   S10_3    
-        24        322 33101  40088 4R   S10_3    
-        24        323 33101  45622 4L   R4_1     
-        24        324 33101  42635 4R   R1_1     
-        24        325 33101  45627 4L   R4_1     
-        24        326 33101  45205 4R   R3_2     
-        24        327 33101  45632 4L   R4_1     
-        24        328 33101  45212 4R   R3_2     
-        24        329 33101  45637 4L   R4_1     
-        24        330 33101  45210 4R   R3_2     
-        24        331 33101  46258 4L   R4_2     
-        24        332 33101  46284 4R   R4_2     
-        24        333 33101  46262 4L   R4_2     
-        24        334 33101  46289 4R   R4_2     
-        24        335 33101  46267 4L   R4_2     
-        24        336 33101  46297 4R   R4_2     
-        24        337 33101  46272 4L   R4_2     
-        24        338 33101  46302 4R   R4_2     
-        24        339 33101  46276 4L   R4_2     
-        24        340 33101  46294 4R   R4_2     
-        24        341 33101  40687 4L   S10_4    
-        24        342 33101  42158 4R   P19      
-        24        343 33101  45624 4L   R4_1     
-        24        344 33101  44681 4R   R3_1     
-        24        345 33101  45628 4L   R4_1     
-        24        346 33101  45206 4R   R3_2     
-        24        347 33101  45633 4L   R4_1     
-        24        348 33101  45213 4R   R3_2     
-        24        349 33101  45638 4L   R4_1     
-        24        350 33101  45216 4R   R3_2     
-        24        351 33101  46259 4L   R4_2     
-        24        352 33101  46285 4R   R4_2     
-        24        353 33101  46263 4L   R4_2     
-        24        354 33101  46290 4R   R4_2     
-        24        355 33101  46268 4L   R4_2     
-        24        356 33101  46298 4R   R4_2     
-        24        357 33101  46273 4L   R4_2     
-        24        358 33101  46303 4R   R4_2     
-        24        359 33101  46277 4L   R4_2     
-        24        360 33101  46306 4R   R4_2     
-        24        361 33101  41868 4L   P18      
-        24        362 33101  42617 4R   R1_1     
-        24        363 33101  45625 4L   R4_1     
-        24        364 33101  44689 4R   R3_1     
-        24        365 33101  45629 4L   R4_1     
-        24        366 33101  45207 4R   R3_2     
-        24        367 33101  45634 4L   R4_1     
-        24        368 33101  45214 4R   R3_2     
-        24        369 33101  45639 4L   R4_1     
-        24        370 33101  45217 4R   R3_2     
-        24        371 33101  46260 4L   R4_2     
-        24        372 33101  46286 4R   R4_2     
-        24        373 33101  46264 4L   R4_2     
-        24        374 33101  46291 4R   R4_2     
-        24        375 33101  46269 4L   R4_2     
-        24        376 33101  46299 4R   R4_2     
-        24        377 33101  46274 4L   R4_2     
-        24        378 33101  46304 4R   R4_2     
-        24        379 33101  46279 4L   R4_2     
-        24        380 33101  46307 4R   R4_2     
-        24        381 33101  46281 4L   R4_2     
-        24        382 33101  42622 4R   R1_1     
-        24        383 33101  44666 4L   R3_1     
-        24        384 33101  45202 4R   R3_2     
-        24        385 33101  45630 4L   R4_1     
-        24        386 33101  45208 4R   R3_2     
-        24        387 33101  45635 4L   R4_1     
-        24        388 33101  45215 4R   R3_2     
-        24        389 33101  45640 4L   R4_1     
-        24        390 33101  45218 4R   R3_2     
-        24        391 33101  44672 4L   R3_1     
-        24        392 33101  46287 4R   R4_2     
-        24        393 33101  46265 4L   R4_2     
-        24        394 33101  46292 4R   R4_2     
-        24        395 33101  46270 4L   R4_2     
-        24        396 33101  46300 4R   R4_2     
-        24        397 33101  46275 4L   R4_2     
-        24        398 33101  46305 4R   R4_2     
-        24        399 33101  46280 4L   R4_2     
-        24        400 33101  46308 4R   R4_2     
-        24        401 33101  40737 5L   S10_4    
-        24        402 33101  40116 5R   S10_3    
-        24        403 33101  45237 5L   R3_2     
-        24        404 33101  45256 5R   R3_2     
-        24        405 33101  45641 5L   R4_1     
-        24        406 33101  45261 5R   R3_2     
-        24        407 33101  45646 5L   R4_1     
-        24        408 33101  45266 5R   R3_2     
-        24        409 33101  45651 5L   R4_1     
-        24        410 33101  45661 5R   R4_1     
-        24        411 33101  45656 5L   R4_1     
-        24        412 33101  45666 5R   R4_1     
-        24        413 33101  44731 5L   R3_1     
-        24        414 33101  46336 5R   R4_2     
-        24        415 33101  46311 5L   R4_2     
-        24        416 33101  46341 5R   R4_2     
-        24        417 33101  46316 5L   R4_2     
-        24        418 33101  46346 5R   R4_2     
-        24        419 33101  46310 5L   R4_2     
-        24        420 33101  46351 5R   R4_2     
-        24        421 33101  43113 5L   R1_2     
-        24        422 33101  45251 5R   R3_2     
-        24        423 33101  45238 5L   R3_2     
-        24        424 33101  45257 5R   R3_2     
-        24        425 33101  45642 5L   R4_1     
-        24        426 33101  45262 5R   R3_2     
-        24        427 33101  45647 5L   R4_1     
-        24        428 33101  45267 5R   R3_2     
-        24        429 33101  45652 5L   R4_1     
-        24        430 33101  45662 5R   R4_1     
-        24        431 33101  45657 5L   R4_1     
-        24        432 33101  45667 5R   R4_1     
-        24        433 33101  45243 5L   R3_2     
-        24        434 33101  46337 5R   R4_2     
-        24        435 33101  46312 5L   R4_2     
-        24        436 33101  46342 5R   R4_2     
-        24        437 33101  46317 5L   R4_2     
-        24        438 33101  46347 5R   R4_2     
-        24        439 33101  46321 5L   R4_2     
-        24        440 33101  46335 5R   R4_2     
-        24        441 33101  43115 5L   R1_2     
-        24        442 33101  45253 5R   R3_2     
-        24        443 33101  45239 5L   R3_2     
-        24        444 33101  45258 5R   R3_2     
-        24        445 33101  45643 5L   R4_1     
-        24        446 33101  45263 5R   R3_2     
-        24        447 33101  45648 5L   R4_1     
-        24        448 33101  45268 5R   R3_2     
-        24        449 33101  45653 5L   R4_1     
-        24        450 33101  45663 5R   R4_1     
-        24        451 33101  45658 5L   R4_1     
-        24        452 33101  45668 5R   R4_1     
-        24        453 33101  45244 5L   R3_2     
-        24        454 33101  46338 5R   R4_2     
-        24        455 33101  46313 5L   R4_2     
-        24        456 33101  46343 5R   R4_2     
-        24        457 33101  46318 5L   R4_2     
-        24        458 33101  46348 5R   R4_2     
-        24        459 33101  46322 5L   R4_2     
-        24        460 33101  45271 5R   R3_2     
-        24        461 33101  43117 5L   R1_2     
-        24        462 33101  45254 5R   R3_2     
-        24        463 33101  45240 5L   R3_2     
-        24        464 33101  45259 5R   R3_2     
-        24        465 33101  45644 5L   R4_1     
-        24        466 33101  45264 5R   R3_2     
-        24        467 33101  45649 5L   R4_1     
-        24        468 33101  45269 5R   R3_2     
-        24        469 33101  45654 5L   R4_1     
-        24        470 33101  45664 5R   R4_1     
-        24        471 33101  45659 5L   R4_1     
-        24        472 33101  45669 5R   R4_1     
-        24        473 33101  45245 5L   R3_2     
-        24        474 33101  46339 5R   R4_2     
-        24        475 33101  46314 5L   R4_2     
-        24        476 33101  46344 5R   R4_2     
-        24        477 33101  46319 5L   R4_2     
-        24        478 33101  46349 5R   R4_2     
-        24        479 33101  46323 5L   R4_2     
-        24        480 33101  45272 5R   R3_2     
-        24        481 33101  45227 5L   R3_2     
-        24        482 33101  45255 5R   R3_2     
-        24        483 33101  45241 5L   R3_2     
-        24        484 33101  45260 5R   R3_2     
-        24        485 33101  45645 5L   R4_1     
-        24        486 33101  45265 5R   R3_2     
-        24        487 33101  45650 5L   R4_1     
-        24        488 33101  45270 5R   R3_2     
-        24        489 33101  45655 5L   R4_1     
-        24        490 33101  45665 5R   R4_1     
-        24        491 33101  45660 5L   R4_1     
-        24        492 33101  45670 5R   R4_1     
-        24        493 33101  46309 5L   R4_2     
-        24        494 33101  46340 5R   R4_2     
-        24        495 33101  46315 5L   R4_2     
-        24        496 33101  46345 5R   R4_2     
-        24        497 33101  46320 5L   R4_2     
-        24        498 33101  46350 5R   R4_2     
-        24        499 33101  46324 5L   R4_2     
-        24        500 33101  46353 5R   R4_2     
-        24        501 33101  47026 6L   R5_1     
-        24        502 33101  47048 6R   R5_1     
-        24        503 33101  47021 6L   R5_1     
-        24        504 33101  45851 6R   R4_1     
-        24        505 33101  46366 6L   R4_2     
-        24        506 33101  45846 6R   R4_1     
-        24        507 33101  46371 6L   R4_2     
-        24        508 33101  47053 6R   R5_1     
-        24        509 33101  46376 6L   R4_2     
-        24        510 33101  46382 6R   R4_2     
-        24        511 33101  47041 6L   R5_1     
-        24        512 33101  47058 6R   R5_1     
-        24        513 33101  47036 6L   R5_1     
-        24        514 33101  47063 6R   R5_1     
-        24        515 33101  46361 6L   R4_2     
-        24        516 33101  46381 6R   R4_2     
-        24        517 33101  45836 6L   R4_1     
-        24        518 33101  46391 6R   R4_2     
-        24        519 33101  45841 6L   R4_1     
-        24        520 33101  46386 6R   R4_2     
-        24        521 33101  47027 6L   R5_1     
-        24        522 33101  47049 6R   R5_1     
-        24        523 33101  47022 6L   R5_1     
-        24        524 33101  45852 6R   R4_1     
-        24        525 33101  46367 6L   R4_2     
-        24        526 33101  45847 6R   R4_1     
-        24        527 33101  46372 6L   R4_2     
-        24        528 33101  47054 6R   R5_1     
-        24        529 33101  46377 6L   R4_2     
-        24        530 33101  46387 6R   R4_2     
-        24        531 33101  47042 6L   R5_1     
-        24        532 33101  47059 6R   R5_1     
-        24        533 33101  47037 6L   R5_1     
-        24        534 33101  47064 6R   R5_1     
-        24        535 33101  46362 6L   R4_2     
-        24        536 33101  46396 6R   R4_2     
-        24        537 33101  45837 6L   R4_1     
-        24        538 33101  46392 6R   R4_2     
-        24        539 33101  45842 6L   R4_1     
-        24        540 33101  46397 6R   R4_2     
-        24        541 33101  47028 6L   R5_1     
-        24        542 33101  47050 6R   R5_1     
-        24        543 33101  47023 6L   R5_1     
-        24        544 33101  45853 6R   R4_1     
-        24        545 33101  46368 6L   R4_2     
-        24        546 33101  45848 6R   R4_1     
-        24        547 33101  46373 6L   R4_2     
-        24        548 33101  47055 6R   R5_1     
-        24        549 33101  46378 6L   R4_2     
-        24        550 33101  46398 6R   R4_2     
-        24        551 33101  47043 6L   R5_1     
-        24        552 33101  47060 6R   R5_1     
-        24        553 33101  47038 6L   R5_1     
-        24        554 33101  47065 6R   R5_1     
-        24        555 33101  46363 6L   R4_2     
-        24        556 33101  46383 6R   R4_2     
-        24        557 33101  45838 6L   R4_1     
-        24        558 33101  46393 6R   R4_2     
-        24        559 33101  45843 6L   R4_1     
-        24        560 33101  46388 6R   R4_2     
-        24        561 33101  47029 6L   R5_1     
-        24        562 33101  47051 6R   R5_1     
-        24        563 33101  47024 6L   R5_1     
-        24        564 33101  45854 6R   R4_1     
-        24        565 33101  46369 6L   R4_2     
-        24        566 33101  45849 6R   R4_1     
-        24        567 33101  46374 6L   R4_2     
-        24        568 33101  47056 6R   R5_1     
-        24        569 33101  46379 6L   R4_2     
-        24        570 33101  46399 6R   R4_2     
-        24        571 33101  47044 6L   R5_1     
-        24        572 33101  47061 6R   R5_1     
-        24        573 33101  47039 6L   R5_1     
-        24        574 33101  47066 6R   R5_1     
-        24        575 33101  46364 6L   R4_2     
-        24        576 33101  46384 6R   R4_2     
-        24        577 33101  45839 6L   R4_1     
-        24        578 33101  46394 6R   R4_2     
-        24        579 33101  45844 6L   R4_1     
-        24        580 33101  46389 6R   R4_2     
-        24        581 33101  47030 6L   R5_1     
-        24        582 33101  47062 6R   R5_1     
-        24        583 33101  47025 6L   R5_1     
-        24        584 33101  45855 6R   R4_1     
-        24        585 33101  46370 6L   R4_2     
-        24        586 33101  45850 6R   R4_1     
-        24        587 33101  46375 6L   R4_2     
-        24        588 33101  47057 6R   R5_1     
-        24        589 33101  46380 6L   R4_2     
-        24        590 33101  46400 6R   R4_2     
-        24        591 33101  47045 6L   R5_1     
-        24        592 33101  47052 6R   R5_1     
-        24        593 33101  47040 6L   R5_1     
-        24        594 33101  47067 6R   R5_1     
-        24        595 33101  46365 6L   R4_2     
-        24        596 33101  46385 6R   R4_2     
-        24        597 33101  45840 6L   R4_1     
-        24        598 33101  46395 6R   R4_2     
-        24        599 33101  45845 6L   R4_1     
-        24        600 33101  46390 6R   R4_2     
-        24        601 33101  47087 7L   R5_1     
-        24        602 33101  47104 7R   R5_1     
-        24        603 33101  45871 7L   R4_1     
-        24        604 33101  45876 7R   R4_1     
-        24        605 33101  46411 7L   R4_2     
-        24        606 33101  47109 7R   R5_1     
-        24        607 33101  46406 7L   R4_2     
-        24        608 33101  46421 7R   R4_2     
-        24        609 33101  46416 7L   R4_2     
-        24        610 33101  46431 7R   R4_2     
-        24        611 33101  47082 7L   R5_1     
-        24        612 33101  47099 7R   R5_1     
-        24        613 33101  47077 7L   R5_1     
-        24        614 33101  47094 7R   R5_1     
-        24        615 33101  47072 7L   R5_1     
-        24        616 33101  47089 7R   R5_1     
-        24        617 33101  45866 7L   R4_1     
-        24        618 33101  46436 7R   R4_2     
-        24        619 33101  46401 7L   R4_2     
-        24        620 33101  46426 7R   R4_2     
-        24        621 33101  47088 7L   R5_1     
-        24        622 33101  47105 7R   R5_1     
-        24        623 33101  45872 7L   R4_1     
-        24        624 33101  45878 7R   R4_1     
-        24        625 33101  46412 7L   R4_2     
-        24        626 33101  47110 7R   R5_1     
-        24        627 33101  46407 7L   R4_2     
-        24        628 33101  46422 7R   R4_2     
-        24        629 33101  46417 7L   R4_2     
-        24        630 33101  46432 7R   R4_2     
-        24        631 33101  47083 7L   R5_1     
-        24        632 33101  47100 7R   R5_1     
-        24        633 33101  47078 7L   R5_1     
-        24        634 33101  47095 7R   R5_1     
-        24        635 33101  47073 7L   R5_1     
-        24        636 33101  47090 7R   R5_1     
-        24        637 33101  45867 7L   R4_1     
-        24        638 33101  46437 7R   R4_2     
-        24        639 33101  46402 7L   R4_2     
-        24        640 33101  46427 7R   R4_2     
-        24        641 33101  39538 7L   S10-1    
-        24        642 33101  47106 7R   R5_1     
-        24        643 33101  45873 7L   R4_1     
-        24        644 33101  45879 7R   R4_1     
-        24        645 33101  46413 7L   R4_2     
-        24        646 33101  47111 7R   R5_1     
-        24        647 33101  46408 7L   R4_2     
-        24        648 33101  46423 7R   R4_2     
-        24        649 33101  46418 7L   R4_2     
-        24        650 33101  46433 7R   R4_2     
-        24        651 33101  47084 7L   R5_1     
-        24        652 33101  47101 7R   R5_1     
-        24        653 33101  47079 7L   R5_1     
-        24        654 33101  47096 7R   R5_1     
-        24        655 33101  47074 7L   R5_1     
-        24        656 33101  47091 7R   R5_1     
-        24        657 33101  45868 7L   R4_1     
-        24        658 33101  46438 7R   R4_2     
-        24        659 33101  46403 7L   R4_2     
-        24        660 33101  46428 7R   R4_2     
-        24        661 33101  39539 7L   S10-1    
-        24        662 33101  47107 7R   R5_1     
-        24        663 33101  45874 7L   R4_1     
-        24        664 33101  45880 7R   R4_1     
-        24        665 33101  46414 7L   R4_2     
-        24        666 33101  47112 7R   R5_1     
-        24        667 33101  46409 7L   R4_2     
-        24        668 33101  46424 7R   R4_2     
-        24        669 33101  46419 7L   R4_2     
-        24        670 33101  46434 7R   R4_2     
-        24        671 33101  47085 7L   R5_1     
-        24        672 33101  47102 7R   R5_1     
-        24        673 33101  47080 7L   R5_1     
-        24        674 33101  47097 7R   R5_1     
-        24        675 33101  47075 7L   R5_1     
-        24        676 33101  47092 7R   R5_1     
-        24        677 33101  45869 7L   R4_1     
-        24        678 33101  46439 7R   R4_2     
-        24        679 33101  46404 7L   R4_2     
-        24        680 33101  46429 7R   R4_2     
-        24        681 33101  44944 7L   R3_1     
-        24        682 33101  47108 7R   R5_1     
-        24        683 33101  45875 7L   R4_1     
-        24        684 33101  45881 7R   R4_1     
-        24        685 33101  46415 7L   R4_2     
-        24        686 33101  47113 7R   R5_1     
-        24        687 33101  46410 7L   R4_2     
-        24        688 33101  46425 7R   R4_2     
-        24        689 33101  46420 7L   R4_2     
-        24        690 33101  46435 7R   R4_2     
-        24        691 33101  47086 7L   R5_1     
-        24        692 33101  47103 7R   R5_1     
-        24        693 33101  47081 7L   R5_1     
-        24        694 33101  47098 7R   R5_1     
-        24        695 33101  47076 7L   R5_1     
-        24        696 33101  47093 7R   R5_1     
-        24        697 33101  45870 7L   R4_1     
-        24        698 33101  46440 7R   R4_2     
-        24        699 33101  46405 7L   R4_2     
-        24        700 33101  46430 7R   R4_2     
-        24        701 33101  45891 8L   R4_1     
-        24        702 33101  45912 8R   R4_1     
-        24        703 33101  47139 8L   R5_1     
-        24        704 33101  45906 8R   R4_1     
-        24        705 33101  47134 8L   R5_1     
-        24        706 33101  47161 8R   R5_1     
-        24        707 33101  47119 8L   R5_1     
-        24        708 33101  47146 8R   R5_1     
-        24        709 33101  47114 8L   R5_1     
-        24        710 33101  47141 8R   R5_1     
-        24        711 33101  47129 8L   R5_1     
-        24        712 33101  47156 8R   R5_1     
-        24        713 33101  47124 8L   R5_1     
-        24        714 33101  47151 8R   R5_1     
-        24        715 33101  46456 8L   R4_2     
-        24        716 33101  46476 8R   R4_2     
-        24        717 33101  46451 8L   R4_2     
-        24        718 33101  46471 8R   R4_2     
-        24        719 33101  46441 8L   R4_2     
-        24        720 33101  46466 8R   R4_2     
-        24        721 33101  45892 8L   R4_1     
-        24        722 33101  45913 8R   R4_1     
-        24        723 33101  47140 8L   R5_1     
-        24        724 33101  45908 8R   R4_1     
-        24        725 33101  47135 8L   R5_1     
-        24        726 33101  47162 8R   R5_1     
-        24        727 33101  47120 8L   R5_1     
-        24        728 33101  47147 8R   R5_1     
-        24        729 33101  47115 8L   R5_1     
-        24        730 33101  47142 8R   R5_1     
-        24        731 33101  47130 8L   R5_1     
-        24        732 33101  47157 8R   R5_1     
-        24        733 33101  47125 8L   R5_1     
-        24        734 33101  47152 8R   R5_1     
-        24        735 33101  46457 8L   R4_2     
-        24        736 33101  46477 8R   R4_2     
-        24        737 33101  46452 8L   R4_2     
-        24        738 33101  46472 8R   R4_2     
-        24        739 33101  46442 8L   R4_2     
-        24        740 33101  46467 8R   R4_2     
-        24        741 33101  45893 8L   R4_1     
-        24        742 33101  45914 8R   R4_1     
-        24        743 33101  39540 8L   S10-1    
-        24        744 33101  45909 8R   R4_1     
-        24        745 33101  47136 8L   R5_1     
-        24        746 33101  47163 8R   R5_1     
-        24        747 33101  47121 8L   R5_1     
-        24        748 33101  47148 8R   R5_1     
-        24        749 33101  47116 8L   R5_1     
-        24        750 33101  47143 8R   R5_1     
-        24        751 33101  47131 8L   R5_1     
-        24        752 33101  47158 8R   R5_1     
-        24        753 33101  47126 8L   R5_1     
-        24        754 33101  47153 8R   R5_1     
-        24        755 33101  46458 8L   R4_2     
-        24        756 33101  46478 8R   R4_2     
-        24        757 33101  46453 8L   R4_2     
-        24        758 33101  46473 8R   R4_2     
-        24        759 33101  46443 8L   R4_2     
-        24        760 33101  43519 8R   R2_1     
-        24        761 33101  45894 8L   R4_1     
-        24        762 33101  45915 8R   R4_1     
-        24        763 33101  43218 8L   R1_2     
-        24        764 33101  45910 8R   R4_1     
-        24        765 33101  47137 8L   R5_1     
-        24        766 33101  47164 8R   R5_1     
-        24        767 33101  47122 8L   R5_1     
-        24        768 33101  47149 8R   R5_1     
-        24        769 33101  47117 8L   R5_1     
-        24        770 33101  47144 8R   R5_1     
-        24        771 33101  47132 8L   R5_1     
-        24        772 33101  47159 8R   R5_1     
-        24        773 33101  47127 8L   R5_1     
-        24        774 33101  47154 8R   R5_1     
-        24        775 33101  46459 8L   R4_2     
-        24        776 33101  46479 8R   R4_2     
-        24        777 33101  46454 8L   R4_2     
-        24        778 33101  46474 8R   R4_2     
-        24        779 33101  46444 8L   R4_2     
-        24        780 33101  46469 8R   R4_2     
-        24        781 33101  45895 8L   R4_1     
-        24        782 33101  45916 8R   R4_1     
-        24        783 33101  43226 8L   R1_2     
-        24        784 33101  45911 8R   R4_1     
-        24        785 33101  47138 8L   R5_1     
-        24        786 33101  47165 8R   R5_1     
-        24        787 33101  47123 8L   R5_1     
-        24        788 33101  47150 8R   R5_1     
-        24        789 33101  47118 8L   R5_1     
-        24        790 33101  47145 8R   R5_1     
-        24        791 33101  47133 8L   R5_1     
-        24        792 33101  47160 8R   R5_1     
-        24        793 33101  47128 8L   R5_1     
-        24        794 33101  47155 8R   R5_1     
-        24        795 33101  46460 8L   R4_2     
-        24        796 33101  46480 8R   R4_2     
-        24        797 33101  46455 8L   R4_2     
-        24        798 33101  46475 8R   R4_2     
-        24        799 33101  46445 8L   R4_2     
-        24        800 33101  46470 8R   R4_2     
-        24        801 33101  46481 9L   R4_2     
-        24        802 33101  47217 9R   R5_1     
-        24        803 33101  45926 9L   R4_1     
-        24        804 33101  47207 9R   R5_1     
-        24        805 33101  45921 9L   R4_1     
-        24        806 33101  47202 9R   R5_1     
-        24        807 33101  44999 9L   R3_1     
-        24        808 33101  47197 9R   R5_1     
-        24        809 33101  46496 9L   R4_2     
-        24        810 33101  45941 9R   R4_1     
-        24        811 33101  47177 9L   R5_1     
-        24        812 33101  47192 9R   R5_1     
-        24        813 33101  47172 9L   R5_1     
-        24        814 33101  47187 9R   R5_1     
-        24        815 33101  47167 9L   R5_1     
-        24        816 33101  47182 9R   R5_1     
-        24        817 33101  46491 9L   R4_2     
-        24        818 33101  46521 9R   R4_2     
-        24        819 33101  46486 9L   R4_2     
-        24        820 33101  46526 9R   R4_2     
-        24        821 33101  45932 9L   R4_1     
-        24        822 33101  47218 9R   R5_1     
-        24        823 33101  45927 9L   R4_1     
-        24        824 33101  47208 9R   R5_1     
-        24        825 33101  45922 9L   R4_1     
-        24        826 33101  47203 9R   R5_1     
-        24        827 33101  46482 9L   R4_2     
-        24        828 33101  47198 9R   R5_1     
-        24        829 33101  46497 9L   R4_2     
-        24        830 33101  45942 9R   R4_1     
-        24        831 33101  47178 9L   R5_1     
-        24        832 33101  47193 9R   R5_1     
-        24        833 33101  47173 9L   R5_1     
-        24        834 33101  47188 9R   R5_1     
-        24        835 33101  47168 9L   R5_1     
-        24        836 33101  47183 9R   R5_1     
-        24        837 33101  46492 9L   R4_2     
-        24        838 33101  46522 9R   R4_2     
-        24        839 33101  46487 9L   R4_2     
-        24        840 33101  46527 9R   R4_2     
-        24        841 33101  45933 9L   R4_1     
-        24        842 33101  47219 9R   R5_1     
-        24        843 33101  45928 9L   R4_1     
-        24        844 33101  47209 9R   R5_1     
-        24        845 33101  45923 9L   R4_1     
-        24        846 33101  47204 9R   R5_1     
-        24        847 33101  46483 9L   R4_2     
-        24        848 33101  47199 9R   R5_1     
-        24        849 33101  46498 9L   R4_2     
-        24        850 33101  45943 9R   R4_1     
-        24        851 33101  47179 9L   R5_1     
-        24        852 33101  47194 9R   R5_1     
-        24        853 33101  47174 9L   R5_1     
-        24        854 33101  47189 9R   R5_1     
-        24        855 33101  47169 9L   R5_1     
-        24        856 33101  47184 9R   R5_1     
-        24        857 33101  46493 9L   R4_2     
-        24        858 33101  46523 9R   R4_2     
-        24        859 33101  46488 9L   R4_2     
-        24        860 33101  46528 9R   R4_2     
-        24        861 33101  45934 9L   R4_1     
-        24        862 33101  47220 9R   R5_1     
-        24        863 33101  45929 9L   R4_1     
-        24        864 33101  47210 9R   R5_1     
-        24        865 33101  45924 9L   R4_1     
-        24        866 33101  47205 9R   R5_1     
-        24        867 33101  46484 9L   R4_2     
-        24        868 33101  47200 9R   R5_1     
-        24        869 33101  46499 9L   R4_2     
-        24        870 33101  45944 9R   R4_1     
-        24        871 33101  47180 9L   R5_1     
-        24        872 33101  47195 9R   R5_1     
-        24        873 33101  47175 9L   R5_1     
-        24        874 33101  47190 9R   R5_1     
-        24        875 33101  47170 9L   R5_1     
-        24        876 33101  47185 9R   R5_1     
-        24        877 33101  46494 9L   R4_2     
-        24        878 33101  46524 9R   R4_2     
-        24        879 33101  46489 9L   R4_2     
-        24        880 33101  46529 9R   R4_2     
-        24        881 33101  45935 9L   R4_1     
-        24        882 33101  47221 9R   R5_1     
-        24        883 33101  45930 9L   R4_1     
-        24        884 33101  47211 9R   R5_1     
-        24        885 33101  45925 9L   R4_1     
-        24        886 33101  47206 9R   R5_1     
-        24        887 33101  46485 9L   R4_2     
-        24        888 33101  47212 9R   R5_1     
-        24        889 33101  46500 9L   R4_2     
-        24        890 33101  45945 9R   R4_1     
-        24        891 33101  47181 9L   R5_1     
-        24        892 33101  47196 9R   R5_1     
-        24        893 33101  47176 9L   R5_1     
-        24        894 33101  47191 9R   R5_1     
-        24        895 33101  47171 9L   R5_1     
-        24        896 33101  47186 9R   R5_1     
-        24        897 33101  46495 9L   R4_2     
-        24        898 33101  46525 9R   R4_2     
-        24        899 33101  46490 9L   R4_2     
-        24        900 33101  46530 9R   R4_2     
-        24        901 33101  47541 10L  R5_2     
-        24        902 33101  47563 10R  R5_2     
-        24        903 33101  47531 10L  R5_2     
-        24        904 33101  47568 10R  R5_2     
-        24        905 33101  47556 10L  R5_2     
-        24        906 33101  47578 10R  R5_2     
-        24        907 33101  47551 10L  R5_2     
-        24        908 33101  47573 10R  R5_2     
-        24        909 33101  46541 10L  R4_2     
-        24        910 33101  46556 10R  R4_2     
-        24        911 33101  44404 10L  R2_2     
-        24        912 33101  45338 10R  R3_2     
-        24        913 33101  46536 10L  R4_2     
-        24        914 33101  45311 10R  R3_2     
-        24        915 33101  46546 10L  R4_2     
-        24        916 33101  46561 10R  R4_2     
-        24        917 33101  46551 10L  R4_2     
-        24        918 33101  46566 10R  R4_2     
-        24        919 33101  46531 10L  R4_2     
-        24        920 33101  46571 10R  R4_2     
-        24        921 33101  47542 10L  R5_2     
-        24        922 33101  47564 10R  R5_2     
-        24        923 33101  47532 10L  R5_2     
-        24        924 33101  47569 10R  R5_2     
-        24        925 33101  47557 10L  R5_2     
-        24        926 33101  47579 10R  R5_2     
-        24        927 33101  47552 10L  R5_2     
-        24        928 33101  47574 10R  R5_2     
-        24        929 33101  46542 10L  R4_2     
-        24        930 33101  46557 10R  R4_2     
-        24        931 33101  45273 10L  R3_2     
-        24        932 33101  45339 10R  R3_2     
-        24        933 33101  46537 10L  R4_2     
-        24        934 33101  45312 10R  R3_2     
-        24        935 33101  46547 10L  R4_2     
-        24        936 33101  46562 10R  R4_2     
-        24        937 33101  46552 10L  R4_2     
-        24        938 33101  46567 10R  R4_2     
-        24        939 33101  46532 10L  R4_2     
-        24        940 33101  46572 10R  R4_2     
-        24        941 33101  47543 10L  R5_2     
-        24        942 33101  47565 10R  R5_2     
-        24        943 33101  47533 10L  R5_2     
-        24        944 33101  47570 10R  R5_2     
-        24        945 33101  47558 10L  R5_2     
-        24        946 33101  47580 10R  R5_2     
-        24        947 33101  47553 10L  R5_2     
-        24        948 33101  47575 10R  R5_2     
-        24        949 33101  46543 10L  R4_2     
-        24        950 33101  46558 10R  R4_2     
-        24        951 33101  45277 10L  R3_2     
-        24        952 33101  45340 10R  R3_2     
-        24        953 33101  46538 10L  R4_2     
-        24        954 33101  45313 10R  R3_2     
-        24        955 33101  46548 10L  R4_2     
-        24        956 33101  46563 10R  R4_2     
-        24        957 33101  46553 10L  R4_2     
-        24        958 33101  46568 10R  R4_2     
-        24        959 33101  46533 10L  R4_2     
-        24        960 33101  46573 10R  R4_2     
-        24        961 33101  47544 10L  R5_2     
-        24        962 33101  47566 10R  R5_2     
-        24        963 33101  47534 10L  R5_2     
-        24        964 33101  47571 10R  R5_2     
-        24        965 33101  47559 10L  R5_2     
-        24        966 33101  47581 10R  R5_2     
-        24        967 33101  47554 10L  R5_2     
-        24        968 33101  47576 10R  R5_2     
-        24        969 33101  46544 10L  R4_2     
-        24        970 33101  46559 10R  R4_2     
-        24        971 33101  45279 10L  R3_2     
-        24        972 33101  45341 10R  R3_2     
-        24        973 33101  46539 10L  R4_2     
-        24        974 33101  45314 10R  R3_2     
-        24        975 33101  46549 10L  R4_2     
-        24        976 33101  46564 10R  R4_2     
-        24        977 33101  46554 10L  R4_2     
-        24        978 33101  46569 10R  R4_2     
-        24        979 33101  46534 10L  R4_2     
-        24        980 33101  46574 10R  R4_2     
-        24        981 33101  47545 10L  R5_2     
-        24        982 33101  47567 10R  R5_2     
-        24        983 33101  47535 10L  R5_2     
-        24        984 33101  47572 10R  R5_2     
-        24        985 33101  47560 10L  R5_2     
-        24        986 33101  47582 10R  R5_2     
-        24        987 33101  47555 10L  R5_2     
-        24        988 33101  47577 10R  R5_2     
-        24        989 33101  46545 10L  R4_2     
-        24        990 33101  46560 10R  R4_2     
-        24        991 33101  45280 10L  R3_2     
-        24        992 33101  45342 10R  R3_2     
-        24        993 33101  46540 10L  R4_2     
-        24        994 33101  45315 10R  R3_2     
-        24        995 33101  46550 10L  R4_2     
-        24        996 33101  46565 10R  R4_2     
-        24        997 33101  46555 10L  R4_2     
-        24        998 33101  46570 10R  R4_2     
-        24        999 33101  46535 10L  R4_2     
-        24       1000 33101  46575 10R  R4_2     
-        24       1001 33101  47620 11L  R5_2     
-        24       1002 33101  47647 11R  R5_2     
-        24       1003 33101  47615 11L  R5_2     
-        24       1004 33101  47642 11R  R5_2     
-        24       1005 33101  47610 11L  R5_2     
-        24       1006 33101  47637 11R  R5_2     
-        24       1007 33101  47605 11L  R5_2     
-        24       1008 33101  47632 11R  R5_2     
-        24       1009 33101  47595 11L  R5_2     
-        24       1010 33101  47627 11R  R5_2     
-        24       1011 33101  46586 11L  R4_2     
-        24       1012 33101  45406 11R  R3_2     
-        24       1013 33101  46581 11L  R4_2     
-        24       1014 33101  45401 11R  R3_2     
-        24       1015 33101  46576 11L  R4_2     
-        24       1016 33101  45396 11R  R3_2     
-        24       1017 33101  45372 11L  R3_2     
-        24       1018 33101  46596 11R  R4_2     
-        24       1019 33101  45344 11L  R3_2     
-        24       1020 33101  46591 11R  R4_2     
-        24       1021 33101  47621 11L  R5_2     
-        24       1022 33101  47648 11R  R5_2     
-        24       1023 33101  47616 11L  R5_2     
-        24       1024 33101  47643 11R  R5_2     
-        24       1025 33101  47611 11L  R5_2     
-        24       1026 33101  47638 11R  R5_2     
-        24       1027 33101  47606 11L  R5_2     
-        24       1028 33101  47633 11R  R5_2     
-        24       1029 33101  47596 11L  R5_2     
-        24       1030 33101  47628 11R  R5_2     
-        24       1031 33101  46587 11L  R4_2     
-        24       1032 33101  45407 11R  R3_2     
-        24       1033 33101  46582 11L  R4_2     
-        24       1034 33101  45402 11R  R3_2     
-        24       1035 33101  46577 11L  R4_2     
-        24       1036 33101  45397 11R  R3_2     
-        24       1037 33101  45374 11L  R3_2     
-        24       1038 33101  46597 11R  R4_2     
-        24       1039 33101  45345 11L  R3_2     
-        24       1040 33101  46592 11R  R4_2     
-        24       1041 33101  47622 11L  R5_2     
-        24       1042 33101  47649 11R  R5_2     
-        24       1043 33101  47617 11L  R5_2     
-        24       1044 33101  47644 11R  R5_2     
-        24       1045 33101  47612 11L  R5_2     
-        24       1046 33101  47639 11R  R5_2     
-        24       1047 33101  47607 11L  R5_2     
-        24       1048 33101  47634 11R  R5_2     
-        24       1049 33101  47597 11L  R5_2     
-        24       1050 33101  47629 11R  R5_2     
-        24       1051 33101  46588 11L  R4_2     
-        24       1052 33101  45408 11R  R3_2     
-        24       1053 33101  46583 11L  R4_2     
-        24       1054 33101  45403 11R  R3_2     
-        24       1055 33101  46578 11L  R4_2     
-        24       1056 33101  45398 11R  R3_2     
-        24       1057 33101  45375 11L  R3_2     
-        24       1058 33101  46598 11R  R4_2     
-        24       1059 33101  45346 11L  R3_2     
-        24       1060 33101  46593 11R  R4_2     
-        24       1061 33101  47623 11L  R5_2     
-        24       1062 33101  47650 11R  R5_2     
-        24       1063 33101  47618 11L  R5_2     
-        24       1064 33101  47645 11R  R5_2     
-        24       1065 33101  47613 11L  R5_2     
-        24       1066 33101  47640 11R  R5_2     
-        24       1067 33101  47608 11L  R5_2     
-        24       1068 33101  47635 11R  R5_2     
-        24       1069 33101  47598 11L  R5_2     
-        24       1070 33101  47630 11R  R5_2     
-        24       1071 33101  46589 11L  R4_2     
-        24       1072 33101  45409 11R  R3_2     
-        24       1073 33101  46584 11L  R4_2     
-        24       1074 33101  45404 11R  R3_2     
-        24       1075 33101  46579 11L  R4_2     
-        24       1076 33101  45399 11R  R3_2     
-        24       1077 33101  45376 11L  R3_2     
-        24       1078 33101  46599 11R  R4_2     
-        24       1079 33101  45348 11L  R3_2     
-        24       1080 33101  46594 11R  R4_2     
-        24       1081 33101  47624 11L  R5_2     
-        24       1082 33101  47651 11R  R5_2     
-        24       1083 33101  47619 11L  R5_2     
-        24       1084 33101  47646 11R  R5_2     
-        24       1085 33101  47614 11L  R5_2     
-        24       1086 33101  47641 11R  R5_2     
-        24       1087 33101  47609 11L  R5_2     
-        24       1088 33101  47636 11R  R5_2     
-        24       1089 33101  47599 11L  R5_2     
-        24       1090 33101  47631 11R  R5_2     
-        24       1091 33101  46590 11L  R4_2     
-        24       1092 33101  45410 11R  R3_2     
-        24       1093 33101  46585 11L  R4_2     
-        24       1094 33101  45405 11R  R3_2     
-        24       1095 33101  46580 11L  R4_2     
-        24       1096 33101  45400 11R  R3_2     
-        24       1097 33101  45377 11L  R3_2     
-        24       1098 33101  46600 11R  R4_2     
-        24       1099 33101  45349 11L  R3_2     
-        24       1100 33101  46595 11R  R4_2     
-        24       1101 33101  47687 12L  R5_2     
-        24       1102 33101  47719 12R  R5_2     
-        24       1103 33101  47672 12L  R5_2     
-        24       1104 33101  47714 12R  R5_2     
-        24       1105 33101  47677 12L  R5_2     
-        24       1106 33101  47709 12R  R5_2     
-        24       1107 33101  47667 12L  R5_2     
-        24       1108 33101  47704 12R  R5_2     
-        24       1109 33101  47662 12L  R5_2     
-        24       1110 33101  47694 12R  R5_2     
-        24       1111 33101  46606 12L  R4_2     
-        24       1112 33101  46621 12R  R4_2     
-        24       1113 33101  46601 12L  R4_2     
-        24       1114 33101  45477 12R  R3_2     
-        24       1115 33101  46616 12L  R4_2     
-        24       1116 33101  46631 12R  R4_2     
-        24       1117 33101  46611 12L  R4_2     
-        24       1118 33101  46626 12R  R4_2     
-        24       1119 33101  45422 12L  R3_2     
-        24       1120 33101  45452 12R  R3_2     
-        24       1121 33101  47688 12L  R5_2     
-        24       1122 33101  47720 12R  R5_2     
-        24       1123 33101  47682 12L  R5_2     
-        24       1124 33101  47715 12R  R5_2     
-        24       1125 33101  47678 12L  R5_2     
-        24       1126 33101  47710 12R  R5_2     
-        24       1127 33101  47668 12L  R5_2     
-        24       1128 33101  47705 12R  R5_2     
-        24       1129 33101  47663 12L  R5_2     
-        24       1130 33101  47695 12R  R5_2     
-        24       1131 33101  46607 12L  R4_2     
-        24       1132 33101  46622 12R  R4_2     
-        24       1133 33101  46602 12L  R4_2     
-        24       1134 33101  45478 12R  R3_2     
-        24       1135 33101  46617 12L  R4_2     
-        24       1136 33101  46632 12R  R4_2     
-        24       1137 33101  46612 12L  R4_2     
-        24       1138 33101  46627 12R  R4_2     
-        24       1139 33101  45424 12L  R3_2     
-        24       1140 33101  45453 12R  R3_2     
-        24       1141 33101  47689 12L  R5_2     
-        24       1142 33101  47721 12R  R5_2     
-        24       1143 33101  47683 12L  R5_2     
-        24       1144 33101  47716 12R  R5_2     
-        24       1145 33101  47679 12L  R5_2     
-        24       1146 33101  47711 12R  R5_2     
-        24       1147 33101  47669 12L  R5_2     
-        24       1148 33101  47706 12R  R5_2     
-        24       1149 33101  47664 12L  R5_2     
-        24       1150 33101  47696 12R  R5_2     
-        24       1151 33101  46608 12L  R4_2     
-        24       1152 33101  46623 12R  R4_2     
-        24       1153 33101  46603 12L  R4_2     
-        24       1154 33101  45479 12R  R3_2     
-        24       1155 33101  46618 12L  R4_2     
-        24       1156 33101  46633 12R  R4_2     
-        24       1157 33101  46613 12L  R4_2     
-        24       1158 33101  46628 12R  R4_2     
-        24       1159 33101  45425 12L  R3_2     
-        24       1160 33101  45454 12R  R3_2     
-        24       1161 33101  47690 12L  R5_2     
-        24       1162 33101  47722 12R  R5_2     
-        24       1163 33101  47685 12L  R5_2     
-        24       1164 33101  47717 12R  R5_2     
-        24       1165 33101  47680 12L  R5_2     
-        24       1166 33101  47712 12R  R5_2     
-        24       1167 33101  47670 12L  R5_2     
-        24       1168 33101  47707 12R  R5_2     
-        24       1169 33101  47665 12L  R5_2     
-        24       1170 33101  47697 12R  R5_2     
-        24       1171 33101  46609 12L  R4_2     
-        24       1172 33101  46624 12R  R4_2     
-        24       1173 33101  46604 12L  R4_2     
-        24       1174 33101  45480 12R  R3_2     
-        24       1175 33101  46619 12L  R4_2     
-        24       1176 33101  46634 12R  R4_2     
-        24       1177 33101  46614 12L  R4_2     
-        24       1178 33101  46629 12R  R4_2     
-        24       1179 33101  45426 12L  R3_2     
-        24       1180 33101  45455 12R  R3_2     
-        24       1181 33101  47691 12L  R5_2     
-        24       1182 33101  47723 12R  R5_2     
-        24       1183 33101  47686 12L  R5_2     
-        24       1184 33101  47718 12R  R5_2     
-        24       1185 33101  47681 12L  R5_2     
-        24       1186 33101  47713 12R  R5_2     
-        24       1187 33101  47671 12L  R5_2     
-        24       1188 33101  47708 12R  R5_2     
-        24       1189 33101  47666 12L  R5_2     
-        24       1190 33101  47698 12R  R5_2     
-        24       1191 33101  46610 12L  R4_2     
-        24       1192 33101  46625 12R  R4_2     
-        24       1193 33101  46605 12L  R4_2     
-        24       1194 33101  45481 12R  R3_2     
-        24       1195 33101  46620 12L  R4_2     
-        24       1196 33101  46635 12R  R4_2     
-        24       1197 33101  46615 12L  R4_2     
-        24       1198 33101  46630 12R  R4_2     
-        24       1199 33101  45427 12L  R3_2     
-        24       1200 33101  45456 12R  R3_2     
-        24       1201 33101  47746 13L  R5_2     
-        24       1202 33101  47784 13R  R5_2     
-        24       1203 33101  47741 13L  R5_2     
-        24       1204 33101  47781 13R  R5_2     
-        24       1205 33101  47736 13L  R5_2     
-        24       1206 33101  47774 13R  R5_2     
-        24       1207 33101  47731 13L  R5_2     
-        24       1208 33101  47769 13R  R5_2     
-        24       1209 33101  47726 13L  R5_2     
-        24       1210 33101  47759 13R  R5_2     
-        24       1211 33101  46651 13L  R4_2     
-        24       1212 33101  45545 13R  R3_2     
-        24       1213 33101  46646 13L  R4_2     
-        24       1214 33101  46656 13R  R4_2     
-        24       1215 33101  46641 13L  R4_2     
-        24       1216 33101  46666 13R  R4_2     
-        24       1217 33101  46636 13L  R4_2     
-        24       1218 33101  46661 13R  R4_2     
-        24       1219 33101  45508 13L  R3_2     
-        24       1220 33101  45540 13R  R3_2     
-        24       1221 33101  47747 13L  R5_2     
-        24       1222 33101  47785 13R  R5_2     
-        24       1223 33101  47742 13L  R5_2     
-        24       1224 33101  47764 13R  R5_2     
-        24       1225 33101  47737 13L  R5_2     
-        24       1226 33101  47775 13R  R5_2     
-        24       1227 33101  47732 13L  R5_2     
-        24       1228 33101  47770 13R  R5_2     
-        24       1229 33101  47727 13L  R5_2     
-        24       1230 33101  47760 13R  R5_2     
-        24       1231 33101  46652 13L  R4_2     
-        24       1232 33101  45546 13R  R3_2     
-        24       1233 33101  46647 13L  R4_2     
-        24       1234 33101  46657 13R  R4_2     
-        24       1235 33101  46642 13L  R4_2     
-        24       1236 33101  46667 13R  R4_2     
-        24       1237 33101  46637 13L  R4_2     
-        24       1238 33101  43848 13R  R2_1     
-        24       1239 33101  45509 13L  R3_2     
-        24       1240 33101  45541 13R  R3_2     
-        24       1241 33101  47748 13L  R5_2     
-        24       1242 33101  47786 13R  R5_2     
-        24       1243 33101  47743 13L  R5_2     
-        24       1244 33101  47766 13R  R5_2     
-        24       1245 33101  47738 13L  R5_2     
-        24       1246 33101  47776 13R  R5_2     
-        24       1247 33101  47733 13L  R5_2     
-        24       1248 33101  47771 13R  R5_2     
-        24       1249 33101  47728 13L  R5_2     
-        24       1250 33101  47761 13R  R5_2     
-        24       1251 33101  46653 13L  R4_2     
-        24       1252 33101  45547 13R  R3_2     
-        24       1253 33101  46648 13L  R4_2     
-        24       1254 33101  46658 13R  R4_2     
-        24       1255 33101  46643 13L  R4_2     
-        24       1256 33101  46668 13R  R4_2     
-        24       1257 33101  46638 13L  R4_2     
-        24       1258 33101  46663 13R  R4_2     
-        24       1259 33101  45510 13L  R3_2     
-        24       1260 33101  45542 13R  R3_2     
-        24       1261 33101  47749 13L  R5_2     
-        24       1262 33101  47787 13R  R5_2     
-        24       1263 33101  47744 13L  R5_2     
-        24       1264 33101  47767 13R  R5_2     
-        24       1265 33101  47739 13L  R5_2     
-        24       1266 33101  47778 13R  R5_2     
-        24       1267 33101  47734 13L  R5_2     
-        24       1268 33101  47772 13R  R5_2     
-        24       1269 33101  47729 13L  R5_2     
-        24       1270 33101  47762 13R  R5_2     
-        24       1271 33101  46655 13L  R4_2     
-        24       1272 33101  45548 13R  R3_2     
-        24       1273 33101  46649 13L  R4_2     
-        24       1274 33101  46659 13R  R4_2     
-        24       1275 33101  46644 13L  R4_2     
-        24       1276 33101  46669 13R  R4_2     
-        24       1277 33101  46639 13L  R4_2     
-        24       1278 33101  46664 13R  R4_2     
-        24       1279 33101  45511 13L  R3_2     
-        24       1280 33101  45543 13R  R3_2     
-        24       1281 33101  47750 13L  R5_2     
-        24       1282 33101  47788 13R  R5_2     
-        24       1283 33101  47745 13L  R5_2     
-        24       1284 33101  47768 13R  R5_2     
-        24       1285 33101  47740 13L  R5_2     
-        24       1286 33101  47779 13R  R5_2     
-        24       1287 33101  47735 13L  R5_2     
-        24       1288 33101  47773 13R  R5_2     
-        24       1289 33101  47730 13L  R5_2     
-        24       1290 33101  47763 13R  R5_2     
-        24       1291 33101  43811 13L  R2_1     
-        24       1292 33101  45549 13R  R3_2     
-        24       1293 33101  46650 13L  R4_2     
-        24       1294 33101  43847 13R  R2_1     
-        24       1295 33101  46645 13L  R4_2     
-        24       1296 33101  46670 13R  R4_2     
-        24       1297 33101  46640 13L  R4_2     
-        24       1298 33101  46665 13R  R4_2     
-        24       1299 33101  45512 13L  R3_2     
-        24       1300 33101  45544 13R  R3_2     
-        24       1301 33101  43966 14L  R2_2     
-        24       1302 33101  39280 14R  S10_1    
-        24       1303 33101  39732 14L  S10_2    
-        24       1304 33101  42217 14R  P19      
-        24       1305 33101  39236 14L  S10_1    
-        24       1306 33101  45693 14R  R4_1     
-        24       1307 33101  39234 14L  S10_1    
-        24       1308 33101  45698 14R  R4_1     
-        24       1309 33101  45676 14L  R4_1     
-        24       1310 33101  45703 14R  R4_1     
-        24       1311 33101  45671 14L  R4_1     
-        24       1312 33101  45708 14R  R4_1     
-        24       1313 33101  39228 14L  S10_1    
-        24       1314 33101  46896 14R  R5_1     
-        24       1315 33101  39244 14L  S10_1    
-        24       1316 33101  46901 14R  R5_1     
-        24       1317 33101  43967 14L  R2_2     
-        24       1318 33101  39252 14R  S10_1    
-        24       1319 33101  45686 14L  R4_1     
-        24       1320 33101  46906 14R  R5_1     
-        24       1321 33101  39224 14L  S10_1    
-        24       1322 33101  39281 14R  S10_1    
-        24       1323 33101  41887 14L  P18      
-        24       1324 33101  44016 14R  R2_2     
-        24       1325 33101  39237 14L  S10_1    
-        24       1326 33101  45694 14R  R4_1     
-        24       1327 33101  39235 14L  S10_1    
-        24       1328 33101  45699 14R  R4_1     
-        24       1329 33101  45677 14L  R4_1     
-        24       1330 33101  45704 14R  R4_1     
-        24       1331 33101  45672 14L  R4_1     
-        24       1332 33101  45709 14R  R4_1     
-        24       1333 33101  39229 14L  S10_1    
-        24       1334 33101  46897 14R  R5_1     
-        24       1335 33101  45682 14L  R4_1     
-        24       1336 33101  39250 14R  S10_1    
-        24       1337 33101  46871 14L  R5_1     
-        24       1338 33101  46911 14R  R5_1     
-        24       1339 33101  45687 14L  R4_1     
-        24       1340 33101  46907 14R  R5_1     
-        24       1341 33101  39225 14L  S10_1    
-        24       1342 33101  39282 14R  S10_1    
-        24       1343 33101  45674 14L  R4_1     
-        24       1344 33101  39286 14R  S10_1    
-        24       1345 33101  39238 14L  S10_1    
-        24       1346 33101  45695 14R  R4_1     
-        24       1347 33101  39241 14L  S10_1    
-        24       1348 33101  45700 14R  R4_1     
-        24       1349 33101  45678 14L  R4_1     
-        24       1350 33101  45705 14R  R4_1     
-        24       1351 33101  45673 14L  R4_1     
-        24       1352 33101  45710 14R  R4_1     
-        24       1353 33101  43974 14L  R2_2     
-        24       1354 33101  46898 14R  R5_1     
-        24       1355 33101  45683 14L  R4_1     
-        24       1356 33101  46903 14R  R5_1     
-        24       1357 33101  46872 14L  R5_1     
-        24       1358 33101  39751 14R  S10_2    
-        24       1359 33101  45688 14L  R4_1     
-        24       1360 33101  46908 14R  R5_1     
-        24       1361 33101  39226 14L  S10_1    
-        24       1362 33101  39283 14R  S10_1    
-        24       1363 33101  45681 14L  R4_1     
-        24       1364 33101  39287 14R  S10_1    
-        24       1365 33101  39239 14L  S10_1    
-        24       1366 33101  45696 14R  R4_1     
-        24       1367 33101  39242 14L  S10_1    
-        24       1368 33101  45701 14R  R4_1     
-        24       1369 33101  45679 14L  R4_1     
-        24       1370 33101  45706 14R  R4_1     
-        24       1371 33101  45675 14L  R4_1     
-        24       1372 33101  39246 14R  S10_1    
-        24       1373 33101  39232 14L  S10_1    
-        24       1374 33101  46899 14R  R5_1     
-        24       1375 33101  45684 14L  R4_1     
-        24       1376 33101  46904 14R  R5_1     
-        24       1377 33101  46873 14L  R5_1     
-        24       1378 33101  44009 14R  R2_2     
-        24       1379 33101  45689 14L  R4_1     
-        24       1380 33101  46909 14R  R5_1     
-        24       1381 33101  39227 14L  S10_1    
-        24       1382 33101  39284 14R  S10_1    
-        24       1383 33101  45692 14L  R4_1     
-        24       1384 33101  39288 14R  S10_1    
-        24       1385 33101  39240 14L  S10_1    
-        24       1386 33101  45697 14R  R4_1     
-        24       1387 33101  39243 14L  S10_1    
-        24       1388 33101  45702 14R  R4_1     
-        24       1389 33101  45680 14L  R4_1     
-        24       1390 33101  45707 14R  R4_1     
-        24       1391 33101  45691 14L  R4_1     
-        24       1392 33101  39248 14R  S10_1    
-        24       1393 33101  39233 14L  S10_1    
-        24       1394 33101  46900 14R  R5_1     
-        24       1395 33101  45685 14L  R4_1     
-        24       1396 33101  46905 14R  R5_1     
-        24       1397 33101  46874 14L  R5_1     
-        24       1398 33101  46912 14R  R5_1     
-        24       1399 33101  45690 14L  R4_1     
-        24       1400 33101  46910 14R  R5_1     
-        24       1401 33101  39311 15L  S10_1    
-        24       1402 33101  45741 15R  R4_1     
-        24       1403 33101  39316 15L  S10_1    
-        24       1404 33101  45745 15R  R4_1     
-        24       1405 33101  39321 15L  S10_1    
-        24       1406 33101  45751 15R  R4_1     
-        24       1407 33101  39309 15L  S10_1    
-        24       1408 33101  45756 15R  R4_1     
-        24       1409 33101  39331 15L  S10_1    
-        24       1410 33101  45761 15R  R4_1     
-        24       1411 33101  39336 15L  S10_1    
-        24       1412 33101  45766 15R  R4_1     
-        24       1413 33101  45712 15L  R4_1     
-        24       1414 33101  45771 15R  R4_1     
-        24       1415 33101  45718 15L  R4_1     
-        24       1416 33101  45776 15R  R4_1     
-        24       1417 33101  45723 15L  R4_1     
-        24       1418 33101  45749 15R  R4_1     
-        24       1419 33101  45728 15L  R4_1     
-        24       1420 33101  39344 15R  S10_1    
-        24       1421 33101  39312 15L  S10_1    
-        24       1422 33101  45742 15R  R4_1     
-        24       1423 33101  39317 15L  S10_1    
-        24       1424 33101  45746 15R  R4_1     
-        24       1425 33101  39322 15L  S10_1    
-        24       1426 33101  45752 15R  R4_1     
-        24       1427 33101  39327 15L  S10_1    
-        24       1428 33101  45757 15R  R4_1     
-        24       1429 33101  39332 15L  S10_1    
-        24       1430 33101  45762 15R  R4_1     
-        24       1431 33101  39337 15L  S10_1    
-        24       1432 33101  45767 15R  R4_1     
-        24       1433 33101  45713 15L  R4_1     
-        24       1434 33101  45772 15R  R4_1     
-        24       1435 33101  45719 15L  R4_1     
-        24       1436 33101  45777 15R  R4_1     
-        24       1437 33101  45724 15L  R4_1     
-        24       1438 33101  45781 15R  R4_1     
-        24       1439 33101  45729 15L  R4_1     
-        24       1440 33101  39345 15R  S10_1    
-        24       1441 33101  39313 15L  S10_1    
-        24       1442 33101  45743 15R  R4_1     
-        24       1443 33101  39318 15L  S10_1    
-        24       1444 33101  45747 15R  R4_1     
-        24       1445 33101  39323 15L  S10_1    
-        24       1446 33101  45753 15R  R4_1     
-        24       1447 33101  39328 15L  S10_1    
-        24       1448 33101  45758 15R  R4_1     
-        24       1449 33101  39333 15L  S10_1    
-        24       1450 33101  45763 15R  R4_1     
-        24       1451 33101  39338 15L  S10_1    
-        24       1452 33101  45768 15R  R4_1     
-        24       1453 33101  45714 15L  R4_1     
-        24       1454 33101  45773 15R  R4_1     
-        24       1455 33101  45720 15L  R4_1     
-        24       1456 33101  45778 15R  R4_1     
-        24       1457 33101  45725 15L  R4_1     
-        24       1458 33101  39340 15R  S10_1    
-        24       1459 33101  45730 15L  R4_1     
-        24       1460 33101  39346 15R  S10_1    
-        24       1461 33101  39314 15L  S10_1    
-        24       1462 33101  45744 15R  R4_1     
-        24       1463 33101  39320 15L  S10_1    
-        24       1464 33101  45748 15R  R4_1     
-        24       1465 33101  39324 15L  S10_1    
-        24       1466 33101  45754 15R  R4_1     
-        24       1467 33101  39329 15L  S10_1    
-        24       1468 33101  45759 15R  R4_1     
-        24       1469 33101  39334 15L  S10_1    
-        24       1470 33101  45764 15R  R4_1     
-        24       1471 33101  39339 15L  S10_1    
-        24       1472 33101  45769 15R  R4_1     
-        24       1473 33101  45716 15L  R4_1     
-        24       1474 33101  45774 15R  R4_1     
-        24       1475 33101  45721 15L  R4_1     
-        24       1476 33101  45779 15R  R4_1     
-        24       1477 33101  45726 15L  R4_1     
-        24       1478 33101  39342 15R  S10_1    
-        24       1479 33101  45731 15L  R4_1     
-        24       1480 33101  39347 15R  S10_1    
-        24       1481 33101  39315 15L  S10_1    
-        24       1482 33101  39385 15R  S10_1    
-        24       1483 33101  39308 15L  S10_1    
-        24       1484 33101  45750 15R  R4_1     
-        24       1485 33101  39325 15L  S10_1    
-        24       1486 33101  45755 15R  R4_1     
-        24       1487 33101  39330 15L  S10_1    
-        24       1488 33101  45760 15R  R4_1     
-        24       1489 33101  39335 15L  S10_1    
-        24       1490 33101  45765 15R  R4_1     
-        24       1491 33101  45711 15L  R4_1     
-        24       1492 33101  45770 15R  R4_1     
-        24       1493 33101  45717 15L  R4_1     
-        24       1494 33101  45775 15R  R4_1     
-        24       1495 33101  45722 15L  R4_1     
-        24       1496 33101  45780 15R  R4_1     
-        24       1497 33101  45727 15L  R4_1     
-        24       1498 33101  39343 15R  S10_1    
-        24       1499 33101  45732 15L  R4_1     
-        24       1500 33101  39348 15R  S10_1    
-        24       1501 33101  39412 16L  S10_1    
-        24       1502 33101  39441 16R  S10_1    
-        24       1503 33101  39417 16L  S10_1    
-        24       1504 33101  39439 16R  S10_1    
-        24       1505 33101  45786 16L  R4_1     
-        24       1506 33101  39451 16R  S10_1    
-        24       1507 33101  45791 16L  R4_1     
-        24       1508 33101  39456 16R  S10_1    
-        24       1509 33101  45796 16L  R4_1     
-        24       1510 33101  45811 16R  R4_1     
-        24       1511 33101  45801 16L  R4_1     
-        24       1512 33101  45816 16R  R4_1     
-        24       1513 33101  46971 16L  R5_1     
-        24       1514 33101  45821 16R  R4_1     
-        24       1515 33101  46976 16L  R5_1     
-        24       1516 33101  45826 16R  R4_1     
-        24       1517 33101  46981 16L  R5_1     
-        24       1518 33101  45809 16R  R4_1     
-        24       1519 33101  45806 16L  R4_1     
-        24       1520 33101  39421 16R  S10_1    
-        24       1521 33101  39413 16L  S10_1    
-        24       1522 33101  39442 16R  S10_1    
-        24       1523 33101  45782 16L  R4_1     
-        24       1524 33101  39447 16R  S10_1    
-        24       1525 33101  45787 16L  R4_1     
-        24       1526 33101  39452 16R  S10_1    
-        24       1527 33101  45792 16L  R4_1     
-        24       1528 33101  39457 16R  S10_1    
-        24       1529 33101  45797 16L  R4_1     
-        24       1530 33101  45812 16R  R4_1     
-        24       1531 33101  45802 16L  R4_1     
-        24       1532 33101  45817 16R  R4_1     
-        24       1533 33101  46972 16L  R5_1     
-        24       1534 33101  45822 16R  R4_1     
-        24       1535 33101  46977 16L  R5_1     
-        24       1536 33101  45827 16R  R4_1     
-        24       1537 33101  46982 16L  R5_1     
-        24       1538 33101  45810 16R  R4_1     
-        24       1539 33101  45807 16L  R4_1     
-        24       1540 33101  39425 16R  S10_1    
-        24       1541 33101  39414 16L  S10_1    
-        24       1542 33101  39443 16R  S10_1    
-        24       1543 33101  45783 16L  R4_1     
-        24       1544 33101  39448 16R  S10_1    
-        24       1545 33101  45788 16L  R4_1     
-        24       1546 33101  39453 16R  S10_1    
-        24       1547 33101  45793 16L  R4_1     
-        24       1548 33101  39459 16R  S10_1    
-        24       1549 33101  45798 16L  R4_1     
-        24       1550 33101  45813 16R  R4_1     
-        24       1551 33101  45803 16L  R4_1     
-        24       1552 33101  45818 16R  R4_1     
-        24       1553 33101  46973 16L  R5_1     
-        24       1554 33101  45823 16R  R4_1     
-        24       1555 33101  46978 16L  R5_1     
-        24       1556 33101  45828 16R  R4_1     
-        24       1557 33101  46983 16L  R5_1     
-        24       1558 33101  39462 16R  S10_1    
-        24       1559 33101  45808 16L  R4_1     
-        24       1560 33101  39426 16R  S10_1    
-        24       1561 33101  39415 16L  S10_1    
-        24       1562 33101  39440 16R  S10_1    
-        24       1563 33101  45784 16L  R4_1     
-        24       1564 33101  39449 16R  S10_1    
-        24       1565 33101  45789 16L  R4_1     
-        24       1566 33101  39454 16R  S10_1    
-        24       1567 33101  45794 16L  R4_1     
-        24       1568 33101  39460 16R  S10_1    
-        24       1569 33101  45799 16L  R4_1     
-        24       1570 33101  45814 16R  R4_1     
-        24       1571 33101  45804 16L  R4_1     
-        24       1572 33101  45819 16R  R4_1     
-        24       1573 33101  46974 16L  R5_1     
-        24       1574 33101  45824 16R  R4_1     
-        24       1575 33101  46979 16L  R5_1     
-        24       1576 33101  45829 16R  R4_1     
-        24       1577 33101  44227 16L  R2_2     
-        24       1578 33101  42312 16R  P19      
-        24       1579 33101  42287 16L  P19      
-        24       1580 33101  39428 16R  S10_1    
-        24       1581 33101  39416 16L  S10_1    
-        24       1582 33101  39445 16R  S10_1    
-        24       1583 33101  45785 16L  R4_1     
-        24       1584 33101  39450 16R  S10_1    
-        24       1585 33101  45790 16L  R4_1     
-        24       1586 33101  39455 16R  S10_1    
-        24       1587 33101  45795 16L  R4_1     
-        24       1588 33101  39461 16R  S10_1    
-        24       1589 33101  45800 16L  R4_1     
-        24       1590 33101  45815 16R  R4_1     
-        24       1591 33101  45805 16L  R4_1     
-        24       1592 33101  45820 16R  R4_1     
-        24       1593 33101  46975 16L  R5_1     
-        24       1594 33101  45825 16R  R4_1     
-        24       1595 33101  46980 16L  R5_1     
-        24       1596 33101  45830 16R  R4_1     
-        24       1597 33101  44240 16L  R2_2     
-        24       1598 33101  39794 16R  S10_2    
-        24       1599 33101  43167 16L  R1_2     
-        24       1600 33101  39822 16R  S10_2    
-        24       1601 33101  44816 17L  R3_1     
-        24       1602 33101  44881 17R  R3_1     
-        24       1603 33101  44821 17L  R3_1     
-        24       1604 33101  40337 17R  S10_3    
-        24       1605 33101  44826 17L  R3_1     
-        24       1606 33101  44885 17R  R3_1     
-        24       1607 33101  44836 17L  R3_1     
-        24       1608 33101  44890 17R  R3_1     
-        24       1609 33101  39851 17L  S10_2    
-        24       1610 33101  44896 17R  R3_1     
-        24       1611 33101  39466 17L  S10_1    
-        24       1612 33101  44901 17R  R3_1     
-        24       1613 33101  39471 17L  S10_1    
-        24       1614 33101  44906 17R  R3_1     
-        24       1615 33101  39476 17L  S10_1    
-        24       1616 33101  39510 17R  S10_1    
-        24       1617 33101  39481 17L  S10_1    
-        24       1618 33101  39515 17R  S10_1    
-        24       1619 33101  44807 17L  R3_1     
-        24       1620 33101  39521 17R  S10_1    
-        24       1621 33101  44817 17L  R3_1     
-        24       1622 33101  44877 17R  R3_1     
-        24       1623 33101  44822 17L  R3_1     
-        24       1624 33101  42352 17R  P19      
-        24       1625 33101  44827 17L  R3_1     
-        24       1626 33101  44886 17R  R3_1     
-        24       1627 33101  44837 17L  R3_1     
-        24       1628 33101  44891 17R  R3_1     
-        24       1629 33101  44832 17L  R3_1     
-        24       1630 33101  44897 17R  R3_1     
-        24       1631 33101  39467 17L  S10_1    
-        24       1632 33101  44902 17R  R3_1     
-        24       1633 33101  39472 17L  S10_1    
-        24       1634 33101  44907 17R  R3_1     
-        24       1635 33101  39477 17L  S10_1    
-        24       1636 33101  39511 17R  S10_1    
-        24       1637 33101  44814 17L  R3_1     
-        24       1638 33101  39516 17R  S10_1    
-        24       1639 33101  44809 17L  R3_1     
-        24       1640 33101  39522 17R  S10_1    
-        24       1641 33101  44818 17L  R3_1     
-        24       1642 33101  44878 17R  R3_1     
-        24       1643 33101  44823 17L  R3_1     
-        24       1644 33101  44882 17R  R3_1     
-        24       1645 33101  44828 17L  R3_1     
-        24       1646 33101  44887 17R  R3_1     
-        24       1647 33101  44838 17L  R3_1     
-        24       1648 33101  44892 17R  R3_1     
-        24       1649 33101  44833 17L  R3_1     
-        24       1650 33101  44898 17R  R3_1     
-        24       1651 33101  39468 17L  S10_1    
-        24       1652 33101  44903 17R  R3_1     
-        24       1653 33101  39473 17L  S10_1    
-        24       1654 33101  44908 17R  R3_1     
-        24       1655 33101  39478 17L  S10_1    
-        24       1656 33101  39512 17R  S10_1    
-        24       1657 33101  39463 17L  S10_1    
-        24       1658 33101  39518 17R  S10_1    
-        24       1659 33101  44810 17L  R3_1     
-        24       1660 33101  39523 17R  S10_1    
-        24       1661 33101  44819 17L  R3_1     
-        24       1662 33101  44879 17R  R3_1     
-        24       1663 33101  44824 17L  R3_1     
-        24       1664 33101  44883 17R  R3_1     
-        24       1665 33101  44829 17L  R3_1     
-        24       1666 33101  44888 17R  R3_1     
-        24       1667 33101  44839 17L  R3_1     
-        24       1668 33101  44893 17R  R3_1     
-        24       1669 33101  44834 17L  R3_1     
-        24       1670 33101  44899 17R  R3_1     
-        24       1671 33101  39469 17L  S10_1    
-        24       1672 33101  44904 17R  R3_1     
-        24       1673 33101  39474 17L  S10_1    
-        24       1674 33101  44909 17R  R3_1     
-        24       1675 33101  39479 17L  S10_1    
-        24       1676 33101  39513 17R  S10_1    
-        24       1677 33101  39464 17L  S10_1    
-        24       1678 33101  39519 17R  S10_1    
-        24       1679 33101  44811 17L  R3_1     
-        24       1680 33101  39524 17R  S10_1    
-        24       1681 33101  44820 17L  R3_1     
-        24       1682 33101  44880 17R  R3_1     
-        24       1683 33101  44825 17L  R3_1     
-        24       1684 33101  44884 17R  R3_1     
-        24       1685 33101  44830 17L  R3_1     
-        24       1686 33101  44889 17R  R3_1     
-        24       1687 33101  41178 17L  S10_5    
-        24       1688 33101  44894 17R  R3_1     
-        24       1689 33101  44835 17L  R3_1     
-        24       1690 33101  44900 17R  R3_1     
-        24       1691 33101  39470 17L  S10_1    
-        24       1692 33101  44905 17R  R3_1     
-        24       1693 33101  39475 17L  S10_1    
-        24       1694 33101  39509 17R  S10_1    
-        24       1695 33101  39480 17L  S10_1    
-        24       1696 33101  39514 17R  S10_1    
-        24       1697 33101  39465 17L  S10_1    
-        24       1698 33101  39520 17R  S10_1    
-        24       1699 33101  44813 17L  R3_1     
-        24       1700 33101  39525 17R  S10_1    
-        25          1 33101  31828 1L   S07_5    
-        25          2 33101  46701 1R   R5_1     
-        25          3 33101  46676 1L   R5_1     
-        25          4 33101  46706 1R   R5_1     
-        25          5 33101  46681 1L   R5_1     
-        25          6 33101  47246 1R   R5_2     
-        25          7 33101  46686 1L   R5_1     
-        25          8 33101  48541 1R   R6_2     
-        25          9 33101  47231 1L   R5_2     
-        25         10 33101  47251 1R   R5_2     
-        25         11 33101  47236 1L   R5_2     
-        25         12 33101  47256 1R   R5_2     
-        25         13 33101  47241 1L   R5_2     
-        25         14 33101  48531 1R   R6_2     
-        25         15 33101  46675 1L   R5_1     
-        25         16 33101  48536 1R   R6_2     
-        25         17 33101  48501 1L   R6_2     
-        25         18 33101  46696 1R   R5_1     
-        25         19 33101  48511 1L   R6_2     
-        25         20 33101  41549 1R   S10_6    
-        25         21 33101  33819 1L   S8_3     
-        25         22 33101  46702 1R   R5_1     
-        25         23 33101  46677 1L   R5_1     
-        25         24 33101  46707 1R   R5_1     
-        25         25 33101  46682 1L   R5_1     
-        25         26 33101  47247 1R   R5_2     
-        25         27 33101  46687 1L   R5_1     
-        25         28 33101  48542 1R   R6_2     
-        25         29 33101  47232 1L   R5_2     
-        25         30 33101  47252 1R   R5_2     
-        25         31 33101  47237 1L   R5_2     
-        25         32 33101  47257 1R   R5_2     
-        25         33 33101  47242 1L   R5_2     
-        25         34 33101  48532 1R   R6_2     
-        25         35 33101  48507 1L   R6_2     
-        25         36 33101  48538 1R   R6_2     
-        25         37 33101  48502 1L   R6_2     
-        25         38 33101  46697 1R   R5_1     
-        25         39 33101  48512 1L   R6_2     
-        25         40 33101  41565 1R   S10_6    
-        25         41 33101  41528 1L   S10_6    
-        25         42 33101  46703 1R   R5_1     
-        25         43 33101  46678 1L   R5_1     
-        25         44 33101  46708 1R   R5_1     
-        25         45 33101  46683 1L   R5_1     
-        25         46 33101  47248 1R   R5_2     
-        25         47 33101  46688 1L   R5_1     
-        25         48 33101  48543 1R   R6_2     
-        25         49 33101  47233 1L   R5_2     
-        25         50 33101  47253 1R   R5_2     
-        25         51 33101  47238 1L   R5_2     
-        25         52 33101  47258 1R   R5_2     
-        25         53 33101  47243 1L   R5_2     
-        25         54 33101  48533 1R   R6_2     
-        25         55 33101  48508 1L   R6_2     
-        25         56 33101  46693 1R   R5_1     
-        25         57 33101  48503 1L   R6_2     
-        25         58 33101  48539 1R   R6_2     
-        25         59 33101  48513 1L   R6_2     
-        25         60 33101  41805 1R   P18      
-        25         61 33101  41537 1L   S10_6    
-        25         62 33101  46704 1R   R5_1     
-        25         63 33101  46679 1L   R5_1     
-        25         64 33101  46709 1R   R5_1     
-        25         65 33101  46684 1L   R5_1     
-        25         66 33101  47249 1R   R5_2     
-        25         67 33101  46689 1L   R5_1     
-        25         68 33101  48546 1R   R6_2     
-        25         69 33101  47234 1L   R5_2     
-        25         70 33101  47254 1R   R5_2     
-        25         71 33101  47239 1L   R5_2     
-        25         72 33101  47259 1R   R5_2     
-        25         73 33101  47244 1L   R5_2     
-        25         74 33101  48534 1R   R6_2     
-        25         75 33101  48509 1L   R6_2     
-        25         76 33101  46694 1R   R5_1     
-        25         77 33101  48504 1L   R6_2     
-        25         78 33101  46699 1R   R5_1     
-        25         79 33101  48514 1L   R6_2     
-        25         80 33101  48548 1R   R6_2     
-        25         81 33101  33846 1L   S8_3     
-        25         82 33101  46705 1R   R5_1     
-        25         83 33101  46680 1L   R5_1     
-        25         84 33101  46710 1R   R5_1     
-        25         85 33101  46685 1L   R5_1     
-        25         86 33101  47250 1R   R5_2     
-        25         87 33101  46674 1L   R5_1     
-        25         88 33101  48547 1R   R6_2     
-        25         89 33101  47235 1L   R5_2     
-        25         90 33101  47255 1R   R5_2     
-        25         91 33101  47240 1L   R5_2     
-        25         92 33101  47260 1R   R5_2     
-        25         93 33101  47245 1L   R5_2     
-        25         94 33101  48535 1R   R6_2     
-        25         95 33101  48510 1L   R6_2     
-        25         96 33101  46695 1R   R5_1     
-        25         97 33101  48505 1L   R6_2     
-        25         98 33101  46700 1R   R5_1     
-        25         99 33101  48515 1L   R6_2     
-        25        100 33101  43861 1R   R2_2     
-        25        101 33101  41591 2L   S10_6    
-        25        102 33101  46196 2R   R4_2     
-        25        103 33101  37533 2L   S9_4     
-        25        104 33101  46731 2R   R5_1     
-        25        105 33101  46711 2L   R5_1     
-        25        106 33101  46736 2R   R5_1     
-        25        107 33101  46716 2L   R5_1     
-        25        108 33101  46204 2R   R4_2     
-        25        109 33101  46721 2L   R5_1     
-        25        110 33101  46746 2R   R5_1     
-        25        111 33101  46726 2L   R5_1     
-        25        112 33101  47276 2R   R5_2     
-        25        113 33101  47261 2L   R5_2     
-        25        114 33101  47281 2R   R5_2     
-        25        115 33101  47266 2L   R5_2     
-        25        116 33101  47286 2R   R5_2     
-        25        117 33101  47271 2L   R5_2     
-        25        118 33101  48586 2R   R6_2     
-        25        119 33101  48566 2L   R6_2     
-        25        120 33101  41652 2R   S10_6    
-        25        121 33101  41604 2L   S10_6    
-        25        122 33101  46197 2R   R4_2     
-        25        123 33101  46175 2L   R4_2     
-        25        124 33101  46732 2R   R5_1     
-        25        125 33101  46712 2L   R5_1     
-        25        126 33101  46737 2R   R5_1     
-        25        127 33101  46717 2L   R5_1     
-        25        128 33101  46742 2R   R5_1     
-        25        129 33101  46722 2L   R5_1     
-        25        130 33101  46747 2R   R5_1     
-        25        131 33101  46727 2L   R5_1     
-        25        132 33101  47277 2R   R5_2     
-        25        133 33101  47262 2L   R5_2     
-        25        134 33101  47282 2R   R5_2     
-        25        135 33101  47267 2L   R5_2     
-        25        136 33101  47287 2R   R5_2     
-        25        137 33101  47272 2L   R5_2     
-        25        138 33101  48587 2R   R6_2     
-        25        139 33101  48567 2L   R6_2     
-        25        140 33101  31951 2R   S07_5    
-        25        141 33101  41615 2L   S10_6    
-        25        142 33101  46198 2R   R4_2     
-        25        143 33101  46176 2L   R4_2     
-        25        144 33101  46733 2R   R5_1     
-        25        145 33101  46713 2L   R5_1     
-        25        146 33101  46738 2R   R5_1     
-        25        147 33101  46718 2L   R5_1     
-        25        148 33101  46743 2R   R5_1     
-        25        149 33101  46723 2L   R5_1     
-        25        150 33101  46748 2R   R5_1     
-        25        151 33101  46728 2L   R5_1     
-        25        152 33101  47278 2R   R5_2     
-        25        153 33101  47263 2L   R5_2     
-        25        154 33101  47283 2R   R5_2     
-        25        155 33101  47268 2L   R5_2     
-        25        156 33101  47288 2R   R5_2     
-        25        157 33101  47273 2L   R5_2     
-        25        158 33101  48588 2R   R6_2     
-        25        159 33101  48568 2L   R6_2     
-        25        160 33101  41669 2R   S10_6    
-        25        161 33101  26506 2L   S6_2     
-        25        162 33101  46199 2R   R4_2     
-        25        163 33101  46177 2L   R4_2     
-        25        164 33101  46201 2R   R4_2     
-        25        165 33101  46714 2L   R5_1     
-        25        166 33101  46739 2R   R5_1     
-        25        167 33101  46719 2L   R5_1     
-        25        168 33101  46744 2R   R5_1     
-        25        169 33101  46724 2L   R5_1     
-        25        170 33101  46749 2R   R5_1     
-        25        171 33101  46729 2L   R5_1     
-        25        172 33101  47279 2R   R5_2     
-        25        173 33101  47264 2L   R5_2     
-        25        174 33101  47284 2R   R5_2     
-        25        175 33101  47269 2L   R5_2     
-        25        176 33101  47289 2R   R5_2     
-        25        177 33101  47274 2L   R5_2     
-        25        178 33101  48589 2R   R6_2     
-        25        179 33101  48569 2L   R6_2     
-        25        180 33101  30197 2R   S7_2     
-        25        181 33101  30146 2L   S7_2     
-        25        182 33101  46200 2R   R4_2     
-        25        183 33101  46178 2L   R4_2     
-        25        184 33101  46735 2R   R5_1     
-        25        185 33101  46715 2L   R5_1     
-        25        186 33101  46740 2R   R5_1     
-        25        187 33101  46720 2L   R5_1     
-        25        188 33101  46745 2R   R5_1     
-        25        189 33101  46725 2L   R5_1     
-        25        190 33101  46750 2R   R5_1     
-        25        191 33101  48564 2L   R6_2     
-        25        192 33101  47280 2R   R5_2     
-        25        193 33101  47265 2L   R5_2     
-        25        194 33101  47315 2R   R5_2     
-        25        195 33101  47270 2L   R5_2     
-        25        196 33101  47290 2R   R5_2     
-        25        197 33101  47275 2L   R5_2     
-        25        198 33101  48590 2R   R6_2     
-        25        199 33101  48565 2L   R6_2     
-        25        200 33101  31949 2R   S07_5    
-        25        201 33101  46751 3L   R5_1     
-        25        202 33101  41699 3R   S10_6    
-        25        203 33101  46756 3L   R5_1     
-        25        204 33101  36151 3R   S9_1     
-        25        205 33101  46761 3L   R5_1     
-        25        206 33101  46776 3R   R5_1     
-        25        207 33101  46766 3L   R5_1     
-        25        208 33101  48648 3R   R6_2     
-        25        209 33101  47291 3L   R5_2     
-        25        210 33101  47306 3R   R5_2     
-        25        211 33101  47296 3L   R5_2     
-        25        212 33101  46786 3R   R5_1     
-        25        213 33101  47301 3L   R5_2     
-        25        214 33101  47316 3R   R5_2     
-        25        215 33101  48621 3L   R6_2     
-        25        216 33101  48641 3R   R6_2     
-        25        217 33101  48616 3L   R6_2     
-        25        218 33101  48646 3R   R6_2     
-        25        219 33101  42139 3L   P19      
-        25        220 33101  47312 3R   R5_2     
-        25        221 33101  46752 3L   R5_1     
-        25        222 33101  26589 3R   S6_2     
-        25        223 33101  46229 3L   R4_2     
-        25        224 33101  37627 3R   S9_4     
-        25        225 33101  46762 3L   R5_1     
-        25        226 33101  46777 3R   R5_1     
-        25        227 33101  46767 3L   R5_1     
-        25        228 33101  46782 3R   R5_1     
-        25        229 33101  47292 3L   R5_2     
-        25        230 33101  47307 3R   R5_2     
-        25        231 33101  47297 3L   R5_2     
-        25        232 33101  46787 3R   R5_1     
-        25        233 33101  47302 3L   R5_2     
-        25        234 33101  47317 3R   R5_2     
-        25        235 33101  48612 3L   R6_2     
-        25        236 33101  48642 3R   R6_2     
-        25        237 33101  48617 3L   R6_2     
-        25        238 33101  48647 3R   R6_2     
-        25        239 33101  35211 3L   S8_5     
-        25        240 33101  47313 3R   R5_2     
-        25        241 33101  46753 3L   R5_1     
-        25        242 33101  29083 3R   P13      
-        25        243 33101  46758 3L   R5_1     
-        25        244 33101  46773 3R   R5_1     
-        25        245 33101  46763 3L   R5_1     
-        25        246 33101  46778 3R   R5_1     
-        25        247 33101  46768 3L   R5_1     
-        25        248 33101  46783 3R   R5_1     
-        25        249 33101  47293 3L   R5_2     
-        25        250 33101  47308 3R   R5_2     
-        25        251 33101  47298 3L   R5_2     
-        25        252 33101  46788 3R   R5_1     
-        25        253 33101  46230 3L   R4_2     
-        25        254 33101  47318 3R   R5_2     
-        25        255 33101  48613 3L   R6_2     
-        25        256 33101  48643 3R   R6_2     
-        25        257 33101  48618 3L   R6_2     
-        25        258 33101  48638 3R   R6_2     
-        25        259 33101  35214 3L   S8_5     
-        25        260 33101  47314 3R   R5_2     
-        25        261 33101  46754 3L   R5_1     
-        25        262 33101  41716 3R   S10_6    
-        25        263 33101  46759 3L   R5_1     
-        25        264 33101  46774 3R   R5_1     
-        25        265 33101  46764 3L   R5_1     
-        25        266 33101  46779 3R   R5_1     
-        25        267 33101  46769 3L   R5_1     
-        25        268 33101  46784 3R   R5_1     
-        25        269 33101  47294 3L   R5_2     
-        25        270 33101  47309 3R   R5_2     
-        25        271 33101  47299 3L   R5_2     
-        25        272 33101  46789 3R   R5_1     
-        25        273 33101  47304 3L   R5_2     
-        25        274 33101  47319 3R   R5_2     
-        25        275 33101  48614 3L   R6_2     
-        25        276 33101  48644 3R   R6_2     
-        25        277 33101  48619 3L   R6_2     
-        25        278 33101  48639 3R   R6_2     
-        25        279 33101  35215 3L   S8_5     
-        25        280 33101  47285 3R   R5_2     
-        25        281 33101  46755 3L   R5_1     
-        25        282 33101  41867 3R   P18      
-        25        283 33101  46760 3L   R5_1     
-        25        284 33101  46775 3R   R5_1     
-        25        285 33101  46765 3L   R5_1     
-        25        286 33101  46780 3R   R5_1     
-        25        287 33101  46770 3L   R5_1     
-        25        288 33101  46785 3R   R5_1     
-        25        289 33101  47295 3L   R5_2     
-        25        290 33101  47310 3R   R5_2     
-        25        291 33101  47300 3L   R5_2     
-        25        292 33101  47311 3R   R5_2     
-        25        293 33101  47305 3L   R5_2     
-        25        294 33101  47320 3R   R5_2     
-        25        295 33101  48615 3L   R6_2     
-        25        296 33101  48645 3R   R6_2     
-        25        297 33101  48620 3L   R6_2     
-        25        298 33101  48640 3R   R6_2     
-        25        299 33101  35228 3L   S8_5     
-        25        300 33101  48649 3R   R6_2     
-        25        301 33101  37705 4L   S9_4     
-        25        302 33101  32334 4R   P14      
-        25        303 33101  46791 4L   R5_1     
-        25        304 33101  46821 4R   R5_1     
-        25        305 33101  46797 4L   R5_1     
-        25        306 33101  46826 4R   R5_1     
-        25        307 33101  46802 4L   R5_1     
-        25        308 33101  46816 4R   R5_1     
-        25        309 33101  47321 4L   R5_2     
-        25        310 33101  47341 4R   R5_2     
-        25        311 33101  47326 4L   R5_2     
-        25        312 33101  47346 4R   R5_2     
-        25        313 33101  47331 4L   R5_2     
-        25        314 33101  47338 4R   R5_2     
-        25        315 33101  48666 4L   R6_2     
-        25        316 33101  47340 4R   R5_2     
-        25        317 33101  46807 4L   R5_1     
-        25        318 33101  48696 4R   R6_2     
-        25        319 33101  40679 4L   S10_4    
-        25        320 33101  48701 4R   R6_2     
-        25        321 33101  46282 4L   R4_2     
-        25        322 33101  33461 4R   S8_2     
-        25        323 33101  46792 4L   R5_1     
-        25        324 33101  46822 4R   R5_1     
-        25        325 33101  46798 4L   R5_1     
-        25        326 33101  46827 4R   R5_1     
-        25        327 33101  46803 4L   R5_1     
-        25        328 33101  46818 4R   R5_1     
-        25        329 33101  47322 4L   R5_2     
-        25        330 33101  47342 4R   R5_2     
-        25        331 33101  47327 4L   R5_2     
-        25        332 33101  47347 4R   R5_2     
-        25        333 33101  47332 4L   R5_2     
-        25        334 33101  47339 4R   R5_2     
-        25        335 33101  48667 4L   R6_2     
-        25        336 33101  48692 4R   R6_2     
-        25        337 33101  46808 4L   R5_1     
-        25        338 33101  48697 4R   R6_2     
-        25        339 33101  41731 4L   S10_6    
-        25        340 33101  48702 4R   R6_2     
-        25        341 33101  48668 4L   R6_2     
-        25        342 33101  35334 4R   S8_5     
-        25        343 33101  46793 4L   R5_1     
-        25        344 33101  46823 4R   R5_1     
-        25        345 33101  46799 4L   R5_1     
-        25        346 33101  46828 4R   R5_1     
-        25        347 33101  46804 4L   R5_1     
-        25        348 33101  46819 4R   R5_1     
-        25        349 33101  47323 4L   R5_2     
-        25        350 33101  47343 4R   R5_2     
-        25        351 33101  47328 4L   R5_2     
-        25        352 33101  47348 4R   R5_2     
-        25        353 33101  47333 4L   R5_2     
-        25        354 33101  48688 4R   R6_2     
-        25        355 33101  48663 4L   R6_2     
-        25        356 33101  48693 4R   R6_2     
-        25        357 33101  46809 4L   R5_1     
-        25        358 33101  48698 4R   R6_2     
-        25        359 33101  41744 4L   S10_6    
-        25        360 33101  48703 4R   R6_2     
-        25        361 33101  48669 4L   R6_2     
-        25        362 33101  35337 4R   S8_5     
-        25        363 33101  46794 4L   R5_1     
-        25        364 33101  46824 4R   R5_1     
-        25        365 33101  46800 4L   R5_1     
-        25        366 33101  46829 4R   R5_1     
-        25        367 33101  46805 4L   R5_1     
-        25        368 33101  46820 4R   R5_1     
-        25        369 33101  47324 4L   R5_2     
-        25        370 33101  47344 4R   R5_2     
-        25        371 33101  47329 4L   R5_2     
-        25        372 33101  47349 4R   R5_2     
-        25        373 33101  47334 4L   R5_2     
-        25        374 33101  48689 4R   R6_2     
-        25        375 33101  48664 4L   R6_2     
-        25        376 33101  48694 4R   R6_2     
-        25        377 33101  46810 4L   R5_1     
-        25        378 33101  48699 4R   R6_2     
-        25        379 33101  41869 4L   P18      
-        25        380 33101  48704 4R   R6_2     
-        25        381 33101  48670 4L   R6_2     
-        25        382 33101  46815 4R   R5_1     
-        25        383 33101  46795 4L   R5_1     
-        25        384 33101  46825 4R   R5_1     
-        25        385 33101  46801 4L   R5_1     
-        25        386 33101  46830 4R   R5_1     
-        25        387 33101  46806 4L   R5_1     
-        25        388 33101  47337 4R   R5_2     
-        25        389 33101  47325 4L   R5_2     
-        25        390 33101  47345 4R   R5_2     
-        25        391 33101  47330 4L   R5_2     
-        25        392 33101  47350 4R   R5_2     
-        25        393 33101  47335 4L   R5_2     
-        25        394 33101  48690 4R   R6_2     
-        25        395 33101  48665 4L   R6_2     
-        25        396 33101  48695 4R   R6_2     
-        25        397 33101  48671 4L   R6_2     
-        25        398 33101  48700 4R   R6_2     
-        25        399 33101  41870 4L   P18      
-        25        400 33101  48705 4R   R6_2     
-        25        401 33101  46326 5L   R4_2     
-        25        402 33101  30323 5R   S7_2     
-        25        403 33101  46331 5L   R4_2     
-        25        404 33101  46356 5R   R4_2     
-        25        405 33101  46831 5L   R5_1     
-        25        406 33101  46354 5R   R4_2     
-        25        407 33101  46836 5L   R5_1     
-        25        408 33101  46856 5R   R5_1     
-        25        409 33101  46841 5L   R5_1     
-        25        410 33101  46861 5R   R5_1     
-        25        411 33101  46846 5L   R5_1     
-        25        412 33101  46866 5R   R5_1     
-        25        413 33101  47351 5L   R5_2     
-        25        414 33101  47366 5R   R5_2     
-        25        415 33101  47356 5L   R5_2     
-        25        416 33101  47371 5R   R5_2     
-        25        417 33101  47361 5L   R5_2     
-        25        418 33101  47376 5R   R5_2     
-        25        419 33101  30291 5L   S7_2     
-        25        420 33101  47336 5R   R5_2     
-        25        421 33101  46327 5L   R4_2     
-        25        422 33101  32264 5R   S07_5    
-        25        423 33101  46332 5L   R4_2     
-        25        424 33101  46357 5R   R4_2     
-        25        425 33101  46832 5L   R5_1     
-        25        426 33101  46852 5R   R5_1     
-        25        427 33101  46837 5L   R5_1     
-        25        428 33101  46857 5R   R5_1     
-        25        429 33101  46842 5L   R5_1     
-        25        430 33101  46862 5R   R5_1     
-        25        431 33101  47362 5L   R5_2     
-        25        432 33101  46867 5R   R5_1     
-        25        433 33101  47352 5L   R5_2     
-        25        434 33101  47367 5R   R5_2     
-        25        435 33101  47357 5L   R5_2     
-        25        436 33101  47372 5R   R5_2     
-        25        437 33101  48713 5L   R6_2     
-        25        438 33101  47377 5R   R5_2     
-        25        439 33101  41882 5L   P18      
-        25        440 33101  48728 5R   R6_2     
-        25        441 33101  46328 5L   R4_2     
-        25        442 33101  42202 5R   P19      
-        25        443 33101  46333 5L   R4_2     
-        25        444 33101  46358 5R   R4_2     
-        25        445 33101  46833 5L   R5_1     
-        25        446 33101  46853 5R   R5_1     
-        25        447 33101  46838 5L   R5_1     
-        25        448 33101  46858 5R   R5_1     
-        25        449 33101  46843 5L   R5_1     
-        25        450 33101  46863 5R   R5_1     
-        25        451 33101  46848 5L   R5_1     
-        25        452 33101  46868 5R   R5_1     
-        25        453 33101  47353 5L   R5_2     
-        25        454 33101  47368 5R   R5_2     
-        25        455 33101  47358 5L   R5_2     
-        25        456 33101  47373 5R   R5_2     
-        25        457 33101  47363 5L   R5_2     
-        25        458 33101  47378 5R   R5_2     
-        25        459 33101  34111 5L   S8_3     
-        25        460 33101  48729 5R   R6_2     
-        25        461 33101  46329 5L   R4_2     
-        25        462 33101  36288 5R   S9_1     
-        25        463 33101  46334 5L   R4_2     
-        25        464 33101  46359 5R   R4_2     
-        25        465 33101  46834 5L   R5_1     
-        25        466 33101  46854 5R   R5_1     
-        25        467 33101  46839 5L   R5_1     
-        25        468 33101  46859 5R   R5_1     
-        25        469 33101  46844 5L   R5_1     
-        25        470 33101  46864 5R   R5_1     
-        25        471 33101  46849 5L   R5_1     
-        25        472 33101  46355 5R   R4_2     
-        25        473 33101  47354 5L   R5_2     
-        25        474 33101  47369 5R   R5_2     
-        25        475 33101  47359 5L   R5_2     
-        25        476 33101  47374 5R   R5_2     
-        25        477 33101  47364 5L   R5_2     
-        25        478 33101  47379 5R   R5_2     
-        25        479 33101  35462 5L   P15_1    
-        25        480 33101  48730 5R   R6_2     
-        25        481 33101  46330 5L   R4_2     
-        25        482 33101  36308 5R   S9_1     
-        25        483 33101  46325 5L   R4_2     
-        25        484 33101  46360 5R   R4_2     
-        25        485 33101  46835 5L   R5_1     
-        25        486 33101  46855 5R   R5_1     
-        25        487 33101  46840 5L   R5_1     
-        25        488 33101  46860 5R   R5_1     
-        25        489 33101  46845 5L   R5_1     
-        25        490 33101  46865 5R   R5_1     
-        25        491 33101  46850 5L   R5_1     
-        25        492 33101  46870 5R   R5_1     
-        25        493 33101  47355 5L   R5_2     
-        25        494 33101  47370 5R   R5_2     
-        25        495 33101  47360 5L   R5_2     
-        25        496 33101  47375 5R   R5_2     
-        25        497 33101  47365 5L   R5_2     
-        25        498 33101  47380 5R   R5_2     
-        25        499 33101  36259 5L   S9_1     
-        25        500 33101  48731 5R   R6_2     
-        25        501 33101  39551 6L   S10_1    
-        25        502 33101  45856 6R   R4_1     
-        25        503 33101  39546 6L   S10_1    
-        25        504 33101  39570 6R   S10_1    
-        25        505 33101  39541 6L   S10_1    
-        25        506 33101  39565 6R   S10_1    
-        25        507 33101  47031 6L   R5_1     
-        25        508 33101  39560 6R   S10_1    
-        25        509 33101  47046 6L   R5_1     
-        25        510 33101  39555 6R   S10_1    
-        25        511 33101  48141 6L   R6_1     
-        25        512 33101  48166 6R   R6_1     
-        25        513 33101  48136 6L   R6_1     
-        25        514 33101  48161 6R   R6_1     
-        25        515 33101  48131 6L   R6_1     
-        25        516 33101  48156 6R   R6_1     
-        25        517 33101  48126 6L   R6_1     
-        25        518 33101  48151 6R   R6_1     
-        25        519 33101  48121 6L   R6_1     
-        25        520 33101  48146 6R   R6_1     
-        25        521 33101  39552 6L   S10_1    
-        25        522 33101  45857 6R   R4_1     
-        25        523 33101  39547 6L   S10_1    
-        25        524 33101  39571 6R   S10_1    
-        25        525 33101  39542 6L   S10_1    
-        25        526 33101  39566 6R   S10_1    
-        25        527 33101  47032 6L   R5_1     
-        25        528 33101  39561 6R   S10_1    
-        25        529 33101  47047 6L   R5_1     
-        25        530 33101  39556 6R   S10_1    
-        25        531 33101  48142 6L   R6_1     
-        25        532 33101  48167 6R   R6_1     
-        25        533 33101  48137 6L   R6_1     
-        25        534 33101  48162 6R   R6_1     
-        25        535 33101  48132 6L   R6_1     
-        25        536 33101  48157 6R   R6_1     
-        25        537 33101  48127 6L   R6_1     
-        25        538 33101  48152 6R   R6_1     
-        25        539 33101  48122 6L   R6_1     
-        25        540 33101  48147 6R   R6_1     
-        25        541 33101  39553 6L   S10_1    
-        25        542 33101  45858 6R   R4_1     
-        25        543 33101  39548 6L   S10_1    
-        25        544 33101  39572 6R   S10_1    
-        25        545 33101  39543 6L   S10_1    
-        25        546 33101  39567 6R   S10_1    
-        25        547 33101  47033 6L   R5_1     
-        25        548 33101  39562 6R   S10_1    
-        25        549 33101  39536 6L   S10-1    
-        25        550 33101  39557 6R   S10_1    
-        25        551 33101  48143 6L   R6_1     
-        25        552 33101  48168 6R   R6_1     
-        25        553 33101  48138 6L   R6_1     
-        25        554 33101  48163 6R   R6_1     
-        25        555 33101  48133 6L   R6_1     
-        25        556 33101  48158 6R   R6_1     
-        25        557 33101  48128 6L   R6_1     
-        25        558 33101  48153 6R   R6_1     
-        25        559 33101  48123 6L   R6_1     
-        25        560 33101  48148 6R   R6_1     
-        25        561 33101  42356 6L   P19      
-        25        562 33101  45859 6R   R4_1     
-        25        563 33101  39549 6L   S10_1    
-        25        564 33101  39573 6R   S10_1    
-        25        565 33101  39544 6L   S10_1    
-        25        566 33101  39568 6R   S10_1    
-        25        567 33101  47034 6L   R5_1     
-        25        568 33101  39563 6R   S10_1    
-        25        569 33101  39537 6L   S10-1    
-        25        570 33101  39558 6R   S10_1    
-        25        571 33101  48144 6L   R6_1     
-        25        572 33101  48169 6R   R6_1     
-        25        573 33101  48139 6L   R6_1     
-        25        574 33101  48164 6R   R6_1     
-        25        575 33101  48134 6L   R6_1     
-        25        576 33101  48159 6R   R6_1     
-        25        577 33101  48129 6L   R6_1     
-        25        578 33101  48154 6R   R6_1     
-        25        579 33101  48124 6L   R6_1     
-        25        580 33101  48149 6R   R6_1     
-        25        581 33101  41959 6L   P18      
-        25        582 33101  45860 6R   R4_1     
-        25        583 33101  39550 6L   S10_1    
-        25        584 33101  39574 6R   S10_1    
-        25        585 33101  39545 6L   S10_1    
-        25        586 33101  39569 6R   S10_1    
-        25        587 33101  47035 6L   R5_1     
-        25        588 33101  39564 6R   S10_1    
-        25        589 33101  42736 6L   R1       
-        25        590 33101  39559 6R   S10_1    
-        25        591 33101  48145 6L   R6_1     
-        25        592 33101  48170 6R   R6_1     
-        25        593 33101  48140 6L   R6_1     
-        25        594 33101  48165 6R   R6_1     
-        25        595 33101  48135 6L   R6_1     
-        25        596 33101  48160 6R   R6_1     
-        25        597 33101  48130 6L   R6_1     
-        25        598 33101  48155 6R   R6_1     
-        25        599 33101  48125 6L   R6_1     
-        25        600 33101  48150 6R   R6_1     
-        25        601 33101  48201 7L   R6_1     
-        25        602 33101  39624 7R   S10_1    
-        25        603 33101  48171 7L   R6_1     
-        25        604 33101  39618 7R   S10_1    
-        25        605 33101  39590 7L   S10_1    
-        25        606 33101  39613 7R   S10_1    
-        25        607 33101  39585 7L   S10_1    
-        25        608 33101  39608 7R   S10_1    
-        25        609 33101  39580 7L   S10_1    
-        25        610 33101  39603 7R   S10_1    
-        25        611 33101  48196 7L   R6_1     
-        25        612 33101  44956 7R   R3_1     
-        25        613 33101  48191 7L   R6_1     
-        25        614 33101  48226 7R   R6_1     
-        25        615 33101  48186 7L   R6_1     
-        25        616 33101  48216 7R   R6_1     
-        25        617 33101  48181 7L   R6_1     
-        25        618 33101  48211 7R   R6_1     
-        25        619 33101  48176 7L   R6_1     
-        25        620 33101  48206 7R   R6_1     
-        25        621 33101  48202 7L   R6_1     
-        25        622 33101  39625 7R   S10_1    
-        25        623 33101  48172 7L   R6_1     
-        25        624 33101  39619 7R   S10_1    
-        25        625 33101  39591 7L   S10_1    
-        25        626 33101  39614 7R   S10_1    
-        25        627 33101  39586 7L   S10_1    
-        25        628 33101  39609 7R   S10_1    
-        25        629 33101  39581 7L   S10_1    
-        25        630 33101  39604 7R   S10_1    
-        25        631 33101  48197 7L   R6_1     
-        25        632 33101  45887 7R   R4_1     
-        25        633 33101  48192 7L   R6_1     
-        25        634 33101  48227 7R   R6_1     
-        25        635 33101  48187 7L   R6_1     
-        25        636 33101  48217 7R   R6_1     
-        25        637 33101  48182 7L   R6_1     
-        25        638 33101  48212 7R   R6_1     
-        25        639 33101  48177 7L   R6_1     
-        25        640 33101  48207 7R   R6_1     
-        25        641 33101  48203 7L   R6_1     
-        25        642 33101  39626 7R   S10_1    
-        25        643 33101  48173 7L   R6_1     
-        25        644 33101  39620 7R   S10_1    
-        25        645 33101  39592 7L   S10_1    
-        25        646 33101  39615 7R   S10_1    
-        25        647 33101  39587 7L   S10_1    
-        25        648 33101  39610 7R   S10_1    
-        25        649 33101  39582 7L   S10_1    
-        25        650 33101  39605 7R   S10_1    
-        25        651 33101  48198 7L   R6_1     
-        25        652 33101  45888 7R   R4_1     
-        25        653 33101  48193 7L   R6_1     
-        25        654 33101  48228 7R   R6_1     
-        25        655 33101  48188 7L   R6_1     
-        25        656 33101  48218 7R   R6_1     
-        25        657 33101  48183 7L   R6_1     
-        25        658 33101  48213 7R   R6_1     
-        25        659 33101  48178 7L   R6_1     
-        25        660 33101  48208 7R   R6_1     
-        25        661 33101  48204 7L   R6_1     
-        25        662 33101  39627 7R   S10_1    
-        25        663 33101  48174 7L   R6_1     
-        25        664 33101  39621 7R   S10_1    
-        25        665 33101  39593 7L   S10_1    
-        25        666 33101  39616 7R   S10_1    
-        25        667 33101  39588 7L   S10_1    
-        25        668 33101  39611 7R   S10_1    
-        25        669 33101  39583 7L   S10_1    
-        25        670 33101  39606 7R   S10_1    
-        25        671 33101  48199 7L   R6_1     
-        25        672 33101  45889 7R   R4_1     
-        25        673 33101  48194 7L   R6_1     
-        25        674 33101  48229 7R   R6_1     
-        25        675 33101  48189 7L   R6_1     
-        25        676 33101  48219 7R   R6_1     
-        25        677 33101  48184 7L   R6_1     
-        25        678 33101  48214 7R   R6_1     
-        25        679 33101  48179 7L   R6_1     
-        25        680 33101  48209 7R   R6_1     
-        25        681 33101  48205 7L   R6_1     
-        25        682 33101  44957 7R   R3_1     
-        25        683 33101  48175 7L   R6_1     
-        25        684 33101  39623 7R   S10_1    
-        25        685 33101  39594 7L   S10_1    
-        25        686 33101  39617 7R   S10_1    
-        25        687 33101  39589 7L   S10_1    
-        25        688 33101  39612 7R   S10_1    
-        25        689 33101  39584 7L   S10_1    
-        25        690 33101  39607 7R   S10_1    
-        25        691 33101  48200 7L   R6_1     
-        25        692 33101  45890 7R   R4_1     
-        25        693 33101  48195 7L   R6_1     
-        25        694 33101  48230 7R   R6_1     
-        25        695 33101  48190 7L   R6_1     
-        25        696 33101  48220 7R   R6_1     
-        25        697 33101  48185 7L   R6_1     
-        25        698 33101  48215 7R   R6_1     
-        25        699 33101  48180 7L   R6_1     
-        25        700 33101  48210 7R   R6_1     
-        25        701 33101  39638 8L   S10_1    
-        25        702 33101  39667 8R   S10_1    
-        25        703 33101  39633 8L   S10_1    
-        25        704 33101  39662 8R   S10_1    
-        25        705 33101  39628 8L   S10_1    
-        25        706 33101  39657 8R   S10_1    
-        25        707 33101  45901 8L   R4_1     
-        25        708 33101  39652 8R   S10_1    
-        25        709 33101  48236 8L   R6_1     
-        25        710 33101  48256 8R   R6_1     
-        25        711 33101  48251 8L   R6_1     
-        25        712 33101  48276 8R   R6_1     
-        25        713 33101  48241 8L   R6_1     
-        25        714 33101  48271 8R   R6_1     
-        25        715 33101  48231 8L   R6_1     
-        25        716 33101  48260 8R   R6_1     
-        25        717 33101  48246 8L   R6_1     
-        25        718 33101  48261 8R   R6_1     
-        25        719 33101  45896 8L   R4_1     
-        25        720 33101  43520 8R   R2_1     
-        25        721 33101  39639 8L   S10_1    
-        25        722 33101  39668 8R   S10_1    
-        25        723 33101  39634 8L   S10_1    
-        25        724 33101  39663 8R   S10_1    
-        25        725 33101  39629 8L   S10_1    
-        25        726 33101  39658 8R   S10_1    
-        25        727 33101  45902 8L   R4_1     
-        25        728 33101  39653 8R   S10_1    
-        25        729 33101  48237 8L   R6_1     
-        25        730 33101  48257 8R   R6_1     
-        25        731 33101  48252 8L   R6_1     
-        25        732 33101  48277 8R   R6_1     
-        25        733 33101  48242 8L   R6_1     
-        25        734 33101  48272 8R   R6_1     
-        25        735 33101  48232 8L   R6_1     
-        25        736 33101  48267 8R   R6_1     
-        25        737 33101  48247 8L   R6_1     
-        25        738 33101  48262 8R   R6_1     
-        25        739 33101  45897 8L   R4_1     
-        25        740 33101  45917 8R   R4_1     
-        25        741 33101  39640 8L   S10_1    
-        25        742 33101  39669 8R   S10_1    
-        25        743 33101  39635 8L   S10_1    
-        25        744 33101  39664 8R   S10_1    
-        25        745 33101  39630 8L   S10_1    
-        25        746 33101  39659 8R   S10_1    
-        25        747 33101  45903 8L   R4_1     
-        25        748 33101  39654 8R   S10_1    
-        25        749 33101  48238 8L   R6_1     
-        25        750 33101  48258 8R   R6_1     
-        25        751 33101  48253 8L   R6_1     
-        25        752 33101  48278 8R   R6_1     
-        25        753 33101  48243 8L   R6_1     
-        25        754 33101  48273 8R   R6_1     
-        25        755 33101  48233 8L   R6_1     
-        25        756 33101  48268 8R   R6_1     
-        25        757 33101  48248 8L   R6_1     
-        25        758 33101  48263 8R   R6_1     
-        25        759 33101  45898 8L   R4_1     
-        25        760 33101  45918 8R   R4_1     
-        25        761 33101  39641 8L   S10_1    
-        25        762 33101  39670 8R   S10_1    
-        25        763 33101  39636 8L   S10_1    
-        25        764 33101  39665 8R   S10_1    
-        25        765 33101  39631 8L   S10_1    
-        25        766 33101  39660 8R   S10_1    
-        25        767 33101  45904 8L   R4_1     
-        25        768 33101  39655 8R   S10_1    
-        25        769 33101  48239 8L   R6_1     
-        25        770 33101  48259 8R   R6_1     
-        25        771 33101  48254 8L   R6_1     
-        25        772 33101  48279 8R   R6_1     
-        25        773 33101  48244 8L   R6_1     
-        25        774 33101  48274 8R   R6_1     
-        25        775 33101  48234 8L   R6_1     
-        25        776 33101  48269 8R   R6_1     
-        25        777 33101  48249 8L   R6_1     
-        25        778 33101  48264 8R   R6_1     
-        25        779 33101  45899 8L   R4_1     
-        25        780 33101  45919 8R   R4_1     
-        25        781 33101  39642 8L   S10_1    
-        25        782 33101  39671 8R   S10_1    
-        25        783 33101  39637 8L   S10_1    
-        25        784 33101  39666 8R   S10_1    
-        25        785 33101  39632 8L   S10_1    
-        25        786 33101  39661 8R   S10_1    
-        25        787 33101  45905 8L   R4_1     
-        25        788 33101  39656 8R   S10_1    
-        25        789 33101  48240 8L   R6_1     
-        25        790 33101  48266 8R   R6_1     
-        25        791 33101  48255 8L   R6_1     
-        25        792 33101  48280 8R   R6_1     
-        25        793 33101  48245 8L   R6_1     
-        25        794 33101  48275 8R   R6_1     
-        25        795 33101  48235 8L   R6_1     
-        25        796 33101  48270 8R   R6_1     
-        25        797 33101  48250 8L   R6_1     
-        25        798 33101  48265 8R   R6_1     
-        25        799 33101  45900 8L   R4_1     
-        25        800 33101  45920 8R   R4_1     
-        25        801 33101  48788 9L   R6_2     
-        25        802 33101  39687 9R   S10_1    
-        25        803 33101  48783 9L   R6_2     
-        25        804 33101  39682 9R   S10_1    
-        25        805 33101  48778 9L   R6_2     
-        25        806 33101  39677 9R   S10_1    
-        25        807 33101  48311 9L   R6_1     
-        25        808 33101  48326 9R   R6_1     
-        25        809 33101  48306 9L   R6_1     
-        25        810 33101  48316 9R   R6_1     
-        25        811 33101  48301 9L   R6_1     
-        25        812 33101  47227 9R   R5_1     
-        25        813 33101  48296 9L   R6_1     
-        25        814 33101  47222 9R   R5_1     
-        25        815 33101  48291 9L   R6_1     
-        25        816 33101  47201 9R   R5_1     
-        25        817 33101  48286 9L   R6_1     
-        25        818 33101  45946 9R   R4_1     
-        25        819 33101  48281 9L   R6_1     
-        25        820 33101  45936 9R   R4_1     
-        25        821 33101  48789 9L   R6_2     
-        25        822 33101  39688 9R   S10_1    
-        25        823 33101  48784 9L   R6_2     
-        25        824 33101  39683 9R   S10_1    
-        25        825 33101  48779 9L   R6_2     
-        25        826 33101  39678 9R   S10_1    
-        25        827 33101  48312 9L   R6_1     
-        25        828 33101  48327 9R   R6_1     
-        25        829 33101  48307 9L   R6_1     
-        25        830 33101  48317 9R   R6_1     
-        25        831 33101  48302 9L   R6_1     
-        25        832 33101  47228 9R   R5_1     
-        25        833 33101  48297 9L   R6_1     
-        25        834 33101  47223 9R   R5_1     
-        25        835 33101  48292 9L   R6_1     
-        25        836 33101  47213 9R   R5_1     
-        25        837 33101  48287 9L   R6_1     
-        25        838 33101  45947 9R   R4_1     
-        25        839 33101  48282 9L   R6_1     
-        25        840 33101  45937 9R   R4_1     
-        25        841 33101  44988 9L   R3_1     
-        25        842 33101  39689 9R   S10_1    
-        25        843 33101  48785 9L   R6_2     
-        25        844 33101  39684 9R   S10_1    
-        25        845 33101  48780 9L   R6_2     
-        25        846 33101  39679 9R   S10_1    
-        25        847 33101  48313 9L   R6_1     
-        25        848 33101  48328 9R   R6_1     
-        25        849 33101  48308 9L   R6_1     
-        25        850 33101  48318 9R   R6_1     
-        25        851 33101  48303 9L   R6_1     
-        25        852 33101  47229 9R   R5_1     
-        25        853 33101  48298 9L   R6_1     
-        25        854 33101  47224 9R   R5_1     
-        25        855 33101  48293 9L   R6_1     
-        25        856 33101  47214 9R   R5_1     
-        25        857 33101  48288 9L   R6_1     
-        25        858 33101  45948 9R   R4_1     
-        25        859 33101  48283 9L   R6_1     
-        25        860 33101  45938 9R   R4_1     
-        25        861 33101  45000 9L   R3_1     
-        25        862 33101  39690 9R   S10_1    
-        25        863 33101  48786 9L   R6_2     
-        25        864 33101  39685 9R   S10_1    
-        25        865 33101  48781 9L   R6_2     
-        25        866 33101  39680 9R   S10_1    
-        25        867 33101  48314 9L   R6_1     
-        25        868 33101  48329 9R   R6_1     
-        25        869 33101  48309 9L   R6_1     
-        25        870 33101  48319 9R   R6_1     
-        25        871 33101  48304 9L   R6_1     
-        25        872 33101  47230 9R   R5_1     
-        25        873 33101  48299 9L   R6_1     
-        25        874 33101  47225 9R   R5_1     
-        25        875 33101  48294 9L   R6_1     
-        25        876 33101  47215 9R   R5_1     
-        25        877 33101  48289 9L   R6_1     
-        25        878 33101  45949 9R   R4_1     
-        25        879 33101  48284 9L   R6_1     
-        25        880 33101  45939 9R   R4_1     
-        25        881 33101  45931 9L   R4_1     
-        25        882 33101  39691 9R   S10_1    
-        25        883 33101  48787 9L   R6_2     
-        25        884 33101  39686 9R   S10_1    
-        25        885 33101  48782 9L   R6_2     
-        25        886 33101  39681 9R   S10_1    
-        25        887 33101  48315 9L   R6_1     
-        25        888 33101  48330 9R   R6_1     
-        25        889 33101  48310 9L   R6_1     
-        25        890 33101  48320 9R   R6_1     
-        25        891 33101  48305 9L   R6_1     
-        25        892 33101  43263 9R   R1_2     
-        25        893 33101  48300 9L   R6_1     
-        25        894 33101  47226 9R   R5_1     
-        25        895 33101  48295 9L   R6_1     
-        25        896 33101  47216 9R   R5_1     
-        25        897 33101  48290 9L   R6_1     
-        25        898 33101  45950 9R   R4_1     
-        25        899 33101  48285 9L   R6_1     
-        25        900 33101  45940 9R   R4_1     
-        25        901 33101  48813 10L  R6_2     
-        25        902 33101  48838 10R  R6_2     
-        25        903 33101  48808 10L  R6_2     
-        25        904 33101  48833 10R  R6_2     
-        25        905 33101  48803 10L  R6_2     
-        25        906 33101  48828 10R  R6_2     
-        25        907 33101  48798 10L  R6_2     
-        25        908 33101  48823 10R  R6_2     
-        25        909 33101  48356 10L  R6_1     
-        25        910 33101  48376 10R  R6_1     
-        25        911 33101  48351 10L  R6_1     
-        25        912 33101  48371 10R  R6_1     
-        25        913 33101  48346 10L  R6_1     
-        25        914 33101  48366 10R  R6_1     
-        25        915 33101  48341 10L  R6_1     
-        25        916 33101  48361 10R  R6_1     
-        25        917 33101  47546 10L  R5_2     
-        25        918 33101  47588 10R  R5_2     
-        25        919 33101  47561 10L  R5_2     
-        25        920 33101  47583 10R  R5_2     
-        25        921 33101  48814 10L  R6_2     
-        25        922 33101  48839 10R  R6_2     
-        25        923 33101  48809 10L  R6_2     
-        25        924 33101  48834 10R  R6_2     
-        25        925 33101  48804 10L  R6_2     
-        25        926 33101  48829 10R  R6_2     
-        25        927 33101  48799 10L  R6_2     
-        25        928 33101  48824 10R  R6_2     
-        25        929 33101  48357 10L  R6_1     
-        25        930 33101  48377 10R  R6_1     
-        25        931 33101  48352 10L  R6_1     
-        25        932 33101  48372 10R  R6_1     
-        25        933 33101  48347 10L  R6_1     
-        25        934 33101  48367 10R  R6_1     
-        25        935 33101  48342 10L  R6_1     
-        25        936 33101  48362 10R  R6_1     
-        25        937 33101  47547 10L  R5_2     
-        25        938 33101  47589 10R  R5_2     
-        25        939 33101  47562 10L  R5_2     
-        25        940 33101  47584 10R  R5_2     
-        25        941 33101  48815 10L  R6_2     
-        25        942 33101  48840 10R  R6_2     
-        25        943 33101  48810 10L  R6_2     
-        25        944 33101  48835 10R  R6_2     
-        25        945 33101  48805 10L  R6_2     
-        25        946 33101  48830 10R  R6_2     
-        25        947 33101  48800 10L  R6_2     
-        25        948 33101  48825 10R  R6_2     
-        25        949 33101  48358 10L  R6_1     
-        25        950 33101  48378 10R  R6_1     
-        25        951 33101  48353 10L  R6_1     
-        25        952 33101  48373 10R  R6_1     
-        25        953 33101  48348 10L  R6_1     
-        25        954 33101  48368 10R  R6_1     
-        25        955 33101  48343 10L  R6_1     
-        25        956 33101  48363 10R  R6_1     
-        25        957 33101  47548 10L  R5_2     
-        25        958 33101  47590 10R  R5_2     
-        25        959 33101  47538 10L  R5_2     
-        25        960 33101  47585 10R  R5_2     
-        25        961 33101  48816 10L  R6_2     
-        25        962 33101  48841 10R  R6_2     
-        25        963 33101  48811 10L  R6_2     
-        25        964 33101  48836 10R  R6_2     
-        25        965 33101  48806 10L  R6_2     
-        25        966 33101  48831 10R  R6_2     
-        25        967 33101  48801 10L  R6_2     
-        25        968 33101  48826 10R  R6_2     
-        25        969 33101  48359 10L  R6_1     
-        25        970 33101  48379 10R  R6_1     
-        25        971 33101  48354 10L  R6_1     
-        25        972 33101  48374 10R  R6_1     
-        25        973 33101  48349 10L  R6_1     
-        25        974 33101  48369 10R  R6_1     
-        25        975 33101  48344 10L  R6_1     
-        25        976 33101  48364 10R  R6_1     
-        25        977 33101  47549 10L  R5_2     
-        25        978 33101  47591 10R  R5_2     
-        25        979 33101  47539 10L  R5_2     
-        25        980 33101  47586 10R  R5_2     
-        25        981 33101  48817 10L  R6_2     
-        25        982 33101  48842 10R  R6_2     
-        25        983 33101  48812 10L  R6_2     
-        25        984 33101  48837 10R  R6_2     
-        25        985 33101  48807 10L  R6_2     
-        25        986 33101  48832 10R  R6_2     
-        25        987 33101  48802 10L  R6_2     
-        25        988 33101  48827 10R  R6_2     
-        25        989 33101  48360 10L  R6_1     
-        25        990 33101  48380 10R  R6_1     
-        25        991 33101  48355 10L  R6_1     
-        25        992 33101  48375 10R  R6_1     
-        25        993 33101  48350 10L  R6_1     
-        25        994 33101  48370 10R  R6_1     
-        25        995 33101  48345 10L  R6_1     
-        25        996 33101  48365 10R  R6_1     
-        25        997 33101  47550 10L  R5_2     
-        25        998 33101  47592 10R  R5_2     
-        25        999 33101  47540 10L  R5_2     
-        25       1000 33101  47587 10R  R5_2     
-        25       1001 33101  48868 11L  R6_2     
-        25       1002 33101  48913 11R  R6_2     
-        25       1003 33101  48863 11L  R6_2     
-        25       1004 33101  48903 11R  R6_2     
-        25       1005 33101  48858 11L  R6_2     
-        25       1006 33101  48898 11R  R6_2     
-        25       1007 33101  48853 11L  R6_2     
-        25       1008 33101  48893 11R  R6_2     
-        25       1009 33101  48396 11L  R6_1     
-        25       1010 33101  48416 11R  R6_1     
-        25       1011 33101  48391 11L  R6_1     
-        25       1012 33101  48411 11R  R6_1     
-        25       1013 33101  48386 11L  R6_1     
-        25       1014 33101  48406 11R  R6_1     
-        25       1015 33101  48381 11L  R6_1     
-        25       1016 33101  48401 11R  R6_1     
-        25       1017 33101  47625 11L  R5_2     
-        25       1018 33101  47657 11R  R5_2     
-        25       1019 33101  47600 11L  R5_2     
-        25       1020 33101  47652 11R  R5_2     
-        25       1021 33101  48869 11L  R6_2     
-        25       1022 33101  48914 11R  R6_2     
-        25       1023 33101  48864 11L  R6_2     
-        25       1024 33101  48904 11R  R6_2     
-        25       1025 33101  48859 11L  R6_2     
-        25       1026 33101  48899 11R  R6_2     
-        25       1027 33101  48854 11L  R6_2     
-        25       1028 33101  48894 11R  R6_2     
-        25       1029 33101  48397 11L  R6_1     
-        25       1030 33101  48417 11R  R6_1     
-        25       1031 33101  48392 11L  R6_1     
-        25       1032 33101  48412 11R  R6_1     
-        25       1033 33101  48387 11L  R6_1     
-        25       1034 33101  48407 11R  R6_1     
-        25       1035 33101  48382 11L  R6_1     
-        25       1036 33101  48402 11R  R6_1     
-        25       1037 33101  47626 11L  R5_2     
-        25       1038 33101  47658 11R  R5_2     
-        25       1039 33101  47601 11L  R5_2     
-        25       1040 33101  47653 11R  R5_2     
-        25       1041 33101  48870 11L  R6_2     
-        25       1042 33101  48915 11R  R6_2     
-        25       1043 33101  48865 11L  R6_2     
-        25       1044 33101  48905 11R  R6_2     
-        25       1045 33101  48860 11L  R6_2     
-        25       1046 33101  48900 11R  R6_2     
-        25       1047 33101  48855 11L  R6_2     
-        25       1048 33101  48895 11R  R6_2     
-        25       1049 33101  48398 11L  R6_1     
-        25       1050 33101  48418 11R  R6_1     
-        25       1051 33101  48393 11L  R6_1     
-        25       1052 33101  48413 11R  R6_1     
-        25       1053 33101  48388 11L  R6_1     
-        25       1054 33101  48408 11R  R6_1     
-        25       1055 33101  48383 11L  R6_1     
-        25       1056 33101  48403 11R  R6_1     
-        25       1057 33101  43302 11L  R1_2     
-        25       1058 33101  47659 11R  R5_2     
-        25       1059 33101  47602 11L  R5_2     
-        25       1060 33101  47654 11R  R5_2     
-        25       1061 33101  48871 11L  R6_2     
-        25       1062 33101  48916 11R  R6_2     
-        25       1063 33101  48866 11L  R6_2     
-        25       1064 33101  48906 11R  R6_2     
-        25       1065 33101  48861 11L  R6_2     
-        25       1066 33101  48901 11R  R6_2     
-        25       1067 33101  48856 11L  R6_2     
-        25       1068 33101  48896 11R  R6_2     
-        25       1069 33101  48399 11L  R6_1     
-        25       1070 33101  48419 11R  R6_1     
-        25       1071 33101  48394 11L  R6_1     
-        25       1072 33101  48414 11R  R6_1     
-        25       1073 33101  48389 11L  R6_1     
-        25       1074 33101  48409 11R  R6_1     
-        25       1075 33101  48384 11L  R6_1     
-        25       1076 33101  48404 11R  R6_1     
-        25       1077 33101  43668 11L  R2_1     
-        25       1078 33101  47660 11R  R5_2     
-        25       1079 33101  47603 11L  R5_2     
-        25       1080 33101  47655 11R  R5_2     
-        25       1081 33101  48872 11L  R6_2     
-        25       1082 33101  48917 11R  R6_2     
-        25       1083 33101  48867 11L  R6_2     
-        25       1084 33101  48907 11R  R6_2     
-        25       1085 33101  48862 11L  R6_2     
-        25       1086 33101  48902 11R  R6_2     
-        25       1087 33101  48857 11L  R6_2     
-        25       1088 33101  48897 11R  R6_2     
-        25       1089 33101  48400 11L  R6_1     
-        25       1090 33101  48420 11R  R6_1     
-        25       1091 33101  48395 11L  R6_1     
-        25       1092 33101  48415 11R  R6_1     
-        25       1093 33101  48390 11L  R6_1     
-        25       1094 33101  48410 11R  R6_1     
-        25       1095 33101  48385 11L  R6_1     
-        25       1096 33101  48405 11R  R6_1     
-        25       1097 33101  43671 11L  R2_1     
-        25       1098 33101  47661 11R  R5_2     
-        25       1099 33101  47604 11L  R5_2     
-        25       1100 33101  47656 11R  R5_2     
-        25       1101 33101  48944 12L  R6_2     
-        25       1102 33101  48959 12R  R6_2     
-        25       1103 33101  48939 12L  R6_2     
-        25       1104 33101  48954 12R  R6_2     
-        25       1105 33101  48934 12L  R6_2     
-        25       1106 33101  48949 12R  R6_2     
-        25       1107 33101  45439 12L  R3_2     
-        25       1108 33101  48456 12R  R6_1     
-        25       1109 33101  48436 12L  R6_1     
-        25       1110 33101  48451 12R  R6_1     
-        25       1111 33101  48431 12L  R6_1     
-        25       1112 33101  48446 12R  R6_2     
-        25       1113 33101  48426 12L  R6_1     
-        25       1114 33101  48441 12R  R6_1     
-        25       1115 33101  48421 12L  R6_1     
-        25       1116 33101  45462 12R  R3_2     
-        25       1117 33101  47692 12L  R5_2     
-        25       1118 33101  47724 12R  R5_2     
-        25       1119 33101  34852 12L  S8_4     
-        25       1120 33101  47699 12R  R5_2     
-        25       1121 33101  48945 12L  R6_2     
-        25       1122 33101  48960 12R  R6_2     
-        25       1123 33101  48940 12L  R6_2     
-        25       1124 33101  48955 12R  R6_2     
-        25       1125 33101  48935 12L  R6_2     
-        25       1126 33101  48950 12R  R6_2     
-        25       1127 33101  45440 12L  R3_2     
-        25       1128 33101  48457 12R  R6_1     
-        25       1129 33101  48437 12L  R6_1     
-        25       1130 33101  48452 12R  R6_1     
-        25       1131 33101  48432 12L  R6_1     
-        25       1132 33101  48447 12R  R6_1     
-        25       1133 33101  48427 12L  R6_1     
-        25       1134 33101  48442 12R  R6_1     
-        25       1135 33101  48422 12L  R6_1     
-        25       1136 33101  45463 12R  R3_2     
-        25       1137 33101  47693 12L  R5_2     
-        25       1138 33101  47725 12R  R5_2     
-        25       1139 33101  47673 12L  R5_2     
-        25       1140 33101  47700 12R  R5_2     
-        25       1141 33101  48946 12L  R6_2     
-        25       1142 33101  48961 12R  R6_2     
-        25       1143 33101  48941 12L  R6_2     
-        25       1144 33101  48956 12R  R6_2     
-        25       1145 33101  48936 12L  R6_2     
-        25       1146 33101  48951 12R  R6_2     
-        25       1147 33101  45441 12L  R3_2     
-        25       1148 33101  48458 12R  R6_1     
-        25       1149 33101  48438 12L  R6_1     
-        25       1150 33101  48453 12R  R6_1     
-        25       1151 33101  48433 12L  R6_1     
-        25       1152 33101  48448 12R  R6_2     
-        25       1153 33101  48428 12L  R6_1     
-        25       1154 33101  48443 12R  R6_1     
-        25       1155 33101  48423 12L  R6_1     
-        25       1156 33101  45464 12R  R3_2     
-        25       1157 33101  41434 12L  S10_5    
-        25       1158 33101  45482 12R  R3_2     
-        25       1159 33101  47684 12L  R5_2     
-        25       1160 33101  47701 12R  R5_2     
-        25       1161 33101  48947 12L  R6_2     
-        25       1162 33101  48962 12R  R6_2     
-        25       1163 33101  48942 12L  R6_2     
-        25       1164 33101  48957 12R  R6_2     
-        25       1165 33101  48937 12L  R6_2     
-        25       1166 33101  48952 12R  R6_2     
-        25       1167 33101  45442 12L  R3_2     
-        25       1168 33101  48459 12R  R6_1     
-        25       1169 33101  48439 12L  R6_1     
-        25       1170 33101  48454 12R  R6_1     
-        25       1171 33101  48434 12L  R6_1     
-        25       1172 33101  48449 12R  R6_1     
-        25       1173 33101  48429 12L  R6_1     
-        25       1174 33101  48444 12R  R6_1     
-        25       1175 33101  48424 12L  R6_1     
-        25       1176 33101  45465 12R  R3_2     
-        25       1177 33101  43746 12L  R2_1     
-        25       1178 33101  45483 12R  R3_2     
-        25       1179 33101  47675 12L  R5_2     
-        25       1180 33101  47702 12R  R5_2     
-        25       1181 33101  48948 12L  R6_2     
-        25       1182 33101  48963 12R  R6_2     
-        25       1183 33101  48943 12L  R6_2     
-        25       1184 33101  48958 12R  R6_2     
-        25       1185 33101  48938 12L  R6_2     
-        25       1186 33101  48953 12R  R6_2     
-        25       1187 33101  45443 12L  R3_2     
-        25       1188 33101  48460 12R  R6_1     
-        25       1189 33101  48440 12L  R6_1     
-        25       1190 33101  48455 12R  R6_1     
-        25       1191 33101  48435 12L  R6_1     
-        25       1192 33101  48450 12R  R6_1     
-        25       1193 33101  48430 12L  R6_1     
-        25       1194 33101  48445 12R  R6_1     
-        25       1195 33101  48425 12L  R6_1     
-        25       1196 33101  45476 12R  R3_2     
-        25       1197 33101  43747 12L  R2_1     
-        25       1198 33101  45484 12R  R3_2     
-        25       1199 33101  47676 12L  R5_2     
-        25       1200 33101  47703 12R  R5_2     
-        25       1201 33101  48989 13L  R6_2     
-        25       1202 33101  49039 13R  R6_2     
-        25       1203 33101  48999 13L  R6_2     
-        25       1204 33101  49014 13R  R6_2     
-        25       1205 33101  48994 13L  R6_2     
-        25       1206 33101  49024 13R  R6_2     
-        25       1207 33101  44436 13L  R2_2     
-        25       1208 33101  49019 13R  R6_2     
-        25       1209 33101  48476 13L  R6_1     
-        25       1210 33101  45535 13R  R3_2     
-        25       1211 33101  48471 13L  R6_1     
-        25       1212 33101  47789 13R  R5_2     
-        25       1213 33101  48466 13L  R6_1     
-        25       1214 33101  48496 13R  R6_1     
-        25       1215 33101  48461 13L  R6_1     
-        25       1216 33101  48491 13R  R6_1     
-        25       1217 33101  47756 13L  R5_2     
-        25       1218 33101  48486 13R  R6_1     
-        25       1219 33101  47751 13L  R5_2     
-        25       1220 33101  48481 13R  R6_1     
-        25       1221 33101  48990 13L  R6_2     
-        25       1222 33101  49040 13R  R6_2     
-        25       1223 33101  49000 13L  R6_2     
-        25       1224 33101  49015 13R  R6_2     
-        25       1225 33101  48995 13L  R6_2     
-        25       1226 33101  49025 13R  R6_2     
-        25       1227 33101  44439 13L  R2_2     
-        25       1228 33101  49020 13R  R6_2     
-        25       1229 33101  48477 13L  R6_1     
-        25       1230 33101  45536 13R  R3_2     
-        25       1231 33101  48472 13L  R6_1     
-        25       1232 33101  47790 13R  R5_2     
-        25       1233 33101  48467 13L  R6_1     
-        25       1234 33101  48497 13R  R6_1     
-        25       1235 33101  48462 13L  R6_1     
-        25       1236 33101  48492 13R  R6_1     
-        25       1237 33101  47757 13L  R5_2     
-        25       1238 33101  48487 13R  R6_1     
-        25       1239 33101  47752 13L  R5_2     
-        25       1240 33101  48482 13R  R6_1     
-        25       1241 33101  48991 13L  R6_2     
-        25       1242 33101  49031 13R  R6_2     
-        25       1243 33101  49001 13L  R6_2     
-        25       1244 33101  49016 13R  R6_2     
-        25       1245 33101  48996 13L  R6_2     
-        25       1246 33101  49026 13R  R6_2     
-        25       1247 33101  44440 13L  R2_2     
-        25       1248 33101  49021 13R  R6_2     
-        25       1249 33101  48478 13L  R6_1     
-        25       1250 33101  47780 13R  R5_2     
-        25       1251 33101  48473 13L  R6_1     
-        25       1252 33101  43849 13R  R2_1     
-        25       1253 33101  48468 13L  R6_1     
-        25       1254 33101  48498 13R  R6_1     
-        25       1255 33101  48463 13L  R6_1     
-        25       1256 33101  48493 13R  R6_1     
-        25       1257 33101  47758 13L  R5_2     
-        25       1258 33101  48488 13R  R6_1     
-        25       1259 33101  47753 13L  R5_2     
-        25       1260 33101  48483 13R  R6_1     
-        25       1261 33101  48992 13L  R6_2     
-        25       1262 33101  49032 13R  R6_2     
-        25       1263 33101  49002 13L  R6_2     
-        25       1264 33101  49036 13R  R6_2     
-        25       1265 33101  48997 13L  R6_2     
-        25       1266 33101  49027 13R  R6_2     
-        25       1267 33101  45502 13L  R3_2     
-        25       1268 33101  49022 13R  R6_2     
-        25       1269 33101  48479 13L  R6_1     
-        25       1270 33101  47782 13R  R5_2     
-        25       1271 33101  48474 13L  R6_1     
-        25       1272 33101  45550 13R  R3_2     
-        25       1273 33101  48469 13L  R6_1     
-        25       1274 33101  48499 13R  R6_1     
-        25       1275 33101  48464 13L  R6_1     
-        25       1276 33101  48494 13R  R6_1     
-        25       1277 33101  45518 13L  R3_2     
-        25       1278 33101  48489 13R  R6_1     
-        25       1279 33101  47754 13L  R5_2     
-        25       1280 33101  48484 13R  R6_1     
-        25       1281 33101  48993 13L  R6_2     
-        25       1282 33101  49033 13R  R6_2     
-        25       1283 33101  49003 13L  R6_2     
-        25       1284 33101  49018 13R  R6_2     
-        25       1285 33101  48998 13L  R6_2     
-        25       1286 33101  49028 13R  R6_2     
-        25       1287 33101  45501 13L  R3_2     
-        25       1288 33101  49023 13R  R6_2     
-        25       1289 33101  48480 13L  R6_1     
-        25       1290 33101  47783 13R  R5_2     
-        25       1291 33101  48475 13L  R6_1     
-        25       1292 33101  46662 13R  R4_2     
-        25       1293 33101  48470 13L  R6_1     
-        25       1294 33101  48500 13R  R6_1     
-        25       1295 33101  48465 13L  R6_1     
-        25       1296 33101  48495 13R  R6_1     
-        25       1297 33101  45519 13L  R3_2     
-        25       1298 33101  48490 13R  R6_1     
-        25       1299 33101  47755 13L  R5_2     
-        25       1300 33101  48485 13R  R6_1     
-        25       1301 33101  37030 14L  S9_3     
-        25       1302 33101  36336 14R  S9_1     
-        25       1303 33101  47385 14L  R5_2     
-        25       1304 33101  47406 14R  R5_2     
-        25       1305 33101  47390 14L  R5_2     
-        25       1306 33101  47411 14R  R5_2     
-        25       1307 33101  47395 14L  R5_2     
-        25       1308 33101  47416 14R  R5_2     
-        25       1309 33101  47400 14L  R5_2     
-        25       1310 33101  47421 14R  R5_2     
-        25       1311 33101  47405 14L  R5_2     
-        25       1312 33101  47426 14R  R5_2     
-        25       1313 33101  48010 14L  R6_1     
-        25       1314 33101  48026 14R  R6_1     
-        25       1315 33101  48005 14L  R6_1     
-        25       1316 33101  48021 14R  R6_1     
-        25       1317 33101  48015 14L  R6_1     
-        25       1318 33101  48031 14R  R6_1     
-        25       1319 33101  36326 14L  S9_1     
-        25       1320 33101  48036 14R  R6_1     
-        25       1321 33101  47381 14L  R5_2     
-        25       1322 33101  36341 14R  S9_1     
-        25       1323 33101  47386 14L  R5_2     
-        25       1324 33101  47407 14R  R5_2     
-        25       1325 33101  47391 14L  R5_2     
-        25       1326 33101  47412 14R  R5_2     
-        25       1327 33101  47396 14L  R5_2     
-        25       1328 33101  47417 14R  R5_2     
-        25       1329 33101  47401 14L  R5_2     
-        25       1330 33101  47422 14R  R5_2     
-        25       1331 33101  48001 14L  R6_1     
-        25       1332 33101  47427 14R  R5_2     
-        25       1333 33101  48011 14L  R6_1     
-        25       1334 33101  48027 14R  R6_1     
-        25       1335 33101  48006 14L  R6_1     
-        25       1336 33101  48022 14R  R6_1     
-        25       1337 33101  48016 14L  R6_1     
-        25       1338 33101  48032 14R  R6_1     
-        25       1339 33101  36631 14L  S9_2     
-        25       1340 33101  48037 14R  R6_1     
-        25       1341 33101  47382 14L  R5_2     
-        25       1342 33101  36353 14R  S9_1     
-        25       1343 33101  47387 14L  R5_2     
-        25       1344 33101  47408 14R  R5_2     
-        25       1345 33101  47392 14L  R5_2     
-        25       1346 33101  47413 14R  R5_2     
-        25       1347 33101  47397 14L  R5_2     
-        25       1348 33101  47418 14R  R5_2     
-        25       1349 33101  47402 14L  R5_2     
-        25       1350 33101  47423 14R  R5_2     
-        25       1351 33101  48002 14L  R6_1     
-        25       1352 33101  47428 14R  R5_2     
-        25       1353 33101  48012 14L  R6_1     
-        25       1354 33101  48028 14R  R6_1     
-        25       1355 33101  48007 14L  R6_1     
-        25       1356 33101  48023 14R  R6_1     
-        25       1357 33101  48017 14L  R6_1     
-        25       1358 33101  48033 14R  R6_1     
-        25       1359 33101  37027 14L  S9_3     
-        25       1360 33101  48038 14R  R6_1     
-        25       1361 33101  47383 14L  R5_2     
-        25       1362 33101  36360 14R  S9_1     
-        25       1363 33101  47388 14L  R5_2     
-        25       1364 33101  47409 14R  R5_2     
-        25       1365 33101  47393 14L  R5_2     
-        25       1366 33101  47414 14R  R5_2     
-        25       1367 33101  47398 14L  R5_2     
-        25       1368 33101  47419 14R  R5_2     
-        25       1369 33101  47403 14L  R5_2     
-        25       1370 33101  47424 14R  R5_2     
-        25       1371 33101  48003 14L  R6_1     
-        25       1372 33101  47429 14R  R5_2     
-        25       1373 33101  48013 14L  R6_1     
-        25       1374 33101  48029 14R  R6_1     
-        25       1375 33101  48008 14L  R6_1     
-        25       1376 33101  48024 14R  R6_1     
-        25       1377 33101  48018 14L  R6_1     
-        25       1378 33101  48034 14R  R6_1     
-        25       1379 33101  37028 14L  S9_3     
-        25       1380 33101  48039 14R  R6_1     
-        25       1381 33101  47384 14L  R5_2     
-        25       1382 33101  37039 14R  S9_3     
-        25       1383 33101  47389 14L  R5_2     
-        25       1384 33101  47410 14R  R5_2     
-        25       1385 33101  47394 14L  R5_2     
-        25       1386 33101  47415 14R  R5_2     
-        25       1387 33101  47399 14L  R5_2     
-        25       1388 33101  47420 14R  R5_2     
-        25       1389 33101  47404 14L  R5_2     
-        25       1390 33101  47425 14R  R5_2     
-        25       1391 33101  48004 14L  R6_1     
-        25       1392 33101  47430 14R  R5_2     
-        25       1393 33101  48014 14L  R6_1     
-        25       1394 33101  48030 14R  R6_1     
-        25       1395 33101  48009 14L  R6_1     
-        25       1396 33101  48025 14R  R6_1     
-        25       1397 33101  48019 14L  R6_1     
-        25       1398 33101  48035 14R  R6_1     
-        25       1399 33101  37029 14L  S9_3     
-        25       1400 33101  48040 14R  R6_1     
-        25       1401 33101  45733 15L  R4_1     
-        25       1402 33101  36395 15R  S9_1     
-        25       1403 33101  47432 15L  R5_2     
-        25       1404 33101  42267 15R  P19      
-        25       1405 33101  47436 15L  R5_2     
-        25       1406 33101  47460 15R  R5_2     
-        25       1407 33101  47441 15L  R5_2     
-        25       1408 33101  47465 15R  R5_2     
-        25       1409 33101  47451 15L  R5_2     
-        25       1410 33101  47476 15R  R5_2     
-        25       1411 33101  47446 15L  R5_2     
-        25       1412 33101  47471 15R  R5_2     
-        25       1413 33101  48052 15L  R6_1     
-        25       1414 33101  48061 15R  R6_1     
-        25       1415 33101  48041 15L  R6_1     
-        25       1416 33101  48066 15R  R6_1     
-        25       1417 33101  48046 15L  R6_1     
-        25       1418 33101  48071 15R  R6_1     
-        25       1419 33101  40167 15L  S10_3    
-        25       1420 33101  39349 15R  S10_1    
-        25       1421 33101  45734 15L  R4_1     
-        25       1422 33101  36400 15R  S9_1     
-        25       1423 33101  47433 15L  R5_2     
-        25       1424 33101  46951 15R  R5_1     
-        25       1425 33101  47437 15L  R5_2     
-        25       1426 33101  47461 15R  R5_2     
-        25       1427 33101  47442 15L  R5_2     
-        25       1428 33101  47466 15R  R5_2     
-        25       1429 33101  47452 15L  R5_2     
-        25       1430 33101  47477 15R  R5_2     
-        25       1431 33101  47447 15L  R5_2     
-        25       1432 33101  47472 15R  R5_2     
-        25       1433 33101  45738 15L  R4_1     
-        25       1434 33101  48062 15R  R6_1     
-        25       1435 33101  48042 15L  R6_1     
-        25       1436 33101  48067 15R  R6_1     
-        25       1437 33101  48047 15L  R6_1     
-        25       1438 33101  48072 15R  R6_1     
-        25       1439 33101  40171 15L  S10_3    
-        25       1440 33101  39352 15R  S10_1    
-        25       1441 33101  45735 15L  R4_1     
-        25       1442 33101  37077 15R  S9_3     
-        25       1443 33101  47434 15L  R5_2     
-        25       1444 33101  47456 15R  R5_2     
-        25       1445 33101  47438 15L  R5_2     
-        25       1446 33101  47462 15R  R5_2     
-        25       1447 33101  47443 15L  R5_2     
-        25       1448 33101  47467 15R  R5_2     
-        25       1449 33101  47453 15L  R5_2     
-        25       1450 33101  47478 15R  R5_2     
-        25       1451 33101  47448 15L  R5_2     
-        25       1452 33101  47473 15R  R5_2     
-        25       1453 33101  45739 15L  R4_1     
-        25       1454 33101  48063 15R  R6_1     
-        25       1455 33101  48043 15L  R6_1     
-        25       1456 33101  48068 15R  R6_1     
-        25       1457 33101  48048 15L  R6_1     
-        25       1458 33101  48073 15R  R6_1     
-        25       1459 33101  42233 15L  P19      
-        25       1460 33101  39354 15R  S10_1    
-        25       1461 33101  45736 15L  R4_1     
-        25       1462 33101  37078 15R  S9_3     
-        25       1463 33101  47435 15L  R5_2     
-        25       1464 33101  47457 15R  R5_2     
-        25       1465 33101  47439 15L  R5_2     
-        25       1466 33101  47463 15R  R5_2     
-        25       1467 33101  47444 15L  R5_2     
-        25       1468 33101  47468 15R  R5_2     
-        25       1469 33101  47454 15L  R5_2     
-        25       1470 33101  47479 15R  R5_2     
-        25       1471 33101  47449 15L  R5_2     
-        25       1472 33101  47474 15R  R5_2     
-        25       1473 33101  45740 15L  R4_1     
-        25       1474 33101  48064 15R  R6_1     
-        25       1475 33101  48044 15L  R6_1     
-        25       1476 33101  48069 15R  R6_1     
-        25       1477 33101  48049 15L  R6_1     
-        25       1478 33101  47470 15R  R5_2     
-        25       1479 33101  42257 15L  P19      
-        25       1480 33101  39355 15R  S10_1    
-        25       1481 33101  45737 15L  R4_1     
-        25       1482 33101  41099 15R  S10_5    
-        25       1483 33101  48051 15L  R6_1     
-        25       1484 33101  47459 15R  R5_2     
-        25       1485 33101  47440 15L  R5_2     
-        25       1486 33101  47464 15R  R5_2     
-        25       1487 33101  47445 15L  R5_2     
-        25       1488 33101  47469 15R  R5_2     
-        25       1489 33101  47455 15L  R5_2     
-        25       1490 33101  47480 15R  R5_2     
-        25       1491 33101  47450 15L  R5_2     
-        25       1492 33101  47475 15R  R5_2     
-        25       1493 33101  47431 15L  R5_2     
-        25       1494 33101  48065 15R  R6_1     
-        25       1495 33101  48045 15L  R6_1     
-        25       1496 33101  48070 15R  R6_1     
-        25       1497 33101  48050 15L  R6_1     
-        25       1498 33101  41098 15R  S10_5    
-        25       1499 33101  36382 15L  S9_1     
-        25       1500 33101  39361 15R  S10_1    
-        25       1501 33101  47481 16L  R5_2     
-        25       1502 33101  36480 16R  S9_1     
-        25       1503 33101  47486 16L  R5_2     
-        25       1504 33101  47006 16R  R5_1     
-        25       1505 33101  47491 16L  R5_2     
-        25       1506 33101  47511 16R  R5_2     
-        25       1507 33101  47496 16L  R5_2     
-        25       1508 33101  47516 16R  R5_2     
-        25       1509 33101  47501 16L  R5_2     
-        25       1510 33101  47521 16R  R5_2     
-        25       1511 33101  48081 16L  R6_1     
-        25       1512 33101  47526 16R  R5_2     
-        25       1513 33101  48086 16L  R6_1     
-        25       1514 33101  48101 16R  R6_1     
-        25       1515 33101  48091 16L  R6_1     
-        25       1516 33101  48106 16R  R6_1     
-        25       1517 33101  36443 16L  S9_1     
-        25       1518 33101  48116 16R  R6_1     
-        25       1519 33101  48096 16L  R6_1     
-        25       1520 33101  48111 16R  R6_1     
-        25       1521 33101  47482 16L  R5_2     
-        25       1522 33101  36485 16R  S9_1     
-        25       1523 33101  47487 16L  R5_2     
-        25       1524 33101  47020 16R  R5_1     
-        25       1525 33101  47492 16L  R5_2     
-        25       1526 33101  47512 16R  R5_2     
-        25       1527 33101  47497 16L  R5_2     
-        25       1528 33101  47517 16R  R5_2     
-        25       1529 33101  47502 16L  R5_2     
-        25       1530 33101  47522 16R  R5_2     
-        25       1531 33101  48082 16L  R6_1     
-        25       1532 33101  47527 16R  R5_2     
-        25       1533 33101  48087 16L  R6_1     
-        25       1534 33101  48102 16R  R6_1     
-        25       1535 33101  48092 16L  R6_1     
-        25       1536 33101  48107 16R  R6_1     
-        25       1537 33101  36448 16L  S9_1     
-        25       1538 33101  48117 16R  R6_1     
-        25       1539 33101  48097 16L  R6_1     
-        25       1540 33101  48112 16R  R6_1     
-        25       1541 33101  47483 16L  R5_2     
-        25       1542 33101  36486 16R  S9_1     
-        25       1543 33101  47488 16L  R5_2     
-        25       1544 33101  47506 16R  R5_2     
-        25       1545 33101  47493 16L  R5_2     
-        25       1546 33101  47513 16R  R5_2     
-        25       1547 33101  47498 16L  R5_2     
-        25       1548 33101  47518 16R  R5_2     
-        25       1549 33101  47503 16L  R5_2     
-        25       1550 33101  47523 16R  R5_2     
-        25       1551 33101  48083 16L  R6_1     
-        25       1552 33101  47528 16R  R5_2     
-        25       1553 33101  48088 16L  R6_1     
-        25       1554 33101  48103 16R  R6_1     
-        25       1555 33101  48093 16L  R6_1     
-        25       1556 33101  48108 16R  R6_1     
-        25       1557 33101  36454 16L  S9_1     
-        25       1558 33101  48118 16R  R6_1     
-        25       1559 33101  48098 16L  R6_1     
-        25       1560 33101  48113 16R  R6_1     
-        25       1561 33101  47484 16L  R5_2     
-        25       1562 33101  39432 16R  S10_1    
-        25       1563 33101  47489 16L  R5_2     
-        25       1564 33101  47507 16R  R5_2     
-        25       1565 33101  47494 16L  R5_2     
-        25       1566 33101  47514 16R  R5_2     
-        25       1567 33101  47499 16L  R5_2     
-        25       1568 33101  47519 16R  R5_2     
-        25       1569 33101  47504 16L  R5_2     
-        25       1570 33101  47524 16R  R5_2     
-        25       1571 33101  48084 16L  R6_1     
-        25       1572 33101  47529 16R  R5_2     
-        25       1573 33101  48089 16L  R6_1     
-        25       1574 33101  48104 16R  R6_1     
-        25       1575 33101  48094 16L  R6_1     
-        25       1576 33101  48109 16R  R6_1     
-        25       1577 33101  37081 16L  S9_3     
-        25       1578 33101  47509 16R  R5_2     
-        25       1579 33101  48099 16L  R6_1     
-        25       1580 33101  48114 16R  R6_1     
-        25       1581 33101  47485 16L  R5_2     
-        25       1582 33101  39444 16R  S10_1    
-        25       1583 33101  47490 16L  R5_2     
-        25       1584 33101  47508 16R  R5_2     
-        25       1585 33101  47495 16L  R5_2     
-        25       1586 33101  47515 16R  R5_2     
-        25       1587 33101  47500 16L  R5_2     
-        25       1588 33101  47520 16R  R5_2     
-        25       1589 33101  47505 16L  R5_2     
-        25       1590 33101  47525 16R  R5_2     
-        25       1591 33101  48085 16L  R6_1     
-        25       1592 33101  47530 16R  R5_2     
-        25       1593 33101  48090 16L  R6_1     
-        25       1594 33101  48105 16R  R6_1     
-        25       1595 33101  48095 16L  R6_1     
-        25       1596 33101  48110 16R  R6_1     
-        25       1597 33101  37082 16L  S9_3     
-        25       1598 33101  47510 16R  R5_2     
-        25       1599 33101  34146 16L  S8_3     
-        25       1600 33101  48115 16R  R6_1     
-        25       1601 33106     53 17L  SICEB1_1 
-        25       1602 33106     76 17R  SICEB1_1 
-        25       1603 33106     63 17L  SICEB1_1 
-        25       1604 33106     86 17R  SICEB1_1 
-        25       1605 33106     68 17L  SICEB1_1 
-        25       1606 33106    152 17R  SICEB02  
-        25       1607 33106    110 17L  SICEB02  
-        25       1608 33106    167 17R  SICEB02  
-        25       1609 33106    137 17L  SICEB02  
-        25       1610 33106    199 17R  SICEB02  
-        25       1611 33106    144 17L  SICEB02  
-        25       1612 33106    274 17R  EBP01    
-        25       1613 33106    219 17L  EBP01    
-        25       1614 33106    279 17R  EBP01    
-        25       1615 33106    235 17L  EBP01    
-        25       1616 33106    285 17R  EBP01    
-        25       1617 33106    240 17L  EBP01    
-        25       1618 33106    290 17R  EBP01    
-        25       1619 33106    247 17L  EBP01    
-        25       1620 33106    298 17R  EBP01    
-        25       1621 33106     56 17L  SICEB1_1 
-        25       1622 33106     81 17R  SICEB1_1 
-        25       1623 33106     65 17L  SICEB1_1 
-        25       1624 33106     91 17R  SICEB1_1 
-        25       1625 33106    101 17L  SICEB02  
-        25       1626 33106    154 17R  SICEB02  
-        25       1627 33106    113 17L  SICEB02  
-        25       1628 33106    173 17R  SICEB02  
-        25       1629 33106    138 17L  SICEB02  
-        25       1630 33106    265 17R  EBP01    
-        25       1631 33106    204 17L  EBP01    
-        25       1632 33106    275 17R  EBP01    
-        25       1633 33106    221 17L  EBP01    
-        25       1634 33106    280 17R  EBP01    
-        25       1635 33106    236 17L  EBP01    
-        25       1636 33106    286 17R  EBP01    
-        25       1637 33106    241 17L  EBP01    
-        25       1638 33106    293 17R  EBP01    
-        25       1639 33106    248 17L  EBP01    
-        25       1640 33106    299 17R  EBP01    
-        25       1641 33106     59 17L  SICEB1_1 
-        25       1642 33106     83 17R  SICEB1_1 
-        25       1643 33106     66 17L  SICEB1_1 
-        25       1644 33106     97 17R  SICEB1_1 
-        25       1645 33106    104 17L  SICEB02  
-        25       1646 33106    155 17R  SICEB02  
-        25       1647 33106    114 17L  SICEB02  
-        25       1648 33106    177 17R  SICEB02  
-        25       1649 33106    140 17L  SICEB02  
-        25       1650 33106    271 17R  EBP01    
-        25       1651 33106    208 17L  EBP01    
-        25       1652 33106    276 17R  EBP01    
-        25       1653 33106    223 17L  EBP01    
-        25       1654 33106    281 17R  EBP01    
-        25       1655 33106    237 17L  EBP01    
-        25       1656 33106    287 17R  EBP01    
-        25       1657 33106    242 17L  EBP01    
-        25       1658 33106    294 17R  EBP01    
-        25       1659 33106    249 17L  EBP01    
-        25       1660 33106    434 17R  EBP03    
-        25       1661 33106     61 17L  SICEB1_1 
-        25       1662 33106     84 17R  SICEB1_1 
-        25       1663 33106     75 17L  SICEB1_1 
-        25       1664 33106     99 17R  SICEB1_1 
-        25       1665 33106    105 17L  SICEB02  
-        25       1666 33106    159 17R  SICEB02  
-        25       1667 33106    119 17L  SICEB02  
-        25       1668 33106    181 17R  SICEB02  
-        25       1669 33106    142 17L  SICEB02  
-        25       1670 33106    272 17R  EBP01    
-        25       1671 33106    216 17L  EBP01    
-        25       1672 33106    277 17R  EBP01    
-        25       1673 33106    224 17L  EBP01    
-        25       1674 33106    283 17R  EBP01    
-        25       1675 33106    238 17L  EBP01    
-        25       1676 33106    288 17R  EBP01    
-        25       1677 33106    243 17L  EBP01    
-        25       1678 33106    295 17R  EBP01    
-        25       1679 33106    371 17L  EBP03    
-        25       1680 33106    435 17R  EBP03    
-        25       1681 33106     62 17L  SICEB1_1 
-        25       1682 33106     85 17R  SICEB1_1 
-        25       1683 33106     70 17L  SICEB1_1 
-        25       1684 33106    100 17R  SICEB1_1 
-        25       1685 33106    108 17L  SICEB02  
-        25       1686 33106    160 17R  SICEB02  
-        25       1687 33106    121 17L  SICEB02  
-        25       1688 33106    191 17R  SICEB02  
-        25       1689 33106    143 17L  SICEB02  
-        25       1690 33106    273 17R  EBP01    
-        25       1691 33106    218 17L  EBP01    
-        25       1692 33106    278 17R  EBP01    
-        25       1693 33106    233 17L  EBP01    
-        25       1694 33106    284 17R  EBP01    
-        25       1695 33106    239 17L  EBP01    
-        25       1696 33106    289 17R  EBP01    
-        25       1697 33106    244 17L  EBP01    
-        25       1698 33106    297 17R  EBP01    
-        25       1699 33106    372 17L  EBP03    
-        25       1700 33106    436 17R  EBP03    
-        26          1 33101  26503 1L   S6_2     
-        26          2 33101  46698 1R   R5_1     
-        26          3 33101  48516 1L   R6_2     
-        26          4 33101  48549 1R   R6_2     
-        26          5 33101  48521 1L   R6_2     
-        26          6 33101  48554 1R   R6_2     
-        26          7 33101  48526 1L   R6_2     
-        26          8 33101  49616 1R   R7_2     
-        26          9 33101  49591 1L   R7_2     
-        26         10 33101  49621 1R   R7_2     
-        26         11 33101  49596 1L   R7_2     
-        26         12 33101  49626 1R   R7_2     
-        26         13 33101  49601 1L   R7_2     
-        26         14 33101  49631 1R   R7_2     
-        26         15 33101  49606 1L   R7_2     
-        26         16 33101  49636 1R   R7_2     
-        26         17 33101  49611 1L   R7_2     
-        26         18 33101  48561 1R   R6_2     
-        26         19 33101  50141 1L   R8_1     
-        26         20 33101  31848 1R   S07_5    
-        26         21 33101  35004 1L   S8_5     
-        26         22 33101  48537 1R   R6_2     
-        26         23 33101  48517 1L   R6_2     
-        26         24 33101  48550 1R   R6_2     
-        26         25 33101  48522 1L   R6_2     
-        26         26 33101  48555 1R   R6_2     
-        26         27 33101  48527 1L   R6_2     
-        26         28 33101  49617 1R   R7_2     
-        26         29 33101  49592 1L   R7_2     
-        26         30 33101  49622 1R   R7_2     
-        26         31 33101  49597 1L   R7_2     
-        26         32 33101  48559 1R   R6_2     
-        26         33 33101  49602 1L   R7_2     
-        26         34 33101  49632 1R   R7_2     
-        26         35 33101  49607 1L   R7_2     
-        26         36 33101  49637 1R   R7_2     
-        26         37 33101  49612 1L   R7_2     
-        26         38 33101  48562 1R   R6_2     
-        26         39 33101  50142 1L   R8_1     
-        26         40 33101  31849 1R   S07_5    
-        26         41 33101  35007 1L   S8_5     
-        26         42 33101  48540 1R   R6_2     
-        26         43 33101  48518 1L   R6_2     
-        26         44 33101  48551 1R   R6_2     
-        26         45 33101  48523 1L   R6_2     
-        26         46 33101  48556 1R   R6_2     
-        26         47 33101  48528 1L   R6_2     
-        26         48 33101  49618 1R   R7_2     
-        26         49 33101  48506 1L   R6_2     
-        26         50 33101  49623 1R   R7_2     
-        26         51 33101  49598 1L   R7_2     
-        26         52 33101  49628 1R   R7_2     
-        26         53 33101  49603 1L   R7_2     
-        26         54 33101  48563 1R   R6_2     
-        26         55 33101  49608 1L   R7_2     
-        26         56 33101  49638 1R   R7_2     
-        26         57 33101  49613 1L   R7_2     
-        26         58 33101  48558 1R   R6_2     
-        26         59 33101  50143 1L   R8_1     
-        26         60 33101  31872 1R   S07_5    
-        26         61 33101  35013 1L   S8_5     
-        26         62 33101  48544 1R   R6_2     
-        26         63 33101  48519 1L   R6_2     
-        26         64 33101  48552 1R   R6_2     
-        26         65 33101  48524 1L   R6_2     
-        26         66 33101  48557 1R   R6_2     
-        26         67 33101  48529 1L   R6_2     
-        26         68 33101  49619 1R   R7_2     
-        26         69 33101  49594 1L   R7_2     
-        26         70 33101  49624 1R   R7_2     
-        26         71 33101  49599 1L   R7_2     
-        26         72 33101  49629 1R   R7_2     
-        26         73 33101  49604 1L   R7_2     
-        26         74 33101  49634 1R   R7_2     
-        26         75 33101  49609 1L   R7_2     
-        26         76 33101  49639 1R   R7_2     
-        26         77 33101  49614 1L   R7_2     
-        26         78 33101  49627 1R   R7_2     
-        26         79 33101  50144 1L   R8_1     
-        26         80 33101  33901 1R   S8_3     
-        26         81 33101  35020 1L   S8_5     
-        26         82 33101  48545 1R   R6_2     
-        26         83 33101  48520 1L   R6_2     
-        26         84 33101  48553 1R   R6_2     
-        26         85 33101  48525 1L   R6_2     
-        26         86 33101  48560 1R   R6_2     
-        26         87 33101  48530 1L   R6_2     
-        26         88 33101  49620 1R   R7_2     
-        26         89 33101  49595 1L   R7_2     
-        26         90 33101  49625 1R   R7_2     
-        26         91 33101  49600 1L   R7_2     
-        26         92 33101  49630 1R   R7_2     
-        26         93 33101  49605 1L   R7_2     
-        26         94 33101  49635 1R   R7_2     
-        26         95 33101  49610 1L   R7_2     
-        26         96 33101  49640 1R   R7_2     
-        26         97 33101  49615 1L   R7_2     
-        26         98 33101  49633 1R   R7_2     
-        26         99 33101  49593 1L   R7_2     
-        26        100 33101  34303 1R   S8_4     
-        26        101 33101  31915 2L   S07_5    
-        26        102 33101  46202 2R   R4_2     
-        26        103 33101  48571 2L   R6_2     
-        26        104 33101  48591 2R   R6_2     
-        26        105 33101  48576 2L   R6_2     
-        26        106 33101  48596 2R   R6_2     
-        26        107 33101  48581 2L   R6_2     
-        26        108 33101  48601 2R   R6_2     
-        26        109 33101  49641 2L   R7_2     
-        26        110 33101  48606 2R   R6_2     
-        26        111 33101  49646 2L   R7_2     
-        26        112 33101  49676 2R   R7_2     
-        26        113 33101  49651 2L   R7_2     
-        26        114 33101  49681 2R   R7_2     
-        26        115 33101  49656 2L   R7_2     
-        26        116 33101  49686 2R   R7_2     
-        26        117 33101  50157 2L   R8_1     
-        26        118 33101  49667 2R   R7_2     
-        26        119 33101  49661 2L   R7_2     
-        26        120 33101  31954 2R   S07_5    
-        26        121 33101  41811 2L   P18      
-        26        122 33101  46203 2R   R4_2     
-        26        123 33101  48572 2L   R6_2     
-        26        124 33101  48592 2R   R6_2     
-        26        125 33101  48577 2L   R6_2     
-        26        126 33101  48597 2R   R6_2     
-        26        127 33101  48582 2L   R6_2     
-        26        128 33101  48602 2R   R6_2     
-        26        129 33101  49642 2L   R7_2     
-        26        130 33101  48607 2R   R6_2     
-        26        131 33101  49647 2L   R7_2     
-        26        132 33101  49677 2R   R7_2     
-        26        133 33101  49652 2L   R7_2     
-        26        134 33101  49682 2R   R7_2     
-        26        135 33101  49657 2L   R7_2     
-        26        136 33101  49687 2R   R7_2     
-        26        137 33101  50158 2L   R8_1     
-        26        138 33101  49674 2R   R7_2     
-        26        139 33101  49662 2L   R7_2     
-        26        140 33101  31960 2R   S07_5    
-        26        141 33101  41813 2L   P18      
-        26        142 33101  46734 2R   R5_1     
-        26        143 33101  48573 2L   R6_2     
-        26        144 33101  48593 2R   R6_2     
-        26        145 33101  48578 2L   R6_2     
-        26        146 33101  48598 2R   R6_2     
-        26        147 33101  48583 2L   R6_2     
-        26        148 33101  48603 2R   R6_2     
-        26        149 33101  49643 2L   R7_2     
-        26        150 33101  48608 2R   R6_2     
-        26        151 33101  49648 2L   R7_2     
-        26        152 33101  49678 2R   R7_2     
-        26        153 33101  48570 2L   R6_2     
-        26        154 33101  49683 2R   R7_2     
-        26        155 33101  49658 2L   R7_2     
-        26        156 33101  49688 2R   R7_2     
-        26        157 33101  50159 2L   R8_1     
-        26        158 33101  49675 2R   R7_2     
-        26        159 33101  49663 2L   R7_2     
-        26        160 33101  33984 2R   S8_3     
-        26        161 33101  41815 2L   P18      
-        26        162 33101  46741 2R   R5_1     
-        26        163 33101  48574 2L   R6_2     
-        26        164 33101  48594 2R   R6_2     
-        26        165 33101  48579 2L   R6_2     
-        26        166 33101  48599 2R   R6_2     
-        26        167 33101  48584 2L   R6_2     
-        26        168 33101  48604 2R   R6_2     
-        26        169 33101  49644 2L   R7_2     
-        26        170 33101  48609 2R   R6_2     
-        26        171 33101  49649 2L   R7_2     
-        26        172 33101  49672 2R   R7_2     
-        26        173 33101  49654 2L   R7_2     
-        26        174 33101  49684 2R   R7_2     
-        26        175 33101  49659 2L   R7_2     
-        26        176 33101  49689 2R   R7_2     
-        26        177 33101  50160 2L   R8_1     
-        26        178 33101  49670 2R   R7_2     
-        26        179 33101  49664 2L   R7_2     
-        26        180 33101  38331 2R   S9_6     
-        26        181 33101  41816 2L   P18      
-        26        182 33101  48611 2R   R6_2     
-        26        183 33101  48575 2L   R6_2     
-        26        184 33101  48595 2R   R6_2     
-        26        185 33101  48580 2L   R6_2     
-        26        186 33101  48600 2R   R6_2     
-        26        187 33101  48585 2L   R6_2     
-        26        188 33101  48605 2R   R6_2     
-        26        189 33101  49645 2L   R7_2     
-        26        190 33101  48610 2R   R6_2     
-        26        191 33101  49650 2L   R7_2     
-        26        192 33101  49680 2R   R7_2     
-        26        193 33101  49655 2L   R7_2     
-        26        194 33101  49685 2R   R7_2     
-        26        195 33101  49660 2L   R7_2     
-        26        196 33101  49690 2R   R7_2     
-        26        197 33101  49653 2L   R7_2     
-        26        198 33101  49671 2R   R7_2     
-        26        199 33101  49665 2L   R7_2     
-        26        200 33101  38336 2R   S9_6     
-        26        201 33101  26546 3L   S6_2     
-        26        202 33101  41840 3R   P18      
-        26        203 33101  44605 3L   R3_1     
-        26        204 33101  48651 3R   R6_2     
-        26        205 33101  48626 3L   R6_2     
-        26        206 33101  48656 3R   R6_2     
-        26        207 33101  48631 3L   R6_2     
-        26        208 33101  49056 3R   R7_1     
-        26        209 33101  46757 3L   R5_1     
-        26        210 33101  49061 3R   R7_1     
-        26        211 33101  49043 3L   R7_1     
-        26        212 33101  49066 3R   R7_1     
-        26        213 33101  49051 3L   R7_1     
-        26        214 33101  49071 3R   R7_1     
-        26        215 33101  49691 3L   R7_2     
-        26        216 33101  49716 3R   R7_2     
-        26        217 33101  49696 3L   R7_2     
-        26        218 33101  49721 3R   R7_2     
-        26        219 33101  49046 3L   R7_1     
-        26        220 33101  32074 3R   S07_5    
-        26        221 33101  26582 3L   S6_2     
-        26        222 33101  46790 3R   R5_1     
-        26        223 33101  48622 3L   R6_2     
-        26        224 33101  48652 3R   R6_2     
-        26        225 33101  48627 3L   R6_2     
-        26        226 33101  48658 3R   R6_2     
-        26        227 33101  48632 3L   R6_2     
-        26        228 33101  49057 3R   R7_1     
-        26        229 33101  48636 3L   R6_2     
-        26        230 33101  49062 3R   R7_1     
-        26        231 33101  49044 3L   R7_1     
-        26        232 33101  49067 3R   R7_1     
-        26        233 33101  49052 3L   R7_1     
-        26        234 33101  49072 3R   R7_1     
-        26        235 33101  49692 3L   R7_2     
-        26        236 33101  49717 3R   R7_2     
-        26        237 33101  49049 3L   R7_1     
-        26        238 33101  49722 3R   R7_2     
-        26        239 33101  49701 3L   R7_2     
-        26        240 33101  33360 3R   S8_2     
-        26        241 33101  29018 3L   P13      
-        26        242 33101  48650 3R   R6_2     
-        26        243 33101  48623 3L   R6_2     
-        26        244 33101  48653 3R   R6_2     
-        26        245 33101  48628 3L   R6_2     
-        26        246 33101  48657 3R   R6_2     
-        26        247 33101  48633 3L   R6_2     
-        26        248 33101  49058 3R   R7_1     
-        26        249 33101  48637 3L   R6_2     
-        26        250 33101  49063 3R   R7_1     
-        26        251 33101  49045 3L   R7_1     
-        26        252 33101  49068 3R   R7_1     
-        26        253 33101  49053 3L   R7_1     
-        26        254 33101  49073 3R   R7_1     
-        26        255 33101  49693 3L   R7_2     
-        26        256 33101  49718 3R   R7_2     
-        26        257 33101  49698 3L   R7_2     
-        26        258 33101  49724 3R   R7_2     
-        26        259 33101  49702 3L   R7_2     
-        26        260 33101  33363 3R   S8_2     
-        26        261 33101  29020 3L   P13      
-        26        262 33101  48661 3R   R6_2     
-        26        263 33101  48624 3L   R6_2     
-        26        264 33101  48654 3R   R6_2     
-        26        265 33101  48629 3L   R6_2     
-        26        266 33101  48659 3R   R6_2     
-        26        267 33101  48634 3L   R6_2     
-        26        268 33101  49059 3R   R7_1     
-        26        269 33101  49041 3L   R7_1     
-        26        270 33101  49064 3R   R7_1     
-        26        271 33101  49047 3L   R7_1     
-        26        272 33101  49069 3R   R7_1     
-        26        273 33101  49054 3L   R7_1     
-        26        274 33101  49074 3R   R7_1     
-        26        275 33101  49694 3L   R7_2     
-        26        276 33101  49719 3R   R7_2     
-        26        277 33101  49699 3L   R7_2     
-        26        278 33101  49725 3R   R7_2     
-        26        279 33101  49703 3L   R7_2     
-        26        280 33101  33364 3R   S8_2     
-        26        281 33101  29063 3L   P13      
-        26        282 33101  48662 3R   R6_2     
-        26        283 33101  48625 3L   R6_2     
-        26        284 33101  48655 3R   R6_2     
-        26        285 33101  48630 3L   R6_2     
-        26        286 33101  48660 3R   R6_2     
-        26        287 33101  48635 3L   R6_2     
-        26        288 33101  49060 3R   R7_1     
-        26        289 33101  49042 3L   R7_1     
-        26        290 33101  49065 3R   R7_1     
-        26        291 33101  49048 3L   R7_1     
-        26        292 33101  49070 3R   R7_1     
-        26        293 33101  49055 3L   R7_1     
-        26        294 33101  49075 3R   R7_1     
-        26        295 33101  49695 3L   R7_2     
-        26        296 33101  49720 3R   R7_2     
-        26        297 33101  49700 3L   R7_2     
-        26        298 33101  49726 3R   R7_2     
-        26        299 33101  49050 3L   R7_1     
-        26        300 33101  38361 3R   S9_6     
-        26        301 33101  26647 4L   S6_2     
-        26        302 33101  46811 4R   R5_1     
-        26        303 33101  46278 4L   R4_2     
-        26        304 33101  48706 4R   R6_2     
-        26        305 33101  48676 4L   R6_2     
-        26        306 33101  48711 4R   R6_2     
-        26        307 33101  48681 4L   R6_2     
-        26        308 33101  49771 4R   R7_2     
-        26        309 33101  49741 4L   R7_2     
-        26        310 33101  49776 4R   R7_2     
-        26        311 33101  49746 4L   R7_2     
-        26        312 33101  49783 4R   R7_2     
-        26        313 33101  49751 4L   R7_2     
-        26        314 33101  50186 4R   R8_1     
-        26        315 33101  49756 4L   R7_2     
-        26        316 33101  50191 4R   R8_1     
-        26        317 33101  49761 4L   R7_2     
-        26        318 33101  49789 4R   R7_2     
-        26        319 33101  50176 4L   R8_1     
-        26        320 33101  38778 4R   P016     
-        26        321 33101  32101 4L   S07_5    
-        26        322 33101  46812 4R   R5_1     
-        26        323 33101  48672 4L   R6_2     
-        26        324 33101  48707 4R   R6_2     
-        26        325 33101  48677 4L   R6_2     
-        26        326 33101  49767 4R   R7_2     
-        26        327 33101  48682 4L   R6_2     
-        26        328 33101  49772 4R   R7_2     
-        26        329 33101  49742 4L   R7_2     
-        26        330 33101  49777 4R   R7_2     
-        26        331 33101  49747 4L   R7_2     
-        26        332 33101  49784 4R   R7_2     
-        26        333 33101  49752 4L   R7_2     
-        26        334 33101  50187 4R   R8_1     
-        26        335 33101  49757 4L   R7_2     
-        26        336 33101  50192 4R   R8_1     
-        26        337 33101  49762 4L   R7_2     
-        26        338 33101  49790 4R   R7_2     
-        26        339 33101  46796 4L   R5_1     
-        26        340 33101  38779 4R   P016     
-        26        341 33101  32104 4L   S07_5    
-        26        342 33101  46813 4R   R5_1     
-        26        343 33101  48673 4L   R6_2     
-        26        344 33101  48708 4R   R6_2     
-        26        345 33101  48678 4L   R6_2     
-        26        346 33101  49768 4R   R7_2     
-        26        347 33101  48683 4L   R6_2     
-        26        348 33101  49773 4R   R7_2     
-        26        349 33101  49743 4L   R7_2     
-        26        350 33101  49779 4R   R7_2     
-        26        351 33101  49748 4L   R7_2     
-        26        352 33101  49786 4R   R7_2     
-        26        353 33101  49753 4L   R7_2     
-        26        354 33101  50188 4R   R8_1     
-        26        355 33101  49758 4L   R7_2     
-        26        356 33101  50183 4R   R8_1     
-        26        357 33101  49763 4L   R7_2     
-        26        358 33101  49766 4R   R7_2     
-        26        359 33101  48686 4L   R6_2     
-        26        360 33101  38780 4R   P016     
-        26        361 33101  32114 4L   S07_5    
-        26        362 33101  46814 4R   R5_1     
-        26        363 33101  48674 4L   R6_2     
-        26        364 33101  48709 4R   R6_2     
-        26        365 33101  48679 4L   R6_2     
-        26        366 33101  49769 4R   R7_2     
-        26        367 33101  48684 4L   R6_2     
-        26        368 33101  49774 4R   R7_2     
-        26        369 33101  49744 4L   R7_2     
-        26        370 33101  49781 4R   R7_2     
-        26        371 33101  49749 4L   R7_2     
-        26        372 33101  49787 4R   R7_2     
-        26        373 33101  49754 4L   R7_2     
-        26        374 33101  50189 4R   R8_1     
-        26        375 33101  49759 4L   R7_2     
-        26        376 33101  50184 4R   R8_1     
-        26        377 33101  49764 4L   R7_2     
-        26        378 33101  50193 4R   R8_1     
-        26        379 33101  48687 4L   R6_2     
-        26        380 33101  38781 4R   P016     
-        26        381 33101  41874 4L   P18      
-        26        382 33101  46817 4R   R5_1     
-        26        383 33101  48675 4L   R6_2     
-        26        384 33101  48710 4R   R6_2     
-        26        385 33101  48680 4L   R6_2     
-        26        386 33101  48691 4R   R6_2     
-        26        387 33101  48685 4L   R6_2     
-        26        388 33101  49775 4R   R7_2     
-        26        389 33101  49745 4L   R7_2     
-        26        390 33101  49782 4R   R7_2     
-        26        391 33101  49750 4L   R7_2     
-        26        392 33101  49788 4R   R7_2     
-        26        393 33101  49755 4L   R7_2     
-        26        394 33101  50190 4R   R8_1     
-        26        395 33101  49760 4L   R7_2     
-        26        396 33101  50185 4R   R8_1     
-        26        397 33101  49765 4L   R7_2     
-        26        398 33101  49780 4R   R7_2     
-        26        399 33101  42586 4L   R1_1     
-        26        400 33101  38782 4R   P016     
-        26        401 33101  26738 5L   S6_2     
-        26        402 33101  44740 5R   R3_1     
-        26        403 33101  45242 5L   R3_2     
-        26        404 33101  48736 5R   R6_2     
-        26        405 33101  48716 5L   R6_2     
-        26        406 33101  48741 5R   R6_2     
-        26        407 33101  48721 5L   R6_2     
-        26        408 33101  49816 5R   R7_2     
-        26        409 33101  48726 5L   R6_2     
-        26        410 33101  49821 5R   R7_2     
-        26        411 33101  49796 5L   R7_2     
-        26        412 33101  49826 5R   R7_2     
-        26        413 33101  49801 5L   R7_2     
-        26        414 33101  49831 5R   R7_2     
-        26        415 33101  49806 5L   R7_2     
-        26        416 33101  49836 5R   R7_2     
-        26        417 33101  49811 5L   R7_2     
-        26        418 33101  48746 5R   R6_2     
-        26        419 33101  50201 5L   R8_1     
-        26        420 33101  26787 5R   S6_2     
-        26        421 33101  26759 5L   S6_2     
-        26        422 33101  48732 5R   R6_2     
-        26        423 33101  46847 5L   R5_1     
-        26        424 33101  48737 5R   R6_2     
-        26        425 33101  48717 5L   R6_2     
-        26        426 33101  48742 5R   R6_2     
-        26        427 33101  48722 5L   R6_2     
-        26        428 33101  49817 5R   R7_2     
-        26        429 33101  49792 5L   R7_2     
-        26        430 33101  49822 5R   R7_2     
-        26        431 33101  49797 5L   R7_2     
-        26        432 33101  49827 5R   R7_2     
-        26        433 33101  49802 5L   R7_2     
-        26        434 33101  49832 5R   R7_2     
-        26        435 33101  49807 5L   R7_2     
-        26        436 33101  49837 5R   R7_2     
-        26        437 33101  49812 5L   R7_2     
-        26        438 33101  48747 5R   R6_2     
-        26        439 33101  50202 5L   R8_1     
-        26        440 33101  33513 5R   S8_2     
-        26        441 33101  26769 5L   S6_2     
-        26        442 33101  48733 5R   R6_2     
-        26        443 33101  48712 5L   R6_2     
-        26        444 33101  48738 5R   R6_2     
-        26        445 33101  48718 5L   R6_2     
-        26        446 33101  48743 5R   R6_2     
-        26        447 33101  48723 5L   R6_2     
-        26        448 33101  49818 5R   R7_2     
-        26        449 33101  49793 5L   R7_2     
-        26        450 33101  49823 5R   R7_2     
-        26        451 33101  49798 5L   R7_2     
-        26        452 33101  49828 5R   R7_2     
-        26        453 33101  49803 5L   R7_2     
-        26        454 33101  49833 5R   R7_2     
-        26        455 33101  49808 5L   R7_2     
-        26        456 33101  49838 5R   R7_2     
-        26        457 33101  49813 5L   R7_2     
-        26        458 33101  50213 5R   R8_1     
-        26        459 33101  50203 5L   R8_1     
-        26        460 33101  33529 5R   S8_2     
-        26        461 33101  27004 5L   S6_2b    
-        26        462 33101  48734 5R   R6_2     
-        26        463 33101  48714 5L   R6_2     
-        26        464 33101  48739 5R   R6_2     
-        26        465 33101  48719 5L   R6_2     
-        26        466 33101  48744 5R   R6_2     
-        26        467 33101  48724 5L   R6_2     
-        26        468 33101  49819 5R   R7_2     
-        26        469 33101  49794 5L   R7_2     
-        26        470 33101  49824 5R   R7_2     
-        26        471 33101  49799 5L   R7_2     
-        26        472 33101  49829 5R   R7_2     
-        26        473 33101  49804 5L   R7_2     
-        26        474 33101  49834 5R   R7_2     
-        26        475 33101  49809 5L   R7_2     
-        26        476 33101  49839 5R   R7_2     
-        26        477 33101  49814 5L   R7_2     
-        26        478 33101  46352 5R   R4_2     
-        26        479 33101  50204 5L   R8_1     
-        26        480 33101  38409 5R   S9_6     
-        26        481 33101  27005 5L   S6_2b    
-        26        482 33101  48735 5R   R6_2     
-        26        483 33101  48715 5L   R6_2     
-        26        484 33101  48740 5R   R6_2     
-        26        485 33101  48720 5L   R6_2     
-        26        486 33101  48745 5R   R6_2     
-        26        487 33101  48725 5L   R6_2     
-        26        488 33101  49820 5R   R7_2     
-        26        489 33101  49795 5L   R7_2     
-        26        490 33101  49825 5R   R7_2     
-        26        491 33101  49800 5L   R7_2     
-        26        492 33101  49830 5R   R7_2     
-        26        493 33101  49805 5L   R7_2     
-        26        494 33101  49835 5R   R7_2     
-        26        495 33101  49810 5L   R7_2     
-        26        496 33101  49840 5R   R7_2     
-        26        497 33101  49815 5L   R7_2     
-        26        498 33101  50212 5R   R8_1     
-        26        499 33101  48727 5L   R6_2     
-        26        500 33101  38410 5R   S9_6     
-        26        501 33101  28594 6L   S6_3b    
-        26        502 33101  50426 6R   R8_1     
-        26        503 33101  49306 6L   R7_1     
-        26        504 33101  50436 6R   R8_1     
-        26        505 33101  49321 6L   R7_1     
-        26        506 33101  49346 6R   R7_1     
-        26        507 33101  49316 6L   R7_1     
-        26        508 33101  49341 6R   R7_1     
-        26        509 33101  49311 6L   R7_1     
-        26        510 33101  49331 6R   R7_1     
-        26        511 33101  49301 6L   R7_1     
-        26        512 33101  49336 6R   R7_1     
-        26        513 33101  49296 6L   R7_1     
-        26        514 33101  49326 6R   R7_1     
-        26        515 33101  48768 6L   R6_2     
-        26        516 33101  39575 6R   S10_1    
-        26        517 33101  48763 6L   R6_2     
-        26        518 33101  48776 6R   R6_2     
-        26        519 33101  49291 6L   R7_1     
-        26        520 33101  27551 6R   S6_3a    
-        26        521 33101  34167 6L   S8_3     
-        26        522 33101  50427 6R   R8_1     
-        26        523 33101  49307 6L   R7_1     
-        26        524 33101  50437 6R   R8_1     
-        26        525 33101  49322 6L   R7_1     
-        26        526 33101  49347 6R   R7_1     
-        26        527 33101  49317 6L   R7_1     
-        26        528 33101  49342 6R   R7_1     
-        26        529 33101  49312 6L   R7_1     
-        26        530 33101  49332 6R   R7_1     
-        26        531 33101  49302 6L   R7_1     
-        26        532 33101  49337 6R   R7_1     
-        26        533 33101  49297 6L   R7_1     
-        26        534 33101  49327 6R   R7_1     
-        26        535 33101  48769 6L   R6_2     
-        26        536 33101  39576 6R   S10_1    
-        26        537 33101  48764 6L   R6_2     
-        26        538 33101  48777 6R   R6_2     
-        26        539 33101  49292 6L   R7_1     
-        26        540 33101  31031 6R   S7_3     
-        26        541 33101  42735 6L   R1       
-        26        542 33101  50432 6R   R8_1     
-        26        543 33101  49308 6L   R7_1     
-        26        544 33101  50438 6R   R8_1     
-        26        545 33101  49323 6L   R7_1     
-        26        546 33101  49348 6R   R7_1     
-        26        547 33101  49318 6L   R7_1     
-        26        548 33101  49343 6R   R7_1     
-        26        549 33101  49313 6L   R7_1     
-        26        550 33101  49333 6R   R7_1     
-        26        551 33101  49303 6L   R7_1     
-        26        552 33101  49338 6R   R7_1     
-        26        553 33101  49298 6L   R7_1     
-        26        554 33101  49328 6R   R7_1     
-        26        555 33101  48770 6L   R6_2     
-        26        556 33101  39577 6R   S10_1    
-        26        557 33101  48765 6L   R6_2     
-        26        558 33101  47068 6R   R5_1     
-        26        559 33101  49293 6L   R7_1     
-        26        560 33101  31052 6R   S7_3     
-        26        561 33101  48773 6L   R6_2     
-        26        562 33101  50429 6R   R8_1     
-        26        563 33101  49309 6L   R7_1     
-        26        564 33101  50439 6R   R8_1     
-        26        565 33101  49324 6L   R7_1     
-        26        566 33101  49349 6R   R7_1     
-        26        567 33101  49319 6L   R7_1     
-        26        568 33101  49344 6R   R7_1     
-        26        569 33101  49314 6L   R7_1     
-        26        570 33101  49334 6R   R7_1     
-        26        571 33101  49304 6L   R7_1     
-        26        572 33101  49339 6R   R7_1     
-        26        573 33101  49299 6L   R7_1     
-        26        574 33101  49329 6R   R7_1     
-        26        575 33101  48771 6L   R6_2     
-        26        576 33101  39578 6R   S10_1    
-        26        577 33101  48766 6L   R6_2     
-        26        578 33101  47069 6R   R5_1     
-        26        579 33101  49294 6L   R7_1     
-        26        580 33101  31070 6R   S7_3     
-        26        581 33101  48774 6L   R6_2     
-        26        582 33101  50430 6R   R8_1     
-        26        583 33101  49310 6L   R7_1     
-        26        584 33101  50440 6R   R8_1     
-        26        585 33101  49325 6L   R7_1     
-        26        586 33101  49350 6R   R7_1     
-        26        587 33101  49320 6L   R7_1     
-        26        588 33101  49345 6R   R7_1     
-        26        589 33101  49315 6L   R7_1     
-        26        590 33101  49335 6R   R7_1     
-        26        591 33101  49305 6L   R7_1     
-        26        592 33101  49340 6R   R7_1     
-        26        593 33101  49300 6L   R7_1     
-        26        594 33101  49330 6R   R7_1     
-        26        595 33101  48772 6L   R6_2     
-        26        596 33101  39579 6R   S10_1    
-        26        597 33101  48767 6L   R6_2     
-        26        598 33101  47070 6R   R5_1     
-        26        599 33101  49295 6L   R7_1     
-        26        600 33101  32959 6R   S8_1     
-        26        601 33101  47794 7L   S9_5     
-        26        602 33101  50466 7R   R8_1     
-        26        603 33101  50451 7L   R8_1     
-        26        604 33101  50481 7R   R8_1     
-        26        605 33101  49381 7L   R7_1     
-        26        606 33101  50471 7R   R8_1     
-        26        607 33101  49376 7L   R7_1     
-        26        608 33101  49405 7R   R7_1     
-        26        609 33101  49371 7L   R7_1     
-        26        610 33101  49401 7R   R7_1     
-        26        611 33101  49366 7L   R7_1     
-        26        612 33101  49396 7R   R7_1     
-        26        613 33101  49361 7L   R7_1     
-        26        614 33101  49391 7R   R7_1     
-        26        615 33101  49351 7L   R7_1     
-        26        616 33101  49386 7R   R7_1     
-        26        617 33101  39595 7L   S10_1    
-        26        618 33101  48221 7R   R6_1     
-        26        619 33101  49356 7L   R7_1     
-        26        620 33101  28539 7R   S6_2b    
-        26        621 33101  47795 7L   S9_5     
-        26        622 33101  50467 7R   R8_1     
-        26        623 33101  50452 7L   R8_1     
-        26        624 33101  50482 7R   R8_1     
-        26        625 33101  49382 7L   R7_1     
-        26        626 33101  50472 7R   R8_1     
-        26        627 33101  49377 7L   R7_1     
-        26        628 33101  49407 7R   R7_1     
-        26        629 33101  49372 7L   R7_1     
-        26        630 33101  49402 7R   R7_1     
-        26        631 33101  49367 7L   R7_1     
-        26        632 33101  49397 7R   R7_1     
-        26        633 33101  49362 7L   R7_1     
-        26        634 33101  49392 7R   R7_1     
-        26        635 33101  49352 7L   R7_1     
-        26        636 33101  49387 7R   R7_1     
-        26        637 33101  39596 7L   S10_1    
-        26        638 33101  48222 7R   R6_1     
-        26        639 33101  49357 7L   R7_1     
-        26        640 33101  33027 7R   S8_1     
-        26        641 33101  47797 7L   S9_5     
-        26        642 33101  50478 7R   R8_1     
-        26        643 33101  50453 7L   R8_1     
-        26        644 33101  50483 7R   R8_1     
-        26        645 33101  49383 7L   R7_1     
-        26        646 33101  50473 7R   R8_1     
-        26        647 33101  49378 7L   R7_1     
-        26        648 33101  49408 7R   R7_1     
-        26        649 33101  49373 7L   R7_1     
-        26        650 33101  49403 7R   R7_1     
-        26        651 33101  49368 7L   R7_1     
-        26        652 33101  49398 7R   R7_1     
-        26        653 33101  49363 7L   R7_1     
-        26        654 33101  49393 7R   R7_1     
-        26        655 33101  49353 7L   R7_1     
-        26        656 33101  49388 7R   R7_1     
-        26        657 33101  39597 7L   S10_1    
-        26        658 33101  48223 7R   R6_1     
-        26        659 33101  49358 7L   R7_1     
-        26        660 33101  33028 7R   S8_1     
-        26        661 33101  47798 7L   S9_5     
-        26        662 33101  50469 7R   R8_1     
-        26        663 33101  50454 7L   R8_1     
-        26        664 33101  50484 7R   R8_1     
-        26        665 33101  49384 7L   R7_1     
-        26        666 33101  50474 7R   R8_1     
-        26        667 33101  49379 7L   R7_1     
-        26        668 33101  49409 7R   R7_1     
-        26        669 33101  49374 7L   R7_1     
-        26        670 33101  49404 7R   R7_1     
-        26        671 33101  49369 7L   R7_1     
-        26        672 33101  49399 7R   R7_1     
-        26        673 33101  49364 7L   R7_1     
-        26        674 33101  49395 7R   R7_1     
-        26        675 33101  49354 7L   R7_1     
-        26        676 33101  49389 7R   R7_1     
-        26        677 33101  39598 7L   S10_1    
-        26        678 33101  48224 7R   R6_1     
-        26        679 33101  49359 7L   R7_1     
-        26        680 33101  33038 7R   S8_1     
-        26        681 33101  47799 7L   S9_5     
-        26        682 33101  50470 7R   R8_1     
-        26        683 33101  50455 7L   R8_1     
-        26        684 33101  50485 7R   R8_1     
-        26        685 33101  49385 7L   R7_1     
-        26        686 33101  50475 7R   R8_1     
-        26        687 33101  49380 7L   R7_1     
-        26        688 33101  49394 7R   R7_1     
-        26        689 33101  49375 7L   R7_1     
-        26        690 33101  49406 7R   R7_1     
-        26        691 33101  49370 7L   R7_1     
-        26        692 33101  49400 7R   R7_1     
-        26        693 33101  49365 7L   R7_1     
-        26        694 33101  49410 7R   R7_1     
-        26        695 33101  49355 7L   R7_1     
-        26        696 33101  49390 7R   R7_1     
-        26        697 33101  39599 7L   S10_1    
-        26        698 33101  48225 7R   R6_1     
-        26        699 33101  49360 7L   R7_1     
-        26        700 33101  34418 7R   S8_4     
-        26        701 33101  30429 8L   S7_2     
-        26        702 33101  49461 8R   R7_1     
-        26        703 33101  49425 8L   R7_1     
-        26        704 33101  49449 8R   R7_1     
-        26        705 33101  50506 8L   R8_1     
-        26        706 33101  50521 8R   R8_1     
-        26        707 33101  50494 8L   R8_1     
-        26        708 33101  50511 8R   R8_1     
-        26        709 33101  50501 8L   R8_1     
-        26        710 33101  50516 8R   R8_1     
-        26        711 33101  49431 8L   R7_1     
-        26        712 33101  49456 8R   R7_1     
-        26        713 33101  49421 8L   R7_1     
-        26        714 33101  49441 8R   R7_1     
-        26        715 33101  49411 8L   R7_1     
-        26        716 33101  49436 8R   R7_1     
-        26        717 33101  39643 8L   S10_1    
-        26        718 33101  39672 8R   S10_1    
-        26        719 33101  49416 8L   R7_1     
-        26        720 33101  27241 8R   S6_3b    
-        26        721 33101  30431 8L   S7_2     
-        26        722 33101  49446 8R   R7_1     
-        26        723 33101  49426 8L   R7_1     
-        26        724 33101  49452 8R   R7_1     
-        26        725 33101  50507 8L   R8_1     
-        26        726 33101  50522 8R   R8_1     
-        26        727 33101  50497 8L   R8_1     
-        26        728 33101  50512 8R   R8_1     
-        26        729 33101  50502 8L   R8_1     
-        26        730 33101  50517 8R   R8_1     
-        26        731 33101  49432 8L   R7_1     
-        26        732 33101  49457 8R   R7_1     
-        26        733 33101  49422 8L   R7_1     
-        26        734 33101  49442 8R   R7_1     
-        26        735 33101  49412 8L   R7_1     
-        26        736 33101  49437 8R   R7_1     
-        26        737 33101  39644 8L   S10_1    
-        26        738 33101  39673 8R   S10_1    
-        26        739 33101  49417 8L   R7_1     
-        26        740 33101  30472 8R   S7_2     
-        26        741 33101  30437 8L   S7_2     
-        26        742 33101  49463 8R   R7_1     
-        26        743 33101  49427 8L   R7_1     
-        26        744 33101  49453 8R   R7_1     
-        26        745 33101  50508 8L   R8_1     
-        26        746 33101  50523 8R   R8_1     
-        26        747 33101  50498 8L   R8_1     
-        26        748 33101  50513 8R   R8_1     
-        26        749 33101  50503 8L   R8_1     
-        26        750 33101  50518 8R   R8_1     
-        26        751 33101  49433 8L   R7_1     
-        26        752 33101  49458 8R   R7_1     
-        26        753 33101  49423 8L   R7_1     
-        26        754 33101  49443 8R   R7_1     
-        26        755 33101  49413 8L   R7_1     
-        26        756 33101  49438 8R   R7_1     
-        26        757 33101  39645 8L   S10_1    
-        26        758 33101  39674 8R   S10_1    
-        26        759 33101  49418 8L   R7_1     
-        26        760 33101  30487 8R   S7_2     
-        26        761 33101  30445 8L   S7_2     
-        26        762 33101  49448 8R   R7_1     
-        26        763 33101  49428 8L   R7_1     
-        26        764 33101  49454 8R   R7_1     
-        26        765 33101  50509 8L   R8_1     
-        26        766 33101  50524 8R   R8_1     
-        26        767 33101  50499 8L   R8_1     
-        26        768 33101  50514 8R   R8_1     
-        26        769 33101  50504 8L   R8_1     
-        26        770 33101  50519 8R   R8_1     
-        26        771 33101  49434 8L   R7_1     
-        26        772 33101  49459 8R   R7_1     
-        26        773 33101  49424 8L   R7_1     
-        26        774 33101  49444 8R   R7_1     
-        26        775 33101  49414 8L   R7_1     
-        26        776 33101  49439 8R   R7_1     
-        26        777 33101  39646 8L   S10_1    
-        26        778 33101  39675 8R   S10_1    
-        26        779 33101  49419 8L   R7_1     
-        26        780 33101  30491 8R   S7_2     
-        26        781 33101  39648 8L   S10_1    
-        26        782 33101  49465 8R   R7_1     
-        26        783 33101  49429 8L   R7_1     
-        26        784 33101  49455 8R   R7_1     
-        26        785 33101  50510 8L   R8_1     
-        26        786 33101  50525 8R   R8_1     
-        26        787 33101  50500 8L   R8_1     
-        26        788 33101  50515 8R   R8_1     
-        26        789 33101  50505 8L   R8_1     
-        26        790 33101  50520 8R   R8_1     
-        26        791 33101  49435 8L   R7_1     
-        26        792 33101  49460 8R   R7_1     
-        26        793 33101  49430 8L   R7_1     
-        26        794 33101  49445 8R   R7_1     
-        26        795 33101  49415 8L   R7_1     
-        26        796 33101  49440 8R   R7_1     
-        26        797 33101  39647 8L   S10_1    
-        26        798 33101  39676 8R   S10_1    
-        26        799 33101  49420 8L   R7_1     
-        26        800 33101  31673 8R   S7_4     
-        26        801 33101  47849 9L   S9_5     
-        26        802 33101  42023 9R   P18      
-        26        803 33101  49501 9L   R7_1     
-        26        804 33101  39692 9R   S10_1    
-        26        805 33101  49496 9L   R7_1     
-        26        806 33101  39698 9R   S10_1    
-        26        807 33101  49516 9L   R7_1     
-        26        808 33101  49522 9R   R7_1     
-        26        809 33101  49491 9L   R7_1     
-        26        810 33101  49521 9R   R7_1     
-        26        811 33101  49486 9L   R7_1     
-        26        812 33101  48336 9R   R6_1     
-        26        813 33101  49481 9L   R7_1     
-        26        814 33101  48790 9R   R6_2     
-        26        815 33101  49471 9L   R7_1     
-        26        816 33101  48322 9R   R6_1     
-        26        817 33101  49466 9L   R7_1     
-        26        818 33101  48321 9R   R6_1     
-        26        819 33101  49476 9L   R7_1     
-        26        820 33101  31144 9R   S7_3     
-        26        821 33101  47850 9L   S9_5     
-        26        822 33101  47877 9R   S9_5     
-        26        823 33101  49502 9L   R7_1     
-        26        824 33101  39693 9R   S10_1    
-        26        825 33101  49497 9L   R7_1     
-        26        826 33101  39699 9R   S10_1    
-        26        827 33101  49517 9L   R7_1     
-        26        828 33101  49527 9R   R7_1     
-        26        829 33101  49492 9L   R7_1     
-        26        830 33101  49526 9R   R7_1     
-        26        831 33101  49487 9L   R7_1     
-        26        832 33101  48337 9R   R6_1     
-        26        833 33101  49482 9L   R7_1     
-        26        834 33101  48791 9R   R6_2     
-        26        835 33101  49472 9L   R7_1     
-        26        836 33101  48323 9R   R6_1     
-        26        837 33101  49467 9L   R7_1     
-        26        838 33101  48324 9R   R6_1     
-        26        839 33101  49477 9L   R7_1     
-        26        840 33101  31800 9R   S7_4     
-        26        841 33101  47851 9L   S9_5     
-        26        842 33101  47878 9R   S9_5     
-        26        843 33101  49503 9L   R7_1     
-        26        844 33101  39694 9R   S10_1    
-        26        845 33101  49498 9L   R7_1     
-        26        846 33101  39700 9R   S10_1    
-        26        847 33101  49518 9L   R7_1     
-        26        848 33101  49528 9R   R7_1     
-        26        849 33101  49493 9L   R7_1     
-        26        850 33101  49523 9R   R7_1     
-        26        851 33101  49488 9L   R7_1     
-        26        852 33101  48338 9R   R6_1     
-        26        853 33101  49483 9L   R7_1     
-        26        854 33101  48792 9R   R6_2     
-        26        855 33101  49473 9L   R7_1     
-        26        856 33101  48333 9R   R6_1     
-        26        857 33101  49468 9L   R7_1     
-        26        858 33101  48325 9R   R6_1     
-        26        859 33101  49478 9L   R7_1     
-        26        860 33101  34600 9R   S8_4     
-        26        861 33101  47852 9L   S9_5     
-        26        862 33101  47895 9R   S9_5     
-        26        863 33101  49504 9L   R7_1     
-        26        864 33101  39695 9R   S10_1    
-        26        865 33101  49499 9L   R7_1     
-        26        866 33101  43264 9R   R1_2     
-        26        867 33101  49519 9L   R7_1     
-        26        868 33101  49529 9R   R7_1     
-        26        869 33101  49494 9L   R7_1     
-        26        870 33101  49524 9R   R7_1     
-        26        871 33101  49489 9L   R7_1     
-        26        872 33101  48339 9R   R6_1     
-        26        873 33101  49484 9L   R7_1     
-        26        874 33101  44395 9R   R2_2     
-        26        875 33101  49474 9L   R7_1     
-        26        876 33101  48334 9R   R6_1     
-        26        877 33101  49469 9L   R7_1     
-        26        878 33101  48332 9R   R6_1     
-        26        879 33101  49479 9L   R7_1     
-        26        880 33101  35672 9R   P15_1    
-        26        881 33101  47854 9L   S9_5     
-        26        882 33101  47875 9R   S9_5     
-        26        883 33101  49505 9L   R7_1     
-        26        884 33101  39697 9R   S10_1    
-        26        885 33101  49500 9L   R7_1     
-        26        886 33101  44394 9R   R2_2     
-        26        887 33101  49520 9L   R7_1     
-        26        888 33101  49530 9R   R7_1     
-        26        889 33101  49495 9L   R7_1     
-        26        890 33101  49525 9R   R7_1     
-        26        891 33101  49490 9L   R7_1     
-        26        892 33101  48331 9R   R6_1     
-        26        893 33101  49485 9L   R7_1     
-        26        894 33101  44396 9R   R2_2     
-        26        895 33101  49475 9L   R7_1     
-        26        896 33101  48335 9R   R6_1     
-        26        897 33101  49470 9L   R7_1     
-        26        898 33101  48340 9R   R6_1     
-        26        899 33101  49480 9L   R7_1     
-        26        900 33101  47872 9R   S9_5     
-        26        901 33101  32721 10L  P14      
-        26        902 33101  49551 10R  R7_1     
-        26        903 33101  49541 10L  R7_1     
-        26        904 33101  49546 10R  R7_1     
-        26        905 33101  49861 10L  R7_2     
-        26        906 33101  49886 10R  R7_2     
-        26        907 33101  49856 10L  R7_2     
-        26        908 33101  49891 10R  R7_2     
-        26        909 33101  49851 10L  R7_2     
-        26        910 33101  49881 10R  R7_2     
-        26        911 33101  49846 10L  R7_2     
-        26        912 33101  49876 10R  R7_2     
-        26        913 33101  49841 10L  R7_2     
-        26        914 33101  49871 10R  R7_2     
-        26        915 33101  49531 10L  R7_1     
-        26        916 33101  48848 10R  R6_2     
-        26        917 33101  48793 10L  R6_2     
-        26        918 33101  48843 10R  R6_2     
-        26        919 33101  48818 10L  R6_2     
-        26        920 33101  30335 10R  S7_2     
-        26        921 33101  33540 10L  S8_2     
-        26        922 33101  49552 10R  R7_1     
-        26        923 33101  49542 10L  R7_1     
-        26        924 33101  49547 10R  R7_1     
-        26        925 33101  49862 10L  R7_2     
-        26        926 33101  49887 10R  R7_2     
-        26        927 33101  49857 10L  R7_2     
-        26        928 33101  49892 10R  R7_2     
-        26        929 33101  49852 10L  R7_2     
-        26        930 33101  49882 10R  R7_2     
-        26        931 33101  49847 10L  R7_2     
-        26        932 33101  49877 10R  R7_2     
-        26        933 33101  49842 10L  R7_2     
-        26        934 33101  49872 10R  R7_2     
-        26        935 33101  49532 10L  R7_1     
-        26        936 33101  48849 10R  R6_2     
-        26        937 33101  48794 10L  R6_2     
-        26        938 33101  48844 10R  R6_2     
-        26        939 33101  48819 10L  R6_2     
-        26        940 33101  30370 10R  S7_2     
-        26        941 33101  38526 10L  S9_6     
-        26        942 33101  49554 10R  R7_1     
-        26        943 33101  49543 10L  R7_1     
-        26        944 33101  49548 10R  R7_1     
-        26        945 33101  49863 10L  R7_2     
-        26        946 33101  49888 10R  R7_2     
-        26        947 33101  49858 10L  R7_2     
-        26        948 33101  49893 10R  R7_2     
-        26        949 33101  49853 10L  R7_2     
-        26        950 33101  49883 10R  R7_2     
-        26        951 33101  49848 10L  R7_2     
-        26        952 33101  49878 10R  R7_2     
-        26        953 33101  49843 10L  R7_2     
-        26        954 33101  49873 10R  R7_2     
-        26        955 33101  49533 10L  R7_1     
-        26        956 33101  48850 10R  R6_2     
-        26        957 33101  48795 10L  R6_2     
-        26        958 33101  48845 10R  R6_2     
-        26        959 33101  48820 10L  R6_2     
-        26        960 33101  32760 10R  P14      
-        26        961 33101  38527 10L  S9_6     
-        26        962 33101  49555 10R  R7_1     
-        26        963 33101  49544 10L  R7_1     
-        26        964 33101  49550 10R  R7_1     
-        26        965 33101  49864 10L  R7_2     
-        26        966 33101  49889 10R  R7_2     
-        26        967 33101  49859 10L  R7_2     
-        26        968 33101  49894 10R  R7_2     
-        26        969 33101  49854 10L  R7_2     
-        26        970 33101  49884 10R  R7_2     
-        26        971 33101  49849 10L  R7_2     
-        26        972 33101  49879 10R  R7_2     
-        26        973 33101  49844 10L  R7_2     
-        26        974 33101  49874 10R  R7_2     
-        26        975 33101  49534 10L  R7_1     
-        26        976 33101  48851 10R  R6_2     
-        26        977 33101  48796 10L  R6_2     
-        26        978 33101  48846 10R  R6_2     
-        26        979 33101  48821 10L  R6_2     
-        26        980 33101  34710 10R  S8_4     
-        26        981 33101  38528 10L  S9_6     
-        26        982 33101  49558 10R  R7_1     
-        26        983 33101  49545 10L  R7_1     
-        26        984 33101  49557 10R  R7_1     
-        26        985 33101  49865 10L  R7_2     
-        26        986 33101  49890 10R  R7_2     
-        26        987 33101  49860 10L  R7_2     
-        26        988 33101  49895 10R  R7_2     
-        26        989 33101  49855 10L  R7_2     
-        26        990 33101  49885 10R  R7_2     
-        26        991 33101  49850 10L  R7_2     
-        26        992 33101  49880 10R  R7_2     
-        26        993 33101  49845 10L  R7_2     
-        26        994 33101  49875 10R  R7_2     
-        26        995 33101  49535 10L  R7_1     
-        26        996 33101  48852 10R  R6_2     
-        26        997 33101  48797 10L  R6_2     
-        26        998 33101  48847 10R  R6_2     
-        26        999 33101  48822 10L  R6_2     
-        26       1000 33101  34722 10R  S8_4     
-        26       1001 33101  31161 11L  S7_3     
-        26       1002 33101  49931 11R  R7_2     
-        26       1003 33101  49901 11L  R7_2     
-        26       1004 33101  49926 11R  R7_2     
-        26       1005 33101  49573 11L  R7_1     
-        26       1006 33101  49956 11R  R7_2     
-        26       1007 33101  49576 11L  R7_1     
-        26       1008 33101  49961 11R  R7_2     
-        26       1009 33101  49566 11L  R7_1     
-        26       1010 33101  49951 11R  R7_2     
-        26       1011 33101  49561 11L  R7_1     
-        26       1012 33101  49946 11R  R7_2     
-        26       1013 33101  49571 11L  R7_1     
-        26       1014 33101  48888 11R  R6_2     
-        26       1015 33101  49581 11L  R7_1     
-        26       1016 33101  48908 11R  R6_2     
-        26       1017 33101  48878 11L  R6_2     
-        26       1018 33101  48883 11R  R6_2     
-        26       1019 33101  48873 11L  R6_2     
-        26       1020 33101  27716 11R  S6_3a    
-        26       1021 33101  33581 11L  S8_2     
-        26       1022 33101  49932 11R  R7_2     
-        26       1023 33101  49902 11L  R7_2     
-        26       1024 33101  49927 11R  R7_2     
-        26       1025 33101  49579 11L  R7_1     
-        26       1026 33101  49957 11R  R7_2     
-        26       1027 33101  49577 11L  R7_1     
-        26       1028 33101  49962 11R  R7_2     
-        26       1029 33101  49567 11L  R7_1     
-        26       1030 33101  49952 11R  R7_2     
-        26       1031 33101  49562 11L  R7_1     
-        26       1032 33101  49947 11R  R7_2     
-        26       1033 33101  49572 11L  R7_1     
-        26       1034 33101  48889 11R  R6_2     
-        26       1035 33101  49582 11L  R7_1     
-        26       1036 33101  48909 11R  R6_2     
-        26       1037 33101  48879 11L  R6_2     
-        26       1038 33101  48884 11R  R6_2     
-        26       1039 33101  48874 11L  R6_2     
-        26       1040 33101  30629 11R  S7_2     
-        26       1041 33101  38538 11L  S9_6     
-        26       1042 33101  49933 11R  R7_2     
-        26       1043 33101  49903 11L  R7_2     
-        26       1044 33101  49938 11R  R7_2     
-        26       1045 33101  49588 11L  R7_1     
-        26       1046 33101  49958 11R  R7_2     
-        26       1047 33101  49578 11L  R7_1     
-        26       1048 33101  49963 11R  R7_2     
-        26       1049 33101  49568 11L  R7_1     
-        26       1050 33101  49953 11R  R7_2     
-        26       1051 33101  49563 11L  R7_1     
-        26       1052 33101  49948 11R  R7_2     
-        26       1053 33101  49586 11L  R7_1     
-        26       1054 33101  48890 11R  R6_2     
-        26       1055 33101  49583 11L  R7_1     
-        26       1056 33101  48910 11R  R6_2     
-        26       1057 33101  48880 11L  R6_2     
-        26       1058 33101  48885 11R  R6_2     
-        26       1059 33101  48875 11L  R6_2     
-        26       1060 33101  33667 11R  S8_2     
-        26       1061 33101  38539 11L  S9_6     
-        26       1062 33101  49934 11R  R7_2     
-        26       1063 33101  49905 11L  R7_2     
-        26       1064 33101  49929 11R  R7_2     
-        26       1065 33101  49587 11L  R7_1     
-        26       1066 33101  49959 11R  R7_2     
-        26       1067 33101  49589 11L  R7_1     
-        26       1068 33101  49964 11R  R7_2     
-        26       1069 33101  49569 11L  R7_1     
-        26       1070 33101  49954 11R  R7_2     
-        26       1071 33101  49564 11L  R7_1     
-        26       1072 33101  49949 11R  R7_2     
-        26       1073 33101  49574 11L  R7_1     
-        26       1074 33101  48891 11R  R6_2     
-        26       1075 33101  49584 11L  R7_1     
-        26       1076 33101  48911 11R  R6_2     
-        26       1077 33101  48881 11L  R6_2     
-        26       1078 33101  48886 11R  R6_2     
-        26       1079 33101  48876 11L  R6_2     
-        26       1080 33101  34295 11R  S8_3     
-        26       1081 33101  38540 11L  S9_6     
-        26       1082 33101  49935 11R  R7_2     
-        26       1083 33101  49906 11L  R7_2     
-        26       1084 33101  49930 11R  R7_2     
-        26       1085 33101  49590 11L  R7_1     
-        26       1086 33101  49960 11R  R7_2     
-        26       1087 33101  49580 11L  R7_1     
-        26       1088 33101  49965 11R  R7_2     
-        26       1089 33101  49570 11L  R7_1     
-        26       1090 33101  49955 11R  R7_2     
-        26       1091 33101  49565 11L  R7_1     
-        26       1092 33101  49950 11R  R7_2     
-        26       1093 33101  49575 11L  R7_1     
-        26       1094 33101  48892 11R  R6_2     
-        26       1095 33101  49585 11L  R7_1     
-        26       1096 33101  48912 11R  R6_2     
-        26       1097 33101  48882 11L  R6_2     
-        26       1098 33101  48887 11R  R6_2     
-        26       1099 33101  48877 11L  R6_2     
-        26       1100 33101  34802 11R  S8_4     
-        26       1101 33101  33716 12L  S8_2     
-        26       1102 33101  50036 12R  R7_2     
-        26       1103 33101  49986 12L  R7_2     
-        26       1104 33101  50031 12R  R7_2     
-        26       1105 33101  49981 12L  R7_2     
-        26       1106 33101  50026 12R  R7_2     
-        26       1107 33101  48923 12L  R6_2     
-        26       1108 33101  50016 12R  R7_2     
-        26       1109 33101  49996 12L  R7_2     
-        26       1110 33101  50011 12R  R7_2     
-        26       1111 33101  49991 12L  R7_2     
-        26       1112 33101  50006 12R  R7_2     
-        26       1113 33101  49976 12L  R7_2     
-        26       1114 33101  48974 12R  R6_2     
-        26       1115 33101  49971 12L  R7_2     
-        26       1116 33101  48969 12R  R6_2     
-        26       1117 33101  48924 12L  R6_2     
-        26       1118 33101  48964 12R  R6_2     
-        26       1119 33101  48919 12L  R6_2     
-        26       1120 33101  38564 12R  S9_6     
-        26       1121 33101  34858 12L  S8_4     
-        26       1122 33101  50037 12R  R7_2     
-        26       1123 33101  49987 12L  R7_2     
-        26       1124 33101  50041 12R  R7_2     
-        26       1125 33101  49982 12L  R7_2     
-        26       1126 33101  50027 12R  R7_2     
-        26       1127 33101  48930 12L  R6_2     
-        26       1128 33101  50017 12R  R7_2     
-        26       1129 33101  49997 12L  R7_2     
-        26       1130 33101  50012 12R  R7_2     
-        26       1131 33101  49992 12L  R7_2     
-        26       1132 33101  50007 12R  R7_2     
-        26       1133 33101  49977 12L  R7_2     
-        26       1134 33101  48975 12R  R6_2     
-        26       1135 33101  49972 12L  R7_2     
-        26       1136 33101  48970 12R  R6_2     
-        26       1137 33101  48925 12L  R6_2     
-        26       1138 33101  48965 12R  R6_2     
-        26       1139 33101  48920 12L  R6_2     
-        26       1140 33101  38565 12R  S9_6     
-        26       1141 33101  35365 12L  S8_5     
-        26       1142 33101  50044 12R  R7_2     
-        26       1143 33101  49988 12L  R7_2     
-        26       1144 33101  50033 12R  R7_2     
-        26       1145 33101  49983 12L  R7_2     
-        26       1146 33101  50024 12R  R7_2     
-        26       1147 33101  48931 12L  R6_2     
-        26       1148 33101  50018 12R  R7_2     
-        26       1149 33101  49998 12L  R7_2     
-        26       1150 33101  50013 12R  R7_2     
-        26       1151 33101  49993 12L  R7_2     
-        26       1152 33101  50008 12R  R7_2     
-        26       1153 33101  49978 12L  R7_2     
-        26       1154 33101  48976 12R  R6_2     
-        26       1155 33101  49973 12L  R7_2     
-        26       1156 33101  48971 12R  R6_2     
-        26       1157 33101  48926 12L  R6_2     
-        26       1158 33101  48966 12R  R6_2     
-        26       1159 33101  48921 12L  R6_2     
-        26       1160 33101  38566 12R  S9_6     
-        26       1161 33101  44420 12L  R2_2     
-        26       1162 33101  50039 12R  R7_2     
-        26       1163 33101  49989 12L  R7_2     
-        26       1164 33101  50034 12R  R7_2     
-        26       1165 33101  49984 12L  R7_2     
-        26       1166 33101  50029 12R  R7_2     
-        26       1167 33101  48932 12L  R6_2     
-        26       1168 33101  50045 12R  R7_2     
-        26       1169 33101  49999 12L  R7_2     
-        26       1170 33101  50014 12R  R7_2     
-        26       1171 33101  49994 12L  R7_2     
-        26       1172 33101  50009 12R  R7_2     
-        26       1173 33101  49979 12L  R7_2     
-        26       1174 33101  48977 12R  R6_2     
-        26       1175 33101  49974 12L  R7_2     
-        26       1176 33101  48972 12R  R6_2     
-        26       1177 33101  48927 12L  R6_2     
-        26       1178 33101  48967 12R  R6_2     
-        26       1179 33101  48922 12L  R6_2     
-        26       1180 33101  38567 12R  S9_6     
-        26       1181 33101  47674 12L  R5_2     
-        26       1182 33101  50040 12R  R7_2     
-        26       1183 33101  49990 12L  R7_2     
-        26       1184 33101  50035 12R  R7_2     
-        26       1185 33101  49985 12L  R7_2     
-        26       1186 33101  50030 12R  R7_2     
-        26       1187 33101  48933 12L  R6_2     
-        26       1188 33101  50046 12R  R7_2     
-        26       1189 33101  5   12L  R7_2     
-        26       1190 33101  50015 12R  R7_2     
-        26       1191 33101  49995 12L  R7_2     
-        26       1192 33101  50010 12R  R7_2     
-        26       1193 33101  49980 12L  R7_2     
-        26       1194 33101  48978 12R  R6_2     
-        26       1195 33101  49975 12L  R7_2     
-        26       1196 33101  48973 12R  R6_2     
-        26       1197 33101  48928 12L  R6_2     
-        26       1198 33101  48968 12R  R6_2     
-        26       1199 33101  48929 12L  R6_2     
-        26       1200 33101  38568 12R  S9_6     
-        26       1201 33101  29339 13L  S6_3b    
-        26       1202 33101  50091 13R  R7_2     
-        26       1203 33101  50056 13L  R7_2     
-        26       1204 33101  50136 13R  R7_2     
-        26       1205 33101  50066 13L  R7_2     
-        26       1206 33101  50131 13R  R7_2     
-        26       1207 33101  50081 13L  R7_2     
-        26       1208 33101  50126 13R  R7_2     
-        26       1209 33101  50076 13L  R7_2     
-        26       1210 33101  50106 13R  R7_2     
-        26       1211 33101  50071 13L  R7_2     
-        26       1212 33101  50116 13R  R7_2     
-        26       1213 33101  50061 13L  R7_2     
-        26       1214 33101  50101 13R  R7_2     
-        26       1215 33101  48984 13L  R6_2     
-        26       1216 33101  50111 13R  R7_2     
-        26       1217 33101  48979 13L  R6_2     
-        26       1218 33101  49035 13R  R6_2     
-        26       1219 33101  49004 13L  R6_2     
-        26       1220 33101  31293 13R  S7_3     
-        26       1221 33101  29361 13L  P13      
-        26       1222 33101  50132 13R  R7_2     
-        26       1223 33101  50051 13L  R7_2     
-        26       1224 33101  50137 13R  R7_2     
-        26       1225 33101  50077 13L  R7_2     
-        26       1226 33101  50092 13R  R7_2     
-        26       1227 33101  50082 13L  R7_2     
-        26       1228 33101  50127 13R  R7_2     
-        26       1229 33101  50072 13L  R7_2     
-        26       1230 33101  50100 13R  R7_2     
-        26       1231 33101  50067 13L  R7_2     
-        26       1232 33101  50117 13R  R7_2     
-        26       1233 33101  50062 13L  R7_2     
-        26       1234 33101  50102 13R  R7_2     
-        26       1235 33101  48985 13L  R6_2     
-        26       1236 33101  50112 13R  R7_2     
-        26       1237 33101  48980 13L  R6_2     
-        26       1238 33101  49010 13R  R6_2     
-        26       1239 33101  49005 13L  R6_2     
-        26       1240 33101  38586 13R  S9_6     
-        26       1241 33101  33225 13L  S8_1     
-        26       1242 33101  50133 13R  R7_2     
-        26       1243 33101  50058 13L  R7_2     
-        26       1244 33101  50138 13R  R7_2     
-        26       1245 33101  50073 13L  R7_2     
-        26       1246 33101  50093 13R  R7_2     
-        26       1247 33101  50074 13L  R7_2     
-        26       1248 33101  50128 13R  R7_2     
-        26       1249 33101  50078 13L  R7_2     
-        26       1250 33101  50108 13R  R7_2     
-        26       1251 33101  50068 13L  R7_2     
-        26       1252 33101  50099 13R  R7_2     
-        26       1253 33101  50063 13L  R7_2     
-        26       1254 33101  50097 13R  R7_2     
-        26       1255 33101  48986 13L  R6_2     
-        26       1256 33101  50113 13R  R7_2     
-        26       1257 33101  48981 13L  R6_2     
-        26       1258 33101  49011 13R  R6_2     
-        26       1259 33101  49006 13L  R6_2     
-        26       1260 33101  47777 13R  R5_2     
-        26       1261 33101  38569 13L  S9_6     
-        26       1262 33101  50134 13R  R7_2     
-        26       1263 33101  50052 13L  R7_2     
-        26       1264 33101  50139 13R  R7_2     
-        26       1265 33101  50083 13L  R7_2     
-        26       1266 33101  50094 13R  R7_2     
-        26       1267 33101  50084 13L  R7_2     
-        26       1268 33101  50122 13R  R7_2     
-        26       1269 33101  50079 13L  R7_2     
-        26       1270 33101  50109 13R  R7_2     
-        26       1271 33101  50069 13L  R7_2     
-        26       1272 33101  50119 13R  R7_2     
-        26       1273 33101  50064 13L  R7_2     
-        26       1274 33101  50104 13R  R7_2     
-        26       1275 33101  48987 13L  R6_2     
-        26       1276 33101  50114 13R  R7_2     
-        26       1277 33101  48982 13L  R6_2     
-        26       1278 33101  49012 13R  R6_2     
-        26       1279 33101  49007 13L  R6_2     
-        26       1280 33101  49029 13R  R6_2     
-        26       1281 33101  38570 13L  S9_6     
-        26       1282 33101  50135 13R  R7_2     
-        26       1283 33101  50060 13L  R7_2     
-        26       1284 33101  50140 13R  R7_2     
-        26       1285 33101  50075 13L  R7_2     
-        26       1286 33101  50095 13R  R7_2     
-        26       1287 33101  50085 13L  R7_2     
-        26       1288 33101  50125 13R  R7_2     
-        26       1289 33101  50080 13L  R7_2     
-        26       1290 33101  50121 13R  R7_2     
-        26       1291 33101  50070 13L  R7_2     
-        26       1292 33101  50120 13R  R7_2     
-        26       1293 33101  50065 13L  R7_2     
-        26       1294 33101  50105 13R  R7_2     
-        26       1295 33101  48988 13L  R6_2     
-        26       1296 33101  50115 13R  R7_2     
-        26       1297 33101  48983 13L  R6_2     
-        26       1298 33101  49013 13R  R6_2     
-        26       1299 33101  49008 13L  R6_2     
-        26       1300 33101  49030 13R  R6_2     
-        26       1301 33101  41035 14L  S10_5    
-        26       1302 33101  38475 14R  S9_6     
-        26       1303 33101  46875 14L  R5_1     
-        26       1304 33101  46916 14R  R5_1     
-        26       1305 33101  46881 14L  R5_1     
-        26       1306 33101  38427 14R  S9_6     
-        26       1307 33101  46886 14L  R5_1     
-        26       1308 33101  38444 14R  S9_6     
-        26       1309 33101  46891 14L  R5_1     
-        26       1310 33101  38455 14R  S9_6     
-        26       1311 33101  48749 14L  R6_2     
-        26       1312 33101  49116 14R  R7_1     
-        26       1313 33101  49081 14L  R7_1     
-        26       1314 33101  49121 14R  R7_1     
-        26       1315 33101  49086 14L  R7_1     
-        26       1316 33101  49126 14R  R7_1     
-        26       1317 33101  49091 14L  R7_1     
-        26       1318 33101  49131 14R  R7_1     
-        26       1319 33101  49096 14L  R7_1     
-        26       1320 33101  27044 14R  S6_2b    
-        26       1321 33101  27033 14L  S6_2b    
-        26       1322 33101  46902 14R  R5_1     
-        26       1323 33101  46876 14L  R5_1     
-        26       1324 33101  46917 14R  R5_1     
-        26       1325 33101  46882 14L  R5_1     
-        26       1326 33101  38437 14R  S9_6     
-        26       1327 33101  46887 14L  R5_1     
-        26       1328 33101  38447 14R  S9_6     
-        26       1329 33101  46892 14L  R5_1     
-        26       1330 33101  38456 14R  S9_6     
-        26       1331 33101  49076 14L  R7_1     
-        26       1332 33101  49117 14R  R7_1     
-        26       1333 33101  49082 14L  R7_1     
-        26       1334 33101  49114 14R  R7_1     
-        26       1335 33101  49087 14L  R7_1     
-        26       1336 33101  49127 14R  R7_1     
-        26       1337 33101  49092 14L  R7_1     
-        26       1338 33101  49132 14R  R7_1     
-        26       1339 33101  49097 14L  R7_1     
-        26       1340 33101  27503 14R  S6_3     
-        26       1341 33101  27035 14L  S6_2b    
-        26       1342 33101  46913 14R  R5_1     
-        26       1343 33101  46877 14L  R5_1     
-        26       1344 33101  46918 14R  R5_1     
-        26       1345 33101  46883 14L  R5_1     
-        26       1346 33101  38439 14R  S9_6     
-        26       1347 33101  46888 14L  R5_1     
-        26       1348 33101  38448 14R  S9_6     
-        26       1349 33101  46893 14L  R5_1     
-        26       1350 33101  38457 14R  S9_6     
-        26       1351 33101  49078 14L  R7_1     
-        26       1352 33101  49118 14R  R7_1     
-        26       1353 33101  49083 14L  R7_1     
-        26       1354 33101  49115 14R  R7_1     
-        26       1355 33101  49088 14L  R7_1     
-        26       1356 33101  49128 14R  R7_1     
-        26       1357 33101  49093 14L  R7_1     
-        26       1358 33101  49133 14R  R7_1     
-        26       1359 33101  49098 14L  R7_1     
-        26       1360 33101  28061 14R  S6_3b    
-        26       1361 33101  28001 14L  S6_3b    
-        26       1362 33101  46914 14R  R5_1     
-        26       1363 33101  46878 14L  R5_1     
-        26       1364 33101  46919 14R  R5_1     
-        26       1365 33101  46884 14L  R5_1     
-        26       1366 33101  38441 14R  S9_6     
-        26       1367 33101  46889 14L  R5_1     
-        26       1368 33101  38453 14R  S9_6     
-        26       1369 33101  46894 14L  R5_1     
-        26       1370 33101  38458 14R  S9_6     
-        26       1371 33101  49079 14L  R7_1     
-        26       1372 33101  49119 14R  R7_1     
-        26       1373 33101  49084 14L  R7_1     
-        26       1374 33101  49124 14R  R7_1     
-        26       1375 33101  49089 14L  R7_1     
-        26       1376 33101  49129 14R  R7_1     
-        26       1377 33101  49094 14L  R7_1     
-        26       1378 33101  49134 14R  R7_1     
-        26       1379 33101  48020 14L  R6_1     
-        26       1380 33101  28065 14R  S6_3b    
-        26       1381 33101  28003 14L  S6_3b    
-        26       1382 33101  46915 14R  R5_1     
-        26       1383 33101  46879 14L  R5_1     
-        26       1384 33101  46920 14R  R5_1     
-        26       1385 33101  46885 14L  R5_1     
-        26       1386 33101  38442 14R  S9_6     
-        26       1387 33101  46890 14L  R5_1     
-        26       1388 33101  38454 14R  S9_6     
-        26       1389 33101  46895 14L  R5_1     
-        26       1390 33101  38459 14R  S9_6     
-        26       1391 33101  49080 14L  R7_1     
-        26       1392 33101  49120 14R  R7_1     
-        26       1393 33101  49085 14L  R7_1     
-        26       1394 33101  49125 14R  R7_1     
-        26       1395 33101  49090 14L  R7_1     
-        26       1396 33101  49130 14R  R7_1     
-        26       1397 33101  49095 14L  R7_1     
-        26       1398 33101  49135 14R  R7_1     
-        26       1399 33101  48748 14L  R6_2     
-        26       1400 33101  28067 14R  S6_3b    
-        26       1401 33101  27077 15L  S6_2b    
-        26       1402 33101  46946 15R  R5_1     
-        26       1403 33101  46922 15L  R5_1     
-        26       1404 33101  46956 15R  R5_1     
-        26       1405 33101  46927 15L  R5_1     
-        26       1406 33101  46961 15R  R5_1     
-        26       1407 33101  39326 15L  S10_1    
-        26       1408 33101  46966 15R  R5_1     
-        26       1409 33101  46936 15L  R5_1     
-        26       1410 33101  48074 15R  R6_1     
-        26       1411 33101  46941 15L  R5_1     
-        26       1412 33101  48076 15R  R6_1     
-        26       1413 33101  48056 15L  R6_1     
-        26       1414 33101  48077 15R  R6_1     
-        26       1415 33101  49172 15L  R7_1     
-        26       1416 33101  49202 15R  R7_1     
-        26       1417 33101  48054 15L  R6_1     
-        26       1418 33101  49192 15R  R7_1     
-        26       1419 33101  48053 15L  R6_1     
-        26       1420 33101  41917 15R  P18      
-        26       1421 33101  27079 15L  S6_2b    
-        26       1422 33101  46947 15R  R5_1     
-        26       1423 33101  46923 15L  R5_1     
-        26       1424 33101  46957 15R  R5_1     
-        26       1425 33101  46928 15L  R5_1     
-        26       1426 33101  46962 15R  R5_1     
-        26       1427 33101  46932 15L  R5_1     
-        26       1428 33101  46967 15R  R5_1     
-        26       1429 33101  46937 15L  R5_1     
-        26       1430 33101  46952 15R  R5_1     
-        26       1431 33101  46942 15L  R5_1     
-        26       1432 33101  48075 15R  R6_1     
-        26       1433 33101  48057 15L  R6_1     
-        26       1434 33101  49188 15R  R7_1     
-        26       1435 33101  49166 15L  R7_1     
-        26       1436 33101  49203 15R  R7_1     
-        26       1437 33101  48055 15L  R6_1     
-        26       1438 33101  49201 15R  R7_1     
-        26       1439 33101  49165 15L  R7_1     
-        26       1440 33101  27096 15R  S6_2b    
-        26       1441 33101  27081 15L  S6_2b    
-        26       1442 33101  46948 15R  R5_1     
-        26       1443 33101  46924 15L  R5_1     
-        26       1444 33101  46958 15R  R5_1     
-        26       1445 33101  46929 15L  R5_1     
-        26       1446 33101  46963 15R  R5_1     
-        26       1447 33101  46933 15L  R5_1     
-        26       1448 33101  46968 15R  R5_1     
-        26       1449 33101  46938 15L  R5_1     
-        26       1450 33101  46953 15R  R5_1     
-        26       1451 33101  46943 15L  R5_1     
-        26       1452 33101  48078 15R  R6_1     
-        26       1453 33101  48058 15L  R6_1     
-        26       1454 33101  49189 15R  R7_1     
-        26       1455 33101  49182 15L  R7_1     
-        26       1456 33101  49198 15R  R7_1     
-        26       1457 33101  49183 15L  R7_1     
-        26       1458 33101  49193 15R  R7_1     
-        26       1459 33101  49167 15L  R7_1     
-        26       1460 33101  27105 15R  S6_2b    
-        26       1461 33101  44125 15L  R2_2     
-        26       1462 33101  46949 15R  R5_1     
-        26       1463 33101  46925 15L  R5_1     
-        26       1464 33101  46959 15R  R5_1     
-        26       1465 33101  46930 15L  R5_1     
-        26       1466 33101  46964 15R  R5_1     
-        26       1467 33101  46934 15L  R5_1     
-        26       1468 33101  46969 15R  R5_1     
-        26       1469 33101  46939 15L  R5_1     
-        26       1470 33101  46954 15R  R5_1     
-        26       1471 33101  46944 15L  R5_1     
-        26       1472 33101  48079 15R  R6_1     
-        26       1473 33101  48059 15L  R6_1     
-        26       1474 33101  49190 15R  R7_1     
-        26       1475 33101  49184 15L  R7_1     
-        26       1476 33101  49199 15R  R7_1     
-        26       1477 33101  49187 15L  R7_1     
-        26       1478 33101  49194 15R  R7_1     
-        26       1479 33101  49168 15L  R7_1     
-        26       1480 33101  27120 15R  S6_2b    
-        26       1481 33101  46921 15L  R5_1     
-        26       1482 33101  46950 15R  R5_1     
-        26       1483 33101  46926 15L  R5_1     
-        26       1484 33101  46960 15R  R5_1     
-        26       1485 33101  46931 15L  R5_1     
-        26       1486 33101  46965 15R  R5_1     
-        26       1487 33101  46935 15L  R5_1     
-        26       1488 33101  46970 15R  R5_1     
-        26       1489 33101  46940 15L  R5_1     
-        26       1490 33101  46955 15R  R5_1     
-        26       1491 33101  46945 15L  R5_1     
-        26       1492 33101  48080 15R  R6_1     
-        26       1493 33101  48060 15L  R6_1     
-        26       1494 33101  49191 15R  R7_1     
-        26       1495 33101  49186 15L  R7_1     
-        26       1496 33101  49200 15R  R7_1     
-        26       1497 33101  49169 15L  R7_1     
-        26       1498 33101  49195 15R  R7_1     
-        26       1499 33101  49171 15L  R7_1     
-        26       1500 33101  27511 15R  S6_3     
-        26       1501 33101  27513 16L  S6_3     
-        26       1502 33101  46996 16R  R5_1     
-        26       1503 33101  37085 16L  S9_3     
-        26       1504 33101  47001 16R  R5_1     
-        26       1505 33101  46986 16L  R5_1     
-        26       1506 33101  48752 16R  R6_2     
-        26       1507 33101  46991 16L  R5_1     
-        26       1508 33101  47011 16R  R5_1     
-        26       1509 33101  49216 16L  R7_1     
-        26       1510 33101  47016 16R  R5_1     
-        26       1511 33101  49213 16L  R7_1     
-        26       1512 33101  48119 16R  R6_1     
-        26       1513 33101  49221 16L  R7_1     
-        26       1514 33101  49260 16R  R7_1     
-        26       1515 33101  49226 16L  R7_1     
-        26       1516 33101  49266 16R  R7_1     
-        26       1517 33101  49231 16L  R7_1     
-        26       1518 33101  49271 16R  R7_1     
-        26       1519 33101  49236 16L  R7_1     
-        26       1520 33101  39446 16R  S10_1    
-        26       1521 33101  41139 16L  S10_5    
-        26       1522 33101  46997 16R  R5_1     
-        26       1523 33101  37086 16L  S9_3     
-        26       1524 33101  47002 16R  R5_1     
-        26       1525 33101  46987 16L  R5_1     
-        26       1526 33101  47007 16R  R5_1     
-        26       1527 33101  46992 16L  R5_1     
-        26       1528 33101  47012 16R  R5_1     
-        26       1529 33101  49249 16L  R7_1     
-        26       1530 33101  47017 16R  R5_1     
-        26       1531 33101  49214 16L  R7_1     
-        26       1532 33101  48120 16R  R6_1     
-        26       1533 33101  49222 16L  R7_1     
-        26       1534 33101  49263 16R  R7_1     
-        26       1535 33101  49227 16L  R7_1     
-        26       1536 33101  49267 16R  R7_1     
-        26       1537 33101  49232 16L  R7_1     
-        26       1538 33101  49272 16R  R7_1     
-        26       1539 33101  49242 16L  R7_1     
-        26       1540 33101  39458 16R  S10_1    
-        26       1541 33101  42285 16L  P19      
-        26       1542 33101  46998 16R  R5_1     
-        26       1543 33101  46984 16L  R5_1     
-        26       1544 33101  47003 16R  R5_1     
-        26       1545 33101  46988 16L  R5_1     
-        26       1546 33101  47008 16R  R5_1     
-        26       1547 33101  46993 16L  R5_1     
-        26       1548 33101  47013 16R  R5_1     
-        26       1549 33101  48100 16L  R6_1     
-        26       1550 33101  47018 16R  R5_1     
-        26       1551 33101  49215 16L  R7_1     
-        26       1552 33101  49261 16R  R7_1     
-        26       1553 33101  49223 16L  R7_1     
-        26       1554 33101  49265 16R  R7_1     
-        26       1555 33101  49228 16L  R7_1     
-        26       1556 33101  49268 16R  R7_1     
-        26       1557 33101  49233 16L  R7_1     
-        26       1558 33101  49273 16R  R7_1     
-        26       1559 33101  49238 16L  R7_1     
-        26       1560 33101  41169 16R  S10_5    
-        26       1561 33101  42289 16L  P19      
-        26       1562 33101  46999 16R  R5_1     
-        26       1563 33101  46985 16L  R5_1     
-        26       1564 33101  47004 16R  R5_1     
-        26       1565 33101  46989 16L  R5_1     
-        26       1566 33101  47009 16R  R5_1     
-        26       1567 33101  46994 16L  R5_1     
-        26       1568 33101  47014 16R  R5_1     
-        26       1569 33101  48751 16L  R6_2     
-        26       1570 33101  47019 16R  R5_1     
-        26       1571 33101  49217 16L  R7_1     
-        26       1572 33101  48754 16R  R6_2     
-        26       1573 33101  49224 16L  R7_1     
-        26       1574 33101  49276 16R  R7_1     
-        26       1575 33101  49229 16L  R7_1     
-        26       1576 33101  49269 16R  R7_1     
-        26       1577 33101  49234 16L  R7_1     
-        26       1578 33101  49274 16R  R7_1     
-        26       1579 33101  49239 16L  R7_1     
-        26       1580 33101  41932 16R  P18      
-        26       1581 33101  42303 16L  P19      
-        26       1582 33101  47000 16R  R5_1     
-        26       1583 33101  48750 16L  R6_2     
-        26       1584 33101  47005 16R  R5_1     
-        26       1585 33101  46990 16L  R5_1     
-        26       1586 33101  47010 16R  R5_1     
-        26       1587 33101  46995 16L  R5_1     
-        26       1588 33101  47015 16R  R5_1     
-        26       1589 33101  49237 16L  R7_1     
-        26       1590 33101  48753 16R  R6_2     
-        26       1591 33101  49218 16L  R7_1     
-        26       1592 33101  48755 16R  R6_2     
-        26       1593 33101  49220 16L  R7_1     
-        26       1594 33101  49277 16R  R7_1     
-        26       1595 33101  49230 16L  R7_1     
-        26       1596 33101  49270 16R  R7_1     
-        26       1597 33101  49235 16L  R7_1     
-        26       1598 33101  49275 16R  R7_1     
-        26       1599 33101  49240 16L  R7_1     
-        26       1600 33101  41933 16R  P18      
-        26       1601 33106     72 17L  SICEB1_1 
-        26       1602 33106    439 17R  EBP03    
-        26       1603 33106    377 17L  EBP03    
-        26       1604 33106    448 17R  EBP03    
-        26       1605 33106    382 17L  EBP03    
-        26       1606 33106    454 17R  EBP03    
-        26       1607 33106    392 17L  EBP03    
-        26       1608 33106    466 17R  EBP03    
-        26       1609 33106    397 17L  EBP03    
-        26       1610 33106    473 17R  EBP03    
-        26       1611 33106    409 17L  EBP03    
-        26       1612 33106    480 17R  EBP03    
-        26       1613 33106    415 17L  EBP03    
-        26       1614 33106    485 17R  EBP03    
-        26       1615 33106    420 17L  EBP03    
-        26       1616 33106    492 17R  EBP03    
-        26       1617 33106    501 17L  EBP04    
-        26       1618 33106    495 17R  EBP03    
-        26       1619 33106    424 17L  EBP03    
-        26       1620 33106    500 17R  EBP03    
-        26       1621 33106    373 17L  EBP03    
-        26       1622 33106    440 17R  EBP03    
-        26       1623 33106    378 17L  EBP03    
-        26       1624 33106    449 17R  EBP03    
-        26       1625 33106    383 17L  EBP03    
-        26       1626 33106    457 17R  EBP03    
-        26       1627 33106    393 17L  EBP03    
-        26       1628 33106    468 17R  EBP03    
-        26       1629 33106    398 17L  EBP03    
-        26       1630 33106    476 17R  EBP03    
-        26       1631 33106    410 17L  EBP03    
-        26       1632 33106    481 17R  EBP03    
-        26       1633 33106    416 17L  EBP03    
-        26       1634 33106    486 17R  EBP03    
-        26       1635 33106    421 17L  EBP03    
-        26       1636 33106    493 17R  EBP03    
-        26       1637 33106    502 17L  EBP04    
-        26       1638 33106    496 17R  EBP03    
-        26       1639 33106    508 17L  EBP04    
-        26       1640 33106    544 17R  EBP04    
-        26       1641 33106    374 17L  EBP03    
-        26       1642 33106    442 17R  EBP03    
-        26       1643 33106    379 17L  EBP03    
-        26       1644 33106    450 17R  EBP03    
-        26       1645 33106    384 17L  EBP03    
-        26       1646 33106    460 17R  EBP03    
-        26       1647 33106    394 17L  EBP03    
-        26       1648 33106    469 17R  EBP03    
-        26       1649 33106    403 17L  EBP03    
-        26       1650 33106    477 17R  EBP03    
-        26       1651 33106    412 17L  EBP03    
-        26       1652 33106    482 17R  EBP03    
-        26       1653 33106    417 17L  EBP03    
-        26       1654 33106    487 17R  EBP03    
-        26       1655 33106    422 17L  EBP03    
-        26       1656 33106    488 17R  EBP03    
-        26       1657 33106    504 17L  EBP04    
-        26       1658 33106    497 17R  EBP03    
-        26       1659 33106    509 17L  EBP04    
-        26       1660 33106    547 17R  EBP04    
-        26       1661 33106    375 17L  EBP03    
-        26       1662 33106    443 17R  EBP03    
-        26       1663 33106    380 17L  EBP03    
-        26       1664 33106    451 17R  EBP03    
-        26       1665 33106    386 17L  EBP03    
-        26       1666 33106    461 17R  EBP03    
-        26       1667 33106    395 17L  EBP03    
-        26       1668 33106    471 17R  EBP03    
-        26       1669 33106    405 17L  EBP03    
-        26       1670 33106    478 17R  EBP03    
-        26       1671 33106    413 17L  EBP03    
-        26       1672 33106    483 17R  EBP03    
-        26       1673 33106    418 17L  EBP03    
-        26       1674 33106    491 17R  EBP03    
-        26       1675 33106    423 17L  EBP03    
-        26       1676 33106    489 17R  EBP03    
-        26       1677 33106    505 17L  EBP04    
-        26       1678 33106    499 17R  EBP03    
-        26       1679 33106    519 17L  EBP04    
-        26       1680 33106    548 17R  EBP04    
-        26       1681 33106    376 17L  EBP03    
-        26       1682 33106    445 17R  EBP03    
-        26       1683 33106    381 17L  EBP03    
-        26       1684 33106    452 17R  EBP03    
-        26       1685 33106    391 17L  EBP03    
-        26       1686 33106    465 17R  EBP03    
-        26       1687 33106    396 17L  EBP03    
-        26       1688 33106    472 17R  EBP03    
-        26       1689 33106    406 17L  EBP03    
-        26       1690 33106    479 17R  EBP03    
-        26       1691 33106    414 17L  EBP03    
-        26       1692 33106    484 17R  EBP03    
-        26       1693 33106    419 17L  EBP03    
-        26       1694 33106    494 17R  EBP03    
-        26       1695 33106    425 17L  EBP03    
-        26       1696 33106    490 17R  EBP03    
-        26       1697 33106    506 17L  EBP04    
-        26       1698 33106    542 17R  EBP04    
-        26       1699 33106    521 17L  EBP04    
-        26       1700 33106    549 17R  EBP04    
-        27          1 33101  35034 1L   S8_5     
-        27          2 33101  37498 1R   S9_4     
-        27          3 33101  50691 1L   R8_2     
-        27          4 33101  50148 1R   R8_1     
-        27          5 33101  50696 1L   R8_2     
-        27          6 33101  50153 1R   R8_1     
-        27          7 33101  50701 1L   R8_2     
-        27          8 33101  50723 1R   R8_2     
-        27          9 33101  50706 1L   R8_2     
-        27         10 33101  50728 1R   R8_2     
-        27         11 33101  50711 1L   R8_2     
-        27         12 33101  50733 1R   R8_2     
-        27         13 33101  50716 1L   R8_2     
-        27         14 33101  50738 1R   R8_2     
-        27         15 33101  51241 1L   R9_1     
-        27         16 33101  50743 1R   R8_2     
-        27         17 33101  51246 1L   R9_1     
-        27         18 33101  50748 1R   R8_2     
-        27         19 33101  41501 1L   S10_6    
-        27         20 33101  38292 1R   S9_6     
-        27         21 33101  37479 1L   S9_4     
-        27         22 33101  37506 1R   S9_4     
-        27         23 33101  50692 1L   R8_2     
-        27         24 33101  50149 1R   R8_1     
-        27         25 33101  50697 1L   R8_2     
-        27         26 33101  50154 1R   R8_1     
-        27         27 33101  50702 1L   R8_2     
-        27         28 33101  50725 1R   R8_2     
-        27         29 33101  50707 1L   R8_2     
-        27         30 33101  50729 1R   R8_2     
-        27         31 33101  50712 1L   R8_2     
-        27         32 33101  50734 1R   R8_2     
-        27         33 33101  50717 1L   R8_2     
-        27         34 33101  50739 1R   R8_2     
-        27         35 33101  51242 1L   R9_1     
-        27         36 33101  50744 1R   R8_2     
-        27         37 33101  51247 1L   R9_1     
-        27         38 33101  50749 1R   R8_2     
-        27         39 33101  41508 1L   S10_6    
-        27         40 33101  38293 1R   S9_6     
-        27         41 33101  38902 1L   P017     
-        27         42 33101  37511 1R   S9_4     
-        27         43 33101  50693 1L   R8_2     
-        27         44 33101  50150 1R   R8_1     
-        27         45 33101  50698 1L   R8_2     
-        27         46 33101  50155 1R   R8_1     
-        27         47 33101  50703 1L   R8_2     
-        27         48 33101  50724 1R   R8_2     
-        27         49 33101  50708 1L   R8_2     
-        27         50 33101  50730 1R   R8_2     
-        27         51 33101  50713 1L   R8_2     
-        27         52 33101  50735 1R   R8_2     
-        27         53 33101  50718 1L   R8_2     
-        27         54 33101  50740 1R   R8_2     
-        27         55 33101  51243 1L   R9_1     
-        27         56 33101  50745 1R   R8_2     
-        27         57 33101  51248 1L   R9_1     
-        27         58 33101  50750 1R   R8_2     
-        27         59 33101  37458 1L   S9_4     
-        27         60 33101  38297 1R   S9_6     
-        27         61 33101  38903 1L   P017     
-        27         62 33101  50147 1R   R8_1     
-        27         63 33101  50145 1L   R8_1     
-        27         64 33101  50151 1R   R8_1     
-        27         65 33101  50699 1L   R8_2     
-        27         66 33101  50721 1R   R8_2     
-        27         67 33101  50704 1L   R8_2     
-        27         68 33101  50726 1R   R8_2     
-        27         69 33101  50146 1L   R8_1     
-        27         70 33101  50731 1R   R8_2     
-        27         71 33101  50714 1L   R8_2     
-        27         72 33101  50736 1R   R8_2     
-        27         73 33101  50719 1L   R8_2     
-        27         74 33101  50741 1R   R8_2     
-        27         75 33101  51244 1L   R9_1     
-        27         76 33101  50746 1R   R8_2     
-        27         77 33101  46730 1L   R5_1     
-        27         78 33101  51261 1R   R9_1     
-        27         79 33101  37481 1L   S9_4     
-        27         80 33101  38298 1R   S9_6     
-        27         81 33101  38904 1L   P017     
-        27         82 33101  50156 1R   R8_1     
-        27         83 33101  50695 1L   R8_2     
-        27         84 33101  50152 1R   R8_1     
-        27         85 33101  50700 1L   R8_2     
-        27         86 33101  50722 1R   R8_2     
-        27         87 33101  50705 1L   R8_2     
-        27         88 33101  50727 1R   R8_2     
-        27         89 33101  50710 1L   R8_2     
-        27         90 33101  50732 1R   R8_2     
-        27         91 33101  50715 1L   R8_2     
-        27         92 33101  50737 1R   R8_2     
-        27         93 33101  50720 1L   R8_2     
-        27         94 33101  50742 1R   R8_2     
-        27         95 33101  51245 1L   R9_1     
-        27         96 33101  50747 1R   R8_2     
-        27         97 33101  50709 1L   R8_2     
-        27         98 33101  51262 1R   R9_1     
-        27         99 33101  37485 1L   S9_4     
-        27        100 33101  38299 1R   S9_6     
-        27        101 33101  31919 2L   S07_5    
-        27        102 33101  37568 2R   S9_4     
-        27        103 33101  50751 2L   R8_2     
-        27        104 33101  50166 2R   R8_1     
-        27        105 33101  50161 2L   R8_1     
-        27        106 33101  50171 2R   R8_1     
-        27        107 33101  50755 2L   R8_2     
-        27        108 33101  50781 2R   R8_2     
-        27        109 33101  50761 2L   R8_2     
-        27        110 33101  50786 2R   R8_2     
-        27        111 33101  50766 2L   R8_2     
-        27        112 33101  50796 2R   R8_2     
-        27        113 33101  50771 2L   R8_2     
-        27        114 33101  50801 2R   R8_2     
-        27        115 33101  50776 2L   R8_2     
-        27        116 33101  51311 2R   R9_1     
-        27        117 33101  51281 2L   R9_1     
-        27        118 33101  51316 2R   R9_1     
-        27        119 33101  37549 2L   S9_4     
-        27        120 33101  26524 2R   S6_2     
-        27        121 33101  31924 2L   S07_5    
-        27        122 33101  49666 2R   R7_2     
-        27        123 33101  50752 2L   R8_2     
-        27        124 33101  50167 2R   R8_1     
-        27        125 33101  50162 2L   R8_1     
-        27        126 33101  50172 2R   R8_1     
-        27        127 33101  50756 2L   R8_2     
-        27        128 33101  50782 2R   R8_2     
-        27        129 33101  50762 2L   R8_2     
-        27        130 33101  50787 2R   R8_2     
-        27        131 33101  50767 2L   R8_2     
-        27        132 33101  50797 2R   R8_2     
-        27        133 33101  50772 2L   R8_2     
-        27        134 33101  50802 2R   R8_2     
-        27        135 33101  50777 2L   R8_2     
-        27        136 33101  51312 2R   R9_1     
-        27        137 33101  51282 2L   R9_1     
-        27        138 33101  51317 2R   R9_1     
-        27        139 33101  37558 2L   S9_4     
-        27        140 33101  38337 2R   S9_6     
-        27        141 33101  33924 2L   S8_3     
-        27        142 33101  49673 2R   R7_2     
-        27        143 33101  50753 2L   R8_2     
-        27        144 33101  50168 2R   R8_1     
-        27        145 33101  50163 2L   R8_1     
-        27        146 33101  50173 2R   R8_1     
-        27        147 33101  50757 2L   R8_2     
-        27        148 33101  50783 2R   R8_2     
-        27        149 33101  50763 2L   R8_2     
-        27        150 33101  50788 2R   R8_2     
-        27        151 33101  50768 2L   R8_2     
-        27        152 33101  50798 2R   R8_2     
-        27        153 33101  50773 2L   R8_2     
-        27        154 33101  50803 2R   R8_2     
-        27        155 33101  50778 2L   R8_2     
-        27        156 33101  51313 2R   R9_1     
-        27        157 33101  51283 2L   R9_1     
-        27        158 33101  50793 2R   R8_2     
-        27        159 33101  38316 2L   S9_6     
-        27        160 33101  38338 2R   S9_6     
-        27        161 33101  33949 2L   S8_3     
-        27        162 33101  50791 2R   R8_2     
-        27        163 33101  50754 2L   R8_2     
-        27        164 33101  50169 2R   R8_1     
-        27        165 33101  50164 2L   R8_1     
-        27        166 33101  50174 2R   R8_1     
-        27        167 33101  50759 2L   R8_2     
-        27        168 33101  50784 2R   R8_2     
-        27        169 33101  50764 2L   R8_2     
-        27        170 33101  50789 2R   R8_2     
-        27        171 33101  50769 2L   R8_2     
-        27        172 33101  50799 2R   R8_2     
-        27        173 33101  50774 2L   R8_2     
-        27        174 33101  50804 2R   R8_2     
-        27        175 33101  50779 2L   R8_2     
-        27        176 33101  51314 2R   R9_1     
-        27        177 33101  51284 2L   R9_1     
-        27        178 33101  50794 2R   R8_2     
-        27        179 33101  38322 2L   S9_6     
-        27        180 33101  38340 2R   S9_6     
-        27        181 33101  33959 2L   S8_3     
-        27        182 33101  50792 2R   R8_2     
-        27        183 33101  46690 2L   R5_1     
-        27        184 33101  50170 2R   R8_1     
-        27        185 33101  50165 2L   R8_1     
-        27        186 33101  50175 2R   R8_1     
-        27        187 33101  50760 2L   R8_2     
-        27        188 33101  50785 2R   R8_2     
-        27        189 33101  50765 2L   R8_2     
-        27        190 33101  50790 2R   R8_2     
-        27        191 33101  50758 2L   R8_2     
-        27        192 33101  50800 2R   R8_2     
-        27        193 33101  50775 2L   R8_2     
-        27        194 33101  50805 2R   R8_2     
-        27        195 33101  50780 2L   R8_2     
-        27        196 33101  51315 2R   R9_1     
-        27        197 33101  51285 2L   R9_1     
-        27        198 33101  50795 2R   R8_2     
-        27        199 33101  38731 2L   P016     
-        27        200 33101  38341 2R   S9_6     
-        27        201 33101  26536 3L   S6_2     
-        27        202 33101  37657 3R   S9_4     
-        27        203 33101  49706 3L   R7_2     
-        27        204 33101  49723 3R   R7_2     
-        27        205 33101  49711 3L   R7_2     
-        27        206 33101  49730 3R   R7_2     
-        27        207 33101  50806 3L   R8_2     
-        27        208 33101  49736 3R   R7_2     
-        27        209 33101  50811 3L   R8_2     
-        27        210 33101  50831 3R   R8_2     
-        27        211 33101  50816 3L   R8_2     
-        27        212 33101  50836 3R   R8_2     
-        27        213 33101  50822 3L   R8_2     
-        27        214 33101  50841 3R   R8_2     
-        27        215 33101  51336 3L   R9_1     
-        27        216 33101  51361 3R   R9_1     
-        27        217 33101  50819 3L   R8_2     
-        27        218 33101  51366 3R   R9_1     
-        27        219 33101  29014 3L   P13      
-        27        220 33101  38762 3R   P016     
-        27        221 33101  32009 3L   S07_5    
-        27        222 33101  37659 3R   S9_4     
-        27        223 33101  49707 3L   R7_2     
-        27        224 33101  49727 3R   R7_2     
-        27        225 33101  49712 3L   R7_2     
-        27        226 33101  49732 3R   R7_2     
-        27        227 33101  50807 3L   R8_2     
-        27        228 33101  49737 3R   R7_2     
-        27        229 33101  50812 3L   R8_2     
-        27        230 33101  50846 3R   R8_2     
-        27        231 33101  50818 3L   R8_2     
-        27        232 33101  50837 3R   R8_2     
-        27        233 33101  50823 3L   R8_2     
-        27        234 33101  50842 3R   R8_2     
-        27        235 33101  51332 3L   R9_1     
-        27        236 33101  51362 3R   R9_1     
-        27        237 33101  51337 3L   R9_1     
-        27        238 33101  51367 3R   R9_1     
-        27        239 33101  37603 3L   S9_4     
-        27        240 33101  38763 3R   P016     
-        27        241 33101  32030 3L   S07_5    
-        27        242 33101  39014 3R   P017     
-        27        243 33101  49708 3L   R7_2     
-        27        244 33101  49729 3R   R7_2     
-        27        245 33101  49713 3L   R7_2     
-        27        246 33101  49733 3R   R7_2     
-        27        247 33101  50808 3L   R8_2     
-        27        248 33101  49738 3R   R7_2     
-        27        249 33101  50813 3L   R8_2     
-        27        250 33101  50833 3R   R8_2     
-        27        251 33101  50820 3L   R8_2     
-        27        252 33101  50838 3R   R8_2     
-        27        253 33101  50824 3L   R8_2     
-        27        254 33101  50843 3R   R8_2     
-        27        255 33101  51333 3L   R9_1     
-        27        256 33101  50832 3R   R8_2     
-        27        257 33101  50828 3L   R8_2     
-        27        258 33101  50849 3R   R8_2     
-        27        259 33101  37616 3L   S9_4     
-        27        260 33101  38368 3R   S9_6     
-        27        261 33101  34035 3L   S8_3     
-        27        262 33101  50847 3R   R8_2     
-        27        263 33101  49709 3L   R7_2     
-        27        264 33101  49731 3R   R7_2     
-        27        265 33101  49714 3L   R7_2     
-        27        266 33101  49734 3R   R7_2     
-        27        267 33101  50809 3L   R8_2     
-        27        268 33101  49739 3R   R7_2     
-        27        269 33101  50814 3L   R8_2     
-        27        270 33101  50834 3R   R8_2     
-        27        271 33101  50821 3L   R8_2     
-        27        272 33101  50839 3R   R8_2     
-        27        273 33101  50825 3L   R8_2     
-        27        274 33101  50844 3R   R8_2     
-        27        275 33101  51334 3L   R9_1     
-        27        276 33101  51364 3R   R9_1     
-        27        277 33101  50829 3L   R8_2     
-        27        278 33101  50850 3R   R8_2     
-        27        279 33101  37618 3L   S9_4     
-        27        280 33101  38369 3R   S9_6     
-        27        281 33101  34038 3L   S8_3     
-        27        282 33101  50848 3R   R8_2     
-        27        283 33101  49705 3L   R7_2     
-        27        284 33101  49728 3R   R7_2     
-        27        285 33101  49715 3L   R7_2     
-        27        286 33101  49735 3R   R7_2     
-        27        287 33101  50810 3L   R8_2     
-        27        288 33101  49740 3R   R7_2     
-        27        289 33101  50815 3L   R8_2     
-        27        290 33101  50835 3R   R8_2     
-        27        291 33101  50827 3L   R8_2     
-        27        292 33101  50840 3R   R8_2     
-        27        293 33101  50826 3L   R8_2     
-        27        294 33101  50845 3R   R8_2     
-        27        295 33101  51335 3L   R9_1     
-        27        296 33101  51365 3R   R9_1     
-        27        297 33101  50830 3L   R8_2     
-        27        298 33101  51368 3R   R9_1     
-        27        299 33101  38349 3L   S9_6     
-        27        300 33101  38370 3R   S9_6     
-        27        301 33101  33374 4L   S8_2     
-        27        302 33101  37721 4R   S9_4     
-        27        303 33101  50178 4L   R8_1     
-        27        304 33101  38770 4R   P016     
-        27        305 33101  50851 4L   R8_2     
-        27        306 33101  50876 4R   R8_2     
-        27        307 33101  50856 4L   R8_2     
-        27        308 33101  50196 4R   R8_1     
-        27        309 33101  50861 4L   R8_2     
-        27        310 33101  50881 4R   R8_2     
-        27        311 33101  50177 4L   R8_1     
-        27        312 33101  50886 4R   R8_2     
-        27        313 33101  50871 4L   R8_2     
-        27        314 33101  50891 4R   R8_2     
-        27        315 33101  50866 4L   R8_2     
-        27        316 33101  50896 4R   R8_2     
-        27        317 33101  51386 4L   R9_1     
-        27        318 33101  50901 4R   R8_2     
-        27        319 33101  26659 4L   S6_2     
-        27        320 33101  26685 4R   S6_2     
-        27        321 33101  33379 4L   S8_2     
-        27        322 33101  37728 4R   S9_4     
-        27        323 33101  50179 4L   R8_1     
-        27        324 33101  39065 4R   P017     
-        27        325 33101  50852 4L   R8_2     
-        27        326 33101  50877 4R   R8_2     
-        27        327 33101  50857 4L   R8_2     
-        27        328 33101  50197 4R   R8_1     
-        27        329 33101  50862 4L   R8_2     
-        27        330 33101  50882 4R   R8_2     
-        27        331 33101  50867 4L   R8_2     
-        27        332 33101  50887 4R   R8_2     
-        27        333 33101  50872 4L   R8_2     
-        27        334 33101  50892 4R   R8_2     
-        27        335 33101  51382 4L   R9_1     
-        27        336 33101  50897 4R   R8_2     
-        27        337 33101  51387 4L   R9_1     
-        27        338 33101  50902 4R   R8_2     
-        27        339 33101  30247 4L   S7_2     
-        27        340 33101  26700 4R   S6_2     
-        27        341 33101  33398 4L   S8_2     
-        27        342 33101  37742 4R   S9_4     
-        27        343 33101  50180 4L   R8_1     
-        27        344 33101  46851 4R   R5_1     
-        27        345 33101  50853 4L   R8_2     
-        27        346 33101  50878 4R   R8_2     
-        27        347 33101  50858 4L   R8_2     
-        27        348 33101  50198 4R   R8_1     
-        27        349 33101  50863 4L   R8_2     
-        27        350 33101  50883 4R   R8_2     
-        27        351 33101  50868 4L   R8_2     
-        27        352 33101  50888 4R   R8_2     
-        27        353 33101  50873 4L   R8_2     
-        27        354 33101  50893 4R   R8_2     
-        27        355 33101  51383 4L   R9_1     
-        27        356 33101  50898 4R   R8_2     
-        27        357 33101  51388 4L   R9_1     
-        27        358 33101  50903 4R   R8_2     
-        27        359 33101  35292 4L   S8_5     
-        27        360 33101  26709 4R   S6_2     
-        27        361 33101  33418 4L   S8_2     
-        27        362 33101  37744 4R   S9_4     
-        27        363 33101  50181 4L   R8_1     
-        27        364 33101  49770 4R   R7_2     
-        27        365 33101  50854 4L   R8_2     
-        27        366 33101  39063 4R   P017     
-        27        367 33101  50859 4L   R8_2     
-        27        368 33101  50199 4R   R8_1     
-        27        369 33101  50864 4L   R8_2     
-        27        370 33101  50884 4R   R8_2     
-        27        371 33101  50869 4L   R8_2     
-        27        372 33101  50889 4R   R8_2     
-        27        373 33101  50874 4L   R8_2     
-        27        374 33101  50894 4R   R8_2     
-        27        375 33101  51384 4L   R9_1     
-        27        376 33101  50899 4R   R8_2     
-        27        377 33101  51389 4L   R9_1     
-        27        378 33101  50195 4R   R8_1     
-        27        379 33101  36165 4L   S9_1     
-        27        380 33101  26719 4R   S6_2     
-        27        381 33101  35295 4L   S8_5     
-        27        382 33101  39088 4R   P017     
-        27        383 33101  50182 4L   R8_1     
-        27        384 33101  49778 4R   R7_2     
-        27        385 33101  50855 4L   R8_2     
-        27        386 33101  50880 4R   R8_2     
-        27        387 33101  50860 4L   R8_2     
-        27        388 33101  50200 4R   R8_1     
-        27        389 33101  50865 4L   R8_2     
-        27        390 33101  50885 4R   R8_2     
-        27        391 33101  50870 4L   R8_2     
-        27        392 33101  50890 4R   R8_2     
-        27        393 33101  50875 4L   R8_2     
-        27        394 33101  50895 4R   R8_2     
-        27        395 33101  51385 4L   R9_1     
-        27        396 33101  50900 4R   R8_2     
-        27        397 33101  51390 4L   R9_1     
-        27        398 33101  50194 4R   R8_1     
-        27        399 33101  36170 4L   S9_1     
-        27        400 33101  39057 4R   P017     
-        27        401 33101  32223 5L   S07_5    
-        27        402 33101  37820 5R   S9_4     
-        27        403 33101  50206 5L   R8_1     
-        27        404 33101  38417 5R   S9_6     
-        27        405 33101  50906 5L   R8_2     
-        27        406 33101  50216 5R   R8_1     
-        27        407 33101  50911 5L   R8_2     
-        27        408 33101  50215 5R   R8_1     
-        27        409 33101  50916 5L   R8_2     
-        27        410 33101  50941 5R   R8_2     
-        27        411 33101  50921 5L   R8_2     
-        27        412 33101  50946 5R   R8_2     
-        27        413 33101  50926 5L   R8_2     
-        27        414 33101  50951 5R   R8_2     
-        27        415 33101  50931 5L   R8_2     
-        27        416 33101  50961 5R   R8_2     
-        27        417 33101  51436 5L   R9_1     
-        27        418 33101  50956 5R   R8_2     
-        27        419 33101  29220 5L   P13      
-        27        420 33101  26779 5R   S6_2     
-        27        421 33101  32340 5L   P14      
-        27        422 33101  36287 5R   S9_1     
-        27        423 33101  50207 5L   R8_1     
-        27        424 33101  50214 5R   R8_1     
-        27        425 33101  50907 5L   R8_2     
-        27        426 33101  50217 5R   R8_1     
-        27        427 33101  50912 5L   R8_2     
-        27        428 33101  50937 5R   R8_2     
-        27        429 33101  50917 5L   R8_2     
-        27        430 33101  50942 5R   R8_2     
-        27        431 33101  50922 5L   R8_2     
-        27        432 33101  50947 5R   R8_2     
-        27        433 33101  50927 5L   R8_2     
-        27        434 33101  50952 5R   R8_2     
-        27        435 33101  50932 5L   R8_2     
-        27        436 33101  50962 5R   R8_2     
-        27        437 33101  51437 5L   R9_1     
-        27        438 33101  51456 5R   R9_1     
-        27        439 33101  32244 5L   S07_5    
-        27        440 33101  26781 5R   S6_2     
-        27        441 33101  32341 5L   P14      
-        27        442 33101  38413 5R   S9_6     
-        27        443 33101  50208 5L   R8_1     
-        27        444 33101  38418 5R   S9_6     
-        27        445 33101  50908 5L   R8_2     
-        27        446 33101  50218 5R   R8_1     
-        27        447 33101  50913 5L   R8_2     
-        27        448 33101  50938 5R   R8_2     
-        27        449 33101  50918 5L   R8_2     
-        27        450 33101  50943 5R   R8_2     
-        27        451 33101  50923 5L   R8_2     
-        27        452 33101  50948 5R   R8_2     
-        27        453 33101  50928 5L   R8_2     
-        27        454 33101  50953 5R   R8_2     
-        27        455 33101  50933 5L   R8_2     
-        27        456 33101  50963 5R   R8_2     
-        27        457 33101  51438 5L   R9_1     
-        27        458 33101  50958 5R   R8_2     
-        27        459 33101  36212 5L   S9_1     
-        27        460 33101  39139 5R   P017     
-        27        461 33101  33480 5L   S8_2     
-        27        462 33101  38414 5R   S9_6     
-        27        463 33101  50209 5L   R8_1     
-        27        464 33101  38419 5R   S9_6     
-        27        465 33101  50909 5L   R8_2     
-        27        466 33101  50219 5R   R8_1     
-        27        467 33101  50914 5L   R8_2     
-        27        468 33101  50939 5R   R8_2     
-        27        469 33101  50919 5L   R8_2     
-        27        470 33101  50944 5R   R8_2     
-        27        471 33101  50924 5L   R8_2     
-        27        472 33101  50949 5R   R8_2     
-        27        473 33101  50929 5L   R8_2     
-        27        474 33101  50954 5R   R8_2     
-        27        475 33101  50934 5L   R8_2     
-        27        476 33101  50964 5R   R8_2     
-        27        477 33101  50205 5L   R8_1     
-        27        478 33101  50959 5R   R8_2     
-        27        479 33101  36246 5L   S9_1     
-        27        480 33101  39140 5R   P017     
-        27        481 33101  33502 5L   S8_2     
-        27        482 33101  38415 5R   S9_6     
-        27        483 33101  50210 5L   R8_1     
-        27        484 33101  38421 5R   S9_6     
-        27        485 33101  50910 5L   R8_2     
-        27        486 33101  50220 5R   R8_1     
-        27        487 33101  50915 5L   R8_2     
-        27        488 33101  50940 5R   R8_2     
-        27        489 33101  50920 5L   R8_2     
-        27        490 33101  50945 5R   R8_2     
-        27        491 33101  50925 5L   R8_2     
-        27        492 33101  50950 5R   R8_2     
-        27        493 33101  50930 5L   R8_2     
-        27        494 33101  50955 5R   R8_2     
-        27        495 33101  50935 5L   R8_2     
-        27        496 33101  50965 5R   R8_2     
-        27        497 33101  50211 5L   R8_1     
-        27        498 33101  50960 5R   R8_2     
-        27        499 33101  39112 5L   P017     
-        27        500 33101  38416 5R   S9_6     
-        27        501 33101  51486 6L   R9_1     
-        27        502 33101  51523 6R   R9_1     
-        27        503 33101  51481 6L   R9_1     
-        27        504 33101  51538 6R   R9_1     
-        27        505 33101  51476 6L   R9_1     
-        27        506 33101  51533 6R   R9_1     
-        27        507 33101  50986 6L   R8_2     
-        27        508 33101  51528 6R   R9_1     
-        27        509 33101  50981 6L   R8_2     
-        27        510 33101  50991 6R   R8_2     
-        27        511 33101  50976 6L   R8_2     
-        27        512 33101  51006 6R   R8_2     
-        27        513 33101  50971 6L   R8_2     
-        27        514 33101  51001 6R   R8_2     
-        27        515 33101  50966 6L   R8_2     
-        27        516 33101  50996 6R   R8_2     
-        27        517 33101  50421 6L   R8_1     
-        27        518 33101  50431 6R   R8_1     
-        27        519 33101  50416 6L   R8_1     
-        27        520 33101  27566 6R   S6_3a    
-        27        521 33101  51487 6L   R9_1     
-        27        522 33101  51524 6R   R9_1     
-        27        523 33101  51482 6L   R9_1     
-        27        524 33101  51539 6R   R9_1     
-        27        525 33101  51493 6L   R9_1     
-        27        526 33101  51534 6R   R9_1     
-        27        527 33101  50987 6L   R8_2     
-        27        528 33101  51529 6R   R9_1     
-        27        529 33101  50982 6L   R8_2     
-        27        530 33101  50992 6R   R8_2     
-        27        531 33101  50977 6L   R8_2     
-        27        532 33101  51007 6R   R8_2     
-        27        533 33101  50972 6L   R8_2     
-        27        534 33101  51002 6R   R8_2     
-        27        535 33101  50967 6L   R8_2     
-        27        536 33101  50997 6R   R8_2     
-        27        537 33101  50422 6L   R8_1     
-        27        538 33101  50428 6R   R8_1     
-        27        539 33101  50417 6L   R8_1     
-        27        540 33101  47792 6R   S9_5     
-        27        541 33101  51494 6L   R9_1     
-        27        542 33101  51525 6R   R9_1     
-        27        543 33101  51483 6L   R9_1     
-        27        544 33101  51540 6R   R9_1     
-        27        545 33101  51478 6L   R9_1     
-        27        546 33101  51535 6R   R9_1     
-        27        547 33101  50988 6L   R8_2     
-        27        548 33101  51530 6R   R9_1     
-        27        549 33101  50983 6L   R8_2     
-        27        550 33101  50993 6R   R8_2     
-        27        551 33101  50978 6L   R8_2     
-        27        552 33101  51008 6R   R8_2     
-        27        553 33101  50973 6L   R8_2     
-        27        554 33101  51003 6R   R8_2     
-        27        555 33101  50968 6L   R8_2     
-        27        556 33101  50998 6R   R8_2     
-        27        557 33101  50423 6L   R8_1     
-        27        558 33101  50433 6R   R8_1     
-        27        559 33101  50418 6L   R8_1     
-        27        560 33101  50443 6R   R8_1     
-        27        561 33101  51489 6L   R9_1     
-        27        562 33101  51526 6R   R9_1     
-        27        563 33101  51484 6L   R9_1     
-        27        564 33101  51541 6R   R9_1     
-        27        565 33101  51479 6L   R9_1     
-        27        566 33101  51536 6R   R9_1     
-        27        567 33101  50989 6L   R8_2     
-        27        568 33101  51531 6R   R9_1     
-        27        569 33101  50984 6L   R8_2     
-        27        570 33101  50994 6R   R8_2     
-        27        571 33101  50979 6L   R8_2     
-        27        572 33101  51009 6R   R8_2     
-        27        573 33101  50974 6L   R8_2     
-        27        574 33101  51004 6R   R8_2     
-        27        575 33101  50969 6L   R8_2     
-        27        576 33101  50999 6R   R8_2     
-        27        577 33101  50424 6L   R8_1     
-        27        578 33101  50434 6R   R8_1     
-        27        579 33101  50419 6L   R8_1     
-        27        580 33101  50444 6R   R8_1     
-        27        581 33101  51490 6L   R9_1     
-        27        582 33101  51527 6R   R9_1     
-        27        583 33101  51485 6L   R9_1     
-        27        584 33101  51542 6R   R9_1     
-        27        585 33101  51480 6L   R9_1     
-        27        586 33101  51537 6R   R9_1     
-        27        587 33101  50990 6L   R8_2     
-        27        588 33101  51532 6R   R9_1     
-        27        589 33101  50985 6L   R8_2     
-        27        590 33101  50995 6R   R8_2     
-        27        591 33101  50980 6L   R8_2     
-        27        592 33101  51010 6R   R8_2     
-        27        593 33101  50975 6L   R8_2     
-        27        594 33101  51005 6R   R8_2     
-        27        595 33101  50970 6L   R8_2     
-        27        596 33101  51000 6R   R8_2     
-        27        597 33101  50425 6L   R8_1     
-        27        598 33101  50435 6R   R8_1     
-        27        599 33101  50420 6L   R8_1     
-        27        600 33101  50445 6R   R8_1     
-        27        601 33101  31556 7L   S7_4     
-        27        602 33101  51591 7R   R9_1     
-        27        603 33101  51026 7L   R8_2     
-        27        604 33101  51586 7R   R9_1     
-        27        605 33101  51021 7L   R8_2     
-        27        606 33101  51581 7R   R9_1     
-        27        607 33101  51016 7L   R8_2     
-        27        608 33101  51576 7R   R9_1     
-        27        609 33101  44937 7L   R3_1     
-        27        610 33101  51046 7R   R8_2     
-        27        611 33101  51011 7L   R8_2     
-        27        612 33101  51041 7R   R8_2     
-        27        613 33101  51036 7L   R8_2     
-        27        614 33101  51056 7R   R8_2     
-        27        615 33101  50461 7L   R8_1     
-        27        616 33101  50486 7R   R8_1     
-        27        617 33101  50456 7L   R8_1     
-        27        618 33101  50476 7R   R8_1     
-        27        619 33101  50446 7L   R8_1     
-        27        620 33101  47814 7R   S9_5     
-        27        621 33101  47800 7L   S9_5     
-        27        622 33101  51592 7R   R9_1     
-        27        623 33101  51027 7L   R8_2     
-        27        624 33101  51587 7R   R9_1     
-        27        625 33101  51022 7L   R8_2     
-        27        626 33101  51582 7R   R9_1     
-        27        627 33101  51017 7L   R8_2     
-        27        628 33101  51577 7R   R9_1     
-        27        629 33101  44945 7L   R3_1     
-        27        630 33101  51044 7R   R8_2     
-        27        631 33101  51012 7L   R8_2     
-        27        632 33101  51042 7R   R8_2     
-        27        633 33101  51037 7L   R8_2     
-        27        634 33101  51057 7R   R8_2     
-        27        635 33101  50462 7L   R8_1     
-        27        636 33101  50487 7R   R8_1     
-        27        637 33101  50457 7L   R8_1     
-        27        638 33101  50477 7R   R8_1     
-        27        639 33101  50447 7L   R8_1     
-        27        640 33101  47815 7R   S9_5     
-        27        641 33101  47801 7L   S9_5     
-        27        642 33101  51593 7R   R9_1     
-        27        643 33101  51028 7L   R8_2     
-        27        644 33101  51588 7R   R9_1     
-        27        645 33101  51023 7L   R8_2     
-        27        646 33101  51583 7R   R9_1     
-        27        647 33101  51018 7L   R8_2     
-        27        648 33101  51578 7R   R9_1     
-        27        649 33101  47796 7L   S9_5     
-        27        650 33101  51054 7R   R8_2     
-        27        651 33101  51013 7L   R8_2     
-        27        652 33101  51043 7R   R8_2     
-        27        653 33101  51038 7L   R8_2     
-        27        654 33101  51058 7R   R8_2     
-        27        655 33101  50463 7L   R8_1     
-        27        656 33101  50488 7R   R8_1     
-        27        657 33101  50458 7L   R8_1     
-        27        658 33101  26213 7R   S06      
-        27        659 33101  50448 7L   R8_1     
-        27        660 33101  47816 7R   S9_5     
-        27        661 33101  47802 7L   S9_5     
-        27        662 33101  51594 7R   R9_1     
-        27        663 33101  51029 7L   R8_2     
-        27        664 33101  51589 7R   R9_1     
-        27        665 33101  51024 7L   R8_2     
-        27        666 33101  51584 7R   R9_1     
-        27        667 33101  51019 7L   R8_2     
-        27        668 33101  51579 7R   R9_1     
-        27        669 33101  47806 7L   S9_5     
-        27        670 33101  51049 7R   R8_2     
-        27        671 33101  51014 7L   R8_2     
-        27        672 33101  51047 7R   R8_2     
-        27        673 33101  51039 7L   R8_2     
-        27        674 33101  51059 7R   R8_2     
-        27        675 33101  50464 7L   R8_1     
-        27        676 33101  50489 7R   R8_1     
-        27        677 33101  50459 7L   R8_1     
-        27        678 33101  50479 7R   R8_1     
-        27        679 33101  50449 7L   R8_1     
-        27        680 33101  47817 7R   S9_5     
-        27        681 33101  47803 7L   S9_5     
-        27        682 33101  51595 7R   R9_1     
-        27        683 33101  51030 7L   R8_2     
-        27        684 33101  51590 7R   R9_1     
-        27        685 33101  51025 7L   R8_2     
-        27        686 33101  51585 7R   R9_1     
-        27        687 33101  51020 7L   R8_2     
-        27        688 33101  51580 7R   R9_1     
-        27        689 33101  47813 7L   S9_5     
-        27        690 33101  51050 7R   R8_2     
-        27        691 33101  51015 7L   R8_2     
-        27        692 33101  51045 7R   R8_2     
-        27        693 33101  51040 7L   R8_2     
-        27        694 33101  51060 7R   R8_2     
-        27        695 33101  50465 7L   R8_1     
-        27        696 33101  50490 7R   R8_1     
-        27        697 33101  50460 7L   R8_1     
-        27        698 33101  50480 7R   R8_1     
-        27        699 33101  50450 7L   R8_1     
-        27        700 33101  47818 7R   S9_5     
-        27        701 33101  51615 8L   R9_1     
-        27        702 33101  51632 8R   R9_1     
-        27        703 33101  51090 8L   R8_2     
-        27        704 33101  51624 8R   R9_1     
-        27        705 33101  51610 8L   R9_1     
-        27        706 33101  51116 8R   R8_2     
-        27        707 33101  39649 8L   S10_1    
-        27        708 33101  47166 8R   R5_1     
-        27        709 33101  51086 8L   R8_2     
-        27        710 33101  51111 8R   R8_2     
-        27        711 33101  51076 8L   R8_2     
-        27        712 33101  51106 8R   R8_2     
-        27        713 33101  51071 8L   R8_2     
-        27        714 33101  51101 8R   R8_2     
-        27        715 33101  51066 8L   R8_2     
-        27        716 33101  51096 8R   R8_2     
-        27        717 33101  51061 8L   R8_2     
-        27        718 33101  51091 8R   R8_2     
-        27        719 33101  50491 8L   R8_1     
-        27        720 33101  33103 8R   S8_1     
-        27        721 33101  51616 8L   R9_1     
-        27        722 33101  51640 8R   R9_1     
-        27        723 33101  51077 8L   R8_2     
-        27        724 33101  51625 8R   R9_1     
-        27        725 33101  51611 8L   R9_1     
-        27        726 33101  51117 8R   R8_2     
-        27        727 33101  39650 8L   S10_1    
-        27        728 33101  50527 8R   R8_1     
-        27        729 33101  51087 8L   R8_2     
-        27        730 33101  51112 8R   R8_2     
-        27        731 33101  51082 8L   R8_2     
-        27        732 33101  51107 8R   R8_2     
-        27        733 33101  51072 8L   R8_2     
-        27        734 33101  51102 8R   R8_2     
-        27        735 33101  51067 8L   R8_2     
-        27        736 33101  51097 8R   R8_2     
-        27        737 33101  51062 8L   R8_2     
-        27        738 33101  51092 8R   R8_2     
-        27        739 33101  50492 8L   R8_1     
-        27        740 33101  34513 8R   S8_4     
-        27        741 33101  51617 8L   R9_1     
-        27        742 33101  51641 8R   R9_1     
-        27        743 33101  51083 8L   R8_2     
-        27        744 33101  51626 8R   R9_1     
-        27        745 33101  51612 8L   R9_1     
-        27        746 33101  51118 8R   R8_2     
-        27        747 33101  39651 8L   S10_1    
-        27        748 33101  50528 8R   R8_1     
-        27        749 33101  51088 8L   R8_2     
-        27        750 33101  51113 8R   R8_2     
-        27        751 33101  51078 8L   R8_2     
-        27        752 33101  51108 8R   R8_2     
-        27        753 33101  51073 8L   R8_2     
-        27        754 33101  51103 8R   R8_2     
-        27        755 33101  51068 8L   R8_2     
-        27        756 33101  51098 8R   R8_2     
-        27        757 33101  51063 8L   R8_2     
-        27        758 33101  51093 8R   R8_2     
-        27        759 33101  50493 8L   R8_1     
-        27        760 33101  47848 8R   S9_5     
-        27        761 33101  51618 8L   R9_1     
-        27        762 33101  51642 8R   R9_1     
-        27        763 33101  51084 8L   R8_2     
-        27        764 33101  51627 8R   R9_1     
-        27        765 33101  51613 8L   R9_1     
-        27        766 33101  51119 8R   R8_2     
-        27        767 33101  34332 8L   S8_4     
-        27        768 33101  50529 8R   R8_1     
-        27        769 33101  51089 8L   R8_2     
-        27        770 33101  51114 8R   R8_2     
-        27        771 33101  51079 8L   R8_2     
-        27        772 33101  51109 8R   R8_2     
-        27        773 33101  51074 8L   R8_2     
-        27        774 33101  51104 8R   R8_2     
-        27        775 33101  51069 8L   R8_2     
-        27        776 33101  51099 8R   R8_2     
-        27        777 33101  51064 8L   R8_2     
-        27        778 33101  51094 8R   R8_2     
-        27        779 33101  50496 8L   R8_1     
-        27        780 33101  49447 8R   R7_1     
-        27        781 33101  51605 8L   R9_1     
-        27        782 33101  51643 8R   R9_1     
-        27        783 33101  51080 8L   R8_2     
-        27        784 33101  51628 8R   R9_1     
-        27        785 33101  51614 8L   R9_1     
-        27        786 33101  51120 8R   R8_2     
-        27        787 33101  34333 8L   S8_4     
-        27        788 33101  50530 8R   R8_1     
-        27        789 33101  51081 8L   R8_2     
-        27        790 33101  51115 8R   R8_2     
-        27        791 33101  51085 8L   R8_2     
-        27        792 33101  51110 8R   R8_2     
-        27        793 33101  51075 8L   R8_2     
-        27        794 33101  51105 8R   R8_2     
-        27        795 33101  51070 8L   R8_2     
-        27        796 33101  51100 8R   R8_2     
-        27        797 33101  51065 8L   R8_2     
-        27        798 33101  51095 8R   R8_2     
-        27        799 33101  50495 8L   R8_1     
-        27        800 33101  49450 8R   R7_1     
-        27        801 33101  47855 9L   S9_5     
-        27        802 33101  52163 9R   R9_2     
-        27        803 33101  51126 9L   R8_2     
-        27        804 33101  51673 9R   R9_1     
-        27        805 33101  51121 9L   R8_2     
-        27        806 33101  51680 9R   R9_1     
-        27        807 33101  50551 9L   R8_1     
-        27        808 33101  51670 9R   R9_1     
-        27        809 33101  50546 9L   R8_1     
-        27        810 33101  51665 9R   R9_1     
-        27        811 33101  50541 9L   R8_1     
-        27        812 33101  51650 9R   R9_1     
-        27        813 33101  50531 9L   R8_1     
-        27        814 33101  51645 9R   R9_1     
-        27        815 33101  50536 9L   R8_1     
-        27        816 33101  51660 9R   R9_1     
-        27        817 33101  49510 9L   R7_1     
-        27        818 33101  51655 9R   R9_1     
-        27        819 33101  49506 9L   R7_1     
-        27        820 33101  47889 9R   S9_5     
-        27        821 33101  47859 9L   S9_5     
-        27        822 33101  52166 9R   R9_2     
-        27        823 33101  51127 9L   R8_2     
-        27        824 33101  51676 9R   R9_1     
-        27        825 33101  51122 9L   R8_2     
-        27        826 33101  51681 9R   R9_1     
-        27        827 33101  50552 9L   R8_1     
-        27        828 33101  51671 9R   R9_1     
-        27        829 33101  50547 9L   R8_1     
-        27        830 33101  51666 9R   R9_1     
-        27        831 33101  50542 9L   R8_1     
-        27        832 33101  51651 9R   R9_1     
-        27        833 33101  50532 9L   R8_1     
-        27        834 33101  51646 9R   R9_1     
-        27        835 33101  50537 9L   R8_1     
-        27        836 33101  51661 9R   R9_1     
-        27        837 33101  49512 9L   R7_1     
-        27        838 33101  51656 9R   R9_1     
-        27        839 33101  49507 9L   R7_1     
-        27        840 33101  47890 9R   S9_5     
-        27        841 33101  47860 9L   S9_5     
-        27        842 33101  52167 9R   R9_2     
-        27        843 33101  51128 9L   R8_2     
-        27        844 33101  51677 9R   R9_1     
-        27        845 33101  51123 9L   R8_2     
-        27        846 33101  51682 9R   R9_1     
-        27        847 33101  50553 9L   R8_1     
-        27        848 33101  51672 9R   R9_1     
-        27        849 33101  50548 9L   R8_1     
-        27        850 33101  51667 9R   R9_1     
-        27        851 33101  50543 9L   R8_1     
-        27        852 33101  51652 9R   R9_1     
-        27        853 33101  50533 9L   R8_1     
-        27        854 33101  51647 9R   R9_1     
-        27        855 33101  50538 9L   R8_1     
-        27        856 33101  39696 9R   S10_1    
-        27        857 33101  49513 9L   R7_1     
-        27        858 33101  51657 9R   R9_1     
-        27        859 33101  49508 9L   R7_1     
-        27        860 33101  47891 9R   S9_5     
-        27        861 33101  47861 9L   S9_5     
-        27        862 33101  52168 9R   R9_2     
-        27        863 33101  51129 9L   R8_2     
-        27        864 33101  51678 9R   R9_1     
-        27        865 33101  51124 9L   R8_2     
-        27        866 33101  51662 9R   R9_1     
-        27        867 33101  50554 9L   R8_1     
-        27        868 33101  51674 9R   R9_1     
-        27        869 33101  50549 9L   R8_1     
-        27        870 33101  51668 9R   R9_1     
-        27        871 33101  50544 9L   R8_1     
-        27        872 33101  51653 9R   R9_1     
-        27        873 33101  50534 9L   R8_1     
-        27        874 33101  51648 9R   R9_1     
-        27        875 33101  50539 9L   R8_1     
-        27        876 33101  51663 9R   R9_1     
-        27        877 33101  49514 9L   R7_1     
-        27        878 33101  51658 9R   R9_1     
-        27        879 33101  49509 9L   R7_1     
-        27        880 33101  47893 9R   S9_5     
-        27        881 33101  47863 9L   S9_5     
-        27        882 33101  52172 9R   R9_2     
-        27        883 33101  51130 9L   R8_2     
-        27        884 33101  51679 9R   R9_1     
-        27        885 33101  51125 9L   R8_2     
-        27        886 33101  51664 9R   R9_1     
-        27        887 33101  50555 9L   R8_1     
-        27        888 33101  51675 9R   R9_1     
-        27        889 33101  50550 9L   R8_1     
-        27        890 33101  51669 9R   R9_1     
-        27        891 33101  50545 9L   R8_1     
-        27        892 33101  51654 9R   R9_1     
-        27        893 33101  50535 9L   R8_1     
-        27        894 33101  51649 9R   R9_1     
-        27        895 33101  50540 9L   R8_1     
-        27        896 33101  47881 9R   S9_5     
-        27        897 33101  49515 9L   R7_1     
-        27        898 33101  51659 9R   R9_1     
-        27        899 33101  49511 9L   R7_1     
-        27        900 33101  47894 9R   S9_5     
-        27        901 33101  38529 10L  S9_6     
-        27        902 33101  51211 10R  R8_2     
-        27        903 33101  51186 10L  R8_2     
-        27        904 33101  51206 10R  R8_2     
-        27        905 33101  51156 10L  R8_2     
-        27        906 33101  51201 10R  R8_2     
-        27        907 33101  51150 10L  R8_2     
-        27        908 33101  51196 10R  R8_2     
-        27        909 33101  50571 10L  R8_1     
-        27        910 33101  50576 10R  R8_1     
-        27        911 33101  50566 10L  R8_1     
-        27        912 33101  50581 10R  R8_1     
-        27        913 33101  50561 10L  R8_1     
-        27        914 33101  49896 10R  R7_2     
-        27        915 33101  50556 10L  R8_1     
-        27        916 33101  49549 10R  R7_1     
-        27        917 33101  49866 10L  R7_2     
-        27        918 33101  36048 10R  P15_2    
-        27        919 33101  49536 10L  R7_1     
-        27        920 33101  35678 10R  P15_1    
-        27        921 33101  47896 10L  S9_5     
-        27        922 33101  51212 10R  R8_2     
-        27        923 33101  51187 10L  R8_2     
-        27        924 33101  51207 10R  R8_2     
-        27        925 33101  51157 10L  R8_2     
-        27        926 33101  51202 10R  R8_2     
-        27        927 33101  51151 10L  R8_2     
-        27        928 33101  51197 10R  R8_2     
-        27        929 33101  50572 10L  R8_1     
-        27        930 33101  50577 10R  R8_1     
-        27        931 33101  50567 10L  R8_1     
-        27        932 33101  50582 10R  R8_1     
-        27        933 33101  50562 10L  R8_1     
-        27        934 33101  49897 10R  R7_2     
-        27        935 33101  50557 10L  R8_1     
-        27        936 33101  49553 10R  R7_1     
-        27        937 33101  49867 10L  R7_2     
-        27        938 33101  45326 10R  R3_2     
-        27        939 33101  49537 10L  R7_1     
-        27        940 33101  38530 10R  S9_6     
-        27        941 33101  47897 10L  S9_5     
-        27        942 33101  51213 10R  R8_2     
-        27        943 33101  51188 10L  R8_2     
-        27        944 33101  51208 10R  R8_2     
-        27        945 33101  51158 10L  R8_2     
-        27        946 33101  51203 10R  R8_2     
-        27        947 33101  51153 10L  R8_2     
-        27        948 33101  51198 10R  R8_2     
-        27        949 33101  50573 10L  R8_1     
-        27        950 33101  50578 10R  R8_1     
-        27        951 33101  50568 10L  R8_1     
-        27        952 33101  50583 10R  R8_1     
-        27        953 33101  50563 10L  R8_1     
-        27        954 33101  49898 10R  R7_2     
-        27        955 33101  50558 10L  R8_1     
-        27        956 33101  49556 10R  R7_1     
-        27        957 33101  49868 10L  R7_2     
-        27        958 33101  42044 10R  P18      
-        27        959 33101  49538 10L  R7_1     
-        27        960 33101  38531 10R  S9_6     
-        27        961 33101  47898 10L  S9_5     
-        27        962 33101  51214 10R  R8_2     
-        27        963 33101  51189 10L  R8_2     
-        27        964 33101  51209 10R  R8_2     
-        27        965 33101  51159 10L  R8_2     
-        27        966 33101  51204 10R  R8_2     
-        27        967 33101  51154 10L  R8_2     
-        27        968 33101  51199 10R  R8_2     
-        27        969 33101  50574 10L  R8_1     
-        27        970 33101  50579 10R  R8_1     
-        27        971 33101  50569 10L  R8_1     
-        27        972 33101  50584 10R  R8_1     
-        27        973 33101  50564 10L  R8_1     
-        27        974 33101  49899 10R  R7_2     
-        27        975 33101  50559 10L  R8_1     
-        27        976 33101  49559 10R  R7_1     
-        27        977 33101  49869 10L  R7_2     
-        27        978 33101  47593 10R  R5_2     
-        27        979 33101  49539 10L  R7_1     
-        27        980 33101  38532 10R  S9_6     
-        27        981 33101  47899 10L  S9_5     
-        27        982 33101  51215 10R  R8_2     
-        27        983 33101  51190 10L  R8_2     
-        27        984 33101  51210 10R  R8_2     
-        27        985 33101  51160 10L  R8_2     
-        27        986 33101  51205 10R  R8_2     
-        27        987 33101  51155 10L  R8_2     
-        27        988 33101  51200 10R  R8_2     
-        27        989 33101  50575 10L  R8_1     
-        27        990 33101  50580 10R  R8_1     
-        27        991 33101  50570 10L  R8_1     
-        27        992 33101  50585 10R  R8_1     
-        27        993 33101  50565 10L  R8_1     
-        27        994 33101  49900 10R  R7_2     
-        27        995 33101  50560 10L  R8_1     
-        27        996 33101  49560 10R  R7_1     
-        27        997 33101  49870 10L  R7_2     
-        27        998 33101  47594 10R  R5_2     
-        27        999 33101  49540 10L  R7_1     
-        27       1000 33101  38533 10R  S9_6     
-        27       1001 33101  38541 11L  S9_6     
-        27       1002 33101  51688 11R  R9_1     
-        27       1003 33101  51231 11L  R8_2     
-        27       1004 33101  51693 11R  R9_1     
-        27       1005 33101  51226 11L  R8_2     
-        27       1006 33101  51683 11R  R9_1     
-        27       1007 33101  51221 11L  R8_2     
-        27       1008 33101  50607 11R  R8_1     
-        27       1009 33101  51216 11L  R8_2     
-        27       1010 33101  49936 11R  R7_2     
-        27       1011 33101  50591 11L  R8_1     
-        27       1012 33101  50606 11R  R8_1     
-        27       1013 33101  50586 11L  R8_1     
-        27       1014 33101  50601 11R  R8_1     
-        27       1015 33101  49911 11L  R7_2     
-        27       1016 33101  49937 11R  R7_2     
-        27       1017 33101  49916 11L  R7_2     
-        27       1018 33101  49941 11R  R7_2     
-        27       1019 33101  49904 11L  R7_2     
-        27       1020 33101  38562 11R  S9_6     
-        27       1021 33101  38542 11L  S9_6     
-        27       1022 33101  51689 11R  R9_1     
-        27       1023 33101  51232 11L  R8_2     
-        27       1024 33101  51694 11R  R9_1     
-        27       1025 33101  51227 11L  R8_2     
-        27       1026 33101  51684 11R  R9_1     
-        27       1027 33101  51222 11L  R8_2     
-        27       1028 33101  50610 11R  R8_1     
-        27       1029 33101  51217 11L  R8_2     
-        27       1030 33101  49921 11R  R7_2     
-        27       1031 33101  50592 11L  R8_1     
-        27       1032 33101  50596 11R  R8_1     
-        27       1033 33101  50587 11L  R8_1     
-        27       1034 33101  50602 11R  R8_1     
-        27       1035 33101  49912 11L  R7_2     
-        27       1036 33101  49922 11R  R7_2     
-        27       1037 33101  49917 11L  R7_2     
-        27       1038 33101  49942 11R  R7_2     
-        27       1039 33101  49907 11L  R7_2     
-        27       1040 33101  38563 11R  S9_6     
-        27       1041 33101  38543 11L  S9_6     
-        27       1042 33101  51690 11R  R9_1     
-        27       1043 33101  51233 11L  R8_2     
-        27       1044 33101  51695 11R  R9_1     
-        27       1045 33101  51228 11L  R8_2     
-        27       1046 33101  51685 11R  R9_1     
-        27       1047 33101  51223 11L  R8_2     
-        27       1048 33101  50598 11R  R8_1     
-        27       1049 33101  51218 11L  R8_2     
-        27       1050 33101  49928 11R  R7_2     
-        27       1051 33101  50593 11L  R8_1     
-        27       1052 33101  50608 11R  R8_1     
-        27       1053 33101  50588 11L  R8_1     
-        27       1054 33101  50603 11R  R8_1     
-        27       1055 33101  49913 11L  R7_2     
-        27       1056 33101  49923 11R  R7_2     
-        27       1057 33101  49918 11L  R7_2     
-        27       1058 33101  49943 11R  R7_2     
-        27       1059 33101  49908 11L  R7_2     
-        27       1060 33101  43314 11R  R1_2     
-        27       1061 33101  38544 11L  S9_6     
-        27       1062 33101  51691 11R  R9_1     
-        27       1063 33101  51234 11L  R8_2     
-        27       1064 33101  38175 11R  S9_6     
-        27       1065 33101  51229 11L  R8_2     
-        27       1066 33101  51686 11R  R9_1     
-        27       1067 33101  51224 11L  R8_2     
-        27       1068 33101  50604 11R  R8_1     
-        27       1069 33101  51219 11L  R8_2     
-        27       1070 33101  49939 11R  R7_2     
-        27       1071 33101  50594 11L  R8_1     
-        27       1072 33101  50609 11R  R8_1     
-        27       1073 33101  50589 11L  R8_1     
-        27       1074 33101  50599 11R  R8_1     
-        27       1075 33101  49914 11L  R7_2     
-        27       1076 33101  49924 11R  R7_2     
-        27       1077 33101  49919 11L  R7_2     
-        27       1078 33101  49944 11R  R7_2     
-        27       1079 33101  49909 11L  R7_2     
-        27       1080 33101  45411 11R  R3_2     
-        27       1081 33101  38545 11L  S9_6     
-        27       1082 33101  51692 11R  R9_1     
-        27       1083 33101  51235 11L  R8_2     
-        27       1084 33101  48918 11R  R6_2     
-        27       1085 33101  51230 11L  R8_2     
-        27       1086 33101  51687 11R  R9_1     
-        27       1087 33101  51225 11L  R8_2     
-        27       1088 33101  50600 11R  R8_1     
-        27       1089 33101  51220 11L  R8_2     
-        27       1090 33101  49940 11R  R7_2     
-        27       1091 33101  50595 11L  R8_1     
-        27       1092 33101  50597 11R  R8_1     
-        27       1093 33101  50590 11L  R8_1     
-        27       1094 33101  50605 11R  R8_1     
-        27       1095 33101  49915 11L  R7_2     
-        27       1096 33101  49925 11R  R7_2     
-        27       1097 33101  49920 11L  R7_2     
-        27       1098 33101  49945 11R  R7_2     
-        27       1099 33101  49910 11L  R7_2     
-        27       1100 33101  45412 11R  R3_2     
-        27       1101 33101  11986 12L  S1       
-        27       1102 33101  51714 12R  R9_1     
-        27       1103 33101  51706 12L  R9_1     
-        27       1104 33101  51709 12R  R9_1     
-        27       1105 33101  51701 12L  R9_1     
-        27       1106 33101  51236 12R  R8_2     
-        27       1107 33101  51696 12L  R9_1     
-        27       1108 33101  50646 12R  R8_1     
-        27       1109 33101  50626 12L  R8_1     
-        27       1110 33101  50631 12R  R8_1     
-        27       1111 33101  50621 12L  R8_1     
-        27       1112 33101  50641 12R  R8_1     
-        27       1113 33101  50616 12L  R8_1     
-        27       1114 33101  50636 12R  R8_1     
-        27       1115 33101  50611 12L  R8_1     
-        27       1116 33101  50020 12R  R7_2     
-        27       1117 33101  50001 12L  R7_2     
-        27       1118 33101  43777 12R  R2_1     
-        27       1119 33101  49966 12L  R7_2     
-        27       1120 33101  27415 12R  S6_2b    
-        27       1121 33101  28792 12L  P12      
-        27       1122 33101  51720 12R  R9_1     
-        27       1123 33101  51707 12L  R9_1     
-        27       1124 33101  51715 12R  R9_1     
-        27       1125 33101  51702 12L  R9_1     
-        27       1126 33101  51237 12R  R8_2     
-        27       1127 33101  51697 12L  R9_1     
-        27       1128 33101  50647 12R  R8_1     
-        27       1129 33101  50627 12L  R8_1     
-        27       1130 33101  50632 12R  R8_1     
-        27       1131 33101  50622 12L  R8_1     
-        27       1132 33101  50637 12R  R8_1     
-        27       1133 33101  50612 12L  R8_1     
-        27       1134 33101  50642 12R  R8_1     
-        27       1135 33101  50617 12L  R8_1     
-        27       1136 33101  50047 12R  R7_2     
-        27       1137 33101  50002 12L  R7_2     
-        27       1138 33101  50019 12R  R7_2     
-        27       1139 33101  49967 12L  R7_2     
-        27       1140 33101  33750 12R  S8_2     
-        27       1141 33101  37254 12L  S9_3     
-        27       1142 33101  51721 12R  R9_1     
-        27       1143 33101  51708 12L  R9_1     
-        27       1144 33101  51717 12R  R9_1     
-        27       1145 33101  51703 12L  R9_1     
-        27       1146 33101  51238 12R  R8_2     
-        27       1147 33101  51698 12L  R9_1     
-        27       1148 33101  50648 12R  R8_1     
-        27       1149 33101  50628 12L  R8_1     
-        27       1150 33101  50633 12R  R8_1     
-        27       1151 33101  50623 12L  R8_1     
-        27       1152 33101  50643 12R  R8_1     
-        27       1153 33101  50625 12L  R8_1     
-        27       1154 33101  50638 12R  R8_1     
-        27       1155 33101  50613 12L  R8_1     
-        27       1156 33101  50048 12R  R7_2     
-        27       1157 33101  50003 12L  R7_2     
-        27       1158 33101  50023 12R  R7_2     
-        27       1159 33101  49968 12L  R7_2     
-        27       1160 33101  50032 12R  R7_2     
-        27       1161 33101  35352 12L  S8_5     
-        27       1162 33101  51716 12R  R9_1     
-        27       1163 33101  45430 12L  R3_2     
-        27       1164 33101  51712 12R  R9_1     
-        27       1165 33101  51704 12L  R9_1     
-        27       1166 33101  51239 12R  R8_2     
-        27       1167 33101  51699 12L  R9_1     
-        27       1168 33101  50649 12R  R8_1     
-        27       1169 33101  50629 12L  R8_1     
-        27       1170 33101  50634 12R  R8_1     
-        27       1171 33101  50624 12L  R8_1     
-        27       1172 33101  50644 12R  R8_1     
-        27       1173 33101  50619 12L  R8_1     
-        27       1174 33101  50645 12R  R8_1     
-        27       1175 33101  50614 12L  R8_1     
-        27       1176 33101  50049 12R  R7_2     
-        27       1177 33101  50004 12L  R7_2     
-        27       1178 33101  50028 12R  R7_2     
-        27       1179 33101  49969 12L  R7_2     
-        27       1180 33101  50042 12R  R7_2     
-        27       1181 33101  35353 12L  S8_5     
-        27       1182 33101  51718 12R  R9_1     
-        27       1183 33101  45444 12L  R3_2     
-        27       1184 33101  51713 12R  R9_1     
-        27       1185 33101  51705 12L  R9_1     
-        27       1186 33101  51240 12R  R8_2     
-        27       1187 33101  51700 12L  R9_1     
-        27       1188 33101  50650 12R  R8_1     
-        27       1189 33101  50630 12L  R8_1     
-        27       1190 33101  50635 12R  R8_1     
-        27       1191 33101  50618 12L  R8_1     
-        27       1192 33101  50639 12R  R8_1     
-        27       1193 33101  50620 12L  R8_1     
-        27       1194 33101  50640 12R  R8_1     
-        27       1195 33101  50615 12L  R8_1     
-        27       1196 33101  50050 12R  R7_2     
-        27       1197 33101  50005 12L  R7_2     
-        27       1198 33101  50025 12R  R7_2     
-        27       1199 33101  49970 12L  R7_2     
-        27       1200 33101  50043 12R  R7_2     
-        27       1201 33101  38571 13L  S9_6     
-        27       1202 33101  51764 13R  R9_1     
-        27       1203 33101  51737 13L  R9_1     
-        27       1204 33101  51784 13R  R9_1     
-        27       1205 33101  51730 13L  R9_1     
-        27       1206 33101  49037 13R  R6_2     
-        27       1207 33101  51725 13L  R9_1     
-        27       1208 33101  51774 13R  R9_1     
-        27       1209 33101  50666 13L  R8_1     
-        27       1210 33101  50686 13R  R8_1     
-        27       1211 33101  50661 13L  R8_1     
-        27       1212 33101  50681 13R  R8_1     
-        27       1213 33101  50656 13L  R8_1     
-        27       1214 33101  50676 13R  R8_1     
-        27       1215 33101  50651 13L  R8_1     
-        27       1216 33101  50671 13R  R8_1     
-        27       1217 33101  50086 13L  R7_2     
-        27       1218 33101  50110 13R  R7_2     
-        27       1219 33101  44428 13L  R2_2     
-        27       1220 33101  50096 13R  R7_2     
-        27       1221 33101  38572 13L  S9_6     
-        27       1222 33101  51765 13R  R9_1     
-        27       1223 33101  51738 13L  R9_1     
-        27       1224 33101  51786 13R  R9_1     
-        27       1225 33101  51731 13L  R9_1     
-        27       1226 33101  49038 13R  R6_2     
-        27       1227 33101  51726 13L  R9_1     
-        27       1228 33101  51775 13R  R9_1     
-        27       1229 33101  50667 13L  R8_1     
-        27       1230 33101  50687 13R  R8_1     
-        27       1231 33101  50660 13L  R8_1     
-        27       1232 33101  50682 13R  R8_1     
-        27       1233 33101  50657 13L  R8_1     
-        27       1234 33101  50677 13R  R8_1     
-        27       1235 33101  50652 13L  R8_1     
-        27       1236 33101  50690 13R  R8_1     
-        27       1237 33101  50087 13L  R7_2     
-        27       1238 33101  50129 13R  R7_2     
-        27       1239 33101  50059 13L  R7_2     
-        27       1240 33101  50103 13R  R7_2     
-        27       1241 33101  38573 13L  S9_6     
-        27       1242 33101  51771 13R  R9_1     
-        27       1243 33101  51742 13L  R9_1     
-        27       1244 33101  51787 13R  R9_1     
-        27       1245 33101  51732 13L  R9_1     
-        27       1246 33101  51781 13R  R9_1     
-        27       1247 33101  51735 13L  R9_1     
-        27       1248 33101  51776 13R  R9_1     
-        27       1249 33101  50668 13L  R8_1     
-        27       1250 33101  50688 13R  R8_1     
-        27       1251 33101  50663 13L  R8_1     
-        27       1252 33101  50683 13R  R8_1     
-        27       1253 33101  50658 13L  R8_1     
-        27       1254 33101  50678 13R  R8_1     
-        27       1255 33101  50653 13L  R8_1     
-        27       1256 33101  50673 13R  R8_1     
-        27       1257 33101  50088 13L  R7_2     
-        27       1258 33101  50123 13R  R7_2     
-        27       1259 33101  50053 13L  R7_2     
-        27       1260 33101  50098 13R  R7_2     
-        27       1261 33101  38574 13L  S9_6     
-        27       1262 33101  51767 13R  R9_1     
-        27       1263 33101  51743 13L  R9_1     
-        27       1264 33101  51790 13R  R9_1     
-        27       1265 33101  51733 13L  R9_1     
-        27       1266 33101  51782 13R  R9_1     
-        27       1267 33101  51728 13L  R9_1     
-        27       1268 33101  51777 13R  R9_1     
-        27       1269 33101  50669 13L  R8_1     
-        27       1270 33101  50689 13R  R8_1     
-        27       1271 33101  50664 13L  R8_1     
-        27       1272 33101  50684 13R  R8_1     
-        27       1273 33101  50659 13L  R8_1     
-        27       1274 33101  50679 13R  R8_1     
-        27       1275 33101  50654 13L  R8_1     
-        27       1276 33101  50674 13R  R8_1     
-        27       1277 33101  50089 13L  R7_2     
-        27       1278 33101  50124 13R  R7_2     
-        27       1279 33101  50054 13L  R7_2     
-        27       1280 33101  50118 13R  R7_2     
-        27       1281 33101  38575 13L  S9_6     
-        27       1282 33101  51768 13R  R9_1     
-        27       1283 33101  51744 13L  R9_1     
-        27       1284 33101  49017 13R  R6_2     
-        27       1285 33101  51734 13L  R9_1     
-        27       1286 33101  51783 13R  R9_1     
-        27       1287 33101  51729 13L  R9_1     
-        27       1288 33101  51778 13R  R9_1     
-        27       1289 33101  50670 13L  R8_1     
-        27       1290 33101  50672 13R  R8_1     
-        27       1291 33101  50665 13L  R8_1     
-        27       1292 33101  50685 13R  R8_1     
-        27       1293 33101  50662 13L  R8_1     
-        27       1294 33101  50680 13R  R8_1     
-        27       1295 33101  50655 13L  R8_1     
-        27       1296 33101  50675 13R  R8_1     
-        27       1297 33101  50090 13L  R7_2     
-        27       1298 33101  50130 13R  R7_2     
-        27       1299 33101  50055 13L  R7_2     
-        27       1300 33101  50107 13R  R7_2     
-        27       1301 33101  28007 14L  S6_3b    
-        27       1302 33101  29535 14R  R1       
-        27       1303 33101  49101 14L  R7_1     
-        27       1304 33101  49136 14R  R7_1     
-        27       1305 33101  49106 14L  R7_1     
-        27       1306 33101  49151 14R  R7_1     
-        27       1307 33101  49111 14L  R7_1     
-        27       1308 33101  49146 14R  R7_1     
-        27       1309 33101  50221 14L  R8_1     
-        27       1310 33101  50255 14R  R8_1     
-        27       1311 33101  50226 14L  R8_1     
-        27       1312 33101  49156 14R  R7_1     
-        27       1313 33101  50231 14L  R8_1     
-        27       1314 33101  49161 14R  R7_1     
-        27       1315 33101  50236 14L  R8_1     
-        27       1316 33101  50257 14R  R8_1     
-        27       1317 33101  38785 14L  P016     
-        27       1318 33101  50266 14R  R8_1     
-        27       1319 33101  50241 14L  R8_1     
-        27       1320 33101  28068 14R  S6_3b    
-        27       1321 33101  28011 14L  S6_3b    
-        27       1322 33101  27036 14R  S6_2b    
-        27       1323 33101  49102 14L  R7_1     
-        27       1324 33101  49137 14R  R7_1     
-        27       1325 33101  49107 14L  R7_1     
-        27       1326 33101  49142 14R  R7_1     
-        27       1327 33101  49112 14L  R7_1     
-        27       1328 33101  49147 14R  R7_1     
-        27       1329 33101  50222 14L  R8_1     
-        27       1330 33101  49152 14R  R7_1     
-        27       1331 33101  50227 14L  R8_1     
-        27       1332 33101  49157 14R  R7_1     
-        27       1333 33101  50232 14L  R8_1     
-        27       1334 33101  49162 14R  R7_1     
-        27       1335 33101  50237 14L  R8_1     
-        27       1336 33101  50258 14R  R8_1     
-        27       1337 33101  50247 14L  R8_1     
-        27       1338 33101  50267 14R  R8_1     
-        27       1339 33101  50242 14L  R8_1     
-        27       1340 33101  38460 14R  S9_6     
-        27       1341 33101  28020 14L  S6_3b    
-        27       1342 33101  37040 14R  S9_3     
-        27       1343 33101  49103 14L  R7_1     
-        27       1344 33101  49138 14R  R7_1     
-        27       1345 33101  49108 14L  R7_1     
-        27       1346 33101  49143 14R  R7_1     
-        27       1347 33101  49113 14L  R7_1     
-        27       1348 33101  49148 14R  R7_1     
-        27       1349 33101  50223 14L  R8_1     
-        27       1350 33101  49153 14R  R7_1     
-        27       1351 33101  50228 14L  R8_1     
-        27       1352 33101  49158 14R  R7_1     
-        27       1353 33101  50233 14L  R8_1     
-        27       1354 33101  49163 14R  R7_1     
-        27       1355 33101  50238 14L  R8_1     
-        27       1356 33101  50259 14R  R8_1     
-        27       1357 33101  50248 14L  R8_1     
-        27       1358 33101  50263 14R  R8_1     
-        27       1359 33101  50244 14L  R8_1     
-        27       1360 33101  38461 14R  S9_6     
-        27       1361 33101  28031 14L  S6_3b    
-        27       1362 33101  38428 14R  S9_6     
-        27       1363 33101  49104 14L  R7_1     
-        27       1364 33101  49140 14R  R7_1     
-        27       1365 33101  49109 14L  R7_1     
-        27       1366 33101  49144 14R  R7_1     
-        27       1367 33101  49099 14L  R7_1     
-        27       1368 33101  49149 14R  R7_1     
-        27       1369 33101  50224 14L  R8_1     
-        27       1370 33101  49154 14R  R7_1     
-        27       1371 33101  50229 14L  R8_1     
-        27       1372 33101  49159 14R  R7_1     
-        27       1373 33101  50234 14L  R8_1     
-        27       1374 33101  49164 14R  R7_1     
-        27       1375 33101  50239 14L  R8_1     
-        27       1376 33101  50260 14R  R8_1     
-        27       1377 33101  50249 14L  R8_1     
-        27       1378 33101  50264 14R  R8_1     
-        27       1379 33101  50245 14L  R8_1     
-        27       1380 33101  38462 14R  S9_6     
-        27       1381 33101  28038 14L  S6_3b    
-        27       1382 33101  38451 14R  S9_6     
-        27       1383 33101  49105 14L  R7_1     
-        27       1384 33101  49141 14R  R7_1     
-        27       1385 33101  49110 14L  R7_1     
-        27       1386 33101  49145 14R  R7_1     
-        27       1387 33101  49100 14L  R7_1     
-        27       1388 33101  49150 14R  R7_1     
-        27       1389 33101  50225 14L  R8_1     
-        27       1390 33101  49155 14R  R7_1     
-        27       1391 33101  50230 14L  R8_1     
-        27       1392 33101  49160 14R  R7_1     
-        27       1393 33101  50243 14L  R8_1     
-        27       1394 33101  50256 14R  R8_1     
-        27       1395 33101  50240 14L  R8_1     
-        27       1396 33101  50261 14R  R8_1     
-        27       1397 33101  50250 14L  R8_1     
-        27       1398 33101  50265 14R  R8_1     
-        27       1399 33101  50246 14L  R8_1     
-        27       1400 33101  38467 14R  S9_6     
-        27       1401 33101  27091 15L  S6_2b    
-        27       1402 33101  37067 15R  S9_3     
-        27       1403 33101  44066 15L  R2_2     
-        27       1404 33101  49204 15R  R7_1     
-        27       1405 33101  49176 15L  R7_1     
-        27       1406 33101  49209 15R  R7_1     
-        27       1407 33101  50276 15L  R8_1     
-        27       1408 33101  50311 15R  R8_1     
-        27       1409 33101  50281 15L  R8_1     
-        27       1410 33101  50316 15R  R8_1     
-        27       1411 33101  50286 15L  R8_1     
-        27       1412 33101  50321 15R  R8_1     
-        27       1413 33101  50291 15L  R8_1     
-        27       1414 33101  50326 15R  R8_1     
-        27       1415 33101  50296 15L  R8_1     
-        27       1416 33101  50331 15R  R8_1     
-        27       1417 33101  49185 15L  R7_1     
-        27       1418 33101  28182 15R  S6_3b    
-        27       1419 33101  50301 15L  R8_1     
-        27       1420 33101  50336 15R  R8_1     
-        27       1421 33101  28116 15L  S6_3b    
-        27       1422 33101  37076 15R  S9_3     
-        27       1423 33101  49173 15L  R7_1     
-        27       1424 33101  49205 15R  R7_1     
-        27       1425 33101  49177 15L  R7_1     
-        27       1426 33101  49210 15R  R7_1     
-        27       1427 33101  50277 15L  R8_1     
-        27       1428 33101  50312 15R  R8_1     
-        27       1429 33101  50282 15L  R8_1     
-        27       1430 33101  50317 15R  R8_1     
-        27       1431 33101  50287 15L  R8_1     
-        27       1432 33101  50322 15R  R8_1     
-        27       1433 33101  50292 15L  R8_1     
-        27       1434 33101  50327 15R  R8_1     
-        27       1435 33101  50297 15L  R8_1     
-        27       1436 33101  50332 15R  R8_1     
-        27       1437 33101  50274 15L  R8_1     
-        27       1438 33101  28186 15R  S6_3b    
-        27       1439 33101  50302 15L  R8_1     
-        27       1440 33101  50337 15R  R8_1     
-        27       1441 33101  28167 15L  S6_3b    
-        27       1442 33101  39363 15R  S10_1    
-        27       1443 33101  49174 15L  R7_1     
-        27       1444 33101  49206 15R  R7_1     
-        27       1445 33101  49178 15L  R7_1     
-        27       1446 33101  49211 15R  R7_1     
-        27       1447 33101  50278 15L  R8_1     
-        27       1448 33101  50313 15R  R8_1     
-        27       1449 33101  50283 15L  R8_1     
-        27       1450 33101  50318 15R  R8_1     
-        27       1451 33101  50288 15L  R8_1     
-        27       1452 33101  50323 15R  R8_1     
-        27       1453 33101  50293 15L  R8_1     
-        27       1454 33101  50328 15R  R8_1     
-        27       1455 33101  50298 15L  R8_1     
-        27       1456 33101  50333 15R  R8_1     
-        27       1457 33101  50275 15L  R8_1     
-        27       1458 33101  28202 15R  S6_3b    
-        27       1459 33101  50303 15L  R8_1     
-        27       1460 33101  50338 15R  R8_1     
-        27       1461 33101  41773 15L  S10_6    
-        27       1462 33101  39381 15R  S10_1    
-        27       1463 33101  49175 15L  R7_1     
-        27       1464 33101  49207 15R  R7_1     
-        27       1465 33101  49179 15L  R7_1     
-        27       1466 33101  49212 15R  R7_1     
-        27       1467 33101  50279 15L  R8_1     
-        27       1468 33101  50314 15R  R8_1     
-        27       1469 33101  50284 15L  R8_1     
-        27       1470 33101  50319 15R  R8_1     
-        27       1471 33101  50289 15L  R8_1     
-        27       1472 33101  50324 15R  R8_1     
-        27       1473 33101  50294 15L  R8_1     
-        27       1474 33101  50329 15R  R8_1     
-        27       1475 33101  50299 15L  R8_1     
-        27       1476 33101  50334 15R  R8_1     
-        27       1477 33101  50306 15L  R8_1     
-        27       1478 33101  28211 15R  S6_3b    
-        27       1479 33101  50304 15L  R8_1     
-        27       1480 33101  50339 15R  R8_1     
-        27       1481 33101  42236 15L  P19      
-        27       1482 33101  39386 15R  S10_1    
-        27       1483 33101  49181 15L  R7_1     
-        27       1484 33101  49208 15R  R7_1     
-        27       1485 33101  49180 15L  R7_1     
-        27       1486 33101  50309 15R  R8_1     
-        27       1487 33101  50280 15L  R8_1     
-        27       1488 33101  50315 15R  R8_1     
-        27       1489 33101  50285 15L  R8_1     
-        27       1490 33101  50320 15R  R8_1     
-        27       1491 33101  50290 15L  R8_1     
-        27       1492 33101  50325 15R  R8_1     
-        27       1493 33101  50295 15L  R8_1     
-        27       1494 33101  50330 15R  R8_1     
-        27       1495 33101  50300 15L  R8_1     
-        27       1496 33101  50335 15R  R8_1     
-        27       1497 33101  37060 15L  S9_3     
-        27       1498 33101  32866 15R  S3       
-        27       1499 33101  50305 15L  R8_1     
-        27       1500 33101  50310 15R  R8_1     
-        27       1501 33106    301 16L  EBP02    
-        27       1502 33106    326 16R  EBP02    
-        27       1503 33106    307 16L  EBP02    
-        27       1504 33106    332 16R  EBP02    
-        27       1505 33106    313 16L  EBP02    
-        27       1506 33106    340 16R  EBP02    
-        27       1507 33106    591 16L  EBP04    
-        27       1508 33106    603 16R  EBP04    
-        27       1509 33106    319 16L  EBP02    
-        27       1510 33106    347 16R  EBP02    
-        27       1511 33106    571 16L  EBP04    
-        27       1512 33106    623 16R  EBP04    
-        27       1513 33106    324 16L  EBP02    
-        27       1514 33106    845 16R  EBP06    
-        27       1515 33106    599 16L  EBP04    
-        27       1516 33106    871 16R  EBP06    
-        27       1517 33106    769 16L  EBP06    
-        27       1518 33106    864 16R  EBP06    
-        27       1519 33106    780 16L  EBP06    
-        27       1520 33106    878 16R  EBP06    
-        27       1521 33106    302 16L  EBP02    
-        27       1522 33106    328 16R  EBP02    
-        27       1523 33106    308 16L  EBP02    
-        27       1524 33106    335 16R  EBP02    
-        27       1525 33106    314 16L  EBP02    
-        27       1526 33106    341 16R  EBP02    
-        27       1527 33106    594 16L  EBP04    
-        27       1528 33106    604 16R  EBP04    
-        27       1529 33106    320 16L  EBP02    
-        27       1530 33106    348 16R  EBP02    
-        27       1531 33106    582 16L  EBP04    
-        27       1532 33106    624 16R  EBP04    
-        27       1533 33106    325 16L  EBP02    
-        27       1534 33106    848 16R  EBP06    
-        27       1535 33106    600 16L  EBP04    
-        27       1536 33106    872 16R  EBP06    
-        27       1537 33106    772 16L  EBP06    
-        27       1538 33106    868 16R  EBP06    
-        27       1539 33106    811 16L  EBP06    
-        27       1540 33106    888 16R  EBP06    
-        27       1541 33106    303 16L  EBP02    
-        27       1542 33106    329 16R  EBP02    
-        27       1543 33106    309 16L  EBP02    
-        27       1544 33106    336 16R  EBP02    
-        27       1545 33106    315 16L  EBP02    
-        27       1546 33106    342 16R  EBP02    
-        27       1547 33106    595 16L  EBP04    
-        27       1548 33106    607 16R  EBP04    
-        27       1549 33106    321 16L  EBP02    
-        27       1550 33106    349 16R  EBP02    
-        27       1551 33106    587 16L  EBP04    
-        27       1552 33106    625 16R  EBP04    
-        27       1553 33106    581 16L  EBP04    
-        27       1554 33106    851 16R  EBP06    
-        27       1555 33106    765 16L  EBP06    
-        27       1556 33106    873 16R  EBP06    
-        27       1557 33106    774 16L  EBP06    
-        27       1558 33106    869 16R  EBP06    
-        27       1559 33106    829 16L  EBP06    
-        27       1560 33106    605 16R  EBP04    
-        27       1561 33106    304 16L  EBP02    
-        27       1562 33106    330 16R  EBP02    
-        27       1563 33106    310 16L  EBP02    
-        27       1564 33106    338 16R  EBP02    
-        27       1565 33106    316 16L  EBP02    
-        27       1566 33106    343 16R  EBP02    
-        27       1567 33106    596 16L  EBP04    
-        27       1568 33106    611 16R  EBP04    
-        27       1569 33106    322 16L  EBP02    
-        27       1570 33106    350 16R  EBP02    
-        27       1571 33106    589 16L  EBP04    
-        27       1572 33106    628 16R  EBP04    
-        27       1573 33106    583 16L  EBP04    
-        27       1574 33106    855 16R  EBP06    
-        27       1575 33106    766 16L  EBP06    
-        27       1576 33106    874 16R  EBP06    
-        27       1577 33106    778 16L  EBP06    
-        27       1578 33106    870 16R  EBP06    
-        27       1579 33106    830 16L  EBP06    
-        27       1580 33106    614 16R  EBP04    
-        27       1581 33106    305 16L  EBP02    
-        27       1582 33106    331 16R  EBP02    
-        27       1583 33106    311 16L  EBP02    
-        27       1584 33106    339 16R  EBP02    
-        27       1585 33106    317 16L  EBP02    
-        27       1586 33106    345 16R  EBP02    
-        27       1587 33106    598 16L  EBP04    
-        27       1588 33106    612 16R  EBP04    
-        27       1589 33106    323 16L  EBP02    
-        27       1590 33106    601 16R  EBP04    
-        27       1591 33106    590 16L  EBP04    
-        27       1592 33106    629 16R  EBP04    
-        27       1593 33106    585 16L  EBP04    
-        27       1594 33106    856 16R  EBP06    
-        27       1595 33106    767 16L  EBP06    
-        27       1596 33106    875 16R  EBP06    
-        27       1597 33106    779 16L  EBP06    
-        27       1598 33106    877 16R  EBP06    
-        27       1599 33106    775 16L  EBP06    
-        27       1600 33106    619 16R  EBP04    
-        27       1601 33106    523 17L  EBP04    
-        27       1602 33106    200 17R  SICEB02  
-        27       1603 33106    528 17L  EBP04    
-        27       1604 33106    555 17R  EBP04    
-        27       1605 33106    534 17L  EBP04    
-        27       1606 33106    565 17R  EBP04    
-        27       1607 33106    637 17L  EBP05    
-        27       1608 33106    696 17R  EBP05    
-        27       1609 33106    643 17L  EBP05    
-        27       1610 33106    701 17R  EBP05    
-        27       1611 33106    644 17L  EBP05    
-        27       1612 33106    711 17R  EBP05    
-        27       1613 33106    661 17L  EBP05    
-        27       1614 33106    716 17R  EBP05    
-        27       1615 33106    651 17L  EBP05    
-        27       1616 33106    706 17R  EBP05    
-        27       1617 33106    666 17L  EBP05    
-        27       1618 33106    564 17R  EBP04    
-        27       1619 33106    671 17L  EBP05    
-        27       1620 33106    721 17R  EBP05    
-        27       1621 33106    524 17L  EBP04    
-        27       1622 33106    550 17R  EBP04    
-        27       1623 33106    530 17L  EBP04    
-        27       1624 33106    556 17R  EBP04    
-        27       1625 33106    631 17L  EBP05    
-        27       1626 33106    566 17R  EBP04    
-        27       1627 33106    638 17L  EBP05    
-        27       1628 33106    697 17R  EBP05    
-        27       1629 33106    647 17L  EBP05    
-        27       1630 33106    702 17R  EBP05    
-        27       1631 33106    656 17L  EBP05    
-        27       1632 33106    712 17R  EBP05    
-        27       1633 33106    662 17L  EBP05    
-        27       1634 33106    717 17R  EBP05    
-        27       1635 33106    652 17L  EBP05    
-        27       1636 33106    707 17R  EBP05    
-        27       1637 33106    667 17L  EBP05    
-        27       1638 33106    727 17R  EBP05    
-        27       1639 33106    672 17L  EBP05    
-        27       1640 33106    723 17R  EBP05    
-        27       1641 33106    525 17L  EBP04    
-        27       1642 33106    552 17R  EBP04    
-        27       1643 33106    531 17L  EBP04    
-        27       1644 33106    559 17R  EBP04    
-        27       1645 33106    632 17L  EBP05    
-        27       1646 33106    568 17R  EBP04    
-        27       1647 33106    639 17L  EBP05    
-        27       1648 33106    698 17R  EBP05    
-        27       1649 33106    648 17L  EBP05    
-        27       1650 33106    703 17R  EBP05    
-        27       1651 33106    657 17L  EBP05    
-        27       1652 33106    713 17R  EBP05    
-        27       1653 33106    663 17L  EBP05    
-        27       1654 33106    718 17R  EBP05    
-        27       1655 33106    653 17L  EBP05    
-        27       1656 33106    730 17R  EBP05    
-        27       1657 33106    668 17L  EBP05    
-        27       1658 33106    732 17R  EBP05    
-        27       1659 33106    673 17L  EBP05    
-        27       1660 33106    724 17R  EBP05    
-        27       1661 33106    526 17L  EBP04    
-        27       1662 33106    553 17R  EBP04    
-        27       1663 33106    532 17L  EBP04    
-        27       1664 33106    561 17R  EBP04    
-        27       1665 33106    633 17L  EBP05    
-        27       1666 33106    570 17R  EBP04    
-        27       1667 33106    640 17L  EBP05    
-        27       1668 33106    699 17R  EBP05    
-        27       1669 33106    649 17L  EBP05    
-        27       1670 33106    704 17R  EBP05    
-        27       1671 33106    659 17L  EBP05    
-        27       1672 33106    714 17R  EBP05    
-        27       1673 33106    664 17L  EBP05    
-        27       1674 33106    719 17R  EBP05    
-        27       1675 33106    654 17L  EBP05    
-        27       1676 33106    709 17R  EBP05    
-        27       1677 33106    669 17L  EBP05    
-        27       1678 33106    733 17R  EBP05    
-        27       1679 33106    674 17L  EBP05    
-        27       1680 33106    725 17R  EBP05    
-        27       1681 33106    527 17L  EBP04    
-        27       1682 33106    554 17R  EBP04    
-        27       1683 33106    533 17L  EBP04    
-        27       1684 33106    563 17R  EBP04    
-        27       1685 33106    634 17L  EBP05    
-        27       1686 33106    728 17R  EBP05    
-        27       1687 33106    642 17L  EBP05    
-        27       1688 33106    700 17R  EBP05    
-        27       1689 33106    650 17L  EBP05    
-        27       1690 33106    705 17R  EBP05    
-        27       1691 33106    676 17L  EBP05    
-        27       1692 33106    715 17R  EBP05    
-        27       1693 33106    665 17L  EBP05    
-        27       1694 33106    720 17R  EBP05    
-        27       1695 33106    655 17L  EBP05    
-        27       1696 33106    710 17R  EBP05    
-        27       1697 33106    670 17L  EBP05    
-        27       1698 33106    735 17R  EBP05    
-        27       1699 33106    675 17L  EBP05    
-        27       1700 33106    726 17R  EBP05    
-        28          1 33101  29629 1L   S7_1     
-        28          2 33101  51266 1R   R9_1     
-        28          3 33101  51251 1L   R9_1     
-        28          4 33101  51271 1R   R9_1     
-        28          5 33101  51256 1L   R9_1     
-        28          6 33101  51276 1R   R9_1     
-        28          7 33101  51791 1L   R9_2     
-        28          8 33101  51801 1R   R9_2     
-        28          9 33101  52341 1L   R10_1    
-        28         10 33101  52386 1R   R10_1    
-        28         11 33101  51796 1L   R9_2     
-        28         12 33101  51806 1R   R9_2     
-        28         13 33101  52351 1L   R10_1    
-        28         14 33101  52376 1R   R10_1    
-        28         15 33101  52346 1L   R10_1    
-        28         16 33101  52371 1R   R10_1    
-        28         17 33101  52356 1L   R10_1    
-        28         18 33101  52381 1R   R10_1    
-        28         19 33101  52361 1L   R10_1    
-        28         20 33101  33889 1R   S8_3     
-        28         21 33101  31802 1L   S07_5    
-        28         22 33101  51267 1R   R9_1     
-        28         23 33101  51252 1L   R9_1     
-        28         24 33101  51272 1R   R9_1     
-        28         25 33101  51257 1L   R9_1     
-        28         26 33101  51277 1R   R9_1     
-        28         27 33101  51792 1L   R9_2     
-        28         28 33101  51802 1R   R9_2     
-        28         29 33101  52342 1L   R10_1    
-        28         30 33101  52370 1R   R10_1    
-        28         31 33101  51797 1L   R9_2     
-        28         32 33101  51807 1R   R9_2     
-        28         33 33101  52352 1L   R10_1    
-        28         34 33101  52377 1R   R10_1    
-        28         35 33101  52347 1L   R10_1    
-        28         36 33101  52372 1R   R10_1    
-        28         37 33101  52357 1L   R10_1    
-        28         38 33101  52382 1R   R10_1    
-        28         39 33101  52362 1L   R10_1    
-        28         40 33101  38303 1R   S9_6     
-        28         41 33101  31803 1L   S07_5    
-        28         42 33101  51268 1R   R9_1     
-        28         43 33101  51253 1L   R9_1     
-        28         44 33101  51273 1R   R9_1     
-        28         45 33101  51258 1L   R9_1     
-        28         46 33101  51278 1R   R9_1     
-        28         47 33101  51793 1L   R9_2     
-        28         48 33101  51803 1R   R9_2     
-        28         49 33101  52343 1L   R10_1    
-        28         50 33101  51263 1R   R9_1     
-        28         51 33101  51798 1L   R9_2     
-        28         52 33101  51808 1R   R9_2     
-        28         53 33101  52353 1L   R10_1    
-        28         54 33101  52378 1R   R10_1    
-        28         55 33101  52348 1L   R10_1    
-        28         56 33101  52373 1R   R10_1    
-        28         57 33101  52358 1L   R10_1    
-        28         58 33101  52383 1R   R10_1    
-        28         59 33101  52363 1L   R10_1    
-        28         60 33101  41559 1R   S10_6    
-        28         61 33101  31825 1L   S07_5    
-        28         62 33101  51269 1R   R9_1     
-        28         63 33101  51254 1L   R9_1     
-        28         64 33101  51274 1R   R9_1     
-        28         65 33101  51259 1L   R9_1     
-        28         66 33101  51279 1R   R9_1     
-        28         67 33101  51794 1L   R9_2     
-        28         68 33101  51804 1R   R9_2     
-        28         69 33101  52344 1L   R10_1    
-        28         70 33101  51264 1R   R9_1     
-        28         71 33101  51799 1L   R9_2     
-        28         72 33101  51809 1R   R9_2     
-        28         73 33101  52354 1L   R10_1    
-        28         74 33101  52379 1R   R10_1    
-        28         75 33101  52349 1L   R10_1    
-        28         76 33101  52374 1R   R10_1    
-        28         77 33101  52359 1L   R10_1    
-        28         78 33101  52384 1R   R10_1    
-        28         79 33101  52364 1L   R10_1    
-        28         80 33101  41571 1R   S10_6    
-        28         81 33101  31829 1L   S07_5    
-        28         82 33101  51270 1R   R9_1     
-        28         83 33101  51249 1L   R9_1     
-        28         84 33101  51275 1R   R9_1     
-        28         85 33101  51260 1L   R9_1     
-        28         86 33101  51280 1R   R9_1     
-        28         87 33101  51795 1L   R9_2     
-        28         88 33101  51805 1R   R9_2     
-        28         89 33101  52345 1L   R10_1    
-        28         90 33101  51265 1R   R9_1     
-        28         91 33101  51250 1L   R9_1     
-        28         92 33101  51810 1R   R9_2     
-        28         93 33101  52355 1L   R10_1    
-        28         94 33101  52380 1R   R10_1    
-        28         95 33101  52350 1L   R10_1    
-        28         96 33101  52375 1R   R10_1    
-        28         97 33101  52360 1L   R10_1    
-        28         98 33101  52385 1R   R10_1    
-        28         99 33101  52365 1L   R10_1    
-        28        100 33101  42114 1R   P19      
-        28        101 33101  26005 2L   S06      
-        28        102 33101  51321 2R   R9_1     
-        28        103 33101  51286 2L   R9_1     
-        28        104 33101  51326 2R   R9_1     
-        28        105 33101  51291 2L   R9_1     
-        28        106 33101  51811 2R   R9_2     
-        28        107 33101  51301 2L   R9_1     
-        28        108 33101  51816 2R   R9_2     
-        28        109 33101  51306 2L   R9_1     
-        28        110 33101  52426 2R   R10_1    
-        28        111 33101  52397 2L   R10_1    
-        28        112 33101  51318 2R   R9_1     
-        28        113 33101  52401 2L   R10_1    
-        28        114 33101  52436 2R   R10_1    
-        28        115 33101  52406 2L   R10_1    
-        28        116 33101  51319 2R   R9_1     
-        28        117 33101  52411 2L   R10_1    
-        28        118 33101  52446 2R   R10_1    
-        28        119 33101  38949 2L   P017     
-        28        120 33101  26515 2R   S6_2     
-        28        121 33101  26020 2L   S06      
-        28        122 33101  51322 2R   R9_1     
-        28        123 33101  51287 2L   R9_1     
-        28        124 33101  51327 2R   R9_1     
-        28        125 33101  51292 2L   R9_1     
-        28        126 33101  51812 2R   R9_2     
-        28        127 33101  51302 2L   R9_1     
-        28        128 33101  51817 2R   R9_2     
-        28        129 33101  51307 2L   R9_1     
-        28        130 33101  52427 2R   R10_1    
-        28        131 33101  51297 2L   R9_1     
-        28        132 33101  52432 2R   R10_1    
-        28        133 33101  52402 2L   R10_1    
-        28        134 33101  52437 2R   R10_1    
-        28        135 33101  52407 2L   R10_1    
-        28        136 33101  52442 2R   R10_1    
-        28        137 33101  52412 2L   R10_1    
-        28        138 33101  52447 2R   R10_1    
-        28        139 33101  38950 2L   P017     
-        28        140 33101  30168 2R   S7_2     
-        28        141 33101  30107 2L   S7_2     
-        28        142 33101  51323 2R   R9_1     
-        28        143 33101  51288 2L   R9_1     
-        28        144 33101  51328 2R   R9_1     
-        28        145 33101  51293 2L   R9_1     
-        28        146 33101  51813 2R   R9_2     
-        28        147 33101  52398 2L   R10_1    
-        28        148 33101  51818 2R   R9_2     
-        28        149 33101  51308 2L   R9_1     
-        28        150 33101  52428 2R   R10_1    
-        28        151 33101  51298 2L   R9_1     
-        28        152 33101  52433 2R   R10_1    
-        28        153 33101  52403 2L   R10_1    
-        28        154 33101  52438 2R   R10_1    
-        28        155 33101  52408 2L   R10_1    
-        28        156 33101  52443 2R   R10_1    
-        28        157 33101  52413 2L   R10_1    
-        28        158 33101  51320 2R   R9_1     
-        28        159 33101  38951 2L   P017     
-        28        160 33101  30167 2R   S7_2     
-        28        161 33101  30110 2L   S7_2     
-        28        162 33101  51324 2R   R9_1     
-        28        163 33101  51289 2L   R9_1     
-        28        164 33101  51329 2R   R9_1     
-        28        165 33101  51294 2L   R9_1     
-        28        166 33101  51814 2R   R9_2     
-        28        167 33101  51304 2L   R9_1     
-        28        168 33101  51819 2R   R9_2     
-        28        169 33101  51309 2L   R9_1     
-        28        170 33101  52429 2R   R10_1    
-        28        171 33101  51299 2L   R9_1     
-        28        172 33101  52434 2R   R10_1    
-        28        173 33101  52404 2L   R10_1    
-        28        174 33101  52439 2R   R10_1    
-        28        175 33101  52409 2L   R10_1    
-        28        176 33101  52444 2R   R10_1    
-        28        177 33101  52399 2L   R10_1    
-        28        178 33101  52449 2R   R10_1    
-        28        179 33101  38952 2L   P017     
-        28        180 33101  30171 2R   S7_2     
-        28        181 33101  30115 2L   S7_2     
-        28        182 33101  51325 2R   R9_1     
-        28        183 33101  51290 2L   R9_1     
-        28        184 33101  51330 2R   R9_1     
-        28        185 33101  51295 2L   R9_1     
-        28        186 33101  51815 2R   R9_2     
-        28        187 33101  51305 2L   R9_1     
-        28        188 33101  51820 2R   R9_2     
-        28        189 33101  51310 2L   R9_1     
-        28        190 33101  52430 2R   R10_1    
-        28        191 33101  51300 2L   R9_1     
-        28        192 33101  52435 2R   R10_1    
-        28        193 33101  52405 2L   R10_1    
-        28        194 33101  52440 2R   R10_1    
-        28        195 33101  52410 2L   R10_1    
-        28        196 33101  52445 2R   R10_1    
-        28        197 33101  52400 2L   R10_1    
-        28        198 33101  52450 2R   R10_1    
-        28        199 33101  38953 2L   P017     
-        28        200 33101  30174 2R   S7_2     
-        28        201 33101  41829 3L   P18      
-        28        202 33101  38764 3R   P016     
-        28        203 33101  51340 3L   R9_1     
-        28        204 33101  51371 3R   R9_1     
-        28        205 33101  51341 3L   R9_1     
-        28        206 33101  51376 3R   R9_1     
-        28        207 33101  51346 3L   R9_1     
-        28        208 33101  51821 3R   R9_2     
-        28        209 33101  51351 3L   R9_1     
-        28        210 33101  51826 3R   R9_2     
-        28        211 33101  51356 3L   R9_1     
-        28        212 33101  51369 3R   R9_1     
-        28        213 33101  52456 3L   R10_1    
-        28        214 33101  52481 3R   R10_1    
-        28        215 33101  52461 3L   R10_1    
-        28        216 33101  52486 3R   R10_1    
-        28        217 33101  52466 3L   R10_1    
-        28        218 33101  52491 3R   R10_1    
-        28        219 33101  38995 3L   P017     
-        28        220 33101  26585 3R   S6_2     
-        28        221 33101  41830 3L   P18      
-        28        222 33101  38765 3R   P016     
-        28        223 33101  51331 3L   R9_1     
-        28        224 33101  51372 3R   R9_1     
-        28        225 33101  51342 3L   R9_1     
-        28        226 33101  51377 3R   R9_1     
-        28        227 33101  51347 3L   R9_1     
-        28        228 33101  51822 3R   R9_2     
-        28        229 33101  51352 3L   R9_1     
-        28        230 33101  51827 3R   R9_2     
-        28        231 33101  51357 3L   R9_1     
-        28        232 33101  52477 3R   R10_1    
-        28        233 33101  52457 3L   R10_1    
-        28        234 33101  52482 3R   R10_1    
-        28        235 33101  52462 3L   R10_1    
-        28        236 33101  52487 3R   R10_1    
-        28        237 33101  52467 3L   R10_1    
-        28        238 33101  52492 3R   R10_1    
-        28        239 33101  38996 3L   P017     
-        28        240 33101  26588 3R   S6_2     
-        28        241 33101  42531 3L   R1_1     
-        28        242 33101  38766 3R   P016     
-        28        243 33101  51338 3L   R9_1     
-        28        244 33101  51373 3R   R9_1     
-        28        245 33101  51343 3L   R9_1     
-        28        246 33101  51379 3R   R9_1     
-        28        247 33101  51348 3L   R9_1     
-        28        248 33101  51823 3R   R9_2     
-        28        249 33101  51353 3L   R9_1     
-        28        250 33101  51828 3R   R9_2     
-        28        251 33101  51358 3L   R9_1     
-        28        252 33101  52478 3R   R10_1    
-        28        253 33101  52458 3L   R10_1    
-        28        254 33101  52483 3R   R10_1    
-        28        255 33101  52463 3L   R10_1    
-        28        256 33101  52488 3R   R10_1    
-        28        257 33101  52468 3L   R10_1    
-        28        258 33101  52493 3R   R10_1    
-        28        259 33101  38997 3L   P017     
-        28        260 33101  26590 3R   S6_2     
-        28        261 33101  42534 3L   R1_1     
-        28        262 33101  38767 3R   P016     
-        28        263 33101  51339 3L   R9_1     
-        28        264 33101  51374 3R   R9_1     
-        28        265 33101  51344 3L   R9_1     
-        28        266 33101  51378 3R   R9_1     
-        28        267 33101  51349 3L   R9_1     
-        28        268 33101  51824 3R   R9_2     
-        28        269 33101  51354 3L   R9_1     
-        28        270 33101  51829 3R   R9_2     
-        28        271 33101  51359 3L   R9_1     
-        28        272 33101  52479 3R   R10_1    
-        28        273 33101  52459 3L   R10_1    
-        28        274 33101  52484 3R   R10_1    
-        28        275 33101  52464 3L   R10_1    
-        28        276 33101  52489 3R   R10_1    
-        28        277 33101  52469 3L   R10_1    
-        28        278 33101  51370 3R   R9_1     
-        28        279 33101  38998 3L   P017     
-        28        280 33101  26595 3R   S6_2     
-        28        281 33101  43067 3L   R1_2     
-        28        282 33101  38768 3R   P016     
-        28        283 33101  52453 3L   R10_1    
-        28        284 33101  51375 3R   R9_1     
-        28        285 33101  51345 3L   R9_1     
-        28        286 33101  51380 3R   R9_1     
-        28        287 33101  51350 3L   R9_1     
-        28        288 33101  51825 3R   R9_2     
-        28        289 33101  51355 3L   R9_1     
-        28        290 33101  51830 3R   R9_2     
-        28        291 33101  51360 3L   R9_1     
-        28        292 33101  52480 3R   R10_1    
-        28        293 33101  52460 3L   R10_1    
-        28        294 33101  52485 3R   R10_1    
-        28        295 33101  52454 3L   R10_1    
-        28        296 33101  52490 3R   R10_1    
-        28        297 33101  52455 3L   R10_1    
-        28        298 33101  52495 3R   R10_1    
-        28        299 33101  38999 3L   P017     
-        28        300 33101  26602 3R   S6_2     
-        28        301 33101  26642 4L   S6_2     
-        28        302 33101  38771 4R   P016     
-        28        303 33101  51391 4L   R9_1     
-        28        304 33101  51411 4R   R9_1     
-        28        305 33101  51396 4L   R9_1     
-        28        306 33101  51421 4R   R9_1     
-        28        307 33101  51401 4L   R9_1     
-        28        308 33101  51426 4R   R9_1     
-        28        309 33101  51406 4L   R9_1     
-        28        310 33101  51431 4R   R9_1     
-        28        311 33101  52516 4L   R10_1    
-        28        312 33101  50905 4R   R8_2     
-        28        313 33101  52521 4L   R10_1    
-        28        314 33101  52541 4R   R10_1    
-        28        315 33101  52526 4L   R10_1    
-        28        316 33101  52546 4R   R10_1    
-        28        317 33101  52515 4L   R10_1    
-        28        318 33101  51416 4R   R9_1     
-        28        319 33101  39029 4L   P017     
-        28        320 33101  26684 4R   S6_2     
-        28        321 33101  26645 4L   S6_2     
-        28        322 33101  38772 4R   P016     
-        28        323 33101  51392 4L   R9_1     
-        28        324 33101  51412 4R   R9_1     
-        28        325 33101  51397 4L   R9_1     
-        28        326 33101  51422 4R   R9_1     
-        28        327 33101  51402 4L   R9_1     
-        28        328 33101  51427 4R   R9_1     
-        28        329 33101  51407 4L   R9_1     
-        28        330 33101  51432 4R   R9_1     
-        28        331 33101  52517 4L   R10_1    
-        28        332 33101  52537 4R   R10_1    
-        28        333 33101  52522 4L   R10_1    
-        28        334 33101  52542 4R   R10_1    
-        28        335 33101  52527 4L   R10_1    
-        28        336 33101  52547 4R   R10_1    
-        28        337 33101  52532 4L   R10_1    
-        28        338 33101  51417 4R   R9_1     
-        28        339 33101  39030 4L   P017     
-        28        340 33101  26686 4R   S6_2     
-        28        341 33101  26648 4L   S6_2     
-        28        342 33101  38773 4R   P016     
-        28        343 33101  51393 4L   R9_1     
-        28        344 33101  50904 4R   R8_2     
-        28        345 33101  51398 4L   R9_1     
-        28        346 33101  51423 4R   R9_1     
-        28        347 33101  51403 4L   R9_1     
-        28        348 33101  51428 4R   R9_1     
-        28        349 33101  51408 4L   R9_1     
-        28        350 33101  51433 4R   R9_1     
-        28        351 33101  52518 4L   R10_1    
-        28        352 33101  52538 4R   R10_1    
-        28        353 33101  52523 4L   R10_1    
-        28        354 33101  52543 4R   R10_1    
-        28        355 33101  52528 4L   R10_1    
-        28        356 33101  52548 4R   R10_1    
-        28        357 33101  52533 4L   R10_1    
-        28        358 33101  51418 4R   R9_1     
-        28        359 33101  39032 4L   P017     
-        28        360 33101  26687 4R   S6_2     
-        28        361 33101  26652 4L   S6_2     
-        28        362 33101  38774 4R   P016     
-        28        363 33101  51394 4L   R9_1     
-        28        364 33101  51414 4R   R9_1     
-        28        365 33101  51399 4L   R9_1     
-        28        366 33101  51424 4R   R9_1     
-        28        367 33101  51404 4L   R9_1     
-        28        368 33101  51429 4R   R9_1     
-        28        369 33101  51409 4L   R9_1     
-        28        370 33101  51434 4R   R9_1     
-        28        371 33101  52519 4L   R10_1    
-        28        372 33101  52539 4R   R10_1    
-        28        373 33101  52524 4L   R10_1    
-        28        374 33101  52552 4R   R10_1    
-        28        375 33101  52529 4L   R10_1    
-        28        376 33101  52551 4R   R10_1    
-        28        377 33101  52534 4L   R10_1    
-        28        378 33101  52556 4R   R10_1    
-        28        379 33101  39033 4L   P017     
-        28        380 33101  26690 4R   S6_2     
-        28        381 33101  26655 4L   S6_2     
-        28        382 33101  38775 4R   P016     
-        28        383 33101  51395 4L   R9_1     
-        28        384 33101  51415 4R   R9_1     
-        28        385 33101  51400 4L   R9_1     
-        28        386 33101  51425 4R   R9_1     
-        28        387 33101  51405 4L   R9_1     
-        28        388 33101  51430 4R   R9_1     
-        28        389 33101  51410 4L   R9_1     
-        28        390 33101  51435 4R   R9_1     
-        28        391 33101  52520 4L   R10_1    
-        28        392 33101  52540 4R   R10_1    
-        28        393 33101  52525 4L   R10_1    
-        28        394 33101  52545 4R   R10_1    
-        28        395 33101  52530 4L   R10_1    
-        28        396 33101  52550 4R   R10_1    
-        28        397 33101  52535 4L   R10_1    
-        28        398 33101  52555 4R   R10_1    
-        28        399 33101  39034 4L   P017     
-        28        400 33101  26691 4R   S6_2     
-        28        401 33101  22665 5L   S5       
-        28        402 33101  38411 5R   S9_6     
-        28        403 33101  51441 5L   R9_1     
-        28        404 33101  52589 5R   R10_1    
-        28        405 33101  51446 5L   R9_1     
-        28        406 33101  52611 5R   R10_1    
-        28        407 33101  51451 5L   R9_1     
-        28        408 33101  51466 5R   R9_1     
-        28        409 33101  51831 5L   R9_2     
-        28        410 33101  51471 5R   R9_1     
-        28        411 33101  51836 5L   R9_2     
-        28        412 33101  52591 5R   R10_1    
-        28        413 33101  52566 5L   R10_1    
-        28        414 33101  52596 5R   R10_1    
-        28        415 33101  52571 5L   R10_1    
-        28        416 33101  52601 5R   R10_1    
-        28        417 33101  52576 5L   R10_1    
-        28        418 33101  52606 5R   R10_1    
-        28        419 33101  39094 5L   P017     
-        28        420 33101  22616 5R   S5       
-        28        421 33101  26736 5L   S6_2     
-        28        422 33101  38412 5R   S9_6     
-        28        423 33101  51442 5L   R9_1     
-        28        424 33101  51457 5R   R9_1     
-        28        425 33101  51447 5L   R9_1     
-        28        426 33101  51462 5R   R9_1     
-        28        427 33101  51452 5L   R9_1     
-        28        428 33101  51467 5R   R9_1     
-        28        429 33101  51832 5L   R9_2     
-        28        430 33101  51472 5R   R9_1     
-        28        431 33101  51837 5L   R9_2     
-        28        432 33101  52592 5R   R10_1    
-        28        433 33101  52567 5L   R10_1    
-        28        434 33101  52597 5R   R10_1    
-        28        435 33101  52572 5L   R10_1    
-        28        436 33101  52602 5R   R10_1    
-        28        437 33101  52577 5L   R10_1    
-        28        438 33101  52607 5R   R10_1    
-        28        439 33101  39095 5L   P017     
-        28        440 33101  26801 5R   S6_2     
-        28        441 33101  26741 5L   S6_2     
-        28        442 33101  38422 5R   S9_6     
-        28        443 33101  51443 5L   R9_1     
-        28        444 33101  51458 5R   R9_1     
-        28        445 33101  51448 5L   R9_1     
-        28        446 33101  51463 5R   R9_1     
-        28        447 33101  51453 5L   R9_1     
-        28        448 33101  51468 5R   R9_1     
-        28        449 33101  51833 5L   R9_2     
-        28        450 33101  51473 5R   R9_1     
-        28        451 33101  51838 5L   R9_2     
-        28        452 33101  52593 5R   R10_1    
-        28        453 33101  52568 5L   R10_1    
-        28        454 33101  52598 5R   R10_1    
-        28        455 33101  52573 5L   R10_1    
-        28        456 33101  52603 5R   R10_1    
-        28        457 33101  52578 5L   R10_1    
-        28        458 33101  52608 5R   R10_1    
-        28        459 33101  39101 5L   P017     
-        28        460 33101  26809 5R   S6_2     
-        28        461 33101  26743 5L   S6_2     
-        28        462 33101  39114 5R   P017     
-        28        463 33101  51444 5L   R9_1     
-        28        464 33101  51459 5R   R9_1     
-        28        465 33101  51449 5L   R9_1     
-        28        466 33101  51464 5R   R9_1     
-        28        467 33101  51454 5L   R9_1     
-        28        468 33101  51469 5R   R9_1     
-        28        469 33101  51834 5L   R9_2     
-        28        470 33101  51474 5R   R9_1     
-        28        471 33101  51839 5L   R9_2     
-        28        472 33101  52594 5R   R10_1    
-        28        473 33101  52569 5L   R10_1    
-        28        474 33101  52599 5R   R10_1    
-        28        475 33101  52574 5L   R10_1    
-        28        476 33101  52604 5R   R10_1    
-        28        477 33101  51439 5L   R9_1     
-        28        478 33101  52609 5R   R10_1    
-        28        479 33101  39109 5L   P017     
-        28        480 33101  27011 5R   S6_2b    
-        28        481 33101  26744 5L   S6_2     
-        28        482 33101  39115 5R   P017     
-        28        483 33101  51445 5L   R9_1     
-        28        484 33101  52590 5R   R10_1    
-        28        485 33101  51450 5L   R9_1     
-        28        486 33101  51465 5R   R9_1     
-        28        487 33101  51455 5L   R9_1     
-        28        488 33101  51470 5R   R9_1     
-        28        489 33101  51835 5L   R9_2     
-        28        490 33101  51475 5R   R9_1     
-        28        491 33101  51840 5L   R9_2     
-        28        492 33101  52595 5R   R10_1    
-        28        493 33101  52570 5L   R10_1    
-        28        494 33101  52600 5R   R10_1    
-        28        495 33101  52575 5L   R10_1    
-        28        496 33101  52605 5R   R10_1    
-        28        497 33101  51440 5L   R9_1     
-        28        498 33101  52610 5R   R10_1    
-        28        499 33101  39113 5L   P017     
-        28        500 33101  27012 5R   S6_2b    
-        28        501 33101  23001 6L   S5       
-        28        502 33101  52653 6R   R10_1    
-        28        503 33101  52632 6L   R10_1    
-        28        504 33101  52662 6R   R10_1    
-        28        505 33101  52627 6L   R10_1    
-        28        506 33101  52652 6R   R10_1    
-        28        507 33101  52622 6L   R10_1    
-        28        508 33101  51553 6R   R9_1     
-        28        509 33101  52617 6L   R10_1    
-        28        510 33101  52106 6R   R9_2     
-        28        511 33101  51511 6L   R9_1     
-        28        512 33101  51548 6R   R9_1     
-        28        513 33101  51506 6L   R9_1     
-        28        514 33101  51543 6R   R9_1     
-        28        515 33101  51501 6L   R9_1     
-        28        516 33101  51518 6R   R9_1     
-        28        517 33101  51496 6L   R9_1     
-        28        518 33101  51513 6R   R9_1     
-        28        519 33101  51491 6L   R9_1     
-        28        520 33101  28478 6R   S6_3b    
-        28        521 33101  23002 6L   S5       
-        28        522 33101  52654 6R   R10_1    
-        28        523 33101  52633 6L   R10_1    
-        28        524 33101  52663 6R   R10_1    
-        28        525 33101  52628 6L   R10_1    
-        28        526 33101  52655 6R   R10_1    
-        28        527 33101  52623 6L   R10_1    
-        28        528 33101  47071 6R   R5_1     
-        28        529 33101  52618 6L   R10_1    
-        28        530 33101  52107 6R   R9_2     
-        28        531 33101  51512 6L   R9_1     
-        28        532 33101  51549 6R   R9_1     
-        28        533 33101  51507 6L   R9_1     
-        28        534 33101  51544 6R   R9_1     
-        28        535 33101  51502 6L   R9_1     
-        28        536 33101  51519 6R   R9_1     
-        28        537 33101  51497 6L   R9_1     
-        28        538 33101  51514 6R   R9_1     
-        28        539 33101  51492 6L   R9_1     
-        28        540 33101  31049 6R   S7_3     
-        28        541 33101  26129 6L   S06      
-        28        542 33101  52659 6R   R10_1    
-        28        543 33101  52645 6L   R10_1    
-        28        544 33101  52664 6R   R10_1    
-        28        545 33101  52629 6L   R10_1    
-        28        546 33101  52656 6R   R10_1    
-        28        547 33101  52624 6L   R10_1    
-        28        548 33101  47791 6R   S9_5     
-        28        549 33101  52619 6L   R10_1    
-        28        550 33101  52108 6R   R9_2     
-        28        551 33101  28716 6L   P12      
-        28        552 33101  51550 6R   R9_1     
-        28        553 33101  51508 6L   R9_1     
-        28        554 33101  51545 6R   R9_1     
-        28        555 33101  51503 6L   R9_1     
-        28        556 33101  51520 6R   R9_1     
-        28        557 33101  51498 6L   R9_1     
-        28        558 33101  51515 6R   R9_1     
-        28        559 33101  51477 6L   R9_1     
-        28        560 33101  32945 6R   S8_1     
-        28        561 33101  28715 6L   P12      
-        28        562 33101  52660 6R   R10_1    
-        28        563 33101  52635 6L   R10_1    
-        28        564 33101  52665 6R   R10_1    
-        28        565 33101  52630 6L   R10_1    
-        28        566 33101  52657 6R   R10_1    
-        28        567 33101  52625 6L   R10_1    
-        28        568 33101  50441 6R   R8_1     
-        28        569 33101  52620 6L   R10_1    
-        28        570 33101  52109 6R   R9_2     
-        28        571 33101  39554 6L   S10_1    
-        28        572 33101  51551 6R   R9_1     
-        28        573 33101  51509 6L   R9_1     
-        28        574 33101  51546 6R   R9_1     
-        28        575 33101  51504 6L   R9_1     
-        28        576 33101  51521 6R   R9_1     
-        28        577 33101  51499 6L   R9_1     
-        28        578 33101  51516 6R   R9_1     
-        28        579 33101  51488 6L   R9_1     
-        28        580 33101  34208 6R   P14      
-        28        581 33101  32654 6L   P14      
-        28        582 33101  52661 6R   R10_1    
-        28        583 33101  52646 6L   R10_1    
-        28        584 33101  52666 6R   R10_1    
-        28        585 33101  52631 6L   R10_1    
-        28        586 33101  52658 6R   R10_1    
-        28        587 33101  52644 6L   R10_1    
-        28        588 33101  50442 6R   R8_1     
-        28        589 33101  52621 6L   R10_1    
-        28        590 33101  52110 6R   R9_2     
-        28        591 33101  48775 6L   R6_2     
-        28        592 33101  51552 6R   R9_1     
-        28        593 33101  51510 6L   R9_1     
-        28        594 33101  51547 6R   R9_1     
-        28        595 33101  51505 6L   R9_1     
-        28        596 33101  51522 6R   R9_1     
-        28        597 33101  51500 6L   R9_1     
-        28        598 33101  51517 6R   R9_1     
-        28        599 33101  51495 6L   R9_1     
-        28        600 33101  35587 6R   P15_1    
-        28        601 33101  47804 7L   S9_5     
-        28        602 33101  52715 7R   R10_1    
-        28        603 33101  52697 7L   R10_1    
-        28        604 33101  52111 7R   R9_2     
-        28        605 33101  52692 7L   R10_1    
-        28        606 33101  52735 7R   R10_1    
-        28        607 33101  52682 7L   R10_1    
-        28        608 33101  52730 7R   R10_1    
-        28        609 33101  51569 7L   R9_1     
-        28        610 33101  52725 7R   R10_1    
-        28        611 33101  51559 7L   R9_1     
-        28        612 33101  52116 7R   R9_2     
-        28        613 33101  51564 7L   R9_1     
-        28        614 33101  51601 7R   R9_1     
-        28        615 33101  51554 7L   R9_1     
-        28        616 33101  51596 7R   R9_1     
-        28        617 33101  51031 7L   R8_2     
-        28        618 33101  51051 7R   R8_2     
-        28        619 33101  11469 7L   S1       
-        28        620 33101  47819 7R   S9_5     
-        28        621 33101  47805 7L   S9_5     
-        28        622 33101  52716 7R   R10_1    
-        28        623 33101  52698 7L   R10_1    
-        28        624 33101  52117 7R   R9_2     
-        28        625 33101  52688 7L   R10_1    
-        28        626 33101  52736 7R   R10_1    
-        28        627 33101  52683 7L   R10_1    
-        28        628 33101  52731 7R   R10_1    
-        28        629 33101  51570 7L   R9_1     
-        28        630 33101  52726 7R   R10_1    
-        28        631 33101  51560 7L   R9_1     
-        28        632 33101  52112 7R   R9_2     
-        28        633 33101  51565 7L   R9_1     
-        28        634 33101  51602 7R   R9_1     
-        28        635 33101  51555 7L   R9_1     
-        28        636 33101  51597 7R   R9_1     
-        28        637 33101  51032 7L   R8_2     
-        28        638 33101  51052 7R   R8_2     
-        28        639 33101  34328 7L   S8_4     
-        28        640 33101  47821 7R   S9_5     
-        28        641 33101  47807 7L   S9_5     
-        28        642 33101  52717 7R   R10_1    
-        28        643 33101  52703 7L   R10_1    
-        28        644 33101  52113 7R   R9_2     
-        28        645 33101  52689 7L   R10_1    
-        28        646 33101  52737 7R   R10_1    
-        28        647 33101  52684 7L   R10_1    
-        28        648 33101  52732 7R   R10_1    
-        28        649 33101  51571 7L   R9_1     
-        28        650 33101  52727 7R   R10_1    
-        28        651 33101  51561 7L   R9_1     
-        28        652 33101  52118 7R   R9_2     
-        28        653 33101  51566 7L   R9_1     
-        28        654 33101  51603 7R   R9_1     
-        28        655 33101  51556 7L   R9_1     
-        28        656 33101  51598 7R   R9_1     
-        28        657 33101  51033 7L   R8_2     
-        28        658 33101  51053 7R   R8_2     
-        28        659 33101  39600 7L   S10_1    
-        28        660 33101  47824 7R   S9_5     
-        28        661 33101  47808 7L   S9_5     
-        28        662 33101  52718 7R   R10_1    
-        28        663 33101  52700 7L   R10_1    
-        28        664 33101  52114 7R   R9_2     
-        28        665 33101  52690 7L   R10_1    
-        28        666 33101  52738 7R   R10_1    
-        28        667 33101  52685 7L   R10_1    
-        28        668 33101  52733 7R   R10_1    
-        28        669 33101  51572 7L   R9_1     
-        28        670 33101  52728 7R   R10_1    
-        28        671 33101  51562 7L   R9_1     
-        28        672 33101  52119 7R   R9_2     
-        28        673 33101  51567 7L   R9_1     
-        28        674 33101  51604 7R   R9_1     
-        28        675 33101  51557 7L   R9_1     
-        28        676 33101  51599 7R   R9_1     
-        28        677 33101  51034 7L   R8_2     
-        28        678 33101  51048 7R   R8_2     
-        28        679 33101  39601 7L   S10_1    
-        28        680 33101  47825 7R   S9_5     
-        28        681 33101  47809 7L   S9_5     
-        28        682 33101  52719 7R   R10_1    
-        28        683 33101  52701 7L   R10_1    
-        28        684 33101  52115 7R   R9_2     
-        28        685 33101  52691 7L   R10_1    
-        28        686 33101  52739 7R   R10_1    
-        28        687 33101  52686 7L   R10_1    
-        28        688 33101  52734 7R   R10_1    
-        28        689 33101  51573 7L   R9_1     
-        28        690 33101  52729 7R   R10_1    
-        28        691 33101  51563 7L   R9_1     
-        28        692 33101  52120 7R   R9_2     
-        28        693 33101  51568 7L   R9_1     
-        28        694 33101  34331 7R   S8_4     
-        28        695 33101  51558 7L   R9_1     
-        28        696 33101  51600 7R   R9_1     
-        28        697 33101  51035 7L   R8_2     
-        28        698 33101  51055 7R   R8_2     
-        28        699 33101  39602 7L   S10_1    
-        28        700 33101  47826 7R   S9_5     
-        28        701 33101  26257 8L   S06      
-        28        702 33101  52785 8R   R10_1    
-        28        703 33101  52779 8L   R10_1    
-        28        704 33101  52799 8R   R10_1    
-        28        705 33101  52754 8L   R10_1    
-        28        706 33101  52787 8R   R10_1    
-        28        707 33101  52764 8L   R10_1    
-        28        708 33101  52794 8R   R10_1    
-        28        709 33101  52774 8L   R10_1    
-        28        710 33101  45907 8R   R4_1     
-        28        711 33101  52132 8L   R9_2     
-        28        712 33101  52139 8R   R9_2     
-        28        713 33101  52127 8L   R9_2     
-        28        714 33101  52137 8R   R9_2     
-        28        715 33101  52122 8L   R9_2     
-        28        716 33101  51634 8R   R9_1     
-        28        717 33101  51620 8L   R9_1     
-        28        718 33101  51629 8R   R9_1     
-        28        719 33101  51619 8L   R9_1     
-        28        720 33101  26282 8R   S06      
-        28        721 33101  28719 8L   P12      
-        28        722 33101  52790 8R   R10_1    
-        28        723 33101  52780 8L   R10_1    
-        28        724 33101  52800 8R   R10_1    
-        28        725 33101  52755 8L   R10_1    
-        28        726 33101  52805 8R   R10_1    
-        28        727 33101  52765 8L   R10_1    
-        28        728 33101  52795 8R   R10_1    
-        28        729 33101  52775 8L   R10_1    
-        28        730 33101  49451 8R   R7_1     
-        28        731 33101  52133 8L   R9_2     
-        28        732 33101  52140 8R   R9_2     
-        28        733 33101  52128 8L   R9_2     
-        28        734 33101  52143 8R   R9_2     
-        28        735 33101  52123 8L   R9_2     
-        28        736 33101  51635 8R   R9_1     
-        28        737 33101  51621 8L   R9_1     
-        28        738 33101  51630 8R   R9_1     
-        28        739 33101  51606 8L   R9_1     
-        28        740 33101  26315 8R   S06      
-        28        741 33101  30424 8L   S7_2     
-        28        742 33101  52791 8R   R10_1    
-        28        743 33101  52781 8L   R10_1    
-        28        744 33101  52788 8R   R10_1    
-        28        745 33101  52756 8L   R10_1    
-        28        746 33101  52806 8R   R10_1    
-        28        747 33101  52766 8L   R10_1    
-        28        748 33101  52796 8R   R10_1    
-        28        749 33101  52776 8L   R10_1    
-        28        750 33101  49462 8R   R7_1     
-        28        751 33101  52134 8L   R9_2     
-        28        752 33101  52141 8R   R9_2     
-        28        753 33101  52129 8L   R9_2     
-        28        754 33101  51644 8R   R9_1     
-        28        755 33101  52124 8L   R9_2     
-        28        756 33101  51631 8R   R9_1     
-        28        757 33101  51622 8L   R9_1     
-        28        758 33101  51636 8R   R9_1     
-        28        759 33101  51607 8L   R9_1     
-        28        760 33101  31129 8R   S7_3     
-        28        761 33101  30436 8L   S7_2     
-        28        762 33101  52792 8R   R10_1    
-        28        763 33101  52782 8L   R10_1    
-        28        764 33101  52802 8R   R10_1    
-        28        765 33101  52757 8L   R10_1    
-        28        766 33101  52807 8R   R10_1    
-        28        767 33101  52767 8L   R10_1    
-        28        768 33101  52797 8R   R10_1    
-        28        769 33101  52777 8L   R10_1    
-        28        770 33101  49464 8R   R7_1     
-        28        771 33101  52135 8L   R9_2     
-        28        772 33101  52142 8R   R9_2     
-        28        773 33101  52130 8L   R9_2     
-        28        774 33101  52138 8R   R9_2     
-        28        775 33101  52125 8L   R9_2     
-        28        776 33101  51637 8R   R9_1     
-        28        777 33101  51623 8L   R9_1     
-        28        778 33101  51639 8R   R9_1     
-        28        779 33101  51608 8L   R9_1     
-        28        780 33101  31130 8R   S7_3     
-        28        781 33101  31122 8L   S7_3     
-        28        782 33101  52793 8R   R10_1    
-        28        783 33101  52773 8L   R10_1    
-        28        784 33101  52803 8R   R10_1    
-        28        785 33101  52758 8L   R10_1    
-        28        786 33101  52808 8R   R10_1    
-        28        787 33101  52768 8L   R10_1    
-        28        788 33101  52798 8R   R10_1    
-        28        789 33101  52778 8L   R10_1    
-        28        790 33101  50526 8R   R8_1     
-        28        791 33101  52136 8L   R9_2     
-        28        792 33101  47841 8R   S9_5     
-        28        793 33101  52131 8L   R9_2     
-        28        794 33101  52146 8R   R9_2     
-        28        795 33101  52126 8L   R9_2     
-        28        796 33101  51638 8R   R9_1     
-        28        797 33101  21723 8L   P9       
-        28        798 33101  51633 8R   R9_1     
-        28        799 33101  51609 8L   R9_1     
-        28        800 33101  31661 8R   S7_4     
-        28        801 33101  26345 9L   S06      
-        28        802 33101  52872 9R   R10_1    
-        28        803 33101  52820 9L   R10_1    
-        28        804 33101  52862 9R   R10_1    
-        28        805 33101  52829 9L   R10_1    
-        28        806 33101  52857 9R   R10_1    
-        28        807 33101  52844 9L   R10_1    
-        28        808 33101  52188 9R   R9_2     
-        28        809 33101  52157 9L   R9_2     
-        28        810 33101  52183 9R   R9_2     
-        28        811 33101  52152 9L   R9_2     
-        28        812 33101  52193 9R   R9_2     
-        28        813 33101  52147 9L   R9_2     
-        28        814 33101  52196 9R   R9_2     
-        28        815 33101  51141 9L   R8_2     
-        28        816 33101  52178 9R   R9_2     
-        28        817 33101  51136 9L   R8_2     
-        28        818 33101  52164 9R   R9_2     
-        28        819 33101  51131 9L   R8_2     
-        28        820 33101  47873 9R   S9_5     
-        28        821 33101  26341 9L   S06      
-        28        822 33101  52873 9R   R10_1    
-        28        823 33101  52815 9L   R10_1    
-        28        824 33101  52868 9R   R10_1    
-        28        825 33101  52830 9L   R10_1    
-        28        826 33101  52858 9R   R10_1    
-        28        827 33101  52845 9L   R10_1    
-        28        828 33101  52189 9R   R9_2     
-        28        829 33101  52158 9L   R9_2     
-        28        830 33101  52184 9R   R9_2     
-        28        831 33101  52153 9L   R9_2     
-        28        832 33101  52194 9R   R9_2     
-        28        833 33101  52148 9L   R9_2     
-        28        834 33101  52169 9R   R9_2     
-        28        835 33101  51142 9L   R8_2     
-        28        836 33101  52176 9R   R9_2     
-        28        837 33101  51137 9L   R8_2     
-        28        838 33101  52165 9R   R9_2     
-        28        839 33101  51132 9L   R8_2     
-        28        840 33101  47874 9R   S9_5     
-        28        841 33101  47864 9L   S9_5     
-        28        842 33101  52874 9R   R10_1    
-        28        843 33101  52816 9L   R10_1    
-        28        844 33101  52864 9R   R10_1    
-        28        845 33101  52826 9L   R10_1    
-        28        846 33101  52859 9R   R10_1    
-        28        847 33101  52846 9L   R10_1    
-        28        848 33101  52190 9R   R9_2     
-        28        849 33101  52159 9L   R9_2     
-        28        850 33101  52185 9R   R9_2     
-        28        851 33101  52154 9L   R9_2     
-        28        852 33101  52195 9R   R9_2     
-        28        853 33101  52149 9L   R9_2     
-        28        854 33101  52175 9R   R9_2     
-        28        855 33101  51143 9L   R8_2     
-        28        856 33101  52180 9R   R9_2     
-        28        857 33101  51138 9L   R8_2     
-        28        858 33101  52170 9R   R9_2     
-        28        859 33101  51133 9L   R8_2     
-        28        860 33101  47876 9R   S9_5     
-        28        861 33101  47866 9L   S9_5     
-        28        862 33101  52875 9R   R10_1    
-        28        863 33101  52821 9L   R10_1    
-        28        864 33101  52865 9R   R10_1    
-        28        865 33101  52827 9L   R10_1    
-        28        866 33101  52860 9R   R10_1    
-        28        867 33101  52162 9L   R9_2     
-        28        868 33101  52191 9R   R9_2     
-        28        869 33101  52160 9L   R9_2     
-        28        870 33101  52186 9R   R9_2     
-        28        871 33101  52155 9L   R9_2     
-        28        872 33101  52192 9R   R9_2     
-        28        873 33101  52150 9L   R9_2     
-        28        874 33101  52179 9R   R9_2     
-        28        875 33101  51144 9L   R8_2     
-        28        876 33101  52181 9R   R9_2     
-        28        877 33101  51139 9L   R8_2     
-        28        878 33101  52171 9R   R9_2     
-        28        879 33101  51134 9L   R8_2     
-        28        880 33101  47879 9R   S9_5     
-        28        881 33101  47867 9L   S9_5     
-        28        882 33101  52876 9R   R10_1    
-        28        883 33101  52818 9L   R10_1    
-        28        884 33101  52866 9R   R10_1    
-        28        885 33101  52833 9L   R10_1    
-        28        886 33101  52861 9R   R10_1    
-        28        887 33101  47853 9L   S9_5     
-        28        888 33101  52173 9R   R9_2     
-        28        889 33101  52161 9L   R9_2     
-        28        890 33101  52187 9R   R9_2     
-        28        891 33101  52156 9L   R9_2     
-        28        892 33101  52197 9R   R9_2     
-        28        893 33101  52151 9L   R9_2     
-        28        894 33101  52177 9R   R9_2     
-        28        895 33101  51145 9L   R8_2     
-        28        896 33101  52182 9R   R9_2     
-        28        897 33101  51140 9L   R8_2     
-        28        898 33101  52174 9R   R9_2     
-        28        899 33101  51135 9L   R8_2     
-        28        900 33101  47880 9R   S9_5     
-        28        901 33101  26817 10L  S6_2     
-        28        902 33101  52255 10R  R9_2     
-        28        903 33101  52208 10L  R9_2     
-        28        904 33101  52245 10R  R9_2     
-        28        905 33101  52198 10L  R9_2     
-        28        906 33101  52240 10R  R9_2     
-        28        907 33101  51191 10L  R8_2     
-        28        908 33101  52235 10R  R9_2     
-        28        909 33101  51146 10L  R8_2     
-        28        910 33101  52260 10R  R9_2     
-        28        911 33101  51181 10L  R8_2     
-        28        912 33101  52225 10R  R9_2     
-        28        913 33101  51176 10L  R8_2     
-        28        914 33101  52220 10R  R9_2     
-        28        915 33101  51171 10L  R8_2     
-        28        916 33101  52215 10R  R9_2     
-        28        917 33101  51166 10L  R8_2     
-        28        918 33101  52210 10R  R9_2     
-        28        919 33101  51161 10L  R8_2     
-        28        920 33101  47904 10R  S9_5     
-        28        921 33101  47900 10L  S9_5     
-        28        922 33101  52256 10R  R9_2     
-        28        923 33101  52209 10L  R9_2     
-        28        924 33101  52232 10R  R9_2     
-        28        925 33101  52199 10L  R9_2     
-        28        926 33101  52238 10R  R9_2     
-        28        927 33101  51192 10L  R8_2     
-        28        928 33101  52236 10R  R9_2     
-        28        929 33101  51147 10L  R8_2     
-        28        930 33101  52261 10R  R9_2     
-        28        931 33101  51182 10L  R8_2     
-        28        932 33101  52226 10R  R9_2     
-        28        933 33101  51177 10L  R8_2     
-        28        934 33101  52221 10R  R9_2     
-        28        935 33101  51172 10L  R8_2     
-        28        936 33101  52216 10R  R9_2     
-        28        937 33101  51167 10L  R8_2     
-        28        938 33101  52211 10R  R9_2     
-        28        939 33101  51162 10L  R8_2     
-        28        940 33101  47905 10R  S9_5     
-        28        941 33101  47901 10L  S9_5     
-        28        942 33101  52257 10R  R9_2     
-        28        943 33101  45297 10L  R3_2     
-        28        944 33101  52247 10R  R9_2     
-        28        945 33101  52200 10L  R9_2     
-        28        946 33101  52242 10R  R9_2     
-        28        947 33101  51193 10L  R8_2     
-        28        948 33101  52237 10R  R9_2     
-        28        949 33101  51148 10L  R8_2     
-        28        950 33101  52252 10R  R9_2     
-        28        951 33101  51183 10L  R8_2     
-        28        952 33101  52227 10R  R9_2     
-        28        953 33101  51178 10L  R8_2     
-        28        954 33101  52222 10R  R9_2     
-        28        955 33101  51173 10L  R8_2     
-        28        956 33101  52217 10R  R9_2     
-        28        957 33101  51168 10L  R8_2     
-        28        958 33101  52212 10R  R9_2     
-        28        959 33101  51163 10L  R8_2     
-        28        960 33101  47906 10R  S9_5     
-        28        961 33101  47902 10L  S9_5     
-        28        962 33101  52258 10R  R9_2     
-        28        963 33101  47536 10L  R5_2     
-        28        964 33101  52248 10R  R9_2     
-        28        965 33101  52201 10L  R9_2     
-        28        966 33101  52243 10R  R9_2     
-        28        967 33101  51194 10L  R8_2     
-        28        968 33101  52234 10R  R9_2     
-        28        969 33101  51149 10L  R8_2     
-        28        970 33101  52263 10R  R9_2     
-        28        971 33101  51184 10L  R8_2     
-        28        972 33101  52228 10R  R9_2     
-        28        973 33101  51179 10L  R8_2     
-        28        974 33101  52224 10R  R9_2     
-        28        975 33101  51174 10L  R8_2     
-        28        976 33101  52218 10R  R9_2     
-        28        977 33101  51169 10L  R8_2     
-        28        978 33101  52213 10R  R9_2     
-        28        979 33101  51164 10L  R8_2     
-        28        980 33101  47907 10R  S9_5     
-        28        981 33101  47903 10L  S9_5     
-        28        982 33101  52254 10R  R9_2     
-        28        983 33101  47537 10L  R5_2     
-        28        984 33101  52249 10R  R9_2     
-        28        985 33101  52202 10L  R9_2     
-        28        986 33101  52244 10R  R9_2     
-        28        987 33101  51195 10L  R8_2     
-        28        988 33101  52239 10R  R9_2     
-        28        989 33101  51152 10L  R8_2     
-        28        990 33101  52264 10R  R9_2     
-        28        991 33101  51185 10L  R8_2     
-        28        992 33101  52229 10R  R9_2     
-        28        993 33101  51180 10L  R8_2     
-        28        994 33101  52250 10R  R9_2     
-        28        995 33101  51175 10L  R8_2     
-        28        996 33101  52219 10R  R9_2     
-        28        997 33101  51170 10L  R8_2     
-        28        998 33101  52214 10R  R9_2     
-        28        999 33101  51165 10L  R8_2     
-        28       1000 33101  47908 10R  S9_5     
-        28       1001 33101  38546 11L  S9_6     
-        28       1002 33101  52335 11R  R9_2     
-        28       1003 33101  45356 11L  R3_2     
-        28       1004 33101  52325 11R  R9_2     
-        28       1005 33101  52905 11L  R10_1    
-        28       1006 33101  53411 11R  R10_2    
-        28       1007 33101  52900 11L  R10_1    
-        28       1008 33101  52916 11R  R10_1    
-        28       1009 33101  52280 11L  R9_2     
-        28       1010 33101  52330 11R  R9_2     
-        28       1011 33101  52285 11L  R9_2     
-        28       1012 33101  52320 11R  R9_2     
-        28       1013 33101  52282 11L  R9_2     
-        28       1014 33101  52311 11R  R9_2     
-        28       1015 33101  52275 11L  R9_2     
-        28       1016 33101  52305 11R  R9_2     
-        28       1017 33101  52270 11L  R9_2     
-        28       1018 33101  52300 11R  R9_2     
-        28       1019 33101  52265 11L  R9_2     
-        28       1020 33101  28744 11R  P12      
-        28       1021 33101  38547 11L  S9_6     
-        28       1022 33101  52336 11R  R9_2     
-        28       1023 33101  52291 11L  R9_2     
-        28       1024 33101  52314 11R  R9_2     
-        28       1025 33101  52906 11L  R10_1    
-        28       1026 33101  53412 11R  R10_2    
-        28       1027 33101  52901 11L  R10_1    
-        28       1028 33101  52917 11R  R10_1    
-        28       1029 33101  52281 11L  R9_2     
-        28       1030 33101  52322 11R  R9_2     
-        28       1031 33101  52293 11L  R9_2     
-        28       1032 33101  52321 11R  R9_2     
-        28       1033 33101  52284 11L  R9_2     
-        28       1034 33101  52316 11R  R9_2     
-        28       1035 33101  52276 11L  R9_2     
-        28       1036 33101  52301 11R  R9_2     
-        28       1037 33101  52271 11L  R9_2     
-        28       1038 33101  52303 11R  R9_2     
-        28       1039 33101  52266 11L  R9_2     
-        28       1040 33101  27324 11R  S6_2b    
-        28       1041 33101  38548 11L  S9_6     
-        28       1042 33101  52337 11R  R9_2     
-        28       1043 33101  52292 11L  R9_2     
-        28       1044 33101  52327 11R  R9_2     
-        28       1045 33101  52907 11L  R10_1    
-        28       1046 33101  53413 11R  R10_2    
-        28       1047 33101  52902 11L  R10_1    
-        28       1048 33101  52918 11R  R10_1    
-        28       1049 33101  52295 11L  R9_2     
-        28       1050 33101  52332 11R  R9_2     
-        28       1051 33101  52287 11L  R9_2     
-        28       1052 33101  52312 11R  R9_2     
-        28       1053 33101  52297 11L  R9_2     
-        28       1054 33101  52317 11R  R9_2     
-        28       1055 33101  52277 11L  R9_2     
-        28       1056 33101  52307 11R  R9_2     
-        28       1057 33101  52272 11L  R9_2     
-        28       1058 33101  52304 11R  R9_2     
-        28       1059 33101  52267 11L  R9_2     
-        28       1060 33101  27317 11R  S6_2b    
-        28       1061 33101  38549 11L  S9_6     
-        28       1062 33101  52334 11R  R9_2     
-        28       1063 33101  52286 11L  R9_2     
-        28       1064 33101  52328 11R  R9_2     
-        28       1065 33101  52908 11L  R10_1    
-        28       1066 33101  53414 11R  R10_2    
-        28       1067 33101  52903 11L  R10_1    
-        28       1068 33101  52919 11R  R10_1    
-        28       1069 33101  52283 11L  R9_2     
-        28       1070 33101  52333 11R  R9_2     
-        28       1071 33101  52288 11L  R9_2     
-        28       1072 33101  52323 11R  R9_2     
-        28       1073 33101  52298 11L  R9_2     
-        28       1074 33101  52318 11R  R9_2     
-        28       1075 33101  52278 11L  R9_2     
-        28       1076 33101  52302 11R  R9_2     
-        28       1077 33101  52273 11L  R9_2     
-        28       1078 33101  52306 11R  R9_2     
-        28       1079 33101  52268 11L  R9_2     
-        28       1080 33101  27296 11R  S6_2b    
-        28       1081 33101  38550 11L  S9_6     
-        28       1082 33101  52339 11R  R9_2     
-        28       1083 33101  45347 11L  R3_2     
-        28       1084 33101  52329 11R  R9_2     
-        28       1085 33101  52909 11L  R10_1    
-        28       1086 33101  53415 11R  R10_2    
-        28       1087 33101  52904 11L  R10_1    
-        28       1088 33101  52920 11R  R10_1    
-        28       1089 33101  52296 11L  R9_2     
-        28       1090 33101  52338 11R  R9_2     
-        28       1091 33101  52294 11L  R9_2     
-        28       1092 33101  52324 11R  R9_2     
-        28       1093 33101  52299 11L  R9_2     
-        28       1094 33101  52319 11R  R9_2     
-        28       1095 33101  52279 11L  R9_2     
-        28       1096 33101  52309 11R  R9_2     
-        28       1097 33101  52274 11L  R9_2     
-        28       1098 33101  52308 11R  R9_2     
-        28       1099 33101  52269 11L  R9_2     
-        28       1100 33101  27294 11R  S6_2b    
-        28       1101 33101  26843 12L  S6_2     
-        28       1102 33101  51710 12R  R9_1     
-        28       1103 33101  53793 12L  R11_1    
-        28       1104 33101  53871 12R  R11_1    
-        28       1105 33101  53798 12L  R11_1    
-        28       1106 33101  53823 12R  R11_1    
-        28       1107 33101  53783 12L  R11_1    
-        28       1108 33101  53829 12R  R11_1    
-        28       1109 33101  53788 12L  R11_1    
-        28       1110 33101  53876 12R  R11_1    
-        28       1111 33101  53752 12L  R11_1    
-        28       1112 33101  53880 12R  R11_1    
-        28       1113 33101  53747 12L  R11_1    
-        28       1114 33101  53820 12R  R11_1    
-        28       1115 33101  53742 12L  R11_1    
-        28       1116 33101  53426 12R  R10_2    
-        28       1117 33101  53421 12L  R10_2    
-        28       1118 33101  53431 12R  R10_2    
-        28       1119 33101  53416 12L  R10_2    
-        28       1120 33101  27427 12R  S6_2b    
-        28       1121 33101  26844 12L  S6_2     
-        28       1122 33101  51711 12R  R9_1     
-        28       1123 33101  53784 12L  R11_1    
-        28       1124 33101  51723 12R  R9_1     
-        28       1125 33101  53799 12L  R11_1    
-        28       1126 33101  53826 12R  R11_1    
-        28       1127 33101  53794 12L  R11_1    
-        28       1128 33101  53889 12R  R11_1    
-        28       1129 33101  53789 12L  R11_1    
-        28       1130 33101  53872 12R  R11_1    
-        28       1131 33101  53753 12L  R11_1    
-        28       1132 33101  53828 12R  R11_1    
-        28       1133 33101  53748 12L  R11_1    
-        28       1134 33101  53821 12R  R11_1    
-        28       1135 33101  53743 12L  R11_1    
-        28       1136 33101  53427 12R  R10_2    
-        28       1137 33101  53422 12L  R10_2    
-        28       1138 33101  53432 12R  R10_2    
-        28       1139 33101  53417 12L  R10_2    
-        28       1140 33101  29397 12R  P13      
-        28       1141 33101  26845 12L  S6_2     
-        28       1142 33101  51719 12R  R9_1     
-        28       1143 33101  53795 12L  R11_1    
-        28       1144 33101  50022 12R  R7_2     
-        28       1145 33101  53800 12L  R11_1    
-        28       1146 33101  53879 12R  R11_1    
-        28       1147 33101  53785 12L  R11_1    
-        28       1148 33101  53886 12R  R11_1    
-        28       1149 33101  53790 12L  R11_1    
-        28       1150 33101  53877 12R  R11_1    
-        28       1151 33101  53749 12L  R11_1    
-        28       1152 33101  53882 12R  R11_1    
-        28       1153 33101  53757 12L  R11_1    
-        28       1154 33101  53822 12R  R11_1    
-        28       1155 33101  53751 12L  R11_1    
-        28       1156 33101  53428 12R  R10_2    
-        28       1157 33101  53423 12L  R10_2    
-        28       1158 33101  53430 12R  R10_2    
-        28       1159 33101  53418 12L  R10_2    
-        28       1160 33101  30677 12R  S7_2     
-        28       1161 33101  28769 12L  P12      
-        28       1162 33101  51722 12R  R9_1     
-        28       1163 33101  53796 12L  R11_1    
-        28       1164 33101  50038 12R  R7_2     
-        28       1165 33101  53801 12L  R11_1    
-        28       1166 33101  53881 12R  R11_1    
-        28       1167 33101  53786 12L  R11_1    
-        28       1168 33101  53885 12R  R11_1    
-        28       1169 33101  53791 12L  R11_1    
-        28       1170 33101  53874 12R  R11_1    
-        28       1171 33101  53750 12L  R11_1    
-        28       1172 33101  53883 12R  R11_1    
-        28       1173 33101  53759 12L  R11_1    
-        28       1174 33101  53824 12R  R11_1    
-        28       1175 33101  53745 12L  R11_1    
-        28       1176 33101  53429 12R  R10_2    
-        28       1177 33101  53424 12L  R10_2    
-        28       1178 33101  53434 12R  R10_2    
-        28       1179 33101  53419 12L  R10_2    
-        28       1180 33101  30679 12R  S7_2     
-        28       1181 33101  28791 12L  P12      
-        28       1182 33101  51724 12R  R9_1     
-        28       1183 33101  53797 12L  R11_1    
-        28       1184 33101  45485 12R  R3_2     
-        28       1185 33101  53802 12L  R11_1    
-        28       1186 33101  53888 12R  R11_1    
-        28       1187 33101  53787 12L  R11_1    
-        28       1188 33101  53873 12R  R11_1    
-        28       1189 33101  53792 12L  R11_1    
-        28       1190 33101  53875 12R  R11_1    
-        28       1191 33101  53756 12L  R11_1    
-        28       1192 33101  53884 12R  R11_1    
-        28       1193 33101  53754 12L  R11_1    
-        28       1194 33101  53825 12R  R11_1    
-        28       1195 33101  53746 12L  R11_1    
-        28       1196 33101  53433 12R  R10_2    
-        28       1197 33101  53425 12L  R10_2    
-        28       1198 33101  53435 12R  R10_2    
-        28       1199 33101  53420 12L  R10_2    
-        28       1200 33101  30692 12R  S7_2     
-        28       1201 33101  38576 13L  S9_6     
-        28       1202 33101  39199 13R  P17      
-        28       1203 33101  53451 13L  R10_2    
-        28       1204 33101  49034 13R  R6_2     
-        28       1205 33101  53461 13L  R10_2    
-        28       1206 33101  53476 13R  R10_2    
-        28       1207 33101  53456 13L  R10_2    
-        28       1208 33101  53486 13R  R10_2    
-        28       1209 33101  53440 13L  R10_2    
-        28       1210 33101  53481 13R  R10_2    
-        28       1211 33101  53446 13L  R10_2    
-        28       1212 33101  53496 13R  R10_2    
-        28       1213 33101  51756 13L  R9_1     
-        28       1214 33101  53466 13R  R10_2    
-        28       1215 33101  51757 13L  R9_1     
-        28       1216 33101  51779 13R  R9_1     
-        28       1217 33101  51750 13L  R9_1     
-        28       1218 33101  51769 13R  R9_1     
-        28       1219 33101  51760 13L  R9_1     
-        28       1220 33101  26846 13R  S6_2     
-        28       1221 33101  38577 13L  S9_6     
-        28       1222 33101  39200 13R  P17      
-        28       1223 33101  53452 13L  R10_2    
-        28       1224 33101  53497 13R  R10_2    
-        28       1225 33101  53462 13L  R10_2    
-        28       1226 33101  53477 13R  R10_2    
-        28       1227 33101  53457 13L  R10_2    
-        28       1228 33101  53475 13R  R10_2    
-        28       1229 33101  53442 13L  R10_2    
-        28       1230 33101  53482 13R  R10_2    
-        28       1231 33101  53447 13L  R10_2    
-        28       1232 33101  53492 13R  R10_2    
-        28       1233 33101  51745 13L  R9_1     
-        28       1234 33101  53467 13R  R10_2    
-        28       1235 33101  51736 13L  R9_1     
-        28       1236 33101  51780 13R  R9_1     
-        28       1237 33101  51751 13L  R9_1     
-        28       1238 33101  51770 13R  R9_1     
-        28       1239 33101  51761 13L  R9_1     
-        28       1240 33101  27917 13R  S6_3a    
-        28       1241 33101  38578 13L  S9_6     
-        28       1242 33101  53472 13R  R10_2    
-        28       1243 33101  53453 13L  R10_2    
-        28       1244 33101  53471 13R  R10_2    
-        28       1245 33101  53463 13L  R10_2    
-        28       1246 33101  53478 13R  R10_2    
-        28       1247 33101  53436 13L  R10_2    
-        28       1248 33101  53488 13R  R10_2    
-        28       1249 33101  53443 13L  R10_2    
-        28       1250 33101  53483 13R  R10_2    
-        28       1251 33101  53448 13L  R10_2    
-        28       1252 33101  53493 13R  R10_2    
-        28       1253 33101  51747 13L  R9_1     
-        28       1254 33101  53468 13R  R10_2    
-        28       1255 33101  51739 13L  R9_1     
-        28       1256 33101  51785 13R  R9_1     
-        28       1257 33101  51752 13L  R9_1     
-        28       1258 33101  51766 13R  R9_1     
-        28       1259 33101  51762 13L  R9_1     
-        28       1260 33101  27983 13R  S6_3a    
-        28       1261 33101  38579 13L  S9_6     
-        28       1262 33101  53484 13R  R10_2    
-        28       1263 33101  53454 13L  R10_2    
-        28       1264 33101  53499 13R  R10_2    
-        28       1265 33101  53464 13L  R10_2    
-        28       1266 33101  53479 13R  R10_2    
-        28       1267 33101  53459 13L  R10_2    
-        28       1268 33101  53489 13R  R10_2    
-        28       1269 33101  53444 13L  R10_2    
-        28       1270 33101  53474 13R  R10_2    
-        28       1271 33101  53449 13L  R10_2    
-        28       1272 33101  53494 13R  R10_2    
-        28       1273 33101  51748 13L  R9_1     
-        28       1274 33101  53469 13R  R10_2    
-        28       1275 33101  51740 13L  R9_1     
-        28       1276 33101  51788 13R  R9_1     
-        28       1277 33101  51754 13L  R9_1     
-        28       1278 33101  51789 13R  R9_1     
-        28       1279 33101  51763 13L  R9_1     
-        28       1280 33101  28836 13R  P12      
-        28       1281 33101  38580 13L  S9_6     
-        28       1282 33101  53487 13R  R10_2    
-        28       1283 33101  53455 13L  R10_2    
-        28       1284 33101  53500 13R  R10_2    
-        28       1285 33101  53465 13L  R10_2    
-        28       1286 33101  53480 13R  R10_2    
-        28       1287 33101  53438 13L  R10_2    
-        28       1288 33101  53490 13R  R10_2    
-        28       1289 33101  53445 13L  R10_2    
-        28       1290 33101  53485 13R  R10_2    
-        28       1291 33101  53450 13L  R10_2    
-        28       1292 33101  53495 13R  R10_2    
-        28       1293 33101  51749 13L  R9_1     
-        28       1294 33101  53470 13R  R10_2    
-        28       1295 33101  51741 13L  R9_1     
-        28       1296 33101  51772 13R  R9_1     
-        28       1297 33101  51755 13L  R9_1     
-        28       1298 33101  51773 13R  R9_1     
-        28       1299 33101  52340 13L  R9_2     
-        28       1300 33101  28852 13R  P12      
-        28       1301 33101  27017 14L  S6_2b    
-        28       1302 33101  38468 14R  S9_6     
-        28       1303 33101  50251 14L  R8_1     
-        28       1304 33101  50271 14R  R8_1     
-        28       1305 33101  51841 14L  R9_2     
-        28       1306 33101  51898 14R  R9_2     
-        28       1307 33101  51851 14L  R9_2     
-        28       1308 33101  51906 14R  R9_2     
-        28       1309 33101  51856 14L  R9_2     
-        28       1310 33101  51911 14R  R9_2     
-        28       1311 33101  51861 14L  R9_2     
-        28       1312 33101  51916 14R  R9_2     
-        28       1313 33101  51850 14L  R9_2     
-        28       1314 33101  51921 14R  R9_2     
-        28       1315 33101  51872 14L  R9_2     
-        28       1316 33101  51926 14R  R9_2     
-        28       1317 33101  51843 14L  R9_2     
-        28       1318 33101  51932 14R  R9_2     
-        28       1319 33101  51878 14L  R9_2     
-        28       1320 33101  27038 14R  S6_2b    
-        28       1321 33101  27020 14L  S6_2b    
-        28       1322 33101  38471 14R  S9_6     
-        28       1323 33101  50252 14L  R8_1     
-        28       1324 33101  50268 14R  R8_1     
-        28       1325 33101  51842 14L  R9_2     
-        28       1326 33101  51902 14R  R9_2     
-        28       1327 33101  51852 14L  R9_2     
-        28       1328 33101  51907 14R  R9_2     
-        28       1329 33101  51857 14L  R9_2     
-        28       1330 33101  51912 14R  R9_2     
-        28       1331 33101  51862 14L  R9_2     
-        28       1332 33101  51917 14R  R9_2     
-        28       1333 33101  51866 14L  R9_2     
-        28       1334 33101  51922 14R  R9_2     
-        28       1335 33101  51874 14L  R9_2     
-        28       1336 33101  51927 14R  R9_2     
-        28       1337 33101  51846 14L  R9_2     
-        28       1338 33101  51931 14R  R9_2     
-        28       1339 33101  51879 14L  R9_2     
-        28       1340 33101  27039 14R  S6_2b    
-        28       1341 33101  27023 14L  S6_2b    
-        28       1342 33101  38472 14R  S9_6     
-        28       1343 33101  50253 14L  R8_1     
-        28       1344 33101  50269 14R  R8_1     
-        28       1345 33101  51844 14L  R9_2     
-        28       1346 33101  51903 14R  R9_2     
-        28       1347 33101  51853 14L  R9_2     
-        28       1348 33101  51908 14R  R9_2     
-        28       1349 33101  51858 14L  R9_2     
-        28       1350 33101  51913 14R  R9_2     
-        28       1351 33101  51863 14L  R9_2     
-        28       1352 33101  51918 14R  R9_2     
-        28       1353 33101  51868 14L  R9_2     
-        28       1354 33101  51923 14R  R9_2     
-        28       1355 33101  51875 14L  R9_2     
-        28       1356 33101  51928 14R  R9_2     
-        28       1357 33101  51848 14L  R9_2     
-        28       1358 33101  51925 14R  R9_2     
-        28       1359 33101  51880 14L  R9_2     
-        28       1360 33101  27042 14R  S6_2b    
-        28       1361 33101  27032 14L  S6_2b    
-        28       1362 33101  38474 14R  S9_6     
-        28       1363 33101  50254 14L  R8_1     
-        28       1364 33101  50270 14R  R8_1     
-        28       1365 33101  51845 14L  R9_2     
-        28       1366 33101  51904 14R  R9_2     
-        28       1367 33101  51854 14L  R9_2     
-        28       1368 33101  51909 14R  R9_2     
-        28       1369 33101  51859 14L  R9_2     
-        28       1370 33101  51914 14R  R9_2     
-        28       1371 33101  51864 14L  R9_2     
-        28       1372 33101  51919 14R  R9_2     
-        28       1373 33101  51869 14L  R9_2     
-        28       1374 33101  51924 14R  R9_2     
-        28       1375 33101  51876 14L  R9_2     
-        28       1376 33101  51929 14R  R9_2     
-        28       1377 33101  51867 14L  R9_2     
-        28       1378 33101  51901 14R  R9_2     
-        28       1379 33101  51881 14L  R9_2     
-        28       1380 33101  27043 14R  S6_2b    
-        28       1381 33101  27502 14L  S6_3     
-        28       1382 33101  39147 14R  P017     
-        28       1383 33101  51847 14L  R9_2     
-        28       1384 33101  51897 14R  R9_2     
-        28       1385 33101  51849 14L  R9_2     
-        28       1386 33101  51905 14R  R9_2     
-        28       1387 33101  51855 14L  R9_2     
-        28       1388 33101  51910 14R  R9_2     
-        28       1389 33101  51860 14L  R9_2     
-        28       1390 33101  51899 14R  R9_2     
-        28       1391 33101  51865 14L  R9_2     
-        28       1392 33101  51920 14R  R9_2     
-        28       1393 33101  51871 14L  R9_2     
-        28       1394 33101  51915 14R  R9_2     
-        28       1395 33101  51877 14L  R9_2     
-        28       1396 33101  51930 14R  R9_2     
-        28       1397 33101  51870 14L  R9_2     
-        28       1398 33101  51896 14R  R9_2     
-        28       1399 33101  51873 14L  R9_2     
-        28       1400 33101  27505 14R  S6_3     
-        28       1401 33101  27048 15L  S6_2b    
-        28       1402 33101  41122 15R  S10_5    
-        28       1403 33101  51951 15L  R9_2     
-        28       1404 33101  50341 15R  R8_1     
-        28       1405 33101  51956 15L  R9_2     
-        28       1406 33101  52006 15R  R9_2     
-        28       1407 33101  51961 15L  R9_2     
-        28       1408 33101  52011 15R  R9_2     
-        28       1409 33101  51966 15L  R9_2     
-        28       1410 33101  52016 15R  R9_2     
-        28       1411 33101  51971 15L  R9_2     
-        28       1412 33101  50340 15R  R8_1     
-        28       1413 33101  51976 15L  R9_2     
-        28       1414 33101  52026 15R  R9_2     
-        28       1415 33101  51981 15L  R9_2     
-        28       1416 33101  52031 15R  R9_2     
-        28       1417 33101  51986 15L  R9_2     
-        28       1418 33101  52036 15R  R9_2     
-        28       1419 33101  32847 15L  S3       
-        28       1420 33101  27101 15R  S6_2b    
-        28       1421 33101  27052 15L  S6_2b    
-        28       1422 33101  41916 15R  P18      
-        28       1423 33101  51952 15L  R9_2     
-        28       1424 33101  50342 15R  R8_1     
-        28       1425 33101  51957 15L  R9_2     
-        28       1426 33101  52007 15R  R9_2     
-        28       1427 33101  51962 15L  R9_2     
-        28       1428 33101  52012 15R  R9_2     
-        28       1429 33101  51967 15L  R9_2     
-        28       1430 33101  52017 15R  R9_2     
-        28       1431 33101  51972 15L  R9_2     
-        28       1432 33101  52022 15R  R9_2     
-        28       1433 33101  51977 15L  R9_2     
-        28       1434 33101  52027 15R  R9_2     
-        28       1435 33101  51982 15L  R9_2     
-        28       1436 33101  52032 15R  R9_2     
-        28       1437 33101  51987 15L  R9_2     
-        28       1438 33101  52037 15R  R9_2     
-        28       1439 33101  35749 15L  P15_2    
-        28       1440 33101  27102 15R  S6_2b    
-        28       1441 33101  27054 15L  S6_2b    
-        28       1442 33101  39341 15R  S10_1    
-        28       1443 33101  51953 15L  R9_2     
-        28       1444 33101  50343 15R  R8_1     
-        28       1445 33101  51958 15L  R9_2     
-        28       1446 33101  52008 15R  R9_2     
-        28       1447 33101  51963 15L  R9_2     
-        28       1448 33101  52013 15R  R9_2     
-        28       1449 33101  51968 15L  R9_2     
-        28       1450 33101  52018 15R  R9_2     
-        28       1451 33101  51973 15L  R9_2     
-        28       1452 33101  52023 15R  R9_2     
-        28       1453 33101  51978 15L  R9_2     
-        28       1454 33101  52028 15R  R9_2     
-        28       1455 33101  51983 15L  R9_2     
-        28       1456 33101  52033 15R  R9_2     
-        28       1457 33101  51988 15L  R9_2     
-        28       1458 33101  52038 15R  R9_2     
-        28       1459 33101  38793 15L  P016     
-        28       1460 33101  27104 15R  S6_2b    
-        28       1461 33101  27058 15L  S6_2b    
-        28       1462 33101  39350 15R  S10_1    
-        28       1463 33101  51954 15L  R9_2     
-        28       1464 33101  50344 15R  R8_1     
-        28       1465 33101  51959 15L  R9_2     
-        28       1466 33101  52009 15R  R9_2     
-        28       1467 33101  51964 15L  R9_2     
-        28       1468 33101  52014 15R  R9_2     
-        28       1469 33101  51969 15L  R9_2     
-        28       1470 33101  52019 15R  R9_2     
-        28       1471 33101  51974 15L  R9_2     
-        28       1472 33101  52024 15R  R9_2     
-        28       1473 33101  51979 15L  R9_2     
-        28       1474 33101  52029 15R  R9_2     
-        28       1475 33101  51984 15L  R9_2     
-        28       1476 33101  52034 15R  R9_2     
-        28       1477 33101  50307 15L  R8_1     
-        28       1478 33101  50346 15R  R8_1     
-        28       1479 33101  38796 15L  P016     
-        28       1480 33101  27108 15R  S6_2b    
-        28       1481 33101  27059 15L  S6_2b    
-        28       1482 33101  39353 15R  S10_1    
-        28       1483 33101  51955 15L  R9_2     
-        28       1484 33101  50345 15R  R8_1     
-        28       1485 33101  51960 15L  R9_2     
-        28       1486 33101  52010 15R  R9_2     
-        28       1487 33101  51965 15L  R9_2     
-        28       1488 33101  52015 15R  R9_2     
-        28       1489 33101  51970 15L  R9_2     
-        28       1490 33101  52020 15R  R9_2     
-        28       1491 33101  51975 15L  R9_2     
-        28       1492 33101  52025 15R  R9_2     
-        28       1493 33101  51980 15L  R9_2     
-        28       1494 33101  52030 15R  R9_2     
-        28       1495 33101  51985 15L  R9_2     
-        28       1496 33101  52035 15R  R9_2     
-        28       1497 33101  50308 15L  R8_1     
-        28       1498 33101  50347 15R  R8_1     
-        28       1499 33101  39149 15L  P017     
-        28       1500 33101  27109 15R  S6_2b    
-        28       1501 33101  38806 16L  P016     
-        28       1502 33101  36802 16R  S9_2     
-        28       1503 33101  49225 16L  R7_1     
-        28       1504 33101  49281 16R  R7_1     
-        28       1505 33101  49246 16L  R7_1     
-        28       1506 33101  50381 16R  R8_1     
-        28       1507 33101  49251 16L  R7_1     
-        28       1508 33101  50386 16R  R8_1     
-        28       1509 33101  49256 16L  R7_1     
-        28       1510 33101  50391 16R  R8_1     
-        28       1511 33101  50356 16L  R8_1     
-        28       1512 33101  50396 16R  R8_1     
-        28       1513 33101  50361 16L  R8_1     
-        28       1514 33101  50401 16R  R8_1     
-        28       1515 33101  50366 16L  R8_1     
-        28       1516 33101  50406 16R  R8_1     
-        28       1517 33101  50371 16L  R8_1     
-        28       1518 33101  49286 16R  R7_1     
-        28       1519 33101  50370 16L  R8_1     
-        28       1520 33101  28301 16R  S6_3b    
-        28       1521 33101  38807 16L  P016     
-        28       1522 33101  49284 16R  R7_1     
-        28       1523 33101  49241 16L  R7_1     
-        28       1524 33101  49282 16R  R7_1     
-        28       1525 33101  49247 16L  R7_1     
-        28       1526 33101  50382 16R  R8_1     
-        28       1527 33101  49252 16L  R7_1     
-        28       1528 33101  50387 16R  R8_1     
-        28       1529 33101  49257 16L  R7_1     
-        28       1530 33101  50392 16R  R8_1     
-        28       1531 33101  50357 16L  R8_1     
-        28       1532 33101  50397 16R  R8_1     
-        28       1533 33101  50362 16L  R8_1     
-        28       1534 33101  50402 16R  R8_1     
-        28       1535 33101  50367 16L  R8_1     
-        28       1536 33101  50407 16R  R8_1     
-        28       1537 33101  50372 16L  R8_1     
-        28       1538 33101  50411 16R  R8_1     
-        28       1539 33101  50352 16L  R8_1     
-        28       1540 33101  28317 16R  S6_3b    
-        28       1541 33101  30908 16L  S7_3     
-        28       1542 33101  49278 16R  R7_1     
-        28       1543 33101  49243 16L  R7_1     
-        28       1544 33101  49283 16R  R7_1     
-        28       1545 33101  49248 16L  R7_1     
-        28       1546 33101  50383 16R  R8_1     
-        28       1547 33101  49253 16L  R7_1     
-        28       1548 33101  50388 16R  R8_1     
-        28       1549 33101  50348 16L  R8_1     
-        28       1550 33101  50393 16R  R8_1     
-        28       1551 33101  50358 16L  R8_1     
-        28       1552 33101  50398 16R  R8_1     
-        28       1553 33101  50363 16L  R8_1     
-        28       1554 33101  50403 16R  R8_1     
-        28       1555 33101  50368 16L  R8_1     
-        28       1556 33101  50408 16R  R8_1     
-        28       1557 33101  50373 16L  R8_1     
-        28       1558 33101  49288 16R  R7_1     
-        28       1559 33101  50353 16L  R8_1     
-        28       1560 33101  28325 16R  S6_3b    
-        28       1561 33101  37089 16L  S9_3     
-        28       1562 33101  49279 16R  R7_1     
-        28       1563 33101  49244 16L  R7_1     
-        28       1564 33101  49290 16R  R7_1     
-        28       1565 33101  49258 16L  R7_1     
-        28       1566 33101  50384 16R  R8_1     
-        28       1567 33101  49254 16L  R7_1     
-        28       1568 33101  50389 16R  R8_1     
-        28       1569 33101  50349 16L  R8_1     
-        28       1570 33101  50394 16R  R8_1     
-        28       1571 33101  50359 16L  R8_1     
-        28       1572 33101  50399 16R  R8_1     
-        28       1573 33101  50364 16L  R8_1     
-        28       1574 33101  50404 16R  R8_1     
-        28       1575 33101  50369 16L  R8_1     
-        28       1576 33101  50409 16R  R8_1     
-        28       1577 33101  50354 16L  R8_1     
-        28       1578 33101  49289 16R  R7_1     
-        28       1579 33101  37083 16L  S9_3     
-        28       1580 33101  28339 16R  S6_3b    
-        28       1581 33101  37090 16L  S9_3     
-        28       1582 33101  49280 16R  R7_1     
-        28       1583 33101  49245 16L  R7_1     
-        28       1584 33101  49285 16R  R7_1     
-        28       1585 33101  49250 16L  R7_1     
-        28       1586 33101  50385 16R  R8_1     
-        28       1587 33101  49255 16L  R7_1     
-        28       1588 33101  50390 16R  R8_1     
-        28       1589 33101  50350 16L  R8_1     
-        28       1590 33101  50395 16R  R8_1     
-        28       1591 33101  50360 16L  R8_1     
-        28       1592 33101  50400 16R  R8_1     
-        28       1593 33101  50365 16L  R8_1     
-        28       1594 33101  50405 16R  R8_1     
-        28       1595 33101  50351 16L  R8_1     
-        28       1596 33101  50410 16R  R8_1     
-        28       1597 33101  50355 16L  R8_1     
-        28       1598 33101  50412 16R  R8_1     
-        28       1599 33101  37087 16L  S9_3     
-        28       1600 33101  28342 16R  S6_3b    
-        28       1601 33101  27132 17L  S6_2b    
-        28       1602 33101  27192 17R  S6_2b    
-        28       1603 33101  36492 17L  S9_1     
-        28       1604 33101  38833 17R  P016     
-        28       1605 33101  37109 17L  S9_3     
-        28       1606 33101  36553 17R  S9_1     
-        28       1607 33101  39486 17L  S10_1    
-        28       1608 33101  36578 17R  S9_1     
-        28       1609 33101  39491 17L  S10_1    
-        28       1610 33101  37115 17R  S9_3     
-        28       1611 33101  39496 17L  S10_1    
-        28       1612 33101  48760 17R  R6_2     
-        28       1613 33101  39501 17L  S10_1    
-        28       1614 33101  52081 17R  R9_2     
-        28       1615 33101  37108 17L  S9_3     
-        28       1616 33101  52086 17R  R9_2     
-        28       1617 33101  44777 17L  R3_1     
-        28       1618 33101  52091 17R  R9_2     
-        28       1619 33101  48756 17L  R6_2     
-        28       1620 33101  52098 17R  R9_2     
-        28       1621 33101  27139 17L  S6_2b    
-        28       1622 33101  27224 17R  S6_2b    
-        28       1623 33101  37103 17L  S9_3     
-        28       1624 33101  38834 17R  P016     
-        28       1625 33101  39482 17L  S10_1    
-        28       1626 33101  36555 17R  S9_1     
-        28       1627 33101  39487 17L  S10_1    
-        28       1628 33101  36579 17R  S9_1     
-        28       1629 33101  39492 17L  S10_1    
-        28       1630 33101  37117 17R  S9_3     
-        28       1631 33101  39497 17L  S10_1    
-        28       1632 33101  48761 17R  R6_2     
-        28       1633 33101  39502 17L  S10_1    
-        28       1634 33101  52082 17R  R9_2     
-        28       1635 33101  39849 17L  S10_2    
-        28       1636 33101  52087 17R  R9_2     
-        28       1637 33101  44787 17L  R3_1     
-        28       1638 33101  52092 17R  R9_2     
-        28       1639 33101  48759 17L  R6_2     
-        28       1640 33101  40329 17R  S10_3    
-        28       1641 33101  27143 17L  S6_2b    
-        28       1642 33101  28456 17R  S6_3b    
-        28       1643 33101  37104 17L  S9_3     
-        28       1644 33101  39152 17R  P017     
-        28       1645 33101  39483 17L  S10_1    
-        28       1646 33101  36556 17R  S9_1     
-        28       1647 33101  39488 17L  S10_1    
-        28       1648 33101  36580 17R  S9_1     
-        28       1649 33101  39493 17L  S10_1    
-        28       1650 33101  39517 17R  S10_1    
-        28       1651 33101  39498 17L  S10_1    
-        28       1652 33101  48762 17R  R6_2     
-        28       1653 33101  39503 17L  S10_1    
-        28       1654 33101  52083 17R  R9_2     
-        28       1655 33101  39850 17L  S10_2    
-        28       1656 33101  52088 17R  R9_2     
-        28       1657 33101  44800 17L  R3_1     
-        28       1658 33101  52093 17R  R9_2     
-        28       1659 33101  44815 17L  R3_1     
-        28       1660 33101  39158 17R  P017     
-        28       1661 33101  27154 17L  S6_2b    
-        28       1662 33101  32630 17R  P14      
-        28       1663 33101  37106 17L  S9_3     
-        28       1664 33101  39157 17R  P017     
-        28       1665 33101  39484 17L  S10_1    
-        28       1666 33101  36559 17R  S9_1     
-        28       1667 33101  39489 17L  S10_1    
-        28       1668 33101  36583 17R  S9_1     
-        28       1669 33101  39494 17L  S10_1    
-        28       1670 33101  44846 17R  R3_1     
-        28       1671 33101  39499 17L  S10_1    
-        28       1672 33101  52096 17R  R9_2     
-        28       1673 33101  39504 17L  S10_1    
-        28       1674 33101  52084 17R  R9_2     
-        28       1675 33101  41945 17L  P18      
-        28       1676 33101  52089 17R  R9_2     
-        28       1677 33101  44808 17L  R3_1     
-        28       1678 33101  52094 17R  R9_2     
-        28       1679 33101  44831 17L  R3_1     
-        28       1680 33101  30084 17R  S7_1     
-        28       1681 33101  27156 17L  S6_2b    
-        28       1682 33101  32636 17R  P14      
-        28       1683 33101  37107 17L  S9_3     
-        28       1684 33101  39161 17R  P017     
-        28       1685 33101  39485 17L  S10_1    
-        28       1686 33101  36571 17R  S9_1     
-        28       1687 33101  39490 17L  S10_1    
-        28       1688 33101  36584 17R  S9_1     
-        28       1689 33101  39495 17L  S10_1    
-        28       1690 33101  44895 17R  R3_1     
-        28       1691 33101  39500 17L  S10_1    
-        28       1692 33101  52097 17R  R9_2     
-        28       1693 33101  39505 17L  S10_1    
-        28       1694 33101  52085 17R  R9_2     
-        28       1695 33101  44775 17L  R3_1     
-        28       1696 33101  52090 17R  R9_2     
-        28       1697 33101  44812 17L  R3_1     
-        28       1698 33101  52095 17R  R9_2     
-        28       1699 33101  27157 17L  S6_2b    
-        28       1700 33101  34152 17R  S8_3     
-        29          1 33101  33813 1L   S8_3     
-        29          2 33101  52391 1R   R10_1    
-        29          3 33101  52922 1L   R10_2    
-        29          4 33101  52396 1R   R10_1    
-        29          5 33101  52926 1L   R10_2    
-        29          6 33101  52951 1R   R10_2    
-        29          7 33101  52931 1L   R10_2    
-        29          8 33101  52956 1R   R10_2    
-        29          9 33101  52936 1L   R10_2    
-        29         10 33101  52961 1R   R10_2    
-        29         11 33101  52366 1L   R10_1    
-        29         12 33101  52966 1R   R10_2    
-        29         13 33101  52941 1L   R10_2    
-        29         14 33101  52971 1R   R10_2    
-        29         15 33101  53506 1L   R11_1    
-        29         16 33101  52976 1R   R10_2    
-        29         17 33101  53511 1L   R11_1    
-        29         18 33101  52387 1R   R10_1    
-        29         19 33101  38916 1L   P017     
-        29         20 33101  35052 1R   S8_5     
-        29         21 33101  35043 1L   S8_5     
-        29         22 33101  52392 1R   R10_1    
-        29         23 33101  51800 1L   R9_2     
-        29         24 33101  52947 1R   R10_2    
-        29         25 33101  52927 1L   R10_2    
-        29         26 33101  52952 1R   R10_2    
-        29         27 33101  52932 1L   R10_2    
-        29         28 33101  52957 1R   R10_2    
-        29         29 33101  52937 1L   R10_2    
-        29         30 33101  52962 1R   R10_2    
-        29         31 33101  52367 1L   R10_1    
-        29         32 33101  52967 1R   R10_2    
-        29         33 33101  52942 1L   R10_2    
-        29         34 33101  52972 1R   R10_2    
-        29         35 33101  53507 1L   R11_1    
-        29         36 33101  52977 1R   R10_2    
-        29         37 33101  53512 1L   R11_1    
-        29         38 33101  52388 1R   R10_1    
-        29         39 33101  53501 1L   R11_1    
-        29         40 33101  38307 1R   S9_6     
-        29         41 33101  41001 1L   S10_5    
-        29         42 33101  52393 1R   R10_1    
-        29         43 33101  52368 1L   R10_1    
-        29         44 33101  52948 1R   R10_2    
-        29         45 33101  52928 1L   R10_2    
-        29         46 33101  52953 1R   R10_2    
-        29         47 33101  52933 1L   R10_2    
-        29         48 33101  52958 1R   R10_2    
-        29         49 33101  52938 1L   R10_2    
-        29         50 33101  52963 1R   R10_2    
-        29         51 33101  52946 1L   R10_2    
-        29         52 33101  52968 1R   R10_2    
-        29         53 33101  52943 1L   R10_2    
-        29         54 33101  52973 1R   R10_2    
-        29         55 33101  53508 1L   R11_1    
-        29         56 33101  52978 1R   R10_2    
-        29         57 33101  53513 1L   R11_1    
-        29         58 33101  52389 1R   R10_1    
-        29         59 33101  53503 1L   R11_1    
-        29         60 33101  38715 1R   P016     
-        29         61 33101  41801 1L   P18      
-        29         62 33101  52394 1R   R10_1    
-        29         63 33101  52369 1L   R10_1    
-        29         64 33101  52949 1R   R10_2    
-        29         65 33101  52929 1L   R10_2    
-        29         66 33101  52954 1R   R10_2    
-        29         67 33101  52934 1L   R10_2    
-        29         68 33101  52959 1R   R10_2    
-        29         69 33101  52939 1L   R10_2    
-        29         70 33101  52964 1R   R10_2    
-        29         71 33101  52924 1L   R10_2    
-        29         72 33101  52969 1R   R10_2    
-        29         73 33101  52944 1L   R10_2    
-        29         74 33101  52974 1R   R10_2    
-        29         75 33101  53509 1L   R11_1    
-        29         76 33101  52979 1R   R10_2    
-        29         77 33101  53514 1L   R11_1    
-        29         78 33101  52390 1R   R10_1    
-        29         79 33101  53504 1L   R11_1    
-        29         80 33101  38719 1R   P016     
-        29         81 33101  42503 1L   R1_1     
-        29         82 33101  52395 1R   R10_1    
-        29         83 33101  52923 1L   R10_2    
-        29         84 33101  52950 1R   R10_2    
-        29         85 33101  52930 1L   R10_2    
-        29         86 33101  52955 1R   R10_2    
-        29         87 33101  52935 1L   R10_2    
-        29         88 33101  52960 1R   R10_2    
-        29         89 33101  52940 1L   R10_2    
-        29         90 33101  52965 1R   R10_2    
-        29         91 33101  52925 1L   R10_2    
-        29         92 33101  52970 1R   R10_2    
-        29         93 33101  52945 1L   R10_2    
-        29         94 33101  52975 1R   R10_2    
-        29         95 33101  53510 1L   R11_1    
-        29         96 33101  52980 1R   R10_2    
-        29         97 33101  53515 1L   R11_1    
-        29         98 33101  52431 1R   R10_1    
-        29         99 33101  53505 1L   R11_1    
-        29        100 33101  38721 1R   P016     
-        29        101 33101  30124 2L   S7_2     
-        29        102 33101  52441 2R   R10_1    
-        29        103 33101  52416 2L   R10_1    
-        29        104 33101  53001 2R   R10_2    
-        29        105 33101  52421 2L   R10_1    
-        29        106 33101  53006 2R   R10_2    
-        29        107 33101  52981 2L   R10_2    
-        29        108 33101  53011 2R   R10_2    
-        29        109 33101  52986 2L   R10_2    
-        29        110 33101  53021 2R   R10_2    
-        29        111 33101  52991 2L   R10_2    
-        29        112 33101  53566 2R   R11_1    
-        29        113 33101  52996 2L   R10_2    
-        29        114 33101  53561 2R   R11_1    
-        29        115 33101  53536 2L   R11_1    
-        29        116 33101  53551 2R   R11_1    
-        29        117 33101  37555 2L   S9_4     
-        29        118 33101  30180 2R   S7_2     
-        29        119 33101  53538 2L   R11_1    
-        29        120 33101  53556 2R   R11_1    
-        29        121 33101  31894 2L   S07_5    
-        29        122 33101  53017 2R   R10_2    
-        29        123 33101  52417 2L   R10_1    
-        29        124 33101  53002 2R   R10_2    
-        29        125 33101  52422 2L   R10_1    
-        29        126 33101  53007 2R   R10_2    
-        29        127 33101  52982 2L   R10_2    
-        29        128 33101  53012 2R   R10_2    
-        29        129 33101  52987 2L   R10_2    
-        29        130 33101  53022 2R   R10_2    
-        29        131 33101  52992 2L   R10_2    
-        29        132 33101  53567 2R   R11_1    
-        29        133 33101  52997 2L   R10_2    
-        29        134 33101  53562 2R   R11_1    
-        29        135 33101  53537 2L   R11_1    
-        29        136 33101  53552 2R   R11_1    
-        29        137 33101  38724 2L   P016     
-        29        138 33101  31975 2R   S07_5    
-        29        139 33101  52415 2L   R10_1    
-        29        140 33101  53557 2R   R11_1    
-        29        141 33101  33931 2L   S8_3     
-        29        142 33101  53018 2R   R10_2    
-        29        143 33101  52418 2L   R10_1    
-        29        144 33101  53003 2R   R10_2    
-        29        145 33101  52423 2L   R10_1    
-        29        146 33101  53008 2R   R10_2    
-        29        147 33101  52983 2L   R10_2    
-        29        148 33101  53013 2R   R10_2    
-        29        149 33101  52988 2L   R10_2    
-        29        150 33101  53023 2R   R10_2    
-        29        151 33101  52993 2L   R10_2    
-        29        152 33101  53568 2R   R11_1    
-        29        153 33101  52998 2L   R10_2    
-        29        154 33101  53563 2R   R11_1    
-        29        155 33101  53533 2L   R11_1    
-        29        156 33101  53553 2R   R11_1    
-        29        157 33101  38946 2L   P017     
-        29        158 33101  32316 2R   P14      
-        29        159 33101  53541 2L   R11_1    
-        29        160 33101  52451 2R   R10_1    
-        29        161 33101  35097 2L   S8_5     
-        29        162 33101  53019 2R   R10_2    
-        29        163 33101  52419 2L   R10_1    
-        29        164 33101  53004 2R   R10_2    
-        29        165 33101  52424 2L   R10_1    
-        29        166 33101  53009 2R   R10_2    
-        29        167 33101  52984 2L   R10_2    
-        29        168 33101  53014 2R   R10_2    
-        29        169 33101  52989 2L   R10_2    
-        29        170 33101  53024 2R   R10_2    
-        29        171 33101  52994 2L   R10_2    
-        29        172 33101  53569 2R   R11_1    
-        29        173 33101  52414 2L   R10_1    
-        29        174 33101  53564 2R   R11_1    
-        29        175 33101  53534 2L   R11_1    
-        29        176 33101  53554 2R   R11_1    
-        29        177 33101  38947 2L   P017     
-        29        178 33101  33972 2R   S8_3     
-        29        179 33101  53542 2L   R11_1    
-        29        180 33101  53549 2R   R11_1    
-        29        181 33101  35101 2L   S8_5     
-        29        182 33101  53020 2R   R10_2    
-        29        183 33101  52420 2L   R10_1    
-        29        184 33101  53005 2R   R10_2    
-        29        185 33101  52425 2L   R10_1    
-        29        186 33101  53010 2R   R10_2    
-        29        187 33101  52985 2L   R10_2    
-        29        188 33101  53015 2R   R10_2    
-        29        189 33101  52990 2L   R10_2    
-        29        190 33101  53025 2R   R10_2    
-        29        191 33101  51303 2L   R9_1     
-        29        192 33101  52452 2R   R10_1    
-        29        193 33101  53000 2L   R10_2    
-        29        194 33101  53565 2R   R11_1    
-        29        195 33101  53535 2L   R11_1    
-        29        196 33101  53555 2R   R11_1    
-        29        197 33101  38948 2L   P017     
-        29        198 33101  33986 2R   S8_3     
-        29        199 33101  53543 2L   R11_1    
-        29        200 33101  53550 2R   R11_1    
-        29        201 33101  26539 3L   S6_2     
-        29        202 33101  38769 3R   P016     
-        29        203 33101  52471 3L   R10_1    
-        29        204 33101  52496 3R   R10_1    
-        29        205 33101  52465 3L   R10_1    
-        29        206 33101  53056 3R   R10_2    
-        29        207 33101  53031 3L   R10_2    
-        29        208 33101  53061 3R   R10_2    
-        29        209 33101  53036 3L   R10_2    
-        29        210 33101  53066 3R   R10_2    
-        29        211 33101  52476 3L   R10_1    
-        29        212 33101  53071 3R   R10_2    
-        29        213 33101  53051 3L   R10_2    
-        29        214 33101  53077 3R   R10_2    
-        29        215 33101  53026 3L   R10_2    
-        29        216 33101  52502 3R   R10_1    
-        29        217 33101  54016 3L   R11_2    
-        29        218 33101  54026 3R   R11_2    
-        29        219 33101  38748 3L   P016     
-        29        220 33101  26612 3R   S6_2     
-        29        221 33101  26545 3L   S6_2     
-        29        222 33101  39001 3R   P017     
-        29        223 33101  52472 3L   R10_1    
-        29        224 33101  52497 3R   R10_1    
-        29        225 33101  53027 3L   R10_2    
-        29        226 33101  53057 3R   R10_2    
-        29        227 33101  53032 3L   R10_2    
-        29        228 33101  53062 3R   R10_2    
-        29        229 33101  53037 3L   R10_2    
-        29        230 33101  53067 3R   R10_2    
-        29        231 33101  53042 3L   R10_2    
-        29        232 33101  53072 3R   R10_2    
-        29        233 33101  53052 3L   R10_2    
-        29        234 33101  52506 3R   R10_1    
-        29        235 33101  53047 3L   R10_2    
-        29        236 33101  52494 3R   R10_1    
-        29        237 33101  54017 3L   R11_2    
-        29        238 33101  54027 3R   R11_2    
-        29        239 33101  38749 3L   P016     
-        29        240 33101  26614 3R   S6_2     
-        29        241 33101  26547 3L   S6_2     
-        29        242 33101  39002 3R   P017     
-        29        243 33101  52473 3L   R10_1    
-        29        244 33101  52498 3R   R10_1    
-        29        245 33101  53028 3L   R10_2    
-        29        246 33101  53058 3R   R10_2    
-        29        247 33101  53033 3L   R10_2    
-        29        248 33101  53063 3R   R10_2    
-        29        249 33101  53038 3L   R10_2    
-        29        250 33101  53068 3R   R10_2    
-        29        251 33101  53043 3L   R10_2    
-        29        252 33101  53073 3R   R10_2    
-        29        253 33101  53053 3L   R10_2    
-        29        254 33101  52499 3R   R10_1    
-        29        255 33101  53048 3L   R10_2    
-        29        256 33101  52507 3R   R10_1    
-        29        257 33101  54018 3L   R11_2    
-        29        258 33101  54028 3R   R11_2    
-        29        259 33101  38750 3L   P016     
-        29        260 33101  26634 3R   S6_2     
-        29        261 33101  26565 3L   S6_2     
-        29        262 33101  39003 3R   P017     
-        29        263 33101  52474 3L   R10_1    
-        29        264 33101  52501 3R   R10_1    
-        29        265 33101  53029 3L   R10_2    
-        29        266 33101  53059 3R   R10_2    
-        29        267 33101  53034 3L   R10_2    
-        29        268 33101  53064 3R   R10_2    
-        29        269 33101  53039 3L   R10_2    
-        29        270 33101  53069 3R   R10_2    
-        29        271 33101  53044 3L   R10_2    
-        29        272 33101  53074 3R   R10_2    
-        29        273 33101  53054 3L   R10_2    
-        29        274 33101  52500 3R   R10_1    
-        29        275 33101  53049 3L   R10_2    
-        29        276 33101  52505 3R   R10_1    
-        29        277 33101  49710 3L   R7_2     
-        29        278 33101  54024 3R   R11_2    
-        29        279 33101  38751 3L   P016     
-        29        280 33101  29066 3R   P13      
-        29        281 33101  26570 3L   S6_2     
-        29        282 33101  39004 3R   P017     
-        29        283 33101  52475 3L   R10_1    
-        29        284 33101  52504 3R   R10_1    
-        29        285 33101  53030 3L   R10_2    
-        29        286 33101  53060 3R   R10_2    
-        29        287 33101  53035 3L   R10_2    
-        29        288 33101  53065 3R   R10_2    
-        29        289 33101  53040 3L   R10_2    
-        29        290 33101  53070 3R   R10_2    
-        29        291 33101  53045 3L   R10_2    
-        29        292 33101  53075 3R   R10_2    
-        29        293 33101  53055 3L   R10_2    
-        29        294 33101  52503 3R   R10_1    
-        29        295 33101  53050 3L   R10_2    
-        29        296 33101  53076 3R   R10_2    
-        29        297 33101  53046 3L   R10_2    
-        29        298 33101  54025 3R   R11_2    
-        29        299 33101  38752 3L   P016     
-        29        300 33101  29074 3R   P13      
-        29        301 33101  26665 4L   S6_2     
-        29        302 33101  39062 4R   P017     
-        29        303 33101  52508 4L   R10_1    
-        29        304 33101  52544 4R   R10_1    
-        29        305 33101  52536 4L   R10_1    
-        29        306 33101  52561 4R   R10_1    
-        29        307 33101  53081 4L   R10_2    
-        29        308 33101  53106 4R   R10_2    
-        29        309 33101  53086 4L   R10_2    
-        29        310 33101  53111 4R   R10_2    
-        29        311 33101  53091 4L   R10_2    
-        29        312 33101  53116 4R   R10_2    
-        29        313 33101  53096 4L   R10_2    
-        29        314 33101  53121 4R   R10_2    
-        29        315 33101  53101 4L   R10_2    
-        29        316 33101  54056 4R   R11_2    
-        29        317 33101  54041 4L   R11_2    
-        29        318 33101  50879 4R   R8_2     
-        29        319 33101  39035 4L   P017     
-        29        320 33101  26696 4R   S6_2     
-        29        321 33101  26672 4L   S6_2     
-        29        322 33101  39064 4R   P017     
-        29        323 33101  52509 4L   R10_1    
-        29        324 33101  52557 4R   R10_1    
-        29        325 33101  52513 4L   R10_1    
-        29        326 33101  52562 4R   R10_1    
-        29        327 33101  53082 4L   R10_2    
-        29        328 33101  53107 4R   R10_2    
-        29        329 33101  53087 4L   R10_2    
-        29        330 33101  53112 4R   R10_2    
-        29        331 33101  53092 4L   R10_2    
-        29        332 33101  53117 4R   R10_2    
-        29        333 33101  53097 4L   R10_2    
-        29        334 33101  53122 4R   R10_2    
-        29        335 33101  53102 4L   R10_2    
-        29        336 33101  54057 4R   R11_2    
-        29        337 33101  54042 4L   R11_2    
-        29        338 33101  51413 4R   R9_1     
-        29        339 33101  39036 4L   P017     
-        29        340 33101  26703 4R   S6_2     
-        29        341 33101  26680 4L   S6_2     
-        29        342 33101  39066 4R   P017     
-        29        343 33101  52510 4L   R10_1    
-        29        344 33101  52558 4R   R10_1    
-        29        345 33101  53078 4L   R10_2    
-        29        346 33101  52563 4R   R10_1    
-        29        347 33101  53083 4L   R10_2    
-        29        348 33101  53108 4R   R10_2    
-        29        349 33101  53088 4L   R10_2    
-        29        350 33101  53113 4R   R10_2    
-        29        351 33101  53093 4L   R10_2    
-        29        352 33101  53118 4R   R10_2    
-        29        353 33101  53098 4L   R10_2    
-        29        354 33101  53123 4R   R10_2    
-        29        355 33101  53103 4L   R10_2    
-        29        356 33101  54058 4R   R11_2    
-        29        357 33101  54043 4L   R11_2    
-        29        358 33101  52549 4R   R10_1    
-        29        359 33101  39037 4L   P017     
-        29        360 33101  26704 4R   S6_2     
-        29        361 33101  29122 4L   P13      
-        29        362 33101  39060 4R   P017     
-        29        363 33101  52511 4L   R10_1    
-        29        364 33101  52559 4R   R10_1    
-        29        365 33101  53079 4L   R10_2    
-        29        366 33101  52565 4R   R10_1    
-        29        367 33101  53084 4L   R10_2    
-        29        368 33101  53109 4R   R10_2    
-        29        369 33101  53089 4L   R10_2    
-        29        370 33101  53104 4R   R10_2    
-        29        371 33101  53094 4L   R10_2    
-        29        372 33101  53119 4R   R10_2    
-        29        373 33101  53099 4L   R10_2    
-        29        374 33101  53114 4R   R10_2    
-        29        375 33101  53090 4L   R10_2    
-        29        376 33101  54059 4R   R11_2    
-        29        377 33101  51381 4L   R9_1     
-        29        378 33101  52553 4R   R10_1    
-        29        379 33101  39038 4L   P017     
-        29        380 33101  26714 4R   S6_2     
-        29        381 33101  29124 4L   P13      
-        29        382 33101  39061 4R   P017     
-        29        383 33101  52512 4L   R10_1    
-        29        384 33101  52560 4R   R10_1    
-        29        385 33101  53080 4L   R10_2    
-        29        386 33101  52554 4R   R10_1    
-        29        387 33101  53085 4L   R10_2    
-        29        388 33101  53110 4R   R10_2    
-        29        389 33101  52514 4L   R10_1    
-        29        390 33101  53105 4R   R10_2    
-        29        391 33101  53095 4L   R10_2    
-        29        392 33101  53120 4R   R10_2    
-        29        393 33101  53100 4L   R10_2    
-        29        394 33101  53115 4R   R10_2    
-        29        395 33101  54040 4L   R11_2    
-        29        396 33101  54060 4R   R11_2    
-        29        397 33101  52531 4L   R10_1    
-        29        398 33101  52564 4R   R10_1    
-        29        399 33101  39039 4L   P017     
-        29        400 33101  26715 4R   S6_2     
-        29        401 33101  26750 5L   S6_2     
-        29        402 33101  39116 5R   P017     
-        29        403 33101  52581 5L   R10_1    
-        29        404 33101  52616 5R   R10_1    
-        29        405 33101  52586 5L   R10_1    
-        29        406 33101  53153 5R   R10_2    
-        29        407 33101  53124 5L   R10_2    
-        29        408 33101  53156 5R   R10_2    
-        29        409 33101  53131 5L   R10_2    
-        29        410 33101  53161 5R   R10_2    
-        29        411 33101  53136 5L   R10_2    
-        29        412 33101  53166 5R   R10_2    
-        29        413 33101  53141 5L   R10_2    
-        29        414 33101  53171 5R   R10_2    
-        29        415 33101  53146 5L   R10_2    
-        29        416 33101  54086 5R   R11_2    
-        29        417 33101  54076 5L   R11_2    
-        29        418 33101  50936 5R   R8_2     
-        29        419 33101  54078 5L   R11_2    
-        29        420 33101  29265 5R   P13      
-        29        421 33101  26754 5L   S6_2     
-        29        422 33101  39117 5R   P017     
-        29        423 33101  52582 5L   R10_1    
-        29        424 33101  52612 5R   R10_1    
-        29        425 33101  52587 5L   R10_1    
-        29        426 33101  53176 5R   R10_2    
-        29        427 33101  53127 5L   R10_2    
-        29        428 33101  53157 5R   R10_2    
-        29        429 33101  53132 5L   R10_2    
-        29        430 33101  53162 5R   R10_2    
-        29        431 33101  53137 5L   R10_2    
-        29        432 33101  53167 5R   R10_2    
-        29        433 33101  53142 5L   R10_2    
-        29        434 33101  53172 5R   R10_2    
-        29        435 33101  53147 5L   R10_2    
-        29        436 33101  54087 5R   R11_2    
-        29        437 33101  54077 5L   R11_2    
-        29        438 33101  53178 5R   R10_2    
-        29        439 33101  53125 5L   R10_2    
-        29        440 33101  27014 5R   S6_2b    
-        29        441 33101  26767 5L   S6_2     
-        29        442 33101  39118 5R   P017     
-        29        443 33101  52583 5L   R10_1    
-        29        444 33101  52613 5R   R10_1    
-        29        445 33101  52588 5L   R10_1    
-        29        446 33101  53177 5R   R10_2    
-        29        447 33101  53128 5L   R10_2    
-        29        448 33101  53158 5R   R10_2    
-        29        449 33101  53133 5L   R10_2    
-        29        450 33101  53163 5R   R10_2    
-        29        451 33101  53138 5L   R10_2    
-        29        452 33101  53168 5R   R10_2    
-        29        453 33101  53143 5L   R10_2    
-        29        454 33101  53173 5R   R10_2    
-        29        455 33101  53148 5L   R10_2    
-        29        456 33101  54088 5R   R11_2    
-        29        457 33101  54073 5L   R11_2    
-        29        458 33101  50957 5R   R8_2     
-        29        459 33101  53151 5L   R10_2    
-        29        460 33101  29253 5R   P13      
-        29        461 33101  27007 5L   S6_2b    
-        29        462 33101  39119 5R   P017     
-        29        463 33101  52584 5L   R10_1    
-        29        464 33101  52614 5R   R10_1    
-        29        465 33101  52579 5L   R10_1    
-        29        466 33101  53154 5R   R10_2    
-        29        467 33101  53129 5L   R10_2    
-        29        468 33101  53159 5R   R10_2    
-        29        469 33101  53134 5L   R10_2    
-        29        470 33101  53164 5R   R10_2    
-        29        471 33101  53139 5L   R10_2    
-        29        472 33101  53169 5R   R10_2    
-        29        473 33101  53144 5L   R10_2    
-        29        474 33101  53174 5R   R10_2    
-        29        475 33101  53149 5L   R10_2    
-        29        476 33101  54084 5R   R11_2    
-        29        477 33101  54074 5L   R11_2    
-        29        478 33101  51460 5R   R9_1     
-        29        479 33101  53152 5L   R10_2    
-        29        480 33101  30318 5R   S7_2     
-        29        481 33101  27008 5L   S6_2b    
-        29        482 33101  39120 5R   P017     
-        29        483 33101  52585 5L   R10_1    
-        29        484 33101  52615 5R   R10_1    
-        29        485 33101  52580 5L   R10_1    
-        29        486 33101  53155 5R   R10_2    
-        29        487 33101  53130 5L   R10_2    
-        29        488 33101  53160 5R   R10_2    
-        29        489 33101  53135 5L   R10_2    
-        29        490 33101  53165 5R   R10_2    
-        29        491 33101  53140 5L   R10_2    
-        29        492 33101  53170 5R   R10_2    
-        29        493 33101  53145 5L   R10_2    
-        29        494 33101  53175 5R   R10_2    
-        29        495 33101  53150 5L   R10_2    
-        29        496 33101  54085 5R   R11_2    
-        29        497 33101  54075 5L   R11_2    
-        29        498 33101  51461 5R   R9_1     
-        29        499 33101  53126 5L   R10_2    
-        29        500 33101  30326 5R   S7_2     
-        29        501 33101  32656 6L   P14      
-        29        502 33101  54181 6R   R11_2    
-        29        503 33101  54164 6L   R11_2    
-        29        504 33101  53228 6R   R10_2    
-        29        505 33101  54154 6L   R11_2    
-        29        506 33101  53234 6R   R10_2    
-        29        507 33101  53195 6L   R10_2    
-        29        508 33101  53208 6R   R10_2    
-        29        509 33101  53185 6L   R10_2    
-        29        510 33101  53213 6R   R10_2    
-        29        511 33101  53200 6L   R10_2    
-        29        512 33101  53219 6R   R10_2    
-        29        513 33101  53190 6L   R10_2    
-        29        514 33101  52677 6R   R10_1    
-        29        515 33101  52637 6L   R10_1    
-        29        516 33101  52672 6R   R10_1    
-        29        517 33101  52647 6L   R10_1    
-        29        518 33101  52667 6R   R10_1    
-        29        519 33101  52642 6L   R10_1    
-        29        520 33101  38593 6R   S9_5     
-        29        521 33101  32893 6L   S8_1     
-        29        522 33101  54182 6R   R11_2    
-        29        523 33101  54165 6L   R11_2    
-        29        524 33101  53229 6R   R10_2    
-        29        525 33101  54155 6L   R11_2    
-        29        526 33101  53233 6R   R10_2    
-        29        527 33101  53196 6L   R10_2    
-        29        528 33101  53209 6R   R10_2    
-        29        529 33101  53186 6L   R10_2    
-        29        530 33101  53214 6R   R10_2    
-        29        531 33101  53201 6L   R10_2    
-        29        532 33101  53224 6R   R10_2    
-        29        533 33101  53191 6L   R10_2    
-        29        534 33101  52678 6R   R10_1    
-        29        535 33101  52638 6L   R10_1    
-        29        536 33101  52673 6R   R10_1    
-        29        537 33101  52648 6L   R10_1    
-        29        538 33101  52668 6R   R10_1    
-        29        539 33101  52643 6L   R10_1    
-        29        540 33101  38594 6R   S9_5     
-        29        541 33101  34164 6L   S8_3     
-        29        542 33101  54183 6R   R11_2    
-        29        543 33101  54166 6L   R11_2    
-        29        544 33101  53230 6R   R10_2    
-        29        545 33101  54156 6L   R11_2    
-        29        546 33101  53220 6R   R10_2    
-        29        547 33101  53197 6L   R10_2    
-        29        548 33101  53210 6R   R10_2    
-        29        549 33101  53187 6L   R10_2    
-        29        550 33101  53215 6R   R10_2    
-        29        551 33101  53205 6L   R10_2    
-        29        552 33101  53225 6R   R10_2    
-        29        553 33101  53192 6L   R10_2    
-        29        554 33101  52679 6R   R10_1    
-        29        555 33101  52639 6L   R10_1    
-        29        556 33101  52674 6R   R10_1    
-        29        557 33101  52649 6L   R10_1    
-        29        558 33101  52669 6R   R10_1    
-        29        559 33101  52626 6L   R10_1    
-        29        560 33101  38595 6R   S9_5     
-        29        561 33101  38587 6L   S9_5     
-        29        562 33101  54184 6R   R11_2    
-        29        563 33101  54167 6L   R11_2    
-        29        564 33101  53231 6R   R10_2    
-        29        565 33101  54157 6L   R11_2    
-        29        566 33101  53221 6R   R10_2    
-        29        567 33101  53198 6L   R10_2    
-        29        568 33101  53211 6R   R10_2    
-        29        569 33101  53188 6L   R10_2    
-        29        570 33101  53216 6R   R10_2    
-        29        571 33101  53206 6L   R10_2    
-        29        572 33101  53226 6R   R10_2    
-        29        573 33101  53193 6L   R10_2    
-        29        574 33101  52680 6R   R10_1    
-        29        575 33101  52640 6L   R10_1    
-        29        576 33101  52675 6R   R10_1    
-        29        577 33101  52650 6L   R10_1    
-        29        578 33101  52670 6R   R10_1    
-        29        579 33101  52634 6L   R10_1    
-        29        580 33101  38596 6R   S9_5     
-        29        581 33101  38588 6L   S9_5     
-        29        582 33101  54185 6R   R11_2    
-        29        583 33101  54168 6L   R11_2    
-        29        584 33101  53232 6R   R10_2    
-        29        585 33101  54158 6L   R11_2    
-        29        586 33101  53222 6R   R10_2    
-        29        587 33101  53199 6L   R10_2    
-        29        588 33101  53218 6R   R10_2    
-        29        589 33101  53189 6L   R10_2    
-        29        590 33101  53217 6R   R10_2    
-        29        591 33101  53207 6L   R10_2    
-        29        592 33101  53227 6R   R10_2    
-        29        593 33101  53194 6L   R10_2    
-        29        594 33101  52681 6R   R10_1    
-        29        595 33101  52641 6L   R10_1    
-        29        596 33101  52676 6R   R10_1    
-        29        597 33101  52651 6L   R10_1    
-        29        598 33101  52671 6R   R10_1    
-        29        599 33101  52636 6L   R10_1    
-        29        600 33101  38597 6R   S9_5     
-        29        601 33101  26175 7L   S06      
-        29        602 33101  53255 7R   R10_2    
-        29        603 30301    546 7L   4        
-        29        604 33101  53267 7R   R10_2    
-        29        605 33101  54188 7L   R11_2    
-        29        606 33101  53265 7R   R10_2    
-        29        607 33101  53235 7L   R10_2    
-        29        608 33101  53260 7R   R10_2    
-        29        609 33101  53245 7L   R10_2    
-        29        610 33101  53270 7R   R10_2    
-        29        611 33101  53240 7L   R10_2    
-        29        612 33101  52745 7R   R10_1    
-        29        613 33101  53250 7L   R10_2    
-        29        614 33101  52750 7R   R10_1    
-        29        615 33101  52687 7L   R10_1    
-        29        616 33101  52720 7R   R10_1    
-        29        617 33101  52702 7L   R10_1    
-        29        618 33101  52740 7R   R10_1    
-        29        619 33101  52706 7L   R10_1    
-        29        620 33101  47828 7R   S9_5     
-        29        621 33101  38603 7L   S9_5     
-        29        622 33101  53261 7R   R10_2    
-        29        623 30301    547 7L   4        
-        29        624 33101  54194 7R   R11_2    
-        29        625 33101  54189 7L   R11_2    
-        29        626 33101  53266 7R   R10_2    
-        29        627 33101  53236 7L   R10_2    
-        29        628 33101  53256 7R   R10_2    
-        29        629 33101  53246 7L   R10_2    
-        29        630 33101  53271 7R   R10_2    
-        29        631 33101  53241 7L   R10_2    
-        29        632 33101  52746 7R   R10_1    
-        29        633 33101  53251 7L   R10_2    
-        29        634 33101  52751 7R   R10_1    
-        29        635 33101  52693 7L   R10_1    
-        29        636 33101  52721 7R   R10_1    
-        29        637 33101  52699 7L   R10_1    
-        29        638 33101  52741 7R   R10_1    
-        29        639 33101  52708 7L   R10_1    
-        29        640 33101  47829 7R   S9_5     
-        29        641 33101  47810 7L   S9_5     
-        29        642 33101  53269 7R   R10_2    
-        29        643 30301    548 7L   4        
-        29        644 33101  54195 7R   R11_2    
-        29        645 33101  54190 7L   R11_2    
-        29        646 33101  54193 7R   R11_2    
-        29        647 33101  53237 7L   R10_2    
-        29        648 33101  53257 7R   R10_2    
-        29        649 33101  53247 7L   R10_2    
-        29        650 33101  53272 7R   R10_2    
-        29        651 33101  53242 7L   R10_2    
-        29        652 33101  52747 7R   R10_1    
-        29        653 33101  52712 7L   R10_1    
-        29        654 33101  52752 7R   R10_1    
-        29        655 33101  52694 7L   R10_1    
-        29        656 33101  52722 7R   R10_1    
-        29        657 33101  52704 7L   R10_1    
-        29        658 33101  52742 7R   R10_1    
-        29        659 33101  52709 7L   R10_1    
-        29        660 33101  47830 7R   S9_5     
-        29        661 33101  47811 7L   S9_5     
-        29        662 33101  53275 7R   R10_2    
-        29        663 30301    549 7L   4        
-        29        664 33101  54196 7R   R11_2    
-        29        665 33101  54191 7L   R11_2    
-        29        666 33101  53268 7R   R10_2    
-        29        667 33101  53238 7L   R10_2    
-        29        668 33101  53258 7R   R10_2    
-        29        669 33101  53248 7L   R10_2    
-        29        670 33101  53273 7R   R10_2    
-        29        671 33101  53243 7L   R10_2    
-        29        672 33101  52748 7R   R10_1    
-        29        673 33101  52713 7L   R10_1    
-        29        674 33101  52753 7R   R10_1    
-        29        675 33101  52695 7L   R10_1    
-        29        676 33101  52723 7R   R10_1    
-        29        677 33101  52705 7L   R10_1    
-        29        678 33101  52743 7R   R10_1    
-        29        679 33101  52710 7L   R10_1    
-        29        680 33101  47831 7R   S9_5     
-        29        681 33101  47812 7L   S9_5     
-        29        682 33101  53276 7R   R10_2    
-        29        683 30301    550 7L   4        
-        29        684 33101  54197 7R   R11_2    
-        29        685 33101  54192 7L   R11_2    
-        29        686 33101  53262 7R   R10_2    
-        29        687 33101  53239 7L   R10_2    
-        29        688 33101  53259 7R   R10_2    
-        29        689 33101  53249 7L   R10_2    
-        29        690 33101  53274 7R   R10_2    
-        29        691 33101  53244 7L   R10_2    
-        29        692 33101  52749 7R   R10_1    
-        29        693 33101  52714 7L   R10_1    
-        29        694 33101  47820 7R   S9_5     
-        29        695 33101  52696 7L   R10_1    
-        29        696 33101  52724 7R   R10_1    
-        29        697 33101  52707 7L   R10_1    
-        29        698 33101  52744 7R   R10_1    
-        29        699 33101  52711 7L   R10_1    
-        29        700 33101  47832 7R   S9_5     
-        29        701 33101  33048 8L   S8_1     
-        29        702 33101  53311 8R   R10_2    
-        29        703 30301    253 8L   4        
-        29        704 30301    560 8R   4        
-        29        705 33101  54198 8L   R11_2    
-        29        706 33101  54200 8R   R11_2    
-        29        707 33101  53287 8L   R10_2    
-        29        708 33101  53316 8R   R10_2    
-        29        709 33101  53297 8L   R10_2    
-        29        710 33101  34334 8R   S8_4     
-        29        711 33101  53292 8L   R10_2    
-        29        712 33101  53326 8R   R10_2    
-        29        713 33101  53282 8L   R10_2    
-        29        714 33101  53321 8R   R10_2    
-        29        715 33101  53277 8L   R10_2    
-        29        716 33101  52809 8R   R10_1    
-        29        717 33101  52769 8L   R10_1    
-        29        718 33101  52784 8R   R10_1    
-        29        719 33101  52759 8L   R10_1    
-        29        720 33101  31664 8R   S7_4     
-        29        721 33101  33076 8L   S8_1     
-        29        722 33101  53312 8R   R10_2    
-        29        723 30301    256 8L   4        
-        29        724 30301    561 8R   4        
-        29        725 33101  54199 8L   R11_2    
-        29        726 33101  54201 8R   R11_2    
-        29        727 33101  53288 8L   R10_2    
-        29        728 33101  53317 8R   R10_2    
-        29        729 33101  53298 8L   R10_2    
-        29        730 33101  53306 8R   R10_2    
-        29        731 33101  53293 8L   R10_2    
-        29        732 33101  53327 8R   R10_2    
-        29        733 33101  53283 8L   R10_2    
-        29        734 33101  53322 8R   R10_2    
-        29        735 33101  53278 8L   R10_2    
-        29        736 33101  52810 8R   R10_1    
-        29        737 33101  52770 8L   R10_1    
-        29        738 33101  52789 8R   R10_1    
-        29        739 33101  52760 8L   R10_1    
-        29        740 33101  33090 8R   S8_1     
-        29        741 33101  47839 8L   S9_5     
-        29        742 33101  53318 8R   R10_2    
-        29        743 30301    261 8L   4        
-        29        744 30301    562 8R   4        
-        29        745 33101  53302 8L   R10_2    
-        29        746 33101  34336 8R   S8_4     
-        29        747 33101  53289 8L   R10_2    
-        29        748 33101  53313 8R   R10_2    
-        29        749 33101  53299 8L   R10_2    
-        29        750 33101  53308 8R   R10_2    
-        29        751 33101  53294 8L   R10_2    
-        29        752 33101  53328 8R   R10_2    
-        29        753 33101  53284 8L   R10_2    
-        29        754 33101  53323 8R   R10_2    
-        29        755 33101  53279 8L   R10_2    
-        29        756 33101  52811 8R   R10_1    
-        29        757 33101  52771 8L   R10_1    
-        29        758 33101  52786 8R   R10_1    
-        29        759 33101  52761 8L   R10_1    
-        29        760 33101  33093 8R   S8_1     
-        29        761 33101  47840 8L   S9_5     
-        29        762 33101  53319 8R   R10_2    
-        29        763 30301    262 8L   4        
-        29        764 30301    563 8R   4        
-        29        765 33101  53303 8L   R10_2    
-        29        766 33101  34337 8R   S8_4     
-        29        767 33101  53290 8L   R10_2    
-        29        768 33101  53314 8R   R10_2    
-        29        769 33101  53300 8L   R10_2    
-        29        770 33101  53309 8R   R10_2    
-        29        771 33101  53295 8L   R10_2    
-        29        772 33101  53315 8R   R10_2    
-        29        773 33101  53285 8L   R10_2    
-        29        774 33101  53324 8R   R10_2    
-        29        775 33101  53280 8L   R10_2    
-        29        776 33101  52812 8R   R10_1    
-        29        777 33101  52772 8L   R10_1    
-        29        778 33101  52804 8R   R10_1    
-        29        779 33101  52762 8L   R10_1    
-        29        780 33101  34335 8R   S8_4     
-        29        781 33101  33075 8L   S8_1     
-        29        782 33101  53320 8R   R10_2    
-        29        783 30301    263 8L   4        
-        29        784 30301    564 8R   4        
-        29        785 33101  53304 8L   R10_2    
-        29        786 33101  52144 8R   R9_2     
-        29        787 33101  53291 8L   R10_2    
-        29        788 33101  53329 8R   R10_2    
-        29        789 33101  53301 8L   R10_2    
-        29        790 33101  53310 8R   R10_2    
-        29        791 33101  53296 8L   R10_2    
-        29        792 33101  53330 8R   R10_2    
-        29        793 33101  53286 8L   R10_2    
-        29        794 33101  53325 8R   R10_2    
-        29        795 33101  53281 8L   R10_2    
-        29        796 33101  52813 8R   R10_1    
-        29        797 33101  52783 8L   R10_1    
-        29        798 33101  52801 8R   R10_1    
-        29        799 33101  52763 8L   R10_1    
-        29        800 33101  34338 8R   S8_4     
-        29        801 33101  30501 9L   S7_2     
-        29        802 33101  53363 9R   R10_2    
-        29        803 33101  53346 9L   R10_2    
-        29        804 33101  53378 9R   R10_2    
-        29        805 33101  53351 9L   R10_2    
-        29        806 33101  53368 9R   R10_2    
-        29        807 33101  53356 9L   R10_2    
-        29        808 33101  53358 9R   R10_2    
-        29        809 33101  53341 9L   R10_2    
-        29        810 33101  52867 9R   R10_1    
-        29        811 33101  53331 9L   R10_2    
-        29        812 33101  52849 9R   R10_1    
-        29        813 33101  52819 9L   R10_1    
-        29        814 33101  52847 9R   R10_1    
-        29        815 33101  52839 9L   R10_1    
-        29        816 33101  52882 9R   R10_1    
-        29        817 33101  52834 9L   R10_1    
-        29        818 33101  52877 9R   R10_1    
-        29        819 33101  52824 9L   R10_1    
-        29        820 33101  47882 9R   S9_5     
-        29        821 33101  30512 9L   S7_2     
-        29        822 33101  53364 9R   R10_2    
-        29        823 33101  53347 9L   R10_2    
-        29        824 33101  53379 9R   R10_2    
-        29        825 33101  53352 9L   R10_2    
-        29        826 33101  53369 9R   R10_2    
-        29        827 33101  53357 9L   R10_2    
-        29        828 33101  53359 9R   R10_2    
-        29        829 33101  53342 9L   R10_2    
-        29        830 33101  52863 9R   R10_1    
-        29        831 33101  53332 9L   R10_2    
-        29        832 33101  52853 9R   R10_1    
-        29        833 33101  52814 9L   R10_1    
-        29        834 33101  52852 9R   R10_1    
-        29        835 33101  52840 9L   R10_1    
-        29        836 33101  52883 9R   R10_1    
-        29        837 33101  52835 9L   R10_1    
-        29        838 33101  52878 9R   R10_1    
-        29        839 33101  52825 9L   R10_1    
-        29        840 33101  47883 9R   S9_5     
-        29        841 33101  30525 9L   S7_2     
-        29        842 33101  53365 9R   R10_2    
-        29        843 33101  53348 9L   R10_2    
-        29        844 33101  53380 9R   R10_2    
-        29        845 33101  53353 9L   R10_2    
-        29        846 33101  53370 9R   R10_2    
-        29        847 33101  53338 9L   R10_2    
-        29        848 33101  53360 9R   R10_2    
-        29        849 33101  53343 9L   R10_2    
-        29        850 33101  52869 9R   R10_1    
-        29        851 33101  53333 9L   R10_2    
-        29        852 33101  52854 9R   R10_1    
-        29        853 33101  52817 9L   R10_1    
-        29        854 33101  52848 9R   R10_1    
-        29        855 33101  52841 9L   R10_1    
-        29        856 33101  34342 9R   S8_4     
-        29        857 33101  52836 9L   R10_1    
-        29        858 33101  52879 9R   R10_1    
-        29        859 33101  52831 9L   R10_1    
-        29        860 33101  47884 9R   S9_5     
-        29        861 33101  30534 9L   S7_2     
-        29        862 33101  53366 9R   R10_2    
-        29        863 33101  53349 9L   R10_2    
-        29        864 33101  53377 9R   R10_2    
-        29        865 33101  53354 9L   R10_2    
-        29        866 33101  53371 9R   R10_2    
-        29        867 33101  53339 9L   R10_2    
-        29        868 33101  53361 9R   R10_2    
-        29        869 33101  53344 9L   R10_2    
-        29        870 33101  52870 9R   R10_1    
-        29        871 33101  53334 9L   R10_2    
-        29        872 33101  52855 9R   R10_1    
-        29        873 33101  52822 9L   R10_1    
-        29        874 33101  52850 9R   R10_1    
-        29        875 33101  52842 9L   R10_1    
-        29        876 33101  34343 9R   S8_4     
-        29        877 33101  52837 9L   R10_1    
-        29        878 33101  52880 9R   R10_1    
-        29        879 33101  52832 9L   R10_1    
-        29        880 33101  47885 9R   S9_5     
-        29        881 33101  31133 9L   S7_3     
-        29        882 33101  53367 9R   R10_2    
-        29        883 33101  53350 9L   R10_2    
-        29        884 33101  53376 9R   R10_2    
-        29        885 33101  53355 9L   R10_2    
-        29        886 33101  53372 9R   R10_2    
-        29        887 33101  53340 9L   R10_2    
-        29        888 33101  53362 9R   R10_2    
-        29        889 33101  53345 9L   R10_2    
-        29        890 33101  52871 9R   R10_1    
-        29        891 33101  53335 9L   R10_2    
-        29        892 33101  52856 9R   R10_1    
-        29        893 33101  52823 9L   R10_1    
-        29        894 33101  52851 9R   R10_1    
-        29        895 33101  52843 9L   R10_1    
-        29        896 33101  34344 9R   S8_4     
-        29        897 33101  52838 9L   R10_1    
-        29        898 33101  52881 9R   R10_1    
-        29        899 33101  52828 9L   R10_1    
-        29        900 33101  47886 9R   S9_5     
-        29        901 33101  38622 10L  S9_5     
-        29        902 33101  54220 10R  R11_2    
-        29        903 33101  54662 10L  R12_1    
-        29        904 33101  52223 10R  R9_2     
-        29        905 33101  54642 10L  R12_1    
-        29        906 33101  54674 10R  R12_1    
-        29        907 33101  54647 10L  R12_1    
-        29        908 33101  54669 10R  R12_1    
-        29        909 33101  54637 10L  R12_1    
-        29        910 33101  53388 10R  R10_2    
-        29        911 33101  54622 10L  R12_1    
-        29        912 33101  53393 10R  R10_2    
-        29        913 33101  53381 10L  R10_2    
-        29        914 33101  52894 10R  R10_1    
-        29        915 33101  53386 10L  R10_2    
-        29        916 33101  52889 10R  R10_1    
-        29        917 33101  52884 10L  R10_1    
-        29        918 33101  52230 10R  R9_2     
-        29        919 33101  52203 10L  R9_2     
-        29        920 33101  38534 10R  S9_6     
-        29        921 33101  38623 10L  S9_5     
-        29        922 33101  54221 10R  R11_2    
-        29        923 33101  54663 10L  R12_1    
-        29        924 33101  52251 10R  R9_2     
-        29        925 33101  54643 10L  R12_1    
-        29        926 33101  54675 10R  R12_1    
-        29        927 33101  54648 10L  R12_1    
-        29        928 33101  54670 10R  R12_1    
-        29        929 33101  54638 10L  R12_1    
-        29        930 33101  53389 10R  R10_2    
-        29        931 33101  54623 10L  R12_1    
-        29        932 33101  53394 10R  R10_2    
-        29        933 33101  53382 10L  R10_2    
-        29        934 33101  52895 10R  R10_1    
-        29        935 33101  53387 10L  R10_2    
-        29        936 33101  52890 10R  R10_1    
-        29        937 33101  52885 10L  R10_1    
-        29        938 33101  52231 10R  R9_2     
-        29        939 33101  52204 10L  R9_2     
-        29        940 33101  38535 10R  S9_6     
-        29        941 33101  38624 10L  S9_5     
-        29        942 33101  54222 10R  R11_2    
-        29        943 33101  54214 10L  R11_2    
-        29        944 33101  52262 10R  R9_2     
-        29        945 33101  54644 10L  R12_1    
-        29        946 33101  54676 10R  R12_1    
-        29        947 33101  54649 10L  R12_1    
-        29        948 33101  54671 10R  R12_1    
-        29        949 33101  54639 10L  R12_1    
-        29        950 33101  53390 10R  R10_2    
-        29        951 33101  54624 10L  R12_1    
-        29        952 33101  53395 10R  R10_2    
-        29        953 33101  53383 10L  R10_2    
-        29        954 33101  52896 10R  R10_1    
-        29        955 33101  45274 10L  R3_2     
-        29        956 33101  52891 10R  R10_1    
-        29        957 33101  52886 10L  R10_1    
-        29        958 33101  52246 10R  R9_2     
-        29        959 33101  52205 10L  R9_2     
-        29        960 33101  38536 10R  S9_6     
-        29        961 33101  38625 10L  S9_5     
-        29        962 33101  38151 10R  S9_6     
-        29        963 33101  41301 10L  S10_5    
-        29        964 33101  52233 10R  R9_2     
-        29        965 33101  54645 10L  R12_1    
-        29        966 33101  54677 10R  R12_1    
-        29        967 33101  54650 10L  R12_1    
-        29        968 33101  54672 10R  R12_1    
-        29        969 33101  54640 10L  R12_1    
-        29        970 33101  53391 10R  R10_2    
-        29        971 33101  54625 10L  R12_1    
-        29        972 33101  53396 10R  R10_2    
-        29        973 33101  53384 10L  R10_2    
-        29        974 33101  52897 10R  R10_1    
-        29        975 33101  45275 10L  R3_2     
-        29        976 33101  52892 10R  R10_1    
-        29        977 33101  52887 10L  R10_1    
-        29        978 33101  52259 10R  R9_2     
-        29        979 33101  52206 10L  R9_2     
-        29        980 33101  47909 10R  S9_5     
-        29        981 33101  38626 10L  S9_5     
-        29        982 33101  38156 10R  S9_6     
-        29        983 33101  41302 10L  S10_5    
-        29        984 33101  45337 10R  R3_2     
-        29        985 33101  54646 10L  R12_1    
-        29        986 33101  54678 10R  R12_1    
-        29        987 33101  54651 10L  R12_1    
-        29        988 33101  54673 10R  R12_1    
-        29        989 33101  54641 10L  R12_1    
-        29        990 33101  53392 10R  R10_2    
-        29        991 33101  54626 10L  R12_1    
-        29        992 33101  52899 10R  R10_1    
-        29        993 33101  53385 10L  R10_2    
-        29        994 33101  52898 10R  R10_1    
-        29        995 33101  45276 10L  R3_2     
-        29        996 33101  52893 10R  R10_1    
-        29        997 33101  52888 10L  R10_1    
-        29        998 33101  52241 10R  R9_2     
-        29        999 33101  52207 10L  R9_2     
-        29       1000 33101  47911 10R  S9_5     
-        29       1001 33101  26836 11L  S6_2     
-        29       1002 33101  53717 11R  R11_1    
-        29       1003 33101  54715 11L  R12_1    
-        29       1004 33101  54735 11R  R12_1    
-        29       1005 33101  54700 11L  R12_1    
-        29       1006 33101  53722 11R  R11_1    
-        29       1007 33101  54710 11L  R12_1    
-        29       1008 33101  53697 11R  R11_1    
-        29       1009 33101  54705 11L  R12_1    
-        29       1010 33101  53689 11R  R11_1    
-        29       1011 33101  54685 11L  R12_1    
-        29       1012 33101  53737 11R  R11_1    
-        29       1013 33101  53397 11L  R10_2    
-        29       1014 33101  53707 11R  R11_1    
-        29       1015 33101  53402 11L  R10_2    
-        29       1016 33101  53687 11R  R11_1    
-        29       1017 33101  53407 11L  R10_2    
-        29       1018 33101  53699 11R  R11_1    
-        29       1019 33101  52910 11L  R10_1    
-        29       1020 33101  35351 11R  S8_5     
-        29       1021 33101  26837 11L  S6_2     
-        29       1022 33101  53718 11R  R11_1    
-        29       1023 33101  54716 11L  R12_1    
-        29       1024 33101  54736 11R  R12_1    
-        29       1025 33101  54701 11L  R12_1    
-        29       1026 33101  53728 11R  R11_1    
-        29       1027 33101  54711 11L  R12_1    
-        29       1028 33101  53698 11R  R11_1    
-        29       1029 33101  54706 11L  R12_1    
-        29       1030 33101  53690 11R  R11_1    
-        29       1031 33101  54686 11L  R12_1    
-        29       1032 33101  53738 11R  R11_1    
-        29       1033 33101  53398 11L  R10_2    
-        29       1034 33101  53708 11R  R11_1    
-        29       1035 33101  53403 11L  R10_2    
-        29       1036 33101  53688 11R  R11_1    
-        29       1037 33101  53408 11L  R10_2    
-        29       1038 33101  53701 11R  R11_1    
-        29       1039 33101  52911 11L  R10_1    
-        29       1040 33101  35350 11R  S8_5     
-        29       1041 33101  26838 11L  S6_2     
-        29       1042 33101  53731 11R  R11_1    
-        29       1043 33101  54717 11L  R12_1    
-        29       1044 33101  54737 11R  R12_1    
-        29       1045 33101  54702 11L  R12_1    
-        29       1046 33101  53724 11R  R11_1    
-        29       1047 33101  54712 11L  R12_1    
-        29       1048 33101  53702 11R  R11_1    
-        29       1049 33101  54707 11L  R12_1    
-        29       1050 33101  53694 11R  R11_1    
-        29       1051 33101  54687 11L  R12_1    
-        29       1052 33101  53739 11R  R11_1    
-        29       1053 33101  53399 11L  R10_2    
-        29       1054 33101  53709 11R  R11_1    
-        29       1055 33101  53404 11L  R10_2    
-        29       1056 33101  53692 11R  R11_1    
-        29       1057 33101  53409 11L  R10_2    
-        29       1058 33101  53704 11R  R11_1    
-        29       1059 33101  52912 11L  R10_1    
-        29       1060 33101  30643 11R  S7_2     
-        29       1061 33101  26839 11L  S6_2     
-        29       1062 33101  53720 11R  R11_1    
-        29       1063 33101  54718 11L  R12_1    
-        29       1064 33101  54738 11R  R12_1    
-        29       1065 33101  54703 11L  R12_1    
-        29       1066 33101  53725 11R  R11_1    
-        29       1067 33101  54713 11L  R12_1    
-        29       1068 33101  53700 11R  R11_1    
-        29       1069 33101  54708 11L  R12_1    
-        29       1070 33101  53695 11R  R11_1    
-        29       1071 33101  54688 11L  R12_1    
-        29       1072 33101  53740 11R  R11_1    
-        29       1073 33101  53400 11L  R10_2    
-        29       1074 33101  53710 11R  R11_1    
-        29       1075 33101  53405 11L  R10_2    
-        29       1076 33101  53693 11R  R11_1    
-        29       1077 33101  53410 11L  R10_2    
-        29       1078 33101  53705 11R  R11_1    
-        29       1079 33101  52913 11L  R10_1    
-        29       1080 33101  28760 11R  P12      
-        29       1081 33101  26840 11L  S6_2     
-        29       1082 33101  53721 11R  R11_1    
-        29       1083 33101  54719 11L  R12_1    
-        29       1084 33101  54739 11R  R12_1    
-        29       1085 33101  54704 11L  R12_1    
-        29       1086 33101  53726 11R  R11_1    
-        29       1087 33101  54714 11L  R12_1    
-        29       1088 33101  53703 11R  R11_1    
-        29       1089 33101  54709 11L  R12_1    
-        29       1090 33101  53696 11R  R11_1    
-        29       1091 33101  54689 11L  R12_1    
-        29       1092 33101  53741 11R  R11_1    
-        29       1093 33101  53401 11L  R10_2    
-        29       1094 33101  53712 11R  R11_1    
-        29       1095 33101  53406 11L  R10_2    
-        29       1096 33101  53691 11R  R11_1    
-        29       1097 33101  52915 11L  R10_1    
-        29       1098 33101  53706 11R  R11_1    
-        29       1099 33101  52914 11L  R10_1    
-        29       1100 33101  28750 11R  P12      
-        29       1101 33101  28781 12L  P12      
-        29       1102 33101  53860 12R  R11_1    
-        29       1103 33101  53782 12L  R11_1    
-        29       1104 33101  53870 12R  R11_1    
-        29       1105 33101  53807 12L  R11_1    
-        29       1106 33101  53897 12R  R11_1    
-        29       1107 33101  54230 12L  R11_2    
-        29       1108 33101  53835 12R  R11_1    
-        29       1109 33101  54250 12L  R11_2    
-        29       1110 33101  53845 12R  R11_1    
-        29       1111 33101  53812 12L  R11_1    
-        29       1112 33101  53830 12R  R11_1    
-        29       1113 33101  53772 12L  R11_1    
-        29       1114 33101  53865 12R  R11_1    
-        29       1115 33101  53767 12L  R11_1    
-        29       1116 33101  53855 12R  R11_1    
-        29       1117 33101  54243 12L  R11_2    
-        29       1118 33101  53850 12R  R11_1    
-        29       1119 33101  54238 12L  R11_2    
-        29       1120 33101  33752 12R  S8_2     
-        29       1121 33101  28784 12L  P12      
-        29       1122 33101  53861 12R  R11_1    
-        29       1123 33101  53803 12L  R11_1    
-        29       1124 33101  53891 12R  R11_1    
-        29       1125 33101  53808 12L  R11_1    
-        29       1126 33101  54252 12R  R11_2    
-        29       1127 33101  53765 12L  R11_1    
-        29       1128 33101  53836 12R  R11_1    
-        29       1129 33101  53762 12L  R11_1    
-        29       1130 33101  53846 12R  R11_1    
-        29       1131 33101  53813 12L  R11_1    
-        29       1132 33101  53831 12R  R11_1    
-        29       1133 33101  53773 12L  R11_1    
-        29       1134 33101  53866 12R  R11_1    
-        29       1135 33101  53768 12L  R11_1    
-        29       1136 33101  53856 12R  R11_1    
-        29       1137 33101  54244 12L  R11_2    
-        29       1138 33101  53851 12R  R11_1    
-        29       1139 33101  54239 12L  R11_2    
-        29       1140 33101  34882 12R  S8_4     
-        29       1141 33101  33730 12L  S8_2     
-        29       1142 33101  53868 12R  R11_1    
-        29       1143 33101  53804 12L  R11_1    
-        29       1144 33101  53892 12R  R11_1    
-        29       1145 33101  53809 12L  R11_1    
-        29       1146 33101  54253 12R  R11_2    
-        29       1147 33101  54228 12L  R11_2    
-        29       1148 33101  53837 12R  R11_1    
-        29       1149 33101  53763 12L  R11_1    
-        29       1150 33101  53847 12R  R11_1    
-        29       1151 33101  53814 12L  R11_1    
-        29       1152 33101  53832 12R  R11_1    
-        29       1153 33101  53774 12L  R11_1    
-        29       1154 33101  53867 12R  R11_1    
-        29       1155 33101  53769 12L  R11_1    
-        29       1156 33101  53857 12R  R11_1    
-        29       1157 33101  54245 12L  R11_2    
-        29       1158 33101  53852 12R  R11_1    
-        29       1159 33101  54240 12L  R11_2    
-        29       1160 33101  34906 12R  S8_4     
-        29       1161 33101  39171 12L  P16      
-        29       1162 33101  53863 12R  R11_1    
-        29       1163 33101  53805 12L  R11_1    
-        29       1164 33101  53893 12R  R11_1    
-        29       1165 33101  53810 12L  R11_1    
-        29       1166 33101  54254 12R  R11_2    
-        29       1167 33101  54231 12L  R11_2    
-        29       1168 33101  53838 12R  R11_1    
-        29       1169 33101  54229 12L  R11_2    
-        29       1170 33101  53848 12R  R11_1    
-        29       1171 33101  53815 12L  R11_1    
-        29       1172 33101  53833 12R  R11_1    
-        29       1173 33101  53775 12L  R11_1    
-        29       1174 33101  53862 12R  R11_1    
-        29       1175 33101  53770 12L  R11_1    
-        29       1176 33101  53858 12R  R11_1    
-        29       1177 33101  54246 12L  R11_2    
-        29       1178 33101  53853 12R  R11_1    
-        29       1179 33101  54241 12L  R11_2    
-        29       1180 33101  35690 12R  P15_1    
-        29       1181 33101  39174 12L  P16      
-        29       1182 33101  53864 12R  R11_1    
-        29       1183 33101  53806 12L  R11_1    
-        29       1184 33101  53894 12R  R11_1    
-        29       1185 33101  53811 12L  R11_1    
-        29       1186 33101  54255 12R  R11_2    
-        29       1187 33101  54232 12L  R11_2    
-        29       1188 33101  53839 12R  R11_1    
-        29       1189 33101  53771 12L  R11_1    
-        29       1190 33101  53849 12R  R11_1    
-        29       1191 33101  53816 12L  R11_1    
-        29       1192 33101  53834 12R  R11_1    
-        29       1193 33101  53776 12L  R11_1    
-        29       1194 33101  53869 12R  R11_1    
-        29       1195 33101  53766 12L  R11_1    
-        29       1196 33101  53859 12R  R11_1    
-        29       1197 33101  54247 12L  R11_2    
-        29       1198 33101  53854 12R  R11_1    
-        29       1199 33101  54242 12L  R11_2    
-        29       1200 33101  39178 12R  P16      
-        29       1201 33101  53932 13L  R11_1    
-        29       1202 33101  54007 13R  R11_1    
-        29       1203 33101  53922 13L  R11_1    
-        29       1204 33101  53967 13R  R11_1    
-        29       1205 33101  54267 13L  R11_2    
-        29       1206 33101  54009 13R  R11_1    
-        29       1207 33101  53940 13L  R11_1    
-        29       1208 33101  53954 13R  R11_1    
-        29       1209 33101  53942 13L  R11_1    
-        29       1210 33101  54270 13R  R11_2    
-        29       1211 33101  53917 13L  R11_1    
-        29       1212 33101  53957 13R  R11_1    
-        29       1213 33101  53912 13L  R11_1    
-        29       1214 33101  53972 13R  R11_1    
-        29       1215 33101  53907 13L  R11_1    
-        29       1216 33101  53977 13R  R11_1    
-        29       1217 33101  53902 13L  R11_1    
-        29       1218 33101  53997 13R  R11_1    
-        29       1219 33101  53458 13L  R10_2    
-        29       1220 33101  28857 13R  P12      
-        29       1221 33101  53933 13L  R11_1    
-        29       1222 33101  53988 13R  R11_1    
-        29       1223 33101  53923 13L  R11_1    
-        29       1224 33101  53968 13R  R11_1    
-        29       1225 33101  54268 13L  R11_2    
-        29       1226 33101  53993 13R  R11_1    
-        29       1227 33101  53944 13L  R11_1    
-        29       1228 33101  54008 13R  R11_1    
-        29       1229 33101  53943 13L  R11_1    
-        29       1230 33101  53953 13R  R11_1    
-        29       1231 33101  53918 13L  R11_1    
-        29       1232 33101  53958 13R  R11_1    
-        29       1233 33101  53913 13L  R11_1    
-        29       1234 33101  53973 13R  R11_1    
-        29       1235 33101  53908 13L  R11_1    
-        29       1236 33101  53978 13R  R11_1    
-        29       1237 33101  53903 13L  R11_1    
-        29       1238 33101  53998 13R  R11_1    
-        29       1239 33101  53437 13L  R10_2    
-        29       1240 33101  28863 13R  P12      
-        29       1241 33101  53934 13L  R11_1    
-        29       1242 33101  53989 13R  R11_1    
-        29       1243 33101  53924 13L  R11_1    
-        29       1244 33101  53969 13R  R11_1    
-        29       1245 33101  44432 13L  R2_2     
-        29       1246 33101  53994 13R  R11_1    
-        29       1247 33101  53949 13L  R11_1    
-        29       1248 33101  53992 13R  R11_1    
-        29       1249 33101  53948 13L  R11_1    
-        29       1250 33101  54010 13R  R11_1    
-        29       1251 33101  53919 13L  R11_1    
-        29       1252 33101  53959 13R  R11_1    
-        29       1253 33101  53914 13L  R11_1    
-        29       1254 33101  53955 13R  R11_1    
-        29       1255 33101  53909 13L  R11_1    
-        29       1256 33101  53979 13R  R11_1    
-        29       1257 33101  53904 13L  R11_1    
-        29       1258 33101  53999 13R  R11_1    
-        29       1259 33101  53460 13L  R10_2    
-        29       1260 33101  28865 13R  P12      
-        29       1261 33101  53935 13L  R11_1    
-        29       1262 33101  53990 13R  R11_1    
-        29       1263 33101  53925 13L  R11_1    
-        29       1264 33101  53970 13R  R11_1    
-        29       1265 33101  51758 13L  R9_1     
-        29       1266 33101  53995 13R  R11_1    
-        29       1267 33101  53950 13L  R11_1    
-        29       1268 33101  53987 13R  R11_1    
-        29       1269 33101  53945 13L  R11_1    
-        29       1270 33101  53974 13R  R11_1    
-        29       1271 33101  53920 13L  R11_1    
-        29       1272 33101  53956 13R  R11_1    
-        29       1273 33101  53915 13L  R11_1    
-        29       1274 33101  53975 13R  R11_1    
-        29       1275 33101  53910 13L  R11_1    
-        29       1276 33101  53980 13R  R11_1    
-        29       1277 33101  53905 13L  R11_1    
-        29       1278 33101  54000 13R  R11_1    
-        29       1279 33101  53439 13L  R10_2    
-        29       1280 33101  29365 13R  S6_3b    
-        29       1281 33101  53936 13L  R11_1    
-        29       1282 33101  53991 13R  R11_1    
-        29       1283 33101  53926 13L  R11_1    
-        29       1284 33101  53971 13R  R11_1    
-        29       1285 33101  51759 13L  R9_1     
-        29       1286 33101  53996 13R  R11_1    
-        29       1287 33101  53951 13L  R11_1    
-        29       1288 33101  54269 13R  R11_2    
-        29       1289 33101  53946 13L  R11_1    
-        29       1290 33101  53960 13R  R11_1    
-        29       1291 33101  53921 13L  R11_1    
-        29       1292 33101  53961 13R  R11_1    
-        29       1293 33101  53916 13L  R11_1    
-        29       1294 33101  53976 13R  R11_1    
-        29       1295 33101  53911 13L  R11_1    
-        29       1296 33101  53981 13R  R11_1    
-        29       1297 33101  53906 13L  R11_1    
-        29       1298 33101  54001 13R  R11_1    
-        29       1299 33101  53441 13L  R10_2    
-        29       1300 33101  33257 13R  S8_1     
-        29       1301 33101  28027 14L  S6_3b    
-        29       1302 33101  50272 14R  R8_1     
-        29       1303 33101  51886 14L  R9_2     
-        29       1304 33101  51936 14R  R9_2     
-        29       1305 33101  50235 14L  R8_1     
-        29       1306 33101  51946 14R  R9_2     
-        29       1307 33101  51894 14L  R9_2     
-        29       1308 33101  53626 14R  R11_1    
-        29       1309 33101  53576 14L  R11_1    
-        29       1310 33101  53623 14R  R11_1    
-        29       1311 33101  53581 14L  R11_1    
-        29       1312 33101  53630 14R  R11_1    
-        29       1313 33101  53586 14L  R11_1    
-        29       1314 33101  53636 14R  R11_1    
-        29       1315 33101  53591 14L  R11_1    
-        29       1316 33101  53641 14R  R11_1    
-        29       1317 33101  53596 14L  R11_1    
-        29       1318 33101  54106 14R  R11_2    
-        29       1319 33101  43938 14L  R2_2     
-        29       1320 33101  27508 14R  S6_3     
-        29       1321 33101  28623 14L  P12      
-        29       1322 33101  51933 14R  R9_2     
-        29       1323 33101  51887 14L  R9_2     
-        29       1324 33101  51937 14R  R9_2     
-        29       1325 33101  51882 14L  R9_2     
-        29       1326 33101  51947 14R  R9_2     
-        29       1327 33101  51895 14L  R9_2     
-        29       1328 33101  53628 14R  R11_1    
-        29       1329 33101  53577 14L  R11_1    
-        29       1330 33101  51942 14R  R9_2     
-        29       1331 33101  53582 14L  R11_1    
-        29       1332 33101  53632 14R  R11_1    
-        29       1333 33101  53587 14L  R11_1    
-        29       1334 33101  53637 14R  R11_1    
-        29       1335 33101  53592 14L  R11_1    
-        29       1336 33101  53631 14R  R11_1    
-        29       1337 33101  53598 14L  R11_1    
-        29       1338 33101  53646 14R  R11_1    
-        29       1339 33101  46880 14L  R5_1     
-        29       1340 33101  28062 14R  S6_3b    
-        29       1341 33101  28628 14L  P12      
-        29       1342 33101  51934 14R  R9_2     
-        29       1343 33101  51888 14L  R9_2     
-        29       1344 33101  51941 14R  R9_2     
-        29       1345 33101  51884 14L  R9_2     
-        29       1346 33101  51948 14R  R9_2     
-        29       1347 33101  53573 14L  R11_1    
-        29       1348 33101  53629 14R  R11_1    
-        29       1349 33101  53578 14L  R11_1    
-        29       1350 33101  51943 14R  R9_2     
-        29       1351 33101  53583 14L  R11_1    
-        29       1352 33101  53633 14R  R11_1    
-        29       1353 33101  53588 14L  R11_1    
-        29       1354 33101  53638 14R  R11_1    
-        29       1355 33101  53601 14L  R11_1    
-        29       1356 33101  53179 14R  R10_2    
-        29       1357 33101  53599 14L  R11_1    
-        29       1358 33101  53643 14R  R11_1    
-        29       1359 33101  38786 14L  P016     
-        29       1360 33101  28063 14R  S6_3b    
-        29       1361 33101  29300 14L  P13      
-        29       1362 33101  51935 14R  R9_2     
-        29       1363 33101  51889 14L  R9_2     
-        29       1364 33101  51939 14R  R9_2     
-        29       1365 33101  51891 14L  R9_2     
-        29       1366 33101  51949 14R  R9_2     
-        29       1367 33101  53574 14L  R11_1    
-        29       1368 33101  53624 14R  R11_1    
-        29       1369 33101  53579 14L  R11_1    
-        29       1370 33101  51944 14R  R9_2     
-        29       1371 33101  53584 14L  R11_1    
-        29       1372 33101  53634 14R  R11_1    
-        29       1373 33101  53589 14L  R11_1    
-        29       1374 33101  53639 14R  R11_1    
-        29       1375 33101  53594 14L  R11_1    
-        29       1376 33101  53642 14R  R11_1    
-        29       1377 33101  53593 14L  R11_1    
-        29       1378 33101  53644 14R  R11_1    
-        29       1379 33101  39146 14L  P017     
-        29       1380 33101  28079 14R  S6_3b    
-        29       1381 33101  29701 14L  S7_1     
-        29       1382 33101  51938 14R  R9_2     
-        29       1383 33101  51890 14L  R9_2     
-        29       1384 33101  51940 14R  R9_2     
-        29       1385 33101  51893 14L  R9_2     
-        29       1386 33101  51950 14R  R9_2     
-        29       1387 33101  53575 14L  R11_1    
-        29       1388 33101  53625 14R  R11_1    
-        29       1389 33101  53580 14L  R11_1    
-        29       1390 33101  51945 14R  R9_2     
-        29       1391 33101  53585 14L  R11_1    
-        29       1392 33101  53635 14R  R11_1    
-        29       1393 33101  53590 14L  R11_1    
-        29       1394 33101  53640 14R  R11_1    
-        29       1395 33101  53595 14L  R11_1    
-        29       1396 33101  54107 14R  R11_2    
-        29       1397 33101  53600 14L  R11_1    
-        29       1398 33101  53645 14R  R11_1    
-        29       1399 33101  39230 14L  S10_1    
-        29       1400 33101  28080 14R  S6_3b    
-        29       1401 33101  27065 15L  S6_2b    
-        29       1402 33101  52041 15R  R9_2     
-        29       1403 33101  51991 15L  R9_2     
-        29       1404 33101  52046 15R  R9_2     
-        29       1405 33101  51989 15L  R9_2     
-        29       1406 33101  53666 15R  R11_1    
-        29       1407 33101  53651 15L  R11_1    
-        29       1408 33101  53671 15R  R11_1    
-        29       1409 33101  53656 15L  R11_1    
-        29       1410 33101  53676 15R  R11_1    
-        29       1411 33101  53661 15L  R11_1    
-        29       1412 33101  53664 15R  R11_1    
-        29       1413 33101  54131 15L  R11_2    
-        29       1414 33101  53683 15R  R11_1    
-        29       1415 33101  51996 15L  R9_2     
-        29       1416 33101  52051 15R  R9_2     
-        29       1417 33101  52001 15L  R9_2     
-        29       1418 33101  52056 15R  R9_2     
-        29       1419 33101  54126 15L  R11_2    
-        29       1420 33101  27113 15R  S6_2b    
-        29       1421 33101  27072 15L  S6_2b    
-        29       1422 33101  52042 15R  R9_2     
-        29       1423 33101  51992 15L  R9_2     
-        29       1424 33101  52047 15R  R9_2     
-        29       1425 33101  53647 15L  R11_1    
-        29       1426 33101  53667 15R  R11_1    
-        29       1427 33101  53652 15L  R11_1    
-        29       1428 33101  53672 15R  R11_1    
-        29       1429 33101  53657 15L  R11_1    
-        29       1430 33101  53677 15R  R11_1    
-        29       1431 33101  53662 15L  R11_1    
-        29       1432 33101  53665 15R  R11_1    
-        29       1433 33101  54132 15L  R11_2    
-        29       1434 33101  53684 15R  R11_1    
-        29       1435 33101  51997 15L  R9_2     
-        29       1436 33101  52052 15R  R9_2     
-        29       1437 33101  52002 15L  R9_2     
-        29       1438 33101  52057 15R  R9_2     
-        29       1439 33101  54127 15L  R11_2    
-        29       1440 33101  27119 15R  S6_2b    
-        29       1441 33101  27073 15L  S6_2b    
-        29       1442 33101  52043 15R  R9_2     
-        29       1443 33101  51993 15L  R9_2     
-        29       1444 33101  52048 15R  R9_2     
-        29       1445 33101  51990 15L  R9_2     
-        29       1446 33101  53668 15R  R11_1    
-        29       1447 33101  53653 15L  R11_1    
-        29       1448 33101  53673 15R  R11_1    
-        29       1449 33101  53658 15L  R11_1    
-        29       1450 33101  53678 15R  R11_1    
-        29       1451 33101  53663 15L  R11_1    
-        29       1452 33101  52039 15R  R9_2     
-        29       1453 33101  54133 15L  R11_2    
-        29       1454 33101  47458 15R  R5_2     
-        29       1455 33101  51998 15L  R9_2     
-        29       1456 33101  52053 15R  R9_2     
-        29       1457 33101  52003 15L  R9_2     
-        29       1458 33101  52058 15R  R9_2     
-        29       1459 33101  54128 15L  R11_2    
-        29       1460 33101  28178 15R  S6_3b    
-        29       1461 33101  27076 15L  S6_2b    
-        29       1462 33101  52044 15R  R9_2     
-        29       1463 33101  51994 15L  R9_2     
-        29       1464 33101  52049 15R  R9_2     
-        29       1465 33101  53649 15L  R11_1    
-        29       1466 33101  53669 15R  R11_1    
-        29       1467 33101  53654 15L  R11_1    
-        29       1468 33101  53674 15R  R11_1    
-        29       1469 33101  53659 15L  R11_1    
-        29       1470 33101  53679 15R  R11_1    
-        29       1471 33101  36708 15L  S9_2     
-        29       1472 33101  52040 15R  R9_2     
-        29       1473 33101  54134 15L  R11_2    
-        29       1474 33101  53682 15R  R11_1    
-        29       1475 33101  51999 15L  R9_2     
-        29       1476 33101  52054 15R  R9_2     
-        29       1477 33101  52004 15L  R9_2     
-        29       1478 33101  52059 15R  R9_2     
-        29       1479 33101  54129 15L  R11_2    
-        29       1480 33101  28195 15R  S6_3b    
-        29       1481 33101  27078 15L  S6_2b    
-        29       1482 33101  52045 15R  R9_2     
-        29       1483 33101  51995 15L  R9_2     
-        29       1484 33101  52050 15R  R9_2     
-        29       1485 33101  53650 15L  R11_1    
-        29       1486 33101  53670 15R  R11_1    
-        29       1487 33101  53655 15L  R11_1    
-        29       1488 33101  53675 15R  R11_1    
-        29       1489 33101  53660 15L  R11_1    
-        29       1490 33101  53680 15R  R11_1    
-        29       1491 33101  53648 15L  R11_1    
-        29       1492 33101  53681 15R  R11_1    
-        29       1493 33101  54125 15L  R11_2    
-        29       1494 33101  53685 15R  R11_1    
-        29       1495 33101  52000 15L  R9_2     
-        29       1496 33101  52055 15R  R9_2     
-        29       1497 33101  52005 15L  R9_2     
-        29       1498 33101  52060 15R  R9_2     
-        29       1499 33101  54130 15L  R11_2    
-        29       1500 33101  28196 15R  S6_3b    
-        29       1501 33106    814 16L  EBP06    
-        29       1502 33106    841 16R  EBP06    
-        29       1503 33106    761 16L  EBP06    
-        29       1504 33106    831 16R  EBP06    
-        29       1505 33106    771 16L  EBP06    
-        29       1506 33106    836 16R  EBP06    
-        29       1507 33106    787 16L  EBP06    
-        29       1508 33106    861 16R  EBP06    
-        29       1509 33106    827 16L  EBP06    
-        29       1510 33106    897 16R  EBP06    
-        29       1511 33106    796 16L  EBP06    
-        29       1512 33106    899 16R  EBP06    
-        29       1513 33106    763 16L  EBP06    
-        29       1514 33106    846 16R  EBP06    
-        29       1515 33106    786 16L  EBP06    
-        29       1516 33106    898 16R  EBP06    
-        29       1517 33106    802 16L  EBP06    
-        29       1518 33106    880 16R  EBP06    
-        29       1519 33106    823 16L  EBP06    
-        29       1520 33106   1118 16R  EBP08    
-        29       1521 33106    806 16L  EBP06    
-        29       1522 33106    842 16R  EBP06    
-        29       1523 33106    810 16L  EBP06    
-        29       1524 33106    832 16R  EBP06    
-        29       1525 33106    776 16L  EBP06    
-        29       1526 33106    837 16R  EBP06    
-        29       1527 33106    789 16L  EBP06    
-        29       1528 33106    863 16R  EBP06    
-        29       1529 33106    770 16L  EBP06    
-        29       1530 33106    892 16R  EBP06    
-        29       1531 33106    797 16L  EBP06    
-        29       1532 33106    857 16R  EBP06    
-        29       1533 33106    764 16L  EBP06    
-        29       1534 33106    847 16R  EBP06    
-        29       1535 33106    788 16L  EBP06    
-        29       1536 33106    327 16R  EBP02    
-        29       1537 33106    805 16L  EBP06    
-        29       1538 33106    881 16R  EBP06    
-        29       1539 33106    822 16L  EBP06    
-        29       1540 33106   1119 16R  EBP08    
-        29       1541 33106    795 16L  EBP06    
-        29       1542 33106    843 16R  EBP06    
-        29       1543 33106    812 16L  EBP06    
-        29       1544 33106    833 16R  EBP06    
-        29       1545 33106    777 16L  EBP06    
-        29       1546 33106    838 16R  EBP06    
-        29       1547 33106    792 16L  EBP06    
-        29       1548 33106    865 16R  EBP06    
-        29       1549 33106    781 16L  EBP06    
-        29       1550 33106    893 16R  EBP06    
-        29       1551 33106    798 16L  EBP06    
-        29       1552 33106    858 16R  EBP06    
-        29       1553 33106    768 16L  EBP06    
-        29       1554 33106    900 16R  EBP06    
-        29       1555 33106    799 16L  EBP06    
-        29       1556 33106    835 16R  EBP06    
-        29       1557 33106    808 16L  EBP06    
-        29       1558 33106    884 16R  EBP06    
-        29       1559 33106    818 16L  EBP06    
-        29       1560 33106   1128 16R  EBP08    
-        29       1561 33106    791 16L  EBP06    
-        29       1562 33106    853 16R  EBP06    
-        29       1563 33106    813 16L  EBP06    
-        29       1564 33106    879 16R  EBP06    
-        29       1565 33106    816 16L  EBP06    
-        29       1566 33106    839 16R  EBP06    
-        29       1567 33106    793 16L  EBP06    
-        29       1568 33106    886 16R  EBP06    
-        29       1569 33106    784 16L  EBP06    
-        29       1570 33106    894 16R  EBP06    
-        29       1571 33106    803 16L  EBP06    
-        29       1572 33106    859 16R  EBP06    
-        29       1573 33106    782 16L  EBP06    
-        29       1574 33106    849 16R  EBP06    
-        29       1575 33106    800 16L  EBP06    
-        29       1576 33106    862 16R  EBP06    
-        29       1577 33106    809 16L  EBP06    
-        29       1578 33106    885 16R  EBP06    
-        29       1579 33106    819 16L  EBP06    
-        29       1580 33106   1177 16R  EBP08    
-        29       1581 33106    773 16L  EBP06    
-        29       1582 33106    854 16R  EBP06    
-        29       1583 33106    821 16L  EBP06    
-        29       1584 33106    883 16R  EBP06    
-        29       1585 33106    820 16L  EBP06    
-        29       1586 33106    840 16R  EBP06    
-        29       1587 33106    794 16L  EBP06    
-        29       1588 33106    887 16R  EBP06    
-        29       1589 33106    785 16L  EBP06    
-        29       1590 33106    895 16R  EBP06    
-        29       1591 33106    804 16L  EBP06    
-        29       1592 33106    860 16R  EBP06    
-        29       1593 33106    783 16L  EBP06    
-        29       1594 33106    850 16R  EBP06    
-        29       1595 33106    801 16L  EBP06    
-        29       1596 33106    866 16R  EBP06    
-        29       1597 33106    815 16L  EBP06    
-        29       1598 33106    891 16R  EBP06    
-        29       1599 33106    828 16L  EBP06    
-        29       1600 33106    896 16R  EBP06    
-        29       1601 33106    139 17L  SICEB02  
-        29       1602 33106     90 17R  SICEB1_1 
-        29       1603 33106    694 17L  EBP05    
-        29       1604 33106    749 17R  EBP05    
-        29       1605 33106    681 17L  EBP05    
-        29       1606 33106    736 17R  EBP05    
-        29       1607 33106    686 17L  EBP05    
-        29       1608 33106    746 17R  EBP05    
-        29       1609 33106    692 17L  EBP05    
-        29       1610 33106    989 17R  EBP07    
-        29       1611 33106    928 17L  EBP07    
-        29       1612 33106    994 17R  EBP07    
-        29       1613 33106    939 17L  EBP07    
-        29       1614 33106   1007 17R  EBP07    
-        29       1615 33106    945 17L  EBP07    
-        29       1616 33106   1017 17R  EBP07    
-        29       1617 33106    951 17L  EBP07    
-        29       1618 33106   1035 17R  EBP07    
-        29       1619 33106    958 17L  EBP07    
-        29       1620 33106    753 17R  EBP05    
-        29       1621 33106    222 17L  EBP01    
-        29       1622 33106    163 17R  SICEB02  
-        29       1623 33106    695 17L  EBP05    
-        29       1624 33106    752 17R  EBP05    
-        29       1625 33106    682 17L  EBP05    
-        29       1626 33106    737 17R  EBP05    
-        29       1627 33106    687 17L  EBP05    
-        29       1628 33106    745 17R  EBP05    
-        29       1629 33106    693 17L  EBP05    
-        29       1630 33106    990 17R  EBP07    
-        29       1631 33106    930 17L  EBP07    
-        29       1632 33106    995 17R  EBP07    
-        29       1633 33106    940 17L  EBP07    
-        29       1634 33106   1010 17R  EBP07    
-        29       1635 33106    946 17L  EBP07    
-        29       1636 33106   1020 17R  EBP07    
-        29       1637 33106    952 17L  EBP07    
-        29       1638 33106   1037 17R  EBP07    
-        29       1639 33106    957 17L  EBP07    
-        29       1640 33106    758 17R  EBP05    
-        29       1641 33106    925 17L  EBP07    
-        29       1642 33106    741 17R  EBP05    
-        29       1643 33106    356 17L  EBP03    
-        29       1644 33106    754 17R  EBP05    
-        29       1645 33106    683 17L  EBP05    
-        29       1646 33106    738 17R  EBP05    
-        29       1647 33106    691 17L  EBP05    
-        29       1648 33106    973 17R  EBP07    
-        29       1649 33106    678 17L  EBP05    
-        29       1650 33106    991 17R  EBP07    
-        29       1651 33106    931 17L  EBP07    
-        29       1652 33106    996 17R  EBP07    
-        29       1653 33106    245 17L  EBP01    
-        29       1654 33106   1011 17R  EBP07    
-        29       1655 33106    947 17L  EBP07    
-        29       1656 33106   1026 17R  EBP07    
-        29       1657 33106    953 17L  EBP07    
-        29       1658 33106    708 17R  EBP05    
-        29       1659 33106    960 17L  EBP07    
-        29       1660 33106    756 17R  EBP05    
-        29       1661 33106    927 17L  EBP07    
-        29       1662 33106    743 17R  EBP05    
-        29       1663 33106    366 17L  EBP03    
-        29       1664 33106    755 17R  EBP05    
-        29       1665 33106    684 17L  EBP05    
-        29       1666 33106    740 17R  EBP05    
-        29       1667 33106    689 17L  EBP05    
-        29       1668 33106    985 17R  EBP07    
-        29       1669 33106    679 17L  EBP05    
-        29       1670 33106    992 17R  EBP07    
-        29       1671 33106    932 17L  EBP07    
-        29       1672 33106    998 17R  EBP07    
-        29       1673 33106    942 17L  EBP07    
-        29       1674 33106   1014 17R  EBP07    
-        29       1675 33106    948 17L  EBP07    
-        29       1676 33106   1028 17R  EBP07    
-        29       1677 33106    954 17L  EBP07    
-        29       1678 33106    729 17R  EBP05    
-        29       1679 33106    966 17L  EBP07    
-        29       1680 33106    757 17R  EBP05    
-        29       1681 33106    970 17L  EBP07    
-        29       1682 33106    748 17R  EBP05    
-        29       1683 33106    368 17L  EBP03    
-        29       1684 33106    759 17R  EBP05    
-        29       1685 33106    685 17L  EBP05    
-        29       1686 33106    742 17R  EBP05    
-        29       1687 33106    690 17L  EBP05    
-        29       1688 33106    988 17R  EBP07    
-        29       1689 33106    680 17L  EBP05    
-        29       1690 33106    747 17R  EBP05    
-        29       1691 33106    120 17L  SICEB02  
-        29       1692 33106    751 17R  EBP05    
-        29       1693 33106    944 17L  EBP07    
-        29       1694 33106   1015 17R  EBP07    
-        29       1695 33106    949 17L  EBP07    
-        29       1696 33106   1031 17R  EBP07    
-        29       1697 33106    956 17L  EBP07    
-        29       1698 33106    734 17R  EBP05    
-        29       1699 33106    116 17L  SICEB02  
-        29       1700 33106    731 17R  EBP05    
-        30          1 33101  38905 1L   P017     
-        30          2 33101  53526 1R   R11_1    
-        30          3 33101  53516 1L   R11_1    
-        30          4 33101  53531 1R   R11_1    
-        30          5 33101  53521 1L   R11_1    
-        30          6 33101  54271 1R   R12_1    
-        30          7 33101  54876 1L   R12_2    
-        30          8 33101  54276 1R   R12_1    
-        30          9 33101  54881 1L   R12_2    
-        30         10 33101  54281 1R   R12_1    
-        30         11 33101  54886 1L   R12_2    
-        30         12 33101  54286 1R   R12_1    
-        30         13 33101  54891 1L   R12_2    
-        30         14 33101  53530 1R   R11_1    
-        30         15 33101  54896 1L   R12_2    
-        30         16 33101  54926 1R   R12_2    
-        30         17 33101  54901 1L   R12_2    
-        30         18 33101  54931 1R   R12_2    
-        30         19 33101  54906 1L   R12_2    
-        30         20 33101  38929 1R   P017     
-        30         21 33101  38906 1L   P017     
-        30         22 33101  53527 1R   R11_1    
-        30         23 33101  53517 1L   R11_1    
-        30         24 33101  53532 1R   R11_1    
-        30         25 33101  54872 1L   R12_2    
-        30         26 33101  54272 1R   R12_1    
-        30         27 33101  54877 1L   R12_2    
-        30         28 33101  54277 1R   R12_1    
-        30         29 33101  54882 1L   R12_2    
-        30         30 33101  54282 1R   R12_1    
-        30         31 33101  54887 1L   R12_2    
-        30         32 33101  54287 1R   R12_1    
-        30         33 33101  54892 1L   R12_2    
-        30         34 33101  54922 1R   R12_2    
-        30         35 33101  54911 1L   R12_2    
-        30         36 33101  54927 1R   R12_2    
-        30         37 33101  54902 1L   R12_2    
-        30         38 33101  54932 1R   R12_2    
-        30         39 33101  54907 1L   R12_2    
-        30         40 33101  38930 1R   P017     
-        30         41 33101  38907 1L   P017     
-        30         42 33101  53528 1R   R11_1    
-        30         43 33101  53518 1L   R11_1    
-        30         44 33101  53523 1R   R11_1    
-        30         45 33101  54873 1L   R12_2    
-        30         46 33101  54273 1R   R12_1    
-        30         47 33101  54878 1L   R12_2    
-        30         48 33101  54278 1R   R12_1    
-        30         49 33101  54883 1L   R12_2    
-        30         50 33101  54283 1R   R12_1    
-        30         51 33101  54888 1L   R12_2    
-        30         52 33101  54288 1R   R12_1    
-        30         53 33101  54893 1L   R12_2    
-        30         54 33101  54923 1R   R12_2    
-        30         55 33101  54898 1L   R12_2    
-        30         56 33101  54928 1R   R12_2    
-        30         57 33101  54903 1L   R12_2    
-        30         58 33101  54933 1R   R12_2    
-        30         59 33101  54908 1L   R12_2    
-        30         60 33101  38931 1R   P017     
-        30         61 33101  38908 1L   P017     
-        30         62 33101  53529 1R   R11_1    
-        30         63 33101  52921 1L   R10_2    
-        30         64 33101  53524 1R   R11_1    
-        30         65 33101  54874 1L   R12_2    
-        30         66 33101  54274 1R   R12_1    
-        30         67 33101  54879 1L   R12_2    
-        30         68 33101  54279 1R   R12_1    
-        30         69 33101  54884 1L   R12_2    
-        30         70 33101  54284 1R   R12_1    
-        30         71 33101  54889 1L   R12_2    
-        30         72 33101  54289 1R   R12_1    
-        30         73 33101  54894 1L   R12_2    
-        30         74 33101  54924 1R   R12_2    
-        30         75 33101  54899 1L   R12_2    
-        30         76 33101  54929 1R   R12_2    
-        30         77 33101  54904 1L   R12_2    
-        30         78 33101  54934 1R   R12_2    
-        30         79 33101  54909 1L   R12_2    
-        30         80 33101  38932 1R   P017     
-        30         81 33101  38910 1L   P017     
-        30         82 33101  38934 1R   P017     
-        30         83 33101  53520 1L   R11_1    
-        30         84 33101  53525 1R   R11_1    
-        30         85 33101  54875 1L   R12_2    
-        30         86 33101  54275 1R   R12_1    
-        30         87 33101  54880 1L   R12_2    
-        30         88 33101  54280 1R   R12_1    
-        30         89 33101  54885 1L   R12_2    
-        30         90 33101  54285 1R   R12_1    
-        30         91 33101  53522 1L   R11_1    
-        30         92 33101  54936 1R   R12_2    
-        30         93 33101  54895 1L   R12_2    
-        30         94 33101  54925 1R   R12_2    
-        30         95 33101  54900 1L   R12_2    
-        30         96 33101  54930 1R   R12_2    
-        30         97 33101  54905 1L   R12_2    
-        30         98 33101  54935 1R   R12_2    
-        30         99 33101  54910 1L   R12_2    
-        30        100 33101  38933 1R   P017     
-        30        101 33101  35103 2L   S8_5     
-        30        102 33101  52448 2R   R10_1    
-        30        103 33101  53539 2L   R11_1    
-        30        104 33101  53571 2R   R11_1    
-        30        105 33101  53546 2L   R11_1    
-        30        106 33101  54981 2R   R12_2    
-        30        107 33101  54011 2L   R11_2    
-        30        108 33101  54986 2R   R12_2    
-        30        109 33101  54291 2L   R12_1    
-        30        110 33101  54991 2R   R12_2    
-        30        111 33101  54946 2L   R12_2    
-        30        112 33101  54996 2R   R12_2    
-        30        113 33101  54951 2L   R12_2    
-        30        114 33101  55001 2R   R12_2    
-        30        115 33101  54956 2L   R12_2    
-        30        116 33101  55006 2R   R12_2    
-        30        117 33101  54961 2L   R12_2    
-        30        118 33101  55011 2R   R12_2    
-        30        119 33101  54966 2L   R12_2    
-        30        120 33101  35702 2R   P15_2    
-        30        121 33101  35115 2L   S8_5     
-        30        122 33101  53016 2R   R10_2    
-        30        123 33101  53540 2L   R11_1    
-        30        124 33101  53572 2R   R11_1    
-        30        125 33101  53547 2L   R11_1    
-        30        126 33101  54982 2R   R12_2    
-        30        127 33101  54012 2L   R11_2    
-        30        128 33101  54987 2R   R12_2    
-        30        129 33101  54292 2L   R12_1    
-        30        130 33101  54992 2R   R12_2    
-        30        131 33101  54947 2L   R12_2    
-        30        132 33101  54997 2R   R12_2    
-        30        133 33101  54952 2L   R12_2    
-        30        134 33101  55002 2R   R12_2    
-        30        135 33101  54957 2L   R12_2    
-        30        136 33101  55007 2R   R12_2    
-        30        137 33101  54962 2L   R12_2    
-        30        138 33101  55012 2R   R12_2    
-        30        139 33101  54967 2L   R12_2    
-        30        140 33101  38346 2R   S9_6     
-        30        141 33101  35116 2L   S8_5     
-        30        142 33101  53558 2R   R11_1    
-        30        143 33101  51296 2L   R9_1     
-        30        144 33101  54979 2R   R12_2    
-        30        145 33101  52999 2L   R10_2    
-        30        146 33101  54983 2R   R12_2    
-        30        147 33101  54013 2L   R11_2    
-        30        148 33101  54988 2R   R12_2    
-        30        149 33101  54293 2L   R12_1    
-        30        150 33101  54993 2R   R12_2    
-        30        151 33101  54948 2L   R12_2    
-        30        152 33101  54998 2R   R12_2    
-        30        153 33101  54953 2L   R12_2    
-        30        154 33101  55003 2R   R12_2    
-        30        155 33101  54958 2L   R12_2    
-        30        156 33101  55008 2R   R12_2    
-        30        157 33101  54963 2L   R12_2    
-        30        158 33101  55013 2R   R12_2    
-        30        159 33101  54968 2L   R12_2    
-        30        160 33101  41667 2R   S10_6    
-        30        161 33101  35133 2L   S8_5     
-        30        162 33101  53559 2R   R11_1    
-        30        163 33101  53544 2L   R11_1    
-        30        164 33101  54980 2R   R12_2    
-        30        165 33101  54944 2L   R12_2    
-        30        166 33101  54984 2R   R12_2    
-        30        167 33101  54014 2L   R11_2    
-        30        168 33101  54989 2R   R12_2    
-        30        169 33101  54294 2L   R12_1    
-        30        170 33101  54994 2R   R12_2    
-        30        171 33101  54949 2L   R12_2    
-        30        172 33101  54999 2R   R12_2    
-        30        173 33101  54954 2L   R12_2    
-        30        174 33101  55004 2R   R12_2    
-        30        175 33101  54959 2L   R12_2    
-        30        176 33101  55018 2R   R12_2    
-        30        177 33101  54964 2L   R12_2    
-        30        178 33101  55014 2R   R12_2    
-        30        179 33101  54971 2L   R12_2    
-        30        180 33101  41670 2R   S10_6    
-        30        181 33101  35140 2L   S8_5     
-        30        182 33101  53560 2R   R11_1    
-        30        183 33101  53545 2L   R11_1    
-        30        184 33101  55016 2R   R12_2    
-        30        185 33101  54945 2L   R12_2    
-        30        186 33101  54985 2R   R12_2    
-        30        187 33101  54015 2L   R11_2    
-        30        188 33101  54990 2R   R12_2    
-        30        189 33101  54295 2L   R12_1    
-        30        190 33101  54995 2R   R12_2    
-        30        191 33101  54950 2L   R12_2    
-        30        192 33101  55017 2R   R12_2    
-        30        193 33101  54955 2L   R12_2    
-        30        194 33101  55005 2R   R12_2    
-        30        195 33101  54960 2L   R12_2    
-        30        196 33101  55010 2R   R12_2    
-        30        197 33101  54965 2L   R12_2    
-        30        198 33101  55015 2R   R12_2    
-        30        199 33101  22104 2L   S5       
-        30        200 33101  42521 2R   R1_1     
-        30        201 33101  26576 3L   S6_2     
-        30        202 33101  39005 3R   P017     
-        30        203 33101  54019 3L   R11_2    
-        30        204 33101  54031 3R   R11_2    
-        30        205 33101  54301 3L   R12_1    
-        30        206 33101  54036 3R   R11_2    
-        30        207 33101  55029 3L   R12_2    
-        30        208 33101  54030 3R   R11_2    
-        30        209 33101  54306 3L   R12_1    
-        30        210 33101  54331 3R   R12_1    
-        30        211 33101  54311 3L   R12_1    
-        30        212 33101  54326 3R   R12_1    
-        30        213 33101  54316 3L   R12_1    
-        30        214 33101  55051 3R   R12_2    
-        30        215 33101  55031 3L   R12_2    
-        30        216 33101  55056 3R   R12_2    
-        30        217 33101  55036 3L   R12_2    
-        30        218 33101  55049 3R   R12_2    
-        30        219 33101  38753 3L   P016     
-        30        220 33101  29077 3R   P13      
-        30        221 33101  26577 3L   S6_2     
-        30        222 33101  39006 3R   P017     
-        30        223 33101  54020 3L   R11_2    
-        30        224 33101  54032 3R   R11_2    
-        30        225 33101  54302 3L   R12_1    
-        30        226 33101  54037 3R   R11_2    
-        30        227 33101  54321 3L   R12_1    
-        30        228 33101  54322 3R   R12_1    
-        30        229 33101  54307 3L   R12_1    
-        30        230 33101  54332 3R   R12_1    
-        30        231 33101  54312 3L   R12_1    
-        30        232 33101  54327 3R   R12_1    
-        30        233 33101  54317 3L   R12_1    
-        30        234 33101  55052 3R   R12_2    
-        30        235 33101  55032 3L   R12_2    
-        30        236 33101  55057 3R   R12_2    
-        30        237 33101  55037 3L   R12_2    
-        30        238 33101  55050 3R   R12_2    
-        30        239 33101  38754 3L   P016     
-        30        240 33101  29113 3R   P13      
-        30        241 33101  26581 3L   S6_2     
-        30        242 33101  39007 3R   P017     
-        30        243 33101  54021 3L   R11_2    
-        30        244 33101  54033 3R   R11_2    
-        30        245 33101  54303 3L   R12_1    
-        30        246 33101  54038 3R   R11_2    
-        30        247 33101  54298 3L   R12_1    
-        30        248 33101  54323 3R   R12_1    
-        30        249 33101  54308 3L   R12_1    
-        30        250 33101  54333 3R   R12_1    
-        30        251 33101  54313 3L   R12_1    
-        30        252 33101  54328 3R   R12_1    
-        30        253 33101  54318 3L   R12_1    
-        30        254 33101  55053 3R   R12_2    
-        30        255 33101  55033 3L   R12_2    
-        30        256 33101  55058 3R   R12_2    
-        30        257 33101  55038 3L   R12_2    
-        30        258 33101  55061 3R   R12_2    
-        30        259 33101  38755 3L   P016     
-        30        260 33101  30818 3R   S7_3     
-        30        261 33101  27001 3L   S6_2b    
-        30        262 33101  39008 3R   P017     
-        30        263 33101  54022 3L   R11_2    
-        30        264 33101  54034 3R   R11_2    
-        30        265 33101  54304 3L   R12_1    
-        30        266 33101  54039 3R   R11_2    
-        30        267 33101  54299 3L   R12_1    
-        30        268 33101  54324 3R   R12_1    
-        30        269 33101  54309 3L   R12_1    
-        30        270 33101  54334 3R   R12_1    
-        30        271 33101  54314 3L   R12_1    
-        30        272 33101  54329 3R   R12_1    
-        30        273 33101  54319 3L   R12_1    
-        30        274 33101  55054 3R   R12_2    
-        30        275 33101  55034 3L   R12_2    
-        30        276 33101  55059 3R   R12_2    
-        30        277 33101  55039 3L   R12_2    
-        30        278 33101  55062 3R   R12_2    
-        30        279 33101  38756 3L   P016     
-        30        280 33101  30819 3R   S7_3     
-        30        281 33101  29021 3L   P13      
-        30        282 33101  39010 3R   P017     
-        30        283 33101  54023 3L   R11_2    
-        30        284 33101  54035 3R   R11_2    
-        30        285 33101  54305 3L   R12_1    
-        30        286 33101  54029 3R   R11_2    
-        30        287 33101  54300 3L   R12_1    
-        30        288 33101  54325 3R   R12_1    
-        30        289 33101  54310 3L   R12_1    
-        30        290 33101  55048 3R   R12_2    
-        30        291 33101  54315 3L   R12_1    
-        30        292 33101  54330 3R   R12_1    
-        30        293 33101  55030 3L   R12_2    
-        30        294 33101  55055 3R   R12_2    
-        30        295 33101  55035 3L   R12_2    
-        30        296 33101  55060 3R   R12_2    
-        30        297 33101  55040 3L   R12_2    
-        30        298 33101  55063 3R   R12_2    
-        30        299 33101  38757 3L   P016     
-        30        300 33101  32064 3R   S07_5    
-        30        301 33101  29151 4L   P13      
-        30        302 33101  39067 4R   P017     
-        30        303 33101  54046 4L   R11_2    
-        30        304 33101  54061 4R   R11_2    
-        30        305 33101  54051 4L   R11_2    
-        30        306 33101  54066 4R   R11_2    
-        30        307 33101  54336 4L   R12_1    
-        30        308 33101  54341 4R   R12_1    
-        30        309 33101  55082 4L   R12_2    
-        30        310 33101  49785 4R   R7_2     
-        30        311 33101  54044 4L   R11_2    
-        30        312 33101  54346 4R   R12_1    
-        30        313 33101  55089 4L   R12_2    
-        30        314 33101  55096 4R   R12_2    
-        30        315 33101  55391 4L   R13_1    
-        30        316 33101  55101 4R   R12_2    
-        30        317 33101  55396 4L   R13_1    
-        30        318 33101  55106 4R   R12_2    
-        30        319 33101  39040 4L   P017     
-        30        320 33101  26721 4R   S6_2     
-        30        321 33101  29158 4L   P13      
-        30        322 33101  39068 4R   P017     
-        30        323 33101  54047 4L   R11_2    
-        30        324 33101  54062 4R   R11_2    
-        30        325 33101  54052 4L   R11_2    
-        30        326 33101  54067 4R   R11_2    
-        30        327 33101  54337 4L   R12_1    
-        30        328 33101  54342 4R   R12_1    
-        30        329 33101  55083 4L   R12_2    
-        30        330 33101  51419 4R   R9_1     
-        30        331 33101  54045 4L   R11_2    
-        30        332 33101  54347 4R   R12_1    
-        30        333 33101  55090 4L   R12_2    
-        30        334 33101  55097 4R   R12_2    
-        30        335 33101  55392 4L   R13_1    
-        30        336 33101  55102 4R   R12_2    
-        30        337 33101  55397 4L   R13_1    
-        30        338 33101  55107 4R   R12_2    
-        30        339 33101  39041 4L   P017     
-        30        340 33101  26722 4R   S6_2     
-        30        341 33101  30244 4L   S7_2     
-        30        342 33101  39070 4R   P017     
-        30        343 33101  54048 4L   R11_2    
-        30        344 33101  54063 4R   R11_2    
-        30        345 33101  54053 4L   R11_2    
-        30        346 33101  54068 4R   R11_2    
-        30        347 33101  54338 4L   R12_1    
-        30        348 33101  54343 4R   R12_1    
-        30        349 33101  55084 4L   R12_2    
-        30        350 33101  54071 4R   R11_2    
-        30        351 33101  55086 4L   R12_2    
-        30        352 33101  54348 4R   R12_1    
-        30        353 33101  55091 4L   R12_2    
-        30        354 33101  55098 4R   R12_2    
-        30        355 33101  55393 4L   R13_1    
-        30        356 33101  55103 4R   R12_2    
-        30        357 33101  55398 4L   R13_1    
-        30        358 33101  55108 4R   R12_2    
-        30        359 33101  39042 4L   P017     
-        30        360 33101  26727 4R   S6_2     
-        30        361 33101  30820 4L   S7_3     
-        30        362 33101  39071 4R   P017     
-        30        363 33101  54049 4L   R11_2    
-        30        364 33101  54064 4R   R11_2    
-        30        365 33101  54054 4L   R11_2    
-        30        366 33101  54069 4R   R11_2    
-        30        367 33101  54339 4L   R12_1    
-        30        368 33101  54344 4R   R12_1    
-        30        369 33101  55085 4L   R12_2    
-        30        370 33101  54072 4R   R11_2    
-        30        371 33101  55087 4L   R12_2    
-        30        372 33101  55094 4R   R12_2    
-        30        373 33101  55092 4L   R12_2    
-        30        374 33101  55099 4R   R12_2    
-        30        375 33101  55394 4L   R13_1    
-        30        376 33101  55104 4R   R12_2    
-        30        377 33101  55399 4L   R13_1    
-        30        378 33101  55109 4R   R12_2    
-        30        379 33101  39043 4L   P017     
-        30        380 33101  26728 4R   S6_2     
-        30        381 33101  30822 4L   S7_3     
-        30        382 33101  39072 4R   P017     
-        30        383 33101  54050 4L   R11_2    
-        30        384 33101  54065 4R   R11_2    
-        30        385 33101  54055 4L   R11_2    
-        30        386 33101  54070 4R   R11_2    
-        30        387 33101  54340 4L   R12_1    
-        30        388 33101  54345 4R   R12_1    
-        30        389 33101  54335 4L   R12_1    
-        30        390 33101  55111 4R   R12_2    
-        30        391 33101  55088 4L   R12_2    
-        30        392 33101  55095 4R   R12_2    
-        30        393 33101  55093 4L   R12_2    
-        30        394 33101  55100 4R   R12_2    
-        30        395 33101  55395 4L   R13_1    
-        30        396 33101  55105 4R   R12_2    
-        30        397 33101  55400 4L   R13_1    
-        30        398 33101  55110 4R   R12_2    
-        30        399 33101  39044 4L   P017     
-        30        400 33101  29179 4R   P13      
-        30        401 33101  29221 5L   P13      
-        30        402 33101  39121 5R   P017     
-        30        403 33101  54079 5L   R11_2    
-        30        404 33101  54090 5R   R11_2    
-        30        405 33101  54351 5L   R12_1    
-        30        406 33101  54096 5R   R11_2    
-        30        407 33101  55115 5L   R12_2    
-        30        408 33101  54356 5R   R12_1    
-        30        409 33101  55120 5L   R12_2    
-        30        410 33101  54361 5R   R12_1    
-        30        411 33101  55125 5L   R12_2    
-        30        412 33101  54089 5R   R11_2    
-        30        413 33101  55451 5L   R13_1    
-        30        414 33101  55131 5R   R12_2    
-        30        415 33101  55456 5L   R13_1    
-        30        416 33101  55129 5R   R12_2    
-        30        417 33101  55461 5L   R13_1    
-        30        418 33101  55496 5R   R13_1    
-        30        419 33101  55466 5L   R13_1    
-        30        420 33101  42685 5R   R1_1     
-        30        421 33101  29223 5L   P13      
-        30        422 33101  39122 5R   P017     
-        30        423 33101  54080 5L   R11_2    
-        30        424 33101  54091 5R   R11_2    
-        30        425 33101  54352 5L   R12_1    
-        30        426 33101  54097 5R   R11_2    
-        30        427 33101  55116 5L   R12_2    
-        30        428 33101  54357 5R   R12_1    
-        30        429 33101  55121 5L   R12_2    
-        30        430 33101  54362 5R   R12_1    
-        30        431 33101  55126 5L   R12_2    
-        30        432 33101  54101 5R   R11_2    
-        30        433 33101  55452 5L   R13_1    
-        30        434 33101  55132 5R   R12_2    
-        30        435 33101  55457 5L   R13_1    
-        30        436 33101  54367 5R   R12_1    
-        30        437 33101  55462 5L   R13_1    
-        30        438 33101  55497 5R   R13_1    
-        30        439 33101  55467 5L   R13_1    
-        30        440 33101  30833 5R   S7_3     
-        30        441 33101  29224 5L   P13      
-        30        442 33101  39123 5R   P017     
-        30        443 33101  54081 5L   R11_2    
-        30        444 33101  54093 5R   R11_2    
-        30        445 33101  54353 5L   R12_1    
-        30        446 33101  54098 5R   R11_2    
-        30        447 33101  55117 5L   R12_2    
-        30        448 33101  54358 5R   R12_1    
-        30        449 33101  55122 5L   R12_2    
-        30        450 33101  54363 5R   R12_1    
-        30        451 33101  55127 5L   R12_2    
-        30        452 33101  54102 5R   R11_2    
-        30        453 33101  55453 5L   R13_1    
-        30        454 33101  55133 5R   R12_2    
-        30        455 33101  55458 5L   R13_1    
-        30        456 33101  54368 5R   R12_1    
-        30        457 33101  55463 5L   R13_1    
-        30        458 33101  55498 5R   R13_1    
-        30        459 33101  55468 5L   R13_1    
-        30        460 33101  32263 5R   S07_5    
-        30        461 33101  30272 5L   S7_2     
-        30        462 33101  39124 5R   P017     
-        30        463 33101  54082 5L   R11_2    
-        30        464 33101  54094 5R   R11_2    
-        30        465 33101  54354 5L   R12_1    
-        30        466 33101  54099 5R   R11_2    
-        30        467 33101  55118 5L   R12_2    
-        30        468 33101  54359 5R   R12_1    
-        30        469 33101  55123 5L   R12_2    
-        30        470 33101  54364 5R   R12_1    
-        30        471 33101  55128 5L   R12_2    
-        30        472 33101  54355 5R   R12_1    
-        30        473 33101  55454 5L   R13_1    
-        30        474 33101  55134 5R   R12_2    
-        30        475 33101  55471 5L   R13_1    
-        30        476 33101  55130 5R   R12_2    
-        30        477 33101  55464 5L   R13_1    
-        30        478 33101  55499 5R   R13_1    
-        30        479 33101  55469 5L   R13_1    
-        30        480 33101  32271 5R   S07_5    
-        30        481 33101  32199 5L   S07_5    
-        30        482 33101  39125 5R   P017     
-        30        483 33101  54083 5L   R11_2    
-        30        484 33101  54095 5R   R11_2    
-        30        485 33101  54349 5L   R12_1    
-        30        486 33101  54100 5R   R11_2    
-        30        487 33101  55119 5L   R12_2    
-        30        488 33101  54360 5R   R12_1    
-        30        489 33101  55124 5L   R12_2    
-        30        490 33101  54365 5R   R12_1    
-        30        491 33101  54350 5L   R12_1    
-        30        492 33101  54366 5R   R12_1    
-        30        493 33101  55455 5L   R13_1    
-        30        494 33101  55135 5R   R12_2    
-        30        495 33101  55460 5L   R13_1    
-        30        496 33101  55136 5R   R12_2    
-        30        497 33101  55465 5L   R13_1    
-        30        498 33101  55500 5R   R13_1    
-        30        499 33101  55470 5L   R13_1    
-        30        500 33101  33532 5R   S8_2     
-        30        501 33101  34346 6L   S8_4     
-        30        502 33101  53212 6R   R10_2    
-        30        503 33101  54159 6L   R11_2    
-        30        504 33101  54171 6R   R11_2    
-        30        505 33101  55560 6L   R13_1    
-        30        506 33101  55159 6R   R12_2    
-        30        507 30301     72 6L   B01      
-        30        508 30301     45 6R   B01      
-        30        509 30301     56 6L   B01      
-        30        510 30301     15 6R   B01      
-        30        511 30301    524 6L   B04      
-        30        512 30301     39 6R   B01      
-        30        513 30301    517 6L   B04      
-        30        514 30301      9 6R   B01      
-        30        515 30301     94 6L   B01      
-        30        516 30301      6 6R   B01      
-        30        517 33101  54149 6L   R11_2    
-        30        518 33101  54176 6R   R11_2    
-        30        519 33101  53202 6L   R10_2    
-        30        520 33101  38843 6R   P17      
-        30        521 33101  39527 6L   S10_1    
-        30        522 33101  53223 6R   R10_2    
-        30        523 33101  54160 6L   R11_2    
-        30        524 33101  54172 6R   R11_2    
-        30        525 33101  55566 6L   R13_1    
-        30        526 33101  55160 6R   R12_2    
-        30        527 30301     74 6L   B01      
-        30        528 30301     46 6R   B01      
-        30        529 30301     60 6L   B01      
-        30        530 30301     17 6R   B01      
-        30        531 30301    526 6L   B04      
-        30        532 30301     40 6R   B01      
-        30        533 30301     93 6L   B01      
-        30        534 30301     11 6R   B01      
-        30        535 30301    519 6L   B04      
-        30        536 30301      5 6R   B01      
-        30        537 33101  54150 6L   R11_2    
-        30        538 33101  54177 6R   R11_2    
-        30        539 33101  53203 6L   R10_2    
-        30        540 33101  38844 6R   P17      
-        30        541 33101  39528 6L   S10_1    
-        30        542 33101  54186 6R   R11_2    
-        30        543 33101  54170 6L   R11_2    
-        30        544 33101  54173 6R   R11_2    
-        30        545 33101  55567 6L   R13_1    
-        30        546 33101  55161 6R   R12_2    
-        30        547 30301     76 6L   B01      
-        30        548 30301     47 6R   B01      
-        30        549 30301     61 6L   B01      
-        30        550 30301     22 6R   B01      
-        30        551 30301    527 6L   B04      
-        30        552 30301     42 6R   B01      
-        30        553 30301     90 6L   B01      
-        30        554 30301     12 6R   B01      
-        30        555 30301    520 6L   B04      
-        30        556 30301      2 6R   B01      
-        30        557 33101  54169 6L   R11_2    
-        30        558 33101  54178 6R   R11_2    
-        30        559 33101  53204 6L   R10_2    
-        30        560 33101  38845 6R   P17      
-        30        561 33101  39529 6L   S10_1    
-        30        562 33101  54187 6R   R11_2    
-        30        563 33101  54162 6L   R11_2    
-        30        564 33101  54174 6R   R11_2    
-        30        565 33101  55157 6L   R12_2    
-        30        566 33101  55162 6R   R12_2    
-        30        567 30301     78 6L   B01      
-        30        568 30301     50 6R   B01      
-        30        569 30301     67 6L   B01      
-        30        570 30301     26 6R   B01      
-        30        571 30301    528 6L   B04      
-        30        572 30301     43 6R   B01      
-        30        573 30301     89 6L   B01      
-        30        574 30301     13 6R   B01      
-        30        575 30301     97 6L   B01      
-        30        576 30301      7 6R   B01      
-        30        577 33101  54161 6L   R11_2    
-        30        578 33101  54179 6R   R11_2    
-        30        579 33101  54152 6L   R11_2    
-        30        580 33101  38846 6R   P17      
-        30        581 33101  39530 6L   S10_1    
-        30        582 33101  54542 6R   R12_1    
-        30        583 33101  54163 6L   R11_2    
-        30        584 33101  54175 6R   R11_2    
-        30        585 33101  55158 6L   R12_2    
-        30        586 33101  55163 6R   R12_2    
-        30        587 30301     84 6L   B01      
-        30        588 30301    503 6R   B04      
-        30        589 30301     71 6L   B01      
-        30        590 30301     29 6R   B01      
-        30        591 30301    529 6L   B04      
-        30        592 30301     44 6R   B01      
-        30        593 30301     86 6L   B01      
-        30        594 30301     14 6R   B01      
-        30        595 30301     98 6L   B01      
-        30        596 30301      1 6R   B01      
-        30        597 33101  54151 6L   R11_2    
-        30        598 33101  54180 6R   R11_2    
-        30        599 33101  54153 6L   R11_2    
-        30        600 33101  38847 6R   P17      
-        30        601 33101  23188 7L   S5-2     
-        30        602 33101  55677 7R   R13_1    
-        30        603 33101  55172 7L   R12_2    
-        30        604 33101  55182 7R   R12_2    
-        30        605 30301    181 7L   B02      
-        30        606 30301    534 7R   B04      
-        30        607 30301    176 7L   B02      
-        30        608 30301    129 7R   B02      
-        30        609 33101  55167 7L   R12_2    
-        30        610 33101  55177 7R   R12_2    
-        30        611 30301    551 7L   B04      
-        30        612 30301    115 7R   B02      
-        30        613 30301    169 7L   B02      
-        30        614 30301    109 7R   B02      
-        30        615 33101  54543 7L   R12_1    
-        30        616 33101  54558 7R   R12_1    
-        30        617 33101  54548 7L   R12_1    
-        30        618 33101  54563 7R   R12_1    
-        30        619 33101  54553 7L   R12_1    
-        30        620 33101  38604 7R   S9_5     
-        30        621 33101  30392 7L   S7_2     
-        30        622 33101  55678 7R   R13_1    
-        30        623 33101  55173 7L   R12_2    
-        30        624 33101  55183 7R   R12_2    
-        30        625 30301    182 7L   B02      
-        30        626 30301    535 7R   B04      
-        30        627 30301    177 7L   B02      
-        30        628 30301    138 7R   B02      
-        30        629 33101  55168 7L   R12_2    
-        30        630 33101  55178 7R   R12_2    
-        30        631 30301    175 7L   B02      
-        30        632 30301    117 7R   B02      
-        30        633 30301    158 7L   B02      
-        30        634 30301    107 7R   B02      
-        30        635 33101  54544 7L   R12_1    
-        30        636 33101  54559 7R   R12_1    
-        30        637 33101  54549 7L   R12_1    
-        30        638 33101  54564 7R   R12_1    
-        30        639 33101  54554 7L   R12_1    
-        30        640 33101  38605 7R   S9_5     
-        30        641 33101  31099 7L   S7_3     
-        30        642 33101  55679 7R   R13_1    
-        30        643 33101  55174 7L   R12_2    
-        30        644 33101  55184 7R   R12_2    
-        30        645 30301    185 7L   B02      
-        30        646 30301    536 7R   B04      
-        30        647 30301    178 7L   B02      
-        30        648 30301    147 7R   B02      
-        30        649 33101  55169 7L   R12_2    
-        30        650 33101  55179 7R   R12_2    
-        30        651 30301    162 7L   B02      
-        30        652 30301    112 7R   B02      
-        30        653 30301    156 7L   B02      
-        30        654 30301    108 7R   B02      
-        30        655 33101  54545 7L   R12_1    
-        30        656 33101  54560 7R   R12_1    
-        30        657 33101  54550 7L   R12_1    
-        30        658 33101  54565 7R   R12_1    
-        30        659 33101  54555 7L   R12_1    
-        30        660 33101  47822 7R   S9_5     
-        30        661 33101  31564 7L   S7_4     
-        30        662 33101  55680 7R   R13_1    
-        30        663 33101  55175 7L   R12_2    
-        30        664 33101  55185 7R   R12_2    
-        30        665 30301    186 7L   B02      
-        30        666 30301    537 7R   B04      
-        30        667 30301    179 7L   B02      
-        30        668 30301    532 7R   B04      
-        30        669 33101  55170 7L   R12_2    
-        30        670 33101  55180 7R   R12_2    
-        30        671 30301    167 7L   B02      
-        30        672 30301    110 7R   B02      
-        30        673 30301    155 7L   B02      
-        30        674 30301    118 7R   B02      
-        30        675 33101  54546 7L   R12_1    
-        30        676 33101  54561 7R   R12_1    
-        30        677 33101  54551 7L   R12_1    
-        30        678 33101  54566 7R   R12_1    
-        30        679 33101  54556 7L   R12_1    
-        30        680 33101  47823 7R   S9_5     
-        30        681 33101  34330 7L   S8_4     
-        30        682 33101  55681 7R   R13_1    
-        30        683 33101  55176 7L   R12_2    
-        30        684 33101  55186 7R   R12_2    
-        30        685 30301    188 7L   B02      
-        30        686 30301    538 7R   B04      
-        30        687 30301    180 7L   B02      
-        30        688 30301    533 7R   B04      
-        30        689 33101  55171 7L   R12_2    
-        30        690 33101  55181 7R   R12_2    
-        30        691 30301    170 7L   B02      
-        30        692 30301    111 7R   B02      
-        30        693 30301    153 7L   B02      
-        30        694 30301    114 7R   B02      
-        30        695 33101  54547 7L   R12_1    
-        30        696 33101  54562 7R   R12_1    
-        30        697 33101  54552 7L   R12_1    
-        30        698 33101  53264 7R   R10_2    
-        30        699 33101  54557 7L   R12_1    
-        30        700 33101  47827 7R   S9_5     
-        30        701 30301    252 8L   B03      
-        30        702 33101  55781 8R   R13_1    
-        30        703 30301    282 8L   B03      
-        30        704 33101  55776 8R   R13_1    
-        30        705 30301    281 8L   B03      
-        30        706 33101  55751 8R   R13_1    
-        30        707 30301    576 8L   B04      
-        30        708 33101  55766 8R   R13_1    
-        30        709 33101  54577 8L   R12_1    
-        30        710 33101  55192 8R   R12_2    
-        30        711 33101  54587 8L   R12_1    
-        30        712 33101  54601 8R   R12_1    
-        30        713 33101  54567 8L   R12_1    
-        30        714 33101  54596 8R   R12_1    
-        30        715 33101  54582 8L   R12_1    
-        30        716 33101  54591 8R   R12_1    
-        30        717 33101  54572 8L   R12_1    
-        30        718 30301    565 8R   4        
-        30        719 30301    574 8L   4        
-        30        720 33101  31697 8R   S7_4     
-        30        721 30301    264 8L   B03      
-        30        722 33101  55782 8R   R13_1    
-        30        723 30301    274 8L   B03      
-        30        724 33101  55777 8R   R13_1    
-        30        725 30301    283 8L   B03      
-        30        726 33101  55752 8R   R13_1    
-        30        727 30301    298 8L   B03      
-        30        728 33101  55767 8R   R13_1    
-        30        729 33101  54578 8L   R12_1    
-        30        730 33101  55193 8R   R12_2    
-        30        731 33101  54588 8L   R12_1    
-        30        732 33101  54602 8R   R12_1    
-        30        733 33101  54568 8L   R12_1    
-        30        734 33101  54597 8R   R12_1    
-        30        735 33101  54583 8L   R12_1    
-        30        736 33101  54592 8R   R12_1    
-        30        737 33101  54573 8L   R12_1    
-        30        738 30301    566 8R   4        
-        30        739 30301    578 8L   4        
-        30        740 33101  34339 8R   S8_4     
-        30        741 30301    266 8L   B03      
-        30        742 33101  55783 8R   R13_1    
-        30        743 30301    273 8L   B03      
-        30        744 33101  55778 8R   R13_1    
-        30        745 30301    289 8L   B03      
-        30        746 33101  55753 8R   R13_1    
-        30        747 30301    297 8L   B03      
-        30        748 33101  55768 8R   R13_1    
-        30        749 33101  54579 8L   R12_1    
-        30        750 33101  55194 8R   R12_2    
-        30        751 33101  54589 8L   R12_1    
-        30        752 33101  54603 8R   R12_1    
-        30        753 33101  54569 8L   R12_1    
-        30        754 33101  54598 8R   R12_1    
-        30        755 33101  54584 8L   R12_1    
-        30        756 33101  54593 8R   R12_1    
-        30        757 33101  54574 8L   R12_1    
-        30        758 30301    570 8R   4        
-        30        759 30301    579 8L   4        
-        30        760 33101  34518 8R   S8_4     
-        30        761 30301    268 8L   B03      
-        30        762 33101  55784 8R   R13_1    
-        30        763 30301    272 8L   B03      
-        30        764 33101  55779 8R   R13_1    
-        30        765 30301    291 8L   B03      
-        30        766 33101  55754 8R   R13_1    
-        30        767 30301    296 8L   B03      
-        30        768 33101  55769 8R   R13_1    
-        30        769 33101  54580 8L   R12_1    
-        30        770 33101  55195 8R   R12_2    
-        30        771 33101  54590 8L   R12_1    
-        30        772 33101  54604 8R   R12_1    
-        30        773 33101  54570 8L   R12_1    
-        30        774 33101  54599 8R   R12_1    
-        30        775 33101  54585 8L   R12_1    
-        30        776 33101  54594 8R   R12_1    
-        30        777 33101  54575 8L   R12_1    
-        30        778 30301    571 8R   4        
-        30        779 30301    580 8L   4        
-        30        780 33101  43509 8R   R2_1     
-        30        781 30301    269 8L   B03      
-        30        782 33101  55785 8R   R13_1    
-        30        783 30301    270 8L   B03      
-        30        784 33101  55780 8R   R13_1    
-        30        785 30301    577 8L   B04      
-        30        786 33101  55755 8R   R13_1    
-        30        787 30301    277 8L   B03      
-        30        788 33101  55770 8R   R13_1    
-        30        789 33101  54581 8L   R12_1    
-        30        790 33101  55196 8R   R12_2    
-        30        791 33101  53305 8L   R10_2    
-        30        792 33101  54605 8R   R12_1    
-        30        793 33101  54571 8L   R12_1    
-        30        794 33101  54600 8R   R12_1    
-        30        795 33101  54586 8L   R12_1    
-        30        796 33101  54595 8R   R12_1    
-        30        797 33101  54576 8L   R12_1    
-        30        798 30301    572 8R   4        
-        30        799 30301    581 8L   4        
-        30        800 33101  38865 8R   P17      
-        30        801 33101  31721 9L   S7_4     
-        30        802 33101  54212 9R   R11_2    
-        30        803 30301    405 9L   B03      
-        30        804 33101  55828 9R   R13_1    
-        30        805 30301    397 9L   B03      
-        30        806 33101  55823 9R   R13_1    
-        30        807 33101  55791 9L   R13_1    
-        30        808 33101  55838 9R   R13_1    
-        30        809 33101  55786 9L   R13_1    
-        30        810 33101  55198 9R   R12_2    
-        30        811 30301    352 9L   B03      
-        30        812 30301    590 9R   B04      
-        30        813 33101  54614 9L   R12_1    
-        30        814 33101  54207 9R   R11_2    
-        30        815 30301    358 9L   B03      
-        30        816 30301    343 9R   B03      
-        30        817 33101  54609 9L   R12_1    
-        30        818 33101  54617 9R   R12_1    
-        30        819 33101  54202 9L   R11_2    
-        30        820 33101  26378 9R   S06      
-        30        821 33101  34340 9L   S8_4     
-        30        822 33101  54213 9R   R11_2    
-        30        823 30301    406 9L   B03      
-        30        824 33101  55829 9R   R13_1    
-        30        825 30301    605 9L   B04      
-        30        826 33101  55833 9R   R13_1    
-        30        827 33101  55792 9L   R13_1    
-        30        828 33101  55839 9R   R13_1    
-        30        829 33101  55787 9L   R13_1    
-        30        830 33101  55199 9R   R12_2    
-        30        831 30301    357 9L   B03      
-        30        832 30301    591 9R   B04      
-        30        833 33101  54615 9L   R12_1    
-        30        834 33101  54208 9R   R11_2    
-        30        835 30301    362 9L   B03      
-        30        836 30301    344 9R   B03      
-        30        837 33101  54610 9L   R12_1    
-        30        838 33101  54618 9R   R12_1    
-        30        839 33101  54203 9L   R11_2    
-        30        840 33101  31777 9R   S7_4     
-        30        841 33101  34341 9L   S8_4     
-        30        842 33101  53373 9R   R10_2    
-        30        843 30301    393 9L   B03      
-        30        844 33101  55830 9R   R13_1    
-        30        845 30301    606 9L   B04      
-        30        846 33101  55825 9R   R13_1    
-        30        847 33101  55793 9L   R13_1    
-        30        848 33101  55855 9R   R13_1    
-        30        849 33101  55788 9L   R13_1    
-        30        850 33101  55200 9R   R12_2    
-        30        851 30301    360 9L   B03      
-        30        852 30301    593 9R   B04      
-        30        853 33101  54616 9L   R12_1    
-        30        854 33101  54209 9R   R11_2    
-        30        855 30301    369 9L   B03      
-        30        856 30301    345 9R   B03      
-        30        857 33101  54611 9L   R12_1    
-        30        858 33101  54619 9R   R12_1    
-        30        859 33101  54204 9L   R11_2    
-        30        860 33101  31788 9R   S7_4     
-        30        861 33101  36896 9L   S9_2     
-        30        862 33101  53374 9R   R10_2    
-        30        863 30301    395 9L   B03      
-        30        864 33101  55831 9R   R13_1    
-        30        865 30301    607 9L   B04      
-        30        866 33101  55826 9R   R13_1    
-        30        867 33101  55794 9L   R13_1    
-        30        868 33101  55841 9R   R13_1    
-        30        869 33101  55789 9L   R13_1    
-        30        870 33101  55866 9R   R13_1    
-        30        871 30301    374 9L   B03      
-        30        872 30301    594 9R   B04      
-        30        873 33101  53336 9L   R10_2    
-        30        874 33101  54210 9R   R11_2    
-        30        875 30301    365 9L   B03      
-        30        876 30301    346 9R   B03      
-        30        877 33101  54612 9L   R12_1    
-        30        878 33101  54620 9R   R12_1    
-        30        879 33101  54205 9L   R11_2    
-        30        880 33101  31798 9R   S7_4     
-        30        881 33101  43534 9L   R2_1     
-        30        882 33101  53375 9R   R10_2    
-        30        883 30301    396 9L   B03      
-        30        884 33101  55832 9R   R13_1    
-        30        885 30301    608 9L   B04      
-        30        886 33101  55827 9R   R13_1    
-        30        887 33101  55197 9L   R12_2    
-        30        888 33101  55842 9R   R13_1    
-        30        889 33101  55790 9L   R13_1    
-        30        890 33101  55867 9R   R13_1    
-        30        891 30301    604 9L   B04      
-        30        892 30301    595 9R   B04      
-        30        893 33101  53337 9L   R10_2    
-        30        894 33101  54211 9R   R11_2    
-        30        895 30301    368 9L   B03      
-        30        896 30301    589 9R   B04      
-        30        897 33101  54613 9L   R12_1    
-        30        898 33101  54621 9R   R12_1    
-        30        899 33101  54206 9L   R11_2    
-        30        900 33101  43560 9R   R2_1     
-        30        901 33101  38627 10L  S9_5     
-        30        902 33101  55248 10R  R12_2    
-        30        903 33101  55208 10L  R12_2    
-        30        904 33101  55243 10R  R12_2    
-        30        905 33101  55221 10L  R12_2    
-        30        906 33101  55273 10R  R12_2    
-        30        907 33101  55206 10L  R12_2    
-        30        908 33101  55263 10R  R12_2    
-        30        909 33101  55216 10L  R12_2    
-        30        910 33101  55253 10R  R12_2    
-        30        911 33101  55201 10L  R12_2    
-        30        912 33101  55238 10R  R12_2    
-        30        913 33101  54657 10L  R12_1    
-        30        914 33101  54215 10R  R11_2    
-        30        915 33101  54632 10L  R12_1    
-        30        916 33101  54679 10R  R12_1    
-        30        917 33101  54652 10L  R12_1    
-        30        918 33101  54664 10R  R12_1    
-        30        919 33101  54627 10L  R12_1    
-        30        920 33101  38632 10R  S9_5     
-        30        921 33101  38628 10L  S9_5     
-        30        922 33101  55249 10R  R12_2    
-        30        923 33101  55213 10L  R12_2    
-        30        924 33101  55240 10R  R12_2    
-        30        925 33101  55222 10L  R12_2    
-        30        926 33101  55269 10R  R12_2    
-        30        927 33101  55207 10L  R12_2    
-        30        928 33101  55264 10R  R12_2    
-        30        929 33101  55212 10L  R12_2    
-        30        930 33101  55254 10R  R12_2    
-        30        931 33101  55202 10L  R12_2    
-        30        932 33101  55239 10R  R12_2    
-        30        933 33101  54658 10L  R12_1    
-        30        934 33101  54217 10R  R11_2    
-        30        935 33101  54633 10L  R12_1    
-        30        936 33101  54680 10R  R12_1    
-        30        937 33101  54653 10L  R12_1    
-        30        938 33101  54665 10R  R12_1    
-        30        939 33101  54628 10L  R12_1    
-        30        940 33101  38633 10R  S9_5     
-        30        941 33101  38629 10L  S9_5     
-        30        942 33101  55250 10R  R12_2    
-        30        943 33101  55218 10L  R12_2    
-        30        944 33101  55245 10R  R12_2    
-        30        945 33101  55223 10L  R12_2    
-        30        946 33101  55275 10R  R12_2    
-        30        947 33101  55211 10L  R12_2    
-        30        948 33101  55265 10R  R12_2    
-        30        949 33101  55217 10L  R12_2    
-        30        950 33101  55255 10R  R12_2    
-        30        951 33101  55203 10L  R12_2    
-        30        952 33101  55244 10R  R12_2    
-        30        953 33101  54659 10L  R12_1    
-        30        954 33101  54216 10R  R11_2    
-        30        955 33101  54634 10L  R12_1    
-        30        956 33101  54681 10R  R12_1    
-        30        957 33101  54654 10L  R12_1    
-        30        958 33101  54666 10R  R12_1    
-        30        959 33101  54629 10L  R12_1    
-        30        960 33101  38634 10R  S9_5     
-        30        961 33101  38630 10L  S9_5     
-        30        962 33101  55251 10R  R12_2    
-        30        963 33101  55219 10L  R12_2    
-        30        964 33101  55246 10R  R12_2    
-        30        965 33101  55224 10L  R12_2    
-        30        966 33101  55276 10R  R12_2    
-        30        967 33101  55209 10L  R12_2    
-        30        968 33101  55266 10R  R12_2    
-        30        969 33101  55214 10L  R12_2    
-        30        970 33101  55256 10R  R12_2    
-        30        971 33101  55204 10L  R12_2    
-        30        972 33101  55241 10R  R12_2    
-        30        973 33101  54660 10L  R12_1    
-        30        974 33101  54218 10R  R11_2    
-        30        975 33101  54635 10L  R12_1    
-        30        976 33101  54682 10R  R12_1    
-        30        977 33101  54655 10L  R12_1    
-        30        978 33101  54667 10R  R12_1    
-        30        979 33101  54630 10L  R12_1    
-        30        980 33101  38635 10R  S9_5     
-        30        981 33101  38631 10L  S9_5     
-        30        982 33101  55252 10R  R12_2    
-        30        983 33101  55220 10L  R12_2    
-        30        984 33101  55247 10R  R12_2    
-        30        985 33101  55225 10L  R12_2    
-        30        986 33101  42045 10R  P18      
-        30        987 33101  55210 10L  R12_2    
-        30        988 33101  55267 10R  R12_2    
-        30        989 33101  55215 10L  R12_2    
-        30        990 33101  55257 10R  R12_2    
-        30        991 33101  55205 10L  R12_2    
-        30        992 33101  55242 10R  R12_2    
-        30        993 33101  54661 10L  R12_1    
-        30        994 33101  54219 10R  R11_2    
-        30        995 33101  54636 10L  R12_1    
-        30        996 33101  54683 10R  R12_1    
-        30        997 33101  54656 10L  R12_1    
-        30        998 33101  54668 10R  R12_1    
-        30        999 33101  54631 10L  R12_1    
-        30       1000 33101  38537 10R  S9_6     
-        30       1001 33101  38551 11L  S9_6     
-        30       1002 33101  54740 11R  R12_1    
-        30       1003 33101  55307 11L  R12_2    
-        30       1004 33101  55320 11R  R12_2    
-        30       1005 33101  55289 11L  R12_2    
-        30       1006 33101  55310 11R  R12_2    
-        30       1007 33101  55292 11L  R12_2    
-        30       1008 33101  55315 11R  R12_2    
-        30       1009 33101  55282 11L  R12_2    
-        30       1010 33101  53711 11R  R11_1    
-        30       1011 33101  55277 11L  R12_2    
-        30       1012 33101  54730 11R  R12_1    
-        30       1013 33101  54720 11L  R12_1    
-        30       1014 33101  53727 11R  R11_1    
-        30       1015 33101  54695 11L  R12_1    
-        30       1016 33101  54223 11R  R11_2    
-        30       1017 33101  54690 11L  R12_1    
-        30       1018 33101  53732 11R  R11_1    
-        30       1019 33101  54725 11L  R12_1    
-        30       1020 33101  27333 11R  S6_2b    
-        30       1021 33101  38552 11L  S9_6     
-        30       1022 33101  54741 11R  R12_1    
-        30       1023 33101  55308 11L  R12_2    
-        30       1024 33101  55321 11R  R12_2    
-        30       1025 33101  55298 11L  R12_2    
-        30       1026 33101  55311 11R  R12_2    
-        30       1027 33101  55293 11L  R12_2    
-        30       1028 33101  55316 11R  R12_2    
-        30       1029 33101  55283 11L  R12_2    
-        30       1030 33101  53713 11R  R11_1    
-        30       1031 33101  55278 11L  R12_2    
-        30       1032 33101  54742 11R  R12_1    
-        30       1033 33101  54721 11L  R12_1    
-        30       1034 33101  53723 11R  R11_1    
-        30       1035 33101  54696 11L  R12_1    
-        30       1036 33101  54224 11R  R11_2    
-        30       1037 33101  54691 11L  R12_1    
-        30       1038 33101  53733 11R  R11_1    
-        30       1039 33101  54726 11L  R12_1    
-        30       1040 33101  38637 11R  S9_5     
-        30       1041 33101  38553 11L  S9_6     
-        30       1042 33101  54731 11R  R12_1    
-        30       1043 33101  55309 11L  R12_2    
-        30       1044 33101  55322 11R  R12_2    
-        30       1045 33101  55299 11L  R12_2    
-        30       1046 33101  55312 11R  R12_2    
-        30       1047 33101  55294 11L  R12_2    
-        30       1048 33101  55317 11R  R12_2    
-        30       1049 33101  55284 11L  R12_2    
-        30       1050 33101  53714 11R  R11_1    
-        30       1051 33101  55279 11L  R12_2    
-        30       1052 33101  52310 11R  R9_2     
-        30       1053 33101  54722 11L  R12_1    
-        30       1054 33101  53729 11R  R11_1    
-        30       1055 33101  54697 11L  R12_1    
-        30       1056 33101  54225 11R  R11_2    
-        30       1057 33101  54692 11L  R12_1    
-        30       1058 33101  53734 11R  R11_1    
-        30       1059 33101  54727 11L  R12_1    
-        30       1060 33101  38638 11R  S9_5     
-        30       1061 33101  38554 11L  S9_6     
-        30       1062 33101  54743 11R  R12_1    
-        30       1063 33101  28742 11L  P12      
-        30       1064 33101  55323 11R  R12_2    
-        30       1065 33101  55305 11L  R12_2    
-        30       1066 33101  55313 11R  R12_2    
-        30       1067 33101  55295 11L  R12_2    
-        30       1068 33101  55318 11R  R12_2    
-        30       1069 33101  55285 11L  R12_2    
-        30       1070 33101  53715 11R  R11_1    
-        30       1071 33101  55280 11L  R12_2    
-        30       1072 33101  54745 11R  R12_1    
-        30       1073 33101  54723 11L  R12_1    
-        30       1074 33101  53730 11R  R11_1    
-        30       1075 33101  54698 11L  R12_1    
-        30       1076 33101  54226 11R  R11_2    
-        30       1077 33101  54693 11L  R12_1    
-        30       1078 33101  53735 11R  R11_1    
-        30       1079 33101  54728 11L  R12_1    
-        30       1080 33101  38639 11R  S9_5     
-        30       1081 33101  38555 11L  S9_6     
-        30       1082 33101  54744 11R  R12_1    
-        30       1083 33101  45373 11L  R3_2     
-        30       1084 33101  55324 11R  R12_2    
-        30       1085 33101  55306 11L  R12_2    
-        30       1086 33101  55314 11R  R12_2    
-        30       1087 33101  55296 11L  R12_2    
-        30       1088 33101  55319 11R  R12_2    
-        30       1089 33101  55286 11L  R12_2    
-        30       1090 33101  53716 11R  R11_1    
-        30       1091 33101  55281 11L  R12_2    
-        30       1092 33101  54746 11R  R12_1    
-        30       1093 33101  54724 11L  R12_1    
-        30       1094 33101  53719 11R  R11_1    
-        30       1095 33101  54699 11L  R12_1    
-        30       1096 33101  54227 11R  R11_2    
-        30       1097 33101  54694 11L  R12_1    
-        30       1098 33101  53736 11R  R11_1    
-        30       1099 33101  54729 11L  R12_1    
-        30       1100 33101  38640 11R  S9_5     
-        30       1101 33101  27746 12L  S6_3a    
-        30       1102 33101  54791 12R  R12_1    
-        30       1103 33101  54782 12L  R12_1    
-        30       1104 33101  54816 12R  R12_1    
-        30       1105 33101  53777 12L  R11_1    
-        30       1106 33101  53895 12R  R11_1    
-        30       1107 33101  53744 12L  R11_1    
-        30       1108 33101  54256 12R  R11_2    
-        30       1109 33101  54233 12L  R11_2    
-        30       1110 33101  53840 12R  R11_1    
-        30       1111 33101  53817 12L  R11_1    
-        30       1112 33101  54821 12R  R12_1    
-        30       1113 33101  54753 12L  R12_1    
-        30       1114 33101  54811 12R  R12_1    
-        30       1115 33101  54762 12L  R12_1    
-        30       1116 33101  54806 12R  R12_1    
-        30       1117 33101  54757 12L  R12_1    
-        30       1118 33101  54801 12R  R12_1    
-        30       1119 33101  54767 12L  R12_1    
-        30       1120 33101  38641 12R  S9_5     
-        30       1121 33101  33733 12L  S8_2     
-        30       1122 33101  54792 12R  R12_1    
-        30       1123 33101  54783 12L  R12_1    
-        30       1124 33101  54817 12R  R12_1    
-        30       1125 33101  53778 12L  R11_1    
-        30       1126 33101  53896 12R  R11_1    
-        30       1127 33101  53758 12L  R11_1    
-        30       1128 33101  53900 12R  R11_1    
-        30       1129 33101  54234 12L  R11_2    
-        30       1130 33101  53841 12R  R11_1    
-        30       1131 33101  53818 12L  R11_1    
-        30       1132 33101  54822 12R  R12_1    
-        30       1133 33101  54748 12L  R12_1    
-        30       1134 33101  54797 12R  R12_1    
-        30       1135 33101  54763 12L  R12_1    
-        30       1136 33101  54807 12R  R12_1    
-        30       1137 33101  54755 12L  R12_1    
-        30       1138 33101  54802 12R  R12_1    
-        30       1139 33101  54768 12L  R12_1    
-        30       1140 33101  38642 12R  S9_5     
-        30       1141 33101  35366 12L  S8_5     
-        30       1142 33101  54793 12R  R12_1    
-        30       1143 33101  54784 12L  R12_1    
-        30       1144 33101  54818 12R  R12_1    
-        30       1145 33101  53779 12L  R11_1    
-        30       1146 33101  54251 12R  R11_2    
-        30       1147 33101  53755 12L  R11_1    
-        30       1148 33101  53901 12R  R11_1    
-        30       1149 33101  54235 12L  R11_2    
-        30       1150 33101  53842 12R  R11_1    
-        30       1151 33101  53819 12L  R11_1    
-        30       1152 33101  54786 12R  R12_1    
-        30       1153 33101  54749 12L  R12_1    
-        30       1154 33101  54814 12R  R12_1    
-        30       1155 33101  54764 12L  R12_1    
-        30       1156 33101  54808 12R  R12_1    
-        30       1157 33101  54759 12L  R12_1    
-        30       1158 33101  54803 12R  R12_1    
-        30       1159 33101  54769 12L  R12_1    
-        30       1160 33101  38643 12R  S9_5     
-        30       1161 33101  35368 12L  S8_5     
-        30       1162 33101  54794 12R  R12_1    
-        30       1163 33101  54785 12L  R12_1    
-        30       1164 33101  54819 12R  R12_1    
-        30       1165 33101  53780 12L  R11_1    
-        30       1166 33101  53898 12R  R11_1    
-        30       1167 33101  53760 12L  R11_1    
-        30       1168 33101  53899 12R  R11_1    
-        30       1169 33101  54236 12L  R11_2    
-        30       1170 33101  53843 12R  R11_1    
-        30       1171 33101  54248 12L  R11_2    
-        30       1172 33101  54789 12R  R12_1    
-        30       1173 33101  54750 12L  R12_1    
-        30       1174 33101  54799 12R  R12_1    
-        30       1175 33101  54765 12L  R12_1    
-        30       1176 33101  54809 12R  R12_1    
-        30       1177 33101  54760 12L  R12_1    
-        30       1178 33101  54804 12R  R12_1    
-        30       1179 33101  54770 12L  R12_1    
-        30       1180 33101  38644 12R  S9_5     
-        30       1181 33101  39172 12L  P16      
-        30       1182 33101  54795 12R  R12_1    
-        30       1183 33101  53764 12L  R11_1    
-        30       1184 33101  54820 12R  R12_1    
-        30       1185 33101  53781 12L  R11_1    
-        30       1186 33101  53827 12R  R11_1    
-        30       1187 33101  53761 12L  R11_1    
-        30       1188 33101  53887 12R  R11_1    
-        30       1189 33101  54237 12L  R11_2    
-        30       1190 33101  53844 12R  R11_1    
-        30       1191 33101  54249 12L  R11_2    
-        30       1192 33101  54790 12R  R12_1    
-        30       1193 33101  54751 12L  R12_1    
-        30       1194 33101  54800 12R  R12_1    
-        30       1195 33101  54766 12L  R12_1    
-        30       1196 33101  54810 12R  R12_1    
-        30       1197 33101  54761 12L  R12_1    
-        30       1198 33101  54805 12R  R12_1    
-        30       1199 33101  54754 12L  R12_1    
-        30       1200 33101  38645 12R  S9_5     
-        30       1201 33101  38581 13L  S9_6     
-        30       1202 33101  54851 13R  R12_1    
-        30       1203 33101  54833 13L  R12_1    
-        30       1204 33101  54836 13R  R12_1    
-        30       1205 33101  55357 13L  R12_2    
-        30       1206 33101  53982 13R  R11_1    
-        30       1207 33101  55342 13L  R12_2    
-        30       1208 33101  53962 13R  R11_1    
-        30       1209 33101  53927 13L  R11_1    
-        30       1210 33101  54002 13R  R11_1    
-        30       1211 33101  54257 13L  R11_2    
-        30       1212 33101  54856 13R  R12_1    
-        30       1213 33101  54262 13L  R11_2    
-        30       1214 33101  54868 13R  R12_1    
-        30       1215 33101  53937 13L  R11_1    
-        30       1216 33101  54861 13R  R12_1    
-        30       1217 33101  54828 13L  R12_1    
-        30       1218 33101  54846 13R  R12_1    
-        30       1219 33101  35378 13L  S8_5     
-        30       1220 33101  27480 13R  S6_2b    
-        30       1221 33101  38582 13L  S9_6     
-        30       1222 33101  54852 13R  R12_1    
-        30       1223 33101  54834 13L  R12_1    
-        30       1224 33101  54837 13R  R12_1    
-        30       1225 33101  55358 13L  R12_2    
-        30       1226 33101  53983 13R  R11_1    
-        30       1227 33101  55343 13L  R12_2    
-        30       1228 33101  53963 13R  R11_1    
-        30       1229 33101  53928 13L  R11_1    
-        30       1230 33101  54003 13R  R11_1    
-        30       1231 33101  54258 13L  R11_2    
-        30       1232 33101  54857 13R  R12_1    
-        30       1233 33101  54263 13L  R11_2    
-        30       1234 33101  54841 13R  R12_1    
-        30       1235 33101  53938 13L  R11_1    
-        30       1236 33101  54862 13R  R12_1    
-        30       1237 33101  54829 13L  R12_1    
-        30       1238 33101  54847 13R  R12_1    
-        30       1239 33101  54824 13L  R12_1    
-        30       1240 33101  34997 13R  S8_4     
-        30       1241 33101  38583 13L  S9_6     
-        30       1242 33101  54843 13R  R12_1    
-        30       1243 33101  54835 13L  R12_1    
-        30       1244 33101  54838 13R  R12_1    
-        30       1245 33101  55359 13L  R12_2    
-        30       1246 33101  53984 13R  R11_1    
-        30       1247 33101  55344 13L  R12_2    
-        30       1248 33101  53964 13R  R11_1    
-        30       1249 33101  53929 13L  R11_1    
-        30       1250 33101  54004 13R  R11_1    
-        30       1251 33101  54259 13L  R11_2    
-        30       1252 33101  54858 13R  R12_1    
-        30       1253 33101  54264 13L  R11_2    
-        30       1254 33101  53952 13R  R11_1    
-        30       1255 33101  53939 13L  R11_1    
-        30       1256 33101  54863 13R  R12_1    
-        30       1257 33101  54830 13L  R12_1    
-        30       1258 33101  54848 13R  R12_1    
-        30       1259 33101  46654 13L  R4_2     
-        30       1260 33101  33267 13R  S8_1     
-        30       1261 33101  38584 13L  S9_6     
-        30       1262 33101  54844 13R  R12_1    
-        30       1263 33101  54823 13L  R12_1    
-        30       1264 33101  54839 13R  R12_1    
-        30       1265 33101  55360 13L  R12_2    
-        30       1266 33101  53985 13R  R11_1    
-        30       1267 33101  55345 13L  R12_2    
-        30       1268 33101  53965 13R  R11_1    
-        30       1269 33101  53930 13L  R11_1    
-        30       1270 33101  54005 13R  R11_1    
-        30       1271 33101  54260 13L  R11_2    
-        30       1272 33101  54859 13R  R12_1    
-        30       1273 33101  54265 13L  R11_2    
-        30       1274 33101  54869 13R  R12_1    
-        30       1275 33101  53947 13L  R11_1    
-        30       1276 33101  54864 13R  R12_1    
-        30       1277 33101  54831 13L  R12_1    
-        30       1278 33101  54849 13R  R12_1    
-        30       1279 33101  54826 13L  R12_1    
-        30       1280 33101  43820 13R  R2_1     
-        30       1281 33101  38585 13L  S9_6     
-        30       1282 33101  54855 13R  R12_1    
-        30       1283 33101  54825 13L  R12_1    
-        30       1284 33101  54840 13R  R12_1    
-        30       1285 33101  55361 13L  R12_2    
-        30       1286 33101  53986 13R  R11_1    
-        30       1287 33101  55346 13L  R12_2    
-        30       1288 33101  53966 13R  R11_1    
-        30       1289 33101  53931 13L  R11_1    
-        30       1290 33101  54006 13R  R11_1    
-        30       1291 33101  54261 13L  R11_2    
-        30       1292 33101  54845 13R  R12_1    
-        30       1293 33101  54266 13L  R11_2    
-        30       1294 33101  54870 13R  R12_1    
-        30       1295 33101  53941 13L  R11_1    
-        30       1296 33101  54865 13R  R12_1    
-        30       1297 33101  54832 13L  R12_1    
-        30       1298 33101  54850 13R  R12_1    
-        30       1299 33101  54827 13L  R12_1    
-        30       1300 33101  43846 13R  R2_1     
-        30       1301 33101  39701 14L  S10_2    
-        30       1302 33101  38466 14R  S9_6     
-        30       1303 33101  53606 14L  R11_1    
-        30       1304 33101  54112 14R  R11_2    
-        30       1305 33101  53611 14L  R11_1    
-        30       1306 33101  54116 14R  R11_2    
-        30       1307 33101  53617 14L  R11_1    
-        30       1308 33101  54121 14R  R11_2    
-        30       1309 33101  53605 14L  R11_1    
-        30       1310 33101  54401 14R  R12_1    
-        30       1311 33101  54371 14L  R12_1    
-        30       1312 33101  54421 14R  R12_1    
-        30       1313 33101  54376 14L  R12_1    
-        30       1314 33101  54406 14R  R12_1    
-        30       1315 33101  54381 14L  R12_1    
-        30       1316 33101  54411 14R  R12_1    
-        30       1317 33101  54386 14L  R12_1    
-        30       1318 33101  54416 14R  R12_1    
-        30       1319 33101  54391 14L  R12_1    
-        30       1320 33101  28081 14R  S6_3b    
-        30       1321 33101  29705 14L  S7_1     
-        30       1322 33101  50262 14R  R8_1     
-        30       1323 33101  53607 14L  R11_1    
-        30       1324 33101  54111 14R  R11_2    
-        30       1325 33101  53612 14L  R11_1    
-        30       1326 33101  54117 14R  R11_2    
-        30       1327 33101  53618 14L  R11_1    
-        30       1328 33101  54122 14R  R11_2    
-        30       1329 33101  53621 14L  R11_1    
-        30       1330 33101  54397 14R  R12_1    
-        30       1331 33101  54372 14L  R12_1    
-        30       1332 33101  54422 14R  R12_1    
-        30       1333 33101  54377 14L  R12_1    
-        30       1334 33101  54407 14R  R12_1    
-        30       1335 33101  54382 14L  R12_1    
-        30       1336 33101  54412 14R  R12_1    
-        30       1337 33101  54387 14L  R12_1    
-        30       1338 33101  54417 14R  R12_1    
-        30       1339 33101  54370 14L  R12_1    
-        30       1340 33101  28082 14R  S6_3b    
-        30       1341 33101  29742 14L  S7_1     
-        30       1342 33101  54113 14R  R11_2    
-        30       1343 33101  53608 14L  R11_1    
-        30       1344 33101  54108 14R  R11_2    
-        30       1345 33101  53613 14L  R11_1    
-        30       1346 33101  54118 14R  R11_2    
-        30       1347 33101  53620 14L  R11_1    
-        30       1348 33101  54123 14R  R11_2    
-        30       1349 33101  53622 14L  R11_1    
-        30       1350 33101  54398 14R  R12_1    
-        30       1351 33101  54373 14L  R12_1    
-        30       1352 33101  54402 14R  R12_1    
-        30       1353 33101  54378 14L  R12_1    
-        30       1354 33101  54408 14R  R12_1    
-        30       1355 33101  54383 14L  R12_1    
-        30       1356 33101  54413 14R  R12_1    
-        30       1357 33101  54388 14L  R12_1    
-        30       1358 33101  54418 14R  R12_1    
-        30       1359 33101  38784 14L  P016     
-        30       1360 33101  28084 14R  S6_3b    
-        30       1361 33101  36331 14L  S9_1     
-        30       1362 33101  54114 14R  R11_2    
-        30       1363 33101  53609 14L  R11_1    
-        30       1364 33101  54109 14R  R11_2    
-        30       1365 33101  53614 14L  R11_1    
-        30       1366 33101  54119 14R  R11_2    
-        30       1367 33101  53610 14L  R11_1    
-        30       1368 33101  54124 14R  R11_2    
-        30       1369 33101  54103 14L  R11_2    
-        30       1370 33101  54399 14R  R12_1    
-        30       1371 33101  54374 14L  R12_1    
-        30       1372 33101  54403 14R  R12_1    
-        30       1373 33101  54379 14L  R12_1    
-        30       1374 33101  54409 14R  R12_1    
-        30       1375 33101  54384 14L  R12_1    
-        30       1376 33101  54414 14R  R12_1    
-        30       1377 33101  54389 14L  R12_1    
-        30       1378 33101  54419 14R  R12_1    
-        30       1379 33101  54392 14L  R12_1    
-        30       1380 33101  28085 14R  S6_3b    
-        30       1381 33101  37026 14L  S9_3     
-        30       1382 33101  54115 14R  R11_2    
-        30       1383 33101  53597 14L  R11_1    
-        30       1384 33101  54110 14R  R11_2    
-        30       1385 33101  53615 14L  R11_1    
-        30       1386 33101  54120 14R  R11_2    
-        30       1387 33101  53604 14L  R11_1    
-        30       1388 33101  53627 14R  R11_1    
-        30       1389 33101  54105 14L  R11_2    
-        30       1390 33101  54405 14R  R12_1    
-        30       1391 33101  54375 14L  R12_1    
-        30       1392 33101  54400 14R  R12_1    
-        30       1393 33101  54380 14L  R12_1    
-        30       1394 33101  54410 14R  R12_1    
-        30       1395 33101  54385 14L  R12_1    
-        30       1396 33101  54415 14R  R12_1    
-        30       1397 33101  54390 14L  R12_1    
-        30       1398 33101  54420 14R  R12_1    
-        30       1399 33101  54393 14L  R12_1    
-        30       1400 33101  28087 14R  S6_3b    
-        30       1401 33101  27083 15L  S6_2b    
-        30       1402 33101  54496 15R  R12_1    
-        30       1403 33101  54431 15L  R12_1    
-        30       1404 33101  54471 15R  R12_1    
-        30       1405 33101  54436 15L  R12_1    
-        30       1406 33101  54476 15R  R12_1    
-        30       1407 33101  54135 15L  R11_2    
-        30       1408 33101  54481 15R  R12_1    
-        30       1409 33101  54441 15L  R12_1    
-        30       1410 33101  54486 15R  R12_1    
-        30       1411 33101  54446 15L  R12_1    
-        30       1412 33101  54491 15R  R12_1    
-        30       1413 33101  54451 15L  R12_1    
-        30       1414 33101  55142 15R  R12_2    
-        30       1415 33101  54456 15L  R12_1    
-        30       1416 33101  55147 15R  R12_2    
-        30       1417 33101  54461 15L  R12_1    
-        30       1418 33101  55141 15R  R12_2    
-        30       1419 33101  55137 15L  R12_2    
-        30       1420 33101  30869 15R  S7_3     
-        30       1421 33101  27086 15L  S6_2b    
-        30       1422 33101  54467 15R  R12_1    
-        30       1423 33101  54432 15L  R12_1    
-        30       1424 33101  54472 15R  R12_1    
-        30       1425 33101  54437 15L  R12_1    
-        30       1426 33101  54477 15R  R12_1    
-        30       1427 33101  54136 15L  R11_2    
-        30       1428 33101  54482 15R  R12_1    
-        30       1429 33101  54442 15L  R12_1    
-        30       1430 33101  54487 15R  R12_1    
-        30       1431 33101  54447 15L  R12_1    
-        30       1432 33101  54492 15R  R12_1    
-        30       1433 33101  54452 15L  R12_1    
-        30       1434 33101  55143 15R  R12_2    
-        30       1435 33101  54457 15L  R12_1    
-        30       1436 33101  55148 15R  R12_2    
-        30       1437 33101  54462 15L  R12_1    
-        30       1438 33101  54497 15R  R12_1    
-        30       1439 33101  55138 15L  R12_2    
-        30       1440 33101  32424 15R  P14      
-        30       1441 33101  27087 15L  S6_2b    
-        30       1442 33101  54468 15R  R12_1    
-        30       1443 33101  54433 15L  R12_1    
-        30       1444 33101  54473 15R  R12_1    
-        30       1445 33101  54438 15L  R12_1    
-        30       1446 33101  54478 15R  R12_1    
-        30       1447 33101  54138 15L  R11_2    
-        30       1448 33101  54483 15R  R12_1    
-        30       1449 33101  54443 15L  R12_1    
-        30       1450 33101  54488 15R  R12_1    
-        30       1451 33101  54448 15L  R12_1    
-        30       1452 33101  54493 15R  R12_1    
-        30       1453 33101  54453 15L  R12_1    
-        30       1454 33101  55144 15R  R12_2    
-        30       1455 33101  54458 15L  R12_1    
-        30       1456 33101  55149 15R  R12_2    
-        30       1457 33101  54463 15L  R12_1    
-        30       1458 33101  54498 15R  R12_1    
-        30       1459 33101  55139 15L  R12_2    
-        30       1460 33101  32892 15R  S3       
-        30       1461 33101  27088 15L  S6_2b    
-        30       1462 33101  54469 15R  R12_1    
-        30       1463 33101  54434 15L  R12_1    
-        30       1464 33101  54474 15R  R12_1    
-        30       1465 33101  54439 15L  R12_1    
-        30       1466 33101  54479 15R  R12_1    
-        30       1467 33101  54139 15L  R11_2    
-        30       1468 33101  54484 15R  R12_1    
-        30       1469 33101  54444 15L  R12_1    
-        30       1470 33101  54489 15R  R12_1    
-        30       1471 33101  54449 15L  R12_1    
-        30       1472 33101  54494 15R  R12_1    
-        30       1473 33101  54454 15L  R12_1    
-        30       1474 33101  55145 15R  R12_2    
-        30       1475 33101  54459 15L  R12_1    
-        30       1476 33101  55150 15R  R12_2    
-        30       1477 33101  54464 15L  R12_1    
-        30       1478 33101  55152 15R  R12_2    
-        30       1479 33101  54430 15L  R12_1    
-        30       1480 33101  38798 15R  P016     
-        30       1481 33101  28160 15L  S6_3b    
-        30       1482 33101  54470 15R  R12_1    
-        30       1483 33101  54435 15L  R12_1    
-        30       1484 33101  54475 15R  R12_1    
-        30       1485 33101  54440 15L  R12_1    
-        30       1486 33101  54480 15R  R12_1    
-        30       1487 33101  54137 15L  R11_2    
-        30       1488 33101  54485 15R  R12_1    
-        30       1489 33101  54445 15L  R12_1    
-        30       1490 33101  54490 15R  R12_1    
-        30       1491 33101  54450 15L  R12_1    
-        30       1492 33101  54495 15R  R12_1    
-        30       1493 33101  54455 15L  R12_1    
-        30       1494 33101  55146 15R  R12_2    
-        30       1495 33101  54460 15L  R12_1    
-        30       1496 33101  55151 15R  R12_2    
-        30       1497 33101  54465 15L  R12_1    
-        30       1498 33101  55153 15R  R12_2    
-        30       1499 33101  40268 15L  S10_3    
-        30       1500 33101  34326 15R  S8_4     
-        30       1501 33106   1097 16L  EBP08    
-        30       1502 33106   1111 16R  EBP08    
-        30       1503 33106   1046 16L  EBP08    
-        30       1504 33106   1121 16R  EBP08    
-        30       1505 33106   1051 16L  EBP08    
-        30       1506 33106   1116 16R  EBP08    
-        30       1507 33106   1056 16L  EBP08    
-        30       1508 33106   1130 16R  EBP08    
-        30       1509 33106   1061 16L  EBP08    
-        30       1510 33106   1131 16R  EBP08    
-        30       1511 33106   1066 16L  EBP08    
-        30       1512 33106   1146 16R  EBP08    
-        30       1513 33106   1071 16L  EBP08    
-        30       1514 33106   1141 16R  EBP08    
-        30       1515 33106   1076 16L  EBP08    
-        30       1516 33106   1156 16R  EBP08    
-        30       1517 33106   1087 16L  EBP08    
-        30       1518 33106   1135 16R  EBP08    
-        30       1519 33106   1081 16L  EBP08    
-        30       1520 33106   1161 16R  EBP08    
-        30       1521 33106   1098 16L  EBP08    
-        30       1522 33106   1112 16R  EBP08    
-        30       1523 33106   1047 16L  EBP08    
-        30       1524 33106   1122 16R  EBP08    
-        30       1525 33106   1052 16L  EBP08    
-        30       1526 33106   1117 16R  EBP08    
-        30       1527 33106   1057 16L  EBP08    
-        30       1528 33106   1136 16R  EBP08    
-        30       1529 33106   1062 16L  EBP08    
-        30       1530 33106   1132 16R  EBP08    
-        30       1531 33106   1067 16L  EBP08    
-        30       1532 33106   1147 16R  EBP08    
-        30       1533 33106   1072 16L  EBP08    
-        30       1534 33106   1142 16R  EBP08    
-        30       1535 33106   1077 16L  EBP08    
-        30       1536 33106   1157 16R  EBP08    
-        30       1537 33106   1089 16L  EBP08    
-        30       1538 33106   1151 16R  EBP08    
-        30       1539 33106   1082 16L  EBP08    
-        30       1540 33106   1162 16R  EBP08    
-        30       1541 33106   1100 16L  EBP08    
-        30       1542 33106   1113 16R  EBP08    
-        30       1543 33106   1048 16L  EBP08    
-        30       1544 33106   1123 16R  EBP08    
-        30       1545 33106   1053 16L  EBP08    
-        30       1546 33106   1120 16R  EBP08    
-        30       1547 33106   1096 16L  EBP08    
-        30       1548 33106   1138 16R  EBP08    
-        30       1549 33106   1063 16L  EBP08    
-        30       1550 33106   1133 16R  EBP08    
-        30       1551 33106   1068 16L  EBP08    
-        30       1552 33106   1148 16R  EBP08    
-        30       1553 33106   1045 16L  EBP08    
-        30       1554 33106   1137 16R  EBP08    
-        30       1555 33106   1078 16L  EBP08    
-        30       1556 33106   1158 16R  EBP08    
-        30       1557 33106   1090 16L  EBP08    
-        30       1558 33106   1143 16R  EBP08    
-        30       1559 33106   1095 16L  EBP08    
-        30       1560 33106   1163 16R  EBP08    
-        30       1561 33106   1043 16L  EBP08    
-        30       1562 33106   1114 16R  EBP08    
-        30       1563 33106   1049 16L  EBP08    
-        30       1564 33106   1124 16R  EBP08    
-        30       1565 33106   1054 16L  EBP08    
-        30       1566 33106   1126 16R  EBP08    
-        30       1567 33106   1059 16L  EBP08    
-        30       1568 33106   1139 16R  EBP08    
-        30       1569 33106   1064 16L  EBP08    
-        30       1570 33106   1134 16R  EBP08    
-        30       1571 33106   1069 16L  EBP08    
-        30       1572 33106   1149 16R  EBP08    
-        30       1573 33106   1074 16L  EBP08    
-        30       1574 33106   1144 16R  EBP08    
-        30       1575 33106   1080 16L  EBP08    
-        30       1576 33106   1160 16R  EBP08    
-        30       1577 33106   1091 16L  EBP08    
-        30       1578 33106   1153 16R  EBP08    
-        30       1579 33106   1084 16L  EBP08    
-        30       1580 33106   1154 16R  EBP08    
-        30       1581 33106   1044 16L  EBP08    
-        30       1582 33106   1115 16R  EBP08    
-        30       1583 33106   1050 16L  EBP08    
-        30       1584 33106   1125 16R  EBP08    
-        30       1585 33106   1055 16L  EBP08    
-        30       1586 33106   1127 16R  EBP08    
-        30       1587 33106   1060 16L  EBP08    
-        30       1588 33106   1140 16R  EBP08    
-        30       1589 33106   1065 16L  EBP08    
-        30       1590 33106   1129 16R  EBP08    
-        30       1591 33106   1070 16L  EBP08    
-        30       1592 33106   1150 16R  EBP08    
-        30       1593 33106   1075 16L  EBP08    
-        30       1594 33106   1145 16R  EBP08    
-        30       1595 33106   1042 16L  EBP08    
-        30       1596 33106   1159 16R  EBP08    
-        30       1597 33106   1092 16L  EBP08    
-        30       1598 33106   1152 16R  EBP08    
-        30       1599 33106   1086 16L  EBP08    
-        30       1600 33106   1155 16R  EBP08    
-        30       1601 33106    906 17L  EBP07    
-        30       1602 33106    977 17R  EBP07    
-        30       1603 33106    901 17L  EBP07    
-        30       1604 33106    971 17R  EBP07    
-        30       1605 33106    911 17L  EBP07    
-        30       1606 33106    983 17R  EBP07    
-        30       1607 33106    917 17L  EBP07    
-        30       1608 33106   1001 17R  EBP07    
-        30       1609 33106    922 17L  EBP07    
-        30       1610 33106    999 17R  EBP07    
-        30       1611 33106    943 17L  EBP07    
-        30       1612 33106   1013 17R  EBP07    
-        30       1613 33106    959 17L  EBP07    
-        30       1614 33106   1029 17R  EBP07    
-        30       1615 33106    914 17L  EBP07    
-        30       1616 33106   1004 17R  EBP07    
-        30       1617 33106   1181 17L  EBP09    
-        30       1618 33106   1255 17R  EBP09    
-        30       1619 33106   1191 17L  EBP09    
-        30       1620 33106   1261 17R  EBP09    
-        30       1621 33106    907 17L  EBP07    
-        30       1622 33106    978 17R  EBP07    
-        30       1623 33106    902 17L  EBP07    
-        30       1624 33106    972 17R  EBP07    
-        30       1625 33106    912 17L  EBP07    
-        30       1626 33106    986 17R  EBP07    
-        30       1627 33106    918 17L  EBP07    
-        30       1628 33106   1002 17R  EBP07    
-        30       1629 33106    923 17L  EBP07    
-        30       1630 33106   1000 17R  EBP07    
-        30       1631 33106    935 17L  EBP07    
-        30       1632 33106   1016 17R  EBP07    
-        30       1633 33106    962 17L  EBP07    
-        30       1634 33106   1032 17R  EBP07    
-        30       1635 33106    967 17L  EBP07    
-        30       1636 33106   1266 17R  EBP09    
-        30       1637 33106   1182 17L  EBP09    
-        30       1638 33106   1256 17R  EBP09    
-        30       1639 33106   1192 17L  EBP09    
-        30       1640 33106   1262 17R  EBP09    
-        30       1641 33106    908 17L  EBP07    
-        30       1642 33106    979 17R  EBP07    
-        30       1643 33106    903 17L  EBP07    
-        30       1644 33106    974 17R  EBP07    
-        30       1645 33106    913 17L  EBP07    
-        30       1646 33106    987 17R  EBP07    
-        30       1647 33106    919 17L  EBP07    
-        30       1648 33106   1005 17R  EBP07    
-        30       1649 33106    924 17L  EBP07    
-        30       1650 33106   1003 17R  EBP07    
-        30       1651 33106    936 17L  EBP07    
-        30       1652 33106   1018 17R  EBP07    
-        30       1653 33106    964 17L  EBP07    
-        30       1654 33106   1033 17R  EBP07    
-        30       1655 33106    961 17L  EBP07    
-        30       1656 33106   1267 17R  EBP09    
-        30       1657 33106   1184 17L  EBP09    
-        30       1658 33106   1258 17R  EBP09    
-        30       1659 33106   1193 17L  EBP09    
-        30       1660 33106   1263 17R  EBP09    
-        30       1661 33106    909 17L  EBP07    
-        30       1662 33106    980 17R  EBP07    
-        30       1663 33106    905 17L  EBP07    
-        30       1664 33106    975 17R  EBP07    
-        30       1665 33106    916 17L  EBP07    
-        30       1666 33106    993 17R  EBP07    
-        30       1667 33106    920 17L  EBP07    
-        30       1668 33106   1040 17R  EBP07    
-        30       1669 33106    929 17L  EBP07    
-        30       1670 33106   1008 17R  EBP07    
-        30       1671 33106    937 17L  EBP07    
-        30       1672 33106   1019 17R  EBP07    
-        30       1673 33106    965 17L  EBP07    
-        30       1674 33106   1034 17R  EBP07    
-        30       1675 33106    963 17L  EBP07    
-        30       1676 33106   1268 17R  EBP09    
-        30       1677 33106   1187 17L  EBP09    
-        30       1678 33106   1259 17R  EBP09    
-        30       1679 33106   1194 17L  EBP09    
-        30       1680 33106   1264 17R  EBP09    
-        30       1681 33106    910 17L  EBP07    
-        30       1682 33106    981 17R  EBP07    
-        30       1683 33106    904 17L  EBP07    
-        30       1684 33106    976 17R  EBP07    
-        30       1685 33106    915 17L  EBP07    
-        30       1686 33106    997 17R  EBP07    
-        30       1687 33106    921 17L  EBP07    
-        30       1688 33106   1009 17R  EBP07    
-        30       1689 33106    933 17L  EBP07    
-        30       1690 33106   1012 17R  EBP07    
-        30       1691 33106    938 17L  EBP07    
-        30       1692 33106   1027 17R  EBP07    
-        30       1693 33106    968 17L  EBP07    
-        30       1694 33106   1036 17R  EBP07    
-        30       1695 33106   1197 17L  EBP09    
-        30       1696 33106   1254 17R  EBP09    
-        30       1697 33106   1189 17L  EBP09    
-        30       1698 33106   1260 17R  EBP09    
-        30       1699 33106   1195 17L  EBP09    
-        30       1700 33106   1253 17R  EBP09    
-        31          1 33101  38911 1L   P017     
-        31          2 33101  54941 1R   R12_2    
-        31          3 33101  54890 1L   R12_2    
-        31          4 33101  54942 1R   R12_2    
-        31          5 33101  54916 1L   R12_2    
-        31          6 33101  55931 1R   R13_2    
-        31          7 33101  56476 1L   R13_3    
-        31          8 33101  56481 1R   R13_3    
-        31          9 33101  56471 1L   R13_3    
-        31         10 33101  56486 1R   R13_3    
-        31         11 33101  56477 1L   R13_3    
-        31         12 33101  56492 1R   R13_3    
-        31         13 33101  56671 1L   R14_1    
-        31         14 33101  56497 1R   R13_3    
-        31         15 33101  56676 1L   R14_1    
-        31         16 33101  56691 1R   R14_1    
-        31         17 33101  56681 1L   R14_1    
-        31         18 33101  56696 1R   R14_1    
-        31         19 33101  57231 1L   R14_2    
-        31         20 33101  38935 1R   P017     
-        31         21 33101  38912 1L   P017     
-        31         22 33101  54937 1R   R12_2    
-        31         23 33101  54912 1L   R12_2    
-        31         24 33101  55376 1R   R13_1    
-        31         25 33101  54917 1L   R12_2    
-        31         26 33101  55932 1R   R13_2    
-        31         27 33101  54897 1L   R12_2    
-        31         28 33101  56482 1R   R13_3    
-        31         29 33101  56472 1L   R13_3    
-        31         30 33101  56487 1R   R13_3    
-        31         31 33101  56478 1L   R13_3    
-        31         32 33101  56493 1R   R13_3    
-        31         33 33101  56672 1L   R14_1    
-        31         34 33101  56687 1R   R14_1    
-        31         35 33101  56677 1L   R14_1    
-        31         36 33101  56692 1R   R14_1    
-        31         37 33101  56682 1L   R14_1    
-        31         38 33101  56697 1R   R14_1    
-        31         39 33101  57232 1L   R14_2    
-        31         40 33101  38936 1R   P017     
-        31         41 33101  38913 1L   P017     
-        31         42 33101  54938 1R   R12_2    
-        31         43 33101  54913 1L   R12_2    
-        31         44 33101  55373 1R   R13_1    
-        31         45 33101  54918 1L   R12_2    
-        31         46 33101  55933 1R   R13_2    
-        31         47 33101  55922 1L   R13_2    
-        31         48 33101  56483 1R   R13_3    
-        31         49 33101  56473 1L   R13_3    
-        31         50 33101  56488 1R   R13_3    
-        31         51 33101  56479 1L   R13_3    
-        31         52 33101  56494 1R   R13_3    
-        31         53 33101  56673 1L   R14_1    
-        31         54 33101  56688 1R   R14_1    
-        31         55 33101  56678 1L   R14_1    
-        31         56 33101  56693 1R   R14_1    
-        31         57 33101  56683 1L   R14_1    
-        31         58 33101  56698 1R   R14_1    
-        31         59 33101  57233 1L   R14_2    
-        31         60 33101  38937 1R   P017     
-        31         61 33101  38914 1L   P017     
-        31         62 33101  54939 1R   R12_2    
-        31         63 33101  54914 1L   R12_2    
-        31         64 33101  55374 1R   R13_1    
-        31         65 33101  54919 1L   R12_2    
-        31         66 33101  55934 1R   R13_2    
-        31         67 33101  55929 1L   R13_2    
-        31         68 33101  56484 1R   R13_3    
-        31         69 33101  56474 1L   R13_3    
-        31         70 33101  56490 1R   R13_3    
-        31         71 33101  56480 1L   R13_3    
-        31         72 33101  56495 1R   R13_3    
-        31         73 33101  56674 1L   R14_1    
-        31         74 33101  56689 1R   R14_1    
-        31         75 33101  56679 1L   R14_1    
-        31         76 33101  56694 1R   R14_1    
-        31         77 33101  56684 1L   R14_1    
-        31         78 33101  56699 1R   R14_1    
-        31         79 33101  57234 1L   R14_2    
-        31         80 33101  38938 1R   P017     
-        31         81 33101  38915 1L   P017     
-        31         82 33101  54940 1R   R12_2    
-        31         83 33101  54915 1L   R12_2    
-        31         84 33101  55375 1R   R13_1    
-        31         85 33101  54920 1L   R12_2    
-        31         86 33101  55935 1R   R13_2    
-        31         87 33101  55930 1L   R13_2    
-        31         88 33101  56485 1R   R13_3    
-        31         89 33101  56475 1L   R13_3    
-        31         90 33101  56491 1R   R13_3    
-        31         91 33101  57236 1L   R14_2    
-        31         92 33101  56496 1R   R13_3    
-        31         93 33101  56675 1L   R14_1    
-        31         94 33101  56690 1R   R14_1    
-        31         95 33101  56680 1L   R14_1    
-        31         96 33101  56695 1R   R14_1    
-        31         97 33101  56685 1L   R14_1    
-        31         98 33101  56499 1R   R13_3    
-        31         99 33101  57235 1L   R14_2    
-        31        100 33101  38939 1R   P017     
-        31        101 33101  41602 2L   S10_6    
-        31        102 33101  38967 2R   P017     
-        31        103 33101  55381 2L   R13_1    
-        31        104 33101  55021 2R   R12_2    
-        31        105 33101  54976 2L   R12_2    
-        31        106 33101  55020 2R   R12_2    
-        31        107 33101  55936 2L   R13_2    
-        31        108 33101  55955 2R   R13_2    
-        31        109 33101  56502 2L   R13_3    
-        31        110 33101  55953 2R   R13_2    
-        31        111 33101  56507 2L   R13_3    
-        31        112 33101  56718 2R   R14_1    
-        31        113 33101  56704 2L   R14_1    
-        31        114 33101  56726 2R   R14_1    
-        31        115 33101  56709 2L   R14_1    
-        31        116 33101  56731 2R   R14_1    
-        31        117 33101  56714 2L   R14_1    
-        31        118 33101  57320 2R   R14_2    
-        31        119 33101  57291 2L   R14_2    
-        31        120 33101  38348 2R   S9_6     
-        31        121 33101  41619 2L   S10_6    
-        31        122 33101  38968 2R   P017     
-        31        123 33101  54972 2L   R12_2    
-        31        124 33101  55022 2R   R12_2    
-        31        125 33101  54977 2L   R12_2    
-        31        126 33101  55026 2R   R12_2    
-        31        127 33101  55937 2L   R13_2    
-        31        128 33101  55956 2R   R13_2    
-        31        129 33101  56503 2L   R13_3    
-        31        130 33101  55961 2R   R13_2    
-        31        131 33101  56508 2L   R13_3    
-        31        132 33101  56719 2R   R14_1    
-        31        133 33101  56705 2L   R14_1    
-        31        134 33101  56727 2R   R14_1    
-        31        135 33101  56710 2L   R14_1    
-        31        136 33101  56732 2R   R14_1    
-        31        137 33101  56715 2L   R14_1    
-        31        138 33101  57321 2R   R14_2    
-        31        139 33101  57292 2L   R14_2    
-        31        140 33101  38742 2R   P016     
-        31        141 33101  41631 2L   S10_6    
-        31        142 33101  38969 2R   P017     
-        31        143 33101  54973 2L   R12_2    
-        31        144 33101  55023 2R   R12_2    
-        31        145 33101  54978 2L   R12_2    
-        31        146 33101  55027 2R   R12_2    
-        31        147 33101  55939 2L   R13_2    
-        31        148 33101  55958 2R   R13_2    
-        31        149 33101  56504 2L   R13_3    
-        31        150 33101  55962 2R   R13_2    
-        31        151 33101  56510 2L   R13_3    
-        31        152 33101  56720 2R   R14_1    
-        31        153 33101  56706 2L   R14_1    
-        31        154 33101  56723 2R   R14_1    
-        31        155 33101  56711 2L   R14_1    
-        31        156 33101  56728 2R   R14_1    
-        31        157 33101  57288 2L   R14_2    
-        31        158 33101  56733 2R   R14_1    
-        31        159 33101  57293 2L   R14_2    
-        31        160 33101  38743 2R   P016     
-        31        161 33101  41817 2L   P18      
-        31        162 33101  55009 2R   R12_2    
-        31        163 33101  54974 2L   R12_2    
-        31        164 33101  55024 2R   R12_2    
-        31        165 33101  54296 2L   R12_1    
-        31        166 33101  55028 2R   R12_2    
-        31        167 33101  55943 2L   R13_2    
-        31        168 33101  55959 2R   R13_2    
-        31        169 33101  56505 2L   R13_3    
-        31        170 33101  55963 2R   R13_2    
-        31        171 33101  56702 2L   R14_1    
-        31        172 33101  56721 2R   R14_1    
-        31        173 33101  56707 2L   R14_1    
-        31        174 33101  56724 2R   R14_1    
-        31        175 33101  56712 2L   R14_1    
-        31        176 33101  56729 2R   R14_1    
-        31        177 33101  57289 2L   R14_2    
-        31        178 33101  56734 2R   R14_1    
-        31        179 33101  57294 2L   R14_2    
-        31        180 33101  38745 2R   P016     
-        31        181 33101  41818 2L   P18      
-        31        182 33101  55019 2R   R12_2    
-        31        183 33101  54975 2L   R12_2    
-        31        184 33101  55025 2R   R12_2    
-        31        185 33101  54297 2L   R12_1    
-        31        186 33101  55950 2R   R13_2    
-        31        187 33101  56500 2L   R13_3    
-        31        188 33101  55960 2R   R13_2    
-        31        189 33101  56506 2L   R13_3    
-        31        190 33101  56717 2R   R14_1    
-        31        191 33101  56703 2L   R14_1    
-        31        192 33101  56722 2R   R14_1    
-        31        193 33101  56708 2L   R14_1    
-        31        194 33101  56725 2R   R14_1    
-        31        195 33101  56713 2L   R14_1    
-        31        196 33101  56730 2R   R14_1    
-        31        197 33101  57290 2L   R14_2    
-        31        198 33101  56735 2R   R14_1    
-        31        199 33101  40568 2L   S10_4    
-        31        200 33101  38966 2R   P017     
-        31        201 33101  29032 3L   P13      
-        31        202 33101  39011 3R   P017     
-        31        203 33101  55966 3L   R13_2    
-        31        204 33101  55074 3R   R12_2    
-        31        205 33101  55041 3L   R12_2    
-        31        206 33101  55064 3R   R12_2    
-        31        207 33101  55047 3L   R12_2    
-        31        208 33101  55069 3R   R12_2    
-        31        209 33101  55971 3L   R13_2    
-        31        210 33101  55079 3R   R12_2    
-        31        211 33101  56511 3L   R13_3    
-        31        212 33101  55978 3R   R13_2    
-        31        213 33101  56738 3L   R14_1    
-        31        214 33101  56521 3R   R13_3    
-        31        215 33101  56744 3L   R14_1    
-        31        216 33101  56776 3R   R14_1    
-        31        217 33101  56749 3L   R14_1    
-        31        218 33101  56771 3R   R14_1    
-        31        219 33101  38758 3L   P016     
-        31        220 33101  32328 3R   P14      
-        31        221 33101  29051 3L   P13      
-        31        222 33101  39012 3R   P017     
-        31        223 33101  55967 3L   R13_2    
-        31        224 33101  55075 3R   R12_2    
-        31        225 33101  55042 3L   R12_2    
-        31        226 33101  55065 3R   R12_2    
-        31        227 33101  55390 3L   R13_1    
-        31        228 33101  55070 3R   R12_2    
-        31        229 33101  55972 3L   R13_2    
-        31        230 33101  55080 3R   R12_2    
-        31        231 33101  56512 3L   R13_3    
-        31        232 33101  56515 3R   R13_3    
-        31        233 33101  56739 3L   R14_1    
-        31        234 33101  56522 3R   R13_3    
-        31        235 33101  56745 3L   R14_1    
-        31        236 33101  56777 3R   R14_1    
-        31        237 33101  56751 3L   R14_1    
-        31        238 33101  56772 3R   R14_1    
-        31        239 33101  38759 3L   P016     
-        31        240 33101  33349 3R   S8_2     
-        31        241 33101  29054 3L   P13      
-        31        242 33101  39013 3R   P017     
-        31        243 33101  55968 3L   R13_2    
-        31        244 33101  55076 3R   R12_2    
-        31        245 33101  55043 3L   R12_2    
-        31        246 33101  55066 3R   R12_2    
-        31        247 33101  55383 3L   R13_1    
-        31        248 33101  55071 3R   R12_2    
-        31        249 33101  55973 3L   R13_2    
-        31        250 33101  55081 3R   R12_2    
-        31        251 33101  56513 3L   R13_3    
-        31        252 33101  56517 3R   R13_3    
-        31        253 33101  56741 3L   R14_1    
-        31        254 33101  56523 3R   R13_3    
-        31        255 33101  56746 3L   R14_1    
-        31        256 33101  56778 3R   R14_1    
-        31        257 33101  56752 3L   R14_1    
-        31        258 33101  56773 3R   R14_1    
-        31        259 33101  38760 3L   P016     
-        31        260 33101  33350 3R   S8_2     
-        31        261 33101  30815 3L   S7_3     
-        31        262 33101  39015 3R   P017     
-        31        263 33101  55969 3L   R13_2    
-        31        264 33101  55077 3R   R12_2    
-        31        265 33101  55044 3L   R12_2    
-        31        266 33101  55067 3R   R12_2    
-        31        267 33101  55965 3L   R13_2    
-        31        268 33101  55072 3R   R12_2    
-        31        269 33101  55974 3L   R13_2    
-        31        270 33101  55976 3R   R13_2    
-        31        271 33101  56514 3L   R13_3    
-        31        272 33101  56518 3R   R13_3    
-        31        273 33101  56742 3L   R14_1    
-        31        274 33101  56524 3R   R13_3    
-        31        275 33101  56747 3L   R14_1    
-        31        276 33101  56516 3R   R13_3    
-        31        277 33101  56740 3L   R14_1    
-        31        278 33101  56774 3R   R14_1    
-        31        279 33101  38977 3L   P017     
-        31        280 33101  35246 3R   S8_5     
-        31        281 33101  32036 3L   S07_5    
-        31        282 33101  39016 3R   P017     
-        31        283 33101  56769 3L   R14_1    
-        31        284 33101  55078 3R   R12_2    
-        31        285 33101  55045 3L   R12_2    
-        31        286 33101  55068 3R   R12_2    
-        31        287 33101  55385 3L   R13_1    
-        31        288 33101  55073 3R   R12_2    
-        31        289 33101  55975 3L   R13_2    
-        31        290 33101  55977 3R   R13_2    
-        31        291 33101  56737 3L   R14_1    
-        31        292 33101  56519 3R   R13_3    
-        31        293 33101  56743 3L   R14_1    
-        31        294 33101  56525 3R   R13_3    
-        31        295 33101  56748 3L   R14_1    
-        31        296 33101  56526 3R   R13_3    
-        31        297 33101  56753 3L   R14_1    
-        31        298 33101  56775 3R   R14_1    
-        31        299 33101  38978 3L   P017     
-        31        300 33101  35272 3R   S8_5     
-        31        301 33101  32115 4L   S07_5    
-        31        302 33101  39073 4R   P017     
-        31        303 33101  55407 4L   R13_1    
-        31        304 33101  55112 4R   R12_2    
-        31        305 33101  55403 4L   R13_1    
-        31        306 33101  55438 4R   R13_1    
-        31        307 33101  55421 4L   R13_1    
-        31        308 33101  55441 4R   R13_1    
-        31        309 33101  55985 4L   R13_2    
-        31        310 33101  55446 4R   R13_1    
-        31        311 33101  56527 4L   R13_3    
-        31        312 33101  55444 4R   R13_1    
-        31        313 33101  56804 4L   R14_1    
-        31        314 33101  56532 4R   R13_3    
-        31        315 33101  56811 4L   R14_1    
-        31        316 33101  56003 4R   R13_2    
-        31        317 33101  39045 4L   P017     
-        31        318 33101  29219 4R   P13      
-        31        319 33101  56816 4L   R14_1    
-        31        320 33101  56841 4R   R14_1    
-        31        321 33101  32122 4L   S07_5    
-        31        322 33101  39074 4R   P017     
-        31        323 33101  55408 4L   R13_1    
-        31        324 33101  55113 4R   R12_2    
-        31        325 33101  55405 4L   R13_1    
-        31        326 33101  55439 4R   R13_1    
-        31        327 33101  55422 4L   R13_1    
-        31        328 33101  55442 4R   R13_1    
-        31        329 33101  55986 4L   R13_2    
-        31        330 33101  55447 4R   R13_1    
-        31        331 33101  56528 4L   R13_3    
-        31        332 33101  55450 4R   R13_1    
-        31        333 33101  56805 4L   R14_1    
-        31        334 33101  56533 4R   R13_3    
-        31        335 33101  56812 4L   R14_1    
-        31        336 33101  56537 4R   R13_3    
-        31        337 33101  39046 4L   P017     
-        31        338 33101  30827 4R   S7_3     
-        31        339 33101  56817 4L   R14_1    
-        31        340 33101  56842 4R   R14_1    
-        31        341 33101  32142 4L   S07_5    
-        31        342 33101  39075 4R   P017     
-        31        343 33101  55409 4L   R13_1    
-        31        344 33101  55114 4R   R12_2    
-        31        345 33101  55416 4L   R13_1    
-        31        346 33101  55433 4R   R13_1    
-        31        347 33101  55424 4L   R13_1    
-        31        348 33101  55443 4R   R13_1    
-        31        349 33101  55987 4L   R13_2    
-        31        350 33101  55448 4R   R13_1    
-        31        351 33101  56529 4L   R13_3    
-        31        352 33101  55999 4R   R13_2    
-        31        353 33101  56806 4L   R14_1    
-        31        354 33101  56534 4R   R13_3    
-        31        355 33101  56813 4L   R14_1    
-        31        356 33101  56538 4R   R13_3    
-        31        357 33101  39047 4L   P017     
-        31        358 33101  30828 4R   S7_3     
-        31        359 33101  56818 4L   R14_1    
-        31        360 33101  56843 4R   R14_1    
-        31        361 33101  32329 4L   P14      
-        31        362 33101  39076 4R   P017     
-        31        363 33101  55414 4L   R13_1    
-        31        364 33101  55428 4R   R13_1    
-        31        365 33101  55418 4L   R13_1    
-        31        366 33101  55434 4R   R13_1    
-        31        367 33101  55981 4L   R13_2    
-        31        368 33101  55440 4R   R13_1    
-        31        369 33101  55991 4L   R13_2    
-        31        370 33101  55449 4R   R13_1    
-        31        371 33101  56530 4L   R13_3    
-        31        372 33101  56000 4R   R13_2    
-        31        373 33101  56807 4L   R14_1    
-        31        374 33101  56535 4R   R13_3    
-        31        375 33101  56814 4L   R14_1    
-        31        376 33101  56839 4R   R14_1    
-        31        377 33101  39048 4L   P017     
-        31        378 33101  33457 4R   S8_2     
-        31        379 33101  56819 4L   R14_1    
-        31        380 33101  56844 4R   R14_1    
-        31        381 33101  33386 4L   S8_2     
-        31        382 33101  39077 4R   P017     
-        31        383 33101  55415 4L   R13_1    
-        31        384 33101  55432 4R   R13_1    
-        31        385 33101  55420 4L   R13_1    
-        31        386 33101  55435 4R   R13_1    
-        31        387 33101  55984 4L   R13_2    
-        31        388 33101  55445 4R   R13_1    
-        31        389 33101  55992 4L   R13_2    
-        31        390 33101  55997 4R   R13_2    
-        31        391 33101  56531 4L   R13_3    
-        31        392 33101  56002 4R   R13_2    
-        31        393 33101  56809 4L   R14_1    
-        31        394 33101  56536 4R   R13_3    
-        31        395 33101  56815 4L   R14_1    
-        31        396 33101  56840 4R   R14_1    
-        31        397 33101  39049 4L   P017     
-        31        398 33101  33458 4R   S8_2     
-        31        399 33101  56810 4L   R14_1    
-        31        400 33101  56845 4R   R14_1    
-        31        401 33101  32202 5L   S07_5    
-        31        402 33101  39130 5R   P017     
-        31        403 33101  55477 5L   R13_1    
-        31        404 33101  55511 5R   R13_1    
-        31        405 33101  55481 5L   R13_1    
-        31        406 33101  55516 5R   R13_1    
-        31        407 33101  55487 5L   R13_1    
-        31        408 33101  55521 5R   R13_1    
-        31        409 33101  55480 5L   R13_1    
-        31        410 33101  55526 5R   R13_1    
-        31        411 33101  57353 5L   R14_2    
-        31        412 33101  56883 5R   R14_1    
-        31        413 33101  57356 5L   R14_2    
-        31        414 33101  56886 5R   R14_1    
-        31        415 33101  57361 5L   R14_2    
-        31        416 33101  56891 5R   R14_1    
-        31        417 33101  57366 5L   R14_2    
-        31        418 33101  56896 5R   R14_1    
-        31        419 33101  57371 5L   R14_2    
-        31        420 33101  39126 5R   P017     
-        31        421 33101  32204 5L   S07_5    
-        31        422 33101  55502 5R   R13_1    
-        31        423 33101  55478 5L   R13_1    
-        31        424 33101  55512 5R   R13_1    
-        31        425 33101  55482 5L   R13_1    
-        31        426 33101  55517 5R   R13_1    
-        31        427 33101  55488 5L   R13_1    
-        31        428 33101  55522 5R   R13_1    
-        31        429 33101  55486 5L   R13_1    
-        31        430 33101  55527 5R   R13_1    
-        31        431 33101  57354 5L   R14_2    
-        31        432 33101  56884 5R   R14_1    
-        31        433 33101  57357 5L   R14_2    
-        31        434 33101  56887 5R   R14_1    
-        31        435 33101  57362 5L   R14_2    
-        31        436 33101  56892 5R   R14_1    
-        31        437 33101  57367 5L   R14_2    
-        31        438 33101  56897 5R   R14_1    
-        31        439 33101  57372 5L   R14_2    
-        31        440 33101  39127 5R   P017     
-        31        441 33101  32212 5L   S07_5    
-        31        442 33101  55503 5R   R13_1    
-        31        443 33101  55479 5L   R13_1    
-        31        444 33101  55508 5R   R13_1    
-        31        445 33101  55483 5L   R13_1    
-        31        446 33101  55518 5R   R13_1    
-        31        447 33101  55489 5L   R13_1    
-        31        448 33101  55523 5R   R13_1    
-        31        449 33101  56007 5L   R13_2    
-        31        450 33101  55528 5R   R13_1    
-        31        451 33101  57355 5L   R14_2    
-        31        452 33101  56885 5R   R14_1    
-        31        453 33101  57358 5L   R14_2    
-        31        454 33101  56888 5R   R14_1    
-        31        455 33101  57363 5L   R14_2    
-        31        456 33101  56893 5R   R14_1    
-        31        457 33101  57368 5L   R14_2    
-        31        458 33101  56898 5R   R14_1    
-        31        459 33101  57373 5L   R14_2    
-        31        460 33101  39128 5R   P017     
-        31        461 33101  32338 5L   P14      
-        31        462 33101  55505 5R   R13_1    
-        31        463 33101  55474 5L   R13_1    
-        31        464 33101  55509 5R   R13_1    
-        31        465 33101  55484 5L   R13_1    
-        31        466 33101  55519 5R   R13_1    
-        31        467 33101  55491 5L   R13_1    
-        31        468 33101  55524 5R   R13_1    
-        31        469 33101  56008 5L   R13_2    
-        31        470 33101  55515 5R   R13_1    
-        31        471 33101  57376 5L   R14_2    
-        31        472 33101  56901 5R   R14_1    
-        31        473 33101  57359 5L   R14_2    
-        31        474 33101  56889 5R   R14_1    
-        31        475 33101  57364 5L   R14_2    
-        31        476 33101  56894 5R   R14_1    
-        31        477 33101  57369 5L   R14_2    
-        31        478 33101  56899 5R   R14_1    
-        31        479 33101  57374 5L   R14_2    
-        31        480 33101  39129 5R   P017     
-        31        481 33101  33506 5L   S8_2     
-        31        482 33101  55506 5R   R13_1    
-        31        483 33101  55475 5L   R13_1    
-        31        484 33101  55510 5R   R13_1    
-        31        485 33101  55485 5L   R13_1    
-        31        486 33101  55514 5R   R13_1    
-        31        487 33101  55494 5L   R13_1    
-        31        488 33101  55525 5R   R13_1    
-        31        489 33101  56010 5L   R13_2    
-        31        490 33101  41772 5R   S10_6    
-        31        491 33101  57377 5L   R14_2    
-        31        492 33101  56902 5R   R14_1    
-        31        493 33101  57360 5L   R14_2    
-        31        494 33101  56890 5R   R14_1    
-        31        495 33101  57365 5L   R14_2    
-        31        496 33101  56895 5R   R14_1    
-        31        497 33101  57370 5L   R14_2    
-        31        498 33101  56900 5R   R14_1    
-        31        499 33101  57375 5L   R14_2    
-        31        500 33101  39131 5R   P017     
-        31        501 30301    521 6L   B04      
-        31        502 33101  55626 6R   R13_1    
-        31        503 33101  56112 6L   R13_2    
-        31        504 33101  55621 6R   R13_1    
-        31        505 33101  56107 6L   R13_2    
-        31        506 33101  55616 6R   R13_1    
-        31        507 33101  55596 6L   R13_1    
-        31        508 33101  55641 6R   R13_1    
-        31        509 33101  55593 6L   R13_1    
-        31        510 33101  55611 6R   R13_1    
-        31        511 33101  55583 6L   R13_1    
-        31        512 33101  55606 6R   R13_1    
-        31        513 33101  55578 6L   R13_1    
-        31        514 33101  55646 6R   R13_1    
-        31        515 33101  55573 6L   R13_1    
-        31        516 33101  55636 6R   R13_1    
-        31        517 33101  55561 6L   R13_1    
-        31        518 33101  55634 6R   R13_1    
-        31        519 33101  55568 6L   R13_1    
-        31        520 33101  38598 6R   S9_5     
-        31        521 30301    522 6L   B04      
-        31        522 33101  55627 6R   R13_1    
-        31        523 33101  56113 6L   R13_2    
-        31        524 33101  55622 6R   R13_1    
-        31        525 33101  56118 6L   R13_2    
-        31        526 33101  55617 6R   R13_1    
-        31        527 33101  55594 6L   R13_1    
-        31        528 33101  55642 6R   R13_1    
-        31        529 33101  55588 6L   R13_1    
-        31        530 33101  55612 6R   R13_1    
-        31        531 33101  55584 6L   R13_1    
-        31        532 33101  55607 6R   R13_1    
-        31        533 33101  55579 6L   R13_1    
-        31        534 33101  55647 6R   R13_1    
-        31        535 33101  55574 6L   R13_1    
-        31        536 33101  55637 6R   R13_1    
-        31        537 33101  55562 6L   R13_1    
-        31        538 33101  55635 6R   R13_1    
-        31        539 33101  55569 6L   R13_1    
-        31        540 33101  38599 6R   S9_5     
-        31        541 33101  38589 6L   S9_5     
-        31        542 33101  55628 6R   R13_1    
-        31        543 33101  56114 6L   R13_2    
-        31        544 33101  55623 6R   R13_1    
-        31        545 33101  56109 6L   R13_2    
-        31        546 33101  55618 6R   R13_1    
-        31        547 33101  55591 6L   R13_1    
-        31        548 33101  55643 6R   R13_1    
-        31        549 33101  55595 6L   R13_1    
-        31        550 33101  55613 6R   R13_1    
-        31        551 33101  55585 6L   R13_1    
-        31        552 33101  55608 6R   R13_1    
-        31        553 33101  55580 6L   R13_1    
-        31        554 33101  55631 6R   R13_1    
-        31        555 33101  55575 6L   R13_1    
-        31        556 33101  55638 6R   R13_1    
-        31        557 33101  55563 6L   R13_1    
-        31        558 33101  55164 6R   R12_2    
-        31        559 33101  55570 6L   R13_1    
-        31        560 33101  38600 6R   S9_5     
-        31        561 33101  38590 6L   S9_5     
-        31        562 33101  55629 6R   R13_1    
-        31        563 33101  56115 6L   R13_2    
-        31        564 33101  55624 6R   R13_1    
-        31        565 33101  56110 6L   R13_2    
-        31        566 33101  55619 6R   R13_1    
-        31        567 33101  55590 6L   R13_1    
-        31        568 33101  55644 6R   R13_1    
-        31        569 33101  55589 6L   R13_1    
-        31        570 33101  55614 6R   R13_1    
-        31        571 33101  55586 6L   R13_1    
-        31        572 33101  55609 6R   R13_1    
-        31        573 33101  55581 6L   R13_1    
-        31        574 33101  55165 6R   R12_2    
-        31        575 33101  55576 6L   R13_1    
-        31        576 33101  55639 6R   R13_1    
-        31        577 33101  55564 6L   R13_1    
-        31        578 33101  55166 6R   R12_2    
-        31        579 33101  55571 6L   R13_1    
-        31        580 33101  38601 6R   S9_5     
-        31        581 33101  38591 6L   S9_5     
-        31        582 33101  55630 6R   R13_1    
-        31        583 33101  56116 6L   R13_2    
-        31        584 33101  55625 6R   R13_1    
-        31        585 33101  56111 6L   R13_2    
-        31        586 33101  55620 6R   R13_1    
-        31        587 33101  55598 6L   R13_1    
-        31        588 33101  55645 6R   R13_1    
-        31        589 33101  55597 6L   R13_1    
-        31        590 33101  55615 6R   R13_1    
-        31        591 33101  55587 6L   R13_1    
-        31        592 33101  55610 6R   R13_1    
-        31        593 33101  55582 6L   R13_1    
-        31        594 33101  55599 6R   R13_1    
-        31        595 33101  55577 6L   R13_1    
-        31        596 33101  55640 6R   R13_1    
-        31        597 33101  55565 6L   R13_1    
-        31        598 33101  55600 6R   R13_1    
-        31        599 33101  55572 6L   R13_1    
-        31        600 33101  38602 6R   S9_5     
-        31        601 33101  47793 7L   S9_5     
-        31        602 33101  55702 7R   R13_1    
-        31        603 33101  56137 7L   R13_2    
-        31        604 33101  55687 7R   R13_1    
-        31        605 33101  56151 7L   R13_2    
-        31        606 33101  55700 7R   R13_1    
-        31        607 33101  56142 7L   R13_2    
-        31        608 33101  38606 7R   S9_5     
-        31        609 33101  55673 7L   R13_1    
-        31        610 33101  55717 7R   R13_1    
-        31        611 33101  55668 7L   R13_1    
-        31        612 33101  55697 7R   R13_1    
-        31        613 33101  55663 7L   R13_1    
-        31        614 33101  55695 7R   R13_1    
-        31        615 33101  55658 7L   R13_1    
-        31        616 33101  55707 7R   R13_1    
-        31        617 33101  55653 7L   R13_1    
-        31        618 33101  55682 7R   R13_1    
-        31        619 33101  55648 7L   R13_1    
-        31        620 33101  47833 7R   S9_5     
-        31        621 33101  34329 7L   S8_4     
-        31        622 33101  55703 7R   R13_1    
-        31        623 33101  56138 7L   R13_2    
-        31        624 33101  55688 7R   R13_1    
-        31        625 33101  56150 7L   R13_2    
-        31        626 33101  55694 7R   R13_1    
-        31        627 33101  56143 7L   R13_2    
-        31        628 33101  38607 7R   S9_5     
-        31        629 33101  55674 7L   R13_1    
-        31        630 33101  55718 7R   R13_1    
-        31        631 33101  55669 7L   R13_1    
-        31        632 33101  55698 7R   R13_1    
-        31        633 33101  55664 7L   R13_1    
-        31        634 33101  55693 7R   R13_1    
-        31        635 33101  55659 7L   R13_1    
-        31        636 33101  55708 7R   R13_1    
-        31        637 33101  55654 7L   R13_1    
-        31        638 33101  55683 7R   R13_1    
-        31        639 33101  55649 7L   R13_1    
-        31        640 33101  47834 7R   S9_5     
-        31        641 33101  51574 7L   R9_1     
-        31        642 33101  55704 7R   R13_1    
-        31        643 33101  56139 7L   R13_2    
-        31        644 33101  55689 7R   R13_1    
-        31        645 33101  56149 7L   R13_2    
-        31        646 33101  55696 7R   R13_1    
-        31        647 33101  56144 7L   R13_2    
-        31        648 33101  38610 7R   S9_5     
-        31        649 33101  55675 7L   R13_1    
-        31        650 33101  55719 7R   R13_1    
-        31        651 33101  55670 7L   R13_1    
-        31        652 33101  55699 7R   R13_1    
-        31        653 33101  55665 7L   R13_1    
-        31        654 33101  55714 7R   R13_1    
-        31        655 33101  55660 7L   R13_1    
-        31        656 33101  55709 7R   R13_1    
-        31        657 33101  55655 7L   R13_1    
-        31        658 33101  55684 7R   R13_1    
-        31        659 33101  55650 7L   R13_1    
-        31        660 33101  47836 7R   S9_5     
-        31        661 33101  53252 7L   R10_2    
-        31        662 33101  55705 7R   R13_1    
-        31        663 33101  56140 7L   R13_2    
-        31        664 33101  55690 7R   R13_1    
-        31        665 33101  56148 7L   R13_2    
-        31        666 33101  55712 7R   R13_1    
-        31        667 33101  56145 7L   R13_2    
-        31        668 33101  38614 7R   S9_5     
-        31        669 33101  55676 7L   R13_1    
-        31        670 33101  55720 7R   R13_1    
-        31        671 33101  55671 7L   R13_1    
-        31        672 33101  55692 7R   R13_1    
-        31        673 33101  55666 7L   R13_1    
-        31        674 33101  55715 7R   R13_1    
-        31        675 33101  55661 7L   R13_1    
-        31        676 33101  55710 7R   R13_1    
-        31        677 33101  55656 7L   R13_1    
-        31        678 33101  55685 7R   R13_1    
-        31        679 33101  55651 7L   R13_1    
-        31        680 33101  47837 7R   S9_5     
-        31        681 33101  53253 7L   R10_2    
-        31        682 33101  55706 7R   R13_1    
-        31        683 33101  56141 7L   R13_2    
-        31        684 33101  55691 7R   R13_1    
-        31        685 33101  56147 7L   R13_2    
-        31        686 33101  55713 7R   R13_1    
-        31        687 33101  56146 7L   R13_2    
-        31        688 33101  38615 7R   S9_5     
-        31        689 33101  53254 7L   R10_2    
-        31        690 33101  52121 7R   R9_2     
-        31        691 33101  55672 7L   R13_1    
-        31        692 33101  55701 7R   R13_1    
-        31        693 33101  55667 7L   R13_1    
-        31        694 33101  55716 7R   R13_1    
-        31        695 33101  55662 7L   R13_1    
-        31        696 33101  55711 7R   R13_1    
-        31        697 33101  55657 7L   R13_1    
-        31        698 33101  55686 7R   R13_1    
-        31        699 33101  55652 7L   R13_1    
-        31        700 33101  47838 7R   S9_5     
-        31        701 33101  56168 8L   R13_2    
-        31        702 30301    243 8R   B03      
-        31        703 33101  56163 8L   R13_2    
-        31        704 30301    213 8R   B03      
-        31        705 33101  56158 8L   R13_2    
-        31        706 30301    228 8R   B03      
-        31        707 33101  55187 8L   R12_2    
-        31        708 33101  56187 8R   R13_2    
-        31        709 33101  55726 8L   R13_1    
-        31        710 33101  56192 8R   R13_2    
-        31        711 33101  55721 8L   R13_1    
-        31        712 33101  56182 8R   R13_2    
-        31        713 33101  55731 8L   R13_1    
-        31        714 33101  55761 8R   R13_1    
-        31        715 33101  55741 8L   R13_1    
-        31        716 33101  55771 8R   R13_1    
-        31        717 33101  55736 8L   R13_1    
-        31        718 33101  55756 8R   R13_1    
-        31        719 33101  55746 8L   R13_1    
-        31        720 33101  47842 8R   S9_5     
-        31        721 33101  56169 8L   R13_2    
-        31        722 30301    245 8R   B03      
-        31        723 33101  56164 8L   R13_2    
-        31        724 30301    622 8R   B04      
-        31        725 33101  56159 8L   R13_2    
-        31        726 30301    229 8R   B03      
-        31        727 33101  55188 8L   R12_2    
-        31        728 33101  56188 8R   R13_2    
-        31        729 33101  55727 8L   R13_1    
-        31        730 33101  56193 8R   R13_2    
-        31        731 33101  55722 8L   R13_1    
-        31        732 33101  56183 8R   R13_2    
-        31        733 33101  55732 8L   R13_1    
-        31        734 33101  55762 8R   R13_1    
-        31        735 33101  55742 8L   R13_1    
-        31        736 33101  55772 8R   R13_1    
-        31        737 33101  55737 8L   R13_1    
-        31        738 33101  55757 8R   R13_1    
-        31        739 33101  55747 8L   R13_1    
-        31        740 33101  47843 8R   S9_5     
-        31        741 33101  56170 8L   R13_2    
-        31        742 30301    246 8R   B03      
-        31        743 33101  56165 8L   R13_2    
-        31        744 33101  56197 8R   R13_2    
-        31        745 33101  56160 8L   R13_2    
-        31        746 30301    233 8R   B03      
-        31        747 33101  55189 8L   R12_2    
-        31        748 33101  56189 8R   R13_2    
-        31        749 33101  55728 8L   R13_1    
-        31        750 33101  56194 8R   R13_2    
-        31        751 33101  55723 8L   R13_1    
-        31        752 33101  56184 8R   R13_2    
-        31        753 33101  55750 8L   R13_1    
-        31        754 33101  55763 8R   R13_1    
-        31        755 33101  55743 8L   R13_1    
-        31        756 33101  55773 8R   R13_1    
-        31        757 33101  55738 8L   R13_1    
-        31        758 33101  55758 8R   R13_1    
-        31        759 33101  55748 8L   R13_1    
-        31        760 33101  47844 8R   S9_5     
-        31        761 33101  56171 8L   R13_2    
-        31        762 30301    247 8R   B03      
-        31        763 33101  56166 8L   R13_2    
-        31        764 33101  56198 8R   R13_2    
-        31        765 33101  56161 8L   R13_2    
-        31        766 30301    234 8R   B03      
-        31        767 33101  55190 8L   R12_2    
-        31        768 33101  56190 8R   R13_2    
-        31        769 33101  55729 8L   R13_1    
-        31        770 33101  56195 8R   R13_2    
-        31        771 33101  55724 8L   R13_1    
-        31        772 33101  56185 8R   R13_2    
-        31        773 33101  55734 8L   R13_1    
-        31        774 33101  55764 8R   R13_1    
-        31        775 33101  55744 8L   R13_1    
-        31        776 33101  55774 8R   R13_1    
-        31        777 33101  55739 8L   R13_1    
-        31        778 33101  55759 8R   R13_1    
-        31        779 33101  55749 8L   R13_1    
-        31        780 33101  47845 8R   S9_5     
-        31        781 33101  56172 8L   R13_2    
-        31        782 30301    249 8R   B03      
-        31        783 33101  56167 8L   R13_2    
-        31        784 33101  56199 8R   R13_2    
-        31        785 33101  56162 8L   R13_2    
-        31        786 30301    239 8R   B03      
-        31        787 33101  55191 8L   R12_2    
-        31        788 33101  56191 8R   R13_2    
-        31        789 33101  55730 8L   R13_1    
-        31        790 33101  56196 8R   R13_2    
-        31        791 33101  55725 8L   R13_1    
-        31        792 33101  56186 8R   R13_2    
-        31        793 33101  55735 8L   R13_1    
-        31        794 33101  55765 8R   R13_1    
-        31        795 33101  55745 8L   R13_1    
-        31        796 33101  55775 8R   R13_1    
-        31        797 33101  55740 8L   R13_1    
-        31        798 33101  55760 8R   R13_1    
-        31        799 33101  55733 8L   R13_1    
-        31        800 33101  47846 8R   S9_5     
-        31        801 33101  35671 9L   P15_1    
-        31        802 33101  55853 9R   R13_1    
-        31        803 33101  55795 9L   R13_1    
-        31        804 33101  55848 9R   R13_1    
-        31        805 33101  56215 9L   R13_2    
-        31        806 33101  56251 9R   R13_2    
-        31        807 33101  56210 9L   R13_2    
-        31        808 33101  56246 9R   R13_2    
-        31        809 33101  56205 9L   R13_2    
-        31        810 33101  56256 9R   R13_2    
-        31        811 33101  55816 9L   R13_1    
-        31        812 33101  55863 9R   R13_1    
-        31        813 33101  55811 9L   R13_1    
-        31        814 33101  55843 9R   R13_1    
-        31        815 33101  55806 9L   R13_1    
-        31        816 33101  55824 9R   R13_1    
-        31        817 33101  55801 9L   R13_1    
-        31        818 33101  55858 9R   R13_1    
-        31        819 33101  55796 9L   R13_1    
-        31        820 33101  30545 9R   S7_2     
-        31        821 33101  47856 9L   S9_5     
-        31        822 33101  55854 9R   R13_1    
-        31        823 33101  55821 9L   R13_1    
-        31        824 33101  55849 9R   R13_1    
-        31        825 33101  56216 9L   R13_2    
-        31        826 33101  56252 9R   R13_2    
-        31        827 33101  56211 9L   R13_2    
-        31        828 33101  56247 9R   R13_2    
-        31        829 33101  56206 9L   R13_2    
-        31        830 33101  56257 9R   R13_2    
-        31        831 33101  55817 9L   R13_1    
-        31        832 33101  55864 9R   R13_1    
-        31        833 33101  55812 9L   R13_1    
-        31        834 33101  55844 9R   R13_1    
-        31        835 33101  55807 9L   R13_1    
-        31        836 33101  55834 9R   R13_1    
-        31        837 33101  55802 9L   R13_1    
-        31        838 33101  55859 9R   R13_1    
-        31        839 33101  55797 9L   R13_1    
-        31        840 33101  30558 9R   S7_2     
-        31        841 33101  47857 9L   S9_5     
-        31        842 33101  55840 9R   R13_1    
-        31        843 33101  55822 9L   R13_1    
-        31        844 33101  55850 9R   R13_1    
-        31        845 33101  56217 9L   R13_2    
-        31        846 33101  56253 9R   R13_2    
-        31        847 33101  56212 9L   R13_2    
-        31        848 33101  56248 9R   R13_2    
-        31        849 33101  56207 9L   R13_2    
-        31        850 33101  56258 9R   R13_2    
-        31        851 33101  55818 9L   R13_1    
-        31        852 33101  55865 9R   R13_1    
-        31        853 33101  55813 9L   R13_1    
-        31        854 33101  55845 9R   R13_1    
-        31        855 33101  55808 9L   R13_1    
-        31        856 33101  55835 9R   R13_1    
-        31        857 33101  55803 9L   R13_1    
-        31        858 33101  55860 9R   R13_1    
-        31        859 33101  55798 9L   R13_1    
-        31        860 33101  38617 9R   S9_5     
-        31        861 33101  47858 9L   S9_5     
-        31        862 33101  55856 9R   R13_1    
-        31        863 30301    383 9L   B03      
-        31        864 33101  55851 9R   R13_1    
-        31        865 33101  56218 9L   R13_2    
-        31        866 33101  56254 9R   R13_2    
-        31        867 33101  56213 9L   R13_2    
-        31        868 33101  56249 9R   R13_2    
-        31        869 33101  56208 9L   R13_2    
-        31        870 33101  56259 9R   R13_2    
-        31        871 33101  55819 9L   R13_1    
-        31        872 30301    596 9R   B04      
-        31        873 33101  55814 9L   R13_1    
-        31        874 33101  55846 9R   R13_1    
-        31        875 33101  55809 9L   R13_1    
-        31        876 33101  55836 9R   R13_1    
-        31        877 33101  55804 9L   R13_1    
-        31        878 33101  55861 9R   R13_1    
-        31        879 33101  55799 9L   R13_1    
-        31        880 33101  47888 9R   S9_5     
-        31        881 33101  47862 9L   S9_5     
-        31        882 33101  55857 9R   R13_1    
-        31        883 30301    386 9L   B03      
-        31        884 33101  55852 9R   R13_1    
-        31        885 33101  56219 9L   R13_2    
-        31        886 33101  56255 9R   R13_2    
-        31        887 33101  56214 9L   R13_2    
-        31        888 33101  56250 9R   R13_2    
-        31        889 33101  56209 9L   R13_2    
-        31        890 33101  56260 9R   R13_2    
-        31        891 33101  55820 9L   R13_1    
-        31        892 30301    598 9R   B04      
-        31        893 33101  55815 9L   R13_1    
-        31        894 33101  55847 9R   R13_1    
-        31        895 33101  55810 9L   R13_1    
-        31        896 33101  55837 9R   R13_1    
-        31        897 33101  55805 9L   R13_1    
-        31        898 33101  55862 9R   R13_1    
-        31        899 33101  55800 9L   R13_1    
-        31        900 33101  47869 9R   S9_5     
-        31        901 33101  26828 10L  S6_2     
-        31        902 33101  55875 10R  R13_1    
-        31        903 33101  56293 10L  R13_2    
-        31        904 33101  56333 10R  R13_2    
-        31        905 33101  56283 10L  R13_2    
-        31        906 33101  56328 10R  R13_2    
-        31        907 33101  56294 10L  R13_2    
-        31        908 33101  56318 10R  R13_2    
-        31        909 33101  56303 10L  R13_2    
-        31        910 33101  56323 10R  R13_2    
-        31        911 33101  56298 10L  R13_2    
-        31        912 33101  56313 10R  R13_2    
-        31        913 33101  56273 10L  R13_2    
-        31        914 33101  55880 10R  R13_1    
-        31        915 33101  55868 10L  R13_1    
-        31        916 33101  55268 10R  R12_2    
-        31        917 33101  55226 10L  R12_2    
-        31        918 33101  55258 10R  R12_2    
-        31        919 33101  55231 10L  R12_2    
-        31        920 33101  26895 10R  S6_2     
-        31        921 33101  26829 10L  S6_2     
-        31        922 33101  55876 10R  R13_1    
-        31        923 33101  56288 10L  R13_2    
-        31        924 33101  56334 10R  R13_2    
-        31        925 33101  56278 10L  R13_2    
-        31        926 33101  56329 10R  R13_2    
-        31        927 33101  56289 10L  R13_2    
-        31        928 33101  56319 10R  R13_2    
-        31        929 33101  56304 10L  R13_2    
-        31        930 33101  56324 10R  R13_2    
-        31        931 33101  56299 10L  R13_2    
-        31        932 33101  56309 10R  R13_2    
-        31        933 33101  56274 10L  R13_2    
-        31        934 33101  55881 10R  R13_1    
-        31        935 33101  55869 10L  R13_1    
-        31        936 33101  55274 10R  R12_2    
-        31        937 33101  55227 10L  R12_2    
-        31        938 33101  55259 10R  R12_2    
-        31        939 33101  55232 10L  R12_2    
-        31        940 33101  26897 10R  S6_2     
-        31        941 33101  26891 10L  S6_2     
-        31        942 33101  55877 10R  R13_1    
-        31        943 33101  56295 10L  R13_2    
-        31        944 33101  56335 10R  R13_2    
-        31        945 33101  56279 10L  R13_2    
-        31        946 33101  56312 10R  R13_2    
-        31        947 33101  56290 10L  R13_2    
-        31        948 33101  56320 10R  R13_2    
-        31        949 33101  56305 10L  R13_2    
-        31        950 33101  56325 10R  R13_2    
-        31        951 33101  56300 10L  R13_2    
-        31        952 33101  56315 10R  R13_2    
-        31        953 33101  56275 10L  R13_2    
-        31        954 33101  55882 10R  R13_1    
-        31        955 33101  55870 10L  R13_1    
-        31        956 33101  55270 10R  R12_2    
-        31        957 33101  55228 10L  R12_2    
-        31        958 33101  55260 10R  R12_2    
-        31        959 33101  55233 10L  R12_2    
-        31        960 33101  26898 10R  S6_2     
-        31        961 33101  27599 10L  S6_3a    
-        31        962 33101  55878 10R  R13_1    
-        31        963 33101  56296 10L  R13_2    
-        31        964 33101  56336 10R  R13_2    
-        31        965 33101  56286 10L  R13_2    
-        31        966 33101  56331 10R  R13_2    
-        31        967 33101  56291 10L  R13_2    
-        31        968 33101  56321 10R  R13_2    
-        31        969 33101  56306 10L  R13_2    
-        31        970 33101  56311 10R  R13_2    
-        31        971 33101  56301 10L  R13_2    
-        31        972 33101  56316 10R  R13_2    
-        31        973 33101  56276 10L  R13_2    
-        31        974 33101  55883 10R  R13_1    
-        31        975 33101  55236 10L  R12_2    
-        31        976 33101  55271 10R  R12_2    
-        31        977 33101  55229 10L  R12_2    
-        31        978 33101  55261 10R  R12_2    
-        31        979 33101  55234 10L  R12_2    
-        31        980 33101  32778 10R  P14      
-        31        981 33101  38875 10L  P16      
-        31        982 33101  55879 10R  R13_1    
-        31        983 33101  56297 10L  R13_2    
-        31        984 33101  56337 10R  R13_2    
-        31        985 33101  56287 10L  R13_2    
-        31        986 33101  56332 10R  R13_2    
-        31        987 33101  56292 10L  R13_2    
-        31        988 33101  56322 10R  R13_2    
-        31        989 33101  56307 10L  R13_2    
-        31        990 33101  56327 10R  R13_2    
-        31        991 33101  56302 10L  R13_2    
-        31        992 33101  56317 10R  R13_2    
-        31        993 33101  56277 10L  R13_2    
-        31        994 33101  54684 10R  R12_1    
-        31        995 33101  55237 10L  R12_2    
-        31        996 33101  55272 10R  R12_2    
-        31        997 33101  55230 10L  R12_2    
-        31        998 33101  55262 10R  R12_2    
-        31        999 33101  55235 10L  R12_2    
-        31       1000 33101  33574 10R  S8_2     
-        31       1001 33101  28740 11L  P12      
-        31       1002 33101  56636 11R  R13_3    
-        31       1003 33101  55884 11L  R13_1    
-        31       1004 33101  56373 11R  R13_2    
-        31       1005 33101  56349 11L  R13_2    
-        31       1006 33101  56377 11R  R13_2    
-        31       1007 33101  56354 11L  R13_2    
-        31       1008 33101  56362 11R  R13_2    
-        31       1009 33101  38886 11L  P16      
-        31       1010 33101  56382 11R  R13_2    
-        31       1011 33101  56344 11L  R13_2    
-        31       1012 33101  56367 11R  R13_2    
-        31       1013 33101  56339 11L  R13_2    
-        31       1014 33101  56357 11R  R13_2    
-        31       1015 33101  55889 11L  R13_1    
-        31       1016 33101  55895 11R  R13_1    
-        31       1017 33101  55287 11L  R12_2    
-        31       1018 33101  55330 11R  R12_2    
-        31       1019 33101  55297 11L  R12_2    
-        31       1020 33101  55325 11R  R12_2    
-        31       1021 33101  28741 11L  P12      
-        31       1022 33101  56637 11R  R13_3    
-        31       1023 33101  55885 11L  R13_1    
-        31       1024 33101  56374 11R  R13_2    
-        31       1025 33101  56350 11L  R13_2    
-        31       1026 33101  56378 11R  R13_2    
-        31       1027 33101  56355 11L  R13_2    
-        31       1028 33101  56363 11R  R13_2    
-        31       1029 33101  38887 11L  P16      
-        31       1030 33101  56383 11R  R13_2    
-        31       1031 33101  56345 11L  R13_2    
-        31       1032 33101  56368 11R  R13_2    
-        31       1033 33101  56340 11L  R13_2    
-        31       1034 33101  56358 11R  R13_2    
-        31       1035 33101  55890 11L  R13_1    
-        31       1036 33101  55896 11R  R13_1    
-        31       1037 33101  55288 11L  R12_2    
-        31       1038 33101  55331 11R  R12_2    
-        31       1039 33101  55302 11L  R12_2    
-        31       1040 33101  55326 11R  R12_2    
-        31       1041 33101  29377 11L  P13      
-        31       1042 33101  56638 11R  R13_3    
-        31       1043 33101  55886 11L  R13_1    
-        31       1044 33101  56364 11R  R13_2    
-        31       1045 33101  56351 11L  R13_2    
-        31       1046 33101  56379 11R  R13_2    
-        31       1047 33101  56356 11L  R13_2    
-        31       1048 33101  56372 11R  R13_2    
-        31       1049 33101  38888 11L  P17      
-        31       1050 33101  52315 11R  R9_2     
-        31       1051 33101  56346 11L  R13_2    
-        31       1052 33101  56369 11R  R13_2    
-        31       1053 33101  56341 11L  R13_2    
-        31       1054 33101  56359 11R  R13_2    
-        31       1055 33101  55891 11L  R13_1    
-        31       1056 33101  55897 11R  R13_1    
-        31       1057 33101  55304 11L  R12_2    
-        31       1058 33101  55332 11R  R12_2    
-        31       1059 33101  55303 11L  R12_2    
-        31       1060 33101  43698 11R  R2_1     
-        31       1061 33101  38883 11L  P16      
-        31       1062 33101  56639 11R  R13_3    
-        31       1063 33101  55887 11L  R13_1    
-        31       1064 33101  56365 11R  R13_2    
-        31       1065 33101  56352 11L  R13_2    
-        31       1066 33101  56380 11R  R13_2    
-        31       1067 33101  55894 11L  R13_1    
-        31       1068 33101  56375 11R  R13_2    
-        31       1069 33101  56635 11L  R13_3    
-        31       1070 33101  54733 11R  R12_1    
-        31       1071 33101  56347 11L  R13_2    
-        31       1072 33101  56370 11R  R13_2    
-        31       1073 33101  56342 11L  R13_2    
-        31       1074 33101  56360 11R  R13_2    
-        31       1075 33101  55892 11L  R13_1    
-        31       1076 33101  55898 11R  R13_1    
-        31       1077 33101  55290 11L  R12_2    
-        31       1078 33101  55333 11R  R12_2    
-        31       1079 33101  55300 11L  R12_2    
-        31       1080 33101  55328 11R  R12_2    
-        31       1081 33101  38884 11L  P16      
-        31       1082 33101  56640 11R  R13_3    
-        31       1083 33101  55888 11L  R13_1    
-        31       1084 33101  56366 11R  R13_2    
-        31       1085 33101  56353 11L  R13_2    
-        31       1086 33101  56381 11R  R13_2    
-        31       1087 33101  38885 11L  P16      
-        31       1088 33101  56376 11R  R13_2    
-        31       1089 33101  45378 11L  R3_2     
-        31       1090 33101  54734 11R  R12_1    
-        31       1091 33101  56348 11L  R13_2    
-        31       1092 33101  56371 11R  R13_2    
-        31       1093 33101  56343 11L  R13_2    
-        31       1094 33101  56361 11R  R13_2    
-        31       1095 33101  55893 11L  R13_1    
-        31       1096 33101  55335 11R  R12_2    
-        31       1097 33101  55291 11L  R12_2    
-        31       1098 33101  55334 11R  R12_2    
-        31       1099 33101  55301 11L  R12_2    
-        31       1100 33101  55329 11R  R12_2    
-        31       1101 33101  28787 12L  P12      
-        31       1102 33101  56416 12R  R13_2    
-        31       1103 33101  56384 12L  R13_2    
-        31       1104 33101  56405 12R  R13_2    
-        31       1105 33101  57199 12L  R14_1    
-        31       1106 33101  57207 12R  R14_1    
-        31       1107 33101  56648 12L  R13_3    
-        31       1108 33101  56658 12R  R13_3    
-        31       1109 33101  56394 12L  R13_2    
-        31       1110 33101  56426 12R  R13_2    
-        31       1111 33101  56389 12L  R13_2    
-        31       1112 33101  56401 12R  R13_2    
-        31       1113 33101  55901 12L  R13_1    
-        31       1114 33101  56421 12R  R13_2    
-        31       1115 33101  54779 12L  R12_1    
-        31       1116 33101  55907 12R  R13_1    
-        31       1117 33101  54772 12L  R12_1    
-        31       1118 33101  55336 12R  R12_2    
-        31       1119 33101  54747 12L  R12_1    
-        31       1120 33101  54796 12R  R12_1    
-        31       1121 33101  28788 12L  P12      
-        31       1122 33101  56417 12R  R13_2    
-        31       1123 33101  56395 12L  R13_2    
-        31       1124 33101  56407 12R  R13_2    
-        31       1125 33101  57200 12L  R14_1    
-        31       1126 33101  57208 12R  R14_1    
-        31       1127 33101  56649 12L  R13_3    
-        31       1128 33101  56659 12R  R13_3    
-        31       1129 33101  56385 12L  R13_2    
-        31       1130 33101  56411 12R  R13_2    
-        31       1131 33101  56390 12L  R13_2    
-        31       1132 33101  56402 12R  R13_2    
-        31       1133 33101  55902 12L  R13_1    
-        31       1134 33101  56422 12R  R13_2    
-        31       1135 33101  55900 12L  R13_1    
-        31       1136 33101  55908 12R  R13_1    
-        31       1137 33101  54773 12L  R12_1    
-        31       1138 33101  55337 12R  R12_2    
-        31       1139 33101  54752 12L  R12_1    
-        31       1140 33101  53890 12R  R11_1    
-        31       1141 33101  28790 12L  P12      
-        31       1142 33101  56418 12R  R13_2    
-        31       1143 33101  56392 12L  R13_2    
-        31       1144 33101  56408 12R  R13_2    
-        31       1145 33101  57201 12L  R14_1    
-        31       1146 33101  56654 12R  R13_3    
-        31       1147 33101  56650 12L  R13_3    
-        31       1148 33101  56660 12R  R13_3    
-        31       1149 33101  56396 12L  R13_2    
-        31       1150 33101  54788 12R  R12_1    
-        31       1151 33101  56391 12L  R13_2    
-        31       1152 33101  56403 12R  R13_2    
-        31       1153 33101  55903 12L  R13_1    
-        31       1154 33101  56423 12R  R13_2    
-        31       1155 33101  55906 12L  R13_1    
-        31       1156 33101  55909 12R  R13_1    
-        31       1157 33101  54774 12L  R12_1    
-        31       1158 33101  55338 12R  R12_2    
-        31       1159 33101  54756 12L  R12_1    
-        31       1160 33101  27813 12R  S6_3a    
-        31       1161 33101  43740 12L  R2_1     
-        31       1162 33101  56419 12R  R13_2    
-        31       1163 33101  56387 12L  R13_2    
-        31       1164 33101  56409 12R  R13_2    
-        31       1165 33101  57195 12L  R14_1    
-        31       1166 33101  56655 12R  R13_3    
-        31       1167 33101  56651 12L  R13_3    
-        31       1168 33101  56661 12R  R13_3    
-        31       1169 33101  56397 12L  R13_2    
-        31       1170 33101  56414 12R  R13_2    
-        31       1171 33101  56386 12L  R13_2    
-        31       1172 33101  56404 12R  R13_2    
-        31       1173 33101  55904 12L  R13_1    
-        31       1174 33101  56424 12R  R13_2    
-        31       1175 33101  56399 12L  R13_2    
-        31       1176 33101  55341 12R  R12_2    
-        31       1177 33101  54775 12L  R12_1    
-        31       1178 33101  55339 12R  R12_2    
-        31       1179 33101  54780 12L  R12_1    
-        31       1180 33101  39184 12R  P17      
-        31       1181 33101  54771 12L  R12_1    
-        31       1182 33101  56420 12R  R13_2    
-        31       1183 33101  56388 12L  R13_2    
-        31       1184 33101  56410 12R  R13_2    
-        31       1185 33101  57203 12L  R14_1    
-        31       1186 33101  56656 12R  R13_3    
-        31       1187 33101  56652 12L  R13_3    
-        31       1188 33101  56662 12R  R13_3    
-        31       1189 33101  56398 12L  R13_2    
-        31       1190 33101  56415 12R  R13_2    
-        31       1191 33101  56393 12L  R13_2    
-        31       1192 33101  56406 12R  R13_2    
-        31       1193 33101  55905 12L  R13_1    
-        31       1194 33101  56425 12R  R13_2    
-        31       1195 33101  56400 12L  R13_2    
-        31       1196 33101  53878 12R  R11_1    
-        31       1197 33101  54776 12L  R12_1    
-        31       1198 33101  55340 12R  R12_2    
-        31       1199 33101  54781 12L  R12_1    
-        31       1200 33101  54815 12R  R12_1    
-        31       1201 33101  31254 13L  S7_3     
-        31       1202 33101  56470 13R  R13_2    
-        31       1203 33101  56432 13L  R13_2    
-        31       1204 33101  45952 13R  R13_2    
-        31       1205 33101  57209 13L  R14_1    
-        31       1206 33101  57225 13R  R14_1    
-        31       1207 33101  56663 13L  R13_3    
-        31       1208 33101  56667 13R  R13_3    
-        31       1209 33101  45951 13L  R13_2    
-        31       1210 33101  55917 13R  R13_1    
-        31       1211 33101  56437 13L  R13_2    
-        31       1212 33101  56453 13R  R13_2    
-        31       1213 33101  55914 13L  R13_1    
-        31       1214 33101  56465 13R  R13_2    
-        31       1215 33101  55910 13L  R13_1    
-        31       1216 33101  56460 13R  R13_2    
-        31       1217 33101  55347 13L  R12_2    
-        31       1218 33101  55919 13R  R13_1    
-        31       1219 33101  55352 13L  R12_2    
-        31       1220 33101  55363 13R  R12_2    
-        31       1221 33101  50057 13L  R7_2     
-        31       1222 33101  56450 13R  R13_2    
-        31       1223 33101  56433 13L  R13_2    
-        31       1224 33101  56447 13R  R13_2    
-        31       1225 33101  57210 13L  R14_1    
-        31       1226 33101  57226 13R  R14_1    
-        31       1227 33101  56664 13L  R13_3    
-        31       1228 33101  56668 13R  R13_3    
-        31       1229 33101  55899 13L  R13_1    
-        31       1230 33101  55918 13R  R13_1    
-        31       1231 33101  56438 13L  R13_2    
-        31       1232 33101  56455 13R  R13_2    
-        31       1233 33101  55915 13L  R13_1    
-        31       1234 33101  56466 13R  R13_2    
-        31       1235 33101  55911 13L  R13_1    
-        31       1236 33101  56461 13R  R13_2    
-        31       1237 33101  55348 13L  R12_2    
-        31       1238 33101  55920 13R  R13_1    
-        31       1239 33101  55353 13L  R12_2    
-        31       1240 33101  55364 13R  R12_2    
-        31       1241 33101  51727 13L  R9_1     
-        31       1242 33101  56457 13R  R13_2    
-        31       1243 33101  56434 13L  R13_2    
-        31       1244 33101  56449 13R  R13_2    
-        31       1245 33101  57211 13L  R14_1    
-        31       1246 33101  57230 13R  R14_1    
-        31       1247 33101  56665 13L  R13_3    
-        31       1248 33101  56669 13R  R13_3    
-        31       1249 33101  56429 13L  R13_2    
-        31       1250 33101  54853 13R  R12_1    
-        31       1251 33101  56439 13L  R13_2    
-        31       1252 33101  56456 13R  R13_2    
-        31       1253 33101  55916 13L  R13_1    
-        31       1254 33101  56467 13R  R13_2    
-        31       1255 33101  55912 13L  R13_1    
-        31       1256 33101  56462 13R  R13_2    
-        31       1257 33101  55349 13L  R12_2    
-        31       1258 33101  55368 13R  R12_2    
-        31       1259 33101  55354 13L  R12_2    
-        31       1260 33101  55365 13R  R12_2    
-        31       1261 33101  51746 13L  R9_1     
-        31       1262 33101  56454 13R  R13_2    
-        31       1263 33101  56435 13L  R13_2    
-        31       1264 33101  56451 13R  R13_2    
-        31       1265 33101  57212 13L  R14_1    
-        31       1266 33101  57227 13R  R14_1    
-        31       1267 33101  56666 13L  R13_3    
-        31       1268 33101  56670 13R  R13_3    
-        31       1269 33101  56430 13L  R13_2    
-        31       1270 33101  54854 13R  R12_1    
-        31       1271 33101  56440 13L  R13_2    
-        31       1272 33101  56458 13R  R13_2    
-        31       1273 33101  56443 13L  R13_2    
-        31       1274 33101  56468 13R  R13_2    
-        31       1275 33101  55913 13L  R13_1    
-        31       1276 33101  56463 13R  R13_2    
-        31       1277 33101  55350 13L  R12_2    
-        31       1278 33101  55369 13R  R12_2    
-        31       1279 33101  55355 13L  R12_2    
-        31       1280 33101  55366 13R  R12_2    
-        31       1281 33101  51753 13L  R9_1     
-        31       1282 33101  56446 13R  R13_2    
-        31       1283 33101  56436 13L  R13_2    
-        31       1284 33101  56452 13R  R13_2    
-        31       1285 33101  57213 13L  R14_1    
-        31       1286 33101  57228 13R  R14_1    
-        31       1287 33101  56428 13L  R13_2    
-        31       1288 33101  56448 13R  R13_2    
-        31       1289 33101  56431 13L  R13_2    
-        31       1290 33101  54867 13R  R12_1    
-        31       1291 33101  56441 13L  R13_2    
-        31       1292 33101  56459 13R  R13_2    
-        31       1293 33101  56444 13L  R13_2    
-        31       1294 33101  56469 13R  R13_2    
-        31       1295 33101  55362 13L  R12_2    
-        31       1296 33101  56464 13R  R13_2    
-        31       1297 33101  55351 13L  R12_2    
-        31       1298 33101  55370 13R  R12_2    
-        31       1299 33101  55356 13L  R12_2    
-        31       1300 33101  55367 13R  R12_2    
-        31       1301 33101  28044 14L  S6_3b    
-        31       1302 33101  50273 14R  R8_1     
-        31       1303 33101  53619 14L  R11_1    
-        31       1304 33101  54428 14R  R12_1    
-        31       1305 33101  55534 14L  R13_1    
-        31       1306 33101  55544 14R  R13_1    
-        31       1307 33101  56014 14L  R13_2    
-        31       1308 33101  54426 14R  R12_1    
-        31       1309 33101  56016 14L  R13_2    
-        31       1310 33101  55554 14R  R13_1    
-        31       1311 33101  56024 14L  R13_2    
-        31       1312 33101  56031 14R  R13_2    
-        31       1313 33101  56025 14L  R13_2    
-        31       1314 33101  56036 14R  R13_2    
-        31       1315 33101  56911 14L  R14_1    
-        31       1316 33101  56041 14R  R13_2    
-        31       1317 33101  56916 14L  R14_1    
-        31       1318 33101  56030 14R  R13_2    
-        31       1319 33101  56921 14L  R14_1    
-        31       1320 33101  28093 14R  S6_3b    
-        31       1321 33101  39702 14L  S10_2    
-        31       1322 33101  54429 14R  R12_1    
-        31       1323 33101  54104 14L  R11_2    
-        31       1324 33101  55540 14R  R13_1    
-        31       1325 33101  55535 14L  R13_1    
-        31       1326 33101  55545 14R  R13_1    
-        31       1327 33101  56015 14L  R13_2    
-        31       1328 33101  54427 14R  R12_1    
-        31       1329 33101  56017 14L  R13_2    
-        31       1330 33101  56028 14R  R13_2    
-        31       1331 33101  56026 14L  R13_2    
-        31       1332 33101  56032 14R  R13_2    
-        31       1333 33101  56926 14L  R14_1    
-        31       1334 33101  56037 14R  R13_2    
-        31       1335 33101  56912 14L  R14_1    
-        31       1336 33101  56042 14R  R13_2    
-        31       1337 33101  56917 14L  R14_1    
-        31       1338 33101  56046 14R  R13_2    
-        31       1339 33101  56922 14L  R14_1    
-        31       1340 33101  28096 14R  S6_3b    
-        31       1341 33101  40146 14L  S10_3    
-        31       1342 33101  54423 14R  R12_1    
-        31       1343 33101  54394 14L  R12_1    
-        31       1344 33101  55541 14R  R13_1    
-        31       1345 33101  55536 14L  R13_1    
-        31       1346 33101  55546 14R  R13_1    
-        31       1347 33101  56021 14L  R13_2    
-        31       1348 33101  55551 14R  R13_1    
-        31       1349 33101  56018 14L  R13_2    
-        31       1350 33101  55556 14R  R13_1    
-        31       1351 33101  56539 14L  R13_3    
-        31       1352 33101  56033 14R  R13_2    
-        31       1353 33101  56908 14L  R14_1    
-        31       1354 33101  56038 14R  R13_2    
-        31       1355 33101  56913 14L  R14_1    
-        31       1356 33101  56043 14R  R13_2    
-        31       1357 33101  56918 14L  R14_1    
-        31       1358 33101  56048 14R  R13_2    
-        31       1359 33101  56923 14L  R14_1    
-        31       1360 33101  28104 14R  S6_3b    
-        31       1361 33101  41038 14L  S10_5    
-        31       1362 33101  54424 14R  R12_1    
-        31       1363 33101  54395 14L  R12_1    
-        31       1364 33101  56029 14R  R13_2    
-        31       1365 33101  55537 14L  R13_1    
-        31       1366 33101  55547 14R  R13_1    
-        31       1367 33101  56022 14L  R13_2    
-        31       1368 33101  55552 14R  R13_1    
-        31       1369 33101  56019 14L  R13_2    
-        31       1370 33101  55557 14R  R13_1    
-        31       1371 33101  56541 14L  R13_3    
-        31       1372 33101  56034 14R  R13_2    
-        31       1373 33101  56909 14L  R14_1    
-        31       1374 33101  56039 14R  R13_2    
-        31       1375 33101  56914 14L  R14_1    
-        31       1376 33101  56044 14R  R13_2    
-        31       1377 33101  56919 14L  R14_1    
-        31       1378 33101  56049 14R  R13_2    
-        31       1379 33101  56924 14L  R14_1    
-        31       1380 33101  28642 14R  P12      
-        31       1381 33101  41888 14L  P18      
-        31       1382 33101  54425 14R  R12_1    
-        31       1383 33101  54396 14L  R12_1    
-        31       1384 33101  55543 14R  R13_1    
-        31       1385 33101  55530 14L  R13_1    
-        31       1386 33101  55548 14R  R13_1    
-        31       1387 33101  56023 14L  R13_2    
-        31       1388 33101  55553 14R  R13_1    
-        31       1389 33101  56020 14L  R13_2    
-        31       1390 33101  55558 14R  R13_1    
-        31       1391 33101  56542 14L  R13_3    
-        31       1392 33101  56035 14R  R13_2    
-        31       1393 33101  56910 14L  R14_1    
-        31       1394 33101  56040 14R  R13_2    
-        31       1395 33101  56915 14L  R14_1    
-        31       1396 33101  56045 14R  R13_2    
-        31       1397 33101  56920 14L  R14_1    
-        31       1398 33101  56543 14R  R13_3    
-        31       1399 33101  56925 14L  R14_1    
-        31       1400 33101  32384 14R  P14      
-        31       1401 33101  29803 15L  S7_1     
-        31       1402 33101  54499 15R  R12_1    
-        31       1403 33101  56051 15L  R13_2    
-        31       1404 33101  56091 15R  R13_2    
-        31       1405 33101  56066 15L  R13_2    
-        31       1406 33101  56086 15R  R13_2    
-        31       1407 33101  56061 15L  R13_2    
-        31       1408 33101  56096 15R  R13_2    
-        31       1409 33101  56057 15L  R13_2    
-        31       1410 33101  56101 15R  R13_2    
-        31       1411 33101  56075 15L  R13_2    
-        31       1412 33101  56104 15R  R13_2    
-        31       1413 33101  56546 15L  R13_3    
-        31       1414 33101  56951 15R  R14_1    
-        31       1415 33101  56553 15L  R13_3    
-        31       1416 33101  56956 15R  R14_1    
-        31       1417 33101  56560 15L  R13_3    
-        31       1418 33101  56961 15R  R14_1    
-        31       1419 33101  56939 15L  R14_1    
-        31       1420 33101  37071 15R  S9_3     
-        31       1421 33101  29847 15L  S7_1     
-        31       1422 33101  55154 15R  R12_2    
-        31       1423 33101  56052 15L  R13_2    
-        31       1424 33101  56092 15R  R13_2    
-        31       1425 33101  56067 15L  R13_2    
-        31       1426 33101  56087 15R  R13_2    
-        31       1427 33101  56062 15L  R13_2    
-        31       1428 33101  56097 15R  R13_2    
-        31       1429 33101  56059 15L  R13_2    
-        31       1430 33101  56102 15R  R13_2    
-        31       1431 33101  56076 15L  R13_2    
-        31       1432 33101  56105 15R  R13_2    
-        31       1433 33101  56548 15L  R13_3    
-        31       1434 33101  56952 15R  R14_1    
-        31       1435 33101  56555 15L  R13_3    
-        31       1436 33101  56957 15R  R14_1    
-        31       1437 33101  56561 15L  R13_3    
-        31       1438 33101  56962 15R  R14_1    
-        31       1439 33101  56940 15L  R14_1    
-        31       1440 33101  37073 15R  S9_3     
-        31       1441 33101  30841 15L  S7_3     
-        31       1442 33101  55155 15R  R12_2    
-        31       1443 33101  56053 15L  R13_2    
-        31       1444 33101  56081 15R  R13_2    
-        31       1445 33101  56068 15L  R13_2    
-        31       1446 33101  56088 15R  R13_2    
-        31       1447 33101  56063 15L  R13_2    
-        31       1448 33101  56098 15R  R13_2    
-        31       1449 33101  55140 15L  R12_2    
-        31       1450 33101  56103 15R  R13_2    
-        31       1451 33101  56077 15L  R13_2    
-        31       1452 33101  56564 15R  R13_3    
-        31       1453 33101  56550 15L  R13_3    
-        31       1454 33101  56953 15R  R14_1    
-        31       1455 33101  56556 15L  R13_3    
-        31       1456 33101  56958 15R  R14_1    
-        31       1457 33101  56563 15L  R13_3    
-        31       1458 33101  56963 15R  R14_1    
-        31       1459 33101  56941 15L  R14_1    
-        31       1460 33101  37074 15R  S9_3     
-        31       1461 33101  30847 15L  S7_3     
-        31       1462 33101  55156 15R  R12_2    
-        31       1463 33101  56054 15L  R13_2    
-        31       1464 33101  56084 15R  R13_2    
-        31       1465 33101  56069 15L  R13_2    
-        31       1466 33101  56089 15R  R13_2    
-        31       1467 33101  56073 15L  R13_2    
-        31       1468 33101  56099 15R  R13_2    
-        31       1469 33101  56071 15L  R13_2    
-        31       1470 33101  56094 15R  R13_2    
-        31       1471 33101  56078 15L  R13_2    
-        31       1472 33101  56949 15R  R14_1    
-        31       1473 33101  56551 15L  R13_3    
-        31       1474 33101  56954 15R  R14_1    
-        31       1475 33101  56557 15L  R13_3    
-        31       1476 33101  56959 15R  R14_1    
-        31       1477 33101  56937 15L  R14_1    
-        31       1478 33101  56964 15R  R14_1    
-        31       1479 33101  56942 15L  R14_1    
-        31       1480 33101  37080 15R  S9_3     
-        31       1481 33101  31318 15L  S07_4    
-        31       1482 33101  56080 15R  R13_2    
-        31       1483 33101  56055 15L  R13_2    
-        31       1484 33101  56085 15R  R13_2    
-        31       1485 33101  56070 15L  R13_2    
-        31       1486 33101  56090 15R  R13_2    
-        31       1487 33101  54466 15L  R12_1    
-        31       1488 33101  56100 15R  R13_2    
-        31       1489 33101  56072 15L  R13_2    
-        31       1490 33101  56095 15R  R13_2    
-        31       1491 33101  56547 15L  R13_3    
-        31       1492 33101  56950 15R  R14_1    
-        31       1493 33101  56552 15L  R13_3    
-        31       1494 33101  56955 15R  R14_1    
-        31       1495 33101  56559 15L  R13_3    
-        31       1496 33101  56960 15R  R14_1    
-        31       1497 33101  56938 15L  R14_1    
-        31       1498 33101  56965 15R  R14_1    
-        31       1499 33101  56943 15L  R14_1    
-        31       1500 33101  39150 15R  P017     
-        31       1501 33101  26069 16L  S06      
-        31       1502 33101  39837 16R  S10_2    
-        31       1503 33101  40202 16L  S10_3    
-        31       1504 33101  50414 16R  R8_1     
-        31       1505 33101  53180 16L  R10_2    
-        31       1506 33101  52071 16R  R9_2     
-        31       1507 33101  52061 16L  R9_2     
-        31       1508 33101  52076 16R  R9_2     
-        31       1509 33101  52066 16L  R9_2     
-        31       1510 33101  53181 16R  R10_2    
-        31       1511 33101  54141 16L  R11_2    
-        31       1512 33101  54516 16R  R12_1    
-        31       1513 33101  54501 16L  R12_1    
-        31       1514 33101  54521 16R  R12_1    
-        31       1515 33101  54506 16L  R12_1    
-        31       1516 33101  54526 16R  R12_1    
-        31       1517 33101  54500 16L  R12_1    
-        31       1518 33101  54531 16R  R12_1    
-        31       1519 33101  29931 16L  S7_1     
-        31       1520 33101  28321 16R  S6_3b    
-        31       1521 33101  28229 16L  S6_3b    
-        31       1522 33101  28707 16R  P12      
-        31       1523 33101  50374 16L  R8_1     
-        31       1524 33101  50415 16R  R8_1     
-        31       1525 33101  54146 16L  R11_2    
-        31       1526 33101  52072 16R  R9_2     
-        31       1527 33101  52062 16L  R9_2     
-        31       1528 33101  52077 16R  R9_2     
-        31       1529 33101  52067 16L  R9_2     
-        31       1530 33101  53182 16R  R10_2    
-        31       1531 33101  54142 16L  R11_2    
-        31       1532 33101  54517 16R  R12_1    
-        31       1533 33101  54502 16L  R12_1    
-        31       1534 33101  54522 16R  R12_1    
-        31       1535 33101  54507 16L  R12_1    
-        31       1536 33101  54527 16R  R12_1    
-        31       1537 33101  54511 16L  R12_1    
-        31       1538 33101  54532 16R  R12_1    
-        31       1539 33101  32428 16L  P14      
-        31       1540 33101  28324 16R  S6_3b    
-        31       1541 33101  26072 16L  S06      
-        31       1542 33101  29951 16R  S7_1     
-        31       1543 33101  50375 16L  R8_1     
-        31       1544 33101  54147 16R  R11_2    
-        31       1545 33101  50378 16L  R8_1     
-        31       1546 33101  52073 16R  R9_2     
-        31       1547 33101  52063 16L  R9_2     
-        31       1548 33101  52078 16R  R9_2     
-        31       1549 33101  52068 16L  R9_2     
-        31       1550 33101  53183 16R  R10_2    
-        31       1551 33101  54143 16L  R11_2    
-        31       1552 33101  54518 16R  R12_1    
-        31       1553 33101  54503 16L  R12_1    
-        31       1554 33101  54523 16R  R12_1    
-        31       1555 33101  54508 16L  R12_1    
-        31       1556 33101  54528 16R  R12_1    
-        31       1557 33101  28656 16L  P12      
-        31       1558 33101  54533 16R  R12_1    
-        31       1559 33101  36774 16L  S9_2     
-        31       1560 33101  28681 16R  P12      
-        31       1561 33101  27126 16L  S6_2b    
-        31       1562 33101  38811 16R  P016     
-        31       1563 33101  50376 16L  R8_1     
-        31       1564 33101  54148 16R  R11_2    
-        31       1565 33101  50379 16L  R8_1     
-        31       1566 33101  52074 16R  R9_2     
-        31       1567 33101  52064 16L  R9_2     
-        31       1568 33101  52079 16R  R9_2     
-        31       1569 33101  52069 16L  R9_2     
-        31       1570 33101  53184 16R  R10_2    
-        31       1571 33101  54144 16L  R11_2    
-        31       1572 33101  54519 16R  R12_1    
-        31       1573 33101  54504 16L  R12_1    
-        31       1574 33101  54524 16R  R12_1    
-        31       1575 33101  54509 16L  R12_1    
-        31       1576 33101  54529 16R  R12_1    
-        31       1577 33101  29315 16L  P13      
-        31       1578 33101  54534 16R  R12_1    
-        31       1579 33101  37084 16L  S9_3     
-        31       1580 33101  28691 16R  P12      
-        31       1581 33101  27128 16L  S6_2b    
-        31       1582 33101  38812 16R  P016     
-        31       1583 33101  50377 16L  R8_1     
-        31       1584 33101  54536 16R  R12_1    
-        31       1585 33101  50380 16L  R8_1     
-        31       1586 33101  52075 16R  R9_2     
-        31       1587 33101  52065 16L  R9_2     
-        31       1588 33101  52080 16R  R9_2     
-        31       1589 33101  52070 16L  R9_2     
-        31       1590 33101  50413 16R  R8_1     
-        31       1591 33101  54145 16L  R11_2    
-        31       1592 33101  54520 16R  R12_1    
-        31       1593 33101  54505 16L  R12_1    
-        31       1594 33101  54525 16R  R12_1    
-        31       1595 33101  54510 16L  R12_1    
-        31       1596 33101  54530 16R  R12_1    
-        31       1597 33101  29318 16L  P13      
-        31       1598 33101  54535 16R  R12_1    
-        31       1599 33101  37088 16L  S9_3     
-        31       1600 33101  28701 16R  P12      
-        31       1601 33106    202 17L  EBP01    
-        31       1602 33106    251 17R  EBP01    
-        31       1603 33106    385 17L  EBP03    
-        31       1604 33106    447 17R  EBP03    
-        31       1605 33106    404 17L  EBP03    
-        31       1606 33106   1269 17R  EBP09    
-        31       1607 33106   1199 17L  EBP09    
-        31       1608 33106   1294 17R  EBP09    
-        31       1609 33106   1206 17L  EBP09    
-        31       1610 33106   1299 17R  EBP09    
-        31       1611 33106   1210 17L  EBP09    
-        31       1612 33106   1271 17R  EBP09    
-        31       1613 33106   1183 17L  EBP09    
-        31       1614 33106   1276 17R  EBP09    
-        31       1615 33106   1222 17L  EBP09    
-        31       1616 33106   1281 17R  EBP09    
-        31       1617 33106   1227 17L  EBP09    
-        31       1618 33106   1257 17R  EBP09    
-        31       1619 33106   1229 17L  EBP09    
-        31       1620 33106   1302 17R  EBP09    
-        31       1621 33106    205 17L  EBP01    
-        31       1622 33106    253 17R  EBP01    
-        31       1623 33106    387 17L  EBP03    
-        31       1624 33106    456 17R  EBP03    
-        31       1625 33106    407 17L  EBP03    
-        31       1626 33106   1270 17R  EBP09    
-        31       1627 33106   1200 17L  EBP09    
-        31       1628 33106   1295 17R  EBP09    
-        31       1629 33106   1208 17L  EBP09    
-        31       1630 33106   1300 17R  EBP09    
-        31       1631 33106   1211 17L  EBP09    
-        31       1632 33106   1272 17R  EBP09    
-        31       1633 33106   1186 17L  EBP09    
-        31       1634 33106   1277 17R  EBP09    
-        31       1635 33106   1223 17L  EBP09    
-        31       1636 33106   1282 17R  EBP09    
-        31       1637 33106   1228 17L  EBP09    
-        31       1638 33106   1265 17R  EBP09    
-        31       1639 33106   1230 17L  EBP09    
-        31       1640 33106   1303 17R  EBP09    
-        31       1641 33106    206 17L  EBP01    
-        31       1642 33106    269 17R  EBP01    
-        31       1643 33106    388 17L  EBP03    
-        31       1644 33106    464 17R  EBP03    
-        31       1645 33106    411 17L  EBP03    
-        31       1646 33106   1287 17R  EBP09    
-        31       1647 33106   1202 17L  EBP09    
-        31       1648 33106   1296 17R  EBP09    
-        31       1649 33106   1209 17L  EBP09    
-        31       1650 33106   1301 17R  EBP09    
-        31       1651 33106   1212 17L  EBP09    
-        31       1652 33106   1273 17R  EBP09    
-        31       1653 33106   1190 17L  EBP09    
-        31       1654 33106   1278 17R  EBP09    
-        31       1655 33106   1219 17L  EBP09    
-        31       1656 33106   1283 17R  EBP09    
-        31       1657 33106   1224 17L  EBP09    
-        31       1658 33106   1288 17R  EBP09    
-        31       1659 33106   1231 17L  EBP09    
-        31       1660 33106   1304 17R  EBP09    
-        31       1661 33106    250 17L  EBP01    
-        31       1662 33106    433 17R  EBP03    
-        31       1663 33106    389 17L  EBP03    
-        31       1664 33106    470 17R  EBP03    
-        31       1665 33106    969 17L  EBP07    
-        31       1666 33106   1290 17R  EBP09    
-        31       1667 33106   1204 17L  EBP09    
-        31       1668 33106   1297 17R  EBP09    
-        31       1669 33106   1218 17L  EBP09    
-        31       1670 33106   1306 17R  EBP09    
-        31       1671 33106   1214 17L  EBP09    
-        31       1672 33106   1274 17R  EBP09    
-        31       1673 33106   1216 17L  EBP09    
-        31       1674 33106   1279 17R  EBP09    
-        31       1675 33106   1220 17L  EBP09    
-        31       1676 33106   1284 17R  EBP09    
-        31       1677 33106   1225 17L  EBP09    
-        31       1678 33106   1289 17R  EBP09    
-        31       1679 33106   1232 17L  EBP09    
-        31       1680 33106   1305 17R  EBP09    
-        31       1681 33106    369 17L  EBP03    
-        31       1682 33106    446 17R  EBP03    
-        31       1683 33106    390 17L  EBP03    
-        31       1684 33106    475 17R  EBP03    
-        31       1685 33106   1198 17L  EBP09    
-        31       1686 33106   1292 17R  EBP09    
-        31       1687 33106   1205 17L  EBP09    
-        31       1688 33106   1298 17R  EBP09    
-        31       1689 33106   1201 17L  EBP09    
-        31       1690 33106   1307 17R  EBP09    
-        31       1691 33106   1215 17L  EBP09    
-        31       1692 33106   1275 17R  EBP09    
-        31       1693 33106   1217 17L  EBP09    
-        31       1694 33106   1280 17R  EBP09    
-        31       1695 33106   1221 17L  EBP09    
-        31       1696 33106   1285 17R  EBP09    
-        31       1697 33106   1226 17L  EBP09    
-        31       1698 33106   1293 17R  EBP09    
-        31       1699 33106   1233 17L  EBP09    
-        31       1700 33106   1308 17R  EBP09    
-        32          1 33101  56686 1L   R14_1    
-        32          2 33101  56700 1R   R14_1    
-        32          3 33101  57241 1L   R14_2    
-        32          4 33101  57266 1R   R14_2    
-        32          5 33101  57246 1L   R14_2    
-        32          6 33101  57271 1R   R14_2    
-        32          7 33101  57251 1L   R14_2    
-        32          8 33101  57276 1R   R14_2    
-        32          9 33101  57256 1L   R14_2    
-        32         10 33101  57281 1R   R14_2    
-        32         11 33101  57261 1L   R14_2    
-        32         12 33101  57286 1R   R14_2    
-        32         13 33101  57801 1L   R15_1    
-        32         14 33101  57831 1R   R15_1    
-        32         15 33101  57806 1L   R15_1    
-        32         16 33101  57836 1R   R15_1    
-        32         17 33101  57811 1L   R15_1    
-        32         18 33101  57841 1R   R15_1    
-        32         19 33101  57816 1L   R15_1    
-        32         20 33101  57846 1R   R15_1    
-        32         21 33101  57237 1L   R14_2    
-        32         22 33101  56701 1R   R14_1    
-        32         23 33101  57242 1L   R14_2    
-        32         24 33101  57267 1R   R14_2    
-        32         25 33101  57247 1L   R14_2    
-        32         26 33101  57272 1R   R14_2    
-        32         27 33101  57252 1L   R14_2    
-        32         28 33101  57277 1R   R14_2    
-        32         29 33101  57257 1L   R14_2    
-        32         30 33101  57282 1R   R14_2    
-        32         31 33101  57262 1L   R14_2    
-        32         32 33101  57287 1R   R14_2    
-        32         33 33101  57802 1L   R15_1    
-        32         34 33101  57832 1R   R15_1    
-        32         35 33101  57807 1L   R15_1    
-        32         36 33101  57837 1R   R15_1    
-        32         37 33101  57812 1L   R15_1    
-        32         38 33101  57842 1R   R15_1    
-        32         39 33101  57817 1L   R15_1    
-        32         40 33101  57847 1R   R15_1    
-        32         41 33101  57238 1L   R14_2    
-        32         42 33101  57263 1R   R14_2    
-        32         43 33101  57243 1L   R14_2    
-        32         44 33101  57268 1R   R14_2    
-        32         45 33101  57248 1L   R14_2    
-        32         46 33101  57273 1R   R14_2    
-        32         47 33101  57253 1L   R14_2    
-        32         48 33101  57278 1R   R14_2    
-        32         49 33101  57258 1L   R14_2    
-        32         50 33101  57283 1R   R14_2    
-        32         51 33101  57821 1L   R15_1    
-        32         52 33101  57851 1R   R15_1    
-        32         53 33101  57803 1L   R15_1    
-        32         54 33101  57833 1R   R15_1    
-        32         55 33101  57808 1L   R15_1    
-        32         56 33101  57838 1R   R15_1    
-        32         57 33101  57813 1L   R15_1    
-        32         58 33101  57843 1R   R15_1    
-        32         59 33101  57818 1L   R15_1    
-        32         60 33101  57848 1R   R15_1    
-        32         61 33101  57239 1L   R14_2    
-        32         62 33101  57264 1R   R14_2    
-        32         63 33101  57244 1L   R14_2    
-        32         64 33101  57269 1R   R14_2    
-        32         65 33101  57249 1L   R14_2    
-        32         66 33101  57274 1R   R14_2    
-        32         67 33101  57254 1L   R14_2    
-        32         68 33101  57279 1R   R14_2    
-        32         69 33101  57259 1L   R14_2    
-        32         70 33101  57284 1R   R14_2    
-        32         71 33101  57822 1L   R15_1    
-        32         72 33101  57852 1R   R15_1    
-        32         73 33101  57804 1L   R15_1    
-        32         74 33101  57834 1R   R15_1    
-        32         75 33101  57809 1L   R15_1    
-        32         76 33101  57839 1R   R15_1    
-        32         77 33101  57814 1L   R15_1    
-        32         78 33101  57844 1R   R15_1    
-        32         79 33101  57819 1L   R15_1    
-        32         80 33101  57849 1R   R15_1    
-        32         81 33101  57240 1L   R14_2    
-        32         82 33101  57265 1R   R14_2    
-        32         83 33101  57245 1L   R14_2    
-        32         84 33101  57270 1R   R14_2    
-        32         85 33101  57250 1L   R14_2    
-        32         86 33101  57275 1R   R14_2    
-        32         87 33101  57255 1L   R14_2    
-        32         88 33101  57280 1R   R14_2    
-        32         89 33101  57260 1L   R14_2    
-        32         90 33101  57285 1R   R14_2    
-        32         91 33101  57823 1L   R15_1    
-        32         92 33101  57853 1R   R15_1    
-        32         93 33101  57805 1L   R15_1    
-        32         94 33101  57835 1R   R15_1    
-        32         95 33101  57810 1L   R15_1    
-        32         96 33101  57840 1R   R15_1    
-        32         97 33101  57815 1L   R15_1    
-        32         98 33101  57845 1R   R15_1    
-        32         99 33101  57820 1L   R15_1    
-        32        100 33101  57850 1R   R15_1    
-        32        101 33101  42518 2L   R1_1     
-        32        102 33101  57318 2R   R14_2    
-        32        103 33101  57296 2L   R14_2    
-        32        104 33101  57326 2R   R14_2    
-        32        105 33101  57301 2L   R14_2    
-        32        106 33101  57331 2R   R14_2    
-        32        107 33101  57306 2L   R14_2    
-        32        108 33101  57336 2R   R14_2    
-        32        109 33101  57311 2L   R14_2    
-        32        110 33101  57341 2R   R14_2    
-        32        111 33101  56716 2L   R14_1    
-        32        112 33101  57335 2R   R14_2    
-        32        113 33101  57881 2L   R15_1    
-        32        114 33101  57896 2R   R15_1    
-        32        115 33101  57866 2L   R15_1    
-        32        116 33101  57901 2R   R15_1    
-        32        117 33101  57871 2L   R15_1    
-        32        118 33101  57906 2R   R15_1    
-        32        119 33101  57876 2L   R15_1    
-        32        120 33101  57911 2R   R15_1    
-        32        121 33101  35091 2L   S8_5     
-        32        122 33101  57319 2R   R14_2    
-        32        123 33101  57297 2L   R14_2    
-        32        124 33101  57327 2R   R14_2    
-        32        125 33101  57302 2L   R14_2    
-        32        126 33101  57332 2R   R14_2    
-        32        127 33101  57307 2L   R14_2    
-        32        128 33101  57337 2R   R14_2    
-        32        129 33101  57312 2L   R14_2    
-        32        130 33101  57342 2R   R14_2    
-        32        131 33101  57295 2L   R14_2    
-        32        132 33101  57345 2R   R14_2    
-        32        133 33101  57882 2L   R15_1    
-        32        134 33101  57897 2R   R15_1    
-        32        135 33101  57867 2L   R15_1    
-        32        136 33101  57902 2R   R15_1    
-        32        137 33101  57872 2L   R15_1    
-        32        138 33101  57907 2R   R15_1    
-        32        139 33101  57877 2L   R15_1    
-        32        140 33101  57912 2R   R15_1    
-        32        141 33101  35092 2L   S8_5     
-        32        142 33101  57322 2R   R14_2    
-        32        143 33101  57298 2L   R14_2    
-        32        144 33101  57328 2R   R14_2    
-        32        145 33101  57303 2L   R14_2    
-        32        146 33101  57333 2R   R14_2    
-        32        147 33101  57308 2L   R14_2    
-        32        148 33101  57338 2R   R14_2    
-        32        149 33101  57313 2L   R14_2    
-        32        150 33101  57343 2R   R14_2    
-        32        151 33101  57316 2L   R14_2    
-        32        152 33101  57893 2R   R15_1    
-        32        153 33101  57883 2L   R15_1    
-        32        154 33101  57898 2R   R15_1    
-        32        155 33101  57868 2L   R15_1    
-        32        156 33101  57903 2R   R15_1    
-        32        157 33101  57873 2L   R15_1    
-        32        158 33101  57908 2R   R15_1    
-        32        159 33101  57878 2L   R15_1    
-        32        160 33101  57913 2R   R15_1    
-        32        161 33101  35096 2L   S8_5     
-        32        162 33101  57323 2R   R14_2    
-        32        163 33101  57299 2L   R14_2    
-        32        164 33101  57329 2R   R14_2    
-        32        165 33101  57304 2L   R14_2    
-        32        166 33101  57334 2R   R14_2    
-        32        167 33101  57309 2L   R14_2    
-        32        168 33101  57339 2R   R14_2    
-        32        169 33101  57314 2L   R14_2    
-        32        170 33101  57344 2R   R14_2    
-        32        171 33101  57317 2L   R14_2    
-        32        172 33101  57894 2R   R15_1    
-        32        173 33101  57864 2L   R15_1    
-        32        174 33101  57899 2R   R15_1    
-        32        175 33101  57869 2L   R15_1    
-        32        176 33101  57904 2R   R15_1    
-        32        177 33101  57874 2L   R15_1    
-        32        178 33101  57909 2R   R15_1    
-        32        179 33101  57879 2L   R15_1    
-        32        180 33101  57914 2R   R15_1    
-        32        181 33101  35099 2L   S8_5     
-        32        182 33101  57324 2R   R14_2    
-        32        183 33101  57300 2L   R14_2    
-        32        184 33101  57330 2R   R14_2    
-        32        185 33101  57305 2L   R14_2    
-        32        186 33101  57325 2R   R14_2    
-        32        187 33101  57310 2L   R14_2    
-        32        188 33101  57340 2R   R14_2    
-        32        189 33101  57315 2L   R14_2    
-        32        190 33101  57346 2R   R14_2    
-        32        191 33101  57863 2L   R15_1    
-        32        192 33101  57895 2R   R15_1    
-        32        193 33101  57865 2L   R15_1    
-        32        194 33101  57900 2R   R15_1    
-        32        195 33101  57870 2L   R15_1    
-        32        196 33101  57905 2R   R15_1    
-        32        197 33101  57875 2L   R15_1    
-        32        198 33101  57910 2R   R15_1    
-        32        199 33101  57880 2L   R15_1    
-        32        200 33101  57915 2R   R15_1    
-        32        201 33101  32323 3L   P14      
-        32        202 33101  39017 3R   P017     
-        32        203 33101  56756 3L   R14_1    
-        32        204 33101  56781 3R   R14_1    
-        32        205 33101  56761 3L   R14_1    
-        32        206 33101  56786 3R   R14_1    
-        32        207 33101  56766 3L   R14_1    
-        32        208 33101  56791 3R   R14_1    
-        32        209 33101  57926 3L   R15_1    
-        32        210 33101  56796 3R   R14_1    
-        32        211 33101  57931 3L   R15_1    
-        32        212 33101  56780 3R   R14_1    
-        32        213 33101  57936 3L   R15_1    
-        32        214 33101  57956 3R   R15_1    
-        32        215 33101  56770 3L   R14_1    
-        32        216 33101  57966 3R   R15_1    
-        32        217 33101  57941 3L   R15_1    
-        32        218 33101  57961 3R   R15_1    
-        32        219 33101  38990 3L   P017     
-        32        220 33101  41686 3R   S10_6    
-        32        221 33101  34045 3L   S8_3     
-        32        222 33101  39018 3R   P017     
-        32        223 33101  56757 3L   R14_1    
-        32        224 33101  56782 3R   R14_1    
-        32        225 33101  56762 3L   R14_1    
-        32        226 33101  56787 3R   R14_1    
-        32        227 33101  56767 3L   R14_1    
-        32        228 33101  56792 3R   R14_1    
-        32        229 33101  57927 3L   R15_1    
-        32        230 33101  56797 3R   R14_1    
-        32        231 33101  57932 3L   R15_1    
-        32        232 33101  56801 3R   R14_1    
-        32        233 33101  57937 3L   R15_1    
-        32        234 33101  57957 3R   R15_1    
-        32        235 33101  57923 3L   R15_1    
-        32        236 33101  57967 3R   R15_1    
-        32        237 33101  57942 3L   R15_1    
-        32        238 33101  57962 3R   R15_1    
-        32        239 33101  38991 3L   P017     
-        32        240 33101  41691 3R   S10_6    
-        32        241 33101  34316 3L   S8_4     
-        32        242 33101  39019 3R   P017     
-        32        243 33101  56758 3L   R14_1    
-        32        244 33101  56783 3R   R14_1    
-        32        245 33101  56763 3L   R14_1    
-        32        246 33101  56788 3R   R14_1    
-        32        247 33101  56768 3L   R14_1    
-        32        248 33101  56793 3R   R14_1    
-        32        249 33101  57928 3L   R15_1    
-        32        250 33101  56798 3R   R14_1    
-        32        251 33101  57933 3L   R15_1    
-        32        252 33101  56802 3R   R14_1    
-        32        253 33101  57938 3L   R15_1    
-        32        254 33101  57958 3R   R15_1    
-        32        255 33101  57924 3L   R15_1    
-        32        256 33101  57968 3R   R15_1    
-        32        257 33101  57943 3L   R15_1    
-        32        258 33101  57963 3R   R15_1    
-        32        259 33101  38992 3L   P017     
-        32        260 33101  41702 3R   S10_6    
-        32        261 33101  37600 3L   S9_4     
-        32        262 33101  43892 3R   R2_2     
-        32        263 33101  56754 3L   R14_1    
-        32        264 33101  56784 3R   R14_1    
-        32        265 33101  56759 3L   R14_1    
-        32        266 33101  56789 3R   R14_1    
-        32        267 33101  56764 3L   R14_1    
-        32        268 33101  56794 3R   R14_1    
-        32        269 33101  57929 3L   R15_1    
-        32        270 33101  56799 3R   R14_1    
-        32        271 33101  57934 3L   R15_1    
-        32        272 33101  56803 3R   R14_1    
-        32        273 33101  57939 3L   R15_1    
-        32        274 33101  57959 3R   R15_1    
-        32        275 33101  57925 3L   R15_1    
-        32        276 33101  57969 3R   R15_1    
-        32        277 33101  57944 3L   R15_1    
-        32        278 33101  57964 3R   R15_1    
-        32        279 33101  38993 3L   P017     
-        32        280 33101  41714 3R   S10_6    
-        32        281 33101  38986 3L   P017     
-        32        282 33101  56779 3R   R14_1    
-        32        283 33101  56755 3L   R14_1    
-        32        284 33101  56785 3R   R14_1    
-        32        285 33101  56760 3L   R14_1    
-        32        286 33101  56790 3R   R14_1    
-        32        287 33101  56765 3L   R14_1    
-        32        288 33101  56795 3R   R14_1    
-        32        289 33101  57930 3L   R15_1    
-        32        290 33101  56800 3R   R14_1    
-        32        291 33101  57935 3L   R15_1    
-        32        292 33101  57955 3R   R15_1    
-        32        293 33101  57940 3L   R15_1    
-        32        294 33101  57960 3R   R15_1    
-        32        295 33101  57947 3L   R15_1    
-        32        296 33101  57970 3R   R15_1    
-        32        297 33101  57945 3L   R15_1    
-        32        298 33101  57965 3R   R15_1    
-        32        299 33101  38994 3L   P017     
-        32        300 33101  38761 3R   P016     
-        32        301 33101  33421 4L   S8_2     
-        32        302 33101  39078 4R   P017     
-        32        303 33101  56821 4L   R14_1    
-        32        304 33101  56846 4R   R14_1    
-        32        305 33101  56826 4L   R14_1    
-        32        306 33101  56851 4R   R14_1    
-        32        307 33101  56831 4L   R14_1    
-        32        308 33101  56856 4R   R14_1    
-        32        309 33101  56836 4L   R14_1    
-        32        310 33101  56861 4R   R14_1    
-        32        311 33101  57347 4L   R14_2    
-        32        312 33101  56866 4R   R14_1    
-        32        313 33101  57352 4L   R14_2    
-        32        314 33101  56871 4R   R14_1    
-        32        315 33101  57982 4L   R15_1    
-        32        316 33101  56876 4R   R14_1    
-        32        317 33101  57987 4L   R15_1    
-        32        318 33101  56881 4R   R14_1    
-        32        319 33101  39055 4L   P017     
-        32        320 33101  33460 4R   S8_2     
-        32        321 33101  37681 4L   S9_4     
-        32        322 33101  39079 4R   P017     
-        32        323 33101  56822 4L   R14_1    
-        32        324 33101  56847 4R   R14_1    
-        32        325 33101  56827 4L   R14_1    
-        32        326 33101  56852 4R   R14_1    
-        32        327 33101  56832 4L   R14_1    
-        32        328 33101  56857 4R   R14_1    
-        32        329 33101  56837 4L   R14_1    
-        32        330 33101  56862 4R   R14_1    
-        32        331 33101  57348 4L   R14_2    
-        32        332 33101  56867 4R   R14_1    
-        32        333 33101  57978 4L   R15_1    
-        32        334 33101  56872 4R   R14_1    
-        32        335 33101  57983 4L   R15_1    
-        32        336 33101  56877 4R   R14_1    
-        32        337 33101  57988 4L   R15_1    
-        32        338 33101  56882 4R   R14_1    
-        32        339 33101  41739 4L   S10_6    
-        32        340 33101  38776 4R   P016     
-        32        341 33101  37701 4L   S9_4     
-        32        342 33101  39080 4R   P017     
-        32        343 33101  56823 4L   R14_1    
-        32        344 33101  56848 4R   R14_1    
-        32        345 33101  56828 4L   R14_1    
-        32        346 33101  56853 4R   R14_1    
-        32        347 33101  56833 4L   R14_1    
-        32        348 33101  56858 4R   R14_1    
-        32        349 33101  56838 4L   R14_1    
-        32        350 33101  56863 4R   R14_1    
-        32        351 33101  57349 4L   R14_2    
-        32        352 33101  56868 4R   R14_1    
-        32        353 33101  57979 4L   R15_1    
-        32        354 33101  56873 4R   R14_1    
-        32        355 33101  57984 4L   R15_1    
-        32        356 33101  56878 4R   R14_1    
-        32        357 33101  57989 4L   R15_1    
-        32        358 33101  58008 4R   R15_1    
-        32        359 33101  42153 4L   P19      
-        32        360 33101  38777 4R   P016     
-        32        361 33101  37706 4L   S9_4     
-        32        362 33101  39081 4R   P017     
-        32        363 33101  56824 4L   R14_1    
-        32        364 33101  56849 4R   R14_1    
-        32        365 33101  56829 4L   R14_1    
-        32        366 33101  56854 4R   R14_1    
-        32        367 33101  56834 4L   R14_1    
-        32        368 33101  56859 4R   R14_1    
-        32        369 33101  56808 4L   R14_1    
-        32        370 33101  56864 4R   R14_1    
-        32        371 33101  57350 4L   R14_2    
-        32        372 33101  56869 4R   R14_1    
-        32        373 33101  57980 4L   R15_1    
-        32        374 33101  56874 4R   R14_1    
-        32        375 33101  57985 4L   R15_1    
-        32        376 33101  56879 4R   R14_1    
-        32        377 33101  57990 4L   R15_1    
-        32        378 33101  58009 4R   R15_1    
-        32        379 33101  42154 4L   P19      
-        32        380 33101  39058 4R   P017     
-        32        381 33101  38374 4L   S9_6     
-        32        382 33101  39082 4R   P017     
-        32        383 33101  56825 4L   R14_1    
-        32        384 33101  56850 4R   R14_1    
-        32        385 33101  56830 4L   R14_1    
-        32        386 33101  56855 4R   R14_1    
-        32        387 33101  56835 4L   R14_1    
-        32        388 33101  56860 4R   R14_1    
-        32        389 33101  56820 4L   R14_1    
-        32        390 33101  56865 4R   R14_1    
-        32        391 33101  57351 4L   R14_2    
-        32        392 33101  56870 4R   R14_1    
-        32        393 33101  57981 4L   R15_1    
-        32        394 33101  56875 4R   R14_1    
-        32        395 33101  57986 4L   R15_1    
-        32        396 33101  56880 4R   R14_1    
-        32        397 33101  57991 4L   R15_1    
-        32        398 33101  58010 4R   R15_1    
-        32        399 33101  57992 4L   R15_1    
-        32        400 33101  39059 4R   P017     
-        32        401 33101  34106 5L   S8_3     
-        32        402 33101  56903 5R   R14_1    
-        32        403 33101  57390 5L   R14_2    
-        32        404 33101  57396 5R   R14_2    
-        32        405 33101  57381 5L   R14_2    
-        32        406 33101  57401 5R   R14_2    
-        32        407 33101  57386 5L   R14_2    
-        32        408 33101  57406 5R   R14_2    
-        32        409 33101  58018 5L   R15_1    
-        32        410 33101  57411 5R   R14_2    
-        32        411 33101  58026 5L   R15_1    
-        32        412 33101  58061 5R   R15_1    
-        32        413 33101  58031 5L   R15_1    
-        32        414 33101  58066 5R   R15_1    
-        32        415 33101  58041 5L   R15_1    
-        32        416 33101  58076 5R   R15_1    
-        32        417 33101  58036 5L   R15_1    
-        32        418 33101  58071 5R   R15_1    
-        32        419 33101  58046 5L   R15_1    
-        32        420 33101  39132 5R   P017     
-        32        421 33101  41881 5L   P18      
-        32        422 33101  56904 5R   R14_1    
-        32        423 33101  57391 5L   R14_2    
-        32        424 33101  57397 5R   R14_2    
-        32        425 33101  57382 5L   R14_2    
-        32        426 33101  57402 5R   R14_2    
-        32        427 33101  57387 5L   R14_2    
-        32        428 33101  57407 5R   R14_2    
-        32        429 33101  58019 5L   R15_1    
-        32        430 33101  57412 5R   R14_2    
-        32        431 33101  58027 5L   R15_1    
-        32        432 33101  58062 5R   R15_1    
-        32        433 33101  58032 5L   R15_1    
-        32        434 33101  58067 5R   R15_1    
-        32        435 33101  58042 5L   R15_1    
-        32        436 33101  58077 5R   R15_1    
-        32        437 33101  58037 5L   R15_1    
-        32        438 33101  58072 5R   R15_1    
-        32        439 33101  58047 5L   R15_1    
-        32        440 33101  39133 5R   P017     
-        32        441 33101  42650 5L   R1_1     
-        32        442 33101  57393 5R   R14_2    
-        32        443 33101  57378 5L   R14_2    
-        32        444 33101  57398 5R   R14_2    
-        32        445 33101  57383 5L   R14_2    
-        32        446 33101  57403 5R   R14_2    
-        32        447 33101  57388 5L   R14_2    
-        32        448 33101  57408 5R   R14_2    
-        32        449 33101  58021 5L   R15_1    
-        32        450 33101  56905 5R   R14_1    
-        32        451 33101  58028 5L   R15_1    
-        32        452 33101  58063 5R   R15_1    
-        32        453 33101  58033 5L   R15_1    
-        32        454 33101  58068 5R   R15_1    
-        32        455 33101  58043 5L   R15_1    
-        32        456 33101  58078 5R   R15_1    
-        32        457 33101  58038 5L   R15_1    
-        32        458 33101  58058 5R   R15_1    
-        32        459 33101  58048 5L   R15_1    
-        32        460 33101  39134 5R   P017     
-        32        461 33101  43130 5L   R1_2     
-        32        462 33101  57394 5R   R14_2    
-        32        463 33101  57379 5L   R14_2    
-        32        464 33101  57399 5R   R14_2    
-        32        465 33101  57384 5L   R14_2    
-        32        466 33101  57404 5R   R14_2    
-        32        467 33101  57389 5L   R14_2    
-        32        468 33101  57409 5R   R14_2    
-        32        469 33101  58022 5L   R15_1    
-        32        470 33101  56906 5R   R14_1    
-        32        471 33101  58029 5L   R15_1    
-        32        472 33101  58064 5R   R15_1    
-        32        473 33101  58034 5L   R15_1    
-        32        474 33101  58069 5R   R15_1    
-        32        475 33101  58044 5L   R15_1    
-        32        476 33101  58074 5R   R15_1    
-        32        477 33101  58039 5L   R15_1    
-        32        478 33101  58059 5R   R15_1    
-        32        479 33101  58024 5L   R15_1    
-        32        480 33101  39135 5R   P017     
-        32        481 33101  33504 5L   S8_2     
-        32        482 33101  57395 5R   R14_2    
-        32        483 33101  57380 5L   R14_2    
-        32        484 33101  57400 5R   R14_2    
-        32        485 33101  57385 5L   R14_2    
-        32        486 33101  57405 5R   R14_2    
-        32        487 33101  57392 5L   R14_2    
-        32        488 33101  57410 5R   R14_2    
-        32        489 33101  58023 5L   R15_1    
-        32        490 33101  56907 5R   R14_1    
-        32        491 33101  58030 5L   R15_1    
-        32        492 33101  58065 5R   R15_1    
-        32        493 33101  58035 5L   R15_1    
-        32        494 33101  58070 5R   R15_1    
-        32        495 33101  58045 5L   R15_1    
-        32        496 33101  58075 5R   R15_1    
-        32        497 33101  58040 5L   R15_1    
-        32        498 33101  58060 5R   R15_1    
-        32        499 33101  58025 5L   R15_1    
-        32        500 33101  39136 5R   P017     
-        32        501 33101  57528 6L   R14_2    
-        32        502 33101  57011 6R   R14_1    
-        32        503 33101  57523 6L   R14_2    
-        32        504 30301     36 6R   B01      
-        32        505 33101  56972 6L   R14_1    
-        32        506 33101  56580 6R   R13_3    
-        32        507 33101  56565 6L   R13_3    
-        32        508 33101  56575 6R   R13_3    
-        32        509 33101  56992 6L   R14_1    
-        32        510 33101  56570 6R   R13_3    
-        32        511 33101  56987 6L   R14_1    
-        32        512 33101  57006 6R   R14_1    
-        32        513 33101  56982 6L   R14_1    
-        32        514 33101  57001 6R   R14_1    
-        32        515 33101  56977 6L   R14_1    
-        32        516 33101  56996 6R   R14_1    
-        32        517 33101  56117 6L   R13_2    
-        32        518 33101  55601 6R   R13_1    
-        32        519 33101  56123 6L   R13_2    
-        32        520 33101  35799 6R   P15_2    
-        32        521 33101  57529 6L   R14_2    
-        32        522 33101  55632 6R   R13_1    
-        32        523 33101  57531 6L   R14_2    
-        32        524 30301     37 6R   B01      
-        32        525 33101  56973 6L   R14_1    
-        32        526 33101  56581 6R   R13_3    
-        32        527 33101  56566 6L   R13_3    
-        32        528 33101  56576 6R   R13_3    
-        32        529 33101  56993 6L   R14_1    
-        32        530 33101  56571 6R   R13_3    
-        32        531 33101  56988 6L   R14_1    
-        32        532 33101  57007 6R   R14_1    
-        32        533 33101  56983 6L   R14_1    
-        32        534 33101  57002 6R   R14_1    
-        32        535 33101  56978 6L   R14_1    
-        32        536 33101  56997 6R   R14_1    
-        32        537 33101  56119 6L   R13_2    
-        32        538 33101  55602 6R   R13_1    
-        32        539 33101  56124 6L   R13_2    
-        32        540 33101  38592 6R   S9_5     
-        32        541 33101  57530 6L   R14_2    
-        32        542 33101  55633 6R   R13_1    
-        32        543 33101  57525 6L   R14_2    
-        32        544 30301    504 6R   B04      
-        32        545 33101  56974 6L   R14_1    
-        32        546 33101  56582 6R   R13_3    
-        32        547 33101  56567 6L   R13_3    
-        32        548 33101  56577 6R   R13_3    
-        32        549 33101  56994 6L   R14_1    
-        32        550 33101  56572 6R   R13_3    
-        32        551 33101  56989 6L   R14_1    
-        32        552 33101  57008 6R   R14_1    
-        32        553 33101  56984 6L   R14_1    
-        32        554 33101  57003 6R   R14_1    
-        32        555 33101  56979 6L   R14_1    
-        32        556 33101  56998 6R   R14_1    
-        32        557 33101  56120 6L   R13_2    
-        32        558 33101  55603 6R   R13_1    
-        32        559 33101  55592 6L   R13_1    
-        32        560 33101  38840 6R   P17      
-        32        561 33101  57524 6L   R14_2    
-        32        562 30301    507 6R   B04      
-        32        563 33101  57526 6L   R14_2    
-        32        564 30301    508 6R   B04      
-        32        565 33101  56975 6L   R14_1    
-        32        566 33101  56583 6R   R13_3    
-        32        567 33101  56568 6L   R13_3    
-        32        568 33101  56578 6R   R13_3    
-        32        569 33101  56995 6L   R14_1    
-        32        570 33101  56573 6R   R13_3    
-        32        571 33101  56990 6L   R14_1    
-        32        572 33101  57009 6R   R14_1    
-        32        573 33101  56985 6L   R14_1    
-        32        574 33101  57004 6R   R14_1    
-        32        575 33101  56980 6L   R14_1    
-        32        576 33101  56999 6R   R14_1    
-        32        577 33101  56121 6L   R13_2    
-        32        578 33101  55604 6R   R13_1    
-        32        579 30301    523 6L   B04      
-        32        580 33101  38841 6R   P17      
-        32        581 33101  57527 6L   R14_2    
-        32        582 30301    510 6R   B04      
-        32        583 33101  57532 6L   R14_2    
-        32        584 30301     31 6R   B01      
-        32        585 33101  56976 6L   R14_1    
-        32        586 33101  56584 6R   R13_3    
-        32        587 33101  56569 6L   R13_3    
-        32        588 33101  56579 6R   R13_3    
-        32        589 33101  56125 6L   R13_2    
-        32        590 33101  56574 6R   R13_3    
-        32        591 33101  56991 6L   R14_1    
-        32        592 33101  57010 6R   R14_1    
-        32        593 33101  56986 6L   R14_1    
-        32        594 33101  57005 6R   R14_1    
-        32        595 33101  56981 6L   R14_1    
-        32        596 33101  57000 6R   R14_1    
-        32        597 33101  56122 6L   R13_2    
-        32        598 33101  55605 6R   R13_1    
-        32        599 30301    525 6L   B04      
-        32        600 33101  38842 6R   P17      
-        32        601 33101  51575 7L   R9_1     
-        32        602 33101  57070 7R   R14_1    
-        32        603 33101  57042 7L   R14_1    
-        32        604 33101  57060 7R   R14_1    
-        32        605 33101  57017 7L   R14_1    
-        32        606 33101  56152 7R   R13_2    
-        32        607 33101  57047 7L   R14_1    
-        32        608 33101  56607 7R   R13_3    
-        32        609 33101  57032 7L   R14_1    
-        32        610 33101  57050 7R   R14_1    
-        32        611 33101  56590 7L   R13_3    
-        32        612 33101  56602 7R   R13_3    
-        32        613 33101  56585 7L   R13_3    
-        32        614 33101  56597 7R   R13_3    
-        32        615 33101  57037 7L   R14_1    
-        32        616 33101  57075 7R   R14_1    
-        32        617 33101  57027 7L   R14_1    
-        32        618 33101  57055 7R   R14_1    
-        32        619 33101  57022 7L   R14_1    
-        32        620 33101  26814 7R   S6_2     
-        32        621 30301    193 7L   B02      
-        32        622 33101  57071 7R   R14_1    
-        32        623 33101  57043 7L   R14_1    
-        32        624 33101  57061 7R   R14_1    
-        32        625 33101  57018 7L   R14_1    
-        32        626 33101  56153 7R   R13_2    
-        32        627 33101  57048 7L   R14_1    
-        32        628 33101  56608 7R   R13_3    
-        32        629 33101  57033 7L   R14_1    
-        32        630 33101  57051 7R   R14_1    
-        32        631 33101  56591 7L   R13_3    
-        32        632 33101  56603 7R   R13_3    
-        32        633 33101  56586 7L   R13_3    
-        32        634 33101  56598 7R   R13_3    
-        32        635 33101  57038 7L   R14_1    
-        32        636 33101  57076 7R   R14_1    
-        32        637 33101  57028 7L   R14_1    
-        32        638 33101  57056 7R   R14_1    
-        32        639 33101  57023 7L   R14_1    
-        32        640 33101  26815 7R   S6_2     
-        32        641 30301    195 7L   B02      
-        32        642 33101  57067 7R   R14_1    
-        32        643 33101  57044 7L   R14_1    
-        32        644 33101  57062 7R   R14_1    
-        32        645 33101  57019 7L   R14_1    
-        32        646 33101  56154 7R   R13_2    
-        32        647 33101  57049 7L   R14_1    
-        32        648 33101  56609 7R   R13_3    
-        32        649 33101  57034 7L   R14_1    
-        32        650 33101  57052 7R   R14_1    
-        32        651 33101  56592 7L   R13_3    
-        32        652 33101  56604 7R   R13_3    
-        32        653 33101  56587 7L   R13_3    
-        32        654 33101  56599 7R   R13_3    
-        32        655 33101  57039 7L   R14_1    
-        32        656 33101  57077 7R   R14_1    
-        32        657 33101  57029 7L   R14_1    
-        32        658 33101  57057 7R   R14_1    
-        32        659 33101  57024 7L   R14_1    
-        32        660 33101  26816 7R   S6_2     
-        32        661 30301    197 7L   B02      
-        32        662 33101  57073 7R   R14_1    
-        32        663 33101  56595 7L   R13_3    
-        32        664 33101  57063 7R   R14_1    
-        32        665 33101  57020 7L   R14_1    
-        32        666 33101  56155 7R   R13_2    
-        32        667 33101  57041 7L   R14_1    
-        32        668 33101  56610 7R   R13_3    
-        32        669 33101  57035 7L   R14_1    
-        32        670 33101  57053 7R   R14_1    
-        32        671 33101  56593 7L   R13_3    
-        32        672 33101  56605 7R   R13_3    
-        32        673 33101  56588 7L   R13_3    
-        32        674 33101  56600 7R   R13_3    
-        32        675 33101  57040 7L   R14_1    
-        32        676 33101  47835 7R   S9_5     
-        32        677 33101  57030 7L   R14_1    
-        32        678 33101  57058 7R   R14_1    
-        32        679 33101  57025 7L   R14_1    
-        32        680 33101  28546 7R   S6_3b    
-        32        681 30301    198 7L   B02      
-        32        682 33101  57068 7R   R14_1    
-        32        683 33101  56596 7L   R13_3    
-        32        684 33101  57066 7R   R14_1    
-        32        685 33101  57021 7L   R14_1    
-        32        686 33101  56156 7R   R13_2    
-        32        687 33101  57046 7L   R14_1    
-        32        688 33101  56611 7R   R13_3    
-        32        689 33101  57036 7L   R14_1    
-        32        690 33101  57054 7R   R14_1    
-        32        691 33101  56594 7L   R13_3    
-        32        692 33101  56606 7R   R13_3    
-        32        693 33101  56589 7L   R13_3    
-        32        694 33101  56601 7R   R13_3    
-        32        695 33101  57045 7L   R14_1    
-        32        696 33101  56157 7R   R13_2    
-        32        697 33101  57031 7L   R14_1    
-        32        698 33101  57059 7R   R14_1    
-        32        699 33101  57026 7L   R14_1    
-        32        700 33101  31585 7R   S7_4     
-        32        701 33101  57113 8L   R14_1    
-        32        702 30301    620 8R   B04      
-        32        703 33101  57108 8L   R14_1    
-        32        704 33101  57141 8R   R14_1    
-        32        705 33101  57103 8L   R14_1    
-        32        706 33101  57131 8R   R14_1    
-        32        707 33101  57078 8L   R14_1    
-        32        708 33101  57126 8R   R14_1    
-        32        709 33101  57083 8L   R14_1    
-        32        710 33101  57136 8R   R14_1    
-        32        711 33101  57093 8L   R14_1    
-        32        712 33101  56623 8R   R13_3    
-        32        713 33101  57098 8L   R14_1    
-        32        714 30301    201 8R   B03      
-        32        715 33101  57088 8L   R14_1    
-        32        716 33101  56618 8R   R13_3    
-        32        717 33101  56178 8L   R13_2    
-        32        718 33101  57121 8R   R14_1    
-        32        719 33101  56173 8L   R13_2    
-        32        720 30301    624 8R   B04      
-        32        721 33101  57114 8L   R14_1    
-        32        722 30301    569 8R   B04      
-        32        723 33101  57109 8L   R14_1    
-        32        724 33101  57142 8R   R14_1    
-        32        725 33101  57104 8L   R14_1    
-        32        726 33101  57132 8R   R14_1    
-        32        727 33101  57079 8L   R14_1    
-        32        728 33101  57127 8R   R14_1    
-        32        729 33101  57084 8L   R14_1    
-        32        730 33101  57137 8R   R14_1    
-        32        731 33101  57094 8L   R14_1    
-        32        732 33101  57146 8R   R14_1    
-        32        733 33101  57099 8L   R14_1    
-        32        734 30301    205 8R   B03      
-        32        735 33101  57089 8L   R14_1    
-        32        736 33101  56619 8R   R13_3    
-        32        737 33101  56179 8L   R13_2    
-        32        738 33101  57122 8R   R14_1    
-        32        739 33101  56174 8L   R13_2    
-        32        740 33101  47847 8R   S9_5     
-        32        741 33101  57118 8L   R14_1    
-        32        742 33101  57147 8R   R14_1    
-        32        743 33101  57110 8L   R14_1    
-        32        744 33101  57143 8R   R14_1    
-        32        745 33101  57105 8L   R14_1    
-        32        746 33101  57133 8R   R14_1    
-        32        747 33101  57080 8L   R14_1    
-        32        748 33101  57128 8R   R14_1    
-        32        749 33101  57085 8L   R14_1    
-        32        750 33101  57138 8R   R14_1    
-        32        751 33101  57095 8L   R14_1    
-        32        752 30301    623 8R   B04      
-        32        753 33101  57100 8L   R14_1    
-        32        754 30301    209 8R   B03      
-        32        755 33101  57090 8L   R14_1    
-        32        756 33101  56620 8R   R13_3    
-        32        757 33101  56180 8L   R13_2    
-        32        758 33101  57123 8R   R14_1    
-        32        759 33101  56175 8L   R13_2    
-        32        760 33101  54606 8R   R12_1    
-        32        761 33101  57116 8L   R14_1    
-        32        762 33101  56624 8R   R13_3    
-        32        763 33101  57111 8L   R14_1    
-        32        764 33101  57144 8R   R14_1    
-        32        765 33101  57106 8L   R14_1    
-        32        766 33101  57134 8R   R14_1    
-        32        767 33101  57081 8L   R14_1    
-        32        768 33101  57129 8R   R14_1    
-        32        769 33101  57086 8L   R14_1    
-        32        770 33101  57139 8R   R14_1    
-        32        771 33101  57096 8L   R14_1    
-        32        772 30301    215 8R   B03      
-        32        773 33101  57101 8L   R14_1    
-        32        774 30301    211 8R   B03      
-        32        775 33101  57091 8L   R14_1    
-        32        776 33101  56621 8R   R13_3    
-        32        777 33101  56181 8L   R13_2    
-        32        778 33101  57124 8R   R14_1    
-        32        779 33101  56176 8L   R13_2    
-        32        780 33101  54607 8R   R12_1    
-        32        781 33101  57117 8L   R14_1    
-        32        782 33101  56625 8R   R13_3    
-        32        783 33101  57112 8L   R14_1    
-        32        784 33101  57145 8R   R14_1    
-        32        785 33101  57107 8L   R14_1    
-        32        786 33101  57135 8R   R14_1    
-        32        787 33101  57082 8L   R14_1    
-        32        788 33101  57130 8R   R14_1    
-        32        789 33101  57087 8L   R14_1    
-        32        790 33101  57140 8R   R14_1    
-        32        791 33101  57097 8L   R14_1    
-        32        792 30301    217 8R   B03      
-        32        793 33101  57102 8L   R14_1    
-        32        794 30301    221 8R   B03      
-        32        795 33101  57092 8L   R14_1    
-        32        796 33101  56622 8R   R13_3    
-        32        797 30301    251 8L   B03      
-        32        798 33101  57125 8R   R14_1    
-        32        799 33101  56177 8L   R13_2    
-        32        800 33101  54608 8R   R12_1    
-        32        801 33101  47865 9L   S9_5     
-        32        802 33101  57535 9R   R14_2    
-        32        803 33101  57158 9L   R14_1    
-        32        804 30301    317 9R   B03      
-        32        805 33101  57153 9L   R14_1    
-        32        806 33101  57164 9R   R14_1    
-        32        807 33101  57148 9L   R14_1    
-        32        808 33101  57159 9R   R14_1    
-        32        809 33101  56235 9L   R13_2    
-        32        810 30301    319 9R   B03      
-        32        811 30301    384 9L   B03      
-        32        812 30301    320 9R   B03      
-        32        813 30301    379 9L   B03      
-        32        814 30301    325 9R   B03      
-        32        815 33101  56230 9L   R13_2    
-        32        816 33101  56267 9R   R13_2    
-        32        817 33101  56225 9L   R13_2    
-        32        818 33101  56261 9R   R13_2    
-        32        819 33101  56220 9L   R13_2    
-        32        820 33101  38616 9R   S9_5     
-        32        821 30301    610 9L   B04      
-        32        822 33101  57536 9R   R14_2    
-        32        823 33101  56240 9L   R13_2    
-        32        824 30301    599 9R   B04      
-        32        825 33101  57154 9L   R14_1    
-        32        826 33101  57165 9R   R14_1    
-        32        827 33101  57149 9L   R14_1    
-        32        828 33101  57160 9R   R14_1    
-        32        829 33101  56236 9L   R13_2    
-        32        830 30301    328 9R   B03      
-        32        831 30301    382 9L   B03      
-        32        832 30301    321 9R   B03      
-        32        833 30301    385 9L   B03      
-        32        834 30301    335 9R   B03      
-        32        835 33101  56231 9L   R13_2    
-        32        836 33101  56268 9R   R13_2    
-        32        837 33101  56226 9L   R13_2    
-        32        838 33101  56262 9R   R13_2    
-        32        839 33101  56221 9L   R13_2    
-        32        840 33101  38618 9R   S9_5     
-        32        841 30301    611 9L   B04      
-        32        842 33101  57537 9R   R14_2    
-        32        843 30301    613 9L   B04      
-        32        844 30301    304 9R   B03      
-        32        845 33101  57151 9L   R14_1    
-        32        846 33101  57166 9R   R14_1    
-        32        847 33101  57150 9L   R14_1    
-        32        848 33101  57161 9R   R14_1    
-        32        849 33101  56237 9L   R13_2    
-        32        850 30301    332 9R   B03      
-        32        851 30301    378 9L   B03      
-        32        852 30301    324 9R   B03      
-        32        853 30301    390 9L   B03      
-        32        854 30301    334 9R   B03      
-        32        855 33101  56232 9L   R13_2    
-        32        856 33101  56269 9R   R13_2    
-        32        857 33101  56227 9L   R13_2    
-        32        858 33101  56263 9R   R13_2    
-        32        859 33101  56222 9L   R13_2    
-        32        860 33101  38619 9R   S9_5     
-        32        861 30301    612 9L   B04      
-        32        862 33101  57538 9R   R14_2    
-        32        863 30301    614 9L   B04      
-        32        864 30301    312 9R   B03      
-        32        865 33101  57156 9L   R14_1    
-        32        866 33101  57167 9R   R14_1    
-        32        867 33101  57155 9L   R14_1    
-        32        868 33101  57162 9R   R14_1    
-        32        869 33101  56238 9L   R13_2    
-        32        870 30301    331 9R   B03      
-        32        871 30301    376 9L   B03      
-        32        872 30301    322 9R   B03      
-        32        873 30301    388 9L   B03      
-        32        874 30301    339 9R   B03      
-        32        875 33101  56233 9L   R13_2    
-        32        876 33101  56270 9R   R13_2    
-        32        877 33101  56228 9L   R13_2    
-        32        878 33101  56264 9R   R13_2    
-        32        879 33101  56223 9L   R13_2    
-        32        880 33101  39526 9R   S10_1    
-        32        881 33101  47868 9L   S9_5     
-        32        882 33101  57539 9R   R14_2    
-        32        883 30301    615 9L   B04      
-        32        884 30301    305 9R   B03      
-        32        885 33101  57157 9L   R14_1    
-        32        886 33101  57168 9R   R14_1    
-        32        887 33101  57152 9L   R14_1    
-        32        888 33101  57163 9R   R14_1    
-        32        889 33101  56239 9L   R13_2    
-        32        890 30301    338 9R   B03      
-        32        891 30301    375 9L   B03      
-        32        892 30301    318 9R   B03      
-        32        893 30301    391 9L   B03      
-        32        894 30301    342 9R   B03      
-        32        895 33101  56234 9L   R13_2    
-        32        896 33101  56271 9R   R13_2    
-        32        897 33101  56229 9L   R13_2    
-        32        898 33101  56265 9R   R13_2    
-        32        899 33101  56224 9L   R13_2    
-        32        900 33101  47887 9R   S9_5     
-        32        901 33101  32715 10L  P14      
-        32        902 33101  57576 10R  R14_2    
-        32        903 33101  58213 10L  R15_1    
-        32        904 33101  57591 10R  R14_2    
-        32        905 33101  58208 10L  R15_1    
-        32        906 33101  57586 10R  R14_2    
-        32        907 33101  58193 10L  R15_1    
-        32        908 33101  57581 10R  R14_2    
-        32        909 33101  57555 10L  R14_2    
-        32        910 33101  57571 10R  R14_2    
-        32        911 33101  57546 10L  R14_2    
-        32        912 33101  57566 10R  R14_2    
-        32        913 33101  57545 10L  R14_2    
-        32        914 33101  57561 10R  R14_2    
-        32        915 33101  57550 10L  R14_2    
-        32        916 33101  56308 10R  R13_2    
-        32        917 33101  56284 10L  R13_2    
-        32        918 33101  56338 10R  R13_2    
-        32        919 33101  55871 10L  R13_1    
-        32        920 33101  47910 10R  S9_5     
-        32        921 33101  38620 10L  S9_5     
-        32        922 33101  57577 10R  R14_2    
-        32        923 33101  58214 10L  R15_1    
-        32        924 33101  57574 10R  R14_2    
-        32        925 33101  58209 10L  R15_1    
-        32        926 33101  57587 10R  R14_2    
-        32        927 33101  58194 10L  R15_1    
-        32        928 33101  57582 10R  R14_2    
-        32        929 33101  57556 10L  R14_2    
-        32        930 33101  57572 10R  R14_2    
-        32        931 33101  57554 10L  R14_2    
-        32        932 33101  57567 10R  R14_2    
-        32        933 33101  57540 10L  R14_2    
-        32        934 33101  57562 10R  R14_2    
-        32        935 33101  57551 10L  R14_2    
-        32        936 33101  57596 10R  R14_2    
-        32        937 33101  56285 10L  R13_2    
-        32        938 33101  56314 10R  R13_2    
-        32        939 33101  55872 10L  R13_1    
-        32        940 33101  27260 10R  S6_2b    
-        32        941 33101  38621 10L  S9_5     
-        32        942 33101  57578 10R  R14_2    
-        32        943 33101  58215 10L  R15_1    
-        32        944 33101  57593 10R  R14_2    
-        32        945 33101  58210 10L  R15_1    
-        32        946 33101  57588 10R  R14_2    
-        32        947 33101  58195 10L  R15_1    
-        32        948 33101  57583 10R  R14_2    
-        32        949 33101  57557 10L  R14_2    
-        32        950 33101  57573 10R  R14_2    
-        32        951 33101  57542 10L  R14_2    
-        32        952 33101  57568 10R  R14_2    
-        32        953 33101  57547 10L  R14_2    
-        32        954 33101  57563 10R  R14_2    
-        32        955 33101  57552 10L  R14_2    
-        32        956 33101  56628 10R  R13_3    
-        32        957 33101  56280 10L  R13_2    
-        32        958 33101  56310 10R  R13_2    
-        32        959 33101  55873 10L  R13_1    
-        32        960 33101  36026 10R  P15_2    
-        32        961 33101  27606 10L  S6_3a    
-        32        962 33101  57579 10R  R14_2    
-        32        963 33101  58216 10L  R15_1    
-        32        964 33101  57594 10R  R14_2    
-        32        965 33101  58211 10L  R15_1    
-        32        966 33101  57589 10R  R14_2    
-        32        967 33101  58196 10L  R15_1    
-        32        968 33101  57569 10R  R14_2    
-        32        969 33101  57558 10L  R14_2    
-        32        970 33101  57592 10R  R14_2    
-        32        971 33101  57549 10L  R14_2    
-        32        972 33101  57584 10R  R14_2    
-        32        973 33101  57548 10L  R14_2    
-        32        974 33101  57564 10R  R14_2    
-        32        975 33101  57553 10L  R14_2    
-        32        976 33101  56629 10R  R13_3    
-        32        977 33101  56281 10L  R13_2    
-        32        978 33101  56326 10R  R13_2    
-        32        979 33101  55874 10L  R13_1    
-        32        980 33101  26446 10R  S06      
-        32        981 33101  38873 10L  P16      
-        32        982 33101  57580 10R  R14_2    
-        32        983 33101  58217 10L  R15_1    
-        32        984 33101  57595 10R  R14_2    
-        32        985 33101  58212 10L  R15_1    
-        32        986 33101  57585 10R  R14_2    
-        32        987 33101  58197 10L  R15_1    
-        32        988 33101  57590 10R  R14_2    
-        32        989 33101  57559 10L  R14_2    
-        32        990 33101  57575 10R  R14_2    
-        32        991 33101  57544 10L  R14_2    
-        32        992 33101  57570 10R  R14_2    
-        32        993 33101  57543 10L  R14_2    
-        32        994 33101  57565 10R  R14_2    
-        32        995 33101  57541 10L  R14_2    
-        32        996 33101  56630 10R  R13_3    
-        32        997 33101  56282 10L  R13_2    
-        32        998 33101  56330 10R  R13_2    
-        32        999 33101  26435 10L  S06      
-        32       1000 33101  47912 10R  S9_5     
-        32       1001 33101  28732 11L  P12      
-        32       1002 33101  57632 11R  R14_2    
-        32       1003 33101  58263 11L  R15_1    
-        32       1004 33101  57643 11R  R14_2    
-        32       1005 33101  57605 11L  R14_2    
-        32       1006 33101  57647 11R  R14_2    
-        32       1007 33101  57610 11L  R14_2    
-        32       1008 33101  57652 11R  R14_2    
-        32       1009 33101  57600 11L  R14_2    
-        32       1010 33101  57627 11R  R14_2    
-        32       1011 33101  57170 11L  R14_1    
-        32       1012 33101  57612 11R  R14_2    
-        32       1013 33101  57189 11L  R14_1    
-        32       1014 33101  57617 11R  R14_2    
-        32       1015 33101  57169 11L  R14_1    
-        32       1016 33101  57622 11R  R14_2    
-        32       1017 33101  57184 11L  R14_1    
-        32       1018 33101  56641 11R  R13_3    
-        32       1019 33101  57174 11L  R14_1    
-        32       1020 33101  52313 11R  R9_2     
-        32       1021 33101  28737 11L  P12      
-        32       1022 33101  57645 11R  R14_2    
-        32       1023 33101  58264 11L  R15_1    
-        32       1024 33101  57638 11R  R14_2    
-        32       1025 33101  57606 11L  R14_2    
-        32       1026 33101  57644 11R  R14_2    
-        32       1027 33101  57611 11L  R14_2    
-        32       1028 33101  57653 11R  R14_2    
-        32       1029 33101  57601 11L  R14_2    
-        32       1030 33101  57628 11R  R14_2    
-        32       1031 33101  57180 11L  R14_1    
-        32       1032 33101  57613 11R  R14_2    
-        32       1033 33101  57190 11L  R14_1    
-        32       1034 33101  57618 11R  R14_2    
-        32       1035 33101  57179 11L  R14_1    
-        32       1036 33101  57623 11R  R14_2    
-        32       1037 33101  57185 11L  R14_1    
-        32       1038 33101  56642 11R  R13_3    
-        32       1039 33101  57175 11L  R14_1    
-        32       1040 33101  52326 11R  R9_2     
-        32       1041 33101  28739 11L  P12      
-        32       1042 33101  57646 11R  R14_2    
-        32       1043 33101  58265 11L  R15_1    
-        32       1044 33101  57639 11R  R14_2    
-        32       1045 33101  57607 11L  R14_2    
-        32       1046 33101  57649 11R  R14_2    
-        32       1047 33101  56631 11L  R13_3    
-        32       1048 33101  57654 11R  R14_2    
-        32       1049 33101  57602 11L  R14_2    
-        32       1050 33101  57629 11R  R14_2    
-        32       1051 33101  57181 11L  R14_1    
-        32       1052 33101  57614 11R  R14_2    
-        32       1053 33101  57191 11L  R14_1    
-        32       1054 33101  57619 11R  R14_2    
-        32       1055 33101  57183 11L  R14_1    
-        32       1056 33101  57624 11R  R14_2    
-        32       1057 33101  57186 11L  R14_1    
-        32       1058 33101  56643 11R  R13_3    
-        32       1059 33101  57176 11L  R14_1    
-        32       1060 33101  52331 11R  R9_2     
-        32       1061 33101  33599 11L  S8_2     
-        32       1062 33101  57635 11R  R14_2    
-        32       1063 33101  58266 11L  R15_1    
-        32       1064 33101  57640 11R  R14_2    
-        32       1065 33101  57608 11L  R14_2    
-        32       1066 33101  57650 11R  R14_2    
-        32       1067 33101  56632 11L  R13_3    
-        32       1068 33101  57642 11R  R14_2    
-        32       1069 33101  57603 11L  R14_2    
-        32       1070 33101  57630 11R  R14_2    
-        32       1071 33101  57182 11L  R14_1    
-        32       1072 33101  57615 11R  R14_2    
-        32       1073 33101  57192 11L  R14_1    
-        32       1074 33101  57620 11R  R14_2    
-        32       1075 33101  57172 11L  R14_1    
-        32       1076 33101  57625 11R  R14_2    
-        32       1077 33101  57187 11L  R14_1    
-        32       1078 33101  56644 11R  R13_3    
-        32       1079 33101  57177 11L  R14_1    
-        32       1080 33101  54732 11R  R12_1    
-        32       1081 33101  38636 11L  S9_5     
-        32       1082 33101  57636 11R  R14_2    
-        32       1083 33101  58267 11L  R15_1    
-        32       1084 33101  57641 11R  R14_2    
-        32       1085 33101  57609 11L  R14_2    
-        32       1086 33101  57651 11R  R14_2    
-        32       1087 33101  56633 11L  R13_3    
-        32       1088 33101  56646 11R  R13_3    
-        32       1089 33101  57604 11L  R14_2    
-        32       1090 33101  57631 11R  R14_2    
-        32       1091 33101  57171 11L  R14_1    
-        32       1092 33101  57616 11R  R14_2    
-        32       1093 33101  57193 11L  R14_1    
-        32       1094 33101  57621 11R  R14_2    
-        32       1095 33101  57173 11L  R14_1    
-        32       1096 33101  57626 11R  R14_2    
-        32       1097 33101  57188 11L  R14_1    
-        32       1098 33101  56645 11R  R13_3    
-        32       1099 33101  57178 11L  R14_1    
-        32       1100 33101  55327 11R  R12_2    
-        32       1101 33101  58339 12L  R15_1    
-        32       1102 33101  58343 12R  R15_1    
-        32       1103 33101  58324 12L  R15_1    
-        32       1104 33101  57697 12R  R14_2    
-        32       1105 33101  58329 12L  R15_1    
-        32       1106 33101  57702 12R  R14_2    
-        32       1107 33101  58319 12L  R15_1    
-        32       1108 33101  57712 12R  R14_2    
-        32       1109 33101  58314 12L  R15_1    
-        32       1110 33101  57682 12R  R14_2    
-        32       1111 33101  57661 12L  R14_2    
-        32       1112 33101  57692 12R  R14_2    
-        32       1113 33101  57658 12L  R14_2    
-        32       1114 33101  57687 12R  R14_2    
-        32       1115 33101  57656 12L  R14_2    
-        32       1116 33101  57677 12R  R14_2    
-        32       1117 33101  57194 12L  R14_1    
-        32       1118 33101  57672 12R  R14_2    
-        32       1119 33101  57204 12L  R14_1    
-        32       1120 33101  54813 12R  R12_1    
-        32       1121 33101  58340 12L  R15_1    
-        32       1122 33101  58344 12R  R15_1    
-        32       1123 33101  58325 12L  R15_1    
-        32       1124 33101  57708 12R  R14_2    
-        32       1125 33101  58330 12L  R15_1    
-        32       1126 33101  57703 12R  R14_2    
-        32       1127 33101  58320 12L  R15_1    
-        32       1128 33101  57713 12R  R14_2    
-        32       1129 33101  58315 12L  R15_1    
-        32       1130 33101  57683 12R  R14_2    
-        32       1131 33101  57662 12L  R14_2    
-        32       1132 33101  57699 12R  R14_2    
-        32       1133 33101  57659 12L  R14_2    
-        32       1134 33101  57688 12R  R14_2    
-        32       1135 33101  57657 12L  R14_2    
-        32       1136 33101  57678 12R  R14_2    
-        32       1137 33101  57202 12L  R14_1    
-        32       1138 33101  57673 12R  R14_2    
-        32       1139 33101  57205 12L  R14_1    
-        32       1140 33101  54787 12R  R12_1    
-        32       1141 33101  58341 12L  R15_1    
-        32       1142 33101  58345 12R  R15_1    
-        32       1143 33101  58326 12L  R15_1    
-        32       1144 33101  57709 12R  R14_2    
-        32       1145 33101  58331 12L  R15_1    
-        32       1146 33101  57701 12R  R14_2    
-        32       1147 33101  58321 12L  R15_1    
-        32       1148 33101  57714 12R  R14_2    
-        32       1149 33101  58316 12L  R15_1    
-        32       1150 33101  57684 12R  R14_2    
-        32       1151 33101  57663 12L  R14_2    
-        32       1152 33101  57694 12R  R14_2    
-        32       1153 33101  57666 12L  R14_2    
-        32       1154 33101  57689 12R  R14_2    
-        32       1155 33101  57660 12L  R14_2    
-        32       1156 33101  57679 12R  R14_2    
-        32       1157 33101  57196 12L  R14_1    
-        32       1158 33101  57674 12R  R14_2    
-        32       1159 33101  57206 12L  R14_1    
-        32       1160 33101  54798 12R  R12_1    
-        32       1161 33101  58342 12L  R15_1    
-        32       1162 33101  58346 12R  R15_1    
-        32       1163 33101  58327 12L  R15_1    
-        32       1164 33101  57710 12R  R14_2    
-        32       1165 33101  58332 12L  R15_1    
-        32       1166 33101  57705 12R  R14_2    
-        32       1167 33101  58322 12L  R15_1    
-        32       1168 33101  57715 12R  R14_2    
-        32       1169 33101  58317 12L  R15_1    
-        32       1170 33101  57685 12R  R14_2    
-        32       1171 33101  57664 12L  R14_2    
-        32       1172 33101  57695 12R  R14_2    
-        32       1173 33101  57668 12L  R14_2    
-        32       1174 33101  57690 12R  R14_2    
-        32       1175 33101  57667 12L  R14_2    
-        32       1176 33101  57680 12R  R14_2    
-        32       1177 33101  57197 12L  R14_1    
-        32       1178 33101  57675 12R  R14_2    
-        32       1179 33101  56653 12L  R13_3    
-        32       1180 33101  50021 12R  R7_2     
-        32       1181 33101  57671 12L  R14_2    
-        32       1182 33101  58347 12R  R15_1    
-        32       1183 33101  58328 12L  R15_1    
-        32       1184 33101  57711 12R  R14_2    
-        32       1185 33101  58333 12L  R15_1    
-        32       1186 33101  57706 12R  R14_2    
-        32       1187 33101  58323 12L  R15_1    
-        32       1188 33101  57716 12R  R14_2    
-        32       1189 33101  58318 12L  R15_1    
-        32       1190 33101  57686 12R  R14_2    
-        32       1191 33101  57665 12L  R14_2    
-        32       1192 33101  57696 12R  R14_2    
-        32       1193 33101  57670 12L  R14_2    
-        32       1194 33101  57691 12R  R14_2    
-        32       1195 33101  57669 12L  R14_2    
-        32       1196 33101  57681 12R  R14_2    
-        32       1197 33101  57198 12L  R14_1    
-        32       1198 33101  57676 12R  R14_2    
-        32       1199 33101  54778 12L  R12_1    
-        32       1200 33101  56413 12R  R13_2    
-        32       1201 33101  24400 13L  S5-3     
-        32       1202 33101  57761 13R  R14_2    
-        32       1203 33101  57737 13L  R14_2    
-        32       1204 33101  57756 13R  R14_2    
-        32       1205 33101  57720 13L  R14_2    
-        32       1206 33101  57771 13R  R14_2    
-        32       1207 33101  57725 13L  R14_2    
-        32       1208 33101  57766 13R  R14_2    
-        32       1209 33101  57745 13L  R14_2    
-        32       1210 33101  57796 13R  R14_2    
-        32       1211 33101  57735 13L  R14_2    
-        32       1212 33101  57791 13R  R14_2    
-        32       1213 33101  57740 13L  R14_2    
-        32       1214 33101  57776 13R  R14_2    
-        32       1215 33101  57730 13L  R14_2    
-        32       1216 33101  57781 13R  R14_2    
-        32       1217 33101  57219 13L  R14_1    
-        32       1218 33101  57786 13R  R14_2    
-        32       1219 33101  57214 13L  R14_1    
-        32       1220 33101  46660 13R  R4_2     
-        32       1221 33101  34928 13L  S8_4     
-        32       1222 33101  57762 13R  R14_2    
-        32       1223 33101  57741 13L  R14_2    
-        32       1224 33101  57757 13R  R14_2    
-        32       1225 33101  57721 13L  R14_2    
-        32       1226 33101  57772 13R  R14_2    
-        32       1227 33101  57726 13L  R14_2    
-        32       1228 33101  57767 13R  R14_2    
-        32       1229 33101  57746 13L  R14_2    
-        32       1230 33101  57797 13R  R14_2    
-        32       1231 33101  57736 13L  R14_2    
-        32       1232 33101  57792 13R  R14_2    
-        32       1233 33101  57750 13L  R14_2    
-        32       1234 33101  57777 13R  R14_2    
-        32       1235 33101  57731 13L  R14_2    
-        32       1236 33101  57782 13R  R14_2    
-        32       1237 33101  57220 13L  R14_1    
-        32       1238 33101  57787 13R  R14_2    
-        32       1239 33101  57215 13L  R14_1    
-        32       1240 33101  53473 13R  R10_2    
-        32       1241 33101  34938 13L  S8_4     
-        32       1242 33101  57763 13R  R14_2    
-        32       1243 33101  57752 13L  R14_2    
-        32       1244 33101  57758 13R  R14_2    
-        32       1245 33101  57722 13L  R14_2    
-        32       1246 33101  57773 13R  R14_2    
-        32       1247 33101  57727 13L  R14_2    
-        32       1248 33101  57768 13R  R14_2    
-        32       1249 33101  57747 13L  R14_2    
-        32       1250 33101  57798 13R  R14_2    
-        32       1251 33101  57751 13L  R14_2    
-        32       1252 33101  57793 13R  R14_2    
-        32       1253 33101  57742 13L  R14_2    
-        32       1254 33101  57778 13R  R14_2    
-        32       1255 33101  57732 13L  R14_2    
-        32       1256 33101  57783 13R  R14_2    
-        32       1257 33101  57221 13L  R14_1    
-        32       1258 33101  57788 13R  R14_2    
-        32       1259 33101  57216 13L  R14_1    
-        32       1260 33101  53491 13R  R10_2    
-        32       1261 33101  38646 13L  S9_5     
-        32       1262 33101  57764 13R  R14_2    
-        32       1263 33101  57753 13L  R14_2    
-        32       1264 33101  57759 13R  R14_2    
-        32       1265 33101  57723 13L  R14_2    
-        32       1266 33101  57774 13R  R14_2    
-        32       1267 33101  57728 13L  R14_2    
-        32       1268 33101  57769 13R  R14_2    
-        32       1269 33101  57748 13L  R14_2    
-        32       1270 33101  57799 13R  R14_2    
-        32       1271 33101  57738 13L  R14_2    
-        32       1272 33101  57794 13R  R14_2    
-        32       1273 33101  57743 13L  R14_2    
-        32       1274 33101  57779 13R  R14_2    
-        32       1275 33101  57733 13L  R14_2    
-        32       1276 33101  57784 13R  R14_2    
-        32       1277 33101  57222 13L  R14_1    
-        32       1278 33101  57789 13R  R14_2    
-        32       1279 33101  57217 13L  R14_1    
-        32       1280 33101  53498 13R  R10_2    
-        32       1281 33101  43786 13L  R2_1     
-        32       1282 33101  57765 13R  R14_2    
-        32       1283 33101  57754 13L  R14_2    
-        32       1284 33101  57760 13R  R14_2    
-        32       1285 33101  57724 13L  R14_2    
-        32       1286 33101  57775 13R  R14_2    
-        32       1287 33101  57729 13L  R14_2    
-        32       1288 33101  57770 13R  R14_2    
-        32       1289 33101  57749 13L  R14_2    
-        32       1290 33101  57800 13R  R14_2    
-        32       1291 33101  57739 13L  R14_2    
-        32       1292 33101  57795 13R  R14_2    
-        32       1293 33101  57744 13L  R14_2    
-        32       1294 33101  57780 13R  R14_2    
-        32       1295 33101  57734 13L  R14_2    
-        32       1296 33101  57785 13R  R14_2    
-        32       1297 33101  57223 13L  R14_1    
-        32       1298 33101  57790 13R  R14_2    
-        32       1299 33101  57218 13L  R14_1    
-        32       1300 33101  47765 13R  R5_2     
-        32       1301 33101  56933 14L  R14_1    
-        32       1302 33101  57455 14R  R14_2    
-        32       1303 33101  41889 14L  P18      
-        32       1304 33101  56544 14R  R13_3    
-        32       1305 33101  56931 14L  R14_1    
-        32       1306 33101  57461 14R  R14_2    
-        32       1307 33101  57421 14L  R14_2    
-        32       1308 33101  57466 14R  R14_2    
-        32       1309 33101  57426 14L  R14_2    
-        32       1310 33101  57471 14R  R14_2    
-        32       1311 33101  57420 14L  R14_2    
-        32       1312 33101  57476 14R  R14_2    
-        32       1313 33101  57431 14L  R14_2    
-        32       1314 33101  57470 14R  R14_2    
-        32       1315 33101  57436 14L  R14_2    
-        32       1316 33101  58101 14R  R15_1    
-        32       1317 33101  57446 14L  R14_2    
-        32       1318 33101  38469 14R  S9_6     
-        32       1319 33101  57441 14L  R14_2    
-        32       1320 33101  58106 14R  R15_1    
-        32       1321 33101  56927 14L  R14_1    
-        32       1322 33101  57456 14R  R14_2    
-        32       1323 33101  41892 14L  P18      
-        32       1324 33101  56545 14R  R13_3    
-        32       1325 33101  56932 14L  R14_1    
-        32       1326 33101  57462 14R  R14_2    
-        32       1327 33101  57422 14L  R14_2    
-        32       1328 33101  57467 14R  R14_2    
-        32       1329 33101  57427 14L  R14_2    
-        32       1330 33101  57472 14R  R14_2    
-        32       1331 33101  57417 14L  R14_2    
-        32       1332 33101  57477 14R  R14_2    
-        32       1333 33101  57432 14L  R14_2    
-        32       1334 33101  58099 14R  R15_1    
-        32       1335 33101  57437 14L  R14_2    
-        32       1336 33101  58102 14R  R15_1    
-        32       1337 33101  57447 14L  R14_2    
-        32       1338 33101  38787 14R  P016     
-        32       1339 33101  57442 14L  R14_2    
-        32       1340 33101  58107 14R  R15_1    
-        32       1341 33101  56928 14L  R14_1    
-        32       1342 33101  57458 14R  R14_2    
-        32       1343 33101  28039 14L  S6_3b    
-        32       1344 33101  56934 14R  R14_1    
-        32       1345 33101  57414 14L  R14_2    
-        32       1346 33101  57463 14R  R14_2    
-        32       1347 33101  57423 14L  R14_2    
-        32       1348 33101  57468 14R  R14_2    
-        32       1349 33101  57428 14L  R14_2    
-        32       1350 33101  57473 14R  R14_2    
-        32       1351 33101  57418 14L  R14_2    
-        32       1352 33101  57478 14R  R14_2    
-        32       1353 33101  57433 14L  R14_2    
-        32       1354 33101  58100 14R  R15_1    
-        32       1355 33101  57438 14L  R14_2    
-        32       1356 33101  58103 14R  R15_1    
-        32       1357 33101  57448 14L  R14_2    
-        32       1358 33101  38789 14R  P016     
-        32       1359 33101  57443 14L  R14_2    
-        32       1360 33101  58108 14R  R15_1    
-        32       1361 33101  56929 14L  R14_1    
-        32       1362 33101  57459 14R  R14_2    
-        32       1363 33101  28043 14L  S6_3b    
-        32       1364 33101  56935 14R  R14_1    
-        32       1365 33101  57415 14L  R14_2    
-        32       1366 33101  57464 14R  R14_2    
-        32       1367 33101  57424 14L  R14_2    
-        32       1368 33101  57469 14R  R14_2    
-        32       1369 33101  57429 14L  R14_2    
-        32       1370 33101  57474 14R  R14_2    
-        32       1371 33101  57419 14L  R14_2    
-        32       1372 33101  57479 14R  R14_2    
-        32       1373 33101  57434 14L  R14_2    
-        32       1374 33101  58111 14R  R15_1    
-        32       1375 33101  57439 14L  R14_2    
-        32       1376 33101  58104 14R  R15_1    
-        32       1377 33101  57449 14L  R14_2    
-        32       1378 33101  41073 14R  S10_5    
-        32       1379 33101  57444 14L  R14_2    
-        32       1380 33101  58109 14R  R15_1    
-        32       1381 33101  56930 14L  R14_1    
-        32       1382 33101  57460 14R  R14_2    
-        32       1383 33101  32379 14L  P14      
-        32       1384 33101  56936 14R  R14_1    
-        32       1385 33101  57416 14L  R14_2    
-        32       1386 33101  57465 14R  R14_2    
-        32       1387 33101  57425 14L  R14_2    
-        32       1388 33101  57454 14R  R14_2    
-        32       1389 33101  57430 14L  R14_2    
-        32       1390 33101  57475 14R  R14_2    
-        32       1391 33101  57451 14L  R14_2    
-        32       1392 33101  57480 14R  R14_2    
-        32       1393 33101  57435 14L  R14_2    
-        32       1394 33101  58112 14R  R15_1    
-        32       1395 33101  57440 14L  R14_2    
-        32       1396 33101  58105 14R  R15_1    
-        32       1397 33101  57450 14L  R14_2    
-        32       1398 33101  41906 14R  P18      
-        32       1399 33101  57445 14L  R14_2    
-        32       1400 33101  58110 14R  R15_1    
-        32       1401 33101  31319 15L  S07_4    
-        32       1402 33101  56966 15R  R14_1    
-        32       1403 33101  56944 15L  R14_1    
-        32       1404 33101  58136 15R  R15_1    
-        32       1405 33101  57521 15L  R14_2    
-        32       1406 33101  58141 15R  R15_1    
-        32       1407 33101  57486 15L  R14_2    
-        32       1408 33101  58146 15R  R15_1    
-        32       1409 33101  57491 15L  R14_2    
-        32       1410 33101  58151 15R  R15_1    
-        32       1411 33101  57496 15L  R14_2    
-        32       1412 33101  58156 15R  R15_1    
-        32       1413 33101  57501 15L  R14_2    
-        32       1414 33101  58161 15R  R15_1    
-        32       1415 33101  57506 15L  R14_2    
-        32       1416 33101  58166 15R  R15_1    
-        32       1417 33101  57511 15L  R14_2    
-        32       1418 33101  58171 15R  R15_1    
-        32       1419 33101  57516 15L  R14_2    
-        32       1420 33101  17307 15R  S3       
-        32       1421 33101  31322 15L  S07_4    
-        32       1422 33101  56967 15R  R14_1    
-        32       1423 33101  56945 15L  R14_1    
-        32       1424 33101  58137 15R  R15_1    
-        32       1425 33101  57482 15L  R14_2    
-        32       1426 33101  58142 15R  R15_1    
-        32       1427 33101  57487 15L  R14_2    
-        32       1428 33101  58147 15R  R15_1    
-        32       1429 33101  57492 15L  R14_2    
-        32       1430 33101  58152 15R  R15_1    
-        32       1431 33101  57497 15L  R14_2    
-        32       1432 33101  58157 15R  R15_1    
-        32       1433 33101  57502 15L  R14_2    
-        32       1434 33101  58162 15R  R15_1    
-        32       1435 33101  57507 15L  R14_2    
-        32       1436 33101  58134 15R  R15_1    
-        32       1437 33101  57512 15L  R14_2    
-        32       1438 33101  58172 15R  R15_1    
-        32       1439 33101  57517 15L  R14_2    
-        32       1440 33101  58135 15R  R15_1    
-        32       1441 33101  31324 15L  S07_4    
-        32       1442 33101  56968 15R  R14_1    
-        32       1443 33101  56946 15L  R14_1    
-        32       1444 33101  58138 15R  R15_1    
-        32       1445 33101  57483 15L  R14_2    
-        32       1446 33101  58143 15R  R15_1    
-        32       1447 33101  57488 15L  R14_2    
-        32       1448 33101  58148 15R  R15_1    
-        32       1449 33101  57493 15L  R14_2    
-        32       1450 33101  58153 15R  R15_1    
-        32       1451 33101  57498 15L  R14_2    
-        32       1452 33101  58158 15R  R15_1    
-        32       1453 33101  57503 15L  R14_2    
-        32       1454 33101  58163 15R  R15_1    
-        32       1455 33101  57508 15L  R14_2    
-        32       1456 33101  58168 15R  R15_1    
-        32       1457 33101  57513 15L  R14_2    
-        32       1458 33101  58173 15R  R15_1    
-        32       1459 33101  57518 15L  R14_2    
-        32       1460 33101  58176 15R  R15_1    
-        32       1461 33101  31327 15L  S07_4    
-        32       1462 33101  56969 15R  R14_1    
-        32       1463 33101  56947 15L  R14_1    
-        32       1464 33101  58139 15R  R15_1    
-        32       1465 33101  57484 15L  R14_2    
-        32       1466 33101  58144 15R  R15_1    
-        32       1467 33101  57489 15L  R14_2    
-        32       1468 33101  58149 15R  R15_1    
-        32       1469 33101  57494 15L  R14_2    
-        32       1470 33101  58154 15R  R15_1    
-        32       1471 33101  57499 15L  R14_2    
-        32       1472 33101  56971 15R  R14_1    
-        32       1473 33101  57504 15L  R14_2    
-        32       1474 33101  58164 15R  R15_1    
-        32       1475 33101  57509 15L  R14_2    
-        32       1476 33101  58169 15R  R15_1    
-        32       1477 33101  57514 15L  R14_2    
-        32       1478 33101  58174 15R  R15_1    
-        32       1479 33101  57519 15L  R14_2    
-        32       1480 33101  58177 15R  R15_1    
-        32       1481 33101  31331 15L  S07_4    
-        32       1482 33101  56970 15R  R14_1    
-        32       1483 33101  56948 15L  R14_1    
-        32       1484 33101  58140 15R  R15_1    
-        32       1485 33101  57485 15L  R14_2    
-        32       1486 33101  58145 15R  R15_1    
-        32       1487 33101  57490 15L  R14_2    
-        32       1488 33101  58150 15R  R15_1    
-        32       1489 33101  57495 15L  R14_2    
-        32       1490 33101  58155 15R  R15_1    
-        32       1491 33101  57500 15L  R14_2    
-        32       1492 33101  58160 15R  R15_1    
-        32       1493 33101  57505 15L  R14_2    
-        32       1494 33101  58165 15R  R15_1    
-        32       1495 33101  57510 15L  R14_2    
-        32       1496 33101  58170 15R  R15_1    
-        32       1497 33101  57515 15L  R14_2    
-        32       1498 33101  58175 15R  R15_1    
-        32       1499 33101  57520 15L  R14_2    
-        32       1500 33101  58179 15R  R15_1    
-        32       1501 33106    306 16L  EBP02    
-        32       1502 33106    337 16R  EBP02    
-        32       1503 33106   1106 16L  EBP08    
-        32       1504 33106   1168 16R  EBP08    
-        32       1505 33106   1326 16L  EBP10    
-        32       1506 33106   1173 16R  EBP08    
-        32       1507 33106   1337 16L  EBP10    
-        32       1508 33106   1405 16R  EBP10    
-        32       1509 33106   1336 16L  EBP10    
-        32       1510 33106   1179 16R  EBP08    
-        32       1511 33106   1346 16L  EBP10    
-        32       1512 33106   1411 16R  EBP10    
-        32       1513 33106   1344 16L  EBP10    
-        32       1514 33106   1421 16R  EBP10    
-        32       1515 33106   1354 16L  EBP10    
-        32       1516 33106   1426 16R  EBP10    
-        32       1517 33106   1361 16L  EBP10    
-        32       1518 33106   1431 16R  EBP10    
-        32       1519 33106   1365 16L  EBP10    
-        32       1520 33106   1437 16R  EBP10    
-        32       1521 33106   1101 16L  EBP08    
-        32       1522 33106   1164 16R  EBP08    
-        32       1523 33106   1107 16L  EBP08    
-        32       1524 33106   1169 16R  EBP08    
-        32       1525 33106   1327 16L  EBP10    
-        32       1526 33106   1174 16R  EBP08    
-        32       1527 33106   1338 16L  EBP10    
-        32       1528 33106   1406 16R  EBP10    
-        32       1529 33106   1332 16L  EBP10    
-        32       1530 33106   1180 16R  EBP08    
-        32       1531 33106   1347 16L  EBP10    
-        32       1532 33106   1414 16R  EBP10    
-        32       1533 33106   1345 16L  EBP10    
-        32       1534 33106   1422 16R  EBP10    
-        32       1535 33106   1355 16L  EBP10    
-        32       1536 33106   1427 16R  EBP10    
-        32       1537 33106   1362 16L  EBP10    
-        32       1538 33106   1432 16R  EBP10    
-        32       1539 33106   1366 16L  EBP10    
-        32       1540 33106   1438 16R  EBP10    
-        32       1541 33106   1102 16L  EBP08    
-        32       1542 33106   1165 16R  EBP08    
-        32       1543 33106   1108 16L  EBP08    
-        32       1544 33106   1170 16R  EBP08    
-        32       1545 33106   1328 16L  EBP10    
-        32       1546 33106   1175 16R  EBP08    
-        32       1547 33106   1339 16L  EBP10    
-        32       1548 33106   1408 16R  EBP10    
-        32       1549 33106   1333 16L  EBP10    
-        32       1550 33106   1401 16R  EBP10    
-        32       1551 33106   1348 16L  EBP10    
-        32       1552 33106   1416 16R  EBP10    
-        32       1553 33106   1351 16L  EBP10    
-        32       1554 33106   1423 16R  EBP10    
-        32       1555 33106   1356 16L  EBP10    
-        32       1556 33106   1428 16R  EBP10    
-        32       1557 33106   1363 16L  EBP10    
-        32       1558 33106   1433 16R  EBP10    
-        32       1559 33106   1367 16L  EBP10    
-        32       1560 33106   1439 16R  EBP10    
-        32       1561 33106   1104 16L  EBP08    
-        32       1562 33106   1166 16R  EBP08    
-        32       1563 33106   1109 16L  EBP08    
-        32       1564 33106   1171 16R  EBP08    
-        32       1565 33106   1330 16L  EBP10    
-        32       1566 33106   1176 16R  EBP08    
-        32       1567 33106   1341 16L  EBP10    
-        32       1568 33106   1409 16R  EBP10    
-        32       1569 33106   1334 16L  EBP10    
-        32       1570 33106   1403 16R  EBP10    
-        32       1571 33106   1349 16L  EBP10    
-        32       1572 33106   1418 16R  EBP10    
-        32       1573 33106   1352 16L  EBP10    
-        32       1574 33106   1398 16R  EBP10    
-        32       1575 33106   1357 16L  EBP10    
-        32       1576 33106   1429 16R  EBP10    
-        32       1577 33106   1364 16L  EBP10    
-        32       1578 33106   1434 16R  EBP10    
-        32       1579 33106   1368 16L  EBP10    
-        32       1580 33106   1441 16R  EBP10    
-        32       1581 33106   1105 16L  EBP08    
-        32       1582 33106   1167 16R  EBP08    
-        32       1583 33106   1110 16L  EBP08    
-        32       1584 33106   1172 16R  EBP08    
-        32       1585 33106   1331 16L  EBP10    
-        32       1586 33106   1178 16R  EBP08    
-        32       1587 33106   1343 16L  EBP10    
-        32       1588 33106   1410 16R  EBP10    
-        32       1589 33106   1335 16L  EBP10    
-        32       1590 33106   1404 16R  EBP10    
-        32       1591 33106   1350 16L  EBP10    
-        32       1592 33106   1420 16R  EBP10    
-        32       1593 33106   1353 16L  EBP10    
-        32       1594 33106   1425 16R  EBP10    
-        32       1595 33106   1358 16L  EBP10    
-        32       1596 33106   1430 16R  EBP10    
-        32       1597 33106   1360 16L  EBP10    
-        32       1598 33106   1436 16R  EBP10    
-        32       1599 33106   1373 16L  EBP10    
-        32       1600 33106   1442 16R  EBP10    
-        32       1601 33106    677 17L  EBP05    
-        32       1602 33106    270 17R  EBP01    
-        32       1603 33106   1234 17L  EBP09    
-        32       1604 33106   1309 17R  EBP09    
-        32       1605 33106   1241 17L  EBP09    
-        32       1606 33106   1316 17R  EBP09    
-        32       1607 33106   1252 17L  EBP09    
-        32       1608 33106   1315 17R  EBP09    
-        32       1609 33106   1504 17L  EBP11    
-        32       1610 33106   1325 17R  EBP09    
-        32       1611 33106   1513 17L  EBP11    
-        32       1612 33106   1571 17R  EBP11    
-        32       1613 33106   1521 17L  EBP11    
-        32       1614 33106   1576 17R  EBP11    
-        32       1615 33106   1524 17L  EBP11    
-        32       1616 33106   1569 17R  EBP11    
-        32       1617 33106   1529 17L  EBP11    
-        32       1618 33106   1586 17R  EBP11    
-        32       1619 33106   1534 17L  EBP11    
-        32       1620 33106   1591 17R  EBP11    
-        32       1621 33106    688 17L  EBP05    
-        32       1622 33106    438 17R  EBP03    
-        32       1623 33106   1235 17L  EBP09    
-        32       1624 33106   1310 17R  EBP09    
-        32       1625 33106   1242 17L  EBP09    
-        32       1626 33106   1317 17R  EBP09    
-        32       1627 33106   1247 17L  EBP09    
-        32       1628 33106   1321 17R  EBP09    
-        32       1629 33106   1506 17L  EBP11    
-        32       1630 33106   1563 17R  EBP11    
-        32       1631 33106   1515 17L  EBP11    
-        32       1632 33106   1572 17R  EBP11    
-        32       1633 33106   1522 17L  EBP11    
-        32       1634 33106   1577 17R  EBP11    
-        32       1635 33106   1525 17L  EBP11    
-        32       1636 33106   1582 17R  EBP11    
-        32       1637 33106   1530 17L  EBP11    
-        32       1638 33106   1587 17R  EBP11    
-        32       1639 33106   1535 17L  EBP11    
-        32       1640 33106   1592 17R  EBP11    
-        32       1641 33106   1188 17L  EBP09    
-        32       1642 33106    474 17R  EBP03    
-        32       1643 33106   1236 17L  EBP09    
-        32       1644 33106   1311 17R  EBP09    
-        32       1645 33106   1243 17L  EBP09    
-        32       1646 33106   1318 17R  EBP09    
-        32       1647 33106   1248 17L  EBP09    
-        32       1648 33106   1322 17R  EBP09    
-        32       1649 33106   1507 17L  EBP11    
-        32       1650 33106   1564 17R  EBP11    
-        32       1651 33106   1516 17L  EBP11    
-        32       1652 33106   1573 17R  EBP11    
-        32       1653 33106   1523 17L  EBP11    
-        32       1654 33106   1578 17R  EBP11    
-        32       1655 33106   1526 17L  EBP11    
-        32       1656 33106   1583 17R  EBP11    
-        32       1657 33106   1531 17L  EBP11    
-        32       1658 33106   1588 17R  EBP11    
-        32       1659 33106   1536 17L  EBP11    
-        32       1660 33106   1593 17R  EBP11    
-        32       1661 33106   1203 17L  EBP09    
-        32       1662 33106   1291 17R  EBP09    
-        32       1663 33106   1237 17L  EBP09    
-        32       1664 33106   1312 17R  EBP09    
-        32       1665 33106   1245 17L  EBP09    
-        32       1666 33106   1319 17R  EBP09    
-        32       1667 33106   1249 17L  EBP09    
-        32       1668 33106   1323 17R  EBP09    
-        32       1669 33106   1509 17L  EBP11    
-        32       1670 33106   1565 17R  EBP11    
-        32       1671 33106   1517 17L  EBP11    
-        32       1672 33106   1574 17R  EBP11    
-        32       1673 33106   1519 17L  EBP11    
-        32       1674 33106   1579 17R  EBP11    
-        32       1675 33106   1527 17L  EBP11    
-        32       1676 33106   1584 17R  EBP11    
-        32       1677 33106   1532 17L  EBP11    
-        32       1678 33106   1589 17R  EBP11    
-        32       1679 33106   1537 17L  EBP11    
-        32       1680 33106   1594 17R  EBP11    
-        32       1681 33106   1239 17L  EBP09    
-        32       1682 33106   1314 17R  EBP09    
-        32       1683 33106   1238 17L  EBP09    
-        32       1684 33106   1313 17R  EBP09    
-        32       1685 33106   1246 17L  EBP09    
-        32       1686 33106   1320 17R  EBP09    
-        32       1687 33106   1250 17L  EBP09    
-        32       1688 33106   1324 17R  EBP09    
-        32       1689 33106   1510 17L  EBP11    
-        32       1690 33106   1566 17R  EBP11    
-        32       1691 33106   1518 17L  EBP11    
-        32       1692 33106   1575 17R  EBP11    
-        32       1693 33106   1520 17L  EBP11    
-        32       1694 33106   1568 17R  EBP11    
-        32       1695 33106   1528 17L  EBP11    
-        32       1696 33106   1596 17R  EBP11    
-        32       1697 33106   1533 17L  EBP11    
-        32       1698 33106   1590 17R  EBP11    
-        32       1699 33106   1538 17L  EBP11    
-        32       1700 33106   1595 17R  EBP11    
-        33          1 33101  57824 1L   R15_1    
-        33          2 33101  57854 1R   R15_1    
-        33          3 33101  57828 1L   R15_1    
-        33          4 33101  57859 1R   R15_1    
-        33          5 33101  58404 1L   R15_2    
-        33          6 33101  58427 1R   R15_2    
-        33          7 33101  58409 1L   R15_2    
-        33          8 33101  58433 1R   R15_2    
-        33          9 33101  58414 1L   R15_2    
-        33         10 33101  58438 1R   R15_2    
-        33         11 33101  58419 1L   R15_2    
-        33         12 33101  58443 1R   R15_2    
-        33         13 33101  58424 1L   R15_2    
-        33         14 33101  58448 1R   R15_2    
-        33         15 33101  59005 1L   R16_1    
-        33         16 33101  59027 1R   R16_1    
-        33         17 33101  59010 1L   R16_1    
-        33         18 33101  59032 1R   R16_1    
-        33         19 33101  59015 1L   R16_1    
-        33         20 33101  59037 1R   R16_1    
-        33         21 33101  57825 1L   R15_1    
-        33         22 33101  57855 1R   R15_1    
-        33         23 33101  57829 1L   R15_1    
-        33         24 33101  57860 1R   R15_1    
-        33         25 33101  58405 1L   R15_2    
-        33         26 33101  58429 1R   R15_2    
-        33         27 33101  58410 1L   R15_2    
-        33         28 33101  58434 1R   R15_2    
-        33         29 33101  58415 1L   R15_2    
-        33         30 33101  58439 1R   R15_2    
-        33         31 33101  58420 1L   R15_2    
-        33         32 33101  58444 1R   R15_2    
-        33         33 33101  59001 1L   R16_1    
-        33         34 33101  58449 1R   R15_2    
-        33         35 33101  59006 1L   R16_1    
-        33         36 33101  59028 1R   R16_1    
-        33         37 33101  59011 1L   R16_1    
-        33         38 33101  59033 1R   R16_1    
-        33         39 33101  59016 1L   R16_1    
-        33         40 33101  59038 1R   R16_1    
-        33         41 33101  57826 1L   R15_1    
-        33         42 33101  57856 1R   R15_1    
-        33         43 33101  57830 1L   R15_1    
-        33         44 33101  57861 1R   R15_1    
-        33         45 33101  58406 1L   R15_2    
-        33         46 33101  58430 1R   R15_2    
-        33         47 33101  58411 1L   R15_2    
-        33         48 33101  58435 1R   R15_2    
-        33         49 33101  58416 1L   R15_2    
-        33         50 33101  58440 1R   R15_2    
-        33         51 33101  58421 1L   R15_2    
-        33         52 33101  58445 1R   R15_2    
-        33         53 33101  59002 1L   R16_1    
-        33         54 33101  59024 1R   R16_1    
-        33         55 33101  59007 1L   R16_1    
-        33         56 33101  59029 1R   R16_1    
-        33         57 33101  59012 1L   R16_1    
-        33         58 33101  59034 1R   R16_1    
-        33         59 33101  59017 1L   R16_1    
-        33         60 33101  59039 1R   R16_1    
-        33         61 33101  57827 1L   R15_1    
-        33         62 33101  57857 1R   R15_1    
-        33         63 33101  58402 1L   R15_2    
-        33         64 33101  57862 1R   R15_1    
-        33         65 33101  58407 1L   R15_2    
-        33         66 33101  58431 1R   R15_2    
-        33         67 33101  58412 1L   R15_2    
-        33         68 33101  58436 1R   R15_2    
-        33         69 33101  58417 1L   R15_2    
-        33         70 33101  58441 1R   R15_2    
-        33         71 33101  58422 1L   R15_2    
-        33         72 33101  58446 1R   R15_2    
-        33         73 33101  59003 1L   R16_1    
-        33         74 33101  59025 1R   R16_1    
-        33         75 33101  59008 1L   R16_1    
-        33         76 33101  59030 1R   R16_1    
-        33         77 33101  59013 1L   R16_1    
-        33         78 33101  59035 1R   R16_1    
-        33         79 33101  59018 1L   R16_1    
-        33         80 33101  59040 1R   R16_1    
-        33         81 33101  59019 1L   R16_1    
-        33         82 33101  57858 1R   R15_1    
-        33         83 33101  58403 1L   R15_2    
-        33         84 33101  58426 1R   R15_2    
-        33         85 33101  58408 1L   R15_2    
-        33         86 33101  58432 1R   R15_2    
-        33         87 33101  58413 1L   R15_2    
-        33         88 33101  58437 1R   R15_2    
-        33         89 33101  58418 1L   R15_2    
-        33         90 33101  58442 1R   R15_2    
-        33         91 33101  58423 1L   R15_2    
-        33         92 33101  58447 1R   R15_2    
-        33         93 33101  59004 1L   R16_1    
-        33         94 33101  59026 1R   R16_1    
-        33         95 33101  59009 1L   R16_1    
-        33         96 33101  59031 1R   R16_1    
-        33         97 33101  59014 1L   R16_1    
-        33         98 33101  59036 1R   R16_1    
-        33         99 33101  58401 1L   R15_2    
-        33        100 33101  58428 1R   R15_2    
-        33        101 33101  35106 2L   S8_5     
-        33        102 33101  57916 2R   R15_1    
-        33        103 33101  57886 2L   R15_1    
-        33        104 33101  57921 2R   R15_1    
-        33        105 33101  57884 2L   R15_1    
-        33        106 33101  59096 2R   R16_1    
-        33        107 33101  59046 2L   R16_1    
-        33        108 33101  59101 2R   R16_1    
-        33        109 33101  59051 2L   R16_1    
-        33        110 33101  59106 2R   R16_1    
-        33        111 33101  59056 2L   R16_1    
-        33        112 33101  59111 2R   R16_1    
-        33        113 33101  59061 2L   R16_1    
-        33        114 33101  59116 2R   R16_1    
-        33        115 33101  59066 2L   R16_1    
-        33        116 33101  59091 2R   R16_1    
-        33        117 33101  59071 2L   R16_1    
-        33        118 33101  59301 2R   R16_2    
-        33        119 33101  59076 2L   R16_1    
-        33        120 33101  59121 2R   R16_1    
-        33        121 33101  35138 2L   S8_5     
-        33        122 33101  57917 2R   R15_1    
-        33        123 33101  57887 2L   R15_1    
-        33        124 33101  59092 2R   R16_1    
-        33        125 33101  57885 2L   R15_1    
-        33        126 33101  59097 2R   R16_1    
-        33        127 33101  59047 2L   R16_1    
-        33        128 33101  59102 2R   R16_1    
-        33        129 33101  59052 2L   R16_1    
-        33        130 33101  59107 2R   R16_1    
-        33        131 33101  59057 2L   R16_1    
-        33        132 33101  59112 2R   R16_1    
-        33        133 33101  59062 2L   R16_1    
-        33        134 33101  59117 2R   R16_1    
-        33        135 33101  59067 2L   R16_1    
-        33        136 33101  59100 2R   R16_1    
-        33        137 33101  59072 2L   R16_1    
-        33        138 33101  59302 2R   R16_2    
-        33        139 33101  59077 2L   R16_1    
-        33        140 33101  59122 2R   R16_1    
-        33        141 33101  37519 2L   S9_4     
-        33        142 33101  57918 2R   R15_1    
-        33        143 33101  57888 2L   R15_1    
-        33        144 33101  59093 2R   R16_1    
-        33        145 33101  57891 2L   R15_1    
-        33        146 33101  59098 2R   R16_1    
-        33        147 33101  59048 2L   R16_1    
-        33        148 33101  59103 2R   R16_1    
-        33        149 33101  59053 2L   R16_1    
-        33        150 33101  59108 2R   R16_1    
-        33        151 33101  59058 2L   R16_1    
-        33        152 33101  59113 2R   R16_1    
-        33        153 33101  59063 2L   R16_1    
-        33        154 33101  59118 2R   R16_1    
-        33        155 33101  59068 2L   R16_1    
-        33        156 33101  59125 2R   R16_1    
-        33        157 33101  59073 2L   R16_1    
-        33        158 33101  59303 2R   R16_2    
-        33        159 33101  59078 2L   R16_1    
-        33        160 33101  59123 2R   R16_1    
-        33        161 33101  38725 2L   P016     
-        33        162 33101  57919 2R   R15_1    
-        33        163 33101  57889 2L   R15_1    
-        33        164 33101  59094 2R   R16_1    
-        33        165 33101  57892 2L   R15_1    
-        33        166 33101  59099 2R   R16_1    
-        33        167 33101  59049 2L   R16_1    
-        33        168 33101  59104 2R   R16_1    
-        33        169 33101  59054 2L   R16_1    
-        33        170 33101  59109 2R   R16_1    
-        33        171 33101  59059 2L   R16_1    
-        33        172 33101  59114 2R   R16_1    
-        33        173 33101  59064 2L   R16_1    
-        33        174 33101  59119 2R   R16_1    
-        33        175 33101  59069 2L   R16_1    
-        33        176 33101  59126 2R   R16_1    
-        33        177 33101  59074 2L   R16_1    
-        33        178 33101  59304 2R   R16_2    
-        33        179 33101  59079 2L   R16_1    
-        33        180 33101  59124 2R   R16_1    
-        33        181 33101  38727 2L   P016     
-        33        182 33101  57920 2R   R15_1    
-        33        183 33101  57890 2L   R15_1    
-        33        184 33101  59095 2R   R16_1    
-        33        185 33101  59045 2L   R16_1    
-        33        186 33101  57922 2R   R15_1    
-        33        187 33101  59050 2L   R16_1    
-        33        188 33101  59105 2R   R16_1    
-        33        189 33101  59055 2L   R16_1    
-        33        190 33101  59110 2R   R16_1    
-        33        191 33101  59060 2L   R16_1    
-        33        192 33101  59115 2R   R16_1    
-        33        193 33101  59065 2L   R16_1    
-        33        194 33101  59120 2R   R16_1    
-        33        195 33101  59070 2L   R16_1    
-        33        196 33101  59306 2R   R16_2    
-        33        197 33101  59075 2L   R16_1    
-        33        198 33101  59305 2R   R16_2    
-        33        199 33101  59080 2L   R16_1    
-        33        200 33101  56736 2R   R14_1    
-        33        201 33101  39000 3L   P017     
-        33        202 33101  57971 3R   R15_1    
-        33        203 33101  57951 3L   R15_1    
-        33        204 33101  59361 3R   R16_2    
-        33        205 33101  57946 3L   R15_1    
-        33        206 33101  59366 3R   R16_2    
-        33        207 33101  59316 3L   R16_2    
-        33        208 33101  59371 3R   R16_2    
-        33        209 33101  59321 3L   R16_2    
-        33        210 33101  59376 3R   R16_2    
-        33        211 33101  59326 3L   R16_2    
-        33        212 33101  59381 3R   R16_2    
-        33        213 33101  59341 3L   R16_2    
-        33        214 33101  59391 3R   R16_2    
-        33        215 33101  59336 3L   R16_2    
-        33        216 33101  59386 3R   R16_2    
-        33        217 33101  59346 3L   R16_2    
-        33        218 33101  59396 3R   R16_2    
-        33        219 33101  38984 3L   P017     
-        33        220 33101  26586 3R   S6_2     
-        33        221 33101  34047 3L   S8_3     
-        33        222 33101  57972 3R   R15_1    
-        33        223 33101  57952 3L   R15_1    
-        33        224 33101  59362 3R   R16_2    
-        33        225 33101  57954 3L   R15_1    
-        33        226 33101  59367 3R   R16_2    
-        33        227 33101  59317 3L   R16_2    
-        33        228 33101  59372 3R   R16_2    
-        33        229 33101  59322 3L   R16_2    
-        33        230 33101  59377 3R   R16_2    
-        33        231 33101  59327 3L   R16_2    
-        33        232 33101  59382 3R   R16_2    
-        33        233 33101  59342 3L   R16_2    
-        33        234 33101  59392 3R   R16_2    
-        33        235 33101  59337 3L   R16_2    
-        33        236 33101  59387 3R   R16_2    
-        33        237 33101  57953 3L   R15_1    
-        33        238 33101  59397 3R   R16_2    
-        33        239 33101  38985 3L   P017     
-        33        240 33101  39023 3R   P017     
-        33        241 33101  34054 3L   S8_3     
-        33        242 33101  57973 3R   R15_1    
-        33        243 33101  57948 3L   R15_1    
-        33        244 33101  59363 3R   R16_2    
-        33        245 33101  59313 3L   R16_2    
-        33        246 33101  59368 3R   R16_2    
-        33        247 33101  59318 3L   R16_2    
-        33        248 33101  59373 3R   R16_2    
-        33        249 33101  59323 3L   R16_2    
-        33        250 33101  59378 3R   R16_2    
-        33        251 33101  59328 3L   R16_2    
-        33        252 33101  59383 3R   R16_2    
-        33        253 33101  59343 3L   R16_2    
-        33        254 33101  59393 3R   R16_2    
-        33        255 33101  59338 3L   R16_2    
-        33        256 33101  59388 3R   R16_2    
-        33        257 33101  59333 3L   R16_2    
-        33        258 33101  59360 3R   R16_2    
-        33        259 33101  38987 3L   P017     
-        33        260 33101  39025 3R   P017     
-        33        261 33101  34069 3L   S8_3     
-        33        262 33101  57974 3R   R15_1    
-        33        263 33101  57949 3L   R15_1    
-        33        264 33101  59364 3R   R16_2    
-        33        265 33101  59314 3L   R16_2    
-        33        266 33101  59369 3R   R16_2    
-        33        267 33101  59319 3L   R16_2    
-        33        268 33101  59374 3R   R16_2    
-        33        269 33101  59324 3L   R16_2    
-        33        270 33101  59379 3R   R16_2    
-        33        271 33101  59329 3L   R16_2    
-        33        272 33101  59384 3R   R16_2    
-        33        273 33101  59344 3L   R16_2    
-        33        274 33101  59394 3R   R16_2    
-        33        275 33101  59339 3L   R16_2    
-        33        276 33101  59389 3R   R16_2    
-        33        277 33101  59334 3L   R16_2    
-        33        278 33101  57977 3R   R15_1    
-        33        279 33101  38988 3L   P017     
-        33        280 33101  39027 3R   P017     
-        33        281 33101  35200 3L   S8_5     
-        33        282 33101  57975 3R   R15_1    
-        33        283 33101  57950 3L   R15_1    
-        33        284 33101  59365 3R   R16_2    
-        33        285 33101  59315 3L   R16_2    
-        33        286 33101  59370 3R   R16_2    
-        33        287 33101  59320 3L   R16_2    
-        33        288 33101  59375 3R   R16_2    
-        33        289 33101  59332 3L   R16_2    
-        33        290 33101  59380 3R   R16_2    
-        33        291 33101  59330 3L   R16_2    
-        33        292 33101  59385 3R   R16_2    
-        33        293 33101  59345 3L   R16_2    
-        33        294 33101  59395 3R   R16_2    
-        33        295 33101  59340 3L   R16_2    
-        33        296 33101  59390 3R   R16_2    
-        33        297 33101  59335 3L   R16_2    
-        33        298 33101  57976 3R   R15_1    
-        33        299 33101  38989 3L   P017     
-        33        300 33101  41860 3R   P18      
-        33        301 33101  38376 4L   S9_6     
-        33        302 33101  58013 4R   R15_1    
-        33        303 33101  57993 4L   R15_1    
-        33        304 33101  59421 4R   R16_2    
-        33        305 33101  58003 4L   R15_1    
-        33        306 33101  59431 4R   R16_2    
-        33        307 33101  57998 4L   R15_1    
-        33        308 33101  59426 4R   R16_2    
-        33        309 33101  59411 4L   R16_2    
-        33        310 33101  59846 4R   R16_3    
-        33        311 33101  59406 4L   R16_2    
-        33        312 33101  59841 4R   R16_3    
-        33        313 33101  59832 4L   R16_3    
-        33        314 33101  59856 4R   R16_3    
-        33        315 33101  59821 4L   R16_3    
-        33        316 33101  59861 4R   R16_3    
-        33        317 33101  59416 4L   R16_2    
-        33        318 33101  59851 4R   R16_3    
-        33        319 33101  59826 4L   R16_3    
-        33        320 33101  39083 4R   P017     
-        33        321 33101  39031 4L   P017     
-        33        322 33101  58014 4R   R15_1    
-        33        323 33101  57994 4L   R15_1    
-        33        324 33101  59422 4R   R16_2    
-        33        325 33101  58004 4L   R15_1    
-        33        326 33101  59432 4R   R16_2    
-        33        327 33101  57999 4L   R15_1    
-        33        328 33101  59427 4R   R16_2    
-        33        329 33101  59412 4L   R16_2    
-        33        330 33101  59847 4R   R16_3    
-        33        331 33101  59407 4L   R16_2    
-        33        332 33101  59842 4R   R16_3    
-        33        333 33101  59817 4L   R16_3    
-        33        334 33101  59857 4R   R16_3    
-        33        335 33101  59822 4L   R16_3    
-        33        336 33101  59862 4R   R16_3    
-        33        337 33101  59417 4L   R16_2    
-        33        338 33101  59852 4R   R16_3    
-        33        339 33101  59827 4L   R16_3    
-        33        340 33101  39084 4R   P017     
-        33        341 33101  39050 4L   P017     
-        33        342 33101  58015 4R   R15_1    
-        33        343 33101  57995 4L   R15_1    
-        33        344 33101  59423 4R   R16_2    
-        33        345 33101  58005 4L   R15_1    
-        33        346 33101  59433 4R   R16_2    
-        33        347 33101  58000 4L   R15_1    
-        33        348 33101  59428 4R   R16_2    
-        33        349 33101  59413 4L   R16_2    
-        33        350 33101  59848 4R   R16_3    
-        33        351 33101  59408 4L   R16_2    
-        33        352 33101  59843 4R   R16_3    
-        33        353 33101  59818 4L   R16_3    
-        33        354 33101  59858 4R   R16_3    
-        33        355 33101  59823 4L   R16_3    
-        33        356 33101  59863 4R   R16_3    
-        33        357 33101  59418 4L   R16_2    
-        33        358 33101  59853 4R   R16_3    
-        33        359 33101  59828 4L   R16_3    
-        33        360 33101  39085 4R   P017     
-        33        361 33101  39056 4L   P017     
-        33        362 33101  58016 4R   R15_1    
-        33        363 33101  57996 4L   R15_1    
-        33        364 33101  59424 4R   R16_2    
-        33        365 33101  58006 4L   R15_1    
-        33        366 33101  59434 4R   R16_2    
-        33        367 33101  58001 4L   R15_1    
-        33        368 33101  59429 4R   R16_2    
-        33        369 33101  59415 4L   R16_2    
-        33        370 33101  59849 4R   R16_3    
-        33        371 33101  59409 4L   R16_2    
-        33        372 33101  59844 4R   R16_3    
-        33        373 33101  59819 4L   R16_3    
-        33        374 33101  59866 4R   R16_3    
-        33        375 33101  59824 4L   R16_3    
-        33        376 33101  59864 4R   R16_3    
-        33        377 33101  59419 4L   R16_2    
-        33        378 33101  58012 4R   R15_1    
-        33        379 33101  59829 4L   R16_3    
-        33        380 33101  39086 4R   P017     
-        33        381 33101  41724 4L   S10_6    
-        33        382 33101  58017 4R   R15_1    
-        33        383 33101  57997 4L   R15_1    
-        33        384 33101  59425 4R   R16_2    
-        33        385 33101  58007 4L   R15_1    
-        33        386 33101  58011 4R   R15_1    
-        33        387 33101  58002 4L   R15_1    
-        33        388 33101  59430 4R   R16_2    
-        33        389 33101  59831 4L   R16_3    
-        33        390 33101  59850 4R   R16_3    
-        33        391 33101  59410 4L   R16_2    
-        33        392 33101  59845 4R   R16_3    
-        33        393 33101  59820 4L   R16_3    
-        33        394 33101  59860 4R   R16_3    
-        33        395 33101  59825 4L   R16_3    
-        33        396 33101  59865 4R   R16_3    
-        33        397 33101  59420 4L   R16_2    
-        33        398 33101  59855 4R   R16_3    
-        33        399 33101  59830 4L   R16_3    
-        33        400 33101  39087 4R   P017     
-        33        401 33101  34097 5L   S8_3     
-        33        402 33101  58057 5R   R15_1    
-        33        403 33101  58051 5L   R15_1    
-        33        404 33101  58081 5R   R15_1    
-        33        405 33101  58451 5L   R15_2    
-        33        406 33101  58473 5R   R15_2    
-        33        407 33101  58456 5L   R15_2    
-        33        408 33101  58466 5R   R15_2    
-        33        409 33101  58056 5L   R15_1    
-        33        410 33101  58471 5R   R15_2    
-        33        411 33101  59131 5L   R16_1    
-        33        412 33101  59166 5R   R16_1    
-        33        413 33101  59136 5L   R16_1    
-        33        414 33101  59171 5R   R16_1    
-        33        415 33101  59141 5L   R16_1    
-        33        416 33101  59176 5R   R16_1    
-        33        417 33101  59146 5L   R16_1    
-        33        418 33101  59181 5R   R16_1    
-        33        419 33101  59151 5L   R16_1    
-        33        420 33101  58472 5R   R15_2    
-        33        421 33101  39093 5L   P017     
-        33        422 33101  58073 5R   R15_1    
-        33        423 33101  58052 5L   R15_1    
-        33        424 33101  58082 5R   R15_1    
-        33        425 33101  58452 5L   R15_2    
-        33        426 33101  58462 5R   R15_2    
-        33        427 33101  58457 5L   R15_2    
-        33        428 33101  58467 5R   R15_2    
-        33        429 33101  59127 5L   R16_1    
-        33        430 33101  59162 5R   R16_1    
-        33        431 33101  59132 5L   R16_1    
-        33        432 33101  59167 5R   R16_1    
-        33        433 33101  59137 5L   R16_1    
-        33        434 33101  59172 5R   R16_1    
-        33        435 33101  59142 5L   R16_1    
-        33        436 33101  59177 5R   R16_1    
-        33        437 33101  59147 5L   R16_1    
-        33        438 33101  59182 5R   R16_1    
-        33        439 33101  59152 5L   R16_1    
-        33        440 33101  39137 5R   P017     
-        33        441 33101  58020 5L   R15_1    
-        33        442 33101  58079 5R   R15_1    
-        33        443 33101  58053 5L   R15_1    
-        33        444 33101  58083 5R   R15_1    
-        33        445 33101  58453 5L   R15_2    
-        33        446 33101  58463 5R   R15_2    
-        33        447 33101  58458 5L   R15_2    
-        33        448 33101  58468 5R   R15_2    
-        33        449 33101  59128 5L   R16_1    
-        33        450 33101  59163 5R   R16_1    
-        33        451 33101  59133 5L   R16_1    
-        33        452 33101  59168 5R   R16_1    
-        33        453 33101  59138 5L   R16_1    
-        33        454 33101  59173 5R   R16_1    
-        33        455 33101  59143 5L   R16_1    
-        33        456 33101  59178 5R   R16_1    
-        33        457 33101  59148 5L   R16_1    
-        33        458 33101  59183 5R   R16_1    
-        33        459 33101  59153 5L   R16_1    
-        33        460 33101  39138 5R   P017     
-        33        461 33101  58049 5L   R15_1    
-        33        462 33101  58080 5R   R15_1    
-        33        463 33101  58054 5L   R15_1    
-        33        464 33101  58084 5R   R15_1    
-        33        465 33101  58454 5L   R15_2    
-        33        466 33101  58464 5R   R15_2    
-        33        467 33101  58459 5L   R15_2    
-        33        468 33101  58469 5R   R15_2    
-        33        469 33101  59129 5L   R16_1    
-        33        470 33101  59164 5R   R16_1    
-        33        471 33101  59134 5L   R16_1    
-        33        472 33101  59169 5R   R16_1    
-        33        473 33101  59139 5L   R16_1    
-        33        474 33101  59174 5R   R16_1    
-        33        475 33101  59144 5L   R16_1    
-        33        476 33101  59179 5R   R16_1    
-        33        477 33101  59149 5L   R16_1    
-        33        478 33101  59184 5R   R16_1    
-        33        479 33101  59154 5L   R16_1    
-        33        480 33101  39141 5R   P017     
-        33        481 33101  58050 5L   R15_1    
-        33        482 33101  58086 5R   R15_1    
-        33        483 33101  58055 5L   R15_1    
-        33        484 33101  58085 5R   R15_1    
-        33        485 33101  58455 5L   R15_2    
-        33        486 33101  58465 5R   R15_2    
-        33        487 33101  58461 5L   R15_2    
-        33        488 33101  58470 5R   R15_2    
-        33        489 33101  59130 5L   R16_1    
-        33        490 33101  59165 5R   R16_1    
-        33        491 33101  59135 5L   R16_1    
-        33        492 33101  59170 5R   R16_1    
-        33        493 33101  59140 5L   R16_1    
-        33        494 33101  59175 5R   R16_1    
-        33        495 33101  59145 5L   R16_1    
-        33        496 33101  59180 5R   R16_1    
-        33        497 33101  59150 5L   R16_1    
-        33        498 33101  59185 5R   R16_1    
-        33        499 33101  58460 5L   R15_2    
-        33        500 33101  39143 5R   P017     
-        33        501 33101  59236 6L   R16_1    
-        33        502 33101  59254 6R   R16_1    
-        33        503 33101  59231 6L   R16_1    
-        33        504 33101  59249 6R   R16_1    
-        33        505 33101  59226 6L   R16_1    
-        33        506 33101  59244 6R   R16_1    
-        33        507 33101  59221 6L   R16_1    
-        33        508 33101  59264 6R   R16_1    
-        33        509 33101  58636 6L   R15_2    
-        33        510 33101  58659 6R   R15_2    
-        33        511 33101  58631 6L   R15_2    
-        33        512 33101  58646 6R   R15_2    
-        33        513 33101  58626 6L   R15_2    
-        33        514 33101  58656 6R   R15_2    
-        33        515 33101  58621 6L   R15_2    
-        33        516 33101  58651 6R   R15_2    
-        33        517 33101  58616 6L   R15_2    
-        33        518 33101  58641 6R   R15_2    
-        33        519 33101  56127 6L   R13_2    
-        33        520 33101  56132 6R   R13_2    
-        33        521 33101  59237 6L   R16_1    
-        33        522 33101  59255 6R   R16_1    
-        33        523 33101  59232 6L   R16_1    
-        33        524 33101  59250 6R   R16_1    
-        33        525 33101  59227 6L   R16_1    
-        33        526 33101  59245 6R   R16_1    
-        33        527 33101  59222 6L   R16_1    
-        33        528 33101  59265 6R   R16_1    
-        33        529 33101  58637 6L   R15_2    
-        33        530 33101  58662 6R   R15_2    
-        33        531 33101  58632 6L   R15_2    
-        33        532 33101  58647 6R   R15_2    
-        33        533 33101  58627 6L   R15_2    
-        33        534 33101  58657 6R   R15_2    
-        33        535 33101  58622 6L   R15_2    
-        33        536 33101  58652 6R   R15_2    
-        33        537 33101  58617 6L   R15_2    
-        33        538 33101  58642 6R   R15_2    
-        33        539 33101  56128 6L   R13_2    
-        33        540 33101  56133 6R   R13_2    
-        33        541 33101  59238 6L   R16_1    
-        33        542 33101  59256 6R   R16_1    
-        33        543 33101  59233 6L   R16_1    
-        33        544 33101  59251 6R   R16_1    
-        33        545 33101  59228 6L   R16_1    
-        33        546 33101  59246 6R   R16_1    
-        33        547 33101  59223 6L   R16_1    
-        33        548 33101  59266 6R   R16_1    
-        33        549 33101  58638 6L   R15_2    
-        33        550 33101  58663 6R   R15_2    
-        33        551 33101  58633 6L   R15_2    
-        33        552 33101  58648 6R   R15_2    
-        33        553 33101  58628 6L   R15_2    
-        33        554 33101  58658 6R   R15_2    
-        33        555 33101  58623 6L   R15_2    
-        33        556 33101  58653 6R   R15_2    
-        33        557 33101  58618 6L   R15_2    
-        33        558 33101  58643 6R   R15_2    
-        33        559 33101  56129 6L   R13_2    
-        33        560 33101  56134 6R   R13_2    
-        33        561 33101  59239 6L   R16_1    
-        33        562 33101  59257 6R   R16_1    
-        33        563 33101  59234 6L   R16_1    
-        33        564 33101  59252 6R   R16_1    
-        33        565 33101  59229 6L   R16_1    
-        33        566 33101  59247 6R   R16_1    
-        33        567 33101  59224 6L   R16_1    
-        33        568 33101  59267 6R   R16_1    
-        33        569 33101  58639 6L   R15_2    
-        33        570 33101  58664 6R   R15_2    
-        33        571 33101  58634 6L   R15_2    
-        33        572 33101  58649 6R   R15_2    
-        33        573 33101  58629 6L   R15_2    
-        33        574 33101  58661 6R   R15_2    
-        33        575 33101  58624 6L   R15_2    
-        33        576 33101  58654 6R   R15_2    
-        33        577 33101  58619 6L   R15_2    
-        33        578 33101  58644 6R   R15_2    
-        33        579 33101  56130 6L   R13_2    
-        33        580 33101  38848 6R   P17      
-        33        581 33101  59240 6L   R16_1    
-        33        582 33101  59258 6R   R16_1    
-        33        583 33101  59235 6L   R16_1    
-        33        584 33101  59253 6R   R16_1    
-        33        585 33101  59230 6L   R16_1    
-        33        586 33101  59248 6R   R16_1    
-        33        587 33101  59225 6L   R16_1    
-        33        588 33101  59268 6R   R16_1    
-        33        589 33101  58640 6L   R15_2    
-        33        590 33101  58665 6R   R15_2    
-        33        591 33101  58635 6L   R15_2    
-        33        592 33101  58650 6R   R15_2    
-        33        593 33101  58630 6L   R15_2    
-        33        594 33101  58660 6R   R15_2    
-        33        595 33101  58625 6L   R15_2    
-        33        596 33101  58655 6R   R15_2    
-        33        597 33101  58620 6L   R15_2    
-        33        598 33101  58645 6R   R15_2    
-        33        599 33101  56131 6L   R13_2    
-        33        600 33101  38849 6R   P17      
-        33        601 33101  59534 7L   R16_2    
-        33        602 33101  59572 7R   R16_2    
-        33        603 33101  59529 7L   R16_2    
-        33        604 33101  59567 7R   R16_2    
-        33        605 33101  59524 7L   R16_2    
-        33        606 33101  59562 7R   R16_2    
-        33        607 33101  59519 7L   R16_2    
-        33        608 33101  59273 7R   R16_1    
-        33        609 33101  58675 7L   R15_2    
-        33        610 33101  59552 7R   R16_2    
-        33        611 33101  58686 7L   R15_2    
-        33        612 33101  59547 7R   R16_2    
-        33        613 33101  58681 7L   R15_2    
-        33        614 33101  59278 7R   R16_1    
-        33        615 33101  58671 7L   R15_2    
-        33        616 30301    539 7R   B04      
-        33        617 33101  58666 7L   R15_2    
-        33        618 33101  57065 7R   R14_1    
-        33        619 33101  57012 7L   R14_1    
-        33        620 33101  38608 7R   S9_5     
-        33        621 33101  59535 7L   R16_2    
-        33        622 33101  59573 7R   R16_2    
-        33        623 33101  59530 7L   R16_2    
-        33        624 33101  59568 7R   R16_2    
-        33        625 33101  59525 7L   R16_2    
-        33        626 33101  59563 7R   R16_2    
-        33        627 33101  59520 7L   R16_2    
-        33        628 33101  59274 7R   R16_1    
-        33        629 33101  58677 7L   R15_2    
-        33        630 33101  59553 7R   R16_2    
-        33        631 33101  58687 7L   R15_2    
-        33        632 33101  59548 7R   R16_2    
-        33        633 33101  58682 7L   R15_2    
-        33        634 33101  59279 7R   R16_1    
-        33        635 33101  58672 7L   R15_2    
-        33        636 30301    540 7R   B04      
-        33        637 33101  58667 7L   R15_2    
-        33        638 33101  57064 7R   R14_1    
-        33        639 33101  57013 7L   R14_1    
-        33        640 33101  38609 7R   S9_5     
-        33        641 33101  59536 7L   R16_2    
-        33        642 33101  59574 7R   R16_2    
-        33        643 33101  59531 7L   R16_2    
-        33        644 33101  59569 7R   R16_2    
-        33        645 33101  59526 7L   R16_2    
-        33        646 33101  59564 7R   R16_2    
-        33        647 33101  59521 7L   R16_2    
-        33        648 33101  59275 7R   R16_1    
-        33        649 33101  58678 7L   R15_2    
-        33        650 33101  59554 7R   R16_2    
-        33        651 33101  58688 7L   R15_2    
-        33        652 33101  59549 7R   R16_2    
-        33        653 33101  58683 7L   R15_2    
-        33        654 33101  59280 7R   R16_1    
-        33        655 33101  58673 7L   R15_2    
-        33        656 33101  53263 7R   R10_2    
-        33        657 33101  58668 7L   R15_2    
-        33        658 33101  57072 7R   R14_1    
-        33        659 33101  57014 7L   R14_1    
-        33        660 33101  38611 7R   S9_5     
-        33        661 33101  59537 7L   R16_2    
-        33        662 33101  59283 7R   R16_1    
-        33        663 33101  59532 7L   R16_2    
-        33        664 33101  59570 7R   R16_2    
-        33        665 33101  59527 7L   R16_2    
-        33        666 33101  59565 7R   R16_2    
-        33        667 33101  59522 7L   R16_2    
-        33        668 33101  59276 7R   R16_1    
-        33        669 33101  58679 7L   R15_2    
-        33        670 33101  59555 7R   R16_2    
-        33        671 33101  58689 7L   R15_2    
-        33        672 33101  59550 7R   R16_2    
-        33        673 33101  58684 7L   R15_2    
-        33        674 33101  59281 7R   R16_1    
-        33        675 33101  58674 7L   R15_2    
-        33        676 33101  56612 7R   R13_3    
-        33        677 33101  58669 7L   R15_2    
-        33        678 33101  57074 7R   R14_1    
-        33        679 33101  57015 7L   R14_1    
-        33        680 33101  38612 7R   S9_5     
-        33        681 33101  59538 7L   R16_2    
-        33        682 33101  59284 7R   R16_1    
-        33        683 33101  59533 7L   R16_2    
-        33        684 33101  59571 7R   R16_2    
-        33        685 33101  59528 7L   R16_2    
-        33        686 33101  59566 7R   R16_2    
-        33        687 33101  59523 7L   R16_2    
-        33        688 33101  59277 7R   R16_1    
-        33        689 33101  58680 7L   R15_2    
-        33        690 33101  59556 7R   R16_2    
-        33        691 33101  58690 7L   R15_2    
-        33        692 33101  59551 7R   R16_2    
-        33        693 33101  58685 7L   R15_2    
-        33        694 33101  59282 7R   R16_1    
-        33        695 33101  58676 7L   R15_2    
-        33        696 33101  56613 7R   R13_3    
-        33        697 33101  58670 7L   R15_2    
-        33        698 33101  57069 7R   R14_1    
-        33        699 33101  57016 7L   R14_1    
-        33        700 33101  38613 7R   S9_5     
-        33        701 33101  59595 8L   R16_2    
-        33        702 33101  59609 8R   R16_2    
-        33        703 33101  59580 8L   R16_2    
-        33        704 33101  59604 8R   R16_2    
-        33        705 33101  59575 8L   R16_2    
-        33        706 33101  59599 8R   R16_2    
-        33        707 33101  59285 8L   R16_1    
-        33        708 33101  59290 8R   R16_1    
-        33        709 33101  58696 8L   R15_2    
-        33        710 33101  58722 8R   R15_2    
-        33        711 33101  57119 8L   R14_1    
-        33        712 33101  58736 8R   R15_2    
-        33        713 33101  58711 8L   R15_2    
-        33        714 33101  58726 8R   R15_2    
-        33        715 33101  58706 8L   R15_2    
-        33        716 33101  58716 8R   R15_2    
-        33        717 33101  58701 8L   R15_2    
-        33        718 33101  58721 8R   R15_2    
-        33        719 33101  58691 8L   R15_2    
-        33        720 33101  53307 8R   R10_2    
-        33        721 33101  59596 8L   R16_2    
-        33        722 33101  59610 8R   R16_2    
-        33        723 33101  59581 8L   R16_2    
-        33        724 33101  59605 8R   R16_2    
-        33        725 33101  59576 8L   R16_2    
-        33        726 33101  59600 8R   R16_2    
-        33        727 33101  59286 8L   R16_1    
-        33        728 33101  59291 8R   R16_1    
-        33        729 33101  58697 8L   R15_2    
-        33        730 33101  58732 8R   R15_2    
-        33        731 33101  57115 8L   R14_1    
-        33        732 33101  58737 8R   R15_2    
-        33        733 33101  58712 8L   R15_2    
-        33        734 33101  58727 8R   R15_2    
-        33        735 33101  58707 8L   R15_2    
-        33        736 33101  58717 8R   R15_2    
-        33        737 33101  58702 8L   R15_2    
-        33        738 30301    227 8R   B03      
-        33        739 33101  58692 8L   R15_2    
-        33        740 33101  52145 8R   R9_2     
-        33        741 33101  59597 8L   R16_2    
-        33        742 33101  59611 8R   R16_2    
-        33        743 33101  59582 8L   R16_2    
-        33        744 33101  59606 8R   R16_2    
-        33        745 33101  59577 8L   R16_2    
-        33        746 33101  59601 8R   R16_2    
-        33        747 33101  59287 8L   R16_1    
-        33        748 33101  59292 8R   R16_1    
-        33        749 33101  58698 8L   R15_2    
-        33        750 33101  58733 8R   R15_2    
-        33        751 33101  57120 8L   R14_1    
-        33        752 33101  58738 8R   R15_2    
-        33        753 33101  58713 8L   R15_2    
-        33        754 33101  58728 8R   R15_2    
-        33        755 33101  58708 8L   R15_2    
-        33        756 33101  58718 8R   R15_2    
-        33        757 33101  58703 8L   R15_2    
-        33        758 33101  58723 8R   R15_2    
-        33        759 33101  58693 8L   R15_2    
-        33        760 33101  46468 8R   R4_2     
-        33        761 33101  59598 8L   R16_2    
-        33        762 33101  59612 8R   R16_2    
-        33        763 33101  59583 8L   R16_2    
-        33        764 33101  59607 8R   R16_2    
-        33        765 33101  59578 8L   R16_2    
-        33        766 33101  59602 8R   R16_2    
-        33        767 33101  59288 8L   R16_1    
-        33        768 33101  59293 8R   R16_1    
-        33        769 33101  58699 8L   R15_2    
-        33        770 33101  58734 8R   R15_2    
-        33        771 33101  56615 8L   R13_3    
-        33        772 33101  58739 8R   R15_2    
-        33        773 33101  58714 8L   R15_2    
-        33        774 33101  58729 8R   R15_2    
-        33        775 33101  58709 8L   R15_2    
-        33        776 33101  58719 8R   R15_2    
-        33        777 33101  58704 8L   R15_2    
-        33        778 33101  58724 8R   R15_2    
-        33        779 33101  58694 8L   R15_2    
-        33        780 33101  56627 8R   R13_3    
-        33        781 33101  56614 8L   R13_3    
-        33        782 33101  59613 8R   R16_2    
-        33        783 33101  59584 8L   R16_2    
-        33        784 33101  59608 8R   R16_2    
-        33        785 33101  59579 8L   R16_2    
-        33        786 33101  59603 8R   R16_2    
-        33        787 33101  59289 8L   R16_1    
-        33        788 33101  59294 8R   R16_1    
-        33        789 33101  58700 8L   R15_2    
-        33        790 33101  58735 8R   R15_2    
-        33        791 33101  56616 8L   R13_3    
-        33        792 33101  58740 8R   R15_2    
-        33        793 33101  58715 8L   R15_2    
-        33        794 33101  58730 8R   R15_2    
-        33        795 33101  58710 8L   R15_2    
-        33        796 33101  58720 8R   R15_2    
-        33        797 33101  58705 8L   R15_2    
-        33        798 33101  58725 8R   R15_2    
-        33        799 33101  58695 8L   R15_2    
-        33        800 33101  58731 8R   R15_2    
-        33        801 33101  26321 9L   S06      
-        33        802 33101  58766 9R   R15_2    
-        33        803 33101  59658 9L   R16_2    
-        33        804 33101  59688 9R   R16_2    
-        33        805 33101  59653 9L   R16_2    
-        33        806 33101  59683 9R   R16_2    
-        33        807 33101  59648 9L   R16_2    
-        33        808 33101  59678 9R   R16_2    
-        33        809 33101  59295 9L   R16_1    
-        33        810 33101  58771 9R   R15_2    
-        33        811 33101  58761 9L   R15_2    
-        33        812 33101  58786 9R   R15_2    
-        33        813 33101  58756 9L   R15_2    
-        33        814 33101  58781 9R   R15_2    
-        33        815 33101  58746 9L   R15_2    
-        33        816 33101  56241 9R   R13_2    
-        33        817 33101  58741 9L   R15_2    
-        33        818 33101  58776 9R   R15_2    
-        33        819 33101  56200 9L   R13_2    
-        33        820 33101  38870 9R   P16      
-        33        821 33101  58752 9L   R15_2    
-        33        822 33101  58767 9R   R15_2    
-        33        823 33101  59659 9L   R16_2    
-        33        824 33101  59689 9R   R16_2    
-        33        825 33101  59654 9L   R16_2    
-        33        826 33101  59684 9R   R16_2    
-        33        827 33101  59649 9L   R16_2    
-        33        828 33101  59679 9R   R16_2    
-        33        829 33101  59296 9L   R16_1    
-        33        830 33101  58772 9R   R15_2    
-        33        831 33101  58762 9L   R15_2    
-        33        832 33101  58787 9R   R15_2    
-        33        833 33101  58757 9L   R15_2    
-        33        834 33101  58782 9R   R15_2    
-        33        835 33101  58747 9L   R15_2    
-        33        836 33101  56242 9R   R13_2    
-        33        837 33101  58742 9L   R15_2    
-        33        838 33101  58777 9R   R15_2    
-        33        839 33101  56201 9L   R13_2    
-        33        840 33101  38872 9R   P16      
-        33        841 33101  58753 9L   R15_2    
-        33        842 33101  58768 9R   R15_2    
-        33        843 33101  59660 9L   R16_2    
-        33        844 33101  59690 9R   R16_2    
-        33        845 33101  59655 9L   R16_2    
-        33        846 33101  59685 9R   R16_2    
-        33        847 33101  59650 9L   R16_2    
-        33        848 33101  59680 9R   R16_2    
-        33        849 33101  59297 9L   R16_1    
-        33        850 33101  58773 9R   R15_2    
-        33        851 33101  58763 9L   R15_2    
-        33        852 33101  58788 9R   R15_2    
-        33        853 33101  58758 9L   R15_2    
-        33        854 33101  58783 9R   R15_2    
-        33        855 33101  58748 9L   R15_2    
-        33        856 33101  56243 9R   R13_2    
-        33        857 33101  58743 9L   R15_2    
-        33        858 33101  58778 9R   R15_2    
-        33        859 33101  56202 9L   R13_2    
-        33        860 33101  47870 9R   S9_5     
-        33        861 33101  58754 9L   R15_2    
-        33        862 33101  58769 9R   R15_2    
-        33        863 33101  59661 9L   R16_2    
-        33        864 33101  59691 9R   R16_2    
-        33        865 33101  59656 9L   R16_2    
-        33        866 33101  59686 9R   R16_2    
-        33        867 33101  59651 9L   R16_2    
-        33        868 33101  59681 9R   R16_2    
-        33        869 33101  57533 9L   R14_2    
-        33        870 33101  58774 9R   R15_2    
-        33        871 33101  58764 9L   R15_2    
-        33        872 33101  58789 9R   R15_2    
-        33        873 33101  58759 9L   R15_2    
-        33        874 33101  58784 9R   R15_2    
-        33        875 33101  58749 9L   R15_2    
-        33        876 33101  56244 9R   R13_2    
-        33        877 33101  58744 9L   R15_2    
-        33        878 33101  58779 9R   R15_2    
-        33        879 33101  56203 9L   R13_2    
-        33        880 33101  47871 9R   S9_5     
-        33        881 33101  58755 9L   R15_2    
-        33        882 33101  58770 9R   R15_2    
-        33        883 33101  59662 9L   R16_2    
-        33        884 33101  59692 9R   R16_2    
-        33        885 33101  59657 9L   R16_2    
-        33        886 33101  59687 9R   R16_2    
-        33        887 33101  59652 9L   R16_2    
-        33        888 33101  59682 9R   R16_2    
-        33        889 33101  57534 9L   R14_2    
-        33        890 33101  58775 9R   R15_2    
-        33        891 33101  58765 9L   R15_2    
-        33        892 33101  58790 9R   R15_2    
-        33        893 33101  58760 9L   R15_2    
-        33        894 33101  58785 9R   R15_2    
-        33        895 33101  58750 9L   R15_2    
-        33        896 33101  56245 9R   R13_2    
-        33        897 33101  58745 9L   R15_2    
-        33        898 33101  58780 9R   R15_2    
-        33        899 33101  56204 9L   R13_2    
-        33        900 33101  47892 9R   S9_5     
-        33        901 33101  26818 10L  S6_2     
-        33        902 33101  58245 10R  R15_1    
-        33        903 33101  58801 10L  R15_2    
-        33        904 33101  58813 10R  R15_2    
-        33        905 33101  58796 10L  R15_2    
-        33        906 33101  58803 10R  R15_2    
-        33        907 33101  58791 10L  R15_2    
-        33        908 33101  58808 10R  R15_2    
-        33        909 33101  58188 10L  R15_1    
-        33        910 33101  58255 10R  R15_1    
-        33        911 33101  58223 10L  R15_1    
-        33        912 33101  58260 10R  R15_1    
-        33        913 33101  58218 10L  R15_1    
-        33        914 33101  58250 10R  R15_1    
-        33        915 33101  58228 10L  R15_1    
-        33        916 33101  58240 10R  R15_1    
-        33        917 33101  58203 10L  R15_1    
-        33        918 33101  58235 10R  R15_1    
-        33        919 33101  58198 10L  R15_1    
-        33        920 33101  26475 10R  S06      
-        33        921 33101  26820 10L  S6_2     
-        33        922 33101  58246 10R  R15_1    
-        33        923 33101  58802 10L  R15_2    
-        33        924 33101  58814 10R  R15_2    
-        33        925 33101  58797 10L  R15_2    
-        33        926 33101  58804 10R  R15_2    
-        33        927 33101  58792 10L  R15_2    
-        33        928 33101  58809 10R  R15_2    
-        33        929 33101  58189 10L  R15_1    
-        33        930 33101  58256 10R  R15_1    
-        33        931 33101  58224 10L  R15_1    
-        33        932 33101  58261 10R  R15_1    
-        33        933 33101  58219 10L  R15_1    
-        33        934 33101  58251 10R  R15_1    
-        33        935 33101  58229 10L  R15_1    
-        33        936 33101  58241 10R  R15_1    
-        33        937 33101  58204 10L  R15_1    
-        33        938 33101  58236 10R  R15_1    
-        33        939 33101  58199 10L  R15_1    
-        33        940 33101  26483 10R  S06      
-        33        941 33101  26821 10L  S6_2     
-        33        942 33101  58247 10R  R15_1    
-        33        943 33101  57560 10L  R14_2    
-        33        944 33101  58815 10R  R15_2    
-        33        945 33101  58798 10L  R15_2    
-        33        946 33101  58805 10R  R15_2    
-        33        947 33101  58793 10L  R15_2    
-        33        948 33101  58810 10R  R15_2    
-        33        949 33101  58190 10L  R15_1    
-        33        950 33101  58257 10R  R15_1    
-        33        951 33101  58225 10L  R15_1    
-        33        952 33101  58262 10R  R15_1    
-        33        953 33101  58220 10L  R15_1    
-        33        954 33101  58252 10R  R15_1    
-        33        955 33101  58230 10L  R15_1    
-        33        956 33101  58242 10R  R15_1    
-        33        957 33101  58205 10L  R15_1    
-        33        958 33101  58237 10R  R15_1    
-        33        959 33101  58200 10L  R15_1    
-        33        960 33101  26498 10R  S06      
-        33        961 33101  26822 10L  S6_2     
-        33        962 33101  58248 10R  R15_1    
-        33        963 33101  58233 10L  R15_1    
-        33        964 33101  58816 10R  R15_2    
-        33        965 33101  58799 10L  R15_2    
-        33        966 33101  58806 10R  R15_2    
-        33        967 33101  58794 10L  R15_2    
-        33        968 33101  58811 10R  R15_2    
-        33        969 33101  58191 10L  R15_1    
-        33        970 33101  58258 10R  R15_1    
-        33        971 33101  58226 10L  R15_1    
-        33        972 33101  57598 10R  R14_2    
-        33        973 33101  58221 10L  R15_1    
-        33        974 33101  58253 10R  R15_1    
-        33        975 33101  58231 10L  R15_1    
-        33        976 33101  58243 10R  R15_1    
-        33        977 33101  58206 10L  R15_1    
-        33        978 33101  58238 10R  R15_1    
-        33        979 33101  58201 10L  R15_1    
-        33        980 33101  26832 10R  S6_2     
-        33        981 33101  33542 10L  S8_2     
-        33        982 33101  58249 10R  R15_1    
-        33        983 33101  58234 10L  R15_1    
-        33        984 33101  56626 10R  R13_3    
-        33        985 33101  58800 10L  R15_2    
-        33        986 33101  58807 10R  R15_2    
-        33        987 33101  58795 10L  R15_2    
-        33        988 33101  58812 10R  R15_2    
-        33        989 33101  58192 10L  R15_1    
-        33        990 33101  58259 10R  R15_1    
-        33        991 33101  58227 10L  R15_1    
-        33        992 33101  57599 10R  R14_2    
-        33        993 33101  58222 10L  R15_1    
-        33        994 33101  58254 10R  R15_1    
-        33        995 33101  58232 10L  R15_1    
-        33        996 33101  58244 10R  R15_1    
-        33        997 33101  58207 10L  R15_1    
-        33        998 33101  58239 10R  R15_1    
-        33        999 33101  58202 10L  R15_1    
-        33       1000 33101  52253 10R  R9_2     
-        33       1001 33101  26955 11L  S6_2     
-        33       1002 33101  57637 11R  R14_2    
-        33       1003 33101  59299 11L  R16_1    
-        33       1004 33101  58862 11R  R15_2    
-        33       1005 33101  58837 11L  R15_2    
-        33       1006 33101  58857 11R  R15_2    
-        33       1007 33101  58839 11L  R15_2    
-        33       1008 33101  58847 11R  R15_2    
-        33       1009 33101  58838 11L  R15_2    
-        33       1010 33101  58842 11R  R15_2    
-        33       1011 33101  58832 11L  R15_2    
-        33       1012 33101  58296 11R  R15_1    
-        33       1013 33101  58827 11L  R15_2    
-        33       1014 33101  58286 11R  R15_1    
-        33       1015 33101  58268 11L  R15_1    
-        33       1016 33101  58301 11R  R15_1    
-        33       1017 33101  58278 11L  R15_1    
-        33       1018 33101  58291 11R  R15_1    
-        33       1019 33101  58273 11L  R15_1    
-        33       1020 33101  58306 11R  R15_1    
-        33       1021 33101  28728 11L  P12      
-        33       1022 33101  57648 11R  R14_2    
-        33       1023 33101  59300 11L  R16_1    
-        33       1024 33101  56647 11R  R13_3    
-        33       1025 33101  58817 11L  R15_2    
-        33       1026 33101  58858 11R  R15_2    
-        33       1027 33101  58823 11L  R15_2    
-        33       1028 33101  58848 11R  R15_2    
-        33       1029 33101  58818 11L  R15_2    
-        33       1030 33101  58843 11R  R15_2    
-        33       1031 33101  58833 11L  R15_2    
-        33       1032 33101  58297 11R  R15_1    
-        33       1033 33101  58828 11L  R15_2    
-        33       1034 33101  58287 11R  R15_1    
-        33       1035 33101  58269 11L  R15_1    
-        33       1036 33101  58302 11R  R15_1    
-        33       1037 33101  58279 11L  R15_1    
-        33       1038 33101  58292 11R  R15_1    
-        33       1039 33101  58274 11L  R15_1    
-        33       1040 33101  58307 11R  R15_1    
-        33       1041 33101  28731 11L  P12      
-        33       1042 33101  57655 11R  R14_2    
-        33       1043 33101  58283 11L  R15_1    
-        33       1044 33101  58311 11R  R15_1    
-        33       1045 33101  58822 11L  R15_2    
-        33       1046 33101  58859 11R  R15_2    
-        33       1047 33101  58824 11L  R15_2    
-        33       1048 33101  58849 11R  R15_2    
-        33       1049 33101  58819 11L  R15_2    
-        33       1050 33101  58844 11R  R15_2    
-        33       1051 33101  58834 11L  R15_2    
-        33       1052 33101  58298 11R  R15_1    
-        33       1053 33101  58829 11L  R15_2    
-        33       1054 33101  58288 11R  R15_1    
-        33       1055 33101  58270 11L  R15_1    
-        33       1056 33101  58303 11R  R15_1    
-        33       1057 33101  58280 11L  R15_1    
-        33       1058 33101  58293 11R  R15_1    
-        33       1059 33101  58275 11L  R15_1    
-        33       1060 33101  58308 11R  R15_1    
-        33       1061 33101  26841 11L  S6_2     
-        33       1062 33101  57633 11R  R14_2    
-        33       1063 33101  58284 11L  R15_1    
-        33       1064 33101  58312 11R  R15_1    
-        33       1065 33101  58825 11L  R15_2    
-        33       1066 33101  58860 11R  R15_2    
-        33       1067 33101  58840 11L  R15_2    
-        33       1068 33101  58850 11R  R15_2    
-        33       1069 33101  58820 11L  R15_2    
-        33       1070 33101  58845 11R  R15_2    
-        33       1071 33101  58835 11L  R15_2    
-        33       1072 33101  58299 11R  R15_1    
-        33       1073 33101  58830 11L  R15_2    
-        33       1074 33101  58289 11R  R15_1    
-        33       1075 33101  58271 11L  R15_1    
-        33       1076 33101  58304 11R  R15_1    
-        33       1077 33101  58281 11L  R15_1    
-        33       1078 33101  58294 11R  R15_1    
-        33       1079 33101  58276 11L  R15_1    
-        33       1080 33101  58309 11R  R15_1    
-        33       1081 33101  26842 11L  S6_2     
-        33       1082 33101  57634 11R  R14_2    
-        33       1083 33101  58285 11L  R15_1    
-        33       1084 33101  58313 11R  R15_1    
-        33       1085 33101  58836 11L  R15_2    
-        33       1086 33101  58861 11R  R15_2    
-        33       1087 33101  58826 11L  R15_2    
-        33       1088 33101  58851 11R  R15_2    
-        33       1089 33101  58821 11L  R15_2    
-        33       1090 33101  58846 11R  R15_2    
-        33       1091 33101  58841 11L  R15_2    
-        33       1092 33101  58300 11R  R15_1    
-        33       1093 33101  58831 11L  R15_2    
-        33       1094 33101  58290 11R  R15_1    
-        33       1095 33101  58272 11L  R15_1    
-        33       1096 33101  58305 11R  R15_1    
-        33       1097 33101  58282 11L  R15_1    
-        33       1098 33101  58295 11R  R15_1    
-        33       1099 33101  58277 11L  R15_1    
-        33       1100 33101  58310 11R  R15_1    
-        33       1101 33101  54758 12L  R12_1    
-        33       1102 33101  58920 12R  R15_2    
-        33       1103 33101  58868 12L  R15_2    
-        33       1104 33101  58915 12R  R15_2    
-        33       1105 33101  58888 12L  R15_2    
-        33       1106 33101  58930 12R  R15_2    
-        33       1107 33101  58903 12L  R15_2    
-        33       1108 33101  58910 12R  R15_2    
-        33       1109 33101  58893 12L  R15_2    
-        33       1110 33101  57707 12R  R14_2    
-        33       1111 33101  58883 12L  R15_2    
-        33       1112 33101  58353 12R  R15_1    
-        33       1113 33101  58878 12L  R15_2    
-        33       1114 33101  58363 12R  R15_1    
-        33       1115 33101  58873 12L  R15_2    
-        33       1116 33101  58348 12R  R15_1    
-        33       1117 33101  58863 12L  R15_2    
-        33       1118 33101  58358 12R  R15_1    
-        33       1119 33101  58334 12L  R15_1    
-        33       1120 33101  57717 12R  R14_2    
-        33       1121 33101  58899 12L  R15_2    
-        33       1122 33101  58921 12R  R15_2    
-        33       1123 33101  58869 12L  R15_2    
-        33       1124 33101  58916 12R  R15_2    
-        33       1125 33101  58889 12L  R15_2    
-        33       1126 33101  58931 12R  R15_2    
-        33       1127 33101  58904 12L  R15_2    
-        33       1128 33101  58911 12R  R15_2    
-        33       1129 33101  58894 12L  R15_2    
-        33       1130 33101  57698 12R  R14_2    
-        33       1131 33101  58884 12L  R15_2    
-        33       1132 33101  57693 12R  R14_2    
-        33       1133 33101  58879 12L  R15_2    
-        33       1134 33101  58364 12R  R15_1    
-        33       1135 33101  58874 12L  R15_2    
-        33       1136 33101  58349 12R  R15_1    
-        33       1137 33101  58864 12L  R15_2    
-        33       1138 33101  58354 12R  R15_1    
-        33       1139 33101  58335 12L  R15_1    
-        33       1140 33101  57718 12R  R14_2    
-        33       1141 33101  58900 12L  R15_2    
-        33       1142 33101  58922 12R  R15_2    
-        33       1143 33101  58870 12L  R15_2    
-        33       1144 33101  58917 12R  R15_2    
-        33       1145 33101  58890 12L  R15_2    
-        33       1146 33101  58932 12R  R15_2    
-        33       1147 33101  58905 12L  R15_2    
-        33       1148 33101  58912 12R  R15_2    
-        33       1149 33101  58895 12L  R15_2    
-        33       1150 33101  58359 12R  R15_1    
-        33       1151 33101  58885 12L  R15_2    
-        33       1152 33101  58360 12R  R15_1    
-        33       1153 33101  58880 12L  R15_2    
-        33       1154 33101  58365 12R  R15_1    
-        33       1155 33101  58875 12L  R15_2    
-        33       1156 33101  58350 12R  R15_1    
-        33       1157 33101  58865 12L  R15_2    
-        33       1158 33101  58355 12R  R15_1    
-        33       1159 33101  58336 12L  R15_1    
-        33       1160 33101  57719 12R  R14_2    
-        33       1161 33101  58901 12L  R15_2    
-        33       1162 33101  58923 12R  R15_2    
-        33       1163 33101  58871 12L  R15_2    
-        33       1164 33101  58918 12R  R15_2    
-        33       1165 33101  58891 12L  R15_2    
-        33       1166 33101  58368 12R  R15_1    
-        33       1167 33101  58906 12L  R15_2    
-        33       1168 33101  58913 12R  R15_2    
-        33       1169 33101  58896 12L  R15_2    
-        33       1170 33101  57700 12R  R14_2    
-        33       1171 33101  58886 12L  R15_2    
-        33       1172 33101  58356 12R  R15_1    
-        33       1173 33101  58881 12L  R15_2    
-        33       1174 33101  58366 12R  R15_1    
-        33       1175 33101  58876 12L  R15_2    
-        33       1176 33101  58351 12R  R15_1    
-        33       1177 33101  58866 12L  R15_2    
-        33       1178 33101  58361 12R  R15_1    
-        33       1179 33101  58337 12L  R15_1    
-        33       1180 33101  56657 12R  R13_3    
-        33       1181 33101  58902 12L  R15_2    
-        33       1182 33101  58924 12R  R15_2    
-        33       1183 33101  58872 12L  R15_2    
-        33       1184 33101  58919 12R  R15_2    
-        33       1185 33101  58892 12L  R15_2    
-        33       1186 33101  58369 12R  R15_1    
-        33       1187 33101  58907 12L  R15_2    
-        33       1188 33101  58914 12R  R15_2    
-        33       1189 33101  58897 12L  R15_2    
-        33       1190 33101  57704 12R  R14_2    
-        33       1191 33101  58887 12L  R15_2    
-        33       1192 33101  58362 12R  R15_1    
-        33       1193 33101  58882 12L  R15_2    
-        33       1194 33101  58367 12R  R15_1    
-        33       1195 33101  58877 12L  R15_2    
-        33       1196 33101  58352 12R  R15_1    
-        33       1197 33101  58867 12L  R15_2    
-        33       1198 33101  58357 12R  R15_1    
-        33       1199 33101  58338 12L  R15_1    
-        33       1200 33101  54812 12R  R12_1    
-        33       1201 33101  58968 13L  R15_2    
-        33       1202 33101  58979 13R  R15_2    
-        33       1203 33101  58958 13L  R15_2    
-        33       1204 33101  58974 13R  R15_2    
-        33       1205 33101  58953 13L  R15_2    
-        33       1206 33101  58969 13R  R15_2    
-        33       1207 33101  58948 13L  R15_2    
-        33       1208 33101  58999 13R  R15_2    
-        33       1209 33101  58943 13L  R15_2    
-        33       1210 33101  58994 13R  R15_2    
-        33       1211 33101  58933 13L  R15_2    
-        33       1212 33101  58384 13R  R15_1    
-        33       1213 33101  58938 13L  R15_2    
-        33       1214 33101  58989 13R  R15_2    
-        33       1215 33101  58376 13L  R15_1    
-        33       1216 33101  58394 13R  R15_1    
-        33       1217 33101  58377 13L  R15_1    
-        33       1218 33101  58389 13R  R15_1    
-        33       1219 33101  58371 13L  R15_1    
-        33       1220 33101  57224 13R  R14_1    
-        33       1221 33101  28813 13L  P12      
-        33       1222 33101  58980 13R  R15_2    
-        33       1223 33101  58959 13L  R15_2    
-        33       1224 33101  58975 13R  R15_2    
-        33       1225 33101  58954 13L  R15_2    
-        33       1226 33101  58970 13R  R15_2    
-        33       1227 33101  58949 13L  R15_2    
-        33       1228 33101  59000 13R  R15_2    
-        33       1229 33101  58944 13L  R15_2    
-        33       1230 33101  58995 13R  R15_2    
-        33       1231 33101  58934 13L  R15_2    
-        33       1232 33101  58385 13R  R15_1    
-        33       1233 33101  58939 13L  R15_2    
-        33       1234 33101  58990 13R  R15_2    
-        33       1235 33101  58381 13L  R15_1    
-        33       1236 33101  58395 13R  R15_1    
-        33       1237 33101  58382 13L  R15_1    
-        33       1238 33101  58390 13R  R15_1    
-        33       1239 33101  58372 13L  R15_1    
-        33       1240 33101  54404 13R  R12_1    
-        33       1241 33101  28816 13L  P12      
-        33       1242 33101  58981 13R  R15_2    
-        33       1243 33101  58960 13L  R15_2    
-        33       1244 33101  58976 13R  R15_2    
-        33       1245 33101  58955 13L  R15_2    
-        33       1246 33101  58971 13R  R15_2    
-        33       1247 33101  58950 13L  R15_2    
-        33       1248 33101  57229 13R  R14_1    
-        33       1249 33101  58945 13L  R15_2    
-        33       1250 33101  58996 13R  R15_2    
-        33       1251 33101  58935 13L  R15_2    
-        33       1252 33101  58386 13R  R15_1    
-        33       1253 33101  58940 13L  R15_2    
-        33       1254 33101  58991 13R  R15_2    
-        33       1255 33101  58378 13L  R15_1    
-        33       1256 33101  58396 13R  R15_1    
-        33       1257 33101  58383 13L  R15_1    
-        33       1258 33101  58391 13R  R15_1    
-        33       1259 33101  58373 13L  R15_1    
-        33       1260 33101  54842 13R  R12_1    
-        33       1261 33101  28822 13L  P12      
-        33       1262 33101  58982 13R  R15_2    
-        33       1263 33101  58961 13L  R15_2    
-        33       1264 33101  58977 13R  R15_2    
-        33       1265 33101  58956 13L  R15_2    
-        33       1266 33101  58972 13R  R15_2    
-        33       1267 33101  58951 13L  R15_2    
-        33       1268 33101  58399 13R  R15_1    
-        33       1269 33101  58946 13L  R15_2    
-        33       1270 33101  58997 13R  R15_2    
-        33       1271 33101  58936 13L  R15_2    
-        33       1272 33101  58387 13R  R15_1    
-        33       1273 33101  58941 13L  R15_2    
-        33       1274 33101  58992 13R  R15_2    
-        33       1275 33101  58379 13L  R15_1    
-        33       1276 33101  58397 13R  R15_1    
-        33       1277 33101  56427 13L  R13_2    
-        33       1278 33101  58392 13R  R15_1    
-        33       1279 33101  58374 13L  R15_1    
-        33       1280 33101  54860 13R  R12_1    
-        33       1281 33101  28825 13L  P12      
-        33       1282 33101  58983 13R  R15_2    
-        33       1283 33101  58962 13L  R15_2    
-        33       1284 33101  58978 13R  R15_2    
-        33       1285 33101  58957 13L  R15_2    
-        33       1286 33101  58973 13R  R15_2    
-        33       1287 33101  58952 13L  R15_2    
-        33       1288 33101  58400 13R  R15_1    
-        33       1289 33101  58947 13L  R15_2    
-        33       1290 33101  58998 13R  R15_2    
-        33       1291 33101  58937 13L  R15_2    
-        33       1292 33101  58388 13R  R15_1    
-        33       1293 33101  58942 13L  R15_2    
-        33       1294 33101  58993 13R  R15_2    
-        33       1295 33101  58380 13L  R15_1    
-        33       1296 33101  58398 13R  R15_1    
-        33       1297 33101  57755 13L  R14_2    
-        33       1298 33101  58393 13R  R15_1    
-        33       1299 33101  58375 13L  R15_1    
-        33       1300 33101  49009 13R  R6_2     
-        33       1301 33101  28052 14L  S6_3b    
-        33       1302 33101  57457 14R  R14_2    
-        33       1303 33101  57452 14L  R14_2    
-        33       1304 33101  58116 14R  R15_1    
-        33       1305 33101  58091 14L  R15_1    
-        33       1306 33101  58516 14R  R15_2    
-        33       1307 33101  58476 14L  R15_2    
-        33       1308 33101  58521 14R  R15_2    
-        33       1309 33101  58481 14L  R15_2    
-        33       1310 33101  58121 14R  R15_1    
-        33       1311 33101  58486 14L  R15_2    
-        33       1312 33101  58531 14R  R15_2    
-        33       1313 33101  58491 14L  R15_2    
-        33       1314 33101  58536 14R  R15_2    
-        33       1315 33101  58496 14L  R15_2    
-        33       1316 33101  58541 14R  R15_2    
-        33       1317 33101  58501 14L  R15_2    
-        33       1318 33101  58546 14R  R15_2    
-        33       1319 33101  58506 14L  R15_2    
-        33       1320 33101  58551 14R  R15_2    
-        33       1321 33101  32369 14L  P14      
-        33       1322 33101  58097 14R  R15_1    
-        33       1323 33101  57453 14L  R14_2    
-        33       1324 33101  58117 14R  R15_1    
-        33       1325 33101  58092 14L  R15_1    
-        33       1326 33101  58517 14R  R15_2    
-        33       1327 33101  58477 14L  R15_2    
-        33       1328 33101  58522 14R  R15_2    
-        33       1329 33101  58482 14L  R15_2    
-        33       1330 33101  58514 14R  R15_2    
-        33       1331 33101  58487 14L  R15_2    
-        33       1332 33101  58532 14R  R15_2    
-        33       1333 33101  58492 14L  R15_2    
-        33       1334 33101  58537 14R  R15_2    
-        33       1335 33101  58497 14L  R15_2    
-        33       1336 33101  58542 14R  R15_2    
-        33       1337 33101  58502 14L  R15_2    
-        33       1338 33101  58547 14R  R15_2    
-        33       1339 33101  58507 14L  R15_2    
-        33       1340 33101  58552 14R  R15_2    
-        33       1341 33101  32373 14L  P14      
-        33       1342 33101  58113 14R  R15_1    
-        33       1343 33101  58087 14L  R15_1    
-        33       1344 33101  58118 14R  R15_1    
-        33       1345 33101  58094 14L  R15_1    
-        33       1346 33101  58518 14R  R15_2    
-        33       1347 33101  58478 14L  R15_2    
-        33       1348 33101  58523 14R  R15_2    
-        33       1349 33101  58483 14L  R15_2    
-        33       1350 33101  58515 14R  R15_2    
-        33       1351 33101  58488 14L  R15_2    
-        33       1352 33101  58528 14R  R15_2    
-        33       1353 33101  58493 14L  R15_2    
-        33       1354 33101  58538 14R  R15_2    
-        33       1355 33101  58498 14L  R15_2    
-        33       1356 33101  58543 14R  R15_2    
-        33       1357 33101  58503 14L  R15_2    
-        33       1358 33101  58548 14R  R15_2    
-        33       1359 33101  58508 14L  R15_2    
-        33       1360 33101  58553 14R  R15_2    
-        33       1361 33101  32376 14L  P14      
-        33       1362 33101  58114 14R  R15_1    
-        33       1363 33101  58088 14L  R15_1    
-        33       1364 33101  58119 14R  R15_1    
-        33       1365 33101  58096 14L  R15_1    
-        33       1366 33101  58519 14R  R15_2    
-        33       1367 33101  58479 14L  R15_2    
-        33       1368 33101  58524 14R  R15_2    
-        33       1369 33101  58484 14L  R15_2    
-        33       1370 33101  58526 14R  R15_2    
-        33       1371 33101  58489 14L  R15_2    
-        33       1372 33101  58529 14R  R15_2    
-        33       1373 33101  58494 14L  R15_2    
-        33       1374 33101  58539 14R  R15_2    
-        33       1375 33101  58499 14L  R15_2    
-        33       1376 33101  58544 14R  R15_2    
-        33       1377 33101  58504 14L  R15_2    
-        33       1378 33101  58549 14R  R15_2    
-        33       1379 33101  58090 14L  R15_1    
-        33       1380 33101  58533 14R  R15_2    
-        33       1381 33101  58474 14L  R15_2    
-        33       1382 33101  58115 14R  R15_1    
-        33       1383 33101  58089 14L  R15_1    
-        33       1384 33101  58120 14R  R15_1    
-        33       1385 33101  58475 14L  R15_2    
-        33       1386 33101  58520 14R  R15_2    
-        33       1387 33101  58480 14L  R15_2    
-        33       1388 33101  58525 14R  R15_2    
-        33       1389 33101  58485 14L  R15_2    
-        33       1390 33101  58527 14R  R15_2    
-        33       1391 33101  58490 14L  R15_2    
-        33       1392 33101  58530 14R  R15_2    
-        33       1393 33101  58495 14L  R15_2    
-        33       1394 33101  58540 14R  R15_2    
-        33       1395 33101  58500 14L  R15_2    
-        33       1396 33101  58545 14R  R15_2    
-        33       1397 33101  58505 14L  R15_2    
-        33       1398 33101  58550 14R  R15_2    
-        33       1399 33101  58095 14L  R15_1    
-        33       1400 33101  58535 14R  R15_2    
-        33       1401 33101  32805 15L  S3       
-        33       1402 33101  58181 15R  R15_1    
-        33       1403 33101  57522 15L  R14_2    
-        33       1404 33101  58186 15R  R15_1    
-        33       1405 33101  58126 15L  R15_1    
-        33       1406 33101  58576 15R  R15_2    
-        33       1407 33101  58131 15L  R15_1    
-        33       1408 33101  58581 15R  R15_2    
-        33       1409 33101  58556 15L  R15_2    
-        33       1410 33101  58586 15R  R15_2    
-        33       1411 33101  58566 15L  R15_2    
-        33       1412 33101  58611 15R  R15_2    
-        33       1413 33101  58571 15L  R15_2    
-        33       1414 33101  58591 15R  R15_2    
-        33       1415 33101  59191 15L  R16_1    
-        33       1416 33101  58596 15R  R15_2    
-        33       1417 33101  59196 15L  R16_1    
-        33       1418 33101  58601 15R  R15_2    
-        33       1419 33101  59201 15L  R16_1    
-        33       1420 33101  58606 15R  R15_2    
-        33       1421 33101  36385 15L  S9_1     
-        33       1422 33101  58182 15R  R15_1    
-        33       1423 33101  58122 15L  R15_1    
-        33       1424 33101  58187 15R  R15_1    
-        33       1425 33101  58127 15L  R15_1    
-        33       1426 33101  58577 15R  R15_2    
-        33       1427 33101  58132 15L  R15_1    
-        33       1428 33101  58582 15R  R15_2    
-        33       1429 33101  58557 15L  R15_2    
-        33       1430 33101  58587 15R  R15_2    
-        33       1431 33101  58562 15L  R15_2    
-        33       1432 33101  58612 15R  R15_2    
-        33       1433 33101  58567 15L  R15_2    
-        33       1434 33101  58592 15R  R15_2    
-        33       1435 33101  59192 15L  R16_1    
-        33       1436 33101  58597 15R  R15_2    
-        33       1437 33101  59197 15L  R16_1    
-        33       1438 33101  58602 15R  R15_2    
-        33       1439 33101  59202 15L  R16_1    
-        33       1440 33101  58607 15R  R15_2    
-        33       1441 33101  42220 15L  P19      
-        33       1442 33101  58183 15R  R15_1    
-        33       1443 33101  58123 15L  R15_1    
-        33       1444 33101  58167 15R  R15_1    
-        33       1445 33101  58128 15L  R15_1    
-        33       1446 33101  58573 15R  R15_2    
-        33       1447 33101  58133 15L  R15_1    
-        33       1448 33101  58583 15R  R15_2    
-        33       1449 33101  58558 15L  R15_2    
-        33       1450 33101  58588 15R  R15_2    
-        33       1451 33101  58563 15L  R15_2    
-        33       1452 33101  58578 15R  R15_2    
-        33       1453 33101  58568 15L  R15_2    
-        33       1454 33101  58593 15R  R15_2    
-        33       1455 33101  59193 15L  R16_1    
-        33       1456 33101  58598 15R  R15_2    
-        33       1457 33101  59198 15L  R16_1    
-        33       1458 33101  58603 15R  R15_2    
-        33       1459 33101  59203 15L  R16_1    
-        33       1460 33101  58608 15R  R15_2    
-        33       1461 33101  42227 15L  P19      
-        33       1462 33101  58184 15R  R15_1    
-        33       1463 33101  58124 15L  R15_1    
-        33       1464 33101  58178 15R  R15_1    
-        33       1465 33101  58129 15L  R15_1    
-        33       1466 33101  58574 15R  R15_2    
-        33       1467 33101  58555 15L  R15_2    
-        33       1468 33101  58584 15R  R15_2    
-        33       1469 33101  58559 15L  R15_2    
-        33       1470 33101  58589 15R  R15_2    
-        33       1471 33101  58564 15L  R15_2    
-        33       1472 33101  58579 15R  R15_2    
-        33       1473 33101  58569 15L  R15_2    
-        33       1474 33101  58594 15R  R15_2    
-        33       1475 33101  59194 15L  R16_1    
-        33       1476 33101  58599 15R  R15_2    
-        33       1477 33101  59199 15L  R16_1    
-        33       1478 33101  58604 15R  R15_2    
-        33       1479 33101  59204 15L  R16_1    
-        33       1480 33101  58609 15R  R15_2    
-        33       1481 33101  45715 15L  R4_1     
-        33       1482 33101  58185 15R  R15_1    
-        33       1483 33101  58125 15L  R15_1    
-        33       1484 33101  58180 15R  R15_1    
-        33       1485 33101  58130 15L  R15_1    
-        33       1486 33101  58575 15R  R15_2    
-        33       1487 33101  58561 15L  R15_2    
-        33       1488 33101  58585 15R  R15_2    
-        33       1489 33101  58560 15L  R15_2    
-        33       1490 33101  58590 15R  R15_2    
-        33       1491 33101  58565 15L  R15_2    
-        33       1492 33101  58580 15R  R15_2    
-        33       1493 33101  58570 15L  R15_2    
-        33       1494 33101  58595 15R  R15_2    
-        33       1495 33101  59195 15L  R16_1    
-        33       1496 33101  58600 15R  R15_2    
-        33       1497 33101  59200 15L  R16_1    
-        33       1498 33101  58605 15R  R15_2    
-        33       1499 33101  59205 15L  R16_1    
-        33       1500 33101  58610 15R  R15_2    
-        33       1501 33106   1041 16L  EBP08    
-        33       1502 33106   1443 16R  EBP10    
-        33       1503 33106   1374 16L  EBP10    
-        33       1504 33106   1449 16R  EBP10    
-        33       1505 33106   1379 16L  EBP10    
-        33       1506 33106   1456 16R  EBP10    
-        33       1507 33106   1384 16L  EBP10    
-        33       1508 33106   1461 16R  EBP10    
-        33       1509 33106   1389 16L  EBP10    
-        33       1510 33106   1453 16R  EBP10    
-        33       1511 33106   1342 16L  EBP10    
-        33       1512 33106   1471 16R  EBP10    
-        33       1513 33106   1372 16L  EBP10    
-        33       1514 33106   1487 16R  EBP11    
-        33       1515 33106   1476 16L  EBP11    
-        33       1516 33106   1491 16R  EBP11    
-        33       1517 33106   1481 16L  EBP11    
-        33       1518 33106   1496 16R  EBP11    
-        33       1519 33106   1486 16L  EBP11    
-        33       1520 33106   1424 16R  EBP10    
-        33       1521 33106   1058 16L  EBP08    
-        33       1522 33106   1445 16R  EBP10    
-        33       1523 33106   1375 16L  EBP10    
-        33       1524 33106   1450 16R  EBP10    
-        33       1525 33106   1380 16L  EBP10    
-        33       1526 33106   1457 16R  EBP10    
-        33       1527 33106   1385 16L  EBP10    
-        33       1528 33106   1466 16R  EBP10    
-        33       1529 33106   1390 16L  EBP10    
-        33       1530 33106   1467 16R  EBP10    
-        33       1531 33106   1359 16L  EBP10    
-        33       1532 33106   1472 16R  EBP10    
-        33       1533 33106   1395 16L  EBP10    
-        33       1534 33106   1488 16R  EBP11    
-        33       1535 33106   1477 16L  EBP11    
-        33       1536 33106   1492 16R  EBP11    
-        33       1537 33106   1482 16L  EBP11    
-        33       1538 33106   1497 16R  EBP11    
-        33       1539 33106   1627 16L  EBP12    
-        33       1540 33106   1444 16R  EBP10    
-        33       1541 33106   1085 16L  EBP08    
-        33       1542 33106   1446 16R  EBP10    
-        33       1543 33106   1376 16L  EBP10    
-        33       1544 33106   1452 16R  EBP10    
-        33       1545 33106   1381 16L  EBP10    
-        33       1546 33106   1458 16R  EBP10    
-        33       1547 33106   1386 16L  EBP10    
-        33       1548 33106   1463 16R  EBP10    
-        33       1549 33106   1391 16L  EBP10    
-        33       1550 33106   1468 16R  EBP10    
-        33       1551 33106   1369 16L  EBP10    
-        33       1552 33106   1473 16R  EBP10    
-        33       1553 33106   1396 16L  EBP10    
-        33       1554 33106   1489 16R  EBP11    
-        33       1555 33106   1478 16L  EBP11    
-        33       1556 33106   1493 16R  EBP11    
-        33       1557 33106   1483 16L  EBP11    
-        33       1558 33106   1498 16R  EBP11    
-        33       1559 33106   1628 16L  EBP12    
-        33       1560 33106   1638 16R  EBP12    
-        33       1561 33106   1099 16L  EBP08    
-        33       1562 33106   1447 16R  EBP10    
-        33       1563 33106   1377 16L  EBP10    
-        33       1564 33106   1454 16R  EBP10    
-        33       1565 33106   1382 16L  EBP10    
-        33       1566 33106   1459 16R  EBP10    
-        33       1567 33106   1387 16L  EBP10    
-        33       1568 33106   1464 16R  EBP10    
-        33       1569 33106   1392 16L  EBP10    
-        33       1570 33106   1469 16R  EBP10    
-        33       1571 33106   1370 16L  EBP10    
-        33       1572 33106   1474 16R  EBP10    
-        33       1573 33106   1397 16L  EBP10    
-        33       1574 33106   1490 16R  EBP11    
-        33       1575 33106   1479 16L  EBP11    
-        33       1576 33106   1494 16R  EBP11    
-        33       1577 33106   1484 16L  EBP11    
-        33       1578 33106   1499 16R  EBP11    
-        33       1579 33106   1630 16L  EBP12    
-        33       1580 33106    834 16R  EBP06    
-        33       1581 33106   1394 16L  EBP10    
-        33       1582 33106   1448 16R  EBP10    
-        33       1583 33106   1378 16L  EBP10    
-        33       1584 33106   1455 16R  EBP10    
-        33       1585 33106   1383 16L  EBP10    
-        33       1586 33106   1460 16R  EBP10    
-        33       1587 33106   1388 16L  EBP10    
-        33       1588 33106   1465 16R  EBP10    
-        33       1589 33106   1393 16L  EBP10    
-        33       1590 33106   1470 16R  EBP10    
-        33       1591 33106   1371 16L  EBP10    
-        33       1592 33106   1475 16R  EBP10    
-        33       1593 33106   1399 16L  EBP10    
-        33       1594 33106   1407 16R  EBP10    
-        33       1595 33106   1480 16L  EBP11    
-        33       1596 33106   1495 16R  EBP11    
-        33       1597 33106   1485 16L  EBP11    
-        33       1598 33106   1500 16R  EBP11    
-        33       1599 33106    824 16L  EBP06    
-        33       1600 33106    844 16R  EBP06    
-        33       1601 33106   1505 17L  EBP11    
-        33       1602 33106   1599 17R  EBP11    
-        33       1603 33106   1540 17L  EBP11    
-        33       1604 33106   1606 17R  EBP11    
-        33       1605 33106   1546 17L  EBP11    
-        33       1606 33106   1616 17R  EBP11    
-        33       1607 33106   1551 17L  EBP11    
-        33       1608 33106   1621 17R  EBP11    
-        33       1609 33106   1556 17L  EBP11    
-        33       1610 33106   1676 17R  EBP12    
-        33       1611 33106   1646 17L  EBP12    
-        33       1612 33106   1681 17R  EBP12    
-        33       1613 33106   1650 17L  EBP12    
-        33       1614 33106   1686 17R  EBP12    
-        33       1615 33106   1656 17L  EBP12    
-        33       1616 33106   1691 17R  EBP12    
-        33       1617 33106   1661 17L  EBP12    
-        33       1618 33106   1696 17R  EBP12    
-        33       1619 33106   1666 17L  EBP12    
-        33       1620 33106   1695 17R  EBP12    
-        33       1621 33106   1508 17L  EBP11    
-        33       1622 33106   1601 17R  EBP11    
-        33       1623 33106   1541 17L  EBP11    
-        33       1624 33106   1607 17R  EBP11    
-        33       1625 33106   1547 17L  EBP11    
-        33       1626 33106   1617 17R  EBP11    
-        33       1627 33106   1552 17L  EBP11    
-        33       1628 33106   1622 17R  EBP11    
-        33       1629 33106   1557 17L  EBP11    
-        33       1630 33106   1677 17R  EBP12    
-        33       1631 33106   1647 17L  EBP12    
-        33       1632 33106   1682 17R  EBP12    
-        33       1633 33106   1651 17L  EBP12    
-        33       1634 33106   1687 17R  EBP12    
-        33       1635 33106   1657 17L  EBP12    
-        33       1636 33106   1692 17R  EBP12    
-        33       1637 33106   1662 17L  EBP12    
-        33       1638 33106   1697 17R  EBP12    
-        33       1639 33106   1667 17L  EBP12    
-        33       1640 33106   1614 17R  EBP11    
-        33       1641 33106   1511 17L  EBP11    
-        33       1642 33106   1602 17R  EBP11    
-        33       1643 33106   1542 17L  EBP11    
-        33       1644 33106   1608 17R  EBP11    
-        33       1645 33106   1548 17L  EBP11    
-        33       1646 33106   1618 17R  EBP11    
-        33       1647 33106   1553 17L  EBP11    
-        33       1648 33106   1623 17R  EBP11    
-        33       1649 33106   1558 17L  EBP11    
-        33       1650 33106   1678 17R  EBP12    
-        33       1651 33106   1648 17L  EBP12    
-        33       1652 33106   1683 17R  EBP12    
-        33       1653 33106   1652 17L  EBP12    
-        33       1654 33106   1688 17R  EBP12    
-        33       1655 33106   1658 17L  EBP12    
-        33       1656 33106   1693 17R  EBP12    
-        33       1657 33106   1663 17L  EBP12    
-        33       1658 33106   1698 17R  EBP12    
-        33       1659 33106   1668 17L  EBP12    
-        33       1660 33106   1615 17R  EBP11    
-        33       1661 33106   1514 17L  EBP11    
-        33       1662 33106   1604 17R  EBP11    
-        33       1663 33106   1543 17L  EBP11    
-        33       1664 33106   1597 17R  EBP11    
-        33       1665 33106   1549 17L  EBP11    
-        33       1666 33106   1619 17R  EBP11    
-        33       1667 33106   1554 17L  EBP11    
-        33       1668 33106   1624 17R  EBP11    
-        33       1669 33106   1559 17L  EBP11    
-        33       1670 33106   1679 17R  EBP12    
-        33       1671 33106   1644 17L  EBP12    
-        33       1672 33106   1684 17R  EBP12    
-        33       1673 33106   1654 17L  EBP12    
-        33       1674 33106   1689 17R  EBP12    
-        33       1675 33106   1659 17L  EBP12    
-        33       1676 33106   1694 17R  EBP12    
-        33       1677 33106   1664 17L  EBP12    
-        33       1678 33106   1699 17R  EBP12    
-        33       1679 33106   1649 17L  EBP12    
-        33       1680 33106   1024 17R  EBP07    
-        33       1681 33106   1539 17L  EBP11    
-        33       1682 33106   1605 17R  EBP11    
-        33       1683 33106   1544 17L  EBP11    
-        33       1684 33106   1611 17R  EBP11    
-        33       1685 33106   1550 17L  EBP11    
-        33       1686 33106   1620 17R  EBP11    
-        33       1687 33106   1555 17L  EBP11    
-        33       1688 33106   1625 17R  EBP11    
-        33       1689 33106   1545 17L  EBP11    
-        33       1690 33106   1680 17R  EBP12    
-        33       1691 33106   1645 17L  EBP12    
-        33       1692 33106   1685 17R  EBP12    
-        33       1693 33106   1655 17L  EBP12    
-        33       1694 33106   1690 17R  EBP12    
-        33       1695 33106   1660 17L  EBP12    
-        33       1696 33106   1613 17R  EBP11    
-        33       1697 33106   1665 17L  EBP12    
-        33       1698 33106   1700 17R  EBP12    
-        33       1699 33106   1653 17L  EBP12    
-        33       1700 33106   1030 17R  EBP07    
-        34          1 33101  60301 1L   R17_1    
-        34          2 33101  60391 1R   R17_1    
-        34          3 33101  53502 1L   R11_1    
-        34          4 33101  58450 1R   R15_2    
-        34          5 33101  60306 1L   R17_1    
-        34          6 33101  60351 1R   R17_1    
-        34          7 33101  60311 1L   R17_1    
-        34          8 33101  60356 1R   R17_1    
-        34          9 33101  60316 1L   R17_1    
-        34         10 33101  60361 1R   R17_1    
-        34         11 33101  60321 1L   R17_1    
-        34         12 33101  60366 1R   R17_1    
-        34         13 33101  60326 1L   R17_1    
-        34         14 33101  60371 1R   R17_1    
-        34         15 33101  60331 1L   R17_1    
-        34         16 33101  60376 1R   R17_1    
-        34         17 33101  60336 1L   R17_1    
-        34         18 33101  60381 1R   R17_1    
-        34         19 33101  60341 1L   R17_1    
-        34         20 33101  60386 1R   R17_1    
-        34         21 33101  60302 1L   R17_1    
-        34         22 33101  60347 1R   R17_1    
-        34         23 33101  59020 1L   R16_1    
-        34         24 33101  59041 1R   R16_1    
-        34         25 33101  60307 1L   R17_1    
-        34         26 33101  60352 1R   R17_1    
-        34         27 33101  60312 1L   R17_1    
-        34         28 33101  60357 1R   R17_1    
-        34         29 33101  60317 1L   R17_1    
-        34         30 33101  60362 1R   R17_1    
-        34         31 33101  60322 1L   R17_1    
-        34         32 33101  60367 1R   R17_1    
-        34         33 33101  60327 1L   R17_1    
-        34         34 33101  60372 1R   R17_1    
-        34         35 33101  60332 1L   R17_1    
-        34         36 33101  60377 1R   R17_1    
-        34         37 33101  60337 1L   R17_1    
-        34         38 33101  60382 1R   R17_1    
-        34         39 33101  60342 1L   R17_1    
-        34         40 33101  60387 1R   R17_1    
-        34         41 33101  60303 1L   R17_1    
-        34         42 33101  60348 1R   R17_1    
-        34         43 33101  59021 1L   R16_1    
-        34         44 33101  59042 1R   R16_1    
-        34         45 33101  60308 1L   R17_1    
-        34         46 33101  60353 1R   R17_1    
-        34         47 33101  60313 1L   R17_1    
-        34         48 33101  60358 1R   R17_1    
-        34         49 33101  60318 1L   R17_1    
-        34         50 33101  60363 1R   R17_1    
-        34         51 33101  60323 1L   R17_1    
-        34         52 33101  60368 1R   R17_1    
-        34         53 33101  60328 1L   R17_1    
-        34         54 33101  60373 1R   R17_1    
-        34         55 33101  60333 1L   R17_1    
-        34         56 33101  60378 1R   R17_1    
-        34         57 33101  60338 1L   R17_1    
-        34         58 33101  60383 1R   R17_1    
-        34         59 33101  60343 1L   R17_1    
-        34         60 33101  60388 1R   R17_1    
-        34         61 33101  60304 1L   R17_1    
-        34         62 33101  60349 1R   R17_1    
-        34         63 33101  59022 1L   R16_1    
-        34         64 33101  59043 1R   R16_1    
-        34         65 33101  60309 1L   R17_1    
-        34         66 33101  60354 1R   R17_1    
-        34         67 33101  60314 1L   R17_1    
-        34         68 33101  60359 1R   R17_1    
-        34         69 33101  60319 1L   R17_1    
-        34         70 33101  60364 1R   R17_1    
-        34         71 33101  60324 1L   R17_1    
-        34         72 33101  60369 1R   R17_1    
-        34         73 33101  60329 1L   R17_1    
-        34         74 33101  60374 1R   R17_1    
-        34         75 33101  60334 1L   R17_1    
-        34         76 33101  60379 1R   R17_1    
-        34         77 33101  60339 1L   R17_1    
-        34         78 33101  60384 1R   R17_1    
-        34         79 33101  60344 1L   R17_1    
-        34         80 33101  60389 1R   R17_1    
-        34         81 33101  60305 1L   R17_1    
-        34         82 33101  60350 1R   R17_1    
-        34         83 33101  59023 1L   R16_1    
-        34         84 33101  59044 1R   R16_1    
-        34         85 33101  60310 1L   R17_1    
-        34         86 33101  60355 1R   R17_1    
-        34         87 33101  60315 1L   R17_1    
-        34         88 33101  60360 1R   R17_1    
-        34         89 33101  60320 1L   R17_1    
-        34         90 33101  60365 1R   R17_1    
-        34         91 33101  60325 1L   R17_1    
-        34         92 33101  60370 1R   R17_1    
-        34         93 33101  60330 1L   R17_1    
-        34         94 33101  60375 1R   R17_1    
-        34         95 33101  60335 1L   R17_1    
-        34         96 33101  60380 1R   R17_1    
-        34         97 33101  60340 1L   R17_1    
-        34         98 33101  60385 1R   R17_1    
-        34         99 33101  60345 1L   R17_1    
-        34        100 33101  60390 1R   R17_1    
-        34        101 33101  60721 2L   R17_2    
-        34        102 33101  60409 2R   R17_1    
-        34        103 33101  59086 2L   R16_1    
-        34        104 33101  60394 2R   R17_1    
-        34        105 33101  59085 2L   R16_1    
-        34        106 33101  60399 2R   R17_1    
-        34        107 33101  54969 2L   R12_2    
-        34        108 33101  59311 2R   R16_2    
-        34        109 33101  60716 2L   R17_2    
-        34        110 33101  60404 2R   R17_1    
-        34        111 33101  60726 2L   R17_2    
-        34        112 33101  60414 2R   R17_1    
-        34        113 33101  60731 2L   R17_2    
-        34        114 33101  60419 2R   R17_1    
-        34        115 33101  60736 2L   R17_2    
-        34        116 33101  60424 2R   R17_1    
-        34        117 33101  60741 2L   R17_2    
-        34        118 33101  60429 2R   R17_1    
-        34        119 33101  60746 2L   R17_2    
-        34        120 33101  60753 2R   R17_2    
-        34        121 33101  60722 2L   R17_2    
-        34        122 33101  60410 2R   R17_1    
-        34        123 33101  59087 2L   R16_1    
-        34        124 33101  60395 2R   R17_1    
-        34        125 33101  60712 2L   R17_2    
-        34        126 33101  60400 2R   R17_1    
-        34        127 33101  59081 2L   R16_1    
-        34        128 33101  59307 2R   R16_2    
-        34        129 33101  60717 2L   R17_2    
-        34        130 33101  60405 2R   R17_1    
-        34        131 33101  60727 2L   R17_2    
-        34        132 33101  60415 2R   R17_1    
-        34        133 33101  60732 2L   R17_2    
-        34        134 33101  60420 2R   R17_1    
-        34        135 33101  60737 2L   R17_2    
-        34        136 33101  60425 2R   R17_1    
-        34        137 33101  60742 2L   R17_2    
-        34        138 33101  60430 2R   R17_1    
-        34        139 33101  60747 2L   R17_2    
-        34        140 33101  60754 2R   R17_2    
-        34        141 33101  60723 2L   R17_2    
-        34        142 33101  60411 2R   R17_1    
-        34        143 33101  59088 2L   R16_1    
-        34        144 33101  60396 2R   R17_1    
-        34        145 33101  60713 2L   R17_2    
-        34        146 33101  60401 2R   R17_1    
-        34        147 33101  59082 2L   R16_1    
-        34        148 33101  59308 2R   R16_2    
-        34        149 33101  60718 2L   R17_2    
-        34        150 33101  60406 2R   R17_1    
-        34        151 33101  60728 2L   R17_2    
-        34        152 33101  60416 2R   R17_1    
-        34        153 33101  60733 2L   R17_2    
-        34        154 33101  60421 2R   R17_1    
-        34        155 33101  60738 2L   R17_2    
-        34        156 33101  60426 2R   R17_1    
-        34        157 33101  60743 2L   R17_2    
-        34        158 33101  60431 2R   R17_1    
-        34        159 33101  60748 2L   R17_2    
-        34        160 33101  60755 2R   R17_2    
-        34        161 33101  60724 2L   R17_2    
-        34        162 33101  60412 2R   R17_1    
-        34        163 33101  59089 2L   R16_1    
-        34        164 33101  60397 2R   R17_1    
-        34        165 33101  60714 2L   R17_2    
-        34        166 33101  60402 2R   R17_1    
-        34        167 33101  59083 2L   R16_1    
-        34        168 33101  59309 2R   R16_2    
-        34        169 33101  60719 2L   R17_2    
-        34        170 33101  60407 2R   R17_1    
-        34        171 33101  60729 2L   R17_2    
-        34        172 33101  60417 2R   R17_1    
-        34        173 33101  60735 2L   R17_2    
-        34        174 33101  60422 2R   R17_1    
-        34        175 33101  60739 2L   R17_2    
-        34        176 33101  60427 2R   R17_1    
-        34        177 33101  60744 2L   R17_2    
-        34        178 33101  60432 2R   R17_1    
-        34        179 33101  60749 2L   R17_2    
-        34        180 33101  60756 2R   R17_2    
-        34        181 33101  60725 2L   R17_2    
-        34        182 33101  60413 2R   R17_1    
-        34        183 33101  59090 2L   R16_1    
-        34        184 33101  60398 2R   R17_1    
-        34        185 33101  60715 2L   R17_2    
-        34        186 33101  60403 2R   R17_1    
-        34        187 33101  59084 2L   R16_1    
-        34        188 33101  59310 2R   R16_2    
-        34        189 33101  60720 2L   R17_2    
-        34        190 33101  60408 2R   R17_1    
-        34        191 33101  60730 2L   R17_2    
-        34        192 33101  60418 2R   R17_1    
-        34        193 33101  60711 2L   R17_2    
-        34        194 33101  60423 2R   R17_1    
-        34        195 33101  60740 2L   R17_2    
-        34        196 33101  60428 2R   R17_1    
-        34        197 33101  60745 2L   R17_2    
-        34        198 33101  59312 2R   R16_2    
-        34        199 33101  60750 2L   R17_2    
-        34        200 33101  60757 2R   R17_2    
-        34        201 33101  38979 3L   P017     
-        34        202 33101  59807 3R   R16_3    
-        34        203 33101  59325 3L   R16_2    
-        34        204 33101  59401 3R   R16_2    
-        34        205 33101  59351 3L   R16_2    
-        34        206 33101  59811 3R   R16_3    
-        34        207 33101  59356 3L   R16_2    
-        34        208 33101  60466 3R   R17_1    
-        34        209 33101  59801 3L   R16_3    
-        34        210 33101  60471 3R   R17_1    
-        34        211 33101  60436 3L   R17_1    
-        34        212 33101  60465 3R   R17_1    
-        34        213 33101  60441 3L   R17_1    
-        34        214 33101  60476 3R   R17_1    
-        34        215 33101  60446 3L   R17_1    
-        34        216 33101  60481 3R   R17_1    
-        34        217 33101  60451 3L   R17_1    
-        34        218 33101  60486 3R   R17_1    
-        34        219 33101  60456 3L   R17_1    
-        34        220 33101  60491 3R   R17_1    
-        34        221 33101  38980 3L   P017     
-        34        222 33101  59808 3R   R16_3    
-        34        223 33101  59347 3L   R16_2    
-        34        224 33101  59402 3R   R16_2    
-        34        225 33101  59352 3L   R16_2    
-        34        226 33101  59812 3R   R16_3    
-        34        227 33101  59357 3L   R16_2    
-        34        228 33101  60467 3R   R17_1    
-        34        229 33101  59802 3L   R16_3    
-        34        230 33101  60472 3R   R17_1    
-        34        231 33101  60437 3L   R17_1    
-        34        232 33101  60496 3R   R17_1    
-        34        233 33101  60442 3L   R17_1    
-        34        234 33101  60477 3R   R17_1    
-        34        235 33101  60447 3L   R17_1    
-        34        236 33101  60482 3R   R17_1    
-        34        237 33101  60452 3L   R17_1    
-        34        238 33101  60487 3R   R17_1    
-        34        239 33101  60457 3L   R17_1    
-        34        240 33101  60492 3R   R17_1    
-        34        241 33101  38981 3L   P017     
-        34        242 33101  59398 3R   R16_2    
-        34        243 33101  59348 3L   R16_2    
-        34        244 33101  59403 3R   R16_2    
-        34        245 33101  59353 3L   R16_2    
-        34        246 33101  59813 3R   R16_3    
-        34        247 33101  59358 3L   R16_2    
-        34        248 33101  60468 3R   R17_1    
-        34        249 33101  59803 3L   R16_3    
-        34        250 33101  60473 3R   R17_1    
-        34        251 33101  60438 3L   R17_1    
-        34        252 33101  60497 3R   R17_1    
-        34        253 33101  60443 3L   R17_1    
-        34        254 33101  60478 3R   R17_1    
-        34        255 33101  60448 3L   R17_1    
-        34        256 33101  60483 3R   R17_1    
-        34        257 33101  60453 3L   R17_1    
-        34        258 33101  60488 3R   R17_1    
-        34        259 33101  60434 3L   R17_1    
-        34        260 33101  60493 3R   R17_1    
-        34        261 33101  38982 3L   P017     
-        34        262 33101  59399 3R   R16_2    
-        34        263 33101  59349 3L   R16_2    
-        34        264 33101  59404 3R   R16_2    
-        34        265 33101  59354 3L   R16_2    
-        34        266 33101  59814 3R   R16_3    
-        34        267 33101  59359 3L   R16_2    
-        34        268 33101  60469 3R   R17_1    
-        34        269 33101  59804 3L   R16_3    
-        34        270 33101  60474 3R   R17_1    
-        34        271 33101  60439 3L   R17_1    
-        34        272 33101  59809 3R   R16_3    
-        34        273 33101  60444 3L   R17_1    
-        34        274 33101  60479 3R   R17_1    
-        34        275 33101  60449 3L   R17_1    
-        34        276 33101  60484 3R   R17_1    
-        34        277 33101  60454 3L   R17_1    
-        34        278 33101  60489 3R   R17_1    
-        34        279 33101  60435 3L   R17_1    
-        34        280 33101  60494 3R   R17_1    
-        34        281 33101  38983 3L   P017     
-        34        282 33101  59400 3R   R16_2    
-        34        283 33101  59350 3L   R16_2    
-        34        284 33101  59405 3R   R16_2    
-        34        285 33101  59355 3L   R16_2    
-        34        286 33101  59815 3R   R16_3    
-        34        287 33101  59331 3L   R16_2    
-        34        288 33101  60470 3R   R17_1    
-        34        289 33101  59805 3L   R16_3    
-        34        290 33101  60475 3R   R17_1    
-        34        291 33101  60440 3L   R17_1    
-        34        292 33101  59810 3R   R16_3    
-        34        293 33101  60445 3L   R17_1    
-        34        294 33101  60480 3R   R17_1    
-        34        295 33101  60450 3L   R17_1    
-        34        296 33101  60485 3R   R17_1    
-        34        297 33101  60455 3L   R17_1    
-        34        298 33101  60498 3R   R17_1    
-        34        299 33101  59806 3L   R16_3    
-        34        300 33101  60495 3R   R17_1    
-        34        301 33101  42574 4L   R1_1     
-        34        302 33101  59435 4R   R16_2    
-        34        303 33101  59414 4L   R16_2    
-        34        304 33101  59869 4R   R16_3    
-        34        305 33101  59837 4L   R16_3    
-        34        306 33101  60799 4R   R17_2    
-        34        307 33101  60759 4L   R17_2    
-        34        308 33101  60804 4R   R17_2    
-        34        309 33101  60764 4L   R17_2    
-        34        310 33101  60809 4R   R17_2    
-        34        311 33101  60769 4L   R17_2    
-        34        312 33101  60815 4R   R17_2    
-        34        313 33101  60774 4L   R17_2    
-        34        314 33101  60820 4R   R17_2    
-        34        315 33101  60779 4L   R17_2    
-        34        316 33101  60825 4R   R17_2    
-        34        317 33101  60784 4L   R17_2    
-        34        318 33101  60830 4R   R17_2    
-        34        319 33101  60789 4L   R17_2    
-        34        320 33101  60835 4R   R17_2    
-        34        321 33101  42580 4L   R1_1     
-        34        322 33101  59854 4R   R16_3    
-        34        323 33101  59833 4L   R16_3    
-        34        324 33101  59870 4R   R16_3    
-        34        325 33101  59838 4L   R16_3    
-        34        326 33101  60800 4R   R17_2    
-        34        327 33101  60760 4L   R17_2    
-        34        328 33101  60805 4R   R17_2    
-        34        329 33101  60765 4L   R17_2    
-        34        330 33101  60810 4R   R17_2    
-        34        331 33101  60770 4L   R17_2    
-        34        332 33101  60816 4R   R17_2    
-        34        333 33101  60775 4L   R17_2    
-        34        334 33101  60821 4R   R17_2    
-        34        335 33101  60780 4L   R17_2    
-        34        336 33101  60826 4R   R17_2    
-        34        337 33101  60785 4L   R17_2    
-        34        338 33101  60831 4R   R17_2    
-        34        339 33101  60790 4L   R17_2    
-        34        340 33101  60836 4R   R17_2    
-        34        341 33101  42590 4L   R1_1     
-        34        342 33101  59859 4R   R16_3    
-        34        343 33101  59834 4L   R16_3    
-        34        344 33101  59871 4R   R16_3    
-        34        345 33101  59839 4L   R16_3    
-        34        346 33101  60801 4R   R17_2    
-        34        347 33101  60761 4L   R17_2    
-        34        348 33101  60806 4R   R17_2    
-        34        349 33101  60766 4L   R17_2    
-        34        350 33101  60811 4R   R17_2    
-        34        351 33101  60771 4L   R17_2    
-        34        352 33101  60817 4R   R17_2    
-        34        353 33101  60776 4L   R17_2    
-        34        354 33101  60822 4R   R17_2    
-        34        355 33101  60781 4L   R17_2    
-        34        356 33101  60827 4R   R17_2    
-        34        357 33101  60786 4L   R17_2    
-        34        358 33101  60832 4R   R17_2    
-        34        359 33101  60792 4L   R17_2    
-        34        360 33101  60837 4R   R17_2    
-        34        361 33101  42593 4L   R1_1     
-        34        362 33101  59867 4R   R16_3    
-        34        363 33101  59835 4L   R16_3    
-        34        364 33101  59872 4R   R16_3    
-        34        365 33101  59840 4L   R16_3    
-        34        366 33101  60802 4R   R17_2    
-        34        367 33101  60762 4L   R17_2    
-        34        368 33101  60807 4R   R17_2    
-        34        369 33101  60767 4L   R17_2    
-        34        370 33101  60812 4R   R17_2    
-        34        371 33101  60772 4L   R17_2    
-        34        372 33101  60818 4R   R17_2    
-        34        373 33101  60777 4L   R17_2    
-        34        374 33101  60823 4R   R17_2    
-        34        375 33101  60782 4L   R17_2    
-        34        376 33101  60828 4R   R17_2    
-        34        377 33101  60787 4L   R17_2    
-        34        378 33101  60833 4R   R17_2    
-        34        379 33101  60793 4L   R17_2    
-        34        380 33101  39089 4R   P017     
-        34        381 33101  42594 4L   R1_1     
-        34        382 33101  59868 4R   R16_3    
-        34        383 33101  59836 4L   R16_3    
-        34        384 33101  59873 4R   R16_3    
-        34        385 33101  59876 4L   R16_3    
-        34        386 33101  60803 4R   R17_2    
-        34        387 33101  60763 4L   R17_2    
-        34        388 33101  60808 4R   R17_2    
-        34        389 33101  60768 4L   R17_2    
-        34        390 33101  60813 4R   R17_2    
-        34        391 33101  60773 4L   R17_2    
-        34        392 33101  60819 4R   R17_2    
-        34        393 33101  60778 4L   R17_2    
-        34        394 33101  60824 4R   R17_2    
-        34        395 33101  60783 4L   R17_2    
-        34        396 33101  60829 4R   R17_2    
-        34        397 33101  60788 4L   R17_2    
-        34        398 33101  60834 4R   R17_2    
-        34        399 33101  60794 4L   R17_2    
-        34        400 33101  39090 4R   P017     
-        34        401 33101  59156 5L   R16_1    
-        34        402 33101  59186 5R   R16_1    
-        34        403 33101  60841 5L   R17_2    
-        34        404 33101  59436 5R   R16_2    
-        34        405 33101  59155 5L   R16_1    
-        34        406 33101  60851 5R   R17_2    
-        34        407 33101  61021 5L   R17_3    
-        34        408 33101  60856 5R   R17_2    
-        34        409 33101  61026 5L   R17_3    
-        34        410 33101  60861 5R   R17_2    
-        34        411 33101  61031 5L   R17_3    
-        34        412 33101  60866 5R   R17_2    
-        34        413 33101  61036 5L   R17_3    
-        34        414 33101  60871 5R   R17_2    
-        34        415 33101  61041 5L   R17_3    
-        34        416 33101  60876 5R   R17_2    
-        34        417 33101  61046 5L   R17_3    
-        34        418 33101  60881 5R   R17_2    
-        34        419 33101  61051 5L   R17_3    
-        34        420 33101  60886 5R   R17_2    
-        34        421 33101  59157 5L   R16_1    
-        34        422 33101  59187 5R   R16_1    
-        34        423 33101  60842 5L   R17_2    
-        34        424 33101  59437 5R   R16_2    
-        34        425 33101  59161 5L   R16_1    
-        34        426 33101  60852 5R   R17_2    
-        34        427 33101  61022 5L   R17_3    
-        34        428 33101  60857 5R   R17_2    
-        34        429 33101  61027 5L   R17_3    
-        34        430 33101  60862 5R   R17_2    
-        34        431 33101  61032 5L   R17_3    
-        34        432 33101  60867 5R   R17_2    
-        34        433 33101  61037 5L   R17_3    
-        34        434 33101  60872 5R   R17_2    
-        34        435 33101  61042 5L   R17_3    
-        34        436 33101  60877 5R   R17_2    
-        34        437 33101  61047 5L   R17_3    
-        34        438 33101  60882 5R   R17_2    
-        34        439 33101  61052 5L   R17_3    
-        34        440 33101  60887 5R   R17_2    
-        34        441 33101  59158 5L   R16_1    
-        34        442 33101  59188 5R   R16_1    
-        34        443 33101  60843 5L   R17_2    
-        34        444 33101  59438 5R   R16_2    
-        34        445 33101  60840 5L   R17_2    
-        34        446 33101  60853 5R   R17_2    
-        34        447 33101  61023 5L   R17_3    
-        34        448 33101  60858 5R   R17_2    
-        34        449 33101  61028 5L   R17_3    
-        34        450 33101  60863 5R   R17_2    
-        34        451 33101  61033 5L   R17_3    
-        34        452 33101  60868 5R   R17_2    
-        34        453 33101  61038 5L   R17_3    
-        34        454 33101  60873 5R   R17_2    
-        34        455 33101  61043 5L   R17_3    
-        34        456 33101  60878 5R   R17_2    
-        34        457 33101  61048 5L   R17_3    
-        34        458 33101  60883 5R   R17_2    
-        34        459 33101  61053 5L   R17_3    
-        34        460 33101  60888 5R   R17_2    
-        34        461 33101  59159 5L   R16_1    
-        34        462 33101  59189 5R   R16_1    
-        34        463 33101  60844 5L   R17_2    
-        34        464 33101  59439 5R   R16_2    
-        34        465 33101  60846 5L   R17_2    
-        34        466 33101  60854 5R   R17_2    
-        34        467 33101  61024 5L   R17_3    
-        34        468 33101  60859 5R   R17_2    
-        34        469 33101  61029 5L   R17_3    
-        34        470 33101  60864 5R   R17_2    
-        34        471 33101  61034 5L   R17_3    
-        34        472 33101  60869 5R   R17_2    
-        34        473 33101  61039 5L   R17_3    
-        34        474 33101  60874 5R   R17_2    
-        34        475 33101  61044 5L   R17_3    
-        34        476 33101  60879 5R   R17_2    
-        34        477 33101  61049 5L   R17_3    
-        34        478 33101  60884 5R   R17_2    
-        34        479 33101  61054 5L   R17_3    
-        34        480 33101  60849 5R   R17_2    
-        34        481 33101  59160 5L   R16_1    
-        34        482 33101  59190 5R   R16_1    
-        34        483 33101  60845 5L   R17_2    
-        34        484 33101  60848 5R   R17_2    
-        34        485 33101  61019 5L   R17_3    
-        34        486 33101  60855 5R   R17_2    
-        34        487 33101  61025 5L   R17_3    
-        34        488 33101  60860 5R   R17_2    
-        34        489 33101  61030 5L   R17_3    
-        34        490 33101  60865 5R   R17_2    
-        34        491 33101  61035 5L   R17_3    
-        34        492 33101  60870 5R   R17_2    
-        34        493 33101  61040 5L   R17_3    
-        34        494 33101  60875 5R   R17_2    
-        34        495 33101  61045 5L   R17_3    
-        34        496 33101  60880 5R   R17_2    
-        34        497 33101  61050 5L   R17_3    
-        34        498 33101  60885 5R   R17_2    
-        34        499 33101  61020 5L   R17_3    
-        34        500 33101  60850 5R   R17_2    
-        34        501 33101  60599 6L   R17_1    
-        34        502 33101  60638 6R   R17_1    
-        34        503 33101  60594 6L   R17_1    
-        34        504 33101  60633 6R   R17_1    
-        34        505 33101  60614 6L   R17_1    
-        34        506 33101  60623 6R   R17_1    
-        34        507 33101  60609 6L   R17_1    
-        34        508 33101  60618 6R   R17_1    
-        34        509 33101  60604 6L   R17_1    
-        34        510 33101  60643 6R   R17_1    
-        34        511 33101  59948 6L   R16_3    
-        34        512 33101  59956 6R   R16_3    
-        34        513 33101  59938 6L   R16_3    
-        34        514 33101  59951 6R   R16_3    
-        34        515 33101  59943 6L   R16_3    
-        34        516 33101  59961 6R   R16_3    
-        34        517 33101  59510 6L   R16_2    
-        34        518 33101  59259 6R   R16_1    
-        34        519 33101  59505 6L   R16_2    
-        34        520 33101  59515 6R   R16_2    
-        34        521 33101  60600 6L   R17_1    
-        34        522 33101  60639 6R   R17_1    
-        34        523 33101  60595 6L   R17_1    
-        34        524 33101  60634 6R   R17_1    
-        34        525 33101  60615 6L   R17_1    
-        34        526 33101  60624 6R   R17_1    
-        34        527 33101  60610 6L   R17_1    
-        34        528 33101  60619 6R   R17_1    
-        34        529 33101  60605 6L   R17_1    
-        34        530 33101  60644 6R   R17_1    
-        34        531 33101  59949 6L   R16_3    
-        34        532 33101  59957 6R   R16_3    
-        34        533 33101  59939 6L   R16_3    
-        34        534 33101  59952 6R   R16_3    
-        34        535 33101  59944 6L   R16_3    
-        34        536 33101  59962 6R   R16_3    
-        34        537 33101  59511 6L   R16_2    
-        34        538 33101  59260 6R   R16_1    
-        34        539 33101  59506 6L   R16_2    
-        34        540 33101  59516 6R   R16_2    
-        34        541 33101  60601 6L   R17_1    
-        34        542 33101  60640 6R   R17_1    
-        34        543 33101  60596 6L   R17_1    
-        34        544 33101  60635 6R   R17_1    
-        34        545 33101  60616 6L   R17_1    
-        34        546 33101  60625 6R   R17_1    
-        34        547 33101  60611 6L   R17_1    
-        34        548 33101  60620 6R   R17_1    
-        34        549 33101  60606 6L   R17_1    
-        34        550 33101  60645 6R   R17_1    
-        34        551 33101  59241 6L   R16_1    
-        34        552 33101  59958 6R   R16_3    
-        34        553 33101  59940 6L   R16_3    
-        34        554 33101  59953 6R   R16_3    
-        34        555 33101  59945 6L   R16_3    
-        34        556 33101  59963 6R   R16_3    
-        34        557 33101  59512 6L   R16_2    
-        34        558 33101  59261 6R   R16_1    
-        34        559 33101  59507 6L   R16_2    
-        34        560 33101  59517 6R   R16_2    
-        34        561 33101  60602 6L   R17_1    
-        34        562 33101  60641 6R   R17_1    
-        34        563 33101  60597 6L   R17_1    
-        34        564 33101  60636 6R   R17_1    
-        34        565 33101  60617 6L   R17_1    
-        34        566 33101  60626 6R   R17_1    
-        34        567 33101  60612 6L   R17_1    
-        34        568 33101  60621 6R   R17_1    
-        34        569 33101  60607 6L   R17_1    
-        34        570 33101  60646 6R   R17_1    
-        34        571 33101  59242 6L   R16_1    
-        34        572 33101  59959 6R   R16_3    
-        34        573 33101  59941 6L   R16_3    
-        34        574 33101  59954 6R   R16_3    
-        34        575 33101  59946 6L   R16_3    
-        34        576 33101  59270 6R   R16_1    
-        34        577 33101  59513 6L   R16_2    
-        34        578 33101  59262 6R   R16_1    
-        34        579 33101  59508 6L   R16_2    
-        34        580 33101  59518 6R   R16_2    
-        34        581 33101  60603 6L   R17_1    
-        34        582 33101  60642 6R   R17_1    
-        34        583 33101  60598 6L   R17_1    
-        34        584 33101  60637 6R   R17_1    
-        34        585 33101  59950 6L   R16_3    
-        34        586 33101  60627 6R   R17_1    
-        34        587 33101  60613 6L   R17_1    
-        34        588 33101  60622 6R   R17_1    
-        34        589 33101  60608 6L   R17_1    
-        34        590 33101  60647 6R   R17_1    
-        34        591 33101  59243 6L   R16_1    
-        34        592 33101  59960 6R   R16_3    
-        34        593 33101  59942 6L   R16_3    
-        34        594 33101  59955 6R   R16_3    
-        34        595 33101  59947 6L   R16_3    
-        34        596 33101  56135 6R   R13_2    
-        34        597 33101  59514 6L   R16_2    
-        34        598 33101  59263 6R   R16_1    
-        34        599 33101  59509 6L   R16_2    
-        34        600 33101  59269 6R   R16_1    
-        34        601 33101  61204 7L   R17_3    
-        34        602 33101  60910 7R   R17_2    
-        34        603 33101  61194 7L   R17_3    
-        34        604 33101  60900 7R   R17_2    
-        34        605 33101  61199 7L   R17_3    
-        34        606 33101  60905 7R   R17_2    
-        34        607 33101  61189 7L   R17_3    
-        34        608 33101  60895 7R   R17_2    
-        34        609 33101  59974 7L   R16_3    
-        34        610 33101  59979 7R   R16_3    
-        34        611 33101  60890 7L   R17_2    
-        34        612 33101  59984 7R   R16_3    
-        34        613 33101  59969 7L   R16_3    
-        34        614 33101  59994 7R   R16_3    
-        34        615 33101  59964 7L   R16_3    
-        34        616 33101  59989 7R   R16_3    
-        34        617 33101  59544 7L   R16_2    
-        34        618 33101  59557 7R   R16_2    
-        34        619 33101  59539 7L   R16_2    
-        34        620 33101  33016 7R   S8_1     
-        34        621 33101  61205 7L   R17_3    
-        34        622 33101  60911 7R   R17_2    
-        34        623 33101  61195 7L   R17_3    
-        34        624 33101  60901 7R   R17_2    
-        34        625 33101  61200 7L   R17_3    
-        34        626 33101  60906 7R   R17_2    
-        34        627 33101  61190 7L   R17_3    
-        34        628 33101  60896 7R   R17_2    
-        34        629 33101  59975 7L   R16_3    
-        34        630 33101  59980 7R   R16_3    
-        34        631 33101  60891 7L   R17_2    
-        34        632 33101  59985 7R   R16_3    
-        34        633 33101  59970 7L   R16_3    
-        34        634 33101  59995 7R   R16_3    
-        34        635 33101  59965 7L   R16_3    
-        34        636 33101  59990 7R   R16_3    
-        34        637 33101  59545 7L   R16_2    
-        34        638 33101  59558 7R   R16_2    
-        34        639 33101  59540 7L   R16_2    
-        34        640 33101  34435 7R   S8_4     
-        34        641 33101  61206 7L   R17_3    
-        34        642 33101  60912 7R   R17_2    
-        34        643 33101  61196 7L   R17_3    
-        34        644 33101  60902 7R   R17_2    
-        34        645 33101  61201 7L   R17_3    
-        34        646 33101  60907 7R   R17_2    
-        34        647 33101  61191 7L   R17_3    
-        34        648 33101  60897 7R   R17_2    
-        34        649 33101  59976 7L   R16_3    
-        34        650 33101  59981 7R   R16_3    
-        34        651 33101  60892 7L   R17_2    
-        34        652 33101  59986 7R   R16_3    
-        34        653 33101  59971 7L   R16_3    
-        34        654 33101  59996 7R   R16_3    
-        34        655 33101  59966 7L   R16_3    
-        34        656 33101  59991 7R   R16_3    
-        34        657 33101  59546 7L   R16_2    
-        34        658 33101  59559 7R   R16_2    
-        34        659 33101  59541 7L   R16_2    
-        34        660 33101  35661 7R   P15_1    
-        34        661 33101  61207 7L   R17_3    
-        34        662 33101  60913 7R   R17_2    
-        34        663 33101  61197 7L   R17_3    
-        34        664 33101  60903 7R   R17_2    
-        34        665 33101  61202 7L   R17_3    
-        34        666 33101  60908 7R   R17_2    
-        34        667 33101  61192 7L   R17_3    
-        34        668 33101  60898 7R   R17_2    
-        34        669 33101  59977 7L   R16_3    
-        34        670 33101  59982 7R   R16_3    
-        34        671 33101  60893 7L   R17_2    
-        34        672 33101  59987 7R   R16_3    
-        34        673 33101  59972 7L   R16_3    
-        34        674 33101  59997 7R   R16_3    
-        34        675 33101  59967 7L   R16_3    
-        34        676 33101  59992 7R   R16_3    
-        34        677 33101  59271 7L   R16_1    
-        34        678 33101  59560 7R   R16_2    
-        34        679 33101  59542 7L   R16_2    
-        34        680 33101  31590 7R   S7_4     
-        34        681 33101  61208 7L   R17_3    
-        34        682 33101  60914 7R   R17_2    
-        34        683 33101  61198 7L   R17_3    
-        34        684 33101  60904 7R   R17_2    
-        34        685 33101  61203 7L   R17_3    
-        34        686 33101  60909 7R   R17_2    
-        34        687 33101  61193 7L   R17_3    
-        34        688 33101  60899 7R   R17_2    
-        34        689 33101  59978 7L   R16_3    
-        34        690 33101  59983 7R   R16_3    
-        34        691 33101  60894 7L   R17_2    
-        34        692 33101  59988 7R   R16_3    
-        34        693 33101  59973 7L   R16_3    
-        34        694 33101  59998 7R   R16_3    
-        34        695 33101  59968 7L   R16_3    
-        34        696 33101  59993 7R   R16_3    
-        34        697 33101  59272 7L   R16_1    
-        34        698 33101  59561 7R   R16_2    
-        34        699 33101  59543 7L   R16_2    
-        34        700 33101  31591 7R   S7_4     
-        34        701 33101  61229 8L   R17_3    
-        34        702 33101  60939 8R   R17_2    
-        34        703 33101  61224 8L   R17_3    
-        34        704 33101  60919 8R   R17_2    
-        34        705 33101  61219 8L   R17_3    
-        34        706 33101  60929 8R   R17_2    
-        34        707 33101  61214 8L   R17_3    
-        34        708 33101  60924 8R   R17_2    
-        34        709 33101  60915 8L   R17_2    
-        34        710 33101  59639 8R   R16_2    
-        34        711 33101  60009 8L   R16_3    
-        34        712 33101  59629 8R   R16_2    
-        34        713 33101  60004 8L   R16_3    
-        34        714 33101  59634 8R   R16_2    
-        34        715 33101  59999 8L   R16_3    
-        34        716 33101  59624 8R   R16_2    
-        34        717 33101  59590 8L   R16_2    
-        34        718 33101  59619 8R   R16_2    
-        34        719 33101  59585 8L   R16_2    
-        34        720 33101  59614 8R   R16_2    
-        34        721 33101  61230 8L   R17_3    
-        34        722 33101  60940 8R   R17_2    
-        34        723 33101  61225 8L   R17_3    
-        34        724 33101  60920 8R   R17_2    
-        34        725 33101  61220 8L   R17_3    
-        34        726 33101  60930 8R   R17_2    
-        34        727 33101  61215 8L   R17_3    
-        34        728 33101  60925 8R   R17_2    
-        34        729 33101  60916 8L   R17_2    
-        34        730 33101  59640 8R   R16_2    
-        34        731 33101  60010 8L   R16_3    
-        34        732 33101  59630 8R   R16_2    
-        34        733 33101  60005 8L   R16_3    
-        34        734 33101  59635 8R   R16_2    
-        34        735 33101  6   8L   R16_3    
-        34        736 33101  59625 8R   R16_2    
-        34        737 33101  59591 8L   R16_2    
-        34        738 33101  59620 8R   R16_2    
-        34        739 33101  59586 8L   R16_2    
-        34        740 33101  59615 8R   R16_2    
-        34        741 33101  61231 8L   R17_3    
-        34        742 33101  60941 8R   R17_2    
-        34        743 33101  61226 8L   R17_3    
-        34        744 33101  60921 8R   R17_2    
-        34        745 33101  61221 8L   R17_3    
-        34        746 33101  60931 8R   R17_2    
-        34        747 33101  61216 8L   R17_3    
-        34        748 33101  60926 8R   R17_2    
-        34        749 33101  60917 8L   R17_2    
-        34        750 33101  59641 8R   R16_2    
-        34        751 33101  60011 8L   R16_3    
-        34        752 33101  59631 8R   R16_2    
-        34        753 33101  60006 8L   R16_3    
-        34        754 33101  59636 8R   R16_2    
-        34        755 33101  60001 8L   R16_3    
-        34        756 33101  59626 8R   R16_2    
-        34        757 33101  59592 8L   R16_2    
-        34        758 33101  59621 8R   R16_2    
-        34        759 33101  59587 8L   R16_2    
-        34        760 33101  59616 8R   R16_2    
-        34        761 33101  61232 8L   R17_3    
-        34        762 33101  60942 8R   R17_2    
-        34        763 33101  61227 8L   R17_3    
-        34        764 33101  60922 8R   R17_2    
-        34        765 33101  61222 8L   R17_3    
-        34        766 33101  60932 8R   R17_2    
-        34        767 33101  61217 8L   R17_3    
-        34        768 33101  60927 8R   R17_2    
-        34        769 33101  60918 8L   R17_2    
-        34        770 33101  59642 8R   R16_2    
-        34        771 33101  60012 8L   R16_3    
-        34        772 33101  59632 8R   R16_2    
-        34        773 33101  60007 8L   R16_3    
-        34        774 33101  59637 8R   R16_2    
-        34        775 33101  60002 8L   R16_3    
-        34        776 33101  59627 8R   R16_2    
-        34        777 33101  59593 8L   R16_2    
-        34        778 33101  59622 8R   R16_2    
-        34        779 33101  59588 8L   R16_2    
-        34        780 33101  59617 8R   R16_2    
-        34        781 33101  61233 8L   R17_3    
-        34        782 33101  60943 8R   R17_2    
-        34        783 33101  61228 8L   R17_3    
-        34        784 33101  60923 8R   R17_2    
-        34        785 33101  61223 8L   R17_3    
-        34        786 33101  60933 8R   R17_2    
-        34        787 33101  61218 8L   R17_3    
-        34        788 33101  60928 8R   R17_2    
-        34        789 33101  60014 8L   R16_3    
-        34        790 30301    223 8R   B03      
-        34        791 33101  60013 8L   R16_3    
-        34        792 33101  59633 8R   R16_2    
-        34        793 33101  60008 8L   R16_3    
-        34        794 33101  59638 8R   R16_2    
-        34        795 33101  60003 8L   R16_3    
-        34        796 33101  59628 8R   R16_2    
-        34        797 33101  59594 8L   R16_2    
-        34        798 33101  59623 8R   R16_2    
-        34        799 33101  59589 8L   R16_2    
-        34        800 33101  59618 8R   R16_2    
-        34        801 33101  61259 9L   R17_3    
-        34        802 33101  61277 9R   R17_3    
-        34        803 33101  61254 9L   R17_3    
-        34        804 33101  61272 9R   R17_3    
-        34        805 33101  61244 9L   R17_3    
-        34        806 33101  61267 9R   R17_3    
-        34        807 33101  61239 9L   R17_3    
-        34        808 33101  61262 9R   R17_3    
-        34        809 33101  60944 9L   R17_2    
-        34        810 33101  60047 9R   R16_3    
-        34        811 33101  60020 9L   R16_3    
-        34        812 33101  60042 9R   R16_3    
-        34        813 33101  60015 9L   R16_3    
-        34        814 33101  60037 9R   R16_3    
-        34        815 33101  60025 9L   R16_3    
-        34        816 33101  60032 9R   R16_3    
-        34        817 33101  59663 9L   R16_2    
-        34        818 33101  59673 9R   R16_2    
-        34        819 33101  59643 9L   R16_2    
-        34        820 33101  59668 9R   R16_2    
-        34        821 33101  61260 9L   R17_3    
-        34        822 33101  61278 9R   R17_3    
-        34        823 33101  61249 9L   R17_3    
-        34        824 33101  61273 9R   R17_3    
-        34        825 33101  61245 9L   R17_3    
-        34        826 33101  61268 9R   R17_3    
-        34        827 33101  61240 9L   R17_3    
-        34        828 33101  61263 9R   R17_3    
-        34        829 33101  60945 9L   R17_2    
-        34        830 33101  60048 9R   R16_3    
-        34        831 33101  60021 9L   R16_3    
-        34        832 33101  60043 9R   R16_3    
-        34        833 33101  60016 9L   R16_3    
-        34        834 33101  60038 9R   R16_3    
-        34        835 33101  60026 9L   R16_3    
-        34        836 33101  60033 9R   R16_3    
-        34        837 33101  59664 9L   R16_2    
-        34        838 33101  59674 9R   R16_2    
-        34        839 33101  59644 9L   R16_2    
-        34        840 33101  59669 9R   R16_2    
-        34        841 33101  61261 9L   R17_3    
-        34        842 33101  61279 9R   R17_3    
-        34        843 33101  61256 9L   R17_3    
-        34        844 33101  61274 9R   R17_3    
-        34        845 33101  61246 9L   R17_3    
-        34        846 33101  61269 9R   R17_3    
-        34        847 33101  61241 9L   R17_3    
-        34        848 33101  61264 9R   R17_3    
-        34        849 33101  60946 9L   R17_2    
-        34        850 33101  60049 9R   R16_3    
-        34        851 33101  60022 9L   R16_3    
-        34        852 33101  60044 9R   R16_3    
-        34        853 33101  60017 9L   R16_3    
-        34        854 33101  60039 9R   R16_3    
-        34        855 33101  60027 9L   R16_3    
-        34        856 33101  60034 9R   R16_3    
-        34        857 33101  59665 9L   R16_2    
-        34        858 33101  59675 9R   R16_2    
-        34        859 33101  59645 9L   R16_2    
-        34        860 33101  59670 9R   R16_2    
-        34        861 33101  60031 9L   R16_3    
-        34        862 33101  61280 9R   R17_3    
-        34        863 33101  61257 9L   R17_3    
-        34        864 33101  61275 9R   R17_3    
-        34        865 33101  61247 9L   R17_3    
-        34        866 33101  61270 9R   R17_3    
-        34        867 33101  61242 9L   R17_3    
-        34        868 33101  61265 9R   R17_3    
-        34        869 33101  60947 9L   R17_2    
-        34        870 33101  60050 9R   R16_3    
-        34        871 33101  60023 9L   R16_3    
-        34        872 33101  60045 9R   R16_3    
-        34        873 33101  60018 9L   R16_3    
-        34        874 33101  60040 9R   R16_3    
-        34        875 33101  60028 9L   R16_3    
-        34        876 33101  60035 9R   R16_3    
-        34        877 33101  59666 9L   R16_2    
-        34        878 33101  59676 9R   R16_2    
-        34        879 33101  59646 9L   R16_2    
-        34        880 33101  59671 9R   R16_2    
-        34        881 33101  58751 9L   R15_2    
-        34        882 33101  61281 9R   R17_3    
-        34        883 33101  61258 9L   R17_3    
-        34        884 33101  61276 9R   R17_3    
-        34        885 33101  61248 9L   R17_3    
-        34        886 33101  61271 9R   R17_3    
-        34        887 33101  61243 9L   R17_3    
-        34        888 33101  61266 9R   R17_3    
-        34        889 33101  60030 9L   R16_3    
-        34        890 33101  59298 9R   R16_1    
-        34        891 33101  60024 9L   R16_3    
-        34        892 33101  60046 9R   R16_3    
-        34        893 33101  60019 9L   R16_3    
-        34        894 33101  60041 9R   R16_3    
-        34        895 33101  60029 9L   R16_3    
-        34        896 33101  60036 9R   R16_3    
-        34        897 33101  59667 9L   R16_2    
-        34        898 33101  59677 9R   R16_2    
-        34        899 33101  59647 9L   R16_2    
-        34        900 33101  59672 9R   R16_2    
-        34        901 33101  26823 10L  S6_2     
-        34        902 33101  60125 10R  R16_3    
-        34        903 33101  60071 10L  R16_3    
-        34        904 33101  60120 10R  R16_3    
-        34        905 33101  60066 10L  R16_3    
-        34        906 33101  60115 10R  R16_3    
-        34        907 33101  60056 10L  R16_3    
-        34        908 33101  60110 10R  R16_3    
-        34        909 33101  60051 10L  R16_3    
-        34        910 33101  60100 10R  R16_3    
-        34        911 33101  60081 10L  R16_3    
-        34        912 33101  60095 10R  R16_3    
-        34        913 33101  60076 10L  R16_3    
-        34        914 33101  60090 10R  R16_3    
-        34        915 33101  59698 10L  R16_2    
-        34        916 33101  59711 10R  R16_2    
-        34        917 33101  60086 10L  R16_3    
-        34        918 33101  59706 10R  R16_2    
-        34        919 33101  59693 10L  R16_2    
-        34        920 33101  57597 10R  R14_2    
-        34        921 33101  26824 10L  S6_2     
-        34        922 33101  60126 10R  R16_3    
-        34        923 33101  60072 10L  R16_3    
-        34        924 33101  60121 10R  R16_3    
-        34        925 33101  60067 10L  R16_3    
-        34        926 33101  60116 10R  R16_3    
-        34        927 33101  60057 10L  R16_3    
-        34        928 33101  60111 10R  R16_3    
-        34        929 33101  60052 10L  R16_3    
-        34        930 33101  60101 10R  R16_3    
-        34        931 33101  60082 10L  R16_3    
-        34        932 33101  60096 10R  R16_3    
-        34        933 33101  60077 10L  R16_3    
-        34        934 33101  60091 10R  R16_3    
-        34        935 33101  59699 10L  R16_2    
-        34        936 33101  59712 10R  R16_2    
-        34        937 33101  60087 10L  R16_3    
-        34        938 33101  59707 10R  R16_2    
-        34        939 33101  59694 10L  R16_2    
-        34        940 33101  26831 10R  S6_2     
-        34        941 33101  26825 10L  S6_2     
-        34        942 33101  60127 10R  R16_3    
-        34        943 33101  60073 10L  R16_3    
-        34        944 33101  60122 10R  R16_3    
-        34        945 33101  60068 10L  R16_3    
-        34        946 33101  60117 10R  R16_3    
-        34        947 33101  60058 10L  R16_3    
-        34        948 33101  60112 10R  R16_3    
-        34        949 33101  60053 10L  R16_3    
-        34        950 33101  60102 10R  R16_3    
-        34        951 33101  60083 10L  R16_3    
-        34        952 33101  60097 10R  R16_3    
-        34        953 33101  60078 10L  R16_3    
-        34        954 33101  60092 10R  R16_3    
-        34        955 33101  59700 10L  R16_2    
-        34        956 33101  59713 10R  R16_2    
-        34        957 33101  59703 10L  R16_2    
-        34        958 33101  59708 10R  R16_2    
-        34        959 33101  59695 10L  R16_2    
-        34        960 33101  26833 10R  S6_2     
-        34        961 33101  26826 10L  S6_2     
-        34        962 33101  60128 10R  R16_3    
-        34        963 33101  60074 10L  R16_3    
-        34        964 33101  60123 10R  R16_3    
-        34        965 33101  60069 10L  R16_3    
-        34        966 33101  60118 10R  R16_3    
-        34        967 33101  60059 10L  R16_3    
-        34        968 33101  60113 10R  R16_3    
-        34        969 33101  60054 10L  R16_3    
-        34        970 33101  60103 10R  R16_3    
-        34        971 33101  60084 10L  R16_3    
-        34        972 33101  60098 10R  R16_3    
-        34        973 33101  60079 10L  R16_3    
-        34        974 33101  60093 10R  R16_3    
-        34        975 33101  59701 10L  R16_2    
-        34        976 33101  59714 10R  R16_2    
-        34        977 33101  59704 10L  R16_2    
-        34        978 33101  59709 10R  R16_2    
-        34        979 33101  59696 10L  R16_2    
-        34        980 33101  26834 10R  S6_2     
-        34        981 33101  26827 10L  S6_2     
-        34        982 33101  60129 10R  R16_3    
-        34        983 33101  60075 10L  R16_3    
-        34        984 33101  60124 10R  R16_3    
-        34        985 33101  60070 10L  R16_3    
-        34        986 33101  60119 10R  R16_3    
-        34        987 33101  60060 10L  R16_3    
-        34        988 33101  60114 10R  R16_3    
-        34        989 33101  60055 10L  R16_3    
-        34        990 33101  60104 10R  R16_3    
-        34        991 33101  60085 10L  R16_3    
-        34        992 33101  60099 10R  R16_3    
-        34        993 33101  60080 10L  R16_3    
-        34        994 33101  60094 10R  R16_3    
-        34        995 33101  59702 10L  R16_2    
-        34        996 33101  59715 10R  R16_2    
-        34        997 33101  59705 10L  R16_2    
-        34        998 33101  59710 10R  R16_2    
-        34        999 33101  59697 10L  R16_2    
-        34       1000 33101  26835 10R  S6_2     
-        34       1001 33101   9941 11L  R4_1     
-        34       1002 33101  60186 11R  R16_3    
-        34       1003 33101  60660 11L  R17_1    
-        34       1004 33101  60181 11R  R16_3    
-        34       1005 33101  60655 11L  R17_1    
-        34       1006 33101  60176 11R  R16_3    
-        34       1007 33101  56634 11L  R13_3    
-        34       1008 33101  60156 11R  R16_3    
-        34       1009 33101  60140 11L  R16_3    
-        34       1010 33101  59738 11R  R16_2    
-        34       1011 33101  60135 11L  R16_3    
-        34       1012 33101  60171 11R  R16_3    
-        34       1013 33101  60130 11L  R16_3    
-        34       1014 33101  60166 11R  R16_3    
-        34       1015 33101  59726 11L  R16_2    
-        34       1016 33101  58852 11R  R15_2    
-        34       1017 33101  59721 11L  R16_2    
-        34       1018 33101  59733 11R  R16_2    
-        34       1019 33101  59716 11L  R16_2    
-        34       1020 33101  59728 11R  R16_2    
-        34       1021 33101  20934 11L  S4       
-        34       1022 33101  60187 11R  R16_3    
-        34       1023 33101  60661 11L  R17_1    
-        34       1024 33101  60182 11R  R16_3    
-        34       1025 33101  60656 11L  R17_1    
-        34       1026 33101  60177 11R  R16_3    
-        34       1027 33101  60146 11L  R16_3    
-        34       1028 33101  60157 11R  R16_3    
-        34       1029 33101  60141 11L  R16_3    
-        34       1030 33101  59739 11R  R16_2    
-        34       1031 33101  60136 11L  R16_3    
-        34       1032 33101  60172 11R  R16_3    
-        34       1033 33101  60131 11L  R16_3    
-        34       1034 33101  60167 11R  R16_3    
-        34       1035 33101  59727 11L  R16_2    
-        34       1036 33101  58853 11R  R15_2    
-        34       1037 33101  59722 11L  R16_2    
-        34       1038 33101  59734 11R  R16_2    
-        34       1039 33101  59717 11L  R16_2    
-        34       1040 33101  59729 11R  R16_2    
-        34       1041 33101  38556 11L  S9_6     
-        34       1042 33101  60188 11R  R16_3    
-        34       1043 33101  60662 11L  R17_1    
-        34       1044 33101  60183 11R  R16_3    
-        34       1045 33101  60657 11L  R17_1    
-        34       1046 33101  60178 11R  R16_3    
-        34       1047 33101  60147 11L  R16_3    
-        34       1048 33101  60158 11R  R16_3    
-        34       1049 33101  60142 11L  R16_3    
-        34       1050 33101  59740 11R  R16_2    
-        34       1051 33101  60137 11L  R16_3    
-        34       1052 33101  60173 11R  R16_3    
-        34       1053 33101  60132 11L  R16_3    
-        34       1054 33101  60168 11R  R16_3    
-        34       1055 33101  60150 11L  R16_3    
-        34       1056 33101  58854 11R  R15_2    
-        34       1057 33101  59723 11L  R16_2    
-        34       1058 33101  59735 11R  R16_2    
-        34       1059 33101  59718 11L  R16_2    
-        34       1060 33101  59730 11R  R16_2    
-        34       1061 33101  52289 11L  R9_2     
-        34       1062 33101  60189 11R  R16_3    
-        34       1063 33101  60663 11L  R17_1    
-        34       1064 33101  60184 11R  R16_3    
-        34       1065 33101  60658 11L  R17_1    
-        34       1066 33101  60179 11R  R16_3    
-        34       1067 33101  60148 11L  R16_3    
-        34       1068 33101  60159 11R  R16_3    
-        34       1069 33101  60143 11L  R16_3    
-        34       1070 33101  60191 11R  R16_3    
-        34       1071 33101  60138 11L  R16_3    
-        34       1072 33101  60174 11R  R16_3    
-        34       1073 33101  60133 11L  R16_3    
-        34       1074 33101  60169 11R  R16_3    
-        34       1075 33101  60151 11L  R16_3    
-        34       1076 33101  58855 11R  R15_2    
-        34       1077 33101  59724 11L  R16_2    
-        34       1078 33101  59736 11R  R16_2    
-        34       1079 33101  59719 11L  R16_2    
-        34       1080 33101  59731 11R  R16_2    
-        34       1081 33101  52290 11L  R9_2     
-        34       1082 33101  60190 11R  R16_3    
-        34       1083 33101  60664 11L  R17_1    
-        34       1084 33101  60185 11R  R16_3    
-        34       1085 33101  60659 11L  R17_1    
-        34       1086 33101  60180 11R  R16_3    
-        34       1087 33101  60149 11L  R16_3    
-        34       1088 33101  60160 11R  R16_3    
-        34       1089 33101  60144 11L  R16_3    
-        34       1090 33101  60192 11R  R16_3    
-        34       1091 33101  60139 11L  R16_3    
-        34       1092 33101  60175 11R  R16_3    
-        34       1093 33101  60134 11L  R16_3    
-        34       1094 33101  60170 11R  R16_3    
-        34       1095 33101  60152 11L  R16_3    
-        34       1096 33101  58856 11R  R15_2    
-        34       1097 33101  59725 11L  R16_2    
-        34       1098 33101  59737 11R  R16_2    
-        34       1099 33101  59720 11L  R16_2    
-        34       1100 33101  59732 11R  R16_2    
-        34       1101 33101  60225 12L  R16_3    
-        34       1102 33101  60261 12R  R16_3    
-        34       1103 33101  60220 12L  R16_3    
-        34       1104 33101  60256 12R  R16_3    
-        34       1105 33101  60205 12L  R16_3    
-        34       1106 33101  60251 12R  R16_3    
-        34       1107 33101  60200 12L  R16_3    
-        34       1108 33101  60246 12R  R16_3    
-        34       1109 33101  60195 12L  R16_3    
-        34       1110 33101  60241 12R  R16_3    
-        34       1111 33101  60210 12L  R16_3    
-        34       1112 33101  60231 12R  R16_3    
-        34       1113 33101  59756 12L  R16_2    
-        34       1114 33101  59767 12R  R16_2    
-        34       1115 33101  59751 12L  R16_2    
-        34       1116 33101  59762 12R  R16_2    
-        34       1117 33101  59746 12L  R16_2    
-        34       1118 33101  59757 12R  R16_2    
-        34       1119 33101  59741 12L  R16_2    
-        34       1120 33101  58925 12R  R15_2    
-        34       1121 33101  60226 12L  R16_3    
-        34       1122 33101  60262 12R  R16_3    
-        34       1123 33101  60221 12L  R16_3    
-        34       1124 33101  60257 12R  R16_3    
-        34       1125 33101  60206 12L  R16_3    
-        34       1126 33101  60252 12R  R16_3    
-        34       1127 33101  60201 12L  R16_3    
-        34       1128 33101  60247 12R  R16_3    
-        34       1129 33101  60196 12L  R16_3    
-        34       1130 33101  60242 12R  R16_3    
-        34       1131 33101  60211 12L  R16_3    
-        34       1132 33101  60232 12R  R16_3    
-        34       1133 33101  58908 12L  R15_2    
-        34       1134 33101  59768 12R  R16_2    
-        34       1135 33101  59752 12L  R16_2    
-        34       1136 33101  59763 12R  R16_2    
-        34       1137 33101  59747 12L  R16_2    
-        34       1138 33101  59758 12R  R16_2    
-        34       1139 33101  59742 12L  R16_2    
-        34       1140 33101  58926 12R  R15_2    
-        34       1141 33101  60227 12L  R16_3    
-        34       1142 33101  60263 12R  R16_3    
-        34       1143 33101  60222 12L  R16_3    
-        34       1144 33101  60258 12R  R16_3    
-        34       1145 33101  60207 12L  R16_3    
-        34       1146 33101  60253 12R  R16_3    
-        34       1147 33101  60202 12L  R16_3    
-        34       1148 33101  60248 12R  R16_3    
-        34       1149 33101  60197 12L  R16_3    
-        34       1150 33101  60243 12R  R16_3    
-        34       1151 33101  60212 12L  R16_3    
-        34       1152 33101  60233 12R  R16_3    
-        34       1153 33101  58909 12L  R15_2    
-        34       1154 33101  59769 12R  R16_2    
-        34       1155 33101  59753 12L  R16_2    
-        34       1156 33101  59764 12R  R16_2    
-        34       1157 33101  59748 12L  R16_2    
-        34       1158 33101  59759 12R  R16_2    
-        34       1159 33101  59743 12L  R16_2    
-        34       1160 33101  58927 12R  R15_2    
-        34       1161 33101  60228 12L  R16_3    
-        34       1162 33101  60264 12R  R16_3    
-        34       1163 33101  60223 12L  R16_3    
-        34       1164 33101  60259 12R  R16_3    
-        34       1165 33101  60208 12L  R16_3    
-        34       1166 33101  60254 12R  R16_3    
-        34       1167 33101  60203 12L  R16_3    
-        34       1168 33101  60249 12R  R16_3    
-        34       1169 33101  60198 12L  R16_3    
-        34       1170 33101  60244 12R  R16_3    
-        34       1171 33101  60213 12L  R16_3    
-        34       1172 33101  60234 12R  R16_3    
-        34       1173 33101  54777 12L  R12_1    
-        34       1174 33101  59770 12R  R16_2    
-        34       1175 33101  59754 12L  R16_2    
-        34       1176 33101  59765 12R  R16_2    
-        34       1177 33101  59749 12L  R16_2    
-        34       1178 33101  59760 12R  R16_2    
-        34       1179 33101  59744 12L  R16_2    
-        34       1180 33101  58928 12R  R15_2    
-        34       1181 33101  60229 12L  R16_3    
-        34       1182 33101  60265 12R  R16_3    
-        34       1183 33101  60224 12L  R16_3    
-        34       1184 33101  60260 12R  R16_3    
-        34       1185 33101  60209 12L  R16_3    
-        34       1186 33101  60255 12R  R16_3    
-        34       1187 33101  60204 12L  R16_3    
-        34       1188 33101  60250 12R  R16_3    
-        34       1189 33101  60199 12L  R16_3    
-        34       1190 33101  60245 12R  R16_3    
-        34       1191 33101  60214 12L  R16_3    
-        34       1192 33101  60235 12R  R16_3    
-        34       1193 33101  58898 12L  R15_2    
-        34       1194 33101  58370 12R  R15_1    
-        34       1195 33101  59755 12L  R16_2    
-        34       1196 33101  59766 12R  R16_2    
-        34       1197 33101  59750 12L  R16_2    
-        34       1198 33101  59761 12R  R16_2    
-        34       1199 33101  59745 12L  R16_2    
-        34       1200 33101  58929 12R  R15_2    
-        34       1201 33101  60684 13L  R17_1    
-        34       1202 33101  60704 13R  R17_1    
-        34       1203 33101  60679 13L  R17_1    
-        34       1204 33101  60699 13R  R17_1    
-        34       1205 33101  60674 13L  R17_1    
-        34       1206 33101  60694 13R  R17_1    
-        34       1207 33101  60274 13L  R16_3    
-        34       1208 33101  60689 13R  R17_1    
-        34       1209 33101  60269 13L  R16_3    
-        34       1210 33101  60295 13R  R16_3    
-        34       1211 33101  60279 13L  R16_3    
-        34       1212 33101  60290 13R  R16_3    
-        34       1213 33101  59781 13L  R16_2    
-        34       1214 33101  60300 13R  R16_3    
-        34       1215 33101  59776 13L  R16_2    
-        34       1216 33101  59792 13R  R16_2    
-        34       1217 33101  59771 13L  R16_2    
-        34       1218 33101  59787 13R  R16_2    
-        34       1219 33101  58963 13L  R15_2    
-        34       1220 33101  58984 13R  R15_2    
-        34       1221 33101  60685 13L  R17_1    
-        34       1222 33101  60705 13R  R17_1    
-        34       1223 33101  60680 13L  R17_1    
-        34       1224 33101  60700 13R  R17_1    
-        34       1225 33101  60675 13L  R17_1    
-        34       1226 33101  60695 13R  R17_1    
-        34       1227 33101  60275 13L  R16_3    
-        34       1228 33101  60690 13R  R17_1    
-        34       1229 33101  60270 13L  R16_3    
-        34       1230 33101  60296 13R  R16_3    
-        34       1231 33101  60280 13L  R16_3    
-        34       1232 33101  60291 13R  R16_3    
-        34       1233 33101  59782 13L  R16_2    
-        34       1234 33101  59797 13R  R16_2    
-        34       1235 33101  59777 13L  R16_2    
-        34       1236 33101  59793 13R  R16_2    
-        34       1237 33101  59772 13L  R16_2    
-        34       1238 33101  59788 13R  R16_2    
-        34       1239 33101  58964 13L  R15_2    
-        34       1240 33101  58985 13R  R15_2    
-        34       1241 33101  60686 13L  R17_1    
-        34       1242 33101  60706 13R  R17_1    
-        34       1243 33101  60681 13L  R17_1    
-        34       1244 33101  60701 13R  R17_1    
-        34       1245 33101  60676 13L  R17_1    
-        34       1246 33101  60696 13R  R17_1    
-        34       1247 33101  60276 13L  R16_3    
-        34       1248 33101  60691 13R  R17_1    
-        34       1249 33101  60271 13L  R16_3    
-        34       1250 33101  60297 13R  R16_3    
-        34       1251 33101  60281 13L  R16_3    
-        34       1252 33101  60292 13R  R16_3    
-        34       1253 33101  59783 13L  R16_2    
-        34       1254 33101  59798 13R  R16_2    
-        34       1255 33101  59778 13L  R16_2    
-        34       1256 33101  59794 13R  R16_2    
-        34       1257 33101  59773 13L  R16_2    
-        34       1258 33101  59789 13R  R16_2    
-        34       1259 33101  58965 13L  R15_2    
-        34       1260 33101  58986 13R  R15_2    
-        34       1261 33101  60687 13L  R17_1    
-        34       1262 33101  60707 13R  R17_1    
-        34       1263 33101  60682 13L  R17_1    
-        34       1264 33101  60702 13R  R17_1    
-        34       1265 33101  60677 13L  R17_1    
-        34       1266 33101  60697 13R  R17_1    
-        34       1267 33101  60277 13L  R16_3    
-        34       1268 33101  60692 13R  R17_1    
-        34       1269 33101  60272 13L  R16_3    
-        34       1270 33101  60298 13R  R16_3    
-        34       1271 33101  60282 13L  R16_3    
-        34       1272 33101  60293 13R  R16_3    
-        34       1273 33101  59784 13L  R16_2    
-        34       1274 33101  59799 13R  R16_2    
-        34       1275 33101  59779 13L  R16_2    
-        34       1276 33101  59795 13R  R16_2    
-        34       1277 33101  59774 13L  R16_2    
-        34       1278 33101  59790 13R  R16_2    
-        34       1279 33101  58966 13L  R15_2    
-        34       1280 33101  58987 13R  R15_2    
-        34       1281 33101  60688 13L  R17_1    
-        34       1282 33101  60708 13R  R17_1    
-        34       1283 33101  60683 13L  R17_1    
-        34       1284 33101  60703 13R  R17_1    
-        34       1285 33101  60678 13L  R17_1    
-        34       1286 33101  60698 13R  R17_1    
-        34       1287 33101  60278 13L  R16_3    
-        34       1288 33101  60693 13R  R17_1    
-        34       1289 33101  60273 13L  R16_3    
-        34       1290 33101  60299 13R  R16_3    
-        34       1291 33101  59786 13L  R16_2    
-        34       1292 33101  60294 13R  R16_3    
-        34       1293 33101  59785 13L  R16_2    
-        34       1294 33101  59800 13R  R16_2    
-        34       1295 33101  59780 13L  R16_2    
-        34       1296 33101  59796 13R  R16_2    
-        34       1297 33101  59775 13L  R16_2    
-        34       1298 33101  59791 13R  R16_2    
-        34       1299 33101  58967 13L  R15_2    
-        34       1300 33101  58988 13R  R15_2    
-        34       1301 33101  58509 14L  R15_2    
-        34       1302 33101  58534 14R  R15_2    
-        34       1303 33101  59441 14L  R16_2    
-        34       1304 33101  59466 14R  R16_2    
-        34       1305 33101  59446 14L  R16_2    
-        34       1306 33101  59471 14R  R16_2    
-        34       1307 33101  59451 14L  R16_2    
-        34       1308 33101  59911 14R  R16_3    
-        34       1309 33101  59456 14L  R16_2    
-        34       1310 33101  59881 14R  R16_3    
-        34       1311 33101  59816 14L  R16_3    
-        34       1312 33101  59886 14R  R16_3    
-        34       1313 33101  60501 14L  R17_1    
-        34       1314 33101  59891 14R  R16_3    
-        34       1315 33101  60506 14L  R17_1    
-        34       1316 33101  59896 14R  R16_3    
-        34       1317 33101  60511 14L  R17_1    
-        34       1318 33101  59901 14R  R16_3    
-        34       1319 33101  60516 14L  R17_1    
-        34       1320 33101  59906 14R  R16_3    
-        34       1321 33101  58510 14L  R15_2    
-        34       1322 33101  59462 14R  R16_2    
-        34       1323 33101  59442 14L  R16_2    
-        34       1324 33101  59467 14R  R16_2    
-        34       1325 33101  59447 14L  R16_2    
-        34       1326 33101  59472 14R  R16_2    
-        34       1327 33101  59452 14L  R16_2    
-        34       1328 33101  59877 14R  R16_3    
-        34       1329 33101  59457 14L  R16_2    
-        34       1330 33101  59882 14R  R16_3    
-        34       1331 33101  59461 14L  R16_2    
-        34       1332 33101  59887 14R  R16_3    
-        34       1333 33101  60502 14L  R17_1    
-        34       1334 33101  59892 14R  R16_3    
-        34       1335 33101  60507 14L  R17_1    
-        34       1336 33101  59897 14R  R16_3    
-        34       1337 33101  60512 14L  R17_1    
-        34       1338 33101  59902 14R  R16_3    
-        34       1339 33101  60517 14L  R17_1    
-        34       1340 33101  59907 14R  R16_3    
-        34       1341 33101  58511 14L  R15_2    
-        34       1342 33101  59463 14R  R16_2    
-        34       1343 33101  59443 14L  R16_2    
-        34       1344 33101  59468 14R  R16_2    
-        34       1345 33101  59448 14L  R16_2    
-        34       1346 33101  59473 14R  R16_2    
-        34       1347 33101  59453 14L  R16_2    
-        34       1348 33101  59878 14R  R16_3    
-        34       1349 33101  59458 14L  R16_2    
-        34       1350 33101  59883 14R  R16_3    
-        34       1351 33101  59875 14L  R16_3    
-        34       1352 33101  59888 14R  R16_3    
-        34       1353 33101  60503 14L  R17_1    
-        34       1354 33101  59893 14R  R16_3    
-        34       1355 33101  60508 14L  R17_1    
-        34       1356 33101  59898 14R  R16_3    
-        34       1357 33101  60513 14L  R17_1    
-        34       1358 33101  59903 14R  R16_3    
-        34       1359 33101  60518 14L  R17_1    
-        34       1360 33101  59908 14R  R16_3    
-        34       1361 33101  58512 14L  R15_2    
-        34       1362 33101  59464 14R  R16_2    
-        34       1363 33101  59444 14L  R16_2    
-        34       1364 33101  59469 14R  R16_2    
-        34       1365 33101  59449 14L  R16_2    
-        34       1366 33101  59474 14R  R16_2    
-        34       1367 33101  59454 14L  R16_2    
-        34       1368 33101  59879 14R  R16_3    
-        34       1369 33101  59459 14L  R16_2    
-        34       1370 33101  59884 14R  R16_3    
-        34       1371 33101  59440 14L  R16_2    
-        34       1372 33101  59889 14R  R16_3    
-        34       1373 33101  60504 14L  R17_1    
-        34       1374 33101  59894 14R  R16_3    
-        34       1375 33101  60509 14L  R17_1    
-        34       1376 33101  59899 14R  R16_3    
-        34       1377 33101  60514 14L  R17_1    
-        34       1378 33101  59904 14R  R16_3    
-        34       1379 33101  60519 14L  R17_1    
-        34       1380 33101  59909 14R  R16_3    
-        34       1381 33101  58513 14L  R15_2    
-        34       1382 33101  59465 14R  R16_2    
-        34       1383 33101  59445 14L  R16_2    
-        34       1384 33101  59470 14R  R16_2    
-        34       1385 33101  59450 14L  R16_2    
-        34       1386 33101  59475 14R  R16_2    
-        34       1387 33101  59455 14L  R16_2    
-        34       1388 33101  59880 14R  R16_3    
-        34       1389 33101  59460 14L  R16_2    
-        34       1390 33101  59885 14R  R16_3    
-        34       1391 33101  59874 14L  R16_3    
-        34       1392 33101  59890 14R  R16_3    
-        34       1393 33101  60505 14L  R17_1    
-        34       1394 33101  59895 14R  R16_3    
-        34       1395 33101  60510 14L  R17_1    
-        34       1396 33101  59900 14R  R16_3    
-        34       1397 33101  60515 14L  R17_1    
-        34       1398 33101  59905 14R  R16_3    
-        34       1399 33101  60520 14L  R17_1    
-        34       1400 33101  59910 14R  R16_3    
-        34       1401 33101  59209 15L  R16_1    
-        34       1402 33101  59481 15R  R16_2    
-        34       1403 33101  59214 15L  R16_1    
-        34       1404 33101  59486 15R  R16_2    
-        34       1405 33101  56549 15L  R13_3    
-        34       1406 33101  58159 15R  R15_1    
-        34       1407 33101  59476 15L  R16_2    
-        34       1408 33101  59491 15R  R16_2    
-        34       1409 33101  59916 15L  R16_3    
-        34       1410 33101  59496 15R  R16_2    
-        34       1411 33101  59921 15L  R16_3    
-        34       1412 33101  59501 15R  R16_2    
-        34       1413 33101  59926 15L  R16_3    
-        34       1414 33101  59504 15R  R16_2    
-        34       1415 33101  59914 15L  R16_3    
-        34       1416 33101  60538 15R  R17_1    
-        34       1417 33101  59208 15L  R16_1    
-        34       1418 33101  60541 15R  R17_1    
-        34       1419 33101  60526 15L  R17_1    
-        34       1420 33101  60546 15R  R17_1    
-        34       1421 33101  59210 15L  R16_1    
-        34       1422 33101  59482 15R  R16_2    
-        34       1423 33101  59215 15L  R16_1    
-        34       1424 33101  59487 15R  R16_2    
-        34       1425 33101  56562 15L  R13_3    
-        34       1426 33101  59480 15R  R16_2    
-        34       1427 33101  59477 15L  R16_2    
-        34       1428 33101  59492 15R  R16_2    
-        34       1429 33101  59917 15L  R16_3    
-        34       1430 33101  59497 15R  R16_2    
-        34       1431 33101  59922 15L  R16_3    
-        34       1432 33101  59502 15R  R16_2    
-        34       1433 33101  59927 15L  R16_3    
-        34       1434 33101  59937 15R  R16_3    
-        34       1435 33101  59915 15L  R16_3    
-        34       1436 33101  60539 15R  R17_1    
-        34       1437 33101  60522 15L  R17_1    
-        34       1438 33101  60542 15R  R17_1    
-        34       1439 33101  60527 15L  R17_1    
-        34       1440 33101  60547 15R  R17_1    
-        34       1441 33101  59211 15L  R16_1    
-        34       1442 33101  59483 15R  R16_2    
-        34       1443 33101  59216 15L  R16_1    
-        34       1444 33101  59488 15R  R16_2    
-        34       1445 33101  58572 15L  R15_2    
-        34       1446 33101  58613 15R  R15_2    
-        34       1447 33101  59478 15L  R16_2    
-        34       1448 33101  59493 15R  R16_2    
-        34       1449 33101  59918 15L  R16_3    
-        34       1450 33101  59498 15R  R16_2    
-        34       1451 33101  59923 15L  R16_3    
-        34       1452 33101  59503 15R  R16_2    
-        34       1453 33101  59928 15L  R16_3    
-        34       1454 33101  60535 15R  R17_1    
-        34       1455 33101  59479 15L  R16_2    
-        34       1456 33101  59933 15R  R16_3    
-        34       1457 33101  60523 15L  R17_1    
-        34       1458 33101  60543 15R  R17_1    
-        34       1459 33101  60528 15L  R17_1    
-        34       1460 33101  60548 15R  R17_1    
-        34       1461 33101  59212 15L  R16_1    
-        34       1462 33101  59484 15R  R16_2    
-        34       1463 33101  59217 15L  R16_1    
-        34       1464 33101  59489 15R  R16_2    
-        34       1465 33101  59206 15L  R16_1    
-        34       1466 33101  58614 15R  R15_2    
-        34       1467 33101  59219 15L  R16_1    
-        34       1468 33101  59494 15R  R16_2    
-        34       1469 33101  59919 15L  R16_3    
-        34       1470 33101  59499 15R  R16_2    
-        34       1471 33101  59924 15L  R16_3    
-        34       1472 33101  59936 15R  R16_3    
-        34       1473 33101  59929 15L  R16_3    
-        34       1474 33101  60536 15R  R17_1    
-        34       1475 33101  59931 15L  R16_3    
-        34       1476 33101  59934 15R  R16_3    
-        34       1477 33101  60524 15L  R17_1    
-        34       1478 33101  60544 15R  R17_1    
-        34       1479 33101  60529 15L  R17_1    
-        34       1480 33101  60549 15R  R17_1    
-        34       1481 33101  59213 15L  R16_1    
-        34       1482 33101  59485 15R  R16_2    
-        34       1483 33101  59218 15L  R16_1    
-        34       1484 33101  59490 15R  R16_2    
-        34       1485 33101  59207 15L  R16_1    
-        34       1486 33101  58615 15R  R15_2    
-        34       1487 33101  59220 15L  R16_1    
-        34       1488 33101  59495 15R  R16_2    
-        34       1489 33101  59920 15L  R16_3    
-        34       1490 33101  59500 15R  R16_2    
-        34       1491 33101  59925 15L  R16_3    
-        34       1492 33101  59932 15R  R16_3    
-        34       1493 33101  59930 15L  R16_3    
-        34       1494 33101  60537 15R  R17_1    
-        34       1495 33101  60531 15L  R17_1    
-        34       1496 33101  59935 15R  R16_3    
-        34       1497 33101  60525 15L  R17_1    
-        34       1498 33101  60545 15R  R17_1    
-        34       1499 33101  60530 15L  R17_1    
-        34       1500 33101  60540 15R  R17_1    
-        34       1501 33106   1329 16L  EBP10    
-        34       1502 33106    852 16R  EBP06    
-        34       1503 33106   1635 16L  EBP12    
-        34       1504 33106   1814 16R  EBP13    
-        34       1505 33106   1804 16L  EBP13    
-        34       1506 33106   1824 16R  EBP13    
-        34       1507 33106   1809 16L  EBP13    
-        34       1508 33101  38814 16R  P016     
-        34       1509 33101  26076 16L  S06      
-        34       1510 33101  54537 16R  R12_1    
-        34       1511 33101  38805 16L  P016     
-        34       1512 33101  60576 16R  R17_1    
-        34       1513 33101  36777 16L  S9_2     
-        34       1514 33101  60571 16R  R17_1    
-        34       1515 33101  60553 16L  R17_1    
-        34       1516 33101  60581 16R  R17_1    
-        34       1517 33101  60561 16L  R17_1    
-        34       1518 33101  60586 16R  R17_1    
-        34       1519 33101  29947 16L  S7_1     
-        34       1520 33101  29965 16R  S7_1     
-        34       1521 33106   1626 16L  EBP12    
-        34       1522 33106   1639 16R  EBP12    
-        34       1523 33106   1636 16L  EBP12    
-        34       1524 33106   1815 16R  EBP13    
-        34       1525 33106   1805 16L  EBP13    
-        34       1526 33101  29434 16R  R1       
-        34       1527 33106   1810 16L  EBP13    
-        34       1528 33101  38815 16R  P016     
-        34       1529 33101  31412 16L  S07_4    
-        34       1530 33101  54538 16R  R12_1    
-        34       1531 33101  54512 16L  R12_1    
-        34       1532 33101  60577 16R  R17_1    
-        34       1533 33101  36778 16L  S9_2     
-        34       1534 33101  60572 16R  R17_1    
-        34       1535 33101  60554 16L  R17_1    
-        34       1536 33101  60582 16R  R17_1    
-        34       1537 33101  60562 16L  R17_1    
-        34       1538 33101  60587 16R  R17_1    
-        34       1539 33101  31383 16L  S07_4    
-        34       1540 33101  30937 16R  S7_3     
-        34       1541 33106   1631 16L  EBP12    
-        34       1542 33106   1641 16R  EBP12    
-        34       1543 33106   1637 16L  EBP12    
-        34       1544 33106   1818 16R  EBP13    
-        34       1545 33106   1806 16L  EBP13    
-        34       1546 33101  36490 16R  S9_1     
-        34       1547 33106   1811 16L  EBP13    
-        34       1548 33101  38819 16R  P016     
-        34       1549 33101  36752 16L  S9_2     
-        34       1550 33101  54539 16R  R12_1    
-        34       1551 33101  54513 16L  R12_1    
-        34       1552 33101  60578 16R  R17_1    
-        34       1553 33101  38802 16L  P016     
-        34       1554 33101  60573 16R  R17_1    
-        34       1555 33101  60555 16L  R17_1    
-        34       1556 33101  60583 16R  R17_1    
-        34       1557 33101  60558 16L  R17_1    
-        34       1558 33101  60588 16R  R17_1    
-        34       1559 33101  31404 16L  S07_4    
-        34       1560 33101  31418 16R  S07_4    
-        34       1561 33106   1632 16L  EBP12    
-        34       1562 33106   1642 16R  EBP12    
-        34       1563 33106   1802 16L  EBP13    
-        34       1564 33106   1819 16R  EBP13    
-        34       1565 33106   1807 16L  EBP13    
-        34       1566 33101  36805 16R  S9_2     
-        34       1567 33106   1812 16L  EBP13    
-        34       1568 33101  38820 16R  P016     
-        34       1569 33101  36756 16L  S9_2     
-        34       1570 33101  54540 16R  R12_1    
-        34       1571 33101  54514 16L  R12_1    
-        34       1572 33101  60579 16R  R17_1    
-        34       1573 33101  38803 16L  P016     
-        34       1574 33101  60574 16R  R17_1    
-        34       1575 33101  60556 16L  R17_1    
-        34       1576 33101  60584 16R  R17_1    
-        34       1577 33101  60559 16L  R17_1    
-        34       1578 33101  60569 16R  R17_1    
-        34       1579 33101  31405 16L  S07_4    
-        34       1580 33101  31424 16R  S07_4    
-        34       1581 33106   1634 16L  EBP12    
-        34       1582 33106   1643 16R  EBP12    
-        34       1583 33106   1803 16L  EBP13    
-        34       1584 33106   1822 16R  EBP13    
-        34       1585 33106   1808 16L  EBP13    
-        34       1586 33101  38813 16R  P016     
-        34       1587 33106   1813 16L  EBP13    
-        34       1588 33101  38821 16R  P016     
-        34       1589 33101  36757 16L  S9_2     
-        34       1590 33101  54541 16R  R12_1    
-        34       1591 33101  54515 16L  R12_1    
-        34       1592 33101  60580 16R  R17_1    
-        34       1593 33101  38804 16L  P016     
-        34       1594 33101  60575 16R  R17_1    
-        34       1595 33101  60557 16L  R17_1    
-        34       1596 33101  60585 16R  R17_1    
-        34       1597 33101  60560 16L  R17_1    
-        34       1598 33101  60570 16R  R17_1    
-        34       1599 33101  31410 16L  S07_4    
-        34       1600 33101  31425 16R  S07_4    
-        34       1601 33106   1671 17L  EBP12    
-        34       1602 33106   1766 17R  EBP13    
-        34       1603 33106   1669 17L  EBP12    
-        34       1604 33106   1756 17R  EBP13    
-        34       1605 33106   1704 17L  EBP13    
-        34       1606 33106   1761 17R  EBP13    
-        34       1607 33106   1713 17L  EBP13    
-        34       1608 33106   1771 17R  EBP13    
-        34       1609 33106   1721 17L  EBP13    
-        34       1610 33106   1768 17R  EBP13    
-        34       1611 33106   1726 17L  EBP13    
-        34       1612 33106   1781 17R  EBP13    
-        34       1613 33106   1736 17L  EBP13    
-        34       1614 33106   1791 17R  EBP13    
-        34       1615 33106   1725 17L  EBP13    
-        34       1616 33106   1786 17R  EBP13    
-        34       1617 33106   1741 17L  EBP13    
-        34       1618 33106   1793 17R  EBP13    
-        34       1619 33106   1746 17L  EBP13    
-        34       1620 33106   1798 17R  EBP13    
-        34       1621 33106   1672 17L  EBP12    
-        34       1622 33106   1752 17R  EBP13    
-        34       1623 33106   1670 17L  EBP12    
-        34       1624 33106   1757 17R  EBP13    
-        34       1625 33106   1706 17L  EBP13    
-        34       1626 33106   1762 17R  EBP13    
-        34       1627 33106   1714 17L  EBP13    
-        34       1628 33106   1772 17R  EBP13    
-        34       1629 33106   1722 17L  EBP13    
-        34       1630 33106   1769 17R  EBP13    
-        34       1631 33106   1727 17L  EBP13    
-        34       1632 33106   1782 17R  EBP13    
-        34       1633 33106   1737 17L  EBP13    
-        34       1634 33106   1792 17R  EBP13    
-        34       1635 33106   1731 17L  EBP13    
-        34       1636 33106   1787 17R  EBP13    
-        34       1637 33106   1742 17L  EBP13    
-        34       1638 33106   1794 17R  EBP13    
-        34       1639 33106   1747 17L  EBP13    
-        34       1640 33106   1800 17R  EBP13    
-        34       1641 33106   1673 17L  EBP12    
-        34       1642 33106   1753 17R  EBP13    
-        34       1643 33106   1702 17L  EBP13    
-        34       1644 33106   1758 17R  EBP13    
-        34       1645 33106   1708 17L  EBP13    
-        34       1646 33106   1763 17R  EBP13    
-        34       1647 33106   1716 17L  EBP13    
-        34       1648 33106   1773 17R  EBP13    
-        34       1649 33106   1723 17L  EBP13    
-        34       1650 33106   1770 17R  EBP13    
-        34       1651 33106   1728 17L  EBP13    
-        34       1652 33106   1783 17R  EBP13    
-        34       1653 33106   1738 17L  EBP13    
-        34       1654 33106   1778 17R  EBP13    
-        34       1655 33106   1732 17L  EBP13    
-        34       1656 33106   1788 17R  EBP13    
-        34       1657 33106   1743 17L  EBP13    
-        34       1658 33106   1795 17R  EBP13    
-        34       1659 33106   1748 17L  EBP13    
-        34       1660 33106   1801 17R  EBP13    
-        34       1661 33106   1674 17L  EBP12    
-        34       1662 33106   1754 17R  EBP13    
-        34       1663 33106   1703 17L  EBP13    
-        34       1664 33106   1759 17R  EBP13    
-        34       1665 33106   1709 17L  EBP13    
-        34       1666 33106   1764 17R  EBP13    
-        34       1667 33106   1717 17L  EBP13    
-        34       1668 33106   1774 17R  EBP13    
-        34       1669 33106   1724 17L  EBP13    
-        34       1670 33106   1776 17R  EBP13    
-        34       1671 33106   1729 17L  EBP13    
-        34       1672 33106   1784 17R  EBP13    
-        34       1673 33106   1739 17L  EBP13    
-        34       1674 33106   1779 17R  EBP13    
-        34       1675 33106   1734 17L  EBP13    
-        34       1676 33106   1789 17R  EBP13    
-        34       1677 33106   1744 17L  EBP13    
-        34       1678 33106   1796 17R  EBP13    
-        34       1679 33106   1749 17L  EBP13    
-        34       1680 33101  31532 17R  S07_4    
-        34       1681 33106   1675 17L  EBP12    
-        34       1682 33106   1755 17R  EBP13    
-        34       1683 33106   1705 17L  EBP13    
-        34       1684 33106   1760 17R  EBP13    
-        34       1685 33106   1711 17L  EBP13    
-        34       1686 33106   1765 17R  EBP13    
-        34       1687 33106   1718 17L  EBP13    
-        34       1688 33106   1775 17R  EBP13    
-        34       1689 33106   1720 17L  EBP13    
-        34       1690 33106   1777 17R  EBP13    
-        34       1691 33106   1730 17L  EBP13    
-        34       1692 33106   1785 17R  EBP13    
-        34       1693 33106   1740 17L  EBP13    
-        34       1694 33106   1780 17R  EBP13    
-        34       1695 33106   1735 17L  EBP13    
-        34       1696 33106   1790 17R  EBP13    
-        34       1697 33106   1745 17L  EBP13    
-        34       1698 33106   1797 17R  EBP13    
-        34       1699 33106   1750 17L  EBP13    
-        34       1700 33101  31533 17R  S07_4    
-        35          1 33101  60346 1L   R17_1    
-        35          2 33101  60392 1R   R17_1    
-        35          3 33101  62181 1L   R18_2    
-        35          4 33101  61596 1R   R18_1    
-        35          5 33101  62186 1L   R18_2    
-        35          6 33101  61601 1R   R18_1    
-        35          7 33101  62191 1L   R18_2    
-        35          8 33101  61606 1R   R18_1    
-        35          9 33101  62196 1L   R18_2    
-        35         10 33101  61611 1R   R18_1    
-        35         11 33101  62201 1L   R18_2    
-        35         12 33101  61618 1R   R18_1    
-        35         13 33101  62206 1L   R18_2    
-        35         14 33101  62236 1R   R18_2    
-        35         15 33101  62211 1L   R18_2    
-        35         16 33101  62241 1R   R18_2    
-        35         17 33101  62216 1L   R18_2    
-        35         18 33101  62246 1R   R18_2    
-        35         19 33101  62221 1L   R18_2    
-        35         20 33101  62251 1R   R18_2    
-        35         21 33101  61002 1L   R17_3    
-        35         22 33101  60393 1R   R17_1    
-        35         23 33101  62182 1L   R18_2    
-        35         24 33101  61597 1R   R18_1    
-        35         25 33101  62187 1L   R18_2    
-        35         26 33101  61602 1R   R18_1    
-        35         27 33101  62192 1L   R18_2    
-        35         28 33101  61607 1R   R18_1    
-        35         29 33101  62197 1L   R18_2    
-        35         30 33101  61612 1R   R18_1    
-        35         31 33101  62202 1L   R18_2    
-        35         32 33101  61619 1R   R18_1    
-        35         33 33101  62207 1L   R18_2    
-        35         34 33101  62237 1R   R18_2    
-        35         35 33101  62212 1L   R18_2    
-        35         36 33101  62242 1R   R18_2    
-        35         37 33101  62217 1L   R18_2    
-        35         38 33101  62247 1R   R18_2    
-        35         39 33101  62222 1L   R18_2    
-        35         40 33101  62252 1R   R18_2    
-        35         41 33101  61591 1L   R18_1    
-        35         42 33101  61594 1R   R18_1    
-        35         43 33101  62183 1L   R18_2    
-        35         44 33101  61598 1R   R18_1    
-        35         45 33101  62188 1L   R18_2    
-        35         46 33101  61603 1R   R18_1    
-        35         47 33101  62193 1L   R18_2    
-        35         48 33101  61608 1R   R18_1    
-        35         49 33101  62198 1L   R18_2    
-        35         50 33101  61613 1R   R18_1    
-        35         51 33101  62203 1L   R18_2    
-        35         52 33101  61620 1R   R18_1    
-        35         53 33101  62208 1L   R18_2    
-        35         54 33101  62238 1R   R18_2    
-        35         55 33101  62213 1L   R18_2    
-        35         56 33101  62243 1R   R18_2    
-        35         57 33101  62218 1L   R18_2    
-        35         58 33101  62248 1R   R18_2    
-        35         59 33101  62223 1L   R18_2    
-        35         60 33101  62253 1R   R18_2    
-        35         61 33101  61592 1L   R18_1    
-        35         62 33101  61595 1R   R18_1    
-        35         63 33101  62184 1L   R18_2    
-        35         64 33101  61599 1R   R18_1    
-        35         65 33101  62189 1L   R18_2    
-        35         66 33101  61604 1R   R18_1    
-        35         67 33101  62194 1L   R18_2    
-        35         68 33101  61609 1R   R18_1    
-        35         69 33101  62199 1L   R18_2    
-        35         70 33101  61614 1R   R18_1    
-        35         71 33101  62204 1L   R18_2    
-        35         72 33101  62255 1R   R18_2    
-        35         73 33101  62209 1L   R18_2    
-        35         74 33101  62239 1R   R18_2    
-        35         75 33101  62214 1L   R18_2    
-        35         76 33101  62244 1R   R18_2    
-        35         77 33101  62219 1L   R18_2    
-        35         78 33101  62249 1R   R18_2    
-        35         79 33101  61001 1L   R17_3    
-        35         80 33101  62254 1R   R18_2    
-        35         81 33101  62224 1L   R18_2    
-        35         82 33101  61616 1R   R18_1    
-        35         83 33101  62185 1L   R18_2    
-        35         84 33101  61600 1R   R18_1    
-        35         85 33101  62190 1L   R18_2    
-        35         86 33101  61605 1R   R18_1    
-        35         87 33101  62195 1L   R18_2    
-        35         88 33101  61610 1R   R18_1    
-        35         89 33101  62200 1L   R18_2    
-        35         90 33101  61615 1R   R18_1    
-        35         91 33101  62205 1L   R18_2    
-        35         92 33101  62256 1R   R18_2    
-        35         93 33101  62210 1L   R18_2    
-        35         94 33101  62240 1R   R18_2    
-        35         95 33101  62215 1L   R18_2    
-        35         96 33101  62245 1R   R18_2    
-        35         97 33101  62220 1L   R18_2    
-        35         98 33101  62250 1R   R18_2    
-        35         99 33101  61593 1L   R18_1    
-        35        100 33101  64001 1R   R18_1    
-        35        101 33101  60734 2L   R17_2    
-        35        102 33101  62321 2R   R18_2    
-        35        103 33101  62266 2L   R18_2    
-        35        104 33101  62326 2R   R18_2    
-        35        105 33101  62271 2L   R18_2    
-        35        106 33101  62331 2R   R18_2    
-        35        107 33101  62276 2L   R18_2    
-        35        108 33101  62336 2R   R18_2    
-        35        109 33101  62281 2L   R18_2    
-        35        110 33101  62341 2R   R18_2    
-        35        111 33101  64002 2L   R18_2    
-        35        112 33101  62346 2R   R18_2    
-        35        113 33101  62291 2L   R18_2    
-        35        114 33101  62351 2R   R18_2    
-        35        115 33101  62296 2L   R18_2    
-        35        116 33101  62356 2R   R18_2    
-        35        117 33101  62301 2L   R18_2    
-        35        118 33101  62361 2R   R18_2    
-        35        119 33101  62311 2L   R18_2    
-        35        120 33101  62366 2R   R18_2    
-        35        121 33101  60751 2L   R17_2    
-        35        122 33101  62322 2R   R18_2    
-        35        123 33101  62267 2L   R18_2    
-        35        124 33101  62327 2R   R18_2    
-        35        125 33101  62272 2L   R18_2    
-        35        126 33101  62332 2R   R18_2    
-        35        127 33101  62277 2L   R18_2    
-        35        128 33101  62337 2R   R18_2    
-        35        129 33101  62282 2L   R18_2    
-        35        130 33101  62342 2R   R18_2    
-        35        131 33101  62287 2L   R18_2    
-        35        132 33101  60433 2R   R17_1    
-        35        133 33101  62292 2L   R18_2    
-        35        134 33101  62352 2R   R18_2    
-        35        135 33101  62297 2L   R18_2    
-        35        136 33101  62357 2R   R18_2    
-        35        137 33101  62302 2L   R18_2    
-        35        138 33101  62362 2R   R18_2    
-        35        139 33101  61005 2L   R17_3    
-        35        140 33101  62367 2R   R18_2    
-        35        141 33101  60752 2L   R17_2    
-        35        142 33101  62323 2R   R18_2    
-        35        143 33101  62268 2L   R18_2    
-        35        144 33101  62328 2R   R18_2    
-        35        145 33101  62273 2L   R18_2    
-        35        146 33101  62333 2R   R18_2    
-        35        147 33101  62278 2L   R18_2    
-        35        148 33101  62338 2R   R18_2    
-        35        149 33101  62283 2L   R18_2    
-        35        150 33101  62343 2R   R18_2    
-        35        151 33101  62288 2L   R18_2    
-        35        152 33101  62348 2R   R18_2    
-        35        153 33101  62293 2L   R18_2    
-        35        154 33101  62353 2R   R18_2    
-        35        155 33101  62298 2L   R18_2    
-        35        156 33101  62358 2R   R18_2    
-        35        157 33101  62303 2L   R18_2    
-        35        158 33101  62363 2R   R18_2    
-        35        159 33101  62308 2L   R18_2    
-        35        160 33101  62368 2R   R18_2    
-        35        161 33101  61003 2L   R17_3    
-        35        162 33101  62324 2R   R18_2    
-        35        163 33101  62269 2L   R18_2    
-        35        164 33101  62329 2R   R18_2    
-        35        165 33101  62274 2L   R18_2    
-        35        166 33101  62334 2R   R18_2    
-        35        167 33101  62279 2L   R18_2    
-        35        168 33101  62339 2R   R18_2    
-        35        169 33101  62284 2L   R18_2    
-        35        170 33101  62344 2R   R18_2    
-        35        171 33101  62289 2L   R18_2    
-        35        172 33101  62349 2R   R18_2    
-        35        173 33101  62294 2L   R18_2    
-        35        174 33101  62354 2R   R18_2    
-        35        175 33101  62299 2L   R18_2    
-        35        176 33101  62359 2R   R18_2    
-        35        177 33101  62304 2L   R18_2    
-        35        178 33101  62364 2R   R18_2    
-        35        179 33101  62309 2L   R18_2    
-        35        180 33101  60758 2R   R17_2    
-        35        181 33101  61004 2L   R17_3    
-        35        182 33101  62325 2R   R18_2    
-        35        183 33101  62270 2L   R18_2    
-        35        184 33101  62330 2R   R18_2    
-        35        185 33101  62275 2L   R18_2    
-        35        186 33101  62335 2R   R18_2    
-        35        187 33101  62280 2L   R18_2    
-        35        188 33101  62340 2R   R18_2    
-        35        189 33101  62285 2L   R18_2    
-        35        190 33101  62345 2R   R18_2    
-        35        191 33101  62290 2L   R18_2    
-        35        192 33101  62350 2R   R18_2    
-        35        193 33101  62295 2L   R18_2    
-        35        194 33101  62355 2R   R18_2    
-        35        195 33101  62300 2L   R18_2    
-        35        196 33101  62360 2R   R18_2    
-        35        197 33101  62305 2L   R18_2    
-        35        198 33101  62365 2R   R18_2    
-        35        199 33101  62310 2L   R18_2    
-        35        200 33101  62370 2R   R18_2    
-        35        201 33101  60461 3L   R17_1    
-        35        202 33101  62431 3R   R18_2    
-        35        203 33101  62376 3L   R18_2    
-        35        204 33101  62436 3R   R18_2    
-        35        205 33101  62386 3L   R18_2    
-        35        206 33101  62446 3R   R18_2    
-        35        207 33101  62381 3L   R18_2    
-        35        208 33101  62441 3R   R18_2    
-        35        209 33101  62391 3L   R18_2    
-        35        210 33101  62451 3R   R18_2    
-        35        211 33101  62396 3L   R18_2    
-        35        212 33101  62456 3R   R18_2    
-        35        213 33101  62401 3L   R18_2    
-        35        214 33101  62461 3R   R18_2    
-        35        215 33101  62406 3L   R18_2    
-        35        216 33101  62466 3R   R18_2    
-        35        217 33101  60459 3L   R17_1    
-        35        218 33101  62471 3R   R18_2    
-        35        219 33101  62416 3L   R18_2    
-        35        220 33101  62476 3R   R18_2    
-        35        221 33101  60462 3L   R17_1    
-        35        222 33101  62432 3R   R18_2    
-        35        223 33101  62377 3L   R18_2    
-        35        224 33101  62437 3R   R18_2    
-        35        225 33101  62387 3L   R18_2    
-        35        226 33101  62447 3R   R18_2    
-        35        227 33101  62382 3L   R18_2    
-        35        228 33101  62442 3R   R18_2    
-        35        229 33101  62392 3L   R18_2    
-        35        230 33101  62452 3R   R18_2    
-        35        231 33101  62397 3L   R18_2    
-        35        232 33101  62457 3R   R18_2    
-        35        233 33101  62402 3L   R18_2    
-        35        234 33101  62462 3R   R18_2    
-        35        235 33101  62407 3L   R18_2    
-        35        236 33101  62467 3R   R18_2    
-        35        237 33101  62412 3L   R18_2    
-        35        238 33101  62472 3R   R18_2    
-        35        239 33101  62417 3L   R18_2    
-        35        240 33101  62477 3R   R18_2    
-        35        241 33101  60463 3L   R17_1    
-        35        242 33101  62433 3R   R18_2    
-        35        243 33101  62378 3L   R18_2    
-        35        244 33101  60490 3R   R17_1    
-        35        245 33101  62388 3L   R18_2    
-        35        246 33101  62448 3R   R18_2    
-        35        247 33101  62383 3L   R18_2    
-        35        248 33101  62443 3R   R18_2    
-        35        249 33101  62393 3L   R18_2    
-        35        250 33101  62453 3R   R18_2    
-        35        251 33101  62398 3L   R18_2    
-        35        252 33101  62458 3R   R18_2    
-        35        253 33101  62403 3L   R18_2    
-        35        254 33101  62463 3R   R18_2    
-        35        255 33101  62408 3L   R18_2    
-        35        256 33101  62468 3R   R18_2    
-        35        257 33101  62413 3L   R18_2    
-        35        258 33101  62473 3R   R18_2    
-        35        259 33101  62418 3L   R18_2    
-        35        260 33101  62478 3R   R18_2    
-        35        261 33101  60464 3L   R17_1    
-        35        262 33101  62434 3R   R18_2    
-        35        263 33101  62379 3L   R18_2    
-        35        264 33101  62439 3R   R18_2    
-        35        265 33101  62389 3L   R18_2    
-        35        266 33101  62449 3R   R18_2    
-        35        267 33101  62384 3L   R18_2    
-        35        268 33101  62444 3R   R18_2    
-        35        269 33101  62394 3L   R18_2    
-        35        270 33101  62454 3R   R18_2    
-        35        271 33101  62399 3L   R18_2    
-        35        272 33101  62459 3R   R18_2    
-        35        273 33101  62404 3L   R18_2    
-        35        274 33101  62464 3R   R18_2    
-        35        275 33101  62409 3L   R18_2    
-        35        276 33101  62469 3R   R18_2    
-        35        277 33101  60460 3L   R17_1    
-        35        278 33101  62474 3R   R18_2    
-        35        279 33101  62419 3L   R18_2    
-        35        280 33101  60499 3R   R17_1    
-        35        281 33101  60458 3L   R17_1    
-        35        282 33101  62435 3R   R18_2    
-        35        283 33101  62380 3L   R18_2    
-        35        284 33101  62440 3R   R18_2    
-        35        285 33101  62390 3L   R18_2    
-        35        286 33101  62450 3R   R18_2    
-        35        287 33101  62385 3L   R18_2    
-        35        288 33101  62445 3R   R18_2    
-        35        289 33101  62395 3L   R18_2    
-        35        290 33101  62455 3R   R18_2    
-        35        291 33101  62400 3L   R18_2    
-        35        292 33101  62460 3R   R18_2    
-        35        293 33101  62405 3L   R18_2    
-        35        294 33101  62465 3R   R18_2    
-        35        295 33101  62410 3L   R18_2    
-        35        296 33101  62470 3R   R18_2    
-        35        297 33101  62415 3L   R18_2    
-        35        298 33101  62475 3R   R18_2    
-        35        299 33101  62420 3L   R18_2    
-        35        300 33101  60500 3R   R17_1    
-        35        301 33101  62486 4L   R18_2    
-        35        302 33101  62506 4R   R18_2    
-        35        303 33101  62484 4L   R18_2    
-        35        304 33101  62511 4R   R18_2    
-        35        305 33101  62496 4L   R18_2    
-        35        306 33101  62516 4R   R18_2    
-        35        307 33101  62501 4L   R18_2    
-        35        308 33101  62521 4R   R18_2    
-        35        309 33101  60791 4L   R17_2    
-        35        310 33101  60814 4R   R17_2    
-        35        311 33101  61006 4L   R17_3    
-        35        312 33101  61011 4R   R17_3    
-        35        313 33101  62566 4L   R18_3    
-        35        314 33101  62526 4R   R18_2    
-        35        315 33101  62571 4L   R18_3    
-        35        316 33101  62531 4R   R18_2    
-        35        317 33101  62576 4L   R18_3    
-        35        318 33101  62536 4R   R18_2    
-        35        319 33101  62581 4L   R18_3    
-        35        320 33101  62541 4R   R18_2    
-        35        321 33101  62487 4L   R18_2    
-        35        322 33101  62507 4R   R18_2    
-        35        323 33101  62492 4L   R18_2    
-        35        324 33101  62512 4R   R18_2    
-        35        325 33101  62497 4L   R18_2    
-        35        326 33101  62517 4R   R18_2    
-        35        327 33101  62502 4L   R18_2    
-        35        328 33101  62522 4R   R18_2    
-        35        329 33101  60795 4L   R17_2    
-        35        330 33101  60838 4R   R17_2    
-        35        331 33101  61007 4L   R17_3    
-        35        332 33101  61012 4R   R17_3    
-        35        333 33101  62567 4L   R18_3    
-        35        334 33101  62527 4R   R18_2    
-        35        335 33101  62572 4L   R18_3    
-        35        336 33101  62532 4R   R18_2    
-        35        337 33101  62577 4L   R18_3    
-        35        338 33101  62537 4R   R18_2    
-        35        339 33101  62582 4L   R18_3    
-        35        340 33101  62542 4R   R18_2    
-        35        341 33101  62488 4L   R18_2    
-        35        342 33101  62508 4R   R18_2    
-        35        343 33101  62493 4L   R18_2    
-        35        344 33101  62513 4R   R18_2    
-        35        345 33101  62498 4L   R18_2    
-        35        346 33101  62518 4R   R18_2    
-        35        347 33101  62503 4L   R18_2    
-        35        348 33101  62523 4R   R18_2    
-        35        349 33101  60796 4L   R17_2    
-        35        350 33101  61016 4R   R17_3    
-        35        351 33101  61008 4L   R17_3    
-        35        352 33101  61013 4R   R17_3    
-        35        353 33101  62568 4L   R18_3    
-        35        354 33101  62528 4R   R18_2    
-        35        355 33101  62573 4L   R18_3    
-        35        356 33101  62533 4R   R18_2    
-        35        357 33101  62578 4L   R18_3    
-        35        358 33101  62538 4R   R18_2    
-        35        359 33101  62583 4L   R18_3    
-        35        360 33101  62543 4R   R18_2    
-        35        361 33101  62489 4L   R18_2    
-        35        362 33101  62509 4R   R18_2    
-        35        363 33101  62494 4L   R18_2    
-        35        364 33101  62514 4R   R18_2    
-        35        365 33101  62499 4L   R18_2    
-        35        366 33101  62519 4R   R18_2    
-        35        367 33101  62485 4L   R18_2    
-        35        368 33101  62524 4R   R18_2    
-        35        369 33101  60797 4L   R17_2    
-        35        370 33101  61017 4R   R17_3    
-        35        371 33101  61009 4L   R17_3    
-        35        372 33101  61014 4R   R17_3    
-        35        373 33101  62569 4L   R18_3    
-        35        374 33101  62529 4R   R18_2    
-        35        375 33101  62574 4L   R18_3    
-        35        376 33101  62534 4R   R18_2    
-        35        377 33101  62579 4L   R18_3    
-        35        378 33101  62539 4R   R18_2    
-        35        379 33101  62584 4L   R18_3    
-        35        380 33101  62504 4R   R18_2    
-        35        381 33101  62490 4L   R18_2    
-        35        382 33101  62510 4R   R18_2    
-        35        383 33101  62495 4L   R18_2    
-        35        384 33101  62515 4R   R18_2    
-        35        385 33101  62500 4L   R18_2    
-        35        386 33101  62520 4R   R18_2    
-        35        387 33101  62586 4L   R18_3    
-        35        388 33101  62525 4R   R18_2    
-        35        389 33101  60798 4L   R17_2    
-        35        390 33101  61018 4R   R17_3    
-        35        391 33101  61010 4L   R17_3    
-        35        392 33101  61015 4R   R17_3    
-        35        393 33101  62570 4L   R18_3    
-        35        394 33101  62530 4R   R18_2    
-        35        395 33101  62575 4L   R18_3    
-        35        396 33101  62535 4R   R18_2    
-        35        397 33101  62580 4L   R18_3    
-        35        398 33101  62540 4R   R18_2    
-        35        399 33101  62585 4L   R18_3    
-        35        400 33101  62505 4R   R18_2    
-        35        401 33101  62596 5L   R18_3    
-        35        402 33101  60847 5R   R17_2    
-        35        403 33101  60839 5L   R17_2    
-        35        404 33101  62656 5R   R18_3    
-        35        405 33101  62606 5L   R18_3    
-        35        406 33101  62661 5R   R18_3    
-        35        407 33101  62611 5L   R18_3    
-        35        408 33101  62666 5R   R18_3    
-        35        409 33101  62616 5L   R18_3    
-        35        410 33101  62681 5R   R18_3    
-        35        411 33101  62621 5L   R18_3    
-        35        412 33101  62671 5R   R18_3    
-        35        413 33101  62626 5L   R18_3    
-        35        414 33101  62676 5R   R18_3    
-        35        415 33101  62631 5L   R18_3    
-        35        416 33101  62686 5R   R18_3    
-        35        417 33101  62636 5L   R18_3    
-        35        418 33101  62696 5R   R18_3    
-        35        419 33101  62641 5L   R18_3    
-        35        420 33101  62701 5R   R18_3    
-        35        421 33101  62597 5L   R18_3    
-        35        422 33101  60889 5R   R17_2    
-        35        423 33101  62602 5L   R18_3    
-        35        424 33101  62657 5R   R18_3    
-        35        425 33101  62607 5L   R18_3    
-        35        426 33101  62662 5R   R18_3    
-        35        427 33101  62612 5L   R18_3    
-        35        428 33101  62667 5R   R18_3    
-        35        429 33101  62617 5L   R18_3    
-        35        430 33101  62682 5R   R18_3    
-        35        431 33101  62622 5L   R18_3    
-        35        432 33101  62672 5R   R18_3    
-        35        433 33101  62627 5L   R18_3    
-        35        434 33101  62677 5R   R18_3    
-        35        435 33101  62632 5L   R18_3    
-        35        436 33101  62687 5R   R18_3    
-        35        437 33101  62637 5L   R18_3    
-        35        438 33101  62692 5R   R18_3    
-        35        439 33101  62642 5L   R18_3    
-        35        440 33101  62697 5R   R18_3    
-        35        441 33101  62598 5L   R18_3    
-        35        442 33101  62653 5R   R18_3    
-        35        443 33101  62603 5L   R18_3    
-        35        444 33101  62658 5R   R18_3    
-        35        445 33101  62608 5L   R18_3    
-        35        446 33101  62663 5R   R18_3    
-        35        447 33101  62613 5L   R18_3    
-        35        448 33101  62668 5R   R18_3    
-        35        449 33101  62618 5L   R18_3    
-        35        450 33101  62683 5R   R18_3    
-        35        451 33101  62623 5L   R18_3    
-        35        452 33101  62673 5R   R18_3    
-        35        453 33101  62628 5L   R18_3    
-        35        454 33101  62678 5R   R18_3    
-        35        455 33101  62633 5L   R18_3    
-        35        456 33101  62689 5R   R18_3    
-        35        457 33101  62638 5L   R18_3    
-        35        458 33101  62693 5R   R18_3    
-        35        459 33101  62643 5L   R18_3    
-        35        460 33101  62698 5R   R18_3    
-        35        461 33101  62599 5L   R18_3    
-        35        462 33101  62654 5R   R18_3    
-        35        463 33101  62604 5L   R18_3    
-        35        464 33101  62659 5R   R18_3    
-        35        465 33101  62609 5L   R18_3    
-        35        466 33101  62664 5R   R18_3    
-        35        467 33101  62614 5L   R18_3    
-        35        468 33101  62669 5R   R18_3    
-        35        469 33101  62619 5L   R18_3    
-        35        470 33101  62684 5R   R18_3    
-        35        471 33101  62624 5L   R18_3    
-        35        472 33101  62674 5R   R18_3    
-        35        473 33101  62629 5L   R18_3    
-        35        474 33101  62679 5R   R18_3    
-        35        475 33101  62634 5L   R18_3    
-        35        476 33101  62690 5R   R18_3    
-        35        477 33101  62639 5L   R18_3    
-        35        478 33101  62694 5R   R18_3    
-        35        479 33101  62644 5L   R18_3    
-        35        480 33101  62699 5R   R18_3    
-        35        481 33101  62600 5L   R18_3    
-        35        482 33101  62655 5R   R18_3    
-        35        483 33101  62605 5L   R18_3    
-        35        484 33101  62660 5R   R18_3    
-        35        485 33101  62610 5L   R18_3    
-        35        486 33101  62665 5R   R18_3    
-        35        487 33101  62615 5L   R18_3    
-        35        488 33101  62670 5R   R18_3    
-        35        489 33101  62620 5L   R18_3    
-        35        490 33101  62685 5R   R18_3    
-        35        491 33101  62625 5L   R18_3    
-        35        492 33101  62675 5R   R18_3    
-        35        493 33101  62630 5L   R18_3    
-        35        494 33101  62680 5R   R18_3    
-        35        495 33101  62635 5L   R18_3    
-        35        496 33101  62691 5R   R18_3    
-        35        497 33101  62640 5L   R18_3    
-        35        498 33101  62695 5R   R18_3    
-        35        499 33101  61055 5L   R17_3    
-        35        500 33101  62700 5R   R18_3    
-        35        501 33101  61864 6L   R18_1    
-        35        502 33101  61877 6R   R18_1    
-        35        503 33101  61859 6L   R18_1    
-        35        504 33101  61183 6R   R17_3    
-        35        505 33101  61849 6L   R18_1    
-        35        506 33101  61163 6R   R17_3    
-        35        507 33101  61853 6L   R18_1    
-        35        508 33101  61178 6R   R17_3    
-        35        509 33101  61834 6L   R18_1    
-        35        510 33101  61173 6R   R17_3    
-        35        511 33101  61844 6L   R18_1    
-        35        512 33101  61168 6R   R17_3    
-        35        513 33101  61839 6L   R18_1    
-        35        514 33101  61158 6R   R17_3    
-        35        515 33101  61869 6L   R18_1    
-        35        516 33101  61153 6R   R17_3    
-        35        517 33101  61148 6L   R17_3    
-        35        518 33101  60648 6R   R17_1    
-        35        519 33101  60589 6L   R17_1    
-        35        520 33101  60628 6R   R17_1    
-        35        521 33101  61865 6L   R18_1    
-        35        522 33101  61878 6R   R18_1    
-        35        523 33101  61860 6L   R18_1    
-        35        524 33101  61184 6R   R17_3    
-        35        525 33101  61841 6L   R18_1    
-        35        526 33101  61164 6R   R17_3    
-        35        527 33101  61855 6L   R18_1    
-        35        528 33101  61179 6R   R17_3    
-        35        529 33101  61835 6L   R18_1    
-        35        530 33101  61174 6R   R17_3    
-        35        531 33101  61845 6L   R18_1    
-        35        532 33101  61169 6R   R17_3    
-        35        533 33101  61840 6L   R18_1    
-        35        534 33101  61159 6R   R17_3    
-        35        535 33101  61870 6L   R18_1    
-        35        536 33101  61154 6R   R17_3    
-        35        537 33101  61149 6L   R17_3    
-        35        538 33101  60649 6R   R17_1    
-        35        539 33101  60590 6L   R17_1    
-        35        540 33101  60629 6R   R17_1    
-        35        541 33101  61866 6L   R18_1    
-        35        542 33101  61879 6R   R18_1    
-        35        543 33101  61861 6L   R18_1    
-        35        544 33101  61185 6R   R17_3    
-        35        545 33101  61843 6L   R18_1    
-        35        546 33101  61165 6R   R17_3    
-        35        547 33101  61856 6L   R18_1    
-        35        548 33101  61180 6R   R17_3    
-        35        549 33101  61836 6L   R18_1    
-        35        550 33101  61175 6R   R17_3    
-        35        551 33101  61846 6L   R18_1    
-        35        552 33101  61170 6R   R17_3    
-        35        553 33101  61850 6L   R18_1    
-        35        554 33101  61160 6R   R17_3    
-        35        555 33101  61872 6L   R18_1    
-        35        556 33101  61155 6R   R17_3    
-        35        557 33101  61150 6L   R17_3    
-        35        558 33101  60650 6R   R17_1    
-        35        559 33101  60591 6L   R17_1    
-        35        560 33101  60630 6R   R17_1    
-        35        561 33101  61867 6L   R18_1    
-        35        562 33101  61880 6R   R18_1    
-        35        563 33101  61875 6L   R18_1    
-        35        564 33101  61186 6R   R17_3    
-        35        565 33101  61852 6L   R18_1    
-        35        566 33101  61166 6R   R17_3    
-        35        567 33101  61857 6L   R18_1    
-        35        568 33101  61181 6R   R17_3    
-        35        569 33101  61837 6L   R18_1    
-        35        570 33101  61176 6R   R17_3    
-        35        571 33101  61847 6L   R18_1    
-        35        572 33101  61171 6R   R17_3    
-        35        573 33101  61842 6L   R18_1    
-        35        574 33101  61161 6R   R17_3    
-        35        575 33101  61873 6L   R18_1    
-        35        576 33101  61156 6R   R17_3    
-        35        577 33101  61151 6L   R17_3    
-        35        578 33101  60651 6R   R17_1    
-        35        579 33101  60592 6L   R17_1    
-        35        580 33101  60631 6R   R17_1    
-        35        581 33101  61868 6L   R18_1    
-        35        582 33101  61881 6R   R18_1    
-        35        583 33101  61876 6L   R18_1    
-        35        584 33101  61187 6R   R17_3    
-        35        585 33101  61854 6L   R18_1    
-        35        586 33101  45953 6R   R17_3    
-        35        587 33101  61858 6L   R18_1    
-        35        588 33101  61182 6R   R17_3    
-        35        589 33101  61838 6L   R18_1    
-        35        590 33101  61177 6R   R17_3    
-        35        591 33101  61848 6L   R18_1    
-        35        592 33101  61172 6R   R17_3    
-        35        593 33101  61851 6L   R18_1    
-        35        594 33101  61162 6R   R17_3    
-        35        595 33101  61874 6L   R18_1    
-        35        596 33101  61157 6R   R17_3    
-        35        597 33101  61152 6L   R17_3    
-        35        598 33101  60652 6R   R17_1    
-        35        599 33101  60593 6L   R17_1    
-        35        600 33101  60632 6R   R17_1    
-        35        601 33101  61927 7L   R18_1    
-        35        602 33101  61212 7R   R17_3    
-        35        603 33101  61912 7L   R18_1    
-        35        604 33101  61966 7R   R18_1    
-        35        605 33101  61907 7L   R18_1    
-        35        606 33101  61961 7R   R18_1    
-        35        607 33101  61902 7L   R18_1    
-        35        608 33101  61956 7R   R18_1    
-        35        609 33101  61897 7L   R18_1    
-        35        610 33101  61951 7R   R18_1    
-        35        611 33101  61887 7L   R18_1    
-        35        612 33101  61971 7R   R18_1    
-        35        613 33101  61882 7L   R18_1    
-        35        614 33101  61946 7R   R18_1    
-        35        615 33101  61209 7L   R17_3    
-        35        616 33101  61941 7R   R18_1    
-        35        617 33101  61922 7L   R18_1    
-        35        618 33101  61936 7R   R18_1    
-        35        619 33101  61917 7L   R18_1    
-        35        620 33101  61931 7R   R18_1    
-        35        621 33101  61928 7L   R18_1    
-        35        622 33101  61976 7R   R18_1    
-        35        623 33101  61913 7L   R18_1    
-        35        624 33101  61967 7R   R18_1    
-        35        625 33101  61908 7L   R18_1    
-        35        626 33101  61962 7R   R18_1    
-        35        627 33101  61903 7L   R18_1    
-        35        628 33101  61957 7R   R18_1    
-        35        629 33101  61898 7L   R18_1    
-        35        630 33101  61952 7R   R18_1    
-        35        631 33101  61888 7L   R18_1    
-        35        632 33101  61972 7R   R18_1    
-        35        633 33101  61883 7L   R18_1    
-        35        634 33101  61947 7R   R18_1    
-        35        635 33101  61210 7L   R17_3    
-        35        636 33101  61942 7R   R18_1    
-        35        637 33101  61923 7L   R18_1    
-        35        638 33101  61937 7R   R18_1    
-        35        639 33101  61918 7L   R18_1    
-        35        640 33101  61932 7R   R18_1    
-        35        641 33101  61929 7L   R18_1    
-        35        642 33101  61978 7R   R18_1    
-        35        643 33101  61914 7L   R18_1    
-        35        644 33101  61968 7R   R18_1    
-        35        645 33101  61909 7L   R18_1    
-        35        646 33101  61963 7R   R18_1    
-        35        647 33101  61904 7L   R18_1    
-        35        648 33101  61958 7R   R18_1    
-        35        649 33101  61899 7L   R18_1    
-        35        650 33101  61953 7R   R18_1    
-        35        651 33101  61889 7L   R18_1    
-        35        652 33101  61973 7R   R18_1    
-        35        653 33101  61884 7L   R18_1    
-        35        654 33101  61948 7R   R18_1    
-        35        655 33101  61211 7L   R17_3    
-        35        656 33101  61943 7R   R18_1    
-        35        657 33101  61924 7L   R18_1    
-        35        658 33101  61938 7R   R18_1    
-        35        659 33101  61919 7L   R18_1    
-        35        660 33101  61933 7R   R18_1    
-        35        661 33101  61930 7L   R18_1    
-        35        662 33101  61979 7R   R18_1    
-        35        663 33101  61915 7L   R18_1    
-        35        664 33101  61969 7R   R18_1    
-        35        665 33101  61910 7L   R18_1    
-        35        666 33101  61964 7R   R18_1    
-        35        667 33101  61905 7L   R18_1    
-        35        668 33101  61959 7R   R18_1    
-        35        669 33101  61900 7L   R18_1    
-        35        670 33101  61954 7R   R18_1    
-        35        671 33101  61890 7L   R18_1    
-        35        672 33101  61974 7R   R18_1    
-        35        673 33101  61885 7L   R18_1    
-        35        674 33101  61949 7R   R18_1    
-        35        675 30301    189 7L   B02      
-        35        676 33101  61944 7R   R18_1    
-        35        677 33101  61925 7L   R18_1    
-        35        678 33101  61939 7R   R18_1    
-        35        679 33101  61920 7L   R18_1    
-        35        680 33101  61934 7R   R18_1    
-        35        681 33101  61895 7L   R18_1    
-        35        682 33101  61980 7R   R18_1    
-        35        683 33101  61916 7L   R18_1    
-        35        684 33101  61970 7R   R18_1    
-        35        685 33101  61911 7L   R18_1    
-        35        686 33101  61965 7R   R18_1    
-        35        687 33101  61906 7L   R18_1    
-        35        688 33101  61960 7R   R18_1    
-        35        689 33101  61901 7L   R18_1    
-        35        690 33101  61955 7R   R18_1    
-        35        691 33101  61891 7L   R18_1    
-        35        692 33101  61975 7R   R18_1    
-        35        693 33101  61886 7L   R18_1    
-        35        694 33101  61950 7R   R18_1    
-        35        695 30301    192 7L   B02      
-        35        696 33101  61945 7R   R18_1    
-        35        697 33101  61926 7L   R18_1    
-        35        698 33101  61940 7R   R18_1    
-        35        699 33101  61921 7L   R18_1    
-        35        700 33101  61935 7R   R18_1    
-        35        701 33101  62026 8L   R18_1    
-        35        702 33101  62076 8R   R18_1    
-        35        703 33101  61996 8L   R18_1    
-        35        704 33101  62075 8R   R18_1    
-        35        705 33101  61991 8L   R18_1    
-        35        706 33101  62061 8R   R18_1    
-        35        707 33101  61986 8L   R18_1    
-        35        708 33101  62056 8R   R18_1    
-        35        709 33101  61981 8L   R18_1    
-        35        710 33101  60934 8R   R17_2    
-        35        711 33101  62021 8L   R18_1    
-        35        712 33101  62051 8R   R18_1    
-        35        713 33101  62016 8L   R18_1    
-        35        714 33101  62046 8R   R18_1    
-        35        715 33101  62011 8L   R18_1    
-        35        716 33101  62041 8R   R18_1    
-        35        717 33101  62006 8L   R18_1    
-        35        718 33101  62036 8R   R18_1    
-        35        719 33101  62001 8L   R18_1    
-        35        720 33101  62031 8R   R18_1    
-        35        721 33101  62027 8L   R18_1    
-        35        722 33101  61237 8R   R17_3    
-        35        723 33101  61997 8L   R18_1    
-        35        724 33101  62067 8R   R18_1    
-        35        725 33101  61992 8L   R18_1    
-        35        726 33101  62073 8R   R18_1    
-        35        727 33101  61987 8L   R18_1    
-        35        728 33101  62057 8R   R18_1    
-        35        729 33101  61982 8L   R18_1    
-        35        730 33101  60935 8R   R17_2    
-        35        731 33101  62022 8L   R18_1    
-        35        732 33101  62052 8R   R18_1    
-        35        733 33101  62017 8L   R18_1    
-        35        734 33101  62047 8R   R18_1    
-        35        735 33101  62012 8L   R18_1    
-        35        736 33101  62042 8R   R18_1    
-        35        737 33101  62007 8L   R18_1    
-        35        738 33101  62037 8R   R18_1    
-        35        739 33101  62002 8L   R18_1    
-        35        740 33101  62032 8R   R18_1    
-        35        741 33101  62028 8L   R18_1    
-        35        742 33101  61238 8R   R17_3    
-        35        743 33101  61998 8L   R18_1    
-        35        744 33101  62068 8R   R18_1    
-        35        745 33101  61993 8L   R18_1    
-        35        746 33101  62063 8R   R18_1    
-        35        747 33101  61234 8L   R17_3    
-        35        748 33101  62058 8R   R18_1    
-        35        749 33101  61983 8L   R18_1    
-        35        750 33101  60936 8R   R17_2    
-        35        751 33101  62023 8L   R18_1    
-        35        752 33101  62053 8R   R18_1    
-        35        753 33101  62018 8L   R18_1    
-        35        754 33101  62048 8R   R18_1    
-        35        755 33101  62013 8L   R18_1    
-        35        756 33101  62043 8R   R18_1    
-        35        757 33101  62008 8L   R18_1    
-        35        758 33101  62038 8R   R18_1    
-        35        759 33101  62003 8L   R18_1    
-        35        760 33101  62033 8R   R18_1    
-        35        761 33101  62029 8L   R18_1    
-        35        762 33101  62060 8R   R18_1    
-        35        763 33101  61999 8L   R18_1    
-        35        764 33101  62069 8R   R18_1    
-        35        765 33101  61994 8L   R18_1    
-        35        766 33101  62064 8R   R18_1    
-        35        767 33101  61235 8L   R17_3    
-        35        768 33101  62059 8R   R18_1    
-        35        769 33101  61984 8L   R18_1    
-        35        770 33101  60937 8R   R17_2    
-        35        771 33101  62024 8L   R18_1    
-        35        772 33101  62054 8R   R18_1    
-        35        773 33101  62019 8L   R18_1    
-        35        774 33101  62049 8R   R18_1    
-        35        775 33101  62014 8L   R18_1    
-        35        776 33101  62044 8R   R18_1    
-        35        777 33101  62009 8L   R18_1    
-        35        778 33101  62039 8R   R18_1    
-        35        779 33101  62004 8L   R18_1    
-        35        780 33101  62034 8R   R18_1    
-        35        781 33101  62030 8L   R18_1    
-        35        782 33101  62062 8R   R18_1    
-        35        783 33101  62000 8L   R18_1    
-        35        784 33101  62070 8R   R18_1    
-        35        785 33101  61995 8L   R18_1    
-        35        786 33101  62065 8R   R18_1    
-        35        787 33101  61236 8L   R17_3    
-        35        788 33101  62071 8R   R18_1    
-        35        789 33101  61985 8L   R18_1    
-        35        790 33101  60938 8R   R17_2    
-        35        791 33101  62025 8L   R18_1    
-        35        792 33101  62055 8R   R18_1    
-        35        793 33101  62020 8L   R18_1    
-        35        794 33101  62050 8R   R18_1    
-        35        795 33101  62015 8L   R18_1    
-        35        796 33101  62045 8R   R18_1    
-        35        797 33101  62010 8L   R18_1    
-        35        798 33101  62040 8R   R18_1    
-        35        799 33101  62005 8L   R18_1    
-        35        800 33101  62035 8R   R18_1    
-        35        801 33101  61255 9L   R17_3    
-        35        802 33101  62176 9R   R18_1    
-        35        803 33101  62122 9L   R18_1    
-        35        804 33101  62171 9R   R18_1    
-        35        805 33101  62117 9L   R18_1    
-        35        806 33101  62166 9R   R18_1    
-        35        807 33101  62112 9L   R18_1    
-        35        808 33101  62161 9R   R18_1    
-        35        809 33101  62077 9L   R18_1    
-        35        810 33101  62131 9R   R18_1    
-        35        811 33101  62107 9L   R18_1    
-        35        812 33101  62156 9R   R18_1    
-        35        813 33101  62097 9L   R18_1    
-        35        814 33101  62151 9R   R18_1    
-        35        815 33101  62092 9L   R18_1    
-        35        816 33101  62146 9R   R18_1    
-        35        817 33101  62087 9L   R18_1    
-        35        818 33101  62141 9R   R18_1    
-        35        819 33101  62082 9L   R18_1    
-        35        820 33101  62136 9R   R18_1    
-        35        821 33101  61250 9L   R17_3    
-        35        822 33101  61282 9R   R17_3    
-        35        823 33101  62123 9L   R18_1    
-        35        824 33101  62172 9R   R18_1    
-        35        825 33101  62118 9L   R18_1    
-        35        826 33101  62126 9R   R18_1    
-        35        827 33101  62113 9L   R18_1    
-        35        828 33101  62162 9R   R18_1    
-        35        829 33101  62078 9L   R18_1    
-        35        830 33101  62132 9R   R18_1    
-        35        831 33101  62108 9L   R18_1    
-        35        832 33101  62157 9R   R18_1    
-        35        833 33101  62098 9L   R18_1    
-        35        834 33101  62152 9R   R18_1    
-        35        835 33101  62093 9L   R18_1    
-        35        836 33101  62147 9R   R18_1    
-        35        837 33101  62088 9L   R18_1    
-        35        838 33101  62142 9R   R18_1    
-        35        839 33101  62083 9L   R18_1    
-        35        840 33101  62137 9R   R18_1    
-        35        841 33101  61251 9L   R17_3    
-        35        842 33101  62128 9R   R18_1    
-        35        843 33101  62124 9L   R18_1    
-        35        844 33101  62173 9R   R18_1    
-        35        845 33101  62119 9L   R18_1    
-        35        846 33101  62168 9R   R18_1    
-        35        847 33101  62114 9L   R18_1    
-        35        848 33101  62163 9R   R18_1    
-        35        849 33101  62079 9L   R18_1    
-        35        850 33101  62133 9R   R18_1    
-        35        851 33101  62109 9L   R18_1    
-        35        852 33101  62158 9R   R18_1    
-        35        853 33101  62099 9L   R18_1    
-        35        854 33101  62153 9R   R18_1    
-        35        855 33101  62094 9L   R18_1    
-        35        856 33101  62148 9R   R18_1    
-        35        857 33101  62089 9L   R18_1    
-        35        858 33101  62143 9R   R18_1    
-        35        859 33101  62084 9L   R18_1    
-        35        860 33101  62138 9R   R18_1    
-        35        861 33101  61252 9L   R17_3    
-        35        862 33101  62129 9R   R18_1    
-        35        863 33101  62125 9L   R18_1    
-        35        864 33101  62174 9R   R18_1    
-        35        865 33101  62120 9L   R18_1    
-        35        866 33101  62169 9R   R18_1    
-        35        867 33101  62115 9L   R18_1    
-        35        868 33101  62164 9R   R18_1    
-        35        869 33101  62080 9L   R18_1    
-        35        870 33101  62134 9R   R18_1    
-        35        871 33101  62110 9L   R18_1    
-        35        872 33101  62159 9R   R18_1    
-        35        873 33101  62100 9L   R18_1    
-        35        874 33101  62154 9R   R18_1    
-        35        875 33101  62095 9L   R18_1    
-        35        876 33101  62149 9R   R18_1    
-        35        877 33101  62090 9L   R18_1    
-        35        878 33101  62144 9R   R18_1    
-        35        879 33101  62085 9L   R18_1    
-        35        880 33101  62139 9R   R18_1    
-        35        881 33101  61253 9L   R17_3    
-        35        882 33101  62130 9R   R18_1    
-        35        883 33101  62106 9L   R18_1    
-        35        884 33101  62175 9R   R18_1    
-        35        885 33101  62121 9L   R18_1    
-        35        886 33101  62170 9R   R18_1    
-        35        887 33101  62116 9L   R18_1    
-        35        888 33101  62165 9R   R18_1    
-        35        889 33101  62081 9L   R18_1    
-        35        890 33101  62135 9R   R18_1    
-        35        891 33101  62111 9L   R18_1    
-        35        892 33101  62160 9R   R18_1    
-        35        893 33101  62101 9L   R18_1    
-        35        894 33101  62155 9R   R18_1    
-        35        895 33101  62096 9L   R18_1    
-        35        896 33101  62150 9R   R18_1    
-        35        897 33101  62091 9L   R18_1    
-        35        898 33101  62145 9R   R18_1    
-        35        899 33101  62086 9L   R18_1    
-        35        900 33101  62140 9R   R18_1    
-        35        901 33101  61323 10L  R17_3    
-        35        902 33101  61344 10R  R17_3    
-        35        903 33101  61303 10L  R17_3    
-        35        904 33101  61339 10R  R17_3    
-        35        905 33101  61298 10L  R17_3    
-        35        906 33101  61334 10R  R17_3    
-        35        907 33101  61293 10L  R17_3    
-        35        908 33101  61329 10R  R17_3    
-        35        909 33101  60088 10L  R16_3    
-        35        910 33101  60653 10R  R17_1    
-        35        911 33101  61318 10L  R17_3    
-        35        912 33101  60969 10R  R17_2    
-        35        913 33101  61313 10L  R17_3    
-        35        914 33101  60964 10R  R17_2    
-        35        915 33101  61308 10L  R17_3    
-        35        916 33101  60959 10R  R17_2    
-        35        917 33101  61288 10L  R17_3    
-        35        918 33101  60954 10R  R17_2    
-        35        919 33101  61283 10L  R17_3    
-        35        920 33101  60949 10R  R17_2    
-        35        921 33101  61324 10L  R17_3    
-        35        922 33101  61345 10R  R17_3    
-        35        923 33101  61304 10L  R17_3    
-        35        924 33101  61340 10R  R17_3    
-        35        925 33101  61299 10L  R17_3    
-        35        926 33101  61335 10R  R17_3    
-        35        927 33101  61294 10L  R17_3    
-        35        928 33101  61330 10R  R17_3    
-        35        929 33101  60089 10L  R16_3    
-        35        930 33101  60654 10R  R17_1    
-        35        931 33101  61319 10L  R17_3    
-        35        932 33101  60970 10R  R17_2    
-        35        933 33101  61314 10L  R17_3    
-        35        934 33101  60965 10R  R17_2    
-        35        935 33101  61309 10L  R17_3    
-        35        936 33101  60960 10R  R17_2    
-        35        937 33101  61289 10L  R17_3    
-        35        938 33101  60955 10R  R17_2    
-        35        939 33101  61284 10L  R17_3    
-        35        940 33101  60950 10R  R17_2    
-        35        941 33101  61325 10L  R17_3    
-        35        942 33101  61346 10R  R17_3    
-        35        943 33101  61305 10L  R17_3    
-        35        944 33101  61341 10R  R17_3    
-        35        945 33101  61328 10L  R17_3    
-        35        946 33101  61336 10R  R17_3    
-        35        947 33101  61295 10L  R17_3    
-        35        948 33101  61331 10R  R17_3    
-        35        949 33101  60063 10L  R16_3    
-        35        950 33101  60107 10R  R16_3    
-        35        951 33101  61320 10L  R17_3    
-        35        952 33101  60971 10R  R17_2    
-        35        953 33101  61315 10L  R17_3    
-        35        954 33101  60966 10R  R17_2    
-        35        955 33101  61310 10L  R17_3    
-        35        956 33101  60961 10R  R17_2    
-        35        957 33101  61327 10L  R17_3    
-        35        958 33101  60956 10R  R17_2    
-        35        959 33101  61285 10L  R17_3    
-        35        960 33101  60951 10R  R17_2    
-        35        961 33101  61326 10L  R17_3    
-        35        962 33101  61347 10R  R17_3    
-        35        963 33101  61306 10L  R17_3    
-        35        964 33101  61342 10R  R17_3    
-        35        965 33101  61301 10L  R17_3    
-        35        966 33101  61337 10R  R17_3    
-        35        967 33101  61302 10L  R17_3    
-        35        968 33101  61332 10R  R17_3    
-        35        969 33101  60064 10L  R16_3    
-        35        970 33101  60108 10R  R16_3    
-        35        971 33101  61321 10L  R17_3    
-        35        972 33101  60972 10R  R17_2    
-        35        973 33101  61316 10L  R17_3    
-        35        974 33101  60967 10R  R17_2    
-        35        975 33101  61311 10L  R17_3    
-        35        976 33101  60962 10R  R17_2    
-        35        977 33101  61291 10L  R17_3    
-        35        978 33101  60957 10R  R17_2    
-        35        979 33101  61286 10L  R17_3    
-        35        980 33101  60952 10R  R17_2    
-        35        981 33101  61290 10L  R17_3    
-        35        982 33101  61348 10R  R17_3    
-        35        983 33101  61307 10L  R17_3    
-        35        984 33101  61343 10R  R17_3    
-        35        985 33101  61296 10L  R17_3    
-        35        986 33101  61338 10R  R17_3    
-        35        987 33101  61297 10L  R17_3    
-        35        988 33101  61333 10R  R17_3    
-        35        989 33101  60065 10L  R16_3    
-        35        990 33101  60109 10R  R16_3    
-        35        991 33101  61322 10L  R17_3    
-        35        992 33101  60973 10R  R17_2    
-        35        993 33101  61317 10L  R17_3    
-        35        994 33101  60968 10R  R17_2    
-        35        995 33101  61312 10L  R17_3    
-        35        996 33101  60963 10R  R17_2    
-        35        997 33101  61292 10L  R17_3    
-        35        998 33101  60958 10R  R17_2    
-        35        999 33101  61287 10L  R17_3    
-        35       1000 33101  60953 10R  R17_2    
-        35       1001 33101  38557 11L  S9_6     
-        35       1002 33101  61400 11R  R17_3    
-        35       1003 33101  39148 11L  P17      
-        35       1004 33101  61395 11R  R17_3    
-        35       1005 33101  61000 11L  R17_2    
-        35       1006 33101  61385 11R  R17_3    
-        35       1007 33101  61350 11L  R17_3    
-        35       1008 33101  61390 11R  R17_3    
-        35       1009 33101  60985 11L  R17_2    
-        35       1010 33101  61372 11R  R17_3    
-        35       1011 33101  60995 11L  R17_2    
-        35       1012 33101  61405 11R  R17_3    
-        35       1013 33101  60990 11L  R17_2    
-        35       1014 33101  61375 11R  R17_3    
-        35       1015 33101  60980 11L  R17_2    
-        35       1016 33101  61370 11R  R17_3    
-        35       1017 33101  60975 11L  R17_2    
-        35       1018 33101  61360 11R  R17_3    
-        35       1019 33101  60154 11L  R16_3    
-        35       1020 33101  60193 11R  R16_3    
-        35       1021 33101  38558 11L  S9_6     
-        35       1022 33101  61401 11R  R17_3    
-        35       1023 33101  61355 11L  R17_3    
-        35       1024 33101  61364 11R  R17_3    
-        35       1025 33101  61356 11L  R17_3    
-        35       1026 33101  61386 11R  R17_3    
-        35       1027 33101  61351 11L  R17_3    
-        35       1028 33101  61391 11R  R17_3    
-        35       1029 33101  60986 11L  R17_2    
-        35       1030 33101  61381 11R  R17_3    
-        35       1031 33101  60996 11L  R17_2    
-        35       1032 33101  61366 11R  R17_3    
-        35       1033 33101  60991 11L  R17_2    
-        35       1034 33101  61376 11R  R17_3    
-        35       1035 33101  60981 11L  R17_2    
-        35       1036 33101  61371 11R  R17_3    
-        35       1037 33101  60976 11L  R17_2    
-        35       1038 33101  61361 11R  R17_3    
-        35       1039 33101  60155 11L  R16_3    
-        35       1040 33101  60194 11R  R16_3    
-        35       1041 33101  38559 11L  S9_6     
-        35       1042 33101  61399 11R  R17_3    
-        35       1043 33101  42053 11L  P18      
-        35       1044 33101  61388 11R  R17_3    
-        35       1045 33101  61357 11L  R17_3    
-        35       1046 33101  61387 11R  R17_3    
-        35       1047 33101  61352 11L  R17_3    
-        35       1048 33101  61392 11R  R17_3    
-        35       1049 33101  60987 11L  R17_2    
-        35       1050 33101  61373 11R  R17_3    
-        35       1051 33101  60997 11L  R17_2    
-        35       1052 33101  61367 11R  R17_3    
-        35       1053 33101  60992 11L  R17_2    
-        35       1054 33101  61377 11R  R17_3    
-        35       1055 33101  60982 11L  R17_2    
-        35       1056 33101  61380 11R  R17_3    
-        35       1057 33101  60977 11L  R17_2    
-        35       1058 33101  61362 11R  R17_3    
-        35       1059 33101  60667 11L  R17_1    
-        35       1060 33101  60163 11R  R16_3    
-        35       1061 33101  38560 11L  S9_6     
-        35       1062 33101  61403 11R  R17_3    
-        35       1063 33101  60665 11L  R17_1    
-        35       1064 33101  61398 11R  R17_3    
-        35       1065 33101  61358 11L  R17_3    
-        35       1066 33101  61397 11R  R17_3    
-        35       1067 33101  61353 11L  R17_3    
-        35       1068 33101  61393 11R  R17_3    
-        35       1069 33101  60988 11L  R17_2    
-        35       1070 33101  61383 11R  R17_3    
-        35       1071 33101  60998 11L  R17_2    
-        35       1072 33101  61368 11R  R17_3    
-        35       1073 33101  60993 11L  R17_2    
-        35       1074 33101  61378 11R  R17_3    
-        35       1075 33101  60983 11L  R17_2    
-        35       1076 33101  61382 11R  R17_3    
-        35       1077 33101  60978 11L  R17_2    
-        35       1078 33101  61363 11R  R17_3    
-        35       1079 33101  60668 11L  R17_1    
-        35       1080 33101  60164 11R  R16_3    
-        35       1081 33101  38561 11L  S9_6     
-        35       1082 33101  61404 11R  R17_3    
-        35       1083 33101  60666 11L  R17_1    
-        35       1084 33101  61402 11R  R17_3    
-        35       1085 33101  61359 11L  R17_3    
-        35       1086 33101  61389 11R  R17_3    
-        35       1087 33101  61354 11L  R17_3    
-        35       1088 33101  61394 11R  R17_3    
-        35       1089 33101  60989 11L  R17_2    
-        35       1090 33101  61384 11R  R17_3    
-        35       1091 33101  60999 11L  R17_2    
-        35       1092 33101  61396 11R  R17_3    
-        35       1093 33101  60994 11L  R17_2    
-        35       1094 33101  61379 11R  R17_3    
-        35       1095 33101  60984 11L  R17_2    
-        35       1096 33101  61374 11R  R17_3    
-        35       1097 33101  60979 11L  R17_2    
-        35       1098 33101  61369 11R  R17_3    
-        35       1099 33101  60153 11L  R16_3    
-        35       1100 33101  60165 11R  R16_3    
-        35       1101 33101  61406 12L  R17_3    
-        35       1102 33101  61494 12R  R17_3    
-        35       1103 33101  61446 12L  R17_3    
-        35       1104 33101  61460 12R  R17_3    
-        35       1105 33101  61441 12L  R17_3    
-        35       1106 33101  61489 12R  R17_3    
-        35       1107 33101  61436 12L  R17_3    
-        35       1108 33101  61484 12R  R17_3    
-        35       1109 33101  61434 12L  R17_3    
-        35       1110 33101  61479 12R  R17_3    
-        35       1111 33101  61426 12L  R17_3    
-        35       1112 33101  61474 12R  R17_3    
-        35       1113 33101  61421 12L  R17_3    
-        35       1114 33101  61469 12R  R17_3    
-        35       1115 33101  61416 12L  R17_3    
-        35       1116 33101  61493 12R  R17_3    
-        35       1117 33101  61408 12L  R17_3    
-        35       1118 33101  61454 12R  R17_3    
-        35       1119 33101  60230 12L  R16_3    
-        35       1120 33101  60266 12R  R16_3    
-        35       1121 33101  61442 12L  R17_3    
-        35       1122 33101  61495 12R  R17_3    
-        35       1123 33101  61447 12L  R17_3    
-        35       1124 33101  61499 12R  R17_3    
-        35       1125 33101  61432 12L  R17_3    
-        35       1126 33101  61477 12R  R17_3    
-        35       1127 33101  61437 12L  R17_3    
-        35       1128 33101  61485 12R  R17_3    
-        35       1129 33101  61431 12L  R17_3    
-        35       1130 33101  61480 12R  R17_3    
-        35       1131 33101  61427 12L  R17_3    
-        35       1132 33101  61475 12R  R17_3    
-        35       1133 33101  61422 12L  R17_3    
-        35       1134 33101  61470 12R  R17_3    
-        35       1135 33101  61417 12L  R17_3    
-        35       1136 33101  61465 12R  R17_3    
-        35       1137 33101  61412 12L  R17_3    
-        35       1138 33101  61455 12R  R17_3    
-        35       1139 33101  60216 12L  R16_3    
-        35       1140 33101  60267 12R  R16_3    
-        35       1141 33101  61451 12L  R17_3    
-        35       1142 33101  61496 12R  R17_3    
-        35       1143 33101  61448 12L  R17_3    
-        35       1144 33101  61486 12R  R17_3    
-        35       1145 33101  61443 12L  R17_3    
-        35       1146 33101  61473 12R  R17_3    
-        35       1147 33101  61438 12L  R17_3    
-        35       1148 33101  61456 12R  R17_3    
-        35       1149 33101  61411 12L  R17_3    
-        35       1150 33101  61481 12R  R17_3    
-        35       1151 33101  61428 12L  R17_3    
-        35       1152 33101  61476 12R  R17_3    
-        35       1153 33101  61423 12L  R17_3    
-        35       1154 33101  61471 12R  R17_3    
-        35       1155 33101  61418 12L  R17_3    
-        35       1156 33101  61466 12R  R17_3    
-        35       1157 33101  61413 12L  R17_3    
-        35       1158 33101  61459 12R  R17_3    
-        35       1159 33101  60217 12L  R16_3    
-        35       1160 33101  60268 12R  R16_3    
-        35       1161 33101  61452 12L  R17_3    
-        35       1162 33101  61497 12R  R17_3    
-        35       1163 33101  61449 12L  R17_3    
-        35       1164 33101  61487 12R  R17_3    
-        35       1165 33101  61444 12L  R17_3    
-        35       1166 33101  61492 12R  R17_3    
-        35       1167 33101  61439 12L  R17_3    
-        35       1168 33101  61462 12R  R17_3    
-        35       1169 33101  61425 12L  R17_3    
-        35       1170 33101  61482 12R  R17_3    
-        35       1171 33101  61429 12L  R17_3    
-        35       1172 33101  61490 12R  R17_3    
-        35       1173 33101  61424 12L  R17_3    
-        35       1174 33101  61472 12R  R17_3    
-        35       1175 33101  61419 12L  R17_3    
-        35       1176 33101  61467 12R  R17_3    
-        35       1177 33101  61414 12L  R17_3    
-        35       1178 33101  61457 12R  R17_3    
-        35       1179 33101  60218 12L  R16_3    
-        35       1180 33101  60239 12R  R16_3    
-        35       1181 33101  61453 12L  R17_3    
-        35       1182 33101  61498 12R  R17_3    
-        35       1183 33101  61450 12L  R17_3    
-        35       1184 33101  61488 12R  R17_3    
-        35       1185 33101  61445 12L  R17_3    
-        35       1186 33101  61464 12R  R17_3    
-        35       1187 33101  61440 12L  R17_3    
-        35       1188 33101  61463 12R  R17_3    
-        35       1189 33101  61435 12L  R17_3    
-        35       1190 33101  61483 12R  R17_3    
-        35       1191 33101  61430 12L  R17_3    
-        35       1192 33101  61478 12R  R17_3    
-        35       1193 33101  61407 12L  R17_3    
-        35       1194 33101  61491 12R  R17_3    
-        35       1195 33101  61420 12L  R17_3    
-        35       1196 33101  61468 12R  R17_3    
-        35       1197 33101  61415 12L  R17_3    
-        35       1198 33101  61458 12R  R17_3    
-        35       1199 33101  60219 12L  R16_3    
-        35       1200 33101  60240 12R  R16_3    
-        35       1201 33101  61525 13L  R17_3    
-        35       1202 33101  60709 13R  R17_1    
-        35       1203 33101  61520 13L  R17_3    
-        35       1204 33101  61564 13R  R17_3    
-        35       1205 33101  61515 13L  R17_3    
-        35       1206 33101  61559 13R  R17_3    
-        35       1207 33101  61510 13L  R17_3    
-        35       1208 33101  61554 13R  R17_3    
-        35       1209 33101  61505 13L  R17_3    
-        35       1210 33101  61549 13R  R17_3    
-        35       1211 33101  61530 13L  R17_3    
-        35       1212 33101  61544 13R  R17_3    
-        35       1213 33101  61540 13L  R17_3    
-        35       1214 33101  61584 13R  R17_3    
-        35       1215 33101  61535 13L  R17_3    
-        35       1216 33101  61579 13R  R17_3    
-        35       1217 33101  61500 13L  R17_3    
-        35       1218 33101  61574 13R  R17_3    
-        35       1219 33101  60283 13L  R16_3    
-        35       1220 33101  61569 13R  R17_3    
-        35       1221 33101  61526 13L  R17_3    
-        35       1222 33101  60710 13R  R17_1    
-        35       1223 33101  61521 13L  R17_3    
-        35       1224 33101  61565 13R  R17_3    
-        35       1225 33101  61516 13L  R17_3    
-        35       1226 33101  61560 13R  R17_3    
-        35       1227 33101  61511 13L  R17_3    
-        35       1228 33101  61555 13R  R17_3    
-        35       1229 33101  61506 13L  R17_3    
-        35       1230 33101  61550 13R  R17_3    
-        35       1231 33101  61531 13L  R17_3    
-        35       1232 33101  61545 13R  R17_3    
-        35       1233 33101  61534 13L  R17_3    
-        35       1234 33101  61585 13R  R17_3    
-        35       1235 33101  61536 13L  R17_3    
-        35       1236 33101  61580 13R  R17_3    
-        35       1237 33101  61501 13L  R17_3    
-        35       1238 33101  61575 13R  R17_3    
-        35       1239 33101  60284 13L  R16_3    
-        35       1240 33101  61570 13R  R17_3    
-        35       1241 33101  61527 13L  R17_3    
-        35       1242 33101  60287 13R  R16_3    
-        35       1243 33101  61522 13L  R17_3    
-        35       1244 33101  61566 13R  R17_3    
-        35       1245 33101  61517 13L  R17_3    
-        35       1246 33101  61589 13R  R17_3    
-        35       1247 33101  61512 13L  R17_3    
-        35       1248 33101  61556 13R  R17_3    
-        35       1249 33101  61507 13L  R17_3    
-        35       1250 33101  61557 13R  R17_3    
-        35       1251 33101  61532 13L  R17_3    
-        35       1252 33101  61546 13R  R17_3    
-        35       1253 33101  61542 13L  R17_3    
-        35       1254 33101  61586 13R  R17_3    
-        35       1255 33101  61537 13L  R17_3    
-        35       1256 33101  61581 13R  R17_3    
-        35       1257 33101  61502 13L  R17_3    
-        35       1258 33101  61576 13R  R17_3    
-        35       1259 33101  60671 13L  R17_1    
-        35       1260 33101  61571 13R  R17_3    
-        35       1261 33101  61528 13L  R17_3    
-        35       1262 33101  60288 13R  R16_3    
-        35       1263 33101  61523 13L  R17_3    
-        35       1264 33101  61567 13R  R17_3    
-        35       1265 33101  61518 13L  R17_3    
-        35       1266 33101  61590 13R  R17_3    
-        35       1267 33101  61513 13L  R17_3    
-        35       1268 33101  61551 13R  R17_3    
-        35       1269 33101  61508 13L  R17_3    
-        35       1270 33101  61552 13R  R17_3    
-        35       1271 33101  61533 13L  R17_3    
-        35       1272 33101  61547 13R  R17_3    
-        35       1273 33101  61543 13L  R17_3    
-        35       1274 33101  61587 13R  R17_3    
-        35       1275 33101  61538 13L  R17_3    
-        35       1276 33101  61582 13R  R17_3    
-        35       1277 33101  61503 13L  R17_3    
-        35       1278 33101  61558 13R  R17_3    
-        35       1279 33101  60672 13L  R17_1    
-        35       1280 33101  61572 13R  R17_3    
-        35       1281 33101  61529 13L  R17_3    
-        35       1282 33101  60289 13R  R16_3    
-        35       1283 33101  61524 13L  R17_3    
-        35       1284 33101  61568 13R  R17_3    
-        35       1285 33101  61519 13L  R17_3    
-        35       1286 33101  61563 13R  R17_3    
-        35       1287 33101  61514 13L  R17_3    
-        35       1288 33101  61577 13R  R17_3    
-        35       1289 33101  61509 13L  R17_3    
-        35       1290 33101  61553 13R  R17_3    
-        35       1291 33101  61541 13L  R17_3    
-        35       1292 33101  61548 13R  R17_3    
-        35       1293 33101  60669 13L  R17_1    
-        35       1294 33101  61588 13R  R17_3    
-        35       1295 33101  61539 13L  R17_3    
-        35       1296 33101  61583 13R  R17_3    
-        35       1297 33101  61504 13L  R17_3    
-        35       1298 33101  61578 13R  R17_3    
-        35       1299 33101  60673 13L  R17_1    
-        35       1300 33101  61573 13R  R17_3    
-        35       1301 33101  61626 14L  R18_1    
-        35       1302 33101  61071 14R  R17_3    
-        35       1303 33101  60521 14L  R17_1    
-        35       1304 33101  61066 14R  R17_3    
-        35       1305 33101  61056 14L  R17_3    
-        35       1306 33101  59912 14R  R16_3    
-        35       1307 33101  61631 14L  R18_1    
-        35       1308 33101  61076 14R  R17_3    
-        35       1309 33101  61636 14L  R18_1    
-        35       1310 33101  61081 14R  R17_3    
-        35       1311 33101  61661 14L  R18_1    
-        35       1312 33101  61666 14R  R18_1    
-        35       1313 33101  61641 14L  R18_1    
-        35       1314 33101  61671 14R  R18_1    
-        35       1315 33101  61646 14L  R18_1    
-        35       1316 33101  61676 14R  R18_1    
-        35       1317 33101  61651 14L  R18_1    
-        35       1318 33101  61681 14R  R18_1    
-        35       1319 33101  61656 14L  R18_1    
-        35       1320 33101  61686 14R  R18_1    
-        35       1321 33101  61627 14L  R18_1    
-        35       1322 33101  61072 14R  R17_3    
-        35       1323 33101  61061 14L  R17_3    
-        35       1324 33101  61067 14R  R17_3    
-        35       1325 33101  61057 14L  R17_3    
-        35       1326 33101  59913 14R  R16_3    
-        35       1327 33101  61632 14L  R18_1    
-        35       1328 33101  61077 14R  R17_3    
-        35       1329 33101  61637 14L  R18_1    
-        35       1330 33101  61082 14R  R17_3    
-        35       1331 33101  61662 14L  R18_1    
-        35       1332 33101  61667 14R  R18_1    
-        35       1333 33101  61642 14L  R18_1    
-        35       1334 33101  61672 14R  R18_1    
-        35       1335 33101  61647 14L  R18_1    
-        35       1336 33101  61677 14R  R18_1    
-        35       1337 33101  61652 14L  R18_1    
-        35       1338 33101  61682 14R  R18_1    
-        35       1339 33101  61657 14L  R18_1    
-        35       1340 33101  61687 14R  R18_1    
-        35       1341 33101  61623 14L  R18_1    
-        35       1342 33101  61073 14R  R17_3    
-        35       1343 33101  61062 14L  R17_3    
-        35       1344 33101  61068 14R  R17_3    
-        35       1345 33101  61058 14L  R17_3    
-        35       1346 33101  61065 14R  R17_3    
-        35       1347 33101  61628 14L  R18_1    
-        35       1348 33101  61078 14R  R17_3    
-        35       1349 33101  61633 14L  R18_1    
-        35       1350 33101  61083 14R  R17_3    
-        35       1351 33101  61638 14L  R18_1    
-        35       1352 33101  61668 14R  R18_1    
-        35       1353 33101  61643 14L  R18_1    
-        35       1354 33101  61673 14R  R18_1    
-        35       1355 33101  61648 14L  R18_1    
-        35       1356 33101  61678 14R  R18_1    
-        35       1357 33101  61653 14L  R18_1    
-        35       1358 33101  61683 14R  R18_1    
-        35       1359 33101  61658 14L  R18_1    
-        35       1360 33101  61688 14R  R18_1    
-        35       1361 33101  61624 14L  R18_1    
-        35       1362 33101  61074 14R  R17_3    
-        35       1363 33101  61621 14L  R18_1    
-        35       1364 33101  61069 14R  R17_3    
-        35       1365 33101  61059 14L  R17_3    
-        35       1366 33101  61086 14R  R17_3    
-        35       1367 33101  61629 14L  R18_1    
-        35       1368 33101  61079 14R  R17_3    
-        35       1369 33101  61634 14L  R18_1    
-        35       1370 33101  61084 14R  R17_3    
-        35       1371 33101  61639 14L  R18_1    
-        35       1372 33101  61669 14R  R18_1    
-        35       1373 33101  61644 14L  R18_1    
-        35       1374 33101  61674 14R  R18_1    
-        35       1375 33101  61649 14L  R18_1    
-        35       1376 33101  61679 14R  R18_1    
-        35       1377 33101  61654 14L  R18_1    
-        35       1378 33101  61684 14R  R18_1    
-        35       1379 33101  61659 14L  R18_1    
-        35       1380 33101  61689 14R  R18_1    
-        35       1381 33101  61625 14L  R18_1    
-        35       1382 33101  61075 14R  R17_3    
-        35       1383 33101  61622 14L  R18_1    
-        35       1384 33101  61070 14R  R17_3    
-        35       1385 33101  61060 14L  R17_3    
-        35       1386 33101  61087 14R  R17_3    
-        35       1387 33101  61630 14L  R18_1    
-        35       1388 33101  61080 14R  R17_3    
-        35       1389 33101  61635 14L  R18_1    
-        35       1390 33101  61085 14R  R17_3    
-        35       1391 33101  61640 14L  R18_1    
-        35       1392 33101  61670 14R  R18_1    
-        35       1393 33101  61645 14L  R18_1    
-        35       1394 33101  61675 14R  R18_1    
-        35       1395 33101  61650 14L  R18_1    
-        35       1396 33101  61680 14R  R18_1    
-        35       1397 33101  61655 14L  R18_1    
-        35       1398 33101  61685 14R  R18_1    
-        35       1399 33101  61660 14L  R18_1    
-        35       1400 33101  61665 14R  R18_1    
-        35       1401 33101  61691 15L  R18_1    
-        35       1402 33101  60550 15R  R17_1    
-        35       1403 33101  61696 15L  R18_1    
-        35       1404 33101  61746 15R  R18_1    
-        35       1405 33101  61701 15L  R18_1    
-        35       1406 33101  61751 15R  R18_1    
-        35       1407 33101  61706 15L  R18_1    
-        35       1408 33101  61756 15R  R18_1    
-        35       1409 33101  60532 15L  R17_1    
-        35       1410 33101  61761 15R  R18_1    
-        35       1411 33101  61711 15L  R18_1    
-        35       1412 33101  61745 15R  R18_1    
-        35       1413 33101  61716 15L  R18_1    
-        35       1414 33101  61766 15R  R18_1    
-        35       1415 33101  61721 15L  R18_1    
-        35       1416 33101  61771 15R  R18_1    
-        35       1417 33101  61726 15L  R18_1    
-        35       1418 33101  61776 15R  R18_1    
-        35       1419 33101  61733 15L  R18_1    
-        35       1420 33101  61781 15R  R18_1    
-        35       1421 33101  61692 15L  R18_1    
-        35       1422 33101  60551 15R  R17_1    
-        35       1423 33101  61697 15L  R18_1    
-        35       1424 33101  61747 15R  R18_1    
-        35       1425 33101  61702 15L  R18_1    
-        35       1426 33101  61752 15R  R18_1    
-        35       1427 33101  61707 15L  R18_1    
-        35       1428 33101  61757 15R  R18_1    
-        35       1429 33101  60533 15L  R17_1    
-        35       1430 33101  61762 15R  R18_1    
-        35       1431 33101  61712 15L  R18_1    
-        35       1432 33101  61744 15R  R18_1    
-        35       1433 33101  61717 15L  R18_1    
-        35       1434 33101  61767 15R  R18_1    
-        35       1435 33101  61722 15L  R18_1    
-        35       1436 33101  61772 15R  R18_1    
-        35       1437 33101  61727 15L  R18_1    
-        35       1438 33101  61777 15R  R18_1    
-        35       1439 33101  61734 15L  R18_1    
-        35       1440 33101  61782 15R  R18_1    
-        35       1441 33101  61693 15L  R18_1    
-        35       1442 33101  60552 15R  R17_1    
-        35       1443 33101  61698 15L  R18_1    
-        35       1444 33101  61748 15R  R18_1    
-        35       1445 33101  61703 15L  R18_1    
-        35       1446 33101  61753 15R  R18_1    
-        35       1447 33101  61708 15L  R18_1    
-        35       1448 33101  61758 15R  R18_1    
-        35       1449 33101  60534 15L  R17_1    
-        35       1450 33101  61763 15R  R18_1    
-        35       1451 33101  61713 15L  R18_1    
-        35       1452 33101  61786 15R  R18_1    
-        35       1453 33101  61718 15L  R18_1    
-        35       1454 33101  61768 15R  R18_1    
-        35       1455 33101  61723 15L  R18_1    
-        35       1456 33101  61773 15R  R18_1    
-        35       1457 33101  61728 15L  R18_1    
-        35       1458 33101  61778 15R  R18_1    
-        35       1459 33101  61735 15L  R18_1    
-        35       1460 33101  61783 15R  R18_1    
-        35       1461 33101  61694 15L  R18_1    
-        35       1462 33101  61742 15R  R18_1    
-        35       1463 33101  61699 15L  R18_1    
-        35       1464 33101  61749 15R  R18_1    
-        35       1465 33101  61704 15L  R18_1    
-        35       1466 33101  61754 15R  R18_1    
-        35       1467 33101  61709 15L  R18_1    
-        35       1468 33101  61759 15R  R18_1    
-        35       1469 33101  61731 15L  R18_1    
-        35       1470 33101  61764 15R  R18_1    
-        35       1471 33101  61714 15L  R18_1    
-        35       1472 33101  61787 15R  R18_1    
-        35       1473 33101  61719 15L  R18_1    
-        35       1474 33101  61769 15R  R18_1    
-        35       1475 33101  61724 15L  R18_1    
-        35       1476 33101  61774 15R  R18_1    
-        35       1477 33101  61729 15L  R18_1    
-        35       1478 33101  61779 15R  R18_1    
-        35       1479 33101  61736 15L  R18_1    
-        35       1480 33101  61784 15R  R18_1    
-        35       1481 33101  61695 15L  R18_1    
-        35       1482 33101  61743 15R  R18_1    
-        35       1483 33101  61700 15L  R18_1    
-        35       1484 33101  61750 15R  R18_1    
-        35       1485 33101  61705 15L  R18_1    
-        35       1486 33101  61755 15R  R18_1    
-        35       1487 33101  61710 15L  R18_1    
-        35       1488 33101  61760 15R  R18_1    
-        35       1489 33101  61732 15L  R18_1    
-        35       1490 33101  61765 15R  R18_1    
-        35       1491 33101  61715 15L  R18_1    
-        35       1492 33101  61788 15R  R18_1    
-        35       1493 33101  61720 15L  R18_1    
-        35       1494 33101  61770 15R  R18_1    
-        35       1495 33101  61725 15L  R18_1    
-        35       1496 33101  61775 15R  R18_1    
-        35       1497 33101  61730 15L  R18_1    
-        35       1498 33101  61780 15R  R18_1    
-        35       1499 33101  61737 15L  R18_1    
-        35       1500 33101  61785 15R  R18_1    
-        35       1501 33101  32435 16L  P14      
-        35       1502 33101  61096 16R  R17_3    
-        35       1503 33101  60564 16L  R17_1    
-        35       1504 33101  61101 16R  R17_3    
-        35       1505 33101  61793 16L  R18_1    
-        35       1506 33101  61106 16R  R17_3    
-        35       1507 33101  61798 16L  R18_1    
-        35       1508 33101  61111 16R  R17_3    
-        35       1509 33101  61803 16L  R18_1    
-        35       1510 33101  61116 16R  R17_3    
-        35       1511 33101  61808 16L  R18_1    
-        35       1512 33101  61121 16R  R17_3    
-        35       1513 33101  61813 16L  R18_1    
-        35       1514 33101  61126 16R  R17_3    
-        35       1515 33101  61818 16L  R18_1    
-        35       1516 33101  61131 16R  R17_3    
-        35       1517 33101  60566 16L  R17_1    
-        35       1518 33101  61136 16R  R17_3    
-        35       1519 33101  61823 16L  R18_1    
-        35       1520 33101  61141 16R  R17_3    
-        35       1521 33101  32446 16L  P14      
-        35       1522 33101  61097 16R  R17_3    
-        35       1523 33101  60568 16L  R17_1    
-        35       1524 33101  61102 16R  R17_3    
-        35       1525 33101  61794 16L  R18_1    
-        35       1526 33101  61107 16R  R17_3    
-        35       1527 33101  61799 16L  R18_1    
-        35       1528 33101  61112 16R  R17_3    
-        35       1529 33101  61804 16L  R18_1    
-        35       1530 33101  61117 16R  R17_3    
-        35       1531 33101  61809 16L  R18_1    
-        35       1532 33101  61122 16R  R17_3    
-        35       1533 33101  61814 16L  R18_1    
-        35       1534 33101  61127 16R  R17_3    
-        35       1535 33101  61819 16L  R18_1    
-        35       1536 33101  61132 16R  R17_3    
-        35       1537 33101  61092 16L  R17_3    
-        35       1538 33101  61137 16R  R17_3    
-        35       1539 33101  61824 16L  R18_1    
-        35       1540 33101  61142 16R  R17_3    
-        35       1541 33101  32470 16L  P14      
-        35       1542 33101  61098 16R  R17_3    
-        35       1543 33101  60565 16L  R17_1    
-        35       1544 33101  61103 16R  R17_3    
-        35       1545 33101  61795 16L  R18_1    
-        35       1546 33101  61108 16R  R17_3    
-        35       1547 33101  61800 16L  R18_1    
-        35       1548 33101  61113 16R  R17_3    
-        35       1549 33101  61805 16L  R18_1    
-        35       1550 33101  61118 16R  R17_3    
-        35       1551 33101  61810 16L  R18_1    
-        35       1552 33101  61123 16R  R17_3    
-        35       1553 33101  61815 16L  R18_1    
-        35       1554 33101  61128 16R  R17_3    
-        35       1555 33101  61820 16L  R18_1    
-        35       1556 33101  61133 16R  R17_3    
-        35       1557 33101  61093 16L  R17_3    
-        35       1558 33101  61138 16R  R17_3    
-        35       1559 33101  61825 16L  R18_1    
-        35       1560 33101  61143 16R  R17_3    
-        35       1561 33101  32476 16L  P14      
-        35       1562 33101  61099 16R  R17_3    
-        35       1563 33101  60567 16L  R17_1    
-        35       1564 33101  61104 16R  R17_3    
-        35       1565 33101  61796 16L  R18_1    
-        35       1566 33101  61109 16R  R17_3    
-        35       1567 33101  61801 16L  R18_1    
-        35       1568 33101  61114 16R  R17_3    
-        35       1569 33101  61806 16L  R18_1    
-        35       1570 33101  61119 16R  R17_3    
-        35       1571 33101  61811 16L  R18_1    
-        35       1572 33101  61124 16R  R17_3    
-        35       1573 33101  61816 16L  R18_1    
-        35       1574 33101  61129 16R  R17_3    
-        35       1575 33101  61821 16L  R18_1    
-        35       1576 33101  61134 16R  R17_3    
-        35       1577 33101  61094 16L  R17_3    
-        35       1578 33101  61139 16R  R17_3    
-        35       1579 33101  61826 16L  R18_1    
-        35       1580 33101  31429 16R  S07_4    
-        35       1581 33101  42278 16L  P19      
-        35       1582 33101  61100 16R  R17_3    
-        35       1583 33101  60563 16L  R17_1    
-        35       1584 33101  61105 16R  R17_3    
-        35       1585 33101  61797 16L  R18_1    
-        35       1586 33101  61110 16R  R17_3    
-        35       1587 33101  61802 16L  R18_1    
-        35       1588 33101  61115 16R  R17_3    
-        35       1589 33101  61807 16L  R18_1    
-        35       1590 33101  61120 16R  R17_3    
-        35       1591 33101  61812 16L  R18_1    
-        35       1592 33101  61125 16R  R17_3    
-        35       1593 33101  61817 16L  R18_1    
-        35       1594 33101  61130 16R  R17_3    
-        35       1595 33101  61822 16L  R18_1    
-        35       1596 33101  61135 16R  R17_3    
-        35       1597 33101  61828 16L  R18_1    
-        35       1598 33101  61140 16R  R17_3    
-        35       1599 33101  61827 16L  R18_1    
-        35       1600 33101  41774 16R  S10_6    
-        35       1601 33101  39879 17L  S10_2    
-        35       1602 33101  32622 17R  P14      
-        35       1603 33101  32539 17L  P14      
-        35       1604 33101  20191 17R  S4       
-        35       1605 33101  37110 17L  S9_3     
-        35       1606 33101  37118 17R  S9_3     
-        35       1607 33101  38830 17L  P016     
-        35       1608 33101  52101 17R  R9_2     
-        35       1609 33101  48757 17L  R6_2     
-        35       1610 33101  62751 17R  R18_3    
-        35       1611 33101  62731 17L  R18_3    
-        35       1612 33101  52099 17R  R9_2     
-        35       1613 33101  62736 17L  R18_3    
-        35       1614 33101  62756 17R  R18_3    
-        35       1615 33101  62741 17L  R18_3    
-        35       1616 33101  62766 17R  R18_3    
-        35       1617 33101  62746 17L  R18_3    
-        35       1618 33101  62771 17R  R18_3    
-        35       1619 33101  31479 17L  S07_4    
-        35       1620 33101  62776 17R  R18_3    
-        35       1621 33101  27158 17L  S6_2b    
-        35       1622 33101  36875 17R  S9_2     
-        35       1623 33101  32561 17L  P14      
-        35       1624 33101  30959 17R  S7_3     
-        35       1625 33101  38826 17L  P016     
-        35       1626 33101  38835 17R  P016     
-        35       1627 33101  38831 17L  P016     
-        35       1628 33101  52102 17R  R9_2     
-        35       1629 33101  62727 17L  R18_3    
-        35       1630 33101  62752 17R  R18_3    
-        35       1631 33101  62732 17L  R18_3    
-        35       1632 33101  52100 17R  R9_2     
-        35       1633 33101  62737 17L  R18_3    
-        35       1634 33101  62757 17R  R18_3    
-        35       1635 33101  62742 17L  R18_3    
-        35       1636 33101  62767 17R  R18_3    
-        35       1637 33101  62747 17L  R18_3    
-        35       1638 33101  62772 17R  R18_3    
-        35       1639 33101  41937 17L  P18      
-        35       1640 33101  62777 17R  R18_3    
-        35       1641 33101  37097 17L  S9_3     
-        35       1642 33101  37111 17R  S9_3     
-        35       1643 33101  32566 17L  P14      
-        35       1644 33101  31495 17R  S07_4    
-        35       1645 33101  38827 17L  P016     
-        35       1646 33101  39153 17R  P017     
-        35       1647 33101  39151 17L  P017     
-        35       1648 33101  52103 17R  R9_2     
-        35       1649 33101  62728 17L  R18_3    
-        35       1650 33101  62753 17R  R18_3    
-        35       1651 33101  62733 17L  R18_3    
-        35       1652 33101  62761 17R  R18_3    
-        35       1653 33101  62738 17L  R18_3    
-        35       1654 33101  62758 17R  R18_3    
-        35       1655 33101  62743 17L  R18_3    
-        35       1656 33101  62768 17R  R18_3    
-        35       1657 33101  62748 17L  R18_3    
-        35       1658 33101  62773 17R  R18_3    
-        35       1659 33101  41939 17L  P18      
-        35       1660 33101  62778 17R  R18_3    
-        35       1661 33101  37101 17L  S9_3     
-        35       1662 33101  37112 17R  S9_3     
-        35       1663 33101  32567 17L  P14      
-        35       1664 33101  40331 17R  S10_3    
-        35       1665 33101  38828 17L  P016     
-        35       1666 33101  39154 17R  P017     
-        35       1667 33101  40283 17L  S10_3    
-        35       1668 33101  52104 17R  R9_2     
-        35       1669 33101  62729 17L  R18_3    
-        35       1670 33101  62754 17R  R18_3    
-        35       1671 33101  62734 17L  R18_3    
-        35       1672 33101  62762 17R  R18_3    
-        35       1673 33101  62739 17L  R18_3    
-        35       1674 33101  62759 17R  R18_3    
-        35       1675 33101  62744 17L  R18_3    
-        35       1676 33101  62769 17R  R18_3    
-        35       1677 33101  62749 17L  R18_3    
-        35       1678 33101  62774 17R  R18_3    
-        35       1679 33101  41941 17L  P18      
-        35       1680 33101  62764 17R  R18_3    
-        35       1681 33101  37105 17L  S9_3     
-        35       1682 33101  37114 17R  S9_3     
-        35       1683 33101  32589 17L  P14      
-        35       1684 33101  41951 17R  P18      
-        35       1685 33101  38829 17L  P016     
-        35       1686 33101  39160 17R  P017     
-        35       1687 33101  41198 17L  S10_5    
-        35       1688 33101  52105 17R  R9_2     
-        35       1689 33101  62730 17L  R18_3    
-        35       1690 33101  62755 17R  R18_3    
-        35       1691 33101  62735 17L  R18_3    
-        35       1692 33101  62763 17R  R18_3    
-        35       1693 33101  62740 17L  R18_3    
-        35       1694 33101  62760 17R  R18_3    
-        35       1695 33101  62745 17L  R18_3    
-        35       1696 33101  62770 17R  R18_3    
-        35       1697 33101  62750 17L  R18_3    
-        35       1698 33101  62775 17R  R18_3    
-        35       1699 33101  41943 17L  P18      
-        35       1700 33101  62765 17R  R18_3    
-        36          1 33101  62226 1L   R18_2    
-        36          2 33101  62261 1R   R18_2    
-        36          3 33101  62235 1L   R18_2    
-        36          4 33101  62886 1R   R24      
-        36          5 33101  62230 1L   R18_2    
-        36          6 33101  62561 1R   R18_3    
-        36          7 33101  62856 1L   R24      
-        36          8 33101  62896 1R   R24      
-        36          9 33101  62850 1L   R24      
-        36         10 33101  62891 1R   R24      
-        36         11 33101  62866 1L   R24      
-        36         12 33101  62901 1R   R24      
-        36         13 33101  62861 1L   R24      
-        36         14 33101  62906 1R   R24      
-        36         15 33101  62876 1L   R24      
-        36         16 33101  62911 1R   R24      
-        36         17 33101  62871 1L   R24      
-        36         18 33101  62916 1R   R24      
-        36         19 33101  62881 1L   R24      
-        36         20 33101  62922 1R   R24      
-        36         21 33101  62227 1L   R18_2    
-        36         22 33101  62257 1R   R18_2    
-        36         23 33101  62846 1L   R24      
-        36         24 33101  62887 1R   R24      
-        36         25 33101  62231 1L   R18_2    
-        36         26 33101  62562 1R   R18_3    
-        36         27 33101  62857 1L   R24      
-        36         28 33101  62897 1R   R24      
-        36         29 33101  62851 1L   R24      
-        36         30 33101  62892 1R   R24      
-        36         31 33101  62867 1L   R24      
-        36         32 33101  62902 1R   R24      
-        36         33 33101  62862 1L   R24      
-        36         34 33101  62907 1R   R24      
-        36         35 33101  62877 1L   R24      
-        36         36 33101  62912 1R   R24      
-        36         37 33101  62872 1L   R24      
-        36         38 33101  62917 1R   R24      
-        36         39 33101  62882 1L   R24      
-        36         40 33101  62923 1R   R24      
-        36         41 33101  62228 1L   R18_2    
-        36         42 33101  62258 1R   R18_2    
-        36         43 33101  62847 1L   R24      
-        36         44 33101  62888 1R   R24      
-        36         45 33101  62232 1L   R18_2    
-        36         46 33101  62563 1R   R18_3    
-        36         47 33101  62858 1L   R24      
-        36         48 33101  62898 1R   R24      
-        36         49 33101  62852 1L   R24      
-        36         50 33101  62893 1R   R24      
-        36         51 33101  62868 1L   R24      
-        36         52 33101  62903 1R   R24      
-        36         53 33101  62863 1L   R24      
-        36         54 33101  62908 1R   R24      
-        36         55 33101  62878 1L   R24      
-        36         56 33101  62913 1R   R24      
-        36         57 33101  62873 1L   R24      
-        36         58 33101  62918 1R   R24      
-        36         59 33101  62883 1L   R24      
-        36         60 33101  62924 1R   R24      
-        36         61 33101  62229 1L   R18_2    
-        36         62 33101  62259 1R   R18_2    
-        36         63 33101  62848 1L   R24      
-        36         64 33101  62889 1R   R24      
-        36         65 33101  62233 1L   R18_2    
-        36         66 33101  62564 1R   R18_3    
-        36         67 33101  62859 1L   R24      
-        36         68 33101  62899 1R   R24      
-        36         69 33101  62854 1L   R24      
-        36         70 33101  62894 1R   R24      
-        36         71 33101  62869 1L   R24      
-        36         72 33101  62904 1R   R24      
-        36         73 33101  62864 1L   R24      
-        36         74 33101  62909 1R   R24      
-        36         75 33101  62879 1L   R24      
-        36         76 33101  62914 1R   R24      
-        36         77 33101  62874 1L   R24      
-        36         78 33101  62919 1R   R24      
-        36         79 33101  62884 1L   R24      
-        36         80 33101  62925 1R   R24      
-        36         81 33101  62225 1L   R18_2    
-        36         82 33101  62260 1R   R18_2    
-        36         83 33101  62849 1L   R24      
-        36         84 33101  62890 1R   R24      
-        36         85 33101  62234 1L   R18_2    
-        36         86 33101  62565 1R   R18_3    
-        36         87 33101  62860 1L   R24      
-        36         88 33101  62900 1R   R24      
-        36         89 33101  62855 1L   R24      
-        36         90 33101  62895 1R   R24      
-        36         91 33101  62870 1L   R24      
-        36         92 33101  62905 1R   R24      
-        36         93 33101  62865 1L   R24      
-        36         94 33101  62910 1R   R24      
-        36         95 33101  62880 1L   R24      
-        36         96 33101  62915 1R   R24      
-        36         97 33101  62875 1L   R24      
-        36         98 33101  62921 1R   R24      
-        36         99 33101  62885 1L   R24      
-        36        100 33101  62926 1R   R24      
-        36        101 33101  62312 2L   R18_2    
-        36        102 33101  62347 2R   R18_2    
-        36        103 33101  62316 2L   R18_2    
-        36        104 33101  62968 2R   R24      
-        36        105 33101  62306 2L   R18_2    
-        36        106 33101  62369 2R   R18_2    
-        36        107 33101  62936 2L   R24      
-        36        108 33101  62978 2R   R24      
-        36        109 33101  62931 2L   R24      
-        36        110 33101  62973 2R   R24      
-        36        111 33101  62946 2L   R24      
-        36        112 33101  62988 2R   R24      
-        36        113 33101  62941 2L   R24      
-        36        114 33101  62983 2R   R24      
-        36        115 33101  62956 2L   R24      
-        36        116 33101  62998 2R   R24      
-        36        117 33101  62951 2L   R24      
-        36        118 33101  62993 2R   R24      
-        36        119 33101  62961 2L   R24      
-        36        120 33101  63003 2R   R24      
-        36        121 33101  62262 2L   R18_2    
-        36        122 33101  62317 2R   R18_2    
-        36        123 33101  62927 2L   R24      
-        36        124 33101  62969 2R   R24      
-        36        125 33101  62307 2L   R18_2    
-        36        126 33101  62371 2R   R18_2    
-        36        127 33101  62937 2L   R24      
-        36        128 33101  62979 2R   R24      
-        36        129 33101  62932 2L   R24      
-        36        130 33101  62974 2R   R24      
-        36        131 33101  62947 2L   R24      
-        36        132 33101  62989 2R   R24      
-        36        133 33101  62942 2L   R24      
-        36        134 33101  62984 2R   R24      
-        36        135 33101  62957 2L   R24      
-        36        136 33101  62999 2R   R24      
-        36        137 33101  62952 2L   R24      
-        36        138 33101  62994 2R   R24      
-        36        139 33101  62962 2L   R24      
-        36        140 33101  63004 2R   R24      
-        36        141 33101  62263 2L   R18_2    
-        36        142 33101  62318 2R   R18_2    
-        36        143 33101  62928 2L   R24      
-        36        144 33101  62970 2R   R24      
-        36        145 33101  62313 2L   R18_2    
-        36        146 33101  62372 2R   R18_2    
-        36        147 33101  62938 2L   R24      
-        36        148 33101  62980 2R   R24      
-        36        149 33101  62933 2L   R24      
-        36        150 33101  62975 2R   R24      
-        36        151 33101  62948 2L   R24      
-        36        152 33101  62990 2R   R24      
-        36        153 33101  62943 2L   R24      
-        36        154 33101  62985 2R   R24      
-        36        155 33101  62958 2L   R24      
-        36        156 33101  63000 2R   R24      
-        36        157 33101  62953 2L   R24      
-        36        158 33101  62995 2R   R24      
-        36        159 33101  62963 2L   R24      
-        36        160 33101  63005 2R   R24      
-        36        161 33101  62264 2L   R18_2    
-        36        162 33101  62319 2R   R18_2    
-        36        163 33101  62929 2L   R24      
-        36        164 33101  62971 2R   R24      
-        36        165 33101  62314 2L   R18_2    
-        36        166 33101  62373 2R   R18_2    
-        36        167 33101  62939 2L   R24      
-        36        168 33101  62981 2R   R24      
-        36        169 33101  62934 2L   R24      
-        36        170 33101  62976 2R   R24      
-        36        171 33101  62949 2L   R24      
-        36        172 33101  62991 2R   R24      
-        36        173 33101  62944 2L   R24      
-        36        174 33101  62986 2R   R24      
-        36        175 33101  62959 2L   R24      
-        36        176 33101  63001 2R   R24      
-        36        177 33101  62954 2L   R24      
-        36        178 33101  62996 2R   R24      
-        36        179 33101  62964 2L   R24      
-        36        180 33101  63006 2R   R24      
-        36        181 33101  62265 2L   R18_2    
-        36        182 33101  62320 2R   R18_2    
-        36        183 33101  62930 2L   R24      
-        36        184 33101  62972 2R   R24      
-        36        185 33101  62315 2L   R18_2    
-        36        186 33101  62967 2R   R24      
-        36        187 33101  62940 2L   R24      
-        36        188 33101  62982 2R   R24      
-        36        189 33101  62935 2L   R24      
-        36        190 33101  62977 2R   R24      
-        36        191 33101  62950 2L   R24      
-        36        192 33101  62992 2R   R24      
-        36        193 33101  62945 2L   R24      
-        36        194 33101  62987 2R   R24      
-        36        195 33101  62960 2L   R24      
-        36        196 33101  63002 2R   R24      
-        36        197 33101  62955 2L   R24      
-        36        198 33101  62997 2R   R24      
-        36        199 33101  62965 2L   R24      
-        36        200 33101  63007 2R   R24      
-        36        201 33101  62421 3L   R18_2    
-        36        202 33101  62438 3R   R18_2    
-        36        203 33101  62414 3L   R18_2    
-        36        204 33101  63050 3R   R24      
-        36        205 33101  63009 3L   R24      
-        36        206 33101  62479 3R   R18_2    
-        36        207 33101  63019 3L   R24      
-        36        208 33101  63060 3R   R24      
-        36        209 33101  63014 3L   R24      
-        36        210 33101  63055 3R   R24      
-        36        211 33101  63029 3L   R24      
-        36        212 33101  63070 3R   R24      
-        36        213 33101  63024 3L   R24      
-        36        214 33101  63065 3R   R24      
-        36        215 33101  63039 3L   R24      
-        36        216 33101  63080 3R   R24      
-        36        217 33101  63034 3L   R24      
-        36        218 33101  63075 3R   R24      
-        36        219 33101  63044 3L   R24      
-        36        220 33101  63085 3R   R24      
-        36        221 33101  62422 3L   R18_2    
-        36        222 33101  62427 3R   R18_2    
-        36        223 33101  62423 3L   R18_2    
-        36        224 33101  63051 3R   R24      
-        36        225 33101  63010 3L   R24      
-        36        226 33101  62480 3R   R18_2    
-        36        227 33101  63020 3L   R24      
-        36        228 33101  63061 3R   R24      
-        36        229 33101  63015 3L   R24      
-        36        230 33101  63056 3R   R24      
-        36        231 33101  63030 3L   R24      
-        36        232 33101  63071 3R   R24      
-        36        233 33101  63025 3L   R24      
-        36        234 33101  63066 3R   R24      
-        36        235 33101  63040 3L   R24      
-        36        236 33101  63081 3R   R24      
-        36        237 33101  63035 3L   R24      
-        36        238 33101  63076 3R   R24      
-        36        239 33101  63045 3L   R24      
-        36        240 33101  63086 3R   R24      
-        36        241 33101  62374 3L   R18_2    
-        36        242 33101  62428 3R   R18_2    
-        36        243 33101  62424 3L   R18_2    
-        36        244 33101  63052 3R   R24      
-        36        245 33101  63011 3L   R24      
-        36        246 33101  62481 3R   R18_2    
-        36        247 33101  63021 3L   R24      
-        36        248 33101  63062 3R   R24      
-        36        249 33101  63016 3L   R24      
-        36        250 33101  63057 3R   R24      
-        36        251 33101  63031 3L   R24      
-        36        252 33101  63072 3R   R24      
-        36        253 33101  63026 3L   R24      
-        36        254 33101  63067 3R   R24      
-        36        255 33101  63041 3L   R24      
-        36        256 33101  63082 3R   R24      
-        36        257 33101  63036 3L   R24      
-        36        258 33101  63077 3R   R24      
-        36        259 33101  63046 3L   R24      
-        36        260 33101  63087 3R   R24      
-        36        261 33101  62375 3L   R18_2    
-        36        262 33101  62429 3R   R18_2    
-        36        263 33101  62425 3L   R18_2    
-        36        264 33101  63053 3R   R24      
-        36        265 33101  63012 3L   R24      
-        36        266 33101  62482 3R   R18_2    
-        36        267 33101  63022 3L   R24      
-        36        268 33101  63063 3R   R24      
-        36        269 33101  63017 3L   R24      
-        36        270 33101  63058 3R   R24      
-        36        271 33101  63032 3L   R24      
-        36        272 33101  63073 3R   R24      
-        36        273 33101  63027 3L   R24      
-        36        274 33101  63068 3R   R24      
-        36        275 33101  63042 3L   R24      
-        36        276 33101  63083 3R   R24      
-        36        277 33101  63037 3L   R24      
-        36        278 33101  63078 3R   R24      
-        36        279 33101  63047 3L   R24      
-        36        280 33101  63088 3R   R24      
-        36        281 33101  62411 3L   R18_2    
-        36        282 33101  62430 3R   R18_2    
-        36        283 33101  62426 3L   R18_2    
-        36        284 33101  63054 3R   R24      
-        36        285 33101  63013 3L   R24      
-        36        286 33101  62483 3R   R18_2    
-        36        287 33101  63023 3L   R24      
-        36        288 33101  63064 3R   R24      
-        36        289 33101  63018 3L   R24      
-        36        290 33101  63059 3R   R24      
-        36        291 33101  63033 3L   R24      
-        36        292 33101  63074 3R   R24      
-        36        293 33101  63028 3L   R24      
-        36        294 33101  63069 3R   R24      
-        36        295 33101  63043 3L   R24      
-        36        296 33101  63084 3R   R24      
-        36        297 33101  63038 3L   R24      
-        36        298 33101  63079 3R   R24      
-        36        299 33101  63048 3L   R24      
-        36        300 33101  63089 3R   R24      
-        36        301 33101  62491 4L   R18_2    
-        36        302 33101  62546 4R   R18_2    
-        36        303 33101  62591 4L   R18_3    
-        36        304 33101  62549 4R   R18_2    
-        36        305 33101  63092 4L   R24      
-        36        306 33101  63133 4R   R24      
-        36        307 33101  63097 4L   R24      
-        36        308 33101  63138 4R   R24      
-        36        309 33101  63102 4L   R24      
-        36        310 33101  63143 4R   R24      
-        36        311 33101  63112 4L   R24      
-        36        312 33101  63153 4R   R24      
-        36        313 33101  63117 4L   R24      
-        36        314 33101  63158 4R   R24      
-        36        315 33101  63107 4L   R24      
-        36        316 33101  63148 4R   R24      
-        36        317 33101  63127 4L   R24      
-        36        318 33101  63168 4R   R24      
-        36        319 33101  63122 4L   R24      
-        36        320 33101  63163 4R   R24      
-        36        321 33101  62587 4L   R18_3    
-        36        322 33101  62547 4R   R18_2    
-        36        323 33101  62592 4L   R18_3    
-        36        324 33101  62550 4R   R18_2    
-        36        325 33101  63093 4L   R24      
-        36        326 33101  63134 4R   R24      
-        36        327 33101  63098 4L   R24      
-        36        328 33101  63139 4R   R24      
-        36        329 33101  63103 4L   R24      
-        36        330 33101  63144 4R   R24      
-        36        331 33101  63113 4L   R24      
-        36        332 33101  63154 4R   R24      
-        36        333 33101  63118 4L   R24      
-        36        334 33101  63159 4R   R24      
-        36        335 33101  63108 4L   R24      
-        36        336 33101  63149 4R   R24      
-        36        337 33101  63128 4L   R24      
-        36        338 33101  63169 4R   R24      
-        36        339 33101  63123 4L   R24      
-        36        340 33101  63164 4R   R24      
-        36        341 33101  62588 4L   R18_3    
-        36        342 33101  62548 4R   R18_2    
-        36        343 33101  62593 4L   R18_3    
-        36        344 33101  62551 4R   R18_2    
-        36        345 33101  63094 4L   R24      
-        36        346 33101  63135 4R   R24      
-        36        347 33101  63099 4L   R24      
-        36        348 33101  63140 4R   R24      
-        36        349 33101  63104 4L   R24      
-        36        350 33101  63145 4R   R24      
-        36        351 33101  63114 4L   R24      
-        36        352 33101  63155 4R   R24      
-        36        353 33101  63119 4L   R24      
-        36        354 33101  63160 4R   R24      
-        36        355 33101  63109 4L   R24      
-        36        356 33101  63150 4R   R24      
-        36        357 33101  63129 4L   R24      
-        36        358 33101  63170 4R   R24      
-        36        359 33101  63124 4L   R24      
-        36        360 33101  63165 4R   R24      
-        36        361 33101  62589 4L   R18_3    
-        36        362 33101  62544 4R   R18_2    
-        36        363 33101  62594 4L   R18_3    
-        36        364 33101  62552 4R   R18_2    
-        36        365 33101  63095 4L   R24      
-        36        366 33101  63136 4R   R24      
-        36        367 33101  63100 4L   R24      
-        36        368 33101  63141 4R   R24      
-        36        369 33101  63105 4L   R24      
-        36        370 33101  63146 4R   R24      
-        36        371 33101  63115 4L   R24      
-        36        372 33101  63156 4R   R24      
-        36        373 33101  63120 4L   R24      
-        36        374 33101  63161 4R   R24      
-        36        375 33101  63110 4L   R24      
-        36        376 33101  63151 4R   R24      
-        36        377 33101  63130 4L   R24      
-        36        378 33101  63171 4R   R24      
-        36        379 33101  63125 4L   R24      
-        36        380 33101  63166 4R   R24      
-        36        381 33101  62590 4L   R18_3    
-        36        382 33101  62545 4R   R18_2    
-        36        383 33101  63091 4L   R24      
-        36        384 33101  62553 4R   R18_2    
-        36        385 33101  63096 4L   R24      
-        36        386 33101  63137 4R   R24      
-        36        387 33101  63101 4L   R24      
-        36        388 33101  63142 4R   R24      
-        36        389 33101  63106 4L   R24      
-        36        390 33101  63147 4R   R24      
-        36        391 33101  63116 4L   R24      
-        36        392 33101  63157 4R   R24      
-        36        393 33101  63121 4L   R24      
-        36        394 33101  63162 4R   R24      
-        36        395 33101  63111 4L   R24      
-        36        396 33101  63152 4R   R24      
-        36        397 33101  63132 4L   R24      
-        36        398 33101  63172 4R   R24      
-        36        399 33101  63126 4L   R24      
-        36        400 33101  63167 4R   R24      
-        36        401 33101  62646 5L   R18_3    
-        36        402 33101  62702 5R   R18_3    
-        36        403 33101  63174 5L   R24      
-        36        404 33101  63220 5R   R24      
-        36        405 33101  62595 5L   R18_3    
-        36        406 33101  62703 5R   R18_3    
-        36        407 33101  63184 5L   R24      
-        36        408 33101  63230 5R   R24      
-        36        409 33101  63179 5L   R24      
-        36        410 33101  63225 5R   R24      
-        36        411 33101  63194 5L   R24      
-        36        412 33101  63240 5R   R24      
-        36        413 33101  63189 5L   R24      
-        36        414 33101  63235 5R   R24      
-        36        415 33101  63204 5L   R24      
-        36        416 33101  63250 5R   R24      
-        36        417 33101  63199 5L   R24      
-        36        418 33101  63245 5R   R24      
-        36        419 33101  63209 5L   R24      
-        36        420 33101  63255 5R   R24      
-        36        421 33101  62647 5L   R18_3    
-        36        422 33101  62688 5R   R18_3    
-        36        423 33101  63175 5L   R24      
-        36        424 33101  63221 5R   R24      
-        36        425 33101  62601 5L   R18_3    
-        36        426 33101  62704 5R   R18_3    
-        36        427 33101  63185 5L   R24      
-        36        428 33101  63231 5R   R24      
-        36        429 33101  63180 5L   R24      
-        36        430 33101  63226 5R   R24      
-        36        431 33101  63195 5L   R24      
-        36        432 33101  63241 5R   R24      
-        36        433 33101  63190 5L   R24      
-        36        434 33101  63236 5R   R24      
-        36        435 33101  63205 5L   R24      
-        36        436 33101  63251 5R   R24      
-        36        437 33101  63200 5L   R24      
-        36        438 33101  63246 5R   R24      
-        36        439 33101  63210 5L   R24      
-        36        440 33101  63256 5R   R24      
-        36        441 33101  62648 5L   R18_3    
-        36        442 33101  62554 5R   R18_2    
-        36        443 33101  63176 5L   R24      
-        36        444 33101  63222 5R   R24      
-        36        445 33101  62650 5L   R18_3    
-        36        446 33101  62705 5R   R18_3    
-        36        447 33101  63186 5L   R24      
-        36        448 33101  63232 5R   R24      
-        36        449 33101  63181 5L   R24      
-        36        450 33101  63227 5R   R24      
-        36        451 33101  63196 5L   R24      
-        36        452 33101  63242 5R   R24      
-        36        453 33101  63191 5L   R24      
-        36        454 33101  63237 5R   R24      
-        36        455 33101  63206 5L   R24      
-        36        456 33101  63252 5R   R24      
-        36        457 33101  63201 5L   R24      
-        36        458 33101  63247 5R   R24      
-        36        459 33101  63211 5L   R24      
-        36        460 33101  63257 5R   R24      
-        36        461 33101  62649 5L   R18_3    
-        36        462 33101  62555 5R   R18_2    
-        36        463 33101  63177 5L   R24      
-        36        464 33101  63223 5R   R24      
-        36        465 33101  62651 5L   R18_3    
-        36        466 33101  62706 5R   R18_3    
-        36        467 33101  63187 5L   R24      
-        36        468 33101  63233 5R   R24      
-        36        469 33101  63182 5L   R24      
-        36        470 33101  63228 5R   R24      
-        36        471 33101  63197 5L   R24      
-        36        472 33101  63243 5R   R24      
-        36        473 33101  63192 5L   R24      
-        36        474 33101  63238 5R   R24      
-        36        475 33101  63207 5L   R24      
-        36        476 33101  63253 5R   R24      
-        36        477 33101  63202 5L   R24      
-        36        478 33101  63248 5R   R24      
-        36        479 33101  63212 5L   R24      
-        36        480 33101  63258 5R   R24      
-        36        481 33101  62645 5L   R18_3    
-        36        482 33101  62556 5R   R18_2    
-        36        483 33101  63178 5L   R24      
-        36        484 33101  63224 5R   R24      
-        36        485 33101  62652 5L   R18_3    
-        36        486 33101  62707 5R   R18_3    
-        36        487 33101  63188 5L   R24      
-        36        488 33101  63234 5R   R24      
-        36        489 33101  63183 5L   R24      
-        36        490 33101  63229 5R   R24      
-        36        491 33101  63198 5L   R24      
-        36        492 33101  63244 5R   R24      
-        36        493 33101  63193 5L   R24      
-        36        494 33101  63239 5R   R24      
-        36        495 33101  63208 5L   R24      
-        36        496 33101  63254 5R   R24      
-        36        497 33101  63203 5L   R24      
-        36        498 33101  63249 5R   R24      
-        36        499 33101  63213 5L   R24      
-        36        500 33101  63259 5R   R24      
-        36        501 30301     59 6L   B01      
-        36        502 30301      8 6R   B01      
-        36        503 30301     57 6L   B01      
-        36        504 30301     25 6R   B01      
-        36        505 33101  63266 6L   R24      
-        36        506 33101  63298 6R   R24      
-        36        507 33101  63271 6L   R24      
-        36        508 33101  63303 6R   R24      
-        36        509 33101  63276 6L   R24      
-        36        510 33101  63308 6R   R24      
-        36        511 33101  63281 6L   R24      
-        36        512 33101  63313 6R   R24      
-        36        513 33101  63286 6L   R24      
-        36        514 33101  63318 6R   R24      
-        36        515 33101  63291 6L   R24      
-        36        516 33101  63323 6R   R24      
-        36        517 33101  61862 6L   R18_1    
-        36        518 30301     28 6R   B01      
-        36        519 30301     64 6L   B01      
-        36        520 30301     16 6R   B01      
-        36        521 30301     81 6L   B01      
-        36        522 30301     10 6R   B01      
-        36        523 30301     58 6L   B01      
-        36        524 30301     33 6R   B01      
-        36        525 33101  63267 6L   R24      
-        36        526 33101  63299 6R   R24      
-        36        527 33101  63272 6L   R24      
-        36        528 33101  63304 6R   R24      
-        36        529 33101  63277 6L   R24      
-        36        530 33101  63309 6R   R24      
-        36        531 33101  63282 6L   R24      
-        36        532 33101  63314 6R   R24      
-        36        533 33101  63287 6L   R24      
-        36        534 33101  63319 6R   R24      
-        36        535 33101  63292 6L   R24      
-        36        536 33101  63324 6R   R24      
-        36        537 33101  56126 6L   R13_2    
-        36        538 33101  61167 6R   R17_3    
-        36        539 30301     65 6L   B01      
-        36        540 30301     23 6R   B01      
-        36        541 30301     85 6L   B01      
-        36        542 30301     18 6R   B01      
-        36        543 30301     63 6L   B01      
-        36        544 30301     35 6R   B01      
-        36        545 33101  63268 6L   R24      
-        36        546 33101  63300 6R   R24      
-        36        547 33101  63273 6L   R24      
-        36        548 33101  63305 6R   R24      
-        36        549 33101  63278 6L   R24      
-        36        550 33101  63310 6R   R24      
-        36        551 33101  63283 6L   R24      
-        36        552 33101  63315 6R   R24      
-        36        553 33101  63288 6L   R24      
-        36        554 33101  63320 6R   R24      
-        36        555 33101  63293 6L   R24      
-        36        556 33101  63325 6R   R24      
-        36        557 33101  61863 6L   R18_1    
-        36        558 33101  62782 6R   R18_3    
-        36        559 30301     68 6L   B01      
-        36        560 30301     24 6R   B01      
-        36        561 30301     87 6L   B01      
-        36        562 30301     19 6R   B01      
-        36        563 33101  62781 6L   R18_3    
-        36        564 33101  63296 6R   R24      
-        36        565 33101  63269 6L   R24      
-        36        566 33101  63301 6R   R24      
-        36        567 33101  63274 6L   R24      
-        36        568 33101  63306 6R   R24      
-        36        569 33101  63279 6L   R24      
-        36        570 33101  63311 6R   R24      
-        36        571 33101  63284 6L   R24      
-        36        572 33101  63316 6R   R24      
-        36        573 33101  63289 6L   R24      
-        36        574 33101  63321 6R   R24      
-        36        575 33101  63294 6L   R24      
-        36        576 33101  63326 6R   R24      
-        36        577 33101  62779 6L   R18_3    
-        36        578 33101  62783 6R   R18_3    
-        36        579 30301     75 6L   B01      
-        36        580 30301     27 6R   B01      
-        36        581 30301     95 6L   B01      
-        36        582 30301     21 6R   B01      
-        36        583 33101  64003 6L   R18_31   
-        36        584 33101  63297 6R   R24      
-        36        585 33101  63270 6L   R24      
-        36        586 33101  63302 6R   R24      
-        36        587 33101  63275 6L   R24      
-        36        588 33101  63307 6R   R24      
-        36        589 33101  63280 6L   R24      
-        36        590 33101  63312 6R   R24      
-        36        591 33101  63285 6L   R24      
-        36        592 33101  63317 6R   R24      
-        36        593 33101  63290 6L   R24      
-        36        594 33101  63322 6R   R24      
-        36        595 33101  63295 6L   R24      
-        36        596 33101  63327 6R   R24      
-        36        597 33101  62780 6L   R18_3    
-        36        598 33101  62784 6R   R18_3    
-        36        599 30301     80 6L   B01      
-        36        600 30301     34 6R   B01      
-        36        601 30301    151 7L   B02      
-        36        602 30301    146 7R   B02      
-        36        603 30301    190 7L   B02      
-        36        604 33101  63359 7R   R24      
-        36        605 33101  63328 7L   R24      
-        36        606 33101  63364 7R   R24      
-        36        607 33101  63333 7L   R24      
-        36        608 33101  63369 7R   R24      
-        36        609 33101  63339 7L   R24      
-        36        610 33101  63374 7R   R24      
-        36        611 33101  63344 7L   R24      
-        36        612 33101  63379 7R   R24      
-        36        613 33101  63349 7L   R24      
-        36        614 33101  63384 7R   R24      
-        36        615 33101  63354 7L   R24      
-        36        616 33101  63389 7R   R24      
-        36        617 33101  61892 7L   R18_1    
-        36        618 33101  39622 7R   S10_1    
-        36        619 30301    166 7L   B02      
-        36        620 30301    131 7R   B02      
-        36        621 30301    152 7L   B02      
-        36        622 30301    149 7R   B02      
-        36        623 30301    191 7L   B02      
-        36        624 33101  63360 7R   R24      
-        36        625 33101  63329 7L   R24      
-        36        626 33101  63365 7R   R24      
-        36        627 33101  63334 7L   R24      
-        36        628 33101  63370 7R   R24      
-        36        629 33101  63340 7L   R24      
-        36        630 33101  63375 7R   R24      
-        36        631 33101  63345 7L   R24      
-        36        632 33101  63380 7R   R24      
-        36        633 33101  63350 7L   R24      
-        36        634 33101  63385 7R   R24      
-        36        635 33101  63355 7L   R24      
-        36        636 33101  63390 7R   R24      
-        36        637 33101  61893 7L   R18_1    
-        36        638 33101  61963 7R   R18_1    
-        36        639 30301    174 7L   B02      
-        36        640 30301    134 7R   B02      
-        36        641 30301    545 7L   B04      
-        36        642 30301    150 7R   B02      
-        36        643 33101  62786 7L   R18_3    
-        36        644 33101  63361 7R   R24      
-        36        645 33101  63330 7L   R24      
-        36        646 33101  63366 7R   R24      
-        36        647 33101  63335 7L   R24      
-        36        648 33101  63371 7R   R24      
-        36        649 33101  63341 7L   R24      
-        36        650 33101  63376 7R   R24      
-        36        651 33101  63346 7L   R24      
-        36        652 33101  63381 7R   R24      
-        36        653 33101  63351 7L   R24      
-        36        654 33101  63386 7R   R24      
-        36        655 33101  63356 7L   R24      
-        36        656 33101  63391 7R   R24      
-        36        657 33101  61894 7L   R18_1    
-        36        658 33101  61977 7R   R18_1    
-        36        659 30301    183 7L   B02      
-        36        660 30301    137 7R   B02      
-        36        661 30301    157 7L   B02      
-        36        662 33101  62791 7R   R18_3    
-        36        663 33101  62787 7L   R18_3    
-        36        664 33101  63362 7R   R24      
-        36        665 33101  63331 7L   R24      
-        36        666 33101  63367 7R   R24      
-        36        667 33101  63337 7L   R24      
-        36        668 33101  63372 7R   R24      
-        36        669 33101  63342 7L   R24      
-        36        670 33101  63377 7R   R24      
-        36        671 33101  63347 7L   R24      
-        36        672 33101  63382 7R   R24      
-        36        673 33101  63352 7L   R24      
-        36        674 33101  63387 7R   R24      
-        36        675 33101  63357 7L   R24      
-        36        676 33101  63392 7R   R24      
-        36        677 33101  61896 7L   R18_1    
-        36        678 33101  62789 7R   R18_3    
-        36        679 30301    184 7L   B02      
-        36        680 30301    145 7R   B02      
-        36        681 30301    165 7L   B02      
-        36        682 33101  62792 7R   R18_3    
-        36        683 33101  62788 7L   R18_3    
-        36        684 33101  63363 7R   R24      
-        36        685 33101  63332 7L   R24      
-        36        686 33101  63368 7R   R24      
-        36        687 33101  63338 7L   R24      
-        36        688 33101  63373 7R   R24      
-        36        689 33101  63343 7L   R24      
-        36        690 33101  63378 7R   R24      
-        36        691 33101  63348 7L   R24      
-        36        692 33101  63383 7R   R24      
-        36        693 33101  63353 7L   R24      
-        36        694 33101  63388 7R   R24      
-        36        695 33101  63358 7L   R24      
-        36        696 33101  63393 7R   R24      
-        36        697 33101  62785 7L   R18_3    
-        36        698 33101  62790 7R   R18_3    
-        36        699 30301    544 7L   B04      
-        36        700 30301    148 7R   B02      
-        36        701 30301    254 8L   B03      
-        36        702 30301    206 8R   B03      
-        36        703 33101  62794 8L   R18_3    
-        36        704 30301    236 8R   B03      
-        36        705 33101  63396 8L   R24      
-        36        706 33101  63428 8R   R24      
-        36        707 33101  63401 8L   R24      
-        36        708 33101  63433 8R   R24      
-        36        709 33101  63406 8L   R24      
-        36        710 33101  63438 8R   R24      
-        36        711 33101  63411 8L   R24      
-        36        712 33101  63443 8R   R24      
-        36        713 33101  63416 8L   R24      
-        36        714 33101  63448 8R   R24      
-        36        715 33101  63421 8L   R24      
-        36        716 33101  63453 8R   R24      
-        36        717 33101  56617 8L   R13_3    
-        36        718 33101  62066 8R   R18_1    
-        36        719 30301    255 8L   B03      
-        36        720 30301    235 8R   B03      
-        36        721 30301    275 8L   B03      
-        36        722 30301    214 8R   B03      
-        36        723 33101  62795 8L   R18_3    
-        36        724 33101  62799 8R   R18_3    
-        36        725 33101  63397 8L   R24      
-        36        726 33101  63429 8R   R24      
-        36        727 33101  63402 8L   R24      
-        36        728 33101  63434 8R   R24      
-        36        729 33101  63407 8L   R24      
-        36        730 33101  63439 8R   R24      
-        36        731 33101  63412 8L   R24      
-        36        732 33101  63444 8R   R24      
-        36        733 33101  63417 8L   R24      
-        36        734 33101  63449 8R   R24      
-        36        735 33101  63422 8L   R24      
-        36        736 33101  63454 8R   R24      
-        36        737 33101  61988 8L   R18_1    
-        36        738 33101  62072 8R   R18_1    
-        36        739 30301    257 8L   B03      
-        36        740 30301    237 8R   B03      
-        36        741 30301    279 8L   B03      
-        36        742 30301    225 8R   B03      
-        36        743 33101  62796 8L   R18_3    
-        36        744 33101  62800 8R   R18_3    
-        36        745 33101  63398 8L   R24      
-        36        746 33101  63430 8R   R24      
-        36        747 33101  63403 8L   R24      
-        36        748 33101  63435 8R   R24      
-        36        749 33101  63408 8L   R24      
-        36        750 33101  63440 8R   R24      
-        36        751 33101  63413 8L   R24      
-        36        752 33101  63445 8R   R24      
-        36        753 33101  63418 8L   R24      
-        36        754 33101  63450 8R   R24      
-        36        755 33101  63423 8L   R24      
-        36        756 33101  63455 8R   R24      
-        36        757 33101  61989 8L   R18_1    
-        36        758 33101  62074 8R   R18_1    
-        36        759 30301    259 8L   B03      
-        36        760 30301    240 8R   B03      
-        36        761 30301    284 8L   B03      
-        36        762 30301    226 8R   B03      
-        36        763 33101  63394 8L   R24      
-        36        764 33101  63426 8R   R24      
-        36        765 33101  63399 8L   R24      
-        36        766 33101  63431 8R   R24      
-        36        767 33101  63404 8L   R24      
-        36        768 33101  63436 8R   R24      
-        36        769 33101  63409 8L   R24      
-        36        770 33101  63441 8R   R24      
-        36        771 33101  63414 8L   R24      
-        36        772 33101  63446 8R   R24      
-        36        773 33101  63419 8L   R24      
-        36        774 33101  63451 8R   R24      
-        36        775 33101  63424 8L   R24      
-        36        776 33101  63456 8R   R24      
-        36        777 33101  61990 8L   R18_1    
-        36        778 33101  62797 8R   R18_3    
-        36        779 30301    267 8L   B03      
-        36        780 30301    244 8R   B03      
-        36        781 30301    285 8L   B03      
-        36        782 30301    232 8R   B03      
-        36        783 33101  63395 8L   R24      
-        36        784 33101  63427 8R   R24      
-        36        785 33101  63400 8L   R24      
-        36        786 33101  63432 8R   R24      
-        36        787 33101  63405 8L   R24      
-        36        788 33101  63437 8R   R24      
-        36        789 33101  63410 8L   R24      
-        36        790 33101  63442 8R   R24      
-        36        791 33101  63415 8L   R24      
-        36        792 33101  63447 8R   R24      
-        36        793 33101  63420 8L   R24      
-        36        794 33101  63452 8R   R24      
-        36        795 33101  63425 8L   R24      
-        36        796 33101  63457 8R   R24      
-        36        797 33101  62793 8L   R18_3    
-        36        798 33101  62798 8R   R18_3    
-        36        799 30301    271 8L   B03      
-        36        800 30301    248 8R   B03      
-        36        801 30301    353 9L   B03      
-        36        802 30301    308 9R   B03      
-        36        803 33101  63458 9L   R24      
-        36        804 33101  62808 9R   R18_3    
-        36        805 33101  63463 9L   R24      
-        36        806 33101  63498 9R   R24      
-        36        807 33101  63468 9L   R24      
-        36        808 33101  63503 9R   R24      
-        36        809 33101  63473 9L   R24      
-        36        810 33101  63508 9R   R24      
-        36        811 33101  63478 9L   R24      
-        36        812 33101  63513 9R   R24      
-        36        813 33101  63483 9L   R24      
-        36        814 33101  63518 9R   R24      
-        36        815 33101  63488 9L   R24      
-        36        816 33101  63524 9R   R24      
-        36        817 33101  62102 9L   R18_1    
-        36        818 33101  56266 9R   R13_2    
-        36        819 30301    359 9L   B03      
-        36        820 30301    316 9R   B03      
-        36        821 30301    398 9L   B03      
-        36        822 30301    309 9R   B03      
-        36        823 33101  63459 9L   R24      
-        36        824 33101  63494 9R   R24      
-        36        825 33101  63464 9L   R24      
-        36        826 33101  63499 9R   R24      
-        36        827 33101  63469 9L   R24      
-        36        828 33101  63504 9R   R24      
-        36        829 33101  63474 9L   R24      
-        36        830 33101  63509 9R   R24      
-        36        831 33101  63479 9L   R24      
-        36        832 33101  63514 9R   R24      
-        36        833 33101  63484 9L   R24      
-        36        834 33101  63519 9R   R24      
-        36        835 33101  63489 9L   R24      
-        36        836 33101  63525 9R   R24      
-        36        837 33101  62103 9L   R18_1    
-        36        838 33101  56272 9R   R13_2    
-        36        839 30301    366 9L   B03      
-        36        840 30301    326 9R   B03      
-        36        841 30301    399 9L   B03      
-        36        842 30301    311 9R   B03      
-        36        843 33101  63460 9L   R24      
-        36        844 33101  63495 9R   R24      
-        36        845 33101  63465 9L   R24      
-        36        846 33101  63500 9R   R24      
-        36        847 33101  63470 9L   R24      
-        36        848 33101  63505 9R   R24      
-        36        849 33101  63475 9L   R24      
-        36        850 33101  63510 9R   R24      
-        36        851 33101  63480 9L   R24      
-        36        852 33101  63515 9R   R24      
-        36        853 33101  63485 9L   R24      
-        36        854 33101  63520 9R   R24      
-        36        855 33101  63490 9L   R24      
-        36        856 33101  63526 9R   R24      
-        36        857 33101  62105 9L   R18_1    
-        36        858 33101  62805 9R   R18_3    
-        36        859 30301    367 9L   B03      
-        36        860 30301    329 9R   B03      
-        36        861 33101  62803 9L   R18_3    
-        36        862 30301    313 9R   B03      
-        36        863 33101  63461 9L   R24      
-        36        864 33101  63496 9R   R24      
-        36        865 33101  63466 9L   R24      
-        36        866 33101  63501 9R   R24      
-        36        867 33101  63471 9L   R24      
-        36        868 33101  63506 9R   R24      
-        36        869 33101  63476 9L   R24      
-        36        870 33101  63511 9R   R24      
-        36        871 33101  63481 9L   R24      
-        36        872 33101  63516 9R   R24      
-        36        873 33101  63486 9L   R24      
-        36        874 33101  63521 9R   R24      
-        36        875 33101  63491 9L   R24      
-        36        876 33101  63527 9R   R24      
-        36        877 33101  62801 9L   R18_3    
-        36        878 33101  62806 9R   R18_3    
-        36        879 30301    377 9L   B03      
-        36        880 30301    337 9R   B03      
-        36        881 33101  62804 9L   R18_3    
-        36        882 30301    315 9R   B03      
-        36        883 33101  63462 9L   R24      
-        36        884 33101  63497 9R   R24      
-        36        885 33101  63467 9L   R24      
-        36        886 33101  63502 9R   R24      
-        36        887 33101  63472 9L   R24      
-        36        888 33101  63507 9R   R24      
-        36        889 33101  63477 9L   R24      
-        36        890 33101  63512 9R   R24      
-        36        891 33101  63482 9L   R24      
-        36        892 33101  63517 9R   R24      
-        36        893 33101  63487 9L   R24      
-        36        894 33101  63522 9R   R24      
-        36        895 33101  63492 9L   R24      
-        36        896 33101  63528 9R   R24      
-        36        897 33101  62802 9L   R18_3    
-        36        898 33101  62807 9R   R18_3    
-        36        899 30301    380 9L   B03      
-        36        900 30301    340 9R   B03      
-        36        901 33101  60061 10L  R16_3    
-        36        902 33101  60105 10R  R16_3    
-        36        903 33101  63532 10L  R24      
-        36        904 33101  63575 10R  R24      
-        36        905 33101  62811 10L  R18_3    
-        36        906 33101  62814 10R  R18_3    
-        36        907 33101  63542 10L  R24      
-        36        908 33101  63585 10R  R24      
-        36        909 33101  63537 10L  R24      
-        36        910 33101  63580 10R  R24      
-        36        911 33101  63552 10L  R24      
-        36        912 33101  63595 10R  R24      
-        36        913 33101  63547 10L  R24      
-        36        914 33101  63590 10R  R24      
-        36        915 33101  63562 10L  R24      
-        36        916 33101  63605 10R  R24      
-        36        917 33101  63557 10L  R24      
-        36        918 33101  63600 10R  R24      
-        36        919 33101  63567 10L  R24      
-        36        920 33101  63610 10R  R24      
-        36        921 33101  60062 10L  R16_3    
-        36        922 33101  60106 10R  R16_3    
-        36        923 33101  63533 10L  R24      
-        36        924 33101  63576 10R  R24      
-        36        925 33101  62812 10L  R18_3    
-        36        926 33101  62815 10R  R18_3    
-        36        927 33101  63543 10L  R24      
-        36        928 33101  63586 10R  R24      
-        36        929 33101  63538 10L  R24      
-        36        930 33101  63581 10R  R24      
-        36        931 33101  63553 10L  R24      
-        36        932 33101  63596 10R  R24      
-        36        933 33101  63548 10L  R24      
-        36        934 33101  63591 10R  R24      
-        36        935 33101  63563 10L  R24      
-        36        936 33101  63606 10R  R24      
-        36        937 33101  63558 10L  R24      
-        36        938 33101  63601 10R  R24      
-        36        939 33101  63568 10L  R24      
-        36        940 33101  63611 10R  R24      
-        36        941 33101  60948 10L  R17_2    
-        36        942 33101  60974 10R  R17_2    
-        36        943 33101  63534 10L  R24      
-        36        944 33101  63577 10R  R24      
-        36        945 33101  63529 10L  R24      
-        36        946 33101  62816 10R  R18_3    
-        36        947 33101  63544 10L  R24      
-        36        948 33101  63587 10R  R24      
-        36        949 33101  63539 10L  R24      
-        36        950 33101  63582 10R  R24      
-        36        951 33101  63554 10L  R24      
-        36        952 33101  63597 10R  R24      
-        36        953 33101  63549 10L  R24      
-        36        954 33101  63592 10R  R24      
-        36        955 33101  63564 10L  R24      
-        36        956 33101  63607 10R  R24      
-        36        957 33101  63559 10L  R24      
-        36        958 33101  63602 10R  R24      
-        36        959 33101  63569 10L  R24      
-        36        960 33101  63612 10R  R24      
-        36        961 33101  62809 10L  R18_3    
-        36        962 33101  61349 10R  R17_3    
-        36        963 33101  63535 10L  R24      
-        36        964 33101  63578 10R  R24      
-        36        965 33101  63530 10L  R24      
-        36        966 33101  63573 10R  R24      
-        36        967 33101  63545 10L  R24      
-        36        968 33101  63588 10R  R24      
-        36        969 33101  63540 10L  R24      
-        36        970 33101  63583 10R  R24      
-        36        971 33101  63555 10L  R24      
-        36        972 33101  63598 10R  R24      
-        36        973 33101  63550 10L  R24      
-        36        974 33101  63593 10R  R24      
-        36        975 33101  63565 10L  R24      
-        36        976 33101  63608 10R  R24      
-        36        977 33101  63560 10L  R24      
-        36        978 33101  63603 10R  R24      
-        36        979 33101  63570 10L  R24      
-        36        980 33101  63613 10R  R24      
-        36        981 33101  62810 10L  R18_3    
-        36        982 33101  62813 10R  R18_3    
-        36        983 33101  63536 10L  R24      
-        36        984 33101  63579 10R  R24      
-        36        985 33101  63531 10L  R24      
-        36        986 33101  63574 10R  R24      
-        36        987 33101  63546 10L  R24      
-        36        988 33101  63589 10R  R24      
-        36        989 33101  63541 10L  R24      
-        36        990 33101  63584 10R  R24      
-        36        991 33101  63556 10L  R24      
-        36        992 33101  63599 10R  R24      
-        36        993 33101  63551 10L  R24      
-        36        994 33101  63594 10R  R24      
-        36        995 33101  63566 10L  R24      
-        36        996 33101  63609 10R  R24      
-        36        997 33101  63561 10L  R24      
-        36        998 33101  63604 10R  R24      
-        36        999 33101  63572 10L  R24      
-        36       1000 33101  63614 10R  R24      
-        36       1001 33101  62817 11L  R18_3    
-        36       1002 33101  60161 11R  R16_3    
-        36       1003 33101  63616 11L  R24      
-        36       1004 33101  63659 11R  R24      
-        36       1005 33101  62822 11L  R18_3    
-        36       1006 33101  62828 11R  R18_3    
-        36       1007 33101  63626 11L  R24      
-        36       1008 33101  63669 11R  R24      
-        36       1009 33101  63621 11L  R24      
-        36       1010 33101  63674 11R  R24      
-        36       1011 33101  63636 11L  R24      
-        36       1012 33101  63689 11R  R24      
-        36       1013 33101  63631 11L  R24      
-        36       1014 33101  63664 11R  R24      
-        36       1015 33101  63646 11L  R24      
-        36       1016 33101  63679 11R  R24      
-        36       1017 33101  63641 11L  R24      
-        36       1018 33101  63684 11R  R24      
-        36       1019 33101  63651 11L  R24      
-        36       1020 33101  63694 11R  R24      
-        36       1021 33101  62818 11L  R18_3    
-        36       1022 33101  60162 11R  R16_3    
-        36       1023 33101  63617 11L  R24      
-        36       1024 33101  63660 11R  R24      
-        36       1025 33101  62823 11L  R18_3    
-        36       1026 33101  62829 11R  R18_3    
-        36       1027 33101  63627 11L  R24      
-        36       1028 33101  63670 11R  R24      
-        36       1029 33101  63622 11L  R24      
-        36       1030 33101  63675 11R  R24      
-        36       1031 33101  63637 11L  R24      
-        36       1032 33101  63690 11R  R24      
-        36       1033 33101  63632 11L  R24      
-        36       1034 33101  63665 11R  R24      
-        36       1035 33101  63647 11L  R24      
-        36       1036 33101  63680 11R  R24      
-        36       1037 33101  63642 11L  R24      
-        36       1038 33101  63685 11R  R24      
-        36       1039 33101  63652 11L  R24      
-        36       1040 33101  63695 11R  R24      
-        36       1041 33101  62819 11L  R18_3    
-        36       1042 33101  61365 11R  R17_3    
-        36       1043 33101  63618 11L  R24      
-        36       1044 33101  63661 11R  R24      
-        36       1045 33101  62824 11L  R18_3    
-        36       1046 33101  62830 11R  R18_3    
-        36       1047 33101  63628 11L  R24      
-        36       1048 33101  63671 11R  R24      
-        36       1049 33101  63623 11L  R24      
-        36       1050 33101  63676 11R  R24      
-        36       1051 33101  63638 11L  R24      
-        36       1052 33101  63691 11R  R24      
-        36       1053 33101  63633 11L  R24      
-        36       1054 33101  63666 11R  R24      
-        36       1055 33101  63648 11L  R24      
-        36       1056 33101  63681 11R  R24      
-        36       1057 33101  63643 11L  R24      
-        36       1058 33101  63686 11R  R24      
-        36       1059 33101  63653 11L  R24      
-        36       1060 33101  63696 11R  R24      
-        36       1061 33101  62820 11L  R18_3    
-        36       1062 33101  62177 11R  R18_1    
-        36       1063 33101  63619 11L  R24      
-        36       1064 33101  63662 11R  R24      
-        36       1065 33101  62825 11L  R18_3    
-        36       1066 33101  63657 11R  R24      
-        36       1067 33101  63629 11L  R24      
-        36       1068 33101  63672 11R  R24      
-        36       1069 33101  63624 11L  R24      
-        36       1070 33101  63677 11R  R24      
-        36       1071 33101  63639 11L  R24      
-        36       1072 33101  63692 11R  R24      
-        36       1073 33101  63634 11L  R24      
-        36       1074 33101  63667 11R  R24      
-        36       1075 33101  63649 11L  R24      
-        36       1076 33101  63682 11R  R24      
-        36       1077 33101  63644 11L  R24      
-        36       1078 33101  63687 11R  R24      
-        36       1079 33101  63654 11L  R24      
-        36       1080 33101  63697 11R  R24      
-        36       1081 33101  62821 11L  R18_3    
-        36       1082 33101  62827 11R  R18_3    
-        36       1083 33101  63620 11L  R24      
-        36       1084 33101  63663 11R  R24      
-        36       1085 33101  62826 11L  R18_3    
-        36       1086 33101  63658 11R  R24      
-        36       1087 33101  63630 11L  R24      
-        36       1088 33101  63673 11R  R24      
-        36       1089 33101  63625 11L  R24      
-        36       1090 33101  63678 11R  R24      
-        36       1091 33101  63640 11L  R24      
-        36       1092 33101  63693 11R  R24      
-        36       1093 33101  63635 11L  R24      
-        36       1094 33101  63668 11R  R24      
-        36       1095 33101  63650 11L  R24      
-        36       1096 33101  63683 11R  R24      
-        36       1097 33101  63645 11L  R24      
-        36       1098 33101  63688 11R  R24      
-        36       1099 33101  63655 11L  R24      
-        36       1100 33101  63698 11R  R24      
-        36       1101 33101  60215 12L  R16_3    
-        36       1102 33101  60236 12R  R16_3    
-        36       1103 33101  63703 12L  R24      
-        36       1104 33101  63746 12R  R24      
-        36       1105 33101  62832 12L  R18_3    
-        36       1106 33101  62835 12R  R18_3    
-        36       1107 33101  63713 12L  R24      
-        36       1108 33101  63756 12R  R24      
-        36       1109 33101  63708 12L  R24      
-        36       1110 33101  63751 12R  R24      
-        36       1111 33101  63723 12L  R24      
-        36       1112 33101  63766 12R  R24      
-        36       1113 33101  63718 12L  R24      
-        36       1114 33101  63761 12R  R24      
-        36       1115 33101  63733 12L  R24      
-        36       1116 33101  63776 12R  R24      
-        36       1117 33101  63728 12L  R24      
-        36       1118 33101  63771 12R  R24      
-        36       1119 33101  63738 12L  R24      
-        36       1120 33101  63781 12R  R24      
-        36       1121 33101  61409 12L  R17_3    
-        36       1122 33101  60237 12R  R16_3    
-        36       1123 33101  63704 12L  R24      
-        36       1124 33101  63747 12R  R24      
-        36       1125 33101  62833 12L  R18_3    
-        36       1126 33101  62836 12R  R18_3    
-        36       1127 33101  63714 12L  R24      
-        36       1128 33101  63757 12R  R24      
-        36       1129 33101  63709 12L  R24      
-        36       1130 33101  63752 12R  R24      
-        36       1131 33101  63724 12L  R24      
-        36       1132 33101  63767 12R  R24      
-        36       1133 33101  63719 12L  R24      
-        36       1134 33101  63762 12R  R24      
-        36       1135 33101  63734 12L  R24      
-        36       1136 33101  63777 12R  R24      
-        36       1137 33101  63729 12L  R24      
-        36       1138 33101  63772 12R  R24      
-        36       1139 33101  63739 12L  R24      
-        36       1140 33101  63782 12R  R24      
-        36       1141 33101  61410 12L  R17_3    
-        36       1142 33101  60238 12R  R16_3    
-        36       1143 33101  63705 12L  R24      
-        36       1144 33101  63748 12R  R24      
-        36       1145 33101  63700 12L  R24      
-        36       1146 33101  62837 12R  R18_3    
-        36       1147 33101  63715 12L  R24      
-        36       1148 33101  63758 12R  R24      
-        36       1149 33101  63710 12L  R24      
-        36       1150 33101  63753 12R  R24      
-        36       1151 33101  63725 12L  R24      
-        36       1152 33101  63768 12R  R24      
-        36       1153 33101  63720 12L  R24      
-        36       1154 33101  63763 12R  R24      
-        36       1155 33101  63735 12L  R24      
-        36       1156 33101  63778 12R  R24      
-        36       1157 33101  63730 12L  R24      
-        36       1158 33101  63773 12R  R24      
-        36       1159 33101  63740 12L  R24      
-        36       1160 33101  63783 12R  R24      
-        36       1161 33101  61433 12L  R17_3    
-        36       1162 33101  61461 12R  R17_3    
-        36       1163 33101  63706 12L  R24      
-        36       1164 33101  63749 12R  R24      
-        36       1165 33101  63701 12L  R24      
-        36       1166 33101  63744 12R  R24      
-        36       1167 33101  63716 12L  R24      
-        36       1168 33101  63759 12R  R24      
-        36       1169 33101  63711 12L  R24      
-        36       1170 33101  63754 12R  R24      
-        36       1171 33101  63726 12L  R24      
-        36       1172 33101  63769 12R  R24      
-        36       1173 33101  63721 12L  R24      
-        36       1174 33101  63764 12R  R24      
-        36       1175 33101  63736 12L  R24      
-        36       1176 33101  63779 12R  R24      
-        36       1177 33101  63731 12L  R24      
-        36       1178 33101  63774 12R  R24      
-        36       1179 33101  63741 12L  R24      
-        36       1180 33101  63784 12R  R24      
-        36       1181 33101  62831 12L  R18_3    
-        36       1182 33101  62834 12R  R18_3    
-        36       1183 33101  63707 12L  R24      
-        36       1184 33101  63750 12R  R24      
-        36       1185 33101  63702 12L  R24      
-        36       1186 33101  63745 12R  R24      
-        36       1187 33101  63717 12L  R24      
-        36       1188 33101  63760 12R  R24      
-        36       1189 33101  63712 12L  R24      
-        36       1190 33101  63755 12R  R24      
-        36       1191 33101  63727 12L  R24      
-        36       1192 33101  63770 12R  R24      
-        36       1193 33101  63722 12L  R24      
-        36       1194 33101  63765 12R  R24      
-        36       1195 33101  63737 12L  R24      
-        36       1196 33101  63780 12R  R24      
-        36       1197 33101  63732 12L  R24      
-        36       1198 33101  63775 12R  R24      
-        36       1199 33101  63742 12L  R24      
-        36       1200 33101  63785 12R  R24      
-        36       1201 33101  60670 13L  R17_1    
-        36       1202 33101  60285 13R  R16_3    
-        36       1203 33101  63791 13L  R24      
-        36       1204 33101  63835 13R  R24      
-        36       1205 33101  62840 13L  R18_3    
-        36       1206 33101  62844 13R  R18_3    
-        36       1207 33101  63801 13L  R24      
-        36       1208 33101  63845 13R  R24      
-        36       1209 33101  63796 13L  R24      
-        36       1210 33101  63840 13R  R24      
-        36       1211 33101  63811 13L  R24      
-        36       1212 33101  63855 13R  R24      
-        36       1213 33101  63806 13L  R24      
-        36       1214 33101  63850 13R  R24      
-        36       1215 33101  63821 13L  R24      
-        36       1216 33101  63865 13R  R24      
-        36       1217 33101  63816 13L  R24      
-        36       1218 33101  63860 13R  R24      
-        36       1219 33101  63826 13L  R24      
-        36       1220 33101  63870 13R  R24      
-        36       1221 33101  62179 13L  R18_1    
-        36       1222 33101  61561 13R  R17_3    
-        36       1223 33101  63792 13L  R24      
-        36       1224 33101  63836 13R  R24      
-        36       1225 33101  62841 13L  R18_3    
-        36       1226 33101  62845 13R  R18_3    
-        36       1227 33101  63802 13L  R24      
-        36       1228 33101  63846 13R  R24      
-        36       1229 33101  63797 13L  R24      
-        36       1230 33101  63841 13R  R24      
-        36       1231 33101  63812 13L  R24      
-        36       1232 33101  63856 13R  R24      
-        36       1233 33101  63807 13L  R24      
-        36       1234 33101  63851 13R  R24      
-        36       1235 33101  63822 13L  R24      
-        36       1236 33101  63866 13R  R24      
-        36       1237 33101  63817 13L  R24      
-        36       1238 33101  63861 13R  R24      
-        36       1239 33101  63827 13L  R24      
-        36       1240 33101  63871 13R  R24      
-        36       1241 33101  62180 13L  R18_1    
-        36       1242 33101  61562 13R  R17_3    
-        36       1243 33101  63793 13L  R24      
-        36       1244 33101  63837 13R  R24      
-        36       1245 33101  63788 13L  R24      
-        36       1246 33101  63832 13R  R24      
-        36       1247 33101  63803 13L  R24      
-        36       1248 33101  63847 13R  R24      
-        36       1249 33101  63798 13L  R24      
-        36       1250 33101  63842 13R  R24      
-        36       1251 33101  63813 13L  R24      
-        36       1252 33101  63857 13R  R24      
-        36       1253 33101  63808 13L  R24      
-        36       1254 33101  63852 13R  R24      
-        36       1255 33101  63823 13L  R24      
-        36       1256 33101  63867 13R  R24      
-        36       1257 33101  63818 13L  R24      
-        36       1258 33101  63862 13R  R24      
-        36       1259 33101  63828 13L  R24      
-        36       1260 33101  63872 13R  R24      
-        36       1261 33101  62838 13L  R18_3    
-        36       1262 33101  62842 13R  R18_3    
-        36       1263 33101  63794 13L  R24      
-        36       1264 33101  63838 13R  R24      
-        36       1265 33101  63789 13L  R24      
-        36       1266 33101  63833 13R  R24      
-        36       1267 33101  63804 13L  R24      
-        36       1268 33101  63848 13R  R24      
-        36       1269 33101  63799 13L  R24      
-        36       1270 33101  63843 13R  R24      
-        36       1271 33101  63814 13L  R24      
-        36       1272 33101  63858 13R  R24      
-        36       1273 33101  63809 13L  R24      
-        36       1274 33101  63853 13R  R24      
-        36       1275 33101  63824 13L  R24      
-        36       1276 33101  63868 13R  R24      
-        36       1277 33101  63819 13L  R24      
-        36       1278 33101  63863 13R  R24      
-        36       1279 33101  63829 13L  R24      
-        36       1280 33101  63873 13R  R24      
-        36       1281 33101  62839 13L  R18_3    
-        36       1282 33101  62843 13R  R18_3    
-        36       1283 33101  63795 13L  R24      
-        36       1284 33101  63839 13R  R24      
-        36       1285 33101  63790 13L  R24      
-        36       1286 33101  63834 13R  R24      
-        36       1287 33101  63805 13L  R24      
-        36       1288 33101  63849 13R  R24      
-        36       1289 33101  63800 13L  R24      
-        36       1290 33101  63844 13R  R24      
-        36       1291 33101  63815 13L  R24      
-        36       1292 33101  63859 13R  R24      
-        36       1293 33101  63810 13L  R24      
-        36       1294 33101  63854 13R  R24      
-        36       1295 33101  63825 13L  R24      
-        36       1296 33101  63869 13R  R24      
-        36       1297 33101  63820 13L  R24      
-        36       1298 33101  63864 13R  R24      
-        36       1299 33101  63830 13L  R24      
-        36       1300 33101  63874 13R  R24      
-        36       1301 33101  62708 14L  R18_3    
-        36       1302 33101  61091 14R  R17_3    
-        36       1303 33101  63877 14L  R24      
-        36       1304 33101  63919 14R  R24      
-        36       1305 33101  62709 14L  R18_3    
-        36       1306 33101  62712 14R  R18_3    
-        36       1307 33101  63887 14L  R24      
-        36       1308 33101  63929 14R  R24      
-        36       1309 33101  63882 14L  R24      
-        36       1310 33101  63924 14R  R24      
-        36       1311 33101  63897 14L  R24      
-        36       1312 33101  63939 14R  R24      
-        36       1313 33101  63892 14L  R24      
-        36       1314 33101  63934 14R  R24      
-        36       1315 33101  63907 14L  R24      
-        36       1316 33101  63949 14R  R24      
-        36       1317 33101  63902 14L  R24      
-        36       1318 33101  63944 14R  R24      
-        36       1319 33101  63912 14L  R24      
-        36       1320 33101  63954 14R  R24      
-        36       1321 33101  61063 14L  R17_3    
-        36       1322 33101  61690 14R  R18_1    
-        36       1323 33101  63878 14L  R24      
-        36       1324 33101  63920 14R  R24      
-        36       1325 33101  62710 14L  R18_3    
-        36       1326 33101  62713 14R  R18_3    
-        36       1327 33101  63888 14L  R24      
-        36       1328 33101  63930 14R  R24      
-        36       1329 33101  63883 14L  R24      
-        36       1330 33101  63925 14R  R24      
-        36       1331 33101  63898 14L  R24      
-        36       1332 33101  63940 14R  R24      
-        36       1333 33101  63893 14L  R24      
-        36       1334 33101  63935 14R  R24      
-        36       1335 33101  63908 14L  R24      
-        36       1336 33101  63950 14R  R24      
-        36       1337 33101  63903 14L  R24      
-        36       1338 33101  63945 14R  R24      
-        36       1339 33101  63913 14L  R24      
-        36       1340 33101  63955 14R  R24      
-        36       1341 33101  61064 14L  R17_3    
-        36       1342 33101  61088 14R  R17_3    
-        36       1343 33101  63879 14L  R24      
-        36       1344 33101  63921 14R  R24      
-        36       1345 33101  62711 14L  R18_3    
-        36       1346 33101  62714 14R  R18_3    
-        36       1347 33101  63889 14L  R24      
-        36       1348 33101  63931 14R  R24      
-        36       1349 33101  63884 14L  R24      
-        36       1350 33101  63926 14R  R24      
-        36       1351 33101  63899 14L  R24      
-        36       1352 33101  63941 14R  R24      
-        36       1353 33101  63894 14L  R24      
-        36       1354 33101  63936 14R  R24      
-        36       1355 33101  63909 14L  R24      
-        36       1356 33101  63951 14R  R24      
-        36       1357 33101  63904 14L  R24      
-        36       1358 33101  63946 14R  R24      
-        36       1359 33101  63914 14L  R24      
-        36       1360 33101  63956 14R  R24      
-        36       1361 33101  61663 14L  R18_1    
-        36       1362 33101  61089 14R  R17_3    
-        36       1363 33101  63880 14L  R24      
-        36       1364 33101  63922 14R  R24      
-        36       1365 33101  63875 14L  R24      
-        36       1366 33101  62715 14R  R18_3    
-        36       1367 33101  63890 14L  R24      
-        36       1368 33101  63932 14R  R24      
-        36       1369 33101  63885 14L  R24      
-        36       1370 33101  63927 14R  R24      
-        36       1371 33101  63900 14L  R24      
-        36       1372 33101  63942 14R  R24      
-        36       1373 33101  63895 14L  R24      
-        36       1374 33101  63937 14R  R24      
-        36       1375 33101  63910 14L  R24      
-        36       1376 33101  63952 14R  R24      
-        36       1377 33101  63905 14L  R24      
-        36       1378 33101  63947 14R  R24      
-        36       1379 33101  63915 14L  R24      
-        36       1380 33101  63957 14R  R24      
-        36       1381 33101  61664 14L  R18_1    
-        36       1382 33101  61090 14R  R17_3    
-        36       1383 33101  63881 14L  R24      
-        36       1384 33101  63923 14R  R24      
-        36       1385 33101  63876 14L  R24      
-        36       1386 33101  63918 14R  R24      
-        36       1387 33101  63891 14L  R24      
-        36       1388 33101  63933 14R  R24      
-        36       1389 33101  63886 14L  R24      
-        36       1390 33101  63928 14R  R24      
-        36       1391 33101  63901 14L  R24      
-        36       1392 33101  63943 14R  R24      
-        36       1393 33101  63896 14L  R24      
-        36       1394 33101  63938 14R  R24      
-        36       1395 33101  63911 14L  R24      
-        36       1396 33101  63953 14R  R24      
-        36       1397 33101  63906 14L  R24      
-        36       1398 33101  63948 14R  R24      
-        36       1399 33101  63916 14L  R24      
-        36       1400 33101  63958 14R  R24      
-        36       1401 33101  62557 15L  R18_2    
-        36       1402 33101  61789 15R  R18_1    
-        36       1403 33101  63962 15L  R24      
-        36       1404 33101  64008 15R  R24      
-        36       1405 33101  62558 15L  R18_2    
-        36       1406 33101  62717 15R  R18_3    
-        36       1407 33101  63972 15L  R24      
-        36       1408 33101  64018 15R  R24      
-        36       1409 33101  63967 15L  R24      
-        36       1410 33101  64013 15R  R24      
-        36       1411 33101  63982 15L  R24      
-        36       1412 33101  64028 15R  R24      
-        36       1413 33101  63977 15L  R24      
-        36       1414 33101  64023 15R  R24      
-        36       1415 33101  63992 15L  R24      
-        36       1416 33101  64038 15R  R24      
-        36       1417 33101  63987 15L  R24      
-        36       1418 33101  64033 15R  R24      
-        36       1419 33101  63997 15L  R24      
-        36       1420 33101  64043 15R  R24      
-        36       1421 33101  61741 15L  R18_1    
-        36       1422 33101  61790 15R  R18_1    
-        36       1423 33101  63963 15L  R24      
-        36       1424 33101  64009 15R  R24      
-        36       1425 33101  62559 15L  R18_2    
-        36       1426 33101  62718 15R  R18_3    
-        36       1427 33101  63973 15L  R24      
-        36       1428 33101  64019 15R  R24      
-        36       1429 33101  63968 15L  R24      
-        36       1430 33101  64014 15R  R24      
-        36       1431 33101  63983 15L  R24      
-        36       1432 33101  64029 15R  R24      
-        36       1433 33101  63978 15L  R24      
-        36       1434 33101  64024 15R  R24      
-        36       1435 33101  63993 15L  R24      
-        36       1436 33101  64039 15R  R24      
-        36       1437 33101  63988 15L  R24      
-        36       1438 33101  64034 15R  R24      
-        36       1439 33101  63998 15L  R24      
-        36       1440 33101  64044 15R  R24      
-        36       1441 33101  61738 15L  R18_1    
-        36       1442 33101  61791 15R  R18_1    
-        36       1443 33101  63964 15L  R24      
-        36       1444 33101  64010 15R  R24      
-        36       1445 33101  62560 15L  R18_2    
-        36       1446 33101  62719 15R  R18_3    
-        36       1447 33101  63974 15L  R24      
-        36       1448 33101  64020 15R  R24      
-        36       1449 33101  63969 15L  R24      
-        36       1450 33101  64015 15R  R24      
-        36       1451 33101  63984 15L  R24      
-        36       1452 33101  64030 15R  R24      
-        36       1453 33101  63979 15L  R24      
-        36       1454 33101  64025 15R  R24      
-        36       1455 33101  63994 15L  R24      
-        36       1456 33101  64040 15R  R24      
-        36       1457 33101  63989 15L  R24      
-        36       1458 33101  64035 15R  R24      
-        36       1459 33101  63999 15L  R24      
-        36       1460 33101  64045 15R  R24      
-        36       1461 33101  61739 15L  R18_1    
-        36       1462 33101  61792 15R  R18_1    
-        36       1463 33101  63965 15L  R24      
-        36       1464 33101  64011 15R  R24      
-        36       1465 33101  63960 15L  R24      
-        36       1466 33101  64006 15R  R24      
-        36       1467 33101  63975 15L  R24      
-        36       1468 33101  64021 15R  R24      
-        36       1469 33101  63970 15L  R24      
-        36       1470 33101  64016 15R  R24      
-        36       1471 33101  63985 15L  R24      
-        36       1472 33101  64031 15R  R24      
-        36       1473 33101  63980 15L  R24      
-        36       1474 33101  64026 15R  R24      
-        36       1475 33101  63995 15L  R24      
-        36       1476 33101  64041 15R  R24      
-        36       1477 33101  63990 15L  R24      
-        36       1478 33101  64036 15R  R24      
-        36       1479 33101  64000 15L  R24      
-        36       1480 33101  64046 15R  R24      
-        36       1481 33101  61740 15L  R18_1    
-        36       1482 33101  62716 15R  R18_3    
-        36       1483 33101  63966 15L  R24      
-        36       1484 33101  64012 15R  R24      
-        36       1485 33101  63961 15L  R24      
-        36       1486 33101  64007 15R  R24      
-        36       1487 33101  63976 15L  R24      
-        36       1488 33101  64022 15R  R24      
-        36       1489 33101  63971 15L  R24      
-        36       1490 33101  64017 15R  R24      
-        36       1491 33101  63986 15L  R24      
-        36       1492 33101  64032 15R  R24      
-        36       1493 33101  63981 15L  R24      
-        36       1494 33101  64027 15R  R24      
-        36       1495 33101  63996 15L  R24      
-        36       1496 33101  64042 15R  R24      
-        36       1497 33101  63991 15L  R24      
-        36       1498 33101  64037 15R  R24      
-        36       1499 33101  64004 15L  R24      
-        36       1500 33101  64047 15R  R24      
-        36       1501 33101  61830 16L  R18_1    
-        36       1502 33101  61095 16R  R17_3    
-        36       1503 33106   1828 16L  EBP14    
-        36       1504 33106   1877 16R  EBP14    
-        36       1505 33106   1835 16L  EBP14    
-        36       1506 33106   1882 16R  EBP14    
-        36       1507 33106   1840 16L  EBP14    
-        36       1508 33106   1887 16R  EBP14    
-        36       1509 33106   1845 16L  EBP14    
-        36       1510 33106   1892 16R  EBP14    
-        36       1511 33106   1850 16L  EBP14    
-        36       1512 33106   1922 16R  EBP14    
-        36       1513 33106   1855 16L  EBP14    
-        36       1514 33106   1905 16R  EBP14    
-        36       1515 33106   1860 16L  EBP14    
-        36       1516 33106   1910 16R  EBP14    
-        36       1517 33106   1865 16L  EBP14    
-        36       1518 33106   1915 16R  EBP14    
-        36       1519 33106   1872 16L  EBP14    
-        36       1520 33106   1921 16R  EBP14    
-        36       1521 33101  61831 16L  R18_1    
-        36       1522 33101  61144 16R  R17_3    
-        36       1523 33106   1829 16L  EBP14    
-        36       1524 33106   1878 16R  EBP14    
-        36       1525 33106   1836 16L  EBP14    
-        36       1526 33106   1883 16R  EBP14    
-        36       1527 33106   1841 16L  EBP14    
-        36       1528 33106   1888 16R  EBP14    
-        36       1529 33106   1846 16L  EBP14    
-        36       1530 33106   1893 16R  EBP14    
-        36       1531 33106   1851 16L  EBP14    
-        36       1532 33106   1898 16R  EBP14    
-        36       1533 33106   1856 16L  EBP14    
-        36       1534 33106   1906 16R  EBP14    
-        36       1535 33106   1861 16L  EBP14    
-        36       1536 33106   1911 16R  EBP14    
-        36       1537 33106   1866 16L  EBP14    
-        36       1538 33106   1916 16R  EBP14    
-        36       1539 33106   1873 16L  EBP14    
-        36       1540 33106   1924 16R  EBP14    
-        36       1541 33101  61829 16L  R18_1    
-        36       1542 33101  61145 16R  R17_3    
-        36       1543 33106   1830 16L  EBP14    
-        36       1544 33106   1879 16R  EBP14    
-        36       1545 33106   1837 16L  EBP14    
-        36       1546 33106   1884 16R  EBP14    
-        36       1547 33106   1842 16L  EBP14    
-        36       1548 33106   1889 16R  EBP14    
-        36       1549 33106   1847 16L  EBP14    
-        36       1550 33106   1902 16R  EBP14    
-        36       1551 33106   1852 16L  EBP14    
-        36       1552 33106   1923 16R  EBP14    
-        36       1553 33106   1857 16L  EBP14    
-        36       1554 33106   1907 16R  EBP14    
-        36       1555 33106   1862 16L  EBP14    
-        36       1556 33106   1912 16R  EBP14    
-        36       1557 33106   1867 16L  EBP14    
-        36       1558 33106   1917 16R  EBP14    
-        36       1559 33106   1874 16L  EBP14    
-        36       1560 33106   1925 16R  EBP14    
-        36       1561 33101  61832 16L  R18_1    
-        36       1562 33101  61146 16R  R17_3    
-        36       1563 33106   1832 16L  EBP14    
-        36       1564 33106   1880 16R  EBP14    
-        36       1565 33106   1838 16L  EBP14    
-        36       1566 33106   1885 16R  EBP14    
-        36       1567 33106   1843 16L  EBP14    
-        36       1568 33106   1890 16R  EBP14    
-        36       1569 33106   1848 16L  EBP14    
-        36       1570 33106   1895 16R  EBP14    
-        36       1571 33106   1853 16L  EBP14    
-        36       1572 33106   1900 16R  EBP14    
-        36       1573 33106   1858 16L  EBP14    
-        36       1574 33106   1908 16R  EBP14    
-        36       1575 33106   1863 16L  EBP14    
-        36       1576 33106   1913 16R  EBP14    
-        36       1577 33106   1868 16L  EBP14    
-        36       1578 33106   1919 16R  EBP14    
-        36       1579 33106   1875 16L  EBP14    
-        36       1580 33106   1926 16R  EBP14    
-        36       1581 33101  61833 16L  R18_1    
-        36       1582 33101  61147 16R  R17_3    
-        36       1583 33106   1834 16L  EBP14    
-        36       1584 33106   1881 16R  EBP14    
-        36       1585 33106   1839 16L  EBP14    
-        36       1586 33106   1886 16R  EBP14    
-        36       1587 33106   1844 16L  EBP14    
-        36       1588 33106   1891 16R  EBP14    
-        36       1589 33106   1849 16L  EBP14    
-        36       1590 33106   1896 16R  EBP14    
-        36       1591 33106   1854 16L  EBP14    
-        36       1592 33106   1904 16R  EBP14    
-        36       1593 33106   1859 16L  EBP14    
-        36       1594 33106   1909 16R  EBP14    
-        36       1595 33106   1864 16L  EBP14    
-        36       1596 33106   1914 16R  EBP14    
-        36       1597 33106   1871 16L  EBP14    
-        36       1598 33106   1920 16R  EBP14    
-        36       1599 33106   1876 16L  EBP14    
-        36       1600 33106   1927 16R  EBP14    
-        36       1601 33106    141 17L  SICEB02  
-        36       1602 33106   1980 17R  EBP14    
-        36       1603 33106   1931 17L  EBP14    
-        36       1604 33106   1985 17R  EBP14    
-        36       1605 33106   1936 17L  EBP14    
-        36       1606 33106   1990 17R  EBP14    
-        36       1607 33106   1941 17L  EBP14    
-        36       1608 33106   1995 17R  EBP14    
-        36       1609 33106   1946 17L  EBP14    
-        36       1610 33106   2000 17R  EBP14    
-        36       1611 33106   1951 17L  EBP14    
-        36       1612 33106   4805 17R  EBP14    
-        36       1613 33106   1958 17L  EBP14    
-        36       1614 33106   4811 17R  EBP14    
-        36       1615 33106   1963 17L  EBP14    
-        36       1616 33106   4816 17R  EBP14    
-        36       1617 33106   1968 17L  EBP14    
-        36       1618 33106   4821 17R  EBP14    
-        36       1619 33106   1973 17L  EBP14    
-        36       1620 33106   4827 17R  EBP14    
-        36       1621 33106   1751 17L  EBP13    
-        36       1622 33106   1981 17R  EBP14    
-        36       1623 33106   1932 17L  EBP14    
-        36       1624 33106   1986 17R  EBP14    
-        36       1625 33106   1937 17L  EBP14    
-        36       1626 33106   1991 17R  EBP14    
-        36       1627 33106   1942 17L  EBP14    
-        36       1628 33106   1996 17R  EBP14    
-        36       1629 33106   1947 17L  EBP14    
-        36       1630 33106   4801 17R  EBP14    
-        36       1631 33106   1953 17L  EBP14    
-        36       1632 33106   4806 17R  EBP14    
-        36       1633 33106   1959 17L  EBP14    
-        36       1634 33106   4812 17R  EBP14    
-        36       1635 33106   1964 17L  EBP14    
-        36       1636 33106   4817 17R  EBP14    
-        36       1637 33106   1969 17L  EBP14    
-        36       1638 33106   4822 17R  EBP14    
-        36       1639 33106   1974 17L  EBP14    
-        36       1640 33106   4828 17R  EBP14    
-        36       1641 33106   1928 17L  EBP14    
-        36       1642 33106   1982 17R  EBP14    
-        36       1643 33106   1933 17L  EBP14    
-        36       1644 33106   1987 17R  EBP14    
-        36       1645 33106   1938 17L  EBP14    
-        36       1646 33106   1992 17R  EBP14    
-        36       1647 33106   1943 17L  EBP14    
-        36       1648 33106   1997 17R  EBP14    
-        36       1649 33106   1948 17L  EBP14    
-        36       1650 33106   4802 17R  EBP14    
-        36       1651 33106   1954 17L  EBP14    
-        36       1652 33106   4807 17R  EBP14    
-        36       1653 33106   1960 17L  EBP14    
-        36       1654 33106   4813 17R  EBP14    
-        36       1655 33106   1965 17L  EBP14    
-        36       1656 33106   4818 17R  EBP14    
-        36       1657 33106   1970 17L  EBP14    
-        36       1658 33106   4823 17R  EBP14    
-        36       1659 33106   1975 17L  EBP14    
-        36       1660 33106   4829 17R  EBP14    
-        36       1661 33106   1929 17L  EBP14    
-        36       1662 33106   1983 17R  EBP14    
-        36       1663 33106   1934 17L  EBP14    
-        36       1664 33106   1988 17R  EBP14    
-        36       1665 33106   1939 17L  EBP14    
-        36       1666 33106   1993 17R  EBP14    
-        36       1667 33106   1944 17L  EBP14    
-        36       1668 33106   1998 17R  EBP14    
-        36       1669 33106   1949 17L  EBP14    
-        36       1670 33106   4803 17R  EBP14    
-        36       1671 33106   1955 17L  EBP14    
-        36       1672 33106   4808 17R  EBP14    
-        36       1673 33106   1961 17L  EBP14    
-        36       1674 33106   4814 17R  EBP14    
-        36       1675 33106   1966 17L  EBP14    
-        36       1676 33106   4819 17R  EBP14    
-        36       1677 33106   1971 17L  EBP14    
-        36       1678 33106   4824 17R  EBP14    
-        36       1679 33106   1976 17L  EBP14    
-        36       1680 33106   4830 17R  EBP14    
-        36       1681 33106   1930 17L  EBP14    
-        36       1682 33106   1984 17R  EBP14    
-        36       1683 33106   1935 17L  EBP14    
-        36       1684 33106   1989 17R  EBP14    
-        36       1685 33106   1940 17L  EBP14    
-        36       1686 33106   1994 17R  EBP14    
-        36       1687 33106   1945 17L  EBP14    
-        36       1688 33106   1999 17R  EBP14    
-        36       1689 33106   1950 17L  EBP14    
-        36       1690 33106   4804 17R  EBP14    
-        36       1691 33106   1956 17L  EBP14    
-        36       1692 33106   4810 17R  EBP14    
-        36       1693 33106   1962 17L  EBP14    
-        36       1694 33106   4815 17R  EBP14    
-        36       1695 33106   1967 17L  EBP14    
-        36       1696 33106   4820 17R  EBP14    
-        36       1697 33106   1972 17L  EBP14    
-        36       1698 33106   4825 17R  EBP14    
-        36       1699 33106   1978 17L  EBP14    
-        36       1700 33106   4831 17R  EBP14    
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/chi2MatrixAfterGainSwitch_CMS.txt b/CalibCalorimetry/EcalTrivialCondModules/data/chi2MatrixAfterGainSwitch_CMS.txt
deleted file mode 100644
index 78757aa06d8f6..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/chi2MatrixAfterGainSwitch_CMS.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/chi2MatrixAfterGainSwitch_TB.txt b/CalibCalorimetry/EcalTrivialCondModules/data/chi2MatrixAfterGainSwitch_TB.txt
deleted file mode 100644
index 4f639c724e8ef..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/chi2MatrixAfterGainSwitch_TB.txt
+++ /dev/null
@@ -1,500 +0,0 @@
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.6845538 -0.3174248 -0.2548156 -0.1848483 -0.1268129 
-         0          0          0          0          0 -0.3174248  0.6805842 -0.2564139 -0.1860078 -0.1276083 
-         0          0          0          0          0 -0.2548156 -0.2564139  0.7941615 -0.1493194 -0.1024387 
-         0          0          0          0          0 -0.1848483 -0.1860078 -0.1493194  0.8916807 -0.07431109 
-         0          0          0          0          0 -0.1268129 -0.1276083 -0.1024387 -0.07431109  0.9490198 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.6776915 -0.3204406 -0.2559011 -0.1849538 -0.1266897 
-         0          0          0          0          0 -0.3204406  0.6814166 -0.2544181 -0.1838819 -0.1259555 
-         0          0          0          0          0 -0.2559011 -0.2544181  0.7968239 -0.1468465  -0.100587 
-         0          0          0          0          0 -0.1849538 -0.1838819 -0.1468465   0.893866 -0.07269972 
-         0          0          0          0          0 -0.1266897 -0.1259555  -0.100587 -0.07269972  0.9502021 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.6690901 -0.3242874 -0.2569166 -0.1850531 -0.1264729 
-         0          0          0          0          0 -0.3242874  0.6822025  -0.251775 -0.1813497 -0.1239418 
-         0          0          0          0          0 -0.2569166  -0.251775  0.8005313 -0.1436742 -0.09819287 
-         0          0          0          0          0 -0.1850531 -0.1813497 -0.1436742  0.8965137 -0.07072682 
-         0          0          0          0          0 -0.1264729 -0.1239418 -0.09819287 -0.07072682  0.9516624 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.6640441 -0.3264362 -0.2575018 -0.1850829  -0.126357 
-         0          0          0          0          0 -0.3264362  0.6828138 -0.2502052 -0.1798383 -0.1227765 
-         0          0          0          0          0 -0.2575018 -0.2502052  0.8026313 -0.1418614 -0.09684951 
-         0          0          0          0          0 -0.1850829 -0.1798383 -0.1418614  0.8980352 -0.06961188 
-         0          0          0          0          0  -0.126357 -0.1227765 -0.09684951 -0.06961188  0.9524756 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0    0.65666 -0.3293755  -0.258319 -0.1852688 -0.1261594 
-         0          0          0          0          0 -0.3293755   0.684021 -0.2478125 -0.1777334 -0.1210281 
-         0          0          0          0          0  -0.258319 -0.2478125  0.8056483 -0.1393908 -0.09491862 
-         0          0          0          0          0 -0.1852688 -0.1777334 -0.1393908  0.9000276 -0.06807651 
-         0          0          0          0          0 -0.1261594 -0.1210281 -0.09491862 -0.06807651  0.9536431 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.6500634 -0.3319405 -0.2590393 -0.1852466 -0.1260111 
-         0          0          0          0          0 -0.3319405  0.6851301 -0.2457178   -0.17572 -0.1195308 
-         0          0          0          0          0 -0.2590393 -0.2457178  0.8082471 -0.1371281 -0.09327928 
-         0          0          0          0          0 -0.1852466   -0.17572 -0.1371281  0.9019357 -0.06670674 
-         0          0          0          0          0 -0.1260111 -0.1195308 -0.09327928 -0.06670674  0.9546238 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.6435903 -0.3343917 -0.2596788 -0.1852021 -0.1258219 
-         0          0          0          0          0 -0.3343917   0.686266 -0.2436365 -0.1737608 -0.1180489 
-         0          0          0          0          0 -0.2596788 -0.2436365  0.8107991 -0.1349375 -0.09167332 
-         0          0          0          0          0 -0.1852021 -0.1737608 -0.1349375   0.903763 -0.06538112 
-         0          0          0          0          0 -0.1258219 -0.1180489 -0.09167332 -0.06538112  0.9555816 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.6380263 -0.3363673 -0.2602174 -0.1852174 -0.1256472 
-         0          0          0          0          0 -0.3363673  0.6874278 -0.2418093 -0.1721149 -0.1167588 
-         0          0          0          0          0 -0.2602174 -0.2418093  0.8129336   -0.13315 -0.09032588 
-         0          0          0          0          0 -0.1852174 -0.1721149   -0.13315  0.9052266 -0.06429209 
-         0          0          0          0          0 -0.1256472 -0.1167588 -0.09032588 -0.06429209  0.9563857 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.6320023 -0.3384594 -0.2608405 -0.1850722 -0.1254241 
-         0          0          0          0          0 -0.3384594   0.688708 -0.2399034 -0.1702169 -0.1153565 
-         0          0          0          0          0 -0.2608405 -0.2399034  0.8151137  -0.131181 -0.08890182 
-         0          0          0          0          0 -0.1850722 -0.1702169  -0.131181  0.9069241 -0.06307784 
-         0          0          0          0          0 -0.1254241 -0.1153565 -0.08890182 -0.06307784  0.9572519 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.6266068 -0.3403537 -0.2612079 -0.1850049 -0.1251947 
-         0          0          0          0          0 -0.3403537  0.6897624  -0.238095 -0.1686348 -0.1141169 
-         0          0          0          0          0 -0.2612079  -0.238095  0.8172716 -0.1294205 -0.0875802 
-         0          0          0          0          0 -0.1850049 -0.1686348 -0.1294205  0.9083358 -0.06203014 
-         0          0          0          0          0 -0.1251947 -0.1141169 -0.0875802 -0.06203014  0.9580236 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.6196589 -0.3426991 -0.2616765 -0.1848505  -0.124879 
-         0          0          0          0          0 -0.3426991  0.6912176 -0.2357786  -0.166556 -0.1125199 
-         0          0          0          0          0 -0.2616765 -0.2357786  0.8199653 -0.1271781 -0.08591738 
-         0          0          0          0          0 -0.1848505  -0.166556 -0.1271781  0.9101603 -0.06069277 
-         0          0          0          0          0  -0.124879 -0.1125199 -0.08591738 -0.06069277  0.9589979 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.6150176 -0.3442575 -0.2619367  -0.184718 -0.1246041 
-         0          0          0          0          0 -0.3442575  0.6921595  -0.234228 -0.1651778  -0.111423 
-         0          0          0          0          0 -0.2619367  -0.234228  0.8217819 -0.1256796 -0.08477893 
-         0          0          0          0          0  -0.184718 -0.1651778 -0.1256796  0.9113707 -0.05978618 
-         0          0          0          0          0 -0.1246041  -0.111423 -0.08477893 -0.05978618  0.9596704 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.6085049 -0.3462308 -0.2623214 -0.1846171  -0.124318 
-         0          0          0          0          0 -0.3462308  0.6938001  -0.231992 -0.1632718 -0.1099445 
-         0          0          0          0          0 -0.2623214  -0.231992  0.8242315 -0.1237027 -0.08329934 
-         0          0          0          0          0 -0.1846171 -0.1632718 -0.1237027  0.9129402 -0.05862458 
-         0          0          0          0          0  -0.124318 -0.1099445 -0.08329934 -0.05862458  0.9605232 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0   0.603002 -0.3478343 -0.2626919 -0.1844824 -0.1239399 
-         0          0          0          0          0 -0.3478343   0.695241 -0.2301605 -0.1616364 -0.1085913 
-         0          0          0          0          0 -0.2626919 -0.2301605  0.8261779 -0.1220712 -0.08201049 
-         0          0          0          0          0 -0.1844824 -0.1616364 -0.1220712  0.9142722 -0.05759407 
-         0          0          0          0          0 -0.1239399 -0.1085913 -0.08201049 -0.05759407  0.9613069 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.5973505 -0.3496114 -0.2629085 -0.1841151 -0.1235942 
-         0          0          0          0          0 -0.3496114  0.6964405 -0.2282775 -0.1598629  -0.107314 
-         0          0          0          0          0 -0.2629085 -0.2282775  0.8283348 -0.1202173 -0.08070039 
-         0          0          0          0          0 -0.1841151 -0.1598629 -0.1202173  0.9158118 -0.05651455 
-         0          0          0          0          0 -0.1235942  -0.107314 -0.08070039 -0.05651455  0.9620625 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.5931854 -0.3507874 -0.2630692 -0.1839841  -0.123325 
-         0          0          0          0          0 -0.3507874  0.6975235 -0.2268389 -0.1586456 -0.1063405 
-         0          0          0          0          0 -0.2630692 -0.2268389  0.8298846 -0.1189745 -0.0797489 
-         0          0          0          0          0 -0.1839841 -0.1586456 -0.1189745  0.9167922 -0.05577442 
-         0          0          0          0          0  -0.123325 -0.1063405 -0.0797489 -0.05577442  0.9626143 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.5882419 -0.3522613 -0.2632146 -0.1836697  -0.122918 
-         0          0          0          0          0 -0.3522613  0.6986385 -0.2251816 -0.1571304  -0.105157 
-         0          0          0          0          0 -0.2632146 -0.2251816  0.8317411 -0.1174101 -0.07857484 
-         0          0          0          0          0 -0.1836697 -0.1571304 -0.1174101  0.9180719 -0.05482908 
-         0          0          0          0          0  -0.122918  -0.105157 -0.07857484 -0.05482908  0.9633065 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.5821766 -0.3538799 -0.2633181  -0.183429 -0.1226108 
-         0          0          0          0          0 -0.3538799  0.7002777   -0.22302 -0.1553571 -0.1038465 
-         0          0          0          0          0 -0.2633181   -0.22302  0.8340533 -0.1155995 -0.07727103 
-         0          0          0          0          0  -0.183429 -0.1553571 -0.1155995  0.9194727 -0.05382746 
-         0          0          0          0          0 -0.1226108 -0.1038465 -0.07727103 -0.05382746  0.9640197 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.5782866 -0.3549046 -0.2634525 -0.1831673 -0.1222963 
-         0          0          0          0          0 -0.3549046  0.7013201 -0.2217158 -0.1541496 -0.1029219 
-         0          0          0          0          0 -0.2634525 -0.2217158  0.8354161 -0.1144282 -0.07640091 
-         0          0          0          0          0 -0.1831673 -0.1541496 -0.1144282   0.920443 -0.05311829 
-         0          0          0          0          0 -0.1222963 -0.1029219 -0.07640091 -0.05311829  0.9645342 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0   0.573242 -0.3562865 -0.2635134 -0.1827571 -0.1218858 
-         0          0          0          0          0 -0.3562865   0.702548 -0.2199988 -0.1525779 -0.1017585 
-         0          0          0          0          0 -0.2635134 -0.2199988  0.8372865 -0.1128483 -0.07526168 
-         0          0          0          0          0 -0.1827571 -0.1525779 -0.1128483  0.9217352 -0.05219699 
-         0          0          0          0          0 -0.1218858 -0.1017585 -0.07526168 -0.05219699  0.9651884 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0   0.568677 -0.3574883 -0.2634392 -0.1825262 -0.1215301 
-         0          0          0          0          0 -0.3574883  0.7037072 -0.2183432  -0.151281 -0.1007264 
-         0          0          0          0          0 -0.2634392 -0.2183432  0.8390993 -0.1114815 -0.07422697 
-         0          0          0          0          0 -0.1825262  -0.151281 -0.1114815   0.922759 -0.05142882 
-         0          0          0          0          0 -0.1215301 -0.1007264 -0.07422697 -0.05142882  0.9657575 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.5644325  -0.358618  -0.263479 -0.1820751  -0.121116 
-         0          0          0          0          0  -0.358618  0.7047373 -0.2169315 -0.1499088 -0.09971902 
-         0          0          0          0          0  -0.263479 -0.2169315   0.840619  -0.110139 -0.07326423 
-         0          0          0          0          0 -0.1820751 -0.1499088  -0.110139  0.9238893 -0.05062867 
-         0          0          0          0          0  -0.121116 -0.09971902 -0.07326423 -0.05062867  0.9663219 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.5604138 -0.3596248 -0.2633147 -0.1819363 -0.1207672 
-         0          0          0          0          0 -0.3596248  0.7057914 -0.2154173 -0.1488418 -0.09879949 
-         0          0          0          0          0 -0.2633147 -0.2154173   0.842273 -0.1089809 -0.07234026 
-         0          0          0          0          0 -0.1819363 -0.1488418 -0.1089809  0.9247001 -0.04998324 
-         0          0          0          0          0 -0.1207672 -0.09879949 -0.07234026 -0.04998324  0.9668217 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.5566226 -0.3605582 -0.2633785 -0.1814713 -0.1203809 
-         0          0          0          0          0 -0.3605582   0.706791 -0.2141816  -0.147574 -0.09789476 
-         0          0          0          0          0 -0.2633785 -0.2141816  0.8435458  -0.107799 -0.07150961 
-         0          0          0          0          0 -0.1814713  -0.147574  -0.107799   0.925725 -0.04927108 
-         0          0          0          0          0 -0.1203809 -0.09789476 -0.07150961 -0.04927108  0.9673155 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0  0.5520802 -0.3618133 -0.2632755 -0.1809511 -0.1196723 
-         0          0          0          0          0 -0.3618133  0.7077404 -0.2126644 -0.1461657 -0.09666694 
-         0          0          0          0          0 -0.2632755 -0.2126644  0.8452535 -0.1063583 -0.07034026 
-         0          0          0          0          0 -0.1809511 -0.1461657 -0.1063583  0.9268992 -0.04834535 
-         0          0          0          0          0 -0.1196723 -0.09666694 -0.07034026 -0.04834535  0.9680267 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.9615313 -0.1108818 -0.1115773 -0.08956967 -0.06497564          0 
-         0          0          0          0 -0.1108818  0.6803951 -0.3216096  -0.258175 -0.1872853          0 
-         0          0          0          0 -0.1115773 -0.3216096  0.6763731 -0.2597944 -0.1884601          0 
-         0          0          0          0 -0.08956967  -0.258175 -0.2597944  0.7914478  -0.151288          0 
-         0          0          0          0 -0.06497564 -0.1872853 -0.1884601  -0.151288  0.8902526          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.9532692 -0.1229241 -0.1222117 -0.09759724 -0.07053888          0 
-         0          0          0          0 -0.1229241  0.6766511 -0.3214749 -0.2567272 -0.1855508          0 
-         0          0          0          0 -0.1222117 -0.3214749  0.6803882 -0.2552393 -0.1844754          0 
-         0          0          0          0 -0.09759724 -0.2567272 -0.2552393  0.7961681 -0.1473205          0 
-         0          0          0          0 -0.07053888 -0.1855508 -0.1844754 -0.1473205  0.8935234          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.9377886 -0.1424298 -0.1395794 -0.1105817 -0.07965032          0 
-         0          0          0          0 -0.1424298  0.6739143 -0.3195598 -0.2531712 -0.1823553          0 
-         0          0          0          0 -0.1395794 -0.3195598  0.6868355 -0.2481045 -0.1787059          0 
-         0          0          0          0 -0.1105817 -0.2531712 -0.2481045  0.8034393 -0.1415797          0 
-         0          0          0          0 -0.07965032 -0.1823553 -0.1787059 -0.1415797  0.8980223          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.9277309 -0.1537806  -0.149423  -0.117869 -0.0847199          0 
-         0          0          0          0 -0.1537806   0.672772 -0.3179556 -0.2508121 -0.1802746          0 
-         0          0          0          0  -0.149423 -0.3179556  0.6910541  -0.243705 -0.1751662          0 
-         0          0          0          0  -0.117869 -0.2508121  -0.243705  0.8077588 -0.1381759          0 
-         0          0          0          0 -0.0847199 -0.1802746 -0.1751662 -0.1381759  0.9006842          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.9149625 -0.1673694 -0.1605621 -0.1259239 -0.09031376          0 
-         0          0          0          0 -0.1673694  0.6705861 -0.3160158 -0.2478414 -0.1777541          0 
-         0          0          0          0 -0.1605621 -0.3160158  0.6968374  -0.237761 -0.1705244          0 
-         0          0          0          0 -0.1259239 -0.2478414  -0.237761  0.8135314  -0.133737          0 
-         0          0          0          0 -0.09031376 -0.1777541 -0.1705244  -0.133737  0.9040826          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0   0.900699 -0.1810695 -0.1717577  -0.134036 -0.09585308          0 
-         0          0          0          0 -0.1810695  0.6698306 -0.3131899 -0.2444067 -0.1747824          0 
-         0          0          0          0 -0.1717577 -0.3131899  0.7029165 -0.2318377 -0.1657939          0 
-         0          0          0          0  -0.134036 -0.2444067 -0.2318377  0.8190788  -0.129382          0 
-         0          0          0          0 -0.09585308 -0.1747824 -0.1657939  -0.129382  0.9074751          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.8880705  -0.192547  -0.180652  -0.140289 -0.1000537          0 
-         0          0          0          0  -0.192547  0.6687703 -0.3107672 -0.2413327 -0.1721177          0 
-         0          0          0          0  -0.180652 -0.3107672  0.7084311 -0.2264238 -0.1614847          0 
-         0          0          0          0  -0.140289 -0.2413327 -0.2264238   0.824166 -0.1254043          0 
-         0          0          0          0 -0.1000537 -0.1721177 -0.1614847 -0.1254043  0.9105621          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.8751044 -0.2033881 -0.1890002 -0.1462126 -0.1040711          0 
-         0          0          0          0 -0.2033881  0.6687897 -0.3077801 -0.2381021 -0.1694761          0 
-         0          0          0          0 -0.1890002 -0.3077801  0.7139927 -0.2212584 -0.1574872          0 
-         0          0          0          0 -0.1462126 -0.2381021 -0.2212584   0.828832 -0.1218338          0 
-         0          0          0          0 -0.1040711 -0.1694761 -0.1574872 -0.1218338  0.9132812          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.8608806 -0.2145729 -0.1973496 -0.1520914 -0.1079123          0 
-         0          0          0          0 -0.2145729  0.6690505  -0.304385 -0.2345803   -0.16644          0 
-         0          0          0          0 -0.1973496  -0.304385  0.7200473 -0.2157511 -0.1530803          0 
-         0          0          0          0 -0.1520914 -0.2345803 -0.2157511  0.8337271 -0.1179744          0 
-         0          0          0          0 -0.1079123   -0.16644 -0.1530803 -0.1179744  0.9162945          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.8475181 -0.2244289 -0.2045704 -0.1569996 -0.1111976          0 
-         0          0          0          0 -0.2244289  0.6696767 -0.3010948 -0.2310783  -0.163665          0 
-         0          0          0          0 -0.2045704 -0.3010948  0.7255474 -0.2106314 -0.1491832          0 
-         0          0          0          0 -0.1569996 -0.2310783 -0.2106314  0.8383488 -0.1144922          0 
-         0          0          0          0 -0.1111976  -0.163665 -0.1491832 -0.1144922   0.918909          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.8315172 -0.2357171 -0.2123884 -0.1621746 -0.1145615          0 
-         0          0          0          0 -0.2357171  0.6702181 -0.2971437 -0.2268916 -0.1602781          0 
-         0          0          0          0 -0.2123884 -0.2971437  0.7322644 -0.2044363 -0.1444155          0 
-         0          0          0          0 -0.1621746 -0.2268916 -0.2044363  0.8438975 -0.1102721          0 
-         0          0          0          0 -0.1145615 -0.1602781 -0.1444155 -0.1102721  0.9221028          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.8202377 -0.2432084 -0.2174809 -0.1654756 -0.1166936          0 
-         0          0          0          0 -0.2432084  0.6709526 -0.2942395 -0.2238793 -0.1578799          0 
-         0          0          0          0 -0.2174809 -0.2942395  0.7368863 -0.2001965 -0.1411787          0 
-         0          0          0          0 -0.1654756 -0.2238793 -0.2001965  0.8476756 -0.1074193          0 
-         0          0          0          0 -0.1166936 -0.1578799 -0.1411787 -0.1074193  0.9242478          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0   0.806484 -0.2522119 -0.2230514 -0.1689946 -0.1189354          0 
-         0          0          0          0 -0.2522119   0.671289 -0.2907057 -0.2202529   -0.15501          0 
-         0          0          0          0 -0.2230514 -0.2907057  0.7429054 -0.1947874 -0.1370879          0 
-         0          0          0          0 -0.1689946 -0.2202529 -0.1947874  0.8524195 -0.1038645          0 
-         0          0          0          0 -0.1189354   -0.15501 -0.1370879 -0.1038645   0.926902          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.7936033 -0.2600856 -0.2278769 -0.1720975 -0.1208601          0 
-         0          0          0          0 -0.2600856  0.6722598 -0.2871533 -0.2168643 -0.1522988          0 
-         0          0          0          0 -0.2278769 -0.2871533  0.7484073 -0.1900081 -0.1334383          0 
-         0          0          0          0 -0.1720975 -0.2168643 -0.1900081  0.8565019 -0.1007754          0 
-         0          0          0          0 -0.1208601 -0.1522988 -0.1334383 -0.1007754  0.9292277          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.7811927 -0.2674681 -0.2322364 -0.1746423 -0.1223021          0 
-         0          0          0          0 -0.2674681  0.6730494 -0.2838837 -0.2134812  -0.149501          0 
-         0          0          0          0 -0.2322364 -0.2838837  0.7535103 -0.1853608 -0.1298083          0 
-         0          0          0          0 -0.1746423 -0.2134812 -0.1853608  0.8606082 -0.09761616          0 
-         0          0          0          0 -0.1223021  -0.149501 -0.1298083 -0.09761616  0.9316393          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.7726167 -0.2724792  -0.234953 -0.1762004 -0.1232302          0 
-         0          0          0          0 -0.2724792  0.6734811 -0.2815502 -0.2111455   -0.14767          0 
-         0          0          0          0  -0.234953 -0.2815502  0.7572253 -0.1820662 -0.1273326          0 
-         0          0          0          0 -0.1762004 -0.2111455 -0.1820662  0.8634614 -0.09549173          0 
-         0          0          0          0 -0.1232302   -0.14767 -0.1273326 -0.09549173  0.9332154          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.7618055  -0.278501 -0.2382591 -0.1780306 -0.1242287          0 
-         0          0          0          0  -0.278501   0.674372 -0.2785765 -0.2081563 -0.1452503          0 
-         0          0          0          0 -0.2382591 -0.2785765  0.7616762 -0.1780789 -0.1242624          0 
-         0          0          0          0 -0.1780306 -0.2081563 -0.1780789  0.8669369 -0.09285067          0 
-         0          0          0          0 -0.1242287 -0.1452503 -0.1242624 -0.09285067  0.9352093          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.7507825 -0.2847736  -0.241192 -0.1794683 -0.1250187          0 
-         0          0          0          0 -0.2847736  0.6745974 -0.2756032 -0.2050732 -0.1428552          0 
-         0          0          0          0  -0.241192 -0.2756032   0.766575 -0.1736889 -0.1209927          0 
-         0          0          0          0 -0.1794683 -0.2050732 -0.1736889    0.87076 -0.09002933          0 
-         0          0          0          0 -0.1250187 -0.1428552 -0.1209927 -0.09002933   0.937285          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.7411646 -0.2896136 -0.2437324 -0.1809273  -0.125791          0 
-         0          0          0          0 -0.2896136  0.6759482 -0.2727148 -0.2024414 -0.1407489          0 
-         0          0          0          0 -0.2437324 -0.2727148  0.7704892 -0.1703702 -0.1184512          0 
-         0          0          0          0 -0.1809273 -0.2024414 -0.1703702  0.8735309 -0.08792857          0 
-         0          0          0          0  -0.125791 -0.1407489 -0.1184512 -0.08792857   0.938867          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.7320713 -0.2944904 -0.2458605 -0.1818411 -0.1261141          0 
-         0          0          0          0 -0.2944904  0.6763147 -0.2702344 -0.1998683 -0.1386167          0 
-         0          0          0          0 -0.2458605 -0.2702344  0.7743901 -0.1668636 -0.1157266          0 
-         0          0          0          0 -0.1818411 -0.1998683 -0.1668636  0.8765859 -0.08559262          0 
-         0          0          0          0 -0.1261141 -0.1386167 -0.1157266 -0.08559262  0.9406381          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0   0.721681   -0.29951 -0.2482393 -0.1829317 -0.1267459          0 
-         0          0          0          0   -0.29951  0.6776856 -0.2671401   -0.19686 -0.1363962          0 
-         0          0          0          0 -0.2482393 -0.2671401  0.7785895 -0.1631611 -0.1130477          0 
-         0          0          0          0 -0.1829317   -0.19686 -0.1631611  0.8797638 -0.08330672          0 
-         0          0          0          0 -0.1267459 -0.1363962 -0.1130477 -0.08330672  0.9422802          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0   0.713269 -0.3036203 -0.2499812 -0.1836629 -0.1269188          0 
-         0          0          0          0 -0.3036203  0.6784956 -0.2647059 -0.1944812 -0.1343947          0 
-         0          0          0          0 -0.2499812 -0.2647059  0.7820584 -0.1601232 -0.1106519          0 
-         0          0          0          0 -0.1836629 -0.1944812 -0.1601232  0.8823564 -0.08129666          0 
-         0          0          0          0 -0.1269188 -0.1343947 -0.1106519 -0.08129666  0.9438206          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.7074106 -0.3067707 -0.2509687 -0.1837574 -0.1269665          0 
-         0          0          0          0 -0.3067707  0.6783606 -0.2631327 -0.1926638 -0.1331204          0 
-         0          0          0          0 -0.2509687 -0.2631327  0.7847315  -0.157618 -0.1089056          0 
-         0          0          0          0 -0.1837574 -0.1926638  -0.157618  0.8845933 -0.07973987          0 
-         0          0          0          0 -0.1269665 -0.1331204 -0.1089056 -0.07973987   0.944904          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.6995868 -0.3103723 -0.2523974 -0.1843698 -0.1270333          0 
-         0          0          0          0 -0.3103723  0.6793383 -0.2607647  -0.190482 -0.1312446          0 
-         0          0          0          0 -0.2523974 -0.2607647  0.7879439 -0.1549015 -0.1067292          0 
-         0          0          0          0 -0.1843698  -0.190482 -0.1549015  0.8868484 -0.07796296          0 
-         0          0          0          0 -0.1270333 -0.1312446 -0.1067292 -0.07796296  0.9462825          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.6920556 -0.3140242 -0.2536573 -0.1845752 -0.1268598          0 
-         0          0          0          0 -0.3140242   0.679776 -0.2586653 -0.1882193 -0.1293644          0 
-         0          0          0          0 -0.2536573 -0.2586653  0.7910596 -0.1520367 -0.1044959          0 
-         0          0          0          0 -0.1845752 -0.1882193 -0.1520367  0.8893696 -0.07603704          0 
-         0          0          0          0 -0.1268598 -0.1293644 -0.1044959 -0.07603704  0.9477392          0 
-         0          0          0          0          0          0          0          0          0          0 
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/chi2Matrix_CMS.txt b/CalibCalorimetry/EcalTrivialCondModules/data/chi2Matrix_CMS.txt
deleted file mode 100644
index ddeaa710c0235..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/chi2Matrix_CMS.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-  0.694208  -0.305792  -0.305792          0          0          0          0          0          0          0 
- -0.305792   0.694208  -0.305792          0          0          0          0          0          0          0 
- -0.305792  -0.305792   0.694208          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.8059109 -0.2489435 -0.2216915 -0.1711725 -0.1243895          0 
-         0          0          0          0 -0.2489435  0.6526494 -0.2984613  -0.207832 -0.1239048          0 
-         0          0          0          0 -0.2216915 -0.2984613  0.7396785 -0.1896194 -0.1241456          0 
-         0          0          0          0 -0.1711725  -0.207832 -0.1896194  0.8441427  -0.124592          0 
-         0          0          0          0 -0.1243895 -0.1239048 -0.1241456  -0.124592  0.8749946          0 
-         0          0          0          0          0          0          0          0          0          0 
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/chi2Matrix_TB.txt b/CalibCalorimetry/EcalTrivialCondModules/data/chi2Matrix_TB.txt
deleted file mode 100644
index 8dfb780c8c9af..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/chi2Matrix_TB.txt
+++ /dev/null
@@ -1,500 +0,0 @@
- 0.7153241 -0.2846759 -0.2846759          0          0          0          0          0          0          0 
--0.2846759  0.7153241 -0.2846759          0          0          0          0          0          0          0 
--0.2846759 -0.2846759  0.7153241          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.8642656 -0.07800824 -0.0774538 -0.09499779 -0.1146036          0 
-         0          0          0          0 -0.07800824  0.6692846 -0.3331425 -0.2563404 -0.1705122          0 
-         0          0          0          0 -0.0774538 -0.3331425  0.6644017   -0.25789 -0.1710492          0 
-         0          0          0          0 -0.09499779 -0.2563404   -0.25789  0.7911448 -0.1540576          0 
-         0          0          0          0 -0.1146036 -0.1705122 -0.1710492 -0.1540576  0.8649309          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.7119716 -0.2880284 -0.2880284          0          0          0          0          0          0          0 
--0.2880284  0.7119716 -0.2880284          0          0          0          0          0          0          0 
--0.2880284 -0.2880284  0.7119716          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0   0.869281 -0.09025784 -0.09063615 -0.1037072 -0.1180761          0 
-         0          0          0          0 -0.09025784  0.6639459 -0.3337559 -0.2543507 -0.1670617          0 
-         0          0          0          0 -0.09063615 -0.3337559  0.6685173 -0.2529422 -0.1666037          0 
-         0          0          0          0 -0.1037072 -0.2543507 -0.2529422  0.7957236 -0.1507788          0 
-         0          0          0          0 -0.1180761 -0.1670617 -0.1666037 -0.1507788  0.8666174          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.7066214 -0.2933786 -0.2933786          0          0          0          0          0          0          0 
--0.2933786  0.7066214 -0.2933786          0          0          0          0          0          0          0 
--0.2933786 -0.2933786  0.7066214          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.8742034 -0.1118899 -0.1123841 -0.1174111 -0.1227734          0 
-         0          0          0          0 -0.1118899   0.659246 -0.3326217  -0.249891 -0.1616434          0 
-         0          0          0          0 -0.1123841 -0.3326217  0.6752041 -0.2451836 -0.1602622          0 
-         0          0          0          0 -0.1174111  -0.249891 -0.2451836  0.8027058 -0.1462113          0 
-         0          0          0          0 -0.1227734 -0.1616434 -0.1602622 -0.1462113  0.8687765          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.7038122 -0.2961878 -0.2961878          0          0          0          0          0          0          0 
--0.2961878  0.7038122 -0.2961878          0          0          0          0          0          0          0 
--0.2961878 -0.2961878  0.7038122          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0      0.875 -0.1250304 -0.1250288  -0.125017 -0.1250047          0 
-         0          0          0          0 -0.1250304  0.6570967 -0.3312559 -0.2469148 -0.1583104          0 
-         0          0          0          0 -0.1250288 -0.3312559   0.679769 -0.2403982 -0.1565298          0 
-         0          0          0          0  -0.125017 -0.2469148 -0.2403982  0.8067898 -0.1436368          0 
-         0          0          0          0 -0.1250047 -0.1583104 -0.1565298 -0.1436368  0.8699079          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.7009922 -0.2990078 -0.2990078          0          0          0          0          0          0          0 
--0.2990078  0.7009922 -0.2990078          0          0          0          0          0          0          0 
--0.2990078 -0.2990078  0.7009922          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.8738526 -0.1409386 -0.1397156 -0.1334928 -0.1270953          0 
-         0          0          0          0 -0.1409386  0.6535929 -0.3294186 -0.2429751 -0.1541061          0 
-         0          0          0          0 -0.1397156 -0.3294186  0.6862663 -0.2339229 -0.1518728          0 
-         0          0          0          0 -0.1334928 -0.2429751 -0.2339229  0.8121379  -0.140509          0 
-         0          0          0          0 -0.1270953 -0.1541061 -0.1518728  -0.140509  0.8711737          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.6984121 -0.3015879 -0.3015879          0          0          0          0          0          0          0 
--0.3015879  0.6984121 -0.3015879          0          0          0          0          0          0          0 
--0.3015879 -0.3015879  0.6984121          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.8702045 -0.1577066 -0.1545281  -0.141652 -0.1286186          0 
-         0          0          0          0 -0.1577066  0.6519314 -0.3263901 -0.2385718 -0.1496796          0 
-         0          0          0          0 -0.1545281 -0.3263901  0.6931816 -0.2275346 -0.1472812          0 
-         0          0          0          0  -0.141652 -0.2385718 -0.2275346  0.8171767 -0.1375652          0 
-         0          0          0          0 -0.1286186 -0.1496796 -0.1472812 -0.1375652  0.8722695          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.6967727 -0.3032273 -0.3032273          0          0          0          0          0          0          0 
--0.3032273  0.6967727 -0.3032273          0          0          0          0          0          0          0 
--0.3032273 -0.3032273  0.6967727          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.8652175 -0.1719028 -0.1664258 -0.1478407 -0.1293143          0 
-         0          0          0          0 -0.1719028  0.6501215 -0.3236184 -0.2345109 -0.1456852          0 
-         0          0          0          0 -0.1664258 -0.3236184  0.6995751 -0.2217228 -0.1432697          0 
-         0          0          0          0 -0.1478407 -0.2345109 -0.2217228  0.8216706 -0.1350733          0 
-         0          0          0          0 -0.1293143 -0.1456852 -0.1432697 -0.1350733  0.8730973          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.6953802 -0.3046198 -0.3046198          0          0          0          0          0          0          0 
--0.3046198  0.6953802 -0.3046198          0          0          0          0          0          0          0 
--0.3046198 -0.3046198  0.6953802          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.8586474 -0.1856903  -0.177563 -0.1533939 -0.1295896          0 
-         0          0          0          0 -0.1856903  0.6497576 -0.3200795 -0.2303794 -0.1420336          0 
-         0          0          0          0  -0.177563 -0.3200795  0.7060443 -0.2162677 -0.1397526          0 
-         0          0          0          0 -0.1533939 -0.2303794 -0.2162677  0.8256984 -0.1329692          0 
-         0          0          0          0 -0.1295896 -0.1420336 -0.1397526 -0.1329692  0.8737119          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.6943509 -0.3056491 -0.3056491          0          0          0          0          0          0          0 
--0.3056491  0.6943509 -0.3056491          0          0          0          0          0          0          0 
--0.3056491 -0.3056491  0.6943509          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.8499677 -0.2000808 -0.1886566 -0.1586366 -0.1293324          0 
-         0          0          0          0 -0.2000808  0.6498054 -0.3159291 -0.2258884 -0.1379945          0 
-         0          0          0          0 -0.1886566 -0.3159291  0.7131226 -0.2105373 -0.1360173          0 
-         0          0          0          0 -0.1586366 -0.2258884 -0.2105373  0.8298015 -0.1308216          0 
-         0          0          0          0 -0.1293324 -0.1379945 -0.1360173 -0.1308216  0.8742502          0 
-         0          0          0          0          0          0          0          0          0          0 
-  0.693751  -0.306249  -0.306249          0          0          0          0          0          0          0 
- -0.306249   0.693751  -0.306249          0          0          0          0          0          0          0 
- -0.306249  -0.306249   0.693751          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.8405979 -0.2128928 -0.1981285 -0.1627609 -0.1287083          0 
-         0          0          0          0 -0.2128928  0.6504456 -0.3118336 -0.2214741 -0.1344742          0 
-         0          0          0          0 -0.1981285 -0.3118336  0.7195508 -0.2052683 -0.1328827          0 
-         0          0          0          0 -0.1627609 -0.2214741 -0.2052683  0.8335524 -0.1290704          0 
-         0          0          0          0 -0.1287083 -0.1344742 -0.1328827 -0.1290704  0.8746003          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.6935751 -0.3064249 -0.3064249          0          0          0          0          0          0          0 
--0.3064249  0.6935751 -0.3064249          0          0          0          0          0          0          0 
--0.3064249 -0.3064249  0.6935751          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.8280302 -0.2275513 -0.2082658 -0.1667549  -0.127394          0 
-         0          0          0          0 -0.2275513  0.6510953  -0.306798 -0.2161653  -0.130227          0 
-         0          0          0          0 -0.2082658  -0.306798  0.7273903 -0.1990211  -0.129244          0 
-         0          0          0          0 -0.1667549 -0.2161653 -0.1990211   0.837881 -0.1271282          0 
-         0          0          0          0  -0.127394  -0.130227  -0.129244 -0.1271282   0.874878          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.6936928 -0.3063072 -0.3063072          0          0          0          0          0          0          0 
--0.3063072  0.6936928 -0.3063072          0          0          0          0          0          0          0 
--0.3063072 -0.3063072  0.6936928          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.8184036 -0.2373244 -0.2147265 -0.1690476 -0.1261998          0 
-         0          0          0          0 -0.2373244  0.6520747 -0.3030763 -0.2124194 -0.1273812          0 
-         0          0          0          0 -0.2147265 -0.3030763  0.7327498  -0.194832 -0.1269021          0 
-         0          0          0          0 -0.1690476 -0.2124194  -0.194832  0.8407188 -0.1259338          0 
-         0          0          0          0 -0.1261998 -0.1273812 -0.1269021 -0.1259338  0.8749746          0 
-         0          0          0          0          0          0          0          0          0          0 
-  0.694208  -0.305792  -0.305792          0          0          0          0          0          0          0 
- -0.305792   0.694208  -0.305792          0          0          0          0          0          0          0 
- -0.305792  -0.305792   0.694208          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.8059109 -0.2489435 -0.2216915 -0.1711725 -0.1243895          0 
-         0          0          0          0 -0.2489435  0.6526494 -0.2984613  -0.207832 -0.1239048          0 
-         0          0          0          0 -0.2216915 -0.2984613  0.7396785 -0.1896194 -0.1241456          0 
-         0          0          0          0 -0.1711725  -0.207832 -0.1896194  0.8441427  -0.124592          0 
-         0          0          0          0 -0.1243895 -0.1239048 -0.1241456  -0.124592  0.8749946          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.6948506 -0.3051494 -0.3051494          0          0          0          0          0          0          0 
--0.3051494  0.6948506 -0.3051494          0          0          0          0          0          0          0 
--0.3051494 -0.3051494  0.6948506          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.7935542 -0.2591407 -0.2275283 -0.1727816 -0.1224928          0 
-         0          0          0          0 -0.2591407  0.6540712 -0.2938635 -0.2036959 -0.1208706          0 
-         0          0          0          0 -0.2275283 -0.2938635  0.7459318   -0.18515 -0.1218438          0 
-         0          0          0          0 -0.1727816 -0.2036959   -0.18515  0.8469681 -0.1235291          0 
-         0          0          0          0 -0.1224928 -0.1208706 -0.1218438 -0.1235291  0.8749228          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.6958082 -0.3041918 -0.3041918          0          0          0          0          0          0          0 
--0.3041918  0.6958082 -0.3041918          0          0          0          0          0          0          0 
--0.3041918 -0.3041918  0.6958082          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.7811201 -0.2686025 -0.2326021 -0.1737513 -0.1202691          0 
-         0          0          0          0 -0.2686025  0.6553399 -0.2895924 -0.1995719 -0.1177634          0 
-         0          0          0          0 -0.2326021 -0.2895924  0.7516701 -0.1808771 -0.1195776          0 
-         0          0          0          0 -0.1737513 -0.1995719 -0.1808771  0.8496837 -0.1225433          0 
-         0          0          0          0 -0.1202691 -0.1177634 -0.1195776 -0.1225433  0.8747616          0 
-         0          0          0          0          0          0          0          0          0          0 
-   0.69658   -0.30342   -0.30342          0          0          0          0          0          0          0 
-  -0.30342    0.69658   -0.30342          0          0          0          0          0          0          0 
-  -0.30342   -0.30342    0.69658          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.7722609 -0.2749665 -0.2356666 -0.1741372 -0.1186635          0 
-         0          0          0          0 -0.2749665  0.6560967  -0.286538 -0.1967247 -0.1157507          0 
-         0          0          0          0 -0.2356666  -0.286538  0.7557942 -0.1779287 -0.1181746          0 
-         0          0          0          0 -0.1741372 -0.1967247 -0.1779287   0.851499 -0.1219694          0 
-         0          0          0          0 -0.1186635 -0.1157507 -0.1181746 -0.1219694  0.8746092          0 
-         0          0          0          0          0          0          0          0          0          0 
-  0.697667  -0.302333  -0.302333          0          0          0          0          0          0          0 
- -0.302333   0.697667  -0.302333          0          0          0          0          0          0          0 
- -0.302333  -0.302333   0.697667          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.7608158 -0.2825852 -0.2392538 -0.1744012 -0.1164687          0 
-         0          0          0          0 -0.2825852  0.6575173 -0.2826812 -0.1931784  -0.113226          0 
-         0          0          0          0 -0.2392538 -0.2826812  0.7606766 -0.1744313 -0.1164635          0 
-         0          0          0          0 -0.1744012 -0.1931784 -0.1744313  0.8536268  -0.121309          0 
-         0          0          0          0 -0.1164687  -0.113226 -0.1164635  -0.121309  0.8743626          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.6990318 -0.3009682 -0.3009682          0          0          0          0          0          0          0 
--0.3009682  0.6990318 -0.3009682          0          0          0          0          0          0          0 
--0.3009682 -0.3009682  0.6990318          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.7488722 -0.2903775 -0.2422687 -0.1741331 -0.1140274          0 
-         0          0          0          0 -0.2903775  0.6581587 -0.2787615 -0.1894228 -0.1106128          0 
-         0          0          0          0 -0.2422687 -0.2787615  0.7659682  -0.170682 -0.1147981          0 
-         0          0          0          0 -0.1741331 -0.1894228  -0.170682  0.8558602 -0.1207256          0 
-         0          0          0          0 -0.1140274 -0.1106128 -0.1147981 -0.1207256  0.8740454          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.7001104 -0.2998896 -0.2998896          0          0          0          0          0          0          0 
--0.2998896  0.7001104 -0.2998896          0          0          0          0          0          0          0 
--0.2998896 -0.2998896  0.7001104          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.7382314 -0.2964225  -0.244764 -0.1740504 -0.1119715          0 
-         0          0          0          0 -0.2964225  0.6601433 -0.2751092 -0.1864786 -0.1086704          0 
-         0          0          0          0  -0.244764 -0.2751092  0.7701265 -0.1679519 -0.1135913          0 
-         0          0          0          0 -0.1740504 -0.1864786 -0.1679519  0.8574086 -0.1203275          0 
-         0          0          0          0 -0.1119715 -0.1086704 -0.1135913 -0.1203275  0.8737589          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.7014554 -0.2985446 -0.2985446          0          0          0          0          0          0          0 
--0.2985446  0.7014554 -0.2985446          0          0          0          0          0          0          0 
--0.2985446 -0.2985446  0.7014554          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.7280378 -0.3023639 -0.2467036 -0.1734288 -0.1096453          0 
-         0          0          0          0 -0.3023639  0.6609452 -0.2718801 -0.1834472 -0.1064689          0 
-         0          0          0          0 -0.2467036 -0.2718801  0.7742138 -0.1651053 -0.1122843          0 
-         0          0          0          0 -0.1734288 -0.1834472 -0.1651053  0.8590411 -0.1199401          0 
-         0          0          0          0 -0.1096453 -0.1064689 -0.1122843 -0.1199401  0.8733957          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.7028517 -0.2971483 -0.2971483          0          0          0          0          0          0          0 
--0.2971483  0.7028517 -0.2971483          0          0          0          0          0          0          0 
--0.2971483 -0.2971483  0.7028517          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.7162054 -0.3084737 -0.2487637 -0.1727062  -0.107272          0 
-         0          0          0          0 -0.3084737  0.6630118 -0.2679984 -0.1801205 -0.1045168          0 
-         0          0          0          0 -0.2487637 -0.2679984  0.7785393  -0.162182 -0.1111829          0 
-         0          0          0          0 -0.1727062 -0.1801205  -0.162182  0.8606678  -0.119674          0 
-         0          0          0          0  -0.107272 -0.1045168 -0.1111829  -0.119674  0.8730208          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.7041706 -0.2958294 -0.2958294          0          0          0          0          0          0          0 
--0.2958294  0.7041706 -0.2958294          0          0          0          0          0          0          0 
--0.2958294 -0.2958294  0.7041706          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.7065315 -0.3133844 -0.2501332 -0.1719305 -0.1050179          0 
-         0          0          0          0 -0.3133844  0.6643453 -0.2649261 -0.1774785 -0.1026556          0 
-         0          0          0          0 -0.2501332 -0.2649261  0.7820549 -0.1598586 -0.1101579          0 
-         0          0          0          0 -0.1719305 -0.1774785 -0.1598586  0.8619265 -0.1194335          0 
-         0          0          0          0 -0.1050179 -0.1026556 -0.1101579 -0.1194335  0.8726299          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.7052506 -0.2947494 -0.2947494          0          0          0          0          0          0          0 
--0.2947494  0.7052506 -0.2947494          0          0          0          0          0          0          0 
--0.2947494 -0.2947494  0.7052506          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.6997654 -0.3170873 -0.2507738 -0.1709018 -0.1034132          0 
-         0          0          0          0 -0.3170873  0.6644393 -0.2628697 -0.1753163 -0.1013371          0 
-         0          0          0          0 -0.2507738 -0.2628697  0.7847265 -0.1579458 -0.1095061          0 
-         0          0          0          0 -0.1709018 -0.1753163 -0.1579458  0.8629762 -0.1193454          0 
-         0          0          0          0 -0.1034132 -0.1013371 -0.1095061 -0.1193454  0.8723408          0 
-         0          0          0          0          0          0          0          0          0          0 
- 0.7065284 -0.2934716 -0.2934716          0          0          0          0          0          0          0 
--0.2934716  0.7065284 -0.2934716          0          0          0          0          0          0          0 
--0.2934716 -0.2934716  0.7065284          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.6906418 -0.3213125 -0.2517236 -0.1700682 -0.1012455          0 
-         0          0          0          0 -0.3213125  0.6659581 -0.2599407 -0.1729905 -0.09970524          0 
-         0          0          0          0 -0.2517236 -0.2599407  0.7878932 -0.1559788 -0.1086717          0 
-         0          0          0          0 -0.1700682 -0.1729905 -0.1559788  0.8639826  -0.119193          0 
-         0          0          0          0 -0.1012455 -0.09970524 -0.1086717  -0.119193  0.8719393          0 
-         0          0          0          0          0          0          0          0          0          0 
-  0.707955  -0.292045  -0.292045          0          0          0          0          0          0          0 
- -0.292045   0.707955  -0.292045          0          0          0          0          0          0          0 
- -0.292045  -0.292045   0.707955          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0  0.6818365 -0.3255237 -0.2524443 -0.1688143 -0.09894478          0 
-         0          0          0          0 -0.3255237  0.6668357 -0.2573003 -0.1704838 -0.09795199          0 
-         0          0          0          0 -0.2524443 -0.2573003  0.7909156 -0.1539075 -0.1078094          0 
-         0          0          0          0 -0.1688143 -0.1704838 -0.1539075  0.8650618   -0.11909          0 
-         0          0          0          0 -0.09894478 -0.09795199 -0.1078094   -0.11909  0.8714855          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/endcap_ly.txt b/CalibCalorimetry/EcalTrivialCondModules/data/endcap_ly.txt
deleted file mode 100644
index c7e93a8448bcf..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/endcap_ly.txt
+++ /dev/null
@@ -1,14648 +0,0 @@
-  1  47  33 1.000 0 33106  2491
-  1  46  35 1.000 0 33106  2482
-  1  34  87 1.000 0 33201  4823
-  1  35  87 1.000 0 33201  4824
-  1  33  87 1.000 0 33201  4821
-  1  32  87 1.000 0 33201  4820
-  1  34  89 1.000 0 33201  4807
-  1  33  89 1.000 0 33201  4810
-  1  32  89 1.000 0 33201  4809
-  1  35  89 1.000 0 33201  4834
-  1  32  88 1.000 0 33201  4925
-  1  38  89 1.000 0 33201  4771
-  1  46  32 1.000 0 33106  2485
-  1  33  86 1.000 0 33201  4788
-  1  31  86 1.000 0 33201  4785
-  1  32  86 1.000 0 33201  4786
-  1  35  86 1.000 0 33201  4789
-  1  46  33 1.000 0 33106  2484
-  1  38  90 1.000 0 33201  4759
-  1  39  90 1.000 0 33201  4760
-  1  33  88 1.000 0 33201  4781
-  1  31  88 1.000 0 33201  4782
-  1  36  90 1.000 0 33201  4757
-  1  46  34 1.000 0 33106  2483
-  1  37  90 1.000 0 33201  4758
-  1  40  90 1.000 0 33201  4761
-  1  34  88 1.000 0 33201  4780
-  1  40  89 1.000 0 33201  4774
-  1  31  87 1.000 0 33201  4819
-  1  39  89 1.000 0 33201  4772
-  1  31  89 1.000 0 33201  4808
-  1  35  88 1.000 0 33201  4770
-  1  36  89 1.000 0 33201  4769
-  1  47  35 1.000 0 33106  2488
-  1  46  31 1.000 0 33106  2487
-  1  47  34 1.000 0 33106  2490
-  1  23  57 1.000 0 33201  3695
-  1  24  91 1.000 0 33106  2890
-  1  33  66 1.000 0 33201  3872
-  1  24  56 1.000 0 33201  3690
-  1  32  68 1.000 0 33201  3868
-  1  17  87 1.000 0 33106  2840
-  1  27  66 1.000 0 33201  4080
-  1  34  68 1.000 0 33201  3866
-  1  26  66 1.000 0 33201  4079
-  1  10  74 1.000 0 30399   806
-  1  35  70 1.000 0 33201  3854
-  1  23  68 1.000 0 33201  3791
-  1  21  69 1.000 0 33201  3795
-  1   9  71 1.000 0 30399   771
-  1   7  71 1.000 0 30399   793
-  1  25  70 1.000 0 33201  3812
-  1  22  70 1.000 0 33201  3808
-  1  23  70 1.000 0 33201  3809
-  1  25  67 1.000 0 33201  3788
-  1  10  80 1.000 0 30399   285
-  1  28  72 1.000 0 33201  4069
-  1  21  56 1.000 0 33201  3687
-  1   8  74 1.000 0 30399   802
-  1   9  80 1.000 0 30399   299
-  1  49  91 1.000 0 33201  4737
-  1  48  93 1.000 0 33201  4749
-  1  22  92 1.000 0 33106  2856
-  1  24  69 1.000 0 33201  3803
-  1  25  66 1.000 0 33201  3817
-  1  48  91 1.000 0 33201  4736
-  1  40  65 1.000 0 33106  2805
-  1  36  63 1.000 0 33106  2788
-  1  37  63 1.000 0 33106  2789
-  1  49  93 1.000 0 33201  4750
-  1  39  87 1.000 0 33201  4778
-  1  39  83 1.000 0 33201  3824
-  1  38  88 1.000 0 33201  4754
-  1  39  88 1.000 0 33201  4755
-  1  46  93 1.000 0 33201  4747
-  1  40  88 1.000 0 33201  4756
-  1  21  67 1.000 0 33201  3782
-  1  23  67 1.000 0 33201  3784
-  1  21  92 1.000 0 33106  2858
-  1  47  93 1.000 0 33201  4746
-  1  23  58 1.000 0 33201  3672
-  1  22  56 1.000 0 33201  3688
-  1  50  91 1.000 0 33201  4738
-  1  24  66 1.000 0 33201  3816
-  1  24  67 1.000 0 33201  3787
-  1  25  56 1.000 0 33201  3691
-  1  21  57 1.000 0 33201  3693
-  1  10  73 1.000 0 30399   690
-  1  37  83 1.000 0 33201  3827
-  1  10  79 1.000 0 30399   307
-  1  25  91 1.000 0 33106  2893
-  1  22  58 1.000 0 33201  3671
-  1   6  74 1.000 0 30399   826
-  1   9  74 1.000 0 30399   805
-  1  19  87 1.000 0 33106  2843
-  1  25  68 1.000 0 33201  3789
-  1   6  75 1.000 0 30399   761
-  1  40  67 1.000 0 33201  3883
-  1  34  66 1.000 0 33201  3874
-  1  39  67 1.000 0 33201  3884
-  1  37  87 1.000 0 33201  4775
-  1  36  64 1.000 0 33106  2781
-  1  22  69 1.000 0 33201  3800
-  1  14  84 1.000 0 33106  2981
-  1  36  86 1.000 0 33201  4762
-  1  40  63 1.000 0 33106  2792
-  1  14  85 1.000 0 33106  2984
-  1  22  66 1.000 0 33201  3814
-  1  36  87 1.000 0 33201  4776
-  1  21  70 1.000 0 33201  3805
-  1  38  87 1.000 0 33201  4777
-  1  37  64 1.000 0 33106  2783
-  1  38  64 1.000 0 33106  2784
-  1  40  87 1.000 0 33201  4779
-  1  46  91 1.000 0 33201  4734
-  1  47  91 1.000 0 33201  4733
-  1  19  86 1.000 0 33106  2851
-  1  39  64 1.000 0 33106  2786
-  1  35  66 1.000 0 33201  3876
-  1  30  66 1.000 0 33201  4084
-  1  35  64 1.000 0 33201  3703
-  1  38  86 1.000 0 33201  4764
-  1  22  68 1.000 0 33201  3793
-  1  38  63 1.000 0 33106  2790
-  1  31  56 1.000 0 33201  3529
-  1  25  61 1.000 0 33201  3651
-  1  25  63 1.000 0 33201  3645
-  1  40  83 1.000 0 33201  3823
-  1  39  75 1.000 0 33201  3627
-  1  27  57 1.000 0 33201  3486
-  1  32  56 1.000 0 33201  3530
-  1  15  76 1.000 0 33201  4196
-  1  36  75 1.000 0 33201  3624
-  1  43  73 1.000 0 33201  4138
-  1  24  86 1.000 0 33201  4048
-  1  38  73 1.000 0 33201  3638
-  1  41  73 1.000 0 33201  4136
-  1  25  89 1.000 0 33201  3875
-  1  15  81 1.000 0 33106  2975
-  1  46  74 1.000 0 33201  4135
-  1  15  83 1.000 0 33106  2980
-  1  24  89 1.000 0 33201  3879
-  1  28  66 1.000 0 33201  4081
-  1  14  81 1.000 0 33106  2974
-  1  30  25 1.000 0 33201  1413
-  1  23  62 1.000 0 33201  3653
-  1  26  22 1.000 0 33201  1398
-  1  14  78 1.000 0 33201  4118
-  1  38  96 1.000 0 33106  2899
-  1  24  65 1.000 0 33201  3659
-  1  15  82 1.000 0 33106  2978
-  1   4  56 1.000 0 33201  3613
-  1  25  87 1.000 0 33201  4067
-  1  20  86 1.000 0 33106  2922
-  1  40  75 1.000 0 33201  3628
-  1  38  75 1.000 0 33201  3626
-  1  29  21 1.000 0 33201  1391
-  1  28  24 1.000 0 33201  1406
-  1  40  85 1.000 0 33201  3843
-  1  38  71 1.000 0 33201  3621
-  1   6  71 1.000 0 30399   847
-  1  34  69 1.000 0 33201  3862
-  1  23  86 1.000 0 33201  4051
-  1  36  71 1.000 0 33201  3618
-  1  37  81 1.000 0 33201  3820
-  1  11  78 1.000 0 33201  4093
-  1  22  63 1.000 0 33201  3642
-  1  12  76 1.000 0 33201  4216
-  1  21  87 1.000 0 33201  4092
-  1  16  60 1.000 0 33201  3437
-  1  23  87 1.000 0 33201  4082
-  1  17  86 1.000 0 33106  2846
-  1  21  89 1.000 0 33201  3910
-  1  12  79 1.000 0 33201  4177
-  1  37  75 1.000 0 33201  3625
-  1  22  89 1.000 0 33201  3897
-  1  22  86 1.000 0 33201  4061
-  1  23  89 1.000 0 33201  3891
-  1  11  76 1.000 0 33201  4214
-  1  45  76 1.000 0 33201  4373
-  1  27  25 1.000 0 33201  1377
-  1  21  59 1.000 0 33201  3675
-  1  46  71 1.000 0 33201  4109
-  1  37  72 1.000 0 33201  3611
-  1  48  74 1.000 0 33201  4130
-  1  11  77 1.000 0 33201  4145
-  1  14  77 1.000 0 33201  4168
-  1  14  76 1.000 0 33201  4199
-  1  25  62 1.000 0 33201  3655
-  1  25  64 1.000 0 33201  3650
-  1  24  62 1.000 0 33201  3654
-  1  24  60 1.000 0 33201  3685
-  1  23  60 1.000 0 33201  3684
-  1  14  83 1.000 0 33106  2979
-  1  40  68 1.000 0 33201  3894
-  1  22  61 1.000 0 33201  3663
-  1  21  63 1.000 0 33201  3641
-  1  24  64 1.000 0 33201  3649
-  1  13  78 1.000 0 33201  4105
-  1  36  72 1.000 0 33201  3609
-  1  30  21 1.000 0 33201  1408
-  1  27  23 1.000 0 33201  1375
-  1  31  64 1.000 0 33201  3698
-  1  34  52 1.000 0 33106  2692
-  1   9  72 1.000 0 30399   869
-  1  26  23 1.000 0 33201  1399
-  1  36  66 1.000 0 33201  3904
-  1  40  66 1.000 0 33201  3900
-  1  26  24 1.000 0 33201  1400
-  1  22  60 1.000 0 33201  3682
-  1  21  62 1.000 0 33201  3667
-  1  43  72 1.000 0 33201  4144
-  1  25  65 1.000 0 33201  3660
-  1  28  22 1.000 0 33201  1403
-  1  42  73 1.000 0 33201  4137
-  1  50  74 1.000 0 33201  4126
-  1  40  72 1.000 0 33201  3617
-  1  40  97 1.000 0 33106  2921
-  1  20  60 1.000 0 33201  3433
-  1  35  67 1.000 0 33201  3849
-  1  40  82 1.000 0 33201  3830
-  1  36  81 1.000 0 33201  3821
-  1  34  67 1.000 0 33201  3850
-  1  34  70 1.000 0 33201  3855
-  1  37  82 1.000 0 33201  3834
-  1   7  75 1.000 0 30399   735
-  1  27  72 1.000 0 33201  4068
-  1  26  25 1.000 0 33201  1401
-  1  39  82 1.000 0 33201  3831
-  1  39  72 1.000 0 33201  3616
-  1  39  74 1.000 0 33201  3634
-  1  39  81 1.000 0 33201  3818
-  1  49  71 1.000 0 33201  4104
-  1  30  24 1.000 0 33201  1412
-  1  40  84 1.000 0 33201  3837
-  1  46  72 1.000 0 33201  4110
-  1  40  73 1.000 0 33201  3640
-  1  36  85 1.000 0 33201  3847
-  1  33  67 1.000 0 33201  3851
-  1  35  68 1.000 0 33201  3865
-  1  31  69 1.000 0 33201  3859
-  1  32  67 1.000 0 33201  3852
-  1  32  70 1.000 0 33201  3857
-  1  31  70 1.000 0 33201  3858
-  1  38  74 1.000 0 33201  3633
-  1  37  73 1.000 0 33201  3637
-  1  39  85 1.000 0 33201  3844
-  1  39  73 1.000 0 33201  3639
-  1  37  71 1.000 0 33201  3620
-  1  21  86 1.000 0 33201  4065
-  1   3  58 1.000 0 33201  3668
-  1  38  85 1.000 0 33201  3845
-  1  36  84 1.000 0 33201  3842
-  1  23  88 1.000 0 33201  4004
-  1  10  71 1.000 0 30399   765
-  1  38  81 1.000 0 33201  3819
-  1  21  88 1.000 0 33201  4022
-  1  28  64 1.000 0 33201  3478
-  1  44  99 1.000 0 33201  4422
-  1  27  62 1.000 0 33201  3470
-  1  44 100 1.000 0 33201  4393
-  1  31  66 1.000 0 33201  3870
-  1  37  86 1.000 0 33201  4763
-  1  41  37 1.000 0 33106  2113
-  1  23  69 1.000 0 33201  3802
-  1  24  68 1.000 0 33201  3790
-  1  21  68 1.000 0 33201  3794
-  1  37  40 1.000 0 33106  2225
-  1  33  68 1.000 0 33201  3867
-  1  25  69 1.000 0 33201  3804
-  1  43 100 1.000 0 33201  4390
-  1  26  75 1.000 0 33201  4059
-  1  26  61 1.000 0 33201  3461
-  1  32  66 1.000 0 33201  3871
-  1  27  61 1.000 0 33201  3463
-  1  40  64 1.000 0 33106  2787
-  1  31  68 1.000 0 33201  3869
-  1  39  84 1.000 0 33201  3838
-  1  37  67 1.000 0 33201  3886
-  1  41  99 1.000 0 33201  4412
-  1  40  86 1.000 0 33201  4767
-  1  39  86 1.000 0 33201  4765
-  1  38  67 1.000 0 33201  3885
-  1  36  82 1.000 0 33201  3836
-  1  26  72 1.000 0 33201  4066
-  1  24  70 1.000 0 33201  3811
-  1  37  85 1.000 0 33201  3846
-  1  29  66 1.000 0 33201  4083
-  1  22  62 1.000 0 33201  3652
-  1  29  24 1.000 0 33201  1394
-  1  48  72 1.000 0 33201  4112
-  1  22  59 1.000 0 33201  3677
-  1  47  71 1.000 0 33201  4108
-  1  21  60 1.000 0 33201  3681
-  1  38  72 1.000 0 33201  3614
-  1  48  71 1.000 0 33201  4106
-  1  17  60 1.000 0 33201  3436
-  1  39  68 1.000 0 33201  3895
-  1  40  71 1.000 0 33201  3623
-  1  44  70 1.000 0 33201  3906
-  1  47  72 1.000 0 33201  4111
-  1  26  59 1.000 0 33201  3503
-  1  29  25 1.000 0 33201  1396
-  1  24  63 1.000 0 33201  3644
-  1  29  22 1.000 0 33201  1392
-  1  29  61 1.000 0 33201  3465
-  1  45  70 1.000 0 33201  3905
-  1  28  23 1.000 0 33201  1405
-  1  22  64 1.000 0 33201  3647
-  1  27  24 1.000 0 33201  1376
-  1  29  23 1.000 0 33201  1393
-  1  38  66 1.000 0 33201  3902
-  1  21  64 1.000 0 33201  3646
-  1  26  21 1.000 0 33201  1397
-  1  50  71 1.000 0 33201  4103
-  1  41  70 1.000 0 33201  3909
-  1  28  21 1.000 0 33201  1402
-  1  40  81 1.000 0 33201  3822
-  1  36  74 1.000 0 33201  3629
-  1  35  33 1.000 0 33201  1055
-  1  21  61 1.000 0 33201  3662
-  1  49  92 1.000 0 33201  4726
-  1  23  63 1.000 0 33201  3643
-  1  44  72 1.000 0 33201  4146
-  1  39  66 1.000 0 33201  3901
-  1  24  61 1.000 0 33201  3665
-  1  22  65 1.000 0 33201  3657
-  1  23  61 1.000 0 33201  3664
-  1  22  87 1.000 0 33201  4074
-  1  40  74 1.000 0 33201  3635
-  1  39  63 1.000 0 33106  2791
-  1  25  60 1.000 0 33201  3686
-  1  18  60 1.000 0 33201  3435
-  1  28  25 1.000 0 33201  1407
-  1  36  67 1.000 0 33201  3887
-  1  16  56 1.000 0 33201  3438
-  1  37  68 1.000 0 33201  3898
-  1  39  65 1.000 0 33106  2804
-  1  21  65 1.000 0 33201  3656
-  1  23  65 1.000 0 33201  3658
-  1  23  64 1.000 0 33201  3648
-  1  20  56 1.000 0 33201  3444
-  1  38  68 1.000 0 33201  3896
-  1  30  61 1.000 0 33201  3466
-  1  17  56 1.000 0 33201  3439
-  1  28  61 1.000 0 33201  3464
-  1  34  83 1.000 0 33201  4645
-  1  34  46 1.000 0 33106  2286
-  1  38  91 1.000 0 33201  5136
-  1  19  56 1.000 0 33201  3443
-  1  31  53 1.000 0 33106  2682
-  1  42  70 1.000 0 33201  3908
-  1  45  81 1.000 0 33201  4345
-  1  47  19 1.000 0 33201  1641
-  1  33  51 1.000 0 33106  2677
-  1  49  80 1.000 0 33201  4560
-  1  48  79 1.000 0 33201  4564
-  1  36  93 1.000 0 33201  5145
-  1  19  60 1.000 0 33201  3434
-  1  11  21 1.000 0 33201    88
-  1  37  91 1.000 0 33201  5135
-  1  46  80 1.000 0 33201  4561
-  1  42  78 1.000 0 33201  4344
-  1  48  80 1.000 0 33201  4559
-  1  44  78 1.000 0 33201  4347
-  1  43  78 1.000 0 33201  4346
-  1  47  80 1.000 0 33201  4574
-  1  47  79 1.000 0 33201  4563
-  1  49  73 1.000 0 33201  4119
-  1  48  73 1.000 0 33201  4117
-  1  50  20 1.000 0 33201  1660
-  1  47  73 1.000 0 33201  4116
-  1  34  51 1.000 0 33106  2679
-  1   4  52 1.000 0 33201  3490
-  1  28  90 1.000 0 33201  4684
-  1   8  72 1.000 0 30399   878
-  1  50  80 1.000 0 33201  4562
-  1   7  72 1.000 0 30399   934
-  1  48  96 1.000 0 33201  4602
-  1  47   3 1.000 0 33201  1296
-  1  40  61 1.000 0 33106  2800
-  1   6  73 1.000 0 30399   704
-  1  34  48 1.000 0 33106  2279
-  1  48  36 1.000 0 33106  2061
-  1  34  49 1.000 0 33106  2270
-  1  28  47 1.000 0 33201   359
-  1  34  47 1.000 0 33106  2283
-  1  22  88 1.000 0 33201  4015
-  1  41 100 1.000 0 33201  4387
-  1  44  66 1.000 0 33201  3928
-  1  45  66 1.000 0 33201  3927
-  1  43  66 1.000 0 33201  3929
-  1  42  96 1.000 0 33201  4453
-  1  44  96 1.000 0 33201  4469
-  1  11  80 1.000 0 33201  4129
-  1  45 100 1.000 0 33201  4400
-  1  46  79 1.000 0 33201  4565
-  1  43  69 1.000 0 33201  3914
-  1  45  69 1.000 0 33201  3912
-  1  43  96 1.000 0 33201  4455
-  1  48  67 1.000 0 33106  3011
-  1  38   4 1.000 0 33201   695
-  1  31   8 1.000 0 33201  1723
-  1  48  18 1.000 0 33201  1652
-  1  10  76 1.000 0 30399   346
-  1   5  52 1.000 0 33201  3492
-  1  21  85 1.000 0 33201  4470
-  1  49  96 1.000 0 33201  4627
-  1  21  79 1.000 0 33201  4230
-  1   3  52 1.000 0 33201  3488
-  1  41  88 1.000 0 33201  4170
-  1  38  61 1.000 0 33106  2796
-  1  46  86 1.000 0 33201  4458
-  1  46  66 1.000 0 33106  3040
-  1  29  90 1.000 0 33201  4686
-  1  47  98 1.000 0 33201  4744
-  1  47  94 1.000 0 33201  4741
-  1  23  85 1.000 0 33201  4473
-  1  48  95 1.000 0 33201  4730
-  1  34   7 1.000 0 33201   920
-  1  34   6 1.000 0 33201   922
-  1  45  99 1.000 0 33201  4425
-  1  47  17 1.000 0 33201  1643
-  1  26  67 1.000 0 33201  4073
-  1  30  67 1.000 0 33201  4078
-  1  48  94 1.000 0 33201  4742
-  1  44  90 1.000 0 33201  4186
-  1  39  91 1.000 0 33201  5138
-  1  45  90 1.000 0 33201  4185
-  1  22  79 1.000 0 33201  4231
-  1  23  79 1.000 0 33201  4232
-  1  25  85 1.000 0 33201  4472
-  1  43  88 1.000 0 33201  4167
-  1  36  61 1.000 0 33106  2793
-  1  24  92 1.000 0 33106  2871
-  1  22  90 1.000 0 33201  3933
-  1  37  62 1.000 0 33106  2807
-  1  49  79 1.000 0 33201  4566
-  1  45  78 1.000 0 33201  4349
-  1  50  79 1.000 0 33201  4567
-  1  44  69 1.000 0 33201  3913
-  1  48  78 1.000 0 33201  4554
-  1  42  69 1.000 0 33201  3915
-  1  46  73 1.000 0 33201  4115
-  1  24  90 1.000 0 33201  3920
-  1  36  96 1.000 0 33106  2894
-  1   7  68 1.000 0 33201  3796
-  1   7  74 1.000 0 30399   798
-  1  25  88 1.000 0 33201  3995
-  1  23  16 1.000 0 33201  1621
-  1  24  19 1.000 0 33201  1611
-  1  25  86 1.000 0 33201  4025
-  1  22   9 1.000 0 33201   736
-  1  38  62 1.000 0 33106  2809
-  1  42  88 1.000 0 33201  4169
-  1  39  61 1.000 0 33106  2798
-  1  37  66 1.000 0 33201  3903
-  1  50  75 1.000 0 33201  4121
-  1  47   5 1.000 0 33201  1298
-  1  29  57 1.000 0 33201  3491
-  1  49  75 1.000 0 33201  4122
-  1  30  41 1.000 0 33201   561
-  1  47  75 1.000 0 33201  4124
-  1  48  75 1.000 0 33201  4123
-  1  47  78 1.000 0 33201  4553
-  1  50  73 1.000 0 33201  4120
-  1  41  72 1.000 0 33201  4142
-  1  46  75 1.000 0 33201  4125
-  1  15  38 1.000 0 33201   610
-  1  36  91 1.000 0 33201  5134
-  1  19  15 1.000 0 33201   424
-  1  16  34 1.000 0 33201   871
-  1   7  38 1.000 0 33201   618
-  1  26  30 1.000 0 33201  1221
-  1  37  26 1.000 0 33201  1210
-  1   9  50 1.000 0 33201   285
-  1  16  33 1.000 0 33201   873
-  1   8  45 1.000 0 33201   457
-  1  26  26 1.000 0 33201  1225
-  1  26  28 1.000 0 33201  1223
-  1  48  92 1.000 0 33201  4725
-  1   8  42 1.000 0 33201   460
-  1  35  51 1.000 0 33106  2681
-  1  34  53 1.000 0 33106  2686
-  1  26  27 1.000 0 33201  1224
-  1  37  61 1.000 0 33106  2794
-  1  48  98 1.000 0 33201  4748
-  1   2  52 1.000 0 33201  3487
-  1  28  50 1.000 0 33201   362
-  1   5  56 1.000 0 33201  3615
-  1  45  88 1.000 0 33201  4164
-  1  33  82 1.000 0 33201  4655
-  1  21  90 1.000 0 33201  3940
-  1  24  79 1.000 0 33201  4233
-  1   5  63 1.000 0 33106  2762
-  1  46  98 1.000 0 33201  4739
-  1  44  88 1.000 0 33201  4165
-  1  40  91 1.000 0 33201  5139
-  1  29  67 1.000 0 33201  4077
-  1  36  62 1.000 0 33106  2806
-  1  39  96 1.000 0 33106  2900
-  1  23  90 1.000 0 33201  3931
-  1   9  76 1.000 0 30399   355
-  1  24  85 1.000 0 33201  4474
-  1  26  74 1.000 0 33201  4054
-  1  29  74 1.000 0 33201  4057
-  1  10  78 1.000 0 30399   320
-  1  27  74 1.000 0 33201  4055
-  1  28  74 1.000 0 33201  4056
-  1  27  67 1.000 0 33201  4075
-  1  36  95 1.000 0 33201  5140
-  1  42  72 1.000 0 33201  4143
-  1  26  62 1.000 0 33201  3471
-  1  21  25 1.000 0 33201  1389
-  1  30  64 1.000 0 33201  3476
-  1  28  62 1.000 0 33201  3469
-  1  27  64 1.000 0 33201  3451
-  1  26  64 1.000 0 33201  3452
-  1   8  43 1.000 0 33201   459
-  1  38  97 1.000 0 33106  2917
-  1  29  64 1.000 0 33201  3477
-  1  39  97 1.000 0 33106  2920
-  1  29  62 1.000 0 33201  3468
-  1  45  67 1.000 0 33201  3922
-  1  41  67 1.000 0 33201  3926
-  1  21  22 1.000 0 33201  1382
-  1  46  78 1.000 0 33201  4555
-  1   3  50 1.000 0 33201   200
-  1  32  51 1.000 0 33106  2676
-  1  30  46 1.000 0 33201   383
-  1  30  23 1.000 0 33201  1411
-  1  21  20 1.000 0 33201  1612
-  1  28  57 1.000 0 33201  3489
-  1  15  41 1.000 0 33201   455
-  1  27  21 1.000 0 33201  1372
-  1  32  52 1.000 0 33106  2689
-  1  35  53 1.000 0 33106  2687
-  1  33  53 1.000 0 33106  2685
-  1  31  52 1.000 0 33106  2688
-  1  27  22 1.000 0 33201  1374
-  1  32  53 1.000 0 33106  2683
-  1  30  22 1.000 0 33201  1409
-  1  28  59 1.000 0 33201  3505
-  1  30  90 1.000 0 33201  4687
-  1  50  21 1.000 0 33201  1548
-  1   2  53 1.000 0 33201  3500
-  1   5  55 1.000 0 33201  3462
-  1   4  55 1.000 0 33201  3455
-  1  44  68 1.000 0 33201  3917
-  1  41  68 1.000 0 33201  3921
-  1  42  68 1.000 0 33201  3919
-  1  21  24 1.000 0 33201  1386
-  1  50  78 1.000 0 33201  4557
-  1   4  49 1.000 0 33201   189
-  1  50  92 1.000 0 33201  4727
-  1  49  72 1.000 0 33201  4113
-  1   9  49 1.000 0 33201   303
-  1  48  68 1.000 0 33106  3024
-  1  28  26 1.000 0 33201  1216
-  1  47  92 1.000 0 33201  4723
-  1  44  76 1.000 0 33201  4372
-  1  28  29 1.000 0 33201  1219
-  1  50  72 1.000 0 33201  4114
-  1   9  48 1.000 0 33201   304
-  1  21  23 1.000 0 33201  1384
-  1  43  67 1.000 0 33201  3924
-  1  49  95 1.000 0 33201  4731
-  1  42  76 1.000 0 33201  4369
-  1  11  48 1.000 0 33201   297
-  1   7  39 1.000 0 33201   617
-  1  43  99 1.000 0 33201  4421
-  1  41  69 1.000 0 33201  3911
-  1  45  68 1.000 0 33201  3916
-  1  42  67 1.000 0 33201  3925
-  1  34   9 1.000 0 33201   903
-  1  43  68 1.000 0 33201  3918
-  1  44  67 1.000 0 33201  3923
-  1  41  66 1.000 0 33201  3932
-  1  21  21 1.000 0 33201  1381
-  1  42  66 1.000 0 33201  3930
-  1  49  78 1.000 0 33201  4556
-  1  37  37 1.000 0 33106  2209
-  1  43  27 1.000 0 33201  1317
-  1  49  16 1.000 0 33201  1639
-  1  47  24 1.000 0 33201  1537
-  1  38  40 1.000 0 33106  2060
-  1  41  36 1.000 0 33106  2112
-  1  49  30 1.000 0 33201  1309
-  1  46  27 1.000 0 33201  1302
-  1  46  26 1.000 0 33201  1303
-  1  45  27 1.000 0 33201  1291
-  1  49  26 1.000 0 33201  1304
-  1  43  26 1.000 0 33201  1316
-  1  13  80 1.000 0 33201  4132
-  1  45  28 1.000 0 33201  1290
-  1  16  80 1.000 0 33201  4394
-  1  49  27 1.000 0 33201  1305
-  1  49  28 1.000 0 33201  1306
-  1  45  29 1.000 0 33201  1289
-  1  46  95 1.000 0 33201  4729
-  1  45  30 1.000 0 33201  1288
-  1  45  26 1.000 0 33201  1295
-  1  25  41 1.000 0 33201   671
-  1   7  47 1.000 0 33201   289
-  1  21  42 1.000 0 33201   696
-  1  10  48 1.000 0 33201   279
-  1   7  48 1.000 0 33201   288
-  1  20  49 1.000 0 33201   318
-  1  17  15 1.000 0 33201   493
-  1  22  50 1.000 0 33201   308
-  1  28  30 1.000 0 33201  1220
-  1  14  47 1.000 0 33201   280
-  1   7  50 1.000 0 33201   286
-  1  12  46 1.000 0 33201   275
-  1   8  50 1.000 0 33201   256
-  1  25  45 1.000 0 33201   667
-  1   6  50 1.000 0 33201   291
-  1  10  46 1.000 0 33201   282
-  1  28  28 1.000 0 33201  1218
-  1  14  48 1.000 0 33201   278
-  1  15  49 1.000 0 33201   266
-  1   8  46 1.000 0 33201   243
-  1   8  47 1.000 0 33201   258
-  1  15  50 1.000 0 33201   283
-  1  20  15 1.000 0 33201   466
-  1  20  14 1.000 0 33201   483
-  1  28  27 1.000 0 33201  1217
-  1  16  15 1.000 0 33201   486
-  1  16  14 1.000 0 33201   492
-  1  37  30 1.000 0 33201  1205
-  1  35  93 1.000 0 33201  4321
-  1  47  69 1.000 0 33106  3034
-  1   2  41 1.000 0 33201   777
-  1  18  50 1.000 0 33201   313
-  1  20  47 1.000 0 33201   320
-  1  49  99 1.000 0 33201  4706
-  1   6  49 1.000 0 33201   292
-  1   8  48 1.000 0 33201   260
-  1  17  14 1.000 0 33201   494
-  1  18  15 1.000 0 33201   495
-  1  15  46 1.000 0 33201   267
-  1  15  47 1.000 0 33201   265
-  1   8  49 1.000 0 33201   241
-  1   8  73 1.000 0 30399   694
-  1  14  42 1.000 0 33201   448
-  1  31   9 1.000 0 33201  1725
-  1  20  41 1.000 0 33201   723
-  1   7  73 1.000 0 30399   697
-  1  25  42 1.000 0 33201   670
-  1   6  46 1.000 0 33201   295
-  1   7  49 1.000 0 33201   287
-  1   6  47 1.000 0 33201   294
-  1  42  98 1.000 0 33201  4433
-  1  34   8 1.000 0 33201   914
-  1  16  45 1.000 0 33201   725
-  1  14  45 1.000 0 33201   446
-  1  20  42 1.000 0 33201   722
-  1  16  44 1.000 0 33201   727
-  1  17  45 1.000 0 33201   706
-  1   4  50 1.000 0 33201   172
-  1  12  41 1.000 0 33201   470
-  1  20  45 1.000 0 33201   717
-  1  32  82 1.000 0 33201  4654
-  1  47  66 1.000 0 33106  3044
-  1   7  46 1.000 0 33201   290
-  1  22  44 1.000 0 33201   701
-  1   3  47 1.000 0 33201   198
-  1   8  44 1.000 0 33201   458
-  1   3  46 1.000 0 33201   195
-  1  26  47 1.000 0 33201   366
-  1   3  48 1.000 0 33201   196
-  1  12  43 1.000 0 33201   469
-  1  22  43 1.000 0 33201   705
-  1  47  16 1.000 0 33201  1644
-  1  49  17 1.000 0 33201  1637
-  1   1  55 1.000 0 33201  3369
-  1  16  43 1.000 0 33201   728
-  1  20  44 1.000 0 33201   720
-  1  50  22 1.000 0 33201  1549
-  1  22  42 1.000 0 33201   703
-  1  36  68 1.000 0 33201  3899
-  1  50  95 1.000 0 33201  4732
-  1  49  67 1.000 0 33106  3012
-  1  21  49 1.000 0 33201   324
-  1  21  46 1.000 0 33201   327
-  1  18  48 1.000 0 33201   314
-  1  47  67 1.000 0 33106  3010
-  1  16  17 1.000 0 33201  1080
-  1  46  30 1.000 0 33201  1297
-  1  47  28 1.000 0 33201  1283
-  1  47  27 1.000 0 33201  1286
-  1  46  29 1.000 0 33201  1299
-  1  46  28 1.000 0 33201  1301
-  1  26  48 1.000 0 33201   365
-  1  13  46 1.000 0 33201   236
-  1  22  45 1.000 0 33201   700
-  1  49  68 1.000 0 33106  3025
-  1  13  49 1.000 0 33201   231
-  1  21  48 1.000 0 33201   325
-  1  20  50 1.000 0 33201   322
-  1  22  41 1.000 0 33201   704
-  1  21  43 1.000 0 33201   698
-  1  13  50 1.000 0 33201   225
-  1   2  44 1.000 0 33201   767
-  1   4  47 1.000 0 33201   191
-  1  22  47 1.000 0 33201   311
-  1  22  46 1.000 0 33201   312
-  1  14  79 1.000 0 33201  4180
-  1  19  44 1.000 0 33201   713
-  1  35  82 1.000 0 33201  4657
-  1  22  49 1.000 0 33201   309
-  1  20  48 1.000 0 33201   321
-  1  11  50 1.000 0 33201   296
-  1  46  68 1.000 0 33106  3020
-  1  18  47 1.000 0 33201   315
-  1   6  48 1.000 0 33201   293
-  1  50  69 1.000 0 33106  3032
-  1  42  99 1.000 0 33201  4418
-  1  21  44 1.000 0 33201   693
-  1  21  47 1.000 0 33201   326
-  1  15  48 1.000 0 33201   263
-  1  34  95 1.000 0 33201  4228
-  1  48  69 1.000 0 33106  3036
-  1  44   7 1.000 0 33201  1867
-  1  10  34 1.000 0 33201   842
-  1  18  49 1.000 0 33201   317
-  1  16  16 1.000 0 33201  1074
-  1  46  67 1.000 0 33106  3009
-  1   3  43 1.000 0 33201   750
-  1  22  48 1.000 0 33201   310
-  1  27  90 1.000 0 33201  4683
-  1  50  67 1.000 0 33106  3018
-  1  21  50 1.000 0 33201   323
-  1   3  41 1.000 0 33201   753
-  1  20  46 1.000 0 33201   319
-  1  42  60 1.000 0 33106  2760
-  1  26  90 1.000 0 33201  4682
-  1   5  44 1.000 0 33201   828
-  1  20  43 1.000 0 33201   721
-  1  35  10 1.000 0 33201  1885
-  1  16  19 1.000 0 33201  1056
-  1  16  18 1.000 0 33201  1030
-  1  50  68 1.000 0 33106  3030
-  1  41  89 1.000 0 33201  4175
-  1  29  50 1.000 0 33201   373
-  1   3  49 1.000 0 33201   199
-  1   8  41 1.000 0 33201   462
-  1  31   6 1.000 0 33201  1707
-  1  29  49 1.000 0 33201   374
-  1  15  45 1.000 0 33201   451
-  1  15  43 1.000 0 33201   452
-  1  19  43 1.000 0 33201   714
-  1  15  42 1.000 0 33201   453
-  1   1  47 1.000 0 33201   188
-  1  17  41 1.000 0 33201   711
-  1  17  43 1.000 0 33201   708
-  1  49  18 1.000 0 33201  1636
-  1  19  45 1.000 0 33201   712
-  1  14  54 1.000 0 33201  3306
-  1  28  45 1.000 0 33201   562
-  1   7  45 1.000 0 33201   463
-  1  37  36 1.000 0 33106  2211
-  1  50  24 1.000 0 33201  1547
-  1  17  44 1.000 0 33201   707
-  1  32  48 1.000 0 33106  2265
-  1  17  70 1.000 0 33201  3759
-  1  20  69 1.000 0 33201  3781
-  1  48  97 1.000 0 33201  4662
-  1  12  73 1.000 0 33201  3941
-  1  11  70 1.000 0 33201  3735
-  1  20  66 1.000 0 33201  3773
-  1  13  67 1.000 0 33201  3726
-  1  19  70 1.000 0 33201  3761
-  1  19  66 1.000 0 33201  3772
-  1  14  67 1.000 0 33201  3724
-  1  22  11 1.000 0 33201  1308
-  1  22  14 1.000 0 33201  1300
-  1  13  73 1.000 0 33201  3942
-  1  47  96 1.000 0 33201  4600
-  1  12  64 1.000 0 33201  3579
-  1  14  64 1.000 0 33201  3582
-  1  13  64 1.000 0 33201  3581
-  1  49  22 1.000 0 33201  1345
-  1   7  61 1.000 0 33201  3547
-  1  10  63 1.000 0 33201  3561
-  1  19  69 1.000 0 33201  3778
-  1  14  62 1.000 0 33201  3601
-  1  20  68 1.000 0 33201  3756
-  1  11  64 1.000 0 33201  3577
-  1  35  35 1.000 0 33201  1053
-  1  32  31 1.000 0 33201  1063
-  1  19  68 1.000 0 33201  3755
-  1  12  78 1.000 0 33201  4097
-  1  18  68 1.000 0 33201  3754
-  1  38  39 1.000 0 33106  2068
-  1  28  35 1.000 0 33201  1064
-  1  12  77 1.000 0 33201  4151
-  1  15  77 1.000 0 33201  4140
-  1  28  34 1.000 0 33201  1065
-  1   1  60 1.000 0 33201  3580
-  1  47  29 1.000 0 33201  1282
-  1   1  56 1.000 0 33201  3608
-  1  12  65 1.000 0 33201  3585
-  1   2  60 1.000 0 33201  3589
-  1  28  31 1.000 0 33201  1069
-  1  45  91 1.000 0 33201  5159
-  1   3  56 1.000 0 33201  3612
-  1   5  60 1.000 0 33201  3599
-  1  23  15 1.000 0 33201  1373
-  1  42  91 1.000 0 33201  5156
-  1  22  13 1.000 0 33201  1321
-  1   9  78 1.000 0 30399   554
-  1   8  55 1.000 0 33201  3277
-  1  10  32 1.000 0 33201   848
-  1   9  55 1.000 0 33201  3278
-  1   9  51 1.000 0 33201  3292
-  1  10  35 1.000 0 33201   840
-  1   9  33 1.000 0 33201   958
-  1  16  69 1.000 0 33201  3775
-  1  12  51 1.000 0 33201  3310
-  1   8  52 1.000 0 33201  3282
-  1   9  34 1.000 0 33201   957
-  1  11  54 1.000 0 33201  3303
-  1  10  51 1.000 0 33201  3291
-  1   6  54 1.000 0 33201  3289
-  1  10  55 1.000 0 33201  3279
-  1   6  34 1.000 0 33201   952
-  1   4  51 1.000 0 33201  3520
-  1  43  86 1.000 0 33201  4182
-  1  10  33 1.000 0 33201   846
-  1  15  51 1.000 0 33201  3313
-  1  43  90 1.000 0 33201  4187
-  1  48  26 1.000 0 33201  1249
-  1   9  30 1.000 0 33106  2352
-  1  45  86 1.000 0 33201  4178
-  1  43  87 1.000 0 33201  4193
-  1  44  86 1.000 0 33201  4181
-  1  41  87 1.000 0 33201  4195
-  1  41  90 1.000 0 33201  4190
-  1  30  92 1.000 0 33106  2949
-  1   4  64 1.000 0 33106  2764
-  1  17  35 1.000 0 33201   865
-  1  42  89 1.000 0 33201  4174
-  1  41  86 1.000 0 33201  4184
-  1  42  86 1.000 0 33201  4183
-  1  42  87 1.000 0 33201  4194
-  1  45  87 1.000 0 33201  4191
-  1  26  92 1.000 0 33106  2950
-  1  44  89 1.000 0 33201  4172
-  1  42  90 1.000 0 33201  4189
-  1  45  89 1.000 0 33201  4171
-  1  43  89 1.000 0 33201  4173
-  1  50  97 1.000 0 33201  4675
-  1  44  87 1.000 0 33201  4192
-  1  30  86 1.000 0 33201  4693
-  1  24   9 1.000 0 33201   710
-  1  35   9 1.000 0 33201  1882
-  1  47  95 1.000 0 33201  4728
-  1  31   7 1.000 0 33201  1710
-  1  46  92 1.000 0 33201  4724
-  1  15  79 1.000 0 33201  4188
-  1  34  10 1.000 0 33201   902
-  1  25  21 1.000 0 33201  1360
-  1  31  10 1.000 0 33201  1775
-  1  16  66 1.000 0 33201  3769
-  1  14  70 1.000 0 33201  3738
-  1  11  52 1.000 0 33201  3325
-  1  23  14 1.000 0 33201  1370
-  1  23  73 1.000 0 33201  3988
-  1  11  69 1.000 0 33201  3741
-  1   9  53 1.000 0 33201  3302
-  1  15  68 1.000 0 33201  3750
-  1  15  67 1.000 0 33201  3729
-  1  11  66 1.000 0 33201  3730
-  1  15  70 1.000 0 33201  3740
-  1  22  15 1.000 0 33201  1322
-  1   6  53 1.000 0 33201  3297
-  1  12  66 1.000 0 33201  3731
-  1  15  66 1.000 0 33201  3734
-  1  24  73 1.000 0 33201  3987
-  1  45  94 1.000 0 33201  5187
-  1  10  30 1.000 0 33106  2344
-  1  43   5 1.000 0 33201  1966
-  1  35  46 1.000 0 33106  2274
-  1  22  73 1.000 0 33201  3989
-  1  35  47 1.000 0 33106  2275
-  1  13  68 1.000 0 33201  3748
-  1  21  73 1.000 0 33201  3990
-  1  15  52 1.000 0 33201  3329
-  1  44   4 1.000 0 33201  1940
-  1  11  68 1.000 0 33201  3746
-  1  36  45 1.000 0 33106  2099
-  1  12  67 1.000 0 33201  3727
-  1  13  52 1.000 0 33201  3327
-  1   8  53 1.000 0 33201  3301
-  1  15  69 1.000 0 33201  3745
-  1  12  70 1.000 0 33201  3736
-  1  25  71 1.000 0 33201  4008
-  1  12  68 1.000 0 33201  3747
-  1  12  52 1.000 0 33201  3326
-  1  14  69 1.000 0 33201  3744
-  1  41   3 1.000 0 33201  2020
-  1  12  69 1.000 0 33201  3742
-  1  41  41 1.000 0 33106  2122
-  1  16  75 1.000 0 33201  3981
-  1  14  68 1.000 0 33201  3749
-  1  11  67 1.000 0 33201  3728
-  1  13  70 1.000 0 33201  3737
-  1  42   4 1.000 0 33201  1920
-  1  22  80 1.000 0 33201  4241
-  1  17  75 1.000 0 33201  3982
-  1  35  48 1.000 0 33106  2276
-  1  31  50 1.000 0 33106  2273
-  1  43   1 1.000 0 33201  1978
-  1  42   5 1.000 0 33201  1440
-  1  16  24 1.000 0 33201  1158
-  1  41   4 1.000 0 33201  2000
-  1  16  67 1.000 0 33201  3768
-  1  18  75 1.000 0 33201  3983
-  1  16  25 1.000 0 33201  1157
-  1  22  30 1.000 0 33201  1169
-  1  14  66 1.000 0 33201  3733
-  1  24  78 1.000 0 33201  4251
-  1  11  73 1.000 0 33201  3939
-  1   9  29 1.000 0 33106  2346
-  1  20  70 1.000 0 33201  3762
-  1  18  69 1.000 0 33201  3777
-  1   9  61 1.000 0 33201  3549
-  1  18  66 1.000 0 33201  3771
-  1  16  70 1.000 0 33201  3757
-  1  37  48 1.000 0 33106  2026
-  1   9  63 1.000 0 33201  3560
-  1  17  67 1.000 0 33201  3767
-  1   9  65 1.000 0 33201  3574
-  1  10  65 1.000 0 33201  3576
-  1  46  99 1.000 0 33201  4735
-  1  13  69 1.000 0 33201  3743
-  1  13  63 1.000 0 33201  3605
-  1  19  67 1.000 0 33201  3764
-  1  25  77 1.000 0 33201  4235
-  1  20  67 1.000 0 33201  3763
-  1  14  73 1.000 0 33201  3943
-  1   6  65 1.000 0 33201  3571
-  1  17  69 1.000 0 33201  3776
-  1  16  68 1.000 0 33201  3751
-  1  18  70 1.000 0 33201  3760
-  1  17  66 1.000 0 33201  3770
-  1  37  47 1.000 0 33106  2027
-  1  26  93 1.000 0 33106  2936
-  1  18  67 1.000 0 33201  3765
-  1  17  68 1.000 0 33201  3753
-  1  18  30 1.000 0 33201  1011
-  1  22  12 1.000 0 33201  1315
-  1  47  26 1.000 0 33201  1287
-  1  44   3 1.000 0 33201  1942
-  1  48  29 1.000 0 33201  1245
-  1  35  21 1.000 0 33201  1481
-  1  18  29 1.000 0 33201  1012
-  1  35  24 1.000 0 33201  1482
-  1  14  31 1.000 0 33201   889
-  1  37  96 1.000 0 33106  2895
-  1  43  38 1.000 0 33106  2056
-  1  38  21 1.000 0 33201  1487
-  1  10  31 1.000 0 33201   850
-  1  11  51 1.000 0 33201  3308
-  1   6  32 1.000 0 33201   954
-  1  10  52 1.000 0 33201  3284
-  1  46  96 1.000 0 33201  4618
-  1   8  65 1.000 0 33201  3573
-  1  14  27 1.000 0 33201  1007
-  1  10  54 1.000 0 33201  3285
-  1  15  53 1.000 0 33201  3324
-  1  46  97 1.000 0 33201  4661
-  1  15  19 1.000 0 30399   420
-  1   6  31 1.000 0 33201   953
-  1   6  35 1.000 0 33201   956
-  1  11  34 1.000 0 33201   826
-  1  34  21 1.000 0 33201  1475
-  1  41  42 1.000 0 33106  2055
-  1   7  52 1.000 0 33201  3281
-  1  14  34 1.000 0 33201   885
-  1  27  84 1.000 0 33201  4585
-  1   6  33 1.000 0 33201   955
-  1   6  52 1.000 0 33201  3280
-  1   2  56 1.000 0 33201  3610
-  1  37  22 1.000 0 33201  1471
-  1  15  20 1.000 0 30399   419
-  1  37  23 1.000 0 33201  1470
-  1  19  35 1.000 0 33201   877
-  1   7  65 1.000 0 33201  3572
-  1  34  25 1.000 0 33201  1476
-  1  14  33 1.000 0 33201   887
-  1  48  25 1.000 0 33201  1342
-  1  21  80 1.000 0 33201  4246
-  1  49  23 1.000 0 33201  1346
-  1   3  51 1.000 0 33201  3519
-  1  10  26 1.000 0 33106  2345
-  1   1  57 1.000 0 33201  3683
-  1   3  60 1.000 0 33201  3594
-  1   4  60 1.000 0 33201  3596
-  1  13  79 1.000 0 33201  4179
-  1  48  30 1.000 0 33201  1244
-  1  44  91 1.000 0 33201  5158
-  1  25  78 1.000 0 33201  4252
-  1  49  21 1.000 0 33201  1344
-  1  48  27 1.000 0 33201  1248
-  1  45  20 1.000 0 33201  1682
-  1   4  57 1.000 0 33201  3692
-  1  38  92 1.000 0 33201  5152
-  1  37  38 1.000 0 33106  2208
-  1  21  78 1.000 0 33201  4247
-  1  25  72 1.000 0 33201  3996
-  1  47  87 1.000 0 33201  4439
-  1  18  74 1.000 0 33201  3978
-  1  16  74 1.000 0 33201  3980
-  1  14  53 1.000 0 33201  3323
-  1  45  16 1.000 0 33201  1686
-  1  13  53 1.000 0 33201  3322
-  1   9  28 1.000 0 33106  2350
-  1   8  30 1.000 0 33106  2336
-  1  18  25 1.000 0 33201  1176
-  1  10  29 1.000 0 33106  2343
-  1  10  27 1.000 0 33106  2341
-  1   1  51 1.000 0 33201  3513
-  1   5  57 1.000 0 33201  3700
-  1   2  51 1.000 0 33201  3516
-  1  10  28 1.000 0 33106  2342
-  1  46  23 1.000 0 33201  1545
-  1  49  87 1.000 0 33201  4441
-  1  10  53 1.000 0 33201  3296
-  1   7  64 1.000 0 33201  3553
-  1   7  53 1.000 0 33201  3299
-  1  18  72 1.000 0 33201  3962
-  1  15  65 1.000 0 33201  3588
-  1  11  65 1.000 0 33201  3584
-  1  14  51 1.000 0 33201  3312
-  1  13  51 1.000 0 33201  3311
-  1  19  74 1.000 0 33201  3977
-  1   7  55 1.000 0 33201  3276
-  1  17  73 1.000 0 33201  3974
-  1  13  66 1.000 0 33201  3732
-  1  19  73 1.000 0 33201  3972
-  1  18  73 1.000 0 33201  3973
-  1  16  71 1.000 0 33201  3970
-  1  14  52 1.000 0 33201  3328
-  1  41  95 1.000 0 33201  5175
-  1   6  55 1.000 0 33201  3275
-  1  42  95 1.000 0 33201  5178
-  1  21  76 1.000 0 33201  4258
-  1  43  95 1.000 0 33201  5180
-  1  36  42 1.000 0 33106  2101
-  1  25  79 1.000 0 33201  4234
-  1  45  95 1.000 0 33201  5182
-  1  22  76 1.000 0 33201  4253
-  1  44  95 1.000 0 33201  5181
-  1  22  78 1.000 0 33201  4249
-  1  15  54 1.000 0 33201  3307
-  1  12  54 1.000 0 33201  3304
-  1  13  54 1.000 0 33201  3305
-  1  41  19 1.000 0 33201  1661
-  1  11  55 1.000 0 33201  3314
-  1  48  87 1.000 0 33201  4440
-  1   9  64 1.000 0 33201  3555
-  1  19  71 1.000 0 33201  3966
-  1  20  71 1.000 0 33201  3964
-  1  11  71 1.000 0 33201  3954
-  1  23  42 1.000 0 33201   676
-  1  11  62 1.000 0 33201  3597
-  1   8  64 1.000 0 33201  3554
-  1  15  61 1.000 0 33201  3595
-  1  11  72 1.000 0 33201  3945
-  1  18  45 1.000 0 33201   679
-  1  14  65 1.000 0 33201  3587
-  1   6  64 1.000 0 33201  3552
-  1  14  63 1.000 0 33201  3606
-  1  14  74 1.000 0 33201  3956
-  1   6  61 1.000 0 33201  3545
-  1  15  64 1.000 0 33201  3583
-  1  11  61 1.000 0 33201  3590
-  1  18  14 1.000 0 33201   413
-  1   4  59 1.000 0 33201  3568
-  1  15  63 1.000 0 33201  3607
-  1  15  71 1.000 0 33201  3950
-  1  40  92 1.000 0 33201  5154
-  1  36  92 1.000 0 33201  5150
-  1  13  65 1.000 0 33201  3586
-  1  11  63 1.000 0 33201  3603
-  1  14  75 1.000 0 33201  3935
-  1   8  62 1.000 0 33201  3564
-  1  17  72 1.000 0 33201  3963
-  1  13  72 1.000 0 33201  3947
-  1   9  62 1.000 0 33201  3566
-  1  18  42 1.000 0 33201   683
-  1  19  72 1.000 0 33201  3961
-  1  23  43 1.000 0 33201   674
-  1  18  43 1.000 0 33201   682
-  1  12  63 1.000 0 33201  3604
-  1  16  72 1.000 0 33201  3965
-  1  12  62 1.000 0 33201  3598
-  1  13  48 1.000 0 33201   229
-  1  12  50 1.000 0 33201   271
-  1  18  71 1.000 0 33201  3967
-  1   7  63 1.000 0 33201  3558
-  1  23  45 1.000 0 33201   673
-  1  18  44 1.000 0 33201   680
-  1  18  41 1.000 0 33201   684
-  1   4  46 1.000 0 33201   192
-  1   8  63 1.000 0 33201  3559
-  1  15  62 1.000 0 33201  3602
-  1  31  82 1.000 0 33201  4653
-  1   6  63 1.000 0 33201  3557
-  1   6  62 1.000 0 33201  3569
-  1  34  82 1.000 0 33201  4656
-  1  10  62 1.000 0 33201  3562
-  1  14  20 1.000 0 30399   867
-  1   7  62 1.000 0 33201  3567
-  1  26  49 1.000 0 33201   364
-  1   8  61 1.000 0 33201  3548
-  1  13  62 1.000 0 33201  3600
-  1  17  71 1.000 0 33201  3969
-  1  19  19 1.000 0 33201  1193
-  1  23  76 1.000 0 33201  4254
-  1  17  74 1.000 0 33201  3979
-  1  24  77 1.000 0 33201  4236
-  1  46  87 1.000 0 33201  4444
-  1  23  78 1.000 0 33201  4250
-  1  20  75 1.000 0 33201  3985
-  1  21  77 1.000 0 33201  4240
-  1  32  35 1.000 0 33201  1059
-  1  23  77 1.000 0 33201  4237
-  1  23  80 1.000 0 33201  4242
-  1  23  12 1.000 0 33201  1359
-  1  24  80 1.000 0 33201  4243
-  1  23  11 1.000 0 33201  1356
-  1  37  92 1.000 0 33201  5151
-  1   2  57 1.000 0 33201  3669
-  1  37  95 1.000 0 33201  5141
-  1  48  28 1.000 0 33201  1246
-  1  46  25 1.000 0 33201  1546
-  1  50  19 1.000 0 33201  1656
-  1   1  58 1.000 0 33201  3661
-  1   1  54 1.000 0 33201  3565
-  1  40  95 1.000 0 33201  5144
-  1  40  94 1.000 0 33201  5133
-  1  40  93 1.000 0 33201  5149
-  1  38  94 1.000 0 33201  5130
-  1   2  59 1.000 0 33201  3575
-  1  38  95 1.000 0 33201  5142
-  1   3  59 1.000 0 33201  3570
-  1   5  51 1.000 0 33201  3528
-  1  39  95 1.000 0 33201  5143
-  1  38  93 1.000 0 33201  5147
-  1  50  18 1.000 0 33201  1657
-  1  39  93 1.000 0 33201  5148
-  1  47  30 1.000 0 33201  1280
-  1   1  59 1.000 0 33201  3578
-  1  39  94 1.000 0 33201  5132
-  1  50  17 1.000 0 33201  1658
-  1   7  26 1.000 0 33106  2332
-  1  23  41 1.000 0 33201   677
-  1  37  93 1.000 0 33201  5146
-  1  12  61 1.000 0 33201  3591
-  1  19  14 1.000 0 33201   461
-  1  37  94 1.000 0 33201  5129
-  1   4  48 1.000 0 33201   190
-  1  39  92 1.000 0 33201  5153
-  1   3  57 1.000 0 33201  3676
-  1  49  24 1.000 0 33201  1343
-  1  23  44 1.000 0 33201   678
-  1  11  75 1.000 0 33201  3938
-  1  37  50 1.000 0 33106  2023
-  1  24  74 1.000 0 33201  4012
-  1  14  72 1.000 0 33201  3948
-  1  21  30 1.000 0 33201  1168
-  1  18  22 1.000 0 33201  1179
-  1  23  75 1.000 0 33201  4000
-  1  15  75 1.000 0 33201  3934
-  1  22  71 1.000 0 33201  4005
-  1  13  71 1.000 0 33201  3952
-  1   8  69 1.000 0 33201  3810
-  1  37  65 1.000 0 33106  2802
-  1  44  17 1.000 0 33201  1673
-  1  10  64 1.000 0 33201  3556
-  1  14  61 1.000 0 33201  3593
-  1  12  44 1.000 0 33201   472
-  1  28  93 1.000 0 33106  2938
-  1  13  41 1.000 0 33201   477
-  1  12  72 1.000 0 33201  3946
-  1   7  44 1.000 0 33201   464
-  1  25  25 1.000 0 33201  1353
-  1  21  28 1.000 0 33201  1164
-  1  21  74 1.000 0 33201  4009
-  1  24  71 1.000 0 33201  4007
-  1  12  42 1.000 0 33201   471
-  1  13  44 1.000 0 33201   478
-  1  13  42 1.000 0 33201   476
-  1  21  29 1.000 0 33201  1167
-  1  12  45 1.000 0 33201   473
-  1  15  84 1.000 0 33106  2983
-  1  38  65 1.000 0 33106  2803
-  1  49  69 1.000 0 33106  3039
-  1  13  74 1.000 0 33201  3957
-  1  23  71 1.000 0 33201  4006
-  1  36  65 1.000 0 33106  2801
-  1  12  75 1.000 0 33201  3937
-  1  21  26 1.000 0 33201  1162
-  1  12  74 1.000 0 33201  3958
-  1  25  92 1.000 0 33106  2876
-  1  12  71 1.000 0 33201  3953
-  1  10  61 1.000 0 33201  3550
-  1  29  93 1.000 0 33106  2940
-  1  13  43 1.000 0 33201   475
-  1  44  18 1.000 0 33201  1672
-  1  11  74 1.000 0 33201  3959
-  1  13  61 1.000 0 33201  3592
-  1  13  45 1.000 0 33201   474
-  1  20  18 1.000 0 33201  1264
-  1  14  21 1.000 0 33201   403
-  1  15  72 1.000 0 33201  3949
-  1  29  92 1.000 0 33106  2953
-  1  25  12 1.000 0 33201  1390
-  1  50  90 1.000 0 33201  4449
-  1  36   4 1.000 0 33201   657
-  1  50 100 1.000 0 33201  4595
-  1  24  75 1.000 0 33201  3999
-  1  16  73 1.000 0 33201  3975
-  1  19  16 1.000 0 33201  1199
-  1  15  73 1.000 0 33201  3944
-  1  22  77 1.000 0 33201  4238
-  1  22  67 1.000 0 33201  3783
-  1  20  72 1.000 0 33201  3960
-  1  34  22 1.000 0 33201  1474
-  1  24  57 1.000 0 33201  3696
-  1  20  20 1.000 0 33201  1256
-  1  25  74 1.000 0 33201  4013
-  1  22  74 1.000 0 33201  4010
-  1  28  83 1.000 0 33201  4598
-  1  27  95 1.000 0 33106  2967
-  1  15  30 1.000 0 33201   994
-  1  28  95 1.000 0 33106  2968
-  1  17  20 1.000 0 33201  1192
-  1  17  18 1.000 0 33201  1185
-  1  36  22 1.000 0 33201  1461
-  1  25  80 1.000 0 33201  4245
-  1  43  60 1.000 0 33106  2761
-  1  27  93 1.000 0 33106  2937
-  1  50  87 1.000 0 33201  4443
-  1  21  71 1.000 0 33201  4003
-  1  20  19 1.000 0 33201  1240
-  1  21  66 1.000 0 33201  3813
-  1  25  75 1.000 0 33201  3998
-  1  46  69 1.000 0 33106  3033
-  1  38  83 1.000 0 33201  3825
-  1  21  58 1.000 0 33201  3670
-  1  20  29 1.000 0 33201   980
-  1  23  74 1.000 0 33201  4011
-  1  21  75 1.000 0 33201  4002
-  1  15  74 1.000 0 33201  3955
-  1  20  73 1.000 0 33201  3971
-  1  19  75 1.000 0 33201  3984
-  1  14  71 1.000 0 33201  3951
-  1  15  26 1.000 0 33201   997
-  1  36  83 1.000 0 33201  3828
-  1  32  69 1.000 0 33201  3860
-  1  36   5 1.000 0 33201   656
-  1  18  19 1.000 0 33201  1068
-  1  25  76 1.000 0 33201  4257
-  1  22  75 1.000 0 33201  4001
-  1  37   4 1.000 0 33201   663
-  1  24  15 1.000 0 33201  1385
-  1  15  28 1.000 0 33201   995
-  1  25  73 1.000 0 33201  3986
-  1  13  75 1.000 0 33201  3936
-  1  24  76 1.000 0 33201  4255
-  1  25  57 1.000 0 33201  3697
-  1  23  56 1.000 0 33201  3689
-  1   6  72 1.000 0 30399   880
-  1  17  17 1.000 0 33201  1174
-  1   8  67 1.000 0 33201  3752
-  1   2  46 1.000 0 33201    20
-  1   8  70 1.000 0 33201  3780
-  1   9  67 1.000 0 33201  3758
-  1   7  70 1.000 0 33201  3779
-  1   6  67 1.000 0 33201  3725
-  1  21  51 1.000 0 30399   421
-  1   8  68 1.000 0 33201  3797
-  1   6  69 1.000 0 33201  3806
-  1   6  70 1.000 0 33201  3774
-  1  10  70 1.000 0 33201  3786
-  1  37  21 1.000 0 33201  1469
-  1   4  65 1.000 0 33106  2767
-  1   7  69 1.000 0 33201  3807
-  1  50  93 1.000 0 33201  4751
-  1  37  88 1.000 0 33201  4752
-  1  20  87 1.000 0 33106  2844
-  1  10  67 1.000 0 33201  3766
-  1   7  67 1.000 0 33201  3739
-  1  18  56 1.000 0 33201  3440
-  1  47  86 1.000 0 33201  4460
-  1   9  79 1.000 0 30399   317
-  1  46  94 1.000 0 33201  4740
-  1  36  88 1.000 0 33201  4753
-  1  50  94 1.000 0 33201  4745
-  1  24  54 1.000 0 30399   391
-  1   6  66 1.000 0 33201  3835
-  1  23  92 1.000 0 33106  2862
-  1  20  16 1.000 0 33201  1247
-  1  50  98 1.000 0 33201  4773
-  1  20  30 1.000 0 33201   979
-  1  49  98 1.000 0 33201  4766
-  1  37  89 1.000 0 33201  4768
-  1  11  30 1.000 0 33201   989
-  1  49  94 1.000 0 33201  4743
-  1  40  62 1.000 0 33106  2814
-  1  15  85 1.000 0 33106  2985
-  1  37   5 1.000 0 33201   660
-  1  25  11 1.000 0 33201  1388
-  1  18  54 1.000 0 30399   503
-  1  19  20 1.000 0 33201  1236
-  1  40   4 1.000 0 33201   681
-  1  20  55 1.000 0 30399   478
-  1  40   5 1.000 0 33201   685
-  1  10  25 1.000 0 30399   373
-  1   8  26 1.000 0 33106  2337
-  1  22  55 1.000 0 30399   381
-  1  25  14 1.000 0 33201  1387
-  1  25  53 1.000 0 30399   408
-  1  49  97 1.000 0 33201  4670
-  1  14  17 1.000 0 30399   942
-  1  24  55 1.000 0 30399   383
-  1  14  41 1.000 0 33201   449
-  1   1  50 1.000 0 33201   197
-  1   1  48 1.000 0 33201   186
-  1   9  27 1.000 0 33106  2348
-  1  43  91 1.000 0 33201  5157
-  1  22  54 1.000 0 30399   387
-  1  30  47 1.000 0 33201   382
-  1  12  60 1.000 0 33201  3417
-  1  31  49 1.000 0 33106  2272
-  1   9  73 1.000 0 30399   691
-  1  44   5 1.000 0 33201  1926
-  1   6  43 1.000 0 33201   432
-  1  22  53 1.000 0 30399   396
-  1  14  44 1.000 0 33201   450
-  1   2  47 1.000 0 33201    27
-  1  25  54 1.000 0 30399   392
-  1  21  53 1.000 0 30399   395
-  1  31  94 1.000 0 33201  4685
-  1  23  52 1.000 0 30399   415
-  1  21  54 1.000 0 30399   385
-  1  21  52 1.000 0 30399   413
-  1  23  53 1.000 0 30399   399
-  1  30  48 1.000 0 33201   381
-  1  24  51 1.000 0 30399   424
-  1  43  40 1.000 0 33106  2053
-  1  25  51 1.000 0 30399   425
-  1  14  16 1.000 0 30399   931
-  1  31  46 1.000 0 33106  2261
-  1  23  59 1.000 0 33201  3678
-  1  23  55 1.000 0 30399   382
-  1  23  54 1.000 0 30399   389
-  1  24  58 1.000 0 33201  3673
-  1  25  59 1.000 0 33201  3680
-  1  24  52 1.000 0 30399   416
-  1  10  68 1.000 0 33201  3799
-  1   6  68 1.000 0 33201  3792
-  1  25  52 1.000 0 30399   418
-  1   9  70 1.000 0 33201  3785
-  1  25  58 1.000 0 33201  3674
-  1  23  51 1.000 0 30399   423
-  1  22  51 1.000 0 30399   422
-  1   9  68 1.000 0 33201  3798
-  1  17  38 1.000 0 33201   734
-  1  16  37 1.000 0 33201   742
-  1  14  32 1.000 0 33201   888
-  1   5  64 1.000 0 33106  2766
-  1   5  62 1.000 0 33106  2776
-  1  15  27 1.000 0 33201   996
-  1  13  26 1.000 0 33201  1003
-  1  42  36 1.000 0 33106  2075
-  1  13  30 1.000 0 33201  1004
-  1  13  27 1.000 0 33201  1002
-  1  39  62 1.000 0 33106  2810
-  1  22  52 1.000 0 30399   414
-  1   1  46 1.000 0 33201   194
-  1   4  37 1.000 0 30399   941
-  1  21  55 1.000 0 30399   369
-  1  48  89 1.000 0 33201  4466
-  1  40  96 1.000 0 33106  2906
-  1  24  53 1.000 0 30399   404
-  1  19  53 1.000 0 30399   510
-  1  19  52 1.000 0 30399   518
-  1  16  53 1.000 0 30399   507
-  1   8  66 1.000 0 33201  3848
-  1  20  53 1.000 0 30399   511
-  1  16  55 1.000 0 30399   471
-  1  25  55 1.000 0 30399   384
-  1  17  55 1.000 0 30399   472
-  1  20  51 1.000 0 30399   534
-  1  18  53 1.000 0 30399   509
-  1  16  54 1.000 0 30399   480
-  1  16  52 1.000 0 30399   512
-  1  19  55 1.000 0 30399   475
-  1  17  51 1.000 0 30399   524
-  1  25  13 1.000 0 33201  1395
-  1  17  52 1.000 0 30399   513
-  1  10  66 1.000 0 33201  3863
-  1  20  52 1.000 0 30399   521
-  1   9  66 1.000 0 33201  3873
-  1  17  53 1.000 0 30399   508
-  1  18  51 1.000 0 30399   525
-  1  16  51 1.000 0 30399   523
-  1  20  54 1.000 0 30399   506
-  1  18  55 1.000 0 30399   474
-  1  23  13 1.000 0 33201  1355
-  1  17  54 1.000 0 30399   497
-  1  39   4 1.000 0 33201   691
-  1  19  54 1.000 0 30399   505
-  1  18  52 1.000 0 30399   514
-  1  25  15 1.000 0 33201  1404
-  1  32  46 1.000 0 33106  2263
-  1  45   1 1.000 0 33201  2092
-  1   4  63 1.000 0 33106  2780
-  1   9  46 1.000 0 33201   307
-  1  16  22 1.000 0 33201  1160
-  1  19  51 1.000 0 30399   533
-  1  35  32 1.000 0 33201  1057
-  1  16  21 1.000 0 33201  1161
-  1  32  50 1.000 0 33106  2267
-  1  16  23 1.000 0 33201  1159
-  1  32  49 1.000 0 33106  2266
-  1  32  47 1.000 0 33106  2264
-  1  33  42 1.000 0 33201   387
-  1   9  47 1.000 0 33201   306
-  1  33  41 1.000 0 33201   388
-  1  11  46 1.000 0 33201   302
-  1  11  79 1.000 0 33201  4107
-  1   5  46 1.000 0 33201   185
-  1  35  34 1.000 0 33201  1054
-  1  26  35 1.000 0 33201  1038
-  1  32  32 1.000 0 33201  1062
-  1  11  42 1.000 0 33201   427
-  1  38  45 1.000 0 33106  2081
-  1   6  41 1.000 0 33201   435
-  1  15  18 1.000 0 30399   435
-  1  11  49 1.000 0 33201   299
-  1  35  50 1.000 0 33106  2288
-  1  12  80 1.000 0 33201  4134
-  1  11  41 1.000 0 33201   425
-  1   5  48 1.000 0 33201   176
-  1  11  45 1.000 0 33201   429
-  1  22  29 1.000 0 33201  1170
-  1   5  47 1.000 0 33201   179
-  1  11  47 1.000 0 33201   298
-  1  11  44 1.000 0 33201   423
-  1   7  29 1.000 0 33106  2124
-  1  28  49 1.000 0 33201   361
-  1   2  49 1.000 0 33201   100
-  1   8  29 1.000 0 33106  2340
-  1  14  19 1.000 0 30399   870
-  1   8  28 1.000 0 33106  2339
-  1   4  36 1.000 0 30399   944
-  1   2  50 1.000 0 33201   108
-  1  15  44 1.000 0 33201   456
-  1  10  41 1.000 0 33201   445
-  1   9  42 1.000 0 33201   439
-  1  10  42 1.000 0 33201   444
-  1  19  42 1.000 0 33201   715
-  1  19  41 1.000 0 33201   716
-  1  39   8 1.000 0 33201  1887
-  1  28  48 1.000 0 33201   360
-  1  43   4 1.000 0 33201  1974
-  1  50   1 1.000 0 33201  1096
-  1  38  43 1.000 0 33106  2083
-  1  46   1 1.000 0 33201  1134
-  1  45   2 1.000 0 33201  2086
-  1  28  67 1.000 0 33201  4076
-  1  50   3 1.000 0 33201  1082
-  1  50   2 1.000 0 33201  1085
-  1  45   3 1.000 0 33201  2059
-  1  50   4 1.000 0 33201  1099
-  1  14  57 1.000 0 33201  3396
-  1  47   2 1.000 0 33201  1294
-  1  14  59 1.000 0 33201  3402
-  1  47  68 1.000 0 33106  3022
-  1  22  57 1.000 0 33201  3694
-  1  15  59 1.000 0 33201  3403
-  1  14  43 1.000 0 33201   447
-  1   9  43 1.000 0 33201   438
-  1  12  56 1.000 0 33201  3408
-  1  24  59 1.000 0 33201  3679
-  1  46   3 1.000 0 33201  1121
-  1  46   4 1.000 0 33201  1101
-  1  47   1 1.000 0 33201  1293
-  1  47   4 1.000 0 33201  1292
-  1  11  58 1.000 0 33201  3412
-  1  46   2 1.000 0 33201  1128
-  1  50   5 1.000 0 33201  1081
-  1  29  72 1.000 0 33201  4070
-  1   6  29 1.000 0 33106  2095
-  1   4  58 1.000 0 33201  3630
-  1  27  83 1.000 0 33201  4597
-  1   5  58 1.000 0 33201  3632
-  1  46  19 1.000 0 33201  1646
-  1  49   2 1.000 0 33201  1278
-  1   5  59 1.000 0 33201  3619
-  1  50  16 1.000 0 33201  1659
-  1  43   2 1.000 0 33201  1976
-  1  49   4 1.000 0 33201  1285
-  1  13  58 1.000 0 33201  3414
-  1   2  58 1.000 0 33201  3666
-  1  11  32 1.000 0 33201   829
-  1  15  57 1.000 0 33201  3397
-  1  26  82 1.000 0 33201  4596
-  1  29  81 1.000 0 33201  4607
-  1  26  95 1.000 0 33106  2966
-  1  48  19 1.000 0 33201  1651
-  1   5  61 1.000 0 33106  2774
-  1   7  59 1.000 0 33201  3376
-  1   8  60 1.000 0 33201  3364
-  1  34  84 1.000 0 33201  4639
-  1  10  58 1.000 0 33201  3390
-  1  41   1 1.000 0 33201  2005
-  1   6  56 1.000 0 33201  3370
-  1  15  16 1.000 0 30399   537
-  1   6  26 1.000 0 33106  2110
-  1  11  60 1.000 0 33201  3420
-  1   8  56 1.000 0 33201  3372
-  1   6  60 1.000 0 33201  3391
-  1   7  60 1.000 0 33201  3363
-  1  42   2 1.000 0 33201  1908
-  1  35  49 1.000 0 33106  2287
-  1  14  60 1.000 0 33201  3405
-  1   7  57 1.000 0 33201  3383
-  1  15  60 1.000 0 33201  3404
-  1   9  57 1.000 0 33201  3385
-  1   7  58 1.000 0 33201  3361
-  1  13  59 1.000 0 33201  3401
-  1   5  65 1.000 0 33106  2768
-  1  41  22 1.000 0 33201  1416
-  1  22  72 1.000 0 33201  3992
-  1  41   2 1.000 0 33201  2003
-  1  11  35 1.000 0 33201   825
-  1  13  32 1.000 0 33201   834
-  1  12  57 1.000 0 33201  3393
-  1  41  21 1.000 0 33201  1414
-  1  41  43 1.000 0 33106  2052
-  1   8  58 1.000 0 33201  3362
-  1  15  17 1.000 0 30399   535
-  1  18  32 1.000 0 33201   849
-  1  10  60 1.000 0 33201  3368
-  1  24  72 1.000 0 33201  3994
-  1   5  54 1.000 0 33201  3534
-  1  42   1 1.000 0 33201  1905
-  1   9  60 1.000 0 33201  3365
-  1  36  94 1.000 0 33201  5128
-  1  11  59 1.000 0 33201  3399
-  1   6  57 1.000 0 33201  3382
-  1   3  54 1.000 0 33201  3551
-  1   3  53 1.000 0 33201  3496
-  1   4  54 1.000 0 33201  3546
-  1   2  54 1.000 0 33201  3563
-  1  14  56 1.000 0 33201  3410
-  1   6  59 1.000 0 33201  3375
-  1  10  59 1.000 0 33201  3380
-  1  10  57 1.000 0 33201  3386
-  1  14  18 1.000 0 30399   872
-  1  13  31 1.000 0 33201   835
-  1  17  42 1.000 0 33201   709
-  1  18  33 1.000 0 33201   847
-  1  13  33 1.000 0 33201   833
-  1  15  40 1.000 0 33201   607
-  1  15  39 1.000 0 33201   611
-  1   2  48 1.000 0 33201    11
-  1  41  25 1.000 0 33201  1419
-  1  13  34 1.000 0 33201   832
-  1  15  36 1.000 0 33201   608
-  1  47  18 1.000 0 33201  1642
-  1   8  59 1.000 0 33201  3377
-  1  12  59 1.000 0 33201  3400
-  1  15  37 1.000 0 33201   609
-  1   7  56 1.000 0 33201  3371
-  1   8  57 1.000 0 33201  3384
-  1  10  40 1.000 0 33201   612
-  1  10  38 1.000 0 33201   613
-  1  12  58 1.000 0 33201  3413
-  1  41  24 1.000 0 33201  1418
-  1   9  56 1.000 0 33201  3373
-  1   9  58 1.000 0 33201  3387
-  1  23  72 1.000 0 33201  3993
-  1  21  72 1.000 0 33201  3991
-  1  18  87 1.000 0 33106  2842
-  1   6  58 1.000 0 33201  3360
-  1  10  56 1.000 0 33201  3374
-  1  13  60 1.000 0 33201  3406
-  1   9  69 1.000 0 33201  3829
-  1   9  59 1.000 0 33201  3378
-  1  29  82 1.000 0 33201  4591
-  1  30  82 1.000 0 33201  4593
-  1  38  42 1.000 0 33106  2087
-  1  35  84 1.000 0 33201  4641
-  1   7  27 1.000 0 33106  2333
-  1  37   8 1.000 0 33201  1881
-  1  33  84 1.000 0 33201  4638
-  1  33  83 1.000 0 33201  4644
-  1  28  81 1.000 0 33201  4606
-  1  37   9 1.000 0 33201  1880
-  1  31  84 1.000 0 33201  4636
-  1  18  16 1.000 0 33201   968
-  1  46   5 1.000 0 33201  1165
-  1  30  93 1.000 0 33106  2941
-  1  33  69 1.000 0 33201  3861
-  1  35  95 1.000 0 33201  4239
-  1  18  17 1.000 0 33201   969
-  1  10  24 1.000 0 30399   377
-  1   3  45 1.000 0 33201   763
-  1  48  99 1.000 0 33201  4700
-  1  30  81 1.000 0 33201  4608
-  1   2  43 1.000 0 33201   769
-  1  37   6 1.000 0 33201  1884
-  1  32  84 1.000 0 33201  4637
-  1  31  67 1.000 0 33201  3853
-  1  19  18 1.000 0 33201  1233
-  1  31  83 1.000 0 33201  4642
-  1  32  83 1.000 0 33201  4643
-  1  30  72 1.000 0 33201  4072
-  1  17  19 1.000 0 33201  1166
-  1  18  18 1.000 0 33201   999
-  1  28  92 1.000 0 33106  2952
-  1  14  22 1.000 0 33201   399
-  1   8  27 1.000 0 33106  2338
-  1  15  24 1.000 0 33201   414
-  1  33  70 1.000 0 33201  3856
-  1  23  66 1.000 0 33201  3815
-  1   3  42 1.000 0 33201   752
-  1  37  84 1.000 0 33201  3841
-  1  35  69 1.000 0 33201  3864
-  1  43   3 1.000 0 33201  1975
-  1  48  16 1.000 0 33201  1654
-  1  41  58 1.000 0 33106  2754
-  1  37   7 1.000 0 33201  1883
-  1  29  83 1.000 0 33201  4599
-  1   7  28 1.000 0 33106  2334
-  1  35  83 1.000 0 33201  4646
-  1  11  57 1.000 0 33201  3398
-  1  13  56 1.000 0 33201  3409
-  1  48  17 1.000 0 33201  1653
-  1  45   4 1.000 0 33201  2043
-  1  13  57 1.000 0 33201  3394
-  1  36  53 1.000 0 33106  2717
-  1  20  74 1.000 0 33201  3976
-  1   6  27 1.000 0 33106  2103
-  1  27  81 1.000 0 33201  4605
-  1  28  82 1.000 0 33201  4590
-  1  27  92 1.000 0 33106  2951
-  1   6  28 1.000 0 33106  2096
-  1  27  82 1.000 0 33201  4589
-  1  30  83 1.000 0 33201  4601
-  1   1  52 1.000 0 33201  3481
-  1   1  53 1.000 0 33201  3509
-  1  26  83 1.000 0 33201  4603
-  1  15  58 1.000 0 33201  3416
-  1  14  58 1.000 0 33201  3415
-  1  49  25 1.000 0 33201  1347
-  1  47  20 1.000 0 33201  1645
-  1  48  20 1.000 0 33201  1655
-  1  26  81 1.000 0 33201  4604
-  1  11  56 1.000 0 33201  3407
-  1  15  56 1.000 0 33201  3411
-  1  36  73 1.000 0 33201  3636
-  1  20  17 1.000 0 33201  1255
-  1  26  17 1.000 0 33201  1598
-  1  38  84 1.000 0 33201  3839
-  1  38  82 1.000 0 33201  3833
-  1  17  16 1.000 0 33201  1173
-  1  39  71 1.000 0 33201  3622
-  1  39   5 1.000 0 33201   694
-  1  19  17 1.000 0 33201  1209
-  1  37  74 1.000 0 33201  3631
-  1  43  70 1.000 0 33201  3907
-  1  37  97 1.000 0 33106  2912
-  1  18  86 1.000 0 33106  2850
-  1  28  19 1.000 0 33201  1601
-  1  35  19 1.000 0 33201  1567
-  1  32  17 1.000 0 33201  1554
-  1  32  18 1.000 0 33201  1555
-  1  31  19 1.000 0 33201  1557
-  1  32  16 1.000 0 33201  1553
-  1  32  20 1.000 0 33201  1556
-  1  31  16 1.000 0 33201  1558
-  1  16  35 1.000 0 33201   870
-  1  30  19 1.000 0 33201  1591
-  1  31  20 1.000 0 33201  1562
-  1  27  18 1.000 0 33201  1589
-  1  16  20 1.000 0 33201  1073
-  1  15  35 1.000 0 33201   857
-  1  30  16 1.000 0 33201  1592
-  1  32  95 1.000 0 33201  4226
-  1  31  95 1.000 0 33201  4221
-  1  27  17 1.000 0 33201  1588
-  1  45  18 1.000 0 33201  1684
-  1  33  95 1.000 0 33201  4227
-  1  44  38 1.000 0 33106  2043
-  1  18  20 1.000 0 33201  1010
-  1  28  18 1.000 0 33201  1604
-  1  26  19 1.000 0 33201  1596
-  1  38  38 1.000 0 33106  2071
-  1  42  16 1.000 0 33201  1669
-  1  26  18 1.000 0 33201  1599
-  1  34  19 1.000 0 33201  1570
-  1  18  39 1.000 0 33201   479
-  1  26  16 1.000 0 33201  1597
-  1  28  16 1.000 0 33201  1602
-  1  42  19 1.000 0 33201  1670
-  1  44  40 1.000 0 33106  2041
-  1  27  20 1.000 0 33201  1590
-  1  44  39 1.000 0 33106  2042
-  1   7  31 1.000 0 33201   893
-  1  28  17 1.000 0 33201  1603
-  1   7  32 1.000 0 33201   886
-  1  43  41 1.000 0 33106  2123
-  1  38  36 1.000 0 33106  2377
-  1  38  37 1.000 0 33106  2084
-  1   7  54 1.000 0 33201  3288
-  1  40  40 1.000 0 33106  2366
-  1  42  20 1.000 0 33201  1666
-  1  36  49 1.000 0 33106  2030
-  1  28  20 1.000 0 33201  1605
-  1  41  17 1.000 0 33201  1663
-  1  29  18 1.000 0 33201  1583
-  1  42  17 1.000 0 33201  1668
-  1  43  17 1.000 0 33201  1678
-  1  44  16 1.000 0 33201  1674
-  1  36  48 1.000 0 33106  2031
-  1  41  16 1.000 0 33201  1664
-  1  29  17 1.000 0 33201  1582
-  1  27  16 1.000 0 33201  1586
-  1   7  43 1.000 0 33201   465
-  1  36  50 1.000 0 33106  2034
-  1  45  17 1.000 0 33201  1688
-  1  44  19 1.000 0 33201  1675
-  1  30  20 1.000 0 33201  1595
-  1  34  20 1.000 0 33201  1574
-  1  34  16 1.000 0 33201  1571
-  1  31  18 1.000 0 33201  1561
-  1  35  20 1.000 0 33201  1563
-  1  35  16 1.000 0 33201  1564
-  1  32  19 1.000 0 33201  1552
-  1  35  18 1.000 0 33201  1566
-  1  26  20 1.000 0 33201  1600
-  1  31  17 1.000 0 33201  1559
-  1  30  17 1.000 0 33201  1593
-  1   7  42 1.000 0 33201   467
-  1  30  18 1.000 0 33201  1594
-  1  42  18 1.000 0 33201  1667
-  1  27  19 1.000 0 33201  1585
-  1  41  20 1.000 0 33201  1665
-  1  41  18 1.000 0 33201  1662
-  1   7  41 1.000 0 33201   468
-  1  34  17 1.000 0 33201  1572
-  1  29  20 1.000 0 33201  1584
-  1  34  18 1.000 0 33201  1573
-  1  13  36 1.000 0 33201   639
-  1   9  37 1.000 0 33201   632
-  1  13  38 1.000 0 33201   636
-  1  12  39 1.000 0 33201   659
-  1  13  37 1.000 0 33201   638
-  1  46  17 1.000 0 33201  1648
-  1  46  16 1.000 0 33201  1649
-  1  14  40 1.000 0 33201   652
-  1   6  51 1.000 0 33201  3294
-  1   9  52 1.000 0 33201  3283
-  1  46 100 1.000 0 33201  4558
-  1   8  54 1.000 0 33201  3287
-  1   8  51 1.000 0 33201  3293
-  1   9  31 1.000 0 33201   960
-  1   7  34 1.000 0 33201   881
-  1  47  97 1.000 0 33201  4647
-  1  21  15 1.000 0 33201  1569
-  1   7  51 1.000 0 33201  3290
-  1   9  35 1.000 0 33201   961
-  1  13  40 1.000 0 33201   635
-  1  47 100 1.000 0 33201  4526
-  1  21  11 1.000 0 33201  1560
-  1   7  35 1.000 0 33201   899
-  1   9  32 1.000 0 33201   959
-  1  37  39 1.000 0 33106  2082
-  1  21  12 1.000 0 33201  1624
-  1  49 100 1.000 0 33201  4594
-  1  21  14 1.000 0 33201  1568
-  1   9  54 1.000 0 33201  3286
-  1  23  20 1.000 0 33201  1623
-  1  33  20 1.000 0 33201  1575
-  1  41  94 1.000 0 33201  5183
-  1  33  18 1.000 0 33201  1578
-  1  13  22 1.000 0 33201   300
-  1  33  17 1.000 0 33201  1577
-  1  44  94 1.000 0 33201  5186
-  1  35  17 1.000 0 33201  1565
-  1  33  19 1.000 0 33201  1579
-  1  33  16 1.000 0 33201  1576
-  1  38   5 1.000 0 33201   668
-  1  13  23 1.000 0 33201   268
-  1  43  93 1.000 0 33201  5165
-  1  49  20 1.000 0 33201  1640
-  1  11  25 1.000 0 33201    53
-  1  13  21 1.000 0 33201   301
-  1  41  92 1.000 0 33201  5168
-  1  43  94 1.000 0 33201  5185
-  1  44  92 1.000 0 33201  5173
-  1  45  92 1.000 0 33201  5174
-  1  41  93 1.000 0 33201  5161
-  1  11  23 1.000 0 33201    78
-  1  46  20 1.000 0 33201  2377
-  1  42  94 1.000 0 33201  5184
-  1  13  25 1.000 0 33201   224
-  1  42  92 1.000 0 33201  5171
-  1  21  27 1.000 0 33201  1163
-  1  25  23 1.000 0 33201  1357
-  1  37  46 1.000 0 33106  2028
-  1  25  26 1.000 0 33201  1186
-  1  25  27 1.000 0 33201  1184
-  1  18  23 1.000 0 33201  1178
-  1  18  21 1.000 0 33201  1180
-  1  22  26 1.000 0 33201  1175
-  1  22  28 1.000 0 33201  1171
-  1  50  23 1.000 0 33201  1550
-  1  25  24 1.000 0 33201  1354
-  1  25  29 1.000 0 33201  1182
-  1  45  19 1.000 0 33201  1689
-  1  25  28 1.000 0 33201  1183
-  1  15  78 1.000 0 33201  4176
-  1  41  40 1.000 0 33106  2116
-  1  45  93 1.000 0 33201  5167
-  1  22  27 1.000 0 33201  1172
-  1  22  22 1.000 0 33201  1364
-  1  25  22 1.000 0 33201  1358
-  1  43  18 1.000 0 33201  1677
-  1  43  92 1.000 0 33201  5172
-  1  42  93 1.000 0 33201  5164
-  1   2  55 1.000 0 33201  3450
-  1   3  55 1.000 0 33201  3453
-  1  44  93 1.000 0 33201  5166
-  1  35  94 1.000 0 33201  4380
-  1  50  25 1.000 0 33201  1551
-  1   5  53 1.000 0 33201  3493
-  1  46  18 1.000 0 33201  1647
-  1  49  19 1.000 0 33201  1634
-  1  43  20 1.000 0 33201  1676
-  1  11  24 1.000 0 33201    67
-  1  43  19 1.000 0 33201  1680
-  1  14  38 1.000 0 33201   649
-  1   8  40 1.000 0 33201   641
-  1  11  37 1.000 0 33201   664
-  1  12  40 1.000 0 33201   658
-  1  22  21 1.000 0 33201  1365
-  1  22  24 1.000 0 33201  1362
-  1  14  37 1.000 0 33201   650
-  1  11  40 1.000 0 33201   661
-  1  12  37 1.000 0 33201   654
-  1  25  30 1.000 0 33201  1181
-  1  44  20 1.000 0 33201  1671
-  1  22  23 1.000 0 33201  1363
-  1  38  16 1.000 0 33201  1706
-  1  18  24 1.000 0 33201  1177
-  1  11  38 1.000 0 33201   662
-  1  36  47 1.000 0 33106  2032
-  1  38  19 1.000 0 33201  1705
-  1   8  37 1.000 0 33201   643
-  1   8  38 1.000 0 33201   642
-  1  12  36 1.000 0 33201   655
-  1  22  25 1.000 0 33201  1361
-  1   8  36 1.000 0 33201   646
-  1  14  36 1.000 0 33201   651
-  1  14  39 1.000 0 33201   648
-  1  12  38 1.000 0 33201   653
-  1   8  39 1.000 0 33201   647
-  1   4  53 1.000 0 33201  3495
-  1  43  16 1.000 0 33201  1679
-  1  32  43 1.000 0 33201   396
-  1  32  42 1.000 0 33201   397
-  1  35  42 1.000 0 33201   392
-  1  35  44 1.000 0 33201   394
-  1  32  45 1.000 0 33201   395
-  1  10  37 1.000 0 33201   614
-  1  13  39 1.000 0 33201   640
-  1   9  36 1.000 0 33201   633
-  1   9  40 1.000 0 33201   629
-  1   6  40 1.000 0 33201   623
-  1   6  39 1.000 0 33201   628
-  1  37  49 1.000 0 33106  2029
-  1   6  38 1.000 0 33201   625
-  1   6  37 1.000 0 33201   626
-  1   9  39 1.000 0 33201   634
-  1   9  38 1.000 0 33201   630
-  1   6  36 1.000 0 33201   627
-  1  10  39 1.000 0 33201   616
-  1  10  36 1.000 0 33201   615
-  1  44  12 1.000 0 33201  1767
-  1  44  13 1.000 0 33201  1766
-  1   6  30 1.000 0 33106  2085
-  1  31  42 1.000 0 33201   404
-  1  45  11 1.000 0 33201  1754
-  1  35  41 1.000 0 33201   393
-  1  31  44 1.000 0 33201   402
-  1  31  41 1.000 0 33201   405
-  1  48  15 1.000 0 33201  1717
-  1  47  36 1.000 0 33106  2078
-  1  42  24 1.000 0 33201  1422
-  1  44  11 1.000 0 33201  1768
-  1  42  23 1.000 0 33201  1423
-  1  50  11 1.000 0 33201  1738
-  1  13  35 1.000 0 33201   831
-  1  11  33 1.000 0 33201   827
-  1  18  31 1.000 0 33201   851
-  1  48  14 1.000 0 33201  1718
-  1  48  12 1.000 0 33201  1720
-  1  33  23 1.000 0 33201  1447
-  1  41  23 1.000 0 33201  1417
-  1  18  35 1.000 0 33201   844
-  1  49  37 1.000 0 33106  2065
-  1  33  24 1.000 0 33201  1446
-  1  20  32 1.000 0 33201   841
-  1  26  29 1.000 0 33201  1222
-  1  20  34 1.000 0 33201   838
-  1  18  34 1.000 0 33201   845
-  1  19  31 1.000 0 33201   883
-  1  20  33 1.000 0 33201   839
-  1  16  36 1.000 0 33201   743
-  1  20  35 1.000 0 33201   837
-  1  42  25 1.000 0 33201  1420
-  1  19  40 1.000 0 33201   747
-  1  19  36 1.000 0 33201   738
-  1  20  31 1.000 0 33201   843
-  1  14  35 1.000 0 33201   884
-  1  42  37 1.000 0 33106  2074
-  1  20  39 1.000 0 33201   726
-  1  30  29 1.000 0 33201  1251
-  1  15  31 1.000 0 33201   864
-  1  12  26 1.000 0 33201   965
-  1  30  28 1.000 0 33201  1252
-  1  16  30 1.000 0 33201   974
-  1  16  29 1.000 0 33201   975
-  1  30  27 1.000 0 33201  1253
-  1  12  33 1.000 0 33201   854
-  1  17  28 1.000 0 33201   971
-  1  31  48 1.000 0 33106  2271
-  1  12  34 1.000 0 33201   853
-  1  12  32 1.000 0 33201   855
-  1  42  42 1.000 0 33106  2066
-  1  17  29 1.000 0 33201   970
-  1  12  31 1.000 0 33201   856
-  1  41   5 1.000 0 33201  1994
-  1  17  27 1.000 0 33201   972
-  1  12  27 1.000 0 33201   964
-  1  10  21 1.000 0 30399   417
-  1  12  30 1.000 0 33201   962
-  1  16  28 1.000 0 33201   976
-  1  12  28 1.000 0 33201   963
-  1  42   3 1.000 0 33201  1909
-  1  17  30 1.000 0 33201   967
-  1  49   1 1.000 0 33201  1281
-  1  48   2 1.000 0 33201   935
-  1  19  26 1.000 0 33201   988
-  1  37  24 1.000 0 33201  1468
-  1  17  33 1.000 0 33201   867
-  1  11  28 1.000 0 33201   990
-  1  18  37 1.000 0 33201   433
-  1  17  40 1.000 0 33201   731
-  1  17  37 1.000 0 33201   555
-  1   9  24 1.000 0 30399   921
-  1   9  25 1.000 0 30399   811
-  1   4  61 1.000 0 33106  2769
-  1  11  31 1.000 0 33201   830
-  1  20  40 1.000 0 33201   740
-  1  17  39 1.000 0 33201   644
-  1  48   4 1.000 0 33201   924
-  1  31  47 1.000 0 33106  2254
-  1  19  37 1.000 0 33201   737
-  1  12  29 1.000 0 33201   966
-  1  42  41 1.000 0 33106  2067
-  1  17  31 1.000 0 33201   869
-  1  14  28 1.000 0 33201  1008
-  1  17  34 1.000 0 33201   866
-  1  33  50 1.000 0 33106  2260
-  1  15  29 1.000 0 33201   998
-  1  48   1 1.000 0 33201   943
-  1  33  49 1.000 0 33106  2259
-  1   7  37 1.000 0 33201   619
-  1  18  36 1.000 0 33201   454
-  1   7  36 1.000 0 33201   620
-  1   7  40 1.000 0 33201   621
-  1  33  48 1.000 0 33106  2257
-  1  33  46 1.000 0 33106  2252
-  1  19  28 1.000 0 33201   986
-  1  33  47 1.000 0 33106  2253
-  1  48   3 1.000 0 33201   932
-  1  48   5 1.000 0 33201   950
-  1  19  27 1.000 0 33201   987
-  1  19  29 1.000 0 33201   985
-  1  49   5 1.000 0 33201  1284
-  1  49   3 1.000 0 33201  1274
-  1  16  26 1.000 0 33201   978
-  1  44   2 1.000 0 33201  1945
-  1  44   1 1.000 0 33201  1948
-  1  34  50 1.000 0 33106  2268
-  1  20  27 1.000 0 33201   982
-  1  20  26 1.000 0 33201   983
-  1  16  27 1.000 0 33201   977
-  1  19  30 1.000 0 33201   984
-  1  20  28 1.000 0 33201   981
-  1  17  26 1.000 0 33201   973
-  1  36  23 1.000 0 33201  1463
-  1   5  36 1.000 0 30399   855
-  1  37  25 1.000 0 33201  1467
-  1  19  39 1.000 0 33201   739
-  1  18  38 1.000 0 33201   426
-  1  18  40 1.000 0 33201   675
-  1  38  28 1.000 0 33201  1213
-  1  36  30 1.000 0 33201  1273
-  1  38  27 1.000 0 33201  1214
-  1  36  24 1.000 0 33201  1465
-  1  36  21 1.000 0 33201  1460
-  1  47  14 1.000 0 33201  1724
-  1  33  25 1.000 0 33201  1445
-  1  46  12 1.000 0 33201  1742
-  1  47  15 1.000 0 33201  1722
-  1  10  22 1.000 0 30399   412
-  1  36  28 1.000 0 33201  1276
-  1  47  13 1.000 0 33201  1726
-  1  43  25 1.000 0 33201  1444
-  1  43  23 1.000 0 33201  1442
-  1  32  22 1.000 0 33201  1456
-  1  46  13 1.000 0 33201  1741
-  1   9  22 1.000 0 30399   945
-  1  31  43 1.000 0 33201   406
-  1   9  23 1.000 0 30399   924
-  1  46  14 1.000 0 33201  1740
-  1  48  11 1.000 0 33201  1721
-  1  50  14 1.000 0 33201  1735
-  1  29  19 1.000 0 33201  1580
-  1  44  21 1.000 0 33201  1426
-  1  43  22 1.000 0 33201  1441
-  1  29  16 1.000 0 33201  1581
-  1  43  24 1.000 0 33201  1443
-  1  48  13 1.000 0 33201  1719
-  1  49  15 1.000 0 33201  1729
-  1  45  25 1.000 0 33201  1438
-  1  34  24 1.000 0 33201  1472
-  1  42  38 1.000 0 33106  2073
-  1  43  39 1.000 0 33106  2054
-  1  16  38 1.000 0 33201   754
-  1  14  26 1.000 0 33201  1006
-  1  20  38 1.000 0 33201   741
-  1   4  62 1.000 0 33106  2775
-  1  34  23 1.000 0 33201  1473
-  1  19  38 1.000 0 33201   748
-  1  20  36 1.000 0 33201   724
-  1  14  30 1.000 0 33201  1009
-  1  38  29 1.000 0 33201  1212
-  1  11  27 1.000 0 33201   991
-  1  11  26 1.000 0 33201   992
-  1  17  32 1.000 0 33201   868
-  1  11  36 1.000 0 33201   665
-  1  13  29 1.000 0 33201  1000
-  1  11  29 1.000 0 33201   993
-  1  49  36 1.000 0 33106  2007
-  1  37  28 1.000 0 33201  1207
-  1  35  26 1.000 0 33201  1272
-  1  17  36 1.000 0 33201   622
-  1  14  29 1.000 0 33201  1005
-  1  40   6 1.000 0 33201  1900
-  1  16  39 1.000 0 33201   746
-  1  38   8 1.000 0 33201  1903
-  1  13  28 1.000 0 33201  1001
-  1  20  37 1.000 0 33201   719
-  1  38   9 1.000 0 33201  1902
-  1  16  40 1.000 0 33201   751
-  1  40   9 1.000 0 33201  1897
-  1  35  27 1.000 0 33201  1271
-  1   5  37 1.000 0 30399   868
-  1  40  10 1.000 0 33201  1896
-  1  11  39 1.000 0 33201   666
-  1  46  10 1.000 0 33201  1913
-  1  18  28 1.000 0 33201  1013
-  1  46   6 1.000 0 33201  1907
-  1  38   7 1.000 0 33201  1904
-  1  38   6 1.000 0 33201  1906
-  1  38  10 1.000 0 33201  1901
-  1  46  15 1.000 0 33201  1739
-  1  42  39 1.000 0 33106  2072
-  1  10  23 1.000 0 30399   407
-  1  33  22 1.000 0 33201  1448
-  1  32  21 1.000 0 33201  1457
-  1  36  25 1.000 0 33201  1466
-  1  45  12 1.000 0 33201  1755
-  1  43  21 1.000 0 33201  1439
-  1  32  23 1.000 0 33201  1455
-  1  32  24 1.000 0 33201  1454
-  1  34  45 1.000 0 33201   411
-  1  33  21 1.000 0 33201  1449
-  1  49  14 1.000 0 33201  1730
-  1  49  12 1.000 0 33201  1732
-  1   4  40 1.000 0 30399   836
-  1   4  39 1.000 0 30399   937
-  1  49  13 1.000 0 33201  1731
-  1  44  25 1.000 0 33201  1430
-  1  50  15 1.000 0 33201  1734
-  1  43  37 1.000 0 33106  2057
-  1  44  22 1.000 0 33201  1427
-  1  50  12 1.000 0 33201  1737
-  1   9  21 1.000 0 30399   898
-  1  49  11 1.000 0 33201  1733
-  1  50  13 1.000 0 33201  1736
-  1  45  22 1.000 0 33201  1434
-  1  45  24 1.000 0 33201  1436
-  1  45  21 1.000 0 33201  1431
-  1  44  23 1.000 0 33201  1428
-  1  48   6 1.000 0 33201  1919
-  1  44  24 1.000 0 33201  1429
-  1  46   8 1.000 0 33201  1911
-  1  40   7 1.000 0 33201  1899
-  1  45  23 1.000 0 33201  1435
-  1  46   9 1.000 0 33201  1912
-  1  46   7 1.000 0 33201  1910
-  1  40   8 1.000 0 33201  1898
-  1   5  38 1.000 0 30399   840
-  1  42  13 1.000 0 33201  1751
-  1   9  26 1.000 0 33106  2347
-  1  42  12 1.000 0 33201  1752
-  1  47  11 1.000 0 33201  1728
-  1  42  11 1.000 0 33201  1753
-  1  44  15 1.000 0 33201  1764
-  1  48  38 1.000 0 33106  2080
-  1  48  39 1.000 0 33106  2079
-  1  32  41 1.000 0 33201   398
-  1  38  47 1.000 0 33106  2014
-  1  32  44 1.000 0 33201   400
-  1  36   8 1.000 0 33201  1892
-  1  49   9 1.000 0 33201  1917
-  1  31  45 1.000 0 33201   401
-  1  39   7 1.000 0 33201  1888
-  1  49   6 1.000 0 33201  1914
-  1  36   9 1.000 0 33201  1895
-  1  48   9 1.000 0 33201  1923
-  1  49   7 1.000 0 33201  1915
-  1  39   6 1.000 0 33201  1889
-  1  48   7 1.000 0 33201  1921
-  1  34  28 1.000 0 33201  1196
-  1  50  39 1.000 0 33106  2008
-  1  39   9 1.000 0 33201  1886
-  1  47   6 1.000 0 33201  1925
-  1  43  15 1.000 0 33201  1759
-  1  38  41 1.000 0 33106  2088
-  1  38  44 1.000 0 33106  2089
-  1  41  11 1.000 0 33201  1748
-  1  37  10 1.000 0 33201  1879
-  1  47  37 1.000 0 33106  2077
-  1  49  39 1.000 0 33106  2062
-  1  43  12 1.000 0 33201  1762
-  1  27  28 1.000 0 33201  1202
-  1  49  10 1.000 0 33201  1918
-  1  43  13 1.000 0 33201  1761
-  1  43  14 1.000 0 33201  1760
-  1  42   6 1.000 0 33201  1858
-  1  43  11 1.000 0 33201  1763
-  1  42  14 1.000 0 33201  1750
-  1   7  30 1.000 0 33106  2335
-  1  42  15 1.000 0 33201  1749
-  1  45  37 1.000 0 33106  2021
-  1  45  38 1.000 0 33106  2020
-  1  36  29 1.000 0 33201  1275
-  1  43  36 1.000 0 33106  2058
-  1  27  30 1.000 0 33201  1200
-  1  40  28 1.000 0 33201  1265
-  1  49   8 1.000 0 33201  1916
-  1  34  26 1.000 0 33201  1198
-  1  39  10 1.000 0 33201  1890
-  1  38  48 1.000 0 33106  2013
-  1  45  36 1.000 0 33106  2022
-  1  36  26 1.000 0 33201  1279
-  1  40  30 1.000 0 33201  1262
-  1  40  29 1.000 0 33201  1263
-  1  36  27 1.000 0 33201  1277
-  1  47   9 1.000 0 33201  1929
-  1  40  26 1.000 0 33201  1267
-  1  50  10 1.000 0 33201  1935
-  1  38  46 1.000 0 33106  2015
-  1  50   6 1.000 0 33201  1931
-  1  36  10 1.000 0 33201  1891
-  1  36   6 1.000 0 33201  1894
-  1   5  39 1.000 0 30399   953
-  1  34  27 1.000 0 33201  1197
-  1  50   9 1.000 0 33201  1934
-  1  50   8 1.000 0 33201  1933
-  1  40  27 1.000 0 33201  1266
-  1  36   7 1.000 0 33201  1893
-  1  48   8 1.000 0 33201  1922
-  1  50   7 1.000 0 33201  1932
-  1  37  27 1.000 0 33201  1208
-  1  37  29 1.000 0 33201  1206
-  1  29  27 1.000 0 33201  1227
-  1  29  30 1.000 0 33201  1230
-  1  33  27 1.000 0 33201  1235
-  1  38  30 1.000 0 33201  1211
-  1  32  30 1.000 0 33201  1238
-  1  33  28 1.000 0 33201  1234
-  1  29  26 1.000 0 33201  1226
-  1  32  26 1.000 0 33201  1243
-  1  33  26 1.000 0 33201  1237
-  1  33  30 1.000 0 33201  1231
-  1  27  29 1.000 0 33201  1201
-  1   4  38 1.000 0 30399   940
-  1  32  27 1.000 0 33201  1242
-  1  27  27 1.000 0 33201  1203
-  1  27  26 1.000 0 33201  1204
-  1  32  28 1.000 0 33201  1241
-  1  32  29 1.000 0 33201  1239
-  1  29  29 1.000 0 33201  1229
-  1  38  26 1.000 0 33201  1215
-  1  29  28 1.000 0 33201  1228
-  1  48  37 1.000 0 33106  2059
-  1  48  10 1.000 0 33201  1924
-  1  47   8 1.000 0 33201  1928
-  1  47   7 1.000 0 33201  1927
-  1  33  29 1.000 0 33201  1232
-  1  47  10 1.000 0 33201  1930
-  1   6  44 1.000 0 33201   434
-  1  33  44 1.000 0 33201   389
-  1  29  46 1.000 0 33201   375
-  1  35  43 1.000 0 33201   391
-  1   9  41 1.000 0 33201   440
-  1   5  50 1.000 0 33201   157
-  1  35  45 1.000 0 33201   390
-  1   5  49 1.000 0 33201   174
-  1   5  40 1.000 0 30399   935
-  1   6  42 1.000 0 33201   431
-  1   1  49 1.000 0 33201    43
-  1  33  45 1.000 0 33201   384
-  1  27  49 1.000 0 33201   369
-  1  10  45 1.000 0 33201   441
-  1  14  49 1.000 0 33201   270
-  1  12  47 1.000 0 33201   274
-  1  24  42 1.000 0 33201   689
-  1  46  37 1.000 0 33106  2049
-  1  10  47 1.000 0 33201   281
-  1  27  48 1.000 0 33201   370
-  1  24  41 1.000 0 33201   688
-  1  24  45 1.000 0 33201   686
-  1  10  49 1.000 0 33201   277
-  1  13  47 1.000 0 33201   230
-  1  25  43 1.000 0 33201   669
-  1  24  43 1.000 0 33201   687
-  1  21  41 1.000 0 33201   697
-  1  24  44 1.000 0 33201   690
-  1  15  32 1.000 0 33201   863
-  1  14  46 1.000 0 33201   284
-  1  26  46 1.000 0 33201   367
-  1  10  50 1.000 0 33201   276
-  1  12  48 1.000 0 33201   273
-  1  27  46 1.000 0 33201   372
-  1  21  45 1.000 0 33201   692
-  1  35  30 1.000 0 33201  1268
-  1  44  36 1.000 0 33106  2046
-  1  44  37 1.000 0 33106  2044
-  1  42  40 1.000 0 33106  2070
-  1  10  43 1.000 0 33201   443
-  1   9  44 1.000 0 33201   437
-  1  26  50 1.000 0 33201   363
-  1  30  49 1.000 0 33201   380
-  1  28  46 1.000 0 33201   358
-  1  27  47 1.000 0 33201   371
-  1  12  49 1.000 0 33201   272
-  1  47  38 1.000 0 33106  2076
-  1  29  48 1.000 0 33201   376
-  1  11  43 1.000 0 33201   428
-  1  29  47 1.000 0 33201   378
-  1  10  44 1.000 0 33201   442
-  1  33  43 1.000 0 33201   386
-  1   6  45 1.000 0 33201   430
-  1   9  45 1.000 0 33201   436
-  1  27  50 1.000 0 33201   368
-  1  14  50 1.000 0 33201   269
-  1  30  30 1.000 0 33201  1250
-  1  31  30 1.000 0 33201  1257
-  1  30  26 1.000 0 33201  1254
-  1  30  50 1.000 0 33201   379
-  1  42  22 1.000 0 33201  1424
-  1  15  33 1.000 0 33201   862
-  1  15  34 1.000 0 33201   858
-  1  36  46 1.000 0 33106  2033
-  1  16  31 1.000 0 33201   876
-  1  45  14 1.000 0 33201  1757
-  1  31  27 1.000 0 33201  1260
-  1  35  29 1.000 0 33201  1269
-  1  31  29 1.000 0 33201  1258
-  1  31  26 1.000 0 33201  1261
-  1  45  15 1.000 0 33201  1758
-  1  45  13 1.000 0 33201  1756
-  1  35  28 1.000 0 33201  1270
-  1  47  12 1.000 0 33201  1727
-  1  44  14 1.000 0 33201  1765
-  1  31  28 1.000 0 33201  1259
-  1  16  32 1.000 0 33201   874
-  1  42  21 1.000 0 33201  1425
-  1  34  41 1.000 0 33201   410
-  1  34  42 1.000 0 33201   409
-  1  32  25 1.000 0 33201  1453
-  1  34  43 1.000 0 33201   408
-  1  34  44 1.000 0 33201   407
-  1  49  38 1.000 0 33106  2063
-  1  46  11 1.000 0 33201  1743
-  1  12  35 1.000 0 33201   852
-  1  36  19 1.000 0 33201  1703
-  1  36  20 1.000 0 33201  1704
-  1  37  18 1.000 0 33201  1698
-  1  26  15 1.000 0 33201  1848
-  1  30  14 1.000 0 33201  1834
-  1  26  12 1.000 0 33201  1846
-  1  30  12 1.000 0 33201  1836
-  1  28  11 1.000 0 33201  1829
-  1  30  15 1.000 0 33201  1837
-  1  30  11 1.000 0 33201  1838
-  1  28  14 1.000 0 33201  1827
-  1  28  13 1.000 0 33201  1832
-  1  28  15 1.000 0 33201  1833
-  1  28  12 1.000 0 33201  1831
-  1  40  20 1.000 0 33201  1694
-  1  37  16 1.000 0 33201  1696
-  1  40  16 1.000 0 33201  1690
-  1  37  20 1.000 0 33201  1695
-  1  40  19 1.000 0 33201  1693
-  1  38  18 1.000 0 33201  1709
-  1  37  17 1.000 0 33201  1697
-  1  36  16 1.000 0 33201  1700
-  1  37  19 1.000 0 33201  1699
-  1  26  11 1.000 0 33201  1845
-  1  29  11 1.000 0 33201  1852
-  1  26  14 1.000 0 33201  1844
-  1  27  15 1.000 0 33201  1843
-  1  47  23 1.000 0 33201  1540
-  1  48  24 1.000 0 33201  1338
-  1  46  24 1.000 0 33201  1542
-  1  27  14 1.000 0 33201  1839
-  1  47  25 1.000 0 33201  1541
-  1  46  22 1.000 0 33201  1544
-  1  46  21 1.000 0 33201  1543
-  1  21  33 1.000 0 33201  2207
-  1  31  11 1.000 0 33201  1808
-  1  29  15 1.000 0 33201  1853
-  1  27  11 1.000 0 33201  1842
-  1  30  13 1.000 0 33201  1835
-  1  27  12 1.000 0 33201  1841
-  1  21  32 1.000 0 33201  2210
-  1  26  13 1.000 0 33201  1847
-  1  29  12 1.000 0 33201  1851
-  1  45  10 1.000 0 33201  1874
-  1  27  13 1.000 0 33201  1840
-  1  48  22 1.000 0 33201  1340
-  1  31  12 1.000 0 33201  1807
-  1  31  13 1.000 0 33201  1806
-  1  47  21 1.000 0 33201  1538
-  1  31  15 1.000 0 33201  1809
-  1  48  21 1.000 0 33201  1339
-  1  24  31 1.000 0 33201  2228
-  1  48  23 1.000 0 33201  1341
-  1  24  35 1.000 0 33201  2229
-  1  23  33 1.000 0 33201  2197
-  1  24  34 1.000 0 33201  2220
-  1  47  22 1.000 0 33201  1539
-  1  22  33 1.000 0 33201  2202
-  1  24  32 1.000 0 33201  2226
-  1  23  34 1.000 0 33201  2196
-  1  22  34 1.000 0 33201  2205
-  1  24  33 1.000 0 33201  2224
-  1  29  13 1.000 0 33201  1850
-  1  29  14 1.000 0 33201  1849
-  1  31  14 1.000 0 33201  1804
-  1  22  35 1.000 0 33201  2201
-  1  21  35 1.000 0 33201  2206
-  1  22  31 1.000 0 33201  2204
-  1  22  32 1.000 0 33201  2203
-  1  32  73 1.000 0 33201  4300
-  1  21  31 1.000 0 33201  2216
-  1  23  35 1.000 0 33201  2200
-  1  25  33 1.000 0 33201  2192
-  1  23  32 1.000 0 33201  2198
-  1  25  35 1.000 0 33201  2195
-  1  25  34 1.000 0 33201  2191
-  1  23  31 1.000 0 33201  2199
-  1  25  31 1.000 0 33201  2194
-  1  35  77 1.000 0 33201  4276
-  1  25  32 1.000 0 33201  2193
-  1  15  22 1.000 0 33201   416
-  1  15  21 1.000 0 33201   417
-  1  48  70 1.000 0 33106  3057
-  1  50  70 1.000 0 33106  3060
-  1  49  70 1.000 0 33106  3058
-  1  21  34 1.000 0 33201  2218
-  1   8  33 1.000 0 33201   872
-  1  24  11 1.000 0 33201  1379
-  1  14  80 1.000 0 33201  4133
-  1  39  20 1.000 0 33201  1712
-  1  38  17 1.000 0 33201  1708
-  1  38  20 1.000 0 33201  1711
-  1  39  18 1.000 0 33201  1715
-  1   8  34 1.000 0 33201   875
-  1  40  17 1.000 0 33201  1691
-  1  48 100 1.000 0 33201  4592
-  1   8  32 1.000 0 33201   861
-  1   7  33 1.000 0 33201   882
-  1  39  19 1.000 0 33201  1716
-  1  36  17 1.000 0 33201  1701
-  1  39  16 1.000 0 33201  1713
-  1   8  35 1.000 0 33201   859
-  1  40  18 1.000 0 33201  1692
-  1  50  96 1.000 0 33201  4640
-  1  24  13 1.000 0 33201  1383
-  1  11  53 1.000 0 33201  3320
-  1  12  53 1.000 0 33201  3321
-  1  15  55 1.000 0 33201  3319
-  1  14  55 1.000 0 33201  3317
-  1  36  18 1.000 0 33201  1702
-  1   8  31 1.000 0 33201   860
-  1  24  12 1.000 0 33201  1380
-  1  39  17 1.000 0 33201  1714
-  1  24  14 1.000 0 33201  1378
-  1  21  13 1.000 0 33201  1622
-  1  10  69 1.000 0 33201  3832
-  1  47  99 1.000 0 33201  4690
-  1  23   9 1.000 0 33201   732
-  1  46  70 1.000 0 33106  3055
-  1  46  36 1.000 0 33106  2050
-  1  15  23 1.000 0 33201   415
-  1  47  70 1.000 0 33106  3056
-  1  35  91 1.000 0 33201  4328
-  1  25  90 1.000 0 33201  3968
-  1  14  82 1.000 0 33106  2976
-  1   4  45 1.000 0 33201   818
-  1  36  41 1.000 0 33106  2102
-  1  14  23 1.000 0 33201   385
-  1  14  24 1.000 0 33201   377
-  1   1  45 1.000 0 33201   824
-  1  24  88 1.000 0 33201  3997
-  1   4  44 1.000 0 33201   814
-  1  36  44 1.000 0 33106  2104
-  1  34  94 1.000 0 33201  4374
-  1  32  94 1.000 0 33201  4355
-  1  41  39 1.000 0 33106  2115
-  1  50  99 1.000 0 33201  4711
-  1  39  41 1.000 0 33106  2093
-  1  12  25 1.000 0 33201   418
-  1  39  44 1.000 0 33106  2094
-  1  46  38 1.000 0 33106  2048
-  1   5  45 1.000 0 33201   797
-  1  47  39 1.000 0 33106  2051
-  1  33  94 1.000 0 33201  4365
-  1  40  44 1.000 0 33106  2036
-  1  12  22 1.000 0 33201   421
-  1  40  45 1.000 0 33106  2035
-  1  50  66 1.000 0 33106  3052
-  1  15  25 1.000 0 33201   412
-  1  46  39 1.000 0 33106  2047
-  1  49  66 1.000 0 33106  3049
-  1  48  66 1.000 0 33106  3048
-  1  48  62 1.000 0 33106  2882
-  1  49  62 1.000 0 33106  2883
-  1  45  77 1.000 0 33201  4357
-  1  47  65 1.000 0 33106  2885
-  1  39  42 1.000 0 33106  2092
-  1  37  44 1.000 0 33106  2106
-  1   4  42 1.000 0 33201   816
-  1  39  45 1.000 0 33106  2090
-  1  40  42 1.000 0 33106  2039
-  1   2  45 1.000 0 33201   790
-  1  40  43 1.000 0 33106  2037
-  1  37  41 1.000 0 33106  2107
-  1   4  43 1.000 0 33201   815
-  1  37  42 1.000 0 33106  2108
-  1  11  22 1.000 0 33201    83
-  1   4  41 1.000 0 33201   817
-  1   1  43 1.000 0 33201   820
-  1   1  41 1.000 0 33201   823
-  1   1  42 1.000 0 33201   822
-  1  36  43 1.000 0 33106  2100
-  1  37  45 1.000 0 33106  2111
-  1  37  43 1.000 0 33106  2109
-  1  12  24 1.000 0 33201   419
-  1  12  23 1.000 0 33201   420
-  1  40  41 1.000 0 33106  2040
-  1  39  43 1.000 0 33106  2091
-  1   5  43 1.000 0 33201   821
-  1  37  80 1.000 0 33201  4339
-  1  42  79 1.000 0 33201  4359
-  1  41  79 1.000 0 33201  4358
-  1  37  76 1.000 0 33201  4316
-  1  41  78 1.000 0 33201  4343
-  1  46  62 1.000 0 33106  2878
-  1  41  77 1.000 0 33201  4356
-  1  43  77 1.000 0 33201  4352
-  1  40  80 1.000 0 33201  4342
-  1  38  80 1.000 0 33201  4340
-  1  44  80 1.000 0 33201  4367
-  1  40  76 1.000 0 33201  4319
-  1  42  77 1.000 0 33201  4351
-  1  44  79 1.000 0 33201  4361
-  1  39  80 1.000 0 33201  4341
-  1  41  38 1.000 0 33106  2114
-  1  43  80 1.000 0 33201  4366
-  1  44  77 1.000 0 33201  4354
-  1  45  79 1.000 0 33201  4362
-  1  28  44 1.000 0 33201   563
-  1  30  44 1.000 0 33201   558
-  1  30  43 1.000 0 33201   559
-  1  29  44 1.000 0 33201   551
-  1  19  33 1.000 0 33201   879
-  1  29  45 1.000 0 33201   550
-  1  35  23 1.000 0 33201  1479
-  1  29  41 1.000 0 33201   554
-  1  35  25 1.000 0 33201  1478
-  1  19  34 1.000 0 33201   878
-  1  19  32 1.000 0 33201   880
-  1  35  22 1.000 0 33201  1480
-  1  29  43 1.000 0 33201   552
-  1  30  42 1.000 0 33201   560
-  1  29  42 1.000 0 33201   553
-  1  35  39 1.000 0 33201   890
-  1  30  45 1.000 0 33201   557
-  1  23  22 1.000 0 33201  1349
-  1  24  30 1.000 0 33201  1142
-  1  23  27 1.000 0 33201  1150
-  1  17  23 1.000 0 33201  1154
-  1  20  23 1.000 0 33201  1133
-  1  19  21 1.000 0 33201  1141
-  1  39  47 1.000 0 33106  2004
-  1  20  21 1.000 0 33201  1136
-  1  39  50 1.000 0 33106  2006
-  1  17  21 1.000 0 33201  1156
-  1  24  22 1.000 0 33201  1369
-  1  24  23 1.000 0 33201  1368
-  1  39  48 1.000 0 33106  2003
-  1  23  23 1.000 0 33201  1350
-  1  23  17 1.000 0 33201  1620
-  1  23  18 1.000 0 33201  1618
-  1  24  28 1.000 0 33201  1144
-  1  23  24 1.000 0 33201  1351
-  1  24  25 1.000 0 33201  1366
-  1  17  76 1.000 0 33201  4375
-  1  24  26 1.000 0 33201  1146
-  1  24  27 1.000 0 33201  1145
-  1  23  21 1.000 0 33201  1348
-  1  39  49 1.000 0 33106  2001
-  1  20  22 1.000 0 33201  1135
-  1  39  46 1.000 0 33106  2005
-  1  24  24 1.000 0 33201  1367
-  1  45  39 1.000 0 33106  2018
-  1  45  40 1.000 0 33106  2017
-  1  23  25 1.000 0 33201  1352
-  1  16  42 1.000 0 33201   729
-  1  20  24 1.000 0 33201  1132
-  1  38  24 1.000 0 33201  1484
-  1  38  23 1.000 0 33201  1485
-  1  23  26 1.000 0 33201  1151
-  1  16  41 1.000 0 33201   730
-  1  38  50 1.000 0 33106  2016
-  1  38  25 1.000 0 33201  1483
-  1  38  22 1.000 0 33201  1486
-  1  17  80 1.000 0 33201  4388
-  1  43  79 1.000 0 33201  4360
-  1  19  25 1.000 0 33201  1137
-  1  50  28 1.000 0 33201  1312
-  1  41  29 1.000 0 33201  1331
-  1  48  65 1.000 0 33106  2888
-  1  49  65 1.000 0 33106  2889
-  1  20  25 1.000 0 33201  1131
-  1  24  29 1.000 0 33201  1143
-  1  23  29 1.000 0 33201  1148
-  1  18  26 1.000 0 33201  1015
-  1  50  37 1.000 0 33106  2010
-  1  24  16 1.000 0 33201  1614
-  1  17  25 1.000 0 33201  1152
-  1  17  24 1.000 0 33201  1153
-  1  24  21 1.000 0 33201  1371
-  1  23  30 1.000 0 33201  1147
-  1  18  27 1.000 0 33201  1014
-  1  19  22 1.000 0 33201  1140
-  1  19  23 1.000 0 33201  1139
-  1  50  38 1.000 0 33106  2009
-  1  19  24 1.000 0 33201  1138
-  1  50  36 1.000 0 33106  2011
-  1  38  49 1.000 0 33106  2012
-  1  23  28 1.000 0 33201  1149
-  1  17  22 1.000 0 33201  1155
-  1  26  63 1.000 0 33201  3472
-  1  18  59 1.000 0 33201  3423
-  1  16  57 1.000 0 33201  3427
-  1  16  59 1.000 0 33201  3421
-  1  19  58 1.000 0 33201  3448
-  1  20  58 1.000 0 33201  3449
-  1  17  57 1.000 0 33201  3428
-  1  28  63 1.000 0 33201  3474
-  1  20  57 1.000 0 33201  3432
-  1  30  89 1.000 0 33201  4676
-  1  17  59 1.000 0 33201  3422
-  1  30  59 1.000 0 33201  3507
-  1  16  58 1.000 0 33201  3445
-  1  18  58 1.000 0 33201  3447
-  1  30  65 1.000 0 33201  3459
-  1  17  58 1.000 0 33201  3446
-  1  29  59 1.000 0 33201  3506
-  1  30  63 1.000 0 33201  3460
-  1  29  65 1.000 0 33201  3458
-  1  18  57 1.000 0 33201  3429
-  1  20  59 1.000 0 33201  3426
-  1  27  63 1.000 0 33201  3473
-  1  29  63 1.000 0 33201  3475
-  1  19  57 1.000 0 33201  3430
-  1  50  30 1.000 0 33201  1310
-  1  33  34 1.000 0 33201  1023
-  1  50  26 1.000 0 33201  1314
-  1  33  35 1.000 0 33201  1021
-  1  27  34 1.000 0 33201  1044
-  1  39  57 1.000 0 33106  2733
-  1  30  35 1.000 0 33201  1027
-  1  43  29 1.000 0 33201  1319
-  1  44  28 1.000 0 33201  1335
-  1  31  31 1.000 0 33201  1018
-  1  38  51 1.000 0 33106  2708
-  1  31  35 1.000 0 33201  1019
-  1  30  31 1.000 0 33201  1032
-  1  35  31 1.000 0 33201  1058
-  1  16  76 1.000 0 33201  4378
-  1  34  32 1.000 0 33201  1036
-  1  33  32 1.000 0 33201  1025
-  1  31  33 1.000 0 33201  1017
-  1  25  10 1.000 0 33201   702
-  1  20  76 1.000 0 33201  4379
-  1  30  32 1.000 0 33201  1031
-  1  39  51 1.000 0 33106  2707
-  1  33  33 1.000 0 33201  1024
-  1  37  54 1.000 0 33106  2696
-  1  30  34 1.000 0 33201  1028
-  1  34  33 1.000 0 33201  1035
-  1  43  28 1.000 0 33201  1318
-  1  36  54 1.000 0 33106  2697
-  1  19  76 1.000 0 33201  4377
-  1  50  27 1.000 0 33201  1313
-  1  28  33 1.000 0 33201  1066
-  1  41  27 1.000 0 33201  1329
-  1  39  53 1.000 0 33106  2698
-  1  50  29 1.000 0 33201  1311
-  1  40  57 1.000 0 33106  2734
-  1  33  31 1.000 0 33201  1026
-  1  44  30 1.000 0 33201  1337
-  1  41  28 1.000 0 33201  1330
-  1  34  34 1.000 0 33201  1034
-  1  30  57 1.000 0 33201  3494
-  1  29  89 1.000 0 33201  4674
-  1  34  35 1.000 0 33201  1033
-  1  30  33 1.000 0 33201  1029
-  1  29  32 1.000 0 33201  1051
-  1  34  31 1.000 0 33201  1037
-  1  42  28 1.000 0 33201  1325
-  1  42  27 1.000 0 33201  1326
-  1  36  55 1.000 0 33106  2702
-  1  37  53 1.000 0 33106  2700
-  1  42  32 1.000 0 33201   758
-  1  45  35 1.000 0 33201   766
-  1  42  34 1.000 0 33201   756
-  1  42  33 1.000 0 33201   757
-  1  22  36 1.000 0 33201   490
-  1  19  49 1.000 0 33201   332
-  1  44   8 1.000 0 33201  1866
-  1  37  58 1.000 0 33106  2725
-  1  31  93 1.000 0 33201  4270
-  1  44  10 1.000 0 33201  1864
-  1  31  34 1.000 0 33201  1016
-  1  40  35 1.000 0 33201   765
-  1  45   9 1.000 0 33201  1875
-  1  42  31 1.000 0 33201   759
-  1  42  30 1.000 0 33201  1323
-  1  42  29 1.000 0 33201  1324
-  1  21  37 1.000 0 33201   546
-  1  30  39 1.000 0 33201   542
-  1  36  58 1.000 0 33106  2721
-  1  31  32 1.000 0 33201  1020
-  1  24  10 1.000 0 33201   718
-  1  30  36 1.000 0 33201   540
-  1  21  39 1.000 0 33201   544
-  1  49  29 1.000 0 33201  1307
-  1  37  31 1.000 0 33201   800
-  1  26  32 1.000 0 33201  1041
-  1  18  80 1.000 0 33201  4389
-  1  18  46 1.000 0 33201   316
-  1  35  65 1.000 0 33201  3708
-  1  26  33 1.000 0 33201  1040
-  1  23  10 1.000 0 33201   735
-  1  32  65 1.000 0 33201  3705
-  1  29  37 1.000 0 33201   498
-  1  28  78 1.000 0 33201  4408
-  1  37  55 1.000 0 33106  2704
-  1  28  32 1.000 0 33201  1067
-  1  35  40 1.000 0 33201   895
-  1  26  34 1.000 0 33201  1039
-  1  27  78 1.000 0 33201  4407
-  1  44  26 1.000 0 33201  1333
-  1  32   8 1.000 0 33201  1681
-  1  36  34 1.000 0 33201   802
-  1  38  55 1.000 0 33106  2705
-  1  35  37 1.000 0 33201   892
-  1  32  40 1.000 0 33201   915
-  1  32   6 1.000 0 33201  1635
-  1  45   5 1.000 0 33201  3356
-  1  32   7 1.000 0 33201  1638
-  1  35  36 1.000 0 33201   894
-  1  32   9 1.000 0 33201  1683
-  1  32  38 1.000 0 33201   916
-  1  41  30 1.000 0 33201  1332
-  1  33  39 1.000 0 33201   901
-  1  18  76 1.000 0 33201  4376
-  1  44  29 1.000 0 33201  1336
-  1  43  30 1.000 0 33201  1320
-  1  27  31 1.000 0 33201  1047
-  1  29  34 1.000 0 33201  1049
-  1  19  77 1.000 0 33201  4385
-  1  17  77 1.000 0 33201  4382
-  1  42  26 1.000 0 33201  1327
-  1  18  77 1.000 0 33201  4384
-  1  29  33 1.000 0 33201  1050
-  1  38  53 1.000 0 33106  2699
-  1  38  57 1.000 0 33106  2732
-  1  41  26 1.000 0 33201  1328
-  1  27  32 1.000 0 33201  1046
-  1  36  57 1.000 0 33106  2730
-  1  29  31 1.000 0 33201  1052
-  1  16  77 1.000 0 33201  4381
-  1  27  35 1.000 0 33201  1043
-  1  30  78 1.000 0 33201  4410
-  1  19  78 1.000 0 33201  4403
-  1  37  57 1.000 0 33106  2731
-  1  32  33 1.000 0 33201  1061
-  1  19  80 1.000 0 33201  4391
-  1  39  54 1.000 0 33106  2701
-  1  20  78 1.000 0 33201  4404
-  1  22  39 1.000 0 33201   491
-  1  29  35 1.000 0 33201  1048
-  1  29  39 1.000 0 33201   496
-  1  35   8 1.000 0 33201  1830
-  1  44  27 1.000 0 33201  1334
-  1  32  34 1.000 0 33201  1060
-  1  29  78 1.000 0 33201  4409
-  1  39  55 1.000 0 33106  2703
-  1  26  78 1.000 0 33201  4406
-  1  24  38 1.000 0 33201   516
-  1  43  33 1.000 0 33201   810
-  1  16  78 1.000 0 33201  4405
-  1  24  37 1.000 0 33201   517
-  1  20  77 1.000 0 33201  4386
-  1  26  76 1.000 0 33201  4395
-  1  42  35 1.000 0 33201   755
-  1  19  48 1.000 0 33201   329
-  1  24  36 1.000 0 33201   519
-  1  17  78 1.000 0 33201  4401
-  1  27  79 1.000 0 33201  4417
-  1  34  40 1.000 0 33201   933
-  1  29  38 1.000 0 33201   497
-  1  23  39 1.000 0 33201   485
-  1  36  32 1.000 0 33201   804
-  1  34  36 1.000 0 33201   931
-  1  36  31 1.000 0 33201   805
-  1  24  39 1.000 0 33201   515
-  1  18  78 1.000 0 33201  4402
-  1  39  33 1.000 0 33201   761
-  1  37  34 1.000 0 33201   796
-  1  39  58 1.000 0 33106  2728
-  1  35   7 1.000 0 33201  1828
-  1  43  35 1.000 0 33201   807
-  1  36  33 1.000 0 33201   803
-  1  31  65 1.000 0 33201  3704
-  1  34  38 1.000 0 33201   929
-  1  38  58 1.000 0 33106  2726
-  1  38  35 1.000 0 33201   801
-  1  37  33 1.000 0 33201   798
-  1  23  38 1.000 0 33201   481
-  1  37  52 1.000 0 33106  2714
-  1  34  37 1.000 0 33201   930
-  1  44  32 1.000 0 33201   774
-  1  42   9 1.000 0 33201  1855
-  1  42   8 1.000 0 33201  1856
-  1  25  49 1.000 0 33201   354
-  1  45  34 1.000 0 33201   768
-  1  33  91 1.000 0 33201  4350
-  1  44  31 1.000 0 33201   773
-  1  39  32 1.000 0 33201   762
-  1  44   6 1.000 0 33201  1868
-  1  42   7 1.000 0 33201  1857
-  1  44  33 1.000 0 33201   775
-  1  42  10 1.000 0 33201  1854
-  1  41   9 1.000 0 33201  1870
-  1  21  40 1.000 0 33201   548
-  1  19  46 1.000 0 33201   331
-  1  41  10 1.000 0 33201  1869
-  1  25  48 1.000 0 33201   355
-  1  31  63 1.000 0 33201  3719
-  1  26  44 1.000 0 33201   589
-  1  12  21 1.000 0 33201   422
-  1  14  25 1.000 0 33201   305
-  1  34  59 1.000 0 33201  3543
-  1  34  63 1.000 0 33201  3722
-  1  40  12 1.000 0 33201  1794
-  1  40  14 1.000 0 33201  1790
-  1  39  29 1.000 0 33201  1188
-  1  38  12 1.000 0 33201  1777
-  1  31  91 1.000 0 33201  4335
-  1  39  22 1.000 0 33201  1493
-  1  39  28 1.000 0 33201  1189
-  1  34  65 1.000 0 33201  3707
-  1  41  32 1.000 0 33201   794
-  1  34  30 1.000 0 33201  1194
-  1  39  21 1.000 0 33201  1494
-  1  38  13 1.000 0 33201  1776
-  1  32  63 1.000 0 33201  3720
-  1  33  63 1.000 0 33201  3721
-  1  41  15 1.000 0 33201  1744
-  1  40  13 1.000 0 33201  1793
-  1  31  58 1.000 0 33201  3535
-  1  34  29 1.000 0 33201  1195
-  1  26  45 1.000 0 33201   586
-  1  39  26 1.000 0 33201  1191
-  1  39  27 1.000 0 33201  1190
-  1  33  58 1.000 0 33201  3537
-  1   5  41 1.000 0 33201   808
-  1  26  41 1.000 0 33201   590
-  1  21   9 1.000 0 33201   744
-  1  32  61 1.000 0 33201  3710
-  1  39  30 1.000 0 33201  1187
-  1  50  65 1.000 0 33106  2891
-  1  41  14 1.000 0 33201  1745
-  1  26  42 1.000 0 33201   587
-  1  25   9 1.000 0 33201   699
-  1  35  58 1.000 0 33201  3539
-  1  26  43 1.000 0 33201   588
-  1   5  42 1.000 0 33201   811
-  1  46  65 1.000 0 33106  2892
-  1  37  69 1.000 0 33201  3889
-  1  32  91 1.000 0 33201  4348
-  1  30  37 1.000 0 33201   537
-  1  34  57 1.000 0 33201  3521
-  1  22  10 1.000 0 33201   733
-  1  40  11 1.000 0 33201  1795
-  1  36  70 1.000 0 33201  3882
-  1  34  93 1.000 0 33201  4307
-  1  17  47 1.000 0 33201   335
-  1  25  44 1.000 0 33201   672
-  1  22  91 1.000 0 33106  2880
-  1  40  15 1.000 0 33201  1791
-  1  23  37 1.000 0 33201   482
-  1  22  40 1.000 0 33201   487
-  1  23  36 1.000 0 33201   484
-  1  27  45 1.000 0 33201   567
-  1  40  58 1.000 0 33106  2729
-  1  27  44 1.000 0 33201   568
-  1  38  52 1.000 0 33106  2715
-  1  38  54 1.000 0 33106  2720
-  1  23  40 1.000 0 33201   480
-  1  36  51 1.000 0 33106  2711
-  1  26  31 1.000 0 33201  1042
-  1  27  43 1.000 0 33201   569
-  1  27  33 1.000 0 33201  1045
-  1  37  51 1.000 0 33106  2709
-  1   2  42 1.000 0 33201   776
-  1  39  24 1.000 0 33201  1489
-  1  44  84 1.000 0 33201  4508
-  1   3  44 1.000 0 33201   749
-  1  39  11 1.000 0 33201  1772
-  1  25  47 1.000 0 33201   356
-  1  34  91 1.000 0 33201  4353
-  1  44   9 1.000 0 33201  1865
-  1  37  15 1.000 0 33201  1786
-  1  39  15 1.000 0 33201  1773
-  1  37  11 1.000 0 33201  1785
-  1   1  44 1.000 0 33201   819
-  1  45   8 1.000 0 33201  1876
-  1  31  23 1.000 0 33201  1499
-  1  31  25 1.000 0 33201  1496
-  1  19  47 1.000 0 33201   330
-  1  39  23 1.000 0 33201  1491
-  1  31  22 1.000 0 33201  1500
-  1  39  13 1.000 0 33201  1770
-  1  40  23 1.000 0 33201  1505
-  1  39  25 1.000 0 33201  1488
-  1  32  93 1.000 0 33201  4281
-  1  23  46 1.000 0 33201   352
-  1  40  22 1.000 0 33201  1506
-  1  40  21 1.000 0 33201  1507
-  1  21  10 1.000 0 33201   745
-  1  36  35 1.000 0 33201   782
-  1  40  25 1.000 0 33201  1502
-  1  35  12 1.000 0 33201  1813
-  1  40  32 1.000 0 33201   783
-  1  32  14 1.000 0 33201  1817
-  1  37  35 1.000 0 33201   806
-  1  35  57 1.000 0 33201  3522
-  1  43   6 1.000 0 33201  1863
-  1  25  46 1.000 0 33201   357
-  1  45  32 1.000 0 33201   771
-  1  31  24 1.000 0 33201  1498
-  1  39  31 1.000 0 33201   764
-  1  43  10 1.000 0 33201  1859
-  1  17  50 1.000 0 33201   333
-  1  37  13 1.000 0 33201  1788
-  1  32  11 1.000 0 33201  1815
-  1  39  34 1.000 0 33201   760
-  1  38  70 1.000 0 33201  3880
-  1  45   7 1.000 0 33201  1877
-  1  19  50 1.000 0 33201   328
-  1  41   7 1.000 0 33201  1872
-  1  23  50 1.000 0 33201   348
-  1  45  33 1.000 0 33201   770
-  1  37  70 1.000 0 33201  3881
-  1  27  41 1.000 0 33201   573
-  1  39  14 1.000 0 33201  1769
-  1  23  47 1.000 0 33201   351
-  1  41   8 1.000 0 33201  1871
-  1  37  14 1.000 0 33201  1787
-  1  24  49 1.000 0 33201   344
-  1  23  49 1.000 0 33201   349
-  1  32  13 1.000 0 33201  1818
-  1  43   9 1.000 0 33201  1860
-  1  40  24 1.000 0 33201  1503
-  1  41   6 1.000 0 33201  1873
-  1  24  50 1.000 0 33201   343
-  1  16  46 1.000 0 33201   339
-  1  39  35 1.000 0 33201   789
-  1  43   7 1.000 0 33201  1862
-  1  32  15 1.000 0 33201  1816
-  1  38  31 1.000 0 33201   788
-  1  39  12 1.000 0 33201  1771
-  1  43   8 1.000 0 33201  1861
-  1  23  48 1.000 0 33201   350
-  1  31  21 1.000 0 33201  1501
-  1  41  31 1.000 0 33201   795
-  1  45  31 1.000 0 33201   772
-  1  16  48 1.000 0 33201   341
-  1  39  70 1.000 0 33201  3878
-  1  33  93 1.000 0 33201  4283
-  1  33   8 1.000 0 33201  1803
-  1  45   6 1.000 0 33201  1878
-  1  37  12 1.000 0 33201  1789
-  1  35  14 1.000 0 33201  1810
-  1  25  50 1.000 0 33201   353
-  1  17  79 1.000 0 33201  4415
-  1  33   7 1.000 0 33201  1798
-  1  33  36 1.000 0 33201   900
-  1  33  38 1.000 0 33201   897
-  1  16  50 1.000 0 33201   342
-  1  33  37 1.000 0 33201   898
-  1  33   6 1.000 0 33201  1792
-  1  38  33 1.000 0 33201   786
-  1  17  48 1.000 0 33201   334
-  1  17  49 1.000 0 33201   337
-  1  32  10 1.000 0 33201  1685
-  1  38  32 1.000 0 33201   787
-  1  32  12 1.000 0 33201  1819
-  1  41  34 1.000 0 33201   792
-  1  41  35 1.000 0 33201   791
-  1  41  33 1.000 0 33201   793
-  1  40  33 1.000 0 33201   781
-  1  17  46 1.000 0 33201   336
-  1  35  13 1.000 0 33201  1811
-  1  35  11 1.000 0 33201  1812
-  1  36  52 1.000 0 33106  2712
-  1  26  40 1.000 0 33201   504
-  1  43  32 1.000 0 33201   812
-  1  28  76 1.000 0 33201  4397
-  1  33  40 1.000 0 33201   896
-  1  29  40 1.000 0 33201   500
-  1  28  39 1.000 0 33201   502
-  1  31  37 1.000 0 33201   941
-  1  22  38 1.000 0 33201   488
-  1  20  80 1.000 0 33201  4392
-  1  36  12 1.000 0 33201  1783
-  1  30  76 1.000 0 33201  4399
-  1  13  24 1.000 0 33201   250
-  1  36  13 1.000 0 33201  1782
-  1  35  61 1.000 0 33201  3713
-  1  33  64 1.000 0 33201  3701
-  1  43  34 1.000 0 33201   809
-  1  31  59 1.000 0 33201  3540
-  1  32  64 1.000 0 33201  3699
-  1  35  59 1.000 0 33201  3544
-  1  16  47 1.000 0 33201   340
-  1  34  64 1.000 0 33201  3702
-  1  33  65 1.000 0 33201  3706
-  1  33  60 1.000 0 33201  3525
-  1  40  31 1.000 0 33201   784
-  1  35  63 1.000 0 33201  3723
-  1  16  49 1.000 0 33201   338
-  1  24  47 1.000 0 33201   346
-  1  35  38 1.000 0 33201   891
-  1  31  60 1.000 0 33201  3523
-  1  40  34 1.000 0 33201   780
-  1  24  46 1.000 0 33201   347
-  1  38  34 1.000 0 33201   785
-  1  33  61 1.000 0 33201  3711
-  1  33  59 1.000 0 33201  3542
-  1  37  32 1.000 0 33201   799
-  1  34  58 1.000 0 33201  3538
-  1  24  48 1.000 0 33201   345
-  1  32  59 1.000 0 33201  3541
-  1  44  34 1.000 0 33201   778
-  1  34  61 1.000 0 33201  3712
-  1  32  58 1.000 0 33201  3536
-  1  44  35 1.000 0 33201   779
-  1  32  36 1.000 0 33201   918
-  1  43  31 1.000 0 33201   813
-  1  33  62 1.000 0 33201  3716
-  1  28  40 1.000 0 33201   533
-  1  32  37 1.000 0 33201   917
-  1  27  36 1.000 0 33201   532
-  1  30  40 1.000 0 33201   535
-  1  38  69 1.000 0 33201  3890
-  1  32  39 1.000 0 33201   919
-  1  35  60 1.000 0 33201  3527
-  1  41  13 1.000 0 33201  1746
-  1  36  11 1.000 0 33201  1784
-  1  41  83 1.000 0 33201  4510
-  1  31  62 1.000 0 33201  3714
-  1  35  62 1.000 0 33201  3718
-  1  41  12 1.000 0 33201  1747
-  1  34  60 1.000 0 33201  3526
-  1  42  83 1.000 0 33201  4511
-  1  32  62 1.000 0 33201  3715
-  1  33  57 1.000 0 33201  3518
-  1  34  62 1.000 0 33201  3717
-  1  31  39 1.000 0 33201   945
-  1  40  70 1.000 0 33201  3877
-  1  39  52 1.000 0 33106  2716
-  1  40  69 1.000 0 33201  3893
-  1  39  69 1.000 0 33201  3892
-  1  31  57 1.000 0 33201  3515
-  1  32  57 1.000 0 33201  3517
-  1  38  14 1.000 0 33201  1774
-  1  27  76 1.000 0 33201  4396
-  1  29  76 1.000 0 33201  4398
-  1  31  40 1.000 0 33201   940
-  1  31  61 1.000 0 33201  3709
-  1  32  60 1.000 0 33201  3524
-  1  31  36 1.000 0 33201   944
-  1  31  38 1.000 0 33201   942
-  1  38  11 1.000 0 33201  1778
-  1  29  36 1.000 0 33201   499
-  1  36  14 1.000 0 33201  1781
-  1  22  37 1.000 0 33201   489
-  1  28  37 1.000 0 33201   503
-  1  50  62 1.000 0 33106  2884
-  1  41  80 1.000 0 33201  4363
-  1  30  38 1.000 0 33201   536
-  1  26  38 1.000 0 33201   521
-  1  26  36 1.000 0 33201   524
-  1  24  40 1.000 0 33201   520
-  1  28  42 1.000 0 33201   565
-  1  28  41 1.000 0 33201   566
-  1  34  39 1.000 0 33201   928
-  1  45  84 1.000 0 33201  4509
-  1  38  15 1.000 0 33201  1779
-  1  26  37 1.000 0 33201   522
-  1  41  84 1.000 0 33201  4505
-  1  36  15 1.000 0 33201  1780
-  1  27  37 1.000 0 33201   531
-  1  27  38 1.000 0 33201   534
-  1  18  79 1.000 0 33201  4414
-  1  21  36 1.000 0 33201   547
-  1  21  38 1.000 0 33201   545
-  1  28  43 1.000 0 33201   564
-  1  25  39 1.000 0 33201   510
-  1  25  38 1.000 0 33201   511
-  1  26  39 1.000 0 33201   528
-  1  28  38 1.000 0 33201   508
-  1  25  40 1.000 0 33201   509
-  1  25  36 1.000 0 33201   513
-  1  33  10 1.000 0 33201  1821
-  1  25  37 1.000 0 33201   512
-  1  16  79 1.000 0 33201  4416
-  1  34  14 1.000 0 33201  1796
-  1  27  42 1.000 0 33201   571
-  1  35  15 1.000 0 33201  1814
-  1  34  12 1.000 0 33201  1800
-  1  34  13 1.000 0 33201  1797
-  1  34  11 1.000 0 33201  1801
-  1  33  12 1.000 0 33201  1824
-  1  33  14 1.000 0 33201  1822
-  1  33  13 1.000 0 33201  1823
-  1  33  15 1.000 0 33201  1820
-  1  42  80 1.000 0 33201  4364
-  1  50  64 1.000 0 33106  2877
-  1  45  80 1.000 0 33201  4368
-  1  47  62 1.000 0 33106  2881
-  1  34  15 1.000 0 33201  1802
-  1   7  66 1.000 0 33201  3840
-  1  33  11 1.000 0 33201  1825
-  1  43  84 1.000 0 33201  4507
-  1  27  39 1.000 0 33201   529
-  1  27  40 1.000 0 33201   526
-  1  33   9 1.000 0 33201  1805
-  1  35   6 1.000 0 33201  1826
-  1  28  36 1.000 0 33201   506
-  1  24  87 1.000 0 33201  4071
-  1  16  87 1.000 0 33106  2834
-  1  43  98 1.000 0 33201  4434
-  1  41  98 1.000 0 33201  4428
-  1  45  97 1.000 0 33201  4524
-  1   9  75 1.000 0 30399   715
-  1  30  74 1.000 0 33201  4058
-  1  21  91 1.000 0 33106  2879
-  1  45  73 1.000 0 33201  4141
-  1   8  75 1.000 0 30399   727
-  1  10  75 1.000 0 30399   713
-  1  41  96 1.000 0 33201  4490
-  1  30  62 1.000 0 33201  3467
-  1  27  65 1.000 0 33201  3456
-  1  15  80 1.000 0 33201  4475
-  1  19  59 1.000 0 33201  3424
-  1  41  91 1.000 0 33201  5155
-  1  45  72 1.000 0 33201  4147
-  1  10  72 1.000 0 30399   857
-  1   8  71 1.000 0 30399   788
-  1  44  73 1.000 0 33201  4139
-  1  49  74 1.000 0 33201  4127
-  1  16  86 1.000 0 33106  2845
-  1  47  74 1.000 0 33201  4131
-  1  31  55 1.000 0 33106  2573
-  1  45  98 1.000 0 33201  4452
-  1  23  91 1.000 0 33106  2887
-  1  36  69 1.000 0 33201  3888
-  1  29  58 1.000 0 33201  3502
-  1  28  65 1.000 0 33201  3457
-  1  26  65 1.000 0 33201  3454
-  1  26  58 1.000 0 33201  3497
-  1  28  58 1.000 0 33201  3499
-  1  44  98 1.000 0 33201  4442
-  1  42 100 1.000 0 33201  4383
-  1  27  58 1.000 0 33201  3498
-  1   9  77 1.000 0 30399   344
-  1  41  97 1.000 0 33201  4494
-  1  27  59 1.000 0 33201  3504
-  1  10  77 1.000 0 30399   335
-  1  44  97 1.000 0 33201  4512
-  1  30  58 1.000 0 33201  3501
-  1  43  97 1.000 0 33201  4496
-  1  26  57 1.000 0 33201  3485
-  1  32  55 1.000 0 33106  2579
-  1  31  54 1.000 0 33106  2594
-  1  26  60 1.000 0 33201  3508
-  1  34  55 1.000 0 33106  2585
-  1  33  55 1.000 0 33106  2581
-  1  42  97 1.000 0 33201  4495
-  1  36  97 1.000 0 33106  2907
-  1  33  56 1.000 0 33201  3531
-  1  48  64 1.000 0 33106  2873
-  1  48  34 1.000 0 33106  2503
-  1  48  33 1.000 0 33106  2504
-  1  48  32 1.000 0 33106  2505
-  1  47  64 1.000 0 33106  2868
-  1  35  54 1.000 0 33106  2673
-  1  50  63 1.000 0 33106  2865
-  1  46  64 1.000 0 33106  2867
-  1  28  60 1.000 0 33201  3511
-  1  29  60 1.000 0 33201  3512
-  1  35  55 1.000 0 33106  2587
-  1  33  54 1.000 0 33106  2608
-  1  31  51 1.000 0 33106  2674
-  1  34  56 1.000 0 33201  3532
-  1  27  60 1.000 0 33201  3510
-  1  35  52 1.000 0 33106  2695
-  1  34  54 1.000 0 33106  2610
-  1  35  56 1.000 0 33201  3533
-  1  33  52 1.000 0 33106  2690
-  1  32  54 1.000 0 33106  2595
-  1  45  64 1.000 0 33106  2812
-  1  49  33 1.000 0 33106  2510
-  1  25  17 1.000 0 33201  1608
-  1  40  78 1.000 0 33201  4337
-  1  30  68 1.000 0 33201  4085
-  1  49  64 1.000 0 33106  2874
-  1  43  64 1.000 0 33106  2855
-  1  25  16 1.000 0 33201  1607
-  1  36  79 1.000 0 33201  4326
-  1  28  56 1.000 0 33201  3482
-  1  41  63 1.000 0 33106  2831
-  1  25  18 1.000 0 33201  1609
-  1  25  19 1.000 0 33201  1610
-  1  26  68 1.000 0 33201  4089
-  1  37  79 1.000 0 33201  4327
-  1  38  79 1.000 0 33201  4329
-  1  22  20 1.000 0 33201  1629
-  1  49  35 1.000 0 33106  2501
-  1  40  79 1.000 0 33201  4331
-  1  44  62 1.000 0 33106  2820
-  1  49  32 1.000 0 33106  2511
-  1  44  63 1.000 0 33106  2835
-  1  13  55 1.000 0 33201  3316
-  1  23  19 1.000 0 33201  1617
-  1  31  77 1.000 0 33201  4272
-  1  24  20 1.000 0 33201  1615
-  1  25  20 1.000 0 33201  1606
-  1  41  62 1.000 0 33106  2822
-  1  41  65 1.000 0 33106  2765
-  1  12  55 1.000 0 33201  3315
-  1  36  80 1.000 0 33201  4338
-  1  29  68 1.000 0 33201  4086
-  1  24  17 1.000 0 33201  1613
-  1  42  62 1.000 0 33106  2824
-  1  24  18 1.000 0 33201  1616
-  1  45  63 1.000 0 33106  2837
-  1  29   7 1.000 0 33106  2392
-  1  30  10 1.000 0 33106  2375
-  1  47  32 1.000 0 33106  2492
-  1  29  70 1.000 0 33201  4095
-  1  39  79 1.000 0 33201  4330
-  1  26  69 1.000 0 33201  4098
-  1  41  61 1.000 0 33106  2838
-  1  42  63 1.000 0 33106  2832
-  1  46  63 1.000 0 33106  2859
-  1  42  64 1.000 0 33106  2817
-  1  17  85 1.000 0 33106  2872
-  1  48  35 1.000 0 33106  2502
-  1  47  63 1.000 0 33106  2861
-  1  48  63 1.000 0 33106  2863
-  1  27  68 1.000 0 33201  4088
-  1  28  69 1.000 0 33201  4100
-  1  42  61 1.000 0 33106  2839
-  1  34  92 1.000 0 33201  4268
-  1  49  63 1.000 0 33106  2864
-  1  41  64 1.000 0 33106  2854
-  1  47  31 1.000 0 33106  2493
-  1  27  69 1.000 0 33201  4099
-  1  30  69 1.000 0 33201  4102
-  1  30  53 1.000 0 33201  3335
-  1  37  56 1.000 0 33106  2736
-  1  28  55 1.000 0 33201  3332
-  1  26  53 1.000 0 33201  3340
-  1  26  56 1.000 0 33201  3479
-  1  29  53 1.000 0 33201  3336
-  1  27  52 1.000 0 33201  3348
-  1  36  56 1.000 0 33106  2735
-  1  30  56 1.000 0 33201  3484
-  1  27  56 1.000 0 33201  3480
-  1  39  56 1.000 0 33106  2740
-  1  40  36 1.000 0 33106  2361
-  1  30  52 1.000 0 33201  3352
-  1  30  55 1.000 0 33201  3334
-  1  30   6 1.000 0 33106  2368
-  1  26  55 1.000 0 33201  3330
-  1  29  55 1.000 0 33201  3333
-  1  27  55 1.000 0 33201  3331
-  1  38  56 1.000 0 33106  2738
-  1  37  77 1.000 0 33201  4322
-  1  29  80 1.000 0 33201  4430
-  1  43  65 1.000 0 33106  2827
-  1  36  77 1.000 0 33201  4320
-  1  50  35 1.000 0 33106  2494
-  1  39  38 1.000 0 33106  2222
-  1  30   8 1.000 0 33106  2373
-  1  46  90 1.000 0 33201  4446
-  1  29  69 1.000 0 33201  4101
-  1  44  65 1.000 0 33106  2828
-  1  47  76 1.000 0 33201  4569
-  1  45  65 1.000 0 33106  2830
-  1  30   7 1.000 0 33106  2371
-  1  39  77 1.000 0 33201  4324
-  1  47  90 1.000 0 33201  4445
-  1  38  77 1.000 0 33201  4323
-  1  43  74 1.000 0 33201  4161
-  1  28  80 1.000 0 33201  4429
-  1  46  76 1.000 0 33201  4568
-  1  48  90 1.000 0 33201  4447
-  1  26  79 1.000 0 33201  4420
-  1  40  77 1.000 0 33201  4325
-  1  33  81 1.000 0 33201  4650
-  1  27  77 1.000 0 33201  4435
-  1  20  82 1.000 0 33106  2811
-  1  43  63 1.000 0 33106  2833
-  1  40  39 1.000 0 33106  2364
-  1  26   9 1.000 0 33106  2383
-  1  49  90 1.000 0 33201  4448
-  1  28  70 1.000 0 33201  4094
-  1  30   9 1.000 0 33106  2374
-  1  39  78 1.000 0 33201  4336
-  1  39  37 1.000 0 33106  2214
-  1  40  38 1.000 0 33106  2363
-  1  28  79 1.000 0 33201  4419
-  1  30  80 1.000 0 33201  4431
-  1  49  76 1.000 0 33201  4571
-  1  50  76 1.000 0 33201  4572
-  1  34  81 1.000 0 33201  4651
-  1  27  80 1.000 0 33201  4427
-  1  28  68 1.000 0 33201  4087
-  1  20  79 1.000 0 33201  4411
-  1  49  34 1.000 0 33106  2509
-  1  50  77 1.000 0 33201  4578
-  1  29  79 1.000 0 33201  4423
-  1  19  83 1.000 0 33106  2771
-  1  19  79 1.000 0 33201  4413
-  1  26  77 1.000 0 33201  4432
-  1  37  78 1.000 0 33201  4333
-  1  38  78 1.000 0 33201  4334
-  1  28  77 1.000 0 33201  4436
-  1  30  70 1.000 0 33201  4096
-  1  39  40 1.000 0 33106  2212
-  1  27  53 1.000 0 33201  3339
-  1  30  60 1.000 0 33201  3514
-  1  39  36 1.000 0 33106  2213
-  1  28  10 1.000 0 33106  2390
-  1  28  53 1.000 0 33201  3338
-  1  42  65 1.000 0 33106  2826
-  1  36  76 1.000 0 33201  4315
-  1  43  62 1.000 0 33106  2825
-  1  26  51 1.000 0 33201  3341
-  1  27   8 1.000 0 33106  2360
-  1  47  82 1.000 0 33201  4544
-  1  38  60 1.000 0 33106  2751
-  1  41  85 1.000 0 33201  4500
-  1  39  60 1.000 0 33106  2752
-  1  28  52 1.000 0 33201  3350
-  1  22  16 1.000 0 33201  1628
-  1  36  78 1.000 0 33201  4332
-  1  22  19 1.000 0 33201  1625
-  1  45  62 1.000 0 33106  2818
-  1  36  37 1.000 0 33106  2217
-  1  42  59 1.000 0 33106  2756
-  1  40  56 1.000 0 33106  2742
-  1  36  39 1.000 0 33106  2025
-  1  39  39 1.000 0 33106  2223
-  1  36  40 1.000 0 33106  2221
-  1  30  54 1.000 0 33201  3353
-  1  22  18 1.000 0 33201  1626
-  1  48  77 1.000 0 33201  4576
-  1  40  59 1.000 0 33106  2748
-  1  38  76 1.000 0 33201  4317
-  1  48  76 1.000 0 33201  4570
-  1  50  32 1.000 0 33106  2499
-  1  50  33 1.000 0 33106  2498
-  1  45  61 1.000 0 33106  2849
-  1  37  60 1.000 0 33106  2750
-  1  39  76 1.000 0 33201  4318
-  1  30  51 1.000 0 33201  3346
-  1  28   6 1.000 0 33106  2386
-  1  37  59 1.000 0 33106  2744
-  1  40  60 1.000 0 33106  2753
-  1  36  60 1.000 0 33106  2749
-  1  36  36 1.000 0 33106  2219
-  1  41  60 1.000 0 33106  2757
-  1  36  59 1.000 0 33106  2743
-  1  41  59 1.000 0 33106  2755
-  1  28   9 1.000 0 33106  2389
-  1  28  51 1.000 0 33201  3343
-  1  46  77 1.000 0 33201  4573
-  1  36  38 1.000 0 33106  2215
-  1  50  34 1.000 0 33106  2495
-  1  49  77 1.000 0 33201  4577
-  1  29   8 1.000 0 33106  2354
-  1  48  31 1.000 0 33106  2506
-  1  21  16 1.000 0 33201  1630
-  1  28   8 1.000 0 33106  2388
-  1  29  10 1.000 0 33106  2356
-  1  47  77 1.000 0 33201  4575
-  1  41  76 1.000 0 33201  4370
-  1  44  64 1.000 0 33106  2970
-  1  49  31 1.000 0 33106  2513
-  1  39  59 1.000 0 33106  2747
-  1  21  17 1.000 0 33201  1631
-  1  43  76 1.000 0 33201  4371
-  1  21  19 1.000 0 33201  1633
-  1  21  18 1.000 0 33201  1632
-  1  29   6 1.000 0 33106  2391
-  1  38  59 1.000 0 33106  2745
-  1  22  17 1.000 0 33201  1627
-  1  50  31 1.000 0 33106  2500
-  1  44  61 1.000 0 33106  2848
-  1  43  61 1.000 0 33106  2847
-  1  29   9 1.000 0 33106  2355
-  1  28   7 1.000 0 33106  2387
-  1  26   7 1.000 0 33106  2380
-  1  30  79 1.000 0 33201  4424
-  1  26   8 1.000 0 33106  2381
-  1  26  80 1.000 0 33201  4426
-  1  40  37 1.000 0 33106  2362
-  1  26  10 1.000 0 33106  2385
-  1  26   6 1.000 0 33106  2379
-  1  26  86 1.000 0 33201  4688
-  1  27  10 1.000 0 33106  2331
-  1  28  86 1.000 0 33201  4691
-  1  46  85 1.000 0 33201  4535
-  1  27   9 1.000 0 33106  2327
-  1  26  52 1.000 0 33201  3347
-  1  27  94 1.000 0 33106  2945
-  1  27   7 1.000 0 33106  2358
-  1  27  86 1.000 0 33201  4689
-  1  29  56 1.000 0 33201  3483
-  1  30  87 1.000 0 33201  4681
-  1  28  54 1.000 0 33201  3357
-  1  27   6 1.000 0 33106  2357
-  1  27  54 1.000 0 33201  3358
-  1  27  51 1.000 0 33201  3342
-  1  29  51 1.000 0 33201  3345
-  1  26  54 1.000 0 33201  3359
-  1  29  54 1.000 0 33201  3355
-  1  29  52 1.000 0 33201  3351
-  1  42  85 1.000 0 33201  4501
-  1  30  94 1.000 0 33106  2948
-  1  42  84 1.000 0 33201  4506
-  1  50  82 1.000 0 33201  4548
-  1  47  85 1.000 0 33201  4536
-  1  19  85 1.000 0 33106  2903
-  1  16  61 1.000 0 33201  4036
-  1  18  65 1.000 0 33201  4023
-  1  32  92 1.000 0 33201  4248
-  1  48  81 1.000 0 33201  4530
-  1  45  85 1.000 0 33201  4504
-  1  28  91 1.000 0 33106  2956
-  1  34  90 1.000 0 33201  4815
-  1  50  85 1.000 0 33201  4533
-  1  45  96 1.000 0 33201  4128
-  1  35  81 1.000 0 33201  4652
-  1  27  87 1.000 0 33201  4678
-  1  30  77 1.000 0 33201  4438
-  1  29  77 1.000 0 33201  4437
-  1  26  87 1.000 0 33201  4677
-  1  31  85 1.000 0 33201  4658
-  1  35  90 1.000 0 33201  4818
-  1  48  82 1.000 0 33201  4545
-  1  13  77 1.000 0 33201  4166
-  1  29  87 1.000 0 33201  4680
-  1  16  84 1.000 0 33106  2777
-  1  44  85 1.000 0 33201  4503
-  1  41  81 1.000 0 33201  4518
-  1  44  81 1.000 0 33201  4520
-  1  20  61 1.000 0 33201  4516
-  1  44  83 1.000 0 33201  4514
-  1  48  84 1.000 0 33201  4541
-  1  35  76 1.000 0 33201  4280
-  1  25  81 1.000 0 33201  4480
-  1  45  82 1.000 0 33201  4527
-  1  46  82 1.000 0 33201  4543
-  1  42  81 1.000 0 33201  4517
-  1  29  86 1.000 0 33201  4692
-  1  50  89 1.000 0 33201  4468
-  1  23  81 1.000 0 33201  4478
-  1  22  83 1.000 0 33201  4489
-  1  31  90 1.000 0 33201  4814
-  1  43  82 1.000 0 33201  4523
-  1  42  82 1.000 0 33201  4522
-  1  49  85 1.000 0 33201  4547
-  1  46  83 1.000 0 33201  4549
-  1  44  82 1.000 0 33201  4525
-  1  29  75 1.000 0 33201  4063
-  1  26  71 1.000 0 33201  4046
-  1  27  73 1.000 0 33201  4042
-  1  18  83 1.000 0 33106  2770
-  1  44  75 1.000 0 33201  4157
-  1  17  61 1.000 0 33201  4037
-  1  17  64 1.000 0 33201  4028
-  1  46  84 1.000 0 33201  4539
-  1  49  81 1.000 0 33201  4531
-  1  48  85 1.000 0 33201  4537
-  1  25  82 1.000 0 33201  4484
-  1  29  84 1.000 0 33201  4587
-  1  43  83 1.000 0 33201  4513
-  1  21  82 1.000 0 33201  4485
-  1  22  85 1.000 0 33201  4471
-  1  16  82 1.000 0 33106  2795
-  1  31  79 1.000 0 33201  4288
-  1  33  92 1.000 0 33201  4256
-  1  29  71 1.000 0 33201  4052
-  1  16  62 1.000 0 33201  4014
-  1  16  85 1.000 0 33106  2836
-  1  18  64 1.000 0 33201  4029
-  1  31  92 1.000 0 33201  4244
-  1  33  76 1.000 0 33201  4279
-  1  47  89 1.000 0 33201  4464
-  1  21  83 1.000 0 33201  4486
-  1  32  77 1.000 0 33201  4273
-  1  47  84 1.000 0 33201  4540
-  1  33  75 1.000 0 33201  4291
-  1  20  85 1.000 0 33106  2919
-  1  19  82 1.000 0 33106  2813
-  1  43  85 1.000 0 33201  4502
-  1  28  84 1.000 0 33201  4586
-  1  49  89 1.000 0 33201  4467
-  1  19  81 1.000 0 33106  2823
-  1  49  86 1.000 0 33201  4462
-  1  50  84 1.000 0 33201  4534
-  1  47  83 1.000 0 33201  4550
-  1  48  83 1.000 0 33201  4551
-  1  50  86 1.000 0 33201  4463
-  1  22  84 1.000 0 33201  4493
-  1  43  81 1.000 0 33201  4519
-  1  34  80 1.000 0 33201  4262
-  1  26  84 1.000 0 33201  4584
-  1  20  84 1.000 0 33106  2785
-  1  33  79 1.000 0 33201  4286
-  1  28  87 1.000 0 33201  4679
-  1  33  85 1.000 0 33201  4660
-  1  27  88 1.000 0 33201  4666
-  1  26  88 1.000 0 33201  4665
-  1  32  81 1.000 0 33201  4649
-  1  33  90 1.000 0 33201  4813
-  1  26  94 1.000 0 33106  2944
-  1  34  85 1.000 0 33201  4663
-  1  35  85 1.000 0 33201  4664
-  1  30  88 1.000 0 33201  4669
-  1  31  81 1.000 0 33201  4648
-  1  18  81 1.000 0 33106  2819
-  1  28  88 1.000 0 33201  4667
-  1  29  88 1.000 0 33201  4668
-  1  32  85 1.000 0 33201  4659
-  1  24  82 1.000 0 33201  4483
-  1  29  85 1.000 0 33201  4582
-  1  41  82 1.000 0 33201  4521
-  1  33  78 1.000 0 33201  4266
-  1  50  83 1.000 0 33201  4538
-  1  50  81 1.000 0 33201  4532
-  1  45  83 1.000 0 33201  4515
-  1  48  88 1.000 0 33201  4454
-  1  24  84 1.000 0 33201  4498
-  1  47  81 1.000 0 33201  4529
-  1  49  83 1.000 0 33201  4552
-  1  46  81 1.000 0 33201  4528
-  1  49  82 1.000 0 33201  4546
-  1  49  84 1.000 0 33201  4542
-  1  34  86 1.000 0 33201  4790
-  1  29  94 1.000 0 33106  2947
-  1  28  94 1.000 0 33106  2946
-  1  48  86 1.000 0 33201  4461
-  1  30  85 1.000 0 33201  4583
-  1  16  83 1.000 0 33106  2759
-  1  35  72 1.000 0 33201  4294
-  1  31  76 1.000 0 33201  4277
-  1  34  72 1.000 0 33201  4295
-  1  26  85 1.000 0 33201  4579
-  1  21  84 1.000 0 33201  4492
-  1  27  70 1.000 0 33201  4091
-  1  26  91 1.000 0 33106  2961
-  1  30  95 1.000 0 33106  2841
-  1  32  90 1.000 0 33201  4812
-  1  43  71 1.000 0 33201  4150
-  1  18  85 1.000 0 33106  2875
-  1  34  71 1.000 0 33201  4308
-  1  32  78 1.000 0 33201  4265
-  1  16  65 1.000 0 33201  4020
-  1  33  71 1.000 0 33201  4306
-  1  32  80 1.000 0 33201  4260
-  1  34  78 1.000 0 33201  4267
-  1  35  80 1.000 0 33201  4271
-  1  22  82 1.000 0 33201  4481
-  1  34  76 1.000 0 33201  4282
-  1  42  74 1.000 0 33201  4160
-  1  29  95 1.000 0 33106  2808
-  1  30  91 1.000 0 33106  2954
-  1  41  71 1.000 0 33201  4148
-  1  41  74 1.000 0 33201  4159
-  1  45  71 1.000 0 33201  4153
-  1  43  75 1.000 0 33201  4156
-  1  19  64 1.000 0 33201  4030
-  1  19  62 1.000 0 33201  4018
-  1  13  76 1.000 0 33201  4205
-  1  26  73 1.000 0 33201  4047
-  1  17  63 1.000 0 33201  4033
-  1  35  75 1.000 0 33201  4293
-  1  44  71 1.000 0 33201  4152
-  1  34  79 1.000 0 33201  4285
-  1  42  71 1.000 0 33201  4149
-  1  35  79 1.000 0 33201  4284
-  1  32  76 1.000 0 33201  4278
-  1  20  62 1.000 0 33201  4019
-  1  28  75 1.000 0 33201  4062
-  1  27  91 1.000 0 33106  2960
-  1  18  63 1.000 0 33201  4034
-  1  33  80 1.000 0 33201  4261
-  1  24  83 1.000 0 33201  4488
-  1  19  61 1.000 0 33201  4039
-  1  49  88 1.000 0 33201  4456
-  1  31  72 1.000 0 33201  4298
-  1  32  72 1.000 0 33201  4297
-  1  46  89 1.000 0 33201  4465
-  1  33  72 1.000 0 33201  4296
-  1  18  61 1.000 0 33201  4038
-  1  28  85 1.000 0 33201  4581
-  1  22  81 1.000 0 33201  4477
-  1  25  84 1.000 0 33201  4499
-  1  34  77 1.000 0 33201  4275
-  1  33  77 1.000 0 33201  4274
-  1  50  88 1.000 0 33201  4457
-  1  44  74 1.000 0 33201  4162
-  1  26  89 1.000 0 33201  4671
-  1  23  83 1.000 0 33201  4487
-  1  47  88 1.000 0 33201  4451
-  1  46  88 1.000 0 33201  4450
-  1  31  80 1.000 0 33201  4259
-  1  32  74 1.000 0 33201  4313
-  1  20  64 1.000 0 33201  4031
-  1  25  83 1.000 0 33201  4491
-  1  34  74 1.000 0 33201  4311
-  1  18  62 1.000 0 33201  4017
-  1  20  65 1.000 0 33201  4026
-  1  34  73 1.000 0 33201  4302
-  1  17  65 1.000 0 33201  4021
-  1  29  73 1.000 0 33201  4044
-  1  24  81 1.000 0 33201  4479
-  1  27  75 1.000 0 33201  4060
-  1  27  89 1.000 0 33201  4672
-  1  31  78 1.000 0 33201  4264
-  1  35  78 1.000 0 33201  4263
-  1  31  71 1.000 0 33201  4304
-  1  35  74 1.000 0 33201  4310
-  1  35  92 1.000 0 33201  4269
-  1  33  73 1.000 0 33201  4301
-  1  33  74 1.000 0 33201  4312
-  1  34  75 1.000 0 33201  4292
-  1  20  83 1.000 0 33106  2772
-  1  23  82 1.000 0 33201  4482
-  1  29  91 1.000 0 33106  2955
-  1  35  73 1.000 0 33201  4303
-  1  21  81 1.000 0 33201  4476
-  1  27  85 1.000 0 33201  4580
-  1  32  71 1.000 0 33201  4305
-  1  23  84 1.000 0 33201  4497
-  1  31  73 1.000 0 33201  4299
-  1  17  84 1.000 0 33106  2778
-  1  32  79 1.000 0 33201  4287
-  1  35  71 1.000 0 33201  4309
-  1  30  84 1.000 0 33201  4588
-  1  31  74 1.000 0 33201  4314
-  1  19  84 1.000 0 33106  2782
-  1  31  75 1.000 0 33201  4289
-  1  32  75 1.000 0 33201  4290
-  1  20  63 1.000 0 33201  4041
-  1  16  64 1.000 0 33201  4027
-  1  28  73 1.000 0 33201  4043
-  1  42  75 1.000 0 33201  4155
-  1  19  65 1.000 0 33201  4024
-  1  30  71 1.000 0 33201  4053
-  1  27  71 1.000 0 33201  4049
-  1  19  63 1.000 0 33201  4035
-  1  17  82 1.000 0 33106  2797
-  1  45  74 1.000 0 33201  4163
-  1  28  71 1.000 0 33201  4050
-  1  30  75 1.000 0 33201  4064
-  1  45  75 1.000 0 33201  4158
-  1  17  62 1.000 0 33201  4016
-  1  17  83 1.000 0 33106  2763
-  1  18  84 1.000 0 33106  2779
-  1  17  81 1.000 0 33106  2816
-  1  30  73 1.000 0 33201  4045
-  1  18  82 1.000 0 33106  2799
-  1  16  63 1.000 0 33201  4032
-  1  41  75 1.000 0 33201  4154
-  1  28  89 1.000 0 33201  4673
-  1  26  70 1.000 0 33201  4090
-  1  20  81 1.000 0 33106  2869
-  1  16  81 1.000 0 33106  2815
-  1  71  38 1.000 0 33201  5281
-  1  96  45 1.000 0 33201  5067
-  1  71  37 1.000 0 33201  5294
-  1  74  37 1.000 0 33201  5291
-  1  78  35 1.000 0 33201  5395
-  1  96  42 1.000 0 33201  5023
-  1  97  41 1.000 0 33201  5030
-  1 100  43 1.000 0 33201  5103
-  1  73  36 1.000 0 33201  5304
-  1  98  45 1.000 0 33201  5046
-  1  79  35 1.000 0 33201  5396
-  1  97  43 1.000 0 33201  5115
-  1  77  33 1.000 0 33201  5406
-  1  53  71 1.000 0 33201  2668
-  1  98  41 1.000 0 33201  5029
-  1  99  41 1.000 0 33201  5032
-  1  72  36 1.000 0 33201  5303
-  1 100  45 1.000 0 33201  5073
-  1  99  43 1.000 0 33201  5088
-  1  62  24 1.000 0 33201  5929
-  1  65  63 1.000 0 33106  2478
-  1  65  61 1.000 0 33106  2476
-  1  77  15 1.000 0 33201  5504
-  1  65  23 1.000 0 33201  5939
-  1  63  23 1.000 0 33201  5944
-  1  61  24 1.000 0 33201  5928
-  1  64  24 1.000 0 33201  5931
-  1  62  23 1.000 0 33201  5945
-  1  65  12 1.000 0 33201  5685
-  1  76  15 1.000 0 33201  5494
-  1  65  21 1.000 0 33201  5933
-  1  63  14 1.000 0 33201  5855
-  1  65  64 1.000 0 33106  2479
-  1  65  62 1.000 0 33106  2477
-  1  91  28 1.000 0 33106  3008
-  1  64  21 1.000 0 33201  5932
-  1  58  15 1.000 0 33201  6147
-  1  63  21 1.000 0 33201  5934
-  1  57  15 1.000 0 33201  6149
-  1  65  65 1.000 0 33106  2434
-  1  66  11 1.000 0 33201  5781
-  1  70  24 1.000 0 33201  5908
-  1  69  24 1.000 0 33201  5909
-  1  67  24 1.000 0 33201  5911
-  1  61  12 1.000 0 33201  5862
-  1  68  12 1.000 0 33201  5774
-  1  63  12 1.000 0 33201  5896
-  1  80  14 1.000 0 33201  5483
-  1  70  11 1.000 0 33201  5777
-  1  68  24 1.000 0 33201  5910
-  1  79  15 1.000 0 33201  5505
-  1  68  11 1.000 0 33201  5779
-  1 100  57 1.000 0 33201  2754
-  1  70   8 1.000 0 33201  5558
-  1  94  47 1.000 0 33201  4825
-  1  69  25 1.000 0 33201  5904
-  1  70  25 1.000 0 33201  5903
-  1  61  21 1.000 0 33201  5936
-  1  62  21 1.000 0 33201  5935
-  1  67  25 1.000 0 33201  5906
-  1  56  15 1.000 0 33201  6201
-  1  60  15 1.000 0 33201  6150
-  1  66  13 1.000 0 33201  5764
-  1  70  13 1.000 0 33201  5765
-  1  91  29 1.000 0 33106  2994
-  1  70  12 1.000 0 33201  5773
-  1  69  51 1.000 0 33106  2393
-  1  69  11 1.000 0 33201  5778
-  1  63  30 1.000 0 33201  5720
-  1  65  13 1.000 0 33201  6043
-  1  60  93 1.000 0 33201  3239
-  1  62  13 1.000 0 33201  6116
-  1  60  95 1.000 0 33201  3237
-  1  61  13 1.000 0 33201  6032
-  1  69  53 1.000 0 33106  2395
-  1  91  48 1.000 0 33201  4836
-  1  62  27 1.000 0 33201  5723
-  1  61  22 1.000 0 33201  5953
-  1  65  18 1.000 0 33201  6123
-  1  61  18 1.000 0 33201  6125
-  1  94  30 1.000 0 33106  2999
-  1 100  50 1.000 0 33201  4910
-  1  62  22 1.000 0 33201  5952
-  1  96  49 1.000 0 33201  4902
-  1  63  27 1.000 0 33201  5724
-  1  95  41 1.000 0 33201  6090
-  1  99  48 1.000 0 33201  4787
-  1  95  46 1.000 0 33201  4783
-  1  92  46 1.000 0 33201  4805
-  1  96  47 1.000 0 33201  4849
-  1 100  46 1.000 0 33201  4816
-  1  97  47 1.000 0 33201  4837
-  1  98  47 1.000 0 33201  4828
-  1  99  49 1.000 0 33201  4804
-  1  96  50 1.000 0 33201  4953
-  1  65  27 1.000 0 33201  5726
-  1  91  47 1.000 0 33201  4829
-  1  93  46 1.000 0 33201  4803
-  1  92  48 1.000 0 33201  4835
-  1  97  46 1.000 0 33201  4867
-  1  86  45 1.000 0 33201  4964
-  1  94  48 1.000 0 33201  4831
-  1  99  46 1.000 0 33201  4817
-  1  95  48 1.000 0 33201  4832
-  1  99  47 1.000 0 33201  4822
-  1 100  47 1.000 0 33201  4811
-  1  96  48 1.000 0 33201  4801
-  1 100  48 1.000 0 33201  4799
-  1  93  29 1.000 0 33106  2990
-  1  94  29 1.000 0 33106  2987
-  1  96  46 1.000 0 33201  4872
-  1  61  27 1.000 0 33201  5722
-  1  95  47 1.000 0 33201  4830
-  1  64  27 1.000 0 33201  5725
-  1  72  16 1.000 0 33201  6050
-  1  93  48 1.000 0 33201  4833
-  1  93  47 1.000 0 33201  4826
-  1  97  48 1.000 0 33201  4793
-  1  92  47 1.000 0 33201  4827
-  1  62  30 1.000 0 33201  5717
-  1  92  29 1.000 0 33106  2991
-  1  65  30 1.000 0 33201  5718
-  1 100  56 1.000 0 33201  2753
-  1  64  30 1.000 0 33201  5721
-  1  61  30 1.000 0 33201  5716
-  1  97  50 1.000 0 33201  4949
-  1  96  41 1.000 0 33201  5036
-  1  98  42 1.000 0 33201  5020
-  1 100  49 1.000 0 33201  4886
-  1  96  43 1.000 0 33201  5117
-  1  72  40 1.000 0 33201  5297
-  1  99  42 1.000 0 33201  5014
-  1  97  42 1.000 0 33201  5022
-  1  71  36 1.000 0 33201  5302
-  1  76  33 1.000 0 33201  5405
-  1  66  25 1.000 0 33201  5907
-  1  98  49 1.000 0 33201  4888
-  1  76  35 1.000 0 33201  5394
-  1  75  36 1.000 0 33201  5300
-  1  77  35 1.000 0 33201  5397
-  1  64  23 1.000 0 33201  5943
-  1  65  22 1.000 0 33201  5950
-  1 100  42 1.000 0 33201  5011
-  1  63  22 1.000 0 33201  5951
-  1  64  22 1.000 0 33201  5949
-  1  97  49 1.000 0 33201  4891
-  1  75  37 1.000 0 33201  5290
-  1  78  34 1.000 0 33201  5400
-  1  98  52 1.000 0 33201  2352
-  1  98  51 1.000 0 33201  2344
-  1 100  55 1.000 0 33201  2509
-  1  77  34 1.000 0 33201  5401
-  1  94  75 1.000 0 33106  2530
-  1  72  37 1.000 0 33201  5293
-  1  98  54 1.000 0 33201  2384
-  1 100  54 1.000 0 33201  2502
-  1  98  59 1.000 0 33201  2685
-  1  97  45 1.000 0 33201  5043
-  1  98  55 1.000 0 33201  2387
-  1 100  60 1.000 0 33201  2783
-  1  96  55 1.000 0 33201  2333
-  1  99  45 1.000 0 33201  5054
-  1  98  53 1.000 0 33201  2371
-  1  74  35 1.000 0 33201  5419
-  1  72  38 1.000 0 33201  5280
-  1  75  38 1.000 0 33201  5277
-  1  80  35 1.000 0 33201  5393
-  1  60  91 1.000 0 33201  3241
-  1  79  34 1.000 0 33201  5398
-  1 100  58 1.000 0 33201  2758
-  1  73  37 1.000 0 33201  5292
-  1  52  35 1.000 0 33106  3313
-  1  52  34 1.000 0 33106  3228
-  1  55  31 1.000 0 33106  3323
-  1  52  31 1.000 0 33106  3330
-  1  75  82 1.000 0 33201  2935
-  1  75  85 1.000 0 33201  2932
-  1  53  35 1.000 0 33106  3312
-  1  76  80 1.000 0 33201  2918
-  1  75  83 1.000 0 33201  2934
-  1  77  79 1.000 0 33201  2909
-  1  75  81 1.000 0 33201  2936
-  1  75  84 1.000 0 33201  2933
-  1  77  77 1.000 0 33201  2911
-  1  76  76 1.000 0 33201  2925
-  1  54  31 1.000 0 33106  3325
-  1  51  34 1.000 0 33106  3293
-  1  79  77 1.000 0 33201  2906
-  1  77  80 1.000 0 33201  2908
-  1  77  76 1.000 0 33201  2912
-  1  53  33 1.000 0 33106  3301
-  1  78  78 1.000 0 33201  2915
-  1  78  79 1.000 0 33201  2914
-  1  51  31 1.000 0 33106  3331
-  1  78  77 1.000 0 33201  2916
-  1  79  80 1.000 0 33201  2902
-  1  54  33 1.000 0 33106  3298
-  1  75  79 1.000 0 33201  2768
-  1  77  78 1.000 0 33201  2910
-  1  78  76 1.000 0 33201  2917
-  1  58   7 1.000 0 33201  4702
-  1  93  63 1.000 0 33201  2257
-  1  76  12 1.000 0 33201  5309
-  1  93  42 1.000 0 33201  6095
-  1  91  31 1.000 0 33106  2898
-  1  92  42 1.000 0 33201  6096
-  1  93  64 1.000 0 33201  2256
-  1  77  13 1.000 0 33201  5399
-  1  93  62 1.000 0 33201  2258
-  1  93  65 1.000 0 33201  2255
-  1  52  11 1.000 0 33201  6263
-  1  61   4 1.000 0 33106  3435
-  1  72  11 1.000 0 33201  6310
-  1  78  12 1.000 0 33201  5344
-  1  80  11 1.000 0 33201  5305
-  1  64  10 1.000 0 33201  6277
-  1  61  10 1.000 0 33201  6274
-  1  83  18 1.000 0 33106  3267
-  1  95  42 1.000 0 33201  6091
-  1  55  11 1.000 0 33201  6266
-  1  84  18 1.000 0 33106  3183
-  1  79  76 1.000 0 33201  2907
-  1  95  32 1.000 0 33106  3021
-  1  94  35 1.000 0 33106  2971
-  1  92  33 1.000 0 33106  3068
-  1  98  43 1.000 0 33201  5096
-  1  90  22 1.000 0 33201  5194
-  1  91  35 1.000 0 33106  2959
-  1  81  18 1.000 0 33106  3257
-  1  55  84 1.000 0 33201  3060
-  1  80  12 1.000 0 33201  5307
-  1  71  11 1.000 0 33201  6318
-  1  77  12 1.000 0 33201  5350
-  1  75  16 1.000 0 33201  6047
-  1  74  31 1.000 0 33201  5429
-  1  92  31 1.000 0 33106  3088
-  1  59  96 1.000 0 33201  1437
-  1  80  65 1.000 0 33201  2350
-  1  88  22 1.000 0 33201  5202
-  1  87  22 1.000 0 33201  5208
-  1  78  65 1.000 0 33201  2323
-  1  90  23 1.000 0 33201  5212
-  1  60  79 1.000 0 33201  2847
-  1  55  33 1.000 0 33106  3305
-  1  70  38 1.000 0 33201  5530
-  1  66  38 1.000 0 33201  5529
-  1  51  35 1.000 0 33106  3314
-  1  89  23 1.000 0 33201  5213
-  1  92  35 1.000 0 33106  2982
-  1  75  80 1.000 0 33201  2767
-  1  75  78 1.000 0 33201  2769
-  1  75  76 1.000 0 33201  2771
-  1  54  65 1.000 0 33106  2142
-  1  84  62 1.000 0 33201  2296
-  1  80  69 1.000 0 33201  5206
-  1  77  41 1.000 0 33201  5038
-  1  84  64 1.000 0 33201  2299
-  1  81  65 1.000 0 33201  2316
-  1  76  41 1.000 0 33201  5039
-  1  78  61 1.000 0 33201  2327
-  1  78  63 1.000 0 33201  2325
-  1  82  38 1.000 0 33201  5269
-  1  77  64 1.000 0 33201  2338
-  1  52  36 1.000 0 33106  3302
-  1  60  70 1.000 0 33201  2213
-  1  79  63 1.000 0 33201  2330
-  1  52   9 1.000 0 33201  6406
-  1  84  61 1.000 0 33201  2295
-  1  82  61 1.000 0 33201  2307
-  1  84  63 1.000 0 33201  2298
-  1  79  65 1.000 0 33201  2332
-  1  60  69 1.000 0 33201  2214
-  1  80  86 1.000 0 33201  3381
-  1  78  64 1.000 0 33201  2324
-  1  68  90 1.000 0 33201  3155
-  1  81  64 1.000 0 33201  2315
-  1  84  65 1.000 0 33201  2300
-  1  79  64 1.000 0 33201  2331
-  1  53   9 1.000 0 33201  6407
-  1  54   9 1.000 0 33201  6408
-  1  71  32 1.000 0 33201  5424
-  1  87  21 1.000 0 33201  5258
-  1  71  31 1.000 0 33201  5428
-  1  83  70 1.000 0 33201  2274
-  1  73  31 1.000 0 33201  5426
-  1  83  67 1.000 0 33201  2270
-  1  87  65 1.000 0 33201  2286
-  1  71  34 1.000 0 33201  5439
-  1  54   8 1.000 0 33201  6398
-  1  91  42 1.000 0 33201  6097
-  1  53  11 1.000 0 33201  6264
-  1  77  21 1.000 0 33201  5845
-  1  82  21 1.000 0 33201  5833
-  1  72  32 1.000 0 33201  5423
-  1  72  31 1.000 0 33201  5427
-  1  72  34 1.000 0 33201  5438
-  1  76  21 1.000 0 33201  5846
-  1  73  48 1.000 0 33201  5055
-  1  80  26 1.000 0 33201  5631
-  1  62  10 1.000 0 33201  6275
-  1  51  33 1.000 0 33106  3304
-  1  72  79 1.000 0 33201  2763
-  1  75  46 1.000 0 33201  5063
-  1  56  83 1.000 0 33201  3035
-  1  56  84 1.000 0 33201  3034
-  1  60  84 1.000 0 33201  3042
-  1  60  81 1.000 0 33201  3046
-  1  56  85 1.000 0 33201  3032
-  1  60  85 1.000 0 33201  3038
-  1  59  84 1.000 0 33201  3018
-  1  59  83 1.000 0 33201  3019
-  1  95  35 1.000 0 33106  2958
-  1  59  85 1.000 0 33201  3017
-  1  79  73 1.000 0 33201  2533
-  1  85  47 1.000 0 33201  4851
-  1  58  81 1.000 0 33201  3025
-  1  90  25 1.000 0 33201  5169
-  1  59  82 1.000 0 33201  3020
-  1  54  81 1.000 0 33201  3063
-  1  54  84 1.000 0 33201  3066
-  1  53  83 1.000 0 33201  3054
-  1  57  85 1.000 0 33201  3027
-  1  56  81 1.000 0 33201  3037
-  1  80  21 1.000 0 33201  5847
-  1  83  21 1.000 0 33201  5832
-  1  95  31 1.000 0 33106  2886
-  1  52  84 1.000 0 33201  3050
-  1  88  25 1.000 0 33201  5170
-  1  52  83 1.000 0 33201  3049
-  1  60  83 1.000 0 33201  3043
-  1  71  16 1.000 0 33201  6053
-  1  56   4 1.000 0 33201  5938
-  1  80  66 1.000 0 33201  5214
-  1  81  38 1.000 0 33201  5270
-  1  75  19 1.000 0 33201  6068
-  1  91  41 1.000 0 33201  6089
-  1  74  17 1.000 0 33201  6076
-  1  73  17 1.000 0 33201  6077
-  1  74  16 1.000 0 33201  6046
-  1  73  16 1.000 0 33201  6048
-  1  80  67 1.000 0 33201  5211
-  1  81  47 1.000 0 33201  4856
-  1  80  70 1.000 0 33201  5207
-  1  69  65 1.000 0 33201  1084
-  1  76  30 1.000 0 33201  5642
-  1  77  27 1.000 0 33201  5636
-  1  72  19 1.000 0 33201  6066
-  1  86  28 1.000 0 33201  5614
-  1  89  24 1.000 0 33201  5131
-  1  74  58 1.000 0 33201   604
-  1  71  51 1.000 0 33201   951
-  1  79  26 1.000 0 33201  5632
-  1  90  28 1.000 0 33201  5613
-  1  98  44 1.000 0 33201  4992
-  1  78  26 1.000 0 33201  5630
-  1  76  26 1.000 0 33201  5627
-  1  87  27 1.000 0 33201  5607
-  1  75  60 1.000 0 33201   601
-  1  97  36 1.000 0 33201  1650
-  1  85  25 1.000 0 33201  5822
-  1  75  55 1.000 0 33201   921
-  1  84  81 1.000 0 33106  2640
-  1  84  25 1.000 0 33201  5823
-  1  86  27 1.000 0 33201  5608
-  1  85  23 1.000 0 33201  5836
-  1  74  56 1.000 0 33201   602
-  1  96  36 1.000 0 33201  2560
-  1  74  60 1.000 0 33201   606
-  1  84  15 1.000 0 33106  3415
-  1  59   3 1.000 0 33201  5920
-  1  84  48 1.000 0 33201  4858
-  1  56  32 1.000 0 33201  5310
-  1  85  38 1.000 0 33201  5266
-  1  60   6 1.000 0 33201  4705
-  1  59   9 1.000 0 33201  4694
-  1  52  67 1.000 0 33106  3198
-  1  77  70 1.000 0 33201  5215
-  1  79  66 1.000 0 33201  5188
-  1  77  68 1.000 0 33201  5217
-  1  77  67 1.000 0 33201  5219
-  1  80  68 1.000 0 33201  5209
-  1  77  66 1.000 0 33201  5220
-  1  76   9 1.000 0 33106  3451
-  1  94  33 1.000 0 33106  3037
-  1  57   6 1.000 0 33201  4709
-  1  54  79 1.000 0 33201  2864
-  1  58   6 1.000 0 33201  4708
-  1  60   9 1.000 0 33201  4695
-  1  54  76 1.000 0 33201  2867
-  1  54  78 1.000 0 33201  2865
-  1  71  19 1.000 0 33201  6067
-  1  75  50 1.000 0 33201  5047
-  1  53  79 1.000 0 33201  2877
-  1  65  81 1.000 0 33201  3000
-  1  87  28 1.000 0 33201  5612
-  1  55  85 1.000 0 33201  3062
-  1  64  85 1.000 0 33201  3012
-  1  74  66 1.000 0 33201  2432
-  1  51  79 1.000 0 33201  2873
-  1  91  30 1.000 0 33106  2989
-  1  91  27 1.000 0 33106  2957
-  1  92  26 1.000 0 33106  2939
-  1  65  85 1.000 0 33201  2997
-  1  51  80 1.000 0 33201  2875
-  1  93  30 1.000 0 33106  2997
-  1  94  26 1.000 0 33106  2931
-  1  91  26 1.000 0 33106  2943
-  1  51  77 1.000 0 33201  2870
-  1  59   8 1.000 0 33201  4717
-  1  58  38 1.000 0 33106  2998
-  1  89  25 1.000 0 33201  4935
-  1  93  26 1.000 0 33106  2933
-  1  52  77 1.000 0 33201  2861
-  1  52  78 1.000 0 33201  2858
-  1  95  33 1.000 0 33106  3079
-  1  84  46 1.000 0 33201  4844
-  1  68  33 1.000 0 33201  5456
-  1  86  22 1.000 0 33201  5210
-  1  58  84 1.000 0 33201  3023
-  1  59  81 1.000 0 33201  3021
-  1  96  64 1.000 0 33201   523
-  1  88  23 1.000 0 33201  5218
-  1  52  33 1.000 0 33106  3303
-  1  51  12 1.000 0 33201  6204
-  1  67  37 1.000 0 33201  5523
-  1  55  83 1.000 0 33201  3059
-  1  54  15 1.000 0 33201  6255
-  1  51  15 1.000 0 33201  6222
-  1  53  82 1.000 0 33201  3053
-  1  63  10 1.000 0 33201  6276
-  1  55  12 1.000 0 33201  6205
-  1  52  12 1.000 0 33201  6215
-  1  53  81 1.000 0 33201  3052
-  1  94  32 1.000 0 33106  2969
-  1  52  15 1.000 0 33201  6231
-  1  54  83 1.000 0 33201  3065
-  1  65  10 1.000 0 33201  6278
-  1  54  82 1.000 0 33201  3064
-  1  51  30 1.000 0 33201  4899
-  1  52  85 1.000 0 33201  3051
-  1  54  11 1.000 0 33201  6265
-  1  54  69 1.000 0 33106  3170
-  1  91  33 1.000 0 33106  3069
-  1  93  34 1.000 0 33106  3086
-  1  87  25 1.000 0 33201  5177
-  1  51  11 1.000 0 33201  6259
-  1  53  85 1.000 0 33201  3056
-  1  51  83 1.000 0 33201  3077
-  1  53  84 1.000 0 33201  3055
-  1  82  18 1.000 0 33106  3269
-  1  55  81 1.000 0 33201  3057
-  1  55  82 1.000 0 33201  3058
-  1  67  35 1.000 0 33201  5464
-  1  62  85 1.000 0 33201  3006
-  1  53  15 1.000 0 33201  6252
-  1  92  32 1.000 0 33106  3028
-  1  75   7 1.000 0 33106  3372
-  1  95  34 1.000 0 33106  3119
-  1  74  68 1.000 0 33201  2430
-  1  74  71 1.000 0 33201  2565
-  1  57   1 1.000 0 33201  6092
-  1  60  38 1.000 0 33106  2996
-  1  52  76 1.000 0 33201  2862
-  1  51  76 1.000 0 33201  2868
-  1  71  54 1.000 0 33201   947
-  1  54  80 1.000 0 33201  2863
-  1  94  27 1.000 0 33106  2962
-  1  92  27 1.000 0 33106  2965
-  1  60  82 1.000 0 33201  3044
-  1  51  78 1.000 0 33201  2872
-  1  92  30 1.000 0 33106  2995
-  1  53  80 1.000 0 33201  2876
-  1  95  29 1.000 0 33106  2986
-  1  93  27 1.000 0 33106  2963
-  1  95  27 1.000 0 33106  2964
-  1  81  46 1.000 0 33201  4848
-  1  82  46 1.000 0 33201  4847
-  1  93  32 1.000 0 33106  3007
-  1  82  50 1.000 0 33201  4841
-  1  90  24 1.000 0 33201  5162
-  1  59   7 1.000 0 33201  4701
-  1  82  48 1.000 0 33201  4860
-  1  86  24 1.000 0 33201  5163
-  1  94  31 1.000 0 33106  3080
-  1  58  85 1.000 0 33201  3022
-  1  59  61 1.000 0 33106  2182
-  1  58  83 1.000 0 33201  3024
-  1  93  35 1.000 0 33106  2973
-  1  75  74 1.000 0 33201  2562
-  1  58  82 1.000 0 33201  3026
-  1  75  75 1.000 0 33201  2564
-  1  79  21 1.000 0 33201  5843
-  1  77  25 1.000 0 33201  5849
-  1  73  46 1.000 0 33201  5065
-  1  75  25 1.000 0 33201  5889
-  1  71  46 1.000 0 33201  5068
-  1  74  21 1.000 0 33201  5881
-  1  73  22 1.000 0 33201  5872
-  1  74  46 1.000 0 33201  5064
-  1  72  46 1.000 0 33201  5066
-  1  73  21 1.000 0 33201  5882
-  1  72  21 1.000 0 33201  5883
-  1  87  64 1.000 0 33201  2285
-  1  83  48 1.000 0 33201  4859
-  1  91  32 1.000 0 33106  3019
-  1  83  69 1.000 0 33201  2272
-  1  81  50 1.000 0 33201  4842
-  1  85  50 1.000 0 33201  4838
-  1  83  68 1.000 0 33201  2271
-  1  83  46 1.000 0 33201  4846
-  1  55  66 1.000 0 33106  3174
-  1  83  66 1.000 0 33201  2269
-  1  88  21 1.000 0 33201  5253
-  1  84  47 1.000 0 33201  4852
-  1  63  58 1.000 0 33106  2168
-  1  83  50 1.000 0 33201  4840
-  1  87  61 1.000 0 33201  2281
-  1  81  67 1.000 0 33201  2276
-  1  85  46 1.000 0 33201  4843
-  1  59  65 1.000 0 33106  2180
-  1  59  64 1.000 0 33106  2179
-  1  78  31 1.000 0 33201  5411
-  1  81  70 1.000 0 33201  2280
-  1  87  62 1.000 0 33201  2282
-  1  82  47 1.000 0 33201  4855
-  1  81  16 1.000 0 33106  3326
-  1  92  34 1.000 0 33106  3106
-  1  88  24 1.000 0 33201  5137
-  1  81  69 1.000 0 33201  2278
-  1  85  48 1.000 0 33201  4857
-  1  75  31 1.000 0 33201  5425
-  1  81  68 1.000 0 33201  2277
-  1  83  47 1.000 0 33201  4853
-  1  84  50 1.000 0 33201  4839
-  1  87  63 1.000 0 33201  2283
-  1  76  27 1.000 0 33201  5637
-  1  77  29 1.000 0 33201  5624
-  1  80  27 1.000 0 33201  5633
-  1  58  76 1.000 0 33201  2830
-  1  81  81 1.000 0 33106  2590
-  1  61  79 1.000 0 33201  2821
-  1  64  57 1.000 0 33106  2162
-  1  96  37 1.000 0 30399   486
-  1  66  88 1.000 0 33201  3147
-  1  61  80 1.000 0 33201  2820
-  1  68  86 1.000 0 33201  3154
-  1  63  76 1.000 0 33201  2803
-  1  65  78 1.000 0 33201  2800
-  1  59  38 1.000 0 33106  2988
-  1  89  28 1.000 0 33201  5609
-  1  55   2 1.000 0 33201  6102
-  1  63  77 1.000 0 33201  2804
-  1  81  21 1.000 0 33201  5835
-  1  58  77 1.000 0 33201  2828
-  1  92  78 1.000 0 33201   631
-  1  66  89 1.000 0 33201  3145
-  1  68  40 1.000 0 33201  5510
-  1  67  87 1.000 0 33201  3140
-  1  65  80 1.000 0 33201  2802
-  1  54   2 1.000 0 33201  6071
-  1  83  82 1.000 0 33106  2624
-  1  84  83 1.000 0 33106  2631
-  1  97  37 1.000 0 30399   453
-  1  97  44 1.000 0 33201  4995
-  1  81  22 1.000 0 33201  5821
-  1  90  31 1.000 0 33201  5531
-  1  82  25 1.000 0 33201  5825
-  1  78  29 1.000 0 33201  5623
-  1  83  24 1.000 0 33201  5812
-  1  80  30 1.000 0 33201  5638
-  1  81  83 1.000 0 33106  2578
-  1  71  48 1.000 0 33201  5057
-  1  76  29 1.000 0 33201  5625
-  1  79  29 1.000 0 33201  5621
-  1  80  29 1.000 0 33201  5622
-  1  78  27 1.000 0 33201  5635
-  1  82  24 1.000 0 33201  5813
-  1  88  28 1.000 0 33201  5611
-  1  94  43 1.000 0 33201  6106
-  1  80  28 1.000 0 33201  5620
-  1  79  27 1.000 0 33201  5634
-  1  56  69 1.000 0 33201  2362
-  1  86  85 1.000 0 33106  2623
-  1  81  84 1.000 0 33106  2567
-  1  92  45 1.000 0 33201  6104
-  1  86  81 1.000 0 33106  2635
-  1  74  47 1.000 0 33201  5070
-  1  58  62 1.000 0 33106  2201
-  1  74  67 1.000 0 33201  2431
-  1  93  61 1.000 0 33201  2259
-  1  77  75 1.000 0 33201  2553
-  1  62  58 1.000 0 33106  2153
-  1  55  67 1.000 0 33106  3175
-  1  62  59 1.000 0 33106  2151
-  1  76  63 1.000 0 33201  2342
-  1  51  69 1.000 0 33106  3188
-  1  54  70 1.000 0 33106  3166
-  1  51  66 1.000 0 33106  3179
-  1  94  61 1.000 0 33201  2241
-  1  79  72 1.000 0 33201  2534
-  1  53  69 1.000 0 33106  3194
-  1  69  38 1.000 0 33201  5525
-  1  66  37 1.000 0 33201  5524
-  1  56   8 1.000 0 33201  4722
-  1  59  68 1.000 0 33201  2068
-  1  56   9 1.000 0 33201  4698
-  1  66  70 1.000 0 33201  2457
-  1  58  65 1.000 0 33106  2200
-  1  73  68 1.000 0 33201  2425
-  1  56  65 1.000 0 33106  2204
-  1  71  25 1.000 0 33201  5890
-  1  79  20 1.000 0 33201  6020
-  1  84  85 1.000 0 33106  2627
-  1  73  25 1.000 0 33201  5887
-  1  78  21 1.000 0 33201  5844
-  1  71  21 1.000 0 33201  5884
-  1  78  25 1.000 0 33201  5848
-  1  57   8 1.000 0 33201  4721
-  1  87  45 1.000 0 33201  4963
-  1  89  69 1.000 0 33201  2396
-  1  76  28 1.000 0 33201  5594
-  1  89  77 1.000 0 33201  3076
-  1  85  22 1.000 0 33201  5820
-  1  84  24 1.000 0 33201  5811
-  1  89  31 1.000 0 33201  5532
-  1  77  28 1.000 0 33201  5588
-  1  82  22 1.000 0 33201  5819
-  1  79  28 1.000 0 33201  5486
-  1  72  48 1.000 0 33201  5056
-  1  84  22 1.000 0 33201  5817
-  1  58   8 1.000 0 33201  4719
-  1  60   8 1.000 0 33201  4718
-  1  93  43 1.000 0 33201  6111
-  1  88  31 1.000 0 33201  5534
-  1  87  31 1.000 0 33201  5536
-  1  56  10 1.000 0 33201  4716
-  1  89  76 1.000 0 33201  3265
-  1  69  54 1.000 0 33106  2399
-  1  53  66 1.000 0 33106  3189
-  1  97  51 1.000 0 33201  2254
-  1  56   6 1.000 0 33201  4710
-  1  59   6 1.000 0 33201  4707
-  1  88  73 1.000 0 33201  2538
-  1  58  64 1.000 0 33106  2199
-  1  64  59 1.000 0 33106  2164
-  1  89  70 1.000 0 33201  2395
-  1  95  63 1.000 0 33201  2244
-  1  64  60 1.000 0 33106  2165
-  1  94  63 1.000 0 33201  2239
-  1  95  64 1.000 0 33201  2245
-  1  55  69 1.000 0 33106  3177
-  1  63  57 1.000 0 33106  2167
-  1  60  10 1.000 0 33201  4712
-  1  57  10 1.000 0 33201  4715
-  1  58  10 1.000 0 33201  4714
-  1  53  67 1.000 0 33106  3190
-  1  54  68 1.000 0 33106  3169
-  1  94  65 1.000 0 33201  2237
-  1  95  65 1.000 0 33201  2247
-  1  95  62 1.000 0 33201  2243
-  1  53  68 1.000 0 33106  3191
-  1  53  70 1.000 0 33106  3195
-  1  88  75 1.000 0 33201  2536
-  1  95  61 1.000 0 33201  2242
-  1  54  67 1.000 0 33106  3168
-  1  62  60 1.000 0 33106  2150
-  1  74  34 1.000 0 33201  5436
-  1  82  55 1.000 0 33201  2009
-  1  51 100 1.000 0 33106  2508
-  1  81  27 1.000 0 33201  5574
-  1  70  60 1.000 0 33201  1090
-  1  97  53 1.000 0 33201  2273
-  1  51  99 1.000 0 33106  2512
-  1  68  38 1.000 0 33201  5526
-  1  70  56 1.000 0 33201  1086
-  1  71  23 1.000 0 33201  5880
-  1  75  21 1.000 0 33201  5885
-  1  60  40 1.000 0 33106  3047
-  1  71  24 1.000 0 33201  5894
-  1  58  70 1.000 0 33201  2084
-  1  74  25 1.000 0 33201  5886
-  1  74  22 1.000 0 33201  5871
-  1  88  49 1.000 0 33201  4927
-  1  65  76 1.000 0 33201  2798
-  1  54   3 1.000 0 33201  5837
-  1  68  88 1.000 0 33201  3151
-  1  72  25 1.000 0 33201  5888
-  1  54   4 1.000 0 33201  6338
-  1  61  77 1.000 0 33201  2823
-  1  61  76 1.000 0 33201  2824
-  1  88  72 1.000 0 33201  2539
-  1  65  77 1.000 0 33201  2799
-  1  68  87 1.000 0 33201  3152
-  1  99  51 1.000 0 33201  2101
-  1  70  57 1.000 0 33201  1087
-  1  69  61 1.000 0 33201  1077
-  1  54  24 1.000 0 33201  5988
-  1  81  52 1.000 0 33201  2016
-  1  51  96 1.000 0 33106  2519
-  1  83  53 1.000 0 33201  1999
-  1  64  94 1.000 0 33201  3258
-  1  61  93 1.000 0 33201  3264
-  1  77  55 1.000 0 33201  2047
-  1  80  51 1.000 0 33201  2021
-  1  55  96 1.000 0 33106  2556
-  1  83  52 1.000 0 33201  1998
-  1  85  53 1.000 0 33201  1993
-  1  90  55 1.000 0 33201  1990
-  1  55   5 1.000 0 33201  6142
-  1  77  86 1.000 0 33201  1497
-  1  51   5 1.000 0 33201  6247
-  1  76  90 1.000 0 33201  1508
-  1  90  53 1.000 0 33201  1988
-  1  89  55 1.000 0 33201  1980
-  1  70  59 1.000 0 33201  1089
-  1  57  73 1.000 0 33201  2645
-  1  78  53 1.000 0 33201  2029
-  1  78  89 1.000 0 33201  1432
-  1  83  51 1.000 0 33201  1997
-  1  66  17 1.000 0 33201  5127
-  1  95  66 1.000 0 33106  2438
-  1  93  54 1.000 0 33201  1958
-  1  59  60 1.000 0 33106  2120
-  1  67  17 1.000 0 33201  5126
-  1  91  24 1.000 0 33106  3241
-  1  59  95 1.000 0 33201  3196
-  1  88  53 1.000 0 33201  1968
-  1  93  55 1.000 0 33201  1959
-  1  51  98 1.000 0 33106  2514
-  1  88  54 1.000 0 33201  1969
-  1  90  51 1.000 0 33201  1986
-  1  84  82 1.000 0 33106  2636
-  1  88  52 1.000 0 33201  1967
-  1  66  61 1.000 0 33201  1070
-  1  81  53 1.000 0 33201  2017
-  1  78  30 1.000 0 33201  5640
-  1  83  84 1.000 0 33106  2617
-  1  93  51 1.000 0 33201  1955
-  1  69  64 1.000 0 33201  1083
-  1  77  84 1.000 0 33201  2964
-  1  93  52 1.000 0 33201  1956
-  1  94  51 1.000 0 33201  1954
-  1  93  53 1.000 0 33201  1957
-  1  77  90 1.000 0 33201  1459
-  1  90  52 1.000 0 33201  1987
-  1  94  55 1.000 0 33201  1953
-  1  82  52 1.000 0 33201  2007
-  1  92  53 1.000 0 33201  1946
-  1  92  51 1.000 0 33201  1943
-  1  78  87 1.000 0 33201  1450
-  1  92  54 1.000 0 33201  1947
-  1  95  51 1.000 0 33201  1960
-  1  77  87 1.000 0 33201  1495
-  1  94  53 1.000 0 33201  1951
-  1  91  22 1.000 0 33106  3219
-  1  92  52 1.000 0 33201  1944
-  1  85  29 1.000 0 33201  5577
-  1  85  51 1.000 0 33201  1991
-  1  74  59 1.000 0 33201   605
-  1  82  83 1.000 0 33106  2601
-  1  84  84 1.000 0 33106  2629
-  1  81  25 1.000 0 33201  5826
-  1  56  76 1.000 0 33201  2845
-  1  82  84 1.000 0 33106  2596
-  1  82  82 1.000 0 33106  2609
-  1  70  17 1.000 0 33201  5123
-  1  83  85 1.000 0 33106  2616
-  1  75  58 1.000 0 33201   599
-  1  83  81 1.000 0 33106  2626
-  1  68  17 1.000 0 33201  5125
-  1  97  38 1.000 0 30399   451
-  1  70  18 1.000 0 33201  5113
-  1  68  18 1.000 0 33201  5110
-  1  81  82 1.000 0 33106  2589
-  1  95  52 1.000 0 33201  1961
-  1  97  40 1.000 0 30399   394
-  1  92  55 1.000 0 33201  1949
-  1  66  18 1.000 0 33201  5112
-  1  67  18 1.000 0 33201  5111
-  1  95  55 1.000 0 33201  1964
-  1  86  19 1.000 0 33106  3399
-  1  94  54 1.000 0 33201  1952
-  1  75  59 1.000 0 33201   600
-  1  68  64 1.000 0 33201  1112
-  1  84  14 1.000 0 33106  3429
-  1  68  63 1.000 0 33201  1111
-  1  51  97 1.000 0 33106  2518
-  1  85  54 1.000 0 33201  1995
-  1  67  64 1.000 0 33201  1115
-  1  69  60 1.000 0 33201  1095
-  1  92  68 1.000 0 33106  2480
-  1  75  33 1.000 0 33201  5430
-  1  85  15 1.000 0 33106  3426
-  1  52  99 1.000 0 33106  2486
-  1  58  68 1.000 0 33201  2209
-  1  83  55 1.000 0 33201  2002
-  1  84  51 1.000 0 33201  2010
-  1  71  95 1.000 0 33106  2613
-  1  52 100 1.000 0 33106  2297
-  1  93  74 1.000 0 33106  2537
-  1  53  96 1.000 0 33106  2618
-  1  55 100 1.000 0 33106  2520
-  1  70  62 1.000 0 33201  1098
-  1  81  51 1.000 0 33201  2015
-  1  54   1 1.000 0 33201  6250
-  1  76  10 1.000 0 33106  3440
-  1  59  10 1.000 0 33201  4713
-  1  92  79 1.000 0 33201   637
-  1  57   9 1.000 0 33201  4697
-  1  57   7 1.000 0 33201  4703
-  1  51   1 1.000 0 33201  6232
-  1  87  46 1.000 0 33201  4932
-  1  60   7 1.000 0 33201  4699
-  1  67  34 1.000 0 33201  5443
-  1  58   9 1.000 0 33201  4696
-  1  89  52 1.000 0 33201  1973
-  1  56   7 1.000 0 33201  4704
-  1  86  51 1.000 0 33201  1981
-  1  72  93 1.000 0 33106  2598
-  1  73  33 1.000 0 33201  5434
-  1  82  85 1.000 0 33106  2592
-  1  71  52 1.000 0 33201   949
-  1  57  16 1.000 0 33201  6154
-  1  87  18 1.000 0 33106  3402
-  1  73  34 1.000 0 33201  5437
-  1  52  24 1.000 0 33201  5990
-  1  53  24 1.000 0 33201  5989
-  1  86  20 1.000 0 33106  3394
-  1  87  19 1.000 0 33106  3397
-  1  58  16 1.000 0 33201  6153
-  1  78  51 1.000 0 33201  2027
-  1  51  24 1.000 0 33201  5991
-  1  60  16 1.000 0 33201  6158
-  1  85  73 1.000 0 33201  2543
-  1  82  74 1.000 0 33201  2512
-  1  81  73 1.000 0 33201  2504
-  1  85  71 1.000 0 33201  2541
-  1  81  72 1.000 0 33201  2503
-  1  58  19 1.000 0 33201  6160
-  1  59  19 1.000 0 33201  6159
-  1  57  71 1.000 0 33201  2647
-  1  56  16 1.000 0 33201  6155
-  1  51  25 1.000 0 33201  6007
-  1  55  24 1.000 0 33201  5992
-  1  52  25 1.000 0 33201  6005
-  1  57  72 1.000 0 33201  2646
-  1  52   3 1.000 0 33201  6437
-  1  82  73 1.000 0 33201  2511
-  1  69  58 1.000 0 33201  1093
-  1  85  72 1.000 0 33201  2542
-  1  80  54 1.000 0 33201  2024
-  1  63  91 1.000 0 33201  3251
-  1  80   9 1.000 0 33106  3443
-  1  81  55 1.000 0 33201  2019
-  1  76  52 1.000 0 33201  2033
-  1  69  59 1.000 0 33201  1094
-  1  80  10 1.000 0 33106  3442
-  1  70  34 1.000 0 33201  5445
-  1  53  98 1.000 0 33106  2593
-  1  70  64 1.000 0 33201  1102
-  1  81  54 1.000 0 33201  2018
-  1  77  54 1.000 0 33201  2046
-  1  55  98 1.000 0 33106  2539
-  1  82  53 1.000 0 33201  2008
-  1  83  54 1.000 0 33201  2001
-  1  81  74 1.000 0 33201  2505
-  1  83  22 1.000 0 33201  5818
-  1  81  85 1.000 0 33106  2563
-  1  86  31 1.000 0 33201  5537
-  1  91  23 1.000 0 33106  3232
-  1  71  33 1.000 0 33201  5431
-  1  69  18 1.000 0 33201  5109
-  1  96  39 1.000 0 30399   401
-  1  92  22 1.000 0 33106  3206
-  1  83  25 1.000 0 33201  5824
-  1  90  78 1.000 0 33201  2905
-  1  92  66 1.000 0 33201  3268
-  1  56  77 1.000 0 33201  2844
-  1  83  83 1.000 0 33106  2619
-  1  86  36 1.000 0 33201  5374
-  1  96  44 1.000 0 33201  5010
-  1  90  54 1.000 0 33201  1989
-  1  83  14 1.000 0 33106  3432
-  1  52  97 1.000 0 33106  2497
-  1  69  20 1.000 0 33201  5121
-  1  91  68 1.000 0 33106  2415
-  1  87  16 1.000 0 33106  3410
-  1  86  16 1.000 0 33106  3413
-  1  90  76 1.000 0 33201  2920
-  1  90  21 1.000 0 33201  5257
-  1  87  53 1.000 0 33201  2075
-  1  70  20 1.000 0 33201  4945
-  1  67  20 1.000 0 33201  4916
-  1  64  93 1.000 0 33201  3259
-  1  68  20 1.000 0 33201  5122
-  1  89  53 1.000 0 33201  1977
-  1  86  17 1.000 0 33106  3407
-  1  64  91 1.000 0 33201  3261
-  1  64  92 1.000 0 33201  3260
-  1  61  95 1.000 0 33201  3262
-  1  68  19 1.000 0 33201  5119
-  1  72  50 1.000 0 33201  5050
-  1  66  16 1.000 0 33201  5118
-  1  96  40 1.000 0 30399   371
-  1  58  66 1.000 0 33201  2212
-  1  96  38 1.000 0 30399   569
-  1  55   1 1.000 0 33201  6273
-  1  97  39 1.000 0 30399   374
-  1  58  67 1.000 0 33201  2211
-  1  59  91 1.000 0 33201  3231
-  1  51   4 1.000 0 33201  6312
-  1  64  77 1.000 0 33201  2809
-  1  65  79 1.000 0 33201  2801
-  1  66  31 1.000 0 33201  5441
-  1  71  85 1.000 0 33201  2953
-  1  59  59 1.000 0 33106  2119
-  1  66  86 1.000 0 33201  3149
-  1  63  79 1.000 0 33201  2806
-  1  64  76 1.000 0 33201  2808
-  1  56  93 1.000 0 33201  3180
-  1  58  69 1.000 0 33201  2208
-  1  62  90 1.000 0 33201  3156
-  1  64  79 1.000 0 33201  2812
-  1  56  95 1.000 0 33201  3195
-  1  63  80 1.000 0 33201  2807
-  1  63  78 1.000 0 33201  2805
-  1  59  93 1.000 0 33201  3201
-  1  62  79 1.000 0 33201  2816
-  1  75  34 1.000 0 33201  5440
-  1  56  94 1.000 0 33201  3188
-  1  62  88 1.000 0 33201  3158
-  1  56   3 1.000 0 33201  5841
-  1  62  89 1.000 0 33201  3157
-  1  62  87 1.000 0 33201  3159
-  1  55   4 1.000 0 33201  6334
-  1  62  86 1.000 0 33201  3161
-  1  62  77 1.000 0 33201  2818
-  1  59  92 1.000 0 33201  3205
-  1  60  59 1.000 0 33106  2121
-  1  62  78 1.000 0 33201  2817
-  1  57   3 1.000 0 33201  5900
-  1  60  60 1.000 0 33106  2118
-  1  85  52 1.000 0 33201  1992
-  1  89  56 1.000 0 33201  2113
-  1  87  52 1.000 0 33201  2074
-  1  89  57 1.000 0 33201  2114
-  1  80  53 1.000 0 33201  2023
-  1  77  53 1.000 0 33201  2045
-  1  89  49 1.000 0 33201  4926
-  1  63  95 1.000 0 33201  3247
-  1  95  53 1.000 0 33201  1962
-  1  92  24 1.000 0 33106  3236
-  1  91  25 1.000 0 33106  3239
-  1  53  99 1.000 0 33106  2576
-  1  69  19 1.000 0 33201  5116
-  1  95  54 1.000 0 33201  1963
-  1  71  50 1.000 0 33201  5051
-  1  69  62 1.000 0 33201  1078
-  1  86  21 1.000 0 33201  5273
-  1  88  51 1.000 0 33201  1965
-  1  69  17 1.000 0 33201  5124
-  1  70  19 1.000 0 33201  5114
-  1  89  54 1.000 0 33201  1979
-  1  67  19 1.000 0 33201  5120
-  1  70  63 1.000 0 33201  1100
-  1  82  14 1.000 0 33106  3389
-  1  74  57 1.000 0 33201   603
-  1  81  48 1.000 0 33201  4850
-  1  76  51 1.000 0 33201  2032
-  1  76  53 1.000 0 33201  2034
-  1  80  52 1.000 0 33201  2022
-  1  78  54 1.000 0 33201  2030
-  1  85  55 1.000 0 33201  1996
-  1  76  55 1.000 0 33201  2036
-  1  77  30 1.000 0 33201  5641
-  1  63  94 1.000 0 33201  3248
-  1  59  16 1.000 0 33201  6152
-  1  81  29 1.000 0 33201  5579
-  1  82  29 1.000 0 33201  5578
-  1  52  96 1.000 0 33106  2507
-  1  59  73 1.000 0 33201  2650
-  1  59  94 1.000 0 33201  3199
-  1  59  72 1.000 0 33201  2649
-  1  83  29 1.000 0 33201  5576
-  1  53  25 1.000 0 33201  6004
-  1  53   3 1.000 0 33201  6456
-  1  52   2 1.000 0 33201  5701
-  1  53 100 1.000 0 33106  2562
-  1  59  78 1.000 0 33201  2838
-  1  59  74 1.000 0 33201  2651
-  1  57  78 1.000 0 33201  2833
-  1  59  79 1.000 0 33201  2837
-  1  56  78 1.000 0 33201  2843
-  1  84  29 1.000 0 33201  5575
-  1  51   2 1.000 0 33201  5473
-  1  51   3 1.000 0 33201  6424
-  1  77  82 1.000 0 33201  2966
-  1  76  85 1.000 0 33201  2882
-  1  79  84 1.000 0 33201  2977
-  1  68  62 1.000 0 33201  1110
-  1  89  46 1.000 0 33201  4933
-  1  57  75 1.000 0 33201  2643
-  1  77  85 1.000 0 33201  2963
-  1  59  77 1.000 0 33201  2839
-  1  52  98 1.000 0 33106  2489
-  1  75  93 1.000 0 33106  2605
-  1  63  93 1.000 0 33201  3249
-  1  62  94 1.000 0 33201  3253
-  1  68  61 1.000 0 33201  1109
-  1  71  94 1.000 0 33106  2615
-  1  62  93 1.000 0 33201  3254
-  1  62  92 1.000 0 33201  3257
-  1  86  83 1.000 0 33106  2632
-  1  94  68 1.000 0 33106  2450
-  1  70  61 1.000 0 33201  1097
-  1  69  56 1.000 0 33201  1091
-  1  93  67 1.000 0 33106  2428
-  1  55  97 1.000 0 33106  2542
-  1  95  67 1.000 0 33106  2440
-  1  72  33 1.000 0 33201  5432
-  1  68  65 1.000 0 33201  1113
-  1  99  53 1.000 0 33201  2162
-  1  69  57 1.000 0 33201  1092
-  1  53  97 1.000 0 33106  2600
-  1  69  16 1.000 0 33201  5104
-  1  79  86 1.000 0 33201  3344
-  1  78  88 1.000 0 33201  1433
-  1  94  52 1.000 0 33201  1950
-  1  86  52 1.000 0 33201  1982
-  1  76  89 1.000 0 33201  1533
-  1  79  89 1.000 0 33201  3300
-  1  91  79 1.000 0 33201   578
-  1  59  69 1.000 0 33201  2060
-  1  66  64 1.000 0 33201  1075
-  1  53   8 1.000 0 33201  6397
-  1  55  70 1.000 0 33106  3178
-  1  74  33 1.000 0 33201  5435
-  1  68  16 1.000 0 33201  5105
-  1  73  50 1.000 0 33201  5049
-  1  74  50 1.000 0 33201  5048
-  1  80  61 1.000 0 33201  2346
-  1  66  19 1.000 0 33201  5107
-  1  70  16 1.000 0 33201  5108
-  1  67  16 1.000 0 33201  5106
-  1  69  63 1.000 0 33201  1079
-  1  77  52 1.000 0 33201  2038
-  1  77  51 1.000 0 33201  2037
-  1  64  95 1.000 0 33201  3256
-  1  80  55 1.000 0 33201  2026
-  1  66  91 1.000 0 33106  2654
-  1  69  95 1.000 0 33106  2653
-  1  63  92 1.000 0 33201  3250
-  1  69  93 1.000 0 33106  2646
-  1  84  34 1.000 0 30399   305
-  1  87  33 1.000 0 33201  5560
-  1  67  94 1.000 0 33106  2684
-  1  55  80 1.000 0 33201  2855
-  1  69  91 1.000 0 33106  2642
-  1  54  66 1.000 0 33106  3167
-  1  78  24 1.000 0 33201  5868
-  1  91  70 1.000 0 33106  2427
-  1  69  94 1.000 0 33106  2647
-  1  86  33 1.000 0 33201  5561
-  1  91  80 1.000 0 33201   583
-  1  55  77 1.000 0 33201  2852
-  1  76  87 1.000 0 33201  3255
-  1  91  76 1.000 0 33201   543
-  1  99  50 1.000 0 33201  4914
-  1  69  36 1.000 0 33201  5514
-  1 100  41 1.000 0 33201  5037
-  1  70  32 1.000 0 33201  5462
-  1  97  62 1.000 0 33201   530
-  1  97  65 1.000 0 33201   541
-  1  92  69 1.000 0 33106  2468
-  1  96  65 1.000 0 33201   525
-  1  66  32 1.000 0 33201  5461
-  1  69  35 1.000 0 33201  5467
-  1  62  26 1.000 0 33201  5703
-  1  66  40 1.000 0 33201  5512
-  1  62  29 1.000 0 33201  5708
-  1  68  34 1.000 0 33201  5442
-  1  92  67 1.000 0 33201  3269
-  1  92  70 1.000 0 33106  2462
-  1  66  35 1.000 0 33201  5463
-  1  97  64 1.000 0 33201   539
-  1  52  80 1.000 0 33201  2856
-  1  69  33 1.000 0 33201  5457
-  1  60  76 1.000 0 33201  2850
-  1  60  80 1.000 0 33201  2846
-  1  66  33 1.000 0 33201  5453
-  1  60  78 1.000 0 33201  2848
-  1  54  77 1.000 0 33201  2866
-  1  60  77 1.000 0 33201  2849
-  1  90  80 1.000 0 33201  2871
-  1  93  66 1.000 0 33106  2460
-  1  93  72 1.000 0 33106  2532
-  1  93  71 1.000 0 33106  2531
-  1  55  78 1.000 0 33201  2853
-  1  94  64 1.000 0 33201  2238
-  1  79  90 1.000 0 33201  3298
-  1  89  21 1.000 0 33201  5179
-  1  66  34 1.000 0 33201  5446
-  1  92  63 1.000 0 33201  2251
-  1  64  28 1.000 0 33201  5712
-  1  66  82 1.000 0 33201  3083
-  1  74  87 1.000 0 33201  3112
-  1  70  35 1.000 0 33201  5452
-  1  80  62 1.000 0 33201  2347
-  1  92  62 1.000 0 33201  2252
-  1  94  62 1.000 0 33201  2240
-  1  61  29 1.000 0 33201  5709
-  1  67  33 1.000 0 33201  5455
-  1  92  61 1.000 0 33201  2253
-  1  55  99 1.000 0 33106  2527
-  1  68  31 1.000 0 33201  5450
-  1  79  75 1.000 0 33201  2531
-  1  62  95 1.000 0 33201  3252
-  1  63  28 1.000 0 33201  5713
-  1  67  31 1.000 0 33201  5449
-  1  69  31 1.000 0 33201  5451
-  1  61  92 1.000 0 33201  3266
-  1  70  31 1.000 0 33201  5447
-  1  53   2 1.000 0 33201  5831
-  1  61  94 1.000 0 33201  3263
-  1  77  83 1.000 0 33201  2965
-  1  96  63 1.000 0 33201   514
-  1  69  34 1.000 0 33201  5448
-  1  68  35 1.000 0 33201  5466
-  1  56  64 1.000 0 33106  2203
-  1  57  74 1.000 0 33201  2644
-  1  59  75 1.000 0 33201  2652
-  1  77  81 1.000 0 33201  2967
-  1  70  33 1.000 0 33201   193
-  1  75  73 1.000 0 33201  2561
-  1  95  74 1.000 0 33106  2565
-  1  95  71 1.000 0 33106  2569
-  1  92  72 1.000 0 33106  2554
-  1  95  70 1.000 0 33106  2447
-  1  92  71 1.000 0 33106  2555
-  1  95  72 1.000 0 33106  2568
-  1  95  75 1.000 0 33106  2557
-  1  90  77 1.000 0 33201  2919
-  1  95  26 1.000 0 33106  2923
-  1  92  74 1.000 0 33106  2551
-  1  97  63 1.000 0 33201   538
-  1  55  79 1.000 0 33201  2854
-  1  67  40 1.000 0 33201  5511
-  1  74  94 1.000 0 33106  2571
-  1  51  64 1.000 0 33106  2148
-  1  78  90 1.000 0 33201  1415
-  1  74  95 1.000 0 33106  2570
-  1  78  62 1.000 0 33201  2326
-  1  79  87 1.000 0 33201  3337
-  1  77  62 1.000 0 33201  2335
-  1  52   1 1.000 0 33201  6239
-  1  77  63 1.000 0 33201  2337
-  1  58  99 1.000 0 33201  3431
-  1  70  40 1.000 0 33201  5513
-  1  51  65 1.000 0 33106  2149
-  1  77  61 1.000 0 33201  2334
-  1  76  65 1.000 0 33201  2345
-  1  91  78 1.000 0 33201   572
-  1  80  63 1.000 0 33201  2348
-  1  80  64 1.000 0 33201  2349
-  1  76  64 1.000 0 33201  2343
-  1  68  36 1.000 0 33201  5515
-  1  66  63 1.000 0 33201  1072
-  1  94  70 1.000 0 33106  2457
-  1  67  36 1.000 0 33201  5516
-  1  70  58 1.000 0 33201  1088
-  1  74  26 1.000 0 33201  5660
-  1  88  55 1.000 0 33201  1970
-  1  92  21 1.000 0 33106  3181
-  1  76  86 1.000 0 33201  3295
-  1  76  88 1.000 0 33201  3200
-  1  66  65 1.000 0 33201  1076
-  1  82  81 1.000 0 33106  2612
-  1  89  51 1.000 0 33201  1972
-  1  66  62 1.000 0 33201  1071
-  1  87  55 1.000 0 33201   211
-  1  86  55 1.000 0 33201  1985
-  1  77  88 1.000 0 33201  1492
-  1  92  23 1.000 0 33106  3252
-  1  77  89 1.000 0 33201  1464
-  1  78  86 1.000 0 33201  1458
-  1  86  54 1.000 0 33201  1984
-  1  86  53 1.000 0 33201  1983
-  1  99  55 1.000 0 33201  2168
-  1  87  54 1.000 0 33201   518
-  1  77  65 1.000 0 33201  2339
-  1  78  55 1.000 0 33201  2031
-  1  87  51 1.000 0 33201  2073
-  1  92  25 1.000 0 33106  3244
-  1  91  21 1.000 0 33106  3212
-  1  59  67 1.000 0 33201  2071
-  1  66  83 1.000 0 33201  3082
-  1  73  86 1.000 0 33201  3108
-  1  74  89 1.000 0 33201  3110
-  1  74  88 1.000 0 33201  3111
-  1  81  79 1.000 0 33201  2719
-  1  59  62 1.000 0 33106  2177
-  1  59  63 1.000 0 33106  2178
-  1  55  27 1.000 0 33201  4918
-  1  70  86 1.000 0 33201  3129
-  1  59  70 1.000 0 33201  2025
-  1  70  90 1.000 0 33201  3124
-  1  70  89 1.000 0 33201  3125
-  1  81  80 1.000 0 33201  2718
-  1  56  66 1.000 0 33201  2366
-  1  81  76 1.000 0 33201  2722
-  1  56  68 1.000 0 33201  2363
-  1  52  93 1.000 0 33201  2714
-  1  70  87 1.000 0 33201  3128
-  1  72  90 1.000 0 33201  3114
-  1  81  78 1.000 0 33201  2720
-  1  70  88 1.000 0 33201  3126
-  1  81  77 1.000 0 33201  2721
-  1  52  92 1.000 0 33201  2713
-  1  66  85 1.000 0 33201  3080
-  1  72  86 1.000 0 33201  3122
-  1  62  57 1.000 0 33106  2154
-  1  72  87 1.000 0 33201  3121
-  1  74  86 1.000 0 33201  3113
-  1  73  89 1.000 0 33201  3105
-  1  72  80 1.000 0 33201  2762
-  1  66  84 1.000 0 33201  3081
-  1  57  66 1.000 0 33201  2225
-  1  72  88 1.000 0 33201  3116
-  1  72  89 1.000 0 33201  3115
-  1  59  66 1.000 0 33201  2082
-  1  56  67 1.000 0 33201  2364
-  1  86  84 1.000 0 33106  2625
-  1  65  26 1.000 0 33201  5705
-  1  61  26 1.000 0 33201  5704
-  1  54  28 1.000 0 33201  4912
-  1  52  28 1.000 0 33201  4917
-  1  95  68 1.000 0 33106  2445
-  1  99  52 1.000 0 33201  2104
-  1  99  54 1.000 0 33201  2166
-  1  65   4 1.000 0 33106  3460
-  1  64   4 1.000 0 33106  3457
-  1  75  49 1.000 0 33201  5058
-  1  64   5 1.000 0 33106  3469
-  1  55  28 1.000 0 33201  4911
-  1  59  80 1.000 0 33201  2836
-  1  68  37 1.000 0 33201  5522
-  1  67  23 1.000 0 33201  5924
-  1  66  23 1.000 0 33201  5925
-  1  98  48 1.000 0 33201  4791
-  1  62   8 1.000 0 33201  6292
-  1  57  68 1.000 0 33201  2223
-  1  65   7 1.000 0 33201  6281
-  1  73  87 1.000 0 33201  3107
-  1  64   8 1.000 0 33201  6294
-  1  61   9 1.000 0 33201  6286
-  1  56  70 1.000 0 33201  2361
-  1  62   6 1.000 0 33201  6269
-  1  74  90 1.000 0 33201  3109
-  1  65   8 1.000 0 33201  6290
-  1  63   6 1.000 0 33201  6268
-  1  62   7 1.000 0 33201  6280
-  1  98  58 1.000 0 33201  2683
-  1  68  23 1.000 0 33201  5923
-  1  98  50 1.000 0 33201  4915
-  1  98  60 1.000 0 33201  2715
-  1  63   8 1.000 0 33201  6293
-  1  61   8 1.000 0 33201  6291
-  1  63   9 1.000 0 33201  6288
-  1  72  49 1.000 0 33201  5061
-  1  57  38 1.000 0 33106  3003
-  1  71  49 1.000 0 33201  5062
-  1  97  56 1.000 0 33201  2810
-  1  53  39 1.000 0 33106  3156
-  1  53  28 1.000 0 33201  4913
-  1  74  49 1.000 0 33201  5059
-  1  73  49 1.000 0 33201  5060
-  1  62   9 1.000 0 33201  6287
-  1  65   9 1.000 0 33201  6285
-  1  66  93 1.000 0 33106  2661
-  1  64   7 1.000 0 33201  6284
-  1  55  68 1.000 0 33106  3176
-  1  64  56 1.000 0 33106  2161
-  1  61   6 1.000 0 33201  6270
-  1  69  26 1.000 0 33201  5688
-  1  76  11 1.000 0 33201  5533
-  1  56  36 1.000 0 33106  3147
-  1  57  36 1.000 0 33106  3146
-  1  86  23 1.000 0 33201  5234
-  1  91  34 1.000 0 33106  2942
-  1  67  95 1.000 0 33106  2693
-  1  61   7 1.000 0 33201  6282
-  1  98  46 1.000 0 33201  4854
-  1  63   7 1.000 0 33201  6283
-  1  66  92 1.000 0 33106  2660
-  1  92  77 1.000 0 33201   624
-  1  55  15 1.000 0 33201  6256
-  1  65   6 1.000 0 33201  6272
-  1  58  78 1.000 0 33201  2827
-  1  53   4 1.000 0 33201  6279
-  1  67  90 1.000 0 33201  3135
-  1  76  81 1.000 0 33201  2886
-  1  76  83 1.000 0 33201  2884
-  1  76  82 1.000 0 33201  2885
-  1  59  76 1.000 0 33201  2840
-  1  57  76 1.000 0 33201  2831
-  1  57  80 1.000 0 33201  2835
-  1  66  90 1.000 0 33201  3144
-  1  55   3 1.000 0 33201  6367
-  1  66  87 1.000 0 33201  3148
-  1  69  92 1.000 0 33106  2643
-  1  61  78 1.000 0 33201  2822
-  1  67  86 1.000 0 33201  3143
-  1  58  80 1.000 0 33201  2825
-  1  66  95 1.000 0 33106  2667
-  1  87  24 1.000 0 33201  5160
-  1  67  89 1.000 0 33201  3136
-  1  58  79 1.000 0 33201  2826
-  1  86  49 1.000 0 33201  4929
-  1  70  92 1.000 0 33106  2727
-  1  86  25 1.000 0 33201  5176
-  1  89  22 1.000 0 33201  5198
-  1  68  56 1.000 0 33201  1119
-  1  70  65 1.000 0 33201  1103
-  1  68  60 1.000 0 33201  1124
-  1  68  59 1.000 0 33201  1123
-  1  79  81 1.000 0 33201  2881
-  1  76  84 1.000 0 33201  2883
-  1  65  45 1.000 0 33106  3130
-  1  52   4 1.000 0 33201  6308
-  1  56  37 1.000 0 33106  3141
-  1  56  38 1.000 0 33106  3013
-  1  59  37 1.000 0 33106  3137
-  1  61  45 1.000 0 33106  3135
-  1  53  78 1.000 0 33201  2878
-  1  67  56 1.000 0 33201  1125
-  1  53  76 1.000 0 33201  2880
-  1  58   3 1.000 0 33201  5917
-  1  57  61 1.000 0 33106  2183
-  1  60  58 1.000 0 33106  2117
-  1  67  61 1.000 0 33201  1118
-  1  64  45 1.000 0 33106  3131
-  1  64  78 1.000 0 33201  2811
-  1  52   5 1.000 0 33201  6214
-  1  53   1 1.000 0 33201  6144
-  1  58  36 1.000 0 33106  3144
-  1  61  89 1.000 0 33201  3184
-  1  57  77 1.000 0 33201  2832
-  1  79  82 1.000 0 33201  2979
-  1  67  88 1.000 0 33201  3138
-  1  60  36 1.000 0 33106  3148
-  1  57  79 1.000 0 33201  2834
-  1  79  83 1.000 0 33201  2978
-  1  59   2 1.000 0 33201  6012
-  1  93  31 1.000 0 33106  3104
-  1  67  57 1.000 0 33201  1126
-  1  67  93 1.000 0 33106  2691
-  1  68  93 1.000 0 33106  2706
-  1  90  49 1.000 0 33201  4930
-  1  70  93 1.000 0 33106  2737
-  1  54  96 1.000 0 33106  2652
-  1  83  33 1.000 0 30399   336
-  1  60  39 1.000 0 33106  3046
-  1  91  40 1.000 0 33201  5351
-  1  95  38 1.000 0 33201  5356
-  1  90  40 1.000 0 33201  5367
-  1  92  37 1.000 0 33201  5337
-  1  89  40 1.000 0 33201  5372
-  1  86  40 1.000 0 33201  5368
-  1  95  40 1.000 0 33201  5346
-  1  91  39 1.000 0 33201  5360
-  1  57  97 1.000 0 33201  1477
-  1  93  37 1.000 0 33201  5336
-  1  86  39 1.000 0 33201  5383
-  1  91  38 1.000 0 33201  5355
-  1  93  38 1.000 0 33201  5353
-  1  59  40 1.000 0 33106  3051
-  1  94  37 1.000 0 33201  5335
-  1  92  38 1.000 0 33201  5354
-  1  94  39 1.000 0 33201  5357
-  1  79  10 1.000 0 33106  3433
-  1  92  40 1.000 0 33201  5349
-  1  67  65 1.000 0 33201  1114
-  1  86  37 1.000 0 33201  5366
-  1  87  37 1.000 0 33201  5365
-  1  86  38 1.000 0 33201  5381
-  1  88  39 1.000 0 33201  5385
-  1  84  23 1.000 0 33201  5838
-  1  91  37 1.000 0 33201  5338
-  1  88  37 1.000 0 33201  5363
-  1  89  39 1.000 0 33201  5386
-  1  89  36 1.000 0 33201  5377
-  1  89  37 1.000 0 33201  5362
-  1  90  39 1.000 0 33201  5387
-  1  87  39 1.000 0 33201  5384
-  1  90  38 1.000 0 33201  5382
-  1  56  39 1.000 0 33106  3038
-  1  57  39 1.000 0 33106  3026
-  1  88  38 1.000 0 33201  5379
-  1  79  22 1.000 0 33201  5859
-  1  89  38 1.000 0 33201  5378
-  1  88  36 1.000 0 33201  5376
-  1  92  39 1.000 0 33201  5359
-  1  93  39 1.000 0 33201  5358
-  1  94  40 1.000 0 33201  5347
-  1  88  40 1.000 0 33201  5370
-  1  95  39 1.000 0 33201  5361
-  1  83  23 1.000 0 33201  5839
-  1  59  39 1.000 0 33106  3015
-  1  87  38 1.000 0 33201  5380
-  1  85  21 1.000 0 33201  5827
-  1  76  23 1.000 0 33201  5857
-  1  57  96 1.000 0 33201  1490
-  1  80  23 1.000 0 33201  5858
-  1  58  39 1.000 0 33106  3023
-  1  90  37 1.000 0 33201  5364
-  1  76  22 1.000 0 33201  5863
-  1  84  21 1.000 0 33201  5829
-  1  82  23 1.000 0 33201  5840
-  1  77  22 1.000 0 33201  5861
-  1  81  23 1.000 0 33201  5842
-  1  67  63 1.000 0 33201  1116
-  1  67  62 1.000 0 33201  1117
-  1  80  22 1.000 0 33201  5864
-  1  61  90 1.000 0 33201  3183
-  1  60   4 1.000 0 33201  5937
-  1  61  88 1.000 0 33201  3185
-  1  58  86 1.000 0 33201  3211
-  1  54   5 1.000 0 33201  6230
-  1  92  41 1.000 0 33201  6088
-  1  61  86 1.000 0 33201  3187
-  1  53  77 1.000 0 33201  2879
-  1  62  76 1.000 0 33201  2819
-  1  60  68 1.000 0 33201  2215
-  1  53   5 1.000 0 33201  6219
-  1  59  36 1.000 0 33106  3142
-  1  59   4 1.000 0 33201  5947
-  1  60   5 1.000 0 33201  5816
-  1  72  17 1.000 0 33201  6078
-  1  56  92 1.000 0 33201  3175
-  1  60  66 1.000 0 33201  2219
-  1  62  80 1.000 0 33201  2814
-  1  61  87 1.000 0 33201  3186
-  1  64  80 1.000 0 33201  2813
-  1  86  18 1.000 0 33106  3414
-  1  93  41 1.000 0 33201  6087
-  1  94  41 1.000 0 33201  6086
-  1  60  67 1.000 0 33201  2217
-  1  58   4 1.000 0 33201  5941
-  1  93  33 1.000 0 33106  3050
-  1  85  18 1.000 0 33106  3171
-  1  58  75 1.000 0 33201  2637
-  1  59  20 1.000 0 33201  6141
-  1  68  95 1.000 0 33106  2724
-  1  84  20 1.000 0 33106  3324
-  1  78  14 1.000 0 33201  5481
-  1  67  92 1.000 0 33106  2680
-  1  68  94 1.000 0 33106  2710
-  1  61  17 1.000 0 33201  6136
-  1  72  22 1.000 0 33201  5873
-  1  56  20 1.000 0 33201  6146
-  1  60  20 1.000 0 33201  6148
-  1  57  20 1.000 0 33201  6145
-  1  58  20 1.000 0 33201  6143
-  1  56  19 1.000 0 33201  6162
-  1  58  74 1.000 0 33201  2638
-  1  60  19 1.000 0 33201  6163
-  1  74  23 1.000 0 33201  5876
-  1  67  91 1.000 0 33106  2758
-  1  81  34 1.000 0 30399   313
-  1  75  22 1.000 0 33201  5875
-  1  56   5 1.000 0 33201  5828
-  1  54  99 1.000 0 33106  2648
-  1  76  25 1.000 0 33201  5850
-  1  58   5 1.000 0 33201  5867
-  1  92  80 1.000 0 33201   645
-  1  78  23 1.000 0 33201  5854
-  1  59 100 1.000 0 33201   501
-  1  63  17 1.000 0 33201  6138
-  1  62  17 1.000 0 33201  6137
-  1  75  24 1.000 0 33201  5895
-  1  54 100 1.000 0 33106  2649
-  1  76  24 1.000 0 33201  5870
-  1  80  24 1.000 0 33201  5865
-  1  80  25 1.000 0 33201  5851
-  1  77  23 1.000 0 33201  5856
-  1  58 100 1.000 0 33201  3425
-  1  72  23 1.000 0 33201  5878
-  1  73  23 1.000 0 33201  5877
-  1  57  19 1.000 0 33201  6161
-  1  73  24 1.000 0 33201  5892
-  1  71  22 1.000 0 33201  5874
-  1  64  17 1.000 0 33201  6139
-  1  77  24 1.000 0 33201  5869
-  1  79  24 1.000 0 33201  5866
-  1  79  25 1.000 0 33201  5852
-  1  74  24 1.000 0 33201  5891
-  1  79  23 1.000 0 33201  5853
-  1  72  24 1.000 0 33201  5893
-  1  93  36 1.000 0 33201  5341
-  1  81  32 1.000 0 30399   327
-  1  83  59 1.000 0 33201  2141
-  1  75  23 1.000 0 33201  5879
-  1  64  41 1.000 0 33106  3115
-  1  66  94 1.000 0 33106  2666
-  1  83  56 1.000 0 33201  2138
-  1  65  41 1.000 0 33106  3114
-  1  54  98 1.000 0 33106  2628
-  1  63  41 1.000 0 33106  3116
-  1  54  97 1.000 0 33106  2651
-  1  62  28 1.000 0 33201  5714
-  1  69  32 1.000 0 33201  5458
-  1  63  45 1.000 0 33106  3132
-  1  84  66 1.000 0 33201  2983
-  1  62  45 1.000 0 33106  3133
-  1  91  36 1.000 0 33201  5343
-  1  95  36 1.000 0 33201  5345
-  1  95  37 1.000 0 33201  5339
-  1  92  36 1.000 0 33201  5342
-  1  57  37 1.000 0 33106  3139
-  1  60  37 1.000 0 33106  3140
-  1  58  37 1.000 0 33106  3138
-  1  82  66 1.000 0 33201  2287
-  1  84  67 1.000 0 33201  2985
-  1  84  69 1.000 0 33201  2294
-  1  84  70 1.000 0 33201  2293
-  1  82  70 1.000 0 33201  2292
-  1  82  69 1.000 0 33201  2291
-  1  90  68 1.000 0 33201  2381
-  1  84  68 1.000 0 33201  2986
-  1  64  69 1.000 0 33201  1521
-  1  96  57 1.000 0 33201  3139
-  1  82  67 1.000 0 33201  2289
-  1  81  66 1.000 0 33201  2275
-  1  98  56 1.000 0 33201  2641
-  1  64  67 1.000 0 33201  1523
-  1  64  70 1.000 0 33201  1519
-  1  60  64 1.000 0 33106  2193
-  1  90  74 1.000 0 33201  2499
-  1  90  72 1.000 0 33201  2497
-  1  90  73 1.000 0 33201  2498
-  1  73  19 1.000 0 33201  6063
-  1  65  96 1.000 0 33106  2544
-  1  62  96 1.000 0 33106  2561
-  1  61  96 1.000 0 33106  2572
-  1  63  97 1.000 0 33106  2560
-  1  93  73 1.000 0 33106  2533
-  1  64  96 1.000 0 33106  2548
-  1  76  18 1.000 0 33201  6037
-  1  61  97 1.000 0 33106  2543
-  1  94  36 1.000 0 33201  5340
-  1  94  38 1.000 0 33201  5352
-  1  90  71 1.000 0 33201  2496
-  1  83  80 1.000 0 33201  2723
-  1  78  22 1.000 0 33201  5860
-  1  74  20 1.000 0 33201  6075
-  1  94  58 1.000 0 33201  2268
-  1  63  96 1.000 0 33106  2559
-  1  87  83 1.000 0 33106  2644
-  1  79  92 1.000 0 33106  2638
-  1  91  56 1.000 0 33201  2097
-  1  91  57 1.000 0 33201  2098
-  1  65  97 1.000 0 33106  2546
-  1  87  82 1.000 0 33106  2645
-  1  94  60 1.000 0 33201  2266
-  1  81  58 1.000 0 33201  2150
-  1  94  56 1.000 0 33201  2076
-  1  91  59 1.000 0 33201  2235
-  1  87  85 1.000 0 33106  2637
-  1  87  57 1.000 0 33201  2127
-  1  92  59 1.000 0 33201  2087
-  1  91  60 1.000 0 33201  2236
-  1  92  57 1.000 0 33201  2089
-  1  92  56 1.000 0 33201  2090
-  1  94  59 1.000 0 33201  2267
-  1  87  84 1.000 0 33106  2639
-  1  81  59 1.000 0 33201  2151
-  1  92  58 1.000 0 33201  2088
-  1  63  67 1.000 0 33201  1535
-  1  64  66 1.000 0 33201  1524
-  1  99  58 1.000 0 33201  2545
-  1  72  26 1.000 0 33201  5662
-  1  71  26 1.000 0 33201  5663
-  1  99  60 1.000 0 33201  2563
-  1  96  56 1.000 0 33201  3202
-  1  82  72 1.000 0 33201  2510
-  1  62  66 1.000 0 33201  1513
-  1  96  58 1.000 0 33201  3141
-  1  82  71 1.000 0 33201  2507
-  1  82  75 1.000 0 33201  2513
-  1  64  68 1.000 0 33201  1522
-  1  64  97 1.000 0 33106  2553
-  1  62  97 1.000 0 33106  2564
-  1  84  86 1.000 0 33106  2669
-  1  88  60 1.000 0 33201  2122
-  1  87  58 1.000 0 33201  2125
-  1  80  91 1.000 0 33106  2668
-  1  84  87 1.000 0 33106  2664
-  1  91  58 1.000 0 33201  2099
-  1  63  69 1.000 0 33201  1532
-  1  85  82 1.000 0 33106  2541
-  1  90  79 1.000 0 33201  2874
-  1  87  81 1.000 0 33106  2650
-  1  86  78 1.000 0 33201  2987
-  1  76  60 1.000 0 33201  2163
-  1  74   9 1.000 0 33106  3378
-  1  92  60 1.000 0 33201  2085
-  1  68  32 1.000 0 33201  5459
-  1  67  32 1.000 0 33201  5460
-  1  77  92 1.000 0 33106  2536
-  1  79  91 1.000 0 33106  2641
-  1  76  59 1.000 0 33201  2161
-  1  76  58 1.000 0 33201  2160
-  1  76  56 1.000 0 33201  2158
-  1  62  68 1.000 0 33201  1511
-  1  97  57 1.000 0 33201  2829
-  1  88  79 1.000 0 33201  3039
-  1  62  69 1.000 0 33201  1510
-  1  62  67 1.000 0 33201  1512
-  1  62  70 1.000 0 33201  1509
-  1  87  78 1.000 0 33201  2941
-  1 100  59 1.000 0 33201  2759
-  1  88  80 1.000 0 33201  3040
-  1  88  76 1.000 0 33201  2993
-  1  65  66 1.000 0 33201  1518
-  1  88  77 1.000 0 33201  3008
-  1  93  56 1.000 0 33201  2078
-  1  86  79 1.000 0 33201  2990
-  1  95  59 1.000 0 33201  2095
-  1  95  58 1.000 0 33201  2094
-  1  81  75 1.000 0 33201  2506
-  1  95  56 1.000 0 33201  2091
-  1  88  78 1.000 0 33201  3033
-  1  86  76 1.000 0 33201  2974
-  1  86  80 1.000 0 33201  2992
-  1  61  70 1.000 0 33201  1525
-  1  93  50 1.000 0 33201  4720
-  1  78  91 1.000 0 33106  2611
-  1  75   9 1.000 0 33106  3370
-  1  85  83 1.000 0 33106  2547
-  1  80  92 1.000 0 33106  2662
-  1  95  57 1.000 0 33201  2093
-  1  97  59 1.000 0 33201  2860
-  1  97  60 1.000 0 33201  2869
-  1  82  68 1.000 0 33201  2290
-  1  90  70 1.000 0 33201  2379
-  1  97  58 1.000 0 33201  2859
-  1  99  56 1.000 0 33201  3085
-  1  93  60 1.000 0 33201  2083
-  1  85  87 1.000 0 33106  2670
-  1  78  92 1.000 0 33106  2540
-  1  76  91 1.000 0 33106  2528
-  1  91  53 1.000 0 33201  1938
-  1  77  91 1.000 0 33106  2538
-  1  57  67 1.000 0 33201  2234
-  1  82  86 1.000 0 33106  2658
-  1  99  57 1.000 0 33201  2523
-  1  61  67 1.000 0 33201  1528
-  1  61  66 1.000 0 33201  1529
-  1  63  70 1.000 0 33201  1531
-  1  87  79 1.000 0 33201  2930
-  1  63  66 1.000 0 33201  1536
-  1  93  58 1.000 0 33201  2080
-  1  93  57 1.000 0 33201  2079
-  1  75  26 1.000 0 33201  5659
-  1  57  69 1.000 0 33201  2222
-  1  94  57 1.000 0 33201  2077
-  1  91  51 1.000 0 33201  1936
-  1  91  52 1.000 0 33201  1937
-  1  91  54 1.000 0 33201  1939
-  1  79  61 1.000 0 33201  2328
-  1  83  86 1.000 0 33106  2663
-  1  61  69 1.000 0 33201  1526
-  1  57  70 1.000 0 33201  2221
-  1  95  60 1.000 0 33201  2096
-  1  61  68 1.000 0 33201  1527
-  1  86  77 1.000 0 33201  2984
-  1  87  76 1.000 0 33201  2971
-  1  93  59 1.000 0 33201  2081
-  1  87  80 1.000 0 33201  2923
-  1  85  86 1.000 0 33106  2672
-  1  91  55 1.000 0 33201  1941
-  1  92  50 1.000 0 33201  4459
-  1  87  77 1.000 0 33201  2970
-  1  79  62 1.000 0 33201  2329
-  1  79  57 1.000 0 33201  2153
-  1  76  57 1.000 0 33201  2159
-  1  83  87 1.000 0 33106  2659
-  1  79  60 1.000 0 33201  2156
-  1  80  56 1.000 0 33201  2157
-  1  86  60 1.000 0 33201  2112
-  1  63  68 1.000 0 33201  1534
-  1  72   8 1.000 0 33106  3349
-  1  88  58 1.000 0 33201  2120
-  1  88  57 1.000 0 33201  2119
-  1  87  59 1.000 0 33201  2124
-  1  78  33 1.000 0 33201  5407
-  1  87  60 1.000 0 33201  2123
-  1  64  26 1.000 0 33201  5700
-  1  90  46 1.000 0 33201  4936
-  1  76  92 1.000 0 33106  2526
-  1  82  87 1.000 0 33106  2656
-  1  79  58 1.000 0 33201  2154
-  1  79  59 1.000 0 33201  2155
-  1  86  59 1.000 0 33201  2111
-  1  88  56 1.000 0 33201  2118
-  1  75  10 1.000 0 33106  3357
-  1  81  86 1.000 0 33106  2655
-  1  86  57 1.000 0 33201  2109
-  1  90  59 1.000 0 33201  2106
-  1  63  26 1.000 0 33201  5702
-  1  86  58 1.000 0 33201  2110
-  1  90  60 1.000 0 33201  2107
-  1  87  56 1.000 0 33201  2126
-  1  86  56 1.000 0 33201  2108
-  1  88  59 1.000 0 33201  2121
-  1  81  87 1.000 0 33106  2665
-  1  81  60 1.000 0 33201  2152
-  1  74  19 1.000 0 33201  6062
-  1  86  82 1.000 0 33106  2633
-  1  58  63 1.000 0 33106  2198
-  1  58  61 1.000 0 33106  2197
-  1  56  62 1.000 0 33106  2205
-  1  79  31 1.000 0 33201  5410
-  1  71  20 1.000 0 33201  6072
-  1  75  20 1.000 0 33201  6070
-  1  57  63 1.000 0 33106  2185
-  1  57   5 1.000 0 33201  5830
-  1  72  18 1.000 0 33201  6058
-  1  74  18 1.000 0 33201  6054
-  1  73  18 1.000 0 33201  6055
-  1  57  65 1.000 0 33106  2189
-  1  71  18 1.000 0 33201  6059
-  1  74  42 1.000 0 33201  5749
-  1  74  45 1.000 0 33201  5734
-  1  71  44 1.000 0 33201  5733
-  1  57  64 1.000 0 33106  2188
-  1  57  29 1.000 0 33201  5785
-  1  72  42 1.000 0 33201  5752
-  1  79   9 1.000 0 33106  3446
-  1  77  18 1.000 0 33201  6036
-  1  80  18 1.000 0 33201  6038
-  1  58  60 1.000 0 33106  2126
-  1  71  17 1.000 0 33201  6079
-  1  75  18 1.000 0 33201  6060
-  1  75  17 1.000 0 33201  6080
-  1  56   2 1.000 0 33201  5955
-  1  59   5 1.000 0 33201  5834
-  1  72  20 1.000 0 33201  6073
-  1  73  20 1.000 0 33201  6074
-  1  63   5 1.000 0 33106  3387
-  1  60  63 1.000 0 33106  2192
-  1  62   4 1.000 0 33106  3444
-  1  60  61 1.000 0 33106  2191
-  1  61  28 1.000 0 33201  5715
-  1  96  59 1.000 0 33201  3153
-  1  96  60 1.000 0 33201  3190
-  1  67   9 1.000 0 33201  5568
-  1  70  50 1.000 0 33106  3222
-  1  83  58 1.000 0 33201  2140
-  1  68  49 1.000 0 33106  3205
-  1  66   9 1.000 0 33201  5565
-  1  58  35 1.000 0 33201  5323
-  1  89  58 1.000 0 33201  2115
-  1  60  65 1.000 0 33106  2194
-  1  60  62 1.000 0 33106  2195
-  1  77  19 1.000 0 33201  6017
-  1  67  73 1.000 0 33201  2598
-  1  69  72 1.000 0 33201  2592
-  1  60  35 1.000 0 33201  5320
-  1  57  34 1.000 0 33201  5332
-  1  59  34 1.000 0 33201  5334
-  1  58  34 1.000 0 33201  5333
-  1  69   6 1.000 0 33201  5675
-  1  68  46 1.000 0 33106  3234
-  1  70  73 1.000 0 33201  2603
-  1  68  75 1.000 0 33201  2607
-  1  70  74 1.000 0 33201  2605
-  1  70  75 1.000 0 33201  2606
-  1  70  72 1.000 0 33201  2602
-  1  70  71 1.000 0 33201  2601
-  1  69   7 1.000 0 33201  5786
-  1  84  58 1.000 0 33201  2135
-  1  68  71 1.000 0 33201  2611
-  1  66  76 1.000 0 33201  2776
-  1  84  60 1.000 0 33201  2137
-  1  71  75 1.000 0 33201  2585
-  1  74  64 1.000 0 33201  2375
-  1  74  65 1.000 0 33201  2376
-  1  84  56 1.000 0 33201  2133
-  1  74  10 1.000 0 33106  3353
-  1  58  28 1.000 0 33201  5803
-  1  74  74 1.000 0 33201  2569
-  1  60  33 1.000 0 33201  5328
-  1  71   8 1.000 0 33106  3351
-  1  74  63 1.000 0 33201  2374
-  1  83  15 1.000 0 33106  3416
-  1  68  74 1.000 0 33201  2608
-  1  92  64 1.000 0 33201  2250
-  1  66  77 1.000 0 33201  2775
-  1  70   6 1.000 0 33201  5730
-  1  59  35 1.000 0 33201  5324
-  1  72  74 1.000 0 33201  2574
-  1  71  74 1.000 0 33201  2584
-  1  56  31 1.000 0 33201  5315
-  1  68  73 1.000 0 33201  2609
-  1  72  65 1.000 0 33201  2365
-  1  73  10 1.000 0 33106  3355
-  1  89  34 1.000 0 33201  5542
-  1  77  10 1.000 0 33106  3437
-  1  81  33 1.000 0 30399   340
-  1  89  32 1.000 0 33201  5551
-  1  57  31 1.000 0 33201  5316
-  1  89  33 1.000 0 33201  5556
-  1  90  32 1.000 0 33201  5550
-  1  74   6 1.000 0 33106  3363
-  1  59  31 1.000 0 33201  5318
-  1  88  32 1.000 0 33201  5552
-  1  87  20 1.000 0 33106  3396
-  1  59  33 1.000 0 33201  5329
-  1  74  61 1.000 0 33201  2401
-  1  56  35 1.000 0 33201  5321
-  1  57  35 1.000 0 33201  5322
-  1  71  73 1.000 0 33201  2583
-  1  58  27 1.000 0 33201  5807
-  1  92  65 1.000 0 33201  2248
-  1  73   6 1.000 0 33106  3364
-  1  60  34 1.000 0 33201  5330
-  1  56  34 1.000 0 33201  5331
-  1  71  72 1.000 0 33201  2582
-  1  66  78 1.000 0 33201  2774
-  1  66   6 1.000 0 33201  5719
-  1  67   6 1.000 0 33201  5696
-  1  63  89 1.000 0 33201  3178
-  1  63  88 1.000 0 33201  3179
-  1  70  10 1.000 0 33201  5610
-  1  66  10 1.000 0 33201  5626
-  1  69  50 1.000 0 33106  3221
-  1  89  60 1.000 0 33201  2117
-  1  69  49 1.000 0 33106  3207
-  1  52  69 1.000 0 33106  3201
-  1  89  59 1.000 0 33201  2116
-  1  67  10 1.000 0 33201  5628
-  1  69  10 1.000 0 33201  5669
-  1  63  90 1.000 0 33201  3177
-  1  67  50 1.000 0 33106  3216
-  1  66  50 1.000 0 33106  3215
-  1  66   8 1.000 0 33201  5535
-  1  68   8 1.000 0 33201  5547
-  1  68  50 1.000 0 33106  3220
-  1  63  87 1.000 0 33201  3181
-  1  63  86 1.000 0 33201  3182
-  1  70   9 1.000 0 33201  5562
-  1  69   8 1.000 0 33201  5557
-  1  65  89 1.000 0 33201  3172
-  1  69  46 1.000 0 33106  3237
-  1  82  15 1.000 0 33106  3422
-  1  69  74 1.000 0 33201  2594
-  1  67  75 1.000 0 33201  2600
-  1  67  71 1.000 0 33201  2596
-  1  66  71 1.000 0 33201  2586
-  1  68  10 1.000 0 33201  5646
-  1  67  72 1.000 0 33201  2597
-  1  68   9 1.000 0 33201  5596
-  1  70  48 1.000 0 33106  3211
-  1  52  68 1.000 0 33106  3199
-  1  52  66 1.000 0 33106  3197
-  1  90  57 1.000 0 33201  2103
-  1  52  70 1.000 0 33106  3196
-  1  76  19 1.000 0 33201  6018
-  1  68   7 1.000 0 33201  5770
-  1  71  42 1.000 0 33201  5753
-  1  69  73 1.000 0 33201  2593
-  1  68   6 1.000 0 33201  5695
-  1  69   9 1.000 0 33201  5602
-  1  69  75 1.000 0 33201  2595
-  1  73  42 1.000 0 33201  5750
-  1  69  71 1.000 0 33201  2591
-  1  70  46 1.000 0 33106  3235
-  1  68  72 1.000 0 33201  2610
-  1  81  14 1.000 0 33106  3391
-  1  70   7 1.000 0 33201  5751
-  1  67  74 1.000 0 33201  2599
-  1  69  47 1.000 0 33106  3226
-  1  60   2 1.000 0 33201  6030
-  1  69  67 1.000 0 33201  2470
-  1  90  58 1.000 0 33201  2105
-  1  90  56 1.000 0 33201  2102
-  1  68  48 1.000 0 33106  3213
-  1  72  43 1.000 0 33201  5742
-  1  59   1 1.000 0 33201  6101
-  1  67   7 1.000 0 33201  5755
-  1  58   1 1.000 0 33201  6093
-  1  79  55 1.000 0 33201  2044
-  1  72   7 1.000 0 33106  3384
-  1  56  26 1.000 0 33201  5798
-  1  85  65 1.000 0 33201  2306
-  1  69  48 1.000 0 33106  3214
-  1  82  32 1.000 0 30399   326
-  1  85  62 1.000 0 33201  2302
-  1  67  49 1.000 0 33106  3203
-  1  66  72 1.000 0 33201  2587
-  1  84  26 1.000 0 33201  5580
-  1  84  28 1.000 0 33201  5563
-  1  83  32 1.000 0 30399   321
-  1  60   1 1.000 0 33201  6049
-  1  82  28 1.000 0 33201  5566
-  1  57  26 1.000 0 33201  5797
-  1  81  35 1.000 0 30399   304
-  1  83  27 1.000 0 33201  5572
-  1  60  26 1.000 0 33201  5799
-  1  76  16 1.000 0 33201  6029
-  1  72  45 1.000 0 33201  5737
-  1  77  16 1.000 0 33201  6028
-  1  66   7 1.000 0 33201  5729
-  1  85  26 1.000 0 33201  5584
-  1  80  20 1.000 0 33201  6022
-  1  60  29 1.000 0 33201  5783
-  1  82  30 1.000 0 33201  5589
-  1  60  28 1.000 0 33201  5800
-  1  85  28 1.000 0 33201  5567
-  1  67  46 1.000 0 33106  3233
-  1  67  48 1.000 0 33106  3210
-  1  85  27 1.000 0 33201  5570
-  1  56   1 1.000 0 33201  6065
-  1  75  45 1.000 0 33201  5735
-  1  59  28 1.000 0 33201  5801
-  1  59  29 1.000 0 33201  5782
-  1  69  70 1.000 0 33201  2473
-  1  77  20 1.000 0 33201  6023
-  1  70  47 1.000 0 33106  3227
-  1  74  43 1.000 0 33201  5740
-  1  75  42 1.000 0 33201  5754
-  1  78  20 1.000 0 33201  6021
-  1  66  75 1.000 0 33201  2590
-  1  69  68 1.000 0 33201  2471
-  1  70  49 1.000 0 33106  3204
-  1  76  20 1.000 0 33201  6024
-  1  80  16 1.000 0 33201  6025
-  1  66  49 1.000 0 33106  3202
-  1  67  47 1.000 0 33106  3224
-  1  69  69 1.000 0 33201  2472
-  1  75  44 1.000 0 33201  5727
-  1  66  74 1.000 0 33201  2589
-  1  66  46 1.000 0 33106  3231
-  1  68  47 1.000 0 33106  3225
-  1  71  30 1.000 0 33201  5653
-  1  66  48 1.000 0 33106  3209
-  1  66  47 1.000 0 33106  3230
-  1  71  45 1.000 0 33201  5738
-  1  66  73 1.000 0 33201  2588
-  1  71   7 1.000 0 33106  3377
-  1  73  43 1.000 0 33201  5741
-  1  78  16 1.000 0 33201  6027
-  1  84  32 1.000 0 30399   318
-  1  72  44 1.000 0 33201  5732
-  1  79  16 1.000 0 33201  6026
-  1  74  44 1.000 0 33201  5728
-  1  73  45 1.000 0 33201  5736
-  1  73  44 1.000 0 33201  5731
-  1  80  19 1.000 0 33201  6019
-  1  58   2 1.000 0 33201  5974
-  1  78  19 1.000 0 33201  6016
-  1  82  60 1.000 0 33201  2132
-  1  58  26 1.000 0 33201  5796
-  1  82  59 1.000 0 33201  2131
-  1  57  27 1.000 0 33201  5808
-  1  78  17 1.000 0 33201  6041
-  1  90  34 1.000 0 33201  5543
-  1  79  19 1.000 0 33201  6015
-  1  78  18 1.000 0 33201  6035
-  1  85  32 1.000 0 30399   316
-  1  59  30 1.000 0 33201  5788
-  1  83  60 1.000 0 33201  2142
-  1  56  29 1.000 0 33201  5787
-  1  82  34 1.000 0 30399   312
-  1  85  35 1.000 0 30399   288
-  1  84  59 1.000 0 33201  2136
-  1  83  31 1.000 0 30399   271
-  1  57  30 1.000 0 33201  5790
-  1  60  30 1.000 0 33201  5794
-  1  75  43 1.000 0 33201  5739
-  1  58  29 1.000 0 33201  5784
-  1  56  28 1.000 0 33201  5805
-  1  57  28 1.000 0 33201  5804
-  1  73   9 1.000 0 33106  3382
-  1  73   7 1.000 0 33106  3374
-  1  81  31 1.000 0 30399   281
-  1  74  40 1.000 0 33201  5295
-  1  56  30 1.000 0 33201  5791
-  1  57  33 1.000 0 33201  5326
-  1  72  72 1.000 0 33201  2572
-  1  58  33 1.000 0 33201  5327
-  1  82  35 1.000 0 30399   303
-  1  89  35 1.000 0 33201  5545
-  1  60  31 1.000 0 33201  5319
-  1  72  71 1.000 0 33201  2571
-  1  75  71 1.000 0 33201  2558
-  1  78  10 1.000 0 33106  3434
-  1  75  72 1.000 0 33201  2559
-  1  84  35 1.000 0 30399   290
-  1  83  35 1.000 0 30399   293
-  1  74   7 1.000 0 33106  3373
-  1  71   9 1.000 0 33106  3386
-  1  85  61 1.000 0 33201  2301
-  1  87  32 1.000 0 33201  5553
-  1  59  32 1.000 0 33201  5314
-  1  88  35 1.000 0 33201  5546
-  1  86  34 1.000 0 33201  5539
-  1  86  32 1.000 0 33201  5554
-  1  87  35 1.000 0 33201  5548
-  1  73  75 1.000 0 33201  2580
-  1  73  74 1.000 0 33201  2579
-  1  77  36 1.000 0 33201  5233
-  1  90  35 1.000 0 33201  5544
-  1  72  75 1.000 0 33201  2575
-  1  73  73 1.000 0 33201  2578
-  1  87  34 1.000 0 33201  5540
-  1  75   6 1.000 0 33106  3369
-  1  71   6 1.000 0 33106  3367
-  1  82  33 1.000 0 30399   337
-  1  72   6 1.000 0 33106  3366
-  1  82  31 1.000 0 30399   276
-  1  84  57 1.000 0 33201  2134
-  1  78   9 1.000 0 33106  3448
-  1  51  68 1.000 0 33106  3187
-  1  57   2 1.000 0 33201  5968
-  1  80  17 1.000 0 33201  6045
-  1  79  18 1.000 0 33201  6033
-  1  57  62 1.000 0 33106  2190
-  1  62   5 1.000 0 33106  3393
-  1  65   5 1.000 0 33106  3423
-  1  76  17 1.000 0 33201  6044
-  1  71  43 1.000 0 33201  5743
-  1  57   4 1.000 0 33201  5940
-  1  77  17 1.000 0 33201  6042
-  1  88  33 1.000 0 33201  5559
-  1  90  33 1.000 0 33201  5555
-  1  73  41 1.000 0 33201  5746
-  1  82  57 1.000 0 33201  2129
-  1  82  58 1.000 0 33201  2130
-  1  85  33 1.000 0 30399   330
-  1  75   8 1.000 0 33106  3338
-  1  85  31 1.000 0 30399   268
-  1  74   8 1.000 0 33106  3339
-  1  84  33 1.000 0 30399   328
-  1  82  56 1.000 0 33201  2128
-  1  59  27 1.000 0 33201  5806
-  1  72   9 1.000 0 33106  3383
-  1  84  31 1.000 0 30399   269
-  1  85  34 1.000 0 30399   308
-  1  73   8 1.000 0 33106  3346
-  1  76  34 1.000 0 33201  5403
-  1  60   3 1.000 0 33201  5926
-  1  79  17 1.000 0 33201  6039
-  1  61   5 1.000 0 33106  3419
-  1  58  30 1.000 0 33201  5789
-  1  71  41 1.000 0 33201  5748
-  1  83  34 1.000 0 30399   310
-  1  85  14 1.000 0 33106  3392
-  1  60  90 1.000 0 33201  3216
-  1  59  90 1.000 0 33201  3189
-  1  56  87 1.000 0 33201  3096
-  1  56  90 1.000 0 33201  3118
-  1  78  52 1.000 0 33201  2028
-  1  56  86 1.000 0 33201  3095
-  1  56  88 1.000 0 33201  3098
-  1  56  89 1.000 0 33201  3117
-  1  57  86 1.000 0 33201  3206
-  1  60  88 1.000 0 33201  3214
-  1  83  57 1.000 0 33201  2139
-  1  76  54 1.000 0 33201  2035
-  1  57  87 1.000 0 33201  3204
-  1  59  86 1.000 0 33201  3194
-  1  81  15 1.000 0 33106  3425
-  1  60  89 1.000 0 33201  3215
-  1  59  88 1.000 0 33201  3192
-  1  59  89 1.000 0 33201  3191
-  1  73  72 1.000 0 33201  2577
-  1  88  34 1.000 0 33201  5541
-  1  86  35 1.000 0 33201  5549
-  1  57  32 1.000 0 33201  5312
-  1  74  72 1.000 0 33201  2566
-  1  74  73 1.000 0 33201  2568
-  1  71  10 1.000 0 33106  3361
-  1  58  88 1.000 0 33201  3209
-  1  64  86 1.000 0 33201  3169
-  1  64  87 1.000 0 33201  3167
-  1  59  87 1.000 0 33201  3193
-  1  64  88 1.000 0 33201  3166
-  1  72  10 1.000 0 33106  3358
-  1  58  90 1.000 0 33201  3207
-  1  64  90 1.000 0 33201  3164
-  1  57  89 1.000 0 33201  3198
-  1  65  88 1.000 0 33201  3173
-  1  67   8 1.000 0 33201  5538
-  1  65  86 1.000 0 33201  3176
-  1  64  89 1.000 0 33201  3165
-  1  58  89 1.000 0 33201  3208
-  1  72  73 1.000 0 33201  2573
-  1  57  88 1.000 0 33201  3203
-  1  71  71 1.000 0 33201  2581
-  1  56  33 1.000 0 33201  5325
-  1  74  75 1.000 0 33201  2570
-  1  65  87 1.000 0 33201  3174
-  1  73  71 1.000 0 33201  2576
-  1  60  87 1.000 0 33201  3213
-  1  65  90 1.000 0 33201  3170
-  1  57  90 1.000 0 33201  3197
-  1  88  46 1.000 0 33201  4934
-  1  58  87 1.000 0 33201  3210
-  1  87  49 1.000 0 33201  4928
-  1  66  36 1.000 0 33201  5518
-  1  56  97 1.000 0 33201  3395
-  1  72  78 1.000 0 33201  2764
-  1  56  40 1.000 0 33106  3105
-  1  61  91 1.000 0 33201  3267
-  1  90  36 1.000 0 33201  5373
-  1  57  99 1.000 0 33201  1452
-  1  53  94 1.000 0 33201  2707
-  1  55  91 1.000 0 33201  2706
-  1  53  91 1.000 0 33201  2711
-  1  68  91 1.000 0 33106  2723
-  1  51  95 1.000 0 33201  2697
-  1  55  95 1.000 0 33201  2702
-  1  55  39 1.000 0 33106  3158
-  1  51  94 1.000 0 33201  2698
-  1  52  94 1.000 0 33201  2716
-  1  77   9 1.000 0 33106  3450
-  1  57  40 1.000 0 33106  3083
-  1  55  92 1.000 0 33201  2705
-  1  53  92 1.000 0 33201  2709
-  1  52  91 1.000 0 33201  2712
-  1  51  63 1.000 0 33106  2147
-  1  58  40 1.000 0 33106  3059
-  1  51  93 1.000 0 33201  2699
-  1  51  92 1.000 0 33201  2700
-  1  76  62 1.000 0 33201  2341
-  1  56  96 1.000 0 33201  3418
-  1  55  63 1.000 0 33106  2134
-  1  92  76 1.000 0 33201   595
-  1  53  93 1.000 0 33201  2710
-  1  68  92 1.000 0 33106  2678
-  1  51  91 1.000 0 33201  2701
-  1  52  95 1.000 0 33201  2717
-  1  53  95 1.000 0 33201  2708
-  1  70  94 1.000 0 33106  2739
-  1  51  38 1.000 0 33106  3152
-  1  60  97 1.000 0 33201  1530
-  1  69  37 1.000 0 33201  5521
-  1  51  39 1.000 0 33106  3159
-  1  60  99 1.000 0 33201  2815
-  1  70  36 1.000 0 33201  5519
-  1  67  38 1.000 0 33201  5528
-  1  70  37 1.000 0 33201  5520
-  1  54  62 1.000 0 33106  2138
-  1  70  43 1.000 0 33201  5097
-  1  66  43 1.000 0 33201  5102
-  1  55  64 1.000 0 33106  2135
-  1  51  62 1.000 0 33106  2146
-  1  66  44 1.000 0 33201  5095
-  1  68  43 1.000 0 33201  5099
-  1  89  29 1.000 0 33201  5591
-  1  55  65 1.000 0 33106  2136
-  1  88  26 1.000 0 33201  5618
-  1  69  43 1.000 0 33201  5098
-  1  55  23 1.000 0 33201  6009
-  1  51  70 1.000 0 33106  3184
-  1  55  62 1.000 0 33106  2133
-  1  90  27 1.000 0 33201  5604
-  1  60  17 1.000 0 33201  6164
-  1  53  36 1.000 0 33106  3291
-  1  51  67 1.000 0 33106  3180
-  1  67  43 1.000 0 33201  5100
-  1  67  55 1.000 0 33106  2406
-  1  51  72 1.000 0 33201  2676
-  1  67  54 1.000 0 33106  2405
-  1  67  52 1.000 0 33106  2403
-  1  67  53 1.000 0 33106  2404
-  1  56  75 1.000 0 33201  2658
-  1  84  30 1.000 0 33201  5586
-  1  52  22 1.000 0 33201  6000
-  1  82  26 1.000 0 33201  5582
-  1  51  21 1.000 0 33201  5997
-  1  55  19 1.000 0 33201  6217
-  1  60  74 1.000 0 33201  2657
-  1  60  72 1.000 0 33201  2655
-  1  83  26 1.000 0 33201  5581
-  1  83  28 1.000 0 33201  5564
-  1  52  21 1.000 0 33201  5996
-  1  51  71 1.000 0 33201  2674
-  1  68  52 1.000 0 33106  2411
-  1  66  54 1.000 0 33106  2430
-  1  68  53 1.000 0 33106  2412
-  1  68  54 1.000 0 33106  2413
-  1  68  55 1.000 0 33106  2414
-  1  97  61 1.000 0 33201   527
-  1  53  21 1.000 0 33201  5995
-  1  66  52 1.000 0 33106  2425
-  1  67  51 1.000 0 33106  2401
-  1  66  51 1.000 0 33106  2424
-  1  80  42 1.000 0 33201  5025
-  1  80  44 1.000 0 33201  5017
-  1  77  43 1.000 0 33201  5044
-  1  80  45 1.000 0 33201  5009
-  1  76  42 1.000 0 33201  5031
-  1  76  43 1.000 0 33201  5045
-  1  80  41 1.000 0 33201  5033
-  1  78  44 1.000 0 33201  5019
-  1  54   7 1.000 0 33201  6418
-  1  73  27 1.000 0 33201  5665
-  1  78  42 1.000 0 33201  5027
-  1  83  38 1.000 0 33201  5268
-  1  77  69 1.000 0 33201  5216
-  1  64  49 1.000 0 33106  3061
-  1  62  44 1.000 0 33106  3128
-  1  80  43 1.000 0 33201  5040
-  1  63  44 1.000 0 33106  3127
-  1  54  91 1.000 0 33201  2692
-  1  53  64 1.000 0 33106  2127
-  1  56  61 1.000 0 33106  2207
-  1  60  98 1.000 0 33201  1520
-  1  52  39 1.000 0 33106  3157
-  1  55  94 1.000 0 33201  2703
-  1  54  93 1.000 0 33201  2694
-  1  56  63 1.000 0 33106  2206
-  1  55  93 1.000 0 33201  2704
-  1  54  92 1.000 0 33201  2693
-  1  60 100 1.000 0 33201  1504
-  1  54  39 1.000 0 33106  3155
-  1  82  79 1.000 0 33201  2728
-  1  82  77 1.000 0 33201  2730
-  1  82  80 1.000 0 33201  2732
-  1  80  87 1.000 0 33201  3379
-  1  83  77 1.000 0 33201  2726
-  1  83  76 1.000 0 33201  2727
-  1  52  74 1.000 0 33201  2672
-  1  62  47 1.000 0 33106  3099
-  1  86  30 1.000 0 33201  5603
-  1  60  43 1.000 0 33106  3467
-  1  87  29 1.000 0 33201  5595
-  1  88  30 1.000 0 33201  5599
-  1  88  29 1.000 0 33201  5593
-  1  52  73 1.000 0 33201  2671
-  1  87  26 1.000 0 33201  5617
-  1  55  74 1.000 0 33201  2684
-  1  52  72 1.000 0 33201  2670
-  1  55  71 1.000 0 33201  2680
-  1  90  29 1.000 0 33201  5592
-  1  55  72 1.000 0 33201  2681
-  1  86  26 1.000 0 33201  5616
-  1  86  29 1.000 0 33201  5597
-  1  89  30 1.000 0 33201  5600
-  1  51  73 1.000 0 33201  2677
-  1  63   4 1.000 0 33106  3427
-  1  90  30 1.000 0 33201  5598
-  1  52  75 1.000 0 33201  2673
-  1  87  30 1.000 0 33201  5601
-  1  66  55 1.000 0 33201  2434
-  1  51  74 1.000 0 33201  2678
-  1  90  26 1.000 0 33201  5615
-  1  56  74 1.000 0 33201  2659
-  1  55  73 1.000 0 33201  2682
-  1  81  30 1.000 0 33201  5590
-  1  83  30 1.000 0 33201  5587
-  1  89  27 1.000 0 33201  5605
-  1  51  75 1.000 0 33201  2679
-  1  53  23 1.000 0 33201  6011
-  1  56  71 1.000 0 33201  2662
-  1  52  23 1.000 0 33201  6013
-  1  56  73 1.000 0 33201  2660
-  1  56  72 1.000 0 33201  2661
-  1  51  23 1.000 0 33201  6014
-  1  57  17 1.000 0 33201  6167
-  1  66  53 1.000 0 33106  2429
-  1  52  71 1.000 0 33201  2669
-  1  53  75 1.000 0 33201  2663
-  1  81  26 1.000 0 33201  5583
-  1  82  65 1.000 0 33201  2311
-  1  82  27 1.000 0 33201  5573
-  1  60  75 1.000 0 33201  2653
-  1  57  98 1.000 0 33201  1462
-  1  82  62 1.000 0 33201  2308
-  1  51  37 1.000 0 33106  3165
-  1  79  42 1.000 0 33201  5026
-  1  56  98 1.000 0 33201  3392
-  1  82  64 1.000 0 33201  2310
-  1  83  64 1.000 0 33201  2320
-  1  82  63 1.000 0 33201  2309
-  1  81  63 1.000 0 33201  2314
-  1  81  61 1.000 0 33201  2312
-  1  81  62 1.000 0 33201  2313
-  1  54  37 1.000 0 33106  3160
-  1  70  95 1.000 0 33106  2746
-  1  96  62 1.000 0 33201   507
-  1  54  19 1.000 0 33201  6184
-  1  60  71 1.000 0 33201  2654
-  1  55  21 1.000 0 33201  5993
-  1  85  30 1.000 0 33201  5585
-  1  59  71 1.000 0 33201  2648
-  1  51  19 1.000 0 33201  6213
-  1  54  25 1.000 0 33201  6003
-  1  55  22 1.000 0 33201  6002
-  1  54  22 1.000 0 33201  5998
-  1  58  17 1.000 0 33201  6166
-  1  60  73 1.000 0 33201  2656
-  1  53  22 1.000 0 33201  5999
-  1  52  37 1.000 0 33106  3164
-  1  81  43 1.000 0 33201  5008
-  1  70  91 1.000 0 33106  2713
-  1  96  61 1.000 0 33201   505
-  1  55  75 1.000 0 33201  2686
-  1  52  19 1.000 0 33201  6186
-  1  54  21 1.000 0 33201  5994
-  1  84  27 1.000 0 33201  5571
-  1  53  19 1.000 0 33201  6185
-  1  53  37 1.000 0 33106  3163
-  1  55  37 1.000 0 33106  3162
-  1  76  61 1.000 0 33201  2340
-  1  83  61 1.000 0 33201  2317
-  1  83  63 1.000 0 33201  2319
-  1  85  76 1.000 0 33201  2733
-  1  97  52 1.000 0 33201  2263
-  1  88  71 1.000 0 33201  2540
-  1  79  71 1.000 0 33201  2535
-  1  79  74 1.000 0 33201  2532
-  1  64  51 1.000 0 33106  2232
-  1  64  55 1.000 0 33106  2238
-  1  77  71 1.000 0 33201  2557
-  1  82  76 1.000 0 33201  2729
-  1  82  78 1.000 0 33201  2731
-  1  73  66 1.000 0 33201  2423
-  1  69  87 1.000 0 33201  3133
-  1  67  69 1.000 0 33201  2451
-  1  66  67 1.000 0 33201  2454
-  1  63  55 1.000 0 33106  2231
-  1  88  74 1.000 0 33201  2537
-  1  67  68 1.000 0 33201  2450
-  1  73  69 1.000 0 33201  2426
-  1  69  86 1.000 0 33201  3134
-  1  99  59 1.000 0 33201  2548
-  1  85  74 1.000 0 33201  2544
-  1  73  47 1.000 0 33201  5071
-  1  66  66 1.000 0 33201  2453
-  1  53  62 1.000 0 33106  2143
-  1  51  36 1.000 0 33106  3322
-  1  83  62 1.000 0 33201  2318
-  1  85  77 1.000 0 33201  2734
-  1  53  65 1.000 0 33106  2128
-  1  58  97 1.000 0 33201  3442
-  1  54  38 1.000 0 33106  3149
-  1  58  98 1.000 0 33201  3441
-  1  58  96 1.000 0 33201  3367
-  1  57 100 1.000 0 33201  1451
-  1  83  79 1.000 0 33201  2724
-  1  52  38 1.000 0 33106  3151
-  1  53  38 1.000 0 33106  3150
-  1  60  96 1.000 0 33201  3419
-  1  74  62 1.000 0 33201  2373
-  1  83  65 1.000 0 33201  2322
-  1  85  63 1.000 0 33201  2303
-  1  85  64 1.000 0 33201  2305
-  1  53  63 1.000 0 33106  2144
-  1  52  65 1.000 0 33106  2145
-  1  59  97 1.000 0 33201  1421
-  1  59  98 1.000 0 33201  1410
-  1  85  78 1.000 0 33201  2735
-  1  59  99 1.000 0 33201   570
-  1  83  78 1.000 0 33201  2725
-  1  84  77 1.000 0 33201  2741
-  1  99  44 1.000 0 33201  4973
-  1  95  69 1.000 0 33106  2446
-  1  54  94 1.000 0 33201  2695
-  1  94  66 1.000 0 33106  2448
-  1  93  69 1.000 0 33106  2435
-  1 100  44 1.000 0 33201  4956
-  1  91  67 1.000 0 33106  2410
-  1  91  69 1.000 0 33106  2420
-  1  92  73 1.000 0 33106  2552
-  1  91  66 1.000 0 33106  2409
-  1  62  46 1.000 0 33106  3090
-  1  64  44 1.000 0 33106  3126
-  1  93  68 1.000 0 33106  2433
-  1  95  73 1.000 0 33106  2566
-  1  93  75 1.000 0 33106  2545
-  1  94  67 1.000 0 33106  2449
-  1  51  10 1.000 0 33201  6400
-  1  52   8 1.000 0 33201  6396
-  1  52   6 1.000 0 33201  6415
-  1  55   8 1.000 0 33201  6394
-  1  68  39 1.000 0 33201  5506
-  1  63  46 1.000 0 33106  3091
-  1  51   8 1.000 0 33201  6395
-  1  53   7 1.000 0 33201  6416
-  1  55   6 1.000 0 33201  6411
-  1  71  28 1.000 0 33201  5658
-  1  63  43 1.000 0 33106  3108
-  1  84  78 1.000 0 33201  2740
-  1  84  76 1.000 0 33201  2742
-  1  54  95 1.000 0 33201  2696
-  1  85  80 1.000 0 33201  2737
-  1  56  99 1.000 0 33201  3389
-  1  94  69 1.000 0 33106  2451
-  1  65  44 1.000 0 33106  3125
-  1  51   6 1.000 0 33201  6482
-  1  56  79 1.000 0 33201  2842
-  1  55  36 1.000 0 33106  3286
-  1  93  70 1.000 0 33106  2436
-  1  52  64 1.000 0 33106  2132
-  1  55  38 1.000 0 33106  3145
-  1  52  62 1.000 0 33106  2129
-  1  54  64 1.000 0 33106  2141
-  1  54  36 1.000 0 33106  3287
-  1  84  80 1.000 0 33201  2738
-  1  52  63 1.000 0 33106  2131
-  1  65  49 1.000 0 33106  3077
-  1  56 100 1.000 0 33201  3388
-  1  84  79 1.000 0 33201  2739
-  1  85  79 1.000 0 33201  2736
-  1  61  44 1.000 0 33106  3129
-  1  54  63 1.000 0 33106  2139
-  1  68  14 1.000 0 33201  5757
-  1  55  17 1.000 0 33201  6218
-  1  66  14 1.000 0 33201  5759
-  1  69  14 1.000 0 33201  5756
-  1  51  17 1.000 0 33201  6225
-  1  73  28 1.000 0 33201  5656
-  1  91  49 1.000 0 33201  4797
-  1  66  28 1.000 0 33201  5693
-  1  73  14 1.000 0 33201  6244
-  1  64  43 1.000 0 33106  3107
-  1  55  30 1.000 0 33201  4904
-  1  70  41 1.000 0 33201  5085
-  1  53   6 1.000 0 33201  6410
-  1  54  10 1.000 0 33201  6403
-  1  66  26 1.000 0 33201  5692
-  1  53  29 1.000 0 33201  4908
-  1  92  43 1.000 0 33201  6108
-  1  52  82 1.000 0 33201  3048
-  1  63  50 1.000 0 33106  3075
-  1  68  27 1.000 0 33201  5672
-  1  93  44 1.000 0 33201  6083
-  1  70  45 1.000 0 33201  5075
-  1  64  48 1.000 0 33106  3071
-  1  55  10 1.000 0 33201  6399
-  1  62  49 1.000 0 33106  3065
-  1  75  29 1.000 0 33201  5648
-  1  55  29 1.000 0 33201  4905
-  1  53  10 1.000 0 33201  6402
-  1  54  29 1.000 0 33201  4909
-  1  69  15 1.000 0 33201  5767
-  1  55   7 1.000 0 33201  6414
-  1  52   7 1.000 0 33201  6412
-  1  53  17 1.000 0 33201  6223
-  1  65  46 1.000 0 33106  3094
-  1  64  46 1.000 0 33106  3095
-  1  67  14 1.000 0 33201  5758
-  1  52  16 1.000 0 33201  6233
-  1  61  15 1.000 0 33201  6040
-  1  54  16 1.000 0 33201  6228
-  1  74  15 1.000 0 33201  6248
-  1  51   7 1.000 0 33201  6409
-  1  65  48 1.000 0 33106  3066
-  1  80  15 1.000 0 33201  5527
-  1  93  45 1.000 0 33201  6103
-  1  61  11 1.000 0 33201  6064
-  1  51  18 1.000 0 33201  6178
-  1  52  29 1.000 0 33201  4907
-  1  63  49 1.000 0 33106  3063
-  1  52  10 1.000 0 33201  6401
-  1  52  81 1.000 0 33201  3047
-  1  82  17 1.000 0 33106  3223
-  1  62  50 1.000 0 33106  3076
-  1  53  16 1.000 0 33201  6229
-  1  75  15 1.000 0 33201  6251
-  1  81  17 1.000 0 33106  3186
-  1  74  14 1.000 0 33201  6242
-  1  84  17 1.000 0 33106  3308
-  1  73  15 1.000 0 33201  6249
-  1  91  43 1.000 0 33201  6107
-  1  74  78 1.000 0 33201  2757
-  1  65  55 1.000 0 33106  2243
-  1  74  77 1.000 0 33201  2756
-  1  65  67 1.000 0 33201  1517
-  1  65  70 1.000 0 33201  1514
-  1  70  39 1.000 0 33201  5501
-  1  73  80 1.000 0 33201  2752
-  1  72  77 1.000 0 33201  2765
-  1  71  77 1.000 0 33201  2744
-  1  71  78 1.000 0 33201  2745
-  1  71  76 1.000 0 33201  2743
-  1  52  18 1.000 0 33201  6177
-  1  74  80 1.000 0 33201  2761
-  1  66  39 1.000 0 33201  5502
-  1  78  82 1.000 0 33201  2961
-  1  65  69 1.000 0 33201  1515
-  1  74  79 1.000 0 33201  2760
-  1  73  77 1.000 0 33201  2749
-  1  55  16 1.000 0 33201  6226
-  1  69  40 1.000 0 33201  5508
-  1  94  49 1.000 0 33201  4794
-  1  73  76 1.000 0 33201  2748
-  1  69  39 1.000 0 33201  5507
-  1  95  45 1.000 0 33201  6098
-  1  91  50 1.000 0 33201  4800
-  1  52  20 1.000 0 33201  6183
-  1  52  17 1.000 0 33201  6224
-  1  51  29 1.000 0 33201  4906
-  1  72  14 1.000 0 33201  6245
-  1  63  15 1.000 0 33201  6006
-  1  54  17 1.000 0 33201  6221
-  1  69  13 1.000 0 33201  5761
-  1  63  11 1.000 0 33201  6057
-  1  75  14 1.000 0 33201  6243
-  1  89  41 1.000 0 33201  4955
-  1  54   6 1.000 0 33201  6417
-  1  69  12 1.000 0 33201  5772
-  1  66  15 1.000 0 33201  5771
-  1  94  44 1.000 0 33201  6081
-  1  91  63 1.000 0 33201  2262
-  1  75  95 1.000 0 33106  2603
-  1  71  55 1.000 0 33201   946
-  1  67  58 1.000 0 33201  1127
-  1  84  71 1.000 0 33201  2529
-  1  91  64 1.000 0 33201  2261
-  1  73  78 1.000 0 33201  2750
-  1  67  60 1.000 0 33201  1130
-  1  91  65 1.000 0 33201  2260
-  1  67  59 1.000 0 33201  1129
-  1  84  72 1.000 0 33201  2528
-  1  66  60 1.000 0 33201  1108
-  1  66  57 1.000 0 33201  1105
-  1  69  76 1.000 0 33201  2792
-  1  84  74 1.000 0 33201  2530
-  1  71  80 1.000 0 33201  2747
-  1  78  73 1.000 0 33201  2488
-  1  69  79 1.000 0 33201  2789
-  1  78  74 1.000 0 33201  2489
-  1  71  90 1.000 0 33201  3099
-  1  79  78 1.000 0 33201  2904
-  1  81  28 1.000 0 33201  5569
-  1  90  63 1.000 0 33201  2183
-  1  68  80 1.000 0 33201  2781
-  1  61  42 1.000 0 33106  3124
-  1  74  55 1.000 0 33201   939
-  1  67  11 1.000 0 33201  5780
-  1  66  20 1.000 0 33201  4991
-  1  62  42 1.000 0 33106  3123
-  1  63  42 1.000 0 33106  3122
-  1  65  14 1.000 0 33201  6109
-  1  89  73 1.000 0 33201  2405
-  1  63  53 1.000 0 33106  2229
-  1  88  27 1.000 0 33201  5606
-  1  62  43 1.000 0 33106  3111
-  1  75  69 1.000 0 33201  2435
-  1  74  85 1.000 0 33201  2937
-  1  75  68 1.000 0 33201  2436
-  1  74  69 1.000 0 33201  2429
-  1  65  60 1.000 0 33106  2160
-  1  65  59 1.000 0 33106  2159
-  1  72  70 1.000 0 33201  2445
-  1  75  67 1.000 0 33201  2437
-  1  74  70 1.000 0 33201  2428
-  1  75  70 1.000 0 33201  2433
-  1  83  72 1.000 0 33201  2515
-  1  83  71 1.000 0 33201  2514
-  1  83  73 1.000 0 33201  2516
-  1  59  26 1.000 0 33201  5795
-  1  79  79 1.000 0 33201  2903
-  1  72  76 1.000 0 33201  2766
-  1  87  48 1.000 0 33201  4940
-  1  51   9 1.000 0 33201  6405
-  1  75  77 1.000 0 33201  2770
-  1  76  77 1.000 0 33201  2924
-  1  74  54 1.000 0 33201   938
-  1  74  51 1.000 0 33201   934
-  1  84  73 1.000 0 33201  2527
-  1  74  76 1.000 0 33201  2755
-  1  72  41 1.000 0 33201  5747
-  1  71  86 1.000 0 33201  3103
-  1  74  53 1.000 0 33201   937
-  1  78  84 1.000 0 33201  2959
-  1  70  83 1.000 0 33201  2888
-  1  91  62 1.000 0 33201  2264
-  1  73  90 1.000 0 33201  3104
-  1  75  52 1.000 0 33201   926
-  1  64  58 1.000 0 33106  2163
-  1  91  61 1.000 0 33201  2265
-  1  89  78 1.000 0 33201  3061
-  1  89  80 1.000 0 33201  3041
-  1  89  68 1.000 0 33201  2397
-  1  71  87 1.000 0 33201  3102
-  1  84  75 1.000 0 33201  2526
-  1  73  88 1.000 0 33201  3106
-  1  71  88 1.000 0 33201  3101
-  1  66  58 1.000 0 33201  1106
-  1  86  63 1.000 0 33201  2188
-  1  67  77 1.000 0 33201  2786
-  1  69  80 1.000 0 33201  2788
-  1  70  77 1.000 0 33201  2794
-  1  67  39 1.000 0 33201  5503
-  1  70  80 1.000 0 33201  2797
-  1  67  78 1.000 0 33201  2785
-  1  71  89 1.000 0 33201  3100
-  1  73  79 1.000 0 33201  2751
-  1  79  88 1.000 0 33201  3309
-  1  71  27 1.000 0 33201  5668
-  1  68  76 1.000 0 33201  2778
-  1  80  90 1.000 0 33201  3349
-  1  89  75 1.000 0 33201  2407
-  1  74  91 1.000 0 33106  2577
-  1  72  94 1.000 0 33106  2597
-  1  70  79 1.000 0 33201  2796
-  1  67  76 1.000 0 33201  2787
-  1  79  52 1.000 0 33201  2040
-  1  73  91 1.000 0 33106  2588
-  1  84  52 1.000 0 33201  2011
-  1  84  54 1.000 0 33201  2013
-  1  86  73 1.000 0 33201  2493
-  1  71  64 1.000 0 33201  3069
-  1  90  62 1.000 0 33201  2072
-  1  67  79 1.000 0 33201  2784
-  1  93  28 1.000 0 33106  3004
-  1  95  30 1.000 0 33106  3000
-  1  89  61 1.000 0 33201  2063
-  1  78  75 1.000 0 33201  2490
-  1  89  72 1.000 0 33201  2404
-  1  86  75 1.000 0 33201  2495
-  1  89  74 1.000 0 33201  2406
-  1  79  53 1.000 0 33201  2041
-  1  75  61 1.000 0 33201  2367
-  1  81  24 1.000 0 33201  5814
-  1  88  63 1.000 0 33201  2066
-  1  93  40 1.000 0 33201  5348
-  1  71  91 1.000 0 33106  2622
-  1  87  75 1.000 0 33201  2402
-  1  84  53 1.000 0 33201  2012
-  1  86  71 1.000 0 33201  2491
-  1  81  71 1.000 0 33201  2501
-  1  75  62 1.000 0 33201  2368
-  1  88  62 1.000 0 33201  2067
-  1  62  15 1.000 0 33201  5918
-  1  65  54 1.000 0 33106  2242
-  1  71  65 1.000 0 33201  3070
-  1  79  30 1.000 0 33201  5639
-  1  73  63 1.000 0 33201  2354
-  1  87  36 1.000 0 33201  5375
-  1  71  61 1.000 0 33201  3071
-  1  75  63 1.000 0 33201  2369
-  1  77  26 1.000 0 33201  5629
-  1  86  74 1.000 0 33201  2494
-  1  65  52 1.000 0 33106  2239
-  1  62  51 1.000 0 33106  2249
-  1  68  79 1.000 0 33201  2777
-  1  90  75 1.000 0 33201  2500
-  1  85  24 1.000 0 33201  5815
-  1  76  74 1.000 0 33201  2549
-  1  63  75 1.000 0 33201  2632
-  1  62  74 1.000 0 33201  2623
-  1  64  73 1.000 0 33201  2628
-  1  62  71 1.000 0 33201  2626
-  1  68  57 1.000 0 33201  1120
-  1  94  28 1.000 0 33106  3002
-  1  68  58 1.000 0 33201  1122
-  1  65  71 1.000 0 33201  2621
-  1  87  40 1.000 0 33201  5369
-  1  63  71 1.000 0 33201  2636
-  1  92  28 1.000 0 33106  3005
-  1  64  71 1.000 0 33201  2629
-  1  64  72 1.000 0 33201  2630
-  1  66  59 1.000 0 33201  1107
-  1  87  41 1.000 0 33201  4958
-  1  90  48 1.000 0 33201  4938
-  1  75  57 1.000 0 33201   598
-  1  86  50 1.000 0 33201  4947
-  1  63  33 1.000 0 33201  5497
-  1  65  53 1.000 0 33106  2241
-  1  65  47 1.000 0 33106  3085
-  1  65  51 1.000 0 33106  2237
-  1  89  47 1.000 0 33201  4948
-  1  70  30 1.000 0 33201  5684
-  1  74  93 1.000 0 33106  2574
-  1  62  55 1.000 0 33106  2245
-  1  87  50 1.000 0 33201  4946
-  1  80  81 1.000 0 33201  2975
-  1  69  29 1.000 0 33201  5677
-  1  62  48 1.000 0 33106  3082
-  1  85  85 1.000 0 33106  2558
-  1  71  79 1.000 0 33201  2746
-  1  69  30 1.000 0 33201  5681
-  1  88  48 1.000 0 33201  4939
-  1  90  50 1.000 0 33201  4942
-  1  76  72 1.000 0 33201  2551
-  1  86  47 1.000 0 33201  5101
-  1  86  41 1.000 0 33201  4959
-  1  85  81 1.000 0 33106  2535
-  1  88  50 1.000 0 33201  4944
-  1  65  68 1.000 0 33201  1516
-  1  73  83 1.000 0 33201  2945
-  1  65  43 1.000 0 33106  3102
-  1  66  56 1.000 0 33201  1104
-  1  64  75 1.000 0 33201  2631
-  1  73  70 1.000 0 33201  2427
-  1  61  43 1.000 0 33106  3113
-  1  69  90 1.000 0 33201  3130
-  1  64  74 1.000 0 33201  2627
-  1  72  28 1.000 0 33201  5657
-  1  76  71 1.000 0 33201  2552
-  1  62  73 1.000 0 33201  2624
-  1  88  65 1.000 0 33201  2064
-  1  76  73 1.000 0 33201  2550
-  1  89  50 1.000 0 33201  4943
-  1  92  75 1.000 0 33106  2550
-  1  70  82 1.000 0 33201  2889
-  1  62  52 1.000 0 33106  2244
-  1  67  70 1.000 0 33201  2452
-  1  66  81 1.000 0 33201  3084
-  1  63  47 1.000 0 33106  3089
-  1  55   9 1.000 0 33201  6404
-  1  73  85 1.000 0 33201  2943
-  1  73  67 1.000 0 33201  2424
-  1  62  53 1.000 0 33106  2247
-  1  67  66 1.000 0 33201  2448
-  1  85  75 1.000 0 33201  2546
-  1  78  80 1.000 0 33201  2913
-  1  68  13 1.000 0 33201  5762
-  1  62  54 1.000 0 33106  2248
-  1  62  72 1.000 0 33201  2625
-  1  71  47 1.000 0 33201  5074
-  1  64   6 1.000 0 33201  6267
-  1  64   9 1.000 0 33201  6289
-  1  70  81 1.000 0 33201  2890
-  1  88  64 1.000 0 33201  2065
-  1  67  15 1.000 0 33201  5769
-  1  69  88 1.000 0 33201  3132
-  1  88  61 1.000 0 33201  2069
-  1  58  32 1.000 0 33201  5313
-  1  72  57 1.000 0 33201   581
-  1 100  52 1.000 0 33201  2408
-  1 100  51 1.000 0 33201  2520
-  1  68  67 1.000 0 33201  2467
-  1  72  56 1.000 0 33201   580
-  1  72  58 1.000 0 33201   582
-  1  72  95 1.000 0 33106  2591
-  1  75  92 1.000 0 33106  2606
-  1  97  54 1.000 0 33201  2279
-  1  61  75 1.000 0 33201  2616
-  1  65  75 1.000 0 33201  2617
-  1  71  56 1.000 0 33201   574
-  1  73  54 1.000 0 33201   907
-  1  73  93 1.000 0 33106  2583
-  1  87  17 1.000 0 33106  3403
-  1  62  75 1.000 0 33201  2622
-  1  80  57 1.000 0 33201  2178
-  1  69  77 1.000 0 33201  2791
-  1  72  92 1.000 0 33106  2599
-  1  65  73 1.000 0 33201  2619
-  1  69  66 1.000 0 33201  2469
-  1  71  92 1.000 0 33106  2621
-  1  75  91 1.000 0 33106  2607
-  1  96  52 1.000 0 33201  2297
-  1  72  91 1.000 0 33106  2602
-  1  74  92 1.000 0 33106  2575
-  1 100  53 1.000 0 33201  2458
-  1  68  82 1.000 0 33201  2894
-  1  65  72 1.000 0 33201  2620
-  1  80  88 1.000 0 33201  3366
-  1  91  77 1.000 0 33201   556
-  1  73  57 1.000 0 33201   592
-  1  96  53 1.000 0 33201  2304
-  1  80  59 1.000 0 33201  2180
-  1  61  74 1.000 0 33201  2615
-  1  69  78 1.000 0 33201  2790
-  1  71  60 1.000 0 33201   579
-  1  65  57 1.000 0 33106  2157
-  1  70  66 1.000 0 33201  2463
-  1  84  38 1.000 0 33201  5267
-  1  96  54 1.000 0 33201  2321
-  1  73  92 1.000 0 33106  2586
-  1  68  66 1.000 0 33201  2468
-  1  80  75 1.000 0 33201  2519
-  1  75  66 1.000 0 33201  2438
-  1  71  67 1.000 0 33201  2440
-  1  71  69 1.000 0 33201  2447
-  1  73  55 1.000 0 33201   908
-  1  71  70 1.000 0 33201  2485
-  1  68  81 1.000 0 33201  2895
-  1  71  66 1.000 0 33201  2439
-  1  63  52 1.000 0 33106  2228
-  1  80  74 1.000 0 33201  2521
-  1  67  80 1.000 0 33201  2782
-  1  67  83 1.000 0 33201  2898
-  1  71  68 1.000 0 33201  2446
-  1  65  56 1.000 0 33106  2156
-  1  67  84 1.000 0 33201  2897
-  1  80  71 1.000 0 33201  2525
-  1  80  72 1.000 0 33201  2524
-  1  80  73 1.000 0 33201  2522
-  1  70  69 1.000 0 33201  2460
-  1  70  68 1.000 0 33201  2461
-  1  73  53 1.000 0 33201   906
-  1  76  75 1.000 0 33201  2547
-  1  73  52 1.000 0 33201   905
-  1  63  54 1.000 0 33106  2230
-  1  72  67 1.000 0 33201  2442
-  1  80  60 1.000 0 33201  2181
-  1  70  67 1.000 0 33201  2462
-  1  70  70 1.000 0 33201  2459
-  1  72  66 1.000 0 33201  2441
-  1  66  79 1.000 0 33201  2773
-  1  78  57 1.000 0 33201  2164
-  1  66  80 1.000 0 33201  2772
-  1  80  89 1.000 0 33201  3354
-  1  60  32 1.000 0 33201  5311
-  1  83  75 1.000 0 33201  2518
-  1  75  65 1.000 0 33201  2372
-  1  77  74 1.000 0 33201  2554
-  1  79  85 1.000 0 33201  2976
-  1  89  79 1.000 0 33201  3045
-  1  85  84 1.000 0 33106  2549
-  1  86  48 1.000 0 33201  4941
-  1  65  50 1.000 0 33106  3072
-  1  89  48 1.000 0 33201  4937
-  1  64  47 1.000 0 33106  3087
-  1  72  68 1.000 0 33201  2443
-  1  87  47 1.000 0 33201  4952
-  1  88  45 1.000 0 33201  4962
-  1  64  52 1.000 0 33106  2233
-  1  65  58 1.000 0 33106  2158
-  1  83  74 1.000 0 33201  2517
-  1  64  50 1.000 0 33106  3073
-  1  63  48 1.000 0 33106  3081
-  1  88  47 1.000 0 33201  4950
-  1  90  47 1.000 0 33201  4951
-  1  66  27 1.000 0 33201  5674
-  1  71  62 1.000 0 33201  3067
-  1  72  69 1.000 0 33201  2444
-  1  78  71 1.000 0 33201  2486
-  1  73  94 1.000 0 33106  2582
-  1  66  68 1.000 0 33201  2455
-  1  66  69 1.000 0 33201  2456
-  1  87  72 1.000 0 33201  2231
-  1  86  72 1.000 0 33201  2492
-  1  77  73 1.000 0 33201  2555
-  1  64  54 1.000 0 33106  2236
-  1  67  67 1.000 0 33201  2449
-  1  72  47 1.000 0 33201  5072
-  1  71  63 1.000 0 33201  3068
-  1  78  72 1.000 0 33201  2487
-  1  86  62 1.000 0 33201  2187
-  1  86  61 1.000 0 33201  2186
-  1  77  72 1.000 0 33201  2556
-  1  64  53 1.000 0 33106  2235
-  1  87  71 1.000 0 33201  2230
-  1  75  40 1.000 0 33201  5299
-  1  75  47 1.000 0 33201  5069
-  1  87  73 1.000 0 33201  2232
-  1  87  74 1.000 0 33201  2233
-  1  90  65 1.000 0 33201  2185
-  1  82  51 1.000 0 33201  2006
-  1  89  71 1.000 0 33201  2403
-  1  95  28 1.000 0 33106  3001
-  1  61  56 1.000 0 33106  2226
-  1  61  58 1.000 0 33106  2173
-  1  75  51 1.000 0 33201   927
-  1  86  64 1.000 0 33201  2189
-  1  70  76 1.000 0 33201  2793
-  1  68  77 1.000 0 33201  2779
-  1  61  60 1.000 0 33106  2176
-  1  68  78 1.000 0 33201  2780
-  1  51  28 1.000 0 33201  4924
-  1  68  68 1.000 0 33201  2466
-  1  73  51 1.000 0 33201   904
-  1  68  83 1.000 0 33201  2893
-  1  72  61 1.000 0 33201  2357
-  1  72  62 1.000 0 33201  2358
-  1  56  80 1.000 0 33201  2841
-  1  73  60 1.000 0 33201   596
-  1  90  64 1.000 0 33201  2184
-  1  72  64 1.000 0 33201  2360
-  1  86  65 1.000 0 33201  2190
-  1  63  74 1.000 0 33201  2633
-  1  72  63 1.000 0 33201  2359
-  1  73  59 1.000 0 33201   594
-  1  75  56 1.000 0 33201   597
-  1  73  65 1.000 0 33201  2356
-  1  73  58 1.000 0 33201   593
-  1  73  56 1.000 0 33201   591
-  1  79  54 1.000 0 33201  2042
-  1  90  61 1.000 0 33201  2070
-  1  78  28 1.000 0 33201  5509
-  1  75  94 1.000 0 33106  2604
-  1  63  72 1.000 0 33201  2635
-  1  65  42 1.000 0 33106  3120
-  1  63  73 1.000 0 33201  2634
-  1  79  51 1.000 0 33201  2039
-  1  82  54 1.000 0 33201  2004
-  1  84  55 1.000 0 33201  2014
-  1  61  72 1.000 0 33201  2613
-  1  72  60 1.000 0 33201   585
-  1  72  59 1.000 0 33201   584
-  1  89  26 1.000 0 33201  5619
-  1  73  95 1.000 0 33106  2580
-  1  61  41 1.000 0 33106  3118
-  1  64  42 1.000 0 33106  3121
-  1  62  41 1.000 0 33106  3117
-  1  70  78 1.000 0 33201  2795
-  1  65  74 1.000 0 33201  2618
-  1  61  71 1.000 0 33201  2612
-  1  61  73 1.000 0 33201  2614
-  1  73  64 1.000 0 33201  2355
-  1  73  61 1.000 0 33201  2351
-  1  73  62 1.000 0 33201  2353
-  1  75  64 1.000 0 33201  2370
-  1  71  53 1.000 0 33201   948
-  1  71  93 1.000 0 33106  2620
-  1  88  42 1.000 0 33201  4978
-  1  81  19 1.000 0 33106  3193
-  1  64  19 1.000 0 33201  6126
-  1  90  45 1.000 0 33201  4960
-  1  72  54 1.000 0 33201   910
-  1  72  53 1.000 0 33201   911
-  1  81  57 1.000 0 33201  2149
-  1  69  85 1.000 0 33201  2901
-  1  85  59 1.000 0 33201  2146
-  1  67  82 1.000 0 33201  2899
-  1  69  89 1.000 0 33201  3131
-  1  85  58 1.000 0 33201  2145
-  1  74  36 1.000 0 33201  5308
-  1  80  83 1.000 0 33201  2972
-  1  71  57 1.000 0 33201   575
-  1  72  52 1.000 0 33201   912
-  1  81  56 1.000 0 33201  2148
-  1  73  82 1.000 0 33201  2946
-  1  63  51 1.000 0 33106  2227
-  1  77  58 1.000 0 33201  2174
-  1  85  57 1.000 0 33201  2144
-  1  73  81 1.000 0 33201  2947
-  1  80  82 1.000 0 33201  2973
-  1  67  81 1.000 0 33201  2900
-  1  69  84 1.000 0 33201  3087
-  1  85  60 1.000 0 33201  2147
-  1  68  85 1.000 0 33201  2891
-  1  69  83 1.000 0 33201  3088
-  1  68  69 1.000 0 33201  2465
-  1  68  70 1.000 0 33201  2464
-  1  75  90 1.000 0 33201  3097
-  1  69  82 1.000 0 33201  3089
-  1  75  88 1.000 0 33201  3092
-  1  61  59 1.000 0 33106  2174
-  1  68  84 1.000 0 33201  2892
-  1  58  31 1.000 0 33201  5317
-  1  74  52 1.000 0 33201   936
-  1  77  60 1.000 0 33201  2176
-  1  75  54 1.000 0 33201   923
-  1  70  84 1.000 0 33201  2887
-  1  61  57 1.000 0 33106  2172
-  1  63  56 1.000 0 33106  2166
-  1  78  56 1.000 0 33201  2177
-  1  75  87 1.000 0 33201  3093
-  1  70  85 1.000 0 33201  3086
-  1  63  59 1.000 0 33106  2169
-  1  72  55 1.000 0 33201   909
-  1  78  58 1.000 0 33201  2165
-  1  80  58 1.000 0 33201  2179
-  1  78  60 1.000 0 33201  2169
-  1  72  51 1.000 0 33201   913
-  1  78  43 1.000 0 33201  5042
-  1  78  59 1.000 0 33201  2167
-  1  76  44 1.000 0 33201  5024
-  1  71  59 1.000 0 33201   577
-  1  71  58 1.000 0 33201   576
-  1  79  45 1.000 0 33201  5012
-  1  79  44 1.000 0 33201  5018
-  1  77  45 1.000 0 33201  5015
-  1  76  45 1.000 0 33201  5016
-  1  77  44 1.000 0 33201  5021
-  1  78  45 1.000 0 33201  5013
-  1  79  43 1.000 0 33201  5041
-  1  77  42 1.000 0 33201  5028
-  1  97  55 1.000 0 33201  2284
-  1  80  84 1.000 0 33201  2969
-  1  96  51 1.000 0 33201  2288
-  1  67  85 1.000 0 33201  2896
-  1  73  84 1.000 0 33201  2944
-  1  85  56 1.000 0 33201  2143
-  1  77  59 1.000 0 33201  2175
-  1  77  57 1.000 0 33201  2173
-  1  79  56 1.000 0 33201  2171
-  1  75  53 1.000 0 33201   925
-  1  75  86 1.000 0 33201  3094
-  1  62  56 1.000 0 33106  2155
-  1  69  81 1.000 0 33201  3090
-  1  60  86 1.000 0 33201  3212
-  1  77  56 1.000 0 33201  3072
-  1  80  85 1.000 0 33201  2968
-  1  63  60 1.000 0 33106  2171
-  1  68  89 1.000 0 33201  3150
-  1  75  89 1.000 0 33201  3091
-  1  87  44 1.000 0 33201  4968
-  1  88  44 1.000 0 33201  4967
-  1  82  19 1.000 0 33106  3247
-  1  55  34 1.000 0 33106  3332
-  1  75  41 1.000 0 33201  5744
-  1  54  34 1.000 0 33106  3333
-  1  74  41 1.000 0 33201  5745
-  1  71  84 1.000 0 33201  2954
-  1  76  13 1.000 0 33201  5371
-  1  95  49 1.000 0 33201  4792
-  1  85  19 1.000 0 33106  3249
-  1  90  41 1.000 0 33201  4954
-  1  59  42 1.000 0 33106  3453
-  1  93  49 1.000 0 33201  4795
-  1  60  42 1.000 0 33106  3452
-  1  60  27 1.000 0 33201  5809
-  1  56  27 1.000 0 33201  5810
-  1  94  50 1.000 0 33201  4798
-  1  54  35 1.000 0 33106  3309
-  1  53  31 1.000 0 33106  3328
-  1  58  41 1.000 0 33106  3461
-  1  54  32 1.000 0 33106  3315
-  1  76  79 1.000 0 33201  2921
-  1  78  85 1.000 0 33201  2958
-  1  55  35 1.000 0 33106  3307
-  1  76  78 1.000 0 33201  2922
-  1  60  41 1.000 0 33106  3454
-  1  79  69 1.000 0 33201  5190
-  1  80  80 1.000 0 33201  2931
-  1  79  41 1.000 0 33201  5034
-  1  79  68 1.000 0 33201  5191
-  1  80  78 1.000 0 33201  2928
-  1  80  76 1.000 0 33201  2926
-  1  53  34 1.000 0 33106  3335
-  1  80  79 1.000 0 33201  2929
-  1  79  67 1.000 0 33201  5192
-  1  80  77 1.000 0 33201  2927
-  1  78  69 1.000 0 33201  5199
-  1  78  70 1.000 0 33201  5196
-  1  78  66 1.000 0 33201  5193
-  1  78  68 1.000 0 33201  5197
-  1  55  76 1.000 0 33201  2851
-  1  78  67 1.000 0 33201  5195
-  1  79  70 1.000 0 33201  5189
-  1  52  79 1.000 0 33201  2857
-  1  78  41 1.000 0 33201  5035
-  1  65  25 1.000 0 33201  5957
-  1  87  43 1.000 0 33201  4974
-  1  86  42 1.000 0 33201  4980
-  1  62  25 1.000 0 33201  5958
-  1  61  16 1.000 0 33201  6119
-  1  65  20 1.000 0 33201  6131
-  1  90  42 1.000 0 33201  4976
-  1  88  43 1.000 0 33201  4972
-  1  61  25 1.000 0 33201  5959
-  1  86  43 1.000 0 33201  4975
-  1  62  14 1.000 0 33201  6034
-  1  70  42 1.000 0 33201  5080
-  1  54  27 1.000 0 33201  4919
-  1  82  20 1.000 0 33106  3334
-  1  87  42 1.000 0 33201  4979
-  1  64  25 1.000 0 33201  5954
-  1  65  84 1.000 0 33201  2996
-  1  61  83 1.000 0 33201  2991
-  1  63  25 1.000 0 33201  5956
-  1  66  41 1.000 0 33201  5090
-  1  52  30 1.000 0 33201  4900
-  1  57  18 1.000 0 33201  6172
-  1  56  18 1.000 0 33201  6173
-  1  59  21 1.000 0 33201  5972
-  1  75  13 1.000 0 33201  6237
-  1  58  21 1.000 0 33201  5973
-  1  65  17 1.000 0 33201  6140
-  1  73  13 1.000 0 33201  6236
-  1  64  14 1.000 0 33201  6113
-  1  81  20 1.000 0 33106  3292
-  1  61  82 1.000 0 33201  2994
-  1  92  49 1.000 0 33201  4796
-  1  55  20 1.000 0 33201  6180
-  1  53  20 1.000 0 33201  6182
-  1  61  14 1.000 0 33201  6052
-  1  89  42 1.000 0 33201  4977
-  1  86  46 1.000 0 33201  4931
-  1  83  20 1.000 0 33106  3329
-  1  88  41 1.000 0 33201  4957
-  1  65  15 1.000 0 33201  5793
-  1  68  45 1.000 0 33201  5077
-  1  67  45 1.000 0 33201  5078
-  1  66  45 1.000 0 33201  5079
-  1  64  12 1.000 0 33201  5802
-  1  54  20 1.000 0 33201  6181
-  1  80  13 1.000 0 33201  5444
-  1  51  20 1.000 0 33201  6179
-  1  95  50 1.000 0 33201  4802
-  1  79  13 1.000 0 33201  5433
-  1  54  18 1.000 0 33201  6175
-  1  68  15 1.000 0 33201  5768
-  1  59  41 1.000 0 33106  3455
-  1  76  14 1.000 0 33201  5454
-  1  55  18 1.000 0 33201  6174
-  1  70  15 1.000 0 33201  5766
-  1  70  14 1.000 0 33201  5760
-  1  79  12 1.000 0 33201  5306
-  1  51  82 1.000 0 33201  3078
-  1  94  42 1.000 0 33201  6094
-  1  71  15 1.000 0 33201  6260
-  1  84  16 1.000 0 33106  3185
-  1  75  11 1.000 0 33201  6261
-  1  91  44 1.000 0 33201  6085
-  1  51  81 1.000 0 33201  3079
-  1  79  11 1.000 0 33201  5284
-  1  95  44 1.000 0 33201  6082
-  1  74  82 1.000 0 33201  2940
-  1  94  45 1.000 0 33201  6100
-  1  71  14 1.000 0 33201  6246
-  1  82  16 1.000 0 33106  3173
-  1  72  15 1.000 0 33201  6254
-  1  71  82 1.000 0 33201  2956
-  1  91  45 1.000 0 33201  6105
-  1  54  85 1.000 0 33201  3073
-  1  71  83 1.000 0 33201  2955
-  1  78  11 1.000 0 33201  5287
-  1  54  30 1.000 0 33201  4903
-  1  53  30 1.000 0 33201  4901
-  1  51  84 1.000 0 33201  3075
-  1  51  32 1.000 0 33106  3320
-  1  92  44 1.000 0 33201  6084
-  1  52  32 1.000 0 33106  3319
-  1  83  16 1.000 0 33106  3275
-  1  51  85 1.000 0 33201  3074
-  1  77  11 1.000 0 33201  5301
-  1  74  11 1.000 0 33201  6262
-  1  72  81 1.000 0 33201  2952
-  1  78  81 1.000 0 33201  2962
-  1  73  11 1.000 0 33201  6309
-  1  74  81 1.000 0 33201  2942
-  1  85  16 1.000 0 33106  3200
-  1  71  81 1.000 0 33201  2957
-  1  72  83 1.000 0 33201  2950
-  1  79  14 1.000 0 33201  5482
-  1  77  14 1.000 0 33201  5477
-  1  64  11 1.000 0 33201  6056
-  1  69  21 1.000 0 33201  5913
-  1  70  21 1.000 0 33201  5914
-  1  62  12 1.000 0 33201  5792
-  1  69  23 1.000 0 33201  5922
-  1  64  15 1.000 0 33201  6031
-  1  67  13 1.000 0 33201  5763
-  1  64  83 1.000 0 33201  3014
-  1  64  84 1.000 0 33201  3013
-  1  62  81 1.000 0 33201  3011
-  1  87  23 1.000 0 33201  5224
-  1  61  81 1.000 0 33201  2995
-  1  57  82 1.000 0 33201  3030
-  1  63  85 1.000 0 33201  3001
-  1  68  21 1.000 0 33201  5915
-  1  64  81 1.000 0 33201  3016
-  1  66  21 1.000 0 33201  5919
-  1  69  22 1.000 0 33201  5897
-  1  66  22 1.000 0 33201  5902
-  1  86  44 1.000 0 33201  4969
-  1  89  44 1.000 0 33201  4966
-  1  70  22 1.000 0 33201  5898
-  1  63  19 1.000 0 33201  6127
-  1  62  11 1.000 0 33201  6061
-  1  78  15 1.000 0 33201  5517
-  1  67  12 1.000 0 33201  5775
-  1  70  23 1.000 0 33201  5921
-  1  51  16 1.000 0 33201  6234
-  1  68  22 1.000 0 33201  5899
-  1  67  22 1.000 0 33201  5901
-  1  65  11 1.000 0 33201  6051
-  1  66  12 1.000 0 33201  5776
-  1  72  82 1.000 0 33201  2951
-  1  78  83 1.000 0 33201  2960
-  1  72  85 1.000 0 33201  2948
-  1  61  20 1.000 0 33201  6135
-  1  74  84 1.000 0 33201  2938
-  1  78  13 1.000 0 33201  5408
-  1  72  84 1.000 0 33201  2949
-  1  55  32 1.000 0 33106  3317
-  1  90  44 1.000 0 33201  4965
-  1  90  43 1.000 0 33201  4970
-  1  64  16 1.000 0 33201  6114
-  1  63  16 1.000 0 33201  6115
-  1  63  20 1.000 0 33201  6133
-  1  64  20 1.000 0 33201  6132
-  1  53  32 1.000 0 33106  3318
-  1  65  16 1.000 0 33201  6112
-  1  89  43 1.000 0 33201  4971
-  1  89  45 1.000 0 33201  4961
-  1  85  20 1.000 0 33106  3289
-  1  62  20 1.000 0 33201  6134
-  1  62  16 1.000 0 33201  6118
-  1  74  83 1.000 0 33201  2939
-  1  65  83 1.000 0 33201  2998
-  1  61  84 1.000 0 33201  2989
-  1  61  85 1.000 0 33201  2988
-  1  65  82 1.000 0 33201  2999
-  1  57  81 1.000 0 33201  3031
-  1  63  84 1.000 0 33201  3002
-  1  64  82 1.000 0 33201  3015
-  1  57  95 1.000 0 33201  3232
-  1  80  32 1.000 0 33201  5388
-  1  74  32 1.000 0 33201  5421
-  1  57  92 1.000 0 33201  3235
-  1  75  32 1.000 0 33201  5420
-  1  73  32 1.000 0 33201  5422
-  1  63  82 1.000 0 33201  3004
-  1  73  35 1.000 0 33201  5417
-  1  57  91 1.000 0 33201  3236
-  1  78  32 1.000 0 33201  5390
-  1  57  94 1.000 0 33201  3233
-  1  80  34 1.000 0 33201  5402
-  1  79  33 1.000 0 33201  5409
-  1  80  31 1.000 0 33201  5414
-  1  76  31 1.000 0 33201  5413
-  1  60  92 1.000 0 33201  3240
-  1  57  93 1.000 0 33201  3234
-  1  74  38 1.000 0 33201  5278
-  1  63  13 1.000 0 33201  5682
-  1  57  83 1.000 0 33201  3029
-  1  84  19 1.000 0 33106  3243
-  1  67  41 1.000 0 33201  5089
-  1  67  44 1.000 0 33201  5094
-  1  59  24 1.000 0 33201  5965
-  1  63  83 1.000 0 33201  3003
-  1  56  24 1.000 0 33201  5970
-  1  74  13 1.000 0 33201  6235
-  1  68  44 1.000 0 33201  5093
-  1  64  13 1.000 0 33201  5946
-  1  60  23 1.000 0 33201  5964
-  1  57  24 1.000 0 33201  5967
-  1  83  19 1.000 0 33106  3246
-  1  69  44 1.000 0 33201  5092
-  1  58  24 1.000 0 33201  5966
-  1  60  24 1.000 0 33201  5969
-  1  98  57 1.000 0 33201  2675
-  1  69  45 1.000 0 33201  5076
-  1  73  12 1.000 0 33201  6314
-  1  62  82 1.000 0 33201  3010
-  1  62  84 1.000 0 33201  3007
-  1  56  91 1.000 0 33201  3171
-  1  57  84 1.000 0 33201  3028
-  1  72  35 1.000 0 33201  5416
-  1  63  81 1.000 0 33201  3005
-  1  60  94 1.000 0 33201  3238
-  1  56  82 1.000 0 33201  3036
-  1  72  12 1.000 0 33201  6315
-  1  69  41 1.000 0 33201  5086
-  1  95  43 1.000 0 33201  6110
-  1  74  12 1.000 0 33201  6313
-  1  94  34 1.000 0 33106  3092
-  1  59  22 1.000 0 33201  5983
-  1  85  17 1.000 0 33106  3299
-  1  59  18 1.000 0 33201  6170
-  1  62  83 1.000 0 33201  3009
-  1  75  12 1.000 0 33201  6316
-  1  60  18 1.000 0 33201  6169
-  1  56  23 1.000 0 33201  5963
-  1  66  42 1.000 0 33201  5084
-  1  68  41 1.000 0 33201  5087
-  1  71  13 1.000 0 33201  6241
-  1  57  21 1.000 0 33201  5975
-  1  60  22 1.000 0 33201  5984
-  1  68  42 1.000 0 33201  5082
-  1  67  42 1.000 0 33201  5083
-  1  71  12 1.000 0 33201  6317
-  1  56  21 1.000 0 33201  5976
-  1  72  13 1.000 0 33201  6240
-  1  58  23 1.000 0 33201  5961
-  1  83  17 1.000 0 33106  3172
-  1  58  18 1.000 0 33201  6171
-  1  56  22 1.000 0 33201  5987
-  1  59  23 1.000 0 33201  5960
-  1  57  23 1.000 0 33201  5962
-  1  58  22 1.000 0 33201  5985
-  1  57  22 1.000 0 33201  5986
-  1  69  42 1.000 0 33201  5081
-  1  65  91 1.000 0 33201  3271
-  1  68  51 1.000 0 33106  2408
-  1  89  65 1.000 0 33201  2057
-  1  85  70 1.000 0 33201  2056
-  1  69  52 1.000 0 33106  2394
-  1  58  25 1.000 0 33201  5978
-  1  77  32 1.000 0 33201  5391
-  1  70  52 1.000 0 33106  2418
-  1  58  92 1.000 0 33201  3244
-  1  54  90 1.000 0 33201  3119
-  1  85  66 1.000 0 33201  2052
-  1  53  73 1.000 0 33201  2666
-  1  70  51 1.000 0 33106  2417
-  1  71  35 1.000 0 33201  5415
-  1  77  31 1.000 0 33201  5412
-  1  51  88 1.000 0 33201  3168
-  1  64  65 1.000 0 33106  2458
-  1  85  40 1.000 0 33201  5259
-  1  70  54 1.000 0 33106  2421
-  1  70  55 1.000 0 33106  2422
-  1  65  94 1.000 0 33201  3273
-  1  60  21 1.000 0 33201  5971
-  1  58  91 1.000 0 33201  3245
-  1  64  62 1.000 0 33106  2454
-  1  81  36 1.000 0 33201  5248
-  1  70  53 1.000 0 33106  2419
-  1  75  35 1.000 0 33201  5418
-  1  59  25 1.000 0 33201  5977
-  1  63  37 1.000 0 33106  3295
-  1  84  40 1.000 0 33201  5260
-  1  79  37 1.000 0 33201  5247
-  1  62  61 1.000 0 33106  2470
-  1  64  64 1.000 0 33106  2456
-  1  80  39 1.000 0 33201  5231
-  1  76  32 1.000 0 33201  5392
-  1  79  32 1.000 0 33201  5389
-  1  64  61 1.000 0 33106  2453
-  1  62  65 1.000 0 33106  2474
-  1  64  63 1.000 0 33106  2455
-  1  76  38 1.000 0 33201  5221
-  1  62  37 1.000 0 33106  3296
-  1  63  34 1.000 0 33201  5485
-  1  61  38 1.000 0 33106  3276
-  1  78  38 1.000 0 33201  5223
-  1  77  38 1.000 0 33201  5222
-  1  78  39 1.000 0 33201  5229
-  1  65  93 1.000 0 33201  1022
-  1  79  39 1.000 0 33201  5230
-  1  62  36 1.000 0 33106  3251
-  1  65  37 1.000 0 33106  3290
-  1  80  33 1.000 0 33201  5404
-  1  65  32 1.000 0 33201  5474
-  1  76  39 1.000 0 33201  5227
-  1  65  95 1.000 0 33201  3274
-  1  61  34 1.000 0 33201  5488
-  1  53  74 1.000 0 33201  2664
-  1  65  31 1.000 0 33201  5489
-  1  62  34 1.000 0 33201  5487
-  1  61  33 1.000 0 33201  5500
-  1  77  39 1.000 0 33201  5228
-  1  58  95 1.000 0 33201  3246
-  1  65  33 1.000 0 33201  5496
-  1  55  25 1.000 0 33201  6008
-  1  88  70 1.000 0 33201  2389
-  1  90  66 1.000 0 33201  2049
-  1  53  27 1.000 0 33201  4920
-  1  83  39 1.000 0 33201  5263
-  1  85  39 1.000 0 33201  5265
-  1  88  67 1.000 0 33201  2385
-  1  56  17 1.000 0 33201  6168
-  1  86  68 1.000 0 33201  2392
-  1  84  36 1.000 0 33201  5251
-  1  63  62 1.000 0 33106  2439
-  1  59  17 1.000 0 33201  6165
-  1  83  36 1.000 0 33201  5250
-  1  61  61 1.000 0 33106  2459
-  1  81  40 1.000 0 33201  5254
-  1  89  66 1.000 0 33201  2399
-  1  61  62 1.000 0 33106  2464
-  1  82  36 1.000 0 33201  5249
-  1  84  39 1.000 0 33201  5264
-  1  71  39 1.000 0 33201  5288
-  1  83  40 1.000 0 33201  5256
-  1  63  61 1.000 0 33106  2437
-  1  61  63 1.000 0 33106  2465
-  1  86  66 1.000 0 33201  2390
-  1  72  39 1.000 0 33201  5286
-  1  74  39 1.000 0 33201  5282
-  1  61  65 1.000 0 33106  2469
-  1  63  64 1.000 0 33106  2444
-  1  82  40 1.000 0 33201  5255
-  1  63  63 1.000 0 33106  2443
-  1  61  64 1.000 0 33106  2466
-  1  85  36 1.000 0 33201  5252
-  1  90  69 1.000 0 33201  2380
-  1  75  39 1.000 0 33201  5289
-  1  79  36 1.000 0 33201  5236
-  1  62  63 1.000 0 33106  2472
-  1  80  37 1.000 0 33201  5246
-  1  94  71 1.000 0 33106  2523
-  1  76  36 1.000 0 33201  5232
-  1  78  36 1.000 0 33201  5235
-  1  78  37 1.000 0 33201  5245
-  1  77  37 1.000 0 33201  5244
-  1  76  37 1.000 0 33201  5243
-  1  62  64 1.000 0 33106  2473
-  1  66  30 1.000 0 33201  5686
-  1  51  87 1.000 0 33201  3229
-  1  76  49 1.000 0 33201  4878
-  1  84  49 1.000 0 33201  4862
-  1  73  40 1.000 0 33201  5296
-  1  82  43 1.000 0 33201  5007
-  1  71  40 1.000 0 33201  5298
-  1  55  87 1.000 0 33201  3146
-  1  75  48 1.000 0 33201  5053
-  1  52  86 1.000 0 33201  3228
-  1  52  87 1.000 0 33201  3227
-  1  52  88 1.000 0 33201  3226
-  1  51  86 1.000 0 33201  3230
-  1  80  47 1.000 0 33201  4868
-  1  62  38 1.000 0 33106  3271
-  1  63  35 1.000 0 33201  5469
-  1  91  71 1.000 0 33106  2515
-  1  62  39 1.000 0 33106  3261
-  1  64  36 1.000 0 33106  3240
-  1  65  36 1.000 0 33106  3238
-  1  76  68 1.000 0 33201  5203
-  1  76  66 1.000 0 33201  5205
-  1  91  72 1.000 0 33106  2516
-  1  61  36 1.000 0 33106  3248
-  1  62  35 1.000 0 33201  5470
-  1  91  73 1.000 0 33106  2517
-  1  64  38 1.000 0 33106  3264
-  1  79  47 1.000 0 33201  4869
-  1  53  86 1.000 0 33201  3223
-  1  53  90 1.000 0 33201  3219
-  1  78  49 1.000 0 33201  4877
-  1  53  87 1.000 0 33201  3222
-  1  82  39 1.000 0 33201  5262
-  1  51  90 1.000 0 33201  3162
-  1  77  49 1.000 0 33201  4876
-  1  76  47 1.000 0 33201  4873
-  1  52  89 1.000 0 33201  3225
-  1  79  49 1.000 0 33201  4875
-  1  77  47 1.000 0 33201  4871
-  1  65  92 1.000 0 33201  3270
-  1  62  91 1.000 0 33201  3272
-  1  63  65 1.000 0 33106  2452
-  1  78  47 1.000 0 33201  4870
-  1  51  89 1.000 0 33201  3163
-  1  85  67 1.000 0 33201  2053
-  1  55  88 1.000 0 33201  3160
-  1  52  90 1.000 0 33201  3224
-  1  73  38 1.000 0 33201  5279
-  1  89  67 1.000 0 33201  2398
-  1  88  68 1.000 0 33201  2386
-  1  87  67 1.000 0 33201  2051
-  1  54  23 1.000 0 33201  6010
-  1  89  63 1.000 0 33201  2061
-  1  73  39 1.000 0 33201  5285
-  1  89  62 1.000 0 33201  2062
-  1  83  37 1.000 0 33201  5275
-  1  63  36 1.000 0 33106  3245
-  1  94  74 1.000 0 33106  2529
-  1  91  74 1.000 0 33106  2521
-  1  63  38 1.000 0 33106  3270
-  1  63  39 1.000 0 33106  3260
-  1  76  70 1.000 0 33201  5200
-  1  64  37 1.000 0 33106  3294
-  1  85  37 1.000 0 33201  5272
-  1  64  35 1.000 0 33201  5468
-  1  76  69 1.000 0 33201  5201
-  1  82  37 1.000 0 33201  5274
-  1  84  37 1.000 0 33201  5276
-  1  79  38 1.000 0 33201  5225
-  1  81  37 1.000 0 33201  5271
-  1  80  38 1.000 0 33201  5226
-  1  54  74 1.000 0 33201  2688
-  1  63  24 1.000 0 33201  5930
-  1  65  24 1.000 0 33201  5927
-  1  63  18 1.000 0 33201  6121
-  1  58  73 1.000 0 33201  2639
-  1  65  19 1.000 0 33201  6130
-  1  62  18 1.000 0 33201  6122
-  1  64  18 1.000 0 33201  6120
-  1  58  71 1.000 0 33201  2642
-  1  66  24 1.000 0 33201  5912
-  1  58  72 1.000 0 33201  2640
-  1  54  73 1.000 0 33201  2689
-  1  61  19 1.000 0 33201  6129
-  1  86  67 1.000 0 33201  2391
-  1  86  69 1.000 0 33201  2393
-  1  86  70 1.000 0 33201  2394
-  1  54  75 1.000 0 33201  2687
-  1  68  25 1.000 0 33201  5905
-  1  54  72 1.000 0 33201  2690
-  1  55  89 1.000 0 33201  3217
-  1  51  22 1.000 0 33201  6001
-  1  67  21 1.000 0 33201  5916
-  1  88  69 1.000 0 33201  2388
-  1  88  66 1.000 0 33201  2383
-  1  62  19 1.000 0 33201  6128
-  1  55  90 1.000 0 33201  3218
-  1  58  93 1.000 0 33201  3243
-  1  76  67 1.000 0 33201  5204
-  1  53  72 1.000 0 33201  2667
-  1  54  71 1.000 0 33201  2691
-  1  53  18 1.000 0 33201  6176
-  1  69  55 1.000 0 33106  2400
-  1  61  23 1.000 0 33201  5948
-  1  53  89 1.000 0 33201  3220
-  1  55  86 1.000 0 33201  3142
-  1  91  75 1.000 0 33106  2522
-  1  54  86 1.000 0 33201  3137
-  1  56  25 1.000 0 33201  5981
-  1  61  31 1.000 0 33201  5493
-  1  54  87 1.000 0 33201  3127
-  1  58  94 1.000 0 33201  3242
-  1  63  31 1.000 0 33201  5491
-  1  78  40 1.000 0 33201  5240
-  1  54  89 1.000 0 33201  3120
-  1  62  33 1.000 0 33201  5499
-  1  77  40 1.000 0 33201  5239
-  1  57  25 1.000 0 33201  5979
-  1  80  40 1.000 0 33201  5242
-  1  60  25 1.000 0 33201  5982
-  1  79  40 1.000 0 33201  5241
-  1  54  88 1.000 0 33201  3123
-  1  53  88 1.000 0 33201  3221
-  1  64  31 1.000 0 33201  5490
-  1  62  62 1.000 0 33106  2471
-  1  80  36 1.000 0 33201  5237
-  1  94  72 1.000 0 33106  2524
-  1  75  30 1.000 0 33201  5652
-  1  76  40 1.000 0 33201  5238
-  1  61  32 1.000 0 33201  5479
-  1  94  73 1.000 0 33106  2525
-  1  63  32 1.000 0 33201  5476
-  1  62  31 1.000 0 33201  5492
-  1  64  33 1.000 0 33201  5495
-  1  64  32 1.000 0 33201  5475
-  1  62  40 1.000 0 33106  3285
-  1  67  27 1.000 0 33201  5673
-  1  62  32 1.000 0 33201  5478
-  1  81  39 1.000 0 33201  5261
-  1  65  34 1.000 0 33201  5480
-  1  65  35 1.000 0 33201  5471
-  1  64  34 1.000 0 33201  5484
-  1  64  40 1.000 0 33106  3279
-  1  61  39 1.000 0 33106  3263
-  1  61  40 1.000 0 33106  3288
-  1  64  39 1.000 0 33106  3258
-  1  61  35 1.000 0 33201  5472
-  1  65  40 1.000 0 33106  3278
-  1  65  38 1.000 0 33106  3274
-  1  61  37 1.000 0 33106  3297
-  1  85  69 1.000 0 33201  2055
-  1  87  66 1.000 0 33201  2050
-  1  87  69 1.000 0 33201  2982
-  1  80  48 1.000 0 33201  4883
-  1  63  40 1.000 0 33106  3282
-  1  65  39 1.000 0 33106  3253
-  1  76  46 1.000 0 33201  4892
-  1  79  48 1.000 0 33201  4884
-  1  85  68 1.000 0 33201  2054
-  1  90  67 1.000 0 33201  2048
-  1  81  42 1.000 0 33201  4998
-  1  83  44 1.000 0 33201  4988
-  1  81  45 1.000 0 33201  5000
-  1  87  68 1.000 0 33201  2981
-  1  87  70 1.000 0 33201  2980
-  1  89  64 1.000 0 33201  2058
-  1  65  28 1.000 0 33201  5711
-  1  57  14 1.000 0 33201  6196
-  1  54  26 1.000 0 33201  4865
-  1  59  11 1.000 0 33201  6199
-  1  60  12 1.000 0 33201  6188
-  1  52  14 1.000 0 33201  6238
-  1  77  48 1.000 0 33201  4889
-  1  60  14 1.000 0 33201  6197
-  1  83  49 1.000 0 33201  4863
-  1  85  49 1.000 0 33201  4861
-  1  76  50 1.000 0 33201  4887
-  1  81  49 1.000 0 33201  4866
-  1  55  14 1.000 0 33201  6216
-  1  76  48 1.000 0 33201  4890
-  1  59  13 1.000 0 33201  6117
-  1  54  14 1.000 0 33201  6220
-  1  78  50 1.000 0 33201  4881
-  1  85  44 1.000 0 33201  4986
-  1  82  44 1.000 0 33201  4990
-  1  77  46 1.000 0 33201  4893
-  1  80  46 1.000 0 33201  4845
-  1  84  44 1.000 0 33201  4987
-  1  79  50 1.000 0 33201  4880
-  1  81  44 1.000 0 33201  4989
-  1  78  46 1.000 0 33201  4894
-  1  79  46 1.000 0 33201  4895
-  1  59  12 1.000 0 33201  6189
-  1  58  14 1.000 0 33201  6195
-  1  60  11 1.000 0 33201  6203
-  1  64  29 1.000 0 33201  5706
-  1  56  11 1.000 0 33201  6187
-  1  56  13 1.000 0 33201  6157
-  1  55  26 1.000 0 33201  4896
-  1  56  14 1.000 0 33201  6198
-  1  80  50 1.000 0 33201  4879
-  1  51  13 1.000 0 33201  6208
-  1  77  50 1.000 0 33201  4882
-  1  82  49 1.000 0 33201  4864
-  1  80  49 1.000 0 33201  4874
-  1  78  48 1.000 0 33201  4885
-  1  53  14 1.000 0 33201  6253
-  1  58  11 1.000 0 33201  6200
-  1  57  11 1.000 0 33201  6202
-  1  94  46 1.000 0 33201  4806
-  1  52  13 1.000 0 33201  6209
-  1  53  12 1.000 0 33201  6207
-  1  54  12 1.000 0 33201  6212
-  1  56  12 1.000 0 33201  6193
-  1  58  12 1.000 0 33201  6191
-  1  57  12 1.000 0 33201  6192
-  1  60  13 1.000 0 33201  6156
-  1  59  15 1.000 0 33201  6190
-  1  73  26 1.000 0 33201  5661
-  1  53  13 1.000 0 33201  6211
-  1  51  14 1.000 0 33201  6227
-  1  74  27 1.000 0 33201  5664
-  1  67  29 1.000 0 33201  5679
-  1  72  27 1.000 0 33201  5666
-  1  66  29 1.000 0 33201  5680
-  1  75  28 1.000 0 33201  5654
-  1  72  29 1.000 0 33201  5645
-  1  58  13 1.000 0 33201  6124
-  1  59  14 1.000 0 33201  6194
-  1  54  13 1.000 0 33201  6258
-  1  74  28 1.000 0 33201  5655
-  1  73  30 1.000 0 33201  5650
-  1  55  13 1.000 0 33201  6257
-  1  73  29 1.000 0 33201  5644
-  1  67  26 1.000 0 33201  5691
-  1  91  46 1.000 0 33201  4784
-  1  70  27 1.000 0 33201  5670
-  1  68  26 1.000 0 33201  5690
-  1  57  13 1.000 0 33201  6151
-  1  68  29 1.000 0 33201  5678
-  1  75  27 1.000 0 33201  5667
-  1  68  30 1.000 0 33201  5683
-  1  74  29 1.000 0 33201  5643
-  1  72  30 1.000 0 33201  5651
-  1  67  30 1.000 0 33201  5687
-  1  69  28 1.000 0 33201  5698
-  1  70  44 1.000 0 33201  5091
-  1  74  30 1.000 0 33201  5649
-  1  70  29 1.000 0 33201  5676
-  1  70  26 1.000 0 33201  5689
-  1  63  29 1.000 0 33201  5707
-  1  84  42 1.000 0 33201  4994
-  1  84  43 1.000 0 33201  5005
-  1  83  45 1.000 0 33201  5002
-  1  81  41 1.000 0 33201  4985
-  1  84  45 1.000 0 33201  5001
-  1  51  26 1.000 0 33201  4898
-  1  82  42 1.000 0 33201  4997
-  1  85  42 1.000 0 33201  4993
-  1  83  42 1.000 0 33201  4996
-  1  85  45 1.000 0 33201  4999
-  1  83  43 1.000 0 33201  5006
-  1  82  45 1.000 0 33201  5003
-  1  82  41 1.000 0 33201  4984
-  1  84  41 1.000 0 33201  4982
-  1  83  41 1.000 0 33201  4983
-  1  85  43 1.000 0 33201  5004
-  1  85  41 1.000 0 33201  4981
-  1  52  26 1.000 0 33201  4897
-  1  65  29 1.000 0 33201  5710
-  1  52  27 1.000 0 33201  4921
-  1  69  27 1.000 0 33201  5671
-  1  71  29 1.000 0 33201  5647
-  1  68  28 1.000 0 33201  5697
-  1  51  27 1.000 0 33201  4922
-  1  53  26 1.000 0 33201  4923
-  1  67  28 1.000 0 33201  5694
-  1  70  28 1.000 0 33201  5699
-  1  74  48 1.000 0 33201  5052
- -1  73  79 1.000 0 33201  9782
- -1  58  61 1.000 0 33106  3956
- -1  51  62 1.000 0 33106  3991
- -1  66  14 1.000 0 33201  9019
- -1  76   9 1.000 0 33106  3779
- -1  56  99 1.000 0 33201  7026
- -1  66  11 1.000 0 33201  9020
- -1  78  10 1.000 0 33106  3764
- -1  55  17 1.000 0 33201  8963
- -1  55  77 1.000 0 33201  9892
- -1  54  77 1.000 0 33201  9893
- -1  91  76 1.000 0 33106  4029
- -1  73  15 1.000 0 33201  8994
- -1  74  18 1.000 0 33201  8852
- -1  91  77 1.000 0 33106  4026
- -1  91  70 1.000 0 33106  4004
- -1  73  14 1.000 0 33201  8993
- -1  92  77 1.000 0 33106  4027
- -1  63   4 1.000 0 33106  3817
- -1  75  95 1.000 0 33106  4164
- -1  62   5 1.000 0 33106  3818
- -1  92  76 1.000 0 33106  4031
- -1  52  16 1.000 0 33201  8957
- -1  73  11 1.000 0 33201  8989
- -1  91  80 1.000 0 33106  4107
- -1  74  79 1.000 0 33201  9781
- -1  72  79 1.000 0 33201  9779
- -1  75  79 1.000 0 33201  9780
- -1  87  82 1.000 0 33106  4122
- -1  73  77 1.000 0 33201  9791
- -1  75  77 1.000 0 33201  9793
- -1  91  79 1.000 0 33106  4111
- -1  91  78 1.000 0 33106  4112
- -1  86  23 1.000 0 33106  3541
- -1  62  63 1.000 0 33106  3916
- -1  82  17 1.000 0 33201  8810
- -1  82  16 1.000 0 33201  8809
- -1  93  27 1.000 0 33106  3710
- -1  63  88 1.000 0 33201 10138
- -1  93  28 1.000 0 33106  3708
- -1  94  26 1.000 0 33106  3703
- -1  93  30 1.000 0 33106  3709
- -1  81  18 1.000 0 33201  8752
- -1  81  19 1.000 0 33201  8762
- -1  53  92 1.000 0 33201  7079
- -1  58  19 1.000 0 33201  8895
- -1  72  51 1.000 0 33201  9287
- -1  84  68 1.000 0 33201  9339
- -1  56  65 1.000 0 33106  3980
- -1  88  39 1.000 0 33201  9145
- -1  60  64 1.000 0 33106  3959
- -1  93  40 1.000 0 33201  9172
- -1  83  16 1.000 0 33201  9032
- -1  57  64 1.000 0 33106  3962
- -1  84  87 1.000 0 33106  4126
- -1  79  82 1.000 0 33201  9917
- -1  95  27 1.000 0 33106  3676
- -1  58  37 1.000 0 33106  3516
- -1  59  39 1.000 0 33106  3511
- -1  93  26 1.000 0 33106  3680
- -1  58  38 1.000 0 33106  3518
- -1  58  40 1.000 0 33106  3519
- -1  60  98 1.000 0 33201  7217
- -1  68  58 1.000 0 33201  6850
- -1  95  28 1.000 0 33106  3679
- -1  94  29 1.000 0 33106  3704
- -1  64  15 1.000 0 33201  9047
- -1  57  87 1.000 0 33201 10181
- -1  78  85 1.000 0 33201  9933
- -1  70  18 1.000 0 33201  8874
- -1  77   9 1.000 0 33106  3777
- -1  52  65 1.000 0 33106  3997
- -1  80  90 1.000 0 33201 10097
- -1  81  67 1.000 0 33201  9355
- -1  68  18 1.000 0 33201  8879
- -1  92  71 1.000 0 33106  4090
- -1  70  16 1.000 0 33201  8876
- -1  66  19 1.000 0 33201  8871
- -1  70  17 1.000 0 33201  8875
- -1  66  94 1.000 0 33106  4133
- -1  79  90 1.000 0 33201 10096
- -1  66  20 1.000 0 33201  8872
- -1  55  82 1.000 0 33201 10065
- -1  76  74 1.000 0 33201  9574
- -1  81  77 1.000 0 33201  9724
- -1  61  11 1.000 0 33201  9036
- -1  66  16 1.000 0 33201  8869
- -1  61  83 1.000 0 33201 10024
- -1  60  93 1.000 0 33201  7067
- -1  78  24 1.000 0 33201  8685
- -1  79  65 1.000 0 33201  6972
- -1  70  82 1.000 0 33201  9981
- -1  76  76 1.000 0 33201  9757
- -1  87  77 1.000 0 33201  9546
- -1  68  17 1.000 0 33201  8880
- -1  93  31 1.000 0 33201  8540
- -1  89  78 1.000 0 33201  9516
- -1  86  19 1.000 0 33106  3762
- -1  64  14 1.000 0 33201  9046
- -1  53  84 1.000 0 33201 10077
- -1  69  16 1.000 0 33201  8889
- -1  74   7 1.000 0 33106  3809
- -1  54  84 1.000 0 33201 10076
- -1  69  76 1.000 0 33201  9802
- -1  80  78 1.000 0 33201  9760
- -1  67  17 1.000 0 33201  8884
- -1  61  90 1.000 0 33201 10146
- -1  52  84 1.000 0 33201 10078
- -1  69  20 1.000 0 33201  8888
- -1  63  86 1.000 0 33201 10161
- -1  63  11 1.000 0 33201  9038
- -1  53  91 1.000 0 33201  7097
- -1  57  95 1.000 0 33201  7058
- -1  94  28 1.000 0 33106  3699
- -1  64  67 1.000 0 33201  9442
- -1 100  57 1.000 0 33106  3902
- -1  56  40 1.000 0 33106  3544
- -1  83  17 1.000 0 33201  9096
- -1  58  36 1.000 0 33106  3522
- -1  63  15 1.000 0 33201  9039
- -1  62  83 1.000 0 33201 10023
- -1  79  85 1.000 0 33201  9932
- -1  73  88 1.000 0 33201 10088
- -1  70  74 1.000 0 33201  9623
- -1  70  73 1.000 0 33201  9634
- -1  62  97 1.000 0 33106  4205
- -1  60  36 1.000 0 33106  3501
- -1  53  97 1.000 0 33201  9264
- -1  95  29 1.000 0 33106  3675
- -1  80  13 1.000 0 33106  3701
- -1  75  58 1.000 0 33201  6827
- -1  72  36 1.000 0 33201  8184
- -1  67  87 1.000 0 33201 10117
- -1  79  13 1.000 0 33106  3661
- -1  55  62 1.000 0 33106  3987
- -1  85  19 1.000 0 33201  8999
- -1  68  30 1.000 0 33201  8544
- -1  57  93 1.000 0 33201  7070
- -1  75  88 1.000 0 33201 10085
- -1  51  84 1.000 0 33201 10079
- -1  80  11 1.000 0 33106  3745
- -1  66  90 1.000 0 33201 10126
- -1  60  37 1.000 0 33106  3499
- -1  57  88 1.000 0 33201 10171
- -1  54  83 1.000 0 33201 10056
- -1  68  90 1.000 0 33201 10128
- -1  55  84 1.000 0 33201 10075
- -1  64  86 1.000 0 33201 10160
- -1  63  14 1.000 0 33201  9040
- -1  82  67 1.000 0 33201  9359
- -1  65  85 1.000 0 33201 10003
- -1  63  68 1.000 0 33201  9448
- -1  63  83 1.000 0 33201 10021
- -1  51  81 1.000 0 33201 10064
- -1  93  75 1.000 0 33106  4086
- -1  60  38 1.000 0 33106  3502
- -1  66  88 1.000 0 33201 10115
- -1  66  74 1.000 0 33201  9619
- -1  70  20 1.000 0 33201  8881
- -1  68  16 1.000 0 33201  8894
- -1  54  82 1.000 0 33201 10066
- -1  81  70 1.000 0 33201  9348
- -1  82  18 1.000 0 33201  8923
- -1  91  62 1.000 0 33201  6883
- -1  75  51 1.000 0 33201  9290
- -1  63  89 1.000 0 33201 10149
- -1  68  19 1.000 0 33201  8878
- -1  66   6 1.000 0 33201  6823
- -1  65  10 1.000 0 33201  9071
- -1  53  85 1.000 0 33201 10072
- -1  71  85 1.000 0 33201  9970
- -1  66  17 1.000 0 33201  8877
- -1  65  15 1.000 0 33201  9049
- -1  53  82 1.000 0 33201 10067
- -1  52  63 1.000 0 33106  4011
- -1  69  72 1.000 0 33201  9617
- -1  68  62 1.000 0 33201  8152
- -1  68  20 1.000 0 33201  8893
- -1  65  14 1.000 0 33201  9050
- -1  61  12 1.000 0 33201  9037
- -1  90  62 1.000 0 33201  6913
- -1  80  68 1.000 0 33201  9388
- -1  63  50 1.000 0 33106  3476
- -1  74  74 1.000 0 33201  9583
- -1  85  22 1.000 0 33201  8649
- -1  80  79 1.000 0 33201  9773
- -1  58  39 1.000 0 33106  3521
- -1  74  70 1.000 0 33201  9392
- -1  85  16 1.000 0 33201  8950
- -1  80  84 1.000 0 33201  9926
- -1  83  29 1.000 0 33201  9124
- -1  93  33 1.000 0 33201  8466
- -1  82  83 1.000 0 33201  9888
- -1  90  65 1.000 0 33201  6923
- -1  58  13 1.000 0 33201  6331
- -1  78  25 1.000 0 33201  8693
- -1  76  21 1.000 0 33201  8691
- -1  73  84 1.000 0 33201  9950
- -1  69  12 1.000 0 33201  9010
- -1  60 100 1.000 0 33201  7107
- -1  75  82 1.000 0 33201  9954
- -1  81  65 1.000 0 33201  6964
- -1  75  37 1.000 0 33201  8171
- -1  58  95 1.000 0 33201  7057
- -1  66  15 1.000 0 33201  9021
- -1  80  29 1.000 0 33201  8496
- -1  75  68 1.000 0 33201  9403
- -1  80  76 1.000 0 33201  9759
- -1  83  83 1.000 0 33201  9866
- -1  75  32 1.000 0 33201  8301
- -1  85  63 1.000 0 33201  6951
- -1  58  15 1.000 0 33201  6329
- -1  72  82 1.000 0 33201  9958
- -1  75  38 1.000 0 33201  8172
- -1  76  11 1.000 0 33106  3773
- -1  78  68 1.000 0 33201  9386
- -1  73  53 1.000 0 33201  9268
- -1  61  59 1.000 0 33106  3872
- -1  54  64 1.000 0 33106  4000
- -1  82  19 1.000 0 33201  8882
- -1  77  82 1.000 0 33201  9919
- -1  85  79 1.000 0 33201  9726
- -1  72  37 1.000 0 33201  8186
- -1  57  11 1.000 0 33201  6304
- -1  86  62 1.000 0 33201  6918
- -1  80  70 1.000 0 33201  9381
- -1  78  92 1.000 0 33106  4160
- -1  79  62 1.000 0 33201  6966
- -1  85  29 1.000 0 33201  9122
- -1  94  30 1.000 0 33106  3705
- -1  81  83 1.000 0 33201  9903
- -1  82  20 1.000 0 33201  8795
- -1  58  14 1.000 0 33201  6330
- -1  76  24 1.000 0 33201  8688
- -1  62  49 1.000 0 33106  3466
- -1  74  82 1.000 0 33201  9955
- -1  71  72 1.000 0 33201  9597
- -1  57  39 1.000 0 33106  3530
- -1  80  87 1.000 0 33201 10033
- -1  81  66 1.000 0 33201  9332
- -1  76  85 1.000 0 33201  9935
- -1  75  36 1.000 0 33201  8170
- -1  71  69 1.000 0 33201  9398
- -1  74  88 1.000 0 33201 10086
- -1  57  40 1.000 0 33106  3531
- -1  58  97 1.000 0 33201  7180
- -1  57  92 1.000 0 33201  7075
- -1  71  82 1.000 0 33201  9959
- -1  83  81 1.000 0 33201  9814
- -1  75  60 1.000 0 33201  6818
- -1  65  94 1.000 0 33201  7023
- -1  57  15 1.000 0 33201  6303
- -1  53  65 1.000 0 33106  3995
- -1  77  73 1.000 0 33201  9564
- -1  66  77 1.000 0 33201  9807
- -1  94  27 1.000 0 33106  3695
- -1  51  97 1.000 0 33201  9279
- -1  95  26 1.000 0 33106  3678
- -1  72  84 1.000 0 33201  9951
- -1  69  86 1.000 0 33201 10134
- -1  58  94 1.000 0 33201  7063
- -1  53  20 1.000 0 33201  8960
- -1  54  17 1.000 0 33201  8962
- -1  63  49 1.000 0 33106  3477
- -1  63  94 1.000 0 33201  7025
- -1  56  37 1.000 0 33106  3539
- -1  55  64 1.000 0 33106  3999
- -1  78  83 1.000 0 33201  9938
- -1  76  62 1.000 0 33201  6970
- -1  60  39 1.000 0 33106  3503
- -1  79  81 1.000 0 33201  9922
- -1  78  89 1.000 0 33201 10144
- -1  83  66 1.000 0 33201  9334
- -1  80  15 1.000 0 33106  3765
- -1  82  66 1.000 0 33201  9333
- -1  76  15 1.000 0 33106  3795
- -1  77  78 1.000 0 33201  9763
- -1  79  87 1.000 0 33201 10031
- -1  67  73 1.000 0 33201  9631
- -1  85  18 1.000 0 33201  8990
- -1  84  66 1.000 0 33201  9335
- -1  89  77 1.000 0 33201  9538
- -1  92  26 1.000 0 33106  3692
- -1  71  60 1.000 0 33201  6815
- -1  68  29 1.000 0 33201  8545
- -1  80  14 1.000 0 33106  3739
- -1  77  71 1.000 0 33201  9554
- -1  62  46 1.000 0 33106  3495
- -1  55  98 1.000 0 33201 10251
- -1  89  80 1.000 0 33201  9657
- -1  88  78 1.000 0 33201  9527
- -1  56  38 1.000 0 33106  3536
- -1  81  85 1.000 0 33201  9873
- -1  54  97 1.000 0 33201  9207
- -1  68  63 1.000 0 33201  8650
- -1  75  81 1.000 0 33201  9946
- -1  52  91 1.000 0 33201  7098
- -1  79  15 1.000 0 33106  3508
- -1  85  48 1.000 0 33201  6569
- -1  62  75 1.000 0 33201  9653
- -1  73  94 1.000 0 33106  4186
- -1  59  41 1.000 0 33106  3545
- -1  61   9 1.000 0 33201  9062
- -1  61  10 1.000 0 33201  9061
- -1  78  51 1.000 0 33201  9251
- -1  62  10 1.000 0 33201  9054
- -1  62   9 1.000 0 33201  9055
- -1  61   8 1.000 0 33201  9063
- -1  71  17 1.000 0 33201  8846
- -1  62   8 1.000 0 33201  9056
- -1  61   6 1.000 0 33201  9058
- -1  61   7 1.000 0 33201  9060
- -1  55  11 1.000 0 33201  9079
- -1  76  58 1.000 0 33201  6797
- -1  76  56 1.000 0 33201  9315
- -1  84  29 1.000 0 33201  9113
- -1  84  26 1.000 0 33201  9108
- -1  90  36 1.000 0 33201  9143
- -1  66  44 1.000 0 33201  8061
- -1  81  46 1.000 0 33201  6546
- -1  79  60 1.000 0 33201  6787
- -1  83  50 1.000 0 33201  6560
- -1  83  48 1.000 0 33201  6557
- -1  85  47 1.000 0 33201  6568
- -1  83  49 1.000 0 33201  6558
- -1  61  85 1.000 0 33201 10007
- -1  62  85 1.000 0 33201 10006
- -1  74  15 1.000 0 33201  8985
- -1  68  87 1.000 0 33201 10119
- -1  75  66 1.000 0 33201  9408
- -1  66  59 1.000 0 33201  6849
- -1  79  70 1.000 0 33201  9379
- -1  74  81 1.000 0 33201  9945
- -1  72  81 1.000 0 33201  9943
- -1  97  37 1.000 0 33106  3254
- -1  85  81 1.000 0 33201  9806
- -1  71  70 1.000 0 33201  9389
- -1  61  16 1.000 0 33201  8922
- -1  74  68 1.000 0 33201  9402
- -1  76  66 1.000 0 33201  9367
- -1  71  81 1.000 0 33201  9942
- -1  52  12 1.000 0 33201  9093
- -1  75  70 1.000 0 33201  9393
- -1  63   7 1.000 0 33201  9068
- -1  73  81 1.000 0 33201  9944
- -1  94  63 1.000 0 33201  6899
- -1  66  89 1.000 0 33201 10125
- -1  52  13 1.000 0 33201  9092
- -1  67  26 1.000 0 33201  8529
- -1  75  15 1.000 0 33201  8995
- -1  62  27 1.000 0 33201  8973
- -1  69  87 1.000 0 33201 10120
- -1  66  29 1.000 0 33201  8551
- -1  62  23 1.000 0 33201  8283
- -1  66  26 1.000 0 33201  8552
- -1  67  30 1.000 0 33201  8528
- -1  66  28 1.000 0 33201  8550
- -1  66  27 1.000 0 33201  8549
- -1  62  21 1.000 0 33201  8333
- -1  79  63 1.000 0 33201  6990
- -1  85  14 1.000 0 33106  3740
- -1  84  86 1.000 0 33106  4135
- -1  72  38 1.000 0 33201  8185
- -1  55  14 1.000 0 33201  9082
- -1  73  68 1.000 0 33201  9401
- -1  54  29 1.000 0 33201  8620
- -1  71  68 1.000 0 33201  9399
- -1  70  87 1.000 0 33201 10118
- -1  82  85 1.000 0 33201  9940
- -1  62  48 1.000 0 33106  3447
- -1  62  50 1.000 0 33106  3473
- -1  56   7 1.000 0 33201 10516
- -1  64  47 1.000 0 33106  3491
- -1  71  13 1.000 0 33201  8980
- -1  57  82 1.000 0 33201 10053
- -1  63   6 1.000 0 33201  9064
- -1  64   7 1.000 0 33201  9075
- -1  65   6 1.000 0 33201  9073
- -1  56   9 1.000 0 33201 10513
- -1  54  19 1.000 0 33201  8959
- -1  74  67 1.000 0 33201  9412
- -1  72  39 1.000 0 33201  8182
- -1  85  87 1.000 0 33106  4125
- -1  65  87 1.000 0 33201 10152
- -1  57  36 1.000 0 33106  3525
- -1  62  90 1.000 0 33201 10145
- -1  91  30 1.000 0 33106  3717
- -1  73  87 1.000 0 33201 10093
- -1  74  75 1.000 0 33201  9589
- -1  71  88 1.000 0 33201 10090
- -1  61  88 1.000 0 33201 10140
- -1  71  89 1.000 0 33201 10104
- -1  90  38 1.000 0 33201  9141
- -1  63   9 1.000 0 33201  9066
- -1  61  13 1.000 0 33201  9035
- -1  63  10 1.000 0 33201  9065
- -1  64  10 1.000 0 33201  9076
- -1  64   8 1.000 0 33201  9078
- -1  95  71 1.000 0 33106  4094
- -1  65   7 1.000 0 33201  9072
- -1  76  91 1.000 0 33106  4154
- -1  53  13 1.000 0 33201  9100
- -1  55  13 1.000 0 33201  9081
- -1  63   8 1.000 0 33201  9067
- -1  55  15 1.000 0 33201  9083
- -1  91  74 1.000 0 33106  4083
- -1  55  12 1.000 0 33201  9080
- -1  65  81 1.000 0 33201 10008
- -1  62   7 1.000 0 33201  9057
- -1  64   9 1.000 0 33201  9077
- -1  52  77 1.000 0 33201  9895
- -1  62  15 1.000 0 33201  9027
- -1  62  13 1.000 0 33201  9029
- -1  73  27 1.000 0 33201  8503
- -1  64  89 1.000 0 33201 10148
- -1  64   6 1.000 0 33201  9074
- -1  62  87 1.000 0 33201 10155
- -1  61  81 1.000 0 33201 10012
- -1  93  71 1.000 0 33106  4091
- -1  76  90 1.000 0 33201 10099
- -1  77  86 1.000 0 33201  9994
- -1  77  90 1.000 0 33201 10048
- -1  76  60 1.000 0 33201  6784
- -1  82  59 1.000 0 33201  6763
- -1  85  59 1.000 0 33201  6760
- -1  78  60 1.000 0 33201  6786
- -1  59  99 1.000 0 33201  7040
- -1  90  66 1.000 0 33201  9346
- -1  80  57 1.000 0 33201  6802
- -1  82  60 1.000 0 33201  6758
- -1  85  28 1.000 0 33201  9121
- -1  51  12 1.000 0 33201  9084
- -1  62   6 1.000 0 33201  9053
- -1  51  13 1.000 0 33201  9085
- -1  57  99 1.000 0 33201  7034
- -1  51  15 1.000 0 33201  9087
- -1  51  14 1.000 0 33201  9086
- -1  81  26 1.000 0 33201  9107
- -1  51  11 1.000 0 33201  9088
- -1  84  28 1.000 0 33201  9114
- -1  69  91 1.000 0 33106  4141
- -1  85  58 1.000 0 33201  6701
- -1  72  94 1.000 0 33106  4185
- -1  80  86 1.000 0 33201  9956
- -1  84  27 1.000 0 33201  9115
- -1  84  76 1.000 0 33201  9720
- -1  55   8 1.000 0 33201  7115
- -1  99  56 1.000 0 33106  3887
- -1  53  26 1.000 0 33201  8628
- -1  51  26 1.000 0 33201  8633
- -1  97  60 1.000 0 33106  3863
- -1  51  30 1.000 0 33201  8634
- -1  53  28 1.000 0 33201  8632
- -1  98  60 1.000 0 33106  3864
- -1  53  27 1.000 0 33201  8629
- -1  71  26 1.000 0 33201  8512
- -1  89  27 1.000 0 33201  8462
- -1  63  85 1.000 0 33201 10005
- -1  74  72 1.000 0 33201  9592
- -1  59  37 1.000 0 33106  3513
- -1  64  87 1.000 0 33201 10153
- -1  60   5 1.000 0 33201  6984
- -1  61  14 1.000 0 33201  9034
- -1  92  73 1.000 0 33106  4106
- -1  65  12 1.000 0 33201  9052
- -1  56  82 1.000 0 33201 10054
- -1  95  74 1.000 0 33106  4082
- -1  80  89 1.000 0 33201 10159
- -1  61  15 1.000 0 33201  9033
- -1  54  81 1.000 0 33201 10061
- -1  53  81 1.000 0 33201 10062
- -1  62  14 1.000 0 33201  9028
- -1  54   1 1.000 0 33106  3485
- -1  62  12 1.000 0 33201  9031
- -1  65  13 1.000 0 33201  9051
- -1  57  37 1.000 0 33106  3528
- -1  65  83 1.000 0 33201 10019
- -1  71  86 1.000 0 33201 10084
- -1  65  11 1.000 0 33201  9048
- -1  64  83 1.000 0 33201 10020
- -1  76  89 1.000 0 33201 10111
- -1  72  88 1.000 0 33201 10089
- -1  52  19 1.000 0 33201  8953
- -1  58   4 1.000 0 33201  6891
- -1  63  90 1.000 0 33201 10143
- -1  59  10 1.000 0 33201 10530
- -1  83  20 1.000 0 33201  9059
- -1  53  12 1.000 0 33201  9103
- -1  87  20 1.000 0 33106  3752
- -1  54  12 1.000 0 33201  9099
- -1  82  26 1.000 0 33201  9128
- -1  52  14 1.000 0 33201  9090
- -1  57  19 1.000 0 33201  8945
- -1  54  13 1.000 0 33201  9098
- -1  65   8 1.000 0 33201  9069
- -1  71  30 1.000 0 33201  8511
- -1  92  25 1.000 0 33106  3730
- -1  56  16 1.000 0 33201  8941
- -1  77  12 1.000 0 33106  3732
- -1  66  30 1.000 0 33201  8548
- -1  63  52 1.000 0 33106  3838
- -1  52  28 1.000 0 33201  8611
- -1  86  21 1.000 0 33106  3534
- -1  52  29 1.000 0 33201  8612
- -1  52  27 1.000 0 33201  8610
- -1  64  13 1.000 0 33201  9045
- -1  78  22 1.000 0 33201  8687
- -1  54  15 1.000 0 33201  9095
- -1  56  10 1.000 0 33201 10519
- -1  75  83 1.000 0 33201  9960
- -1  52  11 1.000 0 33201  9091
- -1  54  14 1.000 0 33201  9097
- -1  52  15 1.000 0 33201  9089
- -1  84  81 1.000 0 33201  9809
- -1  62  24 1.000 0 33201  8292
- -1  70  13 1.000 0 33201  9023
- -1  99  48 1.000 0 33201  6750
- -1  67  27 1.000 0 33201  8525
- -1  63  22 1.000 0 33201  8025
- -1  73  57 1.000 0 33201  6830
- -1  89  62 1.000 0 33201  6914
- -1  51   3 1.000 0 33106  3824
- -1  68   6 1.000 0 33201  6780
- -1  72  59 1.000 0 33201  6807
- -1  75  61 1.000 0 33201  7019
- -1  63  25 1.000 0 33201  7983
- -1  74  47 1.000 0 33201  7987
- -1  89  26 1.000 0 33201  8458
- -1  74  50 1.000 0 33201  7992
- -1  53  29 1.000 0 33201  8631
- -1  53  30 1.000 0 33201  8630
- -1  57  26 1.000 0 33201  8579
- -1  78  13 1.000 0 33106  3836
- -1  55  26 1.000 0 33201  8627
- -1  54  38 1.000 0 33106  3650
- -1  88  48 1.000 0 33201  6537
- -1  57  38 1.000 0 33106  3529
- -1  59  85 1.000 0 33201 10038
- -1  73  47 1.000 0 33201  8014
- -1  55  28 1.000 0 33201  8624
- -1  55  27 1.000 0 33201  8623
- -1  52  26 1.000 0 33201  8614
- -1  69  46 1.000 0 33106  3352
- -1  80  63 1.000 0 33201  6991
- -1  60  19 1.000 0 33201  8897
- -1  51  89 1.000 0 33201  4209
- -1  64  62 1.000 0 33106  3929
- -1  59   1 1.000 0 33201  6952
- -1  73  73 1.000 0 33201  9606
- -1  71  84 1.000 0 33201  9953
- -1  73  46 1.000 0 33201  8015
- -1  55  90 1.000 0 33201  4229
- -1  67  32 1.000 0 33201  8337
- -1  54  88 1.000 0 33201  4219
- -1  59  94 1.000 0 33201  7062
- -1  74  56 1.000 0 33201  6834
- -1  71  18 1.000 0 33201  8845
- -1  72  46 1.000 0 33201  7994
- -1  92  29 1.000 0 33106  3690
- -1  59  82 1.000 0 33201 10051
- -1  71  46 1.000 0 33201  8008
- -1  93  49 1.000 0 33201  6480
- -1  93  48 1.000 0 33201  6478
- -1  93  50 1.000 0 33201  6481
- -1  58  10 1.000 0 33201 10524
- -1  86  49 1.000 0 33201  6530
- -1  86  50 1.000 0 33201  6531
- -1  93  47 1.000 0 33201  6477
- -1  62  79 1.000 0 33201  9834
- -1  70  24 1.000 0 33201  8764
- -1  70  23 1.000 0 33201  8765
- -1  56  31 1.000 0 33201  8414
- -1  70  21 1.000 0 33201  8769
- -1  63  21 1.000 0 33201  8033
- -1  62  22 1.000 0 33201  8277
- -1  69  25 1.000 0 33201  8763
- -1  59  20 1.000 0 33201  8928
- -1  63  67 1.000 0 33201  9443
- -1  56   1 1.000 0 33201  6957
- -1  63  24 1.000 0 33201  8013
- -1  58  84 1.000 0 33201 10044
- -1  57   6 1.000 0 33201 10510
- -1  55  29 1.000 0 33201  8625
- -1  61  67 1.000 0 33201  9445
- -1  51  94 1.000 0 33201  7104
- -1  83  60 1.000 0 33201  6755
- -1  60  82 1.000 0 33201 10050
- -1  77  21 1.000 0 33201  8670
- -1  73  83 1.000 0 33201  9962
- -1  86  47 1.000 0 33201  6528
- -1  88  46 1.000 0 33201  6533
- -1  72  83 1.000 0 33201  9963
- -1  57  85 1.000 0 33201 10040
- -1  58  85 1.000 0 33201 10039
- -1 100  54 1.000 0 33201  6905
- -1  95  50 1.000 0 33201  6501
- -1  57  10 1.000 0 33201 10511
- -1  60  17 1.000 0 33201  8936
- -1  60  85 1.000 0 33201 10037
- -1  57   7 1.000 0 33201 10512
- -1  56  85 1.000 0 33201 10041
- -1  90  48 1.000 0 33201  6516
- -1  86  46 1.000 0 33201  6532
- -1  56   6 1.000 0 33201 10518
- -1  72  63 1.000 0 33201  7004
- -1  55  88 1.000 0 33201  4220
- -1  67  35 1.000 0 33201  8338
- -1  52  89 1.000 0 33201  4210
- -1  69  32 1.000 0 33201  8349
- -1  53  89 1.000 0 33201  4211
- -1  53  88 1.000 0 33201  4218
- -1  77  57 1.000 0 33201  6798
- -1  68  34 1.000 0 33201  8342
- -1  86  48 1.000 0 33201  6529
- -1  88  47 1.000 0 33201  6536
- -1  54  86 1.000 0 33201  4201
- -1  54  89 1.000 0 33201  4212
- -1  51  88 1.000 0 33201  4215
- -1  52  88 1.000 0 33201  4217
- -1  55  89 1.000 0 33201  4213
- -1  80  58 1.000 0 33201  6796
- -1  73  34 1.000 0 33201  8313
- -1  73  33 1.000 0 33201  8312
- -1  77  60 1.000 0 33201  6785
- -1  74  48 1.000 0 33201  7988
- -1  70  10 1.000 0 33201  6809
- -1  72  47 1.000 0 33201  7993
- -1  76  10 1.000 0 33106  3775
- -1  83  74 1.000 0 33201  9550
- -1  66  95 1.000 0 33106  4056
- -1  95  33 1.000 0 33201  8368
- -1  59  87 1.000 0 33201 10179
- -1  54   6 1.000 0 33201  7117
- -1  67  22 1.000 0 33201  8757
- -1  67  28 1.000 0 33201  8526
- -1  73  55 1.000 0 33201  9282
- -1  91  40 1.000 0 33201  9171
- -1  67  23 1.000 0 33201  8756
- -1  55  67 1.000 0 33106  4067
- -1  71  59 1.000 0 33201  6808
- -1  70  34 1.000 0 33201  8354
- -1  54  90 1.000 0 33201  4225
- -1  51  90 1.000 0 33201  4222
- -1  66  33 1.000 0 33201  8331
- -1  52  90 1.000 0 33201  4223
- -1  53  90 1.000 0 33201  4224
- -1  68  33 1.000 0 33201  8347
- -1  68  35 1.000 0 33201  8345
- -1  75  33 1.000 0 33201  8305
- -1  71  94 1.000 0 33106  4184
- -1  57   8 1.000 0 33201 10508
- -1  99  46 1.000 0 33201  6508
- -1  56   8 1.000 0 33201 10515
- -1 100  47 1.000 0 33201  6271
- -1 100  50 1.000 0 33201  5498
- -1  64  32 1.000 0 33201  8385
- -1  88  25 1.000 0 33106  3638
- -1  72  22 1.000 0 33201  8702
- -1  52   9 1.000 0 33201  7127
- -1  79  47 1.000 0 33201  6581
- -1  54   8 1.000 0 33201  7122
- -1  79  91 1.000 0 33106  4145
- -1  55  87 1.000 0 33201  4208
- -1  55   6 1.000 0 33201  7112
- -1  73  21 1.000 0 33201  8701
- -1  88  24 1.000 0 33106  3641
- -1  89  25 1.000 0 33106  3658
- -1  77  83 1.000 0 33201  9939
- -1  53  87 1.000 0 33201  4206
- -1  51  87 1.000 0 33201  4203
- -1  52  87 1.000 0 33201  4204
- -1  53  86 1.000 0 33201  4200
- -1  55  86 1.000 0 33201  4202
- -1  56   3 1.000 0 33201  6960
- -1  81  32 1.000 0 33201  8244
- -1  54  87 1.000 0 33201  4207
- -1  89  22 1.000 0 33106  3615
- -1  52  86 1.000 0 33201  4198
- -1  51  86 1.000 0 33201  4197
- -1  99  47 1.000 0 33201  6668
- -1  78  76 1.000 0 33201  9754
- -1  66  34 1.000 0 33201  8332
- -1  53  67 1.000 0 33106  4070
- -1  53  99 1.000 0 33201 10302
- -1  70  35 1.000 0 33201  8353
- -1  70  33 1.000 0 33201  8355
- -1  71  32 1.000 0 33201  8306
- -1  71  33 1.000 0 33201  8307
- -1  70  32 1.000 0 33201  8356
- -1  85  76 1.000 0 33201  9728
- -1  70  11 1.000 0 33201  9025
- -1  85  31 1.000 0 33201  8250
- -1  60  16 1.000 0 33201  8937
- -1  79  78 1.000 0 33201  9761
- -1  66  12 1.000 0 33201  9017
- -1  62   4 1.000 0 33106  3819
- -1  64  36 1.000 0 33106  3596
- -1  75  91 1.000 0 33106  4177
- -1  76  14 1.000 0 33106  3796
- -1  86  18 1.000 0 33106  3750
- -1  70   9 1.000 0 33201  6806
- -1  87  67 1.000 0 33201  9318
- -1  89  24 1.000 0 33106  3665
- -1  82  34 1.000 0 33201  8263
- -1  69  34 1.000 0 33201  8351
- -1  73  28 1.000 0 33201  8504
- -1  55  19 1.000 0 33201  8965
- -1  71  91 1.000 0 33106  4182
- -1  81  69 1.000 0 33201  9343
- -1  85  34 1.000 0 33201  8252
- -1  86  16 1.000 0 33106  3757
- -1  73  32 1.000 0 33201  8311
- -1 100  48 1.000 0 33201  6206
- -1  86  17 1.000 0 33106  3759
- -1  61  19 1.000 0 33201  8919
- -1  69  35 1.000 0 33201  8352
- -1  70  31 1.000 0 33201  8357
- -1  65  55 1.000 0 33106  3845
- -1  71  31 1.000 0 33201  8310
- -1  71  35 1.000 0 33201  8309
- -1  69  31 1.000 0 33201  8358
- -1  59   2 1.000 0 33201  6947
- -1  69  33 1.000 0 33201  8350
- -1  73  35 1.000 0 33201  8314
- -1  60  20 1.000 0 33201  8935
- -1  66  31 1.000 0 33201  8334
- -1  67  31 1.000 0 33201  8336
- -1  66  35 1.000 0 33201  8335
- -1  68  31 1.000 0 33201  8344
- -1  67  33 1.000 0 33201  8340
- -1  58  82 1.000 0 33201 10052
- -1  63  62 1.000 0 33106  3926
- -1  85  17 1.000 0 33201  8951
- -1  81  23 1.000 0 33201  8665
- -1  93  35 1.000 0 33201  8533
- -1  93  32 1.000 0 33201  8464
- -1  97  57 1.000 0 33106  3893
- -1  81  22 1.000 0 33201  8667
- -1  57   9 1.000 0 33201 10509
- -1  85  57 1.000 0 33201  6766
- -1  61   5 1.000 0 33106  3821
- -1  57  20 1.000 0 33201  8934
- -1  64  52 1.000 0 33106  3835
- -1  60  89 1.000 0 33201 10183
- -1  91  29 1.000 0 33106  3715
- -1  59  65 1.000 0 33106  3976
- -1  73  31 1.000 0 33201  8315
- -1  84  59 1.000 0 33201  6765
- -1  80  59 1.000 0 33201  6777
- -1  70   8 1.000 0 33201  6804
- -1  91  24 1.000 0 33106  3720
- -1  81  17 1.000 0 33201  8760
- -1  91  22 1.000 0 33106  3718
- -1  91  25 1.000 0 33106  3722
- -1  60   4 1.000 0 33201  6983
- -1  82  57 1.000 0 33201  6768
- -1  64  38 1.000 0 33106  3594
- -1  92  32 1.000 0 33201  8239
- -1  91  51 1.000 0 33201  4613
- -1  56  11 1.000 0 33201  6333
- -1  80  56 1.000 0 33201  6775
- -1  88  21 1.000 0 33106  3524
- -1  93  29 1.000 0 33106  3706
- -1  83  56 1.000 0 33201  6722
- -1  91  28 1.000 0 33106  3713
- -1  69   8 1.000 0 33201  6794
- -1  85  33 1.000 0 33201  8251
- -1  87  23 1.000 0 33106  3599
- -1  95  52 1.000 0 33201  4614
- -1  68   7 1.000 0 33201  6507
- -1  91  52 1.000 0 33201  4619
- -1  84  20 1.000 0 33201  8657
- -1  93  52 1.000 0 33201  4616
- -1  83  19 1.000 0 33201  9111
- -1  93  34 1.000 0 33201  8492
- -1  57   2 1.000 0 33201  6856
- -1  83  57 1.000 0 33201  6769
- -1  69   7 1.000 0 33201  6795
- -1  56  25 1.000 0 33201  8759
- -1  78  17 1.000 0 33201  8825
- -1  78  20 1.000 0 33201  8828
- -1  74  17 1.000 0 33201  8848
- -1  80  19 1.000 0 33201  8832
- -1  81  16 1.000 0 33201  8713
- -1  91  26 1.000 0 33106  3712
- -1  92  27 1.000 0 33106  3684
- -1  81  27 1.000 0 33201  9110
- -1  91  27 1.000 0 33106  3711
- -1  92  30 1.000 0 33106  3689
- -1  62  33 1.000 0 33201  8363
- -1  81  20 1.000 0 33201  8766
- -1  90  50 1.000 0 33201  6518
- -1  90  49 1.000 0 33201  6517
- -1  95  49 1.000 0 33201  6498
- -1  87  46 1.000 0 33201  6526
- -1  86  24 1.000 0 33106  3584
- -1  78  21 1.000 0 33201  8694
- -1  95  46 1.000 0 33201  6502
- -1 100  49 1.000 0 33201  6371
- -1  54  72 1.000 0 33201  9711
- -1  53  10 1.000 0 33201  7133
- -1  81  59 1.000 0 33201  6761
- -1  67  11 1.000 0 33201  9016
- -1  59   5 1.000 0 33201  6907
- -1  75  42 1.000 0 33201  8023
- -1  94  35 1.000 0 33201  8319
- -1  56  17 1.000 0 33201  8940
- -1  94  34 1.000 0 33201  8317
- -1  76  57 1.000 0 33201  6776
- -1  78  16 1.000 0 33201  8824
- -1  79  59 1.000 0 33201  6778
- -1  78  19 1.000 0 33201  8827
- -1  83  59 1.000 0 33201  6764
- -1  80  16 1.000 0 33201  8829
- -1  87  25 1.000 0 33106  3573
- -1  88  23 1.000 0 33106  3517
- -1  78  18 1.000 0 33201  8826
- -1  96  65 1.000 0 33106  4025
- -1  74  12 1.000 0 33201  8988
- -1  59  40 1.000 0 33106  3512
- -1  70  92 1.000 0 33106  4105
- -1  53  14 1.000 0 33201  9101
- -1  70  40 1.000 0 33201  8212
- -1  78  56 1.000 0 33201  6772
- -1  85  24 1.000 0 33201  8652
- -1  89  76 1.000 0 33201  9433
- -1  81  58 1.000 0 33201  6682
- -1  68   9 1.000 0 33201  6711
- -1  84  56 1.000 0 33201  6726
- -1  82  58 1.000 0 33201  6683
- -1  88  70 1.000 0 33201  8731
- -1  85  25 1.000 0 33201  8654
- -1  85  23 1.000 0 33201  8651
- -1  90  76 1.000 0 33201  9473
- -1  90  52 1.000 0 33201  9203
- -1  72  67 1.000 0 33201  9410
- -1  77  59 1.000 0 33201  6781
- -1  85  21 1.000 0 33201  8655
- -1  58  11 1.000 0 33201  6327
- -1  89  52 1.000 0 33201  9204
- -1  86  33 1.000 0 33201  8232
- -1  59  97 1.000 0 33201  7227
- -1  54   7 1.000 0 33201  7119
- -1  76  83 1.000 0 33201  9941
- -1  87  52 1.000 0 33201  9209
- -1  60  18 1.000 0 33201  8896
- -1  54   9 1.000 0 33201  7121
- -1  78  59 1.000 0 33201  6779
- -1  88  52 1.000 0 33201  9206
- -1  57   3 1.000 0 33201  6860
- -1  84  60 1.000 0 33201  6754
- -1  77  56 1.000 0 33201  6771
- -1  76  70 1.000 0 33201  9405
- -1  86  52 1.000 0 33201  9208
- -1  81  57 1.000 0 33201  6767
- -1  73  16 1.000 0 33201  8863
- -1  87  70 1.000 0 33201  8730
- -1  58  98 1.000 0 33201  7161
- -1  64  35 1.000 0 33201  8383
- -1  54  96 1.000 0 33201  9117
- -1  72  75 1.000 0 33201  9586
- -1  97  65 1.000 0 33106  4024
- -1  82  87 1.000 0 33106  4129
- -1  67   6 1.000 0 33201  6841
- -1  81  47 1.000 0 33201  6541
- -1  86  85 1.000 0 33106  4119
- -1  96  62 1.000 0 33106  4018
- -1  63  96 1.000 0 33106  4197
- -1  74  73 1.000 0 33201  9605
- -1  71  43 1.000 0 33201  8019
- -1  65  96 1.000 0 33106  4194
- -1  75  73 1.000 0 33201  9604
- -1  85  27 1.000 0 33201  9120
- -1  83  46 1.000 0 33201  6561
- -1  77  72 1.000 0 33201  9559
- -1  65  38 1.000 0 33106  3560
- -1  88  22 1.000 0 33106  3564
- -1  89  23 1.000 0 33106  3626
- -1  84  18 1.000 0 33201  8581
- -1  65  45 1.000 0 33106  3642
- -1  87  22 1.000 0 33106  3609
- -1  81  49 1.000 0 33201  6544
- -1  89  21 1.000 0 33106  3649
- -1  81  48 1.000 0 33201  6543
- -1  96  61 1.000 0 33106  4013
- -1  80  73 1.000 0 33201  9567
- -1  87  21 1.000 0 33106  3653
- -1  65  44 1.000 0 33106  3640
- -1  86  25 1.000 0 33106  3672
- -1  95  32 1.000 0 33201  8348
- -1  95  31 1.000 0 33201  8367
- -1  84  19 1.000 0 33201  8590
- -1  84  16 1.000 0 33201  8556
- -1  84  17 1.000 0 33201  8233
- -1  97  62 1.000 0 33106  4014
- -1  75  92 1.000 0 33106  4188
- -1  92  51 1.000 0 33201  4612
- -1  65   5 1.000 0 33106  3834
- -1  92  53 1.000 0 33201  4634
- -1  91  31 1.000 0 33201  8327
- -1  81  50 1.000 0 33201  6545
- -1  95  51 1.000 0 33201  4609
- -1  83  47 1.000 0 33201  6556
- -1  56  19 1.000 0 33201  8938
- -1  85  50 1.000 0 33201  6571
- -1  77  11 1.000 0 33106  3723
- -1  79  10 1.000 0 33106  3771
- -1  96  60 1.000 0 33106  3862
- -1  52   6 1.000 0 33201  7124
- -1  87  24 1.000 0 33106  3506
- -1  92  54 1.000 0 33201  4623
- -1  80  91 1.000 0 33106  4147
- -1  96  37 1.000 0 33106  3084
- -1  90  25 1.000 0 33106  3683
- -1  56  20 1.000 0 33201  8939
- -1  52   8 1.000 0 33201  7126
- -1  60  28 1.000 0 33201  8607
- -1  90  22 1.000 0 33106  3681
- -1  86  20 1.000 0 33106  3760
- -1  60  27 1.000 0 33201  8608
- -1  52  30 1.000 0 33201  8613
- -1  99  60 1.000 0 33106  3870
- -1  91  23 1.000 0 33106  3719
- -1  97  56 1.000 0 33106  3879
- -1  55   7 1.000 0 33201  7116
- -1  96  56 1.000 0 33106  3873
- -1  98  59 1.000 0 33106  3904
- -1 100  56 1.000 0 33106  3888
- -1  95  68 1.000 0 33106  3996
- -1  78   9 1.000 0 33106  3780
- -1  90  21 1.000 0 33106  3673
- -1  95  35 1.000 0 33201  8412
- -1  77  10 1.000 0 33106  3778
- -1  64   4 1.000 0 33106  3828
- -1  98  56 1.000 0 33106  3881
- -1  80  72 1.000 0 33201  9562
- -1  55  10 1.000 0 33201  7113
- -1  84  30 1.000 0 33201  9109
- -1  66   7 1.000 0 33201  6812
- -1  51  27 1.000 0 33201  8637
- -1  99  54 1.000 0 33106  3823
- -1  72   9 1.000 0 33106  3802
- -1  51  29 1.000 0 33201  8635
- -1  77  81 1.000 0 33201  9924
- -1 100  60 1.000 0 33106  3859
- -1  68  28 1.000 0 33201  8546
- -1  84  57 1.000 0 33201  6770
- -1  78  57 1.000 0 33201  6799
- -1  87  85 1.000 0 33106  4117
- -1  95  53 1.000 0 33201  4631
- -1  93  55 1.000 0 33201  4628
- -1  84  22 1.000 0 33201  8643
- -1  70  30 1.000 0 33201  8537
- -1  59  27 1.000 0 33201  8592
- -1  82  24 1.000 0 33201  8662
- -1  56  97 1.000 0 33201  7252
- -1  93  54 1.000 0 33201  4622
- -1  65  37 1.000 0 33106  3556
- -1  59  95 1.000 0 33201  7056
- -1  87  84 1.000 0 33106  4114
- -1  95  55 1.000 0 33201  4625
- -1  82  22 1.000 0 33201  8656
- -1  84  24 1.000 0 33201  8641
- -1  72  30 1.000 0 33201  8516
- -1  69  27 1.000 0 33201  8541
- -1  92  69 1.000 0 33106  3951
- -1  56  15 1.000 0 33201  6336
- -1  71  10 1.000 0 33106  3790
- -1  93  53 1.000 0 33201  4633
- -1  90  47 1.000 0 33201  6515
- -1  60  14 1.000 0 33201  6296
- -1  91  55 1.000 0 33201  4630
- -1  97  61 1.000 0 33106  4020
- -1  60  13 1.000 0 33201  6297
- -1  60  95 1.000 0 33201  7054
- -1  56  14 1.000 0 33201  6305
- -1  60  94 1.000 0 33201  7060
- -1  92  55 1.000 0 33201  4629
- -1  95  54 1.000 0 33201  4620
- -1  94  55 1.000 0 33201  4626
- -1  51  98 1.000 0 33201 10276
- -1  59  11 1.000 0 33201  6323
- -1  81  25 1.000 0 33201  8663
- -1  84  23 1.000 0 33201  8642
- -1  59  28 1.000 0 33201  8588
- -1  97  38 1.000 0 33106  3266
- -1  83  24 1.000 0 33201  8647
- -1  59  14 1.000 0 33201  6326
- -1  76  18 1.000 0 33201  8841
- -1  59  15 1.000 0 33201  6324
- -1  70  42 1.000 0 33201  8068
- -1  91  53 1.000 0 33201  4635
- -1  92  52 1.000 0 33201  4617
- -1  69   9 1.000 0 33201  6792
- -1  80   9 1.000 0 33106  3772
- -1  60  11 1.000 0 33201  6298
- -1  91  21 1.000 0 33106  3724
- -1  91  54 1.000 0 33201  4624
- -1  94  54 1.000 0 33201  4621
- -1  93  51 1.000 0 33201  4611
- -1  94  52 1.000 0 33201  4615
- -1  94  51 1.000 0 33201  4610
- -1  65  36 1.000 0 33106  3558
- -1  61   4 1.000 0 33106  3825
- -1  80  10 1.000 0 33106  3774
- -1  75   8 1.000 0 33106  3814
- -1  69  10 1.000 0 33201  6789
- -1  80  12 1.000 0 33106  3698
- -1  56  12 1.000 0 33201  6307
- -1  68  80 1.000 0 33201  9817
- -1  60  12 1.000 0 33201  6299
- -1  57  12 1.000 0 33201  6300
- -1  94  75 1.000 0 33106  4085
- -1  59  32 1.000 0 33201  8402
- -1  91  72 1.000 0 33106  4077
- -1  56  13 1.000 0 33201  6306
- -1  95  72 1.000 0 33106  4072
- -1  85  20 1.000 0 33201  9006
- -1  83  18 1.000 0 33201  9116
- -1  93  72 1.000 0 33106  4075
- -1  91  75 1.000 0 33106  4088
- -1  92  28 1.000 0 33106  3691
- -1  93  44 1.000 0 33201  6630
- -1  93  45 1.000 0 33201  6629
- -1  56  36 1.000 0 33106  3533
- -1  84  14 1.000 0 33106  3738
- -1  94  44 1.000 0 33201  6637
- -1  92  44 1.000 0 33201  6650
- -1  86  45 1.000 0 33201  6641
- -1  60  40 1.000 0 33106  3505
- -1  84  47 1.000 0 33201  6547
- -1  94  43 1.000 0 33201  6636
- -1  96  44 1.000 0 33106  3441
- -1  96  43 1.000 0 33106  3438
- -1  84  46 1.000 0 33201  6554
- -1  92  72 1.000 0 33106  4076
- -1  94  45 1.000 0 33201  6639
- -1  94  42 1.000 0 33201  6635
- -1  66  13 1.000 0 33201  9018
- -1  96  45 1.000 0 33106  3401
- -1  74   8 1.000 0 33106  3808
- -1  81  14 1.000 0 33106  3731
- -1  94  72 1.000 0 33106  4074
- -1  94  41 1.000 0 33201  6633
- -1  92  45 1.000 0 33201  6649
- -1  86  41 1.000 0 33201  6642
- -1  97  43 1.000 0 33106  3459
- -1 100  44 1.000 0 33106  3356
- -1  93  42 1.000 0 33201  6632
- -1  98  45 1.000 0 33106  3337
- -1  77  20 1.000 0 33201  8838
- -1  88  42 1.000 0 33201  6653
- -1  97  45 1.000 0 33106  3456
- -1  94  66 1.000 0 33106  3931
- -1  56  34 1.000 0 33201  8415
- -1  92  43 1.000 0 33201  6651
- -1  86  43 1.000 0 33201  6606
- -1  86  42 1.000 0 33201  6640
- -1  59  13 1.000 0 33201  6325
- -1  97  58 1.000 0 33106  3928
- -1  92  66 1.000 0 33106  3934
- -1  86  44 1.000 0 33201  6607
- -1  97  42 1.000 0 33106  3462
- -1  97  44 1.000 0 33106  3458
- -1  53  98 1.000 0 33201 10270
- -1  93  43 1.000 0 33201  6631
- -1  51  28 1.000 0 33201  8636
- -1  60  29 1.000 0 33201  8606
- -1  81  24 1.000 0 33201  8664
- -1  95  69 1.000 0 33106  3948
- -1 100  58 1.000 0 33106  3922
- -1  91  69 1.000 0 33106  3970
- -1  97  39 1.000 0 33106  3496
- -1  83  23 1.000 0 33201  8645
- -1  83  21 1.000 0 33201  8646
- -1  76  22 1.000 0 33201  8690
- -1  82  23 1.000 0 33201  8659
- -1  81  21 1.000 0 33201  8668
- -1  84  25 1.000 0 33201  8640
- -1  98  43 1.000 0 33106  3343
- -1  59  12 1.000 0 33201  6328
- -1  63   5 1.000 0 33106  3826
- -1  90  77 1.000 0 33201  9536
- -1  94  69 1.000 0 33106  3968
- -1  94  68 1.000 0 33106  3992
- -1  74  30 1.000 0 33201  8521
- -1  83  25 1.000 0 33201  8648
- -1  96  58 1.000 0 33106  3930
- -1  59  30 1.000 0 33201  8587
- -1  94  53 1.000 0 33201  4632
- -1  82  21 1.000 0 33201  8660
- -1  72  34 1.000 0 33201  8326
- -1  74   9 1.000 0 33106  3807
- -1  87  41 1.000 0 33201  6643
- -1  98  41 1.000 0 33106  3463
- -1  87  42 1.000 0 33201  6644
- -1  96  38 1.000 0 33106  3103
- -1  85  68 1.000 0 33201  9341
- -1  70   6 1.000 0 33201  6810
- -1  60  99 1.000 0 33201  7047
- -1  79  84 1.000 0 33201  9927
- -1  74  34 1.000 0 33201  8321
- -1  73  29 1.000 0 33201  8505
- -1  72  93 1.000 0 33106  4174
- -1  74  32 1.000 0 33201  8318
- -1  73  26 1.000 0 33201  8507
- -1  75  26 1.000 0 33201  8498
- -1  99  45 1.000 0 33106  3411
- -1  99  49 1.000 0 33201  6756
- -1  95  43 1.000 0 33201  6615
- -1  81  15 1.000 0 33106  3733
- -1  99  50 1.000 0 33201  6757
- -1  59  34 1.000 0 33201  8404
- -1  87  19 1.000 0 33106  3754
- -1  88  43 1.000 0 33201  6654
- -1  56  96 1.000 0 33201  7095
- -1  88  45 1.000 0 33201  6656
- -1  77  84 1.000 0 33201  9929
- -1  55  20 1.000 0 33201  8956
- -1  95  44 1.000 0 33201  6616
- -1  88  41 1.000 0 33201  6657
- -1  70  95 1.000 0 33106  4054
- -1  77  49 1.000 0 33201  6602
- -1  87  44 1.000 0 33201  6647
- -1  54  94 1.000 0 33201  7101
- -1  77  89 1.000 0 33201 10113
- -1  83  64 1.000 0 33201  6937
- -1  69  93 1.000 0 33106  4039
- -1  96  48 1.000 0 33201  8051
- -1  89  42 1.000 0 33201  6619
- -1  95  45 1.000 0 33201  6617
- -1  77  43 1.000 0 33201  6719
- -1  95  42 1.000 0 33201  6614
- -1  90  43 1.000 0 33201  6624
- -1  87  43 1.000 0 33201  6645
- -1  95  41 1.000 0 33201  6613
- -1  92  21 1.000 0 33201  5283
- -1  63  39 1.000 0 33106  3589
- -1  61  38 1.000 0 33106  3576
- -1  64  40 1.000 0 33106  3597
- -1  61  94 1.000 0 33201  7028
- -1  96  36 1.000 0 33106  3042
- -1  71  29 1.000 0 33201  8510
- -1  94  31 1.000 0 33201  8129
- -1  96  39 1.000 0 33106  3134
- -1  63  40 1.000 0 33106  3591
- -1  64  37 1.000 0 33106  3592
- -1  61  37 1.000 0 33106  3575
- -1  81  64 1.000 0 33201  6939
- -1  56  33 1.000 0 33201  8416
- -1  63  36 1.000 0 33106  3588
- -1  57  28 1.000 0 33201  8582
- -1  99  44 1.000 0 33106  3409
- -1  61  40 1.000 0 33106  3578
- -1 100  46 1.000 0 33201  8782
- -1 100  45 1.000 0 33106  3347
- -1  78  48 1.000 0 33201  6589
- -1  76  46 1.000 0 33201  6596
- -1  76  47 1.000 0 33201  6595
- -1  83  43 1.000 0 33201  6679
- -1  92  35 1.000 0 33201  8070
- -1  79  50 1.000 0 33201  6586
- -1  71  50 1.000 0 33201  8009
- -1  84  49 1.000 0 33201  6551
- -1  78  50 1.000 0 33201  6593
- -1  99  41 1.000 0 33106  3400
- -1  75  14 1.000 0 33201  8996
- -1  77  50 1.000 0 33201  6603
- -1  74  20 1.000 0 33201  8849
- -1 100  43 1.000 0 33106  3359
- -1  96  41 1.000 0 33106  3430
- -1 100  42 1.000 0 33106  3379
- -1  78  46 1.000 0 33201  6594
- -1  75  11 1.000 0 33201  9000
- -1  97  41 1.000 0 33106  3418
- -1  78  49 1.000 0 33201  6590
- -1  82  15 1.000 0 33106  3744
- -1  79  49 1.000 0 33201  6583
- -1  77  47 1.000 0 33201  6600
- -1  75  13 1.000 0 33201  8997
- -1  96  42 1.000 0 33106  3436
- -1  76  80 1.000 0 33201  9736
- -1  65  62 1.000 0 33106  3932
- -1  63  74 1.000 0 33201  9661
- -1  72  49 1.000 0 33201  7996
- -1  79  77 1.000 0 33201  9744
- -1  72  50 1.000 0 33201  7995
- -1  78  47 1.000 0 33201  6588
- -1  55  73 1.000 0 33201 10216
- -1  72  48 1.000 0 33201  7997
- -1  74  46 1.000 0 33201  7985
- -1  82  71 1.000 0 33201  9535
- -1  84  43 1.000 0 33201  6663
- -1  66  91 1.000 0 33106  4158
- -1  82  14 1.000 0 33106  3736
- -1  92  33 1.000 0 33201  8189
- -1 100  41 1.000 0 33106  3368
- -1  66   9 1.000 0 33201  6816
- -1  69  95 1.000 0 33106  4092
- -1  66   8 1.000 0 33201  6813
- -1  82  43 1.000 0 33201  6666
- -1  82  44 1.000 0 33201  6667
- -1  82  42 1.000 0 33201  6665
- -1  75  10 1.000 0 33106  3811
- -1  84  42 1.000 0 33201  6664
- -1  77  48 1.000 0 33201  6601
- -1  84  44 1.000 0 33201  6660
- -1  85  15 1.000 0 33106  3749
- -1  84  15 1.000 0 33106  3741
- -1  91  35 1.000 0 33201  8092
- -1  82  41 1.000 0 33201  6670
- -1  83  14 1.000 0 33106  3747
- -1  94  33 1.000 0 33201  8297
- -1  67   8 1.000 0 33201  6843
- -1  76  72 1.000 0 33201  9558
- -1  82  45 1.000 0 33201  6671
- -1  52  97 1.000 0 33201  9265
- -1  94  32 1.000 0 33201  8264
- -1  67  95 1.000 0 33106  4064
- -1  91  34 1.000 0 33201  8110
- -1  52  73 1.000 0 33201  9699
- -1  70  94 1.000 0 33106  4110
- -1  91  33 1.000 0 33201  8118
- -1  91  32 1.000 0 33201  8125
- -1  76  17 1.000 0 33201  8840
- -1  73  30 1.000 0 33201  8506
- -1  76  50 1.000 0 33201  6599
- -1  83  44 1.000 0 33201  6680
- -1  92  31 1.000 0 33201  8163
- -1  83  15 1.000 0 33106  3748
- -1  79   9 1.000 0 33106  3769
- -1  76  49 1.000 0 33201  6598
- -1  69  26 1.000 0 33201  8542
- -1  82  30 1.000 0 33201  9129
- -1  82  29 1.000 0 33201  9130
- -1  84  45 1.000 0 33201  6659
- -1  83  42 1.000 0 33201  6678
- -1  76  48 1.000 0 33201  6597
- -1  83  45 1.000 0 33201  6681
- -1  52  67 1.000 0 33106  4071
- -1  74  31 1.000 0 33201  8323
- -1  72  35 1.000 0 33201  8328
- -1  61  65 1.000 0 33106  3939
- -1  56   4 1.000 0 33201  6968
- -1  72  31 1.000 0 33201  8329
- -1  53  96 1.000 0 33201  9168
- -1  71   9 1.000 0 33106  3791
- -1  56   2 1.000 0 33201  6958
- -1  69   6 1.000 0 33201  6783
- -1  72  33 1.000 0 33201  8325
- -1  72  32 1.000 0 33201  8324
- -1  90  41 1.000 0 33201  6605
- -1  96  47 1.000 0 33201  8055
- -1  69  66 1.000 0 33201  9420
- -1  84  69 1.000 0 33201  9347
- -1  96  49 1.000 0 33201  8002
- -1  59  17 1.000 0 33201  8932
- -1  63  71 1.000 0 33201  9637
- -1  54  73 1.000 0 33201  9697
- -1  51  93 1.000 0 33201  7093
- -1  75  27 1.000 0 33201  8502
- -1  75  29 1.000 0 33201  8500
- -1  72  40 1.000 0 33201  8181
- -1  85  71 1.000 0 33201  9540
- -1  98  44 1.000 0 33106  3341
- -1  77  44 1.000 0 33201  6720
- -1  87  17 1.000 0 33106  3753
- -1  87  18 1.000 0 33106  3755
- -1  98  42 1.000 0 33106  3344
- -1  87  45 1.000 0 33201  6648
- -1  90  42 1.000 0 33201  6623
- -1  69  92 1.000 0 33106  4093
- -1  84  48 1.000 0 33201  6549
- -1  74  35 1.000 0 33201  8322
- -1  75  28 1.000 0 33201  8501
- -1  56  29 1.000 0 33201  8596
- -1  86  75 1.000 0 33201  9511
- -1  76  30 1.000 0 33201  8484
- -1  89  28 1.000 0 33201  8461
- -1  76  26 1.000 0 33201  8491
- -1  89  29 1.000 0 33201  8460
- -1  77  26 1.000 0 33201  8475
- -1  72  26 1.000 0 33201  8523
- -1  70   7 1.000 0 33201  6801
- -1  79  14 1.000 0 33106  3582
- -1  92  67 1.000 0 33106  4017
- -1  72  28 1.000 0 33201  8514
- -1  81  79 1.000 0 33201  9739
- -1  95  66 1.000 0 33106  3946
- -1  86  37 1.000 0 33201  9152
- -1  91  66 1.000 0 33106  3944
- -1  72   8 1.000 0 33106  3803
- -1  76  28 1.000 0 33201  8489
- -1  94  67 1.000 0 33106  4028
- -1  71  28 1.000 0 33201  8509
- -1  74  29 1.000 0 33201  8520
- -1  90  27 1.000 0 33201  8469
- -1  92  70 1.000 0 33106  4002
- -1  89  30 1.000 0 33201  8459
- -1  90  26 1.000 0 33201  8468
- -1  90  30 1.000 0 33201  8467
- -1  77  85 1.000 0 33201  9934
- -1  77  30 1.000 0 33201  8476
- -1  56  26 1.000 0 33201  8594
- -1  57  27 1.000 0 33201  8580
- -1  83  77 1.000 0 33201  9753
- -1  77  29 1.000 0 33201  8477
- -1  79  74 1.000 0 33201  9577
- -1  56  27 1.000 0 33201  8591
- -1  56  30 1.000 0 33201  8593
- -1  57  96 1.000 0 33201  7087
- -1  71  47 1.000 0 33201  8005
- -1  82  27 1.000 0 33201  9132
- -1  92  34 1.000 0 33201  8169
- -1  71  48 1.000 0 33201  8006
- -1  58  35 1.000 0 33201  8406
- -1  71  49 1.000 0 33201  8007
- -1  68  26 1.000 0 33201  8543
- -1  52  94 1.000 0 33201  7103
- -1  76  29 1.000 0 33201  8488
- -1  89  36 1.000 0 33201  9138
- -1  76  42 1.000 0 33201  6693
- -1  82  69 1.000 0 33201  9344
- -1  79  45 1.000 0 33201  6703
- -1  63  34 1.000 0 33201  8377
- -1  77  41 1.000 0 33201  6704
- -1  82  70 1.000 0 33201  9349
- -1  71  16 1.000 0 33201  8847
- -1  83  69 1.000 0 33201  9345
- -1  64  39 1.000 0 33106  3595
- -1  61  36 1.000 0 33106  3579
- -1  65  34 1.000 0 33201  8388
- -1  65  33 1.000 0 33201  8389
- -1  81  45 1.000 0 33201  6675
- -1  76  44 1.000 0 33201  6695
- -1  76  45 1.000 0 33201  6696
- -1  81  44 1.000 0 33201  6674
- -1  69  41 1.000 0 33201  8060
- -1  63  32 1.000 0 33201  8375
- -1  87  16 1.000 0 33106  3751
- -1  75  20 1.000 0 33201  8856
- -1  55  94 1.000 0 33201  7100
- -1  71  11 1.000 0 33201  8983
- -1  70  26 1.000 0 33201  8534
- -1  71  12 1.000 0 33201  8979
- -1  98  50 1.000 0 33201  6733
- -1  98  49 1.000 0 33201  6762
- -1  98  48 1.000 0 33201  6550
- -1  85  42 1.000 0 33201  6687
- -1  76  43 1.000 0 33201  6694
- -1  85  41 1.000 0 33201  6691
- -1  97  46 1.000 0 33201  6358
- -1  73  49 1.000 0 33201  8011
- -1  85  86 1.000 0 33106  4132
- -1  81  87 1.000 0 33106  4131
- -1  89  45 1.000 0 33201  6622
- -1  51  65 1.000 0 33106  3998
- -1  77  15 1.000 0 33106  3742
- -1  91  45 1.000 0 33201  6611
- -1  55  97 1.000 0 33201  9187
- -1  99  42 1.000 0 33106  3404
- -1  77  42 1.000 0 33201  6718
- -1  91  42 1.000 0 33201  6608
- -1  69  30 1.000 0 33201  8524
- -1  91  41 1.000 0 33201  6612
- -1  83  37 1.000 0 33201  8099
- -1  85  44 1.000 0 33201  6689
- -1  85  45 1.000 0 33201  6690
- -1  91  44 1.000 0 33201  6610
- -1  80  44 1.000 0 33201  6708
- -1  97  48 1.000 0 33201  6368
- -1  76  41 1.000 0 33201  6692
- -1  98  47 1.000 0 33201  6567
- -1  81  42 1.000 0 33201  6672
- -1  60   6 1.000 0 33201 10526
- -1  89  41 1.000 0 33201  6618
- -1  89  43 1.000 0 33201  6620
- -1  81  41 1.000 0 33201  6676
- -1  69  28 1.000 0 33201  8539
- -1  63  35 1.000 0 33201  8378
- -1  98  46 1.000 0 33201  6492
- -1  74  19 1.000 0 33201  8851
- -1  63  33 1.000 0 33201  8376
- -1  96  46 1.000 0 33201  7984
- -1  96  50 1.000 0 33201  7991
- -1  99  43 1.000 0 33106  3408
- -1  89  44 1.000 0 33201  6621
- -1  78  44 1.000 0 33201  6715
- -1  84  41 1.000 0 33201  6661
- -1  73  92 1.000 0 33106  4190
- -1  85  43 1.000 0 33201  6688
- -1  71  92 1.000 0 33106  4192
- -1  79  73 1.000 0 33201  9566
- -1  68  66 1.000 0 33201  9421
- -1  72  95 1.000 0 33106  4166
- -1  98  57 1.000 0 33106  3895
- -1  96  57 1.000 0 33106  3892
- -1  91  68 1.000 0 33106  3975
- -1  58  29 1.000 0 33201  8598
- -1  58  30 1.000 0 33201  8603
- -1  60  30 1.000 0 33201  8605
- -1  97  40 1.000 0 33106  3498
- -1  62  31 1.000 0 33201  8359
- -1  72  27 1.000 0 33201  8513
- -1  79  26 1.000 0 33201  8473
- -1  91  67 1.000 0 33106  4030
- -1  74  27 1.000 0 33201  8518
- -1  93  67 1.000 0 33106  4032
- -1  80  28 1.000 0 33201  8497
- -1  95  70 1.000 0 33106  4016
- -1  80  26 1.000 0 33201  8494
- -1  77  27 1.000 0 33201  8472
- -1  92  22 1.000 0 33106  3728
- -1  79  30 1.000 0 33201  8482
- -1  80  30 1.000 0 33201  8495
- -1  77  28 1.000 0 33201  8471
- -1  79  27 1.000 0 33201  8474
- -1  94  70 1.000 0 33106  4001
- -1  80  27 1.000 0 33201  8493
- -1  90  68 1.000 0 33201  8727
- -1  96  40 1.000 0 33106  3027
- -1  90  28 1.000 0 33201  8463
- -1  74  28 1.000 0 33201  8519
- -1  99  57 1.000 0 33106  3901
- -1  71  27 1.000 0 33201  8508
- -1  76  27 1.000 0 33201  8490
- -1  90  29 1.000 0 33201  8465
- -1  98  58 1.000 0 33106  3927
- -1  82  48 1.000 0 33201  6563
- -1  55   9 1.000 0 33201  7114
- -1  80  47 1.000 0 33201  6576
- -1  79  21 1.000 0 33201  8675
- -1  92  68 1.000 0 33106  3978
- -1  80  50 1.000 0 33201  6579
- -1  78  84 1.000 0 33201  9928
- -1  80  17 1.000 0 33201  8830
- -1  71  21 1.000 0 33201  8710
- -1  80  49 1.000 0 33201  6578
- -1  83  41 1.000 0 33201  6677
- -1  76  16 1.000 0 33201  8839
- -1  79  46 1.000 0 33201  6580
- -1  82  50 1.000 0 33201  6565
- -1  97  64 1.000 0 33106  4022
- -1  85  46 1.000 0 33201  6573
- -1  72  20 1.000 0 33201  8859
- -1  75  52 1.000 0 33201  9274
- -1  63  12 1.000 0 33201  9042
- -1  61  32 1.000 0 33201  8373
- -1  62  34 1.000 0 33201  8362
- -1  61  31 1.000 0 33201  8364
- -1  63  31 1.000 0 33201  8374
- -1  82  47 1.000 0 33201  6562
- -1  69  29 1.000 0 33201  8538
- -1  65  32 1.000 0 33201  8379
- -1  80  45 1.000 0 33201  6706
- -1  97  49 1.000 0 33201  6335
- -1  80  48 1.000 0 33201  6577
- -1  81  43 1.000 0 33201  6673
- -1  66  43 1.000 0 33201  8059
- -1  74  16 1.000 0 33201  8850
- -1  97  47 1.000 0 33201  6686
- -1  66  45 1.000 0 33201  8062
- -1  62  35 1.000 0 33201  8381
- -1  65  31 1.000 0 33201  8380
- -1  85  49 1.000 0 33201  6570
- -1  97  50 1.000 0 33201  6380
- -1  82  46 1.000 0 33201  6566
- -1  82  49 1.000 0 33201  6564
- -1  64  96 1.000 0 33106  4196
- -1  80  46 1.000 0 33201  6574
- -1  55  36 1.000 0 33106  3669
- -1  53  15 1.000 0 33201  9102
- -1  86  39 1.000 0 33201  9150
- -1  75  47 1.000 0 33201  8004
- -1  52  98 1.000 0 33201 10275
- -1  76  13 1.000 0 33106  3812
- -1  62  96 1.000 0 33106  4198
- -1  72  74 1.000 0 33201  9580
- -1  86  83 1.000 0 33106  4113
- -1  70  12 1.000 0 33201  9024
- -1  66  80 1.000 0 33201  9813
- -1  62  11 1.000 0 33201  9030
- -1  72  52 1.000 0 33201  9271
- -1  70  15 1.000 0 33201  9026
- -1  58  20 1.000 0 33201  8927
- -1  76  75 1.000 0 33201  9568
- -1  61  34 1.000 0 33201  8370
- -1  53  64 1.000 0 33106  4003
- -1  75  46 1.000 0 33201  7998
- -1  86  36 1.000 0 33201  9153
- -1  74  52 1.000 0 33201  9273
- -1  54  11 1.000 0 33201  9094
- -1  73  95 1.000 0 33106  4167
- -1  78  14 1.000 0 33106  3820
- -1  87  81 1.000 0 33106  4120
- -1  90  46 1.000 0 33201  6521
- -1  82  28 1.000 0 33201  9131
- -1  67  10 1.000 0 33201  6852
- -1  73  50 1.000 0 33201  8010
- -1  89  37 1.000 0 33201  9137
- -1  66  42 1.000 0 33201  8058
- -1  81  68 1.000 0 33201  9342
- -1  60  33 1.000 0 33201  8392
- -1  61  33 1.000 0 33201  8371
- -1  76  19 1.000 0 33201  8842
- -1  51  37 1.000 0 33106  3657
- -1  74  95 1.000 0 33106  4168
- -1  73  52 1.000 0 33201  9272
- -1  70  58 1.000 0 33201  6857
- -1  70  63 1.000 0 33201  8622
- -1  71  34 1.000 0 33201  8308
- -1  75  94 1.000 0 33106  4183
- -1  74  49 1.000 0 33201  7989
- -1  82  79 1.000 0 33201  9738
- -1  77  75 1.000 0 33201  9570
- -1  71  95 1.000 0 33106  4165
- -1  56  35 1.000 0 33201  8361
- -1  69  70 1.000 0 33201  9417
- -1  62  70 1.000 0 33201  9461
- -1  86  84 1.000 0 33106  4115
- -1  80  81 1.000 0 33201  9921
- -1  62  32 1.000 0 33201  8360
- -1  68  70 1.000 0 33201  9416
- -1  67  75 1.000 0 33201  9612
- -1  61  35 1.000 0 33201  8366
- -1  57  32 1.000 0 33201  8398
- -1  72  91 1.000 0 33106  4181
- -1  58  16 1.000 0 33201  8926
- -1  53   7 1.000 0 33201  7130
- -1  71  20 1.000 0 33201  8868
- -1  79  75 1.000 0 33201  9572
- -1  60  97 1.000 0 33201  7218
- -1  83  22 1.000 0 33201  8644
- -1  79  29 1.000 0 33201  8481
- -1  75  50 1.000 0 33201  7999
- -1  65  59 1.000 0 33106  3867
- -1  71  75 1.000 0 33201  9585
- -1  73  60 1.000 0 33201  6820
- -1  56  28 1.000 0 33201  8595
- -1  59  26 1.000 0 33201  8589
- -1  72  29 1.000 0 33201  8515
- -1  59  29 1.000 0 33201  8586
- -1  88  65 1.000 0 33201  6921
- -1  92  23 1.000 0 33106  3727
- -1  58  34 1.000 0 33201  8408
- -1  78  26 1.000 0 33201  8478
- -1  78  28 1.000 0 33201  8487
- -1  74  26 1.000 0 33201  8522
- -1  57  30 1.000 0 33201  8585
- -1  57  29 1.000 0 33201  8583
- -1  60  26 1.000 0 33201  8604
- -1  70  27 1.000 0 33201  8530
- -1  78  27 1.000 0 33201  8479
- -1  95  67 1.000 0 33106  4019
- -1  62  60 1.000 0 33106  3891
- -1  70  29 1.000 0 33201  8536
- -1  70  28 1.000 0 33201  8531
- -1  71  38 1.000 0 33201  8165
- -1  60  96 1.000 0 33201  7055
- -1  51  64 1.000 0 33106  4006
- -1  74  33 1.000 0 33201  8320
- -1  71  56 1.000 0 33201  6833
- -1  69  94 1.000 0 33106  4116
- -1  77  35 1.000 0 33201  8286
- -1  74  38 1.000 0 33201  8157
- -1  75  40 1.000 0 33201  8174
- -1  75  39 1.000 0 33201  8173
- -1  75  34 1.000 0 33201  8304
- -1  59  96 1.000 0 33201  7066
- -1  52  64 1.000 0 33106  4005
- -1  62  44 1.000 0 33106  3624
- -1  76  84 1.000 0 33201  9930
- -1  74  40 1.000 0 33201  8159
- -1  80  32 1.000 0 33201  8295
- -1  68  67 1.000 0 33201  9436
- -1  74  13 1.000 0 33201  8987
- -1  74  36 1.000 0 33201  8160
- -1  54  10 1.000 0 33201  7120
- -1  66  47 1.000 0 33106  3272
- -1  86  69 1.000 0 33201  9322
- -1  53   9 1.000 0 33201  7132
- -1  85  83 1.000 0 33201  9822
- -1  79  28 1.000 0 33201  8480
- -1  58  33 1.000 0 33201  8407
- -1  76  71 1.000 0 33201  9553
- -1  78  23 1.000 0 33201  8686
- -1  93  70 1.000 0 33106  4007
- -1  84  21 1.000 0 33201  8638
- -1  78  30 1.000 0 33201  8485
- -1  78  29 1.000 0 33201  8486
- -1  82  25 1.000 0 33201  8661
- -1  93  66 1.000 0 33106  3933
- -1  73  82 1.000 0 33201  9957
- -1  52   7 1.000 0 33201  7125
- -1  55  63 1.000 0 33106  4008
- -1  83  76 1.000 0 33201  9749
- -1  97  59 1.000 0 33106  3906
- -1  76  12 1.000 0 33106  3776
- -1  52  10 1.000 0 33201  7123
- -1  96  59 1.000 0 33106  3907
- -1  58  28 1.000 0 33201  8599
- -1  63  13 1.000 0 33201  9041
- -1  65   9 1.000 0 33201  9070
- -1  72  54 1.000 0 33201  9280
- -1  79  72 1.000 0 33201  9561
- -1  96  64 1.000 0 33106  4023
- -1  99  59 1.000 0 33106  3910
- -1  72  10 1.000 0 33106  3800
- -1  78  72 1.000 0 33201  9560
- -1  88  77 1.000 0 33201  9545
- -1  55  70 1.000 0 33106  4037
- -1  54  70 1.000 0 33106  4038
- -1  53  70 1.000 0 33106  4040
- -1  62  52 1.000 0 33106  3839
- -1  52  69 1.000 0 33106  4046
- -1  73  37 1.000 0 33201  8175
- -1  53  63 1.000 0 33106  4010
- -1  75  30 1.000 0 33201  8499
- -1  55  65 1.000 0 33106  3993
- -1  79  33 1.000 0 33201  8289
- -1  85  56 1.000 0 33201  9314
- -1  80  35 1.000 0 33201  8299
- -1  77  34 1.000 0 33201  8285
- -1  77  33 1.000 0 33201  8284
- -1  62  66 1.000 0 33201  9464
- -1  77  32 1.000 0 33201  8287
- -1  81  74 1.000 0 33201  9548
- -1  63  59 1.000 0 33106  3869
- -1  72  19 1.000 0 33201  8860
- -1  65  69 1.000 0 33201  9455
- -1  72  16 1.000 0 33201  8858
- -1  90  74 1.000 0 33201  9520
- -1  65  84 1.000 0 33201 10013
- -1  57  72 1.000 0 33201  9671
- -1  64  68 1.000 0 33201  9449
- -1  65  74 1.000 0 33201  9656
- -1  83  71 1.000 0 33201  9537
- -1  82  65 1.000 0 33201  6963
- -1  73  20 1.000 0 33201  8865
- -1  62  69 1.000 0 33201  9452
- -1  73  19 1.000 0 33201  8866
- -1  93  39 1.000 0 33201  9173
- -1  65  56 1.000 0 33106  3874
- -1  65  79 1.000 0 33201  9837
- -1  86  64 1.000 0 33201  6912
- -1  78  87 1.000 0 33201 10045
- -1  95  65 1.000 0 33201  6877
- -1  61  71 1.000 0 33201  9639
- -1  75  57 1.000 0 33201  6828
- -1  82  74 1.000 0 33201  9549
- -1  62  68 1.000 0 33201  9447
- -1  62  71 1.000 0 33201  9638
- -1  61  69 1.000 0 33201  9451
- -1  86  60 1.000 0 33201  9521
- -1  73  17 1.000 0 33201  8864
- -1  74  44 1.000 0 33201  8039
- -1  68  42 1.000 0 33201  8046
- -1  70  81 1.000 0 33201  9997
- -1  68  43 1.000 0 33201  8047
- -1  67  12 1.000 0 33201  9015
- -1  74  45 1.000 0 33201  8038
- -1  67  45 1.000 0 33201  8056
- -1  52  68 1.000 0 33106  4061
- -1  67  42 1.000 0 33201  8052
- -1  53  68 1.000 0 33106  4060
- -1  67  41 1.000 0 33201  8050
- -1  69  73 1.000 0 33201  9633
- -1  67  44 1.000 0 33201  8054
- -1  51  66 1.000 0 33106  4050
- -1  55  95 1.000 0 33201  7082
- -1  52  66 1.000 0 33106  4055
- -1  67  43 1.000 0 33201  8053
- -1  57  94 1.000 0 33201  7064
- -1  57  91 1.000 0 33201  7052
- -1  82  64 1.000 0 33201  6938
- -1  66  41 1.000 0 33201  8045
- -1  74  43 1.000 0 33201  8041
- -1  62  55 1.000 0 33106  3843
- -1  68  45 1.000 0 33201  8049
- -1  74  42 1.000 0 33201  8044
- -1  62  54 1.000 0 33106  3844
- -1  54  66 1.000 0 33106  4053
- -1  68  44 1.000 0 33201  8048
- -1  62  61 1.000 0 33106  3943
- -1  61  72 1.000 0 33201  9640
- -1  65  53 1.000 0 33106  3841
- -1  69  81 1.000 0 33201  9996
- -1  64  66 1.000 0 33201  9466
- -1  64  53 1.000 0 33106  3842
- -1  56  18 1.000 0 33201  8942
- -1  77  87 1.000 0 33201 10047
- -1  62  53 1.000 0 33106  3851
- -1  74  39 1.000 0 33201  8158
- -1  72  56 1.000 0 33201  6835
- -1  65  70 1.000 0 33201  9456
- -1  63  42 1.000 0 33106  3610
- -1  74  37 1.000 0 33201  8156
- -1  67  29 1.000 0 33201  8527
- -1  87  72 1.000 0 33201  9501
- -1  82  75 1.000 0 33201  9522
- -1  87  37 1.000 0 33201  9155
- -1  75  31 1.000 0 33201  8302
- -1  86  66 1.000 0 33201  8695
- -1  81  72 1.000 0 33201  9547
- -1  88  72 1.000 0 33201  9502
- -1  63  55 1.000 0 33106  3850
- -1  88  40 1.000 0 33201  9144
- -1  82  72 1.000 0 33201  9544
- -1  60   8 1.000 0 33201 10529
- -1  87  73 1.000 0 33201  9506
- -1  56  61 1.000 0 33106  3958
- -1  52  33 1.000 0 33106  3593
- -1  74  57 1.000 0 33201  6829
- -1  51  68 1.000 0 33106  4063
- -1  75  56 1.000 0 33201  6837
- -1  61  66 1.000 0 33201  9463
- -1  64  72 1.000 0 33201  9643
- -1  66  48 1.000 0 33106  3283
- -1  69  55 1.000 0 33106  2915
- -1  54  65 1.000 0 33106  3994
- -1  90  78 1.000 0 33201  9496
- -1  66  32 1.000 0 33201  8330
- -1  53  66 1.000 0 33106  4057
- -1  53  73 1.000 0 33201 10215
- -1  63  63 1.000 0 33106  3918
- -1  68  78 1.000 0 33201  9825
- -1  76  92 1.000 0 33106  4162
- -1  57   4 1.000 0 33201  6871
- -1  67  34 1.000 0 33201  8339
- -1  77  69 1.000 0 33201  9375
- -1  83  70 1.000 0 33201  9350
- -1  62  25 1.000 0 33201  8316
- -1  53 100 1.000 0 33201  9299
- -1  54  63 1.000 0 33106  4009
- -1  84  67 1.000 0 33201  9356
- -1  68  32 1.000 0 33201  8341
- -1  71  37 1.000 0 33201  8161
- -1  80  33 1.000 0 33201  8296
- -1  54 100 1.000 0 33201  9297
- -1  79  34 1.000 0 33201  8294
- -1  89  72 1.000 0 33201  9503
- -1  66  86 1.000 0 33201 10131
- -1  92  61 1.000 0 33201  6896
- -1  87  63 1.000 0 33201  6931
- -1  62  95 1.000 0 33201  7032
- -1  81  78 1.000 0 33201  9751
- -1  77  91 1.000 0 33106  4150
- -1  65  73 1.000 0 33201  9649
- -1  71  58 1.000 0 33201  6838
- -1  73  56 1.000 0 33201  6836
- -1  66  10 1.000 0 33201  6821
- -1  88  26 1.000 0 33201  8450
- -1  88  27 1.000 0 33201  8448
- -1  56  81 1.000 0 33201 10036
- -1  59  83 1.000 0 33201 10026
- -1  60  84 1.000 0 33201 10042
- -1  86  29 1.000 0 33201  8445
- -1  86  28 1.000 0 33201  8444
- -1  86  27 1.000 0 33201  8443
- -1  62  42 1.000 0 33106  3622
- -1  73  36 1.000 0 33201  8180
- -1  75  35 1.000 0 33201  8303
- -1  80  34 1.000 0 33201  8298
- -1  73  39 1.000 0 33201  8177
- -1  73  38 1.000 0 33201  8176
- -1  80  31 1.000 0 33201  8300
- -1  74  14 1.000 0 33201  8986
- -1  73  40 1.000 0 33201  8179
- -1  68   8 1.000 0 33201  6685
- -1  71  36 1.000 0 33201  8168
- -1  71  39 1.000 0 33201  8166
- -1  79  35 1.000 0 33201  8293
- -1  71  40 1.000 0 33201  8167
- -1  76  81 1.000 0 33201  9925
- -1  70  49 1.000 0 33106  3390
- -1  69  47 1.000 0 33106  3412
- -1  69  75 1.000 0 33201  9610
- -1  68  48 1.000 0 33106  3350
- -1  69  49 1.000 0 33106  3340
- -1  66  50 1.000 0 33106  3405
- -1  59   3 1.000 0 33201  6917
- -1  67  50 1.000 0 33106  3375
- -1  51  72 1.000 0 33201  9708
- -1  68  46 1.000 0 33106  3348
- -1  52  72 1.000 0 33201  9709
- -1  67  49 1.000 0 33106  3371
- -1  68  84 1.000 0 33201  9989
- -1  65  63 1.000 0 33106  3920
- -1  68  47 1.000 0 33106  3345
- -1  51  67 1.000 0 33106  4065
- -1  74  84 1.000 0 33201  9948
- -1  59   4 1.000 0 33201  6911
- -1  86  77 1.000 0 33201  9569
- -1  51  18 1.000 0 33201  8949
- -1  75  48 1.000 0 33201  8003
- -1  55  72 1.000 0 33201  9706
- -1  67  47 1.000 0 33106  3362
- -1  75  49 1.000 0 33201  8001
- -1  54  67 1.000 0 33106  4066
- -1  66  84 1.000 0 33201  9991
- -1  53  72 1.000 0 33201  9710
- -1  74  41 1.000 0 33201  8040
- -1  68  49 1.000 0 33106  3354
- -1  66  49 1.000 0 33106  3310
- -1  93  62 1.000 0 33201  6881
- -1  70  46 1.000 0 33106  3380
- -1  70  48 1.000 0 33106  3385
- -1  57   1 1.000 0 33201  6855
- -1  67  48 1.000 0 33106  3365
- -1  67  13 1.000 0 33201  9012
- -1  70  50 1.000 0 33106  3395
- -1  55  66 1.000 0 33106  4052
- -1  69  84 1.000 0 33201  9988
- -1  70  14 1.000 0 33201  9022
- -1  70  47 1.000 0 33106  3381
- -1  73  18 1.000 0 33201  8867
- -1  70  84 1.000 0 33201  9987
- -1  68  12 1.000 0 33201  9004
- -1  91  61 1.000 0 33201  6892
- -1  51  17 1.000 0 33201  8948
- -1  67  46 1.000 0 33106  3376
- -1  69  48 1.000 0 33106  3336
- -1  54  68 1.000 0 33106  4059
- -1  88  80 1.000 0 33201  9670
- -1  63  64 1.000 0 33106  3950
- -1  55  68 1.000 0 33106  4058
- -1  66  46 1.000 0 33106  3417
- -1  71  55 1.000 0 33201  9286
- -1  66  81 1.000 0 33201  9992
- -1  78  64 1.000 0 33201  6982
- -1  60   9 1.000 0 33201 10528
- -1  90  61 1.000 0 33201  6924
- -1  85  70 1.000 0 33201  8720
- -1  81  56 1.000 0 33201  6707
- -1  52  35 1.000 0 33106  3617
- -1  70  69 1.000 0 33201  9428
- -1  82  56 1.000 0 33201  6712
- -1  79  57 1.000 0 33201  6803
- -1  81  61 1.000 0 33201  6950
- -1  67  39 1.000 0 33201  8190
- -1  67  38 1.000 0 33201  8188
- -1  73  43 1.000 0 33201  8034
- -1  82  78 1.000 0 33201  9750
- -1  70  39 1.000 0 33201  8210
- -1  70  36 1.000 0 33201  8211
- -1  84  61 1.000 0 33201  6946
- -1  84  77 1.000 0 33201  9752
- -1  76  77 1.000 0 33201  9747
- -1  73  42 1.000 0 33201  8017
- -1  68  38 1.000 0 33201  8194
- -1  77  77 1.000 0 33201  9746
- -1  68  37 1.000 0 33201  8193
- -1  82  61 1.000 0 33201  6949
- -1  70  37 1.000 0 33201  8208
- -1  67  36 1.000 0 33201  8192
- -1  67  40 1.000 0 33201  8191
- -1  68  39 1.000 0 33201  8195
- -1  52  99 1.000 0 33201 10316
- -1  52  96 1.000 0 33201  9119
- -1  73  44 1.000 0 33201  8035
- -1  57  14 1.000 0 33201  6302
- -1  57  13 1.000 0 33201  6301
- -1  70  38 1.000 0 33201  8209
- -1  60  15 1.000 0 33201  6295
- -1  73  45 1.000 0 33201  8036
- -1  75  41 1.000 0 33201  8016
- -1  51  73 1.000 0 33201 10214
- -1  57  83 1.000 0 33201 10028
- -1  86  26 1.000 0 33201  8470
- -1  88  28 1.000 0 33201  8449
- -1  86  30 1.000 0 33201  8446
- -1  88  29 1.000 0 33201  8452
- -1  78  80 1.000 0 33201  9734
- -1  88  30 1.000 0 33201  8451
- -1  87  62 1.000 0 33201  6916
- -1  76  65 1.000 0 33201  6977
- -1  70  86 1.000 0 33201 10135
- -1  77  65 1.000 0 33201  6974
- -1  70  72 1.000 0 33201  9618
- -1  87  40 1.000 0 33201  9159
- -1  75  45 1.000 0 33201  8027
- -1  72  45 1.000 0 33201  8032
- -1  75  44 1.000 0 33201  8026
- -1  89  50 1.000 0 33201  6413
- -1  88  50 1.000 0 33201  6540
- -1  72  44 1.000 0 33201  8031
- -1  87  48 1.000 0 33201  6523
- -1  72  42 1.000 0 33201  8029
- -1  90  23 1.000 0 33106  3604
- -1  89  49 1.000 0 33201  6509
- -1  70  78 1.000 0 33201  9827
- -1  87  49 1.000 0 33201  6524
- -1  69  19 1.000 0 33201  8892
- -1  67  16 1.000 0 33201  8883
- -1  62  89 1.000 0 33201 10150
- -1  90  67 1.000 0 33201  9321
- -1  54  85 1.000 0 33201 10071
- -1  61  68 1.000 0 33201  9446
- -1  92  62 1.000 0 33201  6882
- -1  69  18 1.000 0 33201  8891
- -1  70  19 1.000 0 33201  8873
- -1  65  86 1.000 0 33201 10158
- -1  69  17 1.000 0 33201  8890
- -1  67  18 1.000 0 33201  8885
- -1  65  89 1.000 0 33201 10147
- -1  67  19 1.000 0 33201  8886
- -1  88  62 1.000 0 33201  6915
- -1  72  43 1.000 0 33201  8030
- -1  66  36 1.000 0 33201  8198
- -1  87  50 1.000 0 33201  6525
- -1  80  60 1.000 0 33201  6788
- -1  87  39 1.000 0 33201  9157
- -1  82  62 1.000 0 33201  6943
- -1  79  56 1.000 0 33201  6774
- -1  74  51 1.000 0 33201  9289
- -1  91  49 1.000 0 33201  6487
- -1  72  41 1.000 0 33201  8028
- -1  66  65 1.000 0 33201  8621
- -1  91  48 1.000 0 33201  6486
- -1  94  46 1.000 0 33201  6504
- -1  57  81 1.000 0 33201 10035
- -1  87  27 1.000 0 33201  8453
- -1  87  28 1.000 0 33201  8454
- -1  56  84 1.000 0 33201 10049
- -1  73   8 1.000 0 33106  3781
- -1  73   9 1.000 0 33106  3784
- -1  57  84 1.000 0 33201 10046
- -1  77  80 1.000 0 33201  9735
- -1  59  84 1.000 0 33201 10043
- -1  61  89 1.000 0 33201 10151
- -1  78  12 1.000 0 33106  3827
- -1  64  90 1.000 0 33201 10142
- -1  63  81 1.000 0 33201 10010
- -1  62  81 1.000 0 33201 10011
- -1  66  18 1.000 0 33201  8870
- -1  64  88 1.000 0 33201 10137
- -1  90  64 1.000 0 33201  6904
- -1  69  78 1.000 0 33201  9826
- -1  67  65 1.000 0 33201  8609
- -1  62  86 1.000 0 33201 10165
- -1  88  64 1.000 0 33201  6909
- -1  51  85 1.000 0 33201 10074
- -1  65  88 1.000 0 33201 10136
- -1  61  87 1.000 0 33201 10157
- -1  67  56 1.000 0 33201  6869
- -1  67  20 1.000 0 33201  8887
- -1  63  87 1.000 0 33201 10154
- -1  52  85 1.000 0 33201 10073
- -1  65  90 1.000 0 33201 10141
- -1  55  81 1.000 0 33201 10060
- -1  71  24 1.000 0 33201  8715
- -1  58  27 1.000 0 33201  8600
- -1  99  58 1.000 0 33106  3924
- -1  58  26 1.000 0 33201  8602
- -1  58  83 1.000 0 33201 10027
- -1  87  29 1.000 0 33201  8455
- -1  80  23 1.000 0 33201  8680
- -1  87  30 1.000 0 33201  8456
- -1  87  26 1.000 0 33201  8457
- -1  60  83 1.000 0 33201 10025
- -1  55  30 1.000 0 33201  8626
- -1  58  81 1.000 0 33201 10034
- -1  77  74 1.000 0 33201  9575
- -1  84  32 1.000 0 33201  8266
- -1  83  32 1.000 0 33201  8256
- -1  62  59 1.000 0 33106  3871
- -1  84  35 1.000 0 33201  8270
- -1  84  33 1.000 0 33201  8267
- -1  85  35 1.000 0 33201  8254
- -1  84  34 1.000 0 33201  8269
- -1  62  74 1.000 0 33201  9660
- -1  64  41 1.000 0 33106  3601
- -1  81  71 1.000 0 33201  9534
- -1  75  12 1.000 0 33201  8998
- -1  59  81 1.000 0 33201 10032
- -1  60  81 1.000 0 33201 10030
- -1  63  84 1.000 0 33201 10016
- -1  80  74 1.000 0 33201  9578
- -1  65  82 1.000 0 33201  9998
- -1  67  94 1.000 0 33106  4128
- -1  74  58 1.000 0 33201  6826
- -1  56  83 1.000 0 33201 10029
- -1  55   2 1.000 0 33106  3782
- -1  80  66 1.000 0 33201  9373
- -1  94  48 1.000 0 33201  6475
- -1  73  67 1.000 0 33201  9411
- -1  94  49 1.000 0 33201  6476
- -1  87  66 1.000 0 33201  8709
- -1  94  50 1.000 0 33201  6503
- -1  92  42 1.000 0 33201  6652
- -1  74  71 1.000 0 33201  9602
- -1  76  69 1.000 0 33201  9374
- -1  91  38 1.000 0 33201  9167
- -1  91  37 1.000 0 33201  9166
- -1  95  64 1.000 0 33201  6888
- -1  88  44 1.000 0 33201  6655
- -1  91  43 1.000 0 33201  6609
- -1  93  41 1.000 0 33201  6628
- -1  55   3 1.000 0 33106  3783
- -1  66  70 1.000 0 33201  9414
- -1  85  64 1.000 0 33201  6935
- -1  63  97 1.000 0 33106  4204
- -1  72  73 1.000 0 33201  9607
- -1  93  46 1.000 0 33201  6479
- -1  71  65 1.000 0 33201 10217
- -1  79  69 1.000 0 33201  9377
- -1  88  37 1.000 0 33201  9147
- -1  70  41 1.000 0 33201  8074
- -1  68  40 1.000 0 33201  8196
- -1  72  70 1.000 0 33201  9390
- -1  69  45 1.000 0 33201  8064
- -1  70  45 1.000 0 33201  8072
- -1  69  42 1.000 0 33201  8063
- -1  69  44 1.000 0 33201  8065
- -1  80  64 1.000 0 33201  6978
- -1  73  41 1.000 0 33201  8037
- -1  53  95 1.000 0 33201  7084
- -1  70  43 1.000 0 33201  8069
- -1  58  96 1.000 0 33201  7086
- -1  70  44 1.000 0 33201  8073
- -1  68  36 1.000 0 33201  8197
- -1  79  64 1.000 0 33201  6981
- -1  76  64 1.000 0 33201  6986
- -1  58  92 1.000 0 33201  7074
- -1  95  34 1.000 0 33201  8372
- -1  72  23 1.000 0 33201  8704
- -1  78  79 1.000 0 33201  9768
- -1  71  22 1.000 0 33201  8717
- -1  82  63 1.000 0 33201  6955
- -1  72  25 1.000 0 33201  8706
- -1  84  72 1.000 0 33201  9542
- -1  65  66 1.000 0 33201  9467
- -1  63  82 1.000 0 33201 10000
- -1  58  41 1.000 0 33106  3551
- -1  69  65 1.000 0 33201  8597
- -1  61  84 1.000 0 33201 10018
- -1  82  31 1.000 0 33201  8261
- -1  82  33 1.000 0 33201  8262
- -1  82  32 1.000 0 33201  8260
- -1  64  81 1.000 0 33201 10009
- -1  55  96 1.000 0 33201  9170
- -1  67  78 1.000 0 33201  9824
- -1  53  94 1.000 0 33201  7102
- -1  79  80 1.000 0 33201  9733
- -1  83  31 1.000 0 33201  8255
- -1  84  31 1.000 0 33201  8271
- -1  83  34 1.000 0 33201  8258
- -1  83  35 1.000 0 33201  8259
- -1  83  33 1.000 0 33201  8257
- -1  62  84 1.000 0 33201 10017
- -1  81  63 1.000 0 33201  6956
- -1  71  44 1.000 0 33201  8020
- -1  76  79 1.000 0 33201  9765
- -1  80  82 1.000 0 33201  9916
- -1  79  23 1.000 0 33201  8677
- -1  77  22 1.000 0 33201  8672
- -1  79  24 1.000 0 33201  8676
- -1  75  21 1.000 0 33201  8700
- -1  84  83 1.000 0 33201  9823
- -1  69  36 1.000 0 33201  8205
- -1  75  43 1.000 0 33201  8024
- -1  80  77 1.000 0 33201  9743
- -1  95  30 1.000 0 33106  3707
- -1  90  24 1.000 0 33106  3598
- -1  76  23 1.000 0 33201  8692
- -1  69  39 1.000 0 33201  8213
- -1  86  81 1.000 0 33106  4121
- -1  80  21 1.000 0 33201  8684
- -1  66  39 1.000 0 33201  8201
- -1  72  21 1.000 0 33201  8739
- -1  78  63 1.000 0 33201  6989
- -1  66  38 1.000 0 33201  8200
- -1  77  24 1.000 0 33201  8669
- -1  73  23 1.000 0 33201  8698
- -1  77  25 1.000 0 33201  8673
- -1  79  25 1.000 0 33201  8674
- -1  68  10 1.000 0 33201  6773
- -1  83  79 1.000 0 33201  9737
- -1  87  69 1.000 0 33201  9325
- -1  70  80 1.000 0 33201  9819
- -1  73  24 1.000 0 33201  8696
- -1  76  25 1.000 0 33201  8689
- -1  54  18 1.000 0 33201  8958
- -1  75  22 1.000 0 33201  8712
- -1  58   1 1.000 0 33201  6906
- -1  73  22 1.000 0 33201  8699
- -1  56  92 1.000 0 33201  7076
- -1  75  25 1.000 0 33201  8707
- -1  73  25 1.000 0 33201  8697
- -1  75  24 1.000 0 33201  8708
- -1  54  93 1.000 0 33201  7090
- -1  70  76 1.000 0 33201  9805
- -1  88  49 1.000 0 33201  6538
- -1  69  40 1.000 0 33201  8215
- -1  86  54 1.000 0 33201  9202
- -1  62  51 1.000 0 33106  3860
- -1  87  54 1.000 0 33201  9201
- -1  69  37 1.000 0 33201  8206
- -1  88  76 1.000 0 33201  9457
- -1  71  41 1.000 0 33201  8022
- -1  69  38 1.000 0 33201  8207
- -1  90  53 1.000 0 33201  9193
- -1  58  17 1.000 0 33201  8925
- -1  90  71 1.000 0 33201  9499
- -1  58  88 1.000 0 33201 10170
- -1  83  26 1.000 0 33201  9125
- -1  72  60 1.000 0 33201  6817
- -1  94  40 1.000 0 33201  9182
- -1  82  76 1.000 0 33201  9740
- -1  67  80 1.000 0 33201  9816
- -1  73  69 1.000 0 33201  9396
- -1  58 100 1.000 0 33201  7129
- -1  88  55 1.000 0 33201  9190
- -1  78  62 1.000 0 33201  6967
- -1  78  78 1.000 0 33201  9762
- -1  77  63 1.000 0 33201  6988
- -1  77  23 1.000 0 33201  8671
- -1  78  66 1.000 0 33201  9369
- -1  85  62 1.000 0 33201  6940
- -1  59 100 1.000 0 33201  7111
- -1  89  55 1.000 0 33201  9189
- -1  86  53 1.000 0 33201  9197
- -1  77  70 1.000 0 33201  9383
- -1  88  53 1.000 0 33201  9195
- -1  87  55 1.000 0 33201  9191
- -1  71  42 1.000 0 33201  8018
- -1  89  53 1.000 0 33201  9194
- -1  88  54 1.000 0 33201  9200
- -1  53  93 1.000 0 33201  7091
- -1  95  38 1.000 0 33201  9162
- -1  75  69 1.000 0 33201  9394
- -1  87  53 1.000 0 33201  9196
- -1  72  68 1.000 0 33201  9400
- -1  90  54 1.000 0 33201  9198
- -1  85  85 1.000 0 33201  9906
- -1  95  40 1.000 0 33201  9164
- -1  88  66 1.000 0 33201  8719
- -1  54  99 1.000 0 33201 10296
- -1  86  55 1.000 0 33201  9192
- -1  95  39 1.000 0 33201  9163
- -1  72  85 1.000 0 33201  9969
- -1  71  45 1.000 0 33201  8021
- -1  81  76 1.000 0 33201  9741
- -1  63  66 1.000 0 33201  9465
- -1  86  71 1.000 0 33201  9494
- -1  75  23 1.000 0 33201  8711
- -1  57  98 1.000 0 33201  7160
- -1  57  33 1.000 0 33201  8399
- -1  89  54 1.000 0 33201  9199
- -1  95  37 1.000 0 33201  9161
- -1  77  62 1.000 0 33201  6969
- -1  66  40 1.000 0 33201  8203
- -1  83  63 1.000 0 33201  6954
- -1  79  22 1.000 0 33201  8682
- -1  75  84 1.000 0 33201  9947
- -1  80  25 1.000 0 33201  8678
- -1  80  24 1.000 0 33201  8679
- -1  63  69 1.000 0 33201  9453
- -1  89  71 1.000 0 33201  9498
- -1  65  64 1.000 0 33106  3947
- -1  69  83 1.000 0 33201  9985
- -1  58  89 1.000 0 33201 10185
- -1  55  38 1.000 0 33106  3666
- -1  68  85 1.000 0 33201  9973
- -1  66  83 1.000 0 33201  9982
- -1  70  77 1.000 0 33201  9812
- -1  64  28 1.000 0 33201  2420
- -1  75  55 1.000 0 33201  9283
- -1  83  68 1.000 0 33201  9338
- -1  73  54 1.000 0 33201  9278
- -1  64  27 1.000 0 33201  2421
- -1  62  72 1.000 0 33201  9641
- -1  80  80 1.000 0 33201  9732
- -1  91  46 1.000 0 33201  6473
- -1  84  62 1.000 0 33201  6941
- -1  53  11 1.000 0 33201  9104
- -1  81  82 1.000 0 33201  9767
- -1  70  83 1.000 0 33201  9986
- -1  57  16 1.000 0 33201  8933
- -1  74  25 1.000 0 33201  8734
- -1  87  75 1.000 0 33201  9512
- -1  80  22 1.000 0 33201  8681
- -1  80  85 1.000 0 33201  9931
- -1  75  17 1.000 0 33201  8857
- -1  71  19 1.000 0 33201  8844
- -1  57  89 1.000 0 33201 10186
- -1  67  37 1.000 0 33201  8187
- -1  84  85 1.000 0 33201  9910
- -1  86  76 1.000 0 33201  9439
- -1  74  83 1.000 0 33201  9961
- -1  62  93 1.000 0 33201  7041
- -1  66  37 1.000 0 33201  8199
- -1  91  47 1.000 0 33201  6484
- -1  92  50 1.000 0 33201  6483
- -1  92  41 1.000 0 33201  6658
- -1  66  76 1.000 0 33201  9799
- -1  71  25 1.000 0 33201  8714
- -1  84  64 1.000 0 33201  6936
- -1  72  24 1.000 0 33201  8705
- -1 100  59 1.000 0 33106  3917
- -1  71  23 1.000 0 33201  8716
- -1  74  22 1.000 0 33201  8737
- -1  56  98 1.000 0 33201  7159
- -1  74  21 1.000 0 33201  8735
- -1  74  23 1.000 0 33201  8738
- -1  57  17 1.000 0 33201  8943
- -1  74  24 1.000 0 33201  8733
- -1  61  45 1.000 0 33106  3635
- -1  62  36 1.000 0 33106  3570
- -1  62  64 1.000 0 33106  3952
- -1  60  67 1.000 0 33201  9483
- -1  62  37 1.000 0 33106  3567
- -1  67  85 1.000 0 33201  9974
- -1  58  67 1.000 0 33201  9480
- -1  71  52 1.000 0 33201  9275
- -1  61  39 1.000 0 33106  3577
- -1  68  83 1.000 0 33201  9984
- -1  88  79 1.000 0 33201  9593
- -1  67  84 1.000 0 33201  9990
- -1  62  39 1.000 0 33106  3571
- -1  77  17 1.000 0 33201  8835
- -1  83  87 1.000 0 33106  4127
- -1  69  82 1.000 0 33201  9980
- -1  77  68 1.000 0 33201  9385
- -1  63  37 1.000 0 33106  3580
- -1  76  20 1.000 0 33201  8843
- -1  62  38 1.000 0 33106  3569
- -1  66  85 1.000 0 33201  9975
- -1  77  16 1.000 0 33201  8834
- -1  80  20 1.000 0 33201  8833
- -1  96  63 1.000 0 33106  4021
- -1  79  67 1.000 0 33201  9360
- -1  89  48 1.000 0 33201  6494
- -1  53   1 1.000 0 33106  3470
- -1  94  47 1.000 0 33201  6474
- -1  55   5 1.000 0 33106  3792
- -1  65  42 1.000 0 33106  3637
- -1  89  38 1.000 0 33201  9136
- -1  64  33 1.000 0 33201  8386
- -1  70  59 1.000 0 33201  6858
- -1  76  67 1.000 0 33201  9365
- -1  71  54 1.000 0 33201  9281
- -1  68  72 1.000 0 33201  9616
- -1  77  66 1.000 0 33201  9368
- -1  67  83 1.000 0 33201  9983
- -1  67  60 1.000 0 33201  6846
- -1  90  44 1.000 0 33201  6625
- -1  95  47 1.000 0 33201  6496
- -1  51   5 1.000 0 33106  3831
- -1  55   1 1.000 0 33106  3758
- -1  66  58 1.000 0 33201  6853
- -1  69  60 1.000 0 33201  6840
- -1  68  60 1.000 0 33201  6845
- -1  80  18 1.000 0 33201  8831
- -1  60  88 1.000 0 33201 10168
- -1  89  47 1.000 0 33201  6506
- -1  65  40 1.000 0 33106  3565
- -1  69  43 1.000 0 33201  8066
- -1  87  47 1.000 0 33201  6522
- -1  68  59 1.000 0 33201  6861
- -1  90  45 1.000 0 33201  6627
- -1  70  85 1.000 0 33201  9971
- -1  57  86 1.000 0 33201 10191
- -1  58  86 1.000 0 33201 10190
- -1  80  69 1.000 0 33201  9378
- -1  77  19 1.000 0 33201  8837
- -1  89  46 1.000 0 33201  6753
- -1  61  73 1.000 0 33201  9645
- -1  65  39 1.000 0 33106  3563
- -1  84  73 1.000 0 33201  9529
- -1  89  79 1.000 0 33201  9587
- -1  77  18 1.000 0 33201  8836
- -1  82  68 1.000 0 33201  9337
- -1  87  80 1.000 0 33201  9672
- -1  63  38 1.000 0 33106  3585
- -1  69  85 1.000 0 33201  9972
- -1  63  73 1.000 0 33201  9647
- -1  63  60 1.000 0 33106  3890
- -1  62  40 1.000 0 33106  3572
- -1  73  91 1.000 0 33106  4180
- -1  68  41 1.000 0 33201  8067
- -1  86  80 1.000 0 33201  9675
- -1  70  60 1.000 0 33201  6839
- -1  55   4 1.000 0 33106  3789
- -1  78  67 1.000 0 33201  9361
- -1  79  66 1.000 0 33201  9370
- -1  77  67 1.000 0 33201  9364
- -1  68  77 1.000 0 33201  9810
- -1  60  62 1.000 0 33106  3964
- -1  68  79 1.000 0 33201  9830
- -1  56  67 1.000 0 33201  9482
- -1  57  62 1.000 0 33106  3969
- -1  78  61 1.000 0 33201  6994
- -1  59  90 1.000 0 33201 10174
- -1  76  38 1.000 0 33201  8150
- -1  61  97 1.000 0 33106  4206
- -1  63  58 1.000 0 33106  3883
- -1  62  77 1.000 0 33201  9849
- -1  59  35 1.000 0 33201  8405
- -1  57  79 1.000 0 33201  9868
- -1  93  61 1.000 0 33201  6895
- -1  73  76 1.000 0 33201  9785
- -1  52  80 1.000 0 33201  9900
- -1  66  79 1.000 0 33201  9828
- -1  76  37 1.000 0 33201  8149
- -1  60  86 1.000 0 33201 10188
- -1  91  50 1.000 0 33201  6472
- -1  61  80 1.000 0 33201  9843
- -1  59  92 1.000 0 33201  7073
- -1  61  64 1.000 0 33106  3953
- -1  63  93 1.000 0 33201  7039
- -1  58  90 1.000 0 33201 10175
- -1  85  65 1.000 0 33201  6959
- -1  72  80 1.000 0 33201  9775
- -1  95  48 1.000 0 33201  6497
- -1  58   7 1.000 0 33201 10521
- -1  60  76 1.000 0 33201  9882
- -1  62  80 1.000 0 33201  9844
- -1  65  80 1.000 0 33201  9847
- -1  64  75 1.000 0 33201  9655
- -1  58   8 1.000 0 33201 10522
- -1  64  94 1.000 0 33201  7024
- -1  60  80 1.000 0 33201  9872
- -1  60   7 1.000 0 33201 10525
- -1  58   9 1.000 0 33201 10523
- -1  96  54 1.000 0 33201  7018
- -1  69  69 1.000 0 33201  9427
- -1  85  30 1.000 0 33201  9118
- -1  51   4 1.000 0 33106  3829
- -1  92  48 1.000 0 33201  6491
- -1  79  68 1.000 0 33201  9387
- -1  92  46 1.000 0 33201  6490
- -1  53  37 1.000 0 33106  3656
- -1  92  49 1.000 0 33201  6495
- -1  72  69 1.000 0 33201  9397
- -1  80  67 1.000 0 33201  9366
- -1  86  22 1.000 0 33106  3557
- -1  61  77 1.000 0 33201  9848
- -1  85  67 1.000 0 33201  9357
- -1  58  79 1.000 0 33201  9863
- -1  88  73 1.000 0 33201  9507
- -1  92  47 1.000 0 33201  6493
- -1  59  79 1.000 0 33201  9864
- -1  53  74 1.000 0 33201  9704
- -1  77  76 1.000 0 33201  9755
- -1  67  86 1.000 0 33201 10132
- -1  60  77 1.000 0 33201  9875
- -1  61  75 1.000 0 33201  9650
- -1  52  17 1.000 0 33201  8955
- -1  77  14 1.000 0 33106  3746
- -1  68  69 1.000 0 33201  9426
- -1  71  76 1.000 0 33201  9788
- -1  77  36 1.000 0 33201  8134
- -1  77  37 1.000 0 33201  8130
- -1  62  73 1.000 0 33201  9646
- -1  77  39 1.000 0 33201  8132
- -1  51   8 1.000 0 33201  7109
- -1  65  68 1.000 0 33201  9450
- -1  79  36 1.000 0 33201  8141
- -1  52  93 1.000 0 33201  7092
- -1  72  53 1.000 0 33201  9269
- -1  61  78 1.000 0 33201  9838
- -1  97  52 1.000 0 33201  9362
- -1  78  37 1.000 0 33201  8121
- -1  72  76 1.000 0 33201  9784
- -1  51  33 1.000 0 33106  3670
- -1  74  76 1.000 0 33201  9786
- -1  63  45 1.000 0 33106  3619
- -1  79  40 1.000 0 33201  8140
- -1  67  62 1.000 0 33201  8162
- -1  80  40 1.000 0 33201  8148
- -1  74  80 1.000 0 33201  9778
- -1  75  76 1.000 0 33201  9787
- -1  82  38 1.000 0 33201  8116
- -1  83  78 1.000 0 33201  9718
- -1  80  65 1.000 0 33201  6971
- -1  53  77 1.000 0 33201  9894
- -1  86  65 1.000 0 33201  6919
- -1  97  55 1.000 0 33201  6510
- -1  78  38 1.000 0 33201  8123
- -1  78  39 1.000 0 33201  8124
- -1  84  37 1.000 0 33201  8098
- -1  96  52 1.000 0 33201  9363
- -1  55  93 1.000 0 33201  7089
- -1  61  96 1.000 0 33106  4200
- -1  98  53 1.000 0 33201  9323
- -1  79  37 1.000 0 33201  8136
- -1  57  31 1.000 0 33201  8397
- -1  78  36 1.000 0 33201  8127
- -1  79  38 1.000 0 33201  8138
- -1  70  71 1.000 0 33201  9629
- -1  51  63 1.000 0 33106  4012
- -1  89  65 1.000 0 33201  6922
- -1  78  40 1.000 0 33201  8128
- -1  77  40 1.000 0 33201  8135
- -1  78  91 1.000 0 33106  4146
- -1  75  80 1.000 0 33201  9777
- -1  56  79 1.000 0 33201  9869
- -1  56  32 1.000 0 33201  8417
- -1  52  18 1.000 0 33201  8954
- -1  80  41 1.000 0 33201  8780
- -1  67  81 1.000 0 33201  9993
- -1  63  80 1.000 0 33201  9845
- -1  69  62 1.000 0 33201  8151
- -1  83  67 1.000 0 33201  9358
- -1  67  69 1.000 0 33201  9425
- -1  73  80 1.000 0 33201  9774
- -1  77  38 1.000 0 33201  8131
- -1  52   5 1.000 0 33106  3735
- -1  71  80 1.000 0 33201  9776
- -1  54  37 1.000 0 33106  3628
- -1  76  36 1.000 0 33201  8154
- -1  98  52 1.000 0 33201  9354
- -1  53  80 1.000 0 33201  9899
- -1  63  76 1.000 0 33201  9854
- -1  60  61 1.000 0 33106  3954
- -1  73  78 1.000 0 33201  9796
- -1  60  92 1.000 0 33201  7072
- -1  65  67 1.000 0 33201  9441
- -1  77  79 1.000 0 33201  9766
- -1  54  36 1.000 0 33106  3600
- -1  86  38 1.000 0 33201  9151
- -1  55  16 1.000 0 33201  8967
- -1  65  72 1.000 0 33201  9644
- -1  51   6 1.000 0 33201  7106
- -1  86  35 1.000 0 33201  8235
- -1  59  18 1.000 0 33201  8930
- -1  52   2 1.000 0 33106  3694
- -1  60  87 1.000 0 33201 10178
- -1  89  61 1.000 0 33201  6925
- -1  79  18 1.000 0 33201  8821
- -1  65  29 1.000 0 33201  2414
- -1  86  31 1.000 0 33201  8216
- -1  67  68 1.000 0 33201  9430
- -1  64  95 1.000 0 33201  7030
- -1  70  68 1.000 0 33201  9432
- -1  99  53 1.000 0 33201  9327
- -1  64  93 1.000 0 33201  7038
- -1  52  92 1.000 0 33201  7080
- -1  53  69 1.000 0 33106  4045
- -1  67  15 1.000 0 33201  9014
- -1  63  95 1.000 0 33201  7031
- -1  66  69 1.000 0 33201  9424
- -1  79  16 1.000 0 33201  8819
- -1  65  28 1.000 0 33201  2415
- -1  80  71 1.000 0 33201  9557
- -1  79  20 1.000 0 33201  8823
- -1  75  62 1.000 0 33201  7021
- -1  90  79 1.000 0 33201  9581
- -1  65  27 1.000 0 33201  2416
- -1  52   4 1.000 0 33106  3725
- -1  55 100 1.000 0 33201  9291
- -1  90  31 1.000 0 33201  8241
- -1  63  30 1.000 0 33201  2481
- -1  59  16 1.000 0 33201  8931
- -1  56  88 1.000 0 33201 10172
- -1  61  91 1.000 0 33201  8532
- -1  90  60 1.000 0 33201  9316
- -1  54   5 1.000 0 33106  3493
- -1  67  14 1.000 0 33201  9013
- -1  65  95 1.000 0 33201  7029
- -1  89  69 1.000 0 33201  9329
- -1  75  85 1.000 0 33201  9965
- -1  70  70 1.000 0 33201  9418
- -1  51  10 1.000 0 33201  7105
- -1  97  53 1.000 0 33201  9324
- -1  85  26 1.000 0 33201  9133
- -1  51  34 1.000 0 33106  3646
- -1  97  54 1.000 0 33201  7015
- -1  96  53 1.000 0 33201  9326
- -1  52   3 1.000 0 33106  3714
- -1  88  36 1.000 0 33201  9148
- -1  90  40 1.000 0 33201  9139
- -1  74  66 1.000 0 33201  9407
- -1  57  90 1.000 0 33201 10176
- -1  54   4 1.000 0 33106  3492
- -1  72  66 1.000 0 33201  9404
- -1  52  95 1.000 0 33201  7085
- -1  52  36 1.000 0 33106  3663
- -1  93  63 1.000 0 33201  6900
- -1  65  93 1.000 0 33201  7035
- -1  84  63 1.000 0 33201  6953
- -1  56  90 1.000 0 33201 10177
- -1  55  37 1.000 0 33106  3664
- -1  52   1 1.000 0 33106  3500
- -1  67   7 1.000 0 33201  6842
- -1  57  97 1.000 0 33201  7182
- -1  54  95 1.000 0 33201  7083
- -1  51  38 1.000 0 33106  3659
- -1  61  28 1.000 0 33201  2411
- -1  89  32 1.000 0 33201  8222
- -1  86  34 1.000 0 33201  8234
- -1  65  30 1.000 0 33201  2478
- -1  53   8 1.000 0 33201  7131
- -1  90  32 1.000 0 33201  8242
- -1  65  26 1.000 0 33201  2417
- -1  83  61 1.000 0 33201  6948
- -1  53  39 1.000 0 33106  3566
- -1  72  55 1.000 0 33201  9285
- -1  90  75 1.000 0 33201  9510
- -1  90  69 1.000 0 33201  9330
- -1  67  76 1.000 0 33201  9800
- -1  58   3 1.000 0 33201  6897
- -1  67  91 1.000 0 33106  4157
- -1  79  92 1.000 0 33106  4159
- -1  61  26 1.000 0 33201  2413
- -1  89  34 1.000 0 33201  8225
- -1  64  56 1.000 0 33106  3875
- -1  93  37 1.000 0 33201  9175
- -1  64  91 1.000 0 33201  5942
- -1  63  92 1.000 0 33201  7045
- -1  73   6 1.000 0 33106  3788
- -1  78  34 1.000 0 33201  8279
- -1  76  32 1.000 0 33201  8272
- -1  78  33 1.000 0 33201  8281
- -1  91  39 1.000 0 33201  9169
- -1  82  82 1.000 0 33201  9756
- -1  71   6 1.000 0 33106  3797
- -1  74  61 1.000 0 33201  7017
- -1  72  17 1.000 0 33201  8862
- -1  80  38 1.000 0 33201  8145
- -1  79  39 1.000 0 33201  8139
- -1  78  31 1.000 0 33201  8280
- -1  69  13 1.000 0 33201  9009
- -1  85  80 1.000 0 33201  9721
- -1  90  35 1.000 0 33201  8223
- -1  75  63 1.000 0 33201  7003
- -1  74   6 1.000 0 33106  3810
- -1  99  51 1.000 0 33201  9372
- -1  72  18 1.000 0 33201  8861
- -1  78  32 1.000 0 33201  8282
- -1  71  79 1.000 0 33201  9783
- -1  84  39 1.000 0 33201  8096
- -1  81  36 1.000 0 33201  8104
- -1  71  63 1.000 0 33201  6998
- -1  78  35 1.000 0 33201  8278
- -1  76  33 1.000 0 33201  8273
- -1  59  19 1.000 0 33201  8929
- -1  79  71 1.000 0 33201  9556
- -1  89  33 1.000 0 33201  8224
- -1  75  16 1.000 0 33201  8854
- -1 100  52 1.000 0 33201  9340
- -1  51   1 1.000 0 33106  3822
- -1  82  80 1.000 0 33201  9730
- -1  87  79 1.000 0 33201  9594
- -1  84  78 1.000 0 33201  9719
- -1  66  82 1.000 0 33201  9976
- -1  83  80 1.000 0 33201  9729
- -1  81  80 1.000 0 33201  9731
- -1  74  78 1.000 0 33201  9797
- -1  85  78 1.000 0 33201  9717
- -1  56  94 1.000 0 33201  7065
- -1  80  37 1.000 0 33201  8142
- -1  71  78 1.000 0 33201  9794
- -1  72  78 1.000 0 33201  9795
- -1  71  53 1.000 0 33201  9270
- -1  74  10 1.000 0 33106  3805
- -1  98  55 1.000 0 33201  6710
- -1  99  55 1.000 0 33201  6822
- -1  76  39 1.000 0 33201  8153
- -1  82  39 1.000 0 33201  8119
- -1  82  40 1.000 0 33201  8120
- -1  99  52 1.000 0 33201  9352
- -1  75  78 1.000 0 33201  9798
- -1  84  80 1.000 0 33201  9727
- -1  81  75 1.000 0 33201  9524
- -1  67  82 1.000 0 33201  9977
- -1  80  36 1.000 0 33201  8143
- -1  61  76 1.000 0 33201  9862
- -1  61  79 1.000 0 33201  9833
- -1  80  39 1.000 0 33201  8147
- -1  67  64 1.000 0 33201  8126
- -1 100  55 1.000 0 33201  6520
- -1  87  78 1.000 0 33201  9528
- -1  74  77 1.000 0 33201  9792
- -1  84  38 1.000 0 33201  8097
- -1  85  77 1.000 0 33201  9722
- -1  71  64 1.000 0 33201  7012
- -1  62  76 1.000 0 33201  9853
- -1  82  77 1.000 0 33201  9723
- -1  82  36 1.000 0 33201  8117
- -1  84  36 1.000 0 33201  8094
- -1  64  29 1.000 0 33201  2419
- -1  71  77 1.000 0 33201  9789
- -1  82  37 1.000 0 33201  8115
- -1  57  35 1.000 0 33201  8396
- -1  84  40 1.000 0 33201  8095
- -1  63  77 1.000 0 33201  9850
- -1  51   7 1.000 0 33201  7108
- -1  56  86 1.000 0 33201 10192
- -1  76  40 1.000 0 33201  8155
- -1  58   6 1.000 0 33201 10520
- -1  64  30 1.000 0 33201  2418
- -1  64  80 1.000 0 33201  9846
- -1  67  74 1.000 0 33201  9620
- -1  87  65 1.000 0 33201  6920
- -1  66  68 1.000 0 33201  9431
- -1  64  78 1.000 0 33201  9841
- -1  53   6 1.000 0 33201  7128
- -1  58  12 1.000 0 33201  6332
- -1  52  37 1.000 0 33106  3651
- -1  76  78 1.000 0 33201  9764
- -1  66  92 1.000 0 33106  4104
- -1  62  91 1.000 0 33201  8133
- -1  64  26 1.000 0 33201  2422
- -1  73  66 1.000 0 33201  9406
- -1  79  12 1.000 0 33106  3677
- -1  56  87 1.000 0 33201 10182
- -1  72  62 1.000 0 33201  8000
- -1  75   9 1.000 0 33106  3813
- -1  67   9 1.000 0 33201  6844
- -1  83  62 1.000 0 33201  6942
- -1  56  89 1.000 0 33201 10187
- -1  68  95 1.000 0 33106  4078
- -1  85  66 1.000 0 33201  9331
- -1  61  86 1.000 0 33201 10166
- -1  51  91 1.000 0 33201  7099
- -1  58   2 1.000 0 33201  6898
- -1  58   5 1.000 0 33201  6890
- -1  88  69 1.000 0 33201  9328
- -1  87  33 1.000 0 33201  8218
- -1  87  32 1.000 0 33201  8217
- -1  71  15 1.000 0 33201  8982
- -1  70  22 1.000 0 33201  8768
- -1  87  31 1.000 0 33201  8219
- -1  55  18 1.000 0 33201  8964
- -1  78  71 1.000 0 33201  9555
- -1  64  69 1.000 0 33201  9454
- -1  86  72 1.000 0 33201  9500
- -1  61  70 1.000 0 33201  9462
- -1  61  93 1.000 0 33201  7042
- -1  71   7 1.000 0 33106  3794
- -1  63  72 1.000 0 33201  9642
- -1  85  32 1.000 0 33201  8249
- -1  72   7 1.000 0 33106  3804
- -1  71  14 1.000 0 33201  8981
- -1  69  71 1.000 0 33201  9628
- -1  88  31 1.000 0 33201  8231
- -1  87  71 1.000 0 33201  9495
- -1  78  73 1.000 0 33201  9565
- -1  81  31 1.000 0 33201  8247
- -1  72  11 1.000 0 33201  8978
- -1  68  73 1.000 0 33201  9632
- -1  76  82 1.000 0 33201  9920
- -1  73   7 1.000 0 33106  3786
- -1  55  22 1.000 0 33201  8818
- -1  78  15 1.000 0 33106  3726
- -1  78  75 1.000 0 33201  9571
- -1  64  74 1.000 0 33201  9658
- -1  63  23 1.000 0 33201  8083
- -1  81  34 1.000 0 33201  8246
- -1  82  35 1.000 0 33201  8265
- -1  68  92 1.000 0 33106  4095
- -1  89  31 1.000 0 33201  8221
- -1  81  33 1.000 0 33201  8245
- -1  88  75 1.000 0 33201  9513
- -1  83  85 1.000 0 33201  9914
- -1  67  72 1.000 0 33201  9615
- -1  79  11 1.000 0 33106  3721
- -1  69  56 1.000 0 33201  6873
- -1  72  92 1.000 0 33106  4191
- -1  89  66 1.000 0 33201  8721
- -1  54  39 1.000 0 33106  3668
- -1  63  53 1.000 0 33106  3856
- -1  66  62 1.000 0 33201  8164
- -1  65  77 1.000 0 33201  9852
- -1  61  95 1.000 0 33201  7033
- -1  98  54 1.000 0 33201  6995
- -1  61  60 1.000 0 33106  3894
- -1  64  77 1.000 0 33201  9851
- -1  53  23 1.000 0 33201  8798
- -1  59  76 1.000 0 33201  9881
- -1  76  87 1.000 0 33201 10022
- -1  52  70 1.000 0 33106  4041
- -1  61  29 1.000 0 33201  2410
- -1  62  26 1.000 0 33201  2475
- -1  76  73 1.000 0 33201  9563
- -1  62  29 1.000 0 33201  2484
- -1  63  26 1.000 0 33201  2477
- -1  51  20 1.000 0 33201  8947
- -1  54  69 1.000 0 33106  4044
- -1  64  54 1.000 0 33106  3854
- -1  79  19 1.000 0 33201  8822
- -1  79  17 1.000 0 33201  8820
- -1  62  30 1.000 0 33201  2479
- -1  51  69 1.000 0 33106  4049
- -1  57  76 1.000 0 33201  9879
- -1  63  27 1.000 0 33201  2476
- -1  93  38 1.000 0 33201  9174
- -1  63  54 1.000 0 33106  3855
- -1  60  43 1.000 0 33106  3555
- -1  88  35 1.000 0 33201  8230
- -1  88  32 1.000 0 33201  8226
- -1  88  34 1.000 0 33201  8229
- -1  61  57 1.000 0 33106  3903
- -1  51  19 1.000 0 33201  8946
- -1  90  72 1.000 0 33201  9504
- -1  64  55 1.000 0 33106  3849
- -1  65  71 1.000 0 33201  9635
- -1  61  27 1.000 0 33201  2412
- -1  64  71 1.000 0 33201  9636
- -1  61  30 1.000 0 33201  2409
- -1  55  69 1.000 0 33106  4043
- -1  63  29 1.000 0 33201  2482
- -1  81  35 1.000 0 33201  8248
- -1  87  34 1.000 0 33201  8220
- -1  62  28 1.000 0 33201  2480
- -1  51  70 1.000 0 33106  4042
- -1  63  28 1.000 0 33201  2483
- -1  67  92 1.000 0 33106  4101
- -1  88  33 1.000 0 33201  8227
- -1  85  75 1.000 0 33201 10213
- -1  63  75 1.000 0 33201  9654
- -1  89  35 1.000 0 33201  8240
- -1  87  35 1.000 0 33201  8238
- -1  57  18 1.000 0 33201  8944
- -1  86  32 1.000 0 33201  8236
- -1  90  34 1.000 0 33201  8237
- -1  74  92 1.000 0 33106  4189
- -1  65  52 1.000 0 33106  3865
- -1  64  70 1.000 0 33201  9458
- -1  54  98 1.000 0 33201 10261
- -1  74  65 1.000 0 33201  7001
- -1  68  11 1.000 0 33201  9005
- -1  76  35 1.000 0 33201  8275
- -1  74  62 1.000 0 33201  7986
- -1  73  62 1.000 0 33201  7990
- -1  73  61 1.000 0 33201  7016
- -1  71  61 1.000 0 33201  7013
- -1  79  31 1.000 0 33201  8290
- -1  76  34 1.000 0 33201  8274
- -1  68  81 1.000 0 33201  9995
- -1  77  31 1.000 0 33201  8288
- -1  70  56 1.000 0 33201  6874
- -1  76  31 1.000 0 33201  8276
- -1  72  61 1.000 0 33201  7014
- -1 100  53 1.000 0 33201  9336
- -1  79  32 1.000 0 33201  8291
- -1  68  68 1.000 0 33201  9429
- -1  61  63 1.000 0 33106  3915
- -1  71  62 1.000 0 33201  8042
- -1  52  34 1.000 0 33106  3606
- -1  90  33 1.000 0 33201  8243
- -1  67  58 1.000 0 33201  6851
- -1  65  75 1.000 0 33201  9651
- -1  70  91 1.000 0 33106  4136
- -1  51   9 1.000 0 33201  7110
- -1  65  51 1.000 0 33106  3866
- -1  53  38 1.000 0 33106  3647
- -1  60  10 1.000 0 33201 10527
- -1  74  85 1.000 0 33201  9967
- -1  66  54 1.000 0 33106  2913
- -1  67  79 1.000 0 33201  9829
- -1  80  42 1.000 0 33201  6705
- -1  92  24 1.000 0 33106  3729
- -1  92  36 1.000 0 33201  9177
- -1  94  39 1.000 0 33201  9183
- -1  53   3 1.000 0 33106  3474
- -1  81  60 1.000 0 33201  6759
- -1  53   2 1.000 0 33106  3471
- -1  55  39 1.000 0 33106  3667
- -1  63  51 1.000 0 33106  3858
- -1  95  36 1.000 0 33201  9160
- -1  53   4 1.000 0 33106  3480
- -1  74  55 1.000 0 33201  9284
- -1  72   6 1.000 0 33106  3799
- -1  64  51 1.000 0 33106  3857
- -1  78  82 1.000 0 33201  9918
- -1  72  72 1.000 0 33201  9596
- -1  77  58 1.000 0 33201  6790
- -1  85  60 1.000 0 33201  6745
- -1  67  71 1.000 0 33201  9626
- -1  78  11 1.000 0 33106  3806
- -1  95  61 1.000 0 33201  6893
- -1  67  70 1.000 0 33201  9415
- -1  64  12 1.000 0 33201  9044
- -1  64  64 1.000 0 33106  3949
- -1  57  65 1.000 0 33106  3979
- -1  74  54 1.000 0 33201  9277
- -1  64  63 1.000 0 33106  3919
- -1  51  39 1.000 0 33106  3662
- -1  56   5 1.000 0 33201  6975
- -1  51  31 1.000 0 33106  3671
- -1  59   6 1.000 0 33201 10531
- -1  62  56 1.000 0 33106  3877
- -1  69  58 1.000 0 33201  6854
- -1  96  55 1.000 0 33201  9371
- -1  58  65 1.000 0 33106  3977
- -1  79  44 1.000 0 33201  6702
- -1  65  54 1.000 0 33106  3852
- -1  92  37 1.000 0 33201  9178
- -1  93  68 1.000 0 33106  3985
- -1  73  10 1.000 0 33106  3785
- -1  67  59 1.000 0 33201  6862
- -1  91  36 1.000 0 33201  9165
- -1  94  36 1.000 0 33201  9186
- -1  80  83 1.000 0 33201  9936
- -1  79  89 1.000 0 33201 10156
- -1  68  91 1.000 0 33106  4143
- -1  53   5 1.000 0 33106  3484
- -1  92  39 1.000 0 33201  9180
- -1  93  69 1.000 0 33106  3974
- -1  94  38 1.000 0 33201  9184
- -1  90  55 1.000 0 33201  9188
- -1  96  51 1.000 0 33201  8729
- -1  92  40 1.000 0 33201  9181
- -1 100  51 1.000 0 33201  7020
- -1  73  70 1.000 0 33201  9391
- -1  97  51 1.000 0 33201  8723
- -1  51   2 1.000 0 33201  6926
- -1  86  40 1.000 0 33201  9149
- -1  68  94 1.000 0 33106  4118
- -1  98  51 1.000 0 33201  8617
- -1  78  70 1.000 0 33201  9382
- -1  59  59 1.000 0 33106  3914
- -1  92  38 1.000 0 33201  9179
- -1  60  65 1.000 0 33106  3973
- -1  69  59 1.000 0 33201  6859
- -1  54  20 1.000 0 33201  8966
- -1  94  37 1.000 0 33201  9185
- -1  66  72 1.000 0 33201  9614
- -1  90  63 1.000 0 33201  6934
- -1  66  60 1.000 0 33201  6847
- -1  86  51 1.000 0 33201  9213
- -1  78  69 1.000 0 33201  9376
- -1  87  51 1.000 0 33201  9212
- -1  78  58 1.000 0 33201  6793
- -1  91  56 1.000 0 33201  6485
- -1  83  58 1.000 0 33201  6684
- -1  88  51 1.000 0 33201  9211
- -1  71  66 1.000 0 33201  9380
- -1  84  58 1.000 0 33201  6699
- -1  75  67 1.000 0 33201  9413
- -1  76  59 1.000 0 33201  6782
- -1  80  75 1.000 0 33201  9573
- -1  79  58 1.000 0 33201  6791
- -1  67  77 1.000 0 33201  9808
- -1  51  36 1.000 0 33106  3660
- -1  64  84 1.000 0 33201 10015
- -1  64  60 1.000 0 33106  3889
- -1  69  63 1.000 0 33201  8639
- -1  66  71 1.000 0 33201  9625
- -1  59  98 1.000 0 33201  7162
- -1  68  71 1.000 0 33201  9627
- -1  55  85 1.000 0 33201 10070
- -1  53  83 1.000 0 33201 10057
- -1  52  83 1.000 0 33201 10058
- -1  68  14 1.000 0 33201  9002
- -1  65   4 1.000 0 33106  3833
- -1  79  83 1.000 0 33201  9937
- -1  59  78 1.000 0 33201  9860
- -1  55  83 1.000 0 33201 10055
- -1  92  78 1.000 0 33106  4034
- -1  68  15 1.000 0 33201  9001
- -1  83  72 1.000 0 33201  9543
- -1  51  79 1.000 0 33201  9891
- -1  64  82 1.000 0 33201  9999
- -1  55  78 1.000 0 33201  9902
- -1  60  32 1.000 0 33201  8393
- -1  53  78 1.000 0 33201  9905
- -1  59  33 1.000 0 33201  8403
- -1  51  83 1.000 0 33201 10059
- -1  86  79 1.000 0 33201  9600
- -1  83  82 1.000 0 33201  9748
- -1  62  18 1.000 0 33201  8910
- -1  62  17 1.000 0 33201  8909
- -1  66  78 1.000 0 33201  9821
- -1  85  82 1.000 0 33201  9701
- -1  56  78 1.000 0 33201  9867
- -1  59  86 1.000 0 33201 10189
- -1  59  61 1.000 0 33106  3955
- -1  54  78 1.000 0 33201  9904
- -1  52  79 1.000 0 33201  9890
- -1  51  78 1.000 0 33201  9908
- -1  58  80 1.000 0 33201  9870
- -1  60  79 1.000 0 33201  9865
- -1  68  13 1.000 0 33201  9003
- -1  88  61 1.000 0 33201  6927
- -1  69  90 1.000 0 33201 10129
- -1  84  82 1.000 0 33201  9707
- -1  65  76 1.000 0 33201  9857
- -1  58  63 1.000 0 33106  3983
- -1  53  25 1.000 0 33201  8800
- -1  53  33 1.000 0 33106  3527
- -1  69  89 1.000 0 33201 10122
- -1  78  77 1.000 0 33201  9745
- -1  65  60 1.000 0 33106  3886
- -1  52  22 1.000 0 33201  8792
- -1  62  19 1.000 0 33201  8911
- -1  58  31 1.000 0 33201  8409
- -1  64  57 1.000 0 33106  3898
- -1  63  70 1.000 0 33201  9460
- -1  85  61 1.000 0 33201  6945
- -1  52  23 1.000 0 33201  8794
- -1  56  64 1.000 0 33106  3963
- -1  53  21 1.000 0 33201  8801
- -1  77  64 1.000 0 33201  6985
- -1  64  61 1.000 0 33106  3941
- -1  60  22 1.000 0 33201  8790
- -1  52  25 1.000 0 33201  8797
- -1  65  92 1.000 0 33201  7043
- -1  57  61 1.000 0 33106  3957
- -1  53  24 1.000 0 33201  8799
- -1  78  65 1.000 0 33201  6973
- -1  92  64 1.000 0 33201  6886
- -1  75  86 1.000 0 33201 10080
- -1  79  76 1.000 0 33201  9758
- -1  76  88 1.000 0 33201 10206
- -1  93  36 1.000 0 33201  9176
- -1  64   5 1.000 0 33106  3830
- -1  70  57 1.000 0 33201  6863
- -1  87  38 1.000 0 33201  9156
- -1  88  67 1.000 0 33201  9319
- -1  68  65 1.000 0 33201  8601
- -1  71  51 1.000 0 33201  9292
- -1  54  25 1.000 0 33201  8814
- -1  73  71 1.000 0 33201  9601
- -1  72  87 1.000 0 33201 10092
- -1  73  90 1.000 0 33201 10102
- -1  71  87 1.000 0 33201 10091
- -1  59  38 1.000 0 33106  3510
- -1  51  32 1.000 0 33106  3674
- -1  71  73 1.000 0 33201  9608
- -1  58  64 1.000 0 33106  3961
- -1  80  61 1.000 0 33201  6997
- -1  59  36 1.000 0 33106  3509
- -1  55  23 1.000 0 33201  8791
- -1  87  36 1.000 0 33201  9154
- -1  54  24 1.000 0 33201  8815
- -1  51  23 1.000 0 33201  8804
- -1  52  24 1.000 0 33201  8793
- -1  52  21 1.000 0 33201  8796
- -1  74  60 1.000 0 33201  6819
- -1  82  81 1.000 0 33201  9815
- -1  80  92 1.000 0 33106  4156
- -1  93  64 1.000 0 33201  6885
- -1  74  94 1.000 0 33106  4187
- -1  79  88 1.000 0 33201 10163
- -1  62  47 1.000 0 33106  3445
- -1  73  74 1.000 0 33201  9582
- -1  59   8 1.000 0 33201 10533
- -1  72  71 1.000 0 33201  9599
- -1  65  47 1.000 0 33106  3472
- -1  74  69 1.000 0 33201  9395
- -1  74  86 1.000 0 33201 10081
- -1  72  90 1.000 0 33201 10101
- -1  63  47 1.000 0 33106  3439
- -1  76  68 1.000 0 33201  9384
- -1  65  49 1.000 0 33106  3483
- -1  74  90 1.000 0 33201 10103
- -1  72  86 1.000 0 33201 10083
- -1  71  90 1.000 0 33201 10100
- -1  63  48 1.000 0 33106  3478
- -1  62  82 1.000 0 33201 10001
- -1  75  74 1.000 0 33201  9584
- -1  64  34 1.000 0 33201  8384
- -1  74  87 1.000 0 33201 10094
- -1  75  71 1.000 0 33201  9603
- -1  70  88 1.000 0 33201 10109
- -1  73  93 1.000 0 33106  4172
- -1  66  64 1.000 0 33201  8057
- -1  73  75 1.000 0 33201  9588
- -1  60   3 1.000 0 33201  6980
- -1  68  88 1.000 0 33201 10112
- -1  74  93 1.000 0 33106  4170
- -1  75  87 1.000 0 33201 10095
- -1  71  93 1.000 0 33106  4175
- -1  67  88 1.000 0 33201 10114
- -1  59  31 1.000 0 33201  8401
- -1  65  48 1.000 0 33106  3482
- -1  73  72 1.000 0 33201  9595
- -1  63  46 1.000 0 33106  3420
- -1  75  75 1.000 0 33201  9590
- -1  65  50 1.000 0 33106  3486
- -1  75  72 1.000 0 33201  9591
- -1  70  64 1.000 0 33201  8043
- -1  65  46 1.000 0 33106  3489
- -1  68  27 1.000 0 33201  8547
- -1  75   7 1.000 0 33106  3815
- -1  51  16 1.000 0 33201  8952
- -1  61  82 1.000 0 33201 10002
- -1  75  53 1.000 0 33201  9266
- -1  69  88 1.000 0 33201 10110
- -1  71   8 1.000 0 33106  3793
- -1  53  19 1.000 0 33201  8968
- -1  70  55 1.000 0 33106  2914
- -1  61  62 1.000 0 33106  3923
- -1  78  90 1.000 0 33201 10087
- -1  85  74 1.000 0 33201  9552
- -1  77  92 1.000 0 33106  4161
- -1  86  61 1.000 0 33201  6929
- -1  64  50 1.000 0 33106  3428
- -1  64  48 1.000 0 33106  3494
- -1  62  94 1.000 0 33201  7027
- -1  84  65 1.000 0 33201  6961
- -1  83  84 1.000 0 33201  9772
- -1  64  17 1.000 0 33201  8917
- -1  53  62 1.000 0 33106  3989
- -1  64  49 1.000 0 33106  3424
- -1  64  20 1.000 0 33201  8914
- -1  71  74 1.000 0 33201  9579
- -1  60  23 1.000 0 33201  8789
- -1  72  57 1.000 0 33201  6831
- -1  78  81 1.000 0 33201  9923
- -1  67  89 1.000 0 33201 10124
- -1  54  30 1.000 0 33201  8616
- -1  61  20 1.000 0 33201  8920
- -1  63  20 1.000 0 33201  8903
- -1  68  89 1.000 0 33201 10123
- -1  61  18 1.000 0 33201  8918
- -1  54  27 1.000 0 33201  8618
- -1  71  71 1.000 0 33201  9598
- -1  51  80 1.000 0 33201  9901
- -1  58  78 1.000 0 33201  9859
- -1  63  16 1.000 0 33201  8904
- -1  60  63 1.000 0 33106  3981
- -1  59  63 1.000 0 33106  3982
- -1  54  26 1.000 0 33201  8615
- -1  85  84 1.000 0 33201  9770
- -1  54  74 1.000 0 33201  9703
- -1  57  78 1.000 0 33201  9858
- -1  70  89 1.000 0 33201 10121
- -1  58  18 1.000 0 33201  8924
- -1  81  81 1.000 0 33201  9820
- -1  84  84 1.000 0 33201  9771
- -1  66  87 1.000 0 33201 10116
- -1  64  19 1.000 0 33201  8915
- -1  81  84 1.000 0 33201  9804
- -1  63  17 1.000 0 33201  8907
- -1  73  89 1.000 0 33201 10106
- -1  63  19 1.000 0 33201  8905
- -1  61  17 1.000 0 33201  8921
- -1  79  61 1.000 0 33201  6996
- -1  65  20 1.000 0 33201  8901
- -1  65  19 1.000 0 33201  8900
- -1  72  89 1.000 0 33201 10108
- -1  74  89 1.000 0 33201 10105
- -1  56  80 1.000 0 33201  9876
- -1  66  75 1.000 0 33201  9613
- -1  75  89 1.000 0 33201 10107
- -1  62  20 1.000 0 33201  8912
- -1  63  18 1.000 0 33201  8906
- -1  55  79 1.000 0 33201  9886
- -1  71  67 1.000 0 33201  9409
- -1  90  73 1.000 0 33201  9509
- -1  69  15 1.000 0 33201  9007
- -1  87  61 1.000 0 33201  6928
- -1  70  90 1.000 0 33201 10130
- -1  74  11 1.000 0 33201  8984
- -1  54  21 1.000 0 33201  8813
- -1  54  28 1.000 0 33201  8619
- -1  64  16 1.000 0 33201  8913
- -1  64  18 1.000 0 33201  8916
- -1  51  25 1.000 0 33201  8806
- -1  65  17 1.000 0 33201  8898
- -1  67  90 1.000 0 33201 10127
- -1  82  84 1.000 0 33201  9803
- -1  97  36 1.000 0 33106  3268
- -1  83  65 1.000 0 33201  6962
- -1  60  24 1.000 0 33201  8788
- -1  65  16 1.000 0 33201  8902
- -1  55  21 1.000 0 33201  8808
- -1  65  18 1.000 0 33201  8899
- -1  77  13 1.000 0 33106  3761
- -1  67  21 1.000 0 33201  8703
- -1  60  21 1.000 0 33201  8778
- -1  64  46 1.000 0 33106  3421
- -1  55  24 1.000 0 33201  8811
- -1  51  22 1.000 0 33201  8803
- -1  62  16 1.000 0 33201  8908
- -1  54  23 1.000 0 33201  8816
- -1  54  62 1.000 0 33106  3988
- -1  52  82 1.000 0 33201 10068
- -1  74  91 1.000 0 33106  4179
- -1  58  77 1.000 0 33201  9877
- -1  59  62 1.000 0 33106  3965
- -1  53  76 1.000 0 33201  9912
- -1  60  25 1.000 0 33201  8779
- -1  61  58 1.000 0 33106  3885
- -1  59  77 1.000 0 33201  9874
- -1  56  77 1.000 0 33201  9884
- -1  51  35 1.000 0 33106  3645
- -1  74  53 1.000 0 33201  9267
- -1  78  86 1.000 0 33201  9978
- -1  54  80 1.000 0 33201  9898
- -1  94  74 1.000 0 33106  4081
- -1  83  55 1.000 0 33201  9231
- -1  60  31 1.000 0 33201  8394
- -1  55  80 1.000 0 33201  9897
- -1  56  63 1.000 0 33106  3986
- -1  52  75 1.000 0 33201  9694
- -1  51  24 1.000 0 33201  8805
- -1  64  59 1.000 0 33106  3868
- -1  59  80 1.000 0 33201  9871
- -1  72  64 1.000 0 33201  7011
- -1  61  74 1.000 0 33201  9659
- -1  58  62 1.000 0 33106  3966
- -1  52  76 1.000 0 33201  9913
- -1  69  14 1.000 0 33201  9008
- -1  51  82 1.000 0 33201 10069
- -1  57  77 1.000 0 33201  9883
- -1  62  67 1.000 0 33201  9444
- -1  87  64 1.000 0 33201  6910
- -1  64  73 1.000 0 33201  9648
- -1  53  79 1.000 0 33201  9889
- -1  84  71 1.000 0 33201  9539
- -1  60  78 1.000 0 33201  9861
- -1  51  21 1.000 0 33201  8807
- -1  55  25 1.000 0 33201  8812
- -1  57  80 1.000 0 33201  9885
- -1  54  22 1.000 0 33201  8817
- -1  52  78 1.000 0 33201  9907
- -1  69  11 1.000 0 33201  9011
- -1  88  71 1.000 0 33201  9497
- -1  73  63 1.000 0 33201  7005
- -1  72  65 1.000 0 33201  7002
- -1  54  79 1.000 0 33201  9887
- -1  66  55 1.000 0 33106  2924
- -1  67  54 1.000 0 33106  2911
- -1  79  86 1.000 0 33201  9966
- -1  86  78 1.000 0 33201  9532
- -1  64  85 1.000 0 33201 10004
- -1  69  77 1.000 0 33201  9811
- -1  68  76 1.000 0 33201  9801
- -1  52  62 1.000 0 33106  3990
- -1  83  75 1.000 0 33201  9523
- -1  89  73 1.000 0 33201  9508
- -1  56  62 1.000 0 33106  3971
- -1  92  80 1.000 0 33106  4109
- -1  83  73 1.000 0 33201  9530
- -1  84  79 1.000 0 33201  9725
- -1  66  52 1.000 0 33106  2972
- -1  62  58 1.000 0 33106  3884
- -1  78  88 1.000 0 33201 10164
- -1  89  67 1.000 0 33201  9320
- -1  76  86 1.000 0 33201 10014
- -1  93  74 1.000 0 33106  4080
- -1  57  34 1.000 0 33201  8395
- -1  75  64 1.000 0 33201  7007
- -1  74  63 1.000 0 33201  7006
- -1  87  74 1.000 0 33201  9517
- -1  91  73 1.000 0 33106  4103
- -1  82  51 1.000 0 33201  9227
- -1  66  73 1.000 0 33201  9630
- -1  52  20 1.000 0 33201  8972
- -1  75  93 1.000 0 33106  4169
- -1  91  63 1.000 0 33201  6902
- -1  59  64 1.000 0 33106  3960
- -1  57  63 1.000 0 33106  3984
- -1  80  88 1.000 0 33201 10162
- -1  53  17 1.000 0 33201  8970
- -1  53  18 1.000 0 33201  8969
- -1  85  72 1.000 0 33201  9541
- -1  69  74 1.000 0 33201  9622
- -1  69  67 1.000 0 33201  9437
- -1  70  75 1.000 0 33201  9609
- -1  68  74 1.000 0 33201  9621
- -1  53  16 1.000 0 33201  8971
- -1  75  65 1.000 0 33201  7000
- -1  88  63 1.000 0 33201  6932
- -1  86  63 1.000 0 33201  6930
- -1  85  37 1.000 0 33201  8111
- -1  73  59 1.000 0 33201  6805
- -1  88  68 1.000 0 33201  8725
- -1  60  42 1.000 0 33106  3549
- -1  86  70 1.000 0 33201  8728
- -1  64  58 1.000 0 33106  3882
- -1  59  89 1.000 0 33201 10184
- -1  74  59 1.000 0 33201  6811
- -1  59  88 1.000 0 33201 10169
- -1  75  54 1.000 0 33201  9276
- -1  60  34 1.000 0 33201  8391
- -1  89  60 1.000 0 33201  9205
- -1  86  68 1.000 0 33201  8722
- -1  52  39 1.000 0 33106  3654
- -1  94  56 1.000 0 33201  6489
- -1  92  79 1.000 0 33106  4108
- -1  90  56 1.000 0 33201  6669
- -1  93  56 1.000 0 33201  9311
- -1  92  58 1.000 0 33201  9303
- -1  65  58 1.000 0 33106  3880
- -1  93  58 1.000 0 33201  9302
- -1  64  31 1.000 0 33201  8387
- -1  89  59 1.000 0 33201  6575
- -1  92  56 1.000 0 33201  9312
- -1  58  93 1.000 0 33201  7069
- -1  70  66 1.000 0 33201  9419
- -1  66  24 1.000 0 33201  8743
- -1  66  23 1.000 0 33201  8744
- -1  77  46 1.000 0 33201  6604
- -1  68  23 1.000 0 33201  8754
- -1  77  45 1.000 0 33201  6721
- -1  67  25 1.000 0 33201  8750
- -1  81  37 1.000 0 33201  8105
- -1  63  91 1.000 0 33201  6099
- -1  70  25 1.000 0 33201  8761
- -1  60  91 1.000 0 33201  7049
- -1  78  42 1.000 0 33201  6713
- -1  80  43 1.000 0 33201  6709
- -1  68  24 1.000 0 33201  8755
- -1  61  92 1.000 0 33201  7048
- -1  65  91 1.000 0 33201  2474
- -1  68  21 1.000 0 33201  8751
- -1  81  30 1.000 0 33201  9106
- -1  90  70 1.000 0 33201  9313
- -1  65  43 1.000 0 33106  3639
- -1  61  44 1.000 0 33106  3634
- -1  86  58 1.000 0 33201  6585
- -1  87  76 1.000 0 33201  9459
- -1  95  57 1.000 0 33201  6499
- -1  73  85 1.000 0 33201  9968
- -1  79  43 1.000 0 33201  6700
- -1  58  91 1.000 0 33201  7051
- -1  53  36 1.000 0 33106  3655
- -1  62  88 1.000 0 33201 10139
- -1  90  80 1.000 0 33201  9624
- -1  68  25 1.000 0 33201  8745
- -1  66  22 1.000 0 33201  8740
- -1  62  43 1.000 0 33106  3623
- -1  73  86 1.000 0 33201 10082
- -1  89  51 1.000 0 33201  9210
- -1  52  38 1.000 0 33106  3652
- -1  69  22 1.000 0 33201  8749
- -1  61  21 1.000 0 33201  8432
- -1  95  60 1.000 0 33201  9298
- -1  87  59 1.000 0 33201  6555
- -1  61  42 1.000 0 33106  3605
- -1  89  70 1.000 0 33201  8732
- -1  69  21 1.000 0 33201  8746
- -1  88  59 1.000 0 33201  6559
- -1  93  60 1.000 0 33201  9295
- -1  77  61 1.000 0 33201  6993
- -1  65  24 1.000 0 33201  8228
- -1  59  24 1.000 0 33201  8786
- -1  69  23 1.000 0 33201  8748
- -1  77  88 1.000 0 33201 10167
- -1  65  23 1.000 0 33201  8183
- -1  66  25 1.000 0 33201  8742
- -1  79  42 1.000 0 33201  6697
- -1  56  91 1.000 0 33201  7053
- -1  65  21 1.000 0 33201  8268
- -1  75  90 1.000 0 33201 10098
- -1  69  24 1.000 0 33201  8747
- -1  84  50 1.000 0 33201  6553
- -1  94  71 1.000 0 33106  4096
- -1  66  21 1.000 0 33201  8741
- -1  89  57 1.000 0 33201  6548
- -1  88  58 1.000 0 33201  6591
- -1  65  22 1.000 0 33201  8122
- -1  90  57 1.000 0 33201  6552
- -1  86  82 1.000 0 33106  4123
- -1  56  39 1.000 0 33106  3542
- -1  61  56 1.000 0 33106  3878
- -1  65  25 1.000 0 33201  8253
- -1  87  58 1.000 0 33201  6587
- -1  78  74 1.000 0 33201  9576
- -1  89  58 1.000 0 33201  6592
- -1  90  58 1.000 0 33201  6626
- -1  63  44 1.000 0 33106  3618
- -1  72  77 1.000 0 33201  9790
- -1  59  25 1.000 0 33201  8787
- -1  93  57 1.000 0 33201  6505
- -1  64  44 1.000 0 33106  3603
- -1  94  57 1.000 0 33201  6500
- -1  73  51 1.000 0 33201  9288
- -1  75  19 1.000 0 33201  8855
- -1  57  25 1.000 0 33201  8718
- -1  92  59 1.000 0 33201  9308
- -1  85  69 1.000 0 33201  9353
- -1  68  93 1.000 0 33106  4047
- -1  84  70 1.000 0 33201  9351
- -1  56  22 1.000 0 33201  8770
- -1  90  51 1.000 0 33201  6572
- -1  56  95 1.000 0 33201  7059
- -1  58  87 1.000 0 33201 10180
- -1  58  22 1.000 0 33201  8776
- -1  94  60 1.000 0 33201  9296
- -1  58  23 1.000 0 33201  8775
- -1  56  21 1.000 0 33201  8658
- -1  95  63 1.000 0 33201  6889
- -1  57  22 1.000 0 33201  8773
- -1  93  59 1.000 0 33201  9309
- -1  92  57 1.000 0 33201  6511
- -1  95  59 1.000 0 33201  9305
- -1  95  62 1.000 0 33201  6884
- -1  89  68 1.000 0 33201  8726
- -1  91  57 1.000 0 33201  6512
- -1  92  60 1.000 0 33201  9294
- -1  58  25 1.000 0 33201  8781
- -1  57 100 1.000 0 33201  7140
- -1  63  56 1.000 0 33106  3876
- -1  91  64 1.000 0 33201  6887
- -1  60  90 1.000 0 33201 10173
- -1  62  92 1.000 0 33201  7046
- -1  91  59 1.000 0 33201  9307
- -1  87  68 1.000 0 33201  8724
- -1  64  43 1.000 0 33106  3607
- -1  65  35 1.000 0 33201  8413
- -1  75  18 1.000 0 33201  8853
- -1  64  42 1.000 0 33106  3608
- -1  86  74 1.000 0 33201  9515
- -1  88  74 1.000 0 33201  9518
- -1  61  41 1.000 0 33106  3630
- -1  60  35 1.000 0 33201  8390
- -1  65  41 1.000 0 33106  3644
- -1  88  38 1.000 0 33201  9146
- -1  56  93 1.000 0 33201  7071
- -1  85  39 1.000 0 33201  8113
- -1  81  39 1.000 0 33201  8107
- -1  79  41 1.000 0 33201  6698
- -1  68  22 1.000 0 33201  8753
- -1  87  83 1.000 0 33106  4124
- -1  91  71 1.000 0 33106  4089
- -1  67  24 1.000 0 33201  8758
- -1  81  40 1.000 0 33201  8108
- -1  83  36 1.000 0 33201  8101
- -1  97  63 1.000 0 33106  4015
- -1  94  59 1.000 0 33201  9310
- -1  81  62 1.000 0 33201  6944
- -1  91  60 1.000 0 33201  9293
- -1  67  66 1.000 0 33201  9422
- -1  95  56 1.000 0 33201  6488
- -1  91  58 1.000 0 33201  9304
- -1  83  38 1.000 0 33201  8100
- -1  79  48 1.000 0 33201  6582
- -1  70  67 1.000 0 33201  9438
- -1  68  50 1.000 0 33106  3360
- -1  86  67 1.000 0 33201  9317
- -1  75  59 1.000 0 33201  6814
- -1  58  32 1.000 0 33201  8411
- -1  82  73 1.000 0 33201  9531
- -1  88  60 1.000 0 33201  6527
- -1  88  56 1.000 0 33201  6638
- -1  86  57 1.000 0 33201  6534
- -1  84  75 1.000 0 33201  9525
- -1  86  59 1.000 0 33201  6514
- -1  87  60 1.000 0 33201  6519
- -1  90  59 1.000 0 33201  6584
- -1  64  22 1.000 0 33201  8343
- -1  61  43 1.000 0 33106  3633
- -1  62  45 1.000 0 33106  3625
- -1  63  41 1.000 0 33106  3616
- -1  60  41 1.000 0 33106  3548
- -1  59  22 1.000 0 33201  8784
- -1  59  91 1.000 0 33201  7050
- -1  64  45 1.000 0 33106  3602
- -1  59  23 1.000 0 33201  8785
- -1  89  56 1.000 0 33201  6634
- -1  52  31 1.000 0 33106  3627
- -1  88  57 1.000 0 33201  6539
- -1  64  25 1.000 0 33201  8382
- -1  86  56 1.000 0 33201  6662
- -1  95  58 1.000 0 33201  9300
- -1  87  56 1.000 0 33201  6646
- -1  94  58 1.000 0 33201  9301
- -1  59  21 1.000 0 33201  8783
- -1  85  73 1.000 0 33201  9526
- -1  94  62 1.000 0 33201  6880
- -1  87  57 1.000 0 33201  6535
- -1  59  42 1.000 0 33106  3546
- -1  57  21 1.000 0 33201  8666
- -1  89  75 1.000 0 33201  9514
- -1  57  24 1.000 0 33201  8736
- -1  56  24 1.000 0 33201  8772
- -1  58  21 1.000 0 33201  8777
- -1  58  24 1.000 0 33201  8774
- -1  64  24 1.000 0 33201  8369
- -1  62  41 1.000 0 33106  3621
- -1  63  43 1.000 0 33106  3614
- -1  57  23 1.000 0 33201  8767
- -1  84  74 1.000 0 33201  9551
- -1  56 100 1.000 0 33201  7157
- -1  67  93 1.000 0 33106  4048
- -1  58  99 1.000 0 33201  7036
- -1  64  23 1.000 0 33201  8365
- -1  56  23 1.000 0 33201  8771
- -1  81  73 1.000 0 33201  9533
- -1  70  93 1.000 0 33106  4036
- -1  64  21 1.000 0 33201  8400
- -1  59  93 1.000 0 33201  7068
- -1  61  23 1.000 0 33201  8517
- -1  53  22 1.000 0 33201  8802
- -1  89  74 1.000 0 33201  9519
- -1  55  76 1.000 0 33201  9909
- -1  78  45 1.000 0 33201  6716
- -1  64  65 1.000 0 33106  3936
- -1  51  92 1.000 0 33201  7081
- -1  61  24 1.000 0 33201  8535
- -1  61  25 1.000 0 33201  8584
- -1  66  93 1.000 0 33106  4051
- -1  73  48 1.000 0 33201  8012
- -1  85  38 1.000 0 33201  8112
- -1  78  41 1.000 0 33201  6717
- -1  78  43 1.000 0 33201  6714
- -1  81  38 1.000 0 33201  8106
- -1  64  92 1.000 0 33201  7044
- -1  61  22 1.000 0 33201  8483
- -1  72  15 1.000 0 33201  8977
- -1  56  66 1.000 0 33201  9484
- -1  64  76 1.000 0 33201  9855
- -1  54  76 1.000 0 33201  9911
- -1  66  67 1.000 0 33201  9440
- -1  85  36 1.000 0 33201  8109
- -1  69  50 1.000 0 33106  3342
- -1  55  91 1.000 0 33201  7094
- -1  83  39 1.000 0 33201  8102
- -1  83  40 1.000 0 33201  8103
- -1  85  40 1.000 0 33201  8114
- -1  72  12 1.000 0 33201  8974
- -1  53  75 1.000 0 33201  9693
- -1  85  55 1.000 0 33201  9229
- -1  94  64 1.000 0 33201  6903
- -1  84  51 1.000 0 33201  9225
- -1  82  53 1.000 0 33201  9222
- -1  60  72 1.000 0 33201  9667
- -1  55  32 1.000 0 33106  3631
- -1  79  52 1.000 0 33201  9262
- -1  57  73 1.000 0 33201  9676
- -1  80  53 1.000 0 33201  9240
- -1  60  71 1.000 0 33201  9664
- -1  51  77 1.000 0 33201  9896
- -1  65  97 1.000 0 33106  4202
- -1  78  53 1.000 0 33201  9243
- -1  66  61 1.000 0 33201  8346
- -1  58  75 1.000 0 33201  9686
- -1  65  78 1.000 0 33201  9842
- -1  55  34 1.000 0 33106  3636
- -1  54  71 1.000 0 33201  9716
- -1  57  70 1.000 0 33201  9469
- -1  58  73 1.000 0 33201  9677
- -1  65  57 1.000 0 33106  3897
- -1  81  52 1.000 0 33201  9218
- -1  83  30 1.000 0 33201  9123
- -1  76  61 1.000 0 33201  6992
- -1  54  92 1.000 0 33201  7078
- -1  89  40 1.000 0 33201  9134
- -1  57  74 1.000 0 33201  9683
- -1  69  68 1.000 0 33201  9434
- -1  63  65 1.000 0 33106  3937
- -1  72  14 1.000 0 33201  8976
- -1  89  39 1.000 0 33201  9135
- -1  60  68 1.000 0 33201  9493
- -1  65  61 1.000 0 33106  3940
- -1  54  33 1.000 0 33106  3559
- -1  77  51 1.000 0 33201  9252
- -1  51  76 1.000 0 33201  9915
- -1  56  76 1.000 0 33201  9878
- -1  67  63 1.000 0 33201  8653
- -1  54  75 1.000 0 33201  9692
- -1  53  34 1.000 0 33106  3526
- -1  72  13 1.000 0 33201  8975
- -1  57  67 1.000 0 33201  9481
- -1  70  65 1.000 0 33201  8410
- -1  60  59 1.000 0 33106  3913
- -1  73  65 1.000 0 33201  6999
- -1  57  71 1.000 0 33201  9665
- -1  51  95 1.000 0 33201  7088
- -1  54  91 1.000 0 33201  7096
- -1  53  32 1.000 0 33106  3535
- -1  89  64 1.000 0 33201  6908
- -1  55  33 1.000 0 33106  3632
- -1  70  79 1.000 0 33201  9832
- -1  92  65 1.000 0 33201  6878
- -1  66  56 1.000 0 33201  6870
- -1  59  73 1.000 0 33201  9678
- -1  56  71 1.000 0 33201  9666
- -1  54  32 1.000 0 33106  3554
- -1  69  61 1.000 0 33201  8202
- -1  68  82 1.000 0 33201  9979
- -1  81  55 1.000 0 33201  9233
- -1  77  53 1.000 0 33201  9242
- -1  59  71 1.000 0 33201  9663
- -1  84  54 1.000 0 33201  9238
- -1  73  58 1.000 0 33201  6825
- -1  60  74 1.000 0 33201  9684
- -1  67  51 1.000 0 33106  2902
- -1  63  79 1.000 0 33201  9835
- -1  93  73 1.000 0 33106  4102
- -1  81  53 1.000 0 33201  9223
- -1  67  53 1.000 0 33106  2928
- -1  69  53 1.000 0 33106  2926
- -1  70  52 1.000 0 33106  2930
- -1  57  66 1.000 0 33201  9485
- -1  92  75 1.000 0 33106  4087
- -1  70  53 1.000 0 33106  2925
- -1  67  55 1.000 0 33106  2918
- -1  67  52 1.000 0 33106  2935
- -1  70  61 1.000 0 33201  8178
- -1  53  31 1.000 0 33106  3537
- -1  77  55 1.000 0 33201  9255
- -1  84  55 1.000 0 33201  9230
- -1  76  51 1.000 0 33201  9253
- -1  70  62 1.000 0 33201  8146
- -1  67  61 1.000 0 33201  8214
- -1  59  70 1.000 0 33201  9471
- -1  68  53 1.000 0 33106  2927
- -1  59  69 1.000 0 33201  9477
- -1  92  74 1.000 0 33106  4079
- -1  76  52 1.000 0 33201  9263
- -1  59  75 1.000 0 33201  9687
- -1  68  64 1.000 0 33201  8137
- -1  58  66 1.000 0 33201  9486
- -1  51  99 1.000 0 33201 10322
- -1  59  67 1.000 0 33201  9479
- -1  60  66 1.000 0 33201  9488
- -1  76  54 1.000 0 33201  9248
- -1  65  65 1.000 0 33106  3935
- -1  60  58 1.000 0 33106  3912
- -1  73  12 1.000 0 33201  8991
- -1  55  31 1.000 0 33106  3629
- -1  60   2 1.000 0 33201  6979
- -1  76  53 1.000 0 33201  9239
- -1  59  72 1.000 0 33201  9668
- -1  78  55 1.000 0 33201  9256
- -1  80  52 1.000 0 33201  9259
- -1  90  37 1.000 0 33201  9142
- -1  71  83 1.000 0 33201  9964
- -1  77  54 1.000 0 33201  9247
- -1  55  92 1.000 0 33201  7077
- -1  58  60 1.000 0 33106  3908
- -1  52  32 1.000 0 33106  3767
- -1  68  86 1.000 0 33201 10133
- -1  59  60 1.000 0 33106  3909
- -1  79  55 1.000 0 33201  9257
- -1  94  61 1.000 0 33201  6894
- -1  56  74 1.000 0 33201  9682
- -1  85  54 1.000 0 33201  9234
- -1  81  51 1.000 0 33201  9228
- -1  52  71 1.000 0 33201  9714
- -1  89  63 1.000 0 33201  6933
- -1  55  74 1.000 0 33201  9702
- -1  54   2 1.000 0 33106  3488
- -1  60   1 1.000 0 33201  6976
- -1  57  69 1.000 0 33201  9475
- -1  78  54 1.000 0 33201  9246
- -1  85  53 1.000 0 33201  9219
- -1  51  96 1.000 0 33201  9158
- -1  81  54 1.000 0 33201  9235
- -1  56  70 1.000 0 33201  9468
- -1  55  75 1.000 0 33201  9691
- -1  56  68 1.000 0 33201  9489
- -1  78  52 1.000 0 33201  9261
- -1  82  55 1.000 0 33201  9232
- -1  77  52 1.000 0 33201  9260
- -1  79  54 1.000 0 33201  9245
- -1  80  55 1.000 0 33201  9258
- -1  54  16 1.000 0 33201  8961
- -1  55  35 1.000 0 33106  3643
- -1  57  75 1.000 0 33201  9685
- -1  63  57 1.000 0 33106  3899
- -1  60  70 1.000 0 33201  9472
- -1  52 100 1.000 0 33201  9306
- -1  58  76 1.000 0 33201  9880
- -1  59  66 1.000 0 33201  9487
- -1  60  60 1.000 0 33106  3911
- -1  73  64 1.000 0 33201  7010
- -1  60  69 1.000 0 33201  9478
- -1  59   7 1.000 0 33201 10532
- -1  84  53 1.000 0 33201  9220
- -1  82  54 1.000 0 33201  9236
- -1  73  13 1.000 0 33201  8992
- -1  59   9 1.000 0 33201 10534
- -1  62  78 1.000 0 33201  9839
- -1  60  73 1.000 0 33201  9679
- -1  53  71 1.000 0 33201  9715
- -1  56  72 1.000 0 33201  9673
- -1  51 100 1.000 0 33201 10223
- -1  83  51 1.000 0 33201  9226
- -1  80  54 1.000 0 33201  9244
- -1  51  71 1.000 0 33201  9713
- -1  85  52 1.000 0 33201  9214
- -1  83  52 1.000 0 33201  9216
- -1  82  52 1.000 0 33201  9217
- -1  69  54 1.000 0 33106  2908
- -1  91  65 1.000 0 33201  6879
- -1  58  71 1.000 0 33201  9662
- -1  68  55 1.000 0 33106  2916
- -1  54  31 1.000 0 33106  3540
- -1  68  52 1.000 0 33106  2934
- -1  70  51 1.000 0 33106  2896
- -1  58  70 1.000 0 33201  9470
- -1  56  73 1.000 0 33201  9674
- -1  67  57 1.000 0 33201  6866
- -1  68  56 1.000 0 33201  6868
- -1  95  73 1.000 0 33106  4098
- -1  68  54 1.000 0 33106  2910
- -1  54  35 1.000 0 33106  3574
- -1  83  28 1.000 0 33201  9127
- -1  58  72 1.000 0 33201  9669
- -1  53  35 1.000 0 33106  3507
- -1  92  63 1.000 0 33201  6901
- -1  62  57 1.000 0 33106  3900
- -1  86  73 1.000 0 33201  9505
- -1  81  28 1.000 0 33201  9112
- -1  64  79 1.000 0 33201  9836
- -1  64  11 1.000 0 33201  9043
- -1  58  68 1.000 0 33201  9491
- -1  63  61 1.000 0 33106  3942
- -1  81  29 1.000 0 33201  9105
- -1  66  63 1.000 0 33201  8683
- -1  58  74 1.000 0 33201  9680
- -1  63  78 1.000 0 33201  9840
- -1  67  67 1.000 0 33201  9435
- -1  52  81 1.000 0 33201 10063
- -1  74  64 1.000 0 33201  7008
- -1  69  57 1.000 0 33201  6864
- -1  93  65 1.000 0 33201  6876
- -1  66  51 1.000 0 33106  2904
- -1  58  69 1.000 0 33201  9476
- -1  79  53 1.000 0 33201  9241
- -1  56  75 1.000 0 33201  9689
- -1  84  52 1.000 0 33201  9215
- -1  68  61 1.000 0 33201  8204
- -1  69  80 1.000 0 33201  9818
- -1  61  61 1.000 0 33106  3945
- -1  51  74 1.000 0 33201  9700
- -1  85  51 1.000 0 33201  9224
- -1  80  51 1.000 0 33201  9249
- -1  66  66 1.000 0 33201  9423
- -1  79  79 1.000 0 33201  9769
- -1  62  62 1.000 0 33106  3925
- -1  83  53 1.000 0 33201  9221
- -1  76  55 1.000 0 33201  9254
- -1  57  68 1.000 0 33201  9490
- -1  79  51 1.000 0 33201  9250
- -1  54  34 1.000 0 33106  3568
- -1  51  75 1.000 0 33201  9690
- -1  55  71 1.000 0 33201  9712
- -1  80  62 1.000 0 33201  6965
- -1  83  54 1.000 0 33201  9237
- -1  81  86 1.000 0 33106  4144
- -1  62  65 1.000 0 33106  3938
- -1  57   5 1.000 0 33201  6872
- -1  83  27 1.000 0 33201  9126
- -1  90  39 1.000 0 33201  9140
- -1  59  68 1.000 0 33201  9492
- -1  68  75 1.000 0 33201  9611
- -1  83  86 1.000 0 33106  4137
- -1  54   3 1.000 0 33106  3490
- -1  52  74 1.000 0 33201  9705
- -1  60  75 1.000 0 33201  9688
- -1  69  52 1.000 0 33106  2932
- -1  75   6 1.000 0 33106  3816
- -1  68  57 1.000 0 33201  6865
- -1  76  63 1.000 0 33201  6987
- -1  70  54 1.000 0 33106  2905
- -1  82  86 1.000 0 33106  4142
- -1  59  74 1.000 0 33201  9681
- -1  94  65 1.000 0 33201  6875
- -1  69  51 1.000 0 33106  2897
- -1  56  69 1.000 0 33201  9474
- -1  66  53 1.000 0 33106  2929
- -1  64  97 1.000 0 33106  4203
- -1  66  57 1.000 0 33201  6867
- -1  55  99 1.000 0 33201 10291
- -1  68  51 1.000 0 33106  2901
- -1  72  58 1.000 0 33201  6824
- -1  94  73 1.000 0 33106  4100
- -1  69  64 1.000 0 33201  8071
- -1  71  57 1.000 0 33201  6832
- -1  69  79 1.000 0 33201  9831
- -1  95  75 1.000 0 33106  4084
- -1  40   5 1.000 0 33201 11904
- -1  16  34 1.000 0 33201 10695
- -1  10  66 1.000 0 30399   315
- -1   6  27 1.000 0 33106  4376
- -1  10  35 1.000 0 30399   199
- -1   9  35 1.000 0 30399   181
- -1   5  65 1.000 0 33106  4500
- -1  10  33 1.000 0 30399   201
- -1   9  66 1.000 0 30399   329
- -1   9  68 1.000 0 30399   323
- -1  10  68 1.000 0 30399   309
- -1   8  34 1.000 0 30399   175
- -1   6  35 1.000 0 30399   200
- -1  20  34 1.000 0 33201 10693
- -1   7  66 1.000 0 30399   345
- -1   7  35 1.000 0 30399   178
- -1   8  35 1.000 0 30399   180
- -1   9  67 1.000 0 30399   325
- -1   8  66 1.000 0 30399   338
- -1  11  26 1.000 0 33201 10879
- -1  30  28 1.000 0 33201 10979
- -1   7  34 1.000 0 30399   194
- -1   6  31 1.000 0 30399   187
- -1  47  70 1.000 0 33201 11607
- -1   8  68 1.000 0 30399   339
- -1  49   4 1.000 0 33201 11179
- -1   6  34 1.000 0 30399   188
- -1  17  34 1.000 0 33201 10696
- -1   7  67 1.000 0 30399   354
- -1   6  32 1.000 0 30399   177
- -1   8  31 1.000 0 30399   192
- -1  14  26 1.000 0 33201 10897
- -1   6  68 1.000 0 30399   287
- -1   9  31 1.000 0 30399   179
- -1   7  69 1.000 0 30399   349
- -1  28  30 1.000 0 33201 10964
- -1   3  57 1.000 0 33201  7767
- -1  35   7 1.000 0 33201 11154
- -1  32   6 1.000 0 33201  7962
- -1   8  70 1.000 0 30399   331
- -1  11  34 1.000 0 33201 10676
- -1   7  68 1.000 0 30399   357
- -1  10  70 1.000 0 30399   297
- -1   8  69 1.000 0 30399   333
- -1  11  29 1.000 0 33201 10887
- -1  14  28 1.000 0 33201 10875
- -1  26  27 1.000 0 33201 10974
- -1  10  69 1.000 0 30399   301
- -1   9  32 1.000 0 30399   198
- -1  10  34 1.000 0 30399   186
- -1   9  69 1.000 0 30399   319
- -1  31   6 1.000 0 33201  7966
- -1  11  30 1.000 0 33201 10873
- -1  10  32 1.000 0 30399   185
- -1  41  95 1.000 0 33201 11754
- -1   7  70 1.000 0 30399   348
- -1  39  48 1.000 0 33106  4233
- -1  10  31 1.000 0 30399   202
- -1   9  33 1.000 0 30399   176
- -1   5  64 1.000 0 33106  4534
- -1  27  27 1.000 0 33201 10973
- -1  33   6 1.000 0 33201  7958
- -1   9  70 1.000 0 30399   324
- -1   6  69 1.000 0 30399   280
- -1   8  32 1.000 0 30399   195
- -1   7  31 1.000 0 30399   203
- -1  30  27 1.000 0 33201 10970
- -1   6  70 1.000 0 30399   279
- -1   8  67 1.000 0 30399   334
- -1   7  32 1.000 0 30399   184
- -1   6  33 1.000 0 30399   183
- -1  29  27 1.000 0 33201 10971
- -1  15  30 1.000 0 33201 10872
- -1   8  33 1.000 0 30399   190
- -1   9  34 1.000 0 30399   174
- -1   7  33 1.000 0 30399   191
- -1  28  27 1.000 0 33201 10972
- -1  31   9 1.000 0 33201  7847
- -1   6  66 1.000 0 30399   294
- -1  10  67 1.000 0 30399   311
- -1  26  29 1.000 0 33201 10969
- -1  27  29 1.000 0 33201 10968
- -1   6  67 1.000 0 30399   292
- -1  34   9 1.000 0 33201  7825
- -1  38  48 1.000 0 33106  4230
- -1  21  11 1.000 0 33201 11051
- -1  45   8 1.000 0 33201  7582
- -1  21  13 1.000 0 33201 11114
- -1  11  22 1.000 0 33106  4277
- -1  22  44 1.000 0 33201 10446
- -1  45  70 1.000 0 33201  7708
- -1  41   8 1.000 0 33201  7577
- -1  43   7 1.000 0 33201  7555
- -1  42   7 1.000 0 33201  7554
- -1  23  11 1.000 0 33201 11063
- -1  24  11 1.000 0 33201 11050
- -1  41   7 1.000 0 33201  7553
- -1  45   5 1.000 0 33201 10826
- -1  41   5 1.000 0 33201 10817
- -1  44   5 1.000 0 33201 10814
- -1  42   5 1.000 0 33201 10809
- -1  44  70 1.000 0 33201  7718
- -1  36  15 1.000 0 33201 11545
- -1  23  90 1.000 0 33201 11362
- -1  44  68 1.000 0 33201  7720
- -1  38  91 1.000 0 33201 11792
- -1  37  27 1.000 0 33201  7754
- -1  38  27 1.000 0 33201  7755
- -1  48  78 1.000 0 33201 11629
- -1  31  83 1.000 0 33201 11465
- -1  43  68 1.000 0 33201  7727
- -1  34  11 1.000 0 33201  7517
- -1  36  12 1.000 0 33201 11551
- -1  50  81 1.000 0 33201 11658
- -1  42   8 1.000 0 33201  7579
- -1  16  35 1.000 0 33201 10710
- -1  16  33 1.000 0 33201 10705
- -1  19  33 1.000 0 33201 10706
- -1  23  12 1.000 0 33201 10914
- -1  31   8 1.000 0 33201  7848
- -1  23  84 1.000 0 33201 11300
- -1  18  31 1.000 0 33201 10725
- -1  18  32 1.000 0 33201 10721
- -1  17  32 1.000 0 33201 10722
- -1   3  42 1.000 0 33201 10571
- -1  20  33 1.000 0 33201 10704
- -1  19  35 1.000 0 33201 10728
- -1  16  31 1.000 0 33201 10727
- -1  16  16 1.000 0 33201  7420
- -1  16  32 1.000 0 33201 10720
- -1   1  42 1.000 0 33201 10584
- -1  11  32 1.000 0 33201 10682
- -1  19  16 1.000 0 33201  7405
- -1  18  16 1.000 0 33201  7409
- -1  12  35 1.000 0 33201 10713
- -1  14  31 1.000 0 33201 10715
- -1  19  31 1.000 0 33201 10724
- -1  43  95 1.000 0 33201 11795
- -1  21  12 1.000 0 33201 10931
- -1  11  35 1.000 0 33201 10716
- -1  17  16 1.000 0 33201  7410
- -1  19  32 1.000 0 33201 10718
- -1  24  15 1.000 0 33201 10993
- -1  26  28 1.000 0 33201 10978
- -1  20  32 1.000 0 33201 10719
- -1  25  15 1.000 0 33201 10984
- -1  17  31 1.000 0 33201 10726
- -1  25  12 1.000 0 33201 10933
- -1  22  15 1.000 0 33201 11015
- -1  14  35 1.000 0 33201 10717
- -1  20  16 1.000 0 33201  7406
- -1  14  32 1.000 0 33201 10678
- -1   5  44 1.000 0 33201 10657
- -1  12  26 1.000 0 33201 10898
- -1  13  32 1.000 0 33201 10679
- -1  21  15 1.000 0 33201 10935
- -1  29  28 1.000 0 33201 10977
- -1  12  32 1.000 0 33201 10680
- -1  35   9 1.000 0 33201  7824
- -1  22  12 1.000 0 33201 10878
- -1  23  15 1.000 0 33201 11001
- -1  15  29 1.000 0 33201 10889
- -1  43   8 1.000 0 33201  7580
- -1   5  36 1.000 0 33106  4553
- -1  29  83 1.000 0 33201 11335
- -1  49  98 1.000 0 33201 11480
- -1   3  58 1.000 0 33201  7771
- -1  10  23 1.000 0 33106  4422
- -1  10  73 1.000 0 33201 11484
- -1   5  62 1.000 0 33106  4590
- -1  28  29 1.000 0 33201 10967
- -1  41   6 1.000 0 33201  7569
- -1  11  24 1.000 0 33106  4201
- -1  13  22 1.000 0 33106  4264
- -1  15  22 1.000 0 33106  4262
- -1  14  22 1.000 0 33106  4263
- -1  44   7 1.000 0 33201  7557
- -1  15  24 1.000 0 33106  4207
- -1  47   3 1.000 0 33201 11256
- -1  12  22 1.000 0 33106  4273
- -1  49  96 1.000 0 33201 11482
- -1   4  44 1.000 0 33201 10642
- -1  45   7 1.000 0 33201  7558
- -1   4  54 1.000 0 33201  7464
- -1  50   2 1.000 0 33201 11363
- -1  22  11 1.000 0 33201 11064
- -1  17  19 1.000 0 33201  7301
- -1  12  25 1.000 0 33106  4221
- -1  14  25 1.000 0 33106  4281
- -1  31  11 1.000 0 33201  7514
- -1  32  15 1.000 0 33201  7520
- -1  41   1 1.000 0 33201 10749
- -1  36  10 1.000 0 33201  7536
- -1  43   5 1.000 0 33201 10802
- -1   4  40 1.000 0 33106  4641
- -1  42   1 1.000 0 33201 10789
- -1  25  13 1.000 0 33201 11066
- -1  35  15 1.000 0 33201  7524
- -1  35  12 1.000 0 33201  7508
- -1  30  82 1.000 0 33201 11330
- -1  33  12 1.000 0 33201  7505
- -1  43   1 1.000 0 33201 10768
- -1  21  83 1.000 0 33201 11327
- -1  38  10 1.000 0 33201  7539
- -1  25  11 1.000 0 33201 11021
- -1  44  34 1.000 0 33201 10857
- -1  17  40 1.000 0 33201 10568
- -1  37  39 1.000 0 33106  4290
- -1  44  86 1.000 0 33201  7463
- -1  33  50 1.000 0 33106  4224
- -1  42  16 1.000 0 33201  7426
- -1  24  17 1.000 0 33201  7322
- -1  25  29 1.000 0 33201 11105
- -1  48   2 1.000 0 33201 11333
- -1  24  28 1.000 0 33201 11115
- -1  47   5 1.000 0 33201 11228
- -1  15  18 1.000 0 33106  4442
- -1  30  29 1.000 0 33201 10965
- -1   4  37 1.000 0 33106  4441
- -1  34   7 1.000 0 33201 11151
- -1  20  39 1.000 0 33201 10567
- -1  17  28 1.000 0 33201 10901
- -1  32  50 1.000 0 33106  4223
- -1  21  84 1.000 0 33201 11326
- -1  19  39 1.000 0 33201 10566
- -1   6  39 1.000 0 33201 10938
- -1  42  67 1.000 0 33201  7706
- -1  32   7 1.000 0 33201  7971
- -1   5  42 1.000 0 33201 10541
- -1  50   4 1.000 0 33201 11184
- -1  27  28 1.000 0 33201 10975
- -1  23  19 1.000 0 33201  7325
- -1  33   9 1.000 0 33201  7831
- -1  50   3 1.000 0 33201 11266
- -1  39  75 1.000 0 33201  7874
- -1  42  99 1.000 0 33201 11853
- -1  20  28 1.000 0 33201 10904
- -1   2  58 1.000 0 33201  7501
- -1  36  46 1.000 0 33106  4238
- -1   1  43 1.000 0 33201 10699
- -1  20  27 1.000 0 33201 10905
- -1  14  82 1.000 0 33106  4466
- -1  16  27 1.000 0 33201 10909
- -1  47   8 1.000 0 33201 11569
- -1  50  80 1.000 0 33201 11640
- -1  37  81 1.000 0 33201 11713
- -1  45  95 1.000 0 33201 11822
- -1  40  75 1.000 0 33201  7886
- -1  37  75 1.000 0 33201  7879
- -1  47   7 1.000 0 33201 11583
- -1   4  41 1.000 0 33201  7979
- -1   9  30 1.000 0 33106  4412
- -1  41  71 1.000 0 33201  7917
- -1  11  27 1.000 0 33201 10894
- -1  27  95 1.000 0 33201 11413
- -1  37  17 1.000 0 33201  7401
- -1  37  49 1.000 0 33106  4239
- -1  40  74 1.000 0 33201  7888
- -1  25  50 1.000 0 33201 10290
- -1  48   4 1.000 0 33201 11158
- -1  31  87 1.000 0 33201  7285
- -1  15  71 1.000 0 33201  7952
- -1  29  23 1.000 0 33201  7174
- -1  17  21 1.000 0 33201  7683
- -1  22  28 1.000 0 33201 11117
- -1  32  10 1.000 0 33201  7887
- -1  25  92 1.000 0 33201 11902
- -1  50  91 1.000 0 33201 11863
- -1  15  76 1.000 0 33201 11711
- -1  15  65 1.000 0 33201  7934
- -1  28  91 1.000 0 33201 11405
- -1  31  49 1.000 0 33106  4215
- -1  24  43 1.000 0 33201 10457
- -1  49  97 1.000 0 33201 11481
- -1  31  86 1.000 0 33201  7286
- -1  14  73 1.000 0 33201  7864
- -1  48  76 1.000 0 33201 11628
- -1   4  53 1.000 0 33201  7458
- -1  15  73 1.000 0 33201  7846
- -1  47  95 1.000 0 33201 11670
- -1  15  61 1.000 0 33201  7938
- -1  37   7 1.000 0 33201  7532
- -1  22  20 1.000 0 33201  7309
- -1  20  81 1.000 0 33201 11791
- -1  19  82 1.000 0 33201 11740
- -1  27  22 1.000 0 33201  7156
- -1  37  18 1.000 0 33201  7395
- -1  29  76 1.000 0 33201 11217
- -1  36  32 1.000 0 33201 10828
- -1  33  86 1.000 0 33201  7280
- -1  46   5 1.000 0 33201 11209
- -1  16  17 1.000 0 33201  7282
- -1  11  65 1.000 0 33201  7946
- -1   2  42 1.000 0 33201 10579
- -1  14  61 1.000 0 33201  7933
- -1  18  85 1.000 0 33201 11592
- -1  15  63 1.000 0 33201  7936
- -1  18  81 1.000 0 33201 11736
- -1  15  62 1.000 0 33201  7937
- -1  27  23 1.000 0 33201  7176
- -1  22  29 1.000 0 33201 11098
- -1  42  12 1.000 0 33201  7226
- -1  16  81 1.000 0 33201 11709
- -1  12  64 1.000 0 33201  7950
- -1  14  64 1.000 0 33201  7930
- -1  12  62 1.000 0 33201  7954
- -1  24  47 1.000 0 33201 10293
- -1  31  90 1.000 0 33201  7281
- -1  18  39 1.000 0 33201 10565
- -1  20  37 1.000 0 33201 10574
- -1  21  27 1.000 0 33201 11092
- -1  17  82 1.000 0 33201 11661
- -1   3  53 1.000 0 33201  7655
- -1  24  56 1.000 0 30399   606
- -1  17  25 1.000 0 33201  7677
- -1  41  13 1.000 0 33201  7231
- -1  14  63 1.000 0 33201  7931
- -1  10  22 1.000 0 33106  4420
- -1  12  63 1.000 0 33201  7953
- -1  19  85 1.000 0 33201 11756
- -1  28  40 1.000 0 33201 10987
- -1   5  61 1.000 0 33106  4632
- -1  17  81 1.000 0 33201 11681
- -1  21  28 1.000 0 33201 11113
- -1  16  82 1.000 0 33201 11708
- -1   8  37 1.000 0 33201 10930
- -1  28   9 1.000 0 33106  3153
- -1  19  84 1.000 0 33201 11753
- -1  39  80 1.000 0 33201 12017
- -1   9  21 1.000 0 33106  4423
- -1   7  72 1.000 0 33201 11403
- -1  50   5 1.000 0 33201 11247
- -1   7  59 1.000 0 33201  7617
- -1  14  80 1.000 0 33201 11603
- -1  24  62 1.000 0 30399   722
- -1  39  20 1.000 0 33201  7386
- -1  36  34 1.000 0 33201 10844
- -1  37  71 1.000 0 33201  7885
- -1  50  79 1.000 0 33201 11643
- -1  16  83 1.000 0 33201 11694
- -1  39  73 1.000 0 33201  7876
- -1  42  75 1.000 0 33201  7918
- -1  15  64 1.000 0 33201  7935
- -1  31  89 1.000 0 33201  7283
- -1  25  47 1.000 0 33201 10292
- -1  22  50 1.000 0 33201 10287
- -1  38  21 1.000 0 33201 11497
- -1  46  25 1.000 0 33201  7795
- -1  23  47 1.000 0 33201 10294
- -1  21  50 1.000 0 33201 10286
- -1  23  50 1.000 0 33201 10288
- -1  14  65 1.000 0 33201  7929
- -1  26  23 1.000 0 33201  7177
- -1  11  64 1.000 0 33201  7947
- -1  24  65 1.000 0 30399   667
- -1  25  65 1.000 0 30399   724
- -1  43  33 1.000 0 33201 10849
- -1  39  47 1.000 0 33106  4236
- -1  35  87 1.000 0 33201  7293
- -1  15  77 1.000 0 33201 11732
- -1  41  16 1.000 0 33201  7425
- -1   7  57 1.000 0 33201  7620
- -1   7  58 1.000 0 33201  7618
- -1  36  47 1.000 0 33106  4229
- -1  24  25 1.000 0 33201  7149
- -1  41   3 1.000 0 33201 10737
- -1  38  93 1.000 0 33201 11788
- -1  38   8 1.000 0 33201  7544
- -1  40   6 1.000 0 33201  7530
- -1  40  18 1.000 0 33201  7399
- -1  37   8 1.000 0 33201  7543
- -1  48  23 1.000 0 33201  7802
- -1  50  10 1.000 0 33201 11575
- -1  38   6 1.000 0 33201  7527
- -1  39   8 1.000 0 33201  7545
- -1  43  34 1.000 0 33201 10859
- -1  45   3 1.000 0 33201 10709
- -1   2  51 1.000 0 33201  7689
- -1  45  76 1.000 0 33201 11278
- -1  48   3 1.000 0 33201 11258
- -1  45  92 1.000 0 33201 11815
- -1  19  42 1.000 0 33201 10425
- -1  17  44 1.000 0 33201 10416
- -1  23  49 1.000 0 33201 10301
- -1  26  93 1.000 0 33201 11418
- -1  47  11 1.000 0 33201 10607
- -1  49  11 1.000 0 33201 10609
- -1  46   1 1.000 0 33201 11186
- -1  24  29 1.000 0 33201 11106
- -1   7  63 1.000 0 33201  7829
- -1  42  71 1.000 0 33201  7922
- -1  33  32 1.000 0 33201 10796
- -1  33   7 1.000 0 33201 11150
- -1  46  12 1.000 0 33201 10591
- -1  45  86 1.000 0 33201  7469
- -1  20  25 1.000 0 33201  7681
- -1  50  13 1.000 0 33201 10606
- -1   9  63 1.000 0 33201  7817
- -1   9  64 1.000 0 33201  7816
- -1   9  65 1.000 0 33201  7815
- -1  39  24 1.000 0 33201 11523
- -1  41  69 1.000 0 33201  7714
- -1  26  84 1.000 0 33201 11219
- -1   6  50 1.000 0 33201 10225
- -1  41  68 1.000 0 33201  7715
- -1   9  61 1.000 0 33201  7819
- -1  42  80 1.000 0 33201 11276
- -1  36  63 1.000 0 33106  2315
- -1  20  22 1.000 0 33201  7697
- -1  36  64 1.000 0 33106  2317
- -1  48  13 1.000 0 33201 10599
- -1  35   6 1.000 0 33201  7944
- -1  15  78 1.000 0 33201 11717
- -1   4  55 1.000 0 33201  7456
- -1   9  62 1.000 0 33201  7818
- -1  38  81 1.000 0 33201 11707
- -1  39  76 1.000 0 33201 11294
- -1  24  36 1.000 0 33201 10619
- -1  50  14 1.000 0 33201 10602
- -1  18  86 1.000 0 33106  4566
- -1  19  37 1.000 0 33201 10575
- -1  41  81 1.000 0 33201  8559
- -1  40  21 1.000 0 33201 11500
- -1   7  65 1.000 0 33201  7827
- -1  16  21 1.000 0 33201  7682
- -1  47   4 1.000 0 33201 11157
- -1  37  84 1.000 0 33201 11716
- -1  42  76 1.000 0 33201 11273
- -1  15  79 1.000 0 33201 11712
- -1  18  25 1.000 0 33201  7678
- -1  21  36 1.000 0 33201 10621
- -1  25  60 1.000 0 30399   598
- -1  21  60 1.000 0 30399   674
- -1  39  35 1.000 0 33201 10837
- -1  27  79 1.000 0 33201 11205
- -1  13  63 1.000 0 33201  7942
- -1  45  25 1.000 0 33201  7788
- -1  24  50 1.000 0 33201 10289
- -1  47  23 1.000 0 33201  7801
- -1  23  60 1.000 0 30399   614
- -1  25  59 1.000 0 30399   846
- -1  48  86 1.000 0 33201 11770
- -1  23  56 1.000 0 30399   734
- -1  47 100 1.000 0 33201 11472
- -1  20  21 1.000 0 33201  7686
- -1  19  25 1.000 0 33201  7679
- -1  49  24 1.000 0 33201  7813
- -1  23  30 1.000 0 33201 11108
- -1  21  57 1.000 0 30399   669
- -1  39  74 1.000 0 33201  7875
- -1  21  91 1.000 0 33201 11858
- -1  44  21 1.000 0 33201  7765
- -1  15  72 1.000 0 33201  7849
- -1  42  25 1.000 0 33201  7785
- -1  41  96 1.000 0 33201 11840
- -1  45  71 1.000 0 33201  7912
- -1  15  80 1.000 0 33201 11596
- -1  24  60 1.000 0 30399   613
- -1  43  21 1.000 0 33201  7763
- -1   8  74 1.000 0 33201 11367
- -1  26  40 1.000 0 33201 10989
- -1  21  30 1.000 0 33201 11104
- -1   9  74 1.000 0 33201 11442
- -1  14  72 1.000 0 33201  7865
- -1  27  85 1.000 0 33201 11208
- -1  29  40 1.000 0 33201 10988
- -1  38   7 1.000 0 33201  7533
- -1  27  78 1.000 0 33201 11204
- -1  42  73 1.000 0 33201  7920
- -1  42  74 1.000 0 33201  7919
- -1  13  62 1.000 0 33201  7943
- -1  28  21 1.000 0 33201  7186
- -1  45  66 1.000 0 33201  7712
- -1  27  76 1.000 0 33201 11201
- -1  27  80 1.000 0 33201 11206
- -1  10  40 1.000 0 33201 10944
- -1  19  83 1.000 0 33201 11737
- -1  20  85 1.000 0 33201 11817
- -1  42  72 1.000 0 33201  7921
- -1  20  26 1.000 0 33201 10917
- -1  19  81 1.000 0 33201 11748
- -1  12  73 1.000 0 33201  7854
- -1  44  72 1.000 0 33201  7927
- -1  50  78 1.000 0 33201 11644
- -1  42  89 1.000 0 33201  7453
- -1  39  72 1.000 0 33201  7877
- -1  44  71 1.000 0 33201  7928
- -1  27  77 1.000 0 33201 11202
- -1  14  62 1.000 0 33201  7932
- -1  18  22 1.000 0 33201  7695
- -1  41  63 1.000 0 30399   804
- -1  23  29 1.000 0 33201 11107
- -1  16  85 1.000 0 33201 11690
- -1  28  69 1.000 0 33201   168
- -1  18  37 1.000 0 33201 10576
- -1  41  61 1.000 0 30399   891
- -1  30  69 1.000 0 33201   187
- -1  29  61 1.000 0 33201   232
- -1  17  68 1.000 0 30399   756
- -1   8  26 1.000 0 33106  4346
- -1  40  85 1.000 0 33201 11728
- -1  26  61 1.000 0 33201   262
- -1  35  95 1.000 0 33201  6723
- -1  45  63 1.000 0 30399   688
- -1  16  70 1.000 0 30399   779
- -1  22  74 1.000 0 30399   557
- -1  35  94 1.000 0 33201  6724
- -1  27  89 1.000 0 33201 11196
- -1  47  92 1.000 0 33201 11673
- -1  20  80 1.000 0 33201 11081
- -1  14  60 1.000 0 33201  7653
- -1  24  48 1.000 0 33201 10306
- -1  38  83 1.000 0 33201 11704
- -1  27  90 1.000 0 33201 11195
- -1  20  79 1.000 0 33201 11082
- -1  47  90 1.000 0 33201 11746
- -1  29  24 1.000 0 33201  7145
- -1  11  56 1.000 0 33201  7652
- -1  16  25 1.000 0 33201  7676
- -1  26  95 1.000 0 33201 11419
- -1  18  76 1.000 0 33201 11149
- -1  21  43 1.000 0 33201 10453
- -1  30  21 1.000 0 33201  7188
- -1  17  83 1.000 0 33201 11655
- -1   6  57 1.000 0 33201  7614
- -1  18  79 1.000 0 33201 11089
- -1  29  19 1.000 0 33201  7303
- -1  31  15 1.000 0 33201  7519
- -1  23  79 1.000 0 33201 11376
- -1  43  25 1.000 0 33201  7786
- -1  43  22 1.000 0 33201  7781
- -1  48  87 1.000 0 33201 11786
- -1  24  72 1.000 0 30399   495
- -1  26  87 1.000 0 33201 11175
- -1  18  80 1.000 0 33201 11088
- -1  21  71 1.000 0 30399   539
- -1   4  62 1.000 0 33106  4473
- -1  24  74 1.000 0 30399   492
- -1  39  10 1.000 0 33201  7540
- -1  33  15 1.000 0 33201  7522
- -1  18  70 1.000 0 30399   527
- -1  18  67 1.000 0 30399   517
- -1  19  79 1.000 0 33201 11162
- -1  21  72 1.000 0 30399   540
- -1  19  67 1.000 0 30399   736
- -1  23  75 1.000 0 30399   528
- -1  41  12 1.000 0 33201  7225
- -1  23  71 1.000 0 30399   538
- -1  21  73 1.000 0 30399   541
- -1  33  48 1.000 0 33106  3716
- -1  19  69 1.000 0 30399   740
- -1  22  82 1.000 0 33201 11322
- -1  16  19 1.000 0 33201  7299
- -1  21  74 1.000 0 30399   547
- -1  17  66 1.000 0 30399   758
- -1  21  75 1.000 0 30399   548
- -1  30  64 1.000 0 33201   259
- -1  19  66 1.000 0 30399   712
- -1  17  67 1.000 0 30399   744
- -1  30  93 1.000 0 33201 11425
- -1  22  81 1.000 0 33201 11323
- -1  41  64 1.000 0 30399   678
- -1  50 100 1.000 0 33201 11483
- -1  16  43 1.000 0 33201 10412
- -1  14  57 1.000 0 33201  7660
- -1  26  80 1.000 0 33201 11210
- -1  28  94 1.000 0 33201 11404
- -1  26  91 1.000 0 33201 11431
- -1  17  30 1.000 0 33201 10922
- -1  19  70 1.000 0 30399   742
- -1  24  80 1.000 0 33201 11402
- -1  24  79 1.000 0 33201 11401
- -1  27  81 1.000 0 33201 11166
- -1  25  49 1.000 0 33201 10299
- -1  22  48 1.000 0 33201 10308
- -1  24  77 1.000 0 33201 11399
- -1  46  86 1.000 0 33201 11735
- -1   7  27 1.000 0 33106  4368
- -1  41  24 1.000 0 33201  7774
- -1   8  27 1.000 0 33106  4370
- -1  42  83 1.000 0 33201  8555
- -1  42  85 1.000 0 33201  8572
- -1  42  84 1.000 0 33201  8557
- -1  41  82 1.000 0 33201  8560
- -1  43  84 1.000 0 33201  8571
- -1  42  82 1.000 0 33201  8554
- -1  41  85 1.000 0 33201  8558
- -1   2  44 1.000 0 33201 10635
- -1  47  98 1.000 0 33201 11474
- -1  43  75 1.000 0 33201  7903
- -1   5  60 1.000 0 33201  7635
- -1  47  89 1.000 0 33201 11742
- -1  38  63 1.000 0 33106  2304
- -1  36  48 1.000 0 33106  4241
- -1  40  62 1.000 0 33106  2324
- -1   3  46 1.000 0 33201 10343
- -1   5  47 1.000 0 33201 10407
- -1  40  19 1.000 0 33201  7413
- -1  25  48 1.000 0 33201 10305
- -1  50  22 1.000 0 33201  7809
- -1  14  59 1.000 0 33201  7654
- -1  21  49 1.000 0 33201 10298
- -1  11  57 1.000 0 33201  7651
- -1   6  65 1.000 0 33201  7838
- -1  12  51 1.000 0 33201  7609
- -1  35  42 1.000 0 33201 10495
- -1  23  73 1.000 0 30399   530
- -1  17  80 1.000 0 33201 11152
- -1  38  85 1.000 0 33201 11705
- -1  23  48 1.000 0 33201 10307
- -1  40  10 1.000 0 33201  7541
- -1  12  74 1.000 0 33201  7853
- -1  40  73 1.000 0 33201  7889
- -1  29  88 1.000 0 33201 11191
- -1  29  86 1.000 0 33201 11193
- -1  24  76 1.000 0 33201 11400
- -1  28  93 1.000 0 33201 11421
- -1  25  71 1.000 0 30399   476
- -1  49 100 1.000 0 33201 11477
- -1  40  36 1.000 0 33106  4261
- -1  25  75 1.000 0 30399   491
- -1  25  74 1.000 0 30399   487
- -1  23  72 1.000 0 30399   536
- -1  18  66 1.000 0 30399   504
- -1  22  49 1.000 0 33201 10303
- -1  26  92 1.000 0 33201 11429
- -1  37  10 1.000 0 33201  7538
- -1  19  77 1.000 0 33201 11164
- -1  18  68 1.000 0 30399   519
- -1  25  73 1.000 0 30399   484
- -1  26  94 1.000 0 33201 11432
- -1  34  48 1.000 0 33106  3693
- -1  35  48 1.000 0 33106  3685
- -1  25  72 1.000 0 30399   481
- -1  24  73 1.000 0 30399   493
- -1  24  75 1.000 0 30399   520
- -1  39  71 1.000 0 33201  7878
- -1  42  24 1.000 0 33201  7775
- -1  16  22 1.000 0 33201  7693
- -1   6  56 1.000 0 33201  7615
- -1  17  84 1.000 0 33201 11652
- -1  23  74 1.000 0 30399   529
- -1  19  80 1.000 0 33201 11161
- -1  25  83 1.000 0 33201 11313
- -1  50  67 1.000 0 33201 11585
- -1  24  71 1.000 0 30399   566
- -1  17  70 1.000 0 30399   748
- -1  23  78 1.000 0 33201 11378
- -1  39  13 1.000 0 33201 11532
- -1  49   3 1.000 0 33201 11261
- -1  45  24 1.000 0 33201  7778
- -1  39  15 1.000 0 33201 11549
- -1  42  23 1.000 0 33201  7769
- -1  18  78 1.000 0 33201 11090
- -1  17  22 1.000 0 33201  7694
- -1  27  88 1.000 0 33201 11197
- -1  28  89 1.000 0 33201 11181
- -1  16  78 1.000 0 33201 11077
- -1  37  58 1.000 0 30399   582
- -1  11  39 1.000 0 33201 10558
- -1  43  96 1.000 0 33201 11848
- -1  29  87 1.000 0 33201 11192
- -1  11  59 1.000 0 33201  7648
- -1  20  43 1.000 0 33201 10411
- -1  12  54 1.000 0 33201  7605
- -1  45  74 1.000 0 33201  7909
- -1  24  49 1.000 0 33201 10300
- -1  42  18 1.000 0 33201  7415
- -1  40  71 1.000 0 33201  7891
- -1  50   9 1.000 0 33201 11557
- -1  12  53 1.000 0 33201  7607
- -1  13  37 1.000 0 33201 10546
- -1  12  52 1.000 0 33201  7608
- -1  11  60 1.000 0 33201  7647
- -1  37  74 1.000 0 33201  7880
- -1   9  27 1.000 0 33106  4405
- -1  49  90 1.000 0 33201 11771
- -1  48   5 1.000 0 33201 11229
- -1  49  89 1.000 0 33201 11772
- -1  28  92 1.000 0 33201 11407
- -1  22  61 1.000 0 30399   731
- -1  14  58 1.000 0 33201  7657
- -1  27   8 1.000 0 33106  4300
- -1  29   8 1.000 0 33106  4309
- -1   2  50 1.000 0 33201 10443
- -1  13  36 1.000 0 33201 10550
- -1   6  58 1.000 0 33201  7612
- -1  17  85 1.000 0 33201 11657
- -1  38  14 1.000 0 33201 11529
- -1   2  53 1.000 0 33201  7725
- -1  41 100 1.000 0 33201 11839
- -1  26  89 1.000 0 33201 11173
- -1  21  87 1.000 0 33201 11345
- -1  17  78 1.000 0 33201 11156
- -1  31  33 1.000 0 33201 10788
- -1  43  93 1.000 0 33201 11797
- -1  24  84 1.000 0 33201 11305
- -1  46  23 1.000 0 33201  7800
- -1  45  21 1.000 0 33201  7766
- -1  24  61 1.000 0 30399   819
- -1  18  19 1.000 0 33201  7302
- -1  50  24 1.000 0 33201  7814
- -1  41  97 1.000 0 33201 11841
- -1  44  23 1.000 0 33201  7772
- -1  14  41 1.000 0 33201 10399
- -1  45  96 1.000 0 33201 11838
- -1   8  28 1.000 0 33106  4321
- -1  14  85 1.000 0 33106  4456
- -1  45  23 1.000 0 33201  7773
- -1  41  22 1.000 0 33201  7779
- -1  42  22 1.000 0 33201  7780
- -1  24  83 1.000 0 33201 11307
- -1   4  48 1.000 0 33201 10379
- -1  22  53 1.000 0 30399   777
- -1  23  51 1.000 0 30399   749
- -1  45   2 1.000 0 33201 10876
- -1  36  81 1.000 0 33201 11765
- -1  42  91 1.000 0 33201 11802
- -1  39  11 1.000 0 33201 11536
- -1  41  84 1.000 0 33201  8561
- -1  42  68 1.000 0 33201  7705
- -1  19  55 1.000 0 30399   684
- -1  30  65 1.000 0 33201   264
- -1  38  94 1.000 0 33201 11793
- -1  38  56 1.000 0 30399   574
- -1  37  15 1.000 0 33201 11546
- -1  14  39 1.000 0 33201 10561
- -1  23  61 1.000 0 30399   814
- -1  19  51 1.000 0 30399   796
- -1  18  54 1.000 0 30399   813
- -1  18  55 1.000 0 30399   800
- -1  18  52 1.000 0 30399   809
- -1  18  51 1.000 0 30399   801
- -1  50  69 1.000 0 33201 11590
- -1  22  71 1.000 0 30399   550
- -1  22  72 1.000 0 30399   551
- -1  40  83 1.000 0 33201 11731
- -1  22  73 1.000 0 30399   553
- -1  19  53 1.000 0 30399   769
- -1  19  54 1.000 0 30399   706
- -1  50  98 1.000 0 33201 11486
- -1  14  69 1.000 0 33201  8423
- -1  19  52 1.000 0 30399   774
- -1  37  70 1.000 0 33201  6378
- -1  43  85 1.000 0 33201  8567
- -1  43  81 1.000 0 33201  8568
- -1  18  21 1.000 0 33201  7684
- -1  19  21 1.000 0 33201  7685
- -1  43  91 1.000 0 33201 11794
- -1  15  32 1.000 0 33201 10683
- -1  15  37 1.000 0 33201 10542
- -1  44  83 1.000 0 33201  8576
- -1   7  73 1.000 0 33201 11390
- -1  44  84 1.000 0 33201  8577
- -1  20  29 1.000 0 33201 10915
- -1  44  82 1.000 0 33201  8575
- -1  36  33 1.000 0 33201 10822
- -1  46  81 1.000 0 33201 11823
- -1  10  46 1.000 0 33201 10204
- -1  25  55 1.000 0 30399   838
- -1  19  49 1.000 0 33201 10253
- -1  12  36 1.000 0 33201 10549
- -1  26   8 1.000 0 33106  4299
- -1  18  53 1.000 0 30399   810
- -1  46  79 1.000 0 33201 11619
- -1  15  36 1.000 0 33201 10552
- -1  14  36 1.000 0 33201 10551
- -1  47  94 1.000 0 33201 11671
- -1  11  36 1.000 0 33201 10548
- -1  15  39 1.000 0 33201 10562
- -1  16  47 1.000 0 33201 10265
- -1  27  84 1.000 0 33201 11183
- -1  36  94 1.000 0 33201 11781
- -1  49  68 1.000 0 33201 11598
- -1  17  69 1.000 0 30399   746
- -1  22  75 1.000 0 30399   558
- -1  27  83 1.000 0 33201 11176
- -1  19  68 1.000 0 30399   738
- -1  18  69 1.000 0 30399   561
- -1   4  65 1.000 0 33106  4492
- -1  44  87 1.000 0 33201  7462
- -1  43  62 1.000 0 30399   752
- -1  37  69 1.000 0 33201  6383
- -1  38  11 1.000 0 33201 11539
- -1  48  94 1.000 0 33201 11666
- -1   6  51 1.000 0 33201  8076
- -1  39  94 1.000 0 33201 11751
- -1  31  82 1.000 0 33201 11464
- -1  28  68 1.000 0 33201   167
- -1  10  21 1.000 0 33106  4435
- -1  44  92 1.000 0 33201 11806
- -1  35  66 1.000 0 33201   159
- -1  32  70 1.000 0 33201   155
- -1  35  81 1.000 0 33201 11445
- -1  42  96 1.000 0 33201 11855
- -1  17  15 1.000 0 33106  4527
- -1  37  33 1.000 0 33201 10823
- -1  44  95 1.000 0 33201 11808
- -1  43  82 1.000 0 33201  8569
- -1  43  83 1.000 0 33201  8570
- -1  15  83 1.000 0 33106  4463
- -1  26  83 1.000 0 33201 11267
- -1  32  44 1.000 0 33201 11059
- -1  38  33 1.000 0 33201 10824
- -1  45  82 1.000 0 33201  8564
- -1  41  83 1.000 0 33201  8562
- -1  32  69 1.000 0 33201   154
- -1  44  91 1.000 0 33201 11807
- -1  45  83 1.000 0 33201  8563
- -1  30  43 1.000 0 33201 10502
- -1  19  18 1.000 0 33201  7219
- -1  27  43 1.000 0 33201 10505
- -1  34  54 1.000 0 33201    48
- -1  38  15 1.000 0 33201 11550
- -1  32  68 1.000 0 33201   153
- -1  11  31 1.000 0 33201 10685
- -1   4  42 1.000 0 33201 10545
- -1  46  14 1.000 0 33201 10597
- -1  34  15 1.000 0 33201  7535
- -1  11  40 1.000 0 33201 10540
- -1  21  55 1.000 0 30399   848
- -1   2  60 1.000 0 33201  7481
- -1  35  92 1.000 0 33201  6727
- -1  35  91 1.000 0 33201  6728
- -1  45  98 1.000 0 33201 11831
- -1  25  56 1.000 0 30399   843
- -1  22  57 1.000 0 30399   862
- -1  50  90 1.000 0 33201 11824
- -1  24  53 1.000 0 30399   700
- -1  45   4 1.000 0 33201 10847
- -1  10  77 1.000 0 33106  4515
- -1  35  70 1.000 0 33201   175
- -1  19  46 1.000 0 33201 10273
- -1  43  94 1.000 0 33201 11796
- -1  42  65 1.000 0 30399   750
- -1  20  30 1.000 0 33201 10925
- -1  31  70 1.000 0 33201   178
- -1  31  67 1.000 0 33201   162
- -1  20  50 1.000 0 33201 10262
- -1  31  69 1.000 0 33201   165
- -1  22  56 1.000 0 30399   860
- -1  28  52 1.000 0 30399   388
- -1  28  66 1.000 0 33201   166
- -1   9  71 1.000 0 33201 11460
- -1  22  60 1.000 0 30399   866
- -1  13  72 1.000 0 33201  8438
- -1  27  52 1.000 0 30399   563
- -1  29  63 1.000 0 33201   239
- -1  30  77 1.000 0 33201 11230
- -1  49  76 1.000 0 33201 11638
- -1  45  84 1.000 0 33201  8578
- -1   7  36 1.000 0 33201 10949
- -1  30  51 1.000 0 30399   470
- -1  32  54 1.000 0 33201    59
- -1  26  52 1.000 0 30399   411
- -1  47  18 1.000 0 33201  7265
- -1  26  51 1.000 0 30399   403
- -1  27  59 1.000 0 33201    39
- -1  40  91 1.000 0 33201 11764
- -1  22  62 1.000 0 30399   729
- -1  35  59 1.000 0 33201    64
- -1  44  85 1.000 0 33201  8573
- -1  41  15 1.000 0 33201  7212
- -1  22  58 1.000 0 30399   863
- -1  24  54 1.000 0 30399   687
- -1  22  52 1.000 0 30399   780
- -1  37  21 1.000 0 33201 11496
- -1   5  59 1.000 0 33201  7629
- -1   4  57 1.000 0 33201  7578
- -1  24  55 1.000 0 30399   685
- -1  40   7 1.000 0 33201  7860
- -1  28  61 1.000 0 33201   251
- -1  37  93 1.000 0 33201 11812
- -1  29  43 1.000 0 33201 10503
- -1  29  65 1.000 0 33201   240
- -1  26  43 1.000 0 33201 10501
- -1  28  51 1.000 0 30399   386
- -1   1  48 1.000 0 33201 10370
- -1  42  64 1.000 0 30399   770
- -1  23  81 1.000 0 33201 11303
- -1  15  27 1.000 0 33201 10893
- -1  45  85 1.000 0 33201  8566
- -1  27  63 1.000 0 33201   252
- -1  26  81 1.000 0 33201 11332
- -1  44   2 1.000 0 33201 11070
- -1  37  94 1.000 0 33201 11811
- -1  42  81 1.000 0 33201  8553
- -1  48  69 1.000 0 33201 11601
- -1  30  61 1.000 0 33201   244
- -1  29  11 1.000 0 33201  7489
- -1  22  63 1.000 0 30399   725
- -1  28  65 1.000 0 33201   234
- -1  25  53 1.000 0 30399   711
- -1  20  17 1.000 0 33201  7272
- -1  31  44 1.000 0 33201 11060
- -1  15  17 1.000 0 33106  4444
- -1  18  47 1.000 0 33201 10263
- -1  29  62 1.000 0 33201   238
- -1  20  19 1.000 0 33201  7326
- -1  35  69 1.000 0 33201   173
- -1  27  72 1.000 0 30399   916
- -1  10  72 1.000 0 33201 11489
- -1  35  67 1.000 0 33201   164
- -1  24  51 1.000 0 30399   710
- -1  22  64 1.000 0 30399   720
- -1  49  13 1.000 0 33201 10600
- -1  23  53 1.000 0 30399   739
- -1  22  51 1.000 0 30399   785
- -1  16  46 1.000 0 33201 10269
- -1  22  54 1.000 0 30399   776
- -1   5  51 1.000 0 33201  7758
- -1  40  31 1.000 0 33201 10819
- -1  16  72 1.000 0 33201   227
- -1  29  52 1.000 0 30399   559
- -1  17  74 1.000 0 33201   213
- -1  43  61 1.000 0 30399   751
- -1  22  59 1.000 0 30399   864
- -1  30  62 1.000 0 33201   247
- -1  28  64 1.000 0 33201   235
- -1  24  52 1.000 0 30399   702
- -1  16  50 1.000 0 33201 10257
- -1  28  53 1.000 0 30399   390
- -1  29  55 1.000 0 30399   468
- -1  49  88 1.000 0 33201 11769
- -1   3  55 1.000 0 33201  7641
- -1  19  71 1.000 0 33201   206
- -1  40  39 1.000 0 33106  4282
- -1  20  71 1.000 0 33201   201
- -1  16  74 1.000 0 33201   228
- -1  23  52 1.000 0 30399   741
- -1  17  73 1.000 0 33201   223
- -1  26  75 1.000 0 30399   881
- -1  22  65 1.000 0 30399   856
- -1  21  51 1.000 0 30399   827
- -1  38  24 1.000 0 33201 11522
- -1  23  36 1.000 0 33201 10618
- -1  16  73 1.000 0 33201   215
- -1  25  68 1.000 0 30399   573
- -1  23  54 1.000 0 30399   737
- -1  19  20 1.000 0 33201  7383
- -1  31  64 1.000 0 30399   427
- -1  21  14 1.000 0 33201 11311
- -1  25  14 1.000 0 33201 11306
- -1  32  62 1.000 0 30399   440
- -1  21  66 1.000 0 30399   515
- -1  21  70 1.000 0 30399   469
- -1  33  14 1.000 0 33201  7498
- -1  22  67 1.000 0 30399   526
- -1  31  14 1.000 0 33201  7496
- -1  21  67 1.000 0 30399   490
- -1  22  68 1.000 0 30399   483
- -1  35  14 1.000 0 33201  7502
- -1  34  12 1.000 0 33201  7506
- -1  18  17 1.000 0 33201  7291
- -1  23  55 1.000 0 30399   733
- -1  21  69 1.000 0 30399   473
- -1  21  54 1.000 0 30399   835
- -1  44   1 1.000 0 33201 10761
- -1  26  63 1.000 0 33201   261
- -1  16  29 1.000 0 33201 10913
- -1  26  19 1.000 0 33201  7304
- -1  35  63 1.000 0 30399   500
- -1  24  69 1.000 0 30399   590
- -1  36   9 1.000 0 33201  7547
- -1  43  63 1.000 0 30399   754
- -1  26  13 1.000 0 33201  7491
- -1  35  11 1.000 0 33201  7518
- -1  23  69 1.000 0 30399   583
- -1  32  61 1.000 0 30399   441
- -1  25  51 1.000 0 30399   849
- -1  34  42 1.000 0 33201 10498
- -1  23  67 1.000 0 30399   595
- -1  24  14 1.000 0 33201 11287
- -1  46  64 1.000 0 33106  4606
- -1  40   9 1.000 0 33201  7552
- -1  18  18 1.000 0 33201  7237
- -1  45  90 1.000 0 33201  7465
- -1  23  66 1.000 0 30399   578
- -1  31  65 1.000 0 30399   426
- -1  33  61 1.000 0 30399   445
- -1  10  25 1.000 0 33106  4437
- -1  35  65 1.000 0 33201  0000
- -1  35  64 1.000 0 30399   499
- -1  21  53 1.000 0 30399   833
- -1  42  63 1.000 0 30399   768
- -1  21  68 1.000 0 30399   479
- -1  33  62 1.000 0 30399   455
- -1  34  62 1.000 0 30399   457
- -1  34  64 1.000 0 30399   464
- -1  42  62 1.000 0 30399   764
- -1  33  63 1.000 0 30399   450
- -1  32  64 1.000 0 30399   433
- -1  31  61 1.000 0 30399   431
- -1  35  61 1.000 0 30399   501
- -1  31  63 1.000 0 30399   428
- -1  25  57 1.000 0 30399   844
- -1  25  52 1.000 0 30399   852
- -1  37  46 1.000 0 33106  4237
- -1  25  54 1.000 0 30399   853
- -1  42  61 1.000 0 30399   757
- -1  32  63 1.000 0 30399   434
- -1  21  52 1.000 0 30399   832
- -1  33  64 1.000 0 30399   449
- -1  10  55 1.000 0 33201  8089
- -1  31  62 1.000 0 30399   429
- -1  22  55 1.000 0 30399   775
- -1  49   5 1.000 0 33201 11241
- -1  33  65 1.000 0 30399   448
- -1  39  57 1.000 0 30399   689
- -1  39  36 1.000 0 33106  4265
- -1  24  57 1.000 0 30399   608
- -1  41  62 1.000 0 30399   890
- -1  43  65 1.000 0 30399   716
- -1  20  70 1.000 0 30399   831
- -1  25  63 1.000 0 30399   726
- -1  16  67 1.000 0 30399   759
- -1  23  59 1.000 0 30399   616
- -1  34  93 1.000 0 33201  6731
- -1  23  68 1.000 0 30399   617
- -1  25  62 1.000 0 30399   730
- -1  16  69 1.000 0 30399   783
- -1  24  64 1.000 0 30399   714
- -1  24  68 1.000 0 30399   592
- -1  39   9 1.000 0 33201  7550
- -1  22  14 1.000 0 33201 11316
- -1  31  13 1.000 0 33201  7509
- -1  45   1 1.000 0 33201 10756
- -1  24  70 1.000 0 30399   580
- -1  24  66 1.000 0 30399   601
- -1  25  67 1.000 0 30399   575
- -1  24  67 1.000 0 30399   593
- -1  23  70 1.000 0 30399   587
- -1  41  65 1.000 0 30399   676
- -1  32  46 1.000 0 33106  4212
- -1  31  46 1.000 0 33106  3763
- -1  25  70 1.000 0 30399   615
- -1  28  23 1.000 0 33201  7175
- -1  26  53 1.000 0 30399   447
- -1  22  69 1.000 0 30399   496
- -1  22  66 1.000 0 30399   522
- -1  25  66 1.000 0 30399   586
- -1  25  69 1.000 0 30399   579
- -1  22  70 1.000 0 30399   532
- -1  25  58 1.000 0 30399   845
- -1  25  61 1.000 0 30399   728
- -1  32  14 1.000 0 33201  7497
- -1  14  83 1.000 0 33106  4460
- -1  32  40 1.000 0 33201 10666
- -1  32  65 1.000 0 30399   432
- -1  49  15 1.000 0 33201 10615
- -1  50  15 1.000 0 33201 10616
- -1  24  13 1.000 0 33201 11078
- -1  23  13 1.000 0 33201 11109
- -1  34  61 1.000 0 30399   456
- -1  37  38 1.000 0 33106  4280
- -1   5  58 1.000 0 33201  7628
- -1  34  65 1.000 0 30399   466
- -1  30   8 1.000 0 33106  4310
- -1  34  63 1.000 0 30399   458
- -1  27  75 1.000 0 30399   446
- -1  31  75 1.000 0 33201   105
- -1  35  62 1.000 0 30399   502
- -1  27  73 1.000 0 30399   405
- -1  27  74 1.000 0 30399   444
- -1  17  50 1.000 0 33201 10258
- -1  40  97 1.000 0 33201 11927
- -1  31  42 1.000 0 33201 10497
- -1  18  50 1.000 0 33201 10259
- -1  50  97 1.000 0 33201 11487
- -1  30   6 1.000 0 33106  4653
- -1  23  82 1.000 0 33201 11302
- -1  34  74 1.000 0 33201   109
- -1  32  71 1.000 0 33201   180
- -1  34  75 1.000 0 33201   107
- -1  34  71 1.000 0 33201   112
- -1  34  72 1.000 0 33201   106
- -1  46   2 1.000 0 33201 11318
- -1  13  50 1.000 0 33201 10247
- -1  17  58 1.000 0 30399   901
- -1  27  71 1.000 0 30399   795
- -1  14  18 1.000 0 33106  4452
- -1   6  30 1.000 0 33106  4406
- -1  39  59 1.000 0 30399   763
- -1  26  65 1.000 0 33201   255
- -1  27  61 1.000 0 33201   257
- -1   5  37 1.000 0 33106  4541
- -1  10  29 1.000 0 33106  4388
- -1  17  38 1.000 0 33201 10586
- -1  30  92 1.000 0 33201 11424
- -1  30  91 1.000 0 33201 11423
- -1  30  63 1.000 0 33201   248
- -1  33  85 1.000 0 33201 11458
- -1  50  89 1.000 0 33201 11825
- -1  31  72 1.000 0 33201   102
- -1  26  64 1.000 0 33201   254
- -1  17  57 1.000 0 30399   906
- -1  23  57 1.000 0 30399   662
- -1  18  75 1.000 0 33201   220
- -1  18  29 1.000 0 33201 10911
- -1  11  79 1.000 0 33201 11510
- -1  24  63 1.000 0 30399   718
- -1   3  47 1.000 0 33201 10401
- -1  24  59 1.000 0 30399   612
- -1  34  94 1.000 0 33201  6730
- -1  30  83 1.000 0 33201 11298
- -1  21  59 1.000 0 30399   673
- -1  18  74 1.000 0 33201   218
- -1  18  72 1.000 0 33201   217
- -1  17  75 1.000 0 33201   226
- -1  19  73 1.000 0 33201   208
- -1  17  72 1.000 0 33201   214
- -1  16  71 1.000 0 33201   207
- -1  31  71 1.000 0 33201   101
- -1   1  41 1.000 0 33201 10702
- -1  23  58 1.000 0 30399   660
- -1  50  68 1.000 0 33201 11586
- -1  20  66 1.000 0 30399   823
- -1  21  20 1.000 0 33201  7308
- -1  17  71 1.000 0 33201   222
- -1  38  17 1.000 0 33201  7402
- -1  45  93 1.000 0 33201 11816
- -1  33   8 1.000 0 33201  7872
- -1  20  75 1.000 0 33201   203
- -1  30  60 1.000 0 33201     1
- -1  28  58 1.000 0 33201    19
- -1  34  95 1.000 0 33201  6729
- -1  16  75 1.000 0 33201   221
- -1  17  59 1.000 0 30399   903
- -1  24  58 1.000 0 30399   609
- -1  26  62 1.000 0 33201   253
- -1  16  68 1.000 0 30399   803
- -1  16  66 1.000 0 30399   772
- -1  17  60 1.000 0 30399   789
- -1  27  51 1.000 0 30399   562
- -1  20  67 1.000 0 30399   828
- -1  21  56 1.000 0 30399   675
- -1  17  18 1.000 0 33201  7137
- -1  20  68 1.000 0 30399   829
- -1  20  69 1.000 0 30399   830
- -1  21  58 1.000 0 30399   672
- -1  14  20 1.000 0 33106  4453
- -1  35  93 1.000 0 33201  6725
- -1  40  33 1.000 0 33201 10827
- -1  20  74 1.000 0 33201   205
- -1  30  70 1.000 0 33201   184
- -1  20  72 1.000 0 33201   202
- -1  31  66 1.000 0 33201   161
- -1  44  61 1.000 0 30399   696
- -1   7  30 1.000 0 33106  4409
- -1  32  66 1.000 0 33201   151
- -1  38  32 1.000 0 33201 10832
- -1  32  67 1.000 0 33201   152
- -1  31  68 1.000 0 33201   163
- -1  35  68 1.000 0 33201   171
- -1  44  79 1.000 0 33201 11284
- -1  39  33 1.000 0 33201 10825
- -1  41  99 1.000 0 33201 11843
- -1  18  35 1.000 0 33201 10712
- -1   3  41 1.000 0 33201  7974
- -1  33  87 1.000 0 33201  7279
- -1  26  67 1.000 0 33201   131
- -1  26  69 1.000 0 33201   134
- -1  33  58 1.000 0 33201    86
- -1  26  66 1.000 0 33201   133
- -1  26  68 1.000 0 33201   135
- -1  26  71 1.000 0 30399   686
- -1  17  56 1.000 0 30399   900
- -1  26  74 1.000 0 30399   925
- -1  24  88 1.000 0 33201 11351
- -1   5  56 1.000 0 33201  7613
- -1  30  75 1.000 0 30399   721
- -1   2  56 1.000 0 33201  7521
- -1   7  40 1.000 0 33201 10942
- -1  19  75 1.000 0 33201   210
- -1  18  71 1.000 0 33201   216
- -1  18  73 1.000 0 33201   219
- -1  20  73 1.000 0 33201   204
- -1  28  43 1.000 0 33201 10504
- -1  34  92 1.000 0 33201  6732
- -1  30  67 1.000 0 33201   182
- -1  17  35 1.000 0 33201 10703
- -1  19  74 1.000 0 33201   209
- -1  19  72 1.000 0 33201   212
- -1  29  21 1.000 0 33201  7185
- -1  25  27 1.000 0 33201 11095
- -1  23  43 1.000 0 33201 10455
- -1  15  20 1.000 0 33106  4447
- -1  29  22 1.000 0 33201  7178
- -1   8  57 1.000 0 33201  7625
- -1  36  66 1.000 0 33201  6365
- -1   7  56 1.000 0 33201  7621
- -1   6  59 1.000 0 33201  7611
- -1  10  38 1.000 0 33201 10954
- -1  27  19 1.000 0 33201  7305
- -1  22  43 1.000 0 33201 10454
- -1  28  22 1.000 0 33201  7155
- -1  25  25 1.000 0 33201  7148
- -1  26  22 1.000 0 33201  7158
- -1  30  22 1.000 0 33201  7181
- -1   6  60 1.000 0 33201  7610
- -1  27  21 1.000 0 33201  7187
- -1  26  21 1.000 0 33201  7183
- -1  14  17 1.000 0 33106  4443
- -1   8  75 1.000 0 33201 11366
- -1  19  22 1.000 0 33201  7696
- -1  39  93 1.000 0 33201 11752
- -1  36  68 1.000 0 33201  6370
- -1  33  27 1.000 0 33201  6432
- -1  30  23 1.000 0 33201  7173
- -1  50   8 1.000 0 33201 11573
- -1   8  60 1.000 0 33201  7622
- -1  25  28 1.000 0 33201  7963
- -1  31  27 1.000 0 33201  6429
- -1  40  66 1.000 0 33201  6374
- -1  43  90 1.000 0 33201  7442
- -1  47  78 1.000 0 33201 11625
- -1  28  71 1.000 0 30399   923
- -1  37  66 1.000 0 33201  6379
- -1  36  93 1.000 0 33201 11778
- -1  34  28 1.000 0 33201  6438
- -1  33  69 1.000 0 33201   142
- -1  43  36 1.000 0 33106  4336
- -1  31  54 1.000 0 33201    32
- -1   4  60 1.000 0 33201  7573
- -1   2  55 1.000 0 33201  7674
- -1  40  28 1.000 0 33201  7747
- -1  32  91 1.000 0 33201  6739
- -1  39  66 1.000 0 33201  6390
- -1  40  67 1.000 0 33201  6375
- -1  30  19 1.000 0 33201  7307
- -1  28  10 1.000 0 33106  4522
- -1  15  47 1.000 0 33201 10234
- -1   4  52 1.000 0 33201  7433
- -1  14  30 1.000 0 33201 10882
- -1  47  80 1.000 0 33201 11623
- -1   4  58 1.000 0 33201  7600
- -1  45  89 1.000 0 33201  7466
- -1  17  43 1.000 0 33201 10417
- -1  36  83 1.000 0 33201 11724
- -1  29  59 1.000 0 33201    99
- -1  18  60 1.000 0 30399   955
- -1  19  56 1.000 0 30399   817
- -1  28  73 1.000 0 30399   928
- -1  27  16 1.000 0 33201  7352
- -1  19  57 1.000 0 30399   877
- -1  29  20 1.000 0 33201  7344
- -1  29  58 1.000 0 33201    98
- -1  29  57 1.000 0 33201    97
- -1  28  75 1.000 0 30399   930
- -1  26  15 1.000 0 33201  7475
- -1  42  88 1.000 0 33201  7455
- -1  35  19 1.000 0 33201  7380
- -1  46  76 1.000 0 33201 11622
- -1  19  50 1.000 0 33201 10260
- -1  34  19 1.000 0 33201  7379
- -1  20  42 1.000 0 33201 10428
- -1  27  20 1.000 0 33201  7341
- -1  28  16 1.000 0 33201  7353
- -1  29  17 1.000 0 33201  7347
- -1  25  88 1.000 0 33201 11368
- -1  37  67 1.000 0 33201  6381
- -1  32  28 1.000 0 33201  6435
- -1  32  95 1.000 0 33201  6740
- -1  20  35 1.000 0 33201 10711
- -1  39  68 1.000 0 33201  6392
- -1  33  67 1.000 0 33201   144
- -1  33  28 1.000 0 33201  6436
- -1  32  92 1.000 0 33201  6738
- -1  35  26 1.000 0 33201  6420
- -1  31  29 1.000 0 33201  6441
- -1  34  29 1.000 0 33201  6443
- -1  20  82 1.000 0 33201 11787
- -1   1  51 1.000 0 33201  7661
- -1  42  95 1.000 0 33201 11803
- -1  21  16 1.000 0 33201  7314
- -1   9  36 1.000 0 33201 10947
- -1  31  20 1.000 0 33201  7371
- -1  36  24 1.000 0 33201 11520
- -1  33  16 1.000 0 33201  7355
- -1   9  38 1.000 0 33201 10953
- -1  15  81 1.000 0 33106  4461
- -1  33  29 1.000 0 33201  6444
- -1  40  68 1.000 0 33201  6376
- -1  32  29 1.000 0 33201  6445
- -1   4  49 1.000 0 33201 10317
- -1  31  26 1.000 0 33201  6419
- -1  35  28 1.000 0 33201  6439
- -1  31  51 1.000 0 33201    24
- -1  27  54 1.000 0 30399   567
- -1  49  82 1.000 0 33201 11649
- -1  36  84 1.000 0 33201 11723
- -1  28  54 1.000 0 30399   393
- -1  12  49 1.000 0 33201 10201
- -1  29  60 1.000 0 33201    94
- -1  16  86 1.000 0 33106  4559
- -1  27  53 1.000 0 30399   564
- -1  28  55 1.000 0 30399   402
- -1  39  82 1.000 0 33201 11726
- -1  13  49 1.000 0 33201 10200
- -1  33  60 1.000 0 33201    82
- -1   5  53 1.000 0 33201  7745
- -1  27  55 1.000 0 30399   565
- -1  22  90 1.000 0 33201 11361
- -1  48  97 1.000 0 33201 11493
- -1  18  46 1.000 0 33201 10272
- -1  48  96 1.000 0 33201 11494
- -1  28  63 1.000 0 33201   233
- -1  41  87 1.000 0 33201  7450
- -1  28  72 1.000 0 30399   952
- -1   1  56 1.000 0 33201  7571
- -1  31  52 1.000 0 33201    29
- -1  46  80 1.000 0 33201 11618
- -1  18  59 1.000 0 30399   946
- -1  36  69 1.000 0 33201  6372
- -1  19  19 1.000 0 33201  7313
- -1  35  27 1.000 0 33201  6430
- -1  47  27 1.000 0 33201  6455
- -1  49  29 1.000 0 33201  6460
- -1  48  29 1.000 0 33201  6459
- -1  28  82 1.000 0 33201 11340
- -1  50  29 1.000 0 33201  6461
- -1  34  27 1.000 0 33201  6431
- -1   7  38 1.000 0 33201 10951
- -1  48  26 1.000 0 33201  6454
- -1  33  71 1.000 0 33201   110
- -1  24  89 1.000 0 33201 11350
- -1  44  81 1.000 0 33201 10959
- -1  47  29 1.000 0 33201  6458
- -1  48  27 1.000 0 33201  6465
- -1  36  67 1.000 0 33201  6369
- -1  46  29 1.000 0 33201  6457
- -1  50  26 1.000 0 33201  6463
- -1  46  97 1.000 0 33201 11470
- -1  49  26 1.000 0 33201  6464
- -1   8  39 1.000 0 33201 10939
- -1  46 100 1.000 0 33201 11467
- -1  26  78 1.000 0 33201 11213
- -1  20  84 1.000 0 33201 11777
- -1  30  78 1.000 0 33201 11231
- -1  19  28 1.000 0 33201 10903
- -1  36  70 1.000 0 33201  6366
- -1  41  31 1.000 0 33201 10861
- -1  30  17 1.000 0 33201  7348
- -1  18  43 1.000 0 33201 10409
- -1  28  18 1.000 0 33201  7337
- -1  27  18 1.000 0 33201  7336
- -1  43  18 1.000 0 33201  7416
- -1  29  18 1.000 0 33201  7338
- -1  28  80 1.000 0 33201 11224
- -1  18  30 1.000 0 33201 10923
- -1  19  43 1.000 0 33201 10410
- -1  16  45 1.000 0 33201 10420
- -1  43  89 1.000 0 33201  7443
- -1   3  59 1.000 0 33201  7792
- -1  44  89 1.000 0 33201  7460
- -1  30  79 1.000 0 33201 11232
- -1  32  19 1.000 0 33201  7377
- -1  20  44 1.000 0 33201 10413
- -1  10  78 1.000 0 33106  4523
- -1  47  26 1.000 0 33201  6466
- -1  36  35 1.000 0 33201 10833
- -1  49  27 1.000 0 33201  6453
- -1  12  76 1.000 0 33201 11562
- -1  12  78 1.000 0 33201 11556
- -1  12  77 1.000 0 33201 11558
- -1  46  26 1.000 0 33201  6462
- -1  25  87 1.000 0 33201 11369
- -1  24  20 1.000 0 33201  7311
- -1   7  74 1.000 0 33201 11385
- -1  13  77 1.000 0 33201 11547
- -1  13  78 1.000 0 33201 11544
- -1  43  11 1.000 0 33201  7222
- -1  50  27 1.000 0 33201  6452
- -1  43  88 1.000 0 33201  7444
- -1  17  33 1.000 0 33201 10701
- -1  31  19 1.000 0 33201  7376
- -1  12  80 1.000 0 33201 11587
- -1  11  78 1.000 0 33201 11511
- -1  26  16 1.000 0 33201  7351
- -1  11  76 1.000 0 33201 11537
- -1  26  17 1.000 0 33201  7350
- -1  25  19 1.000 0 33201  7349
- -1  13  76 1.000 0 33201 11548
- -1  38  35 1.000 0 33201 10838
- -1  39  34 1.000 0 33201 10841
- -1  33  68 1.000 0 33201   143
- -1  43  86 1.000 0 33201  7446
- -1  48  30 1.000 0 33201  6449
- -1   1  58 1.000 0 33201  7551
- -1  34  16 1.000 0 33201  7356
- -1  39  67 1.000 0 33201  6391
- -1  27  17 1.000 0 33201  7345
- -1  33  19 1.000 0 33201  7378
- -1  39  69 1.000 0 33201  6393
- -1  48  85 1.000 0 33201 11659
- -1  40  69 1.000 0 33201  6377
- -1  34  67 1.000 0 33201   137
- -1  25  86 1.000 0 33201 11371
- -1  37  68 1.000 0 33201  6382
- -1  40  70 1.000 0 33201  6373
- -1  31  28 1.000 0 33201  6440
- -1   9  26 1.000 0 33106  4358
- -1  24  12 1.000 0 33201 10927
- -1  37  92 1.000 0 33201 11813
- -1  22  19 1.000 0 33201  7327
- -1  40  61 1.000 0 33106  2319
- -1  30  16 1.000 0 33201  7343
- -1   8  38 1.000 0 33201 10952
- -1  32  93 1.000 0 33201  6736
- -1  18  56 1.000 0 30399   932
- -1   4  39 1.000 0 33106  4600
- -1  27  69 1.000 0 33201   146
- -1  27  67 1.000 0 33201   148
- -1  27  70 1.000 0 33201   158
- -1   1  57 1.000 0 33201  7556
- -1   5  40 1.000 0 33106  4564
- -1   5  39 1.000 0 33106  4626
- -1  46  27 1.000 0 33201  6451
- -1   2  57 1.000 0 33201  7507
- -1  29  64 1.000 0 33201   242
- -1  29  54 1.000 0 30399   406
- -1  45  87 1.000 0 33201  7468
- -1  26  85 1.000 0 33201 11211
- -1  27  66 1.000 0 33201   147
- -1  40  11 1.000 0 33201 11535
- -1  49  12 1.000 0 33201 10595
- -1  17  46 1.000 0 33201 10271
- -1  19  60 1.000 0 30399   876
- -1   4  59 1.000 0 33201  7606
- -1  47  30 1.000 0 33201  6450
- -1   2  54 1.000 0 33201  7680
- -1  40  35 1.000 0 33201 10836
- -1  24  81 1.000 0 33201 11309
- -1   3  51 1.000 0 33201  7644
- -1  32  75 1.000 0 33201   117
- -1  30  52 1.000 0 30399   489
- -1  28  62 1.000 0 33201   237
- -1  49  14 1.000 0 33201 10603
- -1  30  85 1.000 0 33201 11296
- -1  45  73 1.000 0 33201  7910
- -1  27  62 1.000 0 33201   245
- -1  34  69 1.000 0 33201   139
- -1  11  49 1.000 0 33201 10202
- -1  27  64 1.000 0 33201   246
- -1  30  55 1.000 0 30399   552
- -1  29  53 1.000 0 30399   560
- -1  27  65 1.000 0 33201   249
- -1  29  51 1.000 0 30399   556
- -1  32  74 1.000 0 33201   119
- -1  30  54 1.000 0 30399   549
- -1  10  39 1.000 0 33201 10936
- -1  34  70 1.000 0 33201   150
- -1  33  72 1.000 0 33201   156
- -1  30  53 1.000 0 30399   494
- -1  34  68 1.000 0 33201   138
- -1   5  54 1.000 0 33201  7733
- -1  29  72 1.000 0 30399   947
- -1  16  60 1.000 0 30399   661
- -1  33  66 1.000 0 33201   145
- -1  46  30 1.000 0 33201  6446
- -1  35  84 1.000 0 33201 11438
- -1  50  28 1.000 0 33201  6468
- -1  29  68 1.000 0 33201   122
- -1  33  73 1.000 0 33201   113
- -1  39  70 1.000 0 33201  6389
- -1  29  71 1.000 0 30399   818
- -1  34  66 1.000 0 33201   136
- -1  32  72 1.000 0 33201   116
- -1   9  72 1.000 0 33201 11448
- -1  50  30 1.000 0 33201  6447
- -1  29  70 1.000 0 33201   124
- -1  26  55 1.000 0 30399   462
- -1  33  74 1.000 0 33201   115
- -1  25  90 1.000 0 33201 11373
- -1   7  37 1.000 0 33201 10932
- -1  47  28 1.000 0 33201  6471
- -1  29  67 1.000 0 33201   121
- -1  46  28 1.000 0 33201  6467
- -1  29  66 1.000 0 33201   125
- -1  49  30 1.000 0 33201  6448
- -1  33  75 1.000 0 33201   129
- -1  29  69 1.000 0 33201   123
- -1  16  59 1.000 0 30399   659
- -1  29  73 1.000 0 30399   755
- -1  20  57 1.000 0 30399   913
- -1  20  56 1.000 0 30399   911
- -1  21  85 1.000 0 33201 11325
- -1  37  85 1.000 0 33201 11710
- -1  49  83 1.000 0 33201 11648
- -1   9  75 1.000 0 33201 11441
- -1  43   4 1.000 0 33201 10874
- -1  41  92 1.000 0 33201 11758
- -1  48  99 1.000 0 33201 11491
- -1  19  38 1.000 0 33201 10588
- -1  40  84 1.000 0 33201 11733
- -1  32  60 1.000 0 33201    15
- -1  45  94 1.000 0 33201 11818
- -1  48  90 1.000 0 33201 11782
- -1  35  73 1.000 0 33201   130
- -1  33  70 1.000 0 33201   141
- -1  27  68 1.000 0 33201   149
- -1  28  67 1.000 0 33201   170
- -1  28  70 1.000 0 33201   169
- -1  20  31 1.000 0 33201 10723
- -1  39  58 1.000 0 30399   766
- -1  34  81 1.000 0 33201 11437
- -1  30  68 1.000 0 33201   183
- -1  45  78 1.000 0 33201 11279
- -1  36  57 1.000 0 30399   794
- -1  36  56 1.000 0 30399   797
- -1  26  54 1.000 0 30399   454
- -1  15  35 1.000 0 33201 10714
- -1  25  89 1.000 0 33201 11365
- -1  30  66 1.000 0 33201   181
- -1   1  55 1.000 0 33201  7671
- -1  50  88 1.000 0 33201 11766
- -1  40  57 1.000 0 30399   603
- -1  35  16 1.000 0 33201  7357
- -1   8  49 1.000 0 33201 10196
- -1  45  61 1.000 0 30399   705
- -1   8  47 1.000 0 33201 10210
- -1   9  49 1.000 0 33201 10195
- -1   9  23 1.000 0 33106  4432
- -1  32  58 1.000 0 33201    13
- -1   2  52 1.000 0 33201  7722
- -1  31  53 1.000 0 33201    31
- -1  31  58 1.000 0 33201     8
- -1  42  94 1.000 0 33201 11799
- -1  33  10 1.000 0 33201  7896
- -1   7  47 1.000 0 33201 10209
- -1  30  56 1.000 0 33201    34
- -1  32  59 1.000 0 33201    14
- -1  46  83 1.000 0 33201 11775
- -1  40  14 1.000 0 33201 11526
- -1  31  55 1.000 0 33201    33
- -1  22  47 1.000 0 33201 10295
- -1  23  80 1.000 0 33201 11375
- -1  47  87 1.000 0 33201 11744
- -1  48  79 1.000 0 33201 11630
- -1   6  49 1.000 0 33201 10193
- -1  10  24 1.000 0 33106  4440
- -1  45  64 1.000 0 30399   693
- -1   7  49 1.000 0 33201 10197
- -1  40  15 1.000 0 33201 11543
- -1  23  44 1.000 0 33201 10448
- -1  44  13 1.000 0 33201  7234
- -1  10  49 1.000 0 33201 10194
- -1  15  82 1.000 0 33106  4470
- -1  38  16 1.000 0 33201  7390
- -1  36  60 1.000 0 30399   786
- -1   9  24 1.000 0 33106  4439
- -1  28  56 1.000 0 33201    17
- -1  16  58 1.000 0 30399   887
- -1  16  57 1.000 0 30399   886
- -1  33  59 1.000 0 33201    84
- -1  16  56 1.000 0 30399   883
- -1  18  57 1.000 0 30399   943
- -1  31  57 1.000 0 33201     9
- -1  14  49 1.000 0 33201 10199
- -1  15  49 1.000 0 33201 10198
- -1   6  38 1.000 0 33201 10950
- -1  26  73 1.000 0 30399   873
- -1  35  54 1.000 0 33201    79
- -1  26  72 1.000 0 30399   747
- -1  30  72 1.000 0 30399   936
- -1  29  75 1.000 0 30399   850
- -1  30  74 1.000 0 30399   719
- -1  35  55 1.000 0 33201    81
- -1  30  71 1.000 0 30399   743
- -1  29  74 1.000 0 30399   707
- -1  30  58 1.000 0 33201     3
- -1  35  57 1.000 0 33201    62
- -1  20  58 1.000 0 30399   949
- -1  36  58 1.000 0 30399   792
- -1  20  60 1.000 0 30399   732
- -1  20  59 1.000 0 30399   933
- -1  30  73 1.000 0 30399   956
- -1  42  86 1.000 0 33201  7454
- -1  42  97 1.000 0 33201 11852
- -1  46  87 1.000 0 33201 11738
- -1  45  65 1.000 0 30399   807
- -1  28  60 1.000 0 33201    23
- -1  28  57 1.000 0 33201    18
- -1  30  57 1.000 0 33201     4
- -1  49  69 1.000 0 33201 11599
- -1  30  94 1.000 0 33201 11426
- -1  44  62 1.000 0 30399   681
- -1  45  62 1.000 0 30399   745
- -1   1  54 1.000 0 33201  7662
- -1  48  82 1.000 0 33201 11663
- -1  50  12 1.000 0 33201 10596
- -1  40  56 1.000 0 30399   790
- -1  39  85 1.000 0 33201 11722
- -1  39  84 1.000 0 33201 11718
- -1  33  82 1.000 0 33201 11455
- -1  39  56 1.000 0 30399   717
- -1  40  60 1.000 0 30399   799
- -1  31  59 1.000 0 33201     7
- -1  31  60 1.000 0 33201     6
- -1  46  69 1.000 0 33201 11613
- -1  37  82 1.000 0 33201 11714
- -1  42  26 1.000 0 33201  7956
- -1  32  56 1.000 0 33201    16
- -1  50  96 1.000 0 33201 11488
- -1  31  56 1.000 0 33201    10
- -1  32  57 1.000 0 33201    12
- -1  38  46 1.000 0 33106  4235
- -1  44  63 1.000 0 30399   762
- -1  34  82 1.000 0 33201 11436
- -1  28  59 1.000 0 33201    22
- -1  30  59 1.000 0 33201     2
- -1  38  60 1.000 0 30399   589
- -1  50  85 1.000 0 33201 11651
- -1  42  17 1.000 0 33201  7438
- -1  32  73 1.000 0 33201   177
- -1  44   4 1.000 0 33201 10835
- -1  35  72 1.000 0 33201   127
- -1  35  74 1.000 0 33201   120
- -1  47  68 1.000 0 33201 11609
- -1  40  12 1.000 0 33201 11555
- -1  39  60 1.000 0 30399   791
- -1  48  12 1.000 0 33201 10594
- -1  37  14 1.000 0 33201 11525
- -1  20  36 1.000 0 33201 10580
- -1  35  75 1.000 0 33201   128
- -1  26  70 1.000 0 33201   132
- -1   4  56 1.000 0 33201  7575
- -1  31  85 1.000 0 33201 11459
- -1  36  91 1.000 0 33201 11780
- -1  35  71 1.000 0 33201   126
- -1  45  99 1.000 0 33201 11829
- -1  16  36 1.000 0 33201 10583
- -1  48  18 1.000 0 33201  7266
- -1  38  61 1.000 0 33106  2308
- -1  40  65 1.000 0 33106  2322
- -1  37  19 1.000 0 33201  7408
- -1  38  64 1.000 0 33106  2306
- -1  23  76 1.000 0 33201 11374
- -1  31  38 1.000 0 33201 10668
- -1   6  37 1.000 0 33201 10926
- -1  43  30 1.000 0 33201 11042
- -1  29  82 1.000 0 33201 11337
- -1  34  83 1.000 0 33201 11435
- -1  38  59 1.000 0 30399   581
- -1  40  63 1.000 0 33106  2320
- -1  40  64 1.000 0 33106  2321
- -1  30  84 1.000 0 33201 11297
- -1  31  73 1.000 0 33201   103
- -1  31  74 1.000 0 33201   104
- -1  34  73 1.000 0 33201   111
- -1  49  86 1.000 0 33201 11767
- -1  37  60 1.000 0 30399   808
- -1  41  66 1.000 0 33201  7717
- -1  44 100 1.000 0 33201 11885
- -1  37  59 1.000 0 30399   683
- -1  37  57 1.000 0 30399   585
- -1  11  77 1.000 0 33201 11517
- -1  10  37 1.000 0 33201 10928
- -1  36  19 1.000 0 33201  7407
- -1  28  74 1.000 0 30399   929
- -1  18  58 1.000 0 30399   954
- -1  39  14 1.000 0 33201 11527
- -1  33  93 1.000 0 33201  6743
- -1  19  59 1.000 0 30399   884
- -1  36  59 1.000 0 30399   784
- -1  29  84 1.000 0 33201 11334
- -1  19  58 1.000 0 30399   879
- -1  12  75 1.000 0 33201  7852
- -1  32  22 1.000 0 33201  7203
- -1  38  92 1.000 0 33201 11789
- -1  38  58 1.000 0 30399   577
- -1  35  38 1.000 0 33201 10655
- -1  37  65 1.000 0 33106  2289
- -1  37  64 1.000 0 33106  2250
- -1  37  62 1.000 0 33106  2290
- -1  37  61 1.000 0 33106  2002
- -1  38  51 1.000 0 33106  4668
- -1  44  30 1.000 0 33201 11043
- -1  38  57 1.000 0 30399   571
- -1  37  16 1.000 0 33201  7389
- -1  37  63 1.000 0 33106  2220
- -1  22  13 1.000 0 33201 11112
- -1  45  30 1.000 0 33201 11044
- -1  38  71 1.000 0 33201  7902
- -1  40  41 1.000 0 33106  4401
- -1  34  38 1.000 0 33201 10656
- -1  44  32 1.000 0 33201 10853
- -1  35  39 1.000 0 33201 10648
- -1  45  32 1.000 0 33201 10854
- -1  41  41 1.000 0 33106  4319
- -1  25  80 1.000 0 33201 11381
- -1  49  34 1.000 0 33201 11683
- -1  23  83 1.000 0 33201 11301
- -1  29   6 1.000 0 33106  4471
- -1  40  42 1.000 0 33106  4397
- -1  24  30 1.000 0 33201 11110
- -1  35  37 1.000 0 33201 10645
- -1  47  33 1.000 0 33201 11676
- -1  50   6 1.000 0 33201 11565
- -1  43  32 1.000 0 33201 10852
- -1  45  26 1.000 0 33201 11055
- -1  37  42 1.000 0 33106  4400
- -1  38  42 1.000 0 33106  4399
- -1  23  86 1.000 0 33201 11356
- -1  46   8 1.000 0 33201 11570
- -1  36  42 1.000 0 33106  4396
- -1  41  88 1.000 0 33201  7449
- -1  39  91 1.000 0 33201 11750
- -1  31  21 1.000 0 33201  7207
- -1  24  82 1.000 0 33201 11308
- -1  34   6 1.000 0 33201  7957
- -1  10  26 1.000 0 33106  4361
- -1  42  11 1.000 0 33201  7221
- -1   5  57 1.000 0 33201  7619
- -1   5  43 1.000 0 33201 10697
- -1   3  50 1.000 0 33201 10447
- -1  47   6 1.000 0 33201 11566
- -1  22  89 1.000 0 33201 11360
- -1  31  40 1.000 0 33201 10667
- -1   3  45 1.000 0 33201 10514
- -1  49  35 1.000 0 33201 11702
- -1  50  16 1.000 0 33201  7246
- -1  43  41 1.000 0 33106  4413
- -1  41  67 1.000 0 33201  7716
- -1  21  89 1.000 0 33201 11352
- -1  38  70 1.000 0 33201  6384
- -1  39  41 1.000 0 33106  4403
- -1  31  37 1.000 0 33201 10654
- -1  16  26 1.000 0 33201 10916
- -1  33  37 1.000 0 33201 10647
- -1  37  72 1.000 0 33201  7883
- -1  43  97 1.000 0 33201 11847
- -1  24  27 1.000 0 33201 11096
- -1   1  46 1.000 0 33201 10364
- -1   2  48 1.000 0 33201 10373
- -1  32   8 1.000 0 33201  7882
- -1  41   9 1.000 0 33201  7564
- -1  42  32 1.000 0 33201 10851
- -1  46  35 1.000 0 33201 11699
- -1  42  41 1.000 0 33106  4350
- -1  25  18 1.000 0 33201  7334
- -1   8  72 1.000 0 33201 11372
- -1  38  54 1.000 0 33106  4410
- -1  42  42 1.000 0 33106  4335
- -1  33  39 1.000 0 33201 10650
- -1  37  41 1.000 0 33106  4407
- -1  41  28 1.000 0 33201 11052
- -1  34  40 1.000 0 33201 10664
- -1  42  28 1.000 0 33201 11053
- -1  41  42 1.000 0 33106  4353
- -1  44  26 1.000 0 33201 11056
- -1  43  28 1.000 0 33201 11054
- -1  41  60 1.000 0 33106  4643
- -1  38  41 1.000 0 33106  4404
- -1  38  53 1.000 0 33106  4414
- -1  41  32 1.000 0 33201 10855
- -1  46  98 1.000 0 33201 11469
- -1   1  50 1.000 0 33201 10421
- -1  41  59 1.000 0 33106  4637
- -1   3  52 1.000 0 33201  7650
- -1  26  26 1.000 0 33201 10955
- -1  25  42 1.000 0 33201 10431
- -1  33  40 1.000 0 33201 10665
- -1  34  39 1.000 0 33201 10649
- -1  39  19 1.000 0 33201  7412
- -1  43  26 1.000 0 33201  7959
- -1  32  39 1.000 0 33201 10651
- -1  33  90 1.000 0 33201  7275
- -1  30  11 1.000 0 33201  7523
- -1  40  93 1.000 0 33201 11762
- -1  50  84 1.000 0 33201 11653
- -1  18  44 1.000 0 33201 10415
- -1  48  89 1.000 0 33201 11783
- -1  32  37 1.000 0 33201 10653
- -1  17  42 1.000 0 33201 10427
- -1  32  20 1.000 0 33201  7372
- -1  30  80 1.000 0 33201 11233
- -1  36  71 1.000 0 33201  7897
- -1  22  16 1.000 0 33201  7315
- -1  33  20 1.000 0 33201  7373
- -1  13  75 1.000 0 33201  7857
- -1  49  28 1.000 0 33201  6469
- -1  19  29 1.000 0 33201 10912
- -1  35  40 1.000 0 33201 10663
- -1  32  38 1.000 0 33201 10669
- -1  31  36 1.000 0 33201 10662
- -1  37  55 1.000 0 33106  4351
- -1  38  19 1.000 0 33201  7411
- -1  33  83 1.000 0 33201 11456
- -1  45  19 1.000 0 33201  7424
- -1  18  26 1.000 0 33201 10919
- -1  37  11 1.000 0 33201 11540
- -1   3  54 1.000 0 33201  7656
- -1  17  39 1.000 0 33201 10564
- -1  48   8 1.000 0 33201 11572
- -1  43  87 1.000 0 33201  7445
- -1   8  36 1.000 0 33201 10948
- -1  26   6 1.000 0 33106  4629
- -1  38  82 1.000 0 33201 11706
- -1   9  29 1.000 0 33106  4391
- -1  33  38 1.000 0 33201 10670
- -1  15  31 1.000 0 33201 10675
- -1  14  70 1.000 0 33201  8424
- -1  13  33 1.000 0 33201 10673
- -1  34  35 1.000 0 33201 10801
- -1  15  69 1.000 0 33201  8433
- -1  39  61 1.000 0 33106  2291
- -1  39  65 1.000 0 33106  2299
- -1  46  88 1.000 0 33201 11739
- -1  36  65 1.000 0 33106  2309
- -1  36  61 1.000 0 33106  2311
- -1  39  62 1.000 0 33106  2300
- -1  36  62 1.000 0 33106  2314
- -1  23  77 1.000 0 33201 11379
- -1  39  63 1.000 0 33106  2292
- -1  34  37 1.000 0 33201 10646
- -1  46  96 1.000 0 33201 11471
- -1  39  64 1.000 0 33106  2293
- -1  37  56 1.000 0 30399   584
- -1  25  26 1.000 0 33201 11100
- -1   6  29 1.000 0 33106  4387
- -1  39  42 1.000 0 33106  4398
- -1  24  26 1.000 0 33201 11101
- -1  16  18 1.000 0 33201  7179
- -1  28  77 1.000 0 33201 11225
- -1  25  41 1.000 0 33201 10436
- -1  16  41 1.000 0 33201 10405
- -1  30  76 1.000 0 33201 11227
- -1  20  46 1.000 0 33201 10268
- -1  25  16 1.000 0 33201  7318
- -1  44  17 1.000 0 33201  7440
- -1  19  41 1.000 0 33201 10408
- -1  13  69 1.000 0 33201  7490
- -1  35  21 1.000 0 33201  7211
- -1  29  78 1.000 0 33201 11220
- -1  29  77 1.000 0 33201 11218
- -1  40  13 1.000 0 33201 11531
- -1  22  84 1.000 0 33201 11320
- -1  42  98 1.000 0 33201 11849
- -1  35  22 1.000 0 33201  7206
- -1  14  76 1.000 0 33201 11610
- -1  26  76 1.000 0 33201 11215
- -1  14  77 1.000 0 33201 11635
- -1  14  78 1.000 0 33201 11641
- -1  21  45 1.000 0 33201 10440
- -1  27  13 1.000 0 33201  7492
- -1  27  36 1.000 0 33201 10991
- -1  17  41 1.000 0 33201 10402
- -1  29  80 1.000 0 33201 11216
- -1  49  84 1.000 0 33201 11647
- -1  18  20 1.000 0 33201  7382
- -1  28  83 1.000 0 33201 11341
- -1  10  71 1.000 0 33201 11499
- -1  31  39 1.000 0 33201 10652
- -1  32  31 1.000 0 33201 10787
- -1  22  24 1.000 0 33201  7142
- -1  26  20 1.000 0 33201  7328
- -1  18  41 1.000 0 33201 10403
- -1  13  74 1.000 0 33201  7858
- -1  12  71 1.000 0 33201  7856
- -1  13  73 1.000 0 33201  7859
- -1  29  13 1.000 0 33201  7494
- -1  28  11 1.000 0 33201  7488
- -1  30  13 1.000 0 33201  7495
- -1  20  41 1.000 0 33201 10406
- -1  14  81 1.000 0 33106  4475
- -1  41  17 1.000 0 33201  7437
- -1  12  72 1.000 0 33201  7855
- -1  26  11 1.000 0 33201  7486
- -1  14  79 1.000 0 33201 11642
- -1  18  45 1.000 0 33201 10418
- -1  36  21 1.000 0 33201 11495
- -1  17  45 1.000 0 33201 10419
- -1  49  66 1.000 0 33201 11595
- -1  13  28 1.000 0 33201 10880
- -1  35  20 1.000 0 33201  7375
- -1  26  79 1.000 0 33201 11212
- -1  29  79 1.000 0 33201 11221
- -1  33  18 1.000 0 33201  7368
- -1  34  18 1.000 0 33201  7369
- -1  38  69 1.000 0 33201  6388
- -1  35  18 1.000 0 33201  7370
- -1  48  28 1.000 0 33201  6470
- -1  38  68 1.000 0 33201  6387
- -1  16  44 1.000 0 33201 10422
- -1  18  82 1.000 0 33201 11588
- -1  38  66 1.000 0 33201  6385
- -1  13  35 1.000 0 33201 10687
- -1  16  42 1.000 0 33201 10429
- -1  38   9 1.000 0 33201  7549
- -1  38  67 1.000 0 33201  6386
- -1  34  20 1.000 0 33201  7374
- -1   5  63 1.000 0 33106  4575
- -1  33  46 1.000 0 33106  4211
- -1  43   3 1.000 0 33201 10739
- -1  35  10 1.000 0 33201  7941
- -1  32  12 1.000 0 33201  7504
- -1  42   3 1.000 0 33201 10747
- -1  33  11 1.000 0 33201  7516
- -1  33  94 1.000 0 33201  6742
- -1  31  93 1.000 0 33201  6748
- -1  34  50 1.000 0 33106  4225
- -1   9  45 1.000 0 33201 10359
- -1   6  41 1.000 0 33201 10357
- -1  10  52 1.000 0 33201  8091
- -1   6  63 1.000 0 33201  7841
- -1   7  44 1.000 0 33201 10351
- -1  12  44 1.000 0 33201 10371
- -1  10  51 1.000 0 33201  8093
- -1  30  95 1.000 0 33201 11427
- -1  23  41 1.000 0 33201 10438
- -1   7  43 1.000 0 33201 10339
- -1   8  44 1.000 0 33201 10350
- -1  34  91 1.000 0 33201  6734
- -1   7  45 1.000 0 33201 10352
- -1  31  94 1.000 0 33201  6747
- -1  10  41 1.000 0 33201 10353
- -1   7  41 1.000 0 33201 10356
- -1  24  42 1.000 0 33201 10432
- -1  33  81 1.000 0 33201 11454
- -1   8  41 1.000 0 33201 10355
- -1  22  42 1.000 0 33201 10434
- -1  20  18 1.000 0 33201  7253
- -1  26  77 1.000 0 33201 11214
- -1  21  42 1.000 0 33201 10430
- -1  41   2 1.000 0 33201 11939
- -1  20  83 1.000 0 33201 11784
- -1   8  29 1.000 0 33106  4392
- -1  27  11 1.000 0 33201  7487
- -1  20  45 1.000 0 33201 10424
- -1  31  18 1.000 0 33201  7366
- -1  12  79 1.000 0 33201 11582
- -1  40  94 1.000 0 33201 11761
- -1  19  45 1.000 0 33201 10423
- -1  44  14 1.000 0 33201  7240
- -1  15  68 1.000 0 33201  8428
- -1  28  78 1.000 0 33201 11223
- -1  18  83 1.000 0 33201 11589
- -1  32  33 1.000 0 33201 10807
- -1  32  18 1.000 0 33201  7367
- -1  28  79 1.000 0 33201 11222
- -1  18  84 1.000 0 33201 11591
- -1  13  68 1.000 0 33201  8434
- -1  24  19 1.000 0 33201  7324
- -1  14  68 1.000 0 33201  8427
- -1  14  34 1.000 0 33201 10691
- -1  15  41 1.000 0 33201 10375
- -1  45  69 1.000 0 33201  7709
- -1  14  66 1.000 0 33201  8425
- -1  14  67 1.000 0 33201  8426
- -1  12  33 1.000 0 33201 10674
- -1  10  44 1.000 0 33201 10347
- -1  25  84 1.000 0 33201 11312
- -1  22  41 1.000 0 33201 10439
- -1  39  77 1.000 0 33201 12018
- -1  10  53 1.000 0 33201  8090
- -1   9  44 1.000 0 33201 10349
- -1  37  32 1.000 0 33201 10829
- -1  15  44 1.000 0 33201 10377
- -1  13  42 1.000 0 33201 10395
- -1  14  42 1.000 0 33201 10394
- -1  12  42 1.000 0 33201 10396
- -1  12  43 1.000 0 33201 10386
- -1  11  42 1.000 0 33201 10397
- -1  13  43 1.000 0 33201 10385
- -1  25  45 1.000 0 33201 10445
- -1  15  42 1.000 0 33201 10393
- -1  14  43 1.000 0 33201 10384
- -1  26  10 1.000 0 33106  4582
- -1   9  42 1.000 0 33201 10365
- -1  10  62 1.000 0 33201  7823
- -1  35  13 1.000 0 33201  7513
- -1  23  14 1.000 0 33201 11317
- -1  31  12 1.000 0 33201  7503
- -1  40  95 1.000 0 33201 11760
- -1  35  46 1.000 0 33106  4208
- -1  45  18 1.000 0 33201  8574
- -1  43  98 1.000 0 33201 11846
- -1  24  44 1.000 0 33201 10449
- -1  37   9 1.000 0 33201  7548
- -1  22  18 1.000 0 33201  7331
- -1  32  13 1.000 0 33201  7510
- -1  36   7 1.000 0 33201  7531
- -1  48  70 1.000 0 33201 11602
- -1  13  31 1.000 0 33201 10686
- -1  31  48 1.000 0 33106  2234
- -1  39   7 1.000 0 33201  7534
- -1  28  13 1.000 0 33201  7493
- -1  33  13 1.000 0 33201  7511
- -1  28  28 1.000 0 33201 10976
- -1  10  42 1.000 0 33201 10369
- -1  32  48 1.000 0 33106  3682
- -1  34  46 1.000 0 33106  4210
- -1  49  62 1.000 0 33106  4467
- -1  44   3 1.000 0 33201 10745
- -1  34  13 1.000 0 33201  7512
- -1   2  41 1.000 0 33201 10708
- -1  25  44 1.000 0 33201 10450
- -1  16  38 1.000 0 33201 10587
- -1  11  33 1.000 0 33201 10690
- -1  37  24 1.000 0 33201 11521
- -1  46  82 1.000 0 33201 11857
- -1  14  16 1.000 0 33106  4446
- -1  14  33 1.000 0 33201 10672
- -1  47  12 1.000 0 33201 10593
- -1  45  10 1.000 0 33201  7563
- -1  42   6 1.000 0 33201  7570
- -1  12  31 1.000 0 33201 10684
- -1   6  36 1.000 0 33201 10945
- -1  13  55 1.000 0 33201  7593
- -1  15  85 1.000 0 33106  4465
- -1  24  87 1.000 0 33201 11348
- -1  42  92 1.000 0 33201 11801
- -1  49  78 1.000 0 33201 11636
- -1  38  74 1.000 0 33201  7899
- -1  10  48 1.000 0 33201 11061
- -1  10  50 1.000 0 33201 10226
- -1  10  47 1.000 0 33201 10212
- -1  41  73 1.000 0 33201  7915
- -1   1  60 1.000 0 33201  7528
- -1  43  73 1.000 0 33201  7905
- -1  38  34 1.000 0 33201 10842
- -1  15  34 1.000 0 33201 10692
- -1  15  33 1.000 0 33201 10671
- -1  13  52 1.000 0 33201  7596
- -1  11  68 1.000 0 33201  8421
- -1  15  70 1.000 0 33201  8431
- -1  42  31 1.000 0 33201 10862
- -1  13  30 1.000 0 33201 10883
- -1  14  52 1.000 0 33201  7586
- -1  11  55 1.000 0 33201  7598
- -1  15  66 1.000 0 33201  8430
- -1  11  51 1.000 0 33201  7603
- -1  41  94 1.000 0 33201 11755
- -1  23  20 1.000 0 33201  7310
- -1  11  53 1.000 0 33201  7601
- -1  15  51 1.000 0 33201  7592
- -1  42  36 1.000 0 33106  4334
- -1  15  67 1.000 0 33201  8429
- -1  14  54 1.000 0 33201  7584
- -1  11  69 1.000 0 33201  8422
- -1  14  55 1.000 0 33201  7583
- -1  13  51 1.000 0 33201  7597
- -1  16  28 1.000 0 33201 10900
- -1   4  38 1.000 0 33106  4647
- -1  13  67 1.000 0 33201  8435
- -1  12  70 1.000 0 33201  8442
- -1  23  85 1.000 0 33201 11299
- -1  39  16 1.000 0 33201  7391
- -1  40  17 1.000 0 33201  7404
- -1  12  34 1.000 0 33201 10688
- -1  11  67 1.000 0 33201  8420
- -1  14  53 1.000 0 33201  7585
- -1  12  69 1.000 0 33201  8441
- -1  15  55 1.000 0 33201  7588
- -1  14  51 1.000 0 33201  7587
- -1  11  70 1.000 0 33201  8418
- -1  39  17 1.000 0 33201  7403
- -1  12  68 1.000 0 33201  8440
- -1   9  22 1.000 0 33106  4419
- -1  11  66 1.000 0 33201  8419
- -1  13  66 1.000 0 33201  8436
- -1  12  67 1.000 0 33201  8439
- -1  12  27 1.000 0 33201 10890
- -1  13  34 1.000 0 33201 10689
- -1  13  70 1.000 0 33201  8437
- -1  12  66 1.000 0 33201  8447
- -1  34  31 1.000 0 33201 10791
- -1  24  37 1.000 0 33201 10624
- -1  10  80 1.000 0 33106  4526
- -1  49  65 1.000 0 33106  4517
- -1  31  16 1.000 0 33201  7358
- -1  32  16 1.000 0 33201  7359
- -1  31  17 1.000 0 33201  7360
- -1  22  79 1.000 0 33201 11395
- -1  30  15 1.000 0 33201  7479
- -1   7  61 1.000 0 33201  7832
- -1   6  44 1.000 0 33201 10346
- -1   9  43 1.000 0 33201 10341
- -1  10  43 1.000 0 33201 10344
- -1   8  43 1.000 0 33201 10340
- -1  22  92 1.000 0 33201 11860
- -1  23  45 1.000 0 33201 10442
- -1  24  46 1.000 0 33201 10284
- -1  21  41 1.000 0 33201 10435
- -1  23  46 1.000 0 33201 10283
- -1  22  45 1.000 0 33201 10441
- -1  35  17 1.000 0 33201  7365
- -1  19  48 1.000 0 33201 10277
- -1  41  21 1.000 0 33201  7760
- -1  24  45 1.000 0 33201 10444
- -1  21  46 1.000 0 33201 10282
- -1  14  38 1.000 0 33201 10554
- -1  20  47 1.000 0 33201 10267
- -1   6  43 1.000 0 33201 10345
- -1  15  40 1.000 0 33201 10535
- -1  19  47 1.000 0 33201 10266
- -1  48  20 1.000 0 33201  7256
- -1  44  78 1.000 0 33201 11285
- -1  16  48 1.000 0 33201 10280
- -1  21  48 1.000 0 33201 10304
- -1  25  85 1.000 0 33201 11310
- -1  25  77 1.000 0 33201 11384
- -1  22  30 1.000 0 33201 11103
- -1  34  84 1.000 0 33201 11433
- -1  45  34 1.000 0 33201 10856
- -1  35  86 1.000 0 33201  7294
- -1  12  40 1.000 0 33201 10539
- -1  47  19 1.000 0 33201  7248
- -1  14  40 1.000 0 33201 10536
- -1  41  10 1.000 0 33201  7559
- -1  43  80 1.000 0 33201 11290
- -1  35  44 1.000 0 33201 11058
- -1  17  48 1.000 0 33201 10279
- -1  48  68 1.000 0 33201 11604
- -1  43  10 1.000 0 33201  7561
- -1  49  20 1.000 0 33201  7257
- -1  43  31 1.000 0 33201 10866
- -1  13  38 1.000 0 33201 10555
- -1  13  39 1.000 0 33201 10560
- -1  50  19 1.000 0 33201  7251
- -1  13  40 1.000 0 33201 10538
- -1  44   6 1.000 0 33201  7574
- -1   6  71 1.000 0 33201 11440
- -1  45  88 1.000 0 33201  7467
- -1  45   9 1.000 0 33201  7568
- -1  38  18 1.000 0 33201  7396
- -1  12  55 1.000 0 33201  7604
- -1  45   6 1.000 0 33201  7576
- -1  17  27 1.000 0 33201 10908
- -1  42   9 1.000 0 33201  7565
- -1  32  86 1.000 0 33201  7300
- -1  42  33 1.000 0 33201 10850
- -1  43   9 1.000 0 33201  7566
- -1  44  10 1.000 0 33201  7562
- -1  11  54 1.000 0 33201  7599
- -1  13  79 1.000 0 33201 11538
- -1  11  52 1.000 0 33201  7602
- -1  15  52 1.000 0 33201  7591
- -1  13  54 1.000 0 33201  7594
- -1  17  29 1.000 0 33201 10910
- -1  13  53 1.000 0 33201  7595
- -1  42  10 1.000 0 33201  7560
- -1  43   6 1.000 0 33201  7572
- -1  44   9 1.000 0 33201  7567
- -1  42  69 1.000 0 33201  7704
- -1  44  12 1.000 0 33201  7229
- -1  25  17 1.000 0 33201  7323
- -1  42  70 1.000 0 33201  7703
- -1  22  77 1.000 0 33201 11393
- -1  13  27 1.000 0 33201 10891
- -1   6  73 1.000 0 33201 11430
- -1  15  53 1.000 0 33201  7590
- -1  36  16 1.000 0 33201  7388
- -1  23  17 1.000 0 33201  7321
- -1  15  54 1.000 0 33201  7589
- -1  48  11 1.000 0 33201 10611
- -1  36  18 1.000 0 33201  7393
- -1  43  77 1.000 0 33201 11292
- -1  37  91 1.000 0 33201 11809
- -1  33  95 1.000 0 33201  6741
- -1  39  21 1.000 0 33201 11498
- -1  43  78 1.000 0 33201 11293
- -1  24  41 1.000 0 33201 10437
- -1  31  92 1.000 0 33201  6749
- -1  44  94 1.000 0 33201 11804
- -1  31  95 1.000 0 33201  6752
- -1   9  41 1.000 0 33201 10354
- -1  13  44 1.000 0 33201 10376
- -1  31  91 1.000 0 33201  6751
- -1  42  66 1.000 0 33201  7707
- -1  46  11 1.000 0 33201 10610
- -1  43 100 1.000 0 33201 11851
- -1  15  43 1.000 0 33201 10383
- -1  18  42 1.000 0 33201 10426
- -1   8  42 1.000 0 33201 10366
- -1   4  46 1.000 0 33201 10348
- -1  26   9 1.000 0 33106  3515
- -1  50  82 1.000 0 33201 11656
- -1  41  93 1.000 0 33201 11757
- -1   7  29 1.000 0 33106  4381
- -1  34  88 1.000 0 33201  7271
- -1  41  70 1.000 0 33201  7713
- -1  34  89 1.000 0 33201  7270
- -1  43  76 1.000 0 33201 11291
- -1  18  48 1.000 0 33201 10278
- -1  36  17 1.000 0 33201  7400
- -1  26  12 1.000 0 33201  7480
- -1  28  81 1.000 0 33201 11343
- -1  34  53 1.000 0 33201    46
- -1  35  25 1.000 0 33201  7201
- -1  49  18 1.000 0 33201  7267
- -1  48  91 1.000 0 33201 11669
- -1  33  17 1.000 0 33201  7363
- -1  29  16 1.000 0 33201  7354
- -1  28  14 1.000 0 33201  7472
- -1  27  14 1.000 0 33201  7471
- -1  33  53 1.000 0 33201    52
- -1   2  43 1.000 0 33201 10677
- -1  32  24 1.000 0 33201  7197
- -1  10  61 1.000 0 33201  7826
- -1  44  80 1.000 0 33201 11283
- -1  22  25 1.000 0 33201  7151
- -1  47  88 1.000 0 33201 11745
- -1  44  18 1.000 0 33201  7417
- -1  10  36 1.000 0 33201 10946
- -1  48  92 1.000 0 33201 11668
- -1  34  86 1.000 0 33201  7274
- -1  34  87 1.000 0 33201  7273
- -1  46  19 1.000 0 33201  7247
- -1  12  38 1.000 0 33201 10556
- -1  10  64 1.000 0 33201  7821
- -1  21  82 1.000 0 33201 11328
- -1  34  17 1.000 0 33201  7364
- -1  32  17 1.000 0 33201  7362
- -1  49  17 1.000 0 33201  7262
- -1  33  92 1.000 0 33201  6744
- -1  21  18 1.000 0 33201  7332
- -1  33  91 1.000 0 33201  6746
- -1  43  92 1.000 0 33201 11798
- -1  11  38 1.000 0 33201 10557
- -1  29  12 1.000 0 33201  7484
- -1  11  37 1.000 0 33201 10544
- -1  18  36 1.000 0 33201 10582
- -1   8  45 1.000 0 33201 10362
- -1  21  44 1.000 0 33201 10451
- -1   6  42 1.000 0 33201 10363
- -1   6  45 1.000 0 33201 10360
- -1  11  44 1.000 0 33201 10372
- -1  10  45 1.000 0 33201 10358
- -1  15  84 1.000 0 33106  4464
- -1   7  42 1.000 0 33201 10367
- -1   2  49 1.000 0 33201 10327
- -1  46  13 1.000 0 33201 10601
- -1  47  20 1.000 0 33201  7255
- -1  23  87 1.000 0 33201 11354
- -1  44  76 1.000 0 33201 11289
- -1   3  49 1.000 0 33201 10325
- -1  48  14 1.000 0 33201 10604
- -1  46  20 1.000 0 33201  7254
- -1  44  77 1.000 0 33201 11286
- -1  50  20 1.000 0 33201  7258
- -1  48  95 1.000 0 33201 11665
- -1  37  13 1.000 0 33201 11534
- -1  35  88 1.000 0 33201  7290
- -1  15  38 1.000 0 33201 10553
- -1  12  37 1.000 0 33201 10547
- -1  14  37 1.000 0 33201 10543
- -1  21  64 1.000 0 30399   837
- -1  19  61 1.000 0 30399   917
- -1  23  63 1.000 0 30399   816
- -1  34  52 1.000 0 33201    45
- -1  50  17 1.000 0 33201  7263
- -1  40  59 1.000 0 30399   695
- -1   4  43 1.000 0 33201 10694
- -1  20  64 1.000 0 30399   912
- -1  26  57 1.000 0 33201    21
- -1  17  63 1.000 0 30399   895
- -1  20  51 1.000 0 30399   939
- -1  23  62 1.000 0 30399   815
- -1  20  61 1.000 0 30399   908
- -1  32  52 1.000 0 33201    57
- -1  20  53 1.000 0 30399   914
- -1  17  62 1.000 0 30399   894
- -1  49  16 1.000 0 33201  7245
- -1  17  61 1.000 0 30399   893
- -1  48  80 1.000 0 33201 11631
- -1  26  56 1.000 0 33201     5
- -1  32  51 1.000 0 33201    56
- -1  17  51 1.000 0 30399   882
- -1  33  55 1.000 0 33201    55
- -1  20  52 1.000 0 30399   948
- -1  27  58 1.000 0 33201    38
- -1  37  12 1.000 0 33201 11552
- -1  19  64 1.000 0 30399   920
- -1  20  38 1.000 0 33201 10589
- -1  44  64 1.000 0 30399   760
- -1  17  54 1.000 0 30399   889
- -1  46  16 1.000 0 33201  7242
- -1  16  63 1.000 0 30399   904
- -1  21  65 1.000 0 30399   839
- -1  26  60 1.000 0 33201    30
- -1  22  85 1.000 0 33201 11319
- -1  19  63 1.000 0 30399   919
- -1  20  62 1.000 0 30399   909
- -1  29  56 1.000 0 33201    96
- -1  34  55 1.000 0 33201    49
- -1  16  55 1.000 0 30399   861
- -1  46   3 1.000 0 33201 11248
- -1  19  24 1.000 0 33201  7701
- -1  35  53 1.000 0 33201    77
- -1  16  62 1.000 0 30399   902
- -1   1  59 1.000 0 33201  7537
- -1  20  55 1.000 0 30399   951
- -1  16  53 1.000 0 30399   824
- -1  29  15 1.000 0 33201  7478
- -1  33  22 1.000 0 33201  7204
- -1  18  23 1.000 0 33201  7690
- -1  16  52 1.000 0 30399   957
- -1  33  51 1.000 0 33201    50
- -1  35  56 1.000 0 33201    61
- -1  33  56 1.000 0 33201    91
- -1  21  23 1.000 0 33201  7172
- -1  18  63 1.000 0 30399   822
- -1  34  56 1.000 0 33201    66
- -1  35  60 1.000 0 33201    65
- -1  34  57 1.000 0 33201    68
- -1  43  74 1.000 0 33201  7904
- -1  21  61 1.000 0 30399   871
- -1  16  51 1.000 0 30399   926
- -1  34  60 1.000 0 33201    73
- -1  19  65 1.000 0 30399   922
- -1  43   2 1.000 0 33201 11086
- -1  42   2 1.000 0 33201 11936
- -1  21  62 1.000 0 30399   825
- -1  24  85 1.000 0 33201 11304
- -1  35  58 1.000 0 33201    63
- -1  34  58 1.000 0 33201    71
- -1  27  56 1.000 0 33201    35
- -1  18  61 1.000 0 30399   851
- -1  18  62 1.000 0 30399   858
- -1  23  25 1.000 0 33201  7150
- -1  46  68 1.000 0 33201 11614
- -1  33  54 1.000 0 33201    54
- -1  27   6 1.000 0 33106  4644
- -1   6  62 1.000 0 33201  7842
- -1  22  40 1.000 0 33201 10629
- -1   9  25 1.000 0 33106  4436
- -1  31  24 1.000 0 33201  7193
- -1  25  24 1.000 0 33201  7154
- -1  22  23 1.000 0 33201  7171
- -1  30  25 1.000 0 33201  7163
- -1  21  40 1.000 0 33201 10628
- -1  22  37 1.000 0 33201 10626
- -1  23  21 1.000 0 33201  7135
- -1  25  23 1.000 0 33201  7168
- -1  28  24 1.000 0 33201  7146
- -1  25  22 1.000 0 33201  7037
- -1  24  21 1.000 0 33201  7136
- -1  22  36 1.000 0 33201 10622
- -1  38  62 1.000 0 33106  2301
- -1  29  25 1.000 0 33201  7164
- -1  21  38 1.000 0 33201 10636
- -1  22  21 1.000 0 33201  7118
- -1  21  24 1.000 0 33201  7139
- -1  25  21 1.000 0 33201  7138
- -1  32  94 1.000 0 33201  6735
- -1  30  26 1.000 0 33201 10992
- -1  27  24 1.000 0 33201  7147
- -1  13  26 1.000 0 33201 10881
- -1  22  87 1.000 0 33201 11358
- -1  26  25 1.000 0 33201  7167
- -1  23  18 1.000 0 33201  7330
- -1  16  64 1.000 0 30399   905
- -1  23  22 1.000 0 33201  6800
- -1  28  25 1.000 0 33201  7165
- -1  33  89 1.000 0 33201  7277
- -1  26  59 1.000 0 33201    26
- -1  25  64 1.000 0 30399   670
- -1  22  83 1.000 0 33201 11321
- -1  16  61 1.000 0 30399   899
- -1  29  14 1.000 0 33201  7473
- -1  48  10 1.000 0 33201 11577
- -1  30  12 1.000 0 33201  7485
- -1  30  14 1.000 0 33201  7474
- -1  48  19 1.000 0 33201  7249
- -1  26  58 1.000 0 33201    25
- -1  17  64 1.000 0 30399   896
- -1  35  51 1.000 0 33201    74
- -1  34  59 1.000 0 33201    72
- -1  16  65 1.000 0 30399   907
- -1  27  57 1.000 0 33201    36
- -1  27  60 1.000 0 33201    42
- -1  32  53 1.000 0 33201    58
- -1  23  65 1.000 0 30399   821
- -1  50  76 1.000 0 33201 11639
- -1  19  62 1.000 0 30399   918
- -1  20  54 1.000 0 30399   950
- -1  44  65 1.000 0 30399   753
- -1  20  63 1.000 0 30399   910
- -1  18  65 1.000 0 30399   875
- -1  17  65 1.000 0 30399   897
- -1  16  54 1.000 0 30399   859
- -1  17  55 1.000 0 30399   892
- -1  23  64 1.000 0 30399   820
- -1  36  85 1.000 0 33201 11727
- -1  33  57 1.000 0 33201    89
- -1  28  15 1.000 0 33201  7477
- -1  20  65 1.000 0 30399   915
- -1  19  17 1.000 0 33201  7287
- -1  48  93 1.000 0 33201 11667
- -1  40  58 1.000 0 30399   703
- -1  21  63 1.000 0 30399   834
- -1  17  53 1.000 0 30399   888
- -1  46  67 1.000 0 33201 11615
- -1   7  26 1.000 0 33106  4332
- -1  34  25 1.000 0 33201  7200
- -1  18  64 1.000 0 30399   874
- -1  32  55 1.000 0 33201    60
- -1  33  52 1.000 0 33201    51
- -1  35  52 1.000 0 33201    76
- -1  17  52 1.000 0 30399   885
- -1  34  51 1.000 0 33201    44
- -1  27  15 1.000 0 33201  7476
- -1  24  24 1.000 0 33201  7153
- -1  22  22 1.000 0 33201  6737
- -1  21  47 1.000 0 33201 10297
- -1  43  79 1.000 0 33201 11074
- -1  22  46 1.000 0 33201 10281
- -1  21  22 1.000 0 33201  6513
- -1  27   7 1.000 0 33106  4289
- -1  24  22 1.000 0 33201  7009
- -1  33  88 1.000 0 33201  7278
- -1  27  12 1.000 0 33201  7482
- -1  26  14 1.000 0 33201  7470
- -1  46  17 1.000 0 33201  7259
- -1  49  19 1.000 0 33201  7250
- -1  23  40 1.000 0 33201 10630
- -1  46  18 1.000 0 33201  7264
- -1  28  12 1.000 0 33201  7483
- -1  25  46 1.000 0 33201 10285
- -1  25  40 1.000 0 33201 10632
- -1  25  37 1.000 0 33201 10623
- -1  21  25 1.000 0 33201  7152
- -1  24  40 1.000 0 33201 10631
- -1  42  15 1.000 0 33201  7213
- -1  34  21 1.000 0 33201  7210
- -1  22  39 1.000 0 33201 10640
- -1  23  39 1.000 0 33201 10641
- -1  35  35 1.000 0 33201 10803
- -1  45  15 1.000 0 33201  7216
- -1  23  34 1.000 0 33201 10733
- -1  35  79 1.000 0 33201  6353
- -1  30  24 1.000 0 33201  7144
- -1  14  19 1.000 0 33106  4448
- -1  26  24 1.000 0 33201  7143
- -1  28  17 1.000 0 33201  7346
- -1  23  42 1.000 0 33201 10433
- -1  47  22 1.000 0 33201  7806
- -1  34  85 1.000 0 33201 11434
- -1  14  44 1.000 0 33201 10400
- -1  48   1 1.000 0 33201 11194
- -1  47  13 1.000 0 33201 10598
- -1  22  38 1.000 0 33201 10617
- -1  23  38 1.000 0 33201 10634
- -1  27  25 1.000 0 33201  7166
- -1  42  21 1.000 0 33201  7762
- -1  23  32 1.000 0 33201 10750
- -1  15  16 1.000 0 33106  4451
- -1   4  50 1.000 0 33201 10452
- -1  21  21 1.000 0 33201  7061
- -1  34  26 1.000 0 33201  6421
- -1  36  29 1.000 0 33201  7748
- -1  43  35 1.000 0 33201 10870
- -1  32  83 1.000 0 33201 11451
- -1  25  38 1.000 0 33201 10637
- -1  24  38 1.000 0 33201 10633
- -1  43  69 1.000 0 33201  7726
- -1  49  22 1.000 0 33201  7808
- -1  37  47 1.000 0 33106  4231
- -1  48  22 1.000 0 33201  7807
- -1  47  24 1.000 0 33201  7811
- -1  49  99 1.000 0 33201 11478
- -1  48  24 1.000 0 33201  7812
- -1  25  43 1.000 0 33201 10458
- -1  45  22 1.000 0 33201  7783
- -1  19  27 1.000 0 33201 10906
- -1  10  79 1.000 0 33106  4524
- -1  38  47 1.000 0 33106  4232
- -1  48  25 1.000 0 33201  7797
- -1  36  77 1.000 0 33201 11246
- -1  12  45 1.000 0 33201 10391
- -1  12  24 1.000 0 33106  4199
- -1  12  39 1.000 0 33201 10559
- -1  39  32 1.000 0 33201 10831
- -1  14  24 1.000 0 33106  4195
- -1  48  77 1.000 0 33201 11632
- -1  42 100 1.000 0 33201 11854
- -1  39  51 1.000 0 33106  4365
- -1  14  23 1.000 0 33106  4163
- -1  34  10 1.000 0 33201  7924
- -1  19  23 1.000 0 33201  7691
- -1  44   8 1.000 0 33201  7581
- -1  25  32 1.000 0 33201 10752
- -1  15  25 1.000 0 33106  4283
- -1  35  30 1.000 0 33201  6427
- -1  47  93 1.000 0 33201 11672
- -1   9  50 1.000 0 33201 10227
- -1  50  25 1.000 0 33201  7799
- -1  11  43 1.000 0 33201 10387
- -1  42  59 1.000 0 33106  4645
- -1  46  22 1.000 0 33201  7805
- -1  39  55 1.000 0 33106  4343
- -1  41  25 1.000 0 33201  7784
- -1  18  27 1.000 0 33201 10907
- -1  48  15 1.000 0 33201 10614
- -1  37  50 1.000 0 33106  4247
- -1  39  44 1.000 0 33106  4385
- -1  24  34 1.000 0 33201 10732
- -1  36  28 1.000 0 33201  7742
- -1  46  21 1.000 0 33201  7789
- -1  31  30 1.000 0 33201  6428
- -1  13  23 1.000 0 33106  4171
- -1  47  38 1.000 0 33106  4308
- -1  50  37 1.000 0 33106  4315
- -1  35  82 1.000 0 33201 11444
- -1  35   8 1.000 0 33201  7850
- -1  48  38 1.000 0 33106  4307
- -1  50  38 1.000 0 33106  4305
- -1  43  99 1.000 0 33201 11844
- -1  49  38 1.000 0 33106  4306
- -1  46  38 1.000 0 33106  4304
- -1  16  24 1.000 0 33201  7698
- -1  46  37 1.000 0 33106  4311
- -1  25  76 1.000 0 33201 11386
- -1  25  31 1.000 0 33201 10742
- -1  44  16 1.000 0 33201  7429
- -1   7  54 1.000 0 33201  8084
- -1   8  30 1.000 0 33106  4402
- -1  17  47 1.000 0 33201 10264
- -1  45  35 1.000 0 33201 10868
- -1   7  52 1.000 0 33201  8086
- -1  49  79 1.000 0 33201 11633
- -1  43  37 1.000 0 33106  4330
- -1  38  84 1.000 0 33201 11466
- -1  20  48 1.000 0 33201 10274
- -1  11  45 1.000 0 33201 10392
- -1  45  72 1.000 0 33201  7911
- -1  31  25 1.000 0 33201  7134
- -1  29  10 1.000 0 33106  4611
- -1  40  25 1.000 0 33201 11519
- -1  23  31 1.000 0 33201 10744
- -1  24  35 1.000 0 33201 10757
- -1  33  84 1.000 0 33201 11457
- -1  26  49 1.000 0 33201 10321
- -1  28  85 1.000 0 33201 11339
- -1  10  65 1.000 0 33201  7820
- -1  39  18 1.000 0 33201  7398
- -1   7  39 1.000 0 33201 10934
- -1  47  69 1.000 0 33201 11608
- -1  22  34 1.000 0 33201 10729
- -1  22  33 1.000 0 33201 10740
- -1  49   8 1.000 0 33201 11571
- -1  25  20 1.000 0 33201  7312
- -1  50   1 1.000 0 33201 11207
- -1   6  28 1.000 0 33106  4318
- -1  18  40 1.000 0 33201 10569
- -1  11  74 1.000 0 33201  7868
- -1  36  13 1.000 0 33201 11530
- -1  38  72 1.000 0 33201  7901
- -1  10  27 1.000 0 33106  4411
- -1  42  34 1.000 0 33201 10860
- -1  30  81 1.000 0 33201 11331
- -1  14  71 1.000 0 33201  7866
- -1  17  24 1.000 0 33201  7699
- -1  44  37 1.000 0 33106  4331
- -1  45  37 1.000 0 33106  4333
- -1  14  75 1.000 0 33201  7862
- -1   7  55 1.000 0 33201  8082
- -1  37  22 1.000 0 33201 11508
- -1  21  86 1.000 0 33201 11346
- -1  36  41 1.000 0 33106  4327
- -1  26  18 1.000 0 33201  7335
- -1  28  20 1.000 0 33201  7342
- -1  21  92 1.000 0 33201 11883
- -1  49  39 1.000 0 33106  4301
- -1  46  77 1.000 0 33201 11621
- -1  25  79 1.000 0 33201 11382
- -1  46  39 1.000 0 33106  4296
- -1   5  48 1.000 0 33201 10368
- -1  23  88 1.000 0 33201 11355
- -1  47  37 1.000 0 33106  4312
- -1  45  16 1.000 0 33201  7430
- -1  45  12 1.000 0 33201  7230
- -1  24  16 1.000 0 33201  7317
- -1  45  75 1.000 0 33201  7908
- -1   7  51 1.000 0 33201  8087
- -1  34  36 1.000 0 33201 10659
- -1  35  36 1.000 0 33201 10658
- -1  44  88 1.000 0 33201  7461
- -1  39  22 1.000 0 33201 11512
- -1  45  81 1.000 0 33201  8565
- -1  38  22 1.000 0 33201 11509
- -1  25  81 1.000 0 33201 11315
- -1  36  22 1.000 0 33201 11507
- -1  48  88 1.000 0 33201 11785
- -1  40  22 1.000 0 33201 11513
- -1  44  15 1.000 0 33201  7215
- -1  41  33 1.000 0 33201 10846
- -1  40  24 1.000 0 33201 11524
- -1   6  26 1.000 0 33106  4377
- -1  32  84 1.000 0 33201 11449
- -1  16  30 1.000 0 33201 10921
- -1  27  50 1.000 0 33201 10337
- -1  14  84 1.000 0 33106  4459
- -1   7  53 1.000 0 33201  8085
- -1  32  32 1.000 0 33201 10797
- -1  34  24 1.000 0 33201  7195
- -1  12  23 1.000 0 33106  3846
- -1  28  50 1.000 0 33201 10336
- -1  30  18 1.000 0 33201  7339
- -1  17  20 1.000 0 33201  7361
- -1  23  16 1.000 0 33201  7316
- -1  39  23 1.000 0 33201 11504
- -1  41  91 1.000 0 33201 11759
- -1  42  19 1.000 0 33201  7421
- -1   1  52 1.000 0 33201  7659
- -1   8  54 1.000 0 33201  8078
- -1  22  86 1.000 0 33201 11359
- -1  34  22 1.000 0 33201  7205
- -1  47  91 1.000 0 33201 11674
- -1  11  41 1.000 0 33201 10381
- -1  25  34 1.000 0 33201 10730
- -1  15  21 1.000 0 33106  3837
- -1  11  23 1.000 0 33106  3848
- -1  15  23 1.000 0 33106  3853
- -1  13  21 1.000 0 33106  3847
- -1  14  21 1.000 0 33106  3840
- -1  11  21 1.000 0 33106  3464
- -1  12  41 1.000 0 33201 10378
- -1  32  85 1.000 0 33201 11450
- -1  29  81 1.000 0 33201 11336
- -1  13  25 1.000 0 33106  4268
- -1  11  25 1.000 0 33106  4209
- -1   4  51 1.000 0 33201  7428
- -1  39  78 1.000 0 33201 12019
- -1   8  64 1.000 0 33201  7834
- -1  37  31 1.000 0 33201 10816
- -1  24  31 1.000 0 33201 10743
- -1  12  21 1.000 0 33106  4173
- -1  25  33 1.000 0 33201 10735
- -1  21  32 1.000 0 33201 10753
- -1  21  19 1.000 0 33201  7329
- -1  12  30 1.000 0 33201 10884
- -1  37  23 1.000 0 33201 11502
- -1  21  39 1.000 0 33201 10639
- -1  41  35 1.000 0 33201 10867
- -1  39  83 1.000 0 33201 11719
- -1  30  10 1.000 0 33106  4421
- -1  22  35 1.000 0 33201 10759
- -1   7  75 1.000 0 33201 11380
- -1  38  23 1.000 0 33201 11503
- -1  17  17 1.000 0 33201  7292
- -1  50  39 1.000 0 33106  4303
- -1  37  51 1.000 0 33106  4348
- -1  48  36 1.000 0 33106  4293
- -1  48  39 1.000 0 33106  4298
- -1  49  36 1.000 0 33106  4294
- -1  24  18 1.000 0 33201  7333
- -1   9  51 1.000 0 33201  6320
- -1   9  53 1.000 0 33201  6311
- -1  36  25 1.000 0 33201 11514
- -1  48  98 1.000 0 33201 11492
- -1   8  53 1.000 0 33201  8079
- -1   8  51 1.000 0 33201  8081
- -1  40  23 1.000 0 33201 11506
- -1   8  52 1.000 0 33201  8080
- -1   9  52 1.000 0 33201  6319
- -1   9  55 1.000 0 33201  6210
- -1   5  55 1.000 0 33201  7728
- -1   8  40 1.000 0 33201 10941
- -1  36  23 1.000 0 33201 11501
- -1  43  20 1.000 0 33201  7434
- -1  10  54 1.000 0 33201  8088
- -1  10  30 1.000 0 33106  4286
- -1  36  55 1.000 0 33106  4349
- -1  19  30 1.000 0 33201 10924
- -1  17  87 1.000 0 33106  4565
- -1  46  78 1.000 0 33201 11620
- -1   9  54 1.000 0 33201  5465
- -1  34  49 1.000 0 33106  4217
- -1  50  36 1.000 0 33106  4295
- -1   8  55 1.000 0 33201  8077
- -1  25  30 1.000 0 33201 11111
- -1  45 100 1.000 0 33201 11833
- -1   7  71 1.000 0 33201 11406
- -1  15  75 1.000 0 33201  7844
- -1  45  77 1.000 0 33201 11280
- -1  17  26 1.000 0 33201 10920
- -1  47   1 1.000 0 33201 11187
- -1  48  66 1.000 0 33201 11606
- -1   9  39 1.000 0 33201 10937
- -1  39  49 1.000 0 33106  4242
- -1  37  52 1.000 0 33106  4347
- -1  35  85 1.000 0 33201 11446
- -1  37  54 1.000 0 33106  4344
- -1  47  99 1.000 0 33201 11473
- -1  44  19 1.000 0 33201  7423
- -1  27  46 1.000 0 33201 10330
- -1  29   7 1.000 0 33106  4138
- -1  47  76 1.000 0 33201 11627
- -1  29  50 1.000 0 33201 10335
- -1  13  71 1.000 0 33201  7861
- -1   1  53 1.000 0 33201  7658
- -1  27  82 1.000 0 33201 11198
- -1  28  46 1.000 0 33201 10331
- -1  45  67 1.000 0 33201  7711
- -1  13  41 1.000 0 33201 10398
- -1  36  44 1.000 0 33106  4379
- -1  23  33 1.000 0 33201 10738
- -1  13  45 1.000 0 33201 10390
- -1  22  32 1.000 0 33201 10748
- -1  48  81 1.000 0 33201 11776
- -1  21  31 1.000 0 33201 10741
- -1  27  10 1.000 0 33106  4480
- -1  14  45 1.000 0 33201 10389
- -1  21  33 1.000 0 33201 10734
- -1  45  13 1.000 0 33201  7235
- -1  19  26 1.000 0 33201 10918
- -1  30  49 1.000 0 33201 10323
- -1  26  46 1.000 0 33201 10329
- -1  25  36 1.000 0 33201 10620
- -1  29  49 1.000 0 33201 10324
- -1  21  17 1.000 0 33201  7319
- -1  26  50 1.000 0 33201 10338
- -1   6  40 1.000 0 33201 10943
- -1  28  84 1.000 0 33201 11342
- -1  43  19 1.000 0 33201  7422
- -1  48  37 1.000 0 33106  4313
- -1  41  18 1.000 0 33201  7414
- -1   9  73 1.000 0 33201 11447
- -1   8  63 1.000 0 33201  7835
- -1   5  52 1.000 0 33201  7757
- -1  45  33 1.000 0 33201 10845
- -1  27  49 1.000 0 33201 10328
- -1  37  53 1.000 0 33106  4345
- -1  44  69 1.000 0 33201  7719
- -1  28  49 1.000 0 33201 10326
- -1  49  37 1.000 0 33106  4314
- -1  47  39 1.000 0 33106  4297
- -1  45  68 1.000 0 33201  7710
- -1   8  71 1.000 0 33201 11377
- -1  38  25 1.000 0 33201 11516
- -1   9  37 1.000 0 33201 10929
- -1  39  52 1.000 0 33106  4364
- -1  39  25 1.000 0 33201 11518
- -1  40  32 1.000 0 33201 10830
- -1  31  47 1.000 0 33106  4226
- -1  22  88 1.000 0 33201 11364
- -1  21  81 1.000 0 33201 11329
- -1  29  46 1.000 0 33201 10332
- -1  32  36 1.000 0 33201 10661
- -1  32  47 1.000 0 33106  4227
- -1  11  28 1.000 0 33201 10899
- -1  33  36 1.000 0 33201 10660
- -1  32  49 1.000 0 33106  4218
- -1  39  12 1.000 0 33201 11554
- -1  30  36 1.000 0 33201  7418
- -1  39  53 1.000 0 33106  4363
- -1   3  43 1.000 0 33201 10681
- -1   6  74 1.000 0 33201 11428
- -1  33  25 1.000 0 33201  7199
- -1  30  20 1.000 0 33201  7340
- -1  37  25 1.000 0 33201 11515
- -1  32  25 1.000 0 33201  7184
- -1  39  54 1.000 0 33106  4362
- -1  33  47 1.000 0 33106  4228
- -1  34  47 1.000 0 33106  4259
- -1  42  37 1.000 0 33106  4329
- -1   6  52 1.000 0 33201  8075
- -1  41  37 1.000 0 33106  4328
- -1  36  51 1.000 0 33106  4323
- -1  38  55 1.000 0 33106  4360
- -1  34  32 1.000 0 33201 10795
- -1  36  54 1.000 0 33106  4326
- -1  44  90 1.000 0 33201  7459
- -1  27  33 1.000 0 33201 10765
- -1  33  24 1.000 0 33201  7196
- -1   6  54 1.000 0 33201  6322
- -1   6  55 1.000 0 33201  6321
- -1  36  53 1.000 0 33106  4325
- -1  22  31 1.000 0 33201 10746
- -1   6  53 1.000 0 33201  6344
- -1  36  52 1.000 0 33106  4324
- -1  25  35 1.000 0 33201 10755
- -1  44  36 1.000 0 33106  4338
- -1  30  46 1.000 0 33201 10333
- -1  27  47 1.000 0 33201 10315
- -1  39  95 1.000 0 33201 11774
- -1  30  50 1.000 0 33201 10334
- -1  26  47 1.000 0 33201 10314
- -1  24  32 1.000 0 33201 10751
- -1  48   6 1.000 0 33201 11564
- -1  45  97 1.000 0 33201 11835
- -1  44  33 1.000 0 33201 10848
- -1  16  23 1.000 0 33201  7687
- -1  36  30 1.000 0 33201  7731
- -1  48  67 1.000 0 33201 11605
- -1  38  37 1.000 0 33106  4257
- -1  10  75 1.000 0 33201 11462
- -1  20  23 1.000 0 33201  7692
- -1  50  18 1.000 0 33201  7268
- -1  40  40 1.000 0 33106  4288
- -1  33  49 1.000 0 33106  4214
- -1  38  49 1.000 0 33106  4243
- -1  36  36 1.000 0 33106  4269
- -1  37  37 1.000 0 33106  4258
- -1  10  74 1.000 0 33201 11479
- -1   3  60 1.000 0 33201  7764
- -1  49   6 1.000 0 33201 11568
- -1  11  61 1.000 0 33201  7851
- -1  11  73 1.000 0 33201  7869
- -1  39  40 1.000 0 33106  4252
- -1  20  49 1.000 0 33201 10250
- -1  17  23 1.000 0 33201  7688
- -1  14  74 1.000 0 33201  7863
- -1  36  40 1.000 0 33106  4276
- -1  38  36 1.000 0 33106  4270
- -1  16  37 1.000 0 33201 10578
- -1   7  48 1.000 0 33201 10224
- -1   1  45 1.000 0 33201 10466
- -1  35  47 1.000 0 33106  4216
- -1  46  63 1.000 0 33106  4601
- -1  19  40 1.000 0 33201 10572
- -1  11  50 1.000 0 33201 10245
- -1   7  62 1.000 0 33201  7830
- -1  36  38 1.000 0 33106  4279
- -1  36  37 1.000 0 33106  4260
- -1  31  10 1.000 0 33201  7884
- -1  50  86 1.000 0 33201 11747
- -1  31  35 1.000 0 33201 10799
- -1  38  40 1.000 0 33106  4222
- -1  37  40 1.000 0 33106  4220
- -1  38  38 1.000 0 33106  4278
- -1  19  36 1.000 0 33201 10581
- -1  35  49 1.000 0 33106  4213
- -1  40  37 1.000 0 33106  4253
- -1  45  14 1.000 0 33201  7241
- -1  39  38 1.000 0 33106  4272
- -1  40  38 1.000 0 33106  4271
- -1  39  37 1.000 0 33106  4256
- -1  11  71 1.000 0 33201  7873
- -1  31  50 1.000 0 33106  4275
- -1  11  72 1.000 0 33201  7870
- -1  20  24 1.000 0 33201  7702
- -1  14  29 1.000 0 33201 10888
- -1  12  29 1.000 0 33201 10886
- -1  36  75 1.000 0 33201  7892
- -1  49  77 1.000 0 33201 11637
- -1  11  75 1.000 0 33201  7867
- -1  38  20 1.000 0 33201  7385
- -1  18  24 1.000 0 33201  7700
- -1  12  61 1.000 0 33201  7955
- -1  14  27 1.000 0 33201 10892
- -1  11  62 1.000 0 33201  7949
- -1  12  28 1.000 0 33201 10877
- -1  39  79 1.000 0 33201 12020
- -1  13  29 1.000 0 33201 10885
- -1  16  39 1.000 0 33201 10563
- -1  35  80 1.000 0 33201  6350
- -1  41  72 1.000 0 33201  7916
- -1  12  65 1.000 0 33201  7951
- -1  32  77 1.000 0 33201  6347
- -1  11  63 1.000 0 33201  7948
- -1  33  78 1.000 0 33201  6340
- -1  34  90 1.000 0 33201  7269
- -1  47  96 1.000 0 33201 11476
- -1   3  48 1.000 0 33201 10374
- -1  31  88 1.000 0 33201  7284
- -1  32  80 1.000 0 33201  6345
- -1  32  79 1.000 0 33201  6343
- -1   1  44 1.000 0 33201 10592
- -1  32  78 1.000 0 33201  6346
- -1  41  34 1.000 0 33201 10858
- -1   6  75 1.000 0 33201 11422
- -1  29   9 1.000 0 33106  2481
- -1  34  76 1.000 0 33201  6360
- -1  34  77 1.000 0 33201  6361
- -1  30   7 1.000 0 33106  4134
- -1   2  45 1.000 0 33201 10496
- -1  23  26 1.000 0 33201 11102
- -1  26   7 1.000 0 33106  3620
- -1   5  41 1.000 0 33201  7981
- -1   6  61 1.000 0 33201  7843
- -1  34  78 1.000 0 33201  6362
- -1  33  77 1.000 0 33201  6339
- -1  21  37 1.000 0 33201 10627
- -1  28   7 1.000 0 33106  4140
- -1  20  40 1.000 0 33201 10573
- -1  16  40 1.000 0 33201 10570
- -1   8  65 1.000 0 33201  7833
- -1  32  81 1.000 0 33201 11453
- -1  48  64 1.000 0 33106  4430
- -1   8  61 1.000 0 33201  7837
- -1  42  60 1.000 0 33106  4649
- -1  36  31 1.000 0 33201 10818
- -1  36  39 1.000 0 33106  4287
- -1  39  39 1.000 0 33106  4284
- -1  23  24 1.000 0 33201  7141
- -1  35  50 1.000 0 33106  4219
- -1  38  39 1.000 0 33106  4285
- -1  49  87 1.000 0 33201 11768
- -1  10  63 1.000 0 33201  7822
- -1  33  35 1.000 0 33201 10800
- -1  36  26 1.000 0 33201  7737
- -1  39  31 1.000 0 33201 10820
- -1  37  26 1.000 0 33201  7738
- -1  17  77 1.000 0 33201 11159
- -1  30  90 1.000 0 33201 11167
- -1  17  79 1.000 0 33201 11153
- -1  30  88 1.000 0 33201 11169
- -1  25  82 1.000 0 33201 11314
- -1   2  59 1.000 0 33201  7500
- -1  50  87 1.000 0 33201 11664
- -1  17  76 1.000 0 33201 11160
- -1  41  98 1.000 0 33201 11842
- -1  26  88 1.000 0 33201 11174
- -1  26  90 1.000 0 33201 11172
- -1  46   6 1.000 0 33201 11567
- -1  26  86 1.000 0 33201 11178
- -1  30  87 1.000 0 33201 11170
- -1  42  77 1.000 0 33201 11274
- -1  49  80 1.000 0 33201 11634
- -1  30  86 1.000 0 33201 11171
- -1  29  94 1.000 0 33201 11412
- -1   5  49 1.000 0 33201 10252
- -1  23  91 1.000 0 33201 11827
- -1  36  49 1.000 0 33106  4249
- -1  29  93 1.000 0 33201 11411
- -1  23  28 1.000 0 33201 11116
- -1  43  15 1.000 0 33201  7214
- -1  28   8 1.000 0 33106  4302
- -1  10  28 1.000 0 33106  4317
- -1  25  78 1.000 0 33201 11383
- -1   5  38 1.000 0 33106  4518
- -1  29  91 1.000 0 33201 11408
- -1   4  45 1.000 0 33201 10517
- -1  11  58 1.000 0 33201  7649
- -1  43  12 1.000 0 33201  7228
- -1  14  56 1.000 0 33201  7663
- -1  46   7 1.000 0 33201 11584
- -1  36  50 1.000 0 33106  4248
- -1  43  72 1.000 0 33201  7906
- -1  44  75 1.000 0 33201  7923
- -1  37  95 1.000 0 33201 11810
- -1  12  56 1.000 0 33201  7675
- -1  28  87 1.000 0 33201 11185
- -1  50   7 1.000 0 33201 11580
- -1  29  95 1.000 0 33201 11409
- -1  45  91 1.000 0 33201 11814
- -1  28  19 1.000 0 33201  7306
- -1  46   9 1.000 0 33201 11563
- -1  49   7 1.000 0 33201 11581
- -1  29  89 1.000 0 33201 11190
- -1  47   9 1.000 0 33201 11561
- -1  48   7 1.000 0 33201 11579
- -1  48   9 1.000 0 33201 11560
- -1  29  92 1.000 0 33201 11410
- -1  46  34 1.000 0 33201 11684
- -1   2  47 1.000 0 33201 10382
- -1   7  46 1.000 0 33201 10208
- -1  49  25 1.000 0 33201  7798
- -1  33  79 1.000 0 33201  6341
- -1  35  77 1.000 0 33201  6351
- -1  33  76 1.000 0 33201  6337
- -1  35  78 1.000 0 33201  6352
- -1  47  21 1.000 0 33201  7790
- -1  46  24 1.000 0 33201  7810
- -1  32  26 1.000 0 33201  6433
- -1  42  35 1.000 0 33201 10871
- -1  38  28 1.000 0 33201  7744
- -1  32   9 1.000 0 33201  7839
- -1  24  86 1.000 0 33201 11349
- -1  39  28 1.000 0 33201  7746
- -1  32  30 1.000 0 33201  6423
- -1  37  35 1.000 0 33201 10834
- -1  44  22 1.000 0 33201  7782
- -1  44  25 1.000 0 33201  7787
- -1  26  82 1.000 0 33201 11288
- -1  44  24 1.000 0 33201  7777
- -1  43  24 1.000 0 33201  7776
- -1  46  15 1.000 0 33201 10612
- -1  43  23 1.000 0 33201  7770
- -1  41  23 1.000 0 33201  7768
- -1  50  34 1.000 0 33201 11685
- -1  37  48 1.000 0 33106  4240
- -1  38  31 1.000 0 33201 10821
- -1  40  26 1.000 0 33201  7741
- -1  39  26 1.000 0 33201  7740
- -1  29  85 1.000 0 33201 11295
- -1   1  47 1.000 0 33201 10380
- -1  38  26 1.000 0 33201  7739
- -1  41  75 1.000 0 33201  7913
- -1  29  90 1.000 0 33201 11189
- -1  22  17 1.000 0 33201  7320
- -1  48  17 1.000 0 33201  7261
- -1  33  43 1.000 0 33201 10493
- -1  41  74 1.000 0 33201  7914
- -1  38  75 1.000 0 33201  7898
- -1  40  34 1.000 0 33201 10839
- -1   5  46 1.000 0 33201 10361
- -1  31  80 1.000 0 33201  6354
- -1  32  76 1.000 0 33201  6348
- -1  43  67 1.000 0 33201  7729
- -1  38  29 1.000 0 33201  7750
- -1  40  29 1.000 0 33201  7752
- -1  34  79 1.000 0 33201  6364
- -1  34  80 1.000 0 33201  6363
- -1  39  29 1.000 0 33201  7751
- -1  36  27 1.000 0 33201  7753
- -1  31  79 1.000 0 33201  6359
- -1  39  27 1.000 0 33201  7756
- -1  33  30 1.000 0 33201  6425
- -1  34  30 1.000 0 33201  6426
- -1  37  28 1.000 0 33201  7743
- -1  50  70 1.000 0 33201 11593
- -1  17  37 1.000 0 33201 10577
- -1  31  78 1.000 0 33201  6357
- -1  31  76 1.000 0 33201  6355
- -1  49  67 1.000 0 33201 11597
- -1  43  66 1.000 0 33201  7730
- -1  37  29 1.000 0 33201  7749
- -1  31  77 1.000 0 33201  6356
- -1  19  44 1.000 0 33201 10414
- -1  23  23 1.000 0 33201  7170
- -1  37  80 1.000 0 33201 11238
- -1  18  49 1.000 0 33201 10254
- -1  45  31 1.000 0 33201 10863
- -1  40  72 1.000 0 33201  7890
- -1  17  49 1.000 0 33201 10255
- -1  16  49 1.000 0 33201 10256
- -1   7  28 1.000 0 33106  4342
- -1  20  78 1.000 0 33201 11083
- -1  19  76 1.000 0 33201 11165
- -1  15  26 1.000 0 33201 10895
- -1  32  90 1.000 0 33201  7295
- -1  21  29 1.000 0 33201 11099
- -1  13  64 1.000 0 33201  7940
- -1  49   1 1.000 0 33201 11203
- -1  13  61 1.000 0 33201  7945
- -1  15  28 1.000 0 33201 10896
- -1  50  33 1.000 0 33201 11677
- -1  16  84 1.000 0 33201 11692
- -1  31  43 1.000 0 33201 10491
- -1  13  65 1.000 0 33201  7939
- -1  28  88 1.000 0 33201 11182
- -1  46  84 1.000 0 33201 11826
- -1  39  92 1.000 0 33201 11749
- -1  16  79 1.000 0 33201 11076
- -1  44  66 1.000 0 33201  7723
- -1  16  77 1.000 0 33201 11079
- -1  27  87 1.000 0 33201 11199
- -1  45  11 1.000 0 33201  7224
- -1  39  30 1.000 0 33201  7735
- -1  30  40 1.000 0 33201 10990
- -1  47  15 1.000 0 33201 10613
- -1  16  80 1.000 0 33201 11075
- -1  37  73 1.000 0 33201  7881
- -1  47  65 1.000 0 33106  4540
- -1  38  73 1.000 0 33201  7900
- -1  41  40 1.000 0 33106  4408
- -1  28  86 1.000 0 33201 11188
- -1  44  74 1.000 0 33201  7925
- -1  27  86 1.000 0 33201 11200
- -1  43  71 1.000 0 33201  7907
- -1  41   4 1.000 0 33201 10840
- -1  44  67 1.000 0 33201  7721
- -1  15  74 1.000 0 33201  7845
- -1  19  78 1.000 0 33201 11163
- -1  37  30 1.000 0 33201  7732
- -1  28  90 1.000 0 33201 11180
- -1  20  20 1.000 0 33201  7397
- -1  36  72 1.000 0 33201  7895
- -1  16  76 1.000 0 33201 11080
- -1  20  77 1.000 0 33201 11084
- -1   6  47 1.000 0 33201 10218
- -1  11  80 1.000 0 33201 11505
- -1  39  50 1.000 0 33106  4244
- -1  44  73 1.000 0 33201  7926
- -1  40  30 1.000 0 33201  7736
- -1  47  36 1.000 0 33106  4292
- -1  38  50 1.000 0 33106  4246
- -1  36  74 1.000 0 33201  7893
- -1  36  73 1.000 0 33201  7894
- -1  43  70 1.000 0 33201  7724
- -1  40  27 1.000 0 33201  7759
- -1  38  30 1.000 0 33201  7734
- -1  41  30 1.000 0 33201 11040
- -1  45  27 1.000 0 33201 11039
- -1  41  29 1.000 0 33201 11045
- -1  23  37 1.000 0 33201 10625
- -1  22  26 1.000 0 33201 11093
- -1  46  85 1.000 0 33201 11720
- -1  38  78 1.000 0 33201 11262
- -1  48  35 1.000 0 33201 11701
- -1  18  33 1.000 0 33201 10707
- -1  12  50 1.000 0 33201 10246
- -1  31   7 1.000 0 33201  7970
- -1  38  80 1.000 0 33201 11264
- -1  38  45 1.000 0 33106  4357
- -1  41  27 1.000 0 33201 11035
- -1  40  79 1.000 0 33201 11244
- -1  21  26 1.000 0 33201 11094
- -1  36  79 1.000 0 33201 11249
- -1  48  72 1.000 0 33201 11072
- -1  38  65 1.000 0 33106  2307
- -1  37  45 1.000 0 33106  4356
- -1  36  45 1.000 0 33106  4355
- -1  47  77 1.000 0 33201 11626
- -1  37  76 1.000 0 33201 11234
- -1  41  39 1.000 0 33106  4316
- -1  36  78 1.000 0 33201 11251
- -1  36  76 1.000 0 33201 11245
- -1  37  78 1.000 0 33201 11236
- -1  38  13 1.000 0 33201 11533
- -1  34  14 1.000 0 33201  7499
- -1  41  26 1.000 0 33201 11057
- -1  32  11 1.000 0 33201  7515
- -1  46  89 1.000 0 33201 11734
- -1  44  29 1.000 0 33201 11048
- -1  44  39 1.000 0 33106  4250
- -1  22  80 1.000 0 33201 11396
- -1  44  27 1.000 0 33201 11038
- -1  42  93 1.000 0 33201 11800
- -1  48  83 1.000 0 33201 11662
- -1  45  29 1.000 0 33201 11049
- -1  42   4 1.000 0 33201 10864
- -1  46  73 1.000 0 33201  7967
- -1  42  27 1.000 0 33201 11036
- -1   3  44 1.000 0 33201 10638
- -1  18  77 1.000 0 33201 11148
- -1  46  72 1.000 0 33201  7968
- -1  49  75 1.000 0 33201  7980
- -1  30  89 1.000 0 33201 11168
- -1   4  63 1.000 0 33106  4477
- -1  48  73 1.000 0 33201 11071
- -1  46  71 1.000 0 33201  7969
- -1  40  92 1.000 0 33201 11763
- -1   8  59 1.000 0 33201  7623
- -1   8  58 1.000 0 33201  7624
- -1  48  84 1.000 0 33201 11660
- -1  43  39 1.000 0 33106  4245
- -1  45  28 1.000 0 33201  7961
- -1   4  36 1.000 0 33106  4550
- -1  44  93 1.000 0 33201 11805
- -1  49  85 1.000 0 33201 11646
- -1  13  80 1.000 0 33201 11541
- -1  28  76 1.000 0 33201 11226
- -1  49  72 1.000 0 33201 11065
- -1  38  77 1.000 0 33201 11263
- -1  47  73 1.000 0 33201  7976
- -1  40  45 1.000 0 33106  4354
- -1  38  76 1.000 0 33201 11265
- -1  49  73 1.000 0 33201 11062
- -1  40   8 1.000 0 33201  7546
- -1  45  79 1.000 0 33201 11281
- -1  32  21 1.000 0 33201  7208
- -1  22  76 1.000 0 33201 11397
- -1  43  27 1.000 0 33201 11037
- -1  15  19 1.000 0 33106  4449
- -1  28  95 1.000 0 33201 11420
- -1  21  76 1.000 0 33201 11387
- -1  22  27 1.000 0 33201 11091
- -1  32  27 1.000 0 33201  6434
- -1  24  78 1.000 0 33201 11398
- -1  47  97 1.000 0 33201 11475
- -1   2  46 1.000 0 33201 10342
- -1  35  83 1.000 0 33201 11443
- -1  41  77 1.000 0 33201 11269
- -1  36  80 1.000 0 33201 11250
- -1  25  39 1.000 0 33201 10644
- -1   6  72 1.000 0 33201 11439
- -1  30  31 1.000 0 33201 10782
- -1  38  79 1.000 0 33201 11260
- -1  45  80 1.000 0 33201 11282
- -1  33  26 1.000 0 33201  6422
- -1  40  81 1.000 0 33201 11729
- -1  40  16 1.000 0 33201  7392
- -1  37  83 1.000 0 33201 11715
- -1  33  80 1.000 0 33201  6342
- -1  41  76 1.000 0 33201 11268
- -1  35  29 1.000 0 33201  6442
- -1   8  73 1.000 0 33201 11370
- -1  44  35 1.000 0 33201 10869
- -1  35  76 1.000 0 33201  6349
- -1   3  56 1.000 0 33201  7761
- -1  23  27 1.000 0 33201 11097
- -1  46   4 1.000 0 33201 11155
- -1  24  23 1.000 0 33201  7169
- -1  24  39 1.000 0 33201 10643
- -1  24  90 1.000 0 33201 11357
- -1  49  81 1.000 0 33201 11650
- -1  47  71 1.000 0 33201  7978
- -1  44  40 1.000 0 33106  4372
- -1   4  64 1.000 0 33106  4485
- -1  44  31 1.000 0 33201 10865
- -1  49   2 1.000 0 33201 11338
- -1  36  82 1.000 0 33201 11725
- -1  15  50 1.000 0 33201 10249
- -1   8  62 1.000 0 33201  7836
- -1  42  79 1.000 0 33201 11277
- -1  36   8 1.000 0 33201  7542
- -1  34   8 1.000 0 33201  7871
- -1  48  74 1.000 0 33201 11069
- -1  49  74 1.000 0 33201  7982
- -1  39   6 1.000 0 33201  7529
- -1   4  61 1.000 0 33106  4434
- -1  36   6 1.000 0 33201  7525
- -1  48  71 1.000 0 33201 11073
- -1  37   6 1.000 0 33201  7526
- -1  21  35 1.000 0 33201 10754
- -1  49  71 1.000 0 33201 11067
- -1  38  52 1.000 0 33106  4666
- -1  20  76 1.000 0 33201 11085
- -1   7  64 1.000 0 33201  7828
- -1  43  60 1.000 0 33106  4651
- -1  42  29 1.000 0 33201 11046
- -1  47  74 1.000 0 33201  7975
- -1  13  24 1.000 0 33106  4176
- -1  39  45 1.000 0 33106  4359
- -1  47  72 1.000 0 33201  7977
- -1  40  82 1.000 0 33201 11730
- -1  27  42 1.000 0 33201 10473
- -1  42  39 1.000 0 33106  4035
- -1  47  86 1.000 0 33201 11743
- -1  29  29 1.000 0 33201 10966
- -1  44  28 1.000 0 33201  7960
- -1  35  90 1.000 0 33201  7288
- -1  36  92 1.000 0 33201 11779
- -1  38  95 1.000 0 33201 11790
- -1  41  58 1.000 0 33106  4635
- -1  49  70 1.000 0 33201 11600
- -1  43  29 1.000 0 33201 11047
- -1  42  30 1.000 0 33201 11041
- -1   9  28 1.000 0 33106  4322
- -1  36  95 1.000 0 33201 11773
- -1  32  41 1.000 0 33201 10464
- -1  48  21 1.000 0 33201  7791
- -1  30  32 1.000 0 33201 10781
- -1  30  34 1.000 0 33201 10766
- -1  27  41 1.000 0 33201 10462
- -1  30  48 1.000 0 33201 10313
- -1  46  31 1.000 0 33201 11693
- -1  21  77 1.000 0 33201 11388
- -1  46  10 1.000 0 33201 11578
- -1  26  33 1.000 0 33201 10760
- -1  33  33 1.000 0 33201 10806
- -1   9  47 1.000 0 33201 10211
- -1  44  20 1.000 0 33201  7435
- -1  26  37 1.000 0 33201 11007
- -1  50  35 1.000 0 33201 11703
- -1  40  89 1.000 0 33201 11025
- -1  50  75 1.000 0 33201 11252
- -1  31  22 1.000 0 33201  7202
- -1  49  32 1.000 0 33201 11689
- -1  27  39 1.000 0 33201 10980
- -1  50  23 1.000 0 33201  7804
- -1  32  42 1.000 0 33201 10500
- -1  38  88 1.000 0 33201 11012
- -1  27  40 1.000 0 33201 10986
- -1  39  90 1.000 0 33201 11019
- -1  21  34 1.000 0 33201 10731
- -1  27  32 1.000 0 33201 10777
- -1  28  35 1.000 0 33201 10773
- -1  37  90 1.000 0 33201 11018
- -1  28  39 1.000 0 33201 10981
- -1  35  41 1.000 0 33201 10467
- -1  30  35 1.000 0 33201 10776
- -1  27  48 1.000 0 33201 10310
- -1  23  35 1.000 0 33201 10758
- -1  47  25 1.000 0 33201  7796
- -1  31  34 1.000 0 33201 10815
- -1  42  40 1.000 0 33106  4369
- -1  29  35 1.000 0 33201 10774
- -1  26  48 1.000 0 33201 10309
- -1  31  31 1.000 0 33201 10808
- -1  30  41 1.000 0 33201 10459
- -1  35  43 1.000 0 33201 10490
- -1  32  43 1.000 0 33201 10494
- -1  33  42 1.000 0 33201 10499
- -1  28  31 1.000 0 33201 10784
- -1  26  38 1.000 0 33201 11002
- -1  26  39 1.000 0 33201 10985
- -1  37  88 1.000 0 33201 11016
- -1  16  20 1.000 0 33201  7394
- -1  36  14 1.000 0 33201 11528
- -1  45  36 1.000 0 33106  4341
- -1  46  99 1.000 0 33201 11468
- -1  42  87 1.000 0 33201  7457
- -1  31  41 1.000 0 33201 10465
- -1  42  14 1.000 0 33201  7238
- -1  38  12 1.000 0 33201 11553
- -1  49  64 1.000 0 33106  4425
- -1  43  64 0.000 0 30399   773
- -1  29  44 1.000 0 33201 10488
- -1  37  89 1.000 0 33201 11017
- -1  32  82 1.000 0 33201 11452
- -1  48  32 1.000 0 33201 11688
- -1  47  66 1.000 0 33201 11612
- -1  27  26 1.000 0 33201 10956
- -1  41  20 1.000 0 33201  7431
- -1  32  88 1.000 0 33201  7297
- -1  49  21 1.000 0 33201  7793
- -1  29  47 1.000 0 33201 10319
- -1  29  34 1.000 0 33201 10767
- -1  26  42 1.000 0 33201 10474
- -1  29  32 1.000 0 33201 10778
- -1  24  33 1.000 0 33201 10736
- -1  50  65 1.000 0 33106  4528
- -1  42  13 1.000 0 33201  7232
- -1  47  16 1.000 0 33201  7243
- -1  37  34 1.000 0 33201 10843
- -1  33  21 1.000 0 33201  7209
- -1  42  90 1.000 0 33201  7452
- -1  43  14 1.000 0 33201  7239
- -1  43  38 1.000 0 33106  4375
- -1   7  50 1.000 0 33201 10229
- -1  12  46 1.000 0 33201 10241
- -1  43  16 1.000 0 33201  7427
- -1   8  50 1.000 0 33201 10228
- -1  44  11 1.000 0 33201  7223
- -1  49  63 1.000 0 33106  4468
- -1  41  90 1.000 0 33201  7447
- -1  19  34 1.000 0 33201 10698
- -1  48  63 1.000 0 33106  4560
- -1   8  48 1.000 0 33201 10222
- -1  22  78 1.000 0 33201 11394
- -1  43  17 1.000 0 33201  7439
- -1   6  48 1.000 0 33201 10221
- -1  35  32 1.000 0 33201 10794
- -1  46  70 1.000 0 33201 11616
- -1  29  31 1.000 0 33201 10783
- -1  28  33 1.000 0 33201 10764
- -1  26  35 1.000 0 33201 10775
- -1  35  23 1.000 0 33201  7198
- -1  45  38 1.000 0 33106  4352
- -1  33  31 1.000 0 33201 10792
- -1  10  58 1.000 0 33201  7631
- -1  47  64 1.000 0 33106  4549
- -1  39  89 1.000 0 33201 11020
- -1   9  56 1.000 0 33201  7639
- -1  12  58 1.000 0 33201  7672
- -1  15  58 1.000 0 33201  7643
- -1  40  90 1.000 0 33201 11028
- -1   9  57 1.000 0 33201  7638
- -1   9  59 1.000 0 33201  7636
- -1  10  56 1.000 0 33201  7633
- -1   8  56 1.000 0 33201  7626
- -1  32  89 1.000 0 33201  7296
- -1  13  60 1.000 0 33201  7664
- -1   9  76 1.000 0 33106  4516
- -1  49   9 1.000 0 33201 11559
- -1  15  45 1.000 0 33201 10388
- -1  21  79 1.000 0 33201 11392
- -1  15  59 1.000 0 33201  7642
- -1   6  46 1.000 0 33201 10203
- -1  32  35 1.000 0 33201 10798
- -1  30  33 1.000 0 33201 10762
- -1  28  41 1.000 0 33201 10461
- -1  39  86 1.000 0 33201 11022
- -1  31  23 1.000 0 33201  7189
- -1  46  74 1.000 0 33201  7965
- -1  40  86 1.000 0 33201 11029
- -1  26  30 1.000 0 33201 10960
- -1   8  46 1.000 0 33201 10207
- -1   7  60 1.000 0 33201  7616
- -1  12  60 1.000 0 33201  7669
- -1  29  41 1.000 0 33201 10460
- -1  30  47 1.000 0 33201 10320
- -1  34  33 1.000 0 33201 10805
- -1  30  45 1.000 0 33201 10484
- -1  35  31 1.000 0 33201 10790
- -1  26  45 1.000 0 33201 10483
- -1  26  41 1.000 0 33201 10463
- -1  27  31 1.000 0 33201 10785
- -1  27  35 1.000 0 33201 10772
- -1  26  31 1.000 0 33201 10786
- -1  41  89 1.000 0 33201  7448
- -1  29  42 1.000 0 33201 10471
- -1  27  30 1.000 0 33201 10961
- -1  28  37 1.000 0 33201 11005
- -1  47  14 1.000 0 33201 10605
- -1  50  11 1.000 0 33201 10608
- -1  50  31 1.000 0 33201 11698
- -1  27  34 1.000 0 33201 10771
- -1  34  44 1.000 0 33201 10507
- -1  29  26 1.000 0 33201 10958
- -1  28  26 1.000 0 33201 10957
- -1  35  34 1.000 0 33201 10810
- -1  23  89 1.000 0 33201 11353
- -1  34  34 1.000 0 33201 10811
- -1  33  34 1.000 0 33201 10812
- -1  46  36 1.000 0 33106  4291
- -1  18  28 1.000 0 33201 10902
- -1  30  37 1.000 0 33201 11003
- -1  26  32 1.000 0 33201 10780
- -1  38  90 1.000 0 33201 11011
- -1  37  43 1.000 0 33106  4395
- -1  46  66 1.000 0 33201 11617
- -1  48  65 1.000 0 33106  4431
- -1  45  20 1.000 0 33201  7436
- -1  42  20 1.000 0 33201  7432
- -1  32  34 1.000 0 33201 10813
- -1  34  41 1.000 0 33201 10468
- -1  35  33 1.000 0 33201 10804
- -1   9  46 1.000 0 33201 10205
- -1  38  89 1.000 0 33201 11010
- -1  36  90 1.000 0 33201 11034
- -1  30  44 1.000 0 33201 10489
- -1  47  67 1.000 0 33201 11611
- -1  30  39 1.000 0 33201 10983
- -1  50  83 1.000 0 33201 11654
- -1  33  23 1.000 0 33201  7191
- -1  38  43 1.000 0 33106  4394
- -1  28  42 1.000 0 33201 10472
- -1  42  78 1.000 0 33201 11275
- -1  28  34 1.000 0 33201 10769
- -1  38  87 1.000 0 33201 11009
- -1  34  43 1.000 0 33201 10492
- -1  38  44 1.000 0 33106  4384
- -1   6  64 1.000 0 33201  7840
- -1  14  47 1.000 0 33201 10233
- -1   5  50 1.000 0 33201 10456
- -1  29  36 1.000 0 33201 10994
- -1  41  38 1.000 0 33106  4373
- -1  32  23 1.000 0 33201  7192
- -1  38  86 1.000 0 33201 11008
- -1  14  50 1.000 0 33201 10248
- -1  21  90 1.000 0 33201 11347
- -1  37  44 1.000 0 33106  4383
- -1  50  64 1.000 0 33106  4474
- -1  48  62 1.000 0 33106  4529
- -1  50  73 1.000 0 33201 11254
- -1  40  44 1.000 0 33106  4386
- -1  40  43 1.000 0 33106  4389
- -1  31  81 1.000 0 33201 11463
- -1  48  16 1.000 0 33201  7244
- -1  40  77 1.000 0 33201 11242
- -1  35  24 1.000 0 33201  7194
- -1  28  44 1.000 0 33201 10487
- -1  40  20 1.000 0 33201  7387
- -1  29  48 1.000 0 33201 10312
- -1  27  37 1.000 0 33201 11006
- -1  32  87 1.000 0 33201  7298
- -1  34  23 1.000 0 33201  7190
- -1  28  48 1.000 0 33201 10311
- -1  36  89 1.000 0 33201 11033
- -1  36  88 1.000 0 33201 11032
- -1   5  45 1.000 0 33201 10537
- -1  13  47 1.000 0 33201 10232
- -1  46  62 1.000 0 33106  4589
- -1  28  32 1.000 0 33201 10779
- -1  37  86 1.000 0 33201 11013
- -1  28  38 1.000 0 33201 10999
- -1  27   9 1.000 0 33106  3388
- -1  18  38 1.000 0 33201 10590
- -1  29  37 1.000 0 33201 11004
- -1  36  20 1.000 0 33201  7381
- -1  14  46 1.000 0 33201 10243
- -1  50  74 1.000 0 33201 11253
- -1  48  75 1.000 0 33201 11068
- -1  27  44 1.000 0 33201 10486
- -1  41  19 1.000 0 33201  7419
- -1  26  44 1.000 0 33201 10485
- -1   4  47 1.000 0 33201 10404
- -1  37  87 1.000 0 33201 11014
- -1  36  87 1.000 0 33201 11031
- -1  49  23 1.000 0 33201  7803
- -1  29  38 1.000 0 33201 10998
- -1  50  99 1.000 0 33201 11485
- -1  39  87 1.000 0 33201 11023
- -1  45  40 1.000 0 33106  4367
- -1  27  38 1.000 0 33201 11000
- -1  29  39 1.000 0 33201 10982
- -1  11  47 1.000 0 33201 10230
- -1  13  46 1.000 0 33201 10242
- -1  37  20 1.000 0 33201  7384
- -1  40  78 1.000 0 33201 11243
- -1  41  78 1.000 0 33201 11272
- -1  15  56 1.000 0 33201  7646
- -1  46  65 1.000 0 33106  4617
- -1  27  91 1.000 0 33201 11417
- -1  40  76 1.000 0 33201 11240
- -1  42  38 1.000 0 33106  4374
- -1  50  21 1.000 0 33201  7794
- -1  18  34 1.000 0 33201 10700
- -1  28  47 1.000 0 33201 10318
- -1  31  32 1.000 0 33201 10793
- -1  47  63 1.000 0 33106  4558
- -1  26  34 1.000 0 33201 10770
- -1  30   9 1.000 0 33106  2184
- -1  44  38 1.000 0 33106  4378
- -1  30  42 1.000 0 33201 10470
- -1   9  48 1.000 0 33201 10219
- -1   9  40 1.000 0 33201 10940
- -1  27  93 1.000 0 33201 11415
- -1  10  59 1.000 0 33201  7630
- -1  33  41 1.000 0 33201 10469
- -1  29  33 1.000 0 33201 10763
- -1  37  77 1.000 0 33201 11235
- -1  13  57 1.000 0 33201  7667
- -1  47  35 1.000 0 33201 11700
- -1  47  31 1.000 0 33201 11695
- -1  36  86 1.000 0 33201 11030
- -1  30  30 1.000 0 33201 10962
- -1  49  31 1.000 0 33201 11697
- -1  41  14 1.000 0 33201  7236
- -1  45  17 1.000 0 33201  7441
- -1  39  46 1.000 0 33106  4234
- -1  47  32 1.000 0 33201 11687
- -1  32  45 1.000 0 33201 10477
- -1  47  79 1.000 0 33201 11624
- -1  39  88 1.000 0 33201 11024
- -1  50  77 1.000 0 33201 11645
- -1  50  66 1.000 0 33201 11594
- -1  50  62 1.000 0 33106  4489
- -1  27  94 1.000 0 33201 11414
- -1  41  79 1.000 0 33201 11271
- -1  41  11 1.000 0 33201  7220
- -1  28  45 1.000 0 33201 10482
- -1  46  75 1.000 0 33201  7964
- -1  43  40 1.000 0 33106  4371
- -1  48  33 1.000 0 33201 11675
- -1  31  84 1.000 0 33201 11461
- -1  10  60 1.000 0 33201  7627
- -1  40  80 1.000 0 33201 11239
- -1  27  45 1.000 0 33201 10481
- -1  46  33 1.000 0 33201 11678
- -1  13  59 1.000 0 33201  7665
- -1   1  49 1.000 0 33201 10220
- -1   9  60 1.000 0 33201  7634
- -1  30  38 1.000 0 33201 10997
- -1  48  34 1.000 0 33201 11682
- -1  35  89 1.000 0 33201  7289
- -1  50  32 1.000 0 33201 11691
- -1  50  63 1.000 0 33106  4486
- -1  26  36 1.000 0 33201 10996
- -1  17  36 1.000 0 33201 10585
- -1  40  87 1.000 0 33201 11026
- -1  48  31 1.000 0 33201 11696
- -1  15  60 1.000 0 33201  7640
- -1  43  13 1.000 0 33201  7233
- -1  40  88 1.000 0 33201 11027
- -1  31  45 1.000 0 33201 10478
- -1  36  43 1.000 0 33106  4393
- -1  27  92 1.000 0 33201 11416
- -1  37  36 1.000 0 33106  4267
- -1  12  57 1.000 0 33201  7673
- -1  41  36 1.000 0 33106  4366
- -1  28   6 1.000 0 33106  4638
- -1  15  57 1.000 0 33201  7645
- -1  13  58 1.000 0 33201  7666
- -1  28  36 1.000 0 33201 10995
- -1  33  44 1.000 0 33201 10506
- -1  46  32 1.000 0 33201 11686
- -1  29  45 1.000 0 33201 10480
- -1  41  86 1.000 0 33201  7451
- -1  46  90 1.000 0 33201 11741
- -1  47   2 1.000 0 33201 11324
- -1  35  45 1.000 0 33201 10479
- -1  33  45 1.000 0 33201 10476
- -1  29  30 1.000 0 33201 10963
- -1  47  17 1.000 0 33201  7260
- -1  36  11 1.000 0 33201 11542
- -1  47  62 1.000 0 33106  4561
- -1  49  33 1.000 0 33201 11679
- -1  12  59 1.000 0 33201  7670
- -1  21  88 1.000 0 33201 11344
- -1  21  80 1.000 0 33201 11391
- -1  12  47 1.000 0 33201 10231
- -1  47  10 1.000 0 33201 11574
- -1  13  56 1.000 0 33201  7668
- -1  47  75 1.000 0 33201  7972
- -1  49  10 1.000 0 33201 11576
- -1  10  57 1.000 0 33201  7632
- -1   9  58 1.000 0 33201  7637
- -1  15  48 1.000 0 33201 10239
- -1  50  71 1.000 0 33201 11259
- -1  11  48 1.000 0 33201 10237
- -1  45  39 1.000 0 33106  4251
- -1  12  48 1.000 0 33201 10235
- -1  37  79 1.000 0 33201 11237
- -1  47  34 1.000 0 33201 11680
- -1  50  72 1.000 0 33201 11257
- -1  41  80 1.000 0 33201 11270
- -1  21  78 1.000 0 33201 11389
- -1  34  45 1.000 0 33201 10475
- -1  36   5 1.000 0 33201 11903
- -1  14  48 1.000 0 33201 10238
- -1  11  46 1.000 0 33201 10240
- -1  39  81 1.000 0 33201 11721
- -1  41  43 1.000 0 33106  4416
- -1  39  43 1.000 0 33106  4390
- -1  48 100 1.000 0 33201 11490
- -1  15  46 1.000 0 33201 10244
- -1  13  48 1.000 0 33201 10236
- -1  38  97 1.000 0 33201 11918
- -1  37   5 1.000 0 33201 11907
- -1  38   4 1.000 0 33201 11913
- -1  39  96 1.000 0 33201 11915
- -1  39   4 1.000 0 33201 11908
- -1  46  93 1.000 0 33201 11892
- -1  37   4 1.000 0 33201 11912
- -1  36   4 1.000 0 33201 11910
- -1  40  96 1.000 0 33201 11920
- -1  36  97 1.000 0 33201 11922
- -1  39   5 1.000 0 33201 11905
- -1  19  87 1.000 0 33106  4544
- -1  44  97 1.000 0 33201 11888
- -1  46  92 1.000 0 33201 11893
- -1  46  91 1.000 0 33201 11894
- -1  20  86 1.000 0 33106  4548
- -1  17  86 1.000 0 33106  4562
- -1  16  87 1.000 0 33106  4563
- -1  46  95 1.000 0 33201 11895
- -1  10  76 1.000 0 33106  4494
- -1  36  96 1.000 0 33201 11930
- -1  38   5 1.000 0 33201 11906
- -1  18  14 1.000 0 33106  4554
- -1  20  14 1.000 0 33106  4551
- -1  22   9 1.000 0 33106  4512
- -1  19  86 1.000 0 33106  4545
- -1  24  92 1.000 0 33201 11900
- -1  25  91 1.000 0 33201 11901
- -1  20  15 1.000 0 33106  4532
- -1  16  14 1.000 0 33106  4557
- -1  46  94 1.000 0 33201 11891
- -1  37  96 1.000 0 33201 11924
- -1  18  87 1.000 0 33106  4546
- -1  19  14 1.000 0 33106  4555
- -1  24  91 1.000 0 33201 11898
- -1  39  97 1.000 0 33201 11919
- -1  23  92 1.000 0 33201 11896
- -1  37  97 1.000 0 33201 11925
- -1  22  91 1.000 0 33201 11859
- -1  17  14 1.000 0 33106  4556
- -1  38  96 1.000 0 33201 11926
- -1  21   9 1.000 0 33106  4507
- -1  47  82 1.000 0 33201 11882
- -1  25   9 1.000 0 33106  4514
- -1  23  10 1.000 0 33106  4482
- -1  49  93 1.000 0 33201 11874
- -1  24   9 1.000 0 33106  4509
- -1  49  95 1.000 0 33201 11871
- -1  44  99 1.000 0 33201 11884
- -1  50  93 1.000 0 33201 11867
- -1  50  92 1.000 0 33201 11864
- -1  49  91 1.000 0 33201 11872
- -1  47  81 1.000 0 33201 11880
- -1  19  15 1.000 0 33106  4537
- -1  22  10 1.000 0 33106  4479
- -1  47  84 1.000 0 33201 11876
- -1  21  10 1.000 0 33106  4481
- -1  24  10 1.000 0 33106  4484
- -1   9  77 1.000 0 33106  4499
- -1   9  78 1.000 0 33106  4498
- -1  16  15 1.000 0 33106  4530
- -1   9  80 1.000 0 33106  4504
- -1  50  94 1.000 0 33201 11865
- -1  47  85 1.000 0 33201 11870
- -1  18  15 1.000 0 33106  4542
- -1  47  83 1.000 0 33201 11878
- -1   9  79 1.000 0 33106  4503
- -1  23   9 1.000 0 33106  4511
- -1  40   4 1.000 0 33201 11909
- -1  49  92 1.000 0 33201 11873
- -1  50  95 1.000 0 33201 11868
- -1  44  96 1.000 0 33201 11887
- -1  44  98 1.000 0 33201 11890
- -1  25  10 1.000 0 33106  4490
- -1  49  94 1.000 0 33201 11875
- -1  20  87 1.000 0 33106  4547
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/pedWeightsAfterGainSwitch_CMS.txt b/CalibCalorimetry/EcalTrivialCondModules/data/pedWeightsAfterGainSwitch_CMS.txt
deleted file mode 100644
index 7312c0ce75935..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/pedWeightsAfterGainSwitch_CMS.txt
+++ /dev/null
@@ -1 +0,0 @@
-         0          0          0          0          0          0          0          0          0          0 
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/pedWeightsAfterGainSwitch_TB.txt b/CalibCalorimetry/EcalTrivialCondModules/data/pedWeightsAfterGainSwitch_TB.txt
deleted file mode 100644
index 647a8eedc2d68..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/pedWeightsAfterGainSwitch_TB.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
-         0          0          0          0          0          0          0          0          0          0
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/pedWeights_CMS.txt b/CalibCalorimetry/EcalTrivialCondModules/data/pedWeights_CMS.txt
deleted file mode 100644
index 07f955630baaf..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/pedWeights_CMS.txt
+++ /dev/null
@@ -1 +0,0 @@
-  0.305792   0.305792   0.305792          0 0.01323796 -0.07549743 -0.03141308 0.05030892  0.1259876          0 
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/pedWeights_TB.txt b/CalibCalorimetry/EcalTrivialCondModules/data/pedWeights_TB.txt
deleted file mode 100644
index 4f98d73650cb0..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/pedWeights_TB.txt
+++ /dev/null
@@ -1,50 +0,0 @@
- 0.2846759  0.2846759  0.2846759          0  0.1664007 -0.05623958 -0.05837796 0.00928635 0.08490277          0 
- 0.2880284  0.2880284  0.2880284          0  0.1555346 -0.06049341 -0.05847354 0.01131486 0.08803235          0 
- 0.2933786  0.2933786  0.2933786          0  0.1365816 -0.06559999 -0.05841579 0.01466958 0.09262876          0 
- 0.2961878  0.2961878  0.2961878          0   0.124973 -0.06813825 -0.05781458 0.01694097 0.09547541          0 
- 0.2990078  0.2990078  0.2990078          0  0.1108701 -0.07128185 -0.05622122  0.0204127 0.09919682          0 
- 0.3015879  0.3015879  0.3015879          0 0.09589976 -0.07347221 -0.05418408 0.02395103  0.1030417          0 
- 0.3032273  0.3032273  0.3032273          0 0.08324463 -0.07519864 -0.05182055 0.02750764  0.1065849          0 
- 0.3046198  0.3046198  0.3046198          0 0.07080351 -0.07614175 -0.04920619 0.03089608  0.1097889          0 
- 0.3056491  0.3056491  0.3056491          0 0.05775376 -0.07669584 -0.04600587 0.03463918  0.1133615          0 
-  0.306249   0.306249   0.306249          0 0.04603581 -0.07674304 -0.04285415 0.03832624  0.1164882          0 
- 0.3064249  0.3064249  0.3064249          0 0.03268806 -0.07654876 -0.03864618 0.04293716  0.1202949          0 
- 0.3063072  0.3063072  0.3063072          0 0.02370179 -0.07604216 -0.03559571 0.04616201  0.1228526          0 
-  0.305792   0.305792   0.305792          0 0.01323796 -0.07549743 -0.03141308 0.05030892  0.1259876          0 
- 0.3051494  0.3051494  0.3051494          0 0.003870272 -0.07449983 -0.0274846 0.05393715  0.1287288          0 
- 0.3041918  0.3041918  0.3041918          0 -0.00470164 -0.07339678 -0.02365972 0.05764671  0.1315361          0 
-   0.30342    0.30342    0.30342          0 -0.01039099 -0.07262776 -0.0208379 0.06024632  0.1333503          0 
-  0.302333   0.302333   0.302333          0 -0.01729768 -0.0713845 -0.01738438 0.06343564  0.1356318          0 
- 0.3009682  0.3009682  0.3009682          0 -0.02397814 -0.07033864 -0.01351401 0.06696553  0.1379605          0 
- 0.2998896  0.2998896  0.2998896          0  -0.029659 -0.06884582 -0.01042999  0.0695334  0.1397328          0 
- 0.2985446  0.2985446  0.2985446          0 -0.03470126 -0.06773829 -0.007253126 0.07237326  0.1416857          0 
- 0.2971483  0.2971483  0.2971483          0 -0.04033671 -0.06603251 -0.003862543 0.07532836  0.1434584          0 
- 0.2958294  0.2958294  0.2958294          0 -0.04464483 -0.0646998 -0.001006929 0.07774176  0.1451216          0 
- 0.2947494  0.2947494  0.2947494          0 -0.0474702 -0.06405701 0.001210384  0.0798223  0.1462463          0 
- 0.2934716  0.2934716  0.2934716          0 -0.05123601 -0.06266362 0.003859462 0.08191737  0.1477079          0 
-  0.292045   0.292045   0.292045          0 -0.05463019 -0.06147468 0.006484657 0.08425538  0.1492298          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/timeWeightsAfterGainSwitch_CMS.txt b/CalibCalorimetry/EcalTrivialCondModules/data/timeWeightsAfterGainSwitch_CMS.txt
deleted file mode 100644
index 7312c0ce75935..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/timeWeightsAfterGainSwitch_CMS.txt
+++ /dev/null
@@ -1 +0,0 @@
-         0          0          0          0          0          0          0          0          0          0 
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/timeWeightsAfterGainSwitch_TB.txt b/CalibCalorimetry/EcalTrivialCondModules/data/timeWeightsAfterGainSwitch_TB.txt
deleted file mode 100644
index 672e9fbcb0271..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/timeWeightsAfterGainSwitch_TB.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-         0          0          0          0          0   2.610619 -0.3071155  -1.311726  -1.369228  -1.093547 
-         0          0          0          0          0   2.589676 -0.2853282  -1.314601   -1.42452  -1.131628 
-         0          0          0          0          0   2.487381 -0.2515143  -1.380704  -1.349077  -1.084495 
-         0          0          0          0          0   3.588952 -0.5416101  -1.913221  -1.866068  -1.510746 
-         0          0          0          0          0   2.694474 -0.4714848  -1.445177  -1.367688  -1.134427 
-         0          0          0          0          0   3.121362 -0.5661185  -1.652293  -1.703784  -1.275541 
-         0          0          0          0          0   3.282208 -0.6570851  -1.758295  -1.737279  -1.365005 
-         0          0          0          0          0   3.669832  -0.842527  -1.914684  -1.920414  -1.520574 
-         0          0          0          0          0   3.459366 -0.7791004  -1.819069  -1.903939  -1.455003 
-         0          0          0          0          0   3.533255 -0.7720355   -2.01673  -1.851038  -1.496003 
-         0          0          0          0          0   3.252494 -0.7638853  -1.825963   -1.75012  -1.392965 
-         0          0          0          0          0   4.170797  -1.045824  -2.357142  -2.186587  -1.800313 
-         0          0          0          0          0   3.359801 -0.9785724  -1.847994   -1.71506  -1.408774 
-         0          0          0          0          0   3.948724  -1.103143  -2.156254  -2.150494  -1.781233 
-         0          0          0          0          0   4.035276  -1.026054  -2.362321  -2.336678  -1.737863 
-         0          0          0          0          0   4.980291  -1.470341  -2.863721   -2.62864  -2.216038 
-         0          0          0          0          0   3.950168  -1.106705  -2.333733  -2.220135  -1.746043 
-         0          0          0          0          0   4.071097  -1.318494  -2.414864   -2.15875  -1.652028 
-         0          0          0          0          0   5.314522  -1.611728  -3.025345  -3.122889  -2.454276 
-         0          0          0          0          0   4.299378   -1.26343  -2.649999  -2.474647  -1.920499 
-         0          0          0          0          0   5.000337   -1.52144  -3.173219  -2.757413  -2.251402 
-         0          0          0          0          0    5.23695  -1.577953  -3.202732  -3.141965  -2.470662 
-         0          0          0          0          0   5.630799  -1.811012  -3.689617  -2.965542  -2.590658 
-         0          0          0          0          0   5.276135  -1.571116  -3.048396  -3.522501  -2.747324 
-         0          0          0          0          0   4.729484  -1.272202  -3.052437  -2.931116  -2.708306 
-         0          0          0          0   1.107921   0.174114 -0.1841944  -0.278339  -0.253074          0 
-         0          0          0          0   1.050901  0.1287839 -0.1819063 -0.2630412 -0.2415244          0 
-         0          0          0          0  0.8668392 0.04909039 -0.1593142 -0.2173459 -0.1839008          0 
-         0          0          0          0   1.312221 0.08491896 -0.2770704 -0.3511874 -0.2962357          0 
-         0          0          0          0   1.034637 0.06783582 -0.2437514 -0.2998302 -0.2485062          0 
-         0          0          0          0   1.104052 0.02778239  -0.271919 -0.3145715 -0.2691198          0 
-         0          0          0          0    1.24732 0.04107483 -0.3366388 -0.3867348 -0.3243419          0 
-         0          0          0          0   1.237479 -0.0134781 -0.3484876 -0.3693614 -0.3069522          0 
-         0          0          0          0     1.2112 -0.02294244 -0.3591076 -0.3807499 -0.3224858          0 
-         0          0          0          0   1.252776 -0.03750591 -0.3861575 -0.4219122 -0.3360853          0 
-         0          0          0          0   1.214337 -0.03747316 -0.4027972 -0.4316941 -0.3509251          0 
-         0          0          0          0   1.566519 -0.05999641 -0.5442761 -0.5745441 -0.4590385          0 
-         0          0          0          0   1.320468 -0.03984249  -0.499047 -0.5080405 -0.4062186          0 
-         0          0          0          0   1.502744 -0.09261751 -0.5717449 -0.5740571 -0.4715516          0 
-         0          0          0          0   1.670559 -0.08141397 -0.6536179 -0.6962289 -0.5753786          0 
-         0          0          0          0   2.065032 -0.1022092 -0.8566201 -0.8771761 -0.6969029          0 
-         0          0          0          0   1.672232 -0.09504119 -0.7026957 -0.7337754 -0.5939788          0 
-         0          0          0          0   1.763886 -0.07977951 -0.7950461 -0.8104109 -0.6372672          0 
-         0          0          0          0   2.079831 -0.2285402 -0.9027075 -0.8836335 -0.7333837          0 
-         0          0          0          0   1.957293 -0.1112531 -0.9016468 -0.9527784 -0.7669121          0 
-         0          0          0          0   2.000525 -0.2420506 -0.9071293 -0.9243639 -0.7101374          0 
-         0          0          0          0   2.509567 -0.1373278  -1.225833  -1.286695  -1.064631          0 
-         0          0          0          0   2.815782 -0.07090253  -1.448812  -1.573048  -1.177093          0 
-         0          0          0          0   2.405184  -0.270093  -1.166415   -1.15904  -1.028292          0 
-         0          0          0          0    2.45604 -0.1615474  -1.234699   -1.35957  -1.115095          0 
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/timeWeights_CMS.txt b/CalibCalorimetry/EcalTrivialCondModules/data/timeWeights_CMS.txt
deleted file mode 100644
index 4766ed4fdc57f..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/timeWeights_CMS.txt
+++ /dev/null
@@ -1 +0,0 @@
-0.04066309 0.04066309 0.04066309          0   1.325176 -0.04997078  -0.504338 -0.5024844 -0.3903718          0 
diff --git a/CalibCalorimetry/EcalTrivialCondModules/data/timeWeights_TB.txt b/CalibCalorimetry/EcalTrivialCondModules/data/timeWeights_TB.txt
deleted file mode 100644
index 748e12230500e..0000000000000
--- a/CalibCalorimetry/EcalTrivialCondModules/data/timeWeights_TB.txt
+++ /dev/null
@@ -1,50 +0,0 @@
--0.1722233 -0.1722233 -0.1722233          0    1.08266  0.2199886 -0.1614138 -0.3029017 -0.3216635          0 
--0.1502749 -0.1502749 -0.1502749          0   1.030529  0.1677933 -0.1619186 -0.2841568  -0.301422          0 
--0.1089498 -0.1089498 -0.1089498          0  0.8551314 0.07566116 -0.1447909 -0.2325757 -0.2265765          0 
--0.1447401 -0.1447401 -0.1447401          0   1.295656  0.1210968 -0.2582153 -0.3713774 -0.3529398          0 
--0.09493371 -0.09493371 -0.09493371          0    1.02314 0.09202164 -0.2314858 -0.3131803 -0.2856941          0 
--0.08463531 -0.08463531 -0.08463531          0   1.094758 0.04884441 -0.2610524 -0.3263128 -0.3023311          0 
--0.07365247 -0.07365247 -0.07365247          0   1.238583 0.05971835 -0.3271509 -0.3969765 -0.3532167          0 
--0.06107195 -0.06107195 -0.06107195          0   1.231276 0.001700192 -0.3408732 -0.3779411 -0.3309458          0 
--0.03858701 -0.03858701 -0.03858701          0   1.207098 -0.0133203  -0.354245 -0.3861253 -0.3376463          0 
--0.02179584 -0.02179584 -0.02179584          0   1.250466 -0.03207299 -0.3834052 -0.4249651 -0.3446349          0 
-0.002620844 0.002620844 0.002620844          0    1.21463 -0.03812831 -0.4031324 -0.4313319 -0.3499002          0 
-0.02186105 0.02186105 0.02186105          0   1.568952 -0.06545191 -0.5470741 -0.5715215 -0.4504879          0 
-0.04066309 0.04066309 0.04066309          0   1.325176 -0.04997078  -0.504338 -0.5024844 -0.3903718          0 
-0.06349962 0.06349962 0.06349962          0   1.509836 -0.1085079 -0.5798561 -0.5652345 -0.4467366          0 
- 0.1031096  0.1031096  0.1031096          0   1.683293  -0.106991 -0.6672435 -0.6826601 -0.5357277          0 
- 0.1434847  0.1434847  0.1434847          0    2.08225 -0.1376497 -0.8756553 -0.8580875  -0.641312          0 
-  0.139097   0.139097   0.139097          0   1.689433 -0.1293136 -0.7212663 -0.7156301 -0.5405142          0 
- 0.1714725  0.1714725  0.1714725          0   1.785332 -0.1214419 -0.8185696 -0.7883881 -0.5713499          0 
- 0.2046678  0.2046678  0.2046678          0   2.103287 -0.2803276 -0.9287918 -0.8547438 -0.6534278          0 
-  0.238415   0.238415   0.238415          0   1.988387 -0.1686909 -0.9345287 -0.9236076 -0.6768047          0 
- 0.2397122  0.2397122  0.2397122          0   2.028149  -0.302599 -0.9375263 -0.8913953  -0.615765          0 
- 0.3714909  0.3714909  0.3714909          0   2.559393 -0.2243697  -1.278821  -1.243361 -0.9273143          0 
- 0.4487159  0.4487159  0.4487159          0   2.875757 -0.1717505  -1.515012  -1.525407  -1.009735          0 
- 0.3746148  0.3746148  0.3746148          0   2.453932 -0.3629014  -1.216847  -1.109481 -0.8885464          0 
- 0.4371479  0.4371479  0.4371479          0   2.516575 -0.2629263  -1.296533  -1.312229 -0.9563309          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
-         0          0          0          0          0          0          0          0          0          0 
diff --git a/CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h b/CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h
index 75f87f54b0b53..54002bb650d2c 100644
--- a/CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h
+++ b/CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h
@@ -89,6 +89,8 @@
 #include "CondFormats/DataRecord/interface/EcalTPGCrystalStatusRcd.h"
 #include "CondFormats/EcalObjects/interface/EcalMappingElectronics.h"
 #include "CondFormats/DataRecord/interface/EcalMappingElectronicsRcd.h"
+#include "CondFormats/EcalObjects/interface/EcalPFRecHitThresholds.h"
+#include "CondFormats/DataRecord/interface/EcalPFRecHitThresholdsRcd.h"
 
 #include "FWCore/Framework/interface/IOVSyncValue.h"
 
@@ -156,6 +158,8 @@ class EcalTrivialConditionRetriever : public edm::ESProducer,
   virtual std::unique_ptr<EcalClusterEnergyCorrectionParameters> produceEcalClusterEnergyCorrectionParameters( const EcalClusterEnergyCorrectionParametersRcd& );
   virtual std::unique_ptr<EcalClusterEnergyUncertaintyParameters> produceEcalClusterEnergyUncertaintyParameters( const EcalClusterEnergyUncertaintyParametersRcd& );
   virtual std::unique_ptr<EcalClusterEnergyCorrectionObjectSpecificParameters> produceEcalClusterEnergyCorrectionObjectSpecificParameters( const EcalClusterEnergyCorrectionObjectSpecificParametersRcd& );
+  virtual std::unique_ptr<EcalPFRecHitThresholds> produceEcalPFRecHitThresholds( const EcalPFRecHitThresholdsRcd& );
+  virtual std::unique_ptr<EcalPFRecHitThresholds>  getPFRecHitThresholdsFromConfiguration ( const EcalPFRecHitThresholdsRcd& ) ;
 
 
   virtual std::unique_ptr<EcalChannelStatus> produceEcalChannelStatus( const EcalChannelStatusRcd& );
@@ -223,12 +227,24 @@ class EcalTrivialConditionRetriever : public edm::ESProducer,
   std::vector<double> energyCorrectionParameters_;
   std::vector<double> energyUncertaintyParameters_;
   std::vector<double> energyCorrectionObjectSpecificParameters_;
+  double pfRecHitThresholdsNSigmas_;
+  double pfRecHitThresholdsNSigmasHEta_;
+  double pfRecHitThresholdsEB_;
+  double pfRecHitThresholdsEE_;
 
   double sim_pulse_shape_EB_thresh_;
   double sim_pulse_shape_EE_thresh_;
   double sim_pulse_shape_APD_thresh_;
   float sim_pulse_shape_TI_;
 
+  double laserAlphaMeanEER_higheta_;  
+  double laserAlphaMeanEEC_higheta_;  
+  
+  std::string pfRecHitFile_ ;
+  std::string pfRecHitFileEE_ ;
+  
+  std::string EELaserAlphaFile2_;
+  
 
   // ageing parameters 
   double totLumi_;
@@ -359,6 +375,7 @@ class EcalTrivialConditionRetriever : public edm::ESProducer,
   bool producedEcalAlignmentEE_;
   bool producedEcalAlignmentES_;
   bool producedEcalSimPulseShape_;
+  bool producedEcalPFRecHitThresholds_;
   bool getEBAlignmentFromFile_;
   bool getEEAlignmentFromFile_;
   bool getESAlignmentFromFile_;
diff --git a/CalibCalorimetry/EcalTrivialCondModules/python/EcalTrivialCondRetriever_cfi.py b/CalibCalorimetry/EcalTrivialCondModules/python/EcalTrivialCondRetriever_cfi.py
index 05b0f441cff46..ab2a176efb28a 100644
--- a/CalibCalorimetry/EcalTrivialCondModules/python/EcalTrivialCondRetriever_cfi.py
+++ b/CalibCalorimetry/EcalTrivialCondModules/python/EcalTrivialCondRetriever_cfi.py
@@ -39,6 +39,14 @@
     producedEcalADCToGeVConstant = cms.untracked.bool(True),
     adcToGeVEBConstant = cms.untracked.double(0.035),
     adcToGeVEEConstant = cms.untracked.double(0.06),
+### phase I Pulse Shapes
+    sim_pulse_shape_TI = cms.untracked.double( 1.0),
+    sim_pulse_shape_EB_thresh = cms.double(0.00013),
+    sim_pulse_shape_EE_thresh = cms.double(0.00025),
+    sim_pulse_shape_APD_thresh = cms.double(0),
+    EBSimPulseShapeFile = cms.untracked.string("EB_SimPulseShape.txt"),
+    EESimPulseShapeFile = cms.untracked.string("EE_SimPulseShape.txt"),
+    APDSimPulseShapeFile = cms.untracked.string("APD_SimPulseShape.txt"),
     # cluster functions/corrections -- by default no parameters are passed
     producedEcalClusterLocalContCorrParameters = cms.untracked.bool(True),
     localContCorrParameters = cms.untracked.vdouble( 
diff --git a/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialConditionRetriever.cc b/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialConditionRetriever.cc
index a90182196dab3..70b2e9a4eb610 100644
--- a/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialConditionRetriever.cc
+++ b/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialConditionRetriever.cc
@@ -72,6 +72,12 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
   laserAPDPNMean_ = ps.getUntrackedParameter<double>("laserAPDPNMean",1.0);
   laserAPDPNSigma_ = ps.getUntrackedParameter<double>("laserAPDPNSigma",0.0);
 
+  pfRecHitThresholdsNSigmas_ = ps.getUntrackedParameter<double>("EcalPFRecHitThresholdNSigmas", 1.0 );
+  pfRecHitThresholdsNSigmasHEta_ = ps.getUntrackedParameter<double>("EcalPFRecHitThresholdNSigmasHEta", 1.0 );
+  pfRecHitThresholdsEB_ = ps.getUntrackedParameter<double>("EcalPFRecHitThresholdEB", 0.0 );
+  pfRecHitThresholdsEE_ = ps.getUntrackedParameter<double>("EcalPFRecHitThresholdEE", 0.0 );
+
+
   localContCorrParameters_ = ps.getUntrackedParameter< std::vector<double> >("localContCorrParameters", std::vector<double>(0) );
   crackCorrParameters_ = ps.getUntrackedParameter< std::vector<double> >("crackCorrParameters", std::vector<double>(0) );
   energyCorrectionParameters_ = ps.getUntrackedParameter< std::vector<double> >("energyCorrectionParameters", std::vector<double>(0) );
@@ -123,14 +129,14 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
 
   weightsForAsynchronousRunning_ = ps.getUntrackedParameter<bool>("weightsForTB",false);
 
-  std::cout << " EcalTrivialConditionRetriever " << std::endl;
+  edm::LogInfo(" EcalTrivialConditionRetriever ");
 
 
 
   if(totLumi_ > 0 ) {
 
-    std::cout << " EcalTrivialConditionRetriever going to create conditions based on the damage deu to "<<totLumi_<<
-      " fb-1 integrated luminosity" << std::endl;
+    edm::LogInfo(" EcalTrivialConditionRetriever going to create conditions based on the damage deu to ")<<totLumi_<<
+      " fb-1 integrated luminosity";
 
   }
 
@@ -323,6 +329,22 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
     findingRecord<EcalSimPulseShapeRcd> () ;
   }
 
+   producedEcalPFRecHitThresholds_ = ps.getUntrackedParameter<bool>("producedEcalPFRecHitThresholds", false);
+
+   // new for PFRecHit Thresholds
+   pfRecHitFile_ = ps.getUntrackedParameter<std::string>("PFRecHitFile","");
+   pfRecHitFileEE_ = ps.getUntrackedParameter<std::string>("PFRecHitFileEE","");
+ 
+ 
+   if (producedEcalPFRecHitThresholds_) { // user asks to produce constants
+     if(!pfRecHitFile_.empty()) {  // if file provided read constants
+         setWhatProduced (this, &EcalTrivialConditionRetriever::getPFRecHitThresholdsFromConfiguration ) ;
+     } else { // set all constants to 0
+         setWhatProduced (this, &EcalTrivialConditionRetriever::produceEcalPFRecHitThresholds ) ;
+     }
+     findingRecord<EcalPFRecHitThresholdsRcd> () ;
+   }
+
 
   // cluster corrections
   producedEcalClusterLocalContCorrParameters_ = ps.getUntrackedParameter<bool>("producedEcalClusterLocalContCorrParameters", false);
@@ -352,7 +374,7 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
   }
 
   // laser correction
-  producedEcalLaserCorrection_ = ps.getUntrackedParameter<bool>("producedEcalLaserCorrection",true);
+  producedEcalLaserCorrection_ = ps.getUntrackedParameter<bool>("producedEcalLaserCorrection",false);
   if (producedEcalLaserCorrection_) { // user asks to produce constants
     // set all constants to 1. or smear as specified by user
     setWhatProduced (this, &EcalTrivialConditionRetriever::produceEcalLaserAlphas ) ;
@@ -361,10 +383,10 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
     getLaserAlphaFromFileEE_ = ps.getUntrackedParameter<bool>("getLaserAlphaFromFileEE",false);
     getLaserAlphaFromTypeEB_ = ps.getUntrackedParameter<bool>("getLaserAlphaFromTypeEB",false);
     getLaserAlphaFromTypeEE_ = ps.getUntrackedParameter<bool>("getLaserAlphaFromTypeEE",false);
-    std::cout << " getLaserAlphaFromFileEB_ " <<  getLaserAlphaFromFileEB_ << std::endl;
-    std::cout << " getLaserAlphaFromFileEE_ " <<  getLaserAlphaFromFileEE_ << std::endl;
-    std::cout << " getLaserAlphaFromTypeEB_ " <<  getLaserAlphaFromTypeEB_ << std::endl;
-    std::cout << " getLaserAlphaFromTypeEE_ " <<  getLaserAlphaFromTypeEE_ << std::endl;
+    edm::LogInfo(" getLaserAlphaFromFileEB_ ") <<  getLaserAlphaFromFileEB_;
+    edm::LogInfo(" getLaserAlphaFromFileEE_ ") <<  getLaserAlphaFromFileEE_;
+    edm::LogInfo(" getLaserAlphaFromTypeEB_ ") <<  getLaserAlphaFromTypeEB_;
+    edm::LogInfo(" getLaserAlphaFromTypeEE_ ") <<  getLaserAlphaFromTypeEE_;
     if(getLaserAlphaFromFileEB_) {
       EBLaserAlphaFile_ = ps.getUntrackedParameter<std::string>("EBLaserAlphaFile",path+"EBLaserAlpha.txt"); // file is used to read the alphas
     }
@@ -377,9 +399,12 @@ EcalTrivialConditionRetriever::EcalTrivialConditionRetriever( const edm::Paramet
       EBLaserAlphaFile_ = ps.getUntrackedParameter<std::string>("EBLaserAlphaFile",path+"EBLaserAlpha.txt"); // file to find out which one is russian/chinese
     }
     if(getLaserAlphaFromTypeEE_) {
-      laserAlphaMeanEER_  = ps.getUntrackedParameter<double>("laserAlphaMeanEER",1.16); // alpha russian crystals in EE
-      laserAlphaMeanEEC_  = ps.getUntrackedParameter<double>("laserAlphaMeanEEC",1.00); // alpha chinese crystals in EE
-      EELaserAlphaFile_ = ps.getUntrackedParameter<std::string>("EELaserAlphaFile",path+"EELaserAlpha.txt"); // file is used to find out which one is russian or chinese
+      laserAlphaMeanEEC_higheta_  = ps.getUntrackedParameter<double>("laserAlphaMeanEEC_higheta",1.00); // alpha chinese crystals in EE for eta>2.5                         
+      laserAlphaMeanEER_higheta_  = ps.getUntrackedParameter<double>("laserAlphaMeanEER_higheta",1.16); // alpha russian crystals in EE for eta>2                           
+      laserAlphaMeanEER_  = ps.getUntrackedParameter<double>("laserAlphaMeanEER",1.16); // alpha russian crystals in EE                                                     
+      laserAlphaMeanEEC_  = ps.getUntrackedParameter<double>("laserAlphaMeanEEC",1.00); // alpha chinese crystals in EE                                                     
+      EELaserAlphaFile_ = ps.getUntrackedParameter<std::string>("EELaserAlphaFile",path+"EELaserAlpha.txt"); // file is used to find out which one is russian or chinese    
+      EELaserAlphaFile2_ = ps.getUntrackedParameter<std::string>("EELaserAlphaFile2",path+"EELaserAlpha2.txt"); // file is used to read the alphas                          
     }
     setWhatProduced (this, &EcalTrivialConditionRetriever::produceEcalLaserAPDPNRatiosRef ) ;
     findingRecord<EcalLaserAPDPNRatiosRefRcd> () ;
@@ -498,7 +523,7 @@ EcalTrivialConditionRetriever::setIntervalFor( const edm::eventsetup::EventSetup
                                                const edm::IOVSyncValue& iTime,
                                                edm::ValidityInterval& oValidity)
 {
-  if(verbose_>=1) std::cout << "EcalTrivialConditionRetriever::setIntervalFor(): record key = " << rk.name() << "\ttime: " << iTime.time().value() << std::endl;
+  if(verbose_>=1) edm::LogInfo("EcalTrivialConditionRetriever::setIntervalFor(): record key = ") << rk.name() << "\ttime: " << iTime.time().value();
   //For right now, we will just use an infinite interval of validity
   oValidity = edm::ValidityInterval( edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime() );
 }
@@ -544,7 +569,7 @@ EcalTrivialConditionRetriever::produceEcalPedestals( const EcalPedestalsRcd& ) {
       EBitem.rms_x1   = EBpedRMSX1_*noisefactor;
       EBitem.rms_x6   = EBpedRMSX6_*noisefactor;
       EBitem.rms_x12  = EBpedRMSX12_*noisefactor;
-      std::cout << "rms ped at eta:"<< eta<<" ="<< EBitem.rms_x12 << std::endl;
+      edm::LogInfo("rms ped at eta:")<< eta<<" ="<< EBitem.rms_x12;
     }
 
 
@@ -690,6 +715,47 @@ EcalTrivialConditionRetriever::produceEcalLinearCorrections( const EcalLinearCor
 
 }
 
+// new for the PF Rec Hit Thresholds                                                                                                                                        
+
+std::unique_ptr<EcalPFRecHitThresholds>
+EcalTrivialConditionRetriever::produceEcalPFRecHitThresholds( const EcalPFRecHitThresholdsRcd& )
+{
+  auto ical = std::make_unique<EcalPFRecHitThresholds>();
+
+  for(int ieta=-EBDetId::MAX_IETA; ieta<=EBDetId::MAX_IETA ;++ieta) {
+    if(ieta==0) continue;
+    for(int iphi=EBDetId::MIN_IPHI; iphi<=EBDetId::MAX_IPHI; ++iphi) {
+      // make an EBDetId since we need EBDetId::rawId() to be used as the key for the pedestals                                                                             
+      if (EBDetId::validDetId(ieta,iphi))
+        {
+          EBDetId ebid(ieta,iphi);
+          ical->setValue( ebid.rawId(), pfRecHitThresholdsEB_  );
+        }
+    }
+  }
+
+  for(int iX=EEDetId::IX_MIN; iX<=EEDetId::IX_MAX ;++iX) {
+    for(int iY=EEDetId::IY_MIN; iY<=EEDetId::IY_MAX; ++iY) {
+      // make an EEDetId since we need EEDetId::rawId() to be used as the key for the pedestals                                                                             
+      if (EEDetId::validDetId(iX,iY,1))
+        {
+          EEDetId eedetidpos(iX,iY,1);
+          ical->setValue( eedetidpos.rawId(), pfRecHitThresholdsEE_ );
+        }
+      if(EEDetId::validDetId(iX,iY,-1))
+        {
+          EEDetId eedetidneg(iX,iY,-1);
+          ical->setValue( eedetidneg.rawId(), pfRecHitThresholdsEE_ );
+        }
+    }
+  }
+
+  return ical;
+}
+
+
+
+
 //------------------------------
 
 std::unique_ptr<EcalIntercalibConstants>
@@ -884,8 +950,8 @@ EcalTrivialConditionRetriever::produceEcalTimeCalibErrors( const EcalTimeCalibEr
 std::unique_ptr<EcalTimeOffsetConstant>
 EcalTrivialConditionRetriever::produceEcalTimeOffsetConstant( const EcalTimeOffsetConstantRcd& )
 {
-  std::cout << " produceEcalTimeOffsetConstant: " << std::endl;
-  std::cout << "  EB " << timeOffsetEBConstant_ << " EE " <<  timeOffsetEEConstant_<< std::endl;
+  edm::LogInfo(" produceEcalTimeOffsetConstant: ");
+  edm::LogInfo("  EB ") << timeOffsetEBConstant_ << " EE " <<  timeOffsetEEConstant_;
   return std::make_unique<EcalTimeOffsetConstant>(timeOffsetEBConstant_,timeOffsetEEConstant_);
 }
 
@@ -1070,6 +1136,7 @@ EcalTrivialConditionRetriever::produceEcalClusterEnergyCorrectionObjectSpecificP
 }
 
 
+/* 
 // laser records
 std::unique_ptr<EcalLaserAlphas>
 EcalTrivialConditionRetriever::produceEcalLaserAlphas( const EcalLaserAlphasRcd& )
@@ -1244,6 +1311,273 @@ EcalTrivialConditionRetriever::produceEcalLaserAlphas( const EcalLaserAlphasRcd&
   
   return ical;
 }
+*/ 
+
+// laser alphas                                                                                                                                                             
+std::unique_ptr<EcalLaserAlphas>
+EcalTrivialConditionRetriever::produceEcalLaserAlphas( const EcalLaserAlphasRcd& )
+{
+
+  edm::LogInfo(" produceEcalLaserAlphas ");
+  auto ical = std::make_unique<EcalLaserAlphas>();
+
+  // get Barrel alpha from type                                                                                                                                             
+  if(getLaserAlphaFromTypeEB_) {
+    std::ifstream fEB(edm::FileInPath(EBLaserAlphaFile_).fullPath().c_str());
+    int SMpos[36] = {-10, 4, -7, -16, 6, -9, 11, -17, 5, 18, 3, -8, 1, -3, -13, 14, -6, 2,
+                     15, -18, 8, 17, -2, 9, -1, 10, -5, 7, -12, -11, 16, -4, -15, -14, 12, 13};
+    // check!                                                                                                                                                               
+    int SMCal[36] = {12,17,10, 1, 8, 4,27,20,23,25, 6,34,35,15,18,30,21, 9,
+                     24,22,13,31,26,16, 2,11, 5, 0,29,28,14,33,32, 3, 7,19};
+
+    for(int SMcons = 0; SMcons < 36; SMcons++) {
+      int SM = SMpos[SMcons];
+      if(SM < 0) SM = 17 + abs(SM);
+      else SM--;
+      if(SMCal[SM] != SMcons)
+	edm::LogInfo(" SM pb : read SM ") <<  SMcons<< " SMpos " << SM
+                   << " SMCal " << SMCal[SM];
+    }
+
+    std::string type, batch;
+    int readSM, pos, bar, bar2;
+    float alpha = 0;
+    for(int SMcons = 0; SMcons < 36; SMcons++) {
+      int SM = SMpos[SMcons];
+      for(int ic = 0; ic < 1700; ic++) {
+        fEB >> readSM >> pos >> bar >>  bar2 >> type >> batch;
+
+        if(readSM != SMcons || pos != ic + 1)
+          edm::LogInfo(" barrel read pb read SM ") << readSM << " const SM " << SMcons
+                    << " read pos " << pos << " ic " << ic ;
+        if(SM < 0) SM = 18 + abs(SM);
+        EBDetId ebdetid(SM, pos, EBDetId::SMCRYSTALMODE);
+        if(bar == 33101 || bar == 30301 )
+          alpha = laserAlphaMeanEBR_;
+        else if(bar == 33106) {
+          if(bar2 <= 2000)
+            alpha = laserAlphaMeanEBC_;
+          else {
+            edm::LogInfo(" problem with barcode first ") << bar << " last " << bar2
+                      << " read SM " << readSM << " read pos " << pos ;
+            alpha = laserAlphaMeanEBR_;
+          }
+        }
+        ical->setValue( ebdetid, alpha );
+        
+	if (ic==1650 ) {
+          edm::LogInfo(" ic/alpha ")<<ic<<"/"<<alpha;
+        }
+
+      }
+    }  // loop over SMcons                                                                                                                                                  
+    fEB.close();
+    // end laserAlpha from type                                                                                                                                             
+  }    else if(getLaserAlphaFromFileEB_) {
+    // laser alpha from file                                                                                                                                                
+    edm::LogInfo("Laser alpha for EB will be taken from File");
+    int ieta, iphi;
+    float alpha;
+    std::ifstream fEB(edm::FileInPath(EBLaserAlphaFile_).fullPath().c_str());
+    //    std::ifstream fEB(EBLaserAlphaFile_.c_str());                                                                                                                     
+    for(int ic = 0; ic < 61200; ic++) {
+      fEB >> ieta>> iphi>>alpha;
+
+      if (EBDetId::validDetId(ieta,iphi)) {
+        EBDetId ebid(ieta,iphi);
+        ical->setValue( ebid, alpha );
+        //std::cout << " ieta/iphi/alpha "<<ieta<<"/"<<iphi<<"/"<<alpha<<std::endl;                                                                                         
+      }
+      if (ieta==10) {
+        edm::LogInfo("I will print some alphas from the file... ieta/iphi/alpha ")<<ieta<<"/"<<iphi<<"/"<<alpha;
+      }
+    }
+    fEB.close();
+
+  } else {
+    edm::LogInfo("laser alphas from default values");
+
+    // laser alpha from mean and smearing                                                                                                                                   
+    for(int ieta=-EBDetId::MAX_IETA; ieta<=EBDetId::MAX_IETA; ++ieta) {
+      if(ieta==0) continue;
+      for(int iphi=EBDetId::MIN_IPHI; iphi<=EBDetId::MAX_IPHI; ++iphi) {
+        if (EBDetId::validDetId(ieta,iphi)) {
+          EBDetId ebid(ieta,iphi);
+          double r = (double)std::rand()/( double(RAND_MAX)+double(1) );
+          ical->setValue( ebid, laserAlphaMean_ + r*laserAlphaSigma_ );
+        }
+      }  // loop over iphi                                                                                                                                                  
+    }  // loop over ieta                                                                                                                                                    
+  }   // do not read a file                                                                                                                                                 
+
+  edm::LogInfo(" produceEcalLaserAlphas EE");
+  // read mean laser per ring per year                                                                                                                                        
+
+  int itype, iring, iyear;
+  float laser=0;
+  float las[2][140][6];
+
+  if(getLaserAlphaFromTypeEE_) {
+    edm::LogInfo(" EE laser alphas from type");
+
+  std::ifstream fRing(edm::FileInPath(EELaserAlphaFile2_).fullPath().c_str());
+  for(int i = 0; i<1681; i++){
+
+    fRing >> itype>> iring>> iyear>> laser;
+    edm::LogInfo(" ") <<itype<<" "<<iring<<" "<<iyear<<" "<<laser<<std::endl;
+    las[itype][iring][iyear]=laser;
+  }
+  fRing.close();
+
+
+    std::ifstream fEE(edm::FileInPath(EELaserAlphaFile_).fullPath().c_str());
+    int nxt=0;
+    for(int crystal = 0; crystal < 14648; crystal++) {
+      int x, y ,z, bid, bar, bar2;
+      float LY, alpha = 0;
+      fEE >> z >> x >> y >> LY >> bid >> bar >> bar2;
+      if(x < 1 || x > 100 || y < 1 || y > 100)
+        edm::LogInfo(" wrong coordinates for barcode ") << bar
+                  << " x " << x << " y " << y << " z " << z;
+      else {
+        int iyear=4;
+        int iring = (int)(sqrt( ((float)x-50.5)*((float)x-50.5)
+                                  +((float)y-50.5)*((float)y-50.5))+85);
+
+
+        double eta= -log(tan(0.5*atan(sqrt((x-50.5)
+                                           *(x-50.5)+
+                                           (y-50.5)*
+                                           (y-50.5))
+                                      *2.98/328.)));
+
+
+        if(bar == 33201 || (bar == 30399 && bar2 < 568)){
+          // russian                                                                                                                                                          
+            alpha = laserAlphaMeanEER_;
+
+            double raggio=50.5-sqrt(((float)x-50.5)*((float)x-50.5)+
+                               ((float)y-50.5)*((float)y-50.5));
+
+
+            if(raggio>=25){
+              alpha =1.07;
+            }
+            /*                                                                                                                                                                
+            if(raggio>=34){                                                                                                                                                   
+                                                                                                                                                                              
+              if(eta>2.0) {                                                                                                                                                   
+                itype=0;                                                                                                                                                      
+                if(las[itype][iring][iyear]!=999){                                                                                                                            
+                  alpha=0.8044+0.3555*las[itype][iring][iyear];                                                                                                               
+                }                                                                                                                                                             
+              }                                                                                                                                                               
+                                                                                                                                                                              
+            }                                                                                                                                                                 
+            */
+
+            if(x==50) edm::LogInfo("R=")<<raggio<< " x " << x << " y " << y << " z " << z <<"eta="<<eta<<" alpha="<<alpha<<" R";
+
+        } else if((bar == 33106 && bar2 > 2000 && bar2 < 4669)
+                  || (bar == 30399 && bar2 > 567)) {
+          // SIC                                                                                                                                                              
+          itype=1;
+          alpha = laserAlphaMeanEEC_;
+
+
+          double raggio=50.5-sqrt(((float)x-50.5)*((float)x-50.5)+
+                                  ((float)y-50.5)*((float)y-50.5));
+
+
+          if(raggio>=25){
+            alpha =0.80;
+          }
+          if(raggio>=34){
+            float r=sqrt((x-50.5)*(x-50.5)+(y-50.5)*(y-50.5));
+            if(r<21){
+              nxt=nxt+1;
+              // inner SIC crystals                                                                                                                                           
+
+              if(las[itype][iring][iyear]!=999){
+                alpha=0.7312+0.2688*las[itype][iring][iyear];
+              }
+            }
+          }
+          if(x==50) edm::LogInfo("R=")<<raggio<< " x " << x << " y " << y << " z " << z <<"eta="<<eta<<" alpha="<<alpha<<" C";
+
+
+        } else {
+          edm::LogInfo(" problem with barcode ") << bar << " " << bar2
+                    << " x " << x << " y " << y << " z " << z;
+          alpha = laserAlphaMeanEER_;
+        }
+
+
+      }
+
+
+      if (EEDetId::validDetId(x, y, z)) {
+        EEDetId eedetidpos(x, y, z);
+        ical->setValue( eedetidpos, alpha );
+        if(x==50) edm::LogInfo (" x ") << x << " y " << y << " alpha " << alpha ;
+      }
+      else // should not occur                                                                                                                                                
+        edm::LogInfo(" problem with EEDetId ") << " x " << x << " y " << y << " z " << z ;
+    }
+    fEE.close();
+    edm::LogInfo("Number of inner SIC crystals with different alpha= ")<<nxt;
+    // end laserAlpha from type EE                                                                                                                                            
+
+  } else if (getLaserAlphaFromFileEE_) {
+    edm::LogInfo(" EE laser alphas from file");
+
+    std::ifstream fEE(edm::FileInPath(EELaserAlphaFile_).fullPath().c_str());
+
+    for(int crystal = 0; crystal < 14648; crystal++) {
+      int x, y ,z;
+      float alpha = 1;
+      fEE >> z >> x >> y >> alpha;
+      if(x < 1 || x > 100 || y < 1 || y > 100 || z==0 || z>1 || z<-1 ) {
+        edm::LogInfo("ERROR: wrong coordinates for crystal ")
+                  << " x " << x << " y " << y << " z " << z ;
+        edm::LogInfo(" the format of the file should be z x y alpha ");
+      } else {
+        if (EEDetId::validDetId(x, y, z)) {
+          EEDetId eedetidpos(x, y, z);
+          ical->setValue( eedetidpos, alpha );
+        }
+        else // should not occur                                                                                                                                              
+          edm::LogInfo(" problem with EEDetId ") << " x " << x << " y " << y << " z " << z ;
+      }
+    }
+    fEE.close();
+
+    // end laser alpha from file EE                                                                                                                                           
+  }  else {
+    // alphas from python config file                                                                                                                                         
+    edm::LogInfo(" EE laser alphas from default values");
+    for(int iX=EEDetId::IX_MIN; iX<=EEDetId::IX_MAX ;++iX) {
+      for(int iY=EEDetId::IY_MIN; iY<=EEDetId::IY_MAX; ++iY) {
+        // make an EEDetId since we need EEDetId::rawId() to be used as the key for the pedestals                                                                             
+        if (EEDetId::validDetId(iX,iY,1)) {
+          double r = (double)std::rand()/( double(RAND_MAX)+double(1) );
+          EEDetId eedetidpos(iX,iY,1);
+          ical->setValue( eedetidpos, laserAlphaMean_ + r*laserAlphaSigma_ );
+        }
+        if (EEDetId::validDetId(iX,iY,-1)) {
+          double r1 = (double)std::rand()/( double(RAND_MAX)+double(1) );
+          EEDetId eedetidneg(iX,iY,-1);
+          ical->setValue( eedetidneg, laserAlphaMean_ + r1*laserAlphaSigma_ );
+        }
+      } // loop over iY                                                                                                                                                       
+    } // loop over iX                                                                                                                                                         
+  }
+
+  return ical;
+
+}
+
+
 
 
 std::unique_ptr<EcalLaserAPDPNRatiosRef>
@@ -1300,7 +1634,7 @@ EcalTrivialConditionRetriever::produceEcalLaserAPDPNRatios( const EcalLaserAPDPN
     
     eta = fabs(eta);
     double drop=ageing.calcampDropTotal(eta);
-    std::cout<<"EB at eta="<<eta<<" dropping by "<<drop<<std::endl;
+    edm::LogInfo("EB at eta=")<<eta<<" dropping by "<<drop;
     
     for(int iphi=EBDetId::MIN_IPHI; iphi<=EBDetId::MAX_IPHI; ++iphi) {
       if (EBDetId::validDetId(ieta,iphi)) {
@@ -1317,7 +1651,7 @@ EcalTrivialConditionRetriever::produceEcalLaserAPDPNRatios( const EcalLaserAPDPN
   }
 
 
-  std::cout<<"----- EE -----"<<std::endl;
+  edm::LogInfo("----- EE -----");
 
    for(int iX=EEDetId::IX_MIN; iX<=EEDetId::IX_MAX ;++iX) {
      for(int iY=EEDetId::IY_MIN; iY<=EEDetId::IY_MAX; ++iY) {
@@ -1335,7 +1669,7 @@ EcalTrivialConditionRetriever::produceEcalLaserAPDPNRatios( const EcalLaserAPDPN
 					*2.98/328.)));
 	  eta = fabs(eta);
 	  double drop=ageing.calcampDropTotal(eta);
-	  if(iX==50) std::cout<<"EE at eta="<<eta<<" dropping by "<<drop<<std::endl;
+	  if(iX==50) edm::LogInfo("EE at eta=")<<eta<<" dropping by "<<drop;
 	  
 
  	  EcalLaserAPDPNRatios::EcalLaserAPDPNpair pairAPDPN;
@@ -1352,7 +1686,7 @@ EcalTrivialConditionRetriever::produceEcalLaserAPDPNRatios( const EcalLaserAPDPN
 	  double eta= -log(tan(0.5*atan(sqrt((iX-50.0)*(iX-50.0)+(iY-50.0)*(iY-50.0))*2.98/328.)));
 	  eta = fabs(eta);
 	  double drop=ageing.calcampDropTotal(eta);
-	  if(iX==50) std::cout<<"EE at eta="<<eta<<" dropping by "<<drop<<std::endl;
+	  if(iX==50) edm::LogInfo("EE at eta=")<<eta<<" dropping by "<<drop;
 
 
  	  EcalLaserAPDPNRatios::EcalLaserAPDPNpair pairAPDPN;
@@ -2420,7 +2754,7 @@ EcalTrivialConditionRetriever::getIntercalibConstantsFromConfiguration
 
   if(intercalibConstantsFile_.find(".xml")!= std::string::npos) {
 
-    std::cout<<"generating Intercalib from xml file"<<std::endl; 
+    edm::LogInfo("generating Intercalib from xml file"); 
   
     EcalCondHeader h;
     EcalIntercalibConstants * rcd = new EcalIntercalibConstants;
@@ -2428,19 +2762,19 @@ EcalTrivialConditionRetriever::getIntercalibConstantsFromConfiguration
     
 
     if(totLumi_ !=0 || instLumi_!=0) {
-      std::cout<<"implementing ageing for intercalib"<<std::endl; 
+      edm::LogInfo("implementing ageing for intercalib"); 
 
       EcalIntercalibConstantsMC * rcdMC = new EcalIntercalibConstantsMC;
 
       if(intercalibConstantsMCFile_.find(".xml")!= std::string::npos) {
 
-	std::cout<<"generating IntercalibMC from xml file"<<std::endl; 
+	edm::LogInfo("generating IntercalibMC from xml file"); 
   
 	EcalCondHeader h;
 	EcalIntercalibConstantsMCXMLTranslator::readXML(intercalibConstantsMCFile_,h,*rcdMC);
 
       } else {
-	std::cout<<"please provide the xml file of the EcalIntercalibConstantsMC"<<std::endl;
+	edm::LogInfo("please provide the xml file of the EcalIntercalibConstantsMC");
       }
 
 
@@ -2460,7 +2794,7 @@ EcalTrivialConditionRetriever::getIntercalibConstantsFromConfiguration
 	double eta=EBDetId::approxEta(EBDetId(ieta,1));
 	eta = fabs(eta);
 	double constantTerm= ageing.calcresolutitonConstantTerm(eta);
-	std::cout<<"EB at eta="<<eta<<" constant term is "<<constantTerm<<std::endl;
+	edm::LogInfo("EB at eta=")<<eta<<" constant term is "<<constantTerm;
 	
 	for(int iphi=EBDetId::MIN_IPHI; iphi<=EBDetId::MAX_IPHI; ++iphi) {
 	  // make an EBDetId since we need EBDetId::rawId() to be used as the key for the pedestals
@@ -2477,15 +2811,15 @@ EcalTrivialConditionRetriever::getIntercalibConstantsFromConfiguration
 	      
 	      double r = gRandom->Gaus(0,constantTerm); 
 
-	      if(iphi==10) std::cout<<"EB at eta="<<eta<<" IC="<<icalconstant<<" ICMC="<<icalconstantMC<<" smear="<<r<<" ";
+	      if(iphi==10) edm::LogInfo ("EB at eta=")<<eta<<" IC="<<icalconstant<<" ICMC="<<icalconstantMC<<" smear="<<r<<" ";
 
 	      icalconstant = icalconstant + r*1.29*icalconstantMC;
 	      rcd->setValue( ebid.rawId(), icalconstant );
 
-	      if(iphi==10) std::cout<<"newIC="<<icalconstant<<std::endl;
+	      if(iphi==10) edm::LogInfo("newIC=")<<icalconstant;
 
 	      EcalIntercalibConstant icalconstant2=(*idref);
-	      if(icalconstant !=icalconstant2) std::cout<<">>>> error in smearing intercalib"<<std::endl;
+	      if(icalconstant !=icalconstant2) edm::LogInfo(">>>> error in smearing intercalib");
 	    }
 	}
       }
@@ -2500,7 +2834,7 @@ EcalTrivialConditionRetriever::getIntercalibConstantsFromConfiguration
 	      double eta= -log(tan(0.5*atan(sqrt((iX-50.0)*(iX-50.0)+(iY-50.0)*(iY-50.0))*2.98/328.)));
 	      eta = fabs(eta);
 	      double constantTerm=ageing.calcresolutitonConstantTerm(eta);
-	      if(iX==50) std::cout<<"EE at eta="<<eta<<" constant term is "<<constantTerm<<std::endl;
+	      if(iX==50) edm::LogInfo ("EE at eta=")<<eta<<" constant term is "<<constantTerm;
 
 
 
@@ -2515,10 +2849,10 @@ EcalTrivialConditionRetriever::getIntercalibConstantsFromConfiguration
 	      
 	      double r = gRandom->Gaus(0,constantTerm); 
 
-	      if(iX==10) std::cout<<"EE at eta="<<eta<<" IC="<<icalconstant<<" ICMC="<<icalconstantMC<<" smear="<<r<<" ";
+	      if(iX==10) edm::LogInfo("EE at eta=")<<eta<<" IC="<<icalconstant<<" ICMC="<<icalconstantMC<<" smear="<<r<<" ";
 	      icalconstant = icalconstant + r*1.29*icalconstantMC;
 	      rcd->setValue( eedetidpos.rawId(), icalconstant );
-	      if(iX==10) std::cout<<"newIC="<<icalconstant<<std::endl;
+	      if(iX==10) edm::LogInfo("newIC=")<<icalconstant;
 
 
 	      
@@ -2593,7 +2927,7 @@ EcalTrivialConditionRetriever::getIntercalibConstantsFromConfiguration
     
     edm::LogInfo("EcalTrivialConditionRetriever")
       << "[PIETRO] Intercalibration file - " 
-      << str.str () << std::endl ;
+      << str.str ();
     
     float calib[1700]={1} ;
     int calib_status[1700]={0} ;
@@ -2663,6 +2997,98 @@ EcalTrivialConditionRetriever::getIntercalibConstantsFromConfiguration
 
 }
 
+
+
+
+// new for the PF rec hit thresholds                                                                                                                                          
+
+std::unique_ptr<EcalPFRecHitThresholds>
+EcalTrivialConditionRetriever::getPFRecHitThresholdsFromConfiguration
+( const EcalPFRecHitThresholdsRcd& )
+{
+  std::unique_ptr<EcalPFRecHitThresholds> ical;
+
+  // Reads the values from a txt file                                                                                                                                          
+
+
+  edm::LogInfo("EcalTrivialConditionRetriever") << "Reading PF RecHit Thresholds from file "
+                                                << pfRecHitFile_.c_str() ;
+
+  ical = std::make_unique<EcalPFRecHitThresholds>();
+  
+  char line[50];
+  
+  FILE *inpFile; // input file                                                                                                                                                
+  inpFile = fopen(pfRecHitFile_.c_str(),"r");
+  int nxt=0;
+  
+  edm::LogInfo ("Going to multiply the sigmas by ")<<pfRecHitThresholdsNSigmas_;
+  edm::LogInfo ("We will print some values ");
+  
+  
+  while (fgets(line,50,inpFile)) {
+    float thresh;
+    int eta=0;
+    int phi=0;
+    int zeta=0;
+    sscanf(line, "%d %d %d %f", &eta, &phi, &zeta, &thresh);
+    
+    thresh=thresh*pfRecHitThresholdsNSigmas_;
+    
+    if(phi==50) edm::LogInfo ("EB ")<< std::dec<<eta <<"/"<< std::dec<<phi <<"/"<<std::dec<<zeta<<" thresh: " <<thresh ;
+    nxt=nxt+1;
+    
+    EBDetId ebid(eta, phi);
+    ical->setValue( ebid, thresh );
+  }
+
+  fclose(inpFile);
+  
+  edm::LogInfo ("Read number of EB crystals: ")<<nxt;
+
+
+  edm::LogInfo ("Now reading the EE file ... ");
+  edm::LogInfo ("We will multiply the sigma in EE by ")<<pfRecHitThresholdsNSigmas_;
+  edm::LogInfo ("We will multiply the sigma in EE at high eta by")<<pfRecHitThresholdsNSigmasHEta_;
+  edm::LogInfo ("We will print some values ");
+  
+
+  FILE *inpFileEE; // input file                                                                                                                                              
+  inpFileEE = fopen(pfRecHitFileEE_.c_str(),"r");
+  nxt=0;
+  
+  while (fgets(line,40,inpFileEE)) {
+    float thresh;
+    int ix=0;
+    int iy=0;
+    int iz=0;
+    sscanf(line, "%d %d %d %f", &ix, &iy,&iz, &thresh);
+
+    double eta= -log(tan(0.5*atan(sqrt((ix-50.5)*(ix-50.5)+
+                                       (iy-50.5)*(iy-50.5))*2.98/328.))); // approx eta 
+
+    if(eta>2.5) {
+      thresh=thresh*pfRecHitThresholdsNSigmasHEta_;
+    } else {
+      thresh=thresh*pfRecHitThresholdsNSigmas_;
+    }
+
+    if(ix==50) edm::LogInfo ("EE ")<<std::dec<<ix<<"/"<<std::dec<<iy<<"/"<<std::dec<<iz<<" thresh: " <<thresh <<" eta="<<eta;
+
+    EEDetId eeid(ix,iy,iz);
+    ical->setValue( eeid, thresh );
+    nxt=nxt+1;
+  }
+
+  fclose(inpFileEE);
+  edm::LogInfo ("Read number of EE crystals: ")<<nxt;
+  edm::LogInfo ("end PF Rec Hits ... ");
+
+  return ical;
+
+}
+
+
 std::unique_ptr<EcalIntercalibConstantsMC> 
 EcalTrivialConditionRetriever::getIntercalibConstantsMCFromConfiguration 
 ( const EcalIntercalibConstantsMCRcd& )
@@ -2678,7 +3104,7 @@ EcalTrivialConditionRetriever::getIntercalibConstantsMCFromConfiguration
 
   if(intercalibConstantsMCFile_.find(".xml")!= std::string::npos) {
 
-    std::cout<<"generating Intercalib MC from xml file"<<std::endl; 
+    edm::LogInfo ("generating Intercalib MC from xml file"); 
   
     EcalCondHeader h;
     EcalIntercalibConstantsMC * rcd = new EcalIntercalibConstantsMC;
@@ -2688,7 +3114,7 @@ EcalTrivialConditionRetriever::getIntercalibConstantsMCFromConfiguration
 
   } else {
 
-    std::cout <<"ERROR>>> please provide a xml file"<<std::endl;
+    edm::LogInfo ("ERROR>>> please provide a xml file");
   }
 
 
@@ -2697,6 +3123,11 @@ EcalTrivialConditionRetriever::getIntercalibConstantsMCFromConfiguration
 }
 
 
+
+
+
+
+
 std::unique_ptr<EcalIntercalibErrors> 
 EcalTrivialConditionRetriever::getIntercalibErrorsFromConfiguration 
 ( const EcalIntercalibErrorsRcd& )
@@ -3122,8 +3553,8 @@ EcalTrivialConditionRetriever::produceEcalAlignmentEB( const EBAlignmentRcd& ) {
     EBDetId ebdetId(ieta,iphi);
     if(getEBAlignmentFromFile_) {
       f >> myeuler[0] >> myeuler[1] >> myeuler[2] >> mytrans[0] >> mytrans[1] >> mytrans[2];
-      std::cout << " translation " << mytrans[0] << " " << mytrans[1] << " " << mytrans[2] << "\n" 
-	   << " euler " << myeuler[0] << " " << myeuler[1] << " " << myeuler[2] << std::endl;
+      edm::LogInfo (" translation ") << mytrans[0] << " " << mytrans[1] << " " << mytrans[2] << "\n" 
+	   << " euler " << myeuler[0] << " " << myeuler[1] << " " << myeuler[2] ;
     }
     CLHEP::Hep3Vector translation( mytrans[0], mytrans[1], mytrans[2]);
     CLHEP::HepEulerAngles euler( myeuler[0], myeuler[1], myeuler[2]);
@@ -3178,8 +3609,8 @@ EcalTrivialConditionRetriever::produceEcalAlignmentEE( const EEAlignmentRcd& ) {
     EEDetId eedetId(ix, iy, side);
     if(getEEAlignmentFromFile_) {
       f >> myeuler[0] >> myeuler[1] >> myeuler[2] >> mytrans[0] >> mytrans[1] >> mytrans[2];
-      std::cout << " translation " << mytrans[0] << " " << mytrans[1] << " " << mytrans[2] << "\n" 
-	   << " euler " << myeuler[0] << " " << myeuler[1] << " " << myeuler[2] << std::endl;
+      edm::LogInfo (" translation ") << mytrans[0] << " " << mytrans[1] << " " << mytrans[2] << "\n" 
+	   << " euler " << myeuler[0] << " " << myeuler[1] << " " << myeuler[2] ;
     }
     CLHEP::Hep3Vector translation( mytrans[0], mytrans[1], mytrans[2]);
     CLHEP::HepEulerAngles euler( myeuler[0], myeuler[1], myeuler[2]);
@@ -3212,8 +3643,8 @@ EcalTrivialConditionRetriever::produceEcalAlignmentES( const ESAlignmentRcd& ) {
     ESDetId esdetId(strip, ix, iy, plane, side);
     if(getESAlignmentFromFile_) {
       f >> myeuler[0] >> myeuler[1] >> myeuler[2] >> mytrans[0] >> mytrans[1] >> mytrans[2];
-      std::cout << " translation " << mytrans[0] << " " << mytrans[1] << " " << mytrans[2] << "\n" 
-		<< " euler " << myeuler[0] << " " << myeuler[1] << " " << myeuler[2] << std::endl;
+      edm::LogInfo (" translation ") << mytrans[0] << " " << mytrans[1] << " " << mytrans[2] << "\n" 
+		<< " euler " << myeuler[0] << " " << myeuler[1] << " " << myeuler[2];
     }
     CLHEP::Hep3Vector translation( mytrans[0], mytrans[1], mytrans[2]);
     CLHEP::HepEulerAngles euler( myeuler[0], myeuler[1], myeuler[2]);
diff --git a/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialObjectAnalyzer.cc b/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialObjectAnalyzer.cc
index b6eeac5885516..19cd177321759 100644
--- a/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialObjectAnalyzer.cc
+++ b/CalibCalorimetry/EcalTrivialCondModules/src/EcalTrivialObjectAnalyzer.cc
@@ -11,6 +11,7 @@
 #include <map>
 #include <vector>
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
 
@@ -81,7 +82,7 @@ void EcalTrivialObjectAnalyzer::analyze(const edm::Event& e, const edm::EventSet
 {
     using namespace edm::eventsetup;
     // Context is not used.
-    std::cout <<">>> EcalTrivialObjectAnalyzer: processing run "<<e.id().run() << " event: " << e.id().event() << std::endl;
+    edm::LogInfo(">>> EcalTrivialObjectAnalyzer: processing run ")<<e.id().run() << " event: " << e.id().event();
 
     edm::ESHandle<EcalPedestals> pPeds;
     context.get<EcalPedestalsRcd>().get(pPeds);
@@ -90,8 +91,8 @@ void EcalTrivialObjectAnalyzer::analyze(const edm::Event& e, const edm::EventSet
     edm::ESHandle<EcalADCToGeVConstant> pAgc;
     context.get<EcalADCToGeVConstantRcd>().get(pAgc);
     const EcalADCToGeVConstant* agc = pAgc.product();
-    std::cout << "Global ADC->GeV scale: EB " << std::setprecision(6) << agc->getEBValue() << " GeV/ADC count" 
-	      " EE " << std::setprecision(6) << agc->getEEValue() << " GeV/ADC count" << std::endl;
+    edm::LogInfo("Global ADC->GeV scale: EB ") << std::setprecision(6) << agc->getEBValue() << " GeV/ADC count" 
+	      " EE " << std::setprecision(6) << agc->getEEValue() << " GeV/ADC count";
 
     // use a channel to fetch values from DB
     double r1 = (double)std::rand()/( double(RAND_MAX)+double(1) );
@@ -100,19 +101,19 @@ void EcalTrivialObjectAnalyzer::analyze(const edm::Event& e, const edm::EventSet
     int iphi =  int( 1 + r1*20 );
 
     EBDetId ebid(ieta,iphi); //eta,phi
-    std::cout << "EcalTrivialObjectAnalyzer: using EBDetId: " << ebid << std::endl;
+    edm::LogInfo("EcalTrivialObjectAnalyzer: using EBDetId: ") << ebid;
 
     const EcalPedestals* myped=pPeds.product();
     EcalPedestals::const_iterator it = myped->find(ebid.rawId());
     if( it!=myped->end() ){
-      std::cout << "EcalPedestal: "
+      edm::LogInfo("EcalPedestal: ")
                 << "  mean_x1:  " << std::setprecision(8) << (*it).mean_x1 << " rms_x1: " << (*it).rms_x1
                 << "  mean_x6:  " <<(*it).mean_x6 << " rms_x6: " << (*it).rms_x6
                 << "  mean_x12: " <<(*it).mean_x12 << " rms_x12: " << (*it).rms_x12
-                << std::endl;
+                ;
     } else {
-     std::cout << "No pedestal found for this xtal! something wrong with EcalPedestals in your DB? "
-               << std::endl;
+      edm::LogInfo("No pedestal found for this xtal! something wrong with EcalPedestals in your DB? ")
+               ;
     }
 
     // fetch map of groups of xtals
@@ -123,11 +124,11 @@ void EcalTrivialObjectAnalyzer::analyze(const edm::Event& e, const edm::EventSet
     EcalXtalGroupsMap::const_iterator git = grp->getMap().find( ebid.rawId() );
     EcalXtalGroupId gid;
     if( git != grp->getMap().end() ) {
-      std::cout << "XtalGroupId.id() = " << std::setprecision(3) << (*git).id() << std:: endl;
+      edm::LogInfo("XtalGroupId.id() = ") << std::setprecision(3) << (*git).id() ;
       gid = (*git);
     } else {
-      std::cout << "No group id found for this crystal. something wrong with EcalWeightXtalGroups in your DB?"
-                << std::endl;
+      edm::LogInfo("No group id found for this crystal. something wrong with EcalWeightXtalGroups in your DB?")
+                ;
    }
 
     // Gain Ratios
@@ -140,12 +141,12 @@ void EcalTrivialObjectAnalyzer::analyze(const edm::Event& e, const edm::EventSet
     if( grit!=gr->getMap().end() ){
       mgpa = (*grit);
 
-      std::cout << "EcalMGPAGainRatio: "
+      edm::LogInfo("EcalMGPAGainRatio: ")
                 << "gain 12/6 :  " << std::setprecision(4) << mgpa.gain12Over6() << " gain 6/1: " << mgpa.gain6Over1()
-                << std::endl;
+                ;
     } else {
-     std::cout << "No MGPA Gain Ratio found for this xtal! something wrong with EcalGainRatios in your DB? "
-               << std::endl;
+      edm::LogInfo("No MGPA Gain Ratio found for this xtal! something wrong with EcalGainRatios in your DB? ")
+               ;
     }
 
     // Intercalib constants
@@ -158,13 +159,13 @@ void EcalTrivialObjectAnalyzer::analyze(const edm::Event& e, const edm::EventSet
     if( icalit!=ical->getMap().end() ){
       icalconst = (*icalit);
 
-      std::cout << "EcalIntercalibConstant: "
+      edm::LogInfo("EcalIntercalibConstant: ")
                 <<std::setprecision(6)
                 << icalconst
-                << std::endl;
+                ;
     } else {
-     std::cout << "No intercalib const found for this xtal! something wrong with EcalIntercalibConstants in your DB? "
-               << std::endl;
+      edm::LogInfo("No intercalib const found for this xtal! something wrong with EcalIntercalibConstants in your DB? ")
+               ;
     }
 
     // Intercalib errors
@@ -177,13 +178,13 @@ void EcalTrivialObjectAnalyzer::analyze(const edm::Event& e, const edm::EventSet
     if( icalitErr!=icalErr->getMap().end() ){
       icalconstErr = (*icalitErr);
 
-      std::cout << "EcalIntercalibError: "
+      edm::LogInfo("EcalIntercalibError: ")
                 <<std::setprecision(6)
                 << icalconstErr
-                << std::endl;
+                ;
     } else {
-     std::cout << "No intercalib const found for this xtal! something wrong with EcalIntercalibErrors in your DB? "
-               << std::endl;
+      edm::LogInfo("No intercalib const found for this xtal! something wrong with EcalIntercalibErrors in your DB? ")
+               ;
     }
 
 
@@ -199,13 +200,13 @@ void EcalTrivialObjectAnalyzer::analyze(const edm::Event& e, const edm::EventSet
             if( icalit!=ical->getMap().end() ){
                     icalconst = (*icalit);
 
-                    std::cout << "EcalTimeCalibConstant: "
+                    edm::LogInfo("EcalTimeCalibConstant: ")
                             <<std::setprecision(6)
                             << icalconst
-                            << std::endl;
+                            ;
             } else {
-                    std::cout << "No intercalib const found for this xtal! something wrong with EcalTimeCalibConstants in your DB? "
-                            << std::endl;
+	      edm::LogInfo("No intercalib const found for this xtal! something wrong with EcalTimeCalibConstants in your DB? ")
+                            ;
             }
 
             // TimeCalib errors
@@ -218,13 +219,13 @@ void EcalTrivialObjectAnalyzer::analyze(const edm::Event& e, const edm::EventSet
             if( icalitErr!=icalErr->getMap().end() ){
                     icalconstErr = (*icalitErr);
 
-                    std::cout << "EcalTimeCalibError: "
+                    edm::LogInfo("EcalTimeCalibError: ")
                             <<std::setprecision(6)
                             << icalconstErr
-                            << std::endl;
+                            ;
             } else {
-                    std::cout << "No intercalib const found for this xtal! something wrong with EcalTimeCalibErrors in your DB? "
-                            << std::endl;
+	      edm::LogInfo("No intercalib const found for this xtal! something wrong with EcalTimeCalibErrors in your DB? ")
+                            ;
             }
     }
 
@@ -236,30 +237,30 @@ void EcalTrivialObjectAnalyzer::analyze(const edm::Event& e, const edm::EventSet
    context.get<EcalTimeOffsetConstantRcd>().get(pTOff);
    const EcalTimeOffsetConstant* TOff = pTOff.product();
 
-   std::cout << "EcalTimeOffsetConstant: "
+   edm::LogInfo("EcalTimeOffsetConstant: ")
 	     << " EB " << TOff->getEBValue()
 	     << " EE " << TOff->getEEValue()
-	     << std::endl;
+	     ;
 
    // fetch TB weights
-   std::cout <<"Fetching EcalTBWeights from DB " << std::endl;
+   edm::LogInfo("Fetching EcalTBWeights from DB ");
    edm::ESHandle<EcalTBWeights> pWgts;
    context.get<EcalTBWeightsRcd>().get(pWgts);
    const EcalTBWeights* wgts = pWgts.product();
-   std::cout << "EcalTBWeightMap.size(): " << std::setprecision(3) << wgts->getMap().size() << std::endl;
+   edm::LogInfo("EcalTBWeightMap.size(): ") << std::setprecision(3) << wgts->getMap().size();
 
 
    // look up the correct weights for this  xtal
    //EcalXtalGroupId gid( (*git) );
    EcalTBWeights::EcalTDCId tdcid(1);
 
-   std::cout << "Lookup EcalWeightSet for groupid: " << std::setprecision(3) 
-             << gid.id() << " and TDC id " << tdcid << std::endl;
+   edm::LogInfo("Lookup EcalWeightSet for groupid: ") << std::setprecision(3) 
+             << gid.id() << " and TDC id " << tdcid ;
    EcalTBWeights::EcalTBWeightMap::const_iterator wit = wgts->getMap().find( std::make_pair(gid,tdcid) );
    EcalWeightSet  wset;
    if( wit != wgts->getMap().end() ) {
       wset = wit->second;
-      std::cout << "check size of data members in EcalWeightSet" << std::endl;
+      edm::LogInfo("check size of data members in EcalWeightSet") ;
       //wit->second.print(std::cout);
 
 
@@ -279,56 +280,54 @@ void EcalTrivialObjectAnalyzer::analyze(const edm::Event& e, const edm::EventSet
          clmat2[irow][icol] = mat2(irow,icol);
        }
      }
-     std::cout << "weight matrix before gain switch:" << std::endl;
-     std::cout << clmat1 << std::endl;
-     std::cout << "weight matrix after gain switch:" << std::endl;
-     std::cout << clmat2 << std::endl;
+      edm::LogInfo("weight matrix before gain switch:") << clmat1;
+      edm::LogInfo("weight matrix after gain switch:") << clmat2;
 
    } else {
-     std::cout << "No weights found for EcalGroupId: " << gid.id() << " and  EcalTDCId: " << tdcid << std::endl;
+     edm::LogInfo("No weights found for EcalGroupId: ") << gid.id() << " and  EcalTDCId: " << tdcid ;
   }
 
    // cluster functions/corrections
    edm::ESHandle<EcalClusterLocalContCorrParameters> pLocalCont;
    context.get<EcalClusterLocalContCorrParametersRcd>().get(pLocalCont);
    const EcalClusterLocalContCorrParameters* paramLocalCont = pLocalCont.product();
-   std::cout << "LocalContCorrParameters:";
+   edm::LogInfo("LocalContCorrParameters:");
    for ( EcalFunctionParameters::const_iterator it = paramLocalCont->params().begin(); it != paramLocalCont->params().end(); ++it ) {
-           std::cout << " " << *it;
+     edm::LogInfo(" ") << *it;
    }
-   std::cout << "\n";
+   // std::cout << "\n";
    edm::ESHandle<EcalClusterCrackCorrParameters> pCrack;
    context.get<EcalClusterCrackCorrParametersRcd>().get(pCrack);
    const EcalClusterCrackCorrParameters* paramCrack = pCrack.product();
-   std::cout << "CrackCorrParameters:";
+   edm::LogInfo("CrackCorrParameters:");
    for ( EcalFunctionParameters::const_iterator it = paramCrack->params().begin(); it != paramCrack->params().end(); ++it ) {
-           std::cout << " " << *it;
+     edm::LogInfo(" ") << *it;
    }
-   std::cout << "\n";
+   // std::cout << "\n";
    edm::ESHandle<EcalClusterEnergyCorrectionParameters> pEnergyCorrection;
    context.get<EcalClusterEnergyCorrectionParametersRcd>().get(pEnergyCorrection);
    const EcalClusterEnergyCorrectionParameters* paramEnergyCorrection = pEnergyCorrection.product();
-   std::cout << "EnergyCorrectionParameters:";
+   edm::LogInfo("EnergyCorrectionParameters:");
    for ( EcalFunctionParameters::const_iterator it = paramEnergyCorrection->params().begin(); it != paramEnergyCorrection->params().end(); ++it ) {
-           std::cout << " " << *it;
+     edm::LogInfo(" ") << *it;
    }
-   std::cout << "\n";
+   // std::cout << "\n";
    edm::ESHandle<EcalClusterEnergyUncertaintyParameters> pEnergyUncertainty;
    context.get<EcalClusterEnergyUncertaintyParametersRcd>().get(pEnergyUncertainty);
    const EcalClusterEnergyUncertaintyParameters* paramEnergyUncertainty = pEnergyUncertainty.product();
-   std::cout << "EnergyCorrectionParameters:";
+   edm::LogInfo("EnergyCorrectionParameters:");
    for ( EcalFunctionParameters::const_iterator it = paramEnergyUncertainty->params().begin(); it != paramEnergyUncertainty->params().end(); ++it ) {
-           std::cout << " " << *it;
+     edm::LogInfo(" ") << *it;
    }
-   std::cout << "\n";
+   // std::cout << "\n";
    edm::ESHandle<EcalClusterEnergyCorrectionObjectSpecificParameters> pEnergyCorrectionObjectSpecific;
    context.get<EcalClusterEnergyCorrectionObjectSpecificParametersRcd>().get(pEnergyCorrectionObjectSpecific);
    const EcalClusterEnergyCorrectionObjectSpecificParameters* paramEnergyCorrectionObjectSpecific = pEnergyCorrectionObjectSpecific.product();
-   std::cout << "EnergyCorrectionObjectSpecificParameters:";
+   edm::LogInfo("EnergyCorrectionObjectSpecificParameters:");
    for ( EcalFunctionParameters::const_iterator it = paramEnergyCorrectionObjectSpecific->params().begin(); it != paramEnergyCorrectionObjectSpecific->params().end(); ++it ) {
-     std::cout << " " << *it;
+     edm::LogInfo(" ") << *it;
    }
-   std::cout << "\n";
+   // std::cout << "\n";
 
 
    // laser correction
@@ -341,13 +340,13 @@ void EcalTrivialObjectAnalyzer::analyze(const edm::Event& e, const edm::EventSet
    EcalLaserAlphaMap::const_iterator lalphait;
    lalphait = lalpha->getMap().find(ebid.rawId());
    if( lalphait!=lalpha->getMap().end() ){
-     std::cout << "EcalLaserAlpha: "
+     edm::LogInfo("EcalLaserAlpha: ")
 	       <<std::setprecision(6)
 	       << (*lalphait)
-	       << std::endl;
+	       ;
    } else {
-     std::cout << "No laser alpha found for this xtal! something wrong with EcalLaserAlphas in your DB? "
-               << std::endl;
+     edm::LogInfo("No laser alpha found for this xtal! something wrong with EcalLaserAlphas in your DB? ")
+               ;
    }
 
    // laser apdpnref
@@ -358,13 +357,13 @@ void EcalTrivialObjectAnalyzer::analyze(const edm::Event& e, const edm::EventSet
    EcalLaserAPDPNRatiosRef::const_iterator lrefit;
    lrefit = lref->getMap().find(ebid.rawId());
    if( lrefit!=lref->getMap().end() ){
-     std::cout << "EcalLaserAPDPNRatiosRef: "
+     edm::LogInfo("EcalLaserAPDPNRatiosRef: ")
   	       <<std::setprecision(6)
   	       << (*lrefit)
-  	       << std::endl;
+  	       ;
    } else {
-     std::cout << "No laser apd/pn ref found for this xtal! something wrong with EcalLaserAPDPNRatiosRef in your DB? "
-	       << std::endl;
+     edm::LogInfo("No laser apd/pn ref found for this xtal! something wrong with EcalLaserAPDPNRatiosRef in your DB? ")
+	       ;
    }
 
    // laser apdpn ratios 
@@ -379,24 +378,25 @@ void EcalTrivialObjectAnalyzer::analyze(const edm::Event& e, const edm::EventSet
    if( lratioit!=lratio->getLaserMap().end() ){
      lratioconst = (*lratioit);
      
-     std::cout << "EcalLaserAPDPNRatios: "
+     edm::LogInfo("EcalLaserAPDPNRatios: ")
        //	       <<e.id().run() << " " << e.id().event() << " " 
     	       << std::setprecision(6)
     	       << lratioconst.p1 << " " << lratioconst.p2
-    	       << std::endl;
+    	       ;
    } else {
-     std::cout << "No laser apd/pn ratio found for this xtal! something wrong with EcalLaserAPDPNRatios in your DB? "
-  	       << std::endl;
+     edm::LogInfo("No laser apd/pn ratio found for this xtal! something wrong with EcalLaserAPDPNRatios in your DB? ")
+  	       ;
    }
 
    // laser timestamps
    EcalLaserAPDPNRatios::EcalLaserTimeStamp ltimestamp;
+   // EcalLaserAPDPNRatios::EcalLaserTimeStampMap::const_iterator ltimeit;
    for (int i=1; i<=92; i++) {     
      ltimestamp = lratio->getTimeMap()[i];
-     std::cout << "i = " << std::setprecision(6) << i
+     edm::LogInfo("i = ") << std::setprecision(6) << i
              << ltimestamp.t1.value() << " " << ltimestamp.t2.value() << " : " ;
    }
-   std::cout << "Tests finished." << std::endl;
+   edm::LogInfo("Tests finished.");
 
    // channel status
    edm::ESHandle<EcalChannelStatus> pChannelStatus;
@@ -407,13 +407,13 @@ void EcalTrivialObjectAnalyzer::analyze(const edm::Event& e, const edm::EventSet
    chit = ch_status->getMap().find(ebid.rawId());
    if( chit != ch_status->getMap().end() ){
            EcalChannelStatusCode ch_code = (*chit);
-           std::cout << "EcalChannelStatus: "
+           edm::LogInfo("EcalChannelStatus: ")
                    <<std::setprecision(6)
                    << ch_code.getStatusCode()
-                   << std::endl;
+                   ;
    } else {
-           std::cout << "No channel status found for this xtal! something wrong with EcalChannelStatus in your DB? "
-                   << std::endl;
+     edm::LogInfo("No channel status found for this xtal! something wrong with EcalChannelStatus in your DB? ")
+                   ;
    }
 
 
@@ -423,8 +423,8 @@ void EcalTrivialObjectAnalyzer::analyze(const edm::Event& e, const edm::EventSet
    edm::ESHandle<EcalSampleMask> pSMask;
    context.get<EcalSampleMaskRcd>().get(pSMask);
    const EcalSampleMask* smask = pSMask.product();
-   std::cout << "Sample Mask EB " << std::hex << smask->getEcalSampleMaskRecordEB() 
-	     << " EE " << std::hex << smask->getEcalSampleMaskRecordEE() << std::endl;
+   edm::LogInfo("Sample Mask EB ") << std::hex << smask->getEcalSampleMaskRecordEB() 
+	     << " EE " << std::hex << smask->getEcalSampleMaskRecordEE();
    
 
 /*
diff --git a/CalibFormats/CaloObjects/interface/CaloSamples.h b/CalibFormats/CaloObjects/interface/CaloSamples.h
index fe9b9716c6f0b..55acfc7336791 100644
--- a/CalibFormats/CaloObjects/interface/CaloSamples.h
+++ b/CalibFormats/CaloObjects/interface/CaloSamples.h
@@ -1,12 +1,12 @@
 #ifndef CALOSAMPLES_H
 #define CALOSAMPLES_H 1
 
+#include "DataFormats/DetId/interface/DetId.h"
 #include <ostream>
 #include <vector>
-#include "DataFormats/DetId/interface/DetId.h"
 
 /** \class CaloSamples
-    
+
 Class which represents the charge/voltage measurements of an event/channel
 with the ADC decoding performed.
 
@@ -14,21 +14,21 @@ with the ADC decoding performed.
 class CaloSamples {
 public:
   CaloSamples();
-  explicit CaloSamples(const DetId& id, int size);
-  explicit CaloSamples(const DetId& id, int size, int preciseSize);
- 
+  explicit CaloSamples(const DetId &id, int size);
+  explicit CaloSamples(const DetId &id, int size, int preciseSize);
+
   /// get the (generic) id
   DetId id() const { return id_; }
 
   /// get the size
   int size() const { return size_; }
   /// mutable operator to access samples
-  double& operator[](int i) { return data_[i]; }
+  double &operator[](int i) { return data_[i]; }
   /// const operator to access samples
   double operator[](int i) const { return data_[i]; }
 
   /// mutable function to access precise samples
-  float& preciseAtMod(int i) { return preciseData_[i]; }
+  float &preciseAtMod(int i) { return preciseData_[i]; }
   /// const function to access precise samples
   float preciseAt(int i) const { return preciseData_[i]; }
 
@@ -38,52 +38,63 @@ class CaloSamples {
   void setPresamples(int pre);
 
   /// multiply each item by this value
-  CaloSamples& scale(double value);
+  CaloSamples &scale(double value);
   /// scale all samples
-  CaloSamples& operator*=(double value) { return scale(value); }
+  CaloSamples &operator*=(double value) { return scale(value); }
 
   /// add a value to all samples
-  CaloSamples& operator+=(double value);
-  CaloSamples& operator+=(const CaloSamples & other);
+  CaloSamples &operator+=(double value);
+  CaloSamples &operator+=(const CaloSamples &other);
 
   /// shift all the samples by a time, in ns, interpolating
   // between values
-  CaloSamples& offsetTime(double offset);
+  CaloSamples &offsetTime(double offset);
 
-  void setDetId( DetId detId ) { id_ = detId ; }
+  void setDetId(DetId detId) { id_ = detId; }
 
-  void setSize( unsigned int size ) { size_ = size ; data_.resize(size,0.); }
+  void setSize(unsigned int size) {
+    size_ = size;
+    data_.resize(size, 0.);
+  }
 
-  void setPreciseSize( unsigned int size ) { preciseSize_ = size ; preciseData_.resize(preciseSize_,0.); }
+  void setPreciseSize(unsigned int size) {
+    preciseSize_ = size;
+    preciseData_.resize(preciseSize_, 0.);
+  }
 
-  bool isBlank() const ; // are the samples blank (zero?)
+  bool isBlank() const;  // are the samples blank (zero?)
 
-  void setBlank() ; // keep id, presamples, size but zero out data
+  void setBlank();  // keep id, presamples, size but zero out data
 
   /// get the size
-  int preciseSize() const { if ( preciseData_.empty() ) return 0; return preciseSize_; }
+  int preciseSize() const {
+    if (preciseData_.empty())
+      return 0;
+    return preciseSize_;
+  }
   int precisePresamples() const { return precisePresamples_; }
   float preciseDeltaT() const { return deltaTprecise_; }
 
-  void setPrecise( int precisePresamples, float deltaT ) {
-    precisePresamples_=precisePresamples;
-    deltaTprecise_=deltaT;
+  void setPrecise(int precisePresamples, float deltaT) {
+    precisePresamples_ = precisePresamples;
+    deltaTprecise_ = deltaT;
   }
 
   void resetPrecise();
 
-  //preserved for use in other packages - no longer used in this class
-  static const int MAXSAMPLES=10;
+  // preserved for use in other packages - no longer used in this class
+  static const int MAXSAMPLES = 10;
+
 private:
   DetId id_;
   int size_, presamples_;
-  std::vector<double> data_; // 
+  std::vector<double> data_;  //
   float deltaTprecise_;
   std::vector<float> preciseData_;
-  int preciseSize_,precisePresamples_;
+  int preciseSize_, precisePresamples_;
 };
 
-std::ostream& operator<<(std::ostream& s, const CaloSamples& samps);
+std::ostream &operator<<(std::ostream &s, const CaloSamples &samps);
 
 typedef std::vector<CaloSamples> CaloSamplesCollection;
 
diff --git a/CalibFormats/CaloObjects/interface/CaloTSamples.h b/CalibFormats/CaloObjects/interface/CaloTSamples.h
index 93f483d2a5de1..e3416b00bc723 100644
--- a/CalibFormats/CaloObjects/interface/CaloTSamples.h
+++ b/CalibFormats/CaloObjects/interface/CaloTSamples.h
@@ -4,36 +4,31 @@
 #include "CalibFormats/CaloObjects/interface/CaloTSamplesBase.h"
 
 /** \class CaloTSamples
-    
+
 Class which represents the charge/voltage measurements of an event/channel
 with the ADC decoding performed.
 
 */
 
-template <class Ttype, uint32_t Tsize> 
-class CaloTSamples : public CaloTSamplesBase<Ttype>
-{
-   public:
-
-      enum { kCapacity = Tsize } ;
-
-      CaloTSamples<Ttype,Tsize>()  ;
-      CaloTSamples<Ttype,Tsize>( const CaloTSamples<Ttype,Tsize>& cs )  ;
-      CaloTSamples<Ttype,Tsize>( const DetId& id   , 
-				 uint32_t size = 0 ,
-				 uint32_t pre  = 0  ) ;
-      ~CaloTSamples<Ttype,Tsize>() override ;
+template <class Ttype, uint32_t Tsize>
+class CaloTSamples : public CaloTSamplesBase<Ttype> {
+public:
+  enum { kCapacity = Tsize };
 
-      CaloTSamples<Ttype,Tsize>& operator=( const CaloTSamples<Ttype,Tsize>& cs ) ;
+  CaloTSamples<Ttype, Tsize>();
+  CaloTSamples<Ttype, Tsize>(const CaloTSamples<Ttype, Tsize> &cs);
+  CaloTSamples<Ttype, Tsize>(const DetId &id, uint32_t size = 0, uint32_t pre = 0);
+  ~CaloTSamples<Ttype, Tsize>() override;
 
-      uint32_t capacity() const override ;
+  CaloTSamples<Ttype, Tsize> &operator=(const CaloTSamples<Ttype, Tsize> &cs);
 
-   private:
+  uint32_t capacity() const override;
 
-            Ttype* data(  uint32_t i ) override ;
-      const Ttype* cdata( uint32_t i ) const override ;
+private:
+  Ttype *data(uint32_t i) override;
+  const Ttype *cdata(uint32_t i) const override;
 
-      Ttype m_data[ Tsize ] ;
-} ;
+  Ttype m_data[Tsize];
+};
 
 #endif
diff --git a/CalibFormats/CaloObjects/interface/CaloTSamples.icc b/CalibFormats/CaloObjects/interface/CaloTSamples.icc
index edac34c0d3fc2..a2b2104593dfb 100644
--- a/CalibFormats/CaloObjects/interface/CaloTSamples.icc
+++ b/CalibFormats/CaloObjects/interface/CaloTSamples.icc
@@ -3,66 +3,45 @@
 
 #include "CalibFormats/CaloObjects/interface/CaloTSamples.h"
 
-template <class Ttype, uint32_t Tsize> 
-CaloTSamples< Ttype, Tsize >::CaloTSamples() :
-   CaloTSamplesBase< Ttype > ( m_data, Tsize )
-{
-}
+template <class Ttype, uint32_t Tsize>
+CaloTSamples<Ttype, Tsize>::CaloTSamples() : CaloTSamplesBase<Ttype>(m_data, Tsize) {}
 
-template <class Ttype, uint32_t Tsize> 
-CaloTSamples< Ttype, Tsize >::CaloTSamples( const CaloTSamples<Ttype,Tsize>& cs ) :
-   CaloTSamplesBase<Ttype>( cs )
-{
-   if( &cs != this ) 
-   {
-      for( uint32_t i ( 0 ) ; i != Tsize ; ++i )
-      {
-	 m_data[ i ] = cs.m_data[ i ] ;
-      }
-   }
+template <class Ttype, uint32_t Tsize>
+CaloTSamples<Ttype, Tsize>::CaloTSamples(const CaloTSamples<Ttype, Tsize> &cs) : CaloTSamplesBase<Ttype>(cs) {
+  if (&cs != this) {
+    for (uint32_t i(0); i != Tsize; ++i) {
+      m_data[i] = cs.m_data[i];
+    }
+  }
 }
 
-template <class Ttype, uint32_t Tsize> 
-CaloTSamples< Ttype, Tsize >::CaloTSamples( const DetId& id   , 
-					    uint32_t     size ,
-					    uint32_t     pre    ) :
-   CaloTSamplesBase< Ttype > ( m_data, Tsize, id, size, pre )
-{
-}
+template <class Ttype, uint32_t Tsize>
+CaloTSamples<Ttype, Tsize>::CaloTSamples(const DetId &id, uint32_t size, uint32_t pre)
+    : CaloTSamplesBase<Ttype>(m_data, Tsize, id, size, pre) {}
 
-template <class Ttype, uint32_t Tsize> 
-CaloTSamples< Ttype, Tsize >::~CaloTSamples()
-{
-}
+template <class Ttype, uint32_t Tsize>
+CaloTSamples<Ttype, Tsize>::~CaloTSamples() {}
 
-template <class Ttype, uint32_t Tsize> 
-CaloTSamples<Ttype,Tsize>& 
-CaloTSamples< Ttype, Tsize >::operator=( const CaloTSamples<Ttype,Tsize>& cs )
-{
-   CaloTSamplesBase<Ttype>::operator=( cs ) ;
-   std::copy( cs.m_data, cs.m_data + Tsize, m_data ) ;
-   return *this ;
+template <class Ttype, uint32_t Tsize>
+CaloTSamples<Ttype, Tsize> &CaloTSamples<Ttype, Tsize>::operator=(const CaloTSamples<Ttype, Tsize> &cs) {
+  CaloTSamplesBase<Ttype>::operator=(cs);
+  std::copy(cs.m_data, cs.m_data + Tsize, m_data);
+  return *this;
 }
 
-template <class Ttype, uint32_t Tsize> 
-uint32_t 
-CaloTSamples< Ttype, Tsize >::capacity() const
-{
-   return Tsize ;
+template <class Ttype, uint32_t Tsize>
+uint32_t CaloTSamples<Ttype, Tsize>::capacity() const {
+  return Tsize;
 }
 
-template <class Ttype, uint32_t Tsize> 
-Ttype* 
-CaloTSamples< Ttype, Tsize >::data( uint32_t i )
-{
-   return &( m_data[ i ] ) ;
+template <class Ttype, uint32_t Tsize>
+Ttype *CaloTSamples<Ttype, Tsize>::data(uint32_t i) {
+  return &(m_data[i]);
 }
 
-template <class Ttype, uint32_t Tsize> 
-const Ttype* 
-CaloTSamples< Ttype, Tsize >::cdata( uint32_t i ) const
-{
-   return &( m_data[ i ] ) ;
+template <class Ttype, uint32_t Tsize>
+const Ttype *CaloTSamples<Ttype, Tsize>::cdata(uint32_t i) const {
+  return &(m_data[i]);
 }
 
 #endif
diff --git a/CalibFormats/CaloObjects/interface/CaloTSamplesBase.h b/CalibFormats/CaloObjects/interface/CaloTSamplesBase.h
index fa0d08a659272..eb149204179fe 100644
--- a/CalibFormats/CaloObjects/interface/CaloTSamplesBase.h
+++ b/CalibFormats/CaloObjects/interface/CaloTSamplesBase.h
@@ -1,61 +1,52 @@
 #ifndef CALOTSAMPLESBASE_H
 #define CALOTSAMPLESBASE_H 1
 
-#include <ostream>
 #include "DataFormats/DetId/interface/DetId.h"
 #include <cassert>
+#include <ostream>
 
-template <class Ttype> 
-class CaloTSamplesBase 
-{
-   public:
-
-      CaloTSamplesBase<Ttype>( Ttype*   mydata, 
-			       uint32_t size    )  ;
-
-      CaloTSamplesBase<Ttype>( const CaloTSamplesBase<Ttype>& cs )  ;
+template <class Ttype>
+class CaloTSamplesBase {
+public:
+  CaloTSamplesBase<Ttype>(Ttype *mydata, uint32_t size);
 
-      CaloTSamplesBase<Ttype>( Ttype*       mydata , 
-			       uint32_t     length ,
-			       const DetId& id     , 
-			       uint32_t     size   ,
-			       uint32_t     pre      ) ;
+  CaloTSamplesBase<Ttype>(const CaloTSamplesBase<Ttype> &cs);
 
-      virtual ~CaloTSamplesBase<Ttype>() ;
+  CaloTSamplesBase<Ttype>(Ttype *mydata, uint32_t length, const DetId &id, uint32_t size, uint32_t pre);
 
-      void setZero() ;
+  virtual ~CaloTSamplesBase<Ttype>();
 
-      DetId    id()   const ;
-      uint32_t size() const ;
-      uint32_t pre()  const ;
-      bool     zero() const ;
+  void setZero();
 
-      Ttype&       operator[]( uint32_t i ) ;
+  DetId id() const;
+  uint32_t size() const;
+  uint32_t pre() const;
+  bool zero() const;
 
-      const Ttype& operator[]( uint32_t i ) const ;
+  Ttype &operator[](uint32_t i);
 
-      CaloTSamplesBase<Ttype>& operator=( const CaloTSamplesBase<Ttype>& cs ) ;
+  const Ttype &operator[](uint32_t i) const;
 
-      CaloTSamplesBase<Ttype>& operator*=( Ttype value ) ;
+  CaloTSamplesBase<Ttype> &operator=(const CaloTSamplesBase<Ttype> &cs);
 
-      CaloTSamplesBase<Ttype>& operator+=( Ttype value ) ;
+  CaloTSamplesBase<Ttype> &operator*=(Ttype value);
 
-      CaloTSamplesBase<Ttype>& operator+=( const CaloTSamplesBase<Ttype>& cs ) ;
+  CaloTSamplesBase<Ttype> &operator+=(Ttype value);
 
-      virtual uint32_t capacity() const = 0 ;
+  CaloTSamplesBase<Ttype> &operator+=(const CaloTSamplesBase<Ttype> &cs);
 
-   private:
+  virtual uint32_t capacity() const = 0;
 
-      virtual Ttype* data( uint32_t i ) = 0 ;
-      virtual const Ttype* cdata( uint32_t i ) const = 0 ;
+private:
+  virtual Ttype *data(uint32_t i) = 0;
+  virtual const Ttype *cdata(uint32_t i) const = 0;
 
-      DetId    m_id   ;
-      uint32_t m_size ;
-      uint32_t m_pre  ;
-} ;
+  DetId m_id;
+  uint32_t m_size;
+  uint32_t m_pre;
+};
 
 template <class Ttype>
-std::ostream& operator<<( std::ostream& s, 
-			  const CaloTSamplesBase<Ttype>& sam ) ;
+std::ostream &operator<<(std::ostream &s, const CaloTSamplesBase<Ttype> &sam);
 
 #endif
diff --git a/CalibFormats/CaloObjects/interface/CaloTSamplesBase.icc b/CalibFormats/CaloObjects/interface/CaloTSamplesBase.icc
index 72ac4fcd88132..f8082660dd6f4 100644
--- a/CalibFormats/CaloObjects/interface/CaloTSamplesBase.icc
+++ b/CalibFormats/CaloObjects/interface/CaloTSamplesBase.icc
@@ -3,162 +3,115 @@
 
 #include "CalibFormats/CaloObjects/interface/CaloTSamplesBase.h"
 
-
-template <class Ttype> 
-CaloTSamplesBase< Ttype >::CaloTSamplesBase( Ttype*   mydata , 
-					     uint32_t length   ) :
-   m_id   ( 0 ) ,
-   m_size ( 0 ) ,
-   m_pre  ( 0 ) 
-{
-   std::fill( mydata, mydata + length, 0 ) ;
+template <class Ttype>
+CaloTSamplesBase<Ttype>::CaloTSamplesBase(Ttype *mydata, uint32_t length) : m_id(0), m_size(0), m_pre(0) {
+  std::fill(mydata, mydata + length, 0);
 }
 
-template <class Ttype> 
-CaloTSamplesBase< Ttype >::CaloTSamplesBase( const CaloTSamplesBase<Ttype>& cs )
-{
-   if( &cs != this )
-   {
-      m_id   = cs.m_id   ;
-      m_size = cs.m_size ;
-      m_pre  = cs.m_pre  ;
-   }
+template <class Ttype>
+CaloTSamplesBase<Ttype>::CaloTSamplesBase(const CaloTSamplesBase<Ttype> &cs) {
+  if (&cs != this) {
+    m_id = cs.m_id;
+    m_size = cs.m_size;
+    m_pre = cs.m_pre;
+  }
 }
 
-template <class Ttype> 
-CaloTSamplesBase< Ttype >::CaloTSamplesBase( Ttype*       mydata , 
-					     uint32_t     length ,
-					     const DetId& id     , 
-					     uint32_t     size   ,
-					     uint32_t     pre      ) :
-   m_id   ( id   ) ,
-   m_size ( size ) ,
-   m_pre  ( pre  )
-{
-   assert( length >= size ) ;
-   assert( pre    <= size ) ;
-   std::fill( mydata, mydata + length, 0 ) ;
+template <class Ttype>
+CaloTSamplesBase<Ttype>::CaloTSamplesBase(Ttype *mydata, uint32_t length, const DetId &id, uint32_t size, uint32_t pre)
+    : m_id(id), m_size(size), m_pre(pre) {
+  assert(length >= size);
+  assert(pre <= size);
+  std::fill(mydata, mydata + length, 0);
 }
 
-template <class Ttype> 
-CaloTSamplesBase< Ttype >::~CaloTSamplesBase()
-{
-}
+template <class Ttype>
+CaloTSamplesBase<Ttype>::~CaloTSamplesBase() {}
 
-template <class Ttype> 
-void 
-CaloTSamplesBase< Ttype >::setZero()
-{
-   std::fill( data(0), data(0) + capacity(), 0 ) ;
+template <class Ttype>
+void CaloTSamplesBase<Ttype>::setZero() {
+  std::fill(data(0), data(0) + capacity(), 0);
 }
 
-template <class Ttype> 
-DetId    
-CaloTSamplesBase< Ttype >::id()   const
-{
-   return m_id ;
+template <class Ttype>
+DetId CaloTSamplesBase<Ttype>::id() const {
+  return m_id;
 }
 
-template <class Ttype> 
-uint32_t 
-CaloTSamplesBase< Ttype >::size() const
-{
-   return m_size ;
+template <class Ttype>
+uint32_t CaloTSamplesBase<Ttype>::size() const {
+  return m_size;
 }
 
-template <class Ttype> 
-uint32_t 
-CaloTSamplesBase< Ttype >::pre()  const
-{
-   return m_pre ;
+template <class Ttype>
+uint32_t CaloTSamplesBase<Ttype>::pre() const {
+  return m_pre;
 }
 
-template <class Ttype> 
-bool     
-CaloTSamplesBase< Ttype >::zero() const
-{
-   for( uint32_t i ( 0 ) ; i != capacity() ; ++i )
-   {
-      if( 0 != (*cdata( i )) ) return false ;
-   }
-   return true ;
+template <class Ttype>
+bool CaloTSamplesBase<Ttype>::zero() const {
+  for (uint32_t i(0); i != capacity(); ++i) {
+    if (0 != (*cdata(i)))
+      return false;
+  }
+  return true;
 }
 
-template <class Ttype> 
-Ttype& 
-CaloTSamplesBase< Ttype >::operator[]( uint32_t i )
-{
-   assert( capacity() > i ) ;
-   return *data( i ) ;
+template <class Ttype>
+Ttype &CaloTSamplesBase<Ttype>::operator[](uint32_t i) {
+  assert(capacity() > i);
+  return *data(i);
 }
 
-template <class Ttype> 
-const Ttype&
-CaloTSamplesBase< Ttype >::operator[]( uint32_t i ) const 
-{
-   assert( capacity() > i ) ;
-   return *cdata( i ) ;
+template <class Ttype>
+const Ttype &CaloTSamplesBase<Ttype>::operator[](uint32_t i) const {
+  assert(capacity() > i);
+  return *cdata(i);
 }
 
-template <class Ttype> 
-CaloTSamplesBase<Ttype>& 
-CaloTSamplesBase< Ttype >::operator=( const CaloTSamplesBase<Ttype>& cs )
-{
-   if( &cs != this )
-   {
-      m_id = cs.m_id ;
-      m_size = cs.m_size ;
-      m_pre = cs.m_pre ;
-   }
-   return *this ;
+template <class Ttype>
+CaloTSamplesBase<Ttype> &CaloTSamplesBase<Ttype>::operator=(const CaloTSamplesBase<Ttype> &cs) {
+  if (&cs != this) {
+    m_id = cs.m_id;
+    m_size = cs.m_size;
+    m_pre = cs.m_pre;
+  }
+  return *this;
 }
 
-template <class Ttype> 
-CaloTSamplesBase<Ttype>& 
-CaloTSamplesBase< Ttype >::operator*=( Ttype value )
-{
-   for( uint32_t i ( 0 ) ; i != m_size ; ++i )
-   {
-      (*data( i )) *= value ;
-   }
-   return *this ;
+template <class Ttype>
+CaloTSamplesBase<Ttype> &CaloTSamplesBase<Ttype>::operator*=(Ttype value) {
+  for (uint32_t i(0); i != m_size; ++i) {
+    (*data(i)) *= value;
+  }
+  return *this;
 }
 
-template <class Ttype> 
-CaloTSamplesBase<Ttype>& 
-CaloTSamplesBase< Ttype >::operator+=( Ttype value )
-{
-   for( uint32_t i ( 0 ) ; i != m_size ; ++i )
-   {
-      (*data( i )) += value ;
-   }
-   return *this ;
+template <class Ttype>
+CaloTSamplesBase<Ttype> &CaloTSamplesBase<Ttype>::operator+=(Ttype value) {
+  for (uint32_t i(0); i != m_size; ++i) {
+    (*data(i)) += value;
+  }
+  return *this;
 }
 
-template <class Ttype> 
-CaloTSamplesBase<Ttype>& 
-CaloTSamplesBase< Ttype >::operator+=( const CaloTSamplesBase<Ttype>& cs ) 
-{
-   assert( m_size == cs.size() ) ;
-   assert( capacity() == cs.capacity() ) ;
-
-   for( uint32_t i ( 0 ) ; i != m_size ; ++i )
-   {
-      (*data( i )) += (*cs.cdata( i ) ) ;
-   }
-   return *this ;
+template <class Ttype>
+CaloTSamplesBase<Ttype> &CaloTSamplesBase<Ttype>::operator+=(const CaloTSamplesBase<Ttype> &cs) {
+  assert(m_size == cs.size());
+  assert(capacity() == cs.capacity());
+
+  for (uint32_t i(0); i != m_size; ++i) {
+    (*data(i)) += (*cs.cdata(i));
+  }
+  return *this;
 }
 
-template <class Ttype> 
-std::ostream& 
-operator<<( std::ostream& s, 
-	    const CaloTSamplesBase<Ttype>& sam )
-{
-  s << "DetId=" << sam.id().rawId() ;
-  s << ", "<<  sam.size() << " samples." ;
-  for( uint32_t i ( 0 ) ; i != sam.size() ; ++i )
-  {
-     s << "\n" << i << " : " << sam[i] ;
+template <class Ttype>
+std::ostream &operator<<(std::ostream &s, const CaloTSamplesBase<Ttype> &sam) {
+  s << "DetId=" << sam.id().rawId();
+  s << ", " << sam.size() << " samples.";
+  for (uint32_t i(0); i != sam.size(); ++i) {
+    s << "\n" << i << " : " << sam[i];
   }
   s << std::endl;
   return s;
diff --git a/CalibFormats/CaloObjects/interface/IntegerCaloSamples.h b/CalibFormats/CaloObjects/interface/IntegerCaloSamples.h
index 5fbefdefec95b..5aeef9467cf93 100644
--- a/CalibFormats/CaloObjects/interface/IntegerCaloSamples.h
+++ b/CalibFormats/CaloObjects/interface/IntegerCaloSamples.h
@@ -1,13 +1,13 @@
 #ifndef INTEGERCALOSAMPLES_H
 #define INTEGERCALOSAMPLES_H 1
 
-#include <ostream>
 #include "DataFormats/DetId/interface/DetId.h"
+#include <ostream>
 
 /** \class IntegerCaloSamples
-    
+
 Class which represents the linear charge/voltage measurements of an
-event/channel, but with defined resolution.  
+event/channel, but with defined resolution.
 
 This class uses 32-bit bins, so users should be careful if their
 calculation implies fewer bins.
@@ -16,15 +16,15 @@ calculation implies fewer bins.
 class IntegerCaloSamples {
 public:
   IntegerCaloSamples();
-  explicit IntegerCaloSamples(const DetId& id, int size);
-  
+  explicit IntegerCaloSamples(const DetId &id, int size);
+
   /// get the (generic) id
   DetId id() const { return id_; }
 
   /// get the size
   int size() const { return size_; }
   /// mutable operator to access samples
-  uint32_t& operator[](int i) { return data_[i]; }
+  uint32_t &operator[](int i) { return data_[i]; }
   /// const operator to access samples
   uint32_t operator[](int i) const { return data_[i]; }
 
@@ -33,13 +33,14 @@ class IntegerCaloSamples {
   /// set presample information
   void setPresamples(int pre);
 
-  static const int MAXSAMPLES=10;
+  static const int MAXSAMPLES = 10;
+
 private:
   DetId id_;
-  uint32_t data_[MAXSAMPLES]; // 
+  uint32_t data_[MAXSAMPLES];  //
   int size_, presamples_;
 };
 
-std::ostream& operator<<(std::ostream& s, const IntegerCaloSamples& samps);
+std::ostream &operator<<(std::ostream &s, const IntegerCaloSamples &samps);
 
 #endif
diff --git a/CalibFormats/CaloObjects/src/CaloSamples.cc b/CalibFormats/CaloObjects/src/CaloSamples.cc
index 1cc66bafbf49c..e8e9eb4f4d5c5 100644
--- a/CalibFormats/CaloObjects/src/CaloSamples.cc
+++ b/CalibFormats/CaloObjects/src/CaloSamples.cc
@@ -3,120 +3,114 @@
 #include <cmath>
 #include <iostream>
 
-CaloSamples::CaloSamples() : id_(), size_(0), presamples_(0), preciseSize_(0), precisePresamples_(0) { setBlank() ; }
+CaloSamples::CaloSamples() : id_(), size_(0), presamples_(0), preciseSize_(0), precisePresamples_(0) { setBlank(); }
 
-CaloSamples::CaloSamples(const DetId& id, int size) :
-   id_          ( id   ) , 
-   size_        ( size ) , 
-   presamples_  ( 0    ) ,
-   data_        (size_, 0.0),
-   deltaTprecise_ (0.0f) ,
-   preciseSize_(0), 
-   precisePresamples_(0) { setBlank() ; }
+CaloSamples::CaloSamples(const DetId &id, int size)
+    : id_(id),
+      size_(size),
+      presamples_(0),
+      data_(size_, 0.0),
+      deltaTprecise_(0.0f),
+      preciseSize_(0),
+      precisePresamples_(0) {
+  setBlank();
+}
 
-CaloSamples::CaloSamples(const DetId& id, int size, int presize) :
-   id_          ( id   ) , 
-   size_        ( size ) , 
-   presamples_  ( 0    ) ,
-   data_        (size_, 0.0),
-   deltaTprecise_ (0.0f) ,
-   preciseSize_(presize), 
-   precisePresamples_(0) { setBlank() ; }
+CaloSamples::CaloSamples(const DetId &id, int size, int presize)
+    : id_(id),
+      size_(size),
+      presamples_(0),
+      data_(size_, 0.0),
+      deltaTprecise_(0.0f),
+      preciseSize_(presize),
+      precisePresamples_(0) {
+  setBlank();
+}
 
 // add option to set these later.
-void CaloSamples::resetPrecise() {
-  preciseData_.resize(preciseSize_,0);
-}
+void CaloSamples::resetPrecise() { preciseData_.resize(preciseSize_, 0); }
 
-void CaloSamples::setPresamples( int pre ) {
-   presamples_ = pre ;
-}
+void CaloSamples::setPresamples(int pre) { presamples_ = pre; }
 
-CaloSamples& CaloSamples::scale( double value ) {
-   for (int i=0; i<size_; i++) data_[i]*=value;
-   for (std::vector<float>::iterator j=preciseData_.begin() ; j!=preciseData_.end(); ++j)
-     (*j)*=value;
-   return (*this);
+CaloSamples &CaloSamples::scale(double value) {
+  for (int i = 0; i < size_; i++)
+    data_[i] *= value;
+  for (std::vector<float>::iterator j = preciseData_.begin(); j != preciseData_.end(); ++j)
+    (*j) *= value;
+  return (*this);
 }
 
-CaloSamples& CaloSamples::operator+=(double value) {  
-   for (int i=0; i<size_; i++) data_[i]+=value;
-   for (std::vector<float>::iterator j=preciseData_.begin() ; j!=preciseData_.end(); ++j)
-     (*j)+=value*deltaTprecise_/25.0; // note that the scale is conserved!
+CaloSamples &CaloSamples::operator+=(double value) {
+  for (int i = 0; i < size_; i++)
+    data_[i] += value;
+  for (std::vector<float>::iterator j = preciseData_.begin(); j != preciseData_.end(); ++j)
+    (*j) += value * deltaTprecise_ / 25.0;  // note that the scale is conserved!
   return (*this);
 }
 
-CaloSamples& CaloSamples::operator+=(const CaloSamples & other) {
-  if(size_ != other.size_ ||
-     presamples_ != other.presamples_ ||
-     preciseSize_ != other.preciseSize_)  {
-    edm::LogError("CaloHitResponse") << "Mismatched calo signals "; 
+CaloSamples &CaloSamples::operator+=(const CaloSamples &other) {
+  if (size_ != other.size_ || presamples_ != other.presamples_ || preciseSize_ != other.preciseSize_) {
+    edm::LogError("CaloHitResponse") << "Mismatched calo signals ";
   }
   int i;
-  for(i = 0; i < size_; ++i) {
+  for (i = 0; i < size_; ++i) {
     data_[i] += other.data_[i];
   }
-  if ( preciseData_.empty() && !other.preciseData_.empty() ) resetPrecise();
-  if ( !other.preciseData_.empty() ) {
-    for(i = 0; i < preciseSize_; ++i) {
+  if (preciseData_.empty() && !other.preciseData_.empty())
+    resetPrecise();
+  if (!other.preciseData_.empty()) {
+    for (i = 0; i < preciseSize_; ++i) {
       preciseData_[i] += other.preciseData_[i];
     }
   }
   return *this;
 }
 
-CaloSamples &
-CaloSamples::offsetTime(double offset)
-{
-  std::vector<double> data(size_,0.0);
-  for( int i ( 0 ) ; i != size_ ; ++i )
-  {
-    double t = i*25. - offset;
-    int firstbin = floor(t/25.);
-    double f = t/25. - firstbin;
+CaloSamples &CaloSamples::offsetTime(double offset) {
+  std::vector<double> data(size_, 0.0);
+  for (int i(0); i != size_; ++i) {
+    double t = i * 25. - offset;
+    int firstbin = floor(t / 25.);
+    double f = t / 25. - firstbin;
     int nextbin = firstbin + 1;
     double v1 = (firstbin < 0 || firstbin >= size_) ? 0. : data_[firstbin];
-    double v2 = (nextbin < 0  || nextbin  >= size_) ? 0. : data_[nextbin];
-    data[i] = (v1*(1.-f)+v2*f);
+    double v2 = (nextbin < 0 || nextbin >= size_) ? 0. : data_[nextbin];
+    data[i] = (v1 * (1. - f) + v2 * f);
   }
-  for( int i ( 0 ) ; i != size_ ; ++i )
-  {
+  for (int i(0); i != size_; ++i) {
     data_[i] = data[i];
   }
   return (*this);
 }
 
-bool 
-CaloSamples::isBlank() const // are the samples blank (zero?)
+bool CaloSamples::isBlank() const  // are the samples blank (zero?)
 {
-   for( int i ( 0 ) ; i != size_ ; ++i )
-   {
-      if( 1.e-6 < fabs( data_[i] ) ) return false ;
-   }
-   return true ;
+  for (int i(0); i != size_; ++i) {
+    if (1.e-6 < fabs(data_[i]))
+      return false;
+  }
+  return true;
 }
 
-void 
-CaloSamples::setBlank() // keep id, presamples, size but zero out data
+void CaloSamples::setBlank()  // keep id, presamples, size but zero out data
 {
-   std::fill( data_.begin() , data_.end(), (double)0.0 ) ;
-   std::fill( preciseData_.begin() , preciseData_.end(), (double)0.0 ) ;
+  std::fill(data_.begin(), data_.end(), (double)0.0);
+  std::fill(preciseData_.begin(), preciseData_.end(), (double)0.0);
 }
 
-std::ostream& operator<<(std::ostream& s, const CaloSamples& samples) {
+std::ostream &operator<<(std::ostream &s, const CaloSamples &samples) {
   s << "DetId " << samples.id();
   // print out every so many precise samples
-  float preciseStep = samples.preciseSize()/samples.size();
-  s << ", "<<  samples.size() << " samples";
-  if (preciseStep > 0) 
-    s << ", " << samples.preciseSize() << " preciseSamples" 
+  float preciseStep = samples.preciseSize() / samples.size();
+  s << ", " << samples.size() << " samples";
+  if (preciseStep > 0)
+    s << ", " << samples.preciseSize() << " preciseSamples"
       << ", " << preciseStep << " preciseStep";
   s << '\n';
-  for (int i=0; i<samples.size(); i++) {
+  for (int i = 0; i < samples.size(); i++) {
     s << i << ":" << samples[i] << " precise:";
-    int precise_start(i*preciseStep), precise_end(precise_start + preciseStep);
-    for (int j(precise_start); ((j<precise_end) && (j< samples.preciseSize()));
-	 ++j)
+    int precise_start(i * preciseStep), precise_end(precise_start + preciseStep);
+    for (int j(precise_start); ((j < precise_end) && (j < samples.preciseSize())); ++j)
       s << " " << samples.preciseAt(j);
     s << std::endl;
   }
diff --git a/CalibFormats/CaloObjects/src/CaloTSamples.cc b/CalibFormats/CaloObjects/src/CaloTSamples.cc
index 431fa3ccc882c..394eae1f38f60 100644
--- a/CalibFormats/CaloObjects/src/CaloTSamples.cc
+++ b/CalibFormats/CaloObjects/src/CaloTSamples.cc
@@ -1,7 +1,7 @@
-#include "CalibFormats/CaloObjects/interface/CaloTSamplesBase.icc"
 #include "CalibFormats/CaloObjects/interface/CaloTSamples.icc"
+#include "CalibFormats/CaloObjects/interface/CaloTSamplesBase.icc"
 
-template class CaloTSamplesBase<float> ;
+template class CaloTSamplesBase<float>;
 
-template class CaloTSamples<float,10> ;
-template class CaloTSamples<float, 3> ;
+template class CaloTSamples<float, 10>;
+template class CaloTSamples<float, 3>;
diff --git a/CalibFormats/CaloObjects/src/IntegerCaloSamples.cc b/CalibFormats/CaloObjects/src/IntegerCaloSamples.cc
index 3ed26c6eb7c57..85bc01a314949 100644
--- a/CalibFormats/CaloObjects/src/IntegerCaloSamples.cc
+++ b/CalibFormats/CaloObjects/src/IntegerCaloSamples.cc
@@ -1,22 +1,21 @@
 #include "CalibFormats/CaloObjects/interface/IntegerCaloSamples.h"
 
 IntegerCaloSamples::IntegerCaloSamples() : id_(), size_(0), presamples_(0) {
-  for (int i=0; i<MAXSAMPLES; i++) data_[i]=0;
+  for (int i = 0; i < MAXSAMPLES; i++)
+    data_[i] = 0;
 }
 
-IntegerCaloSamples::IntegerCaloSamples(const DetId& id, int size) : id_(id), size_(size), presamples_(0) {
-  for (int i=0; i<MAXSAMPLES; i++) data_[i]=0;
-}
-
-void IntegerCaloSamples::setPresamples(int pre) {
-  presamples_=pre;
+IntegerCaloSamples::IntegerCaloSamples(const DetId &id, int size) : id_(id), size_(size), presamples_(0) {
+  for (int i = 0; i < MAXSAMPLES; i++)
+    data_[i] = 0;
 }
 
+void IntegerCaloSamples::setPresamples(int pre) { presamples_ = pre; }
 
-std::ostream& operator<<(std::ostream& s, const IntegerCaloSamples& samples) {
+std::ostream &operator<<(std::ostream &s, const IntegerCaloSamples &samples) {
   s << "DetId=" << samples.id().rawId();
-  s << ", "<<  samples.size() << "samples" << std::endl;
-  for (int i=0; i<samples.size(); i++)
+  s << ", " << samples.size() << "samples" << std::endl;
+  for (int i = 0; i < samples.size(); i++)
     s << i << ":" << samples[i] << std::endl;
   return s;
 }
diff --git a/CalibFormats/CaloObjects/src/classes.h b/CalibFormats/CaloObjects/src/classes.h
index 7bbfabe3ef786..279b44749e43d 100644
--- a/CalibFormats/CaloObjects/src/classes.h
+++ b/CalibFormats/CaloObjects/src/classes.h
@@ -7,4 +7,4 @@ namespace CalibFormats_CaloObjects {
     CaloSamplesCollection vcs;
     edm::Wrapper<CaloSamplesCollection> wcvs;
   };
-}
+}  // namespace CalibFormats_CaloObjects
diff --git a/CalibFormats/CastorObjects/interface/CastorCalibrationWidths.h b/CalibFormats/CastorObjects/interface/CastorCalibrationWidths.h
index b45f0552d449c..6b2be81a35f1a 100644
--- a/CalibFormats/CastorObjects/interface/CastorCalibrationWidths.h
+++ b/CalibFormats/CastorObjects/interface/CastorCalibrationWidths.h
@@ -7,16 +7,17 @@
 
 */
 class CastorCalibrationWidths {
- public:
-  CastorCalibrationWidths () : mGain{}, mPedestal{} {};
-  CastorCalibrationWidths (const float fGain [4], const float fPedestal [4]);
+public:
+  CastorCalibrationWidths() : mGain{}, mPedestal{} {};
+  CastorCalibrationWidths(const float fGain[4], const float fPedestal[4]);
   /// get gain width for capid=0..3
-  double gain (int fCapId) const {return mGain [fCapId];}
+  double gain(int fCapId) const { return mGain[fCapId]; }
   /// get pedestal width for capid=0..3
-  double pedestal (int fCapId) const {return mPedestal [fCapId];}
- private:
-  double mGain [4];
-  double mPedestal [4];
+  double pedestal(int fCapId) const { return mPedestal[fCapId]; }
+
+private:
+  double mGain[4];
+  double mPedestal[4];
 };
 
 #endif
diff --git a/CalibFormats/CastorObjects/interface/CastorCalibrationWidthsSet.h b/CalibFormats/CastorObjects/interface/CastorCalibrationWidthsSet.h
index 70f4ca823190d..88a32a49e8d1e 100644
--- a/CalibFormats/CastorObjects/interface/CastorCalibrationWidthsSet.h
+++ b/CalibFormats/CastorObjects/interface/CastorCalibrationWidthsSet.h
@@ -17,9 +17,10 @@ class CastorCalibrationWidthsSet {
   void setCalibrationWidths(const DetId id, const CastorCalibrationWidths& ca);
   void sort();
   void clear();
+
 private:
   struct CalibWidthSetObject {
-    CalibWidthSetObject(const DetId& aid) : id(aid) { }
+    CalibWidthSetObject(const DetId& aid) : id(aid) {}
     DetId id;
     CastorCalibrationWidths calib;
     bool operator<(const CalibWidthSetObject& cso) const { return id < cso.id; }
diff --git a/CalibFormats/CastorObjects/interface/CastorCalibrations.h b/CalibFormats/CastorObjects/interface/CastorCalibrations.h
index 3872047a997df..a8790c7ccac34 100644
--- a/CalibFormats/CastorObjects/interface/CastorCalibrations.h
+++ b/CalibFormats/CastorObjects/interface/CastorCalibrations.h
@@ -7,16 +7,17 @@
 
 */
 class CastorCalibrations {
- public:
-  CastorCalibrations () : mGain{}, mPedestal{} {};
-  CastorCalibrations (const float fGain [4], const float fPedestal [4]);
+public:
+  CastorCalibrations() : mGain{}, mPedestal{} {};
+  CastorCalibrations(const float fGain[4], const float fPedestal[4]);
   /// get gain for capid=0..3
-  double gain (int fCapId) const {return mGain [fCapId];}
+  double gain(int fCapId) const { return mGain[fCapId]; }
   /// get pedestal for capid=0..3
-  double pedestal (int fCapId) const {return mPedestal [fCapId];}
- private:
-  double mGain [4];
-  double mPedestal [4];
+  double pedestal(int fCapId) const { return mPedestal[fCapId]; }
+
+private:
+  double mGain[4];
+  double mPedestal[4];
 };
 
 #endif
diff --git a/CalibFormats/CastorObjects/interface/CastorCalibrationsSet.h b/CalibFormats/CastorObjects/interface/CastorCalibrationsSet.h
index 927c8cf354c72..b69a501f4443c 100644
--- a/CalibFormats/CastorObjects/interface/CastorCalibrationsSet.h
+++ b/CalibFormats/CastorObjects/interface/CastorCalibrationsSet.h
@@ -12,9 +12,10 @@ class CastorCalibrationsSet {
   void setCalibrations(const DetId id, const CastorCalibrations& ca);
   void sort();
   void clear();
+
 private:
   struct CalibSetObject {
-    CalibSetObject(const DetId& aid) : id(aid) { }
+    CalibSetObject(const DetId& aid) : id(aid) {}
     DetId id;
     CastorCalibrations calib;
     bool operator<(const CalibSetObject& cso) const { return id < cso.id; }
diff --git a/CalibFormats/CastorObjects/interface/CastorChannelCoder.h b/CalibFormats/CastorObjects/interface/CastorChannelCoder.h
index e5065b887bcff..2bd142ab89fb6 100644
--- a/CalibFormats/CastorObjects/interface/CastorChannelCoder.h
+++ b/CalibFormats/CastorObjects/interface/CastorChannelCoder.h
@@ -11,19 +11,20 @@ namespace reco {
   namespace castor {
     class QieShape;
   }
-}
+}  // namespace reco
 
 class CastorChannelCoder {
- public:
-  CastorChannelCoder (const float fOffset [16], const float fSlope [16]); // [CapId][Range]
+public:
+  CastorChannelCoder(const float fOffset[16], const float fSlope[16]);  // [CapId][Range]
   /// ADC[0..127]+capid[0..3]->fC conversion
-  double charge (const reco::castor::QieShape& fShape, int fAdc, int fCapId) const;
+  double charge(const reco::castor::QieShape& fShape, int fAdc, int fCapId) const;
   /// fC + capid[0..3] -> ADC conversion
-  int adc (const reco::castor::QieShape& fShape, double fCharge, int fCapId) const;
-  int index (int fCapId, int Range) {return fCapId*4+Range;}
- private:
-  double mOffset [4][4];
-  double mSlope [4][4];
+  int adc(const reco::castor::QieShape& fShape, double fCharge, int fCapId) const;
+  int index(int fCapId, int Range) { return fCapId * 4 + Range; }
+
+private:
+  double mOffset[4][4];
+  double mSlope[4][4];
 };
 
 #endif
diff --git a/CalibFormats/CastorObjects/interface/CastorCoderDb.h b/CalibFormats/CastorObjects/interface/CastorCoderDb.h
index 811a78c4a5785..ff3690242d122 100644
--- a/CalibFormats/CastorObjects/interface/CastorCoderDb.h
+++ b/CalibFormats/CastorObjects/interface/CastorCoderDb.h
@@ -15,15 +15,17 @@ class CastorQIEShape;
 
 class CastorCoderDb : public CastorCoder {
 public:
-  CastorCoderDb (const CastorQIECoder& fCoder, const CastorQIEShape& fShape);
+  CastorCoderDb(const CastorQIECoder& fCoder, const CastorQIEShape& fShape);
 
   void adc2fC(const CastorDataFrame& df, CaloSamples& lf) const override;
- 
+
   void fC2adc(const CaloSamples& clf, CastorDataFrame& df, int fCapIdOffset) const override;
- 
- private:
-  template <class Digi> void adc2fC_ (const Digi& df, CaloSamples& clf) const;
-  template <class Digi> void fC2adc_ (const CaloSamples& clf, Digi& df, int fCapIdOffset) const;
+
+private:
+  template <class Digi>
+  void adc2fC_(const Digi& df, CaloSamples& clf) const;
+  template <class Digi>
+  void fC2adc_(const CaloSamples& clf, Digi& df, int fCapIdOffset) const;
 
   const CastorQIECoder* mCoder;
   const CastorQIEShape* mShape;
diff --git a/CalibFormats/CastorObjects/interface/CastorDbRecord.h b/CalibFormats/CastorObjects/interface/CastorDbRecord.h
index 5324dc70f905d..0f6c9f49398b6 100644
--- a/CalibFormats/CastorObjects/interface/CastorDbRecord.h
+++ b/CalibFormats/CastorObjects/interface/CastorDbRecord.h
@@ -4,7 +4,7 @@
 //
 // Package:     CastorDbProducer
 // Class  :     CastorDbRecord
-// 
+//
 /**\class CastorDbRecord CastorDbRecord.h CalibFormats/CastorDbProducer/interface/CastorDbRecord.h
 
  Description: based on the HCAL Db record class
@@ -18,16 +18,22 @@
 // #include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
 
 #include "CondFormats/DataRecord/interface/CastorChannelQualityRcd.h"
-#include "CondFormats/DataRecord/interface/CastorElectronicsMapRcd.h"  
-#include "CondFormats/DataRecord/interface/CastorElectronicsMapRcd.h"      
+#include "CondFormats/DataRecord/interface/CastorElectronicsMapRcd.h"
+#include "CondFormats/DataRecord/interface/CastorElectronicsMapRcd.h"
 #include "CondFormats/DataRecord/interface/CastorGainWidthsRcd.h"
 #include "CondFormats/DataRecord/interface/CastorGainsRcd.h"
 #include "CondFormats/DataRecord/interface/CastorPedestalWidthsRcd.h"
-#include "CondFormats/DataRecord/interface/CastorPedestalsRcd.h" 
+#include "CondFormats/DataRecord/interface/CastorPedestalsRcd.h"
 #include "CondFormats/DataRecord/interface/CastorQIEDataRcd.h"
 
-class CastorDbRecord : public edm::eventsetup::DependentRecordImplementation <CastorDbRecord,  
-  boost::mpl::vector<CastorPedestalsRcd, CastorPedestalWidthsRcd, CastorGainsRcd, CastorGainWidthsRcd, CastorQIEDataRcd, CastorChannelQualityRcd, CastorElectronicsMapRcd > > {}; 
+class CastorDbRecord
+    : public edm::eventsetup::DependentRecordImplementation<CastorDbRecord,
+                                                            boost::mpl::vector<CastorPedestalsRcd,
+                                                                               CastorPedestalWidthsRcd,
+                                                                               CastorGainsRcd,
+                                                                               CastorGainWidthsRcd,
+                                                                               CastorQIEDataRcd,
+                                                                               CastorChannelQualityRcd,
+                                                                               CastorElectronicsMapRcd> > {};
 
 #endif /* CASTORDBPRODUCER_CASTORDBRECORD_H */
-
diff --git a/CalibFormats/CastorObjects/interface/CastorDbService.h b/CalibFormats/CastorObjects/interface/CastorDbService.h
index f84e13309f270..2a1b78fdac673 100644
--- a/CalibFormats/CastorObjects/interface/CastorDbService.h
+++ b/CalibFormats/CastorObjects/interface/CastorDbService.h
@@ -26,39 +26,41 @@ class CastorCalibrations;
 class CastorCalibrationWidths;
 
 class CastorDbService {
- public:
-  CastorDbService ();
+public:
+  CastorDbService();
 
-  const CastorCalibrations& getCastorCalibrations(const HcalGenericDetId& fId) const 
-  { return mCalibSet.getCalibrations(fId); }
-  const CastorCalibrationWidths& getCastorCalibrationWidths(const HcalGenericDetId& fId) const 
-  { return mCalibWidthSet.getCalibrationWidths(fId); }
+  const CastorCalibrations& getCastorCalibrations(const HcalGenericDetId& fId) const {
+    return mCalibSet.getCalibrations(fId);
+  }
+  const CastorCalibrationWidths& getCastorCalibrationWidths(const HcalGenericDetId& fId) const {
+    return mCalibWidthSet.getCalibrationWidths(fId);
+  }
 
-  const CastorPedestal* getPedestal (const HcalGenericDetId& fId) const;
-  const CastorPedestalWidth* getPedestalWidth (const HcalGenericDetId& fId) const;
-  const CastorGain* getGain (const HcalGenericDetId& fId) const;
-  const CastorGainWidth* getGainWidth (const HcalGenericDetId& fId) const;
-  const CastorQIECoder* getCastorCoder (const HcalGenericDetId& fId) const;
-  const CastorQIEShape* getCastorShape () const;
-  const CastorElectronicsMap* getCastorMapping () const;
-  const CastorChannelStatus* getCastorChannelStatus (const HcalGenericDetId& fId) const;
+  const CastorPedestal* getPedestal(const HcalGenericDetId& fId) const;
+  const CastorPedestalWidth* getPedestalWidth(const HcalGenericDetId& fId) const;
+  const CastorGain* getGain(const HcalGenericDetId& fId) const;
+  const CastorGainWidth* getGainWidth(const HcalGenericDetId& fId) const;
+  const CastorQIECoder* getCastorCoder(const HcalGenericDetId& fId) const;
+  const CastorQIEShape* getCastorShape() const;
+  const CastorElectronicsMap* getCastorMapping() const;
+  const CastorChannelStatus* getCastorChannelStatus(const HcalGenericDetId& fId) const;
 
-  void setData (const CastorPedestals* fItem) { mPedestals = fItem; }
-  void setData (const CastorPedestalWidths* fItem) { mPedestalWidths = fItem; }
-  void setData (const CastorGains* fItem) { mGains = fItem; }
-  void setData (const CastorGainWidths* fItem) {mGainWidths = fItem; }
-  void setData (const CastorQIEData* fItem) {mQIEData = fItem; }
-  void setData (const CastorChannelQuality* fItem) {mChannelQuality = fItem;}
-  void setData (const CastorElectronicsMap* fItem) {mElectronicsMap = fItem;}
+  void setData(const CastorPedestals* fItem) { mPedestals = fItem; }
+  void setData(const CastorPedestalWidths* fItem) { mPedestalWidths = fItem; }
+  void setData(const CastorGains* fItem) { mGains = fItem; }
+  void setData(const CastorGainWidths* fItem) { mGainWidths = fItem; }
+  void setData(const CastorQIEData* fItem) { mQIEData = fItem; }
+  void setData(const CastorChannelQuality* fItem) { mChannelQuality = fItem; }
+  void setData(const CastorElectronicsMap* fItem) { mElectronicsMap = fItem; }
 
   void buildCalibrations();
   void buildCalibWidths();
 
- private:
-  bool makeCastorCalibration (const HcalGenericDetId& fId, CastorCalibrations* fObject, 
-			    bool pedestalInADC) const;
-  bool makeCastorCalibrationWidth (const HcalGenericDetId& fId, CastorCalibrationWidths* fObject, 
-				 bool pedestalInADC) const;
+private:
+  bool makeCastorCalibration(const HcalGenericDetId& fId, CastorCalibrations* fObject, bool pedestalInADC) const;
+  bool makeCastorCalibrationWidth(const HcalGenericDetId& fId,
+                                  CastorCalibrationWidths* fObject,
+                                  bool pedestalInADC) const;
   const CastorPedestals* mPedestals;
   const CastorPedestalWidths* mPedestalWidths;
   const CastorGains* mGains;
diff --git a/CalibFormats/CastorObjects/interface/CastorNominalCoder.h b/CalibFormats/CastorObjects/interface/CastorNominalCoder.h
index 770a779110e97..0d50c65a0f4e0 100644
--- a/CalibFormats/CastorObjects/interface/CastorNominalCoder.h
+++ b/CalibFormats/CastorObjects/interface/CastorNominalCoder.h
@@ -12,7 +12,7 @@ class CastorNominalCoder : public CastorCoder {
 public:
   void adc2fC(const CastorDataFrame& df, CaloSamples& lf) const override;
 
-  void fC2adc(const CaloSamples& clf, CastorDataFrame& df, int fCapIdOffset) const override; 
+  void fC2adc(const CaloSamples& clf, CastorDataFrame& df, int fCapIdOffset) const override;
 };
 
 #endif
diff --git a/CalibFormats/CastorObjects/interface/CastorTPGCoder.h b/CalibFormats/CastorObjects/interface/CastorTPGCoder.h
index 90a783c04032c..1256351ccfaf8 100644
--- a/CalibFormats/CastorObjects/interface/CastorTPGCoder.h
+++ b/CalibFormats/CastorObjects/interface/CastorTPGCoder.h
@@ -7,7 +7,7 @@
 
 // forward declaration of EventSetup is all that is needed here
 namespace edm {
-  class EventSetup; 
+  class EventSetup;
 }
 
 /** \class CastorTPGCoder
@@ -25,8 +25,10 @@ class CastorTPGCoder {
   virtual ~CastorTPGCoder() = default;
   //  virtual void adc2Linear(const CastorDataFrame& df, IntegerCaloSamples& ics) const = 0;
 
-  virtual unsigned short adc2Linear(HcalQIESample sample,HcalDetId id) const = 0;
-  unsigned short adc2Linear(unsigned char adc, HcalDetId id) const { return adc2Linear(HcalQIESample(adc,0,0,0),id); }
+  virtual unsigned short adc2Linear(HcalQIESample sample, HcalDetId id) const = 0;
+  unsigned short adc2Linear(unsigned char adc, HcalDetId id) const {
+    return adc2Linear(HcalQIESample(adc, 0, 0, 0), id);
+  }
   virtual float getLUTPedestal(HcalDetId id) const = 0;
   virtual float getLUTGain(HcalDetId id) const = 0;
   /** \brief Get the full linearization LUT (128 elements).
diff --git a/CalibFormats/CastorObjects/interface/CastorTPGRecord.h b/CalibFormats/CastorObjects/interface/CastorTPGRecord.h
index 6c85a7ee1deb0..0cae090d0efda 100644
--- a/CalibFormats/CastorObjects/interface/CastorTPGRecord.h
+++ b/CalibFormats/CastorObjects/interface/CastorTPGRecord.h
@@ -13,6 +13,7 @@
 #include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
 #include "CalibFormats/CastorObjects/interface/CastorDbRecord.h"
 
-class CastorTPGRecord : public edm::eventsetup::DependentRecordImplementation<CastorTPGRecord, boost::mpl::vector<CastorDbRecord> >{};
+class CastorTPGRecord
+    : public edm::eventsetup::DependentRecordImplementation<CastorTPGRecord, boost::mpl::vector<CastorDbRecord> > {};
 
 #endif
diff --git a/CalibFormats/CastorObjects/interface/CastorText2DetIdConverter.h b/CalibFormats/CastorObjects/interface/CastorText2DetIdConverter.h
index f60d7c468d15d..c7fdf09aa1d58 100644
--- a/CalibFormats/CastorObjects/interface/CastorText2DetIdConverter.h
+++ b/CalibFormats/CastorObjects/interface/CastorText2DetIdConverter.h
@@ -10,29 +10,32 @@
 #include "DataFormats/DetId/interface/DetId.h"
 
 class CastorText2DetIdConverter {
- public:
+public:
+  CastorText2DetIdConverter(const std::string& fFlavor = "NA",
+                            const std::string& fField1 = "0",
+                            const std::string& fField2 = "0",
+                            const std::string& fField3 = "0");
 
-  CastorText2DetIdConverter (const std::string& fFlavor = "NA", const std::string& fField1 = "0",
-			  const std::string& fField2 = "0", const std::string& fField3 = "0");
-  
-  CastorText2DetIdConverter (DetId fId);
+  CastorText2DetIdConverter(DetId fId);
 
   //  bool isHcalDetId () const;
-  bool isHcalCastorDetId () const;
-
-  const std::string& getFlavor () const {return flavorName;}
-  const std::string& getField1 () const {return field1;}
-  const std::string& getField2 () const {return field2;}
-  const std::string& getField3 () const {return field3;}
-  DetId getId () const {return mId;}
-  int getField (int i) const;
-  std::string toString () const;
-  
- private:
-  bool init (const std::string& fFlavor, const std::string& fField1,
-	     const std::string& fField2, const std::string& fField3);
-  bool init (DetId fId);
-  void setField (int i, int fValue);
+  bool isHcalCastorDetId() const;
+
+  const std::string& getFlavor() const { return flavorName; }
+  const std::string& getField1() const { return field1; }
+  const std::string& getField2() const { return field2; }
+  const std::string& getField3() const { return field3; }
+  DetId getId() const { return mId; }
+  int getField(int i) const;
+  std::string toString() const;
+
+private:
+  bool init(const std::string& fFlavor,
+            const std::string& fField1,
+            const std::string& fField2,
+            const std::string& fField3);
+  bool init(DetId fId);
+  void setField(int i, int fValue);
   std::string flavorName;
   std::string field1;
   std::string field2;
diff --git a/CalibFormats/CastorObjects/interface/QieShape.h b/CalibFormats/CastorObjects/interface/QieShape.h
index dc18771bac408..2e695fada04ae 100644
--- a/CalibFormats/CastorObjects/interface/QieShape.h
+++ b/CalibFormats/CastorObjects/interface/QieShape.h
@@ -8,21 +8,22 @@
 */
 
 namespace reco {
-namespace castor {
+  namespace castor {
 
-class QieShape {
- public:
-  QieShape (const double fAdcShape [32], const double fAdcBin [32]);
-  // center of the nominal linearized QIE bin
-  double linearization (int fAdc) const {return mLinearization [fAdc];}
-  // width of the nominal linearized bin
-  double binSize (int fAdc) const {return mBinSize [fAdc];}
- private:
-  double mLinearization [128];
-  double mBinSize [128];
-};
+    class QieShape {
+    public:
+      QieShape(const double fAdcShape[32], const double fAdcBin[32]);
+      // center of the nominal linearized QIE bin
+      double linearization(int fAdc) const { return mLinearization[fAdc]; }
+      // width of the nominal linearized bin
+      double binSize(int fAdc) const { return mBinSize[fAdc]; }
 
-}
-}
+    private:
+      double mLinearization[128];
+      double mBinSize[128];
+    };
+
+  }  // namespace castor
+}  // namespace reco
 
 #endif
diff --git a/CalibFormats/CastorObjects/src/CastorCalibrationWidths.cc b/CalibFormats/CastorObjects/src/CastorCalibrationWidths.cc
index 4a85fce0d4ddb..59cc640f18f1a 100644
--- a/CalibFormats/CastorObjects/src/CastorCalibrationWidths.cc
+++ b/CalibFormats/CastorObjects/src/CastorCalibrationWidths.cc
@@ -7,10 +7,9 @@
    $Author: katsas
 */
 
-CastorCalibrationWidths::CastorCalibrationWidths (const float fGain [4], const float fPedestal [4]) {
-  for (size_t iCap = 0; iCap < 4; ++iCap)
-  {
-    mGain [iCap] = fGain [iCap];
-    mPedestal [iCap] = fPedestal [iCap];
+CastorCalibrationWidths::CastorCalibrationWidths(const float fGain[4], const float fPedestal[4]) {
+  for (size_t iCap = 0; iCap < 4; ++iCap) {
+    mGain[iCap] = fGain[iCap];
+    mPedestal[iCap] = fPedestal[iCap];
   }
 }
diff --git a/CalibFormats/CastorObjects/src/CastorCalibrationWidthsSet.cc b/CalibFormats/CastorObjects/src/CastorCalibrationWidthsSet.cc
index 5c5284b03f2d7..3abe9a3df37ec 100644
--- a/CalibFormats/CastorObjects/src/CastorCalibrationWidthsSet.cc
+++ b/CalibFormats/CastorObjects/src/CastorCalibrationWidthsSet.cc
@@ -4,41 +4,36 @@
 #include <algorithm>
 #include <iostream>
 
-
-CastorCalibrationWidthsSet::CastorCalibrationWidthsSet() 
-  : sorted_ (false) {}
+CastorCalibrationWidthsSet::CastorCalibrationWidthsSet() : sorted_(false) {}
 
 const CastorCalibrationWidths& CastorCalibrationWidthsSet::getCalibrationWidths(const DetId fId) const {
   Item target(fId);
   std::vector<Item>::const_iterator cell;
   if (sorted_) {
-    cell = std::lower_bound (mItems.begin(), mItems.end(), target);
-  }
-  else {
-    cell = std::find(mItems.begin(),mItems.end(), target);
+    cell = std::lower_bound(mItems.begin(), mItems.end(), target);
+  } else {
+    cell = std::find(mItems.begin(), mItems.end(), target);
   }
-  if (cell == mItems.end() || cell->id != fId) 
-    throw cms::Exception ("Conditions not found") << "Unavailable CastorCalibrationWidths for cell " << HcalGenericDetId(fId);
+  if (cell == mItems.end() || cell->id != fId)
+    throw cms::Exception("Conditions not found")
+        << "Unavailable CastorCalibrationWidths for cell " << HcalGenericDetId(fId);
   return cell->calib;
 }
 
 void CastorCalibrationWidthsSet::setCalibrationWidths(DetId fId, const CastorCalibrationWidths& ca) {
-  sorted_=false;
-  std::vector<Item>::iterator cell=std::find(mItems.begin(),mItems.end(),Item(fId)); //slow, but guaranteed
-  if (cell==mItems.end()) 
-    {
-      mItems.push_back(Item(fId));
-      mItems.at(mItems.size()-1).calib=ca;
-      return;
-    }
-  cell->calib=ca;
+  sorted_ = false;
+  std::vector<Item>::iterator cell = std::find(mItems.begin(), mItems.end(), Item(fId));  //slow, but guaranteed
+  if (cell == mItems.end()) {
+    mItems.push_back(Item(fId));
+    mItems.at(mItems.size() - 1).calib = ca;
+    return;
+  }
+  cell->calib = ca;
 }
-void CastorCalibrationWidthsSet::sort () {
+void CastorCalibrationWidthsSet::sort() {
   if (!sorted_) {
-    std::sort (mItems.begin(), mItems.end());
+    std::sort(mItems.begin(), mItems.end());
     sorted_ = true;
   }
 }
-void CastorCalibrationWidthsSet::clear() {
-  mItems.clear();
-}
+void CastorCalibrationWidthsSet::clear() { mItems.clear(); }
diff --git a/CalibFormats/CastorObjects/src/CastorCalibrations.cc b/CalibFormats/CastorObjects/src/CastorCalibrations.cc
index f460a86082f91..394bd18eb75e8 100644
--- a/CalibFormats/CastorObjects/src/CastorCalibrations.cc
+++ b/CalibFormats/CastorObjects/src/CastorCalibrations.cc
@@ -7,10 +7,9 @@
    $Author: katsas
 */
 
-CastorCalibrations::CastorCalibrations (const float fGain [4], const float fPedestal [4]) {
-  for (size_t iCap = 0; iCap < 4; ++iCap)
-  {
-    mGain [iCap] = fGain [iCap];
-    mPedestal [iCap] = fPedestal [iCap];
+CastorCalibrations::CastorCalibrations(const float fGain[4], const float fPedestal[4]) {
+  for (size_t iCap = 0; iCap < 4; ++iCap) {
+    mGain[iCap] = fGain[iCap];
+    mPedestal[iCap] = fPedestal[iCap];
   }
 }
diff --git a/CalibFormats/CastorObjects/src/CastorCalibrationsSet.cc b/CalibFormats/CastorObjects/src/CastorCalibrationsSet.cc
index 7048c5349ed00..b6f3ce41ca8e9 100644
--- a/CalibFormats/CastorObjects/src/CastorCalibrationsSet.cc
+++ b/CalibFormats/CastorObjects/src/CastorCalibrationsSet.cc
@@ -3,42 +3,36 @@
 #include "FWCore/Utilities/interface/Exception.h"
 #include <algorithm>
 
-
-CastorCalibrationsSet::CastorCalibrationsSet() 
-  : sorted_ (false) {}
+CastorCalibrationsSet::CastorCalibrationsSet() : sorted_(false) {}
 
 const CastorCalibrations& CastorCalibrationsSet::getCalibrations(const DetId fId) const {
   Item target(fId);
   std::vector<Item>::const_iterator cell;
   if (sorted_) {
-    cell = std::lower_bound (mItems.begin(), mItems.end(), target);
-  }
-  else {
-    cell = std::find(mItems.begin(),mItems.end(), target);
+    cell = std::lower_bound(mItems.begin(), mItems.end(), target);
+  } else {
+    cell = std::find(mItems.begin(), mItems.end(), target);
   }
-  if (cell == mItems.end() || cell->id != fId) 
-    throw cms::Exception ("Conditions not found") << "Unavailable CastorCalibrations for cell " << HcalGenericDetId(fId);
+  if (cell == mItems.end() || cell->id != fId)
+    throw cms::Exception("Conditions not found") << "Unavailable CastorCalibrations for cell " << HcalGenericDetId(fId);
   return cell->calib;
 }
 
 void CastorCalibrationsSet::setCalibrations(DetId fId, const CastorCalibrations& ca) {
-  sorted_=false;
-  std::vector<Item>::iterator cell=std::find(mItems.begin(),mItems.end(),Item(fId)); //slow, but guaranteed
- if (cell==mItems.end())
-    {
-      mItems.push_back(Item(fId));
-      mItems.at(mItems.size()-1).calib=ca;
-      return;
-    }
+  sorted_ = false;
+  std::vector<Item>::iterator cell = std::find(mItems.begin(), mItems.end(), Item(fId));  //slow, but guaranteed
+  if (cell == mItems.end()) {
+    mItems.push_back(Item(fId));
+    mItems.at(mItems.size() - 1).calib = ca;
+    return;
+  }
 
-  cell->calib=ca;
+  cell->calib = ca;
 }
-void CastorCalibrationsSet::sort () {
+void CastorCalibrationsSet::sort() {
   if (!sorted_) {
-    std::sort (mItems.begin(), mItems.end());
+    std::sort(mItems.begin(), mItems.end());
     sorted_ = true;
   }
 }
-void CastorCalibrationsSet::clear() {
-  mItems.clear();
-}
+void CastorCalibrationsSet::clear() { mItems.clear(); }
diff --git a/CalibFormats/CastorObjects/src/CastorChannelCoder.cc b/CalibFormats/CastorObjects/src/CastorChannelCoder.cc
index c3c6e36970984..620f429f3f495 100644
--- a/CalibFormats/CastorObjects/src/CastorChannelCoder.cc
+++ b/CalibFormats/CastorObjects/src/CastorChannelCoder.cc
@@ -9,44 +9,46 @@
 #include "CalibFormats/CastorObjects/interface/CastorChannelCoder.h"
 #include "CalibFormats/CastorObjects/interface/QieShape.h"
 
-CastorChannelCoder::CastorChannelCoder (const float fOffset [16], const float fSlope [16]) { // [CapId][Range]
+CastorChannelCoder::CastorChannelCoder(const float fOffset[16], const float fSlope[16]) {  // [CapId][Range]
   for (int range = 0; range < 4; range++) {
     for (int capId = 0; capId < 4; capId++) {
-      mOffset [capId][range] = fOffset [index (capId, range)];
-      mSlope [capId][range] = fSlope [index (capId, range)];
+      mOffset[capId][range] = fOffset[index(capId, range)];
+      mSlope[capId][range] = fSlope[index(capId, range)];
     }
   }
 }
 
-double CastorChannelCoder::charge (const reco::castor::QieShape& fShape, int fAdc, int fCapId) const {
+double CastorChannelCoder::charge(const reco::castor::QieShape& fShape, int fAdc, int fCapId) const {
   int range = (fAdc >> 6) & 0x3;
-  double charge = fShape.linearization (fAdc) / mSlope [fCapId][range] + mOffset [fCapId][range];
-//   std::cout << "CastorChannelCoder::charge-> " << fAdc << '/' << fCapId 
-// 	    << " result: " << charge << std::endl;
+  double charge = fShape.linearization(fAdc) / mSlope[fCapId][range] + mOffset[fCapId][range];
+  //   std::cout << "CastorChannelCoder::charge-> " << fAdc << '/' << fCapId
+  // 	    << " result: " << charge << std::endl;
   return charge;
 }
 
-int CastorChannelCoder::adc (const reco::castor::QieShape& fShape, double fCharge, int fCapId) const {
-
-  int adc = -1; //nothing found yet
+int CastorChannelCoder::adc(const reco::castor::QieShape& fShape, double fCharge, int fCapId) const {
+  int adc = -1;  //nothing found yet
   // search for the range
   for (int range = 0; range < 4; range++) {
-    double qieCharge = (fCharge - mOffset [fCapId][range]) * mSlope [fCapId][range];
-    double qieChargeMax = fShape.linearization (32*range+31) + 0.5 * fShape.binSize (32*range+31);
-    if (range == 3 && qieCharge > qieChargeMax) adc = 127; // overflow
-    if (qieCharge > qieChargeMax) continue; // next range
-    for (int bin = 32*range; bin < 32*(range+1); bin++) {
-      if (qieCharge < fShape.linearization (bin) + 0.5 * fShape.binSize (bin)) {
+    double qieCharge = (fCharge - mOffset[fCapId][range]) * mSlope[fCapId][range];
+    double qieChargeMax = fShape.linearization(32 * range + 31) + 0.5 * fShape.binSize(32 * range + 31);
+    if (range == 3 && qieCharge > qieChargeMax)
+      adc = 127;  // overflow
+    if (qieCharge > qieChargeMax)
+      continue;  // next range
+    for (int bin = 32 * range; bin < 32 * (range + 1); bin++) {
+      if (qieCharge < fShape.linearization(bin) + 0.5 * fShape.binSize(bin)) {
         adc = bin;
         break;
       }
     }
-    if (adc >= 0) break; // found
+    if (adc >= 0)
+      break;  // found
   }
-  if (adc < 0) adc = 0; // underflow
+  if (adc < 0)
+    adc = 0;  // underflow
 
-  //   std::cout << "CastorChannelCoder::adc-> " << fCharge << '/' << fCapId 
+  //   std::cout << "CastorChannelCoder::adc-> " << fCharge << '/' << fCapId
   //	    << " result: " << adc << std::endl;
   return adc;
 }
-
diff --git a/CalibFormats/CastorObjects/src/CastorCoderDB.cc b/CalibFormats/CastorObjects/src/CastorCoderDB.cc
index 6a96351f1ac13..ec345fc531ea2 100644
--- a/CalibFormats/CastorObjects/src/CastorCoderDB.cc
+++ b/CalibFormats/CastorObjects/src/CastorCoderDB.cc
@@ -8,30 +8,31 @@
 
 #include "CalibFormats/CastorObjects/interface/CastorCoderDb.h"
 
-CastorCoderDb::CastorCoderDb (const CastorQIECoder& fCoder, const CastorQIEShape& fShape)
-  : mCoder (&fCoder),
-    mShape (&fShape)
-{}
-
-template <class Digi> void CastorCoderDb::adc2fC_ (const Digi& df, CaloSamples& clf) const {
-  clf=CaloSamples(df.id(),df.size());
-  for (int i=0; i<df.size(); i++) {
-    clf[i]=mCoder->charge (*mShape, df[i].adc (), df[i].capid ());
+CastorCoderDb::CastorCoderDb(const CastorQIECoder& fCoder, const CastorQIEShape& fShape)
+    : mCoder(&fCoder), mShape(&fShape) {}
+
+template <class Digi>
+void CastorCoderDb::adc2fC_(const Digi& df, CaloSamples& clf) const {
+  clf = CaloSamples(df.id(), df.size());
+  for (int i = 0; i < df.size(); i++) {
+    clf[i] = mCoder->charge(*mShape, df[i].adc(), df[i].capid());
   }
   clf.setPresamples(df.presamples());
 }
 
-template <class Digi> void CastorCoderDb::fC2adc_ (const CaloSamples& clf, Digi& df, int fCapIdOffset) const {
-  df = Digi (clf.id ());
-  df.setSize (clf.size ());
-  df.setPresamples (clf.presamples ());
-  for (int i=0; i<clf.size(); i++) {
+template <class Digi>
+void CastorCoderDb::fC2adc_(const CaloSamples& clf, Digi& df, int fCapIdOffset) const {
+  df = Digi(clf.id());
+  df.setSize(clf.size());
+  df.setPresamples(clf.presamples());
+  for (int i = 0; i < clf.size(); i++) {
     int capId = (fCapIdOffset + i) % 4;
     df.setSample(i, HcalQIESample(mCoder->adc(*mShape, clf[i], capId), capId, 0, 0));
   }
 }
 
-void CastorCoderDb::adc2fC(const CastorDataFrame& df, CaloSamples& lf) const {adc2fC_ (df, lf);}
-
-void CastorCoderDb::fC2adc(const CaloSamples& clf, CastorDataFrame& df, int fCapIdOffset) const {fC2adc_ (clf, df, fCapIdOffset);}
+void CastorCoderDb::adc2fC(const CastorDataFrame& df, CaloSamples& lf) const { adc2fC_(df, lf); }
 
+void CastorCoderDb::fC2adc(const CaloSamples& clf, CastorDataFrame& df, int fCapIdOffset) const {
+  fC2adc_(clf, df, fCapIdOffset);
+}
diff --git a/CalibFormats/CastorObjects/src/CastorDbRecord.cc b/CalibFormats/CastorObjects/src/CastorDbRecord.cc
index 76e7184f33ffe..772b2f72f44b9 100644
--- a/CalibFormats/CastorObjects/src/CastorDbRecord.cc
+++ b/CalibFormats/CastorObjects/src/CastorDbRecord.cc
@@ -2,7 +2,7 @@
 //
 // Package:     CastorDbProducer
 // Class  :     CastorDbRecord
-// 
+//
 // Implementation:
 //     first version copy from HcalDbRecord
 //
diff --git a/CalibFormats/CastorObjects/src/CastorDbService.cc b/CalibFormats/CastorObjects/src/CastorDbService.cc
index 9cc9d8f25ff1c..9b75894dda2f8 100644
--- a/CalibFormats/CastorObjects/src/CastorDbService.cc
+++ b/CalibFormats/CastorObjects/src/CastorDbService.cc
@@ -13,43 +13,43 @@
 
 #include <cmath>
 
-CastorDbService::CastorDbService ()
-  : 
-  mPedestals (nullptr),
-  mPedestalWidths (nullptr),
-  mGains (nullptr),
-  mGainWidths (nullptr),
-  mQIEData(nullptr),
-  mChannelQuality(nullptr),
-  mElectronicsMap(nullptr)
- {}
-
-bool CastorDbService::makeCastorCalibration (const HcalGenericDetId& fId, CastorCalibrations* fObject, bool pedestalInADC) const {
+CastorDbService::CastorDbService()
+    : mPedestals(nullptr),
+      mPedestalWidths(nullptr),
+      mGains(nullptr),
+      mGainWidths(nullptr),
+      mQIEData(nullptr),
+      mChannelQuality(nullptr),
+      mElectronicsMap(nullptr) {}
+
+bool CastorDbService::makeCastorCalibration(const HcalGenericDetId& fId,
+                                            CastorCalibrations* fObject,
+                                            bool pedestalInADC) const {
   if (fObject) {
-    const CastorPedestal* pedestal = getPedestal (fId);
-    const CastorGain* gain = getGain (fId);
+    const CastorPedestal* pedestal = getPedestal(fId);
+    const CastorGain* gain = getGain(fId);
 
     if (pedestalInADC) {
-      const CastorQIEShape* shape=getCastorShape();
-      const CastorQIECoder* coder=getCastorCoder(fId);
-      if (pedestal && gain && shape && coder ) {
-	float pedTrue[4];
-	for (int i=0; i<4; i++) {
-	  float x=pedestal->getValues()[i];
-	  int x1=(int)std::floor(x);
-	  int x2=(int)std::floor(x+1);
-	  // y = (y2-y1)/(x2-x1) * (x - x1) + y1  [note: x2-x1=1]
-	  float y2=coder->charge(*shape,x2,i);
-	  float y1=coder->charge(*shape,x1,i);
-	  pedTrue[i]=(y2-y1)*(x-x1)+y1;
-	}
-	*fObject = CastorCalibrations (gain->getValues (), pedTrue );
-	return true; 
+      const CastorQIEShape* shape = getCastorShape();
+      const CastorQIECoder* coder = getCastorCoder(fId);
+      if (pedestal && gain && shape && coder) {
+        float pedTrue[4];
+        for (int i = 0; i < 4; i++) {
+          float x = pedestal->getValues()[i];
+          int x1 = (int)std::floor(x);
+          int x2 = (int)std::floor(x + 1);
+          // y = (y2-y1)/(x2-x1) * (x - x1) + y1  [note: x2-x1=1]
+          float y2 = coder->charge(*shape, x2, i);
+          float y1 = coder->charge(*shape, x1, i);
+          pedTrue[i] = (y2 - y1) * (x - x1) + y1;
+        }
+        *fObject = CastorCalibrations(gain->getValues(), pedTrue);
+        return true;
       }
     } else {
-      if (pedestal && gain ) {
-	*fObject = CastorCalibrations (gain->getValues (), pedestal->getValues () );
-	return true;
+      if (pedestal && gain) {
+        *fObject = CastorCalibrations(gain->getValues(), pedestal->getValues());
+        return true;
       }
     }
   }
@@ -58,8 +58,9 @@ bool CastorDbService::makeCastorCalibration (const HcalGenericDetId& fId, Castor
 
 void CastorDbService::buildCalibrations() {
   // we use the set of ids for pedestals as the master list
-  if ((!mPedestals) || (!mGains) || (!mQIEData) ) return;
-  std::vector<DetId> ids=mPedestals->getAllChannels();
+  if ((!mPedestals) || (!mGains) || (!mQIEData))
+    return;
+  std::vector<DetId> ids = mPedestals->getAllChannels();
   bool pedsInADC = mPedestals->isADC();
   // clear the calibrations set
   mCalibSet.clear();
@@ -67,11 +68,12 @@ void CastorDbService::buildCalibrations() {
   CastorCalibrations tool;
 
   //  std::cout << " length of id-vector: " << ids.size() << std::endl;
-  for (std::vector<DetId>::const_iterator id=ids.begin(); id!=ids.end(); ++id) {
+  for (std::vector<DetId>::const_iterator id = ids.begin(); id != ids.end(); ++id) {
     // make
-    bool ok=makeCastorCalibration(*id,&tool,pedsInADC);
+    bool ok = makeCastorCalibration(*id, &tool, pedsInADC);
     // store
-    if (ok) mCalibSet.setCalibrations(*id,tool);
+    if (ok)
+      mCalibSet.setCalibrations(*id, tool);
     //    std::cout << "Castor calibrations built... detid no. " << HcalGenericDetId(*id) << std::endl;
   }
   mCalibSet.sort();
@@ -79,9 +81,10 @@ void CastorDbService::buildCalibrations() {
 
 void CastorDbService::buildCalibWidths() {
   // we use the set of ids for pedestal widths as the master list
-  if ((!mPedestalWidths) || (!mGainWidths) || (!mQIEData) ) return;
+  if ((!mPedestalWidths) || (!mGainWidths) || (!mQIEData))
+    return;
 
-  std::vector<DetId> ids=mPedestalWidths->getAllChannels();
+  std::vector<DetId> ids = mPedestalWidths->getAllChannels();
   bool pedsInADC = mPedestalWidths->isADC();
   // clear the calibrations set
   mCalibWidthSet.clear();
@@ -89,99 +92,98 @@ void CastorDbService::buildCalibWidths() {
   CastorCalibrationWidths tool;
 
   //  std::cout << " length of id-vector: " << ids.size() << std::endl;
-  for (std::vector<DetId>::const_iterator id=ids.begin(); id!=ids.end(); ++id) {
+  for (std::vector<DetId>::const_iterator id = ids.begin(); id != ids.end(); ++id) {
     // make
-    bool ok=makeCastorCalibrationWidth(*id,&tool,pedsInADC);
+    bool ok = makeCastorCalibrationWidth(*id, &tool, pedsInADC);
     // store
-    if (ok) mCalibWidthSet.setCalibrationWidths(*id,tool);
+    if (ok)
+      mCalibWidthSet.setCalibrationWidths(*id, tool);
     //    std::cout << "Castor calibrations built... detid no. " << HcalGenericDetId(*id) << std::endl;
   }
   mCalibWidthSet.sort();
 }
 
-bool CastorDbService::makeCastorCalibrationWidth (const HcalGenericDetId& fId, 
-					      CastorCalibrationWidths* fObject, bool pedestalInADC) const {
+bool CastorDbService::makeCastorCalibrationWidth(const HcalGenericDetId& fId,
+                                                 CastorCalibrationWidths* fObject,
+                                                 bool pedestalInADC) const {
   if (fObject) {
-    const CastorPedestalWidth* pedestalwidth = getPedestalWidth (fId);
-    const CastorGainWidth* gainwidth = getGainWidth (fId);
+    const CastorPedestalWidth* pedestalwidth = getPedestalWidth(fId);
+    const CastorGainWidth* gainwidth = getGainWidth(fId);
     if (pedestalInADC) {
-      const CastorQIEShape* shape=getCastorShape();
-      const CastorQIECoder* coder=getCastorCoder(fId);
+      const CastorQIEShape* shape = getCastorShape();
+      const CastorQIECoder* coder = getCastorCoder(fId);
       if (pedestalwidth && gainwidth && shape && coder) {
-	float pedTrueWidth[4];
-	for (int i=0; i<4; i++) {
-	  float x=pedestalwidth->getWidth(i);
-	  // assume QIE is linear in low range and use x1=0 and x2=1
-	  // y = (y2-y1) * (x) [do not add any constant, only scale!]
-	  float y2=coder->charge(*shape,1,i);
-	  float y1=coder->charge(*shape,0,i);
-	  pedTrueWidth[i]=(y2-y1)*x;
-	}
-	*fObject = CastorCalibrationWidths (gainwidth->getValues (), pedTrueWidth);
-	return true; 
-      } 
+        float pedTrueWidth[4];
+        for (int i = 0; i < 4; i++) {
+          float x = pedestalwidth->getWidth(i);
+          // assume QIE is linear in low range and use x1=0 and x2=1
+          // y = (y2-y1) * (x) [do not add any constant, only scale!]
+          float y2 = coder->charge(*shape, 1, i);
+          float y1 = coder->charge(*shape, 0, i);
+          pedTrueWidth[i] = (y2 - y1) * x;
+        }
+        *fObject = CastorCalibrationWidths(gainwidth->getValues(), pedTrueWidth);
+        return true;
+      }
     } else {
       if (pedestalwidth && gainwidth) {
-	float pedestalWidth [4];
-	for (int i = 0; i < 4; i++) pedestalWidth [i] = pedestalwidth->getWidth (i);
-	*fObject = CastorCalibrationWidths (gainwidth->getValues (), pedestalWidth);
-	return true;
-      }      
+        float pedestalWidth[4];
+        for (int i = 0; i < 4; i++)
+          pedestalWidth[i] = pedestalwidth->getWidth(i);
+        *fObject = CastorCalibrationWidths(gainwidth->getValues(), pedestalWidth);
+        return true;
+      }
     }
   }
   return false;
-}  
-
+}
 
-const CastorPedestal* CastorDbService::getPedestal (const HcalGenericDetId& fId) const {
+const CastorPedestal* CastorDbService::getPedestal(const HcalGenericDetId& fId) const {
   if (mPedestals) {
-    return mPedestals->getValues (fId);
+    return mPedestals->getValues(fId);
   }
   return nullptr;
 }
 
-  const CastorPedestalWidth* CastorDbService::getPedestalWidth (const HcalGenericDetId& fId) const {
+const CastorPedestalWidth* CastorDbService::getPedestalWidth(const HcalGenericDetId& fId) const {
   if (mPedestalWidths) {
-    return mPedestalWidths->getValues (fId);
+    return mPedestalWidths->getValues(fId);
   }
   return nullptr;
 }
 
-const CastorGain* CastorDbService::getGain (const HcalGenericDetId& fId) const {
+const CastorGain* CastorDbService::getGain(const HcalGenericDetId& fId) const {
   if (mGains) {
     return mGains->getValues(fId);
   }
   return nullptr;
 }
 
-  const CastorGainWidth* CastorDbService::getGainWidth (const HcalGenericDetId& fId) const {
+const CastorGainWidth* CastorDbService::getGainWidth(const HcalGenericDetId& fId) const {
   if (mGainWidths) {
-    return mGainWidths->getValues (fId);
+    return mGainWidths->getValues(fId);
   }
   return nullptr;
 }
 
-const CastorQIECoder* CastorDbService::getCastorCoder (const HcalGenericDetId& fId) const {
+const CastorQIECoder* CastorDbService::getCastorCoder(const HcalGenericDetId& fId) const {
   if (mQIEData) {
-    return mQIEData->getCoder (fId);
+    return mQIEData->getCoder(fId);
   }
   return nullptr;
 }
 
-const CastorQIEShape* CastorDbService::getCastorShape () const {
+const CastorQIEShape* CastorDbService::getCastorShape() const {
   if (mQIEData) {
-    return &mQIEData->getShape ();
+    return &mQIEData->getShape();
   }
   return nullptr;
 }
 
-const CastorElectronicsMap* CastorDbService::getCastorMapping () const {
-  return mElectronicsMap;
-}
+const CastorElectronicsMap* CastorDbService::getCastorMapping() const { return mElectronicsMap; }
 
-const CastorChannelStatus* CastorDbService::getCastorChannelStatus (const HcalGenericDetId& fId) const
-{
-  return mChannelQuality->getValues (fId);
+const CastorChannelStatus* CastorDbService::getCastorChannelStatus(const HcalGenericDetId& fId) const {
+  return mChannelQuality->getValues(fId);
 }
 
 TYPELOOKUP_DATA_REG(CastorDbService);
diff --git a/CalibFormats/CastorObjects/src/CastorNominalCoder.cc b/CalibFormats/CastorObjects/src/CastorNominalCoder.cc
index 5b7bc2c7d5361..88cad31b503d6 100644
--- a/CalibFormats/CastorObjects/src/CastorNominalCoder.cc
+++ b/CalibFormats/CastorObjects/src/CastorNominalCoder.cc
@@ -1,32 +1,31 @@
 #include "CalibFormats/CastorObjects/interface/CastorNominalCoder.h"
 
 void CastorNominalCoder::adc2fC(const CastorDataFrame& df, CaloSamples& lf) const {
-  lf=CaloSamples(df.id(),df.size());
-  for (int i=0; i<df.size(); i++) lf[i]=df[i].nominal_fC();
+  lf = CaloSamples(df.id(), df.size());
+  for (int i = 0; i < df.size(); i++)
+    lf[i] = df[i].nominal_fC();
   lf.setPresamples(df.presamples());
 }
 
-
 namespace CastorNominalCoderTemplate {
   template <class Digi>
   void process(const CaloSamples& clf, Digi& df, int fCapIdOffset) {
-    df=Digi(clf.id());
+    df = Digi(clf.id());
     df.setSize(clf.size());
     df.setPresamples(clf.presamples());
-    for (int i=0; i<clf.size(); i++) {
+    for (int i = 0; i < clf.size(); i++) {
       int capId = (fCapIdOffset + i) % 4;
-      for (int q=1; q<128; q++) {
-	df.setSample(i,HcalQIESample(q,capId,0,0));
-	if (df[i].nominal_fC()>clf[i]) {
-	  df.setSample(i,HcalQIESample(q-1,capId,0,0));
-	  break;
-	}
+      for (int q = 1; q < 128; q++) {
+        df.setSample(i, HcalQIESample(q, capId, 0, 0));
+        if (df[i].nominal_fC() > clf[i]) {
+          df.setSample(i, HcalQIESample(q - 1, capId, 0, 0));
+          break;
+        }
       }
     }
   }
-}
+}  // namespace CastorNominalCoderTemplate
 
 void CastorNominalCoder::fC2adc(const CaloSamples& clf, CastorDataFrame& df, int fCapIdOffset) const {
-  CastorNominalCoderTemplate::process(clf,df, fCapIdOffset);
+  CastorNominalCoderTemplate::process(clf, df, fCapIdOffset);
 }
-
diff --git a/CalibFormats/CastorObjects/src/CastorTPGCoder.cc b/CalibFormats/CastorObjects/src/CastorTPGCoder.cc
index e3582d847b282..8e2fb5ef93878 100644
--- a/CalibFormats/CastorObjects/src/CastorTPGCoder.cc
+++ b/CalibFormats/CastorObjects/src/CastorTPGCoder.cc
@@ -2,6 +2,7 @@
 
 std::vector<unsigned short> CastorTPGCoder::getLinearizationLUT(HcalDetId id) const {
   std::vector<unsigned short> lut(128);
-  for (unsigned char i=0; i<128; ++i) lut[i]=adc2Linear(i,id);
+  for (unsigned char i = 0; i < 128; ++i)
+    lut[i] = adc2Linear(i, id);
   return lut;
 }
diff --git a/CalibFormats/CastorObjects/src/CastorTPGRecord.cc b/CalibFormats/CastorObjects/src/CastorTPGRecord.cc
index 5e6b044f0110d..d36117e72fef0 100644
--- a/CalibFormats/CastorObjects/src/CastorTPGRecord.cc
+++ b/CalibFormats/CastorObjects/src/CastorTPGRecord.cc
@@ -2,12 +2,11 @@
 //
 // Package:     CastorObjects
 // Class  :     CastorTPGRecord
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
-// Author: katsas     
-
+// Author: katsas
 
 #include "CalibFormats/CastorObjects/interface/CastorTPGRecord.h"
 #include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
diff --git a/CalibFormats/CastorObjects/src/CastorText2DetIdConverter.cc b/CalibFormats/CastorObjects/src/CastorText2DetIdConverter.cc
index b746db45b9368..3a18bedd5523f 100644
--- a/CalibFormats/CastorObjects/src/CastorText2DetIdConverter.cc
+++ b/CalibFormats/CastorObjects/src/CastorText2DetIdConverter.cc
@@ -14,74 +14,81 @@
 #include "CalibFormats/CastorObjects/interface/CastorText2DetIdConverter.h"
 
 namespace {
-  std::string strip (const std::string& fString) {
-    if (fString.empty ()) return fString;
+  std::string strip(const std::string& fString) {
+    if (fString.empty())
+      return fString;
     int startIndex = fString.find_first_not_of(" \t\n");
     int endIndex = fString.find_last_not_of(" \t\n");
-    return fString.substr(startIndex, (endIndex-startIndex)+1);
+    return fString.substr(startIndex, (endIndex - startIndex) + 1);
   }
-}
-
-CastorText2DetIdConverter::CastorText2DetIdConverter (const std::string& fFlavor, const std::string& fField1,
-						  const std::string& fField2, const std::string& fField3) {
-  if (!init (fFlavor, fField1, fField2, fField3)) {
-    std::cerr << "CastorText2DetIdConverter::CastorText2DetIdConverter-> Can not initiate detId from items: "
-	      << fFlavor << '/' << fField1 << '/' << fField2 << '/' << fField3 << std::endl;
-    throw cms::Exception("HcalGenDetId initialization error") 
-      << " Can not initiate detId from items: "
-      << fFlavor << '/' << fField1 << '/' << fField2 << '/' << fField3 << std::endl;
+}  // namespace
+
+CastorText2DetIdConverter::CastorText2DetIdConverter(const std::string& fFlavor,
+                                                     const std::string& fField1,
+                                                     const std::string& fField2,
+                                                     const std::string& fField3) {
+  if (!init(fFlavor, fField1, fField2, fField3)) {
+    std::cerr << "CastorText2DetIdConverter::CastorText2DetIdConverter-> Can not initiate detId from items: " << fFlavor
+              << '/' << fField1 << '/' << fField2 << '/' << fField3 << std::endl;
+    throw cms::Exception("HcalGenDetId initialization error")
+        << " Can not initiate detId from items: " << fFlavor << '/' << fField1 << '/' << fField2 << '/' << fField3
+        << std::endl;
   }
 }
 
-CastorText2DetIdConverter::CastorText2DetIdConverter (DetId fId) {
-  init (fId);
-}
+CastorText2DetIdConverter::CastorText2DetIdConverter(DetId fId) { init(fId); }
 
-bool CastorText2DetIdConverter::isHcalCastorDetId () const {
-  return HcalGenericDetId (mId).isHcalCastorDetId ();
-}
+bool CastorText2DetIdConverter::isHcalCastorDetId() const { return HcalGenericDetId(mId).isHcalCastorDetId(); }
 
-bool CastorText2DetIdConverter::init (DetId fId) {
+bool CastorText2DetIdConverter::init(DetId fId) {
   bool result = true;
   flavorName = "UNKNOWN";
   mId = fId;
-  HcalGenericDetId genId (mId);
+  HcalGenericDetId genId(mId);
   if (fId == HcalDetId::Undefined) {
     flavorName = "NA";
   }
 
-  else if (genId.isHcalCastorDetId ()) {
-    HcalCastorDetId castorId (mId);
+  else if (genId.isHcalCastorDetId()) {
+    HcalCastorDetId castorId(mId);
     switch (castorId.section()) {
-    case HcalCastorDetId::EM: flavorName = "CASTOR_EM"; break;
-    case HcalCastorDetId::HAD: flavorName = "CASTOR_HAD"; break;
-    default: result = false;
+      case HcalCastorDetId::EM:
+        flavorName = "CASTOR_EM";
+        break;
+      case HcalCastorDetId::HAD:
+        flavorName = "CASTOR_HAD";
+        break;
+      default:
+        result = false;
     }
-    setField (1, castorId.zside());
-    setField (2, castorId.sector());
-    setField (3, castorId.module());
+    setField(1, castorId.zside());
+    setField(2, castorId.sector());
+    setField(3, castorId.module());
   }
 
   else {
     flavorName = "UNKNOWN_FLAVOR";
-    std::cerr << "CastorText2DetIdConverter::init-> Unknown detId: " << std::hex << std::showbase << mId.rawId() << std::endl;
+    std::cerr << "CastorText2DetIdConverter::init-> Unknown detId: " << std::hex << std::showbase << mId.rawId()
+              << std::endl;
     result = false;
   }
   return result;
 }
 
-
-bool CastorText2DetIdConverter::init (const std::string& fFlavor, const std::string& fField1,
-				   const std::string& fField2, const std::string& fField3) {
+bool CastorText2DetIdConverter::init(const std::string& fFlavor,
+                                     const std::string& fField1,
+                                     const std::string& fField2,
+                                     const std::string& fField3) {
   bool result = true;
-  flavorName = strip (fFlavor);
-  field1 = strip (fField1);
-  field2 = strip (fField2);
-  field3 = strip (fField3);
-  if (flavorName.find ("CASTOR_") == 0) {
-    HcalCastorDetId::Section section = flavorName == "CASTOR_EM" ? HcalCastorDetId::EM :
-      flavorName == "CASTOR_HAD" ? HcalCastorDetId::HAD : HcalCastorDetId::Unknown;
-    mId = HcalCastorDetId (section, getField (1)>0, getField (2), getField(3));
+  flavorName = strip(fFlavor);
+  field1 = strip(fField1);
+  field2 = strip(fField2);
+  field3 = strip(fField3);
+  if (flavorName.find("CASTOR_") == 0) {
+    HcalCastorDetId::Section section =
+        flavorName == "CASTOR_EM" ? HcalCastorDetId::EM
+                                  : flavorName == "CASTOR_HAD" ? HcalCastorDetId::HAD : HcalCastorDetId::Unknown;
+    mId = HcalCastorDetId(section, getField(1) > 0, getField(2), getField(3));
   }
 
   else {
@@ -91,29 +98,31 @@ bool CastorText2DetIdConverter::init (const std::string& fFlavor, const std::str
   return result;
 }
 
-
-int CastorText2DetIdConverter::getField (int i) const{
+int CastorText2DetIdConverter::getField(int i) const {
   char* endptr;
-  const char* nptr = i == 1 ? field1.c_str() :
-    i == 2 ? field2.c_str() : field3.c_str();
-  long result = strtol (nptr, &endptr, 0);
-    if (*nptr != '\0' && *endptr == '\0') {
-      return result;
-    }
-    if (*nptr != '\0') {
-      std::cerr << "CastorText2DetIdConverter::getField-> Can not convert string "<< nptr << " to int. Bad symbol: " << *endptr << std::endl;
-    }
-    return 0;
+  const char* nptr = i == 1 ? field1.c_str() : i == 2 ? field2.c_str() : field3.c_str();
+  long result = strtol(nptr, &endptr, 0);
+  if (*nptr != '\0' && *endptr == '\0') {
+    return result;
+  }
+  if (*nptr != '\0') {
+    std::cerr << "CastorText2DetIdConverter::getField-> Can not convert string " << nptr
+              << " to int. Bad symbol: " << *endptr << std::endl;
+  }
+  return 0;
 }
 
-void CastorText2DetIdConverter::setField (int i, int fValue) {
-  char buffer [128];
-  sprintf (buffer, "%d", fValue);
-  if (i == 1) field1 = buffer;
-  else if (i == 2) field2 = buffer;
-  else  field3 = buffer;
+void CastorText2DetIdConverter::setField(int i, int fValue) {
+  char buffer[128];
+  sprintf(buffer, "%d", fValue);
+  if (i == 1)
+    field1 = buffer;
+  else if (i == 2)
+    field2 = buffer;
+  else
+    field3 = buffer;
 }
 
-std::string CastorText2DetIdConverter::toString () const {
+std::string CastorText2DetIdConverter::toString() const {
   return flavorName + " " + field1 + " " + field2 + " " + field3;
 }
diff --git a/CalibFormats/CastorObjects/src/QieShape.cc b/CalibFormats/CastorObjects/src/QieShape.cc
index 39f0452956ef2..c323ac08276be 100644
--- a/CalibFormats/CastorObjects/src/QieShape.cc
+++ b/CalibFormats/CastorObjects/src/QieShape.cc
@@ -9,26 +9,27 @@
 #include "CalibFormats/CastorObjects/interface/QieShape.h"
 
 namespace reco {
-namespace castor {
+  namespace castor {
 
-QieShape::QieShape (const double fAdcShape [32], const double fAdcBin [32]) {
-  for (int i = 0; i < 32; i++) {  // initial settings
-    mLinearization [i] = fAdcShape [i];
-    mBinSize [i] = fAdcBin [i];
-    //    std::cout << "QieShape::QieShape-> #/adc/bin: " << i << '/' << fAdcShape [i] << '/' << fAdcBin [i] << std::endl;
-  }
-  double factor = 1;
-  for (int range = 1; range < 4; range++) {
-    factor = factor * 5;
-    int offset = 32 * range;
-    mLinearization [offset] = mLinearization[offset-2]; // initial overlap
-    for (int bin = 1; bin < 32; bin++) {
-      mLinearization [offset+bin] = mLinearization [offset+bin-1] +
-        factor * (mLinearization [bin] - mLinearization [bin-1]); // scale initial curve
-      mBinSize [offset+bin] = factor * mBinSize [bin];
+    QieShape::QieShape(const double fAdcShape[32], const double fAdcBin[32]) {
+      for (int i = 0; i < 32; i++) {  // initial settings
+        mLinearization[i] = fAdcShape[i];
+        mBinSize[i] = fAdcBin[i];
+        //    std::cout << "QieShape::QieShape-> #/adc/bin: " << i << '/' << fAdcShape [i] << '/' << fAdcBin [i] << std::endl;
+      }
+      double factor = 1;
+      for (int range = 1; range < 4; range++) {
+        factor = factor * 5;
+        int offset = 32 * range;
+        mLinearization[offset] = mLinearization[offset - 2];  // initial overlap
+        for (int bin = 1; bin < 32; bin++) {
+          mLinearization[offset + bin] =
+              mLinearization[offset + bin - 1] +
+              factor * (mLinearization[bin] - mLinearization[bin - 1]);  // scale initial curve
+          mBinSize[offset + bin] = factor * mBinSize[bin];
+        }
+      }
     }
-  }
-}
 
-}
-}
+  }  // namespace castor
+}  // namespace reco
diff --git a/CalibFormats/HcalObjects/interface/HcalCoderDb.h b/CalibFormats/HcalObjects/interface/HcalCoderDb.h
index a7b5d6ba06c94..32f68caae58f3 100644
--- a/CalibFormats/HcalObjects/interface/HcalCoderDb.h
+++ b/CalibFormats/HcalObjects/interface/HcalCoderDb.h
@@ -4,7 +4,7 @@
 #include "CalibFormats/HcalObjects/interface/HcalCoder.h"
 
 /** \class HcalCoderDb
-    
+
     coder which uses DB services to convert to fC
     $Author: ratnikov
 */
diff --git a/CalibFormats/HcalObjects/src/HcalCoderDb.cc b/CalibFormats/HcalObjects/src/HcalCoderDb.cc
index 5544c423cb9a5..9829d1497da48 100644
--- a/CalibFormats/HcalObjects/src/HcalCoderDb.cc
+++ b/CalibFormats/HcalObjects/src/HcalCoderDb.cc
@@ -1,5 +1,5 @@
 /** \class HcalCoderDB
-    
+
     coder which uses DB services to convert to fC
     $Author: ratnikov
 */
diff --git a/CalibFormats/SiPixelObjects/interface/PixelMaskCommon.h b/CalibFormats/SiPixelObjects/interface/PixelMaskCommon.h
deleted file mode 100644
index 9e39c0bd830aa..0000000000000
--- a/CalibFormats/SiPixelObjects/interface/PixelMaskCommon.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef PixelMaskCommon_h
-#define PixelMaskCommon_h
-/**
-* \file CalibFormats/SiPixelObjects/interface/PixelMaskCommon.h
-* \brief  This class provide an implementation for
-*         pixel mask data where each pixel have the 
-*         same mask.
-*
-*   A longer explanation will be placed here later
-*
-*/
-
-#include "CalibFormats/SiPixelObjects/interface/PixelMaskBase.h"
-#include "CalibFormats/SiPixelObjects/interface/PixelROCName.h"
-
-namespace pos{
-/*! \class PixelMaskAllPixels PixelMaskAllPixels.h "interface/PixelMaskAllPixels.h"
-*   \brief This class implements..
-*
-*   A longer explanation will be placed here later
-*/
-  class PixelMaskAllPixels: public PixelMaskBase {
-
-  public:
-
-    PixelMaskCommon(std::string filename);
-
-    void writeBinary(std::string filename) const;
-
-    void writeASCII(std::string filename) const;
-    void 	 writeXML(      pos::PixelConfigKey key, int version, std::string path)                     const {;}
-    virtual void writeXMLHeader(pos::PixelConfigKey key, int version, std::string path, std::ofstream *out) const {;}
-    virtual void writeXML(                                                              std::ofstream *out) const {;}
-    virtual void writeXMLTrailer(                                                       std::ofstream *out) const {;}
-
-  private:
-
-    std::vector<PixeROCName> rocname_;  
-    std::vector<bool> maskbits_;  
- 
-  };
-}
-#endif
diff --git a/CalibFormats/SiPixelObjects/src/PixelFEDCard.cc b/CalibFormats/SiPixelObjects/src/PixelFEDCard.cc
index 40b6be5bd9bbc..46dc7bb6805ce 100644
--- a/CalibFormats/SiPixelObjects/src/PixelFEDCard.cc
+++ b/CalibFormats/SiPixelObjects/src/PixelFEDCard.cc
@@ -421,23 +421,23 @@ void PixelFEDCard::readDBTBMLevels(std::vector<std::vector<std::string> > &table
      KEY_ALIAS  			       NOT NULL VARCHAR2(80)
      VERSION						VARCHAR2(40)
      KIND_OF_COND			       NOT NULL VARCHAR2(40)
-     TBM_NAME						VARCHAR2(200)
-     PIXEL_FED  					NUMBER(38)
-     FED_CHAN						NUMBER(38)
-     TBMA_HEAD_L0					NUMBER(38)    TBM_L0[1-36] index taken from FED_CHAN 
-     TBMA_HEAD_L1					NUMBER(38)    TBM_L1[1-36] index taken from FED_CHAN 
-     TBMA_HEAD_L2					NUMBER(38)    TBM_L2[1-36] index taken from FED_CHAN 
-     TBMA_HEAD_L3					NUMBER(38)    TBM_L3[1-36] index taken from FED_CHAN 
-     TBMA_HEAD_L4					NUMBER(38)    TBM_L4[1-36] index taken from FED_CHAN 
-     TBMA_TRAIL_L0					NUMBER(38)    TRL_L0[1-36] index taken from FED_CHAN 
-     TBMA_TRAIL_L1					NUMBER(38)    TRL_L1[1-36] index taken from FED_CHAN 
-     TBMA_TRAIL_L2					NUMBER(38)    TRL_L2[1-36] index taken from FED_CHAN 
-     TBMA_TRAIL_L3					NUMBER(38)    TRL_L3[1-36] index taken from FED_CHAN 
-     TBMA_TRAIL_L4					NUMBER(38)    TRL_L4[1-36] index taken from FED_CHAN
-     TBMA_HEAD_B					NUMBER(38)
-     TBMA_HEAD_UB					NUMBER(38)
-     TBMA_TRAIL_B					NUMBER(38)
-     TBMA_TRAIL_UB					NUMBER(38)
+     TBM_NAME                                           VARCHAR2(200)
+     PIXEL_FED                                          NUMBER(38)
+     FED_CHAN                                           NUMBER(38)
+     TBMA_HEAD_L0                                       NUMBER(38)    TBM_L0[1-36] index taken from FED_CHAN
+     TBMA_HEAD_L1                                       NUMBER(38)    TBM_L1[1-36] index taken from FED_CHAN
+     TBMA_HEAD_L2                                       NUMBER(38)    TBM_L2[1-36] index taken from FED_CHAN
+     TBMA_HEAD_L3                                       NUMBER(38)    TBM_L3[1-36] index taken from FED_CHAN
+     TBMA_HEAD_L4                                       NUMBER(38)    TBM_L4[1-36] index taken from FED_CHAN
+     TBMA_TRAIL_L0                                      NUMBER(38)    TRL_L0[1-36] index taken from FED_CHAN
+     TBMA_TRAIL_L1                                      NUMBER(38)    TRL_L1[1-36] index taken from FED_CHAN
+     TBMA_TRAIL_L2                                      NUMBER(38)    TRL_L2[1-36] index taken from FED_CHAN
+     TBMA_TRAIL_L3                                      NUMBER(38)    TRL_L3[1-36] index taken from FED_CHAN
+     TBMA_TRAIL_L4                                      NUMBER(38)    TRL_L4[1-36] index taken from FED_CHAN
+     TBMA_HEAD_B                                        NUMBER(38)
+     TBMA_HEAD_UB                                       NUMBER(38)
+     TBMA_TRAIL_B                                       NUMBER(38)
+     TBMA_TRAIL_UB                                      NUMBER(38)
 
   */
   
@@ -1238,7 +1238,7 @@ void PixelFEDCard::writeASCII(std::string dir) const{
   s1<<fedNumber;
   std::string fedNum=s1.str();
 
-  if (dir!="") dir+="/";
+  if (!dir.empty()) dir+="/";
 
   std::string filename=dir+"params_fed_"+fedNum+".dat";
 
diff --git a/CalibFormats/SiStripObjects/interface/NumberOfDevices.h b/CalibFormats/SiStripObjects/interface/NumberOfDevices.h
index c522ef4cef033..d0e78185ce9ab 100644
--- a/CalibFormats/SiStripObjects/interface/NumberOfDevices.h
+++ b/CalibFormats/SiStripObjects/interface/NumberOfDevices.h
@@ -6,34 +6,31 @@
 #include <ostream>
 #include <sstream>
 
-/** 
+/**
     @class NumberOfDevices
     @author R.Bainbridge
     @brief Simple container class for counting devices.
 */
 class NumberOfDevices {
-  
- public:
-  
+public:
   NumberOfDevices() { clear(); }
-  
+
   void clear();
-  void print( std::stringstream& ) const;
-  
- public: // ----- Public member data -----
-  
-  uint32_t nFecCrates_, nFecSlots_, nFecRings_;      // FECs and rings
-  uint32_t nCcuAddrs_, nCcuChans_, nApvs_, nDcuIds_; // CCUs and modules
-  uint32_t nApvPairs0_, nApvPairsX_;                 // Number of APVs per module (0,unknown)
-  uint32_t nApvPairs1_, nApvPairs2_, nApvPairs3_;    // Number of APVs per module (1->3)
-  uint32_t nDetIds_, nApvPairs_;                     // Geometry
-  uint32_t nFedCrates_, nFedSlots_;                  // FED
-  uint32_t nFedIds_, nFedChans_;                     // FED
-  uint32_t nDcus_, nMuxes_, nPlls_, nLlds_;          // Ancilliary devices
+  void print(std::stringstream &) const;
 
-}; 
+public:                                               // ----- Public member data -----
+  uint32_t nFecCrates_, nFecSlots_, nFecRings_;       // FECs and rings
+  uint32_t nCcuAddrs_, nCcuChans_, nApvs_, nDcuIds_;  // CCUs and modules
+  uint32_t nApvPairs0_, nApvPairsX_;                  // Number of APVs per module (0,unknown)
+  uint32_t nApvPairs1_, nApvPairs2_,
+      nApvPairs3_;                           // Number of APVs per module (1->3)
+  uint32_t nDetIds_, nApvPairs_;             // Geometry
+  uint32_t nFedCrates_, nFedSlots_;          // FED
+  uint32_t nFedIds_, nFedChans_;             // FED
+  uint32_t nDcus_, nMuxes_, nPlls_, nLlds_;  // Ancilliary devices
+};
 
 /** Debug info for NumberOfDevices class. */
-std::ostream& operator<< ( std::ostream&, const NumberOfDevices& );
+std::ostream &operator<<(std::ostream &, const NumberOfDevices &);
 
-#endif // CalibTracker_SiStripObjects_NumberOfDevices_H
+#endif  // CalibTracker_SiStripObjects_NumberOfDevices_H
diff --git a/CalibFormats/SiStripObjects/interface/SiStripCcu.h b/CalibFormats/SiStripObjects/interface/SiStripCcu.h
index b8e9a5c5fa303..78e5234813a70 100644
--- a/CalibFormats/SiStripObjects/interface/SiStripCcu.h
+++ b/CalibFormats/SiStripObjects/interface/SiStripCcu.h
@@ -7,49 +7,43 @@
 #include <boost/cstdint.hpp>
 #include <vector>
 
-/** 
+/**
     \class SiStripCcu
     \author R.Bainbridge
 */
 class SiStripCcu {
-  
- public: 
-  
+public:
   /** */
-  SiStripCcu( const FedChannelConnection& conn );
-  
+  SiStripCcu(const FedChannelConnection &conn);
+
+  /** */
+  ~SiStripCcu() { ; }
+
   /** */
-  ~SiStripCcu() {;}
- 
-   /** */
-  inline const std::vector<SiStripModule>& modules() const;
-  inline std::vector<SiStripModule>& modules();
+  inline const std::vector<SiStripModule> &modules() const;
+  inline std::vector<SiStripModule> &modules();
 
   /** */
-  inline const uint16_t& ccuAddr() const;
+  inline const uint16_t &ccuAddr() const;
 
   /** */
-  void addDevices( const FedChannelConnection& conn );
-  
- private:
+  void addDevices(const FedChannelConnection &conn);
 
+private:
   /** */
-  SiStripCcu() {;}
+  SiStripCcu() { ; }
 
   /** */
   uint16_t ccuAddr_;
 
   /** */
   std::vector<SiStripModule> modules_;
-
 };
 
 // ---------- inline methods ----------
 
-const std::vector<SiStripModule>& SiStripCcu::modules() const { return modules_; }
-std::vector<SiStripModule>& SiStripCcu::modules() { return modules_; }
-const uint16_t& SiStripCcu::ccuAddr() const { return ccuAddr_; }
-
-#endif // CalibTracker_SiStripObjects_SiStripCcu_H
-
+const std::vector<SiStripModule> &SiStripCcu::modules() const { return modules_; }
+std::vector<SiStripModule> &SiStripCcu::modules() { return modules_; }
+const uint16_t &SiStripCcu::ccuAddr() const { return ccuAddr_; }
 
+#endif  // CalibTracker_SiStripObjects_SiStripCcu_H
diff --git a/CalibFormats/SiStripObjects/interface/SiStripDelay.h b/CalibFormats/SiStripObjects/interface/SiStripDelay.h
index 72f98952aa6a0..832af74297fb5 100644
--- a/CalibFormats/SiStripObjects/interface/SiStripDelay.h
+++ b/CalibFormats/SiStripObjects/interface/SiStripDelay.h
@@ -4,48 +4,49 @@
 //
 // Package:     SiStripObjects
 // Class  :     SiStripDelay
-// 
+//
 /**
  * Author: M. De Mattia (demattia@pd.infn.it) 25/10/2010:
  *
- * Dependent record used to combine the SiStripBaseDelays and provide the reconstruction
- * with a single delay value. <br>
- * When the object is built the list of values is stored in boost::unordered_map which,
- * for the number of modules in the Tracker (~15000) resulted much faster (more than a factor 2)
+ * Dependent record used to combine the SiStripBaseDelays and provide the
+ * reconstruction with a single delay value. <br> When the object is built the
+ * list of values is stored in boost::unordered_map which, for the number of
+ * modules in the Tracker (~15000) resulted much faster (more than a factor 2)
  * than a std::map or a lower_bound search in a sorted vector. <br>
- * The base delays must be filled in together with the sign they will get in the summation:
- * baseDelay1*sign1 + baseDelay2*sign2 + ... <br>
- * Pointers to the baseDelays are stored and after the fill is complete the method "makeDelay"
+ * The base delays must be filled in together with the sign they will get in the
+ * summation: baseDelay1*sign1 + baseDelay2*sign2 + ... <br> Pointers to the
+ * baseDelays are stored and after the fill is complete the method "makeDelay"
  * must be called to build the internal map. <br>
- * This additional step is required such that we don't build the map anytime a new baseDelay is inserted
- * and we don't make checks anytime the getDelay method is called. <br>
- * NOTE: Even if the code does not rely on the presence of the same detIds in all the baseDelays, this
- * condition should be fullfilled for consistency. The code checks only that the number of detIds
- * is the same in all baseDelays.
+ * This additional step is required such that we don't build the map anytime a
+ * new baseDelay is inserted and we don't make checks anytime the getDelay
+ * method is called. <br> NOTE: Even if the code does not rely on the presence
+ * of the same detIds in all the baseDelays, this condition should be fullfilled
+ * for consistency. The code checks only that the number of detIds is the same
+ * in all baseDelays.
  */
 
 #include "CondFormats/SiStripObjects/interface/SiStripBaseDelay.h"
-#include <vector>
-#include <memory>
 #include <boost/unordered_map.hpp>
+#include <memory>
+#include <vector>
 
-class SiStripDelay
-{
- public:
-  SiStripDelay() {};
-  virtual ~SiStripDelay() {};
+class SiStripDelay {
+public:
+  SiStripDelay(){};
+  virtual ~SiStripDelay(){};
 
-  SiStripDelay(const SiStripDelay&) = delete;
-  const SiStripDelay& operator=(const SiStripDelay&) = delete;
+  SiStripDelay(const SiStripDelay &) = delete;
+  const SiStripDelay &operator=(const SiStripDelay &) = delete;
 
-  inline SiStripDelay(const SiStripBaseDelay& baseDelay, const int sumSign,
-		      const std::pair<std::string, std::string> & recordLabelPair)
-  {
+  inline SiStripDelay(const SiStripBaseDelay &baseDelay,
+                      const int sumSign,
+                      const std::pair<std::string, std::string> &recordLabelPair) {
     fillNewDelay(baseDelay, sumSign, recordLabelPair);
   }
 
-  void fillNewDelay(const SiStripBaseDelay& baseDelay, const int sumSign,
-		    const std::pair<std::string, std::string> & recordLabelPair);
+  void fillNewDelay(const SiStripBaseDelay &baseDelay,
+                    const int sumSign,
+                    const std::pair<std::string, std::string> &recordLabelPair);
 
   /// Return the delay combining all the baseDelays
   float getDelay(const uint32_t detId) const;
@@ -55,46 +56,32 @@ class SiStripDelay
 
   /// Empty all the containers
   void clear();
-  
+
   /**
-   * The second parameter allows to specify which delay to retrieve, considering that
-   * they are in input order.
-   * NOTE that no protection is inside the method (because we want to keep it very light)
-   * therefore it is the caller duty to check that the index is in the correct range.
+   * The second parameter allows to specify which delay to retrieve, considering
+   * that they are in input order. NOTE that no protection is inside the method
+   * (because we want to keep it very light) therefore it is the caller duty to
+   * check that the index is in the correct range.
    */
-  inline const SiStripBaseDelay * getBaseDelay(const uint32_t index) const
-  {
-    return baseDelayVector_[index];
-  }
+  inline const SiStripBaseDelay *getBaseDelay(const uint32_t index) const { return baseDelayVector_[index]; }
 
-  inline size_t getNumberOfTags() const
-  {
-    return baseDelayVector_.size();
-  }
-  inline std::string getRcdName(const uint32_t index) const
-  {
-    return recordLabelPair_[index].first;
-  }
-  inline std::string getLabelName(const uint32_t index) const
-  {
-    return recordLabelPair_[index].second;
-  }
-  inline int getTagSign(const uint32_t index) const
-  {
-    return sumSignVector_[index];
-  }
+  inline size_t getNumberOfTags() const { return baseDelayVector_.size(); }
+  inline std::string getRcdName(const uint32_t index) const { return recordLabelPair_[index].first; }
+  inline std::string getLabelName(const uint32_t index) const { return recordLabelPair_[index].second; }
+  inline int getTagSign(const uint32_t index) const { return sumSignVector_[index]; }
 
-  /// Prints the average value of the delays for all layers and wheels in the SiStripTracker
-  void printSummary(std::stringstream& ss, const TrackerTopology* trackerTopo) const;
+  /// Prints the average value of the delays for all layers and wheels in the
+  /// SiStripTracker
+  void printSummary(std::stringstream &ss, const TrackerTopology *trackerTopo) const;
   /// Prints the delays for all the detIds
-  void printDebug(std::stringstream& ss, const TrackerTopology* tTopo) const;
+  void printDebug(std::stringstream &ss, const TrackerTopology *tTopo) const;
 
- private:
+private:
   // ---------- member data --------------------------------
 
   std::vector<const SiStripBaseDelay *> baseDelayVector_;
   std::vector<int> sumSignVector_;
-  std::vector<std::pair<std::string, std::string> > recordLabelPair_;
+  std::vector<std::pair<std::string, std::string>> recordLabelPair_;
   boost::unordered_map<uint32_t, double> delays_;
 };
 
diff --git a/CalibFormats/SiStripObjects/interface/SiStripDetCabling.h b/CalibFormats/SiStripObjects/interface/SiStripDetCabling.h
index ee2a09b158ad3..d4732873e7820 100644
--- a/CalibFormats/SiStripObjects/interface/SiStripDetCabling.h
+++ b/CalibFormats/SiStripObjects/interface/SiStripDetCabling.h
@@ -4,89 +4,114 @@
 //
 // Package:     CalibFormats/SiStripObjects
 // Class  :     SiStripDetCabling
-/**\class SiStripDetCabling SiStripDetCabling.h CalibFormats/SiStripObjects/interface/SiStripDetCabling.h
+/**\class SiStripDetCabling SiStripDetCabling.h
+ CalibFormats/SiStripObjects/interface/SiStripDetCabling.h
 
  Description: give detector view of the cabling of the silicon strip tracker
 */
 // Original Author:  dkcira
 //         Created:  Wed Mar 22 12:24:20 CET 2006
-#include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h"
 #include "CondFormats/SiStripObjects/interface/FedChannelConnection.h"
+#include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h"
 #include <boost/cstdint.hpp>
-#include <vector>
-#include <string>
 #include <map>
+#include <string>
+#include <vector>
 class TrackerTopology;
-class SiStripDetCabling
-{
- public:
-  SiStripDetCabling(const TrackerTopology* const topology);
+class SiStripDetCabling {
+public:
+  SiStripDetCabling(const TrackerTopology *const topology);
   virtual ~SiStripDetCabling();
-  SiStripDetCabling(const SiStripFedCabling &,const TrackerTopology* const topology);
+  SiStripDetCabling(const SiStripFedCabling &, const TrackerTopology *const topology);
 
-  SiStripDetCabling(const SiStripDetCabling&) = delete;
-  const SiStripDetCabling& operator=(const SiStripDetCabling&) = delete;
+  SiStripDetCabling(const SiStripDetCabling &) = delete;
+  const SiStripDetCabling &operator=(const SiStripDetCabling &) = delete;
 
-  void addDevices(const FedChannelConnection &, std::map< uint32_t, std::vector<const FedChannelConnection *> >&);
-  void addDevices(const FedChannelConnection &); // special case of above addDevices
+  void addDevices(const FedChannelConnection &, std::map<uint32_t, std::vector<const FedChannelConnection *>> &);
+  void addDevices(const FedChannelConnection &);  // special case of above addDevices
   // getters
-  inline const  std::map< uint32_t, std::vector<const FedChannelConnection *> >& getDetCabling() const { return fullcabling_; }
+  inline const std::map<uint32_t, std::vector<const FedChannelConnection *>> &getDetCabling() const {
+    return fullcabling_;
+  }
   // for DQM use: all detectors that have at least one connected APV
-  void  addActiveDetectorsRawIds(std::vector<uint32_t> &) const;                    // add to vector Ids of connected modules (active == connected)
-  void  addAllDetectorsRawIds(std::vector<uint32_t> & vector_to_fill_with_detids ) const; // add to vector Ids of all modules
-  void  getAllDetectorsContiguousIds(std::map<uint32_t, unsigned int>&) const;    // map of all connected, detected, undetected to contiguous Ids - map is reset first!
-  void  getActiveDetectorsContiguousIds(std::map<uint32_t, unsigned int>&) const; // map of all connected to contiguous Ids - map is reset first!
+  void addActiveDetectorsRawIds(
+      std::vector<uint32_t> &) const;  // add to vector Ids of connected modules (active == connected)
+  void addAllDetectorsRawIds(
+      std::vector<uint32_t> &vector_to_fill_with_detids) const;  // add to vector Ids of all modules
+  void getAllDetectorsContiguousIds(
+      std::map<uint32_t, unsigned int> &) const;  // map of all connected, detected, undetected to contiguous Ids -
+                                                  // map is reset first!
+  void getActiveDetectorsContiguousIds(
+      std::map<uint32_t, unsigned int> &) const;  // map of all connected to contiguous Ids - map is reset first!
   // for RECO use
-  void  addConnected ( std::map<uint32_t, std::vector<int> > &) const; // map of detector to list of APVs for APVs seen from FECs and FEDs
-  void  addDetected  ( std::map<uint32_t, std::vector<int> > &) const; // map of detector to list of APVs for APVs seen from FECs but not from FEDs
-  void  addUnDetected( std::map<uint32_t, std::vector<int> > &) const; // map of detector to list of APVs for APVs seen neither from FECS or FEDs
-  void  addNotConnectedAPVs( std::map<uint32_t, std::vector<int> > &) const; // map of detector to list of APVs that are not connected - combination of addDetected and addUnDetected
+  void addConnected(std::map<uint32_t, std::vector<int>> &)
+      const;  // map of detector to list of APVs for APVs seen from FECs and FEDs
+  void addDetected(
+      std::map<uint32_t, std::vector<int>> &) const;  // map of detector to list of APVs for APVs seen from FECs but not
+                                                      // from FEDs
+  void addUnDetected(
+      std::map<uint32_t, std::vector<int>> &) const;  // map of detector to list of APVs for APVs seen neither from FECS
+                                                      // or FEDs
+  void addNotConnectedAPVs(
+      std::map<uint32_t, std::vector<int>> &) const;  // map of detector to list of APVs that are not connected -
+                                                      // combination of addDetected and addUnDetected
   // other
-  const std::vector<const FedChannelConnection *>& getConnections( uint32_t det_id ) const;
-  const FedChannelConnection& getConnection( uint32_t det_id, unsigned short apv_pair ) const;
-  const unsigned int getDcuId( uint32_t det_id ) const;
-  const uint16_t nApvPairs(uint32_t det_id) const; // maximal nr. of apvpairs a detector can have (2 or 3)
-  bool IsConnected(const uint32_t& det_id) const;
-  bool IsDetected(const uint32_t& det_id) const;
-  bool IsUndetected(const uint32_t& det_id) const;
+  const std::vector<const FedChannelConnection *> &getConnections(uint32_t det_id) const;
+  const FedChannelConnection &getConnection(uint32_t det_id, unsigned short apv_pair) const;
+  const unsigned int getDcuId(uint32_t det_id) const;
+  const uint16_t nApvPairs(uint32_t det_id) const;  // maximal nr. of apvpairs a detector can have (2 or 3)
+  bool IsConnected(const uint32_t &det_id) const;
+  bool IsDetected(const uint32_t &det_id) const;
+  bool IsUndetected(const uint32_t &det_id) const;
 
   /** Added missing print method. */
-  void print( std::stringstream& ) const;
+  void print(std::stringstream &) const;
 
-  /** The printSummary method outputs the number of connected/detected/undetected modules for each layer of each subdetector.*/
-  void printSummary(std::stringstream& ss, const TrackerTopology* trackerTopo) const;
-  /** The printDebug method returns all the connected/detected/undetected modules.*/
-  void printDebug(std::stringstream& ss, const TrackerTopology* trackerTopo) const;
+  /** The printSummary method outputs the number of
+   * connected/detected/undetected modules for each layer of each subdetector.*/
+  void printSummary(std::stringstream &ss, const TrackerTopology *trackerTopo) const;
+  /** The printDebug method returns all the connected/detected/undetected
+   * modules.*/
+  void printDebug(std::stringstream &ss, const TrackerTopology *trackerTopo) const;
 
-  // Methods to get the number of connected, detected and undetected modules for each layer of each subdetector.
-  uint32_t connectedNumber(const std::string & subDet, const uint16_t layer) const { return detNumber(subDet, layer, 0); }
-  uint32_t detectedNumber(const std::string & subDet, const uint16_t layer) const { return detNumber(subDet, layer, 1); }
-  uint32_t undetectedNumber(const std::string & subDet, const uint16_t layer) const { return detNumber(subDet, layer, 2); }
-  inline const SiStripFedCabling * fedCabling() const {return fedCabling_;}
-  inline const TrackerTopology* const trackerTopology() const {return tTopo;}
+  // Methods to get the number of connected, detected and undetected modules for
+  // each layer of each subdetector.
+  uint32_t connectedNumber(const std::string &subDet, const uint16_t layer) const {
+    return detNumber(subDet, layer, 0);
+  }
+  uint32_t detectedNumber(const std::string &subDet, const uint16_t layer) const { return detNumber(subDet, layer, 1); }
+  uint32_t undetectedNumber(const std::string &subDet, const uint16_t layer) const {
+    return detNumber(subDet, layer, 2);
+  }
+  inline const SiStripFedCabling *fedCabling() const { return fedCabling_; }
+  inline const TrackerTopology *const trackerTopology() const { return tTopo; }
 
-  std::map< uint32_t, std::vector<int> > const & connected() const { return connected_;}
+  std::map<uint32_t, std::vector<int>> const &connected() const { return connected_; }
 
- private:
-  void addFromSpecificConnection( std::map<uint32_t, std::vector<int> > & , const std::map< uint32_t, std::vector<int> >  &, std::map< int16_t, uint32_t >* connectionsToFill = nullptr ) const;
-  bool IsInMap(const uint32_t& det_id, const std::map<uint32_t, std::vector<int> > &) const;
-  int16_t layerSearch( const uint32_t detId ) const;
-  uint32_t detNumber(const std::string & subDet, const uint16_t layer, const int connectionType) const;
+private:
+  void addFromSpecificConnection(std::map<uint32_t, std::vector<int>> &,
+                                 const std::map<uint32_t, std::vector<int>> &,
+                                 std::map<int16_t, uint32_t> *connectionsToFill = nullptr) const;
+  bool IsInMap(const uint32_t &det_id, const std::map<uint32_t, std::vector<int>> &) const;
+  int16_t layerSearch(const uint32_t detId) const;
+  uint32_t detNumber(const std::string &subDet, const uint16_t layer, const int connectionType) const;
 
   // ---------- member data --------------------------------
   // map of KEY=detid DATA=vector<FedChannelConnection>
-  std::map< uint32_t, std::vector<const FedChannelConnection *> > fullcabling_;
-  // map of KEY=detid DATA=vector of apvs, maximum 6 APVs per detector module : 0,1,2,3,4,5
-  std::map< uint32_t, std::vector<int> > connected_; // seen from FECs and FEDs
-  std::map< uint32_t, std::vector<int> > detected_; // seen from FECs but not from FEDs
-  std::map< uint32_t, std::vector<int> > undetected_; // seen from neither FECs or FEDs, DetIds inferred from static Look-Up-Table in the configuration database
+  std::map<uint32_t, std::vector<const FedChannelConnection *>> fullcabling_;
+  // map of KEY=detid DATA=vector of apvs, maximum 6 APVs per detector module :
+  // 0,1,2,3,4,5
+  std::map<uint32_t, std::vector<int>> connected_;   // seen from FECs and FEDs
+  std::map<uint32_t, std::vector<int>> detected_;    // seen from FECs but not from FEDs
+  std::map<uint32_t, std::vector<int>> undetected_;  // seen from neither FECs or FEDs, DetIds inferred from
+                                                     // static Look-Up-Table in the configuration database
 
   // Map containing the number of detectors for each connectionType
   // 0 = connected
   // 1 = detected
   // 2 = undetected
-  std::map< int16_t, uint32_t > connectionCount[3];
-  const SiStripFedCabling * fedCabling_;
-  const TrackerTopology* const tTopo;
+  std::map<int16_t, uint32_t> connectionCount[3];
+  const SiStripFedCabling *fedCabling_;
+  const TrackerTopology *const tTopo;
 };
 #endif
diff --git a/CalibFormats/SiStripObjects/interface/SiStripFec.h b/CalibFormats/SiStripObjects/interface/SiStripFec.h
index 4516a203afa69..ff79dda1d1fc6 100644
--- a/CalibFormats/SiStripObjects/interface/SiStripFec.h
+++ b/CalibFormats/SiStripObjects/interface/SiStripFec.h
@@ -7,49 +7,43 @@
 #include <boost/cstdint.hpp>
 #include <vector>
 
-/** 
+/**
     \class SiStripFec
     \author R.Bainbridge
 */
 class SiStripFec {
-
- public: 
-
+public:
   /** */
-  SiStripFec( const FedChannelConnection& conn );
-  
+  SiStripFec(const FedChannelConnection &conn);
+
   /** */
-  ~SiStripFec() {;}
-  
+  ~SiStripFec() { ; }
+
   /** */
-  inline const std::vector<SiStripRing>& rings() const;
-  inline std::vector<SiStripRing>& rings();
+  inline const std::vector<SiStripRing> &rings() const;
+  inline std::vector<SiStripRing> &rings();
 
   /** */
-  inline const uint16_t& fecSlot() const;
+  inline const uint16_t &fecSlot() const;
 
   /** */
-  void addDevices( const FedChannelConnection& conn );
-  
- private:
+  void addDevices(const FedChannelConnection &conn);
 
+private:
   /** */
-  SiStripFec() {;}
+  SiStripFec() { ; }
 
   /** */
   uint16_t fecSlot_;
 
   /** */
   std::vector<SiStripRing> rings_;
-
 };
 
 // ---------- inline methods ----------
 
-const std::vector<SiStripRing>& SiStripFec::rings() const { return rings_; }
-std::vector<SiStripRing>& SiStripFec::rings() { return rings_; }
-const uint16_t& SiStripFec::fecSlot() const { return fecSlot_; }
-
-#endif // CalibTracker_SiStripObjects_SiStripFec_H
-
+const std::vector<SiStripRing> &SiStripFec::rings() const { return rings_; }
+std::vector<SiStripRing> &SiStripFec::rings() { return rings_; }
+const uint16_t &SiStripFec::fecSlot() const { return fecSlot_; }
 
+#endif  // CalibTracker_SiStripObjects_SiStripFec_H
diff --git a/CalibFormats/SiStripObjects/interface/SiStripFecCabling.h b/CalibFormats/SiStripObjects/interface/SiStripFecCabling.h
index 86e2ea477e6ca..4dfbf51762b50 100644
--- a/CalibFormats/SiStripObjects/interface/SiStripFecCabling.h
+++ b/CalibFormats/SiStripObjects/interface/SiStripFecCabling.h
@@ -2,115 +2,121 @@
 #ifndef CalibFormats_SiStripObjects_SiStripFecCabling_H
 #define CalibFormats_SiStripObjects_SiStripFecCabling_H
 
-#include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h"
 #include "CalibFormats/SiStripObjects/interface/NumberOfDevices.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripFecCrate.h"
 #include "CondFormats/SiStripObjects/interface/FedChannelConnection.h"
+#include "CondFormats/SiStripObjects/interface/SiStripFedCabling.h"
 #include <boost/cstdint.hpp>
-#include <sstream>
 #include <ostream>
+#include <sstream>
 #include <vector>
 
 class SiStripFecCabling;
 
 /** Debug info for SiStripFecCabling class. */
-std::ostream& operator<< ( std::ostream&, const SiStripFecCabling& );
+std::ostream &operator<<(std::ostream &, const SiStripFecCabling &);
 
-/* 
+/*
    @class SiStripFecCabling
    @author R.Bainbridge
    @brief FEC cabling object for the strip tracker.
 */
 class SiStripFecCabling {
-  
- public:
-
+public:
   // ---------- Constructors, destructors ----------
-  
+
   /** */
-  SiStripFecCabling( const SiStripFedCabling& );
+  SiStripFecCabling(const SiStripFedCabling &);
   /** */
-  SiStripFecCabling() {;}
+  SiStripFecCabling() { ; }
   /** */
-  ~SiStripFecCabling() {;} //@@ needs implementation!!
-  
+  ~SiStripFecCabling() { ; }  //@@ needs implementation!!
+
   // ---------- Methods to retrieve connection info ----------
-  
+
   /** */
-  inline const std::vector<SiStripFecCrate>& crates() const;
-  inline std::vector<SiStripFecCrate>& crates();
+  inline const std::vector<SiStripFecCrate> &crates() const;
+  inline std::vector<SiStripFecCrate> &crates();
   /** */
-  inline const std::vector<SiStripFec>& fecs() const; //@@ TEMPORARY: to maintain backward compatibility!
+  inline const std::vector<SiStripFec> &fecs() const;  //@@ TEMPORARY: to maintain backward compatibility!
   /** */
-  void connections( std::vector<FedChannelConnection>& ) const;
+  void connections(std::vector<FedChannelConnection> &) const;
   /** */
-  const SiStripModule& module( const FedChannelConnection& conn ) const;
-  SiStripModule* module( const FedChannelConnection& conn );
+  const SiStripModule &module(const FedChannelConnection &conn) const;
+  SiStripModule *module(const FedChannelConnection &conn);
   /** */
-  const SiStripModule& module( const uint32_t& dcu_id ) const;
+  const SiStripModule &module(const uint32_t &dcu_id) const;
   /** */
   NumberOfDevices countDevices() const;
   /** */
-  void print( std::stringstream& ) const;
+  void print(std::stringstream &) const;
   /** */
-  void terse( std::stringstream& ) const;
+  void terse(std::stringstream &) const;
 
   // ---------- Methods used to build FEC cabling ----------
 
   /** */
-  void buildFecCabling( const SiStripFedCabling& ); 
+  void buildFecCabling(const SiStripFedCabling &);
   /** */
-  void addDevices( const FedChannelConnection& conn );
+  void addDevices(const FedChannelConnection &conn);
   /** */
-  inline void dcuId( const FedChannelConnection& conn );
+  inline void dcuId(const FedChannelConnection &conn);
   /** */
-  inline void detId( const FedChannelConnection& conn );
+  inline void detId(const FedChannelConnection &conn);
   /** */
-  inline void nApvPairs( const FedChannelConnection& conn );
-  
- private:
+  inline void nApvPairs(const FedChannelConnection &conn);
 
+private:
   /** */
   std::vector<SiStripFecCrate> crates_;
-  
 };
 
 // ---------- Inline methods ----------
 
-const std::vector<SiStripFecCrate>& SiStripFecCabling::crates() const { return crates_; }
-std::vector<SiStripFecCrate>& SiStripFecCabling::crates() { return crates_; }
+const std::vector<SiStripFecCrate> &SiStripFecCabling::crates() const { return crates_; }
+std::vector<SiStripFecCrate> &SiStripFecCabling::crates() { return crates_; }
 
 // TEMPORARY method to maintain backward compatibility!
-const std::vector<SiStripFec>& SiStripFecCabling::fecs() const { 
+const std::vector<SiStripFec> &SiStripFecCabling::fecs() const {
   const static std::vector<SiStripFec> my_fecs;
-  if ( !crates_.empty() ) { return crates_[0].fecs(); }
-  else { return my_fecs; }
+  if (!crates_.empty()) {
+    return crates_[0].fecs();
+  } else {
+    return my_fecs;
+  }
 }
 
-void SiStripFecCabling::dcuId( const FedChannelConnection& conn ) { 
+void SiStripFecCabling::dcuId(const FedChannelConnection &conn) {
   auto m = module(conn);
-  if(m) {m->dcuId(conn.dcuId());}
+  if (m) {
+    m->dcuId(conn.dcuId());
+  }
 }
 
-void SiStripFecCabling::detId( const FedChannelConnection& conn ) { 
+void SiStripFecCabling::detId(const FedChannelConnection &conn) {
   auto m = module(conn);
-  if(m) { m->detId(conn.detId()); }
+  if (m) {
+    m->detId(conn.detId());
+  }
 }
 
-void SiStripFecCabling::nApvPairs( const FedChannelConnection& conn ) { 
+void SiStripFecCabling::nApvPairs(const FedChannelConnection &conn) {
   auto m = module(conn);
-  if(m) { m->nApvPairs(conn.nApvPairs()); }
+  if (m) {
+    m->nApvPairs(conn.nApvPairs());
+  }
 }
 
-#endif // CalibTracker_SiStripObjects_SiStripFecCabling_H
+#endif  // CalibTracker_SiStripObjects_SiStripFecCabling_H
 
 /*
 
-inline void fedCh( const FedChannelConnection& conn ); //@@ needs to be implemented
+inline void fedCh( const FedChannelConnection& conn ); //@@ needs to be
+implemented
 
-void SiStripFecCabling::fedCh( const FedChannelConnection& conn ) {  
-  module(conn).detId(conn.fedId());  
-  module(conn).detId(conn.fedCh());  
+void SiStripFecCabling::fedCh( const FedChannelConnection& conn ) {
+  module(conn).detId(conn.fedId());
+  module(conn).detId(conn.fedCh());
 }
 
 */
diff --git a/CalibFormats/SiStripObjects/interface/SiStripFecCrate.h b/CalibFormats/SiStripObjects/interface/SiStripFecCrate.h
index eee9b5acc8c4a..eda333d170847 100644
--- a/CalibFormats/SiStripObjects/interface/SiStripFecCrate.h
+++ b/CalibFormats/SiStripObjects/interface/SiStripFecCrate.h
@@ -7,49 +7,43 @@
 #include <boost/cstdint.hpp>
 #include <vector>
 
-/** 
+/**
     \class SiStripFecCrate
     \author R.Bainbridge
 */
 class SiStripFecCrate {
-
- public: 
-
+public:
   /** */
-  SiStripFecCrate( const FedChannelConnection& conn );
-  
+  SiStripFecCrate(const FedChannelConnection &conn);
+
   /** */
-  ~SiStripFecCrate() {;}
-  
+  ~SiStripFecCrate() { ; }
+
   /** */
-  inline const std::vector<SiStripFec>& fecs() const;
-  inline std::vector<SiStripFec>& fecs();
-  
+  inline const std::vector<SiStripFec> &fecs() const;
+  inline std::vector<SiStripFec> &fecs();
+
   /** */
-  inline const uint16_t& fecCrate() const;
+  inline const uint16_t &fecCrate() const;
 
   /** */
-  void addDevices( const FedChannelConnection& conn );
-  
- private:
+  void addDevices(const FedChannelConnection &conn);
 
+private:
   /** */
-  SiStripFecCrate() {;}
+  SiStripFecCrate() { ; }
 
   /** */
   uint16_t fecCrate_;
 
   /** */
   std::vector<SiStripFec> fecs_;
-
 };
 
 // ---------- inline methods ----------
 
-const std::vector<SiStripFec>& SiStripFecCrate::fecs() const { return fecs_; }
-std::vector<SiStripFec>& SiStripFecCrate::fecs() { return fecs_; }
-const uint16_t& SiStripFecCrate::fecCrate() const { return fecCrate_; }
-
-#endif // CalibTracker_SiStripObjects_SiStripFecCrate_H
-
+const std::vector<SiStripFec> &SiStripFecCrate::fecs() const { return fecs_; }
+std::vector<SiStripFec> &SiStripFecCrate::fecs() { return fecs_; }
+const uint16_t &SiStripFecCrate::fecCrate() const { return fecCrate_; }
 
+#endif  // CalibTracker_SiStripObjects_SiStripFecCrate_H
diff --git a/CalibFormats/SiStripObjects/interface/SiStripGain.h b/CalibFormats/SiStripObjects/interface/SiStripGain.h
index 2115829400888..dbd91f09a3d22 100644
--- a/CalibFormats/SiStripObjects/interface/SiStripGain.h
+++ b/CalibFormats/SiStripObjects/interface/SiStripGain.h
@@ -4,8 +4,9 @@
 //
 // Package:     SiStripObjects
 // Class  :     SiStripGain
-// 
-/**\class SiStripGain SiStripGain.h CalibFormats/SiStripObjects/interface/SiStripGain.h
+//
+/**\class SiStripGain SiStripGain.h
+ * CalibFormats/SiStripObjects/interface/SiStripGain.h
  *
  * Description: give detector view for the cabling classes
  *
@@ -16,110 +17,102 @@
  *         Created:  Wed Mar 22 12:24:20 CET 2006
  *
  * Modifications by M. De Mattia (demattia@pd.infn.it) on 11/11/2009:
- * It now holds a std::vector of pointers to ApvGain and a std::vector of corresponding
- * normalization factors. <br>
- * It returns the product of all the Gain/norm ratios. <br>
- * The multiply method allows to input additional gain records. <br>
- * ATTENTION: the code assumes that the second tag has at least the same DetIds that the first tag and
- * only the DetIds present in the first tag will be used. <br>
- * <br>
- * There are two set of methods to access the gain value. The first one returns the products of all ApvGain/norm.
- * The second set of methods take an additional integer paramter and return the corresponding ApvGain (without normalization).
- * Note that no check is done inside these methods to see if the ApvGain really exists. It is responsibility of the
- * user to not pass an index value that exceeds the number of ApvGains. <br>
- * The normalization factors for each of the stored ApvGains are also accessible passing the corresponding index.
- * <br>
- * Additional method are provided to get the number of ApvGains used to build this object, the names of the records
- * that stored those ApvGains and the labels (they can be used to go back to the tags looking in the cfg).
+ * It now holds a std::vector of pointers to ApvGain and a std::vector of
+ * corresponding normalization factors. <br> It returns the product of all the
+ * Gain/norm ratios. <br> The multiply method allows to input additional gain
+ * records. <br> ATTENTION: the code assumes that the second tag has at least
+ * the same DetIds that the first tag and only the DetIds present in the first
+ * tag will be used. <br> <br> There are two set of methods to access the gain
+ * value. The first one returns the products of all ApvGain/norm. The second set
+ * of methods take an additional integer paramter and return the corresponding
+ * ApvGain (without normalization). Note that no check is done inside these
+ * methods to see if the ApvGain really exists. It is responsibility of the user
+ * to not pass an index value that exceeds the number of ApvGains. <br> The
+ * normalization factors for each of the stored ApvGains are also accessible
+ * passing the corresponding index. <br> Additional method are provided to get
+ * the number of ApvGains used to build this object, the names of the records
+ * that stored those ApvGains and the labels (they can be used to go back to the
+ * tags looking in the cfg).
  */
 
 #include "CondFormats/SiStripObjects/interface/SiStripApvGain.h"
-#include <vector>
 #include <memory>
+#include <vector>
 
 class TrackerTopology;
 
-class SiStripGain
-{
- public:
+class SiStripGain {
+public:
   SiStripGain() {}
-  SiStripGain(const SiStripGain&) = delete;
-  const SiStripGain& operator=(const SiStripGain&) = delete;
+  SiStripGain(const SiStripGain &) = delete;
+  const SiStripGain &operator=(const SiStripGain &) = delete;
 
   /// Kept for compatibility
-  inline SiStripGain(const SiStripApvGain& apvgain, const double & factor) :
-    apvgain_(nullptr)
-  {
+  inline SiStripGain(const SiStripApvGain &apvgain, const double &factor) : apvgain_(nullptr) {
     multiply(apvgain, factor, std::make_pair("", ""));
   }
 
-  inline SiStripGain(const SiStripApvGain& apvgain, const double & factor,
-		     const std::pair<std::string, std::string> & recordLabelPair) :
-    apvgain_(nullptr)
-  {
+  inline SiStripGain(const SiStripApvGain &apvgain,
+                     const double &factor,
+                     const std::pair<std::string, std::string> &recordLabelPair)
+      : apvgain_(nullptr) {
     multiply(apvgain, factor, recordLabelPair);
   }
 
-  /// Used to input additional gain values that will be multiplied to the first one
-  void multiply(const SiStripApvGain & apvgain, const double & factor,
-		const std::pair<std::string, std::string> & recordLabelPair);
+  /// Used to input additional gain values that will be multiplied to the first
+  /// one
+  void multiply(const SiStripApvGain &apvgain,
+                const double &factor,
+                const std::pair<std::string, std::string> &recordLabelPair);
 
   // getters
   // For the product of all apvGains
   // -------------------------------
-  const SiStripApvGain::Range getRange(uint32_t detID) const { return apvgain_->getRange(detID);}
-  SiStripApvGain::Range getRangeByPos(unsigned short pos) const { return apvgain_->getRangeByPos(pos);}
-  static float getStripGain(const uint16_t& strip, const SiStripApvGain::Range& range) { return  SiStripApvGain::getStripGain(strip, range);}
-  static float getApvGain(const uint16_t& apv, const SiStripApvGain::Range& range) {  return SiStripApvGain::getApvGain(apv, range); }
-
+  const SiStripApvGain::Range getRange(uint32_t detID) const { return apvgain_->getRange(detID); }
+  SiStripApvGain::Range getRangeByPos(unsigned short pos) const { return apvgain_->getRangeByPos(pos); }
+  static float getStripGain(const uint16_t &strip, const SiStripApvGain::Range &range) {
+    return SiStripApvGain::getStripGain(strip, range);
+  }
+  static float getApvGain(const uint16_t &apv, const SiStripApvGain::Range &range) {
+    return SiStripApvGain::getApvGain(apv, range);
+  }
 
   // For a specific apvGain
   // ----------------------
   /**
-   * The second parameter allows to specify which gain to retrieve, considering that
-   * they are in input order.
-   * NOTE that no protection is inside the method (because we want to keep it very light)
-   * therefore it is the caller duty to check that the index is in the correct range.
+   * The second parameter allows to specify which gain to retrieve, considering
+   * that they are in input order. NOTE that no protection is inside the method
+   * (because we want to keep it very light) therefore it is the caller duty to
+   * check that the index is in the correct range.
    */
-  const SiStripApvGain::Range getRange(const uint32_t& detID, const uint32_t index) const;
-  float getStripGain(const uint16_t& strip, const SiStripApvGain::Range& range, const uint32_t index) const;
-  float getApvGain(const uint16_t& apv, const SiStripApvGain::Range& range, const uint32_t index) const;
+  const SiStripApvGain::Range getRange(const uint32_t &detID, const uint32_t index) const;
+  float getStripGain(const uint16_t &strip, const SiStripApvGain::Range &range, const uint32_t index) const;
+  float getApvGain(const uint16_t &apv, const SiStripApvGain::Range &range, const uint32_t index) const;
 
   /// ATTENTION: we assume the detIds are the same as those from the first gain
-  void getDetIds(std::vector<uint32_t>& DetIds_) const;
-
-  inline size_t getNumberOfTags() const
-  {
-    return apvgainVector_.size();
-  }
-  inline std::string getRcdName(const uint32_t index) const
-  {
-    return recordLabelPair_[index].first;
-  }
-  inline std::string getLabelName(const uint32_t index) const
-  {
-    return recordLabelPair_[index].second;
-  }
-  inline double getTagNorm(const uint32_t index) const
-  {
-    return normVector_[index];
-  }
+  void getDetIds(std::vector<uint32_t> &DetIds_) const;
 
-  void printDebug(std::stringstream& ss, const TrackerTopology* trackerTopo) const;
-  void printSummary(std::stringstream& ss, const TrackerTopology* trackerTopo) const;
+  inline size_t getNumberOfTags() const { return apvgainVector_.size(); }
+  inline std::string getRcdName(const uint32_t index) const { return recordLabelPair_[index].first; }
+  inline std::string getLabelName(const uint32_t index) const { return recordLabelPair_[index].second; }
+  inline double getTagNorm(const uint32_t index) const { return normVector_[index]; }
 
- private:
+  void printDebug(std::stringstream &ss, const TrackerTopology *trackerTopo) const;
+  void printSummary(std::stringstream &ss, const TrackerTopology *trackerTopo) const;
 
-  void fillNewGain(const SiStripApvGain * apvgain, const double & factor,
-		   const SiStripApvGain * apvgain2 = nullptr, const double & factor2 = 1.);
+private:
+  void fillNewGain(const SiStripApvGain *apvgain,
+                   const double &factor,
+                   const SiStripApvGain *apvgain2 = nullptr,
+                   const double &factor2 = 1.);
 
   // ---------- member data --------------------------------
 
   std::vector<const SiStripApvGain *> apvgainVector_;
   std::vector<double> normVector_;
-  const SiStripApvGain * apvgain_;
+  const SiStripApvGain *apvgain_;
   std::unique_ptr<SiStripApvGain> apvgainAutoPtr_;
-  std::vector<std::pair<std::string, std::string> > recordLabelPair_;
+  std::vector<std::pair<std::string, std::string>> recordLabelPair_;
 };
 
 #endif
diff --git a/CalibFormats/SiStripObjects/interface/SiStripHashedDetId.h b/CalibFormats/SiStripObjects/interface/SiStripHashedDetId.h
index 40ddcc8b016ae..d51427d7998c0 100644
--- a/CalibFormats/SiStripObjects/interface/SiStripHashedDetId.h
+++ b/CalibFormats/SiStripObjects/interface/SiStripHashedDetId.h
@@ -3,34 +3,32 @@
 
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
+#include <algorithm>
 #include <boost/cstdint.hpp>
 #include <iomanip>
 #include <vector>
-#include <algorithm>
 
 class SiStripHashedDetId;
-std::ostream& operator<< ( std::ostream& os, const SiStripHashedDetId& );
+std::ostream &operator<<(std::ostream &os, const SiStripHashedDetId &);
 
-/** 
-    @class SiStripHashedDetId 
+/**
+    @class SiStripHashedDetId
     @author R.Bainbridge
     @brief Provides dense hash map in place of DetId
 */
 class SiStripHashedDetId {
-  
- public:
-
+public:
   // ---------- constructors ----------
-  
+
   /** Constructor taking raw DetIds as input. */
-  SiStripHashedDetId( const std::vector<uint32_t>& );
-  
+  SiStripHashedDetId(const std::vector<uint32_t> &);
+
   /** Constructor taking DetIds as input. */
-  SiStripHashedDetId( const std::vector<DetId>& );
+  SiStripHashedDetId(const std::vector<DetId> &);
 
   /** Copy constructor. */
-  SiStripHashedDetId( const SiStripHashedDetId& );
-  
+  SiStripHashedDetId(const SiStripHashedDetId &);
+
   /** Public default constructor. */
   SiStripHashedDetId();
 
@@ -46,51 +44,54 @@ class SiStripHashedDetId {
   // ---------- public interface ----------
 
   /** Returns hashed index for given DetId. */
-  inline uint32_t hashedIndex( uint32_t det_id ); 
-  
+  inline uint32_t hashedIndex(uint32_t det_id);
+
   /** Returns raw (32-bit) DetId for given hashed index. */
-  inline uint32_t unhashIndex( uint32_t hashed_index ) const;
+  inline uint32_t unhashIndex(uint32_t hashed_index) const;
 
   /** Returns DetId object for given hashed index. */
-  //inline DetId detId( uint32_t index ) const;
+  // inline DetId detId( uint32_t index ) const;
 
   inline const_iterator begin() const;
 
   inline const_iterator end() const;
 
- private:
+private:
+  void init(const std::vector<uint32_t> &);
 
-  void init( const std::vector<uint32_t>& );
-  
   /** Sorted list of all silicon strip tracker DetIds. */
   std::vector<uint32_t> detIds_;
 
   uint32_t id_;
 
   const_iterator iter_;
-
 };
 
-uint32_t SiStripHashedDetId::hashedIndex( uint32_t det_id ) { 
+uint32_t SiStripHashedDetId::hashedIndex(uint32_t det_id) {
   const_iterator iter = end();
-  if ( det_id > id_ ) { iter = find( iter_, end(), det_id ); }
-  else { iter = find( begin(), iter_, det_id ); }
-  if ( iter != end() ) { 
+  if (det_id > id_) {
+    iter = find(iter_, end(), det_id);
+  } else {
+    iter = find(begin(), iter_, det_id);
+  }
+  if (iter != end()) {
     id_ = det_id;
     iter_ = iter;
-    return iter-begin(); 
-  } else { 
+    return iter - begin();
+  } else {
     id_ = 0;
     iter_ = begin();
-    return sistrip::invalid32_; 
+    return sistrip::invalid32_;
   }
 }
-uint32_t SiStripHashedDetId::unhashIndex( uint32_t hashed_index ) const { 
-  if ( hashed_index < static_cast<uint32_t>(end()-begin()) ) { return detIds_[hashed_index]; }
-  else { return sistrip::invalid32_; }
+uint32_t SiStripHashedDetId::unhashIndex(uint32_t hashed_index) const {
+  if (hashed_index < static_cast<uint32_t>(end() - begin())) {
+    return detIds_[hashed_index];
+  } else {
+    return sistrip::invalid32_;
+  }
 }
 SiStripHashedDetId::const_iterator SiStripHashedDetId::begin() const { return detIds_.begin(); }
 SiStripHashedDetId::const_iterator SiStripHashedDetId::end() const { return detIds_.end(); }
 
-#endif // CalibFormats_SiStripObjects_SiStripHashedDetId_H
-
+#endif  // CalibFormats_SiStripObjects_SiStripHashedDetId_H
diff --git a/CalibFormats/SiStripObjects/interface/SiStripModule.h b/CalibFormats/SiStripObjects/interface/SiStripModule.h
index bda075e32b6b8..62265a25a0cca 100644
--- a/CalibFormats/SiStripObjects/interface/SiStripModule.h
+++ b/CalibFormats/SiStripObjects/interface/SiStripModule.h
@@ -5,217 +5,220 @@
 #include "CondFormats/SiStripObjects/interface/FedChannelConnection.h"
 #include "DataFormats/SiStripCommon/interface/SiStripFecKey.h"
 #include <boost/cstdint.hpp>
-#include <sstream>
+#include <map>
 #include <ostream>
+#include <sstream>
 #include <vector>
-#include <map>
 
 class SiStripModule;
 
 /** Debug info for SiStripModule class. */
-std::ostream& operator<< ( std::ostream&, const SiStripModule& );
+std::ostream &operator<<(std::ostream &, const SiStripModule &);
 
-/** 
+/**
     @class SiStripModule
     @author R.Bainbridge
     @brief Device and connection information at the level of a
     front-end module.
 */
 class SiStripModule {
-  
- public: 
-
+public:
   // ---------- Constructors and adding devices ----------
-  
+
   /** Constructor. */
-  SiStripModule( const FedChannelConnection& conn );
-  
+  SiStripModule(const FedChannelConnection &conn);
+
   /** Default constructor. */
-  ~SiStripModule() {;}
-  
+  ~SiStripModule() { ; }
+
   /** Sets device info (addresses, DetID, etc) for this module. */
-  void addDevices( const FedChannelConnection& conn );
+  void addDevices(const FedChannelConnection &conn);
 
   // ---------- Typedefs and enums ----------
 
   /** Pair containing FED id/channel. */
-  typedef std::pair<uint16_t,uint16_t> PairOfU16;
-  
+  typedef std::pair<uint16_t, uint16_t> PairOfU16;
+
   /** Struct containing FED crate/slot/id/channel. */
-  //typedef PairOfU16 FedChannel;
+  // typedef PairOfU16 FedChannel;
   class FedChannel {
   public:
     uint16_t fedCrate_;
     uint16_t fedSlot_;
     uint16_t fedId_;
     uint16_t fedCh_;
-    FedChannel( const uint16_t& crate, const uint16_t& slot, const uint16_t& id, const uint16_t& ch ) : 
-      fedCrate_(crate), fedSlot_(slot), fedId_(id), fedCh_(ch) {;}
-    FedChannel() : fedCrate_(0), fedSlot_(0), fedId_(0), fedCh_(0) {;}
+    FedChannel(const uint16_t &crate, const uint16_t &slot, const uint16_t &id, const uint16_t &ch)
+        : fedCrate_(crate), fedSlot_(slot), fedId_(id), fedCh_(ch) {
+      ;
+    }
+    FedChannel() : fedCrate_(0), fedSlot_(0), fedId_(0), fedCh_(0) { ; }
   };
-  
-  
+
   /** Map between LLD channel and FED channel */
-  typedef std::map< uint16_t, FedChannel > FedCabling;
-  
+  typedef std::map<uint16_t, FedChannel> FedCabling;
+
   // ---------- Control structure ----------
-  
-  inline const uint16_t& fecCrate() const;
-  inline const uint16_t& fecSlot() const;
-  inline const uint16_t& fecRing() const;
-  inline const uint16_t& ccuAddr() const;
-  inline const uint16_t& ccuChan() const;
-  
+
+  inline const uint16_t &fecCrate() const;
+  inline const uint16_t &fecSlot() const;
+  inline const uint16_t &fecRing() const;
+  inline const uint16_t &ccuAddr() const;
+  inline const uint16_t &ccuChan() const;
+
   /** Returns control "key" for this module, containing address
       information on FEC crate, slot, ring, CCU, and module. */
-  inline const SiStripFecKey& key() const;
-  
+  inline const SiStripFecKey &key() const;
+
   // ---------- APV devices ----------
-  
+
   /** Returns I2C addresses of active ("found") APVs. */
   std::vector<uint16_t> activeApvs() const;
-  
+
   /** Identifies whether APV of a given I2C address (32->37) or
       footprint position on the hybrid (0->5) is active or
       not. Returns device I2C address or zero if not active. */
-  const uint16_t& activeApv( const uint16_t& apv_address ) const;
-  
+  const uint16_t &activeApv(const uint16_t &apv_address) const;
+
   /** Identifies APV pairs that are active for given LLD channel
       (1->3). Returns device I2C address or zero if not active. */
-  PairOfU16 activeApvPair( const uint16_t& lld_channel ) const;
+  PairOfU16 activeApvPair(const uint16_t &lld_channel) const;
 
   /** Add APV to module using I2C address (32->37). */
-  void addApv( const uint16_t& apv_address );
-  
+  void addApv(const uint16_t &apv_address);
+
   // ---------- Other hybrid devices ----------
-  
+
   /** Identifies whether the DCU device is active ("found") or not. */
-  inline const uint16_t& dcu() const;
-  
+  inline const uint16_t &dcu() const;
+
   /** Identifies whether the MUX device is active ("found") or not. */
-  inline const uint16_t& mux() const;
-  
+  inline const uint16_t &mux() const;
+
   /** Identifies whether the PLL device is active ("found") or not. */
-  inline const uint16_t& pll() const;
-  
+  inline const uint16_t &pll() const;
+
   /** Identifies whether the LLD device is active ("found") or not. */
-  inline const uint16_t& lld() const;
+  inline const uint16_t &lld() const;
 
   // ---------- Module information ----------
-  
+
   /** Returns DCU id for this module. */
-  inline const uint32_t& dcuId() const;
-  
+  inline const uint32_t &dcuId() const;
+
   /** Returns LLD channel (1->3) for given APV pair (0->1 or 0->2). */
-  uint16_t lldChannel( const uint16_t& apv_pair_num ) const;
-  
+  uint16_t lldChannel(const uint16_t &apv_pair_num) const;
+
   /** Set DCU id for this module. */
-  inline void dcuId( const uint32_t& dcu_id );
-  
+  inline void dcuId(const uint32_t &dcu_id);
+
   // ---------- Detector information ----------
-  
+
   /** Returns unique (geometry-based) identifier for this module. */
-  inline const uint32_t& detId() const;
-  
+  inline const uint32_t &detId() const;
+
   /** Returns APV pair (0->1 or 0->2) for given LLD channel (1->3). */
-  uint16_t apvPairNumber( const uint16_t& lld_channel ) const;
-  
+  uint16_t apvPairNumber(const uint16_t &lld_channel) const;
+
   /** Returns number of APV pairs for this module. */
-  inline const uint16_t& nApvPairs() const;
-  
+  inline const uint16_t &nApvPairs() const;
+
   /** Returns number of detector strips for this module. */
   inline uint16_t nDetStrips() const;
-  
+
   /** Set DetId for this module. */
-  inline void detId( const uint32_t& det_id );
+  inline void detId(const uint32_t &det_id);
 
   /** Set number of detector strips for this module. */
-  void nApvPairs( const uint16_t& npairs );
-  
+  void nApvPairs(const uint16_t &npairs);
+
   // ---------- FED connection information ----------
-  
+
   /** Returns map of apvPairNumber and FedChannel. */
-  inline const FedCabling& fedChannels() const;
-  
+  inline const FedCabling &fedChannels() const;
+
   /** Returns FedChannel for a given apvPairNumber. */
-  FedChannel fedCh( const uint16_t& apv_pair_num ) const;
-  
+  FedChannel fedCh(const uint16_t &apv_pair_num) const;
+
   /** Sets FedChannel for given APV address (32->37). Returns true
       if connection made, false otherwise. */
-  bool fedCh( const uint16_t& apv_address, 
-	      const FedChannel& fed_ch );
-  
+  bool fedCh(const uint16_t &apv_address, const FedChannel &fed_ch);
+
   // ---------- Miscellaneous ----------
 
   /** Prints some debug information for this module. */
-  void print( std::stringstream& ) const; 
+  void print(std::stringstream &) const;
 
   /** Prints some terse debug information for this module. */
-  void terse( std::stringstream& ) const; 
+  void terse(std::stringstream &) const;
 
   /** Returns cable length. */
-  inline const uint16_t& length() const;
-  
+  inline const uint16_t &length() const;
+
   /** Sets cable length. */
-  inline void length( const uint16_t& length );
+  inline void length(const uint16_t &length);
 
- private: 
-  
+private:
   /** Control key/path for this module. */
   SiStripFecKey key_;
-  
-  // APVs found (identified by decimal I2C address)  
+
+  // APVs found (identified by decimal I2C address)
   uint16_t apv32_;
   uint16_t apv33_;
   uint16_t apv34_;
   uint16_t apv35_;
   uint16_t apv36_;
   uint16_t apv37_;
-  
-  // Devices found (with hex addr)  
+
+  // Devices found (with hex addr)
   uint16_t dcu0x00_;
   uint16_t mux0x43_;
   uint16_t pll0x44_;
   uint16_t lld0x60_;
-  
+
   // Detector
   uint32_t dcuId_;
   uint32_t detId_;
   uint16_t nApvPairs_;
-  
+
   /** KEY = LLD channel, DATA = FedId + FedCh */
   FedCabling cabling_;
   uint16_t length_;
-  
 };
 
 // --------------- inline methods ---------------
 
-const uint16_t& SiStripModule::fecCrate() const { return key_.fecCrate(); } 
-const uint16_t& SiStripModule::fecSlot() const { return key_.fecSlot(); } 
-const uint16_t& SiStripModule::fecRing() const { return key_.fecRing(); }
-const uint16_t& SiStripModule::ccuAddr() const { return key_.ccuAddr(); }
-const uint16_t& SiStripModule::ccuChan() const { return key_.ccuChan(); }
-
-const SiStripFecKey& SiStripModule::key() const { return key_; }
-
-const uint32_t& SiStripModule::dcuId() const { return dcuId_; } 
-const uint32_t& SiStripModule::detId() const { return detId_; } 
-const uint16_t& SiStripModule::nApvPairs() const { return nApvPairs_; }
-uint16_t SiStripModule::nDetStrips() const { return 256*nApvPairs_; }
-
-void SiStripModule::dcuId( const uint32_t& dcu_id ) { if ( dcu_id ) { dcuId_ = dcu_id; dcu0x00_ = true; } }
-void SiStripModule::detId( const uint32_t& det_id ) { if ( det_id ) { detId_ = det_id; } } 
-const SiStripModule::FedCabling& SiStripModule::fedChannels() const { return cabling_; } 
-
-const uint16_t& SiStripModule::length() const { return length_; } 
-void SiStripModule::length( const uint16_t& length ) { length_ = length; } 
-
-const uint16_t& SiStripModule::dcu() const { return dcu0x00_; } 
-const uint16_t& SiStripModule::mux() const { return mux0x43_; } 
-const uint16_t& SiStripModule::pll() const { return pll0x44_; } 
-const uint16_t& SiStripModule::lld() const { return lld0x60_; } 
-
-#endif // CalibTracker_SiStripObjects_SiStripModule_H
-
-
+const uint16_t &SiStripModule::fecCrate() const { return key_.fecCrate(); }
+const uint16_t &SiStripModule::fecSlot() const { return key_.fecSlot(); }
+const uint16_t &SiStripModule::fecRing() const { return key_.fecRing(); }
+const uint16_t &SiStripModule::ccuAddr() const { return key_.ccuAddr(); }
+const uint16_t &SiStripModule::ccuChan() const { return key_.ccuChan(); }
+
+const SiStripFecKey &SiStripModule::key() const { return key_; }
+
+const uint32_t &SiStripModule::dcuId() const { return dcuId_; }
+const uint32_t &SiStripModule::detId() const { return detId_; }
+const uint16_t &SiStripModule::nApvPairs() const { return nApvPairs_; }
+uint16_t SiStripModule::nDetStrips() const { return 256 * nApvPairs_; }
+
+void SiStripModule::dcuId(const uint32_t &dcu_id) {
+  if (dcu_id) {
+    dcuId_ = dcu_id;
+    dcu0x00_ = true;
+  }
+}
+void SiStripModule::detId(const uint32_t &det_id) {
+  if (det_id) {
+    detId_ = det_id;
+  }
+}
+const SiStripModule::FedCabling &SiStripModule::fedChannels() const { return cabling_; }
+
+const uint16_t &SiStripModule::length() const { return length_; }
+void SiStripModule::length(const uint16_t &length) { length_ = length; }
+
+const uint16_t &SiStripModule::dcu() const { return dcu0x00_; }
+const uint16_t &SiStripModule::mux() const { return mux0x43_; }
+const uint16_t &SiStripModule::pll() const { return pll0x44_; }
+const uint16_t &SiStripModule::lld() const { return lld0x60_; }
+
+#endif  // CalibTracker_SiStripObjects_SiStripModule_H
diff --git a/CalibFormats/SiStripObjects/interface/SiStripQuality.h b/CalibFormats/SiStripObjects/interface/SiStripQuality.h
index 5a54ce35ac5f8..06fb34b191f09 100644
--- a/CalibFormats/SiStripObjects/interface/SiStripQuality.h
+++ b/CalibFormats/SiStripObjects/interface/SiStripQuality.h
@@ -19,11 +19,10 @@
 // Created:     Wed Sep 26 17:42:12 CEST 2007
 //
 
-
+#include "CondFormats/RunInfo/interface/RunInfo.h"
 #include "CondFormats/SiStripObjects/interface/SiStripBadStrip.h"
-#include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "CondFormats/SiStripObjects/interface/SiStripDetVOff.h"
-#include "CondFormats/RunInfo/interface/RunInfo.h"
+#include "FWCore/ParameterSet/interface/FileInPath.h"
 #include <vector>
 
 #include "FWCore/Utilities/interface/GCC11Compatibility.h"
@@ -33,38 +32,36 @@ class SiStripDetInfoFileReader;
 class TrackerTopology;
 
 class SiStripQuality final : public SiStripBadStrip {
-
- public:
-
-  struct BadComponent{
+public:
+  struct BadComponent {
     uint32_t detid;
     unsigned short BadApvs : 6;
-    unsigned short BadFibers :3;
-    bool BadModule :1;
+    unsigned short BadFibers : 3;
+    bool BadModule : 1;
   };
 
-  class BadComponentStrictWeakOrdering{
+  class BadComponentStrictWeakOrdering {
   public:
-    bool operator() (const BadComponent& p,const uint32_t i) const {return p.detid < i;}
+    bool operator()(const BadComponent &p, const uint32_t i) const { return p.detid < i; }
   };
-  
-  SiStripQuality(); //takes default file for SiStripDetInfoFileReader
-  SiStripQuality(edm::FileInPath&);
-  SiStripQuality(const SiStripQuality&); //copy constructor
+
+  SiStripQuality();  // takes default file for SiStripDetInfoFileReader
+  SiStripQuality(edm::FileInPath &);
+  SiStripQuality(const SiStripQuality &);  // copy constructor
 
   ~SiStripQuality() override;
 
-  void clear(){
+  void clear() {
     v_badstrips.clear();
     indexes.clear();
     BadComponentVect.clear();
-    toCleanUp=false;
+    toCleanUp = false;
   }
 
-  void add(const uint32_t&,const SiStripBadStrip::Range&);
-  void add(const SiStripBadStrip*);
-  void add(const SiStripDetCabling*);
-  void add(const SiStripDetVOff*);
+  void add(const uint32_t &, const SiStripBadStrip::Range &);
+  void add(const SiStripBadStrip *);
+  void add(const SiStripDetCabling *);
+  void add(const SiStripDetVOff *);
   /**
    * Used to get the cabling from RunInfo. <br>
    * It compares the feds from cabling with those from runInfo and it
@@ -75,87 +72,92 @@ class SiStripQuality final : public SiStripBadStrip {
   void addInvalidConnectionFromCabling();
   void addNotConnectedConnectionFromCabling();
 
-  bool cleanUp(bool force=false);
+  bool cleanUp(bool force = false);
 
   void fillBadComponents();
 
-  void ReduceGranularity(double); 
+  void ReduceGranularity(double);
+
+  SiStripQuality &operator+=(const SiStripQuality &);
+  SiStripQuality &operator-=(const SiStripQuality &);
+  const SiStripQuality operator-(const SiStripQuality &) const;
+  bool operator==(const SiStripQuality &) const;
+  bool operator!=(const SiStripQuality &) const;
 
-  SiStripQuality& operator +=(const SiStripQuality&); 
-  SiStripQuality& operator -=(const SiStripQuality&);
-  const SiStripQuality operator -(const SiStripQuality&) const ;
-  bool operator ==(const SiStripQuality&) const;
-  bool operator !=(const SiStripQuality&) const;
-  
-  edm::FileInPath getFileInPath() const {return FileInPath_;}
+  edm::FileInPath getFileInPath() const { return FileInPath_; }
 
   //------- Interface for the user ----------//
-  bool IsModuleUsable(const uint32_t& detid) const;
-
-  bool IsModuleBad(const uint32_t& detid) const;
-  bool IsFiberBad(const uint32_t& detid, const short& fiberNb) const;
-  bool IsApvBad(const uint32_t& detid, const short& apvNb) const;
-  bool IsStripBad(const uint32_t& detid, const short& strip) const;
-  bool IsStripBad(const Range& range, const short& strip) const;
-  int  nBadStripsOnTheLeft(const Range& range, const short& strip) const; //provides number of consecutive bad strips on the left of strip (including strip)
-  int  nBadStripsOnTheRight(const Range& range, const short& strip) const; //provides number of consecutive bad strips on the right of strip (including strip)
-  
-  short getBadApvs(const uint32_t& detid) const; 
-  //each bad apv correspond to a bit to 1: num=
-  //0 <-> all good apvs
-  //1 <-> only apv 0 bad
-  //2<-> only apv 1 bad
-  //3<->  apv 0 and 1 bad
+  bool IsModuleUsable(const uint32_t &detid) const;
+
+  bool IsModuleBad(const uint32_t &detid) const;
+  bool IsFiberBad(const uint32_t &detid, const short &fiberNb) const;
+  bool IsApvBad(const uint32_t &detid, const short &apvNb) const;
+  bool IsStripBad(const uint32_t &detid, const short &strip) const;
+  bool IsStripBad(const Range &range, const short &strip) const;
+  int nBadStripsOnTheLeft(const Range &range,
+                          const short &strip) const;  // provides number of consecutive bad strips on the left of strip
+                                                      // (including strip)
+  int nBadStripsOnTheRight(
+      const Range &range, const short &strip) const;  // provides number of consecutive bad strips on the right of strip
+                                                      // (including strip)
+
+  short getBadApvs(const uint32_t &detid) const;
+  // each bad apv correspond to a bit to 1: num=
+  // 0 <-> all good apvs
+  // 1 <-> only apv 0 bad
+  // 2<-> only apv 1 bad
+  // 3<->  apv 0 and 1 bad
   // 4 <-> only apv 2 bad
   //...
-  short getBadFibers(const uint32_t& detid) const; 
-  //each bad fiber correspond to a bit to 1: num=
-  //0 <-> all good fibers
-  //1 <-> only fiber 0 bad
-  //2<-> only fiber 1 bad
-  //3<->  fiber 0 and 1 bad
+  short getBadFibers(const uint32_t &detid) const;
+  // each bad fiber correspond to a bit to 1: num=
+  // 0 <-> all good fibers
+  // 1 <-> only fiber 0 bad
+  // 2<-> only fiber 1 bad
+  // 3<->  fiber 0 and 1 bad
   // 4 <-> only fiber 2 bad
   //...
-  
-  const std::vector<BadComponent>& getBadComponentList() const { return BadComponentVect; }   
 
-  void compact(unsigned int&,std::vector<unsigned int>&);
+  const std::vector<BadComponent> &getBadComponentList() const { return BadComponentVect; }
+
+  void compact(unsigned int &, std::vector<unsigned int> &);
 
   inline void setPrintDebugOutput(const bool printDebug) { printDebug_ = printDebug; }
   inline void setUseEmptyRunInfo(const bool useEmptyRunInfo) { useEmptyRunInfo_ = useEmptyRunInfo; }
 
+  SiStripDetCabling const *cabling() const { return SiStripDetCabling_; }
 
-  SiStripDetCabling const * cabling() const { return SiStripDetCabling_;}
-
-
- private:
-
-  void compact(std::vector<unsigned int>&,std::vector<unsigned int>&,unsigned short&);
-  void subtract(std::vector<unsigned int>&,const std::vector<unsigned int>&);
-  void subtraction(std::vector<unsigned int>&,const unsigned int&);
-  bool put_replace(const uint32_t& DetId, Range input);
+private:
+  void compact(std::vector<unsigned int> &, std::vector<unsigned int> &, unsigned short &);
+  void subtract(std::vector<unsigned int> &, const std::vector<unsigned int> &);
+  void subtraction(std::vector<unsigned int> &, const unsigned int &);
+  bool put_replace(const uint32_t &DetId, Range input);
 
   /**
    * Loop on all the fedIds, take the fedChannels and then the detId.
    * Depending on the value of a bool turn off or not the strips in the list.
    */
-  void turnOffFeds(const std::vector<int> & fedsList, const bool turnOffStrips, const bool printDebug);
+  void turnOffFeds(const std::vector<int> &fedsList, const bool turnOffStrips, const bool printDebug);
 
   /// Prints debug output for a given detId
-  void printDetInfo(const TrackerTopology* const tTopo, const uint32_t &detId, const uint32_t &apvPairNumber, std::stringstream &ss);
-  /// Prints debug output for the active feds comparing the list in RunInfo and FedCabling
-  void printActiveFedsInfo( const std::vector<uint16_t> & activeFedsFromCabling,
-                            const std::vector<int> & activeFedsFromRunInfo,
-                            const std::vector<int> & differentFeds,
-                            const bool printDebug );
+  void printDetInfo(const TrackerTopology *const tTopo,
+                    const uint32_t &detId,
+                    const uint32_t &apvPairNumber,
+                    std::stringstream &ss);
+  /// Prints debug output for the active feds comparing the list in RunInfo and
+  /// FedCabling
+  void printActiveFedsInfo(const std::vector<uint16_t> &activeFedsFromCabling,
+                           const std::vector<int> &activeFedsFromRunInfo,
+                           const std::vector<int> &differentFeds,
+                           const bool printDebug);
 
   bool toCleanUp;
   edm::FileInPath FileInPath_;
-  SiStripDetInfoFileReader* reader;
+  SiStripDetInfoFileReader *reader;
 
   std::vector<BadComponent> BadComponentVect;
 
-  const SiStripDetCabling *SiStripDetCabling_;  
+  const SiStripDetCabling *SiStripDetCabling_;
   bool printDebug_;
   bool useEmptyRunInfo_;
 };
diff --git a/CalibFormats/SiStripObjects/interface/SiStripRegionCabling.h b/CalibFormats/SiStripObjects/interface/SiStripRegionCabling.h
index 414413a17105e..f223a8a1216e8 100644
--- a/CalibFormats/SiStripObjects/interface/SiStripRegionCabling.h
+++ b/CalibFormats/SiStripObjects/interface/SiStripRegionCabling.h
@@ -2,66 +2,64 @@
 #define CalibTracker_SiStripConnectivity_SiStripRegionCabling_H
 #define _USE_MATH_DEFINES
 
-#include <boost/cstdint.hpp>
 #include "CondFormats/SiStripObjects/interface/FedChannelConnection.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include <boost/cstdint.hpp>
+#include <cmath>
+#include <map>
 #include <sstream>
 #include <vector>
-#include <map>
-#include <cmath>
 
 /**
    Author: pwing
    Package: CalibFormats/SiStripObjects
    Class: SiStripRegionCabling
-   Description: Gives a regional view of the silicon strip tracker cabling. 
-   Cabling is divided into (eta,phi) "regions". A "region" within a given 
-   sub-detector is called a "wedge". A layer within a given wedge is called 
+   Description: Gives a regional view of the silicon strip tracker cabling.
+   Cabling is divided into (eta,phi) "regions". A "region" within a given
+   sub-detector is called a "wedge". A layer within a given wedge is called
    an "element".
 */
 
 class SiStripRegionCabling {
-
- public:
-
+public:
   /** enums */
-  enum SubDet {TIB = 0, TOB = 1, TID = 2, TEC = 3, ALLSUBDETS = 4};
-  enum Layer {TIBLAYERS = 4, TOBLAYERS = 6, TIDLAYERS = 3, TECLAYERS = 9, ALLLAYERS = 10};
+  enum SubDet { TIB = 0, TOB = 1, TID = 2, TEC = 3, ALLSUBDETS = 4 };
+  enum Layer { TIBLAYERS = 4, TOBLAYERS = 6, TIDLAYERS = 3, TECLAYERS = 9, ALLLAYERS = 10 };
 
   /** Cabling typedefs */
-  typedef std::pair< uint32_t, std::vector<FedChannelConnection> > Element;
-  typedef std::vector< Element > ElementCabling;
-  typedef std::vector< ElementCabling > WedgeCabling;
-  typedef std::vector< WedgeCabling > RegionCabling;
-  typedef std::vector< RegionCabling > Cabling;
+  typedef std::pair<uint32_t, std::vector<FedChannelConnection>> Element;
+  typedef std::vector<Element> ElementCabling;
+  typedef std::vector<ElementCabling> WedgeCabling;
+  typedef std::vector<WedgeCabling> RegionCabling;
+  typedef std::vector<RegionCabling> Cabling;
 
   /** Position typedefs */
 
-  typedef std::pair<double,double> Position;
-  typedef std::pair<uint32_t,uint32_t> PositionIndex;
+  typedef std::pair<double, double> Position;
+  typedef std::pair<uint32_t, uint32_t> PositionIndex;
 
   /** Encoded information typedefs */
 
   typedef uint32_t ElementIndex;
 
-  SiStripRegionCabling(const uint32_t,const uint32_t, const double);
+  SiStripRegionCabling(const uint32_t, const uint32_t, const double);
 
   ~SiStripRegionCabling() {}
 
   /** Set and get methods for cabling. */
 
-  inline void setRegionCabling(const Cabling&);
+  inline void setRegionCabling(const Cabling &);
 
-  inline const Cabling& getRegionCabling() const;
+  inline const Cabling &getRegionCabling() const;
 
   inline const uint32_t etadivisions() const;
 
   inline const uint32_t phidivisions() const;
 
-  /** Methods for interchanging between region, region-index and 
+  /** Methods for interchanging between region, region-index and
       eta/phi-position. */
 
-  inline const std::pair<double,double> regionDimensions() const;
+  inline const std::pair<double, double> regionDimensions() const;
 
   inline const Position position(const uint32_t) const;
 
@@ -72,14 +70,14 @@ class SiStripRegionCabling {
   const PositionIndex positionIndex(const Position) const;
 
   const uint32_t region(const Position) const;
-  
+
   inline const uint32_t region(const PositionIndex) const;
 
   /** Method for incrementing position index. */
 
   PositionIndex increment(const PositionIndex, int, int) const;
 
-  /** Methods for interchanging between region-subdet-layer and the 
+  /** Methods for interchanging between region-subdet-layer and the
       corresponding element index. */
 
   inline static const ElementIndex elementIndex(const uint32_t region, const SubDet, const uint32_t layer);
@@ -89,92 +87,86 @@ class SiStripRegionCabling {
   inline const ElementIndex elementIndex(const Position, const SubDet, const uint32_t layer) const;
 
   inline static const uint32_t layer(const ElementIndex);
-  
+
   inline static const SubDet subdet(const ElementIndex);
-  
+
   inline static const uint32_t region(const ElementIndex);
- 
-//  /** Methods for extracting det-id information */
-//
+
+  //  /** Methods for extracting det-id information */
+  //
   static const SubDet subdetFromDetId(const uint32_t detid);
 
   /** */
-  void print( std::stringstream& ) const;
-  
- private:
- 
- SiStripRegionCabling() {;}
- 
- /** Number of regions in eta,phi */
- int etadivisions_;
- int phidivisions_;
- 
- /** Tracker extent in eta */
- double etamax_;
- 
- /** Cabling */
- Cabling regioncabling_;
-}; 
-
-inline void SiStripRegionCabling::setRegionCabling(const Cabling& regioncabling) {
-  regioncabling_ = regioncabling;
-}
+  void print(std::stringstream &) const;
 
-inline const SiStripRegionCabling::Cabling& SiStripRegionCabling::getRegionCabling() const {
-  return regioncabling_;
-}
+private:
+  SiStripRegionCabling() { ; }
 
-inline const uint32_t SiStripRegionCabling::etadivisions() const {
-  return static_cast<uint32_t>(etadivisions_);
-}
+  /** Number of regions in eta,phi */
+  int etadivisions_;
+  int phidivisions_;
 
-inline const uint32_t SiStripRegionCabling::phidivisions() const {
-  return static_cast<uint32_t>(phidivisions_);
-}
+  /** Tracker extent in eta */
+  double etamax_;
+
+  /** Cabling */
+  Cabling regioncabling_;
+};
+
+inline void SiStripRegionCabling::setRegionCabling(const Cabling &regioncabling) { regioncabling_ = regioncabling; }
+
+inline const SiStripRegionCabling::Cabling &SiStripRegionCabling::getRegionCabling() const { return regioncabling_; }
+
+inline const uint32_t SiStripRegionCabling::etadivisions() const { return static_cast<uint32_t>(etadivisions_); }
 
-inline const std::pair<double,double> SiStripRegionCabling::regionDimensions() const {
-  return std::pair<double,double>((2.*etamax_)/etadivisions_,2.*M_PI/phidivisions_);
+inline const uint32_t SiStripRegionCabling::phidivisions() const { return static_cast<uint32_t>(phidivisions_); }
+
+inline const std::pair<double, double> SiStripRegionCabling::regionDimensions() const {
+  return std::pair<double, double>((2. * etamax_) / etadivisions_, 2. * M_PI / phidivisions_);
 }
 
 inline const SiStripRegionCabling::Position SiStripRegionCabling::position(const uint32_t region) const {
-  PositionIndex index = positionIndex(region); 
+  PositionIndex index = positionIndex(region);
   return position(index);
 }
 
 inline const SiStripRegionCabling::Position SiStripRegionCabling::position(const PositionIndex index) const {
-  return Position(regionDimensions().first*(index.first+.5) - etamax_, regionDimensions().second*(index.second+.5)- M_PI);
+  return Position(regionDimensions().first * (index.first + .5) - etamax_,
+                  regionDimensions().second * (index.second + .5) - M_PI);
 }
 
 inline const SiStripRegionCabling::PositionIndex SiStripRegionCabling::positionIndex(const uint32_t region) const {
-  return PositionIndex(region/phidivisions_,region%phidivisions_);
+  return PositionIndex(region / phidivisions_, region % phidivisions_);
 }
 
 inline const uint32_t SiStripRegionCabling::region(const PositionIndex index) const {
-  return index.first*phidivisions_ + index.second;
-}
-  
-inline const uint32_t SiStripRegionCabling::elementIndex(const uint32_t region, const SubDet subdet, const uint32_t layer) {
-  return region*ALLSUBDETS*ALLLAYERS + subdet*ALLLAYERS + layer;
+  return index.first * phidivisions_ + index.second;
 }
 
-inline const uint32_t SiStripRegionCabling::elementIndex(const PositionIndex index, const SubDet subdet, const uint32_t layer) const {
-  return elementIndex(region(index),subdet,layer);
+inline const uint32_t SiStripRegionCabling::elementIndex(const uint32_t region,
+                                                         const SubDet subdet,
+                                                         const uint32_t layer) {
+  return region * ALLSUBDETS * ALLLAYERS + subdet * ALLLAYERS + layer;
 }
 
-inline const uint32_t SiStripRegionCabling::elementIndex(const Position position, const SubDet subdet, const uint32_t layer) const {
-  return elementIndex(region(position),subdet,layer);
+inline const uint32_t SiStripRegionCabling::elementIndex(const PositionIndex index,
+                                                         const SubDet subdet,
+                                                         const uint32_t layer) const {
+  return elementIndex(region(index), subdet, layer);
 }
 
-inline const uint32_t SiStripRegionCabling::layer(const uint32_t index) {
-  return index%ALLLAYERS;
+inline const uint32_t SiStripRegionCabling::elementIndex(const Position position,
+                                                         const SubDet subdet,
+                                                         const uint32_t layer) const {
+  return elementIndex(region(position), subdet, layer);
 }
-  
+
+inline const uint32_t SiStripRegionCabling::layer(const uint32_t index) { return index % ALLLAYERS; }
+
 inline const SiStripRegionCabling::SubDet SiStripRegionCabling::subdet(const uint32_t index) {
-  return static_cast<SiStripRegionCabling::SubDet>((index/ALLLAYERS)%ALLSUBDETS);
-}
-  
-inline const uint32_t SiStripRegionCabling::region(const uint32_t index) {
-  return index/(ALLSUBDETS*ALLLAYERS);
+  return static_cast<SiStripRegionCabling::SubDet>((index / ALLLAYERS) % ALLSUBDETS);
 }
 
+inline const uint32_t SiStripRegionCabling::region(const uint32_t index) { return index / (ALLSUBDETS * ALLLAYERS); }
+
 #endif
diff --git a/CalibFormats/SiStripObjects/interface/SiStripRing.h b/CalibFormats/SiStripObjects/interface/SiStripRing.h
index 523194d431f3f..6895de6f5afa8 100644
--- a/CalibFormats/SiStripObjects/interface/SiStripRing.h
+++ b/CalibFormats/SiStripObjects/interface/SiStripRing.h
@@ -7,49 +7,43 @@
 #include <boost/cstdint.hpp>
 #include <vector>
 
-/** 
+/**
     \class SiStripRing
     \author R.Bainbridge
 */
 class SiStripRing {
-  
- public: 
-  
+public:
   /** */
-  SiStripRing( const FedChannelConnection& conn );
-  
+  SiStripRing(const FedChannelConnection &conn);
+
   /** */
-  ~SiStripRing() {;}
+  ~SiStripRing() { ; }
 
   /** */
-  inline const std::vector<SiStripCcu>& ccus() const;
-  inline std::vector<SiStripCcu>& ccus();
+  inline const std::vector<SiStripCcu> &ccus() const;
+  inline std::vector<SiStripCcu> &ccus();
 
   /** */
-  inline const uint16_t& fecRing() const;
-  
+  inline const uint16_t &fecRing() const;
+
   /** */
-  void addDevices( const FedChannelConnection& conn );
-  
- private:
+  void addDevices(const FedChannelConnection &conn);
 
+private:
   /** */
-  SiStripRing() {;}
+  SiStripRing() { ; }
 
   /** */
   uint16_t fecRing_;
 
   /** */
   std::vector<SiStripCcu> ccus_;
-
 };
 
 // ---------- inline methods ----------
 
-const std::vector<SiStripCcu>& SiStripRing::ccus() const { return ccus_; }
-std::vector<SiStripCcu>& SiStripRing::ccus() { return ccus_; }
-const uint16_t& SiStripRing::fecRing() const { return fecRing_; }
-
-#endif // CalibTracker_SiStripObjects_SiStripRing_H
-
+const std::vector<SiStripCcu> &SiStripRing::ccus() const { return ccus_; }
+std::vector<SiStripCcu> &SiStripRing::ccus() { return ccus_; }
+const uint16_t &SiStripRing::fecRing() const { return fecRing_; }
 
+#endif  // CalibTracker_SiStripObjects_SiStripRing_H
diff --git a/CalibFormats/SiStripObjects/src/NumberOfDevices.cc b/CalibFormats/SiStripObjects/src/NumberOfDevices.cc
index a5ce3fe3a3f76..de3cdab834b8a 100644
--- a/CalibFormats/SiStripObjects/src/NumberOfDevices.cc
+++ b/CalibFormats/SiStripObjects/src/NumberOfDevices.cc
@@ -14,9 +14,9 @@ void NumberOfDevices::clear() {
   nDcuIds_ = 0;
   nDetIds_ = 0;
   nApvPairs_ = 0;
-  nApvPairs0_ = 0; 
-  nApvPairs1_ = 0; 
-  nApvPairs2_ = 0; 
+  nApvPairs0_ = 0;
+  nApvPairs1_ = 0;
+  nApvPairs2_ = 0;
   nApvPairs3_ = 0;
   nApvPairsX_ = 0;
   nFedCrates_ = 0;
@@ -31,7 +31,7 @@ void NumberOfDevices::clear() {
 
 // -----------------------------------------------------------------------------
 //
-void NumberOfDevices::print( std::stringstream& ss ) const {
+void NumberOfDevices::print(std::stringstream &ss) const {
   ss << "  FEC crates   : " << nFecCrates_ << std::endl
      << "  FEC slots    : " << nFecSlots_ << std::endl
      << "  FEC rings    : " << nFecRings_ << std::endl
@@ -49,20 +49,16 @@ void NumberOfDevices::print( std::stringstream& ss ) const {
      << "  FED slots    : " << nFedSlots_ << std::endl
      << "  FED ids      : " << nFedIds_ << std::endl
      << "  FED channels : " << nFedChans_ << std::endl
-     << "  Number of APV pairs (0/1/2/3/>3) per module     : " 
-     << nApvPairs0_ << "/" 
-     << nApvPairs1_ << "/"
-     << nApvPairs2_ << "/"
-     << nApvPairs3_ << "/"
-     << nApvPairsX_ << std::endl
-     << "  Total number of modules/channels (nApvPairs<=3) : " 
-     << ( nApvPairs0_ + nApvPairs1_ + nApvPairs2_ + nApvPairs3_ ) << "/"
-     << ( 0*nApvPairs0_ + 1*nApvPairs1_ + 2*nApvPairs2_ + 3*nApvPairs3_ );
+     << "  Number of APV pairs (0/1/2/3/>3) per module     : " << nApvPairs0_ << "/" << nApvPairs1_ << "/"
+     << nApvPairs2_ << "/" << nApvPairs3_ << "/" << nApvPairsX_ << std::endl
+     << "  Total number of modules/channels (nApvPairs<=3) : "
+     << (nApvPairs0_ + nApvPairs1_ + nApvPairs2_ + nApvPairs3_) << "/"
+     << (0 * nApvPairs0_ + 1 * nApvPairs1_ + 2 * nApvPairs2_ + 3 * nApvPairs3_);
 }
-  
+
 // -----------------------------------------------------------------------------
 //
-std::ostream& operator<< ( std::ostream& os, const NumberOfDevices& devs ) {
+std::ostream &operator<<(std::ostream &os, const NumberOfDevices &devs) {
   std::stringstream ss;
   devs.print(ss);
   os << ss.str();
diff --git a/CalibFormats/SiStripObjects/src/SiStripCcu.cc b/CalibFormats/SiStripObjects/src/SiStripCcu.cc
index 9a9da99df4f71..a58723ab63ac1 100644
--- a/CalibFormats/SiStripObjects/src/SiStripCcu.cc
+++ b/CalibFormats/SiStripObjects/src/SiStripCcu.cc
@@ -1,25 +1,24 @@
 
 #include "CalibFormats/SiStripObjects/interface/SiStripCcu.h"
 #include <iostream>
-  
+
 // -----------------------------------------------------------------------------
 //
-SiStripCcu::SiStripCcu( const FedChannelConnection& conn ) 
-  : ccuAddr_( conn.ccuAddr() ), 
-    modules_() 
-{ 
+SiStripCcu::SiStripCcu(const FedChannelConnection &conn) : ccuAddr_(conn.ccuAddr()), modules_() {
   modules_.reserve(32);
-  addDevices( conn ); 
+  addDevices(conn);
 }
 
 // -----------------------------------------------------------------------------
 //
-void SiStripCcu::addDevices( const FedChannelConnection& conn ) {
+void SiStripCcu::addDevices(const FedChannelConnection &conn) {
   auto imod = modules_.begin();
-  while ( imod != modules_.end() && (*imod).ccuChan() != conn.ccuChan() ) { imod++; }
-  if ( imod == modules_.end() ) { 
-    modules_.push_back( SiStripModule( conn ) ); 
-  } else { 
-    imod->addDevices( conn ); 
+  while (imod != modules_.end() && (*imod).ccuChan() != conn.ccuChan()) {
+    imod++;
+  }
+  if (imod == modules_.end()) {
+    modules_.push_back(SiStripModule(conn));
+  } else {
+    imod->addDevices(conn);
   }
 }
diff --git a/CalibFormats/SiStripObjects/src/SiStripDelay.cc b/CalibFormats/SiStripObjects/src/SiStripDelay.cc
index 91f98d412f5c7..92c1c51193271 100644
--- a/CalibFormats/SiStripObjects/src/SiStripDelay.cc
+++ b/CalibFormats/SiStripObjects/src/SiStripDelay.cc
@@ -7,98 +7,100 @@
 // Original Author:  M. De Mattia
 //         Created:  26/10/2010
 
-#include "FWCore/Utilities/interface/typelookup.h"
-#include <cassert>
 #include "CalibFormats/SiStripObjects/interface/SiStripDelay.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "CondFormats/SiStripObjects/interface/SiStripDetSummary.h"
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
+#include "CondFormats/SiStripObjects/interface/SiStripDetSummary.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/typelookup.h"
+#include <cassert>
 #include <sstream>
 
-void SiStripDelay::fillNewDelay(const SiStripBaseDelay& baseDelay, const int sumSign,
-				const std::pair<std::string, std::string> & recordLabelPair)
-{
+void SiStripDelay::fillNewDelay(const SiStripBaseDelay &baseDelay,
+                                const int sumSign,
+                                const std::pair<std::string, std::string> &recordLabelPair) {
   baseDelayVector_.push_back(&baseDelay);
   sumSignVector_.push_back(sumSign);
   recordLabelPair_.push_back(recordLabelPair);
 }
 
-float SiStripDelay::getDelay(const uint32_t detId) const
-{
+float SiStripDelay::getDelay(const uint32_t detId) const {
   boost::unordered_map<uint32_t, double>::const_iterator it = delays_.find(detId);
-  if( it != delays_.end() ) {
+  if (it != delays_.end()) {
     return it->second;
   }
   return 0.;
 }
 
-bool SiStripDelay::makeDelay()
-{
-  if( baseDelayVector_.empty() ) {
+bool SiStripDelay::makeDelay() {
+  if (baseDelayVector_.empty()) {
     return false;
   }
-  std::vector<const SiStripBaseDelay*>::const_iterator it = baseDelayVector_.begin();
+  std::vector<const SiStripBaseDelay *>::const_iterator it = baseDelayVector_.begin();
   // Check for consistent size in all baseDelays
-  if( baseDelayVector_.size() > 1 ) {
-    for( ; it != baseDelayVector_.end()-1; ++it ) {
-      if( (*it)->delaysSize() != (*(it+1))->delaysSize() ) {
-	std::cout << "makeDelay: Error, size of base delays is different!!" << std::endl;
-	return false;
+  if (baseDelayVector_.size() > 1) {
+    for (; it != baseDelayVector_.end() - 1; ++it) {
+      if ((*it)->delaysSize() != (*(it + 1))->delaysSize()) {
+        std::cout << "makeDelay: Error, size of base delays is different!!" << std::endl;
+        return false;
       }
     }
   }
-  
-//   // All checks done, fill the boost::unoredered_map with the first one (initialization)
-//   int sumSignIndex = 0;
-//   int sumSign = 0;
-//   std::vector<uint32_t>::const_iterator detIdIt;
-//   for( it = baseDelayVector_.begin(); it != baseDelayVector_.end(); ++it, ++sumSignIndex ) {
-//     std::vector<uint32_t> detIds;
-//     (*it)->detIds(detIds);
-//     sumSign = sumSignVector_[sumSignIndex];
-//     for( detIdIt = detIds.begin(); detIdIt != detIds.end(); ++detIdIt ) {
-//       // Check if is alread there so that we never rely on the default initialization
-//       boost::unordered_map<uint32_t, double>::iterator delayIt = delays_.find(*detIdIt);
-//       if( delayIt != delays_.end() ) {
-// 	std::cout << "second delay = " << (*it)->delay(*detIdIt)*sumSign << std::endl;
-// 	delays_[*detIdIt] += (*it)->delay(*detIdIt)*sumSign;
-// 	std::cout << "Full delay = " << delays_[*detIdIt] << std::endl;
-//       }
-//       else {
-// 	std::cout << "first delay = " << (*it)->delay(*detIdIt)*sumSign << std::endl;
-// 	delays_[*detIdIt] = (*it)->delay(*detIdIt)*sumSign;
-//       }
-//     }
-//   }
 
-  // All checks done, fill the boost::unoredered_map with the first one (initialization)
+  //   // All checks done, fill the boost::unoredered_map with the first one
+  //   (initialization) int sumSignIndex = 0; int sumSign = 0;
+  //   std::vector<uint32_t>::const_iterator detIdIt;
+  //   for( it = baseDelayVector_.begin(); it != baseDelayVector_.end(); ++it,
+  //   ++sumSignIndex ) {
+  //     std::vector<uint32_t> detIds;
+  //     (*it)->detIds(detIds);
+  //     sumSign = sumSignVector_[sumSignIndex];
+  //     for( detIdIt = detIds.begin(); detIdIt != detIds.end(); ++detIdIt ) {
+  //       // Check if is alread there so that we never rely on the default
+  //       initialization boost::unordered_map<uint32_t, double>::iterator
+  //       delayIt = delays_.find(*detIdIt); if( delayIt != delays_.end() ) {
+  // 	std::cout << "second delay = " << (*it)->delay(*detIdIt)*sumSign <<
+  // std::endl; 	delays_[*detIdIt] += (*it)->delay(*detIdIt)*sumSign;
+  // std::cout
+  // << "Full delay = " << delays_[*detIdIt] << std::endl;
+  //       }
+  //       else {
+  // 	std::cout << "first delay = " << (*it)->delay(*detIdIt)*sumSign <<
+  // std::endl; 	delays_[*detIdIt] = (*it)->delay(*detIdIt)*sumSign;
+  //       }
+  //     }
+  //   }
+
+  // All checks done, fill the boost::unoredered_map with the first one
+  // (initialization)
   int sumSignIndex = 0;
   int sumSign = sumSignVector_[sumSignIndex];
   it = baseDelayVector_.begin();
   std::vector<uint32_t> detIds;
   (*it)->detIds(detIds);
   std::vector<uint32_t>::const_iterator detIdIt = detIds.begin();
-  for( ; detIdIt != detIds.end(); ++detIdIt ) {
-    delays_[*detIdIt] = (*it)->delay(*detIdIt)*sumSign;
+  for (; detIdIt != detIds.end(); ++detIdIt) {
+    delays_[*detIdIt] = (*it)->delay(*detIdIt) * sumSign;
   }
   ++it;
   ++sumSignIndex;
   // Fill all the others
-  for( ; it != baseDelayVector_.end(); ++it, ++sumSignIndex ) {
+  for (; it != baseDelayVector_.end(); ++it, ++sumSignIndex) {
     std::vector<uint32_t> detIds;
     (*it)->detIds(detIds);
     detIdIt = detIds.begin();
     sumSign = sumSignVector_[sumSignIndex];
-    for( ; detIdIt != detIds.end(); ++detIdIt ) {
-      // The same detIds should be in both maps, if not don't rely on the default initialization
+    for (; detIdIt != detIds.end(); ++detIdIt) {
+      // The same detIds should be in both maps, if not don't rely on the
+      // default initialization
       boost::unordered_map<uint32_t, double>::iterator delayIt = delays_.find(*detIdIt);
-      if( delayIt != delays_.end() ) {
-	delays_[*detIdIt] += (*it)->delay(*detIdIt)*sumSign;
-      }
-      else {
-	std::cout << "makeDelay: Warning, detId = " << *detIdIt << " not present, summing to 0..." << std::endl;
-	std::cout << "This means that the two baseDelay tags have different detIds. PLEASE, CHECK THAT THIS IS EXPECTED." << std::endl;
-	delays_[*detIdIt] = (*it)->delay(*detIdIt)*sumSign;
+      if (delayIt != delays_.end()) {
+        delays_[*detIdIt] += (*it)->delay(*detIdIt) * sumSign;
+      } else {
+        std::cout << "makeDelay: Warning, detId = " << *detIdIt << " not present, summing to 0..." << std::endl;
+        std::cout << "This means that the two baseDelay tags have different "
+                     "detIds. PLEASE, CHECK THAT THIS IS EXPECTED."
+                  << std::endl;
+        delays_[*detIdIt] = (*it)->delay(*detIdIt) * sumSign;
       }
     }
   }
@@ -106,27 +108,24 @@ bool SiStripDelay::makeDelay()
   return true;
 }
 
-void SiStripDelay::clear()
-{
+void SiStripDelay::clear() {
   baseDelayVector_.clear();
   sumSignVector_.clear();
   recordLabelPair_.clear();
   delays_.clear();
 }
 
-void SiStripDelay::printDebug(std::stringstream & ss, const TrackerTopology* /*trackerTopo*/) const
-{
+void SiStripDelay::printDebug(std::stringstream &ss, const TrackerTopology * /*trackerTopo*/) const {
   boost::unordered_map<uint32_t, double>::const_iterator it = delays_.begin();
-  for( ; it != delays_.end(); ++it ) {
+  for (; it != delays_.end(); ++it) {
     ss << "detId = " << it->first << " delay = " << it->second << std::endl;
   }
 }
 
-void SiStripDelay::printSummary(std::stringstream& ss, const TrackerTopology* trackerTopo) const
-{
+void SiStripDelay::printSummary(std::stringstream &ss, const TrackerTopology *trackerTopo) const {
   SiStripDetSummary summaryDelays{trackerTopo};
   boost::unordered_map<uint32_t, double>::const_iterator it = delays_.begin();
-  for( ; it != delays_.end(); ++it ) {
+  for (; it != delays_.end(); ++it) {
     summaryDelays.add(it->first, it->second);
   }
   summaryDelays.print(ss);
diff --git a/CalibFormats/SiStripObjects/src/SiStripDetCabling.cc b/CalibFormats/SiStripObjects/src/SiStripDetCabling.cc
index 79d08d42d1e03..7989253564ade 100644
--- a/CalibFormats/SiStripObjects/src/SiStripDetCabling.cc
+++ b/CalibFormats/SiStripObjects/src/SiStripDetCabling.cc
@@ -3,101 +3,118 @@
 // Class  :     SiStripDetCabling
 // Original Author:  dkcira
 //         Created:  Wed Mar 22 12:24:33 CET 2006
-#include "FWCore/Utilities/interface/typelookup.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/typelookup.h"
 
 #include <iostream>
 
 //---- default constructor / destructor
-SiStripDetCabling::SiStripDetCabling(const TrackerTopology* const topology) : fedCabling_(nullptr), tTopo(topology) {}
+SiStripDetCabling::SiStripDetCabling(const TrackerTopology *const topology) : fedCabling_(nullptr), tTopo(topology) {}
 SiStripDetCabling::~SiStripDetCabling() {}
 
 //---- construct detector view (DetCabling) out of readout view (FedCabling)
-SiStripDetCabling::SiStripDetCabling(const SiStripFedCabling& fedcabling,const TrackerTopology* const topology) : fullcabling_(), connected_(), detected_(), undetected_(), fedCabling_(&fedcabling), tTopo(topology)
-{
+SiStripDetCabling::SiStripDetCabling(const SiStripFedCabling &fedcabling, const TrackerTopology *const topology)
+    : fullcabling_(), connected_(), detected_(), undetected_(), fedCabling_(&fedcabling), tTopo(topology) {
   // --- CONNECTED = have fedid and i2cAddr
-  // create fullcabling_, loop over vector of FedChannelConnection, either make new element of map, or add to appropriate vector of existing map element
+  // create fullcabling_, loop over vector of FedChannelConnection, either make
+  // new element of map, or add to appropriate vector of existing map element
   // get feds list (vector) from fedcabling object - these are the active FEDs
   auto feds = fedcabling.fedIds();
-  for ( auto ifed = feds.begin(); ifed != feds.end(); ifed++ ) { // iterate over active feds, get all their FedChannelConnection-s
-    SiStripFedCabling::ConnsConstIterRange conns = fedcabling.fedConnections( *ifed );
-    for ( auto iconn = conns.begin(); iconn != conns.end(); iconn++ ) { // loop over FedChannelConnection objects
-      addDevices(*iconn, fullcabling_); // leave separate method, in case you will need to add devices also after constructing
+  for (auto ifed = feds.begin(); ifed != feds.end(); ifed++) {  // iterate over active feds, get all their
+                                                                // FedChannelConnection-s
+    SiStripFedCabling::ConnsConstIterRange conns = fedcabling.fedConnections(*ifed);
+    for (auto iconn = conns.begin(); iconn != conns.end(); iconn++) {  // loop over FedChannelConnection objects
+      addDevices(*iconn,
+                 fullcabling_);  // leave separate method, in case you will need
+                                 // to add devices also after constructing
       bool have_fed_id = iconn->fedId();
       std::vector<int> vector_of_connected_apvs;
-      if(have_fed_id){ // these apvpairs are seen from the readout
-	// there can be at most 6 APVs on one DetId: 0,1,2,3,4,5
-        int which_apv_pair = iconn->apvPairNumber(); // APVPair (0,1) for 512 strips and (0,1,2) for 768 strips
-	
-	// patch needed to take into account invalid detids or apvPairs
-	if( iconn->detId()==0 ||  
-	    iconn->detId() == sistrip::invalid32_ ||  
-	    iconn->apvPairNumber() == sistrip::invalid_  ||
-	    iconn->nApvPairs() == sistrip::invalid_ ) {
-	  continue;
-	}
+      if (have_fed_id) {  // these apvpairs are seen from the readout
+        // there can be at most 6 APVs on one DetId: 0,1,2,3,4,5
+        int which_apv_pair = iconn->apvPairNumber();  // APVPair (0,1) for 512 strips and (0,1,2)
+                                                      // for 768 strips
 
-	if(iconn->i2cAddr(0)) vector_of_connected_apvs.push_back(2*which_apv_pair + 0); // first apv of the pair
-	if(iconn->i2cAddr(1)) vector_of_connected_apvs.push_back(2*which_apv_pair + 1); // second apv of the pair
+        // patch needed to take into account invalid detids or apvPairs
+        if (iconn->detId() == 0 || iconn->detId() == sistrip::invalid32_ ||
+            iconn->apvPairNumber() == sistrip::invalid_ || iconn->nApvPairs() == sistrip::invalid_) {
+          continue;
+        }
+
+        if (iconn->i2cAddr(0))
+          vector_of_connected_apvs.push_back(2 * which_apv_pair + 0);  // first apv of the pair
+        if (iconn->i2cAddr(1))
+          vector_of_connected_apvs.push_back(2 * which_apv_pair + 1);  // second apv of the pair
       }
-      if(!vector_of_connected_apvs.empty()){ // add only is smth. there, obviously
-        std::map<uint32_t, std::vector<int> > map_of_connected_apvs;
-        map_of_connected_apvs.insert(std::make_pair(iconn->detId(),vector_of_connected_apvs));
+      if (!vector_of_connected_apvs.empty()) {  // add only is smth. there, obviously
+        std::map<uint32_t, std::vector<int>> map_of_connected_apvs;
+        map_of_connected_apvs.insert(std::make_pair(iconn->detId(), vector_of_connected_apvs));
         addFromSpecificConnection(connected_, map_of_connected_apvs, &(connectionCount[0]));
       }
     }
   }
   // --- DETECTED = do not have fedid but have i2cAddr
   SiStripFedCabling::ConnsConstIterRange detected_fed_connections = fedcabling.detectedDevices();
-  for(std::vector<FedChannelConnection>::const_iterator idtct = detected_fed_connections.begin(); idtct != detected_fed_connections.end(); ++idtct){
+  for (std::vector<FedChannelConnection>::const_iterator idtct = detected_fed_connections.begin();
+       idtct != detected_fed_connections.end();
+       ++idtct) {
     addDevices(*idtct, fullcabling_);
     bool have_fed_id = idtct->fedId();
     std::vector<int> vector_of_detected_apvs;
-    if(! have_fed_id){
-      int which_apv_pair = idtct->apvPairNumber(); // APVPair (0,1) for 512 strips and (0,1,2) for 768 strips
-      if(idtct->i2cAddr(0)) vector_of_detected_apvs.push_back(2*which_apv_pair + 0); // first apv of the pair
-      if(idtct->i2cAddr(1)) vector_of_detected_apvs.push_back(2*which_apv_pair + 1); // second apv of the pair
+    if (!have_fed_id) {
+      int which_apv_pair = idtct->apvPairNumber();  // APVPair (0,1) for 512 strips and (0,1,2)
+                                                    // for 768 strips
+      if (idtct->i2cAddr(0))
+        vector_of_detected_apvs.push_back(2 * which_apv_pair + 0);  // first apv of the pair
+      if (idtct->i2cAddr(1))
+        vector_of_detected_apvs.push_back(2 * which_apv_pair + 1);  // second apv of the pair
     }
-    if(!vector_of_detected_apvs.empty()){ // add only is smth. there, obviously
-      std::map<uint32_t,std::vector<int> > map_of_detected_apvs;
-      map_of_detected_apvs.insert(std::make_pair(idtct->detId(),vector_of_detected_apvs));
-      addFromSpecificConnection(detected_, map_of_detected_apvs, &(connectionCount[1]) );
+    if (!vector_of_detected_apvs.empty()) {  // add only is smth. there, obviously
+      std::map<uint32_t, std::vector<int>> map_of_detected_apvs;
+      map_of_detected_apvs.insert(std::make_pair(idtct->detId(), vector_of_detected_apvs));
+      addFromSpecificConnection(detected_, map_of_detected_apvs, &(connectionCount[1]));
     }
   }
   // --- UNDETECTED = have neither fedid nor i2caddr
   SiStripFedCabling::ConnsConstIterRange undetected_fed_connections = fedcabling.undetectedDevices();
-  for(std::vector<FedChannelConnection>::const_iterator iudtct = undetected_fed_connections.begin(); iudtct != undetected_fed_connections.end(); ++iudtct){
+  for (std::vector<FedChannelConnection>::const_iterator iudtct = undetected_fed_connections.begin();
+       iudtct != undetected_fed_connections.end();
+       ++iudtct) {
     addDevices(*iudtct, fullcabling_);
     bool have_fed_id = iudtct->fedId();
     std::vector<int> vector_of_undetected_apvs;
-    if(! have_fed_id){
-      int which_apv_pair = iudtct->apvPairNumber(); // APVPair (0,1) for 512 strips and (0,1,2) for 768 strips
-      if(iudtct->i2cAddr(0)) vector_of_undetected_apvs.push_back(2*which_apv_pair + 0); // first apv of the pair
-      if(iudtct->i2cAddr(1)) vector_of_undetected_apvs.push_back(2*which_apv_pair + 1); // second apv of the pair
+    if (!have_fed_id) {
+      int which_apv_pair = iudtct->apvPairNumber();  // APVPair (0,1) for 512 strips and (0,1,2)
+                                                     // for 768 strips
+      if (iudtct->i2cAddr(0))
+        vector_of_undetected_apvs.push_back(2 * which_apv_pair + 0);  // first apv of the pair
+      if (iudtct->i2cAddr(1))
+        vector_of_undetected_apvs.push_back(2 * which_apv_pair + 1);  // second apv of the pair
     }
-    if(!vector_of_undetected_apvs.empty()){ // add only is smth. there, obviously
-      std::map<uint32_t, std::vector<int> > map_of_undetected_apvs;
-      map_of_undetected_apvs.insert(std::make_pair(iudtct->detId(),vector_of_undetected_apvs));
+    if (!vector_of_undetected_apvs.empty()) {  // add only is smth. there, obviously
+      std::map<uint32_t, std::vector<int>> map_of_undetected_apvs;
+      map_of_undetected_apvs.insert(std::make_pair(iudtct->detId(), vector_of_undetected_apvs));
       addFromSpecificConnection(undetected_, map_of_undetected_apvs, &(connectionCount[2]));
     }
   }
 }
 
 //---- add to certain connections
-void SiStripDetCabling::addDevices( const FedChannelConnection& conn, 
-                                    std::map< uint32_t, std::vector<const FedChannelConnection *> >& conns ){
-  if( conn.detId() && conn.detId() != sistrip::invalid32_ &&  // check for valid detid
-      conn.apvPairNumber() != sistrip::invalid_ ) {           // check for valid apv pair number
-    if( conn.fedId()==0 || conn.fedId()==sistrip::invalid_ ){
-      edm::LogInfo("") << " SiStripDetCabling::addDevices for connection associated to detid " << conn.detId() << " apvPairNumber " << conn.apvPairNumber() << "the fedId is " << conn.fedId();
+void SiStripDetCabling::addDevices(const FedChannelConnection &conn,
+                                   std::map<uint32_t, std::vector<const FedChannelConnection *>> &conns) {
+  if (conn.detId() && conn.detId() != sistrip::invalid32_ &&  // check for valid detid
+      conn.apvPairNumber() != sistrip::invalid_) {            // check for valid apv pair number
+    if (conn.fedId() == 0 || conn.fedId() == sistrip::invalid_) {
+      edm::LogInfo("") << " SiStripDetCabling::addDevices for connection "
+                          "associated to detid "
+                       << conn.detId() << " apvPairNumber " << conn.apvPairNumber() << "the fedId is " << conn.fedId();
       return;
     }
     // check cached vector size is sufficient
     // if not, resize
-    if( conn.apvPairNumber() >= conns[conn.detId()].size() ) {
-      conns[conn.detId()].resize( conn.apvPairNumber()+1 );
+    if (conn.apvPairNumber() >= conns[conn.detId()].size()) {
+      conns[conn.detId()].resize(conn.apvPairNumber() + 1);
     }
     // add latest connection object
     conns[conn.detId()][conn.apvPairNumber()] = &conn;
@@ -105,78 +122,97 @@ void SiStripDetCabling::addDevices( const FedChannelConnection& conn,
 }
 
 //----
-void SiStripDetCabling::addDevices(const FedChannelConnection & conn){ // by default add to fullcabling_ connections - special case of above class
-  addDevices(conn, fullcabling_ ); // add to fullcabling_
+void SiStripDetCabling::addDevices(
+    const FedChannelConnection &conn) {  // by default add to fullcabling_ connections - special case of
+                                         // above class
+  addDevices(conn, fullcabling_);        // add to fullcabling_
 }
 
-//---- get vector of connected modules. replaces getActiveDetectorRawIds method - avoid use of static
-void SiStripDetCabling::addActiveDetectorsRawIds(std::vector<uint32_t> & vector_to_fill_with_detids ) const{
-  for(std::map< uint32_t, std::vector<int> >::const_iterator conn_it = connected_.begin(); conn_it!=connected_.end(); ++conn_it){
+//---- get vector of connected modules. replaces getActiveDetectorRawIds method
+//- avoid use of static
+void SiStripDetCabling::addActiveDetectorsRawIds(std::vector<uint32_t> &vector_to_fill_with_detids) const {
+  for (std::map<uint32_t, std::vector<int>>::const_iterator conn_it = connected_.begin(); conn_it != connected_.end();
+       ++conn_it) {
     vector_to_fill_with_detids.push_back(conn_it->first);
   }
   // no elements added to vector_to_fill_with_detids is empty connected_
 }
 
 //---- get vector of all modules.
-void SiStripDetCabling::addAllDetectorsRawIds(std::vector<uint32_t> & vector_to_fill_with_detids ) const{
-  for(std::map< uint32_t, std::vector<int> >::const_iterator conn_it = connected_.begin(); conn_it!=connected_.end(); ++conn_it){
+void SiStripDetCabling::addAllDetectorsRawIds(std::vector<uint32_t> &vector_to_fill_with_detids) const {
+  for (std::map<uint32_t, std::vector<int>>::const_iterator conn_it = connected_.begin(); conn_it != connected_.end();
+       ++conn_it) {
     vector_to_fill_with_detids.push_back(conn_it->first);
   }
-  for(std::map< uint32_t, std::vector<int> >::const_iterator conn_it = detected_.begin(); conn_it!=detected_.end(); ++conn_it){
+  for (std::map<uint32_t, std::vector<int>>::const_iterator conn_it = detected_.begin(); conn_it != detected_.end();
+       ++conn_it) {
     vector_to_fill_with_detids.push_back(conn_it->first);
   }
-  for(std::map< uint32_t, std::vector<int> >::const_iterator conn_it = undetected_.begin(); conn_it!=undetected_.end(); ++conn_it){
+  for (std::map<uint32_t, std::vector<int>>::const_iterator conn_it = undetected_.begin(); conn_it != undetected_.end();
+       ++conn_it) {
     vector_to_fill_with_detids.push_back(conn_it->first);
   }
-  // no elements added to vector_to_fill_with_detids is empty connected_, detected_.begin and undetected_.begin
+  // no elements added to vector_to_fill_with_detids is empty connected_,
+  // detected_.begin and undetected_.begin
 }
 
 //----
-const std::vector<const FedChannelConnection *>& SiStripDetCabling::getConnections(uint32_t det_id ) const{ // return all connections corresponding to one det_id
-  std::map< uint32_t, std::vector<const FedChannelConnection *> >::const_iterator detcabl_it = fullcabling_.find(det_id); // has to be const_iterator because this function cannot change data members
-  if( ! (detcabl_it==fullcabling_.end()) ){  // found detid in fullcabling_
-    return ( detcabl_it->second );
-  }else{ // DKwarn : is there need for output message here telling det_id does not exist?
+const std::vector<const FedChannelConnection *> &SiStripDetCabling::getConnections(
+    uint32_t det_id) const {  // return all connections corresponding to one det_id
+  std::map<uint32_t, std::vector<const FedChannelConnection *>>::const_iterator detcabl_it =
+      fullcabling_.find(det_id);              // has to be const_iterator because this
+                                              // function cannot change data members
+  if (!(detcabl_it == fullcabling_.end())) {  // found detid in fullcabling_
+    return (detcabl_it->second);
+  } else {  // DKwarn : is there need for output message here telling det_id does
+            // not exist?
     const static std::vector<const FedChannelConnection *> default_empty_fedchannelconnection;
     return default_empty_fedchannelconnection;
   }
 }
 
 //----
-const FedChannelConnection& SiStripDetCabling::getConnection( uint32_t det_id, unsigned short apv_pair ) const{
-  const std::vector<const FedChannelConnection *>& fcconns = getConnections(det_id);
-  for(std::vector<const FedChannelConnection *>::const_iterator iconn = fcconns.begin(); iconn!=fcconns.end();++iconn){
-    if ( ((*iconn) != nullptr) && (((*iconn)->apvPairNumber()) == apv_pair) ) { // check if apvPairNumber() of present FedChannelConnection is the same as requested one
-      return (**iconn); // if yes, return the FedChannelConnection object
+const FedChannelConnection &SiStripDetCabling::getConnection(uint32_t det_id, unsigned short apv_pair) const {
+  const std::vector<const FedChannelConnection *> &fcconns = getConnections(det_id);
+  for (std::vector<const FedChannelConnection *>::const_iterator iconn = fcconns.begin(); iconn != fcconns.end();
+       ++iconn) {
+    if (((*iconn) != nullptr) && (((*iconn)->apvPairNumber()) == apv_pair)) {  // check if apvPairNumber() of present
+      // FedChannelConnection is the same as requested one
+      return (**iconn);  // if yes, return the FedChannelConnection object
     }
   }
-  // if did not match none of the above, return some default value - DKwarn : also output message?
+  // if did not match none of the above, return some default value - DKwarn :
+  // also output message?
   const static FedChannelConnection default_empty_fedchannelconnection;
   return default_empty_fedchannelconnection;
 }
 
 //----
-const unsigned int SiStripDetCabling::getDcuId( uint32_t det_id ) const{
-  const std::vector<const FedChannelConnection *>& fcconns = getConnections( det_id );
-  if(!fcconns.empty()) {
-    // patch needed to take into account the possibility that the first component of fcconns is invalid
-    for(size_t i=0;i<fcconns.size();++i)
-      if (fcconns.at(i) && fcconns.at(i)->detId() != sistrip::invalid32_ && fcconns.at(i)->detId() != 0 )
-        return ( fcconns.at(i) )->dcuId(); // get dcuId of first element - when you build check this consistency
+const unsigned int SiStripDetCabling::getDcuId(uint32_t det_id) const {
+  const std::vector<const FedChannelConnection *> &fcconns = getConnections(det_id);
+  if (!fcconns.empty()) {
+    // patch needed to take into account the possibility that the first
+    // component of fcconns is invalid
+    for (size_t i = 0; i < fcconns.size(); ++i)
+      if (fcconns.at(i) && fcconns.at(i)->detId() != sistrip::invalid32_ && fcconns.at(i)->detId() != 0)
+        return (fcconns.at(i))->dcuId();  // get dcuId of first element - when
+                                          // you build check this consistency
   }
   // default if none of the above is fulfilled
   unsigned int default_zero_value = 0;
   return default_zero_value;
 }
 
-//---- one can find the nr of apvs from fullcabling_ -> std::vector<FedChannelConnection> -> size * 2
-const uint16_t SiStripDetCabling::nApvPairs(uint32_t det_id) const{
-  const std::vector<const FedChannelConnection *>& fcconns = getConnections( det_id );
-  if(!fcconns.empty()) {
-    // patch needed to take into account the possibility that the first component of fcconns is invalid
-    for(size_t i=0;i<fcconns.size();++i) {
-      if ( (fcconns.at(i) != nullptr) && (fcconns.at(i)->nApvPairs() != sistrip::invalid_) ) {
-        return fcconns.at(i)->nApvPairs(); // nr of apvpairs for associated module
+//---- one can find the nr of apvs from fullcabling_ ->
+// std::vector<FedChannelConnection> -> size * 2
+const uint16_t SiStripDetCabling::nApvPairs(uint32_t det_id) const {
+  const std::vector<const FedChannelConnection *> &fcconns = getConnections(det_id);
+  if (!fcconns.empty()) {
+    // patch needed to take into account the possibility that the first
+    // component of fcconns is invalid
+    for (size_t i = 0; i < fcconns.size(); ++i) {
+      if ((fcconns.at(i) != nullptr) && (fcconns.at(i)->nApvPairs() != sistrip::invalid_)) {
+        return fcconns.at(i)->nApvPairs();  // nr of apvpairs for associated module
       }
     }
   }
@@ -187,207 +223,222 @@ const uint16_t SiStripDetCabling::nApvPairs(uint32_t det_id) const{
 }
 
 //---- map of detector to list of APVs for APVs seen from FECs and FEDs
-void SiStripDetCabling::addConnected ( std::map<uint32_t, std::vector<int> > & map_to_add_to) const{
+void SiStripDetCabling::addConnected(std::map<uint32_t, std::vector<int>> &map_to_add_to) const {
   addFromSpecificConnection(map_to_add_to, connected_);
 }
 
 //--- map of detector to list of APVs for APVs seen neither from FECS or FEDs
-void SiStripDetCabling::addDetected( std::map<uint32_t, std::vector<int> > & map_to_add_to) const{
+void SiStripDetCabling::addDetected(std::map<uint32_t, std::vector<int>> &map_to_add_to) const {
   addFromSpecificConnection(map_to_add_to, detected_);
 }
 
 //---- map of detector to list of APVs for APVs seen neither from FECS or FEDs
-void SiStripDetCabling::addUnDetected( std::map<uint32_t, std::vector<int> > & map_to_add_to) const{
+void SiStripDetCabling::addUnDetected(std::map<uint32_t, std::vector<int>> &map_to_add_to) const {
   addFromSpecificConnection(map_to_add_to, undetected_);
 }
 
-//----  map of detector to list of APVs that are not connected - combination of addDetected and addUnDetected
-void SiStripDetCabling::addNotConnectedAPVs( std::map<uint32_t, std::vector<int> > & map_to_add_to) const{
+//----  map of detector to list of APVs that are not connected - combination of
+// addDetected and addUnDetected
+void SiStripDetCabling::addNotConnectedAPVs(std::map<uint32_t, std::vector<int>> &map_to_add_to) const {
   addFromSpecificConnection(map_to_add_to, detected_);
   addFromSpecificConnection(map_to_add_to, undetected_);
 }
 
 //----
-void SiStripDetCabling::addFromSpecificConnection( std::map<uint32_t, std::vector<int> > & map_to_add_to,
-                                                   const std::map< uint32_t, std::vector<int> > & specific_connection,
-                                                   std::map< int16_t, uint32_t >* connectionsToFill ) const {
-  for(std::map< uint32_t, std::vector<int> >::const_iterator conn_it = specific_connection.begin(); conn_it!=specific_connection.end(); ++conn_it){
+void SiStripDetCabling::addFromSpecificConnection(std::map<uint32_t, std::vector<int>> &map_to_add_to,
+                                                  const std::map<uint32_t, std::vector<int>> &specific_connection,
+                                                  std::map<int16_t, uint32_t> *connectionsToFill) const {
+  for (std::map<uint32_t, std::vector<int>>::const_iterator conn_it = specific_connection.begin();
+       conn_it != specific_connection.end();
+       ++conn_it) {
     uint32_t new_detid = conn_it->first;
     std::vector<int> new_apv_vector = conn_it->second;
-    std::map<uint32_t, std::vector<int> >::iterator it = map_to_add_to.find(new_detid);
-    if( it == map_to_add_to.end() ){ // detid does not exist in map, add new entry
-      std::sort(new_apv_vector.begin(),new_apv_vector.end()); // not very efficient sort, time consuming?
-      map_to_add_to.insert(std::make_pair(new_detid,new_apv_vector));
+    std::map<uint32_t, std::vector<int>>::iterator it = map_to_add_to.find(new_detid);
+    if (it == map_to_add_to.end()) {  // detid does not exist in map, add new entry
+      std::sort(new_apv_vector.begin(),
+                new_apv_vector.end());  // not very efficient sort, time consuming?
+      map_to_add_to.insert(std::make_pair(new_detid, new_apv_vector));
 
-      // Count the number of detIds per layer. Doing it in this "if" we count each detId only once
-      // (otherwise it would be counted once per APV pair)
+      // Count the number of detIds per layer. Doing it in this "if" we count
+      // each detId only once (otherwise it would be counted once per APV pair)
       // ATTENTION: consider changing the loop content to avoid this
-      // This is the expected full number of modules (double sided are counted twice because the two
-      // sides have different detId).
-      // TIB1 : 336, TIB2 : 432, TIB3 : 540, TIB4 : 648
-      // TID : each disk has 48+48+40 (ring1+ring2+ring3)
-      // TOB1 : 504, TOB2 : 576, TOB3 : 648, TOB4 : 720, TOB5 : 792, TOB6 : 888
-      // TEC1 : Total number of modules = 6400.
-      if( connectionsToFill ) {
+      // This is the expected full number of modules (double sided are counted
+      // twice because the two sides have different detId). TIB1 : 336, TIB2 :
+      // 432, TIB3 : 540, TIB4 : 648 TID : each disk has 48+48+40
+      // (ring1+ring2+ring3) TOB1 : 504, TOB2 : 576, TOB3 : 648, TOB4 : 720,
+      // TOB5 : 792, TOB6 : 888 TEC1 : Total number of modules = 6400.
+      if (connectionsToFill) {
         (*connectionsToFill)[layerSearch(new_detid)]++;
       }
 
-    }else{                    // detid exists already, add to its vector - if its not there already . . .
+    } else {  // detid exists already, add to its vector - if its not there
+              // already . . .
       std::vector<int> existing_apv_vector = it->second;
-      for(std::vector<int>::iterator inew = new_apv_vector.begin(); inew != new_apv_vector.end(); ++inew ){
+      for (std::vector<int>::iterator inew = new_apv_vector.begin(); inew != new_apv_vector.end(); ++inew) {
         bool there_already = false;
-        for(std::vector<int>::iterator iold = existing_apv_vector.begin(); iold != existing_apv_vector.end(); ++iold){
-	  if (*iold == *inew){
-	    there_already = true;
-	    break; // leave the loop
-	  }
+        for (std::vector<int>::iterator iold = existing_apv_vector.begin(); iold != existing_apv_vector.end(); ++iold) {
+          if (*iold == *inew) {
+            there_already = true;
+            break;  // leave the loop
+          }
         }
-        if( ! there_already ){
+        if (!there_already) {
           existing_apv_vector.push_back(*inew);
-          std::sort(existing_apv_vector.begin(),existing_apv_vector.end()); // not very efficient sort, time consuming?
-        }else{
-          //edm::LogWarning("Logical") << "apv "<<*inew<<" already exists in the detector module "<<new_detid;
+          std::sort(existing_apv_vector.begin(),
+                    existing_apv_vector.end());  // not very efficient sort, time consuming?
+        } else {
+          // edm::LogWarning("Logical") << "apv "<<*inew<<" already exists in
+          // the detector module "<<new_detid;
         }
       }
     }
   }
 }
 
-int16_t SiStripDetCabling::layerSearch( const uint32_t detId ) const
-{
-  const DetId detectorId=DetId(detId);
+int16_t SiStripDetCabling::layerSearch(const uint32_t detId) const {
+  const DetId detectorId = DetId(detId);
   const int subdet = detectorId.subdetId();
-  if(subdet==StripSubdetector::TIB){
+  if (subdet == StripSubdetector::TIB) {
     return tTopo->layer(detId);
-  } else if (subdet==StripSubdetector::TID){
+  } else if (subdet == StripSubdetector::TID) {
     // side: 1 = negative, 2 = positive
-    return 10+(tTopo->side(detId) -1)*3 + tTopo->layer(detId);
-  } else if (subdet==StripSubdetector::TOB){
-    return 100+tTopo->layer(detId);
-  } else if (subdet==StripSubdetector::TEC){
+    return 10 + (tTopo->side(detId) - 1) * 3 + tTopo->layer(detId);
+  } else if (subdet == StripSubdetector::TOB) {
+    return 100 + tTopo->layer(detId);
+  } else if (subdet == StripSubdetector::TEC) {
     // side: 1 = negative, 2 = positive
-    return 1000+(tTopo->side(detId) -1)*9 +tTopo->layer(detId);
+    return 1000 + (tTopo->side(detId) - 1) * 9 + tTopo->layer(detId);
   }
   return 0;
 }
 
-/// Return the number of modules for the specified subDet, layer and connectionType.
-uint32_t SiStripDetCabling::detNumber(const std::string & subDet, const uint16_t layer, const int connectionType) const {
+/// Return the number of modules for the specified subDet, layer and
+/// connectionType.
+uint32_t SiStripDetCabling::detNumber(const std::string &subDet, const uint16_t layer, const int connectionType) const {
   uint16_t subDetLayer = layer;
   // TIB = 1, TID = 2, TOB = 3, TEC = 4
-  if( subDet == "TID-" ) subDetLayer += 10;
-  else if( subDet == "TID+" ) subDetLayer += 10 + 3;
-  else if( subDet == "TOB" ) subDetLayer += 100;
-  else if( subDet == "TEC-" ) subDetLayer += 1000;
-  else if( subDet == "TEC+" ) subDetLayer += 1000 + 9;
-  else if( subDet != "TIB" ) {
+  if (subDet == "TID-")
+    subDetLayer += 10;
+  else if (subDet == "TID+")
+    subDetLayer += 10 + 3;
+  else if (subDet == "TOB")
+    subDetLayer += 100;
+  else if (subDet == "TEC-")
+    subDetLayer += 1000;
+  else if (subDet == "TEC+")
+    subDetLayer += 1000 + 9;
+  else if (subDet != "TIB") {
     LogDebug("SiStripDetCabling") << "Error: Wrong subDet. Please use one of TIB, TID, TOB, TEC." << std::endl;
     return 0;
   }
   auto found = connectionCount[connectionType].find(subDetLayer);
-  if(found != connectionCount[connectionType].end()) {
+  if (found != connectionCount[connectionType].end()) {
     return found->second;
   }
   return 0;
 }
 
-//---- map of all connected, detected, undetected to contiguous Ids - map reset first!
-void SiStripDetCabling::getAllDetectorsContiguousIds(std::map<uint32_t, unsigned int>& allToContiguous) const{
-  allToContiguous.clear(); // reset map
-  std::vector<uint32_t> all; addAllDetectorsRawIds(all); std::sort(all.begin(), all.end()); // get all detids and sort them
+//---- map of all connected, detected, undetected to contiguous Ids - map reset
+// first!
+void SiStripDetCabling::getAllDetectorsContiguousIds(std::map<uint32_t, unsigned int> &allToContiguous) const {
+  allToContiguous.clear();  // reset map
+  std::vector<uint32_t> all;
+  addAllDetectorsRawIds(all);
+  std::sort(all.begin(), all.end());  // get all detids and sort them
   unsigned int contiguousIndex = 0;
-  for(std::vector<uint32_t>::const_iterator idet = all.begin(); idet!= all.end(); ++idet){
-     ++contiguousIndex;
-     allToContiguous.insert(std::make_pair(*idet,contiguousIndex)); 
+  for (std::vector<uint32_t>::const_iterator idet = all.begin(); idet != all.end(); ++idet) {
+    ++contiguousIndex;
+    allToContiguous.insert(std::make_pair(*idet, contiguousIndex));
   }
 }
 
 //---- map of all connected - map reset first!
-void SiStripDetCabling::getActiveDetectorsContiguousIds(std::map<uint32_t, unsigned int>& connectedToContiguous) const{
-  connectedToContiguous.clear(); // reset map
-  std::vector<uint32_t> connected; addAllDetectorsRawIds(connected); std::sort(connected.begin(), connected.end()); // get connected detids and sort them (not strictly necessary)
-  std::map<uint32_t, unsigned int> allToContiguous; getAllDetectorsContiguousIds(allToContiguous); // create map of all indices
-  for(std::vector<uint32_t>::const_iterator idet = connected.begin(); idet!= connected.end(); ++idet){ // select only the indices for active detectors
+void SiStripDetCabling::getActiveDetectorsContiguousIds(std::map<uint32_t, unsigned int> &connectedToContiguous) const {
+  connectedToContiguous.clear();  // reset map
+  std::vector<uint32_t> connected;
+  addAllDetectorsRawIds(connected);
+  std::sort(connected.begin(),
+            connected.end());  // get connected detids and sort them (not
+                               // strictly necessary)
+  std::map<uint32_t, unsigned int> allToContiguous;
+  getAllDetectorsContiguousIds(allToContiguous);  // create map of all indices
+  for (std::vector<uint32_t>::const_iterator idet = connected.begin(); idet != connected.end();
+       ++idet) {  // select only the indices for active detectors
     std::map<uint32_t, unsigned int>::iterator deco = allToContiguous.find(*idet);
-    if(deco!=allToContiguous.end()){
-       connectedToContiguous.insert(*deco);
+    if (deco != allToContiguous.end()) {
+      connectedToContiguous.insert(*deco);
     }
   }
 }
 
-bool SiStripDetCabling::IsConnected(const uint32_t& det_id) const {
-  return IsInMap(det_id,connected_);
-}
+bool SiStripDetCabling::IsConnected(const uint32_t &det_id) const { return IsInMap(det_id, connected_); }
 
-bool SiStripDetCabling::IsDetected(const uint32_t& det_id) const {
-  return IsInMap(det_id,detected_);
-}
-bool SiStripDetCabling::IsUndetected(const uint32_t& det_id) const{
-  return IsInMap(det_id,undetected_);
-}
-bool SiStripDetCabling::IsInMap(const uint32_t& det_id, const std::map<uint32_t, std::vector<int> > & map) const{
-  std::map< uint32_t, std::vector<int> >::const_iterator it=map.find(det_id);
-  return (it!=map.end());
+bool SiStripDetCabling::IsDetected(const uint32_t &det_id) const { return IsInMap(det_id, detected_); }
+bool SiStripDetCabling::IsUndetected(const uint32_t &det_id) const { return IsInMap(det_id, undetected_); }
+bool SiStripDetCabling::IsInMap(const uint32_t &det_id, const std::map<uint32_t, std::vector<int>> &map) const {
+  std::map<uint32_t, std::vector<int>>::const_iterator it = map.find(det_id);
+  return (it != map.end());
 }
 
 // -----------------------------------------------------------------------------
 /** Added missing print method. */
-void SiStripDetCabling::print( std::stringstream& ss ) const {
+void SiStripDetCabling::print(std::stringstream &ss) const {
   uint32_t valid = 0;
   uint32_t total = 0;
   typedef std::vector<const FedChannelConnection *> Conns;
-  typedef std::map<uint32_t,Conns> ConnsMap;
+  typedef std::map<uint32_t, Conns> ConnsMap;
   ConnsMap::const_iterator ii = fullcabling_.begin();
   ConnsMap::const_iterator jj = fullcabling_.end();
   ss << "[SiStripDetCabling::" << __func__ << "]"
-     << " Printing DET cabling for " << fullcabling_.size()
-     << " modules " << std::endl;
-  for ( ; ii != jj; ++ii ) {
-    ss << "Printing " << ii->second.size()
-       << " connections for DetId: " << ii->first << std::endl;
+     << " Printing DET cabling for " << fullcabling_.size() << " modules " << std::endl;
+  for (; ii != jj; ++ii) {
+    ss << "Printing " << ii->second.size() << " connections for DetId: " << ii->first << std::endl;
     Conns::const_iterator iii = ii->second.begin();
     Conns::const_iterator jjj = ii->second.end();
-    for ( ; iii != jjj; ++iii ) { 
-      if ( (*iii)->isConnected() ) { valid++; }
+    for (; iii != jjj; ++iii) {
+      if ((*iii)->isConnected()) {
+        valid++;
+      }
       total++;
       ss << **iii << std::endl;
     }
   }
-  ss << "Number of connected:   " << valid << std::endl
-     << "Number of connections: " << total << std::endl;
+  ss << "Number of connected:   " << valid << std::endl << "Number of connections: " << total << std::endl;
 }
 
-void SiStripDetCabling::printSummary(std::stringstream& ss, const TrackerTopology* trackerTopo) const {
-  for( int connectionType = 0; connectionType < 3; ++connectionType ) {
-    if( connectionType == 0 ) ss << "Connected modules:" << std::endl;
-    else if( connectionType == 1 ) ss << "Detected modules:" << std::endl;
-    else ss << "Undetected modules:" << std::endl;
+void SiStripDetCabling::printSummary(std::stringstream &ss, const TrackerTopology *trackerTopo) const {
+  for (int connectionType = 0; connectionType < 3; ++connectionType) {
+    if (connectionType == 0)
+      ss << "Connected modules:" << std::endl;
+    else if (connectionType == 1)
+      ss << "Detected modules:" << std::endl;
+    else
+      ss << "Undetected modules:" << std::endl;
     ss << "SubDet and layer\t modules" << std::endl;
-    std::map< int16_t, uint32_t >::const_iterator iter = connectionCount[connectionType].begin();
-    for( ; iter != connectionCount[connectionType].end(); ++iter ) {
+    std::map<int16_t, uint32_t>::const_iterator iter = connectionCount[connectionType].begin();
+    for (; iter != connectionCount[connectionType].end(); ++iter) {
       uint32_t subDetLayer = iter->first;
       uint32_t modules = iter->second;
-      if( int(subDetLayer/10) == 0 ) {
+      if (int(subDetLayer / 10) == 0) {
         ss << "TIB \t layer " << subDetLayer << " \t" << modules << std::endl;
-      }
-      else if( int(subDetLayer/100) == 0 ) {
-        int layer = subDetLayer%10;
-        if( layer <= 3 ) ss << "TID- \t disk  " << layer << "\t" << modules << std::endl;
-        else ss << "TID+ \t disk  " << layer-3 << "\t" << modules << std::endl;
-      }
-      else if( int(subDetLayer/1000) == 0 ) {
-        int layer = subDetLayer%100;
+      } else if (int(subDetLayer / 100) == 0) {
+        int layer = subDetLayer % 10;
+        if (layer <= 3)
+          ss << "TID- \t disk  " << layer << "\t" << modules << std::endl;
+        else
+          ss << "TID+ \t disk  " << layer - 3 << "\t" << modules << std::endl;
+      } else if (int(subDetLayer / 1000) == 0) {
+        int layer = subDetLayer % 100;
         ss << "TOB \t layer " << layer << " \t" << modules << std::endl;
-      }
-      else {
-        int layer = subDetLayer%100;
-        if( layer <= 9 ) ss << "TEC- \t disk  " << layer << " \t" << modules << std::endl;
-        else ss << "TEC+ \t disk  " << layer-9 << " \t" << modules << std::endl;
+      } else {
+        int layer = subDetLayer % 100;
+        if (layer <= 9)
+          ss << "TEC- \t disk  " << layer << " \t" << modules << std::endl;
+        else
+          ss << "TEC+ \t disk  " << layer - 9 << " \t" << modules << std::endl;
       }
     }
   }
 }
 
-void SiStripDetCabling::printDebug(std::stringstream& ss, const TrackerTopology* /*trackerTopo*/) const {
-  print(ss);
-}
+void SiStripDetCabling::printDebug(std::stringstream &ss, const TrackerTopology * /*trackerTopo*/) const { print(ss); }
diff --git a/CalibFormats/SiStripObjects/src/SiStripFec.cc b/CalibFormats/SiStripObjects/src/SiStripFec.cc
index 484bf02367298..82a81a3e00e6f 100644
--- a/CalibFormats/SiStripObjects/src/SiStripFec.cc
+++ b/CalibFormats/SiStripObjects/src/SiStripFec.cc
@@ -4,22 +4,21 @@
 
 // -----------------------------------------------------------------------------
 //
-SiStripFec::SiStripFec( const FedChannelConnection& conn )
-  : fecSlot_( conn.fecSlot() ), 
-    rings_() 
-{ 
+SiStripFec::SiStripFec(const FedChannelConnection &conn) : fecSlot_(conn.fecSlot()), rings_() {
   rings_.reserve(8);
-  addDevices( conn ); 
+  addDevices(conn);
 }
 
 // -----------------------------------------------------------------------------
 //
-void SiStripFec::addDevices( const FedChannelConnection& conn ) {
+void SiStripFec::addDevices(const FedChannelConnection &conn) {
   auto iring = rings_.begin();
-  while ( iring != rings_.end() && (*iring).fecRing() != conn.fecRing() ) { iring++; }
-  if ( iring == rings_.end() ) { 
-    rings_.push_back( SiStripRing( conn ) ); 
-  } else { 
-    iring->addDevices( conn ); 
+  while (iring != rings_.end() && (*iring).fecRing() != conn.fecRing()) {
+    iring++;
+  }
+  if (iring == rings_.end()) {
+    rings_.push_back(SiStripRing(conn));
+  } else {
+    iring->addDevices(conn);
   }
 }
diff --git a/CalibFormats/SiStripObjects/src/SiStripFecCabling.cc b/CalibFormats/SiStripObjects/src/SiStripFecCabling.cc
index add21a4c54296..59389d7d2d5e4 100644
--- a/CalibFormats/SiStripObjects/src/SiStripFecCabling.cc
+++ b/CalibFormats/SiStripObjects/src/SiStripFecCabling.cc
@@ -1,112 +1,115 @@
 
-#include "FWCore/Utilities/interface/typelookup.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripFecCabling.h"
 #include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include <iostream>
+#include "FWCore/Utilities/interface/typelookup.h"
 #include <iomanip>
+#include <iostream>
 
 using namespace sistrip;
 
 // -----------------------------------------------------------------------------
 //
-SiStripFecCabling::SiStripFecCabling( const SiStripFedCabling& fed_cabling ) 
-  : crates_() 
-{
-  LogTrace(mlCabling_)
-    << "[SiStripFecCabling::" << __func__ << "]"
-    << " Constructing object...";
+SiStripFecCabling::SiStripFecCabling(const SiStripFedCabling &fed_cabling) : crates_() {
+  LogTrace(mlCabling_) << "[SiStripFecCabling::" << __func__ << "]"
+                       << " Constructing object...";
   crates_.reserve(4);
-  buildFecCabling( fed_cabling );
+  buildFecCabling(fed_cabling);
 }
 
 // -----------------------------------------------------------------------------
 //
-void SiStripFecCabling::buildFecCabling( const SiStripFedCabling& fed_cabling ) {
-  LogTrace(mlCabling_)
-    << "[SiStripFecCabling::" << __func__ << "]"
-    << " Building FEC cabling...";
+void SiStripFecCabling::buildFecCabling(const SiStripFedCabling &fed_cabling) {
+  LogTrace(mlCabling_) << "[SiStripFecCabling::" << __func__ << "]"
+                       << " Building FEC cabling...";
 
   // Retrieve and iterate through FED ids
   auto feds = fed_cabling.fedIds();
-  for ( auto ifed = feds.begin(); ifed != feds.end(); ifed++ ) {
-
+  for (auto ifed = feds.begin(); ifed != feds.end(); ifed++) {
     // Retrieve and iterate through FED channel connections
-    auto conns = fed_cabling.fedConnections( *ifed ); 
-    for ( auto iconn = conns.begin(); iconn != conns.end(); iconn++ ) {
-
+    auto conns = fed_cabling.fedConnections(*ifed);
+    for (auto iconn = conns.begin(); iconn != conns.end(); iconn++) {
       // Check that FED id is not invalid and add devices
-      if ( iconn->fedId() != sistrip::invalid_ ) { addDevices( *iconn ); } 
-      
+      if (iconn->fedId() != sistrip::invalid_) {
+        addDevices(*iconn);
+      }
     }
   }
 
   // Consistency checks
-  for ( std::vector<SiStripFecCrate>::const_iterator icrate = this->crates().begin(); icrate != this->crates().end(); ++icrate ) {
-    for ( std::vector<SiStripFec>::const_iterator ifec = icrate->fecs().begin(); ifec != icrate->fecs().end(); ++ifec ) {
-      for ( std::vector<SiStripRing>::const_iterator iring = ifec->rings().begin(); iring != ifec->rings().end(); ++iring ) {
-	for ( std::vector<SiStripCcu>::const_iterator iccu = iring->ccus().begin(); iccu != iring->ccus().end(); ++iccu ) {
-	  for ( std::vector<SiStripModule>::const_iterator imod = iccu->modules().begin(); imod != iccu->modules().end(); ++imod ) {
-	    //@@ need consistency checks here!
-	  }
-	}
+  for (std::vector<SiStripFecCrate>::const_iterator icrate = this->crates().begin(); icrate != this->crates().end();
+       ++icrate) {
+    for (std::vector<SiStripFec>::const_iterator ifec = icrate->fecs().begin(); ifec != icrate->fecs().end(); ++ifec) {
+      for (std::vector<SiStripRing>::const_iterator iring = ifec->rings().begin(); iring != ifec->rings().end();
+           ++iring) {
+        for (std::vector<SiStripCcu>::const_iterator iccu = iring->ccus().begin(); iccu != iring->ccus().end();
+             ++iccu) {
+          for (std::vector<SiStripModule>::const_iterator imod = iccu->modules().begin(); imod != iccu->modules().end();
+               ++imod) {
+            //@@ need consistency checks here!
+          }
+        }
       }
     }
   }
-  LogTrace(mlCabling_)
-    << "[SiStripFecCabling::" << __func__ << "]"
-    << " Finished building FEC cabling";
+  LogTrace(mlCabling_) << "[SiStripFecCabling::" << __func__ << "]"
+                       << " Finished building FEC cabling";
 }
 
 // -----------------------------------------------------------------------------
 //
-void SiStripFecCabling::addDevices( const FedChannelConnection& conn ) {
+void SiStripFecCabling::addDevices(const FedChannelConnection &conn) {
   auto icrate = crates_.begin();
-  while ( icrate != crates_.end() && (*icrate).fecCrate() != conn.fecCrate() ) { icrate++; }
-  if ( icrate == crates_.end() ) { 
-    crates_.push_back( SiStripFecCrate( conn ) ); 
-  } else { 
-    icrate->addDevices( conn ); 
+  while (icrate != crates_.end() && (*icrate).fecCrate() != conn.fecCrate()) {
+    icrate++;
+  }
+  if (icrate == crates_.end()) {
+    crates_.push_back(SiStripFecCrate(conn));
+  } else {
+    icrate->addDevices(conn);
   }
 }
 
 // -----------------------------------------------------------------------------
 //
-void SiStripFecCabling::connections( std::vector<FedChannelConnection>& conns ) const {
-  LogTrace(mlCabling_)
-    << "[SiStripFecCabling::" << __func__ << "]"
-    << " Building vector of FedChannelConnection objects...";
+void SiStripFecCabling::connections(std::vector<FedChannelConnection> &conns) const {
+  LogTrace(mlCabling_) << "[SiStripFecCabling::" << __func__ << "]"
+                       << " Building vector of FedChannelConnection objects...";
   conns.clear();
-  for ( std::vector<SiStripFecCrate>::const_iterator icrate = this->crates().begin(); icrate != this->crates().end(); ++icrate ) {
-    for ( std::vector<SiStripFec>::const_iterator ifec = icrate->fecs().begin(); ifec != icrate->fecs().end(); ++ifec ) {
-      for ( std::vector<SiStripRing>::const_iterator iring = ifec->rings().begin(); iring != ifec->rings().end(); ++iring ) {
-	for ( std::vector<SiStripCcu>::const_iterator iccu = iring->ccus().begin(); iccu != iring->ccus().end(); ++iccu ) {
-	  for ( std::vector<SiStripModule>::const_iterator imod = iccu->modules().begin(); imod != iccu->modules().end(); ++imod ) {
-	    for ( uint16_t ipair = 0; ipair < imod->nApvPairs(); ipair++ ) {
-	      conns.push_back( FedChannelConnection( icrate->fecCrate(), 
-						     ifec->fecSlot(), 
-						     iring->fecRing(), 
-						     iccu->ccuAddr(), 
-						     imod->ccuChan(), 
-						     imod->activeApvPair( imod->lldChannel(ipair) ).first, 
-						     imod->activeApvPair( imod->lldChannel(ipair) ).second,
-						     imod->dcuId(), 
-						     imod->detId(), 
-						     imod->nApvPairs(),
-						     imod->fedCh(ipair).fedId_, 
-						     imod->fedCh(ipair).fedCh_, 
-						     imod->length(),
-						     imod->dcu(), 
-						     imod->pll(), 
-						     imod->mux(), 
-						     imod->lld() ) );
-	      uint16_t fed_crate = imod->fedCh(ipair).fedCrate_;
-	      uint16_t fed_slot = imod->fedCh(ipair).fedSlot_;
-	      conns.back().fedCrate( fed_crate );
-	      conns.back().fedSlot( fed_slot );
-	    }
-	  }
-	}
+  for (std::vector<SiStripFecCrate>::const_iterator icrate = this->crates().begin(); icrate != this->crates().end();
+       ++icrate) {
+    for (std::vector<SiStripFec>::const_iterator ifec = icrate->fecs().begin(); ifec != icrate->fecs().end(); ++ifec) {
+      for (std::vector<SiStripRing>::const_iterator iring = ifec->rings().begin(); iring != ifec->rings().end();
+           ++iring) {
+        for (std::vector<SiStripCcu>::const_iterator iccu = iring->ccus().begin(); iccu != iring->ccus().end();
+             ++iccu) {
+          for (std::vector<SiStripModule>::const_iterator imod = iccu->modules().begin(); imod != iccu->modules().end();
+               ++imod) {
+            for (uint16_t ipair = 0; ipair < imod->nApvPairs(); ipair++) {
+              conns.push_back(FedChannelConnection(icrate->fecCrate(),
+                                                   ifec->fecSlot(),
+                                                   iring->fecRing(),
+                                                   iccu->ccuAddr(),
+                                                   imod->ccuChan(),
+                                                   imod->activeApvPair(imod->lldChannel(ipair)).first,
+                                                   imod->activeApvPair(imod->lldChannel(ipair)).second,
+                                                   imod->dcuId(),
+                                                   imod->detId(),
+                                                   imod->nApvPairs(),
+                                                   imod->fedCh(ipair).fedId_,
+                                                   imod->fedCh(ipair).fedCh_,
+                                                   imod->length(),
+                                                   imod->dcu(),
+                                                   imod->pll(),
+                                                   imod->mux(),
+                                                   imod->lld()));
+              uint16_t fed_crate = imod->fedCh(ipair).fedCrate_;
+              uint16_t fed_slot = imod->fedCh(ipair).fedSlot_;
+              conns.back().fedCrate(fed_crate);
+              conns.back().fedSlot(fed_slot);
+            }
+          }
+        }
       }
     }
   }
@@ -115,56 +118,69 @@ void SiStripFecCabling::connections( std::vector<FedChannelConnection>& conns )
 // -----------------------------------------------------------------------------
 //
 namespace {
-  // Using a template allows the const and non-const version to share the same code
-  template<typename T> 
-  auto moduleFrom( T& crates, const FedChannelConnection& conn ) -> decltype(& (crates[0].fecs()[0].rings()[0].ccus()[0].modules()[0])) {
+  // Using a template allows the const and non-const version to share the same
+  // code
+  template <typename T>
+  auto moduleFrom(T &crates, const FedChannelConnection &conn)
+      -> decltype(&(crates[0].fecs()[0].rings()[0].ccus()[0].modules()[0])) {
     std::stringstream ss;
     auto icrate = crates.begin();
-    while ( icrate != crates.end() && icrate->fecCrate() != conn.fecCrate() ) { icrate++; }
-    if ( icrate != crates.end() ) { 
+    while (icrate != crates.end() && icrate->fecCrate() != conn.fecCrate()) {
+      icrate++;
+    }
+    if (icrate != crates.end()) {
       auto ifec = icrate->fecs().begin();
-      while ( ifec != icrate->fecs().end() && ifec->fecSlot() != conn.fecSlot() ) { ifec++; }
-      if ( ifec != icrate->fecs().end() ) { 
+      while (ifec != icrate->fecs().end() && ifec->fecSlot() != conn.fecSlot()) {
+        ifec++;
+      }
+      if (ifec != icrate->fecs().end()) {
         auto iring = ifec->rings().begin();
-        while ( iring != ifec->rings().end() && iring->fecRing() != conn.fecRing() ) { iring++; }
-        if ( iring != ifec->rings().end() ) { 
+        while (iring != ifec->rings().end() && iring->fecRing() != conn.fecRing()) {
+          iring++;
+        }
+        if (iring != ifec->rings().end()) {
           auto iccu = iring->ccus().begin();
-          while ( iccu != iring->ccus().end() && iccu->ccuAddr() != conn.ccuAddr() ) { iccu++; }
-          if ( iccu != iring->ccus().end() ) { 
+          while (iccu != iring->ccus().end() && iccu->ccuAddr() != conn.ccuAddr()) {
+            iccu++;
+          }
+          if (iccu != iring->ccus().end()) {
             auto imod = iccu->modules().begin();
-            while ( imod != iccu->modules().end() && imod->ccuChan() != conn.ccuChan() ) { imod++; }
-            if ( imod != iccu->modules().end() ) { 
+            while (imod != iccu->modules().end() && imod->ccuChan() != conn.ccuChan()) {
+              imod++;
+            }
+            if (imod != iccu->modules().end()) {
               return &(*imod);
-            } else { 
+            } else {
               ss << "[SiStripFecCabling::" << __func__ << "]"
-                 << " CCU channel " << conn.ccuChan() 
-                 << " not found!"; }
-          } else { 
+                 << " CCU channel " << conn.ccuChan() << " not found!";
+            }
+          } else {
             ss << "[SiStripFecCabling::" << __func__ << "]"
-               << " CCU address " << conn.ccuAddr() 
-               << " not found!"; }
-        } else { 
+               << " CCU address " << conn.ccuAddr() << " not found!";
+          }
+        } else {
           ss << "[SiStripFecCabling::" << __func__ << "]"
-             << " FEC ring " << conn.fecRing() 
-             << " not found!"; }
-      } else { 
+             << " FEC ring " << conn.fecRing() << " not found!";
+        }
+      } else {
         ss << "[SiStripFecCabling::" << __func__ << "]"
-           << " FEC slot " << conn.fecSlot() 
-           << " not found!"; }
-    } else { 
+           << " FEC slot " << conn.fecSlot() << " not found!";
+      }
+    } else {
       ss << "[SiStripFecCabling::" << __func__ << "]"
-         << " FEC crate " << conn.fecCrate() 
-         << " not found!"; 
+         << " FEC crate " << conn.fecCrate() << " not found!";
+    }
+
+    if (!ss.str().empty()) {
+      edm::LogWarning(mlCabling_) << ss.str();
     }
-    
-    if ( !ss.str().empty() ) { edm::LogWarning(mlCabling_) << ss.str(); }
     return nullptr;
   }
-}
+}  // namespace
 
-const SiStripModule& SiStripFecCabling::module( const FedChannelConnection& conn ) const {
+const SiStripModule &SiStripFecCabling::module(const FedChannelConnection &conn) const {
   auto module = moduleFrom(crates(), conn);
-  if(module) {
+  if (module) {
     return *module;
   }
 
@@ -172,22 +188,25 @@ const SiStripModule& SiStripFecCabling::module( const FedChannelConnection& conn
   return s_module;
 }
 
-SiStripModule* SiStripFecCabling::module( const FedChannelConnection& conn ) {
-  return  moduleFrom(crates(), conn);
-}
-
+SiStripModule *SiStripFecCabling::module(const FedChannelConnection &conn) { return moduleFrom(crates(), conn); }
 
 // -----------------------------------------------------------------------------
 //
-const SiStripModule& SiStripFecCabling::module( const uint32_t& dcu_id ) const {
-  for ( std::vector<SiStripFecCrate>::const_iterator icrate = this->crates().begin(); icrate != this->crates().end(); ++icrate ) {
-    for ( std::vector<SiStripFec>::const_iterator ifec = icrate->fecs().begin(); ifec != icrate->fecs().end(); ++ifec ) {
-      for ( std::vector<SiStripRing>::const_iterator iring = ifec->rings().begin(); iring != ifec->rings().end(); ++iring ) {
-	for ( std::vector<SiStripCcu>::const_iterator iccu = iring->ccus().begin(); iccu != iring->ccus().end(); ++iccu ) {
-	  for ( std::vector<SiStripModule>::const_iterator imod = iccu->modules().begin(); imod != iccu->modules().end(); ++imod ) {
-	    if ( (*imod).dcuId() == dcu_id ) { return *imod; }
-	  }
-	}
+const SiStripModule &SiStripFecCabling::module(const uint32_t &dcu_id) const {
+  for (std::vector<SiStripFecCrate>::const_iterator icrate = this->crates().begin(); icrate != this->crates().end();
+       ++icrate) {
+    for (std::vector<SiStripFec>::const_iterator ifec = icrate->fecs().begin(); ifec != icrate->fecs().end(); ++ifec) {
+      for (std::vector<SiStripRing>::const_iterator iring = ifec->rings().begin(); iring != ifec->rings().end();
+           ++iring) {
+        for (std::vector<SiStripCcu>::const_iterator iccu = iring->ccus().begin(); iccu != iring->ccus().end();
+             ++iccu) {
+          for (std::vector<SiStripModule>::const_iterator imod = iccu->modules().begin(); imod != iccu->modules().end();
+               ++imod) {
+            if ((*imod).dcuId() == dcu_id) {
+              return *imod;
+            }
+          }
+        }
       }
     }
   }
@@ -198,139 +217,172 @@ const SiStripModule& SiStripFecCabling::module( const uint32_t& dcu_id ) const {
 // -----------------------------------------------------------------------------
 //
 NumberOfDevices SiStripFecCabling::countDevices() const {
-  
-  NumberOfDevices num_of_devices; // simple container class used for counting
-
-  std::vector<uint16_t> fed_crates; 
-  std::vector<uint16_t> fed_slots; 
-  std::vector<uint16_t> fed_ids; 
-  for ( std::vector<SiStripFecCrate>::const_iterator icrate = this->crates().begin(); icrate != this->crates().end(); ++icrate ) {
-    for ( std::vector<SiStripFec>::const_iterator ifec = icrate->fecs().begin(); ifec != icrate->fecs().end(); ++ifec ) {
-      for ( std::vector<SiStripRing>::const_iterator iring = ifec->rings().begin(); iring != ifec->rings().end(); ++iring ) {
-	for ( std::vector<SiStripCcu>::const_iterator iccu = iring->ccus().begin(); iccu != iring->ccus().end(); ++iccu ) {
-	  for ( std::vector<SiStripModule>::const_iterator imod = iccu->modules().begin(); imod != iccu->modules().end(); ++imod ) {
-
-	    // APVs
-	    if ( imod->activeApv(32) ) { num_of_devices.nApvs_++; }
-	    if ( imod->activeApv(33) ) { num_of_devices.nApvs_++; }
-	    if ( imod->activeApv(34) ) { num_of_devices.nApvs_++; }
-	    if ( imod->activeApv(35) ) { num_of_devices.nApvs_++; }
-	    if ( imod->activeApv(36) ) { num_of_devices.nApvs_++; }
-	    if ( imod->activeApv(37) ) { num_of_devices.nApvs_++; }
-	    if ( imod->dcuId() ) { num_of_devices.nDcuIds_++; }
-	    if ( imod->detId() ) { num_of_devices.nDetIds_++; }
-
-	    // APV pairs
-	    num_of_devices.nApvPairs_ += imod->nApvPairs();
-	    if      ( imod->nApvPairs() == 0 ) { num_of_devices.nApvPairs0_++; }
-	    else if ( imod->nApvPairs() == 1 ) { num_of_devices.nApvPairs1_++; }
-	    else if ( imod->nApvPairs() == 2 ) { num_of_devices.nApvPairs2_++; }
-	    else if ( imod->nApvPairs() == 3 ) { num_of_devices.nApvPairs3_++; }
-	    else { num_of_devices.nApvPairsX_++; }
-
-	    // FED crates, slots, ids, channels
-	    for ( uint16_t ipair = 0; ipair < imod->nApvPairs(); ipair++ ) {
-
-	      uint16_t fed_crate = imod->fedCh(ipair).fedCrate_;
-	      uint16_t fed_slot  = imod->fedCh(ipair).fedSlot_;
-	      uint16_t fed_id    = imod->fedCh(ipair).fedId_;
-
-	      if ( fed_id ) { 
-
-		num_of_devices.nFedChans_++;
-		
-		std::vector<uint16_t>::iterator icrate = find( fed_crates.begin(), fed_crates.end(), fed_crate );
-		if ( icrate == fed_crates.end() ) { 
-		  num_of_devices.nFedCrates_++; 
-		  fed_crates.push_back(fed_crate); 
-		}
-		
-		std::vector<uint16_t>::iterator islot = find( fed_slots.begin(), fed_slots.end(), fed_slot );
-		if ( islot == fed_slots.end() ) { 
-		  num_of_devices.nFedSlots_++; 
-		  fed_slots.push_back(fed_slot); 
-		}
-
-		std::vector<uint16_t>::iterator ifed = find( fed_ids.begin(), fed_ids.end(), fed_id );
-		if ( ifed == fed_ids.end() ) { 
-		  num_of_devices.nFedIds_++; 
-		  fed_ids.push_back(fed_id); 
-		}
-
-	      }
-
-	    }
-
-	    // FE devices
-	    if ( imod->dcu() ) { num_of_devices.nDcus_++; }
-	    if ( imod->mux() ) { num_of_devices.nMuxes_++; }
-	    if ( imod->pll() ) { num_of_devices.nPlls_++; }
-	    if ( imod->lld() ) { num_of_devices.nLlds_++; }
-
-	    // FE modules
-	    num_of_devices.nCcuChans_++;
-	  } 
-	  num_of_devices.nCcuAddrs_++;
-	}
-	num_of_devices.nFecRings_++;
+  NumberOfDevices num_of_devices;  // simple container class used for counting
+
+  std::vector<uint16_t> fed_crates;
+  std::vector<uint16_t> fed_slots;
+  std::vector<uint16_t> fed_ids;
+  for (std::vector<SiStripFecCrate>::const_iterator icrate = this->crates().begin(); icrate != this->crates().end();
+       ++icrate) {
+    for (std::vector<SiStripFec>::const_iterator ifec = icrate->fecs().begin(); ifec != icrate->fecs().end(); ++ifec) {
+      for (std::vector<SiStripRing>::const_iterator iring = ifec->rings().begin(); iring != ifec->rings().end();
+           ++iring) {
+        for (std::vector<SiStripCcu>::const_iterator iccu = iring->ccus().begin(); iccu != iring->ccus().end();
+             ++iccu) {
+          for (std::vector<SiStripModule>::const_iterator imod = iccu->modules().begin(); imod != iccu->modules().end();
+               ++imod) {
+            // APVs
+            if (imod->activeApv(32)) {
+              num_of_devices.nApvs_++;
+            }
+            if (imod->activeApv(33)) {
+              num_of_devices.nApvs_++;
+            }
+            if (imod->activeApv(34)) {
+              num_of_devices.nApvs_++;
+            }
+            if (imod->activeApv(35)) {
+              num_of_devices.nApvs_++;
+            }
+            if (imod->activeApv(36)) {
+              num_of_devices.nApvs_++;
+            }
+            if (imod->activeApv(37)) {
+              num_of_devices.nApvs_++;
+            }
+            if (imod->dcuId()) {
+              num_of_devices.nDcuIds_++;
+            }
+            if (imod->detId()) {
+              num_of_devices.nDetIds_++;
+            }
+
+            // APV pairs
+            num_of_devices.nApvPairs_ += imod->nApvPairs();
+            if (imod->nApvPairs() == 0) {
+              num_of_devices.nApvPairs0_++;
+            } else if (imod->nApvPairs() == 1) {
+              num_of_devices.nApvPairs1_++;
+            } else if (imod->nApvPairs() == 2) {
+              num_of_devices.nApvPairs2_++;
+            } else if (imod->nApvPairs() == 3) {
+              num_of_devices.nApvPairs3_++;
+            } else {
+              num_of_devices.nApvPairsX_++;
+            }
+
+            // FED crates, slots, ids, channels
+            for (uint16_t ipair = 0; ipair < imod->nApvPairs(); ipair++) {
+              uint16_t fed_crate = imod->fedCh(ipair).fedCrate_;
+              uint16_t fed_slot = imod->fedCh(ipair).fedSlot_;
+              uint16_t fed_id = imod->fedCh(ipair).fedId_;
+
+              if (fed_id) {
+                num_of_devices.nFedChans_++;
+
+                std::vector<uint16_t>::iterator icrate = find(fed_crates.begin(), fed_crates.end(), fed_crate);
+                if (icrate == fed_crates.end()) {
+                  num_of_devices.nFedCrates_++;
+                  fed_crates.push_back(fed_crate);
+                }
+
+                std::vector<uint16_t>::iterator islot = find(fed_slots.begin(), fed_slots.end(), fed_slot);
+                if (islot == fed_slots.end()) {
+                  num_of_devices.nFedSlots_++;
+                  fed_slots.push_back(fed_slot);
+                }
+
+                std::vector<uint16_t>::iterator ifed = find(fed_ids.begin(), fed_ids.end(), fed_id);
+                if (ifed == fed_ids.end()) {
+                  num_of_devices.nFedIds_++;
+                  fed_ids.push_back(fed_id);
+                }
+              }
+            }
+
+            // FE devices
+            if (imod->dcu()) {
+              num_of_devices.nDcus_++;
+            }
+            if (imod->mux()) {
+              num_of_devices.nMuxes_++;
+            }
+            if (imod->pll()) {
+              num_of_devices.nPlls_++;
+            }
+            if (imod->lld()) {
+              num_of_devices.nLlds_++;
+            }
+
+            // FE modules
+            num_of_devices.nCcuChans_++;
+          }
+          num_of_devices.nCcuAddrs_++;
+        }
+        num_of_devices.nFecRings_++;
       }
       num_of_devices.nFecSlots_++;
     }
     num_of_devices.nFecCrates_++;
   }
-  
+
   return num_of_devices;
-  
 }
 
 // -----------------------------------------------------------------------------
 //
-void SiStripFecCabling::print( std::stringstream& ss ) const {
+void SiStripFecCabling::print(std::stringstream &ss) const {
   uint32_t valid = 0;
   uint32_t total = 0;
   ss << "[SiStripFecCabling::" << __func__ << "] Printing FEC cabling:" << std::endl;
   ss << "Printing cabling for " << crates().size() << " crates" << std::endl;
-  for ( std::vector<SiStripFecCrate>::const_iterator icrate = crates().begin(); icrate != crates().end(); ++icrate ) {
+  for (std::vector<SiStripFecCrate>::const_iterator icrate = crates().begin(); icrate != crates().end(); ++icrate) {
     ss << "Printing cabling for " << icrate->fecs().size() << " FECs for crate " << icrate->fecCrate() << std::endl;
-    for ( std::vector<SiStripFec>::const_iterator ifec = icrate->fecs().begin(); ifec != icrate->fecs().end(); ++ifec ) {
+    for (std::vector<SiStripFec>::const_iterator ifec = icrate->fecs().begin(); ifec != icrate->fecs().end(); ++ifec) {
       ss << "Printing cabling for " << ifec->rings().size() << " rings for FEC " << ifec->fecSlot() << std::endl;
-      for ( std::vector<SiStripRing>::const_iterator iring = ifec->rings().begin(); iring != ifec->rings().end(); ++iring ) {
-	ss << "Printing cabling for " << iring->ccus().size() << " CCUs for ring " << iring->fecRing() << std::endl;
-	for ( std::vector<SiStripCcu>::const_iterator iccu = iring->ccus().begin(); iccu != iring->ccus().end(); ++iccu ) {
-	  ss << "Printing cabling for " << iccu->modules().size() << " modules for CCU " << iccu->ccuAddr() << std::endl;
-	  for ( std::vector<SiStripModule>::const_iterator imod = iccu->modules().begin(); imod != iccu->modules().end(); ++imod ) {
-
-	    SiStripModule::FedCabling conns = imod->fedChannels();
-	    SiStripModule::FedCabling::const_iterator ii = conns.begin();
-	    SiStripModule::FedCabling::const_iterator jj = conns.end();
-	    for ( ; ii != jj; ++ii ) {
-	      if ( ii->second.fedId_ != sistrip::invalid_ &&
-		   ii->second.fedCh_ != sistrip::invalid_ ) { valid++; }
-	      total++;
-	    }
-	    ss << *imod << std::endl;
-	  } 
-	}
+      for (std::vector<SiStripRing>::const_iterator iring = ifec->rings().begin(); iring != ifec->rings().end();
+           ++iring) {
+        ss << "Printing cabling for " << iring->ccus().size() << " CCUs for ring " << iring->fecRing() << std::endl;
+        for (std::vector<SiStripCcu>::const_iterator iccu = iring->ccus().begin(); iccu != iring->ccus().end();
+             ++iccu) {
+          ss << "Printing cabling for " << iccu->modules().size() << " modules for CCU " << iccu->ccuAddr()
+             << std::endl;
+          for (std::vector<SiStripModule>::const_iterator imod = iccu->modules().begin(); imod != iccu->modules().end();
+               ++imod) {
+            SiStripModule::FedCabling conns = imod->fedChannels();
+            SiStripModule::FedCabling::const_iterator ii = conns.begin();
+            SiStripModule::FedCabling::const_iterator jj = conns.end();
+            for (; ii != jj; ++ii) {
+              if (ii->second.fedId_ != sistrip::invalid_ && ii->second.fedCh_ != sistrip::invalid_) {
+                valid++;
+              }
+              total++;
+            }
+            ss << *imod << std::endl;
+          }
+        }
       }
     }
   }
-  ss << "Number of connected:   " << valid << std::endl
-     << "Number of connections: " << total << std::endl;
+  ss << "Number of connected:   " << valid << std::endl << "Number of connections: " << total << std::endl;
 }
 
 // -----------------------------------------------------------------------------
 //
-void SiStripFecCabling::terse( std::stringstream& ss ) const {
+void SiStripFecCabling::terse(std::stringstream &ss) const {
   ss << "[SiStripFecCabling::" << __func__ << "] Printing FEC cabling:" << std::endl;
-  for ( std::vector<SiStripFecCrate>::const_iterator icrate = crates().begin(); icrate != crates().end(); ++icrate ) {
-    for ( std::vector<SiStripFec>::const_iterator ifec = icrate->fecs().begin(); ifec != icrate->fecs().end(); ++ifec ) {
-      for ( std::vector<SiStripRing>::const_iterator iring = ifec->rings().begin(); iring != ifec->rings().end(); ++iring ) {
-	for ( std::vector<SiStripCcu>::const_iterator iccu = iring->ccus().begin(); iccu != iring->ccus().end(); ++iccu ) {
-	  for ( std::vector<SiStripModule>::const_iterator imod = iccu->modules().begin(); imod != iccu->modules().end(); ++imod ) {
-	    imod->terse(ss); 
-	    ss << std::endl;
-	  } 
-	}
+  for (std::vector<SiStripFecCrate>::const_iterator icrate = crates().begin(); icrate != crates().end(); ++icrate) {
+    for (std::vector<SiStripFec>::const_iterator ifec = icrate->fecs().begin(); ifec != icrate->fecs().end(); ++ifec) {
+      for (std::vector<SiStripRing>::const_iterator iring = ifec->rings().begin(); iring != ifec->rings().end();
+           ++iring) {
+        for (std::vector<SiStripCcu>::const_iterator iccu = iring->ccus().begin(); iccu != iring->ccus().end();
+             ++iccu) {
+          for (std::vector<SiStripModule>::const_iterator imod = iccu->modules().begin(); imod != iccu->modules().end();
+               ++imod) {
+            imod->terse(ss);
+            ss << std::endl;
+          }
+        }
       }
     }
   }
@@ -338,7 +390,7 @@ void SiStripFecCabling::terse( std::stringstream& ss ) const {
 
 // -----------------------------------------------------------------------------
 //
-std::ostream& operator<< ( std::ostream& os, const SiStripFecCabling& cabling ) {
+std::ostream &operator<<(std::ostream &os, const SiStripFecCabling &cabling) {
   std::stringstream ss;
   cabling.print(ss);
   os << ss.str();
diff --git a/CalibFormats/SiStripObjects/src/SiStripFecCrate.cc b/CalibFormats/SiStripObjects/src/SiStripFecCrate.cc
index e453a086635c4..0eeb9193a6cd6 100644
--- a/CalibFormats/SiStripObjects/src/SiStripFecCrate.cc
+++ b/CalibFormats/SiStripObjects/src/SiStripFecCrate.cc
@@ -4,24 +4,21 @@
 
 // -----------------------------------------------------------------------------
 //
-SiStripFecCrate::SiStripFecCrate( const FedChannelConnection& conn )
-  : fecCrate_( conn.fecCrate() ), 
-    fecs_() 
-{ 
+SiStripFecCrate::SiStripFecCrate(const FedChannelConnection &conn) : fecCrate_(conn.fecCrate()), fecs_() {
   fecs_.reserve(20);
-  addDevices( conn ); 
+  addDevices(conn);
 }
 
 // -----------------------------------------------------------------------------
 //
-void SiStripFecCrate::addDevices( const FedChannelConnection& conn ) {
+void SiStripFecCrate::addDevices(const FedChannelConnection &conn) {
   auto ifec = fecs_.begin();
-  while ( ifec != fecs_.end() && (*ifec).fecSlot() != conn.fecSlot() ) { ifec++; }
-  if ( ifec == fecs_.end() ) { 
-    fecs_.push_back( SiStripFec( conn ) ); 
-  } else { 
-    ifec->addDevices( conn ); 
+  while (ifec != fecs_.end() && (*ifec).fecSlot() != conn.fecSlot()) {
+    ifec++;
+  }
+  if (ifec == fecs_.end()) {
+    fecs_.push_back(SiStripFec(conn));
+  } else {
+    ifec->addDevices(conn);
   }
 }
-
-
diff --git a/CalibFormats/SiStripObjects/src/SiStripGain.cc b/CalibFormats/SiStripObjects/src/SiStripGain.cc
index cc2b4cdc0d0ac..4a85e5f423271 100644
--- a/CalibFormats/SiStripObjects/src/SiStripGain.cc
+++ b/CalibFormats/SiStripObjects/src/SiStripGain.cc
@@ -1,4 +1,4 @@
- // -*- C++ -*-
+// -*- C++ -*-
 //
 // Package:     SiStripObjects
 // Class  :     SiStripGain
@@ -7,74 +7,74 @@
 // Original Author:  gbruno
 //         Created:  Wed Mar 22 12:24:33 CET 2006
 
-#include "FWCore/Utilities/interface/typelookup.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripGain.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "CondFormats/SiStripObjects/interface/SiStripDetSummary.h"
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
+#include "CondFormats/SiStripObjects/interface/SiStripDetSummary.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/typelookup.h"
 #include <sstream>
 
-void SiStripGain::multiply(const SiStripApvGain & apvgain, const double & factor,
-			   const std::pair<std::string, std::string> & recordLabelPair)
-{
+void SiStripGain::multiply(const SiStripApvGain &apvgain,
+                           const double &factor,
+                           const std::pair<std::string, std::string> &recordLabelPair) {
   // When inserting the first ApvGain
-  if( apvgain_ == nullptr ) {
-    if( (factor != 1) && (factor != 0) ) {
-      fillNewGain( &apvgain, factor );
-    }
-    else {
-      // If the normalization factor is one, no need to create a new SiStripApvGain
+  if (apvgain_ == nullptr) {
+    if ((factor != 1) && (factor != 0)) {
+      fillNewGain(&apvgain, factor);
+    } else {
+      // If the normalization factor is one, no need to create a new
+      // SiStripApvGain
       apvgain_ = &apvgain;
     }
-  }
-  else {
-    // There is already an ApvGain inside the SiStripGain. Multiply it by the new one and save the new pointer.
-    fillNewGain( apvgain_, 1., &apvgain, factor ); 
+  } else {
+    // There is already an ApvGain inside the SiStripGain. Multiply it by the
+    // new one and save the new pointer.
+    fillNewGain(apvgain_, 1., &apvgain, factor);
   }
   recordLabelPair_.push_back(recordLabelPair);
   apvgainVector_.push_back(&apvgain);
   normVector_.push_back(factor);
 }
 
-void SiStripGain::fillNewGain(const SiStripApvGain * apvgain, const double & factor,
-		 const SiStripApvGain * apvgain2, const double & factor2)
-{
-  SiStripApvGain * newApvGain = new SiStripApvGain;
+void SiStripGain::fillNewGain(const SiStripApvGain *apvgain,
+                              const double &factor,
+                              const SiStripApvGain *apvgain2,
+                              const double &factor2) {
+  SiStripApvGain *newApvGain = new SiStripApvGain;
   edm::FileInPath fp("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
   SiStripDetInfoFileReader reader(fp.fullPath());
-  const std::map<uint32_t, SiStripDetInfoFileReader::DetInfo>& DetInfos = reader.getAllData();
+  const std::map<uint32_t, SiStripDetInfoFileReader::DetInfo> &DetInfos = reader.getAllData();
 
-  // Loop on the apvgain in input and fill the newApvGain with the values/factor.
+  // Loop on the apvgain in input and fill the newApvGain with the
+  // values/factor.
   std::vector<uint32_t> detIds;
   apvgain->getDetIds(detIds);
   std::vector<uint32_t>::const_iterator it = detIds.begin();
-  for( ; it != detIds.end(); ++it ) {
-
+  for (; it != detIds.end(); ++it) {
     std::map<uint32_t, SiStripDetInfoFileReader::DetInfo>::const_iterator detInfoIt = DetInfos.find(*it);
-    if( detInfoIt != DetInfos.end() ) {
-
+    if (detInfoIt != DetInfos.end()) {
       std::vector<float> theSiStripVector;
 
       // Loop on all the apvs and then on the strips
       SiStripApvGain::Range range = apvgain->getRange(*it);
 
       SiStripApvGain::Range range2;
-      if( apvgain2 != nullptr ) {
-	range2 = apvgain2->getRange(*it);
+      if (apvgain2 != nullptr) {
+        range2 = apvgain2->getRange(*it);
       }
 
-      for( int apv = 0; apv < detInfoIt->second.nApvs; ++apv ) {
-	float apvGainValue = apvgain->getApvGain( apv, range )/factor;
+      for (int apv = 0; apv < detInfoIt->second.nApvs; ++apv) {
+        float apvGainValue = apvgain->getApvGain(apv, range) / factor;
 
-	if( (apvgain2 != nullptr) && (factor2 != 0.) ) {
-	  apvGainValue *= apvgain2->getApvGain( apv, range2 )/factor2;
-	}
+        if ((apvgain2 != nullptr) && (factor2 != 0.)) {
+          apvGainValue *= apvgain2->getApvGain(apv, range2) / factor2;
+        }
 
-	theSiStripVector.push_back(apvGainValue);
+        theSiStripVector.push_back(apvGainValue);
       }
       SiStripApvGain::Range inputRange(theSiStripVector.begin(), theSiStripVector.end());
-      if( ! newApvGain->put(*it, inputRange) ) {
-	edm::LogError("SiStripGain") << "detid already exists" << std::endl;
+      if (!newApvGain->put(*it, inputRange)) {
+        edm::LogError("SiStripGain") << "detid already exists" << std::endl;
       }
     }
   }
@@ -83,69 +83,56 @@ void SiStripGain::fillNewGain(const SiStripApvGain * apvgain, const double & fac
   apvgainAutoPtr_.reset(newApvGain);
 }
 
-
-
-float SiStripGain::getStripGain(const uint16_t& strip, const SiStripApvGain::Range& range, const uint32_t index) const
-{
-  if( !(apvgainVector_.empty()) ) {
-    return( apvgainVector_[index]->getStripGain(strip, range) );
+float SiStripGain::getStripGain(const uint16_t &strip, const SiStripApvGain::Range &range, const uint32_t index) const {
+  if (!(apvgainVector_.empty())) {
+    return (apvgainVector_[index]->getStripGain(strip, range));
   }
   edm::LogError("SiStripGain::getStripGain") << "ERROR: no gain available. Returning gain = 1." << std::endl;
   return 1.;
 }
 
-
-
-float SiStripGain::getApvGain(const uint16_t& apv, const SiStripApvGain::Range& range, const uint32_t index) const
-{
-  if( !(apvgainVector_.empty()) ) {
-    return (apvgainVector_[index]->getApvGain(apv, range))/(normVector_[index]);
+float SiStripGain::getApvGain(const uint16_t &apv, const SiStripApvGain::Range &range, const uint32_t index) const {
+  if (!(apvgainVector_.empty())) {
+    return (apvgainVector_[index]->getApvGain(apv, range)) / (normVector_[index]);
   }
   edm::LogError("SiStripGain::getApvGain") << "ERROR: no gain available. Returning gain = 1." << std::endl;
   return 1.;
 }
 
-void SiStripGain::getDetIds(std::vector<uint32_t>& DetIds_) const
-{
+void SiStripGain::getDetIds(std::vector<uint32_t> &DetIds_) const {
   // ATTENTION: we assume the detIds are the same as those from the first gain
   return apvgain_->getDetIds(DetIds_);
 }
 
-
-const SiStripApvGain::Range SiStripGain::getRange(const uint32_t& DetId, const uint32_t index) const
-{
+const SiStripApvGain::Range SiStripGain::getRange(const uint32_t &DetId, const uint32_t index) const {
   return apvgainVector_[index]->getRange(DetId);
 }
 
-void SiStripGain::printDebug(std::stringstream & ss, const TrackerTopology* /*trackerTopo*/) const
-{
+void SiStripGain::printDebug(std::stringstream &ss, const TrackerTopology * /*trackerTopo*/) const {
   std::vector<unsigned int> detIds;
   getDetIds(detIds);
   std::vector<unsigned int>::const_iterator detid = detIds.begin();
   ss << "Number of detids " << detIds.size() << std::endl;
 
-  for( ; detid != detIds.end(); ++detid ) {
+  for (; detid != detIds.end(); ++detid) {
     SiStripApvGain::Range range = getRange(*detid);
-    int apv=0;
-    for( int it=0; it < range.second - range.first; ++it ) {
+    int apv = 0;
+    for (int it = 0; it < range.second - range.first; ++it) {
       ss << "detid " << *detid << " \t"
-	 << " apv " << apv++ << " \t"
-	 << getApvGain(it,range) << " \t"
-	 << std::endl;
+         << " apv " << apv++ << " \t" << getApvGain(it, range) << " \t" << std::endl;
     }
   }
 }
 
-void SiStripGain::printSummary(std::stringstream& ss, const TrackerTopology* trackerTopo) const
-{
+void SiStripGain::printSummary(std::stringstream &ss, const TrackerTopology *trackerTopo) const {
   SiStripDetSummary summaryGain{trackerTopo};
 
   std::vector<unsigned int> detIds;
   getDetIds(detIds);
   std::vector<uint32_t>::const_iterator detid = detIds.begin();
-  for( ; detid != detIds.end(); ++detid ) {
+  for (; detid != detIds.end(); ++detid) {
     SiStripApvGain::Range range = getRange(*detid);
-    for( int it=0; it < range.second - range.first; ++it ) {
+    for (int it = 0; it < range.second - range.first; ++it) {
       summaryGain.add(*detid, getApvGain(it, range));
     }
   }
diff --git a/CalibFormats/SiStripObjects/src/SiStripHashedDetId.cc b/CalibFormats/SiStripObjects/src/SiStripHashedDetId.cc
index ed6a1b0379fcb..1e789185a7f1d 100644
--- a/CalibFormats/SiStripObjects/src/SiStripHashedDetId.cc
+++ b/CalibFormats/SiStripObjects/src/SiStripHashedDetId.cc
@@ -2,105 +2,79 @@
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 #include <sstream>
 
 using namespace sistrip;
 
 // -----------------------------------------------------------------------------
 //
-SiStripHashedDetId::SiStripHashedDetId( const std::vector<uint32_t>& raw_ids ) 
-  : detIds_(),
-    id_(0),
-    iter_(detIds_.begin())
-{
-  LogTrace(mlCabling_)
-    << "[SiStripHashedDetId::" << __func__ << "]"
-    << " Constructing object...";
+SiStripHashedDetId::SiStripHashedDetId(const std::vector<uint32_t> &raw_ids)
+    : detIds_(), id_(0), iter_(detIds_.begin()) {
+  LogTrace(mlCabling_) << "[SiStripHashedDetId::" << __func__ << "]"
+                       << " Constructing object...";
   init(raw_ids);
 }
 
 // -----------------------------------------------------------------------------
 //
-SiStripHashedDetId::SiStripHashedDetId( const std::vector<DetId>& det_ids ) 
-  : detIds_(),
-    id_(0),
-    iter_(detIds_.begin())
-{
-  LogTrace(mlCabling_)
-    << "[SiStripHashedDetId::" << __func__ << "]"
-    << " Constructing object...";
+SiStripHashedDetId::SiStripHashedDetId(const std::vector<DetId> &det_ids) : detIds_(), id_(0), iter_(detIds_.begin()) {
+  LogTrace(mlCabling_) << "[SiStripHashedDetId::" << __func__ << "]"
+                       << " Constructing object...";
   detIds_.clear();
   detIds_.reserve(16000);
   std::vector<DetId>::const_iterator iter = det_ids.begin();
-  for ( ; iter != det_ids.end(); ++iter ) {
-    detIds_.push_back( iter->rawId() );
+  for (; iter != det_ids.end(); ++iter) {
+    detIds_.push_back(iter->rawId());
   }
   init(detIds_);
 }
 
 // -----------------------------------------------------------------------------
 //
-SiStripHashedDetId::SiStripHashedDetId( const SiStripHashedDetId& input ) 
-  : detIds_(),
-    id_(0),
-    iter_(detIds_.begin())
-{
-  LogTrace(mlCabling_)
-    << "[SiStripHashedDetId::" << __func__ << "]"
-    << " Constructing object...";
-  detIds_.reserve( input.end() - input.begin() );
-  std::copy( input.begin(), input.end(), detIds_.begin() );
+SiStripHashedDetId::SiStripHashedDetId(const SiStripHashedDetId &input) : detIds_(), id_(0), iter_(detIds_.begin()) {
+  LogTrace(mlCabling_) << "[SiStripHashedDetId::" << __func__ << "]"
+                       << " Constructing object...";
+  detIds_.reserve(input.end() - input.begin());
+  std::copy(input.begin(), input.end(), detIds_.begin());
 }
 
 // -----------------------------------------------------------------------------
 //
-SiStripHashedDetId::SiStripHashedDetId() 
-  : detIds_(),
-    id_(0),
-    iter_(detIds_.begin())
-{
-  LogTrace(mlCabling_) 
-    << "[SiStripHashedDetId::" << __func__ << "]"
-    << " Constructing object...";
+SiStripHashedDetId::SiStripHashedDetId() : detIds_(), id_(0), iter_(detIds_.begin()) {
+  LogTrace(mlCabling_) << "[SiStripHashedDetId::" << __func__ << "]"
+                       << " Constructing object...";
 }
 
 // -----------------------------------------------------------------------------
 //
 SiStripHashedDetId::~SiStripHashedDetId() {
-  LogTrace(mlCabling_)
-    << "[SiStripHashedDetId::" << __func__ << "]"
-    << " Destructing object...";
+  LogTrace(mlCabling_) << "[SiStripHashedDetId::" << __func__ << "]"
+                       << " Destructing object...";
   detIds_.clear();
 }
 
 // -----------------------------------------------------------------------------
 //
-void SiStripHashedDetId::init( const std::vector<uint32_t>& raw_ids ) {
+void SiStripHashedDetId::init(const std::vector<uint32_t> &raw_ids) {
   detIds_.clear();
   detIds_.reserve(16000);
   const_iterator iter = raw_ids.begin();
-  for ( ; iter != raw_ids.end(); ++iter ) {
-    DetId detectorId=DetId(*iter);
-    if ( *iter != sistrip::invalid32_ && 
-	 *iter != sistrip::invalid_ && 
-	 detectorId.det() == DetId::Tracker &&
-	 ( detectorId.subdetId() == StripSubdetector::TID ||
-	   detectorId.subdetId() == StripSubdetector::TIB ||
-	   detectorId.subdetId() == StripSubdetector::TOB ||
-	   detectorId.subdetId() == StripSubdetector::TEC ) ) {
+  for (; iter != raw_ids.end(); ++iter) {
+    DetId detectorId = DetId(*iter);
+    if (*iter != sistrip::invalid32_ && *iter != sistrip::invalid_ && detectorId.det() == DetId::Tracker &&
+        (detectorId.subdetId() == StripSubdetector::TID || detectorId.subdetId() == StripSubdetector::TIB ||
+         detectorId.subdetId() == StripSubdetector::TOB || detectorId.subdetId() == StripSubdetector::TEC)) {
       detIds_.push_back(*iter);
     } else {
-      edm::LogWarning(mlCabling_)
-	<< "[SiStripHashedDetId::" << __func__ << "]"
-	<< " DetId 0x" 
-	<< std::hex << std::setw(8) << std::setfill('0') << *iter
-	<< " is not from the strip tracker!";
+      edm::LogWarning(mlCabling_) << "[SiStripHashedDetId::" << __func__ << "]"
+                                  << " DetId 0x" << std::hex << std::setw(8) << std::setfill('0') << *iter
+                                  << " is not from the strip tracker!";
     }
   }
-  if ( !detIds_.empty() ) {
-    std::sort( detIds_.begin(), detIds_.end() );
+  if (!detIds_.empty()) {
+    std::sort(detIds_.begin(), detIds_.end());
     id_ = detIds_.front();
     iter_ = detIds_.begin();
   }
@@ -108,20 +82,14 @@ void SiStripHashedDetId::init( const std::vector<uint32_t>& raw_ids ) {
 
 // -----------------------------------------------------------------------------
 //
-std::ostream& operator<< ( std::ostream& os, const SiStripHashedDetId& input ) {
+std::ostream &operator<<(std::ostream &os, const SiStripHashedDetId &input) {
   std::stringstream ss;
   ss << "[SiStripHashedDetId::" << __func__ << "]"
-     << " Found " << input.end() - input.begin()
-     << " entries in DetId hash map:"
-     << std::endl;
+     << " Found " << input.end() - input.begin() << " entries in DetId hash map:" << std::endl;
   SiStripHashedDetId::const_iterator iter = input.begin();
-  for ( ; iter != input.end(); ++iter ) {
-    ss << " Index: "
-       << std::dec << std::setw(5) << std::setfill(' ')
-       << iter - input.begin() 
-       << "  DetId: 0x"
-       << std::hex << std::setw(8) << std::setfill('0')
-       << *iter << std::endl;
+  for (; iter != input.end(); ++iter) {
+    ss << " Index: " << std::dec << std::setw(5) << std::setfill(' ') << iter - input.begin() << "  DetId: 0x"
+       << std::hex << std::setw(8) << std::setfill('0') << *iter << std::endl;
   }
   os << ss.str();
   return os;
diff --git a/CalibFormats/SiStripObjects/src/SiStripModule.cc b/CalibFormats/SiStripObjects/src/SiStripModule.cc
index 864aa4c9d6c29..57148fa3b442e 100644
--- a/CalibFormats/SiStripObjects/src/SiStripModule.cc
+++ b/CalibFormats/SiStripObjects/src/SiStripModule.cc
@@ -2,138 +2,146 @@
 #include "CalibFormats/SiStripObjects/interface/SiStripModule.h"
 #include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
 using namespace sistrip;
 
 // -----------------------------------------------------------------------------
 //
-SiStripModule::SiStripModule( const FedChannelConnection& conn ) 
-  : key_( conn.fecCrate(), 
-	  conn.fecSlot(), 
-	  conn.fecRing(), 
-	  conn.ccuAddr(), 
-	  conn.ccuChan() ),
-    apv32_(0), 
-    apv33_(0), 
-    apv34_(0), 
-    apv35_(0), 
-    apv36_(0), 
-    apv37_(0), 
-    dcu0x00_(0), 
-    mux0x43_(0), 
-    pll0x44_(0), 
-    lld0x60_(0), 
-    dcuId_(0), 
-    detId_(0), 
-    nApvPairs_(0),
-    cabling_(), 
-    length_(0) 
-{ 
-  addDevices( conn ); 
+SiStripModule::SiStripModule(const FedChannelConnection &conn)
+    : key_(conn.fecCrate(), conn.fecSlot(), conn.fecRing(), conn.ccuAddr(), conn.ccuChan()),
+      apv32_(0),
+      apv33_(0),
+      apv34_(0),
+      apv35_(0),
+      apv36_(0),
+      apv37_(0),
+      dcu0x00_(0),
+      mux0x43_(0),
+      pll0x44_(0),
+      lld0x60_(0),
+      dcuId_(0),
+      detId_(0),
+      nApvPairs_(0),
+      cabling_(),
+      length_(0) {
+  addDevices(conn);
 }
 
 // -----------------------------------------------------------------------------
 //
-void SiStripModule::addDevices( const FedChannelConnection& conn ) {
-  
-  if ( key_.fecCrate() && key_.fecCrate() != conn.fecCrate() ) {
-    edm::LogWarning(mlCabling_)
-      << "SiStripModule::" << __func__ << "]"
-      << " Unexpected FEC crate ("
-      << conn.fecCrate() << ") for this module ("
-      << key_.fecCrate() << ")!";
+void SiStripModule::addDevices(const FedChannelConnection &conn) {
+  if (key_.fecCrate() && key_.fecCrate() != conn.fecCrate()) {
+    edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                << " Unexpected FEC crate (" << conn.fecCrate() << ") for this module ("
+                                << key_.fecCrate() << ")!";
     return;
   }
 
-  if ( key_.fecSlot() && key_.fecSlot() != conn.fecSlot() ) {
-    edm::LogWarning(mlCabling_)
-            << "SiStripModule::" << __func__ << "]"
-	    << " Unexpected FEC slot ("
-	    << conn.fecSlot() << ") for this module ("
-	    << key_.fecSlot() << ")!";
+  if (key_.fecSlot() && key_.fecSlot() != conn.fecSlot()) {
+    edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                << " Unexpected FEC slot (" << conn.fecSlot() << ") for this module (" << key_.fecSlot()
+                                << ")!";
     return;
   }
 
-  if ( key_.fecRing() && key_.fecRing() != conn.fecRing() ) {
-    edm::LogWarning(mlCabling_)
-      << "SiStripModule::" << __func__ << "]"
-      << " Unexpected FEC ring ("
-      << conn.fecRing() << ") for this module ("
-      << key_.fecRing() << ")!";
+  if (key_.fecRing() && key_.fecRing() != conn.fecRing()) {
+    edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                << " Unexpected FEC ring (" << conn.fecRing() << ") for this module (" << key_.fecRing()
+                                << ")!";
     return;
   }
 
-  if ( key_.ccuAddr() && key_.ccuAddr() != conn.ccuAddr() ) {
-    edm::LogWarning(mlCabling_)
-      << "SiStripModule::" << __func__ << "]"
-      << " Unexpected CCU addr ("
-      << conn.ccuAddr() << ") for this module ("
-      << key_.ccuAddr() << ")!";
+  if (key_.ccuAddr() && key_.ccuAddr() != conn.ccuAddr()) {
+    edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                << " Unexpected CCU addr (" << conn.ccuAddr() << ") for this module (" << key_.ccuAddr()
+                                << ")!";
     return;
   }
 
-  if ( key_.ccuChan() && key_.ccuChan() != conn.ccuChan() ) {
-    edm::LogWarning(mlCabling_)
-      << "SiStripModule::" << __func__ << "]"
-      << " Unexpected CCU chan ("
-      << conn.ccuChan() << ") for this module ("
-      << key_.ccuChan() << ")!";
+  if (key_.ccuChan() && key_.ccuChan() != conn.ccuChan()) {
+    edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                << " Unexpected CCU chan (" << conn.ccuChan() << ") for this module (" << key_.ccuChan()
+                                << ")!";
     return;
   }
 
   // APVs
-  if ( conn.i2cAddr(0) ) { addApv( conn.i2cAddr(0) ); }
-  if ( conn.i2cAddr(1) ) { addApv( conn.i2cAddr(1) ); }
-  
+  if (conn.i2cAddr(0)) {
+    addApv(conn.i2cAddr(0));
+  }
+  if (conn.i2cAddr(1)) {
+    addApv(conn.i2cAddr(1));
+  }
+
   // Detector
-  dcuId( conn.dcuId() ); 
-  detId( conn.detId() ); 
-  nApvPairs( conn.nApvPairs() ); 
-  
+  dcuId(conn.dcuId());
+  detId(conn.detId());
+  nApvPairs(conn.nApvPairs());
+
   // FED cabling
-  FedChannel fed_ch( conn.fedCrate(), 
-		     conn.fedSlot(), 
-		     conn.fedId(), 
-		     conn.fedCh() ); 
-  fedCh( conn.i2cAddr(0), fed_ch );
-  
+  FedChannel fed_ch(conn.fedCrate(), conn.fedSlot(), conn.fedId(), conn.fedCh());
+  fedCh(conn.i2cAddr(0), fed_ch);
+
   // DCU, MUX, PLL, LLD
-  if ( conn.dcu() ) { dcu0x00_ = true; }
-  if ( conn.mux() ) { mux0x43_ = true; }
-  if ( conn.pll() ) { pll0x44_ = true; }
-  if ( conn.lld() ) { lld0x60_ = true; }
-  
+  if (conn.dcu()) {
+    dcu0x00_ = true;
+  }
+  if (conn.mux()) {
+    mux0x43_ = true;
+  }
+  if (conn.pll()) {
+    pll0x44_ = true;
+  }
+  if (conn.lld()) {
+    lld0x60_ = true;
+  }
 }
 
 // -----------------------------------------------------------------------------
 //
 std::vector<uint16_t> SiStripModule::activeApvs() const {
   std::vector<uint16_t> apvs;
-  if ( apv32_ ) { apvs.push_back( apv32_ ); }
-  if ( apv33_ ) { apvs.push_back( apv33_ ); }
-  if ( apv34_ ) { apvs.push_back( apv34_ ); }
-  if ( apv35_ ) { apvs.push_back( apv35_ ); }
-  if ( apv36_ ) { apvs.push_back( apv36_ ); }
-  if ( apv37_ ) { apvs.push_back( apv37_ ); }
+  if (apv32_) {
+    apvs.push_back(apv32_);
+  }
+  if (apv33_) {
+    apvs.push_back(apv33_);
+  }
+  if (apv34_) {
+    apvs.push_back(apv34_);
+  }
+  if (apv35_) {
+    apvs.push_back(apv35_);
+  }
+  if (apv36_) {
+    apvs.push_back(apv36_);
+  }
+  if (apv37_) {
+    apvs.push_back(apv37_);
+  }
   return apvs;
 }
 
 // -----------------------------------------------------------------------------
 //
- const uint16_t& SiStripModule::activeApv( const uint16_t& apv_address ) const {
-  if      ( apv_address == 0 || apv_address == 32 ) { return apv32_; }
-  else if ( apv_address == 1 || apv_address == 33 ) { return apv33_; }
-  else if ( apv_address == 2 || apv_address == 34 ) { return apv34_; }
-  else if ( apv_address == 3 || apv_address == 35 ) { return apv35_; }
-  else if ( apv_address == 4 || apv_address == 36 ) { return apv36_; }
-  else if ( apv_address == 5 || apv_address == 37 ) { return apv37_; }
-  else {
-    edm::LogWarning(mlCabling_)
-      << "SiStripModule::" << __func__ << "]"
-      << " Unexpected I2C address or number (" 
-      << apv_address << ") for this module!";
+const uint16_t &SiStripModule::activeApv(const uint16_t &apv_address) const {
+  if (apv_address == 0 || apv_address == 32) {
+    return apv32_;
+  } else if (apv_address == 1 || apv_address == 33) {
+    return apv33_;
+  } else if (apv_address == 2 || apv_address == 34) {
+    return apv34_;
+  } else if (apv_address == 3 || apv_address == 35) {
+    return apv35_;
+  } else if (apv_address == 4 || apv_address == 36) {
+    return apv36_;
+  } else if (apv_address == 5 || apv_address == 37) {
+    return apv37_;
+  } else {
+    edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                << " Unexpected I2C address or number (" << apv_address << ") for this module!";
   }
   static const uint16_t address = 0;
   return address;
@@ -141,300 +149,292 @@ std::vector<uint16_t> SiStripModule::activeApvs() const {
 
 // -----------------------------------------------------------------------------
 //
-void SiStripModule::addApv( const uint16_t& apv_address ) {
-
+void SiStripModule::addApv(const uint16_t &apv_address) {
   // Some checks on value of APV I2C address
-  if ( apv_address == 0 ) {
-    edm::LogWarning(mlCabling_)
-      << "SiStripModule::" << __func__ << "]"
-      << " Null APV I2C address!"; 
+  if (apv_address == 0) {
+    edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                << " Null APV I2C address!";
     return;
-  } else if ( apv_address < 32 && apv_address > 37 ) {
-    edm::LogWarning(mlCabling_)
-            << "SiStripModule::" << __func__ << "]"
-	    << " Unexpected I2C address (" 
-	    << apv_address << ") for APV!"; 
+  } else if (apv_address < 32 && apv_address > 37) {
+    edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                << " Unexpected I2C address (" << apv_address << ") for APV!";
     return;
   }
 
-  bool added_apv = false; 
-  if      ( !apv32_ && apv_address == 32 ) { apv32_ = 32; added_apv = true; }
-  else if ( !apv33_ && apv_address == 33 ) { apv33_ = 33; added_apv = true; }
-  else if ( !apv34_ && apv_address == 34 ) { apv34_ = 34; added_apv = true; }
-  else if ( !apv35_ && apv_address == 35 ) { apv35_ = 35; added_apv = true; }
-  else if ( !apv36_ && apv_address == 36 ) { apv36_ = 36; added_apv = true; }
-  else if ( !apv37_ && apv_address == 37 ) { apv37_ = 37; added_apv = true; }
-  
+  bool added_apv = false;
+  if (!apv32_ && apv_address == 32) {
+    apv32_ = 32;
+    added_apv = true;
+  } else if (!apv33_ && apv_address == 33) {
+    apv33_ = 33;
+    added_apv = true;
+  } else if (!apv34_ && apv_address == 34) {
+    apv34_ = 34;
+    added_apv = true;
+  } else if (!apv35_ && apv_address == 35) {
+    apv35_ = 35;
+    added_apv = true;
+  } else if (!apv36_ && apv_address == 36) {
+    apv36_ = 36;
+    added_apv = true;
+  } else if (!apv37_ && apv_address == 37) {
+    apv37_ = 37;
+    added_apv = true;
+  }
+
   std::stringstream ss;
   ss << "SiStripModule::" << __func__ << "]";
-  if ( added_apv ) { ss << " Added new APV for"; }
-  else { ss << " APV already exists for"; }
-  ss << " Crate/FEC/Ring/CCU/Module: "
-     << key_.fecCrate() << "/"
-     << key_.fecSlot() << "/"
-     << key_.fecRing() << "/"
-     << key_.ccuAddr() << "/"
-     << key_.ccuChan() << "/"
-     << apv_address;
-  //if ( added_apv ) { LogTrace(mlCabling_) << ss.str(); }
-  /* else */ if ( !added_apv ) { edm::LogWarning(mlCabling_) << ss.str(); }
-  
+  if (added_apv) {
+    ss << " Added new APV for";
+  } else {
+    ss << " APV already exists for";
+  }
+  ss << " Crate/FEC/Ring/CCU/Module: " << key_.fecCrate() << "/" << key_.fecSlot() << "/" << key_.fecRing() << "/"
+     << key_.ccuAddr() << "/" << key_.ccuChan() << "/" << apv_address;
+  // if ( added_apv ) { LogTrace(mlCabling_) << ss.str(); }
+  /* else */ if (!added_apv) { edm::LogWarning(mlCabling_) << ss.str(); }
 }
 
 // -----------------------------------------------------------------------------
 //
-void SiStripModule::nApvPairs( const uint16_t& npairs ) { 
-  if ( npairs == 2 || npairs == 3 ) { nApvPairs_ = npairs; } 
-  else if ( npairs == 0 ) {
+void SiStripModule::nApvPairs(const uint16_t &npairs) {
+  if (npairs == 2 || npairs == 3) {
+    nApvPairs_ = npairs;
+  } else if (npairs == 0) {
     nApvPairs_ = 0;
-    if ( apv32_ || apv33_ ) { nApvPairs_++; }
-    if ( apv34_ || apv35_ ) { nApvPairs_++; }
-    if ( apv36_ || apv37_ ) { nApvPairs_++; }
-  } else { 
-    edm::LogWarning(mlCabling_)
-      << "SiStripModule::" << __func__ << "]"
-      << " Unexpected number of APV pairs: " 
-      << npairs;
+    if (apv32_ || apv33_) {
+      nApvPairs_++;
+    }
+    if (apv34_ || apv35_) {
+      nApvPairs_++;
+    }
+    if (apv36_ || apv37_) {
+      nApvPairs_++;
+    }
+  } else {
+    edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                << " Unexpected number of APV pairs: " << npairs;
   }
-} 
+}
 
 // -----------------------------------------------------------------------------
 //
-SiStripModule::PairOfU16 SiStripModule::activeApvPair( const uint16_t& lld_channel ) const {
-  if      ( lld_channel == 1 ) { return PairOfU16(apv32_,apv33_); }
-  else if ( lld_channel == 2 ) { return PairOfU16(apv34_,apv35_); }
-  else if ( lld_channel == 3 ) { return PairOfU16(apv36_,apv37_); }
-  else { 
-    edm::LogWarning(mlCabling_)
-      << "SiStripModule::" << __func__ << "]"
-      << " Unexpected LLD channel: " << lld_channel;
-    return PairOfU16(0,0); 
+SiStripModule::PairOfU16 SiStripModule::activeApvPair(const uint16_t &lld_channel) const {
+  if (lld_channel == 1) {
+    return PairOfU16(apv32_, apv33_);
+  } else if (lld_channel == 2) {
+    return PairOfU16(apv34_, apv35_);
+  } else if (lld_channel == 3) {
+    return PairOfU16(apv36_, apv37_);
+  } else {
+    edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                << " Unexpected LLD channel: " << lld_channel;
+    return PairOfU16(0, 0);
   }
 }
 
 // -----------------------------------------------------------------------------
 //
-uint16_t SiStripModule::lldChannel( const uint16_t& apv_pair_num ) const {
-  if ( apv_pair_num > 2 ) {
-    edm::LogWarning(mlCabling_)
-      << "SiStripModule::" << __func__ << "]"
-      << " Unexpected APV pair number: " << apv_pair_num;
+uint16_t SiStripModule::lldChannel(const uint16_t &apv_pair_num) const {
+  if (apv_pair_num > 2) {
+    edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                << " Unexpected APV pair number: " << apv_pair_num;
     return 0;
   }
-  if ( nApvPairs_ != 2 && nApvPairs_ != 3 ) {
-    edm::LogWarning(mlCabling_)
-      << "SiStripModule::" << __func__ << "]"
-      << " Unexpected number of APV pairs: " << nApvPairs_;
+  if (nApvPairs_ != 2 && nApvPairs_ != 3) {
+    edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                << " Unexpected number of APV pairs: " << nApvPairs_;
     return 0;
   }
-  if ( nApvPairs_ == 2 && apv_pair_num == 1 ) { return 3; }
-  else if ( nApvPairs_ == 2 && apv_pair_num == 2 ) { 
-    edm::LogWarning(mlCabling_)
-      << "[SiStripFecCabling::" << __func__ << "]"
-      << " APV pair number is incompatible with"
-      << " respect to number of !";
+  if (nApvPairs_ == 2 && apv_pair_num == 1) {
+    return 3;
+  } else if (nApvPairs_ == 2 && apv_pair_num == 2) {
+    edm::LogWarning(mlCabling_) << "[SiStripFecCabling::" << __func__ << "]"
+                                << " APV pair number is incompatible with"
+                                << " respect to number of !";
     return 0;
-  } else { return apv_pair_num + 1; } 
+  } else {
+    return apv_pair_num + 1;
+  }
 }
 
 // -----------------------------------------------------------------------------
 //
-uint16_t SiStripModule::apvPairNumber( const uint16_t& lld_channel ) const {
-  if ( lld_channel < 1 || lld_channel > 3 ) {
-    edm::LogWarning(mlCabling_)
-      << "SiStripModule::" << __func__ << "]"
-      << " Unexpected LLD channel: " << lld_channel;
+uint16_t SiStripModule::apvPairNumber(const uint16_t &lld_channel) const {
+  if (lld_channel < 1 || lld_channel > 3) {
+    edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                << " Unexpected LLD channel: " << lld_channel;
     return 0;
   }
-  if ( nApvPairs_ != 2 && nApvPairs_ != 3 ) {
-    edm::LogWarning(mlCabling_)
-      << "SiStripModule::" << __func__ << "]"
-      << " Unexpected number of APV pairs: " << nApvPairs_;
+  if (nApvPairs_ != 2 && nApvPairs_ != 3) {
+    edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                << " Unexpected number of APV pairs: " << nApvPairs_;
     return 0;
   }
-  if ( nApvPairs_ == 2 && lld_channel == 3 ) { return 1; }
-  else if ( nApvPairs_ == 2 && lld_channel == 2 ) { 
-    edm::LogWarning(mlCabling_)
-      << "SiStripModule::" << __func__ << "]"
-      << " LLD channel is incompatible with"
-      << " respect to number of APV pairs!";
+  if (nApvPairs_ == 2 && lld_channel == 3) {
+    return 1;
+  } else if (nApvPairs_ == 2 && lld_channel == 2) {
+    edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                << " LLD channel is incompatible with"
+                                << " respect to number of APV pairs!";
     return 0;
-  } else { return lld_channel - 1; }
+  } else {
+    return lld_channel - 1;
+  }
 }
 
 // -----------------------------------------------------------------------------
 //
-SiStripModule::FedChannel SiStripModule::fedCh( const uint16_t& apv_pair ) const {
+SiStripModule::FedChannel SiStripModule::fedCh(const uint16_t &apv_pair) const {
+  FedChannel fed_ch(0, 0, 0, 0);
 
-  FedChannel fed_ch(0,0,0,0);
-  
-  if ( !nApvPairs() ) {
-    
-    edm::LogWarning(mlCabling_)
-      << "SiStripModule::" << __func__ << "]"
-      << " No APV pairs exist!";
-    return fed_ch; 
+  if (!nApvPairs()) {
+    edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                << " No APV pairs exist!";
+    return fed_ch;
 
   } else {
-
     uint16_t lld_ch = 0;
-    if ( nApvPairs() == 2 ) {
-
-      if      ( apv_pair == 0 ) { lld_ch = 1; }
-      else if ( apv_pair == 1 ) { lld_ch = 3; }
-      else { 
-	edm::LogWarning(mlCabling_)
-	  << "SiStripModule::" << __func__ << "]"
-	  << " Unexpected pair number! " << apv_pair;
+    if (nApvPairs() == 2) {
+      if (apv_pair == 0) {
+        lld_ch = 1;
+      } else if (apv_pair == 1) {
+        lld_ch = 3;
+      } else {
+        edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                    << " Unexpected pair number! " << apv_pair;
       }
 
-    } else if ( nApvPairs() == 3 ) {
-
-      if      ( apv_pair == 0 ) { lld_ch = 1; }
-      else if ( apv_pair == 1 ) { lld_ch = 2; }
-      else if ( apv_pair == 2 ) { lld_ch = 3; }
-      else { 
-	edm::LogWarning(mlCabling_)
-	  << "SiStripModule::" << __func__ << "]"
-	  << " Unexpected pair number! " << apv_pair;
+    } else if (nApvPairs() == 3) {
+      if (apv_pair == 0) {
+        lld_ch = 1;
+      } else if (apv_pair == 1) {
+        lld_ch = 2;
+      } else if (apv_pair == 2) {
+        lld_ch = 3;
+      } else {
+        edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                    << " Unexpected pair number! " << apv_pair;
       }
 
     } else {
-
-      edm::LogWarning(mlCabling_) 
-	<< "SiStripModule::" << __func__ << "]"
-	<< " Unexpected number of APV pairs: " << nApvPairs();
-
+      edm::LogWarning(mlCabling_) << "SiStripModule::" << __func__ << "]"
+                                  << " Unexpected number of APV pairs: " << nApvPairs();
     }
-    
-    FedCabling::const_iterator ipair = cabling_.find( lld_ch );
-    if ( ipair != cabling_.end() ) { return (*ipair).second; }
-    else { return fed_ch; }
 
+    FedCabling::const_iterator ipair = cabling_.find(lld_ch);
+    if (ipair != cabling_.end()) {
+      return (*ipair).second;
+    } else {
+      return fed_ch;
+    }
   }
-
 }
 
 // -----------------------------------------------------------------------------
 //
-bool SiStripModule::fedCh( const uint16_t& apv_address, 
-			   const FedChannel& fed_ch ) {
+bool SiStripModule::fedCh(const uint16_t &apv_address, const FedChannel &fed_ch) {
   // Determine LLD channel
   int16_t lld_ch = 1;
-  if      ( apv_address == 32 || apv_address == 33 ) { lld_ch = 1; }
-  else if ( apv_address == 34 || apv_address == 35 ) { lld_ch = 2; }
-  else if ( apv_address == 36 || apv_address == 37 ) { lld_ch = 3; }
-  else if ( apv_address == 0 ) { ; } //@@ do nothing?
-  else { 
-    edm::LogWarning(mlCabling_) << "[SiStripModule::fedCh]" 
-				<< " Unexpected I2C address (" 
-				<< apv_address << ") for APV!"; 
+  if (apv_address == 32 || apv_address == 33) {
+    lld_ch = 1;
+  } else if (apv_address == 34 || apv_address == 35) {
+    lld_ch = 2;
+  } else if (apv_address == 36 || apv_address == 37) {
+    lld_ch = 3;
+  } else if (apv_address == 0) {
+    ;
+  }  //@@ do nothing?
+  else {
+    edm::LogWarning(mlCabling_) << "[SiStripModule::fedCh]"
+                                << " Unexpected I2C address (" << apv_address << ") for APV!";
     return false;
   }
   // Search for entry in std::map
-  //@@ use FedKey as key instead of lld chan? what about "duplicates"? 
+  //@@ use FedKey as key instead of lld chan? what about "duplicates"?
   //@@ always append to std::map? then can have >3 entries. useful for debug?
-  FedCabling::iterator ipair = cabling_.find( lld_ch );
-  if ( ipair == cabling_.end() ) { cabling_[lld_ch] = fed_ch; }
-  else { ipair->second = fed_ch; }
+  FedCabling::iterator ipair = cabling_.find(lld_ch);
+  if (ipair == cabling_.end()) {
+    cabling_[lld_ch] = fed_ch;
+  } else {
+    ipair->second = fed_ch;
+  }
   return true;
 }
 
 // -----------------------------------------------------------------------------
 //
-void SiStripModule::print( std::stringstream& ss ) const {
-
+void SiStripModule::print(std::stringstream &ss) const {
   ss << " [SiStripModule::" << __func__ << "]" << std::endl
-     << " Crate/FEC/Ring/CCU/Module               : "
-     << key().fecCrate() << "/"
-     << key().fecSlot() << "/"
-     << key().fecRing() << "/"
-     << key().ccuAddr() << "/"
-     << key().ccuChan() << std::endl;
+     << " Crate/FEC/Ring/CCU/Module               : " << key().fecCrate() << "/" << key().fecSlot() << "/"
+     << key().fecRing() << "/" << key().ccuAddr() << "/" << key().ccuChan() << std::endl;
 
   ss << " ActiveApvs                              : ";
   std::vector<uint16_t> apvs = activeApvs();
-  if ( apvs.empty() ) { ss << "NONE!"; }
+  if (apvs.empty()) {
+    ss << "NONE!";
+  }
   std::vector<uint16_t>::const_iterator iapv = apvs.begin();
-  for ( ; iapv != apvs.end(); ++iapv ) { ss << *iapv << ", "; }
+  for (; iapv != apvs.end(); ++iapv) {
+    ss << *iapv << ", ";
+  }
   ss << std::endl;
-  
-  ss << " DcuId/DetId/nPairs                      : "
-     << std::hex
-     << "0x" << std::setfill('0') << std::setw(8) << dcuId() << "/"
-     << "0x" << std::setfill('0') << std::setw(8) << detId() << "/"
-     << std::dec
-     << nApvPairs() << std::endl;
-  
+
+  ss << " DcuId/DetId/nPairs                      : " << std::hex << "0x" << std::setfill('0') << std::setw(8)
+     << dcuId() << "/"
+     << "0x" << std::setfill('0') << std::setw(8) << detId() << "/" << std::dec << nApvPairs() << std::endl;
+
   FedCabling channels = fedChannels();
   ss << " ApvPairNum/FedCrate/FedSlot/FedId/FedCh : ";
   FedCabling::const_iterator ichan = channels.begin();
-  for ( ; ichan != channels.end(); ++ichan ) {
-    ss << ichan->first << "/"
-       << ichan->second.fedCrate_ << "/"
-       << ichan->second.fedSlot_ << "/"
-       << ichan->second.fedId_ << "/"
-       << ichan->second.fedCh_ << ", ";
+  for (; ichan != channels.end(); ++ichan) {
+    ss << ichan->first << "/" << ichan->second.fedCrate_ << "/" << ichan->second.fedSlot_ << "/" << ichan->second.fedId_
+       << "/" << ichan->second.fedCh_ << ", ";
   }
   ss << std::endl;
-  
-  ss << " DCU/MUX/PLL/LLD found                   : "
-     << bool(dcu0x00_) << "/"
-     << bool(mux0x43_) << "/"
-     << bool(pll0x44_) << "/"
-     << bool(lld0x60_);
-  
+
+  ss << " DCU/MUX/PLL/LLD found                   : " << bool(dcu0x00_) << "/" << bool(mux0x43_) << "/"
+     << bool(pll0x44_) << "/" << bool(lld0x60_);
 }
 
 // -----------------------------------------------------------------------------
 //@@ NEEDS MODIFYING!!!!
-void SiStripModule::terse( std::stringstream& ss ) const {
-
+void SiStripModule::terse(std::stringstream &ss) const {
   ss << " [SiStripModule::" << __func__ << "]" << std::endl
-     << " Crate/FEC/Ring/CCU/Module               : "
-     << key().fecCrate() << "/"
-     << key().fecSlot() << "/"
-     << key().fecRing() << "/"
-     << key().ccuAddr() << "/"
-     << key().ccuChan() << std::endl;
+     << " Crate/FEC/Ring/CCU/Module               : " << key().fecCrate() << "/" << key().fecSlot() << "/"
+     << key().fecRing() << "/" << key().ccuAddr() << "/" << key().ccuChan() << std::endl;
 
   ss << " ActiveApvs                              : ";
   std::vector<uint16_t> apvs = activeApvs();
-  if ( apvs.empty() ) { ss << "NONE!"; }
+  if (apvs.empty()) {
+    ss << "NONE!";
+  }
   std::vector<uint16_t>::const_iterator iapv = apvs.begin();
-  for ( ; iapv != apvs.end(); ++iapv ) { ss << *iapv << ", "; }
+  for (; iapv != apvs.end(); ++iapv) {
+    ss << *iapv << ", ";
+  }
   ss << std::endl;
-  
-  ss << " DcuId/DetId/nPairs                      : "
-     << std::hex
-     << "0x" << std::setfill('0') << std::setw(8) << dcuId() << "/"
-     << "0x" << std::setfill('0') << std::setw(8) << detId() << "/"
-     << std::dec
-     << nApvPairs() << std::endl;
-  
+
+  ss << " DcuId/DetId/nPairs                      : " << std::hex << "0x" << std::setfill('0') << std::setw(8)
+     << dcuId() << "/"
+     << "0x" << std::setfill('0') << std::setw(8) << detId() << "/" << std::dec << nApvPairs() << std::endl;
+
   FedCabling channels = fedChannels();
   ss << " ApvPairNum/FedCrate/FedSlot/FedId/FedCh : ";
   FedCabling::const_iterator ichan = channels.begin();
-  for ( ; ichan != channels.end(); ++ichan ) {
-    ss << ichan->first << "/"
-       << ichan->second.fedCrate_ << "/"
-       << ichan->second.fedSlot_ << "/"
-       << ichan->second.fedId_ << "/"
-       << ichan->second.fedCh_ << ", ";
+  for (; ichan != channels.end(); ++ichan) {
+    ss << ichan->first << "/" << ichan->second.fedCrate_ << "/" << ichan->second.fedSlot_ << "/" << ichan->second.fedId_
+       << "/" << ichan->second.fedCh_ << ", ";
   }
   ss << std::endl;
-  
-  ss << " DCU/MUX/PLL/LLD found                   : "
-     << bool(dcu0x00_) << "/"
-     << bool(mux0x43_) << "/"
-     << bool(pll0x44_) << "/"
-     << bool(lld0x60_);
-  
+
+  ss << " DCU/MUX/PLL/LLD found                   : " << bool(dcu0x00_) << "/" << bool(mux0x43_) << "/"
+     << bool(pll0x44_) << "/" << bool(lld0x60_);
 }
 
 // -----------------------------------------------------------------------------
 //
-std::ostream& operator<< ( std::ostream& os, const SiStripModule& device ) {
+std::ostream &operator<<(std::ostream &os, const SiStripModule &device) {
   std::stringstream ss;
   device.print(ss);
   os << ss.str();
diff --git a/CalibFormats/SiStripObjects/src/SiStripQuality.cc b/CalibFormats/SiStripObjects/src/SiStripQuality.cc
index eb6d2906ba6b6..4654618d1402e 100644
--- a/CalibFormats/SiStripObjects/src/SiStripQuality.cc
+++ b/CalibFormats/SiStripObjects/src/SiStripQuality.cc
@@ -2,15 +2,14 @@
 // Author:      Domenico Giordano
 // Created:     Wed Sep 26 17:42:12 CEST 2007
 //
-#include "FWCore/Utilities/interface/typelookup.h"
+#include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripQuality.h"
-#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
-#include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
+#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-
+#include "FWCore/Utilities/interface/typelookup.h"
 
 // Needed only for output
 #include "DataFormats/DetId/interface/DetId.h"
@@ -18,141 +17,129 @@
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
 
-SiStripQuality::SiStripQuality():
-  toCleanUp(false),
-  FileInPath_("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat"),
-  SiStripDetCabling_(nullptr),
-  printDebug_(false),
-  useEmptyRunInfo_(false)
-{
-  reader=new SiStripDetInfoFileReader(FileInPath_.fullPath());
+SiStripQuality::SiStripQuality()
+    : toCleanUp(false),
+      FileInPath_("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat"),
+      SiStripDetCabling_(nullptr),
+      printDebug_(false),
+      useEmptyRunInfo_(false) {
+  reader = new SiStripDetInfoFileReader(FileInPath_.fullPath());
 }
 
-SiStripQuality::SiStripQuality(edm::FileInPath& file):toCleanUp(false),FileInPath_(file),SiStripDetCabling_(nullptr), printDebug_(false), useEmptyRunInfo_(false)
-{
-  reader=new SiStripDetInfoFileReader(FileInPath_.fullPath());
+SiStripQuality::SiStripQuality(edm::FileInPath &file)
+    : toCleanUp(false), FileInPath_(file), SiStripDetCabling_(nullptr), printDebug_(false), useEmptyRunInfo_(false) {
+  reader = new SiStripDetInfoFileReader(FileInPath_.fullPath());
 }
 
-SiStripQuality::SiStripQuality(const SiStripQuality& other)
-{
-  FileInPath_=other.FileInPath_;
-  reader=new SiStripDetInfoFileReader(*(other.reader));
-  toCleanUp=other.toCleanUp;
-  indexes=other.indexes;
-  v_badstrips=other.v_badstrips;
-  BadComponentVect=other.BadComponentVect;
-  SiStripDetCabling_=other.SiStripDetCabling_;
-  printDebug_=other.printDebug_;
-  useEmptyRunInfo_=other.useEmptyRunInfo_;
+SiStripQuality::SiStripQuality(const SiStripQuality &other) {
+  FileInPath_ = other.FileInPath_;
+  reader = new SiStripDetInfoFileReader(*(other.reader));
+  toCleanUp = other.toCleanUp;
+  indexes = other.indexes;
+  v_badstrips = other.v_badstrips;
+  BadComponentVect = other.BadComponentVect;
+  SiStripDetCabling_ = other.SiStripDetCabling_;
+  printDebug_ = other.printDebug_;
+  useEmptyRunInfo_ = other.useEmptyRunInfo_;
 }
 
-SiStripQuality::~SiStripQuality(){ 
-  LogTrace("SiStripQuality") << "SiStripQuality destructor" << std::endl; 
+SiStripQuality::~SiStripQuality() {
+  LogTrace("SiStripQuality") << "SiStripQuality destructor" << std::endl;
   delete reader;
 }
 
-
-SiStripQuality& SiStripQuality::operator +=(const SiStripQuality& other)
-{
-  this->add(&other); 
-  this->cleanUp(); 
-  this->fillBadComponents(); 
-  return *this; 
+SiStripQuality &SiStripQuality::operator+=(const SiStripQuality &other) {
+  this->add(&other);
+  this->cleanUp();
+  this->fillBadComponents();
+  return *this;
 }
 
-SiStripQuality& SiStripQuality::operator -=(const SiStripQuality& other)
-{    
+SiStripQuality &SiStripQuality::operator-=(const SiStripQuality &other) {
   SiStripBadStrip::RegistryIterator rbegin = other.getRegistryVectorBegin();
-  SiStripBadStrip::RegistryIterator rend   = other.getRegistryVectorEnd();
-  std::vector<unsigned int> ovect,vect;
+  SiStripBadStrip::RegistryIterator rend = other.getRegistryVectorEnd();
+  std::vector<unsigned int> ovect, vect;
   uint32_t detid;
   unsigned short Nstrips;
-    
-  for (SiStripBadStrip::RegistryIterator rp=rbegin; rp != rend; ++rp) {
-    
-    detid=rp->detid;
-    Nstrips=reader->getNumberOfApvsAndStripLength(detid).first*128;
-    
-    SiStripBadStrip::Range orange = SiStripBadStrip::Range( other.getDataVectorBegin()+rp->ibegin , other.getDataVectorBegin()+rp->iend );
-    
-    //Is this detid already in the collections owned by this class?
-    SiStripBadStrip::Range range = getRange(detid);   
-    if (range.first!=range.second){ //yes, it is
+
+  for (SiStripBadStrip::RegistryIterator rp = rbegin; rp != rend; ++rp) {
+    detid = rp->detid;
+    Nstrips = reader->getNumberOfApvsAndStripLength(detid).first * 128;
+
+    SiStripBadStrip::Range orange =
+        SiStripBadStrip::Range(other.getDataVectorBegin() + rp->ibegin, other.getDataVectorBegin() + rp->iend);
+
+    // Is this detid already in the collections owned by this class?
+    SiStripBadStrip::Range range = getRange(detid);
+    if (range.first != range.second) {  // yes, it is
 
       vect.clear();
       ovect.clear();
 
-      //if other full det is bad, remove det from this
-      SiStripBadStrip::data data_=decode(*(orange.first));
-      if(orange.second-orange.first!=1
-	 || data_.firstStrip!=0
-	 || data_.range<Nstrips){
-	
-	ovect.insert(ovect.end(),orange.first,orange.second);
-	vect.insert(vect.end(),range.first,range.second);
-	subtract(vect,ovect);
-      } 
-      SiStripBadStrip::Range newrange(vect.begin(),vect.end());
-      if ( ! put_replace(detid,newrange) )
-	edm::LogError("SiStripQuality")<<"[" << __PRETTY_FUNCTION__ << "] " << std::endl;
+      // if other full det is bad, remove det from this
+      SiStripBadStrip::data data_ = decode(*(orange.first));
+      if (orange.second - orange.first != 1 || data_.firstStrip != 0 || data_.range < Nstrips) {
+        ovect.insert(ovect.end(), orange.first, orange.second);
+        vect.insert(vect.end(), range.first, range.second);
+        subtract(vect, ovect);
+      }
+      SiStripBadStrip::Range newrange(vect.begin(), vect.end());
+      if (!put_replace(detid, newrange))
+        edm::LogError("SiStripQuality") << "[" << __PRETTY_FUNCTION__ << "] " << std::endl;
     }
   }
-  cleanUp(); 
-  fillBadComponents(); 
-  return *this; 
+  cleanUp();
+  fillBadComponents();
+  return *this;
 }
 
-const SiStripQuality SiStripQuality::operator -(const SiStripQuality& other) const
-{
-  return SiStripQuality(*this) -= other; 
+const SiStripQuality SiStripQuality::operator-(const SiStripQuality &other) const {
+  return SiStripQuality(*this) -= other;
 }
 
-bool SiStripQuality::operator ==(const SiStripQuality& other) const
-{
-  SiStripQuality a = (*this) - other ;
-  return a.getRegistryVectorBegin()==a.getRegistryVectorEnd();
+bool SiStripQuality::operator==(const SiStripQuality &other) const {
+  SiStripQuality a = (*this) - other;
+  return a.getRegistryVectorBegin() == a.getRegistryVectorEnd();
 }
 
-bool SiStripQuality::operator !=(const SiStripQuality& other) const { return !(*this == other) ; }
+bool SiStripQuality::operator!=(const SiStripQuality &other) const { return !(*this == other); }
 
-void SiStripQuality::add(const SiStripDetVOff *Voff)
-{
+void SiStripQuality::add(const SiStripDetVOff *Voff) {
   std::vector<unsigned int> vect;
-  short firstStrip=0;
-  short range=0;
+  short firstStrip = 0;
+  short range = 0;
 
-  //Get vector of Voff dets
+  // Get vector of Voff dets
   std::vector<uint32_t> vdets;
   Voff->getDetIds(vdets);
-  std::vector<uint32_t>::const_iterator iter=vdets.begin();
-  std::vector<uint32_t>::const_iterator iterEnd=vdets.end();
+  std::vector<uint32_t>::const_iterator iter = vdets.begin();
+  std::vector<uint32_t>::const_iterator iterEnd = vdets.end();
 
-  for(;iter!=iterEnd;++iter){
+  for (; iter != iterEnd; ++iter) {
     vect.clear();
-    range = (short) (reader->getNumberOfApvsAndStripLength(*iter).first*128.);
-    LogTrace("SiStripQuality") << "[add Voff] add detid " << *iter << " first strip " << firstStrip << " range " << range << std::endl;
-    vect.push_back(encode(firstStrip,range));
-    SiStripBadStrip::Range Range(vect.begin(),vect.end());
-    add(*iter,Range);
+    range = (short)(reader->getNumberOfApvsAndStripLength(*iter).first * 128.);
+    LogTrace("SiStripQuality") << "[add Voff] add detid " << *iter << " first strip " << firstStrip << " range "
+                               << range << std::endl;
+    vect.push_back(encode(firstStrip, range));
+    SiStripBadStrip::Range Range(vect.begin(), vect.end());
+    add(*iter, Range);
   }
 }
 
-void SiStripQuality::add(const RunInfo *runInfo)
-{
+void SiStripQuality::add(const RunInfo *runInfo) {
   bool allFedsEmpty = runInfo->m_fed_in.empty();
-  if( allFedsEmpty ) {
+  if (allFedsEmpty) {
     std::stringstream ss;
     ss << "WARNING: the full list of feds in RunInfo is empty. ";
-    if( useEmptyRunInfo_ ) {
+    if (useEmptyRunInfo_) {
       ss << " SiStripQuality will still use it and all tracker will be off." << std::endl;
-    }
-    else {
+    } else {
       ss << " SiStripQuality will not use it." << std::endl;
     }
     edm::LogInfo("SiStripQuality") << ss.str();
   }
 
-  if( !allFedsEmpty || useEmptyRunInfo_ ) {
+  if (!allFedsEmpty || useEmptyRunInfo_) {
     // Take the list of active feds from fedCabling
     auto ids = SiStripDetCabling_->fedCabling()->fedIds();
 
@@ -160,205 +147,215 @@ void SiStripQuality::add(const RunInfo *runInfo)
     // Take the list of active feds from RunInfo
     std::vector<int> activeFedsFromRunInfo;
     // Take only Tracker feds (remove all non Tracker)
-    std::remove_copy_if( runInfo->m_fed_in.begin(),
-                         runInfo->m_fed_in.end(),
-                         std::back_inserter(activeFedsFromRunInfo),
-                         !boost::bind(std::logical_and<bool>(),
-                                      boost::bind(std::greater_equal<int>(), _1, int(FEDNumbering::MINSiStripFEDID)),
-                                      boost::bind(std::less_equal<int>(), _1, int(FEDNumbering::MAXSiStripFEDID))) );
-
-    // Compare the two. If a fedId from RunInfo is not present in the fedCabling we need to
-    // get all the corresponding fedChannels and then the single apv pairs and use them to
-    // turn off the corresponding strips (apvNumber*256).
-    // set_difference returns the set of elements that are in the first and not in the second
+    std::remove_copy_if(runInfo->m_fed_in.begin(),
+                        runInfo->m_fed_in.end(),
+                        std::back_inserter(activeFedsFromRunInfo),
+                        !boost::bind(std::logical_and<bool>(),
+                                     boost::bind(std::greater_equal<int>(), _1, int(FEDNumbering::MINSiStripFEDID)),
+                                     boost::bind(std::less_equal<int>(), _1, int(FEDNumbering::MAXSiStripFEDID))));
+
+    // Compare the two. If a fedId from RunInfo is not present in the fedCabling
+    // we need to get all the corresponding fedChannels and then the single apv
+    // pairs and use them to turn off the corresponding strips (apvNumber*256).
+    // set_difference returns the set of elements that are in the first and not
+    // in the second
     std::sort(activeFedsFromCabling.begin(), activeFedsFromCabling.end());
     std::sort(activeFedsFromRunInfo.begin(), activeFedsFromRunInfo.end());
     std::vector<int> differentFeds;
     // Take the feds active for cabling but not for runInfo
-    std::set_difference(activeFedsFromCabling.begin(), activeFedsFromCabling.end(),
-                        activeFedsFromRunInfo.begin(), activeFedsFromRunInfo.end(),
+    std::set_difference(activeFedsFromCabling.begin(),
+                        activeFedsFromCabling.end(),
+                        activeFedsFromRunInfo.begin(),
+                        activeFedsFromRunInfo.end(),
                         std::back_inserter(differentFeds));
 
     // IGNORE for time being.
-    //printActiveFedsInfo(activeFedsFromCabling, activeFedsFromRunInfo, differentFeds, printDebug_);
+    // printActiveFedsInfo(activeFedsFromCabling, activeFedsFromRunInfo,
+    // differentFeds, printDebug_);
 
-    // Feds in the differentFeds vector are now to be turned off as they are off according to RunInfo
-    // but were not off in cabling and thus are still active for the SiStripQuality.
-    // The "true" means that the strips are to be set as bad.
+    // Feds in the differentFeds vector are now to be turned off as they are off
+    // according to RunInfo but were not off in cabling and thus are still
+    // active for the SiStripQuality. The "true" means that the strips are to be
+    // set as bad.
     turnOffFeds(differentFeds, true, printDebug_);
 
     // Consistency check
     // -----------------
     std::vector<int> check;
-    std::set_difference(activeFedsFromRunInfo.begin(), activeFedsFromRunInfo.end(),
-                        activeFedsFromCabling.begin(), activeFedsFromCabling.end(),
+    std::set_difference(activeFedsFromRunInfo.begin(),
+                        activeFedsFromRunInfo.end(),
+                        activeFedsFromCabling.begin(),
+                        activeFedsFromCabling.end(),
                         std::back_inserter(check));
     // This must not happen
-    if( !check.empty() ) {
+    if (!check.empty()) {
       // throw cms::Exception("LogicError")
-      edm::LogInfo("SiStripQuality") 
-        << "The cabling should always include the active feds in runInfo and possibly have some more"
-        << "there are instead " << check.size() << " feds only active in runInfo";
-      // The "false" means that we are only printing the output, but not setting the strips as bad.
-      // The second bool means that we always want the debug output in this case.
+      edm::LogInfo("SiStripQuality") << "The cabling should always include the active feds in runInfo and "
+                                        "possibly have some more"
+                                     << "there are instead " << check.size() << " feds only active in runInfo";
+      // The "false" means that we are only printing the output, but not setting
+      // the strips as bad. The second bool means that we always want the debug
+      // output in this case.
       turnOffFeds(check, false, true);
     }
   }
 }
 
-void SiStripQuality::add(const SiStripDetCabling *cab)
-{
-  SiStripDetCabling_=cab;
+void SiStripQuality::add(const SiStripDetCabling *cab) {
+  SiStripDetCabling_ = cab;
   addInvalidConnectionFromCabling();
   addNotConnectedConnectionFromCabling();
 }
 
-void SiStripQuality::addNotConnectedConnectionFromCabling()
-{  
-  std::map<uint32_t, SiStripDetInfoFileReader::DetInfo > allData = reader->getAllData();
-  std::map<uint32_t, SiStripDetInfoFileReader::DetInfo >::const_iterator iter=allData.begin();
-  std::map<uint32_t, SiStripDetInfoFileReader::DetInfo >::const_iterator iterEnd=allData.end();
+void SiStripQuality::addNotConnectedConnectionFromCabling() {
+  std::map<uint32_t, SiStripDetInfoFileReader::DetInfo> allData = reader->getAllData();
+  std::map<uint32_t, SiStripDetInfoFileReader::DetInfo>::const_iterator iter = allData.begin();
+  std::map<uint32_t, SiStripDetInfoFileReader::DetInfo>::const_iterator iterEnd = allData.end();
   std::vector<unsigned int> vect;
-  short firstStrip=0;
-  short range=0;
-  for(;iter!=iterEnd;++iter)
-    if (!SiStripDetCabling_->IsConnected(iter->first)){
+  short firstStrip = 0;
+  short range = 0;
+  for (; iter != iterEnd; ++iter)
+    if (!SiStripDetCabling_->IsConnected(iter->first)) {
       vect.clear();
-      range=iter->second.nApvs*128;
+      range = iter->second.nApvs * 128;
       LogTrace("SiStripQuality") << "[addNotConnectedConnectionFromCabling] add detid " << iter->first << std::endl;
-      vect.push_back(encode(firstStrip,range));
-      SiStripBadStrip::Range Range(vect.begin(),vect.end());
-      add(iter->first,Range);
+      vect.push_back(encode(firstStrip, range));
+      SiStripBadStrip::Range Range(vect.begin(), vect.end());
+      add(iter->first, Range);
     }
 }
 
-void SiStripQuality::addInvalidConnectionFromCabling()
-{
+void SiStripQuality::addInvalidConnectionFromCabling() {
   std::vector<uint32_t> connected_detids;
   SiStripDetCabling_->addActiveDetectorsRawIds(connected_detids);
   std::vector<uint32_t>::const_iterator itdet = connected_detids.begin();
   std::vector<uint32_t>::const_iterator itdetEnd = connected_detids.end();
-  for(;itdet!=itdetEnd;++itdet){
-    //LogTrace("SiStripQuality") << "[addInvalidConnectionFromCabling] looking at detid " <<*itdet << std::endl;
-    const std::vector<const FedChannelConnection *>& fedconns=SiStripDetCabling_->getConnections(*itdet);
-    std::vector<const FedChannelConnection *>::const_iterator itconns=fedconns.begin();
-    std::vector<const FedChannelConnection *>::const_iterator itconnsEnd=fedconns.end();
-    
-    unsigned short nApvPairs=SiStripDetCabling_->nApvPairs(*itdet);
-    short ngoodConn=0, goodConn=0;
-    for(;itconns!=itconnsEnd;++itconns){
-      //LogTrace("SiStripQuality") << "[addInvalidConnectionFromCabling] apvpair " << (*itconns)->apvPairNumber() << " napvpair " << (*itconns)->nApvPairs()<< " detid " << (*itconns)->detId() << std::endl;
-      if( (*itconns == nullptr) || ((*itconns)->nApvPairs()==sistrip::invalid_) )
-	continue;
+  for (; itdet != itdetEnd; ++itdet) {
+    // LogTrace("SiStripQuality") << "[addInvalidConnectionFromCabling] looking
+    // at detid " <<*itdet << std::endl;
+    const std::vector<const FedChannelConnection *> &fedconns = SiStripDetCabling_->getConnections(*itdet);
+    std::vector<const FedChannelConnection *>::const_iterator itconns = fedconns.begin();
+    std::vector<const FedChannelConnection *>::const_iterator itconnsEnd = fedconns.end();
+
+    unsigned short nApvPairs = SiStripDetCabling_->nApvPairs(*itdet);
+    short ngoodConn = 0, goodConn = 0;
+    for (; itconns != itconnsEnd; ++itconns) {
+      // LogTrace("SiStripQuality") << "[addInvalidConnectionFromCabling]
+      // apvpair " << (*itconns)->apvPairNumber() << " napvpair " <<
+      // (*itconns)->nApvPairs()<< " detid " << (*itconns)->detId() <<
+      // std::endl;
+      if ((*itconns == nullptr) || ((*itconns)->nApvPairs() == sistrip::invalid_))
+        continue;
       ngoodConn++;
-      goodConn = goodConn | ( 0x1 << (*itconns)->apvPairNumber() );
+      goodConn = goodConn | (0x1 << (*itconns)->apvPairNumber());
     }
 
-    if (ngoodConn!=nApvPairs){
+    if (ngoodConn != nApvPairs) {
       std::vector<unsigned int> vect;
-      for (size_t idx=0;idx<nApvPairs;++idx){
-	if( !(goodConn & ( 0x1 << idx)) ) {
-	  short firstStrip=idx*256;
-	  short range=256;
-	  LogTrace("SiStripQuality") << "[addInvalidConnectionFromCabling] add detid " <<*itdet << "firstStrip " << firstStrip<< std::endl;
-	  vect.push_back(encode(firstStrip,range));
-	}
+      for (size_t idx = 0; idx < nApvPairs; ++idx) {
+        if (!(goodConn & (0x1 << idx))) {
+          short firstStrip = idx * 256;
+          short range = 256;
+          LogTrace("SiStripQuality") << "[addInvalidConnectionFromCabling] add detid " << *itdet << "firstStrip "
+                                     << firstStrip << std::endl;
+          vect.push_back(encode(firstStrip, range));
+        }
       }
-      if(!vect.empty()){
-	SiStripBadStrip::Range Range(vect.begin(),vect.end());
-	add(*itdet,Range);
+      if (!vect.empty()) {
+        SiStripBadStrip::Range Range(vect.begin(), vect.end());
+        add(*itdet, Range);
       }
     }
   }
 }
 
-void SiStripQuality::add(const SiStripBadStrip* base)
-{
+void SiStripQuality::add(const SiStripBadStrip *base) {
   SiStripBadStrip::RegistryIterator basebegin = base->getRegistryVectorBegin();
-  SiStripBadStrip::RegistryIterator baseend   = base->getRegistryVectorEnd();
-  
-  //the Registry already contains data
-  //Loop on detids
-  for (SiStripBadStrip::RegistryIterator basep=basebegin; basep != baseend; ++basep) {
-    uint32_t detid=basep->detid;
-    LogTrace("SiStripQuality") << "add detid " <<detid << std::endl;
-    
-    SiStripBadStrip::Range baserange = SiStripBadStrip::Range( base->getDataVectorBegin()+basep->ibegin , base->getDataVectorBegin()+basep->iend );
-    
-    add(detid,baserange);
+  SiStripBadStrip::RegistryIterator baseend = base->getRegistryVectorEnd();
+
+  // the Registry already contains data
+  // Loop on detids
+  for (SiStripBadStrip::RegistryIterator basep = basebegin; basep != baseend; ++basep) {
+    uint32_t detid = basep->detid;
+    LogTrace("SiStripQuality") << "add detid " << detid << std::endl;
+
+    SiStripBadStrip::Range baserange =
+        SiStripBadStrip::Range(base->getDataVectorBegin() + basep->ibegin, base->getDataVectorBegin() + basep->iend);
+
+    add(detid, baserange);
+  }
+}
+
+void SiStripQuality::add(const uint32_t &detid, const SiStripBadStrip::Range &baserange) {
+  std::vector<unsigned int> vect, tmp;
+
+  unsigned short Nstrips = reader->getNumberOfApvsAndStripLength(detid).first * 128;
+
+  // Is this detid already in the collections owned by this class?
+  SiStripBadStrip::Range range = getRange(detid);
+
+  // Append bad strips
+  tmp.clear();
+  if (range.first == range.second) {
+    LogTrace("SiStripQuality") << "new detid" << std::endl;
+    // It's a new detid
+    tmp.insert(tmp.end(), baserange.first, baserange.second);
+    std::stable_sort(tmp.begin(), tmp.end());
+    LogTrace("SiStripQuality") << "ordered" << std::endl;
+  } else {
+    LogTrace("SiStripQuality") << "already exists" << std::endl;
+    // alredy existing detid
+
+    // if full det is bad go to next detid
+    SiStripBadStrip::data data_ = decode(*(range.first));
+    if (range.second - range.first == 1 && data_.firstStrip == 0 && data_.range >= Nstrips) {
+      LogTrace("SiStripQuality") << "full det is bad.. " << range.second - range.first << " "
+                                 << decode(*(range.first)).firstStrip << " " << decode(*(range.first)).range << " "
+                                 << decode(*(range.first)).flag << "\n"
+                                 << std::endl;
+      return;
+    }
+
+    tmp.insert(tmp.end(), baserange.first, baserange.second);
+    tmp.insert(tmp.end(), range.first, range.second);
+    std::stable_sort(tmp.begin(), tmp.end());
+    LogTrace("SiStripQuality") << "ordered" << std::endl;
   }
+  // Compact data
+  compact(tmp, vect, Nstrips);
+  SiStripBadStrip::Range newrange(vect.begin(), vect.end());
+  if (!put_replace(detid, newrange))
+    edm::LogError("SiStripQuality") << "[" << __PRETTY_FUNCTION__ << "] " << std::endl;
 }
 
-void SiStripQuality::add(const uint32_t& detid,const SiStripBadStrip::Range& baserange)
-{
- std::vector<unsigned int> vect, tmp;
-
- unsigned short Nstrips=reader->getNumberOfApvsAndStripLength(detid).first*128;
-    
- //Is this detid already in the collections owned by this class?
- SiStripBadStrip::Range range = getRange(detid);
- 
- //Append bad strips  
- tmp.clear();
- if (range.first==range.second){
-   LogTrace("SiStripQuality") << "new detid" << std::endl;
-   //It's a new detid
-   tmp.insert(tmp.end(),baserange.first,baserange.second);
-   std::stable_sort(tmp.begin(),tmp.end());
-   LogTrace("SiStripQuality") << "ordered" << std::endl;
- } else {
-   LogTrace("SiStripQuality") << "already exists" << std::endl;
-   //alredy existing detid
-   
-   //if full det is bad go to next detid
-   SiStripBadStrip::data data_=decode(*(range.first));
-   if(range.second-range.first==1
-      && data_.firstStrip==0
-      && data_.range>=Nstrips){
-     LogTrace("SiStripQuality") << "full det is bad.. " << range.second-range.first << " " << decode(*(range.first)).firstStrip << " " << decode(*(range.first)).range << " " << decode(*(range.first)).flag <<"\n"<< std::endl;
-     return;
-   }
-	 	
-   tmp.insert(tmp.end(),baserange.first,baserange.second);
-   tmp.insert(tmp.end(),range.first,range.second);
-   std::stable_sort(tmp.begin(),tmp.end());
-   LogTrace("SiStripQuality") << "ordered" << std::endl;
- }
- //Compact data
- compact(tmp,vect,Nstrips);
- SiStripBadStrip::Range newrange(vect.begin(),vect.end());
- if ( ! put_replace(detid,newrange) )
-   edm::LogError("SiStripQuality")<<"[" << __PRETTY_FUNCTION__ << "] " << std::endl;
-}
-
-void SiStripQuality::compact(unsigned int& detid, std::vector<unsigned int>& vect)
-{
-  std::vector<unsigned int> tmp=vect;
+void SiStripQuality::compact(unsigned int &detid, std::vector<unsigned int> &vect) {
+  std::vector<unsigned int> tmp = vect;
   vect.clear();
-  std::stable_sort(tmp.begin(),tmp.end());
-  unsigned short Nstrips=reader->getNumberOfApvsAndStripLength(detid).first*128;
-  compact(tmp,vect,Nstrips);
+  std::stable_sort(tmp.begin(), tmp.end());
+  unsigned short Nstrips = reader->getNumberOfApvsAndStripLength(detid).first * 128;
+  compact(tmp, vect, Nstrips);
 }
 
-bool SiStripQuality::put_replace(const uint32_t& DetId, Range input)
-{
+bool SiStripQuality::put_replace(const uint32_t &DetId, Range input) {
   // put in SiStripQuality::v_badstrips of DetId
-  Registry::iterator p = std::lower_bound(indexes.begin(),indexes.end(),DetId,SiStripBadStrip::StrictWeakOrdering());
+  Registry::iterator p = std::lower_bound(indexes.begin(), indexes.end(), DetId, SiStripBadStrip::StrictWeakOrdering());
 
-  size_t sd= input.second-input.first;
+  size_t sd = input.second - input.first;
   DetRegistry detregistry;
-  detregistry.detid=DetId;
-  detregistry.ibegin=v_badstrips.size();
-  detregistry.iend=v_badstrips.size()+sd;
-
-  v_badstrips.insert(v_badstrips.end(),input.first,input.second);
-
-  if (p!=indexes.end() && p->detid==DetId){
-    LogTrace("SiStripQuality") << "[SiStripQuality::put_replace]  Replacing SiStripQuality for already stored DetID " << DetId << std::endl;
-    toCleanUp=true;
-    *p=detregistry;
+  detregistry.detid = DetId;
+  detregistry.ibegin = v_badstrips.size();
+  detregistry.iend = v_badstrips.size() + sd;
+
+  v_badstrips.insert(v_badstrips.end(), input.first, input.second);
+
+  if (p != indexes.end() && p->detid == DetId) {
+    LogTrace("SiStripQuality") << "[SiStripQuality::put_replace]  Replacing "
+                                  "SiStripQuality for already stored DetID "
+                               << DetId << std::endl;
+    toCleanUp = true;
+    *p = detregistry;
   } else {
-    indexes.insert(p,detregistry);
+    indexes.insert(p, detregistry);
   }
 
   return true;
@@ -368,215 +365,221 @@ bool SiStripQuality::put_replace(const uint32_t& DetId, Range input)
 Method to reduce the granularity of badcomponents:
 if in an apv there are more than ratio*128 bad strips,
 the full apv is declared as bad.
-Method needed to help the 
+Method needed to help the
  */
-void SiStripQuality::ReduceGranularity(double threshold)
-{
+void SiStripQuality::ReduceGranularity(double threshold) {
   SiStripBadStrip::RegistryIterator rp = getRegistryVectorBegin();
-  SiStripBadStrip::RegistryIterator rend   = getRegistryVectorEnd();
+  SiStripBadStrip::RegistryIterator rend = getRegistryVectorEnd();
   SiStripBadStrip::data data_;
   uint16_t BadStripPerApv[6], ipos;
   std::vector<unsigned int> vect;
 
   for (; rp != rend; ++rp) {
-    uint32_t detid=rp->detid;
-
-    BadStripPerApv[0]=0;    BadStripPerApv[1]=0;    BadStripPerApv[2]=0;    BadStripPerApv[3]=0;    BadStripPerApv[4]=0;    BadStripPerApv[5]=0;
-    ipos=0;
-
-    SiStripBadStrip::Range sqrange = SiStripBadStrip::Range( getDataVectorBegin()+rp->ibegin , getDataVectorBegin()+rp->iend );
-    
-    for(int it=0;it<sqrange.second-sqrange.first;it++){
-
-      data_=decode( *(sqrange.first+it) );
-      LogTrace("SiStripQuality") << "[SiStripQuality::ReduceGranularity] detid " << detid << " first strip " << data_.firstStrip << " lastStrip " << data_.firstStrip+data_.range-1  << " range " << data_.range;
-      ipos= data_.firstStrip/128;
-      while (ipos<=(data_.firstStrip+data_.range-1)/128){
-	BadStripPerApv[ipos]+=std::min(data_.firstStrip+data_.range,(ipos+1)*128)-std::max(data_.firstStrip*1,ipos*128);
-	LogTrace("SiStripQuality") << "[SiStripQuality::ReduceGranularity] ipos " << ipos << " Counter " << BadStripPerApv[ipos] << " min " << std::min(data_.firstStrip+data_.range,(ipos+1)*128) << " max " << std::max(data_.firstStrip*1,ipos*128) << " added " << std::min(data_.firstStrip+data_.range,(ipos+1)*128)-std::max(data_.firstStrip*1,ipos*128);
-	ipos++;
+    uint32_t detid = rp->detid;
+
+    BadStripPerApv[0] = 0;
+    BadStripPerApv[1] = 0;
+    BadStripPerApv[2] = 0;
+    BadStripPerApv[3] = 0;
+    BadStripPerApv[4] = 0;
+    BadStripPerApv[5] = 0;
+    ipos = 0;
+
+    SiStripBadStrip::Range sqrange =
+        SiStripBadStrip::Range(getDataVectorBegin() + rp->ibegin, getDataVectorBegin() + rp->iend);
+
+    for (int it = 0; it < sqrange.second - sqrange.first; it++) {
+      data_ = decode(*(sqrange.first + it));
+      LogTrace("SiStripQuality") << "[SiStripQuality::ReduceGranularity] detid " << detid << " first strip "
+                                 << data_.firstStrip << " lastStrip " << data_.firstStrip + data_.range - 1 << " range "
+                                 << data_.range;
+      ipos = data_.firstStrip / 128;
+      while (ipos <= (data_.firstStrip + data_.range - 1) / 128) {
+        BadStripPerApv[ipos] +=
+            std::min(data_.firstStrip + data_.range, (ipos + 1) * 128) - std::max(data_.firstStrip * 1, ipos * 128);
+        LogTrace("SiStripQuality") << "[SiStripQuality::ReduceGranularity] ipos " << ipos << " Counter "
+                                   << BadStripPerApv[ipos] << " min "
+                                   << std::min(data_.firstStrip + data_.range, (ipos + 1) * 128) << " max "
+                                   << std::max(data_.firstStrip * 1, ipos * 128) << " added "
+                                   << std::min(data_.firstStrip + data_.range, (ipos + 1) * 128) -
+                                          std::max(data_.firstStrip * 1, ipos * 128);
+        ipos++;
       }
     }
 
-    LogTrace("SiStripQuality") << "[SiStripQuality::ReduceGranularity] Total for detid " << detid << " values " << BadStripPerApv[0] << " " << BadStripPerApv[1] << " " << BadStripPerApv[2] << " " <<BadStripPerApv[3] << " " <<BadStripPerApv[4] << " " << BadStripPerApv[5];
-    
-    
+    LogTrace("SiStripQuality") << "[SiStripQuality::ReduceGranularity] Total for detid " << detid << " values "
+                               << BadStripPerApv[0] << " " << BadStripPerApv[1] << " " << BadStripPerApv[2] << " "
+                               << BadStripPerApv[3] << " " << BadStripPerApv[4] << " " << BadStripPerApv[5];
+
     vect.clear();
-    for(size_t i=0;i<6;++i){
-      if (BadStripPerApv[i]>=threshold*128){
-	vect.push_back(encode(i*128,128));
+    for (size_t i = 0; i < 6; ++i) {
+      if (BadStripPerApv[i] >= threshold * 128) {
+        vect.push_back(encode(i * 128, 128));
       }
     }
-    if(!vect.empty()){
-      SiStripBadStrip::Range Range(vect.begin(),vect.end());
-      add(detid,Range);
+    if (!vect.empty()) {
+      SiStripBadStrip::Range Range(vect.begin(), vect.end());
+      add(detid, Range);
     }
   }
 }
 
-
-void SiStripQuality::compact(std::vector<unsigned int>& tmp,std::vector<unsigned int>& vect,unsigned short& Nstrips)
-{
+void SiStripQuality::compact(std::vector<unsigned int> &tmp, std::vector<unsigned int> &vect, unsigned short &Nstrips) {
   SiStripBadStrip::data fs_0, fs_1;
   vect.clear();
 
-  ContainerIterator it=tmp.begin();
-  fs_0=decode(*it);
-   
-  //Check if at the module end
-  if (fs_0.firstStrip+fs_0.range>=Nstrips){
-    vect.push_back(encode(fs_0.firstStrip,Nstrips-fs_0.firstStrip));
+  ContainerIterator it = tmp.begin();
+  fs_0 = decode(*it);
+
+  // Check if at the module end
+  if (fs_0.firstStrip + fs_0.range >= Nstrips) {
+    vect.push_back(encode(fs_0.firstStrip, Nstrips - fs_0.firstStrip));
     return;
   }
 
   ++it;
-  for(;it!=tmp.end();++it){
-    fs_1=decode(*it);
-    
-    if (fs_0.firstStrip+fs_0.range>=fs_1.firstStrip+fs_1.range){
-      //fs_0 includes fs_1, go ahead
-    } else if (fs_0.firstStrip+fs_0.range>=fs_1.firstStrip){
+  for (; it != tmp.end(); ++it) {
+    fs_1 = decode(*it);
+
+    if (fs_0.firstStrip + fs_0.range >= fs_1.firstStrip + fs_1.range) {
+      // fs_0 includes fs_1, go ahead
+    } else if (fs_0.firstStrip + fs_0.range >= fs_1.firstStrip) {
       // contiguous or superimposed intervals
-      //Check if at the module end
-      if (fs_1.firstStrip+fs_1.range>=Nstrips){
-	vect.push_back(encode(fs_0.firstStrip,Nstrips-fs_0.firstStrip));
-	return;
-      }else{
-      	//create new fs_0
-	fs_0.range=fs_1.firstStrip+fs_1.range-fs_0.firstStrip;
+      // Check if at the module end
+      if (fs_1.firstStrip + fs_1.range >= Nstrips) {
+        vect.push_back(encode(fs_0.firstStrip, Nstrips - fs_0.firstStrip));
+        return;
+      } else {
+        // create new fs_0
+        fs_0.range = fs_1.firstStrip + fs_1.range - fs_0.firstStrip;
       }
-    } else{
-      //separated intervals
-      vect.push_back(encode(fs_0.firstStrip,fs_0.range));
-      fs_0=fs_1;
+    } else {
+      // separated intervals
+      vect.push_back(encode(fs_0.firstStrip, fs_0.range));
+      fs_0 = fs_1;
     }
   }
-  vect.push_back(encode(fs_0.firstStrip,fs_0.range));
+  vect.push_back(encode(fs_0.firstStrip, fs_0.range));
 }
 
-void SiStripQuality::subtract(std::vector<unsigned int>& A,const std::vector<unsigned int>& B)
-{
-  ContainerIterator it=B.begin();
-  ContainerIterator itend=B.end();
-  for(;it!=itend;++it){    
-    subtraction(A,*it);
+void SiStripQuality::subtract(std::vector<unsigned int> &A, const std::vector<unsigned int> &B) {
+  ContainerIterator it = B.begin();
+  ContainerIterator itend = B.end();
+  for (; it != itend; ++it) {
+    subtraction(A, *it);
   }
 }
 
-void SiStripQuality::subtraction(std::vector<unsigned int>& A,const unsigned int& B)
-{
+void SiStripQuality::subtraction(std::vector<unsigned int> &A, const unsigned int &B) {
   SiStripBadStrip::data fs_A, fs_B, fs_m, fs_M;
   std::vector<unsigned int> tmp;
 
-  fs_B=decode(B);
-  ContainerIterator jt=A.begin();
-  ContainerIterator jtend=A.end();
-  for(;jt!=jtend;++jt){
-    fs_A=decode(*jt);
-    if (B<*jt){
-      fs_m=fs_B;
-      fs_M=fs_A;
-    }else{
-      fs_m=fs_A;
-      fs_M=fs_B;
+  fs_B = decode(B);
+  ContainerIterator jt = A.begin();
+  ContainerIterator jtend = A.end();
+  for (; jt != jtend; ++jt) {
+    fs_A = decode(*jt);
+    if (B < *jt) {
+      fs_m = fs_B;
+      fs_M = fs_A;
+    } else {
+      fs_m = fs_A;
+      fs_M = fs_B;
     }
-    //A) Verify the range to be subtracted crosses the new range
-    if (fs_m.firstStrip+fs_m.range>fs_M.firstStrip){
-      if (*jt<B){
-	tmp.push_back(encode(fs_A.firstStrip,fs_B.firstStrip-fs_A.firstStrip));
+    // A) Verify the range to be subtracted crosses the new range
+    if (fs_m.firstStrip + fs_m.range > fs_M.firstStrip) {
+      if (*jt < B) {
+        tmp.push_back(encode(fs_A.firstStrip, fs_B.firstStrip - fs_A.firstStrip));
       }
-      if (fs_A.firstStrip+fs_A.range>fs_B.firstStrip+fs_B.range){
-	tmp.push_back(encode(fs_B.firstStrip+fs_B.range,fs_A.firstStrip+fs_A.range-(fs_B.firstStrip+fs_B.range)));
+      if (fs_A.firstStrip + fs_A.range > fs_B.firstStrip + fs_B.range) {
+        tmp.push_back(
+            encode(fs_B.firstStrip + fs_B.range, fs_A.firstStrip + fs_A.range - (fs_B.firstStrip + fs_B.range)));
       }
-    }else{
+    } else {
       tmp.push_back(*jt);
     }
-  } 
-  A=tmp;
+  }
+  A = tmp;
 }
 
-bool SiStripQuality::cleanUp(bool force)
-{
+bool SiStripQuality::cleanUp(bool force) {
   if (!toCleanUp && !force)
     return false;
 
-  toCleanUp=false;
+  toCleanUp = false;
 
-  std::vector<unsigned int> v_badstrips_tmp=v_badstrips;
-  std::vector<DetRegistry> indexes_tmp=indexes;
+  std::vector<unsigned int> v_badstrips_tmp = v_badstrips;
+  std::vector<DetRegistry> indexes_tmp = indexes;
 
-  LogTrace("SiStripQuality") << "[SiStripQuality::cleanUp] before cleanUp v_badstrips.size()= " << v_badstrips.size() << " indexes.size()=" << indexes.size() << std::endl;
+  LogTrace("SiStripQuality") << "[SiStripQuality::cleanUp] before cleanUp v_badstrips.size()= " << v_badstrips.size()
+                             << " indexes.size()=" << indexes.size() << std::endl;
 
   v_badstrips.clear();
   indexes.clear();
 
   SiStripBadStrip::RegistryIterator basebegin = indexes_tmp.begin();
-  SiStripBadStrip::RegistryIterator baseend   = indexes_tmp.end();
+  SiStripBadStrip::RegistryIterator baseend = indexes_tmp.end();
 
-  for (SiStripBadStrip::RegistryIterator basep=basebegin; basep != baseend; ++basep) {
-    if(basep->ibegin!=basep->iend){
-      SiStripBadStrip::Range range( v_badstrips_tmp.begin()+basep->ibegin, v_badstrips_tmp.begin()+basep->iend );
-      if ( ! put(basep->detid,range) )
-	edm::LogError("SiStripQuality")<<"[" << __PRETTY_FUNCTION__ << "] " << std::endl;
+  for (SiStripBadStrip::RegistryIterator basep = basebegin; basep != baseend; ++basep) {
+    if (basep->ibegin != basep->iend) {
+      SiStripBadStrip::Range range(v_badstrips_tmp.begin() + basep->ibegin, v_badstrips_tmp.begin() + basep->iend);
+      if (!put(basep->detid, range))
+        edm::LogError("SiStripQuality") << "[" << __PRETTY_FUNCTION__ << "] " << std::endl;
     }
   }
-  
-  LogTrace("SiStripQuality") << "[SiStripQuality::cleanUp] after cleanUp v_badstrips.size()= " << v_badstrips.size() << " indexes.size()=" << indexes.size() << std::endl;
+
+  LogTrace("SiStripQuality") << "[SiStripQuality::cleanUp] after cleanUp v_badstrips.size()= " << v_badstrips.size()
+                             << " indexes.size()=" << indexes.size() << std::endl;
   return true;
 }
 
-void SiStripQuality::fillBadComponents()
-{
+void SiStripQuality::fillBadComponents() {
   BadComponentVect.clear();
-  
-  for (SiStripBadStrip::RegistryIterator basep=indexes.begin(); basep != indexes.end(); ++basep) {
-    
-    SiStripBadStrip::Range range( v_badstrips.begin()+basep->ibegin, v_badstrips.begin()+basep->iend );
-    
-    //Fill BadModules, BadFibers, BadApvs vectors
-    unsigned short resultA=0, resultF=0;
+
+  for (SiStripBadStrip::RegistryIterator basep = indexes.begin(); basep != indexes.end(); ++basep) {
+    SiStripBadStrip::Range range(v_badstrips.begin() + basep->ibegin, v_badstrips.begin() + basep->iend);
+
+    // Fill BadModules, BadFibers, BadApvs vectors
+    unsigned short resultA = 0, resultF = 0;
     BadComponent result;
-    
+
     SiStripBadStrip::data fs;
-    unsigned short Nstrips=reader->getNumberOfApvsAndStripLength(basep->detid).first*128;
-    
-    //BadModules
-    fs=decode(*(range.first));
-    if (basep->iend - basep->ibegin == 1 &&
-	fs.firstStrip==0 && 
-	fs.range==Nstrips ){
-      result.detid=basep->detid;
-      result.BadModule=true;
-      result.BadFibers=(1<< (Nstrips/256))-1; 
-      result.BadApvs=(1<< (Nstrips/128))-1; 
-	
+    unsigned short Nstrips = reader->getNumberOfApvsAndStripLength(basep->detid).first * 128;
+
+    // BadModules
+    fs = decode(*(range.first));
+    if (basep->iend - basep->ibegin == 1 && fs.firstStrip == 0 && fs.range == Nstrips) {
+      result.detid = basep->detid;
+      result.BadModule = true;
+      result.BadFibers = (1 << (Nstrips / 256)) - 1;
+      result.BadApvs = (1 << (Nstrips / 128)) - 1;
+
       BadComponentVect.push_back(result);
-      
-    } else {
 
-      //Bad Fibers and  Apvs
-      for(SiStripBadStrip::ContainerIterator it=range.first;it!=range.second;++it){
-	fs=decode(*it);
-      
-	//BadApvs
-	for(short apvNb=0;apvNb<6;++apvNb){
-	  if ( fs.firstStrip<=apvNb*128 && (apvNb+1)*128<=fs.firstStrip+fs.range ){
-	    resultA=resultA | (1<<apvNb);
-	  }     
-	}
-	//BadFibers
-	for(short fiberNb=0;fiberNb<3;++fiberNb){
-	  if ( fs.firstStrip<=fiberNb*256 && (fiberNb+1)*256<=fs.firstStrip+fs.range ){
-	    resultF=resultF | (1<<fiberNb);
-	  }     
-	}
+    } else {
+      // Bad Fibers and  Apvs
+      for (SiStripBadStrip::ContainerIterator it = range.first; it != range.second; ++it) {
+        fs = decode(*it);
+
+        // BadApvs
+        for (short apvNb = 0; apvNb < 6; ++apvNb) {
+          if (fs.firstStrip <= apvNb * 128 && (apvNb + 1) * 128 <= fs.firstStrip + fs.range) {
+            resultA = resultA | (1 << apvNb);
+          }
+        }
+        // BadFibers
+        for (short fiberNb = 0; fiberNb < 3; ++fiberNb) {
+          if (fs.firstStrip <= fiberNb * 256 && (fiberNb + 1) * 256 <= fs.firstStrip + fs.range) {
+            resultF = resultF | (1 << fiberNb);
+          }
+        }
       }
-      if (resultA!=0){
-	result.detid=basep->detid;
-	result.BadModule=false;
-	result.BadFibers=resultF;
-	result.BadApvs=resultA;
-	BadComponentVect.push_back(result);    
+      if (resultA != 0) {
+        result.detid = basep->detid;
+        result.BadModule = false;
+        result.BadFibers = resultF;
+        result.BadApvs = resultA;
+        BadComponentVect.push_back(result);
       }
     }
   }
@@ -584,151 +587,145 @@ void SiStripQuality::fillBadComponents()
 
 //--------------------------------------------------------------//
 
-bool SiStripQuality::IsModuleUsable(const uint32_t& detid) const
-{
-  std::vector<BadComponent>::const_iterator p = std::lower_bound(BadComponentVect.begin(),BadComponentVect.end(),detid,SiStripQuality::BadComponentStrictWeakOrdering());
-  if (p!=BadComponentVect.end() && p->detid==detid)
-    if(p->BadModule)
+bool SiStripQuality::IsModuleUsable(const uint32_t &detid) const {
+  std::vector<BadComponent>::const_iterator p = std::lower_bound(
+      BadComponentVect.begin(), BadComponentVect.end(), detid, SiStripQuality::BadComponentStrictWeakOrdering());
+  if (p != BadComponentVect.end() && p->detid == detid)
+    if (p->BadModule)
       return false;
 
-  if (SiStripDetCabling_!=nullptr)
-    if(!SiStripDetCabling_->IsConnected(detid))
+  if (SiStripDetCabling_ != nullptr)
+    if (!SiStripDetCabling_->IsConnected(detid))
       return false;
 
   return true;
 }
 
-bool SiStripQuality::IsModuleBad(const uint32_t& detid) const
-{
-  std::vector<BadComponent>::const_iterator p = std::lower_bound(BadComponentVect.begin(),BadComponentVect.end(),detid,SiStripQuality::BadComponentStrictWeakOrdering());
-  if (p!=BadComponentVect.end() && p->detid==detid)
+bool SiStripQuality::IsModuleBad(const uint32_t &detid) const {
+  std::vector<BadComponent>::const_iterator p = std::lower_bound(
+      BadComponentVect.begin(), BadComponentVect.end(), detid, SiStripQuality::BadComponentStrictWeakOrdering());
+  if (p != BadComponentVect.end() && p->detid == detid)
     return p->BadModule;
   return false;
 }
 
-bool SiStripQuality::IsFiberBad(const uint32_t& detid, const short& fiberNb) const
-{
-  std::vector<BadComponent>::const_iterator p = std::lower_bound(BadComponentVect.begin(),BadComponentVect.end(),detid,SiStripQuality::BadComponentStrictWeakOrdering());
-  if (p!=BadComponentVect.end() && p->detid==detid)
-    return ((p->BadFibers>>fiberNb)&0x1);
+bool SiStripQuality::IsFiberBad(const uint32_t &detid, const short &fiberNb) const {
+  std::vector<BadComponent>::const_iterator p = std::lower_bound(
+      BadComponentVect.begin(), BadComponentVect.end(), detid, SiStripQuality::BadComponentStrictWeakOrdering());
+  if (p != BadComponentVect.end() && p->detid == detid)
+    return ((p->BadFibers >> fiberNb) & 0x1);
   return false;
 }
 
-bool SiStripQuality::IsApvBad(const uint32_t& detid, const short& apvNb) const
-{
-  std::vector<BadComponent>::const_iterator p = std::lower_bound(BadComponentVect.begin(),BadComponentVect.end(),detid,SiStripQuality::BadComponentStrictWeakOrdering());
-  if (p!=BadComponentVect.end() && p->detid==detid)
-    return ((p->BadApvs>>apvNb)&0x1);
+bool SiStripQuality::IsApvBad(const uint32_t &detid, const short &apvNb) const {
+  std::vector<BadComponent>::const_iterator p = std::lower_bound(
+      BadComponentVect.begin(), BadComponentVect.end(), detid, SiStripQuality::BadComponentStrictWeakOrdering());
+  if (p != BadComponentVect.end() && p->detid == detid)
+    return ((p->BadApvs >> apvNb) & 0x1);
   return false;
 }
 
-bool SiStripQuality::IsStripBad(const uint32_t& detid, const short& strip) const
-{
-  SiStripBadStrip::Range range=getRange(detid);
-  return IsStripBad(range,strip);
+bool SiStripQuality::IsStripBad(const uint32_t &detid, const short &strip) const {
+  SiStripBadStrip::Range range = getRange(detid);
+  return IsStripBad(range, strip);
 }
 
-bool SiStripQuality::IsStripBad(const Range& range, const short& strip) const
-{
-  bool result=false;
+bool SiStripQuality::IsStripBad(const Range &range, const short &strip) const {
+  bool result = false;
   SiStripBadStrip::data fs;
-  for(SiStripBadStrip::ContainerIterator it=range.first;it!=range.second;++it){
-    fs=decode(*it);
-    if ( (fs.firstStrip<=strip)  & (strip<fs.firstStrip+fs.range) ){
-      result=true;
+  for (SiStripBadStrip::ContainerIterator it = range.first; it != range.second; ++it) {
+    fs = decode(*it);
+    if ((fs.firstStrip <= strip) & (strip < fs.firstStrip + fs.range)) {
+      result = true;
       break;
-    }      
+    }
   }
   return result;
 }
 
-int SiStripQuality::nBadStripsOnTheLeft(const Range& range, const short& strip) const
-{
-  int result=0;
+int SiStripQuality::nBadStripsOnTheLeft(const Range &range, const short &strip) const {
+  int result = 0;
   SiStripBadStrip::data fs;
-  for(SiStripBadStrip::ContainerIterator it=range.first;it!=range.second;++it){
-    fs=decode(*it);
-    if ( fs.firstStrip<=strip && strip<fs.firstStrip+fs.range ){
-      result=strip-fs.firstStrip+1;
+  for (SiStripBadStrip::ContainerIterator it = range.first; it != range.second; ++it) {
+    fs = decode(*it);
+    if (fs.firstStrip <= strip && strip < fs.firstStrip + fs.range) {
+      result = strip - fs.firstStrip + 1;
       break;
-    }      
+    }
   }
   return result;
 }
 
-int SiStripQuality::nBadStripsOnTheRight(const Range& range, const short& strip) const
-{
-  int result=0;
+int SiStripQuality::nBadStripsOnTheRight(const Range &range, const short &strip) const {
+  int result = 0;
   SiStripBadStrip::data fs;
-  for(SiStripBadStrip::ContainerIterator it=range.first;it!=range.second;++it){
-    fs=decode(*it);
-    if ( fs.firstStrip<=strip && strip<fs.firstStrip+fs.range ){
-      result=fs.firstStrip+fs.range-strip;
+  for (SiStripBadStrip::ContainerIterator it = range.first; it != range.second; ++it) {
+    fs = decode(*it);
+    if (fs.firstStrip <= strip && strip < fs.firstStrip + fs.range) {
+      result = fs.firstStrip + fs.range - strip;
       break;
-    }      
+    }
   }
   return result;
 }
 
-short SiStripQuality::getBadApvs(const uint32_t& detid) const
-{
-  std::vector<BadComponent>::const_iterator p = std::lower_bound(BadComponentVect.begin(),BadComponentVect.end(),detid,SiStripQuality::BadComponentStrictWeakOrdering());
-  if (p!=BadComponentVect.end() && p->detid==detid)
+short SiStripQuality::getBadApvs(const uint32_t &detid) const {
+  std::vector<BadComponent>::const_iterator p = std::lower_bound(
+      BadComponentVect.begin(), BadComponentVect.end(), detid, SiStripQuality::BadComponentStrictWeakOrdering());
+  if (p != BadComponentVect.end() && p->detid == detid)
     return p->BadApvs;
   return 0;
 }
 
-short SiStripQuality::getBadFibers(const uint32_t& detid) const
-{
-  std::vector<BadComponent>::const_iterator p = std::lower_bound(BadComponentVect.begin(),BadComponentVect.end(),detid,SiStripQuality::BadComponentStrictWeakOrdering());
-  if (p!=BadComponentVect.end() && p->detid==detid)
+short SiStripQuality::getBadFibers(const uint32_t &detid) const {
+  std::vector<BadComponent>::const_iterator p = std::lower_bound(
+      BadComponentVect.begin(), BadComponentVect.end(), detid, SiStripQuality::BadComponentStrictWeakOrdering());
+  if (p != BadComponentVect.end() && p->detid == detid)
     return p->BadFibers;
   return 0;
-} 
+}
 
-void SiStripQuality::printDetInfo(const TrackerTopology* const tTopo, const uint32_t &detId, const uint32_t &apvPairNumber, std::stringstream &ss)
-{
+void SiStripQuality::printDetInfo(const TrackerTopology *const tTopo,
+                                  const uint32_t &detId,
+                                  const uint32_t &apvPairNumber,
+                                  std::stringstream &ss) {
   std::string subDetName;
   DetId detid(detId);
   int layer = tTopo->layer(detid);
   int stereo = 0;
   switch (detid.subdetId()) {
-  case StripSubdetector::TIB:
-    {
+    case StripSubdetector::TIB: {
       stereo = tTopo->tibIsStereo(detid);
       subDetName = "TIB";
       break;
     }
-  case StripSubdetector::TOB:
-    {
+    case StripSubdetector::TOB: {
       stereo = tTopo->tobIsStereo(detid);
       subDetName = "TOB";
       break;
     }
-  case StripSubdetector::TEC:
-    {
+    case StripSubdetector::TEC: {
       stereo = tTopo->tecIsStereo(detid);
       subDetName = "TEC";
       break;
     }
-  case StripSubdetector::TID:
-    {
+    case StripSubdetector::TID: {
       stereo = tTopo->tidIsStereo(detid);
       subDetName = "TID";
       break;
     }
   }
-  ss << detId << " and apv = " << apvPairNumber << " of subDet = " << subDetName << ", layer = " << layer << " stereo = " << stereo << std::endl;
+  ss << detId << " and apv = " << apvPairNumber << " of subDet = " << subDetName << ", layer = " << layer
+     << " stereo = " << stereo << std::endl;
 }
 
-void SiStripQuality::printActiveFedsInfo( const std::vector<uint16_t> & activeFedsFromCabling,
-                                          const std::vector<int> & activeFedsFromRunInfo,
-                                          const std::vector<int> & differentFeds,
-                                          const bool printDebug )
-{
+void SiStripQuality::printActiveFedsInfo(const std::vector<uint16_t> &activeFedsFromCabling,
+                                         const std::vector<int> &activeFedsFromRunInfo,
+                                         const std::vector<int> &differentFeds,
+                                         const bool printDebug) {
   std::ostringstream ss;
 
-  if( printDebug ) {
+  if (printDebug) {
     ss << "activeFedsFromCabling:" << std::endl;
     std::copy(activeFedsFromCabling.begin(), activeFedsFromCabling.end(), std::ostream_iterator<uint16_t>(ss, " "));
     ss << std::endl;
@@ -736,48 +733,50 @@ void SiStripQuality::printActiveFedsInfo( const std::vector<uint16_t> & activeFe
     std::copy(activeFedsFromRunInfo.begin(), activeFedsFromRunInfo.end(), std::ostream_iterator<int>(ss, " "));
     ss << std::endl;
   }
-  if( differentFeds.size() != 440 ) {
+  if (differentFeds.size() != 440) {
     ss << "differentFeds : " << std::endl;
     std::copy(differentFeds.begin(), differentFeds.end(), std::ostream_iterator<int>(ss, " "));
     ss << std::endl;
-  }
-  else {
-    ss << "There are 440 feds (all) active for Cabling but off for RunInfo. Tracker was probably not in this run" << std::endl;
+  } else {
+    ss << "There are 440 feds (all) active for Cabling but off for RunInfo. "
+          "Tracker was probably not in this run"
+       << std::endl;
   }
   edm::LogInfo("SiStripQuality") << ss.str() << std::endl;
 }
 
-void SiStripQuality::turnOffFeds(const std::vector<int> & fedsList, const bool turnOffStrips, const bool printDebug)
-{
-
+void SiStripQuality::turnOffFeds(const std::vector<int> &fedsList, const bool turnOffStrips, const bool printDebug) {
   std::stringstream ss;
-  if( printDebug ) {
+  if (printDebug) {
     ss << "associated to detIds : " << std::endl;
   }
 
   std::vector<int>::const_iterator fedIdIt = fedsList.begin();
-  for( ; fedIdIt != fedsList.end(); ++fedIdIt ) {
-    std::vector<FedChannelConnection>::const_iterator fedChIt = SiStripDetCabling_->fedCabling()->fedConnections( *fedIdIt ).begin();
-    for( ; fedChIt != SiStripDetCabling_->fedCabling()->fedConnections( *fedIdIt ).end(); ++fedChIt ) {
+  for (; fedIdIt != fedsList.end(); ++fedIdIt) {
+    std::vector<FedChannelConnection>::const_iterator fedChIt =
+        SiStripDetCabling_->fedCabling()->fedConnections(*fedIdIt).begin();
+    for (; fedChIt != SiStripDetCabling_->fedCabling()->fedConnections(*fedIdIt).end(); ++fedChIt) {
       uint32_t detId = fedChIt->detId();
-      if (detId == 0 || detId == 0xFFFFFFFF) continue;
+      if (detId == 0 || detId == 0xFFFFFFFF)
+        continue;
       uint16_t apvPairNumber = fedChIt->apvPairNumber();
 
-      if( printDebug ) {
-        printDetInfo(SiStripDetCabling_->trackerTopology(),detId, apvPairNumber, ss);
+      if (printDebug) {
+        printDetInfo(SiStripDetCabling_->trackerTopology(), detId, apvPairNumber, ss);
       }
 
-      if( turnOffStrips ) {
+      if (turnOffStrips) {
         // apvPairNumber == i it means that the i*256 strips are to be set off
         std::vector<unsigned int> vect;
-        vect.push_back(encode(apvPairNumber*256,256));
+        vect.push_back(encode(apvPairNumber * 256, 256));
         SiStripBadStrip::Range Range(vect.begin(), vect.end());
-        add(detId,Range);
-        LogTrace("SiStripQuality") << "[addOffForRunInfo] adding apvPairNumber "<<apvPairNumber<<" for detId "<<detId<<" off according to RunInfo" << std::endl;
+        add(detId, Range);
+        LogTrace("SiStripQuality") << "[addOffForRunInfo] adding apvPairNumber " << apvPairNumber << " for detId "
+                                   << detId << " off according to RunInfo" << std::endl;
       }
     }
   }
-  if( printDebug ) {
+  if (printDebug) {
     edm::LogInfo("SiStripQuality") << ss.str() << std::endl;
   }
 }
diff --git a/CalibFormats/SiStripObjects/src/SiStripRegionCabling.cc b/CalibFormats/SiStripObjects/src/SiStripRegionCabling.cc
index c09db35e60036..33f04ac9ad145 100644
--- a/CalibFormats/SiStripObjects/src/SiStripRegionCabling.cc
+++ b/CalibFormats/SiStripObjects/src/SiStripRegionCabling.cc
@@ -4,93 +4,101 @@
 
 using namespace sistrip;
 
-SiStripRegionCabling::SiStripRegionCabling(const uint32_t etadivisions, const uint32_t phidivisions, const double etamax) :
+SiStripRegionCabling::SiStripRegionCabling(const uint32_t etadivisions,
+                                           const uint32_t phidivisions,
+                                           const double etamax)
+    :
 
-  etadivisions_(static_cast<int>(etadivisions)),
-  phidivisions_(static_cast<int>(phidivisions)),
-  etamax_(etamax),
-  regioncabling_()
+      etadivisions_(static_cast<int>(etadivisions)),
+      phidivisions_(static_cast<int>(phidivisions)),
+      etamax_(etamax),
+      regioncabling_()
 
 {}
 
 const SiStripRegionCabling::PositionIndex SiStripRegionCabling::positionIndex(const Position position) const {
-  int eta = static_cast<int>((position.first+etamax_)*etadivisions_/(2.*etamax_));
-  int phi = static_cast<int>((position.second+M_PI)*phidivisions_/(2.*M_PI));
-  return PositionIndex(static_cast<uint32_t>(eta),static_cast<uint32_t>(phi));
+  int eta = static_cast<int>((position.first + etamax_) * etadivisions_ / (2. * etamax_));
+  int phi = static_cast<int>((position.second + M_PI) * phidivisions_ / (2. * M_PI));
+  return PositionIndex(static_cast<uint32_t>(eta), static_cast<uint32_t>(phi));
 }
 
 const uint32_t SiStripRegionCabling::region(const Position position) const {
-  PositionIndex index = positionIndex(position); 
+  PositionIndex index = positionIndex(position);
   return region(index);
 }
 
-SiStripRegionCabling::PositionIndex SiStripRegionCabling::increment(const PositionIndex index, int deta, int dphi) const {
-  
-  int eta = static_cast<int>(index.first)+deta;
-  if (eta > etadivisions_-1) eta = etadivisions_-1;
-  else if (eta < 0) eta = 0;
- 
-  int phi = static_cast<int>(index.second)+dphi;
-  while (phi<0) phi+=phidivisions_;
-  while (phi>phidivisions_-1) phi-=phidivisions_;
+SiStripRegionCabling::PositionIndex SiStripRegionCabling::increment(const PositionIndex index,
+                                                                    int deta,
+                                                                    int dphi) const {
+  int eta = static_cast<int>(index.first) + deta;
+  if (eta > etadivisions_ - 1)
+    eta = etadivisions_ - 1;
+  else if (eta < 0)
+    eta = 0;
 
-  return PositionIndex(static_cast<uint32_t>(eta),static_cast<uint32_t>(phi));
+  int phi = static_cast<int>(index.second) + dphi;
+  while (phi < 0)
+    phi += phidivisions_;
+  while (phi > phidivisions_ - 1)
+    phi -= phidivisions_;
+
+  return PositionIndex(static_cast<uint32_t>(eta), static_cast<uint32_t>(phi));
 }
 
 const SiStripRegionCabling::SubDet SiStripRegionCabling::subdetFromDetId(const uint32_t detid) {
-  DetId detectorId=DetId(detid);
-  if (detectorId.subdetId() == StripSubdetector::TIB) return TIB;
-  else if (detectorId.subdetId() == StripSubdetector::TID) return TID;
-  else if (detectorId.subdetId() == StripSubdetector::TOB) return TOB;
-  else if (detectorId.subdetId() == StripSubdetector::TEC) return TEC;
-  else return ALLSUBDETS;
+  DetId detectorId = DetId(detid);
+  if (detectorId.subdetId() == StripSubdetector::TIB)
+    return TIB;
+  else if (detectorId.subdetId() == StripSubdetector::TID)
+    return TID;
+  else if (detectorId.subdetId() == StripSubdetector::TOB)
+    return TOB;
+  else if (detectorId.subdetId() == StripSubdetector::TEC)
+    return TEC;
+  else
+    return ALLSUBDETS;
 }
 
 // -----------------------------------------------------------------------------
 //
-void SiStripRegionCabling::print( std::stringstream& ss ) const {
+void SiStripRegionCabling::print(std::stringstream &ss) const {
   uint32_t valid = 0;
   uint32_t total = 0;
   ss << "[SiStripRegionCabling::" << __func__ << "] Printing REGION cabling:" << std::endl;
   ss << "Printing cabling for " << regioncabling_.size() << " regions" << std::endl;
   Cabling::const_iterator id = regioncabling_.begin();
   Cabling::const_iterator jd = regioncabling_.end();
-  for ( ; id != jd; ++id ) {
-    ss << "Printing cabling for " << id->size()
-       << " regions for partition " << static_cast<int32_t>( id - regioncabling_.begin() )
-       << std::endl;
+  for (; id != jd; ++id) {
+    ss << "Printing cabling for " << id->size() << " regions for partition "
+       << static_cast<int32_t>(id - regioncabling_.begin()) << std::endl;
     RegionCabling::const_iterator ir = id->begin();
     RegionCabling::const_iterator jr = id->end();
-    for ( ; ir != jr; ++ir ) {
-      ss << "Printing cabling for " << ir->size()
-	 << " wedges for region " << static_cast<int32_t>( ir - id->begin() )
-	 << std::endl;
+    for (; ir != jr; ++ir) {
+      ss << "Printing cabling for " << ir->size() << " wedges for region " << static_cast<int32_t>(ir - id->begin())
+         << std::endl;
       WedgeCabling::const_iterator iw = ir->begin();
       WedgeCabling::const_iterator jw = ir->end();
-      for ( ; iw != jw; ++iw ) {
-	ss << "Printing cabling for " << iw->size()
-	   << " elements for wedge " << static_cast<int32_t>( iw - ir->begin() )
-	   << std::endl;
-	ElementCabling::const_iterator ie = iw->begin();
-	ElementCabling::const_iterator je = iw->end();
-	for ( ; ie != je; ++ie ) {
-	  ss << "Printing cabling for " << ie->second.size()
-	     << " connections for element (DetId) " << ie->first
-	     << std::endl;
-	  std::vector<FedChannelConnection>::const_iterator ic = ie->second.begin();
-	  std::vector<FedChannelConnection>::const_iterator jc = ie->second.end();
-	  for ( ; ic != jc; ++ic ) {
-	    if ( ic->isConnected() ) { valid++; }
-	    total++;
-	    ic->print(ss);
-	    ss << std::endl;
-	  }
-	}
+      for (; iw != jw; ++iw) {
+        ss << "Printing cabling for " << iw->size() << " elements for wedge " << static_cast<int32_t>(iw - ir->begin())
+           << std::endl;
+        ElementCabling::const_iterator ie = iw->begin();
+        ElementCabling::const_iterator je = iw->end();
+        for (; ie != je; ++ie) {
+          ss << "Printing cabling for " << ie->second.size() << " connections for element (DetId) " << ie->first
+             << std::endl;
+          std::vector<FedChannelConnection>::const_iterator ic = ie->second.begin();
+          std::vector<FedChannelConnection>::const_iterator jc = ie->second.end();
+          for (; ic != jc; ++ic) {
+            if (ic->isConnected()) {
+              valid++;
+            }
+            total++;
+            ic->print(ss);
+            ss << std::endl;
+          }
+        }
       }
     }
   }
-  ss << "Number of connected:   " << valid << std::endl
-     << "Number of connections: " << total << std::endl;
+  ss << "Number of connected:   " << valid << std::endl << "Number of connections: " << total << std::endl;
 }
-
-
diff --git a/CalibFormats/SiStripObjects/src/SiStripRing.cc b/CalibFormats/SiStripObjects/src/SiStripRing.cc
index 65ea34bf0ee44..6a161426d3a79 100644
--- a/CalibFormats/SiStripObjects/src/SiStripRing.cc
+++ b/CalibFormats/SiStripObjects/src/SiStripRing.cc
@@ -4,23 +4,21 @@
 
 // -----------------------------------------------------------------------------
 //
-SiStripRing::SiStripRing( const FedChannelConnection& conn )
-  : fecRing_( conn.fecRing() ), 
-    ccus_()
-{ 
+SiStripRing::SiStripRing(const FedChannelConnection &conn) : fecRing_(conn.fecRing()), ccus_() {
   ccus_.reserve(256);
-  addDevices( conn ); 
+  addDevices(conn);
 }
 
 // -----------------------------------------------------------------------------
 //
-void SiStripRing::addDevices( const FedChannelConnection& conn ) {
+void SiStripRing::addDevices(const FedChannelConnection &conn) {
   auto iccu = ccus_.begin();
-  while ( iccu != ccus_.end() && (*iccu).ccuAddr() != conn.ccuAddr() ) { iccu++; }
-  if ( iccu == ccus().end() ) { 
-    ccus_.push_back( SiStripCcu( conn ) ); 
-  } else { 
-    iccu->addDevices( conn ); 
+  while (iccu != ccus_.end() && (*iccu).ccuAddr() != conn.ccuAddr()) {
+    iccu++;
+  }
+  if (iccu == ccus().end()) {
+    ccus_.push_back(SiStripCcu(conn));
+  } else {
+    iccu->addDevices(conn);
   }
 }
-
diff --git a/CalibFormats/SiStripObjects/test/UnitTests/TestSiStripDelay.cc b/CalibFormats/SiStripObjects/test/UnitTests/TestSiStripDelay.cc
index b604154000d0e..6baf134a9e2a9 100644
--- a/CalibFormats/SiStripObjects/test/UnitTests/TestSiStripDelay.cc
+++ b/CalibFormats/SiStripObjects/test/UnitTests/TestSiStripDelay.cc
@@ -1,16 +1,16 @@
+#include <cppunit/CompilerOutputter.h>
 #include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/TestResult.h>
-#include <cppunit/TestRunner.h>
-#include <cppunit/ui/text/TestRunner.h>
 #include <cppunit/TestResultCollector.h>
+#include <cppunit/TestRunner.h>
 #include <cppunit/TextTestProgressListener.h>
-#include <cppunit/CompilerOutputter.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/ui/text/TestRunner.h>
 
 #include <algorithm>
-#include <iterator>
 #include <boost/foreach.hpp>
 #include <cassert>
+#include <iterator>
 
 #include "CalibFormats/SiStripObjects/interface/SiStripDelay.h"
 
@@ -20,20 +20,19 @@
 class TestSiStripDelay : public CppUnit::TestFixture {
 public:
   TestSiStripDelay() {}
-  void setUp()
-  {
+  void setUp() {
     baseDelay1 = new SiStripBaseDelay;
     baseDelaySign1 = 1;
     baseDelay2 = new SiStripBaseDelay;
     baseDelaySign2 = -1;
-    totalDelays = 15000;    
+    totalDelays = 15000;
     // totalDelays = 1;
-    for( uint32_t i=0; i<totalDelays; ++i ) {
+    for (uint32_t i = 0; i < totalDelays; ++i) {
       detIds.push_back(i);
-      coarseDelay.push_back(i/1000);
-      fineDelay.push_back(i/2000);
-      baseDelay1->put(i, i/1000, i/2000);
-      baseDelay2->put(i, i/2000, i/1000);
+      coarseDelay.push_back(i / 1000);
+      fineDelay.push_back(i / 2000);
+      baseDelay1->put(i, i / 1000, i / 2000);
+      baseDelay2->put(i, i / 2000, i / 1000);
       // coarseDelay.push_back(1);
       // fineDelay.push_back(2);
       // baseDelay1->put(i, 1, 2);
@@ -41,58 +40,61 @@ class TestSiStripDelay : public CppUnit::TestFixture {
     }
   }
 
-  void tearDown()
-  {
+  void tearDown() {
     delete baseDelay1;
     delete baseDelay2;
   }
 
-  void testConstructor()
-  {
+  void testConstructor() {
     SiStripDelay delay(*baseDelay1, baseDelaySign1, std::make_pair("baseDelay1", "delay1"));
-    CPPUNIT_ASSERT( delay.getNumberOfTags() == 1 );
-    CPPUNIT_ASSERT( delay.getBaseDelay(0) == baseDelay1 );
-    CPPUNIT_ASSERT( delay.getTagSign(0) == 1 );
-    CPPUNIT_ASSERT( delay.getRcdName(0) == "baseDelay1" );
-    CPPUNIT_ASSERT( delay.getLabelName(0) == "delay1" );
+    CPPUNIT_ASSERT(delay.getNumberOfTags() == 1);
+    CPPUNIT_ASSERT(delay.getBaseDelay(0) == baseDelay1);
+    CPPUNIT_ASSERT(delay.getTagSign(0) == 1);
+    CPPUNIT_ASSERT(delay.getRcdName(0) == "baseDelay1");
+    CPPUNIT_ASSERT(delay.getLabelName(0) == "delay1");
   }
 
-  void testFillNewDelay()
-  {
+  void testFillNewDelay() {
     SiStripDelay delay(*baseDelay1, baseDelaySign1, std::make_pair("baseDelay1", "delay1"));
     delay.fillNewDelay(*baseDelay2, baseDelaySign2, std::make_pair("baseDelay2", "delay2"));
-    CPPUNIT_ASSERT( delay.getNumberOfTags() == 2 );
-    CPPUNIT_ASSERT( delay.getBaseDelay(0) == baseDelay1 );
-    CPPUNIT_ASSERT( delay.getTagSign(0) == baseDelaySign1 );
-    CPPUNIT_ASSERT( delay.getRcdName(0) == "baseDelay1" );
-    CPPUNIT_ASSERT( delay.getLabelName(0) == "delay1" );
-    CPPUNIT_ASSERT( delay.getBaseDelay(1) == baseDelay2 );
-    CPPUNIT_ASSERT( delay.getTagSign(1) == baseDelaySign2 );
-    CPPUNIT_ASSERT( delay.getRcdName(1) == "baseDelay2" );
-    CPPUNIT_ASSERT( delay.getLabelName(1) == "delay2" );
+    CPPUNIT_ASSERT(delay.getNumberOfTags() == 2);
+    CPPUNIT_ASSERT(delay.getBaseDelay(0) == baseDelay1);
+    CPPUNIT_ASSERT(delay.getTagSign(0) == baseDelaySign1);
+    CPPUNIT_ASSERT(delay.getRcdName(0) == "baseDelay1");
+    CPPUNIT_ASSERT(delay.getLabelName(0) == "delay1");
+    CPPUNIT_ASSERT(delay.getBaseDelay(1) == baseDelay2);
+    CPPUNIT_ASSERT(delay.getTagSign(1) == baseDelaySign2);
+    CPPUNIT_ASSERT(delay.getRcdName(1) == "baseDelay2");
+    CPPUNIT_ASSERT(delay.getLabelName(1) == "delay2");
   }
 
-  void testMakeDelay()
-  {
-    SiStripDelay delay(*baseDelay1, baseDelaySign1, std::make_pair("baseDelay1", "delay1"));    
+  void testMakeDelay() {
+    SiStripDelay delay(*baseDelay1, baseDelaySign1, std::make_pair("baseDelay1", "delay1"));
     CPPUNIT_ASSERT(delay.makeDelay());
-    for( uint32_t i=0; i<totalDelays; ++i ) {
-      CPPUNIT_ASSERT( float(delay.getDelay(detIds[i])) == float(baseDelay1->delay(detIds[i])*baseDelaySign1) );
+    for (uint32_t i = 0; i < totalDelays; ++i) {
+      CPPUNIT_ASSERT(float(delay.getDelay(detIds[i])) == float(baseDelay1->delay(detIds[i]) * baseDelaySign1));
     }
     delay.fillNewDelay(*baseDelay2, baseDelaySign2, std::make_pair("baseDelay2", "delay2"));
     CPPUNIT_ASSERT(delay.makeDelay());
-    for( uint32_t i=0; i<totalDelays; ++i ) {
-//       std::cout << "float(delay.getDelay("<<detIds[i]<<")) = " << float(delay.getDelay(detIds[i])) << std::endl;
-//       std::cout << "float(baseDelay1->delay("<<detIds[i]<<") = " << float(baseDelay1->delay(detIds[i])) << std::endl;
-//       std::cout << "float(baseDelay2->delay("<<detIds[i]<<") = " << float(baseDelay2->delay(detIds[i])) << std::endl;
-//       std::cout << "float(baseDelay1->delay("<<detIds[i]<<")*"<<baseDelaySign1<<" - baseDelay2->delay("<<detIds[i]<<"))*"<<baseDelaySign2<<" = " << float(baseDelay1->delay(detIds[i])*baseDelaySign1 + baseDelay2->delay(detIds[i])*baseDelaySign2) << std::endl;
-      CPPUNIT_ASSERT( float(delay.getDelay(detIds[i])) == float(baseDelay1->delay(detIds[i])*baseDelaySign1 + baseDelay2->delay(detIds[i])*baseDelaySign2) );
+    for (uint32_t i = 0; i < totalDelays; ++i) {
+      //       std::cout << "float(delay.getDelay("<<detIds[i]<<")) = " <<
+      //       float(delay.getDelay(detIds[i])) << std::endl; std::cout <<
+      //       "float(baseDelay1->delay("<<detIds[i]<<") = " <<
+      //       float(baseDelay1->delay(detIds[i])) << std::endl; std::cout <<
+      //       "float(baseDelay2->delay("<<detIds[i]<<") = " <<
+      //       float(baseDelay2->delay(detIds[i])) << std::endl; std::cout <<
+      //       "float(baseDelay1->delay("<<detIds[i]<<")*"<<baseDelaySign1<<" -
+      //       baseDelay2->delay("<<detIds[i]<<"))*"<<baseDelaySign2<<" = " <<
+      //       float(baseDelay1->delay(detIds[i])*baseDelaySign1 +
+      //       baseDelay2->delay(detIds[i])*baseDelaySign2) << std::endl;
+      CPPUNIT_ASSERT(float(delay.getDelay(detIds[i])) == float(baseDelay1->delay(detIds[i]) * baseDelaySign1 +
+                                                               baseDelay2->delay(detIds[i]) * baseDelaySign2));
     }
   }
 
-  SiStripBaseDelay * baseDelay1;
+  SiStripBaseDelay *baseDelay1;
   int baseDelaySign1;
-  SiStripBaseDelay * baseDelay2;
+  SiStripBaseDelay *baseDelay2;
   int baseDelaySign2;
   std::vector<uint32_t> detIds;
   std::vector<uint16_t> coarseDelay;
@@ -100,16 +102,16 @@ class TestSiStripDelay : public CppUnit::TestFixture {
   uint32_t totalDelays;
 
   // Declare and build the test suite
-  CPPUNIT_TEST_SUITE( TestSiStripDelay );
-  CPPUNIT_TEST( testConstructor );
-  CPPUNIT_TEST( testFillNewDelay );
-  CPPUNIT_TEST( testMakeDelay );
+  CPPUNIT_TEST_SUITE(TestSiStripDelay);
+  CPPUNIT_TEST(testConstructor);
+  CPPUNIT_TEST(testFillNewDelay);
+  CPPUNIT_TEST(testMakeDelay);
   CPPUNIT_TEST_SUITE_END();
 };
 
 // Register the test suite in the registry.
 // This way we will have to only pass the registry to the runner
 // and it will contain all the registered test suites.
-CPPUNIT_TEST_SUITE_REGISTRATION( TestSiStripDelay );
+CPPUNIT_TEST_SUITE_REGISTRATION(TestSiStripDelay);
 
 #endif
diff --git a/CalibFormats/SiStripObjects/test/UnitTests/TestSiStripGain.cc b/CalibFormats/SiStripObjects/test/UnitTests/TestSiStripGain.cc
index e1a61ad08485b..cb0095d206760 100644
--- a/CalibFormats/SiStripObjects/test/UnitTests/TestSiStripGain.cc
+++ b/CalibFormats/SiStripObjects/test/UnitTests/TestSiStripGain.cc
@@ -1,15 +1,15 @@
+#include <cppunit/CompilerOutputter.h>
 #include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/TestResult.h>
-#include <cppunit/TestRunner.h>
-#include <cppunit/ui/text/TestRunner.h>
 #include <cppunit/TestResultCollector.h>
+#include <cppunit/TestRunner.h>
 #include <cppunit/TextTestProgressListener.h>
-#include <cppunit/CompilerOutputter.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/ui/text/TestRunner.h>
 
 #include <algorithm>
-#include <iterator>
 #include <boost/foreach.hpp>
+#include <iterator>
 
 #include "CalibFormats/SiStripObjects/interface/SiStripGain.h"
 
@@ -19,8 +19,7 @@
 class TestSiStripGain : public CppUnit::TestFixture {
 public:
   TestSiStripGain() {}
-  void setUp()
-  {
+  void setUp() {
     detId = 436282904;
 
     apvGain1 = new SiStripApvGain;
@@ -34,28 +33,25 @@ class TestSiStripGain : public CppUnit::TestFixture {
     apvGain2 = new SiStripApvGain;
     theSiStripVector.clear();
     theSiStripVector.push_back(1.);
-    theSiStripVector.push_back(1./0.8);
-    theSiStripVector.push_back(1./1.2);
+    theSiStripVector.push_back(1. / 0.8);
+    theSiStripVector.push_back(1. / 1.2);
     theSiStripVector.push_back(2.);
     fillApvGain(apvGain2, detId, theSiStripVector);
   }
 
-  void tearDown()
-  {
+  void tearDown() {
     delete apvGain1;
     delete apvGain2;
   }
 
-  void testConstructor()
-  {
+  void testConstructor() {
     // Test with normalization factor = 1
     apvGainsTest(1.);
     // Test with normalization factor != 1
     apvGainsTest(2.);
   }
 
-  void testMultiply()
-  {
+  void testMultiply() {
     // Test with norm = 1
     multiplyTest(1., 1.);
 
@@ -63,11 +59,10 @@ class TestSiStripGain : public CppUnit::TestFixture {
     multiplyTest(2., 3.);
   }
 
-  void multiplyTest(const float & norm1, const float & norm2)
-  {
+  void multiplyTest(const float &norm1, const float &norm2) {
     std::pair<std::string, std::string> recordLabelPair1("gainRcd1", "");
     std::pair<std::string, std::string> recordLabelPair2("gainRcd2", "");
-    std::vector<std::pair<std::string, std::string> > recordLabelPairVector;
+    std::vector<std::pair<std::string, std::string>> recordLabelPairVector;
     recordLabelPairVector.push_back(recordLabelPair1);
     recordLabelPairVector.push_back(recordLabelPair2);
     std::vector<float> normVector;
@@ -79,73 +74,70 @@ class TestSiStripGain : public CppUnit::TestFixture {
     SiStripApvGain::Range range = gain.getRange(detId);
 
     // Check multiplication
-    CPPUNIT_ASSERT( float(gain.getApvGain(0, range)) == float(1./norm1*1./norm2));
-    CPPUNIT_ASSERT( float(gain.getApvGain(1, range)) == float(0.8/norm1*1./(0.8*norm2)));
-    CPPUNIT_ASSERT( float(gain.getApvGain(2, range)) == float(1.2/norm1*1./(1.2*norm2)));
-    CPPUNIT_ASSERT( float(gain.getApvGain(3, range)) == float(2./norm1*2./norm2));
+    CPPUNIT_ASSERT(float(gain.getApvGain(0, range)) == float(1. / norm1 * 1. / norm2));
+    CPPUNIT_ASSERT(float(gain.getApvGain(1, range)) == float(0.8 / norm1 * 1. / (0.8 * norm2)));
+    CPPUNIT_ASSERT(float(gain.getApvGain(2, range)) == float(1.2 / norm1 * 1. / (1.2 * norm2)));
+    CPPUNIT_ASSERT(float(gain.getApvGain(3, range)) == float(2. / norm1 * 2. / norm2));
 
     checkTag(gain, normVector, normVector.size(), recordLabelPairVector);
   }
 
-  void apvGainsTest(const float & norm)
-  {
+  void apvGainsTest(const float &norm) {
     SiStripGain gain(*apvGain1, norm);
     SiStripApvGain::Range range = gain.getRange(detId);
-    CPPUNIT_ASSERT( float(gain.getApvGain(0, range)) == float(1./norm));
-    CPPUNIT_ASSERT( float(gain.getApvGain(1, range)) == float(0.8/norm));
-    CPPUNIT_ASSERT( float(gain.getApvGain(2, range)) == float(1.2/norm));
-    CPPUNIT_ASSERT( float(gain.getApvGain(3, range)) == float(2./norm));
+    CPPUNIT_ASSERT(float(gain.getApvGain(0, range)) == float(1. / norm));
+    CPPUNIT_ASSERT(float(gain.getApvGain(1, range)) == float(0.8 / norm));
+    CPPUNIT_ASSERT(float(gain.getApvGain(2, range)) == float(1.2 / norm));
+    CPPUNIT_ASSERT(float(gain.getApvGain(3, range)) == float(2. / norm));
     checkTag(gain, norm, "", "");
 
     SiStripGain gain2(*apvGain2, norm);
     SiStripApvGain::Range range2 = gain2.getRange(detId);
-    CPPUNIT_ASSERT( float(gain2.getApvGain(0, range2)) == float(1./norm));
-    CPPUNIT_ASSERT( float(gain2.getApvGain(1, range2)) == float(1./(norm*0.8)));
-    CPPUNIT_ASSERT( float(gain2.getApvGain(2, range2)) == float(1./(norm*1.2)));
-    CPPUNIT_ASSERT( float(gain2.getApvGain(3, range2)) == float(2./norm));
+    CPPUNIT_ASSERT(float(gain2.getApvGain(0, range2)) == float(1. / norm));
+    CPPUNIT_ASSERT(float(gain2.getApvGain(1, range2)) == float(1. / (norm * 0.8)));
+    CPPUNIT_ASSERT(float(gain2.getApvGain(2, range2)) == float(1. / (norm * 1.2)));
+    CPPUNIT_ASSERT(float(gain2.getApvGain(3, range2)) == float(2. / norm));
     checkTag(gain2, norm, "", "");
   }
 
-  void checkTag(const SiStripGain & gain, const float & norm,
-		const std::string & rcdName, const std::string & labelName)
-  {
+  void checkTag(const SiStripGain &gain, const float &norm, const std::string &rcdName, const std::string &labelName) {
     std::vector<float> normVector;
     normVector.push_back(norm);
-    std::vector<std::pair<std::string, std::string> > recordLabelPairVector;
+    std::vector<std::pair<std::string, std::string>> recordLabelPairVector;
     recordLabelPairVector.push_back(std::make_pair(rcdName, labelName));
     checkTag(gain, normVector, 1, recordLabelPairVector);
   }
-  void checkTag(const SiStripGain & gain, const std::vector<float> & norm, const uint32_t tagNum,
-		const std::vector<std::pair<std::string, std::string> > & recordLabelPair)
-  {
-    CPPUNIT_ASSERT( gain.getNumberOfTags() == tagNum );
-    for( unsigned int i=0; i<tagNum; ++i ) {
-      CPPUNIT_ASSERT( float(gain.getTagNorm(i)) == norm[i] );
-      CPPUNIT_ASSERT( gain.getRcdName(i) == recordLabelPair[i].first );
-      CPPUNIT_ASSERT( gain.getLabelName(i) == recordLabelPair[i].second );
+  void checkTag(const SiStripGain &gain,
+                const std::vector<float> &norm,
+                const uint32_t tagNum,
+                const std::vector<std::pair<std::string, std::string>> &recordLabelPair) {
+    CPPUNIT_ASSERT(gain.getNumberOfTags() == tagNum);
+    for (unsigned int i = 0; i < tagNum; ++i) {
+      CPPUNIT_ASSERT(float(gain.getTagNorm(i)) == norm[i]);
+      CPPUNIT_ASSERT(gain.getRcdName(i) == recordLabelPair[i].first);
+      CPPUNIT_ASSERT(gain.getLabelName(i) == recordLabelPair[i].second);
     }
   }
 
-  void fillApvGain(SiStripApvGain * apvGain, const uint32_t detId, const std::vector<float> & theSiStripVector)
-  {
-    SiStripApvGain::Range range(theSiStripVector.begin(),theSiStripVector.end());
-    apvGain->put(detId,range);
+  void fillApvGain(SiStripApvGain *apvGain, const uint32_t detId, const std::vector<float> &theSiStripVector) {
+    SiStripApvGain::Range range(theSiStripVector.begin(), theSiStripVector.end());
+    apvGain->put(detId, range);
   }
 
-  SiStripApvGain * apvGain1;
-  SiStripApvGain * apvGain2;
+  SiStripApvGain *apvGain1;
+  SiStripApvGain *apvGain2;
   uint32_t detId;
 
   // Declare and build the test suite
-  CPPUNIT_TEST_SUITE( TestSiStripGain );
-  CPPUNIT_TEST( testConstructor );
-  CPPUNIT_TEST( testMultiply );
+  CPPUNIT_TEST_SUITE(TestSiStripGain);
+  CPPUNIT_TEST(testConstructor);
+  CPPUNIT_TEST(testMultiply);
   CPPUNIT_TEST_SUITE_END();
 };
 
 // Register the test suite in the registry.
 // This way we will have to only pass the registry to the runner
 // and it will contain all the registered test suites.
-CPPUNIT_TEST_SUITE_REGISTRATION( TestSiStripGain );
+CPPUNIT_TEST_SUITE_REGISTRATION(TestSiStripGain);
 
 #endif
diff --git a/CalibFormats/SiStripObjects/test/plugins/module.cc b/CalibFormats/SiStripObjects/test/plugins/module.cc
index 35ae31756b38b..5df9a54b05a9e 100644
--- a/CalibFormats/SiStripObjects/test/plugins/module.cc
+++ b/CalibFormats/SiStripObjects/test/plugins/module.cc
@@ -1,6 +1,4 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-
 #include "CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.h"
 DEFINE_FWK_MODULE(testSiStripHashedDetId);
-
diff --git a/CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.cc b/CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.cc
index c82f857fc36fd..3139ba4fb23e5 100644
--- a/CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.cc
+++ b/CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.cc
@@ -1,204 +1,184 @@
 
-#include "CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripHashedDetId.h"
+#include "CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.h"
 #include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
-#include "FWCore/Framework/interface/Event.h" 
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" 
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "Geometry/CommonDetUnit/interface/GeomDetType.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
-#include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h"
-#include <boost/cstdint.hpp>
+#include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include <algorithm>
+#include <boost/cstdint.hpp>
 #include <iostream>
 #include <sstream>
-#include <vector>
 #include <time.h>
+#include <vector>
 
 using namespace sistrip;
 
 // -----------------------------------------------------------------------------
-// 
-testSiStripHashedDetId::testSiStripHashedDetId( const edm::ParameterSet& pset ) 
-{
-  edm::LogVerbatim(mlDqmCommon_)
-    << "[testSiStripHashedDetId::" << __func__ << "]"
-    << " Constructing object...";
+//
+testSiStripHashedDetId::testSiStripHashedDetId(const edm::ParameterSet &pset) {
+  edm::LogVerbatim(mlDqmCommon_) << "[testSiStripHashedDetId::" << __func__ << "]"
+                                 << " Constructing object...";
 }
 
 // -----------------------------------------------------------------------------
-// 
+//
 testSiStripHashedDetId::~testSiStripHashedDetId() {
-  edm::LogVerbatim(mlDqmCommon_)
-    << "[testSiStripHashedDetId::" << __func__ << "]"
-    << " Destructing object...";
+  edm::LogVerbatim(mlDqmCommon_) << "[testSiStripHashedDetId::" << __func__ << "]"
+                                 << " Destructing object...";
 }
 
 // -----------------------------------------------------------------------------
-// 
-void testSiStripHashedDetId::initialize( const edm::EventSetup& setup ) {
-  edm::LogVerbatim(mlDqmCommon_)
-    << "[SiStripHashedDetId::" << __func__ << "]"
-    << " Tests the generation of DetId hash map...";
-  
+//
+void testSiStripHashedDetId::initialize(const edm::EventSetup &setup) {
+  edm::LogVerbatim(mlDqmCommon_) << "[SiStripHashedDetId::" << __func__ << "]"
+                                 << " Tests the generation of DetId hash map...";
+
   // Retrieve geometry
   edm::ESHandle<TrackerGeometry> geom;
-  setup.get<TrackerDigiGeometryRecord>().get( geom );
+  setup.get<TrackerDigiGeometryRecord>().get(geom);
 
   // Build list of DetIds
   std::vector<uint32_t> dets;
   dets.reserve(16000);
   TrackerGeometry::DetContainer::const_iterator iter = geom->detUnits().begin();
-  for( ; iter != geom->detUnits().end(); ++iter ) {
-    const auto strip = dynamic_cast<const StripGeomDetUnit*>(*iter);
-    if( strip ) {
-      dets.push_back( (strip->geographicalId()).rawId() );
+  for (; iter != geom->detUnits().end(); ++iter) {
+    const auto strip = dynamic_cast<const StripGeomDetUnit *>(*iter);
+    if (strip) {
+      dets.push_back((strip->geographicalId()).rawId());
     }
   }
-  edm::LogVerbatim(mlDqmCommon_)
-    << "[testSiStripHashedDetId::" << __func__ << "]"
-    << " Retrieved " << dets.size() 
-    << " strip DetIds from geometry!";
+  edm::LogVerbatim(mlDqmCommon_) << "[testSiStripHashedDetId::" << __func__ << "]"
+                                 << " Retrieved " << dets.size() << " strip DetIds from geometry!";
 
   // Sorted DetId list gives max performance, anything else is worse
-  if ( true ) { std::sort( dets.begin(), dets.end() ); }
-  else { std::reverse( dets.begin(), dets.end() ); }
-    
+  if (true) {
+    std::sort(dets.begin(), dets.end());
+  } else {
+    std::reverse(dets.begin(), dets.end());
+  }
+
   // Manipulate DetId list
-  if ( false ) {
-    if ( dets.size() > 4 ) {
+  if (false) {
+    if (dets.size() > 4) {
       uint32_t temp = dets.front();
-      dets.front() = dets.back();          // swapped
-      dets.back() = temp;                  // swapped
-      dets.at(1) = 0x00000001;             // wrong
-      dets.at(dets.size()-2) = 0xFFFFFFFF; // wrong
+      dets.front() = dets.back();             // swapped
+      dets.back() = temp;                     // swapped
+      dets.at(1) = 0x00000001;                // wrong
+      dets.at(dets.size() - 2) = 0xFFFFFFFF;  // wrong
     }
   }
 
   // Create hash map
-  SiStripHashedDetId hash( dets );
-  LogTrace(mlDqmCommon_)
-    << "[testSiStripHashedDetId::" << __func__ << "]"
-    << " DetId hash map: " << std::endl
-    << hash;
+  SiStripHashedDetId hash(dets);
+  LogTrace(mlDqmCommon_) << "[testSiStripHashedDetId::" << __func__ << "]"
+                         << " DetId hash map: " << std::endl
+                         << hash;
 
   // Manipulate DetId list
-  if ( false ) {
-    if ( dets.size() > 4 ) {
+  if (false) {
+    if (dets.size() > 4) {
       uint32_t temp = dets.front();
-      dets.front() = dets.back();          // swapped
-      dets.back() = temp;                  // swapped
-      dets.at(1) = 0x00000001;             // wrong
-      dets.at(dets.size()-2) = 0xFFFFFFFF; // wrong
+      dets.front() = dets.back();             // swapped
+      dets.back() = temp;                     // swapped
+      dets.at(1) = 0x00000001;                // wrong
+      dets.at(dets.size() - 2) = 0xFFFFFFFF;  // wrong
     }
   }
-  
+
   // Retrieve hashed indices
   std::vector<uint32_t> hashes;
   uint32_t istart = time(NULL);
-  for( uint16_t tt = 0; tt < 10000; ++tt ) { // 10000 loops just to see some non-negligible time meaasurement!
+  for (uint16_t tt = 0; tt < 10000; ++tt) {  // 10000 loops just to see some non-negligible time meaasurement!
     hashes.clear();
     hashes.reserve(dets.size());
     std::vector<uint32_t>::const_iterator idet = dets.begin();
-    for( ; idet != dets.end(); ++idet ) {
-      hashes.push_back( hash.hashedIndex(*idet) );
+    for (; idet != dets.end(); ++idet) {
+      hashes.push_back(hash.hashedIndex(*idet));
     }
   }
-  
+
   // Some debug
   std::stringstream ss;
   ss << "[testSiStripHashedDetId::" << __func__ << "]";
   std::vector<uint32_t>::const_iterator ii = hashes.begin();
   uint16_t cntr1 = 0;
-  for( ; ii != hashes.end(); ++ii ) {
-    if ( *ii == sistrip::invalid32_ ) {
+  for (; ii != hashes.end(); ++ii) {
+    if (*ii == sistrip::invalid32_) {
       cntr1++;
-      ss << std::endl
-	 << " Invalid index " 
-	 << *ii;
+      ss << std::endl << " Invalid index " << *ii;
       continue;
     }
     uint32_t detid = hash.unhashIndex(*ii);
-    std::vector<uint32_t>::const_iterator iter = find( dets.begin(), dets.end(), detid );
-    if ( iter == dets.end() ) {
+    std::vector<uint32_t>::const_iterator iter = find(dets.begin(), dets.end(), detid);
+    if (iter == dets.end()) {
       cntr1++;
-      ss << std::endl
-	 << " Did not find value " 
-	 << detid << " at index " 
-	 << ii-hashes.begin()
-	 << " in vector!";
-    } else if ( *ii != static_cast<uint32_t>(iter-dets.begin()) ) {
+      ss << std::endl << " Did not find value " << detid << " at index " << ii - hashes.begin() << " in vector!";
+    } else if (*ii != static_cast<uint32_t>(iter - dets.begin())) {
       cntr1++;
       ss << std::endl
-	 << " Found same value " 
-	 << detid << " at different indices " 
-	 << *ii << " and " 
-	 << iter-dets.begin();
+         << " Found same value " << detid << " at different indices " << *ii << " and " << iter - dets.begin();
     }
   }
-  if ( cntr1 ) { ss << std::endl << " Found " << cntr1 << " incompatible values!"; }
-  else { ss << " Found no incompatible values!"; }
+  if (cntr1) {
+    ss << std::endl << " Found " << cntr1 << " incompatible values!";
+  } else {
+    ss << " Found no incompatible values!";
+  }
   LogTrace(mlDqmCommon_) << ss.str();
 
-  edm::LogVerbatim(mlDqmCommon_)
-    << "[testSiStripHashedDetId::" << __func__ << "]"
-    << " Processed " << hashes.size()
-    << " DetIds in " << (time(NULL)-istart)
-    << " seconds";
-  
+  edm::LogVerbatim(mlDqmCommon_) << "[testSiStripHashedDetId::" << __func__ << "]"
+                                 << " Processed " << hashes.size() << " DetIds in " << (time(NULL) - istart)
+                                 << " seconds";
+
   // Retrieve DetIds
   std::vector<uint32_t> detids;
   uint32_t jstart = time(NULL);
-  for( uint16_t ttt = 0; ttt < 10000; ++ttt ) { // 10000 loops just to see some non-negligible time meaasurement!
+  for (uint16_t ttt = 0; ttt < 10000; ++ttt) {  // 10000 loops just to see some non-negligible time
+                                                // meaasurement!
     detids.clear();
     detids.reserve(dets.size());
-    for( uint16_t idet = 0; idet < dets.size(); ++idet ) {
-      detids.push_back( hash.unhashIndex(idet) );
+    for (uint16_t idet = 0; idet < dets.size(); ++idet) {
+      detids.push_back(hash.unhashIndex(idet));
     }
   }
-  
+
   // Some debug
   std::stringstream sss;
   sss << "[testSiStripHashedDetId::" << __func__ << "]";
   uint16_t cntr2 = 0;
   std::vector<uint32_t>::const_iterator iii = detids.begin();
-  for( ; iii != detids.end(); ++iii ) {
-    if ( *iii != dets.at(iii-detids.begin()) ) {
+  for (; iii != detids.end(); ++iii) {
+    if (*iii != dets.at(iii - detids.begin())) {
       cntr2++;
       sss << std::endl
-	  << " Diff values " 
-	  << *iii << " and " 
-	  << dets.at(iii-detids.begin())
-	  << " found at index " 
-	  << iii-detids.begin() << " ";
+          << " Diff values " << *iii << " and " << dets.at(iii - detids.begin()) << " found at index "
+          << iii - detids.begin() << " ";
     }
   }
-  if ( cntr2 ) { sss << std::endl << " Found " << cntr2 << " incompatible values!"; }
-  else { sss << " Found no incompatible values!"; }
+  if (cntr2) {
+    sss << std::endl << " Found " << cntr2 << " incompatible values!";
+  } else {
+    sss << " Found no incompatible values!";
+  }
   LogTrace(mlDqmCommon_) << sss.str();
 
-  edm::LogVerbatim(mlDqmCommon_)
-    << "[testSiStripHashedDetId::" << __func__ << "]"
-    << " Processed " << detids.size()
-    << " hashed indices in " << (time(NULL)-jstart)
-    << " seconds";
- 
+  edm::LogVerbatim(mlDqmCommon_) << "[testSiStripHashedDetId::" << __func__ << "]"
+                                 << " Processed " << detids.size() << " hashed indices in " << (time(NULL) - jstart)
+                                 << " seconds";
 }
 
 // -----------------------------------------------------------------------------
-// 
-void testSiStripHashedDetId::analyze( const edm::Event& event, 
-				       const edm::EventSetup& setup ) {
+//
+void testSiStripHashedDetId::analyze(const edm::Event &event, const edm::EventSetup &setup) {
   initialize(setup);
-  LogTrace(mlDqmCommon_) 
-    << "[testSiStripHashedDetId::" << __func__ << "]"
-    << " Analyzing run/event "
-    << event.id().run() << "/"
-    << event.id().event();
+  LogTrace(mlDqmCommon_) << "[testSiStripHashedDetId::" << __func__ << "]"
+                         << " Analyzing run/event " << event.id().run() << "/" << event.id().event();
 }
-
-
diff --git a/CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.h b/CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.h
index cd307d95138f8..aa7d028dd0ed4 100644
--- a/CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.h
+++ b/CalibFormats/SiStripObjects/test/plugins/testSiStripHashedDetId.h
@@ -6,22 +6,18 @@
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
 /**
-   @class test_SiStripHashedDetId 
+   @class test_SiStripHashedDetId
    @author R.Bainbridge
    @brief Simple class that tests SiStripHashedDetId.
 */
 class testSiStripHashedDetId : public edm::EDAnalyzer {
-
- public:
-  
-  testSiStripHashedDetId( const edm::ParameterSet& );
+public:
+  testSiStripHashedDetId(const edm::ParameterSet &);
   ~testSiStripHashedDetId();
-  
-  void initialize( edm::EventSetup const& );
-  void analyze( const edm::Event&, const edm::EventSetup& );
-  void endJob() {;}
-  
-};
 
-#endif // CalibFormats_SiStripObjects_test_SiStripHashedDetId_H
+  void initialize(edm::EventSetup const &);
+  void analyze(const edm::Event &, const edm::EventSetup &);
+  void endJob() { ; }
+};
 
+#endif  // CalibFormats_SiStripObjects_test_SiStripHashedDetId_H
diff --git a/CalibMuon/CSCCalibration/interface/CSCBadChambersConditions.h b/CalibMuon/CSCCalibration/interface/CSCBadChambersConditions.h
index 92b00edcd2db6..c939921d61ad6 100644
--- a/CalibMuon/CSCCalibration/interface/CSCBadChambersConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCBadChambersConditions.h
@@ -1,82 +1,80 @@
 #ifndef _CSCBADCHAMBERSCONDITIONS_H
 #define _CSCBADCHAMBERSCONDITIONS_H
 
-#include <memory>
-#include <cmath>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <cmath>
+#include <memory>
 
-#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 #include "CondFormats/CSCObjects/interface/CSCBadChambers.h"
 #include "CondFormats/DataRecord/interface/CSCBadChambersRcd.h"
+#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCBadChambersConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
- public:
-  CSCBadChambersConditions(const edm::ParameterSet&);
+class CSCBadChambersConditions : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCBadChambersConditions(const edm::ParameterSet &);
   ~CSCBadChambersConditions() override;
-  
 
-  inline static CSCBadChambers *  prefillBadChambers();
+  inline static CSCBadChambers *prefillBadChambers();
 
   typedef std::unique_ptr<CSCBadChambers> ReturnType;
-  
-  ReturnType produceBadChambers(const CSCBadChambersRcd&);
-  
- private:
-  // ----------member data ---------------------------
-  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
-  CSCBadChambers *cndbBadChambers ;
 
+  ReturnType produceBadChambers(const CSCBadChambersRcd &);
+
+private:
+  // ----------member data ---------------------------
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
+  CSCBadChambers *cndbBadChambers;
 };
 
-#include<fstream>
-#include<vector>
-#include<iostream>
+#include <fstream>
+#include <iostream>
+#include <vector>
 
 // to workaround plugin library
-inline CSCBadChambers *  CSCBadChambersConditions::prefillBadChambers()
-{
+inline CSCBadChambers *CSCBadChambersConditions::prefillBadChambers() {
   //  const int MAX_SIZE = 468;
-  //cndbbadchambers = new CSCBadChambers();
+  // cndbbadchambers = new CSCBadChambers();
 
   int new_chambers;
   std::vector<int> new_badchambers;
   int old_chamber = -1;
   int new_nrlines;
-  new_nrlines=0;
- 
+  new_nrlines = 0;
+
   std::ifstream newdata;
 
-  newdata.open("badchambers.dat",std::ios::in);
-  if(!newdata) {
-    std::cerr <<"Error: badchambers.dat -> no such file!"<< std::endl;
+  newdata.open("badchambers.dat", std::ios::in);
+  if (!newdata) {
+    std::cerr << "Error: badchambers.dat -> no such file!" << std::endl;
     exit(1);
   }
 
-  while(!newdata.eof() ) {
-
+  while (!newdata.eof()) {
     newdata >> new_chambers;
-    if (new_chambers!=old_chamber){
-    new_badchambers.push_back(new_chambers);
-    std::cout<<new_chambers<<std::endl;  
-    ++new_nrlines;
+    if (new_chambers != old_chamber) {
+      new_badchambers.push_back(new_chambers);
+      std::cout << new_chambers << std::endl;
+      ++new_nrlines;
     }
     old_chamber = new_chambers;
   }
   newdata.close();
 
-  CSCBadChambers * cndbbadchambers = new CSCBadChambers(new_nrlines, new_badchambers);  
+  CSCBadChambers *cndbbadchambers = new CSCBadChambers(new_nrlines, new_badchambers);
 
-  //std::cout <<"numberOfBadChambers "<<new_nrlines<<std::endl;
+  // std::cout <<"numberOfBadChambers "<<new_nrlines<<std::endl;
 
-   return cndbbadchambers;
+  return cndbbadchambers;
 }
 
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCBadStripsConditions.h b/CalibMuon/CSCCalibration/interface/CSCBadStripsConditions.h
index cd52f4bd0d8d0..33d074e8d3b6b 100644
--- a/CalibMuon/CSCCalibration/interface/CSCBadStripsConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCBadStripsConditions.h
@@ -1,52 +1,51 @@
 #ifndef _CSCBADSTRIPSCONDITIONS_H
 #define _CSCBADSTRIPSCONDITIONS_H
 
-#include <memory>
-#include <cmath>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <cmath>
+#include <memory>
 
-#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 #include "CondFormats/CSCObjects/interface/CSCBadStrips.h"
 #include "CondFormats/DataRecord/interface/CSCBadStripsRcd.h"
+#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCBadStripsConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
- public:
-  CSCBadStripsConditions(const edm::ParameterSet&);
+class CSCBadStripsConditions : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCBadStripsConditions(const edm::ParameterSet &);
   ~CSCBadStripsConditions() override;
-  
 
-  inline static CSCBadStrips *  prefillBadStrips();
+  inline static CSCBadStrips *prefillBadStrips();
 
   typedef std::unique_ptr<CSCBadStrips> ReturnType;
-  
-  ReturnType produceBadStrips(const CSCBadStripsRcd&);
-  
- private:
-  // ----------member data ---------------------------
-  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
-  CSCBadStrips *cndbBadStrips ;
 
+  ReturnType produceBadStrips(const CSCBadStripsRcd &);
+
+private:
+  // ----------member data ---------------------------
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
+  CSCBadStrips *cndbBadStrips;
 };
 
-#include<fstream>
-#include<vector>
-#include<iostream>
+#include <fstream>
+#include <iostream>
+#include <vector>
 
 // to workaround plugin library
-inline CSCBadStrips *  CSCBadStripsConditions::prefillBadStrips()
-{
-  CSCBadStrips * cndbbadstrips = new CSCBadStrips();
+inline CSCBadStrips *CSCBadStripsConditions::prefillBadStrips() {
+  CSCBadStrips *cndbbadstrips = new CSCBadStrips();
 
   int new_index, new_chan;
-  int new_layer,new_channel, new_flag1, new_flag2, new_flag3,new_pointer;
+  int new_layer, new_channel, new_flag1, new_flag2, new_flag3, new_pointer;
   std::vector<int> new_index_id;
   std::vector<short int> new_layer_id;
   std::vector<short int> new_chan_id;
@@ -56,30 +55,29 @@ inline CSCBadStrips *  CSCBadStripsConditions::prefillBadStrips()
   std::vector<short int> new_flag3_id;
   std::vector<int> new_cham_id;
   std::vector<int> new_point;
-  
-  //when bad channels exist use the following
-   int new_nrlines1=0;
-   int new_nrlines2=0;
-  //when empty
-  //int new_nrlines1=-1;
-  //int new_nrlines2=-1;
-
- 
+
+  // when bad channels exist use the following
+  int new_nrlines1 = 0;
+  int new_nrlines2 = 0;
+  // when empty
+  // int new_nrlines1=-1;
+  // int new_nrlines2=-1;
+
   std::ifstream newdata1;
   std::ifstream newdata2;
 
-  newdata1.open("badstrips1.dat",std::ios::in); //chambercontainer
-  if(!newdata1) {
-    std::cerr <<"Error: badstrips1.dat -> no such file!"<< std::endl;
+  newdata1.open("badstrips1.dat", std::ios::in);  // chambercontainer
+  if (!newdata1) {
+    std::cerr << "Error: badstrips1.dat -> no such file!" << std::endl;
     exit(1);
   }
-  newdata2.open("badstrips2.dat",std::ios::in); //channelcontainer
-  if(!newdata2) {
-    std::cerr <<"Error: badstrips2.dat -> no such file!"<< std::endl;
+  newdata2.open("badstrips2.dat", std::ios::in);  // channelcontainer
+  if (!newdata2) {
+    std::cerr << "Error: badstrips2.dat -> no such file!" << std::endl;
     exit(1);
   }
 
-  while(!newdata1.eof() ) {
+  while (!newdata1.eof()) {
     newdata1 >> new_index >> new_pointer >> new_chan;
     new_index_id.push_back(new_index);
     new_point.push_back(new_pointer);
@@ -88,8 +86,8 @@ inline CSCBadStrips *  CSCBadStripsConditions::prefillBadStrips()
   }
   newdata1.close();
 
-  while (!newdata2.eof() ) { 
-    newdata2 >> new_layer >> new_channel >> new_flag1 >> new_flag2 >> new_flag3; 
+  while (!newdata2.eof()) {
+    newdata2 >> new_layer >> new_channel >> new_flag1 >> new_flag2 >> new_flag3;
     new_layer_id.push_back(new_layer);
     new_chan_id.push_back(new_channel);
     new_flag1_id.push_back(new_flag1);
@@ -98,32 +96,30 @@ inline CSCBadStrips *  CSCBadStripsConditions::prefillBadStrips()
     new_nrlines2++;
   }
   newdata2.close();
-  
 
-  CSCBadStrips::BadChamberContainer & itemvector1 = cndbbadstrips->chambers;
+  CSCBadStrips::BadChamberContainer &itemvector1 = cndbbadstrips->chambers;
   itemvector1.resize(new_nrlines1);
-  
-  CSCBadStrips::BadChannelContainer & itemvector2 = cndbbadstrips->channels;
+
+  CSCBadStrips::BadChannelContainer &itemvector2 = cndbbadstrips->channels;
   itemvector2.resize(new_nrlines2);
-  
+
   cndbbadstrips->numberOfBadChannels = new_nrlines2;
- 
-  for(int i=0; i<new_nrlines1;i++){
+
+  for (int i = 0; i < new_nrlines1; i++) {
     itemvector1[i].chamber_index = new_index_id[i];
     itemvector1[i].pointer = new_point[i];
     itemvector1[i].bad_channels = new_badchannels[i];
   }
 
-  for(int j=0;j<new_nrlines2;j++) {
-    itemvector2[j].layer =  new_layer_id[j];
+  for (int j = 0; j < new_nrlines2; j++) {
+    itemvector2[j].layer = new_layer_id[j];
     itemvector2[j].channel = new_chan_id[j];
-    itemvector2[j].flag1 =  new_flag1_id[j];
+    itemvector2[j].flag1 = new_flag1_id[j];
     itemvector2[j].flag2 = new_flag2_id[j];
     itemvector2[j].flag3 = new_flag3_id[j];
   }
 
-   return cndbbadstrips;
+  return cndbbadstrips;
 }
 
 #endif
-
diff --git a/CalibMuon/CSCCalibration/interface/CSCBadWiresConditions.h b/CalibMuon/CSCCalibration/interface/CSCBadWiresConditions.h
index ba0f3e28b0c04..23a925083d702 100644
--- a/CalibMuon/CSCCalibration/interface/CSCBadWiresConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCBadWiresConditions.h
@@ -1,52 +1,51 @@
 #ifndef _CSCBADWIRESCONDITIONS_H
 #define _CSCBADWIRESCONDITIONS_H
 
-#include <memory>
-#include <cmath>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <cmath>
+#include <memory>
 
-#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 #include "CondFormats/CSCObjects/interface/CSCBadWires.h"
 #include "CondFormats/DataRecord/interface/CSCBadWiresRcd.h"
+#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCBadWiresConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
- public:
-  CSCBadWiresConditions(const edm::ParameterSet&);
+class CSCBadWiresConditions : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCBadWiresConditions(const edm::ParameterSet &);
   ~CSCBadWiresConditions() override;
-  
 
-  inline static CSCBadWires *  prefillBadWires();
+  inline static CSCBadWires *prefillBadWires();
 
   typedef std::unique_ptr<CSCBadWires> ReturnType;
-  
-  ReturnType produceBadWires(const CSCBadWiresRcd&);
-  
- private:
-  // ----------member data ---------------------------
-  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
-  CSCBadWires *cndbBadWires ;
 
+  ReturnType produceBadWires(const CSCBadWiresRcd &);
+
+private:
+  // ----------member data ---------------------------
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
+  CSCBadWires *cndbBadWires;
 };
 
-#include<fstream>
-#include<vector>
-#include<iostream>
+#include <fstream>
+#include <iostream>
+#include <vector>
 
 // to workaround plugin library
-inline CSCBadWires *  CSCBadWiresConditions::prefillBadWires()
-{
-  CSCBadWires * cndbbadwires = new CSCBadWires();
+inline CSCBadWires *CSCBadWiresConditions::prefillBadWires() {
+  CSCBadWires *cndbbadwires = new CSCBadWires();
 
-  int new_index,new_chan;
-  int new_layer,new_channel, new_flag1,  new_flag2, new_flag3,new_pointer;
+  int new_index, new_chan;
+  int new_layer, new_channel, new_flag1, new_flag2, new_flag3, new_pointer;
   std::vector<int> new_index_id;
   std::vector<short int> new_layer_id;
   std::vector<short int> new_chan_id;
@@ -57,38 +56,38 @@ inline CSCBadWires *  CSCBadWiresConditions::prefillBadWires()
   std::vector<int> new_cham_id;
   std::vector<int> new_point;
 
-  //when bad channels exist use the following
-   int new_nrlines1=0;
-   int new_nrlines2=0;
-  //when empty
-  //int new_nrlines1=-1;
-  //int new_nrlines2=-1;
- 
+  // when bad channels exist use the following
+  int new_nrlines1 = 0;
+  int new_nrlines2 = 0;
+  // when empty
+  // int new_nrlines1=-1;
+  // int new_nrlines2=-1;
+
   std::ifstream newdata1;
   std::ifstream newdata2;
 
-  newdata1.open("badwires1.dat",std::ios::in); 
-  if(!newdata1) {
-    std::cerr <<"Error: badwires1.dat -> no such file!"<< std::endl;
+  newdata1.open("badwires1.dat", std::ios::in);
+  if (!newdata1) {
+    std::cerr << "Error: badwires1.dat -> no such file!" << std::endl;
     exit(1);
   }
-  newdata2.open("badwires2.dat",std::ios::in); //channelcontainer
-  if(!newdata2) {
-    std::cerr <<"Error: badwires2.dat -> no such file!"<< std::endl;
+  newdata2.open("badwires2.dat", std::ios::in);  // channelcontainer
+  if (!newdata2) {
+    std::cerr << "Error: badwires2.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!newdata1.eof() ) { 
-    newdata1 >> new_index >> new_pointer >> new_chan; 
+
+  while (!newdata1.eof()) {
+    newdata1 >> new_index >> new_pointer >> new_chan;
     new_index_id.push_back(new_index);
     new_point.push_back(new_pointer);
-     new_badchannels.push_back(new_chan);
+    new_badchannels.push_back(new_chan);
     new_nrlines1++;
   }
   newdata1.close();
-  
- while (!newdata2.eof() ) { 
-    newdata2 >> new_layer >> new_channel >> new_flag1 >> new_flag2 >> new_flag3; 
+
+  while (!newdata2.eof()) {
+    newdata2 >> new_layer >> new_channel >> new_flag1 >> new_flag2 >> new_flag3;
     new_layer_id.push_back(new_layer);
     new_chan_id.push_back(new_channel);
     new_flag1_id.push_back(new_flag1);
@@ -98,33 +97,29 @@ inline CSCBadWires *  CSCBadWiresConditions::prefillBadWires()
   }
   newdata2.close();
 
- 
-  CSCBadWires::BadChamberContainer & itemvector1 = cndbbadwires->chambers;
+  CSCBadWires::BadChamberContainer &itemvector1 = cndbbadwires->chambers;
   itemvector1.resize(new_nrlines1);
-  
 
-  CSCBadWires::BadChannelContainer & itemvector2 = cndbbadwires->channels;
+  CSCBadWires::BadChannelContainer &itemvector2 = cndbbadwires->channels;
   itemvector2.resize(new_nrlines2);
-  
+
   cndbbadwires->numberOfBadChannels = new_nrlines2;
 
-  for(int i=0; i<new_nrlines1;i++){
+  for (int i = 0; i < new_nrlines1; i++) {
     itemvector1[i].chamber_index = new_index_id[i];
     itemvector1[i].pointer = new_point[i];
     itemvector1[i].bad_channels = new_badchannels[i];
-    
   }
 
-  for(int j=0; j<new_nrlines2;++j){
-       itemvector2[j].layer = new_layer_id[j];
-       itemvector2[j].channel = new_chan_id[j];
-       itemvector2[j].flag1 = new_flag1_id[j];
-       itemvector2[j].flag2 = new_flag2_id[j];
-       itemvector2[j].flag3 = new_flag3_id[j];
+  for (int j = 0; j < new_nrlines2; ++j) {
+    itemvector2[j].layer = new_layer_id[j];
+    itemvector2[j].channel = new_chan_id[j];
+    itemvector2[j].flag1 = new_flag1_id[j];
+    itemvector2[j].flag2 = new_flag2_id[j];
+    itemvector2[j].flag3 = new_flag3_id[j];
   }
 
   return cndbbadwires;
 }
 
 #endif
-
diff --git a/CalibMuon/CSCCalibration/interface/CSCChannelMapperBase.h b/CalibMuon/CSCCalibration/interface/CSCChannelMapperBase.h
index 538fc4e335135..37717f7d4ed0e 100644
--- a/CalibMuon/CSCCalibration/interface/CSCChannelMapperBase.h
+++ b/CalibMuon/CSCCalibration/interface/CSCChannelMapperBase.h
@@ -10,23 +10,28 @@
  * corresponds to increasing local x (strips) or y (wire groups) as defined
  * in CMS Note CMS IN-2007/024.
  *
- * The original of this class, CSCChannelTranslator, was written in the expectation
- * that one day it would be replaced by a full "cable map" stored in conditions data.
- * That has not yet been required and so the mappings are hard-coded.
+ * The original of this class, CSCChannelTranslator, was written in the
+ * expectation that one day it would be replaced by a full "cable map" stored in
+ * conditions data. That has not yet been required and so the mappings are
+ * hard-coded.
  *
  * Concrete derived classes must implement the following: <BR>
- * 1. Sort out any readout-flipping within the two endcaps for ME1a and ME1b strip channels. <BR>
- * 2. If ME1a is ganged then map the ME1a channels from online labels 65-80 to offline 1-16. <BR>
+ * 1. Sort out any readout-flipping within the two endcaps for ME1a and ME1b
+ * strip channels. <BR>
+ * 2. If ME1a is ganged then map the ME1a channels from online labels 65-80 to
+ * offline 1-16. <BR>
  * 3. Do nothing with wiregroup channels; the output = the input. <BR>
- * (Historically some test beam data needed wiregroup remapping but this was embedded directly in the
- * Unpacker of CSCRawToDigi. We want to move any such mappings into this class rather than have them 
- * scattered through the code.)
+ * (Historically some test beam data needed wiregroup remapping but this was
+ * embedded directly in the Unpacker of CSCRawToDigi. We want to move any such
+ * mappings into this class rather than have them scattered through the code.)
  *
- * Beware that if ME1a is ganged,the 48 strips in ME1a are fed to 16 channels, so it is important
- * to distinguish the nomenclatures "strip" vs "channel". It is usually a meaningful distinction!
+ * Beware that if ME1a is ganged,the 48 strips in ME1a are fed to 16 channels,
+ * so it is important to distinguish the nomenclatures "strip" vs "channel". It
+ * is usually a meaningful distinction!
  *
- * Also note that the CSCDetId for ME11 and ME1b is identical. Offline we presume ring=1 of station 1
- * to mean the ME1b strips. We use the identifier ring=4 to denote the ME1a strips.
+ * Also note that the CSCDetId for ME11 and ME1b is identical. Offline we
+ * presume ring=1 of station 1 to mean the ME1b strips. We use the identifier
+ * ring=4 to denote the ME1a strips.
  *
  * \author Tim Cox
  *
@@ -34,40 +39,40 @@
 
 #include "DataFormats/MuonDetId/interface/CSCDetId.h"
 
-class CSCChannelMapperBase{
- public:
-
+class CSCChannelMapperBase {
+public:
   CSCChannelMapperBase() {}
   virtual ~CSCChannelMapperBase() {}
 
-  virtual std::string name() const {return "CSCChannelMapperBase";}
+  virtual std::string name() const { return "CSCChannelMapperBase"; }
 
   /// Return raw strip channel number for input geometrical channel number
-  virtual int rawStripChannel( const CSCDetId& id, int igeom ) const = 0;
+  virtual int rawStripChannel(const CSCDetId &id, int igeom) const = 0;
   /// Return raw wiregroup channel number for input geometrical channel number
-  int rawWireChannel( const CSCDetId& id, int igeom ) const { return igeom; }
+  int rawWireChannel(const CSCDetId &id, int igeom) const { return igeom; }
   /// Return geometrical strip channel number for input raw channel number
-  virtual int geomStripChannel( const CSCDetId& id, int iraw ) const = 0;
+  virtual int geomStripChannel(const CSCDetId &id, int iraw) const = 0;
   /// Return geometrical wiregroup channel number for input raw channel number
-  int geomWireChannel( const CSCDetId& id, int iraw ) const { return iraw; }
+  int geomWireChannel(const CSCDetId &id, int iraw) const { return iraw; }
 
   /// Alias for rawStripChannel
-  int rawCathodeChannel( const CSCDetId& id, int igeom ) const { return rawStripChannel( id, igeom );}
+  int rawCathodeChannel(const CSCDetId &id, int igeom) const { return rawStripChannel(id, igeom); }
   /// Alias for rawWireChannel
-  int rawAnodeChannel( const CSCDetId& id, int igeom ) const { return rawWireChannel( id, igeom );}
+  int rawAnodeChannel(const CSCDetId &id, int igeom) const { return rawWireChannel(id, igeom); }
   /// Alias for geomStripChannel
-  int geomCathodeChannel( const CSCDetId& id, int iraw ) const { return geomStripChannel( id, iraw );}
+  int geomCathodeChannel(const CSCDetId &id, int iraw) const { return geomStripChannel(id, iraw); }
   /// Alias for geomWireChannel
-  int geomAnodeChannel( const CSCDetId& id, int iraw ) const { return geomWireChannel( id, iraw );}
+  int geomAnodeChannel(const CSCDetId &id, int iraw) const { return geomWireChannel(id, iraw); }
 
   /// Offline conversion of a strip (geometric labelling) back to channel
-  /// (At present this just has to convert the 48 strips of ME1A to 16 ganged channels.)
-  virtual int channelFromStrip( const CSCDetId& id, int strip ) const = 0;
+  /// (At present this just has to convert the 48 strips of ME1A to 16 ganged
+  /// channels.)
+  virtual int channelFromStrip(const CSCDetId &id, int strip) const = 0;
 
   /// Construct raw CSCDetId matching supplied offline CSCDetid
-  /// (At present all this has to do is return the ME11 CSCDetID when supplied with that for ME1A)
-  virtual CSCDetId rawCSCDetId( const CSCDetId& id ) const = 0;
-
+  /// (At present all this has to do is return the ME11 CSCDetID when supplied
+  /// with that for ME1A)
+  virtual CSCDetId rawCSCDetId(const CSCDetId &id) const = 0;
 };
 
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCChannelMapperESProducer.h b/CalibMuon/CSCCalibration/interface/CSCChannelMapperESProducer.h
index 3201ac115247a..cec42d0591025 100644
--- a/CalibMuon/CSCCalibration/interface/CSCChannelMapperESProducer.h
+++ b/CalibMuon/CSCCalibration/interface/CSCChannelMapperESProducer.h
@@ -9,16 +9,15 @@
 #include "CalibMuon/CSCCalibration/interface/CSCChannelMapperRecord.h"
 
 class CSCChannelMapperESProducer : public edm::ESProducer {
-
- public:
+public:
   typedef std::unique_ptr<CSCChannelMapperBase> BSP_TYPE;
 
-  CSCChannelMapperESProducer(const edm::ParameterSet&);
+  CSCChannelMapperESProducer(const edm::ParameterSet &);
   ~CSCChannelMapperESProducer() override;
 
-  BSP_TYPE produce(const CSCChannelMapperRecord&);
+  BSP_TYPE produce(const CSCChannelMapperRecord &);
 
- private:
+private:
   std::string algoName;
 };
 
diff --git a/CalibMuon/CSCCalibration/interface/CSCChannelMapperFactory.h b/CalibMuon/CSCCalibration/interface/CSCChannelMapperFactory.h
index cc860f429b3fd..63416ea4e6f49 100644
--- a/CalibMuon/CSCCalibration/interface/CSCChannelMapperFactory.h
+++ b/CalibMuon/CSCCalibration/interface/CSCChannelMapperFactory.h
@@ -1,9 +1,9 @@
 #ifndef CSCChannelMapperFactory_H
 #define CSCChannelMapperFactory_H
 
-#include "FWCore/PluginManager/interface/PluginFactory.h"
 #include "CalibMuon/CSCCalibration/interface/CSCChannelMapperBase.h"
+#include "FWCore/PluginManager/interface/PluginFactory.h"
 
-typedef edmplugin::PluginFactory< CSCChannelMapperBase* (void) > CSCChannelMapperFactory;
+typedef edmplugin::PluginFactory<CSCChannelMapperBase *(void)> CSCChannelMapperFactory;
 
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCChannelMapperPostls1.h b/CalibMuon/CSCCalibration/interface/CSCChannelMapperPostls1.h
index a24273b33f948..697a047c11137 100644
--- a/CalibMuon/CSCCalibration/interface/CSCChannelMapperPostls1.h
+++ b/CalibMuon/CSCCalibration/interface/CSCChannelMapperPostls1.h
@@ -12,13 +12,16 @@
  *
  * This version is for CMS Postls1 (2013-)
  *
- * 1. Sorts out readout-flipping within the two endcaps for ME1a and ME1b strip channels. <BR>
- *    We do not yet know whether there WILL be any flipping. For now we presume it is as in the Startup case. <BR>
- * 2. Doesnothing with ME1a channels since we intend each of the 48 strips to go to 48 individual channels. <BR>
+ * 1. Sorts out readout-flipping within the two endcaps for ME1a and ME1b strip
+ * channels. <BR> We do not yet know whether there WILL be any flipping. For now
+ * we presume it is as in the Startup case. <BR>
+ * 2. Doesnothing with ME1a channels since we intend each of the 48 strips to go
+ * to 48 individual channels. <BR>
  * 3. Does nothing with wiregroup channels; the output = the input. <BR>
  *
- * Also note that the CSCDetId for ME11 and ME1b is identical. Offline we presume ring=1 of station 1
- * to mean the ME1b strips. We use the identifier ring=4 to denote the ME1a strips.
+ * Also note that the CSCDetId for ME11 and ME1b is identical. Offline we
+ * presume ring=1 of station 1 to mean the ME1b strips. We use the identifier
+ * ring=4 to denote the ME1a strips.
  *
  * \author Tim Cox
  *
@@ -27,27 +30,25 @@
 #include "CalibMuon/CSCCalibration/interface/CSCChannelMapperBase.h"
 
 class CSCChannelMapperPostls1 : public CSCChannelMapperBase {
- public:
-
+public:
   CSCChannelMapperPostls1() {}
   ~CSCChannelMapperPostls1() override {}
 
-  std::string name() const override {return "CSCChannelMapperPostls1";}
+  std::string name() const override { return "CSCChannelMapperPostls1"; }
 
   /// Return raw strip channel number for input geometrical channel number
-  int rawStripChannel( const CSCDetId& id, int igeom ) const override;
+  int rawStripChannel(const CSCDetId &id, int igeom) const override;
 
   /// Return geometrical strip channel number for input raw channel number
-  int geomStripChannel( const CSCDetId& id, int iraw ) const override ;
+  int geomStripChannel(const CSCDetId &id, int iraw) const override;
 
   /// Offline conversion of a strip (geometric labelling) back to channel
   /// (Postls1: 1-1 correspondence strip to channel)
-  int channelFromStrip( const CSCDetId& id, int strip ) const override;
+  int channelFromStrip(const CSCDetId &id, int strip) const override;
 
   /// Construct raw CSCDetId matching supplied offline CSCDetid
   /// (Postls1: leave ME1a detid alone)
-  CSCDetId rawCSCDetId( const CSCDetId& id ) const override;
-
+  CSCDetId rawCSCDetId(const CSCDetId &id) const override;
 };
 
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCChannelMapperStartup.h b/CalibMuon/CSCCalibration/interface/CSCChannelMapperStartup.h
index b5bcd67182a26..acffaaf52c4d1 100644
--- a/CalibMuon/CSCCalibration/interface/CSCChannelMapperStartup.h
+++ b/CalibMuon/CSCCalibration/interface/CSCChannelMapperStartup.h
@@ -12,15 +12,18 @@
  *
  * This version is for CMS Startup (2008-2013)
  *
- * 1. Sorts out readout-flipping within the two endcaps for ME1a and ME1b strip channels. <BR>
+ * 1. Sorts out readout-flipping within the two endcaps for ME1a and ME1b strip
+ * channels. <BR>
  * 2. Maps the ME1a channels from online labels 65-80 to offline 1-16. <BR>
  * 3. Does nothing with wiregroup channels; the output = the input. <BR>
  *
- * Since ME1a is ganged, the 48 strips in ME1a are fed to 16 channels, so it is important
- * to distinguish the nomenclatures "strip" vs "channel". It is usually a meaningful distinction!
+ * Since ME1a is ganged, the 48 strips in ME1a are fed to 16 channels, so it is
+ * important to distinguish the nomenclatures "strip" vs "channel". It is
+ * usually a meaningful distinction!
  *
- * Also note that the CSCDetId for ME11 and ME1b is identical. Offline we presume ring=1 of station 1
- * to mean the ME1b strips. We use the identifier ring=4 to denote the ME1a strips.
+ * Also note that the CSCDetId for ME11 and ME1b is identical. Offline we
+ * presume ring=1 of station 1 to mean the ME1b strips. We use the identifier
+ * ring=4 to denote the ME1a strips.
  *
  * \author Tim Cox
  *
@@ -29,27 +32,25 @@
 #include "CalibMuon/CSCCalibration/interface/CSCChannelMapperBase.h"
 
 class CSCChannelMapperStartup : public CSCChannelMapperBase {
- public:
-
+public:
   CSCChannelMapperStartup() {}
   ~CSCChannelMapperStartup() override {}
 
-  std::string name() const override {return "CSCChannelMapperStartup";}
+  std::string name() const override { return "CSCChannelMapperStartup"; }
 
   /// Return raw strip channel number for input geometrical channel number
-  int rawStripChannel( const CSCDetId& id, int igeom ) const override;
+  int rawStripChannel(const CSCDetId &id, int igeom) const override;
 
   /// Return geometrical strip channel number for input raw channel number
-  int geomStripChannel( const CSCDetId& id, int iraw ) const override ;
+  int geomStripChannel(const CSCDetId &id, int iraw) const override;
 
   /// Offline conversion of a strip (geometric labelling) back to channel
   /// (Startup: convert the 48 strips of ME1A to 16 ganged channels.)
-  int channelFromStrip( const CSCDetId& id, int strip ) const override;
+  int channelFromStrip(const CSCDetId &id, int strip) const override;
 
   /// Construct raw CSCDetId matching supplied offline CSCDetid
   /// (Startup:  return the ME11 CSCDetID when supplied with that for ME1A)
-  CSCDetId rawCSCDetId( const CSCDetId& id ) const override;
-
+  CSCDetId rawCSCDetId(const CSCDetId &id) const override;
 };
 
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCChipSpeedCorrectionDBConditions.h b/CalibMuon/CSCCalibration/interface/CSCChipSpeedCorrectionDBConditions.h
index 43dc2ef5af2b2..f1eb86a12afcd 100644
--- a/CalibMuon/CSCCalibration/interface/CSCChipSpeedCorrectionDBConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCChipSpeedCorrectionDBConditions.h
@@ -1,108 +1,121 @@
 #ifndef _CSCCHIPSPEEDCORRECTIONDBCONDITIONS_H
 #define _CSCCHIPSPEEDCORRECTIONDBCONDITIONS_H
 
-#include <memory>
-#include <cmath>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <cmath>
+#include <memory>
 
-#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 #include "CondFormats/CSCObjects/interface/CSCDBChipSpeedCorrection.h"
 #include "CondFormats/DataRecord/interface/CSCDBChipSpeedCorrectionRcd.h"
 #include "DataFormats/MuonDetId/interface/CSCIndexer.h"
+#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCChipSpeedCorrectionDBConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
- public:
-  CSCChipSpeedCorrectionDBConditions(const edm::ParameterSet&);
+class CSCChipSpeedCorrectionDBConditions : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCChipSpeedCorrectionDBConditions(const edm::ParameterSet &);
   ~CSCChipSpeedCorrectionDBConditions() override;
-  
-  inline static CSCDBChipSpeedCorrection * prefillDBChipSpeedCorrection(bool isForMC, std::string dataCorrFileName, float dataOffse);
+
+  inline static CSCDBChipSpeedCorrection *prefillDBChipSpeedCorrection(bool isForMC,
+                                                                       std::string dataCorrFileName,
+                                                                       float dataOffse);
 
   typedef std::unique_ptr<CSCDBChipSpeedCorrection> ReturnType;
-  
-  ReturnType produceDBChipSpeedCorrection(const CSCDBChipSpeedCorrectionRcd&);
-  
- private:
+
+  ReturnType produceDBChipSpeedCorrection(const CSCDBChipSpeedCorrectionRcd &);
+
+private:
   // ----------member data ---------------------------
-  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
-  CSCDBChipSpeedCorrection *cndbChipCorr ;
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
+  CSCDBChipSpeedCorrection *cndbChipCorr;
 
-  //Flag for determining if this is for setting MC or data corrections
+  // Flag for determining if this is for setting MC or data corrections
   bool isForMC;
-  //File for reading <= 15768 data chip corrections.  MC will be fake (only one value for every chip);
+  // File for reading <= 15768 data chip corrections.  MC will be fake (only one
+  // value for every chip);
   std::string dataCorrFileName;
   float dataOffset;
-
 };
 
-#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 #include "CondFormats/CSCObjects/interface/CSCDBChipSpeedCorrection.h"
 #include "CondFormats/DataRecord/interface/CSCDBChipSpeedCorrectionRcd.h"
+#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-#include<fstream>
-#include<vector>
-#include<iostream>
-
-
+#include <fstream>
+#include <iostream>
+#include <vector>
 
 // to workaround plugin library
-inline CSCDBChipSpeedCorrection * CSCChipSpeedCorrectionDBConditions::prefillDBChipSpeedCorrection(bool isMC, std::string filename,float dataOffset)  
-{
+inline CSCDBChipSpeedCorrection *CSCChipSpeedCorrectionDBConditions::prefillDBChipSpeedCorrection(bool isMC,
+                                                                                                  std::string filename,
+                                                                                                  float dataOffset) {
   if (isMC)
     printf("\n Generating fake DB constants for MC\n");
   else {
-    printf("\n Reading chip corrections from file %s \n",filename.data());
-    printf("my data offset value is %f \n",dataOffset);
+    printf("\n Reading chip corrections from file %s \n", filename.data());
+    printf("my data offset value is %f \n", dataOffset);
   }
-  
+
   CSCIndexer indexer;
 
-  const int CHIP_FACTOR=100;
+  const int CHIP_FACTOR = 100;
   const int MAX_SIZE = 15768;
-  const int MAX_SHORT= 32767;
-  CSCDBChipSpeedCorrection * cndbChipCorr = new CSCDBChipSpeedCorrection();
+  const int MAX_SHORT = 32767;
+  CSCDBChipSpeedCorrection *cndbChipCorr = new CSCDBChipSpeedCorrection();
 
-  CSCDBChipSpeedCorrection::ChipSpeedContainer & itemvector = cndbChipCorr->chipSpeedCorr;
+  CSCDBChipSpeedCorrection::ChipSpeedContainer &itemvector = cndbChipCorr->chipSpeedCorr;
   itemvector.resize(MAX_SIZE);
-  cndbChipCorr->factor_speedCorr= int (CHIP_FACTOR);
+  cndbChipCorr->factor_speedCorr = int(CHIP_FACTOR);
 
-  //Fill chip corrections for MC is very simple
-  if (isMC){
-    for (int i=0;i<MAX_SIZE;i++){
+  // Fill chip corrections for MC is very simple
+  if (isMC) {
+    for (int i = 0; i < MAX_SIZE; i++) {
       itemvector[i].speedCorr = 0;
     }
     return cndbChipCorr;
   }
 
-  //Filling for data takes a little more time
-  FILE *fin = fopen(filename.data(),"r");
+  // Filling for data takes a little more time
+  FILE *fin = fopen(filename.data(), "r");
 
-  int serialChamber,endcap,station,ring,chamber,chip;
-  float t,dt;
+  int serialChamber, endcap, station, ring, chamber, chip;
+  float t, dt;
   int nPulses;
 
   std::vector<int> new_index_id;
   std::vector<float> new_chipPulse;
   double runningTotal = 0;
   int numNonZero = 0;
-  while (!feof(fin)){
-    //note space at end of format string to convert last \n
+  while (!feof(fin)) {
+    // note space at end of format string to convert last \n
     // int check = fscanf(fin,"%d %d %f %f \n",&serialChamber,&chip,&t,&dt);
-    int check = fscanf(fin,"%d %d %d %d %d %d %f %f %d \n",&serialChamber,&endcap,&station,&ring,&chamber,&chip,&t,&dt,&nPulses);
-    if (check != 9){
+    int check = fscanf(fin,
+                       "%d %d %d %d %d %d %f %f %d \n",
+                       &serialChamber,
+                       &endcap,
+                       &station,
+                       &ring,
+                       &chamber,
+                       &chip,
+                       &t,
+                       &dt,
+                       &nPulses);
+    if (check != 9) {
       printf("The input file format is not as expected\n");
       assert(0);
     }
-   
+
     int serialChamber_safecopy = serialChamber;
-    // Now to map from S. Durkin's serialChamber index convention 
+    // Now to map from S. Durkin's serialChamber index convention
     // ME+1/1-ME+41 = 1  -234
     // ME+4/2       = 235-270*
     // ME-1/1-ME-41 = 271-504*
@@ -113,72 +126,82 @@ inline CSCDBChipSpeedCorrection * CSCChipSpeedCorrectionDBConditions::prefillDBC
     // ME-1/1-ME-41 = 235-468*
     // ME-4/2       = 505-540
     // Only the chambers marked * need to be remapped
-    
-    if (serialChamber >=235 && serialChamber <=270)
+
+    if (serialChamber >= 235 && serialChamber <= 270)
       serialChamber += 234;
-    else { // not in ME+4\2
-      if (serialChamber >=271 && serialChamber <=504)
-	serialChamber -= 36;
+    else {  // not in ME+4\2
+      if (serialChamber >= 271 && serialChamber <= 504)
+        serialChamber -= 36;
     }
 
     CSCDetId chamberId = indexer.detIdFromChamberIndex(serialChamber);
-    // Now to map from S. Durkin's chip index convention 0-29 (with 4,9,14,19,24,29 unused in ME1/3)
-    // To the convention used in /DataFormats/MuonDetId/interface/CSCIndexer.h 
-    // Layer 1-6 and chip 1-5 for all chambers except ME1/3 which is chip 1-4
-    int layer = (chip)/5+1;
-    CSCDetId cscId(chamberId.endcap(),chamberId.station(),chamberId.ring(),chamberId.chamber(),layer);
+    // Now to map from S. Durkin's chip index convention 0-29 (with
+    // 4,9,14,19,24,29 unused in ME1/3) To the convention used in
+    // /DataFormats/MuonDetId/interface/CSCIndexer.h Layer 1-6 and chip 1-5 for
+    // all chambers except ME1/3 which is chip 1-4
+    int layer = (chip) / 5 + 1;
+    CSCDetId cscId(chamberId.endcap(), chamberId.station(), chamberId.ring(), chamberId.chamber(), layer);
     // This should yield the same CSCDetId as decoding the chamber serial does
     // If not, some debugging is needed
-    CSCDetId cscId_doubleCheck(endcap,station,ring,chamber,layer);
-    if (cscId != cscId_doubleCheck){
-      printf("Why doesn't chamberSerial %d map to e: %d s: %d r: %d c: %d ? \n",serialChamber_safecopy, endcap, station, ring, chamber);
+    CSCDetId cscId_doubleCheck(endcap, station, ring, chamber, layer);
+    if (cscId != cscId_doubleCheck) {
+      printf("Why doesn't chamberSerial %d map to e: %d s: %d r: %d c: %d ? \n",
+             serialChamber_safecopy,
+             endcap,
+             station,
+             ring,
+             chamber);
       assert(0);
     }
 
-    chip =(chip%5)+1;
-    // The file produced by Stan starts from the geometrical strip number stored in the CSCStripDigi 
-    // When the strip digis are built, the conversion from electronics channel to geometrical strip (reversing ME+1/1a and, more importantly, ME-1/1b) 
-    // is done before the digi is filled (EventFilter/CSCRawToDigi/src/CSCCFEBData.cc).
-    // Since we're filling an electronics channel database, I'll flip again ME-1/1b
-    if (endcap == 2 && station ==1 && ring==1 && chip <5){
-      chip = 5 - chip; //change 1-4 to 4-1
+    chip = (chip % 5) + 1;
+    // The file produced by Stan starts from the geometrical strip number stored
+    // in the CSCStripDigi When the strip digis are built, the conversion from
+    // electronics channel to geometrical strip (reversing ME+1/1a and, more
+    // importantly, ME-1/1b) is done before the digi is filled
+    // (EventFilter/CSCRawToDigi/src/CSCCFEBData.cc). Since we're filling an
+    // electronics channel database, I'll flip again ME-1/1b
+    if (endcap == 2 && station == 1 && ring == 1 && chip < 5) {
+      chip = 5 - chip;  // change 1-4 to 4-1
     }
 
-
-    new_index_id.push_back(indexer.chipIndex(cscId,chip));
+    new_index_id.push_back(indexer.chipIndex(cscId, chip));
     new_chipPulse.push_back(t);
-    if (t!=0){
+    if (t != 0) {
       runningTotal += t;
       numNonZero++;
     }
   }
-  fclose(fin);    
-
+  fclose(fin);
 
   // Fill the chip corrections with zeros to start
-  for (int i=0;i<MAX_SIZE;i++){
+  for (int i = 0; i < MAX_SIZE; i++) {
     itemvector[i].speedCorr = 0;
   }
- 
-  for (unsigned int i=0;i<new_index_id.size();i++){
-    if((short int)  (fabs((dataOffset-new_chipPulse[i])*CHIP_FACTOR+0.5))<MAX_SHORT) 
-      itemvector[new_index_id[i]-1].speedCorr = (short int) ((dataOffset-new_chipPulse[i])*CHIP_FACTOR+0.5*(dataOffset>=new_chipPulse[i])-0.5*(dataOffset<new_chipPulse[i]));
-    //printf("i= %d \t new index id = %d \t corr = %f \n",i,new_index_id[i], new_chipPulse[i]);
+
+  for (unsigned int i = 0; i < new_index_id.size(); i++) {
+    if ((short int)(fabs((dataOffset - new_chipPulse[i]) * CHIP_FACTOR + 0.5)) < MAX_SHORT)
+      itemvector[new_index_id[i] - 1].speedCorr =
+          (short int)((dataOffset - new_chipPulse[i]) * CHIP_FACTOR + 0.5 * (dataOffset >= new_chipPulse[i]) -
+                      0.5 * (dataOffset < new_chipPulse[i]));
+    // printf("i= %d \t new index id = %d \t corr = %f \n",i,new_index_id[i],
+    // new_chipPulse[i]);
   }
 
-  //For now, calculate the mean chip correction and use it for all chambers that don't have calibration pulse data (speedCorr ==0)
-  //or had values of zero (speedCorr == dataOffset)
-  //This should be a temporary fix until all chips that will read out in data have calibration information
-  //Since there is only a handful out of 15K chips with values more than 3 ns away from the average, this is probably very safe 
-  //to first order
-  float ave = runningTotal/numNonZero;
-  for (int i=0;i<MAX_SIZE;i++){
-    if( itemvector[i].speedCorr == 0 ||itemvector[i].speedCorr == (short int)(dataOffset*CHIP_FACTOR+0.5) )
-      itemvector[i].speedCorr = (short int) ((dataOffset-ave)*CHIP_FACTOR+0.5*(dataOffset>=ave)-0.5*(dataOffset<ave));
+  // For now, calculate the mean chip correction and use it for all chambers
+  // that don't have calibration pulse data (speedCorr ==0) or had values of
+  // zero (speedCorr == dataOffset) This should be a temporary fix until all
+  // chips that will read out in data have calibration information Since there
+  // is only a handful out of 15K chips with values more than 3 ns away from the
+  // average, this is probably very safe to first order
+  float ave = runningTotal / numNonZero;
+  for (int i = 0; i < MAX_SIZE; i++) {
+    if (itemvector[i].speedCorr == 0 || itemvector[i].speedCorr == (short int)(dataOffset * CHIP_FACTOR + 0.5))
+      itemvector[i].speedCorr =
+          (short int)((dataOffset - ave) * CHIP_FACTOR + 0.5 * (dataOffset >= ave) - 0.5 * (dataOffset < ave));
   }
 
- 
   return cndbChipCorr;
 }
- 
+
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCConditions.h b/CalibMuon/CSCCalibration/interface/CSCConditions.h
old mode 100755
new mode 100644
index 434c63d73d21e..be1e62f586a28
--- a/CalibMuon/CSCCalibration/interface/CSCConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCConditions.h
@@ -1,17 +1,17 @@
 #ifndef CSCCalibration_CSCConditions_h
 #define CSCCalibration_CSCConditions_h
 
-#include "FWCore/Framework/interface/ESWatcher.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "DataFormats/MuonDetId/interface/CSCDetId.h"
 #include "CondFormats/CSCObjects/interface/CSCDBNoiseMatrix.h"
-#include "CondFormats/DataRecord/interface/CSCDBGainsRcd.h"
 #include "CondFormats/DataRecord/interface/CSCBadStripsRcd.h"
 #include "CondFormats/DataRecord/interface/CSCBadWiresRcd.h"
+#include "CondFormats/DataRecord/interface/CSCDBGainsRcd.h"
+#include "DataFormats/MuonDetId/interface/CSCDetId.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ESWatcher.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
-#include <vector>
 #include <bitset>
+#include <vector>
 
 class CSCDBGains;
 class CSCDBPedestals;
@@ -32,78 +32,75 @@ class CSCChannelMapperBase;
  *
  * Interfaces generally use "channels" which count from 1 and are 'geometric'
  * i.e. in the order matching local coordinates. This is the channel labelling
- * in CSCStripDigi (and CSCWireDigi) after internal corrections within CSCRawToDigi.
+ * in CSCStripDigi (and CSCWireDigi) after internal corrections within
+ * CSCRawToDigi.
  *
- * The input CSCDetId is also 'geometric channel level' i.e. ME11A has its own CSCDetId
- * even in the ganged case,
+ * The input CSCDetId is also 'geometric channel level' i.e. ME11A has its own
+ * CSCDetId even in the ganged case,
  *
  * Ganged ME1a channels are 1-16 (and unganged, of course, 1-48)
  *
- * From CMSSW 61X, this class also handles separate algorithm versions for indexing
- * the conditions data and for mapping between online and offline channel labelling.
+ * From CMSSW 61X, this class also handles separate algorithm versions for
+ * indexing the conditions data and for mapping between online and offline
+ * channel labelling.
  */
 
-class CSCConditions
-{
+class CSCConditions {
 public:
-  explicit CSCConditions( const edm::ParameterSet& ps );
+  explicit CSCConditions(const edm::ParameterSet &ps);
   ~CSCConditions();
 
   /// fetch database content via EventSetup
-  void initializeEvent(const edm::EventSetup & es);
+  void initializeEvent(const edm::EventSetup &es);
 
   /// gain per channel
-  float gain(const CSCDetId & detId, int channel) const;
+  float gain(const CSCDetId &detId, int channel) const;
   /// overall calibration precision
-  float gainSigma(const CSCDetId & detId, int channel) const {return 0.005;}
+  float gainSigma(const CSCDetId &detId, int channel) const { return 0.005; }
 
   /// static ped in ADC counts
-  float pedestal(const CSCDetId & detId, int channel) const;
+  float pedestal(const CSCDetId &detId, int channel) const;
   /// static ped rms in ADC counts
-  float pedestalSigma(const CSCDetId & detId, int channel) const;
+  float pedestalSigma(const CSCDetId &detId, int channel) const;
 
   /// crosstalk slope for left and right
-  float crosstalkSlope(const CSCDetId & detId, int channel, bool leftRight) const;
+  float crosstalkSlope(const CSCDetId &detId, int channel, bool leftRight) const;
   /// crosstalk intercept for left and right
-  float crosstalkIntercept(const CSCDetId & detId, int channel, bool leftRight) const;
+  float crosstalkIntercept(const CSCDetId &detId, int channel, bool leftRight) const;
 
   /// raw noise matrix (unscaled short int elements)
-  const CSCDBNoiseMatrix::Item & noiseMatrix(const CSCDetId & detId, int channel) const;
+  const CSCDBNoiseMatrix::Item &noiseMatrix(const CSCDetId &detId, int channel) const;
 
-  /// fill vector (dim 12, must be allocated by caller) with noise matrix elements (scaled to float)
-  void noiseMatrixElements( const CSCDetId& id, int channel, std::vector<float>& me ) const;
+  /// fill vector (dim 12, must be allocated by caller) with noise matrix
+  /// elements (scaled to float)
+  void noiseMatrixElements(const CSCDetId &id, int channel, std::vector<float> &me) const;
 
-  /// fill vector (dim 4, must be allocated by caller) with crosstalk sl, il, sr, ir
-  void crossTalk( const CSCDetId& id, int channel, std::vector<float>& ct ) const;
+  /// fill vector (dim 4, must be allocated by caller) with crosstalk sl, il,
+  /// sr, ir
+  void crossTalk(const CSCDetId &id, int channel, std::vector<float> &ct) const;
 
   /// chip speed correction in ns given detId (w/layer) and strip channel
-  float chipCorrection( const CSCDetId & detId, int channel ) const;
+  float chipCorrection(const CSCDetId &detId, int channel) const;
 
   /// chamber timing correction in ns given detId of chamber
-  float chamberTimingCorrection( const CSCDetId & detId) const;
+  float chamberTimingCorrection(const CSCDetId &detId) const;
 
   /// anode bx offset in bx given detId of chamber
-  float anodeBXoffset( const CSCDetId & detId) const;
+  float anodeBXoffset(const CSCDetId &detId) const;
 
   /// bad strip channel word for a CSCLayer - 1 bit per channel
-  const std::bitset<112>& badStripWord() const {
-    return badStripWord_; 
-  }
+  const std::bitset<112> &badStripWord() const { return badStripWord_; }
 
   /// bad wiregroup channel word for a CSCLayer - 1 bit per channel
-  const std::bitset<112>& badWireWord() const {
-    return badWireWord_;
-  }
+  const std::bitset<112> &badWireWord() const { return badWireWord_; }
 
   /// the offline CSCDetId of current bad channel words
-  const CSCDetId& idOfBadChannelWords() const{
-    return idOfBadChannelWords_;
-  }
+  const CSCDetId &idOfBadChannelWords() const { return idOfBadChannelWords_; }
 
   void print() const;
 
   /// Is the gven chamber flagged as bad?
-  bool isInBadChamber( const CSCDetId& id ) const;
+  bool isInBadChamber(const CSCDetId &id) const;
 
   /// did we request reading bad channel info from db?
   bool readBadChannels() const { return readBadChannels_; }
@@ -114,33 +111,34 @@ class CSCConditions
   /// did we request reading timing correction info from db?
   bool useTimingCorrections() const { return useTimingCorrections_; }
 
-  /// Fill bad channel words - one for strips, one for wires, for an offline CSCDetId
-  void fillBadChannelWords( const CSCDetId& id );
+  /// Fill bad channel words - one for strips, one for wires, for an offline
+  /// CSCDetId
+  void fillBadChannelWords(const CSCDetId &id);
 
-  /// average gain over entire CSC system (logically const although must be cached here).
+  /// average gain over entire CSC system (logically const although must be
+  /// cached here).
   float averageGain() const;
 
-  /// gas gain correction as a function of detId (w/layer), strip, and wire channels
-  float gasGainCorrection( const CSCDetId & detId, int strip, int wire ) const;
+  /// gas gain correction as a function of detId (w/layer), strip, and wire
+  /// channels
+  float gasGainCorrection(const CSCDetId &detId, int strip, int wire) const;
 
   /// did we request reading gas gain correction info from db?
   bool useGasGainCorrections() const { return useGasGainCorrections_; }
 
   /// feedthrough for external access
-  int channelFromStrip(const CSCDetId& id, int geomStrip) const;
-  int rawStripChannel( const CSCDetId& id, int geomChannel) const;
+  int channelFromStrip(const CSCDetId &id, int geomStrip) const;
+  int rawStripChannel(const CSCDetId &id, int geomChannel) const;
 
 private:
-
   /// fill bad channel words for offline id
-  void fillBadStripWord( const CSCDetId& id );
-  void fillBadWireWord( const CSCDetId& id );
-  /// Set id for current content of bad channel words - this is offline id i.e. separate for ME11A & ME11B
-  void setIdOfBadChannelWords ( const CSCDetId& id ){
-    idOfBadChannelWords_ = id;
-  }
+  void fillBadStripWord(const CSCDetId &id);
+  void fillBadWireWord(const CSCDetId &id);
+  /// Set id for current content of bad channel words - this is offline id i.e.
+  /// separate for ME11A & ME11B
+  void setIdOfBadChannelWords(const CSCDetId &id) { idOfBadChannelWords_ = id; }
 
-// handles to conditions data
+  // handles to conditions data
 
   edm::ESHandle<CSCDBGains> theGains;
   edm::ESHandle<CSCDBCrosstalk> theCrosstalk;
@@ -153,24 +151,29 @@ class CSCConditions
   edm::ESHandle<CSCChamberTimeCorrections> theChamberTimingCorrections;
   edm::ESHandle<CSCDBGasGainCorrection> theGasGainCorrections;
 
-// handles to algorithm versions
+  // handles to algorithm versions
 
   edm::ESHandle<CSCIndexerBase> indexer_;
   edm::ESHandle<CSCChannelMapperBase> mapper_;
 
-// logical flags controlling some conditions data usage
+  // logical flags controlling some conditions data usage
 
-  bool readBadChannels_; // flag whether or not to even attempt reading bad channel info from db
-  bool readBadChambers_; // flag whether or not to even attempt reading bad chamber info from db
-  bool useTimingCorrections_; // flag whether or not to even attempt reading timing correction info from db
-  bool useGasGainCorrections_; // flag whether or not to even attempt reading gas-gain correction info from db
+  bool readBadChannels_;        // flag whether or not to even attempt reading bad
+                                // channel info from db
+  bool readBadChambers_;        // flag whether or not to even attempt reading bad
+                                // chamber info from db
+  bool useTimingCorrections_;   // flag whether or not to even attempt reading
+                                // timing correction info from db
+  bool useGasGainCorrections_;  // flag whether or not to even attempt reading
+                                // gas-gain correction info from db
 
   // Cache bad channel content for current CSC layer
   CSCDetId idOfBadChannelWords_;
   std::bitset<112> badStripWord_;
   std::bitset<112> badWireWord_;
 
-  mutable float theAverageGain; // average over entire system, subject to some constraints!
+  mutable float theAverageGain;  // average over entire system, subject to some
+                                 // constraints!
 
   edm::ESWatcher<CSCDBGainsRcd> gainsWatcher_;
   //@@ remove until we have real information to use
@@ -178,9 +181,7 @@ class CSCConditions
   //  edm::ESWatcher<CSCBadWiresRcd> badWiresWatcher_;
 
   // Total number of CSC layers in the system, with full ME42 installed.
-  enum elayers{ MAX_LAYERS = 3240 };
+  enum elayers { MAX_LAYERS = 3240 };
 };
 
 #endif
-
-
diff --git a/CalibMuon/CSCCalibration/interface/CSCCrosstalkConditions.h b/CalibMuon/CSCCalibration/interface/CSCCrosstalkConditions.h
index cf3c64d06c0d9..650045a1ca9c8 100644
--- a/CalibMuon/CSCCalibration/interface/CSCCrosstalkConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCCrosstalkConditions.h
@@ -1,38 +1,38 @@
 #ifndef _CSCCROSSTALKCONDITIONS_H
 #define _CSCCROSSTALKCONDITIONS_H
 
-#include <memory>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
+#include <memory>
 
 #include "CondFormats/CSCObjects/interface/CSCcrosstalk.h"
 #include "CondFormats/DataRecord/interface/CSCcrosstalkRcd.h"
 #include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCCrosstalkConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
- public:
-  CSCCrosstalkConditions(const edm::ParameterSet&);
+class CSCCrosstalkConditions : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCCrosstalkConditions(const edm::ParameterSet &);
   ~CSCCrosstalkConditions() override;
-  
 
-  static  CSCcrosstalk * prefillCrosstalk();
-  
+  static CSCcrosstalk *prefillCrosstalk();
+
   typedef std::unique_ptr<CSCcrosstalk> ReturnType;
-  
-  ReturnType produceCrosstalk(const CSCcrosstalkRcd&);
-  
- private:
+
+  ReturnType produceCrosstalk(const CSCcrosstalkRcd &);
+
+private:
   // ----------member data ---------------------------
-  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
-  CSCcrosstalk *cnCrosstalk ;
-  
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
+  CSCcrosstalk *cnCrosstalk;
 };
 
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCCrosstalkDBConditions.h b/CalibMuon/CSCCalibration/interface/CSCCrosstalkDBConditions.h
index 3354f84ad1be9..33e8acd414189 100644
--- a/CalibMuon/CSCCalibration/interface/CSCCrosstalkDBConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCCrosstalkDBConditions.h
@@ -1,83 +1,82 @@
 #ifndef _CSCCROSSTALKDBCONDITIONS_H
 #define _CSCCROSSTALKDBCONDITIONS_H
 
-#include <memory>
-#include <cmath>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <cmath>
+#include <memory>
 
-#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 #include "CondFormats/CSCObjects/interface/CSCDBCrosstalk.h"
 #include "CondFormats/DataRecord/interface/CSCDBCrosstalkRcd.h"
+#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCCrosstalkDBConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
- public:
-  CSCCrosstalkDBConditions(const edm::ParameterSet&);
+class CSCCrosstalkDBConditions : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCCrosstalkDBConditions(const edm::ParameterSet &);
   ~CSCCrosstalkDBConditions() override;
-  
 
-  inline static CSCDBCrosstalk * prefillDBCrosstalk();
+  inline static CSCDBCrosstalk *prefillDBCrosstalk();
 
   typedef std::unique_ptr<CSCDBCrosstalk> ReturnType;
-  
-  ReturnType produceDBCrosstalk(const CSCDBCrosstalkRcd&);
-  
- private:
-  // ----------member data ---------------------------
-  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
 
+  ReturnType produceDBCrosstalk(const CSCDBCrosstalkRcd &);
+
+private:
+  // ----------member data ---------------------------
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
 };
 
-#include<fstream>
-#include<vector>
-#include<iostream>
+#include <fstream>
+#include <iostream>
+#include <vector>
 
 // to workaround plugin library
-inline CSCDBCrosstalk *  CSCCrosstalkDBConditions::prefillDBCrosstalk()
-{
+inline CSCDBCrosstalk *CSCCrosstalkDBConditions::prefillDBCrosstalk() {
   // const int MAX_SIZE = 273024; //for ME1a unganged
   const int MAX_SIZE = 252288;
-  const int SLOPE_FACTOR=10000000;
-  const int INTERCEPT_FACTOR=100000;
-  const int MAX_SHORT= 32767;
-  CSCDBCrosstalk * cndbcrosstalk = new CSCDBCrosstalk();
+  const int SLOPE_FACTOR = 10000000;
+  const int INTERCEPT_FACTOR = 100000;
+  const int MAX_SHORT = 32767;
+  CSCDBCrosstalk *cndbcrosstalk = new CSCDBCrosstalk();
 
-  int db_index,new_index;
-  float db_slope_right,db_slope_left,db_intercept_right;
+  int db_index, new_index;
+  float db_slope_right, db_slope_left, db_intercept_right;
   float db_intercept_left;
   std::vector<int> db_index_id;
   std::vector<float> db_slope_r;
   std::vector<float> db_intercept_r;
   std::vector<float> db_slope_l;
   std::vector<float> db_intercept_l;
-  float new_slope_right,new_slope_left,new_intercept_right;
+  float new_slope_right, new_slope_left, new_intercept_right;
   float new_intercept_left;
-   std::vector<int> new_index_id;
-   std::vector<float> new_slope_r;
+  std::vector<int> new_index_id;
+  std::vector<float> new_slope_r;
   std::vector<float> new_intercept_r;
   std::vector<float> new_slope_l;
   std::vector<float> new_intercept_l;
-    
+
   int counter;
-  int db_nrlines=0;
-  int new_nrlines=0;
-    
-  std::ifstream dbdata; 
-  dbdata.open("old_dbxtalk.dat",std::ios::in); 
-  if(!dbdata) {
-    std::cerr <<"Error: old_dbxtalk.dat -> no such file!"<< std::endl;
+  int db_nrlines = 0;
+  int new_nrlines = 0;
+
+  std::ifstream dbdata;
+  dbdata.open("old_dbxtalk.dat", std::ios::in);
+  if (!dbdata) {
+    std::cerr << "Error: old_dbxtalk.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!dbdata.eof() ) { 
-    dbdata >> db_index >> db_slope_right >> db_intercept_right >> db_slope_left >> db_intercept_left ;
+
+  while (!dbdata.eof()) {
+    dbdata >> db_index >> db_slope_right >> db_intercept_right >> db_slope_left >> db_intercept_left;
     db_index_id.push_back(db_index);
     db_slope_r.push_back(db_slope_right);
     db_slope_l.push_back(db_slope_left);
@@ -88,14 +87,14 @@ inline CSCDBCrosstalk *  CSCCrosstalkDBConditions::prefillDBCrosstalk()
   dbdata.close();
 
   std::ifstream newdata;
-  newdata.open("xtalk.dat",std::ios::in); 
-  if(!newdata) {
-    std::cerr <<"Error: xtalk.dat -> no such file!"<< std::endl;
+  newdata.open("xtalk.dat", std::ios::in);
+  if (!newdata) {
+    std::cerr << "Error: xtalk.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!newdata.eof() ) { 
-    newdata >> new_index >> new_slope_right >> new_intercept_right >> new_slope_left >> new_intercept_left; 
+
+  while (!newdata.eof()) {
+    newdata >> new_index >> new_slope_right >> new_intercept_right >> new_slope_left >> new_intercept_left;
     new_index_id.push_back(new_index);
     new_slope_r.push_back(new_slope_right);
     new_slope_l.push_back(new_slope_left);
@@ -104,43 +103,46 @@ inline CSCDBCrosstalk *  CSCCrosstalkDBConditions::prefillDBCrosstalk()
     new_nrlines++;
   }
   newdata.close();
-  
-  CSCDBCrosstalk::CrosstalkContainer & itemvector = cndbcrosstalk->crosstalk;
+
+  CSCDBCrosstalk::CrosstalkContainer &itemvector = cndbcrosstalk->crosstalk;
   itemvector.resize(MAX_SIZE);
-  cndbcrosstalk->factor_slope = int (SLOPE_FACTOR);
-  cndbcrosstalk->factor_intercept = int (INTERCEPT_FACTOR);
-
-  for(int i=0; i<MAX_SIZE;++i){
-    itemvector[i].xtalk_slope_right=(short int) (db_slope_r[i]*SLOPE_FACTOR+0.5);
-    itemvector[i].xtalk_intercept_right= (short int) (db_intercept_r[i]*INTERCEPT_FACTOR+0.5); 
-    itemvector[i].xtalk_slope_left= (short int) (db_slope_l[i]*SLOPE_FACTOR+0.5);  
-    itemvector[i].xtalk_intercept_left= (short int) (db_intercept_l[i]*INTERCEPT_FACTOR+0.5);  
+  cndbcrosstalk->factor_slope = int(SLOPE_FACTOR);
+  cndbcrosstalk->factor_intercept = int(INTERCEPT_FACTOR);
+
+  for (int i = 0; i < MAX_SIZE; ++i) {
+    itemvector[i].xtalk_slope_right = (short int)(db_slope_r[i] * SLOPE_FACTOR + 0.5);
+    itemvector[i].xtalk_intercept_right = (short int)(db_intercept_r[i] * INTERCEPT_FACTOR + 0.5);
+    itemvector[i].xtalk_slope_left = (short int)(db_slope_l[i] * SLOPE_FACTOR + 0.5);
+    itemvector[i].xtalk_intercept_left = (short int)(db_intercept_l[i] * INTERCEPT_FACTOR + 0.5);
   }
 
-  for(int i=0; i<MAX_SIZE;++i){
-    counter=db_index_id[i];  
-    for (unsigned int k=0;k<new_index_id.size()-1;k++){
-      if(counter==new_index_id[k]){
-	if ((short int) (fabs(new_slope_r[k]*SLOPE_FACTOR+0.5))<MAX_SHORT)         itemvector[counter].xtalk_slope_right= int (new_slope_r[k]*SLOPE_FACTOR+0.5);
-	if ((short int) (fabs(new_intercept_r[k]*INTERCEPT_FACTOR+0.5))<MAX_SHORT) itemvector[counter].xtalk_intercept_right= int (new_intercept_r[k]*INTERCEPT_FACTOR+0.5); 
-	if ((short int) (fabs(new_slope_l[k]*SLOPE_FACTOR+0.5))<MAX_SHORT)         itemvector[counter].xtalk_slope_left= int (new_slope_l[k]*SLOPE_FACTOR+0.5);  
-	if ((short int) (fabs(new_intercept_l[k]*INTERCEPT_FACTOR+0.5))<MAX_SHORT) itemvector[counter].xtalk_intercept_left= int (new_intercept_l[k]*INTERCEPT_FACTOR+0.5);  
-	itemvector[i] = itemvector[counter];
-	//std::cout<<" counter "<<counter <<" dbindex "<<new_index_id[k]<<" dbslope " <<db_slope_r[k]<<" new slope "<<new_slope_r[k]<<std::endl;
-      }  
+  for (int i = 0; i < MAX_SIZE; ++i) {
+    counter = db_index_id[i];
+    for (unsigned int k = 0; k < new_index_id.size() - 1; k++) {
+      if (counter == new_index_id[k]) {
+        if ((short int)(fabs(new_slope_r[k] * SLOPE_FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].xtalk_slope_right = int(new_slope_r[k] * SLOPE_FACTOR + 0.5);
+        if ((short int)(fabs(new_intercept_r[k] * INTERCEPT_FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].xtalk_intercept_right = int(new_intercept_r[k] * INTERCEPT_FACTOR + 0.5);
+        if ((short int)(fabs(new_slope_l[k] * SLOPE_FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].xtalk_slope_left = int(new_slope_l[k] * SLOPE_FACTOR + 0.5);
+        if ((short int)(fabs(new_intercept_l[k] * INTERCEPT_FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].xtalk_intercept_left = int(new_intercept_l[k] * INTERCEPT_FACTOR + 0.5);
+        itemvector[i] = itemvector[counter];
+        // std::cout<<" counter "<<counter <<" dbindex "<<new_index_id[k]<<"
+        // dbslope " <<db_slope_r[k]<<" new slope "<<new_slope_r[k]<<std::endl;
+      }
     }
 
-     if (counter>223968){
-      itemvector[counter].xtalk_slope_right = int (db_slope_r[i]);
-      itemvector[counter].xtalk_slope_left = int (db_slope_l[i]);
-      itemvector[counter].xtalk_intercept_right = int (db_intercept_r[i]);
-      itemvector[counter].xtalk_intercept_left = int (db_intercept_l[i]);
-     }
+    if (counter > 223968) {
+      itemvector[counter].xtalk_slope_right = int(db_slope_r[i]);
+      itemvector[counter].xtalk_slope_left = int(db_slope_l[i]);
+      itemvector[counter].xtalk_intercept_right = int(db_intercept_r[i]);
+      itemvector[counter].xtalk_intercept_left = int(db_intercept_l[i]);
+    }
   }
-  
-  return cndbcrosstalk;
 
+  return cndbcrosstalk;
 }
-  
-#endif
 
+#endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCDBL1TPParametersConditions.h b/CalibMuon/CSCCalibration/interface/CSCDBL1TPParametersConditions.h
index a61306df7f0bc..3fcb07fd93df9 100644
--- a/CalibMuon/CSCCalibration/interface/CSCDBL1TPParametersConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCDBL1TPParametersConditions.h
@@ -1,56 +1,52 @@
 #ifndef _CSCDBL1TPPARAMETERSCONDITIONS_H
 #define _CSCDBL1TPPARAMETERSCONDITIONS_H
 
-#include <memory>
-#include <cmath>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <cmath>
+#include <memory>
 
-#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 #include "CondFormats/CSCObjects/interface/CSCDBL1TPParameters.h"
 #include "CondFormats/DataRecord/interface/CSCDBL1TPParametersRcd.h"
+#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCDBL1TPParametersConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
- public:
-  CSCDBL1TPParametersConditions(const edm::ParameterSet&);
+class CSCDBL1TPParametersConditions : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCDBL1TPParametersConditions(const edm::ParameterSet &);
   ~CSCDBL1TPParametersConditions();
-  
 
-  inline static CSCDBL1TPParameters *  prefillCSCDBL1TPParameters();
+  inline static CSCDBL1TPParameters *prefillCSCDBL1TPParameters();
 
   typedef std::unique_ptr<CSCDBL1TPParameters> ReturnType;
-  
-  ReturnType produceCSCDBL1TPParameters(const CSCDBL1TPParametersRcd&);
-  
- private:
-  // ----------member data ---------------------------
-  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & );
 
+  ReturnType produceCSCDBL1TPParameters(const CSCDBL1TPParametersRcd &);
+
+private:
+  // ----------member data ---------------------------
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue &, edm::ValidityInterval &);
 };
 
-#include<fstream>
-#include<vector>
-#include<iostream>
+#include <fstream>
+#include <iostream>
+#include <vector>
 
 // to workaround plugin library
-inline CSCDBL1TPParameters *  CSCDBL1TPParametersConditions::prefillCSCDBL1TPParameters()
-{
+inline CSCDBL1TPParameters *CSCDBL1TPParametersConditions::prefillCSCDBL1TPParameters() {
+  CSCDBL1TPParameters *cnl1tp = new CSCDBL1TPParameters();
 
-  CSCDBL1TPParameters * cnl1tp = new CSCDBL1TPParameters();
-    
   cnl1tp->setAlctFifoTbins(16);
   cnl1tp->setAlctFifoPretrig(10);
   cnl1tp->setAlctDriftDelay(2);
-  cnl1tp->setAlctNplanesHitPretrig(3);//was 2, new is 3
+  cnl1tp->setAlctNplanesHitPretrig(3);  // was 2, new is 3
   cnl1tp->setAlctNplanesHitPattern(4);
-  cnl1tp->setAlctNplanesHitAccelPretrig(3);//was 2, new is 3
+  cnl1tp->setAlctNplanesHitAccelPretrig(3);  // was 2, new is 3
   cnl1tp->setAlctNplanesHitAccelPattern(4);
   cnl1tp->setAlctTrigMode(2);
   cnl1tp->setAlctAccelMode(0);
@@ -58,14 +54,14 @@ inline CSCDBL1TPParameters *  CSCDBL1TPParametersConditions::prefillCSCDBL1TPPar
 
   cnl1tp->setClctFifoTbins(12);
   cnl1tp->setClctFifoPretrig(7);
-  cnl1tp->setClctHitPersist(4);//was 6, new is 4
+  cnl1tp->setClctHitPersist(4);  // was 6, new is 4
   cnl1tp->setClctDriftDelay(2);
-  cnl1tp->setClctNplanesHitPretrig(3);//was 2, new is 3
+  cnl1tp->setClctNplanesHitPretrig(3);  // was 2, new is 3
   cnl1tp->setClctNplanesHitPattern(4);
   cnl1tp->setClctPidThreshPretrig(2);
   cnl1tp->setClctMinSeparation(10);
 
-  //the new parameters
+  // the new parameters
   cnl1tp->setTmbMpcBlockMe1a(0);
   cnl1tp->setTmbAlctTrigEnable(0);
   cnl1tp->setTmbClctTrigEnable(0);
@@ -73,8 +69,7 @@ inline CSCDBL1TPParameters *  CSCDBL1TPParametersConditions::prefillCSCDBL1TPPar
   cnl1tp->setTmbMatchTrigWindowSize(7);
   cnl1tp->setTmbTmbL1aWindowSize(7);
 
- return cnl1tp;
+  return cnl1tp;
 }
 
-
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCFakeCrosstalkConditions.h b/CalibMuon/CSCCalibration/interface/CSCFakeCrosstalkConditions.h
index 4ad1e05d4e29d..e27d2309ca504 100644
--- a/CalibMuon/CSCCalibration/interface/CSCFakeCrosstalkConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCFakeCrosstalkConditions.h
@@ -1,40 +1,41 @@
 #ifndef _CSCFRONTIERCROSSTALKCONDITIONS_H
 #define _CSCFRONTIERCROSSTALKCONDITIONS_H
 
-#include <memory>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <memory>
 
 #include "CondFormats/CSCObjects/interface/CSCcrosstalk.h"
 #include "CondFormats/DataRecord/interface/CSCcrosstalkRcd.h"
 #include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCFakeCrosstalkConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
- public:
-  CSCFakeCrosstalkConditions(const edm::ParameterSet&);
+class CSCFakeCrosstalkConditions : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCFakeCrosstalkConditions(const edm::ParameterSet &);
   ~CSCFakeCrosstalkConditions() override;
-  
-  float mean,min,minchi;
-  int seed;long int M;
 
-  CSCcrosstalk * prefillCrosstalk();
-  
+  float mean, min, minchi;
+  int seed;
+  long int M;
+
+  CSCcrosstalk *prefillCrosstalk();
+
   typedef std::unique_ptr<CSCcrosstalk> ReturnType;
-  
-  ReturnType produceCrosstalk(const CSCcrosstalkRcd&);
-  
- private:
+
+  ReturnType produceCrosstalk(const CSCcrosstalkRcd &);
+
+private:
   // ----------member data ---------------------------
-  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
-  
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
 };
 
 #endif
-
diff --git a/CalibMuon/CSCCalibration/interface/CSCFakeDBCrosstalk.h b/CalibMuon/CSCCalibration/interface/CSCFakeDBCrosstalk.h
index e49ea350c16a5..4d39453cd1280 100644
--- a/CalibMuon/CSCCalibration/interface/CSCFakeDBCrosstalk.h
+++ b/CalibMuon/CSCCalibration/interface/CSCFakeDBCrosstalk.h
@@ -1,15 +1,15 @@
 #ifndef _CSCFAKEDBCROSSTALK_H
 #define _CSCFAKEDBCROSSTALK_H
 
-#include <memory>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
+#include <memory>
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -17,130 +17,127 @@
 #include "CondFormats/DataRecord/interface/CSCDBCrosstalkRcd.h"
 #include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCFakeDBCrosstalk: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
-   public:
-      CSCFakeDBCrosstalk(const edm::ParameterSet&);
-      ~CSCFakeDBCrosstalk() override;
-
-      inline static CSCDBCrosstalk * prefillDBCrosstalk(); 
+class CSCFakeDBCrosstalk : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCFakeDBCrosstalk(const edm::ParameterSet &);
+  ~CSCFakeDBCrosstalk() override;
 
-      typedef  std::unique_ptr<CSCDBCrosstalk> Pointer;
+  inline static CSCDBCrosstalk *prefillDBCrosstalk();
 
-      Pointer produceDBCrosstalk(const CSCDBCrosstalkRcd&);
+  typedef std::unique_ptr<CSCDBCrosstalk> Pointer;
 
-   private:
-      // ----------member data ---------------------------
-    void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
-    Pointer cndbCrosstalk ;
+  Pointer produceDBCrosstalk(const CSCDBCrosstalkRcd &);
 
+private:
+  // ----------member data ---------------------------
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
+  Pointer cndbCrosstalk;
 };
 
-#include<fstream>
-#include<vector>
-#include<iostream>
+#include <fstream>
+#include <iostream>
+#include <vector>
 
 // to workaround plugin library
-inline CSCDBCrosstalk *  CSCFakeDBCrosstalk::prefillDBCrosstalk()
-{
+inline CSCDBCrosstalk *CSCFakeDBCrosstalk::prefillDBCrosstalk() {
   int seed;
-  float mean,min;
-  int ii,jj,iii,jjj;
-  const int MAX_SIZE = 217728; //or 252288 for ME4/2 chambers
-  const int SLOPE_FACTOR=10000000;
-  const int INTERCEPT_FACTOR=100000;
-  
-  CSCDBCrosstalk * cndbcrosstalk = new CSCDBCrosstalk();
+  float mean, min;
+  int ii, jj, iii, jjj;
+  const int MAX_SIZE = 217728;  // or 252288 for ME4/2 chambers
+  const int SLOPE_FACTOR = 10000000;
+  const int INTERCEPT_FACTOR = 100000;
+
+  CSCDBCrosstalk *cndbcrosstalk = new CSCDBCrosstalk();
   cndbcrosstalk->crosstalk.resize(MAX_SIZE);
 
-  seed = 10000;	
+  seed = 10000;
   srand(seed);
-  mean=-0.0009, min=0.035;
-  ii=0,jj=0,iii=0,jjj=0;
-  
-  cndbcrosstalk->factor_slope = int (SLOPE_FACTOR);
-  cndbcrosstalk->factor_intercept = int (INTERCEPT_FACTOR);
-  
-  for(int i=0; i<MAX_SIZE;i++){
-    cndbcrosstalk->crosstalk[i].xtalk_slope_right = (short int) ((-((double)rand()/((double)(RAND_MAX)+(double)(1)))/10000+mean)*SLOPE_FACTOR+0.5);
-    cndbcrosstalk->crosstalk[i].xtalk_intercept_right= (short int) ((((double)rand()/((double)(RAND_MAX)+(double)(1)))/100+min)*INTERCEPT_FACTOR+0.5);
-    cndbcrosstalk->crosstalk[i].xtalk_slope_left= (short int) ((-((double)rand()/((double)(RAND_MAX)+(double)(1)))/10000+mean)*SLOPE_FACTOR+0.5);
-    cndbcrosstalk->crosstalk[i].xtalk_intercept_left=(short int) ((((double)rand()/((double)(RAND_MAX)+(double)(1)))/100+min)*INTERCEPT_FACTOR+0.5); 
-  
-  
-    //80 strips per chamber
-    if(i<34561 && i%80==0){
-      cndbcrosstalk->crosstalk[i].xtalk_slope_left=0;
-      cndbcrosstalk->crosstalk[i].xtalk_intercept_left=0;
+  mean = -0.0009, min = 0.035;
+  ii = 0, jj = 0, iii = 0, jjj = 0;
+
+  cndbcrosstalk->factor_slope = int(SLOPE_FACTOR);
+  cndbcrosstalk->factor_intercept = int(INTERCEPT_FACTOR);
+
+  for (int i = 0; i < MAX_SIZE; i++) {
+    cndbcrosstalk->crosstalk[i].xtalk_slope_right =
+        (short int)((-((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 10000 + mean) * SLOPE_FACTOR + 0.5);
+    cndbcrosstalk->crosstalk[i].xtalk_intercept_right =
+        (short int)((((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 100 + min) * INTERCEPT_FACTOR + 0.5);
+    cndbcrosstalk->crosstalk[i].xtalk_slope_left =
+        (short int)((-((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 10000 + mean) * SLOPE_FACTOR + 0.5);
+    cndbcrosstalk->crosstalk[i].xtalk_intercept_left =
+        (short int)((((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 100 + min) * INTERCEPT_FACTOR + 0.5);
+
+    // 80 strips per chamber
+    if (i < 34561 && i % 80 == 0) {
+      cndbcrosstalk->crosstalk[i].xtalk_slope_left = 0;
+      cndbcrosstalk->crosstalk[i].xtalk_intercept_left = 0;
     }
-    
-    if(i!=0 && i<34561 && (i+1)%80==0){
-      cndbcrosstalk->crosstalk[i].xtalk_slope_right=0;
-      cndbcrosstalk->crosstalk[i].xtalk_intercept_right=0;
+
+    if (i != 0 && i < 34561 && (i + 1) % 80 == 0) {
+      cndbcrosstalk->crosstalk[i].xtalk_slope_right = 0;
+      cndbcrosstalk->crosstalk[i].xtalk_intercept_right = 0;
     }
-    
-    //64 strips per chamber
-    if(i>34560 && i<48385 && i%64==0){
-      cndbcrosstalk->crosstalk[i].xtalk_slope_left=0;
-      cndbcrosstalk->crosstalk[i].xtalk_intercept_left=0;
+
+    // 64 strips per chamber
+    if (i > 34560 && i < 48385 && i % 64 == 0) {
+      cndbcrosstalk->crosstalk[i].xtalk_slope_left = 0;
+      cndbcrosstalk->crosstalk[i].xtalk_intercept_left = 0;
     }
-    
-    if(i>34560 && i<48385 && (i+1)%64==0){
-      cndbcrosstalk->crosstalk[i].xtalk_slope_right=0;
-      cndbcrosstalk->crosstalk[i].xtalk_intercept_right=0;
+
+    if (i > 34560 && i < 48385 && (i + 1) % 64 == 0) {
+      cndbcrosstalk->crosstalk[i].xtalk_slope_right = 0;
+      cndbcrosstalk->crosstalk[i].xtalk_intercept_right = 0;
     }
-    
-    //80 strips per chamber again
-    if(i>48384 && i<143425){
+
+    // 80 strips per chamber again
+    if (i > 48384 && i < 143425) {
       ii++;
-      if(i>48384 && i<143425 && ii%80==0){
-	cndbcrosstalk->crosstalk[i].xtalk_slope_left=0;
-	cndbcrosstalk->crosstalk[i].xtalk_intercept_left=0;
+      if (i > 48384 && i < 143425 && ii % 80 == 0) {
+        cndbcrosstalk->crosstalk[i].xtalk_slope_left = 0;
+        cndbcrosstalk->crosstalk[i].xtalk_intercept_left = 0;
       }
     }
-    
-    if(i>48384 && i<143425){
+
+    if (i > 48384 && i < 143425) {
       jj++;
-      if(i>48384 && i<143425 && (jj+1)%80==0){
-	cndbcrosstalk->crosstalk[i].xtalk_slope_right=0;
-	cndbcrosstalk->crosstalk[i].xtalk_intercept_right=0;
+      if (i > 48384 && i < 143425 && (jj + 1) % 80 == 0) {
+        cndbcrosstalk->crosstalk[i].xtalk_slope_right = 0;
+        cndbcrosstalk->crosstalk[i].xtalk_intercept_right = 0;
       }
     }
-    
-    //64 strips per chamber again
-    if(i>143424 && i<157249 &&i%64==0){
-      cndbcrosstalk->crosstalk[i].xtalk_slope_left=0;
-      cndbcrosstalk->crosstalk[i].xtalk_intercept_left=0;
+
+    // 64 strips per chamber again
+    if (i > 143424 && i < 157249 && i % 64 == 0) {
+      cndbcrosstalk->crosstalk[i].xtalk_slope_left = 0;
+      cndbcrosstalk->crosstalk[i].xtalk_intercept_left = 0;
     }
-    
-    if(i>143424 && i<157249 && (i+1)%64==0){
-      cndbcrosstalk->crosstalk[i].xtalk_slope_right=0;
-      cndbcrosstalk->crosstalk[i].xtalk_intercept_right=0;
+
+    if (i > 143424 && i < 157249 && (i + 1) % 64 == 0) {
+      cndbcrosstalk->crosstalk[i].xtalk_slope_right = 0;
+      cndbcrosstalk->crosstalk[i].xtalk_intercept_right = 0;
     }
-    
-    
-    //80 strips per chamber last time
-    if(i>157248){
+
+    // 80 strips per chamber last time
+    if (i > 157248) {
       iii++;
-      if(i>157248 && iii%80==0){
-	cndbcrosstalk->crosstalk[i].xtalk_slope_left=0;
-	cndbcrosstalk->crosstalk[i].xtalk_intercept_left=0;
+      if (i > 157248 && iii % 80 == 0) {
+        cndbcrosstalk->crosstalk[i].xtalk_slope_left = 0;
+        cndbcrosstalk->crosstalk[i].xtalk_intercept_left = 0;
       }
     }
-    
-    if(i>157248){
+
+    if (i > 157248) {
       jjj++;
-      if(i>157248 && (jjj+1)%80==0){
-	cndbcrosstalk->crosstalk[i].xtalk_slope_right=0;
-	cndbcrosstalk->crosstalk[i].xtalk_intercept_right=0;
+      if (i > 157248 && (jjj + 1) % 80 == 0) {
+        cndbcrosstalk->crosstalk[i].xtalk_slope_right = 0;
+        cndbcrosstalk->crosstalk[i].xtalk_intercept_right = 0;
       }
     }
   }
   return cndbcrosstalk;
-}  
+}
 
 #endif
-
-  
-
- 
-
diff --git a/CalibMuon/CSCCalibration/interface/CSCFakeDBGains.h b/CalibMuon/CSCCalibration/interface/CSCFakeDBGains.h
index dc5c94a216804..45107c441301a 100644
--- a/CalibMuon/CSCCalibration/interface/CSCFakeDBGains.h
+++ b/CalibMuon/CSCCalibration/interface/CSCFakeDBGains.h
@@ -1,15 +1,15 @@
 #ifndef _CSCFAKEDBGAINS_H
 #define _CSCFAKEDBGAINS_H
 
-#include <memory>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
+#include <memory>
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -17,48 +17,49 @@
 #include "CondFormats/DataRecord/interface/CSCDBGainsRcd.h"
 #include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCFakeDBGains: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
-   public:
-      CSCFakeDBGains(const edm::ParameterSet&);
-      ~CSCFakeDBGains() override;
+class CSCFakeDBGains : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCFakeDBGains(const edm::ParameterSet &);
+  ~CSCFakeDBGains() override;
 
-      inline static CSCDBGains* prefillDBGains(); 
+  inline static CSCDBGains *prefillDBGains();
 
-      typedef std::unique_ptr<CSCDBGains> Pointer;
-      Pointer produceDBGains(const CSCDBGainsRcd&);
+  typedef std::unique_ptr<CSCDBGains> Pointer;
+  Pointer produceDBGains(const CSCDBGainsRcd &);
 
-   private:
-    void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
-
-    // member data
-    Pointer cndbGains ;
+private:
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
 
+  // member data
+  Pointer cndbGains;
 };
 
-#include<fstream>
-#include<vector>
-#include<iostream>
+#include <fstream>
+#include <iostream>
+#include <vector>
 
 // to workaround plugin library
-inline CSCDBGains* CSCFakeDBGains::prefillDBGains()
-{
+inline CSCDBGains *CSCFakeDBGains::prefillDBGains() {
   int seed;
   float mean;
-  const int MAX_SIZE = 217728; //or 252288 for ME4/2 chambers
-  const int FACTOR=1000;
-  
-  CSCDBGains* cndbgains = new CSCDBGains();
+  const int MAX_SIZE = 217728;  // or 252288 for ME4/2 chambers
+  const int FACTOR = 1000;
+
+  CSCDBGains *cndbgains = new CSCDBGains();
   cndbgains->gains.resize(MAX_SIZE);
 
-  seed = 10000; 
+  seed = 10000;
   srand(seed);
-  mean=6.8;
-  cndbgains->factor_gain = int (FACTOR);
-  
-  for(int i=0; i<MAX_SIZE;i++){
-    cndbgains->gains[i].gain_slope= (short int) (((double)rand()/((double)(RAND_MAX)+(double)(1)))+mean*FACTOR+0.5);
+  mean = 6.8;
+  cndbgains->factor_gain = int(FACTOR);
+
+  for (int i = 0; i < MAX_SIZE; i++) {
+    cndbgains->gains[i].gain_slope =
+        (short int)(((double)rand() / ((double)(RAND_MAX) + (double)(1))) + mean * FACTOR + 0.5);
   }
   return cndbgains;
-}  
+}
 
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCFakeDBNoiseMatrix.h b/CalibMuon/CSCCalibration/interface/CSCFakeDBNoiseMatrix.h
index e51467a2dd2ef..dfa1e20f757fc 100644
--- a/CalibMuon/CSCCalibration/interface/CSCFakeDBNoiseMatrix.h
+++ b/CalibMuon/CSCCalibration/interface/CSCFakeDBNoiseMatrix.h
@@ -1,15 +1,15 @@
 #ifndef _CSCFAKEDBNOISEMATRIX_H
 #define _CSCFAKEDBNOISEMATRIX_H
 
-#include <memory>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
+#include <memory>
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -17,58 +17,57 @@
 #include "CondFormats/DataRecord/interface/CSCDBNoiseMatrixRcd.h"
 #include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCFakeDBNoiseMatrix: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
-   public:
-      CSCFakeDBNoiseMatrix(const edm::ParameterSet&);
-      ~CSCFakeDBNoiseMatrix() override;
+class CSCFakeDBNoiseMatrix : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCFakeDBNoiseMatrix(const edm::ParameterSet &);
+  ~CSCFakeDBNoiseMatrix() override;
 
-      inline static CSCDBNoiseMatrix * prefillDBNoiseMatrix(); 
+  inline static CSCDBNoiseMatrix *prefillDBNoiseMatrix();
 
-      typedef std::unique_ptr<CSCDBNoiseMatrix> Pointer;
+  typedef std::unique_ptr<CSCDBNoiseMatrix> Pointer;
 
-      Pointer produceDBNoiseMatrix(const CSCDBNoiseMatrixRcd&);
-
-   private:
-      // ----------member data ---------------------------
-    void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
-    Pointer cndbNoiseMatrix ;
+  Pointer produceDBNoiseMatrix(const CSCDBNoiseMatrixRcd &);
 
+private:
+  // ----------member data ---------------------------
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
+  Pointer cndbNoiseMatrix;
 };
 
-#include<fstream>
-#include<vector>
-#include<iostream>
+#include <fstream>
+#include <iostream>
+#include <vector>
 
 // to workaround plugin library
-inline CSCDBNoiseMatrix *  CSCFakeDBNoiseMatrix::prefillDBNoiseMatrix()
-{
+inline CSCDBNoiseMatrix *CSCFakeDBNoiseMatrix::prefillDBNoiseMatrix() {
   int seed;
-  const int MAX_SIZE = 252288; //or 252288 for ME4/2 chambers
-  const int FACTOR=1000;
-  
-  CSCDBNoiseMatrix * cndbmatrix = new CSCDBNoiseMatrix();
+  const int MAX_SIZE = 252288;  // or 252288 for ME4/2 chambers
+  const int FACTOR = 1000;
+
+  CSCDBNoiseMatrix *cndbmatrix = new CSCDBNoiseMatrix();
   cndbmatrix->matrix.resize(MAX_SIZE);
 
-  seed = 10000;	
+  seed = 10000;
   srand(seed);
-  cndbmatrix->factor_noise = int (FACTOR);
-  
-  for(int i=0; i<MAX_SIZE;i++){
-    cndbmatrix->matrix[i].elem33 = (short int) (10.0*FACTOR+0.5);
-    cndbmatrix->matrix[i].elem34 = (short int) (4.0*FACTOR+0.5);
-    cndbmatrix->matrix[i].elem35 = (short int) (3.0*FACTOR+0.5);
-    cndbmatrix->matrix[i].elem44 = (short int) (10.0*FACTOR+0.5);
-    cndbmatrix->matrix[i].elem45 = (short int) (8.0*FACTOR+0.5);
-    cndbmatrix->matrix[i].elem46 = (short int) (2.0*FACTOR+0.5);
-    cndbmatrix->matrix[i].elem55 = (short int) (10.0*FACTOR+0.5);
-    cndbmatrix->matrix[i].elem56 = (short int) (5.0*FACTOR+0.5);
-    cndbmatrix->matrix[i].elem57 = (short int) (3.0*FACTOR+0.5);
-    cndbmatrix->matrix[i].elem66 = (short int) (10.0*FACTOR+0.5);
-    cndbmatrix->matrix[i].elem67 = (short int) (4.0*FACTOR+0.5);
-    cndbmatrix->matrix[i].elem77 = (short int) (10.0*FACTOR+0.5);
+  cndbmatrix->factor_noise = int(FACTOR);
+
+  for (int i = 0; i < MAX_SIZE; i++) {
+    cndbmatrix->matrix[i].elem33 = (short int)(10.0 * FACTOR + 0.5);
+    cndbmatrix->matrix[i].elem34 = (short int)(4.0 * FACTOR + 0.5);
+    cndbmatrix->matrix[i].elem35 = (short int)(3.0 * FACTOR + 0.5);
+    cndbmatrix->matrix[i].elem44 = (short int)(10.0 * FACTOR + 0.5);
+    cndbmatrix->matrix[i].elem45 = (short int)(8.0 * FACTOR + 0.5);
+    cndbmatrix->matrix[i].elem46 = (short int)(2.0 * FACTOR + 0.5);
+    cndbmatrix->matrix[i].elem55 = (short int)(10.0 * FACTOR + 0.5);
+    cndbmatrix->matrix[i].elem56 = (short int)(5.0 * FACTOR + 0.5);
+    cndbmatrix->matrix[i].elem57 = (short int)(3.0 * FACTOR + 0.5);
+    cndbmatrix->matrix[i].elem66 = (short int)(10.0 * FACTOR + 0.5);
+    cndbmatrix->matrix[i].elem67 = (short int)(4.0 * FACTOR + 0.5);
+    cndbmatrix->matrix[i].elem77 = (short int)(10.0 * FACTOR + 0.5);
   }
   return cndbmatrix;
-}  
+}
 
 #endif
-
diff --git a/CalibMuon/CSCCalibration/interface/CSCFakeDBPedestals.h b/CalibMuon/CSCCalibration/interface/CSCFakeDBPedestals.h
index 742d27c9ae6dc..2dd4bdb1bbba3 100644
--- a/CalibMuon/CSCCalibration/interface/CSCFakeDBPedestals.h
+++ b/CalibMuon/CSCCalibration/interface/CSCFakeDBPedestals.h
@@ -1,15 +1,15 @@
 #ifndef _CSCFAKEDBPEDESTALS_H
 #define _CSCFAKEDBPEDESTALS_H
 
-#include <memory>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
+#include <memory>
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -17,50 +17,52 @@
 #include "CondFormats/DataRecord/interface/CSCDBPedestalsRcd.h"
 #include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCFakeDBPedestals: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
-   public:
-      CSCFakeDBPedestals(const edm::ParameterSet&);
-      ~CSCFakeDBPedestals() override;
-      
-       inline static CSCDBPedestals * prefillDBPedestals();
+class CSCFakeDBPedestals : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCFakeDBPedestals(const edm::ParameterSet &);
+  ~CSCFakeDBPedestals() override;
 
-      typedef  std::unique_ptr<CSCDBPedestals> Pointer;
+  inline static CSCDBPedestals *prefillDBPedestals();
 
-      Pointer produceDBPedestals(const CSCDBPedestalsRcd&);
+  typedef std::unique_ptr<CSCDBPedestals> Pointer;
 
-   private:
-      // ----------member data ---------------------------
-    void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
+  Pointer produceDBPedestals(const CSCDBPedestalsRcd &);
 
+private:
+  // ----------member data ---------------------------
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
 };
 
-#include<fstream>
-#include<vector>
-#include<iostream>
+#include <fstream>
+#include <iostream>
+#include <vector>
 
 // to workaround plugin library
-inline CSCDBPedestals *  CSCFakeDBPedestals::prefillDBPedestals()
-{
+inline CSCDBPedestals *CSCFakeDBPedestals::prefillDBPedestals() {
   int seed;
-  float meanped,meanrms;
-  const int MAX_SIZE = 217728; //or 252288 for ME4/2 chambers
-  const int PED_FACTOR=10;
-  const int RMS_FACTOR=1000;
- 
-  CSCDBPedestals * cndbpedestals = new CSCDBPedestals();
+  float meanped, meanrms;
+  const int MAX_SIZE = 217728;  // or 252288 for ME4/2 chambers
+  const int PED_FACTOR = 10;
+  const int RMS_FACTOR = 1000;
+
+  CSCDBPedestals *cndbpedestals = new CSCDBPedestals();
   cndbpedestals->pedestals.resize(MAX_SIZE);
 
-  seed = 10000;	
+  seed = 10000;
   srand(seed);
-  meanped=600.0, meanrms=1.5;
-  cndbpedestals->factor_ped = int (PED_FACTOR);
-  cndbpedestals->factor_rms = int (RMS_FACTOR);
- 
-  for(int i=0; i<MAX_SIZE;i++){
-    cndbpedestals->pedestals[i].ped=(short int) (((double)rand()/((double)(RAND_MAX)+(double)(1)))*100+meanped*PED_FACTOR+0.5);
-    cndbpedestals->pedestals[i].rms= (short int) (((double)rand()/((double)(RAND_MAX)+(double)(1)))+meanrms*RMS_FACTOR+0.5);
+  meanped = 600.0, meanrms = 1.5;
+  cndbpedestals->factor_ped = int(PED_FACTOR);
+  cndbpedestals->factor_rms = int(RMS_FACTOR);
+
+  for (int i = 0; i < MAX_SIZE; i++) {
+    cndbpedestals->pedestals[i].ped =
+        (short int)(((double)rand() / ((double)(RAND_MAX) + (double)(1))) * 100 + meanped * PED_FACTOR + 0.5);
+    cndbpedestals->pedestals[i].rms =
+        (short int)(((double)rand() / ((double)(RAND_MAX) + (double)(1))) + meanrms * RMS_FACTOR + 0.5);
   }
   return cndbpedestals;
-}  
+}
 
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCFakeGainsConditions.h b/CalibMuon/CSCCalibration/interface/CSCFakeGainsConditions.h
index 7a2a975827ab2..050ba34d3514a 100644
--- a/CalibMuon/CSCCalibration/interface/CSCFakeGainsConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCFakeGainsConditions.h
@@ -1,15 +1,15 @@
 #ifndef _CSCFAKEGAINSCONDITIONS_H
 #define _CSCFAKEGAINSCONDITIONS_H
 
-#include <memory>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
+#include <memory>
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -17,24 +17,26 @@
 #include "CondFormats/DataRecord/interface/CSCGainsRcd.h"
 #include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCFakeGainsConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
-   public:
-      CSCFakeGainsConditions(const edm::ParameterSet&);
-      ~CSCFakeGainsConditions() override;
-
-      float mean,min,minchi;
-      int seed;long int M;
+class CSCFakeGainsConditions : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCFakeGainsConditions(const edm::ParameterSet &);
+  ~CSCFakeGainsConditions() override;
 
-      CSCGains * prefillGains(); 
+  float mean, min, minchi;
+  int seed;
+  long int M;
 
-      typedef std::unique_ptr<CSCGains> ReturnType;
+  CSCGains *prefillGains();
 
-      ReturnType produceGains(const CSCGainsRcd&);
+  typedef std::unique_ptr<CSCGains> ReturnType;
 
-   private:
-      // ----------member data ---------------------------
-    void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
+  ReturnType produceGains(const CSCGainsRcd &);
 
+private:
+  // ----------member data ---------------------------
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
 };
 
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCFakeNoiseMatrixConditions.h b/CalibMuon/CSCCalibration/interface/CSCFakeNoiseMatrixConditions.h
index 8d546a539be09..da95000d45c19 100644
--- a/CalibMuon/CSCCalibration/interface/CSCFakeNoiseMatrixConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCFakeNoiseMatrixConditions.h
@@ -1,35 +1,35 @@
 #ifndef _CSCFAKENOISEMATRIXCONDITIONS_H
 #define _CSCFAKENOISEMATRIXCONDITIONS_H
 
-#include <memory>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <memory>
 
 #include "CondFormats/CSCObjects/interface/CSCNoiseMatrix.h"
 #include "CondFormats/DataRecord/interface/CSCNoiseMatrixRcd.h"
 #include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
+class CSCFakeNoiseMatrixConditions : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCFakeNoiseMatrixConditions(const edm::ParameterSet &);
+  ~CSCFakeNoiseMatrixConditions() override;
+
+  CSCNoiseMatrix *prefillNoiseMatrix();
 
-class CSCFakeNoiseMatrixConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
-   public:
-      CSCFakeNoiseMatrixConditions(const edm::ParameterSet&);
-      ~CSCFakeNoiseMatrixConditions() override;
-      
-      CSCNoiseMatrix * prefillNoiseMatrix();
-      
-      typedef std::unique_ptr<CSCNoiseMatrix> ReturnType;
-      ReturnType produceNoiseMatrix(const CSCNoiseMatrixRcd&);
+  typedef std::unique_ptr<CSCNoiseMatrix> ReturnType;
+  ReturnType produceNoiseMatrix(const CSCNoiseMatrixRcd &);
 
- private:
-      void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
-      
+private:
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
 };
 
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCFakePedestalsConditions.h b/CalibMuon/CSCCalibration/interface/CSCFakePedestalsConditions.h
index ebb60c39752ec..9c787e175acf3 100644
--- a/CalibMuon/CSCCalibration/interface/CSCFakePedestalsConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCFakePedestalsConditions.h
@@ -1,15 +1,15 @@
 #ifndef _CSCFAKEPEDESTALSCONDITIONS_H
 #define _CSCFAKEPEDESTALSCONDITIONS_H
 
-#include <memory>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
+#include <memory>
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -17,23 +17,26 @@
 #include "CondFormats/DataRecord/interface/CSCPedestalsRcd.h"
 #include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCFakePedestalsConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
-   public:
-      CSCFakePedestalsConditions(const edm::ParameterSet&);
-      ~CSCFakePedestalsConditions() override;
+class CSCFakePedestalsConditions : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCFakePedestalsConditions(const edm::ParameterSet &);
+  ~CSCFakePedestalsConditions() override;
+
+  float meanped, meanrms;
+  int seed;
+  long int M;
 
-      float meanped,meanrms;
-      int seed;long int M;
-      
-      CSCPedestals *  prefillPedestals();
+  CSCPedestals *prefillPedestals();
 
-      typedef std::unique_ptr<CSCPedestals> ReturnType;
+  typedef std::unique_ptr<CSCPedestals> ReturnType;
 
-      ReturnType producePedestals(const CSCPedestalsRcd&);
+  ReturnType producePedestals(const CSCPedestalsRcd &);
 
-   private:
-      // ----------member data ---------------------------
-    void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
+private:
+  // ----------member data ---------------------------
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
 };
 
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCGainsConditions.h b/CalibMuon/CSCCalibration/interface/CSCGainsConditions.h
index 09454306d18a2..9acf83b8dab26 100644
--- a/CalibMuon/CSCCalibration/interface/CSCGainsConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCGainsConditions.h
@@ -1,37 +1,38 @@
 #ifndef _CSCGAINSCONDITIONS_H
 #define _CSCGAINSCONDITIONS_H
 
-#include <memory>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <memory>
 
-#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 #include "CondFormats/CSCObjects/interface/CSCGains.h"
 #include "CondFormats/DataRecord/interface/CSCGainsRcd.h"
+#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCGainsConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
- public:
-  CSCGainsConditions(const edm::ParameterSet&);
+class CSCGainsConditions : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCGainsConditions(const edm::ParameterSet &);
   ~CSCGainsConditions() override;
-  
-  static CSCGains * prefillGains();
+
+  static CSCGains *prefillGains();
 
   typedef std::unique_ptr<CSCGains> ReturnType;
-  
-  ReturnType produceGains(const CSCGainsRcd&);
-  
- private:
-  // ----------member data ---------------------------
-  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
-  CSCGains *cnGains ;
 
+  ReturnType produceGains(const CSCGainsRcd &);
+
+private:
+  // ----------member data ---------------------------
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
+  CSCGains *cnGains;
 };
 
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCGainsDBConditions.h b/CalibMuon/CSCCalibration/interface/CSCGainsDBConditions.h
index e0b2a89211829..9d65de287db80 100644
--- a/CalibMuon/CSCCalibration/interface/CSCGainsDBConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCGainsDBConditions.h
@@ -1,62 +1,61 @@
 #ifndef _CSCGAINSDBCONDITIONS_H
 #define _CSCGAINSDBCONDITIONS_H
 
-#include <memory>
-#include <cmath>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <cmath>
+#include <memory>
 
-#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 #include "CondFormats/CSCObjects/interface/CSCDBGains.h"
 #include "CondFormats/DataRecord/interface/CSCDBGainsRcd.h"
+#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCGainsDBConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
- public:
-  CSCGainsDBConditions(const edm::ParameterSet&);
+class CSCGainsDBConditions : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCGainsDBConditions(const edm::ParameterSet &);
   ~CSCGainsDBConditions() override;
-  
 
-  inline static CSCDBGains *  prefillDBGains();
+  inline static CSCDBGains *prefillDBGains();
 
   typedef std::unique_ptr<CSCDBGains> ReturnType;
-  
-  ReturnType produceDBGains(const CSCDBGainsRcd&);
-  
- private:
-  // ----------member data ---------------------------
-  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
-  CSCDBGains *cndbGains ;
 
+  ReturnType produceDBGains(const CSCDBGainsRcd &);
+
+private:
+  // ----------member data ---------------------------
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
+  CSCDBGains *cndbGains;
 };
 
-#include<fstream>
-#include<vector>
-#include<iostream>
+#include <fstream>
+#include <iostream>
+#include <vector>
 
 // to workaround plugin library
-inline CSCDBGains *  CSCGainsDBConditions::prefillDBGains()
-{
+inline CSCDBGains *CSCGainsDBConditions::prefillDBGains() {
   // const int MAX_SIZE = 273024;//for ME1a unganged
   const int MAX_SIZE = 252288;
   const int FACTOR = 1000;
   const int MAX_SHORT = 32767;
-  CSCDBGains * cndbgains = new CSCDBGains();
-    
+  CSCDBGains *cndbgains = new CSCDBGains();
+
   int db_index;
-  float db_gainslope;//db_intercpt, db_chisq;
+  float db_gainslope;  // db_intercpt, db_chisq;
   std::vector<int> db_index_id;
   std::vector<float> db_slope;
   std::vector<float> db_intercept;
   std::vector<float> db_chi2;
   int new_index;
-  float new_gainslope,new_intercpt, new_chisq;
+  float new_gainslope, new_intercpt, new_chisq;
   std::vector<int> new_cham_id;
   std::vector<int> new_index_id;
   std::vector<int> new_strips;
@@ -65,35 +64,35 @@ inline CSCDBGains *  CSCGainsDBConditions::prefillDBGains()
   std::vector<float> new_chi2;
 
   int counter;
-  int db_nrlines=0;
-  int new_nrlines=0;
-  
-  std::ifstream dbdata; 
-  dbdata.open("old_dbgains.dat",std::ios::in); 
-  if(!dbdata) {
-    std::cerr <<"Error: old_dbgains.dat -> no such file!"<< std::endl;
+  int db_nrlines = 0;
+  int new_nrlines = 0;
+
+  std::ifstream dbdata;
+  dbdata.open("old_dbgains.dat", std::ios::in);
+  if (!dbdata) {
+    std::cerr << "Error: old_dbgains.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!dbdata.eof() ) { 
-    dbdata >> db_index >> db_gainslope; 
+
+  while (!dbdata.eof()) {
+    dbdata >> db_index >> db_gainslope;
     db_index_id.push_back(db_index);
     db_slope.push_back(db_gainslope);
-    //db_intercept.push_back(db_intercpt);
-    //db_chi2.push_back(db_chisq);
+    // db_intercept.push_back(db_intercpt);
+    // db_chi2.push_back(db_chisq);
     db_nrlines++;
   }
   dbdata.close();
 
   std::ifstream newdata;
-  newdata.open("gains.dat",std::ios::in); 
-  if(!newdata) {
-    std::cerr <<"Error: gains.dat -> no such file!"<< std::endl;
+  newdata.open("gains.dat", std::ios::in);
+  if (!newdata) {
+    std::cerr << "Error: gains.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!newdata.eof() ) { 
-    newdata >> new_index >> new_gainslope >> new_intercpt >> new_chisq ; 
+
+  while (!newdata.eof()) {
+    newdata >> new_index >> new_gainslope >> new_intercpt >> new_chisq;
     new_index_id.push_back(new_index);
     new_slope.push_back(new_gainslope);
     new_intercept.push_back(new_intercpt);
@@ -102,34 +101,33 @@ inline CSCDBGains *  CSCGainsDBConditions::prefillDBGains()
   }
   newdata.close();
 
-  CSCDBGains::GainContainer & itemvector = cndbgains->gains;
+  CSCDBGains::GainContainer &itemvector = cndbgains->gains;
   itemvector.resize(MAX_SIZE);
-  cndbgains->factor_gain = (short int) (FACTOR);
-  std::cout<<" myfactor "<<cndbgains->factor_gain<<std::endl;
+  cndbgains->factor_gain = (short int)(FACTOR);
+  std::cout << " myfactor " << cndbgains->factor_gain << std::endl;
 
-  for(int i=0; i<MAX_SIZE;++i){
-    itemvector[i].gain_slope= int (db_slope[i]*FACTOR+0.5);
+  for (int i = 0; i < MAX_SIZE; ++i) {
+    itemvector[i].gain_slope = int(db_slope[i] * FACTOR + 0.5);
   }
 
-   for(int i=0; i<MAX_SIZE;++i){
-     counter=db_index_id[i]; 
-     itemvector[i] = itemvector[counter];
-     itemvector[i].gain_slope = int (db_slope[i]);
- 
-     for (unsigned int k=0;k<new_index_id.size()-1;k++){
-       if(counter==new_index_id[k]){
-	 if ((short int) (fabs(new_slope[k]*FACTOR+0.5))<MAX_SHORT) itemvector[counter].gain_slope= int (new_slope[k]*FACTOR+0.5);
-	 itemvector[i] = itemvector[counter];
-       }
-     }
-     if(counter>223968){
-       itemvector[counter].gain_slope = int (db_slope[i]);
-       itemvector[i] = itemvector[counter];
-     }
-   }
-     return cndbgains;
+  for (int i = 0; i < MAX_SIZE; ++i) {
+    counter = db_index_id[i];
+    itemvector[i] = itemvector[counter];
+    itemvector[i].gain_slope = int(db_slope[i]);
+
+    for (unsigned int k = 0; k < new_index_id.size() - 1; k++) {
+      if (counter == new_index_id[k]) {
+        if ((short int)(fabs(new_slope[k] * FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].gain_slope = int(new_slope[k] * FACTOR + 0.5);
+        itemvector[i] = itemvector[counter];
+      }
+    }
+    if (counter > 223968) {
+      itemvector[counter].gain_slope = int(db_slope[i]);
+      itemvector[i] = itemvector[counter];
+    }
+  }
+  return cndbgains;
 }
 
-
 #endif
-
diff --git a/CalibMuon/CSCCalibration/interface/CSCGasGainCorrectionDBConditions.h b/CalibMuon/CSCCalibration/interface/CSCGasGainCorrectionDBConditions.h
index fa495b2da6dc3..e4d9ebe1c7540 100644
--- a/CalibMuon/CSCCalibration/interface/CSCGasGainCorrectionDBConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCGasGainCorrectionDBConditions.h
@@ -1,153 +1,150 @@
 #ifndef _CSCGASGAINCORRECTIONDBCONDITIONS_H
 #define _CSCGASGAINCORRECTIONDBCONDITIONS_H
 
-#include <memory>
-#include <cmath>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <cmath>
+#include <memory>
 
-#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 #include "CondFormats/CSCObjects/interface/CSCDBGasGainCorrection.h"
 #include "CondFormats/DataRecord/interface/CSCDBGasGainCorrectionRcd.h"
 #include "DataFormats/MuonDetId/interface/CSCIndexer.h"
+#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCGasGainCorrectionDBConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
- public:
-  CSCGasGainCorrectionDBConditions(const edm::ParameterSet&);
+class CSCGasGainCorrectionDBConditions : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCGasGainCorrectionDBConditions(const edm::ParameterSet &);
   ~CSCGasGainCorrectionDBConditions() override;
-  
-  inline static CSCDBGasGainCorrection * prefillDBGasGainCorrection(bool isForMC, std::string dataCorrFileName);
+
+  inline static CSCDBGasGainCorrection *prefillDBGasGainCorrection(bool isForMC, std::string dataCorrFileName);
 
   typedef std::unique_ptr<CSCDBGasGainCorrection> ReturnType;
-  
-  ReturnType produceDBGasGainCorrection(const CSCDBGasGainCorrectionRcd&);
-  
- private:
+
+  ReturnType produceDBGasGainCorrection(const CSCDBGasGainCorrectionRcd &);
+
+private:
   // ----------member data ---------------------------
-  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
 
-  //Flag for determining if this is for setting MC or data corrections
+  // Flag for determining if this is for setting MC or data corrections
   bool isForMC;
-  //File for reading 55944 gas gain corrections.  MC will be fake;
+  // File for reading 55944 gas gain corrections.  MC will be fake;
   std::string dataCorrFileName;
-
 };
 
-#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 #include "CondFormats/CSCObjects/interface/CSCDBGasGainCorrection.h"
 #include "CondFormats/DataRecord/interface/CSCDBGasGainCorrectionRcd.h"
+#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-#include<fstream>
-#include<vector>
-#include<iostream>
-
-
+#include <fstream>
+#include <iostream>
+#include <vector>
 
 // to workaround plugin library
-inline CSCDBGasGainCorrection * CSCGasGainCorrectionDBConditions::prefillDBGasGainCorrection(bool isMC, std::string filename)  
-{
+inline CSCDBGasGainCorrection *CSCGasGainCorrectionDBConditions::prefillDBGasGainCorrection(bool isMC,
+                                                                                            std::string filename) {
   if (isMC)
     printf("\n Generating fake DB constants for MC\n");
   else {
-    printf("\n Reading gas gain corrections from file %s \n",filename.data());
+    printf("\n Reading gas gain corrections from file %s \n", filename.data());
   }
-  
+
   CSCIndexer indexer;
 
   const int MAX_SIZE = 55944;
 
-  CSCDBGasGainCorrection * cndbGasGainCorr = new CSCDBGasGainCorrection();
+  CSCDBGasGainCorrection *cndbGasGainCorr = new CSCDBGasGainCorrection();
 
-  CSCDBGasGainCorrection::GasGainContainer & itemvector = cndbGasGainCorr->gasGainCorr;
+  CSCDBGasGainCorrection::GasGainContainer &itemvector = cndbGasGainCorr->gasGainCorr;
   itemvector.resize(MAX_SIZE);
 
-  //Filling corrections for MC is very simple
-  if (isMC){
-    for (int i=0;i<MAX_SIZE;i++){
+  // Filling corrections for MC is very simple
+  if (isMC) {
+    for (int i = 0; i < MAX_SIZE; i++) {
       itemvector[i].gainCorr = 1.;
     }
     return cndbGasGainCorr;
   }
 
   struct gain_info {
-    int   gas_gain_index     ;
-    int   endcap             ;
-    int   station            ;
-    int   ring               ;
-    int   chamber            ;
-    int   layer              ;
-    int   hvsegment          ;
-    int   cfeb               ;
-    int   nentries           ;
-    float mean               ;
-    float truncated_mean     ;
+    int gas_gain_index;
+    int endcap;
+    int station;
+    int ring;
+    int chamber;
+    int layer;
+    int hvsegment;
+    int cfeb;
+    int nentries;
+    float mean;
+    float truncated_mean;
     float gas_gain_correction;
   } gains[MAX_SIZE];
 
-
-  for (int j=0; j<MAX_SIZE; j++) {
-    gains[j].gas_gain_index     = -999;
-    gains[j].endcap             = -999;
-    gains[j].station            = -999;
-    gains[j].ring               = -999;
-    gains[j].chamber            = -999;
-    gains[j].layer              = -999;
-    gains[j].hvsegment          = -999;
-    gains[j].cfeb               = -999;
-    gains[j].nentries           = -999;
-    gains[j].mean               = -999.;
-    gains[j].truncated_mean     = -999.;
-    gains[j].gas_gain_correction= -999.;
+  for (int j = 0; j < MAX_SIZE; j++) {
+    gains[j].gas_gain_index = -999;
+    gains[j].endcap = -999;
+    gains[j].station = -999;
+    gains[j].ring = -999;
+    gains[j].chamber = -999;
+    gains[j].layer = -999;
+    gains[j].hvsegment = -999;
+    gains[j].cfeb = -999;
+    gains[j].nentries = -999;
+    gains[j].mean = -999.;
+    gains[j].truncated_mean = -999.;
+    gains[j].gas_gain_correction = -999.;
   }
 
-  FILE *fin = fopen(filename.data(),"r");
+  FILE *fin = fopen(filename.data(), "r");
 
   int linecounter = 0;  // set the line counter to the first serial number in the file....
 
-  while (!feof(fin)){
-    //note space at end of format string to convert last \n
-    int check = fscanf(fin,"%d %d %d %d %d %d %d %d %d %f %f %f \n",
-		       &gains[linecounter].gas_gain_index     ,
-		       &gains[linecounter].endcap             ,
-		       &gains[linecounter].station            ,
-		       &gains[linecounter].ring               ,
-		       &gains[linecounter].chamber            ,
-		       &gains[linecounter].layer              ,
-		       &gains[linecounter].hvsegment          ,
-		       &gains[linecounter].cfeb               ,
-		       &gains[linecounter].nentries           ,
-		       &gains[linecounter].mean               ,
-		       &gains[linecounter].truncated_mean     ,
-		       &gains[linecounter].gas_gain_correction);
-
-    if (check != 12){
+  while (!feof(fin)) {
+    // note space at end of format string to convert last \n
+    int check = fscanf(fin,
+                       "%d %d %d %d %d %d %d %d %d %f %f %f \n",
+                       &gains[linecounter].gas_gain_index,
+                       &gains[linecounter].endcap,
+                       &gains[linecounter].station,
+                       &gains[linecounter].ring,
+                       &gains[linecounter].chamber,
+                       &gains[linecounter].layer,
+                       &gains[linecounter].hvsegment,
+                       &gains[linecounter].cfeb,
+                       &gains[linecounter].nentries,
+                       &gains[linecounter].mean,
+                       &gains[linecounter].truncated_mean,
+                       &gains[linecounter].gas_gain_correction);
+
+    if (check != 12) {
       printf("The input file format is not as expected\n");
       assert(0);
     }
 
     linecounter++;
-
   }
 
-  fclose(fin);      
+  fclose(fin);
 
   if (linecounter == MAX_SIZE) {
     std::cout << "Total number of gas gains read in = " << linecounter << std::endl;
   } else {
-    std::cout << "ERROR:  Total number of gas-gains read in = " << linecounter 
-	      << " while total number expected = " << MAX_SIZE << std::endl;
+    std::cout << "ERROR:  Total number of gas-gains read in = " << linecounter
+              << " while total number expected = " << MAX_SIZE << std::endl;
   }
 
   // Fill the chip corrections with values from the file
-  for (int i=0;i<MAX_SIZE;i++){
-
+  for (int i = 0; i < MAX_SIZE; i++) {
     itemvector[i].gainCorr = 0.;
 
     if (gains[i].gas_gain_correction > 0.) {
@@ -157,8 +154,8 @@ inline CSCDBGasGainCorrection * CSCGasGainCorrectionDBConditions::prefillDBGasGa
       std::cout << "ERROR:  gas_gain_correction < 0 for index " << gains[i].gas_gain_index << std::endl;
     }
   }
- 
+
   return cndbGasGainCorr;
 }
- 
+
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCIndexerBase.h b/CalibMuon/CSCCalibration/interface/CSCIndexerBase.h
index ef7b5a89f9daa..1f1129c92086e 100644
--- a/CalibMuon/CSCCalibration/interface/CSCIndexerBase.h
+++ b/CalibMuon/CSCCalibration/interface/CSCIndexerBase.h
@@ -4,64 +4,77 @@
 /** \class CSCIndexerBase
  * ABC for CSCIndexer classes.
  *
- * A CSCIndexer class provides a linear index for various sublevels of the endcap muon CSC system for
- * use in access to information stored in the Conditions Database. Only concrete derived classes can be instantiated.
+ * A CSCIndexer class provides a linear index for various sublevels of the
+ * endcap muon CSC system for use in access to information stored in the
+ * Conditions Database. Only concrete derived classes can be instantiated.
  *
  * It supplies a linear index for:
- * 1. Each chamber of the CSC system: range 1-468 (CSC system as installed 2008) 469-540 for ME42 <br>
- * 2. Each layer of the CSC system: range 1-2808 (CSCs 2008) 2809-3240 for ME42 <br>
- * 3. Each strip channel of the CSC system: range 1-217728 (CSCs 2008) 217729-252288 for ME42 <br>
- * 4. Each Buckeye chip (1 for each layer in each CFEB) of the CSC system: range 1-13608 (CSCs 2008) 13609-15768 for ME42 <br>
- * 5. Each Gas Gain Sector (1 for each [CFEB*HV segment] combination in each layer): range 1-45144 (CSCs 2008) 45145-55944 for ME42 <br>
+ * 1. Each chamber of the CSC system: range 1-468 (CSC system as installed 2008)
+ * 469-540 for ME42 <br>
+ * 2. Each layer of the CSC system: range 1-2808 (CSCs 2008) 2809-3240 for ME42
+ * <br>
+ * 3. Each strip channel of the CSC system: range 1-217728 (CSCs 2008)
+ * 217729-252288 for ME42 <br>
+ * 4. Each Buckeye chip (1 for each layer in each CFEB) of the CSC system: range
+ * 1-13608 (CSCs 2008) 13609-15768 for ME42 <br>
+ * 5. Each Gas Gain Sector (1 for each [CFEB*HV segment] combination in each
+ * layer): range 1-45144 (CSCs 2008) 45145-55944 for ME42 <br>
  *
- * The chamber and layer may be specified by CSCDetId or labels for endcap, station, ring, chamber, layer.
+ * The chamber and layer may be specified by CSCDetId or labels for endcap,
+ * station, ring, chamber, layer.
  *
  * The strip channel is a value 1-80 for most chambers. <br>
  * ME1/3 and ME1/1B have 64 channels. <br>
- * ME1/1A has 16 channels at CMS startup (2008-2013) and 48 channels after Long Shutdown 1 ('LS1' 2013-2014) <br>
- * The chip number is a value 1-30 (or 24: ME13 chambers have only 24 chips.)
+ * ME1/1A has 16 channels at CMS startup (2008-2013) and 48 channels after Long
+ * Shutdown 1 ('LS1' 2013-2014) <br> The chip number is a value 1-30 (or 24:
+ * ME13 chambers have only 24 chips.)
  *
  * The main user interface is the set of functions <br>
  *   chamberIndex(.) <br>
  *   layerIndex(.) <br>
  *   stripChannelIndex(.) <br>
  *   chipIndex(.) <br>
- * But the other functions are public since they may be useful in contexts other than for
- * Conditions Data for which the above functions are intended.
+ * But the other functions are public since they may be useful in contexts other
+ * than for Conditions Data for which the above functions are intended.
  *
  * The terminology "label" can be confusing. <br>
- * The CSC project typically refers to an element of the CSC detector by hardware labels
- * endcap (+z, -z), station (1-4), ring (1-3), chamber (1-18 or 1-36 depending on ring), layer (1-6). 
- * Strips (and wiregroups) are number 1-N where N is the total number of strips in a given layer. <br>
- * Offline, we turn +z, -z into integers 1, 2 and extend the ring index to 4 to mean ME1/1A (leaving ring 1 in station 1 to
- * mean ME1/1B when dealing with strip planes. Since there is only one common wire plane sometimes ring 1, station 1 means
+ * The CSC project typically refers to an element of the CSC detector by
+ * hardware labels endcap (+z, -z), station (1-4), ring (1-3), chamber (1-18 or
+ * 1-36 depending on ring), layer (1-6). Strips (and wiregroups) are number 1-N
+ * where N is the total number of strips in a given layer. <br> Offline, we turn
+ * +z, -z into integers 1, 2 and extend the ring index to 4 to mean ME1/1A
+ * (leaving ring 1 in station 1 to mean ME1/1B when dealing with strip planes.
+ * Since there is only one common wire plane sometimes ring 1, station 1 means
  * the entire ME1/1 and sometimes just ME1/1B.)
- * So in offline code, when we talk about "labels" for an element, we typically mean these integer values. <br>
- * For example, strip 71 of layer 4 of chamber 17 of ME-3/1 is labelled {ie=2, is=3, ir=1, ic=17, il=4, istrip=71}.
- * However, in CSCIndexer classes, "label" may be generalized to mean more than this. For example, the "chamberLabel_"
- * vector encodes these integer labels for a chamber, and does not just mean the value ic=1-18 or 36.
+ * So in offline code, when we talk about "labels" for an element, we typically
+ * mean these integer values. <br> For example, strip 71 of layer 4 of chamber
+ * 17 of ME-3/1 is labelled {ie=2, is=3, ir=1, ic=17, il=4, istrip=71}. However,
+ * in CSCIndexer classes, "label" may be generalized to mean more than this. For
+ * example, the "chamberLabel_" vector encodes these integer labels for a
+ * chamber, and does not just mean the value ic=1-18 or 36.
  *
  * \warning EVERY LABEL COUNTS FROM ONE NOT ZERO.
  *
- * \warning Contains a number of non-virtual method that derived classes are not expected to override!
- * TODO: add 'final' attribute to those non-virtual methods after full migration to gcc4.7
+ * \warning Contains a number of non-virtual method that derived classes are not
+ * expected to override!
+ * TODO: add 'final' attribute to those non-virtual methods after full migration
+ * to gcc4.7
  */
 
 #include <DataFormats/MuonDetId/interface/CSCDetId.h>
-#include <vector>
-#include <utility>  // for pair
 #include <boost/tuple/tuple.hpp>
+#include <utility>  // for pair
+#include <vector>
 
-class CSCIndexerBase
-{
+class CSCIndexerBase {
 public:
-
   typedef uint16_t IndexType;
   typedef uint32_t LongIndexType;
-  typedef boost::tuple<CSCDetId,  // id
-                       IndexType, // HV segment
-                       IndexType  // chip
-                      > GasGainIndexType;
+  typedef boost::tuple<CSCDetId,   // id
+                       IndexType,  // HV segment
+                       IndexType   // chip
+                       >
+      GasGainIndexType;
 
   CSCIndexerBase();
   virtual ~CSCIndexerBase();
@@ -69,45 +82,44 @@ class CSCIndexerBase
   virtual std::string name() const { return "CSCIndexerBase"; }
 
   /** \name maxIndexMethods
-   * The following methods are expected to define maximum values for various index types.
+   * The following methods are expected to define maximum values for various
+   * index types.
    *
-   * \warning The abstract methods need to be implemented by concrete CSCIndexers!
-   * \warning the minimum index value is 1.
+   * \warning The abstract methods need to be implemented by concrete
+   * CSCIndexers! \warning the minimum index value is 1.
    */
   //@{
-  IndexType maxChamberIndex() const          { return 540; }
-  IndexType maxLayerIndex() const            { return 3240; }
+  IndexType maxChamberIndex() const { return 540; }
+  IndexType maxLayerIndex() const { return 3240; }
   virtual LongIndexType maxStripChannelIndex() const = 0;
   virtual IndexType maxChipIndex() const = 0;
   virtual IndexType maxGasGainIndex() const = 0;
   //@}
 
-
   /// \name nonIndexCountingMethods
   //@{
   /**
    * How many physical rings are there in station 'is'=1, 2, 3, 4 ?
    */
-  IndexType ringsInStation( IndexType is ) const
-  {
-    const IndexType nrins[5] = {0, 3, 2, 2, 2}; // physical rings per station
+  IndexType ringsInStation(IndexType is) const {
+    const IndexType nrins[5] = {0, 3, 2, 2, 2};  // physical rings per station
     return nrins[is];
   }
 
   /**
    * How many online rings are there in station 'is'=1, 2, 3, 4 ?
    */
-  virtual IndexType onlineRingsInStation( IndexType is ) const = 0;
+  virtual IndexType onlineRingsInStation(IndexType is) const = 0;
 
   /**
    * How many offline rings are there in station 'is'=1, 2, 3, 4 ?
    *
    * \warning:
-   * - ME1 has 4 rings in the offline notation (virtual ring 4 is used for ME1a).
+   * - ME1 has 4 rings in the offline notation (virtual ring 4 is used for
+   * ME1a).
    */
-  IndexType offlineRingsInStation( IndexType is ) const
-  {
-    const IndexType nrings[5] = { 0, 4, 2, 2, 2 }; // offline rings per station
+  IndexType offlineRingsInStation(IndexType is) const {
+    const IndexType nrings[5] = {0, 4, 2, 2, 2};  // offline rings per station
     return nrings[is];
   }
 
@@ -115,10 +127,9 @@ class CSCIndexerBase
    * How many chambers are there in an "offline" ring ir of station is?
    * Works for ME1a (ring 4 of ME1) too.
    */
-  IndexType chambersInRingOfStation(IndexType is, IndexType ir) const
-  {
-    const IndexType nCinR[16] = { 36,36,36,36,  18,36,0,0,  18,36,0,0,  18,36,0,0 }; // chambers in ring
-    return nCinR[(is - 1)*4 + ir - 1];
+  IndexType chambersInRingOfStation(IndexType is, IndexType ir) const {
+    const IndexType nCinR[16] = {36, 36, 36, 36, 18, 36, 0, 0, 18, 36, 0, 0, 18, 36, 0, 0};  // chambers in ring
+    return nCinR[(is - 1) * 4 + ir - 1];
   }
 
   /**
@@ -126,21 +137,21 @@ class CSCIndexerBase
    * with ring 'ir' and station 'is'.
    * Works for ME1a (ring 4 of ME1) too.
    */
-  virtual IndexType stripChannelsPerOfflineLayer( IndexType is, IndexType ir ) const = 0;
+  virtual IndexType stripChannelsPerOfflineLayer(IndexType is, IndexType ir) const = 0;
 
   /**
    * Number of strip readout channels per layer in an online chamber
    * with ring 'ir' and station 'is'.
    * Works for ME1a (ring 4 of ME1) too.
    */
-  virtual IndexType stripChannelsPerOnlineLayer( IndexType is, IndexType ir ) const = 0;
+  virtual IndexType stripChannelsPerOnlineLayer(IndexType is, IndexType ir) const = 0;
 
   /**
    * Number of Buckeye chips per layer in an online chamber
    * in ring 'ir' of station 'is'.
    * Works for ME1a (ring 4 of ME1) too.
    */
-  virtual IndexType chipsPerOnlineLayer( IndexType is, IndexType ir ) const = 0;
+  virtual IndexType chipsPerOnlineLayer(IndexType is, IndexType ir) const = 0;
 
   /**
    * Number of Gas Gain sectors per layer in an online chamber
@@ -150,42 +161,37 @@ class CSCIndexerBase
    * The difference between this and sectorsPerLayer completely depends on
    * the difference between chipsPerOnlineLayer and chipsPerLayer
    */
-  IndexType sectorsPerOnlineLayer( IndexType is, IndexType ir ) const
-  {
+  IndexType sectorsPerOnlineLayer(IndexType is, IndexType ir) const {
     return chipsPerOnlineLayer(is, ir) * hvSegmentsPerLayer(is, ir);
   }
 
   //@}
 
-
   /// \name chamberIndexMethods
   //@{
   /**
-   * Starting index for first chamber in ring 'ir' of station 'is' in endcap 'ie',
-   * in range 1-468 (CSCs 2008) or 469-540 (ME42).
+   * Starting index for first chamber in ring 'ir' of station 'is' in endcap
+   * 'ie', in range 1-468 (CSCs 2008) or 469-540 (ME42).
    *
    * \warning: Considers both ME1a and ME1b to be part of one whole ME11 chamber
    *          (result would be the same for is=1 and ir=1 or 4).
    */
-  IndexType startChamberIndexInEndcap(IndexType ie, IndexType is, IndexType ir) const
-  {
-    const IndexType nschin[32] =
-      { 1,37,73,1,        109,127,0,0,  163,181,0,0,  217,469,0,0,
-        235,271,307,235,  343,361,0,0,  397,415,0,0,  451,505,0,0 };
-    return nschin[(ie - 1)*16 + (is - 1)*4 + ir - 1];
+  IndexType startChamberIndexInEndcap(IndexType ie, IndexType is, IndexType ir) const {
+    const IndexType nschin[32] = {1,   37,  73,  1,   109, 127, 0, 0, 163, 181, 0, 0, 217, 469, 0, 0,
+                                  235, 271, 307, 235, 343, 361, 0, 0, 397, 415, 0, 0, 451, 505, 0, 0};
+    return nschin[(ie - 1) * 16 + (is - 1) * 4 + ir - 1];
   }
 
   /**
    * Linear index for chamber 'ic' in ring 'ir' of station 'is' in endcap 'ie',
    * in range 1-468 (CSCs 2008) or 469-540 (ME42)
    *
-   * \warning: Since both ME1a and ME1b are part of one ME11 chamber 
+   * \warning: Since both ME1a and ME1b are part of one ME11 chamber
    * the output is the same for input {is=1, ir=1} and {is=1, ir=4}, i.e.
    * chamberIndex for ME1/1a is the same as for ME1/1b.
    */
-  IndexType chamberIndex(IndexType ie, IndexType is, IndexType ir, IndexType ic) const
-  {
-    return startChamberIndexInEndcap(ie, is, ir) + ic - 1; // -1 so start index _is_ ic=1
+  IndexType chamberIndex(IndexType ie, IndexType is, IndexType ir, IndexType ic) const {
+    return startChamberIndexInEndcap(ie, is, ir) + ic - 1;  // -1 so start index _is_ ic=1
   }
 
   /**
@@ -194,31 +200,28 @@ class CSCIndexerBase
    *
    * Output is 1-468 (CSCs 2008) 469-540 (with ME42)
    *
-   * \warning: Since both ME1a and ME1b are part of one ME11 chamber 
+   * \warning: Since both ME1a and ME1b are part of one ME11 chamber
    * the output is the same for input {is=1, ir=1} and {is=1, ir=4}, i.e.
    * chamberIndex for ME1/1a is the same as for ME1/1b.
    */
-  IndexType chamberIndex( const CSCDetId& id ) const
-  {
-    return chamberIndex( id.endcap(), id.station(), id.ring(), id.chamber() );
+  IndexType chamberIndex(const CSCDetId &id) const {
+    return chamberIndex(id.endcap(), id.station(), id.ring(), id.chamber());
   }
   //@}
 
-
   /// \name layerIndexMethods
   //@{
   /**
-   * Linear index for layer 'il' of chamber 'ic' in ring 'ir' of station 'is' in endcap 'ie',
-   * in range 1-2808 (CSCs 2008) or 2809-3240 (ME42).
+   * Linear index for layer 'il' of chamber 'ic' in ring 'ir' of station 'is' in
+   * endcap 'ie', in range 1-2808 (CSCs 2008) or 2809-3240 (ME42).
    *
-   * \warning: Since both ME1a and ME1b are part of one ME11 chamber 
+   * \warning: Since both ME1a and ME1b are part of one ME11 chamber
    * the output is the same for input {is=1, ir=1} and {is=1, ir=4}, i.e.
    * layerIndex for ME1/1a is the same as for ME1/1b.
    */
-  IndexType layerIndex(IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il) const
-  {
+  IndexType layerIndex(IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il) const {
     const IndexType layersInChamber = 6;
-    return (chamberIndex(ie, is, ir, ic) - 1 ) * layersInChamber + il;
+    return (chamberIndex(ie, is, ir, ic) - 1) * layersInChamber + il;
   }
 
   /**
@@ -231,13 +234,11 @@ class CSCIndexerBase
    * the output is the same for input {is=1, ir=1} and {is=1, ir=4}, i.e.
    * layerIndex for ME1/1a is the same as for ME1/1b.
    */
-  IndexType layerIndex(const CSCDetId& id) const
-  {
+  IndexType layerIndex(const CSCDetId &id) const {
     return layerIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer());
   }
   //@}
 
-
   /// \name stripIndexMethods
   //@{
   /**
@@ -247,107 +248,105 @@ class CSCIndexerBase
    * Station label range 1-4, Ring label range 1-4 (4=ME1a)
    *
    * This depends on the ordering of the channels in the database.
-   * E.g., in startup scenario there are 80 indices allocated per ME1/1 layer with 1-64 belonging to ME1b
-   * and 65-80 belonging to ME1a. So the ME1/a database indices are mapped to extend the ME1/b index ranges,
-   * which is how the raw hardware chnnels numbering is implemented.
+   * E.g., in startup scenario there are 80 indices allocated per ME1/1 layer
+   * with 1-64 belonging to ME1b and 65-80 belonging to ME1a. So the ME1/a
+   * database indices are mapped to extend the ME1/b index ranges, which is how
+   * the raw hardware chnnels numbering is implemented.
    *
-   * In the currently implemented upgrade scenario on the other hand, the ME1b still keeps the
-   * 80 indices wide ranges (with the last 16 of them remaining unused),
-   * while the ME1/1A gets its own 48 indices wide ranges.
+   * In the currently implemented upgrade scenario on the other hand, the ME1b
+   * still keeps the 80 indices wide ranges (with the last 16 of them remaining
+   * unused), while the ME1/1A gets its own 48 indices wide ranges.
    */
-  virtual IndexType stripChannelsPerLayer( IndexType is, IndexType ir ) const = 0;
+  virtual IndexType stripChannelsPerLayer(IndexType is, IndexType ir) const = 0;
 
   /**
-   * Linear index for 1st strip channel in ring 'ir' of station 'is' in endcap 'ie'.
+   * Linear index for 1st strip channel in ring 'ir' of station 'is' in endcap
+   * 'ie'.
    *
-   * Endcap label range 1-2, Station label range 1-4, Ring label range 1-4 (4=ME1a)
+   * Endcap label range 1-2, Station label range 1-4, Ring label range 1-4
+   * (4=ME1a)
    */
-  virtual LongIndexType stripChannelStart( IndexType ie, IndexType is, IndexType ir ) const = 0;
+  virtual LongIndexType stripChannelStart(IndexType ie, IndexType is, IndexType ir) const = 0;
 
   /**
-   * Linear index for strip channel istrip in layer 'il' of chamber 'ic' of ring 'ir'
-   * in station 'is' of endcap 'ie'.
+   * Linear index for strip channel istrip in layer 'il' of chamber 'ic' of ring
+   * 'ir' in station 'is' of endcap 'ie'.
    *
-   * \warning: You must input labels within hardware ranges. No trapping on out-of-range values!
+   * \warning: You must input labels within hardware ranges. No trapping on
+   * out-of-range values!
    */
-  LongIndexType stripChannelIndex( IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il, IndexType istrip ) const
-  {
-    return stripChannelStart(ie, is, ir)
-           + ( (ic - 1)*6 + il - 1 ) * stripChannelsPerLayer(is, ir)
-           + (istrip - 1);
+  LongIndexType stripChannelIndex(
+      IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il, IndexType istrip) const {
+    return stripChannelStart(ie, is, ir) + ((ic - 1) * 6 + il - 1) * stripChannelsPerLayer(is, ir) + (istrip - 1);
   }
 
   /**
    * Linear index for strip channel 'istrip' in layer labeled by CSCDetId 'id'
    *
-   * \warning: You must input labels within hardware ranges. No trapping on out-of-range values!
+   * \warning: You must input labels within hardware ranges. No trapping on
+   * out-of-range values!
    */
-  LongIndexType stripChannelIndex( const CSCDetId& id, IndexType istrip ) const
-  {
-    return stripChannelIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer(), istrip );
+  LongIndexType stripChannelIndex(const CSCDetId &id, IndexType istrip) const {
+    return stripChannelIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer(), istrip);
   }
   //@}
 
-
   /// \name chipIndexMethods
   //@{
   /**
-   * Number of Buckeye chips indices per layer in a chamber in ring 'ir' of station 'is'.
+   * Number of Buckeye chips indices per layer in a chamber in ring 'ir' of
+   * station 'is'.
    *
    * Station label range 1-4, Ring label range 1-4 (4=ME1a)
    */
-  virtual IndexType chipsPerLayer( IndexType is, IndexType ir ) const = 0;
+  virtual IndexType chipsPerLayer(IndexType is, IndexType ir) const = 0;
 
   /**
-   * Linear index for 1st Buckeye chip in ring 'ir' of station 'is' in endcap 'ie'.
+   * Linear index for 1st Buckeye chip in ring 'ir' of station 'is' in endcap
+   * 'ie'.
    *
-   * Endcap label range 1-2, Station label range 1-4, Ring label range 1-4 (4=ME1a)
+   * Endcap label range 1-2, Station label range 1-4, Ring label range 1-4
+   * (4=ME1a)
    */
-  virtual IndexType chipStart( IndexType ie, IndexType is, IndexType ir ) const = 0;
+  virtual IndexType chipStart(IndexType ie, IndexType is, IndexType ir) const = 0;
 
   /**
-   * Linear index for Buckeye chip 'ichip' in layer 'il' of chamber 'ic' of ring 'ir'
-   * in station 'is' of endcap 'ie'.
+   * Linear index for Buckeye chip 'ichip' in layer 'il' of chamber 'ic' of ring
+   * 'ir' in station 'is' of endcap 'ie'.
    *
-   * \warning: You must input labels within hardware ranges. No trapping on out-of-range values!
-   * E.g., if you provide ir=4 in ganged case, it would still be treated the same as ir=1,
-   * but ichip must be 5 for it to make sense!
+   * \warning: You must input labels within hardware ranges. No trapping on
+   * out-of-range values! E.g., if you provide ir=4 in ganged case, it would
+   * still be treated the same as ir=1, but ichip must be 5 for it to make
+   * sense!
    */
-  IndexType chipIndex( IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il, IndexType ichip ) const
-  {
-    return chipStart(ie, is, ir)
-           + ( (ic - 1)*6 + il - 1 ) * chipsPerLayer(is, ir)
-           + (ichip - 1);
+  IndexType chipIndex(IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il, IndexType ichip) const {
+    return chipStart(ie, is, ir) + ((ic - 1) * 6 + il - 1) * chipsPerLayer(is, ir) + (ichip - 1);
   }
 
   /**
    * Linear index for Buckeye chip 'ichip' in layer labelled by CSCDetId 'id'.
    *
-   * \warning: The supplied CSCDetId must be a layer id, and ichip must be h/w chip number in a chamber.
-   * No trapping on out-of-range values!
-   * E.g., if you provide ME1a id in ganged case, it would still be treated the same as whole ME11 id,
-   * but ichip must be 5 for it to make sense!
+   * \warning: The supplied CSCDetId must be a layer id, and ichip must be h/w
+   * chip number in a chamber. No trapping on out-of-range values! E.g., if you
+   * provide ME1a id in ganged case, it would still be treated the same as whole
+   * ME11 id, but ichip must be 5 for it to make sense!
    */
-  IndexType chipIndex( const CSCDetId& id, IndexType ichip ) const
-  {
-    return chipIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer(), ichip );
+  IndexType chipIndex(const CSCDetId &id, IndexType ichip) const {
+    return chipIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer(), ichip);
   }
 
   /**
    * Chip number in a chamber for a Buckeye chip processing strip 'istrip'.
    *
    * Input is hardware strip channel 1-80.
-   * \warning: for ganged ME1a istrip would have to be in 65-80, while for unganged ME1a it would be in 1-48
+   * \warning: for ganged ME1a istrip would have to be in 65-80, while for
+   * unganged ME1a it would be in 1-48
    *
    * Output is 1-5.
    */
-  IndexType chipIndex( IndexType istrip ) const
-  {
-    return (istrip - 1)/16 + 1;
-  }
+  IndexType chipIndex(IndexType istrip) const { return (istrip - 1) / 16 + 1; }
   //@}
 
-
   /// \name gasGainIndexMethods
   //@{
   /**
@@ -355,11 +354,11 @@ class CSCIndexerBase
    *
    * Station label range 1-4, Ring label range 1-4 (4=ME1a)
    *
-   * ME1a (ir=4), ME1b(ir=1) and whole ME11 are all assumed to have the same single HV segment
+   * ME1a (ir=4), ME1b(ir=1) and whole ME11 are all assumed to have the same
+   * single HV segment
    */
-  IndexType hvSegmentsPerLayer( IndexType is, IndexType ir ) const
-  {
-    const IndexType nSinL[16] = { 1,3,3,1, 3,5,0,0, 3,5,0,0, 3,5,0,0 };
+  IndexType hvSegmentsPerLayer(IndexType is, IndexType ir) const {
+    const IndexType nSinL[16] = {1, 3, 3, 1, 3, 5, 0, 0, 3, 5, 0, 0, 3, 5, 0, 0};
     return nSinL[(is - 1) * 4 + ir - 1];
   }
 
@@ -369,163 +368,179 @@ class CSCIndexerBase
    *
    * Output is 1-5.
    *
-   * ME1a (ir=4), ME1b(ir=1) and whole ME11 are all assumed to have the same single HV segment
+   * ME1a (ir=4), ME1b(ir=1) and whole ME11 are all assumed to have the same
+   * single HV segment
    */
-  IndexType hvSegmentIndex(IndexType is, IndexType ir, IndexType iwire ) const;
+  IndexType hvSegmentIndex(IndexType is, IndexType ir, IndexType iwire) const;
 
   /**
    * Number of Gas Gain sectors per layer in a chamber in ring ir of station is.
    *
    * Station label range 1-4, Ring label range 1-4 (4=ME1a)
    *
-   * \warning: for ganged case, the ir=4 ME1a input would give the same result as ir=1
+   * \warning: for ganged case, the ir=4 ME1a input would give the same result
+   * as ir=1
    */
-  IndexType sectorsPerLayer( IndexType is, IndexType ir ) const
-  {
+  IndexType sectorsPerLayer(IndexType is, IndexType ir) const {
     return chipsPerLayer(is, ir) * hvSegmentsPerLayer(is, ir);
   }
 
   /**
-   * Linear index for 1st Gas gain sector in ring 'ir' of station 'is' in endcap 'ie'.
+   * Linear index for 1st Gas gain sector in ring 'ir' of station 'is' in endcap
+   * 'ie'.
    *
-   * Endcap label range 1-2, Station label range 1-4, Ring label range 1-4 (4=ME1a)
+   * Endcap label range 1-2, Station label range 1-4, Ring label range 1-4
+   * (4=ME1a)
    *
    * \warning:
-   *   current: ME1a chip is the last 1 of the 5 chips total in each layer of an ME11 chamber,
-   *            and an input ir=4 in this case would give the same result as ir=1
-   *   upgraded:  ME1a has 3 own chips, which are appended to the end of the index range,
-   *            ME1b still keeps 5 chips with chip #5 index unused.
+   *   current: ME1a chip is the last 1 of the 5 chips total in each layer of an
+   * ME11 chamber, and an input ir=4 in this case would give the same result as
+   * ir=1 upgraded:  ME1a has 3 own chips, which are appended to the end of the
+   * index range, ME1b still keeps 5 chips with chip #5 index unused.
    */
-  virtual IndexType sectorStart( IndexType ie, IndexType is, IndexType ir ) const = 0;
+  virtual IndexType sectorStart(IndexType ie, IndexType is, IndexType ir) const = 0;
 
   /**
    * Linear index for Gas gain sector, based on the HV segment# and the chip#
-   * located in layer 'il' of chamber 'ic' of ring 'ir' in station 'is' of endcap 'ie'.
+   * located in layer 'il' of chamber 'ic' of ring 'ir' in station 'is' of
+   * endcap 'ie'.
    *
    * Output is 1-45144 (CSCs 2008) and 45145-55944 (ME42) and 55945-57240 (ME1a)
    *
-   * \warning: You must input labels within hardware ranges. No trapping on out-of-range values!
-   * E.g., if you provide ir=4 in ganged case, it would still be treated the same as ir=1,
-   * but ichip must be 5 for it to make sense!
-   */
-  IndexType gasGainIndex( IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il,
-                          IndexType ihvsegment, IndexType ichip ) const
-  {
-    return sectorStart(ie,is,ir)
-           + ( (ic-1)*6 + il - 1 ) * sectorsPerLayer(is,ir)
-           + (ihvsegment - 1) * chipsPerLayer(is,ir)
-           + (ichip - 1);
+   * \warning: You must input labels within hardware ranges. No trapping on
+   * out-of-range values! E.g., if you provide ir=4 in ganged case, it would
+   * still be treated the same as ir=1, but ichip must be 5 for it to make
+   * sense!
+   */
+  IndexType gasGainIndex(IndexType ie,
+                         IndexType is,
+                         IndexType ir,
+                         IndexType ic,
+                         IndexType il,
+                         IndexType ihvsegment,
+                         IndexType ichip) const {
+    return sectorStart(ie, is, ir) + ((ic - 1) * 6 + il - 1) * sectorsPerLayer(is, ir) +
+           (ihvsegment - 1) * chipsPerLayer(is, ir) + (ichip - 1);
   }
 
   /**
-   * Linear index for Gas gain sector, based on CSCDetId 'id', cathode strip 'istrip' and anode wire 'iwire'
+   * Linear index for Gas gain sector, based on CSCDetId 'id', cathode strip
+   * 'istrip' and anode wire 'iwire'
    *
-   * \warning: You must input labels within hardware ranges (e.g., 'id' must correspond
-   * to a specific layer 1-6). No trapping on out-of-range values!
-   * E.g., if you provide ME1a id in ganged case, it would still be treated the same as whole ME11 id,
-   * but istrip must be a h/w strip number in 64-80 in that case!
+   * \warning: You must input labels within hardware ranges (e.g., 'id' must
+   * correspond to a specific layer 1-6). No trapping on out-of-range values!
+   * E.g., if you provide ME1a id in ganged case, it would still be treated the
+   * same as whole ME11 id, but istrip must be a h/w strip number in 64-80 in
+   * that case!
    */
-  IndexType gasGainIndex( const CSCDetId& id, IndexType istrip, IndexType iwire ) const
-  {
-    return gasGainIndex( id.endcap(), id.station(), id.ring(), id.chamber(), id.layer(),
-                         hvSegmentIndex( id.station(), id.ring(), iwire ),
-                         chipIndex(istrip) );
+  IndexType gasGainIndex(const CSCDetId &id, IndexType istrip, IndexType iwire) const {
+    return gasGainIndex(id.endcap(),
+                        id.station(),
+                        id.ring(),
+                        id.chamber(),
+                        id.layer(),
+                        hvSegmentIndex(id.station(), id.ring(), iwire),
+                        chipIndex(istrip));
   }
 
   /**
-   * Linear index for Gas gain sector, based on CSCDetId 'id', the HV segment# and the chip#.
-   * Note: to allow method overloading, the parameters order is reversed comparing to the (id,strip,wire) method
+   * Linear index for Gas gain sector, based on CSCDetId 'id', the HV segment#
+   * and the chip#. Note: to allow method overloading, the parameters order is
+   * reversed comparing to the (id,strip,wire) method
    *
    * Output is 1-45144 (CSCs 2008) and 45145-55944 (ME42) and 55945-57240 (ME1a)
    *
-   * \warning: Use at your own risk! You must input labels within hardware ranges.
-   * No trapping on out-of-range values!
-   * The supplied CSCDetId must be a layer id, and ichip must be h/w chip number in a chamber.
-   * E.g., if you provide ME1a id in ganged case, it would still be treated the same as whole ME11 id,
-   * but ichip must be 5 for it to make sense!
+   * \warning: Use at your own risk! You must input labels within hardware
+   * ranges. No trapping on out-of-range values! The supplied CSCDetId must be a
+   * layer id, and ichip must be h/w chip number in a chamber. E.g., if you
+   * provide ME1a id in ganged case, it would still be treated the same as whole
+   * ME11 id, but ichip must be 5 for it to make sense!
    */
-  IndexType gasGainIndex( IndexType ihvsegment, IndexType ichip, const CSCDetId& id ) const
-  {
+  IndexType gasGainIndex(IndexType ihvsegment, IndexType ichip, const CSCDetId &id) const {
     return gasGainIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer(), ihvsegment, ichip);
   }
   //@}
 
-
   /// \name reverseIndexMethods
   /// reverse look-up methods: index --> detid + etc.
   //@{
   /**
-   * CSCDetId for a physical chamber labelled by the chamber index (1-468 non-ME4/2, 469-540 ME4/2)
-   * 
+   * CSCDetId for a physical chamber labelled by the chamber index (1-468
+   * non-ME4/2, 469-540 ME4/2)
+   *
    * No distinction between ME1/1a and ME1/1b.
    */
-  CSCDetId detIdFromChamberIndex( IndexType ici ) const;
+  CSCDetId detIdFromChamberIndex(IndexType ici) const;
 
   /**
-   * CSCDetId for a physical layer labelled by the layer index (1-2808 non-ME4/2, 2809-3240 ME4/2)
-   * 
+   * CSCDetId for a physical layer labelled by the layer index (1-2808
+   * non-ME4/2, 2809-3240 ME4/2)
+   *
    * No distinction between ME1/1a and ME1/1b.
    */
-  CSCDetId detIdFromLayerIndex( IndexType ili ) const;
+  CSCDetId detIdFromLayerIndex(IndexType ili) const;
 
   /**
    * CSCDetId + strip channel within layer from conditions data strip index.
    *
    * \warning This function changes meaning with ganged and unganged ME1/1a.
-   * If ME1/1a is ganged then an ME1/1a strip index returns ME1/1b CSCDetId + channel in range 65-80. <br>
-   * If ME1/1a is unganged then an ME1/1a strip index returns ME1/1a CSCDetId + channel in range 1-48.
+   * If ME1/1a is ganged then an ME1/1a strip index returns ME1/1b CSCDetId +
+   * channel in range 65-80. <br> If ME1/1a is unganged then an ME1/1a strip
+   * index returns ME1/1a CSCDetId + channel in range 1-48.
    */
-  virtual std::pair<CSCDetId, IndexType> detIdFromStripChannelIndex( LongIndexType ichi ) const = 0;
+  virtual std::pair<CSCDetId, IndexType> detIdFromStripChannelIndex(LongIndexType ichi) const = 0;
 
   /**
    * CSCDetId + chip within chamber from conditions data chip index.
    *
    * \warning This function changes meaning with ganged and unganged ME1/1a.
-   * If ME1/1a is ganged then an ME1/1a chip index returns ME1/1b CSCDetId + chip=5. <br>
-   * If ME1/1a is unganged then an ME1/1a chip index returns ME1/1a CSCDetId + chip# in range 1-3.
+   * If ME1/1a is ganged then an ME1/1a chip index returns ME1/1b CSCDetId +
+   * chip=5. <br> If ME1/1a is unganged then an ME1/1a chip index returns ME1/1a
+   * CSCDetId + chip# in range 1-3.
    */
-  virtual std::pair<CSCDetId, IndexType> detIdFromChipIndex( IndexType ichi ) const = 0;
+  virtual std::pair<CSCDetId, IndexType> detIdFromChipIndex(IndexType ichi) const = 0;
 
   /**
-   * CSCDetId + HV segment + chip within chamber from conditions data gas gain index.
+   * CSCDetId + HV segment + chip within chamber from conditions data gas gain
+   * index.
    *
    * \warning This function changes meaning with ganged and unganged ME1/1a.
-   * If ME1/1a is ganged then an ME1/1a gas gain index returns ME1/1b CSCDetId + HVsegment=1 + chip=5. <br>
-   * If ME1/1a is unganged then an ME1/1a gas gain index returns ME1/1a CSCDetId + HVsegment=1 + chip# in range 1-3.
+   * If ME1/1a is ganged then an ME1/1a gas gain index returns ME1/1b CSCDetId +
+   * HVsegment=1 + chip=5. <br> If ME1/1a is unganged then an ME1/1a gas gain
+   * index returns ME1/1a CSCDetId + HVsegment=1 + chip# in range 1-3.
    */
-  virtual GasGainIndexType detIdFromGasGainIndex( IndexType igg ) const = 0;
+  virtual GasGainIndexType detIdFromGasGainIndex(IndexType igg) const = 0;
 
   //@}
 
-
   /**
    * Create the "Igor Index" for a strip channel.
-   * This is integer ie*100000 + is*10000 + ir*1000 + ic*10 + il. 
+   * This is integer ie*100000 + is*10000 + ir*1000 + ic*10 + il.
    *
-   * \warning The channel is NOT encoded. BUT... channel is passed in as a reference
-   * and is converted from 1-16 to 65-80 if the chamber is ME1/1a and ganged.
+   * \warning The channel is NOT encoded. BUT... channel is passed in as a
+   * reference and is converted from 1-16 to 65-80 if the chamber is ME1/1a and
+   * ganged.
    *
    */
-  virtual int dbIndex(const CSCDetId & id, int & channel) const = 0;
-
+  virtual int dbIndex(const CSCDetId &id, int &channel) const = 0;
 
   /**
    * Encoded chambers label value from cache for input chamber index.
    * For debugging only!
    */
-  IndexType chamberLabelFromChamberIndex( IndexType ) const;
+  IndexType chamberLabelFromChamberIndex(IndexType) const;
 
 protected:
-
   /**
-   * Decode CSCDetId from the encoded chamber values in chamberLabel cache vector.
-   * Requires endcap label since that is not encoded in cache.
+   * Decode CSCDetId from the encoded chamber values in chamberLabel cache
+   * vector. Requires endcap label since that is not encoded in cache.
    */
-  CSCDetId detIdFromChamberLabel( IndexType ie, IndexType icl ) const;
+  CSCDetId detIdFromChamberLabel(IndexType ie, IndexType icl) const;
 
   /**
-   * Encode a chamber's is, ir, ic values as is*1000 + ir*100 + ic in linear vector with serial index 1-270.
-   * Save space in this vector by not storing ie.
+   * Encode a chamber's is, ir, ic values as is*1000 + ir*100 + ic in linear
+   * vector with serial index 1-270. Save space in this vector by not storing
+   * ie.
    */
   std::vector<IndexType> chamberLabel_;
 };
diff --git a/CalibMuon/CSCCalibration/interface/CSCIndexerESProducer.h b/CalibMuon/CSCCalibration/interface/CSCIndexerESProducer.h
index b56d349a62e60..016ab61b37609 100644
--- a/CalibMuon/CSCCalibration/interface/CSCIndexerESProducer.h
+++ b/CalibMuon/CSCCalibration/interface/CSCIndexerESProducer.h
@@ -9,16 +9,15 @@
 #include "CalibMuon/CSCCalibration/interface/CSCIndexerRecord.h"
 
 class CSCIndexerESProducer : public edm::ESProducer {
-
- public:
+public:
   typedef std::unique_ptr<CSCIndexerBase> BSP_TYPE;
 
-  CSCIndexerESProducer(const edm::ParameterSet&);
+  CSCIndexerESProducer(const edm::ParameterSet &);
   ~CSCIndexerESProducer() override;
 
-  BSP_TYPE produce(const CSCIndexerRecord&);
+  BSP_TYPE produce(const CSCIndexerRecord &);
 
- private:
+private:
   std::string algoName;
 };
 
diff --git a/CalibMuon/CSCCalibration/interface/CSCIndexerFactory.h b/CalibMuon/CSCCalibration/interface/CSCIndexerFactory.h
index b2213497e8596..f8acf563b1085 100644
--- a/CalibMuon/CSCCalibration/interface/CSCIndexerFactory.h
+++ b/CalibMuon/CSCCalibration/interface/CSCIndexerFactory.h
@@ -1,9 +1,9 @@
 #ifndef CSCIndexerFactory_H
 #define CSCIndexerFactory_H
 
-#include "FWCore/PluginManager/interface/PluginFactory.h"
 #include "CalibMuon/CSCCalibration/interface/CSCIndexerBase.h"
+#include "FWCore/PluginManager/interface/PluginFactory.h"
 
-typedef edmplugin::PluginFactory< CSCIndexerBase* (void) > CSCIndexerFactory;
+typedef edmplugin::PluginFactory<CSCIndexerBase *(void)> CSCIndexerFactory;
 
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCIndexerPostls1.h b/CalibMuon/CSCCalibration/interface/CSCIndexerPostls1.h
index 6a3b12d3dd30d..512c74295dd4e 100644
--- a/CalibMuon/CSCCalibration/interface/CSCIndexerPostls1.h
+++ b/CalibMuon/CSCCalibration/interface/CSCIndexerPostls1.h
@@ -2,25 +2,29 @@
 #define CSCIndexerPostls1_H
 
 /** \class CSCIndexerPostls1
- * Concrete CSCIndexer class appropriate for CSC Conditions Data access after CMS long shutdown 1 (2013-2014)
- * in which most ME4/2 rings are complete and the 48 strips in ME1/1A are unganged and so have 48 channels. <br>
- * The conditions data are stored in an order based on the hadrware channel order so this class
- * has to jump through hoops in order to map between that order and a CSCDetID order offline.
+ * Concrete CSCIndexer class appropriate for CSC Conditions Data access after
+ * CMS long shutdown 1 (2013-2014) in which most ME4/2 rings are complete and
+ * the 48 strips in ME1/1A are unganged and so have 48 channels. <br> The
+ * conditions data are stored in an order based on the hadrware channel order so
+ * this class has to jump through hoops in order to map between that order and a
+ * CSCDetID order offline.
  *
  * See documentation in base class CSCIndexerBase for more information.
  *
- * \warning This class is hard-wired for the CSC system expected after long shutdown 2013-2014 (LS1) of CMS.<br>
- * The basic order is as for startup (pre-LS1)
- * with rings ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41 totalling 234 chambers per endcap.
- * Then ME42 is appended, so the chamber order is <br>
+ * \warning This class is hard-wired for the CSC system expected after long
+ * shutdown 2013-2014 (LS1) of CMS.<br> The basic order is as for startup
+ * (pre-LS1) with rings ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41 totalling
+ * 234 chambers per endcap. Then ME42 is appended, so the chamber order is <br>
  * +z ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41, <br>
  * -z ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41, <br>
  * +z ME42, -z ME42 <br>
  *
- * It is further extended for unganged ME1a strip channels by appending +z ME1a, -z ME1a.
+ * It is further extended for unganged ME1a strip channels by appending +z ME1a,
+ * -z ME1a.
  *
  *  CSCIndexerBase::stripChannelIndex returns <br>
- *      1-217728 (CSCs 2008), 217729-252288 (ME42), 252289-273024 (unganged ME1a)
+ *      1-217728 (CSCs 2008), 217729-252288 (ME42), 252289-273024 (unganged
+ * ME1a)
  *
  *  CSCIndexerBase::chipIndex returns <br>
  *      1-13608 (CSCs 2008), 13609-15768 (ME42), 15769-17064 (unganged ME1a).
@@ -35,23 +39,19 @@
 
 #include <CalibMuon/CSCCalibration/interface/CSCIndexerBase.h>
 
-class CSCIndexerPostls1 : public CSCIndexerBase
-{
+class CSCIndexerPostls1 : public CSCIndexerBase {
 public:
-
   ~CSCIndexerPostls1() override;
 
   std::string name() const override { return "CSCIndexerPostls1"; }
 
-
   /// \name maxIndexMethods
   //@{
   LongIndexType maxStripChannelIndex() const override { return 273024; }
-  IndexType maxChipIndex() const override             { return 17064; }
-  IndexType maxGasGainIndex() const override          { return 57240; }
+  IndexType maxChipIndex() const override { return 17064; }
+  IndexType maxGasGainIndex() const override { return 57240; }
   //@}
 
-
   /// \name nonIndexCountingMethods
   //@{
   /**
@@ -60,9 +60,8 @@ class CSCIndexerPostls1 : public CSCIndexerBase
    * \warning: ME1a and ME1b are considered as two separate
    * 'online' rings for the upgrade
    */
-  IndexType onlineRingsInStation( IndexType is ) const override
-  {
-    const IndexType nrings[5] = { 0, 4, 2, 2, 2 };
+  IndexType onlineRingsInStation(IndexType is) const override {
+    const IndexType nrings[5] = {0, 4, 2, 2, 2};
     return nrings[is];
   }
 
@@ -72,10 +71,9 @@ class CSCIndexerPostls1 : public CSCIndexerBase
    *
    * Assume ME1a has 48 unganged readout channels.
    */
-  IndexType stripChannelsPerOfflineLayer( IndexType is, IndexType ir ) const override
-  {
-    const IndexType nSC[16] = { 64,80,64,48,  80,80,0,0,  80,80,0,0,  80,80,0,0 };
-    return nSC[(is-1)*4 + ir - 1];
+  IndexType stripChannelsPerOfflineLayer(IndexType is, IndexType ir) const override {
+    const IndexType nSC[16] = {64, 80, 64, 48, 80, 80, 0, 0, 80, 80, 0, 0, 80, 80, 0, 0};
+    return nSC[(is - 1) * 4 + ir - 1];
   }
 
   /**
@@ -85,10 +83,9 @@ class CSCIndexerPostls1 : public CSCIndexerBase
    * Assume ME1a has 48 unganged readout channels.
    * Online chambers ME1a and ME1b are separate.
    */
-  IndexType stripChannelsPerOnlineLayer( IndexType is, IndexType ir ) const override
-  {
-    const IndexType nSC[16] = { 64,80,64,48,  80,80,0,0,  80,80,0,0,  80,80,0,0 };
-    return nSC[(is-1)*4 + ir - 1];
+  IndexType stripChannelsPerOnlineLayer(IndexType is, IndexType ir) const override {
+    const IndexType nSC[16] = {64, 80, 64, 48, 80, 80, 0, 0, 80, 80, 0, 0, 80, 80, 0, 0};
+    return nSC[(is - 1) * 4 + ir - 1];
   }
 
   /**
@@ -99,15 +96,13 @@ class CSCIndexerPostls1 : public CSCIndexerBase
    * 'Online' ME11 for the upgrade is considered as split into 1a and 1b
    * chambers with 3 and 4 CFEBs respectively
    */
-  IndexType chipsPerOnlineLayer( IndexType is, IndexType ir ) const override
-  {
-    const IndexType nCinL[16] = { 4,5,4,3,  5,5,0,0,  5,5,0,0,  5,5,0,0 };
-    return nCinL[(is - 1)*4 + ir - 1];
+  IndexType chipsPerOnlineLayer(IndexType is, IndexType ir) const override {
+    const IndexType nCinL[16] = {4, 5, 4, 3, 5, 5, 0, 0, 5, 5, 0, 0, 5, 5, 0, 0};
+    return nCinL[(is - 1) * 4 + ir - 1];
   }
 
   //@}
 
-
   /// \name stripIndexMethods
   //@{
   /**
@@ -118,40 +113,41 @@ class CSCIndexerPostls1 : public CSCIndexerBase
    *
    * This depends on the ordering of the channels in the database.
    * In the currently implemented upgrade scenario, the ME1b still keeps the
-   * 80 indices wide ranges inherited from Startup (with the last 65-80 indices remaining unused),
-   * while the ME1/1A unganged channels get their own 48 indices wide ranges.
+   * 80 indices wide ranges inherited from Startup (with the last 65-80 indices
+   * remaining unused), while the ME1/1A unganged channels get their own 48
+   * indices wide ranges.
    */
-  IndexType stripChannelsPerLayer( IndexType is, IndexType ir ) const override
-  {
-    const IndexType nSCinC[16] = { 80,80,64,48,  80,80,0,0,  80,80,0,0,  80,80,0,0 };
-    return nSCinC[(is - 1)*4 + ir - 1];
+  IndexType stripChannelsPerLayer(IndexType is, IndexType ir) const override {
+    const IndexType nSCinC[16] = {80, 80, 64, 48, 80, 80, 0, 0, 80, 80, 0, 0, 80, 80, 0, 0};
+    return nSCinC[(is - 1) * 4 + ir - 1];
   }
 
   /**
-   * Linear index for 1st strip channel in ring 'ir' of station 'is' in endcap 'ie'.
+   * Linear index for 1st strip channel in ring 'ir' of station 'is' in endcap
+   * 'ie'.
    *
-   * Endcap label range 1-2, Station label range 1-4, Ring label range 1-4 (4=ME1a)
+   * Endcap label range 1-2, Station label range 1-4, Ring label range 1-4
+   * (4=ME1a)
    *
-   * WARNING: ME1a channels are  NOT  considered the last 16 of the 80 total in each layer of an ME11 chamber!
+   * WARNING: ME1a channels are  NOT  considered the last 16 of the 80 total in
+   * each layer of an ME11 chamber!
    */
-  LongIndexType stripChannelStart( IndexType ie, IndexType is, IndexType ir ) const override
-  {
-    // These are in the ranges 1-217728 (CSCs 2008), 217729-252288 (ME42), and 252289-273024 (unganged ME1a)
-    // There are 1-108884 channels per endcap (CSCs 2008), 17280 channels per endcap (ME42),
-    // and 10368 channels per endcap (unganged ME1a)
-    // Start of -z channels (CSCs 2008) is 108864 + 1    = 108865
-    // Start of +z (ME42) is 217728 + 1                  = 217729
-    // Start of -z (ME42) is 217728 + 1 + 17280          = 235009
-    // Start of +z (unganged ME1a) is 252288 + 1         = 252289
-    // Start of -z (unganged ME1a) is 252288 + 1 + 10368 = 262657
-    const LongIndexType nStart[32] =
-      {      1, 17281, 34561,252289,   48385, 57025,0,0,   74305, 82945,0,0,  100225,217729,0,0,
-        108865,126145,143425,262657,  157249,165889,0,0,  183169,191809,0,0,  209089,235009,0,0 };
-    return  nStart[(ie - 1)*16 + (is - 1)*4 + ir - 1];
+  LongIndexType stripChannelStart(IndexType ie, IndexType is, IndexType ir) const override {
+    // These are in the ranges 1-217728 (CSCs 2008), 217729-252288 (ME42), and
+    // 252289-273024 (unganged ME1a) There are 1-108884 channels per endcap
+    // (CSCs 2008), 17280 channels per endcap (ME42), and 10368 channels per
+    // endcap (unganged ME1a) Start of -z channels (CSCs 2008) is 108864 + 1 =
+    // 108865 Start of +z (ME42) is 217728 + 1                  = 217729 Start
+    // of -z (ME42) is 217728 + 1 + 17280          = 235009 Start of +z
+    // (unganged ME1a) is 252288 + 1         = 252289 Start of -z (unganged
+    // ME1a) is 252288 + 1 + 10368 = 262657
+    const LongIndexType nStart[32] = {1, 17281,  34561,  252289, 48385, 57025,  0,      0,      74305,  82945,  0,
+                                      0, 100225, 217729, 0,      0,     108865, 126145, 143425, 262657, 157249, 165889,
+                                      0, 0,      183169, 191809, 0,     0,      209089, 235009, 0,      0};
+    return nStart[(ie - 1) * 16 + (is - 1) * 4 + ir - 1];
   }
   //@}
 
-
   /// \name chipIndexMethods
   //@{
   /**
@@ -164,54 +160,56 @@ class CSCIndexerPostls1 : public CSCIndexerBase
    * Considers ME42 as standard 5 chip per layer chambers.
    *
    * WARNING:
-   * - ME1a channels are considered to be unganged and have their own 3 chips (ME1b has 4 chips).
-   * - ME1b keeps 5 chips for the indexing purposes, however indices for the chip #5 are ignored in the unganged case.
+   * - ME1a channels are considered to be unganged and have their own 3 chips
+   * (ME1b has 4 chips).
+   * - ME1b keeps 5 chips for the indexing purposes, however indices for the
+   * chip #5 are ignored in the unganged case.
    */
-  IndexType chipsPerLayer( IndexType is, IndexType ir ) const override
-  {
-    const IndexType nCinL[16] = { 5,5,4,3,  5,5,0,0,  5,5,0,0,  5,5,0,0 };
-    return nCinL[(is - 1)*4 + ir - 1];
+  IndexType chipsPerLayer(IndexType is, IndexType ir) const override {
+    const IndexType nCinL[16] = {5, 5, 4, 3, 5, 5, 0, 0, 5, 5, 0, 0, 5, 5, 0, 0};
+    return nCinL[(is - 1) * 4 + ir - 1];
   }
 
   /**
-   * Linear index for 1st Buckeye chip in offline ring 'ir' of station 'is' in endcap 'ie'.
+   * Linear index for 1st Buckeye chip in offline ring 'ir' of station 'is' in
+   * endcap 'ie'.
    *
-   * Endcap label range 1-2, Station label range 1-4, Ring label range 1-4 (4=ME1a)
-   * Works for ME1a input as is=1, ir=4
+   * Endcap label range 1-2, Station label range 1-4, Ring label range 1-4
+   * (4=ME1a) Works for ME1a input as is=1, ir=4
    *
-   * \warning: ME1a chips are the last 3 of the 7 chips total in each layer of an ME11 chamber,
+   * \warning: ME1a chips are the last 3 of the 7 chips total in each layer of
+   * an ME11 chamber,
    */
-  IndexType chipStart( IndexType ie, IndexType is, IndexType ir ) const override
-  {
-    // These are in the ranges 1-13608 (CSCs 2008) and 13609-15768 (ME42) and 15769-17064 (ME1a).
-    // There are 1-6804 chips per endcap (CSCs 2008) and 1080 chips per endcap (ME42) and 648 chips per endcap (ME1a).
-    // Start of -z channels (CSCs 2008) is 6804 + 1 = 6805
-    // Start of +z (ME42) is 13608 + 1 = 13609
-    // Start of -z (ME42) is 13608 + 1 + 1080 = 14689
-    // Start of +z (ME1a) is 15768 + 1 = 15769
-    // Start of -z (ME1a) is 15768 + 1 + 648 = 16417
-    const IndexType nStart[32] =
-      {1,   1081, 2161, 15769,   3025, 3565, 0,0,  4645, 5185, 0,0,  6265, 13609,0,0,
-       6805,7885, 8965, 16417,   9829, 10369,0,0,  11449,11989,0,0,  13069,14689,0,0 };
-    return  nStart[(ie - 1)*16 + (is - 1)*4 + ir - 1];
+  IndexType chipStart(IndexType ie, IndexType is, IndexType ir) const override {
+    // These are in the ranges 1-13608 (CSCs 2008) and 13609-15768 (ME42) and
+    // 15769-17064 (ME1a). There are 1-6804 chips per endcap (CSCs 2008) and
+    // 1080 chips per endcap (ME42) and 648 chips per endcap (ME1a). Start of -z
+    // channels (CSCs 2008) is 6804 + 1 = 6805 Start of +z (ME42) is 13608 + 1 =
+    // 13609 Start of -z (ME42) is 13608 + 1 + 1080 = 14689 Start of +z (ME1a)
+    // is 15768 + 1 = 15769 Start of -z (ME1a) is 15768 + 1 + 648 = 16417
+    const IndexType nStart[32] = {1,    1081, 2161, 15769, 3025, 3565,  0, 0, 4645,  5185,  0, 0, 6265,  13609, 0, 0,
+                                  6805, 7885, 8965, 16417, 9829, 10369, 0, 0, 11449, 11989, 0, 0, 13069, 14689, 0, 0};
+    return nStart[(ie - 1) * 16 + (is - 1) * 4 + ir - 1];
   }
   //@}
 
-
   /// \name gasGainIndexMethods
   //@{
   /**
-   * Linear index for 1st Gas gain sector in ring 'ir' of station 'is' in endcap 'ie'.
+   * Linear index for 1st Gas gain sector in ring 'ir' of station 'is' in endcap
+   * 'ie'.
    *
-   * Endcap label range 1-2, Station label range 1-4, Ring label range 1-4 (4=ME1a)
+   * Endcap label range 1-2, Station label range 1-4, Ring label range 1-4
+   * (4=ME1a)
    *
-   * \warning:  unganged ME1a has 3 own chips, which are currently appended to the end of the index range,
-   *            ME1b still keeps 5 chips with the chip #5 index being unused.
+   * \warning:  unganged ME1a has 3 own chips, which are currently appended to
+   * the end of the index range, ME1b still keeps 5 chips with the chip #5 index
+   * being unused.
    */
-  IndexType sectorStart( IndexType ie, IndexType is, IndexType ir ) const override
-  {
-    // There are 36 chambers * 6 layers * 5 CFEB's * 1 HV segment = 1080 gas-gain sectors in ME1/1 (non-upgraded)
-    // There are 36 chambers * 6 layers * 3 CFEB's * 1 HV segment = 648 gas-gain sectors in ME1/1a (upgraded)
+  IndexType sectorStart(IndexType ie, IndexType is, IndexType ir) const override {
+    // There are 36 chambers * 6 layers * 5 CFEB's * 1 HV segment = 1080
+    // gas-gain sectors in ME1/1 (non-upgraded) There are 36 chambers * 6 layers
+    // * 3 CFEB's * 1 HV segment = 648 gas-gain sectors in ME1/1a (upgraded)
     // There are 36*6*5*3 = 3240 gas-gain sectors in ME1/2
     // There are 36*6*4*3 = 2592 gas-gain sectors in ME1/3
     // There are 18*6*5*3 = 1620 gas-gain sectors in ME[2-4]/1
@@ -221,37 +219,36 @@ class CSCIndexerPostls1 : public CSCIndexerBase
     // Start of -z (ME42) is 45144 + 1 + 5400 = 50545
     // Start of +z (ME1a) is 45144 + 1 + 2*5400 = 55945
     // Start of -z (ME42) is 45144 + 1 + 2*5400 + 648 = 56593
-    const IndexType nStart[32] =
-      {1    , 1081 ,  4321, 55945,  //ME+1/1,ME+1/2,ME+1/3,ME+1/a
-       6913 , 8533 ,     0,     0,  //ME+2/1,ME+2/2
-       13933, 15553,     0,     0,  //ME+3/1,ME+3/2
-       20953, 45145,     0,     0,  //ME+4/1,ME+4/2 (note, ME+4/2 index follows ME-4/1...)
-       22573, 23653, 26893, 56593,  //ME-1/1,ME-1/2,ME-1/3,ME+1/a
-       29485, 31105,     0,     0,  //ME-2/1,ME-2/2
-       36505, 38125,     0,     0,  //ME-3/1,ME-3/2
-       43525, 50545,     0,     0 };//ME-4/1,ME-4/2 (note, ME-4/2 index follows ME+4/2...)
-    return  nStart[(ie-1)*16 + (is-1)*4 + ir - 1];
+    const IndexType nStart[32] = {1,     1081,  4321,  55945,  // ME+1/1,ME+1/2,ME+1/3,ME+1/a
+                                  6913,  8533,  0,     0,      // ME+2/1,ME+2/2
+                                  13933, 15553, 0,     0,      // ME+3/1,ME+3/2
+                                  20953, 45145, 0,     0,      // ME+4/1,ME+4/2 (note, ME+4/2 index follows ME-4/1...)
+                                  22573, 23653, 26893, 56593,  // ME-1/1,ME-1/2,ME-1/3,ME+1/a
+                                  29485, 31105, 0,     0,      // ME-2/1,ME-2/2
+                                  36505, 38125, 0,     0,      // ME-3/1,ME-3/2
+                                  43525, 50545, 0,     0};     // ME-4/1,ME-4/2 (note, ME-4/2 index follows ME+4/2...)
+    return nStart[(ie - 1) * 16 + (is - 1) * 4 + ir - 1];
   }
   //@}
 
   /**
    *  Decode CSCDetId from various indexes and labels
    */
-  std::pair<CSCDetId, IndexType> detIdFromStripChannelIndex( LongIndexType ichi ) const override;
-  std::pair<CSCDetId, IndexType> detIdFromChipIndex( IndexType ichi ) const override;
-  CSCIndexerBase::GasGainIndexType detIdFromGasGainIndex( IndexType igg ) const override;
+  std::pair<CSCDetId, IndexType> detIdFromStripChannelIndex(LongIndexType ichi) const override;
+  std::pair<CSCDetId, IndexType> detIdFromChipIndex(IndexType ichi) const override;
+  CSCIndexerBase::GasGainIndexType detIdFromGasGainIndex(IndexType igg) const override;
 
   /**
-   * Build index used internally in online CSC conditions databases (the 'Igor Index')
-   *
-   * This is the decimal integer ie*100000 + is*10000 + ir*1000 + ic*10 + il <br>
-   * (ie=1-2, is=1-4, ir=1-4, ic=1-36, il=1-6) <br>
-   * Channels 1-16 in ME1A (is=1, ir=4) are NOT reset to channels 65-80 of ME11.
-   * WARNING: This is now ADAPTED for unganged ME1a channels
-   *          (we expect that the online conditions DB will adopt it too).
+   * Build index used internally in online CSC conditions databases (the 'Igor
+   * Index')
+   *
+   * This is the decimal integer ie*100000 + is*10000 + ir*1000 + ic*10 + il
+   * <br> (ie=1-2, is=1-4, ir=1-4, ic=1-36, il=1-6) <br> Channels 1-16 in ME1A
+   * (is=1, ir=4) are NOT reset to channels 65-80 of ME11. WARNING: This is now
+   * ADAPTED for unganged ME1a channels (we expect that the online conditions DB
+   * will adopt it too).
    */
-  int dbIndex(const CSCDetId & id, int & channel) const override;
-
+  int dbIndex(const CSCDetId &id, int &channel) const override;
 };
 
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCIndexerStartup.h b/CalibMuon/CSCCalibration/interface/CSCIndexerStartup.h
index d03f952bcdff7..96da4c0c1c5f6 100644
--- a/CalibMuon/CSCCalibration/interface/CSCIndexerStartup.h
+++ b/CalibMuon/CSCCalibration/interface/CSCIndexerStartup.h
@@ -2,22 +2,25 @@
 #define CSCIndexerStartup_H
 
 /** \class CSCIndexerStartup
- * Concrete CSCIndexer class appropriate for CSC Conditions Data access for CMS startup (2008-2013)
- * in which most ME4/2 chambers do not exist and the 48 ME1/1A strips are ganged into 16 channels. <br>
- * The conditions data are stored in an order based on the hadrware channel order so this class
- * has to jump through hoops in order to map between that order and a CSCDetID order offline.
+ * Concrete CSCIndexer class appropriate for CSC Conditions Data access for CMS
+ * startup (2008-2013) in which most ME4/2 chambers do not exist and the 48
+ * ME1/1A strips are ganged into 16 channels. <br> The conditions data are
+ * stored in an order based on the hadrware channel order so this class has to
+ * jump through hoops in order to map between that order and a CSCDetID order
+ * offline.
  *
  * See documentation in base class CSCIndexerBase for more information.
  *
- * \warning This class is hard-wired for the CSC system at start-up of CMS in 2008.
- * with rings ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41 totalling 234 chambers per endcap.
- * But ME42 is appended (to permit simulation studies), so the chamber order is <br>
- * +z ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41, <br>
- * -z ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41, <br>
- * +z ME42, -z ME42 <br>
+ * \warning This class is hard-wired for the CSC system at start-up of CMS in
+ * 2008. with rings ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41 totalling 234
+ * chambers per endcap. But ME42 is appended (to permit simulation studies), so
+ * the chamber order is <br> +z ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41,
+ * <br> -z ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41, <br> +z ME42, -z ME42
+ * <br>
  *
  *  CSCIndexerBase::stripChannelIndex returns <br>
- *      1-217728 (CSCs 2008), 217729-252288 (ME42) (and ME1a channels are always channels 65-80 of 1-80 in ME11)
+ *      1-217728 (CSCs 2008), 217729-252288 (ME42) (and ME1a channels are always
+ * channels 65-80 of 1-80 in ME11)
  *
  *  CSCIndexerBase::chipIndex returns <br>
  *      1-13608 (CSCs 2008), 13609-15768 (ME42)
@@ -33,21 +36,18 @@
 #include <CalibMuon/CSCCalibration/interface/CSCIndexerBase.h>
 
 class CSCIndexerStartup : public CSCIndexerBase {
-
 public:
-
   ~CSCIndexerStartup() override;
 
-  std::string name() const override {return "CSCIndexerStartup";}
+  std::string name() const override { return "CSCIndexerStartup"; }
 
   /// \name maxIndexMethods
   //@{
   LongIndexType maxStripChannelIndex() const override { return 252288; }
-  IndexType maxChipIndex() const override             { return 15768; }
-  IndexType maxGasGainIndex() const override          { return 55944; }
+  IndexType maxChipIndex() const override { return 15768; }
+  IndexType maxGasGainIndex() const override { return 55944; }
   //@}
 
-
   /// \name nonIndexCountingMethods
   //@{
   /**
@@ -56,9 +56,8 @@ class CSCIndexerStartup : public CSCIndexerBase {
    * \warning: ME1a + ME1b are considered as single ME1/1
    * 'online' rings for the startup
    */
-  IndexType onlineRingsInStation( IndexType is ) const override
-  {
-    const IndexType nrings[5] = { 0, 3, 2, 2, 2 };
+  IndexType onlineRingsInStation(IndexType is) const override {
+    const IndexType nrings[5] = {0, 3, 2, 2, 2};
     return nrings[is];
   }
 
@@ -69,10 +68,9 @@ class CSCIndexerStartup : public CSCIndexerBase {
    *
    * Assume ME1a has 16 ganged readout channels.
    */
-  IndexType stripChannelsPerOfflineLayer( IndexType is, IndexType ir ) const override
-  {
-    const IndexType nSC[16] = { 64,80,64,16,  80,80,0,0,  80,80,0,0,  80,80,0,0 };
-    return nSC[(is-1)*4 + ir - 1];
+  IndexType stripChannelsPerOfflineLayer(IndexType is, IndexType ir) const override {
+    const IndexType nSC[16] = {64, 80, 64, 16, 80, 80, 0, 0, 80, 80, 0, 0, 80, 80, 0, 0};
+    return nSC[(is - 1) * 4 + ir - 1];
   }
 
   /**
@@ -80,12 +78,12 @@ class CSCIndexerStartup : public CSCIndexerBase {
    * with ring 'ir' and station 'is'.
    * Works for ME1a (ring 4 of ME1) too.
    *
-   * Assume ME1a has 16 ganged readout channels. Online chamber has 64+16=80 channels.
+   * Assume ME1a has 16 ganged readout channels. Online chamber has 64+16=80
+   * channels.
    */
-  IndexType stripChannelsPerOnlineLayer( IndexType is, IndexType ir ) const override
-  {
-    const IndexType nSC[16] = { 80,80,64,80,  80,80,0,0,  80,80,0,0,  80,80,0,0 };
-    return nSC[(is-1)*4 + ir - 1];
+  IndexType stripChannelsPerOnlineLayer(IndexType is, IndexType ir) const override {
+    const IndexType nSC[16] = {80, 80, 64, 80, 80, 80, 0, 0, 80, 80, 0, 0, 80, 80, 0, 0};
+    return nSC[(is - 1) * 4 + ir - 1];
   }
 
   /**
@@ -93,17 +91,16 @@ class CSCIndexerStartup : public CSCIndexerBase {
    * in ring 'ir' of station 'is'.
    * Works for ME1a (ring 4 of ME1) too.
    *
-   * 'Online' ME11 for the startup is considered as a single chamber with 5 chips
+   * 'Online' ME11 for the startup is considered as a single chamber with 5
+   * chips
    */
-  IndexType chipsPerOnlineLayer( IndexType is, IndexType ir ) const override
-  {
-    const IndexType nCinL[16] = { 5,5,4,5,  5,5,0,0,  5,5,0,0,  5,5,0,0 };
-    return nCinL[(is - 1)*4 + ir - 1];
+  IndexType chipsPerOnlineLayer(IndexType is, IndexType ir) const override {
+    const IndexType nCinL[16] = {5, 5, 4, 5, 5, 5, 0, 0, 5, 5, 0, 0, 5, 5, 0, 0};
+    return nCinL[(is - 1) * 4 + ir - 1];
   }
 
   //@}
 
-
   /// \name stripIndexMethods
   //@{
   /**
@@ -113,39 +110,39 @@ class CSCIndexerStartup : public CSCIndexerBase {
    * Station label range 1-4, Ring label range 1-4 (4=ME1a)
    *
    * This depends on the ordering of the channels in the database.
-   * In startup scenario there are 80 indices allocated per ME1/1 layer with 1-64 belonging to ME1b
-   * and 65-80 belonging to ME1a. So the ME1/a database indices are mapped to extend the ME1/b index ranges,
-   * which is how the raw hardware channels numbering is implemented.
+   * In startup scenario there are 80 indices allocated per ME1/1 layer with
+   * 1-64 belonging to ME1b and 65-80 belonging to ME1a. So the ME1/a database
+   * indices are mapped to extend the ME1/b index ranges, which is how the raw
+   * hardware channels numbering is implemented.
    */
-  IndexType stripChannelsPerLayer( IndexType is, IndexType ir ) const override
-  {
-    const IndexType nSCinC[16] = { 80,80,64,80,  80,80,0,0,  80,80,0,0,  80,80,0,0 };
-    return nSCinC[(is - 1)*4 + ir - 1];
+  IndexType stripChannelsPerLayer(IndexType is, IndexType ir) const override {
+    const IndexType nSCinC[16] = {80, 80, 64, 80, 80, 80, 0, 0, 80, 80, 0, 0, 80, 80, 0, 0};
+    return nSCinC[(is - 1) * 4 + ir - 1];
   }
 
   /**
-   * Linear index for 1st strip channel in ring 'ir' of station 'is' in endcap 'ie'.
+   * Linear index for 1st strip channel in ring 'ir' of station 'is' in endcap
+   * 'ie'.
    *
    * Endcap label range 1-2, Station label range 1-4, Ring label range 1-4.
    *
-   * WARNING: while ME1a channels are the last 16 of the 80 total in each layer of an ME11 chamber,
-   * their start index here defaults to the start index of ME1a.
+   * WARNING: while ME1a channels are the last 16 of the 80 total in each layer
+   * of an ME11 chamber, their start index here defaults to the start index of
+   * ME1a.
    */
-  LongIndexType stripChannelStart( IndexType ie, IndexType is, IndexType ir ) const override
-  {
+  LongIndexType stripChannelStart(IndexType ie, IndexType is, IndexType ir) const override {
     // These are in the ranges 1-217728 (CSCs 2008) and 217729-252288 (ME42).
-    // There are 1-108884 channels per endcap (CSCs 2008) and 17280 channels per endcap (ME42).
-    // Start of -z channels (CSCs 2008) is 108864 + 1 = 108865
+    // There are 1-108884 channels per endcap (CSCs 2008) and 17280 channels per
+    // endcap (ME42). Start of -z channels (CSCs 2008) is 108864 + 1 = 108865
     // Start of +z (ME42) is 217728 + 1 = 217729
     // Start of -z (ME42) is 217728 + 1 + 17280 = 235009
-    const LongIndexType nStart[32] =
-      {      1, 17281, 34561,     1,   48385, 57025,0,0,   74305, 82945,0,0,  100225,217729,0,0,
-        108865,126145,143425,108865,  157249,165889,0,0,  183169,191809,0,0,  209089,235009,0,0 };
-     return  nStart[(ie - 1)*16 + (is - 1)*4 + ir - 1];
+    const LongIndexType nStart[32] = {1, 17281,  34561,  1,      48385, 57025,  0,      0,      74305,  82945,  0,
+                                      0, 100225, 217729, 0,      0,     108865, 126145, 143425, 108865, 157249, 165889,
+                                      0, 0,      183169, 191809, 0,     0,      209089, 235009, 0,      0};
+    return nStart[(ie - 1) * 16 + (is - 1) * 4 + ir - 1];
   }
   //@}
 
-
   /// \name chipIndexMethods
   //@{
   /**
@@ -154,89 +151,96 @@ class CSCIndexerStartup : public CSCIndexerBase {
    *
    * Station label range 1-4, Ring label range 1-4 (4=ME1a)
    *
-   * \warning: the ME1a CFEB is just the last 1 of the 5 total in each layer of an ME11 chamber.
-   * So, the input of ir=4 is will just return the same 5 total chips per whole ME11.
+   * \warning: the ME1a CFEB is just the last 1 of the 5 total in each layer of
+   * an ME11 chamber. So, the input of ir=4 is will just return the same 5 total
+   * chips per whole ME11.
    *
    * Considers ME42 as standard 5 chip per layer chambers.
    */
-  IndexType chipsPerLayer( IndexType is, IndexType ir ) const override
-  {
-    const IndexType nCinL[16] = { 5,5,4,5,  5,5,0,0,  5,5,0,0,  5,5,0,0 };
-    return nCinL[(is - 1)*4 + ir - 1];
+  IndexType chipsPerLayer(IndexType is, IndexType ir) const override {
+    const IndexType nCinL[16] = {5, 5, 4, 5, 5, 5, 0, 0, 5, 5, 0, 0, 5, 5, 0, 0};
+    return nCinL[(is - 1) * 4 + ir - 1];
   }
 
   /**
-   * Linear index for 1st Buckeye chip in offline ring 'ir' of station 'is' in endcap 'ie'.
+   * Linear index for 1st Buckeye chip in offline ring 'ir' of station 'is' in
+   * endcap 'ie'.
    *
    * Endcap label range 1-2, Station label range 1-4, Ring label range 1-3.
    *
-   * \warning: while ME1a chip is the last 1 of the 5 chips total in each layer of an ME11 chamber,
-   * here the ME1a input ir=4 defaults to the ME1b start index (ir=4 <=> ir=1).
+   * \warning: while ME1a chip is the last 1 of the 5 chips total in each layer
+   * of an ME11 chamber, here the ME1a input ir=4 defaults to the ME1b start
+   * index (ir=4 <=> ir=1).
    */
-  IndexType chipStart( IndexType ie, IndexType is, IndexType ir ) const override
-  {
+  IndexType chipStart(IndexType ie, IndexType is, IndexType ir) const override {
     // These are in the ranges 1-13608 (CSCs 2008) and 13609-15768 (ME42).
-    // There are 1-6804 chips per endcap (CSCs 2008) and 1080 channels per endcap (ME42).
-    // Start of -z channels (CSCs 2008) is 6804 + 1 = 6805
-    // Start of +z (ME42) is 13608 + 1 = 13609
-    // Start of -z (ME42) is 13608 + 1 + 1080 = 14689
-    const IndexType nStart[32] =
-      {   1, 1081, 2161,    1,   3025, 3565, 0,0,   4645,  5185, 0,0,   6265, 13609,0,0,
-       6805, 7885, 8965, 6805,   9829, 10369,0,0,  11449, 11989, 0,0,  13069, 14689,0,0 };
-    return  nStart[(ie - 1)*16 + (is - 1)*4 + ir - 1];
+    // There are 1-6804 chips per endcap (CSCs 2008) and 1080 channels per
+    // endcap (ME42). Start of -z channels (CSCs 2008) is 6804 + 1 = 6805 Start
+    // of +z (ME42) is 13608 + 1 = 13609 Start of -z (ME42) is 13608 + 1 + 1080
+    // = 14689
+    const IndexType nStart[32] = {1,    1081, 2161, 1,    3025, 3565,  0, 0, 4645,  5185,  0, 0, 6265,  13609, 0, 0,
+                                  6805, 7885, 8965, 6805, 9829, 10369, 0, 0, 11449, 11989, 0, 0, 13069, 14689, 0, 0};
+    return nStart[(ie - 1) * 16 + (is - 1) * 4 + ir - 1];
   }
   //@}
 
-
   /// \name gasGainIndexMethods
   //@{
   /**
-   * Linear index for 1st Gas gain sector in ring 'ir' of station 'is' in endcap 'ie'.
+   * Linear index for 1st Gas gain sector in ring 'ir' of station 'is' in endcap
+   * 'ie'.
    *
-   * Endcap label range 1-2, Station label range 1-4, Ring label range 1-4 (4=ME1a)
+   * Endcap label range 1-2, Station label range 1-4, Ring label range 1-4
+   * (4=ME1a)
    *
-   * \warning: ME1a chip is the last 1 of the 5 chips total in each layer of an ME11 chamber,
-   *            and an input ir=4 in this case would give the same result as ir=1
+   * \warning: ME1a chip is the last 1 of the 5 chips total in each layer of an
+   * ME11 chamber, and an input ir=4 in this case would give the same result as
+   * ir=1
    */
-  IndexType sectorStart( IndexType ie, IndexType is, IndexType ir ) const override
-  {
-    // There are 36 chambers * 6 layers * 5 CFEB's * 1 HV segment = 1080 gas-gain sectors in ME1/1
-    // There are 36*6*5*3 = 3240 gas-gain sectors in ME1/2
-    // There are 36*6*4*3 = 2592 gas-gain sectors in ME1/3
-    // There are 18*6*5*3 = 1620 gas-gain sectors in ME[2-4]/1
-    // There are 36*6*5*5 = 5400 gas-gain sectors in ME[2-4]/2
-    // Start of -z channels (CSCs 2008) is 22572 + 1 = 22573
-    // Start of +z (ME42) is 45144 + 1 = 45145
-    // Start of -z (ME42) is 45144 + 1 + 5400 = 50545
-    const IndexType nStart[32] =
-      {1    ,1081 , 4321,  1, //ME+1/1,ME+1/2,ME+1/3,ME+1/4
-       6913 ,8533 ,    0,  0, //ME+2/1,ME+2/2,
-       13933,15553,    0,  0, //ME+3/1,ME+3/2,
-       20953,45145,    0,  0, //ME+4/1,ME+4/2,ME+4/3 (note, ME+4/2 index follows ME-4/1...)
-       22573,23653,26893,  22573, //ME-1/1,ME-1/2,ME-1/3, ME-1/4
-       29485,31105,    0,  0, //ME-2/1,ME-2/2,ME-2/3
-       36505,38125,    0,  0, //ME-3/1,ME-3/2,ME-3/3
-       43525,50545,    0,  0};//ME-4/1,ME-4/2,ME-4/3 (note, ME-4/2 index follows ME+4/2...)
-    return  nStart[(ie-1)*16 + (is-1)*4 + ir - 1];
+  IndexType sectorStart(IndexType ie, IndexType is, IndexType ir) const override {
+    // There are 36 chambers * 6 layers * 5 CFEB's * 1 HV segment = 1080
+    // gas-gain sectors in ME1/1 There are 36*6*5*3 = 3240 gas-gain sectors in
+    // ME1/2 There are 36*6*4*3 = 2592 gas-gain sectors in ME1/3 There are
+    // 18*6*5*3 = 1620 gas-gain sectors in ME[2-4]/1 There are 36*6*5*5 = 5400
+    // gas-gain sectors in ME[2-4]/2 Start of -z channels (CSCs 2008) is 22572 +
+    // 1 = 22573 Start of +z (ME42) is 45144 + 1 = 45145 Start of -z (ME42) is
+    // 45144 + 1 + 5400 = 50545
+    const IndexType nStart[32] = {1,     1081,  4321,
+                                  1,  // ME+1/1,ME+1/2,ME+1/3,ME+1/4
+                                  6913,  8533,  0,
+                                  0,  // ME+2/1,ME+2/2,
+                                  13933, 15553, 0,
+                                  0,  // ME+3/1,ME+3/2,
+                                  20953, 45145, 0,
+                                  0,  // ME+4/1,ME+4/2,ME+4/3 (note, ME+4/2 index follows ME-4/1...)
+                                  22573, 23653, 26893,
+                                  22573,  // ME-1/1,ME-1/2,ME-1/3, ME-1/4
+                                  29485, 31105, 0,
+                                  0,  // ME-2/1,ME-2/2,ME-2/3
+                                  36505, 38125, 0,
+                                  0,  // ME-3/1,ME-3/2,ME-3/3
+                                  43525, 50545, 0,
+                                  0};  // ME-4/1,ME-4/2,ME-4/3 (note, ME-4/2 index follows ME+4/2...)
+    return nStart[(ie - 1) * 16 + (is - 1) * 4 + ir - 1];
   }
   //@}
 
-
   /**
    *  Decode CSCDetId from various indexes and labels
    */
-  std::pair<CSCDetId, IndexType> detIdFromStripChannelIndex( LongIndexType ichi ) const override;
-  std::pair<CSCDetId, IndexType> detIdFromChipIndex( IndexType ichi ) const override;
-  GasGainIndexType detIdFromGasGainIndex( IndexType igg ) const override;
+  std::pair<CSCDetId, IndexType> detIdFromStripChannelIndex(LongIndexType ichi) const override;
+  std::pair<CSCDetId, IndexType> detIdFromChipIndex(IndexType ichi) const override;
+  GasGainIndexType detIdFromGasGainIndex(IndexType igg) const override;
 
   /**
-   * Build index used internally in online CSC conditions databases (the 'Igor Index')
+   * Build index used internally in online CSC conditions databases (the 'Igor
+   * Index')
    *
-   * This is the decimal integer ie*100000 + is*10000 + ir*1000 + ic*10 + il <br>
-   * (ie=1-2, is=1-4, ir=1-4, ic=1-36, il=1-6) <br>
-   * Channels 1-16 in ME1A (is=1, ir=4) are reset to channels 65-80 of ME11.
+   * This is the decimal integer ie*100000 + is*10000 + ir*1000 + ic*10 + il
+   * <br> (ie=1-2, is=1-4, ir=1-4, ic=1-36, il=1-6) <br> Channels 1-16 in ME1A
+   * (is=1, ir=4) are reset to channels 65-80 of ME11.
    */
-  int dbIndex(const CSCDetId & id, int & channel) const override;
+  int dbIndex(const CSCDetId &id, int &channel) const override;
 };
 
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCL1TPParametersConditions.h b/CalibMuon/CSCCalibration/interface/CSCL1TPParametersConditions.h
index 1c44221ff1cf9..780e7fcfa9a45 100644
--- a/CalibMuon/CSCCalibration/interface/CSCL1TPParametersConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCL1TPParametersConditions.h
@@ -1,57 +1,55 @@
 #ifndef _CSCL1TPPARAMETERSCONDITIONS_H
 #define _CSCL1TPPARAMETERSCONDITIONS_H
 
-#include <memory>
-#include <cmath>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <cmath>
+#include <memory>
 
-#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 #include "CondFormats/CSCObjects/interface/CSCL1TPParameters.h"
 #include "CondFormats/DataRecord/interface/CSCL1TPParametersRcd.h"
+#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCL1TPParametersConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
- public:
-  CSCL1TPParametersConditions(const edm::ParameterSet&);
+class CSCL1TPParametersConditions : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCL1TPParametersConditions(const edm::ParameterSet &);
   ~CSCL1TPParametersConditions() override;
-  
 
-  inline static CSCL1TPParameters *  prefillCSCL1TPParameters();
+  inline static CSCL1TPParameters *prefillCSCL1TPParameters();
 
   typedef std::unique_ptr<CSCL1TPParameters> ReturnType;
-  
-  ReturnType produceCSCL1TPParameters(const CSCL1TPParametersRcd&);
-  
- private:
-  // ----------member data ---------------------------
-  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
-  CSCL1TPParameters *CSCl1TPParameters ;
 
+  ReturnType produceCSCL1TPParameters(const CSCL1TPParametersRcd &);
+
+private:
+  // ----------member data ---------------------------
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
+  CSCL1TPParameters *CSCl1TPParameters;
 };
 
-#include<fstream>
-#include<vector>
-#include<iostream>
+#include <fstream>
+#include <iostream>
+#include <vector>
 
 // to workaround plugin library
-inline CSCL1TPParameters *  CSCL1TPParametersConditions::prefillCSCL1TPParameters()
-{
+inline CSCL1TPParameters *CSCL1TPParametersConditions::prefillCSCL1TPParameters() {
+  CSCL1TPParameters *cnl1tp = new CSCL1TPParameters();
 
-  CSCL1TPParameters * cnl1tp = new CSCL1TPParameters();
-    
   cnl1tp->setAlctFifoTbins(16);
   cnl1tp->setAlctFifoPretrig(10);
   cnl1tp->setAlctDriftDelay(2);
-  cnl1tp->setAlctNplanesHitPretrig(3);//was 2, new is 3
+  cnl1tp->setAlctNplanesHitPretrig(3);  // was 2, new is 3
   cnl1tp->setAlctNplanesHitPattern(4);
-  cnl1tp->setAlctNplanesHitAccelPretrig(3);//was 2, new is 3
+  cnl1tp->setAlctNplanesHitAccelPretrig(3);  // was 2, new is 3
   cnl1tp->setAlctNplanesHitAccelPattern(4);
   cnl1tp->setAlctTrigMode(2);
   cnl1tp->setAlctAccelMode(0);
@@ -59,15 +57,14 @@ inline CSCL1TPParameters *  CSCL1TPParametersConditions::prefillCSCL1TPParameter
 
   cnl1tp->setClctFifoTbins(12);
   cnl1tp->setClctFifoPretrig(7);
-  cnl1tp->setClctHitPersist(4);//was 6, new is 4
+  cnl1tp->setClctHitPersist(4);  // was 6, new is 4
   cnl1tp->setClctDriftDelay(2);
-  cnl1tp->setClctNplanesHitPretrig(3);//was 2, new is 3
+  cnl1tp->setClctNplanesHitPretrig(3);  // was 2, new is 3
   cnl1tp->setClctNplanesHitPattern(4);
   cnl1tp->setClctPidThreshPretrig(2);
   cnl1tp->setClctMinSeparation(10);
 
- return cnl1tp;
+  return cnl1tp;
 }
 
-
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCNoiseMatrixConditions.h b/CalibMuon/CSCCalibration/interface/CSCNoiseMatrixConditions.h
index bf190a52e73d5..9e30d3e931504 100644
--- a/CalibMuon/CSCCalibration/interface/CSCNoiseMatrixConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCNoiseMatrixConditions.h
@@ -1,38 +1,38 @@
 #ifndef _CSCNOISEMATRIXCONDITIONS_H
 #define _CSCNOISEMATRIXCONDITIONS_H
 
-#include <memory>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <memory>
 
-#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 #include "CondFormats/CSCObjects/interface/CSCNoiseMatrix.h"
 #include "CondFormats/DataRecord/interface/CSCNoiseMatrixRcd.h"
+#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCNoiseMatrixConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
- public:
-  CSCNoiseMatrixConditions(const edm::ParameterSet&);
+class CSCNoiseMatrixConditions : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCNoiseMatrixConditions(const edm::ParameterSet &);
   ~CSCNoiseMatrixConditions() override;
-  
-  static CSCNoiseMatrix * prefillNoiseMatrix();
-  
+
+  static CSCNoiseMatrix *prefillNoiseMatrix();
 
   typedef std::unique_ptr<CSCNoiseMatrix> ReturnType;
-  
-  ReturnType produceNoiseMatrix(const CSCNoiseMatrixRcd&);
-  
- private:
-  // ----------member data ---------------------------
-  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
-  CSCNoiseMatrix *cnMatrix ;
 
+  ReturnType produceNoiseMatrix(const CSCNoiseMatrixRcd &);
+
+private:
+  // ----------member data ---------------------------
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
+  CSCNoiseMatrix *cnMatrix;
 };
 
 #endif
diff --git a/CalibMuon/CSCCalibration/interface/CSCNoiseMatrixDBConditions.h b/CalibMuon/CSCCalibration/interface/CSCNoiseMatrixDBConditions.h
index 915c85d478090..8ee58d0606680 100644
--- a/CalibMuon/CSCCalibration/interface/CSCNoiseMatrixDBConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCNoiseMatrixDBConditions.h
@@ -1,55 +1,54 @@
 #ifndef _CSCNOISEMATRIXDBCONDITIONS_H
 #define _CSCNOISEMATRIXDBCONDITIONS_H
 
-#include <memory>
-#include <cmath>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <cmath>
+#include <memory>
 
-#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 #include "CondFormats/CSCObjects/interface/CSCDBNoiseMatrix.h"
 #include "CondFormats/DataRecord/interface/CSCDBNoiseMatrixRcd.h"
+#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCNoiseMatrixDBConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
- public:
-  CSCNoiseMatrixDBConditions(const edm::ParameterSet&);
+class CSCNoiseMatrixDBConditions : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCNoiseMatrixDBConditions(const edm::ParameterSet &);
   ~CSCNoiseMatrixDBConditions() override;
-  
-  inline static CSCDBNoiseMatrix * prefillDBNoiseMatrix();
+
+  inline static CSCDBNoiseMatrix *prefillDBNoiseMatrix();
 
   typedef std::unique_ptr<CSCDBNoiseMatrix> ReturnType;
-  
-  ReturnType produceDBNoiseMatrix(const CSCDBNoiseMatrixRcd&);
-  
- private:
-  // ----------member data ---------------------------
-  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
-  CSCDBNoiseMatrix *cndbMatrix ;
 
-};
+  ReturnType produceDBNoiseMatrix(const CSCDBNoiseMatrixRcd &);
 
+private:
+  // ----------member data ---------------------------
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
+  CSCDBNoiseMatrix *cndbMatrix;
+};
 
-#include<fstream>
-#include<vector>
-#include<iostream>
+#include <fstream>
+#include <iostream>
+#include <vector>
 
 // to workaround plugin library
-inline CSCDBNoiseMatrix *  CSCNoiseMatrixDBConditions::prefillDBNoiseMatrix()
-{
-  //const int MAX_SIZE = 273024; //for ME1a unganged
+inline CSCDBNoiseMatrix *CSCNoiseMatrixDBConditions::prefillDBNoiseMatrix() {
+  // const int MAX_SIZE = 273024; //for ME1a unganged
   const int MAX_SIZE = 252288;
-  const int FACTOR=1000;
-  const int MAX_SHORT= 32767;
- 
+  const int FACTOR = 1000;
+  const int MAX_SHORT = 32767;
+
   int new_index, db_index;
-  float db_elm33,db_elm34, db_elm44, db_elm35, db_elm45, db_elm55;
+  float db_elm33, db_elm34, db_elm44, db_elm35, db_elm45, db_elm55;
   float db_elm46, db_elm56, db_elm66, db_elm57, db_elm67, db_elm77;
   std::vector<int> db_index_id;
   std::vector<float> db_elem33;
@@ -65,9 +64,8 @@ inline CSCDBNoiseMatrix *  CSCNoiseMatrixDBConditions::prefillDBNoiseMatrix()
   std::vector<float> db_elem67;
   std::vector<float> db_elem77;
 
-
-  float new_elm33,new_elm34, new_elm44, new_elm35, new_elm45, new_elm55;
-  float  new_elm46, new_elm56, new_elm66, new_elm57, new_elm67, new_elm77;
+  float new_elm33, new_elm34, new_elm44, new_elm35, new_elm45, new_elm55;
+  float new_elm46, new_elm56, new_elm66, new_elm57, new_elm67, new_elm77;
   std::vector<int> new_cham_id;
   std::vector<int> new_index_id;
   std::vector<float> new_elem33;
@@ -83,21 +81,22 @@ inline CSCDBNoiseMatrix *  CSCNoiseMatrixDBConditions::prefillDBNoiseMatrix()
   std::vector<float> new_elem67;
   std::vector<float> new_elem77;
 
-  CSCDBNoiseMatrix * cndbmatrix = new CSCDBNoiseMatrix();
+  CSCDBNoiseMatrix *cndbmatrix = new CSCDBNoiseMatrix();
+
+  int counter;
+  int db_nrlines = 0;
+  int new_nrlines = 0;
 
- int counter;
-  int db_nrlines=0;
-  int new_nrlines=0;
-    
-  std::ifstream dbdata; 
-  dbdata.open("old_dbmatrix.dat",std::ios::in); 
-  if(!dbdata) {
-    std::cerr <<"Error: old_dbmatrix.dat -> no such file!"<< std::endl;
+  std::ifstream dbdata;
+  dbdata.open("old_dbmatrix.dat", std::ios::in);
+  if (!dbdata) {
+    std::cerr << "Error: old_dbmatrix.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!dbdata.eof() ) { 
-    dbdata >> db_index >> db_elm33 >> db_elm34 >> db_elm44 >> db_elm35 >> db_elm45 >> db_elm55 >> db_elm46 >> db_elm56 >> db_elm66 >> db_elm57 >> db_elm67 >> db_elm77 ; 
+
+  while (!dbdata.eof()) {
+    dbdata >> db_index >> db_elm33 >> db_elm34 >> db_elm44 >> db_elm35 >> db_elm45 >> db_elm55 >> db_elm46 >>
+        db_elm56 >> db_elm66 >> db_elm57 >> db_elm67 >> db_elm77;
     db_index_id.push_back(db_index);
     db_elem33.push_back(db_elm33);
     db_elem34.push_back(db_elm34);
@@ -116,15 +115,16 @@ inline CSCDBNoiseMatrix *  CSCNoiseMatrixDBConditions::prefillDBNoiseMatrix()
   dbdata.close();
 
   std::ifstream newdata;
-  newdata.open("matrix.dat",std::ios::in); 
-  if(!newdata) {
-    std::cerr <<"Error: matrix.dat -> no such file!"<< std::endl;
+  newdata.open("matrix.dat", std::ios::in);
+  if (!newdata) {
+    std::cerr << "Error: matrix.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!newdata.eof() ) { 
-    newdata >> new_index>> new_elm33 >> new_elm34 >> new_elm44 >> new_elm35 >> new_elm45 >> new_elm55 >> new_elm46 >> new_elm56 >> new_elm66 >> new_elm57 >> new_elm67 >> new_elm77 ; 
-    //new_cham_id.push_back(new_chamber_id);
+
+  while (!newdata.eof()) {
+    newdata >> new_index >> new_elm33 >> new_elm34 >> new_elm44 >> new_elm35 >> new_elm45 >> new_elm55 >> new_elm46 >>
+        new_elm56 >> new_elm66 >> new_elm57 >> new_elm67 >> new_elm77;
+    // new_cham_id.push_back(new_chamber_id);
     new_index_id.push_back(new_index);
     new_elem33.push_back(new_elm33);
     new_elem34.push_back(new_elm34);
@@ -137,84 +137,94 @@ inline CSCDBNoiseMatrix *  CSCNoiseMatrixDBConditions::prefillDBNoiseMatrix()
     new_elem57.push_back(new_elm57);
     new_elem66.push_back(new_elm66);
     new_elem67.push_back(new_elm67);
-    new_elem77.push_back(new_elm77); 
+    new_elem77.push_back(new_elm77);
     new_nrlines++;
   }
   newdata.close();
-  
-  CSCDBNoiseMatrix::NoiseMatrixContainer & itemvector = cndbmatrix->matrix;
+
+  CSCDBNoiseMatrix::NoiseMatrixContainer &itemvector = cndbmatrix->matrix;
   itemvector.resize(MAX_SIZE);
-  cndbmatrix->factor_noise= int (FACTOR);
-  
-  for(int i=0; i<MAX_SIZE;++i){
-    itemvector[i].elem33 = (short int) (db_elem33[i]*FACTOR+0.5);
-    itemvector[i].elem34 = (short int) (db_elem34[i]*FACTOR+0.5); 
-    itemvector[i].elem35 = (short int) (db_elem35[i]*FACTOR+0.5);
-    itemvector[i].elem44 = (short int) (db_elem44[i]*FACTOR+0.5);
-    itemvector[i].elem45 = (short int) (db_elem45[i]*FACTOR+0.5);
-    itemvector[i].elem46 = (short int) (db_elem46[i]*FACTOR+0.5);
-    itemvector[i].elem55 = (short int) (db_elem55[i]*FACTOR+0.5);
-    itemvector[i].elem56 = (short int) (db_elem56[i]*FACTOR+0.5);
-    itemvector[i].elem57 = (short int) (db_elem57[i]*FACTOR+0.5);
-    itemvector[i].elem66 = (short int) (db_elem66[i]*FACTOR+0.5);
-    itemvector[i].elem67 = (short int) (db_elem67[i]*FACTOR+0.5);
-    itemvector[i].elem77 = (short int) (db_elem77[i]*FACTOR+0.5);
+  cndbmatrix->factor_noise = int(FACTOR);
+
+  for (int i = 0; i < MAX_SIZE; ++i) {
+    itemvector[i].elem33 = (short int)(db_elem33[i] * FACTOR + 0.5);
+    itemvector[i].elem34 = (short int)(db_elem34[i] * FACTOR + 0.5);
+    itemvector[i].elem35 = (short int)(db_elem35[i] * FACTOR + 0.5);
+    itemvector[i].elem44 = (short int)(db_elem44[i] * FACTOR + 0.5);
+    itemvector[i].elem45 = (short int)(db_elem45[i] * FACTOR + 0.5);
+    itemvector[i].elem46 = (short int)(db_elem46[i] * FACTOR + 0.5);
+    itemvector[i].elem55 = (short int)(db_elem55[i] * FACTOR + 0.5);
+    itemvector[i].elem56 = (short int)(db_elem56[i] * FACTOR + 0.5);
+    itemvector[i].elem57 = (short int)(db_elem57[i] * FACTOR + 0.5);
+    itemvector[i].elem66 = (short int)(db_elem66[i] * FACTOR + 0.5);
+    itemvector[i].elem67 = (short int)(db_elem67[i] * FACTOR + 0.5);
+    itemvector[i].elem77 = (short int)(db_elem77[i] * FACTOR + 0.5);
   }
 
-  
-  for(int i=0; i<MAX_SIZE;++i){
-    counter=db_index_id[i];  
+  for (int i = 0; i < MAX_SIZE; ++i) {
+    counter = db_index_id[i];
     itemvector[i] = itemvector[counter];
-    itemvector[i].elem33 = int (db_elem33[i]);
-    itemvector[i].elem34 = int (db_elem34[i]);
-    itemvector[i].elem35 = int (db_elem35[i]);
-    itemvector[i].elem44 = int (db_elem44[i]);
-    itemvector[i].elem45 = int (db_elem45[i]);
-    itemvector[i].elem46 = int (db_elem46[i]);
-    itemvector[i].elem55 = int (db_elem55[i]);
-    itemvector[i].elem56 = int (db_elem56[i]);
-    itemvector[i].elem57 = int (db_elem57[i]);
-    itemvector[i].elem66 = int (db_elem66[i]);
-    itemvector[i].elem67 = int (db_elem67[i]);
-    itemvector[i].elem77 = int (db_elem77[i]);
-    
-    for (unsigned int k=0;k<new_index_id.size()-1;k++){
-      if(counter==new_index_id[k]){
-	if((short int) (fabs(new_elem33[k]*FACTOR+0.5))<MAX_SHORT) itemvector[counter].elem33 = int (new_elem33[k]*FACTOR+0.5);
-	if((short int) (fabs(new_elem34[k]*FACTOR+0.5))<MAX_SHORT) itemvector[counter].elem34 = int (new_elem34[k]*FACTOR+0.5); 
-	if((short int) (fabs(new_elem35[k]*FACTOR+0.5))<MAX_SHORT) itemvector[counter].elem35 = int (new_elem35[k]*FACTOR+0.5);
-	if((short int) (fabs(new_elem44[k]*FACTOR+0.5))<MAX_SHORT) itemvector[counter].elem44 = int (new_elem44[k]*FACTOR+0.5);
-	if((short int) (fabs(new_elem45[k]*FACTOR+0.5))<MAX_SHORT) itemvector[counter].elem45 = int (new_elem45[k]*FACTOR+0.5);
-	if((short int) (fabs(new_elem46[k]*FACTOR+0.5))<MAX_SHORT) itemvector[counter].elem46 = int (new_elem46[k]*FACTOR+0.5);
-	if((short int) (fabs(new_elem55[k]*FACTOR+0.5))<MAX_SHORT) itemvector[counter].elem55 = int (new_elem55[k]*FACTOR+0.5);
-	if((short int) (fabs(new_elem56[k]*FACTOR+0.5))<MAX_SHORT) itemvector[counter].elem56 = int (new_elem56[k]*FACTOR+0.5);
-	if((short int) (fabs(new_elem57[k]*FACTOR+0.5))<MAX_SHORT) itemvector[counter].elem57 = int (new_elem57[k]*FACTOR+0.5);
-	if((short int) (fabs(new_elem66[k]*FACTOR+0.5))<MAX_SHORT) itemvector[counter].elem66 = int (new_elem66[k]*FACTOR+0.5);
-	if((short int) (fabs(new_elem67[k]*FACTOR+0.5))<MAX_SHORT) itemvector[counter].elem67 = int (new_elem67[k]*FACTOR+0.5);
-	if((short int) (fabs(new_elem77[k]*FACTOR+0.5))<MAX_SHORT) itemvector[counter].elem77 = int (new_elem77[k]*FACTOR+0.5);
-	itemvector[i] = itemvector[counter];
-      }  
+    itemvector[i].elem33 = int(db_elem33[i]);
+    itemvector[i].elem34 = int(db_elem34[i]);
+    itemvector[i].elem35 = int(db_elem35[i]);
+    itemvector[i].elem44 = int(db_elem44[i]);
+    itemvector[i].elem45 = int(db_elem45[i]);
+    itemvector[i].elem46 = int(db_elem46[i]);
+    itemvector[i].elem55 = int(db_elem55[i]);
+    itemvector[i].elem56 = int(db_elem56[i]);
+    itemvector[i].elem57 = int(db_elem57[i]);
+    itemvector[i].elem66 = int(db_elem66[i]);
+    itemvector[i].elem67 = int(db_elem67[i]);
+    itemvector[i].elem77 = int(db_elem77[i]);
+
+    for (unsigned int k = 0; k < new_index_id.size() - 1; k++) {
+      if (counter == new_index_id[k]) {
+        if ((short int)(fabs(new_elem33[k] * FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].elem33 = int(new_elem33[k] * FACTOR + 0.5);
+        if ((short int)(fabs(new_elem34[k] * FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].elem34 = int(new_elem34[k] * FACTOR + 0.5);
+        if ((short int)(fabs(new_elem35[k] * FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].elem35 = int(new_elem35[k] * FACTOR + 0.5);
+        if ((short int)(fabs(new_elem44[k] * FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].elem44 = int(new_elem44[k] * FACTOR + 0.5);
+        if ((short int)(fabs(new_elem45[k] * FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].elem45 = int(new_elem45[k] * FACTOR + 0.5);
+        if ((short int)(fabs(new_elem46[k] * FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].elem46 = int(new_elem46[k] * FACTOR + 0.5);
+        if ((short int)(fabs(new_elem55[k] * FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].elem55 = int(new_elem55[k] * FACTOR + 0.5);
+        if ((short int)(fabs(new_elem56[k] * FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].elem56 = int(new_elem56[k] * FACTOR + 0.5);
+        if ((short int)(fabs(new_elem57[k] * FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].elem57 = int(new_elem57[k] * FACTOR + 0.5);
+        if ((short int)(fabs(new_elem66[k] * FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].elem66 = int(new_elem66[k] * FACTOR + 0.5);
+        if ((short int)(fabs(new_elem67[k] * FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].elem67 = int(new_elem67[k] * FACTOR + 0.5);
+        if ((short int)(fabs(new_elem77[k] * FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].elem77 = int(new_elem77[k] * FACTOR + 0.5);
+        itemvector[i] = itemvector[counter];
+      }
     }
 
-    if (counter>223968){
-      itemvector[counter].elem33 = int (db_elem33[i]);
-      itemvector[counter].elem34 = int (db_elem34[i]);
-      itemvector[counter].elem35 = int (db_elem35[i]);
-      itemvector[counter].elem44 = int (db_elem44[i]);
-      itemvector[counter].elem45 = int (db_elem45[i]);
-      itemvector[counter].elem46 = int (db_elem46[i]);
-      itemvector[counter].elem55 = int (db_elem55[i]);
-      itemvector[counter].elem56 = int (db_elem56[i]);
-      itemvector[counter].elem57 = int (db_elem57[i]);
-      itemvector[counter].elem66 = int (db_elem66[i]);
-      itemvector[counter].elem67 = int (db_elem67[i]);
-      itemvector[counter].elem77 = int (db_elem77[i]);
+    if (counter > 223968) {
+      itemvector[counter].elem33 = int(db_elem33[i]);
+      itemvector[counter].elem34 = int(db_elem34[i]);
+      itemvector[counter].elem35 = int(db_elem35[i]);
+      itemvector[counter].elem44 = int(db_elem44[i]);
+      itemvector[counter].elem45 = int(db_elem45[i]);
+      itemvector[counter].elem46 = int(db_elem46[i]);
+      itemvector[counter].elem55 = int(db_elem55[i]);
+      itemvector[counter].elem56 = int(db_elem56[i]);
+      itemvector[counter].elem57 = int(db_elem57[i]);
+      itemvector[counter].elem66 = int(db_elem66[i]);
+      itemvector[counter].elem67 = int(db_elem67[i]);
+      itemvector[counter].elem77 = int(db_elem77[i]);
       itemvector[i] = itemvector[counter];
     }
   }
-  
+
   return cndbmatrix;
 }
 
 #endif
-
diff --git a/CalibMuon/CSCCalibration/interface/CSCPedestalsDBConditions.h b/CalibMuon/CSCCalibration/interface/CSCPedestalsDBConditions.h
index 782472ce69de3..f80fc8390c8e5 100644
--- a/CalibMuon/CSCCalibration/interface/CSCPedestalsDBConditions.h
+++ b/CalibMuon/CSCCalibration/interface/CSCPedestalsDBConditions.h
@@ -1,57 +1,57 @@
 #ifndef _CSCPEDESTALSDBCONDITIONS_H
 #define _CSCPEDESTALSDBCONDITIONS_H
 
-#include <memory>
-#include <cmath>
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <cmath>
+#include <memory>
 
-#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 #include "CondFormats/CSCObjects/interface/CSCDBPedestals.h"
 #include "CondFormats/DataRecord/interface/CSCDBPedestalsRcd.h"
+#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-class CSCPedestalsDBConditions: public edm::ESProducer, public edm::EventSetupRecordIntervalFinder  {
- public:
-  CSCPedestalsDBConditions(const edm::ParameterSet&);
+class CSCPedestalsDBConditions : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  CSCPedestalsDBConditions(const edm::ParameterSet &);
   ~CSCPedestalsDBConditions() override;
-  
-  inline static CSCDBPedestals * prefillDBPedestals();
+
+  inline static CSCDBPedestals *prefillDBPedestals();
 
   typedef std::unique_ptr<CSCDBPedestals> ReturnType;
-  
-  ReturnType produceDBPedestals(const CSCDBPedestalsRcd&);
-  
- private:
-  // ----------member data ---------------------------
-  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&, edm::ValidityInterval & ) override;
-  CSCDBPedestals *cndbPedestals ;
 
+  ReturnType produceDBPedestals(const CSCDBPedestalsRcd &);
+
+private:
+  // ----------member data ---------------------------
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
+  CSCDBPedestals *cndbPedestals;
 };
 
-#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 #include "CondFormats/CSCObjects/interface/CSCDBPedestals.h"
 #include "CondFormats/DataRecord/interface/CSCDBPedestalsRcd.h"
+#include <DataFormats/MuonDetId/interface/CSCDetId.h>
 
-#include<fstream>
-#include<vector>
-#include<iostream>
+#include <fstream>
+#include <iostream>
+#include <vector>
 
 // to workaround plugin library
-inline CSCDBPedestals * CSCPedestalsDBConditions::prefillDBPedestals()  
-{
-  const int PED_FACTOR=10;
-  const int RMS_FACTOR=1000;
+inline CSCDBPedestals *CSCPedestalsDBConditions::prefillDBPedestals() {
+  const int PED_FACTOR = 10;
+  const int RMS_FACTOR = 1000;
   const int MAX_SIZE = 252288;
-  //const int MAX_SIZE = 273024; //for extra ME1a unganged case
-  const int MAX_SHORT= 32767;
-  CSCDBPedestals * cndbpedestals = new CSCDBPedestals();
+  // const int MAX_SIZE = 273024; //for extra ME1a unganged case
+  const int MAX_SHORT = 32767;
+  CSCDBPedestals *cndbpedestals = new CSCDBPedestals();
 
   int db_index;
   float db_ped, db_rms;
@@ -59,24 +59,24 @@ inline CSCDBPedestals * CSCPedestalsDBConditions::prefillDBPedestals()
   std::vector<float> db_peds;
   std::vector<float> db_pedrms;
   int new_index;
-  float new_ped,new_rms;
+  float new_ped, new_rms;
   std::vector<int> new_index_id;
   std::vector<float> new_peds;
   std::vector<float> new_pedrms;
 
   int counter;
-  int db_nrlines=0;
-  int new_nrlines=0;
-  
-  std::ifstream dbdata; 
-  dbdata.open("old_dbpeds.dat",std::ios::in); 
-  if(!dbdata) {
-    std::cerr <<"Error: old_dbpeds.dat -> no such file!"<< std::endl;
+  int db_nrlines = 0;
+  int new_nrlines = 0;
+
+  std::ifstream dbdata;
+  dbdata.open("old_dbpeds.dat", std::ios::in);
+  if (!dbdata) {
+    std::cerr << "Error: old_dbpeds.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!dbdata.eof() ) { 
-    dbdata >> db_index >> db_ped >> db_rms ; 
+
+  while (!dbdata.eof()) {
+    dbdata >> db_index >> db_ped >> db_rms;
     db_index_id.push_back(db_index);
     db_peds.push_back(db_ped);
     db_pedrms.push_back(db_rms);
@@ -85,55 +85,56 @@ inline CSCDBPedestals * CSCPedestalsDBConditions::prefillDBPedestals()
   dbdata.close();
 
   std::ifstream newdata;
-  newdata.open("peds.dat",std::ios::in); 
-  if(!newdata) {
-    std::cerr <<"Error: peds.dat -> no such file!"<< std::endl;
+  newdata.open("peds.dat", std::ios::in);
+  if (!newdata) {
+    std::cerr << "Error: peds.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!newdata.eof() ) { 
-    newdata >> new_index >> new_ped >> new_rms ; 
+
+  while (!newdata.eof()) {
+    newdata >> new_index >> new_ped >> new_rms;
     new_index_id.push_back(new_index);
     new_peds.push_back(new_ped);
     new_pedrms.push_back(new_rms);
     new_nrlines++;
   }
   newdata.close();
-  
-  CSCDBPedestals::PedestalContainer & itemvector = cndbpedestals->pedestals;
+
+  CSCDBPedestals::PedestalContainer &itemvector = cndbpedestals->pedestals;
   itemvector.resize(MAX_SIZE);
-  cndbpedestals->factor_ped= int (PED_FACTOR);
-  cndbpedestals->factor_rms= int (RMS_FACTOR);
+  cndbpedestals->factor_ped = int(PED_FACTOR);
+  cndbpedestals->factor_rms = int(RMS_FACTOR);
 
-  for(int i=0; i<MAX_SIZE;++i){
-    itemvector[i].ped= (short int) (db_peds[i]*PED_FACTOR+0.5);
-    itemvector[i].rms= (short int) (db_pedrms[i]*RMS_FACTOR+0.5);
+  for (int i = 0; i < MAX_SIZE; ++i) {
+    itemvector[i].ped = (short int)(db_peds[i] * PED_FACTOR + 0.5);
+    itemvector[i].rms = (short int)(db_pedrms[i] * RMS_FACTOR + 0.5);
   }
 
-  for(int i=0; i<MAX_SIZE;++i){
-     counter=db_index_id[i];  
-     itemvector[i] = itemvector[counter];
-     itemvector[i].ped = int (db_peds[i]);
-     itemvector[i].rms = int (db_pedrms[i]);
-
-     for (unsigned int k=0;k<new_index_id.size()-1;k++){
-       if(counter==new_index_id[k]){
-	 if((short int) (fabs(new_peds[k]*PED_FACTOR+0.5))<MAX_SHORT)   itemvector[counter].ped= int (new_peds[k]*PED_FACTOR+0.5);
-	 if((short int) (fabs(new_pedrms[k]*RMS_FACTOR+0.5))<MAX_SHORT) itemvector[counter].rms= int (new_pedrms[k]*RMS_FACTOR+0.5);
-	 itemvector[i] = itemvector[counter];
-	 //if (new_peds[k]==0) itemvector[counter].ped = int (db_peds[i]);
-	 //if (new_pedrms[k]==0) itemvector[counter].rms = int (db_pedrms[i]);
-       }  
-     }
-     
-     if (counter>223968){
-       itemvector[counter].ped = int (db_peds[i]);
-       itemvector[counter].rms = int (db_pedrms[i]);
-       itemvector[i] = itemvector[counter];
-     }
-     
-   }
-   return cndbpedestals;
+  for (int i = 0; i < MAX_SIZE; ++i) {
+    counter = db_index_id[i];
+    itemvector[i] = itemvector[counter];
+    itemvector[i].ped = int(db_peds[i]);
+    itemvector[i].rms = int(db_pedrms[i]);
+
+    for (unsigned int k = 0; k < new_index_id.size() - 1; k++) {
+      if (counter == new_index_id[k]) {
+        if ((short int)(fabs(new_peds[k] * PED_FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].ped = int(new_peds[k] * PED_FACTOR + 0.5);
+        if ((short int)(fabs(new_pedrms[k] * RMS_FACTOR + 0.5)) < MAX_SHORT)
+          itemvector[counter].rms = int(new_pedrms[k] * RMS_FACTOR + 0.5);
+        itemvector[i] = itemvector[counter];
+        // if (new_peds[k]==0) itemvector[counter].ped = int (db_peds[i]);
+        // if (new_pedrms[k]==0) itemvector[counter].rms = int (db_pedrms[i]);
+      }
+    }
+
+    if (counter > 223968) {
+      itemvector[counter].ped = int(db_peds[i]);
+      itemvector[counter].rms = int(db_pedrms[i]);
+      itemvector[i] = itemvector[counter];
+    }
+  }
+  return cndbpedestals;
 }
 
 #endif
diff --git a/CalibMuon/CSCCalibration/plugins/CSCBadChambersConditions.cc b/CalibMuon/CSCCalibration/plugins/CSCBadChambersConditions.cc
index c0a0007d765db..ddf8953f541d0 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCBadChambersConditions.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCBadChambersConditions.cc
@@ -1,44 +1,35 @@
-#include <memory>
 #include <fstream>
+#include <memory>
 
+#include "CalibMuon/CSCCalibration/interface/CSCBadChambersConditions.h"
 #include "CondFormats/CSCObjects/interface/CSCBadChambers.h"
 #include "CondFormats/DataRecord/interface/CSCBadChambersRcd.h"
-#include "CalibMuon/CSCCalibration/interface/CSCBadChambersConditions.h"
 
-
-CSCBadChambersConditions::CSCBadChambersConditions(const edm::ParameterSet& iConfig)
-{
-  //the following line is needed to tell the framework what
+CSCBadChambersConditions::CSCBadChambersConditions(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
-  setWhatProduced(this,&CSCBadChambersConditions::produceBadChambers);
+  setWhatProduced(this, &CSCBadChambersConditions::produceBadChambers);
   findingRecord<CSCBadChambersRcd>();
-  //now do what ever other initialization is needed
+  // now do what ever other initialization is needed
 }
 
-
-CSCBadChambersConditions::~CSCBadChambersConditions()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+CSCBadChambersConditions::~CSCBadChambersConditions() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CSCBadChambersConditions::ReturnType
-CSCBadChambersConditions::produceBadChambers(const CSCBadChambersRcd& iRecord)
-{
-  //need a new object so to not be deleted at exit
-  return CSCBadChambersConditions::ReturnType( prefillBadChambers());
+CSCBadChambersConditions::ReturnType CSCBadChambersConditions::produceBadChambers(const CSCBadChambersRcd &iRecord) {
+  // need a new object so to not be deleted at exit
+  return CSCBadChambersConditions::ReturnType(prefillBadChambers());
 }
 
- void CSCBadChambersConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
- oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- 
- }
+void CSCBadChambersConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                              const edm::IOVSyncValue &,
+                                              edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibMuon/CSCCalibration/plugins/CSCBadStripsConditions.cc b/CalibMuon/CSCCalibration/plugins/CSCBadStripsConditions.cc
index e8b2343f351ad..0b6191a7e3d5c 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCBadStripsConditions.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCBadStripsConditions.cc
@@ -1,44 +1,35 @@
-#include <memory>
 #include <fstream>
+#include <memory>
 
+#include "CalibMuon/CSCCalibration/interface/CSCBadStripsConditions.h"
 #include "CondFormats/CSCObjects/interface/CSCBadStrips.h"
 #include "CondFormats/DataRecord/interface/CSCBadStripsRcd.h"
-#include "CalibMuon/CSCCalibration/interface/CSCBadStripsConditions.h"
 
-
-CSCBadStripsConditions::CSCBadStripsConditions(const edm::ParameterSet& iConfig)
-{
-  //the following line is needed to tell the framework what
+CSCBadStripsConditions::CSCBadStripsConditions(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
-  setWhatProduced(this,&CSCBadStripsConditions::produceBadStrips);
+  setWhatProduced(this, &CSCBadStripsConditions::produceBadStrips);
   findingRecord<CSCBadStripsRcd>();
-  //now do what ever other initialization is needed
+  // now do what ever other initialization is needed
 }
 
-
-CSCBadStripsConditions::~CSCBadStripsConditions()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+CSCBadStripsConditions::~CSCBadStripsConditions() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CSCBadStripsConditions::ReturnType
-CSCBadStripsConditions::produceBadStrips(const CSCBadStripsRcd& iRecord)
-{
-  //need a new object so to not be deleted at exit
-  return  CSCBadStripsConditions::ReturnType( prefillBadStrips());
+CSCBadStripsConditions::ReturnType CSCBadStripsConditions::produceBadStrips(const CSCBadStripsRcd &iRecord) {
+  // need a new object so to not be deleted at exit
+  return CSCBadStripsConditions::ReturnType(prefillBadStrips());
 }
 
- void CSCBadStripsConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
- oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- 
- }
+void CSCBadStripsConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                            const edm::IOVSyncValue &,
+                                            edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibMuon/CSCCalibration/plugins/CSCBadWiresConditions.cc b/CalibMuon/CSCCalibration/plugins/CSCBadWiresConditions.cc
index b7a92457e9ffd..70de8edf29ff3 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCBadWiresConditions.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCBadWiresConditions.cc
@@ -1,45 +1,35 @@
-#include <memory>
 #include <fstream>
+#include <memory>
 
+#include "CalibMuon/CSCCalibration/interface/CSCBadWiresConditions.h"
 #include "CondFormats/CSCObjects/interface/CSCBadWires.h"
 #include "CondFormats/DataRecord/interface/CSCBadWiresRcd.h"
-#include "CalibMuon/CSCCalibration/interface/CSCBadWiresConditions.h"
 
-
-CSCBadWiresConditions::CSCBadWiresConditions(const edm::ParameterSet& iConfig)
-{
-  //the following line is needed to tell the framework what
+CSCBadWiresConditions::CSCBadWiresConditions(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
-  setWhatProduced(this,&CSCBadWiresConditions::produceBadWires);
+  setWhatProduced(this, &CSCBadWiresConditions::produceBadWires);
   findingRecord<CSCBadWiresRcd>();
-  //now do what ever other initialization is needed
+  // now do what ever other initialization is needed
 }
 
-
-CSCBadWiresConditions::~CSCBadWiresConditions()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+CSCBadWiresConditions::~CSCBadWiresConditions() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CSCBadWiresConditions::ReturnType
-CSCBadWiresConditions::produceBadWires(const CSCBadWiresRcd& iRecord)
-{
-  //need a new object so to not be deleted at exit
-  return CSCBadWiresConditions::ReturnType( prefillBadWires());
-  
+CSCBadWiresConditions::ReturnType CSCBadWiresConditions::produceBadWires(const CSCBadWiresRcd &iRecord) {
+  // need a new object so to not be deleted at exit
+  return CSCBadWiresConditions::ReturnType(prefillBadWires());
 }
 
- void CSCBadWiresConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
- oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- 
- }
+void CSCBadWiresConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                           const edm::IOVSyncValue &,
+                                           edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibMuon/CSCCalibration/plugins/CSCChannelMapperESProducer.cc b/CalibMuon/CSCCalibration/plugins/CSCChannelMapperESProducer.cc
index f2b02ea1e9b99..f306b1f5c4636 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCChannelMapperESProducer.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCChannelMapperESProducer.cc
@@ -5,25 +5,20 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-CSCChannelMapperESProducer::CSCChannelMapperESProducer(const edm::ParameterSet& pset)
-{
+CSCChannelMapperESProducer::CSCChannelMapperESProducer(const edm::ParameterSet &pset) {
   algoName = pset.getParameter<std::string>("AlgoName");
 
   LogTrace("CSCChannelMapperESProducer") << " will produce: " << algoName;
 
   setWhatProduced(this);
-
 }
 
-CSCChannelMapperESProducer::~CSCChannelMapperESProducer(){
-}
+CSCChannelMapperESProducer::~CSCChannelMapperESProducer() {}
 
-CSCChannelMapperESProducer::BSP_TYPE CSCChannelMapperESProducer::produce(const CSCChannelMapperRecord& )
-{
+CSCChannelMapperESProducer::BSP_TYPE CSCChannelMapperESProducer::produce(const CSCChannelMapperRecord &) {
   LogTrace("CSCChannelMapperESProducer") << " producing: " << algoName;
 
   return CSCChannelMapperESProducer::BSP_TYPE(CSCChannelMapperFactory::get()->create(algoName));
-
 }
 
 // define this as a plug-in
diff --git a/CalibMuon/CSCCalibration/plugins/CSCChipSpeedCorrectionDBConditions.cc b/CalibMuon/CSCCalibration/plugins/CSCChipSpeedCorrectionDBConditions.cc
index 8fa3fde1d17cf..7cb2db4966dda 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCChipSpeedCorrectionDBConditions.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCChipSpeedCorrectionDBConditions.cc
@@ -1,50 +1,41 @@
-#include <memory>
 #include <fstream>
+#include <memory>
 
+#include "CalibMuon/CSCCalibration/interface/CSCChipSpeedCorrectionDBConditions.h"
 #include "CondFormats/CSCObjects/interface/CSCDBChipSpeedCorrection.h"
 #include "CondFormats/DataRecord/interface/CSCDBChipSpeedCorrectionRcd.h"
-#include "CalibMuon/CSCCalibration/interface/CSCChipSpeedCorrectionDBConditions.h"
 
-
-CSCChipSpeedCorrectionDBConditions::CSCChipSpeedCorrectionDBConditions(const edm::ParameterSet& iConfig)
-{
-  //the following line is needed to tell the framework what
+CSCChipSpeedCorrectionDBConditions::CSCChipSpeedCorrectionDBConditions(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
-  isForMC = iConfig.getUntrackedParameter<bool>("isForMC",true);
-  dataCorrFileName= iConfig.getUntrackedParameter<std::string>("dataCorrFileName","empty.txt");
-  dataOffset=170.;
+  isForMC = iConfig.getUntrackedParameter<bool>("isForMC", true);
+  dataCorrFileName = iConfig.getUntrackedParameter<std::string>("dataCorrFileName", "empty.txt");
+  dataOffset = 170.;
   // added by Zhen (changed since 1_2_0)
-  setWhatProduced(this,&CSCChipSpeedCorrectionDBConditions::produceDBChipSpeedCorrection);
+  setWhatProduced(this, &CSCChipSpeedCorrectionDBConditions::produceDBChipSpeedCorrection);
   findingRecord<CSCDBChipSpeedCorrectionRcd>();
-  //now do what ever other initialization is needed
-
+  // now do what ever other initialization is needed
 }
 
-
-CSCChipSpeedCorrectionDBConditions::~CSCChipSpeedCorrectionDBConditions()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+CSCChipSpeedCorrectionDBConditions::~CSCChipSpeedCorrectionDBConditions() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CSCChipSpeedCorrectionDBConditions::ReturnType
-CSCChipSpeedCorrectionDBConditions::produceDBChipSpeedCorrection(const CSCDBChipSpeedCorrectionRcd& iRecord)
-{
-  //need a new object so to not be deleted at exit
-  return CSCChipSpeedCorrectionDBConditions::ReturnType( prefillDBChipSpeedCorrection(isForMC,dataCorrFileName,dataOffset) );
-  
+CSCChipSpeedCorrectionDBConditions::ReturnType CSCChipSpeedCorrectionDBConditions::produceDBChipSpeedCorrection(
+    const CSCDBChipSpeedCorrectionRcd &iRecord) {
+  // need a new object so to not be deleted at exit
+  return CSCChipSpeedCorrectionDBConditions::ReturnType(
+      prefillDBChipSpeedCorrection(isForMC, dataCorrFileName, dataOffset));
 }
 
-void CSCChipSpeedCorrectionDBConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
-							edm::ValidityInterval & oValidity)
-{
-  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
-  
+void CSCChipSpeedCorrectionDBConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                                        const edm::IOVSyncValue &,
+                                                        edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
 }
diff --git a/CalibMuon/CSCCalibration/plugins/CSCCrosstalkConditions.cc b/CalibMuon/CSCCalibration/plugins/CSCCrosstalkConditions.cc
index 9b91b97392853..9b1ab405dcef1 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCCrosstalkConditions.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCCrosstalkConditions.cc
@@ -3,13 +3,12 @@
 
 #include "CalibMuon/CSCCalibration/interface/CSCCrosstalkConditions.h"
 
-CSCcrosstalk * CSCCrosstalkConditions::prefillCrosstalk() {
-
-  float mean,min,minchi;
+CSCcrosstalk *CSCCrosstalkConditions::prefillCrosstalk() {
+  float mean, min, minchi;
   int seed;
-  int old_chamber_id,old_strip,new_chamber_id,new_strip;
-  float old_slope_right,old_slope_left,old_intercept_right;
-  float old_intercept_left, old_chi2_right,old_chi2_left;
+  int old_chamber_id, old_strip, new_chamber_id, new_strip;
+  float old_slope_right, old_slope_left, old_intercept_right;
+  float old_intercept_left, old_chi2_right, old_chi2_left;
   std::vector<int> old_cham_id;
   std::vector<int> old_strips;
   std::vector<float> old_slope_r;
@@ -18,8 +17,8 @@ CSCcrosstalk * CSCCrosstalkConditions::prefillCrosstalk() {
   std::vector<float> old_slope_l;
   std::vector<float> old_intercept_l;
   std::vector<float> old_chi2_l;
-  float new_slope_right,new_slope_left,new_intercept_right;
-  float new_intercept_left, new_chi2_right,new_chi2_left;
+  float new_slope_right, new_slope_left, new_intercept_right;
+  float new_intercept_left, new_chi2_right, new_chi2_left;
   std::vector<int> new_cham_id;
   std::vector<int> new_strips;
   std::vector<float> new_slope_r;
@@ -28,29 +27,28 @@ CSCcrosstalk * CSCCrosstalkConditions::prefillCrosstalk() {
   std::vector<float> new_slope_l;
   std::vector<float> new_intercept_l;
   std::vector<float> new_chi2_l;
-  
 
+  const CSCDetId &detId = CSCDetId();
+  CSCcrosstalk *cncrosstalk = new CSCcrosstalk();
 
-  const CSCDetId& detId = CSCDetId();
-  CSCcrosstalk * cncrosstalk = new CSCcrosstalk();
-  
-  int max_istrip,id_layer,max_ring,max_cham;
-  unsigned int old_nrlines=0;
-  unsigned int new_nrlines=0;
-  seed = 10000;	
+  int max_istrip, id_layer, max_ring, max_cham;
+  unsigned int old_nrlines = 0;
+  unsigned int new_nrlines = 0;
+  seed = 10000;
   srand(seed);
-  mean=-0.0009, min=0.035, minchi=1.5;
- 
-  //endcap=1 to 2,station=1 to 4, ring=1 to 4,chamber=1 to 36,layer=1 to 6 
-  std::ifstream olddata; 
-  olddata.open("old_xtalk.dat",std::ios::in); 
-  if(!olddata) {
-    std::cerr <<"Error: old_xtalk.dat -> no such file!"<< std::endl;
+  mean = -0.0009, min = 0.035, minchi = 1.5;
+
+  // endcap=1 to 2,station=1 to 4, ring=1 to 4,chamber=1 to 36,layer=1 to 6
+  std::ifstream olddata;
+  olddata.open("old_xtalk.dat", std::ios::in);
+  if (!olddata) {
+    std::cerr << "Error: old_xtalk.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!olddata.eof() ) { 
-    olddata >> old_chamber_id >> old_strip >> old_slope_right >> old_intercept_right >> old_chi2_right >> old_slope_left >> old_intercept_left >> old_chi2_left ; 
+
+  while (!olddata.eof()) {
+    olddata >> old_chamber_id >> old_strip >> old_slope_right >> old_intercept_right >> old_chi2_right >>
+        old_slope_left >> old_intercept_left >> old_chi2_left;
     old_cham_id.push_back(old_chamber_id);
     old_strips.push_back(old_strip);
     old_slope_r.push_back(old_slope_right);
@@ -64,14 +62,15 @@ CSCcrosstalk * CSCCrosstalkConditions::prefillCrosstalk() {
   olddata.close();
 
   std::ifstream newdata;
-  newdata.open("new_xtalk.txt",std::ios::in); 
-  if(!newdata) {
-    std::cerr <<"Error: new_xtalk.dat -> no such file!"<< std::endl;
+  newdata.open("new_xtalk.txt", std::ios::in);
+  if (!newdata) {
+    std::cerr << "Error: new_xtalk.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!newdata.eof() ) { 
-    newdata >> new_chamber_id >> new_strip >> new_slope_right >> new_intercept_right >> new_chi2_right >> new_slope_left >> new_intercept_left >> new_chi2_left ; 
+
+  while (!newdata.eof()) {
+    newdata >> new_chamber_id >> new_strip >> new_slope_right >> new_intercept_right >> new_chi2_right >>
+        new_slope_left >> new_intercept_left >> new_chi2_left;
     new_cham_id.push_back(new_chamber_id);
     new_strips.push_back(new_strip);
     new_slope_r.push_back(new_slope_right);
@@ -84,209 +83,222 @@ CSCcrosstalk * CSCCrosstalkConditions::prefillCrosstalk() {
   }
   newdata.close();
 
-  for(int iendcap=detId.minEndcapId(); iendcap<=detId.maxEndcapId(); iendcap++){
-    for(int istation=detId.minStationId() ; istation<=detId.maxStationId(); istation++){
-      max_ring=detId.maxRingId();
-      //station 4 ring 4 not there(36 chambers*2 missing)
-      //3 rings max this way of counting (ME1a & b)
-      if(istation==1)    max_ring=3;
-      if(istation==2)    max_ring=2;
-      if(istation==3)    max_ring=2;
-      if(istation==4)    max_ring=1;
-      
-      for(int iring=detId.minRingId(); iring<=max_ring; iring++){
-	max_istrip=80;
-	max_cham=detId.maxChamberId();
-	if(istation==1 && iring==1)    max_cham=36;
-	if(istation==1 && iring==2)    max_cham=36;
-	if(istation==1 && iring==3)    max_cham=36;
-	if(istation==2 && iring==1)    max_cham=18;
-	if(istation==2 && iring==2)    max_cham=36;
-	if(istation==3 && iring==1)    max_cham=18;
-	if(istation==3 && iring==2)    max_cham=36;
-	if(istation==4 && iring==1)    max_cham=18;
-	//station 1 ring 3 has 64 strips per layer instead of 80(minus & plus side!!!)
+  for (int iendcap = detId.minEndcapId(); iendcap <= detId.maxEndcapId(); iendcap++) {
+    for (int istation = detId.minStationId(); istation <= detId.maxStationId(); istation++) {
+      max_ring = detId.maxRingId();
+      // station 4 ring 4 not there(36 chambers*2 missing)
+      // 3 rings max this way of counting (ME1a & b)
+      if (istation == 1)
+        max_ring = 3;
+      if (istation == 2)
+        max_ring = 2;
+      if (istation == 3)
+        max_ring = 2;
+      if (istation == 4)
+        max_ring = 1;
 
-	for(int ichamber=detId.minChamberId(); ichamber<=max_cham; ichamber++){
+      for (int iring = detId.minRingId(); iring <= max_ring; iring++) {
+        max_istrip = 80;
+        max_cham = detId.maxChamberId();
+        if (istation == 1 && iring == 1)
+          max_cham = 36;
+        if (istation == 1 && iring == 2)
+          max_cham = 36;
+        if (istation == 1 && iring == 3)
+          max_cham = 36;
+        if (istation == 2 && iring == 1)
+          max_cham = 18;
+        if (istation == 2 && iring == 2)
+          max_cham = 36;
+        if (istation == 3 && iring == 1)
+          max_cham = 18;
+        if (istation == 3 && iring == 2)
+          max_cham = 36;
+        if (istation == 4 && iring == 1)
+          max_cham = 18;
+        // station 1 ring 3 has 64 strips per layer instead of 80(minus & plus
+        // side!!!)
 
- 	  for(int ilayer=detId.minLayerId(); ilayer<=detId.maxLayerId(); ilayer++){
-	    //station 1 ring 3 has 64 strips per layer instead of 80 
-	    if(istation==1 && iring==3)   max_istrip=64;
-	    
-	    std::vector<CSCcrosstalk::Item> itemvector;
-	    itemvector.resize(max_istrip);
-	    id_layer = 100000*iendcap + 10000*istation + 1000*iring + 10*ichamber + ilayer;
+        for (int ichamber = detId.minChamberId(); ichamber <= max_cham; ichamber++) {
+          for (int ilayer = detId.minLayerId(); ilayer <= detId.maxLayerId(); ilayer++) {
+            // station 1 ring 3 has 64 strips per layer instead of 80
+            if (istation == 1 && iring == 3)
+              max_istrip = 64;
 
-	    for(int istrip=0;istrip<max_istrip;istrip++){
-	      //create fake values
-	      itemvector[istrip].xtalk_slope_right=-((double)rand()/((double)(RAND_MAX)+(double)(1)))/10000+mean;
-	      itemvector[istrip].xtalk_intercept_right=((double)rand()/((double)(RAND_MAX)+(double)(1)))/100+min;
-	      itemvector[istrip].xtalk_chi2_right=((double)rand()/((double)(RAND_MAX)+(double)(1)))+minchi;
-	      itemvector[istrip].xtalk_slope_left=-((double)rand()/((double)(RAND_MAX)+(double)(1)))/10000+mean;
-	      itemvector[istrip].xtalk_intercept_left=((double)rand()/((double)(RAND_MAX)+(double)(1)))/100+min;
-	      itemvector[istrip].xtalk_chi2_left=((double)rand()/((double)(RAND_MAX)+(double)(1)))+minchi;
-	      cncrosstalk->crosstalk[id_layer]=itemvector;
+            std::vector<CSCcrosstalk::Item> itemvector;
+            itemvector.resize(max_istrip);
+            id_layer = 100000 * iendcap + 10000 * istation + 1000 * iring + 10 * ichamber + ilayer;
 
-	      if(istrip==0){
-		itemvector[istrip].xtalk_slope_right=-((double)rand()/((double)(RAND_MAX)+(double)(1)))/10000+mean;
-		itemvector[istrip].xtalk_intercept_right=((double)rand()/((double)(RAND_MAX)+(double)(1)))/100+min;
-		itemvector[istrip].xtalk_chi2_right=((double)rand()/((double)(RAND_MAX)+(double)(1)))+minchi;
-		itemvector[istrip].xtalk_slope_left=0.0;
-		itemvector[istrip].xtalk_intercept_left=0.0;
-		itemvector[istrip].xtalk_chi2_left=0.0;
-		cncrosstalk->crosstalk[id_layer]=itemvector;
-	      }
-	      
-	      if(istrip==79){
-		itemvector[istrip].xtalk_slope_right=0.0;
-		itemvector[istrip].xtalk_intercept_right=0.0;
-		itemvector[istrip].xtalk_chi2_right=0.0;
-		itemvector[istrip].xtalk_slope_left=-((double)rand()/((double)(RAND_MAX)+(double)(1)))/10000+mean;
-		itemvector[istrip].xtalk_intercept_left=((double)rand()/((double)(RAND_MAX)+(double)(1)))/100+min;
-		itemvector[istrip].xtalk_chi2_left=((double)rand()/((double)(RAND_MAX)+(double)(1)))+minchi;
-		cncrosstalk->crosstalk[id_layer]=itemvector;
-	      }
-	    }
-	  }
-	}
+            for (int istrip = 0; istrip < max_istrip; istrip++) {
+              // create fake values
+              itemvector[istrip].xtalk_slope_right =
+                  -((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 10000 + mean;
+              itemvector[istrip].xtalk_intercept_right =
+                  ((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 100 + min;
+              itemvector[istrip].xtalk_chi2_right = ((double)rand() / ((double)(RAND_MAX) + (double)(1))) + minchi;
+              itemvector[istrip].xtalk_slope_left =
+                  -((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 10000 + mean;
+              itemvector[istrip].xtalk_intercept_left =
+                  ((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 100 + min;
+              itemvector[istrip].xtalk_chi2_left = ((double)rand() / ((double)(RAND_MAX) + (double)(1))) + minchi;
+              cncrosstalk->crosstalk[id_layer] = itemvector;
+
+              if (istrip == 0) {
+                itemvector[istrip].xtalk_slope_right =
+                    -((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 10000 + mean;
+                itemvector[istrip].xtalk_intercept_right =
+                    ((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 100 + min;
+                itemvector[istrip].xtalk_chi2_right = ((double)rand() / ((double)(RAND_MAX) + (double)(1))) + minchi;
+                itemvector[istrip].xtalk_slope_left = 0.0;
+                itemvector[istrip].xtalk_intercept_left = 0.0;
+                itemvector[istrip].xtalk_chi2_left = 0.0;
+                cncrosstalk->crosstalk[id_layer] = itemvector;
+              }
+
+              if (istrip == 79) {
+                itemvector[istrip].xtalk_slope_right = 0.0;
+                itemvector[istrip].xtalk_intercept_right = 0.0;
+                itemvector[istrip].xtalk_chi2_right = 0.0;
+                itemvector[istrip].xtalk_slope_left =
+                    -((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 10000 + mean;
+                itemvector[istrip].xtalk_intercept_left =
+                    ((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 100 + min;
+                itemvector[istrip].xtalk_chi2_left = ((double)rand() / ((double)(RAND_MAX) + (double)(1))) + minchi;
+                cncrosstalk->crosstalk[id_layer] = itemvector;
+              }
+            }
+          }
+        }
       }
     }
-    
-    //overwrite fakes with old values from DB
+
+    // overwrite fakes with old values from DB
     int istrip = 0;
     std::vector<CSCcrosstalk::Item> itemvector;
     itemvector.resize(80);
-    
-    for(unsigned int mystrip=0; mystrip<old_nrlines-1; mystrip++){
-      if(old_strips[mystrip]==0) istrip = 0;
-      itemvector[istrip].xtalk_slope_right=old_slope_r[mystrip];
-      itemvector[istrip].xtalk_intercept_right=old_intercept_r[mystrip]; 
-      itemvector[istrip].xtalk_chi2_right=old_chi2_r[mystrip];
-      itemvector[istrip].xtalk_slope_left=old_slope_l[mystrip];  
-      itemvector[istrip].xtalk_intercept_left=old_intercept_l[mystrip];  
-      itemvector[istrip].xtalk_chi2_left=old_chi2_l[mystrip];
-      cncrosstalk->crosstalk[old_cham_id[mystrip]]=itemvector;
+
+    for (unsigned int mystrip = 0; mystrip < old_nrlines - 1; mystrip++) {
+      if (old_strips[mystrip] == 0)
+        istrip = 0;
+      itemvector[istrip].xtalk_slope_right = old_slope_r[mystrip];
+      itemvector[istrip].xtalk_intercept_right = old_intercept_r[mystrip];
+      itemvector[istrip].xtalk_chi2_right = old_chi2_r[mystrip];
+      itemvector[istrip].xtalk_slope_left = old_slope_l[mystrip];
+      itemvector[istrip].xtalk_intercept_left = old_intercept_l[mystrip];
+      itemvector[istrip].xtalk_chi2_left = old_chi2_l[mystrip];
+      cncrosstalk->crosstalk[old_cham_id[mystrip]] = itemvector;
       istrip++;
-    }  
-  
-    
+    }
+
     itemvector.resize(64);
-    for(unsigned int mystrip=0; mystrip<old_nrlines-1; mystrip++){
-      if(old_strips[mystrip]==0) istrip = 0;
-      if(old_cham_id[mystrip] >= 113000 && old_cham_id[mystrip] <= 113999){
-	itemvector[istrip].xtalk_slope_right=old_slope_r[mystrip];
-	itemvector[istrip].xtalk_intercept_right=old_intercept_r[mystrip]; 
-	itemvector[istrip].xtalk_chi2_right=old_chi2_r[mystrip];
-	itemvector[istrip].xtalk_slope_left=old_slope_l[mystrip];  
-	itemvector[istrip].xtalk_intercept_left=old_intercept_l[mystrip];  
-	itemvector[istrip].xtalk_chi2_left=old_chi2_l[mystrip];
-	cncrosstalk->crosstalk[old_cham_id[mystrip]]=itemvector;
-	istrip++;
+    for (unsigned int mystrip = 0; mystrip < old_nrlines - 1; mystrip++) {
+      if (old_strips[mystrip] == 0)
+        istrip = 0;
+      if (old_cham_id[mystrip] >= 113000 && old_cham_id[mystrip] <= 113999) {
+        itemvector[istrip].xtalk_slope_right = old_slope_r[mystrip];
+        itemvector[istrip].xtalk_intercept_right = old_intercept_r[mystrip];
+        itemvector[istrip].xtalk_chi2_right = old_chi2_r[mystrip];
+        itemvector[istrip].xtalk_slope_left = old_slope_l[mystrip];
+        itemvector[istrip].xtalk_intercept_left = old_intercept_l[mystrip];
+        itemvector[istrip].xtalk_chi2_left = old_chi2_l[mystrip];
+        cncrosstalk->crosstalk[old_cham_id[mystrip]] = itemvector;
+        istrip++;
       }
-    } 
-    
+    }
+
     itemvector.resize(64);
-    for(unsigned int mystrip=0; mystrip<old_nrlines-1; mystrip++){
-      if(old_strips[mystrip]==0) istrip = 0;
-      if(old_cham_id[mystrip] >= 213000 && old_cham_id[mystrip] <= 213999){
-	itemvector[istrip].xtalk_slope_right=old_slope_r[mystrip];
-	itemvector[istrip].xtalk_intercept_right=old_intercept_r[mystrip]; 
-	itemvector[istrip].xtalk_chi2_right=old_chi2_r[mystrip];
-	itemvector[istrip].xtalk_slope_left=old_slope_l[mystrip];  
-	itemvector[istrip].xtalk_intercept_left=old_intercept_l[mystrip];  
-	itemvector[istrip].xtalk_chi2_left=old_chi2_l[mystrip];
-	cncrosstalk->crosstalk[old_cham_id[mystrip]]=itemvector;
-	istrip++;
+    for (unsigned int mystrip = 0; mystrip < old_nrlines - 1; mystrip++) {
+      if (old_strips[mystrip] == 0)
+        istrip = 0;
+      if (old_cham_id[mystrip] >= 213000 && old_cham_id[mystrip] <= 213999) {
+        itemvector[istrip].xtalk_slope_right = old_slope_r[mystrip];
+        itemvector[istrip].xtalk_intercept_right = old_intercept_r[mystrip];
+        itemvector[istrip].xtalk_chi2_right = old_chi2_r[mystrip];
+        itemvector[istrip].xtalk_slope_left = old_slope_l[mystrip];
+        itemvector[istrip].xtalk_intercept_left = old_intercept_l[mystrip];
+        itemvector[istrip].xtalk_chi2_left = old_chi2_l[mystrip];
+        cncrosstalk->crosstalk[old_cham_id[mystrip]] = itemvector;
+        istrip++;
       }
-    }   
-    
-    //overwrite old values with ones from new runs
+    }
+
+    // overwrite old values with ones from new runs
     itemvector.resize(80);
-    for(unsigned int mystrip=0; mystrip<new_nrlines-1; mystrip++){
-      if(new_strips[mystrip]==0) istrip = 0;
-      itemvector[istrip].xtalk_slope_right=new_slope_r[mystrip];
-      itemvector[istrip].xtalk_intercept_right=new_intercept_r[mystrip]; 
-      itemvector[istrip].xtalk_chi2_right=new_chi2_r[mystrip];
-      itemvector[istrip].xtalk_slope_left=new_slope_l[mystrip];  
-      itemvector[istrip].xtalk_intercept_left=new_intercept_l[mystrip];  
-      itemvector[istrip].xtalk_chi2_left=new_chi2_l[mystrip];
-      cncrosstalk->crosstalk[new_cham_id[mystrip]]=itemvector;
+    for (unsigned int mystrip = 0; mystrip < new_nrlines - 1; mystrip++) {
+      if (new_strips[mystrip] == 0)
+        istrip = 0;
+      itemvector[istrip].xtalk_slope_right = new_slope_r[mystrip];
+      itemvector[istrip].xtalk_intercept_right = new_intercept_r[mystrip];
+      itemvector[istrip].xtalk_chi2_right = new_chi2_r[mystrip];
+      itemvector[istrip].xtalk_slope_left = new_slope_l[mystrip];
+      itemvector[istrip].xtalk_intercept_left = new_intercept_l[mystrip];
+      itemvector[istrip].xtalk_chi2_left = new_chi2_l[mystrip];
+      cncrosstalk->crosstalk[new_cham_id[mystrip]] = itemvector;
       istrip++;
     }
-    
+
     itemvector.resize(64);
-    for(unsigned int mystrip=0; mystrip<new_nrlines-1; mystrip++){
-      if(new_strips[mystrip]==0) istrip = 0;
-      if(new_cham_id[mystrip] >= 113000 && new_cham_id[mystrip] <= 113999){
-	itemvector[istrip].xtalk_slope_right=new_slope_r[mystrip];
-	itemvector[istrip].xtalk_intercept_right=new_intercept_r[mystrip]; 
-	itemvector[istrip].xtalk_chi2_right=new_chi2_r[mystrip];
-	itemvector[istrip].xtalk_slope_left=new_slope_l[mystrip];  
-	itemvector[istrip].xtalk_intercept_left=new_intercept_l[mystrip];  
-	itemvector[istrip].xtalk_chi2_left=new_chi2_l[mystrip];
-	cncrosstalk->crosstalk[new_cham_id[mystrip]]=itemvector;
-	istrip++;
+    for (unsigned int mystrip = 0; mystrip < new_nrlines - 1; mystrip++) {
+      if (new_strips[mystrip] == 0)
+        istrip = 0;
+      if (new_cham_id[mystrip] >= 113000 && new_cham_id[mystrip] <= 113999) {
+        itemvector[istrip].xtalk_slope_right = new_slope_r[mystrip];
+        itemvector[istrip].xtalk_intercept_right = new_intercept_r[mystrip];
+        itemvector[istrip].xtalk_chi2_right = new_chi2_r[mystrip];
+        itemvector[istrip].xtalk_slope_left = new_slope_l[mystrip];
+        itemvector[istrip].xtalk_intercept_left = new_intercept_l[mystrip];
+        itemvector[istrip].xtalk_chi2_left = new_chi2_l[mystrip];
+        cncrosstalk->crosstalk[new_cham_id[mystrip]] = itemvector;
+        istrip++;
       }
-    } 
-    
+    }
+
     itemvector.resize(64);
-    for(unsigned int mystrip=0; mystrip<new_nrlines-1; mystrip++){
-      if(new_strips[mystrip]==0) istrip = 0;
-      if(new_cham_id[mystrip] >= 213000 && new_cham_id[mystrip] <= 213999){
-	itemvector[istrip].xtalk_slope_right=new_slope_r[mystrip];
-	itemvector[istrip].xtalk_intercept_right=new_intercept_r[mystrip]; 
-	itemvector[istrip].xtalk_chi2_right=new_chi2_r[mystrip];
-	itemvector[istrip].xtalk_slope_left=new_slope_l[mystrip];  
-	itemvector[istrip].xtalk_intercept_left=new_intercept_l[mystrip];  
-	itemvector[istrip].xtalk_chi2_left=new_chi2_l[mystrip];
-	cncrosstalk->crosstalk[new_cham_id[mystrip]]=itemvector;
-	istrip++;
+    for (unsigned int mystrip = 0; mystrip < new_nrlines - 1; mystrip++) {
+      if (new_strips[mystrip] == 0)
+        istrip = 0;
+      if (new_cham_id[mystrip] >= 213000 && new_cham_id[mystrip] <= 213999) {
+        itemvector[istrip].xtalk_slope_right = new_slope_r[mystrip];
+        itemvector[istrip].xtalk_intercept_right = new_intercept_r[mystrip];
+        itemvector[istrip].xtalk_chi2_right = new_chi2_r[mystrip];
+        itemvector[istrip].xtalk_slope_left = new_slope_l[mystrip];
+        itemvector[istrip].xtalk_intercept_left = new_intercept_l[mystrip];
+        itemvector[istrip].xtalk_chi2_left = new_chi2_l[mystrip];
+        cncrosstalk->crosstalk[new_cham_id[mystrip]] = itemvector;
+        istrip++;
       }
-    } 
+    }
   }
 
-  return  cncrosstalk;
-
+  return cncrosstalk;
 }
 
-
-CSCCrosstalkConditions::CSCCrosstalkConditions(const edm::ParameterSet& iConfig)
-{
-  //the following line is needed to tell the framework what
+CSCCrosstalkConditions::CSCCrosstalkConditions(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
   // added by Zhen (changed since 1_2_0)
-  setWhatProduced(this,&CSCCrosstalkConditions::produceCrosstalk);
+  setWhatProduced(this, &CSCCrosstalkConditions::produceCrosstalk);
   findingRecord<CSCcrosstalkRcd>();
-  //now do what ever other initialization is needed
+  // now do what ever other initialization is needed
 }
 
-
-CSCCrosstalkConditions::~CSCCrosstalkConditions()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+CSCCrosstalkConditions::~CSCCrosstalkConditions() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CSCCrosstalkConditions::ReturnType
-CSCCrosstalkConditions::produceCrosstalk(const CSCcrosstalkRcd& iRecord)
-{
+CSCCrosstalkConditions::ReturnType CSCCrosstalkConditions::produceCrosstalk(const CSCcrosstalkRcd &iRecord) {
   // Added by Zhen, need a new object so to not be deleted at exit
   return CSCCrosstalkConditions::ReturnType(prefillCrosstalk());
-  
 }
 
- void CSCCrosstalkConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
- oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- 
- }
-
-
+void CSCCrosstalkConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                            const edm::IOVSyncValue &,
+                                            edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibMuon/CSCCalibration/plugins/CSCCrosstalkDBConditions.cc b/CalibMuon/CSCCalibration/plugins/CSCCrosstalkDBConditions.cc
index 5245474aa4ded..27f11a6cd5eb7 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCCrosstalkDBConditions.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCCrosstalkDBConditions.cc
@@ -1,46 +1,36 @@
-#include <memory>
 #include <fstream>
+#include <memory>
 
+#include "CalibMuon/CSCCalibration/interface/CSCCrosstalkDBConditions.h"
 #include "CondFormats/CSCObjects/interface/CSCDBCrosstalk.h"
 #include "CondFormats/DataRecord/interface/CSCDBCrosstalkRcd.h"
-#include "CalibMuon/CSCCalibration/interface/CSCCrosstalkDBConditions.h"
 
-
-CSCCrosstalkDBConditions::CSCCrosstalkDBConditions(const edm::ParameterSet& iConfig)
-{
-  //the following line is needed to tell the framework what
+CSCCrosstalkDBConditions::CSCCrosstalkDBConditions(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
   // added by Zhen (changed since 1_2_0)
-  setWhatProduced(this,&CSCCrosstalkDBConditions::produceDBCrosstalk);
+  setWhatProduced(this, &CSCCrosstalkDBConditions::produceDBCrosstalk);
   findingRecord<CSCDBCrosstalkRcd>();
-  //now do what ever other initialization is needed
+  // now do what ever other initialization is needed
 }
 
-
-CSCCrosstalkDBConditions::~CSCCrosstalkDBConditions()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+CSCCrosstalkDBConditions::~CSCCrosstalkDBConditions() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CSCCrosstalkDBConditions::ReturnType
-CSCCrosstalkDBConditions::produceDBCrosstalk(const CSCDBCrosstalkRcd& iRecord)
-{
-  //need a new object so to not be deleted at exit
+CSCCrosstalkDBConditions::ReturnType CSCCrosstalkDBConditions::produceDBCrosstalk(const CSCDBCrosstalkRcd &iRecord) {
+  // need a new object so to not be deleted at exit
   return CSCCrosstalkDBConditions::ReturnType(prefillDBCrosstalk());
-  
 }
 
- void CSCCrosstalkDBConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
- oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- 
- }
+void CSCCrosstalkDBConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                              const edm::IOVSyncValue &,
+                                              edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibMuon/CSCCalibration/plugins/CSCFakeCrosstalkConditions.cc b/CalibMuon/CSCCalibration/plugins/CSCFakeCrosstalkConditions.cc
index fe1fa35edce76..6e50152ce9a75 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCFakeCrosstalkConditions.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCFakeCrosstalkConditions.cc
@@ -2,123 +2,132 @@
 
 #include "CalibMuon/CSCCalibration/interface/CSCFakeCrosstalkConditions.h"
 
-CSCcrosstalk * CSCFakeCrosstalkConditions::prefillCrosstalk(){
-  
-  const CSCDetId& detId = CSCDetId();
-  CSCcrosstalk * cncrosstalk = new CSCcrosstalk();
-  
-  int max_istrip,id_layer,max_ring,max_cham;
-  seed = 10000;	
-  srand(seed);
-  mean=-0.0009, min=0.035, minchi=1.5, M=1000;
- 
-  //endcap=1 to 2,station=1 to 4, ring=1 to 4,chamber=1 to 36,layer=1 to 6 
-  for(int iendcap=detId.minEndcapId(); iendcap<=detId.maxEndcapId(); iendcap++){
-    for(int istation=detId.minStationId() ; istation<=detId.maxStationId(); istation++){
-      max_ring=detId.maxRingId();
-      //station 4 ring 4 not there(36 chambers*2 missing)
-      //3 rings max this way of counting (ME1a & b)
-      if(istation==1)    max_ring=3;
-      if(istation==2)    max_ring=2;
-      if(istation==3)    max_ring=2;
-      if(istation==4)    max_ring=1;
-      
-      for(int iring=detId.minRingId(); iring<=max_ring; iring++){
-	max_istrip=80;
-	max_cham=detId.maxChamberId();
-	if(istation==1 && iring==1)    max_cham=36;
-	if(istation==1 && iring==2)    max_cham=36;
-	if(istation==1 && iring==3)    max_cham=36;
-	if(istation==2 && iring==1)    max_cham=18;
-	if(istation==2 && iring==2)    max_cham=36;
-	if(istation==3 && iring==1)    max_cham=18;
-	if(istation==3 && iring==2)    max_cham=36;
-	if(istation==4 && iring==1)    max_cham=18;
-	//station 1 ring 3 has 64 strips per layer instead of 80(minus & plus side!!!)
-
-	for(int ichamber=detId.minChamberId(); ichamber<=max_cham; ichamber++){
-
- 	  for(int ilayer=detId.minLayerId(); ilayer<=detId.maxLayerId(); ilayer++){
-	    //station 1 ring 3 has 64 strips per layer instead of 80 
-	    if(istation==1 && iring==3)   max_istrip=64;
-	    
-	    std::vector<CSCcrosstalk::Item> itemvector;
-	    itemvector.resize(max_istrip);
-	    id_layer = 100000*iendcap + 10000*istation + 1000*iring + 10*ichamber + ilayer;
+CSCcrosstalk *CSCFakeCrosstalkConditions::prefillCrosstalk() {
+  const CSCDetId &detId = CSCDetId();
+  CSCcrosstalk *cncrosstalk = new CSCcrosstalk();
 
-	    for(int istrip=0;istrip<max_istrip;istrip++){
-	      //create fake values
-	      itemvector[istrip].xtalk_slope_right=-((double)rand()/((double)(RAND_MAX)+(double)(1)))/10000+mean;
-	      itemvector[istrip].xtalk_intercept_right=((double)rand()/((double)(RAND_MAX)+(double)(1)))/100+min;
-	      itemvector[istrip].xtalk_chi2_right=((double)rand()/((double)(RAND_MAX)+(double)(1)))+minchi;
-	      itemvector[istrip].xtalk_slope_left=-((double)rand()/((double)(RAND_MAX)+(double)(1)))/10000+mean;
-	      itemvector[istrip].xtalk_intercept_left=((double)rand()/((double)(RAND_MAX)+(double)(1)))/100+min;
-	      itemvector[istrip].xtalk_chi2_left=((double)rand()/((double)(RAND_MAX)+(double)(1)))+minchi;
-	      cncrosstalk->crosstalk[id_layer]=itemvector;
-
-	      if(istrip==0){
-		itemvector[istrip].xtalk_slope_right=-((double)rand()/((double)(RAND_MAX)+(double)(1)))/10000+mean;
-		itemvector[istrip].xtalk_intercept_right=((double)rand()/((double)(RAND_MAX)+(double)(1)))/100+min;
-		itemvector[istrip].xtalk_chi2_right=((double)rand()/((double)(RAND_MAX)+(double)(1)))+minchi;
-		itemvector[istrip].xtalk_slope_left=0.0;
-		itemvector[istrip].xtalk_intercept_left=0.0;
-		itemvector[istrip].xtalk_chi2_left=0.0;
-		cncrosstalk->crosstalk[id_layer]=itemvector;
-	      }
-	      
-	      if(istrip==79){
-		itemvector[istrip].xtalk_slope_right=0.0;
-		itemvector[istrip].xtalk_intercept_right=0.0;
-		itemvector[istrip].xtalk_chi2_right=0.0;
-		itemvector[istrip].xtalk_slope_left=-((double)rand()/((double)(RAND_MAX)+(double)(1)))/10000+mean;
-		itemvector[istrip].xtalk_intercept_left=((double)rand()/((double)(RAND_MAX)+(double)(1)))/100+min;
-		itemvector[istrip].xtalk_chi2_left=((double)rand()/((double)(RAND_MAX)+(double)(1)))+minchi;
-		cncrosstalk->crosstalk[id_layer]=itemvector;
-	      }
-	    }
-	  }
-	}
+  int max_istrip, id_layer, max_ring, max_cham;
+  seed = 10000;
+  srand(seed);
+  mean = -0.0009, min = 0.035, minchi = 1.5, M = 1000;
+
+  // endcap=1 to 2,station=1 to 4, ring=1 to 4,chamber=1 to 36,layer=1 to 6
+  for (int iendcap = detId.minEndcapId(); iendcap <= detId.maxEndcapId(); iendcap++) {
+    for (int istation = detId.minStationId(); istation <= detId.maxStationId(); istation++) {
+      max_ring = detId.maxRingId();
+      // station 4 ring 4 not there(36 chambers*2 missing)
+      // 3 rings max this way of counting (ME1a & b)
+      if (istation == 1)
+        max_ring = 3;
+      if (istation == 2)
+        max_ring = 2;
+      if (istation == 3)
+        max_ring = 2;
+      if (istation == 4)
+        max_ring = 1;
+
+      for (int iring = detId.minRingId(); iring <= max_ring; iring++) {
+        max_istrip = 80;
+        max_cham = detId.maxChamberId();
+        if (istation == 1 && iring == 1)
+          max_cham = 36;
+        if (istation == 1 && iring == 2)
+          max_cham = 36;
+        if (istation == 1 && iring == 3)
+          max_cham = 36;
+        if (istation == 2 && iring == 1)
+          max_cham = 18;
+        if (istation == 2 && iring == 2)
+          max_cham = 36;
+        if (istation == 3 && iring == 1)
+          max_cham = 18;
+        if (istation == 3 && iring == 2)
+          max_cham = 36;
+        if (istation == 4 && iring == 1)
+          max_cham = 18;
+        // station 1 ring 3 has 64 strips per layer instead of 80(minus & plus
+        // side!!!)
+
+        for (int ichamber = detId.minChamberId(); ichamber <= max_cham; ichamber++) {
+          for (int ilayer = detId.minLayerId(); ilayer <= detId.maxLayerId(); ilayer++) {
+            // station 1 ring 3 has 64 strips per layer instead of 80
+            if (istation == 1 && iring == 3)
+              max_istrip = 64;
+
+            std::vector<CSCcrosstalk::Item> itemvector;
+            itemvector.resize(max_istrip);
+            id_layer = 100000 * iendcap + 10000 * istation + 1000 * iring + 10 * ichamber + ilayer;
+
+            for (int istrip = 0; istrip < max_istrip; istrip++) {
+              // create fake values
+              itemvector[istrip].xtalk_slope_right =
+                  -((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 10000 + mean;
+              itemvector[istrip].xtalk_intercept_right =
+                  ((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 100 + min;
+              itemvector[istrip].xtalk_chi2_right = ((double)rand() / ((double)(RAND_MAX) + (double)(1))) + minchi;
+              itemvector[istrip].xtalk_slope_left =
+                  -((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 10000 + mean;
+              itemvector[istrip].xtalk_intercept_left =
+                  ((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 100 + min;
+              itemvector[istrip].xtalk_chi2_left = ((double)rand() / ((double)(RAND_MAX) + (double)(1))) + minchi;
+              cncrosstalk->crosstalk[id_layer] = itemvector;
+
+              if (istrip == 0) {
+                itemvector[istrip].xtalk_slope_right =
+                    -((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 10000 + mean;
+                itemvector[istrip].xtalk_intercept_right =
+                    ((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 100 + min;
+                itemvector[istrip].xtalk_chi2_right = ((double)rand() / ((double)(RAND_MAX) + (double)(1))) + minchi;
+                itemvector[istrip].xtalk_slope_left = 0.0;
+                itemvector[istrip].xtalk_intercept_left = 0.0;
+                itemvector[istrip].xtalk_chi2_left = 0.0;
+                cncrosstalk->crosstalk[id_layer] = itemvector;
+              }
+
+              if (istrip == 79) {
+                itemvector[istrip].xtalk_slope_right = 0.0;
+                itemvector[istrip].xtalk_intercept_right = 0.0;
+                itemvector[istrip].xtalk_chi2_right = 0.0;
+                itemvector[istrip].xtalk_slope_left =
+                    -((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 10000 + mean;
+                itemvector[istrip].xtalk_intercept_left =
+                    ((double)rand() / ((double)(RAND_MAX) + (double)(1))) / 100 + min;
+                itemvector[istrip].xtalk_chi2_left = ((double)rand() / ((double)(RAND_MAX) + (double)(1))) + minchi;
+                cncrosstalk->crosstalk[id_layer] = itemvector;
+              }
+            }
+          }
+        }
       }
     }
   }
   return cncrosstalk;
 }
 
-
-CSCFakeCrosstalkConditions::CSCFakeCrosstalkConditions(const edm::ParameterSet& iConfig)
-{
-  //the following line is needed to tell the framework what
+CSCFakeCrosstalkConditions::CSCFakeCrosstalkConditions(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
-  setWhatProduced(this,&CSCFakeCrosstalkConditions::produceCrosstalk);
+  setWhatProduced(this, &CSCFakeCrosstalkConditions::produceCrosstalk);
   findingRecord<CSCcrosstalkRcd>();
-  //now do what ever other initialization is needed
+  // now do what ever other initialization is needed
 }
 
-
-CSCFakeCrosstalkConditions::~CSCFakeCrosstalkConditions()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+CSCFakeCrosstalkConditions::~CSCFakeCrosstalkConditions() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CSCFakeCrosstalkConditions::ReturnType
-CSCFakeCrosstalkConditions::produceCrosstalk(const CSCcrosstalkRcd& iRecord)
-{
-  return CSCFakeCrosstalkConditions::ReturnType( prefillCrosstalk() );
+CSCFakeCrosstalkConditions::ReturnType CSCFakeCrosstalkConditions::produceCrosstalk(const CSCcrosstalkRcd &iRecord) {
+  return CSCFakeCrosstalkConditions::ReturnType(prefillCrosstalk());
 }
 
- void CSCFakeCrosstalkConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
- oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- 
- }
-
-
+void CSCFakeCrosstalkConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                                const edm::IOVSyncValue &,
+                                                edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibMuon/CSCCalibration/plugins/CSCFakeDBCrosstalk.cc b/CalibMuon/CSCCalibration/plugins/CSCFakeDBCrosstalk.cc
index 95425ac2c4351..6c0da4444f078 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCFakeDBCrosstalk.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCFakeDBCrosstalk.cc
@@ -1,34 +1,24 @@
+#include "CalibMuon/CSCCalibration/interface/CSCCrosstalkDBConditions.h"
 #include "CalibMuon/CSCCalibration/interface/CSCFakeDBCrosstalk.h"
 #include "CondFormats/CSCObjects/interface/CSCDBCrosstalk.h"
 #include "CondFormats/DataRecord/interface/CSCDBCrosstalkRcd.h"
-#include "CalibMuon/CSCCalibration/interface/CSCCrosstalkDBConditions.h"
 
-CSCFakeDBCrosstalk::CSCFakeDBCrosstalk(const edm::ParameterSet& iConfig)
-{
-  //the following line is needed to tell the framework what
+CSCFakeDBCrosstalk::CSCFakeDBCrosstalk(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
-  setWhatProduced(this,&CSCFakeDBCrosstalk::produceDBCrosstalk);
+  setWhatProduced(this, &CSCFakeDBCrosstalk::produceDBCrosstalk);
   findingRecord<CSCDBCrosstalkRcd>();
 }
 
-
-CSCFakeDBCrosstalk::~CSCFakeDBCrosstalk()
-{
-}
-
+CSCFakeDBCrosstalk::~CSCFakeDBCrosstalk() {}
 
 // ------------ method called to produce the data  ------------
-CSCFakeDBCrosstalk::Pointer
-CSCFakeDBCrosstalk::produceDBCrosstalk(const CSCDBCrosstalkRcd& iRecord)
-{
-  return CSCFakeDBCrosstalk::Pointer( prefillDBCrosstalk());
+CSCFakeDBCrosstalk::Pointer CSCFakeDBCrosstalk::produceDBCrosstalk(const CSCDBCrosstalkRcd &iRecord) {
+  return CSCFakeDBCrosstalk::Pointer(prefillDBCrosstalk());
 }
 
- void CSCFakeDBCrosstalk::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
- oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- 
- }
-
-
+void CSCFakeDBCrosstalk::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                        const edm::IOVSyncValue &,
+                                        edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibMuon/CSCCalibration/plugins/CSCFakeDBGains.cc b/CalibMuon/CSCCalibration/plugins/CSCFakeDBGains.cc
index 98e3b72811d77..c516fbe6a82d7 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCFakeDBGains.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCFakeDBGains.cc
@@ -1,30 +1,24 @@
 #include "CalibMuon/CSCCalibration/interface/CSCFakeDBGains.h"
+#include "CalibMuon/CSCCalibration/interface/CSCGainsDBConditions.h"
 #include "CondFormats/CSCObjects/interface/CSCDBGains.h"
 #include "CondFormats/DataRecord/interface/CSCDBGainsRcd.h"
-#include "CalibMuon/CSCCalibration/interface/CSCGainsDBConditions.h"
 
-CSCFakeDBGains::CSCFakeDBGains(const edm::ParameterSet& iConfig)
-{
+CSCFakeDBGains::CSCFakeDBGains(const edm::ParameterSet &iConfig) {
   // the following line is needed to tell the framework what
   // data is being produced
   setWhatProduced(this, &CSCFakeDBGains::produceDBGains);
   findingRecord<CSCDBGainsRcd>();
 }
 
-
-CSCFakeDBGains::~CSCFakeDBGains()
-{
-}
+CSCFakeDBGains::~CSCFakeDBGains() {}
 
 // ------------ method called to produce the data  ------------
-CSCFakeDBGains::Pointer
-CSCFakeDBGains::produceDBGains(const CSCDBGainsRcd& iRecord)
-{
-  return CSCFakeDBGains::Pointer( prefillDBGains());
+CSCFakeDBGains::Pointer CSCFakeDBGains::produceDBGains(const CSCDBGainsRcd &iRecord) {
+  return CSCFakeDBGains::Pointer(prefillDBGains());
 }
 
- void CSCFakeDBGains::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
-    oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- }
+void CSCFakeDBGains::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                    const edm::IOVSyncValue &,
+                                    edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibMuon/CSCCalibration/plugins/CSCFakeDBNoiseMatrix.cc b/CalibMuon/CSCCalibration/plugins/CSCFakeDBNoiseMatrix.cc
index 65d6fe703ac3e..d105c381df312 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCFakeDBNoiseMatrix.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCFakeDBNoiseMatrix.cc
@@ -1,30 +1,23 @@
 #include "CalibMuon/CSCCalibration/interface/CSCFakeDBNoiseMatrix.h"
+#include "CalibMuon/CSCCalibration/interface/CSCNoiseMatrixDBConditions.h"
 #include "CondFormats/CSCObjects/interface/CSCDBNoiseMatrix.h"
 #include "CondFormats/DataRecord/interface/CSCDBNoiseMatrixRcd.h"
-#include "CalibMuon/CSCCalibration/interface/CSCNoiseMatrixDBConditions.h"
 
-CSCFakeDBNoiseMatrix::CSCFakeDBNoiseMatrix(const edm::ParameterSet& iConfig)
-{
-  //tell the framework what data is being produced
-  setWhatProduced(this,&CSCFakeDBNoiseMatrix::produceDBNoiseMatrix);  
+CSCFakeDBNoiseMatrix::CSCFakeDBNoiseMatrix(const edm::ParameterSet &iConfig) {
+  // tell the framework what data is being produced
+  setWhatProduced(this, &CSCFakeDBNoiseMatrix::produceDBNoiseMatrix);
   findingRecord<CSCDBNoiseMatrixRcd>();
 }
 
-
-CSCFakeDBNoiseMatrix::~CSCFakeDBNoiseMatrix()
-{
-}
+CSCFakeDBNoiseMatrix::~CSCFakeDBNoiseMatrix() {}
 
 // ------------ method called to produce the data  ------------
-CSCFakeDBNoiseMatrix::Pointer
-CSCFakeDBNoiseMatrix::produceDBNoiseMatrix(const CSCDBNoiseMatrixRcd& iRecord)
-{
-  return CSCFakeDBNoiseMatrix::Pointer( prefillDBNoiseMatrix());
+CSCFakeDBNoiseMatrix::Pointer CSCFakeDBNoiseMatrix::produceDBNoiseMatrix(const CSCDBNoiseMatrixRcd &iRecord) {
+  return CSCFakeDBNoiseMatrix::Pointer(prefillDBNoiseMatrix());
 }
 
-void CSCFakeDBNoiseMatrix::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
-						  edm::ValidityInterval & oValidity)
-{
-  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
-  
+void CSCFakeDBNoiseMatrix::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                          const edm::IOVSyncValue &,
+                                          edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
 }
diff --git a/CalibMuon/CSCCalibration/plugins/CSCFakeDBPedestals.cc b/CalibMuon/CSCCalibration/plugins/CSCFakeDBPedestals.cc
index 3c4f6bff82d59..5035c28e2e083 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCFakeDBPedestals.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCFakeDBPedestals.cc
@@ -1,33 +1,25 @@
 #include "CalibMuon/CSCCalibration/interface/CSCFakeDBPedestals.h"
+#include "CalibMuon/CSCCalibration/interface/CSCPedestalsDBConditions.h"
 #include "CondFormats/CSCObjects/interface/CSCDBPedestals.h"
 #include "CondFormats/DataRecord/interface/CSCDBPedestalsRcd.h"
-#include "CalibMuon/CSCCalibration/interface/CSCPedestalsDBConditions.h"
-
-CSCFakeDBPedestals::CSCFakeDBPedestals(const edm::ParameterSet& iConfig)
-{
 
-  //the following line is needed to tell the framework what
+CSCFakeDBPedestals::CSCFakeDBPedestals(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
-  setWhatProduced(this,&CSCFakeDBPedestals::produceDBPedestals);
+  setWhatProduced(this, &CSCFakeDBPedestals::produceDBPedestals);
   findingRecord<CSCDBPedestalsRcd>();
 }
 
-
-CSCFakeDBPedestals::~CSCFakeDBPedestals()
-{
-}
+CSCFakeDBPedestals::~CSCFakeDBPedestals() {}
 
 // ------------ method called to produce the data  ------------
-CSCFakeDBPedestals::Pointer
-CSCFakeDBPedestals::produceDBPedestals(const CSCDBPedestalsRcd& iRecord)
-{
-  Pointer cndbPedestals( prefillDBPedestals() );
+CSCFakeDBPedestals::Pointer CSCFakeDBPedestals::produceDBPedestals(const CSCDBPedestalsRcd &iRecord) {
+  Pointer cndbPedestals(prefillDBPedestals());
   return cndbPedestals;
 }
 
- void CSCFakeDBPedestals::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
- oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- 
- }
+void CSCFakeDBPedestals::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                        const edm::IOVSyncValue &,
+                                        edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibMuon/CSCCalibration/plugins/CSCFakeGainsConditions.cc b/CalibMuon/CSCCalibration/plugins/CSCFakeGainsConditions.cc
index 2cfdc1a23973b..54ceea2d30bf0 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCFakeGainsConditions.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCFakeGainsConditions.cc
@@ -1,99 +1,102 @@
 
 #include "CalibMuon/CSCCalibration/interface/CSCFakeGainsConditions.h"
 
-CSCGains * CSCFakeGainsConditions::prefillGains()
-{
-  CSCGains * cngains = new CSCGains();
-  const CSCDetId& detId = CSCDetId();
-      
-  int max_istrip,id_layer,max_ring,max_cham;
-  seed = 10000;	
+CSCGains *CSCFakeGainsConditions::prefillGains() {
+  CSCGains *cngains = new CSCGains();
+  const CSCDetId &detId = CSCDetId();
+
+  int max_istrip, id_layer, max_ring, max_cham;
+  seed = 10000;
   srand(seed);
-  mean=6.8, min=-10.0, minchi=1.0, M=1000;
+  mean = 6.8, min = -10.0, minchi = 1.0, M = 1000;
+
+  // endcap=1 to 2,station=1 to 4, ring=1 to 4,chamber=1 to 36,layer=1 to 6
+
+  for (int iendcap = detId.minEndcapId(); iendcap <= detId.maxEndcapId(); iendcap++) {
+    for (int istation = detId.minStationId(); istation <= detId.maxStationId(); istation++) {
+      max_ring = detId.maxRingId();
+      // station 4 ring 4 not there(36 chambers*2 missing)
+      // 3 rings max this way of counting (ME1a & b)
+      if (istation == 1)
+        max_ring = 3;
+      if (istation == 2)
+        max_ring = 2;
+      if (istation == 3)
+        max_ring = 2;
+      if (istation == 4)
+        max_ring = 1;
+
+      for (int iring = detId.minRingId(); iring <= max_ring; iring++) {
+        max_istrip = 80;
+        max_cham = detId.maxChamberId();
+        if (istation == 1 && iring == 1)
+          max_cham = 36;
+        if (istation == 1 && iring == 2)
+          max_cham = 36;
+        if (istation == 1 && iring == 3)
+          max_cham = 36;
+        if (istation == 2 && iring == 1)
+          max_cham = 18;
+        if (istation == 2 && iring == 2)
+          max_cham = 36;
+        if (istation == 3 && iring == 1)
+          max_cham = 18;
+        if (istation == 3 && iring == 2)
+          max_cham = 36;
+        if (istation == 4 && iring == 1)
+          max_cham = 18;
+
+        for (int ichamber = detId.minChamberId(); ichamber <= max_cham; ichamber++) {
+          for (int ilayer = detId.minLayerId(); ilayer <= detId.maxLayerId(); ilayer++) {
+            // station 1 ring 3 has 64 strips per layer instead of 80
+            if (istation == 1 && iring == 3)
+              max_istrip = 64;
 
+            std::vector<CSCGains::Item> itemvector;
+            itemvector.resize(max_istrip);
+            id_layer = 100000 * iendcap + 10000 * istation + 1000 * iring + 10 * ichamber + ilayer;
 
-  //endcap=1 to 2,station=1 to 4, ring=1 to 4,chamber=1 to 36,layer=1 to 6 
-  
-  for(int iendcap=detId.minEndcapId(); iendcap<=detId.maxEndcapId(); iendcap++){
-    for(int istation=detId.minStationId() ; istation<=detId.maxStationId(); istation++){
-      max_ring=detId.maxRingId();
-      //station 4 ring 4 not there(36 chambers*2 missing)
-      //3 rings max this way of counting (ME1a & b)
-      if(istation==1)    max_ring=3;
-      if(istation==2)    max_ring=2;
-      if(istation==3)    max_ring=2;
-      if(istation==4)    max_ring=1;
-      
-      for(int iring=detId.minRingId(); iring<=max_ring; iring++){
-	max_istrip=80;
-	max_cham=detId.maxChamberId();  
-	if(istation==1 && iring==1)    max_cham=36;
-	if(istation==1 && iring==2)    max_cham=36;
-	if(istation==1 && iring==3)    max_cham=36;
-	if(istation==2 && iring==1)    max_cham=18;
-	if(istation==2 && iring==2)    max_cham=36;
-	if(istation==3 && iring==1)    max_cham=18;
-	if(istation==3 && iring==2)    max_cham=36;
-	if(istation==4 && iring==1)    max_cham=18;
-	
-	for(int ichamber=detId.minChamberId(); ichamber<=max_cham; ichamber++){
-	  for(int ilayer=detId.minLayerId(); ilayer<=detId.maxLayerId(); ilayer++){
-	    //station 1 ring 3 has 64 strips per layer instead of 80 
-	    if(istation==1 && iring==3)   max_istrip=64;
-	    
-	    std::vector<CSCGains::Item> itemvector;
-	    itemvector.resize(max_istrip);
-	    id_layer = 100000*iendcap + 10000*istation + 1000*iring + 10*ichamber + ilayer;
-	    
-	    for(int istrip=0;istrip<max_istrip;istrip++){
-	      //itemvector[istrip].gain_slope    = 7.55;
-	      //itemvector[istrip].gain_intercept= -10.00;
-	      //itemvector[istrip].gain_chi2     = 2.00;
-	      itemvector[istrip].gain_slope=((double)rand()/((double)(RAND_MAX)+(double)(1)))+mean;
-	      itemvector[istrip].gain_intercept=((double)rand()/((double)(RAND_MAX)+(double)(1)))+min;
-	      itemvector[istrip].gain_chi2=((double)rand()/((double)(RAND_MAX)+(double)(1)))+minchi;
-	      cngains->gains[id_layer]=itemvector;
-	    }
-	  }
-	}
+            for (int istrip = 0; istrip < max_istrip; istrip++) {
+              // itemvector[istrip].gain_slope    = 7.55;
+              // itemvector[istrip].gain_intercept= -10.00;
+              // itemvector[istrip].gain_chi2     = 2.00;
+              itemvector[istrip].gain_slope = ((double)rand() / ((double)(RAND_MAX) + (double)(1))) + mean;
+              itemvector[istrip].gain_intercept = ((double)rand() / ((double)(RAND_MAX) + (double)(1))) + min;
+              itemvector[istrip].gain_chi2 = ((double)rand() / ((double)(RAND_MAX) + (double)(1))) + minchi;
+              cngains->gains[id_layer] = itemvector;
+            }
+          }
+        }
       }
     }
   }
   return cngains;
-}  
+}
 
-CSCFakeGainsConditions::CSCFakeGainsConditions(const edm::ParameterSet& iConfig)
-{
-  //the following line is needed to tell the framework what
+CSCFakeGainsConditions::CSCFakeGainsConditions(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
-  setWhatProduced(this,&CSCFakeGainsConditions::produceGains);
+  setWhatProduced(this, &CSCFakeGainsConditions::produceGains);
   findingRecord<CSCGainsRcd>();
-  //now do what ever other initialization is needed
+  // now do what ever other initialization is needed
 }
 
-
-CSCFakeGainsConditions::~CSCFakeGainsConditions()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+CSCFakeGainsConditions::~CSCFakeGainsConditions() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CSCFakeGainsConditions::ReturnType
-CSCFakeGainsConditions::produceGains(const CSCGainsRcd& iRecord)
-{
-  return CSCFakeGainsConditions::ReturnType( prefillGains());
+CSCFakeGainsConditions::ReturnType CSCFakeGainsConditions::produceGains(const CSCGainsRcd &iRecord) {
+  return CSCFakeGainsConditions::ReturnType(prefillGains());
 }
 
- void CSCFakeGainsConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
- oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- 
- }
+void CSCFakeGainsConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                            const edm::IOVSyncValue &,
+                                            edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibMuon/CSCCalibration/plugins/CSCFakeNoiseMatrixConditions.cc b/CalibMuon/CSCCalibration/plugins/CSCFakeNoiseMatrixConditions.cc
index 8b785b4b8eceb..5430eba41a8b9 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCFakeNoiseMatrixConditions.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCFakeNoiseMatrixConditions.cc
@@ -1,198 +1,204 @@
 
 #include "CalibMuon/CSCCalibration/interface/CSCFakeNoiseMatrixConditions.h"
 
-CSCNoiseMatrix * CSCFakeNoiseMatrixConditions::prefillNoiseMatrix(){
-
-  const CSCDetId& detId = CSCDetId();
-  CSCNoiseMatrix * cnmatrix = new CSCNoiseMatrix();
-  
-  int max_istrip,id_layer,max_ring,max_cham;
-  //endcap=1 to 2,station=1 to 4, ring=1 to 4,chamber=1 to 36,layer=1 to 6 
-  
-  for(int iendcap=detId.minEndcapId(); iendcap<=detId.maxEndcapId(); iendcap++){
-    for(int istation=detId.minStationId() ; istation<=detId.maxStationId(); istation++){
-      max_ring=detId.maxRingId();
-      //station 4 ring 4 not there(36 chambers*2 missing)
-      //3 rings max this way of counting (ME1a & b)
-      if(istation==1)    max_ring=3;
-      if(istation==2)    max_ring=2;
-      if(istation==3)    max_ring=2;
-      if(istation==4)    max_ring=1;
-	
-      for(int iring=detId.minRingId(); iring<=max_ring; iring++){
-	max_istrip=80;
-	max_cham=detId.maxChamberId(); 
-	if(istation==1 && iring==1)    max_cham=36;
-	if(istation==1 && iring==2)    max_cham=36;
-	if(istation==1 && iring==3)    max_cham=36;
-	if(istation==2 && iring==1)    max_cham=18;
-	if(istation==2 && iring==2)    max_cham=36;
-	if(istation==3 && iring==1)    max_cham=18;
-	if(istation==3 && iring==2)    max_cham=36;
-	if(istation==4 && iring==1)    max_cham=18;
-	
-	for(int ichamber=detId.minChamberId(); ichamber<=max_cham; ichamber++){
-	  for(int ilayer=detId.minLayerId(); ilayer<=detId.maxLayerId(); ilayer++){
-	    //station 1 ring 3 has 64 strips per layer instead of 80 
-	    if(istation==1 && iring==3)   max_istrip=64;
-
-	    std::vector<CSCNoiseMatrix::Item> itemvector;
-	    itemvector.resize(max_istrip);
-	    id_layer = 100000*iendcap + 10000*istation + 1000*iring + 10*ichamber + ilayer;
-	    
-	    for(int istrip=0;istrip<max_istrip;istrip++){
-	      
-	      if(istation==1 && iring==1){
-		itemvector[istrip].elem33 = 7.86675;
-		itemvector[istrip].elem34 = 2.07075;
-		itemvector[istrip].elem44 = 6.93875;
-		itemvector[istrip].elem35 = 1.42525;
-		itemvector[istrip].elem45 = 2.51025;
-		itemvector[istrip].elem55 = 7.93975;
-		itemvector[istrip].elem46 = 0.94725;
-		itemvector[istrip].elem56 = 2.39275;
-		itemvector[istrip].elem66 = 6.46475;
-		itemvector[istrip].elem57 = 1.86325;
-		itemvector[istrip].elem67 = 2.08025;
-		itemvector[istrip].elem77 = 6.67975;
-		cnmatrix->matrix[id_layer]=itemvector;
-	      }
-
-	      if(istation==1 && iring==2){
-		itemvector[istrip].elem33 = 9.118;
-		itemvector[istrip].elem34 = 3.884;
-		itemvector[istrip].elem44 = 7.771;
-		itemvector[istrip].elem35 = 1.8225;
-		itemvector[istrip].elem45 = 3.7505;
-		itemvector[istrip].elem55 = 8.597;
-		itemvector[istrip].elem46 = 1.651;
-		itemvector[istrip].elem56 = 2.5225;
-		itemvector[istrip].elem66 = 6.583;
-		itemvector[istrip].elem57 = 1.5055;
-		itemvector[istrip].elem67 = 2.733;
-		itemvector[istrip].elem77 = 6.988;
-		cnmatrix->matrix[id_layer]=itemvector;
-	      }
-
-	      if(istation==1 && iring==3){
-		itemvector[istrip].elem33 = 9.5245;
-		itemvector[istrip].elem34 = 3.2415;
-		itemvector[istrip].elem44 = 7.6265;
-		itemvector[istrip].elem35 = 1.7225;
-		itemvector[istrip].elem45 = 3.6075;
-		itemvector[istrip].elem55 = 8.7275;
-		itemvector[istrip].elem46 = 1.663;
-		itemvector[istrip].elem56 = 2.592;
-		itemvector[istrip].elem66 = 7.5685;
-		itemvector[istrip].elem57 = 1.7905;
-		itemvector[istrip].elem67 = 2.409;
-		itemvector[istrip].elem77 = 7.1495;
-		cnmatrix->matrix[id_layer]=itemvector;
-	      }
-
-	      if(istation==2 && iring==1){
-		itemvector[istrip].elem33 = 9.06825;
-		itemvector[istrip].elem34 = 3.32025;
-		itemvector[istrip].elem44 = 7.52925;
-		itemvector[istrip].elem35 = 3.66125;
-		itemvector[istrip].elem45 = 3.39125;
-		itemvector[istrip].elem55 = 9.97625;
-		itemvector[istrip].elem46 = 1.32725;
-		itemvector[istrip].elem56 = 3.99025;
-		itemvector[istrip].elem66 = 8.10125;
-		itemvector[istrip].elem57 = 2.56456;
-		itemvector[istrip].elem67 = 2.96625;
-		itemvector[istrip].elem77 = 7.30925;
-		cnmatrix->matrix[id_layer]=itemvector;
-	      }	
-
-	      if(istation==2 &&iring==2){
-		itemvector[istrip].elem33 = 16.7442;
-		itemvector[istrip].elem34 = 7.96925;
-		itemvector[istrip].elem44 = 14.1643;
-		itemvector[istrip].elem35 = 4.67975;
-		itemvector[istrip].elem45 = 8.44075;
-		itemvector[istrip].elem55 = 17.2243;
-		itemvector[istrip].elem46 = 3.68575;
-		itemvector[istrip].elem56 = 7.48825;
-		itemvector[istrip].elem66 = 14.4902;
-		itemvector[istrip].elem57 = 4.4482;
-		itemvector[istrip].elem67 = 6.47875;
-		itemvector[istrip].elem77 = 14.6733;
-		cnmatrix->matrix[id_layer]=itemvector;
-	      }	
-
-	      if(istation==3 && iring==1){
-		itemvector[istrip].elem33 = 9.3495;
-		itemvector[istrip].elem34 = 3.529;
-		itemvector[istrip].elem44 = 7.8715;
-		itemvector[istrip].elem35 = 3.8155;
-		itemvector[istrip].elem45 = 3.858;
-		itemvector[istrip].elem55 = 10.8205;
-		itemvector[istrip].elem46 = 1.8585;
-		itemvector[istrip].elem56 = 4.445;
-		itemvector[istrip].elem66 = 8.0175;
-		itemvector[istrip].elem57 = 3.29479;
-		itemvector[istrip].elem67 = 3.625;
-		itemvector[istrip].elem77 = 8.3895;
-		cnmatrix->matrix[id_layer]=itemvector;
-	      }	
-	
-	      if(istation==3 && iring==2){
-		itemvector[istrip].elem33 = 13.6193;
-		itemvector[istrip].elem34 = 5.91025;
-		itemvector[istrip].elem44 = 11.3842;
-		itemvector[istrip].elem35 = 3.31775;
-		itemvector[istrip].elem45 = 5.69775;
-		itemvector[istrip].elem55 = 11.6652;
-		itemvector[istrip].elem46 = 2.46175;
-		itemvector[istrip].elem56 = 4.48325;
-		itemvector[istrip].elem66 = 9.95725;
-		itemvector[istrip].elem57 = 2.10561;
-		itemvector[istrip].elem67 = 4.04625;
-		itemvector[istrip].elem77 = 9.51625;
-		cnmatrix->matrix[id_layer]=itemvector;
-	      }	
-
-	      if(istation==4 && iring==1){
-		itemvector[istrip].elem33 = 10.0;
-		itemvector[istrip].elem34 = 4.0;
-		itemvector[istrip].elem44 = 10.0;
-		itemvector[istrip].elem35 = 3.0;
-		itemvector[istrip].elem45 = 8.0;
-		itemvector[istrip].elem55 = 10.0;
-		itemvector[istrip].elem46 = 2.0;
-		itemvector[istrip].elem56 = 5.0;
-		itemvector[istrip].elem66 = 10.0;
-		itemvector[istrip].elem57 = 3.0;
-		itemvector[istrip].elem67 = 4.0;
-		itemvector[istrip].elem77 = 10.0;
-		cnmatrix->matrix[id_layer]=itemvector;
-	      }
-	    }
-	  }
-	}
+CSCNoiseMatrix *CSCFakeNoiseMatrixConditions::prefillNoiseMatrix() {
+  const CSCDetId &detId = CSCDetId();
+  CSCNoiseMatrix *cnmatrix = new CSCNoiseMatrix();
+
+  int max_istrip, id_layer, max_ring, max_cham;
+  // endcap=1 to 2,station=1 to 4, ring=1 to 4,chamber=1 to 36,layer=1 to 6
+
+  for (int iendcap = detId.minEndcapId(); iendcap <= detId.maxEndcapId(); iendcap++) {
+    for (int istation = detId.minStationId(); istation <= detId.maxStationId(); istation++) {
+      max_ring = detId.maxRingId();
+      // station 4 ring 4 not there(36 chambers*2 missing)
+      // 3 rings max this way of counting (ME1a & b)
+      if (istation == 1)
+        max_ring = 3;
+      if (istation == 2)
+        max_ring = 2;
+      if (istation == 3)
+        max_ring = 2;
+      if (istation == 4)
+        max_ring = 1;
+
+      for (int iring = detId.minRingId(); iring <= max_ring; iring++) {
+        max_istrip = 80;
+        max_cham = detId.maxChamberId();
+        if (istation == 1 && iring == 1)
+          max_cham = 36;
+        if (istation == 1 && iring == 2)
+          max_cham = 36;
+        if (istation == 1 && iring == 3)
+          max_cham = 36;
+        if (istation == 2 && iring == 1)
+          max_cham = 18;
+        if (istation == 2 && iring == 2)
+          max_cham = 36;
+        if (istation == 3 && iring == 1)
+          max_cham = 18;
+        if (istation == 3 && iring == 2)
+          max_cham = 36;
+        if (istation == 4 && iring == 1)
+          max_cham = 18;
+
+        for (int ichamber = detId.minChamberId(); ichamber <= max_cham; ichamber++) {
+          for (int ilayer = detId.minLayerId(); ilayer <= detId.maxLayerId(); ilayer++) {
+            // station 1 ring 3 has 64 strips per layer instead of 80
+            if (istation == 1 && iring == 3)
+              max_istrip = 64;
+
+            std::vector<CSCNoiseMatrix::Item> itemvector;
+            itemvector.resize(max_istrip);
+            id_layer = 100000 * iendcap + 10000 * istation + 1000 * iring + 10 * ichamber + ilayer;
+
+            for (int istrip = 0; istrip < max_istrip; istrip++) {
+              if (istation == 1 && iring == 1) {
+                itemvector[istrip].elem33 = 7.86675;
+                itemvector[istrip].elem34 = 2.07075;
+                itemvector[istrip].elem44 = 6.93875;
+                itemvector[istrip].elem35 = 1.42525;
+                itemvector[istrip].elem45 = 2.51025;
+                itemvector[istrip].elem55 = 7.93975;
+                itemvector[istrip].elem46 = 0.94725;
+                itemvector[istrip].elem56 = 2.39275;
+                itemvector[istrip].elem66 = 6.46475;
+                itemvector[istrip].elem57 = 1.86325;
+                itemvector[istrip].elem67 = 2.08025;
+                itemvector[istrip].elem77 = 6.67975;
+                cnmatrix->matrix[id_layer] = itemvector;
+              }
+
+              if (istation == 1 && iring == 2) {
+                itemvector[istrip].elem33 = 9.118;
+                itemvector[istrip].elem34 = 3.884;
+                itemvector[istrip].elem44 = 7.771;
+                itemvector[istrip].elem35 = 1.8225;
+                itemvector[istrip].elem45 = 3.7505;
+                itemvector[istrip].elem55 = 8.597;
+                itemvector[istrip].elem46 = 1.651;
+                itemvector[istrip].elem56 = 2.5225;
+                itemvector[istrip].elem66 = 6.583;
+                itemvector[istrip].elem57 = 1.5055;
+                itemvector[istrip].elem67 = 2.733;
+                itemvector[istrip].elem77 = 6.988;
+                cnmatrix->matrix[id_layer] = itemvector;
+              }
+
+              if (istation == 1 && iring == 3) {
+                itemvector[istrip].elem33 = 9.5245;
+                itemvector[istrip].elem34 = 3.2415;
+                itemvector[istrip].elem44 = 7.6265;
+                itemvector[istrip].elem35 = 1.7225;
+                itemvector[istrip].elem45 = 3.6075;
+                itemvector[istrip].elem55 = 8.7275;
+                itemvector[istrip].elem46 = 1.663;
+                itemvector[istrip].elem56 = 2.592;
+                itemvector[istrip].elem66 = 7.5685;
+                itemvector[istrip].elem57 = 1.7905;
+                itemvector[istrip].elem67 = 2.409;
+                itemvector[istrip].elem77 = 7.1495;
+                cnmatrix->matrix[id_layer] = itemvector;
+              }
+
+              if (istation == 2 && iring == 1) {
+                itemvector[istrip].elem33 = 9.06825;
+                itemvector[istrip].elem34 = 3.32025;
+                itemvector[istrip].elem44 = 7.52925;
+                itemvector[istrip].elem35 = 3.66125;
+                itemvector[istrip].elem45 = 3.39125;
+                itemvector[istrip].elem55 = 9.97625;
+                itemvector[istrip].elem46 = 1.32725;
+                itemvector[istrip].elem56 = 3.99025;
+                itemvector[istrip].elem66 = 8.10125;
+                itemvector[istrip].elem57 = 2.56456;
+                itemvector[istrip].elem67 = 2.96625;
+                itemvector[istrip].elem77 = 7.30925;
+                cnmatrix->matrix[id_layer] = itemvector;
+              }
+
+              if (istation == 2 && iring == 2) {
+                itemvector[istrip].elem33 = 16.7442;
+                itemvector[istrip].elem34 = 7.96925;
+                itemvector[istrip].elem44 = 14.1643;
+                itemvector[istrip].elem35 = 4.67975;
+                itemvector[istrip].elem45 = 8.44075;
+                itemvector[istrip].elem55 = 17.2243;
+                itemvector[istrip].elem46 = 3.68575;
+                itemvector[istrip].elem56 = 7.48825;
+                itemvector[istrip].elem66 = 14.4902;
+                itemvector[istrip].elem57 = 4.4482;
+                itemvector[istrip].elem67 = 6.47875;
+                itemvector[istrip].elem77 = 14.6733;
+                cnmatrix->matrix[id_layer] = itemvector;
+              }
+
+              if (istation == 3 && iring == 1) {
+                itemvector[istrip].elem33 = 9.3495;
+                itemvector[istrip].elem34 = 3.529;
+                itemvector[istrip].elem44 = 7.8715;
+                itemvector[istrip].elem35 = 3.8155;
+                itemvector[istrip].elem45 = 3.858;
+                itemvector[istrip].elem55 = 10.8205;
+                itemvector[istrip].elem46 = 1.8585;
+                itemvector[istrip].elem56 = 4.445;
+                itemvector[istrip].elem66 = 8.0175;
+                itemvector[istrip].elem57 = 3.29479;
+                itemvector[istrip].elem67 = 3.625;
+                itemvector[istrip].elem77 = 8.3895;
+                cnmatrix->matrix[id_layer] = itemvector;
+              }
+
+              if (istation == 3 && iring == 2) {
+                itemvector[istrip].elem33 = 13.6193;
+                itemvector[istrip].elem34 = 5.91025;
+                itemvector[istrip].elem44 = 11.3842;
+                itemvector[istrip].elem35 = 3.31775;
+                itemvector[istrip].elem45 = 5.69775;
+                itemvector[istrip].elem55 = 11.6652;
+                itemvector[istrip].elem46 = 2.46175;
+                itemvector[istrip].elem56 = 4.48325;
+                itemvector[istrip].elem66 = 9.95725;
+                itemvector[istrip].elem57 = 2.10561;
+                itemvector[istrip].elem67 = 4.04625;
+                itemvector[istrip].elem77 = 9.51625;
+                cnmatrix->matrix[id_layer] = itemvector;
+              }
+
+              if (istation == 4 && iring == 1) {
+                itemvector[istrip].elem33 = 10.0;
+                itemvector[istrip].elem34 = 4.0;
+                itemvector[istrip].elem44 = 10.0;
+                itemvector[istrip].elem35 = 3.0;
+                itemvector[istrip].elem45 = 8.0;
+                itemvector[istrip].elem55 = 10.0;
+                itemvector[istrip].elem46 = 2.0;
+                itemvector[istrip].elem56 = 5.0;
+                itemvector[istrip].elem66 = 10.0;
+                itemvector[istrip].elem57 = 3.0;
+                itemvector[istrip].elem67 = 4.0;
+                itemvector[istrip].elem77 = 10.0;
+                cnmatrix->matrix[id_layer] = itemvector;
+              }
+            }
+          }
+        }
       }
     }
   }
   return cnmatrix;
 }
 
-CSCFakeNoiseMatrixConditions::CSCFakeNoiseMatrixConditions(const edm::ParameterSet& iConfig)
-{
-  
-  //tell the framework what data is being produced
-  setWhatProduced(this,&CSCFakeNoiseMatrixConditions::produceNoiseMatrix);
-  
+CSCFakeNoiseMatrixConditions::CSCFakeNoiseMatrixConditions(const edm::ParameterSet &iConfig) {
+  // tell the framework what data is being produced
+  setWhatProduced(this, &CSCFakeNoiseMatrixConditions::produceNoiseMatrix);
+
   findingRecord<CSCNoiseMatrixRcd>();
-  
-  //now do what ever other initialization is needed
-  
-}
 
+  // now do what ever other initialization is needed
+}
 
-CSCFakeNoiseMatrixConditions::~CSCFakeNoiseMatrixConditions()
-{
+CSCFakeNoiseMatrixConditions::~CSCFakeNoiseMatrixConditions() {
   // do anything here that needs to be done at destruction time
   // (e.g. close files, deallocate resources etc.)
 }
@@ -202,16 +208,13 @@ CSCFakeNoiseMatrixConditions::~CSCFakeNoiseMatrixConditions()
 //
 
 // ------------ method called to produce the data  ------------
-CSCFakeNoiseMatrixConditions::ReturnType
-CSCFakeNoiseMatrixConditions::produceNoiseMatrix(const CSCNoiseMatrixRcd& iRecord)
-{
-  return CSCFakeNoiseMatrixConditions::ReturnType( prefillNoiseMatrix());
+CSCFakeNoiseMatrixConditions::ReturnType CSCFakeNoiseMatrixConditions::produceNoiseMatrix(
+    const CSCNoiseMatrixRcd &iRecord) {
+  return CSCFakeNoiseMatrixConditions::ReturnType(prefillNoiseMatrix());
 }
 
-
-void CSCFakeNoiseMatrixConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
-						  edm::ValidityInterval & oValidity)
-{
-  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
-  
+void CSCFakeNoiseMatrixConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                                  const edm::IOVSyncValue &,
+                                                  edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
 }
diff --git a/CalibMuon/CSCCalibration/plugins/CSCFakePedestalsConditions.cc b/CalibMuon/CSCCalibration/plugins/CSCFakePedestalsConditions.cc
index 4dd82499315ab..54e6cf7029dd8 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCFakePedestalsConditions.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCFakePedestalsConditions.cc
@@ -1,94 +1,98 @@
 
 #include "CalibMuon/CSCCalibration/interface/CSCFakePedestalsConditions.h"
 
-CSCPedestals *  CSCFakePedestalsConditions::prefillPedestals()
-{
-  const CSCDetId& detId = CSCDetId();
-  CSCPedestals * cnpedestals = new CSCPedestals();
-  
-  int max_istrip,id_layer,max_ring,max_cham;
-  seed = 10000;	
+CSCPedestals *CSCFakePedestalsConditions::prefillPedestals() {
+  const CSCDetId &detId = CSCDetId();
+  CSCPedestals *cnpedestals = new CSCPedestals();
+
+  int max_istrip, id_layer, max_ring, max_cham;
+  seed = 10000;
   srand(seed);
-  meanped=600.0, meanrms=1.5, M=1000;
+  meanped = 600.0, meanrms = 1.5, M = 1000;
+
+  // endcap=1 to 2,station=1 to 4, ring=1 to 4,chamber=1 to 36,layer=1 to 6
+
+  for (int iendcap = detId.minEndcapId(); iendcap <= detId.maxEndcapId(); iendcap++) {
+    for (int istation = detId.minStationId(); istation <= detId.maxStationId(); istation++) {
+      max_ring = detId.maxRingId();
+      // station 4 ring 4 not there(36 chambers*2 missing)
+      // 3 rings max this way of counting (ME1a & b)
+      if (istation == 1)
+        max_ring = 3;
+      if (istation == 2)
+        max_ring = 2;
+      if (istation == 3)
+        max_ring = 2;
+      if (istation == 4)
+        max_ring = 1;
+
+      for (int iring = detId.minRingId(); iring <= max_ring; iring++) {
+        max_istrip = 80;
+        max_cham = detId.maxChamberId();
+        if (istation == 1 && iring == 1)
+          max_cham = 36;
+        if (istation == 1 && iring == 2)
+          max_cham = 36;
+        if (istation == 1 && iring == 3)
+          max_cham = 36;
+        if (istation == 2 && iring == 1)
+          max_cham = 18;
+        if (istation == 2 && iring == 2)
+          max_cham = 36;
+        if (istation == 3 && iring == 1)
+          max_cham = 18;
+        if (istation == 3 && iring == 2)
+          max_cham = 36;
+        if (istation == 4 && iring == 1)
+          max_cham = 18;
+
+        for (int ichamber = detId.minChamberId(); ichamber <= max_cham; ichamber++) {
+          for (int ilayer = detId.minLayerId(); ilayer <= detId.maxLayerId(); ilayer++) {
+            // station 1 ring 3 has 64 strips per layer instead of 80
+            if (istation == 1 && iring == 3)
+              max_istrip = 64;
 
-  //endcap=1 to 2,station=1 to 4, ring=1 to 4,chamber=1 to 36,layer=1 to 6 
-  
-  for(int iendcap=detId.minEndcapId(); iendcap<=detId.maxEndcapId(); iendcap++){
-    for(int istation=detId.minStationId() ; istation<=detId.maxStationId(); istation++){
-      max_ring=detId.maxRingId();
-      //station 4 ring 4 not there(36 chambers*2 missing)
-      //3 rings max this way of counting (ME1a & b)
-      if(istation==1)    max_ring=3;
-      if(istation==2)    max_ring=2;
-      if(istation==3)    max_ring=2;
-      if(istation==4)    max_ring=1;
-      
-      for(int iring=detId.minRingId(); iring<=max_ring; iring++){
-	max_istrip=80;
-	max_cham=detId.maxChamberId();  
-	if(istation==1 && iring==1)    max_cham=36;
-	if(istation==1 && iring==2)    max_cham=36;
-	if(istation==1 && iring==3)    max_cham=36;
-	if(istation==2 && iring==1)    max_cham=18;
-	if(istation==2 && iring==2)    max_cham=36;
-	if(istation==3 && iring==1)    max_cham=18;
-	if(istation==3 && iring==2)    max_cham=36;
-	if(istation==4 && iring==1)    max_cham=18;
-	
-	for(int ichamber=detId.minChamberId(); ichamber<=max_cham; ichamber++){
-	  for(int ilayer=detId.minLayerId(); ilayer<=detId.maxLayerId(); ilayer++){
-	    //station 1 ring 3 has 64 strips per layer instead of 80 
-	    if(istation==1 && iring==3)   max_istrip=64;
-	    
-	    std::vector<CSCPedestals::Item> itemvector;
-	    itemvector.resize(max_istrip);
-	    id_layer = 100000*iendcap + 10000*istation + 1000*iring + 10*ichamber + ilayer;
-	    
-	    for(int istrip=0;istrip<max_istrip;istrip++){
-	      itemvector[istrip].ped=((double)rand()/((double)(RAND_MAX)+(double)(1)))*100+meanped;
-	      itemvector[istrip].rms=((double)rand()/((double)(RAND_MAX)+(double)(1)))+meanrms;
-	      cnpedestals->pedestals[id_layer]=itemvector;
-	    }
-	  }
-	}
+            std::vector<CSCPedestals::Item> itemvector;
+            itemvector.resize(max_istrip);
+            id_layer = 100000 * iendcap + 10000 * istation + 1000 * iring + 10 * ichamber + ilayer;
+
+            for (int istrip = 0; istrip < max_istrip; istrip++) {
+              itemvector[istrip].ped = ((double)rand() / ((double)(RAND_MAX) + (double)(1))) * 100 + meanped;
+              itemvector[istrip].rms = ((double)rand() / ((double)(RAND_MAX) + (double)(1))) + meanrms;
+              cnpedestals->pedestals[id_layer] = itemvector;
+            }
+          }
+        }
       }
     }
   }
   return cnpedestals;
-}  
+}
 
-CSCFakePedestalsConditions::CSCFakePedestalsConditions(const edm::ParameterSet& iConfig)
-{
-  //the following line is needed to tell the framework what
+CSCFakePedestalsConditions::CSCFakePedestalsConditions(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
-  setWhatProduced(this,&CSCFakePedestalsConditions::producePedestals);
+  setWhatProduced(this, &CSCFakePedestalsConditions::producePedestals);
   findingRecord<CSCPedestalsRcd>();
-  //now do what ever other initialization is needed
+  // now do what ever other initialization is needed
 }
 
-
-CSCFakePedestalsConditions::~CSCFakePedestalsConditions()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+CSCFakePedestalsConditions::~CSCFakePedestalsConditions() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CSCFakePedestalsConditions::ReturnType
-CSCFakePedestalsConditions::producePedestals(const CSCPedestalsRcd& iRecord)
-{
-  return CSCFakePedestalsConditions::ReturnType( prefillPedestals());
+CSCFakePedestalsConditions::ReturnType CSCFakePedestalsConditions::producePedestals(const CSCPedestalsRcd &iRecord) {
+  return CSCFakePedestalsConditions::ReturnType(prefillPedestals());
 }
 
- void CSCFakePedestalsConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
- oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- 
- }
+void CSCFakePedestalsConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                                const edm::IOVSyncValue &,
+                                                edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibMuon/CSCCalibration/plugins/CSCGainsConditions.cc b/CalibMuon/CSCCalibration/plugins/CSCGainsConditions.cc
index 8250681764a60..48a31bc876d86 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCGainsConditions.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCGainsConditions.cc
@@ -3,43 +3,42 @@
 
 #include "CalibMuon/CSCCalibration/interface/CSCGainsConditions.h"
 
-CSCGains * CSCGainsConditions::prefillGains(){
-
-  float mean,min,minchi;
+CSCGains *CSCGainsConditions::prefillGains() {
+  float mean, min, minchi;
   int seed;
-  int old_chamber_id,old_strip,new_chamber_id,new_strip;
-  float old_gainslope,old_intercpt, old_chisq;
+  int old_chamber_id, old_strip, new_chamber_id, new_strip;
+  float old_gainslope, old_intercpt, old_chisq;
   std::vector<int> old_cham_id;
   std::vector<int> old_strips;
   std::vector<float> old_slope;
   std::vector<float> old_intercept;
   std::vector<float> old_chi2;
-  float new_gainslope,new_intercpt, new_chisq;
+  float new_gainslope, new_intercpt, new_chisq;
   std::vector<int> new_cham_id;
   std::vector<int> new_strips;
   std::vector<float> new_slope;
   std::vector<float> new_intercept;
   std::vector<float> new_chi2;
 
-  const CSCDetId& detId = CSCDetId();
-  CSCGains * cngains = new CSCGains();
-      
-  int max_istrip,id_layer,max_ring,max_cham;
-  unsigned int old_nrlines=0;
-  unsigned int new_nrlines=0;
-  seed = 10000;	
+  const CSCDetId &detId = CSCDetId();
+  CSCGains *cngains = new CSCGains();
+
+  int max_istrip, id_layer, max_ring, max_cham;
+  unsigned int old_nrlines = 0;
+  unsigned int new_nrlines = 0;
+  seed = 10000;
   srand(seed);
-  mean=6.8, min=-10.0, minchi=1.0;
+  mean = 6.8, min = -10.0, minchi = 1.0;
 
-  std::ifstream olddata; 
-  olddata.open("old_gains.dat",std::ios::in); 
-  if(!olddata) {
-    std::cerr <<"Error: old_gains.dat -> no such file!"<< std::endl;
+  std::ifstream olddata;
+  olddata.open("old_gains.dat", std::ios::in);
+  if (!olddata) {
+    std::cerr << "Error: old_gains.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!olddata.eof() ) { 
-    olddata >> old_chamber_id >> old_strip >> old_gainslope >> old_intercpt >> old_chisq ; 
+
+  while (!olddata.eof()) {
+    olddata >> old_chamber_id >> old_strip >> old_gainslope >> old_intercpt >> old_chisq;
     old_cham_id.push_back(old_chamber_id);
     old_strips.push_back(old_strip);
     old_slope.push_back(old_gainslope);
@@ -50,14 +49,14 @@ CSCGains * CSCGainsConditions::prefillGains(){
   olddata.close();
 
   std::ifstream newdata;
-  newdata.open("new_gains.txt",std::ios::in); 
-  if(!newdata) {
-    std::cerr <<"Error: new_gains.txt -> no such file!"<< std::endl;
+  newdata.open("new_gains.txt", std::ios::in);
+  if (!newdata) {
+    std::cerr << "Error: new_gains.txt -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!newdata.eof() ) { 
-    newdata >> new_chamber_id >> new_strip >> new_gainslope >> new_intercpt >> new_chisq ; 
+
+  while (!newdata.eof()) {
+    newdata >> new_chamber_id >> new_strip >> new_gainslope >> new_intercpt >> new_chisq;
     new_cham_id.push_back(new_chamber_id);
     new_strips.push_back(new_strip);
     new_slope.push_back(new_gainslope);
@@ -67,162 +66,169 @@ CSCGains * CSCGainsConditions::prefillGains(){
   }
   newdata.close();
 
-
-  //endcap=1 to 2,station=1 to 4, ring=1 to 4,chamber=1 to 36,layer=1 to 6 
-  for(int iendcap=detId.minEndcapId(); iendcap<=detId.maxEndcapId(); iendcap++){
-    for(int istation=detId.minStationId() ; istation<=detId.maxStationId(); istation++){
-      max_ring=detId.maxRingId();
-      //station 4 ring 4 not there(36 chambers*2 missing)
-      //3 rings max this way of counting (ME1a & b)
-      if(istation==1)    max_ring=3;
-      if(istation==2)    max_ring=2;
-      if(istation==3)    max_ring=2;
-      if(istation==4)    max_ring=1;
-      
-      for(int iring=detId.minRingId(); iring<=max_ring; iring++){
-	max_istrip=80;
-	max_cham=detId.maxChamberId();  
-	if(istation==1 && iring==1)    max_cham=36;
-	if(istation==1 && iring==2)    max_cham=36;
-	if(istation==1 && iring==3)    max_cham=36;
-	if(istation==2 && iring==1)    max_cham=18;
-	if(istation==2 && iring==2)    max_cham=36;
-	if(istation==3 && iring==1)    max_cham=18;
-	if(istation==3 && iring==2)    max_cham=36;
-	if(istation==4 && iring==1)    max_cham=18;
-	
-	for(int ichamber=detId.minChamberId(); ichamber<=max_cham; ichamber++){
-	  for(int ilayer=detId.minLayerId(); ilayer<=detId.maxLayerId(); ilayer++){
-	    //station 1 ring 3 has 64 strips per layer instead of 80 
-	    if(istation==1 && iring==3)   max_istrip=64;
-	    
-	    std::vector<CSCGains::Item> itemvector;
-	    itemvector.resize(max_istrip);
-	    id_layer = 100000*iendcap + 10000*istation + 1000*iring + 10*ichamber + ilayer;
-	    
-	    for(int istrip=0;istrip<max_istrip;istrip++){
-	      itemvector[istrip].gain_slope=((double)rand()/((double)(RAND_MAX)+(double)(1)))+mean;
-	      itemvector[istrip].gain_intercept=((double)rand()/((double)(RAND_MAX)+(double)(1)))+min;
-	      itemvector[istrip].gain_chi2=((double)rand()/((double)(RAND_MAX)+(double)(1)))+minchi;
-	      cngains->gains[id_layer]=itemvector;
-	    }
-	  }
-	}
+  // endcap=1 to 2,station=1 to 4, ring=1 to 4,chamber=1 to 36,layer=1 to 6
+  for (int iendcap = detId.minEndcapId(); iendcap <= detId.maxEndcapId(); iendcap++) {
+    for (int istation = detId.minStationId(); istation <= detId.maxStationId(); istation++) {
+      max_ring = detId.maxRingId();
+      // station 4 ring 4 not there(36 chambers*2 missing)
+      // 3 rings max this way of counting (ME1a & b)
+      if (istation == 1)
+        max_ring = 3;
+      if (istation == 2)
+        max_ring = 2;
+      if (istation == 3)
+        max_ring = 2;
+      if (istation == 4)
+        max_ring = 1;
+
+      for (int iring = detId.minRingId(); iring <= max_ring; iring++) {
+        max_istrip = 80;
+        max_cham = detId.maxChamberId();
+        if (istation == 1 && iring == 1)
+          max_cham = 36;
+        if (istation == 1 && iring == 2)
+          max_cham = 36;
+        if (istation == 1 && iring == 3)
+          max_cham = 36;
+        if (istation == 2 && iring == 1)
+          max_cham = 18;
+        if (istation == 2 && iring == 2)
+          max_cham = 36;
+        if (istation == 3 && iring == 1)
+          max_cham = 18;
+        if (istation == 3 && iring == 2)
+          max_cham = 36;
+        if (istation == 4 && iring == 1)
+          max_cham = 18;
+
+        for (int ichamber = detId.minChamberId(); ichamber <= max_cham; ichamber++) {
+          for (int ilayer = detId.minLayerId(); ilayer <= detId.maxLayerId(); ilayer++) {
+            // station 1 ring 3 has 64 strips per layer instead of 80
+            if (istation == 1 && iring == 3)
+              max_istrip = 64;
+
+            std::vector<CSCGains::Item> itemvector;
+            itemvector.resize(max_istrip);
+            id_layer = 100000 * iendcap + 10000 * istation + 1000 * iring + 10 * ichamber + ilayer;
+
+            for (int istrip = 0; istrip < max_istrip; istrip++) {
+              itemvector[istrip].gain_slope = ((double)rand() / ((double)(RAND_MAX) + (double)(1))) + mean;
+              itemvector[istrip].gain_intercept = ((double)rand() / ((double)(RAND_MAX) + (double)(1))) + min;
+              itemvector[istrip].gain_chi2 = ((double)rand() / ((double)(RAND_MAX) + (double)(1))) + minchi;
+              cngains->gains[id_layer] = itemvector;
+            }
+          }
+        }
       }
     }
   }
 
-  //overwrite fakes with old values from DB
+  // overwrite fakes with old values from DB
   int istrip = 0;
   std::vector<CSCGains::Item> itemvector;
   itemvector.resize(80);
-  
-  for(unsigned int mystrip=0; mystrip<old_nrlines-1; mystrip++){
-    if(old_strips[mystrip]==0) istrip = 0;
-    itemvector[istrip].gain_slope=old_slope[mystrip];
-    itemvector[istrip].gain_intercept=old_intercept[mystrip]; 
-    itemvector[istrip].gain_chi2=old_chi2[mystrip];
-    cngains->gains[old_cham_id[mystrip]]=itemvector;
+
+  for (unsigned int mystrip = 0; mystrip < old_nrlines - 1; mystrip++) {
+    if (old_strips[mystrip] == 0)
+      istrip = 0;
+    itemvector[istrip].gain_slope = old_slope[mystrip];
+    itemvector[istrip].gain_intercept = old_intercept[mystrip];
+    itemvector[istrip].gain_chi2 = old_chi2[mystrip];
+    cngains->gains[old_cham_id[mystrip]] = itemvector;
     istrip++;
-  }  
-  
-  
+  }
+
   itemvector.resize(64);
-  for(unsigned int mystrip=0; mystrip<old_nrlines-1; mystrip++){
-    if(old_strips[mystrip]==0) istrip = 0;
-    if(old_cham_id[mystrip] >= 113000 && old_cham_id[mystrip] <= 113999){
-      itemvector[istrip].gain_slope=old_slope[mystrip];
-      itemvector[istrip].gain_intercept=old_intercept[mystrip]; 
-      itemvector[istrip].gain_chi2=old_chi2[mystrip];
-      cngains->gains[old_cham_id[mystrip]]=itemvector;
+  for (unsigned int mystrip = 0; mystrip < old_nrlines - 1; mystrip++) {
+    if (old_strips[mystrip] == 0)
+      istrip = 0;
+    if (old_cham_id[mystrip] >= 113000 && old_cham_id[mystrip] <= 113999) {
+      itemvector[istrip].gain_slope = old_slope[mystrip];
+      itemvector[istrip].gain_intercept = old_intercept[mystrip];
+      itemvector[istrip].gain_chi2 = old_chi2[mystrip];
+      cngains->gains[old_cham_id[mystrip]] = itemvector;
       istrip++;
     }
-  } 
-  
+  }
+
   itemvector.resize(64);
-  for(unsigned int mystrip=0; mystrip<old_nrlines-1; mystrip++){
-    if(old_strips[mystrip]==0) istrip = 0;
-    if(old_cham_id[mystrip] >= 213000 && old_cham_id[mystrip] <= 213999){
-      itemvector[istrip].gain_slope=old_slope[mystrip];
-      itemvector[istrip].gain_intercept=old_intercept[mystrip]; 
-      itemvector[istrip].gain_chi2=old_chi2[mystrip];
-      cngains->gains[old_cham_id[mystrip]]=itemvector;
+  for (unsigned int mystrip = 0; mystrip < old_nrlines - 1; mystrip++) {
+    if (old_strips[mystrip] == 0)
+      istrip = 0;
+    if (old_cham_id[mystrip] >= 213000 && old_cham_id[mystrip] <= 213999) {
+      itemvector[istrip].gain_slope = old_slope[mystrip];
+      itemvector[istrip].gain_intercept = old_intercept[mystrip];
+      itemvector[istrip].gain_chi2 = old_chi2[mystrip];
+      cngains->gains[old_cham_id[mystrip]] = itemvector;
       istrip++;
     }
-  }   
-  
-  //overwrite old values with ones from new runs
+  }
+
+  // overwrite old values with ones from new runs
   itemvector.resize(80);
-  for(unsigned int mystrip=0; mystrip<new_nrlines-1; mystrip++){
-    if(new_strips[mystrip]==0) istrip = 0;
-    itemvector[istrip].gain_slope=new_slope[mystrip];
-    itemvector[istrip].gain_intercept=new_intercept[mystrip]; 
-    itemvector[istrip].gain_chi2=new_chi2[mystrip];
-    cngains->gains[new_cham_id[mystrip]]=itemvector;
+  for (unsigned int mystrip = 0; mystrip < new_nrlines - 1; mystrip++) {
+    if (new_strips[mystrip] == 0)
+      istrip = 0;
+    itemvector[istrip].gain_slope = new_slope[mystrip];
+    itemvector[istrip].gain_intercept = new_intercept[mystrip];
+    itemvector[istrip].gain_chi2 = new_chi2[mystrip];
+    cngains->gains[new_cham_id[mystrip]] = itemvector;
     istrip++;
   }
-    
+
   itemvector.resize(64);
-  for(unsigned int mystrip=0; mystrip<new_nrlines-1; mystrip++){
-    if(new_strips[mystrip]==0) istrip = 0;
-    if(new_cham_id[mystrip] >= 113000 && new_cham_id[mystrip] <= 113999){
-      itemvector[istrip].gain_slope=new_slope[mystrip];
-      itemvector[istrip].gain_intercept=new_intercept[mystrip]; 
-      itemvector[istrip].gain_chi2=new_chi2[mystrip];
-      cngains->gains[new_cham_id[mystrip]]=itemvector;
+  for (unsigned int mystrip = 0; mystrip < new_nrlines - 1; mystrip++) {
+    if (new_strips[mystrip] == 0)
+      istrip = 0;
+    if (new_cham_id[mystrip] >= 113000 && new_cham_id[mystrip] <= 113999) {
+      itemvector[istrip].gain_slope = new_slope[mystrip];
+      itemvector[istrip].gain_intercept = new_intercept[mystrip];
+      itemvector[istrip].gain_chi2 = new_chi2[mystrip];
+      cngains->gains[new_cham_id[mystrip]] = itemvector;
       istrip++;
     }
-  } 
-  
+  }
+
   itemvector.resize(64);
-  for(unsigned int mystrip=0; mystrip<new_nrlines-1; mystrip++){
-    if(new_strips[mystrip]==0) istrip = 0;
-    if(new_cham_id[mystrip] >= 213000 && new_cham_id[mystrip] <= 213999){
-      itemvector[istrip].gain_slope=new_slope[mystrip];
-      itemvector[istrip].gain_intercept=new_intercept[mystrip]; 
-      itemvector[istrip].gain_chi2=new_chi2[mystrip];
-      cngains->gains[new_cham_id[mystrip]]=itemvector;
+  for (unsigned int mystrip = 0; mystrip < new_nrlines - 1; mystrip++) {
+    if (new_strips[mystrip] == 0)
+      istrip = 0;
+    if (new_cham_id[mystrip] >= 213000 && new_cham_id[mystrip] <= 213999) {
+      itemvector[istrip].gain_slope = new_slope[mystrip];
+      itemvector[istrip].gain_intercept = new_intercept[mystrip];
+      itemvector[istrip].gain_chi2 = new_chi2[mystrip];
+      cngains->gains[new_cham_id[mystrip]] = itemvector;
       istrip++;
     }
-  } 
+  }
   return cngains;
 }
 
-
-CSCGainsConditions::CSCGainsConditions(const edm::ParameterSet& iConfig)
-{
-  //the following line is needed to tell the framework what
+CSCGainsConditions::CSCGainsConditions(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // added by Zhen (changed since 1_2_0)
-  setWhatProduced(this,&CSCGainsConditions::produceGains);
+  setWhatProduced(this, &CSCGainsConditions::produceGains);
   findingRecord<CSCGainsRcd>();
-  //now do what ever other initialization is needed
+  // now do what ever other initialization is needed
 }
 
-
-CSCGainsConditions::~CSCGainsConditions()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+CSCGainsConditions::~CSCGainsConditions() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CSCGainsConditions::ReturnType
-CSCGainsConditions::produceGains(const CSCGainsRcd& iRecord)
-{
+CSCGainsConditions::ReturnType CSCGainsConditions::produceGains(const CSCGainsRcd &iRecord) {
   // Added by Zhen, need a new object so to not be deleted at exit
-  return CSCGainsConditions::ReturnType( prefillGains());
-  
+  return CSCGainsConditions::ReturnType(prefillGains());
 }
 
- void CSCGainsConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
- oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- 
- }
+void CSCGainsConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                        const edm::IOVSyncValue &,
+                                        edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibMuon/CSCCalibration/plugins/CSCGainsDBConditions.cc b/CalibMuon/CSCCalibration/plugins/CSCGainsDBConditions.cc
index e188b49f929ce..1205a9341a632 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCGainsDBConditions.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCGainsDBConditions.cc
@@ -1,46 +1,36 @@
-#include <memory>
 #include <fstream>
+#include <memory>
 
+#include "CalibMuon/CSCCalibration/interface/CSCGainsDBConditions.h"
 #include "CondFormats/CSCObjects/interface/CSCDBGains.h"
 #include "CondFormats/DataRecord/interface/CSCDBGainsRcd.h"
-#include "CalibMuon/CSCCalibration/interface/CSCGainsDBConditions.h"
 
-
-CSCGainsDBConditions::CSCGainsDBConditions(const edm::ParameterSet& iConfig)
-{
-  //the following line is needed to tell the framework what
+CSCGainsDBConditions::CSCGainsDBConditions(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
   // added by Zhen (changed since 1_2_0)
-  setWhatProduced(this,&CSCGainsDBConditions::produceDBGains);
+  setWhatProduced(this, &CSCGainsDBConditions::produceDBGains);
   findingRecord<CSCDBGainsRcd>();
-  //now do what ever other initialization is needed
+  // now do what ever other initialization is needed
 }
 
-
-CSCGainsDBConditions::~CSCGainsDBConditions()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+CSCGainsDBConditions::~CSCGainsDBConditions() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CSCGainsDBConditions::ReturnType
-CSCGainsDBConditions::produceDBGains(const CSCDBGainsRcd& iRecord)
-{
-  //need a new object so to not be deleted at exit
-  return CSCGainsDBConditions::ReturnType( prefillDBGains());
-  
+CSCGainsDBConditions::ReturnType CSCGainsDBConditions::produceDBGains(const CSCDBGainsRcd &iRecord) {
+  // need a new object so to not be deleted at exit
+  return CSCGainsDBConditions::ReturnType(prefillDBGains());
 }
 
- void CSCGainsDBConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
- oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- 
- }
+void CSCGainsDBConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                          const edm::IOVSyncValue &,
+                                          edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibMuon/CSCCalibration/plugins/CSCGasGainCorrectionDBConditions.cc b/CalibMuon/CSCCalibration/plugins/CSCGasGainCorrectionDBConditions.cc
index b4f5bac26c53e..9853da531f921 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCGasGainCorrectionDBConditions.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCGasGainCorrectionDBConditions.cc
@@ -1,49 +1,39 @@
-#include <memory>
 #include <fstream>
+#include <memory>
 
+#include "CalibMuon/CSCCalibration/interface/CSCGasGainCorrectionDBConditions.h"
 #include "CondFormats/CSCObjects/interface/CSCDBGasGainCorrection.h"
 #include "CondFormats/DataRecord/interface/CSCDBGasGainCorrectionRcd.h"
-#include "CalibMuon/CSCCalibration/interface/CSCGasGainCorrectionDBConditions.h"
 
-
-CSCGasGainCorrectionDBConditions::CSCGasGainCorrectionDBConditions(const edm::ParameterSet& iConfig)
-{
-  //the following line is needed to tell the framework what
+CSCGasGainCorrectionDBConditions::CSCGasGainCorrectionDBConditions(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
-  isForMC = iConfig.getUntrackedParameter<bool>("isForMC",true);
-  dataCorrFileName= iConfig.getUntrackedParameter<std::string>("dataCorrFileName","empty.txt");
+  isForMC = iConfig.getUntrackedParameter<bool>("isForMC", true);
+  dataCorrFileName = iConfig.getUntrackedParameter<std::string>("dataCorrFileName", "empty.txt");
   // added by Zhen (changed since 1_2_0)
-  setWhatProduced(this,&CSCGasGainCorrectionDBConditions::produceDBGasGainCorrection);
+  setWhatProduced(this, &CSCGasGainCorrectionDBConditions::produceDBGasGainCorrection);
   findingRecord<CSCDBGasGainCorrectionRcd>();
-  //now do what ever other initialization is needed
-
+  // now do what ever other initialization is needed
 }
 
-
-CSCGasGainCorrectionDBConditions::~CSCGasGainCorrectionDBConditions()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+CSCGasGainCorrectionDBConditions::~CSCGasGainCorrectionDBConditions() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CSCGasGainCorrectionDBConditions::ReturnType
-CSCGasGainCorrectionDBConditions::produceDBGasGainCorrection(const CSCDBGasGainCorrectionRcd& iRecord)
-{
-  //need a new object so to not be deleted at exit
- return CSCGasGainCorrectionDBConditions::ReturnType( prefillDBGasGainCorrection(isForMC,dataCorrFileName));
-  
+CSCGasGainCorrectionDBConditions::ReturnType CSCGasGainCorrectionDBConditions::produceDBGasGainCorrection(
+    const CSCDBGasGainCorrectionRcd &iRecord) {
+  // need a new object so to not be deleted at exit
+  return CSCGasGainCorrectionDBConditions::ReturnType(prefillDBGasGainCorrection(isForMC, dataCorrFileName));
 }
 
-void CSCGasGainCorrectionDBConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
-							edm::ValidityInterval & oValidity)
-{
-  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
-  
+void CSCGasGainCorrectionDBConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                                      const edm::IOVSyncValue &,
+                                                      edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
 }
diff --git a/CalibMuon/CSCCalibration/plugins/CSCIndexerESProducer.cc b/CalibMuon/CSCCalibration/plugins/CSCIndexerESProducer.cc
index a9f708c5bcc19..add1eb18dc101 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCIndexerESProducer.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCIndexerESProducer.cc
@@ -5,25 +5,20 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-CSCIndexerESProducer::CSCIndexerESProducer(const edm::ParameterSet& pset)
-{
+CSCIndexerESProducer::CSCIndexerESProducer(const edm::ParameterSet &pset) {
   algoName = pset.getParameter<std::string>("AlgoName");
 
   LogTrace("CSCIndexerESProducer") << " will produce: " << algoName;
 
   setWhatProduced(this);
-
 }
 
-CSCIndexerESProducer::~CSCIndexerESProducer(){
-}
+CSCIndexerESProducer::~CSCIndexerESProducer() {}
 
-CSCIndexerESProducer::BSP_TYPE CSCIndexerESProducer::produce(const CSCIndexerRecord& )
-{
+CSCIndexerESProducer::BSP_TYPE CSCIndexerESProducer::produce(const CSCIndexerRecord &) {
   LogTrace("CSCIndexerESProducer") << " producing: " << algoName;
 
-  return CSCIndexerESProducer::BSP_TYPE( CSCIndexerFactory::get()->create(algoName));
-
+  return CSCIndexerESProducer::BSP_TYPE(CSCIndexerFactory::get()->create(algoName));
 }
 
 // define this as a plug-in
diff --git a/CalibMuon/CSCCalibration/plugins/CSCL1TPParameters.cc b/CalibMuon/CSCCalibration/plugins/CSCL1TPParameters.cc
index 07c3087ebdf84..9421c950cedb3 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCL1TPParameters.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCL1TPParameters.cc
@@ -1,46 +1,37 @@
-#include <memory>
 #include <fstream>
+#include <memory>
 
+#include "CalibMuon/CSCCalibration/interface/CSCL1TPParametersConditions.h"
 #include "CondFormats/CSCObjects/interface/CSCL1TPParameters.h"
 #include "CondFormats/DataRecord/interface/CSCL1TPParametersRcd.h"
-#include "CalibMuon/CSCCalibration/interface/CSCL1TPParametersConditions.h"
 
-
-CSCL1TPParametersConditions::CSCL1TPParametersConditions(const edm::ParameterSet& iConfig)
-{
-  //the following line is needed to tell the framework what
+CSCL1TPParametersConditions::CSCL1TPParametersConditions(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
   // added by Zhen (changed since 1_2_0)
-  setWhatProduced(this,&CSCL1TPParametersConditions::produceCSCL1TPParameters);
+  setWhatProduced(this, &CSCL1TPParametersConditions::produceCSCL1TPParameters);
   findingRecord<CSCL1TPParametersRcd>();
-  //now do what ever other initialization is needed
+  // now do what ever other initialization is needed
 }
 
-
-CSCL1TPParametersConditions::~CSCL1TPParametersConditions()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+CSCL1TPParametersConditions::~CSCL1TPParametersConditions() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CSCL1TPParametersConditions::ReturnType
-CSCL1TPParametersConditions::produceCSCL1TPParameters(const CSCL1TPParametersRcd& iRecord)
-{
-  //need a new object so to not be deleted at exit
-  return CSCL1TPParametersConditions::ReturnType( prefillCSCL1TPParameters());
-  
+CSCL1TPParametersConditions::ReturnType CSCL1TPParametersConditions::produceCSCL1TPParameters(
+    const CSCL1TPParametersRcd &iRecord) {
+  // need a new object so to not be deleted at exit
+  return CSCL1TPParametersConditions::ReturnType(prefillCSCL1TPParameters());
 }
 
- void CSCL1TPParametersConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
- oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- 
- }
+void CSCL1TPParametersConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                                 const edm::IOVSyncValue &,
+                                                 edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibMuon/CSCCalibration/plugins/CSCNoiseMatrixConditions.cc b/CalibMuon/CSCCalibration/plugins/CSCNoiseMatrixConditions.cc
index 75bc16d7291e4..5480f9b0de6db 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCNoiseMatrixConditions.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCNoiseMatrixConditions.cc
@@ -3,10 +3,9 @@
 
 #include "CalibMuon/CSCCalibration/interface/CSCNoiseMatrixConditions.h"
 
-CSCNoiseMatrix * CSCNoiseMatrixConditions::prefillNoiseMatrix(){
-  
-  int old_chamber_id,old_strip,new_chamber_id,new_strip;
-  float old_elm33,old_elm34, old_elm44, old_elm35, old_elm45, old_elm55;
+CSCNoiseMatrix *CSCNoiseMatrixConditions::prefillNoiseMatrix() {
+  int old_chamber_id, old_strip, new_chamber_id, new_strip;
+  float old_elm33, old_elm34, old_elm44, old_elm35, old_elm45, old_elm55;
   float old_elm46, old_elm56, old_elm66, old_elm57, old_elm67, old_elm77;
   std::vector<int> old_cham_id;
   std::vector<int> old_strips;
@@ -23,9 +22,8 @@ CSCNoiseMatrix * CSCNoiseMatrixConditions::prefillNoiseMatrix(){
   std::vector<float> old_elem67;
   std::vector<float> old_elem77;
 
-
-  float new_elm33,new_elm34, new_elm44, new_elm35, new_elm45, new_elm55;
-  float  new_elm46, new_elm56, new_elm66, new_elm57, new_elm67, new_elm77;
+  float new_elm33, new_elm34, new_elm44, new_elm35, new_elm45, new_elm55;
+  float new_elm46, new_elm56, new_elm66, new_elm57, new_elm67, new_elm77;
   std::vector<int> new_cham_id;
   std::vector<int> new_strips;
   std::vector<float> new_elem33;
@@ -41,22 +39,23 @@ CSCNoiseMatrix * CSCNoiseMatrixConditions::prefillNoiseMatrix(){
   std::vector<float> new_elem67;
   std::vector<float> new_elem77;
 
-  const CSCDetId& detId = CSCDetId();
-  CSCNoiseMatrix * cnmatrix = new CSCNoiseMatrix();
-  
-  int max_istrip,id_layer,max_ring,max_cham;
-  unsigned int old_nrlines=0;
-  unsigned int new_nrlines=0;
-
-  std::ifstream olddata; 
-  olddata.open("old_matrix.dat",std::ios::in); 
-  if(!olddata) {
-    std::cerr <<"Error: old_matrix.dat -> no such file!"<< std::endl;
+  const CSCDetId &detId = CSCDetId();
+  CSCNoiseMatrix *cnmatrix = new CSCNoiseMatrix();
+
+  int max_istrip, id_layer, max_ring, max_cham;
+  unsigned int old_nrlines = 0;
+  unsigned int new_nrlines = 0;
+
+  std::ifstream olddata;
+  olddata.open("old_matrix.dat", std::ios::in);
+  if (!olddata) {
+    std::cerr << "Error: old_matrix.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!olddata.eof() ) { 
-    olddata >> old_chamber_id >> old_strip >> old_elm33 >> old_elm34 >> old_elm44 >> old_elm35 >> old_elm45 >> old_elm55 >> old_elm46 >> old_elm56 >> old_elm66 >> old_elm57 >> old_elm67 >> old_elm77; 
+
+  while (!olddata.eof()) {
+    olddata >> old_chamber_id >> old_strip >> old_elm33 >> old_elm34 >> old_elm44 >> old_elm35 >> old_elm45 >>
+        old_elm55 >> old_elm46 >> old_elm56 >> old_elm66 >> old_elm57 >> old_elm67 >> old_elm77;
     old_cham_id.push_back(old_chamber_id);
     old_strips.push_back(old_strip);
     old_elem33.push_back(old_elm33);
@@ -77,14 +76,15 @@ CSCNoiseMatrix * CSCNoiseMatrixConditions::prefillNoiseMatrix(){
   olddata.close();
 
   std::ifstream newdata;
-  newdata.open("new_matrix.txt",std::ios::in); 
-  if(!newdata) {
-    std::cerr <<"Error: new_matrix.txt -> no such file!"<< std::endl;
+  newdata.open("new_matrix.txt", std::ios::in);
+  if (!newdata) {
+    std::cerr << "Error: new_matrix.txt -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!newdata.eof() ) { 
-    newdata >> new_chamber_id >> new_strip >> new_elm33 >> new_elm34 >> new_elm44 >> new_elm35 >> new_elm45 >> new_elm55 >> new_elm46 >> new_elm56 >> new_elm66 >> new_elm57 >> new_elm67 >> new_elm77 ; 
+
+  while (!newdata.eof()) {
+    newdata >> new_chamber_id >> new_strip >> new_elm33 >> new_elm34 >> new_elm44 >> new_elm35 >> new_elm45 >>
+        new_elm55 >> new_elm46 >> new_elm56 >> new_elm66 >> new_elm57 >> new_elm67 >> new_elm77;
     new_cham_id.push_back(new_chamber_id);
     new_strips.push_back(new_strip);
     new_elem33.push_back(new_elm33);
@@ -98,191 +98,202 @@ CSCNoiseMatrix * CSCNoiseMatrixConditions::prefillNoiseMatrix(){
     new_elem66.push_back(new_elm66);
     new_elem57.push_back(new_elm57);
     new_elem67.push_back(new_elm67);
-    new_elem77.push_back(new_elm77); 
+    new_elem77.push_back(new_elm77);
     new_nrlines++;
   }
   newdata.close();
 
+  // endcap=1 to 2,station=1 to 4, ring=1 to 4,chamber=1 to 36,layer=1 to 6
+
+  for (int iendcap = detId.minEndcapId(); iendcap <= detId.maxEndcapId(); iendcap++) {
+    for (int istation = detId.minStationId(); istation <= detId.maxStationId(); istation++) {
+      max_ring = detId.maxRingId();
+      // station 4 ring 4 not there(36 chambers*2 missing)
+      // 3 rings max this way of counting (ME1a & b)
+      if (istation == 1)
+        max_ring = 3;
+      if (istation == 2)
+        max_ring = 2;
+      if (istation == 3)
+        max_ring = 2;
+      if (istation == 4)
+        max_ring = 1;
+
+      for (int iring = detId.minRingId(); iring <= max_ring; iring++) {
+        max_istrip = 80;
+        max_cham = detId.maxChamberId();
+        if (istation == 1 && iring == 1)
+          max_cham = 36;
+        if (istation == 1 && iring == 2)
+          max_cham = 36;
+        if (istation == 1 && iring == 3)
+          max_cham = 36;
+        if (istation == 2 && iring == 1)
+          max_cham = 18;
+        if (istation == 2 && iring == 2)
+          max_cham = 36;
+        if (istation == 3 && iring == 1)
+          max_cham = 18;
+        if (istation == 3 && iring == 2)
+          max_cham = 36;
+        if (istation == 4 && iring == 1)
+          max_cham = 18;
+
+        for (int ichamber = detId.minChamberId(); ichamber <= max_cham; ichamber++) {
+          for (int ilayer = detId.minLayerId(); ilayer <= detId.maxLayerId(); ilayer++) {
+            // station 1 ring 3 has 64 strips per layer instead of 80
+            if (istation == 1 && iring == 3)
+              max_istrip = 64;
+
+            std::vector<CSCNoiseMatrix::Item> itemvector;
+            itemvector.resize(max_istrip);
+            id_layer = 100000 * iendcap + 10000 * istation + 1000 * iring + 10 * ichamber + ilayer;
+
+            for (int istrip = 0; istrip < max_istrip; istrip++) {
+              if (istation == 1 && iring == 1) {
+                itemvector[istrip].elem33 = 7.86675;
+                itemvector[istrip].elem34 = 2.07075;
+                itemvector[istrip].elem44 = 6.93875;
+                itemvector[istrip].elem35 = 1.42525;
+                itemvector[istrip].elem45 = 2.51025;
+                itemvector[istrip].elem55 = 7.93975;
+                itemvector[istrip].elem46 = 0.94725;
+                itemvector[istrip].elem56 = 2.39275;
+                itemvector[istrip].elem66 = 6.46475;
+                itemvector[istrip].elem57 = 1.86325;
+                itemvector[istrip].elem67 = 2.08025;
+                itemvector[istrip].elem77 = 6.67975;
+                cnmatrix->matrix[id_layer] = itemvector;
+              }
+
+              if (istation == 1 && iring == 2) {
+                itemvector[istrip].elem33 = 9.118;
+                itemvector[istrip].elem34 = 3.884;
+                itemvector[istrip].elem44 = 7.771;
+                itemvector[istrip].elem35 = 1.8225;
+                itemvector[istrip].elem45 = 3.7505;
+                itemvector[istrip].elem55 = 8.597;
+                itemvector[istrip].elem46 = 1.651;
+                itemvector[istrip].elem56 = 2.5225;
+                itemvector[istrip].elem66 = 6.583;
+                itemvector[istrip].elem57 = 1.5055;
+                itemvector[istrip].elem67 = 2.733;
+                itemvector[istrip].elem77 = 6.988;
+                cnmatrix->matrix[id_layer] = itemvector;
+              }
+
+              if (istation == 1 && iring == 3) {
+                itemvector[istrip].elem33 = 9.5245;
+                itemvector[istrip].elem34 = 3.2415;
+                itemvector[istrip].elem44 = 7.6265;
+                itemvector[istrip].elem35 = 1.7225;
+                itemvector[istrip].elem45 = 3.6075;
+                itemvector[istrip].elem55 = 8.7275;
+                itemvector[istrip].elem46 = 1.663;
+                itemvector[istrip].elem56 = 2.592;
+                itemvector[istrip].elem66 = 7.5685;
+                itemvector[istrip].elem57 = 1.7905;
+                itemvector[istrip].elem67 = 2.409;
+                itemvector[istrip].elem77 = 7.1495;
+                cnmatrix->matrix[id_layer] = itemvector;
+              }
+
+              if (istation == 2 && iring == 1) {
+                itemvector[istrip].elem33 = 9.06825;
+                itemvector[istrip].elem34 = 3.32025;
+                itemvector[istrip].elem44 = 7.52925;
+                itemvector[istrip].elem35 = 3.66125;
+                itemvector[istrip].elem45 = 3.39125;
+                itemvector[istrip].elem55 = 9.97625;
+                itemvector[istrip].elem46 = 1.32725;
+                itemvector[istrip].elem56 = 3.99025;
+                itemvector[istrip].elem66 = 8.10125;
+                itemvector[istrip].elem57 = 2.56456;
+                itemvector[istrip].elem67 = 2.96625;
+                itemvector[istrip].elem77 = 7.30925;
+                cnmatrix->matrix[id_layer] = itemvector;
+              }
+
+              if (istation == 2 && iring == 2) {
+                itemvector[istrip].elem33 = 16.7442;
+                itemvector[istrip].elem34 = 7.96925;
+                itemvector[istrip].elem44 = 14.1643;
+                itemvector[istrip].elem35 = 4.67975;
+                itemvector[istrip].elem45 = 8.44075;
+                itemvector[istrip].elem55 = 17.2243;
+                itemvector[istrip].elem46 = 3.68575;
+                itemvector[istrip].elem56 = 7.48825;
+                itemvector[istrip].elem66 = 14.4902;
+                itemvector[istrip].elem57 = 4.4482;
+                itemvector[istrip].elem67 = 6.47875;
+                itemvector[istrip].elem77 = 14.6733;
+                cnmatrix->matrix[id_layer] = itemvector;
+              }
+
+              if (istation == 3 && iring == 1) {
+                itemvector[istrip].elem33 = 9.3495;
+                itemvector[istrip].elem34 = 3.529;
+                itemvector[istrip].elem44 = 7.8715;
+                itemvector[istrip].elem35 = 3.8155;
+                itemvector[istrip].elem45 = 3.858;
+                itemvector[istrip].elem55 = 10.8205;
+                itemvector[istrip].elem46 = 1.8585;
+                itemvector[istrip].elem56 = 4.445;
+                itemvector[istrip].elem66 = 8.0175;
+                itemvector[istrip].elem57 = 3.29479;
+                itemvector[istrip].elem67 = 3.625;
+                itemvector[istrip].elem77 = 8.3895;
+                cnmatrix->matrix[id_layer] = itemvector;
+              }
 
+              if (istation == 3 && iring == 2) {
+                itemvector[istrip].elem33 = 13.6193;
+                itemvector[istrip].elem34 = 5.91025;
+                itemvector[istrip].elem44 = 11.3842;
+                itemvector[istrip].elem35 = 3.31775;
+                itemvector[istrip].elem45 = 5.69775;
+                itemvector[istrip].elem55 = 11.6652;
+                itemvector[istrip].elem46 = 2.46175;
+                itemvector[istrip].elem56 = 4.48325;
+                itemvector[istrip].elem66 = 9.95725;
+                itemvector[istrip].elem57 = 2.10561;
+                itemvector[istrip].elem67 = 4.04625;
+                itemvector[istrip].elem77 = 9.51625;
+                cnmatrix->matrix[id_layer] = itemvector;
+              }
 
-  //endcap=1 to 2,station=1 to 4, ring=1 to 4,chamber=1 to 36,layer=1 to 6 
-  
-  for(int iendcap=detId.minEndcapId(); iendcap<=detId.maxEndcapId(); iendcap++){
-    for(int istation=detId.minStationId() ; istation<=detId.maxStationId(); istation++){
-      max_ring=detId.maxRingId();
-      //station 4 ring 4 not there(36 chambers*2 missing)
-      //3 rings max this way of counting (ME1a & b)
-      if(istation==1)    max_ring=3;
-      if(istation==2)    max_ring=2;
-      if(istation==3)    max_ring=2;
-      if(istation==4)    max_ring=1;
-	
-      for(int iring=detId.minRingId(); iring<=max_ring; iring++){
-	max_istrip=80;
-	max_cham=detId.maxChamberId(); 
-	if(istation==1 && iring==1)    max_cham=36;
-	if(istation==1 && iring==2)    max_cham=36;
-	if(istation==1 && iring==3)    max_cham=36;
-	if(istation==2 && iring==1)    max_cham=18;
-	if(istation==2 && iring==2)    max_cham=36;
-	if(istation==3 && iring==1)    max_cham=18;
-	if(istation==3 && iring==2)    max_cham=36;
-	if(istation==4 && iring==1)    max_cham=18;
-	
-	for(int ichamber=detId.minChamberId(); ichamber<=max_cham; ichamber++){
-	  for(int ilayer=detId.minLayerId(); ilayer<=detId.maxLayerId(); ilayer++){
-	    //station 1 ring 3 has 64 strips per layer instead of 80 
-	    if(istation==1 && iring==3)   max_istrip=64;
-
-	    std::vector<CSCNoiseMatrix::Item> itemvector;
-	    itemvector.resize(max_istrip);
-	    id_layer = 100000*iendcap + 10000*istation + 1000*iring + 10*ichamber + ilayer;
-	    
-	    for(int istrip=0;istrip<max_istrip;istrip++){
-	      
-	      if(istation==1 && iring==1){
-		itemvector[istrip].elem33 = 7.86675;
-		itemvector[istrip].elem34 = 2.07075;
-		itemvector[istrip].elem44 = 6.93875;
-		itemvector[istrip].elem35 = 1.42525;
-		itemvector[istrip].elem45 = 2.51025;
-		itemvector[istrip].elem55 = 7.93975;
-		itemvector[istrip].elem46 = 0.94725;
-		itemvector[istrip].elem56 = 2.39275;
-		itemvector[istrip].elem66 = 6.46475;
-		itemvector[istrip].elem57 = 1.86325;
-		itemvector[istrip].elem67 = 2.08025;
-		itemvector[istrip].elem77 = 6.67975;
-		cnmatrix->matrix[id_layer]=itemvector;
-	      }
-
-	      if(istation==1 && iring==2){
-		itemvector[istrip].elem33 = 9.118;
-		itemvector[istrip].elem34 = 3.884;
-		itemvector[istrip].elem44 = 7.771;
-		itemvector[istrip].elem35 = 1.8225;
-		itemvector[istrip].elem45 = 3.7505;
-		itemvector[istrip].elem55 = 8.597;
-		itemvector[istrip].elem46 = 1.651;
-		itemvector[istrip].elem56 = 2.5225;
-		itemvector[istrip].elem66 = 6.583;
-		itemvector[istrip].elem57 = 1.5055;
-		itemvector[istrip].elem67 = 2.733;
-		itemvector[istrip].elem77 = 6.988;
-		cnmatrix->matrix[id_layer]=itemvector;
-	      }
-
-	      if(istation==1 && iring==3){
-		itemvector[istrip].elem33 = 9.5245;
-		itemvector[istrip].elem34 = 3.2415;
-		itemvector[istrip].elem44 = 7.6265;
-		itemvector[istrip].elem35 = 1.7225;
-		itemvector[istrip].elem45 = 3.6075;
-		itemvector[istrip].elem55 = 8.7275;
-		itemvector[istrip].elem46 = 1.663;
-		itemvector[istrip].elem56 = 2.592;
-		itemvector[istrip].elem66 = 7.5685;
-		itemvector[istrip].elem57 = 1.7905;
-		itemvector[istrip].elem67 = 2.409;
-		itemvector[istrip].elem77 = 7.1495;
-		cnmatrix->matrix[id_layer]=itemvector;
-	      }
-
-	      if(istation==2 && iring==1){
-		itemvector[istrip].elem33 = 9.06825;
-		itemvector[istrip].elem34 = 3.32025;
-		itemvector[istrip].elem44 = 7.52925;
-		itemvector[istrip].elem35 = 3.66125;
-		itemvector[istrip].elem45 = 3.39125;
-		itemvector[istrip].elem55 = 9.97625;
-		itemvector[istrip].elem46 = 1.32725;
-		itemvector[istrip].elem56 = 3.99025;
-		itemvector[istrip].elem66 = 8.10125;
-		itemvector[istrip].elem57 = 2.56456;
-		itemvector[istrip].elem67 = 2.96625;
-		itemvector[istrip].elem77 = 7.30925;
-		cnmatrix->matrix[id_layer]=itemvector;
-	      }	
-
-	      if(istation==2 &&iring==2){
-		itemvector[istrip].elem33 = 16.7442;
-		itemvector[istrip].elem34 = 7.96925;
-		itemvector[istrip].elem44 = 14.1643;
-		itemvector[istrip].elem35 = 4.67975;
-		itemvector[istrip].elem45 = 8.44075;
-		itemvector[istrip].elem55 = 17.2243;
-		itemvector[istrip].elem46 = 3.68575;
-		itemvector[istrip].elem56 = 7.48825;
-		itemvector[istrip].elem66 = 14.4902;
-		itemvector[istrip].elem57 = 4.4482;
-		itemvector[istrip].elem67 = 6.47875;
-		itemvector[istrip].elem77 = 14.6733;
-		cnmatrix->matrix[id_layer]=itemvector;
-	      }	
-
-	      if(istation==3 && iring==1){
-		itemvector[istrip].elem33 = 9.3495;
-		itemvector[istrip].elem34 = 3.529;
-		itemvector[istrip].elem44 = 7.8715;
-		itemvector[istrip].elem35 = 3.8155;
-		itemvector[istrip].elem45 = 3.858;
-		itemvector[istrip].elem55 = 10.8205;
-		itemvector[istrip].elem46 = 1.8585;
-		itemvector[istrip].elem56 = 4.445;
-		itemvector[istrip].elem66 = 8.0175;
-		itemvector[istrip].elem57 = 3.29479;
-		itemvector[istrip].elem67 = 3.625;
-		itemvector[istrip].elem77 = 8.3895;
-		cnmatrix->matrix[id_layer]=itemvector;
-	      }	
-	
-	      if(istation==3 && iring==2){
-		itemvector[istrip].elem33 = 13.6193;
-		itemvector[istrip].elem34 = 5.91025;
-		itemvector[istrip].elem44 = 11.3842;
-		itemvector[istrip].elem35 = 3.31775;
-		itemvector[istrip].elem45 = 5.69775;
-		itemvector[istrip].elem55 = 11.6652;
-		itemvector[istrip].elem46 = 2.46175;
-		itemvector[istrip].elem56 = 4.48325;
-		itemvector[istrip].elem66 = 9.95725;
-		itemvector[istrip].elem57 = 2.10561;
-		itemvector[istrip].elem67 = 4.04625;
-		itemvector[istrip].elem77 = 9.51625;
-		cnmatrix->matrix[id_layer]=itemvector;
-	      }	
-
-	      if(istation==4 && iring==1){
-		itemvector[istrip].elem33 = 10.0;
-		itemvector[istrip].elem34 = 4.0;
-		itemvector[istrip].elem44 = 10.0;
-		itemvector[istrip].elem35 = 3.0;
-		itemvector[istrip].elem45 = 8.0;
-		itemvector[istrip].elem55 = 10.0;
-		itemvector[istrip].elem46 = 2.0;
-		itemvector[istrip].elem56 = 5.0;
-		itemvector[istrip].elem66 = 10.0;
-		itemvector[istrip].elem57 = 3.0;
-		itemvector[istrip].elem67 = 4.0;
-		itemvector[istrip].elem77 = 10.0;
-		cnmatrix->matrix[id_layer]=itemvector;
-	      }
-	    }
-	  }
-	}
+              if (istation == 4 && iring == 1) {
+                itemvector[istrip].elem33 = 10.0;
+                itemvector[istrip].elem34 = 4.0;
+                itemvector[istrip].elem44 = 10.0;
+                itemvector[istrip].elem35 = 3.0;
+                itemvector[istrip].elem45 = 8.0;
+                itemvector[istrip].elem55 = 10.0;
+                itemvector[istrip].elem46 = 2.0;
+                itemvector[istrip].elem56 = 5.0;
+                itemvector[istrip].elem66 = 10.0;
+                itemvector[istrip].elem57 = 3.0;
+                itemvector[istrip].elem67 = 4.0;
+                itemvector[istrip].elem77 = 10.0;
+                cnmatrix->matrix[id_layer] = itemvector;
+              }
+            }
+          }
+        }
       }
     }
   }
 
-  //overwrite fakes with old values from DB
+  // overwrite fakes with old values from DB
   int istrip = 0;
   std::vector<CSCNoiseMatrix::Item> itemvector;
-  itemvector.resize(80); 
+  itemvector.resize(80);
 
-  for(unsigned int mystrip=0; mystrip<old_nrlines-1; mystrip++){
-    if(old_strips[mystrip]==0) istrip = 0;
+  for (unsigned int mystrip = 0; mystrip < old_nrlines - 1; mystrip++) {
+    if (old_strips[mystrip] == 0)
+      istrip = 0;
     itemvector[istrip].elem33 = old_elem33[mystrip];
-    itemvector[istrip].elem34 = old_elem34[mystrip]; 
+    itemvector[istrip].elem34 = old_elem34[mystrip];
     itemvector[istrip].elem44 = old_elem44[mystrip];
     itemvector[istrip].elem35 = old_elem35[mystrip];
     itemvector[istrip].elem45 = old_elem45[mystrip];
@@ -293,17 +304,17 @@ CSCNoiseMatrix * CSCNoiseMatrixConditions::prefillNoiseMatrix(){
     itemvector[istrip].elem57 = old_elem57[mystrip];
     itemvector[istrip].elem67 = old_elem67[mystrip];
     itemvector[istrip].elem77 = old_elem77[mystrip];
-    cnmatrix->matrix[old_cham_id[mystrip]]=itemvector;
+    cnmatrix->matrix[old_cham_id[mystrip]] = itemvector;
     istrip++;
-  }  
-  
-  
+  }
+
   itemvector.resize(64);
-  for(unsigned int mystrip=0; mystrip<old_nrlines-1; mystrip++){
-    if(old_strips[mystrip]==0) istrip = 0;
-    if(old_cham_id[mystrip] >= 113000 && old_cham_id[mystrip] <= 113999){
+  for (unsigned int mystrip = 0; mystrip < old_nrlines - 1; mystrip++) {
+    if (old_strips[mystrip] == 0)
+      istrip = 0;
+    if (old_cham_id[mystrip] >= 113000 && old_cham_id[mystrip] <= 113999) {
       itemvector[istrip].elem33 = old_elem33[mystrip];
-      itemvector[istrip].elem34 = old_elem34[mystrip]; 
+      itemvector[istrip].elem34 = old_elem34[mystrip];
       itemvector[istrip].elem44 = old_elem44[mystrip];
       itemvector[istrip].elem35 = old_elem35[mystrip];
       itemvector[istrip].elem45 = old_elem45[mystrip];
@@ -314,17 +325,18 @@ CSCNoiseMatrix * CSCNoiseMatrixConditions::prefillNoiseMatrix(){
       itemvector[istrip].elem57 = old_elem57[mystrip];
       itemvector[istrip].elem67 = old_elem67[mystrip];
       itemvector[istrip].elem77 = old_elem77[mystrip];
-      cnmatrix->matrix[old_cham_id[mystrip]]=itemvector;
+      cnmatrix->matrix[old_cham_id[mystrip]] = itemvector;
       istrip++;
     }
-  } 
-  
+  }
+
   itemvector.resize(64);
-  for(unsigned int mystrip=0; mystrip<old_nrlines-1; mystrip++){
-    if(old_strips[mystrip]==0) istrip = 0;
-    if(old_cham_id[mystrip] >= 213000 && old_cham_id[mystrip] <= 213999){
+  for (unsigned int mystrip = 0; mystrip < old_nrlines - 1; mystrip++) {
+    if (old_strips[mystrip] == 0)
+      istrip = 0;
+    if (old_cham_id[mystrip] >= 213000 && old_cham_id[mystrip] <= 213999) {
       itemvector[istrip].elem33 = old_elem33[mystrip];
-      itemvector[istrip].elem34 = old_elem34[mystrip]; 
+      itemvector[istrip].elem34 = old_elem34[mystrip];
       itemvector[istrip].elem44 = old_elem44[mystrip];
       itemvector[istrip].elem35 = old_elem35[mystrip];
       itemvector[istrip].elem45 = old_elem45[mystrip];
@@ -335,17 +347,18 @@ CSCNoiseMatrix * CSCNoiseMatrixConditions::prefillNoiseMatrix(){
       itemvector[istrip].elem57 = old_elem57[mystrip];
       itemvector[istrip].elem67 = old_elem67[mystrip];
       itemvector[istrip].elem77 = old_elem77[mystrip];
-      cnmatrix->matrix[old_cham_id[mystrip]]=itemvector;
+      cnmatrix->matrix[old_cham_id[mystrip]] = itemvector;
       istrip++;
     }
-  }   
-  
-  //overwrite old values with ones from new runs
+  }
+
+  // overwrite old values with ones from new runs
   itemvector.resize(80);
-  for(unsigned int mystrip=0; mystrip<new_nrlines-1; mystrip++){
-    if(new_strips[mystrip]==0) istrip = 0;
+  for (unsigned int mystrip = 0; mystrip < new_nrlines - 1; mystrip++) {
+    if (new_strips[mystrip] == 0)
+      istrip = 0;
     itemvector[istrip].elem33 = new_elem33[mystrip];
-    itemvector[istrip].elem34 = new_elem34[mystrip]; 
+    itemvector[istrip].elem34 = new_elem34[mystrip];
     itemvector[istrip].elem44 = new_elem44[mystrip];
     itemvector[istrip].elem35 = new_elem35[mystrip];
     itemvector[istrip].elem45 = new_elem45[mystrip];
@@ -356,16 +369,17 @@ CSCNoiseMatrix * CSCNoiseMatrixConditions::prefillNoiseMatrix(){
     itemvector[istrip].elem57 = new_elem57[mystrip];
     itemvector[istrip].elem67 = new_elem67[mystrip];
     itemvector[istrip].elem77 = new_elem77[mystrip];
-    cnmatrix->matrix[new_cham_id[mystrip]]=itemvector;
+    cnmatrix->matrix[new_cham_id[mystrip]] = itemvector;
     istrip++;
   }
-    
+
   itemvector.resize(64);
-  for(unsigned int mystrip=0; mystrip<new_nrlines-1; mystrip++){
-    if(new_strips[mystrip]==0) istrip = 0;
-    if(new_cham_id[mystrip] >= 113000 && new_cham_id[mystrip] <= 113999){
+  for (unsigned int mystrip = 0; mystrip < new_nrlines - 1; mystrip++) {
+    if (new_strips[mystrip] == 0)
+      istrip = 0;
+    if (new_cham_id[mystrip] >= 113000 && new_cham_id[mystrip] <= 113999) {
       itemvector[istrip].elem33 = new_elem33[mystrip];
-      itemvector[istrip].elem34 = new_elem34[mystrip]; 
+      itemvector[istrip].elem34 = new_elem34[mystrip];
       itemvector[istrip].elem44 = new_elem44[mystrip];
       itemvector[istrip].elem35 = new_elem35[mystrip];
       itemvector[istrip].elem45 = new_elem45[mystrip];
@@ -376,17 +390,18 @@ CSCNoiseMatrix * CSCNoiseMatrixConditions::prefillNoiseMatrix(){
       itemvector[istrip].elem57 = new_elem57[mystrip];
       itemvector[istrip].elem67 = new_elem67[mystrip];
       itemvector[istrip].elem77 = new_elem77[mystrip];
-      cnmatrix->matrix[new_cham_id[mystrip]]=itemvector;
+      cnmatrix->matrix[new_cham_id[mystrip]] = itemvector;
       istrip++;
     }
-  } 
-  
+  }
+
   itemvector.resize(64);
-  for(unsigned int mystrip=0; mystrip<new_nrlines-1; mystrip++){
-    if(new_strips[mystrip]==0) istrip = 0;
-    if(new_cham_id[mystrip] >= 213000 && new_cham_id[mystrip] <= 213999){
+  for (unsigned int mystrip = 0; mystrip < new_nrlines - 1; mystrip++) {
+    if (new_strips[mystrip] == 0)
+      istrip = 0;
+    if (new_cham_id[mystrip] >= 213000 && new_cham_id[mystrip] <= 213999) {
       itemvector[istrip].elem33 = new_elem33[mystrip];
-      itemvector[istrip].elem34 = new_elem34[mystrip]; 
+      itemvector[istrip].elem34 = new_elem34[mystrip];
       itemvector[istrip].elem44 = new_elem44[mystrip];
       itemvector[istrip].elem35 = new_elem35[mystrip];
       itemvector[istrip].elem45 = new_elem45[mystrip];
@@ -397,50 +412,39 @@ CSCNoiseMatrix * CSCNoiseMatrixConditions::prefillNoiseMatrix(){
       itemvector[istrip].elem57 = new_elem57[mystrip];
       itemvector[istrip].elem67 = new_elem67[mystrip];
       itemvector[istrip].elem77 = new_elem77[mystrip];
-      cnmatrix->matrix[new_cham_id[mystrip]]=itemvector;
+      cnmatrix->matrix[new_cham_id[mystrip]] = itemvector;
       istrip++;
     }
-  } 
+  }
   return cnmatrix;
-  
 }
 
-CSCNoiseMatrixConditions::CSCNoiseMatrixConditions(const edm::ParameterSet& iConfig)
-{
-  //the following line is needed to tell the framework what
+CSCNoiseMatrixConditions::CSCNoiseMatrixConditions(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
   // added by Zhen (changed since 1_2_0)
-  setWhatProduced(this,&CSCNoiseMatrixConditions::produceNoiseMatrix);
+  setWhatProduced(this, &CSCNoiseMatrixConditions::produceNoiseMatrix);
   findingRecord<CSCNoiseMatrixRcd>();
-  //now do what ever other initialization is needed
+  // now do what ever other initialization is needed
 }
 
-
-CSCNoiseMatrixConditions::~CSCNoiseMatrixConditions()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+CSCNoiseMatrixConditions::~CSCNoiseMatrixConditions() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CSCNoiseMatrixConditions::ReturnType
-CSCNoiseMatrixConditions::produceNoiseMatrix(const CSCNoiseMatrixRcd& iRecord)
-{
-    // Added by Zhen, need a new object so to not be deleted at exit
-    return CSCNoiseMatrixConditions::ReturnType( prefillNoiseMatrix());
-    
-
+CSCNoiseMatrixConditions::ReturnType CSCNoiseMatrixConditions::produceNoiseMatrix(const CSCNoiseMatrixRcd &iRecord) {
+  // Added by Zhen, need a new object so to not be deleted at exit
+  return CSCNoiseMatrixConditions::ReturnType(prefillNoiseMatrix());
 }
 
- void CSCNoiseMatrixConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
- oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- 
- }
+void CSCNoiseMatrixConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                              const edm::IOVSyncValue &,
+                                              edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibMuon/CSCCalibration/plugins/CSCNoiseMatrixDBConditions.cc b/CalibMuon/CSCCalibration/plugins/CSCNoiseMatrixDBConditions.cc
index db9b63d808837..654d7856e0b56 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCNoiseMatrixDBConditions.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCNoiseMatrixDBConditions.cc
@@ -1,45 +1,37 @@
-#include <memory>
 #include <fstream>
+#include <memory>
 
+#include "CalibMuon/CSCCalibration/interface/CSCNoiseMatrixDBConditions.h"
 #include "CondFormats/CSCObjects/interface/CSCDBNoiseMatrix.h"
 #include "CondFormats/DataRecord/interface/CSCDBNoiseMatrixRcd.h"
-#include "CalibMuon/CSCCalibration/interface/CSCNoiseMatrixDBConditions.h"
 
-CSCNoiseMatrixDBConditions::CSCNoiseMatrixDBConditions(const edm::ParameterSet& iConfig)
-{
-  //the following line is needed to tell the framework what
+CSCNoiseMatrixDBConditions::CSCNoiseMatrixDBConditions(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
   // added by Zhen (changed since 1_2_0)
-  setWhatProduced(this,&CSCNoiseMatrixDBConditions::produceDBNoiseMatrix);
+  setWhatProduced(this, &CSCNoiseMatrixDBConditions::produceDBNoiseMatrix);
   findingRecord<CSCDBNoiseMatrixRcd>();
-  //now do what ever other initialization is needed
+  // now do what ever other initialization is needed
 }
 
-
-CSCNoiseMatrixDBConditions::~CSCNoiseMatrixDBConditions()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+CSCNoiseMatrixDBConditions::~CSCNoiseMatrixDBConditions() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CSCNoiseMatrixDBConditions::ReturnType
-CSCNoiseMatrixDBConditions::produceDBNoiseMatrix(const CSCDBNoiseMatrixRcd& iRecord)
-{
-  //need a new object so to not be deleted at exit
-  return CSCNoiseMatrixDBConditions::ReturnType( prefillDBNoiseMatrix());
-  
+CSCNoiseMatrixDBConditions::ReturnType CSCNoiseMatrixDBConditions::produceDBNoiseMatrix(
+    const CSCDBNoiseMatrixRcd &iRecord) {
+  // need a new object so to not be deleted at exit
+  return CSCNoiseMatrixDBConditions::ReturnType(prefillDBNoiseMatrix());
 }
 
- void CSCNoiseMatrixDBConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
- oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- 
- }
+void CSCNoiseMatrixDBConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                                const edm::IOVSyncValue &,
+                                                edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibMuon/CSCCalibration/plugins/CSCPedestalsDBConditions.cc b/CalibMuon/CSCCalibration/plugins/CSCPedestalsDBConditions.cc
index 1d6f6d8a34341..768fe7641163a 100644
--- a/CalibMuon/CSCCalibration/plugins/CSCPedestalsDBConditions.cc
+++ b/CalibMuon/CSCCalibration/plugins/CSCPedestalsDBConditions.cc
@@ -1,46 +1,36 @@
-#include <memory>
 #include <fstream>
+#include <memory>
 
+#include "CalibMuon/CSCCalibration/interface/CSCPedestalsDBConditions.h"
 #include "CondFormats/CSCObjects/interface/CSCDBPedestals.h"
 #include "CondFormats/DataRecord/interface/CSCDBPedestalsRcd.h"
-#include "CalibMuon/CSCCalibration/interface/CSCPedestalsDBConditions.h"
 
-
-CSCPedestalsDBConditions::CSCPedestalsDBConditions(const edm::ParameterSet& iConfig)
-{
-  //the following line is needed to tell the framework what
+CSCPedestalsDBConditions::CSCPedestalsDBConditions(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
   // added by Zhen (changed since 1_2_0)
-  setWhatProduced(this,&CSCPedestalsDBConditions::produceDBPedestals);
+  setWhatProduced(this, &CSCPedestalsDBConditions::produceDBPedestals);
   findingRecord<CSCDBPedestalsRcd>();
-  //now do what ever other initialization is needed
+  // now do what ever other initialization is needed
 }
 
-
-CSCPedestalsDBConditions::~CSCPedestalsDBConditions()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+CSCPedestalsDBConditions::~CSCPedestalsDBConditions() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CSCPedestalsDBConditions::ReturnType
-CSCPedestalsDBConditions::produceDBPedestals(const CSCDBPedestalsRcd& iRecord)
-{
-  //need a new object so to not be deleted at exit
-  return CSCPedestalsDBConditions::ReturnType( prefillDBPedestals());
-  
+CSCPedestalsDBConditions::ReturnType CSCPedestalsDBConditions::produceDBPedestals(const CSCDBPedestalsRcd &iRecord) {
+  // need a new object so to not be deleted at exit
+  return CSCPedestalsDBConditions::ReturnType(prefillDBPedestals());
 }
 
- void CSCPedestalsDBConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &, const edm::IOVSyncValue&,
- edm::ValidityInterval & oValidity)
- {
- oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),edm::IOVSyncValue::endOfTime());
- 
- }
+void CSCPedestalsDBConditions::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                              const edm::IOVSyncValue &,
+                                              edm::ValidityInterval &oValidity) {
+  oValidity = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
+}
diff --git a/CalibMuon/CSCCalibration/plugins/SealModule.cc b/CalibMuon/CSCCalibration/plugins/SealModule.cc
index ef758d9800492..9e1dafc997b22 100644
--- a/CalibMuon/CSCCalibration/plugins/SealModule.cc
+++ b/CalibMuon/CSCCalibration/plugins/SealModule.cc
@@ -1,23 +1,22 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/SourceFactory.h"
-#include "CalibMuon/CSCCalibration/interface/CSCFakeGainsConditions.h"
-#include "CalibMuon/CSCCalibration/interface/CSCFakeDBGains.h"
+#include "CalibMuon/CSCCalibration/interface/CSCCrosstalkConditions.h"
+#include "CalibMuon/CSCCalibration/interface/CSCCrosstalkDBConditions.h"
 #include "CalibMuon/CSCCalibration/interface/CSCFakeCrosstalkConditions.h"
 #include "CalibMuon/CSCCalibration/interface/CSCFakeDBCrosstalk.h"
-#include "CalibMuon/CSCCalibration/interface/CSCFakePedestalsConditions.h"
+#include "CalibMuon/CSCCalibration/interface/CSCFakeDBGains.h"
+#include "CalibMuon/CSCCalibration/interface/CSCFakeDBNoiseMatrix.h"
 #include "CalibMuon/CSCCalibration/interface/CSCFakeDBPedestals.h"
+#include "CalibMuon/CSCCalibration/interface/CSCFakeGainsConditions.h"
 #include "CalibMuon/CSCCalibration/interface/CSCFakeNoiseMatrixConditions.h"
-#include "CalibMuon/CSCCalibration/interface/CSCFakeDBNoiseMatrix.h"
-#include "CalibMuon/CSCCalibration/interface/CSCCrosstalkConditions.h"
-#include "CalibMuon/CSCCalibration/interface/CSCCrosstalkDBConditions.h"
+#include "CalibMuon/CSCCalibration/interface/CSCFakePedestalsConditions.h"
 #include "CalibMuon/CSCCalibration/interface/CSCGainsConditions.h"
 #include "CalibMuon/CSCCalibration/interface/CSCGainsDBConditions.h"
+#include "CalibMuon/CSCCalibration/interface/CSCL1TPParametersConditions.h"
 #include "CalibMuon/CSCCalibration/interface/CSCNoiseMatrixConditions.h"
 #include "CalibMuon/CSCCalibration/interface/CSCNoiseMatrixDBConditions.h"
 #include "CalibMuon/CSCCalibration/interface/CSCPedestalsDBConditions.h"
-#include "CalibMuon/CSCCalibration/interface/CSCL1TPParametersConditions.h"
-
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/SourceFactory.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 
 DEFINE_FWK_EVENTSETUP_SOURCE(CSCFakeGainsConditions);
 DEFINE_FWK_EVENTSETUP_SOURCE(CSCFakeDBGains);
diff --git a/CalibMuon/CSCCalibration/plugins/modules.cc b/CalibMuon/CSCCalibration/plugins/modules.cc
index a85d32b6824c1..cd830f3658b54 100644
--- a/CalibMuon/CSCCalibration/plugins/modules.cc
+++ b/CalibMuon/CSCCalibration/plugins/modules.cc
@@ -1,11 +1,10 @@
 #include "CalibMuon/CSCCalibration/interface/CSCIndexerFactory.h"
-#include "CalibMuon/CSCCalibration/interface/CSCIndexerStartup.h"
 #include "CalibMuon/CSCCalibration/interface/CSCIndexerPostls1.h"
+#include "CalibMuon/CSCCalibration/interface/CSCIndexerStartup.h"
 
 #include "CalibMuon/CSCCalibration/interface/CSCChannelMapperFactory.h"
-#include "CalibMuon/CSCCalibration/interface/CSCChannelMapperStartup.h"
 #include "CalibMuon/CSCCalibration/interface/CSCChannelMapperPostls1.h"
-
+#include "CalibMuon/CSCCalibration/interface/CSCChannelMapperStartup.h"
 
 DEFINE_EDM_PLUGIN(CSCIndexerFactory, CSCIndexerStartup, "CSCIndexerStartup");
 DEFINE_EDM_PLUGIN(CSCIndexerFactory, CSCIndexerPostls1, "CSCIndexerPostls1");
diff --git a/CalibMuon/CSCCalibration/src/CSCChannelMapperPostls1.cc b/CalibMuon/CSCCalibration/src/CSCChannelMapperPostls1.cc
index 23675c1475748..a90d05cb06b53 100644
--- a/CalibMuon/CSCCalibration/src/CSCChannelMapperPostls1.cc
+++ b/CalibMuon/CSCCalibration/src/CSCChannelMapperPostls1.cc
@@ -1,51 +1,58 @@
 #include "CalibMuon/CSCCalibration/interface/CSCChannelMapperPostls1.h"
 
-int CSCChannelMapperPostls1::rawStripChannel( const CSCDetId& id, int igeo ) const {
-
+int CSCChannelMapperPostls1::rawStripChannel(const CSCDetId &id, int igeo) const {
   // Translate a geometry-oriented strip channel in range 1-80, igeo,
   // into corresponding raw channel.
 
   int iraw = igeo;
 
-  bool zplus = (id.endcap()==1);
+  bool zplus = (id.endcap() == 1);
 
-  bool me1a = (id.station()==1) && (id.ring()==4);
-  bool me1b = (id.station()==1) && (id.ring()==1);
+  bool me1a = (id.station() == 1) && (id.ring() == 4);
+  bool me1b = (id.station() == 1) && (id.ring() == 1);
 
-  if ( me1a && zplus ) { iraw = 49 - iraw; } // 1-48 -> 48-1
-  if ( me1b && !zplus) { iraw = 65 - iraw; }  // 1-64 -> 64-1
+  if (me1a && zplus) {
+    iraw = 49 - iraw;
+  }  // 1-48 -> 48-1
+  if (me1b && !zplus) {
+    iraw = 65 - iraw;
+  }  // 1-64 -> 64-1
 
   return iraw;
 }
 
-
-int CSCChannelMapperPostls1::geomStripChannel( const CSCDetId& id, int iraw ) const {
+int CSCChannelMapperPostls1::geomStripChannel(const CSCDetId &id, int iraw) const {
   // Translate a raw strip channel in range 1-80, iraw,  into
   // corresponding geometry-oriented channel in which increasing
   // channel number <-> strip number increasing with +ve local x.
 
   int igeo = iraw;
 
-  bool zplus = (id.endcap()==1);
-  bool me1a = (id.station()==1) && (id.ring()==4);
-  bool me1b = (id.station()==1) && (id.ring()==1);
+  bool zplus = (id.endcap() == 1);
+  bool me1a = (id.station() == 1) && (id.ring() == 4);
+  bool me1b = (id.station() == 1) && (id.ring() == 1);
 
-  if ( me1a && zplus ) { igeo = 49 - igeo; } // 1-48 -> 48-1
-  if ( me1b && !zplus) { igeo = 65 - igeo; }  // 1-64 -> 64-1
+  if (me1a && zplus) {
+    igeo = 49 - igeo;
+  }  // 1-48 -> 48-1
+  if (me1b && !zplus) {
+    igeo = 65 - igeo;
+  }  // 1-64 -> 64-1
 
   return igeo;
 }
 
-int CSCChannelMapperPostls1::channelFromStrip( const CSCDetId& id, int strip ) const {
-  // This just returns the electronics channel label to which a given strip is connected
-  // In all chambers (including upgraded ME1A) this is just a direct 1-1 correspondence.
+int CSCChannelMapperPostls1::channelFromStrip(const CSCDetId &id, int strip) const {
+  // This just returns the electronics channel label to which a given strip is
+  // connected In all chambers (including upgraded ME1A) this is just a direct
+  // 1-1 correspondence.
   int ichan = strip;
   return ichan;
 }
 
-CSCDetId CSCChannelMapperPostls1::rawCSCDetId( const CSCDetId& id ) const {
+CSCDetId CSCChannelMapperPostls1::rawCSCDetId(const CSCDetId &id) const {
   // Return the effective online CSCDetId for given offline CSCDetId
   // That means the same one (for upgraded ME1A)
-  CSCDetId idraw( id );
+  CSCDetId idraw(id);
   return idraw;
 }
diff --git a/CalibMuon/CSCCalibration/src/CSCChannelMapperStartup.cc b/CalibMuon/CSCCalibration/src/CSCChannelMapperStartup.cc
index 3a01a4fe6c27e..6822c9181fc30 100644
--- a/CalibMuon/CSCCalibration/src/CSCChannelMapperStartup.cc
+++ b/CalibMuon/CSCCalibration/src/CSCChannelMapperStartup.cc
@@ -1,60 +1,73 @@
 #include "CalibMuon/CSCCalibration/interface/CSCChannelMapperStartup.h"
 
-int CSCChannelMapperStartup::rawStripChannel( const CSCDetId& id, int igeo ) const {
-
+int CSCChannelMapperStartup::rawStripChannel(const CSCDetId &id, int igeo) const {
   // Translate a geometry-oriented strip channel in range 1-80, igeo,
   // into corresponding raw channel.
 
   int iraw = igeo;
 
-  bool zplus = (id.endcap()==1);
+  bool zplus = (id.endcap() == 1);
 
-  bool me1a = (id.station()==1) && (id.ring()==4);
-  bool me1b = (id.station()==1) && (id.ring()==1);
+  bool me1a = (id.station() == 1) && (id.ring() == 4);
+  bool me1b = (id.station() == 1) && (id.ring() == 1);
 
-  if ( me1a && zplus ) { iraw = 17 - iraw; } // 1-16 -> 16-1
-  if ( me1b && !zplus) { iraw = 65 - iraw; }  // 1-64 -> 64-1
-  if ( me1a ) { iraw += 64 ;} // set 1-16 to 65-80
+  if (me1a && zplus) {
+    iraw = 17 - iraw;
+  }  // 1-16 -> 16-1
+  if (me1b && !zplus) {
+    iraw = 65 - iraw;
+  }  // 1-64 -> 64-1
+  if (me1a) {
+    iraw += 64;
+  }  // set 1-16 to 65-80
 
   return iraw;
 }
 
-
-int CSCChannelMapperStartup::geomStripChannel( const CSCDetId& id, int iraw ) const {
+int CSCChannelMapperStartup::geomStripChannel(const CSCDetId &id, int iraw) const {
   // Translate a raw strip channel in range 1-80, iraw,  into
   // corresponding geometry-oriented channel in which increasing
   // channel number <-> strip number increasing with +ve local x.
 
   int igeo = iraw;
 
-  bool zplus = (id.endcap()==1);
-  bool me11 = (id.station()==1) && (id.ring()==1);
+  bool zplus = (id.endcap() == 1);
+  bool me11 = (id.station() == 1) && (id.ring() == 1);
   bool me1a = me11 && (iraw > 64);
   bool me1b = me11 && (iraw <= 64);
 
-  if ( me1a ) igeo -= 64; // 65-80 -> 1-16
-  //if ( me1a ) igeo %= 64; // 65-80 -> 1-16
-  if ( me1a && zplus ) { igeo = 17 - igeo; } // 65-80 -> 16-1
-  if ( me1b && !zplus) { igeo = 65 - igeo; }  // 1-64 -> 64-1
+  if (me1a)
+    igeo -= 64;  // 65-80 -> 1-16
+  // if ( me1a ) igeo %= 64; // 65-80 -> 1-16
+  if (me1a && zplus) {
+    igeo = 17 - igeo;
+  }  // 65-80 -> 16-1
+  if (me1b && !zplus) {
+    igeo = 65 - igeo;
+  }  // 1-64 -> 64-1
 
   return igeo;
 }
 
-int CSCChannelMapperStartup::channelFromStrip( const CSCDetId& id, int strip ) const {
-  // This just returns the electronics channel label to which a given strip is connected
-  // In all chambers but ME1A this is just a direct 1-1 correspondence.
-  // In ME1A the 48 strips are ganged into 16 channels: 1+17+33->1, 2+18+34->2, ... 16+32+48->16.
+int CSCChannelMapperStartup::channelFromStrip(const CSCDetId &id, int strip) const {
+  // This just returns the electronics channel label to which a given strip is
+  // connected In all chambers but ME1A this is just a direct 1-1
+  // correspondence. In ME1A the 48 strips are ganged into 16 channels:
+  // 1+17+33->1, 2+18+34->2, ... 16+32+48->16.
   int ichan = strip;
-  bool me1a = (id.station()==1) && (id.ring()==4);
-  if ( me1a && strip>16 ) ichan = (strip-1)%16 + 1; // gang the 48 to 16
+  bool me1a = (id.station() == 1) && (id.ring() == 4);
+  if (me1a && strip > 16)
+    ichan = (strip - 1) % 16 + 1;  // gang the 48 to 16
   return ichan;
 }
 
-CSCDetId CSCChannelMapperStartup::rawCSCDetId( const CSCDetId& id ) const {
+CSCDetId CSCChannelMapperStartup::rawCSCDetId(const CSCDetId &id) const {
   // Return the effective online CSCDetId for given offline CSCDetId
-  // That means the same one except for ME1A, which online is part of ME11 (channels 65-80)
-  CSCDetId idraw( id );
-  bool me1a = (id.station()==1) && (id.ring()==4);
-  if ( me1a ) idraw = CSCDetId( id.endcap(), id.station(), 1, id.chamber(), id.layer() );
+  // That means the same one except for ME1A, which online is part of ME11
+  // (channels 65-80)
+  CSCDetId idraw(id);
+  bool me1a = (id.station() == 1) && (id.ring() == 4);
+  if (me1a)
+    idraw = CSCDetId(id.endcap(), id.station(), 1, id.chamber(), id.layer());
   return idraw;
 }
diff --git a/CalibMuon/CSCCalibration/src/CSCConditions.cc b/CalibMuon/CSCCalibration/src/CSCConditions.cc
old mode 100755
new mode 100644
index 589414baa3a33..6d4693cb94fb4
--- a/CalibMuon/CSCCalibration/src/CSCConditions.cc
+++ b/CalibMuon/CSCCalibration/src/CSCConditions.cc
@@ -7,79 +7,89 @@
 #include "CalibMuon/CSCCalibration/interface/CSCChannelMapperBase.h"
 #include "CalibMuon/CSCCalibration/interface/CSCIndexerBase.h"
 
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/ESWatcher.h"
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/ESWatcher.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "CondFormats/DataRecord/interface/CSCDBChipSpeedCorrectionRcd.h"
 #include "CondFormats/DataRecord/interface/CSCChamberTimeCorrectionsRcd.h"
+#include "CondFormats/DataRecord/interface/CSCDBChipSpeedCorrectionRcd.h"
+#include "CondFormats/DataRecord/interface/CSCDBCrosstalkRcd.h"
 #include "CondFormats/DataRecord/interface/CSCDBGasGainCorrectionRcd.h"
-#include "CondFormats/DataRecord/interface/CSCDBPedestalsRcd.h"
 #include "CondFormats/DataRecord/interface/CSCDBNoiseMatrixRcd.h"
-#include "CondFormats/DataRecord/interface/CSCDBCrosstalkRcd.h"
+#include "CondFormats/DataRecord/interface/CSCDBPedestalsRcd.h"
 
-#include "CondFormats/CSCObjects/interface/CSCDBGains.h"
-#include "CondFormats/CSCObjects/interface/CSCDBPedestals.h"
-#include "CondFormats/CSCObjects/interface/CSCDBCrosstalk.h"
-#include "CondFormats/CSCObjects/interface/CSCDBChipSpeedCorrection.h"
 #include "CondFormats/CSCObjects/interface/CSCChamberTimeCorrections.h"
+#include "CondFormats/CSCObjects/interface/CSCDBChipSpeedCorrection.h"
+#include "CondFormats/CSCObjects/interface/CSCDBCrosstalk.h"
+#include "CondFormats/CSCObjects/interface/CSCDBGains.h"
 #include "CondFormats/CSCObjects/interface/CSCDBGasGainCorrection.h"
+#include "CondFormats/CSCObjects/interface/CSCDBPedestals.h"
 
 #include "CondFormats/DataRecord/interface/CSCBadChambersRcd.h"
 
+#include "CondFormats/CSCObjects/interface/CSCBadChambers.h"
 #include "CondFormats/CSCObjects/interface/CSCBadStrips.h"
 #include "CondFormats/CSCObjects/interface/CSCBadWires.h"
-#include "CondFormats/CSCObjects/interface/CSCBadChambers.h"
 
-CSCConditions::CSCConditions( const edm::ParameterSet& ps )
-: theGains(), theCrosstalk(), thePedestals(), theNoiseMatrix(),
-  theBadStrips(), theBadWires(), theBadChambers(),
-  theChipCorrections(), theChamberTimingCorrections(), theGasGainCorrections(),
-  indexer_(nullptr), mapper_(nullptr),
-  readBadChannels_(false), readBadChambers_(false),
-  useTimingCorrections_(false), useGasGainCorrections_(false), 
-  idOfBadChannelWords_(CSCDetId()), badStripWord_(0), badWireWord_(0), theAverageGain( -1.0 )
-{
+CSCConditions::CSCConditions(const edm::ParameterSet &ps)
+    : theGains(),
+      theCrosstalk(),
+      thePedestals(),
+      theNoiseMatrix(),
+      theBadStrips(),
+      theBadWires(),
+      theBadChambers(),
+      theChipCorrections(),
+      theChamberTimingCorrections(),
+      theGasGainCorrections(),
+      indexer_(nullptr),
+      mapper_(nullptr),
+      readBadChannels_(false),
+      readBadChambers_(false),
+      useTimingCorrections_(false),
+      useGasGainCorrections_(false),
+      idOfBadChannelWords_(CSCDetId()),
+      badStripWord_(0),
+      badWireWord_(0),
+      theAverageGain(-1.0) {
   readBadChannels_ = ps.getParameter<bool>("readBadChannels");
   readBadChambers_ = ps.getParameter<bool>("readBadChambers");
   useTimingCorrections_ = ps.getParameter<bool>("CSCUseTimingCorrections");
   useGasGainCorrections_ = ps.getParameter<bool>("CSCUseGasGainCorrections");
-
 }
 
+CSCConditions::~CSCConditions() {}
 
-CSCConditions::~CSCConditions(){}
-
-void CSCConditions::initializeEvent(const edm::EventSetup & es)
-{
+void CSCConditions::initializeEvent(const edm::EventSetup &es) {
   // Algorithms
-  es.get<CSCIndexerRecord>().get( indexer_ );
-  es.get<CSCChannelMapperRecord>().get( mapper_ );
+  es.get<CSCIndexerRecord>().get(indexer_);
+  es.get<CSCChannelMapperRecord>().get(mapper_);
 
   // Strip gains
-  es.get<CSCDBGainsRcd>().get( theGains );
+  es.get<CSCDBGainsRcd>().get(theGains);
   // Strip X-talk
-  es.get<CSCDBCrosstalkRcd>().get( theCrosstalk );
+  es.get<CSCDBCrosstalkRcd>().get(theCrosstalk);
   // Strip pedestals
-  es.get<CSCDBPedestalsRcd>().get( thePedestals );
+  es.get<CSCDBPedestalsRcd>().get(thePedestals);
   // Strip autocorrelation noise matrix
-  es.get<CSCDBNoiseMatrixRcd>().get( theNoiseMatrix );
+  es.get<CSCDBNoiseMatrixRcd>().get(theNoiseMatrix);
 
-  if ( useTimingCorrections()){
+  if (useTimingCorrections()) {
     // Buckeye chip speeds
-    es.get<CSCDBChipSpeedCorrectionRcd>().get( theChipCorrections );
-    // Cable lengths from chambers to peripheral crate and additional chamber level timing correction
-    es.get<CSCChamberTimeCorrectionsRcd>().get( theChamberTimingCorrections );
+    es.get<CSCDBChipSpeedCorrectionRcd>().get(theChipCorrections);
+    // Cable lengths from chambers to peripheral crate and additional chamber
+    // level timing correction
+    es.get<CSCChamberTimeCorrectionsRcd>().get(theChamberTimingCorrections);
   }
 
-  if ( readBadChannels() ) {
-  // Bad strip channels
-    es.get<CSCBadStripsRcd>().get( theBadStrips );
-  // Bad wiregroup channels
-    es.get<CSCBadWiresRcd>().get( theBadWires );
+  if (readBadChannels()) {
+    // Bad strip channels
+    es.get<CSCBadStripsRcd>().get(theBadStrips);
+    // Bad wiregroup channels
+    es.get<CSCBadWiresRcd>().get(theBadWires);
 
     //@@    if( badStripsWatcher_.check( es ) ) {
     //      fillBadStripWords();
@@ -87,262 +97,251 @@ void CSCConditions::initializeEvent(const edm::EventSetup & es)
     //@@    if( badWiresWatcher_.check( es ) ) {
     //      fillBadWireWords();
     //@    }
-
   }
 
   // Has GainsRcd changed?
-  if( gainsWatcher_.check( es ) ) { // Yes...
-    theAverageGain = -1.0; // ...reset, so next access will recalculate it
+  if (gainsWatcher_.check(es)) {  // Yes...
+    theAverageGain = -1.0;        // ...reset, so next access will recalculate it
   }
 
-  if ( readBadChambers() ) {
-  // Entire bad chambers
-    es.get<CSCBadChambersRcd>().get( theBadChambers );
+  if (readBadChambers()) {
+    // Entire bad chambers
+    es.get<CSCBadChambersRcd>().get(theBadChambers);
   }
 
-  if ( useGasGainCorrections()){
-    es.get<CSCDBGasGainCorrectionRcd>().get( theGasGainCorrections );
+  if (useGasGainCorrections()) {
+    es.get<CSCDBGasGainCorrectionRcd>().get(theGasGainCorrections);
   }
 
-//  print();
+  //  print();
 }
 
-void CSCConditions::fillBadChannelWords( const CSCDetId& id ) {
-
-  // input CSCDetId is expected to be an offline value i.e. different for ME1/1A and ME1/1B
+void CSCConditions::fillBadChannelWords(const CSCDetId &id) {
+  // input CSCDetId is expected to be an offline value i.e. different for ME1/1A
+  // and ME1/1B
 
   // Only update content if necessary
-  if ( id != idOfBadChannelWords() ) {
+  if (id != idOfBadChannelWords()) {
+    // store offline CSCDetId for the two bad channel words
+    setIdOfBadChannelWords(id);
 
-  // store offline CSCDetId for the two bad channel words
-    setIdOfBadChannelWords( id );
-
-  // reset to all zeroes
+    // reset to all zeroes
     badStripWord_.reset();
     badWireWord_.reset();
 
-    if ( readBadChannels() ) {
+    if (readBadChannels()) {
       // convert to online CSCDetId since that is how conditions data are stored
-      CSCDetId idraw  = mapper_->rawCSCDetId( id );
-      fillBadStripWord( idraw );
-      fillBadWireWord( idraw );
+      CSCDetId idraw = mapper_->rawCSCDetId(id);
+      fillBadStripWord(idraw);
+      fillBadWireWord(idraw);
     }
   }
 }
 
 /// Next function private
 
-void CSCConditions::fillBadStripWord( const CSCDetId& id ){
-
+void CSCConditions::fillBadStripWord(const CSCDetId &id) {
   // Input CSCDetId is expected to be a 'raw' value
 
-    // Find linear index of chamber for input CSCDetId
-    int inputIndex = indexer_->chamberIndex( id );
-    short inputLayer = id.layer();
-
-    // Does this chamber occur in bad channel list? If so, unpack its bad channels
-
-    // chambers is a vector<BadChamber>
-    // channels is a vector<BadChannel>
-    // Each BadChamber contains its index (1-468 or 540 w. ME42), the no. of bad channels,
-    // and the index within vector<BadChannel> where this chamber's bad channels start.
-
-    for ( size_t i=0; i<theBadStrips->chambers.size(); ++i ) { // loop over bad chambers
-      int indexc = theBadStrips->chambers[i].chamber_index;
-      if (indexc != inputIndex ) continue;  // next iteration if not a match
-
-      int start =  theBadStrips->chambers[i].pointer;
-      int nbad  =  theBadStrips->chambers[i].bad_channels;
-
-      for ( int j=start-1; j<start-1+nbad; ++j ) { // bad channels in this chamber
-        short lay  = theBadStrips->channels[j].layer;    // value 1-6
-	if ( lay != inputLayer ) continue;
-
-        short chan = theBadStrips->channels[j].channel;  // value 1-80 (->112 for unganged ME1/1A)
-    // Flags so far unused (and unset in conditins data)
-    //    short f1 = theBadStrips->channels[j].flag1;
-    //    short f2 = theBadStrips->channels[j].flag2;
-    //    short f3 = theBadStrips->channels[j].flag3;
-        badStripWord_.set( chan-1, true ); // set bit 0-79 (111) in 80 (112)-bit bitset representing this layer
-      } // j
-    } // i
-
+  // Find linear index of chamber for input CSCDetId
+  int inputIndex = indexer_->chamberIndex(id);
+  short inputLayer = id.layer();
+
+  // Does this chamber occur in bad channel list? If so, unpack its bad channels
+
+  // chambers is a vector<BadChamber>
+  // channels is a vector<BadChannel>
+  // Each BadChamber contains its index (1-468 or 540 w. ME42), the no. of bad
+  // channels, and the index within vector<BadChannel> where this chamber's bad
+  // channels start.
+
+  for (size_t i = 0; i < theBadStrips->chambers.size(); ++i) {  // loop over bad chambers
+    int indexc = theBadStrips->chambers[i].chamber_index;
+    if (indexc != inputIndex)
+      continue;  // next iteration if not a match
+
+    int start = theBadStrips->chambers[i].pointer;
+    int nbad = theBadStrips->chambers[i].bad_channels;
+
+    for (int j = start - 1; j < start - 1 + nbad; ++j) {  // bad channels in this chamber
+      short lay = theBadStrips->channels[j].layer;        // value 1-6
+      if (lay != inputLayer)
+        continue;
+
+      short chan = theBadStrips->channels[j].channel;  // value 1-80 (->112 for unganged ME1/1A)
+      // Flags so far unused (and unset in conditins data)
+      //    short f1 = theBadStrips->channels[j].flag1;
+      //    short f2 = theBadStrips->channels[j].flag2;
+      //    short f3 = theBadStrips->channels[j].flag3;
+      badStripWord_.set(chan - 1, true);  // set bit 0-79 (111) in 80 (112)-bit
+                                          // bitset representing this layer
+    }                                     // j
+  }                                       // i
 }
 
-void CSCConditions::fillBadWireWord( const CSCDetId& id ){
-
+void CSCConditions::fillBadWireWord(const CSCDetId &id) {
   // Input CSCDetId is expected to be a 'raw' value
 
-    // Find linear index of chamber for input CSCDetId
-    int inputIndex = indexer_->chamberIndex( id );
-    short inputLayer = id.layer();
-
-    // unpack what we've read from theBadWires
+  // Find linear index of chamber for input CSCDetId
+  int inputIndex = indexer_->chamberIndex(id);
+  short inputLayer = id.layer();
 
-    for ( size_t i=0; i<theBadWires->chambers.size(); ++i ) { // loop over bad chambers
-      int indexc = theBadWires->chambers[i].chamber_index;
+  // unpack what we've read from theBadWires
 
-      if (indexc != inputIndex ) continue;  // next iteration if not a match
+  for (size_t i = 0; i < theBadWires->chambers.size(); ++i) {  // loop over bad chambers
+    int indexc = theBadWires->chambers[i].chamber_index;
 
-      int start =  theBadWires->chambers[i].pointer;
-      int nbad  =  theBadWires->chambers[i].bad_channels;
+    if (indexc != inputIndex)
+      continue;  // next iteration if not a match
 
-      for ( int j=start-1; j<start-1+nbad; ++j ) { // bad channels in this chamber
-        short lay  = theBadWires->channels[j].layer;    // value 1-6
-	if ( lay != inputLayer ) continue;
+    int start = theBadWires->chambers[i].pointer;
+    int nbad = theBadWires->chambers[i].bad_channels;
 
-        short chan = theBadWires->channels[j].channel;  // value 1-112
-    //    short f1 = theBadWires->channels[j].flag1;
-    //    short f2 = theBadWires->channels[j].flag2;
-    //    short f3 = theBadWires->channels[j].flag3;
-        badWireWord_.set( chan-1, true ); // set bit 0-111 in 112-bit bitset representing this layer
-      } // j
-    } // i
+    for (int j = start - 1; j < start - 1 + nbad; ++j) {  // bad channels in this chamber
+      short lay = theBadWires->channels[j].layer;         // value 1-6
+      if (lay != inputLayer)
+        continue;
 
+      short chan = theBadWires->channels[j].channel;  // value 1-112
+      //    short f1 = theBadWires->channels[j].flag1;
+      //    short f2 = theBadWires->channels[j].flag2;
+      //    short f3 = theBadWires->channels[j].flag3;
+      badWireWord_.set(chan - 1,
+                       true);  // set bit 0-111 in 112-bit bitset representing this layer
+    }                          // j
+  }                            // i
 }
 
-bool CSCConditions::isInBadChamber( const CSCDetId& id ) const {
-  //@@ We do not consider the possibility of having ME1/1A & ME1/1B independently 'bad'.
-  //@@ To do that we would need to define separate chamber indexes for ME1/1A & ME1/1B.
-
-  if ( readBadChambers() )  {
-    CSCDetId idraw  = mapper_->rawCSCDetId( id );
-    int index = indexer_->chamberIndex( idraw );
-    return theBadChambers->isInBadChamber( index );
-  }
-  else return false;
+bool CSCConditions::isInBadChamber(const CSCDetId &id) const {
+  //@@ We do not consider the possibility of having ME1/1A & ME1/1B
+  // independently 'bad'.
+  //@@ To do that we would need to define separate chamber indexes for ME1/1A &
+  // ME1/1B.
+
+  if (readBadChambers()) {
+    CSCDetId idraw = mapper_->rawCSCDetId(id);
+    int index = indexer_->chamberIndex(idraw);
+    return theBadChambers->isInBadChamber(index);
+  } else
+    return false;
 }
 
-float CSCConditions::gain(const CSCDetId & id, int geomChannel) const
-{
+float CSCConditions::gain(const CSCDetId &id, int geomChannel) const {
   assert(theGains.isValid());
-  CSCDetId idraw  = mapper_->rawCSCDetId( id );
-  int iraw        = mapper_->rawStripChannel( id, geomChannel );
-  int index       = indexer_->stripChannelIndex( idraw, iraw ) - 1; // NOTE THE MINUS ONE!
-  return float( theGains->gain(index) ) /theGains->scale();
+  CSCDetId idraw = mapper_->rawCSCDetId(id);
+  int iraw = mapper_->rawStripChannel(id, geomChannel);
+  int index = indexer_->stripChannelIndex(idraw, iraw) - 1;  // NOTE THE MINUS ONE!
+  return float(theGains->gain(index)) / theGains->scale();
 }
 
-float CSCConditions::pedestal(const CSCDetId & id, int geomChannel) const
-{
+float CSCConditions::pedestal(const CSCDetId &id, int geomChannel) const {
   assert(thePedestals.isValid());
-  CSCDetId idraw  = mapper_->rawCSCDetId( id );
-  int iraw        = mapper_->rawStripChannel( id, geomChannel );
-  int index       = indexer_->stripChannelIndex( idraw, iraw ) - 1; // NOTE THE MINUS ONE!
-  return float( thePedestals->pedestal(index) )/thePedestals->scale_ped();
+  CSCDetId idraw = mapper_->rawCSCDetId(id);
+  int iraw = mapper_->rawStripChannel(id, geomChannel);
+  int index = indexer_->stripChannelIndex(idraw, iraw) - 1;  // NOTE THE MINUS ONE!
+  return float(thePedestals->pedestal(index)) / thePedestals->scale_ped();
 }
 
-
-float CSCConditions::pedestalSigma(const CSCDetId& id, int geomChannel) const
-{
+float CSCConditions::pedestalSigma(const CSCDetId &id, int geomChannel) const {
   assert(thePedestals.isValid());
-  CSCDetId idraw  = mapper_->rawCSCDetId( id );
-  int iraw        = mapper_->rawStripChannel( id, geomChannel );
-  int index       = indexer_->stripChannelIndex( idraw, iraw ) - 1; // NOTE THE MINUS ONE!
-  return float( thePedestals->pedestal_rms(index) )/thePedestals->scale_rms();
+  CSCDetId idraw = mapper_->rawCSCDetId(id);
+  int iraw = mapper_->rawStripChannel(id, geomChannel);
+  int index = indexer_->stripChannelIndex(idraw, iraw) - 1;  // NOTE THE MINUS ONE!
+  return float(thePedestals->pedestal_rms(index)) / thePedestals->scale_rms();
 }
 
-
-float CSCConditions::crosstalkIntercept(const CSCDetId& id, int geomChannel, bool leftRight) const
-{
+float CSCConditions::crosstalkIntercept(const CSCDetId &id, int geomChannel, bool leftRight) const {
   assert(theCrosstalk.isValid());
-  CSCDetId idraw  = mapper_->rawCSCDetId( id );
-  int iraw        = mapper_->rawStripChannel( id, geomChannel );
-  int index       = indexer_->stripChannelIndex( idraw, iraw ) - 1; // NOTE THE MINUS ONE!
+  CSCDetId idraw = mapper_->rawCSCDetId(id);
+  int iraw = mapper_->rawStripChannel(id, geomChannel);
+  int index = indexer_->stripChannelIndex(idraw, iraw) - 1;  // NOTE THE MINUS ONE!
   // resistive fraction is at the peak, where t=0
-  return leftRight ? float ( theCrosstalk->rinter(index) )/theCrosstalk->iscale()
-                   : float ( theCrosstalk->linter(index) )/theCrosstalk->iscale() ;
+  return leftRight ? float(theCrosstalk->rinter(index)) / theCrosstalk->iscale()
+                   : float(theCrosstalk->linter(index)) / theCrosstalk->iscale();
 }
 
-
-float CSCConditions::crosstalkSlope(const CSCDetId& id, int geomChannel, bool leftRight) const
-{
+float CSCConditions::crosstalkSlope(const CSCDetId &id, int geomChannel, bool leftRight) const {
   assert(theCrosstalk.isValid());
-  CSCDetId idraw  = mapper_->rawCSCDetId( id );
-  int iraw        = mapper_->rawStripChannel( id, geomChannel );
-  int index       = indexer_->stripChannelIndex( idraw, iraw ) - 1; // NOTE THE MINUS ONE!
+  CSCDetId idraw = mapper_->rawCSCDetId(id);
+  int iraw = mapper_->rawStripChannel(id, geomChannel);
+  int index = indexer_->stripChannelIndex(idraw, iraw) - 1;  // NOTE THE MINUS ONE!
   // resistive fraction is at the peak, where t=0
-  return leftRight ? float ( theCrosstalk->rslope(index) )/theCrosstalk->sscale()
-                   : float ( theCrosstalk->lslope(index) )/theCrosstalk->sscale() ;
+  return leftRight ? float(theCrosstalk->rslope(index)) / theCrosstalk->sscale()
+                   : float(theCrosstalk->lslope(index)) / theCrosstalk->sscale();
 }
 
-const CSCDBNoiseMatrix::Item & CSCConditions::noiseMatrix(const CSCDetId& id, int geomChannel) const
-{
-  //@@ BEWARE - THIS FUNCTION DOES NOT APPLY SCALE FACTOR USED IN PACKING VALUES IN CONDITIONS DATA
+const CSCDBNoiseMatrix::Item &CSCConditions::noiseMatrix(const CSCDetId &id, int geomChannel) const {
+  //@@ BEWARE - THIS FUNCTION DOES NOT APPLY SCALE FACTOR USED IN PACKING VALUES
+  // IN CONDITIONS DATA
   //@@ MAY BE AN ERROR? WHO WOULD WANT ACCESS WITHOUT IT?
 
   assert(theNoiseMatrix.isValid());
-  CSCDetId idraw  = mapper_->rawCSCDetId( id );
-  int iraw        = mapper_->rawStripChannel( id, geomChannel );
-  int index       = indexer_->stripChannelIndex( idraw, iraw ) - 1; // NOTE THE MINUS ONE!
+  CSCDetId idraw = mapper_->rawCSCDetId(id);
+  int iraw = mapper_->rawStripChannel(id, geomChannel);
+  int index = indexer_->stripChannelIndex(idraw, iraw) - 1;  // NOTE THE MINUS ONE!
   return theNoiseMatrix->item(index);
 }
 
-void CSCConditions::noiseMatrixElements( const CSCDetId& id, int geomChannel, std::vector<float>& me ) const {
-  assert(me.size() > 11 );
-  const CSCDBNoiseMatrix::Item& item = noiseMatrix(id, geomChannel); // i.e. the function above
-  me[0] = float ( item.elem33 )/theNoiseMatrix->scale();
-  me[1] = float ( item.elem34 )/theNoiseMatrix->scale();
-  me[2] = float ( item.elem35 )/theNoiseMatrix->scale();
-  me[3] = float ( item.elem44 )/theNoiseMatrix->scale();
-  me[4] = float ( item.elem45 )/theNoiseMatrix->scale();
-  me[5] = float ( item.elem46 )/theNoiseMatrix->scale();
-  me[6] = float ( item.elem55 )/theNoiseMatrix->scale();
-  me[7] = float ( item.elem56 )/theNoiseMatrix->scale();
-  me[8] = float ( item.elem57 )/theNoiseMatrix->scale();
-  me[9] = float ( item.elem66 )/theNoiseMatrix->scale();
-  me[10] = float ( item.elem67 )/theNoiseMatrix->scale();
-  me[11] = float ( item.elem77 )/theNoiseMatrix->scale();
+void CSCConditions::noiseMatrixElements(const CSCDetId &id, int geomChannel, std::vector<float> &me) const {
+  assert(me.size() > 11);
+  const CSCDBNoiseMatrix::Item &item = noiseMatrix(id, geomChannel);  // i.e. the function above
+  me[0] = float(item.elem33) / theNoiseMatrix->scale();
+  me[1] = float(item.elem34) / theNoiseMatrix->scale();
+  me[2] = float(item.elem35) / theNoiseMatrix->scale();
+  me[3] = float(item.elem44) / theNoiseMatrix->scale();
+  me[4] = float(item.elem45) / theNoiseMatrix->scale();
+  me[5] = float(item.elem46) / theNoiseMatrix->scale();
+  me[6] = float(item.elem55) / theNoiseMatrix->scale();
+  me[7] = float(item.elem56) / theNoiseMatrix->scale();
+  me[8] = float(item.elem57) / theNoiseMatrix->scale();
+  me[9] = float(item.elem66) / theNoiseMatrix->scale();
+  me[10] = float(item.elem67) / theNoiseMatrix->scale();
+  me[11] = float(item.elem77) / theNoiseMatrix->scale();
 }
 
-void CSCConditions::crossTalk( const CSCDetId& id, int geomChannel, std::vector<float>& ct ) const {
+void CSCConditions::crossTalk(const CSCDetId &id, int geomChannel, std::vector<float> &ct) const {
   assert(theCrosstalk.isValid());
-  CSCDetId idraw  = mapper_->rawCSCDetId( id );
-  int iraw        = mapper_->rawStripChannel( id, geomChannel );
-  int index       = indexer_->stripChannelIndex( idraw, iraw ) - 1; // NOTE THE MINUS ONE!
-
-  ct[0] = float ( theCrosstalk->lslope(index) )/theCrosstalk->sscale();
-  ct[1] = float ( theCrosstalk->linter(index) )/theCrosstalk->iscale();
-  ct[2] = float ( theCrosstalk->rslope(index) )/theCrosstalk->sscale();
-  ct[3] = float ( theCrosstalk->rinter(index) )/theCrosstalk->iscale();
+  CSCDetId idraw = mapper_->rawCSCDetId(id);
+  int iraw = mapper_->rawStripChannel(id, geomChannel);
+  int index = indexer_->stripChannelIndex(idraw, iraw) - 1;  // NOTE THE MINUS ONE!
+
+  ct[0] = float(theCrosstalk->lslope(index)) / theCrosstalk->sscale();
+  ct[1] = float(theCrosstalk->linter(index)) / theCrosstalk->iscale();
+  ct[2] = float(theCrosstalk->rslope(index)) / theCrosstalk->sscale();
+  ct[3] = float(theCrosstalk->rinter(index)) / theCrosstalk->iscale();
 }
 
-float CSCConditions::chipCorrection(const CSCDetId & id, int geomChannel) const
-{
-  if ( useTimingCorrections() ){
+float CSCConditions::chipCorrection(const CSCDetId &id, int geomChannel) const {
+  if (useTimingCorrections()) {
     assert(theChipCorrections.isValid());
-    CSCDetId idraw  = mapper_->rawCSCDetId( id );
-    int iraw        = mapper_->rawStripChannel( id, geomChannel);
-    int ichip       = indexer_->chipIndex(iraw); // converts 1-80 to 1-5 (chip#, CFEB#)
-    int index       = indexer_->chipIndex(idraw, ichip) - 1; // NOTE THE MINUS ONE!
-    return float ( theChipCorrections->value(index) )/theChipCorrections->scale();
-  }
-  else
+    CSCDetId idraw = mapper_->rawCSCDetId(id);
+    int iraw = mapper_->rawStripChannel(id, geomChannel);
+    int ichip = indexer_->chipIndex(iraw);              // converts 1-80 to 1-5 (chip#, CFEB#)
+    int index = indexer_->chipIndex(idraw, ichip) - 1;  // NOTE THE MINUS ONE!
+    return float(theChipCorrections->value(index)) / theChipCorrections->scale();
+  } else
     return 0;
 }
-float CSCConditions::chamberTimingCorrection(const CSCDetId & id) const
-{
-  if ( useTimingCorrections() ){
+float CSCConditions::chamberTimingCorrection(const CSCDetId &id) const {
+  if (useTimingCorrections()) {
     assert(theChamberTimingCorrections.isValid());
-    CSCDetId idraw  = mapper_->rawCSCDetId( id );
-    int index = indexer_->chamberIndex(idraw) - 1; // NOTE THE MINUS ONE!
-    return float (
-      theChamberTimingCorrections->item(index).cfeb_tmb_skew_delay*1./theChamberTimingCorrections->precision()
-		   + theChamberTimingCorrections->item(index).cfeb_timing_corr*1./theChamberTimingCorrections->precision()
-		   + (theChamberTimingCorrections->item(index).cfeb_cable_delay*25. )
-);
-  }
-  else
+    CSCDetId idraw = mapper_->rawCSCDetId(id);
+    int index = indexer_->chamberIndex(idraw) - 1;  // NOTE THE MINUS ONE!
+    return float(
+        theChamberTimingCorrections->item(index).cfeb_tmb_skew_delay * 1. / theChamberTimingCorrections->precision() +
+        theChamberTimingCorrections->item(index).cfeb_timing_corr * 1. / theChamberTimingCorrections->precision() +
+        (theChamberTimingCorrections->item(index).cfeb_cable_delay * 25.));
+  } else
     return 0;
 }
-float CSCConditions::anodeBXoffset(const CSCDetId & id) const
-{
-  if ( useTimingCorrections() ){
+float CSCConditions::anodeBXoffset(const CSCDetId &id) const {
+  if (useTimingCorrections()) {
     assert(theChamberTimingCorrections.isValid());
-    CSCDetId idraw  = mapper_->rawCSCDetId( id );
-    int index = indexer_->chamberIndex(idraw) - 1; // NOTE THE MINUS ONE!
-    return float ( theChamberTimingCorrections->item(index).anode_bx_offset*1./theChamberTimingCorrections->precision() );
-  }
-  else
+    CSCDetId idraw = mapper_->rawCSCDetId(id);
+    int index = indexer_->chamberIndex(idraw) - 1;  // NOTE THE MINUS ONE!
+    return float(theChamberTimingCorrections->item(index).anode_bx_offset * 1. /
+                 theChamberTimingCorrections->precision());
+  } else
     return 0;
 }
 
@@ -351,103 +350,106 @@ float CSCConditions::anodeBXoffset(const CSCDetId & id) const
 /// is between 6 or 9 otherwise fix it to 7.5.
 /// These values came from Dominique and Stan,
 float CSCConditions::averageGain() const {
+  const float loEdge = 5.0;           // consider gains above this
+  const float hiEdge = 10.0;          // consider gains below this
+  const float loLimit = 6.0;          // lowest acceptable average gain
+  const float hiLimit = 9.0;          // highest acceptable average gain
+  const float expectedAverage = 7.5;  // default average gain
 
-  const float loEdge = 5.0; // consider gains above this
-  const float hiEdge = 10.0; // consider gains below this
-  const float loLimit = 6.0; // lowest acceptable average gain
-  const float hiLimit = 9.0; // highest acceptable average gain
-  const float expectedAverage = 7.5; // default average gain
-
-  if ( theAverageGain > 0. ) return theAverageGain; // only recalculate if necessary
+  if (theAverageGain > 0.)
+    return theAverageGain;  // only recalculate if necessary
 
-  int  n_strip   = 0;
+  int n_strip = 0;
   float gain_tot = 0.;
 
   CSCDBGains::GainContainer::const_iterator it;
-  for ( it=theGains->gains.begin(); it!=theGains->gains.end(); ++it ) {
-    float the_gain = float( it->gain_slope )/theGains->scale();
-    if (the_gain > loEdge && the_gain < hiEdge ) {
+  for (it = theGains->gains.begin(); it != theGains->gains.end(); ++it) {
+    float the_gain = float(it->gain_slope) / theGains->scale();
+    if (the_gain > loEdge && the_gain < hiEdge) {
       gain_tot += the_gain;
       ++n_strip;
     }
   }
 
   // Average gain
-  if ( n_strip > 0 ) {
+  if (n_strip > 0) {
     theAverageGain = gain_tot / n_strip;
   }
 
   // Average gain has been around 7.5 in real data
-  if ( theAverageGain < loLimit || theAverageGain > hiLimit ) {
+  if (theAverageGain < loLimit || theAverageGain > hiLimit) {
     //    LogTrace("CSC") << "Average CSC strip gain = "
-    //                    << theAverageGain << "  is reset to expected value " << expectedAverage;
+    //                    << theAverageGain << "  is reset to expected value "
+    //                    << expectedAverage;
     theAverageGain = expectedAverage;
   }
 
   return theAverageGain;
 }
 //
-float CSCConditions::gasGainCorrection( const CSCDetId & id, int geomChannel, int iwiregroup ) const
-{
-  if ( useGasGainCorrections() ){
+float CSCConditions::gasGainCorrection(const CSCDetId &id, int geomChannel, int iwiregroup) const {
+  if (useGasGainCorrections()) {
     assert(theGasGainCorrections.isValid());
-    CSCDetId idraw  = mapper_->rawCSCDetId( id );
-    int iraw        = mapper_->rawStripChannel( id, geomChannel );
-    int index       = indexer_->gasGainIndex(idraw, iraw, iwiregroup) - 1; // NOTE THE MINUS ONE!
-    return float ( theGasGainCorrections->value(index) );
+    CSCDetId idraw = mapper_->rawCSCDetId(id);
+    int iraw = mapper_->rawStripChannel(id, geomChannel);
+    int index = indexer_->gasGainIndex(idraw, iraw, iwiregroup) - 1;  // NOTE THE MINUS ONE!
+    return float(theGasGainCorrections->value(index));
   } else {
     return 1.;
   }
 }
 
-int CSCConditions::channelFromStrip( const CSCDetId& id, int geomStrip) const
-{ return mapper_->channelFromStrip(id, geomStrip); }
-
-int CSCConditions::rawStripChannel( const CSCDetId& id, int geomChannel) const
-{ return mapper_->rawStripChannel( id, geomChannel); }
+int CSCConditions::channelFromStrip(const CSCDetId &id, int geomStrip) const {
+  return mapper_->channelFromStrip(id, geomStrip);
+}
 
+int CSCConditions::rawStripChannel(const CSCDetId &id, int geomChannel) const {
+  return mapper_->rawStripChannel(id, geomChannel);
+}
 
 void CSCConditions::print() const
-  //@@ HAS NOT BEEN UPDATED THROUGH SEVERAL VERSIONS OF THE CONDITIONS DATA
+//@@ HAS NOT BEEN UPDATED THROUGH SEVERAL VERSIONS OF THE CONDITIONS DATA
 {
-/*
-  std::cout << "SIZES: GAINS: " << theGains->gains.size()
-            << "   PEDESTALS: " << thePedestals->pedestals.size()
-            << "   NOISES "  << theNoiseMatrix->matrix.size() << std::endl;;
-
-  std::map< int,std::vector<CSCDBGains::Item> >::const_iterator layerGainsItr = theGains->gains.begin(),
-      lastGain = theGains->gains.end();
-  for( ; layerGainsItr != lastGain; ++layerGainsItr)
-  {
-    std::cout << "GAIN " << layerGainsItr->first
-              << " STRIPS " << layerGainsItr->second.size() << " "
-              << layerGainsItr->second[0].gain_slope
-              << " " << layerGainsItr->second[0].gain_intercept << std::endl;
-  }
+  /*
+    std::cout << "SIZES: GAINS: " << theGains->gains.size()
+              << "   PEDESTALS: " << thePedestals->pedestals.size()
+              << "   NOISES "  << theNoiseMatrix->matrix.size() << std::endl;;
+
+    std::map< int,std::vector<CSCDBGains::Item> >::const_iterator layerGainsItr
+    = theGains->gains.begin(), lastGain = theGains->gains.end(); for( ;
+    layerGainsItr != lastGain; ++layerGainsItr)
+    {
+      std::cout << "GAIN " << layerGainsItr->first
+                << " STRIPS " << layerGainsItr->second.size() << " "
+                << layerGainsItr->second[0].gain_slope
+                << " " << layerGainsItr->second[0].gain_intercept << std::endl;
+    }
 
-  std::map< int,std::vector<CSCDBPedestals::Item> >::const_iterator pedestalItr = thePedestals->pedestals.begin(),
-                                                                  lastPedestal = thePedestals->pedestals.end();
-  for( ; pedestalItr != lastPedestal; ++pedestalItr)
-  {
-    std::cout << "PEDS " << pedestalItr->first << " "
-              << " STRIPS " << pedestalItr->second.size() << " ";
-    for(int i = 1; i < 80; ++i)
+    std::map< int,std::vector<CSCDBPedestals::Item> >::const_iterator
+    pedestalItr = thePedestals->pedestals.begin(), lastPedestal =
+    thePedestals->pedestals.end(); for( ; pedestalItr != lastPedestal;
+    ++pedestalItr)
     {
-       std::cout << pedestalItr->second[i-1].rms << " " ;
-     }
-     std::cout << std::endl;
-  }
+      std::cout << "PEDS " << pedestalItr->first << " "
+                << " STRIPS " << pedestalItr->second.size() << " ";
+      for(int i = 1; i < 80; ++i)
+      {
+         std::cout << pedestalItr->second[i-1].rms << " " ;
+       }
+       std::cout << std::endl;
+    }
 
-  std::map< int,std::vector<CSCDBCrosstalk::Item> >::const_iterator crosstalkItr = theCrosstalk->crosstalk.begin(),
-                                                                  lastCrosstalk = theCrosstalk->crosstalk.end();
-  for( ; crosstalkItr != lastCrosstalk; ++crosstalkItr)
-  {
-    std::cout << "XTALKS " << crosstalkItr->first
-      << " STRIPS " << crosstalkItr->second.size() << " "
-     << crosstalkItr->second[5].xtalk_slope_left << " "
-     << crosstalkItr->second[5].xtalk_slope_right << " "
-     << crosstalkItr->second[5].xtalk_intercept_left << " "
-     << crosstalkItr->second[5].xtalk_intercept_right << std::endl;
-  }
-*/
+    std::map< int,std::vector<CSCDBCrosstalk::Item> >::const_iterator
+    crosstalkItr = theCrosstalk->crosstalk.begin(), lastCrosstalk =
+    theCrosstalk->crosstalk.end(); for( ; crosstalkItr != lastCrosstalk;
+    ++crosstalkItr)
+    {
+      std::cout << "XTALKS " << crosstalkItr->first
+        << " STRIPS " << crosstalkItr->second.size() << " "
+       << crosstalkItr->second[5].xtalk_slope_left << " "
+       << crosstalkItr->second[5].xtalk_slope_right << " "
+       << crosstalkItr->second[5].xtalk_intercept_left << " "
+       << crosstalkItr->second[5].xtalk_intercept_right << std::endl;
+    }
+  */
 }
diff --git a/CalibMuon/CSCCalibration/src/CSCIndexerBase.cc b/CalibMuon/CSCCalibration/src/CSCIndexerBase.cc
index 004fdf7c49bf1..0a658e29cb7cc 100644
--- a/CalibMuon/CSCCalibration/src/CSCIndexerBase.cc
+++ b/CalibMuon/CSCCalibration/src/CSCIndexerBase.cc
@@ -1,141 +1,133 @@
 #include "CalibMuon/CSCCalibration/interface/CSCIndexerBase.h"
 
 CSCIndexerBase::CSCIndexerBase()
-: chamberLabel_(271) // # of physical chambers per endcap + 1. Includes ME42.
+    : chamberLabel_(271)  // # of physical chambers per endcap + 1. Includes ME42.
 {
   // Fill the member vector which permits decoding of the linear chamber index.
-  // Beware that the ME42 indices 235-270 within this vector do NOT correspond to
-  // their 'real' linear indices (which are 469-504 for +z)
+  // Beware that the ME42 indices 235-270 within this vector do NOT correspond
+  // to their 'real' linear indices (which are 469-504 for +z)
   IndexType count = 0;
   chamberLabel_[count] = 0;
 
-  for ( IndexType is = 1 ; is <= 4; ++is )
-  {
+  for (IndexType is = 1; is <= 4; ++is) {
     IndexType irmax = ringsInStation(is);
-    for ( IndexType ir = 1; ir <= irmax; ++ir )
-    {
+    for (IndexType ir = 1; ir <= irmax; ++ir) {
       IndexType icmax = chambersInRingOfStation(is, ir);
-      for ( IndexType ic = 1; ic <= icmax; ++ic )
-      {
-        chamberLabel_[ ++count ] = is*1000 + ir*100 + ic ;
+      for (IndexType ic = 1; ic <= icmax; ++ic) {
+        chamberLabel_[++count] = is * 1000 + ir * 100 + ic;
       }
     }
   }
 }
 
-
 CSCIndexerBase::~CSCIndexerBase() {}
 
-
-CSCIndexerBase::IndexType CSCIndexerBase::chamberLabelFromChamberIndex( IndexType ici ) const
-{
+CSCIndexerBase::IndexType CSCIndexerBase::chamberLabelFromChamberIndex(IndexType ici) const {
   // This is just for cross-checking
 
   // Expected range of input range argument is 1-540.
   // 1-468 for CSCs installed at 2008 start-up. 469-540 for ME42.
 
-  if ( ici > 468 )
-  {
+  if (ici > 468) {
     // ME42
-    ici -= 234; // now in range 235-306
-    if ( ici > 270 ) // -z
+    ici -= 234;     // now in range 235-306
+    if (ici > 270)  // -z
     {
-      ici -= 36; // now in range 235-270
+      ici -= 36;  // now in range 235-270
     }
-  }
-  else // in range 1-468
+  } else  // in range 1-468
   {
-    if ( ici > 234 ) // -z
+    if (ici > 234)  // -z
     {
-      ici -= 234; // now in range 1-234
+      ici -= 234;  // now in range 1-234
     }
   }
   return chamberLabel_[ici];
 }
 
+CSCIndexerBase::IndexType CSCIndexerBase::hvSegmentIndex(IndexType is, IndexType ir, IndexType iwire) const {
+  IndexType hvSegment = 1;  // There is only one HV segment in ME1/1
 
-CSCIndexerBase::IndexType CSCIndexerBase::hvSegmentIndex(IndexType is, IndexType ir, IndexType iwire ) const
-{
-  IndexType hvSegment = 1;   // There is only one HV segment in ME1/1
-
-  if (is > 2 && ir == 1)        // HV segments are the same in ME3/1 and ME4/1
-  {
-    if      ( iwire >= 33 && iwire <= 64 ) { hvSegment = 2; }
-    else if ( iwire >= 65 && iwire <= 96 ) { hvSegment = 3; }
-  }
-  else if (is > 1 && ir == 2) // HV segments are the same in ME2/2, ME3/2, and ME4/2
-  {
-    if      ( iwire >= 17 && iwire <= 28 ) { hvSegment = 2; }
-    else if ( iwire >= 29 && iwire <= 40 ) { hvSegment = 3; }
-    else if ( iwire >= 41 && iwire <= 52 ) { hvSegment = 4; }
-    else if ( iwire >= 53 && iwire <= 64 ) { hvSegment = 5; }
-  }
-  else if (is == 1 && ir == 2)
-  {
-    if      ( iwire >= 25 && iwire <= 48 ) { hvSegment = 2; }
-    else if ( iwire >= 49 && iwire <= 64 ) { hvSegment = 3; }
-  }
-  else if (is == 1 && ir == 3)
+  if (is > 2 && ir == 1)  // HV segments are the same in ME3/1 and ME4/1
   {
-    if      ( iwire >= 13 && iwire <= 22 ) { hvSegment = 2; }
-    else if ( iwire >= 23 && iwire <= 32 ) { hvSegment = 3; }
-  }
-  else if (is == 2 && ir == 1)
+    if (iwire >= 33 && iwire <= 64) {
+      hvSegment = 2;
+    } else if (iwire >= 65 && iwire <= 96) {
+      hvSegment = 3;
+    }
+  } else if (is > 1 && ir == 2)  // HV segments are the same in ME2/2, ME3/2, and ME4/2
   {
-    if      ( iwire >= 45 && iwire <= 80 ) { hvSegment = 2; }
-    else if ( iwire >= 81 && iwire <= 112) { hvSegment = 3; }
+    if (iwire >= 17 && iwire <= 28) {
+      hvSegment = 2;
+    } else if (iwire >= 29 && iwire <= 40) {
+      hvSegment = 3;
+    } else if (iwire >= 41 && iwire <= 52) {
+      hvSegment = 4;
+    } else if (iwire >= 53 && iwire <= 64) {
+      hvSegment = 5;
+    }
+  } else if (is == 1 && ir == 2) {
+    if (iwire >= 25 && iwire <= 48) {
+      hvSegment = 2;
+    } else if (iwire >= 49 && iwire <= 64) {
+      hvSegment = 3;
+    }
+  } else if (is == 1 && ir == 3) {
+    if (iwire >= 13 && iwire <= 22) {
+      hvSegment = 2;
+    } else if (iwire >= 23 && iwire <= 32) {
+      hvSegment = 3;
+    }
+  } else if (is == 2 && ir == 1) {
+    if (iwire >= 45 && iwire <= 80) {
+      hvSegment = 2;
+    } else if (iwire >= 81 && iwire <= 112) {
+      hvSegment = 3;
+    }
   }
   return hvSegment;
 }
 
-
-CSCDetId CSCIndexerBase::detIdFromChamberLabel( IndexType ie, IndexType label ) const
-{
-  IndexType is = label/1000;
-  label -= is*1000;
-  IndexType ir = label/100;
-  label -= ir*100;
+CSCDetId CSCIndexerBase::detIdFromChamberLabel(IndexType ie, IndexType label) const {
+  IndexType is = label / 1000;
+  label -= is * 1000;
+  IndexType ir = label / 100;
+  label -= ir * 100;
   IndexType ic = label;
 
-  return CSCDetId( ie, is, ir, ic );
+  return CSCDetId(ie, is, ir, ic);
 }
 
-
-CSCDetId CSCIndexerBase::detIdFromChamberIndex( IndexType ici ) const
-{
+CSCDetId CSCIndexerBase::detIdFromChamberIndex(IndexType ici) const {
   // Expected range of input range argument is 1-540.
   // 1-468 for CSCs installed at 2008 start-up. 469-540 for ME42.
 
   IndexType ie = 1;
-  if ( ici > 468 )
-  {
+  if (ici > 468) {
     // ME42
-    ici -= 234; // now in range 235-306
-    if ( ici > 270 ) // -z
+    ici -= 234;     // now in range 235-306
+    if (ici > 270)  // -z
     {
       ie = 2;
-      ici -= 36; // now in range 235-270
+      ici -= 36;  // now in range 235-270
     }
-  }
-  else // in range 1-468
+  } else  // in range 1-468
   {
-    if ( ici > 234 ) // -z
+    if (ici > 234)  // -z
     {
       ie = 2;
-      ici -= 234; // now in range 1-234
+      ici -= 234;  // now in range 1-234
     }
   }
 
   IndexType label = chamberLabel_[ici];
-  return detIdFromChamberLabel( ie, label );
+  return detIdFromChamberLabel(ie, label);
 }
 
-
-CSCDetId CSCIndexerBase::detIdFromLayerIndex( IndexType ili ) const
-{
-  IndexType il = (ili - 1)%6 + 1;
-  IndexType ici = (ili - 1)/6 + 1;
-  CSCDetId id = detIdFromChamberIndex( ici );
+CSCDetId CSCIndexerBase::detIdFromLayerIndex(IndexType ili) const {
+  IndexType il = (ili - 1) % 6 + 1;
+  IndexType ici = (ili - 1) / 6 + 1;
+  CSCDetId id = detIdFromChamberIndex(ici);
 
   return CSCDetId(id.endcap(), id.station(), id.ring(), id.chamber(), il);
 }
diff --git a/CalibMuon/CSCCalibration/src/CSCIndexerPostls1.cc b/CalibMuon/CSCCalibration/src/CSCIndexerPostls1.cc
index 575804553813e..bd0492d4fd385 100644
--- a/CalibMuon/CSCCalibration/src/CSCIndexerPostls1.cc
+++ b/CalibMuon/CSCCalibration/src/CSCIndexerPostls1.cc
@@ -1,22 +1,19 @@
 #include <CalibMuon/CSCCalibration/interface/CSCIndexerPostls1.h>
 
-
 CSCIndexerPostls1::~CSCIndexerPostls1() {}
 
-
-std::pair<CSCDetId, CSCIndexerBase::IndexType>  CSCIndexerPostls1::detIdFromStripChannelIndex( LongIndexType isi ) const
-{
-  const LongIndexType lastnonme1a       = 252288; // channels with ME42 installed
-  const LongIndexType lastpluszme1a     = 262656; // last unganged ME1a +z channel = 252288 + 10368
-  const LongIndexType lastnonme42 = 217728; // channels in 2008 installed chambers
-  const LongIndexType lastplusznonme42 = 108864; // = 217728/2
-  const LongIndexType firstme13  = 34561; // First channel of ME13
-  const LongIndexType lastme13   = 48384; // Last channel of ME13
+std::pair<CSCDetId, CSCIndexerBase::IndexType> CSCIndexerPostls1::detIdFromStripChannelIndex(LongIndexType isi) const {
+  const LongIndexType lastnonme1a = 252288;       // channels with ME42 installed
+  const LongIndexType lastpluszme1a = 262656;     // last unganged ME1a +z channel = 252288 + 10368
+  const LongIndexType lastnonme42 = 217728;       // channels in 2008 installed chambers
+  const LongIndexType lastplusznonme42 = 108864;  // = 217728/2
+  const LongIndexType firstme13 = 34561;          // First channel of ME13
+  const LongIndexType lastme13 = 48384;           // Last channel of ME13
 
   const IndexType lastnonme42layer = 2808;
-  const IndexType lastplusznonme42layer = 1404; // = 2808/2
-  const IndexType firstme13layer  = 433; // = 72*6 + 1 (ME13 chambers are 72-108 in range 1-234)
-  const IndexType lastme13layer   = 648; // = 108*6
+  const IndexType lastplusznonme42layer = 1404;  // = 2808/2
+  const IndexType firstme13layer = 433;          // = 72*6 + 1 (ME13 chambers are 72-108 in range 1-234)
+  const IndexType lastme13layer = 648;           // = 108*6
 
   bool me1a = false;
 
@@ -31,160 +28,153 @@ std::pair<CSCDetId, CSCIndexerBase::IndexType>  CSCIndexerPostls1::detIdFromStri
   LongIndexType istart = 0;
   IndexType layerOffset = 0;
 
-  if ( isi <= lastnonme42 )
-  {
-    // Chambers as of 2008 Installation (ME11 keeps the same #of channels 80 allocated for it in the index)
-    if ( isi > lastplusznonme42 )
-    {
+  if (isi <= lastnonme42) {
+    // Chambers as of 2008 Installation (ME11 keeps the same #of channels 80
+    // allocated for it in the index)
+    if (isi > lastplusznonme42) {
       ie = 2;
       isi -= lastplusznonme42;
     }
-    if ( isi > lastme13 ) // after ME13
+    if (isi > lastme13)  // after ME13
     {
       istart = lastme13;
       layerOffset = lastme13layer;
-    }
-    else if ( isi >= firstme13 ) // ME13
+    } else if (isi >= firstme13)  // ME13
     {
       istart = firstme13 - 1;
       layerOffset = firstme13layer - 1;
       nchan = 64;
     }
-  }
-  else if ( isi <= lastnonme1a ) // ME42 chambers
+  } else if (isi <= lastnonme1a)  // ME42 chambers
   {
     istart = lastnonme42;
     layerOffset = lastnonme42layer;
     // don't care about ie, as ME42 stretch of indices is uniform
-  }
-  else // Unganged ME1a channels
+  } else  // Unganged ME1a channels
   {
     me1a = true;
-    if (isi > lastpluszme1a) ie = 2;
+    if (isi > lastpluszme1a)
+      ie = 2;
     istart = lastnonme1a;
     nchan = 48;
     // layerOffset stays 0, as we want to map them onto ME1b's layer indices
   }
 
-  isi -= istart; // remove earlier group(s)
-  IndexType ichan = (isi - 1)%nchan + 1;
-  IndexType ili = (isi - 1)/nchan + 1;
-  ili += layerOffset; // add appropriate offset for earlier group(s)
-  if ( ie != 1 ) ili += lastplusznonme42layer; // add offset to -z endcap; ME42 doesn't need this.
+  isi -= istart;  // remove earlier group(s)
+  IndexType ichan = (isi - 1) % nchan + 1;
+  IndexType ili = (isi - 1) / nchan + 1;
+  ili += layerOffset;  // add appropriate offset for earlier group(s)
+  if (ie != 1)
+    ili += lastplusznonme42layer;  // add offset to -z endcap; ME42 doesn't need
+                                   // this.
 
   CSCDetId id = detIdFromLayerIndex(ili);
 
   // For unganged ME1a we need to turn this ME11 detid into an ME1a one
-  if ( me1a ) id = CSCDetId( id.endcap(), 1, 4, id.chamber(), id.layer() );
+  if (me1a)
+    id = CSCDetId(id.endcap(), 1, 4, id.chamber(), id.layer());
 
   return std::make_pair(id, ichan);
 }
 
-
-std::pair<CSCDetId, CSCIndexerBase::IndexType>  CSCIndexerPostls1::detIdFromChipIndex( IndexType ici ) const
-{
-  const LongIndexType lastnonme1a       = 15768; // chips in chambers with ME42 installed
-  const LongIndexType lastpluszme1a     = 16416; // last unganged ME1a +z chip = 15768 + 648 = 16416
-  const LongIndexType lastnonme42 = 13608; // chips in 2008 installed chambers
-  const LongIndexType lastplusznonme42 = 6804; // = 13608/2
-  const LongIndexType firstme13  = 2161; // First channel of ME13
-  const LongIndexType lastme13   = 3024; // Last channel of ME13
+std::pair<CSCDetId, CSCIndexerBase::IndexType> CSCIndexerPostls1::detIdFromChipIndex(IndexType ici) const {
+  const LongIndexType lastnonme1a = 15768;      // chips in chambers with ME42 installed
+  const LongIndexType lastpluszme1a = 16416;    // last unganged ME1a +z chip = 15768 + 648 = 16416
+  const LongIndexType lastnonme42 = 13608;      // chips in 2008 installed chambers
+  const LongIndexType lastplusznonme42 = 6804;  // = 13608/2
+  const LongIndexType firstme13 = 2161;         // First channel of ME13
+  const LongIndexType lastme13 = 3024;          // Last channel of ME13
 
   const IndexType lastnonme42layer = 2808;
-  const IndexType lastplusznonme42layer = 1404; // = 2808/2
-  const IndexType firstme13layer  = 433; // = 72*6 + 1 (ME13 chambers are 72-108 in range 1-234)
-  const IndexType lastme13layer   = 648; // = 108*6
+  const IndexType lastplusznonme42layer = 1404;  // = 2808/2
+  const IndexType firstme13layer = 433;          // = 72*6 + 1 (ME13 chambers are 72-108 in range 1-234)
+  const IndexType lastme13layer = 648;           // = 108*6
 
   bool me1a = false;
 
   // Most chambers (except ME13, ME1a) have 5 chips/layer
   IndexType nchipPerLayer = 5;
 
-  // Set endcap to +z. This should work for ME42 channels too, since we don't need to calculate its endcap explicitly.
+  // Set endcap to +z. This should work for ME42 channels too, since we don't
+  // need to calculate its endcap explicitly.
   IndexType ie = 1;
 
   LongIndexType istart = 0;
   IndexType layerOffset = 0;
 
-  if ( ici <= lastnonme42 )
-  {
-    // Chambers as of 2008 Installation (ME11 keeps the same #of chips 5 allocated for it in the index)
-    if ( ici > lastplusznonme42 )
-    {
+  if (ici <= lastnonme42) {
+    // Chambers as of 2008 Installation (ME11 keeps the same #of chips 5
+    // allocated for it in the index)
+    if (ici > lastplusznonme42) {
       ie = 2;
       ici -= lastplusznonme42;
     }
-    if ( ici > lastme13 ) // after ME13
+    if (ici > lastme13)  // after ME13
     {
       istart = lastme13;
       layerOffset = lastme13layer;
-    }
-    else if ( ici >= firstme13 ) // ME13
+    } else if (ici >= firstme13)  // ME13
     {
       istart = firstme13 - 1;
       layerOffset = firstme13layer - 1;
       nchipPerLayer = 4;
     }
-  }
-  else if ( ici <= lastnonme1a ) // ME42 chambers
+  } else if (ici <= lastnonme1a)  // ME42 chambers
   {
     istart = lastnonme42;
     layerOffset = lastnonme42layer;
     // don't care about ie, as ME42 stratch of indices is uniform
-  }
-  else  // Unganged ME1a channels
+  } else  // Unganged ME1a channels
   {
     me1a = true;
-    if (ici > lastpluszme1a) ie = 2;
+    if (ici > lastpluszme1a)
+      ie = 2;
     istart = lastnonme1a;
     nchipPerLayer = 3;
     // layerOffset stays 0, as we want to map them onto ME1b's layer indices
   }
 
-  ici -= istart; // remove earlier group(s)
-  IndexType ichip = (ici - 1)%nchipPerLayer + 1;
-  IndexType ili = (ici - 1)/nchipPerLayer + 1;
-  ili += layerOffset; // add appropriate offset for earlier group(s)
-  if ( ie != 1 ) ili += lastplusznonme42layer; // add offset to -z endcap; ME42 doesn't need this.
+  ici -= istart;  // remove earlier group(s)
+  IndexType ichip = (ici - 1) % nchipPerLayer + 1;
+  IndexType ili = (ici - 1) / nchipPerLayer + 1;
+  ili += layerOffset;  // add appropriate offset for earlier group(s)
+  if (ie != 1)
+    ili += lastplusznonme42layer;  // add offset to -z endcap; ME42 doesn't need
+                                   // this.
 
   CSCDetId id = detIdFromLayerIndex(ili);
 
   // For unganged ME1a we need to turn this ME11 detid into an ME1a one
-  if ( me1a ) id = CSCDetId( id.endcap(), 1, 4, id.chamber(), id.layer() );
+  if (me1a)
+    id = CSCDetId(id.endcap(), 1, 4, id.chamber(), id.layer());
 
   return std::make_pair(id, ichip);
 }
 
-
-int CSCIndexerPostls1::dbIndex(const CSCDetId & id, int & channel) const
-{
+int CSCIndexerPostls1::dbIndex(const CSCDetId &id, int &channel) const {
   int ec = id.endcap();
   int st = id.station();
   int rg = id.ring();
   int ch = id.chamber();
   int la = id.layer();
 
-  return ec*100000 + st*10000 + rg*1000 + ch*10 + la;
+  return ec * 100000 + st * 10000 + rg * 1000 + ch * 10 + la;
 }
 
-
-CSCIndexerBase::GasGainIndexType  CSCIndexerPostls1::detIdFromGasGainIndex( IndexType igg ) const
-{
+CSCIndexerBase::GasGainIndexType CSCIndexerPostls1::detIdFromGasGainIndex(IndexType igg) const {
   const int n_types = 20;
-  const IndexType type_starts[n_types] =
-    {1,  1081, 4321, 6913, 8533, 13933, 15553, 20953, 22573, 23653, 26893, 29485, 31105, 36505, 38125, 43525, 45145, 50545, 55945, 56593};
-  //+1/1 +1/2  +1/3  +2/1  +2/2  +3/1   +3/2   +4/1   -1/1   -1/2   -1/3   -2/1   -2/2   -3/1   -3/2   -4/1   +4/2   -4/2   +1/4   -1/4
+  const IndexType type_starts[n_types] = {1,     1081,  4321,  6913,  8533,  13933, 15553, 20953, 22573, 23653,
+                                          26893, 29485, 31105, 36505, 38125, 43525, 45145, 50545, 55945, 56593};
+  //+1/1 +1/2  +1/3  +2/1  +2/2  +3/1   +3/2   +4/1   -1/1   -1/2   -1/3   -2/1
+  //-2/2   -3/1   -3/2   -4/1   +4/2   -4/2   +1/4   -1/4
 
-  const int endcaps[n_types] =
-    {1,  1,    1,    1,    1,    1,     1,     1,     2,     2,     2,     2,     2,     2,     2,     2,     1,     2,     1,     2};
-  const int stations[n_types] =
-    {1,  1,    1,    2,    2,    3,     3,     4,     1,     1,     1,     2,     2,     3,     3,     4,     4,     4,     1,     1};
-  const int rings[n_types] =
-    {1,  2,    3,    1,    2,    1,     2,     1,     1,     2,     3,     1,     2,     1,     2,     1,     2,     2,     4,     4};
+  const int endcaps[n_types] = {1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 2};
+  const int stations[n_types] = {1, 1, 1, 2, 2, 3, 3, 4, 1, 1, 1, 2, 2, 3, 3, 4, 4, 4, 1, 1};
+  const int rings[n_types] = {1, 2, 3, 1, 2, 1, 2, 1, 1, 2, 3, 1, 2, 1, 2, 1, 2, 2, 4, 4};
 
   // determine chamber type
   std::vector<IndexType> v_type_starts(type_starts, type_starts + n_types);
-  int type = int(std::upper_bound(v_type_starts.begin(), v_type_starts.end(), igg) -  v_type_starts.begin()) - 1;
+  int type = int(std::upper_bound(v_type_starts.begin(), v_type_starts.end(), igg) - v_type_starts.begin()) - 1;
 
   // determine factors for #HVsectors and #chips
   int sectors_per_layer = sectorsPerLayer(stations[type], rings[type]);
@@ -196,13 +186,13 @@ CSCIndexerBase::GasGainIndexType  CSCIndexerPostls1::detIdFromGasGainIndex( Inde
 
   // extract chamber & layer
   int chamber = (igg_chamber_and_layer - 1) / 6 + 1;
-  int layer   = (igg_chamber_and_layer - 1) % 6 + 1;
+  int layer = (igg_chamber_and_layer - 1) % 6 + 1;
 
-  IndexType igg_hvseg_etc         = (igg_chamber_etc - 1) % sectors_per_layer + 1;
+  IndexType igg_hvseg_etc = (igg_chamber_etc - 1) % sectors_per_layer + 1;
 
   // extract HVsegment and chip numbers
   IndexType hvsegment = (igg_hvseg_etc - 1) / chips_per_layer + 1;
-  IndexType chip      = (igg_hvseg_etc - 1) % chips_per_layer + 1;
+  IndexType chip = (igg_hvseg_etc - 1) % chips_per_layer + 1;
 
   CSCDetId id(endcaps[type], stations[type], rings[type], chamber, layer);
   return boost::make_tuple(id, hvsegment, chip);
diff --git a/CalibMuon/CSCCalibration/src/CSCIndexerStartup.cc b/CalibMuon/CSCCalibration/src/CSCIndexerStartup.cc
index 9b0392e22ee87..60cc575aa8a79 100644
--- a/CalibMuon/CSCCalibration/src/CSCIndexerStartup.cc
+++ b/CalibMuon/CSCCalibration/src/CSCIndexerStartup.cc
@@ -1,123 +1,116 @@
 #include <CalibMuon/CSCCalibration/interface/CSCIndexerStartup.h>
 
-
 CSCIndexerStartup::~CSCIndexerStartup() {}
 
-
-std::pair<CSCDetId, CSCIndexerBase::IndexType>  CSCIndexerStartup::detIdFromStripChannelIndex( LongIndexType isi ) const
-{
-  const LongIndexType lastnonme42 = 217728; // channels in 2008 installed chambers
-  const LongIndexType lastplusznonme42 = 108864; // = 217728/2
-  const LongIndexType firstme13  = 34561; // First channel of ME13
-  const LongIndexType lastme13   = 48384; // Last channel of ME13
+std::pair<CSCDetId, CSCIndexerBase::IndexType> CSCIndexerStartup::detIdFromStripChannelIndex(LongIndexType isi) const {
+  const LongIndexType lastnonme42 = 217728;       // channels in 2008 installed chambers
+  const LongIndexType lastplusznonme42 = 108864;  // = 217728/2
+  const LongIndexType firstme13 = 34561;          // First channel of ME13
+  const LongIndexType lastme13 = 48384;           // Last channel of ME13
 
   const IndexType lastnonme42layer = 2808;
-  const IndexType lastplusznonme42layer = 1404; // = 2808/2
-  const IndexType firstme13layer  = 433; // = 72*6 + 1 (ME13 chambers are 72-108 in range 1-234)
-  const IndexType lastme13layer   = 648; // = 108*6
+  const IndexType lastplusznonme42layer = 1404;  // = 2808/2
+  const IndexType firstme13layer = 433;          // = 72*6 + 1 (ME13 chambers are 72-108 in range 1-234)
+  const IndexType lastme13layer = 648;           // = 108*6
 
   // All chambers but ME13 have 80 channels
   IndexType nchan = 80;
 
-  // Set endcap to +z. This should work for ME42 channels too, since we don't need to calculate its endcap explicitly.
+  // Set endcap to +z. This should work for ME42 channels too, since we don't
+  // need to calculate its endcap explicitly.
   IndexType ie = 1;
 
   LongIndexType istart = 0;
   IndexType layerOffset = 0;
 
-  if ( isi <= lastnonme42 ) // Chambers as of 2008 Installation
+  if (isi <= lastnonme42)  // Chambers as of 2008 Installation
   {
-    if ( isi > lastplusznonme42 )
-    {
+    if (isi > lastplusznonme42) {
       ie = 2;
       isi -= lastplusznonme42;
     }
-    if ( isi > lastme13 ) // after ME13
+    if (isi > lastme13)  // after ME13
     {
       istart = lastme13;
       layerOffset = lastme13layer;
-    }
-    else if ( isi >= firstme13 ) // ME13
+    } else if (isi >= firstme13)  // ME13
     {
       istart = firstme13 - 1;
       layerOffset = firstme13layer - 1;
       nchan = 64;
     }
-  }
-  else // ME42 chambers
+  } else  // ME42 chambers
   {
     istart = lastnonme42;
     layerOffset = lastnonme42layer;
   }
 
-  isi -= istart; // remove earlier group(s)
-  IndexType ichan = (isi - 1)%nchan + 1;
-  IndexType ili = (isi - 1)/nchan + 1;
-  ili += layerOffset; // add appropriate offset for earlier group(s)
-  if ( ie != 1 ) ili += lastplusznonme42layer; // add offset to -z endcap; ME42 doesn't need this.
+  isi -= istart;  // remove earlier group(s)
+  IndexType ichan = (isi - 1) % nchan + 1;
+  IndexType ili = (isi - 1) / nchan + 1;
+  ili += layerOffset;  // add appropriate offset for earlier group(s)
+  if (ie != 1)
+    ili += lastplusznonme42layer;  // add offset to -z endcap; ME42 doesn't need
+                                   // this.
 
   return std::pair<CSCDetId, IndexType>(detIdFromLayerIndex(ili), ichan);
 }
 
-
-std::pair<CSCDetId, CSCIndexerBase::IndexType>  CSCIndexerStartup::detIdFromChipIndex( IndexType ici ) const
-{
-  const LongIndexType lastnonme42 = 13608; // chips in 2008 installed chambers
-  const LongIndexType lastplusznonme42 = 6804; // = 13608/2
-  const LongIndexType firstme13  = 2161; // First channel of ME13
-  const LongIndexType lastme13   = 3024; // Last channel of ME13
+std::pair<CSCDetId, CSCIndexerBase::IndexType> CSCIndexerStartup::detIdFromChipIndex(IndexType ici) const {
+  const LongIndexType lastnonme42 = 13608;      // chips in 2008 installed chambers
+  const LongIndexType lastplusznonme42 = 6804;  // = 13608/2
+  const LongIndexType firstme13 = 2161;         // First channel of ME13
+  const LongIndexType lastme13 = 3024;          // Last channel of ME13
 
   const IndexType lastnonme42layer = 2808;
-  const IndexType lastplusznonme42layer = 1404; // = 2808/2
-  const IndexType firstme13layer  = 433; // = 72*6 + 1 (ME13 chambers are 72-108 in range 1-234)
-  const IndexType lastme13layer   = 648; // = 108*6
+  const IndexType lastplusznonme42layer = 1404;  // = 2808/2
+  const IndexType firstme13layer = 433;          // = 72*6 + 1 (ME13 chambers are 72-108 in range 1-234)
+  const IndexType lastme13layer = 648;           // = 108*6
 
   // All chambers but ME13 have 5 chips/layer
   IndexType nchipPerLayer = 5;
 
-  // Set endcap to +z. This should work for ME42 channels too, since we don't need to calculate its endcap explicitly.
+  // Set endcap to +z. This should work for ME42 channels too, since we don't
+  // need to calculate its endcap explicitly.
   IndexType ie = 1;
 
   LongIndexType istart = 0;
   IndexType layerOffset = 0;
 
-  if ( ici <= lastnonme42 ) // Chambers as of 2008 Installation
+  if (ici <= lastnonme42)  // Chambers as of 2008 Installation
   {
-    if ( ici > lastplusznonme42 )
-    {
+    if (ici > lastplusznonme42) {
       ie = 2;
       ici -= lastplusznonme42;
     }
-    if ( ici > lastme13 ) // after ME13
+    if (ici > lastme13)  // after ME13
     {
       istart = lastme13;
       layerOffset = lastme13layer;
-    }
-    else if ( ici >= firstme13 ) // ME13
+    } else if (ici >= firstme13)  // ME13
     {
       istart = firstme13 - 1;
       layerOffset = firstme13layer - 1;
       nchipPerLayer = 4;
     }
-  }
-  else // ME42 chambers
+  } else  // ME42 chambers
   {
     istart = lastnonme42;
     layerOffset = lastnonme42layer;
   }
 
-  ici -= istart; // remove earlier group(s)
-  IndexType ichip = (ici - 1)%nchipPerLayer + 1;
-  IndexType ili = (ici - 1)/nchipPerLayer + 1;
-  ili += layerOffset; // add appropriate offset for earlier group(s)
-  if ( ie != 1 ) ili += lastplusznonme42layer; // add offset to -z endcap; ME42 doesn't need this.
+  ici -= istart;  // remove earlier group(s)
+  IndexType ichip = (ici - 1) % nchipPerLayer + 1;
+  IndexType ili = (ici - 1) / nchipPerLayer + 1;
+  ili += layerOffset;  // add appropriate offset for earlier group(s)
+  if (ie != 1)
+    ili += lastplusznonme42layer;  // add offset to -z endcap; ME42 doesn't need
+                                   // this.
 
   return std::pair<CSCDetId, IndexType>(detIdFromLayerIndex(ili), ichip);
 }
 
-
-int CSCIndexerStartup::dbIndex(const CSCDetId & id, int & channel) const
-{
+int CSCIndexerStartup::dbIndex(const CSCDetId &id, int &channel) const {
   int ec = id.endcap();
   int st = id.station();
   int rg = id.ring();
@@ -125,32 +118,44 @@ int CSCIndexerStartup::dbIndex(const CSCDetId & id, int & channel) const
   int la = id.layer();
 
   // The channels of ME1A are channels 65-80 of ME11
-  if(st == 1 && rg == 4)
-  {
+  if (st == 1 && rg == 4) {
     rg = 1;
-    if(channel <= 16) channel += 64; // no trapping for any bizarreness
+    if (channel <= 16)
+      channel += 64;  // no trapping for any bizarreness
   }
-  return ec*100000 + st*10000 + rg*1000 + ch*10 + la;
+  return ec * 100000 + st * 10000 + rg * 1000 + ch * 10 + la;
 }
 
-
-CSCIndexerBase::GasGainIndexType  CSCIndexerStartup::detIdFromGasGainIndex( IndexType igg ) const
-{
+CSCIndexerBase::GasGainIndexType CSCIndexerStartup::detIdFromGasGainIndex(IndexType igg) const {
   const int n_types = 18;
-  const IndexType type_starts[n_types] =
-    {1,  1081, 4321, 6913, 8533, 13933, 15553, 20953, 22573, 23653, 26893, 29485, 31105, 36505, 38125, 43525, 45145, 50545};
-  //+1/1 +1/2  +1/3  +2/1  +2/2  +3/1   +3/2   +4/1   -1/1   -1/2   -1/3   -2/1   -2/2   -3/1   -3/2   -4/1   +4/2   -4/2
-
-  const int endcaps[n_types] =
-    {1,  1,    1,    1,    1,    1,     1,     1,     2,     2,     2,     2,     2,     2,     2,     2,     1,     2};
-  const int stations[n_types] =
-    {1,  1,    1,    2,    2,    3,     3,     4,     1,     1,     1,     2,     2,     3,     3,     4,     4,     4};
-  const int rings[n_types] =
-    {1,  2,    3,    1,    2,    1,     2,     1,     1,     2,     3,     1,     2,     1,     2,     1,     2,     2};
+  const IndexType type_starts[n_types] = {1,
+                                          1081,
+                                          4321,
+                                          6913,
+                                          8533,
+                                          13933,
+                                          15553,
+                                          20953,
+                                          22573,
+                                          23653,
+                                          26893,
+                                          29485,
+                                          31105,
+                                          36505,
+                                          38125,
+                                          43525,
+                                          45145,
+                                          50545};
+  //+1/1 +1/2  +1/3  +2/1  +2/2  +3/1   +3/2   +4/1   -1/1   -1/2   -1/3   -2/1
+  //-2/2   -3/1   -3/2   -4/1   +4/2   -4/2
+
+  const int endcaps[n_types] = {1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2};
+  const int stations[n_types] = {1, 1, 1, 2, 2, 3, 3, 4, 1, 1, 1, 2, 2, 3, 3, 4, 4, 4};
+  const int rings[n_types] = {1, 2, 3, 1, 2, 1, 2, 1, 1, 2, 3, 1, 2, 1, 2, 1, 2, 2};
 
   // determine chamber type
   std::vector<IndexType> v_type_starts(type_starts, type_starts + n_types);
-  int type = int(std::upper_bound(v_type_starts.begin(), v_type_starts.end(), igg) -  v_type_starts.begin()) - 1;
+  int type = int(std::upper_bound(v_type_starts.begin(), v_type_starts.end(), igg) - v_type_starts.begin()) - 1;
 
   // determine factors for #HVsectors and #chips
   int sectors_per_layer = sectorsPerLayer(stations[type], rings[type]);
@@ -162,13 +167,13 @@ CSCIndexerBase::GasGainIndexType  CSCIndexerStartup::detIdFromGasGainIndex( Inde
 
   // extract chamber & layer
   int chamber = (igg_chamber_and_layer - 1) / 6 + 1;
-  int layer   = (igg_chamber_and_layer - 1) % 6 + 1;
+  int layer = (igg_chamber_and_layer - 1) % 6 + 1;
 
-  IndexType igg_hvseg_etc         = (igg_chamber_etc - 1) % sectors_per_layer + 1;
+  IndexType igg_hvseg_etc = (igg_chamber_etc - 1) % sectors_per_layer + 1;
 
   // extract HVsegment and chip numbers
   IndexType hvsegment = (igg_hvseg_etc - 1) / chips_per_layer + 1;
-  IndexType chip      = (igg_hvseg_etc - 1) % chips_per_layer + 1;
+  IndexType chip = (igg_hvseg_etc - 1) % chips_per_layer + 1;
 
   CSCDetId id(endcaps[type], stations[type], rings[type], chamber, layer);
   return boost::make_tuple(id, hvsegment, chip);
diff --git a/CalibMuon/CSCCalibration/src/ES_CSCChannelMapperBase.cc b/CalibMuon/CSCCalibration/src/ES_CSCChannelMapperBase.cc
index 82ebbd2283a83..e2df14c27d08b 100644
--- a/CalibMuon/CSCCalibration/src/ES_CSCChannelMapperBase.cc
+++ b/CalibMuon/CSCCalibration/src/ES_CSCChannelMapperBase.cc
@@ -1,4 +1,4 @@
 #include "CalibMuon/CSCCalibration/interface/CSCChannelMapperBase.h"
 #include "FWCore/Utilities/interface/typelookup.h"
 
-TYPELOOKUP_DATA_REG(CSCChannelMapperBase); // registers the type
+TYPELOOKUP_DATA_REG(CSCChannelMapperBase);  // registers the type
diff --git a/CalibMuon/CSCCalibration/src/ES_CSCIndexerBase.cc b/CalibMuon/CSCCalibration/src/ES_CSCIndexerBase.cc
index e310abf5530d1..de1264bc597d8 100644
--- a/CalibMuon/CSCCalibration/src/ES_CSCIndexerBase.cc
+++ b/CalibMuon/CSCCalibration/src/ES_CSCIndexerBase.cc
@@ -1,4 +1,4 @@
 #include "CalibMuon/CSCCalibration/interface/CSCIndexerBase.h"
 #include "FWCore/Utilities/interface/typelookup.h"
 
-TYPELOOKUP_DATA_REG(CSCIndexerBase); // registers the type
+TYPELOOKUP_DATA_REG(CSCIndexerBase);  // registers the type
diff --git a/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldPostls1.cc b/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldPostls1.cc
index 6c1f25a842ead..c9d0c2542c244 100644
--- a/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldPostls1.cc
+++ b/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldPostls1.cc
@@ -4,181 +4,179 @@
 void CSCIndexerOldPostls1::fillChamberLabel() const {
   // Fill the member vector which permits decoding of the linear chamber index
   // Logically const since initializes cache only,
-  // Beware that the ME42 indices 235-270 within this vector do NOT correspond to
-  // their 'real' linear indices (which are 469-504 for +z)
-   chamberLabel.resize( 271 ); // one more than #chambers per endcap. Includes ME42.
-   IndexType count = 0;
-   chamberLabel[count] = 0;
-
-   for ( IndexType is = 1 ; is != 5; ++is ) {
-      IndexType irmax = ringsInStation(is);
-      for ( IndexType ir = 1; ir != irmax+1; ++ir ) {
-         IndexType icmax = chambersInRingOfStation(is, ir);
-         for ( IndexType ic = 1; ic != icmax+1; ++ic ) {
-	   chamberLabel[ ++count ] = is*1000 + ir*100 + ic ;
-         }
-      } 
-   }
+  // Beware that the ME42 indices 235-270 within this vector do NOT correspond
+  // to their 'real' linear indices (which are 469-504 for +z)
+  chamberLabel.resize(271);  // one more than #chambers per endcap. Includes ME42.
+  IndexType count = 0;
+  chamberLabel[count] = 0;
+
+  for (IndexType is = 1; is != 5; ++is) {
+    IndexType irmax = ringsInStation(is);
+    for (IndexType ir = 1; ir != irmax + 1; ++ir) {
+      IndexType icmax = chambersInRingOfStation(is, ir);
+      for (IndexType ic = 1; ic != icmax + 1; ++ic) {
+        chamberLabel[++count] = is * 1000 + ir * 100 + ic;
+      }
+    }
+  }
 }
 
-
-CSCIndexerOldPostls1::IndexType CSCIndexerOldPostls1::hvSegmentIndex(IndexType is, IndexType ir, IndexType iwire ) const
-{
-  IndexType hvSegment = 1;   // There is only one HV segment in ME1/1
-
-  if (is > 2 && ir == 1)
-  {         // HV segments are the same in ME3/1 and ME4/1
-    if      ( iwire >= 33 && iwire <= 64 ) hvSegment = 2;
-    else if ( iwire >= 65 && iwire <= 96 ) hvSegment = 3;
-  }
-  else if (is > 1 && ir == 2)
-  {         // HV segments are the same in ME2/2, ME3/2, and ME4/2
-    if      ( iwire >= 17 && iwire <= 28 ) hvSegment = 2;
-    else if ( iwire >= 29 && iwire <= 40 ) hvSegment = 3;
-    else if ( iwire >= 41 && iwire <= 52 ) hvSegment = 4;
-    else if ( iwire >= 53 && iwire <= 64 ) hvSegment = 5;
-  }
-  else if (is == 1 && ir == 2)
-  {
-    if      ( iwire >= 25 && iwire <= 48 ) hvSegment = 2;
-    else if ( iwire >= 49 && iwire <= 64 ) hvSegment = 3;
-  }
-  else if (is == 1 && ir == 3)
-  {
-    if      ( iwire >= 13 && iwire <= 22 ) hvSegment = 2;
-    else if ( iwire >= 23 && iwire <= 32 ) hvSegment = 3;
-  }
-  else if (is == 2 && ir == 1)
-  {
-    if      ( iwire >= 45 && iwire <= 80 ) hvSegment = 2;
-    else if ( iwire >= 81 && iwire <= 112) hvSegment = 3;
+CSCIndexerOldPostls1::IndexType CSCIndexerOldPostls1::hvSegmentIndex(IndexType is,
+                                                                     IndexType ir,
+                                                                     IndexType iwire) const {
+  IndexType hvSegment = 1;  // There is only one HV segment in ME1/1
+
+  if (is > 2 && ir == 1) {  // HV segments are the same in ME3/1 and ME4/1
+    if (iwire >= 33 && iwire <= 64)
+      hvSegment = 2;
+    else if (iwire >= 65 && iwire <= 96)
+      hvSegment = 3;
+  } else if (is > 1 && ir == 2) {  // HV segments are the same in ME2/2, ME3/2, and ME4/2
+    if (iwire >= 17 && iwire <= 28)
+      hvSegment = 2;
+    else if (iwire >= 29 && iwire <= 40)
+      hvSegment = 3;
+    else if (iwire >= 41 && iwire <= 52)
+      hvSegment = 4;
+    else if (iwire >= 53 && iwire <= 64)
+      hvSegment = 5;
+  } else if (is == 1 && ir == 2) {
+    if (iwire >= 25 && iwire <= 48)
+      hvSegment = 2;
+    else if (iwire >= 49 && iwire <= 64)
+      hvSegment = 3;
+  } else if (is == 1 && ir == 3) {
+    if (iwire >= 13 && iwire <= 22)
+      hvSegment = 2;
+    else if (iwire >= 23 && iwire <= 32)
+      hvSegment = 3;
+  } else if (is == 2 && ir == 1) {
+    if (iwire >= 45 && iwire <= 80)
+      hvSegment = 2;
+    else if (iwire >= 81 && iwire <= 112)
+      hvSegment = 3;
   }
 
   return hvSegment;
 }
 
-
-CSCDetId CSCIndexerOldPostls1::detIdFromChamberIndex_OLD( IndexType ici ) const {
-
+CSCDetId CSCIndexerOldPostls1::detIdFromChamberIndex_OLD(IndexType ici) const {
   // Will not work as is for ME42
   // ============================
 
   IndexType ie = 1;
-  if (ici > 234 ) {
-     ie = 2;
-     ici -= 234; 
+  if (ici > 234) {
+    ie = 2;
+    ici -= 234;
   }
   // Now ici is in range 1-234 (assuming valid input in range 1-468)
 
   // MEij pairs...
-  const IndexType station[] = {0,1,1,1,2,2,3,3,4};
-  const IndexType ring[]    = {0,1,2,3,1,2,1,2,1};
+  const IndexType station[] = {0, 1, 1, 1, 2, 2, 3, 3, 4};
+  const IndexType ring[] = {0, 1, 2, 3, 1, 2, 1, 2, 1};
 
   // MEij preceding a given MEij matching linear index above
-  const IndexType prevs[] =  {0,0,1,1,1,2,2,3,3}; 
-  const IndexType prevr[] =  {0,0,1,2,3,1,2,1,2};
+  const IndexType prevs[] = {0, 0, 1, 1, 1, 2, 2, 3, 3};
+  const IndexType prevr[] = {0, 0, 1, 2, 3, 1, 2, 1, 2};
 
   IndexType is = 4;
   IndexType ir = 1;
-  for ( IndexType i = 2; i<=8; ++i) {
+  for (IndexType i = 2; i <= 8; ++i) {
     IndexType js = station[i];
     IndexType jr = ring[i];
     // if it's before start of MEjs/jr then it's in the previous MEis/ir
-      if ( ici < startChamberIndexInEndcap(ie,js,jr) ) {
-	is = prevs[i];
-	ir = prevr[i];
-	break;
-      }
-      // otherwise it's in ME41
+    if (ici < startChamberIndexInEndcap(ie, js, jr)) {
+      is = prevs[i];
+      ir = prevr[i];
+      break;
+    }
+    // otherwise it's in ME41
   }
-  IndexType ic = ici - startChamberIndexInEndcap(ie,is,ir) + 1;
+  IndexType ic = ici - startChamberIndexInEndcap(ie, is, ir) + 1;
 
-  return CSCDetId( ie, is, ir, ic );
+  return CSCDetId(ie, is, ir, ic);
 }
- 
-CSCDetId CSCIndexerOldPostls1::detIdFromChamberIndex( IndexType ici ) const {
+
+CSCDetId CSCIndexerOldPostls1::detIdFromChamberIndex(IndexType ici) const {
   // Expected range of input range argument is 1-540.
   // 1-468 for CSCs installed at 2008 start-up. 469-540 for ME42.
 
   IndexType ie = 1;
-  if ( ici > 468 ) {
+  if (ici > 468) {
     // ME42
-    ici -= 234; // now in range 235-306
-    if ( ici > 270 ) { // -z
+    ici -= 234;       // now in range 235-306
+    if (ici > 270) {  // -z
       ie = 2;
-      ici -= 36; // now in range 235-270
+      ici -= 36;  // now in range 235-270
     }
-  }
-  else { // in range 1-468
-    if ( ici > 234 ) { // -z
+  } else {            // in range 1-468
+    if (ici > 234) {  // -z
       ie = 2;
-      ici -= 234; // now in range 1-234
+      ici -= 234;  // now in range 1-234
     }
   }
-  if (chamberLabel.empty()) fillChamberLabel();
-  IndexType label = chamberLabel[ici];    
-  return detIdFromChamberLabel( ie, label );
+  if (chamberLabel.empty())
+    fillChamberLabel();
+  IndexType label = chamberLabel[ici];
+  return detIdFromChamberLabel(ie, label);
 }
 
-CSCIndexerOldPostls1::IndexType CSCIndexerOldPostls1::chamberLabelFromChamberIndex( IndexType ici ) const {
+CSCIndexerOldPostls1::IndexType CSCIndexerOldPostls1::chamberLabelFromChamberIndex(IndexType ici) const {
   // This is just for cross-checking
 
   // Expected range of input range argument is 1-540.
   // 1-468 for CSCs installed at 2008 start-up. 469-540 for ME42.
 
-  if ( ici > 468 ) {
+  if (ici > 468) {
     // ME42
-    ici -= 234; // now in range 235-306
-    if ( ici > 270 ) { // -z
-      ici -= 36; // now in range 235-270
+    ici -= 234;       // now in range 235-306
+    if (ici > 270) {  // -z
+      ici -= 36;      // now in range 235-270
     }
-  }
-  else { // in range 1-468
-    if ( ici > 234 ) { // -z
-      ici -= 234; // now in range 1-234
+  } else {            // in range 1-468
+    if (ici > 234) {  // -z
+      ici -= 234;     // now in range 1-234
     }
   }
-  if (chamberLabel.empty()) fillChamberLabel();
-  return chamberLabel[ici];  
-
+  if (chamberLabel.empty())
+    fillChamberLabel();
+  return chamberLabel[ici];
 }
 
-CSCDetId CSCIndexerOldPostls1::detIdFromChamberLabel( IndexType ie, IndexType label ) const {
-
-  IndexType is = label/1000;
-  label -= is*1000;
-  IndexType ir = label/100;
-  label -= ir*100;
+CSCDetId CSCIndexerOldPostls1::detIdFromChamberLabel(IndexType ie, IndexType label) const {
+  IndexType is = label / 1000;
+  label -= is * 1000;
+  IndexType ir = label / 100;
+  label -= ir * 100;
   IndexType ic = label;
 
-  return CSCDetId( ie, is, ir, ic );
+  return CSCDetId(ie, is, ir, ic);
 }
 
-CSCDetId CSCIndexerOldPostls1::detIdFromLayerIndex( IndexType ili ) const {
-
-  IndexType il = (ili-1)%6 + 1;
-  IndexType ici = (ili-1)/6 + 1;
-  CSCDetId id = detIdFromChamberIndex( ici ); 
+CSCDetId CSCIndexerOldPostls1::detIdFromLayerIndex(IndexType ili) const {
+  IndexType il = (ili - 1) % 6 + 1;
+  IndexType ici = (ili - 1) / 6 + 1;
+  CSCDetId id = detIdFromChamberIndex(ici);
 
   return CSCDetId(id.endcap(), id.station(), id.ring(), id.chamber(), il);
 }
 
-std::pair<CSCDetId, CSCIndexerOldPostls1::IndexType>  CSCIndexerOldPostls1::detIdFromStripChannelIndex( LongIndexType isi ) const {
-
-  const LongIndexType lastnonme1a       = 252288; // channels with ME42 installed
-  const LongIndexType lastpluszme1a     = 262656; // last unganged ME1a +z channel = 252288 + 10368
-  const LongIndexType lastnonme42 = 217728; // channels in 2008 installed chambers
-  const LongIndexType lastplusznonme42 = 108864; // = 217728/2
-  const LongIndexType firstme13  = 34561; // First channel of ME13
-  const LongIndexType lastme13   = 48384; // Last channel of ME13
+std::pair<CSCDetId, CSCIndexerOldPostls1::IndexType> CSCIndexerOldPostls1::detIdFromStripChannelIndex(
+    LongIndexType isi) const {
+  const LongIndexType lastnonme1a = 252288;       // channels with ME42 installed
+  const LongIndexType lastpluszme1a = 262656;     // last unganged ME1a +z channel = 252288 + 10368
+  const LongIndexType lastnonme42 = 217728;       // channels in 2008 installed chambers
+  const LongIndexType lastplusznonme42 = 108864;  // = 217728/2
+  const LongIndexType firstme13 = 34561;          // First channel of ME13
+  const LongIndexType lastme13 = 48384;           // Last channel of ME13
 
   const IndexType lastnonme42layer = 2808;
-  const IndexType lastplusznonme42layer = 1404; // = 2808/2
-  const IndexType firstme13layer  = 433; // = 72*6 + 1 (ME13 chambers are 72-108 in range 1-234)
-  const IndexType lastme13layer   = 648; // = 108*6
+  const IndexType lastplusznonme42layer = 1404;  // = 2808/2
+  const IndexType firstme13layer = 433;          // = 72*6 + 1 (ME13 chambers are 72-108 in range 1-234)
+  const IndexType lastme13layer = 648;           // = 108*6
 
   bool me1a = false;
-	
+
   // Most chambers (except ME13 & ME1a) have 80 channels index width allocated
   //   unganged ME1a have 48 channels
   //   ME13 have 64 channels
@@ -190,146 +188,145 @@ std::pair<CSCDetId, CSCIndexerOldPostls1::IndexType>  CSCIndexerOldPostls1::detI
   LongIndexType istart = 0;
   IndexType layerOffset = 0;
 
-  if ( isi <= lastnonme42 ) {
-    // Chambers as of 2008 Installation (ME11 keeps the same #of channels 80 allocated for it in the index)
+  if (isi <= lastnonme42) {
+    // Chambers as of 2008 Installation (ME11 keeps the same #of channels 80
+    // allocated for it in the index)
 
-    if ( isi > lastplusznonme42 ) {
+    if (isi > lastplusznonme42) {
       ie = 2;
       isi -= lastplusznonme42;
     }
-	
-    if ( isi > lastme13 ) { // after ME13
+
+    if (isi > lastme13) {  // after ME13
       istart = lastme13;
       layerOffset = lastme13layer;
-    }
-    else if ( isi >= firstme13 ) { // ME13
+    } else if (isi >= firstme13) {  // ME13
       istart = firstme13 - 1;
       layerOffset = firstme13layer - 1;
       nchan = 64;
     }
-  }
-  else if ( isi <= lastnonme1a ) { // ME42 chambers
+  } else if (isi <= lastnonme1a) {  // ME42 chambers
 
     istart = lastnonme42;
     layerOffset = lastnonme42layer;
 
     // don't care about ie, as ME42 stratch of indices is uniform
-  }
-  else {   // Unganged ME1a channels
-    
+  } else {  // Unganged ME1a channels
+
     me1a = true;
-    if (isi > lastpluszme1a) ie = 2;
-    istart = lastnonme1a; 
+    if (isi > lastpluszme1a)
+      ie = 2;
+    istart = lastnonme1a;
     nchan = 48;
     // layerOffset stays 0, as we want to map them onto ME1b's layer indices
   }
 
-  isi -= istart; // remove earlier group(s)
-  IndexType ichan = (isi-1)%nchan + 1;
-  IndexType ili = (isi-1)/nchan + 1;
-  ili += layerOffset; // add appropriate offset for earlier group(s)
-  if ( ie != 1 ) ili+= lastplusznonme42layer; // add offset to -z endcap; ME42 doesn't need this.
-	
+  isi -= istart;  // remove earlier group(s)
+  IndexType ichan = (isi - 1) % nchan + 1;
+  IndexType ili = (isi - 1) / nchan + 1;
+  ili += layerOffset;  // add appropriate offset for earlier group(s)
+  if (ie != 1)
+    ili += lastplusznonme42layer;  // add offset to -z endcap; ME42 doesn't need
+                                   // this.
+
   CSCDetId id = detIdFromLayerIndex(ili);
 
   // For unganged ME1a we need to turn this ME11 detid into an ME1a one
-  if ( me1a ) id = CSCDetId( id.endcap(), 1, 4, id.chamber(), id.layer() );
-	
+  if (me1a)
+    id = CSCDetId(id.endcap(), 1, 4, id.chamber(), id.layer());
+
   return std::make_pair(id, ichan);
 }
 
-
-std::pair<CSCDetId, CSCIndexerOldPostls1::IndexType>  CSCIndexerOldPostls1::detIdFromChipIndex( IndexType ici ) const {
-
-  const LongIndexType lastnonme1a       = 15768; // chips in chambers with ME42 installed
-  const LongIndexType lastpluszme1a     = 16416; // last unganged ME1a +z chip = 15768 + 648 = 16416
-  const LongIndexType lastnonme42 = 13608; // chips in 2008 installed chambers
-  const LongIndexType lastplusznonme42 = 6804; // = 13608/2
-  const LongIndexType firstme13  = 2161; // First channel of ME13
-  const LongIndexType lastme13   = 3024; // Last channel of ME13
+std::pair<CSCDetId, CSCIndexerOldPostls1::IndexType> CSCIndexerOldPostls1::detIdFromChipIndex(IndexType ici) const {
+  const LongIndexType lastnonme1a = 15768;      // chips in chambers with ME42 installed
+  const LongIndexType lastpluszme1a = 16416;    // last unganged ME1a +z chip = 15768 + 648 = 16416
+  const LongIndexType lastnonme42 = 13608;      // chips in 2008 installed chambers
+  const LongIndexType lastplusznonme42 = 6804;  // = 13608/2
+  const LongIndexType firstme13 = 2161;         // First channel of ME13
+  const LongIndexType lastme13 = 3024;          // Last channel of ME13
 
   const IndexType lastnonme42layer = 2808;
-  const IndexType lastplusznonme42layer = 1404; // = 2808/2
-  const IndexType firstme13layer  = 433; // = 72*6 + 1 (ME13 chambers are 72-108 in range 1-234)
-  const IndexType lastme13layer   = 648; // = 108*6
+  const IndexType lastplusznonme42layer = 1404;  // = 2808/2
+  const IndexType firstme13layer = 433;          // = 72*6 + 1 (ME13 chambers are 72-108 in range 1-234)
+  const IndexType lastme13layer = 648;           // = 108*6
 
   bool me1a = false;
 
   // Most chambers (except ME13, ME1a) have 5 chips/layer
   IndexType nchipPerLayer = 5;
 
-  // Set endcap to +z. This should work for ME42 channels too, since we don't need to calculate its endcap explicitly.
+  // Set endcap to +z. This should work for ME42 channels too, since we don't
+  // need to calculate its endcap explicitly.
   IndexType ie = 1;
 
   LongIndexType istart = 0;
   IndexType layerOffset = 0;
 
-  if ( ici <= lastnonme42 ) {	
-    // Chambers as of 2008 Installation (ME11 keeps the same #of chips 5 allocated for it in the index)
+  if (ici <= lastnonme42) {
+    // Chambers as of 2008 Installation (ME11 keeps the same #of chips 5
+    // allocated for it in the index)
 
-    if ( ici > lastplusznonme42 ) {
+    if (ici > lastplusznonme42) {
       ie = 2;
       ici -= lastplusznonme42;
     }
-	
-    if ( ici > lastme13 ) { // after ME13
+
+    if (ici > lastme13) {  // after ME13
       istart = lastme13;
       layerOffset = lastme13layer;
-    }
-    else if ( ici >= firstme13 ) { // ME13
+    } else if (ici >= firstme13) {  // ME13
       istart = firstme13 - 1;
       layerOffset = firstme13layer - 1;
       nchipPerLayer = 4;
     }
-  }
-  else if ( ici <= lastnonme1a ) {  // ME42 chambers
+  } else if (ici <= lastnonme1a) {  // ME42 chambers
 
     istart = lastnonme42;
     layerOffset = lastnonme42layer;
-    
+
     // don't care about ie, as ME42 stratch of indices is uniform
-  }
-  else {   // Unganged ME1a channels
-    
+  } else {  // Unganged ME1a channels
+
     me1a = true;
-    if (ici > lastpluszme1a) ie = 2;
-    istart = lastnonme1a; 
+    if (ici > lastpluszme1a)
+      ie = 2;
+    istart = lastnonme1a;
     nchipPerLayer = 3;
     // layerOffset stays 0, as we want to map them onto ME1b's layer indices
   }
 
-   ici -= istart; // remove earlier group(s)
-   IndexType ichip = (ici-1)%nchipPerLayer + 1;
-   IndexType ili = (ici-1)/nchipPerLayer + 1;
-   ili += layerOffset; // add appropriate offset for earlier group(s)
-   if ( ie != 1 ) ili+= lastplusznonme42layer; // add offset to -z endcap; ME42 doesn't need this.
-	
-   CSCDetId id = detIdFromLayerIndex(ili);
-   
-   // For unganged ME1a we need to turn this ME11 detid into an ME1a one
-   if ( me1a ) id = CSCDetId( id.endcap(), 1, 4, id.chamber(), id.layer() );
-	
-   return std::make_pair(id, ichip);
-}
+  ici -= istart;  // remove earlier group(s)
+  IndexType ichip = (ici - 1) % nchipPerLayer + 1;
+  IndexType ili = (ici - 1) / nchipPerLayer + 1;
+  ili += layerOffset;  // add appropriate offset for earlier group(s)
+  if (ie != 1)
+    ili += lastplusznonme42layer;  // add offset to -z endcap; ME42 doesn't need
+                                   // this.
 
+  CSCDetId id = detIdFromLayerIndex(ili);
 
-CSCIndexerOldPostls1::GasGainTuple  CSCIndexerOldPostls1::detIdFromGasGainIndex( IndexType igg ) const
-{
+  // For unganged ME1a we need to turn this ME11 detid into an ME1a one
+  if (me1a)
+    id = CSCDetId(id.endcap(), 1, 4, id.chamber(), id.layer());
+
+  return std::make_pair(id, ichip);
+}
+
+CSCIndexerOldPostls1::GasGainTuple CSCIndexerOldPostls1::detIdFromGasGainIndex(IndexType igg) const {
   const int n_types = 20;
-  const IndexType type_starts[n_types] =
-    {1,  1081, 4321, 6913, 8533, 13933, 15553, 20953, 22573, 23653, 26893, 29485, 31105, 36505, 38125, 43525, 45145, 50545, 55945, 56593};
-  //+1/1 +1/2  +1/3  +2/1  +2/2  +3/1   +3/2   +4/1   -1/1   -1/2   -1/3   -2/1   -2/2   -3/1   -3/2   -4/1   +4/2   -4/2   +1/4   -1/4
+  const IndexType type_starts[n_types] = {1,     1081,  4321,  6913,  8533,  13933, 15553, 20953, 22573, 23653,
+                                          26893, 29485, 31105, 36505, 38125, 43525, 45145, 50545, 55945, 56593};
+  //+1/1 +1/2  +1/3  +2/1  +2/2  +3/1   +3/2   +4/1   -1/1   -1/2   -1/3   -2/1
+  //-2/2   -3/1   -3/2   -4/1   +4/2   -4/2   +1/4   -1/4
 
-  const int endcaps[n_types] =
-    {1,  1,    1,    1,    1,    1,     1,     1,     2,     2,     2,     2,     2,     2,     2,     2,     1,     2,     1,     2};
-  const int stations[n_types] =
-    {1,  1,    1,    2,    2,    3,     3,     4,     1,     1,     1,     2,     2,     3,     3,     4,     4,     4,     1,     1};
-  const int rings[n_types] =
-    {1,  2,    3,    1,    2,    1,     2,     1,     1,     2,     3,     1,     2,     1,     2,     1,     2,     2,     4,     4};
+  const int endcaps[n_types] = {1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 1, 2};
+  const int stations[n_types] = {1, 1, 1, 2, 2, 3, 3, 4, 1, 1, 1, 2, 2, 3, 3, 4, 4, 4, 1, 1};
+  const int rings[n_types] = {1, 2, 3, 1, 2, 1, 2, 1, 1, 2, 3, 1, 2, 1, 2, 1, 2, 2, 4, 4};
 
   // determine chamber type
   std::vector<IndexType> v_type_starts(type_starts, type_starts + n_types);
-  int type = int(std::upper_bound(v_type_starts.begin(), v_type_starts.end(), igg) -  v_type_starts.begin()) - 1;
+  int type = int(std::upper_bound(v_type_starts.begin(), v_type_starts.end(), igg) - v_type_starts.begin()) - 1;
 
   // determine factors for #HVsectors and #chips
   int sectors_per_layer = sectorsPerLayer(stations[type], rings[type]);
@@ -341,26 +338,24 @@ CSCIndexerOldPostls1::GasGainTuple  CSCIndexerOldPostls1::detIdFromGasGainIndex(
 
   // extract chamber & layer
   int chamber = (igg_chamber_and_layer - 1) / 6 + 1;
-  int layer   = (igg_chamber_and_layer - 1) % 6 + 1;
+  int layer = (igg_chamber_and_layer - 1) % 6 + 1;
 
-  IndexType igg_hvseg_etc         = (igg_chamber_etc - 1) % sectors_per_layer + 1;
+  IndexType igg_hvseg_etc = (igg_chamber_etc - 1) % sectors_per_layer + 1;
 
   // extract HVsegment and chip numbers
   IndexType hvsegment = (igg_hvseg_etc - 1) / chips_per_layer + 1;
-  IndexType chip      = (igg_hvseg_etc - 1) % chips_per_layer + 1;
+  IndexType chip = (igg_hvseg_etc - 1) % chips_per_layer + 1;
 
   CSCDetId id(endcaps[type], stations[type], rings[type], chamber, layer);
   return boost::make_tuple(id, hvsegment, chip);
 }
 
-
-int CSCIndexerOldPostls1::dbIndex(const CSCDetId & id, int & channel)
-{
+int CSCIndexerOldPostls1::dbIndex(const CSCDetId &id, int &channel) {
   int ec = id.endcap();
   int st = id.station();
   int rg = id.ring();
   int ch = id.chamber();
   int la = id.layer();
 
-  return ec*100000 + st*10000 + rg*1000 + ch*10 + la;
+  return ec * 100000 + st * 10000 + rg * 1000 + ch * 10 + la;
 }
diff --git a/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldPostls1.h b/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldPostls1.h
index ba074cba85bc6..4e347ba81a534 100644
--- a/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldPostls1.h
+++ b/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldPostls1.h
@@ -5,60 +5,66 @@
  * Creates a linear index for various sublevels of the endcap muon CSC system.
  *
  * It supplies a linear index for:
- * 1. Each chamber of the CSC system: range 1-468 (CSC system as installed 2008) 469-540 for ME42 <br>
- * 2. Each layer of the CSC system: range 1-2808 (CSCs 2008) 2809-3240 for ME42 <br>
- * 3. Each strip channel of the CSC system: range 1-217728 (CSCs 2008) 217729-252288 for ME42 <br>
- * 4. Each Buckeye chip (1 for each layer in each CFEB)of the CSC system: range 1-13608 (CSCs 2008) 13609-15768 for ME42 <br>
- * 5. Each Gas Gain Sector (1 for each [CFEB*HV segment] combination in each layer): range 1-45144 (CSCs 2008) 45145-55944 for ME42 <br>
- * 6. Extended for unganged ME1a, appended to the standard list: only in the strip list
- *    252289-273024 (i.e. an extra 2 x 36 x 6 x 48 = 20736 channels)
+ * 1. Each chamber of the CSC system: range 1-468 (CSC system as installed 2008)
+ * 469-540 for ME42 <br>
+ * 2. Each layer of the CSC system: range 1-2808 (CSCs 2008) 2809-3240 for ME42
+ * <br>
+ * 3. Each strip channel of the CSC system: range 1-217728 (CSCs 2008)
+ * 217729-252288 for ME42 <br>
+ * 4. Each Buckeye chip (1 for each layer in each CFEB)of the CSC system: range
+ * 1-13608 (CSCs 2008) 13609-15768 for ME42 <br>
+ * 5. Each Gas Gain Sector (1 for each [CFEB*HV segment] combination in each
+ * layer): range 1-45144 (CSCs 2008) 45145-55944 for ME42 <br>
+ * 6. Extended for unganged ME1a, appended to the standard list: only in the
+ * strip list 252289-273024 (i.e. an extra 2 x 36 x 6 x 48 = 20736 channels)
  *
- * The chamber and layer may be specified by CSCDetId or labels for endcap, station, ring, chamber, layer.
- * The strip channel is a value 1-80 (or 64: ME13 chambers have only 64 channels.)
- * The chip number is a value 1-30 (or 24: ME13 chambers have only 24 chips.)
+ * The chamber and layer may be specified by CSCDetId or labels for endcap,
+ * station, ring, chamber, layer. The strip channel is a value 1-80 (or 64: ME13
+ * chambers have only 64 channels.) The chip number is a value 1-30 (or 24: ME13
+ * chambers have only 24 chips.)
  *
  * The main user interface is the set of functions <br>
  *   chamberIndex(.) <br>
  *   layerIndex(.) <br>
  *   stripChannelIndex(.) <br>
  *   chipIndex(.) <br>
- * But the other functions are public since they may be useful in contexts other than for
- * Conditions Data for which the above functions are intended.
+ * But the other functions are public since they may be useful in contexts other
+ * than for Conditions Data for which the above functions are intended.
  *
- * \warning This class is hard-wired for the CSC system at start-up of CMS in 2008.
- * with rings ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41 totalling 234 chambers per endcap.
- * But ME42 is appended (to permit simulation studies), so the chamber order is <br>
- * +z ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41, <br>
- * -z ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41, <br>
- * +z ME42, -z ME42 <br>
+ * \warning This class is hard-wired for the CSC system at start-up of CMS in
+ * 2008. with rings ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41 totalling 234
+ * chambers per endcap. But ME42 is appended (to permit simulation studies), so
+ * the chamber order is <br> +z ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41,
+ * <br> -z ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41, <br> +z ME42, -z ME42
+ * <br>
  *
  * Further it is extended for hypothetical unganged ME1a strip channels.
  * The strip list then appends
  * +z ME1a, -z ME1a <br>
  *
- * \warning This intentionally has "magic numbers galore" which, supposedly, is for better performance.
+ * \warning This intentionally has "magic numbers galore" which, supposedly, is
+ * for better performance.
  *
  * \warning EVERY LABEL COUNTS FROM ONE NOT ZERO.
  *
  */
 
 #include <DataFormats/MuonDetId/interface/CSCDetId.h>
-#include <vector>
+#include <boost/tuple/tuple.hpp>
 #include <iosfwd>
 #include <utility>  // for pair
-#include <boost/tuple/tuple.hpp>
+#include <vector>
 
 class CSCIndexerOldPostls1 {
-
 public:
-
   typedef uint16_t IndexType;
   typedef uint32_t LongIndexType;
 
-  typedef boost::tuple<CSCDetId,  // id
-                       IndexType, // HV segment
-                       IndexType  // chip
-                      > GasGainTuple;
+  typedef boost::tuple<CSCDetId,   // id
+                       IndexType,  // HV segment
+                       IndexType   // chip
+                       >
+      GasGainTuple;
 
   static const IndexType MAX_CHAMBER_INDEX = 540;
   static const IndexType MAX_LAYER_INDEX = 3240;
@@ -70,16 +76,16 @@ class CSCIndexerOldPostls1 {
   ~CSCIndexerOldPostls1(){};
 
   /**
-   * Starting index for first chamber in ring 'ir' of station 'is' in endcap 'ie',
-   * in range 1-468 (CSCs 2008) or 469-540 (ME42).
+   * Starting index for first chamber in ring 'ir' of station 'is' in endcap
+   * 'ie', in range 1-468 (CSCs 2008) or 469-540 (ME42).
    *
    * WARNING: Considers both ME1a and ME1b to be part of one ME11 chamber
    *          (result would be the same for is=1 and ir=1 or 4).
    */
   IndexType startChamberIndexInEndcap(IndexType ie, IndexType is, IndexType ir) const {
-    const IndexType nschin[32] = { 1,37,73,1,        109,127,0,0,  163,181,0,0,  217,469,0,0,
-                                   235,271,307,235,  343,361,0,0,  397,415,0,0,  451,505,0,0 };
-    return nschin[(ie-1)*16 + (is-1)*4 + ir - 1];
+    const IndexType nschin[32] = {1,   37,  73,  1,   109, 127, 0, 0, 163, 181, 0, 0, 217, 469, 0, 0,
+                                  235, 271, 307, 235, 343, 361, 0, 0, 397, 415, 0, 0, 451, 505, 0, 0};
+    return nschin[(ie - 1) * 16 + (is - 1) * 4 + ir - 1];
   }
 
   /**
@@ -90,7 +96,7 @@ class CSCIndexerOldPostls1 {
    *          (result would be the same for is=1 and ir=1 or 4).
    */
   IndexType chamberIndex(IndexType ie, IndexType is, IndexType ir, IndexType ic) const {
-    return startChamberIndexInEndcap(ie,is,ir) + ic - 1; // -1 so start index _is_ ic=1
+    return startChamberIndexInEndcap(ie, is, ir) + ic - 1;  // -1 so start index _is_ ic=1
   }
 
   /**
@@ -102,8 +108,8 @@ class CSCIndexerOldPostls1 {
    * WARNING: Considers both ME1a and ME1b to be part of one ME11 chamber
    *          (result would be the same for is=1 and ir=1 or 4).
    */
-  IndexType chamberIndex( const CSCDetId& id ) const {
-    return chamberIndex( id.endcap(), id.station(), id.ring(), id.chamber() );
+  IndexType chamberIndex(const CSCDetId &id) const {
+    return chamberIndex(id.endcap(), id.station(), id.ring(), id.chamber());
   }
 
   /**
@@ -112,33 +118,34 @@ class CSCIndexerOldPostls1 {
    *
    * Output is 1-2808 (CSCs 2008) 2809-3240 (ME42)
    *
-   * WARNING: Considers both ME1a and ME1b to share layers of single ME11 chamber
-   *          (result would be the same for is=1 and ir=1 or 4).
+   * WARNING: Considers both ME1a and ME1b to share layers of single ME11
+   * chamber (result would be the same for is=1 and ir=1 or 4).
    */
-  IndexType layerIndex( const CSCDetId& id ) const {
+  IndexType layerIndex(const CSCDetId &id) const {
     return layerIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer());
   }
 
   /**
-   * Linear index for layer 'il' of chamber 'ic' in ring 'ir' of station 'is' in endcap 'ie',
-   * in range 1-2808 (CSCs 2008) or 2809-3240 (ME42).
+   * Linear index for layer 'il' of chamber 'ic' in ring 'ir' of station 'is' in
+   * endcap 'ie', in range 1-2808 (CSCs 2008) or 2809-3240 (ME42).
    *
-   * WARNING: Considers both ME1a and ME1b to share layers of single ME11 chamber
-   *          (result would be the same for is=1 and ir=1 or 4).
+   * WARNING: Considers both ME1a and ME1b to share layers of single ME11
+   * chamber (result would be the same for is=1 and ir=1 or 4).
    */
   IndexType layerIndex(IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il) const {
-    return (chamberIndex(ie,is,ir,ic) - 1 ) * 6 + il;
+    return (chamberIndex(ie, is, ir, ic) - 1) * 6 + il;
   }
 
   /**
    * How many (physical hardware) rings are there in station is=1, 2, 3, 4 ?
    *
    * WARNING:
-   * - ME1 has only 3 physical rings (the hardware) not 4 (virtual ring 4 is used offline for ME1a).
+   * - ME1 has only 3 physical rings (the hardware) not 4 (virtual ring 4 is
+   * used offline for ME1a).
    * - Includes ME42 so claims 2 rings in station 4.
    */
-  IndexType ringsInStation( IndexType is ) const {
-    const IndexType nrings[5] = { 0,3,2,2,2 }; // rings per station
+  IndexType ringsInStation(IndexType is) const {
+    const IndexType nrings[5] = {0, 3, 2, 2, 2};  // rings per station
     return nrings[is];
   }
 
@@ -146,11 +153,12 @@ class CSCIndexerOldPostls1 {
    * How many offline rings are there in station is=1, 2, 3, 4 ?
    *
    * WARNING:
-   * - ME1 has 4 rings in the offline notation (virtual ring 4 is used for ME1a).
+   * - ME1 has 4 rings in the offline notation (virtual ring 4 is used for
+   * ME1a).
    * - Includes ME42 so claims 2 rings in station 4.
    */
-  IndexType offlineRingsInStation( IndexType is ) const {
-    const IndexType nrings[5] = { 0,4,2,2,2 }; // rings per station
+  IndexType offlineRingsInStation(IndexType is) const {
+    const IndexType nrings[5] = {0, 4, 2, 2, 2};  // rings per station
     return nrings[is];
   }
 
@@ -160,11 +168,11 @@ class CSCIndexerOldPostls1 {
    * Works for ME1a (virtual ring 4 of ME1) too.
    */
   IndexType chambersInRingOfStation(IndexType is, IndexType ir) const {
-    const IndexType nCinR[16] = { 36,36,36,36,  18,36,0,0,  18,36,0,0,  18,36,0,0 }; // chambers in ring
-    return nCinR[(is-1)*4 + ir - 1];
+    const IndexType nCinR[16] = {36, 36, 36, 36, 18, 36, 0, 0, 18, 36, 0, 0, 18, 36, 0, 0};  // chambers in ring
+    return nCinR[(is - 1) * 4 + ir - 1];
   }
 
-  /** 
+  /**
    * Number of strip channels per layer in a chamber in ring ir of station is.
    *
    * Station label range 1-4, Ring label range 1-4.
@@ -172,62 +180,68 @@ class CSCIndexerOldPostls1 {
    *
    * WARNING:
    * - ME1a channels are considered to be unganged i.e. 48 not the standard 16.
-   * - ME1b keeps 80 channels for the indexing purposes, however channels 65-80 are ignored in the unganged case.
+   * - ME1b keeps 80 channels for the indexing purposes, however channels 65-80
+   * are ignored in the unganged case.
    */
-  IndexType stripChannelsPerLayer( IndexType is, IndexType ir ) const {
-    const IndexType nSCinC[16] = { 80,80,64,48,  80,80,0,0,  80,80,0,0,  80,80,0,0 };
-    return nSCinC[(is-1)*4 + ir - 1];
+  IndexType stripChannelsPerLayer(IndexType is, IndexType ir) const {
+    const IndexType nSCinC[16] = {80, 80, 64, 48, 80, 80, 0, 0, 80, 80, 0, 0, 80, 80, 0, 0};
+    return nSCinC[(is - 1) * 4 + ir - 1];
   }
 
   /**
-   * Linear index for 1st strip channel in ring 'ir' of station 'is' in endcap 'ie'.
+   * Linear index for 1st strip channel in ring 'ir' of station 'is' in endcap
+   * 'ie'.
    *
    * Endcap label range 1-2, Station label range 1-4, Ring label range 1-3.
    *
-   * WARNING: ME1a channels are  NOT  considered the last 16 of the 80 total in each layer of an ME11 chamber!
+   * WARNING: ME1a channels are  NOT  considered the last 16 of the 80 total in
+   * each layer of an ME11 chamber!
    */
-  LongIndexType stripChannelStart( IndexType ie, IndexType is, IndexType ir ) const {
-    // These are in the ranges 1-217728 (CSCs 2008), 217729-252288 (ME42), and 252289-273024 (unganged ME1a)
-    // There are 1-108884 channels per endcap (CSCs 2008), 17280 channels per endcap (ME42),
-    // and 10368 channels per endcap (unganged ME1a)
-    // Start of -z channels (CSCs 2008) is 108864 + 1    = 108865
-    // Start of +z (ME42) is 217728 + 1                  = 217729
-    // Start of -z (ME42) is 217728 + 1 + 17280          = 235009
-    // Start of +z (unganged ME1a) is 252288 + 1         = 252289
-    // Start of -z (unganged ME1a) is 252288 + 1 + 10368 = 262657
-    const LongIndexType nStart[32] =
-      {      1, 17281, 34561,252289,   48385, 57025,0,0,   74305, 82945,0,0,  100225,217729,0,0,
-        108865,126145,143425,262657,  157249,165889,0,0,  183169,191809,0,0,  209089,235009,0,0 };
-    return  nStart[(ie-1)*16 + (is-1)*4 + ir - 1];
+  LongIndexType stripChannelStart(IndexType ie, IndexType is, IndexType ir) const {
+    // These are in the ranges 1-217728 (CSCs 2008), 217729-252288 (ME42), and
+    // 252289-273024 (unganged ME1a) There are 1-108884 channels per endcap
+    // (CSCs 2008), 17280 channels per endcap (ME42), and 10368 channels per
+    // endcap (unganged ME1a) Start of -z channels (CSCs 2008) is 108864 + 1 =
+    // 108865 Start of +z (ME42) is 217728 + 1                  = 217729 Start
+    // of -z (ME42) is 217728 + 1 + 17280          = 235009 Start of +z
+    // (unganged ME1a) is 252288 + 1         = 252289 Start of -z (unganged
+    // ME1a) is 252288 + 1 + 10368 = 262657
+    const LongIndexType nStart[32] = {1, 17281,  34561,  252289, 48385, 57025,  0,      0,      74305,  82945,  0,
+                                      0, 100225, 217729, 0,      0,     108865, 126145, 143425, 262657, 157249, 165889,
+                                      0, 0,      183169, 191809, 0,     0,      209089, 235009, 0,      0};
+    return nStart[(ie - 1) * 16 + (is - 1) * 4 + ir - 1];
   }
 
   /**
-   * Linear index for strip channel istrip in layer 'il' of chamber 'ic' of ring 'ir'
-   * in station 'is' of endcap 'ie'.
+   * Linear index for strip channel istrip in layer 'il' of chamber 'ic' of ring
+   * 'ir' in station 'is' of endcap 'ie'.
    *
-   * Output is 1-217728 (CSCs 2008) or 217729-252288 (ME42) or 252289-273024 (unganged ME1a)
-   * WARNING: Supplying ME1a values returns index for unganged ME1a channels, not for channels 65-80 of ME11.
+   * Output is 1-217728 (CSCs 2008) or 217729-252288 (ME42) or 252289-273024
+   * (unganged ME1a) WARNING: Supplying ME1a values returns index for unganged
+   * ME1a channels, not for channels 65-80 of ME11.
    *
-   * WARNING: Use at your own risk! You must input labels within hardware ranges.
-   * No trapping on out-of-range values!
+   * WARNING: Use at your own risk! You must input labels within hardware
+   * ranges. No trapping on out-of-range values!
    */
-  LongIndexType stripChannelIndex( IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il, IndexType istrip ) const {
-    return stripChannelStart(ie,is,ir)+( (ic-1)*6 + il - 1 )*stripChannelsPerLayer(is,ir) + (istrip-1);
+  LongIndexType stripChannelIndex(
+      IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il, IndexType istrip) const {
+    return stripChannelStart(ie, is, ir) + ((ic - 1) * 6 + il - 1) * stripChannelsPerLayer(is, ir) + (istrip - 1);
   }
 
   /**
    * Linear index for strip channel 'istrip' in layer labelled by CSCDetId 'id'.
    *
-   * Output is 1-217728 (CSCs 2008) or 217729-252288 (ME42) or 252289-273024 (unganged ME1a)
+   * Output is 1-217728 (CSCs 2008) or 217729-252288 (ME42) or 252289-273024
+   * (unganged ME1a)
    *
    * WARNING: Use at your own risk! The supplied CSCDetId must be a layer id.
    * No trapping on out-of-range values!
    */
-  LongIndexType stripChannelIndex( const CSCDetId& id, IndexType istrip ) const {
-    return stripChannelIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer(), istrip );
+  LongIndexType stripChannelIndex(const CSCDetId &id, IndexType istrip) const {
+    return stripChannelIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer(), istrip);
   }
 
-  /** 
+  /**
    * Number of Buckeye chips per layer in a chamber in ring ir of station is.
    *
    * Station label range 1-4, Ring label range 1-3.
@@ -236,49 +250,52 @@ class CSCIndexerOldPostls1 {
    * Considers ME42 as standard 5 chip per layer chambers.
    *
    * WARNING:
-   * - ME1a channels are considered to be unganged and have their own 3 chips (ME1b has 4 chips).
-   * - ME1b keeps 5 chips for the indexing purposes, however indices for the chip #5 are ignored in the unganged case.
+   * - ME1a channels are considered to be unganged and have their own 3 chips
+   * (ME1b has 4 chips).
+   * - ME1b keeps 5 chips for the indexing purposes, however indices for the
+   * chip #5 are ignored in the unganged case.
    */
-  IndexType chipsPerLayer( IndexType is, IndexType ir ) const {
-    const IndexType nCinL[16] = { 5,5,4,3,  5,5,0,0,  5,5,0,0,  5,5,0,0 };
-    return nCinL[(is-1)*4 + ir - 1];
+  IndexType chipsPerLayer(IndexType is, IndexType ir) const {
+    const IndexType nCinL[16] = {5, 5, 4, 3, 5, 5, 0, 0, 5, 5, 0, 0, 5, 5, 0, 0};
+    return nCinL[(is - 1) * 4 + ir - 1];
   }
 
   /**
-   * Linear index for 1st Buckey chip in ring 'ir' of station 'is' in endcap 'ie'.
+   * Linear index for 1st Buckey chip in ring 'ir' of station 'is' in endcap
+   * 'ie'.
    *
    * Endcap label range 1-2, Station label range 1-4, Ring label range 1-3.
-   * 
+   *
    * Works for ME1a input as is=1, ir=4
-   * WARNING: ME1a channels are the last 3 of the 7 chips total in each layer of an ME11 chamber, 
+   * WARNING: ME1a channels are the last 3 of the 7 chips total in each layer of
+   * an ME11 chamber,
    */
-   IndexType chipStart( IndexType ie, IndexType is, IndexType ir ) const {
-
-     // These are in the ranges 1-13608 (CSCs 2008) and 13609-15768 (ME42) and 15769-17064 (ME1a).
-     // There are 1-6804 chips per endcap (CSCs 2008) and 1080 chips per endcap (ME42) and 648 chips per endcap (ME1a).
-     // Start of -z channels (CSCs 2008) is 6804 + 1 = 6805
-     // Start of +z (ME42) is 13608 + 1 = 13609
-     // Start of -z (ME42) is 13608 + 1 + 1080 = 14689
-     // Start of +z (ME1a) is 15768 + 1 = 15769
-     // Start of -z (ME1a) is 15768 + 1 + 648 = 16417
-     const IndexType nStart[32] = {1,   1081, 2161, 15769,  3025, 3565, 0,0, 4645, 5185, 0,0, 6265, 13609,0,0,
-				   6805,7885, 8965, 16417,  9829, 10369,0,0, 11449,11989,0,0, 13069,14689,0,0 };
-     return  nStart[(ie-1)*16 + (is-1)*4 + ir - 1];
-   }
+  IndexType chipStart(IndexType ie, IndexType is, IndexType ir) const {
+    // These are in the ranges 1-13608 (CSCs 2008) and 13609-15768 (ME42) and
+    // 15769-17064 (ME1a). There are 1-6804 chips per endcap (CSCs 2008) and
+    // 1080 chips per endcap (ME42) and 648 chips per endcap (ME1a). Start of -z
+    // channels (CSCs 2008) is 6804 + 1 = 6805 Start of +z (ME42) is 13608 + 1 =
+    // 13609 Start of -z (ME42) is 13608 + 1 + 1080 = 14689 Start of +z (ME1a)
+    // is 15768 + 1 = 15769 Start of -z (ME1a) is 15768 + 1 + 648 = 16417
+    const IndexType nStart[32] = {1,    1081, 2161, 15769, 3025, 3565,  0, 0, 4645,  5185,  0, 0, 6265,  13609, 0, 0,
+                                  6805, 7885, 8965, 16417, 9829, 10369, 0, 0, 11449, 11989, 0, 0, 13069, 14689, 0, 0};
+    return nStart[(ie - 1) * 16 + (is - 1) * 4 + ir - 1];
+  }
 
   /**
-   * Linear index for Buckeye chip 'ichip' in layer 'il' of chamber 'ic' of ring 'ir'
-   * in station 'is' of endcap 'ie'.
+   * Linear index for Buckeye chip 'ichip' in layer 'il' of chamber 'ic' of ring
+   * 'ir' in station 'is' of endcap 'ie'.
    *
    * Output is 1-13608 (CSCs 2008) or 13609-15768 (ME42) or 15769-17064 (ME1a).
    *
-   * WARNING: Use at your own risk! You must input labels within hardware ranges.
-   * No trapping on out-of-range values!
+   * WARNING: Use at your own risk! You must input labels within hardware
+   * ranges. No trapping on out-of-range values!
    */
-   IndexType chipIndex( IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il, IndexType ichip ) const {
-     //printf("ME%d/%d/%d/%d layer %d  chip %d chipindex %d\n",ie,is,ir,ic,il,ichip,chipStart(ie,is,ir)+( (ic-1)*6 + il - 1 )*chipsPerLayer(is,ir) + (ichip-1));
-     return chipStart(ie,is,ir)+( (ic-1)*6 + il - 1 )*chipsPerLayer(is,ir) + (ichip-1);
-
+  IndexType chipIndex(IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il, IndexType ichip) const {
+    // printf("ME%d/%d/%d/%d layer %d  chip %d chipindex
+    // %d\n",ie,is,ir,ic,il,ichip,chipStart(ie,is,ir)+( (ic-1)*6 + il - 1
+    // )*chipsPerLayer(is,ir) + (ichip-1));
+    return chipStart(ie, is, ir) + ((ic - 1) * 6 + il - 1) * chipsPerLayer(is, ir) + (ichip - 1);
   }
 
   /**
@@ -289,44 +306,43 @@ class CSCIndexerOldPostls1 {
    * WARNING: Use at your own risk! The supplied CSCDetId must be a layer id.
    * No trapping on out-of-range values!
    */
-   IndexType chipIndex( const CSCDetId& id, IndexType ichip ) const {
-      return chipIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer(), ichip);
-   }
+  IndexType chipIndex(const CSCDetId &id, IndexType ichip) const {
+    return chipIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer(), ichip);
+  }
 
   /**
-   * Linear index inside of a chamber for Buckeye chip processing strip 'istrip'.
+   * Linear index inside of a chamber for Buckeye chip processing strip
+   * 'istrip'.
    *
    * Output is 1-5.
    *
-   * WARNING: Use at your own risk! The supplied CSCDetId must be a strip id 1-80
-   * ME1/1b strips must be 1-64
-   * ME1/1a strips must be 1-48
-   * No trapping on out-of-range values!
+   * WARNING: Use at your own risk! The supplied CSCDetId must be a strip id
+   * 1-80 ME1/1b strips must be 1-64 ME1/1a strips must be 1-48 No trapping on
+   * out-of-range values!
    */
 
-   IndexType chipIndex( IndexType istrip ) const {
-     return (istrip-1)/16 + 1;
-   }
+  IndexType chipIndex(IndexType istrip) const { return (istrip - 1) / 16 + 1; }
 
-  /** 
+  /**
    * Number of HV segments per layer in a chamber in ring ir of station is.
    *
    * Station label range 1-4, Ring label range 1-4.
    *
-   * WARNING: ME1a (ir=4), ME1b(ir=1) and whole ME11 are all assumed to have the same single HV segment
+   * WARNING: ME1a (ir=4), ME1b(ir=1) and whole ME11 are all assumed to have the
+   * same single HV segment
    */
-  IndexType hvSegmentsPerLayer( IndexType is, IndexType ir ) const {
-    const IndexType nSinL[16] = { 1,3,3,1, 3,5,0,0, 3,5,0,0, 3,5,0,0 };
-    return nSinL[(is-1)*4 + ir - 1];
+  IndexType hvSegmentsPerLayer(IndexType is, IndexType ir) const {
+    const IndexType nSinL[16] = {1, 3, 3, 1, 3, 5, 0, 0, 3, 5, 0, 0, 3, 5, 0, 0};
+    return nSinL[(is - 1) * 4 + ir - 1];
   }
 
-  /** 
+  /**
    * Number of Gas Gain sectors per layer in a chamber in ring ir of station is.
    *
    * Station label range 1-4, Ring label range 1-4.
    */
-  IndexType sectorsPerLayer( IndexType is, IndexType ir ) const {
-    return chipsPerLayer(is,ir)*hvSegmentsPerLayer(is,ir);
+  IndexType sectorsPerLayer(IndexType is, IndexType ir) const {
+    return chipsPerLayer(is, ir) * hvSegmentsPerLayer(is, ir);
   }
 
   /**
@@ -334,24 +350,26 @@ class CSCIndexerOldPostls1 {
    *
    * Output is 1-5.
    *
-   * WARNING: Use at your own risk! The supplied CSCDetId must be chamber station, ring, and wire.
-   * No trapping on out-of-range values!
+   * WARNING: Use at your own risk! The supplied CSCDetId must be chamber
+   * station, ring, and wire. No trapping on out-of-range values!
    */
-  IndexType hvSegmentIndex(IndexType is, IndexType ir, IndexType iwire ) const;
+  IndexType hvSegmentIndex(IndexType is, IndexType ir, IndexType iwire) const;
 
   /**
-   * Linear index for 1st Gas gain sector in ring 'ir' of station 'is' in endcap 'ie'.
+   * Linear index for 1st Gas gain sector in ring 'ir' of station 'is' in endcap
+   * 'ie'.
    *
    * Endcap label range 1-2, Station label range 1-4, Ring label range 1-3.
    *
    * WARNING:
-   *   current: ME1a channels are the last 1 of the 5 chips total in each layer of an ME11 chamber, 
-   *            and an input ir=4 is invalid and will give nonsense.
-   *   upgraded: 
+   *   current: ME1a channels are the last 1 of the 5 chips total in each layer
+   * of an ME11 chamber, and an input ir=4 is invalid and will give nonsense.
+   *   upgraded:
    */
-  IndexType sectorStart( IndexType ie, IndexType is, IndexType ir ) const {
-    // There are 36 chambers * 6 layers * 5 CFEB's * 1 HV segment = 1080 gas-gain sectors in ME1/1 (non-upgraded)
-    // There are 36 chambers * 6 layers * 3 CFEB's * 1 HV segment = 648 gas-gain sectors in ME1/1a (upgraded)
+  IndexType sectorStart(IndexType ie, IndexType is, IndexType ir) const {
+    // There are 36 chambers * 6 layers * 5 CFEB's * 1 HV segment = 1080
+    // gas-gain sectors in ME1/1 (non-upgraded) There are 36 chambers * 6 layers
+    // * 3 CFEB's * 1 HV segment = 648 gas-gain sectors in ME1/1a (upgraded)
     // There are 36*6*5*3 = 3240 gas-gain sectors in ME1/2
     // There are 36*6*4*3 = 2592 gas-gain sectors in ME1/3
     // There are 18*6*5*3 = 1620 gas-gain sectors in ME[2-4]/1
@@ -361,86 +379,102 @@ class CSCIndexerOldPostls1 {
     // Start of -z (ME42) is 45144 + 1 + 5400 = 50545
     // Start of +z (ME1a) is 45144 + 1 + 2*5400 = 55945
     // Start of -z (ME42) is 45144 + 1 + 2*5400 + 648 = 56593
-    const IndexType nStart[32] = {1    , 1081 ,  4321, 55945,  //ME+1/1,ME+1/2,ME+1/3,ME+1/a
-				  6913 , 8533 ,     0,     0,  //ME+2/1,ME+2/2
-				  13933, 15553,     0,     0,  //ME+3/1,ME+3/2
-				  20953, 45145,     0,     0,  //ME+4/1,ME+4/2 (note, ME+4/2 index follows ME-4/1...)
-				  22573, 23653, 26893, 56593,  //ME-1/1,ME-1/2,ME-1/3,ME+1/a
-				  29485, 31105,     0,     0,  //ME-2/1,ME-2/2
-				  36505, 38125,     0,     0,  //ME-3/1,ME-3/2
-				  43525, 50545,     0,     0 };//ME-4/1,ME-4/2 (note, ME-4/2 index follows ME+4/2...)
-    return  nStart[(ie-1)*16 + (is-1)*4 + ir - 1];
+    const IndexType nStart[32] = {1,     1081,  4321,  55945,  // ME+1/1,ME+1/2,ME+1/3,ME+1/a
+                                  6913,  8533,  0,     0,      // ME+2/1,ME+2/2
+                                  13933, 15553, 0,     0,      // ME+3/1,ME+3/2
+                                  20953, 45145, 0,     0,      // ME+4/1,ME+4/2 (note, ME+4/2 index follows ME-4/1...)
+                                  22573, 23653, 26893, 56593,  // ME-1/1,ME-1/2,ME-1/3,ME+1/a
+                                  29485, 31105, 0,     0,      // ME-2/1,ME-2/2
+                                  36505, 38125, 0,     0,      // ME-3/1,ME-3/2
+                                  43525, 50545, 0,     0};     // ME-4/1,ME-4/2 (note, ME-4/2 index follows ME+4/2...)
+    return nStart[(ie - 1) * 16 + (is - 1) * 4 + ir - 1];
   }
 
   /**
-   * Linear index for Gas gain sector, based on CSCDetId 'id', cathode strip 'istrip' and anode wire 'iwire' 
+   * Linear index for Gas gain sector, based on CSCDetId 'id', cathode strip
+   * 'istrip' and anode wire 'iwire'
    *
    * Output is 1-45144 (CSCs 2008) and 45145-55944 (ME42) and 55945-57240 (ME1a)
    *
-   * WARNING: Use at your own risk!  You must input labels within hardware ranges (e.g., 'id' must correspond 
-   * to a specific layer 1-6). No trapping on out-of-range values!
+   * WARNING: Use at your own risk!  You must input labels within hardware
+   * ranges (e.g., 'id' must correspond to a specific layer 1-6). No trapping on
+   * out-of-range values!
    */
-  IndexType gasGainIndex( const CSCDetId& id, IndexType istrip, IndexType iwire ) const {
-    return gasGainIndex( id.endcap(), id.station(), id.ring(), id.chamber(), id.layer(),
-                         hvSegmentIndex(id.station(), id.ring(), iwire), chipIndex(istrip) );
+  IndexType gasGainIndex(const CSCDetId &id, IndexType istrip, IndexType iwire) const {
+    return gasGainIndex(id.endcap(),
+                        id.station(),
+                        id.ring(),
+                        id.chamber(),
+                        id.layer(),
+                        hvSegmentIndex(id.station(), id.ring(), iwire),
+                        chipIndex(istrip));
   }
 
   /**
-   * Linear index for Gas gain sector, based on CSCDetId 'id', the HV segment# and the chip#.
-   * Note: to allow method overloading, the parameters order is reversed comparing to the (id,strip,wire) method
+   * Linear index for Gas gain sector, based on CSCDetId 'id', the HV segment#
+   * and the chip#. Note: to allow method overloading, the parameters order is
+   * reversed comparing to the (id,strip,wire) method
    *
    * Output is 1-45144 (CSCs 2008) and 45145-55944 (ME42) and 55945-57240 (ME1a)
    *
-   * WARNING: Use at your own risk! You must input labels within hardware ranges.
-   * No trapping on out-of-range values!
+   * WARNING: Use at your own risk! You must input labels within hardware
+   * ranges. No trapping on out-of-range values!
    */
-  IndexType gasGainIndex( IndexType ihvsegment, IndexType ichip, const CSCDetId& id ) const {
+  IndexType gasGainIndex(IndexType ihvsegment, IndexType ichip, const CSCDetId &id) const {
     return gasGainIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer(), ihvsegment, ichip);
   }
 
   /**
    * Linear index for Gas gain sector, based on the HV segment# and the chip#
-   * located in layer 'il' of chamber 'ic' of ring 'ir' in station 'is' of endcap 'ie'.
+   * located in layer 'il' of chamber 'ic' of ring 'ir' in station 'is' of
+   * endcap 'ie'.
    *
    * Output is 1-45144 (CSCs 2008) and 45145-55944 (ME42) and 55945-57240 (ME1a)
    *
-   * WARNING: Use at your own risk! You must input labels within hardware ranges.
-   * No trapping on out-of-range values!
+   * WARNING: Use at your own risk! You must input labels within hardware
+   * ranges. No trapping on out-of-range values!
    */
-  IndexType gasGainIndex( IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il, IndexType ihvsegment, IndexType ichip ) const {
-    return sectorStart(ie,is,ir)+( (ic-1)*6 + il - 1 )*sectorsPerLayer(is,ir) + (ihvsegment-1)*chipsPerLayer(is,ir) + (ichip-1);
+  IndexType gasGainIndex(IndexType ie,
+                         IndexType is,
+                         IndexType ir,
+                         IndexType ic,
+                         IndexType il,
+                         IndexType ihvsegment,
+                         IndexType ichip) const {
+    return sectorStart(ie, is, ir) + ((ic - 1) * 6 + il - 1) * sectorsPerLayer(is, ir) +
+           (ihvsegment - 1) * chipsPerLayer(is, ir) + (ichip - 1);
   }
 
   /**
    *  Decode CSCDetId from various indexes and labels
    */
-  CSCDetId detIdFromLayerIndex( IndexType ili ) const;
-  CSCDetId detIdFromChamberIndex( IndexType ici ) const;
-  CSCDetId detIdFromChamberIndex_OLD( IndexType ici ) const;
-  CSCDetId detIdFromChamberLabel( IndexType ie, IndexType icl ) const;
-  std::pair<CSCDetId, IndexType> detIdFromStripChannelIndex( LongIndexType ichi ) const;
-  std::pair<CSCDetId, IndexType> detIdFromChipIndex( IndexType ichi ) const;
-  GasGainTuple detIdFromGasGainIndex( IndexType igg ) const;
+  CSCDetId detIdFromLayerIndex(IndexType ili) const;
+  CSCDetId detIdFromChamberIndex(IndexType ici) const;
+  CSCDetId detIdFromChamberIndex_OLD(IndexType ici) const;
+  CSCDetId detIdFromChamberLabel(IndexType ie, IndexType icl) const;
+  std::pair<CSCDetId, IndexType> detIdFromStripChannelIndex(LongIndexType ichi) const;
+  std::pair<CSCDetId, IndexType> detIdFromChipIndex(IndexType ichi) const;
+  GasGainTuple detIdFromGasGainIndex(IndexType igg) const;
 
-  IndexType chamberLabelFromChamberIndex( IndexType ) const; // just for cross-checks
+  IndexType chamberLabelFromChamberIndex(IndexType) const;  // just for cross-checks
 
   /**
-   * Build index used internally in online CSC conditions databases (the 'Igor Index')
-   *
-   * This is the decimal integer ie*100000 + is*10000 + ir*1000 + ic*10 + il <br>
-   * (ie=1-2, is=1-4, ir=1-4, ic=1-36, il=1-6) <br>
-   * Channels 1-16 in ME1A (is=1, ir=4) are NOT reset to channels 65-80 of ME11.
-   * WARNING: This is now ADOPTED to unganged ME1a channels
-   *          (we expect that the online conditions DB will adopt it too).
+   * Build index used internally in online CSC conditions databases (the 'Igor
+   * Index')
+   *
+   * This is the decimal integer ie*100000 + is*10000 + ir*1000 + ic*10 + il
+   * <br> (ie=1-2, is=1-4, ir=1-4, ic=1-36, il=1-6) <br> Channels 1-16 in ME1A
+   * (is=1, ir=4) are NOT reset to channels 65-80 of ME11. WARNING: This is now
+   * ADOPTED to unganged ME1a channels (we expect that the online conditions DB
+   * will adopt it too).
    */
-  int dbIndex(const CSCDetId & id, int & channel);
+  int dbIndex(const CSCDetId &id, int &channel);
 
 private:
+  void fillChamberLabel() const;  // const so it can be called in const function
+                                  // detIdFromChamberIndex
 
-  void fillChamberLabel() const; // const so it can be called in const function detIdFromChamberIndex
-
-  mutable std::vector<IndexType> chamberLabel; // mutable so can be filled by fillChamberLabel
-
+  mutable std::vector<IndexType> chamberLabel;  // mutable so can be filled by fillChamberLabel
 };
 
 #endif
diff --git a/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldStartup.cc b/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldStartup.cc
index 91fbea884fdf3..0fce9468139b4 100644
--- a/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldStartup.cc
+++ b/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldStartup.cc
@@ -4,241 +4,236 @@
 void CSCIndexerOldStartup::fillChamberLabel() const {
   // Fill the member vector which permits decoding of the linear chamber index
   // Logically const since initializes cache only,
-  // Beware that the ME42 indices 235-270 within this vector do NOT correspond to
-  // their 'real' linear indices (which are 469-504 for +z)
-   chamberLabel.resize( 271 ); // one more than #chambers per endcap. Includes ME42.
-   IndexType count = 0;
-   chamberLabel[count] = 0;
-
-   for ( IndexType is = 1 ; is != 5; ++is ) {
-      IndexType irmax = ringsInStation(is);
-      for ( IndexType ir = 1; ir != irmax+1; ++ir ) {
-         IndexType icmax = chambersInRingOfStation(is, ir);
-         for ( IndexType ic = 1; ic != icmax+1; ++ic ) {
-	   chamberLabel[ ++count ] = is*1000 + ir*100 + ic ;
-         }
-      } 
-   }
+  // Beware that the ME42 indices 235-270 within this vector do NOT correspond
+  // to their 'real' linear indices (which are 469-504 for +z)
+  chamberLabel.resize(271);  // one more than #chambers per endcap. Includes ME42.
+  IndexType count = 0;
+  chamberLabel[count] = 0;
+
+  for (IndexType is = 1; is != 5; ++is) {
+    IndexType irmax = ringsInStation(is);
+    for (IndexType ir = 1; ir != irmax + 1; ++ir) {
+      IndexType icmax = chambersInRingOfStation(is, ir);
+      for (IndexType ic = 1; ic != icmax + 1; ++ic) {
+        chamberLabel[++count] = is * 1000 + ir * 100 + ic;
+      }
+    }
+  }
 }
 
-CSCDetId CSCIndexerOldStartup::detIdFromChamberIndex_OLD( IndexType ici ) const {
-
+CSCDetId CSCIndexerOldStartup::detIdFromChamberIndex_OLD(IndexType ici) const {
   // Will not work as is for ME42
   // ============================
 
   IndexType ie = 1;
-  if (ici > 234 ) {
-     ie = 2;
-     ici -= 234; 
+  if (ici > 234) {
+    ie = 2;
+    ici -= 234;
   }
   // Now ici is in range 1-234 (assuming valid input in range 1-468)
 
   // MEij pairs...
-  const IndexType station[] = {0,1,1,1,2,2,3,3,4};
-  const IndexType ring[]    = {0,1,2,3,1,2,1,2,1};
+  const IndexType station[] = {0, 1, 1, 1, 2, 2, 3, 3, 4};
+  const IndexType ring[] = {0, 1, 2, 3, 1, 2, 1, 2, 1};
 
   // MEij preceding a given MEij matching linear index above
-  const IndexType prevs[] =  {0,0,1,1,1,2,2,3,3}; 
-  const IndexType prevr[] =  {0,0,1,2,3,1,2,1,2};
+  const IndexType prevs[] = {0, 0, 1, 1, 1, 2, 2, 3, 3};
+  const IndexType prevr[] = {0, 0, 1, 2, 3, 1, 2, 1, 2};
 
   IndexType is = 4;
   IndexType ir = 1;
-  for ( IndexType i = 2; i<=8; ++i) {
+  for (IndexType i = 2; i <= 8; ++i) {
     IndexType js = station[i];
     IndexType jr = ring[i];
     // if it's before start of MEjs/jr then it's in the previous MEis/ir
-      if ( ici < startChamberIndexInEndcap(ie,js,jr) ) {
-	is = prevs[i];
-	ir = prevr[i];
-	break;
-      }
-      // otherwise it's in ME41
+    if (ici < startChamberIndexInEndcap(ie, js, jr)) {
+      is = prevs[i];
+      ir = prevr[i];
+      break;
+    }
+    // otherwise it's in ME41
   }
-  IndexType ic = ici - startChamberIndexInEndcap(ie,is,ir) + 1;
+  IndexType ic = ici - startChamberIndexInEndcap(ie, is, ir) + 1;
 
-  return CSCDetId( ie, is, ir, ic );
+  return CSCDetId(ie, is, ir, ic);
 }
- 
-CSCDetId CSCIndexerOldStartup::detIdFromChamberIndex( IndexType ici ) const {
+
+CSCDetId CSCIndexerOldStartup::detIdFromChamberIndex(IndexType ici) const {
   // Expected range of input range argument is 1-540.
   // 1-468 for CSCs installed at 2008 start-up. 469-540 for ME42.
 
   IndexType ie = 1;
-  if ( ici > 468 ) {
+  if (ici > 468) {
     // ME42
-    ici -= 234; // now in range 235-306
-    if ( ici > 270 ) { // -z
+    ici -= 234;       // now in range 235-306
+    if (ici > 270) {  // -z
       ie = 2;
-      ici -= 36; // now in range 235-270
+      ici -= 36;  // now in range 235-270
     }
-  }
-  else { // in range 1-468
-    if ( ici > 234 ) { // -z
+  } else {            // in range 1-468
+    if (ici > 234) {  // -z
       ie = 2;
-      ici -= 234; // now in range 1-234
+      ici -= 234;  // now in range 1-234
     }
   }
-  if (chamberLabel.empty()) fillChamberLabel();
-  IndexType label = chamberLabel[ici];    
-  return detIdFromChamberLabel( ie, label );
+  if (chamberLabel.empty())
+    fillChamberLabel();
+  IndexType label = chamberLabel[ici];
+  return detIdFromChamberLabel(ie, label);
 }
 
-CSCIndexerOldStartup::IndexType CSCIndexerOldStartup::chamberLabelFromChamberIndex( IndexType ici ) const {
+CSCIndexerOldStartup::IndexType CSCIndexerOldStartup::chamberLabelFromChamberIndex(IndexType ici) const {
   // This is just for cross-checking
 
   // Expected range of input range argument is 1-540.
   // 1-468 for CSCs installed at 2008 start-up. 469-540 for ME42.
 
-  if ( ici > 468 ) {
+  if (ici > 468) {
     // ME42
-    ici -= 234; // now in range 235-306
-    if ( ici > 270 ) { // -z
-      ici -= 36; // now in range 235-270
+    ici -= 234;       // now in range 235-306
+    if (ici > 270) {  // -z
+      ici -= 36;      // now in range 235-270
     }
-  }
-  else { // in range 1-468
-    if ( ici > 234 ) { // -z
-      ici -= 234; // now in range 1-234
+  } else {            // in range 1-468
+    if (ici > 234) {  // -z
+      ici -= 234;     // now in range 1-234
     }
   }
-  if (chamberLabel.empty()) fillChamberLabel();
-  return chamberLabel[ici];  
-
+  if (chamberLabel.empty())
+    fillChamberLabel();
+  return chamberLabel[ici];
 }
 
-CSCDetId CSCIndexerOldStartup::detIdFromChamberLabel( IndexType ie, IndexType label ) const {
-
-  IndexType is = label/1000;
-  label -= is*1000;
-  IndexType ir = label/100;
-  label -= ir*100;
+CSCDetId CSCIndexerOldStartup::detIdFromChamberLabel(IndexType ie, IndexType label) const {
+  IndexType is = label / 1000;
+  label -= is * 1000;
+  IndexType ir = label / 100;
+  label -= ir * 100;
   IndexType ic = label;
 
-  return CSCDetId( ie, is, ir, ic );
+  return CSCDetId(ie, is, ir, ic);
 }
 
-CSCDetId CSCIndexerOldStartup::detIdFromLayerIndex( IndexType ili ) const {
-
-  IndexType il = (ili-1)%6 + 1;
-  IndexType ici = (ili-1)/6 + 1;
-  CSCDetId id = detIdFromChamberIndex( ici ); 
+CSCDetId CSCIndexerOldStartup::detIdFromLayerIndex(IndexType ili) const {
+  IndexType il = (ili - 1) % 6 + 1;
+  IndexType ici = (ili - 1) / 6 + 1;
+  CSCDetId id = detIdFromChamberIndex(ici);
 
   return CSCDetId(id.endcap(), id.station(), id.ring(), id.chamber(), il);
 }
 
-std::pair<CSCDetId, CSCIndexerOldStartup::IndexType>  CSCIndexerOldStartup::detIdFromStripChannelIndex( LongIndexType isi ) const {
-
-  const LongIndexType lastnonme42 = 217728; // channels in 2008 installed chambers
-  const LongIndexType lastplusznonme42 = 108864; // = 217728/2
-  const LongIndexType firstme13  = 34561; // First channel of ME13
-  const LongIndexType lastme13   = 48384; // Last channel of ME13
+std::pair<CSCDetId, CSCIndexerOldStartup::IndexType> CSCIndexerOldStartup::detIdFromStripChannelIndex(
+    LongIndexType isi) const {
+  const LongIndexType lastnonme42 = 217728;       // channels in 2008 installed chambers
+  const LongIndexType lastplusznonme42 = 108864;  // = 217728/2
+  const LongIndexType firstme13 = 34561;          // First channel of ME13
+  const LongIndexType lastme13 = 48384;           // Last channel of ME13
 
   const IndexType lastnonme42layer = 2808;
-  const IndexType lastplusznonme42layer = 1404; // = 2808/2
-  const IndexType firstme13layer  = 433; // = 72*6 + 1 (ME13 chambers are 72-108 in range 1-234)
-  const IndexType lastme13layer   = 648; // = 108*6
+  const IndexType lastplusznonme42layer = 1404;  // = 2808/2
+  const IndexType firstme13layer = 433;          // = 72*6 + 1 (ME13 chambers are 72-108 in range 1-234)
+  const IndexType lastme13layer = 648;           // = 108*6
 
   // All chambers but ME13 have 80 channels
   IndexType nchan = 80;
 
-  // Set endcap to +z. This should work for ME42 channels too, since we don't need to calculate its endcap explicitly.
+  // Set endcap to +z. This should work for ME42 channels too, since we don't
+  // need to calculate its endcap explicitly.
   IndexType ie = 1;
 
   LongIndexType istart = 0;
   IndexType layerOffset = 0;
 
-  if ( isi <= lastnonme42 ) {	
+  if (isi <= lastnonme42) {
     // Chambers as of 2008 Installation
 
-    if ( isi > lastplusznonme42 ) {
+    if (isi > lastplusznonme42) {
       ie = 2;
       isi -= lastplusznonme42;
     }
-	
-    if ( isi > lastme13 ) { // after ME13
+
+    if (isi > lastme13) {  // after ME13
       istart = lastme13;
       layerOffset = lastme13layer;
-    }
-    else if ( isi >= firstme13 ) { // ME13
+    } else if (isi >= firstme13) {  // ME13
       istart = firstme13 - 1;
       layerOffset = firstme13layer - 1;
       nchan = 64;
     }
-  }
-  else {
-     // ME42 chambers
+  } else {
+    // ME42 chambers
 
     istart = lastnonme42;
     layerOffset = lastnonme42layer;
   }
 
-   isi -= istart; // remove earlier group(s)
-   IndexType ichan = (isi-1)%nchan + 1;
-   IndexType ili = (isi-1)/nchan + 1;
-   ili += layerOffset; // add appropriate offset for earlier group(s)
-   if ( ie != 1 ) ili+= lastplusznonme42layer; // add offset to -z endcap; ME42 doesn't need this.
-	
-   return std::pair<CSCDetId, IndexType>(detIdFromLayerIndex(ili), ichan);
-}
-
+  isi -= istart;  // remove earlier group(s)
+  IndexType ichan = (isi - 1) % nchan + 1;
+  IndexType ili = (isi - 1) / nchan + 1;
+  ili += layerOffset;  // add appropriate offset for earlier group(s)
+  if (ie != 1)
+    ili += lastplusznonme42layer;  // add offset to -z endcap; ME42 doesn't need
+                                   // this.
 
-std::pair<CSCDetId, CSCIndexerOldStartup::IndexType>  CSCIndexerOldStartup::detIdFromChipIndex( IndexType ici ) const {
+  return std::pair<CSCDetId, IndexType>(detIdFromLayerIndex(ili), ichan);
+}
 
-  const LongIndexType lastnonme42 = 13608; // chips in 2008 installed chambers
-  const LongIndexType lastplusznonme42 = 6804; // = 13608/2
-  const LongIndexType firstme13  = 2161; // First channel of ME13
-  const LongIndexType lastme13   = 3024; // Last channel of ME13
+std::pair<CSCDetId, CSCIndexerOldStartup::IndexType> CSCIndexerOldStartup::detIdFromChipIndex(IndexType ici) const {
+  const LongIndexType lastnonme42 = 13608;      // chips in 2008 installed chambers
+  const LongIndexType lastplusznonme42 = 6804;  // = 13608/2
+  const LongIndexType firstme13 = 2161;         // First channel of ME13
+  const LongIndexType lastme13 = 3024;          // Last channel of ME13
 
   const IndexType lastnonme42layer = 2808;
-  const IndexType lastplusznonme42layer = 1404; // = 2808/2
-  const IndexType firstme13layer  = 433; // = 72*6 + 1 (ME13 chambers are 72-108 in range 1-234)
-  const IndexType lastme13layer   = 648; // = 108*6
+  const IndexType lastplusznonme42layer = 1404;  // = 2808/2
+  const IndexType firstme13layer = 433;          // = 72*6 + 1 (ME13 chambers are 72-108 in range 1-234)
+  const IndexType lastme13layer = 648;           // = 108*6
 
   // All chambers but ME13 have 5 chips/layer
   IndexType nchipPerLayer = 5;
 
-  // Set endcap to +z. This should work for ME42 channels too, since we don't need to calculate its endcap explicitly.
+  // Set endcap to +z. This should work for ME42 channels too, since we don't
+  // need to calculate its endcap explicitly.
   IndexType ie = 1;
 
   LongIndexType istart = 0;
   IndexType layerOffset = 0;
 
-  if ( ici <= lastnonme42 ) {	
+  if (ici <= lastnonme42) {
     // Chambers as of 2008 Installation
 
-    if ( ici > lastplusznonme42 ) {
+    if (ici > lastplusznonme42) {
       ie = 2;
       ici -= lastplusznonme42;
     }
-	
-    if ( ici > lastme13 ) { // after ME13
+
+    if (ici > lastme13) {  // after ME13
       istart = lastme13;
       layerOffset = lastme13layer;
-    }
-    else if ( ici >= firstme13 ) { // ME13
+    } else if (ici >= firstme13) {  // ME13
       istart = firstme13 - 1;
       layerOffset = firstme13layer - 1;
       nchipPerLayer = 4;
     }
-  }
-  else {
-     // ME42 chambers
+  } else {
+    // ME42 chambers
 
     istart = lastnonme42;
     layerOffset = lastnonme42layer;
   }
 
-   ici -= istart; // remove earlier group(s)
-   IndexType ichip = (ici-1)%nchipPerLayer + 1;
-   IndexType ili = (ici-1)/nchipPerLayer + 1;
-   ili += layerOffset; // add appropriate offset for earlier group(s)
-   if ( ie != 1 ) ili+= lastplusznonme42layer; // add offset to -z endcap; ME42 doesn't need this.
-	
-   return std::pair<CSCDetId, IndexType>(detIdFromLayerIndex(ili), ichip);
+  ici -= istart;  // remove earlier group(s)
+  IndexType ichip = (ici - 1) % nchipPerLayer + 1;
+  IndexType ili = (ici - 1) / nchipPerLayer + 1;
+  ili += layerOffset;  // add appropriate offset for earlier group(s)
+  if (ie != 1)
+    ili += lastplusznonme42layer;  // add offset to -z endcap; ME42 doesn't need
+                                   // this.
+
+  return std::pair<CSCDetId, IndexType>(detIdFromLayerIndex(ili), ichip);
 }
 
-int CSCIndexerOldStartup::dbIndex(const CSCDetId & id, int & channel)
-{
+int CSCIndexerOldStartup::dbIndex(const CSCDetId &id, int &channel) {
   int ec = id.endcap();
   int st = id.station();
   int rg = id.ring();
@@ -246,10 +241,10 @@ int CSCIndexerOldStartup::dbIndex(const CSCDetId & id, int & channel)
   int la = id.layer();
 
   // The channels of ME1A are channels 65-80 of ME11
-  if(st == 1 && rg == 4)
-    {
-      rg = 1;
-      if(channel <= 16) channel += 64; // no trapping for any bizarreness
-    }
-  return ec*100000 + st*10000 + rg*1000 + ch*10 + la;
+  if (st == 1 && rg == 4) {
+    rg = 1;
+    if (channel <= 16)
+      channel += 64;  // no trapping for any bizarreness
+  }
+  return ec * 100000 + st * 10000 + rg * 1000 + ch * 10 + la;
 }
diff --git a/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldStartup.h b/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldStartup.h
index a47a4d39d3ae6..1973a0f46ed63 100644
--- a/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldStartup.h
+++ b/CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldStartup.h
@@ -5,30 +5,36 @@
  * Creates a linear index for various sublevels of the endcap muon CSC system.
  *
  * It supplies a linear index for:
- * 1. Each chamber of the CSC system: range 1-468 (CSC system as installed 2008) 469-540 for ME42 <br>
- * 2. Each layer of the CSC system: range 1-2808 (CSCs 2008) 2809-3240 for ME42 <br>
- * 3. Each strip channel of the CSC system: range 1-217728 (CSCs 2008) 217729-252288 for ME42 <br>
- * 4. Each Buckeye chip (1 for each layer in each CFEB)of the CSC system: range 1-13608 (CSCs 2008) 13609-15768 for ME42 <br>
- * 5. Each Gas Gain Sector (1 for each [CFEB*HV segment] combination in each layer): range 1-45144 (CSCs 2008) 45145-55944 for ME42 <br>
- * 
- * The chamber and layer may be specified by CSCDetId or labels for endcap, station, ring, chamber, layer.
- * The strip channel is a value 1-80 (or 64: ME13 chambers have only 64 channels.)
- * The chip number is a value 1-30 (or 24: ME13 chambers have only 24 chips.)
+ * 1. Each chamber of the CSC system: range 1-468 (CSC system as installed 2008)
+ * 469-540 for ME42 <br>
+ * 2. Each layer of the CSC system: range 1-2808 (CSCs 2008) 2809-3240 for ME42
+ * <br>
+ * 3. Each strip channel of the CSC system: range 1-217728 (CSCs 2008)
+ * 217729-252288 for ME42 <br>
+ * 4. Each Buckeye chip (1 for each layer in each CFEB)of the CSC system: range
+ * 1-13608 (CSCs 2008) 13609-15768 for ME42 <br>
+ * 5. Each Gas Gain Sector (1 for each [CFEB*HV segment] combination in each
+ * layer): range 1-45144 (CSCs 2008) 45145-55944 for ME42 <br>
+ *
+ * The chamber and layer may be specified by CSCDetId or labels for endcap,
+ * station, ring, chamber, layer. The strip channel is a value 1-80 (or 64: ME13
+ * chambers have only 64 channels.) The chip number is a value 1-30 (or 24: ME13
+ * chambers have only 24 chips.)
  *
  * The main user interface is the set of functions <br>
  *   chamberIndex(.) <br>
  *   layerIndex(.) <br>
  *   stripChannelIndex(.) <br>
  *   chipIndex(.) <br>
- * But the other functions are public since they may be useful in contexts other than for
- * Conditions Data for which the above functions are intended.
+ * But the other functions are public since they may be useful in contexts other
+ * than for Conditions Data for which the above functions are intended.
  *
- * \warning This class is hard-wired for the CSC system at start-up of CMS in 2008.
- * with rings ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41 totalling 234 chambers per endcap.
- * But ME42 is appended (to permit simulation studies), so the chamber order is <br>
- * +z ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41, <br>
- * -z ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41, <br>
- * +z ME42, -z ME42 <br>
+ * \warning This class is hard-wired for the CSC system at start-up of CMS in
+ * 2008. with rings ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41 totalling 234
+ * chambers per endcap. But ME42 is appended (to permit simulation studies), so
+ * the chamber order is <br> +z ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41,
+ * <br> -z ME11, ME12, ME13, ME21, ME22, ME31, ME32, ME41, <br> +z ME42, -z ME42
+ * <br>
  *
  * \warning This uses magic numbers galore!!
  *
@@ -37,14 +43,12 @@
  */
 
 #include <DataFormats/MuonDetId/interface/CSCDetId.h>
-#include <vector>
 #include <iosfwd>
 #include <utility>  // for pair
+#include <vector>
 
 class CSCIndexerOldStartup {
-
 public:
-
   //  typedef unsigned short int IndexType;
   //  typedef unsigned       int LongIndexType;
   typedef uint16_t IndexType;
@@ -59,13 +63,14 @@ class CSCIndexerOldStartup {
    *
    * Output is 1-468 (CSCs 2008) 469-540 (ME42)
    *
-   * WARNING: Do not input ME1a values (i.e. ring '4'): does not consider ME1a and ME1b to be separate,
-   * No sanity checking on input value: if you supply an ME1a CSCDetId then you'll get nonsense.
+   * WARNING: Do not input ME1a values (i.e. ring '4'): does not consider ME1a
+   * and ME1b to be separate, No sanity checking on input value: if you supply
+   * an ME1a CSCDetId then you'll get nonsense.
    */
 
-   IndexType chamberIndex( const CSCDetId& id ) const {
-     return chamberIndex( id.endcap(), id.station(), id.ring(), id.chamber() );
-   }
+  IndexType chamberIndex(const CSCDetId &id) const {
+    return chamberIndex(id.endcap(), id.station(), id.ring(), id.chamber());
+  }
 
   /**
    * Linear index to label each hardware layer in CSC system.
@@ -73,109 +78,112 @@ class CSCIndexerOldStartup {
    *
    * Output is 1-2808 (CSCs 2008) 2809-3240 (ME42)
    *
-   * WARNING: Do not input ME1a values (i.e. ring '4'): does not consider ME1a and ME1b to be separate,
-   * No sanity checking on input value: if you supply an ME1a CSCDetId then you'll get nonsense.
+   * WARNING: Do not input ME1a values (i.e. ring '4'): does not consider ME1a
+   * and ME1b to be separate, No sanity checking on input value: if you supply
+   * an ME1a CSCDetId then you'll get nonsense.
+   */
+
+  IndexType layerIndex(const CSCDetId &id) const {
+    return layerIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer());
+  }
+
+  /**
+   * Starting index for first chamber in ring 'ir' of station 'is' in endcap
+   * 'ie', in range 1-468 (CSCs 2008) or 469-540 (ME42).
+   */
+  IndexType startChamberIndexInEndcap(IndexType ie, IndexType is, IndexType ir) const {
+    const IndexType nschin[24] = {1,   37,  73,  109, 127, 0, 163, 181, 0, 217, 469, 0,
+                                  235, 271, 307, 343, 361, 0, 397, 415, 0, 451, 505, 0};
+    return nschin[(ie - 1) * 12 + (is - 1) * 3 + ir - 1];
+  }
+
+  /**
+   * Linear index for chamber 'ic' in ring 'ir' of station 'is' in endcap 'ie',
+   * in range 1-468 (CSCs 2008) or 469-540 (ME42)
    */
+  IndexType chamberIndex(IndexType ie, IndexType is, IndexType ir, IndexType ic) const {
+    return startChamberIndexInEndcap(ie, is, ir) + ic - 1;  // -1 so start index _is_ ic=1
+  }
 
-   IndexType layerIndex( const CSCDetId& id ) const {
-     return layerIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer());
-   }
-
-   /** 
-    * Starting index for first chamber in ring 'ir' of station 'is' in endcap 'ie',
-    * in range 1-468 (CSCs 2008) or 469-540 (ME42).
-    */
-   IndexType startChamberIndexInEndcap(IndexType ie, IndexType is, IndexType ir) const {
-     const IndexType nschin[24] = {1,37,73,    109,127,0, 163,181,0, 217,469,0,
-                                  235,271,307, 343,361,0, 397,415,0, 451,505,0 };
-     return nschin[(ie-1)*12 + (is-1)*3 + ir-1];
-
-   }
-
-   /**
-    * Linear index for chamber 'ic' in ring 'ir' of station 'is' in endcap 'ie',
-    * in range 1-468 (CSCs 2008) or 469-540 (ME42)
-    */
-   IndexType chamberIndex(IndexType ie, IndexType is, IndexType ir, IndexType ic) const {
-     return startChamberIndexInEndcap(ie,is,ir) + ic - 1; // -1 so start index _is_ ic=1
-   }
-
-   /**
-    * Linear index for layer 'il' of chamber 'ic' in ring 'ir' of station 'is' in endcap 'ie',
-    * in range 1-2808 (CSCs 2008) or 2809-3240 (ME42).
-    */
-   IndexType layerIndex(IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il) const {
+  /**
+   * Linear index for layer 'il' of chamber 'ic' in ring 'ir' of station 'is' in
+   * endcap 'ie', in range 1-2808 (CSCs 2008) or 2809-3240 (ME42).
+   */
+  IndexType layerIndex(IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il) const {
     const IndexType layersInChamber = 6;
-     return (chamberIndex(ie,is,ir,ic) - 1 ) * layersInChamber + il;
-   }
+    return (chamberIndex(ie, is, ir, ic) - 1) * layersInChamber + il;
+  }
 
   /**
    * How many rings are there in station is=1, 2, 3, 4 ?
    *
-   * BEWARE! Includes ME42 so claims 2 rings in station 4. There is only 1 at CSC installation 2008.
+   * BEWARE! Includes ME42 so claims 2 rings in station 4. There is only 1 at
+   * CSC installation 2008.
    */
-   IndexType ringsInStation( IndexType is ) const {
-      const IndexType nrins[5] = {0,3,2,2,2}; // rings per station
-      return nrins[is];
-   }
+  IndexType ringsInStation(IndexType is) const {
+    const IndexType nrins[5] = {0, 3, 2, 2, 2};  // rings per station
+    return nrins[is];
+  }
 
   /**
    * How many chambers are there in ring ir of station is?
    *
    * Works for ME1a (ring 4 of ME1) too.
    */
-   IndexType chambersInRingOfStation(IndexType is, IndexType ir) const {
-      IndexType nc = 36; // most rings have 36 chambers
-      if (is >1 && ir<2 ) nc = 18; // but 21, 31, 41 have 18
-      return nc;
-   }
+  IndexType chambersInRingOfStation(IndexType is, IndexType ir) const {
+    IndexType nc = 36;  // most rings have 36 chambers
+    if (is > 1 && ir < 2)
+      nc = 18;  // but 21, 31, 41 have 18
+    return nc;
+  }
 
-  /** 
+  /**
    * Number of strip channels per layer in a chamber in ring ir of station is.
    *
    * Station label range 1-4, Ring label range 1-3.
    *
-   * WARNING: ME1a channels are the last 16 of the 80 total in each layer of an ME11 chamber, 
-   * and an input ir=4 is invalid and will give nonsense. <br>
+   * WARNING: ME1a channels are the last 16 of the 80 total in each layer of an
+   * ME11 chamber, and an input ir=4 is invalid and will give nonsense. <br>
    * Considers ME42 as standard 80-strip per layer chambers.
    */
-   IndexType stripChannelsPerLayer( IndexType is, IndexType ir ) const {
-     const IndexType nSCinC[12] = { 80,80,64, 80,80,0, 80,80,0, 80,80,0 };
-     return nSCinC[(is-1)*3 + ir - 1];
-   }
+  IndexType stripChannelsPerLayer(IndexType is, IndexType ir) const {
+    const IndexType nSCinC[12] = {80, 80, 64, 80, 80, 0, 80, 80, 0, 80, 80, 0};
+    return nSCinC[(is - 1) * 3 + ir - 1];
+  }
 
   /**
-   * Linear index for 1st strip channel in ring 'ir' of station 'is' in endcap 'ie'.
+   * Linear index for 1st strip channel in ring 'ir' of station 'is' in endcap
+   * 'ie'.
    *
    * Endcap label range 1-2, Station label range 1-4, Ring label range 1-3.
    *
-   * WARNING: ME1a channels are the last 16 of the 80 total in each layer of an ME11 chamber, 
-   * and an input ir=4 is invalid and will give nonsense.
+   * WARNING: ME1a channels are the last 16 of the 80 total in each layer of an
+   * ME11 chamber, and an input ir=4 is invalid and will give nonsense.
    */
-   LongIndexType stripChannelStart( IndexType ie, IndexType is, IndexType ir ) const {
-
-     // These are in the ranges 1-217728 (CSCs 2008) and 217729-252288 (ME42).
-     // There are 1-108884 channels per endcap (CSCs 2008) and 17280 channels per endcap (ME42).
-     // Start of -z channels (CSCs 2008) is 108864 + 1 = 108865
-     // Start of +z (ME42) is 217728 + 1 = 217729
-     // Start of -z (ME42) is 217728 + 1 + 17280 = 235009
-      const LongIndexType nStart[24] = { 1,17281,34561, 48385,57025,0, 74305,82945,0, 100225,217729,0,
-                                   108865,126145,143425, 157249,165889,0, 183169,191809,0, 209089,235009,0 };
-      return  nStart[(ie-1)*12 + (is-1)*3 + ir - 1];
-   }
+  LongIndexType stripChannelStart(IndexType ie, IndexType is, IndexType ir) const {
+    // These are in the ranges 1-217728 (CSCs 2008) and 217729-252288 (ME42).
+    // There are 1-108884 channels per endcap (CSCs 2008) and 17280 channels per
+    // endcap (ME42). Start of -z channels (CSCs 2008) is 108864 + 1 = 108865
+    // Start of +z (ME42) is 217728 + 1 = 217729
+    // Start of -z (ME42) is 217728 + 1 + 17280 = 235009
+    const LongIndexType nStart[24] = {1,      17281,  34561,  48385,  57025,  0, 74305,  82945,  0, 100225, 217729, 0,
+                                      108865, 126145, 143425, 157249, 165889, 0, 183169, 191809, 0, 209089, 235009, 0};
+    return nStart[(ie - 1) * 12 + (is - 1) * 3 + ir - 1];
+  }
 
   /**
-   * Linear index for strip channel istrip in layer 'il' of chamber 'ic' of ring 'ir'
-   * in station 'is' of endcap 'ie'.
+   * Linear index for strip channel istrip in layer 'il' of chamber 'ic' of ring
+   * 'ir' in station 'is' of endcap 'ie'.
    *
    * Output is 1-217728 (CSCs 2008) or 217729-252288 (ME42).
    *
-   * WARNING: Use at your own risk! You must input labels within hardware ranges.
-   * No trapping on out-of-range values!
+   * WARNING: Use at your own risk! You must input labels within hardware
+   * ranges. No trapping on out-of-range values!
    */
-   LongIndexType stripChannelIndex( IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il, IndexType istrip ) const {
-      return stripChannelStart(ie,is,ir)+( (ic-1)*6 + il - 1 )*stripChannelsPerLayer(is,ir) + (istrip-1);
-   }
+  LongIndexType stripChannelIndex(
+      IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il, IndexType istrip) const {
+    return stripChannelStart(ie, is, ir) + ((ic - 1) * 6 + il - 1) * stripChannelsPerLayer(is, ir) + (istrip - 1);
+  }
 
   /**
    * Linear index for strip channel 'istrip' in layer labelled by CSCDetId 'id'.
@@ -186,58 +194,59 @@ class CSCIndexerOldStartup {
    * No trapping on out-of-range values!
    */
 
-   LongIndexType stripChannelIndex( const CSCDetId& id, IndexType istrip ) const {
-      return stripChannelIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer(), istrip );
-   }
+  LongIndexType stripChannelIndex(const CSCDetId &id, IndexType istrip) const {
+    return stripChannelIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer(), istrip);
+  }
 
-  /** 
+  /**
    * Number of Buckeye chips per layer in a chamber in ring ir of station is.
    *
    * Station label range 1-4, Ring label range 1-3.
    *
-   * WARNING: ME1a channels are the last 1 of the 5 total in each layer of an ME11 chamber, 
-   * and an input ir=4 is invalid and will give nonsense. <br>
+   * WARNING: ME1a channels are the last 1 of the 5 total in each layer of an
+   * ME11 chamber, and an input ir=4 is invalid and will give nonsense. <br>
    * Considers ME42 as standard 5 chip per layer chambers.
    */
-   IndexType chipsPerLayer( IndexType is, IndexType ir ) const {
-     const IndexType nCinL[12] = { 5,5,4, 5,5,0, 5,5,0, 5,5,0 };
-     return nCinL[(is-1)*3 + ir - 1];
-   }
+  IndexType chipsPerLayer(IndexType is, IndexType ir) const {
+    const IndexType nCinL[12] = {5, 5, 4, 5, 5, 0, 5, 5, 0, 5, 5, 0};
+    return nCinL[(is - 1) * 3 + ir - 1];
+  }
 
   /**
-   * Linear index for 1st Buckey chip in ring 'ir' of station 'is' in endcap 'ie'.
+   * Linear index for 1st Buckey chip in ring 'ir' of station 'is' in endcap
+   * 'ie'.
    *
    * Endcap label range 1-2, Station label range 1-4, Ring label range 1-3.
    *
-   * WARNING: ME1a channels are the last 1 of the 5 chips total in each layer of an ME11 chamber, 
-   * and an input ir=4 is invalid and will give nonsense.
+   * WARNING: ME1a channels are the last 1 of the 5 chips total in each layer of
+   * an ME11 chamber, and an input ir=4 is invalid and will give nonsense.
    */
-   IndexType chipStart( IndexType ie, IndexType is, IndexType ir ) const {
-
-     // These are in the ranges 1-13608 (CSCs 2008) and 13609-15768 (ME42).
-     // There are 1-6804 chips per endcap (CSCs 2008) and 1080 channels per endcap (ME42).
-     // Start of -z channels (CSCs 2008) is 6804 + 1 = 6805
-     // Start of +z (ME42) is 13608 + 1 = 13609
-     // Start of -z (ME42) is 13608 + 1 + 1080 = 14689
-     const IndexType nStart[24] = {1, 1081, 2161, 3025, 3565, 0, 4645, 5185, 0, 6265, 13609,0,
-				    6805, 7885, 8965, 9829, 10369,0, 11449, 11989, 0, 13069, 14689 ,0 };
-                                   
-     return  nStart[(ie-1)*12 + (is-1)*3 + ir - 1];
-   }
+  IndexType chipStart(IndexType ie, IndexType is, IndexType ir) const {
+    // These are in the ranges 1-13608 (CSCs 2008) and 13609-15768 (ME42).
+    // There are 1-6804 chips per endcap (CSCs 2008) and 1080 channels per
+    // endcap (ME42). Start of -z channels (CSCs 2008) is 6804 + 1 = 6805 Start
+    // of +z (ME42) is 13608 + 1 = 13609 Start of -z (ME42) is 13608 + 1 + 1080
+    // = 14689
+    const IndexType nStart[24] = {1,    1081, 2161, 3025, 3565,  0, 4645,  5185,  0, 6265,  13609, 0,
+                                  6805, 7885, 8965, 9829, 10369, 0, 11449, 11989, 0, 13069, 14689, 0};
+
+    return nStart[(ie - 1) * 12 + (is - 1) * 3 + ir - 1];
+  }
 
   /**
-   * Linear index for Buckeye chip 'ichip' in layer 'il' of chamber 'ic' of ring 'ir'
-   * in station 'is' of endcap 'ie'.
+   * Linear index for Buckeye chip 'ichip' in layer 'il' of chamber 'ic' of ring
+   * 'ir' in station 'is' of endcap 'ie'.
    *
    * Output is 1-13608 (CSCs 2008) or 13609-15768 (ME42).
    *
-   * WARNING: Use at your own risk! You must input labels within hardware ranges.
-   * No trapping on out-of-range values!
+   * WARNING: Use at your own risk! You must input labels within hardware
+   * ranges. No trapping on out-of-range values!
    */
-   IndexType chipIndex( IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il, IndexType ichip ) const {
-     //printf("ME%d/%d/%d/%d layer %d  chip %d chipindex %d\n",ie,is,ir,ic,il,ichip,chipStart(ie,is,ir)+( (ic-1)*6 + il - 1 )*chipsPerLayer(is,ir) + (ichip-1));
-     return chipStart(ie,is,ir)+( (ic-1)*6 + il - 1 )*chipsPerLayer(is,ir) + (ichip-1);
-
+  IndexType chipIndex(IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il, IndexType ichip) const {
+    // printf("ME%d/%d/%d/%d layer %d  chip %d chipindex
+    // %d\n",ie,is,ir,ic,il,ichip,chipStart(ie,is,ir)+( (ic-1)*6 + il - 1
+    // )*chipsPerLayer(is,ir) + (ichip-1));
+    return chipStart(ie, is, ir) + ((ic - 1) * 6 + il - 1) * chipsPerLayer(is, ir) + (ichip - 1);
   }
 
   /**
@@ -249,47 +258,44 @@ class CSCIndexerOldStartup {
    * No trapping on out-of-range values!
    */
 
-   IndexType chipIndex( const CSCDetId& id, IndexType ichip ) const {
-      return chipIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer(), ichip );
-   }
+  IndexType chipIndex(const CSCDetId &id, IndexType ichip) const {
+    return chipIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer(), ichip);
+  }
 
   /**
    * Linear index for Buckeye chip processing strip 'istrip'.
    *
    * Output is 1-5.
    *
-   * WARNING: Use at your own risk! The supplied CSCDetId must be a strip id 1-80
-   * ME1/1a strips must be 65-80
-   * No trapping on out-of-range values!
+   * WARNING: Use at your own risk! The supplied CSCDetId must be a strip id
+   * 1-80 ME1/1a strips must be 65-80 No trapping on out-of-range values!
    */
 
-   IndexType chipIndex( IndexType istrip ) const {
-     return (istrip-1)/16+1;
-   }
+  IndexType chipIndex(IndexType istrip) const { return (istrip - 1) / 16 + 1; }
 
-  /** 
+  /**
    * Number of HV segments per layer in a chamber in ring ir of station is.
    *
    * Station label range 1-4, Ring label range 1-3.
    *
-   * WARNING: ME1a channels are the last 1 of the 5 total in each layer of an ME11 chamber, 
-   * and an input ir=4 is invalid and will give nonsense. <br>
+   * WARNING: ME1a channels are the last 1 of the 5 total in each layer of an
+   * ME11 chamber, and an input ir=4 is invalid and will give nonsense. <br>
    */
-  IndexType hvSegmentsPerLayer( IndexType is, IndexType ir ) const {
-    const IndexType nSinL[12] = { 1,3,3, 3,5,0, 3,5,0, 3,5,0 };
-    return nSinL[(is-1)*3 + ir - 1];
+  IndexType hvSegmentsPerLayer(IndexType is, IndexType ir) const {
+    const IndexType nSinL[12] = {1, 3, 3, 3, 5, 0, 3, 5, 0, 3, 5, 0};
+    return nSinL[(is - 1) * 3 + ir - 1];
   }
 
-  /** 
+  /**
    * Number of Gas Gain sectors per layer in a chamber in ring ir of station is.
    *
    * Station label range 1-4, Ring label range 1-3.
    *
-   * WARNING: ME1a channels are the last 1 of the 5 total in each layer of an ME11 chamber, 
-   * and an input ir=4 is invalid and will give nonsense. <br>
+   * WARNING: ME1a channels are the last 1 of the 5 total in each layer of an
+   * ME11 chamber, and an input ir=4 is invalid and will give nonsense. <br>
    */
-  IndexType sectorsPerLayer( IndexType is, IndexType ir ) const {
-    return chipsPerLayer(is,ir)*hvSegmentsPerLayer(is,ir);
+  IndexType sectorsPerLayer(IndexType is, IndexType ir) const {
+    return chipsPerLayer(is, ir) * hvSegmentsPerLayer(is, ir);
   }
 
   /**
@@ -297,153 +303,177 @@ class CSCIndexerOldStartup {
    *
    * Output is 1-5.
    *
-   * WARNING: Use at your own risk! The supplied CSCDetId must be chamber station, ring, and wire.
-   * No trapping on out-of-range values!
+   * WARNING: Use at your own risk! The supplied CSCDetId must be chamber
+   * station, ring, and wire. No trapping on out-of-range values!
    */
-  IndexType hvSegmentIndex(IndexType is, IndexType ir, IndexType iwire ) const {
-
-    IndexType hvSegment = 1;   // There is only one HV segment in ME1/1
-     
-    if (is > 2 && ir == 1) {        // HV segments are the same in ME3/1 and ME4/1
-      if      ( iwire >= 33 && iwire <= 64 ) { hvSegment = 2; }
-      else if ( iwire >= 65 && iwire <= 96 ) { hvSegment = 3; }
-      
-    } else if (is > 1 && ir == 2) { // HV segments are the same in ME2/2, ME3/2, and ME4/2
-      if      ( iwire >= 17 && iwire <= 28 ) { hvSegment = 2; }
-      else if ( iwire >= 29 && iwire <= 40 ) { hvSegment = 3; }
-      else if ( iwire >= 41 && iwire <= 52 ) { hvSegment = 4; }
-      else if ( iwire >= 53 && iwire <= 64 ) { hvSegment = 5; } 
-      
+  IndexType hvSegmentIndex(IndexType is, IndexType ir, IndexType iwire) const {
+    IndexType hvSegment = 1;  // There is only one HV segment in ME1/1
+
+    if (is > 2 && ir == 1) {  // HV segments are the same in ME3/1 and ME4/1
+      if (iwire >= 33 && iwire <= 64) {
+        hvSegment = 2;
+      } else if (iwire >= 65 && iwire <= 96) {
+        hvSegment = 3;
+      }
+
+    } else if (is > 1 && ir == 2) {  // HV segments are the same in ME2/2, ME3/2, and ME4/2
+      if (iwire >= 17 && iwire <= 28) {
+        hvSegment = 2;
+      } else if (iwire >= 29 && iwire <= 40) {
+        hvSegment = 3;
+      } else if (iwire >= 41 && iwire <= 52) {
+        hvSegment = 4;
+      } else if (iwire >= 53 && iwire <= 64) {
+        hvSegment = 5;
+      }
+
     } else if (is == 1 && ir == 2) {
-      if      ( iwire >= 25 && iwire <= 48 ) { hvSegment = 2; }
-      else if ( iwire >= 49 && iwire <= 64 ) { hvSegment = 3; }
-      
+      if (iwire >= 25 && iwire <= 48) {
+        hvSegment = 2;
+      } else if (iwire >= 49 && iwire <= 64) {
+        hvSegment = 3;
+      }
+
     } else if (is == 1 && ir == 3) {
-      if      ( iwire >= 13 && iwire <= 22 ) { hvSegment = 2; }
-      else if ( iwire >= 23 && iwire <= 32 ) { hvSegment = 3; }
-      
+      if (iwire >= 13 && iwire <= 22) {
+        hvSegment = 2;
+      } else if (iwire >= 23 && iwire <= 32) {
+        hvSegment = 3;
+      }
+
     } else if (is == 2 && ir == 1) {
-      if      ( iwire >= 45 && iwire <= 80 ) { hvSegment = 2; }
-      else if ( iwire >= 81 && iwire <= 112) { hvSegment = 3; }
-      
+      if (iwire >= 45 && iwire <= 80) {
+        hvSegment = 2;
+      } else if (iwire >= 81 && iwire <= 112) {
+        hvSegment = 3;
+      }
     }
 
     return hvSegment;
   }
 
   /**
-   * Linear index for 1st Gas gain sector in ring 'ir' of station 'is' in endcap 'ie'.
+   * Linear index for 1st Gas gain sector in ring 'ir' of station 'is' in endcap
+   * 'ie'.
    *
    * Endcap label range 1-2, Station label range 1-4, Ring label range 1-3.
    *
-   * WARNING: ME1a channels are the last 1 of the 5 chips total in each layer of an ME11 chamber, 
-   * and an input ir=4 is invalid and will give nonsense.
+   * WARNING: ME1a channels are the last 1 of the 5 chips total in each layer of
+   * an ME11 chamber, and an input ir=4 is invalid and will give nonsense.
    */
-  IndexType sectorStart( IndexType ie, IndexType is, IndexType ir ) const {
-    // There are 36 chambers * 6 layers * 5 CFEB's * 1 HV segment = 1080 gas-gain sectors in ME1/1
-    // There are 36*6*5*3 = 3240 gas-gain sectors in ME1/2
-    // There are 36*6*4*3 = 2592 gas-gain sectors in ME1/3
-    // There are 18*6*5*3 = 1620 gas-gain sectors in ME[2-4]/1
-    // There are 36*6*5*5 = 5400 gas-gain sectors in ME[2-4]/2
-    // Start of -z channels (CSCs 2008) is 22572 + 1 = 22573
-    // Start of +z (ME42) is 45144 + 1 = 45145
-    // Start of -z (ME42) is 45144 + 1 + 5400 = 50545
-    const IndexType nStart[24] = {1    ,1081 , 4321,   //ME+1/1,ME+1/2,ME+1/3
-				  6913 ,8533 ,    0,   //ME+2/1,ME+2/2,ME+2/3
-				  13933,15553,    0,   //ME+3/1,ME+3/2,ME+3/3
-				  20953,45145,    0,   //ME+4/1,ME+4/2,ME+4/3 (note, ME+4/2 index follows ME-4/1...)
-				  22573,23653,26893,   //ME-1/1,ME-1/2,ME-1/3
-				  29485,31105    ,0,   //ME-2/1,ME-2/2,ME-2/3
-				  36505,38125,    0,   //ME-3/1,ME-3/2,ME-3/3
-				  43525,50545,    0};  //ME-4/1,ME-4/2,ME-4/3 (note, ME-4/2 index follows ME+4/2...)                                   
-    return  nStart[(ie-1)*12 + (is-1)*3 + ir - 1];
+  IndexType sectorStart(IndexType ie, IndexType is, IndexType ir) const {
+    // There are 36 chambers * 6 layers * 5 CFEB's * 1 HV segment = 1080
+    // gas-gain sectors in ME1/1 There are 36*6*5*3 = 3240 gas-gain sectors in
+    // ME1/2 There are 36*6*4*3 = 2592 gas-gain sectors in ME1/3 There are
+    // 18*6*5*3 = 1620 gas-gain sectors in ME[2-4]/1 There are 36*6*5*5 = 5400
+    // gas-gain sectors in ME[2-4]/2 Start of -z channels (CSCs 2008) is 22572 +
+    // 1 = 22573 Start of +z (ME42) is 45144 + 1 = 45145 Start of -z (ME42) is
+    // 45144 + 1 + 5400 = 50545
+    const IndexType nStart[24] = {1,     1081,
+                                  4321,  // ME+1/1,ME+1/2,ME+1/3
+                                  6913,  8533,
+                                  0,  // ME+2/1,ME+2/2,ME+2/3
+                                  13933, 15553,
+                                  0,  // ME+3/1,ME+3/2,ME+3/3
+                                  20953, 45145,
+                                  0,  // ME+4/1,ME+4/2,ME+4/3 (note, ME+4/2 index follows ME-4/1...)
+                                  22573, 23653,
+                                  26893,  // ME-1/1,ME-1/2,ME-1/3
+                                  29485, 31105,
+                                  0,  // ME-2/1,ME-2/2,ME-2/3
+                                  36505, 38125,
+                                  0,                 // ME-3/1,ME-3/2,ME-3/3
+                                  43525, 50545, 0};  // ME-4/1,ME-4/2,ME-4/3 (note, ME-4/2 index follows ME+4/2...)
+    return nStart[(ie - 1) * 12 + (is - 1) * 3 + ir - 1];
   }
 
   /**
    * Linear index for Gas gain sector, based on the HV segment# and the chip#
-   * located in layer 'il' of chamber 'ic' of ring 'ir' in station 'is' of endcap 'ie'.
+   * located in layer 'il' of chamber 'ic' of ring 'ir' in station 'is' of
+   * endcap 'ie'.
    *
    * Output is 1-45144 (CSCs 2008) and 45145-55944 (ME42) and 55945-57240 (ME1a)
    *
-   * \warning: You must input labels within hardware ranges. No trapping on out-of-range values!
-   * E.g., if you provide ir=4 in ganged case, it would still be treated the same as ir=1,
-   * but ichip must be 5 for it to make sense!
+   * \warning: You must input labels within hardware ranges. No trapping on
+   * out-of-range values! E.g., if you provide ir=4 in ganged case, it would
+   * still be treated the same as ir=1, but ichip must be 5 for it to make
+   * sense!
    */
-  IndexType gasGainIndex( IndexType ie, IndexType is, IndexType ir, IndexType ic, IndexType il,
-                          IndexType ihvsegment, IndexType ichip ) const
-  {
-    return sectorStart(ie,is,ir)
-           + ( (ic-1)*6 + il - 1 ) * sectorsPerLayer(is,ir)
-           + (ihvsegment - 1) * chipsPerLayer(is,ir)
-           + (ichip - 1);
+  IndexType gasGainIndex(IndexType ie,
+                         IndexType is,
+                         IndexType ir,
+                         IndexType ic,
+                         IndexType il,
+                         IndexType ihvsegment,
+                         IndexType ichip) const {
+    return sectorStart(ie, is, ir) + ((ic - 1) * 6 + il - 1) * sectorsPerLayer(is, ir) +
+           (ihvsegment - 1) * chipsPerLayer(is, ir) + (ichip - 1);
   }
 
   /**
-   * Linear index for Gas gain sector, based on CSCDetId 'id', cathode strip 'istrip' and anode wire 'iwire'
-   *
-   * \warning: You must input labels within hardware ranges (e.g., 'id' must correspond
-   * to a specific layer 1-6). No trapping on out-of-range values!
-   * E.g., if you provide ME1a id in ganged case, it would still be treated the same as whole ME11 id,
-   * but istrip must be a h/w strip number in 64-80 in that case!
+   * Linear index for Gas gain sector, based on CSCDetId 'id', cathode strip
+   * 'istrip' and anode wire 'iwire'
+   *
+   * \warning: You must input labels within hardware ranges (e.g., 'id' must
+   * correspond to a specific layer 1-6). No trapping on out-of-range values!
+   * E.g., if you provide ME1a id in ganged case, it would still be treated the
+   * same as whole ME11 id, but istrip must be a h/w strip number in 64-80 in
+   * that case!
    */
-  IndexType gasGainIndex( const CSCDetId& id, IndexType istrip, IndexType iwire ) const
-  {
-    return gasGainIndex( id.endcap(), id.station(), id.ring(), id.chamber(), id.layer(),
-                         hvSegmentIndex( id.station(), id.ring(), iwire ),
-                         chipIndex(istrip) );
+  IndexType gasGainIndex(const CSCDetId &id, IndexType istrip, IndexType iwire) const {
+    return gasGainIndex(id.endcap(),
+                        id.station(),
+                        id.ring(),
+                        id.chamber(),
+                        id.layer(),
+                        hvSegmentIndex(id.station(), id.ring(), iwire),
+                        chipIndex(istrip));
   }
 
   /**
-   * Linear index for Gas gain sector, based on CSCDetId 'id', the HV segment# and the chip#.
-   * Note: to allow method overloading, the parameters order is reversed comparing to the (id,strip,wire) method
+   * Linear index for Gas gain sector, based on CSCDetId 'id', the HV segment#
+   * and the chip#. Note: to allow method overloading, the parameters order is
+   * reversed comparing to the (id,strip,wire) method
    *
    * Output is 1-45144 (CSCs 2008) and 45145-55944 (ME42) and 55945-57240 (ME1a)
    *
-   * \warning: Use at your own risk! You must input labels within hardware ranges.
-   * No trapping on out-of-range values!
-   * The supplied CSCDetId must be a layer id, and ichip must be h/w chip number in a chamber.
-   * E.g., if you provide ME1a id in ganged case, it would still be treated the same as whole ME11 id,
-   * but ichip must be 5 for it to make sense!
+   * \warning: Use at your own risk! You must input labels within hardware
+   * ranges. No trapping on out-of-range values! The supplied CSCDetId must be a
+   * layer id, and ichip must be h/w chip number in a chamber. E.g., if you
+   * provide ME1a id in ganged case, it would still be treated the same as whole
+   * ME11 id, but ichip must be 5 for it to make sense!
    */
-  IndexType gasGainIndex( IndexType ihvsegment, IndexType ichip, const CSCDetId& id ) const
-  {
+  IndexType gasGainIndex(IndexType ihvsegment, IndexType ichip, const CSCDetId &id) const {
     return gasGainIndex(id.endcap(), id.station(), id.ring(), id.chamber(), id.layer(), ihvsegment, ichip);
   }
 
-
   /**
    *  Decode CSCDetId from various indexes and labels
    */
-  CSCDetId detIdFromLayerIndex( IndexType ili ) const;
-  CSCDetId detIdFromChamberIndex( IndexType ici ) const;
-  CSCDetId detIdFromChamberIndex_OLD( IndexType ici ) const;
-  CSCDetId detIdFromChamberLabel( IndexType ie, IndexType icl ) const;
-  std::pair<CSCDetId, IndexType> detIdFromStripChannelIndex( LongIndexType ichi ) const;
-  std::pair<CSCDetId, IndexType> detIdFromChipIndex( IndexType ichi ) const;
+  CSCDetId detIdFromLayerIndex(IndexType ili) const;
+  CSCDetId detIdFromChamberIndex(IndexType ici) const;
+  CSCDetId detIdFromChamberIndex_OLD(IndexType ici) const;
+  CSCDetId detIdFromChamberLabel(IndexType ie, IndexType icl) const;
+  std::pair<CSCDetId, IndexType> detIdFromStripChannelIndex(LongIndexType ichi) const;
+  std::pair<CSCDetId, IndexType> detIdFromChipIndex(IndexType ichi) const;
 
-  IndexType chamberLabelFromChamberIndex( IndexType ) const; // just for cross-checks
+  IndexType chamberLabelFromChamberIndex(IndexType) const;  // just for cross-checks
 
   /**
-   * Build index used internally in online CSC conditions databases (the 'Igor Index')
+   * Build index used internally in online CSC conditions databases (the 'Igor
+   * Index')
    *
-   * This is the decimal integer ie*100000 + is*10000 + ir*1000 + ic*10 + il <br>
-   * (ie=1-2, is=1-4, ir=1-4, ic=1-36, il=1-6) <br>
-   * Channels 1-16 in ME1A (is=1, ir=4) are reset to channels 65-80 of ME11.
+   * This is the decimal integer ie*100000 + is*10000 + ir*1000 + ic*10 + il
+   * <br> (ie=1-2, is=1-4, ir=1-4, ic=1-36, il=1-6) <br> Channels 1-16 in ME1A
+   * (is=1, ir=4) are reset to channels 65-80 of ME11.
    */
-  int dbIndex(const CSCDetId & id, int & channel);
+  int dbIndex(const CSCDetId &id, int &channel);
 
 private:
-  void fillChamberLabel() const; // const so it can be called in const function detIdFromChamberIndex
-
-  mutable std::vector<IndexType> chamberLabel; // mutable so can be filled by fillChamberLabel
-
+  void fillChamberLabel() const;  // const so it can be called in const function
+                                  // detIdFromChamberIndex
 
+  mutable std::vector<IndexType> chamberLabel;  // mutable so can be filled by fillChamberLabel
 };
 
 #endif
-
-
-
-
-
-
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCBadChambersHandler.cc b/CalibMuon/CSCCalibration/test/stubs/CSCBadChambersHandler.cc
index 48b3fa6000362..65981e94f1cb7 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCBadChambersHandler.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCBadChambersHandler.cc
@@ -1,38 +1,32 @@
 #include "CalibMuon/CSCCalibration/test/stubs/CSCBadChambersHandler.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
-#include<iostream>
+#include <iostream>
 
-#include "CondFormats/CSCObjects/interface/CSCBadChambers.h"
 #include "CalibMuon/CSCCalibration/interface/CSCBadChambersConditions.h"
+#include "CondFormats/CSCObjects/interface/CSCBadChambers.h"
 
-popcon::CSCBadChambersImpl::CSCBadChambersImpl(const edm::ParameterSet& pset): m_name(pset.getUntrackedParameter<std::string>("name","CSCBadChambersImpl"))
-{}
+popcon::CSCBadChambersImpl::CSCBadChambersImpl(const edm::ParameterSet &pset)
+    : m_name(pset.getUntrackedParameter<std::string>("name", "CSCBadChambersImpl")) {}
 
-popcon::CSCBadChambersImpl::~CSCBadChambersImpl()
-{
-}
+popcon::CSCBadChambersImpl::~CSCBadChambersImpl() {}
 
-void popcon::CSCBadChambersImpl::getNewObjects()
-{
+void popcon::CSCBadChambersImpl::getNewObjects() {
+  std::cout << "------- CSC src - > getNewObjects\n" << m_name;
 
-  std::cout << "------- CSC src - > getNewObjects\n"<<m_name;
-  
   // fill object from file
-  CSCBadChambers * cnbadchambers = CSCBadChambersConditions::prefillBadChambers();
-  
-  //check whats already inside of database
-  
-  std::cerr<<"got offlineInfo"<<std::endl;
-  std::cerr << tagInfo().name << " , last object valid since " 
-	    << tagInfo().lastInterval.first << std::endl; 
-  
+  CSCBadChambers *cnbadchambers = CSCBadChambersConditions::prefillBadChambers();
+
+  // check whats already inside of database
+
+  std::cerr << "got offlineInfo" << std::endl;
+  std::cerr << tagInfo().name << " , last object valid since " << tagInfo().lastInterval.first << std::endl;
+
   unsigned int snc;
-  
+
   std::cout << "Source implementation test ::getNewObjects : enter since ? \n";
   std::cin >> snc;
- 
-  
-  m_to_transfer.push_back(std::make_pair(cnbadchambers,snc));
-  
-  std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n"<< std::endl;
+
+  m_to_transfer.push_back(std::make_pair(cnbadchambers, snc));
+
+  std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n" << std::endl;
 }
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCBadChambersHandler.h b/CalibMuon/CSCCalibration/test/stubs/CSCBadChambersHandler.h
index 212b19494579c..fe400aa36db77 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCBadChambersHandler.h
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCBadChambersHandler.h
@@ -1,34 +1,31 @@
 #ifndef CSC_BADCHAMBERS_SRC_IMPL_H
 #define CSC_BADCHAMBERS_SRC_IMPL_H
 
-#include <vector>
-#include <string>
 #include <iostream>
+#include <string>
 #include <typeinfo>
+#include <vector>
 
+#include "CalibMuon/CSCCalibration/interface/CSCBadChambersConditions.h"
 #include "CondCore/PopCon/interface/PopConSourceHandler.h"
 #include "CondFormats/CSCObjects/interface/CSCobject.h"
 #include "CondFormats/DataRecord/interface/CSCBadChambersRcd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "CalibMuon/CSCCalibration/interface/CSCBadChambersConditions.h"
 
-namespace popcon
-{
-  class CSCBadChambersImpl : public popcon::PopConSourceHandler<CSCBadChambers>
-    {
-      
-    public:
-      void getNewObjects();
-      std::string id() const { return m_name;}
-      ~CSCBadChambersImpl(); 
-      
-      CSCBadChambersImpl(const edm::ParameterSet& pset);
-      
-    private:
-      std::string m_name;
-    };
-}
+namespace popcon {
+  class CSCBadChambersImpl : public popcon::PopConSourceHandler<CSCBadChambers> {
+  public:
+    void getNewObjects();
+    std::string id() const { return m_name; }
+    ~CSCBadChambersImpl();
+
+    CSCBadChambersImpl(const edm::ParameterSet &pset);
+
+  private:
+    std::string m_name;
+  };
+}  // namespace popcon
 #endif
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCBadChambersPopConAnalyzer.cc b/CalibMuon/CSCCalibration/test/stubs/CSCBadChambersPopConAnalyzer.cc
index f406d7f1ba06b..ed2b07ec2cdbb 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCBadChambersPopConAnalyzer.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCBadChambersPopConAnalyzer.cc
@@ -1,5 +1,5 @@
-#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "CSCBadChambersHandler.h"
+#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 typedef popcon::PopConAnalyzer<popcon::CSCBadChambersImpl> CSCBadChambersPopConAnalyzer;
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCBadStripsHandler.cc b/CalibMuon/CSCCalibration/test/stubs/CSCBadStripsHandler.cc
index d9171fa9ad26c..6bc868a754863 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCBadStripsHandler.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCBadStripsHandler.cc
@@ -1,38 +1,32 @@
 #include "CalibMuon/CSCCalibration/test/stubs/CSCBadStripsHandler.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
-#include<iostream>
+#include <iostream>
 
-#include "CondFormats/CSCObjects/interface/CSCBadStrips.h"
 #include "CalibMuon/CSCCalibration/interface/CSCBadStripsConditions.h"
+#include "CondFormats/CSCObjects/interface/CSCBadStrips.h"
 
-popcon::CSCBadStripsImpl::CSCBadStripsImpl(const edm::ParameterSet& pset): m_name(pset.getUntrackedParameter<std::string>("name","CSCBadStripsImpl"))
-{}
+popcon::CSCBadStripsImpl::CSCBadStripsImpl(const edm::ParameterSet &pset)
+    : m_name(pset.getUntrackedParameter<std::string>("name", "CSCBadStripsImpl")) {}
 
-popcon::CSCBadStripsImpl::~CSCBadStripsImpl()
-{
-}
+popcon::CSCBadStripsImpl::~CSCBadStripsImpl() {}
 
-void popcon::CSCBadStripsImpl::getNewObjects()
-{
+void popcon::CSCBadStripsImpl::getNewObjects() {
+  std::cout << "------- CSC src - > getNewObjects\n" << m_name;
 
-  std::cout << "------- CSC src - > getNewObjects\n"<<m_name;
-  
   // fill object from file
-  CSCBadStrips * cnbadstrips = CSCBadStripsConditions::prefillBadStrips();
-  
-  //check whats already inside of database
-  
-  std::cerr<<"got offlineInfo"<<std::endl;
-  std::cerr << tagInfo().name << " , last object valid since " 
-	    << tagInfo().lastInterval.first << std::endl; 
-  
+  CSCBadStrips *cnbadstrips = CSCBadStripsConditions::prefillBadStrips();
+
+  // check whats already inside of database
+
+  std::cerr << "got offlineInfo" << std::endl;
+  std::cerr << tagInfo().name << " , last object valid since " << tagInfo().lastInterval.first << std::endl;
+
   unsigned int snc;
-  
+
   std::cout << "Source implementation test ::getNewObjects : enter since ? \n";
   std::cin >> snc;
- 
-  
-  m_to_transfer.push_back(std::make_pair(cnbadstrips,snc));
-  
-  std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n"<< std::endl;
+
+  m_to_transfer.push_back(std::make_pair(cnbadstrips, snc));
+
+  std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n" << std::endl;
 }
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCBadStripsHandler.h b/CalibMuon/CSCCalibration/test/stubs/CSCBadStripsHandler.h
index 05f812c3f8dd8..ca8af37b9cbcc 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCBadStripsHandler.h
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCBadStripsHandler.h
@@ -1,34 +1,31 @@
 #ifndef CSC_BADSTRIPS_SRC_IMPL_H
 #define CSC_BADSTRIPS_SRC_IMPL_H
 
-#include <vector>
-#include <string>
 #include <iostream>
+#include <string>
 #include <typeinfo>
+#include <vector>
 
+#include "CalibMuon/CSCCalibration/interface/CSCBadStripsConditions.h"
 #include "CondCore/PopCon/interface/PopConSourceHandler.h"
 #include "CondFormats/CSCObjects/interface/CSCobject.h"
 #include "CondFormats/DataRecord/interface/CSCBadStripsRcd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "CalibMuon/CSCCalibration/interface/CSCBadStripsConditions.h"
 
-namespace popcon
-{
-  class CSCBadStripsImpl : public popcon::PopConSourceHandler<CSCBadStrips>
-    {
-      
-    public:
-      void getNewObjects();
-      std::string id() const { return m_name;}
-      ~CSCBadStripsImpl(); 
-      
-      CSCBadStripsImpl(const edm::ParameterSet& pset);
-      
-    private:
-      std::string m_name;
-    };
-}
+namespace popcon {
+  class CSCBadStripsImpl : public popcon::PopConSourceHandler<CSCBadStrips> {
+  public:
+    void getNewObjects();
+    std::string id() const { return m_name; }
+    ~CSCBadStripsImpl();
+
+    CSCBadStripsImpl(const edm::ParameterSet &pset);
+
+  private:
+    std::string m_name;
+  };
+}  // namespace popcon
 #endif
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCBadStripsPopConAnalyzer.cc b/CalibMuon/CSCCalibration/test/stubs/CSCBadStripsPopConAnalyzer.cc
index fc20f0392f8d3..01d36818fecb2 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCBadStripsPopConAnalyzer.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCBadStripsPopConAnalyzer.cc
@@ -1,5 +1,5 @@
-#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "CSCBadStripsHandler.h"
+#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 typedef popcon::PopConAnalyzer<popcon::CSCBadStripsImpl> CSCBadStripsPopConAnalyzer;
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCBadWiresHandler.cc b/CalibMuon/CSCCalibration/test/stubs/CSCBadWiresHandler.cc
index 0c3f4fb978587..3c0e335fafb48 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCBadWiresHandler.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCBadWiresHandler.cc
@@ -1,38 +1,32 @@
 #include "CalibMuon/CSCCalibration/test/stubs/CSCBadWiresHandler.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
-#include<iostream>
+#include <iostream>
 
-#include "CondFormats/CSCObjects/interface/CSCBadWires.h"
 #include "CalibMuon/CSCCalibration/interface/CSCBadWiresConditions.h"
+#include "CondFormats/CSCObjects/interface/CSCBadWires.h"
 
-popcon::CSCBadWiresImpl::CSCBadWiresImpl(const edm::ParameterSet& pset): m_name(pset.getUntrackedParameter<std::string>("name","CSCBadWiresImpl"))
-{}
+popcon::CSCBadWiresImpl::CSCBadWiresImpl(const edm::ParameterSet &pset)
+    : m_name(pset.getUntrackedParameter<std::string>("name", "CSCBadWiresImpl")) {}
 
-popcon::CSCBadWiresImpl::~CSCBadWiresImpl()
-{
-}
+popcon::CSCBadWiresImpl::~CSCBadWiresImpl() {}
 
-void popcon::CSCBadWiresImpl::getNewObjects()
-{
+void popcon::CSCBadWiresImpl::getNewObjects() {
+  std::cout << "------- CSC src - > getNewObjects\n" << m_name;
 
-  std::cout << "------- CSC src - > getNewObjects\n"<<m_name;
-  
   // fill object from file
-  CSCBadWires * cnbadwires = CSCBadWiresConditions::prefillBadWires();
-  
-  //check whats already inside of database
-  
-  std::cerr<<"got offlineInfo"<<std::endl;
-  std::cerr << tagInfo().name << " , last object valid since " 
-	    << tagInfo().lastInterval.first << std::endl; 
-  
+  CSCBadWires *cnbadwires = CSCBadWiresConditions::prefillBadWires();
+
+  // check whats already inside of database
+
+  std::cerr << "got offlineInfo" << std::endl;
+  std::cerr << tagInfo().name << " , last object valid since " << tagInfo().lastInterval.first << std::endl;
+
   unsigned int snc;
-  
+
   std::cout << "Source implementation test ::getNewObjects : enter since ? \n";
   std::cin >> snc;
- 
-  
-  m_to_transfer.push_back(std::make_pair(cnbadwires,snc));
-  
-  std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n"<< std::endl;
+
+  m_to_transfer.push_back(std::make_pair(cnbadwires, snc));
+
+  std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n" << std::endl;
 }
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCBadWiresHandler.h b/CalibMuon/CSCCalibration/test/stubs/CSCBadWiresHandler.h
index 2f3e41f1461a6..eb1ad4b129a7b 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCBadWiresHandler.h
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCBadWiresHandler.h
@@ -1,34 +1,31 @@
 #ifndef CSC_BADWIRES_SRC_IMPL_H
 #define CSC_BADWIRES_SRC_IMPL_H
 
-#include <vector>
-#include <string>
 #include <iostream>
+#include <string>
 #include <typeinfo>
+#include <vector>
 
+#include "CalibMuon/CSCCalibration/interface/CSCBadWiresConditions.h"
 #include "CondCore/PopCon/interface/PopConSourceHandler.h"
 #include "CondFormats/CSCObjects/interface/CSCobject.h"
 #include "CondFormats/DataRecord/interface/CSCBadWiresRcd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "CalibMuon/CSCCalibration/interface/CSCBadWiresConditions.h"
 
-namespace popcon
-{
-  class CSCBadWiresImpl : public popcon::PopConSourceHandler<CSCBadWires>
-    {
-      
-    public:
-      void getNewObjects();
-      std::string id() const { return m_name;}
-      ~CSCBadWiresImpl(); 
-      
-      CSCBadWiresImpl(const edm::ParameterSet& pset);
-      
-    private:
-      std::string m_name;
-    };
-}
+namespace popcon {
+  class CSCBadWiresImpl : public popcon::PopConSourceHandler<CSCBadWires> {
+  public:
+    void getNewObjects();
+    std::string id() const { return m_name; }
+    ~CSCBadWiresImpl();
+
+    CSCBadWiresImpl(const edm::ParameterSet &pset);
+
+  private:
+    std::string m_name;
+  };
+}  // namespace popcon
 #endif
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCBadWiresPopConAnalyzer.cc b/CalibMuon/CSCCalibration/test/stubs/CSCBadWiresPopConAnalyzer.cc
index 769afcd9bd698..4e8196fba34f4 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCBadWiresPopConAnalyzer.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCBadWiresPopConAnalyzer.cc
@@ -1,5 +1,5 @@
-#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "CSCBadWiresHandler.h"
+#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 typedef popcon::PopConAnalyzer<popcon::CSCBadWiresImpl> CSCBadWiresPopConAnalyzer;
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCChipSpeedCorrectionPopConAnalyzer.cc b/CalibMuon/CSCCalibration/test/stubs/CSCChipSpeedCorrectionPopConAnalyzer.cc
index 8d651cf1bfeed..38d13c191d2a4 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCChipSpeedCorrectionPopConAnalyzer.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCChipSpeedCorrectionPopConAnalyzer.cc
@@ -1,6 +1,6 @@
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "CSCDBChipSpeedCorrectionHandler.h"
+#include "CondCore/PopCon/interface/PopConAnalyzer.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 
 typedef popcon::PopConAnalyzer<popcon::CSCDBChipSpeedCorrectionImpl> CSCDBChipSpeedCorrectionPopConAnalyzer;
 
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCCrosstalkHandler.cc b/CalibMuon/CSCCalibration/test/stubs/CSCCrosstalkHandler.cc
index fae402ce34f11..921b215f429f1 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCCrosstalkHandler.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCCrosstalkHandler.cc
@@ -1,46 +1,38 @@
 #include "CalibMuon/CSCCalibration/test/stubs/CSCCrosstalkHandler.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include<iostream>
+#include <iostream>
 
-popcon::CSCDBCrosstalkImpl::CSCDBCrosstalkImpl(const edm::ParameterSet& pset): m_name(pset.getUntrackedParameter<std::string>("name","CSCDBCrosstalkImpl"))
-{}
-
-popcon::CSCDBCrosstalkImpl::~CSCDBCrosstalkImpl()
-{
-}
+popcon::CSCDBCrosstalkImpl::CSCDBCrosstalkImpl(const edm::ParameterSet &pset)
+    : m_name(pset.getUntrackedParameter<std::string>("name", "CSCDBCrosstalkImpl")) {}
 
+popcon::CSCDBCrosstalkImpl::~CSCDBCrosstalkImpl() {}
 
-#include "CondFormats/CSCObjects/interface/CSCDBCrosstalk.h"
 #include "CalibMuon/CSCCalibration/interface/CSCCrosstalkDBConditions.h"
-
-
+#include "CondFormats/CSCObjects/interface/CSCDBCrosstalk.h"
 
 void popcon::CSCDBCrosstalkImpl::getNewObjects() {
-
-  std::cout << "CSCCrosstalkHandler - time before filling object:"<< std::endl;
-  std::cout << "------- CSC src - > getNewObjects\n"<<m_name;
-	
+  std::cout << "CSCCrosstalkHandler - time before filling object:" << std::endl;
+  std::cout << "------- CSC src - > getNewObjects\n" << m_name;
 
   // fill object from file
-  CSCDBCrosstalk * cncrosstalk = CSCCrosstalkDBConditions::prefillDBCrosstalk();
-  //std::cout << "crosstalk size " << cncrosstalk->crosstalk.size() << std::endl;
- 
-  std::cout << "CSCCrosstalkHandler - time after filling object:"<< std::endl;
+  CSCDBCrosstalk *cncrosstalk = CSCCrosstalkDBConditions::prefillDBCrosstalk();
+  // std::cout << "crosstalk size " << cncrosstalk->crosstalk.size() <<
+  // std::endl;
+
+  std::cout << "CSCCrosstalkHandler - time after filling object:" << std::endl;
+
+  // check whats already inside of database
 
-  //check whats already inside of database
-  
-  std::cerr<<"got offlineInfo"<<std::endl;
-  std::cerr << tagInfo().name << " , last object valid since " 
-	    << tagInfo().lastInterval.first << std::endl;  	
+  std::cerr << "got offlineInfo" << std::endl;
+  std::cerr << tagInfo().name << " , last object valid since " << tagInfo().lastInterval.first << std::endl;
 
   unsigned int snc;
-  
+
   std::cout << "Source implementation test ::getNewObjects : enter since ? \n";
   std::cin >> snc;
 
-  
-  m_to_transfer.push_back(std::make_pair(cncrosstalk,snc));
-  
+  m_to_transfer.push_back(std::make_pair(cncrosstalk, snc));
+
   std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n" << std::endl;
-  std::cout << "CSCCrosstalkHandler - time before writing into DB:"<< std::endl;
+  std::cout << "CSCCrosstalkHandler - time before writing into DB:" << std::endl;
 }
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCCrosstalkHandler.h b/CalibMuon/CSCCalibration/test/stubs/CSCCrosstalkHandler.h
index ffdf944651b1e..1230b66f84f0a 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCCrosstalkHandler.h
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCCrosstalkHandler.h
@@ -1,34 +1,31 @@
 #ifndef CSC_DBCROSSTALK_SRC_IMPL_H
 #define CSC_DBCROSSTALK_SRC_IMPL_H
 
-#include <vector>
-#include <string>
 #include <iostream>
+#include <string>
 #include <typeinfo>
+#include <vector>
 
+#include "CalibMuon/CSCCalibration/interface/CSCCrosstalkDBConditions.h"
 #include "CondCore/PopCon/interface/PopConSourceHandler.h"
 #include "CondFormats/CSCObjects/interface/CSCobject.h"
 #include "CondFormats/DataRecord/interface/CSCDBCrosstalkRcd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "CalibMuon/CSCCalibration/interface/CSCCrosstalkDBConditions.h"
 
-namespace popcon
-{
-  class CSCDBCrosstalkImpl : public popcon::PopConSourceHandler<CSCDBCrosstalk>
-    {
-      
-    public:
-      void getNewObjects();
-      std::string id() const { return m_name;}
-      ~CSCDBCrosstalkImpl(); 
-      
-      CSCDBCrosstalkImpl(const edm::ParameterSet& pset);
-  
-    private:
-      std::string m_name;
-    };
-}
+namespace popcon {
+  class CSCDBCrosstalkImpl : public popcon::PopConSourceHandler<CSCDBCrosstalk> {
+  public:
+    void getNewObjects();
+    std::string id() const { return m_name; }
+    ~CSCDBCrosstalkImpl();
+
+    CSCDBCrosstalkImpl(const edm::ParameterSet &pset);
+
+  private:
+    std::string m_name;
+  };
+}  // namespace popcon
 #endif
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCCrosstalkPopConAnalyzer.cc b/CalibMuon/CSCCalibration/test/stubs/CSCCrosstalkPopConAnalyzer.cc
index def080bd68c6b..a9a84eb8e46c8 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCCrosstalkPopConAnalyzer.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCCrosstalkPopConAnalyzer.cc
@@ -1,5 +1,5 @@
-#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "CSCCrosstalkHandler.h"
+#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 typedef popcon::PopConAnalyzer<popcon::CSCDBCrosstalkImpl> CSCCrosstalkPopConAnalyzer;
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCDBChipSpeedCorrectionHandler.cc b/CalibMuon/CSCCalibration/test/stubs/CSCDBChipSpeedCorrectionHandler.cc
index 9469d48af726b..ed549e208627b 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCDBChipSpeedCorrectionHandler.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCDBChipSpeedCorrectionHandler.cc
@@ -1,47 +1,46 @@
 #include "CalibMuon/CSCCalibration/test/stubs/CSCDBChipSpeedCorrectionHandler.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
-#include<iostream>
+#include <iostream>
 
-#include "CondFormats/CSCObjects/interface/CSCDBChipSpeedCorrection.h"
 #include "CalibMuon/CSCCalibration/interface/CSCChipSpeedCorrectionDBConditions.h"
+#include "CondFormats/CSCObjects/interface/CSCDBChipSpeedCorrection.h"
 
-popcon::CSCDBChipSpeedCorrectionImpl::CSCDBChipSpeedCorrectionImpl(const edm::ParameterSet& pset){
-  m_name=(pset.getUntrackedParameter<std::string>("name","CSCDBChipSpeedCorrectionImpl"));
-  isForMC=(pset.getUntrackedParameter<bool>("isForMC",true));
-  dataCorrFileName=(pset.getUntrackedParameter<std::string>("dataCorrFileName","empty.txt"));
+popcon::CSCDBChipSpeedCorrectionImpl::CSCDBChipSpeedCorrectionImpl(const edm::ParameterSet &pset) {
+  m_name = (pset.getUntrackedParameter<std::string>("name", "CSCDBChipSpeedCorrectionImpl"));
+  isForMC = (pset.getUntrackedParameter<bool>("isForMC", true));
+  dataCorrFileName = (pset.getUntrackedParameter<std::string>("dataCorrFileName", "empty.txt"));
   dataOffset = 170.;
-    }
+}
 
-popcon::CSCDBChipSpeedCorrectionImpl::~CSCDBChipSpeedCorrectionImpl(){}
+popcon::CSCDBChipSpeedCorrectionImpl::~CSCDBChipSpeedCorrectionImpl() {}
 
-void popcon::CSCDBChipSpeedCorrectionImpl::getNewObjects()
-{
+void popcon::CSCDBChipSpeedCorrectionImpl::getNewObjects() {
+  std::cout << "CSCChipSpeedCorrectionHandler - time before filling object:" << std::endl;
+  std::cout << "------- CSC src - > getNewObjects\n" << m_name;
 
-  std::cout << "CSCChipSpeedCorrectionHandler - time before filling object:"<< std::endl;
-  std::cout << "------- CSC src - > getNewObjects\n"<<m_name;
-  
   // fill object from file
-  //bool isForMC = iConfig.getUntrackedParameter<bool>("isForMC",true);
-  //string dataCorrFileName= iConfig.getUntrackedParameter<std::string>("dataCorrFileName","empty.txt");
-  CSCDBChipSpeedCorrection * cnchipspeed = CSCChipSpeedCorrectionDBConditions::prefillDBChipSpeedCorrection(isForMC,dataCorrFileName,dataOffset);
-  //std::cout << "chipspeed size " << cnchipspeed->chipspeed.size() << std::endl;
+  // bool isForMC = iConfig.getUntrackedParameter<bool>("isForMC",true);
+  // string dataCorrFileName=
+  // iConfig.getUntrackedParameter<std::string>("dataCorrFileName","empty.txt");
+  CSCDBChipSpeedCorrection *cnchipspeed =
+      CSCChipSpeedCorrectionDBConditions::prefillDBChipSpeedCorrection(isForMC, dataCorrFileName, dataOffset);
+  // std::cout << "chipspeed size " << cnchipspeed->chipspeed.size() <<
+  // std::endl;
 
-  std::cout << "CSCChipSpeedCorrectionHandler - time after filling object:"<< std::endl;
+  std::cout << "CSCChipSpeedCorrectionHandler - time after filling object:" << std::endl;
 
-  //check whats already inside of database
+  // check whats already inside of database
+
+  std::cerr << "got offlineInfo" << std::endl;
+  std::cerr << tagInfo().name << " , last object valid since " << tagInfo().lastInterval.first << std::endl;
 
-  std::cerr<<"got offlineInfo"<<std::endl;
-  std::cerr << tagInfo().name << " , last object valid since " 
-	    << tagInfo().lastInterval.first << std::endl;
-	
   unsigned int snc;
   std::cout << "Source implementation test ::getNewObjects : enter since ? \n";
   std::cin >> snc;
   std::cout << "getNewObjects : enter till ? \n";
-  
-   
-  m_to_transfer.push_back(std::make_pair(cnchipspeed,snc));
-   
+
+  m_to_transfer.push_back(std::make_pair(cnchipspeed, snc));
+
   std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n" << std::endl;
-  std::cout << "CSCChipSpeedCorrectionHandler - time before writing into DB:"<< std::endl;
+  std::cout << "CSCChipSpeedCorrectionHandler - time before writing into DB:" << std::endl;
 }
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCDBChipSpeedCorrectionHandler.h b/CalibMuon/CSCCalibration/test/stubs/CSCDBChipSpeedCorrectionHandler.h
index 94153e727891c..02579a0fda661 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCDBChipSpeedCorrectionHandler.h
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCDBChipSpeedCorrectionHandler.h
@@ -1,36 +1,33 @@
 #ifndef CSC_DBCHIPSPEEDCORRECTION_SRC_IMPL_H
 #define CSC_DBCHIPSPEEDCORRECTION_SRC_IMPL_H
 
-#include <vector>
-#include <string>
 #include <iostream>
+#include <string>
 #include <typeinfo>
+#include <vector>
 
+#include "CalibMuon/CSCCalibration/interface/CSCChipSpeedCorrectionDBConditions.h"
 #include "CondCore/PopCon/interface/PopConSourceHandler.h"
 #include "CondFormats/CSCObjects/interface/CSCobject.h"
 #include "CondFormats/DataRecord/interface/CSCDBChipSpeedCorrectionRcd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "CalibMuon/CSCCalibration/interface/CSCChipSpeedCorrectionDBConditions.h"
 
-namespace popcon
-{
-  class CSCDBChipSpeedCorrectionImpl : public popcon::PopConSourceHandler<CSCDBChipSpeedCorrection>
-    {
-      
-    public:
-      void getNewObjects();
-      std::string id() const { return m_name;}
-      ~CSCDBChipSpeedCorrectionImpl(); 
-      CSCDBChipSpeedCorrectionImpl(const edm::ParameterSet& pset);
-      
-    private:
-      std::string m_name;
-      bool isForMC;
-      std::string dataCorrFileName;
-      float dataOffset;
-    };
-}
+namespace popcon {
+  class CSCDBChipSpeedCorrectionImpl : public popcon::PopConSourceHandler<CSCDBChipSpeedCorrection> {
+  public:
+    void getNewObjects();
+    std::string id() const { return m_name; }
+    ~CSCDBChipSpeedCorrectionImpl();
+    CSCDBChipSpeedCorrectionImpl(const edm::ParameterSet &pset);
+
+  private:
+    std::string m_name;
+    bool isForMC;
+    std::string dataCorrFileName;
+    float dataOffset;
+  };
+}  // namespace popcon
 #endif
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCDBGasGainCorrectionHandler.cc b/CalibMuon/CSCCalibration/test/stubs/CSCDBGasGainCorrectionHandler.cc
index 76f2679e0a7c7..a4ff851358ec7 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCDBGasGainCorrectionHandler.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCDBGasGainCorrectionHandler.cc
@@ -1,45 +1,43 @@
 #include "CalibMuon/CSCCalibration/test/stubs/CSCDBGasGainCorrectionHandler.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
-#include<iostream>
+#include <iostream>
 
-#include "CondFormats/CSCObjects/interface/CSCDBGasGainCorrection.h"
 #include "CalibMuon/CSCCalibration/interface/CSCGasGainCorrectionDBConditions.h"
+#include "CondFormats/CSCObjects/interface/CSCDBGasGainCorrection.h"
 
-popcon::CSCDBGasGainCorrectionImpl::CSCDBGasGainCorrectionImpl(const edm::ParameterSet& pset){
-  m_name=(pset.getUntrackedParameter<std::string>("name","CSCDBGasGainCorrectionImpl"));
-  isForMC=(pset.getUntrackedParameter<bool>("isForMC",true));
-  dataCorrFileName=(pset.getUntrackedParameter<std::string>("dataCorrFileName","empty.txt"));
+popcon::CSCDBGasGainCorrectionImpl::CSCDBGasGainCorrectionImpl(const edm::ParameterSet &pset) {
+  m_name = (pset.getUntrackedParameter<std::string>("name", "CSCDBGasGainCorrectionImpl"));
+  isForMC = (pset.getUntrackedParameter<bool>("isForMC", true));
+  dataCorrFileName = (pset.getUntrackedParameter<std::string>("dataCorrFileName", "empty.txt"));
 }
 
-popcon::CSCDBGasGainCorrectionImpl::~CSCDBGasGainCorrectionImpl(){}
+popcon::CSCDBGasGainCorrectionImpl::~CSCDBGasGainCorrectionImpl() {}
 
-void popcon::CSCDBGasGainCorrectionImpl::getNewObjects()
-{
+void popcon::CSCDBGasGainCorrectionImpl::getNewObjects() {
+  std::cout << "CSCGasGainCorrectionHandler - time before filling object:" << std::endl;
+  std::cout << "------- CSC src - > getNewObjects\n" << m_name;
 
-  std::cout << "CSCGasGainCorrectionHandler - time before filling object:"<< std::endl;
-  std::cout << "------- CSC src - > getNewObjects\n"<<m_name;
-  
   // fill object from file
-  //bool isForMC = iConfig.getUntrackedParameter<bool>("isForMC",true);
-  //string dataCorrFileName= iConfig.getUntrackedParameter<std::string>("dataCorrFileName","empty.txt");
-  CSCDBGasGainCorrection * cngasgain = CSCGasGainCorrectionDBConditions::prefillDBGasGainCorrection(isForMC,dataCorrFileName);
+  // bool isForMC = iConfig.getUntrackedParameter<bool>("isForMC",true);
+  // string dataCorrFileName=
+  // iConfig.getUntrackedParameter<std::string>("dataCorrFileName","empty.txt");
+  CSCDBGasGainCorrection *cngasgain =
+      CSCGasGainCorrectionDBConditions::prefillDBGasGainCorrection(isForMC, dataCorrFileName);
+
+  std::cout << "CSCGasGainCorrectionHandler - time after filling object:" << std::endl;
 
-  std::cout << "CSCGasGainCorrectionHandler - time after filling object:"<< std::endl;
+  // check whats already inside of database
 
-  //check whats already inside of database
+  std::cerr << "got offlineInfo" << std::endl;
+  std::cerr << tagInfo().name << " , last object valid since " << tagInfo().lastInterval.first << std::endl;
 
-  std::cerr<<"got offlineInfo"<<std::endl;
-  std::cerr << tagInfo().name << " , last object valid since " 
-	    << tagInfo().lastInterval.first << std::endl;
-	
   unsigned int snc;
   std::cout << "Source implementation test ::getNewObjects : enter since ? \n";
   std::cin >> snc;
   std::cout << "getNewObjects : enter till ? \n";
-  
-   
-  m_to_transfer.push_back(std::make_pair(cngasgain,snc));
-   
+
+  m_to_transfer.push_back(std::make_pair(cngasgain, snc));
+
   std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n" << std::endl;
-  std::cout << "CSCGasGainCorrectionHandler - time before writing into DB:"<< std::endl;
+  std::cout << "CSCGasGainCorrectionHandler - time before writing into DB:" << std::endl;
 }
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCDBGasGainCorrectionHandler.h b/CalibMuon/CSCCalibration/test/stubs/CSCDBGasGainCorrectionHandler.h
index 98737ddd47c6d..b690259575637 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCDBGasGainCorrectionHandler.h
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCDBGasGainCorrectionHandler.h
@@ -1,35 +1,32 @@
 #ifndef CSC_DBCHIPSPEEDCORRECTION_SRC_IMPL_H
 #define CSC_DBCHIPSPEEDCORRECTION_SRC_IMPL_H
 
-#include <vector>
-#include <string>
 #include <iostream>
+#include <string>
 #include <typeinfo>
+#include <vector>
 
+#include "CalibMuon/CSCCalibration/interface/CSCGasGainCorrectionDBConditions.h"
 #include "CondCore/PopCon/interface/PopConSourceHandler.h"
 #include "CondFormats/CSCObjects/interface/CSCobject.h"
 #include "CondFormats/DataRecord/interface/CSCDBGasGainCorrectionRcd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "CalibMuon/CSCCalibration/interface/CSCGasGainCorrectionDBConditions.h"
 
-namespace popcon
-{
-  class CSCDBGasGainCorrectionImpl : public popcon::PopConSourceHandler<CSCDBGasGainCorrection>
-    {
-      
-    public:
-      void getNewObjects();
-      std::string id() const { return m_name;}
-      ~CSCDBGasGainCorrectionImpl(); 
-      CSCDBGasGainCorrectionImpl(const edm::ParameterSet& pset);
-      
-    private:
-      std::string m_name;
-      bool isForMC;
-      std::string dataCorrFileName;
-    };
-}
+namespace popcon {
+  class CSCDBGasGainCorrectionImpl : public popcon::PopConSourceHandler<CSCDBGasGainCorrection> {
+  public:
+    void getNewObjects();
+    std::string id() const { return m_name; }
+    ~CSCDBGasGainCorrectionImpl();
+    CSCDBGasGainCorrectionImpl(const edm::ParameterSet &pset);
+
+  private:
+    std::string m_name;
+    bool isForMC;
+    std::string dataCorrFileName;
+  };
+}  // namespace popcon
 #endif
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCDBL1TPParametersHandler.cc b/CalibMuon/CSCCalibration/test/stubs/CSCDBL1TPParametersHandler.cc
index 4c4fc6f399722..a03d0a3440047 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCDBL1TPParametersHandler.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCDBL1TPParametersHandler.cc
@@ -1,45 +1,36 @@
 #include "CalibMuon/CSCCalibration/test/stubs/CSCDBL1TPParametersHandler.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include<iostream>
+#include <iostream>
 
-popcon::CSCDBL1TPParametersImpl::CSCDBL1TPParametersImpl(const edm::ParameterSet& pset): m_name(pset.getUntrackedParameter<std::string>("name","CSCDBL1TPParametersImpl"))
-{}
-
-popcon::CSCDBL1TPParametersImpl::~CSCDBL1TPParametersImpl()
-{
-}
+popcon::CSCDBL1TPParametersImpl::CSCDBL1TPParametersImpl(const edm::ParameterSet &pset)
+    : m_name(pset.getUntrackedParameter<std::string>("name", "CSCDBL1TPParametersImpl")) {}
 
+popcon::CSCDBL1TPParametersImpl::~CSCDBL1TPParametersImpl() {}
 
-#include "CondFormats/CSCObjects/interface/CSCDBL1TPParameters.h"
 #include "CalibMuon/CSCCalibration/interface/CSCDBL1TPParametersConditions.h"
-
-
+#include "CondFormats/CSCObjects/interface/CSCDBL1TPParameters.h"
 
 void popcon::CSCDBL1TPParametersImpl::getNewObjects() {
-
-  std::cout << "CSCDBL1TPParametersHandler - time before filling object:"<< std::endl;
-  std::cout << "------- CSC src - > getNewObjects\n"<<m_name;
-	
+  std::cout << "CSCDBL1TPParametersHandler - time before filling object:" << std::endl;
+  std::cout << "------- CSC src - > getNewObjects\n" << m_name;
 
   // fill object from file
-  CSCDBL1TPParameters * cnl1tp = CSCDBL1TPParametersConditions::prefillCSCDBL1TPParameters();
- 
-  std::cout << "CSCDBL1TPParametersHandler - time after filling object:"<< std::endl;
+  CSCDBL1TPParameters *cnl1tp = CSCDBL1TPParametersConditions::prefillCSCDBL1TPParameters();
+
+  std::cout << "CSCDBL1TPParametersHandler - time after filling object:" << std::endl;
+
+  // check whats already inside of database
 
-  //check whats already inside of database
-  
-  std::cerr<<"got offlineInfo"<<std::endl;
-  std::cerr << tagInfo().name << " , last object valid since " 
-	    << tagInfo().lastInterval.first << std::endl;  	
+  std::cerr << "got offlineInfo" << std::endl;
+  std::cerr << tagInfo().name << " , last object valid since " << tagInfo().lastInterval.first << std::endl;
 
   unsigned int snc;
-  
+
   std::cout << "Source implementation test ::getNewObjects : enter since ? \n";
   std::cin >> snc;
 
-  
-  m_to_transfer.push_back(std::make_pair(cnl1tp,snc));
-  
+  m_to_transfer.push_back(std::make_pair(cnl1tp, snc));
+
   std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n" << std::endl;
-  std::cout << "CSCDBL1TPParametersHandler - time before writing into DB:"<< std::endl;
+  std::cout << "CSCDBL1TPParametersHandler - time before writing into DB:" << std::endl;
 }
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCDBL1TPParametersHandler.h b/CalibMuon/CSCCalibration/test/stubs/CSCDBL1TPParametersHandler.h
index fdb0723fe106b..8c1aac38d8961 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCDBL1TPParametersHandler.h
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCDBL1TPParametersHandler.h
@@ -1,34 +1,31 @@
 #ifndef CSC_L1TPPARAMETERS_SRC_IMPL_H
 #define CSC_L1TPPARAMETERS_SRC_IMPL_H
 
-#include <vector>
-#include <string>
 #include <iostream>
+#include <string>
 #include <typeinfo>
+#include <vector>
 
+#include "CalibMuon/CSCCalibration/interface/CSCDBL1TPParametersConditions.h"
 #include "CondCore/PopCon/interface/PopConSourceHandler.h"
 #include "CondFormats/CSCObjects/interface/CSCobject.h"
 #include "CondFormats/DataRecord/interface/CSCDBL1TPParametersRcd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "CalibMuon/CSCCalibration/interface/CSCDBL1TPParametersConditions.h"
 
-namespace popcon
-{
-  class CSCDBL1TPParametersImpl : public popcon::PopConSourceHandler<CSCDBL1TPParameters>
-    {
-      
-    public:
-      void getNewObjects();
-      std::string id() const { return m_name;}
-      ~CSCDBL1TPParametersImpl(); 
-      
-      CSCDBL1TPParametersImpl(const edm::ParameterSet& pset);
-  
-    private:
-      std::string m_name;
-    };
-}
+namespace popcon {
+  class CSCDBL1TPParametersImpl : public popcon::PopConSourceHandler<CSCDBL1TPParameters> {
+  public:
+    void getNewObjects();
+    std::string id() const { return m_name; }
+    ~CSCDBL1TPParametersImpl();
+
+    CSCDBL1TPParametersImpl(const edm::ParameterSet &pset);
+
+  private:
+    std::string m_name;
+  };
+}  // namespace popcon
 #endif
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCDBL1TPParametersPopConAnalyzer.cc b/CalibMuon/CSCCalibration/test/stubs/CSCDBL1TPParametersPopConAnalyzer.cc
index dd5419f641bf0..bead6ae37c917 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCDBL1TPParametersPopConAnalyzer.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCDBL1TPParametersPopConAnalyzer.cc
@@ -1,5 +1,5 @@
-#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "CSCDBL1TPParametersHandler.h"
+#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 typedef popcon::PopConAnalyzer<popcon::CSCDBL1TPParametersImpl> CSCDBL1TPParametersPopConAnalyzer;
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCFakeCrosstalkPopConAnalyzer.cc b/CalibMuon/CSCCalibration/test/stubs/CSCFakeCrosstalkPopConAnalyzer.cc
index a3f7af7d886c3..d6d9b59ec4298 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCFakeCrosstalkPopConAnalyzer.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCFakeCrosstalkPopConAnalyzer.cc
@@ -1,5 +1,5 @@
-#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "CSCFakeDBCrosstalkHandler.h"
+#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 typedef popcon::PopConAnalyzer<popcon::CSCFakeDBCrosstalkImpl> CSCFakeCrosstalkPopConAnalyzer;
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBCrosstalkHandler.cc b/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBCrosstalkHandler.cc
index 51959ff86c2f6..403db66784a5b 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBCrosstalkHandler.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBCrosstalkHandler.cc
@@ -1,39 +1,34 @@
 #include "CalibMuon/CSCCalibration/test/stubs/CSCFakeDBCrosstalkHandler.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
-#include<iostream>
+#include <iostream>
 
-#include "CondFormats/CSCObjects/interface/CSCDBCrosstalk.h"
 #include "CalibMuon/CSCCalibration/interface/CSCFakeDBCrosstalk.h"
+#include "CondFormats/CSCObjects/interface/CSCDBCrosstalk.h"
 
-popcon::CSCFakeDBCrosstalkImpl::CSCFakeDBCrosstalkImpl(const edm::ParameterSet& pset): m_name(pset.getUntrackedParameter<std::string>("name","CSCFakeDBCrosstalkImpl"))
-{}
+popcon::CSCFakeDBCrosstalkImpl::CSCFakeDBCrosstalkImpl(const edm::ParameterSet &pset)
+    : m_name(pset.getUntrackedParameter<std::string>("name", "CSCFakeDBCrosstalkImpl")) {}
 
-popcon::CSCFakeDBCrosstalkImpl::~CSCFakeDBCrosstalkImpl()
-{
-}
+popcon::CSCFakeDBCrosstalkImpl::~CSCFakeDBCrosstalkImpl() {}
 
-void popcon::CSCFakeDBCrosstalkImpl::getNewObjects()
-{
+void popcon::CSCFakeDBCrosstalkImpl::getNewObjects() {
+  std::cout << "------- CSC src - > getNewObjects\n" << m_name;
 
-  std::cout << "------- CSC src - > getNewObjects\n"<<m_name;
-  
   // fill object from file
-  CSCDBCrosstalk * cncrosstalk = CSCFakeDBCrosstalk::prefillDBCrosstalk();
-  //std::cout << "crosstalk size " << cncrosstalk->crosstalk.size() << std::endl;
-  
-  //check whats already inside of database
-  
-  std::cerr<<"got offlineInfo"<<std::endl;
-  std::cerr << tagInfo().name << " , last object valid since " 
-	    << tagInfo().lastInterval.first << std::endl; 
-  
+  CSCDBCrosstalk *cncrosstalk = CSCFakeDBCrosstalk::prefillDBCrosstalk();
+  // std::cout << "crosstalk size " << cncrosstalk->crosstalk.size() <<
+  // std::endl;
+
+  // check whats already inside of database
+
+  std::cerr << "got offlineInfo" << std::endl;
+  std::cerr << tagInfo().name << " , last object valid since " << tagInfo().lastInterval.first << std::endl;
+
   unsigned int snc;
-  
+
   std::cout << "Source implementation test ::getNewObjects : enter since ? \n";
   std::cin >> snc;
- 
-  
-  m_to_transfer.push_back(std::make_pair(cncrosstalk,snc));
-  
-  std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n"<< std::endl;
+
+  m_to_transfer.push_back(std::make_pair(cncrosstalk, snc));
+
+  std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n" << std::endl;
 }
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBCrosstalkHandler.h b/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBCrosstalkHandler.h
index 5fbec0a7cf750..15f9f5abf354b 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBCrosstalkHandler.h
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBCrosstalkHandler.h
@@ -1,34 +1,31 @@
 #ifndef CSC_FAKEDBGAINS_SRC_IMPL_H
 #define CSC_FAKEDBGAINS_SRC_IMPL_H
 
-#include <vector>
-#include <string>
 #include <iostream>
+#include <string>
 #include <typeinfo>
+#include <vector>
 
+#include "CalibMuon/CSCCalibration/interface/CSCFakeDBCrosstalk.h"
 #include "CondCore/PopCon/interface/PopConSourceHandler.h"
 #include "CondFormats/CSCObjects/interface/CSCobject.h"
 #include "CondFormats/DataRecord/interface/CSCDBCrosstalkRcd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "CalibMuon/CSCCalibration/interface/CSCFakeDBCrosstalk.h"
 
-namespace popcon
-{
-  class CSCFakeDBCrosstalkImpl : public popcon::PopConSourceHandler<CSCDBCrosstalk>
-    {
-      
-    public:
-      void getNewObjects();
-      std::string id() const { return m_name;}
-      ~CSCFakeDBCrosstalkImpl(); 
-      
-      CSCFakeDBCrosstalkImpl(const edm::ParameterSet& pset);
-      
-    private:
-      std::string m_name;
-    };
-}
+namespace popcon {
+  class CSCFakeDBCrosstalkImpl : public popcon::PopConSourceHandler<CSCDBCrosstalk> {
+  public:
+    void getNewObjects();
+    std::string id() const { return m_name; }
+    ~CSCFakeDBCrosstalkImpl();
+
+    CSCFakeDBCrosstalkImpl(const edm::ParameterSet &pset);
+
+  private:
+    std::string m_name;
+  };
+}  // namespace popcon
 #endif
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBGainsHandler.cc b/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBGainsHandler.cc
index 5cb304ca89a5c..1f6abd1170c25 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBGainsHandler.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBGainsHandler.cc
@@ -1,39 +1,33 @@
 #include "CalibMuon/CSCCalibration/test/stubs/CSCFakeDBGainsHandler.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
-#include<iostream>
+#include <iostream>
 
-#include "CondFormats/CSCObjects/interface/CSCDBGains.h"
 #include "CalibMuon/CSCCalibration/interface/CSCFakeDBGains.h"
+#include "CondFormats/CSCObjects/interface/CSCDBGains.h"
 
-popcon::CSCFakeDBGainsImpl::CSCFakeDBGainsImpl(const edm::ParameterSet& pset): m_name(pset.getUntrackedParameter<std::string>("name","CSCFakeDBGainsImpl"))
-{}
+popcon::CSCFakeDBGainsImpl::CSCFakeDBGainsImpl(const edm::ParameterSet &pset)
+    : m_name(pset.getUntrackedParameter<std::string>("name", "CSCFakeDBGainsImpl")) {}
 
-popcon::CSCFakeDBGainsImpl::~CSCFakeDBGainsImpl()
-{
-}
+popcon::CSCFakeDBGainsImpl::~CSCFakeDBGainsImpl() {}
 
-void popcon::CSCFakeDBGainsImpl::getNewObjects()
-{
+void popcon::CSCFakeDBGainsImpl::getNewObjects() {
+  std::cout << "------- CSC src - > getNewObjects\n" << m_name;
 
-  std::cout << "------- CSC src - > getNewObjects\n"<<m_name;
-  
   // fill object from file
-  CSCDBGains * cngains = CSCFakeDBGains::prefillDBGains();
-  //std::cout << "gains size " << cngains->gains.size() << std::endl;
-  
-  //check whats already inside of database
-  
-  std::cerr<<"got offlineInfo"<<std::endl;
-  std::cerr << tagInfo().name << " , last object valid since " 
-	    << tagInfo().lastInterval.first << std::endl; 
-  
+  CSCDBGains *cngains = CSCFakeDBGains::prefillDBGains();
+  // std::cout << "gains size " << cngains->gains.size() << std::endl;
+
+  // check whats already inside of database
+
+  std::cerr << "got offlineInfo" << std::endl;
+  std::cerr << tagInfo().name << " , last object valid since " << tagInfo().lastInterval.first << std::endl;
+
   unsigned int snc;
-  
+
   std::cout << "Source implementation test ::getNewObjects : enter since ? \n";
   std::cin >> snc;
- 
-  
-  m_to_transfer.push_back(std::make_pair(cngains,snc));
-  
-  std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n"<< std::endl;
+
+  m_to_transfer.push_back(std::make_pair(cngains, snc));
+
+  std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n" << std::endl;
 }
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBGainsHandler.h b/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBGainsHandler.h
index d09f4654abbba..2e49aa9bd6f5e 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBGainsHandler.h
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBGainsHandler.h
@@ -1,34 +1,31 @@
 #ifndef CSC_FAKEDBGAINS_SRC_IMPL_H
 #define CSC_FAKEDBGAINS_SRC_IMPL_H
 
-#include <vector>
-#include <string>
 #include <iostream>
+#include <string>
 #include <typeinfo>
+#include <vector>
 
+#include "CalibMuon/CSCCalibration/interface/CSCFakeDBGains.h"
 #include "CondCore/PopCon/interface/PopConSourceHandler.h"
 #include "CondFormats/CSCObjects/interface/CSCobject.h"
 #include "CondFormats/DataRecord/interface/CSCDBGainsRcd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "CalibMuon/CSCCalibration/interface/CSCFakeDBGains.h"
 
-namespace popcon
-{
-  class CSCFakeDBGainsImpl : public popcon::PopConSourceHandler<CSCDBGains>
-    {
-      
-    public:
-      void getNewObjects();
-      std::string id() const { return m_name;}
-      ~CSCFakeDBGainsImpl(); 
-      
-      CSCFakeDBGainsImpl(const edm::ParameterSet& pset);
-      
-    private:
-      std::string m_name;
-    };
-}
+namespace popcon {
+  class CSCFakeDBGainsImpl : public popcon::PopConSourceHandler<CSCDBGains> {
+  public:
+    void getNewObjects();
+    std::string id() const { return m_name; }
+    ~CSCFakeDBGainsImpl();
+
+    CSCFakeDBGainsImpl(const edm::ParameterSet &pset);
+
+  private:
+    std::string m_name;
+  };
+}  // namespace popcon
 #endif
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBNoiseMatrixHandler.cc b/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBNoiseMatrixHandler.cc
index 2c53d4173869f..69c751c67e3b0 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBNoiseMatrixHandler.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBNoiseMatrixHandler.cc
@@ -1,39 +1,33 @@
 #include "CalibMuon/CSCCalibration/test/stubs/CSCFakeDBNoiseMatrixHandler.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
-#include<iostream>
+#include <iostream>
 
-#include "CondFormats/CSCObjects/interface/CSCDBNoiseMatrix.h"
 #include "CalibMuon/CSCCalibration/interface/CSCFakeDBNoiseMatrix.h"
+#include "CondFormats/CSCObjects/interface/CSCDBNoiseMatrix.h"
 
-popcon::CSCFakeDBNoiseMatrixImpl::CSCFakeDBNoiseMatrixImpl(const edm::ParameterSet& pset): m_name(pset.getUntrackedParameter<std::string>("name","CSCFakeDBNoiseMatrixImpl"))
-{}
+popcon::CSCFakeDBNoiseMatrixImpl::CSCFakeDBNoiseMatrixImpl(const edm::ParameterSet &pset)
+    : m_name(pset.getUntrackedParameter<std::string>("name", "CSCFakeDBNoiseMatrixImpl")) {}
 
-popcon::CSCFakeDBNoiseMatrixImpl::~CSCFakeDBNoiseMatrixImpl()
-{
-}
+popcon::CSCFakeDBNoiseMatrixImpl::~CSCFakeDBNoiseMatrixImpl() {}
 
-void popcon::CSCFakeDBNoiseMatrixImpl::getNewObjects()
-{
+void popcon::CSCFakeDBNoiseMatrixImpl::getNewObjects() {
+  std::cout << "------- CSC src - > getNewObjects\n" << m_name;
 
-  std::cout << "------- CSC src - > getNewObjects\n"<<m_name;
-  
   // fill object from file
-  CSCDBNoiseMatrix * cnmatrix = CSCFakeDBNoiseMatrix::prefillDBNoiseMatrix();
-  //std::cout << "matrix size " << cnmatrix->matrix.size() << std::endl;
-  
-  //check whats already inside of database
-  
-  std::cerr<<"got offlineInfo"<<std::endl;
-  std::cerr << tagInfo().name << " , last object valid since " 
-	    << tagInfo().lastInterval.first << std::endl; 
-  
+  CSCDBNoiseMatrix *cnmatrix = CSCFakeDBNoiseMatrix::prefillDBNoiseMatrix();
+  // std::cout << "matrix size " << cnmatrix->matrix.size() << std::endl;
+
+  // check whats already inside of database
+
+  std::cerr << "got offlineInfo" << std::endl;
+  std::cerr << tagInfo().name << " , last object valid since " << tagInfo().lastInterval.first << std::endl;
+
   unsigned int snc;
-  
+
   std::cout << "Source implementation test ::getNewObjects : enter since ? \n";
   std::cin >> snc;
- 
-  
-  m_to_transfer.push_back(std::make_pair(cnmatrix,snc));
-  
-  std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n"<< std::endl;
+
+  m_to_transfer.push_back(std::make_pair(cnmatrix, snc));
+
+  std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n" << std::endl;
 }
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBNoiseMatrixHandler.h b/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBNoiseMatrixHandler.h
index 0e4d8e0edf19d..92c7493d53803 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBNoiseMatrixHandler.h
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBNoiseMatrixHandler.h
@@ -1,34 +1,31 @@
 #ifndef CSC_FAKEDBNOISEMATRIX_SRC_IMPL_H
 #define CSC_FAKEDBNOISEMATRIX_SRC_IMPL_H
 
-#include <vector>
-#include <string>
 #include <iostream>
+#include <string>
 #include <typeinfo>
+#include <vector>
 
+#include "CalibMuon/CSCCalibration/interface/CSCFakeDBNoiseMatrix.h"
 #include "CondCore/PopCon/interface/PopConSourceHandler.h"
 #include "CondFormats/CSCObjects/interface/CSCobject.h"
 #include "CondFormats/DataRecord/interface/CSCDBNoiseMatrixRcd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "CalibMuon/CSCCalibration/interface/CSCFakeDBNoiseMatrix.h"
 
-namespace popcon
-{
-  class CSCFakeDBNoiseMatrixImpl : public popcon::PopConSourceHandler<CSCDBNoiseMatrix>
-    {
-      
-    public:
-      void getNewObjects();
-      std::string id() const { return m_name;}
-      ~CSCFakeDBNoiseMatrixImpl(); 
-      
-      CSCFakeDBNoiseMatrixImpl(const edm::ParameterSet& pset);
-      
-    private:
-      std::string m_name;
-    };
-}
+namespace popcon {
+  class CSCFakeDBNoiseMatrixImpl : public popcon::PopConSourceHandler<CSCDBNoiseMatrix> {
+  public:
+    void getNewObjects();
+    std::string id() const { return m_name; }
+    ~CSCFakeDBNoiseMatrixImpl();
+
+    CSCFakeDBNoiseMatrixImpl(const edm::ParameterSet &pset);
+
+  private:
+    std::string m_name;
+  };
+}  // namespace popcon
 #endif
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBPedestalsHandler.cc b/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBPedestalsHandler.cc
index 2aa74da065de9..d1a833793db5e 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBPedestalsHandler.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBPedestalsHandler.cc
@@ -1,39 +1,33 @@
 #include "CalibMuon/CSCCalibration/test/stubs/CSCFakeDBPedestalsHandler.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
-#include<iostream>
+#include <iostream>
 
-#include "CondFormats/CSCObjects/interface/CSCDBPedestals.h"
 #include "CalibMuon/CSCCalibration/interface/CSCFakeDBPedestals.h"
+#include "CondFormats/CSCObjects/interface/CSCDBPedestals.h"
 
-popcon::CSCFakeDBPedestalsImpl::CSCFakeDBPedestalsImpl(const edm::ParameterSet& pset): m_name(pset.getUntrackedParameter<std::string>("name","CSCFakeDBPedestalsImpl"))
-{}
+popcon::CSCFakeDBPedestalsImpl::CSCFakeDBPedestalsImpl(const edm::ParameterSet &pset)
+    : m_name(pset.getUntrackedParameter<std::string>("name", "CSCFakeDBPedestalsImpl")) {}
 
-popcon::CSCFakeDBPedestalsImpl::~CSCFakeDBPedestalsImpl()
-{
-}
+popcon::CSCFakeDBPedestalsImpl::~CSCFakeDBPedestalsImpl() {}
 
-void popcon::CSCFakeDBPedestalsImpl::getNewObjects()
-{
+void popcon::CSCFakeDBPedestalsImpl::getNewObjects() {
+  std::cout << "------- CSC src - > getNewObjects\n" << m_name;
 
-  std::cout << "------- CSC src - > getNewObjects\n"<<m_name;
-  
   // fill object from file
-  CSCDBPedestals * cnpedestals = CSCFakeDBPedestals::prefillDBPedestals();
-  //std::cout << "peds size " << cnpedestals->pedestals.size() << std::endl;
-  
-  //check whats already inside of database
-  
-  std::cerr<<"got offlineInfo"<<std::endl;
-  std::cerr << tagInfo().name << " , last object valid since " 
-	    << tagInfo().lastInterval.first << std::endl; 
-  
+  CSCDBPedestals *cnpedestals = CSCFakeDBPedestals::prefillDBPedestals();
+  // std::cout << "peds size " << cnpedestals->pedestals.size() << std::endl;
+
+  // check whats already inside of database
+
+  std::cerr << "got offlineInfo" << std::endl;
+  std::cerr << tagInfo().name << " , last object valid since " << tagInfo().lastInterval.first << std::endl;
+
   unsigned int snc;
-  
+
   std::cout << "Source implementation test ::getNewObjects : enter since ? \n";
   std::cin >> snc;
- 
-  
-  m_to_transfer.push_back(std::make_pair(cnpedestals,snc));
-  
-  std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n"<< std::endl;
+
+  m_to_transfer.push_back(std::make_pair(cnpedestals, snc));
+
+  std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n" << std::endl;
 }
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBPedestalsHandler.h b/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBPedestalsHandler.h
index 9b1664965a912..546b4bd80ebcf 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBPedestalsHandler.h
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCFakeDBPedestalsHandler.h
@@ -1,34 +1,31 @@
 #ifndef CSC_FAKEDBPEDESTALS_SRC_IMPL_H
 #define CSC_FAKEDBPEDESTALS_SRC_IMPL_H
 
-#include <vector>
-#include <string>
 #include <iostream>
+#include <string>
 #include <typeinfo>
+#include <vector>
 
+#include "CalibMuon/CSCCalibration/interface/CSCFakeDBPedestals.h"
 #include "CondCore/PopCon/interface/PopConSourceHandler.h"
 #include "CondFormats/CSCObjects/interface/CSCobject.h"
 #include "CondFormats/DataRecord/interface/CSCDBPedestalsRcd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "CalibMuon/CSCCalibration/interface/CSCFakeDBPedestals.h"
 
-namespace popcon
-{
-  class CSCFakeDBPedestalsImpl : public popcon::PopConSourceHandler<CSCDBPedestals>
-    {
-      
-    public:
-      void getNewObjects();
-      std::string id() const { return m_name;}
-      ~CSCFakeDBPedestalsImpl(); 
-      
-      CSCFakeDBPedestalsImpl(const edm::ParameterSet& pset);
-      
-    private:
-      std::string m_name;
-    };
-}
+namespace popcon {
+  class CSCFakeDBPedestalsImpl : public popcon::PopConSourceHandler<CSCDBPedestals> {
+  public:
+    void getNewObjects();
+    std::string id() const { return m_name; }
+    ~CSCFakeDBPedestalsImpl();
+
+    CSCFakeDBPedestalsImpl(const edm::ParameterSet &pset);
+
+  private:
+    std::string m_name;
+  };
+}  // namespace popcon
 #endif
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCFakeGainsPopConAnalyzer.cc b/CalibMuon/CSCCalibration/test/stubs/CSCFakeGainsPopConAnalyzer.cc
index b7f013b4b25e6..f22257ff71334 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCFakeGainsPopConAnalyzer.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCFakeGainsPopConAnalyzer.cc
@@ -1,5 +1,5 @@
-#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "CSCFakeDBGainsHandler.h"
+#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 typedef popcon::PopConAnalyzer<popcon::CSCFakeDBGainsImpl> CSCFakeGainsPopConAnalyzer;
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCFakeNoiseMatrixPopConAnalyzer.cc b/CalibMuon/CSCCalibration/test/stubs/CSCFakeNoiseMatrixPopConAnalyzer.cc
index f43df6a6eb249..b3fbb5731240d 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCFakeNoiseMatrixPopConAnalyzer.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCFakeNoiseMatrixPopConAnalyzer.cc
@@ -1,5 +1,5 @@
-#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "CSCFakeDBNoiseMatrixHandler.h"
+#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 typedef popcon::PopConAnalyzer<popcon::CSCFakeDBNoiseMatrixImpl> CSCFakeNoiseMatrixPopConAnalyzer;
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCFakePedestalsPopConAnalyzer.cc b/CalibMuon/CSCCalibration/test/stubs/CSCFakePedestalsPopConAnalyzer.cc
index a60da47db91c2..7830080e4f833 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCFakePedestalsPopConAnalyzer.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCFakePedestalsPopConAnalyzer.cc
@@ -1,5 +1,5 @@
-#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "CSCFakeDBPedestalsHandler.h"
+#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 typedef popcon::PopConAnalyzer<popcon::CSCFakeDBPedestalsImpl> CSCFakePedestalsPopConAnalyzer;
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCGainsHandler.cc b/CalibMuon/CSCCalibration/test/stubs/CSCGainsHandler.cc
index 3bfcd5e801443..fcc42e9a34ac6 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCGainsHandler.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCGainsHandler.cc
@@ -1,43 +1,37 @@
 #include "CalibMuon/CSCCalibration/test/stubs/CSCGainsHandler.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
-#include<iostream>
+#include <iostream>
 
-#include "CondFormats/CSCObjects/interface/CSCDBGains.h"
 #include "CalibMuon/CSCCalibration/interface/CSCGainsDBConditions.h"
+#include "CondFormats/CSCObjects/interface/CSCDBGains.h"
 
-popcon::CSCDBGainsImpl::CSCDBGainsImpl(const edm::ParameterSet& pset): m_name(pset.getUntrackedParameter<std::string>("name","CSCDBGainsImpl"))
-{}
+popcon::CSCDBGainsImpl::CSCDBGainsImpl(const edm::ParameterSet &pset)
+    : m_name(pset.getUntrackedParameter<std::string>("name", "CSCDBGainsImpl")) {}
 
-popcon::CSCDBGainsImpl::~CSCDBGainsImpl()
-{
-}
+popcon::CSCDBGainsImpl::~CSCDBGainsImpl() {}
 
-void popcon::CSCDBGainsImpl::getNewObjects()
-{
+void popcon::CSCDBGainsImpl::getNewObjects() {
+  std::cout << "CSCGainsHandler - time before filling object:" << std::endl;
+  std::cout << "------- CSC src - > getNewObjects\n" << m_name;
 
-  std::cout << "CSCGainsHandler - time before filling object:"<< std::endl;
-  std::cout << "------- CSC src - > getNewObjects\n"<<m_name;
-  
   // fill object from file
-  CSCDBGains * cngains = CSCGainsDBConditions::prefillDBGains();
-  //std::cout << "crosstalk size " << cngains->gains.size() << std::endl;
-  
-  std::cout << "CSCGainsHandler - time after filling object:"<< std::endl;
-  
-  //check whats already inside of database
-  std::cerr<<"got offlineInfo"<<std::endl;
-  std::cerr << tagInfo().name << " , last object valid since " 
-	    << tagInfo().lastInterval.first << std::endl; 
-  
+  CSCDBGains *cngains = CSCGainsDBConditions::prefillDBGains();
+  // std::cout << "crosstalk size " << cngains->gains.size() << std::endl;
+
+  std::cout << "CSCGainsHandler - time after filling object:" << std::endl;
+
+  // check whats already inside of database
+  std::cerr << "got offlineInfo" << std::endl;
+  std::cerr << tagInfo().name << " , last object valid since " << tagInfo().lastInterval.first << std::endl;
+
   unsigned int snc;
-  
+
   std::cout << "Source implementation test ::getNewObjects : enter since ? \n";
   std::cin >> snc;
- 
-  
-  m_to_transfer.push_back(std::make_pair(cngains,snc));
-  
-  std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n"<< std::endl;
-  
-  std::cout << "CSCGainsHandler - time before writing into DB:"<< std::endl;
+
+  m_to_transfer.push_back(std::make_pair(cngains, snc));
+
+  std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n" << std::endl;
+
+  std::cout << "CSCGainsHandler - time before writing into DB:" << std::endl;
 }
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCGainsHandler.h b/CalibMuon/CSCCalibration/test/stubs/CSCGainsHandler.h
index 34250fc11e056..51b6a402ce79d 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCGainsHandler.h
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCGainsHandler.h
@@ -1,34 +1,31 @@
 #ifndef CSC_DBGAINS_SRC_IMPL_H
 #define CSC_DBGAINS_SRC_IMPL_H
 
-#include <vector>
-#include <string>
 #include <iostream>
+#include <string>
 #include <typeinfo>
+#include <vector>
 
+#include "CalibMuon/CSCCalibration/interface/CSCGainsDBConditions.h"
 #include "CondCore/PopCon/interface/PopConSourceHandler.h"
 #include "CondFormats/CSCObjects/interface/CSCobject.h"
 #include "CondFormats/DataRecord/interface/CSCDBGainsRcd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "CalibMuon/CSCCalibration/interface/CSCGainsDBConditions.h"
 
-namespace popcon
-{
-  class CSCDBGainsImpl : public popcon::PopConSourceHandler<CSCDBGains>
-    {
-      
-    public:
-      void getNewObjects();
-      std::string id() const { return m_name;}
-      ~CSCDBGainsImpl(); 
-      
-      CSCDBGainsImpl(const edm::ParameterSet& pset);
-      
-    private:
-      std::string m_name;
-    };
-}
+namespace popcon {
+  class CSCDBGainsImpl : public popcon::PopConSourceHandler<CSCDBGains> {
+  public:
+    void getNewObjects();
+    std::string id() const { return m_name; }
+    ~CSCDBGainsImpl();
+
+    CSCDBGainsImpl(const edm::ParameterSet &pset);
+
+  private:
+    std::string m_name;
+  };
+}  // namespace popcon
 #endif
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCGainsPopConAnalyzer.cc b/CalibMuon/CSCCalibration/test/stubs/CSCGainsPopConAnalyzer.cc
index 1b68300f68319..f0eb51d8ca285 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCGainsPopConAnalyzer.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCGainsPopConAnalyzer.cc
@@ -1,5 +1,5 @@
-#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "CSCGainsHandler.h"
+#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 typedef popcon::PopConAnalyzer<popcon::CSCDBGainsImpl> CSCGainsPopConAnalyzer;
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCGasGainCorrectionPopConAnalyzer.cc b/CalibMuon/CSCCalibration/test/stubs/CSCGasGainCorrectionPopConAnalyzer.cc
index ea4e51a7669a7..369fa4edd7783 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCGasGainCorrectionPopConAnalyzer.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCGasGainCorrectionPopConAnalyzer.cc
@@ -1,6 +1,6 @@
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "CSCDBGasGainCorrectionHandler.h"
+#include "CondCore/PopCon/interface/PopConAnalyzer.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 
 typedef popcon::PopConAnalyzer<popcon::CSCDBGasGainCorrectionImpl> CSCDBGasGainCorrectionPopConAnalyzer;
 
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCIndexerAnalyzer.cc b/CalibMuon/CSCCalibration/test/stubs/CSCIndexerAnalyzer.cc
index ca3c95fb8c3d1..a28c0a3afc0a7 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCIndexerAnalyzer.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCIndexerAnalyzer.cc
@@ -1,8 +1,8 @@
 #include <memory>
 
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -12,56 +12,54 @@
 
 class CSCIndexerAnalyzer : public edm::EDAnalyzer {
 public:
-  explicit CSCIndexerAnalyzer(const edm::ParameterSet&);
+  explicit CSCIndexerAnalyzer(const edm::ParameterSet &);
   ~CSCIndexerAnalyzer();
 
 private:
-  virtual void beginJob() ;
-  virtual void analyze(const edm::Event&, const edm::EventSetup&) ;
-  virtual void endJob() ;
+  virtual void beginJob();
+  virtual void analyze(const edm::Event &, const edm::EventSetup &);
+  virtual void endJob();
 
   std::string algoName;
 };
 
-CSCIndexerAnalyzer::CSCIndexerAnalyzer(const edm::ParameterSet& pset) {}
+CSCIndexerAnalyzer::CSCIndexerAnalyzer(const edm::ParameterSet &pset) {}
 
 CSCIndexerAnalyzer::~CSCIndexerAnalyzer() {}
 
-void CSCIndexerAnalyzer::analyze(const edm::Event& ev, const edm::EventSetup& esu)
-{
-  const int evalues[10] = {  1,  2,  1,  2,  1,  2,  1,  2,  1,  2 }; // endcap 1=+z, 2=-z
-  const int svalues[10] = {  1,  1,  1,  1,  4,  4,  4,  4,  4,  4 }; // station 1-4
-  const int rvalues[10] = {  1,  1,  4,  4,  2,  2,  2,  2,  2,  2 }; // ring 1-4
-  const int cvalues[10] = {  1,  1,  1,  1,  1,  1, 36, 36,  1,  1 }; // chamber 1-18/36
-  const int lvalues[10] = {  1,  1,  1,  1,  1,  1,  1,  1,  6,  6 }; // layer 1-6
-  const int tvalues[10] = {  1,  1,  1,  1,  1,  1,  1,  1, 80, 80 }; // strip 1-80 (16, 48 64)
+void CSCIndexerAnalyzer::analyze(const edm::Event &ev, const edm::EventSetup &esu) {
+  const int evalues[10] = {1, 2, 1, 2, 1, 2, 1, 2, 1, 2};    // endcap 1=+z, 2=-z
+  const int svalues[10] = {1, 1, 1, 1, 4, 4, 4, 4, 4, 4};    // station 1-4
+  const int rvalues[10] = {1, 1, 4, 4, 2, 2, 2, 2, 2, 2};    // ring 1-4
+  const int cvalues[10] = {1, 1, 1, 1, 1, 1, 36, 36, 1, 1};  // chamber 1-18/36
+  const int lvalues[10] = {1, 1, 1, 1, 1, 1, 1, 1, 6, 6};    // layer 1-6
+  const int tvalues[10] = {1, 1, 1, 1, 1, 1, 1, 1, 80, 80};  // strip 1-80 (16, 48 64)
 
-  const CSCIndexerRecord& irec = esu.get<CSCIndexerRecord>();
+  const CSCIndexerRecord &irec = esu.get<CSCIndexerRecord>();
   edm::ESHandle<CSCIndexerBase> indexer_;
   irec.get(indexer_);
 
   algoName = indexer_->name();
 
-  std::cout << "CSCIndexerAnalyzer: analyze sees algorithm " << algoName  << " in Event Setup" << std::endl;
-
-  for (int i=0; i<10; ++i ) {
-    int ie=evalues[i];
-    int is=svalues[i];
-    int ir=rvalues[i];
-    int ic=cvalues[i];
-    int il=lvalues[i];
-    int istrip=tvalues[i];
-  
-    std::cout << "CSCIndexerAnalyzer: calling " << algoName << "::stripChannelIndex(" << ie << "," << is << "," << ir << ","
-	    << ic << "," << il << "," << istrip << ") = " 
-   << indexer_->stripChannelIndex(ie,is,ir,ic,il,istrip) << std::endl;
+  std::cout << "CSCIndexerAnalyzer: analyze sees algorithm " << algoName << " in Event Setup" << std::endl;
+
+  for (int i = 0; i < 10; ++i) {
+    int ie = evalues[i];
+    int is = svalues[i];
+    int ir = rvalues[i];
+    int ic = cvalues[i];
+    int il = lvalues[i];
+    int istrip = tvalues[i];
+
+    std::cout << "CSCIndexerAnalyzer: calling " << algoName << "::stripChannelIndex(" << ie << "," << is << "," << ir
+              << "," << ic << "," << il << "," << istrip
+              << ") = " << indexer_->stripChannelIndex(ie, is, ir, ic, il, istrip) << std::endl;
   }
 }
 
-
 void CSCIndexerAnalyzer::beginJob() {}
 
 void CSCIndexerAnalyzer::endJob() {}
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(CSCIndexerAnalyzer);
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCIndexerAnalyzer2.cc b/CalibMuon/CSCCalibration/test/stubs/CSCIndexerAnalyzer2.cc
index edf8ddbbd4fb2..d523693c51c39 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCIndexerAnalyzer2.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCIndexerAnalyzer2.cc
@@ -1,73 +1,83 @@
 // Test CSCIndexer 22.11.2012 ptc
 
-#include <memory>
 #include <FWCore/Framework/interface/EDAnalyzer.h>
 #include <FWCore/Framework/interface/ESHandle.h>
 #include <FWCore/Framework/interface/EventSetup.h>
 #include <FWCore/Framework/interface/MakerMacros.h>
 #include <FWCore/ParameterSet/interface/ParameterSet.h>
+#include <memory>
 
-#include <Geometry/Records/interface/MuonGeometryRecord.h>
+#include <DataFormats/GeometryVector/interface/Pi.h>
 #include <Geometry/CSCGeometry/interface/CSCGeometry.h>
 #include <Geometry/CSCGeometry/interface/CSCLayer.h>
-#include <DataFormats/GeometryVector/interface/Pi.h>
+#include <Geometry/Records/interface/MuonGeometryRecord.h>
 
 #include <CalibMuon/CSCCalibration/interface/CSCIndexerBase.h>
 #include <CalibMuon/CSCCalibration/interface/CSCIndexerRecord.h>
 
 #include <cmath>
-#include <iomanip> // for setw() etc.
+#include <iomanip>  // for setw() etc.
 #include <string>
 #include <vector>
 
 class CSCIndexerAnalyzer2 : public edm::EDAnalyzer {
-
 public:
- 
-  explicit CSCIndexerAnalyzer2( const edm::ParameterSet& );
+  explicit CSCIndexerAnalyzer2(const edm::ParameterSet &);
   ~CSCIndexerAnalyzer2();
 
-  virtual void analyze( const edm::Event&, const edm::EventSetup& );
- 
-  const std::string& myName() const { return myName_;}
-  const std::string& myAlgo() const { return algoName_;}
+  virtual void analyze(const edm::Event &, const edm::EventSetup &);
 
-private: 
+  const std::string &myName() const { return myName_; }
+  const std::string &myAlgo() const { return algoName_; }
 
+private:
   const int dashedLineWidth_;
   const std::string dashedLine_;
   const std::string myName_;
-  
+
   std::string algoName_;
 };
 
-CSCIndexerAnalyzer2::CSCIndexerAnalyzer2( const edm::ParameterSet& iConfig )
-  : dashedLineWidth_(146), dashedLine_( std::string(dashedLineWidth_, '-') ), 
-    myName_( "CSCIndexerAnalyzer2" ), algoName_( "UNKNOWN" )
-{
+CSCIndexerAnalyzer2::CSCIndexerAnalyzer2(const edm::ParameterSet &iConfig)
+    : dashedLineWidth_(146),
+      dashedLine_(std::string(dashedLineWidth_, '-')),
+      myName_("CSCIndexerAnalyzer2"),
+      algoName_("UNKNOWN") {
   std::cout << dashedLine_ << std::endl;
   std::cout << "Welcome to " << myName_ << std::endl;
   std::cout << dashedLine_ << std::endl;
   std::cout << "At present my CSCIndexer algorithm is    " << myAlgo() << std::endl;
   std::cout << dashedLine_ << std::endl;
   std::cout << "I will build the CSC geometry, then iterate over all layers." << std::endl;
-  std::cout << "From each CSCDetId I will build the associated linear index, including ME1a layers." << std::endl;
-  std::cout << "I will build this index once from the layer labels and once from the CSCDetId, and check they agree." << std::endl;
-  std::cout << "I will output one line per layer, listing the CSCDetId, the labels, and these two indexes." << std::endl;
-  std::cout << "I will append the strip-channel indexes for the two edge strips and the central strip." << std::endl;
-  std::cout << "Finally, I will rebuild a CSCDetId from the layer index, and check it is the same as the original," << std::endl;
-  std::cout << "and rebuild a CSCDetId from the final strip-channel index, and check it is the same as the original." << std::endl;
-  std::cout << "If any of these tests fail, you will see assert failure messages in the output." << std::endl;
+  std::cout << "From each CSCDetId I will build the associated linear index, "
+               "including ME1a layers."
+            << std::endl;
+  std::cout << "I will build this index once from the layer labels and once "
+               "from the CSCDetId, and check they agree."
+            << std::endl;
+  std::cout << "I will output one line per layer, listing the CSCDetId, the "
+               "labels, and these two indexes."
+            << std::endl;
+  std::cout << "I will append the strip-channel indexes for the two edge "
+               "strips and the central strip."
+            << std::endl;
+  std::cout << "Finally, I will rebuild a CSCDetId from the layer index, and "
+               "check it is the same as the original,"
+            << std::endl;
+  std::cout << "and rebuild a CSCDetId from the final strip-channel index, and "
+               "check it is the same as the original."
+            << std::endl;
+  std::cout << "If any of these tests fail, you will see assert failure "
+               "messages in the output."
+            << std::endl;
   std::cout << "If there are no such failures then the tests passed." << std::endl;
   std::cout << dashedLine_ << std::endl;
 }
 
+CSCIndexerAnalyzer2::~CSCIndexerAnalyzer2() {}
 
-CSCIndexerAnalyzer2::~CSCIndexerAnalyzer2(){}
-
-void CSCIndexerAnalyzer2::analyze( const edm::Event& iEvent, const edm::EventSetup& iSetup )
-{
-   CSCDetId testCSCDetId;
+void CSCIndexerAnalyzer2::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  CSCDetId testCSCDetId;
 
   const double dPi = Geom::pi();
   const double radToDeg = 180. / dPi;
@@ -77,16 +87,14 @@ void CSCIndexerAnalyzer2::analyze( const edm::Event& iEvent, const edm::EventSet
   std::cout << "pi = " << dPi << ", radToDeg = " << radToDeg << std::endl;
 
   edm::ESHandle<CSCGeometry> pDD;
-  iSetup.get<MuonGeometryRecord>().get( pDD );     
-
-  std::cout << " Geometry node for CSCGeom is  " << &(*pDD) << std::endl;   
-  std::cout << " I have "<<pDD->detTypes().size()    << " detTypes" << std::endl;
-  std::cout << " I have "<<pDD->detUnits().size()    << " detUnits" << std::endl;
-  std::cout << " I have "<<pDD->dets().size()        << " dets" << std::endl;
-  std::cout << " I have "<<pDD->layers().size()      << " layers" << std::endl;
-  std::cout << " I have "<<pDD->chambers().size()    << " chambers" << std::endl;
-
+  iSetup.get<MuonGeometryRecord>().get(pDD);
 
+  std::cout << " Geometry node for CSCGeom is  " << &(*pDD) << std::endl;
+  std::cout << " I have " << pDD->detTypes().size() << " detTypes" << std::endl;
+  std::cout << " I have " << pDD->detUnits().size() << " detUnits" << std::endl;
+  std::cout << " I have " << pDD->dets().size() << " dets" << std::endl;
+  std::cout << " I have " << pDD->layers().size() << " layers" << std::endl;
+  std::cout << " I have " << pDD->chambers().size() << " chambers" << std::endl;
 
   // Get the CSCIndexer algorithm from EventSetup
 
@@ -99,40 +107,39 @@ void CSCIndexerAnalyzer2::analyze( const edm::Event& iEvent, const edm::EventSet
   std::cout << "Found CSCIndexer algorithm    " << myAlgo() << "    in EventSetup" << std::endl;
   std::cout << dashedLine_ << std::endl;
 
-
   bool ganged = 1;
-  if ( myAlgo() == "CSCIndexerPostls1" ) ganged = 0;
-
+  if (myAlgo() == "CSCIndexerPostls1")
+    ganged = 0;
 
   std::cout << myName() << ": Begin iteration over geometry..." << std::endl;
   std::cout << dashedLine_ << std::endl;
 
   std::cout << "\n  #     id(dec)      id(oct)                        "
-    "lindex     lindex2      cindex       label       strip  sindex   strip  sindex   strip  sindex" << std::endl;
-
+               "lindex     lindex2      cindex       label       strip  sindex "
+               "  strip  sindex   strip  sindex"
+            << std::endl;
 
   int icount = 0;
   int icountAll = 0;
 
   // Iterate over the DetUnits in the CSCGeometry
-  for( const auto& it : pDD->detUnits()) {
-
+  for (const auto &it : pDD->detUnits()) {
     // Check each DetUnit really is a CSC layer
-    auto layer = dynamic_cast<const CSCLayer*>( it );
-     
-    if( layer ) {
-      ++icountAll; // how many layers we see
+    auto layer = dynamic_cast<const CSCLayer *>(it);
+
+    if (layer) {
+      ++icountAll;  // how many layers we see
 
       // Get DetId in various ways
 
       DetId detId = layer->geographicalId();
-      int id = detId(); // or detId.rawId()
+      int id = detId();  // or detId.rawId()
       CSCDetId cscDetId = layer->id();
 
-      // There is going to be a lot of messing with field width (and precision) so
-      // save input values...
-      int iw = std::cout.width(); // save current width
-      int ip = std::cout.precision(); // save current precision
+      // There is going to be a lot of messing with field width (and precision)
+      // so save input values...
+      int iw = std::cout.width();      // save current width
+      int ip = std::cout.precision();  // save current precision
 
       short ie = CSCDetId::endcap(id);
       short is = CSCDetId::station(id);
@@ -140,77 +147,76 @@ void CSCIndexerAnalyzer2::analyze( const edm::Event& iEvent, const edm::EventSet
       short ic = CSCDetId::chamber(id);
       short il = CSCDetId::layer(id);
 
-      ++icount; 
+      ++icount;
 
-      std::cout <<
-	std::setw( 4 ) << icount << 
-	std::setw(12) << id << std::oct << std::setw(12) << id << std::dec << std::setw( iw ) <<
-	"   E" << ie << " S" << is << " R" << ir << " C" << std::setw( 2 ) << ic << std::setw( iw ) << " L" << il;
+      std::cout << std::setw(4) << icount << std::setw(12) << id << std::oct << std::setw(12) << id << std::dec
+                << std::setw(iw) << "   E" << ie << " S" << is << " R" << ir << " C" << std::setw(2) << ic
+                << std::setw(iw) << " L" << il;
 
-      unsigned cind = theIndexer->chamberIndex( ie, is, ir, ic );
-      unsigned lind = theIndexer->layerIndex( ie, is, ir, ic, il );
-      unsigned scind = theIndexer->startChamberIndexInEndcap( ie, is, ir ) + ic - 1;
-      unsigned cind2 = theIndexer->chamberIndex( cscDetId );
-      unsigned lind2 = theIndexer->layerIndex( cscDetId );
+      unsigned cind = theIndexer->chamberIndex(ie, is, ir, ic);
+      unsigned lind = theIndexer->layerIndex(ie, is, ir, ic, il);
+      unsigned scind = theIndexer->startChamberIndexInEndcap(ie, is, ir) + ic - 1;
+      unsigned cind2 = theIndexer->chamberIndex(cscDetId);
+      unsigned lind2 = theIndexer->layerIndex(cscDetId);
 
-      std::cout << std::setw(12) << lind << std::setw(12) << lind2 << std::setw(12)<< scind << std::setw(12) <<  theIndexer->chamberLabelFromChamberIndex(scind) << "     " ;
+      std::cout << std::setw(12) << lind << std::setw(12) << lind2 << std::setw(12) << scind << std::setw(12)
+                << theIndexer->chamberLabelFromChamberIndex(scind) << "     ";
 
       // Index a few strips
-      unsigned short nchan = theIndexer->stripChannelsPerOnlineLayer(is,ir);
+      unsigned short nchan = theIndexer->stripChannelsPerOnlineLayer(is, ir);
       unsigned int sc1 = theIndexer->stripChannelIndex(ie, is, ir, ic, il, 1);
-      unsigned int scm = theIndexer->stripChannelIndex(ie, is, ir, ic, il, nchan/2);
+      unsigned int scm = theIndexer->stripChannelIndex(ie, is, ir, ic, il, nchan / 2);
       unsigned int scn = theIndexer->stripChannelIndex(ie, is, ir, ic, il, nchan);
 
-      std::cout << "      1  " << std::setw(6) << sc1 << "      " << std::setw(2) << nchan/2 << "  " <<
-	std::setw(6) << scm << "      " << std::setw(2) << nchan << "  " <<
-	std::setw(6) << scn << std::endl;
+      std::cout << "      1  " << std::setw(6) << sc1 << "      " << std::setw(2) << nchan / 2 << "  " << std::setw(6)
+                << scm << "      " << std::setw(2) << nchan << "  " << std::setw(6) << scn << std::endl;
 
       // Reset the values we changed
-      std::cout << std::setprecision( ip ) << std::setw( iw );
-
+      std::cout << std::setprecision(ip) << std::setw(iw);
 
-  
       // ASSERTS
       // =======
 
-      // Check layer indices are consistent  
+      // Check layer indices are consistent
 
-      assert ( cind2 == cind );
-      assert ( lind2 == lind );
+      assert(cind2 == cind);
+      assert(lind2 == lind);
 
       // Build CSCDetId from layer index and check it is same as original
 
-      CSCDetId cscDetId2 = theIndexer->detIdFromLayerIndex( lind ); // folds ME1/1a into ME1/1
+      CSCDetId cscDetId2 = theIndexer->detIdFromLayerIndex(lind);  // folds ME1/1a into ME1/1
 
       testCSCDetId = cscDetId;
 
-      if ( ir==4 ) testCSCDetId = CSCDetId(ie, is, 1, ic, il);
+      if (ir == 4)
+        testCSCDetId = CSCDetId(ie, is, 1, ic, il);
 
-      assert( cscDetId2 == testCSCDetId );
+      assert(cscDetId2 == testCSCDetId);
 
-      // Build CSCDetId from the strip-channel index for strip "nchan" and check it matches
-      // Ganged ME1/1a returns ME1/1 CSCDetId and channel 65-80
+      // Build CSCDetId from the strip-channel index for strip "nchan" and check
+      // it matches Ganged ME1/1a returns ME1/1 CSCDetId and channel 65-80
 
-      std::pair<CSCDetId, unsigned short int> p = theIndexer->detIdFromStripChannelIndex( scn );
+      std::pair<CSCDetId, unsigned short int> p = theIndexer->detIdFromStripChannelIndex(scn);
       CSCDetId cscDetId3 = p.first;
       unsigned short iscn = p.second;
 
-      if ( ir == 4 && ganged ) iscn -=64; // reset ganged ME1a channel from 65-80 to 1-16
+      if (ir == 4 && ganged)
+        iscn -= 64;  // reset ganged ME1a channel from 65-80 to 1-16
 
-      assert( iscn == nchan );
+      assert(iscn == nchan);
 
-      if ( ir == 4 && !ganged ) testCSCDetId = cscDetId; // unganged ME1/1a needs its own CSCDetId
+      if (ir == 4 && !ganged)
+        testCSCDetId = cscDetId;  // unganged ME1/1a needs its own CSCDetId
+
+      assert(cscDetId3 == testCSCDetId);
 
-      assert( cscDetId3 == testCSCDetId );
-          
       // Check idToDetUnit
-      const GeomDetUnit * gdu = pDD->idToDetUnit(detId);
-      assert(gdu==layer);
+      const GeomDetUnit *gdu = pDD->idToDetUnit(detId);
+      assert(gdu == layer);
       // Check idToDet
-      const GeomDet * gd = pDD->idToDet(detId);
-      assert(gd==layer);
-    }
-    else {
+      const GeomDet *gd = pDD->idToDet(detId);
+      assert(gd == layer);
+    } else {
       std::cout << myName() << ": something wrong ... could not dynamic_cast Det* to CSCLayer* " << std::endl;
     }
   }
@@ -219,5 +225,5 @@ void CSCIndexerAnalyzer2::analyze( const edm::Event& iEvent, const edm::EventSet
   std::cout << myName() << " end." << std::endl;
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(CSCIndexerAnalyzer2);
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCL1TPParametersHandler.cc b/CalibMuon/CSCCalibration/test/stubs/CSCL1TPParametersHandler.cc
index 3246fbadf1d6a..72f6f4087eeee 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCL1TPParametersHandler.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCL1TPParametersHandler.cc
@@ -1,45 +1,36 @@
 #include "CalibMuon/CSCCalibration/test/stubs/CSCL1TPParametersHandler.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include<iostream>
+#include <iostream>
 
-popcon::CSCL1TPParametersImpl::CSCL1TPParametersImpl(const edm::ParameterSet& pset): m_name(pset.getUntrackedParameter<std::string>("name","CSCL1TPParametersImpl"))
-{}
-
-popcon::CSCL1TPParametersImpl::~CSCL1TPParametersImpl()
-{
-}
+popcon::CSCL1TPParametersImpl::CSCL1TPParametersImpl(const edm::ParameterSet &pset)
+    : m_name(pset.getUntrackedParameter<std::string>("name", "CSCL1TPParametersImpl")) {}
 
+popcon::CSCL1TPParametersImpl::~CSCL1TPParametersImpl() {}
 
-#include "CondFormats/CSCObjects/interface/CSCL1TPParameters.h"
 #include "CalibMuon/CSCCalibration/interface/CSCL1TPParametersConditions.h"
-
-
+#include "CondFormats/CSCObjects/interface/CSCL1TPParameters.h"
 
 void popcon::CSCL1TPParametersImpl::getNewObjects() {
-
-  std::cout << "CSCL1TPParametersHandler - time before filling object:"<< std::endl;
-  std::cout << "------- CSC src - > getNewObjects\n"<<m_name;
-	
+  std::cout << "CSCL1TPParametersHandler - time before filling object:" << std::endl;
+  std::cout << "------- CSC src - > getNewObjects\n" << m_name;
 
   // fill object from file
-  CSCL1TPParameters * cnl1tp = CSCL1TPParametersConditions::prefillCSCL1TPParameters();
- 
-  std::cout << "CSCL1TPParametersHandler - time after filling object:"<< std::endl;
+  CSCL1TPParameters *cnl1tp = CSCL1TPParametersConditions::prefillCSCL1TPParameters();
+
+  std::cout << "CSCL1TPParametersHandler - time after filling object:" << std::endl;
+
+  // check whats already inside of database
 
-  //check whats already inside of database
-  
-  std::cerr<<"got offlineInfo"<<std::endl;
-  std::cerr << tagInfo().name << " , last object valid since " 
-	    << tagInfo().lastInterval.first << std::endl;  	
+  std::cerr << "got offlineInfo" << std::endl;
+  std::cerr << tagInfo().name << " , last object valid since " << tagInfo().lastInterval.first << std::endl;
 
   unsigned int snc;
-  
+
   std::cout << "Source implementation test ::getNewObjects : enter since ? \n";
   std::cin >> snc;
 
-  
-  m_to_transfer.push_back(std::make_pair(cnl1tp,snc));
-  
+  m_to_transfer.push_back(std::make_pair(cnl1tp, snc));
+
   std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n" << std::endl;
-  std::cout << "CSCL1TPParametersHandler - time before writing into DB:"<< std::endl;
+  std::cout << "CSCL1TPParametersHandler - time before writing into DB:" << std::endl;
 }
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCL1TPParametersHandler.h b/CalibMuon/CSCCalibration/test/stubs/CSCL1TPParametersHandler.h
index ede5572417a7d..52f67098d14ae 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCL1TPParametersHandler.h
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCL1TPParametersHandler.h
@@ -1,34 +1,31 @@
 #ifndef CSC_L1TPPARAMETERS_SRC_IMPL_H
 #define CSC_L1TPPARAMETERS_SRC_IMPL_H
 
-#include <vector>
-#include <string>
 #include <iostream>
+#include <string>
 #include <typeinfo>
+#include <vector>
 
+#include "CalibMuon/CSCCalibration/interface/CSCL1TPParametersConditions.h"
 #include "CondCore/PopCon/interface/PopConSourceHandler.h"
 #include "CondFormats/CSCObjects/interface/CSCobject.h"
 #include "CondFormats/DataRecord/interface/CSCL1TPParametersRcd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "CalibMuon/CSCCalibration/interface/CSCL1TPParametersConditions.h"
 
-namespace popcon
-{
-  class CSCL1TPParametersImpl : public popcon::PopConSourceHandler<CSCL1TPParameters>
-    {
-      
-    public:
-      void getNewObjects();
-      std::string id() const { return m_name;}
-      ~CSCL1TPParametersImpl(); 
-      
-      CSCL1TPParametersImpl(const edm::ParameterSet& pset);
-  
-    private:
-      std::string m_name;
-    };
-}
+namespace popcon {
+  class CSCL1TPParametersImpl : public popcon::PopConSourceHandler<CSCL1TPParameters> {
+  public:
+    void getNewObjects();
+    std::string id() const { return m_name; }
+    ~CSCL1TPParametersImpl();
+
+    CSCL1TPParametersImpl(const edm::ParameterSet &pset);
+
+  private:
+    std::string m_name;
+  };
+}  // namespace popcon
 #endif
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCL1TPParametersPopConAnalyzer.cc b/CalibMuon/CSCCalibration/test/stubs/CSCL1TPParametersPopConAnalyzer.cc
index b55181bf6dd84..d477249b1845d 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCL1TPParametersPopConAnalyzer.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCL1TPParametersPopConAnalyzer.cc
@@ -1,5 +1,5 @@
-#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "CSCL1TPParametersHandler.h"
+#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 typedef popcon::PopConAnalyzer<popcon::CSCL1TPParametersImpl> CSCL1TPParametersPopConAnalyzer;
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCMapperTestPostls1.cc b/CalibMuon/CSCCalibration/test/stubs/CSCMapperTestPostls1.cc
index 7517b6e0da56e..2c25a8ace1974 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCMapperTestPostls1.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCMapperTestPostls1.cc
@@ -1,8 +1,8 @@
 #include <memory>
 
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -12,57 +12,56 @@
 
 class CSCMapperTestPostls1 : public edm::EDAnalyzer {
 public:
-  explicit CSCMapperTestPostls1(const edm::ParameterSet&);
+  explicit CSCMapperTestPostls1(const edm::ParameterSet &);
   ~CSCMapperTestPostls1();
 
 private:
-  virtual void beginJob() ;
-  virtual void analyze(const edm::Event&, const edm::EventSetup&) ;
-  virtual void endJob() ;
+  virtual void beginJob();
+  virtual void analyze(const edm::Event &, const edm::EventSetup &);
+  virtual void endJob();
 
   std::string algoName;
 };
 
-CSCMapperTestPostls1::CSCMapperTestPostls1(const edm::ParameterSet& pset) {}
+CSCMapperTestPostls1::CSCMapperTestPostls1(const edm::ParameterSet &pset) {}
 
 CSCMapperTestPostls1::~CSCMapperTestPostls1() {}
 
-void CSCMapperTestPostls1::analyze(const edm::Event& ev, const edm::EventSetup& esu)
-{
-  const int egeo[] = {  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2 }; // endcap 1=+z, 2=-z
-  const int sgeo[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // station 1-4
-  const int rgeo[] = {  1,  1,  1,  4,  4,  4,  1,  1,  1,  4,  4,  4 }; // ring 1-4
-  const int cgeo[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // chamber 1-18/36
-  const int lgeo[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // layer 1-6
-  const int tgeo[] = {  1, 32, 64,  1, 24, 48,  1, 32, 64,  1, 24, 48 }; // strip 1-80 (16, 48 64)
-
-  const int eraw[] = {  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2 }; // endcap 1=+z, 2=-z
-  const int sraw[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // station 1-4
-  const int rraw[] = {  1,  1,  1,  4,  4,  4,  1,  1,  1,  4,  4,  4 }; // ring 1-4
-  const int craw[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // chamber 1-18/36
-  const int lraw[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // layer 1-6
-  const int traw[] = {  1, 32, 64,  1, 24, 48,  1, 32, 64,  1, 24, 48 }; // strip 1-80 (16, 48 64)
-
-  const int estrip[] = {  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2 }; // endcap 1=+z, 2=-z
-  const int sstrip[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // station 1-4
-  const int rstrip[] = {  1,  1,  1,  4,  4,  4,  1,  1,  1,  4,  4,  4 }; // ring 1-4
-  const int cstrip[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // chamber 1-18/36
-  const int lstrip[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // layer 1-6
-  const int tstrip[] = {  1, 32, 64,  1, 24, 48,  1, 32, 64,  1, 24, 48 }; // strip 1-80 (16, 48 64)
-
-  const int edetid[] = {  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2 }; // endcap 1=+z, 2=-z
-  const int sdetid[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // station 1-4
-  const int rdetid[] = {  1,  1,  1,  4,  4,  4,  1,  1,  1,  4,  4,  4 }; // ring 1-4
-  const int cdetid[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // chamber 1-18/36
-  const int ldetid[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // layer 1-6
-
-  const CSCChannelMapperRecord& irec = esu.get<CSCChannelMapperRecord>();
+void CSCMapperTestPostls1::analyze(const edm::Event &ev, const edm::EventSetup &esu) {
+  const int egeo[] = {1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2};          // endcap 1=+z, 2=-z
+  const int sgeo[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};          // station 1-4
+  const int rgeo[] = {1, 1, 1, 4, 4, 4, 1, 1, 1, 4, 4, 4};          // ring 1-4
+  const int cgeo[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};          // chamber 1-18/36
+  const int lgeo[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};          // layer 1-6
+  const int tgeo[] = {1, 32, 64, 1, 24, 48, 1, 32, 64, 1, 24, 48};  // strip 1-80 (16, 48 64)
+
+  const int eraw[] = {1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2};          // endcap 1=+z, 2=-z
+  const int sraw[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};          // station 1-4
+  const int rraw[] = {1, 1, 1, 4, 4, 4, 1, 1, 1, 4, 4, 4};          // ring 1-4
+  const int craw[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};          // chamber 1-18/36
+  const int lraw[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};          // layer 1-6
+  const int traw[] = {1, 32, 64, 1, 24, 48, 1, 32, 64, 1, 24, 48};  // strip 1-80 (16, 48 64)
+
+  const int estrip[] = {1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2};          // endcap 1=+z, 2=-z
+  const int sstrip[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};          // station 1-4
+  const int rstrip[] = {1, 1, 1, 4, 4, 4, 1, 1, 1, 4, 4, 4};          // ring 1-4
+  const int cstrip[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};          // chamber 1-18/36
+  const int lstrip[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};          // layer 1-6
+  const int tstrip[] = {1, 32, 64, 1, 24, 48, 1, 32, 64, 1, 24, 48};  // strip 1-80 (16, 48 64)
+
+  const int edetid[] = {1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2};  // endcap 1=+z, 2=-z
+  const int sdetid[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};  // station 1-4
+  const int rdetid[] = {1, 1, 1, 4, 4, 4, 1, 1, 1, 4, 4, 4};  // ring 1-4
+  const int cdetid[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};  // chamber 1-18/36
+  const int ldetid[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};  // layer 1-6
+
+  const CSCChannelMapperRecord &irec = esu.get<CSCChannelMapperRecord>();
   edm::ESHandle<CSCChannelMapperBase> mapper_;
   irec.get(mapper_);
 
   algoName = mapper_->name();
 
-  std::cout << "CSCMapperTestPostls1: analyze sees algorithm " << algoName  << " in Event Setup" << std::endl;
+  std::cout << "CSCMapperTestPostls1: analyze sees algorithm " << algoName << " in Event Setup" << std::endl;
 
   size_t isiz = 12;
 
@@ -71,20 +70,19 @@ void CSCMapperTestPostls1::analyze(const edm::Event& ev, const edm::EventSetup&
   std::cout << " E   S   R   C   L   geom   raw\n"
             << "                     chan   chan" << std::endl;
 
-  for (size_t i=0; i<isiz; ++i ) {
-    int ie=egeo[i];
-    int is=sgeo[i];
-    int ir=rgeo[i];
-    int ic=cgeo[i];
-    int il=lgeo[i];
-    int igeo=tgeo[i];
-  
+  for (size_t i = 0; i < isiz; ++i) {
+    int ie = egeo[i];
+    int is = sgeo[i];
+    int ir = rgeo[i];
+    int ic = cgeo[i];
+    int il = lgeo[i];
+    int igeo = tgeo[i];
+
     CSCDetId id(ie, is, ir, ic, il);
     int iraw = mapper_->rawStripChannel(id, igeo);
- 
-    std::cout << std::setw(2) << ie << std::setw(4) << is << std::setw(4) << ir << std::setw(4)
-	      << ic << std::setw(4) << il << std::setw(7) << igeo << std::setw(7) << iraw << std::endl;
 
+    std::cout << std::setw(2) << ie << std::setw(4) << is << std::setw(4) << ir << std::setw(4) << ic << std::setw(4)
+              << il << std::setw(7) << igeo << std::setw(7) << iraw << std::endl;
   }
 
   std::cout << "\n" << algoName << "::geomStripChannel for:" << std::endl;
@@ -92,65 +90,64 @@ void CSCMapperTestPostls1::analyze(const edm::Event& ev, const edm::EventSetup&
   std::cout << " E   S   R   C   L    raw   geom\n"
             << "                     chan   chan" << std::endl;
 
-  for (size_t i=0; i<isiz; ++i ) {
-    int ie=eraw[i];
-    int is=sraw[i];
-    int ir=rraw[i];
-    int ic=craw[i];
-    int il=lraw[i];
-    int igeo=traw[i];
-  
+  for (size_t i = 0; i < isiz; ++i) {
+    int ie = eraw[i];
+    int is = sraw[i];
+    int ir = rraw[i];
+    int ic = craw[i];
+    int il = lraw[i];
+    int igeo = traw[i];
+
     CSCDetId id(ie, is, ir, ic, il);
     int iraw = mapper_->geomStripChannel(id, igeo);
- 
-    std::cout << std::setw(2) << ie << std::setw(4) << is << std::setw(4) << ir << std::setw(4)
-	      << ic << std::setw(4) << il << std::setw(7) << igeo << std::setw(7) << iraw << std::endl;
 
+    std::cout << std::setw(2) << ie << std::setw(4) << is << std::setw(4) << ir << std::setw(4) << ic << std::setw(4)
+              << il << std::setw(7) << igeo << std::setw(7) << iraw << std::endl;
   }
 
   std::cout << "\n" << algoName << "::channelFromStrip for:" << std::endl;
-  
+
   std::cout << " E   S   R   C   L   strip  chan" << std::endl;
 
-  for (size_t i=0; i<isiz; ++i ) {
-    int ie=estrip[i];
-    int is=sstrip[i];
-    int ir=rstrip[i];
-    int ic=cstrip[i];
-    int il=lstrip[i];
-    int istrip=tstrip[i];
-  
+  for (size_t i = 0; i < isiz; ++i) {
+    int ie = estrip[i];
+    int is = sstrip[i];
+    int ir = rstrip[i];
+    int ic = cstrip[i];
+    int il = lstrip[i];
+    int istrip = tstrip[i];
+
     CSCDetId id(ie, is, ir, ic, il);
     int ichan = mapper_->channelFromStrip(id, istrip);
- 
-    std::cout << std::setw(2) << ie << std::setw(4) << is << std::setw(4) << ir << std::setw(4)
-	      << ic << std::setw(4) << il << std::setw(7) << istrip << std::setw(7) << ichan << std::endl;
 
+    std::cout << std::setw(2) << ie << std::setw(4) << is << std::setw(4) << ir << std::setw(4) << ic << std::setw(4)
+              << il << std::setw(7) << istrip << std::setw(7) << ichan << std::endl;
   }
 
   std::cout << "\n" << algoName << "::rawCSCDetId for:" << std::endl;
-  
-  std::cout << "          " << "CSCDetId IN" << "         " << "CSCDetId OUT" << std::endl;
-
-  for (size_t i=0; i<isiz; ++i ) {
-    int ie=edetid[i];
-    int is=sdetid[i];
-    int ir=rdetid[i];
-    int ic=cdetid[i];
-    int il=ldetid[i];
-  
+
+  std::cout << "          "
+            << "CSCDetId IN"
+            << "         "
+            << "CSCDetId OUT" << std::endl;
+
+  for (size_t i = 0; i < isiz; ++i) {
+    int ie = edetid[i];
+    int is = sdetid[i];
+    int ir = rdetid[i];
+    int ic = cdetid[i];
+    int il = ldetid[i];
+
     CSCDetId id(ie, is, ir, ic, il);
     CSCDetId idout = mapper_->rawCSCDetId(id);
- 
+
     std::cout << " " << id << " " << idout << std::endl;
   }
-
 }
 
-
 void CSCMapperTestPostls1::beginJob() {}
 
 void CSCMapperTestPostls1::endJob() {}
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(CSCMapperTestPostls1);
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCMapperTestStartup.cc b/CalibMuon/CSCCalibration/test/stubs/CSCMapperTestStartup.cc
index 7f0b67e92d92b..e539653f08b82 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCMapperTestStartup.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCMapperTestStartup.cc
@@ -1,8 +1,8 @@
 #include <memory>
 
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -12,57 +12,56 @@
 
 class CSCMapperTestStartup : public edm::EDAnalyzer {
 public:
-  explicit CSCMapperTestStartup(const edm::ParameterSet&);
+  explicit CSCMapperTestStartup(const edm::ParameterSet &);
   ~CSCMapperTestStartup();
 
 private:
-  virtual void beginJob() ;
-  virtual void analyze(const edm::Event&, const edm::EventSetup&) ;
-  virtual void endJob() ;
+  virtual void beginJob();
+  virtual void analyze(const edm::Event &, const edm::EventSetup &);
+  virtual void endJob();
 
   std::string algoName;
 };
 
-CSCMapperTestStartup::CSCMapperTestStartup(const edm::ParameterSet& pset) {}
+CSCMapperTestStartup::CSCMapperTestStartup(const edm::ParameterSet &pset) {}
 
 CSCMapperTestStartup::~CSCMapperTestStartup() {}
 
-void CSCMapperTestStartup::analyze(const edm::Event& ev, const edm::EventSetup& esu)
-{
-  const int egeo[] = {  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2 }; // endcap 1=+z, 2=-z
-  const int sgeo[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // station 1-4
-  const int rgeo[] = {  1,  1,  1,  4,  4,  4,  1,  1,  1,  4,  4,  4 }; // ring 1-4
-  const int cgeo[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // chamber 1-18/36
-  const int lgeo[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // layer 1-6
-  const int tgeo[] = {  1, 32, 64,  1,  8, 16,  1, 32, 64,  1,  8, 16 }; // strip 1-80 (16, 48 64)
-
-  const int eraw[] = {  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2 }; // endcap 1=+z, 2=-z
-  const int sraw[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // station 1-4
-  const int rraw[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // ring 1-3
-  const int craw[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // chamber 1-18/36
-  const int lraw[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // layer 1-6
-  const int traw[] = {  1, 32, 64, 65, 72, 80,  1, 32, 64, 65, 72, 80 }; // strip 1-80 (16, 48 64)
-
-  const int estrip[] = {  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2 }; // endcap 1=+z, 2=-z
-  const int sstrip[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // station 1-4
-  const int rstrip[] = {  1,  1,  1,  4,  4,  4,  1,  1,  1,  4,  4,  4 }; // ring 1-3
-  const int cstrip[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // chamber 1-18/36
-  const int lstrip[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // layer 1-6
-  const int tstrip[] = {  1, 32, 64, 65, 72, 80,  1, 32, 64, 65, 72, 80 }; // strip 1-80 (16, 48 64)
-
-  const int edetid[] = {  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2 }; // endcap 1=+z, 2=-z
-  const int sdetid[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // station 1-4
-  const int rdetid[] = {  1,  1,  1,  4,  4,  4,  1,  1,  1,  4,  4,  4 }; // ring 1-3
-  const int cdetid[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // chamber 1-18/36
-  const int ldetid[] = {  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1 }; // layer 1-6
-
-  const CSCChannelMapperRecord& irec = esu.get<CSCChannelMapperRecord>();
+void CSCMapperTestStartup::analyze(const edm::Event &ev, const edm::EventSetup &esu) {
+  const int egeo[] = {1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2};        // endcap 1=+z, 2=-z
+  const int sgeo[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};        // station 1-4
+  const int rgeo[] = {1, 1, 1, 4, 4, 4, 1, 1, 1, 4, 4, 4};        // ring 1-4
+  const int cgeo[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};        // chamber 1-18/36
+  const int lgeo[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};        // layer 1-6
+  const int tgeo[] = {1, 32, 64, 1, 8, 16, 1, 32, 64, 1, 8, 16};  // strip 1-80 (16, 48 64)
+
+  const int eraw[] = {1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2};            // endcap 1=+z, 2=-z
+  const int sraw[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};            // station 1-4
+  const int rraw[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};            // ring 1-3
+  const int craw[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};            // chamber 1-18/36
+  const int lraw[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};            // layer 1-6
+  const int traw[] = {1, 32, 64, 65, 72, 80, 1, 32, 64, 65, 72, 80};  // strip 1-80 (16, 48 64)
+
+  const int estrip[] = {1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2};            // endcap 1=+z, 2=-z
+  const int sstrip[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};            // station 1-4
+  const int rstrip[] = {1, 1, 1, 4, 4, 4, 1, 1, 1, 4, 4, 4};            // ring 1-3
+  const int cstrip[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};            // chamber 1-18/36
+  const int lstrip[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};            // layer 1-6
+  const int tstrip[] = {1, 32, 64, 65, 72, 80, 1, 32, 64, 65, 72, 80};  // strip 1-80 (16, 48 64)
+
+  const int edetid[] = {1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2};  // endcap 1=+z, 2=-z
+  const int sdetid[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};  // station 1-4
+  const int rdetid[] = {1, 1, 1, 4, 4, 4, 1, 1, 1, 4, 4, 4};  // ring 1-3
+  const int cdetid[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};  // chamber 1-18/36
+  const int ldetid[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};  // layer 1-6
+
+  const CSCChannelMapperRecord &irec = esu.get<CSCChannelMapperRecord>();
   edm::ESHandle<CSCChannelMapperBase> mapper_;
   irec.get(mapper_);
 
   algoName = mapper_->name();
 
-  std::cout << "CSCMapperTestStartup: analyze sees algorithm " << algoName  << " in Event Setup" << std::endl;
+  std::cout << "CSCMapperTestStartup: analyze sees algorithm " << algoName << " in Event Setup" << std::endl;
 
   size_t isiz = 12;
 
@@ -71,20 +70,19 @@ void CSCMapperTestStartup::analyze(const edm::Event& ev, const edm::EventSetup&
   std::cout << " E   S   R   C   L   geom   raw\n"
             << "                     chan   chan" << std::endl;
 
-  for (size_t i=0; i<isiz; ++i ) {
-    int ie=egeo[i];
-    int is=sgeo[i];
-    int ir=rgeo[i];
-    int ic=cgeo[i];
-    int il=lgeo[i];
-    int igeo=tgeo[i];
-  
+  for (size_t i = 0; i < isiz; ++i) {
+    int ie = egeo[i];
+    int is = sgeo[i];
+    int ir = rgeo[i];
+    int ic = cgeo[i];
+    int il = lgeo[i];
+    int igeo = tgeo[i];
+
     CSCDetId id(ie, is, ir, ic, il);
     int iraw = mapper_->rawStripChannel(id, igeo);
- 
-    std::cout << std::setw(2) << ie << std::setw(4) << is << std::setw(4) << ir << std::setw(4)
-	      << ic << std::setw(4) << il << std::setw(7) << igeo << std::setw(7) << iraw << std::endl;
 
+    std::cout << std::setw(2) << ie << std::setw(4) << is << std::setw(4) << ir << std::setw(4) << ic << std::setw(4)
+              << il << std::setw(7) << igeo << std::setw(7) << iraw << std::endl;
   }
 
   std::cout << "\n" << algoName << "::geomStripChannel for:" << std::endl;
@@ -92,65 +90,64 @@ void CSCMapperTestStartup::analyze(const edm::Event& ev, const edm::EventSetup&
   std::cout << " E   S   R   C   L    raw   geom\n"
             << "                     chan   chan" << std::endl;
 
-  for (size_t i=0; i<isiz; ++i ) {
-    int ie=eraw[i];
-    int is=sraw[i];
-    int ir=rraw[i];
-    int ic=craw[i];
-    int il=lraw[i];
-    int igeo=traw[i];
-  
+  for (size_t i = 0; i < isiz; ++i) {
+    int ie = eraw[i];
+    int is = sraw[i];
+    int ir = rraw[i];
+    int ic = craw[i];
+    int il = lraw[i];
+    int igeo = traw[i];
+
     CSCDetId id(ie, is, ir, ic, il);
     int iraw = mapper_->geomStripChannel(id, igeo);
- 
-    std::cout << std::setw(2) << ie << std::setw(4) << is << std::setw(4) << ir << std::setw(4)
-	      << ic << std::setw(4) << il << std::setw(7) << igeo << std::setw(7) << iraw << std::endl;
 
+    std::cout << std::setw(2) << ie << std::setw(4) << is << std::setw(4) << ir << std::setw(4) << ic << std::setw(4)
+              << il << std::setw(7) << igeo << std::setw(7) << iraw << std::endl;
   }
 
   std::cout << "\n" << algoName << "::channelFromStrip for:" << std::endl;
-  
+
   std::cout << " E   S   R   C   L   strip  chan" << std::endl;
 
-  for (size_t i=0; i<isiz; ++i ) {
-    int ie=estrip[i];
-    int is=sstrip[i];
-    int ir=rstrip[i];
-    int ic=cstrip[i];
-    int il=lstrip[i];
-    int istrip=tstrip[i];
-  
+  for (size_t i = 0; i < isiz; ++i) {
+    int ie = estrip[i];
+    int is = sstrip[i];
+    int ir = rstrip[i];
+    int ic = cstrip[i];
+    int il = lstrip[i];
+    int istrip = tstrip[i];
+
     CSCDetId id(ie, is, ir, ic, il);
     int ichan = mapper_->channelFromStrip(id, istrip);
- 
-    std::cout << std::setw(2) << ie << std::setw(4) << is << std::setw(4) << ir << std::setw(4)
-	      << ic << std::setw(4) << il << std::setw(7) << istrip << std::setw(7) << ichan << std::endl;
 
+    std::cout << std::setw(2) << ie << std::setw(4) << is << std::setw(4) << ir << std::setw(4) << ic << std::setw(4)
+              << il << std::setw(7) << istrip << std::setw(7) << ichan << std::endl;
   }
 
   std::cout << "\n" << algoName << "::rawCSCDetId for:" << std::endl;
-  
-  std::cout << "          " << "CSCDetId IN" << "         " << "CSCDetId OUT" << std::endl;
-
-  for (size_t i=0; i<isiz; ++i ) {
-    int ie=edetid[i];
-    int is=sdetid[i];
-    int ir=rdetid[i];
-    int ic=cdetid[i];
-    int il=ldetid[i];
-  
+
+  std::cout << "          "
+            << "CSCDetId IN"
+            << "         "
+            << "CSCDetId OUT" << std::endl;
+
+  for (size_t i = 0; i < isiz; ++i) {
+    int ie = edetid[i];
+    int is = sdetid[i];
+    int ir = rdetid[i];
+    int ic = cdetid[i];
+    int il = ldetid[i];
+
     CSCDetId id(ie, is, ir, ic, il);
     CSCDetId idout = mapper_->rawCSCDetId(id);
- 
+
     std::cout << " " << id << " " << idout << std::endl;
   }
-
 }
 
-
 void CSCMapperTestStartup::beginJob() {}
 
 void CSCMapperTestStartup::endJob() {}
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(CSCMapperTestStartup);
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCNoiseMatrixHandler.cc b/CalibMuon/CSCCalibration/test/stubs/CSCNoiseMatrixHandler.cc
index 2f748a9fb5ed6..e35bf6627a2c5 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCNoiseMatrixHandler.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCNoiseMatrixHandler.cc
@@ -1,39 +1,37 @@
 #include "CalibMuon/CSCCalibration/test/stubs/CSCNoiseMatrixHandler.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
-#include<iostream>
+#include <iostream>
 
-#include "CondFormats/CSCObjects/interface/CSCDBNoiseMatrix.h"
 #include "CalibMuon/CSCCalibration/interface/CSCNoiseMatrixDBConditions.h"
+#include "CondFormats/CSCObjects/interface/CSCDBNoiseMatrix.h"
 
-popcon::CSCDBNoiseMatrixImpl::CSCDBNoiseMatrixImpl(const edm::ParameterSet& pset): m_name(pset.getUntrackedParameter<std::string>("name","CSCDBNoiseMatrixImpl")){}
+popcon::CSCDBNoiseMatrixImpl::CSCDBNoiseMatrixImpl(const edm::ParameterSet &pset)
+    : m_name(pset.getUntrackedParameter<std::string>("name", "CSCDBNoiseMatrixImpl")) {}
 
-popcon::CSCDBNoiseMatrixImpl::~CSCDBNoiseMatrixImpl(){}
+popcon::CSCDBNoiseMatrixImpl::~CSCDBNoiseMatrixImpl() {}
 
-void popcon::CSCDBNoiseMatrixImpl::getNewObjects()
-{
+void popcon::CSCDBNoiseMatrixImpl::getNewObjects() {
+  std::cout << "CSCNoiseMatrixHandler - time before filling object:" << std::endl;
+  std::cout << "------- CSC src - > getNewObjects\n" << m_name;
 
-  std::cout << "CSCNoiseMatrixHandler - time before filling object:"<< std::endl;
-  std::cout << "------- CSC src - > getNewObjects\n"<<m_name;
-  
   // fill object from file
-  CSCDBNoiseMatrix * cndbmatrix = CSCNoiseMatrixDBConditions::prefillDBNoiseMatrix();
-  //std::cout << "crosstalk size " << cndbmatrix->matrix.size() << std::endl;
-  
-  std::cout << "CSCNoiseMatrixHandler - time after filling object:"<< std::endl;
+  CSCDBNoiseMatrix *cndbmatrix = CSCNoiseMatrixDBConditions::prefillDBNoiseMatrix();
+  // std::cout << "crosstalk size " << cndbmatrix->matrix.size() << std::endl;
+
+  std::cout << "CSCNoiseMatrixHandler - time after filling object:" << std::endl;
+
+  // check whats already inside of database
 
-  //check whats already inside of database
+  std::cerr << "got offlineInfo" << std::endl;
+  std::cerr << tagInfo().name << " , last object valid since " << tagInfo().lastInterval.first << std::endl;
 
-  std::cerr<<"got offlineInfo"<<std::endl;
-  std::cerr << tagInfo().name << " , last object valid since " 
-	    << tagInfo().lastInterval.first << std::endl;  
-  
   unsigned int snc;
-  
+
   std::cerr << "Source implementation test ::getNewObjects : enter since ? \n";
   std::cin >> snc;
-    
-  m_to_transfer.push_back(std::make_pair(cndbmatrix,snc));
-  
-  std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n"<< std::endl;
-  std::cout << "CSCNoiseMatrixHandler - time before writing into DB:"<< std::endl;
+
+  m_to_transfer.push_back(std::make_pair(cndbmatrix, snc));
+
+  std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n" << std::endl;
+  std::cout << "CSCNoiseMatrixHandler - time before writing into DB:" << std::endl;
 }
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCNoiseMatrixHandler.h b/CalibMuon/CSCCalibration/test/stubs/CSCNoiseMatrixHandler.h
index 9612f0256f009..ba0130c0edb7b 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCNoiseMatrixHandler.h
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCNoiseMatrixHandler.h
@@ -1,33 +1,30 @@
 #ifndef CSC_DBNOISEMATRIX_SRC_IMPL_H
 #define CSC_DBNOISEMATRIX_SRC_IMPL_H
 
-#include <vector>
-#include <string>
 #include <iostream>
+#include <string>
 #include <typeinfo>
+#include <vector>
 
+#include "CalibMuon/CSCCalibration/interface/CSCNoiseMatrixDBConditions.h"
 #include "CondCore/PopCon/interface/PopConSourceHandler.h"
 #include "CondFormats/CSCObjects/interface/CSCobject.h"
 #include "CondFormats/DataRecord/interface/CSCDBNoiseMatrixRcd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "CalibMuon/CSCCalibration/interface/CSCNoiseMatrixDBConditions.h"
 
-namespace popcon
-{
-  class CSCDBNoiseMatrixImpl : public popcon::PopConSourceHandler<CSCDBNoiseMatrix>
-    {
-      
-    public:
-      void getNewObjects();
-      std::string id() const { return m_name;}
-      ~CSCDBNoiseMatrixImpl(); 
-      CSCDBNoiseMatrixImpl(const edm::ParameterSet& pset);
-      
-    private:
-      std::string m_name;
-    };
-}
+namespace popcon {
+  class CSCDBNoiseMatrixImpl : public popcon::PopConSourceHandler<CSCDBNoiseMatrix> {
+  public:
+    void getNewObjects();
+    std::string id() const { return m_name; }
+    ~CSCDBNoiseMatrixImpl();
+    CSCDBNoiseMatrixImpl(const edm::ParameterSet &pset);
+
+  private:
+    std::string m_name;
+  };
+}  // namespace popcon
 #endif
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCNoiseMatrixPopConAnalyzer.cc b/CalibMuon/CSCCalibration/test/stubs/CSCNoiseMatrixPopConAnalyzer.cc
index b052cd5a683a4..8d78021485135 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCNoiseMatrixPopConAnalyzer.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCNoiseMatrixPopConAnalyzer.cc
@@ -1,5 +1,5 @@
-#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "CSCNoiseMatrixHandler.h"
+#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 typedef popcon::PopConAnalyzer<popcon::CSCDBNoiseMatrixImpl> CSCNoiseMatrixPopConAnalyzer;
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCPedestalsHandler.cc b/CalibMuon/CSCCalibration/test/stubs/CSCPedestalsHandler.cc
index 88f58267fc219..c47723ea28bcb 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCPedestalsHandler.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCPedestalsHandler.cc
@@ -1,40 +1,38 @@
 #include "CalibMuon/CSCCalibration/test/stubs/CSCPedestalsHandler.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
-#include<iostream>
+#include <iostream>
 
-#include "CondFormats/CSCObjects/interface/CSCDBPedestals.h"
 #include "CalibMuon/CSCCalibration/interface/CSCPedestalsDBConditions.h"
+#include "CondFormats/CSCObjects/interface/CSCDBPedestals.h"
 
-popcon::CSCDBPedestalsImpl::CSCDBPedestalsImpl(const edm::ParameterSet& pset): m_name(pset.getUntrackedParameter<std::string>("name","CSCDBPedestalsImpl")){}
+popcon::CSCDBPedestalsImpl::CSCDBPedestalsImpl(const edm::ParameterSet &pset)
+    : m_name(pset.getUntrackedParameter<std::string>("name", "CSCDBPedestalsImpl")) {}
 
-popcon::CSCDBPedestalsImpl::~CSCDBPedestalsImpl(){}
+popcon::CSCDBPedestalsImpl::~CSCDBPedestalsImpl() {}
 
-void popcon::CSCDBPedestalsImpl::getNewObjects()
-{
+void popcon::CSCDBPedestalsImpl::getNewObjects() {
+  std::cout << "CSCPedestalsHandler - time before filling object:" << std::endl;
+  std::cout << "------- CSC src - > getNewObjects\n" << m_name;
 
-  std::cout << "CSCPedestalsHandler - time before filling object:"<< std::endl;
-  std::cout << "------- CSC src - > getNewObjects\n"<<m_name;
-  
   // fill object from file
-  CSCDBPedestals * cnpedestals = CSCPedestalsDBConditions::prefillDBPedestals();
-  //std::cout << "pedestals size " << cnpedestals->pedestals.size() << std::endl;
+  CSCDBPedestals *cnpedestals = CSCPedestalsDBConditions::prefillDBPedestals();
+  // std::cout << "pedestals size " << cnpedestals->pedestals.size() <<
+  // std::endl;
+
+  std::cout << "CSCPedestalsHandler - time after filling object:" << std::endl;
 
-  std::cout << "CSCPedestalsHandler - time after filling object:"<< std::endl;
+  // check whats already inside of database
 
-  //check whats already inside of database
+  std::cerr << "got offlineInfo" << std::endl;
+  std::cerr << tagInfo().name << " , last object valid since " << tagInfo().lastInterval.first << std::endl;
 
-  std::cerr<<"got offlineInfo"<<std::endl;
-  std::cerr << tagInfo().name << " , last object valid since " 
-	    << tagInfo().lastInterval.first << std::endl;
-	
   unsigned int snc;
   std::cout << "Source implementation test ::getNewObjects : enter since ? \n";
   std::cin >> snc;
   std::cout << "getNewObjects : enter till ? \n";
-  
-   
-  m_to_transfer.push_back(std::make_pair(cnpedestals,snc));
-   
+
+  m_to_transfer.push_back(std::make_pair(cnpedestals, snc));
+
   std::cout << "------- " << m_name << "CSC src - > getNewObjects -----------\n" << std::endl;
-  std::cout << "CSCPedestalsHandler - time before writing into DB:"<< std::endl;
+  std::cout << "CSCPedestalsHandler - time before writing into DB:" << std::endl;
 }
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCPedestalsHandler.h b/CalibMuon/CSCCalibration/test/stubs/CSCPedestalsHandler.h
index 6415cac3c8807..ceaec6443e6e7 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCPedestalsHandler.h
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCPedestalsHandler.h
@@ -1,33 +1,30 @@
 #ifndef CSC_DBPEDESTALS_SRC_IMPL_H
 #define CSC_DBPEDESTALS_SRC_IMPL_H
 
-#include <vector>
-#include <string>
 #include <iostream>
+#include <string>
 #include <typeinfo>
+#include <vector>
 
+#include "CalibMuon/CSCCalibration/interface/CSCPedestalsDBConditions.h"
 #include "CondCore/PopCon/interface/PopConSourceHandler.h"
 #include "CondFormats/CSCObjects/interface/CSCobject.h"
 #include "CondFormats/DataRecord/interface/CSCDBPedestalsRcd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "CalibMuon/CSCCalibration/interface/CSCPedestalsDBConditions.h"
 
-namespace popcon
-{
-  class CSCDBPedestalsImpl : public popcon::PopConSourceHandler<CSCDBPedestals>
-    {
-      
-    public:
-      void getNewObjects();
-      std::string id() const { return m_name;}
-      ~CSCDBPedestalsImpl(); 
-      CSCDBPedestalsImpl(const edm::ParameterSet& pset);
-      
-    private:
-      std::string m_name;
-    };
-}
+namespace popcon {
+  class CSCDBPedestalsImpl : public popcon::PopConSourceHandler<CSCDBPedestals> {
+  public:
+    void getNewObjects();
+    std::string id() const { return m_name; }
+    ~CSCDBPedestalsImpl();
+    CSCDBPedestalsImpl(const edm::ParameterSet &pset);
+
+  private:
+    std::string m_name;
+  };
+}  // namespace popcon
 #endif
diff --git a/CalibMuon/CSCCalibration/test/stubs/CSCPedestalsPopConAnalyzer.cc b/CalibMuon/CSCCalibration/test/stubs/CSCPedestalsPopConAnalyzer.cc
index 85f82f220c5c8..cf218fa35f5e2 100644
--- a/CalibMuon/CSCCalibration/test/stubs/CSCPedestalsPopConAnalyzer.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/CSCPedestalsPopConAnalyzer.cc
@@ -1,6 +1,6 @@
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "CondCore/PopCon/interface/PopConAnalyzer.h"
 #include "CSCPedestalsHandler.h"
+#include "CondCore/PopCon/interface/PopConAnalyzer.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 
 typedef popcon::PopConAnalyzer<popcon::CSCDBPedestalsImpl> CSCPedestalsPopConAnalyzer;
 
diff --git a/CalibMuon/CSCCalibration/test/stubs/Compare.cc b/CalibMuon/CSCCalibration/test/stubs/Compare.cc
index 4ac9759a190ec..18efac5895a0e 100644
--- a/CalibMuon/CSCCalibration/test/stubs/Compare.cc
+++ b/CalibMuon/CSCCalibration/test/stubs/Compare.cc
@@ -2,7 +2,7 @@
 //
 // Package:    Compare
 // Class:      Compare
-// 
+//
 /**\class Compare Compare.cc CalibMuon/Compare/src/Compare.cc
 
  Description: <one line class summary>
@@ -15,22 +15,24 @@
 //         Created:  Thu Oct 29 13:55:15 CET 2009
 //
 //
-//////////////////////////////////READ THIS FIRST//////////////////////////////////////////////////////////
-//////////////////"std::bad_alloc exception caught in cmsRun" ERROR when you have text inside the .dat///// 
-/////////////////files ---->Check them first before running this code!/////////////////////////////////////
+//////////////////////////////////READ THIS
+/// FIRST//////////////////////////////////////////////////////////
+//////////////////"std::bad_alloc exception caught in cmsRun" ERROR when you
+/// have text inside the .dat/////
+/////////////////files ---->Check them first before running this
+/// code!/////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 // system include files
+#include <fstream>
+#include <iostream>
 #include <memory>
 #include <string>
-#include <iostream>
-#include <fstream>
 #include <vector>
-#include <iostream>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -41,17 +43,16 @@
 //
 
 class Compare : public edm::EDAnalyzer {
-   public:
-      explicit Compare(const edm::ParameterSet&);
-      ~Compare();
-
+public:
+  explicit Compare(const edm::ParameterSet &);
+  ~Compare();
 
-   private:
-      virtual void beginJob() ;
-      virtual void analyze(const edm::Event&, const edm::EventSetup&);
-      virtual void endJob() ;
+private:
+  virtual void beginJob();
+  virtual void analyze(const edm::Event &, const edm::EventSetup &);
+  virtual void endJob();
 
-      // ----------member data ---------------------------
+  // ----------member data ---------------------------
 };
 
 //
@@ -65,17 +66,17 @@ class Compare : public edm::EDAnalyzer {
 //
 // constructors and destructor
 //
-Compare::Compare(const edm::ParameterSet& iConfig)
+Compare::Compare(const edm::ParameterSet &iConfig)
 
 {
-   //now do what ever initialization is needed
- /*
+  // now do what ever initialization is needed
+  /*
 
 
- */
+  */
 
   //=========== Compare Pedestals =================
-  std::cout<<"Comparing PEDESTALS, please wait!"<<std::endl;
+  std::cout << "Comparing PEDESTALS, please wait!" << std::endl;
 
   const int MAX_SIZE = 252288;
 
@@ -84,55 +85,54 @@ Compare::Compare(const edm::ParameterSet& iConfig)
   std::vector<int> old_index_id;
   std::vector<float> old_peds;
   int new_index;
-  float new_ped,new_rms;
+  float new_ped, new_rms;
   std::vector<int> new_index_id;
   std::vector<float> new_peds;
   std::vector<float> diffPeds;
   std::vector<float> diffGains;
-  
-  std::ifstream olddata; 
-  olddata.open("old_dbpeds.dat",std::ios::in); 
-  if(!olddata) {
-    std::cerr <<"Error: old_dbpeds.dat -> no such file!"<< std::endl;
+
+  std::ifstream olddata;
+  olddata.open("old_dbpeds.dat", std::ios::in);
+  if (!olddata) {
+    std::cerr << "Error: old_dbpeds.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!olddata.eof() ) { 
-    olddata >> old_index >> old_ped >> old_rms ; 
+
+  while (!olddata.eof()) {
+    olddata >> old_index >> old_ped >> old_rms;
     old_index_id.push_back(old_index);
     old_peds.push_back(old_ped);
   }
   olddata.close();
-  
+
   std::ifstream newdata;
-  std::ofstream myPedsFile("diffPedsTest.dat",std::ios::out);
-  newdata.open("goodPeds.dat",std::ios::in); 
-  if(!newdata) {
-    std::cerr <<"Error: goodPeds.dat -> no such file!"<< std::endl;
+  std::ofstream myPedsFile("diffPedsTest.dat", std::ios::out);
+  newdata.open("goodPeds.dat", std::ios::in);
+  if (!newdata) {
+    std::cerr << "Error: goodPeds.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!newdata.eof() ) { 
-    newdata >> new_index >> new_ped >> new_rms ; 
+
+  while (!newdata.eof()) {
+    newdata >> new_index >> new_ped >> new_rms;
     new_index_id.push_back(new_index);
     new_peds.push_back(new_ped);
   }
   newdata.close();
 
   diffPeds.resize(MAX_SIZE);
-  
-  for(int i=0; i<MAX_SIZE;++i){
-    for (unsigned int k=0;k<new_index_id.size()-1;++k){
-      if(old_index_id[i] == new_index_id[k]){
-	diffPeds[k]=old_peds[i]/10. - new_peds[k];
-	myPedsFile<<old_index_id[i]<<"  "<<diffPeds[k]<<std::endl;	
+
+  for (int i = 0; i < MAX_SIZE; ++i) {
+    for (unsigned int k = 0; k < new_index_id.size() - 1; ++k) {
+      if (old_index_id[i] == new_index_id[k]) {
+        diffPeds[k] = old_peds[i] / 10. - new_peds[k];
+        myPedsFile << old_index_id[i] << "  " << diffPeds[k] << std::endl;
       }
     }
   }
-  
-  
+
   // ============= Compare Crosstalk ===================
-  std::cout<<"Comparing CROSSTALK, please wait!"<<std::endl;
+  std::cout << "Comparing CROSSTALK, please wait!" << std::endl;
 
   old_index = 0;
   float old_xtalk_left, old_xtalk_right, old_int_left, old_int_right;
@@ -145,7 +145,7 @@ Compare::Compare(const edm::ParameterSet& iConfig)
   std::vector<float> diffXtalkL;
   std::vector<float> diffIntR;
   std::vector<float> diffIntL;
-  
+
   std::vector<float> myoldxtalkR;
   std::vector<float> myoldxtalkL;
   std::vector<float> myoldintR;
@@ -159,43 +159,43 @@ Compare::Compare(const edm::ParameterSet& iConfig)
   std::vector<float> new_Rint;
   std::vector<float> new_Lint;
 
-  int counter,counter1;
+  int counter, counter1;
 
-  std::ifstream olddata1; 
-  olddata1.open("old_dbxtalk.dat",std::ios::in); 
-  if(!olddata1) {
-    std::cerr <<"Error: old_dbxtalk.dat -> no such file!"<< std::endl;
+  std::ifstream olddata1;
+  olddata1.open("old_dbxtalk.dat", std::ios::in);
+  if (!olddata1) {
+    std::cerr << "Error: old_dbxtalk.dat -> no such file!" << std::endl;
     exit(1);
   }
 
-  while (!olddata1.eof() ) { 
-    olddata1 >> old_index >> old_xtalk_left >> old_int_left >> old_xtalk_right >> old_int_right ;
+  while (!olddata1.eof()) {
+    olddata1 >> old_index >> old_xtalk_left >> old_int_left >> old_xtalk_right >> old_int_right;
     old_index_id.push_back(old_index);
     old_Rxtalk.push_back(old_xtalk_right);
-    old_Rint.push_back(old_int_right); 
-    old_Lxtalk.push_back(old_xtalk_left);  
+    old_Rint.push_back(old_int_right);
+    old_Lxtalk.push_back(old_xtalk_left);
     old_Lint.push_back(old_int_left);
   }
   olddata1.close();
 
   std::ifstream newdata1;
-  std::ofstream myXtalkFile("diffXtalkTest.dat",std::ios::out);
+  std::ofstream myXtalkFile("diffXtalkTest.dat", std::ios::out);
 
-  newdata1.open("goodXtalk.dat",std::ios::in); 
-  if(!newdata1) {
-    std::cerr <<"Error: goodXtalk.dat  -> no such file!"<< std::endl;
+  newdata1.open("goodXtalk.dat", std::ios::in);
+  if (!newdata1) {
+    std::cerr << "Error: goodXtalk.dat  -> no such file!" << std::endl;
     exit(1);
   }
 
-  while (!newdata1.eof() ) { 
-    newdata1 >> new_index >> new_xtalk_left >> new_int_left >> new_xtalk_right >> new_int_right ;
+  while (!newdata1.eof()) {
+    newdata1 >> new_index >> new_xtalk_left >> new_int_left >> new_xtalk_right >> new_int_right;
     new_index_id.push_back(new_index);
     new_Rxtalk.push_back(new_xtalk_right);
-    new_Rint.push_back(new_int_right); 
+    new_Rint.push_back(new_int_right);
     new_Lxtalk.push_back(new_xtalk_left);
     new_Lint.push_back(new_int_left);
   }
-  newdata1.close();  
+  newdata1.close();
 
   diffXtalkR.resize(MAX_SIZE);
   diffXtalkL.resize(MAX_SIZE);
@@ -206,59 +206,59 @@ Compare::Compare(const edm::ParameterSet& iConfig)
   myoldintR.resize(MAX_SIZE);
   myoldintR.resize(MAX_SIZE);
 
-  for(int i=0; i<MAX_SIZE;++i){
-    counter=old_index_id[i];  
-    myoldxtalkR[i]=old_Rxtalk[i];
-    myoldxtalkL[i]=old_Lxtalk[i];
-    myoldintR[i]=old_Rint[i];
-    myoldintR[i]=old_Lint[i];
-
-    for (unsigned int k=0;k<new_index_id.size()-1;k++){
-      counter1=new_index_id[k];
-      if(counter == counter1){
-	diffXtalkR[k]=old_Rxtalk[i]/10000000. - new_Rxtalk[k];
-	diffXtalkL[k]=old_Lxtalk[i]/10000000. - new_Lxtalk[k];
-	diffIntR[k]=old_Rint[i]/100000. - new_Rint[k];
-	diffIntL[k]=old_Rint[i]/100000. - new_Rint[k];
-	myXtalkFile<<counter<<"  "<<diffXtalkL[k]<<"  "<<diffIntL[k]<<"  "<<diffXtalkR[k]<<"  "<<diffIntR[k]<<"  "<<std::endl;	
+  for (int i = 0; i < MAX_SIZE; ++i) {
+    counter = old_index_id[i];
+    myoldxtalkR[i] = old_Rxtalk[i];
+    myoldxtalkL[i] = old_Lxtalk[i];
+    myoldintR[i] = old_Rint[i];
+    myoldintR[i] = old_Lint[i];
+
+    for (unsigned int k = 0; k < new_index_id.size() - 1; k++) {
+      counter1 = new_index_id[k];
+      if (counter == counter1) {
+        diffXtalkR[k] = old_Rxtalk[i] / 10000000. - new_Rxtalk[k];
+        diffXtalkL[k] = old_Lxtalk[i] / 10000000. - new_Lxtalk[k];
+        diffIntR[k] = old_Rint[i] / 100000. - new_Rint[k];
+        diffIntL[k] = old_Rint[i] / 100000. - new_Rint[k];
+        myXtalkFile << counter << "  " << diffXtalkL[k] << "  " << diffIntL[k] << "  " << diffXtalkR[k] << "  "
+                    << diffIntR[k] << "  " << std::endl;
       }
     }
   }
 
-
   // ================= Compare Gains ===============
-  std::cout<<"Comparing GAINS, please wait!"<<std::endl;
+  std::cout << "Comparing GAINS, please wait!" << std::endl;
 
-  old_index=0;
+  old_index = 0;
   float old_slope;
   old_index_id.clear();
   std::vector<float> old_gains;
   std::vector<float> old_intercept;
   std::vector<float> old_chi;
 
-  new_index=0;
-  float new_slope,new_int, new_chi2;
+  new_index = 0;
+  float new_slope, new_int, new_chi2;
   new_index_id.clear();
   std::vector<float> new_gains;
   std::vector<float> new_intercept;
   std::vector<float> new_chi;
- 
+
   std::vector<float> myoldgains;
 
-  counter=0;
-  counter1=0;
-  int old_nrlines=0;
-  int new_nrlines=0;
+  counter = 0;
+  counter1 = 0;
+  int old_nrlines = 0;
+  int new_nrlines = 0;
 
-  std::ifstream olddata2; 
-  olddata2.open("old_dbgains.dat",std::ios::in); 
-  if(!olddata2) {
-    std::cerr <<"Error: old_dbgains.dat -> no such file!"<< std::endl;
+  std::ifstream olddata2;
+  olddata2.open("old_dbgains.dat", std::ios::in);
+  if (!olddata2) {
+    std::cerr << "Error: old_dbgains.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!olddata2.eof() ) { 
-    olddata2 >> old_index >> old_slope; 
+
+  while (!olddata2.eof()) {
+    olddata2 >> old_index >> old_slope;
     old_index_id.push_back(old_index);
     old_gains.push_back(old_slope);
     old_nrlines++;
@@ -266,15 +266,15 @@ Compare::Compare(const edm::ParameterSet& iConfig)
   olddata2.close();
 
   std::ifstream newdata2;
-  std::ofstream myGainsFile("diffGainsTest.dat",std::ios::out);
-  newdata2.open("goodGains.dat",std::ios::in); 
-  if(!newdata2) {
-    std::cerr <<"Error: goodGains.dat -> no such file!"<< std::endl;
+  std::ofstream myGainsFile("diffGainsTest.dat", std::ios::out);
+  newdata2.open("goodGains.dat", std::ios::in);
+  if (!newdata2) {
+    std::cerr << "Error: goodGains.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!newdata2.eof() ) { 
-    newdata2 >> new_index >> new_slope >> new_int >> new_chi2 ; 
+
+  while (!newdata2.eof()) {
+    newdata2 >> new_index >> new_slope >> new_int >> new_chi2;
     new_index_id.push_back(new_index);
     new_gains.push_back(new_slope);
     new_intercept.push_back(new_int);
@@ -284,27 +284,26 @@ Compare::Compare(const edm::ParameterSet& iConfig)
   newdata2.close();
   diffGains.resize(MAX_SIZE);
   myoldgains.resize(MAX_SIZE);
-  
-  for(int i=0; i<MAX_SIZE;++i){
-    counter=old_index_id[i];  
-    myoldgains[i]=old_gains[i];
-
-    for (unsigned int k=0;k<new_index_id.size()-1;k++){
-      counter1=new_index_id[k];
-      if(counter == counter1){
-	diffGains[k]=old_gains[i]/1000. - new_gains[k];
-	myGainsFile<<counter<<"  "<<diffGains[k]<<std::endl;	
+
+  for (int i = 0; i < MAX_SIZE; ++i) {
+    counter = old_index_id[i];
+    myoldgains[i] = old_gains[i];
+
+    for (unsigned int k = 0; k < new_index_id.size() - 1; k++) {
+      counter1 = new_index_id[k];
+      if (counter == counter1) {
+        diffGains[k] = old_gains[i] / 1000. - new_gains[k];
+        myGainsFile << counter << "  " << diffGains[k] << std::endl;
       }
     }
   }
 
-
   //=================== Compare Noise Matrix ===============
-  std::cout<<"Comparing NOISE MATRIX, please wait!"<<std::endl;
+  std::cout << "Comparing NOISE MATRIX, please wait!" << std::endl;
 
-  old_index=0;
-  float old_elem33, old_elem34,old_elem35,old_elem44,old_elem45,old_elem46,old_elem55,old_elem56;
-  float old_elem57,old_elem66,old_elem67,old_elem77;
+  old_index = 0;
+  float old_elem33, old_elem34, old_elem35, old_elem44, old_elem45, old_elem46, old_elem55, old_elem56;
+  float old_elem57, old_elem66, old_elem67, old_elem77;
   old_index_id.clear();
   std::vector<float> old_el33;
   std::vector<float> old_el34;
@@ -319,9 +318,9 @@ Compare::Compare(const edm::ParameterSet& iConfig)
   std::vector<float> old_el67;
   std::vector<float> old_el77;
 
-  new_index=0;
-  float new_elem33,new_elem34,new_elem35,new_elem44,new_elem45,new_elem46,new_elem55,new_elem56;
-  float new_elem57,new_elem66,new_elem67,new_elem77;
+  new_index = 0;
+  float new_elem33, new_elem34, new_elem35, new_elem44, new_elem45, new_elem46, new_elem55, new_elem56;
+  float new_elem57, new_elem66, new_elem67, new_elem77;
   new_index_id.clear();
   std::vector<float> new_el33;
   std::vector<float> new_el34;
@@ -336,7 +335,7 @@ Compare::Compare(const edm::ParameterSet& iConfig)
   std::vector<float> new_el67;
   std::vector<float> new_el77;
 
-  //differences
+  // differences
   std::vector<float> diff_el33;
   std::vector<float> diff_el34;
   std::vector<float> diff_el35;
@@ -350,7 +349,7 @@ Compare::Compare(const edm::ParameterSet& iConfig)
   std::vector<float> diff_el67;
   std::vector<float> diff_el77;
 
-  //old vectors
+  // old vectors
   std::vector<float> myoldel33;
   std::vector<float> myoldel34;
   std::vector<float> myoldel35;
@@ -364,20 +363,21 @@ Compare::Compare(const edm::ParameterSet& iConfig)
   std::vector<float> myoldel67;
   std::vector<float> myoldel77;
 
-  counter=0;
-  counter1=0;
-  //old_nrlines=0;
-  //new_nrlines=0;
-  
-  std::ifstream olddata3; 
-  olddata3.open("old_dbmatrix.dat",std::ios::in); 
-  if(!olddata3) {
-    std::cerr <<"Error: old_dbmatrix.dat -> no such file!"<< std::endl;
+  counter = 0;
+  counter1 = 0;
+  // old_nrlines=0;
+  // new_nrlines=0;
+
+  std::ifstream olddata3;
+  olddata3.open("old_dbmatrix.dat", std::ios::in);
+  if (!olddata3) {
+    std::cerr << "Error: old_dbmatrix.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!olddata3.eof() ) { 
-    olddata3 >> old_index >> old_elem33 >> old_elem34 >> old_elem44 >> old_elem35 >> old_elem45 >> old_elem55 >> old_elem46 >> old_elem56 >>old_elem66 >> old_elem57 >> old_elem67 >> old_elem77 ; 
+
+  while (!olddata3.eof()) {
+    olddata3 >> old_index >> old_elem33 >> old_elem34 >> old_elem44 >> old_elem35 >> old_elem45 >> old_elem55 >>
+        old_elem46 >> old_elem56 >> old_elem66 >> old_elem57 >> old_elem67 >> old_elem77;
     old_index_id.push_back(old_index);
     old_el33.push_back(old_elem33);
     old_el34.push_back(old_elem34);
@@ -391,20 +391,21 @@ Compare::Compare(const edm::ParameterSet& iConfig)
     old_el66.push_back(old_elem66);
     old_el67.push_back(old_elem67);
     old_el77.push_back(old_elem77);
-    //old_nrlines++;
+    // old_nrlines++;
   }
   olddata3.close();
 
   std::ifstream newdata3;
-  std::ofstream myMatrixFile("diffMatrixTest.dat",std::ios::out);
-  newdata3.open("goodMatrix.dat",std::ios::in); 
-  if(!newdata3) {
-    std::cerr <<"Error: goodMatrix.dat -> no such file!"<< std::endl;
+  std::ofstream myMatrixFile("diffMatrixTest.dat", std::ios::out);
+  newdata3.open("goodMatrix.dat", std::ios::in);
+  if (!newdata3) {
+    std::cerr << "Error: goodMatrix.dat -> no such file!" << std::endl;
     exit(1);
   }
-  
-  while (!newdata3.eof() ) { 
-    newdata3 >> new_index >> new_elem33 >> new_elem34 >> new_elem44 >> new_elem35 >> new_elem45 >> new_elem55 >> new_elem46 >> new_elem56 >>new_elem66 >> new_elem57 >> new_elem67 >> new_elem77; 
+
+  while (!newdata3.eof()) {
+    newdata3 >> new_index >> new_elem33 >> new_elem34 >> new_elem44 >> new_elem35 >> new_elem45 >> new_elem55 >>
+        new_elem46 >> new_elem56 >> new_elem66 >> new_elem57 >> new_elem67 >> new_elem77;
     new_index_id.push_back(new_index);
     new_el33.push_back(new_elem33);
     new_el34.push_back(new_elem34);
@@ -418,11 +419,11 @@ Compare::Compare(const edm::ParameterSet& iConfig)
     new_el66.push_back(new_elem66);
     new_el67.push_back(new_elem67);
     new_el77.push_back(new_elem77);
-    //new_nrlines++;
+    // new_nrlines++;
   }
   newdata3.close();
 
-  //resize
+  // resize
   diff_el33.resize(MAX_SIZE);
   diff_el34.resize(MAX_SIZE);
   diff_el35.resize(MAX_SIZE);
@@ -449,87 +450,77 @@ Compare::Compare(const edm::ParameterSet& iConfig)
   myoldel67.resize(MAX_SIZE);
   myoldel77.resize(MAX_SIZE);
 
-  for(int i=0; i<MAX_SIZE;++i){
-    counter=old_index_id[i];  
-    myoldel33[i]=old_el33[i];
-    myoldel34[i]=old_el34[i];
-    myoldel35[i]=old_el35[i];
-    myoldel44[i]=old_el44[i];
-    myoldel45[i]=old_el45[i];
-    myoldel46[i]=old_el46[i];
-    myoldel55[i]=old_el55[i];
-    myoldel56[i]=old_el56[i];
-    myoldel57[i]=old_el57[i];
-    myoldel66[i]=old_el66[i];
-    myoldel67[i]=old_el67[i];
-    myoldel77[i]=old_el77[i];
-    
-    for (unsigned int k=0;k<new_index_id.size()-1;k++){
-      counter1=new_index_id[k];
-      if(counter == counter1){
-	diff_el33[k]=old_el33[i]/1000. - new_el33[k];
-	diff_el34[k]=old_el34[i]/1000. - new_el34[k];
-	diff_el35[k]=old_el35[i]/1000. - new_el35[k];
-	diff_el44[k]=old_el44[i]/1000. - new_el44[k];
-	diff_el45[k]=old_el45[i]/1000. - new_el45[k];
-	diff_el46[k]=old_el46[i]/1000. - new_el46[k];
-	diff_el55[k]=old_el55[i]/1000. - new_el55[k];
-	diff_el56[k]=old_el56[i]/1000. - new_el56[k];
-	diff_el57[k]=old_el57[i]/1000. - new_el57[k];
-	diff_el66[k]=old_el66[i]/1000. - new_el66[k];
-	diff_el67[k]=old_el67[i]/1000. - new_el67[k];
-	diff_el77[k]=old_el77[i]/1000. - new_el77[k];
-	myMatrixFile<<counter<<"  "<<diff_el33[k]<<"  "<< diff_el34[k]<<"  "<<diff_el35[k]<<"  "<<diff_el44[k]<<"  "<<diff_el45[k]<<"  "<<diff_el46[k]<<"  "<<diff_el55[k]<<"  "<<diff_el56[k]<<"  "<<diff_el57[k]<<"  "<<diff_el66[k]<<"  "<<diff_el67[k]<<"  "<<diff_el77[k]<<"  "<<std::endl;	
+  for (int i = 0; i < MAX_SIZE; ++i) {
+    counter = old_index_id[i];
+    myoldel33[i] = old_el33[i];
+    myoldel34[i] = old_el34[i];
+    myoldel35[i] = old_el35[i];
+    myoldel44[i] = old_el44[i];
+    myoldel45[i] = old_el45[i];
+    myoldel46[i] = old_el46[i];
+    myoldel55[i] = old_el55[i];
+    myoldel56[i] = old_el56[i];
+    myoldel57[i] = old_el57[i];
+    myoldel66[i] = old_el66[i];
+    myoldel67[i] = old_el67[i];
+    myoldel77[i] = old_el77[i];
+
+    for (unsigned int k = 0; k < new_index_id.size() - 1; k++) {
+      counter1 = new_index_id[k];
+      if (counter == counter1) {
+        diff_el33[k] = old_el33[i] / 1000. - new_el33[k];
+        diff_el34[k] = old_el34[i] / 1000. - new_el34[k];
+        diff_el35[k] = old_el35[i] / 1000. - new_el35[k];
+        diff_el44[k] = old_el44[i] / 1000. - new_el44[k];
+        diff_el45[k] = old_el45[i] / 1000. - new_el45[k];
+        diff_el46[k] = old_el46[i] / 1000. - new_el46[k];
+        diff_el55[k] = old_el55[i] / 1000. - new_el55[k];
+        diff_el56[k] = old_el56[i] / 1000. - new_el56[k];
+        diff_el57[k] = old_el57[i] / 1000. - new_el57[k];
+        diff_el66[k] = old_el66[i] / 1000. - new_el66[k];
+        diff_el67[k] = old_el67[i] / 1000. - new_el67[k];
+        diff_el77[k] = old_el77[i] / 1000. - new_el77[k];
+        myMatrixFile << counter << "  " << diff_el33[k] << "  " << diff_el34[k] << "  " << diff_el35[k] << "  "
+                     << diff_el44[k] << "  " << diff_el45[k] << "  " << diff_el46[k] << "  " << diff_el55[k] << "  "
+                     << diff_el56[k] << "  " << diff_el57[k] << "  " << diff_el66[k] << "  " << diff_el67[k] << "  "
+                     << diff_el77[k] << "  " << std::endl;
       }
     }
   }
-  std::cout<<"DONE with comparison!"<<std::endl; 
+  std::cout << "DONE with comparison!" << std::endl;
 }
 
-
-Compare::~Compare()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+Compare::~Compare() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-Compare::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace edm;
-
-
+void Compare::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  using namespace edm;
 
 #ifdef THIS_IS_AN_EVENT_EXAMPLE
-   Handle<ExampleData> pIn;
-   iEvent.getByLabel("example",pIn);
+  Handle<ExampleData> pIn;
+  iEvent.getByLabel("example", pIn);
 #endif
-   
+
 #ifdef THIS_IS_AN_EVENTSETUP_EXAMPLE
-   ESHandle<SetupData> pSetup;
-   iSetup.get<SetupRecord>().get(pSetup);
+  ESHandle<SetupData> pSetup;
+  iSetup.get<SetupRecord>().get(pSetup);
 #endif
 }
 
+// ------------ method called once each job just before starting event loop
+// ------------
+void Compare::beginJob() {}
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-Compare::beginJob()
-{
-}
-
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-Compare::endJob() {
-}
+// ------------ method called once each job just after ending the event loop
+// ------------
+void Compare::endJob() {}
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(Compare);
diff --git a/CalibMuon/CSCCalibration/test/testCSCIndexer.cc b/CalibMuon/CSCCalibration/test/testCSCIndexer.cc
index 8c941497bd0b9..b989b9b3c17f3 100644
--- a/CalibMuon/CSCCalibration/test/testCSCIndexer.cc
+++ b/CalibMuon/CSCCalibration/test/testCSCIndexer.cc
@@ -3,25 +3,27 @@
    test unit for CSCIndexers (both CSCIndexerStartup and CSCIndexerPostls1)
 
    What's tested:
-    - full round-trip index conversion test for the full ranges of all the indices
-    - for the ganged case check the equivalence of ME1a input to ME1a WRT the calculation of various indices
+    - full round-trip index conversion test for the full ranges of all the
+   indices
+    - for the ganged case check the equivalence of ME1a input to ME1a WRT the
+   calculation of various indices
     - full comparison of various indices calculation against the old code
 
-   The old indexers with some code adaptations are saved in CalibMuon/CSCCalibration/test/old_indexers/
+   The old indexers with some code adaptations are saved in
+   CalibMuon/CSCCalibration/test/old_indexers/
 
    \author Vadim Khotilovich
    \date 2 Dec 2012
 */
 
-
-#include <cppunit/extensions/HelperMacros.h>
 #include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
+#include <cppunit/extensions/HelperMacros.h>
 
-#include "FWCore/Utilities/interface/Exception.h"
-#include "CalibMuon/CSCCalibration/interface/CSCIndexerStartup.h"
 #include "CalibMuon/CSCCalibration/interface/CSCIndexerPostls1.h"
-#include "CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldStartup.h"
+#include "CalibMuon/CSCCalibration/interface/CSCIndexerStartup.h"
 #include "CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldPostls1.h"
+#include "CalibMuon/CSCCalibration/test/old_indexers/CSCIndexerOldStartup.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
 #include <iostream>
 
@@ -30,9 +32,9 @@ using namespace std;
 typedef CSCIndexerBase::IndexType IndexType;
 typedef CSCIndexerBase::LongIndexType LongIndexType;
 
-// an "external polymolrphism" sort of adapter pattern for making unrelated indexer classes polymorphic
-class IndexerAdapterBase
-{
+// an "external polymolrphism" sort of adapter pattern for making unrelated
+// indexer classes polymorphic
+class IndexerAdapterBase {
 public:
   virtual ~IndexerAdapterBase() {}
   virtual int ringsInStation(int s) = 0;
@@ -48,15 +50,15 @@ class IndexerAdapterBase
 };
 
 template <class INDEXER>
-class IndexerAdapter: public IndexerAdapterBase
-{
+class IndexerAdapter : public IndexerAdapterBase {
   INDEXER indexer;
+
 public:
   int ringsInStation(int s) { return indexer.ringsInStation(s); }
-  int chambersInRingOfStation(int s, int r) { return indexer.chambersInRingOfStation(s,r); }
-  int stripChannelsPerLayer(int s, int r) { return indexer.stripChannelsPerLayer(s,r); }
-  int chipsPerLayer(int s, int r) { return indexer.chipsPerLayer(s,r); }
-  int sectorsPerLayer(int s, int r) { return indexer.sectorsPerLayer(s,r); }
+  int chambersInRingOfStation(int s, int r) { return indexer.chambersInRingOfStation(s, r); }
+  int stripChannelsPerLayer(int s, int r) { return indexer.stripChannelsPerLayer(s, r); }
+  int chipsPerLayer(int s, int r) { return indexer.chipsPerLayer(s, r); }
+  int sectorsPerLayer(int s, int r) { return indexer.sectorsPerLayer(s, r); }
   int chamberIndex(CSCDetId &id) { return indexer.chamberIndex(id); }
   IndexType layerIndex(CSCDetId &id) { return indexer.layerIndex(id); }
   LongIndexType stripChannelIndex(CSCDetId &id, int strip) { return indexer.stripChannelIndex(id, strip); }
@@ -64,11 +66,9 @@ class IndexerAdapter: public IndexerAdapterBase
   IndexType gasGainIndex(int hvseg, int chip, CSCDetId &id) { return indexer.gasGainIndex(hvseg, chip, id); }
 };
 
-
-class testCSCIndexer: public CppUnit::TestFixture
-{
+class testCSCIndexer : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testCSCIndexer);
-  
+
   CPPUNIT_TEST(testStartupChamber);
   CPPUNIT_TEST(testStartupLayer);
   CPPUNIT_TEST(testStartupStripChannel);
@@ -90,7 +90,7 @@ class testCSCIndexer: public CppUnit::TestFixture
   CPPUNIT_TEST(testStartupAgainstOldCode);
   CPPUNIT_TEST(testPostls1AgainstOldCode);
 
-  //CPPUNIT_TEST(testFail);
+  // CPPUNIT_TEST(testFail);
 
   CPPUNIT_TEST_SUITE_END();
 
@@ -102,11 +102,16 @@ class testCSCIndexer: public CppUnit::TestFixture
   IndexerAdapter<CSCIndexerOldStartup> *indexer_old_startup_;
   IndexerAdapter<CSCIndexerOldPostls1> *indexer_old_postls1_;
 
-  void modeStartup() { indexer_ = indexer_startup_; indexer_old_ = indexer_old_startup_; }
-  void modePostls1() { indexer_ = indexer_postls1_; indexer_old_ = indexer_old_postls1_; }
+  void modeStartup() {
+    indexer_ = indexer_startup_;
+    indexer_old_ = indexer_old_startup_;
+  }
+  void modePostls1() {
+    indexer_ = indexer_postls1_;
+    indexer_old_ = indexer_old_postls1_;
+  }
 
 public:
-
   void setUp();
   void tearDown();
 
@@ -115,19 +120,49 @@ class testCSCIndexer: public CppUnit::TestFixture
   void testStripChannel();
   void testChip();
   void testGasGain();
-  //void testFail();
+  // void testFail();
 
-  void testStartupChamber()      { modeStartup(); testChamber(); }
-  void testStartupLayer()        { modeStartup(); testLayer(); }
-  void testStartupStripChannel() { modeStartup(); testStripChannel(); }
-  void testStartupChip()         { modeStartup(); testChip(); }
-  void testStartupGasGain()      { modeStartup(); testGasGain(); }
+  void testStartupChamber() {
+    modeStartup();
+    testChamber();
+  }
+  void testStartupLayer() {
+    modeStartup();
+    testLayer();
+  }
+  void testStartupStripChannel() {
+    modeStartup();
+    testStripChannel();
+  }
+  void testStartupChip() {
+    modeStartup();
+    testChip();
+  }
+  void testStartupGasGain() {
+    modeStartup();
+    testGasGain();
+  }
 
-  void testPostls1Chamber()      { modePostls1(); testChamber(); }
-  void testPostls1Layer()        { modePostls1(); testLayer(); }
-  void testPostls1StripChannel() { modePostls1(); testStripChannel(); }
-  void testPostls1Chip()         { modePostls1(); testChip(); }
-  void testPostls1GasGain()      { modePostls1(); testGasGain(); }
+  void testPostls1Chamber() {
+    modePostls1();
+    testChamber();
+  }
+  void testPostls1Layer() {
+    modePostls1();
+    testLayer();
+  }
+  void testPostls1StripChannel() {
+    modePostls1();
+    testStripChannel();
+  }
+  void testPostls1Chip() {
+    modePostls1();
+    testChip();
+  }
+  void testPostls1GasGain() {
+    modePostls1();
+    testGasGain();
+  }
 
   void testStartupChamberME1a();
   void testStartupLayerME1a();
@@ -135,18 +170,22 @@ class testCSCIndexer: public CppUnit::TestFixture
   void testStartupChipME1a();
   void testStartupGasGainME1a();
 
-  void testStartupAgainstOldCode() { modeStartup(); testAgainstOldCode(); }
-  void testPostls1AgainstOldCode() { modePostls1(); testAgainstOldCode(); }
+  void testStartupAgainstOldCode() {
+    modeStartup();
+    testAgainstOldCode();
+  }
+  void testPostls1AgainstOldCode() {
+    modePostls1();
+    testAgainstOldCode();
+  }
 
   void testAgainstOldCode();
 };
 
-///registration of the test so that the runner can find it
+/// registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testCSCIndexer);
 
-
-void testCSCIndexer::setUp()
-{
+void testCSCIndexer::setUp() {
   indexer_ = nullptr;
   indexer_startup_ = new CSCIndexerStartup();
   indexer_postls1_ = new CSCIndexerPostls1();
@@ -156,22 +195,17 @@ void testCSCIndexer::setUp()
   indexer_old_postls1_ = new IndexerAdapter<CSCIndexerOldPostls1>();
 }
 
-
-void testCSCIndexer::tearDown()
-{
+void testCSCIndexer::tearDown() {
   delete indexer_startup_;
   delete indexer_postls1_;
   delete indexer_old_startup_;
   delete indexer_old_postls1_;
 }
 
+void testCSCIndexer::testChamber() {
+  // std::cout << "\ntestCSCIndexer: testChamber starting... " << std::endl;
 
-void testCSCIndexer::testChamber()
-{
-  //std::cout << "\ntestCSCIndexer: testChamber starting... " << std::endl;
-
-  for (LongIndexType i = 1; i <= indexer_->maxChamberIndex(); ++i)
-  {
+  for (LongIndexType i = 1; i <= indexer_->maxChamberIndex(); ++i) {
     CSCDetId id = indexer_->detIdFromChamberIndex(i);
     int ie = id.endcap();
     int is = id.station();
@@ -179,8 +213,10 @@ void testCSCIndexer::testChamber()
     int ic = id.chamber();
     IndexType ii = indexer_->chamberIndex(id);
 
-    if (i != ii) cout<<" BAD CHAMBER INDEX: "<<i<<" != "<<ii<<" \t   ("<<ie<<" "<<is<<" "<<ir<<" "<<ic<<")"<<endl;
-    CPPUNIT_ASSERT(i == ii);   // loop-back index test
+    if (i != ii)
+      cout << " BAD CHAMBER INDEX: " << i << " != " << ii << " \t   (" << ie << " " << is << " " << ir << " " << ic
+           << ")" << endl;
+    CPPUNIT_ASSERT(i == ii);  // loop-back index test
     CPPUNIT_ASSERT(ie >= 1 && ie <= 2);
     CPPUNIT_ASSERT(is >= 1 && is <= 4);
     CPPUNIT_ASSERT(ir >= 1 && ir <= indexer_->offlineRingsInStation(is));
@@ -188,13 +224,10 @@ void testCSCIndexer::testChamber()
   }
 }
 
+void testCSCIndexer::testLayer() {
+  // std::cout << "\ntestCSCIndexer: testLayer starting... " << std::endl;
 
-void testCSCIndexer::testLayer()
-{
-  //std::cout << "\ntestCSCIndexer: testLayer starting... " << std::endl;
-
-  for (LongIndexType i = 1; i <= indexer_->maxLayerIndex(); ++i)
-  {
+  for (LongIndexType i = 1; i <= indexer_->maxLayerIndex(); ++i) {
     CSCDetId id = indexer_->detIdFromLayerIndex(i);
     int ie = id.endcap();
     int is = id.station();
@@ -203,8 +236,10 @@ void testCSCIndexer::testLayer()
     int il = id.layer();
     IndexType ii = indexer_->layerIndex(id);
 
-    if (i != ii) cout<<" BAD LAYER INDEX: "<<i<<" != "<<ii<<" \t   ("<<ie<<" "<<is<<" "<<ir<<" "<<ic<<" "<<il<<")"<<endl;
-    CPPUNIT_ASSERT(i == ii);   // loop-back index test
+    if (i != ii)
+      cout << " BAD LAYER INDEX: " << i << " != " << ii << " \t   (" << ie << " " << is << " " << ir << " " << ic << " "
+           << il << ")" << endl;
+    CPPUNIT_ASSERT(i == ii);  // loop-back index test
     CPPUNIT_ASSERT(ie >= 1 && ie <= 2);
     CPPUNIT_ASSERT(is >= 1 && is <= 4);
     CPPUNIT_ASSERT(ir >= 1 && ir <= indexer_->offlineRingsInStation(is));
@@ -213,13 +248,11 @@ void testCSCIndexer::testLayer()
   }
 }
 
+void testCSCIndexer::testStripChannel() {
+  // std::cout << "\ntestCSCIndexer: testStripChannel starting... " <<
+  // std::endl;
 
-void testCSCIndexer::testStripChannel()
-{
-  //std::cout << "\ntestCSCIndexer: testStripChannel starting... " << std::endl;
-
-  for (LongIndexType i = 1; i <= indexer_->maxStripChannelIndex(); ++i)
-  {
+  for (LongIndexType i = 1; i <= indexer_->maxStripChannelIndex(); ++i) {
     std::pair<CSCDetId, CSCIndexerBase::IndexType> t = indexer_->detIdFromStripChannelIndex(i);
     CSCDetId id = t.first;
     int ie = id.endcap();
@@ -230,8 +263,10 @@ void testCSCIndexer::testStripChannel()
     int st = t.second;
     LongIndexType ii = indexer_->stripChannelIndex(id, st);
 
-    if (i != ii) cout<<" BAD STRIPCHANNEL INDEX: "<<i<<" != "<<ii<<" \t   ("<<ie<<" "<<is<<" "<<ir<<" "<<ic<<" "<<il<<") "<<st<<endl;
-    CPPUNIT_ASSERT(i == ii);   // loop-back index test
+    if (i != ii)
+      cout << " BAD STRIPCHANNEL INDEX: " << i << " != " << ii << " \t   (" << ie << " " << is << " " << ir << " " << ic
+           << " " << il << ") " << st << endl;
+    CPPUNIT_ASSERT(i == ii);  // loop-back index test
     CPPUNIT_ASSERT(ie >= 1 && ie <= 2);
     CPPUNIT_ASSERT(is >= 1 && is <= 4);
     CPPUNIT_ASSERT(ir >= 1 && ir <= indexer_->offlineRingsInStation(is));
@@ -241,13 +276,10 @@ void testCSCIndexer::testStripChannel()
   }
 }
 
+void testCSCIndexer::testChip() {
+  // std::cout << "\ntestCSCIndexer: testChip starting... " << std::endl;
 
-void testCSCIndexer::testChip()
-{
-  //std::cout << "\ntestCSCIndexer: testChip starting... " << std::endl;
-
-  for (IndexType i = 1; i <= indexer_->maxChipIndex(); ++i)
-  {
+  for (IndexType i = 1; i <= indexer_->maxChipIndex(); ++i) {
     std::pair<CSCDetId, IndexType> t = indexer_->detIdFromChipIndex(i);
     CSCDetId id = t.first;
     int ie = id.endcap();
@@ -258,8 +290,10 @@ void testCSCIndexer::testChip()
     int ch = t.second;
     IndexType ii = indexer_->chipIndex(id, ch);
 
-    if (i != ii) cout<<" BAD CHIP INDEX: "<<i<<" != "<<ii<<" \t   ("<<ie<<" "<<is<<" "<<ir<<" "<<ic<<" "<<il<<") "<<ch<<endl;
-    CPPUNIT_ASSERT(i == ii);   // loop-back index test
+    if (i != ii)
+      cout << " BAD CHIP INDEX: " << i << " != " << ii << " \t   (" << ie << " " << is << " " << ir << " " << ic << " "
+           << il << ") " << ch << endl;
+    CPPUNIT_ASSERT(i == ii);  // loop-back index test
     CPPUNIT_ASSERT(ie >= 1 && ie <= 2);
     CPPUNIT_ASSERT(is >= 1 && is <= 4);
     CPPUNIT_ASSERT(ir >= 1 && ir <= indexer_->offlineRingsInStation(is));
@@ -269,13 +303,10 @@ void testCSCIndexer::testChip()
   }
 }
 
+void testCSCIndexer::testGasGain() {
+  // std::cout << "\ntestCSCIndexer: testGasGain starting... " << std::endl;
 
-void testCSCIndexer::testGasGain()
-{
-  //std::cout << "\ntestCSCIndexer: testGasGain starting... " << std::endl;
-
-  for (IndexType i = 1; i <= indexer_->maxGasGainIndex() ; ++i)
-  {
+  for (IndexType i = 1; i <= indexer_->maxGasGainIndex(); ++i) {
     CSCIndexerBase::GasGainIndexType t = indexer_->detIdFromGasGainIndex(i);
     CSCDetId id = t.get<0>();
     int ie = id.endcap();
@@ -287,8 +318,10 @@ void testCSCIndexer::testGasGain()
     int ch = t.get<2>();
     IndexType ii = indexer_->gasGainIndex(hv, ch, id);
 
-    if (i != ii) cout<<" BAD GASGAIN INDEX: "<<i<<" != "<<ii<<" \t   ("<<ie<<" "<<is<<" "<<ir<<" "<<ic<<" "<<il<<") "<<hv<<" "<<ch<<endl;
-    CPPUNIT_ASSERT(i == ii);   // loop-back index test
+    if (i != ii)
+      cout << " BAD GASGAIN INDEX: " << i << " != " << ii << " \t   (" << ie << " " << is << " " << ir << " " << ic
+           << " " << il << ") " << hv << " " << ch << endl;
+    CPPUNIT_ASSERT(i == ii);  // loop-back index test
     CPPUNIT_ASSERT(ie >= 1 && ie <= 2);
     CPPUNIT_ASSERT(is >= 1 && is <= 4);
     CPPUNIT_ASSERT(ir >= 1 && ir <= indexer_->offlineRingsInStation(is));
@@ -299,104 +332,84 @@ void testCSCIndexer::testGasGain()
   }
 }
 
-
-void testCSCIndexer::testStartupChamberME1a()
-{
+void testCSCIndexer::testStartupChamberME1a() {
   modeStartup();
-  const CSCDetId id_me1a(1,1,4,1);
-  const CSCDetId id_me1b(1,1,1,1);
-  CPPUNIT_ASSERT(indexer_->chamberIndex(id_me1a) == indexer_->chamberIndex(id_me1b) );
+  const CSCDetId id_me1a(1, 1, 4, 1);
+  const CSCDetId id_me1b(1, 1, 1, 1);
+  CPPUNIT_ASSERT(indexer_->chamberIndex(id_me1a) == indexer_->chamberIndex(id_me1b));
 }
 
-
-void testCSCIndexer::testStartupLayerME1a()
-{
+void testCSCIndexer::testStartupLayerME1a() {
   modeStartup();
-  const CSCDetId id_me1a(1,1,4,1,2);
-  const CSCDetId id_me1b(1,1,1,1,2);
-  CPPUNIT_ASSERT(indexer_->layerIndex(id_me1a) == indexer_->layerIndex(id_me1b) );
+  const CSCDetId id_me1a(1, 1, 4, 1, 2);
+  const CSCDetId id_me1b(1, 1, 1, 1, 2);
+  CPPUNIT_ASSERT(indexer_->layerIndex(id_me1a) == indexer_->layerIndex(id_me1b));
 }
 
-
-void testCSCIndexer::testStartupStripChannelME1a()
-{
+void testCSCIndexer::testStartupStripChannelME1a() {
   modeStartup();
-  const CSCDetId id_me1a(1,1,4,1,2);
-  const CSCDetId id_me1b(1,1,1,1,2);
+  const CSCDetId id_me1a(1, 1, 4, 1, 2);
+  const CSCDetId id_me1b(1, 1, 1, 1, 2);
   const IndexType istrip = 66;
-  CPPUNIT_ASSERT(indexer_->stripChannelIndex(id_me1a, istrip) == indexer_->stripChannelIndex(id_me1b, istrip) );
+  CPPUNIT_ASSERT(indexer_->stripChannelIndex(id_me1a, istrip) == indexer_->stripChannelIndex(id_me1b, istrip));
 }
 
-
-void testCSCIndexer::testStartupChipME1a()
-{
+void testCSCIndexer::testStartupChipME1a() {
   modeStartup();
-  const CSCDetId id_me1a(1,1,4,1,2);
-  const CSCDetId id_me1b(1,1,1,1,2);
+  const CSCDetId id_me1a(1, 1, 4, 1, 2);
+  const CSCDetId id_me1b(1, 1, 1, 1, 2);
   const IndexType ichip = 5;
-  CPPUNIT_ASSERT(indexer_->chipIndex(id_me1a, ichip) == indexer_->chipIndex(id_me1b, ichip) );
+  CPPUNIT_ASSERT(indexer_->chipIndex(id_me1a, ichip) == indexer_->chipIndex(id_me1b, ichip));
 }
 
-
-void testCSCIndexer::testStartupGasGainME1a()
-{
+void testCSCIndexer::testStartupGasGainME1a() {
   modeStartup();
-  const CSCDetId id_me1a(1,1,4,1,2);
-  const CSCDetId id_me1b(1,1,1,1,2);
+  const CSCDetId id_me1a(1, 1, 4, 1, 2);
+  const CSCDetId id_me1b(1, 1, 1, 1, 2);
   const IndexType istrip = 66;
   const IndexType iwire = 4;
-  CPPUNIT_ASSERT(indexer_->gasGainIndex(id_me1a, istrip, iwire) == indexer_->gasGainIndex(id_me1b, istrip, iwire) );
+  CPPUNIT_ASSERT(indexer_->gasGainIndex(id_me1a, istrip, iwire) == indexer_->gasGainIndex(id_me1b, istrip, iwire));
 }
 
-
-void testCSCIndexer::testAgainstOldCode()
-{
+void testCSCIndexer::testAgainstOldCode() {
   for (int e = 1; e <= 2; ++e)
-    for (int s = 1; s <= 4; ++s)
-    {
+    for (int s = 1; s <= 4; ++s) {
       int rmax = indexer_->ringsInStation(s);
-      CPPUNIT_ASSERT(rmax == indexer_old_->ringsInStation(s) );
+      CPPUNIT_ASSERT(rmax == indexer_old_->ringsInStation(s));
 
-      if (s == 1 && indexer_->name() == "CSCIndexerPostls1") rmax = 4;
+      if (s == 1 && indexer_->name() == "CSCIndexerPostls1")
+        rmax = 4;
 
-      for ( int r = 1; r <= rmax; ++r )
-      {
+      for (int r = 1; r <= rmax; ++r) {
         int cmax = indexer_->chambersInRingOfStation(s, r);
-        CPPUNIT_ASSERT(cmax == indexer_old_->chambersInRingOfStation(s, r) );
+        CPPUNIT_ASSERT(cmax == indexer_old_->chambersInRingOfStation(s, r));
 
-        CPPUNIT_ASSERT(indexer_->stripChannelsPerLayer(s, r) ==
-                       indexer_old_->stripChannelsPerLayer(s, r) );
+        CPPUNIT_ASSERT(indexer_->stripChannelsPerLayer(s, r) == indexer_old_->stripChannelsPerLayer(s, r));
         int stripmax = indexer_->stripChannelsPerOnlineLayer(s, r);
 
-        CPPUNIT_ASSERT(indexer_->chipsPerLayer(s, r) ==
-                       indexer_old_->chipsPerLayer(s, r) );
+        CPPUNIT_ASSERT(indexer_->chipsPerLayer(s, r) == indexer_old_->chipsPerLayer(s, r));
         int chipmax = indexer_->chipsPerOnlineLayer(s, r);
 
-        CPPUNIT_ASSERT(indexer_->sectorsPerLayer(s, r) == indexer_old_->sectorsPerLayer(s, r) );
+        CPPUNIT_ASSERT(indexer_->sectorsPerLayer(s, r) == indexer_old_->sectorsPerLayer(s, r));
         int hvsegmax = indexer_->sectorsPerOnlineLayer(s, r);
 
-        for ( int c = 1; c <= cmax; ++c )
-        {
-          CSCDetId cid(e,s,r,c);
-          CPPUNIT_ASSERT( indexer_->chamberIndex(cid) == indexer_old_->chamberIndex(cid));
+        for (int c = 1; c <= cmax; ++c) {
+          CSCDetId cid(e, s, r, c);
+          CPPUNIT_ASSERT(indexer_->chamberIndex(cid) == indexer_old_->chamberIndex(cid));
 
-          for ( int l = 1; l <= 6; ++l )
-          {
-            CSCDetId id(e,s,r,c,l);
-            CPPUNIT_ASSERT( indexer_->layerIndex(id) == indexer_old_->layerIndex(id));
+          for (int l = 1; l <= 6; ++l) {
+            CSCDetId id(e, s, r, c, l);
+            CPPUNIT_ASSERT(indexer_->layerIndex(id) == indexer_old_->layerIndex(id));
 
-            for (int strip = 1; strip <= stripmax; ++strip)
-            {
-              CPPUNIT_ASSERT( indexer_->stripChannelIndex(id, strip) == indexer_old_->stripChannelIndex(id, strip));
+            for (int strip = 1; strip <= stripmax; ++strip) {
+              CPPUNIT_ASSERT(indexer_->stripChannelIndex(id, strip) == indexer_old_->stripChannelIndex(id, strip));
             }
 
-            for (int chip = 1; chip <= chipmax; ++chip)
-            {
-              CPPUNIT_ASSERT( indexer_->chipIndex(id, chip) == indexer_old_->chipIndex(id, chip));
+            for (int chip = 1; chip <= chipmax; ++chip) {
+              CPPUNIT_ASSERT(indexer_->chipIndex(id, chip) == indexer_old_->chipIndex(id, chip));
 
-              for (int hvseg = 1; hvseg <= hvsegmax; ++hvseg)
-              {
-                CPPUNIT_ASSERT( indexer_->gasGainIndex(hvseg, chip, id) == indexer_old_->gasGainIndex(hvseg, chip, id));
+              for (int hvseg = 1; hvseg <= hvsegmax; ++hvseg) {
+                CPPUNIT_ASSERT(indexer_->gasGainIndex(hvseg, chip, id) == indexer_old_->gasGainIndex(hvseg, chip, id));
               }
             }
           }
@@ -407,21 +420,22 @@ void testCSCIndexer::testAgainstOldCode()
 
 /*
 void testCSCIndexer::testFail(){
-  
+
   // std::cout << "\ntestCSCIndexer: testFail starting... " << std::endl;
 
   // construct using an invalid input index
   try {
     // Invalid layer
     CSCDetId detid(3,1,1,1,7);
-    CPPUNIT_ASSERT("Failed to throw required exception" == 0); 
+    CPPUNIT_ASSERT("Failed to throw required exception" == 0);
     detid.rawId(); // avoid compiler warning
   } catch (cms::Exception& e) {
-    //    std::cout << "\ntestCSCDetId: testFail exception caught " << std::endl;
+    //    std::cout << "\ntestCSCDetId: testFail exception caught " <<
+std::endl;
     // OK
   } catch (...) {
     CPPUNIT_ASSERT("Threw wrong kind of exception" == 0);
   }
-  
+
 }
 */
diff --git a/CalibMuon/DTDigiSync/interface/DTTTrigBaseSync.h b/CalibMuon/DTDigiSync/interface/DTTTrigBaseSync.h
index daa32cf35f19d..750b313c72355 100644
--- a/CalibMuon/DTDigiSync/interface/DTTTrigBaseSync.h
+++ b/CalibMuon/DTDigiSync/interface/DTTTrigBaseSync.h
@@ -16,7 +16,6 @@ namespace edm {
   class EventSetup;
 }
 
-
 class DTTTrigBaseSync {
 public:
   /// Constructor
@@ -30,20 +29,15 @@ class DTTTrigBaseSync {
   /// Pass the Event Setup to the synchronization module at each event
   virtual void setES(const edm::EventSetup& setup) = 0;
 
-
-
   /// Time (ns) to be subtracted to the digi time.
   /// Parameters are the layer and the wireId to which the
   /// digi is referred and the estimation of
-  /// the 3D hit position (globPos) 
-  double offset(const DTLayer* layer,
-		const DTWireId& wireId,
-		const GlobalPoint& globalPos) const;
+  /// the 3D hit position (globPos)
+  double offset(const DTLayer* layer, const DTWireId& wireId, const GlobalPoint& globalPos) const;
 
   /// Time (ns) to be subtracted to the digi time.
   /// It does not take into account TOF and signal propagation along the wire
-  virtual double offset(const DTWireId& wireId) const = 0 ;
-
+  virtual double offset(const DTWireId& wireId) const = 0;
 
   /// Time to be subtracted to the digi time,
   /// Parameters are the layer and the wireId to which the
@@ -54,12 +48,11 @@ class DTTTrigBaseSync {
   ///     - wirePropCorr is the delay for signal propagation along the wire
   ///     - tofCorr is the correction due to the particle TOF
   virtual double offset(const DTLayer* layer,
-			const DTWireId& wireId,
-			const GlobalPoint& globalPos,
-			double &tTrig,
-			double& wirePropCorr,
-			double& tofCorr) const = 0;
-
+                        const DTWireId& wireId,
+                        const GlobalPoint& globalPos,
+                        double& tTrig,
+                        double& wirePropCorr,
+                        double& tofCorr) const = 0;
 
   /// Time (ns) to be subtracted to the digi time for emulation purposes
   /// It does not take into account TOF and signal propagation along the wire
@@ -70,11 +63,6 @@ class DTTTrigBaseSync {
   /// It also returns the different contributions separately:
   ///     - tTrig is the offset (t_trig)
   ///     - t0cell is the t0 from pulses
-  virtual double emulatorOffset(const DTWireId& wireId,
-				double &tTrig,
-				double &t0cell) const = 0;
-  
-
+  virtual double emulatorOffset(const DTWireId& wireId, double& tTrig, double& t0cell) const = 0;
 };
 #endif
-
diff --git a/CalibMuon/DTDigiSync/interface/DTTTrigSyncFactory.h b/CalibMuon/DTDigiSync/interface/DTTTrigSyncFactory.h
index 125f258e91e3b..d356b2923531c 100644
--- a/CalibMuon/DTDigiSync/interface/DTTTrigSyncFactory.h
+++ b/CalibMuon/DTDigiSync/interface/DTTTrigSyncFactory.h
@@ -16,4 +16,3 @@ class DTTTrigBaseSync;
 
 typedef edmplugin::PluginFactory<DTTTrigBaseSync *(const edm::ParameterSet &)> DTTTrigSyncFactory;
 #endif
-
diff --git a/CalibMuon/DTDigiSync/src/DTTTrigBaseSync.cc b/CalibMuon/DTDigiSync/src/DTTTrigBaseSync.cc
index f9371fe8d4570..cd0e9c4512185 100644
--- a/CalibMuon/DTDigiSync/src/DTTTrigBaseSync.cc
+++ b/CalibMuon/DTDigiSync/src/DTTTrigBaseSync.cc
@@ -6,28 +6,18 @@
 
 #include "CalibMuon/DTDigiSync/interface/DTTTrigBaseSync.h"
 
+DTTTrigBaseSync::DTTTrigBaseSync() {}
 
-DTTTrigBaseSync::DTTTrigBaseSync(){}
+DTTTrigBaseSync::~DTTTrigBaseSync() {}
 
-
-
-DTTTrigBaseSync::~DTTTrigBaseSync(){}
-
-
-
-double DTTTrigBaseSync::offset(const DTLayer* layer,
-			       const DTWireId& wireId,
-			       const GlobalPoint& globalPos) const {
+double DTTTrigBaseSync::offset(const DTLayer* layer, const DTWireId& wireId, const GlobalPoint& globalPos) const {
   double tTrig = 0;
   double wireProp = 0;
   double tof = 0;
   return offset(layer, wireId, globalPos, tTrig, wireProp, tof);
 }
 
-
-
 double DTTTrigBaseSync::emulatorOffset(const DTWireId& wireId) const {
-
   double tTrig = 0.;
   double t0cell = 0.;
   return emulatorOffset(wireId, tTrig, t0cell);
diff --git a/CalibMuon/DTDigiSync/src/DTTTrigSyncFactory.cc b/CalibMuon/DTDigiSync/src/DTTTrigSyncFactory.cc
index 1a637f67144c9..8d47050e0386c 100644
--- a/CalibMuon/DTDigiSync/src/DTTTrigSyncFactory.cc
+++ b/CalibMuon/DTDigiSync/src/DTTTrigSyncFactory.cc
@@ -7,5 +7,4 @@
 
 #include "CalibMuon/DTDigiSync/interface/DTTTrigSyncFactory.h"
 
-EDM_REGISTER_PLUGINFACTORY(DTTTrigSyncFactory,"DTTTrigSyncFactory");
-
+EDM_REGISTER_PLUGINFACTORY(DTTTrigSyncFactory, "DTTTrigSyncFactory");
diff --git a/CalibMuon/DTDigiSync/src/DTTTrigSyncFromDB.cc b/CalibMuon/DTDigiSync/src/DTTTrigSyncFromDB.cc
index 8176515b7d07c..1db173a8ba8b3 100644
--- a/CalibMuon/DTDigiSync/src/DTTTrigSyncFromDB.cc
+++ b/CalibMuon/DTDigiSync/src/DTTTrigSyncFromDB.cc
@@ -6,7 +6,6 @@
 
 #include "DTTTrigSyncFromDB.h"
 
-
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -23,59 +22,50 @@
 using namespace std;
 using namespace edm;
 
-
 DTTTrigSyncFromDB::DTTTrigSyncFromDB(const ParameterSet& config)
-:  debug(config.getUntrackedParameter<bool>("debug")),
-  // The velocity of signal propagation along the wire (cm/ns)
-  theVPropWire(config.getParameter<double>("vPropWire")),
-  // Switch on/off the T0 correction from pulses
-  doT0Correction(config.getParameter<bool>("doT0Correction")),
-  // Switch on/off the TOF correction for particles from IP
-  doTOFCorrection(config.getParameter<bool>("doTOFCorrection")),
-  theTOFCorrType(config.getParameter<int>("tofCorrType")),
-  // Switch on/off the correction for the signal propagation along the wire
-  doWirePropCorrection(config.getParameter<bool>("doWirePropCorrection")),
-  theWirePropCorrType(config.getParameter<int>("wirePropCorrType")),
-  // spacing of BX in ns
-  theBXspace(config.getUntrackedParameter<double>("bxSpace", 25.)),
-  thetTrigLabel(config.getParameter<string>("tTrigLabel"))
-{
-}
-
-
-
-DTTTrigSyncFromDB::~DTTTrigSyncFromDB(){}
-
-
+    : debug(config.getUntrackedParameter<bool>("debug")),
+      // The velocity of signal propagation along the wire (cm/ns)
+      theVPropWire(config.getParameter<double>("vPropWire")),
+      // Switch on/off the T0 correction from pulses
+      doT0Correction(config.getParameter<bool>("doT0Correction")),
+      // Switch on/off the TOF correction for particles from IP
+      doTOFCorrection(config.getParameter<bool>("doTOFCorrection")),
+      theTOFCorrType(config.getParameter<int>("tofCorrType")),
+      // Switch on/off the correction for the signal propagation along the wire
+      doWirePropCorrection(config.getParameter<bool>("doWirePropCorrection")),
+      theWirePropCorrType(config.getParameter<int>("wirePropCorrType")),
+      // spacing of BX in ns
+      theBXspace(config.getUntrackedParameter<double>("bxSpace", 25.)),
+      thetTrigLabel(config.getParameter<string>("tTrigLabel")) {}
+
+DTTTrigSyncFromDB::~DTTTrigSyncFromDB() {}
 
 void DTTTrigSyncFromDB::setES(const EventSetup& setup) {
-  if(doT0Correction)
-    {
-      // Get the map of t0 from pulses from the Setup
-      ESHandle<DTT0> t0Handle;
-      setup.get<DTT0Rcd>().get(t0Handle);
-      tZeroMap = &*t0Handle;
-      if(debug) {
-	cout << "[DTTTrigSyncFromDB] t0 version: " << tZeroMap->version()<<endl;
-	  }
+  if (doT0Correction) {
+    // Get the map of t0 from pulses from the Setup
+    ESHandle<DTT0> t0Handle;
+    setup.get<DTT0Rcd>().get(t0Handle);
+    tZeroMap = &*t0Handle;
+    if (debug) {
+      cout << "[DTTTrigSyncFromDB] t0 version: " << tZeroMap->version() << endl;
     }
+  }
 
   // Get the map of ttrig from the Setup
   ESHandle<DTTtrig> ttrigHandle;
-  setup.get<DTTtrigRcd>().get(thetTrigLabel,ttrigHandle);
+  setup.get<DTTtrigRcd>().get(thetTrigLabel, ttrigHandle);
   tTrigMap = &*ttrigHandle;
-    if(debug) {
-      cout << "[DTTTrigSyncFromDB] ttrig version: " << tTrigMap->version() << endl;
+  if (debug) {
+    cout << "[DTTTrigSyncFromDB] ttrig version: " << tTrigMap->version() << endl;
   }
 }
 
-
 double DTTTrigSyncFromDB::offset(const DTLayer* layer,
-				  const DTWireId& wireId,
-				  const GlobalPoint& globPos,
-				  double& tTrig,
-				  double& wirePropCorr,
-				  double& tofCorr) const {
+                                 const DTWireId& wireId,
+                                 const GlobalPoint& globPos,
+                                 double& tTrig,
+                                 double& wirePropCorr,
+                                 double& tofCorr) const {
   // Correction for the float to int conversion while writeing the ttrig in ns into an int variable
   // (half a bin on average)
   // FIXME: this should disappear as soon as the ttrig object will become a float
@@ -84,151 +74,126 @@ double DTTTrigSyncFromDB::offset(const DTLayer* layer,
   tTrig = offset(wireId);
 
   // Compute the time spent in signal propagation along wire.
-   // NOTE: the FE is always at y>0
+  // NOTE: the FE is always at y>0
   wirePropCorr = 0;
-  if(doWirePropCorrection) {
-    switch(theWirePropCorrType){
-      // The ttrig computed from the timebox accounts on average for the signal propagation time
-      // from the center of the wire to the frontend. Here we just have to correct for
-      // the distance of the hit from the wire center.
-    case 0: {
-      float wireCoord = layer->toLocal(globPos).y();
-      wirePropCorr = -wireCoord/theVPropWire;
-      break;
-      // FIXME: What if hits used for the time box are not distributed uniformly along the wire?
-    }
-    //On simulated data you need to subtract the total propagation time 
-    case 1: {
-      float halfL     = layer->specificTopology().cellLenght()/2;
-      float wireCoord = layer->toLocal(globPos).y();
-      float propgL    = halfL - wireCoord;
-      wirePropCorr = propgL/theVPropWire;
-      break;
-    }
-    default: {
-    throw
-      cms::Exception("[DTTTrigSyncFromDB]") << " Invalid parameter: wirePropCorrType = "
-					     << theWirePropCorrType 
-					     << std::endl;
-    break;
-    }
+  if (doWirePropCorrection) {
+    switch (theWirePropCorrType) {
+        // The ttrig computed from the timebox accounts on average for the signal propagation time
+        // from the center of the wire to the frontend. Here we just have to correct for
+        // the distance of the hit from the wire center.
+      case 0: {
+        float wireCoord = layer->toLocal(globPos).y();
+        wirePropCorr = -wireCoord / theVPropWire;
+        break;
+        // FIXME: What if hits used for the time box are not distributed uniformly along the wire?
+      }
+      //On simulated data you need to subtract the total propagation time
+      case 1: {
+        float halfL = layer->specificTopology().cellLenght() / 2;
+        float wireCoord = layer->toLocal(globPos).y();
+        float propgL = halfL - wireCoord;
+        wirePropCorr = propgL / theVPropWire;
+        break;
+      }
+      default: {
+        throw cms::Exception("[DTTTrigSyncFromDB]")
+            << " Invalid parameter: wirePropCorrType = " << theWirePropCorrType << std::endl;
+        break;
+      }
     }
   }
 
   // Compute TOF correction:
   tofCorr = 0.;
   // TOF Correction can be switched off with appropriate parameter
-  if(doTOFCorrection) {
+  if (doTOFCorrection) {
     float flightToHit = globPos.mag();
-    static const float cSpeed = 29.9792458; // cm/ns
-    switch(theTOFCorrType) {
-    case 0: {
-      // The ttrig computed from the real data accounts on average for the TOF correction 
-      // Depending on the granularity used for the ttrig computation we just have to correct for the
-      // TOF from the center of the chamber, SL, layer or wire to the hit position.
-      // At the moment only SL granularity is considered
-      // Correction for TOF from the center of the SL to hit position
-      const DTSuperLayer *sl = layer->superLayer();
-      double flightToSL = sl->surface().position().mag();
-      tofCorr = (flightToSL-flightToHit)/cSpeed;
-      break;
-    }
-    case 1: {
-      // On simulated data you need to consider only the TOF from 3D center of the wire to hit position 
-      // (because the TOF from the IP to the wire has been already subtracted in the digitization: 
-      // SimMuon/DTDigitizer/DTDigiSyncTOFCorr.cc corrType=2)
-      float flightToWire =
-	layer->toGlobal(LocalPoint(layer->specificTopology().wirePosition(wireId.wire()), 0., 0.)).mag();
-      tofCorr = (flightToWire-flightToHit)/cSpeed;
-      break;
-    }
-    default: {
-      throw
-	cms::Exception("[DTTTrigSyncFromDB]") << " Invalid parameter: tofCorrType = "
-					      << theTOFCorrType 
-					      << std::endl;
-      break;
-    }
+    static const float cSpeed = 29.9792458;  // cm/ns
+    switch (theTOFCorrType) {
+      case 0: {
+        // The ttrig computed from the real data accounts on average for the TOF correction
+        // Depending on the granularity used for the ttrig computation we just have to correct for the
+        // TOF from the center of the chamber, SL, layer or wire to the hit position.
+        // At the moment only SL granularity is considered
+        // Correction for TOF from the center of the SL to hit position
+        const DTSuperLayer* sl = layer->superLayer();
+        double flightToSL = sl->surface().position().mag();
+        tofCorr = (flightToSL - flightToHit) / cSpeed;
+        break;
+      }
+      case 1: {
+        // On simulated data you need to consider only the TOF from 3D center of the wire to hit position
+        // (because the TOF from the IP to the wire has been already subtracted in the digitization:
+        // SimMuon/DTDigitizer/DTDigiSyncTOFCorr.cc corrType=2)
+        float flightToWire =
+            layer->toGlobal(LocalPoint(layer->specificTopology().wirePosition(wireId.wire()), 0., 0.)).mag();
+        tofCorr = (flightToWire - flightToHit) / cSpeed;
+        break;
+      }
+      default: {
+        throw cms::Exception("[DTTTrigSyncFromDB]")
+            << " Invalid parameter: tofCorrType = " << theTOFCorrType << std::endl;
+        break;
+      }
     }
   }
 
-
-  if(debug) {
+  if (debug) {
     cout << "[DTTTrigSyncFromDB] Channel: " << wireId << endl
-	 << "      Offset (ns): " << tTrig + wirePropCorr - tofCorr << endl
-	 << "      various contributions are: " << endl
-	 << "      tTrig + t0 (ns):   " << tTrig << endl
-	 //<< "      tZero (ns):   " << t0 << endl
-	 << "      Propagation along wire delay (ns): " <<  wirePropCorr << endl
-	 << "      TOF correction (ns): " << tofCorr << endl
-	 << endl;
+         << "      Offset (ns): " << tTrig + wirePropCorr - tofCorr << endl
+         << "      various contributions are: " << endl
+         << "      tTrig + t0 (ns):   " << tTrig
+         << endl
+         //<< "      tZero (ns):   " << t0 << endl
+         << "      Propagation along wire delay (ns): " << wirePropCorr << endl
+         << "      TOF correction (ns): " << tofCorr << endl
+         << endl;
   }
   //The global offset is the sum of various contributions
-    return tTrig + wirePropCorr - tofCorr;
+  return tTrig + wirePropCorr - tofCorr;
 }
 
 double DTTTrigSyncFromDB::offset(const DTWireId& wireId) const {
   float t0 = 0;
   float t0rms = 0;
-  if(doT0Correction)
-    {
-      // Read the t0 from pulses for this wire (ns)
-       tZeroMap->get(wireId,
-		     t0,
-		     t0rms,
-	             DTTimeUnits::ns);
-
-    }
+  if (doT0Correction) {
+    // Read the t0 from pulses for this wire (ns)
+    tZeroMap->get(wireId, t0, t0rms, DTTimeUnits::ns);
+  }
 
   // Read the ttrig for this wire
   float ttrigMean = 0;
   float ttrigSigma = 0;
   float kFactor = 0;
   // FIXME: should check the return value of the DTTtrigRcd::get(..) method
-  if(tTrigMap->get(wireId.superlayerId(),
-		   ttrigMean,
-		   ttrigSigma,
-		   kFactor,
-		   DTTimeUnits::ns) != 0) {
+  if (tTrigMap->get(wireId.superlayerId(), ttrigMean, ttrigSigma, kFactor, DTTimeUnits::ns) != 0) {
     cout << "[DTTTrigSyncFromDB]*Error: ttrig not found for SL: " << wireId.superlayerId() << endl;
-//     FIXME: LogError.....
+    //     FIXME: LogError.....
   }
-  
-  return t0 + ttrigMean + kFactor * ttrigSigma;
 
+  return t0 + ttrigMean + kFactor * ttrigSigma;
 }
 
-double DTTTrigSyncFromDB::emulatorOffset(const DTWireId& wireId,
-					 double &tTrig,
-					 double &t0cell) const {
+double DTTTrigSyncFromDB::emulatorOffset(const DTWireId& wireId, double& tTrig, double& t0cell) const {
   float t0 = 0;
   float t0rms = 0;
-  if(doT0Correction)
-    {
-      // Read the t0 from pulses for this wire (ns)
-       tZeroMap->get(wireId,
-		     t0,
-		     t0rms,
-	             DTTimeUnits::ns);
-
-    }
+  if (doT0Correction) {
+    // Read the t0 from pulses for this wire (ns)
+    tZeroMap->get(wireId, t0, t0rms, DTTimeUnits::ns);
+  }
 
   // Read the ttrig for this wire
   float ttrigMean = 0;
   float ttrigSigma = 0;
   float kFactor = 0;
   // FIXME: should check the return value of the DTTtrigRcd::get(..) method
-  if(tTrigMap->get(wireId.superlayerId(),
-		   ttrigMean,
-		   ttrigSigma,
-		   kFactor,
-		   DTTimeUnits::ns) != 0) {
+  if (tTrigMap->get(wireId.superlayerId(), ttrigMean, ttrigSigma, kFactor, DTTimeUnits::ns) != 0) {
     cout << "[DTTTrigSyncFromDB]*Error: ttrig not found for SL: " << wireId.superlayerId() << endl;
-//     FIXME: LogError.....
+    //     FIXME: LogError.....
   }
-  
+
   tTrig = ttrigMean + kFactor * ttrigSigma;
   t0cell = t0;
 
-  return int(tTrig/theBXspace)*theBXspace + t0cell;
+  return int(tTrig / theBXspace) * theBXspace + t0cell;
 }
diff --git a/CalibMuon/DTDigiSync/src/DTTTrigSyncFromDB.h b/CalibMuon/DTDigiSync/src/DTTTrigSyncFromDB.h
index 8f6e7497630b1..492a35c65ced1 100644
--- a/CalibMuon/DTDigiSync/src/DTTTrigSyncFromDB.h
+++ b/CalibMuon/DTDigiSync/src/DTTTrigSyncFromDB.h
@@ -40,13 +40,11 @@
 
 #include "CalibMuon/DTDigiSync/interface/DTTTrigBaseSync.h"
 
-
 class DTLayer;
 class DTWireId;
 class DTT0;
 class DTTtrig;
 
-
 namespace edm {
   class ParameterSet;
 }
@@ -64,37 +62,31 @@ class DTTTrigSyncFromDB : public DTTTrigBaseSync {
   /// Pass the Event Setup to the algo at each event
   void setES(const edm::EventSetup& setup) override;
 
-
   /// Time (ns) to be subtracted to the digi time,
   /// Parameters are the layer and the wireId to which the
   /// digi is referred and the estimation of
   /// the 3D hit position (globPos)
   double offset(const DTLayer* layer,
-			const DTWireId& wireId,
-			const GlobalPoint& globPos,
-			double& tTrig,
-			double& wirePropCorr,
-			double& tofCorr) const override;
+                const DTWireId& wireId,
+                const GlobalPoint& globPos,
+                double& tTrig,
+                double& wirePropCorr,
+                double& tofCorr) const override;
 
   /// Time (ns) to be subtracted to the digi time.
   /// It does not take into account TOF and signal propagation along the wire
   double offset(const DTWireId& wireId) const override;
 
-
   /// Time (ns) to be subtracted to the digi time for emulation purposes
   /// It does not take into account TOF and signal propagation along the wire
   /// It also returns the different contributions separately:
   ///     - tTrig is the offset (t_trig)
   ///     - t0cell is the t0 from pulses
-  double emulatorOffset(const DTWireId& wireId,
-				double &tTrig,
-				double &t0cell) const override;
+  double emulatorOffset(const DTWireId& wireId, double& tTrig, double& t0cell) const override;
 
-
- private:
-  
-  const DTT0 *tZeroMap;
-  const DTTtrig *tTrigMap;
+private:
+  const DTT0* tZeroMap;
+  const DTTtrig* tTrigMap;
   // Set the verbosity level
   const bool debug;
   // The velocity of signal propagation along the wire (cm/ns)
@@ -111,7 +103,5 @@ class DTTTrigSyncFromDB : public DTTTrigBaseSync {
   double theBXspace;
 
   std::string thetTrigLabel;
-
 };
 #endif
-
diff --git a/CalibMuon/DTDigiSync/src/DTTTrigSyncT0Only.cc b/CalibMuon/DTDigiSync/src/DTTTrigSyncT0Only.cc
index a100840c299d3..e44b97b361da4 100644
--- a/CalibMuon/DTDigiSync/src/DTTTrigSyncT0Only.cc
+++ b/CalibMuon/DTDigiSync/src/DTTTrigSyncT0Only.cc
@@ -6,7 +6,6 @@
 
 #include "DTTTrigSyncT0Only.h"
 
-
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -19,48 +18,38 @@
 using namespace std;
 using namespace edm;
 
+DTTTrigSyncT0Only::DTTTrigSyncT0Only(const ParameterSet& config) : debug(config.getUntrackedParameter<bool>("debug")) {}
 
-DTTTrigSyncT0Only::DTTTrigSyncT0Only(const ParameterSet& config)
- :debug(config.getUntrackedParameter<bool>("debug"))
-{
-}
-
-
-
-DTTTrigSyncT0Only::~DTTTrigSyncT0Only(){}
-
-
+DTTTrigSyncT0Only::~DTTTrigSyncT0Only() {}
 
 void DTTTrigSyncT0Only::setES(const EventSetup& setup) {
   ESHandle<DTT0> t0;
   setup.get<DTT0Rcd>().get(t0);
   tZeroMap = &*t0;
-  
-  if(debug) {
+
+  if (debug) {
     cout << "[DTTTrigSyncT0Only] T0 version: " << t0->version() << endl;
   }
 }
 
-
-
-
 double DTTTrigSyncT0Only::offset(const DTLayer* layer,
-				  const DTWireId& wireId,
-				  const GlobalPoint& globPos,
-				  double& tTrig,
-				  double& wirePropCorr,
-				  double& tofCorr) const {
+                                 const DTWireId& wireId,
+                                 const GlobalPoint& globPos,
+                                 double& tTrig,
+                                 double& wirePropCorr,
+                                 double& tofCorr) const {
   tTrig = offset(wireId);
   wirePropCorr = 0;
   tofCorr = 0;
 
-  if(debug) {
+  if (debug) {
     cout << "[DTTTrigSyncT0Only] Offset (ns): " << tTrig + wirePropCorr - tofCorr << endl
-	 << "      various contributions are: " << endl
-	 //<< "      tZero (ns):   " << t0 << endl
-	 << "      Propagation along wire delay (ns): " <<  wirePropCorr << endl
-	 << "      TOF correction (ns): " << tofCorr << endl
-	 << endl;
+         << "      various contributions are: "
+         << endl
+         //<< "      tZero (ns):   " << t0 << endl
+         << "      Propagation along wire delay (ns): " << wirePropCorr << endl
+         << "      TOF correction (ns): " << tofCorr << endl
+         << endl;
   }
   //The global offset is the sum of various contributions
   return tTrig + wirePropCorr - tofCorr;
@@ -69,18 +58,12 @@ double DTTTrigSyncT0Only::offset(const DTLayer* layer,
 double DTTTrigSyncT0Only::offset(const DTWireId& wireId) const {
   float t0 = 0;
   float t0rms = 0;
-  tZeroMap->get(wireId,
-                t0,
-                t0rms,
-                DTTimeUnits::ns);
+  tZeroMap->get(wireId, t0, t0rms, DTTimeUnits::ns);
 
   return t0;
 }
 
-
-double DTTTrigSyncT0Only::emulatorOffset(const DTWireId& wireId,
-					 double &tTrig,
-					 double &t0cell) const {
+double DTTTrigSyncT0Only::emulatorOffset(const DTWireId& wireId, double& tTrig, double& t0cell) const {
   tTrig = 0.;
   t0cell = 0.;
   return 0.;
diff --git a/CalibMuon/DTDigiSync/src/DTTTrigSyncT0Only.h b/CalibMuon/DTDigiSync/src/DTTTrigSyncT0Only.h
index a64941f375062..54c94be5983ae 100644
--- a/CalibMuon/DTDigiSync/src/DTTTrigSyncT0Only.h
+++ b/CalibMuon/DTDigiSync/src/DTTTrigSyncT0Only.h
@@ -11,8 +11,6 @@
 
 #include "CalibMuon/DTDigiSync/interface/DTTTrigBaseSync.h"
 
-
-
 class DTLayer;
 class DTWireId;
 class DTT0;
@@ -34,33 +32,27 @@ class DTTTrigSyncT0Only : public DTTTrigBaseSync {
   /// Pass the Event Setup to the algo at each event
   void setES(const edm::EventSetup& setup) override;
 
-
   /// Time (ns) to be subtracted to the digi time,
   /// Parameters are the layer and the wireId to which the
   /// digi is referred and the estimation of
   /// the 3D hit position (globPos)
   double offset(const DTLayer* layer,
-			const DTWireId& wireId,
-			const GlobalPoint& globPos,
-			double& tTrig,
-			double& wirePropCorr,
-			double& tofCorr) const override;
+                const DTWireId& wireId,
+                const GlobalPoint& globPos,
+                double& tTrig,
+                double& wirePropCorr,
+                double& tofCorr) const override;
 
   double offset(const DTWireId& wireId) const override;
 
   /// Time (ns) to be subtracted to the digi time for emulation purposes
   /// Returns just 0 in this implementation of the plugin
-  double emulatorOffset(const DTWireId& wireId,
-				double &tTrig,
-				double &t0cell) const override;
+  double emulatorOffset(const DTWireId& wireId, double& tTrig, double& t0cell) const override;
 
-
- private:
-  
-  const DTT0 *tZeroMap;
+private:
+  const DTT0* tZeroMap;
 
   // Set the verbosity level
   const bool debug;
 };
 #endif
-
diff --git a/CalibMuon/DTDigiSync/src/DTTTrigSyncTOFCorr.cc b/CalibMuon/DTDigiSync/src/DTTTrigSyncTOFCorr.cc
index 6f953f5dca58a..7a73f1db92c8a 100644
--- a/CalibMuon/DTDigiSync/src/DTTTrigSyncTOFCorr.cc
+++ b/CalibMuon/DTDigiSync/src/DTTTrigSyncTOFCorr.cc
@@ -16,90 +16,81 @@
 using namespace std;
 
 DTTTrigSyncTOFCorr::DTTTrigSyncTOFCorr(const edm::ParameterSet& config)
-: 
-  // The fixed t0 (or t_trig) to be subtracted to digi time (ns)
-  theTTrig(config.getParameter<double>("tTrig")),           // FIXME: Default was 500 ns
-  // Velocity of signal propagation along the wire (cm/ns)
-  theVPropWire(config.getParameter<double>("vPropWire")),   // FIXME: Default was 24.4 cm/ns
-  // Select the mode for TOF correction:
-  //     0: tofCorr = TOF from IP to 3D Hit position (globPos)
-  //     1: tofCorr = TOF correction for distance difference
-  //                  between 3D center of the chamber and hit position
-  //                  (default)
-  //     2: tofCorr = TOF correction for distance difference
-  //                  between 3D center of the wire and hit position
-  //                  (This mode in available for backward compatibility)
-  theTOFCorrType(config.getParameter<int>("tofCorrType")), // FIXME: Default was 1
-  debug(config.getUntrackedParameter<bool>("debug")),
-  theBXspace(config.getUntrackedParameter<double>("bxSpace", 25.)) // spacing of BX in ns
-{
-}
-
-
-
-DTTTrigSyncTOFCorr::~DTTTrigSyncTOFCorr(){}
-
-
+    :                                                  // The fixed t0 (or t_trig) to be subtracted to digi time (ns)
+      theTTrig(config.getParameter<double>("tTrig")),  // FIXME: Default was 500 ns
+      // Velocity of signal propagation along the wire (cm/ns)
+      theVPropWire(config.getParameter<double>("vPropWire")),  // FIXME: Default was 24.4 cm/ns
+      // Select the mode for TOF correction:
+      //     0: tofCorr = TOF from IP to 3D Hit position (globPos)
+      //     1: tofCorr = TOF correction for distance difference
+      //                  between 3D center of the chamber and hit position
+      //                  (default)
+      //     2: tofCorr = TOF correction for distance difference
+      //                  between 3D center of the wire and hit position
+      //                  (This mode in available for backward compatibility)
+      theTOFCorrType(config.getParameter<int>("tofCorrType")),  // FIXME: Default was 1
+      debug(config.getUntrackedParameter<bool>("debug")),
+      theBXspace(config.getUntrackedParameter<double>("bxSpace", 25.))  // spacing of BX in ns
+{}
+
+DTTTrigSyncTOFCorr::~DTTTrigSyncTOFCorr() {}
 
 double DTTTrigSyncTOFCorr::offset(const DTLayer* layer,
-				  const DTWireId& wireId,
-				  const GlobalPoint& globPos,
-				  double& tTrig,
-				  double& wirePropCorr,
-				  double& tofCorr) const {
+                                  const DTWireId& wireId,
+                                  const GlobalPoint& globPos,
+                                  double& tTrig,
+                                  double& wirePropCorr,
+                                  double& tofCorr) const {
   tTrig = offset(wireId);
 
   //Compute the time spent in signal propagation along wire.
   // NOTE: the FE is always at y>0
-  float halfL     = layer->specificTopology().cellLenght()/2;
+  float halfL = layer->specificTopology().cellLenght() / 2;
   float wireCoord = layer->toLocal(globPos).y();
-  float propgL    = halfL - wireCoord;
-  wirePropCorr = propgL/theVPropWire;
-
+  float propgL = halfL - wireCoord;
+  wirePropCorr = propgL / theVPropWire;
 
   // Compute TOF correction treating it accordingly to
   // the tofCorrType card
   float flightToHit = globPos.mag();
-  static const float cSpeed = 29.9792458; // cm/ns
+  static const float cSpeed = 29.9792458;  // cm/ns
   tofCorr = 0.;
-  switch(theTOFCorrType) {
-  case 0: {
-    // In this mode the subtraction of the TOF from IP to
-    // estimate 3D hit digi position is done here
-    // (No correction is needed anymore)
-    tofCorr = -flightToHit/cSpeed;
-    break;
-  }
-  case 1: {
-    // Correction for TOF from the center of the chamber to hit position
-    const DTChamber * chamber = layer->chamber();
-    double flightToChamber = chamber->surface().position().mag();
-    tofCorr = (flightToChamber-flightToHit)/cSpeed;
-    break;
-  }
-  case 2: {
-    // TOF from 3D center of the wire to hit position
-    float flightToWire =
-      layer->toGlobal(LocalPoint(layer->specificTopology().wirePosition(wireId.wire()), 0., 0.)).mag();
-    tofCorr = (flightToWire-flightToHit)/cSpeed;
-    break;
-  }
-  default: {
-    throw
-      cms::Exception("[DTTTrigSyncTOFCorr]") << " Invalid parameter: tofCorrType = "
-					     << theTOFCorrType 
-					     << std::endl;
-    break;
-  }
+  switch (theTOFCorrType) {
+    case 0: {
+      // In this mode the subtraction of the TOF from IP to
+      // estimate 3D hit digi position is done here
+      // (No correction is needed anymore)
+      tofCorr = -flightToHit / cSpeed;
+      break;
+    }
+    case 1: {
+      // Correction for TOF from the center of the chamber to hit position
+      const DTChamber* chamber = layer->chamber();
+      double flightToChamber = chamber->surface().position().mag();
+      tofCorr = (flightToChamber - flightToHit) / cSpeed;
+      break;
+    }
+    case 2: {
+      // TOF from 3D center of the wire to hit position
+      float flightToWire =
+          layer->toGlobal(LocalPoint(layer->specificTopology().wirePosition(wireId.wire()), 0., 0.)).mag();
+      tofCorr = (flightToWire - flightToHit) / cSpeed;
+      break;
+    }
+    default: {
+      throw cms::Exception("[DTTTrigSyncTOFCorr]")
+          << " Invalid parameter: tofCorrType = " << theTOFCorrType << std::endl;
+      break;
+    }
   }
 
-  if(debug) {
+  if (debug) {
     cout << "[DTTTrigSyncTOFCorr] Offset (ns): " << tTrig + wirePropCorr - tofCorr << endl
-	 << "      various contributions are: " << endl
-	 << "      tTrig (ns):   " << tTrig << endl
-	 << "      Propagation along wire delay (ns): " <<  wirePropCorr << endl
-	 << "      TOF correction (ns): " << tofCorr << endl
-	 << endl;
+         << "      various contributions are: " << endl
+         << "      tTrig (ns):   " << tTrig << endl
+         << "      Propagation along wire delay (ns): " << wirePropCorr << endl
+         << "      TOF correction (ns): " << tofCorr << endl
+         << endl;
   }
   //The global offset is the sum of various contributions
   return tTrig + wirePropCorr - tofCorr;
@@ -108,21 +99,16 @@ double DTTTrigSyncTOFCorr::offset(const DTLayer* layer,
 double DTTTrigSyncTOFCorr::offset(const DTWireId& wireId) const {
   // Correction for the float to int conversion
   // (half a bin on average) in DTDigi constructor
-  static const float f2i_convCorr = (25./64.); // ns
+  static const float f2i_convCorr = (25. / 64.);  // ns
   //FIXME: This should be considered only if the Digi is constructed from a float....
 
-
   // The tTrig is taken from a parameter
   return theTTrig - f2i_convCorr;
 }
 
-
-double DTTTrigSyncTOFCorr::emulatorOffset(const DTWireId& wireId,
-					 double &tTrig,
-					 double &t0cell) const {
+double DTTTrigSyncTOFCorr::emulatorOffset(const DTWireId& wireId, double& tTrig, double& t0cell) const {
   tTrig = theTTrig;
   t0cell = 0.;
 
-  return int(tTrig/theBXspace)*theBXspace;
+  return int(tTrig / theBXspace) * theBXspace;
 }
-
diff --git a/CalibMuon/DTDigiSync/src/DTTTrigSyncTOFCorr.h b/CalibMuon/DTDigiSync/src/DTTTrigSyncTOFCorr.h
index f2c049d213bd8..023f4f9b32bcb 100644
--- a/CalibMuon/DTDigiSync/src/DTTTrigSyncTOFCorr.h
+++ b/CalibMuon/DTDigiSync/src/DTTTrigSyncTOFCorr.h
@@ -38,8 +38,6 @@
 
 #include "CalibMuon/DTDigiSync/interface/DTTTrigBaseSync.h"
 
-
-
 class DTLayer;
 class DTWireId;
 
@@ -60,7 +58,6 @@ class DTTTrigSyncTOFCorr : public DTTTrigBaseSync {
   /// Pass the Event Setup to the algo at each event
   void setES(const edm::EventSetup& setup) override {}
 
-
   /// Time (ns) to be subtracted to the digi time,
   /// Parameters are the layer and the wireId to which the
   /// digi is referred and the estimation of
@@ -68,13 +65,13 @@ class DTTTrigSyncTOFCorr : public DTTTrigBaseSync {
   /// It also returns the different contributions separately:
   ///     - tTrig is the offset (t_trig)
   ///     - wirePropCorr is the delay for signal propagation along the wire
-  ///     - tofCorr is the correction due to the particle TOF 
+  ///     - tofCorr is the correction due to the particle TOF
   double offset(const DTLayer* layer,
-			const DTWireId& wireId,
-			const GlobalPoint& globPos,
-			double& tTrig,
-			double& wirePropCorr,
-			double& tofCorr) const override;
+                const DTWireId& wireId,
+                const GlobalPoint& globPos,
+                double& tTrig,
+                double& wirePropCorr,
+                double& tofCorr) const override;
 
   double offset(const DTWireId& wireId) const override;
 
@@ -83,11 +80,9 @@ class DTTTrigSyncTOFCorr : public DTTTrigBaseSync {
   /// It also returns the different contributions separately:
   ///     - tTrig is the offset (t_trig)
   ///     - t0cell is the t0 from pulses (always 0 in this case)
-  double emulatorOffset(const DTWireId& wireId,
-				double &tTrig,
-				double &t0cell) const override;
+  double emulatorOffset(const DTWireId& wireId, double& tTrig, double& t0cell) const override;
 
- private:
+private:
   // The fixed t_trig to be subtracted to digi time (ns)
   const double theTTrig;
   // Velocity of signal propagation along the wire (cm/ns)
@@ -95,7 +90,7 @@ class DTTTrigSyncTOFCorr : public DTTTrigBaseSync {
   // cfr. CMS-IN 2000-021:   (2.56+-0.17)x1e8 m/s
   //      CMS NOTE 2003-17:  (0.244)  m/ns = 24.4 cm/ns
   const double theVPropWire;
-  
+
   // Select the mode for TOF correction:
   //     0: tofCorr = TOF from IP to 3D Hit position (globPos)
   //     1: tofCorr = TOF correction for distance difference
@@ -110,4 +105,3 @@ class DTTTrigSyncTOFCorr : public DTTTrigBaseSync {
   double theBXspace;
 };
 #endif
-
diff --git a/CalibMuon/RPCCalibration/interface/RPCCalibSetUp.h b/CalibMuon/RPCCalibration/interface/RPCCalibSetUp.h
index 6b0a7a4ac646a..2835d38761060 100644
--- a/CalibMuon/RPCCalibration/interface/RPCCalibSetUp.h
+++ b/CalibMuon/RPCCalibration/interface/RPCCalibSetUp.h
@@ -6,46 +6,43 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 //#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include <map>
-#include <vector>
+#include <cstdlib>
+#include <cstring>
 #include <fstream>
-#include <sstream>
 #include <iostream>
-#include<cstring>
-#include<string>
-#include<cstdlib>
+#include <map>
+#include <sstream>
+#include <string>
 #include <utility>
+#include <vector>
 
 class RPCDigitizer;
 class RPCGeometry;
 class RPCDetId;
 
-class RPCCalibSetUp
-{
+class RPCCalibSetUp {
 public:
-
-  explicit RPCCalibSetUp(const edm::ParameterSet& ps);
+  explicit RPCCalibSetUp(const edm::ParameterSet &ps);
   virtual ~RPCCalibSetUp();
 
   std::vector<float> getNoise(uint32_t id);
   std::vector<float> getEff(uint32_t id);
   float getTime(uint32_t id);
-  std::map< int, std::vector<double> > getClsMap();
+  std::map<int, std::vector<double>> getClsMap();
   //  std::map<int, std::vector<double> > getClsMap(uint32_t id);
   std::vector<double> getCls(uint32_t id);
 
   /// sets geometry
-  void setGeometry(const RPCGeometry * geom) {theGeometry = geom;}
-  const RPCGeometry * getGeometry() { return theGeometry; }
+  void setGeometry(const RPCGeometry *geom) { theGeometry = geom; }
+  const RPCGeometry *getGeometry() { return theGeometry; }
 
-  const RPCGeometry * theGeometry;
+  const RPCGeometry *theGeometry;
 
-  std::map<uint32_t, std::vector<float> > _mapDetIdNoise;
-  std::map<uint32_t, std::vector<float> > _mapDetIdEff;
+  std::map<uint32_t, std::vector<float>> _mapDetIdNoise;
+  std::map<uint32_t, std::vector<float>> _mapDetIdEff;
   std::map<RPCDetId, float> _bxmap;
-  std::map< int, std::vector<double> > _clsMap;
-  std::map<uint32_t, std::vector<double> > _mapDetClsMap;
-
+  std::map<int, std::vector<double>> _clsMap;
+  std::map<uint32_t, std::vector<double>> _mapDetClsMap;
 };
 
 #endif
diff --git a/CalibMuon/RPCCalibration/interface/RPCFakeCalibration.h b/CalibMuon/RPCCalibration/interface/RPCFakeCalibration.h
index 06ad090ea3457..cf3cfc1667850 100644
--- a/CalibMuon/RPCCalibration/interface/RPCFakeCalibration.h
+++ b/CalibMuon/RPCCalibration/interface/RPCFakeCalibration.h
@@ -1,45 +1,37 @@
 #ifndef RPCCalibration_RPCFakeCalibration_H
 #define RPCCalibration_RPCFakeCalibration_H
 
-#include "CondFormats/RPCObjects/interface/RPCClusterSize.h"
 #include "CalibMuon/RPCCalibration/interface/RPCPerformanceESSource.h"
+#include "CondFormats/RPCObjects/interface/RPCClusterSize.h"
 //#include "CalibMuon/RPCCalibration/interface/RPCClusterSizeESSource.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "CondFormats/DataRecord/interface/SiStripNoisesRcd.h"
 #include "CondFormats/SiStripObjects/interface/SiStripNoises.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "boost/cstdint.hpp"
 #include <memory>
 
 class RPCCalibSetUp;
 
-/** 
+/**
     @class RPCFakeCalibration
     @brief Fake source of RPCStripNoises object.
     @author R. Trentadue, B. Pavlov
 */
 
 class RPCFakeCalibration : public RPCPerformanceESSource {
+public:
+  RPCFakeCalibration(const edm::ParameterSet &);
+  ~RPCFakeCalibration() override { ; }
 
- public:
-
-  RPCFakeCalibration( const edm::ParameterSet& );
-  ~RPCFakeCalibration() override {;}
-  
-     
 private:
-  
+  RPCStripNoises *makeNoise() override;
 
-  RPCStripNoises* makeNoise() override;
-
-  RPCClusterSize* makeCls();
+  RPCClusterSize *makeCls();
 
 private:
-
   //  bool printdebug_;
-  RPCCalibSetUp* theRPCCalibSetUp;
-
+  RPCCalibSetUp *theRPCCalibSetUp;
 };
 
-
-#endif // RPCCalibration_RPCFakeCalibration_H
+#endif  // RPCCalibration_RPCFakeCalibration_H
diff --git a/CalibMuon/RPCCalibration/interface/RPCPerformanceESSource.h b/CalibMuon/RPCCalibration/interface/RPCPerformanceESSource.h
index 3406ba0cd3b21..393a47d317691 100644
--- a/CalibMuon/RPCCalibration/interface/RPCPerformanceESSource.h
+++ b/CalibMuon/RPCCalibration/interface/RPCPerformanceESSource.h
@@ -1,8 +1,8 @@
 #ifndef CalibTracker_RPCCalibration_RPCPerformanceESSource_H
 #define CalibTracker_RPCCalibration_RPCPerformanceESSource_H
 
-#include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "boost/cstdint.hpp"
@@ -11,33 +11,30 @@
 class RPCStripNoises;
 class RPCStripNoisesRcd;
 
-/** 
+/**
     @class RPCPerformanceESSource
     @brief Pure virtual class for EventSetup sources of RPCStripNoises.
     @author R. Trentadue
 */
 class RPCPerformanceESSource : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
+public:
+  RPCPerformanceESSource(const edm::ParameterSet &);
+  ~RPCPerformanceESSource() override { ; }
 
- public:
+  std::unique_ptr<RPCStripNoises> produce(const RPCStripNoisesRcd &);
 
-  RPCPerformanceESSource( const edm::ParameterSet& );
-  ~RPCPerformanceESSource() override {;}
-  
-  std::unique_ptr<RPCStripNoises> produce( const RPCStripNoisesRcd& );
-  
   // protected:
 
-  void setIntervalFor( const edm::eventsetup::EventSetupRecordKey&,
-			       const edm::IOVSyncValue&,
-			       edm::ValidityInterval& ) override;
-  
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
+
   // private:
-  
-  RPCPerformanceESSource( const RPCPerformanceESSource& );
-  const RPCPerformanceESSource& operator=( const RPCPerformanceESSource& );
 
-  virtual RPCStripNoises* makeNoise() = 0; 
+  RPCPerformanceESSource(const RPCPerformanceESSource &);
+  const RPCPerformanceESSource &operator=(const RPCPerformanceESSource &);
 
+  virtual RPCStripNoises *makeNoise() = 0;
 };
 
-#endif // CalibTracker_RPCCalibration_RPCPerformanceESSource_H
+#endif  // CalibTracker_RPCCalibration_RPCPerformanceESSource_H
diff --git a/CalibMuon/RPCCalibration/src/RPCCalibSetUp.cc b/CalibMuon/RPCCalibration/src/RPCCalibSetUp.cc
index 9cd7fcfc9992c..433ca3ed5774e 100644
--- a/CalibMuon/RPCCalibration/src/RPCCalibSetUp.cc
+++ b/CalibMuon/RPCCalibration/src/RPCCalibSetUp.cc
@@ -1,111 +1,103 @@
-#include "FWCore/Framework/interface/EDProducer.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
+#include "CalibMuon/RPCCalibration/interface/RPCCalibSetUp.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/MuonDetId/interface/RPCDetId.h"
+#include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "CalibMuon/RPCCalibration/interface/RPCCalibSetUp.h"
-#include "DataFormats/MuonDetId/interface/RPCDetId.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 #include <cmath>
-#include <cmath>
+#include <cstdlib>
+#include <cstring>
 #include <fstream>
-#include <sstream>
 #include <iostream>
-#include<cstring>
-#include<string>
-#include<vector>
-#include<cstdlib>
-#include <utility>
 #include <map>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace std;
 
-RPCCalibSetUp::RPCCalibSetUp(const edm::ParameterSet& ps) {
-  
+RPCCalibSetUp::RPCCalibSetUp(const edm::ParameterSet &ps) {
   _mapDetIdNoise.clear();
   _mapDetIdEff.clear();
   _bxmap.clear();
   _mapDetClsMap.clear();
 
-    //------------------------ Noise Reading ----------------------------
-    
+  //------------------------ Noise Reading ----------------------------
+
   edm::FileInPath fp1 = ps.getParameter<edm::FileInPath>("noisemapfile");
   std::ifstream _infile1(fp1.fullPath().c_str(), std::ios::in);
-  
-  std::vector<float>  vnoise;
+
+  std::vector<float> vnoise;
 
   int rpcdetid = 0;
   std::string buff;
-  
-  std::vector< std::string > words;
+
+  std::vector<std::string> words;
 
   int count = 0;
-  while( getline(_infile1, buff, '\n') ){
-    
+  while (getline(_infile1, buff, '\n')) {
     words.clear();
     vnoise.clear();
-    
+
     stringstream ss;
     std::string chname;
-    ss<<buff;
-    ss>>chname>>rpcdetid;
+    ss << buff;
+    ss >> chname >> rpcdetid;
 
     std::string::size_type pos = 0, prev_pos = 0;
 
-    while ( (pos = buff.find("  ",pos)) != string::npos){
-      
+    while ((pos = buff.find("  ", pos)) != string::npos) {
       words.push_back(buff.substr(prev_pos, pos - prev_pos));
       prev_pos = ++pos;
     }
     words.push_back(buff.substr(prev_pos, pos - prev_pos));
-    
-    for(unsigned int i = 2; i < words.size(); ++i){
-      float value = atof( ((words)[i]).c_str() );
+
+    for (unsigned int i = 2; i < words.size(); ++i) {
+      float value = atof(((words)[i]).c_str());
       vnoise.push_back(value);
     }
-    
-    _mapDetIdNoise.insert(make_pair(static_cast<uint32_t>(rpcdetid),vnoise));
-    
+
+    _mapDetIdNoise.insert(make_pair(static_cast<uint32_t>(rpcdetid), vnoise));
+
     count++;
   }
-   _infile1.close();
+  _infile1.close();
 
   //------------------------ Eff Reading ----------------------------
-  
+
   edm::FileInPath fp2 = ps.getParameter<edm::FileInPath>("effmapfile");
   std::ifstream _infile2(fp2.fullPath().c_str(), std::ios::in);
 
-  std::vector<float> veff ;
+  std::vector<float> veff;
   rpcdetid = 0;
-  
-  while( getline(_infile2, buff, '\n') ){
 
+  while (getline(_infile2, buff, '\n')) {
     words.clear();
     veff.clear();
-    
+
     stringstream ss;
     std::string chname;
-    ss<<buff;
-    ss>>chname>>rpcdetid;
-    
+    ss << buff;
+    ss >> chname >> rpcdetid;
+
     std::string::size_type pos = 0, prev_pos = 0;
-    while ( (pos = buff.find("  ",pos)) != string::npos){
-      
+    while ((pos = buff.find("  ", pos)) != string::npos) {
       words.push_back(buff.substr(prev_pos, pos - prev_pos));
       prev_pos = ++pos;
     }
     words.push_back(buff.substr(prev_pos, pos - prev_pos));
 
-    for(unsigned int i = 2; i < words.size(); ++i){
+    for (unsigned int i = 2; i < words.size(); ++i) {
       float value = atof(((words)[i]).c_str());
       veff.push_back(value);
     }
-    _mapDetIdEff.insert(make_pair(static_cast<uint32_t>(rpcdetid),veff));
+    _mapDetIdEff.insert(make_pair(static_cast<uint32_t>(rpcdetid), veff));
   }
   _infile2.close();
 
@@ -116,8 +108,8 @@ RPCCalibSetUp::RPCCalibSetUp(const edm::ParameterSet& ps) {
 
   uint32_t detUnit = 0;
   float timing = 0.;
-  while(!_infile3.eof()){
-    _infile3>>detUnit>>timing;
+  while (!_infile3.eof()) {
+    _infile3 >> detUnit >> timing;
     _bxmap[RPCDetId(detUnit)] = timing;
   }
   _infile3.close();
@@ -133,13 +125,13 @@ RPCCalibSetUp::RPCCalibSetUp(const edm::ParameterSet& ps) {
   unsigned int row = 1;
   std::vector<double> sum_clsize;
 
-  while ( _infile4 >> buffer ) {
+  while (_infile4 >> buffer) {
     const char *buffer1 = buffer.c_str();
     double dato = atof(buffer1);
     sum += dato;
     sum_clsize.push_back(sum);
 
-    if(counter == row*20) {
+    if (counter == row * 20) {
       _clsMap[row] = sum_clsize;
       row++;
       sum = 0;
@@ -153,107 +145,107 @@ RPCCalibSetUp::RPCCalibSetUp(const edm::ParameterSet& ps) {
 
   edm::FileInPath fp5 = ps.getParameter<edm::FileInPath>("clsidmapfile");
   std::ifstream _infile5(fp5.fullPath().c_str(), ios::in);
-  
-  std::vector<double> vClsDistrib ;
-  rpcdetid = 0;
 
-  while( getline(_infile5, buff, '\n') ){
+  std::vector<double> vClsDistrib;
+  rpcdetid = 0;
 
+  while (getline(_infile5, buff, '\n')) {
     words.clear();
     vClsDistrib.clear();
-    
+
     stringstream ss1;
-    ss1<<buff;
-    ss1>>rpcdetid;
-    
+    ss1 << buff;
+    ss1 >> rpcdetid;
+
     std::string::size_type pos = 0, prev_pos = 0;
-    while ( (pos = buff.find("  ",pos)) != string::npos){
-      
+    while ((pos = buff.find("  ", pos)) != string::npos) {
       words.push_back(buff.substr(prev_pos, pos - prev_pos));
       prev_pos = ++pos;
     }
     words.push_back(buff.substr(prev_pos, pos - prev_pos));
-    
+
     float clusterSizeSumData(0.);
 
-    for(unsigned int i = 1; i < words.size(); ++i){
+    for (unsigned int i = 1; i < words.size(); ++i) {
       float value = atof(((words)[i]).c_str());
-      
-      clusterSizeSumData+=value;
-          vClsDistrib.push_back(clusterSizeSumData);
-	  if(!(i%20)){ 
-	    clusterSizeSumData=0.;
-	  }
+
+      clusterSizeSumData += value;
+      vClsDistrib.push_back(clusterSizeSumData);
+      if (!(i % 20)) {
+        clusterSizeSumData = 0.;
+      }
     }
-    if(vClsDistrib.size()!=100){
-      throw cms::Exception("DataCorrupt") 
-	<< "Exception comming from RPCCalibSetUp - cluster size - a wrong format "<< std::endl;
+    if (vClsDistrib.size() != 100) {
+      throw cms::Exception("DataCorrupt") << "Exception comming from RPCCalibSetUp - cluster size - a wrong "
+                                             "format "
+                                          << std::endl;
     }
-    _mapDetClsMap.insert(make_pair(static_cast<uint32_t>(rpcdetid),vClsDistrib));
-    std::cout<<"_mapDetClsMap.size()\t"<<_mapDetClsMap.size()<<std::endl;
+    _mapDetClsMap.insert(make_pair(static_cast<uint32_t>(rpcdetid), vClsDistrib));
+    std::cout << "_mapDetClsMap.size()\t" << _mapDetClsMap.size() << std::endl;
   }
 
-  
   _infile5.close();
-  
 }
 
-std::vector<float> RPCCalibSetUp::getNoise(uint32_t id)
-{
-  map<uint32_t,std::vector<float> >::iterator iter = _mapDetIdNoise.find(id);
-  if(iter == _mapDetIdNoise.end()){
-    throw cms::Exception("DataCorrupt") 
-      << "Exception comming from RPCCalibSetUp - no noise information for DetId\t"<<id<< std::endl;
+std::vector<float> RPCCalibSetUp::getNoise(uint32_t id) {
+  map<uint32_t, std::vector<float>>::iterator iter = _mapDetIdNoise.find(id);
+  if (iter == _mapDetIdNoise.end()) {
+    throw cms::Exception("DataCorrupt") << "Exception comming from RPCCalibSetUp - no noise information for "
+                                           "DetId\t"
+                                        << id << std::endl;
   }
   return (iter->second);
 }
 
-std::vector<float> RPCCalibSetUp::getEff(uint32_t id)
-{
-  map<uint32_t,std::vector<float> >::iterator iter = _mapDetIdEff.find(id);
-  if(iter == _mapDetIdEff.end()){
-    throw cms::Exception("DataCorrupt") 
-      << "Exception comming from RPCCalibSetUp - no efficiency information for DetId\t"<<id<< std::endl;
+std::vector<float> RPCCalibSetUp::getEff(uint32_t id) {
+  map<uint32_t, std::vector<float>>::iterator iter = _mapDetIdEff.find(id);
+  if (iter == _mapDetIdEff.end()) {
+    throw cms::Exception("DataCorrupt") << "Exception comming from RPCCalibSetUp - no efficiency information "
+                                           "for DetId\t"
+                                        << id << std::endl;
   }
-  if((iter->second).size() != 96){
-    throw cms::Exception("DataCorrupt") 
-      << "Exception comming from RPCCalibSetUp - efficiency information in a wrong format for DetId\t"<<id<< std::endl;
+  if ((iter->second).size() != 96) {
+    throw cms::Exception("DataCorrupt") << "Exception comming from RPCCalibSetUp - efficiency information in a "
+                                           "wrong format for DetId\t"
+                                        << id << std::endl;
   }
   return iter->second;
 }
 
-float RPCCalibSetUp::getTime(uint32_t id)
-{
+float RPCCalibSetUp::getTime(uint32_t id) {
   RPCDetId rpcid(id);
 
   std::map<RPCDetId, float>::iterator iter = _bxmap.find(rpcid);
-  if(iter == _bxmap.end()){
-    throw cms::Exception("DataCorrupt") 
-      << "Exception comming from RPCCalibSetUp - no timing information for rpcid.rawId()\t"<<rpcid.rawId()<< std::endl;
+  if (iter == _bxmap.end()) {
+    throw cms::Exception("DataCorrupt") << "Exception comming from RPCCalibSetUp - no timing information for "
+                                           "rpcid.rawId()\t"
+                                        << rpcid.rawId() << std::endl;
   }
   return iter->second;
 }
 
-std::map< int, std::vector<double> > RPCCalibSetUp::getClsMap()
-{
-  if(_clsMap.size()!=5){
-    throw cms::Exception("DataCorrupt") 
-      << "Exception comming from RPCCalibSetUp - cluster size - a wrong format "<< std::endl;
+std::map<int, std::vector<double>> RPCCalibSetUp::getClsMap() {
+  if (_clsMap.size() != 5) {
+    throw cms::Exception("DataCorrupt") << "Exception comming from RPCCalibSetUp - cluster size - a wrong "
+                                           "format "
+                                        << std::endl;
   }
   return _clsMap;
 }
 
-std::vector<double> RPCCalibSetUp::getCls(uint32_t id){
-  std::map<uint32_t,std::vector<double> >::iterator iter = _mapDetClsMap.find(id);
-  if(iter == _mapDetClsMap.end()){
-    throw cms::Exception("DataCorrupt") 
-      << "Exception comming from RPCCalibSetUp - no cluster size information for DetId\t"<<id<< std::endl;
+std::vector<double> RPCCalibSetUp::getCls(uint32_t id) {
+  std::map<uint32_t, std::vector<double>>::iterator iter = _mapDetClsMap.find(id);
+  if (iter == _mapDetClsMap.end()) {
+    throw cms::Exception("DataCorrupt") << "Exception comming from RPCCalibSetUp - no cluster size information "
+                                           "for DetId\t"
+                                        << id << std::endl;
   }
-  if((iter->second).size() != 100){
-    throw cms::Exception("DataCorrupt") 
-      << "Exception comming from RPCCalibSetUp - cluster size information in a wrong format for DetId\t"<<id<< std::endl;
+  if ((iter->second).size() != 100) {
+    throw cms::Exception("DataCorrupt") << "Exception comming from RPCCalibSetUp - cluster size information in "
+                                           "a wrong format for DetId\t"
+                                        << id << std::endl;
   }
-  return iter->second; 
+  return iter->second;
 }
 
-RPCCalibSetUp::~RPCCalibSetUp(){}
+RPCCalibSetUp::~RPCCalibSetUp() {}
diff --git a/CalibMuon/RPCCalibration/src/RPCFakeCalibration.cc b/CalibMuon/RPCCalibration/src/RPCFakeCalibration.cc
index 0c0c2813c32f7..b6f22a911e95a 100644
--- a/CalibMuon/RPCCalibration/src/RPCFakeCalibration.cc
+++ b/CalibMuon/RPCCalibration/src/RPCFakeCalibration.cc
@@ -1,50 +1,47 @@
+#include "CalibMuon/RPCCalibration/interface/RPCCalibSetUp.h"
 #include "CalibMuon/RPCCalibration/interface/RPCFakeCalibration.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "CondFormats/DataRecord/interface/RPCStripNoisesRcd.h"
+#include "CondFormats/RPCObjects/interface/RPCStripNoises.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/MuonDetId/interface/RPCDetId.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "CalibMuon/RPCCalibration/interface/RPCCalibSetUp.h"
-#include "DataFormats/MuonDetId/interface/RPCDetId.h"
-#include "CondFormats/RPCObjects/interface/RPCStripNoises.h"
-#include "CondFormats/DataRecord/interface/RPCStripNoisesRcd.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include <cmath>
-#include <cmath>
+#include <fstream>
 #include <iostream>
 #include <memory>
-#include <fstream>
 
-RPCFakeCalibration::RPCFakeCalibration( const edm::ParameterSet& pset ) : RPCPerformanceESSource(pset) {
+RPCFakeCalibration::RPCFakeCalibration(const edm::ParameterSet &pset) : RPCPerformanceESSource(pset) {
   edm::LogInfo("RPCFakeCalibration::RPCFakeCalibration");
-  theRPCCalibSetUp  =  new RPCCalibSetUp(pset);
+  theRPCCalibSetUp = new RPCCalibSetUp(pset);
 }
 
-RPCStripNoises * RPCFakeCalibration::makeNoise() { 
-  RPCStripNoises * obj = new RPCStripNoises();
-  
-  std::map< int, std::vector<double> >::iterator itc;
-  for(itc = (theRPCCalibSetUp->_clsMap).begin();itc != (theRPCCalibSetUp->_clsMap).end();++itc){
-    for(unsigned int n = 0; n < (itc->second).size();++n){
+RPCStripNoises *RPCFakeCalibration::makeNoise() {
+  RPCStripNoises *obj = new RPCStripNoises();
+
+  std::map<int, std::vector<double>>::iterator itc;
+  for (itc = (theRPCCalibSetUp->_clsMap).begin(); itc != (theRPCCalibSetUp->_clsMap).end(); ++itc) {
+    for (unsigned int n = 0; n < (itc->second).size(); ++n) {
       (obj->v_cls).push_back((itc->second)[n]);
     }
   }
-  
+
   RPCStripNoises::NoiseItem tipoprova;
-  for(std::map<uint32_t, std::vector<float> >::iterator it = (theRPCCalibSetUp->_mapDetIdNoise).begin();
-      it != (theRPCCalibSetUp->_mapDetIdNoise).end(); ++it){
-    
+  for (std::map<uint32_t, std::vector<float>>::iterator it = (theRPCCalibSetUp->_mapDetIdNoise).begin();
+       it != (theRPCCalibSetUp->_mapDetIdNoise).end();
+       ++it) {
     tipoprova.dpid = it->first;
-    tipoprova.time =  theRPCCalibSetUp->getTime(it->first);
+    tipoprova.time = theRPCCalibSetUp->getTime(it->first);
 
-    for(unsigned int k = 0; k < 96; ++k){
+    for (unsigned int k = 0; k < 96; ++k) {
       tipoprova.noise = ((it->second))[k];
       tipoprova.eff = (theRPCCalibSetUp->getEff(it->first))[k];
       (obj->v_noises).push_back(tipoprova);
@@ -54,21 +51,18 @@ RPCStripNoises * RPCFakeCalibration::makeNoise() {
   return obj;
 }
 
-RPCClusterSize* RPCFakeCalibration::makeCls() {
-  RPCClusterSize * obj = new RPCClusterSize();
+RPCClusterSize *RPCFakeCalibration::makeCls() {
+  RPCClusterSize *obj = new RPCClusterSize();
   RPCClusterSize::ClusterSizeItem rpcClsItem;
-  
-  for(std::map<uint32_t, std::vector<double> >::iterator it 
-	= (theRPCCalibSetUp->_mapDetClsMap).begin();
-      it != (theRPCCalibSetUp->_mapDetClsMap).end(); ++it){
-    
-    rpcClsItem.dpid =  it->first;
-    
-    for(unsigned int k = 0; k < 100; k++){
-      
-      
-            rpcClsItem.clusterSize = (theRPCCalibSetUp->getCls(it->first))[k];
-            (obj->v_cls).push_back(rpcClsItem);
+
+  for (std::map<uint32_t, std::vector<double>>::iterator it = (theRPCCalibSetUp->_mapDetClsMap).begin();
+       it != (theRPCCalibSetUp->_mapDetClsMap).end();
+       ++it) {
+    rpcClsItem.dpid = it->first;
+
+    for (unsigned int k = 0; k < 100; k++) {
+      rpcClsItem.clusterSize = (theRPCCalibSetUp->getCls(it->first))[k];
+      (obj->v_cls).push_back(rpcClsItem);
     }
   }
   return obj;
diff --git a/CalibMuon/RPCCalibration/src/RPCPerformanceESSource.cc b/CalibMuon/RPCCalibration/src/RPCPerformanceESSource.cc
index 38a2bba6c3008..a9524edeeef20 100644
--- a/CalibMuon/RPCCalibration/src/RPCPerformanceESSource.cc
+++ b/CalibMuon/RPCCalibration/src/RPCPerformanceESSource.cc
@@ -1,37 +1,32 @@
 #include "CalibMuon/RPCCalibration/interface/RPCPerformanceESSource.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
-#include "CondFormats/RPCObjects/interface/RPCStripNoises.h"
 #include "CondFormats/DataRecord/interface/RPCStripNoisesRcd.h"
+#include "CondFormats/RPCObjects/interface/RPCStripNoises.h"
+#include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <iostream>
 
 using namespace std;
 
 // -----------------------------------------------------------------------------
 //
-RPCPerformanceESSource::RPCPerformanceESSource( const edm::ParameterSet& pset ) {
-
-  setWhatProduced( this );
+RPCPerformanceESSource::RPCPerformanceESSource(const edm::ParameterSet &pset) {
+  setWhatProduced(this);
   findingRecord<RPCStripNoisesRcd>();
 }
 
 // -----------------------------------------------------------------------------
 //
-unique_ptr<RPCStripNoises> RPCPerformanceESSource::produce( const RPCStripNoisesRcd&) { 
-    
-  RPCStripNoises* noise = makeNoise();
-  
-  return unique_ptr<RPCStripNoises>(noise);
+unique_ptr<RPCStripNoises> RPCPerformanceESSource::produce(const RPCStripNoisesRcd &) {
+  RPCStripNoises *noise = makeNoise();
 
+  return unique_ptr<RPCStripNoises>(noise);
 }
 
 // -----------------------------------------------------------------------------
 //
-void RPCPerformanceESSource::setIntervalFor( const edm::eventsetup::EventSetupRecordKey&, 
-					   const edm::IOVSyncValue& iosv, 
-					   edm::ValidityInterval& oValidity ) {
-  edm::ValidityInterval infinity( iosv.beginOfTime(), iosv.endOfTime() );
+void RPCPerformanceESSource::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                            const edm::IOVSyncValue &iosv,
+                                            edm::ValidityInterval &oValidity) {
+  edm::ValidityInterval infinity(iosv.beginOfTime(), iosv.endOfTime());
   oValidity = infinity;
 }
-
-
diff --git a/CalibMuon/RPCCalibration/src/SealModule.cc b/CalibMuon/RPCCalibration/src/SealModule.cc
index 3a8d25568bff7..8110546ebb540 100644
--- a/CalibMuon/RPCCalibration/src/SealModule.cc
+++ b/CalibMuon/RPCCalibration/src/SealModule.cc
@@ -2,7 +2,5 @@
 #include "FWCore/Framework/interface/SourceFactory.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 
-
-
 #include "CalibMuon/RPCCalibration/interface/RPCFakeCalibration.h"
 DEFINE_FWK_EVENTSETUP_SOURCE(RPCFakeCalibration);
diff --git a/CalibPPS/ESProducers/plugins/CTPPSInterpolatedOpticalFunctionsESSource.cc b/CalibPPS/ESProducers/plugins/CTPPSInterpolatedOpticalFunctionsESSource.cc
index d56847c8b9384..45e624c956e84 100644
--- a/CalibPPS/ESProducers/plugins/CTPPSInterpolatedOpticalFunctionsESSource.cc
+++ b/CalibPPS/ESProducers/plugins/CTPPSInterpolatedOpticalFunctionsESSource.cc
@@ -74,11 +74,12 @@ std::shared_ptr<LHCInterpolatedOpticalFunctionsSetCollection> CTPPSInterpolatedO
     return currentData_;
 
   // is crossing angle reasonable (LHCInfo is correctly filled in DB)?
-  if (currentCrossingAngle_ == 0.)
+  if (hLHCInfo->crossingAngle() == 0.)
   {
     edm::LogInfo("CTPPSInterpolatedOpticalFunctionsESSource") << "Invalid crossing angle, no optical functions produced.";
 
     currentDataValid_ = false;
+    currentCrossingAngle_ = -1;
     currentData_ = std::make_shared<LHCInterpolatedOpticalFunctionsSetCollection>();
 
     return currentData_;
diff --git a/CalibTracker/SiPixelConnectivity/interface/PixelBarrelLinkMaker.h b/CalibTracker/SiPixelConnectivity/interface/PixelBarrelLinkMaker.h
index 99d14f5623498..9311c9b78a02b 100644
--- a/CalibTracker/SiPixelConnectivity/interface/PixelBarrelLinkMaker.h
+++ b/CalibTracker/SiPixelConnectivity/interface/PixelBarrelLinkMaker.h
@@ -5,7 +5,6 @@
  * Assign barrel pixel modules (defined by name and unit) to links
  */
 
-
 #include <boost/cstdint.hpp>
 #include <vector>
 
@@ -18,43 +17,48 @@ class PixelBarrelName;
 
 class PixelBarrelLinkMaker {
 public:
-  typedef sipixelobjects::PixelFEDCabling  PixelFEDCabling;
+  typedef sipixelobjects::PixelFEDCabling PixelFEDCabling;
   typedef sipixelobjects::PixelFEDLink PixelFEDLink;
   typedef sipixelobjects::PixelROC PixelROC;
 
-  typedef std::vector<PixelModuleName* > Names;
+  typedef std::vector<PixelModuleName*> Names;
   typedef std::vector<uint32_t> DetUnits;
   typedef PixelFEDCabling::Links Links;
   typedef TRange<int> Range;
 
   /// ctor from owner
-  PixelBarrelLinkMaker(const PixelFEDCabling * o) : theOwner(o) { }
+  PixelBarrelLinkMaker(const PixelFEDCabling* o) : theOwner(o) {}
 
   /// construct links
-  /// Each barrel module triggers one or two link Items. 
-  /// They are sorted according to Order(). 
+  /// Each barrel module triggers one or two link Items.
+  /// They are sorted according to Order().
   /// The ROCs corresponding to items are created. The link is
   /// form from link items and ROCS.
-  Links links( const Names & n, const DetUnits & u) const;
+  Links links(const Names& n, const DetUnits& u) const;
 
 private:
-  const PixelFEDCabling * theOwner;
+  const PixelFEDCabling* theOwner;
 
-  /// link item. 
-  /// defined by DetUnit with name (representing Pixel Detector module) 
-  /// and Ids of associated ROCs. The Id is the ROC number in module according 
+  /// link item.
+  /// defined by DetUnit with name (representing Pixel Detector module)
+  /// and Ids of associated ROCs. The Id is the ROC number in module according
   /// to PixelDatabase.
-  struct Item { const PixelBarrelName * name; uint32_t unit; Range rocIds; };
+  struct Item {
+    const PixelBarrelName* name;
+    uint32_t unit;
+    Range rocIds;
+  };
 
-  /// define order of items in a link. 
+  /// define order of items in a link.
   /// Highest priority to layer id.
   /// Second priority for ladder id (phi).
   /// Third priority by abs(module) (ie. along |z|)
   /// If all equal id of ROC matters
-  struct Order { bool operator() (const Item&, const Item&) const; } ;
+  struct Order {
+    bool operator()(const Item&, const Item&) const;
+  };
 
 private:
-  
 };
 
 #endif
diff --git a/CalibTracker/SiPixelConnectivity/interface/PixelEndcapLinkMaker.h b/CalibTracker/SiPixelConnectivity/interface/PixelEndcapLinkMaker.h
index efac3238cae60..713e24ec7fca4 100644
--- a/CalibTracker/SiPixelConnectivity/interface/PixelEndcapLinkMaker.h
+++ b/CalibTracker/SiPixelConnectivity/interface/PixelEndcapLinkMaker.h
@@ -13,28 +13,27 @@ class PixelEndcapName;
 
 class PixelEndcapLinkMaker {
 public:
-
-  typedef sipixelobjects::PixelFEDCabling  PixelFEDCabling;
+  typedef sipixelobjects::PixelFEDCabling PixelFEDCabling;
   typedef sipixelobjects::PixelFEDLink PixelFEDLink;
   typedef sipixelobjects::PixelROC PixelROC;
 
-  typedef std::vector<PixelModuleName* > Names;
+  typedef std::vector<PixelModuleName*> Names;
   typedef std::vector<uint32_t> DetUnits;
-  typedef PixelFEDCabling::Links  Links;
+  typedef PixelFEDCabling::Links Links;
   typedef TRange<int> Range;
 
   /// ctor from owner
-  PixelEndcapLinkMaker(const PixelFEDCabling * o) : theOwner(o) { }
+  PixelEndcapLinkMaker(const PixelFEDCabling* o) : theOwner(o) {}
 
   /// construct links
   /// Each Endcap module triggers one or two link Items.
   /// They are sorted according to Order().
   /// The ROCs corresponding to items are created. The link is
   /// form from link items and ROCS.
-  Links links( const Names & n, const DetUnits & u) const;
+  Links links(const Names& n, const DetUnits& u) const;
 
 private:
-  const PixelFEDCabling * theOwner;
+  const PixelFEDCabling* theOwner;
 
   /// link item.
   /// defined by DetUnit with name (representing Pixel Detector module)
@@ -42,9 +41,11 @@ class PixelEndcapLinkMaker {
   /// to PixelDatabase.
   /// The Item represents one module (DetUnit+name) with the Plaquette type
   /// and associated ROCs Ids given explicitly (Id is the ROC number in module)
-  struct Item { const PixelEndcapName * name;
-                uint32_t unit;
-                Range rocIds; };
+  struct Item {
+    const PixelEndcapName* name;
+    uint32_t unit;
+    Range rocIds;
+  };
 
   /// define order of link components.
   /// Highest priority to Endcap id (forward or backward endcpa)
@@ -53,12 +54,11 @@ class PixelEndcapLinkMaker {
   /// Next panned
   /// To compare order of modules in one pannel plaquette id is used.
   /// The order of plaquettes define order of ROCs in link
-  struct Order { bool operator() (const Item&, const Item&) const; } ;
+  struct Order {
+    bool operator()(const Item&, const Item&) const;
+  };
 
 private:
-
 };
 
 #endif
-
-
diff --git a/CalibTracker/SiPixelConnectivity/interface/PixelToFEDAssociate.h b/CalibTracker/SiPixelConnectivity/interface/PixelToFEDAssociate.h
index 9fc70a8a7f0f0..4b17e1b12588c 100644
--- a/CalibTracker/SiPixelConnectivity/interface/PixelToFEDAssociate.h
+++ b/CalibTracker/SiPixelConnectivity/interface/PixelToFEDAssociate.h
@@ -10,12 +10,17 @@
 
 #include "DataFormats/SiPixelDetId/interface/PixelModuleName.h"
 
-
 class PixelToFEDAssociate {
 public:
-
-  struct CablingRocId { int fedId; int linkId; int rocLinkId; }; 
-  struct DetectorRocId { const PixelModuleName * module; int rocDetId; };
+  struct CablingRocId {
+    int fedId;
+    int linkId;
+    int rocLinkId;
+  };
+  struct DetectorRocId {
+    const PixelModuleName *module;
+    int rocDetId;
+  };
 
   virtual ~PixelToFEDAssociate() {}
 
@@ -23,13 +28,9 @@ class PixelToFEDAssociate {
   virtual std::string version() const = 0;
 
   /// FED id for module
-  virtual int operator()(const PixelModuleName &) const {
-    return 0;
-  } 
+  virtual int operator()(const PixelModuleName &) const { return 0; }
 
   /// LNK id for module
-  virtual const CablingRocId * operator()(const DetectorRocId & roc) const {
-    return nullptr;
-  }
+  virtual const CablingRocId *operator()(const DetectorRocId &roc) const { return nullptr; }
 };
-#endif 
+#endif
diff --git a/CalibTracker/SiPixelConnectivity/interface/PixelToFEDAssociateFromAscii.h b/CalibTracker/SiPixelConnectivity/interface/PixelToFEDAssociateFromAscii.h
index 15715c179a471..85f8750a1bceb 100644
--- a/CalibTracker/SiPixelConnectivity/interface/PixelToFEDAssociateFromAscii.h
+++ b/CalibTracker/SiPixelConnectivity/interface/PixelToFEDAssociateFromAscii.h
@@ -16,12 +16,9 @@ class PixelBarrelName;
 class PixelEndcapName;
 class PixelModuleName;
 
-
-
 class PixelToFEDAssociateFromAscii : public PixelToFEDAssociate {
 public:
-
-  PixelToFEDAssociateFromAscii(const std::string & fileName);
+  PixelToFEDAssociateFromAscii(const std::string &fileName);
 
   /// FED id for module
   int operator()(const PixelModuleName &) const override;
@@ -29,42 +26,46 @@ class PixelToFEDAssociateFromAscii : public PixelToFEDAssociate {
   /// version
   std::string version() const override;
 
-
-  /// FED id to which barrel modul (identified by name) should be assigned 
+  /// FED id to which barrel modul (identified by name) should be assigned
   int operator()(const PixelBarrelName &) const;
 
-  /// FED id to which endcape modul (identified by name) should be assigned 
+  /// FED id to which endcape modul (identified by name) should be assigned
   int operator()(const PixelEndcapName &) const;
 
 private:
   /// initialisatin (read file)
-  void init( const std::string & fileName);
+  void init(const std::string &fileName);
 
-
-  typedef TRange<int> Range; 
+  typedef TRange<int> Range;
 
   /// define allowed (layer,module,ladder) ranges for barrel units,
   /// check if module represented by name falls in allowed ranges
-  struct Bdu { int b; Range l,z,f; bool operator()(const PixelBarrelName&) const;};
+  struct Bdu {
+    int b;
+    Range l, z, f;
+    bool operator()(const PixelBarrelName &) const;
+  };
 
   /// define allowed (endcap,disk,blade) ranges for endcap units,
   /// check if module represented by name falls in allowed ranges
-  struct Edu { int e; Range d,b; bool operator()(const PixelEndcapName&) const;};
-
-  typedef std::vector< std::pair< int, std::vector<Bdu> > > BarrelConnections;
-  typedef std::vector< std::pair< int, std::vector<Edu> > > EndcapConnections;
+  struct Edu {
+    int e;
+    Range d, b;
+    bool operator()(const PixelEndcapName &) const;
+  };
+
+  typedef std::vector<std::pair<int, std::vector<Bdu> > > BarrelConnections;
+  typedef std::vector<std::pair<int, std::vector<Edu> > > EndcapConnections;
   BarrelConnections theBarrel;
   EndcapConnections theEndcap;
 
 private:
-
   std::string theVersion;
 
   /// initialisation (read input file)
-  void send (std::pair< int, std::vector<Bdu> > & , 
-      std::pair< int, std::vector<Edu> > & ) ;
-  Bdu getBdu( std::string ) const;
-  Edu getEdu( std::string ) const;
-  Range readRange( const std::string &) const;
+  void send(std::pair<int, std::vector<Bdu> > &, std::pair<int, std::vector<Edu> > &);
+  Bdu getBdu(std::string) const;
+  Edu getEdu(std::string) const;
+  Range readRange(const std::string &) const;
 };
-#endif 
+#endif
diff --git a/CalibTracker/SiPixelConnectivity/interface/PixelToLNKAssociateFromAscii.h b/CalibTracker/SiPixelConnectivity/interface/PixelToLNKAssociateFromAscii.h
index 46c932ff04987..7263e276436c2 100644
--- a/CalibTracker/SiPixelConnectivity/interface/PixelToLNKAssociateFromAscii.h
+++ b/CalibTracker/SiPixelConnectivity/interface/PixelToLNKAssociateFromAscii.h
@@ -19,27 +19,25 @@ class PixelModuleName;
 
 class PixelToLNKAssociateFromAscii : public PixelToFEDAssociate {
 public:
-
   typedef PixelToFEDAssociate::CablingRocId CablingRocId;
   typedef PixelToFEDAssociate::DetectorRocId DetectorRocId;
 
-  PixelToLNKAssociateFromAscii(const std::string & fileName, const bool phase1=false);
+  PixelToLNKAssociateFromAscii(const std::string& fileName, const bool phase1 = false);
 
-  const CablingRocId * operator()(const DetectorRocId& roc) const override;
+  const CablingRocId* operator()(const DetectorRocId& roc) const override;
 
   /// version
   std::string version() const override;
 
 private:
-  typedef TRange<int> Range; 
+  typedef TRange<int> Range;
 
   /// initialisatin (read file)
-  void init( const std::string & fileName);
-  void addConnections( int fedId, int linkId, std::string module, Range rocDetIds);
+  void init(const std::string& fileName);
+  void addConnections(int fedId, int linkId, std::string module, Range rocDetIds);
   std::string theVersion;
-  std::vector< std::pair<DetectorRocId,CablingRocId> > theConnection;
-  Range readRange( const std::string &) const;
-  bool phase1_; // signals phase1 detector
-    
+  std::vector<std::pair<DetectorRocId, CablingRocId> > theConnection;
+  Range readRange(const std::string&) const;
+  bool phase1_;  // signals phase1 detector
 };
-#endif 
+#endif
diff --git a/CalibTracker/SiPixelConnectivity/interface/SiPixelFedCablingMapBuilder.h b/CalibTracker/SiPixelConnectivity/interface/SiPixelFedCablingMapBuilder.h
index 9c75267da5f09..6415a2c9b22fa 100644
--- a/CalibTracker/SiPixelConnectivity/interface/SiPixelFedCablingMapBuilder.h
+++ b/CalibTracker/SiPixelConnectivity/interface/SiPixelFedCablingMapBuilder.h
@@ -11,22 +11,21 @@
 class PixelModuleName;
 class PixelGeomDetUnit;
 
-class SiPixelFedCablingMapBuilder{
+class SiPixelFedCablingMapBuilder {
 public:
   //SiPixelFedCablingMapBuilder(const std::string & associatorName);
-  SiPixelFedCablingMapBuilder(const std::string fileName, const bool phase1=false);
-  SiPixelFedCablingTree* produce(const edm::EventSetup& setup);  
+  SiPixelFedCablingMapBuilder(const std::string fileName, const bool phase1 = false);
+  SiPixelFedCablingTree* produce(const edm::EventSetup& setup);
 
 private:
-
   struct FedSpec {
-      int fedId;                             // fed ID
-      std::vector<PixelModuleName* > names;  // names of modules
-      std::vector<uint32_t> rawids;          // modules corresponding to names
+    int fedId;                            // fed ID
+    std::vector<PixelModuleName*> names;  // names of modules
+    std::vector<uint32_t> rawids;         // modules corresponding to names
   };
   //std::string theAssociatorName;
   std::string fileName_;
-  std::string myprint(const PixelGeomDetUnit * pxUnit);  
+  std::string myprint(const PixelGeomDetUnit* pxUnit);
   bool phase1_;
 };
 
diff --git a/CalibTracker/SiPixelConnectivity/interface/TRange.h b/CalibTracker/SiPixelConnectivity/interface/TRange.h
index 1f90702719107..833d8a8d5cac9 100644
--- a/CalibTracker/SiPixelConnectivity/interface/TRange.h
+++ b/CalibTracker/SiPixelConnectivity/interface/TRange.h
@@ -7,36 +7,35 @@
 #include <utility>
 #include <algorithm>
 
-
-template<class T> class TRange : public std::pair<T,T> {
+template <class T>
+class TRange : public std::pair<T, T> {
 public:
+  TRange() {}
 
-  TRange() { }
-
-  TRange(const T & aMin, const T & aMax) 
-      : std::pair<T,T> (aMin,aMax) { }
+  TRange(const T& aMin, const T& aMax) : std::pair<T, T>(aMin, aMax) {}
 
-  TRange(const std::pair<T,T> & apair ) 
-      : std::pair<T,T> (apair) { }  
+  TRange(const std::pair<T, T>& apair) : std::pair<T, T>(apair) {}
 
-  /// lower edge of range 
-  const T & min() const { return this->first; }
+  /// lower edge of range
+  const T& min() const { return this->first; }
 
   /// upper edge of range
-  const T & max() const { return this->second; }
+  const T& max() const { return this->second; }
 
-  T mean() const { return (this->first+this->second)/2.; }
+  T mean() const { return (this->first + this->second) / 2.; }
 
   /// true for empty region. note that region [x,x] is not empty
   bool empty() const { return (this->second < this->first); }
 
   /// check if object is inside region
-  bool inside(const T & value) const {
-    if (value < this->first || this->second < value)  return false; 
-    else  return true;
+  bool inside(const T& value) const {
+    if (value < this->first || this->second < value)
+      return false;
+    else
+      return true;
   }
 
-/*
+  /*
   /// check if ranges overlap
   bool hasIntersection( const TRange<T> & r) const {
     return rangesIntersect(*this,r); 
@@ -50,19 +49,23 @@ template<class T> class TRange : public std::pair<T,T> {
 */
 
   /// sum of overlaping regions. the overlapping should be checked before.
-  TRange<T> sum(const TRange<T> & r) const {
-   if( this->empty()) return r;
-   else if( r.empty()) return *this;
-   else return TRange( (min() < r.min()) ? min() : r.min(), 
-      (max() < r.max()) ? r.max() : max()); 
+  TRange<T> sum(const TRange<T>& r) const {
+    if (this->empty())
+      return r;
+    else if (r.empty())
+      return *this;
+    else
+      return TRange((min() < r.min()) ? min() : r.min(), (max() < r.max()) ? r.max() : max());
   }
 
-  void sort() { if (empty() ) std::swap(this->first,this->second); }
+  void sort() {
+    if (empty())
+      std::swap(this->first, this->second);
+  }
 };
 
-template <class T> std::ostream & operator<<( 
-    std::ostream& out, const TRange<T>& r) 
-{
-  return out << "("<<r.min()<<","<<r.max()<<")";
+template <class T>
+std::ostream& operator<<(std::ostream& out, const TRange<T>& r) {
+  return out << "(" << r.min() << "," << r.max() << ")";
 }
 #endif
diff --git a/CalibTracker/SiPixelConnectivity/plugins/PixelToFEDAssociateFromAsciiESProducer.cc b/CalibTracker/SiPixelConnectivity/plugins/PixelToFEDAssociateFromAsciiESProducer.cc
index eb19351aa573c..241e65cef7453 100644
--- a/CalibTracker/SiPixelConnectivity/plugins/PixelToFEDAssociateFromAsciiESProducer.cc
+++ b/CalibTracker/SiPixelConnectivity/plugins/PixelToFEDAssociateFromAsciiESProducer.cc
@@ -4,21 +4,15 @@
 
 using namespace edm;
 
-PixelToFEDAssociateFromAsciiESProducer::
-    PixelToFEDAssociateFromAsciiESProducer(const edm::ParameterSet & p)
-    : theConfig(p)
-{
+PixelToFEDAssociateFromAsciiESProducer::PixelToFEDAssociateFromAsciiESProducer(const edm::ParameterSet& p)
+    : theConfig(p) {
   std::string myname = "PixelToFEDAssociateFromAscii";
-  setWhatProduced(this,myname);
+  setWhatProduced(this, myname);
 }
 
-PixelToFEDAssociateFromAsciiESProducer::
-    ~PixelToFEDAssociateFromAsciiESProducer()
-{ }
+PixelToFEDAssociateFromAsciiESProducer::~PixelToFEDAssociateFromAsciiESProducer() {}
 
-std::unique_ptr<PixelToFEDAssociate> PixelToFEDAssociateFromAsciiESProducer::
-    produce(const TrackerDigiGeometryRecord & r)
-{
+std::unique_ptr<PixelToFEDAssociate> PixelToFEDAssociateFromAsciiESProducer::produce(
+    const TrackerDigiGeometryRecord& r) {
   return std::make_unique<PixelToFEDAssociateFromAscii>(theConfig.getParameter<std::string>("fileName"));
 }
-
diff --git a/CalibTracker/SiPixelConnectivity/plugins/PixelToFEDAssociateFromAsciiESProducer.h b/CalibTracker/SiPixelConnectivity/plugins/PixelToFEDAssociateFromAsciiESProducer.h
index 495b919349d92..f8a8eb53b8e9c 100644
--- a/CalibTracker/SiPixelConnectivity/plugins/PixelToFEDAssociateFromAsciiESProducer.h
+++ b/CalibTracker/SiPixelConnectivity/plugins/PixelToFEDAssociateFromAsciiESProducer.h
@@ -1,7 +1,7 @@
 #ifndef PixelToFEDAssociateFromAsciiESProducer_H
 #define PixelToFEDAssociateFromAsciiESProducer_H
 
-#include  "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include <memory>
 
@@ -10,12 +10,12 @@
 
 class PixelToFEDAssociateFromAsciiESProducer : public edm::ESProducer {
 public:
-  PixelToFEDAssociateFromAsciiESProducer(const edm::ParameterSet & p);
+  PixelToFEDAssociateFromAsciiESProducer(const edm::ParameterSet& p);
   ~PixelToFEDAssociateFromAsciiESProducer() override;
   std::unique_ptr<PixelToFEDAssociate> produce(const TrackerDigiGeometryRecord&);
+
 private:
   edm::ParameterSet theConfig;
 };
 
 #endif
-
diff --git a/CalibTracker/SiPixelConnectivity/plugins/PixelToLNKAssociateFromAsciiESProducer.cc b/CalibTracker/SiPixelConnectivity/plugins/PixelToLNKAssociateFromAsciiESProducer.cc
index 8cec88a459e58..61d20a962bd4c 100644
--- a/CalibTracker/SiPixelConnectivity/plugins/PixelToLNKAssociateFromAsciiESProducer.cc
+++ b/CalibTracker/SiPixelConnectivity/plugins/PixelToLNKAssociateFromAsciiESProducer.cc
@@ -4,21 +4,15 @@
 
 using namespace edm;
 
-PixelToLNKAssociateFromAsciiESProducer::
-    PixelToLNKAssociateFromAsciiESProducer(const edm::ParameterSet & p)
-    : theConfig(p)
-{
+PixelToLNKAssociateFromAsciiESProducer::PixelToLNKAssociateFromAsciiESProducer(const edm::ParameterSet& p)
+    : theConfig(p) {
   std::string myname = "PixelToLNKAssociateFromAscii";
-  setWhatProduced(this,myname);
+  setWhatProduced(this, myname);
 }
 
-PixelToLNKAssociateFromAsciiESProducer::
-    ~PixelToLNKAssociateFromAsciiESProducer()
-{ }
+PixelToLNKAssociateFromAsciiESProducer::~PixelToLNKAssociateFromAsciiESProducer() {}
 
-std::unique_ptr<PixelToFEDAssociate> PixelToLNKAssociateFromAsciiESProducer::
-    produce(const TrackerDigiGeometryRecord & r)
-{
+std::unique_ptr<PixelToFEDAssociate> PixelToLNKAssociateFromAsciiESProducer::produce(
+    const TrackerDigiGeometryRecord& r) {
   return std::make_unique<PixelToLNKAssociateFromAscii>(theConfig.getParameter<std::string>("fileName"));
 }
-
diff --git a/CalibTracker/SiPixelConnectivity/plugins/PixelToLNKAssociateFromAsciiESProducer.h b/CalibTracker/SiPixelConnectivity/plugins/PixelToLNKAssociateFromAsciiESProducer.h
index c2aed533938ff..0ccbc552afa66 100644
--- a/CalibTracker/SiPixelConnectivity/plugins/PixelToLNKAssociateFromAsciiESProducer.h
+++ b/CalibTracker/SiPixelConnectivity/plugins/PixelToLNKAssociateFromAsciiESProducer.h
@@ -1,7 +1,7 @@
 #ifndef PixelToLNKAssociateFromAsciiESProducer_H
 #define PixelToLNKAssociateFromAsciiESProducer_H
 
-#include  "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include <memory>
 
@@ -10,12 +10,12 @@
 
 class PixelToLNKAssociateFromAsciiESProducer : public edm::ESProducer {
 public:
-  PixelToLNKAssociateFromAsciiESProducer(const edm::ParameterSet & p);
+  PixelToLNKAssociateFromAsciiESProducer(const edm::ParameterSet& p);
   ~PixelToLNKAssociateFromAsciiESProducer() override;
   std::unique_ptr<PixelToFEDAssociate> produce(const TrackerDigiGeometryRecord&);
+
 private:
   edm::ParameterSet theConfig;
 };
 
 #endif
-
diff --git a/CalibTracker/SiPixelConnectivity/src/PixelBarrelLinkMaker.cc b/CalibTracker/SiPixelConnectivity/src/PixelBarrelLinkMaker.cc
index 0024986fb9578..fa6f11c7a486d 100644
--- a/CalibTracker/SiPixelConnectivity/src/PixelBarrelLinkMaker.cc
+++ b/CalibTracker/SiPixelConnectivity/src/PixelBarrelLinkMaker.cc
@@ -9,96 +9,96 @@
 using namespace std;
 using namespace sipixelobjects;
 
-bool PixelBarrelLinkMaker::Order::operator() 
-    (const Item &u1, const Item& u2) const
-{
-  const PixelBarrelName & n1 = *u1.name;
-  const PixelBarrelName & n2 = *u2.name;
+bool PixelBarrelLinkMaker::Order::operator()(const Item& u1, const Item& u2) const {
+  const PixelBarrelName& n1 = *u1.name;
+  const PixelBarrelName& n2 = *u2.name;
 
   bool res = false;
 
-       if ( n1.layerName() < n2.layerName() ) res = true;
-  else if ( n1.layerName() > n2.layerName() ) res = false;
-  else if ( n1.ladderName() < n2.ladderName() ) res = true;
-  else if ( n1.ladderName() > n2.ladderName() ) res = false;
-  else if ( abs(n1.moduleName()) < abs(n2.moduleName()) ) res =  true;
-  else if ( abs(n1.moduleName()) > abs(n2.moduleName()) ) res =  false;
-  else if ( u1.rocIds.min() < u2.rocIds.min() ) res = true;
-  else if ( u1.rocIds.min() > u2.rocIds.min() ) res = false;
+  if (n1.layerName() < n2.layerName())
+    res = true;
+  else if (n1.layerName() > n2.layerName())
+    res = false;
+  else if (n1.ladderName() < n2.ladderName())
+    res = true;
+  else if (n1.ladderName() > n2.ladderName())
+    res = false;
+  else if (abs(n1.moduleName()) < abs(n2.moduleName()))
+    res = true;
+  else if (abs(n1.moduleName()) > abs(n2.moduleName()))
+    res = false;
+  else if (u1.rocIds.min() < u2.rocIds.min())
+    res = true;
+  else if (u1.rocIds.min() > u2.rocIds.min())
+    res = false;
 
   return res;
 }
 
-PixelBarrelLinkMaker::Links PixelBarrelLinkMaker::links( 
-    const Names & n, const DetUnits & u) const
-{
-
+PixelBarrelLinkMaker::Links PixelBarrelLinkMaker::links(const Names& n, const DetUnits& u) const {
   Links result;
   typedef Names::const_iterator CIN;
 
   //
-  // construct link items from names. 
+  // construct link items from names.
   // the item is equivalent to name for layer=3.
   // for layer=1,2 each module has 2 links
   //
   vector<Item> linkItems;
   typedef vector<Item>::const_iterator CIU;
 
-  for(unsigned int idx = 0; idx < n.size(); idx++) {
+  for (unsigned int idx = 0; idx < n.size(); idx++) {
     Item item;
-    PixelBarrelName * b = dynamic_cast<PixelBarrelName * >(n[idx]);
+    PixelBarrelName* b = dynamic_cast<PixelBarrelName*>(n[idx]);
     uint32_t d = u[idx];
     item.name = b;
     item.unit = d;
 
-    if ( b->isHalfModule()) {
-      item.rocIds = Range(0,7);      // half modules 
+    if (b->isHalfModule()) {
+      item.rocIds = Range(0, 7);  // half modules
       linkItems.push_back(item);
-    } else if(b->layerName() <= 2) {
-      item.rocIds = Range(0,7);      // first link for modules in Layer=1,2
+    } else if (b->layerName() <= 2) {
+      item.rocIds = Range(0, 7);  // first link for modules in Layer=1,2
       linkItems.push_back(item);
-      item.rocIds = Range(8,15);     // second link for modules in Layer=1,2
+      item.rocIds = Range(8, 15);  // second link for modules in Layer=1,2
       linkItems.push_back(item);
     } else {
-      item.rocIds = Range(0,15);    // one module per link 
-      linkItems.push_back(item);     
+      item.rocIds = Range(0, 15);  // one module per link
+      linkItems.push_back(item);
     }
   }
 
-
-
   //
   // sort link items to get the order as in links
   //
-  
+
   Order myLess;
-  sort( linkItems.begin(), linkItems.end(), myLess );
+  sort(linkItems.begin(), linkItems.end(), myLess);
 
   //
   // DEBUG
   //
   ostringstream str;
   for (CIU it = linkItems.begin(); it != linkItems.end(); it++) {
-    str << (*it).name->name() <<" r="<< (*it).rocIds << endl;
+    str << (*it).name->name() << " r=" << (*it).rocIds << endl;
   }
   LogDebug(" sorted BARREL links: ") << str.str();
 
-
   //
   // create corresponding PixelROC and link
   //
   int idLink = 0;
   result.reserve(linkItems.size());
   for (CIU it = linkItems.begin(); it != linkItems.end(); it++) {
-    PixelFEDLink::ROCs rocs; 
+    PixelFEDLink::ROCs rocs;
     PixelFEDLink link(++idLink);
     int idRoc = 0;
     for (int id = (*it).rocIds.min(); id <= (*it).rocIds.max(); id++) {
       idRoc++;
-      rocs.push_back( PixelROC( it->unit, id, idRoc) ); 
+      rocs.push_back(PixelROC(it->unit, id, idRoc));
     }
     link.add(rocs);
-    result.push_back(link); 
+    result.push_back(link);
   }
 
   return result;
diff --git a/CalibTracker/SiPixelConnectivity/src/PixelEndcapLinkMaker.cc b/CalibTracker/SiPixelConnectivity/src/PixelEndcapLinkMaker.cc
index 4b14c15317ccd..47d191ce97ad4 100644
--- a/CalibTracker/SiPixelConnectivity/src/PixelEndcapLinkMaker.cc
+++ b/CalibTracker/SiPixelConnectivity/src/PixelEndcapLinkMaker.cc
@@ -8,32 +8,37 @@
 using namespace std;
 using namespace sipixelobjects;
 
-bool PixelEndcapLinkMaker::Order::operator()
-    (const Item &u1, const Item& u2) const
-{
+bool PixelEndcapLinkMaker::Order::operator()(const Item& u1, const Item& u2) const {
   bool res = true;
-  const PixelEndcapName & n1 = *u1.name;
-  const PixelEndcapName & n2 = *u2.name;
-
-  if (n1.halfCylinder() < n2.halfCylinder() ) res = true;
-  else if(n1.halfCylinder() > n2.halfCylinder() ) res = false;
-  else if (n1.diskName() < n2.diskName() ) res =  true;
-  else if (n1.diskName() > n2.diskName() ) res =  false;
-  else if (n1.bladeName() < n2.bladeName() ) res =  true;
-  else if (n1.bladeName() > n2.bladeName() ) res =  false;
-  else if (n1.pannelName() < n2.pannelName() ) res =  true;
-  else if (n1.pannelName() > n2.pannelName() ) res =  false;
-  else if (n1.plaquetteName() < n2.plaquetteName() ) res =  true;
-  else if (n1.plaquetteName() > n2.plaquetteName() ) res =  false;
+  const PixelEndcapName& n1 = *u1.name;
+  const PixelEndcapName& n2 = *u2.name;
+
+  if (n1.halfCylinder() < n2.halfCylinder())
+    res = true;
+  else if (n1.halfCylinder() > n2.halfCylinder())
+    res = false;
+  else if (n1.diskName() < n2.diskName())
+    res = true;
+  else if (n1.diskName() > n2.diskName())
+    res = false;
+  else if (n1.bladeName() < n2.bladeName())
+    res = true;
+  else if (n1.bladeName() > n2.bladeName())
+    res = false;
+  else if (n1.pannelName() < n2.pannelName())
+    res = true;
+  else if (n1.pannelName() > n2.pannelName())
+    res = false;
+  else if (n1.plaquetteName() < n2.plaquetteName())
+    res = true;
+  else if (n1.plaquetteName() > n2.plaquetteName())
+    res = false;
 
   return res;
 }
 
-PixelEndcapLinkMaker::Links PixelEndcapLinkMaker::links(
-    const Names & n, const DetUnits & u) const
-{
-    
-  Links result; 
+PixelEndcapLinkMaker::Links PixelEndcapLinkMaker::links(const Names& n, const DetUnits& u) const {
+  Links result;
   typedef Names::const_iterator CIN;
 
   //
@@ -42,23 +47,37 @@ PixelEndcapLinkMaker::Links PixelEndcapLinkMaker::links(
   vector<Item> linkItems;
   typedef vector<Item>::const_iterator CIU;
 
-
-  for(unsigned int idx = 0; idx < n.size(); idx++) {
+  for (unsigned int idx = 0; idx < n.size(); idx++) {
     Item item;
-    PixelEndcapName * e = dynamic_cast<PixelEndcapName * >(n[idx]);
+    PixelEndcapName* e = dynamic_cast<PixelEndcapName*>(n[idx]);
     uint32_t d = u[idx];
     item.name = e;
     item.unit = d;
-    Range rocIds(-1,-1);
-    PixelModuleName::ModuleType type = e->moduleType(); 
+    Range rocIds(-1, -1);
+    PixelModuleName::ModuleType type = e->moduleType();
     switch (type) {
-      case(PixelModuleName::v1x2) : { rocIds = Range(0,1); break; }
-      case(PixelModuleName::v1x5) : { rocIds = Range(0,4); break; }
-      case(PixelModuleName::v2x3) : { rocIds = Range(0,5); break; }
-      case(PixelModuleName::v2x4) : { rocIds = Range(0,7); break; }
-      case(PixelModuleName::v2x5) : { rocIds = Range(0,9); break; }
+      case (PixelModuleName::v1x2): {
+        rocIds = Range(0, 1);
+        break;
+      }
+      case (PixelModuleName::v1x5): {
+        rocIds = Range(0, 4);
+        break;
+      }
+      case (PixelModuleName::v2x3): {
+        rocIds = Range(0, 5);
+        break;
+      }
+      case (PixelModuleName::v2x4): {
+        rocIds = Range(0, 7);
+        break;
+      }
+      case (PixelModuleName::v2x5): {
+        rocIds = Range(0, 9);
+        break;
+      }
       default:
-        edm::LogError("PixelEndcapLinkMaker")<< " *** UNEXPECTED roc: " << e->name() ;
+        edm::LogError("PixelEndcapLinkMaker") << " *** UNEXPECTED roc: " << e->name();
     };
     item.rocIds = rocIds;
     linkItems.push_back(item);
@@ -67,14 +86,14 @@ PixelEndcapLinkMaker::Links PixelEndcapLinkMaker::links(
   // sort names to get the order as in links
   //
 
-  sort( linkItems.begin(), linkItems.end(), Order() );
+  sort(linkItems.begin(), linkItems.end(), Order());
 
   //
   // DEBUG
   //
   ostringstream str;
   for (CIU it = linkItems.begin(); it != linkItems.end(); it++) {
-    str << (*it).name->name() <<" r="<< (*it).rocIds << endl;
+    str << (*it).name->name() << " r=" << (*it).rocIds << endl;
   }
   LogDebug(" sorted ENDCAP links: ") << str.str();
 
@@ -82,30 +101,29 @@ PixelEndcapLinkMaker::Links PixelEndcapLinkMaker::links(
   int lastPannelId = -1;
   int idLink = 0;
   int idRoc = 0;
-  PixelFEDLink link(idLink); // dummy object, id=0
+  PixelFEDLink link(idLink);  // dummy object, id=0
 
   for (CIU it = linkItems.begin(); it != linkItems.end(); it++) {
     PixelFEDLink::ROCs rocs;
     int pannelId = it->name->pannelName();
 
-    if ( pannelId != lastPannelId ) {
+    if (pannelId != lastPannelId) {
       lastPannelId = pannelId;
-      if (idLink > 0) result.push_back(link);
+      if (idLink > 0)
+        result.push_back(link);
       idRoc = 0;
-      link = PixelFEDLink(++idLink); // real link, to be filled
+      link = PixelFEDLink(++idLink);  // real link, to be filled
     }
 
-    for (int id = (*it).rocIds.min(); id <= (*it).rocIds.max(); id++) { 
-     ++idRoc;
-     rocs.push_back( PixelROC( it->unit, id, idRoc ) );
+    for (int id = (*it).rocIds.min(); id <= (*it).rocIds.max(); id++) {
+      ++idRoc;
+      rocs.push_back(PixelROC(it->unit, id, idRoc));
     }
 
-    link.add( rocs);
+    link.add(rocs);
   }
 
-  if (idLink > 0) result.push_back(link);
+  if (idLink > 0)
+    result.push_back(link);
   return result;
 }
-
-
-
diff --git a/CalibTracker/SiPixelConnectivity/src/PixelToFEDAssociateFromAscii.cc b/CalibTracker/SiPixelConnectivity/src/PixelToFEDAssociateFromAscii.cc
index 21d8dd3a9eae6..09cf644674317 100644
--- a/CalibTracker/SiPixelConnectivity/src/PixelToFEDAssociateFromAscii.cc
+++ b/CalibTracker/SiPixelConnectivity/src/PixelToFEDAssociateFromAscii.cc
@@ -10,129 +10,108 @@
 
 using namespace std;
 
+PixelToFEDAssociateFromAscii::PixelToFEDAssociateFromAscii(const string& fn) { init(fn); }
+std::string PixelToFEDAssociateFromAscii::version() const { return theVersion; }
 
-PixelToFEDAssociateFromAscii::PixelToFEDAssociateFromAscii(const string & fn) {
-  init(fn);
-}
-std::string PixelToFEDAssociateFromAscii::version() const
-{
-  return theVersion; 
-}
-
-int PixelToFEDAssociateFromAscii::operator()(const PixelModuleName & id) const 
-{
-  return id.isBarrel() ?
-    operator()(dynamic_cast<const PixelBarrelName & >(id)) :
-    operator()(dynamic_cast<const PixelEndcapName & >(id)) ;
+int PixelToFEDAssociateFromAscii::operator()(const PixelModuleName& id) const {
+  return id.isBarrel() ? operator()(dynamic_cast<const PixelBarrelName&>(id)) :
+                       operator()(dynamic_cast<const PixelEndcapName&>(id));
 }
 
-int PixelToFEDAssociateFromAscii::operator()(const PixelBarrelName & id) const
-{
-  for (BarrelConnections::const_iterator
-      ibc = theBarrel.begin(); ibc != theBarrel.end(); ibc++) {
-    for (vector<Bdu>::const_iterator
-        ibd = (*ibc).second.begin(); ibd != (*ibc).second.end(); ibd++) {
-      if (    ibd->b == id.shell() 
-           && ibd->l.inside( id.layerName() )
-           && ibd->z.inside( id.moduleName() )
-           && ibd->f.inside( id.ladderName() ) ) return (*ibc).first; 
+int PixelToFEDAssociateFromAscii::operator()(const PixelBarrelName& id) const {
+  for (BarrelConnections::const_iterator ibc = theBarrel.begin(); ibc != theBarrel.end(); ibc++) {
+    for (vector<Bdu>::const_iterator ibd = (*ibc).second.begin(); ibd != (*ibc).second.end(); ibd++) {
+      if (ibd->b == id.shell() && ibd->l.inside(id.layerName()) && ibd->z.inside(id.moduleName()) &&
+          ibd->f.inside(id.ladderName()))
+        return (*ibc).first;
     }
   }
-  edm::LogError("** PixelToFEDAssociateFromAscii WARNING, name: ")
-       << id.name()<<" not associated to FED";
+  edm::LogError("** PixelToFEDAssociateFromAscii WARNING, name: ") << id.name() << " not associated to FED";
   return -1;
 }
 
-int PixelToFEDAssociateFromAscii::operator()(const PixelEndcapName & id) const 
-{
-  for (EndcapConnections::const_iterator
-      iec = theEndcap.begin(); iec != theEndcap.end(); iec++) {
-    for (vector<Edu>::const_iterator
-        ied = (*iec).second.begin(); ied != (*iec).second.end(); ied++) {
-      if (    ied->e == id.halfCylinder() 
-           && ied->d.inside( id.diskName() )
-           && ied->b.inside( id.bladeName() ) ) return iec->first; 
+int PixelToFEDAssociateFromAscii::operator()(const PixelEndcapName& id) const {
+  for (EndcapConnections::const_iterator iec = theEndcap.begin(); iec != theEndcap.end(); iec++) {
+    for (vector<Edu>::const_iterator ied = (*iec).second.begin(); ied != (*iec).second.end(); ied++) {
+      if (ied->e == id.halfCylinder() && ied->d.inside(id.diskName()) && ied->b.inside(id.bladeName()))
+        return iec->first;
     }
   }
-  edm::LogError("** PixelToFEDAssociateFromAscii WARNING, name: ")
-       << id.name()<<" not associated to FED";
+  edm::LogError("** PixelToFEDAssociateFromAscii WARNING, name: ") << id.name() << " not associated to FED";
   return -1;
 }
 
-
-void PixelToFEDAssociateFromAscii::init(const string & cfg_name)
-{
+void PixelToFEDAssociateFromAscii::init(const string& cfg_name) {
   LogDebug("init, input file:") << cfg_name.c_str();
 
-  std::ifstream file( cfg_name.c_str() );
-  if ( !file ) {
-    edm::LogError(" ** PixelToFEDAssociateFromAscii,init ** ")
-         << " cant open data file: " << cfg_name;
+  std::ifstream file(cfg_name.c_str());
+  if (!file) {
+    edm::LogError(" ** PixelToFEDAssociateFromAscii,init ** ") << " cant open data file: " << cfg_name;
     return;
   } else {
-    edm::LogInfo("PixelToFEDAssociateFromAscii, read data from: ") <<cfg_name ;
+    edm::LogInfo("PixelToFEDAssociateFromAscii, read data from: ") << cfg_name;
   }
 
   string line;
-  pair< int, vector<Bdu> > barCon;
-  pair< int, vector<Edu> > endCon;
+  pair<int, vector<Bdu> > barCon;
+  pair<int, vector<Edu> > endCon;
 
   try {
-  while (getline(file,line)) {
-    //
-    // treat # lines
-    //
-    string::size_type pos = line.find("#");
-    if (pos != string::npos) line = line.erase(pos);
-
-    string::size_type posF = line.find("FED:");
-    string::size_type posB = line.find("S:");
-    string::size_type posE = line.find("E:");
-
-    LogDebug ( "line read" ) << line;
-
-    //
-    // treat version lines, reset date
-    //
-    if (     line.compare(0,3,"VER") == 0 ) { 
-      edm::LogInfo("version: ")<<line;
-      theVersion = line;
-      send(barCon,endCon);
-      theBarrel.clear();
-      theEndcap.clear();
-    }
-
-    //
-    // fed id line
-    //
-    else if ( posF != string::npos) { 
-      line = line.substr(posF+4);
-      int id = atoi(line.c_str());
-      send(barCon,endCon); 
-      barCon.first = id;
-      endCon.first = id;
-    }
-
-    //
-    // barrel connections
-    //
-    else if ( posB != string::npos) {
-      line = line.substr(posB+2);
-      barCon.second.push_back( getBdu(line) );
-    }
-
-    //
-    // endcap connections
-    //
-    else if ( posE != string::npos) {
-      line = line.substr(posE+2);
-      endCon.second.push_back( getEdu(line) );
+    while (getline(file, line)) {
+      //
+      // treat # lines
+      //
+      string::size_type pos = line.find("#");
+      if (pos != string::npos)
+        line = line.erase(pos);
+
+      string::size_type posF = line.find("FED:");
+      string::size_type posB = line.find("S:");
+      string::size_type posE = line.find("E:");
+
+      LogDebug("line read") << line;
+
+      //
+      // treat version lines, reset date
+      //
+      if (line.compare(0, 3, "VER") == 0) {
+        edm::LogInfo("version: ") << line;
+        theVersion = line;
+        send(barCon, endCon);
+        theBarrel.clear();
+        theEndcap.clear();
+      }
+
+      //
+      // fed id line
+      //
+      else if (posF != string::npos) {
+        line = line.substr(posF + 4);
+        int id = atoi(line.c_str());
+        send(barCon, endCon);
+        barCon.first = id;
+        endCon.first = id;
+      }
+
+      //
+      // barrel connections
+      //
+      else if (posB != string::npos) {
+        line = line.substr(posB + 2);
+        barCon.second.push_back(getBdu(line));
+      }
+
+      //
+      // endcap connections
+      //
+      else if (posE != string::npos) {
+        line = line.substr(posE + 2);
+        endCon.second.push_back(getEdu(line));
+      }
     }
-  }
-  send(barCon,endCon);
-  } 
-  catch(exception& err) {
-    edm::LogError("**PixelToFEDAssociateFromAscii**  exception")<<err.what();
+    send(barCon, endCon);
+  } catch (exception& err) {
+    edm::LogError("**PixelToFEDAssociateFromAscii**  exception") << err.what();
     theBarrel.clear();
     theEndcap.clear();
   }
@@ -141,101 +120,104 @@ void PixelToFEDAssociateFromAscii::init(const string & cfg_name)
   // for debug
   //
   std::ostringstream str;
-  str <<" **PixelToFEDAssociateFromAscii ** BARREL FED CONNECTIONS: "<< endl;
-  for (BarrelConnections::const_iterator
-      ibc = theBarrel.begin(); ibc != theBarrel.end(); ibc++) {
+  str << " **PixelToFEDAssociateFromAscii ** BARREL FED CONNECTIONS: " << endl;
+  for (BarrelConnections::const_iterator ibc = theBarrel.begin(); ibc != theBarrel.end(); ibc++) {
     str << "FED: " << ibc->first << endl;
-    for (vector<Bdu>::const_iterator
-        ibd = (*ibc).second.begin(); ibd != (*ibc).second.end(); ibd++) {
-      str << "b: "<<ibd->b<<" l: "<<ibd->l<<" z: "<<ibd->z<<" f: "<<ibd->f<<endl;
+    for (vector<Bdu>::const_iterator ibd = (*ibc).second.begin(); ibd != (*ibc).second.end(); ibd++) {
+      str << "b: " << ibd->b << " l: " << ibd->l << " z: " << ibd->z << " f: " << ibd->f << endl;
     }
   }
-  str <<" **PixelToFEDAssociateFromAscii ** ENDCAP FED CONNECTIONS: " << endl;
-  for (EndcapConnections::const_iterator
-    iec = theEndcap.begin(); iec != theEndcap.end(); iec++) {
+  str << " **PixelToFEDAssociateFromAscii ** ENDCAP FED CONNECTIONS: " << endl;
+  for (EndcapConnections::const_iterator iec = theEndcap.begin(); iec != theEndcap.end(); iec++) {
     str << "FED: " << iec->first << endl;
-    for (vector<Edu>::const_iterator
-        ied = (*iec).second.begin(); ied != (*iec).second.end(); ied++) {
-      str << " e: "<<ied->e<<" d: "<<ied->d<<" b: "<<ied->b<<endl;
+    for (vector<Edu>::const_iterator ied = (*iec).second.begin(); ied != (*iec).second.end(); ied++) {
+      str << " e: " << ied->e << " d: " << ied->d << " b: " << ied->b << endl;
     }
   }
-  edm::LogInfo("PixelToFEDAssociateFromAscii")<<str.str();
+  edm::LogInfo("PixelToFEDAssociateFromAscii") << str.str();
 }
 
-void PixelToFEDAssociateFromAscii::send(
-    pair<int,vector<Bdu> > & b, pair<int,vector<Edu> > & e)
-{
-  if (!b.second.empty()) theBarrel.push_back(b);
-  if (!e.second.empty()) theEndcap.push_back(e);
+void PixelToFEDAssociateFromAscii::send(pair<int, vector<Bdu> >& b, pair<int, vector<Edu> >& e) {
+  if (!b.second.empty())
+    theBarrel.push_back(b);
+  if (!e.second.empty())
+    theEndcap.push_back(e);
   b.second.clear();
   e.second.clear();
 }
 
-PixelToFEDAssociateFromAscii::Bdu PixelToFEDAssociateFromAscii::getBdu( string line) const
-{
+PixelToFEDAssociateFromAscii::Bdu PixelToFEDAssociateFromAscii::getBdu(string line) const {
   Bdu result;
   string::size_type pos;
 
-  result.b =  readRange(line).first;
+  result.b = readRange(line).first;
 
   pos = line.find("L:");
-  if (pos != string::npos) line = line.substr(pos+2);
+  if (pos != string::npos)
+    line = line.substr(pos + 2);
   result.l = readRange(line);
 
   pos = line.find("Z:");
-  if (pos != string::npos) line = line.substr(pos+2);
+  if (pos != string::npos)
+    line = line.substr(pos + 2);
   result.z = readRange(line);
 
   pos = line.find("F:");
-  if (pos != string::npos) line = line.substr(pos+2);
+  if (pos != string::npos)
+    line = line.substr(pos + 2);
   result.f = readRange(line);
 
   return result;
 }
 
-PixelToFEDAssociateFromAscii::Edu PixelToFEDAssociateFromAscii::getEdu( string line) const
-{
+PixelToFEDAssociateFromAscii::Edu PixelToFEDAssociateFromAscii::getEdu(string line) const {
   Edu result;
   string::size_type pos;
 
   result.e = readRange(line).first;
 
   pos = line.find("D:");
-  if (pos != string::npos) line = line.substr(pos+2);
+  if (pos != string::npos)
+    line = line.substr(pos + 2);
   result.d = readRange(line);
 
   pos = line.find("B:");
-  if (pos != string::npos) line = line.substr(pos+2);
+  if (pos != string::npos)
+    line = line.substr(pos + 2);
   result.b = readRange(line);
-  
+
   return result;
 }
 
-PixelToFEDAssociateFromAscii::Range 
-    PixelToFEDAssociateFromAscii::readRange( const string & l) const
-{
+PixelToFEDAssociateFromAscii::Range PixelToFEDAssociateFromAscii::readRange(const string& l) const {
   bool first = true;
   int num1 = -1;
   int num2 = -1;
-  const char * line = l.c_str();
+  const char* line = l.c_str();
   while (line) {
-    char * evp = nullptr;
+    char* evp = nullptr;
     int num = strtol(line, &evp, 10);
-    { stringstream s; s<<"raad from line: "; s<<num; LogDebug(s.str()); }
+    {
+      stringstream s;
+      s << "raad from line: ";
+      s << num;
+      LogDebug(s.str());
+    }
     if (evp != line) {
-      line = evp +1;
-      if (first) { num1 = num; first = false; }
+      line = evp + 1;
+      if (first) {
+        num1 = num;
+        first = false;
+      }
       num2 = num;
-    } else line = nullptr;
+    } else
+      line = nullptr;
   }
   if (first) {
-    string s = "** PixelToFEDAssociateFromAscii, read data, cant intrpret: " ;
-    edm::LogInfo(s) << endl 
-              << l << endl 
-              <<"=====> send exception " << endl;
+    string s = "** PixelToFEDAssociateFromAscii, read data, cant intrpret: ";
+    edm::LogInfo(s) << endl << l << endl << "=====> send exception " << endl;
     s += l;
     throw cms::Exception(s);
   }
-  return Range(num1,num2);
+  return Range(num1, num2);
 }
-
diff --git a/CalibTracker/SiPixelConnectivity/src/PixelToLNKAssociateFromAscii.cc b/CalibTracker/SiPixelConnectivity/src/PixelToLNKAssociateFromAscii.cc
index 4e53016c22ae3..e8a160edd75fe 100644
--- a/CalibTracker/SiPixelConnectivity/src/PixelToLNKAssociateFromAscii.cc
+++ b/CalibTracker/SiPixelConnectivity/src/PixelToLNKAssociateFromAscii.cc
@@ -11,155 +11,147 @@
 
 using namespace std;
 
-PixelToLNKAssociateFromAscii::PixelToLNKAssociateFromAscii(const string & fn, const bool phase) {
+PixelToLNKAssociateFromAscii::PixelToLNKAssociateFromAscii(const string& fn, const bool phase) {
   phase1_ = phase;
   init(fn);
-
-}
-std::string PixelToLNKAssociateFromAscii::version() const {
-  return theVersion; 
 }
+std::string PixelToLNKAssociateFromAscii::version() const { return theVersion; }
 
-const PixelToLNKAssociateFromAscii::CablingRocId * PixelToLNKAssociateFromAscii::operator()( 
+const PixelToLNKAssociateFromAscii::CablingRocId* PixelToLNKAssociateFromAscii::operator()(
     const PixelToLNKAssociateFromAscii::DetectorRocId& roc) const {
-
-  typedef std::vector< std::pair<DetectorRocId,CablingRocId> >::const_iterator IM;
+  typedef std::vector<std::pair<DetectorRocId, CablingRocId> >::const_iterator IM;
   for (IM im = theConnection.begin(); im != theConnection.end(); im++) {
-    if( ( *(im->first.module) == *roc.module ) && (im->first.rocDetId == roc.rocDetId)) {
-      return &(im->second);  
+    if ((*(im->first.module) == *roc.module) && (im->first.rocDetId == roc.rocDetId)) {
+      return &(im->second);
     }
   }
   return nullptr;
 }
 
 // This is where the reading and interpretation of the ascci cabling input file is
-void PixelToLNKAssociateFromAscii::init(const string & cfg_name) {
-
+void PixelToLNKAssociateFromAscii::init(const string& cfg_name) {
   edm::LogInfo(" init, input file: ") << cfg_name;
 
-  std::ifstream file( cfg_name.c_str() );
-  if ( !file ) {
-    edm::LogError(" ** PixelToLNKAssociateFromAscii,init ** ")
-         << " cant open data file: " << cfg_name;
+  std::ifstream file(cfg_name.c_str());
+  if (!file) {
+    edm::LogError(" ** PixelToLNKAssociateFromAscii,init ** ") << " cant open data file: " << cfg_name;
     return;
   } else {
-    edm::LogInfo("PixelToLNKAssociateFromAscii, read data from: ") <<cfg_name;
+    edm::LogInfo("PixelToLNKAssociateFromAscii, read data from: ") << cfg_name;
   }
 
   string line;
-  int fedId=-1;
-  int linkId=-1;
+  int fedId = -1;
+  int linkId = -1;
 
   try {
-  while (getline(file,line)) {
-    //
-    // treat # lines
-    //
-    string::size_type pos = line.find("#");
-    if (pos != string::npos) line = line.erase(pos);
-
-    string::size_type posF = line.find("FED:");
-    string::size_type posL = line.find("LNK:");
-    string::size_type posM = line.find("MOD:");
-    string::size_type posR = line.find("ROC:");
-
-    edm::LogInfo("") <<" read line: "<< line;
-    
-
-    //
-    // treat version lines, reset date
-    //
-    if (     line.compare(0,3,"VER") == 0 ) { 
-      edm::LogInfo("version: ")<<line;
-      theVersion = line;
-    }
+    while (getline(file, line)) {
+      //
+      // treat # lines
+      //
+      string::size_type pos = line.find("#");
+      if (pos != string::npos)
+        line = line.erase(pos);
+
+      string::size_type posF = line.find("FED:");
+      string::size_type posL = line.find("LNK:");
+      string::size_type posM = line.find("MOD:");
+      string::size_type posR = line.find("ROC:");
+
+      edm::LogInfo("") << " read line: " << line;
+
+      //
+      // treat version lines, reset date
+      //
+      if (line.compare(0, 3, "VER") == 0) {
+        edm::LogInfo("version: ") << line;
+        theVersion = line;
+      }
 
-    //
-    // fed id line
-    //
-    else if ( posF != string::npos) { 
-      line = line.substr(posF+4);
-      fedId = atoi(line.c_str());
-    }
+      //
+      // fed id line
+      //
+      else if (posF != string::npos) {
+        line = line.substr(posF + 4);
+        fedId = atoi(line.c_str());
+      }
 
-    //
-    // link id linke
-    //
-    else if ( posL != string::npos) {
-      string srtL = line.substr(posL+4);
-      linkId = atoi(srtL.c_str());
-    }
+      //
+      // link id linke
+      //
+      else if (posL != string::npos) {
+        string srtL = line.substr(posL + 4);
+        linkId = atoi(srtL.c_str());
+      }
 
-    //
-    // module description
-    //
-    if ( posM != string::npos) {
-      if (posR != string::npos) {
-        string strM = line.substr(posM+4, posR-posM-5);
-        string::size_type pos = strM.find(" "); 
-        if(pos != string::npos) strM = strM.substr(pos+1);
-        string strR = line.substr(posR+4);
-        Range range = readRange(strR);
-	//cout<<" range find "<<strR<<" "<<strR.size()<<" "<<range.min()<<" "<<range.max()<<endl;
-        addConnections( fedId, linkId, strM, range);
-      } else { 
-        string strM= line.substr(posM+4);
-        string::size_type pos = strM.find(" "); 
-        if(pos != string::npos) strM = strM.substr(pos+1);
-        addConnections( fedId, linkId, strM, Range(0,0));
+      //
+      // module description
+      //
+      if (posM != string::npos) {
+        if (posR != string::npos) {
+          string strM = line.substr(posM + 4, posR - posM - 5);
+          string::size_type pos = strM.find(" ");
+          if (pos != string::npos)
+            strM = strM.substr(pos + 1);
+          string strR = line.substr(posR + 4);
+          Range range = readRange(strR);
+          //cout<<" range find "<<strR<<" "<<strR.size()<<" "<<range.min()<<" "<<range.max()<<endl;
+          addConnections(fedId, linkId, strM, range);
+        } else {
+          string strM = line.substr(posM + 4);
+          string::size_type pos = strM.find(" ");
+          if (pos != string::npos)
+            strM = strM.substr(pos + 1);
+          addConnections(fedId, linkId, strM, Range(0, 0));
+        }
       }
     }
-  }
-  } 
-  catch(exception& err) {
-    edm::LogError("**PixelToLNKAssociateFromAscii**  exception")<<err.what();
+  } catch (exception& err) {
+    edm::LogError("**PixelToLNKAssociateFromAscii**  exception") << err.what();
   }
 
   //
   // for debug
   //
   std::ostringstream str;
-  str <<" **PixelToLNKAssociateFromAscii ** CONNECTIONS: "<< endl;
-  typedef vector< pair<DetectorRocId,CablingRocId> >::const_iterator ICON;
+  str << " **PixelToLNKAssociateFromAscii ** CONNECTIONS: " << endl;
+  typedef vector<pair<DetectorRocId, CablingRocId> >::const_iterator ICON;
   for (ICON ic = theConnection.begin(); ic != theConnection.end(); ic++) {
-    str<< (*ic).first.module->name()
-       <<", rocDetId="<<(*ic).first.rocDetId
-       <<", fedId="<<ic->second.fedId
-       <<", linkId="<<ic->second.linkId
-       <<", rocLinkId="<<ic->second.rocLinkId
-       <<endl;
+    str << (*ic).first.module->name() << ", rocDetId=" << (*ic).first.rocDetId << ", fedId=" << ic->second.fedId
+        << ", linkId=" << ic->second.linkId << ", rocLinkId=" << ic->second.rocLinkId << endl;
   }
-  edm::LogInfo("PixelToLNKAssociateFromAscii")<<str.str();
+  edm::LogInfo("PixelToLNKAssociateFromAscii") << str.str();
 }
 
-void PixelToLNKAssociateFromAscii::addConnections(
-    int fedId, int linkId,  std::string module, Range rocDetIds) {
-
+void PixelToLNKAssociateFromAscii::addConnections(int fedId, int linkId, std::string module, Range rocDetIds) {
   string::size_type pos;
 
-
   // check for Barrel modules
   pos = module.find("BPix");
-  if (pos != string::npos) { 
-    
-    string module0=module;
-    // strip the trailing spaces 
+  if (pos != string::npos) {
+    string module0 = module;
+    // strip the trailing spaces
     string::size_type p = module0.find(" ");
     //string::size_type p1 = module0.find_first_of(" ");
     //string::size_type p2 = module0.find_last_not_of(" ");
     //cout<<p<<" "<<p1<<" "<<p2<<endl;
-    if(p != string::npos) module0 = module0.substr(0,p);
-    PixelBarrelName * name = new PixelBarrelName(module0,phase1_);
+    if (p != string::npos)
+      module0 = module0.substr(0, p);
+    PixelBarrelName* name = new PixelBarrelName(module0, phase1_);
 
     // shell
-    string strP = module.substr(pos+6,2);
+    string strP = module.substr(pos + 6, 2);
     PixelBarrelName::Shell part;
-    if (strP=="mO")     part = PixelBarrelName::mO; 
-    else if(strP=="mI") part = PixelBarrelName::mI;
-    else if(strP=="pO") part = PixelBarrelName::pO;
-    else                part = PixelBarrelName::pI;
-
-    // // all this can be skipped ----------------------------------- 
+    if (strP == "mO")
+      part = PixelBarrelName::mO;
+    else if (strP == "mI")
+      part = PixelBarrelName::mI;
+    else if (strP == "pO")
+      part = PixelBarrelName::pO;
+    else
+      part = PixelBarrelName::pI;
+
+    // // all this can be skipped -----------------------------------
     // module = module.substr(pos+9);
     // // sector
     // pos = module.find("_");
@@ -177,7 +169,7 @@ void PixelToLNKAssociateFromAscii::addConnections(
     // int ladder = atoi( module.substr(3,pos-3).c_str());
     // module = module.substr(pos+1);
     // // z-module
-    // int zmodule = atoi( module.substr(3,pos-3).c_str());    
+    // int zmodule = atoi( module.substr(3,pos-3).c_str());
     // // place modules in connections
     // PixelBarrelName * name0 = new PixelBarrelName(part, layer, zmodule, ladder, phase1_);
     // if(name->name() != module0) cout<<" wrong name "<<fedId<<" "<<linkId<<" "
@@ -186,276 +178,346 @@ void PixelToLNKAssociateFromAscii::addConnections(
     // 				     <<module0<<" "<<name->name()<<" "<<name0->name()<<endl;
     // //edm::LogInfo(" module ")<<fedId<<" "<<linkId<<" "<<module0<<" "
     // //			     <<name0->name()<<" "<<rocDetIds.max()<<endl;
-    // // until here 
-    
-    
-     int rocLnkId = 0; 
-     bool loopExecuted = false;
-     for (int rocDetId=rocDetIds.min(); rocDetId <= rocDetIds.max(); rocDetId++) {
-       loopExecuted = true;
-       rocLnkId++;
-       DetectorRocId  detectorRocId;
-       //detectorRocId.module = name0;
-       detectorRocId.module = name;
-       detectorRocId.rocDetId = rocDetId;
-
-       CablingRocId   cablingRocId;
-       cablingRocId.fedId = fedId;
-       cablingRocId.linkId = linkId;
-       cablingRocId.rocLinkId = rocLnkId;
-       // fix for type-B modules in barrel
-       edm::LogInfo(" roc ")<<rocDetId<<" "<<rocLnkId<<" "<<name->isHalfModule()<<endl;
-       if (name->isHalfModule() && (rocDetIds.min()>7)  
-           && (part==PixelBarrelName::mO || part==PixelBarrelName::mI) ) {
-	 //cablingRocId.rocLinkId = 9-rocLnkId;
-	 // rocDetId=8,...,15
-	 edm::LogInfo(" special for half modules ");
-         cablingRocId.rocLinkId = rocLnkId;   // 1...8    19/11/08 d.k.
-         detectorRocId.rocDetId = rocDetId-8; // 0...7
-       }
-       theConnection.push_back( make_pair(detectorRocId,cablingRocId));
-     } 
-     if (!loopExecuted) delete name;
+    // // until here
+
+    int rocLnkId = 0;
+    bool loopExecuted = false;
+    for (int rocDetId = rocDetIds.min(); rocDetId <= rocDetIds.max(); rocDetId++) {
+      loopExecuted = true;
+      rocLnkId++;
+      DetectorRocId detectorRocId;
+      //detectorRocId.module = name0;
+      detectorRocId.module = name;
+      detectorRocId.rocDetId = rocDetId;
+
+      CablingRocId cablingRocId;
+      cablingRocId.fedId = fedId;
+      cablingRocId.linkId = linkId;
+      cablingRocId.rocLinkId = rocLnkId;
+      // fix for type-B modules in barrel
+      edm::LogInfo(" roc ") << rocDetId << " " << rocLnkId << " " << name->isHalfModule() << endl;
+      if (name->isHalfModule() && (rocDetIds.min() > 7) &&
+          (part == PixelBarrelName::mO || part == PixelBarrelName::mI)) {
+        //cablingRocId.rocLinkId = 9-rocLnkId;
+        // rocDetId=8,...,15
+        edm::LogInfo(" special for half modules ");
+        cablingRocId.rocLinkId = rocLnkId;      // 1...8    19/11/08 d.k.
+        detectorRocId.rocDetId = rocDetId - 8;  // 0...7
+      }
+      theConnection.push_back(make_pair(detectorRocId, cablingRocId));
+    }
+    if (!loopExecuted)
+      delete name;
   }
 
-
   // check for endcap modules
   pos = module.find("FPix");
   if (pos != string::npos) {
+    string strH = module.substr(pos + 6, 2);
+    PixelEndcapName::HalfCylinder part;
+    if (strH == "mO")
+      part = PixelEndcapName::mO;
+    else if (strH == "mI")
+      part = PixelEndcapName::mI;
+    else if (strH == "pO")
+      part = PixelEndcapName::pO;
+    else
+      part = PixelEndcapName::pI;
+    module = module.substr(pos + 9);
+
+    // disk
+    pos = module.find("_");
+    if (pos == string::npos)
+      throw cms::Exception("problem with disk formatting");
+    int disk = atoi(module.substr(1, pos - 1).c_str());
+    module = module.substr(pos + 1);
+
+    // blade
+    pos = module.find("_");
+    if (pos == string::npos)
+      throw cms::Exception("problem with blade formatting");
+    int blade = atoi(module.substr(3, pos - 3).c_str());
+    module = module.substr(pos + 1);
+
+    //pannel
+    pos = module.find("_");
+    if (pos == string::npos)
+      throw cms::Exception("problem with pannel formatting");
+    int pannel = atoi(module.substr(3, pos - 3).c_str());
+    module = module.substr(pos + 1);
+
+    // plaquete
+    //     pos = module.find("_");
+    //     if (pos ==  string::npos) throw cms::Exception("problem with plaquette formatting");
+    //     int plaq = atoi( module.substr(3,pos-3).c_str());
+
+    int ring = 1;  // preset to 1 so it is ok for pilot blades
+    // pannel type
+    PixelPannelType::PannelType pannelType;
+    if (phase1_) {
+      pannelType = PixelPannelType::p2x8;  // only 1 type for phase1
+
+      // this is not really needed, just for testing
+      // ring
+      pos = module.find("RNG");
+      if (pos == string::npos)
+        throw cms::Exception("problem with ring  formatting");
+      ring = atoi(module.substr(pos + 3, 1).c_str());  //
+      //cout<<" ring "<<ring<<" "<<module<<endl;
+
+    } else {  // phase0
+      pos = module.find("TYP:");
+      if (pos == string::npos)
+        throw cms::Exception("problem with pannel type formatting");
+      string strT = module.substr(pos + 5, 3);
+      string strT4 = module.substr(pos + 5, 4);
+      ring = 1;
+      if (strT == "P3R")
+        pannelType = PixelPannelType::p3R;
+      else if (strT == "P3L")
+        pannelType = PixelPannelType::p3L;
+      else if (strT == "P4R")
+        pannelType = PixelPannelType::p4R;
+      else if (strT == "P4L")
+        pannelType = PixelPannelType::p4L;
+      else if (strT4 == "P2X8")
+        pannelType = PixelPannelType::p2x8;  // for pilot blades
+      else
+        throw cms::Exception("problem with pannel type formatting (unrecoginzed word)");
+    }
 
-     string strH = module.substr(pos+6,2);
-     PixelEndcapName::HalfCylinder part;
-         if (strH=="mO") part = PixelEndcapName::mO;
-     else if(strH=="mI") part = PixelEndcapName::mI;
-     else if(strH=="pO") part = PixelEndcapName::pO;
-     else                part = PixelEndcapName::pI;
-     module = module.substr(pos+9);
-
-     // disk
-     pos = module.find("_");
-     if (pos ==  string::npos) throw cms::Exception("problem with disk formatting");
-     int disk = atoi( module.substr(1,pos-1).c_str());
-     module = module.substr(pos+1);
-
-     // blade
-     pos = module.find("_");
-     if (pos ==  string::npos) throw cms::Exception("problem with blade formatting");
-     int blade = atoi( module.substr(3,pos-3).c_str());
-     module = module.substr(pos+1);
-
-     //pannel
-     pos = module.find("_");
-     if (pos ==  string::npos) throw cms::Exception("problem with pannel formatting");
-     int pannel = atoi( module.substr(3,pos-3).c_str());
-     module = module.substr(pos+1);
-     
-     // plaquete
-//     pos = module.find("_");
-//     if (pos ==  string::npos) throw cms::Exception("problem with plaquette formatting");
-//     int plaq = atoi( module.substr(3,pos-3).c_str());
-
-     int ring=1; // preset to 1 so it is ok for pilot blades
-     // pannel type
-     PixelPannelType::PannelType pannelType; 
-     if(phase1_) {
-       pannelType=PixelPannelType::p2x8; // only 1 type for phase1
-       
-       // this is not really needed, just for testing 
-       // ring 
-       pos = module.find("RNG");
-       if (pos ==  string::npos) throw cms::Exception("problem with ring  formatting");
-       ring  = atoi( module.substr(pos+3,1).c_str()); //
-       //cout<<" ring "<<ring<<" "<<module<<endl;
-
-     } else { // phase0
-       pos = module.find("TYP:");
-       if (pos ==  string::npos) throw cms::Exception("problem with pannel type formatting");
-       string strT = module.substr(pos+5,3);
-       string strT4 = module.substr(pos+5,4);
-       ring=1;
-       if (strT=="P3R") pannelType=PixelPannelType::p3R;
-       else if (strT=="P3L") pannelType=PixelPannelType::p3L;
-       else if (strT=="P4R") pannelType=PixelPannelType::p4R;
-       else if (strT=="P4L") pannelType=PixelPannelType::p4L;
-       else if (strT4=="P2X8") pannelType=PixelPannelType::p2x8;  // for pilot blades
-       else throw cms::Exception("problem with pannel type formatting (unrecoginzed word)");      
-     }
-     
-
-     // Cabling accoring to the panle type
-     if ( pannelType==PixelPannelType::p4L) {
-//     cout <<"----------- p4L"<<endl;
-       int rocLnkId =0;
-       for (int plaq = 1; plaq <= 4; plaq++) {
-         Range rocs; int firstRoc=0; int step=0;
-         if (plaq==1) { rocs = Range(0,1); firstRoc=1; step=-1; }
-         if (plaq==2) { rocs = Range(0,5); firstRoc=0; step=+1; }
-         if (plaq==3) { rocs = Range(0,7); firstRoc=0; step=+1; }
-         if (plaq==4) { rocs = Range(0,4); firstRoc=0; step=+1; }
-         PixelEndcapName * name  = new PixelEndcapName(part,disk,blade,pannel,plaq);
-         for (int iroc =rocs.min(); iroc<=rocs.max(); iroc++) {
-           rocLnkId++;
-           int rocDetId = firstRoc + step*iroc; 
-
-           DetectorRocId  detectorRocId;
-           //detectorRocId.module = new PixelEndcapName(part,disk,blade,pannel,plaq);
-           detectorRocId.module = name;
-           detectorRocId.rocDetId = rocDetId;
-
-           CablingRocId   cablingRocId;
-           cablingRocId.fedId = fedId;
-           cablingRocId.linkId = linkId;
-           cablingRocId.rocLinkId = rocLnkId;
-
-           theConnection.push_back( make_pair(detectorRocId,cablingRocId));
-//         cout <<"PLAQ:"<<plaq<<" rocDetId: "<<rocDetId<<" rocLnkId:"<<rocLnkId<<endl;
-         }
-       } 
-     } 
-     else if ( pannelType==PixelPannelType::p4R) {
-//     cout <<"----------- p4R"<<endl;
-       int rocLnkId =0;
-       for (int plaq = 4; plaq >= 1; plaq--) {
-         Range rocs; int firstRoc=0; int step=0;
-         if (plaq==1) { rocs = Range(0,1); firstRoc=1; step=-1; }
-         if (plaq==2) { rocs = Range(0,5); firstRoc=3; step=+1; }
-         if (plaq==3) { rocs = Range(0,7); firstRoc=4; step=+1; }
-         if (plaq==4) { rocs = Range(0,4); firstRoc=0; step=+1; }
-         PixelEndcapName * name  = new PixelEndcapName(part,disk,blade,pannel,plaq);
-         for (int iroc =rocs.min(); iroc-rocs.max() <= 0; iroc++) {
-           rocLnkId++;
-           int rocDetId = firstRoc + step*iroc;
-           if (rocDetId > rocs.max()) rocDetId = (rocDetId-1)%rocs.max();
-
-           DetectorRocId  detectorRocId;
-           //detectorRocId.module = new PixelEndcapName(part,disk,blade,pannel,plaq);
-           detectorRocId.module = name;
-           detectorRocId.rocDetId = rocDetId;
-           CablingRocId   cablingRocId;
-           cablingRocId.fedId = fedId;
-           cablingRocId.linkId = linkId;
-           cablingRocId.rocLinkId = rocLnkId;
-
-           theConnection.push_back( make_pair(detectorRocId,cablingRocId));
-//         cout <<"PLAQ:"<<plaq<<" rocDetId: "<<rocDetId<<" rocLnkId:"<<rocLnkId<<endl;
-         }
-       }
-     }
-     else if ( pannelType==PixelPannelType::p3L) {
-//     cout <<"----------- p3L"<<endl;
-       int rocLnkId =0;
-       for (int plaq = 1; plaq <= 3; plaq++) {
-         Range rocs; int firstRoc=0; int step=0;
-         if (plaq==1) { rocs = Range(0,5); firstRoc=0; step=1; }
-         if (plaq==2) { rocs = Range(0,7); firstRoc=0; step=1; }
-         if (plaq==3) { rocs = Range(0,9); firstRoc=0; step=1; }
-         PixelEndcapName * name  = new PixelEndcapName(part,disk,blade,pannel,plaq);
-         for (int iroc =rocs.min(); iroc<=rocs.max(); iroc++) {
-           rocLnkId++;
-           int rocDetId = firstRoc + step*iroc; 
-
-           DetectorRocId  detectorRocId;
-           detectorRocId.module = name;
-           detectorRocId.rocDetId = rocDetId;
-
-           CablingRocId   cablingRocId;
-           cablingRocId.fedId = fedId;
-           cablingRocId.linkId = linkId;
-           cablingRocId.rocLinkId = rocLnkId;
-
-           theConnection.push_back( make_pair(detectorRocId,cablingRocId));
-//         cout <<"PLAQ:"<<plaq<<" rocDetId: "<<rocDetId<<" rocLnkId:"<<rocLnkId<<endl;
-         }
-       } 
-     } 
-     else if ( pannelType==PixelPannelType::p3R) {
-//     cout <<"----------- p3R"<<endl;
-       int rocLnkId =0;
-       for (int plaq = 3; plaq >= 1; plaq--) {
-         Range rocs; int firstRoc=0; int step=0;
-         if (plaq==1) { rocs = Range(0,5); firstRoc=3; step=1; }
-         if (plaq==2) { rocs = Range(0,7); firstRoc=4; step=1; }
-         if (plaq==3) { rocs = Range(0,9); firstRoc=5; step=1; }
-         PixelEndcapName * name  = new PixelEndcapName(part,disk,blade,pannel,plaq);
-         for (int iroc =rocs.min(); iroc<=rocs.max(); iroc++) {
-           rocLnkId++;
-           int rocDetId = firstRoc + step*iroc;
-           if (rocDetId > rocs.max()) rocDetId = (rocDetId-1)%rocs.max();
-
-           DetectorRocId  detectorRocId;
-           detectorRocId.module = name;
-           detectorRocId.rocDetId = rocDetId;
-
-           CablingRocId   cablingRocId;
-           cablingRocId.fedId = fedId;
-           cablingRocId.linkId = linkId;
-           cablingRocId.rocLinkId = rocLnkId;
-
-           theConnection.push_back( make_pair(detectorRocId,cablingRocId));
-//         cout <<"PLAQ:"<<plaq<<" rocDetId: "<<rocDetId<<" rocLnkId:"<<rocLnkId<<endl;
-         } // for
-       } // for
-
-     } else if ( pannelType==PixelPannelType::p2x8) { // phase-1 blades
-       //       cout <<"----------- p2x8"<<endl;
-       int rocLnkId = 0; 
-       //       Range rocs = Range(0, 15); 
-       //       for (int rocDetId=rocs.min(); rocDetId <= rocs.max(); rocDetId++) {
-       PixelEndcapName * name = new PixelEndcapName(part, disk, blade, pannel, ring, phase1_); 
-       bool loopExecuted = false;
-       for (int rocDetId=rocDetIds.min(); rocDetId <= rocDetIds.max(); rocDetId++) {
-           loopExecuted = true;
-	 rocLnkId++;
-	 DetectorRocId  detectorRocId;
-	 detectorRocId.module = name;
-	 detectorRocId.rocDetId = rocDetId;
-	 CablingRocId   cablingRocId;
-	 cablingRocId.fedId = fedId;
-	 cablingRocId.linkId = linkId;
-	 cablingRocId.rocLinkId = rocLnkId;
-	 theConnection.push_back( make_pair(detectorRocId,cablingRocId));
-	 edm::LogInfo("PixelToLNKAssociateFromAscii FPix ")
-	   << " rocDetId: " << rocDetId 
-	   << " rocLnkId:" << rocLnkId 
-	   << " fedId = " << fedId 
-	   << " linkId = " << linkId
-	   << " name = " << name->name();
-	 // cout << " rocDetId: " << rocDetId 
-	 //      << " rocLnkId:" << rocLnkId 
-	 //      << " fedId = " << fedId 
-	 //      << " linkId = " << linkId
-	 //      << " name = " << name0->name()
-	 //      << endl;
-       } // end for 
-       if (!loopExecuted) {
-           delete name;
-       }
-       
-     } // end of type
+    // Cabling accoring to the panle type
+    if (pannelType == PixelPannelType::p4L) {
+      //     cout <<"----------- p4L"<<endl;
+      int rocLnkId = 0;
+      for (int plaq = 1; plaq <= 4; plaq++) {
+        Range rocs;
+        int firstRoc = 0;
+        int step = 0;
+        if (plaq == 1) {
+          rocs = Range(0, 1);
+          firstRoc = 1;
+          step = -1;
+        }
+        if (plaq == 2) {
+          rocs = Range(0, 5);
+          firstRoc = 0;
+          step = +1;
+        }
+        if (plaq == 3) {
+          rocs = Range(0, 7);
+          firstRoc = 0;
+          step = +1;
+        }
+        if (plaq == 4) {
+          rocs = Range(0, 4);
+          firstRoc = 0;
+          step = +1;
+        }
+        PixelEndcapName* name = new PixelEndcapName(part, disk, blade, pannel, plaq);
+        for (int iroc = rocs.min(); iroc <= rocs.max(); iroc++) {
+          rocLnkId++;
+          int rocDetId = firstRoc + step * iroc;
+
+          DetectorRocId detectorRocId;
+          //detectorRocId.module = new PixelEndcapName(part,disk,blade,pannel,plaq);
+          detectorRocId.module = name;
+          detectorRocId.rocDetId = rocDetId;
+
+          CablingRocId cablingRocId;
+          cablingRocId.fedId = fedId;
+          cablingRocId.linkId = linkId;
+          cablingRocId.rocLinkId = rocLnkId;
+
+          theConnection.push_back(make_pair(detectorRocId, cablingRocId));
+          //         cout <<"PLAQ:"<<plaq<<" rocDetId: "<<rocDetId<<" rocLnkId:"<<rocLnkId<<endl;
+        }
+      }
+    } else if (pannelType == PixelPannelType::p4R) {
+      //     cout <<"----------- p4R"<<endl;
+      int rocLnkId = 0;
+      for (int plaq = 4; plaq >= 1; plaq--) {
+        Range rocs;
+        int firstRoc = 0;
+        int step = 0;
+        if (plaq == 1) {
+          rocs = Range(0, 1);
+          firstRoc = 1;
+          step = -1;
+        }
+        if (plaq == 2) {
+          rocs = Range(0, 5);
+          firstRoc = 3;
+          step = +1;
+        }
+        if (plaq == 3) {
+          rocs = Range(0, 7);
+          firstRoc = 4;
+          step = +1;
+        }
+        if (plaq == 4) {
+          rocs = Range(0, 4);
+          firstRoc = 0;
+          step = +1;
+        }
+        PixelEndcapName* name = new PixelEndcapName(part, disk, blade, pannel, plaq);
+        for (int iroc = rocs.min(); iroc - rocs.max() <= 0; iroc++) {
+          rocLnkId++;
+          int rocDetId = firstRoc + step * iroc;
+          if (rocDetId > rocs.max())
+            rocDetId = (rocDetId - 1) % rocs.max();
+
+          DetectorRocId detectorRocId;
+          //detectorRocId.module = new PixelEndcapName(part,disk,blade,pannel,plaq);
+          detectorRocId.module = name;
+          detectorRocId.rocDetId = rocDetId;
+          CablingRocId cablingRocId;
+          cablingRocId.fedId = fedId;
+          cablingRocId.linkId = linkId;
+          cablingRocId.rocLinkId = rocLnkId;
+
+          theConnection.push_back(make_pair(detectorRocId, cablingRocId));
+          //         cout <<"PLAQ:"<<plaq<<" rocDetId: "<<rocDetId<<" rocLnkId:"<<rocLnkId<<endl;
+        }
+      }
+    } else if (pannelType == PixelPannelType::p3L) {
+      //     cout <<"----------- p3L"<<endl;
+      int rocLnkId = 0;
+      for (int plaq = 1; plaq <= 3; plaq++) {
+        Range rocs;
+        int firstRoc = 0;
+        int step = 0;
+        if (plaq == 1) {
+          rocs = Range(0, 5);
+          firstRoc = 0;
+          step = 1;
+        }
+        if (plaq == 2) {
+          rocs = Range(0, 7);
+          firstRoc = 0;
+          step = 1;
+        }
+        if (plaq == 3) {
+          rocs = Range(0, 9);
+          firstRoc = 0;
+          step = 1;
+        }
+        PixelEndcapName* name = new PixelEndcapName(part, disk, blade, pannel, plaq);
+        for (int iroc = rocs.min(); iroc <= rocs.max(); iroc++) {
+          rocLnkId++;
+          int rocDetId = firstRoc + step * iroc;
+
+          DetectorRocId detectorRocId;
+          detectorRocId.module = name;
+          detectorRocId.rocDetId = rocDetId;
+
+          CablingRocId cablingRocId;
+          cablingRocId.fedId = fedId;
+          cablingRocId.linkId = linkId;
+          cablingRocId.rocLinkId = rocLnkId;
+
+          theConnection.push_back(make_pair(detectorRocId, cablingRocId));
+          //         cout <<"PLAQ:"<<plaq<<" rocDetId: "<<rocDetId<<" rocLnkId:"<<rocLnkId<<endl;
+        }
+      }
+    } else if (pannelType == PixelPannelType::p3R) {
+      //     cout <<"----------- p3R"<<endl;
+      int rocLnkId = 0;
+      for (int plaq = 3; plaq >= 1; plaq--) {
+        Range rocs;
+        int firstRoc = 0;
+        int step = 0;
+        if (plaq == 1) {
+          rocs = Range(0, 5);
+          firstRoc = 3;
+          step = 1;
+        }
+        if (plaq == 2) {
+          rocs = Range(0, 7);
+          firstRoc = 4;
+          step = 1;
+        }
+        if (plaq == 3) {
+          rocs = Range(0, 9);
+          firstRoc = 5;
+          step = 1;
+        }
+        PixelEndcapName* name = new PixelEndcapName(part, disk, blade, pannel, plaq);
+        for (int iroc = rocs.min(); iroc <= rocs.max(); iroc++) {
+          rocLnkId++;
+          int rocDetId = firstRoc + step * iroc;
+          if (rocDetId > rocs.max())
+            rocDetId = (rocDetId - 1) % rocs.max();
+
+          DetectorRocId detectorRocId;
+          detectorRocId.module = name;
+          detectorRocId.rocDetId = rocDetId;
+
+          CablingRocId cablingRocId;
+          cablingRocId.fedId = fedId;
+          cablingRocId.linkId = linkId;
+          cablingRocId.rocLinkId = rocLnkId;
+
+          theConnection.push_back(make_pair(detectorRocId, cablingRocId));
+          //         cout <<"PLAQ:"<<plaq<<" rocDetId: "<<rocDetId<<" rocLnkId:"<<rocLnkId<<endl;
+        }  // for
+      }    // for
+
+    } else if (pannelType == PixelPannelType::p2x8) {  // phase-1 blades
+      //       cout <<"----------- p2x8"<<endl;
+      int rocLnkId = 0;
+      //       Range rocs = Range(0, 15);
+      //       for (int rocDetId=rocs.min(); rocDetId <= rocs.max(); rocDetId++) {
+      PixelEndcapName* name = new PixelEndcapName(part, disk, blade, pannel, ring, phase1_);
+      bool loopExecuted = false;
+      for (int rocDetId = rocDetIds.min(); rocDetId <= rocDetIds.max(); rocDetId++) {
+        loopExecuted = true;
+        rocLnkId++;
+        DetectorRocId detectorRocId;
+        detectorRocId.module = name;
+        detectorRocId.rocDetId = rocDetId;
+        CablingRocId cablingRocId;
+        cablingRocId.fedId = fedId;
+        cablingRocId.linkId = linkId;
+        cablingRocId.rocLinkId = rocLnkId;
+        theConnection.push_back(make_pair(detectorRocId, cablingRocId));
+        edm::LogInfo("PixelToLNKAssociateFromAscii FPix ")
+            << " rocDetId: " << rocDetId << " rocLnkId:" << rocLnkId << " fedId = " << fedId << " linkId = " << linkId
+            << " name = " << name->name();
+        // cout << " rocDetId: " << rocDetId
+        //      << " rocLnkId:" << rocLnkId
+        //      << " fedId = " << fedId
+        //      << " linkId = " << linkId
+        //      << " name = " << name0->name()
+        //      << endl;
+      }  // end for
+      if (!loopExecuted) {
+        delete name;
+      }
 
+    }  // end of type
   }
 }
 
-PixelToLNKAssociateFromAscii::Range 
-    PixelToLNKAssociateFromAscii::readRange( const string & l) const {
+PixelToLNKAssociateFromAscii::Range PixelToLNKAssociateFromAscii::readRange(const string& l) const {
   //cout<<l<<" in range "<<l.size()<<endl;
-  string l1,l2;
-  int i1=-1, i2=-1;
+  string l1, l2;
+  int i1 = -1, i2 = -1;
   int len = l.size();
   //for(int i=0; i<len;i++) {
   // cout<<i<<" "<<l[i]<<endl;
   //}
   string::size_type p = l.find(",");
-  if(p != string::npos) {
+  if (p != string::npos) {
     //cout<<p<<" "<<len<<endl;
-    l1 = l.substr(0,p-1+1);
-    l2 = l.substr(p+1,len-1-p);
+    l1 = l.substr(0, p - 1 + 1);
+    l2 = l.substr(p + 1, len - 1 - p);
     i1 = stoi(l1);
     i2 = stoi(l2);
     //cout<<l1<<" "<<l2<<" "<<i1<<" "<<i2<<endl;
   }
 
-  return Range(i1,i2);
+  return Range(i1, i2);
 
   // this method is very stupid it relies on a space being present after the last number!
   // exchange with string opertaions (above)
@@ -480,8 +542,8 @@ PixelToLNKAssociateFromAscii::Range
   // }
   // if (first) {
   //   string s = "** PixelToLNKAssociateFromAscii, read data, cant intrpret: " ;
-  //   edm::LogInfo(s) << endl 
-  // 		    << l << endl 
+  //   edm::LogInfo(s) << endl
+  // 		    << l << endl
   //             <<"=====> send exception " << endl;
   //   s += l;
   //   throw cms::Exception(s);
@@ -490,6 +552,4 @@ PixelToLNKAssociateFromAscii::Range
   //if(!phase1_ && (i2!=num2)) cout<<" something wrong with max range "<<i2<<" "<<num2<<endl;
   //cout<<" min max "<<num1<<" "<<num2<<endl;
   //return Range(num1,num2);
-
 }
-
diff --git a/CalibTracker/SiPixelConnectivity/src/SiPixelFedCablingMapBuilder.cc b/CalibTracker/SiPixelConnectivity/src/SiPixelFedCablingMapBuilder.cc
index f0152c9ca148e..d2a8022227a81 100644
--- a/CalibTracker/SiPixelConnectivity/src/SiPixelFedCablingMapBuilder.cc
+++ b/CalibTracker/SiPixelConnectivity/src/SiPixelFedCablingMapBuilder.cc
@@ -30,19 +30,17 @@
 using namespace std;
 using namespace sipixelobjects;
 
-SiPixelFedCablingMapBuilder::SiPixelFedCablingMapBuilder(const string fileName, 
-							 const bool phase1) : 
-  fileName_(fileName)  //, phase1_(phase1) not used anymore
-{ }
-
-
-SiPixelFedCablingTree * SiPixelFedCablingMapBuilder::produce( const edm::EventSetup& setup) {
+SiPixelFedCablingMapBuilder::SiPixelFedCablingMapBuilder(const string fileName,
+                                                         const bool phase1)
+    : fileName_(fileName)  //, phase1_(phase1) not used anymore
+{}
 
+SiPixelFedCablingTree* SiPixelFedCablingMapBuilder::produce(const edm::EventSetup& setup) {
   // Access geometry
   edm::LogInfo("read tracker geometry...");
   edm::ESHandle<TrackerGeometry> pDD;
-  setup.get<TrackerDigiGeometryRecord>().get( pDD );
-  edm::LogInfo("tracker geometry read")<<"There are: "<<  pDD->dets().size() <<" detectors";
+  setup.get<TrackerDigiGeometryRecord>().get(pDD);
+  edm::LogInfo("tracker geometry read") << "There are: " << pDD->dets().size() << " detectors";
 
   // Test new TrackerGeometry features
   //cout << "Test of TrackerGeometry::isThere";
@@ -52,41 +50,40 @@ SiPixelFedCablingTree * SiPixelFedCablingMapBuilder::produce( const edm::EventSe
   //cout  << " is there P1PXEC: " << pDD->isThere(GeomDetEnumerators::P1PXEC);
   //cout  << endl;
 
-  // switch on the phase1 
-  if( (pDD->isThere(GeomDetEnumerators::P1PXB)) || 
-      (pDD->isThere(GeomDetEnumerators::P1PXEC)) ) {
+  // switch on the phase1
+  if ((pDD->isThere(GeomDetEnumerators::P1PXB)) || (pDD->isThere(GeomDetEnumerators::P1PXEC))) {
     phase1_ = true;
     //cout<<" this is phase1 "<<endl;
-    edm::LogInfo("SiPixelFedCablingMapBuilder")<<" pixel phase1 setup ";
+    edm::LogInfo("SiPixelFedCablingMapBuilder") << " pixel phase1 setup ";
   } else {
     phase1_ = false;
     //cout<<" this is phase0 "<<endl;
-    edm::LogInfo("SiPixelFedCablingMapBuilder")<<" pixel phase0 setup ";
+    edm::LogInfo("SiPixelFedCablingMapBuilder") << " pixel phase0 setup ";
   }
 
   int MINFEDID = FEDNumbering::MINSiPixelFEDID;
   int MAXFEDID = FEDNumbering::MAXSiPixelFEDID;
-  if(phase1_) {
+  if (phase1_) {
     // bpix 1200-1239, fpix 1240-1255
     MINFEDID = FEDNumbering::MINSiPixeluTCAFEDID;
-    MAXFEDID = FEDNumbering::MAXSiPixeluTCAFEDID; // is actually 1349, might work
+    MAXFEDID = FEDNumbering::MAXSiPixeluTCAFEDID;  // is actually 1349, might work
   }
-  TRange<int> fedIds(MINFEDID,MAXFEDID);
-  edm::LogInfo("SiPixelFedCablingMapBuilder")<<"pixel fedid range: "<<fedIds;
+  TRange<int> fedIds(MINFEDID, MAXFEDID);
+  edm::LogInfo("SiPixelFedCablingMapBuilder") << "pixel fedid range: " << fedIds;
 
-  // in the constrcuctor init() is called which reads the ascii file and makes 
-  // the map roc<->link 
+  // in the constrcuctor init() is called which reads the ascii file and makes
+  // the map roc<->link
   // what is this junk? Replace by fixed associator.
   //edm::ESHandle<PixelToFEDAssociate> associator;
   //setup.get<TrackerDigiGeometryRecord>().get(theAssociatorName,associator);
   //PixelToFEDAssociate * associator = new PixelToLNKAssociateFromAscii("pixelToLNK.ascii",phase1_);
-  PixelToFEDAssociate * associator = new PixelToLNKAssociateFromAscii(fileName_,phase1_);
-  
-  const PixelToFEDAssociate & name2fed = *associator; 
-  
+  PixelToFEDAssociate* associator = new PixelToLNKAssociateFromAscii(fileName_, phase1_);
+
+  const PixelToFEDAssociate& name2fed = *associator;
+
   string version = name2fed.version();
-  SiPixelFedCablingTree * result = new SiPixelFedCablingTree(version);
-  edm::LogInfo(" version ")<<version<<endl;
+  SiPixelFedCablingTree* result = new SiPixelFedCablingTree(version);
+  edm::LogInfo(" version ") << version << endl;
 
   // Access topology
   edm::ESHandle<TrackerTopology> tTopo;
@@ -96,30 +93,31 @@ SiPixelFedCablingTree * SiPixelFedCablingMapBuilder::produce( const edm::EventSe
   typedef TrackerGeometry::DetContainer::const_iterator ITG;
   int npxdets = 0;
 
-  typedef  std::vector<pair<PixelModuleName* , uint32_t> > UNITS;
+  typedef std::vector<pair<PixelModuleName*, uint32_t> > UNITS;
   UNITS units;
 
   for (ITG it = pDD->dets().begin(); it != pDD->dets().end(); it++) {
-    const PixelGeomDetUnit * pxUnit = dynamic_cast<const PixelGeomDetUnit*>(*it);
-    if (pxUnit  ==nullptr ) continue;
+    const PixelGeomDetUnit* pxUnit = dynamic_cast<const PixelGeomDetUnit*>(*it);
+    if (pxUnit == nullptr)
+      continue;
     npxdets++;
     DetId geomid = pxUnit->geographicalId();
-    PixelModuleName * name =  nullptr;
-    if (1 == geomid.subdetId()) {  // bpix 
-      name = new PixelBarrelName(geomid,tt,phase1_);
-    } else {                      // fpix 
-      name = new PixelEndcapName(geomid,tt,phase1_);
-    } 
-    edm::LogInfo(" NAME: ")<<name->name();
+    PixelModuleName* name = nullptr;
+    if (1 == geomid.subdetId()) {  // bpix
+      name = new PixelBarrelName(geomid, tt, phase1_);
+    } else {  // fpix
+      name = new PixelEndcapName(geomid, tt, phase1_);
+    }
+    edm::LogInfo(" NAME: ") << name->name();
     //cout << " NAME: "<<name->name()<<" "<<geomid.rawId()<<
     //" "<<myprint(pxUnit)<<endl;
-    units.push_back( std::make_pair( name, geomid.rawId() ) );
+    units.push_back(std::make_pair(name, geomid.rawId()));
   }
 
-  // This produces  a simple, unrealistic map, NOT USED ANYMORE 
+  // This produces  a simple, unrealistic map, NOT USED ANYMORE
   // if (theAssociatorName=="PixelToFEDAssociateFromAscii") {
   //   cout <<" HERE PixelToFEDAssociateFromAscii"<<endl;
-  //   vector<FedSpec> fedSpecs(fedIds.max()-fedIds.min()+1); 
+  //   vector<FedSpec> fedSpecs(fedIds.max()-fedIds.min()+1);
   //   for (int id=fedIds.first; id<=fedIds.second; id++) {
   //     FedSpec fs={ id, vector<PixelModuleName* >(), vector<uint32_t>()};
   //     int idx = id - fedIds.min();
@@ -147,7 +145,7 @@ SiPixelFedCablingTree * SiPixelFedCablingMapBuilder::produce( const edm::EventSe
   //     PixelFEDCabling fed(fedId);
   //     bool barrel = it->names.front()->isBarrel();
   //     if (barrel) {
-  // 	PixelFEDCabling::Links links = 
+  // 	PixelFEDCabling::Links links =
   //         PixelBarrelLinkMaker(&fed).links(names,units);
   // 	fed.setLinks(links);
   // 	result->addFed(fed);
@@ -158,55 +156,62 @@ SiPixelFedCablingTree * SiPixelFedCablingMapBuilder::produce( const edm::EventSe
   // 	result->addFed(fed);
   //     }
   //   }
-  // } else {     // This is what is really used 
-
-    PixelToFEDAssociate::DetectorRocId detectorRocId;
-    edm::LogInfo(" HERE PixelToLNKAssociateFromAscii");
-    for (UNITS::iterator iu=units.begin(); iu != units.end(); iu++) {
-      PixelModuleName * name =  (*iu).first; 
-      detectorRocId.module = name;
-      //for (int rocDetId=0; rocDetId<=16; rocDetId++) {
-      for (int rocDetId=0; rocDetId<16; rocDetId++) {
-        detectorRocId.rocDetId = rocDetId;
-        const PixelToFEDAssociate::CablingRocId * cablingRocId =  name2fed(detectorRocId);
-        if (cablingRocId) {
-          sipixelobjects::PixelROC roc( iu->second, rocDetId, cablingRocId->rocLinkId ); 
-          result->addItem(cablingRocId->fedId, cablingRocId->linkId, roc);
-	  edm::LogInfo(" ok ")<<name->name()<<" "<<rocDetId<<" "<<cablingRocId->fedId<<" "
-	      <<cablingRocId->linkId;
-        } else {  // did it fail?
-	  edm::LogInfo(" failed ")<<name->name()<<" "<<rocDetId;
-	  //cout<<" failed "<<name->name()<<" "<<rocDetId<<endl;
-	}
+  // } else {     // This is what is really used
+
+  PixelToFEDAssociate::DetectorRocId detectorRocId;
+  edm::LogInfo(" HERE PixelToLNKAssociateFromAscii");
+  for (UNITS::iterator iu = units.begin(); iu != units.end(); iu++) {
+    PixelModuleName* name = (*iu).first;
+    detectorRocId.module = name;
+    //for (int rocDetId=0; rocDetId<=16; rocDetId++) {
+    for (int rocDetId = 0; rocDetId < 16; rocDetId++) {
+      detectorRocId.rocDetId = rocDetId;
+      const PixelToFEDAssociate::CablingRocId* cablingRocId = name2fed(detectorRocId);
+      if (cablingRocId) {
+        sipixelobjects::PixelROC roc(iu->second, rocDetId, cablingRocId->rocLinkId);
+        result->addItem(cablingRocId->fedId, cablingRocId->linkId, roc);
+        edm::LogInfo(" ok ") << name->name() << " " << rocDetId << " " << cablingRocId->fedId << " "
+                             << cablingRocId->linkId;
+      } else {  // did it fail?
+        edm::LogInfo(" failed ") << name->name() << " " << rocDetId;
+        //cout<<" failed "<<name->name()<<" "<<rocDetId<<endl;
       }
     }
-    //}
+  }
+  //}
 
   //clear names:
-  for (UNITS::iterator iu=units.begin(); iu != units.end(); iu++) delete iu->first;
+  for (UNITS::iterator iu = units.begin(); iu != units.end(); iu++)
+    delete iu->first;
 
   return result;
- 
 }
-std::string SiPixelFedCablingMapBuilder::myprint(const PixelGeomDetUnit * pxUnit)
-{
+std::string SiPixelFedCablingMapBuilder::myprint(const PixelGeomDetUnit* pxUnit) {
   std::ostringstream str;
-  const PixelTopology & tpl = pxUnit->specificTopology();
+  const PixelTopology& tpl = pxUnit->specificTopology();
   LocalPoint local;
   GlobalPoint global;
 
-  local = LocalPoint(0,0,0); global = (*pxUnit).toGlobal(local);
+  local = LocalPoint(0, 0, 0);
+  global = (*pxUnit).toGlobal(local);
   // phi measured from Y axis
-  float phi = 180*atan2(global.x(),global.y())/M_PI;  if (phi > 180.) phi = phi-360;
+  float phi = 180 * atan2(global.x(), global.y()) / M_PI;
+  if (phi > 180.)
+    phi = phi - 360;
   float r = global.perp();
   float z = global.z();
-  str <<"    POSITION: "<<" r="<<r<<" phi="<<phi<<" z="<<z;
-  str <<"   (rows,coll:"<<tpl.nrows()<<","<<tpl.ncolumns()<<")";
-  str <<endl; 
-  local = LocalPoint(0,0,0); str <<local<<"global: "<<(*pxUnit).toGlobal(local) <<endl;
-  local = LocalPoint(1,0,0); str <<local<<"global: "<<(*pxUnit).toGlobal(local) <<endl;
-  local = LocalPoint(0,1,0); str <<local<<"global: "<<(*pxUnit).toGlobal(local) <<endl;
-  local = LocalPoint(0,0,1); str <<local<<"global: "<<(*pxUnit).toGlobal(local) <<endl;
-      
+  str << "    POSITION: "
+      << " r=" << r << " phi=" << phi << " z=" << z;
+  str << "   (rows,coll:" << tpl.nrows() << "," << tpl.ncolumns() << ")";
+  str << endl;
+  local = LocalPoint(0, 0, 0);
+  str << local << "global: " << (*pxUnit).toGlobal(local) << endl;
+  local = LocalPoint(1, 0, 0);
+  str << local << "global: " << (*pxUnit).toGlobal(local) << endl;
+  local = LocalPoint(0, 1, 0);
+  str << local << "global: " << (*pxUnit).toGlobal(local) << endl;
+  local = LocalPoint(0, 0, 1);
+  str << local << "global: " << (*pxUnit).toGlobal(local) << endl;
+
   return str.str();
 }
diff --git a/CalibTracker/SiPixelConnectivity/test/SiPixelFedCablingMapWriter.cc b/CalibTracker/SiPixelConnectivity/test/SiPixelFedCablingMapWriter.cc
old mode 100755
new mode 100644
index 491d9d11a50ac..81e2e5877ea86
--- a/CalibTracker/SiPixelConnectivity/test/SiPixelFedCablingMapWriter.cc
+++ b/CalibTracker/SiPixelConnectivity/test/SiPixelFedCablingMapWriter.cc
@@ -20,50 +20,44 @@ using namespace edm;
 using namespace sipixelobjects;
 
 class SiPixelFedCablingMapWriter : public edm::EDAnalyzer {
- public:
-  explicit SiPixelFedCablingMapWriter( const edm::ParameterSet& cfg);
+public:
+  explicit SiPixelFedCablingMapWriter(const edm::ParameterSet& cfg);
   ~SiPixelFedCablingMapWriter();
   virtual void beginJob();
-  virtual void endJob( );
-  virtual void analyze(const edm::Event& , const edm::EventSetup&);
- private:
-  SiPixelFedCablingTree * cabling;
+  virtual void endJob();
+  virtual void analyze(const edm::Event&, const edm::EventSetup&);
+
+private:
+  SiPixelFedCablingTree* cabling;
   string record_;
   //string pixelToFedAssociator_;
   string fileName_;
   //bool phase1_;
 };
 
-SiPixelFedCablingMapWriter::SiPixelFedCablingMapWriter( 
-    const edm::ParameterSet& cfg ) 
-  : 
-    record_(cfg.getParameter<std::string>("record")), 
-    //pixelToFedAssociator_(cfg.getUntrackedParameter<std::string>("associator","PixelToFEDAssociateFromAscii")), 
-    //phase1_(cfg.getUntrackedParameter<bool>("phase1",false)), 
-    fileName_(cfg.getUntrackedParameter<std::string>("fileName","pixelToLNK.ascii")) 
-{
-  
+SiPixelFedCablingMapWriter::SiPixelFedCablingMapWriter(const edm::ParameterSet& cfg)
+    : record_(cfg.getParameter<std::string>("record")),
+      //pixelToFedAssociator_(cfg.getUntrackedParameter<std::string>("associator","PixelToFEDAssociateFromAscii")),
+      //phase1_(cfg.getUntrackedParameter<bool>("phase1",false)),
+      fileName_(cfg.getUntrackedParameter<std::string>("fileName", "pixelToLNK.ascii")) {
   stringstream out;
   out << " record:          " << record_ << endl;
-  out << " input file name "  << fileName_ << endl;
+  out << " input file name " << fileName_ << endl;
   //out << " phase " << phase1_ << endl;
-  LogInfo("initialisation: ")<<out.str();
-
+  LogInfo("initialisation: ") << out.str();
 
   //::putenv(const_cast<char*>(std::string("CORAL_AUTH_USER=me").c_str()));
-  //::putenv(const_cast<char*>(std::string("CORAL_AUTH_PASSWORD=none").c_str())); 
+  //::putenv(const_cast<char*>(std::string("CORAL_AUTH_PASSWORD=none").c_str()));
 }
 
-
-SiPixelFedCablingMapWriter::~SiPixelFedCablingMapWriter(){
-//  delete cabling;
+SiPixelFedCablingMapWriter::~SiPixelFedCablingMapWriter() {
+  //  delete cabling;
 }
 
-
-void SiPixelFedCablingMapWriter::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
-  static int first(1); 
+void SiPixelFedCablingMapWriter::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
+  static int first(1);
   if (1 == first) {
-    first = 0; 
+    first = 0;
     //std::cout << "-------HERE-----------" << endl;
     //cabling = SiPixelFedCablingMapBuilder(pixelToFedAssociator_).produce(iSetup);
     //cabling = SiPixelFedCablingMapBuilder(fileName_,phase1_).produce(iSetup);
@@ -73,37 +67,33 @@ void SiPixelFedCablingMapWriter::analyze(const edm::Event &iEvent, const edm::Ev
   }
 }
 
-void SiPixelFedCablingMapWriter::beginJob() {
-}
+void SiPixelFedCablingMapWriter::beginJob() {}
 
-void SiPixelFedCablingMapWriter::endJob( ) {
-  SiPixelFedCablingMap * result = new SiPixelFedCablingMap(cabling);
+void SiPixelFedCablingMapWriter::endJob() {
+  SiPixelFedCablingMap* result = new SiPixelFedCablingMap(cabling);
   LogInfo("Now NEW writing to DB");
   edm::Service<cond::service::PoolDBOutputService> mydbservice;
-  if( !mydbservice.isAvailable() ){
+  if (!mydbservice.isAvailable()) {
     edm::LogInfo("db service unavailable");
     //std::cout<<"db service unavailable"<<std::endl;
     return;
-  } else { 
-    //std::cout<<"OK"<<std::endl; 
+  } else {
+    //std::cout<<"OK"<<std::endl;
     edm::LogInfo("Writing finished ");
   }
 
   try {
-    if( mydbservice->isNewTagRequest(record_) ){
-      mydbservice->createNewIOV<SiPixelFedCablingMap>( result, 
-						       mydbservice->beginOfTime(),
-						       mydbservice->endOfTime(), 
-						       record_);
-    }else{
-      mydbservice->appendSinceTime<SiPixelFedCablingMap>( 
-          result, 
-	  mydbservice->currentTime(), 
-	  record_);
+    if (mydbservice->isNewTagRequest(record_)) {
+      mydbservice->createNewIOV<SiPixelFedCablingMap>(
+          result, mydbservice->beginOfTime(), mydbservice->endOfTime(), record_);
+    } else {
+      mydbservice->appendSinceTime<SiPixelFedCablingMap>(result, mydbservice->currentTime(), record_);
     }
-  } 
-  catch (std::exception &e) { LogError("std::exception:  ") << e.what(); }
-  catch (...) { LogError("Unknown error caught "); }
+  } catch (std::exception& e) {
+    LogError("std::exception:  ") << e.what();
+  } catch (...) {
+    LogError("Unknown error caught ");
+  }
   LogInfo("... all done, end");
 }
 
diff --git a/CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h b/CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h
index 99f2c6cea7949..a3efb55b51c6d 100644
--- a/CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h
+++ b/CalibTracker/SiPixelErrorEstimation/interface/SiPixelErrorEstimation.h
@@ -28,18 +28,18 @@
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 
-#include "RecoTracker/TransientTrackingRecHit/interface/TkTransientTrackingRecHitBuilder.h" 
+#include "RecoTracker/TransientTrackingRecHit/interface/TkTransientTrackingRecHitBuilder.h"
 
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 
 //--- for SimHit association
-#include "SimDataFormats/TrackingHit/interface/PSimHit.h"  
-#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h" 
+#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
+#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
 
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h" 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h" 
+#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
+#include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
@@ -58,67 +58,57 @@
 #include <TProfile.h>
 
 class TTree;
-class TFile; 
+class TFile;
 
-class SiPixelErrorEstimation : public edm::EDAnalyzer 
-{
- public:
-  
+class SiPixelErrorEstimation : public edm::EDAnalyzer {
+public:
   explicit SiPixelErrorEstimation(const edm::ParameterSet&);
   ~SiPixelErrorEstimation() override;
-    
-  void beginJob() override ;
+
+  void beginJob() override;
   void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void endJob() override ;
-
-  void computeAnglesFromDetPosition( const SiPixelCluster & cl, 
-				     const GeomDetUnit    & det, 
-				     float& alpha, float& beta );
-    
- private: 
-  
+  void endJob() override;
+
+  void computeAnglesFromDetPosition(const SiPixelCluster& cl, const GeomDetUnit& det, float& alpha, float& beta);
+
+private:
   edm::ParameterSet conf_;
   edm::EDGetTokenT<std::vector<Trajectory>> tTrajectory;
   edm::EDGetTokenT<SiPixelRecHitCollection> tPixRecHitCollection;
-  edm::EDGetTokenT <edm::SimTrackContainer> tSimTrackContainer;
-  edm::EDGetTokenT <reco::TrackCollection> tTrackCollection; 
+  edm::EDGetTokenT<edm::SimTrackContainer> tSimTrackContainer;
+  edm::EDGetTokenT<reco::TrackCollection> tTrackCollection;
   std::string outputFile_;
   std::string src_;
-  bool checkType_; // do we check that the simHit associated with recHit is of the expected particle type ?
-  int genType_; // the type of particle that the simHit associated with recHits should be
-  bool include_trk_hits_; // if set to false, take only hits directly from detector modules (don't ntuplize hits from tracks)
+  bool checkType_;         // do we check that the simHit associated with recHit is of the expected particle type ?
+  int genType_;            // the type of particle that the simHit associated with recHits should be
+  bool include_trk_hits_;  // if set to false, take only hits directly from detector modules (don't ntuplize hits from tracks)
 
   // variables that go in the output ttree_track_hits_
-  float rechitx; // x position of hit 
-  float rechity; // y position of hit
-  float rechitz; // z position of hit
-  float rechiterrx; // x position error of hit (error not squared)
-  float rechiterry; // y position error of hit (error not squared)
-  float rechitresx; // difference between reconstructed hit x position and 'true' x position
-  float rechitresy; // difference between reconstructed hit y position and 'true' y position
-  float rechitpullx; // x residual divideded by error
-  float rechitpully; // y residual divideded by error
-
-
+  float rechitx;      // x position of hit
+  float rechity;      // y position of hit
+  float rechitz;      // z position of hit
+  float rechiterrx;   // x position error of hit (error not squared)
+  float rechiterry;   // y position error of hit (error not squared)
+  float rechitresx;   // difference between reconstructed hit x position and 'true' x position
+  float rechitresy;   // difference between reconstructed hit y position and 'true' y position
+  float rechitpullx;  // x residual divideded by error
+  float rechitpully;  // y residual divideded by error
+
+  float strip_rechitx;     // x position of hit
+  float strip_rechity;     // y position of hit
+  float strip_rechitz;     // z position of hit
+  float strip_rechiterrx;  // x position error of hit (error not squared)
+  float strip_rechiterry;  // y position error of hit (error not squared)
+  float strip_rechitresx;  // difference between reconstructed hit x position and 'true' x position
 
-
-
-  float strip_rechitx; // x position of hit 
-  float strip_rechity; // y position of hit
-  float strip_rechitz; // z position of hit
-  float strip_rechiterrx; // x position error of hit (error not squared)
-  float strip_rechiterry; // y position error of hit (error not squared)
-  float strip_rechitresx; // difference between reconstructed hit x position and 'true' x position
-  
-  
   float strip_rechitresx2;
 
-  float strip_rechitresy; // difference between reconstructed hit y position and 'true' y position
-  float strip_rechitpullx; // x residual divideded by error
-  float strip_rechitpully; // y residual divideded by error
+  float strip_rechitresy;   // difference between reconstructed hit y position and 'true' y position
+  float strip_rechitpullx;  // x residual divideded by error
+  float strip_rechitpully;  // y residual divideded by error
   int strip_is_stereo;
-  int strip_hit_type; // matched=0, 1D=1 or 2D=2
-  int detector_type; //IB1=1, IB2=2, OB1=3, OB2=4
+  int strip_hit_type;  // matched=0, 1D=1 or 2D=2
+  int detector_type;   //IB1=1, IB2=2, OB1=3, OB2=4
 
   float strip_trk_pt;
   float strip_cotalpha;
@@ -129,52 +119,52 @@ class SiPixelErrorEstimation : public edm::EDAnalyzer
   float strip_charge;
   int strip_size;
   int strip_edge;
-  int strip_nsimhit; // number of simhits associated with a rechit
-  int strip_pidhit; // PID of the particle that produced the simHit associated with the recHit
-  int strip_simproc; // procces type
-
-  int strip_subdet_id; // enum SubDetector { UNKNOWN=0, TIB=3, TID=4, TOB=5, TEC=6 };
- 
-  int strip_tib_layer             ;
-  int strip_tib_module            ;
-  int strip_tib_order             ;
-  int strip_tib_side              ;
-  int strip_tib_is_double_side    ;
-  int strip_tib_is_z_plus_side    ;
-  int strip_tib_is_z_minus_side   ;
-  int strip_tib_layer_number      ;
-  int strip_tib_string_number     ;
-  int strip_tib_module_number     ;
+  int strip_nsimhit;  // number of simhits associated with a rechit
+  int strip_pidhit;   // PID of the particle that produced the simHit associated with the recHit
+  int strip_simproc;  // procces type
+
+  int strip_subdet_id;  // enum SubDetector { UNKNOWN=0, TIB=3, TID=4, TOB=5, TEC=6 };
+
+  int strip_tib_layer;
+  int strip_tib_module;
+  int strip_tib_order;
+  int strip_tib_side;
+  int strip_tib_is_double_side;
+  int strip_tib_is_z_plus_side;
+  int strip_tib_is_z_minus_side;
+  int strip_tib_layer_number;
+  int strip_tib_string_number;
+  int strip_tib_module_number;
   int strip_tib_is_internal_string;
   int strip_tib_is_external_string;
-  int strip_tib_is_rphi           ;
-  int strip_tib_is_stereo         ;          
-  
-  int strip_tob_layer             ;
-  int strip_tob_module            ;
+  int strip_tib_is_rphi;
+  int strip_tib_is_stereo;
+
+  int strip_tob_layer;
+  int strip_tob_module;
   //int strip_tob_order             ;
-  int strip_tob_side              ;
-  int strip_tob_is_double_side    ;
-  int strip_tob_is_z_plus_side    ;
-  int strip_tob_is_z_minus_side   ;
-  int strip_tob_layer_number      ;
-  int strip_tob_rod_number     ;
-  int strip_tob_module_number     ;
+  int strip_tob_side;
+  int strip_tob_is_double_side;
+  int strip_tob_is_z_plus_side;
+  int strip_tob_is_z_minus_side;
+  int strip_tob_layer_number;
+  int strip_tob_rod_number;
+  int strip_tob_module_number;
 
-  int strip_tob_is_rphi           ;
-  int strip_tob_is_stereo         ;     
+  int strip_tob_is_rphi;
+  int strip_tob_is_stereo;
 
   float strip_prob;
-  int   strip_qbin;
-  
-  int   strip_nprm;
+  int strip_qbin;
+
+  int strip_nprm;
 
   int strip_pidhit1;
   int strip_simproc1;
-  
+
   int strip_pidhit2;
   int strip_simproc2;
-  
+
   int strip_pidhit3;
   int strip_simproc3;
 
@@ -188,45 +178,45 @@ class SiPixelErrorEstimation : public edm::EDAnalyzer
   float strip_clst_err_x;
   float strip_clst_err_y;
 
-  int npix; // number of pixel in the cluster
-  int nxpix; // size of cluster (number of pixels) along x direction
-  int nypix; // size of cluster (number of pixels) along y direction
-  float charge; // total charge in cluster
+  int npix;      // number of pixel in the cluster
+  int nxpix;     // size of cluster (number of pixels) along x direction
+  int nypix;     // size of cluster (number of pixels) along y direction
+  float charge;  // total charge in cluster
 
-  int edgex; // edgex = 1 if the cluster is at the x edge of the module  
-  int edgey; // edgey = 1 if the cluster is at the y edge of the module 
+  int edgex;  // edgex = 1 if the cluster is at the x edge of the module
+  int edgey;  // edgey = 1 if the cluster is at the y edge of the module
 
-  int bigx; // bigx = 1 if the cluster contains at least one big pixel in x
-  int bigy; // bigy = 1 if the cluster contains at least one big pixel in y
+  int bigx;  // bigx = 1 if the cluster contains at least one big pixel in x
+  int bigy;  // bigy = 1 if the cluster contains at least one big pixel in y
 
-  float alpha; // track angle in the xz plane of the module local coordinate system  
-  float beta;  // track angle in the yz plane of the module local coordinate system  
+  float alpha;  // track angle in the xz plane of the module local coordinate system
+  float beta;   // track angle in the yz plane of the module local coordinate system
 
-  float trk_alpha; // reconstructed track angle in the xz plane of the module local coordinate system  
-  float trk_beta;  // reconstructed track angle in the yz plane of the module local coordinate system  
+  float trk_alpha;  // reconstructed track angle in the xz plane of the module local coordinate system
+  float trk_beta;   // reconstructed track angle in the yz plane of the module local coordinate system
 
-  float phi;   // polar track angle
-  float eta;   // pseudo-rapidity (function of theta, the azimuthal angle)
+  float phi;  // polar track angle
+  float eta;  // pseudo-rapidity (function of theta, the azimuthal angle)
 
   int subdetId;
-  int layer;  
-  int ladder; 
-  int mod;    
-  int side;    
-  int disk;   
-  int blade;  
-  int panel;  
-  int plaq;   
- 
-  int half; // half = 1 if the barrel module is half size and 0 if it is full size (only defined for barrel) 
-  int flipped; // flipped = 1 if the module is flipped and 0 if non-flipped (only defined for barrel) 
-
-  int nsimhit; // number of simhits associated with a rechit
-  int pidhit; // PID of the particle that produced the simHit associated with the recHit
-  int simproc; // procces tye
-
-  float simhitx; // true x position of hit 
-  float simhity; // true y position of hit
+  int layer;
+  int ladder;
+  int mod;
+  int side;
+  int disk;
+  int blade;
+  int panel;
+  int plaq;
+
+  int half;     // half = 1 if the barrel module is half size and 0 if it is full size (only defined for barrel)
+  int flipped;  // flipped = 1 if the module is flipped and 0 if non-flipped (only defined for barrel)
+
+  int nsimhit;  // number of simhits associated with a rechit
+  int pidhit;   // PID of the particle that produced the simHit associated with the recHit
+  int simproc;  // procces tye
+
+  float simhitx;  // true x position of hit
+  float simhity;  // true y position of hit
 
   int evt;
   int run;
@@ -242,9 +232,8 @@ class SiPixelErrorEstimation : public edm::EDAnalyzer
   float pixel_clst_err_x;
   float pixel_clst_err_y;
 
+  // variables that go in the output ttree_sll_hits_
 
-   // variables that go in the output ttree_sll_hits_
-  
   int all_subdetid;
 
   int all_layer;
@@ -256,7 +245,7 @@ class SiPixelErrorEstimation : public edm::EDAnalyzer
   int all_blade;
   int all_panel;
   int all_plaq;
-  
+
   int all_half;
   int all_flipped;
 
@@ -360,7 +349,7 @@ class SiPixelErrorEstimation : public edm::EDAnalyzer
   float all_pixgx[maxpix];
   float all_pixgy[maxpix];
   float all_pixgz[maxpix];
-    
+
   float all_hit_probx;
   float all_hit_proby;
   float all_hit_cprob0;
@@ -371,15 +360,14 @@ class SiPixelErrorEstimation : public edm::EDAnalyzer
   float all_pixel_clst_err_x;
   float all_pixel_clst_err_y;
 
-
   // ----------------------------------
 
-  TFile * tfile_;
-  TTree * ttree_all_hits_;
-  TTree * ttree_track_hits_;
+  TFile* tfile_;
+  TTree* ttree_all_hits_;
+  TTree* ttree_track_hits_;
+
+  TTree* ttree_track_hits_strip_;
 
-  TTree * ttree_track_hits_strip_;
-  
   TrackerHitAssociator::Config trackerHitAssociatorConfig_;
 };
 
diff --git a/CalibTracker/SiPixelErrorEstimation/src/SiPixelErrorEstimation.cc b/CalibTracker/SiPixelErrorEstimation/src/SiPixelErrorEstimation.cc
index e104f85c88f47..54bfa5e4ba373 100644
--- a/CalibTracker/SiPixelErrorEstimation/src/SiPixelErrorEstimation.cc
+++ b/CalibTracker/SiPixelErrorEstimation/src/SiPixelErrorEstimation.cc
@@ -10,7 +10,7 @@
 #include "DataFormats/GeometryVector/interface/LocalVector.h"
 
 #include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/DetId/interface/DetId.h" 
+#include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
 
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h"
@@ -32,260 +32,263 @@
 using namespace std;
 using namespace edm;
 
-SiPixelErrorEstimation::SiPixelErrorEstimation(const edm::ParameterSet& ps):tfile_(nullptr), ttree_all_hits_(nullptr), 
-									    ttree_track_hits_(nullptr), ttree_track_hits_strip_(nullptr),
-									    trackerHitAssociatorConfig_(consumesCollector())
-{
+SiPixelErrorEstimation::SiPixelErrorEstimation(const edm::ParameterSet& ps)
+    : tfile_(nullptr),
+      ttree_all_hits_(nullptr),
+      ttree_track_hits_(nullptr),
+      ttree_track_hits_strip_(nullptr),
+      trackerHitAssociatorConfig_(consumesCollector()) {
   //Read config file
-  outputFile_ = ps.getUntrackedParameter<string>( "outputFile", "SiPixelErrorEstimation_Ntuple.root" );
-  
+  outputFile_ = ps.getUntrackedParameter<string>("outputFile", "SiPixelErrorEstimation_Ntuple.root");
+
   // Replace  "ctfWithMaterialTracks" with "generalTracks"
   //src_ = ps.getUntrackedParameter<std::string>( "src", "ctfWithMaterialTracks" );
-  src_ = ps.getUntrackedParameter<std::string>( "src", "generalTracks" );
+  src_ = ps.getUntrackedParameter<std::string>("src", "generalTracks");
 
-  checkType_ = ps.getParameter<bool>( "checkType" );
-  genType_ = ps.getParameter<int>( "genType" );
-  include_trk_hits_ = ps.getParameter<bool>( "include_trk_hits" );
+  checkType_ = ps.getParameter<bool>("checkType");
+  genType_ = ps.getParameter<int>("genType");
+  include_trk_hits_ = ps.getParameter<bool>("include_trk_hits");
 
-  tTrajectory = consumes<std::vector<Trajectory>> (src_);
-  tPixRecHitCollection = consumes<SiPixelRecHitCollection>(edm::InputTag( "siPixelRecHits"));
-  tSimTrackContainer = consumes <edm::SimTrackContainer>(edm::InputTag("g4SimHits"));
+  tTrajectory = consumes<std::vector<Trajectory>>(src_);
+  tPixRecHitCollection = consumes<SiPixelRecHitCollection>(edm::InputTag("siPixelRecHits"));
+  tSimTrackContainer = consumes<edm::SimTrackContainer>(edm::InputTag("g4SimHits"));
   tTrackCollection = consumes<reco::TrackCollection>(src_);
-
 }
 
-SiPixelErrorEstimation::~SiPixelErrorEstimation()
-{}
-
-void SiPixelErrorEstimation::beginJob()
-{
-   int bufsize = 64000;
+SiPixelErrorEstimation::~SiPixelErrorEstimation() {}
 
+void SiPixelErrorEstimation::beginJob() {
+  int bufsize = 64000;
 
-  tfile_ = new TFile ( outputFile_.c_str() , "RECREATE");
+  tfile_ = new TFile(outputFile_.c_str(), "RECREATE");
 
-  
   ttree_track_hits_strip_ = new TTree("TrackHitNtupleStrip", "TrackHitNtupleStrip");
-  
-  ttree_track_hits_strip_->Branch("strip_rechitx", &strip_rechitx, "strip_rechitx/F"    , bufsize);
-  ttree_track_hits_strip_->Branch("strip_rechity", &strip_rechity, "strip_rechity/F"    , bufsize);
-  ttree_track_hits_strip_->Branch("strip_rechitz", &strip_rechitz, "strip_rechitz/F"    , bufsize);
-  
-  ttree_track_hits_strip_->Branch("strip_rechiterrx", &strip_rechiterrx, "strip_rechiterrx/F" , bufsize);
-  ttree_track_hits_strip_->Branch("strip_rechiterry", &strip_rechiterry, "strip_rechiterry/F" , bufsize);
 
-  ttree_track_hits_strip_->Branch("strip_rechitresx", &strip_rechitresx, "strip_rechitresx/F" , bufsize);
-  
-  ttree_track_hits_strip_->Branch("strip_rechitresx2", &strip_rechitresx2, "strip_rechitresx2/F" , bufsize);
+  ttree_track_hits_strip_->Branch("strip_rechitx", &strip_rechitx, "strip_rechitx/F", bufsize);
+  ttree_track_hits_strip_->Branch("strip_rechity", &strip_rechity, "strip_rechity/F", bufsize);
+  ttree_track_hits_strip_->Branch("strip_rechitz", &strip_rechitz, "strip_rechitz/F", bufsize);
+
+  ttree_track_hits_strip_->Branch("strip_rechiterrx", &strip_rechiterrx, "strip_rechiterrx/F", bufsize);
+  ttree_track_hits_strip_->Branch("strip_rechiterry", &strip_rechiterry, "strip_rechiterry/F", bufsize);
+
+  ttree_track_hits_strip_->Branch("strip_rechitresx", &strip_rechitresx, "strip_rechitresx/F", bufsize);
+
+  ttree_track_hits_strip_->Branch("strip_rechitresx2", &strip_rechitresx2, "strip_rechitresx2/F", bufsize);
 
+  ttree_track_hits_strip_->Branch("strip_rechitresy", &strip_rechitresy, "strip_rechitresy/F", bufsize);
 
-  ttree_track_hits_strip_->Branch("strip_rechitresy", &strip_rechitresy, "strip_rechitresy/F" , bufsize);
-  
   ttree_track_hits_strip_->Branch("strip_rechitpullx", &strip_rechitpullx, "strip_rechitpullx/F", bufsize);
   ttree_track_hits_strip_->Branch("strip_rechitpully", &strip_rechitpully, "strip_rechitpully/F", bufsize);
 
   ttree_track_hits_strip_->Branch("strip_is_stereo", &strip_is_stereo, "strip_is_stereo/I", bufsize);
-  ttree_track_hits_strip_->Branch("strip_hit_type" , &strip_hit_type , "strip_hit_type/I" , bufsize);
-  ttree_track_hits_strip_->Branch("detector_type"  , &detector_type  , "detector_type/I"  , bufsize);
-
-  ttree_track_hits_strip_->Branch("strip_trk_pt"   , &strip_trk_pt   , "strip_trk_pt/F"   , bufsize);
-  ttree_track_hits_strip_->Branch("strip_cotalpha" , &strip_cotalpha , "strip_cotalpha/F" , bufsize);
-  ttree_track_hits_strip_->Branch("strip_cotbeta"  , &strip_cotbeta  , "strip_cotbeta/F"  , bufsize);
-  ttree_track_hits_strip_->Branch("strip_locbx"    , &strip_locbx    , "strip_locbx/F"    , bufsize);
-  ttree_track_hits_strip_->Branch("strip_locby"    , &strip_locby    , "strip_locby/F"    , bufsize);
-  ttree_track_hits_strip_->Branch("strip_locbz"    , &strip_locbz    , "strip_locbz/F"    , bufsize);
-  ttree_track_hits_strip_->Branch("strip_charge"   , &strip_charge   , "strip_charge/F"   , bufsize);
-  ttree_track_hits_strip_->Branch("strip_size"     , &strip_size     , "strip_size/I"     , bufsize);
-
-  
-  ttree_track_hits_strip_->Branch("strip_edge"   , &strip_edge   , "strip_edge/I"    , bufsize);
-  ttree_track_hits_strip_->Branch("strip_nsimhit", &strip_nsimhit, "strip_nsimhit/I" , bufsize);
-  ttree_track_hits_strip_->Branch("strip_pidhit" , &strip_pidhit , "strip_pidhit/I"  , bufsize);
-  ttree_track_hits_strip_->Branch("strip_simproc", &strip_simproc, "strip_simproc/I" , bufsize);
-
-
-ttree_track_hits_strip_->Branch("strip_subdet_id"             , &strip_subdet_id             , "strip_subdet_id/I"            , bufsize);
- 
-ttree_track_hits_strip_->Branch("strip_tib_layer"             , &strip_tib_layer             , "strip_tib_layer/I"            , bufsize);
-ttree_track_hits_strip_->Branch("strip_tib_module"            , &strip_tib_module            , "strip_tib_module/I"           , bufsize);
-ttree_track_hits_strip_->Branch("strip_tib_order"             , &strip_tib_order             , "strip_tib_order/I"            , bufsize);
-ttree_track_hits_strip_->Branch("strip_tib_side"              , &strip_tib_side              , "strip_tib_side/I"             , bufsize);
-ttree_track_hits_strip_->Branch("strip_tib_is_double_side"    , &strip_tib_is_double_side    , "strip_tib_is_double_side/I"   , bufsize);
-ttree_track_hits_strip_->Branch("strip_tib_is_z_plus_side"    , &strip_tib_is_z_plus_side    , "strip_tib_is_z_plus_side/I"   , bufsize);
-ttree_track_hits_strip_->Branch("strip_tib_is_z_minus_side"   , &strip_tib_is_z_minus_side   , "strip_tib_is_z_minus_side/I"  , bufsize);
-ttree_track_hits_strip_->Branch("strip_tib_layer_number"      , &strip_tib_layer_number      , "strip_tib_layer_number/I"     , bufsize);
-ttree_track_hits_strip_->Branch("strip_tib_string_number"     , &strip_tib_string_number     , "strip_tib_string_number/I"    , bufsize);
-ttree_track_hits_strip_->Branch("strip_tib_module_number"     , &strip_tib_module_number     ,"strip_tib_module_number/I"     , bufsize);
-ttree_track_hits_strip_->Branch("strip_tib_is_internal_string", &strip_tib_is_internal_string,"strip_tib_is_internal_string/I", bufsize);
-ttree_track_hits_strip_->Branch("strip_tib_is_external_string", &strip_tib_is_external_string,"strip_tib_is_external_string/I", bufsize);
-ttree_track_hits_strip_->Branch("strip_tib_is_rphi"           , &strip_tib_is_rphi           , "strip_tib_is_rphi/I"          , bufsize);
-ttree_track_hits_strip_->Branch("strip_tib_is_stereo"         , &strip_tib_is_stereo         , "strip_tib_is_stereo/I"        , bufsize);
-ttree_track_hits_strip_->Branch("strip_tob_layer"             , &strip_tob_layer             , "strip_tob_layer/I"            , bufsize);
-ttree_track_hits_strip_->Branch("strip_tob_module"            , &strip_tob_module            , "strip_tob_module/I"           , bufsize);
-ttree_track_hits_strip_->Branch("strip_tob_side"              , &strip_tob_side              , "strip_tob_side/I"             , bufsize);
-ttree_track_hits_strip_->Branch("strip_tob_is_double_side"    , &strip_tob_is_double_side    , "strip_tob_is_double_side/I"   , bufsize);
-ttree_track_hits_strip_->Branch("strip_tob_is_z_plus_side"    , &strip_tob_is_z_plus_side    , "strip_tob_is_z_plus_side/I"   , bufsize);
-ttree_track_hits_strip_->Branch("strip_tob_is_z_minus_side"   , &strip_tob_is_z_minus_side   , "strip_tob_is_z_minus_side/I"  , bufsize);
-ttree_track_hits_strip_->Branch("strip_tob_layer_number"      , &strip_tob_layer_number      , "strip_tob_layer_number/I"     , bufsize);
-ttree_track_hits_strip_->Branch("strip_tob_rod_number"        , &strip_tob_rod_number        , "strip_tob_rod_number/I"       , bufsize);
-ttree_track_hits_strip_->Branch("strip_tob_module_number"     , &strip_tob_module_number     , "strip_tob_module_number/I"    , bufsize);
-
-
-ttree_track_hits_strip_->Branch("strip_prob", &strip_prob, "strip_prob/F"   , bufsize);
-ttree_track_hits_strip_->Branch("strip_qbin", &strip_qbin, "strip_qbin/I", bufsize);
-
-ttree_track_hits_strip_->Branch("strip_nprm", &strip_nprm, "strip_nprm/I", bufsize);
-
-ttree_track_hits_strip_->Branch("strip_pidhit1" , &strip_pidhit1 , "strip_pidhit1/I"  , bufsize);
-ttree_track_hits_strip_->Branch("strip_simproc1", &strip_simproc1, "strip_simproc1/I" , bufsize);
-
-ttree_track_hits_strip_->Branch("strip_pidhit2" , &strip_pidhit2 , "strip_pidhit2/I"  , bufsize);
-ttree_track_hits_strip_->Branch("strip_simproc2", &strip_simproc2, "strip_simproc2/I" , bufsize);
-
-ttree_track_hits_strip_->Branch("strip_pidhit3" , &strip_pidhit3 , "strip_pidhit3/I"  , bufsize);
-ttree_track_hits_strip_->Branch("strip_simproc3", &strip_simproc3, "strip_simproc3/I" , bufsize);
-
-ttree_track_hits_strip_->Branch("strip_pidhit4" , &strip_pidhit4 , "strip_pidhit4/I"  , bufsize);
-ttree_track_hits_strip_->Branch("strip_simproc4", &strip_simproc4, "strip_simproc4/I" , bufsize);
-
-ttree_track_hits_strip_->Branch("strip_pidhit5" , &strip_pidhit5 , "strip_pidhit5/I"  , bufsize);
-ttree_track_hits_strip_->Branch("strip_simproc5", &strip_simproc5, "strip_simproc5/I" , bufsize);
-
-ttree_track_hits_strip_->Branch("strip_split", &strip_split, "strip_split/I" , bufsize);
-
-ttree_track_hits_strip_->Branch("strip_clst_err_x", &strip_clst_err_x, "strip_clst_err_x/F"   , bufsize);
-ttree_track_hits_strip_->Branch("strip_clst_err_y", &strip_clst_err_y, "strip_clst_err_y/F"   , bufsize);
-
- if ( include_trk_hits_ )
-   {
-     //tfile_ = new TFile ("SiPixelErrorEstimation_Ntuple.root" , "RECREATE");
-     //const char* tmp_name = outputFile_.c_str();
-     
-     
-     ttree_track_hits_ = new TTree("TrackHitNtuple", "TrackHitNtuple");
-     
-      ttree_track_hits_->Branch("evt", &evt, "evt/I", bufsize);
-      ttree_track_hits_->Branch("run", &run, "run/I", bufsize);
-      
-      ttree_track_hits_->Branch("subdetId", &subdetId, "subdetId/I", bufsize);
-      
-      ttree_track_hits_->Branch("layer" , &layer , "layer/I" , bufsize);
-      ttree_track_hits_->Branch("ladder", &ladder, "ladder/I", bufsize);
-      ttree_track_hits_->Branch("mod"   , &mod   , "mod/I"   , bufsize);
-      
-      ttree_track_hits_->Branch("side"  , &side  , "side/I"  , bufsize);
-      ttree_track_hits_->Branch("disk"  , &disk  , "disk/I"  , bufsize);
-      ttree_track_hits_->Branch("blade" , &blade , "blade/I" , bufsize);
-      ttree_track_hits_->Branch("panel" , &panel , "panel/I" , bufsize);
-      ttree_track_hits_->Branch("plaq"  , &plaq  , "plaq/I"  , bufsize);
-      
-      ttree_track_hits_->Branch("half"   , &half   , "half/I"   , bufsize);
-      ttree_track_hits_->Branch("flipped", &flipped, "flipped/I", bufsize);
-      
-      ttree_track_hits_->Branch("rechitx", &rechitx, "rechitx/F"    , bufsize);
-      ttree_track_hits_->Branch("rechity", &rechity, "rechity/F"    , bufsize);
-      ttree_track_hits_->Branch("rechitz", &rechitz, "rechitz/F"    , bufsize);
-      
-      ttree_track_hits_->Branch("rechiterrx", &rechiterrx, "rechiterrx/F" , bufsize);
-      ttree_track_hits_->Branch("rechiterry", &rechiterry, "rechiterry/F" , bufsize);
-      
-      ttree_track_hits_->Branch("rechitresx", &rechitresx, "rechitresx/F" , bufsize);
-      ttree_track_hits_->Branch("rechitresy", &rechitresy, "rechitresy/F" , bufsize);
-      
-      ttree_track_hits_->Branch("rechitpullx", &rechitpullx, "rechitpullx/F", bufsize);
-      ttree_track_hits_->Branch("rechitpully", &rechitpully, "rechitpully/F", bufsize);
-
-      
-      ttree_track_hits_->Branch("npix"  , &npix  , "npix/I"  , bufsize);
-      ttree_track_hits_->Branch("nxpix" , &nxpix , "nxpix/I" , bufsize);
-      ttree_track_hits_->Branch("nypix" , &nypix , "nypix/I" , bufsize);
-      ttree_track_hits_->Branch("charge", &charge, "charge/F", bufsize);
-      
-      ttree_track_hits_->Branch("edgex", &edgex, "edgex/I", bufsize);
-      ttree_track_hits_->Branch("edgey", &edgey, "edgey/I", bufsize);
-      
-      ttree_track_hits_->Branch("bigx", &bigx, "bigx/I", bufsize);
-      ttree_track_hits_->Branch("bigy", &bigy, "bigy/I", bufsize);
-      
-      ttree_track_hits_->Branch("alpha", &alpha, "alpha/F", bufsize);
-      ttree_track_hits_->Branch("beta" , &beta , "beta/F" , bufsize);
-      
-      ttree_track_hits_->Branch("trk_alpha", &trk_alpha, "trk_alpha/F", bufsize);
-      ttree_track_hits_->Branch("trk_beta" , &trk_beta , "trk_beta/F" , bufsize);
-
-      ttree_track_hits_->Branch("phi", &phi, "phi/F", bufsize);
-      ttree_track_hits_->Branch("eta", &eta, "eta/F", bufsize);
-      
-      ttree_track_hits_->Branch("simhitx", &simhitx, "simhitx/F", bufsize);
-      ttree_track_hits_->Branch("simhity", &simhity, "simhity/F", bufsize);
-      
-      ttree_track_hits_->Branch("nsimhit", &nsimhit, "nsimhit/I", bufsize);
-      ttree_track_hits_->Branch("pidhit" , &pidhit , "pidhit/I" , bufsize);
-      ttree_track_hits_->Branch("simproc", &simproc, "simproc/I", bufsize);
-      
-      ttree_track_hits_->Branch("pixel_split", &pixel_split, "pixel_split/I", bufsize);
-
-      ttree_track_hits_->Branch("pixel_clst_err_x", &pixel_clst_err_x, "pixel_clst_err_x/F"   , bufsize);
-      ttree_track_hits_->Branch("pixel_clst_err_y", &pixel_clst_err_y, "pixel_clst_err_y/F"   , bufsize);
-
-    } // if ( include_trk_hits_ )
+  ttree_track_hits_strip_->Branch("strip_hit_type", &strip_hit_type, "strip_hit_type/I", bufsize);
+  ttree_track_hits_strip_->Branch("detector_type", &detector_type, "detector_type/I", bufsize);
+
+  ttree_track_hits_strip_->Branch("strip_trk_pt", &strip_trk_pt, "strip_trk_pt/F", bufsize);
+  ttree_track_hits_strip_->Branch("strip_cotalpha", &strip_cotalpha, "strip_cotalpha/F", bufsize);
+  ttree_track_hits_strip_->Branch("strip_cotbeta", &strip_cotbeta, "strip_cotbeta/F", bufsize);
+  ttree_track_hits_strip_->Branch("strip_locbx", &strip_locbx, "strip_locbx/F", bufsize);
+  ttree_track_hits_strip_->Branch("strip_locby", &strip_locby, "strip_locby/F", bufsize);
+  ttree_track_hits_strip_->Branch("strip_locbz", &strip_locbz, "strip_locbz/F", bufsize);
+  ttree_track_hits_strip_->Branch("strip_charge", &strip_charge, "strip_charge/F", bufsize);
+  ttree_track_hits_strip_->Branch("strip_size", &strip_size, "strip_size/I", bufsize);
+
+  ttree_track_hits_strip_->Branch("strip_edge", &strip_edge, "strip_edge/I", bufsize);
+  ttree_track_hits_strip_->Branch("strip_nsimhit", &strip_nsimhit, "strip_nsimhit/I", bufsize);
+  ttree_track_hits_strip_->Branch("strip_pidhit", &strip_pidhit, "strip_pidhit/I", bufsize);
+  ttree_track_hits_strip_->Branch("strip_simproc", &strip_simproc, "strip_simproc/I", bufsize);
+
+  ttree_track_hits_strip_->Branch("strip_subdet_id", &strip_subdet_id, "strip_subdet_id/I", bufsize);
+
+  ttree_track_hits_strip_->Branch("strip_tib_layer", &strip_tib_layer, "strip_tib_layer/I", bufsize);
+  ttree_track_hits_strip_->Branch("strip_tib_module", &strip_tib_module, "strip_tib_module/I", bufsize);
+  ttree_track_hits_strip_->Branch("strip_tib_order", &strip_tib_order, "strip_tib_order/I", bufsize);
+  ttree_track_hits_strip_->Branch("strip_tib_side", &strip_tib_side, "strip_tib_side/I", bufsize);
+  ttree_track_hits_strip_->Branch(
+      "strip_tib_is_double_side", &strip_tib_is_double_side, "strip_tib_is_double_side/I", bufsize);
+  ttree_track_hits_strip_->Branch(
+      "strip_tib_is_z_plus_side", &strip_tib_is_z_plus_side, "strip_tib_is_z_plus_side/I", bufsize);
+  ttree_track_hits_strip_->Branch(
+      "strip_tib_is_z_minus_side", &strip_tib_is_z_minus_side, "strip_tib_is_z_minus_side/I", bufsize);
+  ttree_track_hits_strip_->Branch(
+      "strip_tib_layer_number", &strip_tib_layer_number, "strip_tib_layer_number/I", bufsize);
+  ttree_track_hits_strip_->Branch(
+      "strip_tib_string_number", &strip_tib_string_number, "strip_tib_string_number/I", bufsize);
+  ttree_track_hits_strip_->Branch(
+      "strip_tib_module_number", &strip_tib_module_number, "strip_tib_module_number/I", bufsize);
+  ttree_track_hits_strip_->Branch(
+      "strip_tib_is_internal_string", &strip_tib_is_internal_string, "strip_tib_is_internal_string/I", bufsize);
+  ttree_track_hits_strip_->Branch(
+      "strip_tib_is_external_string", &strip_tib_is_external_string, "strip_tib_is_external_string/I", bufsize);
+  ttree_track_hits_strip_->Branch("strip_tib_is_rphi", &strip_tib_is_rphi, "strip_tib_is_rphi/I", bufsize);
+  ttree_track_hits_strip_->Branch("strip_tib_is_stereo", &strip_tib_is_stereo, "strip_tib_is_stereo/I", bufsize);
+  ttree_track_hits_strip_->Branch("strip_tob_layer", &strip_tob_layer, "strip_tob_layer/I", bufsize);
+  ttree_track_hits_strip_->Branch("strip_tob_module", &strip_tob_module, "strip_tob_module/I", bufsize);
+  ttree_track_hits_strip_->Branch("strip_tob_side", &strip_tob_side, "strip_tob_side/I", bufsize);
+  ttree_track_hits_strip_->Branch(
+      "strip_tob_is_double_side", &strip_tob_is_double_side, "strip_tob_is_double_side/I", bufsize);
+  ttree_track_hits_strip_->Branch(
+      "strip_tob_is_z_plus_side", &strip_tob_is_z_plus_side, "strip_tob_is_z_plus_side/I", bufsize);
+  ttree_track_hits_strip_->Branch(
+      "strip_tob_is_z_minus_side", &strip_tob_is_z_minus_side, "strip_tob_is_z_minus_side/I", bufsize);
+  ttree_track_hits_strip_->Branch(
+      "strip_tob_layer_number", &strip_tob_layer_number, "strip_tob_layer_number/I", bufsize);
+  ttree_track_hits_strip_->Branch("strip_tob_rod_number", &strip_tob_rod_number, "strip_tob_rod_number/I", bufsize);
+  ttree_track_hits_strip_->Branch(
+      "strip_tob_module_number", &strip_tob_module_number, "strip_tob_module_number/I", bufsize);
+
+  ttree_track_hits_strip_->Branch("strip_prob", &strip_prob, "strip_prob/F", bufsize);
+  ttree_track_hits_strip_->Branch("strip_qbin", &strip_qbin, "strip_qbin/I", bufsize);
+
+  ttree_track_hits_strip_->Branch("strip_nprm", &strip_nprm, "strip_nprm/I", bufsize);
+
+  ttree_track_hits_strip_->Branch("strip_pidhit1", &strip_pidhit1, "strip_pidhit1/I", bufsize);
+  ttree_track_hits_strip_->Branch("strip_simproc1", &strip_simproc1, "strip_simproc1/I", bufsize);
+
+  ttree_track_hits_strip_->Branch("strip_pidhit2", &strip_pidhit2, "strip_pidhit2/I", bufsize);
+  ttree_track_hits_strip_->Branch("strip_simproc2", &strip_simproc2, "strip_simproc2/I", bufsize);
+
+  ttree_track_hits_strip_->Branch("strip_pidhit3", &strip_pidhit3, "strip_pidhit3/I", bufsize);
+  ttree_track_hits_strip_->Branch("strip_simproc3", &strip_simproc3, "strip_simproc3/I", bufsize);
+
+  ttree_track_hits_strip_->Branch("strip_pidhit4", &strip_pidhit4, "strip_pidhit4/I", bufsize);
+  ttree_track_hits_strip_->Branch("strip_simproc4", &strip_simproc4, "strip_simproc4/I", bufsize);
+
+  ttree_track_hits_strip_->Branch("strip_pidhit5", &strip_pidhit5, "strip_pidhit5/I", bufsize);
+  ttree_track_hits_strip_->Branch("strip_simproc5", &strip_simproc5, "strip_simproc5/I", bufsize);
+
+  ttree_track_hits_strip_->Branch("strip_split", &strip_split, "strip_split/I", bufsize);
+
+  ttree_track_hits_strip_->Branch("strip_clst_err_x", &strip_clst_err_x, "strip_clst_err_x/F", bufsize);
+  ttree_track_hits_strip_->Branch("strip_clst_err_y", &strip_clst_err_y, "strip_clst_err_y/F", bufsize);
+
+  if (include_trk_hits_) {
+    //tfile_ = new TFile ("SiPixelErrorEstimation_Ntuple.root" , "RECREATE");
+    //const char* tmp_name = outputFile_.c_str();
+
+    ttree_track_hits_ = new TTree("TrackHitNtuple", "TrackHitNtuple");
+
+    ttree_track_hits_->Branch("evt", &evt, "evt/I", bufsize);
+    ttree_track_hits_->Branch("run", &run, "run/I", bufsize);
+
+    ttree_track_hits_->Branch("subdetId", &subdetId, "subdetId/I", bufsize);
+
+    ttree_track_hits_->Branch("layer", &layer, "layer/I", bufsize);
+    ttree_track_hits_->Branch("ladder", &ladder, "ladder/I", bufsize);
+    ttree_track_hits_->Branch("mod", &mod, "mod/I", bufsize);
+
+    ttree_track_hits_->Branch("side", &side, "side/I", bufsize);
+    ttree_track_hits_->Branch("disk", &disk, "disk/I", bufsize);
+    ttree_track_hits_->Branch("blade", &blade, "blade/I", bufsize);
+    ttree_track_hits_->Branch("panel", &panel, "panel/I", bufsize);
+    ttree_track_hits_->Branch("plaq", &plaq, "plaq/I", bufsize);
+
+    ttree_track_hits_->Branch("half", &half, "half/I", bufsize);
+    ttree_track_hits_->Branch("flipped", &flipped, "flipped/I", bufsize);
+
+    ttree_track_hits_->Branch("rechitx", &rechitx, "rechitx/F", bufsize);
+    ttree_track_hits_->Branch("rechity", &rechity, "rechity/F", bufsize);
+    ttree_track_hits_->Branch("rechitz", &rechitz, "rechitz/F", bufsize);
+
+    ttree_track_hits_->Branch("rechiterrx", &rechiterrx, "rechiterrx/F", bufsize);
+    ttree_track_hits_->Branch("rechiterry", &rechiterry, "rechiterry/F", bufsize);
+
+    ttree_track_hits_->Branch("rechitresx", &rechitresx, "rechitresx/F", bufsize);
+    ttree_track_hits_->Branch("rechitresy", &rechitresy, "rechitresy/F", bufsize);
+
+    ttree_track_hits_->Branch("rechitpullx", &rechitpullx, "rechitpullx/F", bufsize);
+    ttree_track_hits_->Branch("rechitpully", &rechitpully, "rechitpully/F", bufsize);
+
+    ttree_track_hits_->Branch("npix", &npix, "npix/I", bufsize);
+    ttree_track_hits_->Branch("nxpix", &nxpix, "nxpix/I", bufsize);
+    ttree_track_hits_->Branch("nypix", &nypix, "nypix/I", bufsize);
+    ttree_track_hits_->Branch("charge", &charge, "charge/F", bufsize);
+
+    ttree_track_hits_->Branch("edgex", &edgex, "edgex/I", bufsize);
+    ttree_track_hits_->Branch("edgey", &edgey, "edgey/I", bufsize);
+
+    ttree_track_hits_->Branch("bigx", &bigx, "bigx/I", bufsize);
+    ttree_track_hits_->Branch("bigy", &bigy, "bigy/I", bufsize);
+
+    ttree_track_hits_->Branch("alpha", &alpha, "alpha/F", bufsize);
+    ttree_track_hits_->Branch("beta", &beta, "beta/F", bufsize);
+
+    ttree_track_hits_->Branch("trk_alpha", &trk_alpha, "trk_alpha/F", bufsize);
+    ttree_track_hits_->Branch("trk_beta", &trk_beta, "trk_beta/F", bufsize);
+
+    ttree_track_hits_->Branch("phi", &phi, "phi/F", bufsize);
+    ttree_track_hits_->Branch("eta", &eta, "eta/F", bufsize);
+
+    ttree_track_hits_->Branch("simhitx", &simhitx, "simhitx/F", bufsize);
+    ttree_track_hits_->Branch("simhity", &simhity, "simhity/F", bufsize);
+
+    ttree_track_hits_->Branch("nsimhit", &nsimhit, "nsimhit/I", bufsize);
+    ttree_track_hits_->Branch("pidhit", &pidhit, "pidhit/I", bufsize);
+    ttree_track_hits_->Branch("simproc", &simproc, "simproc/I", bufsize);
+
+    ttree_track_hits_->Branch("pixel_split", &pixel_split, "pixel_split/I", bufsize);
+
+    ttree_track_hits_->Branch("pixel_clst_err_x", &pixel_clst_err_x, "pixel_clst_err_x/F", bufsize);
+    ttree_track_hits_->Branch("pixel_clst_err_y", &pixel_clst_err_y, "pixel_clst_err_y/F", bufsize);
+
+  }  // if ( include_trk_hits_ )
 
   // ----------------------------------------------------------------------
-  
+
   ttree_all_hits_ = new TTree("AllHitNtuple", "AllHitNtuple");
 
   ttree_all_hits_->Branch("evt", &evt, "evt/I", bufsize);
   ttree_all_hits_->Branch("run", &run, "run/I", bufsize);
 
   ttree_all_hits_->Branch("subdetid", &all_subdetid, "subdetid/I", bufsize);
-  
-  ttree_all_hits_->Branch("layer" , &all_layer , "layer/I" , bufsize);
+
+  ttree_all_hits_->Branch("layer", &all_layer, "layer/I", bufsize);
   ttree_all_hits_->Branch("ladder", &all_ladder, "ladder/I", bufsize);
-  ttree_all_hits_->Branch("mod"   , &all_mod   , "mod/I"   , bufsize);
-  
-  ttree_all_hits_->Branch("side"  , &all_side  , "side/I"  , bufsize);
-  ttree_all_hits_->Branch("disk"  , &all_disk  , "disk/I"  , bufsize);
-  ttree_all_hits_->Branch("blade" , &all_blade , "blade/I" , bufsize);
-  ttree_all_hits_->Branch("panel" , &all_panel , "panel/I" , bufsize);
-  ttree_all_hits_->Branch("plaq"  , &all_plaq  , "plaq/I"  , bufsize);
-
-  ttree_all_hits_->Branch("half"   , &all_half   , "half/I"   , bufsize);
+  ttree_all_hits_->Branch("mod", &all_mod, "mod/I", bufsize);
+
+  ttree_all_hits_->Branch("side", &all_side, "side/I", bufsize);
+  ttree_all_hits_->Branch("disk", &all_disk, "disk/I", bufsize);
+  ttree_all_hits_->Branch("blade", &all_blade, "blade/I", bufsize);
+  ttree_all_hits_->Branch("panel", &all_panel, "panel/I", bufsize);
+  ttree_all_hits_->Branch("plaq", &all_plaq, "plaq/I", bufsize);
+
+  ttree_all_hits_->Branch("half", &all_half, "half/I", bufsize);
   ttree_all_hits_->Branch("flipped", &all_flipped, "flipped/I", bufsize);
 
   ttree_all_hits_->Branch("cols", &all_cols, "cols/I", bufsize);
   ttree_all_hits_->Branch("rows", &all_rows, "rows/I", bufsize);
 
-  ttree_all_hits_->Branch("rechitx"    , &all_rechitx    , "rechitx/F"    , bufsize);
-  ttree_all_hits_->Branch("rechity"    , &all_rechity    , "rechity/F"    , bufsize);
-  ttree_all_hits_->Branch("rechitz"    , &all_rechitz    , "rechitz/F"    , bufsize);
- 
-  ttree_all_hits_->Branch("rechiterrx" , &all_rechiterrx , "rechiterrx/F" , bufsize);
-  ttree_all_hits_->Branch("rechiterry" , &all_rechiterry , "rechiterry/F" , bufsize);
-  
-  ttree_all_hits_->Branch("rechitresx" , &all_rechitresx , "rechitresx/F" , bufsize);
-  ttree_all_hits_->Branch("rechitresy" , &all_rechitresy , "rechitresy/F" , bufsize);
-  
+  ttree_all_hits_->Branch("rechitx", &all_rechitx, "rechitx/F", bufsize);
+  ttree_all_hits_->Branch("rechity", &all_rechity, "rechity/F", bufsize);
+  ttree_all_hits_->Branch("rechitz", &all_rechitz, "rechitz/F", bufsize);
+
+  ttree_all_hits_->Branch("rechiterrx", &all_rechiterrx, "rechiterrx/F", bufsize);
+  ttree_all_hits_->Branch("rechiterry", &all_rechiterry, "rechiterry/F", bufsize);
+
+  ttree_all_hits_->Branch("rechitresx", &all_rechitresx, "rechitresx/F", bufsize);
+  ttree_all_hits_->Branch("rechitresy", &all_rechitresy, "rechitresy/F", bufsize);
+
   ttree_all_hits_->Branch("rechitpullx", &all_rechitpullx, "rechitpullx/F", bufsize);
   ttree_all_hits_->Branch("rechitpully", &all_rechitpully, "rechitpully/F", bufsize);
 
-  ttree_all_hits_->Branch("npix"  , &all_npix  , "npix/I"  , bufsize);
-  ttree_all_hits_->Branch("nxpix" , &all_nxpix , "nxpix/I" , bufsize);
-  ttree_all_hits_->Branch("nypix" , &all_nypix , "nypix/I" , bufsize);
+  ttree_all_hits_->Branch("npix", &all_npix, "npix/I", bufsize);
+  ttree_all_hits_->Branch("nxpix", &all_nxpix, "nxpix/I", bufsize);
+  ttree_all_hits_->Branch("nypix", &all_nypix, "nypix/I", bufsize);
 
   ttree_all_hits_->Branch("edgex", &all_edgex, "edgex/I", bufsize);
   ttree_all_hits_->Branch("edgey", &all_edgey, "edgey/I", bufsize);
- 
+
   ttree_all_hits_->Branch("bigx", &all_bigx, "bigx/I", bufsize);
   ttree_all_hits_->Branch("bigy", &all_bigy, "bigy/I", bufsize);
-  
+
   ttree_all_hits_->Branch("alpha", &all_alpha, "alpha/F", bufsize);
-  ttree_all_hits_->Branch("beta" , &all_beta , "beta/F" , bufsize);
+  ttree_all_hits_->Branch("beta", &all_beta, "beta/F", bufsize);
 
   ttree_all_hits_->Branch("simhitx", &all_simhitx, "simhitx/F", bufsize);
   ttree_all_hits_->Branch("simhity", &all_simhity, "simhity/F", bufsize);
 
   ttree_all_hits_->Branch("nsimhit", &all_nsimhit, "nsimhit/I", bufsize);
-  ttree_all_hits_->Branch("pidhit" , &all_pidhit , "pidhit/I" , bufsize);
+  ttree_all_hits_->Branch("pidhit", &all_pidhit, "pidhit/I", bufsize);
   ttree_all_hits_->Branch("simproc", &all_simproc, "simproc/I", bufsize);
 
   ttree_all_hits_->Branch("vtxr", &all_vtxr, "vtxr/F", bufsize);
@@ -296,12 +299,12 @@ ttree_track_hits_strip_->Branch("strip_clst_err_y", &strip_clst_err_y, "strip_cl
   ttree_all_hits_->Branch("simpz", &all_simpz, "simpz/F", bufsize);
 
   ttree_all_hits_->Branch("eloss", &all_eloss, "eloss/F", bufsize);
-  
+
   ttree_all_hits_->Branch("simphi", &all_simphi, "simphi/F", bufsize);
   ttree_all_hits_->Branch("simtheta", &all_simtheta, "simtheta/F", bufsize);
-  
+
   ttree_all_hits_->Branch("trkid", &all_trkid, "trkid/I", bufsize);
-  
+
   ttree_all_hits_->Branch("x1", &all_x1, "x1/F", bufsize);
   ttree_all_hits_->Branch("x2", &all_x2, "x2/F", bufsize);
   ttree_all_hits_->Branch("y1", &all_x1, "y1/F", bufsize);
@@ -320,13 +323,13 @@ ttree_track_hits_strip_->Branch("strip_clst_err_y", &strip_clst_err_y, "strip_cl
   ttree_all_hits_->Branch("gy2", &all_gx2, "gy2/F", bufsize);
   ttree_all_hits_->Branch("gz1", &all_gx1, "gz1/F", bufsize);
   ttree_all_hits_->Branch("gz2", &all_gx2, "gz2/F", bufsize);
-  
+
   ttree_all_hits_->Branch("simtrketa", &all_simtrketa, "simtrketa/F", bufsize);
   ttree_all_hits_->Branch("simtrkphi", &all_simtrkphi, "simtrkphi/F", bufsize);
 
   ttree_all_hits_->Branch("clust_row", &all_clust_row, "clust_row/F", bufsize);
   ttree_all_hits_->Branch("clust_col", &all_clust_col, "clust_col/F", bufsize);
-  
+
   ttree_all_hits_->Branch("clust_x", &all_clust_x, "clust_x/F", bufsize);
   ttree_all_hits_->Branch("clust_y", &all_clust_y, "clust_y/F", bufsize);
 
@@ -336,11 +339,11 @@ ttree_track_hits_strip_->Branch("strip_clst_err_y", &strip_clst_err_y, "strip_cl
   ttree_all_hits_->Branch("clust_maxpixrow", &all_clust_maxpixrow, "clust_maxpixrow/I", bufsize);
   ttree_all_hits_->Branch("clust_minpixcol", &all_clust_minpixcol, "clust_minpixcol/I", bufsize);
   ttree_all_hits_->Branch("clust_minpixrow", &all_clust_minpixrow, "clust_minpixrow/I", bufsize);
-  
+
   ttree_all_hits_->Branch("clust_geoid", &all_clust_geoid, "clust_geoid/I", bufsize);
-  
+
   ttree_all_hits_->Branch("clust_alpha", &all_clust_alpha, "clust_alpha/F", bufsize);
-  ttree_all_hits_->Branch("clust_beta" , &all_clust_beta , "clust_beta/F" , bufsize);
+  ttree_all_hits_->Branch("clust_beta", &all_clust_beta, "clust_beta/F", bufsize);
 
   ttree_all_hits_->Branch("rowpix", all_pixrow, "row[npix]/F", bufsize);
   ttree_all_hits_->Branch("colpix", all_pixcol, "col[npix]/F", bufsize);
@@ -350,42 +353,38 @@ ttree_track_hits_strip_->Branch("strip_clst_err_y", &strip_clst_err_y, "strip_cl
   ttree_all_hits_->Branch("gxpix", all_pixgx, "gx[npix]/F", bufsize);
   ttree_all_hits_->Branch("gypix", all_pixgy, "gy[npix]/F", bufsize);
   ttree_all_hits_->Branch("gzpix", all_pixgz, "gz[npix]/F", bufsize);
-  
-  ttree_all_hits_->Branch("hit_probx", &all_hit_probx, "hit_probx/F" , bufsize);
-  ttree_all_hits_->Branch("hit_proby", &all_hit_proby, "hit_proby/F" , bufsize);
 
-  ttree_all_hits_->Branch("all_pixel_split", &all_pixel_split, "all_pixel_split/I" , bufsize);
+  ttree_all_hits_->Branch("hit_probx", &all_hit_probx, "hit_probx/F", bufsize);
+  ttree_all_hits_->Branch("hit_proby", &all_hit_proby, "hit_proby/F", bufsize);
 
-  ttree_all_hits_->Branch("all_pixel_clst_err_x", &all_pixel_clst_err_x, "all_pixel_clst_err_x/F"   , bufsize);
-  ttree_all_hits_->Branch("all_pixel_clst_err_y", &all_pixel_clst_err_y, "all_pixel_clst_err_y/F"   , bufsize);
+  ttree_all_hits_->Branch("all_pixel_split", &all_pixel_split, "all_pixel_split/I", bufsize);
 
+  ttree_all_hits_->Branch("all_pixel_clst_err_x", &all_pixel_clst_err_x, "all_pixel_clst_err_x/F", bufsize);
+  ttree_all_hits_->Branch("all_pixel_clst_err_y", &all_pixel_clst_err_y, "all_pixel_clst_err_y/F", bufsize);
 }
 
-void SiPixelErrorEstimation::endJob() 
-{
+void SiPixelErrorEstimation::endJob() {
   tfile_->Write();
   tfile_->Close();
 }
 
-void
-SiPixelErrorEstimation::analyze(const edm::Event& e, const edm::EventSetup& es)
-{
+void SiPixelErrorEstimation::analyze(const edm::Event& e, const edm::EventSetup& es) {
   //Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   es.get<TrackerTopologyRcd>().get(tTopoHandle);
   const TrackerTopology* const tTopo = tTopoHandle.product();
 
   using namespace edm;
-  
+
   run = e.id().run();
   evt = e.id().event();
-  
-  if ( evt%1000 == 0 ) 
+
+  if (evt % 1000 == 0)
     cout << "evt = " << evt << endl;
 
   float math_pi = 3.14159265;
   float radtodeg = 180.0 / math_pi;
-    
+
   LocalPoint position;
   LocalError error;
   float mindist = 999999.9;
@@ -394,409 +393,354 @@ SiPixelErrorEstimation::analyze(const edm::Event& e, const edm::EventSetup& es)
   TrackerHitAssociator associate(e, trackerHitAssociatorConfig_);
 
   edm::ESHandle<TrackerGeometry> pDD;
-  es.get<TrackerDigiGeometryRecord> ().get (pDD);
-  const TrackerGeometry* tracker = &(* pDD);
-  
+  es.get<TrackerDigiGeometryRecord>().get(pDD);
+  const TrackerGeometry* tracker = &(*pDD);
 
   //cout << "...1..." << endl;
 
-
   edm::ESHandle<MagneticField> magneticField;
-  es.get<IdealMagneticFieldRecord>().get( magneticField );
+  es.get<IdealMagneticFieldRecord>().get(magneticField);
   //const MagneticField* magField_ = magFieldHandle.product();
 
   edm::FileInPath FileInPath_;
-    
-
 
   // Strip hits ==============================================================================================================
 
+  edm::Handle<vector<Trajectory>> trajCollectionHandle;
 
-  edm::Handle<vector<Trajectory> > trajCollectionHandle;
-  
-  e.getByToken( tTrajectory, trajCollectionHandle);
+  e.getByToken(tTrajectory, trajCollectionHandle);
   //e.getByLabel( "generalTracks", trajCollectionHandle);
 
-  for ( vector<Trajectory>::const_iterator it = trajCollectionHandle->begin(); it!=trajCollectionHandle->end(); ++it )
-    {
-      
-      vector<TrajectoryMeasurement> tmColl = it->measurements();
-      for ( vector<TrajectoryMeasurement>::const_iterator itTraj = tmColl.begin(); itTraj!=tmColl.end(); ++itTraj )
-	{
-	  
-	  if ( !itTraj->updatedState().isValid() ) 
-	    continue;
-       
-	  strip_rechitx     = -9999999.9;
-	  strip_rechity     = -9999999.9;
-	  strip_rechitz     = -9999999.9;
-	  strip_rechiterrx  = -9999999.9;
-	  strip_rechiterry  = -9999999.9;
-	  strip_rechitresx  = -9999999.9;
-	  strip_rechitresx2  = -9999999.9;
-	  
-
-	  strip_rechitresy  = -9999999.9;
-	  strip_rechitpullx = -9999999.9;
-	  strip_rechitpully = -9999999.9;
-	  strip_is_stereo   = -9999999  ;
-	  strip_hit_type    = -9999999  ;
-	  detector_type     = -9999999  ;
-	  
-	  strip_trk_pt    = -9999999.9;
-	  strip_cotalpha  = -9999999.9;
-	  strip_cotbeta   = -9999999.9;
-	  strip_locbx     = -9999999.9;
-	  strip_locby     = -9999999.9;
-	  strip_locbz     = -9999999.9;
-	  strip_charge    = -9999999.9;
-	  strip_size        = -9999999  ;
-
-	  strip_edge        = -9999999  ;
-	  strip_nsimhit     = -9999999  ;
-	  strip_pidhit      = -9999999  ;
-	  strip_simproc     = -9999999  ;
-
-
-	  strip_subdet_id = -9999999;
- 
-	  strip_tib_layer             = -9999999;
-	  strip_tib_module            = -9999999;
-	  strip_tib_order             = -9999999;
-	  strip_tib_side              = -9999999;
-	  strip_tib_is_double_side    = -9999999;
-	  strip_tib_is_z_plus_side    = -9999999;
-	  strip_tib_is_z_minus_side   = -9999999;
-	  strip_tib_layer_number      = -9999999;
-	  strip_tib_string_number     = -9999999;
-	  strip_tib_module_number     = -9999999;
-	  strip_tib_is_internal_string= -9999999;
-	  strip_tib_is_external_string= -9999999;
-	  strip_tib_is_rphi           = -9999999;
-	  strip_tib_is_stereo         = -9999999;          
-	  
-	  strip_tob_layer             = -9999999;
-	  strip_tob_module            = -9999999;
-	  strip_tob_side              = -9999999;
-	  strip_tob_is_double_side    = -9999999;
-	  strip_tob_is_z_plus_side    = -9999999;
-	  strip_tob_is_z_minus_side   = -9999999;
-	  strip_tob_layer_number      = -9999999;
-	  strip_tob_rod_number        = -9999999;
-	  strip_tob_module_number     = -9999999;
-	  	  
-	  strip_tob_is_rphi           = -9999999;
-	  strip_tob_is_stereo         = -9999999;     
-
-	  strip_prob                  = -9999999.9;
-	  strip_qbin                  = -9999999;
-
-	  strip_nprm                  = -9999999;
-	  
-	  strip_pidhit1      = -9999999  ;
-	  strip_simproc1     = -9999999  ;
-	  
-	  strip_pidhit2      = -9999999  ;
-	  strip_simproc2     = -9999999  ;
-	  
-	  strip_pidhit3      = -9999999  ;
-	  strip_simproc3     = -9999999  ;
-	  
-	  strip_pidhit4      = -9999999  ;
-	  strip_simproc4     = -9999999  ;
-
-	  strip_pidhit5      = -9999999  ;
-	  strip_simproc5     = -9999999  ;
-
-	  strip_split        = -9999999;   
-	  strip_clst_err_x   = -9999999.9;
-	  strip_clst_err_y   = -9999999.9;
-
-	  const TransientTrackingRecHit::ConstRecHitPointer trans_trk_rec_hit_point = itTraj->recHit();
-	 
-	  if ( trans_trk_rec_hit_point == nullptr )
-	    continue;
-
-	  const TrackingRecHit *trk_rec_hit = (*trans_trk_rec_hit_point).hit();
-
-	  if ( trk_rec_hit == nullptr )
-	    continue;
-
-	  DetId detid = (trk_rec_hit)->geographicalId();
-
-	  strip_subdet_id = (int)detid.subdetId();
-	  
-	  if ( (int)detid.subdetId() != (int)(StripSubdetector::TIB) && (int)detid.subdetId() != (int)(StripSubdetector::TOB) )
-	    continue;
-
-	  const SiStripMatchedRecHit2D* matchedhit = dynamic_cast<const SiStripMatchedRecHit2D*>( (*trans_trk_rec_hit_point).hit() );
-	  const SiStripRecHit2D       * hit2d      = dynamic_cast<const SiStripRecHit2D       *>( (*trans_trk_rec_hit_point).hit() );
-	  const SiStripRecHit1D       * hit1d      = dynamic_cast<const SiStripRecHit1D       *>( (*trans_trk_rec_hit_point).hit() );
-	  
-	  if ( !matchedhit && !hit2d && !hit1d )
-	    continue;
-	  
-	  position = (trk_rec_hit)->localPosition(); 
-	  error = (trk_rec_hit)->localPositionError();
-	  
-	  strip_rechitx = position.x();
-	  strip_rechity = position.y();
-	  strip_rechitz = position.z();
-	  strip_rechiterrx = sqrt( error.xx() );
-	  strip_rechiterry = sqrt( error.yy() );
-	  
-	  
-	  //cout << "strip_rechitx = " << strip_rechitx << endl;	      
-	  //cout << "strip_rechity = " << strip_rechity << endl;
-	  //cout << "strip_rechitz = " << strip_rechitz << endl;
-	  
-	  //cout << "strip_rechiterrx = " << strip_rechiterrx << endl;
-	  //cout << "strip_rechiterry = " << strip_rechiterry << endl;
-	  
-	  TrajectoryStateOnSurface tsos = itTraj->updatedState(); 
-	  
-	  strip_trk_pt = tsos.globalMomentum().perp();
-	  
-	  LocalTrajectoryParameters ltp = tsos.localParameters();
-	  
-	  LocalVector localDir = ltp.momentum()/ltp.momentum().mag();
-	  
-	  float locx = localDir.x();
-	  float locy = localDir.y();
-	  float locz = localDir.z();
-	  
-	  //alpha_ = atan2( locz, locx );
-	  //beta_  = atan2( locz, locy );
-	  
-	  strip_cotalpha = locx/locz;
-	  strip_cotbeta  = locy/locz;
-	      
-
-	  StripSubdetector StripSubdet = (StripSubdetector)detid;
-
-	  if ( StripSubdet.stereo() == 0 )
-	    strip_is_stereo = 0;
-	  else
-	    strip_is_stereo = 1;
-
-
-	  SiStripDetId si_strip_det_id = SiStripDetId( detid );
-	  
-	  //const StripGeomDetUnit* strip_geom_det_unit = dynamic_cast<const StripGeomDetUnit*> ( tracker->idToDet( detid ) );
-	  const StripGeomDetUnit* strip_geom_det_unit = (const StripGeomDetUnit*)tracker->idToDetUnit( detid );
-	  
-	  if ( strip_geom_det_unit != nullptr )
-	    {
-	      LocalVector lbfield 
-		= (strip_geom_det_unit->surface()).toLocal( (*magneticField).inTesla( strip_geom_det_unit->surface().position() ) ); 
-	      
-	      strip_locbx = lbfield.x();
-	      strip_locby = lbfield.y();
-	      strip_locbz = lbfield.z();
-	    }
-	  
+  for (vector<Trajectory>::const_iterator it = trajCollectionHandle->begin(); it != trajCollectionHandle->end(); ++it) {
+    vector<TrajectoryMeasurement> tmColl = it->measurements();
+    for (vector<TrajectoryMeasurement>::const_iterator itTraj = tmColl.begin(); itTraj != tmColl.end(); ++itTraj) {
+      if (!itTraj->updatedState().isValid())
+        continue;
+
+      strip_rechitx = -9999999.9;
+      strip_rechity = -9999999.9;
+      strip_rechitz = -9999999.9;
+      strip_rechiterrx = -9999999.9;
+      strip_rechiterry = -9999999.9;
+      strip_rechitresx = -9999999.9;
+      strip_rechitresx2 = -9999999.9;
+
+      strip_rechitresy = -9999999.9;
+      strip_rechitpullx = -9999999.9;
+      strip_rechitpully = -9999999.9;
+      strip_is_stereo = -9999999;
+      strip_hit_type = -9999999;
+      detector_type = -9999999;
+
+      strip_trk_pt = -9999999.9;
+      strip_cotalpha = -9999999.9;
+      strip_cotbeta = -9999999.9;
+      strip_locbx = -9999999.9;
+      strip_locby = -9999999.9;
+      strip_locbz = -9999999.9;
+      strip_charge = -9999999.9;
+      strip_size = -9999999;
+
+      strip_edge = -9999999;
+      strip_nsimhit = -9999999;
+      strip_pidhit = -9999999;
+      strip_simproc = -9999999;
+
+      strip_subdet_id = -9999999;
 
-	  //enum ModuleGeometry {UNKNOWNGEOMETRY, IB1, IB2, OB1, OB2, W1A, W2A, W3A, W1B, W2B, W3B, W4, W5, W6, W7};
-	  
-	  if ( si_strip_det_id.moduleGeometry() == 1 )
-	    {
-	      detector_type = 1;
-	      //cout << "si_strip_det_id.moduleGeometry() = IB1" << endl;
-	      //cout << "si_strip_det_id.moduleGeometry() = " << si_strip_det_id.moduleGeometry() << endl;
-	    }
-	  else if ( si_strip_det_id.moduleGeometry() == 2 )
-	    {
-	      detector_type = 2;
-	      //cout << "si_strip_det_id.moduleGeometry() = IB2" << endl;
-	      //cout << "si_strip_det_id.moduleGeometry() = " << si_strip_det_id.moduleGeometry() << endl;
-	    }
-	  else if ( si_strip_det_id.moduleGeometry() == 3 )
-	    {
-	      detector_type = 3;
-	      //cout << "si_strip_det_id.moduleGeometry() = OB1" << endl;
-	      //cout << "si_strip_det_id.moduleGeometry() = " << si_strip_det_id.moduleGeometry() << endl;
-	    }
-	  else if ( si_strip_det_id.moduleGeometry() == 4 )
-	    {
-	      detector_type = 4;
-	      //cout << "si_strip_det_id.moduleGeometry() = OB2" << endl;
-	      //cout << "si_strip_det_id.moduleGeometry() = " << si_strip_det_id.moduleGeometry() << endl;
-	    }
-	  
+      strip_tib_layer = -9999999;
+      strip_tib_module = -9999999;
+      strip_tib_order = -9999999;
+      strip_tib_side = -9999999;
+      strip_tib_is_double_side = -9999999;
+      strip_tib_is_z_plus_side = -9999999;
+      strip_tib_is_z_minus_side = -9999999;
+      strip_tib_layer_number = -9999999;
+      strip_tib_string_number = -9999999;
+      strip_tib_module_number = -9999999;
+      strip_tib_is_internal_string = -9999999;
+      strip_tib_is_external_string = -9999999;
+      strip_tib_is_rphi = -9999999;
+      strip_tib_is_stereo = -9999999;
 
-	  // Store ntuple variables 
-	  
-	  if ( (int)detid.subdetId() == int(StripSubdetector::TIB) )
-	    {
-	      
-	      
-	      
-	      strip_tib_layer              = (int)tTopo->tibLayer( detid );
-	      strip_tib_module             = (int)tTopo->tibModule( detid ); 
-	      strip_tib_order              = (int)tTopo->tibOrder( detid );
-	      strip_tib_side               = (int)tTopo->tibSide( detid );
-	      strip_tib_is_double_side     = (int)tTopo->tibIsDoubleSide( detid );
-	      strip_tib_is_z_plus_side     = (int)tTopo->tibIsZPlusSide( detid );
-	      strip_tib_is_z_minus_side    = (int)tTopo->tibIsZMinusSide( detid );
-	      strip_tib_layer_number       = (int)tTopo->tibLayer( detid );
-	      strip_tib_string_number      = (int)tTopo->tibString( detid ) ;
-	      strip_tib_module_number      = (int)tTopo->tibModule( detid );
-	      strip_tib_is_internal_string = (int)tTopo->tibIsInternalString( detid );
-	      strip_tib_is_external_string = (int)tTopo->tibIsExternalString( detid );
-	      strip_tib_is_rphi            = (int)tTopo->tibIsRPhi( detid );
-	      strip_tib_is_stereo          = (int)tTopo->tibIsStereo( detid );
-	    }
-	  
-	  
-	  if ( (int)detid.subdetId() == int(StripSubdetector::TOB) )
-	    {
-	      
-	      
-	      
-	      strip_tob_layer              = (int)tTopo->tobLayer( detid );
-	      strip_tob_module             = (int)tTopo->tobModule( detid );
-	      
-	      strip_tob_side               = (int)tTopo->tobSide( detid );
-	      strip_tob_is_double_side     = (int)tTopo->tobIsDoubleSide( detid );
-	      strip_tob_is_z_plus_side     = (int)tTopo->tobIsZPlusSide( detid );
-	      strip_tob_is_z_minus_side    = (int)tTopo->tobIsZMinusSide( detid );
-	      strip_tob_layer_number       = (int)tTopo->tobLayer( detid );
-	      strip_tob_rod_number         = (int)tTopo->tobRod( detid );
-	      strip_tob_module_number      = (int)tTopo->tobModule( detid );
-	      
-	      
-	      strip_tob_is_rphi            = (int)tTopo->tobIsRPhi( detid );
-	      strip_tob_is_stereo          = (int)tTopo->tobIsStereo( detid );
-	          
-	    }
-	 
-	 
-	  if ( matchedhit ) 
-	    {
-	      //cout << endl << endl << endl;
-	      //cout << "Found a SiStripMatchedRecHit2D !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! " << endl;
-	      //cout << endl << endl << endl;
-	      strip_hit_type = 0;
+      strip_tob_layer = -9999999;
+      strip_tob_module = -9999999;
+      strip_tob_side = -9999999;
+      strip_tob_is_double_side = -9999999;
+      strip_tob_is_z_plus_side = -9999999;
+      strip_tob_is_z_minus_side = -9999999;
+      strip_tob_layer_number = -9999999;
+      strip_tob_rod_number = -9999999;
+      strip_tob_module_number = -9999999;
 
-	    } //  if ( matchedhit )
+      strip_tob_is_rphi = -9999999;
+      strip_tob_is_stereo = -9999999;
 
-   
-	  if ( hit1d )
-	    {
-	      strip_hit_type = 1;
-
-	      const SiStripRecHit1D::ClusterRef & cluster = hit1d->cluster();
-
-	      if ( cluster->getSplitClusterError()  > 0.0 )
-		strip_split = 1;
-	      else 
-		strip_split = 0;
-	      
-	      strip_clst_err_x = cluster->getSplitClusterError();
-	      //strip_clst_err_y = ... 
-
-	      // Get cluster total charge
-	      const auto & stripCharges = cluster->amplitudes();
-	      uint16_t charge = 0;
-	      for (unsigned int i = 0; i < stripCharges.size(); ++i) 
-		{
-		  charge += stripCharges[i];
-		}
-	      
-	      strip_charge = (float)charge;
-	      strip_size = (int)( (cluster->amplitudes()).size() );
-
-
-	      // Association of the rechit to the simhit
-	      float mindist = 999999.9;
-	      matched.clear();  
-	      
-	      matched = associate.associateHit(*hit1d);
-
-	      strip_nsimhit = (int)matched.size();
-	      
-	      if ( !matched.empty()) 
-		{
-		  PSimHit closest;
-		  
-		  // Get the closest simhit
-		  
-		  int strip_nprimaries = 0; 
-		  int current_index = 0;
-		 
-		  for ( vector<PSimHit>::const_iterator m=matched.begin(); m<matched.end(); ++m)
-		    {
-		      ++current_index;
-		      
-		      if ( (*m).processType() == 2 )
-			++strip_nprimaries;
-
-		      if ( current_index == 1 )
-			{
-			  strip_pidhit1 = (*m).particleType();
-			  strip_simproc1 = (*m).processType();
-			}
-		      else if ( current_index == 2 )
-			{
-			  strip_pidhit2 = (*m).particleType();
-			  strip_simproc2 = (*m).processType();
-			}
-		      else if ( current_index == 3 )
-			{
-			  strip_pidhit3 = (*m).particleType();
-			  strip_simproc3 = (*m).processType();
-			}
-		      else if ( current_index == 4 )
-			{
-			  strip_pidhit4 = (*m).particleType();
-			  strip_simproc4 = (*m).processType();
-			}
-		      else if ( current_index == 5 )
-			{
-			  strip_pidhit5 = (*m).particleType();
-			  strip_simproc5 = (*m).processType();
-			}
-
-
-		      float dist = abs( (hit1d)->localPosition().x() - (*m).localPosition().x() );
-		      
-		      if ( dist<mindist )
-			{
-			  mindist = dist;
-			  closest = (*m);
-			}
-		    
-		    } // for ( vector<PSimHit>::const_iterator m=matched.begin(); m<matched.end(); ++m)
-		  
-		  strip_nprm = strip_nprimaries;
-
-		  strip_rechitresx = strip_rechitx - closest.localPosition().x();
-		  strip_rechitresy = strip_rechity - closest.localPosition().y();
- 
-		  strip_rechitresx2 = strip_rechitx - matched[0].localPosition().x();
-
-		  strip_rechitpullx = strip_rechitresx / strip_rechiterrx;
-		  strip_rechitpully = strip_rechitresy / strip_rechiterry;
-
-		  strip_pidhit = closest.particleType();
-		  strip_simproc = closest.processType();
-
-		  
-		} //   if( !matched.empty()) 
-		  
-
-	      //strip_prob = (hit1d)->getTemplProb();
-	      //strip_qbin = (hit1d)->getTemplQbin();
-
-	      //cout << endl;
-	      //cout << "SiPixelErrorEstimation 1d hit: " << endl;
-	      //cout << "prob 1d = " << strip_prob << endl;
-	      //cout << "qbin 1d = " << strip_qbin << endl;
-	      //cout << endl;
-
-	      
-	      // Is the cluster on edge ?
-	      /*
+      strip_prob = -9999999.9;
+      strip_qbin = -9999999;
+
+      strip_nprm = -9999999;
+
+      strip_pidhit1 = -9999999;
+      strip_simproc1 = -9999999;
+
+      strip_pidhit2 = -9999999;
+      strip_simproc2 = -9999999;
+
+      strip_pidhit3 = -9999999;
+      strip_simproc3 = -9999999;
+
+      strip_pidhit4 = -9999999;
+      strip_simproc4 = -9999999;
+
+      strip_pidhit5 = -9999999;
+      strip_simproc5 = -9999999;
+
+      strip_split = -9999999;
+      strip_clst_err_x = -9999999.9;
+      strip_clst_err_y = -9999999.9;
+
+      const TransientTrackingRecHit::ConstRecHitPointer trans_trk_rec_hit_point = itTraj->recHit();
+
+      if (trans_trk_rec_hit_point == nullptr)
+        continue;
+
+      const TrackingRecHit* trk_rec_hit = (*trans_trk_rec_hit_point).hit();
+
+      if (trk_rec_hit == nullptr)
+        continue;
+
+      DetId detid = (trk_rec_hit)->geographicalId();
+
+      strip_subdet_id = (int)detid.subdetId();
+
+      if ((int)detid.subdetId() != (int)(StripSubdetector::TIB) &&
+          (int)detid.subdetId() != (int)(StripSubdetector::TOB))
+        continue;
+
+      const SiStripMatchedRecHit2D* matchedhit =
+          dynamic_cast<const SiStripMatchedRecHit2D*>((*trans_trk_rec_hit_point).hit());
+      const SiStripRecHit2D* hit2d = dynamic_cast<const SiStripRecHit2D*>((*trans_trk_rec_hit_point).hit());
+      const SiStripRecHit1D* hit1d = dynamic_cast<const SiStripRecHit1D*>((*trans_trk_rec_hit_point).hit());
+
+      if (!matchedhit && !hit2d && !hit1d)
+        continue;
+
+      position = (trk_rec_hit)->localPosition();
+      error = (trk_rec_hit)->localPositionError();
+
+      strip_rechitx = position.x();
+      strip_rechity = position.y();
+      strip_rechitz = position.z();
+      strip_rechiterrx = sqrt(error.xx());
+      strip_rechiterry = sqrt(error.yy());
+
+      //cout << "strip_rechitx = " << strip_rechitx << endl;
+      //cout << "strip_rechity = " << strip_rechity << endl;
+      //cout << "strip_rechitz = " << strip_rechitz << endl;
+
+      //cout << "strip_rechiterrx = " << strip_rechiterrx << endl;
+      //cout << "strip_rechiterry = " << strip_rechiterry << endl;
+
+      TrajectoryStateOnSurface tsos = itTraj->updatedState();
+
+      strip_trk_pt = tsos.globalMomentum().perp();
+
+      LocalTrajectoryParameters ltp = tsos.localParameters();
+
+      LocalVector localDir = ltp.momentum() / ltp.momentum().mag();
+
+      float locx = localDir.x();
+      float locy = localDir.y();
+      float locz = localDir.z();
+
+      //alpha_ = atan2( locz, locx );
+      //beta_  = atan2( locz, locy );
+
+      strip_cotalpha = locx / locz;
+      strip_cotbeta = locy / locz;
+
+      StripSubdetector StripSubdet = (StripSubdetector)detid;
+
+      if (StripSubdet.stereo() == 0)
+        strip_is_stereo = 0;
+      else
+        strip_is_stereo = 1;
+
+      SiStripDetId si_strip_det_id = SiStripDetId(detid);
+
+      //const StripGeomDetUnit* strip_geom_det_unit = dynamic_cast<const StripGeomDetUnit*> ( tracker->idToDet( detid ) );
+      const StripGeomDetUnit* strip_geom_det_unit = (const StripGeomDetUnit*)tracker->idToDetUnit(detid);
+
+      if (strip_geom_det_unit != nullptr) {
+        LocalVector lbfield = (strip_geom_det_unit->surface())
+                                  .toLocal((*magneticField).inTesla(strip_geom_det_unit->surface().position()));
+
+        strip_locbx = lbfield.x();
+        strip_locby = lbfield.y();
+        strip_locbz = lbfield.z();
+      }
+
+      //enum ModuleGeometry {UNKNOWNGEOMETRY, IB1, IB2, OB1, OB2, W1A, W2A, W3A, W1B, W2B, W3B, W4, W5, W6, W7};
+
+      if (si_strip_det_id.moduleGeometry() == 1) {
+        detector_type = 1;
+        //cout << "si_strip_det_id.moduleGeometry() = IB1" << endl;
+        //cout << "si_strip_det_id.moduleGeometry() = " << si_strip_det_id.moduleGeometry() << endl;
+      } else if (si_strip_det_id.moduleGeometry() == 2) {
+        detector_type = 2;
+        //cout << "si_strip_det_id.moduleGeometry() = IB2" << endl;
+        //cout << "si_strip_det_id.moduleGeometry() = " << si_strip_det_id.moduleGeometry() << endl;
+      } else if (si_strip_det_id.moduleGeometry() == 3) {
+        detector_type = 3;
+        //cout << "si_strip_det_id.moduleGeometry() = OB1" << endl;
+        //cout << "si_strip_det_id.moduleGeometry() = " << si_strip_det_id.moduleGeometry() << endl;
+      } else if (si_strip_det_id.moduleGeometry() == 4) {
+        detector_type = 4;
+        //cout << "si_strip_det_id.moduleGeometry() = OB2" << endl;
+        //cout << "si_strip_det_id.moduleGeometry() = " << si_strip_det_id.moduleGeometry() << endl;
+      }
+
+      // Store ntuple variables
+
+      if ((int)detid.subdetId() == int(StripSubdetector::TIB)) {
+        strip_tib_layer = (int)tTopo->tibLayer(detid);
+        strip_tib_module = (int)tTopo->tibModule(detid);
+        strip_tib_order = (int)tTopo->tibOrder(detid);
+        strip_tib_side = (int)tTopo->tibSide(detid);
+        strip_tib_is_double_side = (int)tTopo->tibIsDoubleSide(detid);
+        strip_tib_is_z_plus_side = (int)tTopo->tibIsZPlusSide(detid);
+        strip_tib_is_z_minus_side = (int)tTopo->tibIsZMinusSide(detid);
+        strip_tib_layer_number = (int)tTopo->tibLayer(detid);
+        strip_tib_string_number = (int)tTopo->tibString(detid);
+        strip_tib_module_number = (int)tTopo->tibModule(detid);
+        strip_tib_is_internal_string = (int)tTopo->tibIsInternalString(detid);
+        strip_tib_is_external_string = (int)tTopo->tibIsExternalString(detid);
+        strip_tib_is_rphi = (int)tTopo->tibIsRPhi(detid);
+        strip_tib_is_stereo = (int)tTopo->tibIsStereo(detid);
+      }
+
+      if ((int)detid.subdetId() == int(StripSubdetector::TOB)) {
+        strip_tob_layer = (int)tTopo->tobLayer(detid);
+        strip_tob_module = (int)tTopo->tobModule(detid);
+
+        strip_tob_side = (int)tTopo->tobSide(detid);
+        strip_tob_is_double_side = (int)tTopo->tobIsDoubleSide(detid);
+        strip_tob_is_z_plus_side = (int)tTopo->tobIsZPlusSide(detid);
+        strip_tob_is_z_minus_side = (int)tTopo->tobIsZMinusSide(detid);
+        strip_tob_layer_number = (int)tTopo->tobLayer(detid);
+        strip_tob_rod_number = (int)tTopo->tobRod(detid);
+        strip_tob_module_number = (int)tTopo->tobModule(detid);
+
+        strip_tob_is_rphi = (int)tTopo->tobIsRPhi(detid);
+        strip_tob_is_stereo = (int)tTopo->tobIsStereo(detid);
+      }
+
+      if (matchedhit) {
+        //cout << endl << endl << endl;
+        //cout << "Found a SiStripMatchedRecHit2D !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! " << endl;
+        //cout << endl << endl << endl;
+        strip_hit_type = 0;
+
+      }  //  if ( matchedhit )
+
+      if (hit1d) {
+        strip_hit_type = 1;
+
+        const SiStripRecHit1D::ClusterRef& cluster = hit1d->cluster();
+
+        if (cluster->getSplitClusterError() > 0.0)
+          strip_split = 1;
+        else
+          strip_split = 0;
+
+        strip_clst_err_x = cluster->getSplitClusterError();
+        //strip_clst_err_y = ...
+
+        // Get cluster total charge
+        const auto& stripCharges = cluster->amplitudes();
+        uint16_t charge = 0;
+        for (unsigned int i = 0; i < stripCharges.size(); ++i) {
+          charge += stripCharges[i];
+        }
+
+        strip_charge = (float)charge;
+        strip_size = (int)((cluster->amplitudes()).size());
+
+        // Association of the rechit to the simhit
+        float mindist = 999999.9;
+        matched.clear();
+
+        matched = associate.associateHit(*hit1d);
+
+        strip_nsimhit = (int)matched.size();
+
+        if (!matched.empty()) {
+          PSimHit closest;
+
+          // Get the closest simhit
+
+          int strip_nprimaries = 0;
+          int current_index = 0;
+
+          for (vector<PSimHit>::const_iterator m = matched.begin(); m < matched.end(); ++m) {
+            ++current_index;
+
+            if ((*m).processType() == 2)
+              ++strip_nprimaries;
+
+            if (current_index == 1) {
+              strip_pidhit1 = (*m).particleType();
+              strip_simproc1 = (*m).processType();
+            } else if (current_index == 2) {
+              strip_pidhit2 = (*m).particleType();
+              strip_simproc2 = (*m).processType();
+            } else if (current_index == 3) {
+              strip_pidhit3 = (*m).particleType();
+              strip_simproc3 = (*m).processType();
+            } else if (current_index == 4) {
+              strip_pidhit4 = (*m).particleType();
+              strip_simproc4 = (*m).processType();
+            } else if (current_index == 5) {
+              strip_pidhit5 = (*m).particleType();
+              strip_simproc5 = (*m).processType();
+            }
+
+            float dist = abs((hit1d)->localPosition().x() - (*m).localPosition().x());
+
+            if (dist < mindist) {
+              mindist = dist;
+              closest = (*m);
+            }
+
+          }  // for ( vector<PSimHit>::const_iterator m=matched.begin(); m<matched.end(); ++m)
+
+          strip_nprm = strip_nprimaries;
+
+          strip_rechitresx = strip_rechitx - closest.localPosition().x();
+          strip_rechitresy = strip_rechity - closest.localPosition().y();
+
+          strip_rechitresx2 = strip_rechitx - matched[0].localPosition().x();
+
+          strip_rechitpullx = strip_rechitresx / strip_rechiterrx;
+          strip_rechitpully = strip_rechitresy / strip_rechiterry;
+
+          strip_pidhit = closest.particleType();
+          strip_simproc = closest.processType();
+
+        }  //   if( !matched.empty())
+
+        //strip_prob = (hit1d)->getTemplProb();
+        //strip_qbin = (hit1d)->getTemplQbin();
+
+        //cout << endl;
+        //cout << "SiPixelErrorEstimation 1d hit: " << endl;
+        //cout << "prob 1d = " << strip_prob << endl;
+        //cout << "qbin 1d = " << strip_qbin << endl;
+        //cout << endl;
+
+        // Is the cluster on edge ?
+        /*
 		SiStripDetInfoFileReader* reader;
 		
 		FileInPath_("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat");
@@ -814,105 +758,82 @@ SiPixelErrorEstimation::analyze(const edm::Event& e, const edm::EventSetup& es)
 		strip_edge = 0;
 	      */
 
-	    } // if ( hit1d )
+      }  // if ( hit1d )
 
+      if (hit2d) {
+        strip_hit_type = 2;
 
-	  if ( hit2d )
-	    {
-	      strip_hit_type = 2;
-	      
-	      const SiStripRecHit1D::ClusterRef & cluster = hit2d->cluster();
-	      
-	      //if ( cluster->getSplitClusterError()  > 0.0 )
-	      //strip_split = 1;
-	      //else 
-	      //strip_split = 0;
-
-	      //strip_clst_err_x = cluster->getSplitClusterError();
-	      //strip_clst_err_y = ... 
-
-	      // Get cluster total charge
-	      auto & stripCharges = cluster->amplitudes();
-	      uint16_t charge = 0;
-	      for (unsigned int i = 0; i < stripCharges.size(); ++i) 
-		{
-		  charge += stripCharges[i];
-		}
-	      
-	      strip_charge = (float)charge;
-	      strip_size = (int)( (cluster->amplitudes()).size() );
-	     
-	      // Association of the rechit to the simhit
-	      float mindist = 999999.9;
-	      matched.clear();  
-	      
-	      matched = associate.associateHit(*hit2d);
-
-	      strip_nsimhit = (int)matched.size();
-	      
-	      if ( !matched.empty()) 
-		{
-		  PSimHit closest;
-		  
-		  // Get the closest simhit
-		  
-		  for ( vector<PSimHit>::const_iterator m=matched.begin(); m<matched.end(); ++m)
-		    {
-		      float dist = abs( (hit2d)->localPosition().x() - (*m).localPosition().x() );
-		      
-		      if ( dist<mindist )
-			{
-			  mindist = dist;
-			  closest = (*m);
-			}
-		    }
-		  
-		  strip_rechitresx = strip_rechitx - closest.localPosition().x();
-		  strip_rechitresy = strip_rechity - closest.localPosition().y();
- 
-		  strip_rechitpullx = strip_rechitresx / strip_rechiterrx;
-		  strip_rechitpully = strip_rechitresy / strip_rechiterry;
-
-		  strip_pidhit = closest.particleType();
-		  strip_simproc = closest.processType();
-
-		  
-		} //   if( !matched.empty()) 
-		  
-
-	      //strip_prob = (hit2d)->getTemplProb();
-	      //strip_qbin = (hit2d)->getTemplQbin();
-
-	      //cout << endl;
-	      //cout << "SiPixelErrorEstimation 2d hit: " << endl;
-	      //cout << "prob 2d = " << strip_prob << endl;
-	      //cout << "qbin 2d = " << strip_qbin << endl;
-	      //cout << endl;
-		  
-	      
-	    } // if ( hit2d )
-
-
-	  ttree_track_hits_strip_->Fill();
-
-
-	} // for ( vector<TrajectoryMeasurement>::const_iterator itTraj = tmColl.begin(); itTraj!=tmColl.end(); ++itTraj )
-
-    } // for( vector<Trajectory>::const_iterator it = trajCollectionHandle->begin(); it!=trajCollectionHandle->end(); ++it)
+        const SiStripRecHit1D::ClusterRef& cluster = hit2d->cluster();
 
+        //if ( cluster->getSplitClusterError()  > 0.0 )
+        //strip_split = 1;
+        //else
+        //strip_split = 0;
 
+        //strip_clst_err_x = cluster->getSplitClusterError();
+        //strip_clst_err_y = ...
 
+        // Get cluster total charge
+        auto& stripCharges = cluster->amplitudes();
+        uint16_t charge = 0;
+        for (unsigned int i = 0; i < stripCharges.size(); ++i) {
+          charge += stripCharges[i];
+        }
 
+        strip_charge = (float)charge;
+        strip_size = (int)((cluster->amplitudes()).size());
 
+        // Association of the rechit to the simhit
+        float mindist = 999999.9;
+        matched.clear();
 
+        matched = associate.associateHit(*hit2d);
 
+        strip_nsimhit = (int)matched.size();
 
-  //cout << "...2..." << endl;
+        if (!matched.empty()) {
+          PSimHit closest;
+
+          // Get the closest simhit
 
+          for (vector<PSimHit>::const_iterator m = matched.begin(); m < matched.end(); ++m) {
+            float dist = abs((hit2d)->localPosition().x() - (*m).localPosition().x());
 
+            if (dist < mindist) {
+              mindist = dist;
+              closest = (*m);
+            }
+          }
 
+          strip_rechitresx = strip_rechitx - closest.localPosition().x();
+          strip_rechitresy = strip_rechity - closest.localPosition().y();
 
+          strip_rechitpullx = strip_rechitresx / strip_rechiterrx;
+          strip_rechitpully = strip_rechitresy / strip_rechiterry;
 
+          strip_pidhit = closest.particleType();
+          strip_simproc = closest.processType();
+
+        }  //   if( !matched.empty())
+
+        //strip_prob = (hit2d)->getTemplProb();
+        //strip_qbin = (hit2d)->getTemplQbin();
+
+        //cout << endl;
+        //cout << "SiPixelErrorEstimation 2d hit: " << endl;
+        //cout << "prob 2d = " << strip_prob << endl;
+        //cout << "qbin 2d = " << strip_qbin << endl;
+        //cout << endl;
+
+      }  // if ( hit2d )
+
+      ttree_track_hits_strip_->Fill();
+
+    }  // for ( vector<TrajectoryMeasurement>::const_iterator itTraj = tmColl.begin(); itTraj!=tmColl.end(); ++itTraj )
+
+  }  // for( vector<Trajectory>::const_iterator it = trajCollectionHandle->begin(); it!=trajCollectionHandle->end(); ++it)
+
+  //cout << "...2..." << endl;
 
   // --------------------------------------- all hits -----------------------------------------------------------
   edm::Handle<SiPixelRecHitCollection> recHitColl;
@@ -922,142 +843,139 @@ SiPixelErrorEstimation::analyze(const edm::Event& e, const edm::EventSetup& es)
   e.getByToken(tSimTrackContainer, simtracks);
 
   //-----Iterate over detunits
-  for (TrackerGeometry::DetContainer::const_iterator it = pDD->dets().begin(); it != pDD->dets().end(); it++) 
-    {
-      DetId detId = ((*it)->geographicalId());
-      
-      SiPixelRecHitCollection::const_iterator dsmatch = recHitColl->find(detId);
-      if (dsmatch == recHitColl->end()) continue;
-
-      SiPixelRecHitCollection::DetSet pixelrechitRange = *dsmatch;
-      SiPixelRecHitCollection::DetSet::const_iterator pixelrechitRangeIteratorBegin = pixelrechitRange.begin();
-      SiPixelRecHitCollection::DetSet::const_iterator pixelrechitRangeIteratorEnd = pixelrechitRange.end();
-      SiPixelRecHitCollection::DetSet::const_iterator pixeliter = pixelrechitRangeIteratorBegin;
-      std::vector<PSimHit> matched;
-      
-      //----Loop over rechits for this detId
-      for ( ; pixeliter != pixelrechitRangeIteratorEnd; ++pixeliter) 
-	{
-	  matched.clear();
-	  matched = associate.associateHit(*pixeliter);
-	  // only consider rechits that have associated simhit
-	  // otherwise cannot determine residiual
-	  if ( matched.empty() )
-	    {
-	      cout << "SiPixelErrorEstimation::analyze: rechits without associated simhit !!!!!!!" 
-		   << endl;
-	      continue;
-	    }
-		
-	  all_subdetid = -9999;
-	  
-	  all_layer = -9999;
-	  all_ladder = -9999;
-	  all_mod = -9999;
-	  
-	  all_side = -9999;
-	  all_disk = -9999;
-	  all_blade = -9999;
-	  all_panel = -9999;
-	  all_plaq = -9999;
-	  
-	  all_half = -9999;
-	  all_flipped = -9999;
-	  
-	  all_cols = -9999;
-	  all_rows = -9999;
-	  
-	  all_rechitx = -9999;
-	  all_rechity = -9999;
-	  all_rechitz = -9999;
-	  
-	  all_simhitx = -9999;
-	  all_simhity = -9999;
-
-	  all_rechiterrx = -9999;
-	  all_rechiterry = -9999;
-	  
-	  all_rechitresx = -9999;
-	  all_rechitresy = -9999;
-	  
-	  all_rechitpullx = -9999;
-	  all_rechitpully = -9999;
-	  
-	  all_npix = -9999;
-	  all_nxpix = -9999;
-	  all_nypix = -9999;
-	 	  
-	  all_edgex = -9999;
-	  all_edgey = -9999;
-	  
-	  all_bigx = -9999;
-	  all_bigy = -9999;
-	  
-	  all_alpha = -9999;
-	  all_beta = -9999;
-	  
-	  all_simphi = -9999;
-	  all_simtheta = -9999;
-	  
-	  all_simhitx = -9999;
-	  all_simhity = -9999;
-	  
-	  all_nsimhit = -9999;
-	  all_pidhit = -9999;
-	  all_simproc = -9999;
-	  
-	  all_vtxr = -9999;
-	  all_vtxz = -9999;
-	  
-	  all_simpx = -9999;
-	  all_simpy = -9999;
-	  all_simpz = -9999;
-	  
-	  all_eloss = -9999;
-	  	  
-	  all_trkid = -9999;
-	  
-	  all_x1 = -9999;
-	  all_x2 = -9999;
-	  all_y1 = -9999;
-	  all_y2 = -9999;
-	  all_z1 = -9999;
-	  all_z2 = -9999;
-	  
-	  all_row1 = -9999;
-	  all_row2 = -9999;
-	  all_col1 = -9999;
-	  all_col2 = -9999;
-	  
-	  all_gx1 = -9999;
-	  all_gx2 = -9999;
-	  all_gy1 = -9999;
-	  all_gy2 = -9999;
-	  all_gz1 = -9999;
-	  all_gz2 = -9999;
-	  
-	  all_simtrketa = -9999;
-	  all_simtrkphi = -9999;
-	  
-	  all_clust_row = -9999;
-	  all_clust_col = -9999;
-	  
-	  all_clust_x = -9999;
-	  all_clust_y = -9999;
-	  
-	  all_clust_q = -9999;
-	  
-	  all_clust_maxpixcol = -9999;
-	  all_clust_maxpixrow = -9999;
-	  all_clust_minpixcol = -9999;
-	  all_clust_minpixrow = -9999;
-	  
-	  all_clust_geoid = -9999;
-	  
-	  all_clust_alpha = -9999;
-	  all_clust_beta = -9999;
-	  
-	  /*
+  for (TrackerGeometry::DetContainer::const_iterator it = pDD->dets().begin(); it != pDD->dets().end(); it++) {
+    DetId detId = ((*it)->geographicalId());
+
+    SiPixelRecHitCollection::const_iterator dsmatch = recHitColl->find(detId);
+    if (dsmatch == recHitColl->end())
+      continue;
+
+    SiPixelRecHitCollection::DetSet pixelrechitRange = *dsmatch;
+    SiPixelRecHitCollection::DetSet::const_iterator pixelrechitRangeIteratorBegin = pixelrechitRange.begin();
+    SiPixelRecHitCollection::DetSet::const_iterator pixelrechitRangeIteratorEnd = pixelrechitRange.end();
+    SiPixelRecHitCollection::DetSet::const_iterator pixeliter = pixelrechitRangeIteratorBegin;
+    std::vector<PSimHit> matched;
+
+    //----Loop over rechits for this detId
+    for (; pixeliter != pixelrechitRangeIteratorEnd; ++pixeliter) {
+      matched.clear();
+      matched = associate.associateHit(*pixeliter);
+      // only consider rechits that have associated simhit
+      // otherwise cannot determine residiual
+      if (matched.empty()) {
+        cout << "SiPixelErrorEstimation::analyze: rechits without associated simhit !!!!!!!" << endl;
+        continue;
+      }
+
+      all_subdetid = -9999;
+
+      all_layer = -9999;
+      all_ladder = -9999;
+      all_mod = -9999;
+
+      all_side = -9999;
+      all_disk = -9999;
+      all_blade = -9999;
+      all_panel = -9999;
+      all_plaq = -9999;
+
+      all_half = -9999;
+      all_flipped = -9999;
+
+      all_cols = -9999;
+      all_rows = -9999;
+
+      all_rechitx = -9999;
+      all_rechity = -9999;
+      all_rechitz = -9999;
+
+      all_simhitx = -9999;
+      all_simhity = -9999;
+
+      all_rechiterrx = -9999;
+      all_rechiterry = -9999;
+
+      all_rechitresx = -9999;
+      all_rechitresy = -9999;
+
+      all_rechitpullx = -9999;
+      all_rechitpully = -9999;
+
+      all_npix = -9999;
+      all_nxpix = -9999;
+      all_nypix = -9999;
+
+      all_edgex = -9999;
+      all_edgey = -9999;
+
+      all_bigx = -9999;
+      all_bigy = -9999;
+
+      all_alpha = -9999;
+      all_beta = -9999;
+
+      all_simphi = -9999;
+      all_simtheta = -9999;
+
+      all_simhitx = -9999;
+      all_simhity = -9999;
+
+      all_nsimhit = -9999;
+      all_pidhit = -9999;
+      all_simproc = -9999;
+
+      all_vtxr = -9999;
+      all_vtxz = -9999;
+
+      all_simpx = -9999;
+      all_simpy = -9999;
+      all_simpz = -9999;
+
+      all_eloss = -9999;
+
+      all_trkid = -9999;
+
+      all_x1 = -9999;
+      all_x2 = -9999;
+      all_y1 = -9999;
+      all_y2 = -9999;
+      all_z1 = -9999;
+      all_z2 = -9999;
+
+      all_row1 = -9999;
+      all_row2 = -9999;
+      all_col1 = -9999;
+      all_col2 = -9999;
+
+      all_gx1 = -9999;
+      all_gx2 = -9999;
+      all_gy1 = -9999;
+      all_gy2 = -9999;
+      all_gz1 = -9999;
+      all_gz2 = -9999;
+
+      all_simtrketa = -9999;
+      all_simtrkphi = -9999;
+
+      all_clust_row = -9999;
+      all_clust_col = -9999;
+
+      all_clust_x = -9999;
+      all_clust_y = -9999;
+
+      all_clust_q = -9999;
+
+      all_clust_maxpixcol = -9999;
+      all_clust_maxpixrow = -9999;
+      all_clust_minpixcol = -9999;
+      all_clust_minpixrow = -9999;
+
+      all_clust_geoid = -9999;
+
+      all_clust_alpha = -9999;
+      all_clust_beta = -9999;
+
+      /*
 	    for (int i=0; i<all_npix; ++i)
 	    {
 	    all_pixrow[i] = -9999;
@@ -1071,635 +989,580 @@ SiPixelErrorEstimation::analyze(const edm::Event& e, const edm::EventSetup& es)
 	    }
 	  */
 
-	  all_hit_probx = -9999;
-	  all_hit_proby = -9999;
-	  all_hit_cprob0 = -9999;
-	  all_hit_cprob1 = -9999;
-	  all_hit_cprob2 = -9999;
-
-	  all_pixel_split = -9999;
-	  all_pixel_clst_err_x = -9999.9;
-	  all_pixel_clst_err_y = -9999.9;
-
-	  all_nsimhit = (int)matched.size();
-	  
-	  all_subdetid = (int)detId.subdetId();
-	  // only consider rechits in pixel barrel and pixel forward 
-	  if ( !(all_subdetid==1 || all_subdetid==2) )
-	    {
-	      cout << "SiPixelErrorEstimation::analyze: Not in a pixel detector !!!!!" << endl; 
-	      continue;
-	    }
+      all_hit_probx = -9999;
+      all_hit_proby = -9999;
+      all_hit_cprob0 = -9999;
+      all_hit_cprob1 = -9999;
+      all_hit_cprob2 = -9999;
+
+      all_pixel_split = -9999;
+      all_pixel_clst_err_x = -9999.9;
+      all_pixel_clst_err_y = -9999.9;
+
+      all_nsimhit = (int)matched.size();
+
+      all_subdetid = (int)detId.subdetId();
+      // only consider rechits in pixel barrel and pixel forward
+      if (!(all_subdetid == 1 || all_subdetid == 2)) {
+        cout << "SiPixelErrorEstimation::analyze: Not in a pixel detector !!!!!" << endl;
+        continue;
+      }
+
+      const PixelGeomDetUnit* theGeomDet = dynamic_cast<const PixelGeomDetUnit*>(tracker->idToDet(detId));
+
+      const PixelTopology* topol = &(theGeomDet->specificTopology());
+
+      if (pixeliter->cluster()->getSplitClusterErrorX() > 0.0 && pixeliter->cluster()->getSplitClusterErrorY() > 0.0) {
+        all_pixel_split = 1;
+      } else {
+        all_pixel_split = 0;
+      }
+
+      all_pixel_clst_err_x = pixeliter->cluster()->getSplitClusterErrorX();
+      all_pixel_clst_err_y = pixeliter->cluster()->getSplitClusterErrorY();
+
+      const int maxPixelCol = pixeliter->cluster()->maxPixelCol();
+      const int maxPixelRow = pixeliter->cluster()->maxPixelRow();
+      const int minPixelCol = pixeliter->cluster()->minPixelCol();
+      const int minPixelRow = pixeliter->cluster()->minPixelRow();
+
+      //all_hit_probx  = (float)pixeliter->probabilityX();
+      //all_hit_proby  = (float)pixeliter->probabilityY();
+      all_hit_cprob0 = (float)pixeliter->clusterProbability(0);
+      all_hit_cprob1 = (float)pixeliter->clusterProbability(1);
+      all_hit_cprob2 = (float)pixeliter->clusterProbability(2);
+
+      // check whether the cluster is at the module edge
+      if (topol->isItEdgePixelInX(minPixelRow) || topol->isItEdgePixelInX(maxPixelRow))
+        all_edgex = 1;
+      else
+        all_edgex = 0;
+
+      if (topol->isItEdgePixelInY(minPixelCol) || topol->isItEdgePixelInY(maxPixelCol))
+        all_edgey = 1;
+      else
+        all_edgey = 0;
+
+      // check whether this rechit contains big pixels
+      if (topol->containsBigPixelInX(minPixelRow, maxPixelRow))
+        all_bigx = 1;
+      else
+        all_bigx = 0;
+
+      if (topol->containsBigPixelInY(minPixelCol, maxPixelCol))
+        all_bigy = 1;
+      else
+        all_bigy = 0;
+
+      if ((int)detId.subdetId() == (int)PixelSubdetector::PixelBarrel) {
+        all_layer = tTopo->pxbLayer(detId);
+        all_ladder = tTopo->pxbLadder(detId);
+        all_mod = tTopo->pxbModule(detId);
+
+        int tmp_nrows = theGeomDet->specificTopology().nrows();
+        if (tmp_nrows == 80)
+          all_half = 1;
+        else if (tmp_nrows == 160)
+          all_half = 0;
+        else
+          cout << "-------------------------------------------------- Wrong module size !!!" << endl;
+
+        float tmp1 = theGeomDet->surface().toGlobal(Local3DPoint(0., 0., 0.)).perp();
+        float tmp2 = theGeomDet->surface().toGlobal(Local3DPoint(0., 0., 1.)).perp();
+
+        if (tmp2 < tmp1)
+          all_flipped = 1;
+        else
+          all_flipped = 0;
+      } else if ((int)detId.subdetId() == (int)PixelSubdetector::PixelEndcap) {
+        all_side = tTopo->pxfSide(detId);
+        all_disk = tTopo->pxfDisk(detId);
+        all_blade = tTopo->pxfBlade(detId);
+        all_panel = tTopo->pxfPanel(detId);
+        all_plaq = tTopo->pxfModule(detId);  // also known as plaquette
+
+      }  // else if ( detId.subdetId()==PixelSubdetector::PixelEndcap )
+      else
+        std::cout << "We are not in the pixel detector" << (int)detId.subdetId() << endl;
+
+      all_cols = theGeomDet->specificTopology().ncolumns();
+      all_rows = theGeomDet->specificTopology().nrows();
+
+      LocalPoint lp = pixeliter->localPosition();
+      // gavril: change this name
+      all_rechitx = lp.x();
+      all_rechity = lp.y();
+      all_rechitz = lp.z();
+
+      LocalError le = pixeliter->localPositionError();
+      all_rechiterrx = sqrt(le.xx());
+      all_rechiterry = sqrt(le.yy());
+
+      bool found_hit_from_generated_particle = false;
+
+      //---Loop over sim hits, fill closest
+      float closest_dist = 99999.9;
+      std::vector<PSimHit>::const_iterator closest_simhit = matched.begin();
+
+      for (std::vector<PSimHit>::const_iterator m = matched.begin(); m < matched.end(); m++) {
+        if (checkType_) {
+          int pid = (*m).particleType();
+          if (abs(pid) != genType_)
+            continue;
+        }
+
+        float simhitx = 0.5 * ((*m).entryPoint().x() + (*m).exitPoint().x());
+        float simhity = 0.5 * ((*m).entryPoint().y() + (*m).exitPoint().y());
+
+        float x_res = simhitx - rechitx;
+        float y_res = simhity - rechity;
+
+        float dist = sqrt(x_res * x_res + y_res * y_res);
+
+        if (dist < closest_dist) {
+          closest_dist = dist;
+          closest_simhit = m;
+          found_hit_from_generated_particle = true;
+        }
+      }  // end sim hit loop
+
+      // If this recHit does not have any simHit with the same particleType as the particles generated
+      // ignore it as most probably comes from delta rays.
+      if (checkType_ && !found_hit_from_generated_particle)
+        continue;
+
+      all_x1 = (*closest_simhit).entryPoint().x();  // width (row index, in col direction)
+      all_y1 = (*closest_simhit).entryPoint().y();  // length (col index, in row direction)
+      all_z1 = (*closest_simhit).entryPoint().z();
+      all_x2 = (*closest_simhit).exitPoint().x();
+      all_y2 = (*closest_simhit).exitPoint().y();
+      all_z2 = (*closest_simhit).exitPoint().z();
+      GlobalPoint GP1 = theGeomDet->surface().toGlobal(Local3DPoint(
+          (*closest_simhit).entryPoint().x(), (*closest_simhit).entryPoint().y(), (*closest_simhit).entryPoint().z()));
+      GlobalPoint GP2 = theGeomDet->surface().toGlobal(Local3DPoint(
+          (*closest_simhit).exitPoint().x(), (*closest_simhit).exitPoint().y(), (*closest_simhit).exitPoint().z()));
+      all_gx1 = GP1.x();
+      all_gx2 = GP2.x();
+      all_gy1 = GP1.y();
+      all_gy2 = GP2.y();
+      all_gz1 = GP1.z();
+      all_gz2 = GP2.z();
+
+      MeasurementPoint mp1 = topol->measurementPosition(LocalPoint(
+          (*closest_simhit).entryPoint().x(), (*closest_simhit).entryPoint().y(), (*closest_simhit).entryPoint().z()));
+      MeasurementPoint mp2 = topol->measurementPosition(LocalPoint(
+          (*closest_simhit).exitPoint().x(), (*closest_simhit).exitPoint().y(), (*closest_simhit).exitPoint().z()));
+      all_row1 = mp1.x();
+      all_col1 = mp1.y();
+      all_row2 = mp2.x();
+      all_col2 = mp2.y();
+
+      all_simhitx = 0.5 * (all_x1 + all_x2);
+      all_simhity = 0.5 * (all_y1 + all_y2);
+
+      all_rechitresx = all_rechitx - all_simhitx;
+      all_rechitresy = all_rechity - all_simhity;
+
+      all_rechitpullx = all_rechitresx / all_rechiterrx;
+      all_rechitpully = all_rechitresy / all_rechiterry;
+
+      SiPixelRecHit::ClusterRef const& clust = pixeliter->cluster();
+
+      all_npix = clust->size();
+      all_nxpix = clust->sizeX();
+      all_nypix = clust->sizeY();
+
+      all_clust_row = clust->x();
+      all_clust_col = clust->y();
+
+      LocalPoint lp2 = topol->localPosition(MeasurementPoint(all_clust_row, all_clust_col));
+      all_clust_x = lp2.x();
+      all_clust_y = lp2.y();
+
+      all_clust_q = clust->charge();
+
+      all_clust_maxpixcol = clust->maxPixelCol();
+      all_clust_maxpixrow = clust->maxPixelRow();
+      all_clust_minpixcol = clust->minPixelCol();
+      all_clust_minpixrow = clust->minPixelRow();
+
+      all_clust_geoid = 0;  // never set!
+
+      all_simpx = (*closest_simhit).momentumAtEntry().x();
+      all_simpy = (*closest_simhit).momentumAtEntry().y();
+      all_simpz = (*closest_simhit).momentumAtEntry().z();
+      all_eloss = (*closest_simhit).energyLoss();
+      all_simphi = (*closest_simhit).phiAtEntry();
+      all_simtheta = (*closest_simhit).thetaAtEntry();
+      all_pidhit = (*closest_simhit).particleType();
+      all_trkid = (*closest_simhit).trackId();
+
+      //--- Fill alpha and beta -- more useful for exploring the residuals...
+      all_beta = atan2(all_simpz, all_simpy);
+      all_alpha = atan2(all_simpz, all_simpx);
+
+      all_simproc = (int)closest_simhit->processType();
+
+      const edm::SimTrackContainer& trks = *(simtracks.product());
+      SimTrackContainer::const_iterator trksiter;
+      for (trksiter = trks.begin(); trksiter != trks.end(); trksiter++)
+        if ((int)trksiter->trackId() == all_trkid) {
+          all_simtrketa = trksiter->momentum().eta();
+          all_simtrkphi = trksiter->momentum().phi();
+        }
+
+      all_vtxz = theGeomDet->surface().position().z();
+      all_vtxr = theGeomDet->surface().position().perp();
+
+      //computeAnglesFromDetPosition(clust,
+      //		       theGeomDet,
+      //		       all_clust_alpha, all_clust_beta )
+
+      const std::vector<SiPixelCluster::Pixel>& pixvector = clust->pixels();
+      for (int i = 0; i < (int)pixvector.size(); ++i) {
+        SiPixelCluster::Pixel holdpix = pixvector[i];
+        all_pixrow[i] = holdpix.x;
+        all_pixcol[i] = holdpix.y;
+        all_pixadc[i] = holdpix.adc;
+        LocalPoint lp = topol->localPosition(MeasurementPoint(holdpix.x, holdpix.y));
+        all_pixx[i] = lp.x();
+        all_pixy[i] = lp.y();
+        GlobalPoint GP = theGeomDet->surface().toGlobal(Local3DPoint(lp.x(), lp.y(), lp.z()));
+        all_pixgx[i] = GP.x();
+        all_pixgy[i] = GP.y();
+        all_pixgz[i] = GP.z();
+      }
+
+      ttree_all_hits_->Fill();
+
+    }  // for ( ; pixeliter != pixelrechitRangeIteratorEnd; ++pixeliter)
+
+  }  // for (TrackerGeometry::DetContainer::const_iterator it = pDD->dets().begin(); it != pDD->dets().end(); it++)
 
-	  const PixelGeomDetUnit* theGeomDet 
-	    = dynamic_cast<const PixelGeomDetUnit*> ( tracker->idToDet(detId) );
-	  
-	  const PixelTopology* topol = &(theGeomDet->specificTopology());
+  // ------------------------------------------------ all hits ---------------------------------------------------------------
 
-	  if ( pixeliter->cluster()->getSplitClusterErrorX()  > 0.0 && 
-	       pixeliter->cluster()->getSplitClusterErrorY()  > 0.0 )
-	    {
-	      all_pixel_split = 1;
-	    }
-	  else
-	    {
-	      all_pixel_split = 0;
-	    }
-	
-	  all_pixel_clst_err_x = pixeliter->cluster()->getSplitClusterErrorX();
-	  all_pixel_clst_err_y = pixeliter->cluster()->getSplitClusterErrorY();
-
-
-	  const int maxPixelCol = pixeliter->cluster()->maxPixelCol();
-	  const int maxPixelRow = pixeliter->cluster()->maxPixelRow();
-	  const int minPixelCol = pixeliter->cluster()->minPixelCol();
-	  const int minPixelRow = pixeliter->cluster()->minPixelRow();
-	  
-	  //all_hit_probx  = (float)pixeliter->probabilityX();
-	  //all_hit_proby  = (float)pixeliter->probabilityY();
-	  all_hit_cprob0 = (float)pixeliter->clusterProbability(0);
-	  all_hit_cprob1 = (float)pixeliter->clusterProbability(1);
-	  all_hit_cprob2 = (float)pixeliter->clusterProbability(2);
-	  
-	  // check whether the cluster is at the module edge 
-	  if ( topol->isItEdgePixelInX( minPixelRow ) || 
-	       topol->isItEdgePixelInX( maxPixelRow ) )
-	    all_edgex = 1;
-	  else 
-	    all_edgex = 0;
-	  
-	  if ( topol->isItEdgePixelInY( minPixelCol ) || 
-	       topol->isItEdgePixelInY( maxPixelCol ) )
-	    all_edgey = 1;
-	  else 
-	    all_edgey = 0;
-	  
-	  // check whether this rechit contains big pixels
-	  if ( topol->containsBigPixelInX(minPixelRow, maxPixelRow) )
-	    all_bigx = 1;
-	  else 
-	    all_bigx = 0;
-	  
-	  if ( topol->containsBigPixelInY(minPixelCol, maxPixelCol) )
-	    all_bigy = 1;
-	  else 
-	    all_bigy = 0;
-	  
-	  if ( (int)detId.subdetId() == (int)PixelSubdetector::PixelBarrel ) 
-	    {
-	      
-	      all_layer = tTopo->pxbLayer(detId);
-	      all_ladder = tTopo->pxbLadder(detId);
-	      all_mod = tTopo->pxbModule(detId);
-	      
-	      int tmp_nrows = theGeomDet->specificTopology().nrows();
-	      if ( tmp_nrows == 80 ) 
-		all_half = 1;
-	      else if ( tmp_nrows == 160 ) 
-		all_half = 0;
-	      else 
-		cout << "-------------------------------------------------- Wrong module size !!!" << endl;
-	      
-	      float tmp1 = theGeomDet->surface().toGlobal(Local3DPoint(0.,0.,0.)).perp();
-	      float tmp2 = theGeomDet->surface().toGlobal(Local3DPoint(0.,0.,1.)).perp();
-	      
-	      if ( tmp2<tmp1 ) 
-		all_flipped = 1;
-	      else 
-		all_flipped = 0;
-	    }
-	  else if ( (int)detId.subdetId() == (int)PixelSubdetector::PixelEndcap )
-	    {
-	      
-	      all_side  = tTopo->pxfSide(detId);
-	      all_disk  = tTopo->pxfDisk(detId);
-	      all_blade = tTopo->pxfBlade(detId);
-	      all_panel = tTopo->pxfPanel(detId);
-	      all_plaq  = tTopo->pxfModule(detId); // also known as plaquette
-	      
-	    } // else if ( detId.subdetId()==PixelSubdetector::PixelEndcap )
-	  else std::cout << "We are not in the pixel detector" << (int)detId.subdetId() << endl;
-	  
-	  all_cols = theGeomDet->specificTopology().ncolumns();
-	  all_rows = theGeomDet->specificTopology().nrows();
-	  	  
-	  LocalPoint lp = pixeliter->localPosition();
-	  // gavril: change this name
-	  all_rechitx = lp.x();
-	  all_rechity = lp.y();
-	  all_rechitz = lp.z();
-	  
-	  LocalError le = pixeliter->localPositionError();
-	  all_rechiterrx = sqrt( le.xx() );
-	  all_rechiterry = sqrt( le.yy() );
-
-	  bool found_hit_from_generated_particle = false;
-	  
-	  //---Loop over sim hits, fill closest
-	  float closest_dist = 99999.9;
-	  std::vector<PSimHit>::const_iterator closest_simhit = matched.begin();
-	  
-	  for (std::vector<PSimHit>::const_iterator m = matched.begin(); m < matched.end(); m++) 
-	    {
-	      if ( checkType_ )
-		{
-		  int pid = (*m).particleType();
-		  if ( abs(pid) != genType_ )
-		    continue;
-		} 
-	      
-	      float simhitx = 0.5 * ( (*m).entryPoint().x() + (*m).exitPoint().x() );
-	      float simhity = 0.5 * ( (*m).entryPoint().y() + (*m).exitPoint().y() );
-	      
-	      float x_res = simhitx - rechitx;
-	      float y_res = simhity - rechity;
-		  
-	      float dist = sqrt( x_res*x_res + y_res*y_res );		  
-	      
-	      if ( dist < closest_dist ) 
-		{
-		  closest_dist = dist;
-		  closest_simhit = m;
-		  found_hit_from_generated_particle = true;
-		} 
-	    } // end sim hit loop
-	  
-	  // If this recHit does not have any simHit with the same particleType as the particles generated
-	  // ignore it as most probably comes from delta rays.
-	  if ( checkType_ && !found_hit_from_generated_particle )
-	    continue; 
-
-	  all_x1 = (*closest_simhit).entryPoint().x(); // width (row index, in col direction)
-	  all_y1 = (*closest_simhit).entryPoint().y(); // length (col index, in row direction) 
-	  all_z1 = (*closest_simhit).entryPoint().z(); 
-	  all_x2 = (*closest_simhit).exitPoint().x();
-	  all_y2 = (*closest_simhit).exitPoint().y();
-	  all_z2 = (*closest_simhit).exitPoint().z();
-	  GlobalPoint GP1 = 
-	    theGeomDet->surface().toGlobal( Local3DPoint( (*closest_simhit).entryPoint().x(),
-							  (*closest_simhit).entryPoint().y(),
-							  (*closest_simhit).entryPoint().z() ) );
-	  GlobalPoint GP2 = 
-	    theGeomDet->surface().toGlobal (Local3DPoint( (*closest_simhit).exitPoint().x(),
-							  (*closest_simhit).exitPoint().y(),
-							  (*closest_simhit).exitPoint().z() ) );
-	  all_gx1 = GP1.x();
-	  all_gx2 = GP2.x();
-	  all_gy1 = GP1.y();
-	  all_gy2 = GP2.y();
-	  all_gz1 = GP1.z();
-	  all_gz2 = GP2.z();
-	  
-	  MeasurementPoint mp1 =
-	    topol->measurementPosition( LocalPoint( (*closest_simhit).entryPoint().x(),
-						    (*closest_simhit).entryPoint().y(),
-						    (*closest_simhit).entryPoint().z() ) );
-	  MeasurementPoint mp2 =
-	    topol->measurementPosition( LocalPoint( (*closest_simhit).exitPoint().x(),
-						    (*closest_simhit).exitPoint().y(), 
-						    (*closest_simhit).exitPoint().z() ) );
-	  all_row1 = mp1.x();
-	  all_col1 = mp1.y();
-	  all_row2 = mp2.x();
-	  all_col2 = mp2.y();
-	  
-	  all_simhitx = 0.5*(all_x1+all_x2);  
-	  all_simhity = 0.5*(all_y1+all_y2);  
-	  
-	  all_rechitresx = all_rechitx - all_simhitx;
-	  all_rechitresy = all_rechity - all_simhity;
-
-	  all_rechitpullx = all_rechitresx / all_rechiterrx;
-	  all_rechitpully = all_rechitresy / all_rechiterry;
-	  
-	  SiPixelRecHit::ClusterRef const& clust = pixeliter->cluster();
-	  
-	  all_npix = clust->size();
-	  all_nxpix = clust->sizeX();
-	  all_nypix = clust->sizeY();
-
-	  all_clust_row = clust->x();
-	  all_clust_col = clust->y();
-	  
-	  LocalPoint lp2 = topol->localPosition( MeasurementPoint( all_clust_row, all_clust_col ) );
-	  all_clust_x = lp2.x();
-	  all_clust_y = lp2.y();
-
-	  all_clust_q = clust->charge();
-
-	  all_clust_maxpixcol = clust->maxPixelCol();
-	  all_clust_maxpixrow = clust->maxPixelRow();
-	  all_clust_minpixcol = clust->minPixelCol();
-	  all_clust_minpixrow = clust->minPixelRow();
-	  
-	  all_clust_geoid = 0;  // never set!
-  
-	  all_simpx  = (*closest_simhit).momentumAtEntry().x();
-	  all_simpy  = (*closest_simhit).momentumAtEntry().y();
-	  all_simpz  = (*closest_simhit).momentumAtEntry().z();
-	  all_eloss = (*closest_simhit).energyLoss();
-	  all_simphi   = (*closest_simhit).phiAtEntry();
-	  all_simtheta = (*closest_simhit).thetaAtEntry();
-	  all_pidhit = (*closest_simhit).particleType();
-	  all_trkid = (*closest_simhit).trackId();
-	  
-	  //--- Fill alpha and beta -- more useful for exploring the residuals...
-	  all_beta  = atan2(all_simpz, all_simpy);
-	  all_alpha = atan2(all_simpz, all_simpx);
-	  
-	  all_simproc = (int)closest_simhit->processType();
-	  
-	  const edm::SimTrackContainer& trks = *(simtracks.product());
-	  SimTrackContainer::const_iterator trksiter;
-	  for (trksiter = trks.begin(); trksiter != trks.end(); trksiter++) 
-	    if ( (int)trksiter->trackId() == all_trkid ) 
-	      {
-		all_simtrketa = trksiter->momentum().eta();
-		all_simtrkphi = trksiter->momentum().phi();
-	      }
-	  
-	  all_vtxz = theGeomDet->surface().position().z();
-	  all_vtxr = theGeomDet->surface().position().perp();
-	  
-	  //computeAnglesFromDetPosition(clust, 
-	  //		       theGeomDet, 
-	  //		       all_clust_alpha, all_clust_beta )
-
-	  const std::vector<SiPixelCluster::Pixel>& pixvector = clust->pixels();
-	  for ( int i=0;  i<(int)pixvector.size(); ++i)
-	    {
-	      SiPixelCluster::Pixel holdpix = pixvector[i];
-	      all_pixrow[i] = holdpix.x;
-	      all_pixcol[i] = holdpix.y;
-	      all_pixadc[i] = holdpix.adc;
-	      LocalPoint lp = topol->localPosition(MeasurementPoint(holdpix.x, holdpix.y));
-	      all_pixx[i] = lp.x();
-	      all_pixy[i]= lp.y();
-	      GlobalPoint GP =  theGeomDet->surface().toGlobal(Local3DPoint(lp.x(),lp.y(),lp.z()));
-	      all_pixgx[i] = GP.x();	
-	      all_pixgy[i]= GP.y();
-	      all_pixgz[i]= GP.z();
-	    }
+  //cout << "...3..." << endl;
 
-	  ttree_all_hits_->Fill();
-	  
-	} // for ( ; pixeliter != pixelrechitRangeIteratorEnd; ++pixeliter)
+  // ------------------------------------------------ track hits only --------------------------------------------------------
+
+  if (include_trk_hits_) {
+    // Get tracks
+    edm::Handle<reco::TrackCollection> trackCollection;
+    e.getByToken(tTrackCollection, trackCollection);
+    const reco::TrackCollection* tracks = trackCollection.product();
+    reco::TrackCollection::const_iterator tciter;
+
+    if (!tracks->empty()) {
+      // Loop on tracks
+      for (tciter = tracks->begin(); tciter != tracks->end(); ++tciter) {
+        // First loop on hits: find matched hits
+        for (auto const hit : tciter->recHits()) {
+          // Is it a matched hit?
+          const SiPixelRecHit* matchedhit = dynamic_cast<const SiPixelRecHit*>(hit);
+
+          if (matchedhit) {
+            rechitx = -9999.9;
+            rechity = -9999.9;
+            rechitz = -9999.9;
+            rechiterrx = -9999.9;
+            rechiterry = -9999.9;
+            rechitresx = -9999.9;
+            rechitresy = -9999.9;
+            rechitpullx = -9999.9;
+            rechitpully = -9999.9;
+
+            npix = -9999;
+            nxpix = -9999;
+            nypix = -9999;
+            charge = -9999.9;
+
+            edgex = -9999;
+            edgey = -9999;
+
+            bigx = -9999;
+            bigy = -9999;
+
+            alpha = -9999.9;
+            beta = -9999.9;
+
+            phi = -9999.9;
+            eta = -9999.9;
+
+            subdetId = -9999;
+
+            layer = -9999;
+            ladder = -9999;
+            mod = -9999;
+            side = -9999;
+            disk = -9999;
+            blade = -9999;
+            panel = -9999;
+            plaq = -9999;
+
+            half = -9999;
+            flipped = -9999;
+
+            nsimhit = -9999;
+            pidhit = -9999;
+            simproc = -9999;
+
+            simhitx = -9999.9;
+            simhity = -9999.9;
+
+            hit_probx = -9999.9;
+            hit_proby = -9999.9;
+            hit_cprob0 = -9999.9;
+            hit_cprob1 = -9999.9;
+            hit_cprob2 = -9999.9;
+
+            pixel_split = -9999;
+
+            pixel_clst_err_x = -9999.9;
+            pixel_clst_err_y = -9999.9;
+
+            position = hit->localPosition();
+            error = hit->localPositionError();
+
+            rechitx = position.x();
+            rechity = position.y();
+            rechitz = position.z();
+            rechiterrx = sqrt(error.xx());
+            rechiterry = sqrt(error.yy());
+
+            npix = matchedhit->cluster()->size();
+            nxpix = matchedhit->cluster()->sizeX();
+            nypix = matchedhit->cluster()->sizeY();
+            charge = matchedhit->cluster()->charge();
+
+            if (matchedhit->cluster()->getSplitClusterErrorX() > 0.0 &&
+                matchedhit->cluster()->getSplitClusterErrorY() > 0.0)
+              pixel_split = 1;
+            else
+              pixel_split = 0;
+
+            pixel_clst_err_x = matchedhit->cluster()->getSplitClusterErrorX();
+            pixel_clst_err_y = matchedhit->cluster()->getSplitClusterErrorY();
+
+            //hit_probx  = (float)matchedhit->probabilityX();
+            //hit_proby  = (float)matchedhit->probabilityY();
+            hit_cprob0 = (float)matchedhit->clusterProbability(0);
+            hit_cprob1 = (float)matchedhit->clusterProbability(1);
+            hit_cprob2 = (float)matchedhit->clusterProbability(2);
+
+            //Association of the rechit to the simhit
+            matched.clear();
+            matched = associate.associateHit(*matchedhit);
+
+            nsimhit = (int)matched.size();
+
+            if (!matched.empty()) {
+              mindist = 999999.9;
+              float distx, disty, dist;
+              bool found_hit_from_generated_particle = false;
+
+              int n_assoc_muon = 0;
+
+              vector<PSimHit>::const_iterator closestit = matched.begin();
+              for (vector<PSimHit>::const_iterator m = matched.begin(); m < matched.end(); ++m) {
+                if (checkType_) {  // only consider associated simhits with the generated pid (muons)
+                  int pid = (*m).particleType();
+                  if (abs(pid) != genType_)
+                    continue;
+                }
+
+                float simhitx = 0.5 * ((*m).entryPoint().x() + (*m).exitPoint().x());
+                float simhity = 0.5 * ((*m).entryPoint().y() + (*m).exitPoint().y());
+
+                distx = fabs(rechitx - simhitx);
+                disty = fabs(rechity - simhity);
+                dist = sqrt(distx * distx + disty * disty);
+
+                if (dist < mindist) {
+                  n_assoc_muon++;
+
+                  mindist = dist;
+                  closestit = m;
+                  found_hit_from_generated_particle = true;
+                }
+              }  // for (vector<PSimHit>::const_iterator m=matched.begin(); m<matched.end(); m++)
+
+              // This recHit does not have any simHit with the same particleType as the particles generated
+              // Ignore it as most probably come from delta rays.
+              if (checkType_ && !found_hit_from_generated_particle)
+                continue;
+
+              //if ( n_assoc_muon > 1 )
+              //{
+              //  // cout << " ----- This is not good: n_assoc_muon = " << n_assoc_muon << endl;
+              //  // cout << "evt = " << evt << endl;
+              //}
+
+              DetId detId = hit->geographicalId();
+
+              const PixelGeomDetUnit* theGeomDet = dynamic_cast<const PixelGeomDetUnit*>((*tracker).idToDet(detId));
+
+              const PixelTopology* theTopol = &(theGeomDet->specificTopology());
+
+              pidhit = (*closestit).particleType();
+              simproc = (int)(*closestit).processType();
+
+              simhitx = 0.5 * ((*closestit).entryPoint().x() + (*closestit).exitPoint().x());
+              simhity = 0.5 * ((*closestit).entryPoint().y() + (*closestit).exitPoint().y());
+
+              rechitresx = rechitx - simhitx;
+              rechitresy = rechity - simhity;
+              rechitpullx = (rechitx - simhitx) / sqrt(error.xx());
+              rechitpully = (rechity - simhity) / sqrt(error.yy());
+
+              float simhitpx = (*closestit).momentumAtEntry().x();
+              float simhitpy = (*closestit).momentumAtEntry().y();
+              float simhitpz = (*closestit).momentumAtEntry().z();
+
+              beta = atan2(simhitpz, simhitpy) * radtodeg;
+              alpha = atan2(simhitpz, simhitpx) * radtodeg;
+
+              //beta  = fabs(atan2(simhitpz, simhitpy)) * radtodeg;
+              //alpha = fabs(atan2(simhitpz, simhitpx)) * radtodeg;
+
+              // calculate alpha and beta exactly as in PixelCPEBase.cc
+              float locx = simhitpx;
+              float locy = simhitpy;
+              float locz = simhitpz;
 
-    } // for (TrackerGeometry::DetContainer::const_iterator it = pDD->dets().begin(); it != pDD->dets().end(); it++) 
- 
-  // ------------------------------------------------ all hits ---------------------------------------------------------------
+              bool isFlipped = false;
+              float tmp1 = theGeomDet->surface().toGlobal(Local3DPoint(0., 0., 0.)).perp();
+              float tmp2 = theGeomDet->surface().toGlobal(Local3DPoint(0., 0., 1.)).perp();
+              if (tmp2 < tmp1)
+                isFlipped = true;
+              else
+                isFlipped = false;
 
+              trk_alpha = acos(locx / sqrt(locx * locx + locz * locz)) * radtodeg;
+              if (isFlipped)  // &&& check for FPIX !!!
+                trk_alpha = 180.0 - trk_alpha;
 
-  //cout << "...3..." << endl;
+              trk_beta = acos(locy / sqrt(locy * locy + locz * locz)) * radtodeg;
 
+              phi = tciter->momentum().phi() / math_pi * 180.0;
+              eta = tciter->momentum().eta();
 
-  // ------------------------------------------------ track hits only -------------------------------------------------------- 
-
-  
-  
-  if ( include_trk_hits_ )
-    {
-      // Get tracks
-      edm::Handle<reco::TrackCollection> trackCollection;
-      e.getByToken(tTrackCollection, trackCollection);
-      const reco::TrackCollection *tracks = trackCollection.product();
-      reco::TrackCollection::const_iterator tciter;
-      
-      if ( !tracks->empty() )
-	{
-	  // Loop on tracks
-	  for ( tciter=tracks->begin(); tciter!=tracks->end(); ++tciter)
-	    {
-	      // First loop on hits: find matched hits
-          for(auto const hit : tciter->recHits())
-		{
-		  // Is it a matched hit?
-		  const SiPixelRecHit* matchedhit = dynamic_cast<const SiPixelRecHit*>(hit);
-		  
-		  if ( matchedhit ) 
-		    {
-		      rechitx = -9999.9;
-		      rechity = -9999.9;
-		      rechitz = -9999.9;
-		      rechiterrx = -9999.9;
-		      rechiterry = -9999.9;		      
-		      rechitresx = -9999.9;
-		      rechitresy = -9999.9;
-		      rechitpullx = -9999.9;
-		      rechitpully = -9999.9;
-		      
-		      npix = -9999;
-		      nxpix = -9999;
-		      nypix = -9999;
-		      charge = -9999.9;
-		      
-		      edgex = -9999;
-		      edgey = -9999;
-		      
-		      bigx = -9999;
-		      bigy = -9999;
-		      
-		      alpha = -9999.9;
-		      beta  = -9999.9;
-		      
-		      phi = -9999.9;
-		      eta = -9999.9;
-		      
-		      subdetId = -9999;
-		      
-		      layer  = -9999; 
-		      ladder = -9999; 
-		      mod    = -9999; 
-		      side   = -9999;  
-		      disk   = -9999;  
-		      blade  = -9999; 
-		      panel  = -9999; 
-		      plaq   = -9999; 
-		      
-		      half = -9999;
-		      flipped = -9999;
-		      
-		      nsimhit = -9999;
-		      pidhit  = -9999;
-		      simproc = -9999;
-		      
-		      simhitx = -9999.9;
-		      simhity = -9999.9;
-
-		      hit_probx = -9999.9;
-		      hit_proby = -9999.9;
-		      hit_cprob0 = -9999.9;
-		      hit_cprob1 = -9999.9;
-		      hit_cprob2 = -9999.9;
-  
-		      pixel_split = -9999;
-
-		      pixel_clst_err_x = -9999.9;
-		      pixel_clst_err_y = -9999.9;
-		      
-		      position = hit->localPosition();
-		      error = hit->localPositionError();
-		      
-		      rechitx = position.x();
-		      rechity = position.y();
-		      rechitz = position.z();
-		      rechiterrx = sqrt(error.xx());
-		      rechiterry = sqrt(error.yy());
-		      
-		      npix = matchedhit->cluster()->size();
-		      nxpix = matchedhit->cluster()->sizeX();
-		      nypix = matchedhit->cluster()->sizeY();
-		      charge = matchedhit->cluster()->charge();
-
-		      if ( matchedhit->cluster()->getSplitClusterErrorX() > 0.0 && 
-			   matchedhit->cluster()->getSplitClusterErrorY() > 0.0 )
-			pixel_split = 1;
-		      else
-			pixel_split = 0;
-		      
-		      pixel_clst_err_x = matchedhit->cluster()->getSplitClusterErrorX();
-		      pixel_clst_err_y = matchedhit->cluster()->getSplitClusterErrorY();
-
-		      //hit_probx  = (float)matchedhit->probabilityX();
-		      //hit_proby  = (float)matchedhit->probabilityY();
-		      hit_cprob0 = (float)matchedhit->clusterProbability(0);
-		      hit_cprob1 = (float)matchedhit->clusterProbability(1);
-		      hit_cprob2 = (float)matchedhit->clusterProbability(2);
-		      
-		      
-		      //Association of the rechit to the simhit
-		      matched.clear();
-		      matched = associate.associateHit(*matchedhit);
-		      
-		      nsimhit = (int)matched.size();
-		      
-		      if ( !matched.empty() ) 
-			{
-			  mindist = 999999.9;
-			  float distx, disty, dist;
-			  bool found_hit_from_generated_particle = false;
-			  
-			  int n_assoc_muon = 0;
-			  
-			  vector<PSimHit>::const_iterator closestit = matched.begin();
-			  for (vector<PSimHit>::const_iterator m=matched.begin(); m<matched.end(); ++m)
-			    {
-			      if ( checkType_ )
-				{ // only consider associated simhits with the generated pid (muons)
-				  int pid = (*m).particleType();
-				  if ( abs(pid) != genType_ )
-				    continue;
-				}
-			      
-			      float simhitx = 0.5 * ( (*m).entryPoint().x() + (*m).exitPoint().x() );
-			      float simhity = 0.5 * ( (*m).entryPoint().y() + (*m).exitPoint().y() );
-			      
-			      distx = fabs(rechitx - simhitx);
-			      disty = fabs(rechity - simhity);
-			      dist = sqrt( distx*distx + disty*disty );
-			      
-			      if ( dist < mindist )
-				{
-				  n_assoc_muon++;
-				  
-				  mindist = dist;
-				  closestit = m;
-				  found_hit_from_generated_particle = true;
-				}
-			    } // for (vector<PSimHit>::const_iterator m=matched.begin(); m<matched.end(); m++)
-			  
-			  // This recHit does not have any simHit with the same particleType as the particles generated
-			  // Ignore it as most probably come from delta rays.
-			  if ( checkType_ && !found_hit_from_generated_particle )
-			    continue; 
-			  
-			  //if ( n_assoc_muon > 1 )
-			  //{
-			  //  // cout << " ----- This is not good: n_assoc_muon = " << n_assoc_muon << endl;
-			  //  // cout << "evt = " << evt << endl;
-			  //}
-			  
-			  DetId detId = hit->geographicalId();
-
-			  const PixelGeomDetUnit* theGeomDet =
-			    dynamic_cast<const PixelGeomDetUnit*> ((*tracker).idToDet(detId) );
-			  
-			  const PixelTopology* theTopol = &(theGeomDet->specificTopology());
-
-			  pidhit = (*closestit).particleType();
-			  simproc = (int)(*closestit).processType();
-			  
-			  simhitx = 0.5*( (*closestit).entryPoint().x() + (*closestit).exitPoint().x() );
-			  simhity = 0.5*( (*closestit).entryPoint().y() + (*closestit).exitPoint().y() );
-			  
-			  rechitresx = rechitx - simhitx;
-			  rechitresy = rechity - simhity;
-			  rechitpullx = ( rechitx - simhitx ) / sqrt(error.xx());
-			  rechitpully = ( rechity - simhity ) / sqrt(error.yy());
-			  
-			  float simhitpx = (*closestit).momentumAtEntry().x();
-			  float simhitpy = (*closestit).momentumAtEntry().y();
-			  float simhitpz = (*closestit).momentumAtEntry().z();
-			  
-			  beta = atan2(simhitpz, simhitpy) * radtodeg;
-			  alpha = atan2(simhitpz, simhitpx) * radtodeg;
-			  
-			  //beta  = fabs(atan2(simhitpz, simhitpy)) * radtodeg;
-			  //alpha = fabs(atan2(simhitpz, simhitpx)) * radtodeg;
-
-			  // calculate alpha and beta exactly as in PixelCPEBase.cc
-			  float locx = simhitpx;
-			  float locy = simhitpy;
-			  float locz = simhitpz;
-			  
-			  bool isFlipped = false;
-			  float tmp1 = theGeomDet->surface().toGlobal(Local3DPoint(0.,0.,0.)).perp();
-			  float tmp2 = theGeomDet->surface().toGlobal(Local3DPoint(0.,0.,1.)).perp();
-			  if ( tmp2<tmp1 ) 
-			    isFlipped = true;
-			  else 
-			    isFlipped = false;    
-
-			  trk_alpha = acos(locx/sqrt(locx*locx+locz*locz)) * radtodeg;
-			  if ( isFlipped )                    // &&& check for FPIX !!!
-			    trk_alpha = 180.0 - trk_alpha ;
-			  
-			  trk_beta = acos(locy/sqrt(locy*locy+locz*locz)) * radtodeg;
-			  
-
-			  phi = tciter->momentum().phi() / math_pi*180.0;
-			  eta = tciter->momentum().eta();
-			  
-			  const int maxPixelCol = (*matchedhit).cluster()->maxPixelCol();
-			  const int maxPixelRow = (*matchedhit).cluster()->maxPixelRow();
-			  const int minPixelCol = (*matchedhit).cluster()->minPixelCol();
-			  const int minPixelRow = (*matchedhit).cluster()->minPixelRow();
-					  
-			  // check whether the cluster is at the module edge 
-			  if ( theTopol->isItEdgePixelInX( minPixelRow ) || 
-			       theTopol->isItEdgePixelInX( maxPixelRow ) )
-			    edgex = 1;
-			  else 
-			    edgex = 0;
-			  
-			  if ( theTopol->isItEdgePixelInY( minPixelCol ) || 
-			       theTopol->isItEdgePixelInY( maxPixelCol ) )
-			    edgey = 1;
-			  else 
-			    edgey = 0;
-			  
-			  // check whether this rechit contains big pixels
-			  if ( theTopol->containsBigPixelInX(minPixelRow, maxPixelRow) )
-			    bigx = 1;
-			  else 
-			    bigx = 0;
-			  
-			  if ( theTopol->containsBigPixelInY(minPixelCol, maxPixelCol) )
-			    bigy = 1;
-			  else 
-			    bigy = 0;
-			  
-			  subdetId = (int)detId.subdetId();
-			  
-			  if ( (int)detId.subdetId() == (int)PixelSubdetector::PixelBarrel ) 
-			    { 
-	  
-			      int tmp_nrows = theGeomDet->specificTopology().nrows();
-			      if ( tmp_nrows == 80 ) 
-				half = 1;
-			      else if ( tmp_nrows == 160 ) 
-				half = 0;
-			      else 
-				cout << "-------------------------------------------------- Wrong module size !!!" << endl;
-			      
-			      float tmp1 = theGeomDet->surface().toGlobal(Local3DPoint(0.,0.,0.)).perp();
-			      float tmp2 = theGeomDet->surface().toGlobal(Local3DPoint(0.,0.,1.)).perp();
-			      
-			      if ( tmp2<tmp1 ) 
-				flipped = 1;
-			      else 
-				flipped = 0;
-			      
-			      
-			      layer  = tTopo->pxbLayer(detId);   // Layer: 1,2,3.
-			      ladder = tTopo->pxbLadder(detId);  // Ladder: 1-20, 32, 44. 
-			      mod   = tTopo->pxbModule(detId);  // Mod: 1-8.
-			    }			  
-			  else if ( (int)detId.subdetId() == (int)PixelSubdetector::PixelEndcap )
-			    {
-			      
-			      side  = tTopo->pxfSide(detId);
-			      disk  = tTopo->pxfDisk(detId);
-			      blade = tTopo->pxfBlade(detId);
-			      panel = tTopo->pxfPanel(detId);
-			      plaq  = tTopo->pxfModule(detId); // also known as plaquette
-			      
-			      float tmp1 = theGeomDet->surface().toGlobal(Local3DPoint(0.,0.,0.)).perp();
-			      float tmp2 = theGeomDet->surface().toGlobal(Local3DPoint(0.,0.,1.)).perp();
-			      
-			      if ( tmp2<tmp1 ) 
-				flipped = 1;
-			      else 
-				flipped = 0;
-			      
-			    } // else if ( detId.subdetId()==PixelSubdetector::PixelEndcap )
-			  //else std::// cout << "We are not in the pixel detector. detId.subdetId() = " << (int)detId.subdetId() << endl;
-			  
-			  ttree_track_hits_->Fill();
-			  
-			} // if ( !matched.empty() )
-		      else
-			cout << "---------------- RecHit with no associated SimHit !!! -------------------------- " << endl;
-		      
-		    } // if ( matchedhit )
-		  
-		} // end of loop on hits
-	      
-	    } //end of loop on track 
-      
-	} // tracks > 0.
-     
-    } // if ( include_trk_hits_ )
-
- 
+              const int maxPixelCol = (*matchedhit).cluster()->maxPixelCol();
+              const int maxPixelRow = (*matchedhit).cluster()->maxPixelRow();
+              const int minPixelCol = (*matchedhit).cluster()->minPixelCol();
+              const int minPixelRow = (*matchedhit).cluster()->minPixelRow();
+
+              // check whether the cluster is at the module edge
+              if (theTopol->isItEdgePixelInX(minPixelRow) || theTopol->isItEdgePixelInX(maxPixelRow))
+                edgex = 1;
+              else
+                edgex = 0;
+
+              if (theTopol->isItEdgePixelInY(minPixelCol) || theTopol->isItEdgePixelInY(maxPixelCol))
+                edgey = 1;
+              else
+                edgey = 0;
+
+              // check whether this rechit contains big pixels
+              if (theTopol->containsBigPixelInX(minPixelRow, maxPixelRow))
+                bigx = 1;
+              else
+                bigx = 0;
+
+              if (theTopol->containsBigPixelInY(minPixelCol, maxPixelCol))
+                bigy = 1;
+              else
+                bigy = 0;
+
+              subdetId = (int)detId.subdetId();
+
+              if ((int)detId.subdetId() == (int)PixelSubdetector::PixelBarrel) {
+                int tmp_nrows = theGeomDet->specificTopology().nrows();
+                if (tmp_nrows == 80)
+                  half = 1;
+                else if (tmp_nrows == 160)
+                  half = 0;
+                else
+                  cout << "-------------------------------------------------- Wrong module size !!!" << endl;
+
+                float tmp1 = theGeomDet->surface().toGlobal(Local3DPoint(0., 0., 0.)).perp();
+                float tmp2 = theGeomDet->surface().toGlobal(Local3DPoint(0., 0., 1.)).perp();
+
+                if (tmp2 < tmp1)
+                  flipped = 1;
+                else
+                  flipped = 0;
+
+                layer = tTopo->pxbLayer(detId);    // Layer: 1,2,3.
+                ladder = tTopo->pxbLadder(detId);  // Ladder: 1-20, 32, 44.
+                mod = tTopo->pxbModule(detId);     // Mod: 1-8.
+              } else if ((int)detId.subdetId() == (int)PixelSubdetector::PixelEndcap) {
+                side = tTopo->pxfSide(detId);
+                disk = tTopo->pxfDisk(detId);
+                blade = tTopo->pxfBlade(detId);
+                panel = tTopo->pxfPanel(detId);
+                plaq = tTopo->pxfModule(detId);  // also known as plaquette
+
+                float tmp1 = theGeomDet->surface().toGlobal(Local3DPoint(0., 0., 0.)).perp();
+                float tmp2 = theGeomDet->surface().toGlobal(Local3DPoint(0., 0., 1.)).perp();
+
+                if (tmp2 < tmp1)
+                  flipped = 1;
+                else
+                  flipped = 0;
+
+              }  // else if ( detId.subdetId()==PixelSubdetector::PixelEndcap )
+              //else std::// cout << "We are not in the pixel detector. detId.subdetId() = " << (int)detId.subdetId() << endl;
+
+              ttree_track_hits_->Fill();
+
+            }  // if ( !matched.empty() )
+            else
+              cout << "---------------- RecHit with no associated SimHit !!! -------------------------- " << endl;
+
+          }  // if ( matchedhit )
+
+        }  // end of loop on hits
+
+      }  //end of loop on track
+
+    }  // tracks > 0.
+
+  }  // if ( include_trk_hits_ )
 
   // ----------------------------------------------- track hits only -----------------------------------------------------------
-  
 }
 
-void SiPixelErrorEstimation::
-computeAnglesFromDetPosition(const SiPixelCluster & cl, 
-			     const GeomDetUnit    & det, 
-			     float& alpha, float& beta )
-{
+void SiPixelErrorEstimation::computeAnglesFromDetPosition(const SiPixelCluster& cl,
+                                                          const GeomDetUnit& det,
+                                                          float& alpha,
+                                                          float& beta) {
   //--- This is a new det unit, so cache it
-  const PixelGeomDetUnit* theDet = dynamic_cast<const PixelGeomDetUnit*>( &det );
-  if (! theDet) 
-    {
-      cout << "---------------------------------------------- Not a pixel detector !!!!!!!!!!!!!!" << endl;
-      assert(0);
-    }
+  const PixelGeomDetUnit* theDet = dynamic_cast<const PixelGeomDetUnit*>(&det);
+  if (!theDet) {
+    cout << "---------------------------------------------- Not a pixel detector !!!!!!!!!!!!!!" << endl;
+    assert(0);
+  }
 
   const PixelTopology* theTopol = &(theDet->specificTopology());
 
   // get cluster center of gravity (of charge)
   float xcenter = cl.x();
   float ycenter = cl.y();
-  
-  // get the cluster position in local coordinates (cm) 
-  LocalPoint lp = theTopol->localPosition( MeasurementPoint(xcenter, ycenter) );
+
+  // get the cluster position in local coordinates (cm)
+  LocalPoint lp = theTopol->localPosition(MeasurementPoint(xcenter, ycenter));
   //float lp_mod = sqrt( lp.x()*lp.x() + lp.y()*lp.y() + lp.z()*lp.z() );
 
   // get the cluster position in global coordinates (cm)
-  GlobalPoint gp = theDet->surface().toGlobal( lp );
-  float gp_mod = sqrt( gp.x()*gp.x() + gp.y()*gp.y() + gp.z()*gp.z() );
+  GlobalPoint gp = theDet->surface().toGlobal(lp);
+  float gp_mod = sqrt(gp.x() * gp.x() + gp.y() * gp.y() + gp.z() * gp.z());
 
   // normalize
-  float gpx = gp.x()/gp_mod;
-  float gpy = gp.y()/gp_mod;
-  float gpz = gp.z()/gp_mod;
+  float gpx = gp.x() / gp_mod;
+  float gpy = gp.y() / gp_mod;
+  float gpz = gp.z() / gp_mod;
 
-  // make a global vector out of the global point; this vector will point from the 
+  // make a global vector out of the global point; this vector will point from the
   // origin of the detector to the cluster
   GlobalVector gv(gpx, gpy, gpz);
 
@@ -1707,30 +1570,30 @@ computeAnglesFromDetPosition(const SiPixelCluster & cl,
   const Local3DVector lvx(1.0, 0.0, 0.0);
 
   // get the unit X vector in global coordinates/
-  GlobalVector gvx = theDet->surface().toGlobal( lvx );
+  GlobalVector gvx = theDet->surface().toGlobal(lvx);
 
   // make local unit vector along local Y axis
   const Local3DVector lvy(0.0, 1.0, 0.0);
 
   // get the unit Y vector in global coordinates
-  GlobalVector gvy = theDet->surface().toGlobal( lvy );
-   
+  GlobalVector gvy = theDet->surface().toGlobal(lvy);
+
   // make local unit vector along local Z axis
   const Local3DVector lvz(0.0, 0.0, 1.0);
 
   // get the unit Z vector in global coordinates
-  GlobalVector gvz = theDet->surface().toGlobal( lvz );
-    
-  // calculate the components of gv (the unit vector pointing to the cluster) 
+  GlobalVector gvz = theDet->surface().toGlobal(lvz);
+
+  // calculate the components of gv (the unit vector pointing to the cluster)
   // in the local coordinate system given by the basis {gvx, gvy, gvz}
   // note that both gv and the basis {gvx, gvy, gvz} are given in global coordinates
-  float gv_dot_gvx = gv.x()*gvx.x() + gv.y()*gvx.y() + gv.z()*gvx.z();
-  float gv_dot_gvy = gv.x()*gvy.x() + gv.y()*gvy.y() + gv.z()*gvy.z();
-  float gv_dot_gvz = gv.x()*gvz.x() + gv.y()*gvz.y() + gv.z()*gvz.z();
+  float gv_dot_gvx = gv.x() * gvx.x() + gv.y() * gvx.y() + gv.z() * gvx.z();
+  float gv_dot_gvy = gv.x() * gvy.x() + gv.y() * gvy.y() + gv.z() * gvy.z();
+  float gv_dot_gvz = gv.x() * gvz.x() + gv.y() * gvz.y() + gv.z() * gvz.z();
 
   // calculate angles
-  alpha = atan2( gv_dot_gvz, gv_dot_gvx );
-  beta  = atan2( gv_dot_gvz, gv_dot_gvy );
+  alpha = atan2(gv_dot_gvz, gv_dot_gvx);
+  beta = atan2(gv_dot_gvz, gv_dot_gvy);
 
   // calculate cotalpha and cotbeta
   //   cotalpha_ = 1.0/tan(alpha_);
diff --git a/CalibTracker/SiPixelGainCalibration/plugins/SiPixelCalibDigiProducer.cc b/CalibTracker/SiPixelGainCalibration/plugins/SiPixelCalibDigiProducer.cc
index e9f7f48fb17cd..b8fef9d76991a 100644
--- a/CalibTracker/SiPixelGainCalibration/plugins/SiPixelCalibDigiProducer.cc
+++ b/CalibTracker/SiPixelGainCalibration/plugins/SiPixelCalibDigiProducer.cc
@@ -2,7 +2,7 @@
 //
 // Package:    SiPixelCalibDigiProducer
 // Class:      SiPixelCalibDigiProducer
-// 
+//
 /**\class SiPixelCalibDigiProducer SiPixelCalibDigiProducer.cc CalibTracker/SiPixelCalibDigiProducer/src/SiPixelCalibDigiProducer.cc
 
  Description: <one line class summary>
@@ -16,18 +16,12 @@
 //
 //
 
-
 // system include files
 
 // user include files
 #include "FWCore/Framework/interface/EventSetup.h"
 
-
-
-
-
-
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" 
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 
 #include "DataFormats/SiPixelDigi/interface/SiPixelCalibDigiError.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h"
@@ -43,7 +37,6 @@
 // constants, enums and typedefs
 //
 
-
 //
 // static data member definitions
 //
@@ -51,52 +44,43 @@
 //
 // constructors and destructor
 //
-SiPixelCalibDigiProducer::SiPixelCalibDigiProducer(const edm::ParameterSet& iConfig):
-  src_(iConfig.getParameter<edm::InputTag>("src")),
-  iEventCounter_(0),
-  ignore_non_pattern_(iConfig.getParameter<bool>("ignoreNonPattern")),
-  control_pattern_size_(iConfig.getParameter<bool>("checkPatternEachEvent")),
-  includeErrors_(iConfig.getUntrackedParameter<bool>("includeErrors",false)),
-  errorType(iConfig.getUntrackedParameter<int>("errorTypeNumber",1)),
-  conf_(iConfig),
-  number_of_pixels_per_pattern_(0),
-  use_realeventnumber_(iConfig.getParameter<bool>("useRealEventNumber"))
+SiPixelCalibDigiProducer::SiPixelCalibDigiProducer(const edm::ParameterSet& iConfig)
+    : src_(iConfig.getParameter<edm::InputTag>("src")),
+      iEventCounter_(0),
+      ignore_non_pattern_(iConfig.getParameter<bool>("ignoreNonPattern")),
+      control_pattern_size_(iConfig.getParameter<bool>("checkPatternEachEvent")),
+      includeErrors_(iConfig.getUntrackedParameter<bool>("includeErrors", false)),
+      errorType(iConfig.getUntrackedParameter<int>("errorTypeNumber", 1)),
+      conf_(iConfig),
+      number_of_pixels_per_pattern_(0),
+      use_realeventnumber_(iConfig.getParameter<bool>("useRealEventNumber"))
 
 {
-  tPixelDigi = consumes<edm::DetSetVector<PixelDigi>> (src_);
-   //register your products
-  produces< edm::DetSetVector<SiPixelCalibDigi> >();
-  if(includeErrors_)
-    produces< edm::DetSetVector<SiPixelCalibDigiError> > ();
-
+  tPixelDigi = consumes<edm::DetSetVector<PixelDigi>>(src_);
+  //register your products
+  produces<edm::DetSetVector<SiPixelCalibDigi>>();
+  if (includeErrors_)
+    produces<edm::DetSetVector<SiPixelCalibDigiError>>();
 }
 
-
-SiPixelCalibDigiProducer::~SiPixelCalibDigiProducer()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+SiPixelCalibDigiProducer::~SiPixelCalibDigiProducer() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 /////////////////////////////////////////////
 // function description:
-// this function checks where/when the pattern changes so that one can fill the data from the temporary container into the event 
-bool 
-SiPixelCalibDigiProducer::store()
-{
+// this function checks where/when the pattern changes so that one can fill the data from the temporary container into the event
+bool SiPixelCalibDigiProducer::store() {
   //  std::cout << "in store() " << std::endl;
-  if(iEventCounter_%pattern_repeat_==0){
+  if (iEventCounter_ % pattern_repeat_ == 0) {
     //    std::cout << "now at event " << iEventCounter_ <<" where we save the calibration information into the CMSSW digi";
     return true;
-  }
-  else if(iEventCounter_==calib_->expectedTotalEvents())
+  } else if (iEventCounter_ == calib_->expectedTotalEvents())
     return true;
   else
     return false;
@@ -105,43 +89,42 @@ SiPixelCalibDigiProducer::store()
 ////////////////////////////////////////////////////////////////////
 // function description:
 // fill function, uses maps to keep track of which pixel is where in the local storage container. Called every event to fill and compress the digi data into calibdig format
-void
-SiPixelCalibDigiProducer::fill(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-
+void SiPixelCalibDigiProducer::fill(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   // figure out which calibration point we're on now..
   short icalibpoint = calib_->vcalIndexForEvent(iEventCounter_);
-  edm::Handle< edm::DetSetVector<PixelDigi> > pixelDigis;
-  iEvent.getByToken( tPixelDigi, pixelDigis );
-  
-  edm::LogInfo("SiPixelCalibProducer") << "in fill(), calibpoint " << icalibpoint <<" ndigis " << pixelDigis->size() <<  std::endl;
-    // loop over the data and store things
+  edm::Handle<edm::DetSetVector<PixelDigi>> pixelDigis;
+  iEvent.getByToken(tPixelDigi, pixelDigis);
+
+  edm::LogInfo("SiPixelCalibProducer") << "in fill(), calibpoint " << icalibpoint << " ndigis " << pixelDigis->size()
+                                       << std::endl;
+  // loop over the data and store things
   edm::DetSetVector<PixelDigi>::const_iterator digiIter;
-  for(digiIter=pixelDigis->begin(); digiIter!=pixelDigis->end(); ++digiIter){// ITERATOR OVER DET IDs
+  for (digiIter = pixelDigis->begin(); digiIter != pixelDigis->end(); ++digiIter) {  // ITERATOR OVER DET IDs
     uint32_t detid = digiIter->id;
-    edm::DetSet<PixelDigi>::const_iterator ipix; // ITERATOR OVER DIGI DATA  
+    edm::DetSet<PixelDigi>::const_iterator ipix;  // ITERATOR OVER DIGI DATA
 
-    for(ipix = digiIter->data.begin(); ipix!=digiIter->end(); ++ipix){
+    for (ipix = digiIter->data.begin(); ipix != digiIter->end(); ++ipix) {
       // fill in the appropriate location of the temporary data container
-      fillPixel(detid,ipix->row(),ipix->column(),icalibpoint,ipix->adc());
+      fillPixel(detid, ipix->row(), ipix->column(), icalibpoint, ipix->adc());
     }
   }
 }
 ////////////////////////////////////////////////////
 // function description:
-// this is the function where we check the cabling map and see if we can assign a fed id to the det ID. 
+// this is the function where we check the cabling map and see if we can assign a fed id to the det ID.
 // returns false if no fed <-> detid association was found
-bool SiPixelCalibDigiProducer::checkFED(uint32_t detid){
+bool SiPixelCalibDigiProducer::checkFED(uint32_t detid) {
   //  edm::LogInfo("SiPixelCalibProducer") << "in checkFED" << std::endl;
 
-  if(detid_to_fedid_[detid])
+  if (detid_to_fedid_[detid])
     return true;
-  for(int fedid=0; fedid<=40; ++fedid){
+  for (int fedid = 0; fedid <= 40; ++fedid) {
     //    edm::LogInfo("SiPixelCalibProducer") << " looking at fedid " << fedid << std::endl;
-    SiPixelFrameConverter converter(theCablingMap_.product(),fedid);
-    if(converter.hasDetUnit(detid)){
-      detid_to_fedid_[detid]=fedid;
-      edm::LogInfo("SiPixelCalibDigiProducer") << "matched detid " << detid << " to fed " << detid_to_fedid_[detid] << std::endl;
+    SiPixelFrameConverter converter(theCablingMap_.product(), fedid);
+    if (converter.hasDetUnit(detid)) {
+      detid_to_fedid_[detid] = fedid;
+      edm::LogInfo("SiPixelCalibDigiProducer")
+          << "matched detid " << detid << " to fed " << detid_to_fedid_[detid] << std::endl;
       return true;
     }
   }
@@ -151,55 +134,54 @@ bool SiPixelCalibDigiProducer::checkFED(uint32_t detid){
 ////////////////////////////////////////////////////
 // function description:
 // this is the function where we look in the maps to find the correct calibration digi container, after which the data is filled.
-void SiPixelCalibDigiProducer::fillPixel(uint32_t detid, short row, short col, short ipoint, short adc){
+void SiPixelCalibDigiProducer::fillPixel(uint32_t detid, short row, short col, short ipoint, short adc) {
   //  edm::LogInfo("SiPixelCalibProducer") << " in fillpixel()" << std::endl;
- 
+
   //  edm::LogInfo("SiPixelCalibProducer") << "in fillPixel " << detid << " " << row << " " << col << " " << ipoint << " " << adc << std::endl;
-  if(!checkFED(detid)){
+  if (!checkFED(detid)) {
     edm::LogError("SiPixelCalibDigiProducer") << " was unable to match detid " << detid << " to a FED!" << std::endl;
     return;
   }
-  if(!checkPixel(detid,row,col)){
+  if (!checkPixel(detid, row, col)) {
     return;
   }
   // now the check if the pixel exists and fill
   //
   pixelstruct temppixelworker;
-  temppixelworker.first=detid;
-  temppixelworker.second.first=row;
-  temppixelworker.second.second=col;  
-  std::map<pixelstruct,SiPixelCalibDigi>::const_iterator ipix = intermediate_data_.find(temppixelworker);
-  
-  if(ipix == intermediate_data_.end()){
+  temppixelworker.first = detid;
+  temppixelworker.second.first = row;
+  temppixelworker.second.second = col;
+  std::map<pixelstruct, SiPixelCalibDigi>::const_iterator ipix = intermediate_data_.find(temppixelworker);
+
+  if (ipix == intermediate_data_.end()) {
     SiPixelCalibDigi tempdigi(calib_->nVCal());
-    tempdigi.setrowcol(row,col);
-    intermediate_data_[temppixelworker]=tempdigi;
+    tempdigi.setrowcol(row, col);
+    intermediate_data_[temppixelworker] = tempdigi;
   }
 
-  intermediate_data_[temppixelworker].fill(ipoint,adc);
+  intermediate_data_[temppixelworker].fill(ipoint, adc);
   return;
-
 }
 //////////////////////////////////////////////////////////////
 // function description:
-// this function cleans up after everything in the pattern is filled. This involves setting the content of the intermediate_data_ containers to zero and completely emptying the map 
-void
-SiPixelCalibDigiProducer::clear(){
+// this function cleans up after everything in the pattern is filled. This involves setting the content of the intermediate_data_ containers to zero and completely emptying the map
+void SiPixelCalibDigiProducer::clear() {
   //  edm::LogInfo("SiPixelCalibProducer") << "in clear() " << std::endl;
   // this is where we empty the containers so they can be re-filled
-  // the idea: the detPixelMap_ container shrinks/expands as a function 
-  // of the number of pixels looked at at one particular time... 
-  // unlike the intermediate_data_ container which only expands when 
+  // the idea: the detPixelMap_ container shrinks/expands as a function
+  // of the number of pixels looked at at one particular time...
+  // unlike the intermediate_data_ container which only expands when
   // detPixelMap_ becomes bigger than intermedate_data_
-  
+
   // shrink the detPixelMap_
   uint32_t tempsize = intermediate_data_.size();
-  if(tempsize>number_of_pixels_per_pattern_){
-    edm::LogError("SiPixelCalibDigiProducer") << "Number of pixels in pattern is now: " << tempsize<< ", size is was " << number_of_pixels_per_pattern_ << std::endl;
-    number_of_pixels_per_pattern_=tempsize;
+  if (tempsize > number_of_pixels_per_pattern_) {
+    edm::LogError("SiPixelCalibDigiProducer") << "Number of pixels in pattern is now: " << tempsize << ", size is was "
+                                              << number_of_pixels_per_pattern_ << std::endl;
+    number_of_pixels_per_pattern_ = tempsize;
   }
 
-  intermediate_data_.erase(intermediate_data_.begin(),intermediate_data_.end());
+  intermediate_data_.erase(intermediate_data_.begin(), intermediate_data_.end());
   intermediate_data_.clear();
 
   // and erase the error bits
@@ -209,57 +191,54 @@ SiPixelCalibDigiProducer::clear(){
 
 ////////////////////////////////////////////////////
 // function description:
-// This method gets the pattern from the calib_ (SiPixelCalibConfiguration) object and fills a vector of pairs that is easier to check 
-void 
-SiPixelCalibDigiProducer::setPattern(){
+// This method gets the pattern from the calib_ (SiPixelCalibConfiguration) object and fills a vector of pairs that is easier to check
+void SiPixelCalibDigiProducer::setPattern() {
   //  edm::LogInfo("SiPixelCalibProducer") << "in setPattern()" << std::endl;
-  uint32_t patternnumber = (iEventCounter_-1)/pattern_repeat_;
-  uint32_t rowpatternnumber = patternnumber/calib_->nColumnPatterns();
-  uint32_t colpatternnumber = patternnumber%calib_->nColumnPatterns();
-  edm::LogInfo("SiPixelCalibDigiProducer") << " rowpatternnumbers = " << rowpatternnumber << " " << colpatternnumber << " " << patternnumber << std::endl;
+  uint32_t patternnumber = (iEventCounter_ - 1) / pattern_repeat_;
+  uint32_t rowpatternnumber = patternnumber / calib_->nColumnPatterns();
+  uint32_t colpatternnumber = patternnumber % calib_->nColumnPatterns();
+  edm::LogInfo("SiPixelCalibDigiProducer")
+      << " rowpatternnumbers = " << rowpatternnumber << " " << colpatternnumber << " " << patternnumber << std::endl;
   // update currentpattern_
   std::vector<short> calibcols = calib_->getColumnPattern();
   std::vector<short> calibrows = calib_->getRowPattern();
   std::vector<short> temprowvals(0);
   std::vector<short> tempcolvals(0);
-  uint32_t nminuscol=0;
-  uint32_t nminusrow=0;
-  uint32_t npatterns=0;
-  for(uint32_t icol=0; icol<calibcols.size(); icol++){
-    if(calibcols[icol]==-1){
+  uint32_t nminuscol = 0;
+  uint32_t nminusrow = 0;
+  uint32_t npatterns = 0;
+  for (uint32_t icol = 0; icol < calibcols.size(); icol++) {
+    if (calibcols[icol] == -1) {
       nminuscol++;
-    }
-    else if(nminuscol==colpatternnumber){
+    } else if (nminuscol == colpatternnumber) {
       //edm::LogInfo("SiPixelCalibProducer") << "col " << calibcols[icol] << std::endl;
-      short val=calibcols[icol];
+      short val = calibcols[icol];
       tempcolvals.push_back(val);
-    }
-    else if (nminuscol> colpatternnumber)
+    } else if (nminuscol > colpatternnumber)
       break;
   }
-  for(uint32_t irow=0; irow<calibrows.size(); irow++){
+  for (uint32_t irow = 0; irow < calibrows.size(); irow++) {
     // edm::LogInfo("SiPixelCalibProducer") << "row " << irow <<" "<< nminusrow<<" "  << calibrows[irow] << std::endl;
-    if(calibrows[irow]==-1)
+    if (calibrows[irow] == -1)
       nminusrow++;
-    else if(nminusrow==rowpatternnumber){
-      short val=calibrows[irow];
+    else if (nminusrow == rowpatternnumber) {
+      short val = calibrows[irow];
       temprowvals.push_back(val);
-    }
-    else if(nminusrow>rowpatternnumber)
+    } else if (nminusrow > rowpatternnumber)
       break;
   }
   //now clean up the currentpattern_;
-  while(currentpattern_.size()>temprowvals.size()*tempcolvals.size()){
+  while (currentpattern_.size() > temprowvals.size() * tempcolvals.size()) {
     currentpattern_.erase(currentpattern_.end());
   }
-  for(uint32_t irow=0; irow<temprowvals.size(); irow++){
-    for(uint32_t icol=0; icol<tempcolvals.size(); icol++){
-      std::pair<short,short> pattern(temprowvals[irow],tempcolvals[icol]);
+  for (uint32_t irow = 0; irow < temprowvals.size(); irow++) {
+    for (uint32_t icol = 0; icol < tempcolvals.size(); icol++) {
+      std::pair<short, short> pattern(temprowvals[irow], tempcolvals[icol]);
       npatterns++;
-      if(npatterns>currentpattern_.size())
-	currentpattern_.push_back(pattern);
+      if (npatterns > currentpattern_.size())
+        currentpattern_.push_back(pattern);
       else
-	currentpattern_[npatterns-1]=pattern;
+        currentpattern_[npatterns - 1] = pattern;
     }
   }
 }
@@ -267,81 +246,80 @@ SiPixelCalibDigiProducer::setPattern(){
 ////////////////////////////////////////////
 // function description:
 // produce method. This is the main loop method
-void
-SiPixelCalibDigiProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void SiPixelCalibDigiProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   //  edm::LogInfo("SiPixelCalibDigiProducer") <<"in produce() " << std::endl;
   using namespace edm;
   iSetup.get<SiPixelCalibConfigurationRcd>().get(calib_);
-  iSetup.get<TrackerDigiGeometryRecord>().get( theGeometry_ );
+  iSetup.get<TrackerDigiGeometryRecord>().get(theGeometry_);
   iSetup.get<SiPixelFedCablingMapRcd>().get(theCablingMap_);
-  pattern_repeat_=calib_->getNTriggers()*calib_->nVCal();
-  if(use_realeventnumber_){
-    iEventCounter_= iEvent.id().event()-1;
-  }
-  else
+  pattern_repeat_ = calib_->getNTriggers() * calib_->nVCal();
+  if (use_realeventnumber_) {
+    iEventCounter_ = iEvent.id().event() - 1;
+  } else
     iEventCounter_++;
-  if(iEventCounter_%pattern_repeat_==1)
+  if (iEventCounter_ % pattern_repeat_ == 1)
     setPattern();
-  
+
   //  edm::LogInfo("SiPixelCalibDigiProducer") << "now starting fill..." << std::endl;
-  fill(iEvent,iSetup); // fill method where the actual looping over the digis is done.
+  fill(iEvent, iSetup);  // fill method where the actual looping over the digis is done.
   //  edm::LogInfo("SiPixelCalibDigiProducer") << "done filling..." << std::endl;
   auto pOut = std::make_unique<edm::DetSetVector<SiPixelCalibDigi>>();
   auto pErr = std::make_unique<edm::DetSetVector<SiPixelCalibDigiError>>();
-  
+
   // copy things over into pOut if necessary (this is only once per pattern)
-  if(store()){
+  if (store()) {
     //    edm::LogInfo("SiPixelCalibDigiProducer") << "in loop" << std::endl;
-    for(std::map<pixelstruct,SiPixelCalibDigi>::const_iterator idet=intermediate_data_.begin(); idet!=intermediate_data_.end();++idet){
-      uint32_t detid=idet->first.first;
-      if(!control_pattern_size_){
-	if(! checkPixel(idet->first.first,idet->first.second.first,idet->first.second.second))
-	  continue;
+    for (std::map<pixelstruct, SiPixelCalibDigi>::const_iterator idet = intermediate_data_.begin();
+         idet != intermediate_data_.end();
+         ++idet) {
+      uint32_t detid = idet->first.first;
+      if (!control_pattern_size_) {
+        if (!checkPixel(idet->first.first, idet->first.second.first, idet->first.second.second))
+          continue;
       }
 
-      
-      SiPixelCalibDigi tempdigi=idet->second;
-      edm::DetSet<SiPixelCalibDigi> & detSet = pOut->find_or_insert(detid);
+      SiPixelCalibDigi tempdigi = idet->second;
+      edm::DetSet<SiPixelCalibDigi>& detSet = pOut->find_or_insert(detid);
       detSet.data.push_back(tempdigi);
     }
-    if(includeErrors_){
-      for(std::map<pixelstruct,SiPixelCalibDigiError>::const_iterator ierr=error_data_.begin(); ierr!=error_data_.end();++ierr){
-	uint32_t detid=ierr->first.first;
-	SiPixelCalibDigiError temperror = ierr->second;
-	edm::DetSet<SiPixelCalibDigiError> & errSet = pErr->find_or_insert(detid);
-	errSet.data.push_back(temperror);
+    if (includeErrors_) {
+      for (std::map<pixelstruct, SiPixelCalibDigiError>::const_iterator ierr = error_data_.begin();
+           ierr != error_data_.end();
+           ++ierr) {
+        uint32_t detid = ierr->first.first;
+        SiPixelCalibDigiError temperror = ierr->second;
+        edm::DetSet<SiPixelCalibDigiError>& errSet = pErr->find_or_insert(detid);
+        errSet.data.push_back(temperror);
       }
     }
-    edm::LogInfo("INFO") << "now filling event " << iEventCounter_ << " as pixel pattern changes every " <<  pattern_repeat_ << " events..." << std::endl;
+    edm::LogInfo("INFO") << "now filling event " << iEventCounter_ << " as pixel pattern changes every "
+                         << pattern_repeat_ << " events..." << std::endl;
     clear();
   }
   iEvent.put(std::move(pOut));
-  if(includeErrors_)
+  if (includeErrors_)
     iEvent.put(std::move(pErr));
 }
 //-----------------------------------------------
 //  method to check that the pixels are actually valid...
-bool SiPixelCalibDigiProducer::checkPixel(uint32_t detid, short row, short col){
-
-  if(!control_pattern_size_ && !store())
+bool SiPixelCalibDigiProducer::checkPixel(uint32_t detid, short row, short col) {
+  if (!control_pattern_size_ && !store())
     return true;
-  
-  if( !ignore_non_pattern_ )
+
+  if (!ignore_non_pattern_)
     return true;
-  
-  
+
   edm::LogInfo("SiPixelCalibDigiProducer") << "Event" << iEventCounter_ << ",now in checkpixel() " << std::endl;
-  if(currentpattern_.empty())
+  if (currentpattern_.empty())
     setPattern();
   //  uint32_t iroc;
   uint32_t fedid = detid_to_fedid_[detid];
 
-  SiPixelFrameConverter formatter(theCablingMap_.product(),fedid);
-  sipixelobjects::DetectorIndex detector ={detid, row, col};
+  SiPixelFrameConverter formatter(theCablingMap_.product(), fedid);
+  sipixelobjects::DetectorIndex detector = {detid, row, col};
   sipixelobjects::ElectronicIndex cabling;
-  
-  formatter.toCabling(cabling,detector);
+
+  formatter.toCabling(cabling, detector);
   // cabling should now contain cabling.roc and cabling.dcol  and cabling.pxid
 
   // however, the coordinates now need to be converted from dcl, pxid to the row,col coordinates used in the calibration info
@@ -352,37 +330,39 @@ bool SiPixelCalibDigiProducer::checkPixel(uint32_t detid, short row, short col){
   currentpair_.first = locpixel.rocRow();
   currentpair_.second = locpixel.rocCol();
 
-  for(uint32_t i=0; i<currentpattern_.size(); ++i){
+  for (uint32_t i = 0; i < currentpattern_.size(); ++i) {
     //    edm::LogInfo("SiPixelCalibDigiProducer") << "found pair " << currentpair_.first << "," << currentpair_.second << " calib " << currentpattern_[i].first << ","<< currentpattern_[i].second << " input " << row << "," << col << std::endl;
-    if(currentpair_==currentpattern_[i]){
+    if (currentpair_ == currentpattern_[i]) {
       return true;
     }
   }
   std::ostringstream errorlog;
-  errorlog <<  "DETID "<<detid<<", row, col (offline)="<<row<<","<<col<<" row, col (ROC) ="<<currentpair_.first<<","<< currentpair_.second<< " found no match in list of patterns: " ;
-  for(uint32_t i=0; i<currentpattern_.size(); ++i){
-    if(i!=0 && i!=currentpattern_.size()-1)
-      errorlog<<" ";
-    errorlog<<"(";
-    errorlog<<currentpattern_[i].first;
-    errorlog<<",";
-    errorlog<<currentpattern_[i].second;
-    errorlog<<")";
+  errorlog << "DETID " << detid << ", row, col (offline)=" << row << "," << col
+           << " row, col (ROC) =" << currentpair_.first << "," << currentpair_.second
+           << " found no match in list of patterns: ";
+  for (uint32_t i = 0; i < currentpattern_.size(); ++i) {
+    if (i != 0 && i != currentpattern_.size() - 1)
+      errorlog << " ";
+    errorlog << "(";
+    errorlog << currentpattern_[i].first;
+    errorlog << ",";
+    errorlog << currentpattern_[i].second;
+    errorlog << ")";
   }
   edm::LogError("ERROR") << errorlog.str() << std::endl;
-  if(includeErrors_){// book the error
-    
+  if (includeErrors_) {  // book the error
+
     pixelstruct temppixelworker;
-    temppixelworker.first=detid;
-    temppixelworker.second.first=row;
-    temppixelworker.second.second=col;
-    std::map<pixelstruct,SiPixelCalibDigiError>::const_iterator ierr = error_data_.find(temppixelworker);
-    if(ierr== error_data_.end()){
-      SiPixelCalibDigiError temperr(row,col,1);
-      error_data_[temppixelworker]=temperr;
+    temppixelworker.first = detid;
+    temppixelworker.second.first = row;
+    temppixelworker.second.second = col;
+    std::map<pixelstruct, SiPixelCalibDigiError>::const_iterator ierr = error_data_.find(temppixelworker);
+    if (ierr == error_data_.end()) {
+      SiPixelCalibDigiError temperr(row, col, 1);
+      error_data_[temppixelworker] = temperr;
     }
   }
-    
+
   return false;
 }
 
diff --git a/CalibTracker/SiPixelGainCalibration/plugins/SiPixelCalibDigiProducer.h b/CalibTracker/SiPixelGainCalibration/plugins/SiPixelCalibDigiProducer.h
index 223b431810fce..bed3e000bbb14 100644
--- a/CalibTracker/SiPixelGainCalibration/plugins/SiPixelCalibDigiProducer.h
+++ b/CalibTracker/SiPixelGainCalibration/plugins/SiPixelCalibDigiProducer.h
@@ -4,7 +4,7 @@
 //
 // Package:    SiPixelCalibDigiProducer
 // Class:      SiPixelCalibDigiProducer
-// 
+//
 /**\class SiPixelCalibDigiProducer SiPixelCalibDigiProducer.cc CalibTracker/SiPixelGainCalibration/src/SiPixelCalibDigiProducer.cc
 
  Description: <one line class summary>
@@ -54,51 +54,50 @@
 //
 
 class SiPixelCalibDigiProducer : public edm::EDProducer {
-   public:
-      explicit SiPixelCalibDigiProducer(const edm::ParameterSet& iConfig);
-      ~SiPixelCalibDigiProducer() override;
-
-   private:
-
-      void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override;
-      virtual bool store();
-      virtual void setPattern();
-      virtual void fill(edm::Event &iEvent, const edm::EventSetup& iSetup);
-      virtual void fillPixel(uint32_t detid, short row, short col,short ipoint, short adc);
-      virtual bool checkPixel(uint32_t detid, short row, short col);
-      virtual bool checkFED(uint32_t detid);
-      virtual void clear();
-      typedef std::pair<uint32_t,std::pair<short,short> >  pixelstruct;
-      // ----------member data ---------------------------
-      edm::InputTag src_;
-      edm::EDGetTokenT <edm::DetSetVector<PixelDigi>>  tPixelDigi;
-      uint32_t iEventCounter_;
-      
-      bool ignore_non_pattern_;
-      bool control_pattern_size_;
-      bool includeErrors_;
-      int errorType;
-      edm::ParameterSet conf_;
-      std::string label_;
-      std::string instance_;
-      uint32_t number_of_pixels_per_pattern_;
-      bool use_realeventnumber_;
-      
-      edm::ESHandle<SiPixelCalibConfiguration> calib_; // keeps track of the calibration constants
-      edm::ESHandle<TrackerGeometry> theGeometry_; // the tracker geometry
-      edm::ESHandle<SiPixelFedCablingMap> theCablingMap_;
-
-      // worker variables
-      std::map<pixelstruct,SiPixelCalibDigi> intermediate_data_; // data container, copied over into the event every pattern_repeat_ events
-      std::map<pixelstruct,SiPixelCalibDigiError> error_data_;
-      //      std::vector<SiPixelCalibDigi> intermediate_data_; // data container, copied over into the event every pattern_repeat_ events
-      std::vector<pixelstruct> detPixelMap_;// map to keep track of which pixels are filled where in intermediate_data_
-      uint32_t pattern_repeat_; // keeps track of when the pattern should change
-      std::map<uint32_t,uint32_t> detid_to_fedid_; // keeps track in which fed each detid is present.
-
-      std::vector<std::pair<short,short> > currentpattern_;// keeps track of which pattern we are at
-      std::pair<short,short> currentpair_;//worker class to keep track of pairs
+public:
+  explicit SiPixelCalibDigiProducer(const edm::ParameterSet& iConfig);
+  ~SiPixelCalibDigiProducer() override;
+
+private:
+  void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override;
+  virtual bool store();
+  virtual void setPattern();
+  virtual void fill(edm::Event& iEvent, const edm::EventSetup& iSetup);
+  virtual void fillPixel(uint32_t detid, short row, short col, short ipoint, short adc);
+  virtual bool checkPixel(uint32_t detid, short row, short col);
+  virtual bool checkFED(uint32_t detid);
+  virtual void clear();
+  typedef std::pair<uint32_t, std::pair<short, short>> pixelstruct;
+  // ----------member data ---------------------------
+  edm::InputTag src_;
+  edm::EDGetTokenT<edm::DetSetVector<PixelDigi>> tPixelDigi;
+  uint32_t iEventCounter_;
+
+  bool ignore_non_pattern_;
+  bool control_pattern_size_;
+  bool includeErrors_;
+  int errorType;
+  edm::ParameterSet conf_;
+  std::string label_;
+  std::string instance_;
+  uint32_t number_of_pixels_per_pattern_;
+  bool use_realeventnumber_;
+
+  edm::ESHandle<SiPixelCalibConfiguration> calib_;  // keeps track of the calibration constants
+  edm::ESHandle<TrackerGeometry> theGeometry_;      // the tracker geometry
+  edm::ESHandle<SiPixelFedCablingMap> theCablingMap_;
+
+  // worker variables
+  std::map<pixelstruct, SiPixelCalibDigi>
+      intermediate_data_;  // data container, copied over into the event every pattern_repeat_ events
+  std::map<pixelstruct, SiPixelCalibDigiError> error_data_;
+  //      std::vector<SiPixelCalibDigi> intermediate_data_; // data container, copied over into the event every pattern_repeat_ events
+  std::vector<pixelstruct> detPixelMap_;  // map to keep track of which pixels are filled where in intermediate_data_
+  uint32_t pattern_repeat_;               // keeps track of when the pattern should change
+  std::map<uint32_t, uint32_t> detid_to_fedid_;  // keeps track in which fed each detid is present.
+
+  std::vector<std::pair<short, short>> currentpattern_;  // keeps track of which pattern we are at
+  std::pair<short, short> currentpair_;                  //worker class to keep track of pairs
 };
 
-
 #endif
diff --git a/CalibTracker/SiPixelGainCalibration/plugins/SiPixelGainCalibrationAnalysis.cc b/CalibTracker/SiPixelGainCalibration/plugins/SiPixelGainCalibrationAnalysis.cc
index 393656f6c8349..3072ffa6a0f45 100644
--- a/CalibTracker/SiPixelGainCalibration/plugins/SiPixelGainCalibrationAnalysis.cc
+++ b/CalibTracker/SiPixelGainCalibration/plugins/SiPixelGainCalibrationAnalysis.cc
@@ -2,7 +2,7 @@
 //
 // Package:    SiPixelGainCalibrationAnalysis
 // Class:      SiPixelGainCalibrationAnalysis
-// 
+//
 /**\class SiPixelGainCalibrationAnalysis SiPixelGainCalibrationAnalysis.cc CalibTracker/SiPixelGainCalibrationAnalysis/src/SiPixelGainCalibrationAnalysis.cc
 
 Description: <one line class summary>
@@ -31,170 +31,164 @@ using std::endl;
 //
 // constructors and destructor
 //
-SiPixelGainCalibrationAnalysis::SiPixelGainCalibrationAnalysis(const edm::ParameterSet& iConfig):
-  SiPixelOfflineCalibAnalysisBase(iConfig),
-  conf_(iConfig),
-  bookkeeper_(),
-  bookkeeper_pixels_(),
-  nfitparameters_(iConfig.getUntrackedParameter<int>("numberOfFitParameters",2)),
-  fitfunction_(iConfig.getUntrackedParameter<std::string>("fitFunctionRootFormula","pol1")),
-   listofdetids_(conf_.getUntrackedParameter<std::vector<uint32_t> >("listOfDetIDs")),
-  ignoreMode_(conf_.getUntrackedParameter<bool>("ignoreMode",false)),
-  reject_plateaupoints_(iConfig.getUntrackedParameter<bool>("suppressPlateauInFit",true)),
-  reject_single_entries_(iConfig.getUntrackedParameter<bool>("suppressPointsWithOneEntryOrLess",true)),
-  plateau_max_slope_(iConfig.getUntrackedParameter<double>("plateauSlopeMax",1.0)),
-  reject_first_point_(iConfig.getUntrackedParameter<bool>("rejectVCalZero",true)),
-  reject_badpoints_frac_(iConfig.getUntrackedParameter<double>("suppressZeroAndPlateausInFitFrac",0)),
-  bookBIGCalibPayload_(iConfig.getUntrackedParameter<bool>("saveFullPayloads",false)),
-  savePixelHists_(iConfig.getUntrackedParameter<bool>("savePixelLevelHists",false)),
-  chi2Threshold_(iConfig.getUntrackedParameter<double>("minChi2NDFforHistSave",10)),
-  chi2ProbThreshold_(iConfig.getUntrackedParameter<double>("minChi2ProbforHistSave",0.05)),
-  maxGainInHist_(iConfig.getUntrackedParameter<double>("maxGainInHist",10)),
-  maxChi2InHist_(iConfig.getUntrackedParameter<double>("maxChi2InHist",25)),
-  saveALLHistograms_(iConfig.getUntrackedParameter<bool>("saveAllHistograms",false)),
- 
-
-  filldb_(iConfig.getUntrackedParameter<bool>("writeDatabase",false)),
-  writeSummary_(iConfig.getUntrackedParameter<bool>("writeSummary",true)),
-  recordName_(conf_.getParameter<std::string>("record")),
-
-  appendMode_(conf_.getUntrackedParameter<bool>("appendMode",true)),
-  /*theGainCalibrationDbInput_(0),
+SiPixelGainCalibrationAnalysis::SiPixelGainCalibrationAnalysis(const edm::ParameterSet &iConfig)
+    : SiPixelOfflineCalibAnalysisBase(iConfig),
+      conf_(iConfig),
+      bookkeeper_(),
+      bookkeeper_pixels_(),
+      nfitparameters_(iConfig.getUntrackedParameter<int>("numberOfFitParameters", 2)),
+      fitfunction_(iConfig.getUntrackedParameter<std::string>("fitFunctionRootFormula", "pol1")),
+      listofdetids_(conf_.getUntrackedParameter<std::vector<uint32_t> >("listOfDetIDs")),
+      ignoreMode_(conf_.getUntrackedParameter<bool>("ignoreMode", false)),
+      reject_plateaupoints_(iConfig.getUntrackedParameter<bool>("suppressPlateauInFit", true)),
+      reject_single_entries_(iConfig.getUntrackedParameter<bool>("suppressPointsWithOneEntryOrLess", true)),
+      plateau_max_slope_(iConfig.getUntrackedParameter<double>("plateauSlopeMax", 1.0)),
+      reject_first_point_(iConfig.getUntrackedParameter<bool>("rejectVCalZero", true)),
+      reject_badpoints_frac_(iConfig.getUntrackedParameter<double>("suppressZeroAndPlateausInFitFrac", 0)),
+      bookBIGCalibPayload_(iConfig.getUntrackedParameter<bool>("saveFullPayloads", false)),
+      savePixelHists_(iConfig.getUntrackedParameter<bool>("savePixelLevelHists", false)),
+      chi2Threshold_(iConfig.getUntrackedParameter<double>("minChi2NDFforHistSave", 10)),
+      chi2ProbThreshold_(iConfig.getUntrackedParameter<double>("minChi2ProbforHistSave", 0.05)),
+      maxGainInHist_(iConfig.getUntrackedParameter<double>("maxGainInHist", 10)),
+      maxChi2InHist_(iConfig.getUntrackedParameter<double>("maxChi2InHist", 25)),
+      saveALLHistograms_(iConfig.getUntrackedParameter<bool>("saveAllHistograms", false)),
+
+      filldb_(iConfig.getUntrackedParameter<bool>("writeDatabase", false)),
+      writeSummary_(iConfig.getUntrackedParameter<bool>("writeSummary", true)),
+      recordName_(conf_.getParameter<std::string>("record")),
+
+      appendMode_(conf_.getUntrackedParameter<bool>("appendMode", true)),
+      /*theGainCalibrationDbInput_(0),
   theGainCalibrationDbInputOffline_(0),
   theGainCalibrationDbInputHLT_(0),
   theGainCalibrationDbInputService_(iConfig),*/
-  gainlow_(10.),gainhi_(0.),pedlow_(255.),pedhi_(0.),
-  useVcalHigh_(conf_.getParameter<bool>("useVCALHIGH")),
-  scalarVcalHigh_VcalLow_(conf_.getParameter<double>("vcalHighToLowConversionFac"))
-{
-  if(reject_single_entries_)
-    min_nentries_=1;
+      gainlow_(10.),
+      gainhi_(0.),
+      pedlow_(255.),
+      pedhi_(0.),
+      useVcalHigh_(conf_.getParameter<bool>("useVCALHIGH")),
+      scalarVcalHigh_VcalLow_(conf_.getParameter<double>("vcalHighToLowConversionFac")) {
+  if (reject_single_entries_)
+    min_nentries_ = 1;
   else
-    min_nentries_=0;
-  ::putenv((char*)"CORAL_AUTH_USER=me");
-  ::putenv((char*)"CORAL_AUTH_PASSWORD=test");   
-  edm::LogInfo("SiPixelGainCalibrationAnalysis") << "now using fit function " << fitfunction_ << ", which has " << nfitparameters_ << " free parameters. " << std::endl;
-  func_= new TF1("func",fitfunction_.c_str(),0,256*scalarVcalHigh_VcalLow_);
+    min_nentries_ = 0;
+  ::putenv((char *)"CORAL_AUTH_USER=me");
+  ::putenv((char *)"CORAL_AUTH_PASSWORD=test");
+  edm::LogInfo("SiPixelGainCalibrationAnalysis") << "now using fit function " << fitfunction_ << ", which has "
+                                                 << nfitparameters_ << " free parameters. " << std::endl;
+  func_ = new TF1("func", fitfunction_.c_str(), 0, 256 * scalarVcalHigh_VcalLow_);
   graph_ = new TGraphErrors();
-  currentDetID_=0;
+  currentDetID_ = 0;
   summary_.open("SummaryPerDetID.txt");
   statusNumbers_ = new int[10];
-  for(int ii=0;ii<10;ii++)
-    statusNumbers_[ii]=0;
+  for (int ii = 0; ii < 10; ii++)
+    statusNumbers_[ii] = 0;
 }
 
-SiPixelGainCalibrationAnalysis::~SiPixelGainCalibrationAnalysis()
-{
-}
+SiPixelGainCalibrationAnalysis::~SiPixelGainCalibrationAnalysis() {}
 // member functions
 //
 // ------------ method called once each job just before starting event loop  ------------
 
-std::vector<float> SiPixelGainCalibrationAnalysis::CalculateAveragePerColumn(uint32_t detid, std::string label){
+std::vector<float> SiPixelGainCalibrationAnalysis::CalculateAveragePerColumn(uint32_t detid, std::string label) {
   std::vector<float> result;
-  int ncols= bookkeeper_[detid][label]->getNbinsX();
-  int nrows= bookkeeper_[detid][label]->getNbinsY();
-  for(int icol=1; icol<=ncols; ++icol){
-    float val=0;
-    float ntimes =0;
-    for(int irow=1; irow<=nrows; ++irow){
-      val+= bookkeeper_[detid][label]->getBinContent(icol,irow);
+  int ncols = bookkeeper_[detid][label]->getNbinsX();
+  int nrows = bookkeeper_[detid][label]->getNbinsY();
+  for (int icol = 1; icol <= ncols; ++icol) {
+    float val = 0;
+    float ntimes = 0;
+    for (int irow = 1; irow <= nrows; ++irow) {
+      val += bookkeeper_[detid][label]->getBinContent(icol, irow);
       ntimes++;
     }
-    val/= ntimes;
+    val /= ntimes;
     result.push_back(val);
   }
   return result;
 }
 
-bool
-SiPixelGainCalibrationAnalysis::checkCorrectCalibrationType()
-{
-  if(calibrationMode_=="GainCalibration")
+bool SiPixelGainCalibrationAnalysis::checkCorrectCalibrationType() {
+  if (calibrationMode_ == "GainCalibration")
     return true;
-  else if(ignoreMode_==true)
+  else if (ignoreMode_ == true)
     return true;
-  else if(calibrationMode_=="unknown"){
-    edm::LogInfo("SiPixelGainCalibrationAnalysis") <<  "calibration mode is: " << calibrationMode_ << ", continuing anyway..." ;
+  else if (calibrationMode_ == "unknown") {
+    edm::LogInfo("SiPixelGainCalibrationAnalysis")
+        << "calibration mode is: " << calibrationMode_ << ", continuing anyway...";
     return true;
-  }
-  else{
+  } else {
     //    edm::LogError("SiPixelGainCalibrationAnalysis") << "unknown calibration mode for Gain calibration, should be \"Gain\" and is \"" << calibrationMode_ << "\"";
   }
   return false;
 }
 
-void SiPixelGainCalibrationAnalysis::calibrationSetup(const edm::EventSetup&)
-{
-}
+void SiPixelGainCalibrationAnalysis::calibrationSetup(const edm::EventSetup &) {}
 //------- summary printing method. Very verbose.
-void
-SiPixelGainCalibrationAnalysis::printSummary(){
-
-  uint32_t detid=0;
-  for(std::map<uint32_t,std::map<std::string,MonitorElement *> >::const_iterator idet = bookkeeper_.begin(); idet != bookkeeper_.end(); ++idet){
-    if(detid==idet->first)
-      continue;// only do things once per detid
-    detid=idet->first;
-    std::vector<float> gainvec=CalculateAveragePerColumn(detid,"gain_2d");
-    std::vector<float> pedvec =CalculateAveragePerColumn(detid,"ped_2d");
-    std::vector<float> chi2vec = CalculateAveragePerColumn(detid,"chi2_2d");
+void SiPixelGainCalibrationAnalysis::printSummary() {
+  uint32_t detid = 0;
+  for (std::map<uint32_t, std::map<std::string, MonitorElement *> >::const_iterator idet = bookkeeper_.begin();
+       idet != bookkeeper_.end();
+       ++idet) {
+    if (detid == idet->first)
+      continue;  // only do things once per detid
+    detid = idet->first;
+    std::vector<float> gainvec = CalculateAveragePerColumn(detid, "gain_2d");
+    std::vector<float> pedvec = CalculateAveragePerColumn(detid, "ped_2d");
+    std::vector<float> chi2vec = CalculateAveragePerColumn(detid, "chi2_2d");
     std::ostringstream summarytext;
 
     summarytext << "Summary for det ID " << detid << "(" << translateDetIdToString(detid) << ")\n";
     summarytext << "\t Following: values per column: column #, gain, pedestal, chi2\n";
-    for(uint32_t i=0; i<gainvec.size(); i++)
+    for (uint32_t i = 0; i < gainvec.size(); i++)
       summarytext << "\t " << i << " \t" << gainvec[i] << " \t" << pedvec[i] << " \t" << chi2vec[i] << "\n";
     summarytext << "\t list of pixels with high chi2 (chi2> " << chi2Threshold_ << "): \n";
 
-    
-    for(std::map<std::string, MonitorElement *>::const_iterator ipix = bookkeeper_pixels_[detid].begin(); ipix!=bookkeeper_pixels_[detid].end(); ++ipix)
+    for (std::map<std::string, MonitorElement *>::const_iterator ipix = bookkeeper_pixels_[detid].begin();
+         ipix != bookkeeper_pixels_[detid].end();
+         ++ipix)
       summarytext << "\t " << ipix->first << "\n";
     edm::LogInfo("SiPixelGainCalibrationAnalysis") << summarytext.str() << std::endl;
-
   }
-  if(summary_.is_open()){
+  if (summary_.is_open()) {
     summary_.close();
     summary_.open("Summary.txt");
-    summary_<<"Total Number of Pixel computed :"<<statusNumbers_[9]<<endl;
-    summary_<<"Number of pixel tagged with status :"<<endl;
-    for(int ii=0;ii<9;ii++)
-      summary_<<ii<<" -> "<<statusNumbers_[ii]<<" ~ "<<double(statusNumbers_[ii])/double(statusNumbers_[9])*100.<<" %"<<endl;
-    
+    summary_ << "Total Number of Pixel computed :" << statusNumbers_[9] << endl;
+    summary_ << "Number of pixel tagged with status :" << endl;
+    for (int ii = 0; ii < 9; ii++)
+      summary_ << ii << " -> " << statusNumbers_[ii] << " ~ "
+               << double(statusNumbers_[ii]) / double(statusNumbers_[9]) * 100. << " %" << endl;
+
     summary_.close();
-  
   }
-
 }
 
 // ------------ method called once each job just after ending the event loop  ------------
 
-void 
-SiPixelGainCalibrationAnalysis::calibrationEnd() {
+void SiPixelGainCalibrationAnalysis::calibrationEnd() {
+  if (writeSummary_)
+    printSummary();
 
-  if(writeSummary_) printSummary();
-  
   // this is where we loop over all histograms and save the database objects
-  if(filldb_)
+  if (filldb_)
     fillDatabase();
 }
 //-----------method to fill the database
-void SiPixelGainCalibrationAnalysis::fillDatabase(){
- // only create when necessary.
+void SiPixelGainCalibrationAnalysis::fillDatabase() {
+  // only create when necessary.
   // process the minimum and maximum gain & ped values...
-  edm::LogError("SiPixelGainCalibration::fillDatabase()") << "PLEASE do not fill the database directly from the gain calibration analyzer. This function is currently disabled and no DB payloads will be produced!" << std::endl;
-
+  edm::LogError("SiPixelGainCalibration::fillDatabase()")
+      << "PLEASE do not fill the database directly from the gain calibration analyzer. This function is currently "
+         "disabled and no DB payloads will be produced!"
+      << std::endl;
 }
 // ------------ method called to do fits to all objects available  ------------
-bool
-SiPixelGainCalibrationAnalysis::doFits(uint32_t detid, std::vector<SiPixelCalibDigi>::const_iterator ipix)
-{
-  float lowmeanval=255;
-  float highmeanval=0;
+bool SiPixelGainCalibrationAnalysis::doFits(uint32_t detid, std::vector<SiPixelCalibDigi>::const_iterator ipix) {
+  float lowmeanval = 255;
+  float highmeanval = 0;
   bool makehistopersistent = saveALLHistograms_;
-  std::vector<uint32_t>::const_iterator detidfinder=find(listofdetids_.begin(),listofdetids_.end(),detid);
-  if(detidfinder!=listofdetids_.end())
-    makehistopersistent=true;
+  std::vector<uint32_t>::const_iterator detidfinder = find(listofdetids_.begin(), listofdetids_.end(), detid);
+  if (detidfinder != listofdetids_.end())
+    makehistopersistent = true;
   // first, fill the input arrays to the TLinearFitter.
   double xvals[257];
   double yvals[256];
@@ -202,296 +196,313 @@ SiPixelGainCalibrationAnalysis::doFits(uint32_t detid, std::vector<SiPixelCalibD
   double xvalsall[257];
   double yvalsall[256];
   double yerrvalsall[256];
-  int npoints=0;
-  int nallpoints=0;
-  bool use_point=true;
-  int status=0;
+  int npoints = 0;
+  int nallpoints = 0;
+  bool use_point = true;
+  int status = 0;
   statusNumbers_[9]++;
-  
-  bookkeeper_[detid]["status_2d"]->setBinContent(ipix->col()+1,ipix->row()+1,0);
-  if(writeSummary_ && detid!=currentDetID_){
+
+  bookkeeper_[detid]["status_2d"]->setBinContent(ipix->col() + 1, ipix->row() + 1, 0);
+  if (writeSummary_ && detid != currentDetID_) {
     currentDetID_ = detid;
-    summary_<<endl<<"DetId_"<<currentDetID_<<endl;
+    summary_ << endl << "DetId_" << currentDetID_ << endl;
   }
-  
-  for(uint32_t ii=0; ii< ipix->getnpoints() && ii<200; ii++){
+
+  for (uint32_t ii = 0; ii < ipix->getnpoints() && ii < 200; ii++) {
     //    std::cout << ipix->getsum(ii) << " " << ipix->getnentries(ii) << " " << ipix->getsumsquares(ii) << std::endl;
     nallpoints++;
-    use_point=true;
-    if(useVcalHigh_){
-      xvalsall[ii]=vCalValues_[ii]*scalarVcalHigh_VcalLow_;
-    }
-    else
-      xvalsall[ii]=vCalValues_[ii];
-    yerrvalsall[ii]=yvalsall[ii]=0; 
-  
-    if(ipix->getnentries(ii)>min_nentries_){
-      yvalsall[ii]=ipix->getsum(ii)/(float)ipix->getnentries(ii);
-      yerrvalsall[ii]=ipix->getsumsquares(ii)/(float)(ipix->getnentries(ii));
-      yerrvalsall[ii]-=pow(yvalsall[ii],2);
-      yerrvalsall[ii]=sqrt(yerrvalsall[ii])/sqrt(ipix->getnentries(ii));
-      
-      if(yvalsall[ii]<lowmeanval)
-	lowmeanval=yvalsall[ii];
-      if(yvalsall[ii]>highmeanval)
-	highmeanval=yvalsall[ii];
+    use_point = true;
+    if (useVcalHigh_) {
+      xvalsall[ii] = vCalValues_[ii] * scalarVcalHigh_VcalLow_;
+    } else
+      xvalsall[ii] = vCalValues_[ii];
+    yerrvalsall[ii] = yvalsall[ii] = 0;
+
+    if (ipix->getnentries(ii) > min_nentries_) {
+      yvalsall[ii] = ipix->getsum(ii) / (float)ipix->getnentries(ii);
+      yerrvalsall[ii] = ipix->getsumsquares(ii) / (float)(ipix->getnentries(ii));
+      yerrvalsall[ii] -= pow(yvalsall[ii], 2);
+      yerrvalsall[ii] = sqrt(yerrvalsall[ii]) / sqrt(ipix->getnentries(ii));
+
+      if (yvalsall[ii] < lowmeanval)
+        lowmeanval = yvalsall[ii];
+      if (yvalsall[ii] > highmeanval)
+        highmeanval = yvalsall[ii];
     }
   }
-  
+
   // calculate plateau value from last 4 entries
-  double plateauval=0;
-  bool noPlateau=false;
-  if(nallpoints>=4){
-    for(int ii=nallpoints-1; ii>nallpoints-5; --ii) plateauval+=yvalsall[ii];
-    plateauval/=4;
-    for(int ii=nallpoints-1; ii>nallpoints-5; --ii){
-      if(fabs(yvalsall[ii]-plateauval)>5){
-        plateauval=255;
-	noPlateau=true;
+  double plateauval = 0;
+  bool noPlateau = false;
+  if (nallpoints >= 4) {
+    for (int ii = nallpoints - 1; ii > nallpoints - 5; --ii)
+      plateauval += yvalsall[ii];
+    plateauval /= 4;
+    for (int ii = nallpoints - 1; ii > nallpoints - 5; --ii) {
+      if (fabs(yvalsall[ii] - plateauval) > 5) {
+        plateauval = 255;
+        noPlateau = true;
         continue;
       }
     }
-    
-    int NbofPointsInPlateau=0;
-    for(int ii=0; ii<nallpoints; ++ii)
-      if(fabs(yvalsall[ii]-plateauval)<10 || yvalsall[ii]==0) NbofPointsInPlateau++;
+
+    int NbofPointsInPlateau = 0;
+    for (int ii = 0; ii < nallpoints; ++ii)
+      if (fabs(yvalsall[ii] - plateauval) < 10 || yvalsall[ii] == 0)
+        NbofPointsInPlateau++;
     //summary_<<"row_"<<ipix->row()<<" col_"<<ipix->col()<<"   "<<plateauval<<"  "<<NbofPointsInPlateau<<"  "<<nallpoints<<endl;
-    if(NbofPointsInPlateau>=(nallpoints-2)){
-      status=-2;
-      bookkeeper_[detid]["status_2d"]->setBinContent(ipix->col()+1,ipix->row()+1,status);
-      if(writeSummary_){
-        summary_<<"row_"<<ipix->row()<<" col_"<<ipix->col()<<" status_"<<status<<endl;
-	statusNumbers_[abs(status)]++;
+    if (NbofPointsInPlateau >= (nallpoints - 2)) {
+      status = -2;
+      bookkeeper_[detid]["status_2d"]->setBinContent(ipix->col() + 1, ipix->row() + 1, status);
+      if (writeSummary_) {
+        summary_ << "row_" << ipix->row() << " col_" << ipix->col() << " status_" << status << endl;
+        statusNumbers_[abs(status)]++;
       }
       return false;
     }
-  }
-  else plateauval=255;
-    
-  double maxgoodvalinfit=plateauval*(1.-reject_badpoints_frac_);
-  npoints=0;
-  for(int ii=0; ii<nallpoints; ++ii){
-   
+  } else
+    plateauval = 255;
+
+  double maxgoodvalinfit = plateauval * (1. - reject_badpoints_frac_);
+  npoints = 0;
+  for (int ii = 0; ii < nallpoints; ++ii) {
     // now selecting the appropriate points for the fit.
-    use_point=true;
-    if(reject_first_point_ && xvalsall[ii]<0.1)
-      use_point=false;
-    if(ipix->getnentries(ii)<=min_nentries_ && reject_single_entries_)
-      use_point=false;
-    if(ipix->getnentries(ii)==0 && reject_badpoints_)
-      use_point=false;
-    if(yvalsall[ii]>maxgoodvalinfit && !noPlateau)
-      use_point=false;
-    if(ii>1 && fabs(yvalsall[ii]-yvalsall[ii-1])<5. && yvalsall[ii]>0.8*maxgoodvalinfit && reject_plateaupoints_){
-      use_point=false;
+    use_point = true;
+    if (reject_first_point_ && xvalsall[ii] < 0.1)
+      use_point = false;
+    if (ipix->getnentries(ii) <= min_nentries_ && reject_single_entries_)
+      use_point = false;
+    if (ipix->getnentries(ii) == 0 && reject_badpoints_)
+      use_point = false;
+    if (yvalsall[ii] > maxgoodvalinfit && !noPlateau)
+      use_point = false;
+    if (ii > 1 && fabs(yvalsall[ii] - yvalsall[ii - 1]) < 5. && yvalsall[ii] > 0.8 * maxgoodvalinfit &&
+        reject_plateaupoints_) {
+      use_point = false;
       break;
     }
-    
-    if(use_point){
-      xvals[npoints]=xvalsall[ii];
-      yvals[npoints]=yvalsall[ii];
-      yerrvals[npoints]=yerrvalsall[ii];
+
+    if (use_point) {
+      xvals[npoints] = xvalsall[ii];
+      yvals[npoints] = yvalsall[ii];
+      yerrvals[npoints] = yerrvalsall[ii];
       npoints++;
     }
   }
-  
-  float chi2,slope,intercept,prob,slopeerror,intercepterror;
-  prob=chi2=-1;
-  slope=intercept=slopeerror=intercepterror=0;
-  
+
+  float chi2, slope, intercept, prob, slopeerror, intercepterror;
+  prob = chi2 = -1;
+  slope = intercept = slopeerror = intercepterror = 0;
 
   // now check on number of points. If bad just start taking the first 4:
 
-  if(npoints<4){
-    npoints=0;
-    for(int ii=0; ii<nallpoints && npoints<4 && yvalsall[ii]<plateauval*0.97; ++ii){
-      if(yvalsall[ii]>0){
-	if(ii>0 && yvalsall[ii]-yvalsall[ii-1]<0.1)
-	  continue;
-	xvals[npoints]=xvalsall[ii];
-	yvals[npoints]=yvalsall[ii];
-	yerrvals[npoints]=yerrvalsall[ii];
-	npoints++;
+  if (npoints < 4) {
+    npoints = 0;
+    for (int ii = 0; ii < nallpoints && npoints < 4 && yvalsall[ii] < plateauval * 0.97; ++ii) {
+      if (yvalsall[ii] > 0) {
+        if (ii > 0 && yvalsall[ii] - yvalsall[ii - 1] < 0.1)
+          continue;
+        xvals[npoints] = xvalsall[ii];
+        yvals[npoints] = yvalsall[ii];
+        yerrvals[npoints] = yerrvalsall[ii];
+        npoints++;
       }
     }
   }
-  if(npoints<2){
+  if (npoints < 2) {
     status = -7;
-    bookkeeper_[detid]["status_2d"]->setBinContent(ipix->col()+1,ipix->row()+1,status);
-    if(writeSummary_){
-      summary_<<"row_"<<ipix->row()<<" col_"<<ipix->col()<<" status_"<<status<<endl;
+    bookkeeper_[detid]["status_2d"]->setBinContent(ipix->col() + 1, ipix->row() + 1, status);
+    if (writeSummary_) {
+      summary_ << "row_" << ipix->row() << " col_" << ipix->col() << " status_" << status << endl;
       statusNumbers_[abs(status)]++;
     }
     std::ostringstream pixelinfo;
     pixelinfo << "GainCurve_row_" << ipix->row() << "_col_" << ipix->col();
-    std::string tempname=translateDetIdToString(detid);
-    tempname+="_";
-    tempname+=pixelinfo.str();
+    std::string tempname = translateDetIdToString(detid);
+    tempname += "_";
+    tempname += pixelinfo.str();
     setDQMDirectory(detid);
-    bookkeeper_pixels_[detid][pixelinfo.str()] = bookDQMHistogram1D(detid,pixelinfo.str(),tempname,105*nallpoints,xvalsall[0],xvalsall[nallpoints-1]*1.05);
-    for(int ii=0; ii<nallpoints; ++ii)
-      bookkeeper_pixels_[detid][pixelinfo.str()]->Fill(xvalsall[ii],yvalsall[ii]);
+    bookkeeper_pixels_[detid][pixelinfo.str()] = bookDQMHistogram1D(
+        detid, pixelinfo.str(), tempname, 105 * nallpoints, xvalsall[0], xvalsall[nallpoints - 1] * 1.05);
+    for (int ii = 0; ii < nallpoints; ++ii)
+      bookkeeper_pixels_[detid][pixelinfo.str()]->Fill(xvalsall[ii], yvalsall[ii]);
     return false;
   }
-    
+
   //  std::cout << "starting fit!" << std::endl;
   graph_->Set(npoints);
-  
-  func_->SetParameter(0,50.);
-  func_->SetParameter(1,0.25);
-  for(int ipointtemp=0; ipointtemp<npoints; ++ipointtemp){
-    graph_->SetPoint(ipointtemp,xvals[ipointtemp],yvals[ipointtemp]);
-    graph_->SetPointError(ipointtemp,0,yerrvals[ipointtemp]);
+
+  func_->SetParameter(0, 50.);
+  func_->SetParameter(1, 0.25);
+  for (int ipointtemp = 0; ipointtemp < npoints; ++ipointtemp) {
+    graph_->SetPoint(ipointtemp, xvals[ipointtemp], yvals[ipointtemp]);
+    graph_->SetPointError(ipointtemp, 0, yerrvals[ipointtemp]);
   }
-  Int_t tempresult = graph_->Fit(func_,"FQ0N");
-  slope=func_->GetParameter(1);
-  slopeerror=func_->GetParError(1);
-  intercept=func_->GetParameter(0);
-  intercepterror=func_->GetParError(0);
-  chi2=func_->GetChisquare()/((float)npoints-func_->GetNpar());
-  prob= TMath::Prob(func_->GetChisquare(),npoints-func_->GetNpar());
-  size_t ntimes=0;
-  while((isnan(slope) || isnan(intercept) )&& ntimes<10){
+  Int_t tempresult = graph_->Fit(func_, "FQ0N");
+  slope = func_->GetParameter(1);
+  slopeerror = func_->GetParError(1);
+  intercept = func_->GetParameter(0);
+  intercepterror = func_->GetParError(0);
+  chi2 = func_->GetChisquare() / ((float)npoints - func_->GetNpar());
+  prob = TMath::Prob(func_->GetChisquare(), npoints - func_->GetNpar());
+  size_t ntimes = 0;
+  while ((isnan(slope) || isnan(intercept)) && ntimes < 10) {
     ntimes++;
-    makehistopersistent=true;
+    makehistopersistent = true;
     //    std::cout << slope << " " << intercept << " " << prob << std::endl;
-    edm::LogWarning("SiPixelGainCalibrationAnalysis") << "impossible to fit values, try " << ntimes << ": " ;
-    for(int ii=0; ii<npoints; ++ii){
-      edm::LogWarning("SiPixelGainCalibrationAnalysis")<< "vcal " << xvals[ii] << " response: " << yvals[ii] << "+/-" << yerrvals[ii] << std::endl; 
-    } 
-    tempresult = graph_->Fit(func_,"FQ0NW");
-    slope=func_->GetParameter(1);
-    slopeerror=func_->GetParError(1);
+    edm::LogWarning("SiPixelGainCalibrationAnalysis") << "impossible to fit values, try " << ntimes << ": ";
+    for (int ii = 0; ii < npoints; ++ii) {
+      edm::LogWarning("SiPixelGainCalibrationAnalysis")
+          << "vcal " << xvals[ii] << " response: " << yvals[ii] << "+/-" << yerrvals[ii] << std::endl;
+    }
+    tempresult = graph_->Fit(func_, "FQ0NW");
+    slope = func_->GetParameter(1);
+    slopeerror = func_->GetParError(1);
     intercept = func_->GetParameter(0);
-    intercepterror=func_->GetParError(0);
-    chi2=func_->GetChisquare()/((float)npoints-func_->GetNpar());
-    prob= TMath::Prob(func_->GetChisquare(),npoints-func_->GetNpar());
+    intercepterror = func_->GetParError(0);
+    chi2 = func_->GetChisquare() / ((float)npoints - func_->GetNpar());
+    prob = TMath::Prob(func_->GetChisquare(), npoints - func_->GetNpar());
   }
-  
-  if(tempresult==0)
-    status=1;
+
+  if (tempresult == 0)
+    status = 1;
   else
-    status=0;
-  if(slope!=0)
-    slope = 1./slope;
-  if(isnan(slope) || isnan(intercept)){
-    status=-6;
-    bookkeeper_[detid]["status_2d"]->setBinContent(ipix->col()+1,ipix->row()+1,status);
-    if(writeSummary_){
-      summary_<<"row_"<<ipix->row()<<" col_"<<ipix->col()<<" status_"<<status<<endl;
+    status = 0;
+  if (slope != 0)
+    slope = 1. / slope;
+  if (isnan(slope) || isnan(intercept)) {
+    status = -6;
+    bookkeeper_[detid]["status_2d"]->setBinContent(ipix->col() + 1, ipix->row() + 1, status);
+    if (writeSummary_) {
+      summary_ << "row_" << ipix->row() << " col_" << ipix->col() << " status_" << status << endl;
       statusNumbers_[abs(status)]++;
     }
     //return false;
   }
-  if(chi2>chi2Threshold_ && chi2Threshold_>=0)
-    status=5;
-  if(prob<chi2ProbThreshold_)
-    status=5;
-  if(noPlateau)
-    status=3;
-  if(nallpoints<4)
-    status=-7;
-  if(TMath::Abs(slope>maxGainInHist_) || slope < 0)
-    status=-8;
-  if(status!=1)
-    makehistopersistent=true;
+  if (chi2 > chi2Threshold_ && chi2Threshold_ >= 0)
+    status = 5;
+  if (prob < chi2ProbThreshold_)
+    status = 5;
+  if (noPlateau)
+    status = 3;
+  if (nallpoints < 4)
+    status = -7;
+  if (TMath::Abs(slope > maxGainInHist_) || slope < 0)
+    status = -8;
+  if (status != 1)
+    makehistopersistent = true;
   statusNumbers_[abs(status)]++;
 
-
-  if(slope<gainlow_)
-    gainlow_=slope;
-  if(slope>gainhi_)
-    gainhi_=slope;
-  if(intercept>pedhi_)
-    pedhi_=intercept;
-  if(intercept<pedlow_)
-    pedlow_=intercept;
+  if (slope < gainlow_)
+    gainlow_ = slope;
+  if (slope > gainhi_)
+    gainhi_ = slope;
+  if (intercept > pedhi_)
+    pedhi_ = intercept;
+  if (intercept < pedlow_)
+    pedlow_ = intercept;
   bookkeeper_[detid]["gain_1d"]->Fill(slope);
-  if(slope>maxGainInHist_){
-    makehistopersistent=true;
-    edm::LogWarning("SiPixelGainCalibration") << "For DETID " << detid << "pixel row,col " << ipix->row() << "," << ipix->col() << " Gain was measured to be " << slope << " which is outside the range of the summary plot (" <<maxGainInHist_ << ") !!!! " << std::endl;
+  if (slope > maxGainInHist_) {
+    makehistopersistent = true;
+    edm::LogWarning("SiPixelGainCalibration")
+        << "For DETID " << detid << "pixel row,col " << ipix->row() << "," << ipix->col() << " Gain was measured to be "
+        << slope << " which is outside the range of the summary plot (" << maxGainInHist_ << ") !!!! " << std::endl;
   }
-  bookkeeper_[detid]["dynamicrange_2d"]->setBinContent(ipix->col()+1,ipix->row()+1,highmeanval-lowmeanval);
-  bookkeeper_[detid]["plateau_2d"]->setBinContent(ipix->col()+1,ipix->row()+1,highmeanval);
-  bookkeeper_[detid]["gain_2d"]->setBinContent(ipix->col()+1,ipix->row()+1,slope);
-  bookkeeper_[detid]["errorgain_2d"]->setBinContent(ipix->col()+1,ipix->row()+1,slopeerror);
+  bookkeeper_[detid]["dynamicrange_2d"]->setBinContent(ipix->col() + 1, ipix->row() + 1, highmeanval - lowmeanval);
+  bookkeeper_[detid]["plateau_2d"]->setBinContent(ipix->col() + 1, ipix->row() + 1, highmeanval);
+  bookkeeper_[detid]["gain_2d"]->setBinContent(ipix->col() + 1, ipix->row() + 1, slope);
+  bookkeeper_[detid]["errorgain_2d"]->setBinContent(ipix->col() + 1, ipix->row() + 1, slopeerror);
   bookkeeper_[detid]["ped_1d"]->Fill(intercept);
-  bookkeeper_[detid]["ped_2d"]->setBinContent(ipix->col()+1,ipix->row()+1,intercept);
-  bookkeeper_[detid]["errorped_2d"]->setBinContent(ipix->col()+1,ipix->row()+1,intercepterror);
+  bookkeeper_[detid]["ped_2d"]->setBinContent(ipix->col() + 1, ipix->row() + 1, intercept);
+  bookkeeper_[detid]["errorped_2d"]->setBinContent(ipix->col() + 1, ipix->row() + 1, intercepterror);
   bookkeeper_[detid]["chi2_1d"]->Fill(chi2);
-  bookkeeper_[detid]["chi2_2d"]->setBinContent(ipix->col()+1,ipix->row()+1,chi2);
+  bookkeeper_[detid]["chi2_2d"]->setBinContent(ipix->col() + 1, ipix->row() + 1, chi2);
   bookkeeper_[detid]["prob_1d"]->Fill(prob);
-  bookkeeper_[detid]["prob_2d"]->setBinContent(ipix->col()+1,ipix->row()+1,prob);
+  bookkeeper_[detid]["prob_2d"]->setBinContent(ipix->col() + 1, ipix->row() + 1, prob);
   bookkeeper_[detid]["lowpoint_1d"]->Fill(xvals[0]);
-  bookkeeper_[detid]["lowpoint_2d"]->setBinContent(ipix->col()+1,ipix->row()+1,xvals[0]);
-  bookkeeper_[detid]["highpoint_1d"]->Fill(xvals[npoints-1]);
-  bookkeeper_[detid]["highpoint_2d"]->setBinContent(ipix->col()+1,ipix->row()+1,xvals[npoints-1]);
+  bookkeeper_[detid]["lowpoint_2d"]->setBinContent(ipix->col() + 1, ipix->row() + 1, xvals[0]);
+  bookkeeper_[detid]["highpoint_1d"]->Fill(xvals[npoints - 1]);
+  bookkeeper_[detid]["highpoint_2d"]->setBinContent(ipix->col() + 1, ipix->row() + 1, xvals[npoints - 1]);
   bookkeeper_[detid]["nfitpoints_1d"]->Fill(npoints);
-  bookkeeper_[detid]["endpoint_1d"]->Fill((255 - intercept)*slope);
-  bookkeeper_[detid]["status_2d"]->setBinContent(ipix->col()+1,ipix->row()+1,status);
+  bookkeeper_[detid]["endpoint_1d"]->Fill((255 - intercept) * slope);
+  bookkeeper_[detid]["status_2d"]->setBinContent(ipix->col() + 1, ipix->row() + 1, status);
 
-    if(!savePixelHists_)
+  if (!savePixelHists_)
     return true;
-  if(detidfinder==listofdetids_.end() && !listofdetids_.empty())
+  if (detidfinder == listofdetids_.end() && !listofdetids_.empty())
     return true;
-  if(makehistopersistent){
+  if (makehistopersistent) {
     std::ostringstream pixelinfo;
     pixelinfo << "GainCurve_row_" << ipix->row() << "_col_" << ipix->col();
-    std::string tempname=translateDetIdToString(detid);
-    tempname+="_";
-    tempname+=pixelinfo.str();
-    
+    std::string tempname = translateDetIdToString(detid);
+    tempname += "_";
+    tempname += pixelinfo.str();
+
     // and book the histo
-    // fill the last value of the vcal array...   
+    // fill the last value of the vcal array...
 
     setDQMDirectory(detid);
-    bookkeeper_pixels_[detid][pixelinfo.str()] =  bookDQMHistogram1D(detid,pixelinfo.str(),tempname,105*nallpoints,xvalsall[0],xvalsall[nallpoints-1]*1.05);
-    
-    edm::LogInfo("SiPixelGainCalibrationAnalysis") << "now saving histogram for pixel " << tempname << ", gain = " << slope << ", pedestal = " << intercept << ", chi2/NDF=" << chi2 << "(prob:" << prob << "), fit status " << status;
-    for(int ii=0; ii<nallpoints; ++ii){
+    bookkeeper_pixels_[detid][pixelinfo.str()] = bookDQMHistogram1D(
+        detid, pixelinfo.str(), tempname, 105 * nallpoints, xvalsall[0], xvalsall[nallpoints - 1] * 1.05);
+
+    edm::LogInfo("SiPixelGainCalibrationAnalysis")
+        << "now saving histogram for pixel " << tempname << ", gain = " << slope << ", pedestal = " << intercept
+        << ", chi2/NDF=" << chi2 << "(prob:" << prob << "), fit status " << status;
+    for (int ii = 0; ii < nallpoints; ++ii) {
       //      std::cout << xvalsall[ii]<<","<<yvalsall[ii]<< " " << tempfloats[ii] << std::endl;
-      bookkeeper_pixels_[detid][pixelinfo.str()]->Fill(xvalsall[ii],yvalsall[ii]);
+      bookkeeper_pixels_[detid][pixelinfo.str()]->Fill(xvalsall[ii], yvalsall[ii]);
     }
-    
+
     //    addTF1ToDQMMonitoringElement(bookkeeper_pixels_[detid][pixelinfo.str()],func_);
-    
-    
-    if(writeSummary_){
-      summary_<<"row_"<<ipix->row()<<" col_"<<ipix->col();
-      summary_<<" status_"<<status;
-      summary_<<endl;
-      
+
+    if (writeSummary_) {
+      summary_ << "row_" << ipix->row() << " col_" << ipix->col();
+      summary_ << " status_" << status;
+      summary_ << endl;
+
       //std::cout<<detid<<"  "<<"row " <<ipix->row()<<" col "<<ipix->col()<<"  "<<status<<"  "<<chi2<<"  "<<prob<<"  "<<npoints<<"  "<<xvals[0]<<"  "<<xvals[npoints-1]<<"  "<<plateauval<<std::endl;
     }
-  } 
+  }
   return true;
 }
 // ------------ method called to do fill new detids  ------------
-void 
-SiPixelGainCalibrationAnalysis::newDetID(uint32_t detid)
-{
+void SiPixelGainCalibrationAnalysis::newDetID(uint32_t detid) {
   setDQMDirectory(detid);
-  std::string tempname=translateDetIdToString(detid);
-  bookkeeper_[detid]["gain_1d"] = bookDQMHistogram1D(detid,"Gain1d","gain for "+tempname,100,0.,maxGainInHist_);
-  bookkeeper_[detid]["gain_2d"] = bookDQMHistoPlaquetteSummary2D(detid, "Gain2d","gain for "+tempname);
-  bookkeeper_[detid]["errorgain_2d"] = bookDQMHistoPlaquetteSummary2D(detid, "ErrorGain2d","error on gain for "+tempname);
-  bookkeeper_[detid]["ped_1d"] = bookDQMHistogram1D(detid,"Pedestal1d","pedestal for "+tempname,256,0.,256.0);
-  bookkeeper_[detid]["ped_2d"] = bookDQMHistoPlaquetteSummary2D(detid,"Pedestal2d","pedestal for "+tempname);
-  bookkeeper_[detid]["errorped_2d"] = bookDQMHistoPlaquetteSummary2D(detid,"ErrorPedestal2d","error on pedestal for "+tempname);
-  bookkeeper_[detid]["chi2_1d"] = bookDQMHistogram1D(detid,"GainChi2NDF1d","#chi^{2}/NDOF for "+tempname,100,0.,maxChi2InHist_);
-  bookkeeper_[detid]["chi2_2d"] = bookDQMHistoPlaquetteSummary2D(detid,"GainChi2NDF2d","#chi^{2}/NDOF for "+tempname);
-  bookkeeper_[detid]["prob_1d"] = bookDQMHistogram1D(detid,"GainChi2Prob1d","P(#chi^{2},NDOF) for "+tempname,100,0.,1.0);
-  bookkeeper_[detid]["prob_2d"] = bookDQMHistoPlaquetteSummary2D(detid,"GainChi2Prob2d","P(#chi^{2},NDOF) for "+tempname);
-  bookkeeper_[detid]["status_2d"] = bookDQMHistoPlaquetteSummary2D(detid,"GainFitResult2d","Fit result for "+tempname);
-  bookkeeper_[detid]["endpoint_1d"]= bookDQMHistogram1D(detid,"GainEndPoint1d","point where fit meets ADC=255 for "+tempname,256,0.,256.*scalarVcalHigh_VcalLow_);
-  bookkeeper_[detid]["lowpoint_1d"]= bookDQMHistogram1D(detid,"GainLowPoint1d","lowest fit point for "+tempname,256,0.,256.*scalarVcalHigh_VcalLow_);
-  bookkeeper_[detid]["highpoint_1d"]= bookDQMHistogram1D(detid,"GainHighPoint1d","highest fit point for "+tempname,256,0.,256.*scalarVcalHigh_VcalLow_);
-  bookkeeper_[detid]["nfitpoints_1d"]= bookDQMHistogram1D(detid,"GainNPoints1d","number of fit point for "+tempname,20,0.,20);
-  bookkeeper_[detid]["dynamicrange_2d"]=bookDQMHistoPlaquetteSummary2D(detid,"GainDynamicRange2d","Difference lowest and highest points on gain curve for "+tempname); 
-  bookkeeper_[detid]["lowpoint_2d"]=bookDQMHistoPlaquetteSummary2D(detid,"GainLowPoint2d","lowest fit point for "+tempname);
-  bookkeeper_[detid]["highpoint_2d"]=bookDQMHistoPlaquetteSummary2D(detid,"GainHighPoint2d","highest fit point for "+tempname);
-  bookkeeper_[detid]["plateau_2d"]=bookDQMHistoPlaquetteSummary2D(detid,"GainSaturate2d","Highest points on gain curve for "+tempname);
-
+  std::string tempname = translateDetIdToString(detid);
+  bookkeeper_[detid]["gain_1d"] = bookDQMHistogram1D(detid, "Gain1d", "gain for " + tempname, 100, 0., maxGainInHist_);
+  bookkeeper_[detid]["gain_2d"] = bookDQMHistoPlaquetteSummary2D(detid, "Gain2d", "gain for " + tempname);
+  bookkeeper_[detid]["errorgain_2d"] =
+      bookDQMHistoPlaquetteSummary2D(detid, "ErrorGain2d", "error on gain for " + tempname);
+  bookkeeper_[detid]["ped_1d"] = bookDQMHistogram1D(detid, "Pedestal1d", "pedestal for " + tempname, 256, 0., 256.0);
+  bookkeeper_[detid]["ped_2d"] = bookDQMHistoPlaquetteSummary2D(detid, "Pedestal2d", "pedestal for " + tempname);
+  bookkeeper_[detid]["errorped_2d"] =
+      bookDQMHistoPlaquetteSummary2D(detid, "ErrorPedestal2d", "error on pedestal for " + tempname);
+  bookkeeper_[detid]["chi2_1d"] =
+      bookDQMHistogram1D(detid, "GainChi2NDF1d", "#chi^{2}/NDOF for " + tempname, 100, 0., maxChi2InHist_);
+  bookkeeper_[detid]["chi2_2d"] =
+      bookDQMHistoPlaquetteSummary2D(detid, "GainChi2NDF2d", "#chi^{2}/NDOF for " + tempname);
+  bookkeeper_[detid]["prob_1d"] =
+      bookDQMHistogram1D(detid, "GainChi2Prob1d", "P(#chi^{2},NDOF) for " + tempname, 100, 0., 1.0);
+  bookkeeper_[detid]["prob_2d"] =
+      bookDQMHistoPlaquetteSummary2D(detid, "GainChi2Prob2d", "P(#chi^{2},NDOF) for " + tempname);
+  bookkeeper_[detid]["status_2d"] =
+      bookDQMHistoPlaquetteSummary2D(detid, "GainFitResult2d", "Fit result for " + tempname);
+  bookkeeper_[detid]["endpoint_1d"] = bookDQMHistogram1D(
+      detid, "GainEndPoint1d", "point where fit meets ADC=255 for " + tempname, 256, 0., 256. * scalarVcalHigh_VcalLow_);
+  bookkeeper_[detid]["lowpoint_1d"] = bookDQMHistogram1D(
+      detid, "GainLowPoint1d", "lowest fit point for " + tempname, 256, 0., 256. * scalarVcalHigh_VcalLow_);
+  bookkeeper_[detid]["highpoint_1d"] = bookDQMHistogram1D(
+      detid, "GainHighPoint1d", "highest fit point for " + tempname, 256, 0., 256. * scalarVcalHigh_VcalLow_);
+  bookkeeper_[detid]["nfitpoints_1d"] =
+      bookDQMHistogram1D(detid, "GainNPoints1d", "number of fit point for " + tempname, 20, 0., 20);
+  bookkeeper_[detid]["dynamicrange_2d"] = bookDQMHistoPlaquetteSummary2D(
+      detid, "GainDynamicRange2d", "Difference lowest and highest points on gain curve for " + tempname);
+  bookkeeper_[detid]["lowpoint_2d"] =
+      bookDQMHistoPlaquetteSummary2D(detid, "GainLowPoint2d", "lowest fit point for " + tempname);
+  bookkeeper_[detid]["highpoint_2d"] =
+      bookDQMHistoPlaquetteSummary2D(detid, "GainHighPoint2d", "highest fit point for " + tempname);
+  bookkeeper_[detid]["plateau_2d"] =
+      bookDQMHistoPlaquetteSummary2D(detid, "GainSaturate2d", "Highest points on gain curve for " + tempname);
 }
 //define this as a plug-in
 DEFINE_FWK_MODULE(SiPixelGainCalibrationAnalysis);
diff --git a/CalibTracker/SiPixelGainCalibration/plugins/SiPixelGainCalibrationAnalysis.h b/CalibTracker/SiPixelGainCalibration/plugins/SiPixelGainCalibrationAnalysis.h
index cf555844f63c9..05f2644f75b7c 100644
--- a/CalibTracker/SiPixelGainCalibration/plugins/SiPixelGainCalibrationAnalysis.h
+++ b/CalibTracker/SiPixelGainCalibration/plugins/SiPixelGainCalibrationAnalysis.h
@@ -2,7 +2,7 @@
 //
 // Package:    SiPixelGainCalibrationAnalysis
 // Class:      SiPixelGainCalibrationAnalysis
-// 
+//
 /**\class SiPixelGainCalibrationAnalysis SiPixelGainCalibrationAnalysis.h CalibTracker/SiPixelGainCalibrationAnalysis/interface/SiPixelGainCalibrationAnalysis.h
 
 Description: <one line class summary>
@@ -16,7 +16,6 @@ Description: <one line class summary>
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -47,28 +46,27 @@ Description: <one line class summary>
 
 class SiPixelGainCalibrationAnalysis : public SiPixelOfflineCalibAnalysisBase {
 public:
-  explicit SiPixelGainCalibrationAnalysis(const edm::ParameterSet& iConfig);
+  explicit SiPixelGainCalibrationAnalysis(const edm::ParameterSet &iConfig);
   ~SiPixelGainCalibrationAnalysis() override;
 
-  void doSetup(const edm::ParameterSet&);
+  void doSetup(const edm::ParameterSet &);
   bool doFits(uint32_t detid, std::vector<SiPixelCalibDigi>::const_iterator ipix) override;
 
   bool checkCorrectCalibrationType() override;
 
 private:
-      
-  void calibrationSetup(const edm::EventSetup& iSetup) override;
-      
+  void calibrationSetup(const edm::EventSetup &iSetup) override;
+
   void calibrationEnd() override;
   void newDetID(uint32_t detid) override;
   void fillDatabase();
   void printSummary();
   std::vector<float> CalculateAveragePerColumn(uint32_t detid, std::string label);
-  // ----------member data --------------------------- 
+  // ----------member data ---------------------------
   edm::ParameterSet conf_;
   // more class members used to keep track of the histograms
-  std::map<uint32_t,std::map<std::string, MonitorElement *> > bookkeeper_;
-  std::map<uint32_t,std::map<std::string, MonitorElement *> > bookkeeper_pixels_;
+  std::map<uint32_t, std::map<std::string, MonitorElement *> > bookkeeper_;
+  std::map<uint32_t, std::map<std::string, MonitorElement *> > bookkeeper_pixels_;
 
   // fitter
   int nfitparameters_;
@@ -97,9 +95,9 @@ class SiPixelGainCalibrationAnalysis : public SiPixelOfflineCalibAnalysisBase {
   bool sum_gain_cols_;
   bool filldb_;
   bool writeSummary_;
-  
-  // parameters for database output  
-  std::string  recordName_;
+
+  // parameters for database output
+  std::string recordName_;
   bool appendMode_;
   /*SiPixelGainCalibration *theGainCalibrationDbInput_;
   SiPixelGainCalibrationOffline *theGainCalibrationDbInputOffline_;
@@ -114,10 +112,9 @@ class SiPixelGainCalibrationAnalysis : public SiPixelOfflineCalibAnalysisBase {
   uint16_t min_nentries_;
   bool useVcalHigh_;
   double scalarVcalHigh_VcalLow_;
-  
+
   //Summary
   std::ofstream summary_;
   uint32_t currentDetID_;
-  int* statusNumbers_;
-  
+  int *statusNumbers_;
 };
diff --git a/CalibTracker/SiPixelGainCalibration/test/SealModules.cc b/CalibTracker/SiPixelGainCalibration/test/SealModules.cc
index faad0a1bed039..b48311f451c74 100644
--- a/CalibTracker/SiPixelGainCalibration/test/SealModules.cc
+++ b/CalibTracker/SiPixelGainCalibration/test/SealModules.cc
@@ -3,6 +3,4 @@
 
 #include "CalibTracker/SiPixelGainCalibration/test/SimpleTestPrintOutPixelCalibAnalyzer.h"
 
-
-
 DEFINE_FWK_MODULE(SimpleTestPrintOutPixelCalibAnalyzer);
diff --git a/CalibTracker/SiPixelGainCalibration/test/SimpleTestPrintOutPixelCalibAnalyzer.cc b/CalibTracker/SiPixelGainCalibration/test/SimpleTestPrintOutPixelCalibAnalyzer.cc
index 9236d13051c74..abc9ddea7be05 100644
--- a/CalibTracker/SiPixelGainCalibration/test/SimpleTestPrintOutPixelCalibAnalyzer.cc
+++ b/CalibTracker/SiPixelGainCalibration/test/SimpleTestPrintOutPixelCalibAnalyzer.cc
@@ -2,7 +2,7 @@
 //
 // Package:    SimpleTestPrintOutPixelCalibAnalyzer
 // Class:      SimpleTestPrintOutPixelCalibAnalyzer
-// 
+//
 /**\class SimpleTestPrintOutPixelCalibAnalyzer CalibTracker/SiPixelGainCalibration/test/SimpleTestPrintOutPixelCalibAnalyzer.cc
 
  Description: <one line class summary>
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -45,62 +44,45 @@
 SimpleTestPrintOutPixelCalibAnalyzer::SimpleTestPrintOutPixelCalibAnalyzer(const edm::ParameterSet& iConfig)
 
 {
-  tPixelCalibDigi = consumes <edm::DetSetVector<SiPixelCalibDigi> > (edm::InputTag("siPixelCalibDigis"));
-
+  tPixelCalibDigi = consumes<edm::DetSetVector<SiPixelCalibDigi> >(edm::InputTag("siPixelCalibDigis"));
 }
 
-
-SimpleTestPrintOutPixelCalibAnalyzer::~SimpleTestPrintOutPixelCalibAnalyzer()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+SimpleTestPrintOutPixelCalibAnalyzer::~SimpleTestPrintOutPixelCalibAnalyzer() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
-void
-SimpleTestPrintOutPixelCalibAnalyzer::printInfo(const edm::Event& iEvent, const edm::EventSetup& iSetup){
-
+void SimpleTestPrintOutPixelCalibAnalyzer::printInfo(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   using namespace edm;
-  
+
   Handle<DetSetVector<SiPixelCalibDigi> > pIn;
-  iEvent.getByToken(tPixelCalibDigi,pIn);
+  iEvent.getByToken(tPixelCalibDigi, pIn);
 
   DetSetVector<SiPixelCalibDigi>::const_iterator digiIter;
-  for(digiIter=pIn->begin(); digiIter!=pIn->end(); ++digiIter){
+  for (digiIter = pIn->begin(); digiIter != pIn->end(); ++digiIter) {
     uint32_t detid = digiIter->id;
     DetSet<SiPixelCalibDigi>::const_iterator ipix;
-    for(ipix= digiIter->data.begin(); ipix!=digiIter->end(); ++ipix){
-      std::cout  << std::endl;
-      for(uint32_t ipoint=0; ipoint<ipix->getnpoints(); ++ipoint)
-	std::cout << "\t Det ID " << detid << " row:" << ipix->row() << " col:" << ipix->col() << " point " << ipoint << " has " << ipix->getnentries(ipoint) << " entries, adc: " << ipix->getsum(ipoint) << ", adcsq: " << ipix->getsumsquares(ipoint) << std::endl;
+    for (ipix = digiIter->data.begin(); ipix != digiIter->end(); ++ipix) {
+      std::cout << std::endl;
+      for (uint32_t ipoint = 0; ipoint < ipix->getnpoints(); ++ipoint)
+        std::cout << "\t Det ID " << detid << " row:" << ipix->row() << " col:" << ipix->col() << " point " << ipoint
+                  << " has " << ipix->getnentries(ipoint) << " entries, adc: " << ipix->getsum(ipoint)
+                  << ", adcsq: " << ipix->getsumsquares(ipoint) << std::endl;
     }
   }
-
 }
 // ------------ method called to for each event  ------------
-void
-SimpleTestPrintOutPixelCalibAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace edm;
-
-   printInfo(iEvent,iSetup);
+void SimpleTestPrintOutPixelCalibAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
+  using namespace edm;
 
+  printInfo(iEvent, iSetup);
 }
 
-
 // ------------ method called once each job just before starting event loop  ------------
-void 
-SimpleTestPrintOutPixelCalibAnalyzer::beginJob()
-{
-}
+void SimpleTestPrintOutPixelCalibAnalyzer::beginJob() {}
 
 // ------------ method called once each job just after ending the event loop  ------------
-void 
-SimpleTestPrintOutPixelCalibAnalyzer::endJob() {
-}
-
+void SimpleTestPrintOutPixelCalibAnalyzer::endJob() {}
diff --git a/CalibTracker/SiPixelGainCalibration/test/SimpleTestPrintOutPixelCalibAnalyzer.h b/CalibTracker/SiPixelGainCalibration/test/SimpleTestPrintOutPixelCalibAnalyzer.h
index afde1ee078802..6346922cf90a5 100644
--- a/CalibTracker/SiPixelGainCalibration/test/SimpleTestPrintOutPixelCalibAnalyzer.h
+++ b/CalibTracker/SiPixelGainCalibration/test/SimpleTestPrintOutPixelCalibAnalyzer.h
@@ -2,7 +2,7 @@
 //
 // Package:    SimpleTestPrintOutPixelCalibAnalyzer
 // Class:      SimpleTestPrintOutPixelCalibAnalyzer
-// 
+//
 /**\class SimpleTestPrintOutPixelCalibAnalyzer CalibTracker/SiPixelGainCalibration/test/SimpleTestPrintOutPixelCalibAnalyzer.cc
 
  Description: <one line class summary>
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -37,16 +36,14 @@ class SimpleTestPrintOutPixelCalibAnalyzer : public edm::EDAnalyzer {
 public:
   explicit SimpleTestPrintOutPixelCalibAnalyzer(const edm::ParameterSet&);
   ~SimpleTestPrintOutPixelCalibAnalyzer();
-  
-  
+
 private:
-  virtual void beginJob() ;
+  virtual void beginJob();
   virtual void analyze(const edm::Event&, const edm::EventSetup&);
-  virtual void printInfo(const edm::Event&, const edm::EventSetup&); // print method added by Freya, this way the analyzer stays clean
-  virtual void endJob() ;
+  virtual void printInfo(const edm::Event&,
+                         const edm::EventSetup&);  // print method added by Freya, this way the analyzer stays clean
+  virtual void endJob();
 
-      // ----------member data ---------------------------
+  // ----------member data ---------------------------
   edm::EDGetTokenT<edm::DetSetVector<SiPixelCalibDigi> > tPixelCalibDigi;
-
 };
-
diff --git a/CalibTracker/SiPixelIsAliveCalibration/src/SiPixelIsAliveCalibration.cc b/CalibTracker/SiPixelIsAliveCalibration/src/SiPixelIsAliveCalibration.cc
index 870cbc08392f6..720a2fac128c3 100644
--- a/CalibTracker/SiPixelIsAliveCalibration/src/SiPixelIsAliveCalibration.cc
+++ b/CalibTracker/SiPixelIsAliveCalibration/src/SiPixelIsAliveCalibration.cc
@@ -2,8 +2,9 @@
 //
 // Package:    SiPixelIsAliveCalibrationAnalyzer
 // Class:      SiPixelIsAliveCalibrationAnalyzer
-// 
-/**\class SiPixelIsAliveCalibration SiPixelIsAliveCalibration.cc CalibTracker/SiPixelIsAliveCalibration/src/SiPixelIsAliveCalibration.cc
+//
+/**\class SiPixelIsAliveCalibration SiPixelIsAliveCalibration.cc
+ CalibTracker/SiPixelIsAliveCalibration/src/SiPixelIsAliveCalibration.cc
 
  Description: <one line class summary>
 
@@ -16,7 +17,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -25,34 +25,32 @@
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "CalibTracker/SiPixelTools/interface/SiPixelOfflineCalibAnalysisBase.h"
-#include "DataFormats/SiPixelDigi/interface/SiPixelCalibDigi.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "DataFormats/SiPixelDigi/interface/SiPixelCalibDigi.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 //
 // class decleration
 //
 
 class SiPixelIsAliveCalibration : public SiPixelOfflineCalibAnalysisBase {
-   public:
-      explicit SiPixelIsAliveCalibration(const edm::ParameterSet&);
-      ~SiPixelIsAliveCalibration() override;
+public:
+  explicit SiPixelIsAliveCalibration(const edm::ParameterSet &);
+  ~SiPixelIsAliveCalibration() override;
 
   void doSetup(const edm::ParameterSet &);
-      bool doFits(uint32_t detid, std::vector<SiPixelCalibDigi>::const_iterator ipix) override;
-  
+  bool doFits(uint32_t detid, std::vector<SiPixelCalibDigi>::const_iterator ipix) override;
 
-   private:
-  
-      void calibrationSetup(const edm::EventSetup&) override ;
-      void calibrationEnd() override ;
+private:
+  void calibrationSetup(const edm::EventSetup &) override;
+  void calibrationEnd() override;
   void newDetID(uint32_t detid) override;
   bool checkCorrectCalibrationType() override;
-      // ----------member data ---------------------------
+  // ----------member data ---------------------------
 
-  std::map<uint32_t,MonitorElement *> bookkeeper_;
-  std::map<uint32_t,MonitorElement *> summaries_;
+  std::map<uint32_t, MonitorElement *> bookkeeper_;
+  std::map<uint32_t, MonitorElement *> summaries_;
   double mineff_;
 };
 
@@ -67,115 +65,110 @@ class SiPixelIsAliveCalibration : public SiPixelOfflineCalibAnalysisBase {
 //
 // constructors and destructor
 //
-SiPixelIsAliveCalibration::SiPixelIsAliveCalibration(const edm::ParameterSet& iConfig):
-  SiPixelOfflineCalibAnalysisBase(iConfig),
-  mineff_(iConfig.getUntrackedParameter<double>("minEfficiencyForAliveDef",0.8))
-{
-   //now do what ever initialization is needed
-
+SiPixelIsAliveCalibration::SiPixelIsAliveCalibration(const edm::ParameterSet &iConfig)
+    : SiPixelOfflineCalibAnalysisBase(iConfig),
+      mineff_(iConfig.getUntrackedParameter<double>("minEfficiencyForAliveDef", 0.8)) {
+  // now do what ever initialization is needed
 }
 
-
-SiPixelIsAliveCalibration::~SiPixelIsAliveCalibration()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+SiPixelIsAliveCalibration::~SiPixelIsAliveCalibration() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
-void 
-SiPixelIsAliveCalibration::newDetID(uint32_t detid){
+void SiPixelIsAliveCalibration::newDetID(uint32_t detid) {
   setDQMDirectory(detid);
-  std::string tempname=translateDetIdToString(detid);
-  bookkeeper_[detid]= bookDQMHistoPlaquetteSummary2D(detid,"pixelAlive","pixel alive for "+tempname); 
+  std::string tempname = translateDetIdToString(detid);
+  bookkeeper_[detid] = bookDQMHistoPlaquetteSummary2D(detid, "pixelAlive", "pixel alive for " + tempname);
   int xpix = bookkeeper_[detid]->getNbinsX();
   int ypix = bookkeeper_[detid]->getNbinsY();
-  int tpix = xpix*ypix;
-  summaries_[detid]= bookDQMHistogram1D(detid,"pixelAliveSummary",bookkeeper_[detid]->getTitle(),calib_->getNTriggers()+1,-.05,.95+(1./(float)calib_->getNTriggers()));
+  int tpix = xpix * ypix;
+  summaries_[detid] = bookDQMHistogram1D(detid,
+                                         "pixelAliveSummary",
+                                         bookkeeper_[detid]->getTitle(),
+                                         calib_->getNTriggers() + 1,
+                                         -.05,
+                                         .95 + (1. / (float)calib_->getNTriggers()));
   summaries_[detid]->setBinContent(1, tpix);
 }
-bool
-SiPixelIsAliveCalibration::checkCorrectCalibrationType(){
-  if(calibrationMode_=="PixelAlive")
+bool SiPixelIsAliveCalibration::checkCorrectCalibrationType() {
+  if (calibrationMode_ == "PixelAlive")
     return true;
-  else if(calibrationMode_=="unknown"){
-    edm::LogInfo("SiPixelIsAliveCalibration") <<  "calibration mode is: " << calibrationMode_ << ", continuing anyway..." ;
+  else if (calibrationMode_ == "unknown") {
+    edm::LogInfo("SiPixelIsAliveCalibration")
+        << "calibration mode is: " << calibrationMode_ << ", continuing anyway...";
     return true;
-  }
-  else{
-    //    edm::LogError("SiPixelIsAliveCalibration")<< "unknown calibration mode for Pixel ALive, should be \"PixelAlive\" and is \"" << calibrationMode_ << "\"";
+  } else {
+    //    edm::LogError("SiPixelIsAliveCalibration")<< "unknown calibration mode
+    //    for Pixel ALive, should be \"PixelAlive\" and is \"" <<
+    //    calibrationMode_ << "\"";
   }
   return false;
-
-}
-void SiPixelIsAliveCalibration::doSetup(const edm::ParameterSet &iConf){
-
 }
-void 
-SiPixelIsAliveCalibration::calibrationSetup(const edm::EventSetup & iSetup){
-
-}
-bool
-SiPixelIsAliveCalibration::doFits(uint32_t detid, std::vector<SiPixelCalibDigi>::const_iterator ipix){
-  edm::LogInfo("SiPixelIsAliveCalibration") << "now looking at DetID " << detid << ", pixel " << ipix->row() << "," << ipix->col() << std::endl;
-  
-  double denom=0;
-  double nom=0;
-  for(uint32_t i=0; i<ipix->getnpoints(); i++){
-    nom+=ipix->getnentries(i);
-    denom+=calib_->getNTriggers();
-    if(i>0)
-      edm::LogWarning("SiPixelIsAliveCalibration::doFits") << " ERROR!!" << " number of vcal points is now " << i << " for detid " << detid << std::endl;
+void SiPixelIsAliveCalibration::doSetup(const edm::ParameterSet &iConf) {}
+void SiPixelIsAliveCalibration::calibrationSetup(const edm::EventSetup &iSetup) {}
+bool SiPixelIsAliveCalibration::doFits(uint32_t detid, std::vector<SiPixelCalibDigi>::const_iterator ipix) {
+  edm::LogInfo("SiPixelIsAliveCalibration")
+      << "now looking at DetID " << detid << ", pixel " << ipix->row() << "," << ipix->col() << std::endl;
+
+  double denom = 0;
+  double nom = 0;
+  for (uint32_t i = 0; i < ipix->getnpoints(); i++) {
+    nom += ipix->getnentries(i);
+    denom += calib_->getNTriggers();
+    if (i > 0)
+      edm::LogWarning("SiPixelIsAliveCalibration::doFits")
+          << " ERROR!!"
+          << " number of vcal points is now " << i << " for detid " << detid << std::endl;
   }
-  edm::LogInfo("SiPixelIsAliveCalibration") << "DetID/col/row " << detid << "/"<< ipix->col() << "/" << ipix->row() << ", now calculating efficiency: " << nom << "/" << denom <<"=" << nom/denom << std::endl;
+  edm::LogInfo("SiPixelIsAliveCalibration")
+      << "DetID/col/row " << detid << "/" << ipix->col() << "/" << ipix->row()
+      << ", now calculating efficiency: " << nom << "/" << denom << "=" << nom / denom << std::endl;
   double eff = -1;
-  if(denom>0)
-    eff = nom/denom;
-  if(bookkeeper_[detid]->getBinContent(ipix->col()+1,ipix->row()+1)==0){
+  if (denom > 0)
+    eff = nom / denom;
+  if (bookkeeper_[detid]->getBinContent(ipix->col() + 1, ipix->row() + 1) == 0) {
     bookkeeper_[detid]->Fill(ipix->col(), ipix->row(), eff);
     summaries_[detid]->Fill(eff);
     float zerobin = summaries_[detid]->getBinContent(1);
-    summaries_[detid]->setBinContent(1, zerobin-1);
-  }
-  else
-    bookkeeper_[detid]->setBinContent(ipix->col()+1,ipix->row()+1,-2);
+    summaries_[detid]->setBinContent(1, zerobin - 1);
+  } else
+    bookkeeper_[detid]->setBinContent(ipix->col() + 1, ipix->row() + 1, -2);
   return true;
 }
 
-void
-SiPixelIsAliveCalibration::calibrationEnd(){
+void SiPixelIsAliveCalibration::calibrationEnd() {
   // print summary of bad modules:
-  for(std::map<uint32_t, MonitorElement *>::const_iterator idet= bookkeeper_.begin(); idet!=bookkeeper_.end();++idet){
+  for (std::map<uint32_t, MonitorElement *>::const_iterator idet = bookkeeper_.begin(); idet != bookkeeper_.end();
+       ++idet) {
     float idead = 0;
-    float iunderthres=0;
-    float imultiplefill=0;
-    float itot=0;
-    uint32_t detid=idet->first;
+    float iunderthres = 0;
+    float imultiplefill = 0;
+    float itot = 0;
+    uint32_t detid = idet->first;
 
     setDQMDirectory(detid);
-    for(int icol=1; icol <= bookkeeper_[detid]->getNbinsX(); ++icol){
-      for(int irow=1; irow <= bookkeeper_[detid]->getNbinsY(); ++irow){
-	itot++;
-	double val = bookkeeper_[detid]->getBinContent(icol,irow);
-	if(val==0)
-	  idead++;
-	if(val<mineff_)
-	  iunderthres++;
-	if(val==-2)
-	  imultiplefill++;
-	
+    for (int icol = 1; icol <= bookkeeper_[detid]->getNbinsX(); ++icol) {
+      for (int irow = 1; irow <= bookkeeper_[detid]->getNbinsY(); ++irow) {
+        itot++;
+        double val = bookkeeper_[detid]->getBinContent(icol, irow);
+        if (val == 0)
+          idead++;
+        if (val < mineff_)
+          iunderthres++;
+        if (val == -2)
+          imultiplefill++;
       }
     }
-    edm::LogInfo("SiPixelIsAliveCalibration") << "summary for " << translateDetIdToString(detid) << "\tfrac dead:" << idead/itot << " frac below " << mineff_ << ":" << iunderthres/itot << " bad " <<  imultiplefill/itot << std::endl;
+    edm::LogInfo("SiPixelIsAliveCalibration")
+        << "summary for " << translateDetIdToString(detid) << "\tfrac dead:" << idead / itot << " frac below "
+        << mineff_ << ":" << iunderthres / itot << " bad " << imultiplefill / itot << std::endl;
   }
-
 }
 // ---------- method called to for each event  ------------
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SiPixelIsAliveCalibration);
diff --git a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc
index 9426c8991039e..a439e68ddcd18 100644
--- a/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc
+++ b/CalibTracker/SiPixelLorentzAngle/src/SiPixelLorentzAngle.cc
@@ -351,10 +351,10 @@ void SiPixelLorentzAngle::analyze(const edm::Event& e, const edm::EventSetup& es
 	  bladeF_ = tTopo->pxfBlade(detIdObj);
 	  panelF_ = tTopo->pxfPanel(detIdObj);
 	  moduleF_ = tTopo->pxfModule(detIdObj);
-	  // 					float tmp1 = theGeomDet->surface().toGlobal(Local3DPoint(0.,0.,0.)).perp();
-	  // 					float tmp2 = theGeomDet->surface().toGlobal(Local3DPoint(0.,0.,1.)).perp();
-	  // 					if ( tmp2<tmp1 ) isflipped_ = 1;
-	  // 					else isflipped_ = 0;
+	  //float tmp1 = theGeomDet->surface().toGlobal(Local3DPoint(0.,0.,0.)).perp();
+	  //float tmp2 = theGeomDet->surface().toGlobal(Local3DPoint(0.,0.,1.)).perp();
+	  //if ( tmp2<tmp1 ) isflipped_ = 1;
+	  //else isflipped_ = 0;
 	  const SiPixelRecHit * recHitPix = dynamic_cast<const SiPixelRecHit *>((*recHit).hit());
 	  if(!recHitPix) continue;
 	  rechitF_.x  = recHitPix->localPosition().x();
diff --git a/CalibTracker/SiPixelQuality/test/step3_SiPixelStatusAlCaRecoProducer.py b/CalibTracker/SiPixelQuality/test/step3_SiPixelStatusAlCaRecoProducer.py
index 22fa8e5db0048..29be3ccbcca6d 100644
--- a/CalibTracker/SiPixelQuality/test/step3_SiPixelStatusAlCaRecoProducer.py
+++ b/CalibTracker/SiPixelQuality/test/step3_SiPixelStatusAlCaRecoProducer.py
@@ -1,7 +1,7 @@
 import os
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process('PCL',eras.Run2_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process('PCL',Run2_2017)
 
 # ----------------------------------------------------------------------
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
diff --git a/CalibTracker/SiPixelQuality/test/step4_ALCAHARVEST.py b/CalibTracker/SiPixelQuality/test/step4_ALCAHARVEST.py
index 99052c8132e48..07b84e3ea193a 100644
--- a/CalibTracker/SiPixelQuality/test/step4_ALCAHARVEST.py
+++ b/CalibTracker/SiPixelQuality/test/step4_ALCAHARVEST.py
@@ -5,9 +5,9 @@
 # with command line options: step4 --conditions 100X_dataRun2_Express_v2 -s ALCAHARVEST:SiPixelQuality --data --era Run2_2017 --filein file:PromptCalibProdSiPixel.root --scenario pp -n 1 --fileout file:step4.root
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('ALCAHARVEST',eras.Run2_2018)
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+process = cms.Process('ALCAHARVEST',Run2_2018)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/CalibTracker/SiPixelSCurveCalibration/interface/SiPixelSCurveCalibrationAnalysis.h b/CalibTracker/SiPixelSCurveCalibration/interface/SiPixelSCurveCalibrationAnalysis.h
index 7a3935b19ebf6..6e61aec577942 100644
--- a/CalibTracker/SiPixelSCurveCalibration/interface/SiPixelSCurveCalibrationAnalysis.h
+++ b/CalibTracker/SiPixelSCurveCalibration/interface/SiPixelSCurveCalibrationAnalysis.h
@@ -3,8 +3,9 @@
 //
 // Package:    SiPixelSCurveCalibrationAnalysis
 // Class:      SiPixelSCurveCalibrationAnalysis
-// 
-/**\class SiPixelSCurveCalibrationAnalysis SiPixelSCurveCalibrationAnalysis.cc CalibTracker/SiPixelSCurveCalibration/src/SiPixelSCurveCalibrationAnalysis.cc
+//
+/**\class SiPixelSCurveCalibrationAnalysis SiPixelSCurveCalibrationAnalysis.cc
+ CalibTracker/SiPixelSCurveCalibration/src/SiPixelSCurveCalibrationAnalysis.cc
 
  Description: <one line class summary>
 
@@ -17,7 +18,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -27,91 +27,100 @@
 #include <iomanip>
 //
 enum sCurveHistogramType {
-   kSigmaSummary,       //1d
-   kSigmas,             //2d
-   kThresholdSummary,   //1d
-   kThresholds,         //2d
-   kChi2Summary,        //1d
-   kChi2s,              //2d
-   kFitResults,         //2d
-   kFitResultSummary   //1d
+  kSigmaSummary,      // 1d
+  kSigmas,            // 2d
+  kThresholdSummary,  // 1d
+  kThresholds,        // 2d
+  kChi2Summary,       // 1d
+  kChi2s,             // 2d
+  kFitResults,        // 2d
+  kFitResultSummary   // 1d
 };
 
 enum sCurveErrorFlag {
-   errNoDigi,                   //default value (will actually never get passed to the analyzer, but included for consistency when viewing histograms) 
-   errOK,                       //everything is OK
-   errFlaggedBadByUser,         //fit converged, but parameters are outside a user specified range (i.e. noise (sigma) > 6 ADC counts)
-   errBadChi2Prob,              //fit converged, but failed user specified chi2 test
-   errFitNonPhysical,           //fit converged, but in a nonsensical region (i.e. vCalMax < threshold < 0, sigma > vCalMax, etc)
-   errNoTurnOn,                 //sCurve never turned on above 90%
-   errAllZeros                  //sCurve was all zeros.  This shouldn't ever happen, (all zeros would prevent a CalibDigi from being produced) but is included as a potential tool for potential future debugging        
+  errNoDigi,            // default value (will actually never get passed to the analyzer,
+                        // but included for consistency when viewing histograms)
+  errOK,                // everything is OK
+  errFlaggedBadByUser,  // fit converged, but parameters are outside a user
+                        // specified range (i.e. noise (sigma) > 6 ADC counts)
+  errBadChi2Prob,       // fit converged, but failed user specified chi2 test
+  errFitNonPhysical,    // fit converged, but in a nonsensical region (i.e. vCalMax
+                        // < threshold < 0, sigma > vCalMax, etc)
+  errNoTurnOn,          // sCurve never turned on above 90%
+  errAllZeros           // sCurve was all zeros.  This shouldn't ever happen, (all zeros
+                        // would prevent a CalibDigi from being produced) but is included
+                        // as a potential tool for potential future debugging
 };
 
-
-typedef std::map<sCurveHistogramType, MonitorElement*> sCurveHistogramHolder;
+typedef std::map<sCurveHistogramType, MonitorElement *> sCurveHistogramHolder;
 typedef std::map<uint32_t, sCurveHistogramHolder> detIDHistogramMap;
 
 // class decleration
 //
 
 class SiPixelSCurveCalibrationAnalysis : public SiPixelOfflineCalibAnalysisBase {
-   public:
-      explicit SiPixelSCurveCalibrationAnalysis(const edm::ParameterSet& iConfig):SiPixelOfflineCalibAnalysisBase(iConfig){doSetup(iConfig);};
-      ~SiPixelSCurveCalibrationAnalysis() override;
-      void doSetup(const edm::ParameterSet&);
-
-      bool doFits(uint32_t detid, std::vector<SiPixelCalibDigi>::const_iterator ipix) override;
-
-      static std::vector<float> efficiencies_;
-      static std::vector<float> effErrors_;
-      std::vector<float> vCalPointsAsFloats_;  //need to save single histograms
-
-      sCurveErrorFlag estimateSCurveParameters(const std::vector<float>& eff, float& threshold, float& sigma);
-      sCurveErrorFlag fittedSCurveSanityCheck(float threshold, float sigma, float amplitude);
-
-      void            buildACurveHistogram(const uint32_t& detid, const uint32_t& row, 
-                                           const uint32_t& col, sCurveErrorFlag errorFlag, 
-                                           const std::vector<float>& efficiencies, const std::vector<float>& errors);
-
-   private:
-      //configuration options
-      bool                      useDetectorHierarchyFolders_;
-      bool                      saveCurvesThatFlaggedBad_;
-      unsigned int              maxCurvesToSave_;               //define maximum number of curves to save, to prevent huge memory consumption
-      unsigned int              curvesSavedCounter_;
-      bool                      write2dHistograms_;
-      bool                      write2dFitResult_; 
-      std::vector<std::string>  plaquettesToSave_;
-      bool                      printoutthresholds_;
-      bool                      writeZeroes_;
-      std::string               thresholdfilename_;
-      std::map<uint32_t, bool>  detIDsToSave_;      
-
-
-      //parameters that define "bad curves"
-      double                     minimumChi2prob_;
-      double                     minimumThreshold_;
-      double                     maximumThreshold_;
-      double                     minimumSigma_;
-      double                     maximumSigma_;
-      double                     minimumEffAsymptote_;
-      double                     maximumEffAsymptote_;
-
-      //parameters that define histogram size/binning
-      double                     maximumThresholdBin_;
-      double                     maximumSigmaBin_;
-
-      
-      //holds histogrms entered
-      detIDHistogramMap histograms_;
-
-      void calibrationSetup(const edm::EventSetup& iSetup) override;
-      bool checkCorrectCalibrationType() override;
-      void newDetID(uint32_t detid) override;
-      void makeThresholdSummary(void);
-      void calibrationEnd() override ;
-      
-      // ----------member data ---------------------------
+public:
+  explicit SiPixelSCurveCalibrationAnalysis(const edm::ParameterSet &iConfig)
+      : SiPixelOfflineCalibAnalysisBase(iConfig) {
+    doSetup(iConfig);
+  };
+  ~SiPixelSCurveCalibrationAnalysis() override;
+  void doSetup(const edm::ParameterSet &);
+
+  bool doFits(uint32_t detid, std::vector<SiPixelCalibDigi>::const_iterator ipix) override;
+
+  static std::vector<float> efficiencies_;
+  static std::vector<float> effErrors_;
+  std::vector<float> vCalPointsAsFloats_;  // need to save single histograms
+
+  sCurveErrorFlag estimateSCurveParameters(const std::vector<float> &eff, float &threshold, float &sigma);
+  sCurveErrorFlag fittedSCurveSanityCheck(float threshold, float sigma, float amplitude);
+
+  void buildACurveHistogram(const uint32_t &detid,
+                            const uint32_t &row,
+                            const uint32_t &col,
+                            sCurveErrorFlag errorFlag,
+                            const std::vector<float> &efficiencies,
+                            const std::vector<float> &errors);
+
+private:
+  // configuration options
+  bool useDetectorHierarchyFolders_;
+  bool saveCurvesThatFlaggedBad_;
+  unsigned int maxCurvesToSave_;  // define maximum number of curves to save, to
+                                  // prevent huge memory consumption
+  unsigned int curvesSavedCounter_;
+  bool write2dHistograms_;
+  bool write2dFitResult_;
+  std::vector<std::string> plaquettesToSave_;
+  bool printoutthresholds_;
+  bool writeZeroes_;
+  std::string thresholdfilename_;
+  std::map<uint32_t, bool> detIDsToSave_;
+
+  // parameters that define "bad curves"
+  double minimumChi2prob_;
+  double minimumThreshold_;
+  double maximumThreshold_;
+  double minimumSigma_;
+  double maximumSigma_;
+  double minimumEffAsymptote_;
+  double maximumEffAsymptote_;
+
+  // parameters that define histogram size/binning
+  double maximumThresholdBin_;
+  double maximumSigmaBin_;
+
+  // holds histogrms entered
+  detIDHistogramMap histograms_;
+
+  void calibrationSetup(const edm::EventSetup &iSetup) override;
+  bool checkCorrectCalibrationType() override;
+  void newDetID(uint32_t detid) override;
+  void makeThresholdSummary(void);
+  void calibrationEnd() override;
+
+  // ----------member data ---------------------------
 };
 
 #endif
diff --git a/CalibTracker/SiPixelSCurveCalibration/src/SealModule.cc b/CalibTracker/SiPixelSCurveCalibration/src/SealModule.cc
index d993f61840eef..b4d6d870fa70f 100644
--- a/CalibTracker/SiPixelSCurveCalibration/src/SealModule.cc
+++ b/CalibTracker/SiPixelSCurveCalibration/src/SealModule.cc
@@ -1,7 +1,5 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-
-
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 
 // define this as a plug-in
 // include header file here:
diff --git a/CalibTracker/SiPixelSCurveCalibration/src/SiPixelSCurveCalibrationAnalysis.cc b/CalibTracker/SiPixelSCurveCalibration/src/SiPixelSCurveCalibrationAnalysis.cc
index 5801825ddfd69..491aecbf88451 100644
--- a/CalibTracker/SiPixelSCurveCalibration/src/SiPixelSCurveCalibrationAnalysis.cc
+++ b/CalibTracker/SiPixelSCurveCalibration/src/SiPixelSCurveCalibrationAnalysis.cc
@@ -1,415 +1,454 @@
 #include "CalibTracker/SiPixelSCurveCalibration/interface/SiPixelSCurveCalibrationAnalysis.h"
 #include "TMath.h"
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "DataFormats/SiPixelDigi/interface/SiPixelCalibDigiError.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h"
-#include "CondFormats/SiPixelObjects/interface/ElectronicIndex.h"
 #include "CondFormats/SiPixelObjects/interface/DetectorIndex.h"
+#include "CondFormats/SiPixelObjects/interface/ElectronicIndex.h"
 #include "CondFormats/SiPixelObjects/interface/LocalPixel.h"
+#include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h"
+#include "DataFormats/SiPixelDigi/interface/SiPixelCalibDigiError.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include <sstream>
 
-//initialize static members
+// initialize static members
 std::vector<float> SiPixelSCurveCalibrationAnalysis::efficiencies_(0);
 std::vector<float> SiPixelSCurveCalibrationAnalysis::effErrors_(0);
 
-
-void SiPixelSCurveCalibrationAnalysis::calibrationEnd(){
-  if(printoutthresholds_)
+void SiPixelSCurveCalibrationAnalysis::calibrationEnd() {
+  if (printoutthresholds_)
     makeThresholdSummary();
 }
 
-void SiPixelSCurveCalibrationAnalysis::makeThresholdSummary(void){
+void SiPixelSCurveCalibrationAnalysis::makeThresholdSummary(void) {
   std::ofstream myfile;
-  myfile.open (thresholdfilename_.c_str());
-  for(detIDHistogramMap::iterator  thisDetIdHistoGrams= histograms_.begin();  thisDetIdHistoGrams != histograms_.end(); ++thisDetIdHistoGrams){
-   // loop over det id (det id = number (unsigned int) of pixel module 
+  myfile.open(thresholdfilename_.c_str());
+  for (detIDHistogramMap::iterator thisDetIdHistoGrams = histograms_.begin(); thisDetIdHistoGrams != histograms_.end();
+       ++thisDetIdHistoGrams) {
+    // loop over det id (det id = number (unsigned int) of pixel module
     const MonitorElement *sigmahist = (*thisDetIdHistoGrams).second[kSigmas];
-    const MonitorElement *thresholdhist = (*thisDetIdHistoGrams).second[kThresholds];  
+    const MonitorElement *thresholdhist = (*thisDetIdHistoGrams).second[kThresholds];
     uint32_t detid = (*thisDetIdHistoGrams).first;
     std::string name = sigmahist->getTitle();
-    std::string rocname = name.substr(0,name.size()-7);
-    rocname+="_ROC";
-    int total_rows = sigmahist ->getNbinsY();
+    std::string rocname = name.substr(0, name.size() - 7);
+    rocname += "_ROC";
+    int total_rows = sigmahist->getNbinsY();
     int total_columns = sigmahist->getNbinsX();
-    //loop over all rows on columns on all ROCs 
-    for (int irow=0; irow<total_rows; ++irow){
-      for (int icol=0; icol<total_columns; ++icol){
-	float threshold_error = sigmahist->getBinContent(icol+1,irow+1); // +1 because root bins start at 1
-       	if(writeZeroes_ ||(!writeZeroes_ && threshold_error>0)){	     
-	  //changing from offline to online numbers
-	  int realfedID=-1;
-	  for(int fedid=0; fedid<=40; ++fedid){
-	    SiPixelFrameConverter converter(theCablingMap_.product(),fedid);
-	    if(converter.hasDetUnit(detid)){
-	      realfedID=fedid;
-	      break;   
-	    }
-	  }
-	  if (realfedID==-1){
-	    std::cout<<"error: could not obtain real fed ID"<<std::endl;
-	  }
-	  sipixelobjects::DetectorIndex detector ={detid,irow,icol};
-	  sipixelobjects::ElectronicIndex cabling; 
-	  SiPixelFrameConverter formatter(theCablingMap_.product(),realfedID);
-	  formatter.toCabling(cabling,detector);
-	  // cabling should now contain cabling.roc and cabling.dcol  and cabling.pxid
-	  // however, the coordinates now need to be converted from dcl,pxid to the row,col coordinates used in the calibration info 
-	  sipixelobjects::LocalPixel::DcolPxid loc;
-	  loc.dcol = cabling.dcol;
-	  loc.pxid = cabling.pxid;
-	  // FIX to adhere to new cabling map. To be replaced with CalibTracker/SiPixelTools detid - > hardware id classes ASAP.
-	  //        const sipixelobjects::PixelFEDCabling *theFed= theCablingMap.product()->fed(realfedID);
-	  //        const sipixelobjects::PixelFEDLink * link = theFed->link(cabling.link);
-	  //        const sipixelobjects::PixelROC *theRoc = link->roc(cabling.roc);
-	  sipixelobjects::LocalPixel locpixel(loc);
-	  sipixelobjects::CablingPathToDetUnit path = {static_cast<unsigned int>(realfedID),
+    // loop over all rows on columns on all ROCs
+    for (int irow = 0; irow < total_rows; ++irow) {
+      for (int icol = 0; icol < total_columns; ++icol) {
+        float threshold_error = sigmahist->getBinContent(icol + 1, irow + 1);  // +1 because root bins start at 1
+        if (writeZeroes_ || (!writeZeroes_ && threshold_error > 0)) {
+          // changing from offline to online numbers
+          int realfedID = -1;
+          for (int fedid = 0; fedid <= 40; ++fedid) {
+            SiPixelFrameConverter converter(theCablingMap_.product(), fedid);
+            if (converter.hasDetUnit(detid)) {
+              realfedID = fedid;
+              break;
+            }
+          }
+          if (realfedID == -1) {
+            std::cout << "error: could not obtain real fed ID" << std::endl;
+          }
+          sipixelobjects::DetectorIndex detector = {detid, irow, icol};
+          sipixelobjects::ElectronicIndex cabling;
+          SiPixelFrameConverter formatter(theCablingMap_.product(), realfedID);
+          formatter.toCabling(cabling, detector);
+          // cabling should now contain cabling.roc and cabling.dcol  and
+          // cabling.pxid however, the coordinates now need to be converted from
+          // dcl,pxid to the row,col coordinates used in the calibration info
+          sipixelobjects::LocalPixel::DcolPxid loc;
+          loc.dcol = cabling.dcol;
+          loc.pxid = cabling.pxid;
+          // FIX to adhere to new cabling map. To be replaced with
+          // CalibTracker/SiPixelTools detid - > hardware id classes ASAP.
+          //        const sipixelobjects::PixelFEDCabling *theFed=
+          //        theCablingMap.product()->fed(realfedID); const
+          //        sipixelobjects::PixelFEDLink * link =
+          //        theFed->link(cabling.link); const sipixelobjects::PixelROC
+          //        *theRoc = link->roc(cabling.roc);
+          sipixelobjects::LocalPixel locpixel(loc);
+          sipixelobjects::CablingPathToDetUnit path = {static_cast<unsigned int>(realfedID),
                                                        static_cast<unsigned int>(cabling.link),
                                                        static_cast<unsigned int>(cabling.roc)};
-	  const sipixelobjects::PixelROC *theRoc = theCablingMap_->findItem(path);
-	  // END of FIX
-	  int newrow= locpixel.rocRow();
-	  int newcol = locpixel.rocCol();
-	  myfile<<rocname<<theRoc->idInDetUnit()<<" "<<newcol<<" "<<newrow<<" "<<thresholdhist->getBinContent(icol+1, irow+1)<<" "<<threshold_error;  // +1 because root bins start at 1
-	  myfile<<"\n";
-	}
+          const sipixelobjects::PixelROC *theRoc = theCablingMap_->findItem(path);
+          // END of FIX
+          int newrow = locpixel.rocRow();
+          int newcol = locpixel.rocCol();
+          myfile << rocname << theRoc->idInDetUnit() << " " << newcol << " " << newrow << " "
+                 << thresholdhist->getBinContent(icol + 1, irow + 1) << " "
+                 << threshold_error;  // +1 because root bins start at 1
+          myfile << "\n";
+        }
       }
     }
   }
   myfile.close();
 }
 
-//used for TMinuit fitting
-void chi2toMinimize(int &npar, double* grad, double &fcnval, double* xval, int iflag)
-{
-   TF1 * theFormula = SiPixelSCurveCalibrationAnalysis::fitFunction_;
-   //setup function parameters
-   for (int i = 0; i < npar; i++)
-      theFormula->SetParameter(i, xval[i]);
-   fcnval = 0;
-   //compute Chi2 of all points
-   const std::vector<short>* theVCalValues = SiPixelSCurveCalibrationAnalysis::getVcalValues();
-   for (uint32_t i = 0; i < theVCalValues->size(); i++)
-   {
-      float chi = (SiPixelSCurveCalibrationAnalysis::efficiencies_[i] - theFormula->Eval((*theVCalValues)[i]) );
-      chi       /= SiPixelSCurveCalibrationAnalysis::effErrors_[i];
-      fcnval += chi*chi;
-   }
+// used for TMinuit fitting
+void chi2toMinimize(int &npar, double *grad, double &fcnval, double *xval, int iflag) {
+  TF1 *theFormula = SiPixelSCurveCalibrationAnalysis::fitFunction_;
+  // setup function parameters
+  for (int i = 0; i < npar; i++)
+    theFormula->SetParameter(i, xval[i]);
+  fcnval = 0;
+  // compute Chi2 of all points
+  const std::vector<short> *theVCalValues = SiPixelSCurveCalibrationAnalysis::getVcalValues();
+  for (uint32_t i = 0; i < theVCalValues->size(); i++) {
+    float chi = (SiPixelSCurveCalibrationAnalysis::efficiencies_[i] - theFormula->Eval((*theVCalValues)[i]));
+    chi /= SiPixelSCurveCalibrationAnalysis::effErrors_[i];
+    fcnval += chi * chi;
+  }
 }
 
-void
-SiPixelSCurveCalibrationAnalysis::doSetup(const edm::ParameterSet& iConfig)
-{
-   edm::LogInfo("SiPixelSCurveCalibrationAnalysis") << "Setting up calibration paramters.";
-   std::vector<uint32_t>        anEmptyDefaultVectorOfUInts;
-   std::vector<uint32_t>        detIDsToSaveVector_;
-   useDetectorHierarchyFolders_ = iConfig.getUntrackedParameter<bool>("useDetectorHierarchyFolders", true);
-   saveCurvesThatFlaggedBad_    = iConfig.getUntrackedParameter<bool>("saveCurvesThatFlaggedBad", false);
-   detIDsToSaveVector_          = iConfig.getUntrackedParameter<std::vector<uint32_t> >("detIDsToSave", anEmptyDefaultVectorOfUInts);
-   maxCurvesToSave_             = iConfig.getUntrackedParameter<uint32_t>("maxCurvesToSave", 1000);
-   write2dHistograms_           = iConfig.getUntrackedParameter<bool>("write2dHistograms", true);
-   write2dFitResult_            = iConfig.getUntrackedParameter<bool>("write2dFitResult", true);
-   printoutthresholds_          = iConfig.getUntrackedParameter<bool>("writeOutThresholdSummary",true);
-   thresholdfilename_           = iConfig.getUntrackedParameter<std::string>("thresholdOutputFileName","thresholds.txt");  
-   minimumChi2prob_             = iConfig.getUntrackedParameter<double>("minimumChi2prob", 0);
-   minimumThreshold_            = iConfig.getUntrackedParameter<double>("minimumThreshold", -10);
-   maximumThreshold_            = iConfig.getUntrackedParameter<double>("maximumThreshold", 300);
-   minimumSigma_                = iConfig.getUntrackedParameter<double>("minimumSigma", 0);
-   maximumSigma_                = iConfig.getUntrackedParameter<double>("maximumSigma", 100);
-   minimumEffAsymptote_         = iConfig.getUntrackedParameter<double>("minimumEffAsymptote", 0);
-   maximumEffAsymptote_         = iConfig.getUntrackedParameter<double>("maximumEffAsymptote", 1000);
-   maximumSigmaBin_             = iConfig.getUntrackedParameter<double>("maximumSigmaBin", 10);
-   maximumThresholdBin_         = iConfig.getUntrackedParameter<double>("maximumThresholdBin", 255);
-
-   writeZeroes_= iConfig.getUntrackedParameter<bool>("alsoWriteZeroThresholds", false);
-
-   // convert the vector into a map for quicker lookups.
-   for(unsigned int i = 0; i < detIDsToSaveVector_.size(); i++)
-      detIDsToSave_.insert( std::make_pair(detIDsToSaveVector_[i], true) );
+void SiPixelSCurveCalibrationAnalysis::doSetup(const edm::ParameterSet &iConfig) {
+  edm::LogInfo("SiPixelSCurveCalibrationAnalysis") << "Setting up calibration paramters.";
+  std::vector<uint32_t> anEmptyDefaultVectorOfUInts;
+  std::vector<uint32_t> detIDsToSaveVector_;
+  useDetectorHierarchyFolders_ = iConfig.getUntrackedParameter<bool>("useDetectorHierarchyFolders", true);
+  saveCurvesThatFlaggedBad_ = iConfig.getUntrackedParameter<bool>("saveCurvesThatFlaggedBad", false);
+  detIDsToSaveVector_ =
+      iConfig.getUntrackedParameter<std::vector<uint32_t>>("detIDsToSave", anEmptyDefaultVectorOfUInts);
+  maxCurvesToSave_ = iConfig.getUntrackedParameter<uint32_t>("maxCurvesToSave", 1000);
+  write2dHistograms_ = iConfig.getUntrackedParameter<bool>("write2dHistograms", true);
+  write2dFitResult_ = iConfig.getUntrackedParameter<bool>("write2dFitResult", true);
+  printoutthresholds_ = iConfig.getUntrackedParameter<bool>("writeOutThresholdSummary", true);
+  thresholdfilename_ = iConfig.getUntrackedParameter<std::string>("thresholdOutputFileName", "thresholds.txt");
+  minimumChi2prob_ = iConfig.getUntrackedParameter<double>("minimumChi2prob", 0);
+  minimumThreshold_ = iConfig.getUntrackedParameter<double>("minimumThreshold", -10);
+  maximumThreshold_ = iConfig.getUntrackedParameter<double>("maximumThreshold", 300);
+  minimumSigma_ = iConfig.getUntrackedParameter<double>("minimumSigma", 0);
+  maximumSigma_ = iConfig.getUntrackedParameter<double>("maximumSigma", 100);
+  minimumEffAsymptote_ = iConfig.getUntrackedParameter<double>("minimumEffAsymptote", 0);
+  maximumEffAsymptote_ = iConfig.getUntrackedParameter<double>("maximumEffAsymptote", 1000);
+  maximumSigmaBin_ = iConfig.getUntrackedParameter<double>("maximumSigmaBin", 10);
+  maximumThresholdBin_ = iConfig.getUntrackedParameter<double>("maximumThresholdBin", 255);
+
+  writeZeroes_ = iConfig.getUntrackedParameter<bool>("alsoWriteZeroThresholds", false);
+
+  // convert the vector into a map for quicker lookups.
+  for (unsigned int i = 0; i < detIDsToSaveVector_.size(); i++)
+    detIDsToSave_.insert(std::make_pair(detIDsToSaveVector_[i], true));
 }
 
-SiPixelSCurveCalibrationAnalysis::~SiPixelSCurveCalibrationAnalysis()
-{
-   //do nothing
+SiPixelSCurveCalibrationAnalysis::~SiPixelSCurveCalibrationAnalysis() {
+  // do nothing
 }
 
-void SiPixelSCurveCalibrationAnalysis::buildACurveHistogram(const uint32_t& detid, const uint32_t& row, const uint32_t& col, sCurveErrorFlag errorFlag, const std::vector<float>& efficiencies, const std::vector<float>& errors)
-{
-   if (curvesSavedCounter_ > maxCurvesToSave_)
-   {
-      edm::LogWarning("SiPixelSCurveCalibrationAnalysis") << "WARNING: Request to save curve for [detid](col/row):  [" << detid << "](" << col << "/" << row << ") denied. Maximum number of saved curves (defined in .cfi) exceeded.";
-      return;
-   }
-   std::ostringstream rootName;
-   rootName << "SCurve_row_" << row << "_col_" << col;
-   std::ostringstream humanName;
-   humanName << translateDetIdToString(detid) << "_" << rootName.str() << "_ErrorFlag_" << (int)errorFlag;
-
-   unsigned int numberOfVCalPoints = vCalPointsAsFloats_.size()-1; //minus one is necessary since the lower edge of the last bin must be added
-   if (efficiencies.size() != numberOfVCalPoints || errors.size() != numberOfVCalPoints)
-   {
-      edm::LogError("SiPixelSCurveCalibrationAnalysis") << "Error saving single curve histogram!  Number of Vcal values (" << numberOfVCalPoints << ") does not match number of efficiency points or error points!";
-      return;
-   }
-   setDQMDirectory(detid);
-   float * vcalValuesToPassToCrappyRoot = &vCalPointsAsFloats_[0];
-   MonitorElement * aBadHisto = bookDQMHistogram1D(detid, rootName.str(), humanName.str(), numberOfVCalPoints, vcalValuesToPassToCrappyRoot);  //ROOT only takes an input as array. :(  HOORAY FOR CINT!
-   curvesSavedCounter_++;
-   for(unsigned int iBin = 0; iBin < numberOfVCalPoints; ++iBin)
-   {
-      int rootBin = iBin + 1;  //root bins start at 1
-      aBadHisto->setBinContent(rootBin, efficiencies[iBin]);
-      aBadHisto->setBinError(rootBin, errors[iBin]);
-   }
+void SiPixelSCurveCalibrationAnalysis::buildACurveHistogram(const uint32_t &detid,
+                                                            const uint32_t &row,
+                                                            const uint32_t &col,
+                                                            sCurveErrorFlag errorFlag,
+                                                            const std::vector<float> &efficiencies,
+                                                            const std::vector<float> &errors) {
+  if (curvesSavedCounter_ > maxCurvesToSave_) {
+    edm::LogWarning("SiPixelSCurveCalibrationAnalysis")
+        << "WARNING: Request to save curve for [detid](col/row):  [" << detid << "](" << col << "/" << row
+        << ") denied. Maximum number of saved curves (defined in .cfi) "
+           "exceeded.";
+    return;
+  }
+  std::ostringstream rootName;
+  rootName << "SCurve_row_" << row << "_col_" << col;
+  std::ostringstream humanName;
+  humanName << translateDetIdToString(detid) << "_" << rootName.str() << "_ErrorFlag_" << (int)errorFlag;
+
+  unsigned int numberOfVCalPoints = vCalPointsAsFloats_.size() - 1;  // minus one is necessary since the lower
+                                                                     // edge of the last bin must be added
+  if (efficiencies.size() != numberOfVCalPoints || errors.size() != numberOfVCalPoints) {
+    edm::LogError("SiPixelSCurveCalibrationAnalysis")
+        << "Error saving single curve histogram!  Number of Vcal values (" << numberOfVCalPoints
+        << ") does not match number of efficiency points or error points!";
+    return;
+  }
+  setDQMDirectory(detid);
+  float *vcalValuesToPassToCrappyRoot = &vCalPointsAsFloats_[0];
+  MonitorElement *aBadHisto =
+      bookDQMHistogram1D(detid,
+                         rootName.str(),
+                         humanName.str(),
+                         numberOfVCalPoints,
+                         vcalValuesToPassToCrappyRoot);  // ROOT only takes an input as array. :(
+                                                         // HOORAY FOR CINT!
+  curvesSavedCounter_++;
+  for (unsigned int iBin = 0; iBin < numberOfVCalPoints; ++iBin) {
+    int rootBin = iBin + 1;  // root bins start at 1
+    aBadHisto->setBinContent(rootBin, efficiencies[iBin]);
+    aBadHisto->setBinError(rootBin, errors[iBin]);
+  }
 }
 
-void SiPixelSCurveCalibrationAnalysis::calibrationSetup(const edm::EventSetup& iSetup)
-{
-   edm::LogInfo("SiPixelSCurveCalibrationAnalysis") << "Calibration Settings: VCalLow: " << vCalValues_[0] << "  VCalHigh: " << vCalValues_[vCalValues_.size()-1] << " nVCal: " << vCalValues_.size() << "  nTriggers: " << nTriggers_;
-   curvesSavedCounter_ = 0;
-   if (saveCurvesThatFlaggedBad_)
-   {
-      //build the vCal values as a vector of floats if we want to save single curves
-      const std::vector<short>* theVCalValues = this->getVcalValues();
-      unsigned int numberOfVCalPoints = theVCalValues->size();
-      edm::LogWarning("SiPixelSCurveCalibrationAnalysis") << "WARNING: Option set to save indiviual S-Curves - max number: " 
-                                                          << maxCurvesToSave_ << " This can lead to large memory consumption! (Got " << numberOfVCalPoints << " VCal Points";
-      for(unsigned int i = 0; i < numberOfVCalPoints; i++)
-      {
-         vCalPointsAsFloats_.push_back( static_cast<float>((*theVCalValues)[i]) );
-         edm::LogInfo("SiPixelSCurveCalibrationAnalysis") << "Adding calibration Vcal: " << (*theVCalValues)[i];
-      }
-      // must add lower edge of last bin to the vector
-      vCalPointsAsFloats_.push_back( vCalPointsAsFloats_[numberOfVCalPoints-1] + 1 );
-   }
+void SiPixelSCurveCalibrationAnalysis::calibrationSetup(const edm::EventSetup &iSetup) {
+  edm::LogInfo("SiPixelSCurveCalibrationAnalysis")
+      << "Calibration Settings: VCalLow: " << vCalValues_[0] << "  VCalHigh: " << vCalValues_[vCalValues_.size() - 1]
+      << " nVCal: " << vCalValues_.size() << "  nTriggers: " << nTriggers_;
+  curvesSavedCounter_ = 0;
+  if (saveCurvesThatFlaggedBad_) {
+    // build the vCal values as a vector of floats if we want to save single
+    // curves
+    const std::vector<short> *theVCalValues = this->getVcalValues();
+    unsigned int numberOfVCalPoints = theVCalValues->size();
+    edm::LogWarning("SiPixelSCurveCalibrationAnalysis")
+        << "WARNING: Option set to save indiviual S-Curves - max number: " << maxCurvesToSave_
+        << " This can lead to large memory consumption! (Got " << numberOfVCalPoints << " VCal Points";
+    for (unsigned int i = 0; i < numberOfVCalPoints; i++) {
+      vCalPointsAsFloats_.push_back(static_cast<float>((*theVCalValues)[i]));
+      edm::LogInfo("SiPixelSCurveCalibrationAnalysis") << "Adding calibration Vcal: " << (*theVCalValues)[i];
+    }
+    // must add lower edge of last bin to the vector
+    vCalPointsAsFloats_.push_back(vCalPointsAsFloats_[numberOfVCalPoints - 1] + 1);
+  }
 
-   fitFunction_ = new TF1("sCurve", "0.5*[2]*(1+TMath::Erf( (x-[0]) / ([1]*sqrt(2)) ) )", vCalValues_[0], vCalValues_[vCalValues_.size()-1]);
+  fitFunction_ = new TF1("sCurve",
+                         "0.5*[2]*(1+TMath::Erf( (x-[0]) / ([1]*sqrt(2)) ) )",
+                         vCalValues_[0],
+                         vCalValues_[vCalValues_.size() - 1]);
 }
 
-bool
-SiPixelSCurveCalibrationAnalysis::checkCorrectCalibrationType()
-{
-  if(calibrationMode_=="SCurve")
+bool SiPixelSCurveCalibrationAnalysis::checkCorrectCalibrationType() {
+  if (calibrationMode_ == "SCurve")
     return true;
-  else if(calibrationMode_=="unknown"){
-    edm::LogInfo("SiPixelSCurveCalibrationAnalysis") <<  "calibration mode is: " << calibrationMode_ << ", continuing anyway..." ;
+  else if (calibrationMode_ == "unknown") {
+    edm::LogInfo("SiPixelSCurveCalibrationAnalysis")
+        << "calibration mode is: " << calibrationMode_ << ", continuing anyway...";
     return true;
-  }
-  else{
-    //    edm::LogDebug("SiPixelSCurveCalibrationAnalysis") << "unknown calibration mode for SCurves, should be \"SCurve\" and is \"" << calibrationMode_ << "\"";
+  } else {
+    //    edm::LogDebug("SiPixelSCurveCalibrationAnalysis") << "unknown
+    //    calibration mode for SCurves, should be \"SCurve\" and is \"" <<
+    //    calibrationMode_ << "\"";
   }
   return false;
 }
 
-sCurveErrorFlag SiPixelSCurveCalibrationAnalysis::estimateSCurveParameters(const std::vector<float>& eff, float& threshold, float& sigma)
-{
-   sCurveErrorFlag output = errAllZeros;
-   bool allZeroSoFar    = true;
-   int turnOnBin        = -1;
-   int saturationBin    = -1;
-   for (uint32_t iVcalPt = 0; iVcalPt < eff.size(); iVcalPt++)
-   {
-      if (allZeroSoFar && eff[iVcalPt] != 0 ) {
-         turnOnBin = iVcalPt;
-         allZeroSoFar = false;
-         output = errNoTurnOn;
-      } else if (eff[iVcalPt] > 0.90)
-      {
-         saturationBin  = iVcalPt;
-         short turnOnVcal       = vCalValues_[turnOnBin];
-         short saturationVcal   = vCalValues_[saturationBin];
-         short delta            = saturationVcal - turnOnVcal;
-         sigma                  = delta * 0.682;
-         if (sigma < 1)         //check to make sure sigma guess is larger than our X resolution.  Hopefully prevents Minuit from getting stuck at boundary
-            sigma = 1;
-         threshold              = turnOnVcal + (0.5 * delta);
-         return errOK;
-      }
-   }
-   return output;
+sCurveErrorFlag SiPixelSCurveCalibrationAnalysis::estimateSCurveParameters(const std::vector<float> &eff,
+                                                                           float &threshold,
+                                                                           float &sigma) {
+  sCurveErrorFlag output = errAllZeros;
+  bool allZeroSoFar = true;
+  int turnOnBin = -1;
+  int saturationBin = -1;
+  for (uint32_t iVcalPt = 0; iVcalPt < eff.size(); iVcalPt++) {
+    if (allZeroSoFar && eff[iVcalPt] != 0) {
+      turnOnBin = iVcalPt;
+      allZeroSoFar = false;
+      output = errNoTurnOn;
+    } else if (eff[iVcalPt] > 0.90) {
+      saturationBin = iVcalPt;
+      short turnOnVcal = vCalValues_[turnOnBin];
+      short saturationVcal = vCalValues_[saturationBin];
+      short delta = saturationVcal - turnOnVcal;
+      sigma = delta * 0.682;
+      if (sigma < 1)  // check to make sure sigma guess is larger than our X resolution.
+                      // Hopefully prevents Minuit from getting stuck at boundary
+        sigma = 1;
+      threshold = turnOnVcal + (0.5 * delta);
+      return errOK;
+    }
+  }
+  return output;
 }
 
-sCurveErrorFlag SiPixelSCurveCalibrationAnalysis::fittedSCurveSanityCheck(float threshold, float sigma, float amplitude)
-{
-   //check if nonsensical
-   if (threshold > vCalValues_[vCalValues_.size()-1] || threshold < vCalValues_[0] ||
-         sigma > vCalValues_[vCalValues_.size()-1] - vCalValues_[0] )
-      return errFitNonPhysical;
+sCurveErrorFlag SiPixelSCurveCalibrationAnalysis::fittedSCurveSanityCheck(float threshold,
+                                                                          float sigma,
+                                                                          float amplitude) {
+  // check if nonsensical
+  if (threshold > vCalValues_[vCalValues_.size() - 1] || threshold < vCalValues_[0] ||
+      sigma > vCalValues_[vCalValues_.size() - 1] - vCalValues_[0])
+    return errFitNonPhysical;
 
-   if (threshold < minimumThreshold_ || threshold > maximumThreshold_ ||
-         sigma < minimumSigma_ || sigma > maximumSigma_ ||
-         amplitude < minimumEffAsymptote_ || amplitude > maximumEffAsymptote_)
-      return errFlaggedBadByUser;
+  if (threshold < minimumThreshold_ || threshold > maximumThreshold_ || sigma < minimumSigma_ ||
+      sigma > maximumSigma_ || amplitude < minimumEffAsymptote_ || amplitude > maximumEffAsymptote_)
+    return errFlaggedBadByUser;
 
-   return errOK;
+  return errOK;
 }
 
-void calculateEffAndError(int nADCResponse, int nTriggers, float& eff, float& error)
-{
-   eff = (float)nADCResponse / (float)nTriggers;
-   double effForErrorCalculation = eff;
-   if (eff <= 0 || eff >= 1)
-      effForErrorCalculation = 0.5 / (double)nTriggers;
-   error = TMath::Sqrt(effForErrorCalculation*(1-effForErrorCalculation) / (double)nTriggers);
+void calculateEffAndError(int nADCResponse, int nTriggers, float &eff, float &error) {
+  eff = (float)nADCResponse / (float)nTriggers;
+  double effForErrorCalculation = eff;
+  if (eff <= 0 || eff >= 1)
+    effForErrorCalculation = 0.5 / (double)nTriggers;
+  error = TMath::Sqrt(effForErrorCalculation * (1 - effForErrorCalculation) / (double)nTriggers);
 }
 
-//book histograms when new DetID is encountered in Event Record
-void SiPixelSCurveCalibrationAnalysis::newDetID(uint32_t detid)
-{
-   edm::LogInfo("SiPixelSCurveCalibrationAnalysis") << "Found a new DetID (" << detid << ")!  Checking to make sure it has not been added.";
-   //ensure that this DetID has not been added yet
-   sCurveHistogramHolder tempMap;
-   std::pair<detIDHistogramMap::iterator, bool> insertResult; 
-   insertResult = histograms_.insert(std::make_pair(detid, tempMap));
-   if (insertResult.second)     //indicates successful insertion
-   {
-      edm::LogInfo("SiPixelSCurveCalibrationAnalysisHistogramReport") << "Histogram Map.insert() returned true!  Booking new histogrames for detID: " << detid;
-      // use detector hierarchy folders if desired
-      if (useDetectorHierarchyFolders_)
-         setDQMDirectory(detid);
-
-      std::string detIdName = translateDetIdToString(detid);
-      if (write2dHistograms_){
-	MonitorElement * D2sigma       = bookDQMHistoPlaquetteSummary2D(detid,"ScurveSigmas", detIdName + " Sigmas");
-	MonitorElement * D2thresh      = bookDQMHistoPlaquetteSummary2D(detid,"ScurveThresholds", detIdName + " Thresholds");
-	MonitorElement * D2chi2        = bookDQMHistoPlaquetteSummary2D(detid,"ScurveChi2Prob",detIdName + " Chi2Prob");
-         insertResult.first->second.insert(std::make_pair(kSigmas, D2sigma));
-         insertResult.first->second.insert(std::make_pair(kThresholds, D2thresh));
-         insertResult.first->second.insert(std::make_pair(kChi2s, D2chi2));
-      }
-      if (write2dFitResult_){
-	MonitorElement * D2FitResult = bookDQMHistoPlaquetteSummary2D(detid,"ScurveFitResult", detIdName + " Fit Result");
-         insertResult.first->second.insert(std::make_pair(kFitResults, D2FitResult));
-      }
-      MonitorElement * D1sigma       = bookDQMHistogram1D(detid,"ScurveSigmasSummary", detIdName + " Sigmas Summary", 100, 0, maximumSigmaBin_);
-      MonitorElement * D1thresh      = bookDQMHistogram1D(detid,"ScurveThresholdSummary", detIdName + " Thresholds Summary", 255, 0, maximumThresholdBin_);
-      MonitorElement * D1chi2        = bookDQMHistogram1D(detid,"ScurveChi2ProbSummary", detIdName + " Chi2Prob Summary", 101, 0, 1.01);
-      MonitorElement * D1FitResult   = bookDQMHistogram1D(detid,"ScurveFitResultSummary", detIdName + " Fit Result Summary", 10, -0.5, 9.5);
-      insertResult.first->second.insert(std::make_pair(kSigmaSummary, D1sigma));
-      insertResult.first->second.insert(std::make_pair(kThresholdSummary, D1thresh));
-      insertResult.first->second.insert(std::make_pair(kChi2Summary, D1chi2));
-      insertResult.first->second.insert(std::make_pair(kFitResultSummary, D1FitResult));
-   }
+// book histograms when new DetID is encountered in Event Record
+void SiPixelSCurveCalibrationAnalysis::newDetID(uint32_t detid) {
+  edm::LogInfo("SiPixelSCurveCalibrationAnalysis")
+      << "Found a new DetID (" << detid << ")!  Checking to make sure it has not been added.";
+  // ensure that this DetID has not been added yet
+  sCurveHistogramHolder tempMap;
+  std::pair<detIDHistogramMap::iterator, bool> insertResult;
+  insertResult = histograms_.insert(std::make_pair(detid, tempMap));
+  if (insertResult.second)  // indicates successful insertion
+  {
+    edm::LogInfo("SiPixelSCurveCalibrationAnalysisHistogramReport")
+        << "Histogram Map.insert() returned true!  Booking new histogrames for "
+           "detID: "
+        << detid;
+    // use detector hierarchy folders if desired
+    if (useDetectorHierarchyFolders_)
+      setDQMDirectory(detid);
+
+    std::string detIdName = translateDetIdToString(detid);
+    if (write2dHistograms_) {
+      MonitorElement *D2sigma = bookDQMHistoPlaquetteSummary2D(detid, "ScurveSigmas", detIdName + " Sigmas");
+      MonitorElement *D2thresh = bookDQMHistoPlaquetteSummary2D(detid, "ScurveThresholds", detIdName + " Thresholds");
+      MonitorElement *D2chi2 = bookDQMHistoPlaquetteSummary2D(detid, "ScurveChi2Prob", detIdName + " Chi2Prob");
+      insertResult.first->second.insert(std::make_pair(kSigmas, D2sigma));
+      insertResult.first->second.insert(std::make_pair(kThresholds, D2thresh));
+      insertResult.first->second.insert(std::make_pair(kChi2s, D2chi2));
+    }
+    if (write2dFitResult_) {
+      MonitorElement *D2FitResult = bookDQMHistoPlaquetteSummary2D(detid, "ScurveFitResult", detIdName + " Fit Result");
+      insertResult.first->second.insert(std::make_pair(kFitResults, D2FitResult));
+    }
+    MonitorElement *D1sigma =
+        bookDQMHistogram1D(detid, "ScurveSigmasSummary", detIdName + " Sigmas Summary", 100, 0, maximumSigmaBin_);
+    MonitorElement *D1thresh = bookDQMHistogram1D(
+        detid, "ScurveThresholdSummary", detIdName + " Thresholds Summary", 255, 0, maximumThresholdBin_);
+    MonitorElement *D1chi2 =
+        bookDQMHistogram1D(detid, "ScurveChi2ProbSummary", detIdName + " Chi2Prob Summary", 101, 0, 1.01);
+    MonitorElement *D1FitResult =
+        bookDQMHistogram1D(detid, "ScurveFitResultSummary", detIdName + " Fit Result Summary", 10, -0.5, 9.5);
+    insertResult.first->second.insert(std::make_pair(kSigmaSummary, D1sigma));
+    insertResult.first->second.insert(std::make_pair(kThresholdSummary, D1thresh));
+    insertResult.first->second.insert(std::make_pair(kChi2Summary, D1chi2));
+    insertResult.first->second.insert(std::make_pair(kFitResultSummary, D1FitResult));
+  }
 }
 
-bool SiPixelSCurveCalibrationAnalysis::doFits(uint32_t detid, std::vector<SiPixelCalibDigi>::const_iterator calibDigi)
-{
-   sCurveErrorFlag errorFlag = errOK;
-   uint32_t nVCalPts = calibDigi->getnpoints();
-   //reset and fill static datamembers with vector of points and errors
-   efficiencies_.resize(0);
-   effErrors_.resize(0);
-   for (uint32_t iVcalPt = 0; iVcalPt < nVCalPts; iVcalPt++)
-   {
-      float eff;
-      float error;
-      calculateEffAndError(calibDigi->getnentries(iVcalPt), nTriggers_, eff, error);
-      edm::LogInfo("SiPixelSCurveCalibrationAnalysis") << "Eff: " << eff << " Error:  " << error << "  nEntries: " << calibDigi->getnentries(iVcalPt) << "  nTriggers: " << nTriggers_ << " VCalPt " << vCalValues_[iVcalPt];
-      efficiencies_.push_back(eff);
-      effErrors_.push_back(error);
-   } 
-
-   //estimate the S-Curve parameters
-   float thresholdGuess = -1.0;
-   float sigmaGuess = -1.0;
-   errorFlag = estimateSCurveParameters(efficiencies_, thresholdGuess, sigmaGuess);
-
-   // these -1.0 default values will only be filled if the curve is all zeroes, or doesn't turn on, WHICH INDICATES A SERIOUS PROBLEM
-   Double_t sigma		        = -1.0;
-   Double_t sigmaError		        = -1.0;
-   Double_t threshold		        = -1.0;
-   Double_t thresholdError		= -1.0;
-   Double_t amplitude		        = -1.0;
-   Double_t amplitudeError		= -1.0;
-   Double_t chi2		        = -1.0;
-   //calculate NDF
-   Int_t nDOF                           = vCalValues_.size() - 3;
-   Double_t chi2probability	        = 0;
-
-   if (errorFlag == errOK)          //only do fit if curve is fittable
-   {
-      //set up minuit fit
-      TMinuit *gMinuit = new TMinuit(3);
-      gMinuit->SetPrintLevel(-1);  //save ourselves from gigabytes of stdout
-      gMinuit->SetFCN(chi2toMinimize);
-
-      //define threshold parameters - choose step size 1, max 300, min -50
-      gMinuit->DefineParameter(0, "Threshold", (Double_t)thresholdGuess, 1, -50, 300);
-      //sigma
-      gMinuit->DefineParameter(1, "Sigma", (Double_t)sigmaGuess, 0.1, 0, 255); 
-      //amplitude
-      gMinuit->DefineParameter(2, "Amplitude", 1, 0.1, -0.001, 200);
-
-      //Do Chi2 minimazation
-      gMinuit->Migrad();
-      gMinuit->GetParameter(0, threshold, thresholdError);
-      gMinuit->GetParameter(1, sigma, sigmaError);
-      gMinuit->GetParameter(2, amplitude, amplitudeError);
-
-      //get Chi2
-      Double_t params[3]   = {threshold, sigma, amplitude};
-      gMinuit->Eval(3, nullptr, chi2, params, 0);
-      //calculate Chi2 proability
-      if (nDOF <= 0)
-         chi2probability = 0;
-      else
-         chi2probability = TMath::Prob(chi2, nDOF);
-      
-      //check to make sure output makes sense (i.e. threshold > 0)
-      if (chi2probability > minimumChi2prob_)
-         errorFlag = fittedSCurveSanityCheck(threshold, sigma, amplitude);
-      else
-         errorFlag = errBadChi2Prob;
-
-      edm::LogInfo("SiPixelSCurveCalibrationAnalysis") << "Fit finished with errorFlag: " << errorFlag << " - threshold: " << threshold << "  sigma: " << sigma << "  chi2: " << chi2 << "  nDOF: " << nDOF << " chi2Prob: " << chi2probability << " chi2MinUser: " << minimumChi2prob_;
-
-      delete gMinuit;
-   }
-   //get row and column for this pixel
-   uint32_t row = calibDigi->row();
-   uint32_t col = calibDigi->col();
-
-   //get iterator to histogram holder for this detid
-   detIDHistogramMap::iterator thisDetIdHistoGrams;
-   thisDetIdHistoGrams = histograms_.find(detid);
-   if (thisDetIdHistoGrams != histograms_.end())
-   {
-      edm::LogInfo("SiPixelSCurveCalibrationAnalysisHistogramReport") << "Filling histograms for [detid](col/row):  [" << detid << "](" << col << "/" << row << ") ErrorFlag: " << errorFlag;
-      //always fill fit result
-      (*thisDetIdHistoGrams).second[kFitResultSummary]->Fill(errorFlag);
-      if (write2dFitResult_)
-         (*thisDetIdHistoGrams).second[kFitResults]->setBinContent(col+1, row+1, errorFlag); // +1 because root bins start at 1
-
-      // fill sigma/threshold result
-      (*thisDetIdHistoGrams).second[kSigmaSummary]->Fill(sigma);
-      (*thisDetIdHistoGrams).second[kThresholdSummary]->Fill(threshold);
-      if (write2dHistograms_)
-      {
-         (*thisDetIdHistoGrams).second[kSigmas]->setBinContent(col+1, row+1, sigma); // +1 because root bins start at 1
-         (*thisDetIdHistoGrams).second[kThresholds]->setBinContent(col+1, row+1, threshold); // +1 because root bins start at 1
-      }
-      // fill chi2
-      (*thisDetIdHistoGrams).second[kChi2Summary]->Fill(chi2probability);
-      if (write2dHistograms_)
-         (*thisDetIdHistoGrams).second[kChi2s]->Fill(col, row, chi2probability);
-   }
-   // save individual curves, if requested
-   if (saveCurvesThatFlaggedBad_)
-   {
-      bool thisDetIDinList = false;
-      if (detIDsToSave_.find(detid) != detIDsToSave_.end()) //see if we want to save this histogram
-         thisDetIDinList = true;
-
-      if (errorFlag != errOK || thisDetIDinList)
-      {
-         edm::LogError("SiPixelSCurveCalibrationAnalysis") << "Saving error histogram for [detid](col/row):  [" << detid << "](" << col << "/" << row << ") ErrorFlag: " << errorFlag;
-         buildACurveHistogram(detid, row, col, errorFlag, efficiencies_, effErrors_);
-      }
-   }
+bool SiPixelSCurveCalibrationAnalysis::doFits(uint32_t detid, std::vector<SiPixelCalibDigi>::const_iterator calibDigi) {
+  sCurveErrorFlag errorFlag = errOK;
+  uint32_t nVCalPts = calibDigi->getnpoints();
+  // reset and fill static datamembers with vector of points and errors
+  efficiencies_.resize(0);
+  effErrors_.resize(0);
+  for (uint32_t iVcalPt = 0; iVcalPt < nVCalPts; iVcalPt++) {
+    float eff;
+    float error;
+    calculateEffAndError(calibDigi->getnentries(iVcalPt), nTriggers_, eff, error);
+    edm::LogInfo("SiPixelSCurveCalibrationAnalysis")
+        << "Eff: " << eff << " Error:  " << error << "  nEntries: " << calibDigi->getnentries(iVcalPt)
+        << "  nTriggers: " << nTriggers_ << " VCalPt " << vCalValues_[iVcalPt];
+    efficiencies_.push_back(eff);
+    effErrors_.push_back(error);
+  }
+
+  // estimate the S-Curve parameters
+  float thresholdGuess = -1.0;
+  float sigmaGuess = -1.0;
+  errorFlag = estimateSCurveParameters(efficiencies_, thresholdGuess, sigmaGuess);
+
+  // these -1.0 default values will only be filled if the curve is all zeroes,
+  // or doesn't turn on, WHICH INDICATES A SERIOUS PROBLEM
+  Double_t sigma = -1.0;
+  Double_t sigmaError = -1.0;
+  Double_t threshold = -1.0;
+  Double_t thresholdError = -1.0;
+  Double_t amplitude = -1.0;
+  Double_t amplitudeError = -1.0;
+  Double_t chi2 = -1.0;
+  // calculate NDF
+  Int_t nDOF = vCalValues_.size() - 3;
+  Double_t chi2probability = 0;
+
+  if (errorFlag == errOK)  // only do fit if curve is fittable
+  {
+    // set up minuit fit
+    TMinuit *gMinuit = new TMinuit(3);
+    gMinuit->SetPrintLevel(-1);  // save ourselves from gigabytes of stdout
+    gMinuit->SetFCN(chi2toMinimize);
+
+    // define threshold parameters - choose step size 1, max 300, min -50
+    gMinuit->DefineParameter(0, "Threshold", (Double_t)thresholdGuess, 1, -50, 300);
+    // sigma
+    gMinuit->DefineParameter(1, "Sigma", (Double_t)sigmaGuess, 0.1, 0, 255);
+    // amplitude
+    gMinuit->DefineParameter(2, "Amplitude", 1, 0.1, -0.001, 200);
+
+    // Do Chi2 minimazation
+    gMinuit->Migrad();
+    gMinuit->GetParameter(0, threshold, thresholdError);
+    gMinuit->GetParameter(1, sigma, sigmaError);
+    gMinuit->GetParameter(2, amplitude, amplitudeError);
+
+    // get Chi2
+    Double_t params[3] = {threshold, sigma, amplitude};
+    gMinuit->Eval(3, nullptr, chi2, params, 0);
+    // calculate Chi2 proability
+    if (nDOF <= 0)
+      chi2probability = 0;
+    else
+      chi2probability = TMath::Prob(chi2, nDOF);
+
+    // check to make sure output makes sense (i.e. threshold > 0)
+    if (chi2probability > minimumChi2prob_)
+      errorFlag = fittedSCurveSanityCheck(threshold, sigma, amplitude);
+    else
+      errorFlag = errBadChi2Prob;
+
+    edm::LogInfo("SiPixelSCurveCalibrationAnalysis")
+        << "Fit finished with errorFlag: " << errorFlag << " - threshold: " << threshold << "  sigma: " << sigma
+        << "  chi2: " << chi2 << "  nDOF: " << nDOF << " chi2Prob: " << chi2probability
+        << " chi2MinUser: " << minimumChi2prob_;
+
+    delete gMinuit;
+  }
+  // get row and column for this pixel
+  uint32_t row = calibDigi->row();
+  uint32_t col = calibDigi->col();
+
+  // get iterator to histogram holder for this detid
+  detIDHistogramMap::iterator thisDetIdHistoGrams;
+  thisDetIdHistoGrams = histograms_.find(detid);
+  if (thisDetIdHistoGrams != histograms_.end()) {
+    edm::LogInfo("SiPixelSCurveCalibrationAnalysisHistogramReport")
+        << "Filling histograms for [detid](col/row):  [" << detid << "](" << col << "/" << row
+        << ") ErrorFlag: " << errorFlag;
+    // always fill fit result
+    (*thisDetIdHistoGrams).second[kFitResultSummary]->Fill(errorFlag);
+    if (write2dFitResult_)
+      (*thisDetIdHistoGrams)
+          .second[kFitResults]
+          ->setBinContent(col + 1,
+                          row + 1,
+                          errorFlag);  // +1 because root bins start at 1
+
+    // fill sigma/threshold result
+    (*thisDetIdHistoGrams).second[kSigmaSummary]->Fill(sigma);
+    (*thisDetIdHistoGrams).second[kThresholdSummary]->Fill(threshold);
+    if (write2dHistograms_) {
+      (*thisDetIdHistoGrams)
+          .second[kSigmas]
+          ->setBinContent(col + 1,
+                          row + 1,
+                          sigma);  // +1 because root bins start at 1
+      (*thisDetIdHistoGrams)
+          .second[kThresholds]
+          ->setBinContent(col + 1,
+                          row + 1,
+                          threshold);  // +1 because root bins start at 1
+    }
+    // fill chi2
+    (*thisDetIdHistoGrams).second[kChi2Summary]->Fill(chi2probability);
+    if (write2dHistograms_)
+      (*thisDetIdHistoGrams).second[kChi2s]->Fill(col, row, chi2probability);
+  }
+  // save individual curves, if requested
+  if (saveCurvesThatFlaggedBad_) {
+    bool thisDetIDinList = false;
+    if (detIDsToSave_.find(detid) != detIDsToSave_.end())  // see if we want to save this histogram
+      thisDetIDinList = true;
+
+    if (errorFlag != errOK || thisDetIDinList) {
+      edm::LogError("SiPixelSCurveCalibrationAnalysis") << "Saving error histogram for [detid](col/row):  [" << detid
+                                                        << "](" << col << "/" << row << ") ErrorFlag: " << errorFlag;
+      buildACurveHistogram(detid, row, col, errorFlag, efficiencies_, effErrors_);
+    }
+  }
 
-   return true;
-   
+  return true;
 }
diff --git a/CalibTracker/SiStripAPVAnalysis/interface/TT6NTPedestalCalculator.h b/CalibTracker/SiStripAPVAnalysis/interface/TT6NTPedestalCalculator.h
index 7fa16e5ab3a18..e98b15cbfc22a 100644
--- a/CalibTracker/SiStripAPVAnalysis/interface/TT6NTPedestalCalculator.h
+++ b/CalibTracker/SiStripAPVAnalysis/interface/TT6NTPedestalCalculator.h
@@ -25,7 +25,7 @@ class TT6NTPedestalCalculator: public TkPedestalCalculator
      * @brief
      *   Celar all Pedestals
      */
-    inline void resetPedestals() override { pedestals_.empty(); }
+    inline void resetPedestals() override { pedestals_.clear(); }
 
     /*
      * @brief
diff --git a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc
index f24127f02a854..2de1dfcfe255e 100644
--- a/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc
+++ b/CalibTracker/SiStripChannelGain/plugins/SiStripGainFromData.cc
@@ -92,7 +92,6 @@ class SiStripGainFromData : public ConditionDBWriter<SiStripApvGain> {
 
       std::unique_ptr<SiStripApvGain> getNewObject() override;
       DQMStore* dqmStore_;
-      DQMStore* dqmStore_infile;
 
       double              ComputeChargeOverPath(const SiStripCluster*   Cluster,TrajectoryStateOnSurface trajState, const edm::EventSetup* iSetup, const Track* track, double trajChi2OverN);
       bool                IsFarFromBorder(TrajectoryStateOnSurface trajState, const uint32_t detid, const edm::EventSetup* iSetup);
@@ -317,7 +316,6 @@ SiStripGainFromData::SiStripGainFromData(const edm::ParameterSet& iConfig) : Con
    VInputFiles         = iConfig.getParameter<vector<string> >("VInputFiles");
 
    dqmStore_       = edm::Service<DQMStore>().operator->();
-   dqmStore_infile = edm::Service<DQMStore>().operator->();
 
    //if( OutputHistos!="" )
    //  dqmStore_->open(OutputHistos.c_str(), true);
diff --git a/CalibTracker/SiStripChannelGain/test/testSSTGain_HARVEST_FromRECO.py b/CalibTracker/SiStripChannelGain/test/testSSTGain_HARVEST_FromRECO.py
index 2c4905e55c1d3..6c1324751ba69 100644
--- a/CalibTracker/SiStripChannelGain/test/testSSTGain_HARVEST_FromRECO.py
+++ b/CalibTracker/SiStripChannelGain/test/testSSTGain_HARVEST_FromRECO.py
@@ -5,7 +5,6 @@
 # with command line options: stepHarvest --data --conditions auto:run2_data --scenario pp -s ALCAHARVEST:SiStripGains --filein file:PromptCalibProdSiStripGains.root -n -1 --fileout file:calib.root
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
 process = cms.Process('ALCAHARVEST')
 
diff --git a/CalibTracker/SiStripChannelGain/test/testSSTGain_PCL_FromRECO_cfg.py b/CalibTracker/SiStripChannelGain/test/testSSTGain_PCL_FromRECO_cfg.py
index 9bec3fe76f270..32428c7643bbf 100644
--- a/CalibTracker/SiStripChannelGain/test/testSSTGain_PCL_FromRECO_cfg.py
+++ b/CalibTracker/SiStripChannelGain/test/testSSTGain_PCL_FromRECO_cfg.py
@@ -4,7 +4,6 @@
 import FWCore.ParameterSet.Config as cms
 import os
 
-from Configuration.StandardSequences.Eras import eras
 import Utilities.General.cmssw_das_client as das_client
 
 ###################################################################
diff --git a/CalibTracker/SiStripCommon/plugins/SealModules.cc b/CalibTracker/SiStripCommon/plugins/SealModules.cc
index 100b2c0e2cb90..c576f60787ab6 100644
--- a/CalibTracker/SiStripCommon/plugins/SealModules.cc
+++ b/CalibTracker/SiStripCommon/plugins/SealModules.cc
@@ -1,7 +1,5 @@
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-//#include "FWCore/Framework/interface/ModuleFactory.h"
-//#include "FWCore/Utilities/interface/typelookup.h"
 
 #include "CalibTracker/SiStripCommon/plugins/SiStripDetInfoFileWriter.h"
 
@@ -21,8 +19,8 @@ DEFINE_FWK_SERVICE(SiStripDetInfoFileReader);
 #include "CalibTracker/SiStripCommon/interface/ShallowRechitClustersProducer.h"
 #include "CalibTracker/SiStripCommon/interface/ShallowSimhitClustersProducer.h"
 #include "CalibTracker/SiStripCommon/interface/ShallowTracksProducer.h"
-#include "CalibTracker/SiStripCommon/interface/ShallowSimTracksProducer.h"
 #include "CalibTracker/SiStripCommon/interface/ShallowGainCalibration.h"
+#include "ShallowSimTracksProducer.h"
 
 DEFINE_FWK_MODULE(ShallowTree);
 DEFINE_FWK_MODULE(ShallowEventDataProducer);
diff --git a/CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.cc b/CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.cc
index e98cce6c3cde1..cdfc22ae0ed39 100644
--- a/CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.cc
+++ b/CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.cc
@@ -1,4 +1,4 @@
-#include "CalibTracker/SiStripCommon/interface/ShallowSimTracksProducer.h"
+#include "ShallowSimTracksProducer.h"
 #include "CalibTracker/SiStripCommon/interface/ShallowTools.h"
 
 #include "FWCore/Framework/interface/Event.h"
diff --git a/CalibTracker/SiStripCommon/interface/ShallowSimTracksProducer.h b/CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.h
similarity index 100%
rename from CalibTracker/SiStripCommon/interface/ShallowSimTracksProducer.h
rename to CalibTracker/SiStripCommon/plugins/ShallowSimTracksProducer.h
diff --git a/CalibTracker/SiStripDCS/interface/SiStripCoralIface.h b/CalibTracker/SiStripDCS/interface/SiStripCoralIface.h
index 1692d0acadab6..e66cc04ee6f0f 100644
--- a/CalibTracker/SiStripDCS/interface/SiStripCoralIface.h
+++ b/CalibTracker/SiStripDCS/interface/SiStripCoralIface.h
@@ -9,33 +9,42 @@
 #include <string>
 #include <map>
 
-
 /**	
    \class SiStripCoralIface
    \brief An interface class to the PVSS cond DB
    \author J.Chen, J.Cole
 */
-class SiStripCoralIface
-{
- public:	
+class SiStripCoralIface {
+public:
   /** constructor */
-  SiStripCoralIface( std::string connectionString , std::string authenticationPath, const bool debug);
+  SiStripCoralIface(std::string connectionString, std::string authenticationPath, const bool debug);
   /** destructor*/
   ~SiStripCoralIface();
   /** Method to retrieve information from status change table or lastValue table.  queryType defines which table is to be accessed.*/
-  void doQuery(std::string queryType, const coral::TimeStamp& startTime, const coral::TimeStamp& endTime, std::vector<coral::TimeStamp>&, std::vector<float>&, std::vector<std::string>& );
+  void doQuery(std::string queryType,
+               const coral::TimeStamp& startTime,
+               const coral::TimeStamp& endTime,
+               std::vector<coral::TimeStamp>&,
+               std::vector<float>&,
+               std::vector<std::string>&);
   /** Method to access the settings for each channel stored in the status change table*/
-  void doSettingsQuery(const coral::TimeStamp& startTime,const coral::TimeStamp& endTime,std::vector<coral::TimeStamp>&,std::vector<float>&,std::vector<std::string>&,std::vector<uint32_t>&);
+  void doSettingsQuery(const coral::TimeStamp& startTime,
+                       const coral::TimeStamp& endTime,
+                       std::vector<coral::TimeStamp>&,
+                       std::vector<float>&,
+                       std::vector<std::string>&,
+                       std::vector<uint32_t>&);
   //
-  void doNameQuery(std::vector<std::string> &vec_dpname, std::vector<uint32_t> &vec_dpid);
- private:
+  void doNameQuery(std::vector<std::string>& vec_dpname, std::vector<uint32_t>& vec_dpid);
+
+private:
   /** Set up the connection to the database*/
   void initialize();
 
   /* member variables*/
   std::string m_connectionString;
   std::string m_authPath;
-  std::map<std::string,unsigned int> m_id_map;
+  std::map<std::string, unsigned int> m_id_map;
   cond::persistency::Session m_session;
   std::unique_ptr<cond::persistency::TransactionScope> m_transaction;
   // cond::CoralTransaction* m_coraldb;
diff --git a/CalibTracker/SiStripDCS/interface/SiStripDetVOffBuilder.h b/CalibTracker/SiStripDCS/interface/SiStripDetVOffBuilder.h
index 7672ee3026d73..70c6fe2890854 100644
--- a/CalibTracker/SiStripDCS/interface/SiStripDetVOffBuilder.h
+++ b/CalibTracker/SiStripDCS/interface/SiStripDetVOffBuilder.h
@@ -2,7 +2,6 @@
 #define SISTRIPDETVOFF_SRC_BUILDER_H
 #define USING_NEW_CORAL
 
-
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -22,7 +21,6 @@
 #include "CondFormats/Common/interface/TimeConversions.h"
 //#include "DataFormats/Provenance/interface/Timestamp.h"
 
-
 #include <fstream>
 #include <iostream>
 #include <memory>
@@ -36,71 +34,70 @@
 // Unit test class for SiStripDetVOffBuilder
 class TestSiStripDetVOffBuilder;
 
-class SiStripDetVOffBuilder
-{
+class SiStripDetVOffBuilder {
   friend class TestSiStripDetVOffBuilder;
 
- public:
+public:
   /** Destructor. */
   ~SiStripDetVOffBuilder();
   /** Default constructor. */
-  SiStripDetVOffBuilder(const edm::ParameterSet&,const edm::ActivityRegistry&);
+  SiStripDetVOffBuilder(const edm::ParameterSet&, const edm::ActivityRegistry&);
   /** Build the SiStripDetVOff object for transfer. */
   void BuildDetVOffObj();
   /** Return modules Off vector of objects. */
-  std::vector< std::pair<SiStripDetVOff*,cond::Time_t> > getModulesVOff() {
+  std::vector<std::pair<SiStripDetVOff*, cond::Time_t> > getModulesVOff() {
     reduction(deltaTmin_, maxIOVlength_);
     return modulesOff;
   }
   /** Return statistics about payloads transferred for storage in logDB. */
-  std::vector< std::vector<uint32_t> > getPayloadStats() {return payloadStats;}
+  std::vector<std::vector<uint32_t> > getPayloadStats() { return payloadStats; }
   /** Store the last payload transferred to DB as starting point for creation of new object list.
       ONLY WORKS FOR STATUSCHANGE OPTION. */
-  void setLastSiStripDetVOff( SiStripDetVOff * lastPayload, cond::Time_t lastTimeStamp );
+  void setLastSiStripDetVOff(SiStripDetVOff* lastPayload, cond::Time_t lastTimeStamp);
 
   /// Operates the reduction of the fast sequences of ramping up and down of the voltages
-  void reduce( std::vector< std::pair<SiStripDetVOff*,cond::Time_t> >::iterator & it,
-	       std::vector< std::pair<SiStripDetVOff*,cond::Time_t> >::iterator & initialIt,
-	       std::vector< std::pair<SiStripDetVOff*,cond::Time_t> > & resultVec,
-	       const bool last = false);
+  void reduce(std::vector<std::pair<SiStripDetVOff*, cond::Time_t> >::iterator& it,
+              std::vector<std::pair<SiStripDetVOff*, cond::Time_t> >::iterator& initialIt,
+              std::vector<std::pair<SiStripDetVOff*, cond::Time_t> >& resultVec,
+              const bool last = false);
 
   void reduction(const uint32_t deltaTmin, const uint32_t maxIOVlength);
 
   /// Removes IOVs as dictated by reduction
-  void discardIOVs( std::vector< std::pair<SiStripDetVOff*,cond::Time_t> >::iterator & it,
-                    std::vector< std::pair<SiStripDetVOff*,cond::Time_t> >::iterator & initialIt,
-                    std::vector< std::pair<SiStripDetVOff*,cond::Time_t> > & resultVec,
-                    const bool last, const unsigned int first );
+  void discardIOVs(std::vector<std::pair<SiStripDetVOff*, cond::Time_t> >::iterator& it,
+                   std::vector<std::pair<SiStripDetVOff*, cond::Time_t> >::iterator& initialIt,
+                   std::vector<std::pair<SiStripDetVOff*, cond::Time_t> >& resultVec,
+                   const bool last,
+                   const unsigned int first);
   bool FileExists(std::string filename);
- private:
+
+private:
   // typedefs
-  typedef std::vector< std::pair< std::vector<uint32_t>,coral::TimeStamp> > DetIdTimeStampVector;
-  
+  typedef std::vector<std::pair<std::vector<uint32_t>, coral::TimeStamp> > DetIdTimeStampVector;
 
   bool whichQuery;
 
-
   void printPar(std::stringstream& ss, const std::vector<int>& par);
 
-  std::string timeToStream(const coral::TimeStamp & coralTime, const string & comment = "");
-  std::string timeToStream(const cond::Time_t & condTime, const string & comment = "");
+  std::string timeToStream(const coral::TimeStamp& coralTime, const string& comment = "");
+  std::string timeToStream(const cond::Time_t& condTime, const string& comment = "");
 
   /** Returns the PSU channel setting, based on date.  Works from DP ID. */
-  int findSetting(uint32_t id, 
-		  const coral::TimeStamp& changeDate, 
-		  const std::vector<uint32_t>& settingID, 
-		  const std::vector<coral::TimeStamp>& settingDate);
+  int findSetting(uint32_t id,
+                  const coral::TimeStamp& changeDate,
+                  const std::vector<uint32_t>& settingID,
+                  const std::vector<coral::TimeStamp>& settingDate);
 
   /** Returns the PSU channel setting, based on date.  Works from PSU channel name. Overloaded. */
-  int findSetting(std::string dpname, 
-		  const coral::TimeStamp& changeDate, 
-		  const std::vector<std::string>& settingDpname, 
-		  const std::vector<coral::TimeStamp>& settingDate);
+  int findSetting(std::string dpname,
+                  const coral::TimeStamp& changeDate,
+                  const std::vector<std::string>& settingDpname,
+                  const std::vector<coral::TimeStamp>& settingDate);
 
   /** Extract the lastValue values from file rather than from the PVSS cond DB. */
-  void readLastValueFromFile(std::vector<uint32_t> &dpIDs,
-			     std::vector<float> &vmonValues, 
-			     std::vector<coral::TimeStamp> &dateChange);
+  void readLastValueFromFile(std::vector<uint32_t>& dpIDs,
+                             std::vector<float>& vmonValues,
+                             std::vector<coral::TimeStamp>& dateChange);
 
   /** Utility code to convert a coral timestamp to the correct time format for O2O timestamp. */
   cond::Time_t getCondTime(const coral::TimeStamp& coralTime);
@@ -109,15 +106,15 @@ class SiStripDetVOffBuilder
   coral::TimeStamp getCoralTime(cond::Time_t iovTime);
 
   /** Utility code to remove all the duplicates from a vector of uint32_t. */
-  void removeDuplicates( std::vector<uint32_t> & vec );
+  void removeDuplicates(std::vector<uint32_t>& vec);
   /** */
-  cond::Time_t findMostRecentTimeStamp( const std::vector<coral::TimeStamp>& coralDate );
-  
+  cond::Time_t findMostRecentTimeStamp(const std::vector<coral::TimeStamp>& coralDate);
+
   // member data
-  std::vector< std::vector<uint32_t> > payloadStats;
-  std::vector< std::pair<SiStripDetVOff*,cond::Time_t> > modulesOff;
-  std::pair<SiStripDetVOff *, cond::Time_t> lastStoredCondObj;
-  
+  std::vector<std::vector<uint32_t> > payloadStats;
+  std::vector<std::pair<SiStripDetVOff*, cond::Time_t> > modulesOff;
+  std::pair<SiStripDetVOff*, cond::Time_t> lastStoredCondObj;
+
   // configurable parameters
   std::string onlineDbConnectionString;
   std::string authenticationPath;
@@ -136,24 +133,18 @@ class SiStripDetVOffBuilder
   double highVoltageOnThreshold_;
 
   // Structure used to store variables needed when building the database objects
-  struct TimesAndValues
-  {
-    TimesAndValues() :
-      latestTime(0)
-    {}
-    std::vector<coral::TimeStamp> changeDate;    // used by both
-    std::vector<std::string>      dpname;        // only used by DB access, not file access
-    std::vector<float>            actualValue;   // only used by DB access, not file access
-    std::vector<uint32_t>         dpid;          // only used by file access
-    std::vector<int>              actualStatus;  // filled using actualValue info
-    cond::Time_t                  latestTime;    // used for timestamp when using lastValue from file
+  struct TimesAndValues {
+    TimesAndValues() : latestTime(0) {}
+    std::vector<coral::TimeStamp> changeDate;  // used by both
+    std::vector<std::string> dpname;           // only used by DB access, not file access
+    std::vector<float> actualValue;            // only used by DB access, not file access
+    std::vector<uint32_t> dpid;                // only used by file access
+    std::vector<int> actualStatus;             // filled using actualValue info
+    cond::Time_t latestTime;                   // used for timestamp when using lastValue from file
   };
-  
-  struct DetIdListTimeAndStatus
-  {
-    DetIdListTimeAndStatus() :
-      notMatched(0)
-    {}
+
+  struct DetIdListTimeAndStatus {
+    DetIdListTimeAndStatus() : notMatched(0) {}
     DetIdTimeStampVector detidV;
     std::vector<bool> StatusGood;
     unsigned int notMatched;
@@ -161,16 +152,17 @@ class SiStripDetVOffBuilder
     std::vector<unsigned int> isHV;
   };
 
-  void statusChange( cond::Time_t & lastTime, TimesAndValues & tStruct );
-  void lastValue( TimesAndValues & tStruct );
-  void lastValueFromFile( TimesAndValues & tStruct );
+  void statusChange(cond::Time_t& lastTime, TimesAndValues& tStruct);
+  void lastValue(TimesAndValues& tStruct);
+  void lastValueFromFile(TimesAndValues& tStruct);
 
-  void buildPSUdetIdMap(TimesAndValues & tStruct, DetIdListTimeAndStatus & dStruct);
+  void buildPSUdetIdMap(TimesAndValues& tStruct, DetIdListTimeAndStatus& dStruct);
 
   void setPayloadStats(const uint32_t afterV, const uint32_t numAdded, const uint32_t numRemoved);
-  std::pair<int, int> extractDetIdVector(const unsigned int i, SiStripDetVOff * modV, DetIdListTimeAndStatus & detIdStruct);
+  std::pair<int, int> extractDetIdVector(const unsigned int i,
+                                         SiStripDetVOff* modV,
+                                         DetIdListTimeAndStatus& detIdStruct);
 
   std::unique_ptr<SiStripCoralIface> coralInterface;
-
 };
 #endif
diff --git a/CalibTracker/SiStripDCS/interface/SiStripPsuDetIdMap.h b/CalibTracker/SiStripDCS/interface/SiStripPsuDetIdMap.h
index cd40dcb711152..62f2ff868e70a 100644
--- a/CalibTracker/SiStripDCS/interface/SiStripPsuDetIdMap.h
+++ b/CalibTracker/SiStripDCS/interface/SiStripPsuDetIdMap.h
@@ -30,22 +30,28 @@ class SiStripConfigDb;
    \author J.Cole
 */
 
-class SiStripPsuDetIdMap
-{
- public:
+class SiStripPsuDetIdMap {
+public:
   /** Constructor */
   SiStripPsuDetIdMap();
   /** Destructor */
   ~SiStripPsuDetIdMap();
 
   std::vector<uint32_t> getLvDetID(std::string psu);
-  void getHvDetID(std::string psuchannel, std::vector<uint32_t> & ids, std::vector<uint32_t> & unmapped_ids, std::vector<uint32_t> & crosstalking_ids );
+  void getHvDetID(std::string psuchannel,
+                  std::vector<uint32_t> &ids,
+                  std::vector<uint32_t> &unmapped_ids,
+                  std::vector<uint32_t> &crosstalking_ids);
 
   //Produces 3 list of detIDs:
   //1-detids (positively matching the PSUChannel for HV case, positively matching the PSU for the LV case)
   //2-unmapped_detids (matching the PSUChannel000 for the HV case, empty for LV case)
   //3-crosstalking_detids (matching the PSUChannel999 for the HV case, empty for the LV case)
-  void getDetID(std::string pvss, bool, std::vector<uint32_t> & detids,std::vector<uint32_t> & unmapped_detids,std::vector<uint32_t> & crosstalking_detids);
+  void getDetID(std::string pvss,
+                bool,
+                std::vector<uint32_t> &detids,
+                std::vector<uint32_t> &unmapped_detids,
+                std::vector<uint32_t> &crosstalking_detids);
   /** Returns the PSU channel name for the specified Det ID, for power groups only. */
   std::string getPSUName(uint32_t detid);
   /** Returns the PSU channel name for the specified Det ID. */
@@ -60,30 +66,30 @@ class SiStripPsuDetIdMap
   uint32_t getDcuId(std::string pvss);
   /** Returns the DCU ID associated to the specified Det ID.  NB.  This checks power groups only, by definition. */
   uint32_t getDcuId(uint32_t detid);
-  
+
   //Return the HVUnmapped PSU channels as a map initialized to all channels (002/003) OFF (false):
-  std::map<std::string,std::vector<uint32_t> > getHVUnmappedMap() {return HVUnmapped_Map;}
+  std::map<std::string, std::vector<uint32_t> > getHVUnmappedMap() { return HVUnmapped_Map; }
   //Return the HVCrosstalking PSU channels as a map initialized to all channels (002/003) OFF (false):
-  std::map<std::string,std::vector<uint32_t> > getHVCrosstalkingMap() {return HVCrosstalking_Map;}
+  std::map<std::string, std::vector<uint32_t> > getHVCrosstalkingMap() { return HVCrosstalking_Map; }
   //PsuDetIdMap getHVUnmappedDetIdMap() {return HVUnmapped_Map}
   //Return the HVUnmapped PSUchannel to (HV status) map initialized to all OFF:
   //PsuDetIdMap getHVUnmappedChannelMap() {return HVUnmapped_ChanStatus}
   //PsuDetIdMap getHVCrosstalkingChannelMap() {return HVCrossTalking_ChanStatus}
   /** Return the PG PSU-DETID map as a vector. */
-  std::vector< std::pair<uint32_t, std::string> > getPsuDetIdMap() {return pgMap;}
+  std::vector<std::pair<uint32_t, std::string> > getPsuDetIdMap() { return pgMap; }
   /** Return the PG detector locations as a vector - one-to-one correspondance with the contents of the PSU-DetID map vector. */
-  std::vector<std::string> getDetectorLocations() {return detectorLocations;}
+  std::vector<std::string> getDetectorLocations() { return detectorLocations; }
   /** Return the DCU IDs associated to the PG map. */
-  std::vector<uint32_t> getDcuIds() {return dcuIds;}
+  std::vector<uint32_t> getDcuIds() { return dcuIds; }
   /** Return the CG PSU-DETID map as a vector. */
-  std::vector< std::pair<uint32_t, std::string> > getControlPsuDetIdMap() {return cgMap;}
+  std::vector<std::pair<uint32_t, std::string> > getControlPsuDetIdMap() { return cgMap; }
   /** Return the CG detector locations as a vector - one-to-one correspondance with the contents of the PSU-DetID map vector. */
-  std::vector<std::string> getControlDetectorLocations() {return controlLocations;}
+  std::vector<std::string> getControlDetectorLocations() { return controlLocations; }
   /** Return the module DCU IDs associated to the CG map. */
-  std::vector<uint32_t> getCgDcuIds() {return cgDcuIds;}
+  std::vector<uint32_t> getCgDcuIds() { return cgDcuIds; }
   /** Return the CCU DCU IDs associated to the CG map. */
-  std::vector<uint32_t> getCcuDcuIds() {return ccuDcuIds;}
-  
+  std::vector<uint32_t> getCcuDcuIds() { return ccuDcuIds; }
+
   /** Produces a formatted printout of the PSU-DETID map. */
   void printMap();
   /** Produces a formatted printout of the control PSU-DETID map. */
@@ -94,47 +100,53 @@ class SiStripPsuDetIdMap
    * Build the map from given file.
    * ATTENTION: this will only build the pgMap, not the cgMap.
    */
-  void BuildMap( const std::string & mapFile, const bool debug );
+  void BuildMap(const std::string &mapFile, const bool debug);
   //Old "rawmap" (vector of pairs) method to be used by excludeddetids:
-  void BuildMap( const std::string & mapFile, std::vector<std::pair<uint32_t,std::string> > & rawmap);
+  void BuildMap(const std::string &mapFile, std::vector<std::pair<uint32_t, std::string> > &rawmap);
   /// Overloaded method that does the buidling
-  void BuildMap( const std::string & mapFile, const bool debug, std::map<std::string,std::vector<uint32_t> > & LVmap, std::map<std::string,std::vector<uint32_t> > & HVmap, std::map<std::string,std::vector<uint32_t> > & HVUnmappedmap, std::map<std::string,std::vector<uint32_t> > & HVCrosstalkingmap);
+  void BuildMap(const std::string &mapFile,
+                const bool debug,
+                std::map<std::string, std::vector<uint32_t> > &LVmap,
+                std::map<std::string, std::vector<uint32_t> > &HVmap,
+                std::map<std::string, std::vector<uint32_t> > &HVUnmappedmap,
+                std::map<std::string, std::vector<uint32_t> > &HVCrosstalkingmap);
 
   //Service function to remove duplicated from vectors of detids:
-  void RemoveDuplicateDetIDs(std::vector<uint32_t> & detids);
+  void RemoveDuplicateDetIDs(std::vector<uint32_t> &detids);
 
   /** Returns the DCU-PSU map as a vector. */
-  std::vector< std::pair<uint32_t, std::string> > getDcuPsuMap();
+  std::vector<std::pair<uint32_t, std::string> > getDcuPsuMap();
   /** Returns 1 if the specified PSU channel is a HV channel, 0 if it is a LV channel.  -1 means error. */
   int IsHVChannel(std::string pvss);
-  
- private:
+
+private:
   // typedefs
-  typedef std::vector<TkDcuPsuMap *> DcuPsuVector ;
-  typedef std::map<std::string,std::vector<uint32_t> > PsuDetIdMap;
-  typedef edm::MapOfVectors<std::string,TkDcuPsuMap*> DcuPsus;
+  typedef std::vector<TkDcuPsuMap *> DcuPsuVector;
+  typedef std::map<std::string, std::vector<uint32_t> > PsuDetIdMap;
+  typedef edm::MapOfVectors<std::string, TkDcuPsuMap *> DcuPsus;
   typedef DcuPsus::range DcuPsusRange;
   /** Extracts the DCU-PSU map from the DB. */
   void getDcuPsuMap(DcuPsusRange &pRange, DcuPsusRange &cRange, std::string partition);
   /** Extracts the DCU device descriptions and stores them for further use. Only used for control groups. */
   //  std::vector< std::pair<uint32_t, SiStripConfigDb::DeviceAddress> >  retrieveDcuDeviceAddresses(std::string partition);
-  std::vector< std::pair< std::vector<uint16_t> , std::vector<uint32_t> > > retrieveDcuDeviceAddresses(std::string partition);
+  std::vector<std::pair<std::vector<uint16_t>, std::vector<uint32_t> > > retrieveDcuDeviceAddresses(
+      std::string partition);
   /** Searches the DCU device descriptions for the specified DCU ID. Needed for control groups. */
-  std::vector<uint32_t>  findDcuIdFromDeviceAddress(uint32_t dcuid_);
+  std::vector<uint32_t> findDcuIdFromDeviceAddress(uint32_t dcuid_);
   /** Utility to clone a DCU-PSU map. */
   void clone(DcuPsuVector &input, DcuPsuVector &output);
   /** Produces a detailed debug of the input values. */
   // for debugging
-  void checkMapInputValues(const SiStripConfigDb::DcuDetIdsV& dcuDetIds_, const DcuPsuVector& dcuPsus_);
-  
+  void checkMapInputValues(const SiStripConfigDb::DcuDetIdsV &dcuDetIds_, const DcuPsuVector &dcuPsus_);
+
   // member variables
   edm::Service<SiStripConfigDb> db_;
   PsuDetIdMap LVMap, HVMap, HVUnmapped_Map, HVCrosstalking_Map;
-  std::vector< std::pair<uint32_t, std::string> > pgMap, cgMap;
+  std::vector<std::pair<uint32_t, std::string> > pgMap, cgMap;
   std::vector<std::string> detectorLocations, controlLocations;
   std::vector<uint32_t> dcuIds, cgDcuIds, ccuDcuIds;
   DcuPsus DcuPsuMapPG_, DcuPsuMapCG_;
   //  std::vector< std::pair<uint32_t, SiStripConfigDb::DeviceAddress> > dcu_device_addr_vector;
-  std::vector< std::pair< std::vector<uint16_t> , std::vector<uint32_t> > > dcu_device_addr_vector;
+  std::vector<std::pair<std::vector<uint16_t>, std::vector<uint32_t> > > dcu_device_addr_vector;
 };
 #endif
diff --git a/CalibTracker/SiStripDCS/plugins/FilterTrackerOn.cc b/CalibTracker/SiStripDCS/plugins/FilterTrackerOn.cc
index 1777638695eca..566691c632a44 100644
--- a/CalibTracker/SiStripDCS/plugins/FilterTrackerOn.cc
+++ b/CalibTracker/SiStripDCS/plugins/FilterTrackerOn.cc
@@ -8,24 +8,19 @@
 #include <iostream>
 #include <algorithm>
 
-FilterTrackerOn::FilterTrackerOn(const edm::ParameterSet& iConfig) :
-  minModulesWithHVoff_(iConfig.getParameter<int>("MinModulesWithHVoff"))
-{
-}
+FilterTrackerOn::FilterTrackerOn(const edm::ParameterSet& iConfig)
+    : minModulesWithHVoff_(iConfig.getParameter<int>("MinModulesWithHVoff")) {}
 
-FilterTrackerOn::~FilterTrackerOn()
-{
-}
+FilterTrackerOn::~FilterTrackerOn() {}
 
-bool FilterTrackerOn::filter(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+bool FilterTrackerOn::filter(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   using namespace edm;
 
   ESHandle<SiStripDetVOff> detVOff;
-  iSetup.get<SiStripDetVOffRcd>().get( detVOff );
+  iSetup.get<SiStripDetVOffRcd>().get(detVOff);
 
   // std::cout << "detVOff->getHVoffCounts() = " << detVOff->getHVoffCounts() << " < " << minModulesWithHVoff_;
-  if( detVOff->getHVoffCounts() > minModulesWithHVoff_ ) {
+  if (detVOff->getHVoffCounts() > minModulesWithHVoff_) {
     // std::cout << " skipping event" << std::endl;
     return false;
   }
@@ -34,11 +29,7 @@ bool FilterTrackerOn::filter(edm::Event& iEvent, const edm::EventSetup& iSetup)
 }
 
 // ------------ method called once each job just before starting event loop  ------------
-void FilterTrackerOn::beginJob()
-{
-}
+void FilterTrackerOn::beginJob() {}
 
 // ------------ method called once each job just after ending the event loop  ------------
-void FilterTrackerOn::endJob()
-{
-}
+void FilterTrackerOn::endJob() {}
diff --git a/CalibTracker/SiStripDCS/plugins/FilterTrackerOn.h b/CalibTracker/SiStripDCS/plugins/FilterTrackerOn.h
index a913fb39a353b..7cbaa8bf1e123 100644
--- a/CalibTracker/SiStripDCS/plugins/FilterTrackerOn.h
+++ b/CalibTracker/SiStripDCS/plugins/FilterTrackerOn.h
@@ -2,7 +2,7 @@
 //
 // Package:    CalibTracker/SiStripDCS/plugins
 // Class:      SyncDCSO2O
-// 
+//
 /**\class FilterTrackerOn FilterTrackerOn.cc
 
  Description: EDFilter returning true when the number of modules with HV on in the Tracker is
@@ -27,16 +27,15 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class FilterTrackerOn : public edm::EDFilter
-{
- public:
+class FilterTrackerOn : public edm::EDFilter {
+public:
   explicit FilterTrackerOn(const edm::ParameterSet&);
   ~FilterTrackerOn() override;
 
- private:
-  void beginJob() override ;
+private:
+  void beginJob() override;
   bool filter(edm::Event&, const edm::EventSetup&) override;
-  void endJob() override ;
+  void endJob() override;
 
   int minModulesWithHVoff_;
 };
diff --git a/CalibTracker/SiStripDCS/plugins/SealModules.cc b/CalibTracker/SiStripDCS/plugins/SealModules.cc
index 210e67223ea04..b1a302e87c57b 100644
--- a/CalibTracker/SiStripDCS/plugins/SealModules.cc
+++ b/CalibTracker/SiStripDCS/plugins/SealModules.cc
@@ -1,7 +1,6 @@
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-
 #include "FWCore/ServiceRegistry/interface/ServiceMaker.h"
 #include "CalibTracker/SiStripDCS/interface/SiStripDetVOffBuilder.h"
 DEFINE_FWK_SERVICE(SiStripDetVOffBuilder);
diff --git a/CalibTracker/SiStripDCS/plugins/SiStripDetVOffHandler.cc b/CalibTracker/SiStripDCS/plugins/SiStripDetVOffHandler.cc
index d748b126aa477..226ff86079b6f 100644
--- a/CalibTracker/SiStripDCS/plugins/SiStripDetVOffHandler.cc
+++ b/CalibTracker/SiStripDCS/plugins/SiStripDetVOffHandler.cc
@@ -11,12 +11,11 @@
 
 #include "CalibTracker/SiStripDCS/interface/SiStripDetVOffBuilder.h"
 
-
 class SiStripDetVOffHandler : public edm::EDAnalyzer {
 public:
-  explicit SiStripDetVOffHandler(const edm::ParameterSet& iConfig );
+  explicit SiStripDetVOffHandler(const edm::ParameterSet& iConfig);
   ~SiStripDetVOffHandler() override;
-  void analyze( const edm::Event& evt, const edm::EventSetup& evtSetup) override;
+  void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) override;
   void endJob() override;
 
 private:
@@ -27,24 +26,24 @@ class SiStripDetVOffHandler : public edm::EDAnalyzer {
 
   int maxTimeBeforeNewIOV_;
 
-  std::vector< std::pair<SiStripDetVOff*,cond::Time_t> > newPayloads;
+  std::vector<std::pair<SiStripDetVOff*, cond::Time_t> > newPayloads;
   edm::Service<SiStripDetVOffBuilder> modHVBuilder;
 };
 
-SiStripDetVOffHandler::SiStripDetVOffHandler(const edm::ParameterSet& iConfig):
-    m_connectionPool(),
-    m_condDb( iConfig.getParameter< std::string >("conditionDatabase") ),
-    m_localCondDbFile( iConfig.getParameter< std::string >("condDbFile") ),
-    m_targetTag( iConfig.getParameter< std::string >("targetTag") ),
-    maxTimeBeforeNewIOV_( iConfig.getUntrackedParameter< int >("maxTimeBeforeNewIOV", 24) ){
-  m_connectionPool.setParameters( iConfig.getParameter<edm::ParameterSet>("DBParameters")  );
+SiStripDetVOffHandler::SiStripDetVOffHandler(const edm::ParameterSet& iConfig)
+    : m_connectionPool(),
+      m_condDb(iConfig.getParameter<std::string>("conditionDatabase")),
+      m_localCondDbFile(iConfig.getParameter<std::string>("condDbFile")),
+      m_targetTag(iConfig.getParameter<std::string>("targetTag")),
+      maxTimeBeforeNewIOV_(iConfig.getUntrackedParameter<int>("maxTimeBeforeNewIOV", 24)) {
+  m_connectionPool.setParameters(iConfig.getParameter<edm::ParameterSet>("DBParameters"));
   m_connectionPool.configure();
   // get last IOV from local sqlite file if "conditionDatabase" is empty
-  if (m_condDb.empty()) m_condDb = m_localCondDbFile;
+  if (m_condDb.empty())
+    m_condDb = m_localCondDbFile;
 }
 
-SiStripDetVOffHandler::~SiStripDetVOffHandler() {
-}
+SiStripDetVOffHandler::~SiStripDetVOffHandler() {}
 
 void SiStripDetVOffHandler::analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) {
   // get last payload from condDb
@@ -52,43 +51,45 @@ void SiStripDetVOffHandler::analyze(const edm::Event& evt, const edm::EventSetup
   std::shared_ptr<SiStripDetVOff> lastPayload;
 
   edm::LogInfo("SiStripDetVOffHandler") << "[SiStripDetVOffHandler::" << __func__ << "] "
-      << "Retrieve last IOV from " << m_condDb;
-  cond::persistency::Session condDbSession = m_connectionPool.createSession( m_condDb );
-  condDbSession.transaction().start( true );
-  if ( m_condDb.find("sqlite")==0 && (!condDbSession.existsDatabase()) ){
+                                        << "Retrieve last IOV from " << m_condDb;
+  cond::persistency::Session condDbSession = m_connectionPool.createSession(m_condDb);
+  condDbSession.transaction().start(true);
+  if (m_condDb.find("sqlite") == 0 && (!condDbSession.existsDatabase())) {
     // Source of last IOV is empty
-    edm::LogInfo("SiStripDetVOffHandler") << "[SiStripDetVOffHandler::" << __func__ << "] "
+    edm::LogInfo("SiStripDetVOffHandler")
+        << "[SiStripDetVOffHandler::" << __func__ << "] "
         << "No information can be retrieved from " << m_condDb << " because the file is empty.\n"
         << "Will assume all HV/LV's are off.";
-  }else{
-    cond::persistency::IOVProxy iovProxy = condDbSession.readIov( m_targetTag );
+  } else {
+    cond::persistency::IOVProxy iovProxy = condDbSession.readIov(m_targetTag);
     cond::Hash lastPayloadHash = iovProxy.getLast().payloadId;
-    if ( !lastPayloadHash.empty() ) {
-      lastPayload = condDbSession.fetchPayload<SiStripDetVOff>( lastPayloadHash );
-      lastIov = iovProxy.getLast().since; // move to LastValidatedTime?
+    if (!lastPayloadHash.empty()) {
+      lastPayload = condDbSession.fetchPayload<SiStripDetVOff>(lastPayloadHash);
+      lastIov = iovProxy.getLast().since;  // move to LastValidatedTime?
     }
     edm::LogInfo("SiStripDetVOffHandler") << "[SiStripDetVOffHandler::" << __func__ << "] "
-        << " ... last IOV: " << lastIov << " , " << "last Payload: " << lastPayloadHash;
+                                          << " ... last IOV: " << lastIov << " , "
+                                          << "last Payload: " << lastPayloadHash;
   }
   condDbSession.transaction().commit();
 
   // build the object!
   newPayloads.clear();
-  modHVBuilder->setLastSiStripDetVOff( lastPayload.get(), lastIov );
+  modHVBuilder->setLastSiStripDetVOff(lastPayload.get(), lastIov);
   modHVBuilder->BuildDetVOffObj();
   newPayloads = modHVBuilder->getModulesVOff();
   edm::LogInfo("SiStripDetVOffHandler") << "[SiStripDetVOffHandler::" << __func__ << "] "
-      << "Finished building " << newPayloads.size() << " new payloads.";
+                                        << "Finished building " << newPayloads.size() << " new payloads.";
 
   // write the payloads to sqlite file
   edm::LogInfo("SiStripDetVOffHandler") << "[SiStripDetVOffHandler::" << __func__ << "] "
-      << "Write new payloads to sqlite file " << m_localCondDbFile;
-  cond::persistency::Session localFileSession = m_connectionPool.createSession( m_localCondDbFile, true );
-  localFileSession.transaction().start( false );
-  if ( lastPayload && newPayloads.size() == 1 && *newPayloads[0].first == *lastPayload ){
+                                        << "Write new payloads to sqlite file " << m_localCondDbFile;
+  cond::persistency::Session localFileSession = m_connectionPool.createSession(m_localCondDbFile, true);
+  localFileSession.transaction().start(false);
+  if (lastPayload && newPayloads.size() == 1 && *newPayloads[0].first == *lastPayload) {
     // if no HV/LV transition was found in this period
     edm::LogInfo("SiStripDetVOffHandler") << "[SiStripDetVOffHandler::" << __func__ << "] "
-        << "No HV/LV transition was found from PVSS query.";
+                                          << "No HV/LV transition was found from PVSS query.";
     bool forceNewIOV = true;
     if (maxTimeBeforeNewIOV_ < 0)
       forceNewIOV = false;
@@ -96,40 +97,41 @@ void SiStripDetVOffHandler::analyze(const edm::Event& evt, const edm::EventSetup
       auto deltaT = cond::time::to_boost(newPayloads[0].second) - cond::time::to_boost(lastIov);
       forceNewIOV = deltaT > boost::posix_time::hours(maxTimeBeforeNewIOV_);
     }
-    if ( !forceNewIOV ){
+    if (!forceNewIOV) {
       newPayloads.erase(newPayloads.begin());
       edm::LogInfo("SiStripDetVOffHandler") << "[SiStripDetVOffHandler::" << __func__ << "] "
-          << " ... No payload transfered.";
-    }else {
-      edm::LogInfo("SiStripDetVOffHandler") << "[SiStripDetVOffHandler::" << __func__ << "] "
-          << " ... The last IOV is too old. Will start a new IOV from " << newPayloads[0].second
-          << "(" << boost::posix_time::to_simple_string(cond::time::to_boost(newPayloads[0].second)) << ") with the same payload.";
+                                            << " ... No payload transfered.";
+    } else {
+      edm::LogInfo("SiStripDetVOffHandler")
+          << "[SiStripDetVOffHandler::" << __func__ << "] "
+          << " ... The last IOV is too old. Will start a new IOV from " << newPayloads[0].second << "("
+          << boost::posix_time::to_simple_string(cond::time::to_boost(newPayloads[0].second))
+          << ") with the same payload.";
     }
   }
 
   cond::persistency::IOVEditor iovEditor;
-  if (localFileSession.existsDatabase() && localFileSession.existsIov(m_targetTag)){
-    edm::LogWarning("SiStripDetVOffHandler") << "[SiStripDetVOffHandler::" << __func__ << "] "
+  if (localFileSession.existsDatabase() && localFileSession.existsIov(m_targetTag)) {
+    edm::LogWarning("SiStripDetVOffHandler")
+        << "[SiStripDetVOffHandler::" << __func__ << "] "
         << "IOV of tag " << m_targetTag << " already exists in sqlite file " << m_localCondDbFile;
     iovEditor = localFileSession.editIov(m_targetTag);
-  }else {
-    iovEditor = localFileSession.createIov<SiStripDetVOff>( m_targetTag, cond::timestamp );
-    iovEditor.setDescription( "New IOV" );
+  } else {
+    iovEditor = localFileSession.createIov<SiStripDetVOff>(m_targetTag, cond::timestamp);
+    iovEditor.setDescription("New IOV");
   }
-  for (const auto &payload : newPayloads){
-    cond::Hash thePayloadHash = localFileSession.storePayload<SiStripDetVOff>( *payload.first );
-    iovEditor.insert( payload.second, thePayloadHash );
+  for (const auto& payload : newPayloads) {
+    cond::Hash thePayloadHash = localFileSession.storePayload<SiStripDetVOff>(*payload.first);
+    iovEditor.insert(payload.second, thePayloadHash);
   }
   iovEditor.flush();
   localFileSession.transaction().commit();
 
-  edm::LogInfo("SiStripDetVOffHandler") << "[SiStripDetVOffHandler::" << __func__ << "] "
-      << newPayloads.size() << " payloads written to sqlite file.";
-
+  edm::LogInfo("SiStripDetVOffHandler") << "[SiStripDetVOffHandler::" << __func__ << "] " << newPayloads.size()
+                                        << " payloads written to sqlite file.";
 }
 
-void SiStripDetVOffHandler::endJob() {
-}
+void SiStripDetVOffHandler::endJob() {}
 
 // -------------------------------------------------------
 typedef SiStripDetVOffHandler SiStripO2ODetVOff;
diff --git a/CalibTracker/SiStripDCS/plugins/SiStripDetVOffPrinter.cc b/CalibTracker/SiStripDCS/plugins/SiStripDetVOffPrinter.cc
index 6609bd1a41fb4..4d55c0ec3b58e 100644
--- a/CalibTracker/SiStripDCS/plugins/SiStripDetVOffPrinter.cc
+++ b/CalibTracker/SiStripDCS/plugins/SiStripDetVOffPrinter.cc
@@ -24,18 +24,15 @@
 #include <TGraph.h>
 #include <TH1.h>
 
-
 class SiStripDetVOffPrinter : public edm::one::EDAnalyzer<> {
 public:
-
-  explicit SiStripDetVOffPrinter(const edm::ParameterSet& iConfig );
+  explicit SiStripDetVOffPrinter(const edm::ParameterSet& iConfig);
   ~SiStripDetVOffPrinter() override;
-  void analyze( const edm::Event& evt, const edm::EventSetup& evtSetup) override;
+  void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) override;
   void endJob() override;
-  static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 private:
-
   cond::persistency::ConnectionPool m_connectionPool;
   std::string m_condDb;
   std::string m_tagName;
@@ -48,74 +45,72 @@ class SiStripDetVOffPrinter : public edm::one::EDAnalyzer<> {
   edm::Service<SiStripDetInfoFileReader> detidReader;
 
   //          IOV                 DETIDs
-  std::map<cond::Time_t, std::set< uint32_t > > iovMap_HVOff;
-  std::map<cond::Time_t, std::set< uint32_t > > iovMap_LVOff;
+  std::map<cond::Time_t, std::set<uint32_t> > iovMap_HVOff;
+  std::map<cond::Time_t, std::set<uint32_t> > iovMap_LVOff;
   //          DETIDs              IOV
-  std::map<uint32_t, std::vector< cond::Time_t > > detidMap;
+  std::map<uint32_t, std::vector<cond::Time_t> > detidMap;
 };
 
-SiStripDetVOffPrinter::SiStripDetVOffPrinter(const edm::ParameterSet& iConfig):
-  m_connectionPool(),
-  m_condDb( iConfig.getParameter< std::string >("conditionDatabase") ),
-  m_tagName( iConfig.getParameter< std::string >("tagName") ),
-  m_startTime( iConfig.getParameter< std::string >("startTime") ),
-  m_endTime( iConfig.getParameter< std::string >("endTime") ),
-  m_output( iConfig.getParameter< std::string >("output") )
-{
-  m_connectionPool.setParameters( iConfig.getParameter<edm::ParameterSet>("DBParameters")  );
+SiStripDetVOffPrinter::SiStripDetVOffPrinter(const edm::ParameterSet& iConfig)
+    : m_connectionPool(),
+      m_condDb(iConfig.getParameter<std::string>("conditionDatabase")),
+      m_tagName(iConfig.getParameter<std::string>("tagName")),
+      m_startTime(iConfig.getParameter<std::string>("startTime")),
+      m_endTime(iConfig.getParameter<std::string>("endTime")),
+      m_output(iConfig.getParameter<std::string>("output")) {
+  m_connectionPool.setParameters(iConfig.getParameter<edm::ParameterSet>("DBParameters"));
   m_connectionPool.configure();
 }
 
-SiStripDetVOffPrinter::~SiStripDetVOffPrinter() {
-}
+SiStripDetVOffPrinter::~SiStripDetVOffPrinter() {}
 
 void SiStripDetVOffPrinter::analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) {
-  
   // get total number of modules
   //auto num_modules = detidReader->getAllDetIds().size();
 
   // use start and end time from config file
   boost::posix_time::ptime p_start, p_end;
   p_start = boost::posix_time::time_from_string(m_startTime);
-  p_end   = boost::posix_time::time_from_string(m_endTime);
+  p_end = boost::posix_time::time_from_string(m_endTime);
   cond::Time_t startIov = cond::time::from_boost(p_start);
-  cond::Time_t endIov   = cond::time::from_boost(p_end);
+  cond::Time_t endIov = cond::time::from_boost(p_end);
   if (startIov > endIov)
     throw cms::Exception("endTime must be greater than startTime!");
   edm::LogInfo("SiStripDetVOffPrinter") << "[SiStripDetVOffPrinter::" << __func__ << "] "
-					<< "Set start time " << startIov << " (" << boost::posix_time::to_simple_string(p_start) << ")"
-					<< "\n ... Set end time " << endIov << " (" << boost::posix_time::to_simple_string(p_end) << ")" ;
+                                        << "Set start time " << startIov << " ("
+                                        << boost::posix_time::to_simple_string(p_start) << ")"
+                                        << "\n ... Set end time " << endIov << " ("
+                                        << boost::posix_time::to_simple_string(p_end) << ")";
 
   // open db session
   edm::LogInfo("SiStripDetVOffPrinter") << "[SiStripDetVOffPrinter::" << __func__ << "] "
-					<< "Query the condition database " << m_condDb;
-  cond::persistency::Session condDbSession = m_connectionPool.createSession( m_condDb );
-  condDbSession.transaction().start( true );
+                                        << "Query the condition database " << m_condDb;
+  cond::persistency::Session condDbSession = m_connectionPool.createSession(m_condDb);
+  condDbSession.transaction().start(true);
 
   std::stringstream ss;
   // list of times with new IOVs within the time range
-  std::vector< cond::Time_t > vTime;
-  
+  std::vector<cond::Time_t> vTime;
+
   // query the database
   edm::LogInfo("SiStripDetVOffPrinter") << "[SiStripDetVOffPrinter::" << __func__ << "] "
-					<< "Reading IOVs from tag " << m_tagName;
-  cond::persistency::IOVProxy iovProxy = condDbSession.readIov(m_tagName, true); // load all?
+                                        << "Reading IOVs from tag " << m_tagName;
+  cond::persistency::IOVProxy iovProxy = condDbSession.readIov(m_tagName, true);  // load all?
   auto iiov = iovProxy.find(startIov);
   auto eiov = iovProxy.find(endIov);
   int niov = 0;
-  while (iiov != iovProxy.end() && (*iiov).since <= (*eiov).since){
+  while (iiov != iovProxy.end() && (*iiov).since <= (*eiov).since) {
     // convert cond::Time_t to seconds since epoch
-    if ((*iiov).since<startIov){
+    if ((*iiov).since < startIov) {
       vTime.push_back(startIov);
     } else {
       vTime.push_back((*iiov).since);
     }
-    auto payload = condDbSession.fetchPayload<SiStripDetVOff>( (*iiov).payloadId );
+    auto payload = condDbSession.fetchPayload<SiStripDetVOff>((*iiov).payloadId);
     // print IOVs summary
-    ss  << boost::posix_time::to_simple_string(cond::time::to_boost((*iiov).since))
-	<< " (" << (*iiov).since <<  ")"
-	<< ", # HV Off=" << std::setw(6) << payload->getHVoffCounts()
-	<< ", # LV Off=" << std::setw(6) << payload->getLVoffCounts() << std::endl;
+    ss << boost::posix_time::to_simple_string(cond::time::to_boost((*iiov).since)) << " (" << (*iiov).since << ")"
+       << ", # HV Off=" << std::setw(6) << payload->getHVoffCounts() << ", # LV Off=" << std::setw(6)
+       << payload->getLVoffCounts() << std::endl;
 
     // list of detids with HV/LV Off
     std::vector<uint32_t> detIds;
@@ -123,111 +118,112 @@ void SiStripDetVOffPrinter::analyze(const edm::Event& evt, const edm::EventSetup
     std::set<uint32_t> detIds_HVOff;
     std::set<uint32_t> detIds_LVOff;
     std::vector<uint32_t>::const_iterator it = detIds.begin();
-    for( ; it!=detIds.end(); ++it ) {
-      if(payload->IsModuleHVOff(*it) ) detIds_HVOff.insert(*it);
-      if(payload->IsModuleLVOff(*it) ) detIds_LVOff.insert(*it);
-      
-      if(detidMap.find(*it)==detidMap.end()) {
-	std::vector< cond::Time_t > vec;
-	detidMap[*it] = vec;		  
+    for (; it != detIds.end(); ++it) {
+      if (payload->IsModuleHVOff(*it))
+        detIds_HVOff.insert(*it);
+      if (payload->IsModuleLVOff(*it))
+        detIds_LVOff.insert(*it);
+
+      if (detidMap.find(*it) == detidMap.end()) {
+        std::vector<cond::Time_t> vec;
+        detidMap[*it] = vec;
       }
-      
+
       // for each module concerned by the IOV, add the time in an history vector
       detidMap[*it].push_back(vTime.back());
     }
-    
+
     // fill list of channels Off at a given time
     iovMap_HVOff[vTime.back()] = detIds_HVOff;
     iovMap_LVOff[vTime.back()] = detIds_LVOff;
-    
+
     /*std::vector<uint32_t>::const_iterator it = detIds.begin();
       for( ; it!=detIds.end(); ++it ) {
       std::cout << *it << std::endl;
       }*/
-    
+
     ++iiov;
     ++niov;
   }
-  vTime.push_back(endIov); // used to compute last IOV duration
+  vTime.push_back(endIov);  // used to compute last IOV duration
 
   edm::LogInfo("SiStripDetVOffPrinter") << "[SiStripDetVOffPrinter::" << __func__ << "] "
-					<< "Read " << niov << " IOVs from tag " << m_tagName << " corresponding to the specified time interval.\n" << ss.str();
-
+                                        << "Read " << niov << " IOVs from tag " << m_tagName
+                                        << " corresponding to the specified time interval.\n"
+                                        << ss.str();
 
   // Create a map of IOVs time_duration
-  std::map< cond::Time_t, boost::posix_time::time_duration > mIOVsDuration;
-  std::vector< cond::Time_t >::const_iterator itTime = ++vTime.begin();
-  std::vector< cond::Time_t >::const_iterator itPreviousTime = vTime.begin();
+  std::map<cond::Time_t, boost::posix_time::time_duration> mIOVsDuration;
+  std::vector<cond::Time_t>::const_iterator itTime = ++vTime.begin();
+  std::vector<cond::Time_t>::const_iterator itPreviousTime = vTime.begin();
   //std::vector< cond::Time_t >::const_iterator itLastTime = --vTime.end();
-  for( ; itTime!=vTime.end(); ++itTime ) {
-    mIOVsDuration[ *itPreviousTime ] = cond::time::to_boost(*itTime) - cond::time::to_boost(*itPreviousTime);
+  for (; itTime != vTime.end(); ++itTime) {
+    mIOVsDuration[*itPreviousTime] = cond::time::to_boost(*itTime) - cond::time::to_boost(*itPreviousTime);
     itPreviousTime = itTime;
   }
-  boost::posix_time::time_duration time_period = cond::time::to_boost(*(--vTime.end())) - cond::time::to_boost(*(vTime.begin()));
-  
+  boost::posix_time::time_duration time_period =
+      cond::time::to_boost(*(--vTime.end())) - cond::time::to_boost(*(vTime.begin()));
+
   // debug
   /*for( itTime=vTime.begin(); itTime!=itLastTime; ++itTime ) {
 	std::cout<<boost::posix_time::to_simple_string( cond::time::to_boost(*itTime) ) << "    " <<boost::posix_time::to_simple_string(mIOVsDuration[ *itTime ])<<std::endl;
   }*/
 
-  // Print summary per module	
-  edm::LogInfo("SiStripDetVOffPrinter") << "[SiStripDetVOffPrinter::" << __func__ << "] "
-					<< detidMap.size() << " modules were Off at some point during the time interval";
+  // Print summary per module
+  edm::LogInfo("SiStripDetVOffPrinter") << "[SiStripDetVOffPrinter::" << __func__ << "] " << detidMap.size()
+                                        << " modules were Off at some point during the time interval";
   ss.str("");
-  
+
   // Loop over detIds
-  std::map<uint32_t, std::vector< cond::Time_t > >::const_iterator itMap = detidMap.begin();
-  for( ; itMap!=detidMap.end(); ++itMap ) {
-    std::vector< cond::Time_t > vecTime = itMap->second;
-    
-    boost::posix_time::time_duration cumul_time_HVOff(0,0,0,0);
-    boost::posix_time::time_duration cumul_time_LVOff(0,0,0,0);
+  std::map<uint32_t, std::vector<cond::Time_t> >::const_iterator itMap = detidMap.begin();
+  for (; itMap != detidMap.end(); ++itMap) {
+    std::vector<cond::Time_t> vecTime = itMap->second;
+
+    boost::posix_time::time_duration cumul_time_HVOff(0, 0, 0, 0);
+    boost::posix_time::time_duration cumul_time_LVOff(0, 0, 0, 0);
     // Loop over IOVs
-    std::vector< cond::Time_t >::const_iterator itTime = vecTime.begin();
-    for( ; itTime!=vecTime.end(); ++itTime ) {
-      if(iovMap_HVOff[*itTime].find(itMap->first) != iovMap_HVOff[*itTime].end()) cumul_time_HVOff+=mIOVsDuration[*itTime];
-      if(iovMap_LVOff[*itTime].find(itMap->first) != iovMap_LVOff[*itTime].end()) cumul_time_LVOff+=mIOVsDuration[*itTime];
+    std::vector<cond::Time_t>::const_iterator itTime = vecTime.begin();
+    for (; itTime != vecTime.end(); ++itTime) {
+      if (iovMap_HVOff[*itTime].find(itMap->first) != iovMap_HVOff[*itTime].end())
+        cumul_time_HVOff += mIOVsDuration[*itTime];
+      if (iovMap_LVOff[*itTime].find(itMap->first) != iovMap_LVOff[*itTime].end())
+        cumul_time_LVOff += mIOVsDuration[*itTime];
     }
-    ss<<"detId "<< itMap->first <<" #IOVs: "<<vecTime.size()
-      <<"  HVOff: "<<cumul_time_HVOff<<" "<<cumul_time_HVOff.total_milliseconds()*100.0/time_period.total_milliseconds()<<"% "
-      <<"  LVOff: "<<cumul_time_LVOff<<" "<<cumul_time_LVOff.total_milliseconds()*100.0/time_period.total_milliseconds()<<"%"<<std::endl;
-    
+    ss << "detId " << itMap->first << " #IOVs: " << vecTime.size() << "  HVOff: " << cumul_time_HVOff << " "
+       << cumul_time_HVOff.total_milliseconds() * 100.0 / time_period.total_milliseconds() << "% "
+       << "  LVOff: " << cumul_time_LVOff << " "
+       << cumul_time_LVOff.total_milliseconds() * 100.0 / time_period.total_milliseconds() << "%" << std::endl;
   }
 
   condDbSession.transaction().commit();
- 
+
   if (!m_output.empty()) {
     std::ofstream fout;
     fout.open(m_output);
     fout << ss.str();
     fout.close();
-  }  
+  }
 }
 
-void
-SiStripDetVOffPrinter::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
-
+void SiStripDetVOffPrinter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
-  desc.add<std::string>("conditionDatabase","frontier://FrontierProd/CMS_CONDITIONS");
-  desc.add<std::string>("tagName","SiStripDetVOff_1hourDelay_v1_Validation");
-  desc.add<std::string>("startTime","2002-01-20 23:59:59.000");
-  desc.add<std::string>("endTime","2002-01-20 23:59:59.000");
-  desc.add<std::string>("output","PerModuleSummary.txt");
-  desc.add<std::string>("connect","");
+  desc.add<std::string>("conditionDatabase", "frontier://FrontierProd/CMS_CONDITIONS");
+  desc.add<std::string>("tagName", "SiStripDetVOff_1hourDelay_v1_Validation");
+  desc.add<std::string>("startTime", "2002-01-20 23:59:59.000");
+  desc.add<std::string>("endTime", "2002-01-20 23:59:59.000");
+  desc.add<std::string>("output", "PerModuleSummary.txt");
+  desc.add<std::string>("connect", "");
 
   edm::ParameterSetDescription descDBParameters;
-  descDBParameters.addUntracked<std::string>("authenticationPath","");  
-  descDBParameters.addUntracked<int>("authenticationSystem",0);  
-  descDBParameters.addUntracked<std::string>("security","");  
-  descDBParameters.addUntracked<int>("messageLevel",0);  
+  descDBParameters.addUntracked<std::string>("authenticationPath", "");
+  descDBParameters.addUntracked<int>("authenticationSystem", 0);
+  descDBParameters.addUntracked<std::string>("security", "");
+  descDBParameters.addUntracked<int>("messageLevel", 0);
 
-  desc.add<edm::ParameterSetDescription>("DBParameters",descDBParameters);
+  desc.add<edm::ParameterSetDescription>("DBParameters", descDBParameters);
   descriptions.add("siStripDetVOffPrinter", desc);
 }
 
-
-void SiStripDetVOffPrinter::endJob() {
-}
+void SiStripDetVOffPrinter::endJob() {}
 
 DEFINE_FWK_MODULE(SiStripDetVOffPrinter);
-
diff --git a/CalibTracker/SiStripDCS/plugins/SiStripDetVOffTkMapPlotter.cc b/CalibTracker/SiStripDCS/plugins/SiStripDetVOffTkMapPlotter.cc
index 1549419bf6080..d34154e6343a2 100644
--- a/CalibTracker/SiStripDCS/plugins/SiStripDetVOffTkMapPlotter.cc
+++ b/CalibTracker/SiStripDCS/plugins/SiStripDetVOffTkMapPlotter.cc
@@ -19,16 +19,15 @@
 #include "DQM/SiStripCommon/interface/TkHistoMap.h"
 #include "CommonTools/TrackerMap/interface/TrackerMap.h"
 
-
 class SiStripDetVOffTkMapPlotter : public edm::EDAnalyzer {
 public:
-  explicit SiStripDetVOffTkMapPlotter(const edm::ParameterSet& iConfig );
+  explicit SiStripDetVOffTkMapPlotter(const edm::ParameterSet& iConfig);
   ~SiStripDetVOffTkMapPlotter() override;
-  void analyze( const edm::Event& evt, const edm::EventSetup& evtSetup) override;
+  void analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) override;
   void endJob() override;
 
 private:
-  std::string formatIOV(cond::Time_t iov, std::string format="%Y-%m-%d__%H_%M_%S");
+  std::string formatIOV(cond::Time_t iov, std::string format = "%Y-%m-%d__%H_%M_%S");
 
   cond::persistency::ConnectionPool m_connectionPool;
   std::string m_condDb;
@@ -46,64 +45,63 @@ class SiStripDetVOffTkMapPlotter : public edm::EDAnalyzer {
   edm::Service<SiStripDetInfoFileReader> detidReader;
 };
 
-SiStripDetVOffTkMapPlotter::SiStripDetVOffTkMapPlotter(const edm::ParameterSet& iConfig):
-    m_connectionPool(),
-    m_condDb( iConfig.getParameter< std::string >("conditionDatabase") ),
-    m_plotTag( iConfig.getParameter< std::string >("Tag") ),
-    m_IOV( iConfig.getUntrackedParameter< cond::Time_t >("IOV", 0) ),
-    m_Time( iConfig.getUntrackedParameter< std::string >("Time", "") ),
-    m_plotFormat( iConfig.getUntrackedParameter< std::string >("plotFormat", "png") ),
-    m_outputFile( iConfig.getUntrackedParameter< std::string >("outputFile", "") ){
-  m_connectionPool.setParameters( iConfig.getParameter<edm::ParameterSet>("DBParameters")  );
+SiStripDetVOffTkMapPlotter::SiStripDetVOffTkMapPlotter(const edm::ParameterSet& iConfig)
+    : m_connectionPool(),
+      m_condDb(iConfig.getParameter<std::string>("conditionDatabase")),
+      m_plotTag(iConfig.getParameter<std::string>("Tag")),
+      m_IOV(iConfig.getUntrackedParameter<cond::Time_t>("IOV", 0)),
+      m_Time(iConfig.getUntrackedParameter<std::string>("Time", "")),
+      m_plotFormat(iConfig.getUntrackedParameter<std::string>("plotFormat", "png")),
+      m_outputFile(iConfig.getUntrackedParameter<std::string>("outputFile", "")) {
+  m_connectionPool.setParameters(iConfig.getParameter<edm::ParameterSet>("DBParameters"));
   m_connectionPool.configure();
 }
 
-SiStripDetVOffTkMapPlotter::~SiStripDetVOffTkMapPlotter() {
-}
+SiStripDetVOffTkMapPlotter::~SiStripDetVOffTkMapPlotter() {}
 
 void SiStripDetVOffTkMapPlotter::analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) {
-
   cond::Time_t theIov = 0;
-  if (m_IOV != 0){
+  if (m_IOV != 0) {
     theIov = m_IOV;
-  }else if (!m_Time.empty()){
-    theIov = cond::time::from_boost( boost::posix_time::time_from_string(m_Time) );
-  }else{
+  } else if (!m_Time.empty()) {
+    theIov = cond::time::from_boost(boost::posix_time::time_from_string(m_Time));
+  } else {
     // Use the current time if no input. Will get the last IOV.
-    theIov = cond::time::from_boost( boost::posix_time::second_clock::universal_time() );
+    theIov = cond::time::from_boost(boost::posix_time::second_clock::universal_time());
   }
 
   // open db session
   edm::LogInfo("SiStripDetVOffMapPlotter") << "[SiStripDetVOffMapPlotter::" << __func__ << "] "
-      << "Query the condition database " << m_condDb << " for tag " << m_plotTag;
-  cond::persistency::Session condDbSession = m_connectionPool.createSession( m_condDb );
-  condDbSession.transaction().start( true );
+                                           << "Query the condition database " << m_condDb << " for tag " << m_plotTag;
+  cond::persistency::Session condDbSession = m_connectionPool.createSession(m_condDb);
+  condDbSession.transaction().start(true);
   cond::persistency::IOVProxy iovProxy = condDbSession.readIov(m_plotTag, true);
   auto iiov = iovProxy.find(theIov);
-  if (iiov==iovProxy.end())
-    throw cms::Exception("Input IOV "+std::to_string(m_IOV)+"/"+m_Time+" is invalid!");
+  if (iiov == iovProxy.end())
+    throw cms::Exception("Input IOV " + std::to_string(m_IOV) + "/" + m_Time + " is invalid!");
 
   theIov = (*iiov).since;
   edm::LogInfo("SiStripDetVOffMapPlotter") << "[SiStripDetVOffMapPlotter::" << __func__ << "] "
-      << "Make tkMap for IOV " << theIov << " (" << boost::posix_time::to_simple_string(cond::time::to_boost(theIov)) << ")";
-  auto payload = condDbSession.fetchPayload<SiStripDetVOff>( (*iiov).payloadId );
+                                           << "Make tkMap for IOV " << theIov << " ("
+                                           << boost::posix_time::to_simple_string(cond::time::to_boost(theIov)) << ")";
+  auto payload = condDbSession.fetchPayload<SiStripDetVOff>((*iiov).payloadId);
 
   edm::ESHandle<TkDetMap> tkDetMapHandle;
   evtSetup.get<TrackerTopologyRcd>().get(tkDetMapHandle);
   const TkDetMap* tkDetMap = tkDetMapHandle.product();
-  TrackerMap lvmap,hvmap;
-  TkHistoMap lvhisto(tkDetMap, "LV_Status","LV_Status",-1);
-  TkHistoMap hvhisto(tkDetMap, "HV_Status","HV_Status",-1);
+  TrackerMap lvmap, hvmap;
+  TkHistoMap lvhisto(tkDetMap, "LV_Status", "LV_Status", -1);
+  TkHistoMap hvhisto(tkDetMap, "HV_Status", "HV_Status", -1);
 
   auto detids = detidReader->getAllDetIds();
-  for (auto id : detids){
+  for (auto id : detids) {
     if (payload->IsModuleLVOff(id))
-      lvhisto.fill(id, 1); // RED
+      lvhisto.fill(id, 1);  // RED
     else
       lvhisto.fill(id, 0.5);
 
     if (payload->IsModuleHVOff(id))
-      hvhisto.fill(id, 1); // RED
+      hvhisto.fill(id, 1);  // RED
     else
       hvhisto.fill(id, 0.5);
   }
@@ -112,26 +110,23 @@ void SiStripDetVOffTkMapPlotter::analyze(const edm::Event& evt, const edm::Event
   hvhisto.dumpInTkMap(&hvmap);
   lvmap.setPalette(1);
   hvmap.setPalette(1);
-  lvmap.save(true,0,0,"LV_tkMap_"+formatIOV(theIov)+"."+m_plotFormat);
-  hvmap.save(true,0,0,"HV_tkMap_"+formatIOV(theIov)+"."+m_plotFormat);
+  lvmap.save(true, 0, 0, "LV_tkMap_" + formatIOV(theIov) + "." + m_plotFormat);
+  hvmap.save(true, 0, 0, "HV_tkMap_" + formatIOV(theIov) + "." + m_plotFormat);
 
-  if (!m_outputFile.empty()){
+  if (!m_outputFile.empty()) {
     lvhisto.save(m_outputFile);
     hvhisto.save(m_outputFile);
   }
-
 }
 
-void SiStripDetVOffTkMapPlotter::endJob() {
-}
+void SiStripDetVOffTkMapPlotter::endJob() {}
 
 std::string SiStripDetVOffTkMapPlotter::formatIOV(cond::Time_t iov, std::string format) {
   auto facet = new boost::posix_time::time_facet(format.c_str());
-   std::ostringstream stream;
-   stream.imbue(std::locale(stream.getloc(), facet));
-   stream << cond::time::to_boost(iov);
-   return stream.str();
+  std::ostringstream stream;
+  stream.imbue(std::locale(stream.getloc(), facet));
+  stream << cond::time::to_boost(iov);
+  return stream.str();
 }
 
 DEFINE_FWK_MODULE(SiStripDetVOffTkMapPlotter);
-
diff --git a/CalibTracker/SiStripDCS/plugins/SiStripDetVOffTrendPlotter.cc b/CalibTracker/SiStripDCS/plugins/SiStripDetVOffTrendPlotter.cc
index 024bb8b62b36c..b545759ab226f 100644
--- a/CalibTracker/SiStripDCS/plugins/SiStripDetVOffTrendPlotter.cc
+++ b/CalibTracker/SiStripDCS/plugins/SiStripDetVOffTrendPlotter.cc
@@ -23,18 +23,17 @@
 #include <TGraph.h>
 #include <TH1.h>
 
-
 class SiStripDetVOffTrendPlotter : public edm::EDAnalyzer {
 public:
-  const std::vector<Color_t> PLOT_COLORS {kRed, kBlue, kBlack, kOrange, kMagenta};
+  const std::vector<Color_t> PLOT_COLORS{kRed, kBlue, kBlack, kOrange, kMagenta};
 
-  explicit SiStripDetVOffTrendPlotter(const edm::ParameterSet& iConfig );
+  explicit SiStripDetVOffTrendPlotter(const edm::ParameterSet &iConfig);
   ~SiStripDetVOffTrendPlotter() override;
-  void analyze( const edm::Event& evt, const edm::EventSetup& evtSetup) override;
+  void analyze(const edm::Event &evt, const edm::EventSetup &evtSetup) override;
   void endJob() override;
 
 private:
-  std::string formatIOV(cond::Time_t iov, std::string format="%Y-%m-%d__%H_%M_%S");
+  std::string formatIOV(cond::Time_t iov, std::string format = "%Y-%m-%d__%H_%M_%S");
   void prepGraph(TGraph *gr, TString name, TString title, Color_t color);
   void dumpCSV(bool isHV);
 
@@ -60,101 +59,104 @@ class SiStripDetVOffTrendPlotter : public edm::EDAnalyzer {
   std::map<cond::Time_t, std::map<std::string, std::pair<int, int>>> iovMap;
 };
 
-SiStripDetVOffTrendPlotter::SiStripDetVOffTrendPlotter(const edm::ParameterSet& iConfig):
-    m_connectionPool(),
-    m_condDb( iConfig.getParameter< std::string >("conditionDatabase") ),
-    m_plotTags( iConfig.getParameter< std::vector<std::string> >("plotTags") ),
-    m_interval( iConfig.getParameter< int >("timeInterval") ),
-    m_startTime( iConfig.getUntrackedParameter< std::string >("startTime", "") ),
-    m_endTime( iConfig.getUntrackedParameter< std::string >("endTime", "") ),
-    m_outputPlot( iConfig.getUntrackedParameter< std::string >("outputPlot", "") ),
-    m_outputRootFile( iConfig.getUntrackedParameter< std::string >("outputRootFile", "") ),
-    m_outputCSV( iConfig.getUntrackedParameter< std::string >("outputCSV", "") ),
-    fout(nullptr){
-  m_connectionPool.setParameters( iConfig.getParameter<edm::ParameterSet>("DBParameters")  );
+SiStripDetVOffTrendPlotter::SiStripDetVOffTrendPlotter(const edm::ParameterSet &iConfig)
+    : m_connectionPool(),
+      m_condDb(iConfig.getParameter<std::string>("conditionDatabase")),
+      m_plotTags(iConfig.getParameter<std::vector<std::string>>("plotTags")),
+      m_interval(iConfig.getParameter<int>("timeInterval")),
+      m_startTime(iConfig.getUntrackedParameter<std::string>("startTime", "")),
+      m_endTime(iConfig.getUntrackedParameter<std::string>("endTime", "")),
+      m_outputPlot(iConfig.getUntrackedParameter<std::string>("outputPlot", "")),
+      m_outputRootFile(iConfig.getUntrackedParameter<std::string>("outputRootFile", "")),
+      m_outputCSV(iConfig.getUntrackedParameter<std::string>("outputCSV", "")),
+      fout(nullptr) {
+  m_connectionPool.setParameters(iConfig.getParameter<edm::ParameterSet>("DBParameters"));
   m_connectionPool.configure();
-  if (m_outputRootFile!="") fout = new TFile(m_outputRootFile.data(), "RECREATE");
+  if (!m_outputRootFile.empty())
+    fout = new TFile(m_outputRootFile.data(), "RECREATE");
 }
 
 SiStripDetVOffTrendPlotter::~SiStripDetVOffTrendPlotter() {
-  if (fout) fout->Close();
+  if (fout)
+    fout->Close();
 }
 
-void SiStripDetVOffTrendPlotter::analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) {
-
+void SiStripDetVOffTrendPlotter::analyze(const edm::Event &evt, const edm::EventSetup &evtSetup) {
   // get total number of modules
   auto num_modules = detidReader->getAllDetIds().size();
 
   // get start and end time for DB query
   boost::posix_time::ptime p_start, p_end;
-  if (m_interval > 0){
+  if (m_interval > 0) {
     // from m_interval hours ago to now
     p_end = boost::posix_time::second_clock::universal_time();
     p_start = p_end - boost::posix_time::hours(m_interval);
-  }else {
+  } else {
     // use start and end time from config file
     p_start = boost::posix_time::time_from_string(m_startTime);
-    p_end   = boost::posix_time::time_from_string(m_endTime);
+    p_end = boost::posix_time::time_from_string(m_endTime);
   }
   cond::Time_t startIov = cond::time::from_boost(p_start);
-  cond::Time_t endIov   = cond::time::from_boost(p_end);
+  cond::Time_t endIov = cond::time::from_boost(p_end);
   if (startIov > endIov)
     throw cms::Exception("endTime must be greater than startTime!");
-  edm::LogInfo("SiStripDetVOffTrendPlotter") << "[SiStripDetVOffTrendPlotter::" << __func__ << "] "
+  edm::LogInfo("SiStripDetVOffTrendPlotter")
+      << "[SiStripDetVOffTrendPlotter::" << __func__ << "] "
       << "Set start IOV " << startIov << " (" << boost::posix_time::to_simple_string(p_start) << ")"
-      << "\n ... Set end IOV " << endIov << " (" << boost::posix_time::to_simple_string(p_end) << ")" ;
+      << "\n ... Set end IOV " << endIov << " (" << boost::posix_time::to_simple_string(p_end) << ")";
 
   // open db session
   edm::LogInfo("SiStripDetVOffTrendPlotter") << "[SiStripDetVOffTrendPlotter::" << __func__ << "] "
-      << "Query the condition database " << m_condDb;
-  cond::persistency::Session condDbSession = m_connectionPool.createSession( m_condDb );
-  condDbSession.transaction().start( true );
+                                             << "Query the condition database " << m_condDb;
+  cond::persistency::Session condDbSession = m_connectionPool.createSession(m_condDb);
+  condDbSession.transaction().start(true);
 
   // loop over all tags to plot
-  std::vector<TGraph*> hvgraphs, lvgraphs;
+  std::vector<TGraph *> hvgraphs, lvgraphs;
   TLegend *leg_hv = new TLegend(0.6, 0.87, 0.99, 0.99);
   TLegend *leg_lv = new TLegend(0.6, 0.87, 0.99, 0.99);
-  for (unsigned itag=0; itag<m_plotTags.size(); ++itag){
+  for (unsigned itag = 0; itag < m_plotTags.size(); ++itag) {
     auto tag = m_plotTags.at(itag);
-    auto color = itag<PLOT_COLORS.size() ? PLOT_COLORS.at(itag) : kGreen+itag;
+    auto color = itag < PLOT_COLORS.size() ? PLOT_COLORS.at(itag) : kGreen + itag;
 
     std::vector<double> vTime;
     std::vector<double> vHVOffPercent, vLVOffPercent;
 
     // query the database
     edm::LogInfo("SiStripDetVOffTrendPlotter") << "[SiStripDetVOffTrendPlotter::" << __func__ << "] "
-        << "Reading IOVs from tag " << tag;
-    cond::persistency::IOVProxy iovProxy = condDbSession.readIov(tag, true); // load all?
+                                               << "Reading IOVs from tag " << tag;
+    cond::persistency::IOVProxy iovProxy = condDbSession.readIov(tag, true);  // load all?
     auto iiov = iovProxy.find(startIov);
     auto eiov = iovProxy.find(endIov);
     int niov = 0;
-    while (iiov != iovProxy.end() && (*iiov).since <= (*eiov).since){
+    while (iiov != iovProxy.end() && (*iiov).since <= (*eiov).since) {
       // convert cond::Time_t to seconds since epoch
-      if ((*iiov).since<startIov)
+      if ((*iiov).since < startIov)
         vTime.push_back(cond::time::unpack(startIov).first);
       else
         vTime.push_back(cond::time::unpack((*iiov).since).first);
-      auto payload = condDbSession.fetchPayload<SiStripDetVOff>( (*iiov).payloadId );
-      vHVOffPercent.push_back( 1.0*payload->getHVoffCounts()/num_modules );
-      vLVOffPercent.push_back( 1.0*payload->getLVoffCounts()/num_modules );
+      auto payload = condDbSession.fetchPayload<SiStripDetVOff>((*iiov).payloadId);
+      vHVOffPercent.push_back(1.0 * payload->getHVoffCounts() / num_modules);
+      vLVOffPercent.push_back(1.0 * payload->getLVoffCounts() / num_modules);
       iovMap[(*iiov).since][tag] = {payload->getHVoffCounts(), payload->getLVoffCounts()};
       // debug
-      std::cout << boost::posix_time::to_simple_string(cond::time::to_boost((*iiov).since))
-          << " (" << (*iiov).since <<  ")"
-          << ", # HV Off=" << std::setw(6) << payload->getHVoffCounts()
-          << ", # LV Off=" << std::setw(6) << payload->getLVoffCounts() << std::endl;
+      std::cout << boost::posix_time::to_simple_string(cond::time::to_boost((*iiov).since)) << " (" << (*iiov).since
+                << ")"
+                << ", # HV Off=" << std::setw(6) << payload->getHVoffCounts() << ", # LV Off=" << std::setw(6)
+                << payload->getLVoffCounts() << std::endl;
       ++iiov;
       ++niov;
     }
-    edm::LogInfo("SiStripDetVOffTrendPlotter") << "[SiStripDetVOffTrendPlotter::" << __func__ << "] "
+    edm::LogInfo("SiStripDetVOffTrendPlotter")
+        << "[SiStripDetVOffTrendPlotter::" << __func__ << "] "
         << "Read " << niov << " IOVs from tag " << tag << " in the specified interval.";
 
     TGraph *hv = new TGraph(vTime.size(), vTime.data(), vHVOffPercent.data());
-    prepGraph(hv, TString("HVOff_")+tag, ";UTC;Fraction of HV off", color);
+    prepGraph(hv, TString("HVOff_") + tag, ";UTC;Fraction of HV off", color);
     leg_hv->AddEntry(hv, tag.data(), "LP");
 
     TGraph *lv = new TGraph(vTime.size(), vTime.data(), vLVOffPercent.data());
-    prepGraph(lv, TString("LVOff_")+tag, ";UTC;Fraction of LV off", color);
+    prepGraph(lv, TString("LVOff_") + tag, ";UTC;Fraction of LV off", color);
     leg_lv->AddEntry(lv, tag.data(), "LP");
 
     hvgraphs.push_back(hv);
@@ -169,53 +171,52 @@ void SiStripDetVOffTrendPlotter::analyze(const edm::Event& evt, const edm::Event
   c.SetBottomMargin(0.08);
   c.SetGridx();
   c.SetGridy();
-  for (const auto hv : hvgraphs){
-    if (hv==hvgraphs.front())
+  for (const auto hv : hvgraphs) {
+    if (hv == hvgraphs.front())
       hv->Draw("ALP");
     else
       hv->Draw("LPsame");
-    if (fout){
+    if (fout) {
       fout->cd();
       hv->Write();
     }
   }
   leg_hv->Draw();
-  std::string plot_postfix = m_outputPlot!="" ? m_outputPlot : "from_" + formatIOV(startIov) + "_to_" + formatIOV(endIov) + ".png";
-  c.Print( ("HVOff_" + plot_postfix).data() );
+  std::string plot_postfix =
+      !m_outputPlot.empty() ? m_outputPlot : "from_" + formatIOV(startIov) + "_to_" + formatIOV(endIov) + ".png";
+  c.Print(("HVOff_" + plot_postfix).data());
 
   c.Clear();
-  for (const auto lv : lvgraphs){
-    if (lv==lvgraphs.front())
+  for (const auto lv : lvgraphs) {
+    if (lv == lvgraphs.front())
       lv->Draw("ALP");
     else
       lv->Draw("LPsame");
-    if (fout){
+    if (fout) {
       fout->cd();
       lv->Write();
     }
   }
   leg_lv->Draw();
-  c.Print( ("LVOff_" + plot_postfix).data() );
+  c.Print(("LVOff_" + plot_postfix).data());
 
-  if (m_outputCSV!="") {
+  if (!m_outputCSV.empty()) {
     dumpCSV(true);
     dumpCSV(false);
   }
-
 }
 
-void SiStripDetVOffTrendPlotter::endJob() {
-}
+void SiStripDetVOffTrendPlotter::endJob() {}
 
 std::string SiStripDetVOffTrendPlotter::formatIOV(cond::Time_t iov, std::string format) {
   auto facet = new boost::posix_time::time_facet(format.c_str());
-   std::ostringstream stream;
-   stream.imbue(std::locale(stream.getloc(), facet));
-   stream << cond::time::to_boost(iov);
-   return stream.str();
+  std::ostringstream stream;
+  stream.imbue(std::locale(stream.getloc(), facet));
+  stream << cond::time::to_boost(iov);
+  return stream.str();
 }
 
-void SiStripDetVOffTrendPlotter::prepGraph(TGraph* gr, TString name, TString title, Color_t color) {
+void SiStripDetVOffTrendPlotter::prepGraph(TGraph *gr, TString name, TString title, Color_t color) {
   gr->SetName(name);
   gr->SetTitle(title);
   gr->SetLineColor(color);
@@ -234,29 +235,29 @@ void SiStripDetVOffTrendPlotter::prepGraph(TGraph* gr, TString name, TString tit
 }
 
 void SiStripDetVOffTrendPlotter::dumpCSV(bool isHV) {
-
   // get total number of modules
   auto num_modules = detidReader->getAllDetIds().size();
 
-  std::string outCSV = isHV ? "HVOff_table_"+m_outputCSV : "LVOff_table_"+m_outputCSV;
+  std::string outCSV = isHV ? "HVOff_table_" + m_outputCSV : "LVOff_table_" + m_outputCSV;
   std::ofstream csv;
   csv.open(outCSV);
   csv << "IOV,Timestamp(UTC),";
-  for (const auto &tag : m_plotTags) csv << tag << ",";
+  for (const auto &tag : m_plotTags)
+    csv << tag << ",";
   csv << std::endl;
 
   csv << std::fixed << std::setprecision(1);
 
-  for (const auto &v : iovMap){
+  for (const auto &v : iovMap) {
     auto iov = v.first;
     auto timestamp = boost::posix_time::to_simple_string(cond::time::to_boost(iov));
     csv << iov << "," << timestamp << ",";
-    for (const auto &tag : m_plotTags){
-      if (v.second.find(tag)!=v.second.end()){
+    for (const auto &tag : m_plotTags) {
+      if (v.second.find(tag) != v.second.end()) {
         int count = isHV ? v.second.at(tag).first : v.second.at(tag).second;
-        csv << count << " (" << 100.*count/num_modules << "%)";
+        csv << count << " (" << 100. * count / num_modules << "%)";
       }
-        csv << ",";
+      csv << ",";
     }
     csv << std::endl;
   }
@@ -265,4 +266,3 @@ void SiStripDetVOffTrendPlotter::dumpCSV(bool isHV) {
 }
 
 DEFINE_FWK_MODULE(SiStripDetVOffTrendPlotter);
-
diff --git a/CalibTracker/SiStripDCS/plugins/TkVoltageMapCreator.cc b/CalibTracker/SiStripDCS/plugins/TkVoltageMapCreator.cc
index 3073b8eceb6fc..949d75f2cb9e2 100644
--- a/CalibTracker/SiStripDCS/plugins/TkVoltageMapCreator.cc
+++ b/CalibTracker/SiStripDCS/plugins/TkVoltageMapCreator.cc
@@ -22,7 +22,7 @@
 
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
-#include "DQM/SiStripCommon/interface/TkHistoMap.h" 
+#include "DQM/SiStripCommon/interface/TkHistoMap.h"
 #include "CommonTools/TrackerMap/interface/TrackerMap.h"
 
 //
@@ -30,25 +30,23 @@
 //
 
 class TkVoltageMapCreator : public edm::EDAnalyzer {
- public:
-    explicit TkVoltageMapCreator(const edm::ParameterSet&);
-    ~TkVoltageMapCreator() override;
+public:
+  explicit TkVoltageMapCreator(const edm::ParameterSet&);
+  ~TkVoltageMapCreator() override;
 
+private:
+  void beginJob() override;
+  void beginRun(const edm::Run&, const edm::EventSetup&) override;
+  void endRun(const edm::Run&, const edm::EventSetup&) override;
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void endJob() override;
 
-   private:
-      void beginJob() override ;
-      void beginRun(const edm::Run&, const edm::EventSetup&) override ;
-      void endRun(const edm::Run&, const edm::EventSetup&) override ;
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      void endJob() override ;
-
-      // ----------member data ---------------------------
+  // ----------member data ---------------------------
 
   const std::string _lvfile;
   const std::string _lvtkmapname;
   const std::string _hvfile;
   const std::string _hvtkmapname;
-
 };
 
 //
@@ -62,50 +60,38 @@ class TkVoltageMapCreator : public edm::EDAnalyzer {
 //
 // constructors and destructor
 //
-TkVoltageMapCreator::TkVoltageMapCreator(const edm::ParameterSet& iConfig):
-  _lvfile(iConfig.getParameter<std::string>("LVStatusFile")),
-  _lvtkmapname(iConfig.getParameter<std::string>("LVTkMapName")),
-  _hvfile(iConfig.getParameter<std::string>("HVStatusFile")),
-  _hvtkmapname(iConfig.getParameter<std::string>("HVTkMapName"))
+TkVoltageMapCreator::TkVoltageMapCreator(const edm::ParameterSet& iConfig)
+    : _lvfile(iConfig.getParameter<std::string>("LVStatusFile")),
+      _lvtkmapname(iConfig.getParameter<std::string>("LVTkMapName")),
+      _hvfile(iConfig.getParameter<std::string>("HVStatusFile")),
+      _hvtkmapname(iConfig.getParameter<std::string>("HVTkMapName"))
 
 {
-   //now do what ever initialization is needed
+  //now do what ever initialization is needed
 }
 
-
-TkVoltageMapCreator::~TkVoltageMapCreator()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+TkVoltageMapCreator::~TkVoltageMapCreator() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-TkVoltageMapCreator::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace edm;
+void TkVoltageMapCreator::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) { using namespace edm; }
 
-}
-
-void 
-TkVoltageMapCreator::beginRun(const edm::Run& iRun, const edm::EventSetup& iSetup)
-{
+void TkVoltageMapCreator::beginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) {
   edm::ESHandle<TkDetMap> tkDetMapHandle;
   iSetup.get<TrackerTopologyRcd>().get(tkDetMapHandle);
   const TkDetMap* tkDetMap = tkDetMapHandle.product();
 
-  TrackerMap lvmap,hvmap;
+  TrackerMap lvmap, hvmap;
+
+  TkHistoMap lvhisto(tkDetMap, "LV_Status", "LV_Status", -1);
+  TkHistoMap hvhisto(tkDetMap, "HV_Status", "HV_Status", -1);
 
-  TkHistoMap lvhisto(tkDetMap, "LV_Status","LV_Status",-1);
-  TkHistoMap hvhisto(tkDetMap, "HV_Status","HV_Status",-1);
-  
   std::ifstream lvdata(_lvfile.c_str());
   std::ifstream hvdata(_hvfile.c_str());
 
@@ -113,21 +99,25 @@ TkVoltageMapCreator::beginRun(const edm::Run& iRun, const edm::EventSetup& iSetu
 
   unsigned int detid;
   std::string lvstatus;
-  
-  while(lvdata >> detid >> lvstatus) {
-    double cha =0.;
-    if(lvstatus=="ON") cha = 0.5; //GREEN
-    if(lvstatus=="OFF") cha = 1.; //RED
-    lvhisto.fill(detid,cha);
+
+  while (lvdata >> detid >> lvstatus) {
+    double cha = 0.;
+    if (lvstatus == "ON")
+      cha = 0.5;  //GREEN
+    if (lvstatus == "OFF")
+      cha = 1.;  //RED
+    lvhisto.fill(detid, cha);
   }
-  
+
   std::string hvstatus;
 
-  while(hvdata >> detid >> hvstatus) {
-    double cha =0.;
-    if(hvstatus=="ON") cha = 0.5; //GREEN
-    if(hvstatus=="OFF") cha = 1.; //RED
-    hvhisto.fill(detid,cha);
+  while (hvdata >> detid >> hvstatus) {
+    double cha = 0.;
+    if (hvstatus == "ON")
+      cha = 0.5;  //GREEN
+    if (hvstatus == "OFF")
+      cha = 1.;  //RED
+    hvhisto.fill(detid, cha);
   }
 
   lvmap.setPalette(1);
@@ -136,8 +126,8 @@ TkVoltageMapCreator::beginRun(const edm::Run& iRun, const edm::EventSetup& iSetu
   lvhisto.dumpInTkMap(&lvmap);
   hvhisto.dumpInTkMap(&hvmap);
 
-  lvmap.save(true,0,0,_lvtkmapname);
-  hvmap.save(true,0,0,_hvtkmapname);
+  lvmap.save(true, 0, 0, _lvtkmapname);
+  hvmap.save(true, 0, 0, _hvtkmapname);
 
   //TODO could make the root file name a parameter to avoid overwriting everytime...
   std::string rootmapname = "VoltageStatus.root";
@@ -145,23 +135,13 @@ TkVoltageMapCreator::beginRun(const edm::Run& iRun, const edm::EventSetup& iSetu
   hvhisto.save(rootmapname);
 }
 
-void 
-TkVoltageMapCreator::endRun(const edm::Run& iRun, const edm::EventSetup&)
-{
-}
-
+void TkVoltageMapCreator::endRun(const edm::Run& iRun, const edm::EventSetup&) {}
 
 // ------------ method called once each job just before starting event loop  ------------
-void 
-TkVoltageMapCreator::beginJob()
-{
-
-}
+void TkVoltageMapCreator::beginJob() {}
 
 // ------------ method called once each job just after ending the event loop  ------------
-void 
-TkVoltageMapCreator::endJob() {}
-
+void TkVoltageMapCreator::endJob() {}
 
 //define this as a plug-in
 DEFINE_FWK_MODULE(TkVoltageMapCreator);
diff --git a/CalibTracker/SiStripDCS/src/SiStripCoralIface.cc b/CalibTracker/SiStripDCS/src/SiStripCoralIface.cc
index d927af2df1a02..c778b0462bd91 100644
--- a/CalibTracker/SiStripDCS/src/SiStripCoralIface.cc
+++ b/CalibTracker/SiStripDCS/src/SiStripCoralIface.cc
@@ -18,90 +18,100 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 // constructor
-SiStripCoralIface::SiStripCoralIface( std::string connectionString , std::string authenticationPath, const bool debug) : m_connectionString(connectionString), m_authPath( authenticationPath ), m_session(), debug_(debug)
-{
+SiStripCoralIface::SiStripCoralIface(std::string connectionString, std::string authenticationPath, const bool debug)
+    : m_connectionString(connectionString), m_authPath(authenticationPath), m_session(), debug_(debug) {
   std::cout << "Building coral interface" << std::endl;
   initialize();
 }
 
 // destructor
-SiStripCoralIface::~SiStripCoralIface() {	
-  LogTrace("SiStripCoralIface") << "[SiStripCoralIface::" << __func__ << "] Destructor called."; 
+SiStripCoralIface::~SiStripCoralIface() {
+  LogTrace("SiStripCoralIface") << "[SiStripCoralIface::" << __func__ << "] Destructor called.";
   // m_connection.close();
 }
 
 // open DB connection
-void  SiStripCoralIface::initialize() {
+void SiStripCoralIface::initialize() {
   cond::persistency::ConnectionPool connection;
   connection.setAuthenticationPath(m_authPath);
   connection.configure();
   m_session = connection.createSession(m_connectionString);
   try {
-    m_transaction.reset( new cond::persistency::TransactionScope(m_session.transaction()) );
+    m_transaction.reset(new cond::persistency::TransactionScope(m_session.transaction()));
     m_transaction->start(true);
-    LogTrace("SiStripCoralIface") << "[SiStripCoralIface::" << __func__ << "] Database connection opened"; 
-  }
-  catch (...) {
-    edm::LogError("SiStripCoralIface") << "Database connection failed";     
+    LogTrace("SiStripCoralIface") << "[SiStripCoralIface::" << __func__ << "] Database connection opened";
+  } catch (...) {
+    edm::LogError("SiStripCoralIface") << "Database connection failed";
     exit(1);
   }
 }
 
 // access the status change or lastValue tables
-void SiStripCoralIface::doQuery(std::string queryType, const coral::TimeStamp& startTime, const coral::TimeStamp& endTime, std::vector<coral::TimeStamp> &vec_changedate, 
-				std::vector<float> &vec_actualValue, std::vector<std::string> &vec_dpname)
-{
-  std::unique_ptr<coral::IQuery> query( m_session.coralSession().schema(std::string("CMS_TRK_DCS_PVSS_COND")).newQuery());
+void SiStripCoralIface::doQuery(std::string queryType,
+                                const coral::TimeStamp& startTime,
+                                const coral::TimeStamp& endTime,
+                                std::vector<coral::TimeStamp>& vec_changedate,
+                                std::vector<float>& vec_actualValue,
+                                std::vector<std::string>& vec_dpname) {
+  std::unique_ptr<coral::IQuery> query(
+      m_session.coralSession().schema(std::string("CMS_TRK_DCS_PVSS_COND")).newQuery());
   std::string condition;
 
   LogTrace("SiStripCoralIface") << "[SiStripCoralIface::" << __func__ << "] table to be accessed: " << queryType;
 
   if (queryType == "STATUSCHANGE") {
-    query->addToOutputList("FWCAENCHANNEL.CHANGE_DATE","CHANGE_DATE");
-    query->addToOutputList("FWCAENCHANNEL.ACTUAL_STATUS","ACTUAL_STATUS");
-    query->addToOutputList("DP_NAME2ID.DPNAME","DPNAME");
+    query->addToOutputList("FWCAENCHANNEL.CHANGE_DATE", "CHANGE_DATE");
+    query->addToOutputList("FWCAENCHANNEL.ACTUAL_STATUS", "ACTUAL_STATUS");
+    query->addToOutputList("DP_NAME2ID.DPNAME", "DPNAME");
     query->addToOrderList("FWCAENCHANNEL.CHANGE_DATE");
     query->addToTableList("FWCAENCHANNEL");
     query->addToTableList("DP_NAME2ID");
-    condition = "FWCAENCHANNEL.DPID = DP_NAME2ID.ID AND FWCAENCHANNEL.CHANGE_DATE<=:tmax AND FWCAENCHANNEL.ACTUAL_STATUS IS NOT NULL AND FWCAENCHANNEL.CHANGE_DATE >=:tmin AND (DP_NAME2ID.DPNAME like '%easyBoard%')";
+    condition =
+        "FWCAENCHANNEL.DPID = DP_NAME2ID.ID AND FWCAENCHANNEL.CHANGE_DATE<=:tmax AND FWCAENCHANNEL.ACTUAL_STATUS IS "
+        "NOT NULL AND FWCAENCHANNEL.CHANGE_DATE >=:tmin AND (DP_NAME2ID.DPNAME like '%easyBoard%')";
   } else if (queryType == "LASTVALUE") {
-    query->addToOutputList("DCSLASTVALUE_VOLTAGE.CHANGE_DATE","CHANGE_DATE");
-    query->addToOutputList("DCSLASTVALUE_VOLTAGE.ACTUAL_VMON","ACTUAL_VMON");
-    query->addToOutputList("DP_NAME2ID.DPNAME","DPNAME");
+    query->addToOutputList("DCSLASTVALUE_VOLTAGE.CHANGE_DATE", "CHANGE_DATE");
+    query->addToOutputList("DCSLASTVALUE_VOLTAGE.ACTUAL_VMON", "ACTUAL_VMON");
+    query->addToOutputList("DP_NAME2ID.DPNAME", "DPNAME");
     query->addToOrderList("DCSLASTVALUE_VOLTAGE.CHANGE_DATE");
     query->addToTableList("DCSLASTVALUE_VOLTAGE");
     query->addToTableList("DP_NAME2ID");
-    condition = "DCSLASTVALUE_VOLTAGE.DPID = DP_NAME2ID.ID AND DCSLASTVALUE_VOLTAGE.CHANGE_DATE<=:tmax AND DCSLASTVALUE_VOLTAGE.CHANGE_DATE>=:tmin AND DCSLASTVALUE_VOLTAGE.ACTUAL_VMON IS NOT NULL AND (DP_NAME2ID.DPNAME like '%easyBoard%')";
+    condition =
+        "DCSLASTVALUE_VOLTAGE.DPID = DP_NAME2ID.ID AND DCSLASTVALUE_VOLTAGE.CHANGE_DATE<=:tmax AND "
+        "DCSLASTVALUE_VOLTAGE.CHANGE_DATE>=:tmin AND DCSLASTVALUE_VOLTAGE.ACTUAL_VMON IS NOT NULL AND "
+        "(DP_NAME2ID.DPNAME like '%easyBoard%')";
   }
 
   coral::AttributeList conditionData;
-  conditionData.extend<coral::TimeStamp>( "tmax" );
-  conditionData.extend<coral::TimeStamp>( "tmin" );
-  query->setCondition( condition, conditionData );
+  conditionData.extend<coral::TimeStamp>("tmax");
+  conditionData.extend<coral::TimeStamp>("tmin");
+  query->setCondition(condition, conditionData);
   conditionData[0].data<coral::TimeStamp>() = endTime;
   conditionData[1].data<coral::TimeStamp>() = startTime;
 
-  query->setMemoryCacheSize( 100 );
-  std::cout<<"Executing query"<<std::endl;
-  if (debug_) std::cout<<"[SiStripCoralIface::"<<__func__<<"] Dumping all query results:"<<std::endl;
+  query->setMemoryCacheSize(100);
+  std::cout << "Executing query" << std::endl;
+  if (debug_)
+    std::cout << "[SiStripCoralIface::" << __func__ << "] Dumping all query results:" << std::endl;
   coral::ICursor& cursor = query->execute();
-  int numberRow=0;
-  while( cursor.next() ){
+  int numberRow = 0;
+  while (cursor.next()) {
     const coral::AttributeList& row = cursor.currentRow();
     //DEBUG
     //Output the query results directly to cout,
     //Can be subsequently parsed by Python validation code
-    if( debug_ ) row.toOutputStream( std::cout ) << std::endl;
+    if (debug_)
+      row.toOutputStream(std::cout) << std::endl;
     numberRow++;
     if (queryType == "STATUSCHANGE") {
-      coral::TimeStamp ts =  row["CHANGE_DATE"].data<coral::TimeStamp>();
+      coral::TimeStamp ts = row["CHANGE_DATE"].data<coral::TimeStamp>();
       vec_changedate.push_back(ts);
       float as = (float)row["ACTUAL_STATUS"].data<float>();
       vec_actualValue.push_back(as);
       std::string id_name = (std::string)row["DPNAME"].data<std::string>();
       vec_dpname.push_back(id_name);
     } else if (queryType == "LASTVALUE") {
-      coral::TimeStamp ts =  row["CHANGE_DATE"].data<coral::TimeStamp>();
+      coral::TimeStamp ts = row["CHANGE_DATE"].data<coral::TimeStamp>();
       vec_changedate.push_back(ts);
       float av = (float)row["ACTUAL_VMON"].data<float>();
       vec_actualValue.push_back(av);
@@ -110,39 +120,49 @@ void SiStripCoralIface::doQuery(std::string queryType, const coral::TimeStamp& s
     }
   }
   cursor.close();
-  if (debug_) std::cout<<"[SiStripCoralIface::"<<__func__<<"] Finished dumping query results, "<< numberRow<<" rows were retrieved from PVSS Cond DB (both Pixel and Strip CAEN supplies)"<<std::endl;
-  edm::LogInfo("SiStripCoralIface") << "[SiStripCoralIface::" << __func__ << "] " << numberRow << " rows retrieved from PVSS Cond DB";
+  if (debug_)
+    std::cout << "[SiStripCoralIface::" << __func__ << "] Finished dumping query results, " << numberRow
+              << " rows were retrieved from PVSS Cond DB (both Pixel and Strip CAEN supplies)" << std::endl;
+  edm::LogInfo("SiStripCoralIface") << "[SiStripCoralIface::" << __func__ << "] " << numberRow
+                                    << " rows retrieved from PVSS Cond DB";
 }
 
 // access the channel settings in the status change table
-void SiStripCoralIface::doSettingsQuery(const coral::TimeStamp& startTime, const coral::TimeStamp& endTime, std::vector<coral::TimeStamp> &vec_changedate,
-					std::vector<float> &vec_settings, std::vector<std::string> &vec_dpname, std::vector<uint32_t> &vec_dpid) 
-{
-  std::unique_ptr<coral::IQuery> query( m_session.coralSession().schema(std::string("CMS_TRK_DCS_PVSS_COND")).newQuery());
-  query->addToOutputList("FWCAENCHANNEL.CHANGE_DATE","CHANGE_DATE");
-  query->addToOutputList("FWCAENCHANNEL.SETTINGS_V0","VSET");
-  query->addToOutputList("FWCAENCHANNEL.DPID","DPID");
-  query->addToOutputList("DP_NAME2ID.DPNAME","DPNAME");
+void SiStripCoralIface::doSettingsQuery(const coral::TimeStamp& startTime,
+                                        const coral::TimeStamp& endTime,
+                                        std::vector<coral::TimeStamp>& vec_changedate,
+                                        std::vector<float>& vec_settings,
+                                        std::vector<std::string>& vec_dpname,
+                                        std::vector<uint32_t>& vec_dpid) {
+  std::unique_ptr<coral::IQuery> query(
+      m_session.coralSession().schema(std::string("CMS_TRK_DCS_PVSS_COND")).newQuery());
+  query->addToOutputList("FWCAENCHANNEL.CHANGE_DATE", "CHANGE_DATE");
+  query->addToOutputList("FWCAENCHANNEL.SETTINGS_V0", "VSET");
+  query->addToOutputList("FWCAENCHANNEL.DPID", "DPID");
+  query->addToOutputList("DP_NAME2ID.DPNAME", "DPNAME");
   query->addToOrderList("FWCAENCHANNEL.CHANGE_DATE");
   query->addToTableList("FWCAENCHANNEL");
   query->addToTableList("DP_NAME2ID");
-  std::string condition = "FWCAENCHANNEL.DPID = DP_NAME2ID.ID AND FWCAENCHANNEL.CHANGE_DATE<=:tmax AND FWCAENCHANNEL.SETTINGS_V0 IS NOT NULL AND FWCAENCHANNEL.CHANGE_DATE >=:tmin AND (DP_NAME2ID.DPNAME like '%easyBoard%')";
+  std::string condition =
+      "FWCAENCHANNEL.DPID = DP_NAME2ID.ID AND FWCAENCHANNEL.CHANGE_DATE<=:tmax AND FWCAENCHANNEL.SETTINGS_V0 IS NOT "
+      "NULL AND FWCAENCHANNEL.CHANGE_DATE >=:tmin AND (DP_NAME2ID.DPNAME like '%easyBoard%')";
 
   coral::AttributeList conditionData;
-  conditionData.extend<coral::TimeStamp>( "tmax" );
-  conditionData.extend<coral::TimeStamp>( "tmin" );
-  query->setCondition( condition, conditionData );
+  conditionData.extend<coral::TimeStamp>("tmax");
+  conditionData.extend<coral::TimeStamp>("tmin");
+  query->setCondition(condition, conditionData);
   conditionData[0].data<coral::TimeStamp>() = endTime;
   conditionData[1].data<coral::TimeStamp>() = startTime;
 
-  query->setMemoryCacheSize( 100 );
+  query->setMemoryCacheSize(100);
   coral::ICursor& cursor = query->execute();
-  int numberRow=0;
-  while( cursor.next() ){
+  int numberRow = 0;
+  while (cursor.next()) {
     const coral::AttributeList& row = cursor.currentRow();
-    if( debug_ ) row.toOutputStream( std::cout ) << std::endl;
+    if (debug_)
+      row.toOutputStream(std::cout) << std::endl;
     numberRow++;
-    coral::TimeStamp ts =  row["CHANGE_DATE"].data<coral::TimeStamp>();
+    coral::TimeStamp ts = row["CHANGE_DATE"].data<coral::TimeStamp>();
     vec_changedate.push_back(ts);
     float vs = (float)row["VSET"].data<float>();
     vec_settings.push_back(vs);
@@ -152,23 +172,24 @@ void SiStripCoralIface::doSettingsQuery(const coral::TimeStamp& startTime, const
     vec_dpname.push_back(id_name);
   }
   cursor.close();
-  edm::LogInfo("SiStripCoralIface") << "[SiStripCoralIface::" << __func__ << "] " << numberRow << " rows retrieved from PVSS Cond DB";
+  edm::LogInfo("SiStripCoralIface") << "[SiStripCoralIface::" << __func__ << "] " << numberRow
+                                    << " rows retrieved from PVSS Cond DB";
 }
 
-void SiStripCoralIface::doNameQuery(std::vector<std::string> &vec_dpname, std::vector<uint32_t> &vec_dpid) 
-{
-  std::unique_ptr<coral::IQuery> query( m_session.coralSession().schema(std::string("CMS_TRK_DCS_PVSS_COND")).newQuery());
-  query->addToOutputList("DP_NAME2ID.DPNAME","DPNAME");
-  query->addToOutputList("DP_NAME2ID.ID","DPID");
+void SiStripCoralIface::doNameQuery(std::vector<std::string>& vec_dpname, std::vector<uint32_t>& vec_dpid) {
+  std::unique_ptr<coral::IQuery> query(
+      m_session.coralSession().schema(std::string("CMS_TRK_DCS_PVSS_COND")).newQuery());
+  query->addToOutputList("DP_NAME2ID.DPNAME", "DPNAME");
+  query->addToOutputList("DP_NAME2ID.ID", "DPID");
   query->addToTableList("DP_NAME2ID");
 
   std::string condition = "DP_NAME2ID.DPNAME like '%easyBoard%' ";
-  query->setCondition( condition, coral::AttributeList() );
+  query->setCondition(condition, coral::AttributeList());
 
-  query->setMemoryCacheSize( 100 );
+  query->setMemoryCacheSize(100);
   coral::ICursor& cursor = query->execute();
-  int numberRow=0;
-  while( cursor.next() ){
+  int numberRow = 0;
+  while (cursor.next()) {
     const coral::AttributeList& row = cursor.currentRow();
     numberRow++;
     uint32_t id = (uint32_t)row["DPID"].data<float>();
@@ -177,5 +198,6 @@ void SiStripCoralIface::doNameQuery(std::vector<std::string> &vec_dpname, std::v
     vec_dpname.push_back(id_name);
   }
   cursor.close();
-  edm::LogInfo("SiStripCoralIface") << "[SiStripCoralIface::" << __func__ << "] " << numberRow << " rows retrieved from PVSS Cond DB";
+  edm::LogInfo("SiStripCoralIface") << "[SiStripCoralIface::" << __func__ << "] " << numberRow
+                                    << " rows retrieved from PVSS Cond DB";
 }
diff --git a/CalibTracker/SiStripDCS/src/SiStripDetVOffBuilder.cc b/CalibTracker/SiStripDCS/src/SiStripDetVOffBuilder.cc
index eb1ff47652bf5..aacefce4b845f 100644
--- a/CalibTracker/SiStripDCS/src/SiStripDetVOffBuilder.cc
+++ b/CalibTracker/SiStripDCS/src/SiStripDetVOffBuilder.cc
@@ -2,24 +2,23 @@
 #include <sys/stat.h>
 
 // constructor
-SiStripDetVOffBuilder::SiStripDetVOffBuilder(const edm::ParameterSet& pset, const edm::ActivityRegistry&) : 
-  onlineDbConnectionString(pset.getParameter<std::string>("onlineDB")),
-  authenticationPath(pset.getParameter<std::string>("authPath")),
-  whichTable(pset.getParameter<std::string>("queryType")),
-  lastValueFileName(pset.getParameter<std::string>("lastValueFile")),
-  fromFile(pset.getParameter<bool>("lastValueFromFile")),
-  psuDetIdMapFile_(pset.getParameter<std::string>("PsuDetIdMapFile")),
-  debug_(pset.getParameter<bool>("debugModeOn")),
-  tDefault(7,0),
-  tmax_par(pset.getParameter< std::vector<int> >("Tmax")),
-  tmin_par(pset.getParameter< std::vector<int> >("Tmin")),
-  tset_par(pset.getParameter< std::vector<int> >("TSetMin")),
-  deltaTmin_(pset.getParameter<uint32_t>("DeltaTmin")),
-  maxIOVlength_(pset.getParameter<uint32_t>("MaxIOVlength")),
-  detIdListFile_(pset.getParameter< std::string >("DetIdListFile")),
-  excludedDetIdListFile_(pset.getParameter< std::string >("ExcludedDetIdListFile")),
-  highVoltageOnThreshold_(pset.getParameter<double>("HighVoltageOnThreshold"))
-{ 
+SiStripDetVOffBuilder::SiStripDetVOffBuilder(const edm::ParameterSet& pset, const edm::ActivityRegistry&)
+    : onlineDbConnectionString(pset.getParameter<std::string>("onlineDB")),
+      authenticationPath(pset.getParameter<std::string>("authPath")),
+      whichTable(pset.getParameter<std::string>("queryType")),
+      lastValueFileName(pset.getParameter<std::string>("lastValueFile")),
+      fromFile(pset.getParameter<bool>("lastValueFromFile")),
+      psuDetIdMapFile_(pset.getParameter<std::string>("PsuDetIdMapFile")),
+      debug_(pset.getParameter<bool>("debugModeOn")),
+      tDefault(7, 0),
+      tmax_par(pset.getParameter<std::vector<int> >("Tmax")),
+      tmin_par(pset.getParameter<std::vector<int> >("Tmin")),
+      tset_par(pset.getParameter<std::vector<int> >("TSetMin")),
+      deltaTmin_(pset.getParameter<uint32_t>("DeltaTmin")),
+      maxIOVlength_(pset.getParameter<uint32_t>("MaxIOVlength")),
+      detIdListFile_(pset.getParameter<std::string>("DetIdListFile")),
+      excludedDetIdListFile_(pset.getParameter<std::string>("ExcludedDetIdListFile")),
+      highVoltageOnThreshold_(pset.getParameter<double>("HighVoltageOnThreshold")) {
   lastStoredCondObj.first = nullptr;
   lastStoredCondObj.second = 0;
 
@@ -27,98 +26,111 @@ SiStripDetVOffBuilder::SiStripDetVOffBuilder(const edm::ParameterSet& pset, cons
 
   // set up vectors based on pset parameters (tDefault purely for initialization)
 
-  whichQuery=(whichTable == "STATUSCHANGE" || (whichTable == "LASTVALUE" && !fromFile));
+  whichQuery = (whichTable == "STATUSCHANGE" || (whichTable == "LASTVALUE" && !fromFile));
 
   //Define the query interval [Tmin, Tmax]
   //where Tmax comes from the cfg
-  //      Tmin comes from the cfg for the first o2o, after that it is extracted from Offline DB 
+  //      Tmin comes from the cfg for the first o2o, after that it is extracted from Offline DB
 
-  tmax = coral::TimeStamp(tmax_par[0],tmax_par[1],tmax_par[2],tmax_par[3],tmax_par[4],tmax_par[5],tmax_par[6]);
+  tmax = coral::TimeStamp(tmax_par[0], tmax_par[1], tmax_par[2], tmax_par[3], tmax_par[4], tmax_par[5], tmax_par[6]);
 
   if (whichQuery) {
     // Is there a better way to do this?  TODO - investigate
-    tmin=coral::TimeStamp(tmin_par[0],tmin_par[1],tmin_par[2],tmin_par[3],tmin_par[4],tmin_par[5],tmin_par[6]);
+    tmin = coral::TimeStamp(tmin_par[0], tmin_par[1], tmin_par[2], tmin_par[3], tmin_par[4], tmin_par[5], tmin_par[6]);
   }
-  
+
   if (whichTable == "LASTVALUE") {
-    tsetmin = coral::TimeStamp(tset_par[0],tset_par[1],tset_par[2],tset_par[3],tset_par[4],tset_par[5],tset_par[6]);
+    tsetmin =
+        coral::TimeStamp(tset_par[0], tset_par[1], tset_par[2], tset_par[3], tset_par[4], tset_par[5], tset_par[6]);
   }
-  
+
   if (onlineDbConnectionString.empty()) {
-    edm::LogError("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::SiStripDetVOffBuilder] DB name has not been set properly ... Returning ...";
+    edm::LogError("SiStripDetVOffBuilder")
+        << "[SiStripDetVOffBuilder::SiStripDetVOffBuilder] DB name has not been set properly ... Returning ...";
     return;
   }
-  
+
   if (fromFile && whichTable == "LASTVALUE" && lastValueFileName.empty()) {
-    edm::LogError("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::SiStripDetVOffBuilder] File expected for lastValue table, but filename not specified ... Returning ...";
+    edm::LogError("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::SiStripDetVOffBuilder] File expected for "
+                                              "lastValue table, but filename not specified ... Returning ...";
     return;
   }
-  
+
   // write out the parameters
   std::stringstream ss;
-  ss << "[SiStripDetVOffBuilder::SiStripDetVOffBuilder]\n" 
-     << "     Parameters:\n" 
+  ss << "[SiStripDetVOffBuilder::SiStripDetVOffBuilder]\n"
+     << "     Parameters:\n"
      << "     DB connection string: " << onlineDbConnectionString << "\n"
-     << "     Authentication path: "  << authenticationPath       << "\n"
-     << "     Table to be queried: "  << whichTable               << "\n"
-     << "     MapFile: "  << psuDetIdMapFile_                << "\n";
-  
-  if (whichQuery){
-    ss << "     Tmin: "; printPar(ss,tmin_par);  ss << std::endl;
-  }
-  ss << "     Tmax: "  ; printPar(ss,tmax_par);  ss << std::endl;
+     << "     Authentication path: " << authenticationPath << "\n"
+     << "     Table to be queried: " << whichTable << "\n"
+     << "     MapFile: " << psuDetIdMapFile_ << "\n";
 
-  if (whichTable == "LASTVALUE"){ 
-    ss << "     TSetMin: "; printPar(ss,tset_par);  ss << std::endl;
+  if (whichQuery) {
+    ss << "     Tmin: ";
+    printPar(ss, tmin_par);
+    ss << std::endl;
   }
-   edm::LogError("SiStripDetVOffBuilder") << ss.str();
+  ss << "     Tmax: ";
+  printPar(ss, tmax_par);
+  ss << std::endl;
 
+  if (whichTable == "LASTVALUE") {
+    ss << "     TSetMin: ";
+    printPar(ss, tset_par);
+    ss << std::endl;
+  }
+  edm::LogError("SiStripDetVOffBuilder") << ss.str();
 }
 
 // destructor
-SiStripDetVOffBuilder::~SiStripDetVOffBuilder() { 
+SiStripDetVOffBuilder::~SiStripDetVOffBuilder() {
   edm::LogError("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::" << __func__ << "]: destructing ...";
 }
 
-void SiStripDetVOffBuilder::printPar(std::stringstream& ss, const std::vector<int>& par){
-  for(int val : par){
+void SiStripDetVOffBuilder::printPar(std::stringstream& ss, const std::vector<int>& par) {
+  for (int val : par) {
     ss << val << " ";
   }
 }
 
-void SiStripDetVOffBuilder::BuildDetVOffObj()
-{
+void SiStripDetVOffBuilder::BuildDetVOffObj() {
   // vectors for storing output from DB or text file
   TimesAndValues timesAndValues;
 
   // Open the PVSS DB connection
-  coralInterface.reset( new SiStripCoralIface(onlineDbConnectionString, authenticationPath, debug_) );
-  edm::LogError("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::BuildDetVOff]: Query type is " << whichTable << endl;
+  coralInterface.reset(new SiStripCoralIface(onlineDbConnectionString, authenticationPath, debug_));
+  edm::LogError("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::BuildDetVOff]: Query type is " << whichTable
+                                         << endl;
 
-  if (whichTable == "LASTVALUE") {edm::LogError("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::BuildDetVOff]: Use file? " << ((fromFile) ? "TRUE" : "FALSE");}
+  if (whichTable == "LASTVALUE") {
+    edm::LogError("SiStripDetVOffBuilder")
+        << "[SiStripDetVOffBuilder::BuildDetVOff]: Use file? " << ((fromFile) ? "TRUE" : "FALSE");
+  }
 
-  if (lastStoredCondObj.second > 0) {edm::LogError("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::BuildDetVOff]: retrieved last time stamp from DB: " 
-									    << lastStoredCondObj.second  << endl;}
+  if (lastStoredCondObj.second > 0) {
+    edm::LogError("SiStripDetVOffBuilder")
+        << "[SiStripDetVOffBuilder::BuildDetVOff]: retrieved last time stamp from DB: " << lastStoredCondObj.second
+        << endl;
+  }
   // access the information!
   //We've been using the STATUSCHANGE query only in last year or so... LASTVALUE may have untested issues...
   //In either case the idea is that the results of the query are saved into the timesAndValues struct
   //ready to be anaylized (i.e. translated into detIDs, HV/LV statuses)
 
   if (whichQuery) {
-    if( whichTable == "STATUSCHANGE" ) {
-      statusChange( lastStoredCondObj.second, timesAndValues );
+    if (whichTable == "STATUSCHANGE") {
+      statusChange(lastStoredCondObj.second, timesAndValues);
     }
-    if( whichTable == "LASTVALUE" ) {
-      if( fromFile ) {
-	lastValueFromFile(timesAndValues);
-      }
-      else {
-	lastValue(timesAndValues);
+    if (whichTable == "LASTVALUE") {
+      if (fromFile) {
+        lastValueFromFile(timesAndValues);
+      } else {
+        lastValue(timesAndValues);
       }
     }
   }
 
-  //Initialize the stuct that will be used to keep the detID-translated information 
+  //Initialize the stuct that will be used to keep the detID-translated information
   DetIdListTimeAndStatus dStruct;
 
   // build PSU - det ID map
@@ -127,11 +139,9 @@ void SiStripDetVOffBuilder::BuildDetVOffObj()
   //populating the DetIDListTimeAndStatus struct that will hold the information by detid.
   buildPSUdetIdMap(timesAndValues, dStruct);
 
-
   // initialize variables
   modulesOff.clear();
   cond::Time_t saveIovTime = 0;
-  
 
   // - If there is already an object stored in the database
   // -- store it in the modulesOff vector
@@ -143,37 +153,38 @@ void SiStripDetVOffBuilder::BuildDetVOffObj()
   // --- LASTVALUE -> iovtime settato a latestTime
   // --- altrimenti iovtime = tempo associato al detId vector del loop
 
-
   // check if there is already an object stored in the DB
   // This happens only if you are using STATUSCHANGE
   if (lastStoredCondObj.first != nullptr && lastStoredCondObj.second > 0) {
-    modulesOff.push_back( lastStoredCondObj );
+    modulesOff.push_back(lastStoredCondObj);
     saveIovTime = lastStoredCondObj.second;
     setPayloadStats(0, 0, 0);
   }
 
-
   //Master loop over all the results of the query stored in the dStruct (that contains vectors with vectors of detids, statuses, isHV flags, etc and in particular a vector of timestamps for which the info is valid... basically it is a loop over the timestamps (i.e. IOVs).
   for (unsigned int i = 0; i < dStruct.detidV.size(); i++) {
- 
     //     std::vector<uint32_t> detids = dStruct.detidV[i].first;
     //     removeDuplicates(detids);
-    std::vector<uint32_t> * detids = &(dStruct.detidV[i].first);
+    std::vector<uint32_t>* detids = &(dStruct.detidV[i].first);
 
     // set the condition time for the transfer
     cond::Time_t iovtime = 0;
 
-    if (whichTable == "LASTVALUE") {iovtime = timesAndValues.latestTime;}
+    if (whichTable == "LASTVALUE") {
+      iovtime = timesAndValues.latestTime;
+    }
 
-    else {iovtime = getCondTime((dStruct.detidV[i]).second);}
+    else {
+      iovtime = getCondTime((dStruct.detidV[i]).second);
+    }
 
     // decide how to initialize modV
-    SiStripDetVOff *modV = nullptr;
+    SiStripDetVOff* modV = nullptr;
 
     // When using STATUSCHANGE they are equal only for the first
     // When using LASTVALUE they are equal only if the tmin was set to tsetmin
 
-    if (iovtime != saveIovTime) { // time is different, so create new object
+    if (iovtime != saveIovTime) {  // time is different, so create new object
 
       // This can be only when using LASTVALUE or with a new tag
       if (modulesOff.empty()) {
@@ -183,57 +194,62 @@ void SiStripDetVOffBuilder::BuildDetVOffObj()
         // Use the file
         edm::FileInPath fp(detIdListFile_);
         SiStripDetInfoFileReader reader(fp.fullPath());
-        const std::map<uint32_t, SiStripDetInfoFileReader::DetInfo >& detInfos  = reader.getAllData();
+        const std::map<uint32_t, SiStripDetInfoFileReader::DetInfo>& detInfos = reader.getAllData();
 
-	//FIXME:
-	//Following code is actually broken (well not until the cfg has "" for excludedDetIDListFile parameter!
-	//Fix it if felt necessary (remember that it assumes that whatever detids are excluded should NOT be in the regular map
-	//breaking our current situation with a fully mapped (LV-wise) tracker...
+        //FIXME:
+        //Following code is actually broken (well not until the cfg has "" for excludedDetIDListFile parameter!
+        //Fix it if felt necessary (remember that it assumes that whatever detids are excluded should NOT be in the regular map
+        //breaking our current situation with a fully mapped (LV-wise) tracker...
         // Careful: if a module is in the exclusion list it must be ignored and the initial status is set to ON.
         // These modules are expected to not be in the PSU-DetId map, so they will never get any status change from the query.
         SiStripPsuDetIdMap map;
-	std::vector< std::pair<uint32_t, std::string> > excludedDetIdMap;
-        if( !excludedDetIdListFile_.empty() ) {
+        std::vector<std::pair<uint32_t, std::string> > excludedDetIdMap;
+        if (!excludedDetIdListFile_.empty()) {
           map.BuildMap(excludedDetIdListFile_, excludedDetIdMap);
         }
-        for(std::map<uint32_t, SiStripDetInfoFileReader::DetInfo >::const_iterator it = detInfos.begin(); it != detInfos.end(); ++it) {
-	  std::vector< std::pair<uint32_t, std::string> >::const_iterator exclIt = excludedDetIdMap.begin();
+        for (std::map<uint32_t, SiStripDetInfoFileReader::DetInfo>::const_iterator it = detInfos.begin();
+             it != detInfos.end();
+             ++it) {
+          std::vector<std::pair<uint32_t, std::string> >::const_iterator exclIt = excludedDetIdMap.begin();
           bool excluded = false;
-          for( ; exclIt != excludedDetIdMap.end(); ++exclIt ) {
-            if( it->first == exclIt->first ) {
+          for (; exclIt != excludedDetIdMap.end(); ++exclIt) {
+            if (it->first == exclIt->first) {
               excluded = true;
               break;
             }
           }
-          if( !excluded ) {
-            modV->put( it->first, 1, 1 );
+          if (!excluded) {
+            modV->put(it->first, 1, 1);
           }
         }
 
-      }
-      else {modV = new SiStripDetVOff( *(modulesOff.back().first) );} // start from copy of previous object
-    }
-    else {
-      modV = (modulesOff.back()).first; // modify previous object (TEST THIS if possible! it's fundamental in handling changes at the edges of O2O executions and also in case of PVSS DB buffering!
+      } else {
+        modV = new SiStripDetVOff(*(modulesOff.back().first));
+      }  // start from copy of previous object
+    } else {
+      modV =
+          (modulesOff.back())
+              .first;  // modify previous object (TEST THIS if possible! it's fundamental in handling changes at the edges of O2O executions and also in case of PVSS DB buffering!
     }
 
-
-    
     // extract the detID vector before modifying for stats calculation
     std::vector<uint32_t> beforeV;
     modV->getDetIds(beforeV);
 
     //CHECKTHIS
-    //The following method call is potentially problematic: 
+    //The following method call is potentially problematic:
     //passing modV as argument while extracting information about dStruct,
     //modV is not currently used in the method!
-    std::pair<int, int> hvlv = extractDetIdVector(i, modV, dStruct);//Returns a pair like this HV OFF->1,-1 HV ON->0,-1 LV OFF->-1,1 LV ON->-1,0
+    std::pair<int, int> hvlv = extractDetIdVector(
+        i, modV, dStruct);  //Returns a pair like this HV OFF->1,-1 HV ON->0,-1 LV OFF->-1,1 LV ON->-1,0
     //Basically a LV OFF of -1  means that the information (IOV) in question is from an HV channel turning on or off and viceversa for an HVOFF of -1.
     //This could be confusing when reading the debug output!
- 
+
     for (unsigned int j = 0; j < detids->size(); j++) {
-      if( debug_ ) cout << "at time = " << iovtime << " detid["<<j<<"] = " << (*detids)[j] << " has hv = " << hvlv.first << " and lv = " << hvlv.second << endl;
-      modV->put((*detids)[j],hvlv.first,hvlv.second);
+      if (debug_)
+        cout << "at time = " << iovtime << " detid[" << j << "] = " << (*detids)[j] << " has hv = " << hvlv.first
+             << " and lv = " << hvlv.second << endl;
+      modV->put((*detids)[j], hvlv.first, hvlv.second);
     }
 
     // calculate the stats for storage
@@ -245,20 +261,21 @@ void SiStripDetVOffBuilder::BuildDetVOffObj()
     }
     std::vector<uint32_t> afterV;
     modV->getDetIds(afterV);
-    
+
     if ((afterV.size() - beforeV.size()) > 0) {
       numAdded += afterV.size() - beforeV.size();
     } else if ((beforeV.size() - afterV.size()) > 0) {
       numRemoved += beforeV.size() - afterV.size();
     }
 
-    
     // store the object if it's a new object
     if (iovtime != saveIovTime) {
-      SiStripDetVOff * testV = nullptr;
-      if (!modulesOff.empty()) {testV = modulesOff.back().first;}
-      if (modulesOff.empty() ||  !(*modV == *testV) ) {
-        modulesOff.push_back( std::make_pair(modV,iovtime) );
+      SiStripDetVOff* testV = nullptr;
+      if (!modulesOff.empty()) {
+        testV = modulesOff.back().first;
+      }
+      if (modulesOff.empty() || !(*modV == *testV)) {
+        modulesOff.push_back(std::make_pair(modV, iovtime));
         // save the time of the object
         saveIovTime = iovtime;
         // save stats
@@ -274,21 +291,20 @@ void SiStripDetVOffBuilder::BuildDetVOffObj()
     }
   }
 
-
   // compare the first element and the last from previous transfer
   if (lastStoredCondObj.first != nullptr && lastStoredCondObj.second > 0) {
-    if ( *(lastStoredCondObj.first) == *(modulesOff[0].first) ) {
-      if ( modulesOff.size() == 1 ){
+    if (*(lastStoredCondObj.first) == *(modulesOff[0].first)) {
+      if (modulesOff.size() == 1) {
         // if no HV/LV transition was found in this period: update the last IOV to be tmax
         modulesOff[0].second = getCondTime(tmax);
-      }else{
+      } else {
         // HV/LV transitions found: remove the first one (which came from previous transfer)
         modulesOff.erase(modulesOff.begin());
         payloadStats.erase(payloadStats.begin());
       }
     }
   }
-  
+
   if (debug_) {
     std::cout << std::endl;
     std::cout << "Size of modulesOff = " << modulesOff.size() << std::endl;
@@ -298,22 +314,32 @@ void SiStripDetVOffBuilder::BuildDetVOffObj()
       std::cout << "Index = " << i << " Size of DetIds vector = " << finalids.size() << std::endl;
       std::cout << "Time = " << modulesOff[i].second << std::endl;
       for (unsigned int j = 0; j < finalids.size(); j++) {
-	std::cout << "detid = " << finalids[j] << " LV off = " << (modulesOff[i].first)->IsModuleLVOff(finalids[j]) << " HV off = " 
-		  << (modulesOff[i].first)->IsModuleHVOff(finalids[j]) << std::endl;
+        std::cout << "detid = " << finalids[j] << " LV off = " << (modulesOff[i].first)->IsModuleLVOff(finalids[j])
+                  << " HV off = " << (modulesOff[i].first)->IsModuleHVOff(finalids[j]) << std::endl;
       }
     }
   }
 }
 
-int SiStripDetVOffBuilder::findSetting(uint32_t id, const coral::TimeStamp& changeDate, const std::vector<uint32_t>& settingID, const std::vector<coral::TimeStamp>& settingDate) {
+int SiStripDetVOffBuilder::findSetting(uint32_t id,
+                                       const coral::TimeStamp& changeDate,
+                                       const std::vector<uint32_t>& settingID,
+                                       const std::vector<coral::TimeStamp>& settingDate) {
   int setting = -1;
   // find out how many channel entries there are
   std::vector<int> locations;
-  for (unsigned int i = 0; i < settingID.size(); i++) { if (settingID[i] == id) {locations.push_back((int)i);} }
+  for (unsigned int i = 0; i < settingID.size(); i++) {
+    if (settingID[i] == id) {
+      locations.push_back((int)i);
+    }
+  }
 
   // simple cases
-  if (locations.empty()) {setting = -1;}
-  else if (locations.size() == 1) {setting = locations[0];}
+  if (locations.empty()) {
+    setting = -1;
+  } else if (locations.size() == 1) {
+    setting = locations[0];
+  }
   // more than one entry for this channel
   // NB.  entries ordered by date!
   else {
@@ -325,21 +351,33 @@ int SiStripDetVOffBuilder::findSetting(uint32_t id, const coral::TimeStamp& chan
       long testSec = changeDate.time().ns();
       long limitSec = settingDate[(unsigned int)locations[j]].time().ns();
 #endif
-      if (testSec >= limitSec) {setting = locations[j];}
+      if (testSec >= limitSec) {
+        setting = locations[j];
+      }
     }
   }
   return setting;
 }
 
-int SiStripDetVOffBuilder::findSetting(std::string dpname, const coral::TimeStamp& changeDate, const std::vector<std::string>& settingDpname, const std::vector<coral::TimeStamp>& settingDate) {
+int SiStripDetVOffBuilder::findSetting(std::string dpname,
+                                       const coral::TimeStamp& changeDate,
+                                       const std::vector<std::string>& settingDpname,
+                                       const std::vector<coral::TimeStamp>& settingDate) {
   int setting = -1;
   // find out how many channel entries there are
   std::vector<int> locations;
-  for (unsigned int i = 0; i < settingDpname.size(); i++) { if (settingDpname[i] == dpname) {locations.push_back((int)i);} }
-  
+  for (unsigned int i = 0; i < settingDpname.size(); i++) {
+    if (settingDpname[i] == dpname) {
+      locations.push_back((int)i);
+    }
+  }
+
   // simple cases
-  if (locations.empty()) {setting = -1;}
-  else if (locations.size() == 1) {setting = locations[0];}
+  if (locations.empty()) {
+    setting = -1;
+  } else if (locations.size() == 1) {
+    setting = locations[0];
+  }
   // more than one entry for this channel
   // NB.  entries ordered by date!
   else {
@@ -351,16 +389,21 @@ int SiStripDetVOffBuilder::findSetting(std::string dpname, const coral::TimeStam
       long testSec = changeDate.time().ns();
       long limitSec = settingDate[(unsigned int)locations[j]].time().ns();
 #endif
-      if (testSec >= limitSec) {setting = locations[j];}
+      if (testSec >= limitSec) {
+        setting = locations[j];
+      }
     }
   }
   return setting;
 }
 
-void SiStripDetVOffBuilder::readLastValueFromFile(std::vector<uint32_t> &dpIDs, std::vector<float> &vmonValues, std::vector<coral::TimeStamp> &dateChange) {
+void SiStripDetVOffBuilder::readLastValueFromFile(std::vector<uint32_t>& dpIDs,
+                                                  std::vector<float>& vmonValues,
+                                                  std::vector<coral::TimeStamp>& dateChange) {
   std::ifstream lastValueFile(lastValueFileName.c_str());
   if (lastValueFile.bad()) {
-    edm::LogError("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::" << __func__ << "]: last Value file does not exist!";
+    edm::LogError("SiStripDetVOffBuilder")
+        << "[SiStripDetVOffBuilder::" << __func__ << "]: last Value file does not exist!";
     return;
   }
 
@@ -374,7 +417,7 @@ void SiStripDetVOffBuilder::readLastValueFromFile(std::vector<uint32_t> &dpIDs,
   //  std::getline(lastValueFile,line);
   //  line.clear();
   // now extract data
-  while( std::getline(lastValueFile,line) ) {
+  while (std::getline(lastValueFile, line)) {
     std::istringstream ss(line);
     uint32_t dpid;
     float vmon;
@@ -384,43 +427,44 @@ void SiStripDetVOffBuilder::readLastValueFromFile(std::vector<uint32_t> &dpIDs,
     vmonValues.push_back(vmon);
     changeDates.push_back(changeDate);
   }
-  lastValueFile.close();  
+  lastValueFile.close();
 
   // Now convert dates to coral::TimeStamp
   for (unsigned int i = 0; i < changeDates.size(); i++) {
-    std::string part = changeDates[i].substr(0,4);
+    std::string part = changeDates[i].substr(0, 4);
     int year = atoi(part.c_str());
     part.clear();
 
-    part = changeDates[i].substr(5,2);
+    part = changeDates[i].substr(5, 2);
     int month = atoi(part.c_str());
     part.clear();
 
-    part = changeDates[i].substr(8,2);
+    part = changeDates[i].substr(8, 2);
     int day = atoi(part.c_str());
     part.clear();
 
-    part = changeDates[i].substr(11,2);
+    part = changeDates[i].substr(11, 2);
     int hour = atoi(part.c_str());
     part.clear();
 
-    part = changeDates[i].substr(14,2);
+    part = changeDates[i].substr(14, 2);
     int minute = atoi(part.c_str());
     part.clear();
 
-    part = changeDates[i].substr(17,2);
+    part = changeDates[i].substr(17, 2);
     int second = atoi(part.c_str());
     part.clear();
 
-    coral::TimeStamp date(year,month,day,hour,minute,second,0);
+    coral::TimeStamp date(year, month, day, hour, minute, second, 0);
     dateChange.push_back(date);
   }
 
-  if (changeDates.size() != dateChange.size()) {edm::LogError("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::" << __func__ << "]: date conversion failed!!";}
+  if (changeDates.size() != dateChange.size()) {
+    edm::LogError("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::" << __func__ << "]: date conversion failed!!";
+  }
 }
 
 cond::Time_t SiStripDetVOffBuilder::getCondTime(const coral::TimeStamp& coralTime) {
-
   // const boost::posix_time::ptime& t = coralTime.time();
   cond::Time_t condTime = cond::time::from_boost(coralTime.time());
 
@@ -430,47 +474,44 @@ cond::Time_t SiStripDetVOffBuilder::getCondTime(const coral::TimeStamp& coralTim
   return condTime;
 }
 
-coral::TimeStamp SiStripDetVOffBuilder::getCoralTime(cond::Time_t iovTime)
-{
+coral::TimeStamp SiStripDetVOffBuilder::getCoralTime(cond::Time_t iovTime) {
   // This method is defined in the TimeConversions header and it does the following:
   // - takes the seconds part of the iovTime (bit-shifting of 32)
   // - adds the nanoseconds part (first 32 bits mask)
   // - adds the time0 that is the time from begin of times (boost::posix_time::from_time_t(0);)
   coral::TimeStamp coralTime(cond::time::to_boost(iovTime));
 
-  if( debug_ ) {
+  if (debug_) {
     unsigned long long iovSec = iovTime >> 32;
     uint32_t iovNanoSec = uint32_t(iovTime);
-    cond::Time_t testTime=getCondTime(coralTime);
+    cond::Time_t testTime = getCondTime(coralTime);
     cout << "[SiStripDetVOffBuilder::getCoralTime] Converting CondTime into CoralTime: "
-	 << " condTime = " <<  iovSec << " - " << iovNanoSec 
-	 << " getCondTime(coralTime) = " << (testTime>>32) << " - " << (testTime&0xFFFFFFFF)  << endl;
+         << " condTime = " << iovSec << " - " << iovNanoSec << " getCondTime(coralTime) = " << (testTime >> 32) << " - "
+         << (testTime & 0xFFFFFFFF) << endl;
   }
 
   return coralTime;
 }
 
-void SiStripDetVOffBuilder::removeDuplicates( std::vector<uint32_t> & vec ) {
-  std::sort(vec.begin(),vec.end());
-  std::vector<uint32_t>::iterator it = std::unique(vec.begin(),vec.end());
-  vec.resize( it - vec.begin() );
+void SiStripDetVOffBuilder::removeDuplicates(std::vector<uint32_t>& vec) {
+  std::sort(vec.begin(), vec.end());
+  std::vector<uint32_t>::iterator it = std::unique(vec.begin(), vec.end());
+  vec.resize(it - vec.begin());
 }
 
-void SiStripDetVOffBuilder::setLastSiStripDetVOff( SiStripDetVOff * lastPayload, cond::Time_t lastTimeStamp ) {
+void SiStripDetVOffBuilder::setLastSiStripDetVOff(SiStripDetVOff* lastPayload, cond::Time_t lastTimeStamp) {
   lastStoredCondObj.first = lastPayload;
   lastStoredCondObj.second = lastTimeStamp;
 }
 
-cond::Time_t SiStripDetVOffBuilder::findMostRecentTimeStamp( const std::vector<coral::TimeStamp>& coralDate ) {
+cond::Time_t SiStripDetVOffBuilder::findMostRecentTimeStamp(const std::vector<coral::TimeStamp>& coralDate) {
   cond::Time_t latestDate = getCondTime(coralDate[0]);
-  
-  if( debug_ ) {
-    std::cout << "latestDate: condTime = " 
-	      << (latestDate>>32) 
-	      << " - " 
-	      << (latestDate&0xFFFFFFFF) 
-      //<< " coralTime= " << coralDate[0] 
-	      << std::endl;
+
+  if (debug_) {
+    std::cout << "latestDate: condTime = " << (latestDate >> 32) << " - "
+              << (latestDate & 0xFFFFFFFF)
+              //<< " coralTime= " << coralDate[0]
+              << std::endl;
   }
 
   for (unsigned int i = 1; i < coralDate.size(); i++) {
@@ -482,112 +523,116 @@ cond::Time_t SiStripDetVOffBuilder::findMostRecentTimeStamp( const std::vector<c
   return latestDate;
 }
 
-void SiStripDetVOffBuilder::reduce( std::vector< std::pair<SiStripDetVOff*,cond::Time_t> >::iterator & it,
-				    std::vector< std::pair<SiStripDetVOff*,cond::Time_t> >::iterator & initialIt,
-				    std::vector< std::pair<SiStripDetVOff*,cond::Time_t> > & resultVec,
-				    const bool last )
-{
+void SiStripDetVOffBuilder::reduce(std::vector<std::pair<SiStripDetVOff*, cond::Time_t> >::iterator& it,
+                                   std::vector<std::pair<SiStripDetVOff*, cond::Time_t> >::iterator& initialIt,
+                                   std::vector<std::pair<SiStripDetVOff*, cond::Time_t> >& resultVec,
+                                   const bool last) {
   //const bool last is set to false by default in the header file...
   int first = 0;
   // Check if it is the first
-  if( distance(resultVec.begin(), initialIt) == 0 ) {
+  if (distance(resultVec.begin(), initialIt) == 0) {
     first = 1;
   }
 
-  if( debug_ && ( it->first->getLVoffCounts() - initialIt->first->getLVoffCounts() == 0 ) && ( it->first->getHVoffCounts() - initialIt->first->getHVoffCounts() == 0 ) ) {
-    cout << "Same number of LV and HV at start and end of sequence: LV off = " << it->first->getLVoffCounts() << " HV off = " << it->first->getHVoffCounts() << endl;
+  if (debug_ && (it->first->getLVoffCounts() - initialIt->first->getLVoffCounts() == 0) &&
+      (it->first->getHVoffCounts() - initialIt->first->getHVoffCounts() == 0)) {
+    cout << "Same number of LV and HV at start and end of sequence: LV off = " << it->first->getLVoffCounts()
+         << " HV off = " << it->first->getHVoffCounts() << endl;
   }
 
   // if it was going off
-  if( ( it->first->getLVoffCounts() - initialIt->first->getLVoffCounts() > 0 ) || ( it->first->getHVoffCounts() - initialIt->first->getHVoffCounts() > 0 ) ) {
+  if ((it->first->getLVoffCounts() - initialIt->first->getLVoffCounts() > 0) ||
+      (it->first->getHVoffCounts() - initialIt->first->getHVoffCounts() > 0)) {
     // Set the time of the current (last) iov as the time of the initial iov of the sequence
     // replace the first iov with the last one
-    //Naughty use of const bool last... by default it is false (=0), and for the case of the last timestamp in the query results it is set to true(=1) in the call 
-    (it+last)->second = (initialIt)->second;
+    //Naughty use of const bool last... by default it is false (=0), and for the case of the last timestamp in the query results it is set to true(=1) in the call
+    (it + last)->second = (initialIt)->second;
     discardIOVs(it, initialIt, resultVec, last, 0);
-    if( debug_ ) cout << "Reducing IOV sequence (going off)" << endl;
+    if (debug_)
+      cout << "Reducing IOV sequence (going off)" << endl;
   }
   // if it was going on
-  else if( ( it->first->getLVoffCounts() - initialIt->first->getLVoffCounts() <= 0 ) || ( it->first->getHVoffCounts() - initialIt->first->getHVoffCounts() <= 0 ) ) {
+  else if ((it->first->getLVoffCounts() - initialIt->first->getLVoffCounts() <= 0) ||
+           (it->first->getHVoffCounts() - initialIt->first->getHVoffCounts() <= 0)) {
     // replace the last minus one iov with the first one
     discardIOVs(it, initialIt, resultVec, last, first);
-    if( debug_ ) cout << "Reducing IOV sequence (going on)" << endl;
+    if (debug_)
+      cout << "Reducing IOV sequence (going on)" << endl;
   }
 }
 
-void SiStripDetVOffBuilder::discardIOVs( std::vector< std::pair<SiStripDetVOff*,cond::Time_t> >::iterator & it,
-                                         std::vector< std::pair<SiStripDetVOff*,cond::Time_t> >::iterator & initialIt,
-                                         std::vector< std::pair<SiStripDetVOff*,cond::Time_t> > & resultVec,
-                                         const bool last, const unsigned int first )
-{
-  if( debug_ ) {
-    cout << "first (1->means the sequence started at the first timestamp in the query results, 0-> that it did not)= " << first << endl;
-    cout << "initial->first (initial SiStripDetVOff object of the IOV sequence)= " << initialIt->first << ", second (initial timestamp of the IOV sequence) = " << initialIt->second << endl;
-    cout << "last (0->means that the sequence is not ending with the last item in the query results, 1-> that it DOES!)= " << last << endl;
+void SiStripDetVOffBuilder::discardIOVs(std::vector<std::pair<SiStripDetVOff*, cond::Time_t> >::iterator& it,
+                                        std::vector<std::pair<SiStripDetVOff*, cond::Time_t> >::iterator& initialIt,
+                                        std::vector<std::pair<SiStripDetVOff*, cond::Time_t> >& resultVec,
+                                        const bool last,
+                                        const unsigned int first) {
+  if (debug_) {
+    cout << "first (1->means the sequence started at the first timestamp in the query results, 0-> that it did not)= "
+         << first << endl;
+    cout << "initial->first (initial SiStripDetVOff object of the IOV sequence)= " << initialIt->first
+         << ", second (initial timestamp of the IOV sequence) = " << initialIt->second << endl;
+    cout << "last (0->means that the sequence is not ending with the last item in the query results, 1-> that it "
+            "DOES!)= "
+         << last << endl;
   }
-  if( last == true ) {
-    resultVec.erase(initialIt+first, it+1);
+  if (last == true) {
+    resultVec.erase(initialIt + first, it + 1);
     // Minus 2 because it will be incremented at the end of the loop becoming end()-1.
-    it = resultVec.end()-2;
-  }
-  else {
-    it = resultVec.erase(initialIt+first, it);
+    it = resultVec.end() - 2;
+  } else {
+    it = resultVec.erase(initialIt + first, it);
   }
 }
 
 //This is the method that (called by GetModulesOff, declared in the header file) executes the reduction by massaging modulesOff
-void SiStripDetVOffBuilder::reduction(const uint32_t deltaTmin, const uint32_t maxIOVlength)
-{
-
+void SiStripDetVOffBuilder::reduction(const uint32_t deltaTmin, const uint32_t maxIOVlength) {
   int count = 0;
-  std::vector< std::pair<SiStripDetVOff*,cond::Time_t> >::iterator initialIt;
+  std::vector<std::pair<SiStripDetVOff*, cond::Time_t> >::iterator initialIt;
 
   int resultVecSize = modulesOff.size();
   int resultsIndex = 0;
 
-  if( resultVecSize > 1 ) {
-  std::vector< std::pair<SiStripDetVOff*,cond::Time_t> >::iterator it = modulesOff.begin();
-    for( ; it != modulesOff.end()-1; ++it, ++resultsIndex ) {
-      unsigned long long deltaT = ((it+1)->second - it->second) >> 32;
+  if (resultVecSize > 1) {
+    std::vector<std::pair<SiStripDetVOff*, cond::Time_t> >::iterator it = modulesOff.begin();
+    for (; it != modulesOff.end() - 1; ++it, ++resultsIndex) {
+      unsigned long long deltaT = ((it + 1)->second - it->second) >> 32;
       unsigned long long deltaTsequence = 0;
-      if( count > 1 ) {
-	deltaTsequence = ((it+1)->second - initialIt->second) >> 32;
+      if (count > 1) {
+        deltaTsequence = ((it + 1)->second - initialIt->second) >> 32;
       }
       // Save the initial pair
-      if( (deltaT < deltaTmin) && ( (count == 0) || ( deltaTsequence < maxIOVlength ) ) ) {
-	// If we are not in a the sequence
-	if( count == 0 ) {
-	  initialIt = it;
-	}
-	// Increase the counter in any case.
-	++count;
+      if ((deltaT < deltaTmin) && ((count == 0) || (deltaTsequence < maxIOVlength))) {
+        // If we are not in a the sequence
+        if (count == 0) {
+          initialIt = it;
+        }
+        // Increase the counter in any case.
+        ++count;
       }
       // We do it only if the sequence is bigger than two cases
-      else if( count > 1 ) {
-	reduce(it, initialIt, modulesOff);
-	// reset all
-	count = 0;
-      }
-      else {
-	// reset all
-	count = 0;
+      else if (count > 1) {
+        reduce(it, initialIt, modulesOff);
+        // reset all
+        count = 0;
+      } else {
+        // reset all
+        count = 0;
       }
       // Border case
-      if( resultsIndex == resultVecSize-2 && count != 0 ) {
-	reduce(it, initialIt, modulesOff, true);
+      if (resultsIndex == resultVecSize - 2 && count != 0) {
+        reduce(it, initialIt, modulesOff, true);
       }
     }
   }
 }
 
-void SiStripDetVOffBuilder::statusChange( cond::Time_t & lastTime, TimesAndValues & tStruct )
-{
+void SiStripDetVOffBuilder::statusChange(cond::Time_t& lastTime, TimesAndValues& tStruct) {
   // Setting tmin to the last value IOV of the database tag
-  if( lastTime > 0 ) {
+  if (lastTime > 0) {
     tmin = getCoralTime(lastTime);
   }
-  
-  coralInterface->doQuery(whichTable, tmin ,tmax, tStruct.changeDate, tStruct.actualValue, tStruct.dpname);
+
+  coralInterface->doQuery(whichTable, tmin, tmax, tStruct.changeDate, tStruct.actualValue, tStruct.dpname);
   //UNIT TEST DEBUG to bypass the query wait time!!!
   //coral::TimeStamp testtime=getCoralTime(lastTime);
   //tStruct.changeDate.push_back(testtime);
@@ -597,74 +642,82 @@ void SiStripDetVOffBuilder::statusChange( cond::Time_t & lastTime, TimesAndValue
   // preset the size of the status vector
   tStruct.actualStatus.resize(tStruct.actualValue.size());
   tStruct.actualStatus.clear();
-  
-  for(float val : tStruct.actualValue) {
+
+  for (float val : tStruct.actualValue) {
     tStruct.actualStatus.push_back(static_cast<int>(val));
   }
 }
 
-void SiStripDetVOffBuilder::lastValue(TimesAndValues & tStruct)
-{
-  coralInterface->doQuery(whichTable, tmin ,tmax, tStruct.changeDate, tStruct.actualValue, tStruct.dpname);
-  
-  tStruct.latestTime = findMostRecentTimeStamp( tStruct.changeDate );
-  
+void SiStripDetVOffBuilder::lastValue(TimesAndValues& tStruct) {
+  coralInterface->doQuery(whichTable, tmin, tmax, tStruct.changeDate, tStruct.actualValue, tStruct.dpname);
+
+  tStruct.latestTime = findMostRecentTimeStamp(tStruct.changeDate);
+
   // preset the size of the status vector
   tStruct.actualStatus.resize(tStruct.actualValue.size());
-  
+
   // retrieve the channel settings from the PVSS DB
   std::vector<coral::TimeStamp> settingDate;
   std::vector<float> settingValue;
   std::vector<std::string> settingDpname;
   std::vector<uint32_t> settingDpid;
-  coralInterface->doSettingsQuery(tsetmin,tmax,settingDate,settingValue,settingDpname,settingDpid);
+  coralInterface->doSettingsQuery(tsetmin, tmax, settingDate, settingValue, settingDpname, settingDpid);
   LogDebug("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::BuildDetVOff]: Channel settings retrieved";
-  LogDebug("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::BuildDetVOff]: Number of PSU channels: " << settingDpname.size();
-    
+  LogDebug("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::BuildDetVOff]: Number of PSU channels: "
+                                    << settingDpname.size();
+
   unsigned int missing = 0;
   std::stringstream ss;
   for (unsigned int j = 0; j < tStruct.dpname.size(); j++) {
-    int setting = findSetting(tStruct.dpname[j],tStruct.changeDate[j],settingDpname,settingDate);
+    int setting = findSetting(tStruct.dpname[j], tStruct.changeDate[j], settingDpname, settingDate);
     if (setting >= 0) {
-      if (tStruct.actualValue[j] > (highVoltageOnThreshold_*(settingValue[setting]))) {tStruct.actualStatus[j] = 1;}
-      else {tStruct.actualStatus[j] = 0;}
+      if (tStruct.actualValue[j] > (highVoltageOnThreshold_ * (settingValue[setting]))) {
+        tStruct.actualStatus[j] = 1;
+      } else {
+        tStruct.actualStatus[j] = 0;
+      }
     } else {
       tStruct.actualStatus[j] = -1;
       missing++;
       ss << "Channel = " << tStruct.dpname[j] << std::endl;
     }
   }
-  LogDebug("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::BuildDetVOff]: Number of channels with no setting information " << missing;
-  LogDebug("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::BuildDetVOff]: Number of entries in dpname vector " << tStruct.dpname.size();
+  LogDebug("SiStripDetVOffBuilder")
+      << "[SiStripDetVOffBuilder::BuildDetVOff]: Number of channels with no setting information " << missing;
+  LogDebug("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::BuildDetVOff]: Number of entries in dpname vector "
+                                    << tStruct.dpname.size();
 }
 
-void SiStripDetVOffBuilder::lastValueFromFile(TimesAndValues & tStruct)
-{
-  readLastValueFromFile(tStruct.dpid,tStruct.actualValue,tStruct.changeDate);
-  tStruct.latestTime = findMostRecentTimeStamp( tStruct.changeDate );
-  LogDebug("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::BuildDetVOff]: File access complete \n\t Number of values read from file: " << tStruct.dpid.size();
-  
+void SiStripDetVOffBuilder::lastValueFromFile(TimesAndValues& tStruct) {
+  readLastValueFromFile(tStruct.dpid, tStruct.actualValue, tStruct.changeDate);
+  tStruct.latestTime = findMostRecentTimeStamp(tStruct.changeDate);
+  LogDebug("SiStripDetVOffBuilder")
+      << "[SiStripDetVOffBuilder::BuildDetVOff]: File access complete \n\t Number of values read from file: "
+      << tStruct.dpid.size();
+
   // retrieve the channel settings from the PVSS DB
   std::vector<coral::TimeStamp> settingDate;
   std::vector<float> settingValue;
   std::vector<std::string> settingDpname;
   std::vector<uint32_t> settingDpid;
-  
-  coralInterface->doSettingsQuery(tsetmin,tmax,settingDate,settingValue,settingDpname,settingDpid);
+
+  coralInterface->doSettingsQuery(tsetmin, tmax, settingDate, settingValue, settingDpname, settingDpid);
   LogDebug("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::BuildDetVOff]: Channel settings retrieved";
-  LogDebug("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::BuildDetVOff]: Number of PSU channels: " << settingDpname.size();
-  
+  LogDebug("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::BuildDetVOff]: Number of PSU channels: "
+                                    << settingDpname.size();
+
   unsigned int missing = 0;
   std::stringstream ss;
   // need to get the PSU channel names from settings
   tStruct.dpname.clear();
-  tStruct.dpname.resize(tStruct. dpid.size());
+  tStruct.dpname.resize(tStruct.dpid.size());
   for (unsigned int j = 0; j < tStruct.dpid.size(); j++) {
-    int setting = findSetting(tStruct.dpid[j],tStruct.changeDate[j],settingDpid,settingDate);
+    int setting = findSetting(tStruct.dpid[j], tStruct.changeDate[j], settingDpid, settingDate);
     if (setting >= 0) {
-      if (tStruct.actualValue[j] > (highVoltageOnThreshold_*settingValue[setting])) {tStruct.actualStatus[j] = 1;}
-      else {
-	tStruct.actualStatus[j] = 0;
+      if (tStruct.actualValue[j] > (highVoltageOnThreshold_ * settingValue[setting])) {
+        tStruct.actualStatus[j] = 1;
+      } else {
+        tStruct.actualStatus[j] = 0;
       }
       tStruct.dpname[j] = settingDpname[setting];
     } else {
@@ -678,23 +731,17 @@ void SiStripDetVOffBuilder::lastValueFromFile(TimesAndValues & tStruct)
   LogDebug("SiStripDetVOffBuilder") << "IDs are: = " << ss.str();
 }
 
-string SiStripDetVOffBuilder::timeToStream(const cond::Time_t & condTime, const string & comment)
-{
+string SiStripDetVOffBuilder::timeToStream(const cond::Time_t& condTime, const string& comment) {
   stringstream ss;
-  ss << comment << (condTime>> 32) << " - " << (condTime & 0xFFFFFFFF) << std::endl;
+  ss << comment << (condTime >> 32) << " - " << (condTime & 0xFFFFFFFF) << std::endl;
   return ss.str();
 }
 
-string SiStripDetVOffBuilder::timeToStream(const coral::TimeStamp & coralTime, const string & comment)
-{
+string SiStripDetVOffBuilder::timeToStream(const coral::TimeStamp& coralTime, const string& comment) {
   stringstream ss;
-  ss << "Starting from IOV time in the database : year = " << coralTime.year()
-     << ", month = " << coralTime.month()
-     << ", day = " << coralTime.day()
-     << ", hour = " << coralTime.hour()
-     << ", minute = " << coralTime.minute()
-     << ", second = " << coralTime.second()
-     << ", nanosecond = " << coralTime.nanosecond() << std::endl;
+  ss << "Starting from IOV time in the database : year = " << coralTime.year() << ", month = " << coralTime.month()
+     << ", day = " << coralTime.day() << ", hour = " << coralTime.hour() << ", minute = " << coralTime.minute()
+     << ", second = " << coralTime.second() << ", nanosecond = " << coralTime.nanosecond() << std::endl;
   return ss.str();
 }
 bool SiStripDetVOffBuilder::FileExists(string FileName) {
@@ -703,33 +750,33 @@ bool SiStripDetVOffBuilder::FileExists(string FileName) {
   bool Existence;
   int Stat;
   //Try to get file attributes
-  Stat=stat(FileName.c_str(),&FileInfo);
-  if (Stat==0) {
-    Existence=true;
-  }
-  else {
-    Existence=false;
+  Stat = stat(FileName.c_str(), &FileInfo);
+  if (Stat == 0) {
+    Existence = true;
+  } else {
+    Existence = false;
   }
   return Existence;
 }
 
-void SiStripDetVOffBuilder::buildPSUdetIdMap(TimesAndValues & psuStruct, DetIdListTimeAndStatus & detIdStruct)
+void SiStripDetVOffBuilder::buildPSUdetIdMap(TimesAndValues& psuStruct, DetIdListTimeAndStatus& detIdStruct)
 //This function builds a PSU to DetID map one way or the other. Then it processes the psuStruct that contains
 //the results of the CAEN status query to the Online DB, filling the detIdStruct with the detIDs corresponding
 //to the PSU (channel in some cases, PSU only in others) reported in the CAEN status query to the Online DB.
 //It may make sense to split this method eventually.
 {
   SiStripPsuDetIdMap map_;
-  if( psuDetIdMapFile_.empty() ) {
-    std::cout<<"PLEASE provide the name of a valid PSUDetIDMapFile in the cfg: currently still necessary to have a file, soon will access the info straight from the DB!"<<endl;
+  if (psuDetIdMapFile_.empty()) {
+    std::cout << "PLEASE provide the name of a valid PSUDetIDMapFile in the cfg: currently still necessary to have a "
+                 "file, soon will access the info straight from the DB!"
+              << endl;
     //map_.BuildMap();//This method is not currently used (it would try to build a map based on a query to SiStripConfigDB, and the info there is STALE!)
+  } else {
+    map_.BuildMap(psuDetIdMapFile_, debug_);  //This is the method used to build the map.
   }
-  else {
-    map_.BuildMap(psuDetIdMapFile_,debug_); //This is the method used to build the map.
-  }
-  LogTrace("SiStripDetVOffBuilder") <<"[SiStripDetVOffBuilder::BuildDetVOff] PSU(Channel)-detID map(s) built";
+  LogTrace("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::BuildDetVOff] PSU(Channel)-detID map(s) built";
   //Following method to be replaced by printMaps... to print all 4 maps built!
-  map_.printMap(); //This method prints to the info.log file, notice that it is overwritten by each individual O2O job running in the same dir.
+  map_.printMap();  //This method prints to the info.log file, notice that it is overwritten by each individual O2O job running in the same dir.
 
   // use map info to build input for list of objects
   // no need to check for duplicates, as put method for SiStripDetVOff checks for you!
@@ -741,164 +788,178 @@ void SiStripDetVOffBuilder::buildPSUdetIdMap(TimesAndValues & psuStruct, DetIdLi
   //Create 2 extra maps that we'll use to keep track of unmapped and crosstalking detids when turning ON and OFF HV:
   //-unmapped need to be both turned OFF when any HV goes OFF and to be turned ON when both are ON
   //-crosstaling need to be both turned ON when any HV goes ON and to be turned OFF ONLY when BOTH are OFF.
-  std::map<std::string,bool> UnmappedState, CrosstalkingState;
+  std::map<std::string, bool> UnmappedState, CrosstalkingState;
   //Get the HVUnmapped map from the map, so that we can set know which PSU are unmapped:
-  std::map<std::string,std::vector<uint32_t> > UnmappedPSUs=map_.getHVUnmappedMap();
+  std::map<std::string, std::vector<uint32_t> > UnmappedPSUs = map_.getHVUnmappedMap();
   //Check here if there is a file already, otherwise initialize to OFF all channels in these PSU!
   if (FileExists("HVUnmappedChannelState.dat")) {
-    std::cout<<"File HVUnmappedChannelState.dat exists!"<<std::endl;
+    std::cout << "File HVUnmappedChannelState.dat exists!" << std::endl;
     std::ifstream ifs("HVUnmappedChannelState.dat");
     string line;
-    while( getline( ifs, line ) ) {
-      if( !line.empty() ) {
-	// split the line and insert in the map
-	stringstream ss(line);
-	string PSUChannel;
-	bool HVStatus;
-	ss >> PSUChannel;
-	ss >> HVStatus;
-	//Extract the PSU from the PSUChannel (since the HVUnmapped_Map uses PSU as key
-	std::string PSU=PSUChannel.substr(0,PSUChannel.size()-10);
-	//Look for the PSU in the unmapped map!
-	std::map<std::string,std::vector<uint32_t> >::iterator iter=UnmappedPSUs.find(PSU);
-	if (iter!=UnmappedPSUs.end()) {
-	  UnmappedState[PSUChannel]=HVStatus;
-	}
-	else {
-	  std::cout<<"WARNING!!! There are channels in the local file with the channel status for HVUnmapped channels, that ARE NOT CONSIDERED AS UNMAPPED in the current map!"<<std::endl;
-	}
+    while (getline(ifs, line)) {
+      if (!line.empty()) {
+        // split the line and insert in the map
+        stringstream ss(line);
+        string PSUChannel;
+        bool HVStatus;
+        ss >> PSUChannel;
+        ss >> HVStatus;
+        //Extract the PSU from the PSUChannel (since the HVUnmapped_Map uses PSU as key
+        std::string PSU = PSUChannel.substr(0, PSUChannel.size() - 10);
+        //Look for the PSU in the unmapped map!
+        std::map<std::string, std::vector<uint32_t> >::iterator iter = UnmappedPSUs.find(PSU);
+        if (iter != UnmappedPSUs.end()) {
+          UnmappedState[PSUChannel] = HVStatus;
+        } else {
+          std::cout << "WARNING!!! There are channels in the local file with the channel status for HVUnmapped "
+                       "channels, that ARE NOT CONSIDERED AS UNMAPPED in the current map!"
+                    << std::endl;
+        }
       }
-    }//End of the while loop reading and initializing UnmappedState map from file
+    }  //End of the while loop reading and initializing UnmappedState map from file
     //Extra check:
     //Should check if there any HVUnmapped channels in the map that are not listed in the local file!
-    bool MissingChannels=false;
-    for (std::map<std::string, vector<uint32_t> >::iterator it=UnmappedPSUs.begin(); it!=UnmappedPSUs.end(); it++) {
-      std::string chan002=it->first+"channel002";
-      std::string chan003=it->first+"channel003";
-      std::map<std::string,bool>::iterator iter=UnmappedState.find(chan002);
-      if (iter==UnmappedState.end()) {
-	std::cout<<"ERROR! The local file with the channel status for HVUnmapped channels IS MISSING one of the following unmapped channel voltage status information:"<<std::endl;
-	std::cout<<chan002<<std::endl;
-	MissingChannels=true;
+    bool MissingChannels = false;
+    for (std::map<std::string, vector<uint32_t> >::iterator it = UnmappedPSUs.begin(); it != UnmappedPSUs.end(); it++) {
+      std::string chan002 = it->first + "channel002";
+      std::string chan003 = it->first + "channel003";
+      std::map<std::string, bool>::iterator iter = UnmappedState.find(chan002);
+      if (iter == UnmappedState.end()) {
+        std::cout << "ERROR! The local file with the channel status for HVUnmapped channels IS MISSING one of the "
+                     "following unmapped channel voltage status information:"
+                  << std::endl;
+        std::cout << chan002 << std::endl;
+        MissingChannels = true;
       }
-      iter=UnmappedState.find(chan003);
-      if (iter==UnmappedState.end()) {
-	std::cout<<"ERROR! The local file with the channel status for HVUnmapped channels IS MISSING one of the following unmapped channel voltage status information:"<<std::endl;
-	std::cout<<chan003<<std::endl;
-	MissingChannels=true;
+      iter = UnmappedState.find(chan003);
+      if (iter == UnmappedState.end()) {
+        std::cout << "ERROR! The local file with the channel status for HVUnmapped channels IS MISSING one of the "
+                     "following unmapped channel voltage status information:"
+                  << std::endl;
+        std::cout << chan003 << std::endl;
+        MissingChannels = true;
       }
     }
     //Now if any channel WAS missing, exit!
     if (MissingChannels) {
-      std::cout<<"!!!!\n"<<"Exiting now... please check the local HVUnmappedChannelState.dat and the mapfile you provided ("<<psuDetIdMapFile_<<")"<<std::endl;
+      std::cout << "!!!!\n"
+                << "Exiting now... please check the local HVUnmappedChannelState.dat and the mapfile you provided ("
+                << psuDetIdMapFile_ << ")" << std::endl;
       exit(1);
     }
-  }
-  else { //If the file HVUnmappedChannelState.dat does not exist, initialize the map to all OFF. 
-    //(see below for creating the file at the end of the execution with the latest state of unmapped channels. 
-    for (std::map<std::string, vector<uint32_t> >::iterator it=UnmappedPSUs.begin(); it!=UnmappedPSUs.end(); it++) {
-      std::string chan002=it->first+"channel002";
-      std::string chan003=it->first+"channel003";
-      UnmappedState[chan002]=false;
-      UnmappedState[chan003]=false;
+  } else {  //If the file HVUnmappedChannelState.dat does not exist, initialize the map to all OFF.
+    //(see below for creating the file at the end of the execution with the latest state of unmapped channels.
+    for (std::map<std::string, vector<uint32_t> >::iterator it = UnmappedPSUs.begin(); it != UnmappedPSUs.end(); it++) {
+      std::string chan002 = it->first + "channel002";
+      std::string chan003 = it->first + "channel003";
+      UnmappedState[chan002] = false;
+      UnmappedState[chan003] = false;
     }
   }
   //Get the HVCrosstalking map from the map, so that we can set know which PSU are crosstalking:
-  std::map<std::string,std::vector<uint32_t> > CrosstalkingPSUs=map_.getHVCrosstalkingMap();
+  std::map<std::string, std::vector<uint32_t> > CrosstalkingPSUs = map_.getHVCrosstalkingMap();
   //Check here if there is a file already, otherwise initialize to OFF all channels in these PSU!
   if (FileExists("HVCrosstalkingChannelState.dat")) {
-    std::cout<<"File HVCrosstalkingChannelState.dat exists!"<<std::endl;
+    std::cout << "File HVCrosstalkingChannelState.dat exists!" << std::endl;
     std::ifstream ifs("HVCrosstalkingChannelState.dat");
     string line;
-    while( getline( ifs, line ) ) {
-      if( !line.empty() ) {
-	// split the line and insert in the map
-	stringstream ss(line);
-	string PSUChannel;
-	bool HVStatus;
-	ss >> PSUChannel;
-	ss >> HVStatus;
-	//Extract the PSU from the PSUChannel (since the HVCrosstalking_Map uses PSU as key
-	std::string PSU=PSUChannel.substr(0,PSUChannel.size()-10);
-	//Look for the PSU in the unmapped map!
-	std::map<std::string,std::vector<uint32_t> >::iterator iter=CrosstalkingPSUs.find(PSU);
-	if (iter!=CrosstalkingPSUs.end()) {
-	  CrosstalkingState[PSUChannel]=HVStatus;
-	}
-	else {
-	  std::cout<<"WARNING!!! There are channels in the local file with the channel status for HVUnmapped channels, that ARE NOT CONSIDERED AS UNMAPPED in the current map!"<<std::endl;
-	}
+    while (getline(ifs, line)) {
+      if (!line.empty()) {
+        // split the line and insert in the map
+        stringstream ss(line);
+        string PSUChannel;
+        bool HVStatus;
+        ss >> PSUChannel;
+        ss >> HVStatus;
+        //Extract the PSU from the PSUChannel (since the HVCrosstalking_Map uses PSU as key
+        std::string PSU = PSUChannel.substr(0, PSUChannel.size() - 10);
+        //Look for the PSU in the unmapped map!
+        std::map<std::string, std::vector<uint32_t> >::iterator iter = CrosstalkingPSUs.find(PSU);
+        if (iter != CrosstalkingPSUs.end()) {
+          CrosstalkingState[PSUChannel] = HVStatus;
+        } else {
+          std::cout << "WARNING!!! There are channels in the local file with the channel status for HVUnmapped "
+                       "channels, that ARE NOT CONSIDERED AS UNMAPPED in the current map!"
+                    << std::endl;
+        }
       }
-    }//End of the while loop reading and initializing CrosstalkingState map from file
+    }  //End of the while loop reading and initializing CrosstalkingState map from file
     //Extra check:
     //Should check if there any HVCrosstalking channels in the map that are not listed in the local file!
-    bool MissingChannels=false;
-    for (std::map<std::string, vector<uint32_t> >::iterator it=CrosstalkingPSUs.begin(); it!=CrosstalkingPSUs.end(); it++) {
-      std::string chan002=it->first+"channel002";
-      std::string chan003=it->first+"channel003";
-      std::map<std::string,bool>::iterator iter=CrosstalkingState.find(chan002);
-      if (iter==CrosstalkingState.end()) {
-	std::cout<<"ERROR! The local file with the channel status for HVCrosstalking channels IS MISSING one of the following unmapped channel voltage status information:"<<std::endl;
-	std::cout<<chan002<<std::endl;
-	MissingChannels=true;
+    bool MissingChannels = false;
+    for (std::map<std::string, vector<uint32_t> >::iterator it = CrosstalkingPSUs.begin(); it != CrosstalkingPSUs.end();
+         it++) {
+      std::string chan002 = it->first + "channel002";
+      std::string chan003 = it->first + "channel003";
+      std::map<std::string, bool>::iterator iter = CrosstalkingState.find(chan002);
+      if (iter == CrosstalkingState.end()) {
+        std::cout << "ERROR! The local file with the channel status for HVCrosstalking channels IS MISSING one of the "
+                     "following unmapped channel voltage status information:"
+                  << std::endl;
+        std::cout << chan002 << std::endl;
+        MissingChannels = true;
       }
-      iter=CrosstalkingState.find(chan003);
-      if (iter==CrosstalkingState.end()) {
-	std::cout<<"ERROR! The local file with the channel status for HVCrosstalking channels IS MISSING one of the following unmapped channel voltage status information:"<<std::endl;
-	std::cout<<chan003<<std::endl;
-	MissingChannels=true;
+      iter = CrosstalkingState.find(chan003);
+      if (iter == CrosstalkingState.end()) {
+        std::cout << "ERROR! The local file with the channel status for HVCrosstalking channels IS MISSING one of the "
+                     "following unmapped channel voltage status information:"
+                  << std::endl;
+        std::cout << chan003 << std::endl;
+        MissingChannels = true;
       }
     }
     //Now if any channel WAS missing, exit!
     if (MissingChannels) {
-      std::cout<<"!!!!\n"<<"Exiting now... please check the local HVCrosstalkingChannelState.dat and the mapfile you provided ("<<psuDetIdMapFile_<<")"<<std::endl;
+      std::cout << "!!!!\n"
+                << "Exiting now... please check the local HVCrosstalkingChannelState.dat and the mapfile you provided ("
+                << psuDetIdMapFile_ << ")" << std::endl;
       exit(1);
     }
-  }
-  else { //If the file HVCrosstalkingChannelState.dat does not exist, initialize the map to all OFF. 
-    //(see below for creating the file at the end of the execution with the latest state of unmapped channels. 
-    for (std::map<std::string, vector<uint32_t> >::iterator it=CrosstalkingPSUs.begin(); it!=CrosstalkingPSUs.end(); it++) {
-      std::string chan002=it->first+"channel002";
-      std::string chan003=it->first+"channel003";
-      CrosstalkingState[chan002]=false;
-      CrosstalkingState[chan003]=false;
+  } else {  //If the file HVCrosstalkingChannelState.dat does not exist, initialize the map to all OFF.
+    //(see below for creating the file at the end of the execution with the latest state of unmapped channels.
+    for (std::map<std::string, vector<uint32_t> >::iterator it = CrosstalkingPSUs.begin(); it != CrosstalkingPSUs.end();
+         it++) {
+      std::string chan002 = it->first + "channel002";
+      std::string chan003 = it->first + "channel003";
+      CrosstalkingState[chan002] = false;
+      CrosstalkingState[chan003] = false;
     }
   }
-  
+
   if (debug_) {
     //print out the UnmappedState map:
-    std::cout<<"Printing the UnmappedChannelState initial map:"<<std::endl;
-    std::cout<<"PSUChannel\t\tHVON?(true or false)"<<std::endl;
-    for (std::map<std::string,bool>::iterator it=UnmappedState.begin(); it!=UnmappedState.end(); it++) {
-      std::cout<<it->first<<"\t\t"<<it->second<<std::endl;
+    std::cout << "Printing the UnmappedChannelState initial map:" << std::endl;
+    std::cout << "PSUChannel\t\tHVON?(true or false)" << std::endl;
+    for (std::map<std::string, bool>::iterator it = UnmappedState.begin(); it != UnmappedState.end(); it++) {
+      std::cout << it->first << "\t\t" << it->second << std::endl;
     }
     //print out the CrosstalkingState map:
-    std::cout<<"Printing the CrosstalkingChannelState initial map:"<<std::endl;
-    std::cout<<"PSUChannel\t\tHVON?(true or false)"<<std::endl;
-    for (std::map<std::string,bool>::iterator it=CrosstalkingState.begin(); it!=CrosstalkingState.end(); it++) {
-      std::cout<<it->first<<"\t\t"<<it->second<<std::endl;
+    std::cout << "Printing the CrosstalkingChannelState initial map:" << std::endl;
+    std::cout << "PSUChannel\t\tHVON?(true or false)" << std::endl;
+    for (std::map<std::string, bool>::iterator it = CrosstalkingState.begin(); it != CrosstalkingState.end(); it++) {
+      std::cout << it->first << "\t\t" << it->second << std::endl;
     }
   }
-  
+
   //Loop over the psuStruct (DB query results), lopping over the PSUChannels
-  //This will probably change int he future when we will change the query itself 
+  //This will probably change int he future when we will change the query itself
   //to report directly the detIDs associated with a channel
-  //Probably we will report in the query results the detID, the changeDate 
+  //Probably we will report in the query results the detID, the changeDate
   //and whether the channel is HV mapped, HV unmapped, HV crosstalking using a flag...
   for (unsigned int dp = 0; dp < psuStruct.dpname.size(); dp++) {
     //FIX ME:
     //Check if the following if condition can EVER be true!
-    std::string PSUChannel=psuStruct.dpname[dp];
+    std::string PSUChannel = psuStruct.dpname[dp];
     if (PSUChannel != "UNKNOWN") {
-
       // figure out the channel and the PSU individually
-      std::string Channel = PSUChannel.substr(PSUChannel.size()-10); //Channel is the channel, i.e. channel000, channel001 etc
-      std::string PSU = PSUChannel.substr(0,PSUChannel.size()-10);
-      
+      std::string Channel =
+          PSUChannel.substr(PSUChannel.size() - 10);  //Channel is the channel, i.e. channel000, channel001 etc
+      std::string PSU = PSUChannel.substr(0, PSUChannel.size() - 10);
+
       // Get the detIDs corresponding to the given PSU channel using the getDetID function of SiStripPsuDetIdMap.cc
       //NOTA BENE
       //Need to make sure the information is treated consistently here:
-      //The map by convention has 
+      //The map by convention has
       //detID-> channel002 or channel003 IF the channel is HV mapped,
       //detID->channel000 if it is not HV mapped
       //We want to differentiate the behavior depending on the status reported for the channel for channels that are unmapped!
@@ -908,10 +969,10 @@ void SiStripDetVOffBuilder::buildPSUdetIdMap(TimesAndValues & psuStruct, DetIdLi
 
       //Fixed SiStripPSUdetidMap.cc to make sure now getDetID gets the correct list of detIDs:
       //-for channels 000/001 all the detIDs connected to the PSU
-      //-for channels 002/003 HV1/HV2 modules only (exclusively) 
-      //UPDATE for HV channels: 
-      //actually fixed it to report also detIDs listed as 
-      //channel000 on the same supply of channel002 or channel003 
+      //-for channels 002/003 HV1/HV2 modules only (exclusively)
+      //UPDATE for HV channels:
+      //actually fixed it to report also detIDs listed as
+      //channel000 on the same supply of channel002 or channel003
       //and the crosstalking ones (channel999) too..
 
       //Get the detIDs associated with the DPNAME (i.e. PSUChannel) reported by the query
@@ -924,303 +985,332 @@ void SiStripDetVOffBuilder::buildPSUdetIdMap(TimesAndValues & psuStruct, DetIdLi
       //getHvDetID
 
       //Declaring the two vector needed for the HV case in this scope.
-      std::vector<uint32_t> unmapped_ids,crosstalking_ids;
+      std::vector<uint32_t> unmapped_ids, crosstalking_ids;
       bool LVCase;
       //LV CASE
-      if (Channel=="channel000" || Channel=="channel001") {
-	LVCase=true;
-	ids=map_.getLvDetID(PSU); //Since in the LV case only 1 list of detids is returned (unmapped and crosstalking are irrelevant for LV) return the vector directly
+      if (Channel == "channel000" || Channel == "channel001") {
+        LVCase = true;
+        ids = map_.getLvDetID(
+            PSU);  //Since in the LV case only 1 list of detids is returned (unmapped and crosstalking are irrelevant for LV) return the vector directly
       }
       //HV CASE
-      else { //if (Channel=="channel002" || Channel=="channel003") {
-	LVCase=false;
-	map_.getHvDetID(PSUChannel,ids,unmapped_ids,crosstalking_ids); //In the HV case since 3 vectors are filled, use reference parameters
+      else {  //if (Channel=="channel002" || Channel=="channel003") {
+        LVCase = false;
+        map_.getHvDetID(PSUChannel,
+                        ids,
+                        unmapped_ids,
+                        crosstalking_ids);  //In the HV case since 3 vectors are filled, use reference parameters
       }
 
-      if ( debug_ ) {
-	cout <<"dpname["<<dp<<"] = "<<PSUChannel<<", for time = "<<timeToStream(psuStruct.changeDate[dp])<<endl;
-	if (!ids.empty()) {
-	  if (Channel=="channel000" || Channel=="channel001") {
-	    cout << "Corresponding to LV (PSU-)matching detids: "<<endl;
-	    for (unsigned int i_detid=0;i_detid<ids.size();i_detid++) {
-	      cout<< ids[i_detid] << std::endl;
-	    }
-	  }
-	  else {
-	    cout << "Corresponding to straight HV matching detids: "<<endl;
-	    for (unsigned int i_detid=0;i_detid<ids.size();i_detid++) {
-	      cout<< ids[i_detid] << std::endl;
-	    }
-	  }
-	}
-	//The unmapped_ids and crosstalking_ids are only filled for HV channels!
-	if (!unmapped_ids.empty()) {
-	  cout << "Corresponding to HV unmapped (PSU-)matching detids: "<<endl;
-	  for (unsigned int i_detid=0;i_detid<unmapped_ids.size();i_detid++) {
-	    cout<< unmapped_ids[i_detid] << std::endl;
-	  }
-	}
-	if (!crosstalking_ids.empty()) {
-	  cout << "Corresponding to HV crosstalking (PSU-)matching detids: "<<endl;
-	  for (unsigned int i_detid=0;i_detid<crosstalking_ids.size();i_detid++) {
-	    cout<< crosstalking_ids[i_detid] << std::endl;
-	  }
-	}
+      if (debug_) {
+        cout << "dpname[" << dp << "] = " << PSUChannel << ", for time = " << timeToStream(psuStruct.changeDate[dp])
+             << endl;
+        if (!ids.empty()) {
+          if (Channel == "channel000" || Channel == "channel001") {
+            cout << "Corresponding to LV (PSU-)matching detids: " << endl;
+            for (unsigned int i_detid = 0; i_detid < ids.size(); i_detid++) {
+              cout << ids[i_detid] << std::endl;
+            }
+          } else {
+            cout << "Corresponding to straight HV matching detids: " << endl;
+            for (unsigned int i_detid = 0; i_detid < ids.size(); i_detid++) {
+              cout << ids[i_detid] << std::endl;
+            }
+          }
+        }
+        //The unmapped_ids and crosstalking_ids are only filled for HV channels!
+        if (!unmapped_ids.empty()) {
+          cout << "Corresponding to HV unmapped (PSU-)matching detids: " << endl;
+          for (unsigned int i_detid = 0; i_detid < unmapped_ids.size(); i_detid++) {
+            cout << unmapped_ids[i_detid] << std::endl;
+          }
+        }
+        if (!crosstalking_ids.empty()) {
+          cout << "Corresponding to HV crosstalking (PSU-)matching detids: " << endl;
+          for (unsigned int i_detid = 0; i_detid < crosstalking_ids.size(); i_detid++) {
+            cout << crosstalking_ids[i_detid] << std::endl;
+          }
+        }
       }
-	      
+
       //NOW implement the new logic using the detids, unmapped_detids, crosstalking_detids!
 
       //First check whether the channel we're looking at is turning OFF or turning ON!
-      
+
       //TURN OFF case:
       if (psuStruct.actualStatus[dp] != 1) {
-	//Behavior is different for LV vs HV channels:
-	//LV case:
-	if (LVCase) {
-	  //Turn OFF all: 
-	  //-positively matching 
-	  //-unmapped matching
-	  //-crosstalking
-	  //for the LV case all the detids are automatically reported in the ids vector
-	  //unmapped and crosstalking are only differentiated (relevant) for HV.
-	  if (!ids.empty()) {
-	    //debug variables increment
-	    ch0bad++;
-	    ch1bad++;
-	    
-	    //Create a pair with the relevant detIDs (vector) and its timestamp
-	    //And put it in the detidV vector of the detIdStruct that will contain all the 
-	    //results
-	    detIdStruct.detidV.push_back( std::make_pair(ids,psuStruct.changeDate[dp]) );
-	    
-	    //Set the status to OFF
-	    detIdStruct.StatusGood.push_back(false);
-	    
-	    //debug variable population
-	    numLvBad.insert(numLvBad.end(),ids.begin(),ids.end());
-
-	    //Set the flag for LV/HV:
-	    detIdStruct.isHV.push_back(0); //LV
-
-	    //Set the PSUChannel (I guess for debug purposes?)
-	    detIdStruct.psuName.push_back( PSUChannel );
-	  }
-	}
-	//HV case:
-	else { //if (!LVCase) {
-	  //Debug variables increment:
-	  if (!ids.empty() || !unmapped_ids.empty() || !crosstalking_ids.empty()) {
-	    if (Channel=="channel002") {
-	      ch2bad++;
-	    }
-	    else if (Channel=="channel003") {
-	      ch3bad++;
-	    }
-	  }
-	  //First sum the ids (positively matching detids) and the unmapped_ids (since both should be TURNED OFF):
-	  std::vector<uint32_t> OFFids;
-	  OFFids.insert(OFFids.end(),ids.begin(),ids.end()); //Add the ids (if any!)
-	  OFFids.insert(OFFids.end(),unmapped_ids.begin(),unmapped_ids.end()); //Add the unmapped_ids (if any!)
-	  //Now for the cross-talking ids this is a bit more complicated!
-	  if (!crosstalking_ids.empty()) {//This already means that the PSUChannel is one of the crosstalking ones (even if only a few modules in that PSU are showing crosstalking behavior both its channels have to be considered crosstalking of course!
-	    //Set the channel OFF in the CrosstalkingState map!
-	    CrosstalkingState[PSUChannel]=false; //Turn OFF the channel in the state map!
-	    
-	    //Need to check if both channels (HV1==channel002 or HV2==channel003) are OFF!
-	    if (!CrosstalkingState[PSUChannel.substr(0,PSUChannel.size()-1)+"2"] && !CrosstalkingState[PSUChannel.substr(0,PSUChannel.size()-1)+"3"]) { //if HV1 & HV2 both OFF (false)
-		OFFids.insert(OFFids.end(),crosstalking_ids.begin(),crosstalking_ids.end()); //Add the crosstalking_ids (if any!) since both HV1 and HV2 are OFF!
-		if (debug_) {
-		  std::cout<<"Adding the unmapped detids corresponding to (HV1/2 cross-talking) PSU "<<PSUChannel.substr(0,PSUChannel.size()-10)<<" to the list of detids turning OFF"<<std::endl;
-		}
-	    }
-	  }
-	  //Handle the crosstalking channel by setting it to OFF in the CrosstalkingState map!
-	  if (!unmapped_ids.empty()) {//This already means that the PSUChannel is one of the unmapped ones (even if only a few modules in that PSU are unmapped both its channels have to be considered crosstalking of course!
-	    UnmappedState[PSUChannel]=false; //Turn OFF the channel in the state map!
-	  }
-	  if (!OFFids.empty()) {
-	    //Create a pair with the relevant detIDs (vector) and its timestamp
-	    //And put it in the detidV vector of the detIdStruct that will contain all the 
-	    //results
-	    
-	    //Going OFF HV:
-	    //report not only ids, but also unmapped_ids.
-	    //have to handle crosstalking_ids here... (only OFF if they corresponding PSU HV1/HV2 is off already...
-	    //then add all three vectors to the pair below...
-	    detIdStruct.detidV.push_back( std::make_pair(OFFids,psuStruct.changeDate[dp]) );
-	    
-	    //Set the status to OFF
-	    detIdStruct.StatusGood.push_back(false);
-	    
-	    //debug variable population
-	    numHvBad.insert(numHvBad.end(),ids.begin(),ids.end());
-
-	    //Set the flag for LV/HV:
-	    detIdStruct.isHV.push_back(1); //HV
-
-	    //Set the PSUChannel (I guess for debug purposes?)
-	    detIdStruct.psuName.push_back( PSUChannel );
-	  }
-	}
+        //Behavior is different for LV vs HV channels:
+        //LV case:
+        if (LVCase) {
+          //Turn OFF all:
+          //-positively matching
+          //-unmapped matching
+          //-crosstalking
+          //for the LV case all the detids are automatically reported in the ids vector
+          //unmapped and crosstalking are only differentiated (relevant) for HV.
+          if (!ids.empty()) {
+            //debug variables increment
+            ch0bad++;
+            ch1bad++;
+
+            //Create a pair with the relevant detIDs (vector) and its timestamp
+            //And put it in the detidV vector of the detIdStruct that will contain all the
+            //results
+            detIdStruct.detidV.push_back(std::make_pair(ids, psuStruct.changeDate[dp]));
+
+            //Set the status to OFF
+            detIdStruct.StatusGood.push_back(false);
+
+            //debug variable population
+            numLvBad.insert(numLvBad.end(), ids.begin(), ids.end());
+
+            //Set the flag for LV/HV:
+            detIdStruct.isHV.push_back(0);  //LV
+
+            //Set the PSUChannel (I guess for debug purposes?)
+            detIdStruct.psuName.push_back(PSUChannel);
+          }
+        }
+        //HV case:
+        else {  //if (!LVCase) {
+          //Debug variables increment:
+          if (!ids.empty() || !unmapped_ids.empty() || !crosstalking_ids.empty()) {
+            if (Channel == "channel002") {
+              ch2bad++;
+            } else if (Channel == "channel003") {
+              ch3bad++;
+            }
+          }
+          //First sum the ids (positively matching detids) and the unmapped_ids (since both should be TURNED OFF):
+          std::vector<uint32_t> OFFids;
+          OFFids.insert(OFFids.end(), ids.begin(), ids.end());                    //Add the ids (if any!)
+          OFFids.insert(OFFids.end(), unmapped_ids.begin(), unmapped_ids.end());  //Add the unmapped_ids (if any!)
+          //Now for the cross-talking ids this is a bit more complicated!
+          if (!crosstalking_ids
+                   .empty()) {  //This already means that the PSUChannel is one of the crosstalking ones (even if only a few modules in that PSU are showing crosstalking behavior both its channels have to be considered crosstalking of course!
+            //Set the channel OFF in the CrosstalkingState map!
+            CrosstalkingState[PSUChannel] = false;  //Turn OFF the channel in the state map!
+
+            //Need to check if both channels (HV1==channel002 or HV2==channel003) are OFF!
+            if (!CrosstalkingState[PSUChannel.substr(0, PSUChannel.size() - 1) + "2"] &&
+                !CrosstalkingState[PSUChannel.substr(0, PSUChannel.size() - 1) + "3"]) {  //if HV1 & HV2 both OFF (false)
+              OFFids.insert(
+                  OFFids.end(),
+                  crosstalking_ids.begin(),
+                  crosstalking_ids.end());  //Add the crosstalking_ids (if any!) since both HV1 and HV2 are OFF!
+              if (debug_) {
+                std::cout << "Adding the unmapped detids corresponding to (HV1/2 cross-talking) PSU "
+                          << PSUChannel.substr(0, PSUChannel.size() - 10) << " to the list of detids turning OFF"
+                          << std::endl;
+              }
+            }
+          }
+          //Handle the crosstalking channel by setting it to OFF in the CrosstalkingState map!
+          if (!unmapped_ids
+                   .empty()) {  //This already means that the PSUChannel is one of the unmapped ones (even if only a few modules in that PSU are unmapped both its channels have to be considered crosstalking of course!
+            UnmappedState[PSUChannel] = false;  //Turn OFF the channel in the state map!
+          }
+          if (!OFFids.empty()) {
+            //Create a pair with the relevant detIDs (vector) and its timestamp
+            //And put it in the detidV vector of the detIdStruct that will contain all the
+            //results
+
+            //Going OFF HV:
+            //report not only ids, but also unmapped_ids.
+            //have to handle crosstalking_ids here... (only OFF if they corresponding PSU HV1/HV2 is off already...
+            //then add all three vectors to the pair below...
+            detIdStruct.detidV.push_back(std::make_pair(OFFids, psuStruct.changeDate[dp]));
+
+            //Set the status to OFF
+            detIdStruct.StatusGood.push_back(false);
+
+            //debug variable population
+            numHvBad.insert(numHvBad.end(), ids.begin(), ids.end());
+
+            //Set the flag for LV/HV:
+            detIdStruct.isHV.push_back(1);  //HV
+
+            //Set the PSUChannel (I guess for debug purposes?)
+            detIdStruct.psuName.push_back(PSUChannel);
+          }
+        }
       }
       //TURNING ON CASE
       else {
-	//Implement the rest of the logic!
-	//Behavior is different for LV vs HV channels:
-	//LV case:
-	if (LVCase) {
-	  //Turn ON all (PSU)matching detids: 
-	  //for the LV case all the detids are automatically reported in the ids vector
-	  //unmapped and crosstalking are only differentiated (relevant) for HV.
-	  if (!ids.empty()) {
-	    //Create a pair with the relevant detIDs (vector) and its timestamp
-	    //And put it in the detidV vector of the detIdStruct that will contain all the 
-	    //results
-	    detIdStruct.detidV.push_back( std::make_pair(ids,psuStruct.changeDate[dp]) );
-	    
-	    //Set the status to ON
-	    detIdStruct.StatusGood.push_back(true);
-	    
-	    //Set the flag for LV/HV:
-	    detIdStruct.isHV.push_back(0); //LV
-
-	    //Set the PSUChannel (I guess for debug purposes?)
-	    detIdStruct.psuName.push_back( PSUChannel );
-	  }
-	}
-	//HV case:
-	else { //if (!LVCase) {
-	  //First sum the ids (positively matching detids) and the crosstalking_ids (since all ids on a crosstalking PSU should be TURNED ON when at least one HV channel is ON):
-	  std::vector<uint32_t> ONids;
-	  ONids.insert(ONids.end(),ids.begin(),ids.end()); //Add the ids (if any!)
-	  ONids.insert(ONids.end(),crosstalking_ids.begin(),crosstalking_ids.end()); //Add the crosstalking_ids (if any!)
-	  //Now for the unmapped ids this is a bit more complicated!
-	  if (!unmapped_ids.empty()) {//This already means that the PSUChannel is one of the unmapped ones (even if only a few modules in that PSU are unmapped both its channels have to be considered unmapped of course!
-	    //Set the HV1 channel on in the UnmappedState map!
-	    UnmappedState[PSUChannel]=true; //Turn ON the channel in the state map!
-
-	    //Need to check if BOTH channels (HV1==channel002 or HV2==channel003) are ON!
-	    if (UnmappedState[PSUChannel.substr(0,PSUChannel.size()-1)+"2"] && UnmappedState[PSUChannel.substr(0,PSUChannel.size()-1)+"3"]) { //if HV1 & HV2 are both ON (true)
-	      ONids.insert(ONids.end(),unmapped_ids.begin(),unmapped_ids.end()); //Add the unmapped_ids (if any!) since both HV1 and HV2 are ON!
-	      if (debug_) {
-		  std::cout<<"Adding the detids corresponding to HV-unmapped PSU "<<PSUChannel.substr(0,PSUChannel.size()-10)<<" to the list of detids turning ON"<<std::endl;
-		}
-	    }
-	  }
-	  //Handle the crosstalking channel by setting it to OFF in the CrosstalkingState map!
-	  if (!crosstalking_ids.empty()) {//This already means that the PSUChannel is one of the crosstalking ones (even if only a few modules in that PSU are showing crosstalking behavior both its channels have to be considered crosstalking of course!
-	    CrosstalkingState[PSUChannel]=true; //Turn ON the channel in the state map!
-	  }
-	  if (!ONids.empty()) {
-	    //Create a pair with the relevant detIDs (vector) and its timestamp
-	    //And put it in the detidV vector of the detIdStruct that will contain all the 
-	    //results
-	    
-	    //Going OFF HV:
-	    //report not only ids, but also unmapped_ids.
-	    //have to handle crosstalking_ids here... (only OFF if they corresponding PSU HV1/HV2 is off already...
-	    //then add all three vectors to the pair below...
-	    detIdStruct.detidV.push_back( std::make_pair(ONids,psuStruct.changeDate[dp]) );
-	    
-	    //Set the status to ON
-	    detIdStruct.StatusGood.push_back(true);
-	    
-	    //Set the flag for LV/HV:
-	    detIdStruct.isHV.push_back(1); //HV
-
-	    //Set the PSUChannel (I guess for debug purposes?)
-	    detIdStruct.psuName.push_back( PSUChannel );
-	  }
-	}
+        //Implement the rest of the logic!
+        //Behavior is different for LV vs HV channels:
+        //LV case:
+        if (LVCase) {
+          //Turn ON all (PSU)matching detids:
+          //for the LV case all the detids are automatically reported in the ids vector
+          //unmapped and crosstalking are only differentiated (relevant) for HV.
+          if (!ids.empty()) {
+            //Create a pair with the relevant detIDs (vector) and its timestamp
+            //And put it in the detidV vector of the detIdStruct that will contain all the
+            //results
+            detIdStruct.detidV.push_back(std::make_pair(ids, psuStruct.changeDate[dp]));
+
+            //Set the status to ON
+            detIdStruct.StatusGood.push_back(true);
+
+            //Set the flag for LV/HV:
+            detIdStruct.isHV.push_back(0);  //LV
+
+            //Set the PSUChannel (I guess for debug purposes?)
+            detIdStruct.psuName.push_back(PSUChannel);
+          }
+        }
+        //HV case:
+        else {  //if (!LVCase) {
+          //First sum the ids (positively matching detids) and the crosstalking_ids (since all ids on a crosstalking PSU should be TURNED ON when at least one HV channel is ON):
+          std::vector<uint32_t> ONids;
+          ONids.insert(ONids.end(), ids.begin(), ids.end());  //Add the ids (if any!)
+          ONids.insert(
+              ONids.end(), crosstalking_ids.begin(), crosstalking_ids.end());  //Add the crosstalking_ids (if any!)
+          //Now for the unmapped ids this is a bit more complicated!
+          if (!unmapped_ids
+                   .empty()) {  //This already means that the PSUChannel is one of the unmapped ones (even if only a few modules in that PSU are unmapped both its channels have to be considered unmapped of course!
+            //Set the HV1 channel on in the UnmappedState map!
+            UnmappedState[PSUChannel] = true;  //Turn ON the channel in the state map!
+
+            //Need to check if BOTH channels (HV1==channel002 or HV2==channel003) are ON!
+            if (UnmappedState[PSUChannel.substr(0, PSUChannel.size() - 1) + "2"] &&
+                UnmappedState[PSUChannel.substr(0, PSUChannel.size() - 1) + "3"]) {  //if HV1 & HV2 are both ON (true)
+              ONids.insert(ONids.end(),
+                           unmapped_ids.begin(),
+                           unmapped_ids.end());  //Add the unmapped_ids (if any!) since both HV1 and HV2 are ON!
+              if (debug_) {
+                std::cout << "Adding the detids corresponding to HV-unmapped PSU "
+                          << PSUChannel.substr(0, PSUChannel.size() - 10) << " to the list of detids turning ON"
+                          << std::endl;
+              }
+            }
+          }
+          //Handle the crosstalking channel by setting it to OFF in the CrosstalkingState map!
+          if (!crosstalking_ids
+                   .empty()) {  //This already means that the PSUChannel is one of the crosstalking ones (even if only a few modules in that PSU are showing crosstalking behavior both its channels have to be considered crosstalking of course!
+            CrosstalkingState[PSUChannel] = true;  //Turn ON the channel in the state map!
+          }
+          if (!ONids.empty()) {
+            //Create a pair with the relevant detIDs (vector) and its timestamp
+            //And put it in the detidV vector of the detIdStruct that will contain all the
+            //results
+
+            //Going OFF HV:
+            //report not only ids, but also unmapped_ids.
+            //have to handle crosstalking_ids here... (only OFF if they corresponding PSU HV1/HV2 is off already...
+            //then add all three vectors to the pair below...
+            detIdStruct.detidV.push_back(std::make_pair(ONids, psuStruct.changeDate[dp]));
+
+            //Set the status to ON
+            detIdStruct.StatusGood.push_back(true);
+
+            //Set the flag for LV/HV:
+            detIdStruct.isHV.push_back(1);  //HV
+
+            //Set the PSUChannel (I guess for debug purposes?)
+            detIdStruct.psuName.push_back(PSUChannel);
+          }
+        }
       }
-    }//End of if dpname not "UNKNOWN" 
+    }  //End of if dpname not "UNKNOWN"
     else {
       //if (debug) {
       //std::cout<<"PSU Channel name WAS NOT RECOGNIZED"<<std::endl;
       //}
       detIdStruct.notMatched++;
     }
-  }//End of the loop over all PSUChannels reported by the DB query.
+  }  //End of the loop over all PSUChannels reported by the DB query.
   //At this point we need to (over)write the 2 files that will keep the HVUnmapped and HVCrosstalking channels status:
   std::ofstream ofsUnmapped("HVUnmappedChannelState.dat");
-  for (std::map<std::string,bool>::iterator it=UnmappedState.begin(); it!=UnmappedState.end(); it++) {
-    ofsUnmapped<<it->first<<"\t"<<it->second<<std::endl;
+  for (std::map<std::string, bool>::iterator it = UnmappedState.begin(); it != UnmappedState.end(); it++) {
+    ofsUnmapped << it->first << "\t" << it->second << std::endl;
   }
   std::ofstream ofsCrosstalking("HVCrosstalkingChannelState.dat");
-  for (std::map<std::string,bool>::iterator it=CrosstalkingState.begin(); it!=CrosstalkingState.end(); it++) {
-    ofsCrosstalking<<it->first<<"\t"<<it->second<<std::endl;
+  for (std::map<std::string, bool>::iterator it = CrosstalkingState.begin(); it != CrosstalkingState.end(); it++) {
+    ofsCrosstalking << it->first << "\t" << it->second << std::endl;
   }
 
   removeDuplicates(numLvBad);
   removeDuplicates(numHvBad);
 
-
   // useful debugging stuff!
-  if( debug_ ) {
-    std::cout << "Number of channels that turned OFF in this O2O interval"<<std::endl;
+  if (debug_) {
+    std::cout << "Number of channels that turned OFF in this O2O interval" << std::endl;
     std::cout << "Channel000 = " << ch0bad << " Channel001 = " << ch1bad << std::endl;
     std::cout << "Channel002 = " << ch2bad << " Channel003 = " << ch3bad << std::endl;
     std::cout << "Number of LV detIDs that turned OFF in this O2O interval = " << numLvBad.size() << std::endl;
     std::cout << "Number of HV detIDs that turned OFF in this O2O interval = " << numHvBad.size() << std::endl;
   }
 
-  LogTrace("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::" << __func__ << "]: Number of PSUs retrieved from DB with map information    " << detIdStruct.detidV.size();
-  LogTrace("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::" << __func__ << "]: Number of PSUs retrieved from DB with no map information " << detIdStruct.notMatched;
-  
+  LogTrace("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::" << __func__
+                                    << "]: Number of PSUs retrieved from DB with map information    "
+                                    << detIdStruct.detidV.size();
+  LogTrace("SiStripDetVOffBuilder") << "[SiStripDetVOffBuilder::" << __func__
+                                    << "]: Number of PSUs retrieved from DB with no map information "
+                                    << detIdStruct.notMatched;
+
   unsigned int dupCount = 0;
   for (unsigned int t = 0; t < numLvBad.size(); t++) {
-    std::vector<unsigned int>::iterator iter = std::find(numHvBad.begin(),numHvBad.end(),numLvBad[t]);
-    if (iter != numHvBad.end()) {dupCount++;}
+    std::vector<unsigned int>::iterator iter = std::find(numHvBad.begin(), numHvBad.end(), numLvBad[t]);
+    if (iter != numHvBad.end()) {
+      dupCount++;
+    }
   }
-  if( debug_ ) std::cout << "Number of channels for which LV & HV turned OFF in this O2O interval = " << dupCount << std::endl;
-  
+  if (debug_)
+    std::cout << "Number of channels for which LV & HV turned OFF in this O2O interval = " << dupCount << std::endl;
 }
 
-void SiStripDetVOffBuilder::setPayloadStats(const uint32_t afterV, const uint32_t numAdded, const uint32_t numRemoved)
-{
-  std::vector<uint32_t> pStats(3,0);
+void SiStripDetVOffBuilder::setPayloadStats(const uint32_t afterV, const uint32_t numAdded, const uint32_t numRemoved) {
+  std::vector<uint32_t> pStats(3, 0);
   pStats.push_back(afterV);
   pStats.push_back(numAdded);
   pStats.push_back(numRemoved);
   payloadStats.push_back(pStats);
 }
 
-pair<int, int> SiStripDetVOffBuilder::extractDetIdVector( const unsigned int i, SiStripDetVOff * modV, DetIdListTimeAndStatus & detIdStruct )
-{
+pair<int, int> SiStripDetVOffBuilder::extractDetIdVector(const unsigned int i,
+                                                         SiStripDetVOff* modV,
+                                                         DetIdListTimeAndStatus& detIdStruct) {
   // set the LV and HV off flags ready for storing
   int lv_off = -1, hv_off = -1;
-  if (detIdStruct.isHV[i] == 0) {lv_off = !(detIdStruct.StatusGood[i]);}
+  if (detIdStruct.isHV[i] == 0) {
+    lv_off = !(detIdStruct.StatusGood[i]);
+  }
   if (detIdStruct.isHV[i] == 1) {
     hv_off = !(detIdStruct.StatusGood[i]);
 
     // TESTING WITHOUT THE FIX
     // -----------------------
 
-    if( psuDetIdMapFile_.empty() ) {
+    if (psuDetIdMapFile_.empty()) {
       // temporary fix to handle the fact that we don't know which HV channel the detIDs are associated to
       if (i > 0) {
-	std::string iChannel = detIdStruct.psuName[i].substr( (detIdStruct.psuName[i].size()-3) );
-	std::string iPsu = detIdStruct.psuName[i].substr(0, (detIdStruct.psuName[i].size()-3) );
-	if (iChannel == "002" || iChannel == "003") {
-	  bool lastStatusOfOtherChannel = true;
-	  for (unsigned int j = 0; j < i; j++) {
-	    std::string jPsu = detIdStruct.psuName[j].substr(0, (detIdStruct.psuName[j].size()-3) );
-	    std::string jChannel = detIdStruct.psuName[j].substr( (detIdStruct.psuName[j].size()-3) );
-	    if (iPsu == jPsu && iChannel != jChannel && (jChannel == "002" || jChannel == "003")) {
-	      if( debug_ ) cout << "psu["<<i<<"] = " << detIdStruct.psuName[i] << " with status = " << detIdStruct.StatusGood[i] << " and psu["<<j<<"] = " << detIdStruct.psuName[j] << " with status " << detIdStruct.StatusGood[j] << endl;
-	      lastStatusOfOtherChannel = detIdStruct.StatusGood[j];
-	    }
-	  }
-	  if (detIdStruct.StatusGood[i] != lastStatusOfOtherChannel) {
-	    if( debug_ ) cout << "turning off hv" << endl;
-	    hv_off = 1;
-	  }
-	}
+        std::string iChannel = detIdStruct.psuName[i].substr((detIdStruct.psuName[i].size() - 3));
+        std::string iPsu = detIdStruct.psuName[i].substr(0, (detIdStruct.psuName[i].size() - 3));
+        if (iChannel == "002" || iChannel == "003") {
+          bool lastStatusOfOtherChannel = true;
+          for (unsigned int j = 0; j < i; j++) {
+            std::string jPsu = detIdStruct.psuName[j].substr(0, (detIdStruct.psuName[j].size() - 3));
+            std::string jChannel = detIdStruct.psuName[j].substr((detIdStruct.psuName[j].size() - 3));
+            if (iPsu == jPsu && iChannel != jChannel && (jChannel == "002" || jChannel == "003")) {
+              if (debug_)
+                cout << "psu[" << i << "] = " << detIdStruct.psuName[i]
+                     << " with status = " << detIdStruct.StatusGood[i] << " and psu[" << j
+                     << "] = " << detIdStruct.psuName[j] << " with status " << detIdStruct.StatusGood[j] << endl;
+              lastStatusOfOtherChannel = detIdStruct.StatusGood[j];
+            }
+          }
+          if (detIdStruct.StatusGood[i] != lastStatusOfOtherChannel) {
+            if (debug_)
+              cout << "turning off hv" << endl;
+            hv_off = 1;
+          }
+        }
       }
     }
 
     // -----------------------
-
   }
 
   return make_pair(hv_off, lv_off);
diff --git a/CalibTracker/SiStripDCS/src/SiStripPsuDetIdMap.cc b/CalibTracker/SiStripDCS/src/SiStripPsuDetIdMap.cc
index edf10101c48cf..08c82010f7a7f 100644
--- a/CalibTracker/SiStripDCS/src/SiStripPsuDetIdMap.cc
+++ b/CalibTracker/SiStripDCS/src/SiStripPsuDetIdMap.cc
@@ -17,40 +17,49 @@
 using namespace sistrip;
 
 // only one constructor
-SiStripPsuDetIdMap::SiStripPsuDetIdMap() { LogTrace("SiStripPsuDetIdMap") << "[SiStripPsuDetIdMap::" << __func__ << "] Constructing ..."; }
+SiStripPsuDetIdMap::SiStripPsuDetIdMap() {
+  LogTrace("SiStripPsuDetIdMap") << "[SiStripPsuDetIdMap::" << __func__ << "] Constructing ...";
+}
 // destructor
-SiStripPsuDetIdMap::~SiStripPsuDetIdMap() {LogTrace("SiStripPsuDetIdMap") << "[SiStripPsuDetIdMap::" << __func__ << "] Destructing ..."; }
+SiStripPsuDetIdMap::~SiStripPsuDetIdMap() {
+  LogTrace("SiStripPsuDetIdMap") << "[SiStripPsuDetIdMap::" << __func__ << "] Destructing ...";
+}
 
 // Build PSU-DETID map
-void SiStripPsuDetIdMap::BuildMap( const std::string & mapFile, const bool debug )
-{
+void SiStripPsuDetIdMap::BuildMap(const std::string& mapFile, const bool debug) {
   BuildMap(mapFile, debug, LVMap, HVMap, HVUnmapped_Map, HVCrosstalking_Map);
 }
 
-void SiStripPsuDetIdMap::BuildMap( const std::string & mapFile, std::vector<std::pair<uint32_t,std::string> > & rawmap) {
-  //This method is a remnant of the old method, that provided a vector type of map, based on the 
+void SiStripPsuDetIdMap::BuildMap(const std::string& mapFile, std::vector<std::pair<uint32_t, std::string> >& rawmap) {
+  //This method is a remnant of the old method, that provided a vector type of map, based on the
   //raw reading of a file, with no processing.
   //FIXME:
-  //This is not currently used, but I think we could slim this down to just a vector with 
+  //This is not currently used, but I think we could slim this down to just a vector with
   //the detIDs since the PSUChannel part of the excludedlist (if it ever is in a file) is never used!
   edm::FileInPath file(mapFile.c_str());
-  std::ifstream ifs( file.fullPath().c_str() );
+  std::ifstream ifs(file.fullPath().c_str());
   string line;
-  while( getline( ifs, line ) ) {
-    if( line != "" ) {
+  while (getline(ifs, line)) {
+    if (!line.empty()) {
       // split the line and insert in the map
       stringstream ss(line);
       string PSUChannel;
       uint32_t detId;
       ss >> detId;
       ss >> PSUChannel;
-      rawmap.push_back(std::make_pair(detId, PSUChannel) );
+      rawmap.push_back(std::make_pair(detId, PSUChannel));
     }
   }
 }
 
 //The following is the currently used method (called from SiStripDetVOffBuilder::buildPSUdetIdMap)
-void SiStripPsuDetIdMap::BuildMap( const std::string & mapFile, const bool debug, PsuDetIdMap & LVmap, PsuDetIdMap & HVmap,PsuDetIdMap & HVUnmappedmap,PsuDetIdMap & HVCrosstalkingmap ) //Maybe it would be nicer to return the map instead of using a reference...
+void SiStripPsuDetIdMap::BuildMap(
+    const std::string& mapFile,
+    const bool debug,
+    PsuDetIdMap& LVmap,
+    PsuDetIdMap& HVmap,
+    PsuDetIdMap& HVUnmappedmap,
+    PsuDetIdMap& HVCrosstalkingmap)  //Maybe it would be nicer to return the map instead of using a reference...
 {
   //This method reads the map from the mapfile indicated in the cfg
   //It populates the 4 maps (private data members of the SiStripPSUDetIdMap in question) (all maps are std::map<std::string,uint32_t > ):
@@ -58,13 +67,13 @@ void SiStripPsuDetIdMap::BuildMap( const std::string & mapFile, const bool debug
   //HVMap
   //HVUnmapped_Map
   //HVCrosstalking_Map
-  //These maps are accessed, based on the LV/HV case, to extract the detIDs connected to a given PSUChannel... 
+  //These maps are accessed, based on the LV/HV case, to extract the detIDs connected to a given PSUChannel...
   //see the getDetIDs method...
   edm::FileInPath file(mapFile.c_str());
-  std::ifstream ifs( file.fullPath().c_str() );
+  std::ifstream ifs(file.fullPath().c_str());
   string line;
-  while( getline( ifs, line ) ) {
-    if( line != "" ) {
+  while (getline(ifs, line)) {
+    if (!line.empty()) {
       // split the line and insert in the map
       stringstream ss(line);
       string PSUChannel;
@@ -74,21 +83,21 @@ void SiStripPsuDetIdMap::BuildMap( const std::string & mapFile, const bool debug
       //Old "vector of pairs" map!
       //map.push_back( std::make_pair(detId, dpName) );//This "map" is normally the pgMap of the map of which we are executing BuildMap()...
       //Using a map to make the look-up easy and avoid lots of lookup loops.
-      std::string PSU=PSUChannel.substr(0,PSUChannel.size()-10);
-      std::string Channel=PSUChannel.substr(PSUChannel.size()-10);
-      LVmap[PSU].push_back(detId); // LVmap uses simply the PSU since there is no channel distinction necessary
-      if (Channel=="channel000") {
-	HVUnmappedmap[PSU].push_back(detId); //Populate HV Unmapped map, by PSU listing all detids unmapped in that PSU (not necessarily all will be unmapped)
-      }
-      else if (Channel=="channel999") {
-	HVCrosstalkingmap[PSU].push_back(detId); //Populate HV Crosstalking map, by PSU listing all detids crosstalking in that PSU (usually all will be unmapped)
-      }
-      else {
-	HVmap[PSUChannel].push_back(detId); //HV map for HV mapped channels, populated by PSU channel!
+      std::string PSU = PSUChannel.substr(0, PSUChannel.size() - 10);
+      std::string Channel = PSUChannel.substr(PSUChannel.size() - 10);
+      LVmap[PSU].push_back(detId);  // LVmap uses simply the PSU since there is no channel distinction necessary
+      if (Channel == "channel000") {
+        HVUnmappedmap[PSU].push_back(
+            detId);  //Populate HV Unmapped map, by PSU listing all detids unmapped in that PSU (not necessarily all will be unmapped)
+      } else if (Channel == "channel999") {
+        HVCrosstalkingmap[PSU].push_back(
+            detId);  //Populate HV Crosstalking map, by PSU listing all detids crosstalking in that PSU (usually all will be unmapped)
+      } else {
+        HVmap[PSUChannel].push_back(detId);  //HV map for HV mapped channels, populated by PSU channel!
       }
     }
   }
-  
+
   //Remove duplicates for all 4 maps
   for (PsuDetIdMap::iterator psu = LVMap.begin(); psu != LVMap.end(); psu++) {
     RemoveDuplicateDetIDs(psu->second);
@@ -104,76 +113,78 @@ void SiStripPsuDetIdMap::BuildMap( const std::string & mapFile, const bool debug
   }
   if (debug) {
     //Print out all the 4 maps:
-    std::cout<<"Dumping the LV map"<<std::endl;
-    std::cout<<"PSU->detids"<<std::endl;
+    std::cout << "Dumping the LV map" << std::endl;
+    std::cout << "PSU->detids" << std::endl;
     for (PsuDetIdMap::iterator psu = LVMap.begin(); psu != LVMap.end(); psu++) {
-      std::cout<<psu->first<<" corresponds to following detids"<<endl;
-      for (unsigned int i=0; i<psu->second.size(); i++) {
-	std::cout<<"\t\t"<<psu->second[i]<<std::endl;
+      std::cout << psu->first << " corresponds to following detids" << endl;
+      for (unsigned int i = 0; i < psu->second.size(); i++) {
+        std::cout << "\t\t" << psu->second[i] << std::endl;
       }
     }
-    std::cout<<"Dumping the HV map for HV mapped channels"<<std::endl;
-    std::cout<<"PSUChannel->detids"<<std::endl;
+    std::cout << "Dumping the HV map for HV mapped channels" << std::endl;
+    std::cout << "PSUChannel->detids" << std::endl;
     for (PsuDetIdMap::iterator psuchan = HVMap.begin(); psuchan != HVMap.end(); psuchan++) {
-      std::cout<<psuchan->first<<" corresponds to following detids"<<endl;
-      for (unsigned int i=0; i<psuchan->second.size(); i++) {
-	std::cout<<"\t\t"<<psuchan->second[i]<<std::endl;
+      std::cout << psuchan->first << " corresponds to following detids" << endl;
+      for (unsigned int i = 0; i < psuchan->second.size(); i++) {
+        std::cout << "\t\t" << psuchan->second[i] << std::endl;
       }
     }
-    std::cout<<"Dumping the HV map for HV UNmapped channels"<<std::endl;
-    std::cout<<"PSU->detids"<<std::endl;
+    std::cout << "Dumping the HV map for HV UNmapped channels" << std::endl;
+    std::cout << "PSU->detids" << std::endl;
     for (PsuDetIdMap::iterator psu = HVUnmapped_Map.begin(); psu != HVUnmapped_Map.end(); psu++) {
-      std::cout<<psu->first<<" corresponds to following detids"<<endl;
-      for (unsigned int i=0; i<psu->second.size(); i++) {
-	std::cout<<"\t\t"<<psu->second[i]<<std::endl;
+      std::cout << psu->first << " corresponds to following detids" << endl;
+      for (unsigned int i = 0; i < psu->second.size(); i++) {
+        std::cout << "\t\t" << psu->second[i] << std::endl;
       }
     }
-    std::cout<<"Dumping the HV map for HV Crosstalking channels"<<std::endl;
-    std::cout<<"PSU->detids"<<std::endl;
+    std::cout << "Dumping the HV map for HV Crosstalking channels" << std::endl;
+    std::cout << "PSU->detids" << std::endl;
     for (PsuDetIdMap::iterator psu = HVCrosstalking_Map.begin(); psu != HVCrosstalking_Map.end(); psu++) {
-      std::cout<<psu->first<<" corresponds to following detids"<<endl;
-      for (unsigned int i=0; i<psu->second.size(); i++) {
-	std::cout<<"\t\t"<<psu->second[i]<<std::endl;
+      std::cout << psu->first << " corresponds to following detids" << endl;
+      for (unsigned int i = 0; i < psu->second.size(); i++) {
+        std::cout << "\t\t" << psu->second[i] << std::endl;
       }
     }
     //Could add here consistency checks against the list of detIDs for Strip or Pixels
-    //Number of total detIDs LVMapped, HV Mapped, HVunmapped, HV crosstalking... 
+    //Number of total detIDs LVMapped, HV Mapped, HVunmapped, HV crosstalking...
   }
 }
 
-void SiStripPsuDetIdMap::RemoveDuplicateDetIDs(std::vector<uint32_t> & detids) {
+void SiStripPsuDetIdMap::RemoveDuplicateDetIDs(std::vector<uint32_t>& detids) {
   //Function to remove duplicates from a vector of detids
-  if (!detids.empty()) { //Leave empty vector alone ;)
-    std::sort(detids.begin(),detids.end());
-    std::vector<uint32_t>::iterator it = std::unique(detids.begin(),detids.end());
-    detids.resize( it - detids.begin() );
+  if (!detids.empty()) {  //Leave empty vector alone ;)
+    std::sort(detids.begin(), detids.end());
+    std::vector<uint32_t>::iterator it = std::unique(detids.begin(), detids.end());
+    detids.resize(it - detids.begin());
   }
 }
 
 std::vector<uint32_t> SiStripPsuDetIdMap::getLvDetID(std::string PSU) {
-  //Function that returns a vector with all detids associated with a PSU 
+  //Function that returns a vector with all detids associated with a PSU
   //(no channel information is saved in the map since it is not relevant for LV!)
-  if (LVMap.find(PSU)!=LVMap.end()) {
+  if (LVMap.find(PSU) != LVMap.end()) {
     return LVMap[PSU];
-  }
-  else {
+  } else {
     std::vector<uint32_t> detids;
     return detids;
   }
 }
 
-void SiStripPsuDetIdMap::getHvDetID(std::string PSUChannel, std::vector<uint32_t> & ids, std::vector<uint32_t> & unmapped_ids, std::vector<uint32_t> & crosstalking_ids ) {
+void SiStripPsuDetIdMap::getHvDetID(std::string PSUChannel,
+                                    std::vector<uint32_t>& ids,
+                                    std::vector<uint32_t>& unmapped_ids,
+                                    std::vector<uint32_t>& crosstalking_ids) {
   //Function that (via reference parameters) populates ids, unmapped_ids, crosstalking_ids vectors of detids associated with a given PSU *HV* channel.
-  if (HVMap.find(PSUChannel)!=HVMap.end()) {
-    ids=HVMap[PSUChannel];
+  if (HVMap.find(PSUChannel) != HVMap.end()) {
+    ids = HVMap[PSUChannel];
   }
   //Extract the PSU to check the unmapped and crosstalking maps too corresponding to this channel
-  std::string PSU = PSUChannel.substr(0,PSUChannel.size()-10);
-  if (HVUnmapped_Map.find(PSU)!=HVUnmapped_Map.end()) {
-    unmapped_ids=HVUnmapped_Map[PSU];
+  std::string PSU = PSUChannel.substr(0, PSUChannel.size() - 10);
+  if (HVUnmapped_Map.find(PSU) != HVUnmapped_Map.end()) {
+    unmapped_ids = HVUnmapped_Map[PSU];
   }
-  if (HVCrosstalking_Map.find(PSU)!=HVCrosstalking_Map.end()) {
-    crosstalking_ids=HVCrosstalking_Map[PSU];
+  if (HVCrosstalking_Map.find(PSU) != HVCrosstalking_Map.end()) {
+    crosstalking_ids = HVCrosstalking_Map[PSU];
   }
 }
 
@@ -181,30 +192,35 @@ void SiStripPsuDetIdMap::getHvDetID(std::string PSUChannel, std::vector<uint32_t
 // Currently, channel number is ignored for mapping purposes
 // check both PG and CG as the channels should be unique
 
-void SiStripPsuDetIdMap::getDetID(std::string PSUChannel,const bool debug,std::vector<uint32_t> & detids,std::vector<uint32_t> & unmapped_detids,std::vector<uint32_t> & crosstalking_detids ) {
+void SiStripPsuDetIdMap::getDetID(std::string PSUChannel,
+                                  const bool debug,
+                                  std::vector<uint32_t>& detids,
+                                  std::vector<uint32_t>& unmapped_detids,
+                                  std::vector<uint32_t>& crosstalking_detids) {
   //This function takes as argument the PSUChannel (i.e. the dpname as it comes from the PVSS query, e.g. cms_trk_dcs_02:CAEN/CMS_TRACKER_SY1527_2/branchController05/easyCrate0/easyBoard12/channel001)
   //And it returns 3 vectors:
   //1-detids->all the detids positively matching the PSUChannel in question
   //2-unmapped_detids->the detids that are matching the PSU in question but that are not HV mapped
   //3-crosstalking_detids->the detids that are matching the PSU in question but exhibit the HV channel cross-talking behavior (they are ON as long as ANY of the 2 HV channels of the supply is ON, so they only go OFF when both channels are OFF)
   //The second and third vectors are only relevant for the HV case, when unmapped and cross-talking channels need further processing before being turned ON and OFF.
-  
+
   const std::string& PSUChannelFromQuery = PSUChannel;
 
   //Get the channel to see if it is LV or HV, they will be treated differently
-  std::string ChannelFromQuery=PSUChannelFromQuery.substr(PSUChannelFromQuery.size()-10);
+  std::string ChannelFromQuery = PSUChannelFromQuery.substr(PSUChannelFromQuery.size() - 10);
   //Get the PSU from Query, to be used for LVMap and for the HVUnmapped and HVCrosstalking maps:
-  std::string PSUFromQuery=PSUChannelFromQuery.substr(0,PSUChannelFromQuery.size()-10);
+  std::string PSUFromQuery = PSUChannelFromQuery.substr(0, PSUChannelFromQuery.size() - 10);
   if (debug) {
     //FIXME:
     //Should handle all the couts with MessageLogger!
-    std::cout << "DPNAME from QUERY: "<<PSUChannelFromQuery<<", Channel: "<<ChannelFromQuery<<"PSU: "<<PSUFromQuery<<std::endl;
+    std::cout << "DPNAME from QUERY: " << PSUChannelFromQuery << ", Channel: " << ChannelFromQuery
+              << "PSU: " << PSUFromQuery << std::endl;
   }
 
   //First prepare the strings needed to do the matching of the PSUChannel from the query to the ones in the map
 
   //Handle the LV case first:
-  if (ChannelFromQuery=="channel000" or ChannelFromQuery=="channel001") {
+  if (ChannelFromQuery == "channel000" or ChannelFromQuery == "channel001") {
     //For LV channels we need to look for any detID that is reported either as channel000 (not HV mapped)
     //but also as channel002 and channel003 (if they are HV mapped), or as channel999 (if they are in a crosstalking PSU)
     //Get the PSU to do a PSU-only matching to get all detIDs connected to the LV channel:
@@ -218,14 +234,14 @@ void SiStripPsuDetIdMap::getDetID(std::string PSUChannel,const bool debug,std::v
     //  }
     //}
     //No need to loop over if we use an actual map!
-    
-    if (LVMap.find(PSUFromQuery)!=LVMap.end()) {
-      detids=LVMap[PSUFromQuery];
+
+    if (LVMap.find(PSUFromQuery) != LVMap.end()) {
+      detids = LVMap[PSUFromQuery];
     }
   }
   //Handle the HV case too:
-  else if (ChannelFromQuery=="channel002" or ChannelFromQuery=="channel003") {
-    //For the HV channel we need to look at the actual positive matching detIDs, 
+  else if (ChannelFromQuery == "channel002" or ChannelFromQuery == "channel003") {
+    //For the HV channel we need to look at the actual positive matching detIDs,
     //but also to the unmapped one (channel000) and the crosstalking ones (channel999).
     //Assemble the corresponding channel000 (unmapped channels) replacing the last character in PSUChannelFromQuery:
     //  std::string ZeroedPSUChannelFromQuery= PSUChannelFromQuery;
@@ -256,26 +272,24 @@ void SiStripPsuDetIdMap::getDetID(std::string PSUChannel,const bool debug,std::v
     //  	crosstalking_detids.push_back(iter->first); //Fill the crosstalking_detids vector with the all detids matching the channel999 for the PSU from the query!
     //    }
     //  }
-    if (HVMap.find(PSUChannelFromQuery)!=HVMap.end()) {
-      detids=HVMap[PSUChannelFromQuery];
-    }
-    else if (HVUnmapped_Map.find(PSUFromQuery)!=HVUnmapped_Map.end()) {
-      unmapped_detids=HVUnmapped_Map[PSUFromQuery];
-    }
-    else if (HVCrosstalking_Map.find(PSUFromQuery)!=HVCrosstalking_Map.end()) {
-      crosstalking_detids=HVCrosstalking_Map[PSUFromQuery];
+    if (HVMap.find(PSUChannelFromQuery) != HVMap.end()) {
+      detids = HVMap[PSUChannelFromQuery];
+    } else if (HVUnmapped_Map.find(PSUFromQuery) != HVUnmapped_Map.end()) {
+      unmapped_detids = HVUnmapped_Map[PSUFromQuery];
+    } else if (HVCrosstalking_Map.find(PSUFromQuery) != HVCrosstalking_Map.end()) {
+      crosstalking_detids = HVCrosstalking_Map[PSUFromQuery];
     }
   }
-  //  
-  //  
+  //
+  //
   //  //With the new code above that makes use of the channel00X information in the map
   //  //we should no more need to remove duplicates by construction.
-  //  //The following code was used when there was no channel information in the map, 
+  //  //The following code was used when there was no channel information in the map,
   //  //to elegantly eliminate duplicates.
   //  //We can now use it as a cross-check (still removing duplicates in case they happen, but writing a message out)
-  //  
+  //
   //  // remove duplicates
-  //  
+  //
   //  //First sort detIDs vector, so that duplicates will be consecutive
   //  if (!detids.empty()) {
   //    std::sort(detids.begin(),detids.end());
@@ -327,32 +341,37 @@ void SiStripPsuDetIdMap::getDetID(std::string PSUChannel,const bool debug,std::v
   //      }
   //    }
   //  }
-  //  
+  //
   //  //Using reference parameters since we are returning multiple objects.
   //  //return detids;
-
 }
 
 // returns PSU channel name for a given DETID
 std::string SiStripPsuDetIdMap::getPSUName(uint32_t detid) {
-  std::vector< std::pair<uint32_t, std::string> >::iterator iter;
+  std::vector<std::pair<uint32_t, std::string> >::iterator iter;
   for (iter = pgMap.begin(); iter != pgMap.end(); iter++) {
-    if (iter->first && iter->first == detid) {return iter->second;}
+    if (iter->first && iter->first == detid) {
+      return iter->second;
+    }
   }
   // if we reach here, then we didn't find the detid in the map
   return "UNKNOWN";
 }
 
 std::string SiStripPsuDetIdMap::getPSUName(uint32_t detid, std::string group) {
-  std::vector< std::pair<uint32_t, std::string> >::iterator iter;
+  std::vector<std::pair<uint32_t, std::string> >::iterator iter;
   if (group == "PG") {
     for (iter = pgMap.begin(); iter != pgMap.end(); iter++) {
-      if (iter->first && iter->first == detid) {return iter->second;}
+      if (iter->first && iter->first == detid) {
+        return iter->second;
+      }
     }
   }
   if (group == "CG") {
     for (iter = cgMap.begin(); iter != cgMap.end(); iter++) {
-      if (iter->first && iter->first == detid) {return iter->second;}
+      if (iter->first && iter->first == detid) {
+        return iter->second;
+      }
     }
   }
   // if we reach here, then we didn't find the detid in the map
@@ -362,7 +381,9 @@ std::string SiStripPsuDetIdMap::getPSUName(uint32_t detid, std::string group) {
 // returns the PVSS name for a given DETID
 std::string SiStripPsuDetIdMap::getDetectorLocation(uint32_t detid) {
   for (unsigned int i = 0; i < pgMap.size(); i++) {
-    if (pgMap[i].first == detid) {return detectorLocations[i];}
+    if (pgMap[i].first == detid) {
+      return detectorLocations[i];
+    }
   }
   return "UNKNOWN";
 }
@@ -371,12 +392,16 @@ std::string SiStripPsuDetIdMap::getDetectorLocation(uint32_t detid) {
 std::string SiStripPsuDetIdMap::getDetectorLocation(uint32_t detid, std::string group) {
   if (group == "PG") {
     for (unsigned int i = 0; i < pgMap.size(); i++) {
-      if (pgMap[i].first == detid) {return detectorLocations[i];}
+      if (pgMap[i].first == detid) {
+        return detectorLocations[i];
+      }
     }
   }
   if (group == "CG") {
     for (unsigned int i = 0; i < cgMap.size(); i++) {
-      if (cgMap[i].first == detid) {return controlLocations[i];}
+      if (cgMap[i].first == detid) {
+        return controlLocations[i];
+      }
     }
   }
   return "UNKNOWN";
@@ -385,10 +410,14 @@ std::string SiStripPsuDetIdMap::getDetectorLocation(uint32_t detid, std::string
 // returns the PVSS name for a given PSU channel
 std::string SiStripPsuDetIdMap::getDetectorLocation(std::string PSUChannel) {
   for (unsigned int i = 0; i < pgMap.size(); i++) {
-    if (pgMap[i].second == PSUChannel) {return detectorLocations[i];}
+    if (pgMap[i].second == PSUChannel) {
+      return detectorLocations[i];
+    }
   }
   for (unsigned int i = 0; i < cgMap.size(); i++) {
-    if (cgMap[i].second == PSUChannel) {return controlLocations[i];}
+    if (cgMap[i].second == PSUChannel) {
+      return controlLocations[i];
+    }
   }
   return "UNKNOWN";
 }
@@ -396,17 +425,23 @@ std::string SiStripPsuDetIdMap::getDetectorLocation(std::string PSUChannel) {
 // returns the DCU ID for a given PSU channel
 uint32_t SiStripPsuDetIdMap::getDcuId(std::string PSUChannel) {
   for (unsigned int i = 0; i < pgMap.size(); i++) {
-    if (pgMap[i].second == PSUChannel) {return dcuIds[i];}
+    if (pgMap[i].second == PSUChannel) {
+      return dcuIds[i];
+    }
   }
   for (unsigned int i = 0; i < cgMap.size(); i++) {
-    if (cgMap[i].second == PSUChannel) {return cgDcuIds[i];}
+    if (cgMap[i].second == PSUChannel) {
+      return cgDcuIds[i];
+    }
   }
   return 0;
 }
 
 uint32_t SiStripPsuDetIdMap::getDcuId(uint32_t detid) {
   for (unsigned int i = 0; i < pgMap.size(); i++) {
-    if (pgMap[i].first == detid) {return dcuIds[i];}
+    if (pgMap[i].first == detid) {
+      return dcuIds[i];
+    }
   }
   return 0;
 }
@@ -415,25 +450,27 @@ uint32_t SiStripPsuDetIdMap::getDcuId(uint32_t detid) {
 int SiStripPsuDetIdMap::IsHVChannel(std::string PSUChannel) {
   // isHV = 0 means LV, = 1 means HV, = -1 means error
   int isHV = 0;
-  std::string::size_type loc = PSUChannel.find( "channel", 0 );
+  std::string::size_type loc = PSUChannel.find("channel", 0);
   if (loc != std::string::npos) {
-    std::string chNumber = PSUChannel.substr(loc+7,3);
+    std::string chNumber = PSUChannel.substr(loc + 7, 3);
     if (chNumber == "002" || chNumber == "003") {
       isHV = 1;
     } else if (chNumber == "000" || chNumber == "001") {
       isHV = 0;
     } else {
-      edm::LogWarning("SiStripPsuDetIdMap") << "[SiStripPsuDetIdMap::" << __func__ << "] channel number of unexpected format, setting error flag!";
+      edm::LogWarning("SiStripPsuDetIdMap")
+          << "[SiStripPsuDetIdMap::" << __func__ << "] channel number of unexpected format, setting error flag!";
       isHV = -1;
     }
   } else {
-    edm::LogWarning("SiStripPsuDetIdMap") << "[SiStripPsuDetIdMap::" << __func__ << "] channel number not located in PSU channel name, setting error flag!";
+    edm::LogWarning("SiStripPsuDetIdMap") << "[SiStripPsuDetIdMap::" << __func__
+                                          << "] channel number not located in PSU channel name, setting error flag!";
     isHV = -1;
   }
   return isHV;
 }
 
-void SiStripPsuDetIdMap::clone(DcuPsuVector &input, DcuPsuVector &output) {
+void SiStripPsuDetIdMap::clone(DcuPsuVector& input, DcuPsuVector& output) {
   output.clear();
   for (unsigned int i = 0; i < input.size(); i++) {
     output.push_back(new TkDcuPsuMap(*(input[i])));
@@ -442,8 +479,7 @@ void SiStripPsuDetIdMap::clone(DcuPsuVector &input, DcuPsuVector &output) {
 
 void SiStripPsuDetIdMap::printMap() {
   stringstream pg;
-  pg << "Map of power supplies to DET IDs: " << std::endl
-     << "-- PSU name --          -- Det Id --" << std::endl;
+  pg << "Map of power supplies to DET IDs: " << std::endl << "-- PSU name --          -- Det Id --" << std::endl;
   for (unsigned int p = 0; p < pgMap.size(); p++) {
     pg << pgMap[p].first << "         " << pgMap[p].second << std::endl;
   }
@@ -460,32 +496,38 @@ void SiStripPsuDetIdMap::printControlMap() {
   edm::LogInfo("SiStripPsuDetIdMap") << "[SiStripPsuDetIdMap::" << __func__ << "] " << cg.str();
 }
 
-std::vector< std::pair<uint32_t, std::string> > SiStripPsuDetIdMap::getDcuPsuMap() {
-  if (!pgMap.empty()) { return pgMap; }
-  std::vector< std::pair<uint32_t, std::string> > emptyVec;
+std::vector<std::pair<uint32_t, std::string> > SiStripPsuDetIdMap::getDcuPsuMap() {
+  if (!pgMap.empty()) {
+    return pgMap;
+  }
+  std::vector<std::pair<uint32_t, std::string> > emptyVec;
   return emptyVec;
 }
 
-void SiStripPsuDetIdMap::checkMapInputValues(const SiStripConfigDb::DcuDetIdsV& dcuDetIds_, const DcuPsuVector& dcuPsus_) {
+void SiStripPsuDetIdMap::checkMapInputValues(const SiStripConfigDb::DcuDetIdsV& dcuDetIds_,
+                                             const DcuPsuVector& dcuPsus_) {
   std::cout << "Number of entries in DCU-PSU map:    " << dcuPsus_.size() << std::endl;
   std::cout << "Number of entries in DCU-DETID map:  " << dcuDetIds_.size() << std::endl;
   std::cout << std::endl;
-  
-  std::vector<bool> ddUsed(dcuDetIds_.size(),false);
-  std::vector<bool> dpUsed(dcuPsus_.size(),false);
+
+  std::vector<bool> ddUsed(dcuDetIds_.size(), false);
+  std::vector<bool> dpUsed(dcuPsus_.size(), false);
 
   for (unsigned int dp = 0; dp < dcuPsus_.size(); dp++) {
     for (unsigned int dd = 0; dd < dcuDetIds_.size(); dd++) {
       if (dcuPsus_[dp]->getDcuHardId() == dcuDetIds_[dd].second->getDcuHardId()) {
-	dpUsed[dp] = true;
-	ddUsed[dd] = true;
+        dpUsed[dp] = true;
+        ddUsed[dd] = true;
       }
     }
   }
   unsigned int numDpUsed = 0, numDpNotUsed = 0;
   for (unsigned int dp = 0; dp < dpUsed.size(); dp++) {
-    if (dpUsed[dp]) { numDpUsed++; }
-    else { numDpNotUsed++; }
+    if (dpUsed[dp]) {
+      numDpUsed++;
+    } else {
+      numDpNotUsed++;
+    }
   }
 
   std::cout << "Number of used DCU-PSU entries:   " << numDpUsed << std::endl;
@@ -493,8 +535,11 @@ void SiStripPsuDetIdMap::checkMapInputValues(const SiStripConfigDb::DcuDetIdsV&
 
   unsigned int numDdUsed = 0, numDdNotUsed = 0;
   for (unsigned int dd = 0; dd < ddUsed.size(); dd++) {
-    if (ddUsed[dd]) { numDdUsed++; }
-    else { numDdNotUsed++; }
+    if (ddUsed[dd]) {
+      numDdUsed++;
+    } else {
+      numDdNotUsed++;
+    }
   }
 
   std::cout << "Number of used DCU-DETID entries:   " << numDdUsed << std::endl;
@@ -505,68 +550,72 @@ void SiStripPsuDetIdMap::checkMapInputValues(const SiStripConfigDb::DcuDetIdsV&
 }
 
 //std::vector< std::pair<uint32_t, SiStripConfigDb::DeviceAddress> > SiStripPsuDetIdMap::retrieveDcuDeviceAddresses(std::string partition) {
-std::vector< std::pair< std::vector<uint16_t> , std::vector<uint32_t> > > SiStripPsuDetIdMap::retrieveDcuDeviceAddresses(std::string partition) {
+std::vector<std::pair<std::vector<uint16_t>, std::vector<uint32_t> > > SiStripPsuDetIdMap::retrieveDcuDeviceAddresses(
+    std::string partition) {
   // get the DB parameters
   SiStripDbParams dbParams_ = db_->dbParams();
   SiStripDbParams::SiStripPartitions::const_iterator iter;
-  
-  std::vector< std::pair<uint32_t, SiStripConfigDb::DeviceAddress> > resultVec;
-  
+
+  std::vector<std::pair<uint32_t, SiStripConfigDb::DeviceAddress> > resultVec;
+
   SiStripConfigDb::DeviceDescriptionsV dcuDevices_;
   SiStripConfigDb::DeviceType device_ = DCU;
-  
+
   for (iter = dbParams_.partitions().begin(); iter != dbParams_.partitions().end(); ++iter) {
-    if ( partition == "" || partition == iter->second.partitionName() ) {
-      if ( iter->second.partitionName() == SiStripPartition::defaultPartitionName_ ) { continue; }
+    if (partition.empty() || partition == iter->second.partitionName()) {
+      if (iter->second.partitionName() == SiStripPartition::defaultPartitionName_) {
+        continue;
+      }
       if (iter->second.dcuVersion().first > 0 && iter->second.fecVersion().first > 0) {
-	SiStripConfigDb::DeviceDescriptionsRange range = db_->getDeviceDescriptions(device_,iter->second.partitionName());
-	if (!range.empty()) {
-	  SiStripConfigDb::DeviceDescriptionsV nextVec( range.begin(), range.end() );
-	  for (unsigned int i = 0; i < nextVec.size(); i++) {
-	    dcuDescription * desc = dynamic_cast<dcuDescription *>(nextVec[i]);
-	    resultVec.push_back( std::make_pair( desc->getDcuHardId(), db_->deviceAddress(*(nextVec[i])) ) );
-	  }
-	}
+        SiStripConfigDb::DeviceDescriptionsRange range =
+            db_->getDeviceDescriptions(device_, iter->second.partitionName());
+        if (!range.empty()) {
+          SiStripConfigDb::DeviceDescriptionsV nextVec(range.begin(), range.end());
+          for (unsigned int i = 0; i < nextVec.size(); i++) {
+            dcuDescription* desc = dynamic_cast<dcuDescription*>(nextVec[i]);
+            resultVec.push_back(std::make_pair(desc->getDcuHardId(), db_->deviceAddress(*(nextVec[i]))));
+          }
+        }
       }
     }
   }
 
-  std::vector< std::pair< std::vector<uint16_t> , std::vector<uint32_t> > > testVec;
-  std::vector< std::pair<uint32_t, SiStripConfigDb::DeviceAddress> >::iterator reorg_iter = resultVec.begin();
+  std::vector<std::pair<std::vector<uint16_t>, std::vector<uint32_t> > > testVec;
+  std::vector<std::pair<uint32_t, SiStripConfigDb::DeviceAddress> >::iterator reorg_iter = resultVec.begin();
 
-  for ( ; reorg_iter != resultVec.end(); reorg_iter++) {
-    std::vector<uint16_t> fecInfo(4,0);
+  for (; reorg_iter != resultVec.end(); reorg_iter++) {
+    std::vector<uint16_t> fecInfo(4, 0);
     fecInfo[0] = reorg_iter->second.fecCrate_;
     fecInfo[1] = reorg_iter->second.fecSlot_;
     fecInfo[2] = reorg_iter->second.fecRing_;
     fecInfo[3] = reorg_iter->second.ccuAddr_;
     std::vector<uint32_t> dcuids;
-    std::vector< std::pair<uint32_t, SiStripConfigDb::DeviceAddress> >::iterator jter = reorg_iter;
-    for ( ; jter != resultVec.end(); jter++) {
+    std::vector<std::pair<uint32_t, SiStripConfigDb::DeviceAddress> >::iterator jter = reorg_iter;
+    for (; jter != resultVec.end(); jter++) {
       if (reorg_iter->second.fecCrate_ == jter->second.fecCrate_ &&
-	  reorg_iter->second.fecSlot_ == jter->second.fecSlot_ &&
-	  reorg_iter->second.fecRing_ == jter->second.fecRing_ &&
-	  reorg_iter->second.ccuAddr_ == jter->second.ccuAddr_) {
-	dcuids.push_back(jter->first);
+          reorg_iter->second.fecSlot_ == jter->second.fecSlot_ &&
+          reorg_iter->second.fecRing_ == jter->second.fecRing_ &&
+          reorg_iter->second.ccuAddr_ == jter->second.ccuAddr_) {
+        dcuids.push_back(jter->first);
       }
     }
     // handle duplicates
     bool isDup = false;
     for (unsigned int i = 0; i < testVec.size(); i++) {
       if (fecInfo == testVec[i].first) {
-	isDup = true;
-	dcuids.insert(dcuids.end(), (testVec[i].second).begin(), (testVec[i].second).end() );
-	std::sort(dcuids.begin(),dcuids.end());
-	std::vector<uint32_t>::iterator it = std::unique(dcuids.begin(),dcuids.end());
-	dcuids.resize( it - dcuids.begin() );
-	testVec[i].second = dcuids;
+        isDup = true;
+        dcuids.insert(dcuids.end(), (testVec[i].second).begin(), (testVec[i].second).end());
+        std::sort(dcuids.begin(), dcuids.end());
+        std::vector<uint32_t>::iterator it = std::unique(dcuids.begin(), dcuids.end());
+        dcuids.resize(it - dcuids.begin());
+        testVec[i].second = dcuids;
       }
     }
     if (!isDup) {
-      std::sort(dcuids.begin(),dcuids.end());
-      std::vector<uint32_t>::iterator it = std::unique(dcuids.begin(),dcuids.end());
-      dcuids.resize( it - dcuids.begin() );
-      testVec.push_back(std::make_pair(fecInfo,dcuids));
+      std::sort(dcuids.begin(), dcuids.end());
+      std::vector<uint32_t>::iterator it = std::unique(dcuids.begin(), dcuids.end());
+      dcuids.resize(it - dcuids.begin());
+      testVec.push_back(std::make_pair(fecInfo, dcuids));
     }
   }
   //  return resultVec;
@@ -574,27 +623,31 @@ std::vector< std::pair< std::vector<uint16_t> , std::vector<uint32_t> > > SiStri
 }
 
 std::vector<uint32_t> SiStripPsuDetIdMap::findDcuIdFromDeviceAddress(uint32_t dcuid_) {
-  std::vector< std::pair< std::vector<uint16_t> , std::vector<uint32_t> > >::iterator iter = dcu_device_addr_vector.begin();
-  std::vector< std::pair< std::vector<uint16_t> , std::vector<uint32_t> > >::iterator res_iter = dcu_device_addr_vector.end();
+  std::vector<std::pair<std::vector<uint16_t>, std::vector<uint32_t> > >::iterator iter =
+      dcu_device_addr_vector.begin();
+  std::vector<std::pair<std::vector<uint16_t>, std::vector<uint32_t> > >::iterator res_iter =
+      dcu_device_addr_vector.end();
   std::vector<uint32_t> pgDcu;
 
-  for ( ; iter != dcu_device_addr_vector.end(); iter++) {
+  for (; iter != dcu_device_addr_vector.end(); iter++) {
     std::vector<uint32_t> dcuids = iter->second;
-    std::vector<uint32_t>::iterator dcu_iter = std::find(dcuids.begin(),dcuids.end(),dcuid_);
+    std::vector<uint32_t>::iterator dcu_iter = std::find(dcuids.begin(), dcuids.end(), dcuid_);
     bool alreadyFound = false;
-    if (res_iter != dcu_device_addr_vector.end()) {alreadyFound = true;}
+    if (res_iter != dcu_device_addr_vector.end()) {
+      alreadyFound = true;
+    }
     if (dcu_iter != dcuids.end()) {
       res_iter = iter;
       if (!alreadyFound) {
-	for (unsigned int i = 0; i < dcuids.size(); i++) {
-	  if (dcuids[i] != dcuid_) {pgDcu.push_back(dcuids[i]);}
-	}
+        for (unsigned int i = 0; i < dcuids.size(); i++) {
+          if (dcuids[i] != dcuid_) {
+            pgDcu.push_back(dcuids[i]);
+          }
+        }
       } else {
-	std::cout << "Oh oh ... we have a duplicate :-(" << std::endl;
+        std::cout << "Oh oh ... we have a duplicate :-(" << std::endl;
       }
     }
   }
   return pgDcu;
 }
-
-
diff --git a/CalibTracker/SiStripDCS/test/Synchronization/SealModules.cc b/CalibTracker/SiStripDCS/test/Synchronization/SealModules.cc
index 3a90438df9ba5..dba6d8ff89bf8 100644
--- a/CalibTracker/SiStripDCS/test/Synchronization/SealModules.cc
+++ b/CalibTracker/SiStripDCS/test/Synchronization/SealModules.cc
@@ -1,5 +1,4 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-
 #include "CalibTracker/SiStripDCS/test/Synchronization/SyncDCSO2O.h"
 DEFINE_FWK_MODULE(SyncDCSO2O);
diff --git a/CalibTracker/SiStripDCS/test/Synchronization/SyncDCSO2O.cc b/CalibTracker/SiStripDCS/test/Synchronization/SyncDCSO2O.cc
index 3ed5635f54606..49ba4f440347f 100644
--- a/CalibTracker/SiStripDCS/test/Synchronization/SyncDCSO2O.cc
+++ b/CalibTracker/SiStripDCS/test/Synchronization/SyncDCSO2O.cc
@@ -14,30 +14,28 @@
 #include "TFile.h"
 #include "TCanvas.h"
 
-SyncDCSO2O::SyncDCSO2O(const edm::ParameterSet& iConfig)
-{
+SyncDCSO2O::SyncDCSO2O(const edm::ParameterSet& iConfig) {
   // get all digi collections
   digiProducersList_ = iConfig.getParameter<Parameters>("DigiProducersList");
 }
 
-SyncDCSO2O::~SyncDCSO2O()
-{
+SyncDCSO2O::~SyncDCSO2O() {
   std::cout << "Analyzed events with digis = " << timeInfo_.size() << std::endl;
 
   // First sort the timeInfo vector by time
   std::sort(timeInfo_.begin(), timeInfo_.end(), SortByTime());
 
-  TFile * outputFile = new TFile("digisAndHVvsTime.root", "RECREATE");
+  TFile* outputFile = new TFile("digisAndHVvsTime.root", "RECREATE");
   outputFile->cd();
 
-  TH1F * digis            = new TH1F("digis",            "digis",            timeInfo_.size(), 0, timeInfo_.size());
-  TH1F * digisWithMasking = new TH1F("digisWithMasking", "digisWithMasking", timeInfo_.size(), 0, timeInfo_.size());
-  TH1F * HVoff            = new TH1F("HVoff",            "HVoff",            timeInfo_.size(), 0, timeInfo_.size());
-  TH1F * time             = new TH1F("time",             "time",             timeInfo_.size(), 0, timeInfo_.size());
+  TH1F* digis = new TH1F("digis", "digis", timeInfo_.size(), 0, timeInfo_.size());
+  TH1F* digisWithMasking = new TH1F("digisWithMasking", "digisWithMasking", timeInfo_.size(), 0, timeInfo_.size());
+  TH1F* HVoff = new TH1F("HVoff", "HVoff", timeInfo_.size(), 0, timeInfo_.size());
+  TH1F* time = new TH1F("time", "time", timeInfo_.size(), 0, timeInfo_.size());
   std::vector<TimeInfo>::const_iterator it = timeInfo_.begin();
   // Float_t * timeArray = new Float_t[timeInfo_.size()];
-  unsigned int i=1;
-  for( ; it != timeInfo_.end(); ++it, ++i ) {
+  unsigned int i = 1;
+  for (; it != timeInfo_.end(); ++it, ++i) {
     digis->SetBinContent(i, it->digiOccupancy);
     digisWithMasking->SetBinContent(i, it->digiOccupancyWithMasking);
     HVoff->SetBinContent(i, it->HVoff);
@@ -46,7 +44,12 @@ SyncDCSO2O::~SyncDCSO2O()
     coral::TimeStamp coralTime(cond::time::to_boost(it->time));
     // N.B. we add 1 hour to the coralTime because it is the conversion from posix_time which is non-adjusted.
     // The shift of +1 gives the CERN time zone.
-    TDatime date1(coralTime.year(), coralTime.month(), coralTime.day(), coralTime.hour()+1, coralTime.minute(), coralTime.second());
+    TDatime date1(coralTime.year(),
+                  coralTime.month(),
+                  coralTime.day(),
+                  coralTime.hour() + 1,
+                  coralTime.minute(),
+                  coralTime.second());
     // timeArray[i-1] = date1.Convert();
     time->SetBinContent(i, date1.Convert());
   }
@@ -68,12 +71,12 @@ SyncDCSO2O::~SyncDCSO2O()
   time->Draw("same");
   time->Write();
 
-//   TGraph * digisGraph = buildGraph(digis, timeArray);
-//   digisGraph->Write("digisGraph");
-//   TGraph * digisWithMaskingGraph = buildGraph(digisWithMasking, timeArray);
-//   digisWithMaskingGraph->Write("digisWithMaskingGraph");
-//   TGraph * HVoffGraph = buildGraph(HVoff, timeArray);
-//   HVoffGraph->Write("HVoffGraph");
+  //   TGraph * digisGraph = buildGraph(digis, timeArray);
+  //   digisGraph->Write("digisGraph");
+  //   TGraph * digisWithMaskingGraph = buildGraph(digisWithMasking, timeArray);
+  //   digisWithMaskingGraph->Write("digisWithMaskingGraph");
+  //   TGraph * HVoffGraph = buildGraph(HVoff, timeArray);
+  //   HVoffGraph->Write("HVoffGraph");
 
   outputFile->Write();
   outputFile->Close();
@@ -82,12 +85,11 @@ SyncDCSO2O::~SyncDCSO2O()
 }
 
 // ------------ method called to for each event  ------------
-void SyncDCSO2O::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void SyncDCSO2O::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   using namespace edm;
 
   ESHandle<SiStripDetVOff> detVOff;
-  iSetup.get<SiStripDetVOffRcd>().get( detVOff );
+  iSetup.get<SiStripDetVOffRcd>().get(detVOff);
 
   std::vector<uint32_t> detIds;
   detVOff->getDetIds(detIds);
@@ -98,7 +100,7 @@ void SyncDCSO2O::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup
   // std::cout << ss.str() << std::endl;
 
   // double seconds = (iEvent.time().value() >> 32);
-  std::cout << "event time = "  << iEvent.time().value() << std::endl;
+  std::cout << "event time = " << iEvent.time().value() << std::endl;
   // std::cout << "event time in seconds = "  << seconds << std::endl;
 
   coral::TimeStamp coralTime(cond::time::to_boost(iEvent.time().value()));
@@ -106,56 +108,56 @@ void SyncDCSO2O::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup
   std::cout << "year = " << coralTime.year() << ", month = " << coralTime.month() << ", day = " << coralTime.day();
   // N.B. we add 1 hour to the coralTime because it is the conversion from posix_time which is non-adjusted.
   // The shift of +1 gives the CERN time zone.
-  std::cout << ", hour = " << coralTime.hour()+1 << ", minute = " << coralTime.minute() << ", second = " << coralTime.second();
+  std::cout << ", hour = " << coralTime.hour() + 1 << ", minute = " << coralTime.minute()
+            << ", second = " << coralTime.second();
   std::cout << ", nanosecond = " << coralTime.nanosecond() << std::endl;
 
   getDigis(iEvent);
-  if( !(digiDetsetVector_[0].isValid()) ) std::cout << "NOT VALID DIGI COLLECTION 0" << std::endl;
+  if (!(digiDetsetVector_[0].isValid()))
+    std::cout << "NOT VALID DIGI COLLECTION 0" << std::endl;
   else {
     edm::DetSetVector<SiStripDigi>::const_iterator it = digiDetsetVector_[0]->begin();
     unsigned int totDigis = 0;
     unsigned int totDigisWithMasking = 0;
-    for( ; it != digiDetsetVector_[0]->end(); ++it ) {
+    for (; it != digiDetsetVector_[0]->end(); ++it) {
       totDigis += it->size();
       // Compute also number of digis masking detIds off according to DetVOff
-      if( !(detVOff->IsModuleHVOff(it->detId())) ) {
+      if (!(detVOff->IsModuleHVOff(it->detId()))) {
         totDigisWithMasking += it->size();
       }
     }
     std::cout << "digis = " << totDigis << std::endl;
-    timeInfo_.push_back( TimeInfo(iEvent.time().value(), totDigis, totDigisWithMasking, detVOff->getHVoffCounts()) );
+    timeInfo_.push_back(TimeInfo(iEvent.time().value(), totDigis, totDigisWithMasking, detVOff->getHVoffCounts()));
   }
 }
 
-void SyncDCSO2O::getDigis(const edm::Event& iEvent)
-{
+void SyncDCSO2O::getDigis(const edm::Event& iEvent) {
   using namespace edm;
 
   int icoll = 0;
   Parameters::iterator itDigiProducersList = digiProducersList_.begin();
-  for(; itDigiProducersList != digiProducersList_.end(); ++itDigiProducersList ) {
+  for (; itDigiProducersList != digiProducersList_.end(); ++itDigiProducersList) {
     std::string digiProducer = itDigiProducersList->getParameter<std::string>("DigiProducer");
     std::string digiLabel = itDigiProducersList->getParameter<std::string>("DigiLabel");
     // std::cout << "Reading digi for " << digiProducer << " with label: " << digiLabel << std::endl;
-    iEvent.getByLabel(digiProducer,digiLabel,digiDetsetVector_[icoll]);
+    iEvent.getByLabel(digiProducer, digiLabel, digiDetsetVector_[icoll]);
     icoll++;
   }
 }
 
 /// Build TGraphs with quantity vs time
-TGraph * SyncDCSO2O::buildGraph(TH1F * histo, Float_t * timeArray)
-{
+TGraph* SyncDCSO2O::buildGraph(TH1F* histo, Float_t* timeArray) {
   unsigned int arraySize = histo->GetNbinsX();
   // Note that the array reported has [0] = underflow and [Nbins+1] = overflow
-  Float_t * valueArray = (histo->GetArray())+1;
+  Float_t* valueArray = (histo->GetArray()) + 1;
 
-  TGraph * graph = new TGraph(arraySize, valueArray, timeArray);
+  TGraph* graph = new TGraph(arraySize, valueArray, timeArray);
   graph->Draw("A*");
   graph->GetXaxis()->SetTimeDisplay(1);
   graph->GetXaxis()->SetLabelOffset(0.02);
   graph->GetXaxis()->SetTimeFormat("#splitline{  %d}{%H:%M}");
-  graph->GetXaxis()->SetTimeOffset(0,"gmt");
-  graph->GetYaxis()->SetRangeUser(0,16000);
+  graph->GetXaxis()->SetTimeOffset(0, "gmt");
+  graph->GetYaxis()->SetRangeUser(0, 16000);
   graph->GetXaxis()->SetTitle("day/hour");
   graph->GetXaxis()->SetTitleSize(0.03);
   graph->GetXaxis()->SetTitleColor(kBlack);
@@ -170,11 +172,7 @@ TGraph * SyncDCSO2O::buildGraph(TH1F * histo, Float_t * timeArray)
 }
 
 // ------------ method called once each job just before starting event loop  ------------
-void SyncDCSO2O::beginJob()
-{
-}
+void SyncDCSO2O::beginJob() {}
 
 // ------------ method called once each job just after ending the event loop  ------------
-void SyncDCSO2O::endJob()
-{
-}
+void SyncDCSO2O::endJob() {}
diff --git a/CalibTracker/SiStripDCS/test/Synchronization/SyncDCSO2O.h b/CalibTracker/SiStripDCS/test/Synchronization/SyncDCSO2O.h
index 0dbae9d326414..1046903b577de 100644
--- a/CalibTracker/SiStripDCS/test/Synchronization/SyncDCSO2O.h
+++ b/CalibTracker/SiStripDCS/test/Synchronization/SyncDCSO2O.h
@@ -2,7 +2,7 @@
 //
 // Package:    CalibTracker/SiStripDCS/test/Synchronization
 // Class:      SyncDCSO2O
-// 
+//
 /**\class SyncDCSO2O SyncDCSO2O.cc
 
  Description: Produces a histogram with the digi occupancy vs time and the change of payload.
@@ -42,24 +42,28 @@ class SyncDCSO2O : public edm::EDAnalyzer {
   ~SyncDCSO2O();
 
 private:
-  virtual void beginJob() ;
+  virtual void beginJob();
   virtual void analyze(const edm::Event&, const edm::EventSetup&);
-  virtual void endJob() ;
+  virtual void endJob();
 
   void getDigis(const edm::Event& iEvent);
   /// Build TGraphs with quantity vs time
-  TGraph * buildGraph(TH1F * histo, Float_t * timeArray);
+  TGraph* buildGraph(TH1F* histo, Float_t* timeArray);
 
   // ----------member data ---------------------------
-  edm::Handle< edm::DetSetVector<SiStripDigi> > digiDetsetVector_[4];
+  edm::Handle<edm::DetSetVector<SiStripDigi> > digiDetsetVector_[4];
   typedef std::vector<edm::ParameterSet> Parameters;
   Parameters digiProducersList_;
 
-  struct TimeInfo
-  {
-    TimeInfo(unsigned long long inputTime, unsigned int inputDigiOccupancy, unsigned int inputDigiOccupancyWithMasking, unsigned int inputHVoff) :
-      time(inputTime), digiOccupancy(inputDigiOccupancy), digiOccupancyWithMasking(inputDigiOccupancyWithMasking), HVoff(inputHVoff)
-    {}
+  struct TimeInfo {
+    TimeInfo(unsigned long long inputTime,
+             unsigned int inputDigiOccupancy,
+             unsigned int inputDigiOccupancyWithMasking,
+             unsigned int inputHVoff)
+        : time(inputTime),
+          digiOccupancy(inputDigiOccupancy),
+          digiOccupancyWithMasking(inputDigiOccupancyWithMasking),
+          HVoff(inputHVoff) {}
 
     unsigned long long time;
     unsigned int digiOccupancy;
@@ -67,12 +71,8 @@ class SyncDCSO2O : public edm::EDAnalyzer {
     unsigned int HVoff;
   };
 
-  struct SortByTime
-  {
-    bool operator()(const TimeInfo & timeInfo1, const TimeInfo & timeInfo2)
-    {
-      return( timeInfo1.time < timeInfo2.time );
-    }
+  struct SortByTime {
+    bool operator()(const TimeInfo& timeInfo1, const TimeInfo& timeInfo2) { return (timeInfo1.time < timeInfo2.time); }
   };
 
   std::vector<TimeInfo> timeInfo_;
diff --git a/CalibTracker/SiStripDCS/test/UnitTests/TestSiStripDetVOffBuilder.cc b/CalibTracker/SiStripDCS/test/UnitTests/TestSiStripDetVOffBuilder.cc
index 517636ceedda9..c7d9730d87088 100644
--- a/CalibTracker/SiStripDCS/test/UnitTests/TestSiStripDetVOffBuilder.cc
+++ b/CalibTracker/SiStripDCS/test/UnitTests/TestSiStripDetVOffBuilder.cc
@@ -11,11 +11,13 @@
 
 #include "CalibTracker/SiStripDCS/interface/SiStripDetVOffBuilder.h"
 
-std::vector<int> vectorDate(const int year, const int month,
-			    const int day, const int hour,
-			    const int minute, const int second,
-			    const int microsecond)
-{
+std::vector<int> vectorDate(const int year,
+                            const int month,
+                            const int day,
+                            const int hour,
+                            const int minute,
+                            const int second,
+                            const int microsecond) {
   std::vector<int> timeVector;
   timeVector.push_back(year);
   timeVector.push_back(month);
@@ -27,12 +29,11 @@ std::vector<int> vectorDate(const int year, const int month,
   return timeVector;
 }
 
-class TestSiStripDetVOffBuilder : public CppUnit::TestFixture { 
-public: 
+class TestSiStripDetVOffBuilder : public CppUnit::TestFixture {
+public:
   TestSiStripDetVOffBuilder() {}
 
-  void setUp()
-  {
+  void setUp() {
     edm::ParameterSet pset;
     // Must set the string type explicitly or it will take it as bool
     pset.addParameter("onlineDB", std::string("onlineDBString"));
@@ -43,7 +44,7 @@ class TestSiStripDetVOffBuilder : public CppUnit::TestFixture {
 
     pset.addParameter("debugModeOn", true);
 
-    pset.addParameter("Tmin", vectorDate(2009, 12, 7,  12,  0, 0, 000));
+    pset.addParameter("Tmin", vectorDate(2009, 12, 7, 12, 0, 0, 000));
     pset.addParameter("Tmax", vectorDate(2009, 12, 8, 9, 0, 0, 000));
     pset.addParameter("TSetMin", vectorDate(2007, 11, 26, 0, 0, 0, 0));
     pset.addParameter<uint32_t>("DeltaTmin", 2);
@@ -57,37 +58,31 @@ class TestSiStripDetVOffBuilder : public CppUnit::TestFixture {
     detVoff = new SiStripDetVOff;
   }
 
-  void tearDown()
-  {
+  void tearDown() {
     delete object;
     delete detVoff;
   }
 
-  void testConstructor()
-  {
-    CPPUNIT_ASSERT( object->highVoltageOnThreshold_ == 0.97 );
-    CPPUNIT_ASSERT( object->whichTable == "STATUSCHANGE" );
+  void testConstructor() {
+    CPPUNIT_ASSERT(object->highVoltageOnThreshold_ == 0.97);
+    CPPUNIT_ASSERT(object->whichTable == "STATUSCHANGE");
   }
 
-
   // Factorize the methods in SiStripDetVOffBuilder, do not call
   // coralInterface, but provide a list of modules built here.
 
-
-  void testStatusChange()
-  {
-    object->coralInterface.reset( new SiStripCoralIface(object->onlineDbConnectionString,object->authenticationPath,false) );
+  void testStatusChange() {
+    object->coralInterface.reset(
+        new SiStripCoralIface(object->onlineDbConnectionString, object->authenticationPath, false));
     SiStripDetVOffBuilder::TimesAndValues tStruct;
-    object->statusChange( object->lastStoredCondObj.second, tStruct );
+    object->statusChange(object->lastStoredCondObj.second, tStruct);
     CPPUNIT_ASSERT(tStruct.actualStatus.size() != 0);
   }
-  void testBuildDetVOffObj()
-  {
+  void testBuildDetVOffObj() {
     // CPPUNIT_ASSERT( object->BuildDetVOffObj() );
   }
 
-  void testReduction()
-  {
+  void testReduction() {
     fillModulesOff();
 
     cout << "number of IOVs before reduction = " << object->modulesOff.size() << endl;
@@ -96,7 +91,7 @@ class TestSiStripDetVOffBuilder : public CppUnit::TestFixture {
 
     cout << "number of IOVs after reduction = " << object->modulesOff.size() << endl;
     vector<pair<SiStripDetVOff *, cond::Time_t> >::const_iterator iovContent = object->modulesOff.begin();
-    for( ; iovContent != object->modulesOff.end(); ++iovContent ) {
+    for (; iovContent != object->modulesOff.end(); ++iovContent) {
       coral::TimeStamp coralTime(object->getCoralTime(iovContent->second));
       cout << "iov seconds = " << coralTime.second() << ", nanoseconds = " << coralTime.nanosecond();
       cout << ", number of modules with HV off = " << iovContent->first->getHVoffCounts() << endl;
@@ -106,58 +101,58 @@ class TestSiStripDetVOffBuilder : public CppUnit::TestFixture {
     CPPUNIT_ASSERT(object->modulesOff.size() == 5);
   }
 
-  void fillModulesOff()
-  {
+  void fillModulesOff() {
     // Initialization: all off
-    fillModule( 1,  1, 1,   0, 0 );
-    fillModule( 2,  1, 1,   0, 1000 );
-    fillModule( 3,  1, 1,   0, 2000 );
+    fillModule(1, 1, 1, 0, 0);
+    fillModule(2, 1, 1, 0, 1000);
+    fillModule(3, 1, 1, 0, 2000);
 
     // Ramping up phase: LV going on
-    fillModule( 1,  1, 0,   5, 0 );
-    fillModule( 2,  1, 0,   5, 1000 );
-    fillModule( 3,  1, 0,   5, 2000 );
+    fillModule(1, 1, 0, 5, 0);
+    fillModule(2, 1, 0, 5, 1000);
+    fillModule(3, 1, 0, 5, 2000);
     // HV going on
-    fillModule( 1,  0, 0,  10, 0 );
-    fillModule( 2,  0, 0,  10, 1000 );
-    fillModule( 3,  0, 0,  10, 2000 );
+    fillModule(1, 0, 0, 10, 0);
+    fillModule(2, 0, 0, 10, 1000);
+    fillModule(3, 0, 0, 10, 2000);
 
     // Wait some time, then switch off HV
-    fillModule( 1,  1, 0,  15, 0 );
-    fillModule( 2,  1, 0,  15, 1000 );
-    fillModule( 3,  1, 0,  15, 2000 );
+    fillModule(1, 1, 0, 15, 0);
+    fillModule(2, 1, 0, 15, 1000);
+    fillModule(3, 1, 0, 15, 2000);
     // LV off
-    fillModule( 1,  1, 1,  20, 0 );
-    fillModule( 2,  1, 1,  20, 1000 );
-    fillModule( 3,  1, 1,  20, 2000 );
+    fillModule(1, 1, 1, 20, 0);
+    fillModule(2, 1, 1, 20, 1000);
+    fillModule(3, 1, 1, 20, 2000);
 
     // fillModule( 3,  1, 0,  25, 0 );
   }
 
-  void fillModule(const unsigned int detId, const unsigned int HVoff, const unsigned int LVoff, const unsigned int seconds, const unsigned int nanoseconds)
-  {
-    // Build the cond time from the 
-    cond::Time_t condTime = object->getCondTime( coral::TimeStamp(2009, 12, 1, 1, 0, seconds, nanoseconds) );
+  void fillModule(const unsigned int detId,
+                  const unsigned int HVoff,
+                  const unsigned int LVoff,
+                  const unsigned int seconds,
+                  const unsigned int nanoseconds) {
+    // Build the cond time from the
+    cond::Time_t condTime = object->getCondTime(coral::TimeStamp(2009, 12, 1, 1, 0, seconds, nanoseconds));
     // Carefull, there is a memory leakage here. Fine if the program is kept simple.
     detVoff->put(detId, HVoff, LVoff);
-    SiStripDetVOff * localDetVoff = new SiStripDetVOff(*detVoff);
-    object->modulesOff.push_back( make_pair(localDetVoff, condTime) );
+    SiStripDetVOff *localDetVoff = new SiStripDetVOff(*detVoff);
+    object->modulesOff.push_back(make_pair(localDetVoff, condTime));
   }
 
-
   // Declare and build the test suite
-  CPPUNIT_TEST_SUITE( TestSiStripDetVOffBuilder );
-  CPPUNIT_TEST( testConstructor );
+  CPPUNIT_TEST_SUITE(TestSiStripDetVOffBuilder);
+  CPPUNIT_TEST(testConstructor);
   // CPPUNIT_TEST( testStatusChange );
-  CPPUNIT_TEST( testReduction );
+  CPPUNIT_TEST(testReduction);
   CPPUNIT_TEST_SUITE_END();
 
-
-  SiStripDetVOffBuilder * object;
-  SiStripDetVOff * detVoff;
+  SiStripDetVOffBuilder *object;
+  SiStripDetVOff *detVoff;
 };
 
 // Register the test suite in the registry.
 // This way we will have to only pass the registry to the runner
 // and it will contain all the registered test suites.
-CPPUNIT_TEST_SUITE_REGISTRATION( TestSiStripDetVOffBuilder );
+CPPUNIT_TEST_SUITE_REGISTRATION(TestSiStripDetVOffBuilder);
diff --git a/CalibTracker/SiStripHitEfficiency/plugins/BuildFile.xml b/CalibTracker/SiStripHitEfficiency/plugins/BuildFile.xml
index 75d99814ad80c..92702d6fd7fad 100644
--- a/CalibTracker/SiStripHitEfficiency/plugins/BuildFile.xml
+++ b/CalibTracker/SiStripHitEfficiency/plugins/BuildFile.xml
@@ -1,4 +1,3 @@
-<use   name="AnalysisDataFormats/SiStripClusterInfo"/>
 <use   name="CommonTools/TrackerMap"/>
 <use   name="CommonTools/UtilAlgos"/>
 <use   name="CondCore/DBOutputService"/>
diff --git a/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc b/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc
index 2b50e223beb71..a66e00a197be2 100755
--- a/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc
+++ b/CalibTracker/SiStripHitEfficiency/plugins/SiStripHitEffFromCalibTree.cc
@@ -42,7 +42,7 @@
 #include "RecoTracker/MeasurementDet/interface/MeasurementTracker.h"
 
 #include "RecoTracker/Record/interface/CkfComponentsRecord.h"
-#include "AnalysisDataFormats/SiStripClusterInfo/interface/SiStripClusterInfo.h"
+#include "RecoLocalTracker/SiStripClusterizer/interface/SiStripClusterInfo.h"
 #include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
 #include "CalibTracker/Records/interface/SiStripQualityRcd.h"
diff --git a/CalibTracker/SiStripHitEfficiency/src/HitEff.cc b/CalibTracker/SiStripHitEfficiency/src/HitEff.cc
index 6c4ac5254afe3..5da0c2b459175 100644
--- a/CalibTracker/SiStripHitEfficiency/src/HitEff.cc
+++ b/CalibTracker/SiStripHitEfficiency/src/HitEff.cc
@@ -49,7 +49,7 @@
 #include "RecoTracker/MeasurementDet/interface/MeasurementTrackerEvent.h"
 
 #include "RecoTracker/Record/interface/CkfComponentsRecord.h"
-#include "AnalysisDataFormats/SiStripClusterInfo/interface/SiStripClusterInfo.h"
+#include "RecoLocalTracker/SiStripClusterizer/interface/SiStripClusterInfo.h"
 #include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
 #include "CalibTracker/Records/interface/SiStripQualityRcd.h"
diff --git a/CalibTracker/SiStripLorentzAngle/interface/SiStripCalibLorentzAngle.h b/CalibTracker/SiStripLorentzAngle/interface/SiStripCalibLorentzAngle.h
index 7ea370dc40644..c1440740600b4 100755
--- a/CalibTracker/SiStripLorentzAngle/interface/SiStripCalibLorentzAngle.h
+++ b/CalibTracker/SiStripLorentzAngle/interface/SiStripCalibLorentzAngle.h
@@ -14,8 +14,6 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
@@ -35,6 +33,7 @@
 #include <memory>
 
 class TrackerTopology;
+class MonitorElement;
 
 class SiStripCalibLorentzAngle : public ConditionDBWriter<SiStripLorentzAngle>
 {
diff --git a/CalibTracker/SiStripLorentzAngle/interface/SiStripLAProfileBooker.h b/CalibTracker/SiStripLorentzAngle/interface/SiStripLAProfileBooker.h
index de6493ba9f3eb..225c914714928 100644
--- a/CalibTracker/SiStripLorentzAngle/interface/SiStripLAProfileBooker.h
+++ b/CalibTracker/SiStripLorentzAngle/interface/SiStripLAProfileBooker.h
@@ -11,21 +11,20 @@
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMStore.h"
+//#include "DQMServices/Core/interface/MonitorElement.h"
+//#include "DQMServices/Core/interface/DQMStore.h"
 
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/GeometryVector/interface/LocalVector.h"
 
-#include "TrackingTools/PatternTools/interface/Trajectory.h"
-#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
-
 #include <TTree.h>
 #include <TFile.h>
 #include <TH1D.h>
 #include <TDirectory.h>
 
 class TrackerTopology;
+class MonitorElement;
+class DQMStore;
 
 class SiStripLAProfileBooker : public edm::EDAnalyzer
 {
diff --git a/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc b/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc
index dcbd2ef6e6aac..4104235ab7006 100644
--- a/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc
+++ b/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc
@@ -39,6 +39,7 @@
 
 #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h"
 #include "TrackingTools/PatternTools/interface/Trajectory.h"
+#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
 
 #include <TProfile.h>
 #include <TStyle.h>
diff --git a/CalibTracker/SiStripQuality/interface/SiStripBadAPVAlgorithmFromClusterOccupancy.h b/CalibTracker/SiStripQuality/interface/SiStripBadAPVAlgorithmFromClusterOccupancy.h
index c765b7c5d8b61..ab35770a6ba5b 100644
--- a/CalibTracker/SiStripQuality/interface/SiStripBadAPVAlgorithmFromClusterOccupancy.h
+++ b/CalibTracker/SiStripQuality/interface/SiStripBadAPVAlgorithmFromClusterOccupancy.h
@@ -2,7 +2,7 @@
 //
 // Package:    SiStripQuality
 // Class:      SiStripBadAPVAlgorithmFromClusterOccupancy
-// 
+//
 /**\class SiStripBadAPVAlgorithmFromClusterOccupancy SiStripBadAPVAlgorithmFromClusterOccupancy.h CalibTracker/SiStripQuality/src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc
 
  Description: <one line class summary>
@@ -38,30 +38,30 @@
 class SiStripQuality;
 class TrackerTopology;
 
-class SiStripBadAPVAlgorithmFromClusterOccupancy{
-
+class SiStripBadAPVAlgorithmFromClusterOccupancy {
 public:
-  typedef SiStrip::QualityHistosMap HistoMap;  
-  
+  typedef SiStrip::QualityHistosMap HistoMap;
+
   SiStripBadAPVAlgorithmFromClusterOccupancy(const edm::ParameterSet&, const TrackerTopology*);
 
   virtual ~SiStripBadAPVAlgorithmFromClusterOccupancy();
 
-  void setLowOccupancyThreshold(long double low_occupancy){lowoccupancy_=low_occupancy;}
-  void setHighOccupancyThreshold(long double high_occupancy){highoccupancy_=high_occupancy;}
-  void setAbsoluteLowThreshold(long double absolute_low){absolutelow_=absolute_low;}
-  void setNumberIterations(int number_iterations){numberiterations_=number_iterations;}
-  void setAbsoluteOccupancyThreshold(long double occupancy){occupancy_=occupancy;}
-  void setNumberOfEvents(double Nevents){Nevents_=Nevents;}
+  void setLowOccupancyThreshold(long double low_occupancy) { lowoccupancy_ = low_occupancy; }
+  void setHighOccupancyThreshold(long double high_occupancy) { highoccupancy_ = high_occupancy; }
+  void setAbsoluteLowThreshold(long double absolute_low) { absolutelow_ = absolute_low; }
+  void setNumberIterations(int number_iterations) { numberiterations_ = number_iterations; }
+  void setAbsoluteOccupancyThreshold(long double occupancy) { occupancy_ = occupancy; }
+  void setNumberOfEvents(double Nevents) { Nevents_ = Nevents; }
   void setMinNumOfEvents();
-  void setOutputFileName(std::string OutputFileName, bool WriteOutputFile){OutFileName_=OutputFileName; WriteOutputFile_=WriteOutputFile;}
-  void setTrackerGeometry(const TrackerGeometry* tkgeom){TkGeom = tkgeom;}
-  void extractBadAPVs(SiStripQuality*,HistoMap&,edm::ESHandle<SiStripQuality>&);
-
- private:
-
-  struct Apv{   
-
+  void setOutputFileName(std::string OutputFileName, bool WriteOutputFile) {
+    OutFileName_ = OutputFileName;
+    WriteOutputFile_ = WriteOutputFile;
+  }
+  void setTrackerGeometry(const TrackerGeometry* tkgeom) { TkGeom = tkgeom; }
+  void extractBadAPVs(SiStripQuality*, HistoMap&, edm::ESHandle<SiStripQuality>&);
+
+private:
+  struct Apv {
     uint32_t detrawId;
     int modulePosition;
     int numberApvs;
@@ -69,13 +69,16 @@ class SiStripBadAPVAlgorithmFromClusterOccupancy{
     double apvabsoluteOccupancy[6];
   };
 
-  void CalculateMeanAndRMS(const std::vector<Apv>&, std::pair<double,double>*, int);
-
-  void AnalyzeOccupancy(SiStripQuality*, std::vector<Apv>&, std::pair<double,double>*, std::vector<unsigned int>&, edm::ESHandle<SiStripQuality>&);
+  void CalculateMeanAndRMS(const std::vector<Apv>&, std::pair<double, double>*, int);
 
-  struct pHisto{   
+  void AnalyzeOccupancy(SiStripQuality*,
+                        std::vector<Apv>&,
+                        std::pair<double, double>*,
+                        std::vector<unsigned int>&,
+                        edm::ESHandle<SiStripQuality>&);
 
-    pHisto():_NEntries(0),_NBins(0){};
+  struct pHisto {
+    pHisto() : _NEntries(0), _NBins(0){};
     TH1F* _th1f;
     int _NEntries;
     int _NBins;
@@ -94,51 +97,84 @@ class SiStripBadAPVAlgorithmFromClusterOccupancy{
   const TrackerGeometry* TkGeom;
   const TrackerTopology* tTopo;
 
-  SiStripQuality *pQuality;
+  SiStripQuality* pQuality;
 
   double stripOccupancy[6][128];
   double stripWeight[6][128];
 
-  std::vector<Apv> medianValues_TIB_Layer1; std::pair<double,double> MeanAndRms_TIB_Layer1[7];
-  std::vector<Apv> medianValues_TIB_Layer2; std::pair<double,double> MeanAndRms_TIB_Layer2[7];
-  std::vector<Apv> medianValues_TIB_Layer3; std::pair<double,double> MeanAndRms_TIB_Layer3[7];
-  std::vector<Apv> medianValues_TIB_Layer4; std::pair<double,double> MeanAndRms_TIB_Layer4[7];
-
-  std::vector<Apv> medianValues_TOB_Layer1; std::pair<double,double> MeanAndRms_TOB_Layer1[7];
-  std::vector<Apv> medianValues_TOB_Layer2; std::pair<double,double> MeanAndRms_TOB_Layer2[7];
-  std::vector<Apv> medianValues_TOB_Layer3; std::pair<double,double> MeanAndRms_TOB_Layer3[7];
-  std::vector<Apv> medianValues_TOB_Layer4; std::pair<double,double> MeanAndRms_TOB_Layer4[7];
-  std::vector<Apv> medianValues_TOB_Layer5; std::pair<double,double> MeanAndRms_TOB_Layer5[7];
-  std::vector<Apv> medianValues_TOB_Layer6; std::pair<double,double> MeanAndRms_TOB_Layer6[7];
-
-  std::vector<Apv> medianValues_TIDPlus_Disc1; std::pair<double,double> MeanAndRms_TIDPlus_Disc1[7];
-  std::vector<Apv> medianValues_TIDPlus_Disc2; std::pair<double,double> MeanAndRms_TIDPlus_Disc2[7];
-  std::vector<Apv> medianValues_TIDPlus_Disc3; std::pair<double,double> MeanAndRms_TIDPlus_Disc3[7];
-
-  std::vector<Apv> medianValues_TIDMinus_Disc1; std::pair<double,double> MeanAndRms_TIDMinus_Disc1[7];
-  std::vector<Apv> medianValues_TIDMinus_Disc2; std::pair<double,double> MeanAndRms_TIDMinus_Disc2[7];
-  std::vector<Apv> medianValues_TIDMinus_Disc3; std::pair<double,double> MeanAndRms_TIDMinus_Disc3[7];
-
-  std::vector<Apv> medianValues_TECPlus_Disc1; std::pair<double,double> MeanAndRms_TECPlus_Disc1[7];
-  std::vector<Apv> medianValues_TECPlus_Disc2; std::pair<double,double> MeanAndRms_TECPlus_Disc2[7];
-  std::vector<Apv> medianValues_TECPlus_Disc3; std::pair<double,double> MeanAndRms_TECPlus_Disc3[7];
-  std::vector<Apv> medianValues_TECPlus_Disc4; std::pair<double,double> MeanAndRms_TECPlus_Disc4[7];
-  std::vector<Apv> medianValues_TECPlus_Disc5; std::pair<double,double> MeanAndRms_TECPlus_Disc5[7];
-  std::vector<Apv> medianValues_TECPlus_Disc6; std::pair<double,double> MeanAndRms_TECPlus_Disc6[7];
-  std::vector<Apv> medianValues_TECPlus_Disc7; std::pair<double,double> MeanAndRms_TECPlus_Disc7[7];
-  std::vector<Apv> medianValues_TECPlus_Disc8; std::pair<double,double> MeanAndRms_TECPlus_Disc8[7];
-  std::vector<Apv> medianValues_TECPlus_Disc9; std::pair<double,double> MeanAndRms_TECPlus_Disc9[7];
-
-  std::vector<Apv> medianValues_TECMinus_Disc1; std::pair<double,double> MeanAndRms_TECMinus_Disc1[7];
-  std::vector<Apv> medianValues_TECMinus_Disc2; std::pair<double,double> MeanAndRms_TECMinus_Disc2[7];
-  std::vector<Apv> medianValues_TECMinus_Disc3; std::pair<double,double> MeanAndRms_TECMinus_Disc3[7];
-  std::vector<Apv> medianValues_TECMinus_Disc4; std::pair<double,double> MeanAndRms_TECMinus_Disc4[7];
-  std::vector<Apv> medianValues_TECMinus_Disc5; std::pair<double,double> MeanAndRms_TECMinus_Disc5[7];
-  std::vector<Apv> medianValues_TECMinus_Disc6; std::pair<double,double> MeanAndRms_TECMinus_Disc6[7];
-  std::vector<Apv> medianValues_TECMinus_Disc7; std::pair<double,double> MeanAndRms_TECMinus_Disc7[7];
-  std::vector<Apv> medianValues_TECMinus_Disc8; std::pair<double,double> MeanAndRms_TECMinus_Disc8[7];
-  std::vector<Apv> medianValues_TECMinus_Disc9; std::pair<double,double> MeanAndRms_TECMinus_Disc9[7];
-
+  std::vector<Apv> medianValues_TIB_Layer1;
+  std::pair<double, double> MeanAndRms_TIB_Layer1[7];
+  std::vector<Apv> medianValues_TIB_Layer2;
+  std::pair<double, double> MeanAndRms_TIB_Layer2[7];
+  std::vector<Apv> medianValues_TIB_Layer3;
+  std::pair<double, double> MeanAndRms_TIB_Layer3[7];
+  std::vector<Apv> medianValues_TIB_Layer4;
+  std::pair<double, double> MeanAndRms_TIB_Layer4[7];
+
+  std::vector<Apv> medianValues_TOB_Layer1;
+  std::pair<double, double> MeanAndRms_TOB_Layer1[7];
+  std::vector<Apv> medianValues_TOB_Layer2;
+  std::pair<double, double> MeanAndRms_TOB_Layer2[7];
+  std::vector<Apv> medianValues_TOB_Layer3;
+  std::pair<double, double> MeanAndRms_TOB_Layer3[7];
+  std::vector<Apv> medianValues_TOB_Layer4;
+  std::pair<double, double> MeanAndRms_TOB_Layer4[7];
+  std::vector<Apv> medianValues_TOB_Layer5;
+  std::pair<double, double> MeanAndRms_TOB_Layer5[7];
+  std::vector<Apv> medianValues_TOB_Layer6;
+  std::pair<double, double> MeanAndRms_TOB_Layer6[7];
+
+  std::vector<Apv> medianValues_TIDPlus_Disc1;
+  std::pair<double, double> MeanAndRms_TIDPlus_Disc1[7];
+  std::vector<Apv> medianValues_TIDPlus_Disc2;
+  std::pair<double, double> MeanAndRms_TIDPlus_Disc2[7];
+  std::vector<Apv> medianValues_TIDPlus_Disc3;
+  std::pair<double, double> MeanAndRms_TIDPlus_Disc3[7];
+
+  std::vector<Apv> medianValues_TIDMinus_Disc1;
+  std::pair<double, double> MeanAndRms_TIDMinus_Disc1[7];
+  std::vector<Apv> medianValues_TIDMinus_Disc2;
+  std::pair<double, double> MeanAndRms_TIDMinus_Disc2[7];
+  std::vector<Apv> medianValues_TIDMinus_Disc3;
+  std::pair<double, double> MeanAndRms_TIDMinus_Disc3[7];
+
+  std::vector<Apv> medianValues_TECPlus_Disc1;
+  std::pair<double, double> MeanAndRms_TECPlus_Disc1[7];
+  std::vector<Apv> medianValues_TECPlus_Disc2;
+  std::pair<double, double> MeanAndRms_TECPlus_Disc2[7];
+  std::vector<Apv> medianValues_TECPlus_Disc3;
+  std::pair<double, double> MeanAndRms_TECPlus_Disc3[7];
+  std::vector<Apv> medianValues_TECPlus_Disc4;
+  std::pair<double, double> MeanAndRms_TECPlus_Disc4[7];
+  std::vector<Apv> medianValues_TECPlus_Disc5;
+  std::pair<double, double> MeanAndRms_TECPlus_Disc5[7];
+  std::vector<Apv> medianValues_TECPlus_Disc6;
+  std::pair<double, double> MeanAndRms_TECPlus_Disc6[7];
+  std::vector<Apv> medianValues_TECPlus_Disc7;
+  std::pair<double, double> MeanAndRms_TECPlus_Disc7[7];
+  std::vector<Apv> medianValues_TECPlus_Disc8;
+  std::pair<double, double> MeanAndRms_TECPlus_Disc8[7];
+  std::vector<Apv> medianValues_TECPlus_Disc9;
+  std::pair<double, double> MeanAndRms_TECPlus_Disc9[7];
+
+  std::vector<Apv> medianValues_TECMinus_Disc1;
+  std::pair<double, double> MeanAndRms_TECMinus_Disc1[7];
+  std::vector<Apv> medianValues_TECMinus_Disc2;
+  std::pair<double, double> MeanAndRms_TECMinus_Disc2[7];
+  std::vector<Apv> medianValues_TECMinus_Disc3;
+  std::pair<double, double> MeanAndRms_TECMinus_Disc3[7];
+  std::vector<Apv> medianValues_TECMinus_Disc4;
+  std::pair<double, double> MeanAndRms_TECMinus_Disc4[7];
+  std::vector<Apv> medianValues_TECMinus_Disc5;
+  std::pair<double, double> MeanAndRms_TECMinus_Disc5[7];
+  std::vector<Apv> medianValues_TECMinus_Disc6;
+  std::pair<double, double> MeanAndRms_TECMinus_Disc6[7];
+  std::vector<Apv> medianValues_TECMinus_Disc7;
+  std::pair<double, double> MeanAndRms_TECMinus_Disc7[7];
+  std::vector<Apv> medianValues_TECMinus_Disc8;
+  std::pair<double, double> MeanAndRms_TECMinus_Disc8[7];
+  std::vector<Apv> medianValues_TECMinus_Disc9;
+  std::pair<double, double> MeanAndRms_TECMinus_Disc9[7];
 
   TFile* f;
   TTree* apvtree;
@@ -164,7 +200,6 @@ class SiStripBadAPVAlgorithmFromClusterOccupancy{
   double apvAbsoluteOccupancy;
   double apvMedianOccupancy;
 
-  std::stringstream ss;   
+  std::stringstream ss;
 };
 #endif
-
diff --git a/CalibTracker/SiStripQuality/interface/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.h b/CalibTracker/SiStripQuality/interface/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.h
index 6ac0c050d59ad..0bf223072845a 100644
--- a/CalibTracker/SiStripQuality/interface/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.h
+++ b/CalibTracker/SiStripQuality/interface/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.h
@@ -2,7 +2,7 @@
 //
 // Package:    SiStripQuality
 // Class:      SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy
-// 
+//
 /**\class SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.h CalibTracker/SiStripQuality/src/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.cc
 
  Description: <one line class summary>
@@ -41,33 +41,38 @@
 class SiStripQuality;
 class TrackerTopology;
 
-class SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy{
-
+class SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy {
 public:
-  typedef SiStrip::QualityHistosMap HistoMap;  
-  
+  typedef SiStrip::QualityHistosMap HistoMap;
+
   SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy(const edm::ParameterSet&, const TrackerTopology*);
 
   virtual ~SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy();
 
-  void setProbabilityThreshold(long double prob){prob_=prob;}
-  void setMinNumEntries(unsigned short m){MinNumEntries_=m;}
-  void setMinNumEntriesPerStrip(unsigned short m){MinNumEntriesPerStrip_=m;}
-  void setLowOccupancyThreshold(long double low_occupancy){lowoccupancy_=low_occupancy;}
-  void setHighOccupancyThreshold(long double high_occupancy){highoccupancy_=high_occupancy;}
-  void setAbsoluteLowThreshold(long double absolute_low){absolutelow_=absolute_low;}
-  void setNumberIterations(int number_iterations){numberiterations_=number_iterations;}
-  void setAbsoluteOccupancyThreshold(long double absolute_occupancy){absolute_occupancy_=absolute_occupancy;}
-  void setNumberOfEvents(double Nevents){Nevents_=Nevents;}
+  void setProbabilityThreshold(long double prob) { prob_ = prob; }
+  void setMinNumEntries(unsigned short m) { MinNumEntries_ = m; }
+  void setMinNumEntriesPerStrip(unsigned short m) { MinNumEntriesPerStrip_ = m; }
+  void setLowOccupancyThreshold(long double low_occupancy) { lowoccupancy_ = low_occupancy; }
+  void setHighOccupancyThreshold(long double high_occupancy) { highoccupancy_ = high_occupancy; }
+  void setAbsoluteLowThreshold(long double absolute_low) { absolutelow_ = absolute_low; }
+  void setNumberIterations(int number_iterations) { numberiterations_ = number_iterations; }
+  void setAbsoluteOccupancyThreshold(long double absolute_occupancy) { absolute_occupancy_ = absolute_occupancy; }
+  void setNumberOfEvents(double Nevents) { Nevents_ = Nevents; }
   void setMinNumOfEvents();
-  void setOutputFileName(std::string OutputFileName, bool WriteOutputFile, std::string DQMOutfileName, bool WriteDQMHistograms){OutFileName_=OutputFileName; WriteOutputFile_=WriteOutputFile; DQMOutfileName_=DQMOutfileName; WriteDQMHistograms_=WriteDQMHistograms;}
-  void setTrackerGeometry(const TrackerGeometry* tkgeom){TkGeom = tkgeom;}
-  void extractBadAPVSandStrips(SiStripQuality*,HistoMap&,edm::ESHandle<SiStripQuality>&);
-
- private:
-
-  struct Apv{   
-
+  void setOutputFileName(std::string OutputFileName,
+                         bool WriteOutputFile,
+                         std::string DQMOutfileName,
+                         bool WriteDQMHistograms) {
+    OutFileName_ = OutputFileName;
+    WriteOutputFile_ = WriteOutputFile;
+    DQMOutfileName_ = DQMOutfileName;
+    WriteDQMHistograms_ = WriteDQMHistograms;
+  }
+  void setTrackerGeometry(const TrackerGeometry* tkgeom) { TkGeom = tkgeom; }
+  void extractBadAPVSandStrips(SiStripQuality*, HistoMap&, edm::ESHandle<SiStripQuality>&);
+
+private:
+  struct Apv {
     uint32_t detrawId;
     int modulePosition;
     int numberApvs;
@@ -78,13 +83,17 @@ class SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy{
     int NEmptyBins[6];
   };
 
-  void CalculateMeanAndRMS(const std::vector<Apv>&, std::pair<double,double>*, int);
+  void CalculateMeanAndRMS(const std::vector<Apv>&, std::pair<double, double>*, int);
 
-  void AnalyzeOccupancy(SiStripQuality*, std::vector<Apv>&, std::pair<double,double>*, std::vector<unsigned int>&, edm::ESHandle<SiStripQuality>&);
+  void AnalyzeOccupancy(SiStripQuality*,
+                        std::vector<Apv>&,
+                        std::pair<double, double>*,
+                        std::vector<unsigned int>&,
+                        edm::ESHandle<SiStripQuality>&);
 
-  void iterativeSearch(Apv&,std::vector<unsigned int>&,int);
+  void iterativeSearch(Apv&, std::vector<unsigned int>&, int);
 
-  void evaluatePoissonian(std::vector<long double>& , long double& meanVal);
+  void evaluatePoissonian(std::vector<long double>&, long double& meanVal);
 
   void setBasicTreeParameters(int detid);
 
@@ -111,51 +120,84 @@ class SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy{
   const TrackerGeometry* TkGeom;
   const TrackerTopology* tTopo;
 
-  SiStripQuality *pQuality;
+  SiStripQuality* pQuality;
 
   double stripOccupancy[6][128];
   double stripWeight[6][128];
 
-  std::vector<Apv> medianValues_TIB_Layer1; std::pair<double,double> MeanAndRms_TIB_Layer1[7];
-  std::vector<Apv> medianValues_TIB_Layer2; std::pair<double,double> MeanAndRms_TIB_Layer2[7];
-  std::vector<Apv> medianValues_TIB_Layer3; std::pair<double,double> MeanAndRms_TIB_Layer3[7];
-  std::vector<Apv> medianValues_TIB_Layer4; std::pair<double,double> MeanAndRms_TIB_Layer4[7];
-
-  std::vector<Apv> medianValues_TOB_Layer1; std::pair<double,double> MeanAndRms_TOB_Layer1[7];
-  std::vector<Apv> medianValues_TOB_Layer2; std::pair<double,double> MeanAndRms_TOB_Layer2[7];
-  std::vector<Apv> medianValues_TOB_Layer3; std::pair<double,double> MeanAndRms_TOB_Layer3[7];
-  std::vector<Apv> medianValues_TOB_Layer4; std::pair<double,double> MeanAndRms_TOB_Layer4[7];
-  std::vector<Apv> medianValues_TOB_Layer5; std::pair<double,double> MeanAndRms_TOB_Layer5[7];
-  std::vector<Apv> medianValues_TOB_Layer6; std::pair<double,double> MeanAndRms_TOB_Layer6[7];
-
-  std::vector<Apv> medianValues_TIDPlus_Disc1; std::pair<double,double> MeanAndRms_TIDPlus_Disc1[7];
-  std::vector<Apv> medianValues_TIDPlus_Disc2; std::pair<double,double> MeanAndRms_TIDPlus_Disc2[7];
-  std::vector<Apv> medianValues_TIDPlus_Disc3; std::pair<double,double> MeanAndRms_TIDPlus_Disc3[7];
-
-  std::vector<Apv> medianValues_TIDMinus_Disc1; std::pair<double,double> MeanAndRms_TIDMinus_Disc1[7];
-  std::vector<Apv> medianValues_TIDMinus_Disc2; std::pair<double,double> MeanAndRms_TIDMinus_Disc2[7];
-  std::vector<Apv> medianValues_TIDMinus_Disc3; std::pair<double,double> MeanAndRms_TIDMinus_Disc3[7];
-
-  std::vector<Apv> medianValues_TECPlus_Disc1; std::pair<double,double> MeanAndRms_TECPlus_Disc1[7];
-  std::vector<Apv> medianValues_TECPlus_Disc2; std::pair<double,double> MeanAndRms_TECPlus_Disc2[7];
-  std::vector<Apv> medianValues_TECPlus_Disc3; std::pair<double,double> MeanAndRms_TECPlus_Disc3[7];
-  std::vector<Apv> medianValues_TECPlus_Disc4; std::pair<double,double> MeanAndRms_TECPlus_Disc4[7];
-  std::vector<Apv> medianValues_TECPlus_Disc5; std::pair<double,double> MeanAndRms_TECPlus_Disc5[7];
-  std::vector<Apv> medianValues_TECPlus_Disc6; std::pair<double,double> MeanAndRms_TECPlus_Disc6[7];
-  std::vector<Apv> medianValues_TECPlus_Disc7; std::pair<double,double> MeanAndRms_TECPlus_Disc7[7];
-  std::vector<Apv> medianValues_TECPlus_Disc8; std::pair<double,double> MeanAndRms_TECPlus_Disc8[7];
-  std::vector<Apv> medianValues_TECPlus_Disc9; std::pair<double,double> MeanAndRms_TECPlus_Disc9[7];
-
-  std::vector<Apv> medianValues_TECMinus_Disc1; std::pair<double,double> MeanAndRms_TECMinus_Disc1[7];
-  std::vector<Apv> medianValues_TECMinus_Disc2; std::pair<double,double> MeanAndRms_TECMinus_Disc2[7];
-  std::vector<Apv> medianValues_TECMinus_Disc3; std::pair<double,double> MeanAndRms_TECMinus_Disc3[7];
-  std::vector<Apv> medianValues_TECMinus_Disc4; std::pair<double,double> MeanAndRms_TECMinus_Disc4[7];
-  std::vector<Apv> medianValues_TECMinus_Disc5; std::pair<double,double> MeanAndRms_TECMinus_Disc5[7];
-  std::vector<Apv> medianValues_TECMinus_Disc6; std::pair<double,double> MeanAndRms_TECMinus_Disc6[7];
-  std::vector<Apv> medianValues_TECMinus_Disc7; std::pair<double,double> MeanAndRms_TECMinus_Disc7[7];
-  std::vector<Apv> medianValues_TECMinus_Disc8; std::pair<double,double> MeanAndRms_TECMinus_Disc8[7];
-  std::vector<Apv> medianValues_TECMinus_Disc9; std::pair<double,double> MeanAndRms_TECMinus_Disc9[7];
-
+  std::vector<Apv> medianValues_TIB_Layer1;
+  std::pair<double, double> MeanAndRms_TIB_Layer1[7];
+  std::vector<Apv> medianValues_TIB_Layer2;
+  std::pair<double, double> MeanAndRms_TIB_Layer2[7];
+  std::vector<Apv> medianValues_TIB_Layer3;
+  std::pair<double, double> MeanAndRms_TIB_Layer3[7];
+  std::vector<Apv> medianValues_TIB_Layer4;
+  std::pair<double, double> MeanAndRms_TIB_Layer4[7];
+
+  std::vector<Apv> medianValues_TOB_Layer1;
+  std::pair<double, double> MeanAndRms_TOB_Layer1[7];
+  std::vector<Apv> medianValues_TOB_Layer2;
+  std::pair<double, double> MeanAndRms_TOB_Layer2[7];
+  std::vector<Apv> medianValues_TOB_Layer3;
+  std::pair<double, double> MeanAndRms_TOB_Layer3[7];
+  std::vector<Apv> medianValues_TOB_Layer4;
+  std::pair<double, double> MeanAndRms_TOB_Layer4[7];
+  std::vector<Apv> medianValues_TOB_Layer5;
+  std::pair<double, double> MeanAndRms_TOB_Layer5[7];
+  std::vector<Apv> medianValues_TOB_Layer6;
+  std::pair<double, double> MeanAndRms_TOB_Layer6[7];
+
+  std::vector<Apv> medianValues_TIDPlus_Disc1;
+  std::pair<double, double> MeanAndRms_TIDPlus_Disc1[7];
+  std::vector<Apv> medianValues_TIDPlus_Disc2;
+  std::pair<double, double> MeanAndRms_TIDPlus_Disc2[7];
+  std::vector<Apv> medianValues_TIDPlus_Disc3;
+  std::pair<double, double> MeanAndRms_TIDPlus_Disc3[7];
+
+  std::vector<Apv> medianValues_TIDMinus_Disc1;
+  std::pair<double, double> MeanAndRms_TIDMinus_Disc1[7];
+  std::vector<Apv> medianValues_TIDMinus_Disc2;
+  std::pair<double, double> MeanAndRms_TIDMinus_Disc2[7];
+  std::vector<Apv> medianValues_TIDMinus_Disc3;
+  std::pair<double, double> MeanAndRms_TIDMinus_Disc3[7];
+
+  std::vector<Apv> medianValues_TECPlus_Disc1;
+  std::pair<double, double> MeanAndRms_TECPlus_Disc1[7];
+  std::vector<Apv> medianValues_TECPlus_Disc2;
+  std::pair<double, double> MeanAndRms_TECPlus_Disc2[7];
+  std::vector<Apv> medianValues_TECPlus_Disc3;
+  std::pair<double, double> MeanAndRms_TECPlus_Disc3[7];
+  std::vector<Apv> medianValues_TECPlus_Disc4;
+  std::pair<double, double> MeanAndRms_TECPlus_Disc4[7];
+  std::vector<Apv> medianValues_TECPlus_Disc5;
+  std::pair<double, double> MeanAndRms_TECPlus_Disc5[7];
+  std::vector<Apv> medianValues_TECPlus_Disc6;
+  std::pair<double, double> MeanAndRms_TECPlus_Disc6[7];
+  std::vector<Apv> medianValues_TECPlus_Disc7;
+  std::pair<double, double> MeanAndRms_TECPlus_Disc7[7];
+  std::vector<Apv> medianValues_TECPlus_Disc8;
+  std::pair<double, double> MeanAndRms_TECPlus_Disc8[7];
+  std::vector<Apv> medianValues_TECPlus_Disc9;
+  std::pair<double, double> MeanAndRms_TECPlus_Disc9[7];
+
+  std::vector<Apv> medianValues_TECMinus_Disc1;
+  std::pair<double, double> MeanAndRms_TECMinus_Disc1[7];
+  std::vector<Apv> medianValues_TECMinus_Disc2;
+  std::pair<double, double> MeanAndRms_TECMinus_Disc2[7];
+  std::vector<Apv> medianValues_TECMinus_Disc3;
+  std::pair<double, double> MeanAndRms_TECMinus_Disc3[7];
+  std::vector<Apv> medianValues_TECMinus_Disc4;
+  std::pair<double, double> MeanAndRms_TECMinus_Disc4[7];
+  std::vector<Apv> medianValues_TECMinus_Disc5;
+  std::pair<double, double> MeanAndRms_TECMinus_Disc5[7];
+  std::vector<Apv> medianValues_TECMinus_Disc6;
+  std::pair<double, double> MeanAndRms_TECMinus_Disc6[7];
+  std::vector<Apv> medianValues_TECMinus_Disc7;
+  std::pair<double, double> MeanAndRms_TECMinus_Disc7[7];
+  std::vector<Apv> medianValues_TECMinus_Disc8;
+  std::pair<double, double> MeanAndRms_TECMinus_Disc8[7];
+  std::vector<Apv> medianValues_TECMinus_Disc9;
+  std::pair<double, double> MeanAndRms_TECMinus_Disc9[7];
 
   TFile* f;
   TTree* apvtree;
@@ -181,9 +223,9 @@ class SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy{
   float strip_global_position_y;
   float strip_global_position_z;
 
-  int    apvAbsoluteOccupancy;
+  int apvAbsoluteOccupancy;
   double apvMedianOccupancy;
-  int    isBad;
+  int isBad;
 
   TTree* striptree;
   int strip_number;
@@ -220,7 +262,7 @@ class SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy{
   // indexes in these arrays are [SubDetId-2][LayerN]
   // histograms for [SubDetId-2][0] are global for the subdetector
   // histogram for [0][0] is global for the tracker
-  
+
   TH2F* medianVsAbsoluteOccupancy[5][10];
   TH1F* medianOccupancy[5][10];
   TH1F* absoluteOccupancy[5][10];
@@ -249,7 +291,7 @@ class SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy{
   std::vector<TH2F*> poissonProbGoodStripsVsStripNumber;
   std::vector<TProfile*> pfxPoissonProbGoodStripsVsStripNumber;
   std::vector<TH1F*> projYPoissonProbGoodStripsVsStripNumber;
-   
+
   std::vector<TH2F*> nHitsVsStripNumber;
   std::vector<TProfile*> pfxNHitsVsStripNumber;
   std::vector<TH1F*> projXNHitsVsStripNumber;
@@ -274,4 +316,3 @@ class SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy{
   std::string outfilename;
 };
 #endif
-
diff --git a/CalibTracker/SiStripQuality/interface/SiStripHotStripAlgorithmFromClusterOccupancy.h b/CalibTracker/SiStripQuality/interface/SiStripHotStripAlgorithmFromClusterOccupancy.h
index 9f2a0f99e28ac..a0f69db8b22f4 100644
--- a/CalibTracker/SiStripQuality/interface/SiStripHotStripAlgorithmFromClusterOccupancy.h
+++ b/CalibTracker/SiStripQuality/interface/SiStripHotStripAlgorithmFromClusterOccupancy.h
@@ -2,7 +2,7 @@
 //
 // Package:    SiStripQuality
 // Class:      SiStripHotStripAlgorithmFromClusterOccupancy
-// 
+//
 /**\class SiStripHotStripAlgorithmFromClusterOccupancy SiStripHotStripAlgorithmFromClusterOccupancy.h CalibTracker/SiStripQuality/src/SiStripHotStripAlgorithmFromClusterOccupancy.cc
 
  Description: <one line class summary>
@@ -49,43 +49,45 @@
 class SiStripQuality;
 class TrackerTopology;
 
-class SiStripHotStripAlgorithmFromClusterOccupancy{
-
+class SiStripHotStripAlgorithmFromClusterOccupancy {
 public:
-  typedef SiStrip::QualityHistosMap HistoMap;  
-  
+  typedef SiStrip::QualityHistosMap HistoMap;
 
   SiStripHotStripAlgorithmFromClusterOccupancy(const edm::ParameterSet&, const TrackerTopology*);
 
   virtual ~SiStripHotStripAlgorithmFromClusterOccupancy();
 
-  void setProbabilityThreshold(long double prob){prob_=prob;}
-  void setMinNumEntries(unsigned short m){MinNumEntries_=m;}
-  void setMinNumEntriesPerStrip(unsigned short m){MinNumEntriesPerStrip_=m;}
-  void setOccupancyThreshold(long double occupancy){occupancy_=occupancy;minNevents_=occupancy_*Nevents_;}
+  void setProbabilityThreshold(long double prob) { prob_ = prob; }
+  void setMinNumEntries(unsigned short m) { MinNumEntries_ = m; }
+  void setMinNumEntriesPerStrip(unsigned short m) { MinNumEntriesPerStrip_ = m; }
+  void setOccupancyThreshold(long double occupancy) {
+    occupancy_ = occupancy;
+    minNevents_ = occupancy_ * Nevents_;
+  }
   void setNumberOfEvents(double Nevents);
-  void setOutputFileName(std::string OutputFileName, bool WriteOutputFile){OutFileName_=OutputFileName; WriteOutputFile_=WriteOutputFile;}
-  void setTrackerGeometry(const TrackerGeometry* tkgeom){TkGeom = tkgeom;}
-  void extractBadStrips(SiStripQuality*,HistoMap&,  edm::ESHandle<SiStripQuality>&);
-
- private:
-
+  void setOutputFileName(std::string OutputFileName, bool WriteOutputFile) {
+    OutFileName_ = OutputFileName;
+    WriteOutputFile_ = WriteOutputFile;
+  }
+  void setTrackerGeometry(const TrackerGeometry* tkgeom) { TkGeom = tkgeom; }
+  void extractBadStrips(SiStripQuality*, HistoMap&, edm::ESHandle<SiStripQuality>&);
+
+private:
   // unsigned long long m_cacheID_;
   //std::string dataLabel_;
   //edm::FileInPath fp_;
   //SiStripDetInfoFileReader* reader;
 
-  struct pHisto{   
-
-    pHisto():_NEntries(0),_NEmptyBins(0),_SubdetId(0){};
+  struct pHisto {
+    pHisto() : _NEntries(0), _NEmptyBins(0), _SubdetId(0){};
     TH1F* _th1f;
     int _NEntries;
     int _NEmptyBins;
     int _SubdetId;
   };
 
-  void iterativeSearch(pHisto&,std::vector<unsigned int>&,int);
-  void evaluatePoissonian(std::vector<long double>& , long double& meanVal);
+  void iterativeSearch(pHisto&, std::vector<unsigned int>&, int);
+  void evaluatePoissonian(std::vector<long double>&, long double& meanVal);
 
   long double prob_;
   long double ratio_;
@@ -99,7 +101,7 @@ class SiStripHotStripAlgorithmFromClusterOccupancy{
   const TrackerGeometry* TkGeom;
   const TrackerTopology* tTopo;
 
-  SiStripQuality *pQuality;
+  SiStripQuality* pQuality;
 
   TFile* f;
   TTree* striptree;
@@ -140,8 +142,6 @@ class SiStripHotStripAlgorithmFromClusterOccupancy{
   double medianapvhits[6];
   double avgapvhits[6];
 
-
-  std::stringstream ss;   
+  std::stringstream ss;
 };
 #endif
-
diff --git a/CalibTracker/SiStripQuality/interface/SiStripQualityHistos.h b/CalibTracker/SiStripQuality/interface/SiStripQualityHistos.h
index ace53e113b10c..6789076fdea02 100644
--- a/CalibTracker/SiStripQuality/interface/SiStripQualityHistos.h
+++ b/CalibTracker/SiStripQuality/interface/SiStripQualityHistos.h
@@ -1,11 +1,11 @@
 #ifndef SiStripQualityHistos_H
-#define  SiStripQualityHistos_H
+#define SiStripQualityHistos_H
 
 #include "boost/shared_ptr.hpp"
 #include <ext/hash_map>
 #include "TH1F.h"
 
-namespace SiStrip{
-  typedef __gnu_cxx::hash_map< unsigned int, boost::shared_ptr<TH1F> > QualityHistosMap;  
+namespace SiStrip {
+  typedef __gnu_cxx::hash_map<unsigned int, boost::shared_ptr<TH1F> > QualityHistosMap;
 }
-#endif 
+#endif
diff --git a/CalibTracker/SiStripQuality/plugins/SealModules.cc b/CalibTracker/SiStripQuality/plugins/SealModules.cc
index 71545661262f5..590effc9327b5 100644
--- a/CalibTracker/SiStripQuality/plugins/SealModules.cc
+++ b/CalibTracker/SiStripQuality/plugins/SealModules.cc
@@ -5,7 +5,6 @@
 #include "CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.h"
 #include "CalibTracker/SiStripQuality/plugins/SiStripBadStripFromASCIIFile.h"
 
-
 DEFINE_FWK_MODULE(SiStripBadModuleByHandBuilder);
 DEFINE_FWK_MODULE(SiStripQualityStatistics);
 DEFINE_FWK_MODULE(SiStripQualityHotStripIdentifier);
diff --git a/CalibTracker/SiStripQuality/plugins/SiStripBadModuleByHandBuilder.cc b/CalibTracker/SiStripQuality/plugins/SiStripBadModuleByHandBuilder.cc
index 49d230c9f73dc..3c8f593ad4936 100644
--- a/CalibTracker/SiStripQuality/plugins/SiStripBadModuleByHandBuilder.cc
+++ b/CalibTracker/SiStripQuality/plugins/SiStripBadModuleByHandBuilder.cc
@@ -1,50 +1,44 @@
 #include "CalibTracker/SiStripQuality/plugins/SiStripBadModuleByHandBuilder.h"
 
-
 #include <iostream>
 #include <fstream>
 
-
-SiStripBadModuleByHandBuilder::SiStripBadModuleByHandBuilder(const edm::ParameterSet& iConfig) : ConditionDBWriter<SiStripBadStrip>(iConfig){
-
-  fp_ = iConfig.getUntrackedParameter<edm::FileInPath>("file",edm::FileInPath("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat"));
+SiStripBadModuleByHandBuilder::SiStripBadModuleByHandBuilder(const edm::ParameterSet& iConfig)
+    : ConditionDBWriter<SiStripBadStrip>(iConfig) {
+  fp_ = iConfig.getUntrackedParameter<edm::FileInPath>(
+      "file", edm::FileInPath("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat"));
   BadModuleList_ = iConfig.getUntrackedParameter<std::vector<uint32_t> >("BadModuleList");
-  printdebug_ = iConfig.getUntrackedParameter<bool>("printDebug",false);
+  printdebug_ = iConfig.getUntrackedParameter<bool>("printDebug", false);
 
-  reader = new SiStripDetInfoFileReader(fp_.fullPath());  
+  reader = new SiStripDetInfoFileReader(fp_.fullPath());
 }
 
+SiStripBadModuleByHandBuilder::~SiStripBadModuleByHandBuilder() {}
 
-SiStripBadModuleByHandBuilder::~SiStripBadModuleByHandBuilder(){
-}
-
-std::unique_ptr<SiStripBadStrip> SiStripBadModuleByHandBuilder::getNewObject(){
-  
+std::unique_ptr<SiStripBadStrip> SiStripBadModuleByHandBuilder::getNewObject() {
   auto obj = std::make_unique<SiStripBadStrip>();
 
-  unsigned int firstBadStrip=0;
+  unsigned int firstBadStrip = 0;
   unsigned short NconsecutiveBadStrips;
-  unsigned int theBadStripRange; 
+  unsigned int theBadStripRange;
 
-  for(std::vector<uint32_t>::const_iterator it=BadModuleList_.begin(); it!=BadModuleList_.end(); ++it){
-    
+  for (std::vector<uint32_t>::const_iterator it = BadModuleList_.begin(); it != BadModuleList_.end(); ++it) {
     std::vector<unsigned int> theSiStripVector;
-    
-    NconsecutiveBadStrips=reader->getNumberOfApvsAndStripLength(*it).first*128;
-    theBadStripRange = obj->encode(firstBadStrip,NconsecutiveBadStrips);
+
+    NconsecutiveBadStrips = reader->getNumberOfApvsAndStripLength(*it).first * 128;
+    theBadStripRange = obj->encode(firstBadStrip, NconsecutiveBadStrips);
     if (printdebug_)
-      edm::LogInfo("SiStripBadModuleByHandBuilder") << " BadModule " << *it << " \t"
-						   << " firstBadStrip " << firstBadStrip << "\t "
-						   << " NconsecutiveBadStrips " << NconsecutiveBadStrips << "\t "
-						   << " packed integer " << std::hex << theBadStripRange  << std::dec
-						   << std::endl; 	    
-    
+      edm::LogInfo("SiStripBadModuleByHandBuilder")
+          << " BadModule " << *it << " \t"
+          << " firstBadStrip " << firstBadStrip << "\t "
+          << " NconsecutiveBadStrips " << NconsecutiveBadStrips << "\t "
+          << " packed integer " << std::hex << theBadStripRange << std::dec << std::endl;
+
     theSiStripVector.push_back(theBadStripRange);
-    SiStripBadStrip::Range range(theSiStripVector.begin(),theSiStripVector.end());
-    if ( ! obj->put(*it,range) )
-      edm::LogError("SiStripBadModuleByHandBuilder")<<"[SiStripBadModuleByHandBuilder::analyze] detid already exists"<<std::endl;
+    SiStripBadStrip::Range range(theSiStripVector.begin(), theSiStripVector.end());
+    if (!obj->put(*it, range))
+      edm::LogError("SiStripBadModuleByHandBuilder")
+          << "[SiStripBadModuleByHandBuilder::analyze] detid already exists" << std::endl;
   }
   return obj;
 }
-
-
diff --git a/CalibTracker/SiStripQuality/plugins/SiStripBadModuleByHandBuilder.h b/CalibTracker/SiStripQuality/plugins/SiStripBadModuleByHandBuilder.h
index 385d5771f199b..629cf6d0135ef 100644
--- a/CalibTracker/SiStripQuality/plugins/SiStripBadModuleByHandBuilder.h
+++ b/CalibTracker/SiStripQuality/plugins/SiStripBadModuleByHandBuilder.h
@@ -15,15 +15,11 @@
 #include <ext/hash_map>
 
 class SiStripBadModuleByHandBuilder : public ConditionDBWriter<SiStripBadStrip> {
-
 public:
-
   explicit SiStripBadModuleByHandBuilder(const edm::ParameterSet&);
   ~SiStripBadModuleByHandBuilder() override;
 
-
 private:
-
   std::unique_ptr<SiStripBadStrip> getNewObject() override;
 
 private:
@@ -31,6 +27,5 @@ class SiStripBadModuleByHandBuilder : public ConditionDBWriter<SiStripBadStrip>
   bool printdebug_;
   std::vector<uint32_t> BadModuleList_;
   SiStripDetInfoFileReader* reader;
-
 };
 #endif
diff --git a/CalibTracker/SiStripQuality/plugins/SiStripBadStripFromASCIIFile.cc b/CalibTracker/SiStripQuality/plugins/SiStripBadStripFromASCIIFile.cc
index f02cad9c87372..62b361cd78e4d 100644
--- a/CalibTracker/SiStripQuality/plugins/SiStripBadStripFromASCIIFile.cc
+++ b/CalibTracker/SiStripQuality/plugins/SiStripBadStripFromASCIIFile.cc
@@ -3,13 +3,11 @@
 #include <cstdio>
 #include <string>
 
-
 // user include files
 
-
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h" 
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "Geometry/CommonDetUnit/interface/GeomDetType.h"
@@ -18,122 +16,123 @@
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h"
 #include "DataFormats/FEDRawData/interface/FEDNumbering.h"
 
-
 #include "CLHEP/Random/RandFlat.h"
 #include "CLHEP/Random/RandGauss.h"
 
-
-
 #include "CalibTracker/SiStripQuality/plugins/SiStripBadStripFromASCIIFile.h"
 
-
-
 using namespace std;
 
-SiStripBadStripFromASCIIFile::SiStripBadStripFromASCIIFile( const edm::ParameterSet& iConfig ):
-  ConditionDBWriter<SiStripBadStrip>( iConfig),
-  printdebug_(iConfig.getUntrackedParameter<bool>("printDebug",false))
-{
-  fp_ = iConfig.getUntrackedParameter<edm::FileInPath>("file",edm::FileInPath("CalibTracker/SiStripQuality/data/DefectsFromConstructionDB.dat"));
- }
-
+SiStripBadStripFromASCIIFile::SiStripBadStripFromASCIIFile(const edm::ParameterSet& iConfig)
+    : ConditionDBWriter<SiStripBadStrip>(iConfig),
+      printdebug_(iConfig.getUntrackedParameter<bool>("printDebug", false)) {
+  fp_ = iConfig.getUntrackedParameter<edm::FileInPath>(
+      "file", edm::FileInPath("CalibTracker/SiStripQuality/data/DefectsFromConstructionDB.dat"));
+}
 
 std::unique_ptr<SiStripBadStrip> SiStripBadStripFromASCIIFile::getNewObject() {
-
   auto SiStripBadStrip_ = std::make_unique<SiStripBadStrip>();
 
-   // open file and fill DB
+  // open file and fill DB
   ifstream infile((fp_.fullPath()).c_str());
-  if(!infile){std::cout << "Problem while trying to open File: " << (fp_.fullPath()).c_str() << std::endl;}
-  
+  if (!infile) {
+    std::cout << "Problem while trying to open File: " << (fp_.fullPath()).c_str() << std::endl;
+  }
 
   //variables needed for reading file and filling of SiStripBadStripObject
   uint32_t detid;
   short flag;
   short channel;
- 
-  bool firstrun=true;
-  short tempchannel=0;
-  int count =0;
-  std::vector<unsigned int> theSiStripVector;
-  short tempflag=0;
-  uint32_t tempdetid=0;
-
 
-   while(!infile.eof()){
+  bool firstrun = true;
+  short tempchannel = 0;
+  int count = 0;
+  std::vector<unsigned int> theSiStripVector;
+  short tempflag = 0;
+  uint32_t tempdetid = 0;
 
-    // get data from file: 
+  while (!infile.eof()) {
+    // get data from file:
     //infile >> detid >> channel >> flag;
 
     //if no flag is available, use the following:
     infile >> detid >> channel;
     flag = 1;
 
-    unsigned int theBadStripRange=0;
+    unsigned int theBadStripRange = 0;
 
     // first loop ?
-    if(firstrun) {
-      tempdetid=detid;
-      tempchannel=channel;
-      tempflag=flag;
-      count =0;
-      firstrun=false;
+    if (firstrun) {
+      tempdetid = detid;
+      tempchannel = channel;
+      tempflag = flag;
+      count = 0;
+      firstrun = false;
     }
 
-
-    if(detid==tempdetid){
-      if (channel!=tempchannel+count || flag != tempflag){
-	                                  // 1.badstrip, nconsectrips, flag
-	theBadStripRange = SiStripBadStrip_->encode(tempchannel-1, count, tempflag); // In the quality object, strips are counted from 0 to 767!!! Therefore "tempchannel-1"!
-	                                                                             // In the input txt-file, they have to be from 1 to 768 instead!!!
-	  edm::LogInfo("SiStripBadStripFromASCIIFile")<< "detid " << tempdetid << " \t"
-							   << " firstBadStrip " << tempchannel << "\t "
-							   << " NconsecutiveBadStrips " << count  << "\t "
-	                                                   <<"flag " << tempflag << "\t"
-							   << " packed integer " << std::hex << theBadStripRange  << std::dec
-						           << std::endl; 	    
-
-	  theSiStripVector.push_back(theBadStripRange);
-
-	  if (infile.eof()){ // Don't forget to save the last strip before eof!!!
-	    SiStripBadStrip::Range range(theSiStripVector.begin(),theSiStripVector.end());
-	    if ( ! SiStripBadStrip_->put(tempdetid,range) )
-	      edm::LogError("SiStripBadStripFromASCIIFile")<<"[SiStripBadStripFromASCIIFile::GetNewObject] detid already exists"<<std::endl;
-	    theSiStripVector.clear();
-	  }
-
-	  count=1;
-	  tempchannel=channel;
-	  tempflag=flag;
-	  	
-      }else{count++;}
+    if (detid == tempdetid) {
+      if (channel != tempchannel + count || flag != tempflag) {
+        // 1.badstrip, nconsectrips, flag
+        theBadStripRange = SiStripBadStrip_->encode(
+            tempchannel - 1,
+            count,
+            tempflag);  // In the quality object, strips are counted from 0 to 767!!! Therefore "tempchannel-1"!
+                        // In the input txt-file, they have to be from 1 to 768 instead!!!
+        edm::LogInfo("SiStripBadStripFromASCIIFile")
+            << "detid " << tempdetid << " \t"
+            << " firstBadStrip " << tempchannel << "\t "
+            << " NconsecutiveBadStrips " << count << "\t "
+            << "flag " << tempflag << "\t"
+            << " packed integer " << std::hex << theBadStripRange << std::dec << std::endl;
+
+        theSiStripVector.push_back(theBadStripRange);
+
+        if (infile.eof()) {  // Don't forget to save the last strip before eof!!!
+          SiStripBadStrip::Range range(theSiStripVector.begin(), theSiStripVector.end());
+          if (!SiStripBadStrip_->put(tempdetid, range))
+            edm::LogError("SiStripBadStripFromASCIIFile")
+                << "[SiStripBadStripFromASCIIFile::GetNewObject] detid already exists" << std::endl;
+          theSiStripVector.clear();
+        }
+
+        count = 1;
+        tempchannel = channel;
+        tempflag = flag;
+
+      } else {
+        count++;
+      }
     }
-    
-    if(detid!=tempdetid){
-                                                    // 1.badstrip, nconsectrips, flag
-	  theBadStripRange = SiStripBadStrip_->encode(tempchannel-1, count, tempflag); // In the quality object, strips are counted from 0 to 767!!! Therefore "tempchannel-1"!
-	                                                                               // In the input txt-file, they have to be from 1 to 768 instead!!!
-	  edm::LogInfo("SiStripBadStripFromASCIIFile")<< "detid " << tempdetid << " \t"
-							   << " firstBadStrip " << tempchannel << "\t "
-							   << " NconsecutiveBadStrips " << count  << "\t "
-	                                                   <<"flag " << tempflag << "\t"
-							   << " packed integer " << std::hex << theBadStripRange  << std::dec
-						           << std::endl; 	    
-	  
-	  theSiStripVector.push_back(theBadStripRange);
-	  
-	  // populate db  object
-	  SiStripBadStrip::Range range(theSiStripVector.begin(),theSiStripVector.end());
-    if ( ! SiStripBadStrip_->put(tempdetid,range) )
-      edm::LogError("SiStripBadStripFromASCIIFile")<<"[SiStripBadStripFromASCIIFile::GetNewObject] detid already exists"<<std::endl;
-    theSiStripVector.clear();
-    
-    count=1;
-    tempdetid=detid;
-    tempchannel=channel;
-    tempflag=flag;
+
+    if (detid != tempdetid) {
+      // 1.badstrip, nconsectrips, flag
+      theBadStripRange = SiStripBadStrip_->encode(
+          tempchannel - 1,
+          count,
+          tempflag);  // In the quality object, strips are counted from 0 to 767!!! Therefore "tempchannel-1"!
+                      // In the input txt-file, they have to be from 1 to 768 instead!!!
+      edm::LogInfo("SiStripBadStripFromASCIIFile")
+          << "detid " << tempdetid << " \t"
+          << " firstBadStrip " << tempchannel << "\t "
+          << " NconsecutiveBadStrips " << count << "\t "
+          << "flag " << tempflag << "\t"
+          << " packed integer " << std::hex << theBadStripRange << std::dec << std::endl;
+
+      theSiStripVector.push_back(theBadStripRange);
+
+      // populate db  object
+      SiStripBadStrip::Range range(theSiStripVector.begin(), theSiStripVector.end());
+      if (!SiStripBadStrip_->put(tempdetid, range))
+        edm::LogError("SiStripBadStripFromASCIIFile")
+            << "[SiStripBadStripFromASCIIFile::GetNewObject] detid already exists" << std::endl;
+      theSiStripVector.clear();
+
+      count = 1;
+      tempdetid = detid;
+      tempchannel = channel;
+      tempflag = flag;
     }
-   }
- 
+  }
+
   return SiStripBadStrip_;
 }
diff --git a/CalibTracker/SiStripQuality/plugins/SiStripBadStripFromASCIIFile.h b/CalibTracker/SiStripQuality/plugins/SiStripBadStripFromASCIIFile.h
index 58df8606b27c0..5181ec0cae4bc 100644
--- a/CalibTracker/SiStripQuality/plugins/SiStripBadStripFromASCIIFile.h
+++ b/CalibTracker/SiStripQuality/plugins/SiStripBadStripFromASCIIFile.h
@@ -1,7 +1,6 @@
 #ifndef SiStripBadStripFromASCIIFile_H
 #define SiStripBadStripFromASCIIFile_H
 
-
 #include "CommonTools/ConditionDBWriter/interface/ConditionDBWriter.h"
 #include "CondFormats/SiStripObjects/interface/SiStripBadStrip.h"
 
@@ -9,18 +8,13 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 
-
-class SiStripBadStripFromASCIIFile:public ConditionDBWriter<SiStripBadStrip> {
-
- public:
-
-  explicit SiStripBadStripFromASCIIFile( const edm::ParameterSet& iConfig);
+class SiStripBadStripFromASCIIFile : public ConditionDBWriter<SiStripBadStrip> {
+public:
+  explicit SiStripBadStripFromASCIIFile(const edm::ParameterSet& iConfig);
 
   ~SiStripBadStripFromASCIIFile() override{};
 
-
-
- private:
+private:
   std::unique_ptr<SiStripBadStrip> getNewObject() override;
   edm::FileInPath fp_;
   bool printdebug_;
diff --git a/CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.cc b/CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.cc
index cd311b20e2913..958b6c8034ca6 100644
--- a/CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.cc
+++ b/CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.cc
@@ -16,200 +16,203 @@
 //Insert here the include to the algos
 #include "CalibTracker/SiStripQuality/interface/SiStripHotStripAlgorithmFromClusterOccupancy.h"
 
-
-
-SiStripQualityHotStripIdentifier::SiStripQualityHotStripIdentifier(const edm::ParameterSet& iConfig) : ConditionDBWriter<SiStripBadStrip>(iConfig),
-  m_cacheID_(0), 
-  dataLabel_(iConfig.getUntrackedParameter<std::string>("dataLabel","")),
-  conf_(iConfig), 
-  fp_(iConfig.getUntrackedParameter<edm::FileInPath>("file",edm::FileInPath("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat"))),
-  Cluster_src_(iConfig.getParameter<edm::InputTag>( "Cluster_src" )),
-  Track_src_(iConfig.getUntrackedParameter<edm::InputTag>( "Track_src" )),
-  tracksCollection_in_EventTree(iConfig.getUntrackedParameter<bool>("RemoveTrackClusters",false)),
-  tTopo(nullptr)
-{
-  reader = new SiStripDetInfoFileReader(fp_.fullPath());  
-
-  edm::ParameterSet pset=iConfig.getUntrackedParameter< edm::ParameterSet > ("ClusterSelection",edm::ParameterSet());
-  MinClusterWidth_=pset.getUntrackedParameter<uint32_t>("minWidth",1);
-  MaxClusterWidth_=pset.getUntrackedParameter<uint32_t>("maxWidth",1000);
+SiStripQualityHotStripIdentifier::SiStripQualityHotStripIdentifier(const edm::ParameterSet& iConfig)
+    : ConditionDBWriter<SiStripBadStrip>(iConfig),
+      m_cacheID_(0),
+      dataLabel_(iConfig.getUntrackedParameter<std::string>("dataLabel", "")),
+      conf_(iConfig),
+      fp_(iConfig.getUntrackedParameter<edm::FileInPath>(
+          "file", edm::FileInPath("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat"))),
+      Cluster_src_(iConfig.getParameter<edm::InputTag>("Cluster_src")),
+      Track_src_(iConfig.getUntrackedParameter<edm::InputTag>("Track_src")),
+      tracksCollection_in_EventTree(iConfig.getUntrackedParameter<bool>("RemoveTrackClusters", false)),
+      tTopo(nullptr) {
+  reader = new SiStripDetInfoFileReader(fp_.fullPath());
+
+  edm::ParameterSet pset = iConfig.getUntrackedParameter<edm::ParameterSet>("ClusterSelection", edm::ParameterSet());
+  MinClusterWidth_ = pset.getUntrackedParameter<uint32_t>("minWidth", 1);
+  MaxClusterWidth_ = pset.getUntrackedParameter<uint32_t>("maxWidth", 1000);
 
   bookHistos();
 }
 
-SiStripQualityHotStripIdentifier::~SiStripQualityHotStripIdentifier(){
-}
-
-std::unique_ptr<SiStripBadStrip> SiStripQualityHotStripIdentifier::getNewObject(){
+SiStripQualityHotStripIdentifier::~SiStripQualityHotStripIdentifier() {}
 
+std::unique_ptr<SiStripBadStrip> SiStripQualityHotStripIdentifier::getNewObject() {
   auto obj = std::make_unique<SiStripBadStrip>();
-  
-  edm::ParameterSet parameters=conf_.getParameter<edm::ParameterSet>("AlgoParameters");
+
+  edm::ParameterSet parameters = conf_.getParameter<edm::ParameterSet>("AlgoParameters");
   std::string AlgoName = parameters.getParameter<std::string>("AlgoName");
-  if (AlgoName=="SiStripHotStripAlgorithmFromClusterOccupancy"){
-    
-    edm::LogInfo("SiStripQualityHotStripIdentifier") <<" [SiStripQualityHotStripIdentifier::getNewObject] call to SiStripHotStripAlgorithmFromClusterOccupancy"<<std::endl;
+  if (AlgoName == "SiStripHotStripAlgorithmFromClusterOccupancy") {
+    edm::LogInfo("SiStripQualityHotStripIdentifier")
+        << " [SiStripQualityHotStripIdentifier::getNewObject] call to SiStripHotStripAlgorithmFromClusterOccupancy"
+        << std::endl;
 
     SiStripHotStripAlgorithmFromClusterOccupancy theIdentifier(conf_, tTopo);
-    theIdentifier.setProbabilityThreshold(parameters.getUntrackedParameter<double>("ProbabilityThreshold",1.E-7));
-    theIdentifier.setMinNumEntries(parameters.getUntrackedParameter<uint32_t>("MinNumEntries",100));
-    theIdentifier.setMinNumEntriesPerStrip(parameters.getUntrackedParameter<uint32_t>("MinNumEntriesPerStrip",5));
+    theIdentifier.setProbabilityThreshold(parameters.getUntrackedParameter<double>("ProbabilityThreshold", 1.E-7));
+    theIdentifier.setMinNumEntries(parameters.getUntrackedParameter<uint32_t>("MinNumEntries", 100));
+    theIdentifier.setMinNumEntriesPerStrip(parameters.getUntrackedParameter<uint32_t>("MinNumEntriesPerStrip", 5));
 
     SiStripQuality* qobj = new SiStripQuality();
-    theIdentifier.extractBadStrips(qobj,ClusterPositionHistoMap,SiStripQuality_);
-
-    edm::LogInfo("SiStripQualityHotStripIdentifier") <<" [SiStripQualityHotStripIdentifier::getNewObject] copy SiStripObject in SiStripBadStrip"<<std::endl;
-
-    std::stringstream ss;  
-  
-    SiStripBadStrip::RegistryIterator rIter=qobj->getRegistryVectorBegin();
-    SiStripBadStrip::RegistryIterator rIterEnd=qobj->getRegistryVectorEnd();
-    for(;rIter!=rIterEnd;++rIter){
-      SiStripBadStrip::Range range(qobj->getDataVectorBegin()+rIter->ibegin,qobj->getDataVectorBegin()+rIter->iend);
-      if ( ! obj->put(rIter->detid,range) )
-	edm::LogError("SiStripQualityHotStripIdentifier")<<"[SiStripQualityHotStripIdentifier::getNewObject] detid already exists"<<std::endl;
+    theIdentifier.extractBadStrips(qobj, ClusterPositionHistoMap, SiStripQuality_);
+
+    edm::LogInfo("SiStripQualityHotStripIdentifier")
+        << " [SiStripQualityHotStripIdentifier::getNewObject] copy SiStripObject in SiStripBadStrip" << std::endl;
+
+    std::stringstream ss;
+
+    SiStripBadStrip::RegistryIterator rIter = qobj->getRegistryVectorBegin();
+    SiStripBadStrip::RegistryIterator rIterEnd = qobj->getRegistryVectorEnd();
+    for (; rIter != rIterEnd; ++rIter) {
+      SiStripBadStrip::Range range(qobj->getDataVectorBegin() + rIter->ibegin,
+                                   qobj->getDataVectorBegin() + rIter->iend);
+      if (!obj->put(rIter->detid, range))
+        edm::LogError("SiStripQualityHotStripIdentifier")
+            << "[SiStripQualityHotStripIdentifier::getNewObject] detid already exists" << std::endl;
     }
-    edm::LogInfo("SiStripQualityHotStripIdentifier") <<" [SiStripQualityHotStripIdentifier::getNewObject] " << ss.str() << std::endl;
+    edm::LogInfo("SiStripQualityHotStripIdentifier")
+        << " [SiStripQualityHotStripIdentifier::getNewObject] " << ss.str() << std::endl;
 
   } else {
-    edm::LogError("SiStripQualityHotStripIdentifier") <<" [SiStripQualityHotStripIdentifier::getNewObject] call for a unknow HotStrip identification algoritm"<<std::endl;
+    edm::LogError("SiStripQualityHotStripIdentifier")
+        << " [SiStripQualityHotStripIdentifier::getNewObject] call for a unknow HotStrip identification algoritm"
+        << std::endl;
 
     std::vector<uint32_t> a;
-    SiStripBadStrip::Range range(a.begin(),a.end());
-    if ( ! obj->put(0xFFFFFFFF,range) )
-      edm::LogError("SiStripQualityHotStripIdentifier")<<"[SiStripQualityHotStripIdentifier::getNewObject] detid already exists"<<std::endl;
+    SiStripBadStrip::Range range(a.begin(), a.end());
+    if (!obj->put(0xFFFFFFFF, range))
+      edm::LogError("SiStripQualityHotStripIdentifier")
+          << "[SiStripQualityHotStripIdentifier::getNewObject] detid already exists" << std::endl;
   }
-  
+
   return obj;
 }
 
-void SiStripQualityHotStripIdentifier::algoBeginRun(const edm::Run& run, const edm::EventSetup& iSetup){
+void SiStripQualityHotStripIdentifier::algoBeginRun(const edm::Run& run, const edm::EventSetup& iSetup) {
   //Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
   tTopo = tTopoHandle.product();
- 
-  resetHistos(); 
+
+  resetHistos();
   unsigned long long cacheID = iSetup.get<SiStripQualityRcd>().cacheIdentifier();
 
-  if (m_cacheID_ == cacheID) 
+  if (m_cacheID_ == cacheID)
     return;
 
-  m_cacheID_ = cacheID; 
-
-  iSetup.get<SiStripQualityRcd>().get(dataLabel_,SiStripQuality_);
+  m_cacheID_ = cacheID;
 
+  iSetup.get<SiStripQualityRcd>().get(dataLabel_, SiStripQuality_);
 }
 
-void SiStripQualityHotStripIdentifier::algoEndJob(){
+void SiStripQualityHotStripIdentifier::algoEndJob() {
   //Clear map
   ClusterPositionHistoMap.clear();
 }
 
-void SiStripQualityHotStripIdentifier::resetHistos(){
-  edm::LogInfo("SiStripQualityHotStripIdentifier") <<" [SiStripQualityHotStripIdentifier::resetHistos] " << std::endl;
-  SiStrip::QualityHistosMap::iterator it=ClusterPositionHistoMap.begin();
-  SiStrip::QualityHistosMap::iterator iEnd=ClusterPositionHistoMap.end();
-  for (;it!=iEnd;++it){
+void SiStripQualityHotStripIdentifier::resetHistos() {
+  edm::LogInfo("SiStripQualityHotStripIdentifier") << " [SiStripQualityHotStripIdentifier::resetHistos] " << std::endl;
+  SiStrip::QualityHistosMap::iterator it = ClusterPositionHistoMap.begin();
+  SiStrip::QualityHistosMap::iterator iEnd = ClusterPositionHistoMap.end();
+  for (; it != iEnd; ++it) {
     it->second->Reset();
   }
 }
 
-void SiStripQualityHotStripIdentifier::bookHistos(){
-  edm::LogInfo("SiStripQualityHotStripIdentifier") <<" [SiStripQualityHotStripIdentifier::bookHistos] " << std::endl;
+void SiStripQualityHotStripIdentifier::bookHistos() {
+  edm::LogInfo("SiStripQualityHotStripIdentifier") << " [SiStripQualityHotStripIdentifier::bookHistos] " << std::endl;
   char hname[1024];
-  std::map<uint32_t, SiStripDetInfoFileReader::DetInfo >::const_iterator it =reader->getAllData().begin();
-  std::map<uint32_t, SiStripDetInfoFileReader::DetInfo >::const_iterator iEnd =reader->getAllData().end();
-  for(; it!=iEnd; ++it){    
-    sprintf(hname,"h_%d",it->first);
-    SiStrip::QualityHistosMap::iterator ref=ClusterPositionHistoMap.find(it->first);
-    if (ref==ClusterPositionHistoMap.end()){
-      ClusterPositionHistoMap[it->first]=boost::shared_ptr<TH1F>(new TH1F(hname,hname,it->second.nApvs*128,-0.5,it->second.nApvs*128-0.5));
-    }
-    else 
-      edm::LogError("SiStripQualityHotStripIdentifier") <<" [SiStripQualityHotStripIdentifier::bookHistos] DetId " << it->first << " already found in map. Ignoring new data"<<std::endl;
+  std::map<uint32_t, SiStripDetInfoFileReader::DetInfo>::const_iterator it = reader->getAllData().begin();
+  std::map<uint32_t, SiStripDetInfoFileReader::DetInfo>::const_iterator iEnd = reader->getAllData().end();
+  for (; it != iEnd; ++it) {
+    sprintf(hname, "h_%d", it->first);
+    SiStrip::QualityHistosMap::iterator ref = ClusterPositionHistoMap.find(it->first);
+    if (ref == ClusterPositionHistoMap.end()) {
+      ClusterPositionHistoMap[it->first] =
+          boost::shared_ptr<TH1F>(new TH1F(hname, hname, it->second.nApvs * 128, -0.5, it->second.nApvs * 128 - 0.5));
+    } else
+      edm::LogError("SiStripQualityHotStripIdentifier")
+          << " [SiStripQualityHotStripIdentifier::bookHistos] DetId " << it->first
+          << " already found in map. Ignoring new data" << std::endl;
   }
 }
 
-void SiStripQualityHotStripIdentifier::fillHisto(uint32_t detid,float value){
-  
-  SiStrip::QualityHistosMap::iterator ref=ClusterPositionHistoMap.find(detid);
-  if (ref!=ClusterPositionHistoMap.end())
+void SiStripQualityHotStripIdentifier::fillHisto(uint32_t detid, float value) {
+  SiStrip::QualityHistosMap::iterator ref = ClusterPositionHistoMap.find(detid);
+  if (ref != ClusterPositionHistoMap.end())
     ref->second->Fill(value);
   else
-    edm::LogError("SiStripQualityHotStripIdentifier") <<" [SiStripQualityHotStripIdentifier::fillHisto] Histogram not found in the list for DetId " << detid << " Ignoring data value "<< value <<std::endl;
+    edm::LogError("SiStripQualityHotStripIdentifier")
+        << " [SiStripQualityHotStripIdentifier::fillHisto] Histogram not found in the list for DetId " << detid
+        << " Ignoring data value " << value << std::endl;
 }
 
+void SiStripQualityHotStripIdentifier::algoAnalyze(const edm::Event& e, const edm::EventSetup& eSetup) {
+  edm::Handle<edm::DetSetVector<SiStripCluster> > dsv_SiStripCluster;
+  e.getByLabel(Cluster_src_, dsv_SiStripCluster);
 
-void SiStripQualityHotStripIdentifier::algoAnalyze(const edm::Event& e, const edm::EventSetup& eSetup){
-  edm::Handle< edm::DetSetVector<SiStripCluster> >  dsv_SiStripCluster;
-  e.getByLabel( Cluster_src_, dsv_SiStripCluster);    
-      
   edm::Handle<reco::TrackCollection> trackCollection;
-  if(tracksCollection_in_EventTree){
+  if (tracksCollection_in_EventTree) {
     e.getByLabel(Track_src_, trackCollection);
-    if(!trackCollection.isValid()){
-      edm::LogError("SiStripQualityHotStripIdentifier")<<" [SiStripQualityHotStripIdentifier::algoAnalyze] missing trackCollection with label " << Track_src_ <<std::endl;
+    if (!trackCollection.isValid()) {
+      edm::LogError("SiStripQualityHotStripIdentifier")
+          << " [SiStripQualityHotStripIdentifier::algoAnalyze] missing trackCollection with label " << Track_src_
+          << std::endl;
     }
   }
 
-  std::set<const void*> vPSiStripCluster;    
+  std::set<const void*> vPSiStripCluster;
   //Perform track study
-  if (tracksCollection_in_EventTree){
-   
+  if (tracksCollection_in_EventTree) {
     const reco::TrackCollection tC = *(trackCollection.product());
-    int i=0;
-    for (reco::TrackCollection::const_iterator track=tC.begin(); track!=tC.end(); track++){
+    int i = 0;
+    for (reco::TrackCollection::const_iterator track = tC.begin(); track != tC.end(); track++) {
       LogTrace("SiStripQualityHotStripIdentifier")
-	<< "Track number "<< i+1 
-	<< "\n\tmomentum: " << track->momentum()
-	<< "\n\tPT: " << track->pt()
-	<< "\n\tvertex: " << track->vertex()
-	<< "\n\timpact parameter: " << track->d0()
-	<< "\n\tcharge: " << track->charge()
-	<< "\n\tnormalizedChi2: " << track->normalizedChi2() 
-	<<"\n\tFrom EXTRA : "
-	<<"\n\t\touter PT "<< track->outerPt()<<std::endl;
+          << "Track number " << i + 1 << "\n\tmomentum: " << track->momentum() << "\n\tPT: " << track->pt()
+          << "\n\tvertex: " << track->vertex() << "\n\timpact parameter: " << track->d0()
+          << "\n\tcharge: " << track->charge() << "\n\tnormalizedChi2: " << track->normalizedChi2()
+          << "\n\tFrom EXTRA : "
+          << "\n\t\touter PT " << track->outerPt() << std::endl;
 
       //Loop on rechits
-      for(auto const& recHit : track->recHits()) {
-	
-	if (!recHit->isValid()){
-	  LogTrace("SiStripQualityHotStripIdentifier") <<"\t\t Invalid Hit "<<std::endl;
-	  continue;
-	}
-	
-	const SiStripRecHit2D* singleHit=dynamic_cast<const SiStripRecHit2D*>(recHit);
-	const SiStripMatchedRecHit2D* matchedHit=dynamic_cast<const SiStripMatchedRecHit2D*>(recHit);
-	const ProjectedSiStripRecHit2D* projectedHit=dynamic_cast<const ProjectedSiStripRecHit2D*>(recHit);
-
-	if(matchedHit){
-	  vPSiStripCluster.insert((void *)&(matchedHit->monoCluster())); 
-	  vPSiStripCluster.insert((void *)&(matchedHit->stereoCluster()));         
-	} else if(projectedHit){
-	  vPSiStripCluster.insert((void *)&*(projectedHit->originalHit().cluster())); 
-	} else if(singleHit){
-          vPSiStripCluster.insert((void*)&*(singleHit->cluster())); 
-	}else{
-	  LogTrace("SiStripQualityHotStripIdentifier") << "NULL hit" << std::endl;
-	}
+      for (auto const& recHit : track->recHits()) {
+        if (!recHit->isValid()) {
+          LogTrace("SiStripQualityHotStripIdentifier") << "\t\t Invalid Hit " << std::endl;
+          continue;
+        }
+
+        const SiStripRecHit2D* singleHit = dynamic_cast<const SiStripRecHit2D*>(recHit);
+        const SiStripMatchedRecHit2D* matchedHit = dynamic_cast<const SiStripMatchedRecHit2D*>(recHit);
+        const ProjectedSiStripRecHit2D* projectedHit = dynamic_cast<const ProjectedSiStripRecHit2D*>(recHit);
+
+        if (matchedHit) {
+          vPSiStripCluster.insert((void*)&(matchedHit->monoCluster()));
+          vPSiStripCluster.insert((void*)&(matchedHit->stereoCluster()));
+        } else if (projectedHit) {
+          vPSiStripCluster.insert((void*)&*(projectedHit->originalHit().cluster()));
+        } else if (singleHit) {
+          vPSiStripCluster.insert((void*)&*(singleHit->cluster()));
+        } else {
+          LogTrace("SiStripQualityHotStripIdentifier") << "NULL hit" << std::endl;
+        }
       }
     }
   }
-	
-  std::stringstream ss;   
+
+  std::stringstream ss;
   //Loop on Det Clusters
-  edm::DetSetVector<SiStripCluster>::const_iterator DSViter=dsv_SiStripCluster->begin();
-  for (; DSViter!=dsv_SiStripCluster->end();DSViter++){
+  edm::DetSetVector<SiStripCluster>::const_iterator DSViter = dsv_SiStripCluster->begin();
+  for (; DSViter != dsv_SiStripCluster->end(); DSViter++) {
     edm::DetSet<SiStripCluster>::const_iterator ClusIter = DSViter->data.begin();
     edm::DetSet<SiStripCluster>::const_iterator ClusIterEnd = DSViter->data.end();
-    for(; ClusIter!=ClusIterEnd; ++ClusIter) {    
-      if (MinClusterWidth_<=ClusIter->amplitudes().size() && ClusIter->amplitudes().size()<=MaxClusterWidth_) {
-	if (std::find(vPSiStripCluster.begin(),vPSiStripCluster.end(),(void*) &*ClusIter) == vPSiStripCluster.end()){
-	  if ( edm::isDebugEnabled() ) 
-	    ss << " adding cluster to histo for detid " << DSViter->id << " with barycenter "<< ClusIter->barycenter() << std::endl;
-	  fillHisto(DSViter->id,ClusIter->barycenter());
-	}
+    for (; ClusIter != ClusIterEnd; ++ClusIter) {
+      if (MinClusterWidth_ <= ClusIter->amplitudes().size() && ClusIter->amplitudes().size() <= MaxClusterWidth_) {
+        if (std::find(vPSiStripCluster.begin(), vPSiStripCluster.end(), (void*)&*ClusIter) == vPSiStripCluster.end()) {
+          if (edm::isDebugEnabled())
+            ss << " adding cluster to histo for detid " << DSViter->id << " with barycenter " << ClusIter->barycenter()
+               << std::endl;
+          fillHisto(DSViter->id, ClusIter->barycenter());
+        }
       }
     }
   }
diff --git a/CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.h b/CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.h
index 3d923efc37d92..cfea6392081ce 100644
--- a/CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.h
+++ b/CalibTracker/SiStripQuality/plugins/SiStripQualityHotStripIdentifier.h
@@ -20,33 +20,28 @@
 class TrackerTopology;
 
 class SiStripQualityHotStripIdentifier : public ConditionDBWriter<SiStripBadStrip> {
-
 public:
-
-  explicit SiStripQualityHotStripIdentifier(const edm::ParameterSet&);
+  explicit SiStripQualityHotStripIdentifier(const edm::ParameterSet &);
   ~SiStripQualityHotStripIdentifier() override;
 
 private:
-
- //Will be called at the beginning of the job
-  void algoBeginJob(const edm::EventSetup&) override{}
+  //Will be called at the beginning of the job
+  void algoBeginJob(const edm::EventSetup &) override {}
   //Will be called at the beginning of each run in the job
   void algoBeginRun(const edm::Run &, const edm::EventSetup &) override;
   //Will be called at the beginning of each luminosity block in the run
-  void algoBeginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) override{ resetHistos(); }
+  void algoBeginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) override { resetHistos(); }
   //Will be called at the end of the job
   void algoEndJob() override;
 
-
   //Will be called at every event
-  void algoAnalyze(const edm::Event&, const edm::EventSetup&) override;
+  void algoAnalyze(const edm::Event &, const edm::EventSetup &) override;
 
   std::unique_ptr<SiStripBadStrip> getNewObject() override;
 
-
   void bookHistos();
   void resetHistos();
-  void fillHisto(uint32_t detid,float value);
+  void fillHisto(uint32_t detid, float value);
 
 private:
   unsigned long long m_cacheID_;
@@ -54,11 +49,11 @@ class SiStripQualityHotStripIdentifier : public ConditionDBWriter<SiStripBadStri
   edm::ESHandle<SiStripQuality> SiStripQuality_;
   const edm::ParameterSet conf_;
   edm::FileInPath fp_;
-  SiStripDetInfoFileReader* reader;
+  SiStripDetInfoFileReader *reader;
   edm::InputTag Cluster_src_;
   edm::InputTag Track_src_;
   bool tracksCollection_in_EventTree;
-  const TrackerTopology* tTopo;
+  const TrackerTopology *tTopo;
 
   unsigned short MinClusterWidth_, MaxClusterWidth_;
 
diff --git a/CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.cc b/CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.cc
index 6bc16ea2cd89f..0d6d02bdff842 100644
--- a/CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.cc
+++ b/CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.cc
@@ -2,7 +2,7 @@
 //
 // Package:    SiStripQualityStatistics
 // Class:      SiStripQualityStatistics
-// 
+//
 /**\class SiStripQualityStatistics SiStripQualityStatistics.h CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.cc
 
  Description: <one line class summary>
@@ -27,308 +27,307 @@
 #include <cstdio>
 #include <sys/time.h>
 
-
-SiStripQualityStatistics::SiStripQualityStatistics( const edm::ParameterSet& iConfig ):
-  m_cacheID_(0), 
-  dataLabel_(iConfig.getUntrackedParameter<std::string>("dataLabel","")),
-  TkMapFileName_(iConfig.getUntrackedParameter<std::string>("TkMapFileName","")),
-  fp_(iConfig.getUntrackedParameter<edm::FileInPath>("file",edm::FileInPath("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat"))),
-  saveTkHistoMap_(iConfig.getUntrackedParameter<bool>("SaveTkHistoMap",true)),
-  tkMap(nullptr),tkMapFullIOVs(nullptr)
-{
+SiStripQualityStatistics::SiStripQualityStatistics(const edm::ParameterSet& iConfig)
+    : m_cacheID_(0),
+      dataLabel_(iConfig.getUntrackedParameter<std::string>("dataLabel", "")),
+      TkMapFileName_(iConfig.getUntrackedParameter<std::string>("TkMapFileName", "")),
+      fp_(iConfig.getUntrackedParameter<edm::FileInPath>(
+          "file", edm::FileInPath("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat"))),
+      saveTkHistoMap_(iConfig.getUntrackedParameter<bool>("SaveTkHistoMap", true)),
+      tkMap(nullptr),
+      tkMapFullIOVs(nullptr) {
   reader = new SiStripDetInfoFileReader(fp_.fullPath());
 
-  tkMapFullIOVs=new TrackerMap( "BadComponents" );
-  tkhisto=nullptr;
+  tkMapFullIOVs = new TrackerMap("BadComponents");
+  tkhisto = nullptr;
 }
 
-SiStripQualityStatistics::~SiStripQualityStatistics()
-{
-  this->EndJob();
-}
+SiStripQualityStatistics::~SiStripQualityStatistics() { this->EndJob(); }
+
+void SiStripQualityStatistics::EndJob() {
+  std::string filename = TkMapFileName_;
+  if (!filename.empty()) {
+    tkMapFullIOVs->save(false, 0, 0, filename);
+    filename.erase(filename.begin() + filename.find("."), filename.end());
+    tkMapFullIOVs->print(false, 0, 0, filename);
 
-void SiStripQualityStatistics::EndJob(){
-
-  std::string filename=TkMapFileName_;
-  if (filename!=""){
-    tkMapFullIOVs->save(false,0,0,filename);
-    filename.erase(filename.begin()+filename.find("."),filename.end());
-    tkMapFullIOVs->print(false,0,0,filename);
-  
-    if(saveTkHistoMap_){
-      tkhisto->save(filename+".root");
-      tkhisto->saveAsCanvas(filename+"_Canvas.root","E");
+    if (saveTkHistoMap_) {
+      tkhisto->save(filename + ".root");
+      tkhisto->saveAsCanvas(filename + "_Canvas.root", "E");
     }
   }
 }
 
-void SiStripQualityStatistics::bookHistograms(DQMStore::IBooker & ibooker , const edm::Run & run, const edm::EventSetup & es)
-{
-}
+void SiStripQualityStatistics::bookHistograms(DQMStore::IBooker& ibooker,
+                                              const edm::Run& run,
+                                              const edm::EventSetup& es) {}
 
-void SiStripQualityStatistics::analyze( const edm::Event& e, const edm::EventSetup& iSetup){
+void SiStripQualityStatistics::analyze(const edm::Event& e, const edm::EventSetup& iSetup) {
   //Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
   const TrackerTopology* const tTopo = tTopoHandle.product();
-  if ( ( ! tkhisto ) && ( ! TkMapFileName_.empty() ) ) {
+  if ((!tkhisto) && (!TkMapFileName_.empty())) {
     edm::ESHandle<TkDetMap> tkDetMapHandle;
     iSetup.get<TrackerTopologyRcd>().get(tkDetMapHandle);
     //here the baseline (the value of the empty,not assigned bins) is put to -1 (default is zero)
-    tkhisto = std::make_unique<TkHistoMap>(tkDetMapHandle.product(), "BadComp","BadComp",-1.);
+    tkhisto = std::make_unique<TkHistoMap>(tkDetMapHandle.product(), "BadComp", "BadComp", -1.);
   }
 
   unsigned long long cacheID = iSetup.get<SiStripQualityRcd>().cacheIdentifier();
 
   std::stringstream ss;
 
-  if (m_cacheID_ == cacheID) 
+  if (m_cacheID_ == cacheID)
     return;
 
-  m_cacheID_ = cacheID; 
+  m_cacheID_ = cacheID;
 
   edm::ESHandle<SiStripQuality> SiStripQuality_;
-  iSetup.get<SiStripQualityRcd>().get(dataLabel_,SiStripQuality_);
-    
-  for(int i=0;i<4;++i){
-    NTkBadComponent[i]=0;
-    for(int j=0;j<19;++j){
+  iSetup.get<SiStripQualityRcd>().get(dataLabel_, SiStripQuality_);
+
+  for (int i = 0; i < 4; ++i) {
+    NTkBadComponent[i] = 0;
+    for (int j = 0; j < 19; ++j) {
       ssV[i][j].str("");
-      for(int k=0;k<4;++k)
-	NBadComponent[i][j][k]=0;
+      for (int k = 0; k < 4; ++k)
+        NBadComponent[i][j][k] = 0;
     }
   }
 
   if (tkMap)
     delete tkMap;
-  tkMap=new TrackerMap( "BadComponents" );
-
+  tkMap = new TrackerMap("BadComponents");
 
-  ss.str(""); 
-  std::vector<uint32_t> detids=reader->getAllDetIds();
-  std::vector<uint32_t>::const_iterator idet=detids.begin();
-  for(;idet!=detids.end();++idet){
+  ss.str("");
+  std::vector<uint32_t> detids = reader->getAllDetIds();
+  std::vector<uint32_t>::const_iterator idet = detids.begin();
+  for (; idet != detids.end(); ++idet) {
     ss << "detid " << (*idet) << " IsModuleUsable " << SiStripQuality_->IsModuleUsable((*idet)) << "\n";
     if (SiStripQuality_->IsModuleUsable((*idet)))
-      tkMap->fillc(*idet,0x00ff00);
+      tkMap->fillc(*idet, 0x00ff00);
   }
   LogDebug("SiStripQualityStatistics") << ss.str() << std::endl;
 
-
   std::vector<SiStripQuality::BadComponent> BC = SiStripQuality_->getBadComponentList();
-  
-  for (size_t i=0;i<BC.size();++i){
-    
+
+  for (size_t i = 0; i < BC.size(); ++i) {
     //&&&&&&&&&&&&&
     //Full Tk
     //&&&&&&&&&&&&&
 
-    if (BC[i].BadModule) 
+    if (BC[i].BadModule)
       NTkBadComponent[0]++;
-    if (BC[i].BadFibers) 
-      NTkBadComponent[1]+= ( (BC[i].BadFibers>>2)&0x1 )+ ( (BC[i].BadFibers>>1)&0x1 ) + ( (BC[i].BadFibers)&0x1 );
+    if (BC[i].BadFibers)
+      NTkBadComponent[1] += ((BC[i].BadFibers >> 2) & 0x1) + ((BC[i].BadFibers >> 1) & 0x1) + ((BC[i].BadFibers) & 0x1);
     if (BC[i].BadApvs)
-      NTkBadComponent[2]+= ( (BC[i].BadApvs>>5)&0x1 )+ ( (BC[i].BadApvs>>4)&0x1 ) + ( (BC[i].BadApvs>>3)&0x1 ) + 
-	( (BC[i].BadApvs>>2)&0x1 )+ ( (BC[i].BadApvs>>1)&0x1 ) + ( (BC[i].BadApvs)&0x1 );
+      NTkBadComponent[2] += ((BC[i].BadApvs >> 5) & 0x1) + ((BC[i].BadApvs >> 4) & 0x1) + ((BC[i].BadApvs >> 3) & 0x1) +
+                            ((BC[i].BadApvs >> 2) & 0x1) + ((BC[i].BadApvs >> 1) & 0x1) + ((BC[i].BadApvs) & 0x1);
 
     //&&&&&&&&&&&&&&&&&
     //Single SubSyste
     //&&&&&&&&&&&&&&&&&
     int component;
-    DetId detectorId=DetId(BC[i].detid);
+    DetId detectorId = DetId(BC[i].detid);
     int subDet = detectorId.subdetId();
-    if ( subDet == StripSubdetector::TIB ){
+    if (subDet == StripSubdetector::TIB) {
       //&&&&&&&&&&&&&&&&&
       //TIB
       //&&&&&&&&&&&&&&&&&
-      
-      component=tTopo->tibLayer(BC[i].detid);
-      SetBadComponents(0, component, BC[i]);         
 
-    } else if ( subDet == StripSubdetector::TID ) {
+      component = tTopo->tibLayer(BC[i].detid);
+      SetBadComponents(0, component, BC[i]);
+
+    } else if (subDet == StripSubdetector::TID) {
       //&&&&&&&&&&&&&&&&&
       //TID
       //&&&&&&&&&&&&&&&&&
 
-      component=tTopo->tidSide(BC[i].detid)==2?tTopo->tidWheel(BC[i].detid):tTopo->tidWheel(BC[i].detid)+3;
-      SetBadComponents(1, component, BC[i]);         
+      component = tTopo->tidSide(BC[i].detid) == 2 ? tTopo->tidWheel(BC[i].detid) : tTopo->tidWheel(BC[i].detid) + 3;
+      SetBadComponents(1, component, BC[i]);
 
-    } else if ( subDet == StripSubdetector::TOB ) {
+    } else if (subDet == StripSubdetector::TOB) {
       //&&&&&&&&&&&&&&&&&
       //TOB
       //&&&&&&&&&&&&&&&&&
 
-      component=tTopo->tobLayer(BC[i].detid);
-      SetBadComponents(2, component, BC[i]);         
+      component = tTopo->tobLayer(BC[i].detid);
+      SetBadComponents(2, component, BC[i]);
 
-    } else if ( subDet == StripSubdetector::TEC ) {
+    } else if (subDet == StripSubdetector::TEC) {
       //&&&&&&&&&&&&&&&&&
       //TEC
       //&&&&&&&&&&&&&&&&&
 
-      component=tTopo->tecSide(BC[i].detid)==2?tTopo->tecWheel(BC[i].detid):tTopo->tecWheel(BC[i].detid)+9;
-      SetBadComponents(3, component, BC[i]);         
-
-    }    
+      component = tTopo->tecSide(BC[i].detid) == 2 ? tTopo->tecWheel(BC[i].detid) : tTopo->tecWheel(BC[i].detid) + 9;
+      SetBadComponents(3, component, BC[i]);
+    }
   }
 
   //&&&&&&&&&&&&&&&&&&
   // Single Strip Info
   //&&&&&&&&&&&&&&&&&&
-  float percentage=0;
+  float percentage = 0;
 
   SiStripQuality::RegistryIterator rbegin = SiStripQuality_->getRegistryVectorBegin();
-  SiStripQuality::RegistryIterator rend   = SiStripQuality_->getRegistryVectorEnd();
-  
-  for (SiStripBadStrip::RegistryIterator rp=rbegin; rp != rend; ++rp) {
-    uint32_t detid=rp->detid;
+  SiStripQuality::RegistryIterator rend = SiStripQuality_->getRegistryVectorEnd();
 
-    int subdet=-999; int component=-999;
-    DetId detectorId=DetId(detid);
+  for (SiStripBadStrip::RegistryIterator rp = rbegin; rp != rend; ++rp) {
+    uint32_t detid = rp->detid;
+
+    int subdet = -999;
+    int component = -999;
+    DetId detectorId = DetId(detid);
     int subDet = detectorId.subdetId();
-    if ( subDet == StripSubdetector::TIB ){
-      subdet=0;
-      component=tTopo->tibLayer(detid);
-    } else if ( subDet == StripSubdetector::TID ) {
-      subdet=1;
-      component=tTopo->tidSide(detid)==2?tTopo->tidWheel(detid):tTopo->tidWheel(detid)+3;
-    } else if ( subDet == StripSubdetector::TOB ) {
-      subdet=2;
-      component=tTopo->tobLayer(detid);
-    } else if ( subDet == StripSubdetector::TEC ) {
-      subdet=3;
-      component=tTopo->tecSide(detid)==2?tTopo->tecWheel(detid):tTopo->tecWheel(detid)+9;
-    } 
-
-    SiStripQuality::Range sqrange = SiStripQuality::Range( SiStripQuality_->getDataVectorBegin()+rp->ibegin , SiStripQuality_->getDataVectorBegin()+rp->iend );
-        
-    percentage=0;
-    for(int it=0;it<sqrange.second-sqrange.first;it++){
-      unsigned int range=SiStripQuality_->decode( *(sqrange.first+it) ).range;
-      NTkBadComponent[3]+=range;
-      NBadComponent[subdet][0][3]+=range;
-      NBadComponent[subdet][component][3]+=range;
-      percentage+=range;
+    if (subDet == StripSubdetector::TIB) {
+      subdet = 0;
+      component = tTopo->tibLayer(detid);
+    } else if (subDet == StripSubdetector::TID) {
+      subdet = 1;
+      component = tTopo->tidSide(detid) == 2 ? tTopo->tidWheel(detid) : tTopo->tidWheel(detid) + 3;
+    } else if (subDet == StripSubdetector::TOB) {
+      subdet = 2;
+      component = tTopo->tobLayer(detid);
+    } else if (subDet == StripSubdetector::TEC) {
+      subdet = 3;
+      component = tTopo->tecSide(detid) == 2 ? tTopo->tecWheel(detid) : tTopo->tecWheel(detid) + 9;
+    }
+
+    SiStripQuality::Range sqrange = SiStripQuality::Range(SiStripQuality_->getDataVectorBegin() + rp->ibegin,
+                                                          SiStripQuality_->getDataVectorBegin() + rp->iend);
+
+    percentage = 0;
+    for (int it = 0; it < sqrange.second - sqrange.first; it++) {
+      unsigned int range = SiStripQuality_->decode(*(sqrange.first + it)).range;
+      NTkBadComponent[3] += range;
+      NBadComponent[subdet][0][3] += range;
+      NBadComponent[subdet][component][3] += range;
+      percentage += range;
     }
-    if(percentage!=0)
-      percentage/=128.*reader->getNumberOfApvsAndStripLength(detid).first;
-    if(percentage>1)
-      edm::LogError("SiStripQualityStatistics") <<  "PROBLEM detid " << detid << " value " << percentage<< std::endl;
+    if (percentage != 0)
+      percentage /= 128. * reader->getNumberOfApvsAndStripLength(detid).first;
+    if (percentage > 1)
+      edm::LogError("SiStripQualityStatistics") << "PROBLEM detid " << detid << " value " << percentage << std::endl;
 
     //------- Global Statistics on percentage of bad components along the IOVs ------//
-    tkMapFullIOVs->fill(detid,percentage);
-    if(tkhisto!=nullptr)
-      tkhisto->fill(detid,percentage);
+    tkMapFullIOVs->fill(detid, percentage);
+    if (tkhisto != nullptr)
+      tkhisto->fill(detid, percentage);
   }
-  
- 
+
   //&&&&&&&&&&&&&&&&&&
   // printout
   //&&&&&&&&&&&&&&&&&&
 
   ss.str("");
-  ss << "\n-----------------\nNew IOV starting from run " <<   e.id().run() << " event " << e.id().event() << " lumiBlock " << e.luminosityBlock() << " time " << e.time().value() << " chacheID " << m_cacheID_ << "\n-----------------\n";
+  ss << "\n-----------------\nNew IOV starting from run " << e.id().run() << " event " << e.id().event()
+     << " lumiBlock " << e.luminosityBlock() << " time " << e.time().value() << " chacheID " << m_cacheID_
+     << "\n-----------------\n";
   ss << "\n-----------------\nGlobal Info\n-----------------";
-  ss << "\nBadComponent \t   Modules \tFibers \tApvs\tStrips\n----------------------------------------------------------------";
-  ss << "\nTracker:\t\t"<<NTkBadComponent[0]<<"\t"<<NTkBadComponent[1]<<"\t"<<NTkBadComponent[2]<<"\t"<<NTkBadComponent[3];
-  ss<< "\n";
-  ss << "\nTIB:\t\t\t"<<NBadComponent[0][0][0]<<"\t"<<NBadComponent[0][0][1]<<"\t"<<NBadComponent[0][0][2]<<"\t"<<NBadComponent[0][0][3];
-  ss << "\nTID:\t\t\t"<<NBadComponent[1][0][0]<<"\t"<<NBadComponent[1][0][1]<<"\t"<<NBadComponent[1][0][2]<<"\t"<<NBadComponent[1][0][3];
-  ss << "\nTOB:\t\t\t"<<NBadComponent[2][0][0]<<"\t"<<NBadComponent[2][0][1]<<"\t"<<NBadComponent[2][0][2]<<"\t"<<NBadComponent[2][0][3];
-  ss << "\nTEC:\t\t\t"<<NBadComponent[3][0][0]<<"\t"<<NBadComponent[3][0][1]<<"\t"<<NBadComponent[3][0][2]<<"\t"<<NBadComponent[3][0][3];
+  ss << "\nBadComponent \t   Modules \tFibers "
+        "\tApvs\tStrips\n----------------------------------------------------------------";
+  ss << "\nTracker:\t\t" << NTkBadComponent[0] << "\t" << NTkBadComponent[1] << "\t" << NTkBadComponent[2] << "\t"
+     << NTkBadComponent[3];
+  ss << "\n";
+  ss << "\nTIB:\t\t\t" << NBadComponent[0][0][0] << "\t" << NBadComponent[0][0][1] << "\t" << NBadComponent[0][0][2]
+     << "\t" << NBadComponent[0][0][3];
+  ss << "\nTID:\t\t\t" << NBadComponent[1][0][0] << "\t" << NBadComponent[1][0][1] << "\t" << NBadComponent[1][0][2]
+     << "\t" << NBadComponent[1][0][3];
+  ss << "\nTOB:\t\t\t" << NBadComponent[2][0][0] << "\t" << NBadComponent[2][0][1] << "\t" << NBadComponent[2][0][2]
+     << "\t" << NBadComponent[2][0][3];
+  ss << "\nTEC:\t\t\t" << NBadComponent[3][0][0] << "\t" << NBadComponent[3][0][1] << "\t" << NBadComponent[3][0][2]
+     << "\t" << NBadComponent[3][0][3];
   ss << "\n";
 
-  for (int i=1;i<5;++i)
-    ss << "\nTIB Layer " << i   << " :\t\t"<<NBadComponent[0][i][0]<<"\t"<<NBadComponent[0][i][1]<<"\t"<<NBadComponent[0][i][2]<<"\t"<<NBadComponent[0][i][3];
+  for (int i = 1; i < 5; ++i)
+    ss << "\nTIB Layer " << i << " :\t\t" << NBadComponent[0][i][0] << "\t" << NBadComponent[0][i][1] << "\t"
+       << NBadComponent[0][i][2] << "\t" << NBadComponent[0][i][3];
   ss << "\n";
-  for (int i=1;i<4;++i)
-    ss << "\nTID+ Disk " << i   << " :\t\t"<<NBadComponent[1][i][0]<<"\t"<<NBadComponent[1][i][1]<<"\t"<<NBadComponent[1][i][2]<<"\t"<<NBadComponent[1][i][3];
-  for (int i=4;i<7;++i)
-    ss << "\nTID- Disk " << i-3 << " :\t\t"<<NBadComponent[1][i][0]<<"\t"<<NBadComponent[1][i][1]<<"\t"<<NBadComponent[1][i][2]<<"\t"<<NBadComponent[1][i][3];
+  for (int i = 1; i < 4; ++i)
+    ss << "\nTID+ Disk " << i << " :\t\t" << NBadComponent[1][i][0] << "\t" << NBadComponent[1][i][1] << "\t"
+       << NBadComponent[1][i][2] << "\t" << NBadComponent[1][i][3];
+  for (int i = 4; i < 7; ++i)
+    ss << "\nTID- Disk " << i - 3 << " :\t\t" << NBadComponent[1][i][0] << "\t" << NBadComponent[1][i][1] << "\t"
+       << NBadComponent[1][i][2] << "\t" << NBadComponent[1][i][3];
   ss << "\n";
-  for (int i=1;i<7;++i)
-    ss << "\nTOB Layer " << i   << " :\t\t"<<NBadComponent[2][i][0]<<"\t"<<NBadComponent[2][i][1]<<"\t"<<NBadComponent[2][i][2]<<"\t"<<NBadComponent[2][i][3];
+  for (int i = 1; i < 7; ++i)
+    ss << "\nTOB Layer " << i << " :\t\t" << NBadComponent[2][i][0] << "\t" << NBadComponent[2][i][1] << "\t"
+       << NBadComponent[2][i][2] << "\t" << NBadComponent[2][i][3];
   ss << "\n";
-  for (int i=1;i<10;++i)
-    ss << "\nTEC+ Disk " << i   << " :\t\t"<<NBadComponent[3][i][0]<<"\t"<<NBadComponent[3][i][1]<<"\t"<<NBadComponent[3][i][2]<<"\t"<<NBadComponent[3][i][3];
-  for (int i=10;i<19;++i)
-    ss << "\nTEC- Disk " << i-9 << " :\t\t"<<NBadComponent[3][i][0]<<"\t"<<NBadComponent[3][i][1]<<"\t"<<NBadComponent[3][i][2]<<"\t"<<NBadComponent[3][i][3];
-  ss<< "\n";
-
-  ss << "\n----------------------------------------------------------------\n\t\t   Detid  \tModules Fibers Apvs\n----------------------------------------------------------------";
-  for (int i=1;i<5;++i)
+  for (int i = 1; i < 10; ++i)
+    ss << "\nTEC+ Disk " << i << " :\t\t" << NBadComponent[3][i][0] << "\t" << NBadComponent[3][i][1] << "\t"
+       << NBadComponent[3][i][2] << "\t" << NBadComponent[3][i][3];
+  for (int i = 10; i < 19; ++i)
+    ss << "\nTEC- Disk " << i - 9 << " :\t\t" << NBadComponent[3][i][0] << "\t" << NBadComponent[3][i][1] << "\t"
+       << NBadComponent[3][i][2] << "\t" << NBadComponent[3][i][3];
+  ss << "\n";
+
+  ss << "\n----------------------------------------------------------------\n\t\t   Detid  \tModules Fibers "
+        "Apvs\n----------------------------------------------------------------";
+  for (int i = 1; i < 5; ++i)
     ss << "\nTIB Layer " << i << " :" << ssV[0][i].str();
   ss << "\n";
-  for (int i=1;i<4;++i)
+  for (int i = 1; i < 4; ++i)
     ss << "\nTID+ Disk " << i << " :" << ssV[1][i].str();
-  for (int i=4;i<7;++i)
-    ss << "\nTID- Disk " << i-3 << " :" << ssV[1][i].str();
+  for (int i = 4; i < 7; ++i)
+    ss << "\nTID- Disk " << i - 3 << " :" << ssV[1][i].str();
   ss << "\n";
-  for (int i=1;i<7;++i)
+  for (int i = 1; i < 7; ++i)
     ss << "\nTOB Layer " << i << " :" << ssV[2][i].str();
   ss << "\n";
-  for (int i=1;i<10;++i)
+  for (int i = 1; i < 10; ++i)
     ss << "\nTEC+ Disk " << i << " :" << ssV[3][i].str();
-  for (int i=10;i<19;++i)
-    ss << "\nTEC- Disk " << i-9 << " :" << ssV[3][i].str();
-
+  for (int i = 10; i < 19; ++i)
+    ss << "\nTEC- Disk " << i - 9 << " :" << ssV[3][i].str();
 
   edm::LogInfo("SiStripQualityStatistics") << ss.str() << std::endl;
 
-  std::string filetype=TkMapFileName_,filename=TkMapFileName_;
-  std::stringstream sRun; sRun.str("");
-  sRun << "_Run_"  << std::setw(6) << std::setfill('0')<< e.id().run() << std::setw(0) ;
-    
-  if (filename!=""){
-    filename.insert(filename.find("."),sRun.str());
-    tkMap->save(true,0,0,filename);
-    filename.erase(filename.begin()+filename.find("."),filename.end());
-    tkMap->print(true,0,0,filename);
+  std::string filetype = TkMapFileName_, filename = TkMapFileName_;
+  std::stringstream sRun;
+  sRun.str("");
+  sRun << "_Run_" << std::setw(6) << std::setfill('0') << e.id().run() << std::setw(0);
+
+  if (!filename.empty()) {
+    filename.insert(filename.find("."), sRun.str());
+    tkMap->save(true, 0, 0, filename);
+    filename.erase(filename.begin() + filename.find("."), filename.end());
+    tkMap->print(true, 0, 0, filename);
   }
 }
 
-
-void SiStripQualityStatistics::SetBadComponents(int i, int component,SiStripQuality::BadComponent& BC){
-
-  int napv=reader->getNumberOfApvsAndStripLength(BC.detid).first;
-
-  ssV[i][component] << "\n\t\t " 
-		    << BC.detid 
-		    << " \t " << BC.BadModule << " \t " 
-		    << ( (BC.BadFibers)&0x1 ) << " ";
-  if (napv==4)
-    ssV[i][component] << "x " <<( (BC.BadFibers>>1)&0x1 );
-  
-  if (napv==6)
-    ssV[i][component] << ( (BC.BadFibers>>1)&0x1 ) << " "
-		      << ( (BC.BadFibers>>2)&0x1 );
-  ssV[i][component] << " \t " 
-		    << ( (BC.BadApvs)&0x1 ) << " " 
-		    << ( (BC.BadApvs>>1)&0x1 ) << " ";
-  if (napv==4) 
-    ssV[i][component] << "x x " << ( (BC.BadApvs>>2)&0x1 ) << " " 
-		      << ( (BC.BadApvs>>3)&0x1 );
-  if (napv==6) 
-    ssV[i][component] << ( (BC.BadApvs>>2)&0x1 ) << " " 
-		      << ( (BC.BadApvs>>3)&0x1 ) << " " 
-		      << ( (BC.BadApvs>>4)&0x1 ) << " " 
-		      << ( (BC.BadApvs>>5)&0x1 ) << " "; 
-
-  if (BC.BadApvs){
-    NBadComponent[i][0][2]+= ( (BC.BadApvs>>5)&0x1 )+ ( (BC.BadApvs>>4)&0x1 ) + ( (BC.BadApvs>>3)&0x1 ) + 
-      ( (BC.BadApvs>>2)&0x1 )+ ( (BC.BadApvs>>1)&0x1 ) + ( (BC.BadApvs)&0x1 );
-    NBadComponent[i][component][2]+= ( (BC.BadApvs>>5)&0x1 )+ ( (BC.BadApvs>>4)&0x1 ) + ( (BC.BadApvs>>3)&0x1 ) + 
-      ( (BC.BadApvs>>2)&0x1 )+ ( (BC.BadApvs>>1)&0x1 ) + ( (BC.BadApvs)&0x1 );
-    tkMap->fillc(BC.detid,0xff0000);
+void SiStripQualityStatistics::SetBadComponents(int i, int component, SiStripQuality::BadComponent& BC) {
+  int napv = reader->getNumberOfApvsAndStripLength(BC.detid).first;
+
+  ssV[i][component] << "\n\t\t " << BC.detid << " \t " << BC.BadModule << " \t " << ((BC.BadFibers) & 0x1) << " ";
+  if (napv == 4)
+    ssV[i][component] << "x " << ((BC.BadFibers >> 1) & 0x1);
+
+  if (napv == 6)
+    ssV[i][component] << ((BC.BadFibers >> 1) & 0x1) << " " << ((BC.BadFibers >> 2) & 0x1);
+  ssV[i][component] << " \t " << ((BC.BadApvs) & 0x1) << " " << ((BC.BadApvs >> 1) & 0x1) << " ";
+  if (napv == 4)
+    ssV[i][component] << "x x " << ((BC.BadApvs >> 2) & 0x1) << " " << ((BC.BadApvs >> 3) & 0x1);
+  if (napv == 6)
+    ssV[i][component] << ((BC.BadApvs >> 2) & 0x1) << " " << ((BC.BadApvs >> 3) & 0x1) << " "
+                      << ((BC.BadApvs >> 4) & 0x1) << " " << ((BC.BadApvs >> 5) & 0x1) << " ";
+
+  if (BC.BadApvs) {
+    NBadComponent[i][0][2] += ((BC.BadApvs >> 5) & 0x1) + ((BC.BadApvs >> 4) & 0x1) + ((BC.BadApvs >> 3) & 0x1) +
+                              ((BC.BadApvs >> 2) & 0x1) + ((BC.BadApvs >> 1) & 0x1) + ((BC.BadApvs) & 0x1);
+    NBadComponent[i][component][2] += ((BC.BadApvs >> 5) & 0x1) + ((BC.BadApvs >> 4) & 0x1) +
+                                      ((BC.BadApvs >> 3) & 0x1) + ((BC.BadApvs >> 2) & 0x1) +
+                                      ((BC.BadApvs >> 1) & 0x1) + ((BC.BadApvs) & 0x1);
+    tkMap->fillc(BC.detid, 0xff0000);
+  }
+  if (BC.BadFibers) {
+    NBadComponent[i][0][1] += ((BC.BadFibers >> 2) & 0x1) + ((BC.BadFibers >> 1) & 0x1) + ((BC.BadFibers) & 0x1);
+    NBadComponent[i][component][1] +=
+        ((BC.BadFibers >> 2) & 0x1) + ((BC.BadFibers >> 1) & 0x1) + ((BC.BadFibers) & 0x1);
+    tkMap->fillc(BC.detid, 0x0000ff);
   }
-  if (BC.BadFibers){ 
-    NBadComponent[i][0][1]+= ( (BC.BadFibers>>2)&0x1 )+ ( (BC.BadFibers>>1)&0x1 ) + ( (BC.BadFibers)&0x1 );
-    NBadComponent[i][component][1]+= ( (BC.BadFibers>>2)&0x1 )+ ( (BC.BadFibers>>1)&0x1 ) + ( (BC.BadFibers)&0x1 );
-    tkMap->fillc(BC.detid,0x0000ff);
-  }   
-  if (BC.BadModule){
+  if (BC.BadModule) {
     NBadComponent[i][0][0]++;
     NBadComponent[i][component][0]++;
-    tkMap->fillc(BC.detid,0x0);
+    tkMap->fillc(BC.detid, 0x0);
   }
 }
diff --git a/CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.h b/CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.h
index 2c5b1d818a2f2..69e0d7322e2a2 100644
--- a/CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.h
+++ b/CalibTracker/SiStripQuality/plugins/SiStripQualityStatistics.h
@@ -18,40 +18,36 @@
 #include "CommonTools/TrackerMap/interface/TrackerMap.h"
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
-#include "DQM/SiStripCommon/interface/TkHistoMap.h" 
+#include "DQM/SiStripCommon/interface/TkHistoMap.h"
 
 #include <sstream>
 
 class SiStripQualityStatistics : public DQMEDAnalyzer {
-
- public:
-  explicit SiStripQualityStatistics( const edm::ParameterSet& );
+public:
+  explicit SiStripQualityStatistics(const edm::ParameterSet&);
   ~SiStripQualityStatistics() override;
-  
-  virtual void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; 
-  virtual void analyze( const edm::Event&, const edm::EventSetup& ) override;
-  
- 
- private:
-
-  void SetBadComponents(int,int,SiStripQuality::BadComponent&);
+
+  void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
+
+private:
+  void SetBadComponents(int, int, SiStripQuality::BadComponent&);
   void EndJob();
-  
-  
+
   unsigned long long m_cacheID_;
   std::string dataLabel_;
   std::string TkMapFileName_;
   edm::FileInPath fp_;
   bool saveTkHistoMap_;
   //Global Info
-  int NTkBadComponent[4]; //k: 0=BadModule, 1=BadFiber, 2=BadApv, 3=BadStrips
-  int NBadComponent[4][19][4];  
+  int NTkBadComponent[4];  //k: 0=BadModule, 1=BadFiber, 2=BadApv, 3=BadStrips
+  int NBadComponent[4][19][4];
   //legend: NBadComponent[i][j][k]= SubSystem i, layer/disk/wheel j, BadModule/Fiber/Apv k
   //     i: 0=TIB, 1=TID, 2=TOB, 3=TEC
   //     k: 0=BadModule, 1=BadFiber, 2=BadApv, 3=BadStrips
   std::stringstream ssV[4][19];
 
-  TrackerMap * tkMap, *tkMapFullIOVs;
+  TrackerMap *tkMap, *tkMapFullIOVs;
   SiStripDetInfoFileReader* reader;
   std::unique_ptr<TkHistoMap> tkhisto;
 };
diff --git a/CalibTracker/SiStripQuality/src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc b/CalibTracker/SiStripQuality/src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc
index b800cf35d9d2b..f0ec61a841d29 100644
--- a/CalibTracker/SiStripQuality/src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc
+++ b/CalibTracker/SiStripQuality/src/SiStripBadAPVAlgorithmFromClusterOccupancy.cc
@@ -1,6 +1,5 @@
 #include "CalibTracker/SiStripQuality/interface/SiStripBadAPVAlgorithmFromClusterOccupancy.h"
 
-
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
@@ -8,431 +7,486 @@
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripQuality.h"
 
+SiStripBadAPVAlgorithmFromClusterOccupancy::SiStripBadAPVAlgorithmFromClusterOccupancy(const edm::ParameterSet& iConfig,
+                                                                                       const TrackerTopology* theTopo)
+    : lowoccupancy_(0),
+      highoccupancy_(100),
+      absolutelow_(0),
+      numberiterations_(2),
+      Nevents_(0),
+      occupancy_(0),
+      OutFileName_("Occupancy.root"),
+      UseInputDB_(iConfig.getUntrackedParameter<bool>("UseInputDB", false)),
+      tTopo(theTopo) {
+  minNevents_ = Nevents_ * occupancy_;
+}
 
-SiStripBadAPVAlgorithmFromClusterOccupancy::SiStripBadAPVAlgorithmFromClusterOccupancy(const edm::ParameterSet& iConfig, const TrackerTopology* theTopo):
-  lowoccupancy_(0),
-  highoccupancy_(100),
-  absolutelow_(0),
-  numberiterations_(2),
-  Nevents_(0),
-  occupancy_(0),
-  OutFileName_("Occupancy.root"),
-  UseInputDB_(iConfig.getUntrackedParameter<bool>("UseInputDB",false)),
-  tTopo(theTopo)
-  {
-    minNevents_=Nevents_*occupancy_;
-  }
-
-SiStripBadAPVAlgorithmFromClusterOccupancy::~SiStripBadAPVAlgorithmFromClusterOccupancy(){
-  LogTrace("SiStripBadAPVAlgorithmFromClusterOccupancy")<<"[SiStripBadAPVAlgorithmFromClusterOccupancy::~SiStripBadAPVAlgorithmFromClusterOccupancy] "<<std::endl;
+SiStripBadAPVAlgorithmFromClusterOccupancy::~SiStripBadAPVAlgorithmFromClusterOccupancy() {
+  LogTrace("SiStripBadAPVAlgorithmFromClusterOccupancy")
+      << "[SiStripBadAPVAlgorithmFromClusterOccupancy::~SiStripBadAPVAlgorithmFromClusterOccupancy] " << std::endl;
 }
 
-void SiStripBadAPVAlgorithmFromClusterOccupancy::extractBadAPVs(SiStripQuality* siStripQuality,HistoMap& DM, edm::ESHandle<SiStripQuality>& inSiStripQuality){
-
-  LogTrace("SiStripBadAPVAlgorithmFromClusterOccupancy")<<"[SiStripBadAPVAlgorithmFromClusterOccupancy::extractBadAPVs] "<<std::endl;
-
-  if (WriteOutputFile_==true){
-  f = new TFile(OutFileName_.c_str(),"RECREATE");
-  f->cd();
-
-  apvtree = new TTree("moduleOccupancy","tree");
-
-  apvtree->Branch("DetRawId",                &detrawid,                "DetRawId/I");
-  apvtree->Branch("SubDetId",                &subdetid,                "SubDetId/I");
-  apvtree->Branch("Layer_Ring",              &layer_ring,              "Layer_Ring/I");
-  apvtree->Branch("Disc",                    &disc,                    "Disc/I");
-  apvtree->Branch("IsBack",                  &isback,                  "IsBack/I");
-  apvtree->Branch("IsExternalString",        &isexternalstring,        "IsExternalString/I");
-  apvtree->Branch("IsZMinusSide",            &iszminusside,            "IsZMinusSide/I");
-  apvtree->Branch("RodStringPetal",          &rodstringpetal,          "RodStringPetal/I");
-  apvtree->Branch("IsStereo",                &isstereo,                "IsStereo/I");
-  apvtree->Branch("ModuleNumber",            &module_number,           "ModuleNumber/I");
-  apvtree->Branch("NumberOfStrips",          &number_strips,           "NumberOfStrips/I");
-  apvtree->Branch("APVGlobalPositionX",      &global_position_x,       "APVGlobalPositionX/F");
-  apvtree->Branch("APVGlobalPositionY",      &global_position_y,       "APVGlobalPositionY/F");
-  apvtree->Branch("APVGlobalPositionZ",      &global_position_z,       "APVGlobalPositionZ/F");
-  apvtree->Branch("APVNumber",               &apv_number,              "APVNumber/I");
-  apvtree->Branch("APVAbsoluteOccupancy",    &apvAbsoluteOccupancy,    "apvAbsoluteOccupancy/D");
-  apvtree->Branch("APVMedianOccupancy",      &apvMedianOccupancy,      "apvMedianOccupancy/D");
+void SiStripBadAPVAlgorithmFromClusterOccupancy::extractBadAPVs(SiStripQuality* siStripQuality,
+                                                                HistoMap& DM,
+                                                                edm::ESHandle<SiStripQuality>& inSiStripQuality) {
+  LogTrace("SiStripBadAPVAlgorithmFromClusterOccupancy")
+      << "[SiStripBadAPVAlgorithmFromClusterOccupancy::extractBadAPVs] " << std::endl;
+
+  if (WriteOutputFile_ == true) {
+    f = new TFile(OutFileName_.c_str(), "RECREATE");
+    f->cd();
+
+    apvtree = new TTree("moduleOccupancy", "tree");
+
+    apvtree->Branch("DetRawId", &detrawid, "DetRawId/I");
+    apvtree->Branch("SubDetId", &subdetid, "SubDetId/I");
+    apvtree->Branch("Layer_Ring", &layer_ring, "Layer_Ring/I");
+    apvtree->Branch("Disc", &disc, "Disc/I");
+    apvtree->Branch("IsBack", &isback, "IsBack/I");
+    apvtree->Branch("IsExternalString", &isexternalstring, "IsExternalString/I");
+    apvtree->Branch("IsZMinusSide", &iszminusside, "IsZMinusSide/I");
+    apvtree->Branch("RodStringPetal", &rodstringpetal, "RodStringPetal/I");
+    apvtree->Branch("IsStereo", &isstereo, "IsStereo/I");
+    apvtree->Branch("ModuleNumber", &module_number, "ModuleNumber/I");
+    apvtree->Branch("NumberOfStrips", &number_strips, "NumberOfStrips/I");
+    apvtree->Branch("APVGlobalPositionX", &global_position_x, "APVGlobalPositionX/F");
+    apvtree->Branch("APVGlobalPositionY", &global_position_y, "APVGlobalPositionY/F");
+    apvtree->Branch("APVGlobalPositionZ", &global_position_z, "APVGlobalPositionZ/F");
+    apvtree->Branch("APVNumber", &apv_number, "APVNumber/I");
+    apvtree->Branch("APVAbsoluteOccupancy", &apvAbsoluteOccupancy, "apvAbsoluteOccupancy/D");
+    apvtree->Branch("APVMedianOccupancy", &apvMedianOccupancy, "apvMedianOccupancy/D");
   }
 
-  HistoMap::iterator it=DM.begin();
-  HistoMap::iterator itEnd=DM.end();
+  HistoMap::iterator it = DM.begin();
+  HistoMap::iterator itEnd = DM.end();
   std::vector<unsigned int> badStripList;
   uint32_t detid;
-  for (;it!=itEnd;++it){
-
+  for (; it != itEnd; ++it) {
     Apv APV;
 
-    for (int apv=0; apv<6; apv++)
-      {
-	APV.apvMedian[apv]            = 0;
-	APV.apvabsoluteOccupancy[apv] = 0;
+    for (int apv = 0; apv < 6; apv++) {
+      APV.apvMedian[apv] = 0;
+      APV.apvabsoluteOccupancy[apv] = 0;
 
-	for (int strip=0; strip<128; strip++)
-	  {
-	    stripOccupancy[apv][strip] = 0;
-	    stripWeight[apv][strip]    = 0;
-	  }
+      for (int strip = 0; strip < 128; strip++) {
+        stripOccupancy[apv][strip] = 0;
+        stripWeight[apv][strip] = 0;
       }
+    }
 
     pHisto phisto;
     phisto._th1f = it->second.get();
     phisto._NEntries = (int)phisto._th1f->GetEntries();
     phisto._NBins = phisto._th1f->GetNbinsX();
 
-    number_strips  = (int)phisto._NBins;
-    number_apvs    = number_strips/128;
+    number_strips = (int)phisto._NBins;
+    number_apvs = number_strips / 128;
     APV.numberApvs = number_apvs;
 
-    for (int apv=0; apv<number_apvs; apv++)
-      {
-	for (int strip=0; strip<128; strip++)
-	  {
-	    stripOccupancy[apv][strip]     = phisto._th1f->GetBinContent((apv*128)+strip+1); // Remember: Bin=0 is underflow bin!
-	    stripWeight[apv][strip]        = 1;
-	    APV.apvabsoluteOccupancy[apv] += phisto._th1f->GetBinContent((apv*128)+strip+1); // Remember: Bin=0 is underflow bin!
-	  }
+    for (int apv = 0; apv < number_apvs; apv++) {
+      for (int strip = 0; strip < 128; strip++) {
+        stripOccupancy[apv][strip] =
+            phisto._th1f->GetBinContent((apv * 128) + strip + 1);  // Remember: Bin=0 is underflow bin!
+        stripWeight[apv][strip] = 1;
+        APV.apvabsoluteOccupancy[apv] +=
+            phisto._th1f->GetBinContent((apv * 128) + strip + 1);  // Remember: Bin=0 is underflow bin!
       }
+    }
 
-    for (int apv=0; apv<number_apvs; apv++)
-      {
-	APV.apvMedian[apv] = TMath::Median(128,stripOccupancy[apv],stripWeight[apv]);
-      }
+    for (int apv = 0; apv < number_apvs; apv++) {
+      APV.apvMedian[apv] = TMath::Median(128, stripOccupancy[apv], stripWeight[apv]);
+    }
 
-    detid=it->first;
-    DetId detectorId=DetId(detid);
+    detid = it->first;
+    DetId detectorId = DetId(detid);
 
     if (edm::isDebugEnabled())
-      LogTrace("SiStripBadAPV") << "Analyzing detid " << detid<< std::endl;
+      LogTrace("SiStripBadAPV") << "Analyzing detid " << detid << std::endl;
 
-    detrawid     = detid;
+    detrawid = detid;
     APV.detrawId = detrawid;
-    subdetid     = detectorId.subdetId();
-    switch (detectorId.subdetId())
-      {
-      case StripSubdetector::TIB :
-	layer_ring = tTopo->tibLayer(detrawid);
-	disc       = -1;
-	isstereo   = tTopo->tibIsStereo(detrawid);
-	isback     = -1;
-	if (tTopo->tibIsExternalString(detrawid)) isexternalstring = 1;
-	else                                       isexternalstring = 0;
-	if (tTopo->tibIsZMinusSide(detrawid)) iszminusside = 1;
-	else                                   iszminusside = 0;
-	rodstringpetal     = tTopo->tibString(detrawid);
-	module_number      = tTopo->tibModule(detrawid);
-	APV.modulePosition = module_number;
-
-	if      (layer_ring == 1) medianValues_TIB_Layer1.push_back(APV);
-	else if (layer_ring == 2) medianValues_TIB_Layer2.push_back(APV);
-	else if (layer_ring == 3) medianValues_TIB_Layer3.push_back(APV);
-	else if (layer_ring == 4) medianValues_TIB_Layer4.push_back(APV);
-	break;
-
-      case StripSubdetector::TID :
-	layer_ring = tTopo->tidRing(detrawid);
-	disc       = tTopo->tidWheel(detrawid);
-	isstereo   = tTopo->tidIsStereo(detrawid);
-	if (tTopo->tidIsBackRing(detrawid)) isback = 1;
-	else                                 isback = 0;
-	if (tTopo->tidIsZMinusSide(detrawid)) iszminusside = 1;
-	else                                   iszminusside = 0;
-	isexternalstring   = -1;
-	rodstringpetal     = -1;
-	module_number      = tTopo->tidModule(detrawid);
-	APV.modulePosition = layer_ring;
-
-	if (iszminusside==0)
-	  {
-	    if      (disc==1) medianValues_TIDPlus_Disc1.push_back(APV);
-	    else if (disc==2) medianValues_TIDPlus_Disc2.push_back(APV);
-	    else if (disc==3) medianValues_TIDPlus_Disc3.push_back(APV);
-	  }
-	else if (iszminusside==1)
-	  {
-	    if      (disc==1) medianValues_TIDMinus_Disc1.push_back(APV);
-	    else if (disc==2) medianValues_TIDMinus_Disc2.push_back(APV);
-	    else if (disc==3) medianValues_TIDMinus_Disc3.push_back(APV);
-	  }
-	break;
-
-      case StripSubdetector::TOB :
-	layer_ring = tTopo->tobLayer(detrawid);
-	disc       = -1;
-	isstereo   = tTopo->tobIsStereo(detrawid);
-	isback     = -1;
-	if (tTopo->tobIsZMinusSide(detrawid)) iszminusside = 1;
-	else                                   iszminusside = 0;
-	isexternalstring   = -1;
-	rodstringpetal     = tTopo->tobRod(detrawid);
-	module_number      = tTopo->tobModule(detrawid);
-	APV.modulePosition = module_number;
-
-	if      (layer_ring == 1) medianValues_TOB_Layer1.push_back(APV);
-	else if (layer_ring == 2) medianValues_TOB_Layer2.push_back(APV);
-	else if (layer_ring == 3) medianValues_TOB_Layer3.push_back(APV);
-	else if (layer_ring == 4) medianValues_TOB_Layer4.push_back(APV);
-	else if (layer_ring == 5) medianValues_TOB_Layer5.push_back(APV);
-	else if (layer_ring == 6) medianValues_TOB_Layer6.push_back(APV);
-	break;
-
-      case StripSubdetector::TEC :
-	layer_ring = tTopo->tecRing(detrawid);
-	disc       = tTopo->tecWheel(detrawid);
-	isstereo   = tTopo->tecIsStereo(detrawid);
-	if (tTopo->tecIsBackPetal(detrawid)) isback = 1;
-	else                                  isback = 0;
-	if (tTopo->tecIsZMinusSide(detrawid)) iszminusside = 1;
-	else                                   iszminusside = 0;
-	isexternalstring   = -1;
-	rodstringpetal     = tTopo->tecPetalNumber(detrawid);
-	module_number      = tTopo->tecModule(detrawid);
-	APV.modulePosition = layer_ring;
-
-	if (iszminusside==0)
-	  {
-	    if      (disc==1) medianValues_TECPlus_Disc1.push_back(APV);
-	    else if (disc==2) medianValues_TECPlus_Disc2.push_back(APV);
-	    else if (disc==3) medianValues_TECPlus_Disc3.push_back(APV);
-	    else if (disc==4) medianValues_TECPlus_Disc4.push_back(APV);
-	    else if (disc==5) medianValues_TECPlus_Disc5.push_back(APV);
-	    else if (disc==6) medianValues_TECPlus_Disc6.push_back(APV);
-	    else if (disc==7) medianValues_TECPlus_Disc7.push_back(APV);
-	    else if (disc==8) medianValues_TECPlus_Disc8.push_back(APV);
-	    else if (disc==9) medianValues_TECPlus_Disc9.push_back(APV);
-	  }
-	else if (iszminusside==1)
-	  {
-	    if      (disc==1) medianValues_TECMinus_Disc1.push_back(APV);
-	    else if (disc==2) medianValues_TECMinus_Disc2.push_back(APV);
-	    else if (disc==3) medianValues_TECMinus_Disc3.push_back(APV);
-	    else if (disc==4) medianValues_TECMinus_Disc4.push_back(APV);
-	    else if (disc==5) medianValues_TECMinus_Disc5.push_back(APV);
-	    else if (disc==6) medianValues_TECMinus_Disc6.push_back(APV);
-	    else if (disc==7) medianValues_TECMinus_Disc7.push_back(APV);
-	    else if (disc==8) medianValues_TECMinus_Disc8.push_back(APV);
-	    else if (disc==9) medianValues_TECMinus_Disc9.push_back(APV);
-	  }
-	break;
-
-      default :
-	std::cout << "### Detector does not belong to TIB, TID, TOB or TEC !? ###" << std::endl;
-	std::cout << "### DetRawId: " << detrawid << " ###" << std::endl;
-      }
+    subdetid = detectorId.subdetId();
+    switch (detectorId.subdetId()) {
+      case StripSubdetector::TIB:
+        layer_ring = tTopo->tibLayer(detrawid);
+        disc = -1;
+        isstereo = tTopo->tibIsStereo(detrawid);
+        isback = -1;
+        if (tTopo->tibIsExternalString(detrawid))
+          isexternalstring = 1;
+        else
+          isexternalstring = 0;
+        if (tTopo->tibIsZMinusSide(detrawid))
+          iszminusside = 1;
+        else
+          iszminusside = 0;
+        rodstringpetal = tTopo->tibString(detrawid);
+        module_number = tTopo->tibModule(detrawid);
+        APV.modulePosition = module_number;
+
+        if (layer_ring == 1)
+          medianValues_TIB_Layer1.push_back(APV);
+        else if (layer_ring == 2)
+          medianValues_TIB_Layer2.push_back(APV);
+        else if (layer_ring == 3)
+          medianValues_TIB_Layer3.push_back(APV);
+        else if (layer_ring == 4)
+          medianValues_TIB_Layer4.push_back(APV);
+        break;
+
+      case StripSubdetector::TID:
+        layer_ring = tTopo->tidRing(detrawid);
+        disc = tTopo->tidWheel(detrawid);
+        isstereo = tTopo->tidIsStereo(detrawid);
+        if (tTopo->tidIsBackRing(detrawid))
+          isback = 1;
+        else
+          isback = 0;
+        if (tTopo->tidIsZMinusSide(detrawid))
+          iszminusside = 1;
+        else
+          iszminusside = 0;
+        isexternalstring = -1;
+        rodstringpetal = -1;
+        module_number = tTopo->tidModule(detrawid);
+        APV.modulePosition = layer_ring;
+
+        if (iszminusside == 0) {
+          if (disc == 1)
+            medianValues_TIDPlus_Disc1.push_back(APV);
+          else if (disc == 2)
+            medianValues_TIDPlus_Disc2.push_back(APV);
+          else if (disc == 3)
+            medianValues_TIDPlus_Disc3.push_back(APV);
+        } else if (iszminusside == 1) {
+          if (disc == 1)
+            medianValues_TIDMinus_Disc1.push_back(APV);
+          else if (disc == 2)
+            medianValues_TIDMinus_Disc2.push_back(APV);
+          else if (disc == 3)
+            medianValues_TIDMinus_Disc3.push_back(APV);
+        }
+        break;
+
+      case StripSubdetector::TOB:
+        layer_ring = tTopo->tobLayer(detrawid);
+        disc = -1;
+        isstereo = tTopo->tobIsStereo(detrawid);
+        isback = -1;
+        if (tTopo->tobIsZMinusSide(detrawid))
+          iszminusside = 1;
+        else
+          iszminusside = 0;
+        isexternalstring = -1;
+        rodstringpetal = tTopo->tobRod(detrawid);
+        module_number = tTopo->tobModule(detrawid);
+        APV.modulePosition = module_number;
+
+        if (layer_ring == 1)
+          medianValues_TOB_Layer1.push_back(APV);
+        else if (layer_ring == 2)
+          medianValues_TOB_Layer2.push_back(APV);
+        else if (layer_ring == 3)
+          medianValues_TOB_Layer3.push_back(APV);
+        else if (layer_ring == 4)
+          medianValues_TOB_Layer4.push_back(APV);
+        else if (layer_ring == 5)
+          medianValues_TOB_Layer5.push_back(APV);
+        else if (layer_ring == 6)
+          medianValues_TOB_Layer6.push_back(APV);
+        break;
+
+      case StripSubdetector::TEC:
+        layer_ring = tTopo->tecRing(detrawid);
+        disc = tTopo->tecWheel(detrawid);
+        isstereo = tTopo->tecIsStereo(detrawid);
+        if (tTopo->tecIsBackPetal(detrawid))
+          isback = 1;
+        else
+          isback = 0;
+        if (tTopo->tecIsZMinusSide(detrawid))
+          iszminusside = 1;
+        else
+          iszminusside = 0;
+        isexternalstring = -1;
+        rodstringpetal = tTopo->tecPetalNumber(detrawid);
+        module_number = tTopo->tecModule(detrawid);
+        APV.modulePosition = layer_ring;
+
+        if (iszminusside == 0) {
+          if (disc == 1)
+            medianValues_TECPlus_Disc1.push_back(APV);
+          else if (disc == 2)
+            medianValues_TECPlus_Disc2.push_back(APV);
+          else if (disc == 3)
+            medianValues_TECPlus_Disc3.push_back(APV);
+          else if (disc == 4)
+            medianValues_TECPlus_Disc4.push_back(APV);
+          else if (disc == 5)
+            medianValues_TECPlus_Disc5.push_back(APV);
+          else if (disc == 6)
+            medianValues_TECPlus_Disc6.push_back(APV);
+          else if (disc == 7)
+            medianValues_TECPlus_Disc7.push_back(APV);
+          else if (disc == 8)
+            medianValues_TECPlus_Disc8.push_back(APV);
+          else if (disc == 9)
+            medianValues_TECPlus_Disc9.push_back(APV);
+        } else if (iszminusside == 1) {
+          if (disc == 1)
+            medianValues_TECMinus_Disc1.push_back(APV);
+          else if (disc == 2)
+            medianValues_TECMinus_Disc2.push_back(APV);
+          else if (disc == 3)
+            medianValues_TECMinus_Disc3.push_back(APV);
+          else if (disc == 4)
+            medianValues_TECMinus_Disc4.push_back(APV);
+          else if (disc == 5)
+            medianValues_TECMinus_Disc5.push_back(APV);
+          else if (disc == 6)
+            medianValues_TECMinus_Disc6.push_back(APV);
+          else if (disc == 7)
+            medianValues_TECMinus_Disc7.push_back(APV);
+          else if (disc == 8)
+            medianValues_TECMinus_Disc8.push_back(APV);
+          else if (disc == 9)
+            medianValues_TECMinus_Disc9.push_back(APV);
+        }
+        break;
+
+      default:
+        std::cout << "### Detector does not belong to TIB, TID, TOB or TEC !? ###" << std::endl;
+        std::cout << "### DetRawId: " << detrawid << " ###" << std::endl;
+    }
 
-    const StripGeomDetUnit*  theStripDet = dynamic_cast<const StripGeomDetUnit*>( (TkGeom->idToDet(detectorId)) );
-    const StripTopology* theStripTopol   = dynamic_cast<const StripTopology*>( &(theStripDet->specificTopology()) );
+    const StripGeomDetUnit* theStripDet = dynamic_cast<const StripGeomDetUnit*>((TkGeom->idToDet(detectorId)));
+    const StripTopology* theStripTopol = dynamic_cast<const StripTopology*>(&(theStripDet->specificTopology()));
 
-    for (int apv=0; apv<number_apvs; apv++)
-      {
-	apv_number           = apv+1;
-	apvMedianOccupancy   = APV.apvMedian[apv];
-	apvAbsoluteOccupancy = APV.apvabsoluteOccupancy[apv];
+    for (int apv = 0; apv < number_apvs; apv++) {
+      apv_number = apv + 1;
+      apvMedianOccupancy = APV.apvMedian[apv];
+      apvAbsoluteOccupancy = APV.apvabsoluteOccupancy[apv];
 
-	LocalPoint  pos_strip_local  = theStripTopol->localPosition((apv*128));
-        GlobalPoint pos_strip_global = (TkGeom->idToDet(detectorId))->surface().toGlobal(pos_strip_local);
+      LocalPoint pos_strip_local = theStripTopol->localPosition((apv * 128));
+      GlobalPoint pos_strip_global = (TkGeom->idToDet(detectorId))->surface().toGlobal(pos_strip_local);
 
-        global_position_x = pos_strip_global.x();
-        global_position_y = pos_strip_global.y();
-        global_position_z = pos_strip_global.z();
+      global_position_x = pos_strip_global.x();
+      global_position_y = pos_strip_global.y();
+      global_position_z = pos_strip_global.z();
 
-	if (WriteOutputFile_==true) apvtree->Fill();
-      }
+      if (WriteOutputFile_ == true)
+        apvtree->Fill();
+    }
 
-  } // end loop on modules
+  }  // end loop on modules
 
   // Calculate Mean and RMS for each Layer
-  CalculateMeanAndRMS(medianValues_TIB_Layer1,MeanAndRms_TIB_Layer1,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TIB_Layer2,MeanAndRms_TIB_Layer2,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TIB_Layer3,MeanAndRms_TIB_Layer3,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TIB_Layer4,MeanAndRms_TIB_Layer4,numberiterations_);
-
-  CalculateMeanAndRMS(medianValues_TOB_Layer1,MeanAndRms_TOB_Layer1,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TOB_Layer2,MeanAndRms_TOB_Layer2,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TOB_Layer3,MeanAndRms_TOB_Layer3,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TOB_Layer4,MeanAndRms_TOB_Layer4,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TOB_Layer5,MeanAndRms_TOB_Layer5,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TOB_Layer6,MeanAndRms_TOB_Layer6,numberiterations_);
-
-  CalculateMeanAndRMS(medianValues_TIDPlus_Disc1,MeanAndRms_TIDPlus_Disc1,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TIDPlus_Disc2,MeanAndRms_TIDPlus_Disc2,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TIDPlus_Disc3,MeanAndRms_TIDPlus_Disc3,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TIDMinus_Disc1,MeanAndRms_TIDMinus_Disc1,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TIDMinus_Disc2,MeanAndRms_TIDMinus_Disc2,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TIDMinus_Disc3,MeanAndRms_TIDMinus_Disc3,numberiterations_);
-
-  CalculateMeanAndRMS(medianValues_TECPlus_Disc1,MeanAndRms_TECPlus_Disc1,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECPlus_Disc2,MeanAndRms_TECPlus_Disc2,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECPlus_Disc3,MeanAndRms_TECPlus_Disc3,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECPlus_Disc4,MeanAndRms_TECPlus_Disc4,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECPlus_Disc5,MeanAndRms_TECPlus_Disc5,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECPlus_Disc6,MeanAndRms_TECPlus_Disc6,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECPlus_Disc7,MeanAndRms_TECPlus_Disc7,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECPlus_Disc8,MeanAndRms_TECPlus_Disc8,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECPlus_Disc9,MeanAndRms_TECPlus_Disc9,numberiterations_);
-
-  CalculateMeanAndRMS(medianValues_TECMinus_Disc1,MeanAndRms_TECMinus_Disc1,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECMinus_Disc2,MeanAndRms_TECMinus_Disc2,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECMinus_Disc3,MeanAndRms_TECMinus_Disc3,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECMinus_Disc4,MeanAndRms_TECMinus_Disc4,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECMinus_Disc5,MeanAndRms_TECMinus_Disc5,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECMinus_Disc6,MeanAndRms_TECMinus_Disc6,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECMinus_Disc7,MeanAndRms_TECMinus_Disc7,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECMinus_Disc8,MeanAndRms_TECMinus_Disc8,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECMinus_Disc9,MeanAndRms_TECMinus_Disc9,numberiterations_);
-
-  pQuality=siStripQuality;
+  CalculateMeanAndRMS(medianValues_TIB_Layer1, MeanAndRms_TIB_Layer1, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TIB_Layer2, MeanAndRms_TIB_Layer2, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TIB_Layer3, MeanAndRms_TIB_Layer3, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TIB_Layer4, MeanAndRms_TIB_Layer4, numberiterations_);
+
+  CalculateMeanAndRMS(medianValues_TOB_Layer1, MeanAndRms_TOB_Layer1, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TOB_Layer2, MeanAndRms_TOB_Layer2, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TOB_Layer3, MeanAndRms_TOB_Layer3, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TOB_Layer4, MeanAndRms_TOB_Layer4, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TOB_Layer5, MeanAndRms_TOB_Layer5, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TOB_Layer6, MeanAndRms_TOB_Layer6, numberiterations_);
+
+  CalculateMeanAndRMS(medianValues_TIDPlus_Disc1, MeanAndRms_TIDPlus_Disc1, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TIDPlus_Disc2, MeanAndRms_TIDPlus_Disc2, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TIDPlus_Disc3, MeanAndRms_TIDPlus_Disc3, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TIDMinus_Disc1, MeanAndRms_TIDMinus_Disc1, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TIDMinus_Disc2, MeanAndRms_TIDMinus_Disc2, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TIDMinus_Disc3, MeanAndRms_TIDMinus_Disc3, numberiterations_);
+
+  CalculateMeanAndRMS(medianValues_TECPlus_Disc1, MeanAndRms_TECPlus_Disc1, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECPlus_Disc2, MeanAndRms_TECPlus_Disc2, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECPlus_Disc3, MeanAndRms_TECPlus_Disc3, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECPlus_Disc4, MeanAndRms_TECPlus_Disc4, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECPlus_Disc5, MeanAndRms_TECPlus_Disc5, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECPlus_Disc6, MeanAndRms_TECPlus_Disc6, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECPlus_Disc7, MeanAndRms_TECPlus_Disc7, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECPlus_Disc8, MeanAndRms_TECPlus_Disc8, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECPlus_Disc9, MeanAndRms_TECPlus_Disc9, numberiterations_);
+
+  CalculateMeanAndRMS(medianValues_TECMinus_Disc1, MeanAndRms_TECMinus_Disc1, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECMinus_Disc2, MeanAndRms_TECMinus_Disc2, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECMinus_Disc3, MeanAndRms_TECMinus_Disc3, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECMinus_Disc4, MeanAndRms_TECMinus_Disc4, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECMinus_Disc5, MeanAndRms_TECMinus_Disc5, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECMinus_Disc6, MeanAndRms_TECMinus_Disc6, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECMinus_Disc7, MeanAndRms_TECMinus_Disc7, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECMinus_Disc8, MeanAndRms_TECMinus_Disc8, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECMinus_Disc9, MeanAndRms_TECMinus_Disc9, numberiterations_);
+
+  pQuality = siStripQuality;
   badStripList.clear();
 
   // Analyze the APV Occupancy for hot APVs
-  AnalyzeOccupancy(siStripQuality,medianValues_TIB_Layer1,MeanAndRms_TIB_Layer1,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TIB_Layer2,MeanAndRms_TIB_Layer2,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TIB_Layer3,MeanAndRms_TIB_Layer3,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TIB_Layer4,MeanAndRms_TIB_Layer4,badStripList,inSiStripQuality);
-
-  AnalyzeOccupancy(siStripQuality,medianValues_TOB_Layer1,MeanAndRms_TOB_Layer1,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TOB_Layer2,MeanAndRms_TOB_Layer2,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TOB_Layer3,MeanAndRms_TOB_Layer3,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TOB_Layer4,MeanAndRms_TOB_Layer4,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TOB_Layer5,MeanAndRms_TOB_Layer5,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TOB_Layer6,MeanAndRms_TOB_Layer6,badStripList,inSiStripQuality);
-
-  AnalyzeOccupancy(siStripQuality,medianValues_TIDPlus_Disc1,MeanAndRms_TIDPlus_Disc1,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TIDPlus_Disc2,MeanAndRms_TIDPlus_Disc2,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TIDPlus_Disc3,MeanAndRms_TIDPlus_Disc3,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TIDMinus_Disc1,MeanAndRms_TIDMinus_Disc1,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TIDMinus_Disc2,MeanAndRms_TIDMinus_Disc2,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TIDMinus_Disc3,MeanAndRms_TIDMinus_Disc3,badStripList,inSiStripQuality);
-
-  AnalyzeOccupancy(siStripQuality,medianValues_TECPlus_Disc1,MeanAndRms_TECPlus_Disc1,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECPlus_Disc2,MeanAndRms_TECPlus_Disc2,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECPlus_Disc3,MeanAndRms_TECPlus_Disc3,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECPlus_Disc4,MeanAndRms_TECPlus_Disc4,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECPlus_Disc5,MeanAndRms_TECPlus_Disc5,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECPlus_Disc6,MeanAndRms_TECPlus_Disc6,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECPlus_Disc7,MeanAndRms_TECPlus_Disc7,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECPlus_Disc8,MeanAndRms_TECPlus_Disc8,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECPlus_Disc9,MeanAndRms_TECPlus_Disc9,badStripList,inSiStripQuality);
-
-  AnalyzeOccupancy(siStripQuality,medianValues_TECMinus_Disc1,MeanAndRms_TECMinus_Disc1,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECMinus_Disc2,MeanAndRms_TECMinus_Disc2,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECMinus_Disc3,MeanAndRms_TECMinus_Disc3,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECMinus_Disc4,MeanAndRms_TECMinus_Disc4,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECMinus_Disc5,MeanAndRms_TECMinus_Disc5,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECMinus_Disc6,MeanAndRms_TECMinus_Disc6,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECMinus_Disc7,MeanAndRms_TECMinus_Disc7,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECMinus_Disc8,MeanAndRms_TECMinus_Disc8,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECMinus_Disc9,MeanAndRms_TECMinus_Disc9,badStripList,inSiStripQuality);
+  AnalyzeOccupancy(siStripQuality, medianValues_TIB_Layer1, MeanAndRms_TIB_Layer1, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(siStripQuality, medianValues_TIB_Layer2, MeanAndRms_TIB_Layer2, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(siStripQuality, medianValues_TIB_Layer3, MeanAndRms_TIB_Layer3, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(siStripQuality, medianValues_TIB_Layer4, MeanAndRms_TIB_Layer4, badStripList, inSiStripQuality);
+
+  AnalyzeOccupancy(siStripQuality, medianValues_TOB_Layer1, MeanAndRms_TOB_Layer1, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(siStripQuality, medianValues_TOB_Layer2, MeanAndRms_TOB_Layer2, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(siStripQuality, medianValues_TOB_Layer3, MeanAndRms_TOB_Layer3, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(siStripQuality, medianValues_TOB_Layer4, MeanAndRms_TOB_Layer4, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(siStripQuality, medianValues_TOB_Layer5, MeanAndRms_TOB_Layer5, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(siStripQuality, medianValues_TOB_Layer6, MeanAndRms_TOB_Layer6, badStripList, inSiStripQuality);
+
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TIDPlus_Disc1, MeanAndRms_TIDPlus_Disc1, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TIDPlus_Disc2, MeanAndRms_TIDPlus_Disc2, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TIDPlus_Disc3, MeanAndRms_TIDPlus_Disc3, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TIDMinus_Disc1, MeanAndRms_TIDMinus_Disc1, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TIDMinus_Disc2, MeanAndRms_TIDMinus_Disc2, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TIDMinus_Disc3, MeanAndRms_TIDMinus_Disc3, badStripList, inSiStripQuality);
+
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECPlus_Disc1, MeanAndRms_TECPlus_Disc1, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECPlus_Disc2, MeanAndRms_TECPlus_Disc2, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECPlus_Disc3, MeanAndRms_TECPlus_Disc3, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECPlus_Disc4, MeanAndRms_TECPlus_Disc4, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECPlus_Disc5, MeanAndRms_TECPlus_Disc5, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECPlus_Disc6, MeanAndRms_TECPlus_Disc6, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECPlus_Disc7, MeanAndRms_TECPlus_Disc7, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECPlus_Disc8, MeanAndRms_TECPlus_Disc8, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECPlus_Disc9, MeanAndRms_TECPlus_Disc9, badStripList, inSiStripQuality);
+
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECMinus_Disc1, MeanAndRms_TECMinus_Disc1, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECMinus_Disc2, MeanAndRms_TECMinus_Disc2, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECMinus_Disc3, MeanAndRms_TECMinus_Disc3, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECMinus_Disc4, MeanAndRms_TECMinus_Disc4, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECMinus_Disc5, MeanAndRms_TECMinus_Disc5, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECMinus_Disc6, MeanAndRms_TECMinus_Disc6, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECMinus_Disc7, MeanAndRms_TECMinus_Disc7, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECMinus_Disc8, MeanAndRms_TECMinus_Disc8, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECMinus_Disc9, MeanAndRms_TECMinus_Disc9, badStripList, inSiStripQuality);
 
   siStripQuality->fillBadComponents();
 
-  if (WriteOutputFile_==true){
-  f->cd();
-  apvtree->Write();
-  f->Close();
+  if (WriteOutputFile_ == true) {
+    f->cd();
+    apvtree->Write();
+    f->Close();
   }
 
   LogTrace("SiStripBadAPV") << ss.str() << std::endl;
 }
 
-
-void SiStripBadAPVAlgorithmFromClusterOccupancy::CalculateMeanAndRMS(const std::vector<Apv>& a, std::pair<double,double>* MeanRMS, int number_iterations)
-{
+void SiStripBadAPVAlgorithmFromClusterOccupancy::CalculateMeanAndRMS(const std::vector<Apv>& a,
+                                                                     std::pair<double, double>* MeanRMS,
+                                                                     int number_iterations) {
   Double_t tot[7], tot2[7];
   Double_t n[7];
 
   Double_t Mean[7] = {0};
-  Double_t Rms[7]  = {1000,1000,1000,1000,1000,1000,1000};
+  Double_t Rms[7] = {1000, 1000, 1000, 1000, 1000, 1000, 1000};
 
   int Moduleposition;
 
-  for (int i=0; i<number_iterations; i++)
-    {
-      for (int j=0; j<7; j++)
-	{
-	  n[j]    = 0;
-	  tot[j]  = 0;
-	  tot2[j] = 0;
-	}
-
-      for (uint32_t it=0; it<a.size(); it++)
-	{
-	  Moduleposition = (a[it].modulePosition)-1;
-
-	  for (int apv=0; apv<a[it].numberApvs; apv++)
-	    {
-	      if (i>0)
-		{
-		  if (a[it].apvMedian[apv]<(Mean[Moduleposition]-3*Rms[Moduleposition]) || (a[it].apvMedian[apv]>(Mean[Moduleposition]+5*Rms[Moduleposition])))
-		    {
-		      continue;
-		    }
-		}
-	      tot[Moduleposition]  += a[it].apvMedian[apv];
-	      tot2[Moduleposition] += (a[it].apvMedian[apv])*(a[it].apvMedian[apv]);
-	      n[Moduleposition]++;
-	    }
-	}
-
-      for (int j=0; j<7; j++)
-	{
-	  if (n[j]!=0)
-	    {
-	      Mean[j] = tot[j]/n[j];
-	      Rms[j]  = TMath::Sqrt(TMath::Abs(tot2[j]/n[j] -Mean[j]*Mean[j]));
-	    }
-	}
+  for (int i = 0; i < number_iterations; i++) {
+    for (int j = 0; j < 7; j++) {
+      n[j] = 0;
+      tot[j] = 0;
+      tot2[j] = 0;
     }
 
-  for (int j=0; j<7; j++)
-    {
-      MeanRMS[j] = std::make_pair(Mean[j],Rms[j]);
+    for (uint32_t it = 0; it < a.size(); it++) {
+      Moduleposition = (a[it].modulePosition) - 1;
+
+      for (int apv = 0; apv < a[it].numberApvs; apv++) {
+        if (i > 0) {
+          if (a[it].apvMedian[apv] < (Mean[Moduleposition] - 3 * Rms[Moduleposition]) ||
+              (a[it].apvMedian[apv] > (Mean[Moduleposition] + 5 * Rms[Moduleposition]))) {
+            continue;
+          }
+        }
+        tot[Moduleposition] += a[it].apvMedian[apv];
+        tot2[Moduleposition] += (a[it].apvMedian[apv]) * (a[it].apvMedian[apv]);
+        n[Moduleposition]++;
+      }
     }
 
+    for (int j = 0; j < 7; j++) {
+      if (n[j] != 0) {
+        Mean[j] = tot[j] / n[j];
+        Rms[j] = TMath::Sqrt(TMath::Abs(tot2[j] / n[j] - Mean[j] * Mean[j]));
+      }
+    }
+  }
+
+  for (int j = 0; j < 7; j++) {
+    MeanRMS[j] = std::make_pair(Mean[j], Rms[j]);
+  }
 }
 
-void SiStripBadAPVAlgorithmFromClusterOccupancy::AnalyzeOccupancy(SiStripQuality* quality, std::vector<Apv>& medianValues, std::pair<double,double>* MeanAndRms, std::vector<unsigned int>& BadStripList, edm::ESHandle<SiStripQuality>& InSiStripQuality)
-{
+void SiStripBadAPVAlgorithmFromClusterOccupancy::AnalyzeOccupancy(SiStripQuality* quality,
+                                                                  std::vector<Apv>& medianValues,
+                                                                  std::pair<double, double>* MeanAndRms,
+                                                                  std::vector<unsigned int>& BadStripList,
+                                                                  edm::ESHandle<SiStripQuality>& InSiStripQuality) {
   int Moduleposition;
   uint32_t Detid;
 
-  for (uint32_t it=0; it<medianValues.size(); it++)
-    {
-      Moduleposition = (medianValues[it].modulePosition)-1;
-      Detid          = medianValues[it].detrawId;
-
-      for (int apv=0; apv<medianValues[it].numberApvs; apv++)
-	{
-	  if(UseInputDB_)
-	    {
-	      if(InSiStripQuality->IsApvBad(Detid,apv) )
-		{
-		  continue;//if the apv is already flagged as bad, continue.
-		}
-	    }
-	  if (medianValues[it].apvMedian[apv] > minNevents_)
-	    {
-	      if ((medianValues[it].apvMedian[apv]>(MeanAndRms[Moduleposition].first+highoccupancy_*MeanAndRms[Moduleposition].second)) && (medianValues[it].apvMedian[apv]>absolutelow_))
-		BadStripList.push_back(pQuality->encode((apv*128),128,0));
-	    }
-	  else if (medianValues[it].apvMedian[apv]<(MeanAndRms[Moduleposition].first-lowoccupancy_*MeanAndRms[Moduleposition].second) && (MeanAndRms[Moduleposition].first>2 || medianValues[it].apvabsoluteOccupancy[apv]==0))
-	    {
-	      BadStripList.push_back(pQuality->encode((apv*128),128,0));
-	      std::cout << "Dead APV! DetId: " << medianValues[it].detrawId << ", APV number: " << apv+1 << ", APVMedian: " << medianValues[it].apvMedian[apv] << ", Mean: " << MeanAndRms[Moduleposition].first << ", RMS: " << MeanAndRms[Moduleposition].second << ", LowThreshold: " << lowoccupancy_ << ", Mean-Low*RMS: " << (MeanAndRms[Moduleposition].first-lowoccupancy_*MeanAndRms[Moduleposition].second) << std::endl;
-	    }
-	}
-      if (BadStripList.begin()!=BadStripList.end())
-	{
-	  quality->compact(Detid,BadStripList);
-	  SiStripQuality::Range range(BadStripList.begin(),BadStripList.end());
-	  quality->put(Detid,range);
-	}
-      BadStripList.clear();
+  for (uint32_t it = 0; it < medianValues.size(); it++) {
+    Moduleposition = (medianValues[it].modulePosition) - 1;
+    Detid = medianValues[it].detrawId;
+
+    for (int apv = 0; apv < medianValues[it].numberApvs; apv++) {
+      if (UseInputDB_) {
+        if (InSiStripQuality->IsApvBad(Detid, apv)) {
+          continue;  //if the apv is already flagged as bad, continue.
+        }
+      }
+      if (medianValues[it].apvMedian[apv] > minNevents_) {
+        if ((medianValues[it].apvMedian[apv] >
+             (MeanAndRms[Moduleposition].first + highoccupancy_ * MeanAndRms[Moduleposition].second)) &&
+            (medianValues[it].apvMedian[apv] > absolutelow_))
+          BadStripList.push_back(pQuality->encode((apv * 128), 128, 0));
+      } else if (medianValues[it].apvMedian[apv] <
+                     (MeanAndRms[Moduleposition].first - lowoccupancy_ * MeanAndRms[Moduleposition].second) &&
+                 (MeanAndRms[Moduleposition].first > 2 || medianValues[it].apvabsoluteOccupancy[apv] == 0)) {
+        BadStripList.push_back(pQuality->encode((apv * 128), 128, 0));
+        std::cout << "Dead APV! DetId: " << medianValues[it].detrawId << ", APV number: " << apv + 1
+                  << ", APVMedian: " << medianValues[it].apvMedian[apv]
+                  << ", Mean: " << MeanAndRms[Moduleposition].first << ", RMS: " << MeanAndRms[Moduleposition].second
+                  << ", LowThreshold: " << lowoccupancy_ << ", Mean-Low*RMS: "
+                  << (MeanAndRms[Moduleposition].first - lowoccupancy_ * MeanAndRms[Moduleposition].second)
+                  << std::endl;
+      }
     }
+    if (BadStripList.begin() != BadStripList.end()) {
+      quality->compact(Detid, BadStripList);
+      SiStripQuality::Range range(BadStripList.begin(), BadStripList.end());
+      quality->put(Detid, range);
+    }
+    BadStripList.clear();
+  }
 }
 
-void SiStripBadAPVAlgorithmFromClusterOccupancy::setMinNumOfEvents()
-{
-  minNevents_=occupancy_*Nevents_;
-}
+void SiStripBadAPVAlgorithmFromClusterOccupancy::setMinNumOfEvents() { minNevents_ = occupancy_ * Nevents_; }
diff --git a/CalibTracker/SiStripQuality/src/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.cc b/CalibTracker/SiStripQuality/src/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.cc
index 193f5dc908ed5..f9fa682ae7e19 100644
--- a/CalibTracker/SiStripQuality/src/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.cc
+++ b/CalibTracker/SiStripQuality/src/SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy.cc
@@ -8,355 +8,414 @@
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripQuality.h"
 
+SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy(
+    const edm::ParameterSet& iConfig, const TrackerTopology* theTopo)
+    : ratio_(1.5),
+      lowoccupancy_(0),
+      highoccupancy_(100),
+      absolutelow_(0),
+      numberiterations_(2),
+      Nevents_(0),
+      absolute_occupancy_(0),
+      OutFileName_("Occupancy.root"),
+      DQMOutfileName_("DQMOutput"),
+      UseInputDB_(iConfig.getUntrackedParameter<bool>("UseInputDB", false)),
+      tTopo(theTopo) {
+  minNevents_ = Nevents_ * absolute_occupancy_;
+}
 
-SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy(const edm::ParameterSet& iConfig, const TrackerTopology* theTopo):
-  ratio_(1.5),
-  lowoccupancy_(0),
-  highoccupancy_(100),
-  absolutelow_(0),
-  numberiterations_(2),
-  Nevents_(0),
-  absolute_occupancy_(0),
-  OutFileName_("Occupancy.root"),
-  DQMOutfileName_("DQMOutput"),
-  UseInputDB_(iConfig.getUntrackedParameter<bool>("UseInputDB",false)),
-  tTopo(theTopo)
-  {
-    minNevents_=Nevents_*absolute_occupancy_;
-  }
-
-SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::~SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy(){
-  LogTrace("SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy")<<"[SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::~SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy] "<<std::endl;
+SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::~SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy() {
+  LogTrace("SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy")
+      << "[SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::~"
+         "SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy] "
+      << std::endl;
 }
 
-void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::extractBadAPVSandStrips(SiStripQuality* siStripQuality,HistoMap& DM, edm::ESHandle<SiStripQuality>& inSiStripQuality){
-
-  LogTrace("SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy")<<"[SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::extractBadAPVs] "<<std::endl;
-
-  if (WriteOutputFile_== true)
-    {
-      f = new TFile(OutFileName_.c_str(),"RECREATE");
-      f->cd();
-
-      apvtree = new TTree("moduleOccupancy","tree");
-
-      apvtree->Branch("DetRawId",                &detrawid,                "DetRawId/I");
-      apvtree->Branch("SubDetId",                &subdetid,                "SubDetId/I");
-      apvtree->Branch("Layer_Ring",              &layer_ring,              "Layer_Ring/I");
-      apvtree->Branch("Disc",                    &disc,                    "Disc/I");
-      apvtree->Branch("IsBack",                  &isback,                  "IsBack/I");
-      apvtree->Branch("IsExternalString",        &isexternalstring,        "IsExternalString/I");
-      apvtree->Branch("IsZMinusSide",            &iszminusside,            "IsZMinusSide/I");
-      apvtree->Branch("RodStringPetal",          &rodstringpetal,          "RodStringPetal/I");
-      apvtree->Branch("IsStereo",                &isstereo,                "IsStereo/I");
-      apvtree->Branch("ModuleNumber",            &module_number,           "ModuleNumber/I");
-      apvtree->Branch("NumberOfStrips",          &number_strips,           "NumberOfStrips/I");
-      apvtree->Branch("APVGlobalPositionX",      &global_position_x,       "APVGlobalPositionX/F");
-      apvtree->Branch("APVGlobalPositionY",      &global_position_y,       "APVGlobalPositionY/F");
-      apvtree->Branch("APVGlobalPositionZ",      &global_position_z,       "APVGlobalPositionZ/F");
-      apvtree->Branch("APVNumber",               &apv_number,              "APVNumber/I");
-      apvtree->Branch("APVAbsoluteOccupancy",    &apvAbsoluteOccupancy,    "apvAbsoluteOccupancy/I");
-      apvtree->Branch("APVMedianOccupancy",      &apvMedianOccupancy,      "apvMedianOccupancy/D");
-      apvtree->Branch("IsBad",                   &isBad,                   "IsBad/I");
-
-      striptree = new TTree("stripOccupancy","tree");
-
-      striptree->Branch("DetRawId",             &detrawid,          "DetRawId/I");
-      striptree->Branch("SubDetId",             &subdetid,          "SubDetId/I");
-      striptree->Branch("Layer_Ring",           &layer_ring,        "Layer_Ring/I");
-      striptree->Branch("Disc",                 &disc,              "Disc/I");
-      striptree->Branch("IsBack",               &isback,            "IsBack/I");
-      striptree->Branch("IsExternalString",     &isexternalstring,  "IsExternalString/I");
-      striptree->Branch("IsZMinusSide",         &iszminusside,      "IsZMinusSide/I");
-      striptree->Branch("RodStringPetal",       &rodstringpetal,    "RodStringPetal/I");
-      striptree->Branch("IsStereo",             &isstereo,          "IsStereo/I");
-      striptree->Branch("ModulePosition",       &module_number,     "ModulePosition/I");
-      striptree->Branch("NumberOfStrips",       &number_strips,     "NumberOfStrips/I");
-      striptree->Branch("StripNumber",          &strip_number,      "StripNumber/I");
-      striptree->Branch("APVChannel",           &apv_channel,       "APVChannel/I");
-      striptree->Branch("StripGlobalPositionX", &strip_global_position_x, "StripGlobalPositionX/F");
-      striptree->Branch("StripGlobalPositionY", &strip_global_position_y, "StripGlobalPositionY/F");
-      striptree->Branch("StripGlobalPositionZ", &strip_global_position_z, "StripGlobalPositionZ/F");
-      striptree->Branch("IsHot",                &isHot,             "IsHot/I");
-      striptree->Branch("HotStripsPerAPV",      &hotStripsPerAPV,   "HotStripsPerAPV/I");
-      striptree->Branch("HotStripsPerModule",   &hotStripsPerModule,"HotStripsPerModule/I");
-      striptree->Branch("StripOccupancy",       &singleStripOccupancy, "StripOccupancy/D");
-      striptree->Branch("StripHits",            &stripHits,         "StripHits/I");
-      striptree->Branch("PoissonProb",          &poissonProb,       "PoissonProb/D");
-      striptree->Branch("MedianAPVHits",        &medianAPVHits,     "MedianAPVHits/D");
-      striptree->Branch("AvgAPVHits",           &avgAPVHits,        "AvgAPVHits/D");
-    }
+void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::extractBadAPVSandStrips(
+    SiStripQuality* siStripQuality, HistoMap& DM, edm::ESHandle<SiStripQuality>& inSiStripQuality) {
+  LogTrace("SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy")
+      << "[SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::extractBadAPVs] " << std::endl;
+
+  if (WriteOutputFile_ == true) {
+    f = new TFile(OutFileName_.c_str(), "RECREATE");
+    f->cd();
+
+    apvtree = new TTree("moduleOccupancy", "tree");
+
+    apvtree->Branch("DetRawId", &detrawid, "DetRawId/I");
+    apvtree->Branch("SubDetId", &subdetid, "SubDetId/I");
+    apvtree->Branch("Layer_Ring", &layer_ring, "Layer_Ring/I");
+    apvtree->Branch("Disc", &disc, "Disc/I");
+    apvtree->Branch("IsBack", &isback, "IsBack/I");
+    apvtree->Branch("IsExternalString", &isexternalstring, "IsExternalString/I");
+    apvtree->Branch("IsZMinusSide", &iszminusside, "IsZMinusSide/I");
+    apvtree->Branch("RodStringPetal", &rodstringpetal, "RodStringPetal/I");
+    apvtree->Branch("IsStereo", &isstereo, "IsStereo/I");
+    apvtree->Branch("ModuleNumber", &module_number, "ModuleNumber/I");
+    apvtree->Branch("NumberOfStrips", &number_strips, "NumberOfStrips/I");
+    apvtree->Branch("APVGlobalPositionX", &global_position_x, "APVGlobalPositionX/F");
+    apvtree->Branch("APVGlobalPositionY", &global_position_y, "APVGlobalPositionY/F");
+    apvtree->Branch("APVGlobalPositionZ", &global_position_z, "APVGlobalPositionZ/F");
+    apvtree->Branch("APVNumber", &apv_number, "APVNumber/I");
+    apvtree->Branch("APVAbsoluteOccupancy", &apvAbsoluteOccupancy, "apvAbsoluteOccupancy/I");
+    apvtree->Branch("APVMedianOccupancy", &apvMedianOccupancy, "apvMedianOccupancy/D");
+    apvtree->Branch("IsBad", &isBad, "IsBad/I");
+
+    striptree = new TTree("stripOccupancy", "tree");
+
+    striptree->Branch("DetRawId", &detrawid, "DetRawId/I");
+    striptree->Branch("SubDetId", &subdetid, "SubDetId/I");
+    striptree->Branch("Layer_Ring", &layer_ring, "Layer_Ring/I");
+    striptree->Branch("Disc", &disc, "Disc/I");
+    striptree->Branch("IsBack", &isback, "IsBack/I");
+    striptree->Branch("IsExternalString", &isexternalstring, "IsExternalString/I");
+    striptree->Branch("IsZMinusSide", &iszminusside, "IsZMinusSide/I");
+    striptree->Branch("RodStringPetal", &rodstringpetal, "RodStringPetal/I");
+    striptree->Branch("IsStereo", &isstereo, "IsStereo/I");
+    striptree->Branch("ModulePosition", &module_number, "ModulePosition/I");
+    striptree->Branch("NumberOfStrips", &number_strips, "NumberOfStrips/I");
+    striptree->Branch("StripNumber", &strip_number, "StripNumber/I");
+    striptree->Branch("APVChannel", &apv_channel, "APVChannel/I");
+    striptree->Branch("StripGlobalPositionX", &strip_global_position_x, "StripGlobalPositionX/F");
+    striptree->Branch("StripGlobalPositionY", &strip_global_position_y, "StripGlobalPositionY/F");
+    striptree->Branch("StripGlobalPositionZ", &strip_global_position_z, "StripGlobalPositionZ/F");
+    striptree->Branch("IsHot", &isHot, "IsHot/I");
+    striptree->Branch("HotStripsPerAPV", &hotStripsPerAPV, "HotStripsPerAPV/I");
+    striptree->Branch("HotStripsPerModule", &hotStripsPerModule, "HotStripsPerModule/I");
+    striptree->Branch("StripOccupancy", &singleStripOccupancy, "StripOccupancy/D");
+    striptree->Branch("StripHits", &stripHits, "StripHits/I");
+    striptree->Branch("PoissonProb", &poissonProb, "PoissonProb/D");
+    striptree->Branch("MedianAPVHits", &medianAPVHits, "MedianAPVHits/D");
+    striptree->Branch("AvgAPVHits", &avgAPVHits, "AvgAPVHits/D");
+  }
 
-  HistoMap::iterator it=DM.begin();
-  HistoMap::iterator itEnd=DM.end();
+  HistoMap::iterator it = DM.begin();
+  HistoMap::iterator itEnd = DM.end();
   std::vector<unsigned int> badStripList;
   uint32_t detid;
-  for (;it!=itEnd;++it){
-
+  for (; it != itEnd; ++it) {
     Apv APV;
 
-    for (int apv=0; apv<6; apv++)
-      {
-	APV.apvMedian[apv]            = 0;
-	APV.apvabsoluteOccupancy[apv] = 0;
-	APV.NEntries[apv]            = 0;
-	APV.NEmptyBins[apv]          = 0;
-
-	for (int strip=0; strip<128; strip++)
-	  {
-	    stripOccupancy[apv][strip] = 0;
-	    stripWeight[apv][strip]    = 0;
-	  }
+    for (int apv = 0; apv < 6; apv++) {
+      APV.apvMedian[apv] = 0;
+      APV.apvabsoluteOccupancy[apv] = 0;
+      APV.NEntries[apv] = 0;
+      APV.NEmptyBins[apv] = 0;
+
+      for (int strip = 0; strip < 128; strip++) {
+        stripOccupancy[apv][strip] = 0;
+        stripWeight[apv][strip] = 0;
       }
+    }
 
-    number_strips  = (int)((it->second.get())->GetNbinsX());
-    number_apvs    = number_strips/128;
+    number_strips = (int)((it->second.get())->GetNbinsX());
+    number_apvs = number_strips / 128;
     APV.numberApvs = number_apvs;
 
-    for (int apv=0; apv<number_apvs; apv++)
-      {
-	APV.th1f[apv] = new TH1F("tmp","tmp",128,0.5,128.5);
-	int NumberEntriesPerAPV=0;
-
-	for (int strip=0; strip<128; strip++)
-	  {
-	    stripOccupancy[apv][strip] = (it->second.get())->GetBinContent((apv*128)+strip+1); // Remember: Bin=0 is underflow bin!
-	    stripWeight[apv][strip]    = 1;
-	    APV.apvabsoluteOccupancy[apv] += (it->second.get())->GetBinContent((apv*128)+strip+1); // Remember: Bin=0 is underflow bin!
-	    APV.th1f[apv]->SetBinContent(strip+1,(it->second.get())->GetBinContent((apv*128)+strip+1));
-	    NumberEntriesPerAPV += (int)(it->second.get())->GetBinContent((apv*128)+strip+1);
-	  }
-
-	APV.th1f[apv]->SetEntries(NumberEntriesPerAPV);
-	APV.NEntries[apv]=(int)APV.th1f[apv]->GetEntries();
+    for (int apv = 0; apv < number_apvs; apv++) {
+      APV.th1f[apv] = new TH1F("tmp", "tmp", 128, 0.5, 128.5);
+      int NumberEntriesPerAPV = 0;
+
+      for (int strip = 0; strip < 128; strip++) {
+        stripOccupancy[apv][strip] =
+            (it->second.get())->GetBinContent((apv * 128) + strip + 1);  // Remember: Bin=0 is underflow bin!
+        stripWeight[apv][strip] = 1;
+        APV.apvabsoluteOccupancy[apv] +=
+            (it->second.get())->GetBinContent((apv * 128) + strip + 1);  // Remember: Bin=0 is underflow bin!
+        APV.th1f[apv]->SetBinContent(strip + 1, (it->second.get())->GetBinContent((apv * 128) + strip + 1));
+        NumberEntriesPerAPV += (int)(it->second.get())->GetBinContent((apv * 128) + strip + 1);
       }
 
-    for (int apv=0; apv<number_apvs; apv++)
-      {
-	APV.apvMedian[apv] = TMath::Median(128,stripOccupancy[apv],stripWeight[apv]);
-      }
+      APV.th1f[apv]->SetEntries(NumberEntriesPerAPV);
+      APV.NEntries[apv] = (int)APV.th1f[apv]->GetEntries();
+    }
 
-    detid=it->first;
-    DetId detectorId=DetId(detid);
+    for (int apv = 0; apv < number_apvs; apv++) {
+      APV.apvMedian[apv] = TMath::Median(128, stripOccupancy[apv], stripWeight[apv]);
+    }
+
+    detid = it->first;
+    DetId detectorId = DetId(detid);
 
     if (edm::isDebugEnabled())
-      LogTrace("SiStripBadAPV") << "Analyzing detid " << detid<< std::endl;
+      LogTrace("SiStripBadAPV") << "Analyzing detid " << detid << std::endl;
 
-    detrawid     = detid;
+    detrawid = detid;
     APV.detrawId = detrawid;
-    subdetid     = detectorId.subdetId();
-
-    switch (detectorId.subdetId())
-      {
-      case StripSubdetector::TIB :
-	layer_ring         = tTopo->tibLayer(detrawid);
-	module_number      = tTopo->tibModule(detrawid);
-	APV.modulePosition = module_number;
-
-	if      (layer_ring == 1) medianValues_TIB_Layer1.push_back(APV);
-	else if (layer_ring == 2) medianValues_TIB_Layer2.push_back(APV);
-	else if (layer_ring == 3) medianValues_TIB_Layer3.push_back(APV);
-	else if (layer_ring == 4) medianValues_TIB_Layer4.push_back(APV);
-	break;
-
-      case StripSubdetector::TID :
-	layer_ring         = tTopo->tidRing(detrawid);
-	disc               = tTopo->tidWheel(detrawid);
-	APV.modulePosition = layer_ring;
-
-	if (tTopo->tidIsZMinusSide(detrawid)) iszminusside = 1;
-	else                                   iszminusside = 0;
-
-	if (iszminusside==0)
-	  {
-	    if      (disc==1) medianValues_TIDPlus_Disc1.push_back(APV);
-	    else if (disc==2) medianValues_TIDPlus_Disc2.push_back(APV);
-	    else if (disc==3) medianValues_TIDPlus_Disc3.push_back(APV);
-	  }
-	else if (iszminusside==1)
-	  {
-	    if      (disc==1) medianValues_TIDMinus_Disc1.push_back(APV);
-	    else if (disc==2) medianValues_TIDMinus_Disc2.push_back(APV);
-	    else if (disc==3) medianValues_TIDMinus_Disc3.push_back(APV);
-	  }
-	break;
-
-      case StripSubdetector::TOB :
-	layer_ring         = tTopo->tobLayer(detrawid);
-	module_number      = tTopo->tobModule(detrawid);
-	APV.modulePosition = module_number;
-
-	if      (layer_ring == 1) medianValues_TOB_Layer1.push_back(APV);
-	else if (layer_ring == 2) medianValues_TOB_Layer2.push_back(APV);
-	else if (layer_ring == 3) medianValues_TOB_Layer3.push_back(APV);
-	else if (layer_ring == 4) medianValues_TOB_Layer4.push_back(APV);
-	else if (layer_ring == 5) medianValues_TOB_Layer5.push_back(APV);
-	else if (layer_ring == 6) medianValues_TOB_Layer6.push_back(APV);
-	break;
-
-      case StripSubdetector::TEC :
-	layer_ring         = tTopo->tecRing(detrawid);
-	disc               = tTopo->tecWheel(detrawid);
-	APV.modulePosition = layer_ring;
-
-	if (tTopo->tecIsZMinusSide(detrawid)) iszminusside = 1;
-	else                                   iszminusside = 0;
-
-	if (iszminusside==0)
-	  {
-	    if      (disc==1) medianValues_TECPlus_Disc1.push_back(APV);
-	    else if (disc==2) medianValues_TECPlus_Disc2.push_back(APV);
-	    else if (disc==3) medianValues_TECPlus_Disc3.push_back(APV);
-	    else if (disc==4) medianValues_TECPlus_Disc4.push_back(APV);
-	    else if (disc==5) medianValues_TECPlus_Disc5.push_back(APV);
-	    else if (disc==6) medianValues_TECPlus_Disc6.push_back(APV);
-	    else if (disc==7) medianValues_TECPlus_Disc7.push_back(APV);
-	    else if (disc==8) medianValues_TECPlus_Disc8.push_back(APV);
-	    else if (disc==9) medianValues_TECPlus_Disc9.push_back(APV);
-	  }
-	else if (iszminusside==1)
-	  {
-	    if      (disc==1) medianValues_TECMinus_Disc1.push_back(APV);
-	    else if (disc==2) medianValues_TECMinus_Disc2.push_back(APV);
-	    else if (disc==3) medianValues_TECMinus_Disc3.push_back(APV);
-	    else if (disc==4) medianValues_TECMinus_Disc4.push_back(APV);
-	    else if (disc==5) medianValues_TECMinus_Disc5.push_back(APV);
-	    else if (disc==6) medianValues_TECMinus_Disc6.push_back(APV);
-	    else if (disc==7) medianValues_TECMinus_Disc7.push_back(APV);
-	    else if (disc==8) medianValues_TECMinus_Disc8.push_back(APV);
-	    else if (disc==9) medianValues_TECMinus_Disc9.push_back(APV);
-	  }
-	break;
-
-      default :
-	std::cout << "### Detector does not belong to TIB, TID, TOB or TEC !? ###" << std::endl;
-	std::cout << "### DetRawId: " << detrawid << " ###" << std::endl;
-      }
+    subdetid = detectorId.subdetId();
+
+    switch (detectorId.subdetId()) {
+      case StripSubdetector::TIB:
+        layer_ring = tTopo->tibLayer(detrawid);
+        module_number = tTopo->tibModule(detrawid);
+        APV.modulePosition = module_number;
+
+        if (layer_ring == 1)
+          medianValues_TIB_Layer1.push_back(APV);
+        else if (layer_ring == 2)
+          medianValues_TIB_Layer2.push_back(APV);
+        else if (layer_ring == 3)
+          medianValues_TIB_Layer3.push_back(APV);
+        else if (layer_ring == 4)
+          medianValues_TIB_Layer4.push_back(APV);
+        break;
+
+      case StripSubdetector::TID:
+        layer_ring = tTopo->tidRing(detrawid);
+        disc = tTopo->tidWheel(detrawid);
+        APV.modulePosition = layer_ring;
+
+        if (tTopo->tidIsZMinusSide(detrawid))
+          iszminusside = 1;
+        else
+          iszminusside = 0;
+
+        if (iszminusside == 0) {
+          if (disc == 1)
+            medianValues_TIDPlus_Disc1.push_back(APV);
+          else if (disc == 2)
+            medianValues_TIDPlus_Disc2.push_back(APV);
+          else if (disc == 3)
+            medianValues_TIDPlus_Disc3.push_back(APV);
+        } else if (iszminusside == 1) {
+          if (disc == 1)
+            medianValues_TIDMinus_Disc1.push_back(APV);
+          else if (disc == 2)
+            medianValues_TIDMinus_Disc2.push_back(APV);
+          else if (disc == 3)
+            medianValues_TIDMinus_Disc3.push_back(APV);
+        }
+        break;
+
+      case StripSubdetector::TOB:
+        layer_ring = tTopo->tobLayer(detrawid);
+        module_number = tTopo->tobModule(detrawid);
+        APV.modulePosition = module_number;
+
+        if (layer_ring == 1)
+          medianValues_TOB_Layer1.push_back(APV);
+        else if (layer_ring == 2)
+          medianValues_TOB_Layer2.push_back(APV);
+        else if (layer_ring == 3)
+          medianValues_TOB_Layer3.push_back(APV);
+        else if (layer_ring == 4)
+          medianValues_TOB_Layer4.push_back(APV);
+        else if (layer_ring == 5)
+          medianValues_TOB_Layer5.push_back(APV);
+        else if (layer_ring == 6)
+          medianValues_TOB_Layer6.push_back(APV);
+        break;
+
+      case StripSubdetector::TEC:
+        layer_ring = tTopo->tecRing(detrawid);
+        disc = tTopo->tecWheel(detrawid);
+        APV.modulePosition = layer_ring;
+
+        if (tTopo->tecIsZMinusSide(detrawid))
+          iszminusside = 1;
+        else
+          iszminusside = 0;
+
+        if (iszminusside == 0) {
+          if (disc == 1)
+            medianValues_TECPlus_Disc1.push_back(APV);
+          else if (disc == 2)
+            medianValues_TECPlus_Disc2.push_back(APV);
+          else if (disc == 3)
+            medianValues_TECPlus_Disc3.push_back(APV);
+          else if (disc == 4)
+            medianValues_TECPlus_Disc4.push_back(APV);
+          else if (disc == 5)
+            medianValues_TECPlus_Disc5.push_back(APV);
+          else if (disc == 6)
+            medianValues_TECPlus_Disc6.push_back(APV);
+          else if (disc == 7)
+            medianValues_TECPlus_Disc7.push_back(APV);
+          else if (disc == 8)
+            medianValues_TECPlus_Disc8.push_back(APV);
+          else if (disc == 9)
+            medianValues_TECPlus_Disc9.push_back(APV);
+        } else if (iszminusside == 1) {
+          if (disc == 1)
+            medianValues_TECMinus_Disc1.push_back(APV);
+          else if (disc == 2)
+            medianValues_TECMinus_Disc2.push_back(APV);
+          else if (disc == 3)
+            medianValues_TECMinus_Disc3.push_back(APV);
+          else if (disc == 4)
+            medianValues_TECMinus_Disc4.push_back(APV);
+          else if (disc == 5)
+            medianValues_TECMinus_Disc5.push_back(APV);
+          else if (disc == 6)
+            medianValues_TECMinus_Disc6.push_back(APV);
+          else if (disc == 7)
+            medianValues_TECMinus_Disc7.push_back(APV);
+          else if (disc == 8)
+            medianValues_TECMinus_Disc8.push_back(APV);
+          else if (disc == 9)
+            medianValues_TECMinus_Disc9.push_back(APV);
+        }
+        break;
+
+      default:
+        std::cout << "### Detector does not belong to TIB, TID, TOB or TEC !? ###" << std::endl;
+        std::cout << "### DetRawId: " << detrawid << " ###" << std::endl;
+    }
 
-  } // end loop on modules
+  }  // end loop on modules
 
   // Calculate Mean and RMS for each Layer
-  CalculateMeanAndRMS(medianValues_TIB_Layer1,MeanAndRms_TIB_Layer1,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TIB_Layer2,MeanAndRms_TIB_Layer2,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TIB_Layer3,MeanAndRms_TIB_Layer3,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TIB_Layer4,MeanAndRms_TIB_Layer4,numberiterations_);
-
-  CalculateMeanAndRMS(medianValues_TOB_Layer1,MeanAndRms_TOB_Layer1,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TOB_Layer2,MeanAndRms_TOB_Layer2,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TOB_Layer3,MeanAndRms_TOB_Layer3,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TOB_Layer4,MeanAndRms_TOB_Layer4,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TOB_Layer5,MeanAndRms_TOB_Layer5,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TOB_Layer6,MeanAndRms_TOB_Layer6,numberiterations_);
-
-  CalculateMeanAndRMS(medianValues_TIDPlus_Disc1,MeanAndRms_TIDPlus_Disc1,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TIDPlus_Disc2,MeanAndRms_TIDPlus_Disc2,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TIDPlus_Disc3,MeanAndRms_TIDPlus_Disc3,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TIDMinus_Disc1,MeanAndRms_TIDMinus_Disc1,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TIDMinus_Disc2,MeanAndRms_TIDMinus_Disc2,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TIDMinus_Disc3,MeanAndRms_TIDMinus_Disc3,numberiterations_);
-
-  CalculateMeanAndRMS(medianValues_TECPlus_Disc1,MeanAndRms_TECPlus_Disc1,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECPlus_Disc2,MeanAndRms_TECPlus_Disc2,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECPlus_Disc3,MeanAndRms_TECPlus_Disc3,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECPlus_Disc4,MeanAndRms_TECPlus_Disc4,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECPlus_Disc5,MeanAndRms_TECPlus_Disc5,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECPlus_Disc6,MeanAndRms_TECPlus_Disc6,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECPlus_Disc7,MeanAndRms_TECPlus_Disc7,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECPlus_Disc8,MeanAndRms_TECPlus_Disc8,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECPlus_Disc9,MeanAndRms_TECPlus_Disc9,numberiterations_);
-
-  CalculateMeanAndRMS(medianValues_TECMinus_Disc1,MeanAndRms_TECMinus_Disc1,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECMinus_Disc2,MeanAndRms_TECMinus_Disc2,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECMinus_Disc3,MeanAndRms_TECMinus_Disc3,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECMinus_Disc4,MeanAndRms_TECMinus_Disc4,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECMinus_Disc5,MeanAndRms_TECMinus_Disc5,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECMinus_Disc6,MeanAndRms_TECMinus_Disc6,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECMinus_Disc7,MeanAndRms_TECMinus_Disc7,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECMinus_Disc8,MeanAndRms_TECMinus_Disc8,numberiterations_);
-  CalculateMeanAndRMS(medianValues_TECMinus_Disc9,MeanAndRms_TECMinus_Disc9,numberiterations_);
-
-  pQuality=siStripQuality;
+  CalculateMeanAndRMS(medianValues_TIB_Layer1, MeanAndRms_TIB_Layer1, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TIB_Layer2, MeanAndRms_TIB_Layer2, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TIB_Layer3, MeanAndRms_TIB_Layer3, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TIB_Layer4, MeanAndRms_TIB_Layer4, numberiterations_);
+
+  CalculateMeanAndRMS(medianValues_TOB_Layer1, MeanAndRms_TOB_Layer1, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TOB_Layer2, MeanAndRms_TOB_Layer2, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TOB_Layer3, MeanAndRms_TOB_Layer3, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TOB_Layer4, MeanAndRms_TOB_Layer4, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TOB_Layer5, MeanAndRms_TOB_Layer5, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TOB_Layer6, MeanAndRms_TOB_Layer6, numberiterations_);
+
+  CalculateMeanAndRMS(medianValues_TIDPlus_Disc1, MeanAndRms_TIDPlus_Disc1, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TIDPlus_Disc2, MeanAndRms_TIDPlus_Disc2, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TIDPlus_Disc3, MeanAndRms_TIDPlus_Disc3, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TIDMinus_Disc1, MeanAndRms_TIDMinus_Disc1, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TIDMinus_Disc2, MeanAndRms_TIDMinus_Disc2, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TIDMinus_Disc3, MeanAndRms_TIDMinus_Disc3, numberiterations_);
+
+  CalculateMeanAndRMS(medianValues_TECPlus_Disc1, MeanAndRms_TECPlus_Disc1, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECPlus_Disc2, MeanAndRms_TECPlus_Disc2, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECPlus_Disc3, MeanAndRms_TECPlus_Disc3, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECPlus_Disc4, MeanAndRms_TECPlus_Disc4, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECPlus_Disc5, MeanAndRms_TECPlus_Disc5, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECPlus_Disc6, MeanAndRms_TECPlus_Disc6, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECPlus_Disc7, MeanAndRms_TECPlus_Disc7, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECPlus_Disc8, MeanAndRms_TECPlus_Disc8, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECPlus_Disc9, MeanAndRms_TECPlus_Disc9, numberiterations_);
+
+  CalculateMeanAndRMS(medianValues_TECMinus_Disc1, MeanAndRms_TECMinus_Disc1, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECMinus_Disc2, MeanAndRms_TECMinus_Disc2, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECMinus_Disc3, MeanAndRms_TECMinus_Disc3, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECMinus_Disc4, MeanAndRms_TECMinus_Disc4, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECMinus_Disc5, MeanAndRms_TECMinus_Disc5, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECMinus_Disc6, MeanAndRms_TECMinus_Disc6, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECMinus_Disc7, MeanAndRms_TECMinus_Disc7, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECMinus_Disc8, MeanAndRms_TECMinus_Disc8, numberiterations_);
+  CalculateMeanAndRMS(medianValues_TECMinus_Disc9, MeanAndRms_TECMinus_Disc9, numberiterations_);
+
+  pQuality = siStripQuality;
   badStripList.clear();
 
   // Initialize the DQM output histograms
   initializeDQMHistograms();
 
   // Analyze the Occupancy for both APVs and Strips
-  AnalyzeOccupancy(siStripQuality,medianValues_TIB_Layer1,MeanAndRms_TIB_Layer1,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TIB_Layer2,MeanAndRms_TIB_Layer2,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TIB_Layer3,MeanAndRms_TIB_Layer3,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TIB_Layer4,MeanAndRms_TIB_Layer4,badStripList,inSiStripQuality);
-
-  AnalyzeOccupancy(siStripQuality,medianValues_TOB_Layer1,MeanAndRms_TOB_Layer1,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TOB_Layer2,MeanAndRms_TOB_Layer2,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TOB_Layer3,MeanAndRms_TOB_Layer3,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TOB_Layer4,MeanAndRms_TOB_Layer4,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TOB_Layer5,MeanAndRms_TOB_Layer5,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TOB_Layer6,MeanAndRms_TOB_Layer6,badStripList,inSiStripQuality);
-
-  AnalyzeOccupancy(siStripQuality,medianValues_TIDPlus_Disc1,MeanAndRms_TIDPlus_Disc1,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TIDPlus_Disc2,MeanAndRms_TIDPlus_Disc2,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TIDPlus_Disc3,MeanAndRms_TIDPlus_Disc3,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TIDMinus_Disc1,MeanAndRms_TIDMinus_Disc1,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TIDMinus_Disc2,MeanAndRms_TIDMinus_Disc2,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TIDMinus_Disc3,MeanAndRms_TIDMinus_Disc3,badStripList,inSiStripQuality);
-
-  AnalyzeOccupancy(siStripQuality,medianValues_TECPlus_Disc1,MeanAndRms_TECPlus_Disc1,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECPlus_Disc2,MeanAndRms_TECPlus_Disc2,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECPlus_Disc3,MeanAndRms_TECPlus_Disc3,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECPlus_Disc4,MeanAndRms_TECPlus_Disc4,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECPlus_Disc5,MeanAndRms_TECPlus_Disc5,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECPlus_Disc6,MeanAndRms_TECPlus_Disc6,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECPlus_Disc7,MeanAndRms_TECPlus_Disc7,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECPlus_Disc8,MeanAndRms_TECPlus_Disc8,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECPlus_Disc9,MeanAndRms_TECPlus_Disc9,badStripList,inSiStripQuality);
-
-  AnalyzeOccupancy(siStripQuality,medianValues_TECMinus_Disc1,MeanAndRms_TECMinus_Disc1,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECMinus_Disc2,MeanAndRms_TECMinus_Disc2,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECMinus_Disc3,MeanAndRms_TECMinus_Disc3,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECMinus_Disc4,MeanAndRms_TECMinus_Disc4,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECMinus_Disc5,MeanAndRms_TECMinus_Disc5,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECMinus_Disc6,MeanAndRms_TECMinus_Disc6,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECMinus_Disc7,MeanAndRms_TECMinus_Disc7,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECMinus_Disc8,MeanAndRms_TECMinus_Disc8,badStripList,inSiStripQuality);
-  AnalyzeOccupancy(siStripQuality,medianValues_TECMinus_Disc9,MeanAndRms_TECMinus_Disc9,badStripList,inSiStripQuality);
+  AnalyzeOccupancy(siStripQuality, medianValues_TIB_Layer1, MeanAndRms_TIB_Layer1, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(siStripQuality, medianValues_TIB_Layer2, MeanAndRms_TIB_Layer2, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(siStripQuality, medianValues_TIB_Layer3, MeanAndRms_TIB_Layer3, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(siStripQuality, medianValues_TIB_Layer4, MeanAndRms_TIB_Layer4, badStripList, inSiStripQuality);
+
+  AnalyzeOccupancy(siStripQuality, medianValues_TOB_Layer1, MeanAndRms_TOB_Layer1, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(siStripQuality, medianValues_TOB_Layer2, MeanAndRms_TOB_Layer2, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(siStripQuality, medianValues_TOB_Layer3, MeanAndRms_TOB_Layer3, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(siStripQuality, medianValues_TOB_Layer4, MeanAndRms_TOB_Layer4, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(siStripQuality, medianValues_TOB_Layer5, MeanAndRms_TOB_Layer5, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(siStripQuality, medianValues_TOB_Layer6, MeanAndRms_TOB_Layer6, badStripList, inSiStripQuality);
+
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TIDPlus_Disc1, MeanAndRms_TIDPlus_Disc1, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TIDPlus_Disc2, MeanAndRms_TIDPlus_Disc2, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TIDPlus_Disc3, MeanAndRms_TIDPlus_Disc3, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TIDMinus_Disc1, MeanAndRms_TIDMinus_Disc1, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TIDMinus_Disc2, MeanAndRms_TIDMinus_Disc2, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TIDMinus_Disc3, MeanAndRms_TIDMinus_Disc3, badStripList, inSiStripQuality);
+
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECPlus_Disc1, MeanAndRms_TECPlus_Disc1, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECPlus_Disc2, MeanAndRms_TECPlus_Disc2, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECPlus_Disc3, MeanAndRms_TECPlus_Disc3, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECPlus_Disc4, MeanAndRms_TECPlus_Disc4, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECPlus_Disc5, MeanAndRms_TECPlus_Disc5, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECPlus_Disc6, MeanAndRms_TECPlus_Disc6, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECPlus_Disc7, MeanAndRms_TECPlus_Disc7, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECPlus_Disc8, MeanAndRms_TECPlus_Disc8, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECPlus_Disc9, MeanAndRms_TECPlus_Disc9, badStripList, inSiStripQuality);
+
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECMinus_Disc1, MeanAndRms_TECMinus_Disc1, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECMinus_Disc2, MeanAndRms_TECMinus_Disc2, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECMinus_Disc3, MeanAndRms_TECMinus_Disc3, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECMinus_Disc4, MeanAndRms_TECMinus_Disc4, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECMinus_Disc5, MeanAndRms_TECMinus_Disc5, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECMinus_Disc6, MeanAndRms_TECMinus_Disc6, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECMinus_Disc7, MeanAndRms_TECMinus_Disc7, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECMinus_Disc8, MeanAndRms_TECMinus_Disc8, badStripList, inSiStripQuality);
+  AnalyzeOccupancy(
+      siStripQuality, medianValues_TECMinus_Disc9, MeanAndRms_TECMinus_Disc9, badStripList, inSiStripQuality);
 
   siStripQuality->fillBadComponents();
 
   // Fill DQM histograms
-  for(unsigned int i = 0; i < subDetName.size(); i++)
-    {
-      projYDistanceVsStripNumber[i]->Add((TH1F*)distanceVsStripNumber[i]->ProjectionY());
-      pfxDistanceVsStripNumber[i]->Add(distanceVsStripNumber[i]->ProfileX(pfxDistanceVsStripNumber[i]->GetName(),1,998));
-      projYNHitsVsStripNumber[i]->Add(nHitsVsStripNumber[i]->ProjectionY());
-      projYNHitsGoodStripsVsStripNumber[i]->Add(nHitsGoodStripsVsStripNumber[i]->ProjectionY());
-      projYNHitsHotStripsVsStripNumber[i]->Add(nHitsHotStripsVsStripNumber[i]->ProjectionY());
-      projYOccupancyVsStripNumber[i]->Add(occupancyVsStripNumber[i]->ProjectionY());
-      projYOccupancyGoodStripsVsStripNumber[i]->Add(occupancyGoodStripsVsStripNumber[i]->ProjectionY());
-      projYOccupancyHotStripsVsStripNumber[i]->Add(occupancyHotStripsVsStripNumber[i]->ProjectionY());
-      pfxOccupancyVsStripNumber[i]->Add(occupancyVsStripNumber[i]->ProfileX(pfxOccupancyVsStripNumber[i]->GetName(),-8.,0.));
-      pfxOccupancyGoodStripsVsStripNumber[i]->Add(occupancyGoodStripsVsStripNumber[i]->ProfileX(pfxOccupancyGoodStripsVsStripNumber[i]->GetName(),-8.,0.));
-      pfxOccupancyHotStripsVsStripNumber[i]->Add(occupancyHotStripsVsStripNumber[i]->ProfileX(pfxOccupancyHotStripsVsStripNumber[i]->GetName(),-8.,0.));
-      projYPoissonProbVsStripNumber[i]->Add(poissonProbVsStripNumber[i]->ProjectionY());
-      projYPoissonProbGoodStripsVsStripNumber[i]->Add(poissonProbGoodStripsVsStripNumber[i]->ProjectionY());
-      projYPoissonProbHotStripsVsStripNumber[i]->Add(poissonProbHotStripsVsStripNumber[i]->ProjectionY());
-      pfxPoissonProbVsStripNumber[i]->Add(poissonProbVsStripNumber[i]->ProfileX(pfxPoissonProbVsStripNumber[i]->GetName(),-18., 0.));
-      pfxPoissonProbGoodStripsVsStripNumber[i]->Add(poissonProbGoodStripsVsStripNumber[i]->ProfileX(pfxPoissonProbGoodStripsVsStripNumber[i]->GetName(),-18., 0.));
-      pfxPoissonProbHotStripsVsStripNumber[i]->Add(poissonProbHotStripsVsStripNumber[i]->ProfileX(pfxPoissonProbHotStripsVsStripNumber[i]->GetName(),-18., 0.));
-      projXDistanceVsStripNumber[i]->Add(distanceVsStripNumber[i]->ProjectionX(projXDistanceVsStripNumber[i]->GetName(),1,998));
-
-    }
+  for (unsigned int i = 0; i < subDetName.size(); i++) {
+    projYDistanceVsStripNumber[i]->Add((TH1F*)distanceVsStripNumber[i]->ProjectionY());
+    pfxDistanceVsStripNumber[i]->Add(
+        distanceVsStripNumber[i]->ProfileX(pfxDistanceVsStripNumber[i]->GetName(), 1, 998));
+    projYNHitsVsStripNumber[i]->Add(nHitsVsStripNumber[i]->ProjectionY());
+    projYNHitsGoodStripsVsStripNumber[i]->Add(nHitsGoodStripsVsStripNumber[i]->ProjectionY());
+    projYNHitsHotStripsVsStripNumber[i]->Add(nHitsHotStripsVsStripNumber[i]->ProjectionY());
+    projYOccupancyVsStripNumber[i]->Add(occupancyVsStripNumber[i]->ProjectionY());
+    projYOccupancyGoodStripsVsStripNumber[i]->Add(occupancyGoodStripsVsStripNumber[i]->ProjectionY());
+    projYOccupancyHotStripsVsStripNumber[i]->Add(occupancyHotStripsVsStripNumber[i]->ProjectionY());
+    pfxOccupancyVsStripNumber[i]->Add(
+        occupancyVsStripNumber[i]->ProfileX(pfxOccupancyVsStripNumber[i]->GetName(), -8., 0.));
+    pfxOccupancyGoodStripsVsStripNumber[i]->Add(
+        occupancyGoodStripsVsStripNumber[i]->ProfileX(pfxOccupancyGoodStripsVsStripNumber[i]->GetName(), -8., 0.));
+    pfxOccupancyHotStripsVsStripNumber[i]->Add(
+        occupancyHotStripsVsStripNumber[i]->ProfileX(pfxOccupancyHotStripsVsStripNumber[i]->GetName(), -8., 0.));
+    projYPoissonProbVsStripNumber[i]->Add(poissonProbVsStripNumber[i]->ProjectionY());
+    projYPoissonProbGoodStripsVsStripNumber[i]->Add(poissonProbGoodStripsVsStripNumber[i]->ProjectionY());
+    projYPoissonProbHotStripsVsStripNumber[i]->Add(poissonProbHotStripsVsStripNumber[i]->ProjectionY());
+    pfxPoissonProbVsStripNumber[i]->Add(
+        poissonProbVsStripNumber[i]->ProfileX(pfxPoissonProbVsStripNumber[i]->GetName(), -18., 0.));
+    pfxPoissonProbGoodStripsVsStripNumber[i]->Add(
+        poissonProbGoodStripsVsStripNumber[i]->ProfileX(pfxPoissonProbGoodStripsVsStripNumber[i]->GetName(), -18., 0.));
+    pfxPoissonProbHotStripsVsStripNumber[i]->Add(
+        poissonProbHotStripsVsStripNumber[i]->ProfileX(pfxPoissonProbHotStripsVsStripNumber[i]->GetName(), -18., 0.));
+    projXDistanceVsStripNumber[i]->Add(
+        distanceVsStripNumber[i]->ProjectionX(projXDistanceVsStripNumber[i]->GetName(), 1, 998));
+  }
 
   // Save output files
 
-  if (WriteOutputFile_==true){
-  f->cd();
-  apvtree->Write();
-  striptree->Write();
-  f->Close();
+  if (WriteOutputFile_ == true) {
+    f->cd();
+    apvtree->Write();
+    striptree->Write();
+    f->Close();
   }
 
-  if (WriteDQMHistograms_==true){
+  if (WriteDQMHistograms_ == true) {
     dqmStore->cd();
     dqmStore->save(DQMOutfileName_);
   }
@@ -364,448 +423,447 @@ void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::extractBadAPVSandStr
   LogTrace("SiStripBadAPV") << ss.str() << std::endl;
 }
 
-
-void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::CalculateMeanAndRMS(const std::vector<Apv>& a, std::pair<double,double>* MeanRMS, int number_iterations)
-{
+void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::CalculateMeanAndRMS(const std::vector<Apv>& a,
+                                                                                std::pair<double, double>* MeanRMS,
+                                                                                int number_iterations) {
   Double_t tot[7], tot2[7];
   Double_t n[7];
 
   Double_t Mean[7] = {0};
-  Double_t Rms[7]  = {1000,1000,1000,1000,1000,1000,1000};
+  Double_t Rms[7] = {1000, 1000, 1000, 1000, 1000, 1000, 1000};
 
   int Moduleposition;
 
-  for (int i=0; i<number_iterations; i++)
-    {
-      for (int j=0; j<7; j++)
-	{
-	  n[j]    = 0;
-	  tot[j]  = 0;
-	  tot2[j] = 0;
-	}
-
-      for (uint32_t it=0; it<a.size(); it++)
-	{
-	  Moduleposition = (a[it].modulePosition)-1;
-
-	  for (int apv=0; apv<a[it].numberApvs; apv++)
-	    {
-	      if (i>0)
-		{
-		  if (a[it].apvMedian[apv]<(Mean[Moduleposition]-3*Rms[Moduleposition]) || (a[it].apvMedian[apv]>(Mean[Moduleposition]+5*Rms[Moduleposition])))
-		    {
-		      continue;
-		    }
-		}
-	      tot[Moduleposition]  += a[it].apvMedian[apv];
-	      tot2[Moduleposition] += (a[it].apvMedian[apv])*(a[it].apvMedian[apv]);
-	      n[Moduleposition]++;
-	    }
-	}
-
-      for (int j=0; j<7; j++)
-	{
-	  if (n[j]!=0)
-	    {
-	      Mean[j] = tot[j]/n[j];
-	      Rms[j]  = TMath::Sqrt(TMath::Abs(tot2[j]/n[j] -Mean[j]*Mean[j]));
-	    }
-	}
+  for (int i = 0; i < number_iterations; i++) {
+    for (int j = 0; j < 7; j++) {
+      n[j] = 0;
+      tot[j] = 0;
+      tot2[j] = 0;
+    }
+
+    for (uint32_t it = 0; it < a.size(); it++) {
+      Moduleposition = (a[it].modulePosition) - 1;
+
+      for (int apv = 0; apv < a[it].numberApvs; apv++) {
+        if (i > 0) {
+          if (a[it].apvMedian[apv] < (Mean[Moduleposition] - 3 * Rms[Moduleposition]) ||
+              (a[it].apvMedian[apv] > (Mean[Moduleposition] + 5 * Rms[Moduleposition]))) {
+            continue;
+          }
+        }
+        tot[Moduleposition] += a[it].apvMedian[apv];
+        tot2[Moduleposition] += (a[it].apvMedian[apv]) * (a[it].apvMedian[apv]);
+        n[Moduleposition]++;
+      }
     }
 
-  for (int j=0; j<7; j++)
-    {
-      MeanRMS[j] = std::make_pair(Mean[j],Rms[j]);
+    for (int j = 0; j < 7; j++) {
+      if (n[j] != 0) {
+        Mean[j] = tot[j] / n[j];
+        Rms[j] = TMath::Sqrt(TMath::Abs(tot2[j] / n[j] - Mean[j] * Mean[j]));
+      }
     }
+  }
 
+  for (int j = 0; j < 7; j++) {
+    MeanRMS[j] = std::make_pair(Mean[j], Rms[j]);
+  }
 }
 
-void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::AnalyzeOccupancy(SiStripQuality* quality, std::vector<Apv>& medianValues, std::pair<double,double>* MeanAndRms, std::vector<unsigned int>& BadStripList, edm::ESHandle<SiStripQuality>& InSiStripQuality)
-{
+void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::AnalyzeOccupancy(
+    SiStripQuality* quality,
+    std::vector<Apv>& medianValues,
+    std::pair<double, double>* MeanAndRms,
+    std::vector<unsigned int>& BadStripList,
+    edm::ESHandle<SiStripQuality>& InSiStripQuality) {
   int Moduleposition;
   uint32_t Detid;
 
-  for (uint32_t it=0; it<medianValues.size(); it++)
-    {
-      Moduleposition = (medianValues[it].modulePosition)-1;
-      Detid          = medianValues[it].detrawId;
-
-      setBasicTreeParameters(Detid);
-
-      DetId DetectorId=DetId(Detid);
-      const StripGeomDetUnit*  TheStripDet   = dynamic_cast<const StripGeomDetUnit*>( (TkGeom->idToDet(DetectorId)) );
-      const StripTopology*     TheStripTopol = dynamic_cast<const StripTopology*>( &(TheStripDet->specificTopology()) );
-
-      //Analyze the occupancies
-      hotstripspermodule = 0;
-      vHotStripsInModule.clear();
-
-      for (int apv=0; apv<medianValues[it].numberApvs; apv++)
-	{
-	  double logMedianOccupancy = -1;
-	  double logAbsoluteOccupancy = -1;
-
-	  for (int i=0; i<128; i++)
-	    {
-	      ishot[i]               = 0;
-	      stripoccupancy[i]      = 0;
-	      striphits[i]           = 0;
-	      poissonprob[i]         = 0;
-	    }
-
-	  number_strips        = (medianValues[it].numberApvs)*128;
-	  apv_number           = apv+1;
-	  apvMedianOccupancy   = medianValues[it].apvMedian[apv];
-	  apvAbsoluteOccupancy = medianValues[it].apvabsoluteOccupancy[apv];
-	  isBad                = 0;
-	  hotstripsperapv[apv] = 0;
-
-	  LocalPoint  pos_apv_local  = TheStripTopol->localPosition((apv*128));
-	  GlobalPoint pos_apv_global = (TkGeom->idToDet(DetectorId))->surface().toGlobal(pos_apv_local);
-
-	  global_position_x = pos_apv_global.x();
-	  global_position_y = pos_apv_global.y();
-	  global_position_z = pos_apv_global.z();
-
-	  if (apvMedianOccupancy>0) logMedianOccupancy = log10(apvMedianOccupancy);
-	  if (apvAbsoluteOccupancy>0) logAbsoluteOccupancy = log10(apvAbsoluteOccupancy);
-
-	  //Fill the DQM histograms
-	  unsigned int layer = 0;
-	  if(subdetid==3 || subdetid==5)
-	    layer=layer_ring;
-	  else
-	    layer=disc;
-
-	  // Fill histograms for all the tracker
-	  medianVsAbsoluteOccupancy[0][0]->Fill(logAbsoluteOccupancy,logMedianOccupancy);
-	  medianOccupancy[0][0]->Fill(logMedianOccupancy);
-	  absoluteOccupancy[0][0]->Fill(logAbsoluteOccupancy);
-	  // Fill summary histograms for each subdetector
-	  medianVsAbsoluteOccupancy[subdetid-2][0]->Fill(logAbsoluteOccupancy,logMedianOccupancy);
-	  medianOccupancy[subdetid-2][0]->Fill(logMedianOccupancy);
-	  absoluteOccupancy[subdetid-2][0]->Fill(logAbsoluteOccupancy);
-	  // Fill histograms for each layer/disk
-	  medianVsAbsoluteOccupancy[subdetid-2][layer]->Fill(logAbsoluteOccupancy,logMedianOccupancy);
-	  medianOccupancy[subdetid-2][layer]->Fill(logMedianOccupancy);
-	  absoluteOccupancy[subdetid-2][layer]->Fill(logAbsoluteOccupancy);
-
-	  if(UseInputDB_)
-	    {
-	      if(InSiStripQuality->IsApvBad(Detid,apv) )
-		{
-		  if (WriteOutputFile_==true)
-		    {
-		      apvtree->Fill();
-		      for (int strip=0; strip<128; strip++)
-			{
-			  strip_number         = (apv*128)+strip+1;
-			  apv_channel          = apv+1;
-			  isHot                = ishot[strip];
-			  singleStripOccupancy = stripoccupancy[strip];
-			  stripHits            = striphits[strip];
-			  poissonProb          = poissonprob[strip];
-
-			  hotStripsPerModule = hotstripspermodule;
-			  hotStripsPerAPV    = hotstripsperapv[apv];
-
-			  LocalPoint  pos_strip_local  = TheStripTopol->localPosition(strip);
-			  GlobalPoint pos_strip_global = (TkGeom->idToDet(DetectorId))->surface().toGlobal(pos_strip_local);
-
-			  strip_global_position_x = pos_strip_global.x();
-			  strip_global_position_y = pos_strip_global.y();
-			  strip_global_position_z = pos_strip_global.z();
-			  striptree->Fill();
-
-			  // Fill the strip DQM Plots
-			  fillStripDQMHistograms();
-			}
-     
-		      if(vHotStripsInModule.size()==1)
-			{
-			  distance = 999;
-			  distanceVsStripNumber[0]->Fill(vHotStripsInModule[0], distance);
-			  distanceVsStripNumber[subdetid-2]->Fill(vHotStripsInModule[0], distance);
-			}
-		      else if(vHotStripsInModule.size()>1)
-			{
-			  for(unsigned int iVec = 0; iVec != vHotStripsInModule.size(); iVec++)
-			    {
-			      if(iVec==0)
-				distance = vHotStripsInModule[1] - vHotStripsInModule[0];
-			      else if(iVec==vHotStripsInModule.size()-1)
-				{
-				  distance = vHotStripsInModule[vHotStripsInModule.size()-1] - vHotStripsInModule[vHotStripsInModule.size() -2];
-				}
-			      else if(vHotStripsInModule.size()>2)
-				{
-				  distanceR = vHotStripsInModule[iVec + 1] -  vHotStripsInModule[iVec];
-				  distanceL = vHotStripsInModule[iVec] - vHotStripsInModule[iVec - 1];
-				  distance = distanceL>distanceR?distanceR:distanceL;
-				}
-			      else
-				{
-				  std::cout << "ERROR! distance is never computed!!!\n";
-				}
-			      distanceVsStripNumber[0]->Fill(vHotStripsInModule[iVec], distance);
-			      distanceVsStripNumber[subdetid-2]->Fill(vHotStripsInModule[iVec], distance);
-			    }
-			}
-
-		    }
-		  continue;//if the apv is already flagged as bad, continue.
-		}
-	    }
-
-	  if (medianValues[it].apvMedian[apv] > minNevents_)
-	    {
-	      if ((medianValues[it].apvMedian[apv]>(MeanAndRms[Moduleposition].first+highoccupancy_*MeanAndRms[Moduleposition].second)) && (medianValues[it].apvMedian[apv]>absolutelow_))
-		{
-		  BadStripList.push_back(pQuality->encode((apv*128),128,0));
-		  isBad = 1;
-		}
-	    }
-	  else if (medianValues[it].apvMedian[apv]<(MeanAndRms[Moduleposition].first-lowoccupancy_*MeanAndRms[Moduleposition].second) && (MeanAndRms[Moduleposition].first>2 || medianValues[it].apvabsoluteOccupancy[apv]==0))
-	    {
-	      BadStripList.push_back(pQuality->encode((apv*128),128,0));
-	      isBad = 1;
-	    }
-
-	  if (isBad!=1)
-	    {
-	      iterativeSearch(medianValues[it],BadStripList,apv);
-	    }
-
-	  if (WriteOutputFile_==true)
-	    {
-	      apvtree->Fill();
-	      for (int strip=0; strip<128; strip++)
-		{
-		  strip_number         = (apv*128)+strip+1;
-		  apv_channel          = apv+1;
-		  isHot                = ishot[strip];
-		  singleStripOccupancy = stripoccupancy[strip];
-		  stripHits            = striphits[strip];
-		  poissonProb          = poissonprob[strip];
-
-		  hotStripsPerModule = hotstripspermodule;
-		  hotStripsPerAPV    = hotstripsperapv[apv];
-
-		  LocalPoint  pos_strip_local  = TheStripTopol->localPosition(strip);
-		  GlobalPoint pos_strip_global = (TkGeom->idToDet(DetectorId))->surface().toGlobal(pos_strip_local);
-
-		  strip_global_position_x = pos_strip_global.x();
-		  strip_global_position_y = pos_strip_global.y();
-		  strip_global_position_z = pos_strip_global.z();
-		  striptree->Fill();
-
-		  // Fill the strip DQM Plots
-		  fillStripDQMHistograms();
-		}
-	      if(vHotStripsInModule.size()==1)
-		{
-		  distance = 999;
-		  distanceVsStripNumber[0]->Fill(vHotStripsInModule[0], distance);
-		  distanceVsStripNumber[subdetid-2]->Fill(vHotStripsInModule[0], distance);
-		}
-	      else if(vHotStripsInModule.size()>1)
-		{
-		  for(unsigned int iVec = 0; iVec != vHotStripsInModule.size(); iVec++)
-		    {
-		      if(iVec==0)
-			distance = vHotStripsInModule[1] - vHotStripsInModule[0];
-		      else if(iVec==vHotStripsInModule.size()-1)
-			{
-			  distance = vHotStripsInModule[vHotStripsInModule.size()-1] - vHotStripsInModule[vHotStripsInModule.size() -2];
-			}
-		      else if(vHotStripsInModule.size()>2)
-			{
-			  distanceR = vHotStripsInModule[iVec + 1] -  vHotStripsInModule[iVec];
-			  distanceL = vHotStripsInModule[iVec] - vHotStripsInModule[iVec - 1];
-			  distance = distanceL>distanceR?distanceR:distanceL;
-			}
-		      else
-			{
-			  std::cout << "ERROR! distance is never computed!!!\n";
-			}
-		      distanceVsStripNumber[0]->Fill(vHotStripsInModule[iVec], distance);
-		      distanceVsStripNumber[subdetid-2]->Fill(vHotStripsInModule[iVec], distance);
-		    }
-		}
-	    }
-	}
-
-      if (BadStripList.begin()!=BadStripList.end())
-	{
-	  quality->compact(Detid,BadStripList);
-	  SiStripQuality::Range range(BadStripList.begin(),BadStripList.end());
-	  quality->put(Detid,range);
-	}
-      BadStripList.clear();
+  for (uint32_t it = 0; it < medianValues.size(); it++) {
+    Moduleposition = (medianValues[it].modulePosition) - 1;
+    Detid = medianValues[it].detrawId;
+
+    setBasicTreeParameters(Detid);
+
+    DetId DetectorId = DetId(Detid);
+    const StripGeomDetUnit* TheStripDet = dynamic_cast<const StripGeomDetUnit*>((TkGeom->idToDet(DetectorId)));
+    const StripTopology* TheStripTopol = dynamic_cast<const StripTopology*>(&(TheStripDet->specificTopology()));
+
+    //Analyze the occupancies
+    hotstripspermodule = 0;
+    vHotStripsInModule.clear();
+
+    for (int apv = 0; apv < medianValues[it].numberApvs; apv++) {
+      double logMedianOccupancy = -1;
+      double logAbsoluteOccupancy = -1;
+
+      for (int i = 0; i < 128; i++) {
+        ishot[i] = 0;
+        stripoccupancy[i] = 0;
+        striphits[i] = 0;
+        poissonprob[i] = 0;
+      }
+
+      number_strips = (medianValues[it].numberApvs) * 128;
+      apv_number = apv + 1;
+      apvMedianOccupancy = medianValues[it].apvMedian[apv];
+      apvAbsoluteOccupancy = medianValues[it].apvabsoluteOccupancy[apv];
+      isBad = 0;
+      hotstripsperapv[apv] = 0;
+
+      LocalPoint pos_apv_local = TheStripTopol->localPosition((apv * 128));
+      GlobalPoint pos_apv_global = (TkGeom->idToDet(DetectorId))->surface().toGlobal(pos_apv_local);
+
+      global_position_x = pos_apv_global.x();
+      global_position_y = pos_apv_global.y();
+      global_position_z = pos_apv_global.z();
+
+      if (apvMedianOccupancy > 0)
+        logMedianOccupancy = log10(apvMedianOccupancy);
+      if (apvAbsoluteOccupancy > 0)
+        logAbsoluteOccupancy = log10(apvAbsoluteOccupancy);
+
+      //Fill the DQM histograms
+      unsigned int layer = 0;
+      if (subdetid == 3 || subdetid == 5)
+        layer = layer_ring;
+      else
+        layer = disc;
+
+      // Fill histograms for all the tracker
+      medianVsAbsoluteOccupancy[0][0]->Fill(logAbsoluteOccupancy, logMedianOccupancy);
+      medianOccupancy[0][0]->Fill(logMedianOccupancy);
+      absoluteOccupancy[0][0]->Fill(logAbsoluteOccupancy);
+      // Fill summary histograms for each subdetector
+      medianVsAbsoluteOccupancy[subdetid - 2][0]->Fill(logAbsoluteOccupancy, logMedianOccupancy);
+      medianOccupancy[subdetid - 2][0]->Fill(logMedianOccupancy);
+      absoluteOccupancy[subdetid - 2][0]->Fill(logAbsoluteOccupancy);
+      // Fill histograms for each layer/disk
+      medianVsAbsoluteOccupancy[subdetid - 2][layer]->Fill(logAbsoluteOccupancy, logMedianOccupancy);
+      medianOccupancy[subdetid - 2][layer]->Fill(logMedianOccupancy);
+      absoluteOccupancy[subdetid - 2][layer]->Fill(logAbsoluteOccupancy);
+
+      if (UseInputDB_) {
+        if (InSiStripQuality->IsApvBad(Detid, apv)) {
+          if (WriteOutputFile_ == true) {
+            apvtree->Fill();
+            for (int strip = 0; strip < 128; strip++) {
+              strip_number = (apv * 128) + strip + 1;
+              apv_channel = apv + 1;
+              isHot = ishot[strip];
+              singleStripOccupancy = stripoccupancy[strip];
+              stripHits = striphits[strip];
+              poissonProb = poissonprob[strip];
+
+              hotStripsPerModule = hotstripspermodule;
+              hotStripsPerAPV = hotstripsperapv[apv];
+
+              LocalPoint pos_strip_local = TheStripTopol->localPosition(strip);
+              GlobalPoint pos_strip_global = (TkGeom->idToDet(DetectorId))->surface().toGlobal(pos_strip_local);
+
+              strip_global_position_x = pos_strip_global.x();
+              strip_global_position_y = pos_strip_global.y();
+              strip_global_position_z = pos_strip_global.z();
+              striptree->Fill();
+
+              // Fill the strip DQM Plots
+              fillStripDQMHistograms();
+            }
+
+            if (vHotStripsInModule.size() == 1) {
+              distance = 999;
+              distanceVsStripNumber[0]->Fill(vHotStripsInModule[0], distance);
+              distanceVsStripNumber[subdetid - 2]->Fill(vHotStripsInModule[0], distance);
+            } else if (vHotStripsInModule.size() > 1) {
+              for (unsigned int iVec = 0; iVec != vHotStripsInModule.size(); iVec++) {
+                if (iVec == 0)
+                  distance = vHotStripsInModule[1] - vHotStripsInModule[0];
+                else if (iVec == vHotStripsInModule.size() - 1) {
+                  distance = vHotStripsInModule[vHotStripsInModule.size() - 1] -
+                             vHotStripsInModule[vHotStripsInModule.size() - 2];
+                } else if (vHotStripsInModule.size() > 2) {
+                  distanceR = vHotStripsInModule[iVec + 1] - vHotStripsInModule[iVec];
+                  distanceL = vHotStripsInModule[iVec] - vHotStripsInModule[iVec - 1];
+                  distance = distanceL > distanceR ? distanceR : distanceL;
+                } else {
+                  std::cout << "ERROR! distance is never computed!!!\n";
+                }
+                distanceVsStripNumber[0]->Fill(vHotStripsInModule[iVec], distance);
+                distanceVsStripNumber[subdetid - 2]->Fill(vHotStripsInModule[iVec], distance);
+              }
+            }
+          }
+          continue;  //if the apv is already flagged as bad, continue.
+        }
+      }
+
+      if (medianValues[it].apvMedian[apv] > minNevents_) {
+        if ((medianValues[it].apvMedian[apv] >
+             (MeanAndRms[Moduleposition].first + highoccupancy_ * MeanAndRms[Moduleposition].second)) &&
+            (medianValues[it].apvMedian[apv] > absolutelow_)) {
+          BadStripList.push_back(pQuality->encode((apv * 128), 128, 0));
+          isBad = 1;
+        }
+      } else if (medianValues[it].apvMedian[apv] <
+                     (MeanAndRms[Moduleposition].first - lowoccupancy_ * MeanAndRms[Moduleposition].second) &&
+                 (MeanAndRms[Moduleposition].first > 2 || medianValues[it].apvabsoluteOccupancy[apv] == 0)) {
+        BadStripList.push_back(pQuality->encode((apv * 128), 128, 0));
+        isBad = 1;
+      }
+
+      if (isBad != 1) {
+        iterativeSearch(medianValues[it], BadStripList, apv);
+      }
+
+      if (WriteOutputFile_ == true) {
+        apvtree->Fill();
+        for (int strip = 0; strip < 128; strip++) {
+          strip_number = (apv * 128) + strip + 1;
+          apv_channel = apv + 1;
+          isHot = ishot[strip];
+          singleStripOccupancy = stripoccupancy[strip];
+          stripHits = striphits[strip];
+          poissonProb = poissonprob[strip];
+
+          hotStripsPerModule = hotstripspermodule;
+          hotStripsPerAPV = hotstripsperapv[apv];
+
+          LocalPoint pos_strip_local = TheStripTopol->localPosition(strip);
+          GlobalPoint pos_strip_global = (TkGeom->idToDet(DetectorId))->surface().toGlobal(pos_strip_local);
+
+          strip_global_position_x = pos_strip_global.x();
+          strip_global_position_y = pos_strip_global.y();
+          strip_global_position_z = pos_strip_global.z();
+          striptree->Fill();
+
+          // Fill the strip DQM Plots
+          fillStripDQMHistograms();
+        }
+        if (vHotStripsInModule.size() == 1) {
+          distance = 999;
+          distanceVsStripNumber[0]->Fill(vHotStripsInModule[0], distance);
+          distanceVsStripNumber[subdetid - 2]->Fill(vHotStripsInModule[0], distance);
+        } else if (vHotStripsInModule.size() > 1) {
+          for (unsigned int iVec = 0; iVec != vHotStripsInModule.size(); iVec++) {
+            if (iVec == 0)
+              distance = vHotStripsInModule[1] - vHotStripsInModule[0];
+            else if (iVec == vHotStripsInModule.size() - 1) {
+              distance =
+                  vHotStripsInModule[vHotStripsInModule.size() - 1] - vHotStripsInModule[vHotStripsInModule.size() - 2];
+            } else if (vHotStripsInModule.size() > 2) {
+              distanceR = vHotStripsInModule[iVec + 1] - vHotStripsInModule[iVec];
+              distanceL = vHotStripsInModule[iVec] - vHotStripsInModule[iVec - 1];
+              distance = distanceL > distanceR ? distanceR : distanceL;
+            } else {
+              std::cout << "ERROR! distance is never computed!!!\n";
+            }
+            distanceVsStripNumber[0]->Fill(vHotStripsInModule[iVec], distance);
+            distanceVsStripNumber[subdetid - 2]->Fill(vHotStripsInModule[iVec], distance);
+          }
+        }
+      }
+    }
+
+    if (BadStripList.begin() != BadStripList.end()) {
+      quality->compact(Detid, BadStripList);
+      SiStripQuality::Range range(BadStripList.begin(), BadStripList.end());
+      quality->put(Detid, range);
     }
+    BadStripList.clear();
+  }
 }
 
-void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::iterativeSearch(Apv& histo,std::vector<unsigned int>& vect, int apv){
-  if (!histo.NEntries[apv] || histo.NEntries[apv] <=MinNumEntries_ || histo.NEntries[apv] <= minNevents_)
+void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::iterativeSearch(Apv& histo,
+                                                                            std::vector<unsigned int>& vect,
+                                                                            int apv) {
+  if (!histo.NEntries[apv] || histo.NEntries[apv] <= MinNumEntries_ || histo.NEntries[apv] <= minNevents_)
     return;
-  
-  size_t startingSize=vect.size();
-  long double diff=1.-prob_; 
-  
-  size_t Nbins     = histo.th1f[apv]->GetNbinsX();
-  size_t ibinStart = 1; 
-  size_t ibinStop  = Nbins+1; 
-  int MaxEntry  = (int)histo.th1f[apv]->GetMaximum();
-
-  std::vector<long double> vPoissonProbs(MaxEntry+1,0);
-  long double meanVal=1.*histo.NEntries[apv]/(1.*Nbins-histo.NEmptyBins[apv]); 
-  evaluatePoissonian(vPoissonProbs,meanVal);
+
+  size_t startingSize = vect.size();
+  long double diff = 1. - prob_;
+
+  size_t Nbins = histo.th1f[apv]->GetNbinsX();
+  size_t ibinStart = 1;
+  size_t ibinStop = Nbins + 1;
+  int MaxEntry = (int)histo.th1f[apv]->GetMaximum();
+
+  std::vector<long double> vPoissonProbs(MaxEntry + 1, 0);
+  long double meanVal = 1. * histo.NEntries[apv] / (1. * Nbins - histo.NEmptyBins[apv]);
+  evaluatePoissonian(vPoissonProbs, meanVal);
 
   // Find median occupancy, taking into account only good strips
   unsigned int goodstripentries[128];
   int nGoodStrips = 0;
-  for (size_t i=ibinStart; i<ibinStop; ++i){
-    if (ishot[(apv*128)+i-1]==0){
+  for (size_t i = ibinStart; i < ibinStop; ++i) {
+    if (ishot[(apv * 128) + i - 1] == 0) {
       goodstripentries[nGoodStrips] = (unsigned int)histo.th1f[apv]->GetBinContent(i);
       nGoodStrips++;
     }
   }
-  double median = TMath::Median(nGoodStrips,goodstripentries);
+  double median = TMath::Median(nGoodStrips, goodstripentries);
 
-  for (size_t i=ibinStart; i<ibinStop; ++i){
-    unsigned int entries= (unsigned int)histo.th1f[apv]->GetBinContent(i);
+  for (size_t i = ibinStart; i < ibinStop; ++i) {
+    unsigned int entries = (unsigned int)histo.th1f[apv]->GetBinContent(i);
 
-    if (ishot[i-1]==0){
-      stripoccupancy[i-1] = entries/(double) Nevents_;
-      striphits[i-1]      = entries;
-      poissonprob[i-1]    = 1-vPoissonProbs[entries];
-      medianapvhits[apv]  = median;
+    if (ishot[i - 1] == 0) {
+      stripoccupancy[i - 1] = entries / (double)Nevents_;
+      striphits[i - 1] = entries;
+      poissonprob[i - 1] = 1 - vPoissonProbs[entries];
+      medianapvhits[apv] = median;
       avgapvhits[apv] = meanVal;
     }
 
-    if (entries<=MinNumEntriesPerStrip_ || entries <= minNevents_ || entries / median < ratio_) continue;
+    if (entries <= MinNumEntriesPerStrip_ || entries <= minNevents_ || entries / median < ratio_)
+      continue;
 
-    if(diff<vPoissonProbs[entries]){
-      ishot[i-1] = 1;
+    if (diff < vPoissonProbs[entries]) {
+      ishot[i - 1] = 1;
       hotstripspermodule++;
       hotstripsperapv[apv]++;
-      histo.th1f[apv]->SetBinContent(i,0.);
-      histo.NEntries[apv]-=entries;
+      histo.th1f[apv]->SetBinContent(i, 0.);
+      histo.NEntries[apv] -= entries;
       histo.NEmptyBins[apv]++;
       if (edm::isDebugEnabled())
-	LogTrace("SiStripHotStrip")<< " rejecting strip " << (apv*128)+i-1 << " value " << entries << " diff  " << diff << " prob " << vPoissonProbs[entries]<< std::endl;
-      vect.push_back(pQuality->encode((apv*128)+i-1,1,0));
+        LogTrace("SiStripHotStrip") << " rejecting strip " << (apv * 128) + i - 1 << " value " << entries << " diff  "
+                                    << diff << " prob " << vPoissonProbs[entries] << std::endl;
+      vect.push_back(pQuality->encode((apv * 128) + i - 1, 1, 0));
     }
-
   }
   if (edm::isDebugEnabled())
-    LogTrace("SiStripHotStrip") << " [SiStripHotStripAlgorithmFromClusterOccupancy::iterativeSearch] Nbins="<< Nbins << " MaxEntry="<<MaxEntry << " meanVal=" << meanVal << " NEmptyBins="<<histo.NEmptyBins[apv]<< " NEntries=" << histo.NEntries[apv] << " thEntries " << histo.th1f[apv]->GetEntries()<< " startingSize " << startingSize << " vector.size " << vect.size() << std::endl;
-
-  if (vect.size()!=startingSize)
-    iterativeSearch(histo,vect,apv);
+    LogTrace("SiStripHotStrip") << " [SiStripHotStripAlgorithmFromClusterOccupancy::iterativeSearch] Nbins=" << Nbins
+                                << " MaxEntry=" << MaxEntry << " meanVal=" << meanVal
+                                << " NEmptyBins=" << histo.NEmptyBins[apv] << " NEntries=" << histo.NEntries[apv]
+                                << " thEntries " << histo.th1f[apv]->GetEntries() << " startingSize " << startingSize
+                                << " vector.size " << vect.size() << std::endl;
+
+  if (vect.size() != startingSize)
+    iterativeSearch(histo, vect, apv);
 }
 
-void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::evaluatePoissonian(std::vector<long double>& vPoissonProbs, long double& meanVal){
-  for(size_t i=0;i<vPoissonProbs.size();++i){
-    vPoissonProbs[i]= (i==0)?TMath::Poisson(i,meanVal):vPoissonProbs[i-1]+TMath::Poisson(i,meanVal);
+void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::evaluatePoissonian(std::vector<long double>& vPoissonProbs,
+                                                                               long double& meanVal) {
+  for (size_t i = 0; i < vPoissonProbs.size(); ++i) {
+    vPoissonProbs[i] = (i == 0) ? TMath::Poisson(i, meanVal) : vPoissonProbs[i - 1] + TMath::Poisson(i, meanVal);
   }
 }
 
-void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::setBasicTreeParameters(int detid){
-  DetId DetectorID=DetId(detid);
+void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::setBasicTreeParameters(int detid) {
+  DetId DetectorID = DetId(detid);
 
   detrawid = detid;
   subdetid = DetectorID.subdetId();
 
-  switch (DetectorID.subdetId())
-    {
-    case StripSubdetector::TIB :
+  switch (DetectorID.subdetId()) {
+    case StripSubdetector::TIB:
       layer_ring = tTopo->tibLayer(detid);
-      disc       = -1;
-      isstereo   = tTopo->tibIsStereo(detid);
-      isback     = -1;
-      if (tTopo->tibIsExternalString(detid)) isexternalstring = 1;
-      else                                    isexternalstring = 0;
-      if (tTopo->tibIsZMinusSide(detid)) iszminusside = 1;
-      else                                iszminusside = 0;
-      rodstringpetal     = tTopo->tibString(detid);
-      module_number      = tTopo->tibModule(detid);
+      disc = -1;
+      isstereo = tTopo->tibIsStereo(detid);
+      isback = -1;
+      if (tTopo->tibIsExternalString(detid))
+        isexternalstring = 1;
+      else
+        isexternalstring = 0;
+      if (tTopo->tibIsZMinusSide(detid))
+        iszminusside = 1;
+      else
+        iszminusside = 0;
+      rodstringpetal = tTopo->tibString(detid);
+      module_number = tTopo->tibModule(detid);
 
       break;
 
-    case StripSubdetector::TID :
+    case StripSubdetector::TID:
       layer_ring = tTopo->tidRing(detid);
-      disc       = tTopo->tidWheel(detid);
-      isstereo   = tTopo->tidIsStereo(detid);
-      if (tTopo->tidIsBackRing(detid)) isback = 1;
-      else                              isback = 0;
-      if (tTopo->tidIsZMinusSide(detid)) iszminusside = 1;
-      else                                iszminusside = 0;
-      isexternalstring   = -1;
-      rodstringpetal     = -1;
-      module_number      = tTopo->tidModule(detid);
+      disc = tTopo->tidWheel(detid);
+      isstereo = tTopo->tidIsStereo(detid);
+      if (tTopo->tidIsBackRing(detid))
+        isback = 1;
+      else
+        isback = 0;
+      if (tTopo->tidIsZMinusSide(detid))
+        iszminusside = 1;
+      else
+        iszminusside = 0;
+      isexternalstring = -1;
+      rodstringpetal = -1;
+      module_number = tTopo->tidModule(detid);
 
       break;
 
-    case StripSubdetector::TOB :
+    case StripSubdetector::TOB:
       layer_ring = tTopo->tobLayer(detid);
-      disc       = -1;
-      isstereo   = tTopo->tobIsStereo(detid);
-      isback     = -1;
-      if (tTopo->tobIsZMinusSide(detid)) iszminusside = 1;
-      else                                iszminusside = 0;
-      isexternalstring   = -1;
-      rodstringpetal     = tTopo->tobRod(detid);
-      module_number      = tTopo->tobModule(detid);
+      disc = -1;
+      isstereo = tTopo->tobIsStereo(detid);
+      isback = -1;
+      if (tTopo->tobIsZMinusSide(detid))
+        iszminusside = 1;
+      else
+        iszminusside = 0;
+      isexternalstring = -1;
+      rodstringpetal = tTopo->tobRod(detid);
+      module_number = tTopo->tobModule(detid);
 
       break;
 
-    case StripSubdetector::TEC :
+    case StripSubdetector::TEC:
       layer_ring = tTopo->tecRing(detid);
-      disc       = tTopo->tecWheel(detid);
-      isstereo   = tTopo->tecIsStereo(detid);
-      if (tTopo->tecIsBackPetal(detid)) isback = 1;
-      else                               isback = 0;
-      if (tTopo->tecIsZMinusSide(detid)) iszminusside = 1;
-      else                                iszminusside = 0;
-      isexternalstring   = -1;
-      rodstringpetal     = tTopo->tecPetalNumber(detid);
-      module_number      = tTopo->tecModule(detid);
+      disc = tTopo->tecWheel(detid);
+      isstereo = tTopo->tecIsStereo(detid);
+      if (tTopo->tecIsBackPetal(detid))
+        isback = 1;
+      else
+        isback = 0;
+      if (tTopo->tecIsZMinusSide(detid))
+        iszminusside = 1;
+      else
+        iszminusside = 0;
+      isexternalstring = -1;
+      rodstringpetal = tTopo->tecPetalNumber(detid);
+      module_number = tTopo->tecModule(detid);
 
       break;
 
-    default :
+    default:
       std::cout << "### Detector does not belong to TIB, TID, TOB or TEC !? ###" << std::endl;
       std::cout << "### DetRawId: " << detid << " ###" << std::endl;
-    }
+  }
 }
 
-void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::setMinNumOfEvents()
-{
-  minNevents_=absolute_occupancy_*Nevents_;
+void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::setMinNumOfEvents() {
+  minNevents_ = absolute_occupancy_ * Nevents_;
 }
 
-void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::initializeDQMHistograms()
-{
+void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::initializeDQMHistograms() {
   oss.str("");
-  oss << 1; //runNumber
+  oss << 1;  //runNumber
 
   dqmStore = edm::Service<DQMStore>().operator->();
   dqmStore->setCurrentFolder("ChannelStatusPlots");
 
   // Initialize histograms
-  subDetName.push_back(""); subDetName.push_back("TIB"); subDetName.push_back("TID"); subDetName.push_back("TOB"); subDetName.push_back("TEC");
-  nLayers.push_back(0); nLayers.push_back(4); nLayers.push_back(3); nLayers.push_back(6); nLayers.push_back(9);
-  layerName.push_back(""); layerName.push_back("Layer"); layerName.push_back("Disk"); layerName.push_back("Layer"); layerName.push_back("Disk");
-  
+  subDetName.push_back("");
+  subDetName.push_back("TIB");
+  subDetName.push_back("TID");
+  subDetName.push_back("TOB");
+  subDetName.push_back("TEC");
+  nLayers.push_back(0);
+  nLayers.push_back(4);
+  nLayers.push_back(3);
+  nLayers.push_back(6);
+  nLayers.push_back(9);
+  layerName.push_back("");
+  layerName.push_back("Layer");
+  layerName.push_back("Disk");
+  layerName.push_back("Layer");
+  layerName.push_back("Disk");
+
   std::string histoName;
   std::string histoTitle;
 
-  for(unsigned int i = 0; i < subDetName.size(); i++)
-  {
+  for (unsigned int i = 0; i < subDetName.size(); i++) {
     histoName = "distanceVsStripNumber" + subDetName[i];
     histoTitle = "Distance between hot strips vs. strip number";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book2D(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5, 999, 0.5, 999.5);
     distanceVsStripNumber.push_back(tmp->getTH2F());
@@ -819,160 +877,160 @@ void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::initializeDQMHistogr
 
     histoName = "projXDistanceVsStripNumber" + subDetName[i];
     histoTitle = "Number of hot strips vs. strip number";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book1D(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5);
     projXDistanceVsStripNumber.push_back(tmp->getTH1F());
     projXDistanceVsStripNumber[i]->GetXaxis()->SetTitle("Strip");
     projXDistanceVsStripNumber[i]->GetYaxis()->SetTitle("N_{hot}");
-    
+
     histoName = "projYDistanceVsStripNumber" + subDetName[i];
     histoTitle = "Distribution of distance between hot strips";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book1D(histoName.c_str(), histoTitle.c_str(), 999, 0.5, 999.5);
     projYDistanceVsStripNumber.push_back(tmp->getTH1F());
     projYDistanceVsStripNumber[i]->GetXaxis()->SetTitle("Distance");
     projYDistanceVsStripNumber[i]->GetYaxis()->SetTitle("N_{strips}");
-    
+
     //
     histoName = "occupancyVsStripNumber" + subDetName[i];
     histoTitle = "Occupancy of strips vs. strip number";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
-    tmp = dqmStore->book2D(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5, 1000, -8.,0.);
+    tmp = dqmStore->book2D(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5, 1000, -8., 0.);
     occupancyVsStripNumber.push_back(tmp->getTH2F());
-    
+
     histoName = "pfxOccupancyVsStripNumber" + subDetName[i];
     tmp_prof = new TProfile(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5);
     tmp = dqmStore->bookProfile(histoName.c_str(), tmp_prof);
     pfxOccupancyVsStripNumber.push_back(tmp->getTProfile());
     pfxOccupancyVsStripNumber[i]->GetXaxis()->SetTitle("Strip");
     pfxOccupancyVsStripNumber[i]->GetYaxis()->SetTitle("log_{10}(Occupancy)");
-    
+
     histoName = "projYOccupancyVsStripNumber" + subDetName[i];
     histoTitle = "Distribution of strip occupancy";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book1D(histoName.c_str(), histoTitle.c_str(), 1000, -8., 0.);
     projYOccupancyVsStripNumber.push_back(tmp->getTH1F());
     projYOccupancyVsStripNumber[i]->GetXaxis()->SetTitle("log_{10}(Occupancy)");
     projYOccupancyVsStripNumber[i]->GetYaxis()->SetTitle("N_{strips}");
-    
+
     //
     histoName = "occupancyHotStripsVsStripNumber" + subDetName[i];
     histoTitle = "Occupancy of hot strips vs. strip number";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book2D(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5, 1000, -8., 0.);
     occupancyHotStripsVsStripNumber.push_back(tmp->getTH2F());
-    
+
     histoName = "pfxOccupancyHotStripsVsStripNumber" + subDetName[i];
     tmp_prof = new TProfile(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5);
     tmp = dqmStore->bookProfile(histoName.c_str(), tmp_prof);
     pfxOccupancyHotStripsVsStripNumber.push_back(tmp->getTProfile());
     pfxOccupancyHotStripsVsStripNumber[i]->GetXaxis()->SetTitle("Strip");
     pfxOccupancyHotStripsVsStripNumber[i]->GetYaxis()->SetTitle("log_{10}(Occupancy)");
-    
+
     histoName = "projYOccupancyHotStripsVsStripNumber" + subDetName[i];
     histoTitle = "Distribution of hot strip occupancy";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book1D(histoName.c_str(), histoTitle.c_str(), 1000, -8., 0.);
     projYOccupancyHotStripsVsStripNumber.push_back(tmp->getTH1F());
     projYOccupancyHotStripsVsStripNumber[i]->GetXaxis()->SetTitle("log_{10}(Occupancy)");
     projYOccupancyHotStripsVsStripNumber[i]->GetYaxis()->SetTitle("N_{strips}");
-    
+
     //
     histoName = "occupancyGoodStripsVsStripNumber" + subDetName[i];
     histoTitle = "Occupancy of good strips vs. strip number";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book2D(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5, 1000, -8., 0.);
     occupancyGoodStripsVsStripNumber.push_back(tmp->getTH2F());
-    
+
     histoName = "pfxOccupancyGoodStripsVsStripNumber" + subDetName[i];
     tmp_prof = new TProfile(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5);
     tmp = dqmStore->bookProfile(histoName.c_str(), tmp_prof);
     pfxOccupancyGoodStripsVsStripNumber.push_back(tmp->getTProfile());
     pfxOccupancyGoodStripsVsStripNumber[i]->GetXaxis()->SetTitle("Strip");
     pfxOccupancyGoodStripsVsStripNumber[i]->GetYaxis()->SetTitle("log_{10}(Occupancy)");
-    
+
     histoName = "projYOccupancyGoodStripsVsStripNumber" + subDetName[i];
     histoTitle = "Distribution of good strip occupancy";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book1D(histoName.c_str(), histoTitle.c_str(), 1000, -8., 0.);
     projYOccupancyGoodStripsVsStripNumber.push_back(tmp->getTH1F());
     projYOccupancyGoodStripsVsStripNumber[i]->GetXaxis()->SetTitle("log_{10}(Occupancy)");
     projYOccupancyGoodStripsVsStripNumber[i]->GetYaxis()->SetTitle("N_{strips}");
-    
+
     //
     histoName = "poissonProbVsStripNumber" + subDetName[i];
     histoTitle = "Poisson probability of strips vs. strip number";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book2D(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5, 1000, -18., 0.);
     poissonProbVsStripNumber.push_back(tmp->getTH2F());
-    
+
     histoName = "pfxPoissonProbVsStripNumber" + subDetName[i];
     tmp_prof = new TProfile(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5);
     tmp = dqmStore->bookProfile(histoName.c_str(), tmp_prof);
     pfxPoissonProbVsStripNumber.push_back(tmp->getTProfile());
     pfxPoissonProbVsStripNumber[i]->GetXaxis()->SetTitle("Strip");
     pfxPoissonProbVsStripNumber[i]->GetYaxis()->SetTitle("log_{10}(Probability)");
-    
+
     histoName = "projYPoissonProbVsStripNumber" + subDetName[i];
     histoTitle = "Distribution of strip Poisson probability";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book1D(histoName.c_str(), histoTitle.c_str(), 1000, -18., 0.);
     projYPoissonProbVsStripNumber.push_back(tmp->getTH1F());
     projYPoissonProbVsStripNumber[i]->GetXaxis()->SetTitle("log_{10}(Probability)");
     projYPoissonProbVsStripNumber[i]->GetYaxis()->SetTitle("N_{strips}");
-    
+
     //
     histoName = "poissonProbHotStripsVsStripNumber" + subDetName[i];
     histoTitle = "Poisson probability of hot strips vs. strip number";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book2D(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5, 1000, -18., 0.);
     poissonProbHotStripsVsStripNumber.push_back(tmp->getTH2F());
-    
+
     histoName = "pfxPoissonProbHotStripsVsStripNumber" + subDetName[i];
     tmp_prof = new TProfile(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5);
     tmp = dqmStore->bookProfile(histoName.c_str(), tmp_prof);
     pfxPoissonProbHotStripsVsStripNumber.push_back(tmp->getTProfile());
     pfxPoissonProbHotStripsVsStripNumber[i]->GetXaxis()->SetTitle("Strip");
     pfxPoissonProbHotStripsVsStripNumber[i]->GetYaxis()->SetTitle("log_{10}(Probability)");
-    
+
     histoName = "projYPoissonProbHotStripsVsStripNumber" + subDetName[i];
     histoTitle = "Distribution of hot strip Poisson probability";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book1D(histoName.c_str(), histoTitle.c_str(), 1000, -18., 0.);
     projYPoissonProbHotStripsVsStripNumber.push_back(tmp->getTH1F());
     projYPoissonProbHotStripsVsStripNumber[i]->GetXaxis()->SetTitle("log_{10}(Probability)");
     projYPoissonProbHotStripsVsStripNumber[i]->GetYaxis()->SetTitle("N_{strips}");
-    
+
     //
     histoName = "poissonProbGoodStripsVsStripNumber" + subDetName[i];
     histoTitle = "Poisson probability of good strips vs. strip number";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book2D(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5, 1000, -18., 0.);
     poissonProbGoodStripsVsStripNumber.push_back(tmp->getTH2F());
-    
+
     histoName = "pfxPoissonProbGoodStripsVsStripNumber" + subDetName[i];
     tmp_prof = new TProfile(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5);
     tmp = dqmStore->bookProfile(histoName.c_str(), tmp_prof);
     pfxPoissonProbGoodStripsVsStripNumber.push_back(tmp->getTProfile());
     pfxPoissonProbGoodStripsVsStripNumber[i]->GetXaxis()->SetTitle("Strip");
     pfxPoissonProbGoodStripsVsStripNumber[i]->GetYaxis()->SetTitle("log_{10}(Probability)");
-    
+
     histoName = "projYPoissonProbGoodStripsVsStripNumber" + subDetName[i];
     histoTitle = "Distribution of good strip Poisson probability";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book1D(histoName.c_str(), histoTitle.c_str(), 1000, -18., 0.);
     projYPoissonProbGoodStripsVsStripNumber.push_back(tmp->getTH1F());
@@ -982,124 +1040,119 @@ void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::initializeDQMHistogr
     //
     histoName = "nHitsVsStripNumber" + subDetName[i];
     histoTitle = "NHits in strips vs. strip number";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book2D(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5, 10000, -0.5, 9999.5);
     nHitsVsStripNumber.push_back(tmp->getTH2F());
-    
+
     histoName = "pfxNHitsVsStripNumber" + subDetName[i];
     tmp_prof = new TProfile(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5);
     tmp = dqmStore->bookProfile(histoName.c_str(), tmp_prof);
     pfxNHitsVsStripNumber.push_back(tmp->getTProfile());
-    
+
     histoName = "projXNHitsVsStripNumber" + subDetName[i];
     histoTitle = "Cumulative nHits in strips vs. strip number";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book1D(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5);
     projXNHitsVsStripNumber.push_back(tmp->getTH1F());
-    
+
     histoName = "projYNHitsVsStripNumber" + subDetName[i];
     histoTitle = "Distribution of nHits for all strips";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book1D(histoName.c_str(), histoTitle.c_str(), 10000, -0.5, 9999.5);
     projYNHitsVsStripNumber.push_back(tmp->getTH1F());
     projYNHitsVsStripNumber[i]->GetXaxis()->SetTitle("N_{hits}");
     projYNHitsVsStripNumber[i]->GetYaxis()->SetTitle("N_{strips}");
-    
+
     //
     histoName = "nHitsHotStripsVsStripNumber" + subDetName[i];
     histoTitle = "NHits in hot strips vs. strip number";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book2D(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5, 10000, -0.5, 9999.5);
     nHitsHotStripsVsStripNumber.push_back(tmp->getTH2F());
-    
+
     histoName = "pfxNHitsHotStripsVsStripNumber" + subDetName[i];
     tmp_prof = new TProfile(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5);
     tmp = dqmStore->bookProfile(histoName.c_str(), tmp_prof);
     pfxNHitsHotStripsVsStripNumber.push_back(tmp->getTProfile());
-    
+
     histoName = "projXNHitsHotStripsVsStripNumber" + subDetName[i];
     histoTitle = "Cumulative nHits in hot strips vs. strip number";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book1D(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5);
     projXNHitsHotStripsVsStripNumber.push_back(tmp->getTH1F());
-    
+
     histoName = "projYNHitsHotStripsVsStripNumber" + subDetName[i];
     histoTitle = "Distribution of nHits for hot strips";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book1D(histoName.c_str(), histoTitle.c_str(), 10000, -0.5, 9999.5);
     projYNHitsHotStripsVsStripNumber.push_back(tmp->getTH1F());
     projYNHitsHotStripsVsStripNumber[i]->GetXaxis()->SetTitle("N_{hits}");
     projYNHitsHotStripsVsStripNumber[i]->GetYaxis()->SetTitle("N_{strips}");
-    
+
     //
     histoName = "nHitsGoodStripsVsStripNumber" + subDetName[i];
     histoTitle = "NHits in good strips vs. strip number";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book2D(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5, 10000, -0.5, 9999.5);
     nHitsGoodStripsVsStripNumber.push_back(tmp->getTH2F());
-    
+
     histoName = "pfxNHitsGoodStripsVsStripNumber" + subDetName[i];
     tmp_prof = new TProfile(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5);
     tmp = dqmStore->bookProfile(histoName.c_str(), tmp_prof);
     pfxNHitsGoodStripsVsStripNumber.push_back(tmp->getTProfile());
-    
+
     histoName = "projXNHitsGoodStripsVsStripNumber" + subDetName[i];
     histoTitle = "Cumulative nHits in good strips vs. strip number";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book1D(histoName.c_str(), histoTitle.c_str(), 768, 0.5, 768.5);
     projXNHitsGoodStripsVsStripNumber.push_back(tmp->getTH1F());
-    
+
     histoName = "projYNHitsGoodStripsVsStripNumber" + subDetName[i];
     histoTitle = "Distribution of nHits for good strips";
-    if(i!=0)
+    if (i != 0)
       histoTitle += " in " + subDetName[i];
     tmp = dqmStore->book1D(histoName.c_str(), histoTitle.c_str(), 10000, -0.5, 9999.5);
     projYNHitsGoodStripsVsStripNumber.push_back(tmp->getTH1F());
     projYNHitsGoodStripsVsStripNumber[i]->GetXaxis()->SetTitle("N_{hits}");
     projYNHitsGoodStripsVsStripNumber[i]->GetYaxis()->SetTitle("N_{strips}");
 
-    for(unsigned int j = 0; j <= nLayers[i]; j++)
-    {
+    for (unsigned int j = 0; j <= nLayers[i]; j++) {
       histoName = "medianVsAbsoluteOccupancy" + subDetName[i];
-      if(j!=0)
-      {
+      if (j != 0) {
         oss.str("");
         oss << j;
         histoName += layerName[i] + oss.str();
       }
       histoTitle = "Median APV occupancy vs. absolute APV occupancy";
-      if(i!=0)
+      if (i != 0)
         histoTitle += " in " + subDetName[i];
-      if(j!=0)
-      {
+      if (j != 0) {
         histoTitle += " " + layerName[i] + " " + oss.str();
       }
       tmp = dqmStore->book2D(histoName.c_str(), histoTitle.c_str(), 1000, 0., 6., 1000, -1., 3.);
       medianVsAbsoluteOccupancy[i][j] = tmp->getTH2F();
-      medianVsAbsoluteOccupancy[i][j]->Rebin2D(10,10);
+      medianVsAbsoluteOccupancy[i][j]->Rebin2D(10, 10);
       medianVsAbsoluteOccupancy[i][j]->GetXaxis()->SetTitle("log_{10}(Abs. Occupancy)");
       medianVsAbsoluteOccupancy[i][j]->GetYaxis()->SetTitle("log_{10}(Median Occupancy)");
       //
       histoName = "medianOccupancy" + subDetName[i];
-      if(j!=0)
-      {
+      if (j != 0) {
         oss.str("");
         oss << j;
         histoName += layerName[i] + oss.str();
       }
       histoTitle = "Median APV occupancy";
-      if(i!=0)
+      if (i != 0)
         histoTitle += " in " + subDetName[i];
-      if(j!=0)
-      {
+      if (j != 0) {
         histoTitle += " " + layerName[i] + " " + oss.str();
       }
       tmp = dqmStore->book1D(histoName.c_str(), histoTitle.c_str(), 1000, -1., 3.);
@@ -1108,17 +1161,15 @@ void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::initializeDQMHistogr
       medianOccupancy[i][j]->GetYaxis()->SetTitle("APVs");
       //
       histoName = "absoluteOccupancy" + subDetName[i];
-      if(j!=0)
-      {
+      if (j != 0) {
         oss.str("");
         oss << j;
         histoName += layerName[i] + oss.str();
       }
       histoTitle = "Absolute APV occupancy";
-      if(i!=0)
+      if (i != 0)
         histoTitle += " in " + subDetName[i];
-      if(j!=0)
-      {
+      if (j != 0) {
         histoTitle += " " + layerName[i] + " " + oss.str();
       }
       tmp = dqmStore->book1D(histoName.c_str(), histoTitle.c_str(), 1000, 0., 6.);
@@ -1129,38 +1180,36 @@ void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::initializeDQMHistogr
   }
 }
 
-void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::fillStripDQMHistograms()
-{
+void SiStripBadAPVandHotStripAlgorithmFromClusterOccupancy::fillStripDQMHistograms() {
   double logStripOccupancy = -1;
   double logPoissonProb = -1;
 
-  if (singleStripOccupancy>0) logStripOccupancy = log10(singleStripOccupancy);
-  if (poissonProb>0) logPoissonProb = log10(fabs(poissonProb));
-
-  occupancyVsStripNumber[0]->Fill(strip_number,logStripOccupancy);
-  occupancyVsStripNumber[subdetid-2]->Fill(strip_number,logStripOccupancy);
-  poissonProbVsStripNumber[0]->Fill(strip_number,logPoissonProb);
-  poissonProbVsStripNumber[subdetid-2]->Fill(strip_number,logPoissonProb);
-  nHitsVsStripNumber[0]->Fill(strip_number,stripHits);
-  nHitsVsStripNumber[subdetid-2]->Fill(strip_number,stripHits);
-       
-  if(isHot)
-    {
-      vHotStripsInModule.push_back(strip_number);
-      occupancyHotStripsVsStripNumber[0]->Fill(strip_number,logStripOccupancy);
-      occupancyHotStripsVsStripNumber[subdetid-2]->Fill(strip_number,logStripOccupancy);
-      poissonProbHotStripsVsStripNumber[0]->Fill(strip_number,logPoissonProb);
-      poissonProbHotStripsVsStripNumber[subdetid-2]->Fill(strip_number,logPoissonProb);
-      nHitsHotStripsVsStripNumber[0]->Fill(strip_number,stripHits);
-      nHitsHotStripsVsStripNumber[subdetid-2]->Fill(strip_number,stripHits);
-    }
-  else
-    {
-      occupancyGoodStripsVsStripNumber[0]->Fill(strip_number,logStripOccupancy);
-      occupancyGoodStripsVsStripNumber[subdetid-2]->Fill(strip_number,logStripOccupancy);
-      poissonProbGoodStripsVsStripNumber[0]->Fill(strip_number,logPoissonProb);
-      poissonProbGoodStripsVsStripNumber[subdetid-2]->Fill(strip_number,logPoissonProb);
-      nHitsGoodStripsVsStripNumber[0]->Fill(strip_number,stripHits);
-      nHitsGoodStripsVsStripNumber[subdetid-2]->Fill(strip_number,stripHits);
-    }
+  if (singleStripOccupancy > 0)
+    logStripOccupancy = log10(singleStripOccupancy);
+  if (poissonProb > 0)
+    logPoissonProb = log10(fabs(poissonProb));
+
+  occupancyVsStripNumber[0]->Fill(strip_number, logStripOccupancy);
+  occupancyVsStripNumber[subdetid - 2]->Fill(strip_number, logStripOccupancy);
+  poissonProbVsStripNumber[0]->Fill(strip_number, logPoissonProb);
+  poissonProbVsStripNumber[subdetid - 2]->Fill(strip_number, logPoissonProb);
+  nHitsVsStripNumber[0]->Fill(strip_number, stripHits);
+  nHitsVsStripNumber[subdetid - 2]->Fill(strip_number, stripHits);
+
+  if (isHot) {
+    vHotStripsInModule.push_back(strip_number);
+    occupancyHotStripsVsStripNumber[0]->Fill(strip_number, logStripOccupancy);
+    occupancyHotStripsVsStripNumber[subdetid - 2]->Fill(strip_number, logStripOccupancy);
+    poissonProbHotStripsVsStripNumber[0]->Fill(strip_number, logPoissonProb);
+    poissonProbHotStripsVsStripNumber[subdetid - 2]->Fill(strip_number, logPoissonProb);
+    nHitsHotStripsVsStripNumber[0]->Fill(strip_number, stripHits);
+    nHitsHotStripsVsStripNumber[subdetid - 2]->Fill(strip_number, stripHits);
+  } else {
+    occupancyGoodStripsVsStripNumber[0]->Fill(strip_number, logStripOccupancy);
+    occupancyGoodStripsVsStripNumber[subdetid - 2]->Fill(strip_number, logStripOccupancy);
+    poissonProbGoodStripsVsStripNumber[0]->Fill(strip_number, logPoissonProb);
+    poissonProbGoodStripsVsStripNumber[subdetid - 2]->Fill(strip_number, logPoissonProb);
+    nHitsGoodStripsVsStripNumber[0]->Fill(strip_number, stripHits);
+    nHitsGoodStripsVsStripNumber[subdetid - 2]->Fill(strip_number, stripHits);
+  }
 }
diff --git a/CalibTracker/SiStripQuality/src/SiStripHotStripAlgorithmFromClusterOccupancy.cc b/CalibTracker/SiStripQuality/src/SiStripHotStripAlgorithmFromClusterOccupancy.cc
index e15929cf745a7..cb4cb88e5bb2e 100644
--- a/CalibTracker/SiStripQuality/src/SiStripHotStripAlgorithmFromClusterOccupancy.cc
+++ b/CalibTracker/SiStripQuality/src/SiStripHotStripAlgorithmFromClusterOccupancy.cc
@@ -1,310 +1,329 @@
 #include "CalibTracker/SiStripQuality/interface/SiStripHotStripAlgorithmFromClusterOccupancy.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 
-
-
-
-SiStripHotStripAlgorithmFromClusterOccupancy::SiStripHotStripAlgorithmFromClusterOccupancy(const edm::ParameterSet& iConfig, const TrackerTopology* theTopo):
-    prob_(1.E-7),
-    ratio_(1.5),
-    MinNumEntries_(0),
-    MinNumEntriesPerStrip_(0),
-    Nevents_(0),
-    occupancy_(0),
-    OutFileName_("Occupancy.root"),
-    tTopo(theTopo),
-    UseInputDB_(iConfig.getUntrackedParameter<bool>("UseInputDB",false))
-  {  
-    minNevents_=Nevents_*occupancy_;
-  }
-
-
-SiStripHotStripAlgorithmFromClusterOccupancy::~SiStripHotStripAlgorithmFromClusterOccupancy(){
-  LogTrace("SiStripHotStripAlgorithmFromClusterOccupancy")<<"[SiStripHotStripAlgorithmFromClusterOccupancy::~SiStripHotStripAlgorithmFromClusterOccupancy] "<<std::endl;
+SiStripHotStripAlgorithmFromClusterOccupancy::SiStripHotStripAlgorithmFromClusterOccupancy(
+    const edm::ParameterSet& iConfig, const TrackerTopology* theTopo)
+    : prob_(1.E-7),
+      ratio_(1.5),
+      MinNumEntries_(0),
+      MinNumEntriesPerStrip_(0),
+      Nevents_(0),
+      occupancy_(0),
+      OutFileName_("Occupancy.root"),
+      tTopo(theTopo),
+      UseInputDB_(iConfig.getUntrackedParameter<bool>("UseInputDB", false)) {
+  minNevents_ = Nevents_ * occupancy_;
 }
 
-void SiStripHotStripAlgorithmFromClusterOccupancy::extractBadStrips(SiStripQuality* OutSiStripQuality,HistoMap& DM,edm::ESHandle<SiStripQuality>& InSiStripQuality){
-
-  LogTrace("SiStripHotStripAlgorithmFromClusterOccupancy")<<"[SiStripHotStripAlgorithmFromClusterOccupancy::extractBadStrips] "<<std::endl;
-
-
-  
-  if (WriteOutputFile_==true){
-  f = new TFile(OutFileName_.c_str(),"RECREATE");
-  f->cd();
-
-  striptree = new TTree("stripOccupancy","tree");
-
-  striptree->Branch("DetRawId",             &detrawid,          "DetRawId/I");
-  striptree->Branch("SubDetId",             &subdetid,          "SubDetId/I");
-  striptree->Branch("Layer_Ring",           &layer_ring,        "Layer_Ring/I");
-  striptree->Branch("Disc",                 &disc,              "Disc/I");
-  striptree->Branch("IsBack",               &isback,            "IsBack/I");
-  striptree->Branch("IsExternalString",     &isexternalstring,  "IsExternalString/I");
-  striptree->Branch("IsZMinusSide",         &iszminusside,      "IsZMinusSide/I");
-  striptree->Branch("RodStringPetal",       &rodstringpetal,    "RodStringPetal/I");
-  striptree->Branch("IsStereo",             &isstereo,          "IsStereo/I");
-  striptree->Branch("ModulePosition",       &module_position,   "ModulePosition/I");
-  striptree->Branch("NumberOfStrips",       &number_strips,     "NumberOfStrips/I");
-  striptree->Branch("StripNumber",          &strip_number,      "StripNumber/I");
-  striptree->Branch("APVChannel",           &apv_channel,       "APVChannel/I");
-  striptree->Branch("StripGlobalPositionX", &global_position_x, "StripGlobalPositionX/F");
-  striptree->Branch("StripGlobalPositionY", &global_position_y, "StripGlobalPositionY/F");
-  striptree->Branch("StripGlobalPositionZ", &global_position_z, "StripGlobalPositionZ/F");
-  striptree->Branch("IsHot",                &isHot,             "IsHot/I");
-  striptree->Branch("HotStripsPerAPV",      &hotStripsPerAPV,   "HotStripsPerAPV/I");
-  striptree->Branch("HotStripsPerModule",   &hotStripsPerModule,"HotStripsPerModule/I");
-  striptree->Branch("StripOccupancy",       &stripOccupancy,    "StripOccupancy/D");
-  striptree->Branch("StripHits",            &stripHits,         "StripHits/I");
-  striptree->Branch("PoissonProb",          &poissonProb,       "PoissonProb/D");
-  striptree->Branch("MedianAPVHits",        &medianAPVHits,     "MedianAPVHits/D");
-  striptree->Branch("AvgAPVHits",           &avgAPVHits,        "AvgAPVHits/D");
+SiStripHotStripAlgorithmFromClusterOccupancy::~SiStripHotStripAlgorithmFromClusterOccupancy() {
+  LogTrace("SiStripHotStripAlgorithmFromClusterOccupancy")
+      << "[SiStripHotStripAlgorithmFromClusterOccupancy::~SiStripHotStripAlgorithmFromClusterOccupancy] " << std::endl;
 }
 
-  
-  HistoMap::iterator it=DM.begin();
-  HistoMap::iterator itEnd=DM.end();
+void SiStripHotStripAlgorithmFromClusterOccupancy::extractBadStrips(SiStripQuality* OutSiStripQuality,
+                                                                    HistoMap& DM,
+                                                                    edm::ESHandle<SiStripQuality>& InSiStripQuality) {
+  LogTrace("SiStripHotStripAlgorithmFromClusterOccupancy")
+      << "[SiStripHotStripAlgorithmFromClusterOccupancy::extractBadStrips] " << std::endl;
+
+  if (WriteOutputFile_ == true) {
+    f = new TFile(OutFileName_.c_str(), "RECREATE");
+    f->cd();
+
+    striptree = new TTree("stripOccupancy", "tree");
+
+    striptree->Branch("DetRawId", &detrawid, "DetRawId/I");
+    striptree->Branch("SubDetId", &subdetid, "SubDetId/I");
+    striptree->Branch("Layer_Ring", &layer_ring, "Layer_Ring/I");
+    striptree->Branch("Disc", &disc, "Disc/I");
+    striptree->Branch("IsBack", &isback, "IsBack/I");
+    striptree->Branch("IsExternalString", &isexternalstring, "IsExternalString/I");
+    striptree->Branch("IsZMinusSide", &iszminusside, "IsZMinusSide/I");
+    striptree->Branch("RodStringPetal", &rodstringpetal, "RodStringPetal/I");
+    striptree->Branch("IsStereo", &isstereo, "IsStereo/I");
+    striptree->Branch("ModulePosition", &module_position, "ModulePosition/I");
+    striptree->Branch("NumberOfStrips", &number_strips, "NumberOfStrips/I");
+    striptree->Branch("StripNumber", &strip_number, "StripNumber/I");
+    striptree->Branch("APVChannel", &apv_channel, "APVChannel/I");
+    striptree->Branch("StripGlobalPositionX", &global_position_x, "StripGlobalPositionX/F");
+    striptree->Branch("StripGlobalPositionY", &global_position_y, "StripGlobalPositionY/F");
+    striptree->Branch("StripGlobalPositionZ", &global_position_z, "StripGlobalPositionZ/F");
+    striptree->Branch("IsHot", &isHot, "IsHot/I");
+    striptree->Branch("HotStripsPerAPV", &hotStripsPerAPV, "HotStripsPerAPV/I");
+    striptree->Branch("HotStripsPerModule", &hotStripsPerModule, "HotStripsPerModule/I");
+    striptree->Branch("StripOccupancy", &stripOccupancy, "StripOccupancy/D");
+    striptree->Branch("StripHits", &stripHits, "StripHits/I");
+    striptree->Branch("PoissonProb", &poissonProb, "PoissonProb/D");
+    striptree->Branch("MedianAPVHits", &medianAPVHits, "MedianAPVHits/D");
+    striptree->Branch("AvgAPVHits", &avgAPVHits, "AvgAPVHits/D");
+  }
+
+  HistoMap::iterator it = DM.begin();
+  HistoMap::iterator itEnd = DM.end();
   std::vector<unsigned int> badStripList;
   uint32_t detid;
-  for (;it!=itEnd;++it){
+  for (; it != itEnd; ++it) {
     pHisto phisto;
-    detid=it->first;
+    detid = it->first;
+
+    DetId detectorId = DetId(detid);
+    phisto._SubdetId = detectorId.subdetId();
 
-    DetId detectorId=DetId(detid);
-    phisto._SubdetId=detectorId.subdetId();
-    
     if (edm::isDebugEnabled())
-      LogTrace("SiStripHotStrip") << "Analyzing detid " << detid<< std::endl;
-    
-    int numberAPVs = (int)(it->second.get())->GetNbinsX()/128;
+      LogTrace("SiStripHotStrip") << "Analyzing detid " << detid << std::endl;
+
+    int numberAPVs = (int)(it->second.get())->GetNbinsX() / 128;
 
     // Set the values for the tree:
 
     detrawid = detid;
     subdetid = detectorId.subdetId();
     number_strips = (int)(it->second.get())->GetNbinsX();
-    switch (detectorId.subdetId())
-      {
-      case StripSubdetector::TIB :
-	layer_ring = tTopo->tibLayer(detrawid);
-	disc       = -1;
-	isstereo = tTopo->tibIsStereo(detrawid);
-	isback     = -1;
-	if (tTopo->tibIsExternalString(detrawid)) isexternalstring = 1;
-	else                                       isexternalstring = 0;
-	if (tTopo->tibIsZMinusSide(detrawid)) iszminusside = 1;
-	else                                   iszminusside = 0;
-	rodstringpetal  = tTopo->tibString(detrawid);
-	module_position = tTopo->tibModule(detrawid);
-	break;
-
-      case StripSubdetector::TID :
-	layer_ring = tTopo->tidRing(detrawid);
-	disc       = tTopo->tidWheel(detrawid);
-	isstereo = tTopo->tidIsStereo(detrawid);
-	if (tTopo->tidIsBackRing(detrawid)) isback = 1;
-	else                                 isback = 0;
-	if (tTopo->tidIsZMinusSide(detrawid)) iszminusside = 1;
-	else                                   iszminusside = 0;
-	isexternalstring = -1;
-	rodstringpetal   = -1;
-	module_position  = tTopo->tidModule(detrawid);
-	break;
-
-      case StripSubdetector::TOB :
-	layer_ring = tTopo->tobLayer(detrawid);
-	disc       = -1;
-	isstereo = tTopo->tobIsStereo(detrawid);
-	isback     = -1;
-	if (tTopo->tobIsZMinusSide(detrawid)) iszminusside = 1;
-	else                                   iszminusside = 0;
-	isexternalstring = -1;
-	rodstringpetal   = tTopo->tobRod(detrawid);
-	module_position  = tTopo->tobModule(detrawid);
-	break;
-
-      case StripSubdetector::TEC :
-	layer_ring = tTopo->tecRing(detrawid);
-	disc       = tTopo->tecWheel(detrawid);
-	isstereo = tTopo->tecIsStereo(detrawid);
-	if (tTopo->tecIsBackPetal(detrawid)) isback = 1;
-	else                                  isback = 0;
-	if (tTopo->tecIsZMinusSide(detrawid)) iszminusside = 1;
-	else                                   iszminusside = 0;
-	isexternalstring = -1;
-	rodstringpetal   = tTopo->tecPetalNumber(detrawid);
-	module_position  = tTopo->tecModule(detrawid);
-	break;
-
-      default :
-	std::cout << "### Detector does not belong to TIB, TID, TOB or TEC !? ###" << std::endl;
-	std::cout << "### DetRawId: " << detrawid << " ###" << std::endl;
-      }
+    switch (detectorId.subdetId()) {
+      case StripSubdetector::TIB:
+        layer_ring = tTopo->tibLayer(detrawid);
+        disc = -1;
+        isstereo = tTopo->tibIsStereo(detrawid);
+        isback = -1;
+        if (tTopo->tibIsExternalString(detrawid))
+          isexternalstring = 1;
+        else
+          isexternalstring = 0;
+        if (tTopo->tibIsZMinusSide(detrawid))
+          iszminusside = 1;
+        else
+          iszminusside = 0;
+        rodstringpetal = tTopo->tibString(detrawid);
+        module_position = tTopo->tibModule(detrawid);
+        break;
+
+      case StripSubdetector::TID:
+        layer_ring = tTopo->tidRing(detrawid);
+        disc = tTopo->tidWheel(detrawid);
+        isstereo = tTopo->tidIsStereo(detrawid);
+        if (tTopo->tidIsBackRing(detrawid))
+          isback = 1;
+        else
+          isback = 0;
+        if (tTopo->tidIsZMinusSide(detrawid))
+          iszminusside = 1;
+        else
+          iszminusside = 0;
+        isexternalstring = -1;
+        rodstringpetal = -1;
+        module_position = tTopo->tidModule(detrawid);
+        break;
+
+      case StripSubdetector::TOB:
+        layer_ring = tTopo->tobLayer(detrawid);
+        disc = -1;
+        isstereo = tTopo->tobIsStereo(detrawid);
+        isback = -1;
+        if (tTopo->tobIsZMinusSide(detrawid))
+          iszminusside = 1;
+        else
+          iszminusside = 0;
+        isexternalstring = -1;
+        rodstringpetal = tTopo->tobRod(detrawid);
+        module_position = tTopo->tobModule(detrawid);
+        break;
+
+      case StripSubdetector::TEC:
+        layer_ring = tTopo->tecRing(detrawid);
+        disc = tTopo->tecWheel(detrawid);
+        isstereo = tTopo->tecIsStereo(detrawid);
+        if (tTopo->tecIsBackPetal(detrawid))
+          isback = 1;
+        else
+          isback = 0;
+        if (tTopo->tecIsZMinusSide(detrawid))
+          iszminusside = 1;
+        else
+          iszminusside = 0;
+        isexternalstring = -1;
+        rodstringpetal = tTopo->tecPetalNumber(detrawid);
+        module_position = tTopo->tecModule(detrawid);
+        break;
+
+      default:
+        std::cout << "### Detector does not belong to TIB, TID, TOB or TEC !? ###" << std::endl;
+        std::cout << "### DetRawId: " << detrawid << " ###" << std::endl;
+    }
 
     // End: Set the values for the tree.
 
-
-    pQuality=OutSiStripQuality;
+    pQuality = OutSiStripQuality;
     badStripList.clear();
 
-    for (int i=0; i<768; i++){
-      ishot[i]               = 0;
-      stripoccupancy[i]      = 0;
-      striphits[i]           = 0;
-      poissonprob[i]         = 0;
-      hotstripsperapv[i/128] = 0;
-	}
+    for (int i = 0; i < 768; i++) {
+      ishot[i] = 0;
+      stripoccupancy[i] = 0;
+      striphits[i] = 0;
+      poissonprob[i] = 0;
+      hotstripsperapv[i / 128] = 0;
+    }
 
     hotstripspermodule = 0;
 
-    for (int apv=0; apv<numberAPVs; apv++){
-      if(UseInputDB_){
-	if(InSiStripQuality->IsApvBad(detid,apv) ){
-	  if(edm::isDebugEnabled())
-	    LogTrace("SiStripHotStrip")<<"(Module and Apv number) "<<detid<<" , "<<apv<<" excluded by input ESetup."<<std::endl;
-	  continue;//if the apv is already flagged as bad, continue.
-	}
-	else{
-	  if(edm::isDebugEnabled())
-	    LogTrace("SiStripHotStrip")<<"(Module and Apv number) "<<detid<<" , "<<apv<<" good by input ESetup."<<std::endl;
-	}
+    for (int apv = 0; apv < numberAPVs; apv++) {
+      if (UseInputDB_) {
+        if (InSiStripQuality->IsApvBad(detid, apv)) {
+          if (edm::isDebugEnabled())
+            LogTrace("SiStripHotStrip") << "(Module and Apv number) " << detid << " , " << apv
+                                        << " excluded by input ESetup." << std::endl;
+          continue;  //if the apv is already flagged as bad, continue.
+        } else {
+          if (edm::isDebugEnabled())
+            LogTrace("SiStripHotStrip") << "(Module and Apv number) " << detid << " , " << apv
+                                        << " good by input ESetup." << std::endl;
+        }
       }
 
-      phisto._th1f = new TH1F("tmp","tmp",128,0.5,128.5);
-      int NumberEntriesPerAPV=0;
-      
-      for (int strip=0; strip<128; strip++){
-	phisto._th1f->SetBinContent(strip+1,(it->second.get())->GetBinContent((apv*128)+strip+1));
-	NumberEntriesPerAPV += (int)(it->second.get())->GetBinContent((apv*128)+strip+1);
+      phisto._th1f = new TH1F("tmp", "tmp", 128, 0.5, 128.5);
+      int NumberEntriesPerAPV = 0;
+
+      for (int strip = 0; strip < 128; strip++) {
+        phisto._th1f->SetBinContent(strip + 1, (it->second.get())->GetBinContent((apv * 128) + strip + 1));
+        NumberEntriesPerAPV += (int)(it->second.get())->GetBinContent((apv * 128) + strip + 1);
       }
 
       phisto._th1f->SetEntries(NumberEntriesPerAPV);
-      phisto._NEntries=(int)phisto._th1f->GetEntries();
-      phisto._NEmptyBins=0;
+      phisto._NEntries = (int)phisto._th1f->GetEntries();
+      phisto._NEmptyBins = 0;
 
       LogTrace("SiStripHotStrip") << "Number of clusters in APV " << apv << ": " << NumberEntriesPerAPV << std::endl;
 
-      iterativeSearch(phisto,badStripList,apv);
+      iterativeSearch(phisto, badStripList, apv);
 
       delete phisto._th1f;
     }
 
-    const StripGeomDetUnit*  theStripDet = dynamic_cast<const StripGeomDetUnit*>( (TkGeom->idToDet(detectorId)) );
-    const StripTopology* theStripTopol   = dynamic_cast<const StripTopology*>( &(theStripDet->specificTopology()) );  
+    const StripGeomDetUnit* theStripDet = dynamic_cast<const StripGeomDetUnit*>((TkGeom->idToDet(detectorId)));
+    const StripTopology* theStripTopol = dynamic_cast<const StripTopology*>(&(theStripDet->specificTopology()));
 
-    for (int strip=0; strip<number_strips; strip++)
-      {
-	strip_number   = strip+1;
-	apv_channel    = (strip%128)+1;
-	isHot          = ishot[strip];
-	stripOccupancy = stripoccupancy[strip];
-	stripHits      = striphits[strip];
-	poissonProb    = poissonprob[strip];
-	medianAPVHits  = medianapvhits[strip/128];
-	avgAPVHits     = avgapvhits[strip/128];
+    for (int strip = 0; strip < number_strips; strip++) {
+      strip_number = strip + 1;
+      apv_channel = (strip % 128) + 1;
+      isHot = ishot[strip];
+      stripOccupancy = stripoccupancy[strip];
+      stripHits = striphits[strip];
+      poissonProb = poissonprob[strip];
+      medianAPVHits = medianapvhits[strip / 128];
+      avgAPVHits = avgapvhits[strip / 128];
 
-	hotStripsPerModule = hotstripspermodule;
-	hotStripsPerAPV    = hotstripsperapv[strip/128];
+      hotStripsPerModule = hotstripspermodule;
+      hotStripsPerAPV = hotstripsperapv[strip / 128];
 
-	LocalPoint  pos_strip_local  = theStripTopol->localPosition(strip);
-	GlobalPoint pos_strip_global = (TkGeom->idToDet(detectorId))->surface().toGlobal(pos_strip_local);
+      LocalPoint pos_strip_local = theStripTopol->localPosition(strip);
+      GlobalPoint pos_strip_global = (TkGeom->idToDet(detectorId))->surface().toGlobal(pos_strip_local);
 
-	global_position_x = pos_strip_global.x();
-	global_position_y = pos_strip_global.y();
-	global_position_z = pos_strip_global.z();
+      global_position_x = pos_strip_global.x();
+      global_position_y = pos_strip_global.y();
+      global_position_z = pos_strip_global.z();
 
-	if (WriteOutputFile_==true) striptree->Fill();
-      }
+      if (WriteOutputFile_ == true)
+        striptree->Fill();
+    }
 
-    if (badStripList.begin()==badStripList.end())
+    if (badStripList.begin() == badStripList.end())
       continue;
 
-    OutSiStripQuality->compact(detid,badStripList);
+    OutSiStripQuality->compact(detid, badStripList);
 
-    SiStripQuality::Range range(badStripList.begin(),badStripList.end());
-    if ( ! OutSiStripQuality->put(detid,range) )
-      edm::LogError("SiStripHotStrip")<<"[SiStripHotStripAlgorithmFromClusterOccupancy::extractBadStrips] detid already exists"<<std::endl;
+    SiStripQuality::Range range(badStripList.begin(), badStripList.end());
+    if (!OutSiStripQuality->put(detid, range))
+      edm::LogError("SiStripHotStrip")
+          << "[SiStripHotStripAlgorithmFromClusterOccupancy::extractBadStrips] detid already exists" << std::endl;
   }
   OutSiStripQuality->fillBadComponents();
 
-  if (WriteOutputFile_==true){
-  f->cd();
-  striptree->Write();
-  f->Close();
+  if (WriteOutputFile_ == true) {
+    f->cd();
+    striptree->Write();
+    f->Close();
   }
 
   LogTrace("SiStripHotStrip") << ss.str() << std::endl;
 }
 
-  
-void SiStripHotStripAlgorithmFromClusterOccupancy::iterativeSearch(pHisto& histo,std::vector<unsigned int>& vect, int apv){
-  if (!histo._NEntries || histo._NEntries <=MinNumEntries_ || histo._NEntries <= minNevents_)
+void SiStripHotStripAlgorithmFromClusterOccupancy::iterativeSearch(pHisto& histo,
+                                                                   std::vector<unsigned int>& vect,
+                                                                   int apv) {
+  if (!histo._NEntries || histo._NEntries <= MinNumEntries_ || histo._NEntries <= minNevents_)
     return;
-  
-  size_t startingSize=vect.size();
-  long double diff=1.-prob_; 
-  
-  size_t Nbins     = histo._th1f->GetNbinsX();
-  size_t ibinStart = 1; 
-  size_t ibinStop  = Nbins+1; 
-  int MaxEntry  = (int)histo._th1f->GetMaximum();
-
-  std::vector<long double> vPoissonProbs(MaxEntry+1,0);
-  long double meanVal=1.*histo._NEntries/(1.*Nbins-histo._NEmptyBins); 
-  evaluatePoissonian(vPoissonProbs,meanVal);
+
+  size_t startingSize = vect.size();
+  long double diff = 1. - prob_;
+
+  size_t Nbins = histo._th1f->GetNbinsX();
+  size_t ibinStart = 1;
+  size_t ibinStop = Nbins + 1;
+  int MaxEntry = (int)histo._th1f->GetMaximum();
+
+  std::vector<long double> vPoissonProbs(MaxEntry + 1, 0);
+  long double meanVal = 1. * histo._NEntries / (1. * Nbins - histo._NEmptyBins);
+  evaluatePoissonian(vPoissonProbs, meanVal);
 
   // Find median occupancy, taking into account only good strips
   unsigned int goodstripentries[128];
   int nGoodStrips = 0;
-  for (size_t i=ibinStart; i<ibinStop; ++i){
-    if (ishot[(apv*128)+i-1]==0){
+  for (size_t i = ibinStart; i < ibinStop; ++i) {
+    if (ishot[(apv * 128) + i - 1] == 0) {
       goodstripentries[nGoodStrips] = (unsigned int)histo._th1f->GetBinContent(i);
       nGoodStrips++;
     }
   }
-  double median = TMath::Median(nGoodStrips,goodstripentries);
+  double median = TMath::Median(nGoodStrips, goodstripentries);
 
-  for (size_t i=ibinStart; i<ibinStop; ++i){
-    unsigned int entries= (unsigned int)histo._th1f->GetBinContent(i);
+  for (size_t i = ibinStart; i < ibinStop; ++i) {
+    unsigned int entries = (unsigned int)histo._th1f->GetBinContent(i);
 
-    if (ishot[(apv*128)+i-1]==0){
-      stripoccupancy[(apv*128)+i-1] = entries/(double) Nevents_;
-      striphits[(apv*128)+i-1]      = entries;
-      poissonprob[(apv*128)+i-1]    = 1-vPoissonProbs[entries];
-      medianapvhits[apv]  = median;
+    if (ishot[(apv * 128) + i - 1] == 0) {
+      stripoccupancy[(apv * 128) + i - 1] = entries / (double)Nevents_;
+      striphits[(apv * 128) + i - 1] = entries;
+      poissonprob[(apv * 128) + i - 1] = 1 - vPoissonProbs[entries];
+      medianapvhits[apv] = median;
       avgapvhits[apv] = meanVal;
     }
-    if (entries<=MinNumEntriesPerStrip_ || entries <= minNevents_ || entries / median < ratio_) continue;
+    if (entries <= MinNumEntriesPerStrip_ || entries <= minNevents_ || entries / median < ratio_)
+      continue;
 
-    if(diff<vPoissonProbs[entries]){
-      ishot[(apv*128)+i-1] = 1;
+    if (diff < vPoissonProbs[entries]) {
+      ishot[(apv * 128) + i - 1] = 1;
       hotstripspermodule++;
       hotstripsperapv[apv]++;
-      histo._th1f->SetBinContent(i,0.);
-      histo._NEntries-=entries;
+      histo._th1f->SetBinContent(i, 0.);
+      histo._NEntries -= entries;
       histo._NEmptyBins++;
       if (edm::isDebugEnabled())
-	LogTrace("SiStripHotStrip")<< " rejecting strip " << (apv*128)+i-1 << " value " << entries << " diff  " << diff << " prob " << vPoissonProbs[entries]<< std::endl;
-      vect.push_back(pQuality->encode((apv*128)+i-1,1,0));
+        LogTrace("SiStripHotStrip") << " rejecting strip " << (apv * 128) + i - 1 << " value " << entries << " diff  "
+                                    << diff << " prob " << vPoissonProbs[entries] << std::endl;
+      vect.push_back(pQuality->encode((apv * 128) + i - 1, 1, 0));
     }
-
   }
   if (edm::isDebugEnabled())
-    LogTrace("SiStripHotStrip") << " [SiStripHotStripAlgorithmFromClusterOccupancy::iterativeSearch] Nbins="<< Nbins << " MaxEntry="<<MaxEntry << " meanVal=" << meanVal << " NEmptyBins="<<histo._NEmptyBins<< " NEntries=" << histo._NEntries << " thEntries " << histo._th1f->GetEntries()<< " startingSize " << startingSize << " vector.size " << vect.size() << std::endl;
-
-  if (vect.size()!=startingSize)
-    iterativeSearch(histo,vect,apv);
+    LogTrace("SiStripHotStrip") << " [SiStripHotStripAlgorithmFromClusterOccupancy::iterativeSearch] Nbins=" << Nbins
+                                << " MaxEntry=" << MaxEntry << " meanVal=" << meanVal
+                                << " NEmptyBins=" << histo._NEmptyBins << " NEntries=" << histo._NEntries
+                                << " thEntries " << histo._th1f->GetEntries() << " startingSize " << startingSize
+                                << " vector.size " << vect.size() << std::endl;
+
+  if (vect.size() != startingSize)
+    iterativeSearch(histo, vect, apv);
 }
 
-void SiStripHotStripAlgorithmFromClusterOccupancy::evaluatePoissonian(std::vector<long double>& vPoissonProbs, long double& meanVal){
-  for(size_t i=0;i<vPoissonProbs.size();++i){
-    vPoissonProbs[i]= (i==0)?TMath::Poisson(i,meanVal):vPoissonProbs[i-1]+TMath::Poisson(i,meanVal);
+void SiStripHotStripAlgorithmFromClusterOccupancy::evaluatePoissonian(std::vector<long double>& vPoissonProbs,
+                                                                      long double& meanVal) {
+  for (size_t i = 0; i < vPoissonProbs.size(); ++i) {
+    vPoissonProbs[i] = (i == 0) ? TMath::Poisson(i, meanVal) : vPoissonProbs[i - 1] + TMath::Poisson(i, meanVal);
   }
 }
 
-void SiStripHotStripAlgorithmFromClusterOccupancy::setNumberOfEvents(double Nevents){
-  Nevents_=Nevents;
-  minNevents_=occupancy_*Nevents_; 
-  if (edm::isDebugEnabled())                                                                                                                                                                          
-    LogTrace("SiStripHotStrip")<<" [SiStripHotStripAlgorithmFromClusterOccupancy::setNumberOfEvents] minNumber of Events per strip used to consider a strip bad" << minNevents_ << " for occupancy " << occupancy_ << std::endl;
+void SiStripHotStripAlgorithmFromClusterOccupancy::setNumberOfEvents(double Nevents) {
+  Nevents_ = Nevents;
+  minNevents_ = occupancy_ * Nevents_;
+  if (edm::isDebugEnabled())
+    LogTrace("SiStripHotStrip") << " [SiStripHotStripAlgorithmFromClusterOccupancy::setNumberOfEvents] minNumber of "
+                                   "Events per strip used to consider a strip bad"
+                                << minNevents_ << " for occupancy " << occupancy_ << std::endl;
 }
diff --git a/CalibTracker/StandaloneTrackerTopology/interface/StandaloneTrackerTopology.h b/CalibTracker/StandaloneTrackerTopology/interface/StandaloneTrackerTopology.h
index a749077c3469e..839dceab12f84 100644
--- a/CalibTracker/StandaloneTrackerTopology/interface/StandaloneTrackerTopology.h
+++ b/CalibTracker/StandaloneTrackerTopology/interface/StandaloneTrackerTopology.h
@@ -21,6 +21,6 @@ namespace StandaloneTrackerTopology {
    * edm::EventSetup (e.g. ROOT macros).
    */
   TrackerTopology fromTrackerParametersXMLString(const std::string& xmlContent);
-};
+};  // namespace StandaloneTrackerTopology
 
-#endif // TRACKER_TOPOLOGY_STANDALONE_H
+#endif  // TRACKER_TOPOLOGY_STANDALONE_H
diff --git a/CalibTracker/StandaloneTrackerTopology/src/StandaloneTrackerTopology.cc b/CalibTracker/StandaloneTrackerTopology/src/StandaloneTrackerTopology.cc
index 2a1dfe40da3d7..1b509b14eb34d 100644
--- a/CalibTracker/StandaloneTrackerTopology/src/StandaloneTrackerTopology.cc
+++ b/CalibTracker/StandaloneTrackerTopology/src/StandaloneTrackerTopology.cc
@@ -5,11 +5,10 @@
 
 namespace {
   // split into tokens and convert them to uint32_t
-  inline std::vector<uint32_t> split_string_to_uints(const std::string& str)
-  {
+  inline std::vector<uint32_t> split_string_to_uints(const std::string& str) {
     std::vector<uint32_t> out{};
     std::size_t iStart{str.find_first_not_of(" ,\n")}, iEnd{};
-    while ( std::string::npos != iStart ) {
+    while (std::string::npos != iStart) {
       iEnd = str.find_first_of(" ,\n", iStart);
       out.push_back(std::stoul(str.substr(iStart, iEnd), nullptr, 0));
       iStart = str.find_first_not_of(" ,\n", iEnd);
@@ -17,176 +16,175 @@ namespace {
     return out;
   }
 
-  class TrackerTopologyExtractor : public tinyxml2::XMLVisitor
-  {
-    public:
-    bool VisitEnter(const tinyxml2::XMLElement& elem, const tinyxml2::XMLAttribute*) override
-      {
-        if ( std::strcmp(elem.Value(), "Vector") == 0 ) {
-          const std::string att_type{elem.Attribute("type")};
-          if ( att_type == "numeric" ) {
-            const std::string att_name{elem.Attribute("name")};
-            if ( 0 == att_name.compare(0, SubdetName.size(), SubdetName) ) { // starts with
-              const std::string att_nEntries{elem.Attribute("nEntries")};
-              const std::size_t nEntries = att_nEntries.empty() ? 0 : std::stoul(att_nEntries);
-              const auto vals = split_string_to_uints(elem.GetText());
-
-              if ( nEntries != vals.size() ) {
-                throw cms::Exception("StandaloneTrackerTopology",
-                    ("Problem parsing element with name '"+att_name+"': "+
-                     "'nEntries' attribute claims "+std::to_string(nEntries)+" elements, but parsed "+std::to_string(vals.size())));
-              }
-              const auto subDet = std::stoi(att_name.substr(SubdetName.size()));
-              switch (subDet) {
-                case PixelSubdetector::PixelBarrel: // layer, ladder module
-                  pxbVals_.layerStartBit_        = vals[0];
-                  pxbVals_.ladderStartBit_       = vals[1];
-                  pxbVals_.moduleStartBit_       = vals[2];
-
-                  pxbVals_.layerMask_            = vals[3];
-                  pxbVals_.ladderMask_           = vals[4];
-                  pxbVals_.moduleMask_           = vals[5];
-
-                  foundPXB = true;
-                  break;
-
-                case PixelSubdetector::PixelEndcap: // side, disk, blade, panel, module
-                  pxfVals_.sideStartBit_         = vals[0];
-                  pxfVals_.diskStartBit_         = vals[1];
-                  pxfVals_.bladeStartBit_        = vals[2];
-                  pxfVals_.panelStartBit_        = vals[3];
-                  pxfVals_.moduleStartBit_       = vals[4];
-
-                  pxfVals_.sideMask_             = vals[5];
-                  pxfVals_.diskMask_             = vals[6];
-                  pxfVals_.bladeMask_            = vals[7];
-                  pxfVals_.panelMask_            = vals[8];
-                  pxfVals_.moduleMask_           = vals[9];
-
-                  foundPXF = true;
-                  break;
-
-                case StripSubdetector::TIB: // layer, str_fw_bw, str_int_ext, str, module, ster
-                  tibVals_.layerStartBit_        = vals[ 0];
-                  tibVals_.str_fw_bwStartBit_    = vals[ 1];
-                  tibVals_.str_int_extStartBit_  = vals[ 2];
-                  tibVals_.strStartBit_          = vals[ 3];
-                  tibVals_.moduleStartBit_       = vals[ 4];
-                  tibVals_.sterStartBit_         = vals[ 5];
-
-                  tibVals_.layerMask_            = vals[ 6];
-                  tibVals_.str_fw_bwMask_        = vals[ 7];
-                  tibVals_.str_int_extMask_      = vals[ 8];
-                  tibVals_.strMask_              = vals[ 9];
-                  tibVals_.moduleMask_           = vals[10];
-                  tibVals_.sterMask_             = vals[11];
-
-                  foundTIB = true;
-                  break;
-
-                case StripSubdetector::TID: // side, wheel, ring, module_fw_bw, module, ster
-                  tidVals_.sideStartBit_         = vals[ 0];
-                  tidVals_.wheelStartBit_        = vals[ 1];
-                  tidVals_.ringStartBit_         = vals[ 2];
-                  tidVals_.module_fw_bwStartBit_ = vals[ 3];
-                  tidVals_.moduleStartBit_       = vals[ 4];
-                  tidVals_.sterStartBit_         = vals[ 5];
-
-                  tidVals_.sideMask_             = vals[ 6];
-                  tidVals_.wheelMask_            = vals[ 7];
-                  tidVals_.ringMask_             = vals[ 8];
-                  tidVals_.module_fw_bwMask_     = vals[ 9];
-                  tidVals_.moduleMask_           = vals[10];
-                  tidVals_.sterMask_             = vals[11];
-
-                  foundTID = true;
-                  break;
-
-                case StripSubdetector::TOB: // layer, rod_fw_bw, rod, module, ster
-                  tobVals_.layerStartBit_        = vals[0];
-                  tobVals_.rod_fw_bwStartBit_    = vals[1];
-                  tobVals_.rodStartBit_          = vals[2];
-                  tobVals_.moduleStartBit_       = vals[3];
-                  tobVals_.sterStartBit_         = vals[4];
-
-                  tobVals_.layerMask_            = vals[5];
-                  tobVals_.rod_fw_bwMask_        = vals[6];
-                  tobVals_.rodMask_              = vals[7];
-                  tobVals_.moduleMask_           = vals[8];
-                  tobVals_.sterMask_             = vals[9];
-
-                  foundTOB = true;
-                  break;
-
-                case StripSubdetector::TEC: // side, wheel, petal_fw_bw, petal, ring, module, ster
-                  tecVals_.sideStartBit_        = vals[ 0];
-                  tecVals_.wheelStartBit_       = vals[ 1];
-                  tecVals_.petal_fw_bwStartBit_ = vals[ 2];
-                  tecVals_.petalStartBit_       = vals[ 3];
-                  tecVals_.ringStartBit_        = vals[ 4];
-                  tecVals_.moduleStartBit_      = vals[ 5];
-                  tecVals_.sterStartBit_        = vals[ 6];
-
-                  tecVals_.sideMask_            = vals[ 7];
-                  tecVals_.wheelMask_           = vals[ 8];
-                  tecVals_.petal_fw_bwMask_     = vals[ 9];
-                  tecVals_.petalMask_           = vals[10];
-                  tecVals_.ringMask_            = vals[11];
-                  tecVals_.moduleMask_          = vals[12];
-                  tecVals_.sterMask_            = vals[13];
-
-                  foundTEC = true;
-                  break;
-              }
+  class TrackerTopologyExtractor : public tinyxml2::XMLVisitor {
+  public:
+    bool VisitEnter(const tinyxml2::XMLElement& elem, const tinyxml2::XMLAttribute*) override {
+      if (std::strcmp(elem.Value(), "Vector") == 0) {
+        const std::string att_type{elem.Attribute("type")};
+        if (att_type == "numeric") {
+          const std::string att_name{elem.Attribute("name")};
+          if (0 == att_name.compare(0, SubdetName.size(), SubdetName)) {  // starts with
+            const std::string att_nEntries{elem.Attribute("nEntries")};
+            const std::size_t nEntries = att_nEntries.empty() ? 0 : std::stoul(att_nEntries);
+            const auto vals = split_string_to_uints(elem.GetText());
+
+            if (nEntries != vals.size()) {
+              throw cms::Exception(
+                  "StandaloneTrackerTopology",
+                  ("Problem parsing element with name '" + att_name + "': " + "'nEntries' attribute claims " +
+                   std::to_string(nEntries) + " elements, but parsed " + std::to_string(vals.size())));
+            }
+            const auto subDet = std::stoi(att_name.substr(SubdetName.size()));
+            switch (subDet) {
+              case PixelSubdetector::PixelBarrel:  // layer, ladder module
+                pxbVals_.layerStartBit_ = vals[0];
+                pxbVals_.ladderStartBit_ = vals[1];
+                pxbVals_.moduleStartBit_ = vals[2];
+
+                pxbVals_.layerMask_ = vals[3];
+                pxbVals_.ladderMask_ = vals[4];
+                pxbVals_.moduleMask_ = vals[5];
+
+                foundPXB = true;
+                break;
+
+              case PixelSubdetector::PixelEndcap:  // side, disk, blade, panel, module
+                pxfVals_.sideStartBit_ = vals[0];
+                pxfVals_.diskStartBit_ = vals[1];
+                pxfVals_.bladeStartBit_ = vals[2];
+                pxfVals_.panelStartBit_ = vals[3];
+                pxfVals_.moduleStartBit_ = vals[4];
+
+                pxfVals_.sideMask_ = vals[5];
+                pxfVals_.diskMask_ = vals[6];
+                pxfVals_.bladeMask_ = vals[7];
+                pxfVals_.panelMask_ = vals[8];
+                pxfVals_.moduleMask_ = vals[9];
+
+                foundPXF = true;
+                break;
+
+              case StripSubdetector::TIB:  // layer, str_fw_bw, str_int_ext, str, module, ster
+                tibVals_.layerStartBit_ = vals[0];
+                tibVals_.str_fw_bwStartBit_ = vals[1];
+                tibVals_.str_int_extStartBit_ = vals[2];
+                tibVals_.strStartBit_ = vals[3];
+                tibVals_.moduleStartBit_ = vals[4];
+                tibVals_.sterStartBit_ = vals[5];
+
+                tibVals_.layerMask_ = vals[6];
+                tibVals_.str_fw_bwMask_ = vals[7];
+                tibVals_.str_int_extMask_ = vals[8];
+                tibVals_.strMask_ = vals[9];
+                tibVals_.moduleMask_ = vals[10];
+                tibVals_.sterMask_ = vals[11];
+
+                foundTIB = true;
+                break;
+
+              case StripSubdetector::TID:  // side, wheel, ring, module_fw_bw, module, ster
+                tidVals_.sideStartBit_ = vals[0];
+                tidVals_.wheelStartBit_ = vals[1];
+                tidVals_.ringStartBit_ = vals[2];
+                tidVals_.module_fw_bwStartBit_ = vals[3];
+                tidVals_.moduleStartBit_ = vals[4];
+                tidVals_.sterStartBit_ = vals[5];
+
+                tidVals_.sideMask_ = vals[6];
+                tidVals_.wheelMask_ = vals[7];
+                tidVals_.ringMask_ = vals[8];
+                tidVals_.module_fw_bwMask_ = vals[9];
+                tidVals_.moduleMask_ = vals[10];
+                tidVals_.sterMask_ = vals[11];
+
+                foundTID = true;
+                break;
+
+              case StripSubdetector::TOB:  // layer, rod_fw_bw, rod, module, ster
+                tobVals_.layerStartBit_ = vals[0];
+                tobVals_.rod_fw_bwStartBit_ = vals[1];
+                tobVals_.rodStartBit_ = vals[2];
+                tobVals_.moduleStartBit_ = vals[3];
+                tobVals_.sterStartBit_ = vals[4];
+
+                tobVals_.layerMask_ = vals[5];
+                tobVals_.rod_fw_bwMask_ = vals[6];
+                tobVals_.rodMask_ = vals[7];
+                tobVals_.moduleMask_ = vals[8];
+                tobVals_.sterMask_ = vals[9];
+
+                foundTOB = true;
+                break;
+
+              case StripSubdetector::TEC:  // side, wheel, petal_fw_bw, petal, ring, module, ster
+                tecVals_.sideStartBit_ = vals[0];
+                tecVals_.wheelStartBit_ = vals[1];
+                tecVals_.petal_fw_bwStartBit_ = vals[2];
+                tecVals_.petalStartBit_ = vals[3];
+                tecVals_.ringStartBit_ = vals[4];
+                tecVals_.moduleStartBit_ = vals[5];
+                tecVals_.sterStartBit_ = vals[6];
+
+                tecVals_.sideMask_ = vals[7];
+                tecVals_.wheelMask_ = vals[8];
+                tecVals_.petal_fw_bwMask_ = vals[9];
+                tecVals_.petalMask_ = vals[10];
+                tecVals_.ringMask_ = vals[11];
+                tecVals_.moduleMask_ = vals[12];
+                tecVals_.sterMask_ = vals[13];
+
+                foundTEC = true;
+                break;
             }
           }
         }
-        return true;
       }
+      return true;
+    }
 
-      TrackerTopology getTrackerTopology() const
-      {
-        if ( ! ( foundPXB && foundPXF && foundTIB && foundTID && foundTOB && foundTEC ) ) {
-          throw cms::Exception("StandaloneTrackerTopology", "Could not find parameters for all tracker subdetectors");
-        }
-        return TrackerTopology(pxbVals_, pxfVals_, tecVals_, tibVals_, tidVals_, tobVals_);
+    TrackerTopology getTrackerTopology() const {
+      if (!(foundPXB && foundPXF && foundTIB && foundTID && foundTOB && foundTEC)) {
+        throw cms::Exception("StandaloneTrackerTopology", "Could not find parameters for all tracker subdetectors");
       }
+      return TrackerTopology(pxbVals_, pxfVals_, tecVals_, tibVals_, tidVals_, tobVals_);
+    }
 
-    private:
-      TrackerTopology::PixelBarrelValues pxbVals_;
-      TrackerTopology::PixelEndcapValues pxfVals_;
-      TrackerTopology::TIBValues tibVals_;
-      TrackerTopology::TIDValues tidVals_;
-      TrackerTopology::TOBValues tobVals_;
-      TrackerTopology::TECValues tecVals_;
+  private:
+    TrackerTopology::PixelBarrelValues pxbVals_;
+    TrackerTopology::PixelEndcapValues pxfVals_;
+    TrackerTopology::TIBValues tibVals_;
+    TrackerTopology::TIDValues tidVals_;
+    TrackerTopology::TOBValues tobVals_;
+    TrackerTopology::TECValues tecVals_;
 
-      bool foundPXB = false, foundPXF = false, foundTIB = false, foundTID = false, foundTOB = false, foundTEC = false;
+    bool foundPXB = false, foundPXF = false, foundTIB = false, foundTID = false, foundTOB = false, foundTEC = false;
 
-      const std::string SubdetName = "Subdetector";
+    const std::string SubdetName = "Subdetector";
   };
-}
+}  // namespace
 
 namespace StandaloneTrackerTopology {
-TrackerTopology fromTrackerParametersXMLFile( const std::string& xmlFileName ) {
-  tinyxml2::XMLDocument xmlDoc;
-  xmlDoc.LoadFile(xmlFileName.c_str());
-  if ( ! xmlDoc.Error() ) {
-    TrackerTopologyExtractor extr{};
-    xmlDoc.Accept(&extr);
-    return extr.getTrackerTopology();
-  } else {
-    throw cms::Exception("StandaloneTrackerTopology", std::string{"Failed to parse file "}+xmlFileName+": "+xmlDoc.ErrorStr());
+  TrackerTopology fromTrackerParametersXMLFile(const std::string& xmlFileName) {
+    tinyxml2::XMLDocument xmlDoc;
+    xmlDoc.LoadFile(xmlFileName.c_str());
+    if (!xmlDoc.Error()) {
+      TrackerTopologyExtractor extr{};
+      xmlDoc.Accept(&extr);
+      return extr.getTrackerTopology();
+    } else {
+      throw cms::Exception("StandaloneTrackerTopology",
+                           std::string{"Failed to parse file "} + xmlFileName + ": " + xmlDoc.ErrorStr());
+    }
   }
-}
-TrackerTopology fromTrackerParametersXMLString( const std::string& xmlContent ) {
-  tinyxml2::XMLDocument xmlDoc;
-  xmlDoc.Parse(xmlContent.c_str());
-  if ( ! xmlDoc.Error() ) {
-    TrackerTopologyExtractor extr{};
-    xmlDoc.Accept(&extr);
-    return extr.getTrackerTopology();
-  } else {
-    throw cms::Exception("StandaloneTrackerTopology", std::string{"Error while parsing XML: "}+xmlDoc.ErrorStr());
+  TrackerTopology fromTrackerParametersXMLString(const std::string& xmlContent) {
+    tinyxml2::XMLDocument xmlDoc;
+    xmlDoc.Parse(xmlContent.c_str());
+    if (!xmlDoc.Error()) {
+      TrackerTopologyExtractor extr{};
+      xmlDoc.Accept(&extr);
+      return extr.getTrackerTopology();
+    } else {
+      throw cms::Exception("StandaloneTrackerTopology", std::string{"Error while parsing XML: "} + xmlDoc.ErrorStr());
+    }
   }
-}
-}
+}  // namespace StandaloneTrackerTopology
diff --git a/Calibration/EcalAlCaRecoProducers/plugins/AlCaElectronTracksReducer.cc b/Calibration/EcalAlCaRecoProducers/plugins/AlCaElectronTracksReducer.cc
index 377a54c96e224..af2bdb97d7248 100644
--- a/Calibration/EcalAlCaRecoProducers/plugins/AlCaElectronTracksReducer.cc
+++ b/Calibration/EcalAlCaRecoProducers/plugins/AlCaElectronTracksReducer.cc
@@ -51,11 +51,7 @@ void AlCaElectronTracksReducer::produce (edm::Event& iEvent,
 
   for (eleIt=electronCollection->begin(); eleIt!=electronCollection->end(); eleIt++) {
     // barrel
-#ifndef CMSSW42X
-    TrackRef track = (eleIt-> closestTrack() ) ;
-#else
     TrackRef track = (eleIt-> closestCtfTrackRef());
-#endif
     if(track.isNull()){
       //      edm::LogError("track") << "Track Ref not found " << eleIt->energy() << "\t" << eleIt->eta();
       continue;
diff --git a/Calibration/EcalCalibAlgos/src/Pi0FixedMassWindowCalibration.cc b/Calibration/EcalCalibAlgos/src/Pi0FixedMassWindowCalibration.cc
index 0d9cda1736062..227b3e792efe0 100755
--- a/Calibration/EcalCalibAlgos/src/Pi0FixedMassWindowCalibration.cc
+++ b/Calibration/EcalCalibAlgos/src/Pi0FixedMassWindowCalibration.cc
@@ -405,23 +405,22 @@ Pi0FixedMassWindowCalibration::duringLoop(const edm::Event& event,
   setup.get<CaloGeometryRecord>().get(geoHandle);
 
   const CaloSubdetectorGeometry *geometry_p;
-  CaloSubdetectorTopology *topology_p;
 
   std::string clustershapetag;
   geometry_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalBarrel);
-  topology_p = new EcalBarrelTopology(geoHandle);
+  EcalBarrelTopology topology{*geoHandle};
 
   const CaloSubdetectorGeometry *geometryES_p;
   geometryES_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalPreshower);
 
   /*
   reco::BasicClusterCollection clusters;
-  clusters = island_p->makeClusters(ecalRecHitBarrelCollection,geometry_p,topology_p,geometryES_p,IslandClusterAlgo::barrel);
+  clusters = island_p->makeClusters(ecalRecHitBarrelCollection,geometry_p,&topology,geometryES_p,IslandClusterAlgo::barrel);
   
   //Create associated ClusterShape objects.
   std::vector <reco::ClusterShape> ClusVec;
   for (int erg=0;erg<int(clusters.size());++erg){
-    reco::ClusterShape TestShape = shapeAlgo_.Calculate(clusters[erg],ecalRecHitBarrelCollection,geometry_p,topology_p);
+    reco::ClusterShape TestShape = shapeAlgo_.Calculate(clusters[erg],ecalRecHitBarrelCollection,geometry_p,&topology);
     ClusVec.push_back(TestShape);
   }
 
@@ -441,12 +440,12 @@ Pi0FixedMassWindowCalibration::duringLoop(const edm::Event& event,
 
   // recalibrated clusters
   reco::BasicClusterCollection clusters_recalib;
-  clusters_recalib = island_p->makeClusters(recalibEcalRecHitCollection,geometry_p,topology_p,geometryES_p,IslandClusterAlgo::barrel);
+  clusters_recalib = island_p->makeClusters(recalibEcalRecHitCollection,geometry_p,&topology,geometryES_p,IslandClusterAlgo::barrel);
   
   //Create associated ClusterShape objects.
   std::vector <reco::ClusterShape> ClusVec_recalib;
   for (int erg=0;erg<int(clusters_recalib.size());++erg){
-    reco::ClusterShape TestShape_recalib = shapeAlgo_.Calculate(clusters_recalib[erg],recalibEcalRecHitCollection,geometry_p,topology_p);
+    reco::ClusterShape TestShape_recalib = shapeAlgo_.Calculate(clusters_recalib[erg],recalibEcalRecHitCollection,geometry_p,&topology);
     ClusVec_recalib.push_back(TestShape_recalib);
   }
 
diff --git a/Calibration/EcalTBTools/interface/TB06Reco.h b/Calibration/EcalTBTools/interface/TB06Reco.h
index b0255daf7bd2d..3f63ccf6a2ce7 100644
--- a/Calibration/EcalTBTools/interface/TB06Reco.h
+++ b/Calibration/EcalTBTools/interface/TB06Reco.h
@@ -7,61 +7,59 @@
 
 #include "TObject.h"
 
-class TB06Reco : public TObject
-{
- public:
-    
+class TB06Reco : public TObject {
+public:
   /// run number
-  Int_t run ;  
+  Int_t run;
   /// event number
-  Int_t event ;
+  Int_t event;
   /// if the table is moving
-  Int_t tableIsMoving ;
+  Int_t tableIsMoving;
   /// ADC output of the S6 integrated signal
-  Int_t S6ADC ;
-  
-   /// most energetic crystal index
-  Int_t MEXTLindex ; //.ic() in CMSSW 
+  Int_t S6ADC;
+
+  /// most energetic crystal index
+  Int_t MEXTLindex;  //.ic() in CMSSW
   /// most energetic crystal eta
-  Int_t MEXTLeta ;
+  Int_t MEXTLeta;
   /// most energetic crystal phi
-  Int_t MEXTLphi ;
+  Int_t MEXTLphi;
   /// most energetic crystal energy
-  Float_t MEXTLenergy ;
+  Float_t MEXTLenergy;
   /// energy of the beam
-  Float_t beamEnergy ;
-    
+  Float_t beamEnergy;
+
   /// energy in 7x7 xtals around the most energetic one
-  Float_t localMap[7][7] ;
+  Float_t localMap[7][7];
 
   /// ECAL x coord (eta)
-  Float_t xECAL ;
+  Float_t xECAL;
   /// ECAL y coord (phi)
-  Float_t yECAL ;
+  Float_t yECAL;
   /// ECAL z coord (phi)
-  Float_t zECAL ;
+  Float_t zECAL;
   /// hodoscope x coord (eta)
-  Float_t xHodo ;
+  Float_t xHodo;
   /// hodoscope y coord (phi)
-  Float_t yHodo ;
+  Float_t yHodo;
   /// hodoscope z coord (phi)
-  Float_t zHodo ;
+  Float_t zHodo;
   /// hodoscope x slope (eta)
-  Float_t xSlopeHodo ;
+  Float_t xSlopeHodo;
   /// hodoscope y slope (eta)
-  Float_t ySlopeHodo ;
+  Float_t ySlopeHodo;
   /// hodoscope x quality (eta)
-  Float_t xQualityHodo ;
+  Float_t xQualityHodo;
   /// hodoscope y quality (eta)
-  Float_t yQualityHodo ;
+  Float_t yQualityHodo;
 
   /// conversion factor from ADC to GeV used
-  Float_t convFactor ;
+  Float_t convFactor;
 
   /// set all the values to 0
-  void reset () ;
-                                                                                      
-  ClassDef (TB06Reco,4) 
-    };
+  void reset();
+
+  ClassDef(TB06Reco, 4)
+};
 
-#endif                                   
+#endif
diff --git a/Calibration/EcalTBTools/interface/TB06RecoH2.h b/Calibration/EcalTBTools/interface/TB06RecoH2.h
index 324fe9262c52a..32e22c9123cd5 100644
--- a/Calibration/EcalTBTools/interface/TB06RecoH2.h
+++ b/Calibration/EcalTBTools/interface/TB06RecoH2.h
@@ -7,53 +7,51 @@
 
 #include "TObject.h"
 
-class TB06RecoH2 : public TObject
-{
- public:
-    
+class TB06RecoH2 : public TObject {
+public:
   /// run number
-  Int_t run ;  
+  Int_t run;
   /// event number
-  Int_t event ;
+  Int_t event;
   /// if the table is moving
-  Int_t tableIsMoving ;
+  Int_t tableIsMoving;
   /// ADC output of the S6 integrated signal
-  Int_t S6ADC ;
-  
-   /// most energetic crystal index
-  Int_t MEXTLindex ; //.ic() in CMSSW 
+  Int_t S6ADC;
+
+  /// most energetic crystal index
+  Int_t MEXTLindex;  //.ic() in CMSSW
   /// most energetic crystal eta
-  Int_t MEXTLeta ;
+  Int_t MEXTLeta;
   /// most energetic crystal phi
-  Int_t MEXTLphi ;
+  Int_t MEXTLphi;
   /// most energetic crystal energy
-  Float_t MEXTLenergy ;
+  Float_t MEXTLenergy;
   /// energy of the beam
-  Float_t beamEnergy ;
-    
+  Float_t beamEnergy;
+
   /// energy in 7x7 xtals around the most energetic one
-  Float_t localMap[7][7] ;
+  Float_t localMap[7][7];
 
   /// ECAL x coord (eta)
-  Float_t xECAL ;
+  Float_t xECAL;
   /// ECAL y coord (phi)
-  Float_t yECAL ;
+  Float_t yECAL;
   /// ECAL z coord (phi)
-  Float_t zECAL ;
+  Float_t zECAL;
   /// hodoscope x coord (eta)
-  Float_t xHodo ;
+  Float_t xHodo;
   /// hodoscope y coord (phi)
-  Float_t yHodo ;
+  Float_t yHodo;
   /// hodoscope z coord (phi)
-  Float_t zHodo ;
+  Float_t zHodo;
   /// hodoscope x slope (eta)
-  Float_t xSlopeHodo ;
+  Float_t xSlopeHodo;
   /// hodoscope y slope (eta)
-  Float_t ySlopeHodo ;
+  Float_t ySlopeHodo;
   /// hodoscope x quality (eta)
-  Float_t xQualityHodo ;
+  Float_t xQualityHodo;
   /// hodoscope y quality (eta)
-  Float_t yQualityHodo ;
+  Float_t yQualityHodo;
 
   //[Edgar]
   // Energy
@@ -61,26 +59,26 @@ class TB06RecoH2 : public TObject
   Float_t S25uncalib_;
   Float_t S49uncalib_;
   Float_t S9uncalib_;
-  //WC
+  // WC
   int wcAXo_;
-  int wcAYo_ ;
-  int wcBXo_ ;
-  int wcBYo_ ;
-  int wcCXo_ ;
-  int wcCYo_ ;
-  float xwA_ ;
-  float ywA_ ;
-  float xwB_ ;
-  float ywB_ ;
-  float xwC_ ;
-  float ywC_ ;
+  int wcAYo_;
+  int wcBXo_;
+  int wcBYo_;
+  int wcCXo_;
+  int wcCYo_;
+  float xwA_;
+  float ywA_;
+  float xwB_;
+  float ywB_;
+  float xwC_;
+  float ywC_;
   Float_t S1adc_;
   Float_t S2adc_;
   Float_t S3adc_;
   Float_t S4adc_;
   Float_t S521_;
   Float_t S528_;
-  //Muon Veto Info:
+  // Muon Veto Info:
   Float_t VM1_;
   Float_t VM2_;
   Float_t VM3_;
@@ -92,28 +90,28 @@ class TB06RecoH2 : public TObject
   Float_t VMF_;
   Float_t VMB_;
 
-  //Cherenkov
+  // Cherenkov
   Float_t CK1_;
   Float_t CK2_;
   Float_t CK3_;
-  //Beam Halo
+  // Beam Halo
   Float_t BH1_;
   Float_t BH2_;
   Float_t BH3_;
   Float_t BH4_;
-  //TOFs
+  // TOFs
   Float_t TOF1S_;
   Float_t TOF2S_;
   Float_t TOF1J_;
   Float_t TOF2J_;
 
   /// conversion factor from ADC to GeV used
-  Float_t convFactor ;
+  Float_t convFactor;
 
   /// set all the values to 0
-  void reset () ;
-                                                                                      
-  ClassDef (TB06RecoH2,4) 
-    };
+  void reset();
+
+  ClassDef(TB06RecoH2, 4)
+};
 
-#endif                                   
+#endif
diff --git a/Calibration/EcalTBTools/interface/TB06Tree.h b/Calibration/EcalTBTools/interface/TB06Tree.h
index fcdfea7f9ae20..143a8025434ac 100644
--- a/Calibration/EcalTBTools/interface/TB06Tree.h
+++ b/Calibration/EcalTBTools/interface/TB06Tree.h
@@ -6,42 +6,44 @@
 
 #include "TClonesArray.h"
 
-class TFile ;
-class TTree ;
+class TFile;
+class TTree;
 
-class G3EventProxy ;
+class G3EventProxy;
 
 class TB06Tree {
- public:
+public:
   //! ctor
-  TB06Tree (const std::string & fileName  = "TB06Tree.root", 
-	    const std::string & treeName = "Analysis") ;
+  TB06Tree(const std::string &fileName = "TB06Tree.root", const std::string &treeName = "Analysis");
   //! dtor
-  ~TB06Tree () ;
-
-  void store (const int & tableIsMoving,
-              const int & run, const int & event,
-              const int & S6adc ,
-              const double & xhodo, const double & yhodo, 
-              const double & xslope, const double & yslope, 
-              const double & xquality, const double & yquality,
-              const int & icMax,
-	            const int & ietaMax, const int & iphiMax,
-              const double & beamEnergy, 
-              const double ampl[49]) ;
-  
-  void reset (float crystal[11][21]) ;
-
-  void check () ;
-
- private:
-  
-  TFile * m_file ;
-  TTree * m_tree ;
-
-  TClonesArray * m_data ;
-  int m_dataSize ;
-  
-} ;
-
-#endif                              
+  ~TB06Tree();
+
+  void store(const int &tableIsMoving,
+             const int &run,
+             const int &event,
+             const int &S6adc,
+             const double &xhodo,
+             const double &yhodo,
+             const double &xslope,
+             const double &yslope,
+             const double &xquality,
+             const double &yquality,
+             const int &icMax,
+             const int &ietaMax,
+             const int &iphiMax,
+             const double &beamEnergy,
+             const double ampl[49]);
+
+  void reset(float crystal[11][21]);
+
+  void check();
+
+private:
+  TFile *m_file;
+  TTree *m_tree;
+
+  TClonesArray *m_data;
+  int m_dataSize;
+};
+
+#endif
diff --git a/Calibration/EcalTBTools/interface/TB06TreeH2.h b/Calibration/EcalTBTools/interface/TB06TreeH2.h
index e6a890f7056fb..41157064759b6 100644
--- a/Calibration/EcalTBTools/interface/TB06TreeH2.h
+++ b/Calibration/EcalTBTools/interface/TB06TreeH2.h
@@ -6,59 +6,81 @@
 
 #include "TClonesArray.h"
 
-class TFile ;
-class TTree ;
+class TFile;
+class TTree;
 
-class G3EventProxy ;
+class G3EventProxy;
 
 class TB06TreeH2 {
- public:
+public:
   //! ctor
-  TB06TreeH2 (const std::string & fileName  = "TB06Tree.root", 
-	    const std::string & treeName = "Analysis") ;
+  TB06TreeH2(const std::string &fileName = "TB06Tree.root", const std::string &treeName = "Analysis");
   //! dtor
-  ~TB06TreeH2 () ;
+  ~TB06TreeH2();
 
-  void store (const int & tableIsMoving,
-              const int & run, const int & event,
-              const int & S6adc ,
-              const double & xhodo, const double & yhodo, 
-              const double & xslope, const double & yslope, 
-              const double & xquality, const double & yquality,
-              const int & icMax,
-	      const int & ietaMax, const int & iphiMax,
-              const double & beamEnergy, 
-              const double ampl[49],
-	      const int &wcAXo,const int &wcAYo,
-	      const int &wcBXo,const int &wcBYo,
-	      const int &wcCXo,const int &wcCYo,
-	      const double & xwA, const double & ywA,
-	      const double & xwB, const double & ywB,
-	      const double & xwC, const double & ywC,
-	      const float &S1adc, const float &S2adc,
-	      const float &S3adc, const float &S4adc,
-	      const float &VM1,const float &VM2,const float &VM3,
-	      const float &VM4,const float &VM5,const float &VM6,
-	      const float &VM7,const float &VM8,const float &VMF,
-	      const float &VMB,
-	      const float &CK1,const float &CK2, const float &CK3,
-	      const float &BH1,const float &BH2,const float &BH3,
-	      const float &BH4,
-	      const float &TOF1S, const float &TOF2S,
-	      const float &TOF1J,const float &TOF2J);
-  
-  void reset (float crystal[11][21]) ;
+  void store(const int &tableIsMoving,
+             const int &run,
+             const int &event,
+             const int &S6adc,
+             const double &xhodo,
+             const double &yhodo,
+             const double &xslope,
+             const double &yslope,
+             const double &xquality,
+             const double &yquality,
+             const int &icMax,
+             const int &ietaMax,
+             const int &iphiMax,
+             const double &beamEnergy,
+             const double ampl[49],
+             const int &wcAXo,
+             const int &wcAYo,
+             const int &wcBXo,
+             const int &wcBYo,
+             const int &wcCXo,
+             const int &wcCYo,
+             const double &xwA,
+             const double &ywA,
+             const double &xwB,
+             const double &ywB,
+             const double &xwC,
+             const double &ywC,
+             const float &S1adc,
+             const float &S2adc,
+             const float &S3adc,
+             const float &S4adc,
+             const float &VM1,
+             const float &VM2,
+             const float &VM3,
+             const float &VM4,
+             const float &VM5,
+             const float &VM6,
+             const float &VM7,
+             const float &VM8,
+             const float &VMF,
+             const float &VMB,
+             const float &CK1,
+             const float &CK2,
+             const float &CK3,
+             const float &BH1,
+             const float &BH2,
+             const float &BH3,
+             const float &BH4,
+             const float &TOF1S,
+             const float &TOF2S,
+             const float &TOF1J,
+             const float &TOF2J);
 
-  void check () ;
+  void reset(float crystal[11][21]);
 
- private:
-  
-  TFile * m_file ;
-  TTree * m_tree ;
+  void check();
 
-  TClonesArray * m_data ;
-  int m_dataSize ;
-  
-} ;
+private:
+  TFile *m_file;
+  TTree *m_tree;
 
-#endif                              
+  TClonesArray *m_data;
+  int m_dataSize;
+};
+
+#endif
diff --git a/Calibration/EcalTBTools/src/TB06Reco.cc b/Calibration/EcalTBTools/src/TB06Reco.cc
index c3b9e37079a92..df2de002f6790 100644
--- a/Calibration/EcalTBTools/src/TB06Reco.cc
+++ b/Calibration/EcalTBTools/src/TB06Reco.cc
@@ -1,38 +1,36 @@
 #include "Calibration/EcalTBTools/interface/TB06Reco.h"
 
-/* 
-*/
+/*
+ */
 
-//FIXME ClassImp (TB06Reco)
+// FIXME ClassImp (TB06Reco)
 
-void TB06Reco::reset ()
-{
-  run = 0 ;
-  event = 0 ;
-  tableIsMoving = 0 ;
-  S6ADC = 0 ;
+void TB06Reco::reset() {
+  run = 0;
+  event = 0;
+  tableIsMoving = 0;
+  S6ADC = 0;
 
-  MEXTLindex = 0 ;
-  MEXTLeta = 0 ;
-  MEXTLphi = 0 ;
-  MEXTLenergy = 0. ;
-  beamEnergy = 0. ;
+  MEXTLindex = 0;
+  MEXTLeta = 0;
+  MEXTLphi = 0;
+  MEXTLenergy = 0.;
+  beamEnergy = 0.;
 
-  for (int eta = 0 ; eta<7 ; ++eta)
-    for (int phi = 0 ; phi<7 ; ++phi)
-      localMap[eta][phi] = 0. ;
+  for (int eta = 0; eta < 7; ++eta)
+    for (int phi = 0; phi < 7; ++phi)
+      localMap[eta][phi] = 0.;
 
-  xECAL = 0. ;
-  yECAL = 0. ;
-  zECAL = 0. ;
-  xHodo = 0. ;
-  yHodo = 0. ;
-  zHodo = 0. ;
-  xSlopeHodo = 0. ;
-  ySlopeHodo = 0. ;
-  xQualityHodo = 0. ;
-  yQualityHodo = 0. ;
+  xECAL = 0.;
+  yECAL = 0.;
+  zECAL = 0.;
+  xHodo = 0.;
+  yHodo = 0.;
+  zHodo = 0.;
+  xSlopeHodo = 0.;
+  ySlopeHodo = 0.;
+  xQualityHodo = 0.;
+  yQualityHodo = 0.;
 
-  convFactor = 0. ;
+  convFactor = 0.;
 }
-                                                                                                                                                                    
diff --git a/Calibration/EcalTBTools/src/TB06RecoH2.cc b/Calibration/EcalTBTools/src/TB06RecoH2.cc
index f1f5eaea73f27..e76862b20dfc2 100644
--- a/Calibration/EcalTBTools/src/TB06RecoH2.cc
+++ b/Calibration/EcalTBTools/src/TB06RecoH2.cc
@@ -1,42 +1,41 @@
 #include "Calibration/EcalTBTools/interface/TB06RecoH2.h"
 
-/* 
-*/
+/*
+ */
 
-//FIXME ClassImp (TB06RecoH2)
+// FIXME ClassImp (TB06RecoH2)
 
-void TB06RecoH2::reset ()
-{
-  run = 0 ;
-  event = 0 ;
-  tableIsMoving = 0 ;
-  S6ADC = 0 ;
+void TB06RecoH2::reset() {
+  run = 0;
+  event = 0;
+  tableIsMoving = 0;
+  S6ADC = 0;
 
-  MEXTLindex = 0 ;
-  MEXTLeta = 0 ;
-  MEXTLphi = 0 ;
-  MEXTLenergy = 0. ;
-  beamEnergy = 0. ;
+  MEXTLindex = 0;
+  MEXTLeta = 0;
+  MEXTLphi = 0;
+  MEXTLenergy = 0.;
+  beamEnergy = 0.;
 
-  for (int eta = 0 ; eta<7 ; ++eta)
-    for (int phi = 0 ; phi<7 ; ++phi)
-      localMap[eta][phi] = 0. ;
+  for (int eta = 0; eta < 7; ++eta)
+    for (int phi = 0; phi < 7; ++phi)
+      localMap[eta][phi] = 0.;
 
   S1uncalib_ = 0.;
   S25uncalib_ = 0.;
   S9uncalib_ = 0.;
   S49uncalib_ = 0.;
 
-  xECAL = 0. ;
-  yECAL = 0. ;
-  zECAL = 0. ;
-  xHodo = 0. ;
-  yHodo = 0. ;
-  zHodo = 0. ;
-  xSlopeHodo = 0. ;
-  ySlopeHodo = 0. ;
-  xQualityHodo = 0. ;
-  yQualityHodo = 0. ;
+  xECAL = 0.;
+  yECAL = 0.;
+  zECAL = 0.;
+  xHodo = 0.;
+  yHodo = 0.;
+  zHodo = 0.;
+  xSlopeHodo = 0.;
+  ySlopeHodo = 0.;
+  xQualityHodo = 0.;
+  yQualityHodo = 0.;
   wcAXo_ = 0;
   wcAYo_ = 0;
   wcBXo_ = 0;
@@ -73,8 +72,7 @@ void TB06RecoH2::reset ()
   TOF1S_ = -999.;
   TOF1J_ = -999.;
   TOF2S_ = -999.;
-  TOF2J_ = -999.;  
+  TOF2J_ = -999.;
 
-  convFactor = 0. ;
+  convFactor = 0.;
 }
-                                                                                                                                                                    
diff --git a/Calibration/EcalTBTools/src/TB06Tree.cc b/Calibration/EcalTBTools/src/TB06Tree.cc
index 56f607d12af49..32617f5bad3bc 100644
--- a/Calibration/EcalTBTools/src/TB06Tree.cc
+++ b/Calibration/EcalTBTools/src/TB06Tree.cc
@@ -1,101 +1,95 @@
-#include "Calibration/EcalTBTools/interface/TB06Tree.h"
-#include "TFile.h" 
-#include "TTree.h" 
 #include "Calibration/EcalTBTools/interface/TB06Reco.h"
+#include "Calibration/EcalTBTools/interface/TB06Tree.h"
+#include "TFile.h"
+#include "TTree.h"
 
 #include <iostream>
 
-
-TB06Tree::TB06Tree (const std::string & fileName, 
-		    const std::string & treeName):
-  m_file (nullptr), m_tree (nullptr), m_data (nullptr), m_dataSize (0)  
-{
-  TDirectory *dir = gDirectory ;
-  m_file = new TFile (fileName.c_str (),"RECREATE") ;
-  m_file->cd () ;
-  m_tree = new TTree (treeName.c_str(),"Analysis tree") ;
-  m_tree->SetAutoSave (10000000) ;
-  dir->cd () ;
+TB06Tree::TB06Tree(const std::string &fileName, const std::string &treeName)
+    : m_file(nullptr), m_tree(nullptr), m_data(nullptr), m_dataSize(0) {
+  TDirectory *dir = gDirectory;
+  m_file = new TFile(fileName.c_str(), "RECREATE");
+  m_file->cd();
+  m_tree = new TTree(treeName.c_str(), "Analysis tree");
+  m_tree->SetAutoSave(10000000);
+  dir->cd();
 
   //  m_tree->cd () ;
-  m_data = new TClonesArray (TB06Reco::Class (), 1) ;
-  m_data->ExpandCreateFast (1) ;
+  m_data = new TClonesArray(TB06Reco::Class(), 1);
+  m_data->ExpandCreateFast(1);
 
   //  m_tree->Branch ("EGCO", &m_data, 64000, 2) ;
-  m_tree->Branch ("TB06O", &m_data, 64000, 2) ;
-  m_tree->Print () ;
- 
+  m_tree->Branch("TB06O", &m_data, 64000, 2);
+  m_tree->Print();
 }
 
+// -------------------------------------------------------------------
 
-// -------------------------------------------------------------------      
-
-TB06Tree::~TB06Tree () 
-{
-  std::cout << "[TB06Tree][dtor] saving TTree " << m_tree->GetName ()
-            << " with " << m_tree->GetEntries () << " entries"
-            << " on file: " << m_file->GetName () << std::endl ;
+TB06Tree::~TB06Tree() {
+  std::cout << "[TB06Tree][dtor] saving TTree " << m_tree->GetName() << " with " << m_tree->GetEntries() << " entries"
+            << " on file: " << m_file->GetName() << std::endl;
 
-  m_file->Write () ;
-  delete m_tree ;
-  m_file->Close () ;
-  delete m_file ;
-  delete m_data ;
+  m_file->Write();
+  delete m_tree;
+  m_file->Close();
+  delete m_file;
+  delete m_data;
 }
 
-
-// -------------------------------------------------------------------   
+// -------------------------------------------------------------------
 
 //! to be called at each loop
-  void TB06Tree::store (const int & tableIsMoving,
-                      const int & run, const int & event,
-                      const int & S6adc ,
-                      const double & xhodo, const double & yhodo, 
-                      const double & xslope, const double & yslope, 
-                      const double & xquality, const double & yquality,
-                      const int & icMax,
-                      const int & ietaMax, const int & iphiMax,
-                      const double & beamEnergy, 
-                      const double ampl[49]) 
-{
-
-  m_data->Clear () ;
-  TB06Reco * entry = static_cast<TB06Reco*> (m_data->AddrAt (0)) ;
-
-  entry->reset () ;
+void TB06Tree::store(const int &tableIsMoving,
+                     const int &run,
+                     const int &event,
+                     const int &S6adc,
+                     const double &xhodo,
+                     const double &yhodo,
+                     const double &xslope,
+                     const double &yslope,
+                     const double &xquality,
+                     const double &yquality,
+                     const int &icMax,
+                     const int &ietaMax,
+                     const int &iphiMax,
+                     const double &beamEnergy,
+                     const double ampl[49]) {
+  m_data->Clear();
+  TB06Reco *entry = static_cast<TB06Reco *>(m_data->AddrAt(0));
+
+  entry->reset();
   //  reset (entry->myCalibrationMap) ;
 
-  entry->tableIsMoving = tableIsMoving ;
-  entry->run = run ;
-  entry->event = event ;
-  entry->S6ADC = S6adc ;
-
-  entry->MEXTLindex = icMax ;
-  entry->MEXTLeta = ietaMax ;
-  entry->MEXTLphi = iphiMax ;
-  entry->MEXTLenergy = ampl[24] ;
-  entry->beamEnergy = beamEnergy ;
-
-  for (int eta = 0 ; eta<7 ; ++eta)
-    for (int phi = 0 ; phi<7 ; ++phi)
-      {
-	// FIXME capire l'orientamento di phi!
-	// FIXME capire se eta, phi iniziano da 1 o da 0
-        entry->localMap[eta][phi] = ampl[eta*7+phi] ;
-      }
-
-  entry->xHodo = xhodo ;
-  entry->yHodo = yhodo ;
-  entry->xSlopeHodo = xslope ;
-  entry->ySlopeHodo = yslope ;
-  entry->xQualityHodo = xquality ;
-  entry->yQualityHodo = yquality ;
-
-  entry->convFactor = 0. ;
+  entry->tableIsMoving = tableIsMoving;
+  entry->run = run;
+  entry->event = event;
+  entry->S6ADC = S6adc;
+
+  entry->MEXTLindex = icMax;
+  entry->MEXTLeta = ietaMax;
+  entry->MEXTLphi = iphiMax;
+  entry->MEXTLenergy = ampl[24];
+  entry->beamEnergy = beamEnergy;
+
+  for (int eta = 0; eta < 7; ++eta)
+    for (int phi = 0; phi < 7; ++phi) {
+      // FIXME capire l'orientamento di phi!
+      // FIXME capire se eta, phi iniziano da 1 o da 0
+      entry->localMap[eta][phi] = ampl[eta * 7 + phi];
+    }
+
+  entry->xHodo = xhodo;
+  entry->yHodo = yhodo;
+  entry->xSlopeHodo = xslope;
+  entry->ySlopeHodo = yslope;
+  entry->xQualityHodo = xquality;
+  entry->yQualityHodo = yquality;
+
+  entry->convFactor = 0.;
 
   /*
   // loop over the 5x5 see (1)
-  for (int xtal=0 ; xtal<25 ; ++xtal) 
+  for (int xtal=0 ; xtal<25 ; ++xtal)
     {
       int ieta = xtal/5 + 3 ;
       int iphi = xtal%5 + 8 ;
@@ -103,62 +97,53 @@ TB06Tree::~TB06Tree ()
     } // loop over the 5x5
 
   entry->electron_Tr_Pmag_ = beamEnergy ;
-  
+
         entry->centralCrystalEta_ = ietaMax ;
         entry->centralCrystalPhi_ = iphiMax ;
-        entry->centralCrystalEnergy_ = ampl[12] ; 
+        entry->centralCrystalEnergy_ = ampl[12] ;
 
   // this is a trick
   entry->electron_Tr_Peta_ = xhodo ;
   entry->electron_Tr_Pphi_ = yhodo ;
   */
-  m_tree->Fill () ;
+  m_tree->Fill();
 }
 
-
 // -------------------------------------------------------------------
 
-
-void TB06Tree::reset (float crystal[11][21])
-{
-  for (int eta =0 ; eta<11 ; ++eta)    
-    {
-      for (int phi =0 ; phi<21 ; ++phi) 
-        {
-          crystal[eta][phi] = -999. ;  
-        }   
+void TB06Tree::reset(float crystal[11][21]) {
+  for (int eta = 0; eta < 11; ++eta) {
+    for (int phi = 0; phi < 21; ++phi) {
+      crystal[eta][phi] = -999.;
     }
+  }
 }
 
-
 // -------------------------------------------------------------------
 
-
-void TB06Tree::check ()
-{
-  TB06Reco * entry = static_cast<TB06Reco*> (m_data->AddrAt (0)) ;
-
-  std::cout << "[TB06Tree][check]reading . . . \n" ;
-  std::cout << "[TB06Tree][check] entry->run: " << entry->run << "\n" ;
-  std::cout << "[TB06Tree][check] entry->event: " << entry->event << "\n" ;
-  std::cout << "[TB06Tree][check] entry->tableIsMoving: " << entry->tableIsMoving << "\n" ;
-  std::cout << "[TB06Tree][check] entry->MEXTLeta: " << entry->MEXTLeta << "\n" ;
-  std::cout << "[TB06Tree][check] entry->MEXTLphi: " << entry->MEXTLphi << "\n" ;
-  std::cout << "[TB06Tree][check] entry->MEXTLenergy: " << entry->MEXTLenergy << "\n" ;
-
-  for (int eta = 0 ; eta<7 ; ++eta)
-      for (int phi = 0 ; phi<7 ; ++phi)
-        std::cout << "[TB06Tree][check]   entry->localMap[" << eta
-                  << "][" << phi << "]: "
-                  << entry->localMap[eta][phi] << "\n" ;
-
-  std::cout << "[TB06Tree][check] entry->xHodo: " << entry->xHodo << "\n" ;
-  std::cout << "[TB06Tree][check] entry->yHodo: " << entry->yHodo << "\n" ;
-  std::cout << "[TB06Tree][check] entry->xSlopeHodo: " << entry->xSlopeHodo << "\n" ;
-  std::cout << "[TB06Tree][check] entry->ySlopeHodo: " << entry->ySlopeHodo << "\n" ;
-  std::cout << "[TB06Tree][check] entry->xQualityHodo: " << entry->xQualityHodo << "\n" ;
-  std::cout << "[TB06Tree][check] entry->yQualityHodo: " << entry->yQualityHodo << "\n" ;
-  std::cout << "[TB06Tree][check] entry->convFactor: " << entry->convFactor << "\n" ;
+void TB06Tree::check() {
+  TB06Reco *entry = static_cast<TB06Reco *>(m_data->AddrAt(0));
+
+  std::cout << "[TB06Tree][check]reading . . . \n";
+  std::cout << "[TB06Tree][check] entry->run: " << entry->run << "\n";
+  std::cout << "[TB06Tree][check] entry->event: " << entry->event << "\n";
+  std::cout << "[TB06Tree][check] entry->tableIsMoving: " << entry->tableIsMoving << "\n";
+  std::cout << "[TB06Tree][check] entry->MEXTLeta: " << entry->MEXTLeta << "\n";
+  std::cout << "[TB06Tree][check] entry->MEXTLphi: " << entry->MEXTLphi << "\n";
+  std::cout << "[TB06Tree][check] entry->MEXTLenergy: " << entry->MEXTLenergy << "\n";
+
+  for (int eta = 0; eta < 7; ++eta)
+    for (int phi = 0; phi < 7; ++phi)
+      std::cout << "[TB06Tree][check]   entry->localMap[" << eta << "][" << phi << "]: " << entry->localMap[eta][phi]
+                << "\n";
+
+  std::cout << "[TB06Tree][check] entry->xHodo: " << entry->xHodo << "\n";
+  std::cout << "[TB06Tree][check] entry->yHodo: " << entry->yHodo << "\n";
+  std::cout << "[TB06Tree][check] entry->xSlopeHodo: " << entry->xSlopeHodo << "\n";
+  std::cout << "[TB06Tree][check] entry->ySlopeHodo: " << entry->ySlopeHodo << "\n";
+  std::cout << "[TB06Tree][check] entry->xQualityHodo: " << entry->xQualityHodo << "\n";
+  std::cout << "[TB06Tree][check] entry->yQualityHodo: " << entry->yQualityHodo << "\n";
+  std::cout << "[TB06Tree][check] entry->convFactor: " << entry->convFactor << "\n";
 
   /* to be implemented with the right variables
   std::cout << "[TB06Tree][check] ------------------------" << std::endl ;
@@ -166,8 +151,6 @@ void TB06Tree::check ()
   */
 }
 
-
-
 /* (1) to fill the 25 crystals vector
 
    for (UInt_t icry=0 ; icry<25 ; ++icry)
@@ -176,21 +159,21 @@ void TB06Tree::check ()
        Int_t column = icry % 5 ;
        try
            {
-             EBDetId tempo (maxHitId.ieta()+column-2, 
-                            maxHitId.iphi()+row-2, 
+             EBDetId tempo (maxHitId.ieta()+column-2,
+                            maxHitId.iphi()+row-2,
                             EBDetId::ETAPHIMODE) ;
 
              Xtals5x5.push_back (tempo) ;
              amplitude [icry] = hits->find (Xtals5x5[icry])->energy () ;
-             
+
            }
        catch ( std::runtime_error &e )
            {
-             std::cout << "Cannot construct 5x5 matrix around EBDetId " 
+             std::cout << "Cannot construct 5x5 matrix around EBDetId "
                      << maxHitId << std::endl ;
              return ;
            }
      } // loop over the 5x5 matrix
 
 
-*/                                                       
+*/
diff --git a/Calibration/EcalTBTools/src/TB06TreeH2.cc b/Calibration/EcalTBTools/src/TB06TreeH2.cc
index fc5119e0a431f..518e58040c260 100644
--- a/Calibration/EcalTBTools/src/TB06TreeH2.cc
+++ b/Calibration/EcalTBTools/src/TB06TreeH2.cc
@@ -1,138 +1,148 @@
-#include "Calibration/EcalTBTools/interface/TB06TreeH2.h"
-#include "TFile.h" 
-#include "TTree.h" 
 #include "Calibration/EcalTBTools/interface/TB06RecoH2.h"
+#include "Calibration/EcalTBTools/interface/TB06TreeH2.h"
+#include "TFile.h"
+#include "TTree.h"
 
 #include <iostream>
 
-
-TB06TreeH2::TB06TreeH2 (const std::string & fileName, 
-		    const std::string & treeName):
-  m_file (nullptr), m_tree (nullptr), m_data (nullptr), m_dataSize (0)  
-{
-  TDirectory *dir = gDirectory ;
-  m_file = new TFile (fileName.c_str (),"RECREATE") ;
-  m_file->cd () ;
-  m_tree = new TTree (treeName.c_str(),"Analysis tree") ;
-  m_tree->SetAutoSave (10000000) ;
-  dir->cd () ;
+TB06TreeH2::TB06TreeH2(const std::string &fileName, const std::string &treeName)
+    : m_file(nullptr), m_tree(nullptr), m_data(nullptr), m_dataSize(0) {
+  TDirectory *dir = gDirectory;
+  m_file = new TFile(fileName.c_str(), "RECREATE");
+  m_file->cd();
+  m_tree = new TTree(treeName.c_str(), "Analysis tree");
+  m_tree->SetAutoSave(10000000);
+  dir->cd();
 
   //  m_tree->cd () ;
-  m_data = new TClonesArray (TB06RecoH2::Class (), 1) ;
-  m_data->ExpandCreateFast (1) ;
+  m_data = new TClonesArray(TB06RecoH2::Class(), 1);
+  m_data->ExpandCreateFast(1);
 
   //  m_tree->Branch ("EGCO", &m_data, 64000, 2) ;
-  m_tree->Branch ("TB06O", &m_data, 64000, 2) ;
-  m_tree->Print () ;
- 
+  m_tree->Branch("TB06O", &m_data, 64000, 2);
+  m_tree->Print();
 }
 
+// -------------------------------------------------------------------
 
-// -------------------------------------------------------------------      
-
-TB06TreeH2::~TB06TreeH2 () 
-{
-  std::cout << "[TB06TreeH2][dtor] saving TTree " << m_tree->GetName ()
-            << " with " << m_tree->GetEntries () << " entries"
-            << " on file: " << m_file->GetName () << std::endl ;
+TB06TreeH2::~TB06TreeH2() {
+  std::cout << "[TB06TreeH2][dtor] saving TTree " << m_tree->GetName() << " with " << m_tree->GetEntries() << " entries"
+            << " on file: " << m_file->GetName() << std::endl;
 
-  m_file->Write () ;
-  delete m_tree ;
-  m_file->Close () ;
-  delete m_file ;
-  delete m_data ;
+  m_file->Write();
+  delete m_tree;
+  m_file->Close();
+  delete m_file;
+  delete m_data;
 }
 
-
-// -------------------------------------------------------------------   
+// -------------------------------------------------------------------
 
 //! to be called at each loop
-  void TB06TreeH2::store (const int & tableIsMoving,
-                      const int & run, const int & event,
-                      const int & S6adc ,
-                      const double & xhodo, const double & yhodo, 
-                      const double & xslope, const double & yslope, 
-                      const double & xquality, const double & yquality,
-                      const int & icMax,
-                      const int & ietaMax, const int & iphiMax,
-                      const double & beamEnergy, 
-		      const double ampl[49],
-		      const int &wcAXo,const int &wcAYo,
-		      const int &wcBXo,const int &wcBYo,
-		      const int &wcCXo,const int &wcCYo,
-		      const double & xwA, const double & ywA,
-		      const double & xwB, const double & ywB,
-		      const double & xwC, const double & ywC,
-		      const float &S1adc, const float &S2adc,
-		      const float &S3adc, const float &S4adc,
-		      const float &VM1,const float &VM2,const float &VM3,
-		      const float &VM4,const float &VM5,const float &VM6,
-		      const float &VM7,const float &VM8,const float &VMF,
-		      const float &VMB,
-		      const float &CK1,const float &CK2, const float &CK3,
-		      const float &BH1,const float &BH2,const float &BH3,
-		      const float &BH4,
-		      const float &TOF1S, const float &TOF2S, 
-		      const float &TOF1J,const float &TOF2J
-		      )
-{
-
-  m_data->Clear () ;
-  TB06RecoH2 * entry = static_cast<TB06RecoH2*> (m_data->AddrAt (0)) ;
-
-  entry->reset () ;
+void TB06TreeH2::store(const int &tableIsMoving,
+                       const int &run,
+                       const int &event,
+                       const int &S6adc,
+                       const double &xhodo,
+                       const double &yhodo,
+                       const double &xslope,
+                       const double &yslope,
+                       const double &xquality,
+                       const double &yquality,
+                       const int &icMax,
+                       const int &ietaMax,
+                       const int &iphiMax,
+                       const double &beamEnergy,
+                       const double ampl[49],
+                       const int &wcAXo,
+                       const int &wcAYo,
+                       const int &wcBXo,
+                       const int &wcBYo,
+                       const int &wcCXo,
+                       const int &wcCYo,
+                       const double &xwA,
+                       const double &ywA,
+                       const double &xwB,
+                       const double &ywB,
+                       const double &xwC,
+                       const double &ywC,
+                       const float &S1adc,
+                       const float &S2adc,
+                       const float &S3adc,
+                       const float &S4adc,
+                       const float &VM1,
+                       const float &VM2,
+                       const float &VM3,
+                       const float &VM4,
+                       const float &VM5,
+                       const float &VM6,
+                       const float &VM7,
+                       const float &VM8,
+                       const float &VMF,
+                       const float &VMB,
+                       const float &CK1,
+                       const float &CK2,
+                       const float &CK3,
+                       const float &BH1,
+                       const float &BH2,
+                       const float &BH3,
+                       const float &BH4,
+                       const float &TOF1S,
+                       const float &TOF2S,
+                       const float &TOF1J,
+                       const float &TOF2J) {
+  m_data->Clear();
+  TB06RecoH2 *entry = static_cast<TB06RecoH2 *>(m_data->AddrAt(0));
+
+  entry->reset();
   //  reset (entry->myCalibrationMap) ;
 
-  entry->tableIsMoving = tableIsMoving ;
-  entry->run = run ;
-  entry->event = event ;
-  entry->S6ADC = S6adc ;
-
-  entry->MEXTLindex = icMax ;
-  entry->MEXTLeta = ietaMax ;
-  entry->MEXTLphi = iphiMax ;
-  entry->MEXTLenergy = ampl[24] ;
-  entry->beamEnergy = beamEnergy ;
-
-  for (int eta = 0 ; eta<7 ; ++eta)
-    for (int phi = 0 ; phi<7 ; ++phi)
-      {
-	// FIXME capire l'orientamento di phi!
-	// FIXME capire se eta, phi iniziano da 1 o da 0
-        entry->localMap[eta][phi] = ampl[eta*7+phi] ;
-      }
-
- //[Edgar] S1 uncleaned, uncalibrated energy
+  entry->tableIsMoving = tableIsMoving;
+  entry->run = run;
+  entry->event = event;
+  entry->S6ADC = S6adc;
+
+  entry->MEXTLindex = icMax;
+  entry->MEXTLeta = ietaMax;
+  entry->MEXTLphi = iphiMax;
+  entry->MEXTLenergy = ampl[24];
+  entry->beamEnergy = beamEnergy;
+
+  for (int eta = 0; eta < 7; ++eta)
+    for (int phi = 0; phi < 7; ++phi) {
+      // FIXME capire l'orientamento di phi!
+      // FIXME capire se eta, phi iniziano da 1 o da 0
+      entry->localMap[eta][phi] = ampl[eta * 7 + phi];
+    }
+
+  //[Edgar] S1 uncleaned, uncalibrated energy
   entry->S1uncalib_ = ampl[24];
-  
+
   //[Edgar] S25 uncleaned, uncalibrated energy
-  for (int eta = 1 ; eta<6 ; ++eta)
-    for (int phi = 1 ; phi<6 ; ++phi)
-      {
-	entry->S25uncalib_ += entry->localMap[eta][phi] ;
-      }
+  for (int eta = 1; eta < 6; ++eta)
+    for (int phi = 1; phi < 6; ++phi) {
+      entry->S25uncalib_ += entry->localMap[eta][phi];
+    }
 
   //[Edgar] S49 uncleaned, uncalibrated energy
-  for (int eta = 0 ; eta<7 ; ++eta)
-    for (int phi = 0 ; phi<7 ; ++phi)
-      {
-	entry->S49uncalib_ += entry->localMap[eta][phi] ;
-      }
+  for (int eta = 0; eta < 7; ++eta)
+    for (int phi = 0; phi < 7; ++phi) {
+      entry->S49uncalib_ += entry->localMap[eta][phi];
+    }
 
   //[Edgar] S9 uncleaned, uncalibrated energy
-  for (int eta = 2 ; eta<5 ; ++eta)
-    for (int phi = 2 ; phi<5 ; ++phi)
-      {
-	entry->S9uncalib_ += entry->localMap[eta][phi] ;
-      }
-
-  entry->xHodo = xhodo ;
-  entry->yHodo = yhodo ;
-  entry->xSlopeHodo = xslope ;
-  entry->ySlopeHodo = yslope ;
-  entry->xQualityHodo = xquality ;
-  entry->yQualityHodo = yquality ;
- entry->wcAXo_ = wcAXo;
+  for (int eta = 2; eta < 5; ++eta)
+    for (int phi = 2; phi < 5; ++phi) {
+      entry->S9uncalib_ += entry->localMap[eta][phi];
+    }
+
+  entry->xHodo = xhodo;
+  entry->yHodo = yhodo;
+  entry->xSlopeHodo = xslope;
+  entry->ySlopeHodo = yslope;
+  entry->xQualityHodo = xquality;
+  entry->yQualityHodo = yquality;
+  entry->wcAXo_ = wcAXo;
   entry->wcAYo_ = wcAYo;
   entry->wcBXo_ = wcBXo;
   entry->wcBYo_ = wcBYo;
@@ -170,11 +180,11 @@ TB06TreeH2::~TB06TreeH2 ()
   entry->TOF1J_ = TOF1J;
   entry->TOF2J_ = TOF2J;
 
-  entry->convFactor = 0. ;
+  entry->convFactor = 0.;
 
   /*
   // loop over the 5x5 see (1)
-  for (int xtal=0 ; xtal<25 ; ++xtal) 
+  for (int xtal=0 ; xtal<25 ; ++xtal)
     {
       int ieta = xtal/5 + 3 ;
       int iphi = xtal%5 + 8 ;
@@ -182,62 +192,53 @@ TB06TreeH2::~TB06TreeH2 ()
     } // loop over the 5x5
 
   entry->electron_Tr_Pmag_ = beamEnergy ;
-  
+
         entry->centralCrystalEta_ = ietaMax ;
         entry->centralCrystalPhi_ = iphiMax ;
-        entry->centralCrystalEnergy_ = ampl[12] ; 
+        entry->centralCrystalEnergy_ = ampl[12] ;
 
   // this is a trick
   entry->electron_Tr_Peta_ = xhodo ;
   entry->electron_Tr_Pphi_ = yhodo ;
   */
-  m_tree->Fill () ;
+  m_tree->Fill();
 }
 
-
 // -------------------------------------------------------------------
 
-
-void TB06TreeH2::reset (float crystal[11][21])
-{
-  for (int eta =0 ; eta<11 ; ++eta)    
-    {
-      for (int phi =0 ; phi<21 ; ++phi) 
-        {
-          crystal[eta][phi] = -999. ;  
-        }   
+void TB06TreeH2::reset(float crystal[11][21]) {
+  for (int eta = 0; eta < 11; ++eta) {
+    for (int phi = 0; phi < 21; ++phi) {
+      crystal[eta][phi] = -999.;
     }
+  }
 }
 
-
 // -------------------------------------------------------------------
 
-
-void TB06TreeH2::check ()
-{
-  TB06RecoH2 * entry = static_cast<TB06RecoH2*> (m_data->AddrAt (0)) ;
-
-  std::cout << "[TB06TreeH2][check]reading . . . \n" ;
-  std::cout << "[TB06TreeH2][check] entry->run: " << entry->run << "\n" ;
-  std::cout << "[TB06TreeH2][check] entry->event: " << entry->event << "\n" ;
-  std::cout << "[TB06TreeH2][check] entry->tableIsMoving: " << entry->tableIsMoving << "\n" ;
-  std::cout << "[TB06TreeH2][check] entry->MEXTLeta: " << entry->MEXTLeta << "\n" ;
-  std::cout << "[TB06TreeH2][check] entry->MEXTLphi: " << entry->MEXTLphi << "\n" ;
-  std::cout << "[TB06TreeH2][check] entry->MEXTLenergy: " << entry->MEXTLenergy << "\n" ;
-
-  for (int eta = 0 ; eta<7 ; ++eta)
-      for (int phi = 0 ; phi<7 ; ++phi)
-        std::cout << "[TB06TreeH2][check]   entry->localMap[" << eta
-                  << "][" << phi << "]: "
-                  << entry->localMap[eta][phi] << "\n" ;
-
-  std::cout << "[TB06TreeH2][check] entry->xHodo: " << entry->xHodo << "\n" ;
-  std::cout << "[TB06TreeH2][check] entry->yHodo: " << entry->yHodo << "\n" ;
-  std::cout << "[TB06TreeH2][check] entry->xSlopeHodo: " << entry->xSlopeHodo << "\n" ;
-  std::cout << "[TB06TreeH2][check] entry->ySlopeHodo: " << entry->ySlopeHodo << "\n" ;
-  std::cout << "[TB06TreeH2][check] entry->xQualityHodo: " << entry->xQualityHodo << "\n" ;
-  std::cout << "[TB06TreeH2][check] entry->yQualityHodo: " << entry->yQualityHodo << "\n" ;
-  std::cout << "[TB06TreeH2][check] entry->convFactor: " << entry->convFactor << "\n" ;
+void TB06TreeH2::check() {
+  TB06RecoH2 *entry = static_cast<TB06RecoH2 *>(m_data->AddrAt(0));
+
+  std::cout << "[TB06TreeH2][check]reading . . . \n";
+  std::cout << "[TB06TreeH2][check] entry->run: " << entry->run << "\n";
+  std::cout << "[TB06TreeH2][check] entry->event: " << entry->event << "\n";
+  std::cout << "[TB06TreeH2][check] entry->tableIsMoving: " << entry->tableIsMoving << "\n";
+  std::cout << "[TB06TreeH2][check] entry->MEXTLeta: " << entry->MEXTLeta << "\n";
+  std::cout << "[TB06TreeH2][check] entry->MEXTLphi: " << entry->MEXTLphi << "\n";
+  std::cout << "[TB06TreeH2][check] entry->MEXTLenergy: " << entry->MEXTLenergy << "\n";
+
+  for (int eta = 0; eta < 7; ++eta)
+    for (int phi = 0; phi < 7; ++phi)
+      std::cout << "[TB06TreeH2][check]   entry->localMap[" << eta << "][" << phi << "]: " << entry->localMap[eta][phi]
+                << "\n";
+
+  std::cout << "[TB06TreeH2][check] entry->xHodo: " << entry->xHodo << "\n";
+  std::cout << "[TB06TreeH2][check] entry->yHodo: " << entry->yHodo << "\n";
+  std::cout << "[TB06TreeH2][check] entry->xSlopeHodo: " << entry->xSlopeHodo << "\n";
+  std::cout << "[TB06TreeH2][check] entry->ySlopeHodo: " << entry->ySlopeHodo << "\n";
+  std::cout << "[TB06TreeH2][check] entry->xQualityHodo: " << entry->xQualityHodo << "\n";
+  std::cout << "[TB06TreeH2][check] entry->yQualityHodo: " << entry->yQualityHodo << "\n";
+  std::cout << "[TB06TreeH2][check] entry->convFactor: " << entry->convFactor << "\n";
 
   /* to be implemented with the right variables
   std::cout << "[TB06TreeH2][check] ------------------------" << std::endl ;
@@ -245,8 +246,6 @@ void TB06TreeH2::check ()
   */
 }
 
-
-
 /* (1) to fill the 25 crystals vector
 
    for (UInt_t icry=0 ; icry<25 ; ++icry)
@@ -255,21 +254,21 @@ void TB06TreeH2::check ()
        Int_t column = icry % 5 ;
        try
            {
-             EBDetId tempo (maxHitId.ieta()+column-2, 
-                            maxHitId.iphi()+row-2, 
+             EBDetId tempo (maxHitId.ieta()+column-2,
+                            maxHitId.iphi()+row-2,
                             EBDetId::ETAPHIMODE) ;
 
              Xtals5x5.push_back (tempo) ;
              amplitude [icry] = hits->find (Xtals5x5[icry])->energy () ;
-             
+
            }
        catch ( std::runtime_error &e )
            {
-             std::cout << "Cannot construct 5x5 matrix around EBDetId " 
+             std::cout << "Cannot construct 5x5 matrix around EBDetId "
                      << maxHitId << std::endl ;
              return ;
            }
      } // loop over the 5x5 matrix
 
 
-*/                                                       
+*/
diff --git a/Calibration/EcalTBTools/src/classes.h b/Calibration/EcalTBTools/src/classes.h
index fa2f92b5d577a..f75b9040a82c2 100644
--- a/Calibration/EcalTBTools/src/classes.h
+++ b/Calibration/EcalTBTools/src/classes.h
@@ -2,6 +2,5 @@
 #include "Calibration/EcalTBTools/interface/TB06RecoH2.h"
 
 namespace Calibration_EcalTBTools {
-  struct dictionary {
-  };
-}
+  struct dictionary {};
+}  // namespace Calibration_EcalTBTools
diff --git a/Calibration/HcalAlCaRecoProducers/test/AlCaIsoTrackFilterProducer_cfg.py b/Calibration/HcalAlCaRecoProducers/test/AlCaIsoTrackFilterProducer_cfg.py
index 4915ac3af083e..eecff400e4145 100644
--- a/Calibration/HcalAlCaRecoProducers/test/AlCaIsoTrackFilterProducer_cfg.py
+++ b/Calibration/HcalAlCaRecoProducers/test/AlCaIsoTrackFilterProducer_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("ALCAISOTRACK",eras.Run2_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process("ALCAISOTRACK",Run2_2017)
 
 process.load('Configuration.StandardSequences.Services_cff')
 process.load('FWCore.MessageService.MessageLogger_cfi')
diff --git a/Calibration/HcalCalibAlgos/macros/HBHEMuonOfflineAnalyzer.C b/Calibration/HcalCalibAlgos/macros/HBHEMuonOfflineAnalyzer.C
index 20f961f96c102..f19e6504f685e 100644
--- a/Calibration/HcalCalibAlgos/macros/HBHEMuonOfflineAnalyzer.C
+++ b/Calibration/HcalCalibAlgos/macros/HBHEMuonOfflineAnalyzer.C
@@ -342,7 +342,7 @@ public :
 			  int runHi=99999999, int etaMin=1, int etaMax=29,
 			  bool debug=false);
   // mode of LHC is kept 1 for 2017 scenario as no change in depth segmentation
-  // mode of LHC is 0 for 2019
+  // mode of LHC is 0 for 2021
   virtual ~HBHEMuonOfflineAnalyzer();
 
   virtual Int_t            Cut(Long64_t entry);
@@ -1712,7 +1712,7 @@ int HBHEMuonOfflineAnalyzer::nDepthBins(int eta, int phi) {
   int  nDepthR3[29]={4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,3,5,6,6,6,6,6,6,6,7,7,7,3};
   // Run 4 scenario
   int  nDepthR4[29]={4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,7,7,7,7,7,7,7,7,7,7,7,7,7};
-  // for 2019 scenario multi depth segmentation
+  // for 2021 scenario multi depth segmentation
   //    int  nDepth[29]={3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,5,5,5,5,5,5,5,5,5,5,5,5,5};
   // modeLHC_ = 0 --> nbin defined maxDepthHB/HE
   //          = 1 -->      corresponds to Run 1 (valid till 2016)
diff --git a/Calibration/HcalCalibAlgos/test/isoTrackAlCaRecoAnalysis_cfg.py b/Calibration/HcalCalibAlgos/test/isoTrackAlCaRecoAnalysis_cfg.py
index c1f8381c87fb6..446eb883b6e77 100644
--- a/Calibration/HcalCalibAlgos/test/isoTrackAlCaRecoAnalysis_cfg.py
+++ b/Calibration/HcalCalibAlgos/test/isoTrackAlCaRecoAnalysis_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("ANALYSIS",eras.Run2_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process("ANALYSIS",Run2_2017)
 
 process.load("FWCore.MessageService.MessageLogger_cfi")
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/Calibration/HcalCalibAlgos/test/isoTrackRecoAnalysis_cfg.py b/Calibration/HcalCalibAlgos/test/isoTrackRecoAnalysis_cfg.py
index a5bf1c17f1784..ed3e8b4dd1382 100644
--- a/Calibration/HcalCalibAlgos/test/isoTrackRecoAnalysis_cfg.py
+++ b/Calibration/HcalCalibAlgos/test/isoTrackRecoAnalysis_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("ANALYSIS",eras.Run2_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process("ANALYSIS",Run2_2017)
 
 process.load("FWCore.MessageService.MessageLogger_cfi")
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/Calibration/HcalCalibAlgos/test/recAnalyzerHF_cfg.py b/Calibration/HcalCalibAlgos/test/recAnalyzerHF_cfg.py
index f5dd261865ebb..868222e1c075b 100644
--- a/Calibration/HcalCalibAlgos/test/recAnalyzerHF_cfg.py
+++ b/Calibration/HcalCalibAlgos/test/recAnalyzerHF_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('recHitHF',eras.Run2_25ns)
+from Configuration.Eras.Era_Run2_25ns_cff import Run2_25ns
+process = cms.Process('recHitHF',Run2_25ns)
 process.load('Calibration.HcalCalibAlgos.recAnalyzerHF_cfi')
 process.load("FWCore.MessageService.MessageLogger_cfi")
 
diff --git a/Calibration/HcalConnectivity/src/HcalCableMapper.cc b/Calibration/HcalConnectivity/src/HcalCableMapper.cc
index fd9bccff221a5..932672c159d21 100644
--- a/Calibration/HcalConnectivity/src/HcalCableMapper.cc
+++ b/Calibration/HcalConnectivity/src/HcalCableMapper.cc
@@ -1,236 +1,221 @@
+#include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
-#include <iostream>
 #include <cstdio>
+#include <iostream>
 
 using namespace std;
 
-/*version 3.1 02-13-07 
+/*version 3.1 02-13-07
 
 author Kevin Klapoetke - Minnesota*/
 
 class HcalCableMapper : public edm::EDAnalyzer {
 public:
-  explicit HcalCableMapper(edm::ParameterSet const& conf);
-  void analyze(edm::Event const& e, edm::EventSetup const& c) override;
-  void endJob () override;
-  //std::string sourceDigi_;
+  explicit HcalCableMapper(edm::ParameterSet const &conf);
+  void analyze(edm::Event const &e, edm::EventSetup const &c) override;
+  void endJob() override;
+  // std::string sourceDigi_;
 private:
   typedef std::vector<HcalQIESample> SampleSet;
-  
-  typedef std::map<HcalDetId,SampleSet> PathSet;
-  typedef std::map<HcalDetId,HcalElectronicsId> IdMap;
-  
-  void process(const PathSet& ps, const IdMap& im);
-  
-  
 
+  typedef std::map<HcalDetId, SampleSet> PathSet;
+  typedef std::map<HcalDetId, HcalElectronicsId> IdMap;
+
+  void process(const PathSet &ps, const IdMap &im);
 
-  std::map<HcalDetId,std::vector<SampleSet> > fullHistory_;
+  std::map<HcalDetId, std::vector<SampleSet>> fullHistory_;
   IdMap IdSet;
   edm::EDGetTokenT<HBHEDigiCollection> tok_hbhe_;
   edm::EDGetTokenT<HODigiCollection> tok_ho_;
   edm::EDGetTokenT<HFDigiCollection> tok_hf_;
 
   template <class DigiCollection>
-  void record(const DigiCollection& digis) {
-
-    for (typename DigiCollection::const_iterator digi=digis.begin(); digi!=digis.end(); digi++) {
-
+  void record(const DigiCollection &digis) {
+    for (typename DigiCollection::const_iterator digi = digis.begin(); digi != digis.end(); digi++) {
       SampleSet q;
-      for (int i=0; i<digi->size(); i++)
-	q.push_back(digi->sample(i));
-      
-      if (fullHistory_.find(digi->id())==fullHistory_.end()) fullHistory_.insert(std::pair<HcalDetId,std::vector<SampleSet> >(digi->id(),std::vector<SampleSet>()));
-      if (IdSet.find(digi->id())==IdSet.end()) IdSet.insert(std::pair<HcalDetId,HcalElectronicsId>(digi->id(),HcalElectronicsId())); 
+      for (int i = 0; i < digi->size(); i++)
+        q.push_back(digi->sample(i));
+
+      if (fullHistory_.find(digi->id()) == fullHistory_.end())
+        fullHistory_.insert(std::pair<HcalDetId, std::vector<SampleSet>>(digi->id(), std::vector<SampleSet>()));
+      if (IdSet.find(digi->id()) == IdSet.end())
+        IdSet.insert(std::pair<HcalDetId, HcalElectronicsId>(digi->id(), HcalElectronicsId()));
       fullHistory_[digi->id()].push_back(q);
-      IdSet[digi->id()]=digi->elecId();
+      IdSet[digi->id()] = digi->elecId();
     }
   }
-
-
 };
 
-
-HcalCableMapper::HcalCableMapper(edm::ParameterSet const& conf) {
+HcalCableMapper::HcalCableMapper(edm::ParameterSet const &conf) {
   tok_hbhe_ = consumes<HBHEDigiCollection>(conf.getParameter<edm::InputTag>("hbheLabel"));
   tok_ho_ = consumes<HODigiCollection>(conf.getParameter<edm::InputTag>("hoLabel"));
   tok_hf_ = consumes<HFDigiCollection>(conf.getParameter<edm::InputTag>("hfLabel"));
-  
 }
 
-constexpr char const* det_names[] = {"Zero","HcalBarrel","HcalEndcap","HcalForward","HcalOuter"};
-
+constexpr char const *det_names[] = {"Zero", "HcalBarrel", "HcalEndcap", "HcalForward", "HcalOuter"};
 
-
-void HcalCableMapper::process(const PathSet& ps, const IdMap& im){
-  
+void HcalCableMapper::process(const PathSet &ps, const IdMap &im) {
   PathSet::const_iterator iii;
   IdMap::const_iterator ij;
-  
-  for (iii=ps.begin();iii!=ps.end();iii++){
-    
-    
+
+  for (iii = ps.begin(); iii != ps.end(); iii++) {
     SampleSet ss = iii->second;
     const HcalDetId dd = iii->first;
-    
-    ij=im.find(dd);
-    HcalElectronicsId eid=ij->second;
-
-    int header = ((ss[0].adc())&0x7F);
-    int ieta  = ((ss[1].adc())&0x3F);
-    int z_ieta = (((ss[1].adc())>>6)&0x1);
-    int iphi = ((ss[2].adc())&0x7F);
-    int depth = ((ss[3].adc())&0x7);
-    int det = (((ss[3].adc())>>3)&0xF);
-    int spigot = ((ss[4].adc())&0xF);
-    int fiber = (((ss[4].adc())>>4)&0x7);
-    int crate  = ((ss[5].adc())&0x1F);
-    int fiber_chan= (((ss[5].adc())>>5)&0x3);
-    int G_Dcc  = ((ss[6].adc())&0x3F);
-    int H_slot  = ((ss[7].adc())&0x1F);
-    int TB = (((ss[7].adc())>>5)&0x1);
-    int RBX_7 = (((ss[7].adc())>>6)&0x1);
-    int RBX = ((ss[8].adc())&0x7F);
-    int RM = ((ss[9].adc())&0x3);
-    int RM_card= (((ss[9].adc())>>2)&0x3);
-    int RM_chan= (((ss[9].adc())>>4)&0x7);
+
+    ij = im.find(dd);
+    HcalElectronicsId eid = ij->second;
+
+    int header = ((ss[0].adc()) & 0x7F);
+    int ieta = ((ss[1].adc()) & 0x3F);
+    int z_ieta = (((ss[1].adc()) >> 6) & 0x1);
+    int iphi = ((ss[2].adc()) & 0x7F);
+    int depth = ((ss[3].adc()) & 0x7);
+    int det = (((ss[3].adc()) >> 3) & 0xF);
+    int spigot = ((ss[4].adc()) & 0xF);
+    int fiber = (((ss[4].adc()) >> 4) & 0x7);
+    int crate = ((ss[5].adc()) & 0x1F);
+    int fiber_chan = (((ss[5].adc()) >> 5) & 0x3);
+    int G_Dcc = ((ss[6].adc()) & 0x3F);
+    int H_slot = ((ss[7].adc()) & 0x1F);
+    int TB = (((ss[7].adc()) >> 5) & 0x1);
+    int RBX_7 = (((ss[7].adc()) >> 6) & 0x1);
+    int RBX = ((ss[8].adc()) & 0x7F);
+    int RM = ((ss[9].adc()) & 0x3);
+    int RM_card = (((ss[9].adc()) >> 2) & 0x3);
+    int RM_chan = (((ss[9].adc()) >> 4) & 0x7);
     string eta_sign;
     std::string det_name;
-    if (det>4 || det<0) {
+    if (det > 4 || det < 0) {
       char c[20];
-      snprintf(c,20,"Det=%d",det);
-      det_name=c;
-    } else det_name=det_names[det];
-    
-    
-    if (z_ieta==1){
+      snprintf(c, 20, "Det=%d", det);
+      det_name = c;
+    } else
+      det_name = det_names[det];
+
+    if (z_ieta == 1) {
       eta_sign = "+";
-    }else{eta_sign = "-";}
+    } else {
+      eta_sign = "-";
+    }
     string is_header;
-    if (header == 0x75){
-     
-      //NO SHIFT
-      if((spigot==eid.spigot())&&(fiber+1==eid.fiberIndex())&&(fiber_chan==eid.fiberChanId())&&(H_slot==eid.htrSlot())&&(G_Dcc==eid.dccid())&&(crate==eid.readoutVMECrateId())&&(iphi==dd.iphi())&&(depth==dd.depth())&&(ieta==dd.ietaAbs())&&(TB==eid.htrTopBottom())&&(det==dd.subdet())){//&&(z_ieta==dd.zside())
-	std::cout <<"Pathway match"<<std::endl;
-      }else{
-	
-	is_header=" Header found";
-	
-	std::cout <<" Digi ID: " << dd << is_header<< " ieta: "<< eta_sign << ieta << " iphi: "<< iphi << " Depth: " << depth << " Detector: " << det_name << " Spigot: "<< spigot<<"/"<<eid.spigot() << " Fiber: " << fiber+1<<"/"<<eid.fiberIndex() << " Fiber Channel: "<< fiber_chan <<"/"<<eid.fiberChanId()<< " Crate: " << crate<<"/"<<eid.readoutVMECrateId() << " Global Dcc: " << G_Dcc <<"/"<<eid.dccid() << " HTR Slot: " << H_slot <<"/ " <<eid.htrSlot()<< " Top/Bottom: " << TB<<"/"<< eid.htrTopBottom() << " RBX: " << (RBX_7*128+RBX) << " RM: " << RM+1 << " RM Card: " << RM_card+1 << " RM Channel: " << RM_chan << std::endl;
-      }    
-    }else if (ieta+64==0x75){
-      
-      ieta  = ((ss[2].adc())&0x3F);
-      z_ieta = (((ss[2].adc())>>6)&0x1);
-      iphi = ((ss[3].adc())&0x7F);
-      depth = ((ss[4].adc())&0x7);
-      det = (((ss[4].adc())>>3)&0xF);
-      spigot = ((ss[5].adc())&0xF);
-      fiber = (((ss[5].adc())>>4)&0x7);
-      crate  = ((ss[6].adc())&0x1F);
-      fiber_chan= (((ss[6].adc())>>5)&0x3);
-      G_Dcc  = ((ss[7].adc())&0x3F);
-      H_slot  = ((ss[8].adc())&0x1F);
-      TB = (((ss[8].adc())>>5)&0x1);
-      RBX_7 = (((ss[8].adc())>>6)&0x1);
-      RBX = ((ss[9].adc())&0x7F);
-      
-
-      //SHIFT
-      	if((spigot==eid.spigot())&&(fiber+1==eid.fiberIndex())&&(fiber_chan==eid.fiberChanId())&&(H_slot==eid.htrSlot())&&(G_Dcc==eid.dccid())&&(TB==eid.htrTopBottom())&&(crate==eid.readoutVMECrateId())&&(iphi==dd.iphi())&&(depth==dd.depth())&&(det==dd.subdet())&&(ieta==dd.ietaAbs())){//&&(z_ieta==dd.zside())
-
-	std::cout <<"Pathway match (SHIFT)"<<std::endl;
-      }else{
-
-
-      is_header=" DATA SHIFT";
-      
-     std::cout <<" Digi ID: " << dd << is_header<< " ieta: "<< eta_sign << ieta << " iphi: "<< iphi << " Depth: " << depth << " Detector: " << det_name << " Spigot: "<< spigot<<"/"<<eid.spigot() << " Fiber: " << fiber+1<<"/"<<eid.fiberIndex() << " Fiber Channel: "<< fiber_chan <<"/"<<eid.fiberChanId()<< " Crate: " << crate<<"/"<<eid.readoutVMECrateId() << " Global Dcc: " << G_Dcc <<"/"<<eid.dccid() << " HTR Slot: " << H_slot <<"/ " <<eid.htrSlot()<< " Top/Bottom: " << TB<<"/"<< eid.htrTopBottom() << " RBX: " << (RBX_7*128+RBX) << std::endl;
-      
-	}
-    }else { std::cout<<" Digi ID: " <<dd << " +NO HEADER+  " << " RBX: " << (RBX_7*128+RBX) << std::endl;
+    if (header == 0x75) {
+      // NO SHIFT
+      if ((spigot == eid.spigot()) && (fiber + 1 == eid.fiberIndex()) && (fiber_chan == eid.fiberChanId()) &&
+          (H_slot == eid.htrSlot()) && (G_Dcc == eid.dccid()) && (crate == eid.readoutVMECrateId()) &&
+          (iphi == dd.iphi()) && (depth == dd.depth()) && (ieta == dd.ietaAbs()) && (TB == eid.htrTopBottom()) &&
+          (det == dd.subdet())) {  //&&(z_ieta==dd.zside())
+        std::cout << "Pathway match" << std::endl;
+      } else {
+        is_header = " Header found";
+
+        std::cout << " Digi ID: " << dd << is_header << " ieta: " << eta_sign << ieta << " iphi: " << iphi
+                  << " Depth: " << depth << " Detector: " << det_name << " Spigot: " << spigot << "/" << eid.spigot()
+                  << " Fiber: " << fiber + 1 << "/" << eid.fiberIndex() << " Fiber Channel: " << fiber_chan << "/"
+                  << eid.fiberChanId() << " Crate: " << crate << "/" << eid.readoutVMECrateId()
+                  << " Global Dcc: " << G_Dcc << "/" << eid.dccid() << " HTR Slot: " << H_slot << "/ " << eid.htrSlot()
+                  << " Top/Bottom: " << TB << "/" << eid.htrTopBottom() << " RBX: " << (RBX_7 * 128 + RBX)
+                  << " RM: " << RM + 1 << " RM Card: " << RM_card + 1 << " RM Channel: " << RM_chan << std::endl;
+      }
+    } else if (ieta + 64 == 0x75) {
+      ieta = ((ss[2].adc()) & 0x3F);
+      z_ieta = (((ss[2].adc()) >> 6) & 0x1);
+      iphi = ((ss[3].adc()) & 0x7F);
+      depth = ((ss[4].adc()) & 0x7);
+      det = (((ss[4].adc()) >> 3) & 0xF);
+      spigot = ((ss[5].adc()) & 0xF);
+      fiber = (((ss[5].adc()) >> 4) & 0x7);
+      crate = ((ss[6].adc()) & 0x1F);
+      fiber_chan = (((ss[6].adc()) >> 5) & 0x3);
+      G_Dcc = ((ss[7].adc()) & 0x3F);
+      H_slot = ((ss[8].adc()) & 0x1F);
+      TB = (((ss[8].adc()) >> 5) & 0x1);
+      RBX_7 = (((ss[8].adc()) >> 6) & 0x1);
+      RBX = ((ss[9].adc()) & 0x7F);
+
+      // SHIFT
+      if ((spigot == eid.spigot()) && (fiber + 1 == eid.fiberIndex()) && (fiber_chan == eid.fiberChanId()) &&
+          (H_slot == eid.htrSlot()) && (G_Dcc == eid.dccid()) && (TB == eid.htrTopBottom()) &&
+          (crate == eid.readoutVMECrateId()) && (iphi == dd.iphi()) && (depth == dd.depth()) && (det == dd.subdet()) &&
+          (ieta == dd.ietaAbs())) {  //&&(z_ieta==dd.zside())
+
+        std::cout << "Pathway match (SHIFT)" << std::endl;
+      } else {
+        is_header = " DATA SHIFT";
+
+        std::cout << " Digi ID: " << dd << is_header << " ieta: " << eta_sign << ieta << " iphi: " << iphi
+                  << " Depth: " << depth << " Detector: " << det_name << " Spigot: " << spigot << "/" << eid.spigot()
+                  << " Fiber: " << fiber + 1 << "/" << eid.fiberIndex() << " Fiber Channel: " << fiber_chan << "/"
+                  << eid.fiberChanId() << " Crate: " << crate << "/" << eid.readoutVMECrateId()
+                  << " Global Dcc: " << G_Dcc << "/" << eid.dccid() << " HTR Slot: " << H_slot << "/ " << eid.htrSlot()
+                  << " Top/Bottom: " << TB << "/" << eid.htrTopBottom() << " RBX: " << (RBX_7 * 128 + RBX) << std::endl;
+      }
+    } else {
+      std::cout << " Digi ID: " << dd << " +NO HEADER+  "
+                << " RBX: " << (RBX_7 * 128 + RBX) << std::endl;
     }
   }
 }
 
-
-void HcalCableMapper::analyze(edm::Event const& e, edm::EventSetup const& c) {
-   
+void HcalCableMapper::analyze(edm::Event const &e, edm::EventSetup const &c) {
   edm::Handle<HBHEDigiCollection> hbhe;
-  e.getByToken(tok_hbhe_,hbhe);
+  e.getByToken(tok_hbhe_, hbhe);
 
   edm::Handle<HFDigiCollection> hf;
-  e.getByToken(tok_hf_,hf);
+  e.getByToken(tok_hf_, hf);
   edm::Handle<HODigiCollection> ho;
-  e.getByToken(tok_ho_,ho);
-  
-   
+  e.getByToken(tok_ho_, ho);
+
   record(*hbhe);
-  record(*hf);  
+  record(*hf);
   record(*ho);
 }
 
+void HcalCableMapper::endJob() {
+  std::vector<SampleSet>::iterator j;
+  int c[128];
+  int k, ii, kk;
+  int c_max = 0;
 
+  std::map<HcalDetId, std::vector<SampleSet>>::iterator i;
 
-
-void HcalCableMapper::endJob(){
-  
-  
-  std::vector<SampleSet>::iterator j; 
-  int c [128];
-  int k,ii,kk;
-  int c_max=0;
-  
-  std::map<HcalDetId,std::vector<SampleSet> >::iterator i;
-  
   PathSet consensus;
- 
-  for (i=fullHistory_.begin(); i!=fullHistory_.end(); i++) {
-    //i.first --> id
-    //i.second --> vector<SampleSet>
+
+  for (i = fullHistory_.begin(); i != fullHistory_.end(); i++) {
+    // i.first --> id
+    // i.second --> vector<SampleSet>
     SampleSet s;
-    for (k=0; k<10; k++) {
-      for (ii=0; ii<128; ii++) c[ii]=0;
+    for (k = 0; k < 10; k++) {
+      for (ii = 0; ii < 128; ii++)
+        c[ii] = 0;
 
-      for (j=i->second.begin();j!=i->second.end();j++){//word number
-	if (int(j->size())>k) 
-	  c[(*j)[k].adc()]++;
-	
-    
-      }//j loop
-      //sort c-array
-      for (kk=0;kk<128;kk++){  
-	if (c[kk]>c[c_max]){
-	  c_max = kk;
-	}
-      }    
-      
-      s.push_back(((c_max&0x7F)));
+      for (j = i->second.begin(); j != i->second.end(); j++) {  // word number
+        if (int(j->size()) > k)
+          c[(*j)[k].adc()]++;
 
-      c_max=0;
-    }//k-loop    
-  consensus[i->first]=s;
-  
-  }//i loop
- 
-  process(consensus,IdSet);
-    
-   
+      }  // j loop
+      // sort c-array
+      for (kk = 0; kk < 128; kk++) {
+        if (c[kk] > c[c_max]) {
+          c_max = kk;
+        }
+      }
 
+      s.push_back(((c_max & 0x7F)));
 
+      c_max = 0;
+    }  // k-loop
+    consensus[i->first] = s;
 
-}//end of endjob 
-  
+  }  // i loop
 
+  process(consensus, IdSet);
 
+}  // end of endjob
 
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 
 DEFINE_FWK_MODULE(HcalCableMapper);
-
diff --git a/Calibration/HcalIsolatedTrackReco/interface/ECALRegFEDSelector.h b/Calibration/HcalIsolatedTrackReco/interface/ECALRegFEDSelector.h
index 301717ed56b66..6010c06dced81 100644
--- a/Calibration/HcalIsolatedTrackReco/interface/ECALRegFEDSelector.h
+++ b/Calibration/HcalIsolatedTrackReco/interface/ECALRegFEDSelector.h
@@ -28,23 +28,21 @@
 #include "DataFormats/EcalRawData/interface/EcalListOfFEDS.h"
 
 class ECALRegFEDSelector : public edm::EDProducer {
- public:
+public:
   ECALRegFEDSelector(const edm::ParameterSet&);
   ~ECALRegFEDSelector() override;
   std::unique_ptr<const EcalElectronicsMapping> ec_mapping;
 
   double delta_;
   bool fedSaved[1200];
-  
+
   edm::EDGetTokenT<FEDRawDataCollection> tok_raw_;
   edm::EDGetTokenT<trigger::TriggerFilterObjectWithRefs> tok_seed_;
-  
- private:
-  void beginJob() override ;
+
+private:
+  void beginJob() override;
   void produce(edm::Event&, const edm::EventSetup&) override;
-  void endJob() override ;
-  
+  void endJob() override;
 };
 
 #endif
-
diff --git a/Calibration/HcalIsolatedTrackReco/interface/EcalIsolatedParticleCandidateProducer.h b/Calibration/HcalIsolatedTrackReco/interface/EcalIsolatedParticleCandidateProducer.h
index 15e518fd8fa09..d10e2ba80e085 100644
--- a/Calibration/HcalIsolatedTrackReco/interface/EcalIsolatedParticleCandidateProducer.h
+++ b/Calibration/HcalIsolatedTrackReco/interface/EcalIsolatedParticleCandidateProducer.h
@@ -35,7 +35,7 @@ class EcalIsolatedParticleCandidateProducer : public edm::global::EDProducer<> {
   edm::EDGetTokenT<trigger::TriggerFilterObjectWithRefs> tok_hlt_;
   edm::EDGetTokenT<EcalRecHitCollection> tok_EB_;
   edm::EDGetTokenT<EcalRecHitCollection> tok_EE_;
-      
+
   // ----------member data ---------------------------
 };
 
diff --git a/Calibration/HcalIsolatedTrackReco/interface/IPTCorrector.h b/Calibration/HcalIsolatedTrackReco/interface/IPTCorrector.h
index 51132bb75bdd0..085724281d47d 100644
--- a/Calibration/HcalIsolatedTrackReco/interface/IPTCorrector.h
+++ b/Calibration/HcalIsolatedTrackReco/interface/IPTCorrector.h
@@ -17,10 +17,9 @@
 #include "DataFormats/HcalIsolatedTrack/interface/IsolatedPixelTrackCandidate.h"
 #include "DataFormats/HLTReco/interface/TriggerFilterObjectWithRefs.h"
 
-class IPTCorrector : public edm::global::EDProducer<>
-{
+class IPTCorrector : public edm::global::EDProducer<> {
 public:
-  IPTCorrector (const edm::ParameterSet& ps);
+  IPTCorrector(const edm::ParameterSet& ps);
 
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
@@ -32,5 +31,4 @@ class IPTCorrector : public edm::global::EDProducer<>
   const double assocCone_;
 };
 
-
 #endif
diff --git a/Calibration/HcalIsolatedTrackReco/interface/IsolatedEcalPixelTrackCandidateProducer.h b/Calibration/HcalIsolatedTrackReco/interface/IsolatedEcalPixelTrackCandidateProducer.h
index 7647e4549f7bc..a0ac1d97433a5 100644
--- a/Calibration/HcalIsolatedTrackReco/interface/IsolatedEcalPixelTrackCandidateProducer.h
+++ b/Calibration/HcalIsolatedTrackReco/interface/IsolatedEcalPixelTrackCandidateProducer.h
@@ -18,7 +18,6 @@
 //
 
 class IsolatedEcalPixelTrackCandidateProducer : public edm::global::EDProducer<> {
-
 public:
   explicit IsolatedEcalPixelTrackCandidateProducer(const edm::ParameterSet&);
   ~IsolatedEcalPixelTrackCandidateProducer() override;
diff --git a/Calibration/HcalIsolatedTrackReco/interface/IsolatedPixelTrackCandidateL1TProducer.h b/Calibration/HcalIsolatedTrackReco/interface/IsolatedPixelTrackCandidateL1TProducer.h
index 7153c4e47741c..b93ad728bfb90 100644
--- a/Calibration/HcalIsolatedTrackReco/interface/IsolatedPixelTrackCandidateL1TProducer.h
+++ b/Calibration/HcalIsolatedTrackReco/interface/IsolatedPixelTrackCandidateL1TProducer.h
@@ -43,26 +43,24 @@
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerObjectMap.h"
 
 class IsolatedPixelTrackCandidateL1TProducer : public edm::stream::EDProducer<> {
-
 public:
-
-  IsolatedPixelTrackCandidateL1TProducer (const edm::ParameterSet& ps);
+  IsolatedPixelTrackCandidateL1TProducer(const edm::ParameterSet& ps);
   ~IsolatedPixelTrackCandidateL1TProducer() override;
 
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
   void beginRun(const edm::Run&, const edm::EventSetup&) override;
   void produce(edm::Event& evt, const edm::EventSetup& es) override;
-  
+
   double getDistInCM(double eta1, double phi1, double eta2, double phi2);
   std::pair<double, double> GetEtaPhiAtEcal(double etaIP, double phiIP, double pT, int charge, double vtxZ);
 
 private:
   struct seedAtEC {
-    seedAtEC(unsigned int i, bool f, double et, double fi) : index(i), ok(f), eta(et), phi(fi) { }
+    seedAtEC(unsigned int i, bool f, double et, double fi) : index(i), ok(f), eta(et), phi(fi) {}
     unsigned int index;
-    bool         ok;
-    double       eta, phi;
+    bool ok;
+    double eta, phi;
   };
 
   const edm::EDGetTokenT<trigger::TriggerFilterObjectWithRefs> tok_hlt_;
@@ -87,5 +85,4 @@ class IsolatedPixelTrackCandidateL1TProducer : public edm::stream::EDProducer<>
   double bfVal_;
 };
 
-
 #endif
diff --git a/Calibration/HcalIsolatedTrackReco/interface/IsolatedPixelTrackCandidateProducer.h b/Calibration/HcalIsolatedTrackReco/interface/IsolatedPixelTrackCandidateProducer.h
index 2bedfb949b66b..240465b88b450 100644
--- a/Calibration/HcalIsolatedTrackReco/interface/IsolatedPixelTrackCandidateProducer.h
+++ b/Calibration/HcalIsolatedTrackReco/interface/IsolatedPixelTrackCandidateProducer.h
@@ -40,26 +40,24 @@
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerObjectMap.h"
 
 class IsolatedPixelTrackCandidateProducer : public edm::stream::EDProducer<> {
-
 public:
-
-  IsolatedPixelTrackCandidateProducer (const edm::ParameterSet& ps);
+  IsolatedPixelTrackCandidateProducer(const edm::ParameterSet& ps);
   ~IsolatedPixelTrackCandidateProducer() override;
 
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
   void beginRun(const edm::Run&, const edm::EventSetup&) override;
   void produce(edm::Event& evt, const edm::EventSetup& es) override;
-  
+
   double getDistInCM(double eta1, double phi1, double eta2, double phi2);
   std::pair<double, double> GetEtaPhiAtEcal(double etaIP, double phiIP, double pT, int charge, double vtxZ);
 
 private:
   struct seedAtEC {
-    seedAtEC(unsigned int i, bool f, double et, double fi) : index(i), ok(f), eta(et), phi(fi) { }
+    seedAtEC(unsigned int i, bool f, double et, double fi) : index(i), ok(f), eta(et), phi(fi) {}
     unsigned int index;
-    bool         ok;
-    double       eta, phi;
+    bool ok;
+    double eta, phi;
   };
 
   const edm::EDGetTokenT<trigger::TriggerFilterObjectWithRefs> tok_hlt_;
@@ -84,5 +82,4 @@ class IsolatedPixelTrackCandidateProducer : public edm::stream::EDProducer<> {
   double bfVal_;
 };
 
-
 #endif
diff --git a/Calibration/HcalIsolatedTrackReco/interface/SiStripRegFEDSelector.h b/Calibration/HcalIsolatedTrackReco/interface/SiStripRegFEDSelector.h
index 7958cf8e276e2..67dc8db39f164 100644
--- a/Calibration/HcalIsolatedTrackReco/interface/SiStripRegFEDSelector.h
+++ b/Calibration/HcalIsolatedTrackReco/interface/SiStripRegFEDSelector.h
@@ -29,15 +29,14 @@ class SiStripRegFEDSelector : public edm::EDProducer {
   edm::ESHandle<SiStripRegionCabling> strip_cabling;
 
   double delta_;
-  
+
   edm::EDGetTokenT<FEDRawDataCollection> tok_raw_;
   edm::EDGetTokenT<trigger::TriggerFilterObjectWithRefs> tok_seed_;
 
 private:
-  void beginJob() override ;
+  void beginJob() override;
   void produce(edm::Event&, const edm::EventSetup&) override;
-  void endJob() override ;
-
+  void endJob() override;
 };
 
 #endif
diff --git a/Calibration/HcalIsolatedTrackReco/interface/SubdetFEDSelector.h b/Calibration/HcalIsolatedTrackReco/interface/SubdetFEDSelector.h
index 7b293927dda71..225096ecd0ac2 100644
--- a/Calibration/HcalIsolatedTrackReco/interface/SubdetFEDSelector.h
+++ b/Calibration/HcalIsolatedTrackReco/interface/SubdetFEDSelector.h
@@ -32,11 +32,11 @@ class SubdetFEDSelector : public edm::EDProducer {
   edm::EDGetTokenT<FEDRawDataCollection> tok_raw_;
 
 private:
-  void beginJob() override ;
+  void beginJob() override;
   void produce(edm::Event&, const edm::EventSetup&) override;
-  void endJob() override ;
+  void endJob() override;
 
-      // ----------member data ---------------------------
+  // ----------member data ---------------------------
 };
 
 #endif
diff --git a/Calibration/HcalIsolatedTrackReco/src/ECALRegFEDSelector.cc b/Calibration/HcalIsolatedTrackReco/src/ECALRegFEDSelector.cc
index 964e334b8d975..4960d213d7c22 100644
--- a/Calibration/HcalIsolatedTrackReco/src/ECALRegFEDSelector.cc
+++ b/Calibration/HcalIsolatedTrackReco/src/ECALRegFEDSelector.cc
@@ -5,11 +5,10 @@
 #include "DataFormats/HcalIsolatedTrack/interface/IsolatedPixelTrackCandidate.h"
 #include "DataFormats/Math/interface/RectangularEtaPhiRegion.h"
 
-ECALRegFEDSelector::ECALRegFEDSelector(const edm::ParameterSet& iConfig)
-{
+ECALRegFEDSelector::ECALRegFEDSelector(const edm::ParameterSet& iConfig) {
   tok_seed_ = consumes<trigger::TriggerFilterObjectWithRefs>(iConfig.getParameter<edm::InputTag>("regSeedLabel"));
-  delta_=iConfig.getParameter<double>("delta");
-  
+  delta_ = iConfig.getParameter<double>("delta");
+
   tok_raw_ = consumes<FEDRawDataCollection>(iConfig.getParameter<edm::InputTag>("rawInputLabel"));
 
   ec_mapping = std::make_unique<EcalElectronicsMapping>();
@@ -17,106 +16,85 @@ ECALRegFEDSelector::ECALRegFEDSelector(const edm::ParameterSet& iConfig)
   produces<FEDRawDataCollection>();
   produces<EcalListOfFEDS>();
 
-  for (int p=0; p<1200; p++)
-    {
-      fedSaved[p]=false;
-    }
-}
-
-
-ECALRegFEDSelector::~ECALRegFEDSelector()
-{
+  for (int p = 0; p < 1200; p++) {
+    fedSaved[p] = false;
+  }
 }
 
+ECALRegFEDSelector::~ECALRegFEDSelector() {}
 
-void ECALRegFEDSelector::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-  for (int p=0; p<1200; p++)
-    {
-      fedSaved[p]=false;
-    }
+void ECALRegFEDSelector::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
+  for (int p = 0; p < 1200; p++) {
+    fedSaved[p] = false;
+  }
 
   auto producedData = std::make_unique<FEDRawDataCollection>();
 
   auto fedList = std::make_unique<EcalListOfFEDS>();
 
   edm::Handle<trigger::TriggerFilterObjectWithRefs> trigSeedTrks;
-  iEvent.getByToken(tok_seed_,trigSeedTrks);
+  iEvent.getByToken(tok_seed_, trigSeedTrks);
 
-  std::vector< edm::Ref<reco::IsolatedPixelTrackCandidateCollection> > isoPixTrackRefs;
+  std::vector<edm::Ref<reco::IsolatedPixelTrackCandidateCollection> > isoPixTrackRefs;
   trigSeedTrks->getObjects(trigger::TriggerTrack, isoPixTrackRefs);
 
   edm::Handle<FEDRawDataCollection> rawIn;
-  iEvent.getByToken(tok_raw_,rawIn);
+  iEvent.getByToken(tok_raw_, rawIn);
 
   //  std::vector<int> EC_FED_IDs;
-  
-  for (uint32_t p=0; p<isoPixTrackRefs.size(); p++)
-    {
-      double etaObj_=isoPixTrackRefs[p]->track()->eta();
-      double phiObj_=isoPixTrackRefs[p]->track()->phi();
-
-      RectangularEtaPhiRegion ecEtaPhi(etaObj_-delta_,etaObj_+delta_,phiObj_-delta_,phiObj_+delta_);
-      
-      const std::vector<int> EC_FED_IDs=ec_mapping->GetListofFEDs(ecEtaPhi);
-      
-      const FEDRawDataCollection *rdc=rawIn.product();
-      
-      for ( int j=0; j< FEDNumbering::MAXFEDID; j++ ) 
-	{
-	  bool rightFED=false;
-	  for (uint32_t k=0; k<EC_FED_IDs.size(); k++)
-	    {
-	      if (j==EcalRegionCabling::fedIndex(EC_FED_IDs[k])) 
-		{
-		  if (!fedSaved[j]) 
-		    {
-		      fedList->AddFED(j);
-		      rightFED=true;
-		      fedSaved[j]=true;
-		    }
-		}
-	    }
-	  if (j>=FEDNumbering::MINPreShowerFEDID&&j<=FEDNumbering::MAXPreShowerFEDID) 
-	    {
-	      fedSaved[j]=true;
-	      rightFED=true;
-	    }
-	  if (!rightFED) continue;
-	  const FEDRawData & fedData = rdc->FEDData(j);
-	  size_t size=fedData.size();
-	  
-	  if ( size > 0 ) 
-	    {
-	      // this fed has data -- lets copy it
-	      FEDRawData & fedDataProd = producedData->FEDData(j);
-	      if ( fedDataProd.size() != 0 ) 
-		{
-//		  std::cout << " More than one FEDRawDataCollection with data in FED ";
-//		  std::cout << j << " Skipping the 2nd\n";
-		  continue;
-		}
-	      fedDataProd.resize(size);
-	      unsigned char *dataProd=fedDataProd.data();
-	      const unsigned char *data=fedData.data();
-	      for ( unsigned int k=0; k<size; ++k ) 
-		{
-		  dataProd[k]=data[k];
-		}
-	    }
-	  
-	}
+
+  for (uint32_t p = 0; p < isoPixTrackRefs.size(); p++) {
+    double etaObj_ = isoPixTrackRefs[p]->track()->eta();
+    double phiObj_ = isoPixTrackRefs[p]->track()->phi();
+
+    RectangularEtaPhiRegion ecEtaPhi(etaObj_ - delta_, etaObj_ + delta_, phiObj_ - delta_, phiObj_ + delta_);
+
+    const std::vector<int> EC_FED_IDs = ec_mapping->GetListofFEDs(ecEtaPhi);
+
+    const FEDRawDataCollection* rdc = rawIn.product();
+
+    for (int j = 0; j < FEDNumbering::MAXFEDID; j++) {
+      bool rightFED = false;
+      for (uint32_t k = 0; k < EC_FED_IDs.size(); k++) {
+        if (j == EcalRegionCabling::fedIndex(EC_FED_IDs[k])) {
+          if (!fedSaved[j]) {
+            fedList->AddFED(j);
+            rightFED = true;
+            fedSaved[j] = true;
+          }
+        }
+      }
+      if (j >= FEDNumbering::MINPreShowerFEDID && j <= FEDNumbering::MAXPreShowerFEDID) {
+        fedSaved[j] = true;
+        rightFED = true;
+      }
+      if (!rightFED)
+        continue;
+      const FEDRawData& fedData = rdc->FEDData(j);
+      size_t size = fedData.size();
+
+      if (size > 0) {
+        // this fed has data -- lets copy it
+        FEDRawData& fedDataProd = producedData->FEDData(j);
+        if (fedDataProd.size() != 0) {
+          //		  std::cout << " More than one FEDRawDataCollection with data in FED ";
+          //		  std::cout << j << " Skipping the 2nd\n";
+          continue;
+        }
+        fedDataProd.resize(size);
+        unsigned char* dataProd = fedDataProd.data();
+        const unsigned char* data = fedData.data();
+        for (unsigned int k = 0; k < size; ++k) {
+          dataProd[k] = data[k];
+        }
+      }
     }
+  }
 
   iEvent.put(std::move(producedData));
   iEvent.put(std::move(fedList));
-  
 }
 
+void ECALRegFEDSelector::beginJob() {}
 
-void ECALRegFEDSelector::beginJob() {
-}
-
-
-void ECALRegFEDSelector::endJob() {
-}
+void ECALRegFEDSelector::endJob() {}
diff --git a/Calibration/HcalIsolatedTrackReco/src/EcalIsolatedParticleCandidateProducer.cc b/Calibration/HcalIsolatedTrackReco/src/EcalIsolatedParticleCandidateProducer.cc
index 78f7719d0be55..a455776b361ac 100644
--- a/Calibration/HcalIsolatedTrackReco/src/EcalIsolatedParticleCandidateProducer.cc
+++ b/Calibration/HcalIsolatedTrackReco/src/EcalIsolatedParticleCandidateProducer.cc
@@ -2,7 +2,7 @@
 //
 // Package:    EcalIsolatedParticleCandidateProducer
 // Class:      EcalIsolatedParticleCandidateProducer
-// 
+//
 /**\class EcalIsolatedParticleCandidateProducer EcalIsolatedParticleCandidateProducer.cc Calibration/EcalIsolatedParticleCandidateProducer/src/EcalIsolatedParticleCandidateProducer.cc
 
  Description: <one line class summary>
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <cmath>
 #include <memory>
@@ -25,7 +24,6 @@
 
 #include "FWCore/Framework/interface/EventSetup.h"
 
-
 #include "DataFormats/Common/interface/Ref.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
@@ -34,173 +32,161 @@
 
 #include "Calibration/HcalIsolatedTrackReco/interface/EcalIsolatedParticleCandidateProducer.h"
 
-EcalIsolatedParticleCandidateProducer::EcalIsolatedParticleCandidateProducer(const edm::ParameterSet& conf)
-{
+EcalIsolatedParticleCandidateProducer::EcalIsolatedParticleCandidateProducer(const edm::ParameterSet& conf) {
   InConeSize_ = conf.getParameter<double>("EcalInnerConeSize");
-  OutConeSize_= conf.getParameter<double>("EcalOuterConeSize");
-  hitCountEthr_= conf.getParameter<double>("ECHitCountEnergyThreshold");
-  hitEthr_=conf.getParameter<double>("ECHitEnergyThreshold");
+  OutConeSize_ = conf.getParameter<double>("EcalOuterConeSize");
+  hitCountEthr_ = conf.getParameter<double>("ECHitCountEnergyThreshold");
+  hitEthr_ = conf.getParameter<double>("ECHitEnergyThreshold");
   tok_l1tau_ = consumes<l1extra::L1JetParticleCollection>(conf.getParameter<edm::InputTag>("L1eTauJetsSource"));
   tok_hlt_ = consumes<trigger::TriggerFilterObjectWithRefs>(conf.getParameter<edm::InputTag>("L1GTSeedLabel"));
   tok_EB_ = consumes<EcalRecHitCollection>(conf.getParameter<edm::InputTag>("EBrecHitCollectionLabel"));
   tok_EE_ = consumes<EcalRecHitCollection>(conf.getParameter<edm::InputTag>("EErecHitCollectionLabel"));
 
-   //register your products
-  produces< reco::IsolatedPixelTrackCandidateCollection >();
-
+  //register your products
+  produces<reco::IsolatedPixelTrackCandidateCollection>();
 }
 
-
-EcalIsolatedParticleCandidateProducer::~EcalIsolatedParticleCandidateProducer()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+EcalIsolatedParticleCandidateProducer::~EcalIsolatedParticleCandidateProducer() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void 
-EcalIsolatedParticleCandidateProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const {
-
-//  std::cout<<"get tau"<<std::endl;
+void EcalIsolatedParticleCandidateProducer::produce(edm::StreamID,
+                                                    edm::Event& iEvent,
+                                                    const edm::EventSetup& iSetup) const {
+  //  std::cout<<"get tau"<<std::endl;
 
   edm::Handle<l1extra::L1JetParticleCollection> l1Taus;
-  iEvent.getByToken(tok_l1tau_,l1Taus);
-  
-//  std::cout<<"get geom"<<std::endl;
+  iEvent.getByToken(tok_l1tau_, l1Taus);
+
+  //  std::cout<<"get geom"<<std::endl;
 
   edm::ESHandle<CaloGeometry> pG;
   iSetup.get<CaloGeometryRecord>().get(pG);
   const CaloGeometry* geo = pG.product();
 
-//  std::cout<<" get ec rechit"<<std::endl;
+  //  std::cout<<" get ec rechit"<<std::endl;
 
   edm::Handle<EcalRecHitCollection> ecalEB;
-  iEvent.getByToken(tok_EB_,ecalEB);
+  iEvent.getByToken(tok_EB_, ecalEB);
 
   edm::Handle<EcalRecHitCollection> ecalEE;
-  iEvent.getByToken(tok_EE_,ecalEE);
+  iEvent.getByToken(tok_EE_, ecalEE);
 
-//  std::cout<<"get l1 trig obj"<<std::endl;
+  //  std::cout<<"get l1 trig obj"<<std::endl;
 
   edm::Handle<trigger::TriggerFilterObjectWithRefs> l1trigobj;
   iEvent.getByToken(tok_hlt_, l1trigobj);
 
-  std::vector< edm::Ref<l1t::TauBxCollection> > l1tauobjref;
-  std::vector< edm::Ref<l1t::JetBxCollection> > l1jetobjref;
-  
+  std::vector<edm::Ref<l1t::TauBxCollection> > l1tauobjref;
+  std::vector<edm::Ref<l1t::JetBxCollection> > l1jetobjref;
+
   l1trigobj->getObjects(trigger::TriggerL1Tau, l1tauobjref);
   l1trigobj->getObjects(trigger::TriggerL1Jet, l1jetobjref);
-   
-  double ptTriggered=-10;
-  double etaTriggered=-100;
-  double phiTriggered=-100;
-
-//  std::cout<<"find highest pT triggered obj"<<std::endl;
-
-  for (unsigned int p=0; p<l1tauobjref.size(); p++) {
-    if (l1tauobjref[p]->pt()>ptTriggered) {
-      ptTriggered=l1tauobjref[p]->pt();
-      phiTriggered=l1tauobjref[p]->phi();
-      etaTriggered=l1tauobjref[p]->eta();
+
+  double ptTriggered = -10;
+  double etaTriggered = -100;
+  double phiTriggered = -100;
+
+  //  std::cout<<"find highest pT triggered obj"<<std::endl;
+
+  for (unsigned int p = 0; p < l1tauobjref.size(); p++) {
+    if (l1tauobjref[p]->pt() > ptTriggered) {
+      ptTriggered = l1tauobjref[p]->pt();
+      phiTriggered = l1tauobjref[p]->phi();
+      etaTriggered = l1tauobjref[p]->eta();
     }
   }
-  for (unsigned int p=0; p<l1jetobjref.size(); p++) {
-    if (l1jetobjref[p]->pt()>ptTriggered) {
-      ptTriggered=l1jetobjref[p]->pt();
-      phiTriggered=l1jetobjref[p]->phi();
-      etaTriggered=l1jetobjref[p]->eta();
+  for (unsigned int p = 0; p < l1jetobjref.size(); p++) {
+    if (l1jetobjref[p]->pt() > ptTriggered) {
+      ptTriggered = l1jetobjref[p]->pt();
+      phiTriggered = l1jetobjref[p]->phi();
+      etaTriggered = l1jetobjref[p]->eta();
     }
   }
 
   auto iptcCollection = std::make_unique<reco::IsolatedPixelTrackCandidateCollection>();
 
-//  std::cout<<"loop over l1taus"<<std::endl;
-
-  for (l1extra::L1JetParticleCollection::const_iterator tit=l1Taus->begin(); tit!=l1Taus->end(); tit++) {
-    double dphi=fabs(tit->phi()-phiTriggered);
-    if (dphi>M_PI) dphi=2*M_PI-dphi;
-    double Rseed=sqrt(pow(etaTriggered-tit->eta(),2)+dphi*dphi);
-    if (Rseed<1.2) continue;
-    int nhitOut=0;
-    int nhitIn=0;
-    double OutEnergy=0;
-    double InEnergy=0;
-//	std::cout<<" loops over rechits"<<std::endl;
-    for (EcalRecHitCollection::const_iterator eItr=ecalEB->begin(); eItr!=ecalEB->end(); eItr++) {
+  //  std::cout<<"loop over l1taus"<<std::endl;
+
+  for (l1extra::L1JetParticleCollection::const_iterator tit = l1Taus->begin(); tit != l1Taus->end(); tit++) {
+    double dphi = fabs(tit->phi() - phiTriggered);
+    if (dphi > M_PI)
+      dphi = 2 * M_PI - dphi;
+    double Rseed = sqrt(pow(etaTriggered - tit->eta(), 2) + dphi * dphi);
+    if (Rseed < 1.2)
+      continue;
+    int nhitOut = 0;
+    int nhitIn = 0;
+    double OutEnergy = 0;
+    double InEnergy = 0;
+    //	std::cout<<" loops over rechits"<<std::endl;
+    for (EcalRecHitCollection::const_iterator eItr = ecalEB->begin(); eItr != ecalEB->end(); eItr++) {
       double phiD, R;
       const GlobalPoint& pos = geo->getPosition(eItr->detid());
       double phihit = pos.phi();
       double etahit = pos.eta();
-      phiD=fabs(phihit-tit->phi());
-      if (phiD>M_PI) phiD=2*M_PI-phiD;
-      R=sqrt(pow(etahit-tit->eta(),2)+phiD*phiD);
-                
-      if (R<OutConeSize_&&R>InConeSize_&&eItr->energy()>hitCountEthr_) {
-	nhitOut++;
+      phiD = fabs(phihit - tit->phi());
+      if (phiD > M_PI)
+        phiD = 2 * M_PI - phiD;
+      R = sqrt(pow(etahit - tit->eta(), 2) + phiD * phiD);
+
+      if (R < OutConeSize_ && R > InConeSize_ && eItr->energy() > hitCountEthr_) {
+        nhitOut++;
       }
-      if (R<InConeSize_&&eItr->energy()>hitCountEthr_)                 {
-	nhitIn++;
+      if (R < InConeSize_ && eItr->energy() > hitCountEthr_) {
+        nhitIn++;
       }
 
-      if (R<OutConeSize_&&R>InConeSize_&&eItr->energy()>hitEthr_)      {
-	OutEnergy+=eItr->energy();
+      if (R < OutConeSize_ && R > InConeSize_ && eItr->energy() > hitEthr_) {
+        OutEnergy += eItr->energy();
       }
-      if (R<InConeSize_&&eItr->energy()>hitEthr_)                      {
-	InEnergy+=eItr->energy();
+      if (R < InConeSize_ && eItr->energy() > hitEthr_) {
+        InEnergy += eItr->energy();
       }
-
     }
-    
-    for (EcalRecHitCollection::const_iterator eItr=ecalEE->begin(); eItr!=ecalEE->end(); eItr++)  {
+
+    for (EcalRecHitCollection::const_iterator eItr = ecalEE->begin(); eItr != ecalEE->end(); eItr++) {
       double phiD, R;
       const GlobalPoint& pos = geo->getPosition(eItr->detid());
       double phihit = pos.phi();
       double etahit = pos.eta();
-      phiD=fabs(phihit-tit->phi());
-      if (phiD>M_PI) phiD=2*M_PI-phiD;
-      R=sqrt(pow(etahit-tit->eta(),2)+phiD*phiD);
-      if (R<OutConeSize_&&R>InConeSize_&&eItr->energy()>hitCountEthr_)  {
-	nhitOut++;
+      phiD = fabs(phihit - tit->phi());
+      if (phiD > M_PI)
+        phiD = 2 * M_PI - phiD;
+      R = sqrt(pow(etahit - tit->eta(), 2) + phiD * phiD);
+      if (R < OutConeSize_ && R > InConeSize_ && eItr->energy() > hitCountEthr_) {
+        nhitOut++;
       }
-      if (R<InConeSize_&&eItr->energy()>hitCountEthr_)                  {
-	nhitIn++;
+      if (R < InConeSize_ && eItr->energy() > hitCountEthr_) {
+        nhitIn++;
       }
-      if (R<OutConeSize_&&R>InConeSize_&&eItr->energy()>hitEthr_)       {
-	OutEnergy+=eItr->energy();
+      if (R < OutConeSize_ && R > InConeSize_ && eItr->energy() > hitEthr_) {
+        OutEnergy += eItr->energy();
       }
-      if (R<InConeSize_&&eItr->energy()>hitEthr_)                       {
-	InEnergy+=eItr->energy();
+      if (R < InConeSize_ && eItr->energy() > hitEthr_) {
+        InEnergy += eItr->energy();
       }
-
     }
-//	std::cout<<"create and push_back candidate"<<std::endl;
-    reco::IsolatedPixelTrackCandidate newca(l1extra::L1JetParticleRef(l1Taus,tit-l1Taus->begin()), InEnergy, OutEnergy, nhitIn, nhitOut);
-    iptcCollection->push_back(newca);	
+    //	std::cout<<"create and push_back candidate"<<std::endl;
+    reco::IsolatedPixelTrackCandidate newca(
+        l1extra::L1JetParticleRef(l1Taus, tit - l1Taus->begin()), InEnergy, OutEnergy, nhitIn, nhitOut);
+    iptcCollection->push_back(newca);
   }
 
-
-  
-  //Use the ExampleData to create an ExampleData2 which 
+  //Use the ExampleData to create an ExampleData2 which
   // is put into the Event
-  
-//  std::cout<<"put cand into event"<<std::endl;
-  iEvent.put(std::move(iptcCollection));
 
+  //  std::cout<<"put cand into event"<<std::endl;
+  iEvent.put(std::move(iptcCollection));
 }
 // ------------ method called once each job just before starting event loop  ------------
-void 
-EcalIsolatedParticleCandidateProducer::beginJob() {
-}
+void EcalIsolatedParticleCandidateProducer::beginJob() {}
 
 // ------------ method called once each job just after ending the event loop  ------------
-void 
-EcalIsolatedParticleCandidateProducer::endJob() {
-}
-
+void EcalIsolatedParticleCandidateProducer::endJob() {}
diff --git a/Calibration/HcalIsolatedTrackReco/src/HITRegionalPixelSeedGenerator.h b/Calibration/HcalIsolatedTrackReco/src/HITRegionalPixelSeedGenerator.h
index 56def657f91b2..6cceeb2ebc9eb 100644
--- a/Calibration/HcalIsolatedTrackReco/src/HITRegionalPixelSeedGenerator.h
+++ b/Calibration/HcalIsolatedTrackReco/src/HITRegionalPixelSeedGenerator.h
@@ -4,7 +4,6 @@
 //
 // Class:           HITRegionalPixelSeedGenerator
 
-
 #include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
@@ -34,20 +33,17 @@
 #include "DataFormats/JetReco/interface/Jet.h"
 
 class HITRegionalPixelSeedGenerator : public TrackingRegionProducer {
- public:
-  
-  explicit HITRegionalPixelSeedGenerator(const edm::ParameterSet& conf_,
-	edm::ConsumesCollector && iC)
-  {
-    edm::LogInfo ("HITRegionalPixelSeedGenerator")<<"Enter the HITRegionalPixelSeedGenerator";
-    
+public:
+  explicit HITRegionalPixelSeedGenerator(const edm::ParameterSet& conf_, edm::ConsumesCollector&& iC) {
+    edm::LogInfo("HITRegionalPixelSeedGenerator") << "Enter the HITRegionalPixelSeedGenerator";
+
     edm::ParameterSet regionPSet = conf_.getParameter<edm::ParameterSet>("RegionPSet");
-    
-    ptmin=regionPSet.getParameter<double>("ptMin");
-    originradius=regionPSet.getParameter<double>("originRadius");
-    halflength=regionPSet.getParameter<double>("originHalfLength");
-    etaCenter_=regionPSet.getParameter<double>("etaCenter");
-    phiCenter_=regionPSet.getParameter<double>("phiCenter");
+
+    ptmin = regionPSet.getParameter<double>("ptMin");
+    originradius = regionPSet.getParameter<double>("originRadius");
+    halflength = regionPSet.getParameter<double>("originHalfLength");
+    etaCenter_ = regionPSet.getParameter<double>("etaCenter");
+    phiCenter_ = regionPSet.getParameter<double>("phiCenter");
     deltaTrackEta = regionPSet.getParameter<double>("deltaEtaTrackRegion");
     deltaTrackPhi = regionPSet.getParameter<double>("deltaPhiTrackRegion");
     deltaL1JetEta = regionPSet.getParameter<double>("deltaEtaL1JetRegion");
@@ -57,175 +53,140 @@ class HITRegionalPixelSeedGenerator : public TrackingRegionProducer {
     useIsoTracks_ = regionPSet.getParameter<bool>("useIsoTracks");
     fixedReg_ = regionPSet.getParameter<bool>("fixedReg");
 
-    if (usetracks_) token_trks = iC.consumes<reco::TrackCollection>(regionPSet.getParameter<edm::InputTag>("trackSrc"));
-    if (usetracks_ || useIsoTracks_ || fixedReg_ || usejets_) 
+    if (usetracks_)
+      token_trks = iC.consumes<reco::TrackCollection>(regionPSet.getParameter<edm::InputTag>("trackSrc"));
+    if (usetracks_ || useIsoTracks_ || fixedReg_ || usejets_)
       token_vertex = iC.consumes<reco::VertexCollection>(regionPSet.getParameter<edm::InputTag>("vertexSrc"));
-    if (useIsoTracks_) token_isoTrack = iC.consumes<trigger::TriggerFilterObjectWithRefs>(regionPSet.getParameter<edm::InputTag>("isoTrackSrc"));
-    if (usejets_) token_l1jet = iC.consumes<l1extra::L1JetParticleCollection>(regionPSet.getParameter<edm::InputTag>("l1tjetSrc"));
+    if (useIsoTracks_)
+      token_isoTrack =
+          iC.consumes<trigger::TriggerFilterObjectWithRefs>(regionPSet.getParameter<edm::InputTag>("isoTrackSrc"));
+    if (usejets_)
+      token_l1jet = iC.consumes<l1extra::L1JetParticleCollection>(regionPSet.getParameter<edm::InputTag>("l1tjetSrc"));
   }
 
   ~HITRegionalPixelSeedGenerator() override {}
-  
-  
-  std::vector<std::unique_ptr<TrackingRegion> > regions(const edm::Event& e, const edm::EventSetup& es) const override
-    {
-      std::vector<std::unique_ptr<TrackingRegion> > result;
-      float originz =0.;
-      
-      double deltaZVertex =  halflength;
-      
-      
-      
-      if (usetracks_)
-	{
-	  edm::Handle<reco::TrackCollection> tracks;
-	  e.getByToken(token_trks, tracks);
-	  
-	  edm::Handle<reco::VertexCollection> vertices;
-	  e.getByToken(token_vertex,vertices);
-	  const reco::VertexCollection vertCollection = *(vertices.product());
-	  reco::VertexCollection::const_iterator ci = vertCollection.begin();
-	  
-	  if(!vertCollection.empty()) 
-	    {
-	      originz = ci->z();
-	    }
-	  else
-	    {
-	      deltaZVertex = 15.;
-	    }
-      
-	  GlobalVector globalVector(0,0,1);
-	  if(tracks->empty()) return result;
-	  
-	  reco::TrackCollection::const_iterator itr = tracks->begin();
-	  for(;itr != tracks->end();itr++)
-	    {
-	      
-	      GlobalVector ptrVec((itr)->px(),(itr)->py(),(itr)->pz());
-	      globalVector = ptrVec;
-	      
-	      
-	      result.push_back(std::make_unique<RectangularEtaPhiTrackingRegion>(globalVector,
-                                                                                 GlobalPoint(0,0,originz),
-                                                                                 ptmin,
-                                                                                 originradius,
-                                                                                 deltaZVertex,
-                                                                                 deltaTrackEta,
-                                                                                 deltaTrackPhi));
-	    }
-	}
-      
-      if (useIsoTracks_)
-        {
-          edm::Handle<trigger::TriggerFilterObjectWithRefs> isotracks;
-          e.getByToken(token_isoTrack, isotracks);
-
-	  std::vector< edm::Ref<reco::IsolatedPixelTrackCandidateCollection> > isoPixTrackRefs;
-	
-	  isotracks->getObjects(trigger::TriggerTrack, isoPixTrackRefs);
-	  
-          edm::Handle<reco::VertexCollection> vertices;
-          e.getByToken(token_vertex,vertices);
-          const reco::VertexCollection vertCollection = *(vertices.product());
-          reco::VertexCollection::const_iterator ci = vertCollection.begin();
-
-          if(!vertCollection.empty()) 
-	    {
-	      originz = ci->z();
-	    }
-	  else
-	    {
-	      deltaZVertex = 15.;
-	    }
-	  
-          GlobalVector globalVector(0,0,1);
-          if(isoPixTrackRefs.empty()) return result;
-	  
-          for(uint32_t p=0; p<isoPixTrackRefs.size(); p++)
-            {
-              GlobalVector ptrVec((isoPixTrackRefs[p]->track())->px(),(isoPixTrackRefs[p]->track())->py(),(isoPixTrackRefs[p]->track())->pz());
-              globalVector = ptrVec;
-	      
-              result.push_back(std::make_unique<RectangularEtaPhiTrackingRegion>(globalVector,
-                                                                                 GlobalPoint(0,0,originz),
-                                                                                 ptmin,
-                                                                                 originradius,
-                                                                                 deltaZVertex,
-                                                                                 deltaTrackEta,
-                                                                                 deltaTrackPhi));
-	    }
-	}
-      
-      if (usejets_)
-	{
-	  edm::Handle<l1extra::L1JetParticleCollection> jets;
-	  e.getByToken(token_l1jet, jets);
-
-          edm::Handle<reco::VertexCollection> vertices;
-          e.getByToken(token_vertex, vertices);
-          const reco::VertexCollection vertCollection = *(vertices.product());
-          reco::VertexCollection::const_iterator ci = vertCollection.begin();
-          if(!vertCollection.empty()) 
-	    {
-	      originz = ci->z();
-	    }
-	  else
-	    {
-	      deltaZVertex = 15.;
-	    }
-
-	  GlobalVector globalVector(0,0,1);
-	  if(jets->empty()) return result;
-	  
-	  for (l1extra::L1JetParticleCollection::const_iterator iJet = jets->begin(); iJet != jets->end(); iJet++) 
-	    {
-	      GlobalVector jetVector(iJet->p4().x(), iJet->p4().y(), iJet->p4().z());
-	      GlobalPoint  vertex(0, 0, originz);
-	      
-	      result.push_back(std::make_unique<RectangularEtaPhiTrackingRegion>( jetVector,
-                                                                                  vertex,
-                                                                                  ptmin,
-                                                                                  originradius,
-                                                                                  deltaZVertex,
-                                                                                  deltaL1JetEta,
-                                                                                  deltaL1JetPhi ));
-	    }
-	}
-      if (fixedReg_)
-	{
-	  GlobalVector fixedVector(cos(phiCenter_)*sin(2*atan(exp(-etaCenter_))), sin(phiCenter_)*sin(2*atan(exp(-etaCenter_))), cos(2*atan(exp(-etaCenter_))));
-	  GlobalPoint  vertex(0, 0, originz);
-	  
-	  edm::Handle<reco::VertexCollection> vertices;
-	  e.getByToken(token_vertex,vertices);
-	  const reco::VertexCollection vertCollection = *(vertices.product());
-	  reco::VertexCollection::const_iterator ci = vertCollection.begin();
-	  if(!vertCollection.empty()) 
-	    {
-	      originz = ci->z();
-	    }
-	  else
-	    {
-	      deltaZVertex = 15.;
-	    }
-	  
-	  result.push_back(std::make_unique<RectangularEtaPhiTrackingRegion>( fixedVector,
-                                                                              vertex,
-                                                                              ptmin,
-                                                                              originradius,
-                                                                              deltaZVertex,
-                                                                              deltaL1JetEta,
-                                                                              deltaL1JetPhi ));
-	}
-      
-      return result;
+
+  std::vector<std::unique_ptr<TrackingRegion> > regions(const edm::Event& e, const edm::EventSetup& es) const override {
+    std::vector<std::unique_ptr<TrackingRegion> > result;
+    float originz = 0.;
+
+    double deltaZVertex = halflength;
+
+    if (usetracks_) {
+      edm::Handle<reco::TrackCollection> tracks;
+      e.getByToken(token_trks, tracks);
+
+      edm::Handle<reco::VertexCollection> vertices;
+      e.getByToken(token_vertex, vertices);
+      const reco::VertexCollection vertCollection = *(vertices.product());
+      reco::VertexCollection::const_iterator ci = vertCollection.begin();
+
+      if (!vertCollection.empty()) {
+        originz = ci->z();
+      } else {
+        deltaZVertex = 15.;
+      }
+
+      GlobalVector globalVector(0, 0, 1);
+      if (tracks->empty())
+        return result;
+
+      reco::TrackCollection::const_iterator itr = tracks->begin();
+      for (; itr != tracks->end(); itr++) {
+        GlobalVector ptrVec((itr)->px(), (itr)->py(), (itr)->pz());
+        globalVector = ptrVec;
+
+        result.push_back(std::make_unique<RectangularEtaPhiTrackingRegion>(
+            globalVector, GlobalPoint(0, 0, originz), ptmin, originradius, deltaZVertex, deltaTrackEta, deltaTrackPhi));
+      }
     }
-  
-  
- private:
+
+    if (useIsoTracks_) {
+      edm::Handle<trigger::TriggerFilterObjectWithRefs> isotracks;
+      e.getByToken(token_isoTrack, isotracks);
+
+      std::vector<edm::Ref<reco::IsolatedPixelTrackCandidateCollection> > isoPixTrackRefs;
+
+      isotracks->getObjects(trigger::TriggerTrack, isoPixTrackRefs);
+
+      edm::Handle<reco::VertexCollection> vertices;
+      e.getByToken(token_vertex, vertices);
+      const reco::VertexCollection vertCollection = *(vertices.product());
+      reco::VertexCollection::const_iterator ci = vertCollection.begin();
+
+      if (!vertCollection.empty()) {
+        originz = ci->z();
+      } else {
+        deltaZVertex = 15.;
+      }
+
+      GlobalVector globalVector(0, 0, 1);
+      if (isoPixTrackRefs.empty())
+        return result;
+
+      for (uint32_t p = 0; p < isoPixTrackRefs.size(); p++) {
+        GlobalVector ptrVec((isoPixTrackRefs[p]->track())->px(),
+                            (isoPixTrackRefs[p]->track())->py(),
+                            (isoPixTrackRefs[p]->track())->pz());
+        globalVector = ptrVec;
+
+        result.push_back(std::make_unique<RectangularEtaPhiTrackingRegion>(
+            globalVector, GlobalPoint(0, 0, originz), ptmin, originradius, deltaZVertex, deltaTrackEta, deltaTrackPhi));
+      }
+    }
+
+    if (usejets_) {
+      edm::Handle<l1extra::L1JetParticleCollection> jets;
+      e.getByToken(token_l1jet, jets);
+
+      edm::Handle<reco::VertexCollection> vertices;
+      e.getByToken(token_vertex, vertices);
+      const reco::VertexCollection vertCollection = *(vertices.product());
+      reco::VertexCollection::const_iterator ci = vertCollection.begin();
+      if (!vertCollection.empty()) {
+        originz = ci->z();
+      } else {
+        deltaZVertex = 15.;
+      }
+
+      GlobalVector globalVector(0, 0, 1);
+      if (jets->empty())
+        return result;
+
+      for (l1extra::L1JetParticleCollection::const_iterator iJet = jets->begin(); iJet != jets->end(); iJet++) {
+        GlobalVector jetVector(iJet->p4().x(), iJet->p4().y(), iJet->p4().z());
+        GlobalPoint vertex(0, 0, originz);
+
+        result.push_back(std::make_unique<RectangularEtaPhiTrackingRegion>(
+            jetVector, vertex, ptmin, originradius, deltaZVertex, deltaL1JetEta, deltaL1JetPhi));
+      }
+    }
+    if (fixedReg_) {
+      GlobalVector fixedVector(cos(phiCenter_) * sin(2 * atan(exp(-etaCenter_))),
+                               sin(phiCenter_) * sin(2 * atan(exp(-etaCenter_))),
+                               cos(2 * atan(exp(-etaCenter_))));
+      GlobalPoint vertex(0, 0, originz);
+
+      edm::Handle<reco::VertexCollection> vertices;
+      e.getByToken(token_vertex, vertices);
+      const reco::VertexCollection vertCollection = *(vertices.product());
+      reco::VertexCollection::const_iterator ci = vertCollection.begin();
+      if (!vertCollection.empty()) {
+        originz = ci->z();
+      } else {
+        deltaZVertex = 15.;
+      }
+
+      result.push_back(std::make_unique<RectangularEtaPhiTrackingRegion>(
+          fixedVector, vertex, ptmin, originradius, deltaZVertex, deltaL1JetEta, deltaL1JetPhi));
+    }
+
+    return result;
+  }
+
+private:
   edm::ParameterSet conf_;
-  
+
   float ptmin;
   float originradius;
   float halflength;
@@ -239,14 +200,10 @@ class HITRegionalPixelSeedGenerator : public TrackingRegionProducer {
   bool usetracks_;
   bool fixedReg_;
   bool useIsoTracks_;
-  edm::EDGetTokenT<reco::TrackCollection> token_trks; 
-  edm::EDGetTokenT<reco::VertexCollection> token_vertex; 
-  edm::EDGetTokenT<trigger::TriggerFilterObjectWithRefs> token_isoTrack; 
-  edm::EDGetTokenT<l1extra::L1JetParticleCollection> token_l1jet; 
-
+  edm::EDGetTokenT<reco::TrackCollection> token_trks;
+  edm::EDGetTokenT<reco::VertexCollection> token_vertex;
+  edm::EDGetTokenT<trigger::TriggerFilterObjectWithRefs> token_isoTrack;
+  edm::EDGetTokenT<l1extra::L1JetParticleCollection> token_l1jet;
 };
 
 #endif
-
-
-
diff --git a/Calibration/HcalIsolatedTrackReco/src/IPTCorrector.cc b/Calibration/HcalIsolatedTrackReco/src/IPTCorrector.cc
index 233143df88fad..e8dceb4279975 100644
--- a/Calibration/HcalIsolatedTrackReco/src/IPTCorrector.cc
+++ b/Calibration/HcalIsolatedTrackReco/src/IPTCorrector.cc
@@ -19,74 +19,73 @@
 #include "Math/GenVector/PxPyPzE4D.h"
 #include "DataFormats/Math/interface/deltaR.h"
 
-IPTCorrector::IPTCorrector(const edm::ParameterSet& config) :
-  tok_cor_(   consumes<reco::TrackCollection>(config.getParameter<edm::InputTag>("corTracksLabel")) ),
-  tok_uncor_( consumes<trigger::TriggerFilterObjectWithRefs>(config.getParameter<edm::InputTag>("filterLabel")) ),
-  assocCone_( config.getParameter<double>("associationCone") )
-{  
+IPTCorrector::IPTCorrector(const edm::ParameterSet& config)
+    : tok_cor_(consumes<reco::TrackCollection>(config.getParameter<edm::InputTag>("corTracksLabel"))),
+      tok_uncor_(consumes<trigger::TriggerFilterObjectWithRefs>(config.getParameter<edm::InputTag>("filterLabel"))),
+      assocCone_(config.getParameter<double>("associationCone")) {
   // register the product
-  produces< reco::IsolatedPixelTrackCandidateCollection >();
+  produces<reco::IsolatedPixelTrackCandidateCollection>();
 }
 
 void IPTCorrector::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
-  desc.add<edm::InputTag>("corTracksLabel",edm::InputTag("hltIter0PFlowCtfWithMaterialTracks"));
-  desc.add<edm::InputTag>("filterLabel",edm::InputTag("hltIsolPixelTrackL2Filter"));
-  desc.add<double>("associationCone",0.2);
-  descriptions.add("iptCorrector",desc);
+  desc.add<edm::InputTag>("corTracksLabel", edm::InputTag("hltIter0PFlowCtfWithMaterialTracks"));
+  desc.add<edm::InputTag>("filterLabel", edm::InputTag("hltIsolPixelTrackL2Filter"));
+  desc.add<double>("associationCone", 0.2);
+  descriptions.add("iptCorrector", desc);
 }
 
 void IPTCorrector::produce(edm::StreamID, edm::Event& theEvent, edm::EventSetup const&) const {
-
   auto trackCollection = std::make_unique<reco::IsolatedPixelTrackCandidateCollection>();
 
   edm::Handle<reco::TrackCollection> corTracks;
-  theEvent.getByToken(tok_cor_,corTracks);
+  theEvent.getByToken(tok_cor_, corTracks);
 
   edm::Handle<trigger::TriggerFilterObjectWithRefs> fiCand;
-  theEvent.getByToken(tok_uncor_,fiCand);
+  theEvent.getByToken(tok_uncor_, fiCand);
 
-  std::vector< edm::Ref<reco::IsolatedPixelTrackCandidateCollection> > isoPixTrackRefs;
+  std::vector<edm::Ref<reco::IsolatedPixelTrackCandidateCollection> > isoPixTrackRefs;
 
   fiCand->getObjects(trigger::TriggerTrack, isoPixTrackRefs);
 
-  int nCand=isoPixTrackRefs.size();
+  int nCand = isoPixTrackRefs.size();
 
   //loop over input ipt
 
-  for (int p=0; p<nCand; p++) {
-    double iptEta=isoPixTrackRefs[p]->track()->eta();
-    double iptPhi=isoPixTrackRefs[p]->track()->phi();
-  
-    int ntrk=0;
-    double minDR=100;
+  for (int p = 0; p < nCand; p++) {
+    double iptEta = isoPixTrackRefs[p]->track()->eta();
+    double iptPhi = isoPixTrackRefs[p]->track()->phi();
+
+    int ntrk = 0;
+    double minDR = 100;
     reco::TrackCollection::const_iterator citSel;
 
-    for (reco::TrackCollection::const_iterator cit=corTracks->begin(); cit!=corTracks->end(); cit++) {
-      double dR=deltaR(cit->eta(), cit->phi(), iptEta, iptPhi);
-      if (dR<minDR&&dR<assocCone_) {
-	minDR=dR;
-	ntrk++;
-	citSel=cit;
+    for (reco::TrackCollection::const_iterator cit = corTracks->begin(); cit != corTracks->end(); cit++) {
+      double dR = deltaR(cit->eta(), cit->phi(), iptEta, iptPhi);
+      if (dR < minDR && dR < assocCone_) {
+        minDR = dR;
+        ntrk++;
+        citSel = cit;
       }
     }
 
-    if (ntrk>0) {
-      reco::IsolatedPixelTrackCandidate newCandidate(reco::TrackRef(corTracks,citSel-corTracks->begin()), isoPixTrackRefs[p]->l1tau(),isoPixTrackRefs[p]->maxPtPxl(), isoPixTrackRefs[p]->sumPtPxl());
+    if (ntrk > 0) {
+      reco::IsolatedPixelTrackCandidate newCandidate(reco::TrackRef(corTracks, citSel - corTracks->begin()),
+                                                     isoPixTrackRefs[p]->l1tau(),
+                                                     isoPixTrackRefs[p]->maxPtPxl(),
+                                                     isoPixTrackRefs[p]->sumPtPxl());
       newCandidate.setEnergyIn(isoPixTrackRefs[p]->energyIn());
       newCandidate.setEnergyOut(isoPixTrackRefs[p]->energyOut());
       newCandidate.setNHitIn(isoPixTrackRefs[p]->nHitIn());
       newCandidate.setNHitOut(isoPixTrackRefs[p]->nHitOut());
       if (isoPixTrackRefs[p]->etaPhiEcalValid()) {
-	std::pair<double,double> etaphi = (isoPixTrackRefs[p]->etaPhiEcal());
-	newCandidate.setEtaPhiEcal(etaphi.first,etaphi.second);
+        std::pair<double, double> etaphi = (isoPixTrackRefs[p]->etaPhiEcal());
+        newCandidate.setEtaPhiEcal(etaphi.first, etaphi.second);
       }
       trackCollection->push_back(newCandidate);
     }
   }
-  
+
   // put the product in the event
   theEvent.put(std::move(trackCollection));
-
-
 }
diff --git a/Calibration/HcalIsolatedTrackReco/src/IsolatedEcalPixelTrackCandidateProducer.cc b/Calibration/HcalIsolatedTrackReco/src/IsolatedEcalPixelTrackCandidateProducer.cc
index 02caad1b75acc..64fbf8d6b3233 100644
--- a/Calibration/HcalIsolatedTrackReco/src/IsolatedEcalPixelTrackCandidateProducer.cc
+++ b/Calibration/HcalIsolatedTrackReco/src/IsolatedEcalPixelTrackCandidateProducer.cc
@@ -2,7 +2,7 @@
 //
 // Package:    IsolatedEcalPixelTrackCandidateProducer
 // Class:      IsolatedEcalPixelTrackCandidateProducer
-// 
+//
 /**\class IsolatedEcalPixelTrackCandidateProducer IsolatedEcalPixelTrackCandidateProducer.cc Calibration/HcalIsolatedTrackReco/src/IsolatedEcalPixelTrackCandidateProducer.cc
 
  Description: <one line class summary>
@@ -34,45 +34,46 @@
 
 #include "Calibration/HcalIsolatedTrackReco/interface/IsolatedEcalPixelTrackCandidateProducer.h"
 
-IsolatedEcalPixelTrackCandidateProducer::IsolatedEcalPixelTrackCandidateProducer(const edm::ParameterSet& conf) :
-  tok_ee(        consumes<EcalRecHitCollection>(conf.getParameter<edm::InputTag>("EERecHitSource")) ),
-  tok_eb(        consumes<EcalRecHitCollection>(conf.getParameter<edm::InputTag>("EBRecHitSource")) ),
-  tok_trigcand(  consumes<trigger::TriggerFilterObjectWithRefs>(conf.getParameter<edm::InputTag>("filterLabel")) ),
-  coneSizeEta0_( conf.getParameter<double>("EcalConeSizeEta0") ),
-  coneSizeEta1_( conf.getParameter<double>("EcalConeSizeEta1") ),
-  hitCountEthrEB_( conf.getParameter<double>("EBHitCountEnergyThreshold") ),
-  hitEthrEB_(      conf.getParameter<double>("EBHitEnergyThreshold") ),
-  fachitCountEE_(  conf.getParameter<double>("EEFacHitCountEnergyThreshold") ),
-  hitEthrEE0_(     conf.getParameter<double>("EEHitEnergyThreshold0") ),
-  hitEthrEE1_(     conf.getParameter<double>("EEHitEnergyThreshold1") ),
-  hitEthrEE2_(     conf.getParameter<double>("EEHitEnergyThreshold2") ),
-  hitEthrEE3_(     conf.getParameter<double>("EEHitEnergyThreshold3") )
-{
+IsolatedEcalPixelTrackCandidateProducer::IsolatedEcalPixelTrackCandidateProducer(const edm::ParameterSet& conf)
+    : tok_ee(consumes<EcalRecHitCollection>(conf.getParameter<edm::InputTag>("EERecHitSource"))),
+      tok_eb(consumes<EcalRecHitCollection>(conf.getParameter<edm::InputTag>("EBRecHitSource"))),
+      tok_trigcand(consumes<trigger::TriggerFilterObjectWithRefs>(conf.getParameter<edm::InputTag>("filterLabel"))),
+      coneSizeEta0_(conf.getParameter<double>("EcalConeSizeEta0")),
+      coneSizeEta1_(conf.getParameter<double>("EcalConeSizeEta1")),
+      hitCountEthrEB_(conf.getParameter<double>("EBHitCountEnergyThreshold")),
+      hitEthrEB_(conf.getParameter<double>("EBHitEnergyThreshold")),
+      fachitCountEE_(conf.getParameter<double>("EEFacHitCountEnergyThreshold")),
+      hitEthrEE0_(conf.getParameter<double>("EEHitEnergyThreshold0")),
+      hitEthrEE1_(conf.getParameter<double>("EEHitEnergyThreshold1")),
+      hitEthrEE2_(conf.getParameter<double>("EEHitEnergyThreshold2")),
+      hitEthrEE3_(conf.getParameter<double>("EEHitEnergyThreshold3")) {
   // register the products
-  produces< reco::IsolatedPixelTrackCandidateCollection >();
+  produces<reco::IsolatedPixelTrackCandidateCollection>();
 }
 
-IsolatedEcalPixelTrackCandidateProducer::~IsolatedEcalPixelTrackCandidateProducer() { }
+IsolatedEcalPixelTrackCandidateProducer::~IsolatedEcalPixelTrackCandidateProducer() {}
 
 void IsolatedEcalPixelTrackCandidateProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
-  desc.add<edm::InputTag>("filterLabel",edm::InputTag("hltIsolPixelTrackL2Filter"));
-  desc.add<edm::InputTag>("EBRecHitSource",edm::InputTag("hltEcalRecHit", "EcalRecHitsEB"));
-  desc.add<edm::InputTag>("EERecHitSource",edm::InputTag("hltEcalRecHit", "EcalRecHitsEE"));
-  desc.add<double>("EBHitEnergyThreshold",0.10);
-  desc.add<double>("EBHitCountEnergyThreshold",0.5);
-  desc.add<double>("EEHitEnergyThreshold0",-41.0664);
-  desc.add<double>("EEHitEnergyThreshold1",68.7950);
-  desc.add<double>("EEHitEnergyThreshold2",-38.1483);
-  desc.add<double>("EEHitEnergyThreshold3",7.04303);
-  desc.add<double>("EEFacHitCountEnergyThreshold",10.0);
-  desc.add<double>("EcalConeSizeEta0",0.09);
-  desc.add<double>("EcalConeSizeEta1",0.14);
-  descriptions.add("isolEcalPixelTrackProd",desc);
+  desc.add<edm::InputTag>("filterLabel", edm::InputTag("hltIsolPixelTrackL2Filter"));
+  desc.add<edm::InputTag>("EBRecHitSource", edm::InputTag("hltEcalRecHit", "EcalRecHitsEB"));
+  desc.add<edm::InputTag>("EERecHitSource", edm::InputTag("hltEcalRecHit", "EcalRecHitsEE"));
+  desc.add<double>("EBHitEnergyThreshold", 0.10);
+  desc.add<double>("EBHitCountEnergyThreshold", 0.5);
+  desc.add<double>("EEHitEnergyThreshold0", -41.0664);
+  desc.add<double>("EEHitEnergyThreshold1", 68.7950);
+  desc.add<double>("EEHitEnergyThreshold2", -38.1483);
+  desc.add<double>("EEHitEnergyThreshold3", 7.04303);
+  desc.add<double>("EEFacHitCountEnergyThreshold", 10.0);
+  desc.add<double>("EcalConeSizeEta0", 0.09);
+  desc.add<double>("EcalConeSizeEta1", 0.14);
+  descriptions.add("isolEcalPixelTrackProd", desc);
 }
 
 // ------------ method called to produce the data  ------------
-void IsolatedEcalPixelTrackCandidateProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const {
+void IsolatedEcalPixelTrackCandidateProducer::produce(edm::StreamID,
+                                                      edm::Event& iEvent,
+                                                      const edm::EventSetup& iSetup) const {
 #ifdef EDM_ML_DEBUG
   edm::LogInfo("HcalIsoTrack") << "==============Inside IsolatedEcalPixelTrackCandidateProducer";
 #endif
@@ -81,113 +82,103 @@ void IsolatedEcalPixelTrackCandidateProducer::produce(edm::StreamID, edm::Event&
   const CaloGeometry* geo = pG.product();
 
   edm::Handle<EcalRecHitCollection> ecalEB;
-  iEvent.getByToken(tok_eb,ecalEB);
+  iEvent.getByToken(tok_eb, ecalEB);
 
   edm::Handle<EcalRecHitCollection> ecalEE;
-  iEvent.getByToken(tok_ee,ecalEE);
+  iEvent.getByToken(tok_ee, ecalEE);
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HcalIsoTrack") << "ecal Collections isValid: " 
-			       << ecalEB.isValid() << "/" << ecalEE.isValid();
+  edm::LogInfo("HcalIsoTrack") << "ecal Collections isValid: " << ecalEB.isValid() << "/" << ecalEE.isValid();
 #endif
 
   edm::Handle<trigger::TriggerFilterObjectWithRefs> trigCand;
-  iEvent.getByToken(tok_trigcand,trigCand);
+  iEvent.getByToken(tok_trigcand, trigCand);
 
-  std::vector< edm::Ref<reco::IsolatedPixelTrackCandidateCollection> > isoPixTrackRefs;
+  std::vector<edm::Ref<reco::IsolatedPixelTrackCandidateCollection> > isoPixTrackRefs;
   trigCand->getObjects(trigger::TriggerTrack, isoPixTrackRefs);
-  int nCand=isoPixTrackRefs.size();  
+  int nCand = isoPixTrackRefs.size();
 
   auto iptcCollection = std::make_unique<reco::IsolatedPixelTrackCandidateCollection>();
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HcalIsoTrack") << "coneSize_ " << coneSizeEta0_ << "/"
-			       << coneSizeEta1_ << " hitCountEthrEB_ " 
-			       << hitCountEthrEB_ << " hitEthrEB_ " 
-			       << hitEthrEB_ << " fachitCountEE_ "
-			       << fachitCountEE_ << " hitEthrEE "
-			       << hitEthrEE0_ << ":" << hitEthrEE1_ << ":"
-			       << hitEthrEE2_ << ":" << hitEthrEE3_;
+  edm::LogInfo("HcalIsoTrack") << "coneSize_ " << coneSizeEta0_ << "/" << coneSizeEta1_ << " hitCountEthrEB_ "
+                               << hitCountEthrEB_ << " hitEthrEB_ " << hitEthrEB_ << " fachitCountEE_ "
+                               << fachitCountEE_ << " hitEthrEE " << hitEthrEE0_ << ":" << hitEthrEE1_ << ":"
+                               << hitEthrEE2_ << ":" << hitEthrEE3_;
 #endif
-  for (int p=0; p<nCand; p++) {
-    int    nhitIn(0), nhitOut(0);
+  for (int p = 0; p < nCand; p++) {
+    int nhitIn(0), nhitOut(0);
     double inEnergy(0), outEnergy(0);
-    std::pair<double,double> etaPhi(isoPixTrackRefs[p]->track()->eta(), isoPixTrackRefs[p]->track()->phi());
-    if (isoPixTrackRefs[p]->etaPhiEcalValid()) etaPhi = isoPixTrackRefs[p]->etaPhiEcal();
+    std::pair<double, double> etaPhi(isoPixTrackRefs[p]->track()->eta(), isoPixTrackRefs[p]->track()->phi());
+    if (isoPixTrackRefs[p]->etaPhiEcalValid())
+      etaPhi = isoPixTrackRefs[p]->etaPhiEcal();
     double etaAbs = std::abs(etaPhi.first);
-    double coneSize_ = (etaAbs > 1.5) ? coneSizeEta1_ : (coneSizeEta0_*(1.5-etaAbs)+coneSizeEta1_*etaAbs)/1.5;
+    double coneSize_ = (etaAbs > 1.5) ? coneSizeEta1_ : (coneSizeEta0_ * (1.5 - etaAbs) + coneSizeEta1_ * etaAbs) / 1.5;
 #ifdef EDM_ML_DEBUG
-    edm::LogInfo("HcalIsoTrack") << "Track: eta/phi " << etaPhi.first << "/" 
-				 << etaPhi.second << " pt:" 
-				 << isoPixTrackRefs[p]->track()->pt() 
-				 << " cone " << coneSize_ << "\n" 
-				 << "rechit size EB/EE : " << ecalEB->size() 
-				 << "/" << ecalEE->size() << " coneSize_: " 
-				 << coneSize_;
+    edm::LogInfo("HcalIsoTrack") << "Track: eta/phi " << etaPhi.first << "/" << etaPhi.second
+                                 << " pt:" << isoPixTrackRefs[p]->track()->pt() << " cone " << coneSize_ << "\n"
+                                 << "rechit size EB/EE : " << ecalEB->size() << "/" << ecalEE->size()
+                                 << " coneSize_: " << coneSize_;
 #endif
-    if (etaAbs<1.7) {
+    if (etaAbs < 1.7) {
       int nin(0), nout(0);
       for (auto eItr : *(ecalEB.product())) {
-	const GlobalPoint& pos = geo->getPosition(eItr.detid());
-	double      R   = reco::deltaR(pos.eta(),pos.phi(),etaPhi.first,etaPhi.second);
-	if (R < coneSize_) {
-	  nhitIn++;
-	  inEnergy += (eItr.energy());
-	  ++nin;
-	  if (eItr.energy() > hitCountEthrEB_) nhitOut++;
-	  if (eItr.energy() > hitEthrEB_) {
-	    outEnergy += (eItr.energy());
-	    ++nout;
-	  }
+        const GlobalPoint& pos = geo->getPosition(eItr.detid());
+        double R = reco::deltaR(pos.eta(), pos.phi(), etaPhi.first, etaPhi.second);
+        if (R < coneSize_) {
+          nhitIn++;
+          inEnergy += (eItr.energy());
+          ++nin;
+          if (eItr.energy() > hitCountEthrEB_)
+            nhitOut++;
+          if (eItr.energy() > hitEthrEB_) {
+            outEnergy += (eItr.energy());
+            ++nout;
+          }
 #ifdef EDM_ML_DEBUG
-	  edm::LogInfo("HcalIsoTrack") << "EBRechit close to the track has E " 
-				       << eItr.energy() << " eta/phi: " 
-				       << pos.eta() << "/" << pos.phi() 
-				       << " deltaR: " << R;
+          edm::LogInfo("HcalIsoTrack") << "EBRechit close to the track has E " << eItr.energy()
+                                       << " eta/phi: " << pos.eta() << "/" << pos.phi() << " deltaR: " << R;
 #endif
-	}
+        }
       }
     }
-    if (etaAbs>1.25) {
+    if (etaAbs > 1.25) {
       int nin(0), nout(0);
       for (auto eItr : *(ecalEE.product())) {
-	const GlobalPoint& pos = geo->getPosition(eItr.detid());
-	double      R   = reco::deltaR(pos.eta(),pos.phi(),etaPhi.first,etaPhi.second);
-	if (R < coneSize_) {
-	  double eta = std::abs(pos.eta());
-	  double hitEthr = (((eta*hitEthrEE3_+hitEthrEE2_)*eta+hitEthrEE1_)*eta+
-			    hitEthrEE0_);
-	  if (hitEthr < hitEthrEB_) hitEthr = hitEthrEB_;
-	  nhitIn++;
-	  inEnergy += (eItr.energy());
-	  ++nin;
-	  if (eItr.energy() > fachitCountEE_*hitEthr) nhitOut++;
-	  if (eItr.energy() > hitEthr) {
-	    outEnergy += (eItr.energy());
-	    ++nout;
-	  }
+        const GlobalPoint& pos = geo->getPosition(eItr.detid());
+        double R = reco::deltaR(pos.eta(), pos.phi(), etaPhi.first, etaPhi.second);
+        if (R < coneSize_) {
+          double eta = std::abs(pos.eta());
+          double hitEthr = (((eta * hitEthrEE3_ + hitEthrEE2_) * eta + hitEthrEE1_) * eta + hitEthrEE0_);
+          if (hitEthr < hitEthrEB_)
+            hitEthr = hitEthrEB_;
+          nhitIn++;
+          inEnergy += (eItr.energy());
+          ++nin;
+          if (eItr.energy() > fachitCountEE_ * hitEthr)
+            nhitOut++;
+          if (eItr.energy() > hitEthr) {
+            outEnergy += (eItr.energy());
+            ++nout;
+          }
 #ifdef EDM_ML_DEBUG
-	  edm::LogInfo("HcalIsoTrack") << "EERechit close to the track has E "
-				       << eItr.energy() << " eta/phi: " 
-				       << pos.eta() << "/" << pos.phi() 
-				       << " deltaR: " << R;
+          edm::LogInfo("HcalIsoTrack") << "EERechit close to the track has E " << eItr.energy()
+                                       << " eta/phi: " << pos.eta() << "/" << pos.phi() << " deltaR: " << R;
 #endif
-	}
+        }
       }
     }
 #ifdef EDM_ML_DEBUG
-    edm::LogInfo("HcalIsoTrack") << "nhitIn:" << nhitIn << " inEnergy:" 
-				 << inEnergy << " nhitOut:" << nhitOut 
-				 << " outEnergy:" << outEnergy;
+    edm::LogInfo("HcalIsoTrack") << "nhitIn:" << nhitIn << " inEnergy:" << inEnergy << " nhitOut:" << nhitOut
+                                 << " outEnergy:" << outEnergy;
 #endif
     reco::IsolatedPixelTrackCandidate newca(*isoPixTrackRefs[p]);
     newca.setEnergyIn(inEnergy);
     newca.setEnergyOut(outEnergy);
     newca.setNHitIn(nhitIn);
     newca.setNHitOut(nhitOut);
-    iptcCollection->push_back(newca);	
+    iptcCollection->push_back(newca);
   }
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HcalIsoTrack") << "ncand:" << nCand << " outcollction size:" 
-			       << iptcCollection->size();
+  edm::LogInfo("HcalIsoTrack") << "ncand:" << nCand << " outcollction size:" << iptcCollection->size();
 #endif
   iEvent.put(std::move(iptcCollection));
 }
diff --git a/Calibration/HcalIsolatedTrackReco/src/IsolatedPixelTrackCandidateL1TProducer.cc b/Calibration/HcalIsolatedTrackReco/src/IsolatedPixelTrackCandidateL1TProducer.cc
index d73bd98edb761..f171f4dbc13cb 100644
--- a/Calibration/HcalIsolatedTrackReco/src/IsolatedPixelTrackCandidateL1TProducer.cc
+++ b/Calibration/HcalIsolatedTrackReco/src/IsolatedPixelTrackCandidateL1TProducer.cc
@@ -16,7 +16,6 @@
 #include "FWCore/Utilities/interface/transform.h"
 //
 
-
 // Math
 #include "Math/GenVector/VectorUtil.h"
 #include "Math/GenVector/PxPyPzE4D.h"
@@ -38,61 +37,60 @@
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 
-
-IsolatedPixelTrackCandidateL1TProducer::IsolatedPixelTrackCandidateL1TProducer(const edm::ParameterSet& config) :
-  tok_hlt_(                     consumes<trigger::TriggerFilterObjectWithRefs>(config.getParameter<edm::InputTag>("L1GTSeedLabel")) ),
-  tok_l1_(                      consumes<l1t::TauBxCollection>(config.getParameter<edm::InputTag>("L1eTauJetsSource")) ),
-  tok_vert_(                    consumes<reco::VertexCollection>(config.getParameter<edm::InputTag>("VertexLabel")) ),
-  toks_pix_(                    edm::vector_transform(
-                                  config.getParameter<std::vector<edm::InputTag> >("PixelTracksSources"),
-                                  [this](edm::InputTag const & tag){return consumes<reco::TrackCollection>(tag);}) ),
-  bfield_(                      config.getParameter<std::string>("MagFieldRecordName") ),
-  prelimCone_(                  config.getParameter<double>("ExtrapolationConeSize") ),
-  pixelIsolationConeSizeAtEC_(  config.getParameter<double>("PixelIsolationConeSizeAtEC") ),
-  vtxCutSeed_(                  config.getParameter<double>("MaxVtxDXYSeed") ),
-  vtxCutIsol_(                  config.getParameter<double>("MaxVtxDXYIsol") ),
-  tauAssocCone_(                config.getParameter<double>("tauAssociationCone") ), 
-  tauUnbiasCone_(               config.getParameter<double>("tauUnbiasCone") ),
-  minPTrackValue_(              config.getParameter<double>("minPTrack") ),
-  maxPForIsolationValue_(       config.getParameter<double>("maxPTrackForIsolation") ),
-  ebEtaBoundary_(               config.getParameter<double>("EBEtaBoundary") ),
-  rEB_( -1 ), 
-  zEE_( -1 ),
-  bfVal_( 0 )
-{
+IsolatedPixelTrackCandidateL1TProducer::IsolatedPixelTrackCandidateL1TProducer(const edm::ParameterSet& config)
+    : tok_hlt_(consumes<trigger::TriggerFilterObjectWithRefs>(config.getParameter<edm::InputTag>("L1GTSeedLabel"))),
+      tok_l1_(consumes<l1t::TauBxCollection>(config.getParameter<edm::InputTag>("L1eTauJetsSource"))),
+      tok_vert_(consumes<reco::VertexCollection>(config.getParameter<edm::InputTag>("VertexLabel"))),
+      toks_pix_(
+          edm::vector_transform(config.getParameter<std::vector<edm::InputTag> >("PixelTracksSources"),
+                                [this](edm::InputTag const& tag) { return consumes<reco::TrackCollection>(tag); })),
+      bfield_(config.getParameter<std::string>("MagFieldRecordName")),
+      prelimCone_(config.getParameter<double>("ExtrapolationConeSize")),
+      pixelIsolationConeSizeAtEC_(config.getParameter<double>("PixelIsolationConeSizeAtEC")),
+      vtxCutSeed_(config.getParameter<double>("MaxVtxDXYSeed")),
+      vtxCutIsol_(config.getParameter<double>("MaxVtxDXYIsol")),
+      tauAssocCone_(config.getParameter<double>("tauAssociationCone")),
+      tauUnbiasCone_(config.getParameter<double>("tauUnbiasCone")),
+      minPTrackValue_(config.getParameter<double>("minPTrack")),
+      maxPForIsolationValue_(config.getParameter<double>("maxPTrackForIsolation")),
+      ebEtaBoundary_(config.getParameter<double>("EBEtaBoundary")),
+      rEB_(-1),
+      zEE_(-1),
+      bfVal_(0) {
   // Register the product
-  produces< reco::IsolatedPixelTrackCandidateCollection >();
+  produces<reco::IsolatedPixelTrackCandidateCollection>();
 }
 
-IsolatedPixelTrackCandidateL1TProducer::~IsolatedPixelTrackCandidateL1TProducer() { }
+IsolatedPixelTrackCandidateL1TProducer::~IsolatedPixelTrackCandidateL1TProducer() {}
 
 void IsolatedPixelTrackCandidateL1TProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
   std::vector<edm::InputTag> tracksrc = {edm::InputTag("hltPixelTracks")};
-  desc.add<edm::InputTag>("L1eTauJetsSource",edm::InputTag("hltGtStage2Digis","Tau"));
-  desc.add<double>("tauAssociationCone",        0.0 );
-  desc.add<double>("tauUnbiasCone",             1.2 );
-  desc.add<std::vector<edm::InputTag> >("PixelTracksSources",tracksrc);
-  desc.add<double>("ExtrapolationConeSize",     1.0);
-  desc.add<double>("PixelIsolationConeSizeAtEC",40);
-  desc.add<edm::InputTag>("L1GTSeedLabel",edm::InputTag("hltL1sV0SingleJet60"));
-  desc.add<double>("MaxVtxDXYSeed",             101.0);
-  desc.add<double>("MaxVtxDXYIsol",             101.0);
-  desc.add<edm::InputTag>("VertexLabel",edm::InputTag("hltTrimmedPixelVertices"));
-  desc.add<std::string>("MagFieldRecordName","VolumeBasedMagneticField");
-  desc.add<double>("minPTrack",                 5.0);
-  desc.add<double>("maxPTrackForIsolation",     3.0);
-  desc.add<double>("EBEtaBoundary",             1.479);
-  descriptions.add("isolPixelTrackProdL1T",desc);
+  desc.add<edm::InputTag>("L1eTauJetsSource", edm::InputTag("hltGtStage2Digis", "Tau"));
+  desc.add<double>("tauAssociationCone", 0.0);
+  desc.add<double>("tauUnbiasCone", 1.2);
+  desc.add<std::vector<edm::InputTag> >("PixelTracksSources", tracksrc);
+  desc.add<double>("ExtrapolationConeSize", 1.0);
+  desc.add<double>("PixelIsolationConeSizeAtEC", 40);
+  desc.add<edm::InputTag>("L1GTSeedLabel", edm::InputTag("hltL1sV0SingleJet60"));
+  desc.add<double>("MaxVtxDXYSeed", 101.0);
+  desc.add<double>("MaxVtxDXYIsol", 101.0);
+  desc.add<edm::InputTag>("VertexLabel", edm::InputTag("hltTrimmedPixelVertices"));
+  desc.add<std::string>("MagFieldRecordName", "VolumeBasedMagneticField");
+  desc.add<double>("minPTrack", 5.0);
+  desc.add<double>("maxPTrackForIsolation", 3.0);
+  desc.add<double>("EBEtaBoundary", 1.479);
+  descriptions.add("isolPixelTrackProdL1T", desc);
 }
 
-void IsolatedPixelTrackCandidateL1TProducer::beginRun(const edm::Run &run, const edm::EventSetup &theEventSetup) {
-
+void IsolatedPixelTrackCandidateL1TProducer::beginRun(const edm::Run& run, const edm::EventSetup& theEventSetup) {
   edm::ESHandle<CaloGeometry> pG;
-  theEventSetup.get<CaloGeometryRecord>().get(pG);   
-  
-  const double rad (dynamic_cast<const EcalBarrelGeometry*>( pG->getSubdetectorGeometry(DetId::Ecal, EcalBarrel ))->avgRadiusXYFrontFaceCenter() ) ;
-  const double zz  (dynamic_cast<const EcalEndcapGeometry*>( pG->getSubdetectorGeometry(DetId::Ecal, EcalEndcap ))->avgAbsZFrontFaceCenter() ) ;
+  theEventSetup.get<CaloGeometryRecord>().get(pG);
+
+  const double rad(dynamic_cast<const EcalBarrelGeometry*>(pG->getSubdetectorGeometry(DetId::Ecal, EcalBarrel))
+                       ->avgRadiusXYFrontFaceCenter());
+  const double zz(dynamic_cast<const EcalEndcapGeometry*>(pG->getSubdetectorGeometry(DetId::Ecal, EcalEndcap))
+                      ->avgAbsZFrontFaceCenter());
 
   rEB_ = rad;
   zEE_ = zz;
@@ -100,238 +98,271 @@ void IsolatedPixelTrackCandidateL1TProducer::beginRun(const edm::Run &run, const
   edm::ESHandle<MagneticField> vbfField;
   theEventSetup.get<IdealMagneticFieldRecord>().get(vbfField);
   const VolumeBasedMagneticField* vbfCPtr = dynamic_cast<const VolumeBasedMagneticField*>(&(*vbfField));
-  GlobalVector BField = vbfCPtr->inTesla(GlobalPoint(0,0,0));
-  bfVal_=BField.mag();
-  edm::LogVerbatim("IsoTrack") << "rEB " << rEB_ << " zEE " << zEE_ << " B "
-			       << bfVal_ << std::endl;
+  GlobalVector BField = vbfCPtr->inTesla(GlobalPoint(0, 0, 0));
+  bfVal_ = BField.mag();
+  edm::LogVerbatim("IsoTrack") << "rEB " << rEB_ << " zEE " << zEE_ << " B " << bfVal_ << std::endl;
 }
 
 void IsolatedPixelTrackCandidateL1TProducer::produce(edm::Event& theEvent, const edm::EventSetup& theEventSetup) {
-
   auto trackCollection = std::make_unique<reco::IsolatedPixelTrackCandidateCollection>();
 
   //create vector of refs from input collections
   std::vector<reco::TrackRef> pixelTrackRefs;
 
-  for (unsigned int iPix=0; iPix<toks_pix_.size(); iPix++) {
+  for (unsigned int iPix = 0; iPix < toks_pix_.size(); iPix++) {
     edm::Handle<reco::TrackCollection> iPixCol;
-    theEvent.getByToken(toks_pix_[iPix],iPixCol);
-    for (reco::TrackCollection::const_iterator pit=iPixCol->begin(); pit!=iPixCol->end(); pit++) {
-      pixelTrackRefs.push_back(reco::TrackRef(iPixCol,pit-iPixCol->begin()));
+    theEvent.getByToken(toks_pix_[iPix], iPixCol);
+    for (reco::TrackCollection::const_iterator pit = iPixCol->begin(); pit != iPixCol->end(); pit++) {
+      pixelTrackRefs.push_back(reco::TrackRef(iPixCol, pit - iPixCol->begin()));
     }
   }
 
   edm::Handle<l1t::TauBxCollection> l1eTauJets;
-  theEvent.getByToken(tok_l1_,l1eTauJets);
+  theEvent.getByToken(tok_l1_, l1eTauJets);
 
   edm::Handle<reco::VertexCollection> pVert;
-  theEvent.getByToken(tok_vert_,pVert);
+  theEvent.getByToken(tok_vert_, pVert);
 
-  double ptTriggered  = -10;
+  double ptTriggered = -10;
   double etaTriggered = -100;
   double phiTriggered = -100;
-  
+
   edm::Handle<trigger::TriggerFilterObjectWithRefs> l1trigobj;
   theEvent.getByToken(tok_hlt_, l1trigobj);
-  
-  std::vector< edm::Ref<l1t::TauBxCollection> > l1tauobjref;
-  std::vector< edm::Ref<l1t::JetBxCollection> > l1jetobjref;
-  
+
+  std::vector<edm::Ref<l1t::TauBxCollection> > l1tauobjref;
+  std::vector<edm::Ref<l1t::JetBxCollection> > l1jetobjref;
+
   //  l1trigobj->getObjects(trigger::TriggerTau, l1tauobjref);
   l1trigobj->getObjects(trigger::TriggerL1Tau, l1tauobjref);
   //  l1trigobj->getObjects(trigger::TriggerJet, l1jetobjref);
   l1trigobj->getObjects(trigger::TriggerL1Jet, l1jetobjref);
-  
+
   for (auto p : l1tauobjref) {
-    if (p->pt()>ptTriggered) {
-      ptTriggered  = p->pt(); 
+    if (p->pt() > ptTriggered) {
+      ptTriggered = p->pt();
       phiTriggered = p->phi();
       etaTriggered = p->eta();
     }
   }
   for (auto p : l1jetobjref) {
-    if (p->pt()>ptTriggered) {
-      ptTriggered  = p->pt();
+    if (p->pt() > ptTriggered) {
+      ptTriggered = p->pt();
       phiTriggered = p->phi();
       etaTriggered = p->eta();
     }
   }
-  edm::LogVerbatim("IsoTrack") << "Sizes " << l1tauobjref.size() << ":" 
-			       << l1jetobjref.size() << " Trig " << ptTriggered
-			       << ":" << etaTriggered << ":" << phiTriggered 
-			       << std::endl;
+  edm::LogVerbatim("IsoTrack") << "Sizes " << l1tauobjref.size() << ":" << l1jetobjref.size() << " Trig " << ptTriggered
+                               << ":" << etaTriggered << ":" << phiTriggered << std::endl;
 
   double drMaxL1Track_ = tauAssocCone_;
   int ntr = 0;
-  std::vector<seedAtEC>  VecSeedsatEC;
+  std::vector<seedAtEC> VecSeedsatEC;
   //loop to select isolated tracks
-  for (unsigned iS=0; iS<pixelTrackRefs.size(); iS++) {
+  for (unsigned iS = 0; iS < pixelTrackRefs.size(); iS++) {
     bool vtxMatch = false;
-    //associate to vertex (in Z) 
+    //associate to vertex (in Z)
     reco::VertexCollection::const_iterator vitSel;
     double minDZ = 1000;
-    bool   found(false);
-    for (reco::VertexCollection::const_iterator vit=pVert->begin(); vit!=pVert->end(); vit++) {
-      if (std::abs(pixelTrackRefs[iS]->dz(vit->position()))<minDZ) {
-	minDZ  = std::abs(pixelTrackRefs[iS]->dz(vit->position()));
-	vitSel = vit;
-	found  = true;
+    bool found(false);
+    for (reco::VertexCollection::const_iterator vit = pVert->begin(); vit != pVert->end(); vit++) {
+      if (std::abs(pixelTrackRefs[iS]->dz(vit->position())) < minDZ) {
+        minDZ = std::abs(pixelTrackRefs[iS]->dz(vit->position()));
+        vitSel = vit;
+        found = true;
       }
     }
     //cut on dYX:
     if (found) {
-      if(std::abs(pixelTrackRefs[iS]->dxy(vitSel->position()))<vtxCutSeed_) vtxMatch=true;
+      if (std::abs(pixelTrackRefs[iS]->dxy(vitSel->position())) < vtxCutSeed_)
+        vtxMatch = true;
     } else {
-      vtxMatch=true;
+      vtxMatch = true;
     }
-    edm::LogVerbatim("IsoTrack") << "minZD " << minDZ << " Found " << found 
-				 << ":" << vtxMatch << std::endl;
+    edm::LogVerbatim("IsoTrack") << "minZD " << minDZ << " Found " << found << ":" << vtxMatch << std::endl;
 
     //select tracks not matched to triggered L1 jet
-    double R=reco::deltaR(etaTriggered, phiTriggered, 
-			  pixelTrackRefs[iS]->eta(), pixelTrackRefs[iS]->phi());
-    edm::LogVerbatim("IsoTrack") << "Distance to L1 " << R << ":" 
-				 << tauUnbiasCone_ << " Result "
-				 << (R<tauUnbiasCone_) << std::endl;
-    if (R<tauUnbiasCone_) continue;
+    double R = reco::deltaR(etaTriggered, phiTriggered, pixelTrackRefs[iS]->eta(), pixelTrackRefs[iS]->phi());
+    edm::LogVerbatim("IsoTrack") << "Distance to L1 " << R << ":" << tauUnbiasCone_ << " Result "
+                                 << (R < tauUnbiasCone_) << std::endl;
+    if (R < tauUnbiasCone_)
+      continue;
 
     //check taujet matching
-    bool tmatch=false;
+    bool tmatch = false;
     l1t::TauBxCollection::const_iterator selj;
-    for (l1t::TauBxCollection::const_iterator tj=l1eTauJets->begin(); tj!=l1eTauJets->end(); tj++) {
-      if (reco::deltaR(pixelTrackRefs[iS]->momentum().eta(), pixelTrackRefs[iS]->momentum().phi(), tj->momentum().eta(), tj->momentum().phi()) > drMaxL1Track_) continue;
-      selj   = tj;
+    for (l1t::TauBxCollection::const_iterator tj = l1eTauJets->begin(); tj != l1eTauJets->end(); tj++) {
+      if (reco::deltaR(pixelTrackRefs[iS]->momentum().eta(),
+                       pixelTrackRefs[iS]->momentum().phi(),
+                       tj->momentum().eta(),
+                       tj->momentum().phi()) > drMaxL1Track_)
+        continue;
+      selj = tj;
       tmatch = true;
-    } //loop over L1 tau
+    }  //loop over L1 tau
     edm::LogVerbatim("IsoTrack") << "tMatch " << tmatch << std::endl;
-    
+
     //propagate seed track to ECAL surface:
-    std::pair<double,double> seedCooAtEC;
+    std::pair<double, double> seedCooAtEC;
     // in case vertex is found:
-    if (found) seedCooAtEC=GetEtaPhiAtEcal(pixelTrackRefs[iS]->eta(), pixelTrackRefs[iS]->phi(), pixelTrackRefs[iS]->pt(), pixelTrackRefs[iS]->charge(), vitSel->z());
+    if (found)
+      seedCooAtEC = GetEtaPhiAtEcal(pixelTrackRefs[iS]->eta(),
+                                    pixelTrackRefs[iS]->phi(),
+                                    pixelTrackRefs[iS]->pt(),
+                                    pixelTrackRefs[iS]->charge(),
+                                    vitSel->z());
     //in case vertex is not found:
-    else       seedCooAtEC=GetEtaPhiAtEcal(pixelTrackRefs[iS]->eta(), pixelTrackRefs[iS]->phi(), pixelTrackRefs[iS]->pt(), pixelTrackRefs[iS]->charge(), 0);
-    seedAtEC seed(iS,(tmatch||vtxMatch),seedCooAtEC.first,seedCooAtEC.second);
+    else
+      seedCooAtEC = GetEtaPhiAtEcal(pixelTrackRefs[iS]->eta(),
+                                    pixelTrackRefs[iS]->phi(),
+                                    pixelTrackRefs[iS]->pt(),
+                                    pixelTrackRefs[iS]->charge(),
+                                    0);
+    seedAtEC seed(iS, (tmatch || vtxMatch), seedCooAtEC.first, seedCooAtEC.second);
     VecSeedsatEC.push_back(seed);
-    edm::LogVerbatim("IsoTrack") << "Seed " << seedCooAtEC.first 
-				 << seedCooAtEC.second << std::endl;
+    edm::LogVerbatim("IsoTrack") << "Seed " << seedCooAtEC.first << seedCooAtEC.second << std::endl;
   }
-  for (unsigned int i=0; i<VecSeedsatEC.size(); i++) {
+  for (unsigned int i = 0; i < VecSeedsatEC.size(); i++) {
     unsigned int iSeed = VecSeedsatEC[i].index;
-    if (!VecSeedsatEC[i].ok) continue;
-    if(pixelTrackRefs[iSeed]->p()<minPTrackValue_) continue; 
+    if (!VecSeedsatEC[i].ok)
+      continue;
+    if (pixelTrackRefs[iSeed]->p() < minPTrackValue_)
+      continue;
     l1t::TauBxCollection::const_iterator selj;
-    for (l1t::TauBxCollection::const_iterator tj=l1eTauJets->begin(); tj!=l1eTauJets->end(); tj++)  {
-      if (reco::deltaR(pixelTrackRefs[iSeed]->momentum().eta(),pixelTrackRefs[iSeed]->momentum().phi(),tj->momentum().eta(),tj->momentum().phi()) > drMaxL1Track_) continue;
-      selj   = tj;
-    } //loop over L1 tau
+    for (l1t::TauBxCollection::const_iterator tj = l1eTauJets->begin(); tj != l1eTauJets->end(); tj++) {
+      if (reco::deltaR(pixelTrackRefs[iSeed]->momentum().eta(),
+                       pixelTrackRefs[iSeed]->momentum().phi(),
+                       tj->momentum().eta(),
+                       tj->momentum().phi()) > drMaxL1Track_)
+        continue;
+      selj = tj;
+    }  //loop over L1 tau
     double maxP = 0;
     double sumP = 0;
-    for(unsigned int j=0; j<VecSeedsatEC.size(); j++) {
-      if (i==j) continue;
+    for (unsigned int j = 0; j < VecSeedsatEC.size(); j++) {
+      if (i == j)
+        continue;
       unsigned int iSurr = VecSeedsatEC[j].index;
       //define preliminary cone around seed track impact point from which tracks will be extrapolated:
-      if (reco::deltaR(pixelTrackRefs[iSeed]->eta(), pixelTrackRefs[iSeed]->phi(), pixelTrackRefs[iSurr]->eta(), pixelTrackRefs[iSurr]->phi())>prelimCone_) continue;
+      if (reco::deltaR(pixelTrackRefs[iSeed]->eta(),
+                       pixelTrackRefs[iSeed]->phi(),
+                       pixelTrackRefs[iSurr]->eta(),
+                       pixelTrackRefs[iSurr]->phi()) > prelimCone_)
+        continue;
       double minDZ2(1000);
-      bool   found(false);
+      bool found(false);
       reco::VertexCollection::const_iterator vitSel2;
-      for (reco::VertexCollection::const_iterator vit=pVert->begin(); vit!=pVert->end(); vit++) {
-	if (std::abs(pixelTrackRefs[iSurr]->dz(vit->position()))<minDZ2) {
-	  minDZ2  = std::abs(pixelTrackRefs[iSurr]->dz(vit->position()));
-	  vitSel2 = vit;
-	  found   = true;
-	}
+      for (reco::VertexCollection::const_iterator vit = pVert->begin(); vit != pVert->end(); vit++) {
+        if (std::abs(pixelTrackRefs[iSurr]->dz(vit->position())) < minDZ2) {
+          minDZ2 = std::abs(pixelTrackRefs[iSurr]->dz(vit->position()));
+          vitSel2 = vit;
+          found = true;
+        }
       }
       //cut ot dXY:
-      if (found&&std::abs(pixelTrackRefs[iSurr]->dxy(vitSel2->position()))>vtxCutIsol_) continue;
-      //calculate distance at ECAL surface and update isolation: 
-      if (getDistInCM(VecSeedsatEC[i].eta, VecSeedsatEC[i].phi, VecSeedsatEC[j].eta, VecSeedsatEC[j].phi)<pixelIsolationConeSizeAtEC_) {
-	sumP+=pixelTrackRefs[iSurr]->p();
-	if(pixelTrackRefs[iSurr]->p()>maxP) maxP=pixelTrackRefs[iSurr]->p();
-      }      
+      if (found && std::abs(pixelTrackRefs[iSurr]->dxy(vitSel2->position())) > vtxCutIsol_)
+        continue;
+      //calculate distance at ECAL surface and update isolation:
+      if (getDistInCM(VecSeedsatEC[i].eta, VecSeedsatEC[i].phi, VecSeedsatEC[j].eta, VecSeedsatEC[j].phi) <
+          pixelIsolationConeSizeAtEC_) {
+        sumP += pixelTrackRefs[iSurr]->p();
+        if (pixelTrackRefs[iSurr]->p() > maxP)
+          maxP = pixelTrackRefs[iSurr]->p();
+      }
     }
-    if (maxP<maxPForIsolationValue_) {
-      reco::IsolatedPixelTrackCandidate newCandidate(pixelTrackRefs[iSeed], l1t::TauRef(l1eTauJets,selj-l1eTauJets->begin()), maxP, sumP);
+    if (maxP < maxPForIsolationValue_) {
+      reco::IsolatedPixelTrackCandidate newCandidate(
+          pixelTrackRefs[iSeed], l1t::TauRef(l1eTauJets, selj - l1eTauJets->begin()), maxP, sumP);
       newCandidate.setEtaPhiEcal(VecSeedsatEC[i].eta, VecSeedsatEC[i].phi);
       trackCollection->push_back(newCandidate);
       ntr++;
-    }    
+    }
   }
   edm::LogVerbatim("IsoTrack") << "Number of Isolated Track " << ntr << "\n";
   // put the product in the event
   theEvent.put(std::move(trackCollection));
 }
 
-
 double IsolatedPixelTrackCandidateL1TProducer::getDistInCM(double eta1, double phi1, double eta2, double phi2) {
   double Rec;
-  double theta1=2*atan(exp(-eta1));
-  double theta2=2*atan(exp(-eta2));
-  if (std::abs(eta1)<1.479) Rec=rEB_; //radius of ECAL barrel
-  else if (std::abs(eta1)>1.479&&std::abs(eta1)<7.0) Rec=tan(theta1)*zEE_; //distance from IP to ECAL endcap
-  else return 1000;
+  double theta1 = 2 * atan(exp(-eta1));
+  double theta2 = 2 * atan(exp(-eta2));
+  if (std::abs(eta1) < 1.479)
+    Rec = rEB_;  //radius of ECAL barrel
+  else if (std::abs(eta1) > 1.479 && std::abs(eta1) < 7.0)
+    Rec = tan(theta1) * zEE_;  //distance from IP to ECAL endcap
+  else
+    return 1000;
 
   //|vect| times tg of acos(scalar product)
-  double angle=acos((sin(theta1)*sin(theta2)*(sin(phi1)*sin(phi2)+cos(phi1)*cos(phi2))+cos(theta1)*cos(theta2)));
-  if (angle<M_PI_2) return std::abs((Rec/sin(theta1))*tan(angle));
-  else return 1000;
+  double angle =
+      acos((sin(theta1) * sin(theta2) * (sin(phi1) * sin(phi2) + cos(phi1) * cos(phi2)) + cos(theta1) * cos(theta2)));
+  if (angle < M_PI_2)
+    return std::abs((Rec / sin(theta1)) * tan(angle));
+  else
+    return 1000;
 }
 
-
-std::pair<double,double> IsolatedPixelTrackCandidateL1TProducer::GetEtaPhiAtEcal(double etaIP, double phiIP, double pT, int charge, double vtxZ) {
-
-  double deltaPhi=0;
+std::pair<double, double> IsolatedPixelTrackCandidateL1TProducer::GetEtaPhiAtEcal(
+    double etaIP, double phiIP, double pT, int charge, double vtxZ) {
+  double deltaPhi = 0;
   double etaEC = 100;
   double phiEC = 100;
 
   double Rcurv = 9999999;
-  if (bfVal_!=0) Rcurv=pT*33.3*100/(bfVal_*10); //r(m)=pT(GeV)*33.3/B(kG)
+  if (bfVal_ != 0)
+    Rcurv = pT * 33.3 * 100 / (bfVal_ * 10);  //r(m)=pT(GeV)*33.3/B(kG)
 
   double ecDist = zEE_;  //distance to ECAL andcap from IP (cm), 317 - ecal (not preshower), preshower -300
-  double ecRad  = rEB_;  //radius of ECAL barrel (cm)
-  double theta  = 2*atan(exp(-etaIP));
-  double zNew   = 0;
-  if (theta>M_PI_2) theta=M_PI-theta;
-  if (std::abs(etaIP)<ebEtaBoundary_) {
-    if ((0.5*ecRad/Rcurv)>1) {
-      etaEC         = 10000;
-      deltaPhi      = 0;
+  double ecRad = rEB_;   //radius of ECAL barrel (cm)
+  double theta = 2 * atan(exp(-etaIP));
+  double zNew = 0;
+  if (theta > M_PI_2)
+    theta = M_PI - theta;
+  if (std::abs(etaIP) < ebEtaBoundary_) {
+    if ((0.5 * ecRad / Rcurv) > 1) {
+      etaEC = 10000;
+      deltaPhi = 0;
     } else {
-      deltaPhi      =-charge*asin(0.5*ecRad/Rcurv);
-      double alpha1 = 2*asin(0.5*ecRad/Rcurv);
-      double z      = ecRad/tan(theta);
-      if (etaIP>0) zNew = z*(Rcurv*alpha1)/ecRad+vtxZ; //new z-coordinate of track
-      else         zNew =-z*(Rcurv*alpha1)/ecRad+vtxZ; //new z-coordinate of track
-      double zAbs=std::abs(zNew);
-      if (zAbs<ecDist) {
-	etaEC    = -log(tan(0.5*atan(ecRad/zAbs)));
-	deltaPhi = -charge*asin(0.5*ecRad/Rcurv);
+      deltaPhi = -charge * asin(0.5 * ecRad / Rcurv);
+      double alpha1 = 2 * asin(0.5 * ecRad / Rcurv);
+      double z = ecRad / tan(theta);
+      if (etaIP > 0)
+        zNew = z * (Rcurv * alpha1) / ecRad + vtxZ;  //new z-coordinate of track
+      else
+        zNew = -z * (Rcurv * alpha1) / ecRad + vtxZ;  //new z-coordinate of track
+      double zAbs = std::abs(zNew);
+      if (zAbs < ecDist) {
+        etaEC = -log(tan(0.5 * atan(ecRad / zAbs)));
+        deltaPhi = -charge * asin(0.5 * ecRad / Rcurv);
       }
-      if (zAbs>ecDist) {
-	zAbs           = (std::abs(etaIP)/etaIP)*ecDist;
-	double Zflight = std::abs(zAbs-vtxZ);
-	double alpha   = (Zflight*ecRad)/(z*Rcurv);
-	double Rec     = 2*Rcurv*sin(alpha/2);
-	deltaPhi       =-charge*alpha/2;
-	etaEC          =-log(tan(0.5*atan(Rec/ecDist)));
+      if (zAbs > ecDist) {
+        zAbs = (std::abs(etaIP) / etaIP) * ecDist;
+        double Zflight = std::abs(zAbs - vtxZ);
+        double alpha = (Zflight * ecRad) / (z * Rcurv);
+        double Rec = 2 * Rcurv * sin(alpha / 2);
+        deltaPhi = -charge * alpha / 2;
+        etaEC = -log(tan(0.5 * atan(Rec / ecDist)));
       }
     }
   } else {
-    zNew           = (std::abs(etaIP)/etaIP)*ecDist;
-    double Zflight = std::abs(zNew-vtxZ);
-    double Rvirt   = std::abs(Zflight*tan(theta));
-    double Rec     = 2*Rcurv*sin(Rvirt/(2*Rcurv));
-    deltaPhi       =-(charge)*(Rvirt/(2*Rcurv));
-    etaEC          =-log(tan(0.5*atan(Rec/ecDist)));
+    zNew = (std::abs(etaIP) / etaIP) * ecDist;
+    double Zflight = std::abs(zNew - vtxZ);
+    double Rvirt = std::abs(Zflight * tan(theta));
+    double Rec = 2 * Rcurv * sin(Rvirt / (2 * Rcurv));
+    deltaPhi = -(charge) * (Rvirt / (2 * Rcurv));
+    etaEC = -log(tan(0.5 * atan(Rec / ecDist)));
   }
 
-  if (zNew<0) etaEC=-etaEC;
-  phiEC            = phiIP+deltaPhi;
+  if (zNew < 0)
+    etaEC = -etaEC;
+  phiEC = phiIP + deltaPhi;
 
-  if (phiEC<-M_PI) phiEC += M_2_PI;
-  if (phiEC>M_PI)  phiEC -= M_2_PI;
+  if (phiEC < -M_PI)
+    phiEC += M_2_PI;
+  if (phiEC > M_PI)
+    phiEC -= M_2_PI;
 
-  std::pair<double,double> retVal(etaEC,phiEC);
+  std::pair<double, double> retVal(etaEC, phiEC);
   return retVal;
 }
-
diff --git a/Calibration/HcalIsolatedTrackReco/src/IsolatedPixelTrackCandidateProducer.cc b/Calibration/HcalIsolatedTrackReco/src/IsolatedPixelTrackCandidateProducer.cc
index 3e0beca1c4dc7..81c278a308821 100644
--- a/Calibration/HcalIsolatedTrackReco/src/IsolatedPixelTrackCandidateProducer.cc
+++ b/Calibration/HcalIsolatedTrackReco/src/IsolatedPixelTrackCandidateProducer.cc
@@ -16,7 +16,6 @@
 #include "FWCore/Utilities/interface/transform.h"
 //
 
-
 // Math
 #include "Math/GenVector/VectorUtil.h"
 #include "Math/GenVector/PxPyPzE4D.h"
@@ -40,60 +39,60 @@
 
 //#define DebugLog
 
-IsolatedPixelTrackCandidateProducer::IsolatedPixelTrackCandidateProducer(const edm::ParameterSet& config) :
-  tok_hlt_(                     consumes<trigger::TriggerFilterObjectWithRefs>(config.getParameter<edm::InputTag>("L1GTSeedLabel")) ),
-  tok_l1_(                      consumes<l1extra::L1JetParticleCollection>(config.getParameter<edm::InputTag>("L1eTauJetsSource")) ),
-  tok_vert_(                    consumes<reco::VertexCollection>(config.getParameter<edm::InputTag>("VertexLabel")) ),
-  toks_pix_(                    edm::vector_transform(
-                                  config.getParameter<std::vector<edm::InputTag> >("PixelTracksSources"),
-                                  [this](edm::InputTag const & tag){return consumes<reco::TrackCollection>(tag);}) ),
-  bfield_(                      config.getParameter<std::string>("MagFieldRecordName") ),
-  prelimCone_(                  config.getParameter<double>("ExtrapolationConeSize") ),
-  pixelIsolationConeSizeAtEC_(  config.getParameter<double>("PixelIsolationConeSizeAtEC") ),
-  vtxCutSeed_(                  config.getParameter<double>("MaxVtxDXYSeed") ),
-  vtxCutIsol_(                  config.getParameter<double>("MaxVtxDXYIsol") ),
-  tauAssocCone_(                config.getParameter<double>("tauAssociationCone") ), 
-  tauUnbiasCone_(               config.getParameter<double>("tauUnbiasCone") ),
-  minPTrackValue_(              config.getParameter<double>("minPTrack") ),
-  maxPForIsolationValue_(       config.getParameter<double>("maxPTrackForIsolation") ),
-  ebEtaBoundary_(               config.getParameter<double>("EBEtaBoundary") ),
-  rEB_( -1 ), 
-  zEE_( -1 ),
-  bfVal_( 0 )
-{
+IsolatedPixelTrackCandidateProducer::IsolatedPixelTrackCandidateProducer(const edm::ParameterSet& config)
+    : tok_hlt_(consumes<trigger::TriggerFilterObjectWithRefs>(config.getParameter<edm::InputTag>("L1GTSeedLabel"))),
+      tok_l1_(consumes<l1extra::L1JetParticleCollection>(config.getParameter<edm::InputTag>("L1eTauJetsSource"))),
+      tok_vert_(consumes<reco::VertexCollection>(config.getParameter<edm::InputTag>("VertexLabel"))),
+      toks_pix_(
+          edm::vector_transform(config.getParameter<std::vector<edm::InputTag> >("PixelTracksSources"),
+                                [this](edm::InputTag const& tag) { return consumes<reco::TrackCollection>(tag); })),
+      bfield_(config.getParameter<std::string>("MagFieldRecordName")),
+      prelimCone_(config.getParameter<double>("ExtrapolationConeSize")),
+      pixelIsolationConeSizeAtEC_(config.getParameter<double>("PixelIsolationConeSizeAtEC")),
+      vtxCutSeed_(config.getParameter<double>("MaxVtxDXYSeed")),
+      vtxCutIsol_(config.getParameter<double>("MaxVtxDXYIsol")),
+      tauAssocCone_(config.getParameter<double>("tauAssociationCone")),
+      tauUnbiasCone_(config.getParameter<double>("tauUnbiasCone")),
+      minPTrackValue_(config.getParameter<double>("minPTrack")),
+      maxPForIsolationValue_(config.getParameter<double>("maxPTrackForIsolation")),
+      ebEtaBoundary_(config.getParameter<double>("EBEtaBoundary")),
+      rEB_(-1),
+      zEE_(-1),
+      bfVal_(0) {
   // Register the product
-  produces< reco::IsolatedPixelTrackCandidateCollection >();
+  produces<reco::IsolatedPixelTrackCandidateCollection>();
 }
 
-IsolatedPixelTrackCandidateProducer::~IsolatedPixelTrackCandidateProducer() { }
+IsolatedPixelTrackCandidateProducer::~IsolatedPixelTrackCandidateProducer() {}
 
 void IsolatedPixelTrackCandidateProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
   std::vector<edm::InputTag> tracksrc = {edm::InputTag("hltPixelTracks")};
-  desc.add<edm::InputTag>("L1eTauJetsSource",edm::InputTag("hltCaloStage2Digis","Tau"));
-  desc.add<double>("tauAssociationCone",        0.0 );
-  desc.add<double>("tauUnbiasCone",             1.2 );
-  desc.add<std::vector<edm::InputTag> >("PixelTracksSources",tracksrc);
-  desc.add<double>("ExtrapolationConeSize",     1.0);
-  desc.add<double>("PixelIsolationConeSizeAtEC",40);
-  desc.add<edm::InputTag>("L1GTSeedLabel",edm::InputTag("hltL1sIsoTrack"));
-  desc.add<double>("MaxVtxDXYSeed",             101.0);
-  desc.add<double>("MaxVtxDXYIsol",             101.0);
-  desc.add<edm::InputTag>("VertexLabel",edm::InputTag("hltTrimmedPixelVertices"));
-  desc.add<std::string>("MagFieldRecordName","VolumeBasedMagneticField");
-  desc.add<double>("minPTrack",                 5.0);
-  desc.add<double>("maxPTrackForIsolation",     3.0);
-  desc.add<double>("EBEtaBoundary",             1.479);
-  descriptions.add("isolPixelTrackProd",desc);
+  desc.add<edm::InputTag>("L1eTauJetsSource", edm::InputTag("hltCaloStage2Digis", "Tau"));
+  desc.add<double>("tauAssociationCone", 0.0);
+  desc.add<double>("tauUnbiasCone", 1.2);
+  desc.add<std::vector<edm::InputTag> >("PixelTracksSources", tracksrc);
+  desc.add<double>("ExtrapolationConeSize", 1.0);
+  desc.add<double>("PixelIsolationConeSizeAtEC", 40);
+  desc.add<edm::InputTag>("L1GTSeedLabel", edm::InputTag("hltL1sIsoTrack"));
+  desc.add<double>("MaxVtxDXYSeed", 101.0);
+  desc.add<double>("MaxVtxDXYIsol", 101.0);
+  desc.add<edm::InputTag>("VertexLabel", edm::InputTag("hltTrimmedPixelVertices"));
+  desc.add<std::string>("MagFieldRecordName", "VolumeBasedMagneticField");
+  desc.add<double>("minPTrack", 5.0);
+  desc.add<double>("maxPTrackForIsolation", 3.0);
+  desc.add<double>("EBEtaBoundary", 1.479);
+  descriptions.add("isolPixelTrackProd", desc);
 }
 
-void IsolatedPixelTrackCandidateProducer::beginRun(const edm::Run &run, const edm::EventSetup &theEventSetup) {
-
+void IsolatedPixelTrackCandidateProducer::beginRun(const edm::Run& run, const edm::EventSetup& theEventSetup) {
   edm::ESHandle<CaloGeometry> pG;
-  theEventSetup.get<CaloGeometryRecord>().get(pG);   
-  
-  const double rad (dynamic_cast<const EcalBarrelGeometry*>( pG->getSubdetectorGeometry(DetId::Ecal, EcalBarrel ))->avgRadiusXYFrontFaceCenter() ) ;
-  const double zz  (dynamic_cast<const EcalEndcapGeometry*>( pG->getSubdetectorGeometry(DetId::Ecal, EcalEndcap ))->avgAbsZFrontFaceCenter() ) ;
+  theEventSetup.get<CaloGeometryRecord>().get(pG);
+
+  const double rad(dynamic_cast<const EcalBarrelGeometry*>(pG->getSubdetectorGeometry(DetId::Ecal, EcalBarrel))
+                       ->avgRadiusXYFrontFaceCenter());
+  const double zz(dynamic_cast<const EcalEndcapGeometry*>(pG->getSubdetectorGeometry(DetId::Ecal, EcalEndcap))
+                      ->avgAbsZFrontFaceCenter());
 
   rEB_ = rad;
   zEE_ = zz;
@@ -101,120 +100,150 @@ void IsolatedPixelTrackCandidateProducer::beginRun(const edm::Run &run, const ed
   edm::ESHandle<MagneticField> vbfField;
   theEventSetup.get<IdealMagneticFieldRecord>().get(vbfField);
   const VolumeBasedMagneticField* vbfCPtr = dynamic_cast<const VolumeBasedMagneticField*>(&(*vbfField));
-  GlobalVector BField = vbfCPtr->inTesla(GlobalPoint(0,0,0));
-  bfVal_=BField.mag();
+  GlobalVector BField = vbfCPtr->inTesla(GlobalPoint(0, 0, 0));
+  bfVal_ = BField.mag();
 }
 
 void IsolatedPixelTrackCandidateProducer::produce(edm::Event& theEvent, const edm::EventSetup& theEventSetup) {
-
   auto trackCollection = std::make_unique<reco::IsolatedPixelTrackCandidateCollection>();
 
   //create vector of refs from input collections
   std::vector<reco::TrackRef> pixelTrackRefs;
 #ifdef DebugLog
-  edm::LogInfo("HcalIsoTrack") << "IsolatedPixelTrakCandidate: with" << toks_pix_.size() << " candidates to start with\n";
+  edm::LogInfo("HcalIsoTrack") << "IsolatedPixelTrakCandidate: with" << toks_pix_.size()
+                               << " candidates to start with\n";
 #endif
-  for (unsigned int iPix=0; iPix<toks_pix_.size(); iPix++) {
+  for (unsigned int iPix = 0; iPix < toks_pix_.size(); iPix++) {
     edm::Handle<reco::TrackCollection> iPixCol;
-    theEvent.getByToken(toks_pix_[iPix],iPixCol);
-    for (reco::TrackCollection::const_iterator pit=iPixCol->begin(); pit!=iPixCol->end(); pit++) {
-      pixelTrackRefs.push_back(reco::TrackRef(iPixCol,pit-iPixCol->begin()));
+    theEvent.getByToken(toks_pix_[iPix], iPixCol);
+    for (reco::TrackCollection::const_iterator pit = iPixCol->begin(); pit != iPixCol->end(); pit++) {
+      pixelTrackRefs.push_back(reco::TrackRef(iPixCol, pit - iPixCol->begin()));
     }
   }
 
   edm::Handle<l1extra::L1JetParticleCollection> l1eTauJets;
-  theEvent.getByToken(tok_l1_,l1eTauJets);
+  theEvent.getByToken(tok_l1_, l1eTauJets);
 
   edm::Handle<reco::VertexCollection> pVert;
-  theEvent.getByToken(tok_vert_,pVert);
+  theEvent.getByToken(tok_vert_, pVert);
 
   double drMaxL1Track_ = tauAssocCone_;
-  
+
   int ntr = 0;
-  std::vector<seedAtEC>  VecSeedsatEC;
+  std::vector<seedAtEC> VecSeedsatEC;
   //loop to select isolated tracks
-  for (unsigned iS=0; iS<pixelTrackRefs.size(); iS++) {
+  for (unsigned iS = 0; iS < pixelTrackRefs.size(); iS++) {
     bool vtxMatch = false;
-    //associate to vertex (in Z) 
+    //associate to vertex (in Z)
     reco::VertexCollection::const_iterator vitSel;
     double minDZ = 1000;
-    bool   found(false);
-    for (reco::VertexCollection::const_iterator vit=pVert->begin(); vit!=pVert->end(); vit++) {
-      if (std::abs(pixelTrackRefs[iS]->dz(vit->position()))<minDZ) {
-	minDZ  = std::abs(pixelTrackRefs[iS]->dz(vit->position()));
-	vitSel = vit;
-	found  = true;
+    bool found(false);
+    for (reco::VertexCollection::const_iterator vit = pVert->begin(); vit != pVert->end(); vit++) {
+      if (std::abs(pixelTrackRefs[iS]->dz(vit->position())) < minDZ) {
+        minDZ = std::abs(pixelTrackRefs[iS]->dz(vit->position()));
+        vitSel = vit;
+        found = true;
       }
     }
     //cut on dYX:
     if (found) {
-      if(std::abs(pixelTrackRefs[iS]->dxy(vitSel->position()))<vtxCutSeed_) vtxMatch=true;
+      if (std::abs(pixelTrackRefs[iS]->dxy(vitSel->position())) < vtxCutSeed_)
+        vtxMatch = true;
     } else {
-      vtxMatch=true;
+      vtxMatch = true;
     }
 
     //check taujet matching
-    bool tmatch=false;
+    bool tmatch = false;
     l1extra::L1JetParticleCollection::const_iterator selj;
-    for (l1extra::L1JetParticleCollection::const_iterator tj=l1eTauJets->begin(); tj!=l1eTauJets->end(); tj++) {
-      if (reco::deltaR(pixelTrackRefs[iS]->momentum().eta(), pixelTrackRefs[iS]->momentum().phi(), tj->momentum().eta(), tj->momentum().phi()) > drMaxL1Track_) continue;
-      selj   = tj;
+    for (l1extra::L1JetParticleCollection::const_iterator tj = l1eTauJets->begin(); tj != l1eTauJets->end(); tj++) {
+      if (reco::deltaR(pixelTrackRefs[iS]->momentum().eta(),
+                       pixelTrackRefs[iS]->momentum().phi(),
+                       tj->momentum().eta(),
+                       tj->momentum().phi()) > drMaxL1Track_)
+        continue;
+      selj = tj;
       tmatch = true;
-    } //loop over L1 tau
+    }  //loop over L1 tau
 
     //propagate seed track to ECAL surface:
-    std::pair<double,double> seedCooAtEC;
+    std::pair<double, double> seedCooAtEC;
     // in case vertex is found:
-    if (found) seedCooAtEC=GetEtaPhiAtEcal(pixelTrackRefs[iS]->eta(), pixelTrackRefs[iS]->phi(), pixelTrackRefs[iS]->pt(), pixelTrackRefs[iS]->charge(), vitSel->z());
+    if (found)
+      seedCooAtEC = GetEtaPhiAtEcal(pixelTrackRefs[iS]->eta(),
+                                    pixelTrackRefs[iS]->phi(),
+                                    pixelTrackRefs[iS]->pt(),
+                                    pixelTrackRefs[iS]->charge(),
+                                    vitSel->z());
     //in case vertex is not found:
-    else       seedCooAtEC=GetEtaPhiAtEcal(pixelTrackRefs[iS]->eta(), pixelTrackRefs[iS]->phi(), pixelTrackRefs[iS]->pt(), pixelTrackRefs[iS]->charge(), 0);
-    seedAtEC seed(iS,(tmatch||vtxMatch),seedCooAtEC.first,seedCooAtEC.second);
+    else
+      seedCooAtEC = GetEtaPhiAtEcal(pixelTrackRefs[iS]->eta(),
+                                    pixelTrackRefs[iS]->phi(),
+                                    pixelTrackRefs[iS]->pt(),
+                                    pixelTrackRefs[iS]->charge(),
+                                    0);
+    seedAtEC seed(iS, (tmatch || vtxMatch), seedCooAtEC.first, seedCooAtEC.second);
     VecSeedsatEC.push_back(seed);
   }
 #ifdef DebugLog
   edm::LogInfo("HcalIsoTrack") << "IsolatedPixelTrakCandidate: " << VecSeedsatEC.size() << " seeds after propagation\n";
 #endif
 
-  for (unsigned int i=0; i<VecSeedsatEC.size(); i++) {
+  for (unsigned int i = 0; i < VecSeedsatEC.size(); i++) {
     unsigned int iSeed = VecSeedsatEC[i].index;
-    if (!VecSeedsatEC[i].ok) continue;
-    if(pixelTrackRefs[iSeed]->p()<minPTrackValue_) continue; 
+    if (!VecSeedsatEC[i].ok)
+      continue;
+    if (pixelTrackRefs[iSeed]->p() < minPTrackValue_)
+      continue;
     l1extra::L1JetParticleCollection::const_iterator selj;
-    for (l1extra::L1JetParticleCollection::const_iterator tj=l1eTauJets->begin(); tj!=l1eTauJets->end(); tj++)  {
-      if (reco::deltaR(pixelTrackRefs[iSeed]->momentum().eta(),pixelTrackRefs[iSeed]->momentum().phi(),tj->momentum().eta(),tj->momentum().phi()) > drMaxL1Track_) continue;
-      selj   = tj;
-    } //loop over L1 tau
+    for (l1extra::L1JetParticleCollection::const_iterator tj = l1eTauJets->begin(); tj != l1eTauJets->end(); tj++) {
+      if (reco::deltaR(pixelTrackRefs[iSeed]->momentum().eta(),
+                       pixelTrackRefs[iSeed]->momentum().phi(),
+                       tj->momentum().eta(),
+                       tj->momentum().phi()) > drMaxL1Track_)
+        continue;
+      selj = tj;
+    }  //loop over L1 tau
     double maxP = 0;
     double sumP = 0;
-    for(unsigned int j=0; j<VecSeedsatEC.size(); j++) {
-      if (i==j) continue;
+    for (unsigned int j = 0; j < VecSeedsatEC.size(); j++) {
+      if (i == j)
+        continue;
       unsigned int iSurr = VecSeedsatEC[j].index;
       //define preliminary cone around seed track impact point from which tracks will be extrapolated:
-      if (reco::deltaR(pixelTrackRefs[iSeed]->eta(), pixelTrackRefs[iSeed]->phi(), pixelTrackRefs[iSurr]->eta(), pixelTrackRefs[iSurr]->phi())>prelimCone_) continue;
+      if (reco::deltaR(pixelTrackRefs[iSeed]->eta(),
+                       pixelTrackRefs[iSeed]->phi(),
+                       pixelTrackRefs[iSurr]->eta(),
+                       pixelTrackRefs[iSurr]->phi()) > prelimCone_)
+        continue;
       double minDZ2(1000);
-      bool   found(false);
+      bool found(false);
       reco::VertexCollection::const_iterator vitSel2;
-      for (reco::VertexCollection::const_iterator vit=pVert->begin(); vit!=pVert->end(); vit++) {
-	if (std::abs(pixelTrackRefs[iSurr]->dz(vit->position()))<minDZ2) {
-	  minDZ2  = std::abs(pixelTrackRefs[iSurr]->dz(vit->position()));
-	  vitSel2 = vit;
-	  found   = true;
-	}
+      for (reco::VertexCollection::const_iterator vit = pVert->begin(); vit != pVert->end(); vit++) {
+        if (std::abs(pixelTrackRefs[iSurr]->dz(vit->position())) < minDZ2) {
+          minDZ2 = std::abs(pixelTrackRefs[iSurr]->dz(vit->position()));
+          vitSel2 = vit;
+          found = true;
+        }
       }
       //cut ot dXY:
-      if (found&&std::abs(pixelTrackRefs[iSurr]->dxy(vitSel2->position()))>vtxCutIsol_) continue;
-      //calculate distance at ECAL surface and update isolation: 
-      if (getDistInCM(VecSeedsatEC[i].eta, VecSeedsatEC[i].phi, VecSeedsatEC[j].eta, VecSeedsatEC[j].phi)<pixelIsolationConeSizeAtEC_) {
-	sumP+=pixelTrackRefs[iSurr]->p();
-	if(pixelTrackRefs[iSurr]->p()>maxP) maxP=pixelTrackRefs[iSurr]->p();
-      }      
+      if (found && std::abs(pixelTrackRefs[iSurr]->dxy(vitSel2->position())) > vtxCutIsol_)
+        continue;
+      //calculate distance at ECAL surface and update isolation:
+      if (getDistInCM(VecSeedsatEC[i].eta, VecSeedsatEC[i].phi, VecSeedsatEC[j].eta, VecSeedsatEC[j].phi) <
+          pixelIsolationConeSizeAtEC_) {
+        sumP += pixelTrackRefs[iSurr]->p();
+        if (pixelTrackRefs[iSurr]->p() > maxP)
+          maxP = pixelTrackRefs[iSurr]->p();
+      }
     }
-    if (maxP<maxPForIsolationValue_) {
-      reco::IsolatedPixelTrackCandidate newCandidate(pixelTrackRefs[iSeed], l1extra::L1JetParticleRef(l1eTauJets,selj-l1eTauJets->begin()), maxP, sumP);
+    if (maxP < maxPForIsolationValue_) {
+      reco::IsolatedPixelTrackCandidate newCandidate(
+          pixelTrackRefs[iSeed], l1extra::L1JetParticleRef(l1eTauJets, selj - l1eTauJets->begin()), maxP, sumP);
       newCandidate.setEtaPhiEcal(VecSeedsatEC[i].eta, VecSeedsatEC[i].phi);
       trackCollection->push_back(newCandidate);
       ntr++;
-    }    
+    }
   }
   // put the product in the event
   theEvent.put(std::move(trackCollection));
@@ -223,77 +252,86 @@ void IsolatedPixelTrackCandidateProducer::produce(edm::Event& theEvent, const ed
 #endif
 }
 
-
 double IsolatedPixelTrackCandidateProducer::getDistInCM(double eta1, double phi1, double eta2, double phi2) {
   double Rec;
-  double theta1=2*atan(exp(-eta1));
-  double theta2=2*atan(exp(-eta2));
-  if (std::abs(eta1)<1.479) Rec=rEB_; //radius of ECAL barrel
-  else if (std::abs(eta1)>1.479&&std::abs(eta1)<7.0) Rec=tan(theta1)*zEE_; //distance from IP to ECAL endcap
-  else return 1000;
+  double theta1 = 2 * atan(exp(-eta1));
+  double theta2 = 2 * atan(exp(-eta2));
+  if (std::abs(eta1) < 1.479)
+    Rec = rEB_;  //radius of ECAL barrel
+  else if (std::abs(eta1) > 1.479 && std::abs(eta1) < 7.0)
+    Rec = tan(theta1) * zEE_;  //distance from IP to ECAL endcap
+  else
+    return 1000;
 
   //|vect| times tg of acos(scalar product)
-  double angle=acos((sin(theta1)*sin(theta2)*(sin(phi1)*sin(phi2)+cos(phi1)*cos(phi2))+cos(theta1)*cos(theta2)));
-  if (angle<M_PI_2) return std::abs((Rec/sin(theta1))*tan(angle));
-  else return 1000;
+  double angle =
+      acos((sin(theta1) * sin(theta2) * (sin(phi1) * sin(phi2) + cos(phi1) * cos(phi2)) + cos(theta1) * cos(theta2)));
+  if (angle < M_PI_2)
+    return std::abs((Rec / sin(theta1)) * tan(angle));
+  else
+    return 1000;
 }
 
-
-std::pair<double,double> IsolatedPixelTrackCandidateProducer::GetEtaPhiAtEcal(double etaIP, double phiIP, double pT, int charge, double vtxZ) {
-
-  double deltaPhi=0;
+std::pair<double, double> IsolatedPixelTrackCandidateProducer::GetEtaPhiAtEcal(
+    double etaIP, double phiIP, double pT, int charge, double vtxZ) {
+  double deltaPhi = 0;
   double etaEC = 100;
   double phiEC = 100;
 
   double Rcurv = 9999999;
-  if (bfVal_!=0) Rcurv=pT*33.3*100/(bfVal_*10); //r(m)=pT(GeV)*33.3/B(kG)
+  if (bfVal_ != 0)
+    Rcurv = pT * 33.3 * 100 / (bfVal_ * 10);  //r(m)=pT(GeV)*33.3/B(kG)
 
   double ecDist = zEE_;  //distance to ECAL andcap from IP (cm), 317 - ecal (not preshower), preshower -300
-  double ecRad  = rEB_;  //radius of ECAL barrel (cm)
-  double theta  = 2*atan(exp(-etaIP));
-  double zNew   = 0;
-  if (theta>M_PI_2) theta=M_PI-theta;
-  if (std::abs(etaIP)<ebEtaBoundary_) {
-    if ((0.5*ecRad/Rcurv)>1) {
-      etaEC         = 10000;
-      deltaPhi      = 0;
+  double ecRad = rEB_;   //radius of ECAL barrel (cm)
+  double theta = 2 * atan(exp(-etaIP));
+  double zNew = 0;
+  if (theta > M_PI_2)
+    theta = M_PI - theta;
+  if (std::abs(etaIP) < ebEtaBoundary_) {
+    if ((0.5 * ecRad / Rcurv) > 1) {
+      etaEC = 10000;
+      deltaPhi = 0;
     } else {
-      deltaPhi      =-charge*asin(0.5*ecRad/Rcurv);
-      double alpha1 = 2*asin(0.5*ecRad/Rcurv);
-      double z      = ecRad/tan(theta);
-      if (etaIP>0) zNew = z*(Rcurv*alpha1)/ecRad+vtxZ; //new z-coordinate of track
-      else         zNew =-z*(Rcurv*alpha1)/ecRad+vtxZ; //new z-coordinate of track
-      double zAbs=std::abs(zNew);
-      if (zAbs<ecDist) {
-	etaEC    = -log(tan(0.5*atan(ecRad/zAbs)));
-	deltaPhi = -charge*asin(0.5*ecRad/Rcurv);
+      deltaPhi = -charge * asin(0.5 * ecRad / Rcurv);
+      double alpha1 = 2 * asin(0.5 * ecRad / Rcurv);
+      double z = ecRad / tan(theta);
+      if (etaIP > 0)
+        zNew = z * (Rcurv * alpha1) / ecRad + vtxZ;  //new z-coordinate of track
+      else
+        zNew = -z * (Rcurv * alpha1) / ecRad + vtxZ;  //new z-coordinate of track
+      double zAbs = std::abs(zNew);
+      if (zAbs < ecDist) {
+        etaEC = -log(tan(0.5 * atan(ecRad / zAbs)));
+        deltaPhi = -charge * asin(0.5 * ecRad / Rcurv);
       }
-      if (zAbs>ecDist) {
-	zAbs           = (std::abs(etaIP)/etaIP)*ecDist;
-	double Zflight = std::abs(zAbs-vtxZ);
-	double alpha   = (Zflight*ecRad)/(z*Rcurv);
-	double Rec     = 2*Rcurv*sin(alpha/2);
-	deltaPhi       =-charge*alpha/2;
-	etaEC          =-log(tan(0.5*atan(Rec/ecDist)));
+      if (zAbs > ecDist) {
+        zAbs = (std::abs(etaIP) / etaIP) * ecDist;
+        double Zflight = std::abs(zAbs - vtxZ);
+        double alpha = (Zflight * ecRad) / (z * Rcurv);
+        double Rec = 2 * Rcurv * sin(alpha / 2);
+        deltaPhi = -charge * alpha / 2;
+        etaEC = -log(tan(0.5 * atan(Rec / ecDist)));
       }
     }
   } else {
-    zNew           = (std::abs(etaIP)/etaIP)*ecDist;
-    double Zflight = std::abs(zNew-vtxZ);
-    double Rvirt   = std::abs(Zflight*tan(theta));
-    double Rec     = 2*Rcurv*sin(Rvirt/(2*Rcurv));
-    deltaPhi       =-(charge)*(Rvirt/(2*Rcurv));
-    etaEC          =-log(tan(0.5*atan(Rec/ecDist)));
+    zNew = (std::abs(etaIP) / etaIP) * ecDist;
+    double Zflight = std::abs(zNew - vtxZ);
+    double Rvirt = std::abs(Zflight * tan(theta));
+    double Rec = 2 * Rcurv * sin(Rvirt / (2 * Rcurv));
+    deltaPhi = -(charge) * (Rvirt / (2 * Rcurv));
+    etaEC = -log(tan(0.5 * atan(Rec / ecDist)));
   }
 
-  if (zNew<0) etaEC=-etaEC;
-  phiEC            = phiIP+deltaPhi;
+  if (zNew < 0)
+    etaEC = -etaEC;
+  phiEC = phiIP + deltaPhi;
 
-  if (phiEC<-M_PI) phiEC += M_2_PI;
-  if (phiEC>M_PI)  phiEC -= M_2_PI;
+  if (phiEC < -M_PI)
+    phiEC += M_2_PI;
+  if (phiEC > M_PI)
+    phiEC -= M_2_PI;
 
-  std::pair<double,double> retVal(etaEC,phiEC);
+  std::pair<double, double> retVal(etaEC, phiEC);
   return retVal;
 }
-
-
diff --git a/Calibration/HcalIsolatedTrackReco/src/SealModule.cc b/Calibration/HcalIsolatedTrackReco/src/SealModule.cc
index 8b9a3662d89e4..cc0f9cb28b225 100644
--- a/Calibration/HcalIsolatedTrackReco/src/SealModule.cc
+++ b/Calibration/HcalIsolatedTrackReco/src/SealModule.cc
@@ -4,15 +4,15 @@
 #include "Calibration/HcalIsolatedTrackReco/interface/IsolatedPixelTrackCandidateL1TProducer.h"
 #include "Calibration/HcalIsolatedTrackReco/interface/IsolatedEcalPixelTrackCandidateProducer.h"
 #include "Calibration/HcalIsolatedTrackReco/interface/EcalIsolatedParticleCandidateProducer.h"
-#include "RecoTracker/TkTrackingRegions/interface/TrackingRegionProducerFactory.h" 	 
-#include "RecoTracker/TkTrackingRegions/interface/TrackingRegionProducer.h" 	 
+#include "RecoTracker/TkTrackingRegions/interface/TrackingRegionProducerFactory.h"
+#include "RecoTracker/TkTrackingRegions/interface/TrackingRegionProducer.h"
 #include "Calibration/HcalIsolatedTrackReco/interface/SiStripRegFEDSelector.h"
 #include "Calibration/HcalIsolatedTrackReco/interface/ECALRegFEDSelector.h"
 #include "Calibration/HcalIsolatedTrackReco/interface/SubdetFEDSelector.h"
 #include "HITRegionalPixelSeedGenerator.h"
 #include "Calibration/HcalIsolatedTrackReco/interface/IPTCorrector.h"
 
-DEFINE_EDM_PLUGIN(TrackingRegionProducerFactory, HITRegionalPixelSeedGenerator, "HITRegionalPixelSeedGenerator"); 
+DEFINE_EDM_PLUGIN(TrackingRegionProducerFactory, HITRegionalPixelSeedGenerator, "HITRegionalPixelSeedGenerator");
 //
 DEFINE_FWK_MODULE(IsolatedPixelTrackCandidateProducer);
 DEFINE_FWK_MODULE(IsolatedPixelTrackCandidateL1TProducer);
diff --git a/Calibration/HcalIsolatedTrackReco/src/SiStripRegFEDSelector.cc b/Calibration/HcalIsolatedTrackReco/src/SiStripRegFEDSelector.cc
index 6d85d261f2f07..892a37aaaf2ca 100644
--- a/Calibration/HcalIsolatedTrackReco/src/SiStripRegFEDSelector.cc
+++ b/Calibration/HcalIsolatedTrackReco/src/SiStripRegFEDSelector.cc
@@ -5,146 +5,123 @@
 #include "DataFormats/HcalIsolatedTrack/interface/IsolatedPixelTrackCandidate.h"
 #include "DataFormats/HcalIsolatedTrack/interface/IsolatedPixelTrackCandidateFwd.h"
 
-SiStripRegFEDSelector::SiStripRegFEDSelector(const edm::ParameterSet& iConfig)
-{
+SiStripRegFEDSelector::SiStripRegFEDSelector(const edm::ParameterSet& iConfig) {
   tok_seed_ = consumes<trigger::TriggerFilterObjectWithRefs>(iConfig.getParameter<edm::InputTag>("regSeedLabel"));
-  delta_=iConfig.getParameter<double>("delta");
-  
+  delta_ = iConfig.getParameter<double>("delta");
+
   tok_raw_ = consumes<FEDRawDataCollection>(iConfig.getParameter<edm::InputTag>("rawInputLabel"));
 
   produces<FEDRawDataCollection>();
 }
 
+SiStripRegFEDSelector::~SiStripRegFEDSelector() {}
 
-SiStripRegFEDSelector::~SiStripRegFEDSelector()
-{
- 
-}
-
-void
-SiStripRegFEDSelector::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void SiStripRegFEDSelector::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   auto producedData = std::make_unique<FEDRawDataCollection>();
 
   edm::Handle<trigger::TriggerFilterObjectWithRefs> trigSeedTrks;
-  iEvent.getByToken(tok_seed_,trigSeedTrks);
-  
-  std::vector< edm::Ref<reco::IsolatedPixelTrackCandidateCollection> > isoPixTrackRefs;
+  iEvent.getByToken(tok_seed_, trigSeedTrks);
+
+  std::vector<edm::Ref<reco::IsolatedPixelTrackCandidateCollection> > isoPixTrackRefs;
   trigSeedTrks->getObjects(trigger::TriggerTrack, isoPixTrackRefs);
- 
+
   edm::Handle<FEDRawDataCollection> rawIn;
-  iEvent.getByToken(tok_raw_,rawIn);
-  
+  iEvent.getByToken(tok_raw_, rawIn);
+
   iSetup.get<SiStripRegionCablingRcd>().get(strip_cabling);
-  
-  std::vector<int> stripFEDVec; 
-  
+
+  std::vector<int> stripFEDVec;
+
   //get vector of regions
-  const SiStripRegionCabling::Cabling ccab=strip_cabling->getRegionCabling();
-  
+  const SiStripRegionCabling::Cabling ccab = strip_cabling->getRegionCabling();
+
   //size of region (eta,phi)
-  const std::pair<double,double> regDim=strip_cabling->regionDimensions();
-  
+  const std::pair<double, double> regDim = strip_cabling->regionDimensions();
+
   const SiStripRegionCabling::ElementCabling elcabling;
-  
+
   bool fedSaved[1000];
-  for (int i=0; i<1000; i++) fedSaved[i]=false;
-  
+  for (int i = 0; i < 1000; i++)
+    fedSaved[i] = false;
+
   //cycle on seeds
-  for (uint32_t p=0; p<isoPixTrackRefs.size(); p++)
-    {
-      double etaObj_=isoPixTrackRefs[p]->track()->eta();
-      double phiObj_=isoPixTrackRefs[p]->track()->phi();
-      
-      //cycle on regions
-      for (uint32_t i=0; i<ccab.size(); i++)
-	{
-	  SiStripRegionCabling::Position pos=strip_cabling->position(i);
-	  double dphi=fabs(pos.second-phiObj_);
-	  if (dphi>acos(-1)) dphi=2*acos(-1)-dphi;
-	  double R=sqrt(pow(pos.first-etaObj_,2)+dphi*dphi);
-	  if (R-sqrt(pow(regDim.first/2,2)+pow(regDim.second/2,2))>delta_) continue;
-	  //get vector of subdets within region
-	  const SiStripRegionCabling::RegionCabling regSubdets= ccab[i];
-	  //cycle on subdets
-	  for (uint32_t idet=0; idet<SiStripRegionCabling::ALLSUBDETS; idet++)
-	    {
-	      //get vector of layers within subdet of region
-	      const SiStripRegionCabling::WedgeCabling regSubdetLayers=regSubdets[idet];	
-	      for (uint32_t ilayer=0; ilayer<SiStripRegionCabling::ALLLAYERS; ilayer++)
-		{
-		  //get map of vectors of feds withing the layer of subdet of region
-		  const SiStripRegionCabling::ElementCabling fedVectorMap=regSubdetLayers[ilayer];
-		  SiStripRegionCabling::ElementCabling::const_iterator it=fedVectorMap.begin();
-		  for( ; it!=fedVectorMap.end(); it++)
-		    {
-		      for (uint32_t op=0; op<(it->second).size(); op++)
-			{
-			  //get fed id 
-			  int fediid=(it->second)[op].fedId(); 
-			  if (!fedSaved[fediid]) 
-			    {
-			      stripFEDVec.push_back(fediid);
-			    }
-			  fedSaved[fediid]=true;
-			  
-			}
-		    }	
-		  
-		}
-	      
-	    }
-	}
+  for (uint32_t p = 0; p < isoPixTrackRefs.size(); p++) {
+    double etaObj_ = isoPixTrackRefs[p]->track()->eta();
+    double phiObj_ = isoPixTrackRefs[p]->track()->phi();
+
+    //cycle on regions
+    for (uint32_t i = 0; i < ccab.size(); i++) {
+      SiStripRegionCabling::Position pos = strip_cabling->position(i);
+      double dphi = fabs(pos.second - phiObj_);
+      if (dphi > acos(-1))
+        dphi = 2 * acos(-1) - dphi;
+      double R = sqrt(pow(pos.first - etaObj_, 2) + dphi * dphi);
+      if (R - sqrt(pow(regDim.first / 2, 2) + pow(regDim.second / 2, 2)) > delta_)
+        continue;
+      //get vector of subdets within region
+      const SiStripRegionCabling::RegionCabling regSubdets = ccab[i];
+      //cycle on subdets
+      for (uint32_t idet = 0; idet < SiStripRegionCabling::ALLSUBDETS; idet++) {
+        //get vector of layers within subdet of region
+        const SiStripRegionCabling::WedgeCabling regSubdetLayers = regSubdets[idet];
+        for (uint32_t ilayer = 0; ilayer < SiStripRegionCabling::ALLLAYERS; ilayer++) {
+          //get map of vectors of feds withing the layer of subdet of region
+          const SiStripRegionCabling::ElementCabling fedVectorMap = regSubdetLayers[ilayer];
+          SiStripRegionCabling::ElementCabling::const_iterator it = fedVectorMap.begin();
+          for (; it != fedVectorMap.end(); it++) {
+            for (uint32_t op = 0; op < (it->second).size(); op++) {
+              //get fed id
+              int fediid = (it->second)[op].fedId();
+              if (!fedSaved[fediid]) {
+                stripFEDVec.push_back(fediid);
+              }
+              fedSaved[fediid] = true;
+            }
+          }
+        }
+      }
     }
-  
-  
+  }
+
   /////////////// Copying FEDs:
-  
-  const FEDRawDataCollection *rdc=rawIn.product();
-  
+
+  const FEDRawDataCollection* rdc = rawIn.product();
+
   //   if ( ( rawData[i].provenance()->processName() != e.processHistory().rbegin()->processName() ) )
   //       continue ; // skip all raw collections not produced by the current process
-  
-  for ( int j=0; j< FEDNumbering::MAXFEDID; ++j ) 
-    {
-      bool rightFED=false;
-      for (uint32_t k=0; k<stripFEDVec.size(); k++) 
-	{
-	  if (j==stripFEDVec[k])
-	    {
-	      rightFED=true;
-	    }
-	}
-      if (!rightFED) continue;
-      const FEDRawData & fedData = rdc->FEDData(j);
-      size_t size=fedData.size();
-      
-      if ( size > 0 ) 
-	{
-	  // this fed has data -- lets copy it
-	  FEDRawData & fedDataProd = producedData->FEDData(j);
-	  if ( fedDataProd.size() != 0 ) {
-//	    std::cout << " More than one FEDRawDataCollection with data in FED ";
-//	    std::cout << j << " Skipping the 2nd\n";
-	    continue;
-	  }
-	  fedDataProd.resize(size);
-	  unsigned char *dataProd=fedDataProd.data();
-	  const unsigned char *data=fedData.data();
-	  for ( unsigned int k=0; k<size; ++k ) {
-	    dataProd[k]=data[k];
-	  }
-	}
+
+  for (int j = 0; j < FEDNumbering::MAXFEDID; ++j) {
+    bool rightFED = false;
+    for (uint32_t k = 0; k < stripFEDVec.size(); k++) {
+      if (j == stripFEDVec[k]) {
+        rightFED = true;
+      }
     }
-  
+    if (!rightFED)
+      continue;
+    const FEDRawData& fedData = rdc->FEDData(j);
+    size_t size = fedData.size();
+
+    if (size > 0) {
+      // this fed has data -- lets copy it
+      FEDRawData& fedDataProd = producedData->FEDData(j);
+      if (fedDataProd.size() != 0) {
+        //	    std::cout << " More than one FEDRawDataCollection with data in FED ";
+        //	    std::cout << j << " Skipping the 2nd\n";
+        continue;
+      }
+      fedDataProd.resize(size);
+      unsigned char* dataProd = fedDataProd.data();
+      const unsigned char* data = fedData.data();
+      for (unsigned int k = 0; k < size; ++k) {
+        dataProd[k] = data[k];
+      }
+    }
+  }
+
   iEvent.put(std::move(producedData));
-  
 }
 
-void 
-SiStripRegFEDSelector::beginJob() {
-}
+void SiStripRegFEDSelector::beginJob() {}
 
-void 
-SiStripRegFEDSelector::endJob() {
-}
+void SiStripRegFEDSelector::endJob() {}
diff --git a/Calibration/HcalIsolatedTrackReco/src/SubdetFEDSelector.cc b/Calibration/HcalIsolatedTrackReco/src/SubdetFEDSelector.cc
index 8cf4c0a925d70..2c297312d6945 100644
--- a/Calibration/HcalIsolatedTrackReco/src/SubdetFEDSelector.cc
+++ b/Calibration/HcalIsolatedTrackReco/src/SubdetFEDSelector.cc
@@ -1,231 +1,178 @@
 
 #include "Calibration/HcalIsolatedTrackReco/interface/SubdetFEDSelector.h"
 
-SubdetFEDSelector::SubdetFEDSelector(const edm::ParameterSet& iConfig)
-{
-  getEcal_=iConfig.getParameter<bool>("getECAL");
-  getStrip_=iConfig.getParameter<bool>("getSiStrip");
-  getPixel_=iConfig.getParameter<bool>("getSiPixel");
-  getHcal_=iConfig.getParameter<bool>("getHCAL");
-  getMuon_=iConfig.getParameter<bool>("getMuon");
-  getTrigger_=iConfig.getParameter<bool>("getTrigger");
-  
+SubdetFEDSelector::SubdetFEDSelector(const edm::ParameterSet& iConfig) {
+  getEcal_ = iConfig.getParameter<bool>("getECAL");
+  getStrip_ = iConfig.getParameter<bool>("getSiStrip");
+  getPixel_ = iConfig.getParameter<bool>("getSiPixel");
+  getHcal_ = iConfig.getParameter<bool>("getHCAL");
+  getMuon_ = iConfig.getParameter<bool>("getMuon");
+  getTrigger_ = iConfig.getParameter<bool>("getTrigger");
+
   tok_raw_ = consumes<FEDRawDataCollection>(iConfig.getParameter<edm::InputTag>("rawInputLabel"));
 
   produces<FEDRawDataCollection>();
-  
-}
-
-SubdetFEDSelector::~SubdetFEDSelector()
-{
 }
 
-void
-SubdetFEDSelector::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+SubdetFEDSelector::~SubdetFEDSelector() {}
 
+void SubdetFEDSelector::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   auto producedData = std::make_unique<FEDRawDataCollection>();
 
   edm::Handle<FEDRawDataCollection> rawIn;
-  iEvent.getByToken(tok_raw_,rawIn);
- 
+  iEvent.getByToken(tok_raw_, rawIn);
+
   std::vector<int> selFEDs;
 
-  if (getEcal_)
-    {
-      for (int i=FEDNumbering::MINECALFEDID; i<=FEDNumbering::MAXECALFEDID; i++)
-	{
-	  selFEDs.push_back(i);
-	}
-      for (int i=FEDNumbering::MINPreShowerFEDID; i<=FEDNumbering::MAXPreShowerFEDID; i++)
-	{
-	  selFEDs.push_back(i);
-	}
-    }
-
-  if (getMuon_)
-    {
-      for (int i=FEDNumbering::MINCSCFEDID; i<=FEDNumbering::MAXCSCFEDID; i++)
-	{
-	  selFEDs.push_back(i);
-	}
-  for (int i=FEDNumbering::MINCSCTFFEDID; i<=FEDNumbering::MAXCSCTFFEDID; i++)
-        {
-	  selFEDs.push_back(i);
-        }
-  for (int i=FEDNumbering::MINDTFEDID; i<=FEDNumbering::MAXDTFEDID; i++)
-        {
-	  selFEDs.push_back(i);
-        }
-  for (int i=FEDNumbering::MINDTTFFEDID; i<=FEDNumbering::MAXDTTFFEDID; i++)
-        {
-	  selFEDs.push_back(i);
-        }
-  for (int i=FEDNumbering::MINRPCFEDID; i<=FEDNumbering::MAXRPCFEDID; i++)
-        {
-	  selFEDs.push_back(i);
-        }
-  for (int i=FEDNumbering::MINCSCDDUFEDID; i<=FEDNumbering::MAXCSCDDUFEDID; i++)
-        {
-	  selFEDs.push_back(i);
-        }
-  for (int i=FEDNumbering::MINCSCContingencyFEDID; i<=FEDNumbering::MAXCSCContingencyFEDID; i++)
-        {
-	  selFEDs.push_back(i);
-        }
-  for (int i=FEDNumbering::MINCSCTFSPFEDID; i<=FEDNumbering::MAXCSCTFSPFEDID; i++)
-        {
-	  selFEDs.push_back(i);
-        }
-    }
-
-
-  if (getHcal_)
-    {
-      for (int i=FEDNumbering::MINHCALFEDID; i<=FEDNumbering::MAXHCALFEDID; i++)
-	{
-	  selFEDs.push_back(i);
-	}
-    }
-
-  
-  if (getStrip_)
-    {
-      for (int i=FEDNumbering::MINSiStripFEDID;  i<=FEDNumbering::MAXSiStripFEDID; i++)
-	{
-	  selFEDs.push_back(i);
-	}
-    }
-
-  
-  if (getPixel_)
-    {
-      for (int i=FEDNumbering::MINSiPixelFEDID;  i<=FEDNumbering::MAXSiPixelFEDID; i++)
-	{
-	  selFEDs.push_back(i);
-	}
-    }
-  
-  if (getTrigger_)
-    {
-      for (int i=FEDNumbering::MINTriggerEGTPFEDID;  i<=FEDNumbering::MAXTriggerEGTPFEDID; i++)
-	{
-	  selFEDs.push_back(i);
-	}
-      for (int i=FEDNumbering::MINTriggerGTPFEDID;  i<=FEDNumbering::MAXTriggerGTPFEDID; i++)
-	{
-	  selFEDs.push_back(i);
-	}
-      for (int i=FEDNumbering::MINTriggerLTCFEDID;  i<=FEDNumbering::MAXTriggerLTCFEDID; i++)
-	{
-	  selFEDs.push_back(i);
-	}
-      for (int i=FEDNumbering::MINTriggerLTCmtccFEDID;  i<=FEDNumbering::MAXTriggerLTCmtccFEDID; i++)
-	{
-	  selFEDs.push_back(i);
-	}
-      for (int i=FEDNumbering::MINTriggerGCTFEDID;  i<=FEDNumbering::MAXTriggerGCTFEDID; i++)
-        {
-          selFEDs.push_back(i);
-        }
-
-      for (int i=FEDNumbering::MINTriggerLTCTriggerFEDID;  i<=FEDNumbering::MAXTriggerLTCTriggerFEDID; i++)
-        {
-          selFEDs.push_back(i);
-        }
-
-      for (int i=FEDNumbering::MINTriggerLTCHCALFEDID;  i<=FEDNumbering::MAXTriggerLTCHCALFEDID; i++)
-        {
-          selFEDs.push_back(i);
-        }
-
-      for (int i=FEDNumbering::MINTriggerLTCSiStripFEDID;  i<=FEDNumbering::MAXTriggerLTCSiStripFEDID; i++)
-        {
-          selFEDs.push_back(i);
-        }
-
-      for (int i=FEDNumbering::MINTriggerLTCECALFEDID;  i<=FEDNumbering::MAXTriggerLTCECALFEDID; i++)
-        {
-          selFEDs.push_back(i);
-        }
-
-      for (int i=FEDNumbering::MINTriggerLTCTotemCastorFEDID;  i<=FEDNumbering::MAXTriggerLTCTotemCastorFEDID; i++)
-        {
-          selFEDs.push_back(i);
-        }
-      for (int i=FEDNumbering::MINTriggerLTCRPCFEDID;  i<=FEDNumbering::MAXTriggerLTCRPCFEDID; i++)
-        {
-          selFEDs.push_back(i);
-        }
-      
-      for (int i=FEDNumbering::MINTriggerLTCCSCFEDID;  i<=FEDNumbering::MAXTriggerLTCCSCFEDID; i++)
-        {
-          selFEDs.push_back(i);
-        }
-      for (int i=FEDNumbering::MINTriggerLTCDTFEDID;  i<=FEDNumbering::MAXTriggerLTCDTFEDID; i++)
-        {
-          selFEDs.push_back(i);
-        }
-      for (int i=FEDNumbering::MINTriggerLTCSiPixelFEDID;  i<=FEDNumbering::MAXTriggerLTCSiPixelFEDID; i++)
-        {
-          selFEDs.push_back(i);
-        }
-
-    }
-  
-  for (int i=FEDNumbering::MINDAQeFEDFEDID;  i<=FEDNumbering::MAXDAQeFEDFEDID; i++)
-    {
-      selFEDs.push_back(i);
-    }
-  
+  if (getEcal_) {
+    for (int i = FEDNumbering::MINECALFEDID; i <= FEDNumbering::MAXECALFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+    for (int i = FEDNumbering::MINPreShowerFEDID; i <= FEDNumbering::MAXPreShowerFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+  }
+
+  if (getMuon_) {
+    for (int i = FEDNumbering::MINCSCFEDID; i <= FEDNumbering::MAXCSCFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+    for (int i = FEDNumbering::MINCSCTFFEDID; i <= FEDNumbering::MAXCSCTFFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+    for (int i = FEDNumbering::MINDTFEDID; i <= FEDNumbering::MAXDTFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+    for (int i = FEDNumbering::MINDTTFFEDID; i <= FEDNumbering::MAXDTTFFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+    for (int i = FEDNumbering::MINRPCFEDID; i <= FEDNumbering::MAXRPCFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+    for (int i = FEDNumbering::MINCSCDDUFEDID; i <= FEDNumbering::MAXCSCDDUFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+    for (int i = FEDNumbering::MINCSCContingencyFEDID; i <= FEDNumbering::MAXCSCContingencyFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+    for (int i = FEDNumbering::MINCSCTFSPFEDID; i <= FEDNumbering::MAXCSCTFSPFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+  }
+
+  if (getHcal_) {
+    for (int i = FEDNumbering::MINHCALFEDID; i <= FEDNumbering::MAXHCALFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+  }
+
+  if (getStrip_) {
+    for (int i = FEDNumbering::MINSiStripFEDID; i <= FEDNumbering::MAXSiStripFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+  }
+
+  if (getPixel_) {
+    for (int i = FEDNumbering::MINSiPixelFEDID; i <= FEDNumbering::MAXSiPixelFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+  }
+
+  if (getTrigger_) {
+    for (int i = FEDNumbering::MINTriggerEGTPFEDID; i <= FEDNumbering::MAXTriggerEGTPFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+    for (int i = FEDNumbering::MINTriggerGTPFEDID; i <= FEDNumbering::MAXTriggerGTPFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+    for (int i = FEDNumbering::MINTriggerLTCFEDID; i <= FEDNumbering::MAXTriggerLTCFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+    for (int i = FEDNumbering::MINTriggerLTCmtccFEDID; i <= FEDNumbering::MAXTriggerLTCmtccFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+    for (int i = FEDNumbering::MINTriggerGCTFEDID; i <= FEDNumbering::MAXTriggerGCTFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+
+    for (int i = FEDNumbering::MINTriggerLTCTriggerFEDID; i <= FEDNumbering::MAXTriggerLTCTriggerFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+
+    for (int i = FEDNumbering::MINTriggerLTCHCALFEDID; i <= FEDNumbering::MAXTriggerLTCHCALFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+
+    for (int i = FEDNumbering::MINTriggerLTCSiStripFEDID; i <= FEDNumbering::MAXTriggerLTCSiStripFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+
+    for (int i = FEDNumbering::MINTriggerLTCECALFEDID; i <= FEDNumbering::MAXTriggerLTCECALFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+
+    for (int i = FEDNumbering::MINTriggerLTCTotemCastorFEDID; i <= FEDNumbering::MAXTriggerLTCTotemCastorFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+    for (int i = FEDNumbering::MINTriggerLTCRPCFEDID; i <= FEDNumbering::MAXTriggerLTCRPCFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+
+    for (int i = FEDNumbering::MINTriggerLTCCSCFEDID; i <= FEDNumbering::MAXTriggerLTCCSCFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+    for (int i = FEDNumbering::MINTriggerLTCDTFEDID; i <= FEDNumbering::MAXTriggerLTCDTFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+    for (int i = FEDNumbering::MINTriggerLTCSiPixelFEDID; i <= FEDNumbering::MAXTriggerLTCSiPixelFEDID; i++) {
+      selFEDs.push_back(i);
+    }
+  }
+
+  for (int i = FEDNumbering::MINDAQeFEDFEDID; i <= FEDNumbering::MAXDAQeFEDFEDID; i++) {
+    selFEDs.push_back(i);
+  }
 
   // Copying:
-  const FEDRawDataCollection *rdc=rawIn.product();
-  
+  const FEDRawDataCollection* rdc = rawIn.product();
+
   //   if ( ( rawData[i].provenance()->processName() != e.processHistory().rbegin()->processName() ) )
   //       continue ; // skip all raw collections not produced by the current process
-  
-  for ( int j=0; j< FEDNumbering::MAXFEDID; ++j ) 
-    {
-      bool rightFED=false;
-      for (uint32_t k=0; k<selFEDs.size(); k++)
-	{
-	  if (j==selFEDs[k])
-	   {
-	     rightFED=true;
-	   }
-       }
-     if (!rightFED) continue;
-     const FEDRawData & fedData = rdc->FEDData(j);
-     size_t size=fedData.size();
-     
-     if ( size > 0 ) 
-       {
-       // this fed has data -- lets copy it
-	 FEDRawData & fedDataProd = producedData->FEDData(j);
-	 if ( fedDataProd.size() != 0 ) {
-//	   std::cout << " More than one FEDRawDataCollection with data in FED ";
-//	   std::cout << j << " Skipping the 2nd\n";
-	   continue;
-	 }
-	 fedDataProd.resize(size);
-	 unsigned char *dataProd=fedDataProd.data();
-	 const unsigned char *data=fedData.data();
-	 for ( unsigned int k=0; k<size; ++k ) {
-	   dataProd[k]=data[k];
-	 }
-       }
-   }
-
- iEvent.put(std::move(producedData));
 
-}
+  for (int j = 0; j < FEDNumbering::MAXFEDID; ++j) {
+    bool rightFED = false;
+    for (uint32_t k = 0; k < selFEDs.size(); k++) {
+      if (j == selFEDs[k]) {
+        rightFED = true;
+      }
+    }
+    if (!rightFED)
+      continue;
+    const FEDRawData& fedData = rdc->FEDData(j);
+    size_t size = fedData.size();
+
+    if (size > 0) {
+      // this fed has data -- lets copy it
+      FEDRawData& fedDataProd = producedData->FEDData(j);
+      if (fedDataProd.size() != 0) {
+        //	   std::cout << " More than one FEDRawDataCollection with data in FED ";
+        //	   std::cout << j << " Skipping the 2nd\n";
+        continue;
+      }
+      fedDataProd.resize(size);
+      unsigned char* dataProd = fedDataProd.data();
+      const unsigned char* data = fedData.data();
+      for (unsigned int k = 0; k < size; ++k) {
+        dataProd[k] = data[k];
+      }
+    }
+  }
 
+  iEvent.put(std::move(producedData));
+}
 
 // ------------ method called once each job just before starting event loop  ------------
-void SubdetFEDSelector::beginJob() {
-}
+void SubdetFEDSelector::beginJob() {}
 
 // ------------ method called once each job just after ending the event loop  ------------
-void SubdetFEDSelector::endJob() {
-}
+void SubdetFEDSelector::endJob() {}
diff --git a/Calibration/IsolatedParticles/macros/HBHEMuonOfflineSimAnalyzer.C b/Calibration/IsolatedParticles/macros/HBHEMuonOfflineSimAnalyzer.C
index e25bb87d03146..d533a42c0cefc 100644
--- a/Calibration/IsolatedParticles/macros/HBHEMuonOfflineSimAnalyzer.C
+++ b/Calibration/IsolatedParticles/macros/HBHEMuonOfflineSimAnalyzer.C
@@ -113,7 +113,7 @@ public :
 
   HBHEMuonOfflineSimAnalyzer(const char *infile, const char *outfile="dyll_PU20_25_output_10.root", const int mode=0, const int maxDHB=4, const int maxDHE=7);
   // mode of LHC is kept 1 for 2017 scenario as no change in depth segmentation
-  // mode of LHC is 0 for 2019
+  // mode of LHC is 0 for 2021
   virtual ~HBHEMuonOfflineSimAnalyzer();
   virtual Int_t    Cut(Long64_t entry);
   virtual Int_t    GetEntry(Long64_t entry);
@@ -862,7 +862,7 @@ void HBHEMuonOfflineSimAnalyzer::WriteHistograms() {
 
 int HBHEMuonOfflineSimAnalyzer::NDepthBins(int eta) {
   //		int  nDepth[29]={1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,3,1,2,2,2,2,2,2,2,2,2,3,3,2};
-		// for 2019 scenario multi depth segmentation
+		// for 2021 scenario multi depth segmentation
 		//    int  nDepth[29]={3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,5,5,5,5,5,5,5,5,5,5,5,5,5};
   int  nDepth[29]={4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,7,7,7,7,7,7,7,7,7,7,7,7,7};
 
diff --git a/Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCProducer.cc b/Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCProducer.cc
index e67ddba8624ef..53932ebf6f24f 100644
--- a/Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCProducer.cc
+++ b/Calibration/LumiAlCaRecoProducers/plugins/AlcaPCCProducer.cc
@@ -7,7 +7,6 @@ authors:Sam Higginbotham (shigginb@cern.ch) and Chris Palmer (capalmer@cern.ch)
 
 ________________________________________________________________**/
 
-
 // C++ standard
 #include <string>
 // CMS
@@ -29,95 +28,92 @@ ________________________________________________________________**/
 #include "FWCore/Framework/interface/LuminosityBlock.h"
 
 #include "TMath.h"
-//The class 
-class AlcaPCCProducer : public edm::one::EDProducer<edm::EndLuminosityBlockProducer,edm::one::WatchLuminosityBlocks>{
-  public:
-    explicit AlcaPCCProducer(const edm::ParameterSet&);
-    ~AlcaPCCProducer() override;
-
-  private:
-    void beginLuminosityBlock     (edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup) override ;
-    void endLuminosityBlock       (edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup) override ;
-    void endLuminosityBlockProduce(edm::LuminosityBlock& lumiSeg, const edm::EventSetup& iSetup) override ;
-    void produce                  (edm::Event& iEvent, const edm::EventSetup& iSetup) override ;
- 
-    edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster> >  pixelToken;
-    edm::InputTag   fPixelClusterLabel;
-
-    std::string trigstring_;      //specifies the trigger Rand or ZeroBias 
-    int countEvt_;       //counter
-    int countLumi_;      //counter
-
-    std::unique_ptr<reco::PixelClusterCounts> thePCCob;
-
+//The class
+class AlcaPCCProducer : public edm::one::EDProducer<edm::EndLuminosityBlockProducer, edm::one::WatchLuminosityBlocks> {
+public:
+  explicit AlcaPCCProducer(const edm::ParameterSet&);
+  ~AlcaPCCProducer() override;
+
+private:
+  void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup) override;
+  void endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup) override;
+  void endLuminosityBlockProduce(edm::LuminosityBlock& lumiSeg, const edm::EventSetup& iSetup) override;
+  void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override;
+
+  edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster> > pixelToken;
+  edm::InputTag fPixelClusterLabel;
+
+  std::string trigstring_;  //specifies the trigger Rand or ZeroBias
+  int countEvt_;            //counter
+  int countLumi_;           //counter
+
+  std::unique_ptr<reco::PixelClusterCounts> thePCCob;
 };
 
 //--------------------------------------------------------------------------------------------------
-AlcaPCCProducer::AlcaPCCProducer(const edm::ParameterSet& iConfig)
-{
-    fPixelClusterLabel = iConfig.getParameter<edm::ParameterSet>("AlcaPCCProducerParameters").getParameter<edm::InputTag>("pixelClusterLabel");
-    trigstring_ = iConfig.getParameter<edm::ParameterSet>("AlcaPCCProducerParameters").getUntrackedParameter<std::string>("trigstring","alcaPCC");
+AlcaPCCProducer::AlcaPCCProducer(const edm::ParameterSet& iConfig) {
+  fPixelClusterLabel = iConfig.getParameter<edm::ParameterSet>("AlcaPCCProducerParameters")
+                           .getParameter<edm::InputTag>("pixelClusterLabel");
+  trigstring_ = iConfig.getParameter<edm::ParameterSet>("AlcaPCCProducerParameters")
+                    .getUntrackedParameter<std::string>("trigstring", "alcaPCC");
 
-    countLumi_ = 0;
+  countLumi_ = 0;
 
-    produces<reco::PixelClusterCounts, edm::Transition::EndLuminosityBlock>(trigstring_);
-    pixelToken=consumes<edmNew::DetSetVector<SiPixelCluster> >(fPixelClusterLabel);
+  produces<reco::PixelClusterCounts, edm::Transition::EndLuminosityBlock>(trigstring_);
+  pixelToken = consumes<edmNew::DetSetVector<SiPixelCluster> >(fPixelClusterLabel);
 }
 
 //--------------------------------------------------------------------------------------------------
-AlcaPCCProducer::~AlcaPCCProducer(){
-}
+AlcaPCCProducer::~AlcaPCCProducer() {}
 
 //--------------------------------------------------------------------------------------------------
-void AlcaPCCProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup){
-    countEvt_++;
-
-    unsigned int bx=iEvent.bunchCrossing();
-    //std::cout<<"The Bunch Crossing"<<bx<<std::endl;
-    thePCCob->eventCounter(bx);
-
-    //Looping over the clusters and adding the counts up  
-    edm::Handle< edmNew::DetSetVector<SiPixelCluster> > hClusterColl;
-    iEvent.getByToken(pixelToken,hClusterColl);
-
-    const edmNew::DetSetVector<SiPixelCluster>& clustColl = *(hClusterColl.product()); 
-    // ----------------------------------------------------------------------
-    // -- Clusters without tracks
-    for (auto const & mod: clustColl) {
-        if(mod.empty()) { continue; }
-        DetId detId = mod.id();
-
-        //--The following will be used when we make a theshold for the clusters.
-        //--Keeping this for features that may be implemented later.
-        // -- clusters on this det
-        //edmNew::DetSet<SiPixelCluster>::const_iterator  di;
-        //int nClusterCount=0;
-        //for (di = mod.begin(); di != mod.end(); ++di) {
-        //    nClusterCount++;
-        //}
-        int nCluster = mod.size();
-        thePCCob->increment(detId(), bx, nCluster);
+void AlcaPCCProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
+  countEvt_++;
+
+  unsigned int bx = iEvent.bunchCrossing();
+  //std::cout<<"The Bunch Crossing"<<bx<<std::endl;
+  thePCCob->eventCounter(bx);
+
+  //Looping over the clusters and adding the counts up
+  edm::Handle<edmNew::DetSetVector<SiPixelCluster> > hClusterColl;
+  iEvent.getByToken(pixelToken, hClusterColl);
+
+  const edmNew::DetSetVector<SiPixelCluster>& clustColl = *(hClusterColl.product());
+  // ----------------------------------------------------------------------
+  // -- Clusters without tracks
+  for (auto const& mod : clustColl) {
+    if (mod.empty()) {
+      continue;
     }
+    DetId detId = mod.id();
+
+    //--The following will be used when we make a theshold for the clusters.
+    //--Keeping this for features that may be implemented later.
+    // -- clusters on this det
+    //edmNew::DetSet<SiPixelCluster>::const_iterator  di;
+    //int nClusterCount=0;
+    //for (di = mod.begin(); di != mod.end(); ++di) {
+    //    nClusterCount++;
+    //}
+    int nCluster = mod.size();
+    thePCCob->increment(detId(), bx, nCluster);
+  }
 }
 
 //--------------------------------------------------------------------------------------------------
-void AlcaPCCProducer::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup){
-    //New PCC object at the beginning of each lumi section
-    thePCCob = std::make_unique<reco::PixelClusterCounts>(); 
-    countLumi_++;
-
+void AlcaPCCProducer::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup) {
+  //New PCC object at the beginning of each lumi section
+  thePCCob = std::make_unique<reco::PixelClusterCounts>();
+  countLumi_++;
 }
 
 //--------------------------------------------------------------------------------------------------
-void AlcaPCCProducer::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup){
-}
+void AlcaPCCProducer::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup) {}
 
 //--------------------------------------------------------------------------------------------------
-void AlcaPCCProducer::endLuminosityBlockProduce(edm::LuminosityBlock& lumiSeg, const edm::EventSetup& iSetup){
-
-    //Saving the PCC object
-    lumiSeg.put(std::move(thePCCob), std::string(trigstring_)); 
-
+void AlcaPCCProducer::endLuminosityBlockProduce(edm::LuminosityBlock& lumiSeg, const edm::EventSetup& iSetup) {
+  //Saving the PCC object
+  lumiSeg.put(std::move(thePCCob), std::string(trigstring_));
 }
 
 DEFINE_FWK_MODULE(AlcaPCCProducer);
diff --git a/Calibration/LumiAlCaRecoProducers/plugins/CorrPCCProducer.cc b/Calibration/LumiAlCaRecoProducers/plugins/CorrPCCProducer.cc
index e0344e22b98fd..ece349b7c6059 100644
--- a/Calibration/LumiAlCaRecoProducers/plugins/CorrPCCProducer.cc
+++ b/Calibration/LumiAlCaRecoProducers/plugins/CorrPCCProducer.cc
@@ -12,7 +12,7 @@ ________________________________________________________________**/
 #include <string>
 #include <vector>
 #include <boost/serialization/vector.hpp>
-#include <iostream> 
+#include <iostream>
 #include <map>
 #include <utility>
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
@@ -53,603 +53,610 @@ class DQMStore;
 class MonitorElement;
 
 class CorrPCCProducer : public one::DQMEDAnalyzer<edm::one::WatchLuminosityBlocks> {
-    public:
-        explicit CorrPCCProducer(const edm::ParameterSet&);
-        ~CorrPCCProducer() override;
-
-    private:
-        void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup) final;
-        void endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup) final;
-        void endRun(edm::Run const& runSeg, const edm::EventSetup& iSetup) final;
-        void endRunProduce(edm::Run& runSeg, const edm::EventSetup& iSetup) final;
-        void endJob()  final;
-
-        void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-
-
-        void makeCorrectionTemplate ();
-        float getMaximum(std::vector<float>);
-        void estimateType1Frac(std::vector<float>, float& );
-        void evaluateCorrectionResiduals(std::vector<float>); 
-        void calculateCorrections (std::vector<float>, std::vector<float>&, float&);
-        void resetBlock();
-
-        edm::EDGetTokenT<LumiInfo>  lumiInfoToken;
-        std::string   pccSrc_;//input file EDproducer module label 
-        std::string   prodInst_;//input file product instance 
-
-        std::vector<float> rawlumiBX_;//new vector containing clusters per bxid 
-        std::vector<float> errOnLumiByBX_;//standard error per bx
-        std::vector<float> totalLumiByBX_;//summed lumi
-        std::vector<float> totalLumiByBXAvg_;//summed lumi
-        std::vector<float> events_;//Number of events in each BX
-        std::vector<float> correctionTemplate_;
-        std::vector<float> correctionScaleFactors_;//list of scale factors to apply.
-        float overallCorrection_;//The Overall correction to the integrated luminosity
-
-        unsigned int iBlock=0;
-        unsigned int minimumNumberOfEvents;
-
-        std::map<unsigned int, LumiInfo*> lumiInfoMapPerLS;
-        std::vector<unsigned int> lumiSections;
-        std::map<std::pair<unsigned int,unsigned int>, LumiInfo*>::iterator lumiInfoMapIterator; 
-        std::map<std::pair<unsigned int,unsigned int>, LumiInfo*> lumiInfoMap;//map to obtain iov for lumiOb corrections to the luminosity. 
-        std::map<std::pair<unsigned int,unsigned int>, unsigned int> lumiInfoCounter; // number of lumiSections in this block
-
-        TH1F *corrlumiAvg_h;
-        TH1F *scaleFactorAvg_h;
-        TH1F *lumiAvg_h;
-        TH1F *type1FracHist;
-        TH1F *type1resHist;
-        TH1F *type2resHist;
-
-        unsigned int maxLS=3500;
-        MonitorElement* Type1FracMon;
-        MonitorElement* Type1ResMon;
-        MonitorElement* Type2ResMon;
-
-        TGraphErrors *type1FracGraph;
-        TGraphErrors *type1resGraph;
-        TGraphErrors *type2resGraph;
-        TList *hlist;//list for the clusters and corrections 
-        TFile * histoFile;
-
-        float type1Frac;
-        float mean_type1_residual;//Type 1 residual 
-        float mean_type2_residual;//Type 2 residual 
-        float mean_type1_residual_unc;//Type 1 residual uncertainty rms 
-        float mean_type2_residual_unc;//Type 2 residual uncertainty rms 
-        unsigned int nTrain;//Number of bunch trains used in calc type 1 and 2 res, frac.
-        unsigned int countLumi_;//The lumisection count... the size of the lumiblock
-        unsigned int approxLumiBlockSize_;//The number of lumisections per block.
-        unsigned int thisLS;//Ending lumisection for the iov that we save with the lumiInfo object.
-
-        double type2_a_;//amplitude for the type 2 correction 
-        double type2_b_;//decay width for the type 2 correction
-
-
-        LumiCorrections* pccCorrections;
-
-        edm::Service<cond::service::PoolDBOutputService> poolDbService;
+public:
+  explicit CorrPCCProducer(const edm::ParameterSet&);
+  ~CorrPCCProducer() override;
+
+private:
+  void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup) final;
+  void endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup) final;
+  void endRun(edm::Run const& runSeg, const edm::EventSetup& iSetup) final;
+  void endRunProduce(edm::Run& runSeg, const edm::EventSetup& iSetup) final;
+  void endJob() final;
+
+  void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
+
+  void makeCorrectionTemplate();
+  float getMaximum(std::vector<float>);
+  void estimateType1Frac(std::vector<float>, float&);
+  void evaluateCorrectionResiduals(std::vector<float>);
+  void calculateCorrections(std::vector<float>, std::vector<float>&, float&);
+  void resetBlock();
+
+  edm::EDGetTokenT<LumiInfo> lumiInfoToken;
+  std::string pccSrc_;    //input file EDproducer module label
+  std::string prodInst_;  //input file product instance
+
+  std::vector<float> rawlumiBX_;         //new vector containing clusters per bxid
+  std::vector<float> errOnLumiByBX_;     //standard error per bx
+  std::vector<float> totalLumiByBX_;     //summed lumi
+  std::vector<float> totalLumiByBXAvg_;  //summed lumi
+  std::vector<float> events_;            //Number of events in each BX
+  std::vector<float> correctionTemplate_;
+  std::vector<float> correctionScaleFactors_;  //list of scale factors to apply.
+  float overallCorrection_;                    //The Overall correction to the integrated luminosity
+
+  unsigned int iBlock = 0;
+  unsigned int minimumNumberOfEvents;
+
+  std::map<unsigned int, LumiInfo*> lumiInfoMapPerLS;
+  std::vector<unsigned int> lumiSections;
+  std::map<std::pair<unsigned int, unsigned int>, LumiInfo*>::iterator lumiInfoMapIterator;
+  std::map<std::pair<unsigned int, unsigned int>, LumiInfo*>
+      lumiInfoMap;  //map to obtain iov for lumiOb corrections to the luminosity.
+  std::map<std::pair<unsigned int, unsigned int>, unsigned int> lumiInfoCounter;  // number of lumiSections in this block
+
+  TH1F* corrlumiAvg_h;
+  TH1F* scaleFactorAvg_h;
+  TH1F* lumiAvg_h;
+  TH1F* type1FracHist;
+  TH1F* type1resHist;
+  TH1F* type2resHist;
+
+  unsigned int maxLS = 3500;
+  MonitorElement* Type1FracMon;
+  MonitorElement* Type1ResMon;
+  MonitorElement* Type2ResMon;
+
+  TGraphErrors* type1FracGraph;
+  TGraphErrors* type1resGraph;
+  TGraphErrors* type2resGraph;
+  TList* hlist;  //list for the clusters and corrections
+  TFile* histoFile;
+
+  float type1Frac;
+  float mean_type1_residual;          //Type 1 residual
+  float mean_type2_residual;          //Type 2 residual
+  float mean_type1_residual_unc;      //Type 1 residual uncertainty rms
+  float mean_type2_residual_unc;      //Type 2 residual uncertainty rms
+  unsigned int nTrain;                //Number of bunch trains used in calc type 1 and 2 res, frac.
+  unsigned int countLumi_;            //The lumisection count... the size of the lumiblock
+  unsigned int approxLumiBlockSize_;  //The number of lumisections per block.
+  unsigned int thisLS;                //Ending lumisection for the iov that we save with the lumiInfo object.
+
+  double type2_a_;  //amplitude for the type 2 correction
+  double type2_b_;  //decay width for the type 2 correction
+
+  LumiCorrections* pccCorrections;
+
+  edm::Service<cond::service::PoolDBOutputService> poolDbService;
 };
 
 //--------------------------------------------------------------------------------------------------
-CorrPCCProducer::CorrPCCProducer(const edm::ParameterSet& iConfig)
-{
-    pccSrc_ = iConfig.getParameter<edm::ParameterSet>("CorrPCCProducerParameters").getParameter<std::string>("inLumiObLabel");
-    prodInst_ = iConfig.getParameter<edm::ParameterSet>("CorrPCCProducerParameters").getParameter<std::string>("ProdInst");
-    approxLumiBlockSize_=iConfig.getParameter<edm::ParameterSet>("CorrPCCProducerParameters").getParameter<int>("approxLumiBlockSize");
-    type2_a_ = iConfig.getParameter<edm::ParameterSet>("CorrPCCProducerParameters").getParameter<double>("type2_a");
-    type2_b_ = iConfig.getParameter<edm::ParameterSet>("CorrPCCProducerParameters").getParameter<double>("type2_b");
-    countLumi_=0;
-    minimumNumberOfEvents=1000;
-
-    totalLumiByBX_.resize(LumiConstants::numBX);
-    totalLumiByBXAvg_.resize(LumiConstants::numBX);
-    events_.resize(LumiConstants::numBX);
-    correctionScaleFactors_.resize(LumiConstants::numBX);
-    correctionTemplate_.resize(LumiConstants::numBX);
-
-    resetBlock();
-
-    makeCorrectionTemplate(); 
-
-    edm::InputTag inputPCCTag_(pccSrc_, prodInst_);
-
-    lumiInfoToken=consumes<LumiInfo, edm::InLumi>(inputPCCTag_);
-
-    histoFile = new TFile("CorrectionHisto.root","RECREATE");
-
-    type1FracGraph= new TGraphErrors();
-    type1resGraph = new TGraphErrors();
-    type2resGraph = new TGraphErrors();
-    type1FracGraph->SetName("Type1Fraction");
-    type1resGraph->SetName("Type1Res");
-    type2resGraph->SetName("Type2Res");
-    type1FracGraph->GetYaxis()->SetTitle("Type 1 Fraction");
-    type1resGraph->GetYaxis()->SetTitle("Type 1 Residual");
-    type2resGraph->GetYaxis()->SetTitle("Type 2 Residual");
-    type1FracGraph->GetXaxis()->SetTitle("Unique LS ID");
-    type1resGraph->GetXaxis()->SetTitle("Unique LS ID");
-    type2resGraph->GetXaxis()->SetTitle("Unique LS ID");
-    type1FracGraph->SetMarkerStyle(8);
-    type1resGraph->SetMarkerStyle(8);
-    type2resGraph->SetMarkerStyle(8);
+CorrPCCProducer::CorrPCCProducer(const edm::ParameterSet& iConfig) {
+  pccSrc_ =
+      iConfig.getParameter<edm::ParameterSet>("CorrPCCProducerParameters").getParameter<std::string>("inLumiObLabel");
+  prodInst_ =
+      iConfig.getParameter<edm::ParameterSet>("CorrPCCProducerParameters").getParameter<std::string>("ProdInst");
+  approxLumiBlockSize_ =
+      iConfig.getParameter<edm::ParameterSet>("CorrPCCProducerParameters").getParameter<int>("approxLumiBlockSize");
+  type2_a_ = iConfig.getParameter<edm::ParameterSet>("CorrPCCProducerParameters").getParameter<double>("type2_a");
+  type2_b_ = iConfig.getParameter<edm::ParameterSet>("CorrPCCProducerParameters").getParameter<double>("type2_b");
+  countLumi_ = 0;
+  minimumNumberOfEvents = 1000;
+
+  totalLumiByBX_.resize(LumiConstants::numBX);
+  totalLumiByBXAvg_.resize(LumiConstants::numBX);
+  events_.resize(LumiConstants::numBX);
+  correctionScaleFactors_.resize(LumiConstants::numBX);
+  correctionTemplate_.resize(LumiConstants::numBX);
+
+  resetBlock();
+
+  makeCorrectionTemplate();
+
+  edm::InputTag inputPCCTag_(pccSrc_, prodInst_);
+
+  lumiInfoToken = consumes<LumiInfo, edm::InLumi>(inputPCCTag_);
+
+  histoFile = new TFile("CorrectionHisto.root", "RECREATE");
+
+  type1FracGraph = new TGraphErrors();
+  type1resGraph = new TGraphErrors();
+  type2resGraph = new TGraphErrors();
+  type1FracGraph->SetName("Type1Fraction");
+  type1resGraph->SetName("Type1Res");
+  type2resGraph->SetName("Type2Res");
+  type1FracGraph->GetYaxis()->SetTitle("Type 1 Fraction");
+  type1resGraph->GetYaxis()->SetTitle("Type 1 Residual");
+  type2resGraph->GetYaxis()->SetTitle("Type 2 Residual");
+  type1FracGraph->GetXaxis()->SetTitle("Unique LS ID");
+  type1resGraph->GetXaxis()->SetTitle("Unique LS ID");
+  type2resGraph->GetXaxis()->SetTitle("Unique LS ID");
+  type1FracGraph->SetMarkerStyle(8);
+  type1resGraph->SetMarkerStyle(8);
+  type2resGraph->SetMarkerStyle(8);
 }
 
 //--------------------------------------------------------------------------------------------------
-CorrPCCProducer::~CorrPCCProducer(){
-}
+CorrPCCProducer::~CorrPCCProducer() {}
 
 //--------------------------------------------------------------------------------------------------
 // This method builds the single bunch response given an exponential function (type 2 only)
-void  CorrPCCProducer::makeCorrectionTemplate(){
-    for(unsigned int bx=1;bx<LumiConstants::numBX;bx++){
-        correctionTemplate_.at(bx)=type2_a_*exp(-(float(bx)-1)*type2_b_);
-    }
+void CorrPCCProducer::makeCorrectionTemplate() {
+  for (unsigned int bx = 1; bx < LumiConstants::numBX; bx++) {
+    correctionTemplate_.at(bx) = type2_a_ * exp(-(float(bx) - 1) * type2_b_);
+  }
 }
 
 //--------------------------------------------------------------------------------------------------
 // Finds max lumi value
-float CorrPCCProducer::getMaximum(std::vector<float> lumi_vector){
-    float max_lumi=0;
-    for(size_t i=0; i<lumi_vector.size(); i++){
-        if(lumi_vector.at(i)>max_lumi)  max_lumi = lumi_vector.at(i);
-    }   
-    return max_lumi;
+float CorrPCCProducer::getMaximum(std::vector<float> lumi_vector) {
+  float max_lumi = 0;
+  for (size_t i = 0; i < lumi_vector.size(); i++) {
+    if (lumi_vector.at(i) > max_lumi)
+      max_lumi = lumi_vector.at(i);
+  }
+  return max_lumi;
 }
 
-
-
 //--------------------------------------------------------------------------------------------------
-// This method takes luminosity from the last bunch in a train and makes a comparison with 
+// This method takes luminosity from the last bunch in a train and makes a comparison with
 // the follow non-active bunch crossing to estimate the spill over fraction (type 1 afterglow).
-void CorrPCCProducer::estimateType1Frac(std::vector<float> uncorrPCCPerBX, float &type1Frac){
-    std::vector<float> corrected_tmp_; 
-    for(size_t i=0; i<uncorrPCCPerBX.size(); i++){
-        corrected_tmp_.push_back(uncorrPCCPerBX.at(i));
-    }
-
-
-    //Apply initial type 1 correction
-    for(size_t k=0;k<LumiConstants::numBX-1; k++){ 
-        float bin_k = corrected_tmp_.at(k);
-        corrected_tmp_.at(k+1)=corrected_tmp_.at(k+1)-type1Frac*bin_k; 
-    }
-
-
-    //Apply type 2 correction
-    for(size_t i=0; i<LumiConstants::numBX-1; i++){
-        for(size_t j=i+1; j<i+LumiConstants::numBX-1; j++){
-            float bin_i = corrected_tmp_.at(i);
-            if (j<LumiConstants::numBX){
-                corrected_tmp_.at(j)=corrected_tmp_.at(j)-bin_i*correctionTemplate_.at(j-i);
-            } else {
-                corrected_tmp_.at(j-LumiConstants::numBX) = corrected_tmp_.at(j-LumiConstants::numBX)-bin_i*correctionTemplate_.at(j-i);
-            }
-        }
+void CorrPCCProducer::estimateType1Frac(std::vector<float> uncorrPCCPerBX, float& type1Frac) {
+  std::vector<float> corrected_tmp_;
+  for (size_t i = 0; i < uncorrPCCPerBX.size(); i++) {
+    corrected_tmp_.push_back(uncorrPCCPerBX.at(i));
+  }
+
+  //Apply initial type 1 correction
+  for (size_t k = 0; k < LumiConstants::numBX - 1; k++) {
+    float bin_k = corrected_tmp_.at(k);
+    corrected_tmp_.at(k + 1) = corrected_tmp_.at(k + 1) - type1Frac * bin_k;
+  }
+
+  //Apply type 2 correction
+  for (size_t i = 0; i < LumiConstants::numBX - 1; i++) {
+    for (size_t j = i + 1; j < i + LumiConstants::numBX - 1; j++) {
+      float bin_i = corrected_tmp_.at(i);
+      if (j < LumiConstants::numBX) {
+        corrected_tmp_.at(j) = corrected_tmp_.at(j) - bin_i * correctionTemplate_.at(j - i);
+      } else {
+        corrected_tmp_.at(j - LumiConstants::numBX) =
+            corrected_tmp_.at(j - LumiConstants::numBX) - bin_i * correctionTemplate_.at(j - i);
+      }
     }
+  }
 
-    //Apply additional iteration for type 1 correction
-    evaluateCorrectionResiduals(corrected_tmp_); 
-    type1Frac+=mean_type1_residual;
+  //Apply additional iteration for type 1 correction
+  evaluateCorrectionResiduals(corrected_tmp_);
+  type1Frac += mean_type1_residual;
 }
 
-
 //--------------------------------------------------------------------------------------------------
-void CorrPCCProducer::evaluateCorrectionResiduals(std::vector<float> corrected_tmp_){
-    float lumiMax = getMaximum(corrected_tmp_);
-    float threshold = lumiMax*0.2; 
-
-    mean_type1_residual = 0;  
-    mean_type2_residual = 0;  
-    nTrain = 0;
-    float lumi=0;
-    std::vector<float> afterGlow;
-    TH1F type1("type1","",1000,-0.5,0.5);
-    TH1F type2("type2","",1000,-0.5,0.5);
-    for(size_t ibx=2; ibx<LumiConstants::numBX-5; ibx++){
-        lumi   = corrected_tmp_.at(ibx);
-        afterGlow.clear();
-        afterGlow.push_back(corrected_tmp_.at(ibx+1));
-        afterGlow.push_back(corrected_tmp_.at(ibx+2));
-
-        //Where type 1 and type 2 residuals are computed
-        if(lumi>threshold && afterGlow[0]<threshold && afterGlow[1]<threshold){
-            for(int index=3; index<6; index++){
-                float thisAfterGlow=corrected_tmp_.at(ibx+index);
-                if(thisAfterGlow<threshold){
-                    afterGlow.push_back(thisAfterGlow);
-                } else {
-                    break;
-                }
-            }
-            float thisType1=0;
-            float thisType2=0;
-            if(afterGlow.size()>1){
-                int nAfter=0;
-                for(unsigned int index=1; index<afterGlow.size(); index++){
-                    thisType2+=afterGlow[index];
-                    type2.Fill(afterGlow[index]/lumi);
-                    nAfter++;
-                }
-                thisType2/=nAfter;
-            }
-            thisType1=(afterGlow[0]-thisType2)/lumi;
-
-            type1.Fill(thisType1);
-            nTrain+=1;
+void CorrPCCProducer::evaluateCorrectionResiduals(std::vector<float> corrected_tmp_) {
+  float lumiMax = getMaximum(corrected_tmp_);
+  float threshold = lumiMax * 0.2;
+
+  mean_type1_residual = 0;
+  mean_type2_residual = 0;
+  nTrain = 0;
+  float lumi = 0;
+  std::vector<float> afterGlow;
+  TH1F type1("type1", "", 1000, -0.5, 0.5);
+  TH1F type2("type2", "", 1000, -0.5, 0.5);
+  for (size_t ibx = 2; ibx < LumiConstants::numBX - 5; ibx++) {
+    lumi = corrected_tmp_.at(ibx);
+    afterGlow.clear();
+    afterGlow.push_back(corrected_tmp_.at(ibx + 1));
+    afterGlow.push_back(corrected_tmp_.at(ibx + 2));
+
+    //Where type 1 and type 2 residuals are computed
+    if (lumi > threshold && afterGlow[0] < threshold && afterGlow[1] < threshold) {
+      for (int index = 3; index < 6; index++) {
+        float thisAfterGlow = corrected_tmp_.at(ibx + index);
+        if (thisAfterGlow < threshold) {
+          afterGlow.push_back(thisAfterGlow);
+        } else {
+          break;
+        }
+      }
+      float thisType1 = 0;
+      float thisType2 = 0;
+      if (afterGlow.size() > 1) {
+        int nAfter = 0;
+        for (unsigned int index = 1; index < afterGlow.size(); index++) {
+          thisType2 += afterGlow[index];
+          type2.Fill(afterGlow[index] / lumi);
+          nAfter++;
         }
-    } 
+        thisType2 /= nAfter;
+      }
+      thisType1 = (afterGlow[0] - thisType2) / lumi;
 
-    mean_type1_residual=type1.GetMean();//Calculate the mean value of the type 1 residual 
-    mean_type2_residual=type2.GetMean();//Calculate the mean value of the type 2 residual 
-    mean_type1_residual_unc=type1.GetMeanError();
-    mean_type2_residual_unc=type2.GetMeanError();
+      type1.Fill(thisType1);
+      nTrain += 1;
+    }
+  }
 
-    histoFile->cd();
-    type1.Write();
-    type2.Write();
-}
+  mean_type1_residual = type1.GetMean();  //Calculate the mean value of the type 1 residual
+  mean_type2_residual = type2.GetMean();  //Calculate the mean value of the type 2 residual
+  mean_type1_residual_unc = type1.GetMeanError();
+  mean_type2_residual_unc = type2.GetMeanError();
 
+  histoFile->cd();
+  type1.Write();
+  type2.Write();
+}
 
 //--------------------------------------------------------------------------------------------------
-void CorrPCCProducer::calculateCorrections (std::vector<float> uncorrected, std::vector<float>& correctionScaleFactors_, float& overallCorrection_){
-    type1Frac = 0;
-
-    int nTrials=4;
-
-    for(int trial=0;trial<nTrials;trial++){
-        estimateType1Frac(uncorrected, type1Frac);
-        edm::LogInfo("INFO") <<"type 1 fraction after iteration "<<trial<<" is  "<<type1Frac;
+void CorrPCCProducer::calculateCorrections(std::vector<float> uncorrected,
+                                           std::vector<float>& correctionScaleFactors_,
+                                           float& overallCorrection_) {
+  type1Frac = 0;
+
+  int nTrials = 4;
+
+  for (int trial = 0; trial < nTrials; trial++) {
+    estimateType1Frac(uncorrected, type1Frac);
+    edm::LogInfo("INFO") << "type 1 fraction after iteration " << trial << " is  " << type1Frac;
+  }
+
+  //correction should never be negative
+  type1Frac = std::max(0.0, (double)type1Frac);
+
+  std::vector<float> corrected_tmp_;
+  for (size_t i = 0; i < uncorrected.size(); i++) {
+    corrected_tmp_.push_back(uncorrected.at(i));
+  }
+
+  //Apply all corrections
+  for (size_t i = 0; i < LumiConstants::numBX - 1; i++) {
+    // type 1 - first (spillover from previous BXs real clusters)
+    float bin_i = corrected_tmp_.at(i);
+    corrected_tmp_.at(i + 1) = corrected_tmp_.at(i + 1) - type1Frac * bin_i;
+
+    // type 2 - after (comes from real activation)
+    bin_i = corrected_tmp_.at(i);
+    for (size_t j = i + 1; j < i + LumiConstants::numBX - 1; j++) {
+      if (j < LumiConstants::numBX) {
+        corrected_tmp_.at(j) = corrected_tmp_.at(j) - bin_i * correctionTemplate_.at(j - i);
+      } else {
+        corrected_tmp_.at(j - LumiConstants::numBX) =
+            corrected_tmp_.at(j - LumiConstants::numBX) - bin_i * correctionTemplate_.at(j - i);
+      }
     }
+  }
 
-    //correction should never be negative
-    type1Frac=std::max(0.0,(double)type1Frac); 
-
-    std::vector<float> corrected_tmp_;
-    for(size_t i=0; i<uncorrected.size(); i++){
-        corrected_tmp_.push_back(uncorrected.at(i));
-    }
+  evaluateCorrectionResiduals(corrected_tmp_);
 
+  float integral_uncorr_clusters = 0;
+  float integral_corr_clusters = 0;
 
-    //Apply all corrections
-    for(size_t i=0; i<LumiConstants::numBX-1; i++){
-        // type 1 - first (spillover from previous BXs real clusters)
-        float bin_i = corrected_tmp_.at(i);
-        corrected_tmp_.at(i+1)=corrected_tmp_.at(i+1)-type1Frac*bin_i;
-
-        // type 2 - after (comes from real activation)
-        bin_i = corrected_tmp_.at(i);
-        for(size_t j=i+1; j<i+LumiConstants::numBX-1; j++){
-            if(j<LumiConstants::numBX){
-                corrected_tmp_.at(j)=corrected_tmp_.at(j)-bin_i*correctionTemplate_.at(j-i);
-            }else{
-                corrected_tmp_.at(j-LumiConstants::numBX) = corrected_tmp_.at(j-LumiConstants::numBX)-bin_i*correctionTemplate_.at(j-i);
-            }
-        }
+  //Calculate Per-BX correction factor and overall correction factor
+  float lumiMax = getMaximum(corrected_tmp_);
+  float threshold = lumiMax * 0.2;
+  for (size_t ibx = 0; ibx < corrected_tmp_.size(); ibx++) {
+    if (corrected_tmp_.at(ibx) > threshold) {
+      integral_uncorr_clusters += uncorrected.at(ibx);
+      integral_corr_clusters += corrected_tmp_.at(ibx);
     }
-
-    evaluateCorrectionResiduals(corrected_tmp_);
-
-    float integral_uncorr_clusters=0;
-    float integral_corr_clusters = 0;
-
-    //Calculate Per-BX correction factor and overall correction factor
-    float lumiMax = getMaximum(corrected_tmp_);
-    float threshold = lumiMax*0.2;
-    for (size_t ibx=0; ibx<corrected_tmp_.size(); ibx++){
-        if(corrected_tmp_.at(ibx)>threshold){
-            integral_uncorr_clusters+=uncorrected.at(ibx);
-            integral_corr_clusters+=corrected_tmp_.at(ibx);
-        }
-        if(corrected_tmp_.at(ibx)!=0.0&&uncorrected.at(ibx)!=0.0){ 
-            correctionScaleFactors_.at(ibx) = corrected_tmp_.at(ibx)/uncorrected.at(ibx);
-        }else{
-            correctionScaleFactors_.at(ibx) = 0.0;
-        }
+    if (corrected_tmp_.at(ibx) != 0.0 && uncorrected.at(ibx) != 0.0) {
+      correctionScaleFactors_.at(ibx) = corrected_tmp_.at(ibx) / uncorrected.at(ibx);
+    } else {
+      correctionScaleFactors_.at(ibx) = 0.0;
     }
+  }
 
-    overallCorrection_ = integral_corr_clusters/integral_uncorr_clusters;  
+  overallCorrection_ = integral_corr_clusters / integral_uncorr_clusters;
 }
 
 //--------------------------------------------------------------------------------------------------
-void CorrPCCProducer::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup){
-    countLumi_++;
+void CorrPCCProducer::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup) {
+  countLumi_++;
 }
 
-
 //--------------------------------------------------------------------------------------------------
-void CorrPCCProducer::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup){
-
-    thisLS = lumiSeg.luminosityBlock();
-
-    edm::Handle<LumiInfo> PCCHandle; 
-    lumiSeg.getByToken(lumiInfoToken,PCCHandle);
-
-    const LumiInfo& inLumiOb = *(PCCHandle.product()); 
-
-    errOnLumiByBX_= inLumiOb.getErrorLumiAllBX();
-
-    unsigned int totalEvents=0;
-    for(unsigned int bx=0;bx<LumiConstants::numBX;bx++){
-        totalEvents+=errOnLumiByBX_[bx];
-    }
-
-    if(totalEvents<minimumNumberOfEvents){
-        edm::LogInfo("INFO") <<"number of events in this LS is too few "<<totalEvents;
-        //return;
-    }
-    else{
-         
-        edm::LogInfo("INFO") <<"Skipping Lumisection "<<thisLS;
-    }
-
-    lumiInfoMapPerLS[thisLS] = new LumiInfo();
-    totalLumiByBX_=inLumiOb.getInstLumiAllBX();
-    events_=inLumiOb.getErrorLumiAllBX();
-    lumiInfoMapPerLS[thisLS]->setInstLumiAllBX(totalLumiByBX_);
-    lumiInfoMapPerLS[thisLS]->setErrorLumiAllBX(events_);
-    lumiSections.push_back(thisLS);
+void CorrPCCProducer::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup) {
+  thisLS = lumiSeg.luminosityBlock();
+
+  edm::Handle<LumiInfo> PCCHandle;
+  lumiSeg.getByToken(lumiInfoToken, PCCHandle);
+
+  const LumiInfo& inLumiOb = *(PCCHandle.product());
+
+  errOnLumiByBX_ = inLumiOb.getErrorLumiAllBX();
+
+  unsigned int totalEvents = 0;
+  for (unsigned int bx = 0; bx < LumiConstants::numBX; bx++) {
+    totalEvents += errOnLumiByBX_[bx];
+  }
+
+  if (totalEvents < minimumNumberOfEvents) {
+    edm::LogInfo("INFO") << "number of events in this LS is too few " << totalEvents;
+    //return;
+  } else {
+    edm::LogInfo("INFO") << "Skipping Lumisection " << thisLS;
+  }
+
+  lumiInfoMapPerLS[thisLS] = new LumiInfo();
+  totalLumiByBX_ = inLumiOb.getInstLumiAllBX();
+  events_ = inLumiOb.getErrorLumiAllBX();
+  lumiInfoMapPerLS[thisLS]->setInstLumiAllBX(totalLumiByBX_);
+  lumiInfoMapPerLS[thisLS]->setErrorLumiAllBX(events_);
+  lumiSections.push_back(thisLS);
 }
 
 //--------------------------------------------------------------------------------------------------
-void CorrPCCProducer::endRun(edm::Run const& runSeg, const edm::EventSetup& iSetup){
-}
+void CorrPCCProducer::endRun(edm::Run const& runSeg, const edm::EventSetup& iSetup) {}
 
 //--------------------------------------------------------------------------------------------------
-void CorrPCCProducer::endRunProduce(edm::Run& runSeg, const edm::EventSetup& iSetup){
-    if(lumiSections.empty()){
-        return;
-    }
-
-    std::sort (lumiSections.begin(), lumiSections.end());
-
-    edm::LogInfo("INFO") <<"Number of Lumisections "<<lumiSections.size()<<" in run "<<runSeg.run() ;
-
-    //Determining integer number of blocks
-    float nBlocks_f = float(lumiSections.size())/approxLumiBlockSize_;
-    unsigned int nBlocks=1;
-    if(nBlocks_f>1){
-        if(nBlocks_f - lumiSections.size()/approxLumiBlockSize_ < 0.5){
-            nBlocks=lumiSections.size()/approxLumiBlockSize_;
-        } else {
-            nBlocks=lumiSections.size()/approxLumiBlockSize_+1;
-        }
+void CorrPCCProducer::endRunProduce(edm::Run& runSeg, const edm::EventSetup& iSetup) {
+  if (lumiSections.empty()) {
+    return;
+  }
+
+  std::sort(lumiSections.begin(), lumiSections.end());
+
+  edm::LogInfo("INFO") << "Number of Lumisections " << lumiSections.size() << " in run " << runSeg.run();
+
+  //Determining integer number of blocks
+  float nBlocks_f = float(lumiSections.size()) / approxLumiBlockSize_;
+  unsigned int nBlocks = 1;
+  if (nBlocks_f > 1) {
+    if (nBlocks_f - lumiSections.size() / approxLumiBlockSize_ < 0.5) {
+      nBlocks = lumiSections.size() / approxLumiBlockSize_;
+    } else {
+      nBlocks = lumiSections.size() / approxLumiBlockSize_ + 1;
     }
+  }
 
-    float nLSPerBlock = float(lumiSections.size())/nBlocks;
+  float nLSPerBlock = float(lumiSections.size()) / nBlocks;
 
-    std::vector<std::pair<unsigned int, unsigned int>> lsKeys;
-    lsKeys.clear();
+  std::vector<std::pair<unsigned int, unsigned int>> lsKeys;
+  lsKeys.clear();
 
-    //Constructing nBlocks IOVs 
-    for(unsigned iKey=0; iKey<nBlocks; iKey++){
-        lsKeys.push_back(std::make_pair(lumiSections[(unsigned int)(iKey*nLSPerBlock)], lumiSections[(unsigned int)((iKey+1)*nLSPerBlock)-1]));
-    }
-    
-    lsKeys[0].first=1;
-
-    for(unsigned int lumiSection=0; lumiSection<lumiSections.size(); lumiSection++){
-        thisLS=lumiSections[lumiSection];
-
-        std::pair<unsigned int,unsigned int> lsKey;
-
-        bool foundKey=false;
-
-        for(unsigned iKey=0; iKey<nBlocks; iKey++){
-            if( (thisLS >= lsKeys[iKey].first) && (thisLS<= lsKeys[iKey].second) ){
-                lsKey=lsKeys[iKey];
-                foundKey=true;
-                break;
-            }
-        }
+  //Constructing nBlocks IOVs
+  for (unsigned iKey = 0; iKey < nBlocks; iKey++) {
+    lsKeys.push_back(std::make_pair(lumiSections[(unsigned int)(iKey * nLSPerBlock)],
+                                    lumiSections[(unsigned int)((iKey + 1) * nLSPerBlock) - 1]));
+  }
 
-        if(!foundKey){
-            edm::LogInfo("WARNING")<<"Didn't find key "<<thisLS;
-            continue;
-        }
+  lsKeys[0].first = 1;
 
-        if(lumiInfoMap.count( lsKey ) == 0 ) {
-            lumiInfoMap[lsKey] = new LumiInfo();
-        }
+  for (unsigned int lumiSection = 0; lumiSection < lumiSections.size(); lumiSection++) {
+    thisLS = lumiSections[lumiSection];
 
-        //Sum all lumi in IOV of lsKey 
-        totalLumiByBX_=lumiInfoMap[lsKey]->getInstLumiAllBX();
-        events_       =lumiInfoMap[lsKey]->getErrorLumiAllBX();
+    std::pair<unsigned int, unsigned int> lsKey;
 
-        rawlumiBX_    =lumiInfoMapPerLS[thisLS]->getInstLumiAllBX();
-        errOnLumiByBX_=lumiInfoMapPerLS[thisLS]->getErrorLumiAllBX();
+    bool foundKey = false;
 
-        for(unsigned int bx=0;bx<LumiConstants::numBX;bx++){
-            totalLumiByBX_[bx]+=rawlumiBX_[bx];
-            events_[bx]+=errOnLumiByBX_[bx];
-        }
-        lumiInfoMap[lsKey]->setInstLumiAllBX(totalLumiByBX_);
-        lumiInfoMap[lsKey]->setErrorLumiAllBX(events_);
-        lumiInfoCounter[lsKey]++;
+    for (unsigned iKey = 0; iKey < nBlocks; iKey++) {
+      if ((thisLS >= lsKeys[iKey].first) && (thisLS <= lsKeys[iKey].second)) {
+        lsKey = lsKeys[iKey];
+        foundKey = true;
+        break;
+      }
     }
 
+    if (!foundKey) {
+      edm::LogInfo("WARNING") << "Didn't find key " << thisLS;
+      continue;
+    }
 
-    cond::Time_t thisIOV = 1;
-
-    char *histname1 = new char[100];
-    char *histname2 = new char[100];
-    char *histname3 = new char[100];
-    char *histTitle1 = new char[100];
-    char *histTitle2 = new char[100];
-    char *histTitle3 = new char[100];
-    sprintf(histTitle1,"Type1Fraction_%d",runSeg.run());
-    sprintf(histTitle2,"Type1Res_%d",runSeg.run());
-    sprintf(histTitle3,"Type2Res_%d",runSeg.run());
-    type1FracHist = new TH1F(histTitle1,histTitle1,1000,-0.5,0.5);
-    type1resHist  = new TH1F(histTitle2,histTitle2,4000,-0.2,0.2);
-    type2resHist  = new TH1F(histTitle3,histTitle3,4000,-0.2,0.2);
-    delete[] histTitle1;
-    delete[] histTitle2;
-    delete[] histTitle3;
-
-    for(lumiInfoMapIterator=lumiInfoMap.begin(); (lumiInfoMapIterator!=lumiInfoMap.end()); ++lumiInfoMapIterator) {
-
-        totalLumiByBX_=lumiInfoMapIterator->second->getInstLumiAllBX();
-        events_=lumiInfoMapIterator->second->getErrorLumiAllBX();
-
-        if(events_.empty()){
-            continue;
-        }
-
-        edm::LuminosityBlockID lu(runSeg.id().run(),edm::LuminosityBlockNumber_t (lumiInfoMapIterator->first.first));
-        thisIOV = (cond::Time_t)(lu.value()); 
-
-        sprintf(histname1, "CorrectedLumiAvg_%d_%d_%d_%d",runSeg.run(),iBlock,lumiInfoMapIterator->first.first,lumiInfoMapIterator->first.second);
-        sprintf(histname2, "ScaleFactorsAvg_%d_%d_%d_%d",runSeg.run(),iBlock,lumiInfoMapIterator->first.first,lumiInfoMapIterator->first.second);
-        sprintf(histname3, "RawLumiAvg_%d_%d_%d_%d",runSeg.run(),iBlock,lumiInfoMapIterator->first.first,lumiInfoMapIterator->first.second);
-
-        corrlumiAvg_h   = new TH1F(histname1,"",LumiConstants::numBX,1,LumiConstants::numBX);
-        scaleFactorAvg_h= new TH1F(histname2,"",LumiConstants::numBX,1,LumiConstants::numBX);
-        lumiAvg_h       = new TH1F(histname3,"",LumiConstants::numBX,1,LumiConstants::numBX); 
-
+    if (lumiInfoMap.count(lsKey) == 0) {
+      lumiInfoMap[lsKey] = new LumiInfo();
+    }
 
-        //Averaging by the number of events
-        for(unsigned int i=0;i<LumiConstants::numBX;i++){
-            if(events_.at(i)!=0){
-                totalLumiByBXAvg_[i] =  totalLumiByBX_[i]/events_[i];
-            }else{
-                totalLumiByBXAvg_[i]=0.0;
-            }
-        }
+    //Sum all lumi in IOV of lsKey
+    totalLumiByBX_ = lumiInfoMap[lsKey]->getInstLumiAllBX();
+    events_ = lumiInfoMap[lsKey]->getErrorLumiAllBX();
 
-        calculateCorrections(totalLumiByBXAvg_,correctionScaleFactors_, overallCorrection_); 
+    rawlumiBX_ = lumiInfoMapPerLS[thisLS]->getInstLumiAllBX();
+    errOnLumiByBX_ = lumiInfoMapPerLS[thisLS]->getErrorLumiAllBX();
 
-        for(unsigned int bx=0;bx<LumiConstants::numBX;bx++){
-            corrlumiAvg_h->SetBinContent(bx,totalLumiByBXAvg_[bx]*correctionScaleFactors_[bx]);
-            if(events_.at(bx)!=0){
-                corrlumiAvg_h->SetBinError(bx,totalLumiByBXAvg_[bx]*correctionScaleFactors_[bx]/TMath::Sqrt(events_.at(bx)));
-            }else{
-                corrlumiAvg_h->SetBinError(bx,0.0);
-            }
+    for (unsigned int bx = 0; bx < LumiConstants::numBX; bx++) {
+      totalLumiByBX_[bx] += rawlumiBX_[bx];
+      events_[bx] += errOnLumiByBX_[bx];
+    }
+    lumiInfoMap[lsKey]->setInstLumiAllBX(totalLumiByBX_);
+    lumiInfoMap[lsKey]->setErrorLumiAllBX(events_);
+    lumiInfoCounter[lsKey]++;
+  }
+
+  cond::Time_t thisIOV = 1;
+
+  char* histname1 = new char[100];
+  char* histname2 = new char[100];
+  char* histname3 = new char[100];
+  char* histTitle1 = new char[100];
+  char* histTitle2 = new char[100];
+  char* histTitle3 = new char[100];
+  sprintf(histTitle1, "Type1Fraction_%d", runSeg.run());
+  sprintf(histTitle2, "Type1Res_%d", runSeg.run());
+  sprintf(histTitle3, "Type2Res_%d", runSeg.run());
+  type1FracHist = new TH1F(histTitle1, histTitle1, 1000, -0.5, 0.5);
+  type1resHist = new TH1F(histTitle2, histTitle2, 4000, -0.2, 0.2);
+  type2resHist = new TH1F(histTitle3, histTitle3, 4000, -0.2, 0.2);
+  delete[] histTitle1;
+  delete[] histTitle2;
+  delete[] histTitle3;
+
+  for (lumiInfoMapIterator = lumiInfoMap.begin(); (lumiInfoMapIterator != lumiInfoMap.end()); ++lumiInfoMapIterator) {
+    totalLumiByBX_ = lumiInfoMapIterator->second->getInstLumiAllBX();
+    events_ = lumiInfoMapIterator->second->getErrorLumiAllBX();
+
+    if (events_.empty()) {
+      continue;
+    }
 
-            scaleFactorAvg_h->SetBinContent(bx,correctionScaleFactors_[bx]);
-            lumiAvg_h->SetBinContent(bx,totalLumiByBXAvg_[bx]);
-        }
+    edm::LuminosityBlockID lu(runSeg.id().run(), edm::LuminosityBlockNumber_t(lumiInfoMapIterator->first.first));
+    thisIOV = (cond::Time_t)(lu.value());
+
+    sprintf(histname1,
+            "CorrectedLumiAvg_%d_%d_%d_%d",
+            runSeg.run(),
+            iBlock,
+            lumiInfoMapIterator->first.first,
+            lumiInfoMapIterator->first.second);
+    sprintf(histname2,
+            "ScaleFactorsAvg_%d_%d_%d_%d",
+            runSeg.run(),
+            iBlock,
+            lumiInfoMapIterator->first.first,
+            lumiInfoMapIterator->first.second);
+    sprintf(histname3,
+            "RawLumiAvg_%d_%d_%d_%d",
+            runSeg.run(),
+            iBlock,
+            lumiInfoMapIterator->first.first,
+            lumiInfoMapIterator->first.second);
+
+    corrlumiAvg_h = new TH1F(histname1, "", LumiConstants::numBX, 1, LumiConstants::numBX);
+    scaleFactorAvg_h = new TH1F(histname2, "", LumiConstants::numBX, 1, LumiConstants::numBX);
+    lumiAvg_h = new TH1F(histname3, "", LumiConstants::numBX, 1, LumiConstants::numBX);
+
+    //Averaging by the number of events
+    for (unsigned int i = 0; i < LumiConstants::numBX; i++) {
+      if (events_.at(i) != 0) {
+        totalLumiByBXAvg_[i] = totalLumiByBX_[i] / events_[i];
+      } else {
+        totalLumiByBXAvg_[i] = 0.0;
+      }
+    }
 
-        //Writing the corrections to SQL lite file for db 
-        pccCorrections = new LumiCorrections();
-        pccCorrections->setOverallCorrection(overallCorrection_);
-        pccCorrections->setType1Fraction(type1Frac);
-        pccCorrections->setType1Residual(mean_type1_residual);
-        pccCorrections->setType2Residual(mean_type2_residual);
-        pccCorrections->setCorrectionsBX(correctionScaleFactors_);
-        
-
-        if( poolDbService.isAvailable() ){ 
-            poolDbService->writeOne<LumiCorrections>(pccCorrections,thisIOV,"LumiCorrectionsRcd"); 
-        }
-        else{
-            throw std::runtime_error("PoolDBService required.");
-        }
+    calculateCorrections(totalLumiByBXAvg_, correctionScaleFactors_, overallCorrection_);
 
-        delete pccCorrections;
-
-        histoFile->cd();
-        corrlumiAvg_h->Write();
-        scaleFactorAvg_h->Write();
-        lumiAvg_h->Write();
-
-        delete corrlumiAvg_h;
-        delete scaleFactorAvg_h;
-        delete lumiAvg_h;
-
-        type1FracHist->Fill(type1Frac);
-        type1resHist->Fill(mean_type1_residual);
-        type2resHist->Fill(mean_type2_residual);
-
-        for(unsigned int ils=lumiInfoMapIterator->first.first;ils<lumiInfoMapIterator->first.second+1;ils++){
-            if(ils>maxLS){
-            std::cout<<"ils out of maxLS range!!"<<std::endl;
-            break;
-            } 
-            Type1FracMon->setBinContent(ils,type1Frac);
-            Type1FracMon->setBinError(ils,mean_type1_residual_unc);
-            Type1ResMon->setBinContent(ils,mean_type1_residual);
-            Type1ResMon->setBinError(ils,mean_type1_residual_unc);
-            Type2ResMon->setBinContent(ils,mean_type2_residual);
-            Type2ResMon->setBinError(ils,mean_type2_residual_unc);
-        }
+    for (unsigned int bx = 0; bx < LumiConstants::numBX; bx++) {
+      corrlumiAvg_h->SetBinContent(bx, totalLumiByBXAvg_[bx] * correctionScaleFactors_[bx]);
+      if (events_.at(bx) != 0) {
+        corrlumiAvg_h->SetBinError(bx,
+                                   totalLumiByBXAvg_[bx] * correctionScaleFactors_[bx] / TMath::Sqrt(events_.at(bx)));
+      } else {
+        corrlumiAvg_h->SetBinError(bx, 0.0);
+      }
 
+      scaleFactorAvg_h->SetBinContent(bx, correctionScaleFactors_[bx]);
+      lumiAvg_h->SetBinContent(bx, totalLumiByBXAvg_[bx]);
+    }
 
-        type1FracGraph->SetPoint(iBlock,thisIOV+approxLumiBlockSize_/2.0,type1Frac);
-        type1resGraph->SetPoint(iBlock,thisIOV+approxLumiBlockSize_/2.0,mean_type1_residual);
-        type2resGraph->SetPoint(iBlock,thisIOV+approxLumiBlockSize_/2.0,mean_type2_residual);
-        type1FracGraph->SetPointError(iBlock,approxLumiBlockSize_/2.0,mean_type1_residual_unc);
-        type1resGraph->SetPointError(iBlock,approxLumiBlockSize_/2.0, mean_type1_residual_unc);
-        type2resGraph->SetPointError(iBlock,approxLumiBlockSize_/2.0, mean_type2_residual_unc);
+    //Writing the corrections to SQL lite file for db
+    pccCorrections = new LumiCorrections();
+    pccCorrections->setOverallCorrection(overallCorrection_);
+    pccCorrections->setType1Fraction(type1Frac);
+    pccCorrections->setType1Residual(mean_type1_residual);
+    pccCorrections->setType2Residual(mean_type2_residual);
+    pccCorrections->setCorrectionsBX(correctionScaleFactors_);
+
+    if (poolDbService.isAvailable()) {
+      poolDbService->writeOne<LumiCorrections>(pccCorrections, thisIOV, "LumiCorrectionsRcd");
+    } else {
+      throw std::runtime_error("PoolDBService required.");
+    }
 
-        edm::LogInfo("INFO") <<"iBlock type1Frac mean_type1_residual mean_type2_residual mean_type1_residual_unc mean_type2_residual_unc "<<iBlock<<" "<<type1Frac<<" "<<mean_type1_residual<<" "<<mean_type2_residual<<" "<<mean_type1_residual_unc<<" "<<mean_type2_residual_unc;
+    delete pccCorrections;
 
-        type1Frac=0.0;
-        mean_type1_residual=0.0;
-        mean_type2_residual=0.0;
-        mean_type1_residual_unc=0;
-        mean_type2_residual_unc=0;
+    histoFile->cd();
+    corrlumiAvg_h->Write();
+    scaleFactorAvg_h->Write();
+    lumiAvg_h->Write();
+
+    delete corrlumiAvg_h;
+    delete scaleFactorAvg_h;
+    delete lumiAvg_h;
+
+    type1FracHist->Fill(type1Frac);
+    type1resHist->Fill(mean_type1_residual);
+    type2resHist->Fill(mean_type2_residual);
+
+    for (unsigned int ils = lumiInfoMapIterator->first.first; ils < lumiInfoMapIterator->first.second + 1; ils++) {
+      if (ils > maxLS) {
+        std::cout << "ils out of maxLS range!!" << std::endl;
+        break;
+      }
+      Type1FracMon->setBinContent(ils, type1Frac);
+      Type1FracMon->setBinError(ils, mean_type1_residual_unc);
+      Type1ResMon->setBinContent(ils, mean_type1_residual);
+      Type1ResMon->setBinError(ils, mean_type1_residual_unc);
+      Type2ResMon->setBinContent(ils, mean_type2_residual);
+      Type2ResMon->setBinError(ils, mean_type2_residual_unc);
+    }
 
-        iBlock++;    
+    type1FracGraph->SetPoint(iBlock, thisIOV + approxLumiBlockSize_ / 2.0, type1Frac);
+    type1resGraph->SetPoint(iBlock, thisIOV + approxLumiBlockSize_ / 2.0, mean_type1_residual);
+    type2resGraph->SetPoint(iBlock, thisIOV + approxLumiBlockSize_ / 2.0, mean_type2_residual);
+    type1FracGraph->SetPointError(iBlock, approxLumiBlockSize_ / 2.0, mean_type1_residual_unc);
+    type1resGraph->SetPointError(iBlock, approxLumiBlockSize_ / 2.0, mean_type1_residual_unc);
+    type2resGraph->SetPointError(iBlock, approxLumiBlockSize_ / 2.0, mean_type2_residual_unc);
 
-        resetBlock();
-    }
-    histoFile->cd();
-    type1FracHist->Write();
-    type1resHist->Write();
-    type2resHist->Write();
+    edm::LogInfo("INFO")
+        << "iBlock type1Frac mean_type1_residual mean_type2_residual mean_type1_residual_unc mean_type2_residual_unc "
+        << iBlock << " " << type1Frac << " " << mean_type1_residual << " " << mean_type2_residual << " "
+        << mean_type1_residual_unc << " " << mean_type2_residual_unc;
 
-    delete type1FracHist;
-    delete type1resHist;
-    delete type2resHist;
+    type1Frac = 0.0;
+    mean_type1_residual = 0.0;
+    mean_type2_residual = 0.0;
+    mean_type1_residual_unc = 0;
+    mean_type2_residual_unc = 0;
 
-    delete[] histname1;
-    delete[] histname2;
-    delete[] histname3;
+    iBlock++;
 
-    for(lumiInfoMapIterator=lumiInfoMap.begin(); (lumiInfoMapIterator!=lumiInfoMap.end()); ++lumiInfoMapIterator) {
-        delete lumiInfoMapIterator->second; 
-    }
-    for(unsigned int lumiSection=0; lumiSection<lumiSections.size(); lumiSection++){
-        thisLS=lumiSections[lumiSection];
-        delete lumiInfoMapPerLS[thisLS];
-    }
-    lumiInfoMap.clear();
-    lumiInfoMapPerLS.clear();
-    lumiSections.clear();
-    lumiInfoCounter.clear();
+    resetBlock();
+  }
+  histoFile->cd();
+  type1FracHist->Write();
+  type1resHist->Write();
+  type2resHist->Write();
+
+  delete type1FracHist;
+  delete type1resHist;
+  delete type2resHist;
+
+  delete[] histname1;
+  delete[] histname2;
+  delete[] histname3;
+
+  for (lumiInfoMapIterator = lumiInfoMap.begin(); (lumiInfoMapIterator != lumiInfoMap.end()); ++lumiInfoMapIterator) {
+    delete lumiInfoMapIterator->second;
+  }
+  for (unsigned int lumiSection = 0; lumiSection < lumiSections.size(); lumiSection++) {
+    thisLS = lumiSections[lumiSection];
+    delete lumiInfoMapPerLS[thisLS];
+  }
+  lumiInfoMap.clear();
+  lumiInfoMapPerLS.clear();
+  lumiSections.clear();
+  lumiInfoCounter.clear();
 }
 
 //--------------------------------------------------------------------------------------------------
-void CorrPCCProducer::resetBlock(){
-    for(unsigned int bx=0;bx<LumiConstants::numBX;bx++){
-        totalLumiByBX_[bx]=0;
-        totalLumiByBXAvg_[bx]=0;
-        events_[bx]=0;
-        correctionScaleFactors_[bx]=1.0;
-    }
+void CorrPCCProducer::resetBlock() {
+  for (unsigned int bx = 0; bx < LumiConstants::numBX; bx++) {
+    totalLumiByBX_[bx] = 0;
+    totalLumiByBXAvg_[bx] = 0;
+    events_[bx] = 0;
+    correctionScaleFactors_[bx] = 1.0;
+  }
 }
 //--------------------------------------------------------------------------------------------------
-void CorrPCCProducer::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & iRun, edm::EventSetup const & context){
-        ibooker.setCurrentFolder("AlCaReco/LumiPCC/") ;
-        Type1FracMon = ibooker.book1D("type1Fraction","Type1Fraction;Lumisection;Type 1 Fraction",maxLS,0,maxLS);
-        Type1ResMon = ibooker.book1D("type1Residual","Type1Residual;Lumisection;Type 1 Residual",maxLS,0,maxLS);
-        Type2ResMon = ibooker.book1D("type2Residual","Type2Residual;Lumisection;Type 2 Residual",maxLS,0,maxLS);
+void CorrPCCProducer::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& iRun, edm::EventSetup const& context) {
+  ibooker.setCurrentFolder("AlCaReco/LumiPCC/");
+  Type1FracMon = ibooker.book1D("type1Fraction", "Type1Fraction;Lumisection;Type 1 Fraction", maxLS, 0, maxLS);
+  Type1ResMon = ibooker.book1D("type1Residual", "Type1Residual;Lumisection;Type 1 Residual", maxLS, 0, maxLS);
+  Type2ResMon = ibooker.book1D("type2Residual", "Type2Residual;Lumisection;Type 2 Residual", maxLS, 0, maxLS);
 }
 //--------------------------------------------------------------------------------------------------
-void CorrPCCProducer::endJob(){
-    histoFile->cd();
-    type1FracGraph->Write();
-    type1resGraph->Write();
-    type2resGraph->Write();
-    histoFile->Write();
-    histoFile->Close();
-    delete type1FracGraph;
-    delete type1resGraph;
-    delete type2resGraph;
+void CorrPCCProducer::endJob() {
+  histoFile->cd();
+  type1FracGraph->Write();
+  type1resGraph->Write();
+  type2resGraph->Write();
+  histoFile->Write();
+  histoFile->Close();
+  delete type1FracGraph;
+  delete type1resGraph;
+  delete type2resGraph;
 }
 
 DEFINE_FWK_MODULE(CorrPCCProducer);
diff --git a/Calibration/LumiAlCaRecoProducers/plugins/RawPCCProducer.cc b/Calibration/LumiAlCaRecoProducers/plugins/RawPCCProducer.cc
index 83fdcd62a10ae..0f19a9a862d41 100644
--- a/Calibration/LumiAlCaRecoProducers/plugins/RawPCCProducer.cc
+++ b/Calibration/LumiAlCaRecoProducers/plugins/RawPCCProducer.cc
@@ -8,8 +8,8 @@ authors:Sam Higginbotham (shigginb@cern.ch) and Chris Palmer (capalmer@cern.ch)
 
 ________________________________________________________________**/
 #include <string>
-#include <iostream> 
-#include <fstream> 
+#include <iostream>
+#include <fstream>
 #include <vector>
 #include <mutex>
 #include <cmath>
@@ -32,162 +32,163 @@ ________________________________________________________________**/
 #include "FWCore/Framework/interface/LuminosityBlock.h"
 
 class RawPCCProducer : public edm::global::EDProducer<edm::EndLuminosityBlockProducer> {
-        public:
-            explicit RawPCCProducer(const edm::ParameterSet&);
-            ~RawPCCProducer() override;
+public:
+  explicit RawPCCProducer(const edm::ParameterSet&);
+  ~RawPCCProducer() override;
 
-        private:
-            void globalEndLuminosityBlockProduce(edm::LuminosityBlock& lumiSeg, const edm::EventSetup& iSetup) const final;
-            void produce                  (edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const final;
+private:
+  void globalEndLuminosityBlockProduce(edm::LuminosityBlock& lumiSeg, const edm::EventSetup& iSetup) const final;
+  void produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const final;
 
+  edm::EDGetTokenT<reco::PixelClusterCounts> pccToken_;
+  const edm::EDPutTokenT<LumiInfo> putToken_;
+  const std::string takeAverageValue_;  //Output average values
 
-            edm::EDGetTokenT<reco::PixelClusterCounts>  pccToken_;
-            const edm::EDPutTokenT<LumiInfo> putToken_;
-            const std::string   takeAverageValue_;      //Output average values 
+  const std::vector<int> modVeto_;  //The list of modules to skip in the lumi calc.
 
-            const std::vector<int>   modVeto_;          //The list of modules to skip in the lumi calc. 
+  const std::string csvOutLabel_;
+  mutable std::mutex fileLock_;
+  const bool saveCSVFile_;
 
-            const std::string csvOutLabel_;
-            mutable std::mutex fileLock_;
-            const bool saveCSVFile_;
-
-            const bool applyCorr_;
-    };
+  const bool applyCorr_;
+};
 
 //--------------------------------------------------------------------------------------------------
-RawPCCProducer::RawPCCProducer(const edm::ParameterSet& iConfig):
-  putToken_{ produces<LumiInfo, edm::Transition::EndLuminosityBlock>(iConfig.getParameter<edm::ParameterSet>("RawPCCProducerParameters").getUntrackedParameter<std::string>("outputProductName","alcaLumi"))},
-  takeAverageValue_ {iConfig.getParameter<edm::ParameterSet>("RawPCCProducerParameters").getUntrackedParameter<std::string>("OutputValue",std::string("Totals"))},
-  modVeto_{ iConfig.getParameter<edm::ParameterSet>("RawPCCProducerParameters").getParameter<std::vector<int>>("modVeto")},
-  csvOutLabel_{ iConfig.getParameter<edm::ParameterSet>("RawPCCProducerParameters").getUntrackedParameter<std::string>("label",std::string("rawPCC.csv")) },
-  saveCSVFile_{ iConfig.getParameter<edm::ParameterSet>("RawPCCProducerParameters").getUntrackedParameter<bool>("saveCSVFile",false)},
-  applyCorr_{ iConfig.getParameter<edm::ParameterSet>("RawPCCProducerParameters").getUntrackedParameter<bool>("ApplyCorrections",false) }
-{
-    auto pccSource = iConfig.getParameter<edm::ParameterSet>("RawPCCProducerParameters").getParameter<std::string>("inputPccLabel");
-    auto prodInst = iConfig.getParameter<edm::ParameterSet>("RawPCCProducerParameters").getParameter<std::string>("ProdInst");
-
-    pccToken_=consumes<reco::PixelClusterCounts, edm::InLumi>(edm::InputTag(pccSource, prodInst));
+RawPCCProducer::RawPCCProducer(const edm::ParameterSet& iConfig)
+    : putToken_{produces<LumiInfo, edm::Transition::EndLuminosityBlock>(
+          iConfig.getParameter<edm::ParameterSet>("RawPCCProducerParameters")
+              .getUntrackedParameter<std::string>("outputProductName", "alcaLumi"))},
+      takeAverageValue_{iConfig.getParameter<edm::ParameterSet>("RawPCCProducerParameters")
+                            .getUntrackedParameter<std::string>("OutputValue", std::string("Totals"))},
+      modVeto_{
+          iConfig.getParameter<edm::ParameterSet>("RawPCCProducerParameters").getParameter<std::vector<int>>("modVeto")},
+      csvOutLabel_{iConfig.getParameter<edm::ParameterSet>("RawPCCProducerParameters")
+                       .getUntrackedParameter<std::string>("label", std::string("rawPCC.csv"))},
+      saveCSVFile_{iConfig.getParameter<edm::ParameterSet>("RawPCCProducerParameters")
+                       .getUntrackedParameter<bool>("saveCSVFile", false)},
+      applyCorr_{iConfig.getParameter<edm::ParameterSet>("RawPCCProducerParameters")
+                     .getUntrackedParameter<bool>("ApplyCorrections", false)} {
+  auto pccSource =
+      iConfig.getParameter<edm::ParameterSet>("RawPCCProducerParameters").getParameter<std::string>("inputPccLabel");
+  auto prodInst =
+      iConfig.getParameter<edm::ParameterSet>("RawPCCProducerParameters").getParameter<std::string>("ProdInst");
+
+  pccToken_ = consumes<reco::PixelClusterCounts, edm::InLumi>(edm::InputTag(pccSource, prodInst));
 }
 
 //--------------------------------------------------------------------------------------------------
-RawPCCProducer::~RawPCCProducer(){
-}
+RawPCCProducer::~RawPCCProducer() {}
 
 //--------------------------------------------------------------------------------------------------
-void RawPCCProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const {
-
-
-}
+void RawPCCProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const {}
 
 //--------------------------------------------------------------------------------------------------
-void RawPCCProducer::globalEndLuminosityBlockProduce(edm::LuminosityBlock& lumiSeg, const edm::EventSetup& iSetup) const {
-    float totalLumi=0.0; //The total raw luminosity from the pixel clusters - not scaled
-    float statErrOnLumi=0.0; //the statistical error on the lumi - large num ie sqrt(N)
-
-    //new vector containing clusters per bxid
-    std::vector<int> clustersPerBXOutput(LumiConstants::numBX,0);
-    //new vector containing clusters per bxid with afterglow corrections 
-    std::vector<float> corrClustersPerBXOutput(LumiConstants::numBX,0);
-
-    //The indicies of all the good modules - not vetoed
-    std::vector<int> goodMods;                 
-
-    edm::Handle<reco::PixelClusterCounts> pccHandle; 
-    lumiSeg.getByToken(pccToken_,pccHandle);
-
-    const reco::PixelClusterCounts& inputPcc = *(pccHandle.product()); 
-
-    //vector with Module IDs 1-1 map to bunch x-ing in clusers
-    auto modID = inputPcc.readModID();
-    //vector with total events at each bxid.
-    auto events= inputPcc.readEvents();
-    auto clustersPerBXInput = inputPcc.readCounts();
-
-    //making list of modules to sum over
-    for (unsigned int i=0;i<modID.size();i++){
-        if (std::find(modVeto_.begin(),modVeto_.end(), modID.at(i)) == modVeto_.end()){
-            goodMods.push_back(i);
-        }
+void RawPCCProducer::globalEndLuminosityBlockProduce(edm::LuminosityBlock& lumiSeg,
+                                                     const edm::EventSetup& iSetup) const {
+  float totalLumi = 0.0;      //The total raw luminosity from the pixel clusters - not scaled
+  float statErrOnLumi = 0.0;  //the statistical error on the lumi - large num ie sqrt(N)
+
+  //new vector containing clusters per bxid
+  std::vector<int> clustersPerBXOutput(LumiConstants::numBX, 0);
+  //new vector containing clusters per bxid with afterglow corrections
+  std::vector<float> corrClustersPerBXOutput(LumiConstants::numBX, 0);
+
+  //The indicies of all the good modules - not vetoed
+  std::vector<int> goodMods;
+
+  edm::Handle<reco::PixelClusterCounts> pccHandle;
+  lumiSeg.getByToken(pccToken_, pccHandle);
+
+  const reco::PixelClusterCounts& inputPcc = *(pccHandle.product());
+
+  //vector with Module IDs 1-1 map to bunch x-ing in clusers
+  auto modID = inputPcc.readModID();
+  //vector with total events at each bxid.
+  auto events = inputPcc.readEvents();
+  auto clustersPerBXInput = inputPcc.readCounts();
+
+  //making list of modules to sum over
+  for (unsigned int i = 0; i < modID.size(); i++) {
+    if (std::find(modVeto_.begin(), modVeto_.end(), modID.at(i)) == modVeto_.end()) {
+      goodMods.push_back(i);
     }
+  }
 
-    //summing over good modules only 
-    for (int bx=0;bx<int(LumiConstants::numBX);bx++){
-        for (unsigned int i=0;i<goodMods.size();i++){
-            clustersPerBXOutput.at(bx)+=clustersPerBXInput.at(goodMods.at(i)*int(LumiConstants::numBX)+bx);
-
-        }
+  //summing over good modules only
+  for (int bx = 0; bx < int(LumiConstants::numBX); bx++) {
+    for (unsigned int i = 0; i < goodMods.size(); i++) {
+      clustersPerBXOutput.at(bx) += clustersPerBXInput.at(goodMods.at(i) * int(LumiConstants::numBX) + bx);
     }
-
-    std::vector<float> correctionScaleFactors;
-    if(applyCorr_){
-        edm::ESHandle< LumiCorrections > corrHandle;
-        iSetup.get<LumiCorrectionsRcd>().get(corrHandle);
-        const LumiCorrections *pccCorrections = corrHandle.product();
-        correctionScaleFactors = pccCorrections->getCorrectionsBX();
+  }
+
+  std::vector<float> correctionScaleFactors;
+  if (applyCorr_) {
+    edm::ESHandle<LumiCorrections> corrHandle;
+    iSetup.get<LumiCorrectionsRcd>().get(corrHandle);
+    const LumiCorrections* pccCorrections = corrHandle.product();
+    correctionScaleFactors = pccCorrections->getCorrectionsBX();
+  } else {
+    correctionScaleFactors.resize(LumiConstants::numBX, 1.0);
+  }
+
+  for (unsigned int i = 0; i < clustersPerBXOutput.size(); i++) {
+    if (events.at(i) != 0) {
+      corrClustersPerBXOutput[i] = clustersPerBXOutput[i] * correctionScaleFactors[i];
     } else {
-        correctionScaleFactors.resize(LumiConstants::numBX,1.0);
+      corrClustersPerBXOutput[i] = 0.0;
     }
-
-    for (unsigned int i=0;i<clustersPerBXOutput.size();i++){
-        if (events.at(i)!=0){
-            corrClustersPerBXOutput[i]=clustersPerBXOutput[i]*correctionScaleFactors[i];
-        }else{
-            corrClustersPerBXOutput[i]=0.0;
-        }
-        totalLumi+=corrClustersPerBXOutput[i];
-        statErrOnLumi+=float(events[i]);
+    totalLumi += corrClustersPerBXOutput[i];
+    statErrOnLumi += float(events[i]);
+  }
+
+  std::vector<float> errorPerBX;  //Stat error (or number of events)
+  errorPerBX.assign(events.begin(), events.end());
+
+  if (takeAverageValue_ == "Average") {
+    unsigned int NActiveBX = 0;
+    for (int bx = 0; bx < int(LumiConstants::numBX); bx++) {
+      if (events[bx] > 0) {
+        NActiveBX++;
+        // Counting where events are will only work
+        // for ZeroBias or AlwaysTrue triggers.
+        // Random triggers will get all BXs.
+        corrClustersPerBXOutput[bx] /= float(events[bx]);
+        errorPerBX[bx] = 1 / sqrt(float(events[bx]));
+      }
     }
-
-    std::vector<float> errorPerBX;             //Stat error (or number of events)
-    errorPerBX.assign(events.begin(),events.end()); 
-
-    if(takeAverageValue_=="Average"){
-        unsigned int NActiveBX=0;
-        for (int bx=0;bx<int(LumiConstants::numBX);bx++){
-            if(events[bx]>0){
-                NActiveBX++;  
-                // Counting where events are will only work 
-                // for ZeroBias or AlwaysTrue triggers.
-                // Random triggers will get all BXs.
-                corrClustersPerBXOutput[bx]/=float(events[bx]);
-                errorPerBX[bx]=1/sqrt(float(events[bx]));
-            }
-        }
-        if (statErrOnLumi!=0) {
-            totalLumi=totalLumi/statErrOnLumi*float(NActiveBX);
-            statErrOnLumi=1/sqrt(statErrOnLumi)*totalLumi;
-        }
+    if (statErrOnLumi != 0) {
+      totalLumi = totalLumi / statErrOnLumi * float(NActiveBX);
+      statErrOnLumi = 1 / sqrt(statErrOnLumi) * totalLumi;
     }
-
-    LumiInfo outputLumiInfo;
-
-
-    outputLumiInfo.setTotalInstLumi(totalLumi);
-    outputLumiInfo.setTotalInstStatError(statErrOnLumi);
-
-    outputLumiInfo.setErrorLumiAllBX(errorPerBX);
-    outputLumiInfo.setInstLumiAllBX(corrClustersPerBXOutput);
-
-    if(saveCSVFile_){
-        std::lock_guard<std::mutex> lock(fileLock_);
-        std::ofstream csfile(csvOutLabel_, std::ios_base::app);
-        csfile<<std::to_string(lumiSeg.run())<<",";
-        csfile<<std::to_string(lumiSeg.luminosityBlock())<<",";
-        csfile<<std::to_string(totalLumi);
-        
-        if(totalLumi>0){
-            for(unsigned int bx=0;bx<LumiConstants::numBX;bx++){
-                csfile<<","<<std::to_string(corrClustersPerBXOutput[bx]);
-            }
-            csfile<<std::endl;   
-        } else if (totalLumi<0) {
-            edm::LogInfo("WARNING")<<"WHY IS LUMI NEGATIVE?!?!?!? "<<totalLumi;
-        }
-
-        csfile.close();
+  }
+
+  LumiInfo outputLumiInfo;
+
+  outputLumiInfo.setTotalInstLumi(totalLumi);
+  outputLumiInfo.setTotalInstStatError(statErrOnLumi);
+
+  outputLumiInfo.setErrorLumiAllBX(errorPerBX);
+  outputLumiInfo.setInstLumiAllBX(corrClustersPerBXOutput);
+
+  if (saveCSVFile_) {
+    std::lock_guard<std::mutex> lock(fileLock_);
+    std::ofstream csfile(csvOutLabel_, std::ios_base::app);
+    csfile << std::to_string(lumiSeg.run()) << ",";
+    csfile << std::to_string(lumiSeg.luminosityBlock()) << ",";
+    csfile << std::to_string(totalLumi);
+
+    if (totalLumi > 0) {
+      for (unsigned int bx = 0; bx < LumiConstants::numBX; bx++) {
+        csfile << "," << std::to_string(corrClustersPerBXOutput[bx]);
+      }
+      csfile << std::endl;
+    } else if (totalLumi < 0) {
+      edm::LogInfo("WARNING") << "WHY IS LUMI NEGATIVE?!?!?!? " << totalLumi;
     }
-    lumiSeg.emplace(putToken_, std::move(outputLumiInfo) ); 
 
+    csfile.close();
+  }
+  lumiSeg.emplace(putToken_, std::move(outputLumiInfo));
 }
 
 DEFINE_FWK_MODULE(RawPCCProducer);
diff --git a/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotFromDB.h b/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotFromDB.h
index 1c54d718a1af1..364549089db6f 100644
--- a/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotFromDB.h
+++ b/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotFromDB.h
@@ -4,7 +4,7 @@
 /**_________________________________________________________________
    class:   AlcaBeamSpotFromDB.h
    package: RecoVertex/TkAlCaRecoProducers
-   
+
 
 
  author: Francisco Yumiceva, Fermilab (yumiceva@fnal.gov)
@@ -12,27 +12,24 @@
 
 ________________________________________________________________**/
 
-
 // C++ standard
 #include <string>
 // CMS
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/one/EDProducer.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 class AlcaBeamSpotFromDB : public edm::one::EDProducer<edm::EndLuminosityBlockProducer> {
- public:
-  explicit AlcaBeamSpotFromDB(const edm::ParameterSet&);
+public:
+  explicit AlcaBeamSpotFromDB(const edm::ParameterSet &);
   ~AlcaBeamSpotFromDB() override;
 
- private:
+private:
   void beginJob() final;
-  void endLuminosityBlockProduce(edm::LuminosityBlock& lumiSeg, const edm::EventSetup& iSetup) final;
-  void produce                  (edm::Event& iEvent, const edm::EventSetup& iSetup) final;
-  void endJob()  final;
-
-
+  void endLuminosityBlockProduce(edm::LuminosityBlock &lumiSeg, const edm::EventSetup &iSetup) final;
+  void produce(edm::Event &iEvent, const edm::EventSetup &iSetup) final;
+  void endJob() final;
 };
 
 #endif
diff --git a/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotHarvester.h b/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotHarvester.h
index cbe0cc4a871cf..29aa0d9906c68 100644
--- a/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotHarvester.h
+++ b/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotHarvester.h
@@ -6,44 +6,42 @@
  *
  *  \author L. Uplegger F. Yumiceva - Fermilab
  */
+#include "Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotManager.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotManager.h"
 #include "RecoVertex/BeamSpotProducer/interface/BeamSpotWrite2Txt.h"
 
 // #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 class AlcaBeamSpotHarvester : public edm::EDAnalyzer {
- public:
+public:
   /// Constructor
-  AlcaBeamSpotHarvester(const edm::ParameterSet&);
+  AlcaBeamSpotHarvester(const edm::ParameterSet &);
 
   /// Destructor
   ~AlcaBeamSpotHarvester() override;
-  
-  // Operations
-  void beginJob            (void) override;
-  void endJob              (void) override;  
-  void analyze             (const edm::Event&          , const edm::EventSetup&) override;
-  void beginRun            (const edm::Run&            , const edm::EventSetup&) override;
-  void endRun              (const edm::Run&            , const edm::EventSetup&) override;
-  void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) override;
-  void endLuminosityBlock  (const edm::LuminosityBlock&, const edm::EventSetup&) override;
 
- protected:
-
- private:
+  // Operations
+  void beginJob(void) override;
+  void endJob(void) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void beginRun(const edm::Run &, const edm::EventSetup &) override;
+  void endRun(const edm::Run &, const edm::EventSetup &) override;
+  void beginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) override;
+  void endLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) override;
+
+protected:
+private:
   // Parameters
-  std::string 	      beamSpotOutputBase_;
-  std::string 	      outputrecordName_;
-  double      	      sigmaZValue_;
-  double              sigmaZCut_;
-  bool                dumpTxt_;
-  std::string 	      outTxtFileName_;
+  std::string beamSpotOutputBase_;
+  std::string outputrecordName_;
+  double sigmaZValue_;
+  double sigmaZCut_;
+  bool dumpTxt_;
+  std::string outTxtFileName_;
   // Member Variables
   AlcaBeamSpotManager theAlcaBeamSpotManager_;
 
-//   edm::ParameterSet metadataForOfflineDropBox_;
+  //   edm::ParameterSet metadataForOfflineDropBox_;
 };
 #endif
-
diff --git a/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotManager.h b/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotManager.h
index 4689afabecf83..eb34f5e60a76f 100644
--- a/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotManager.h
+++ b/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotManager.h
@@ -7,34 +7,35 @@
  *  \author L. Uplegger F. Yumiceva - Fermilab
  */
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
-#include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
-#include <string>
+#include "FWCore/Framework/interface/LuminosityBlock.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include <map>
+#include <string>
 #include <utility>
 
-
 class AlcaBeamSpotManager {
- public:
-  AlcaBeamSpotManager         (void);
-  AlcaBeamSpotManager         (const edm::ParameterSet&, edm::ConsumesCollector&&);
+public:
+  AlcaBeamSpotManager(void);
+  AlcaBeamSpotManager(const edm::ParameterSet &, edm::ConsumesCollector &&);
   virtual ~AlcaBeamSpotManager(void);
 
-  void reset(void);   
-  void readLumi(const edm::LuminosityBlock&);   
-  void createWeightedPayloads(void);   
-  const std::map<edm::LuminosityBlockNumber_t,std::pair<edm::Timestamp,reco::BeamSpot> >& getPayloads(void){return beamSpotMap_;}   
+  void reset(void);
+  void readLumi(const edm::LuminosityBlock &);
+  void createWeightedPayloads(void);
+  const std::map<edm::LuminosityBlockNumber_t, std::pair<edm::Timestamp, reco::BeamSpot>> &getPayloads(void) {
+    return beamSpotMap_;
+  }
 
-  typedef std::map<edm::LuminosityBlockNumber_t,std::pair<edm::Timestamp,reco::BeamSpot> >::iterator bsMap_iterator;
- private:
-  reco::BeamSpot         weight  (const bsMap_iterator& begin,
-                                  const bsMap_iterator& end);
-  void                   weight  (double& mean,double& meanError,const double& val,const double& valError);
-  std::pair<float,float> delta   (const float& x, const float& xError, const float& nextX, const float& nextXError);
-  float                  deltaSig(const float& num, const float& den);
-  std::map<edm::LuminosityBlockNumber_t,std::pair<edm::Timestamp,reco::BeamSpot> > beamSpotMap_;
+  typedef std::map<edm::LuminosityBlockNumber_t, std::pair<edm::Timestamp, reco::BeamSpot>>::iterator bsMap_iterator;
+
+private:
+  reco::BeamSpot weight(const bsMap_iterator &begin, const bsMap_iterator &end);
+  void weight(double &mean, double &meanError, const double &val, const double &valError);
+  std::pair<float, float> delta(const float &x, const float &xError, const float &nextX, const float &nextXError);
+  float deltaSig(const float &num, const float &den);
+  std::map<edm::LuminosityBlockNumber_t, std::pair<edm::Timestamp, reco::BeamSpot>> beamSpotMap_;
 
   std::string beamSpotOutputBase_;
   std::string beamSpotModuleName_;
@@ -42,7 +43,6 @@ class AlcaBeamSpotManager {
   double sigmaZCut_;
   edm::InputTag beamSpotTag_;
   edm::EDGetTokenT<reco::BeamSpot> beamSpotToken_;
-
 };
 
 #endif
diff --git a/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotProducer.h b/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotProducer.h
index 0966a86b2a008..03d0aa6f66186 100644
--- a/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotProducer.h
+++ b/Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotProducer.h
@@ -4,7 +4,7 @@
 /**_________________________________________________________________
    class:   AlcaBeamSpotProducer.h
    package: Calibration/TkAlCaRecoProducers
-   
+
 
 
  author: Francisco Yumiceva, Fermilab (yumiceva@fnal.gov)
@@ -12,34 +12,32 @@
 
 ________________________________________________________________**/
 
-
 // C++ standard
 #include <string>
 // CMS
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/one/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "RecoVertex/BeamSpotProducer/interface/BeamFitter.h"
 
-
-class AlcaBeamSpotProducer : public edm::one::EDProducer<edm::EndLuminosityBlockProducer,
-                                                         edm::one::WatchLuminosityBlocks> {
- public:
-  explicit AlcaBeamSpotProducer(const edm::ParameterSet&);
+class AlcaBeamSpotProducer
+    : public edm::one::EDProducer<edm::EndLuminosityBlockProducer, edm::one::WatchLuminosityBlocks> {
+public:
+  explicit AlcaBeamSpotProducer(const edm::ParameterSet &);
   ~AlcaBeamSpotProducer() override;
 
- private:
-  void beginLuminosityBlock     (edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup) final;
-  void endLuminosityBlock       (edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup) final;
-  void endLuminosityBlockProduce(edm::LuminosityBlock& lumiSeg, const edm::EventSetup& iSetup) final;
-  void produce                  (edm::Event& iEvent, const edm::EventSetup& iSetup) final;
-  
+private:
+  void beginLuminosityBlock(edm::LuminosityBlock const &lumiSeg, const edm::EventSetup &iSetup) final;
+  void endLuminosityBlock(edm::LuminosityBlock const &lumiSeg, const edm::EventSetup &iSetup) final;
+  void endLuminosityBlockProduce(edm::LuminosityBlock &lumiSeg, const edm::EventSetup &iSetup) final;
+  void produce(edm::Event &iEvent, const edm::EventSetup &iSetup) final;
+
   int ftotalevents;
   int fitNLumi_;
   int resetFitNLumi_;
-  int countEvt_;       //counter
-  int countLumi_;      //counter
+  int countEvt_;   // counter
+  int countLumi_;  // counter
   int ftmprun0, ftmprun;
   int beginLumiOfBSFit_;
   int endLumiOfBSFit_;
@@ -50,7 +48,7 @@ class AlcaBeamSpotProducer : public edm::one::EDProducer<edm::EndLuminosityBlock
   bool runallfitters_;
   double inputBeamWidth_;
 
-  BeamFitter * theBeamFitter;
+  BeamFitter *theBeamFitter;
 };
 
 #endif
diff --git a/Calibration/TkAlCaRecoProducers/interface/CalibrationTrackSelector.h b/Calibration/TkAlCaRecoProducers/interface/CalibrationTrackSelector.h
index 9af1c14175730..c2a4b2c475bc1 100644
--- a/Calibration/TkAlCaRecoProducers/interface/CalibrationTrackSelector.h
+++ b/Calibration/TkAlCaRecoProducers/interface/CalibrationTrackSelector.h
@@ -8,60 +8,53 @@
 namespace edm {
   class Event;
   class ParameterSet;
-}
+}  // namespace edm
 
 class TrackingRecHit;
 
-class CalibrationTrackSelector
-{
-
- public:
-
-  typedef std::vector<const reco::Track*> Tracks; 
+class CalibrationTrackSelector {
+public:
+  typedef std::vector<const reco::Track *> Tracks;
 
   /// constructor
-  CalibrationTrackSelector(const edm::ParameterSet & cfg);
+  CalibrationTrackSelector(const edm::ParameterSet &cfg);
 
   /// destructor
   ~CalibrationTrackSelector();
 
   /// select tracks
-  Tracks select(const Tracks& tracks, const edm::Event& evt) const;
-
- private:
+  Tracks select(const Tracks &tracks, const edm::Event &evt) const;
 
+private:
   /// apply basic cuts on pt,eta,phi,nhit
-  Tracks basicCuts(const Tracks& tracks, const edm::Event& evt) const;
+  Tracks basicCuts(const Tracks &tracks, const edm::Event &evt) const;
   /// checking hit requirements beyond simple number of valid hits
-  bool detailedHitsCheck(const reco::Track* track, const edm::Event& evt) const;
+  bool detailedHitsCheck(const reco::Track *track, const edm::Event &evt) const;
   bool isHit2D(const TrackingRecHit &hit) const;
-  bool isOkCharge(const TrackingRecHit* therechit) const;
-  bool isIsolated(const TrackingRecHit* therechit, const edm::Event& evt) const;
+  bool isOkCharge(const TrackingRecHit *therechit) const;
+  bool isIsolated(const TrackingRecHit *therechit, const edm::Event &evt) const;
 
   /// filter the n highest pt tracks
-  Tracks theNHighestPtTracks(const Tracks& tracks) const;
+  Tracks theNHighestPtTracks(const Tracks &tracks) const;
 
   /// compare two tracks in pt (used by theNHighestPtTracks)
   struct ComparePt {
-    bool operator()( const reco::Track* t1, const reco::Track* t2 ) const {
-      return t1->pt()> t2->pt();
-    }
+    bool operator()(const reco::Track *t1, const reco::Track *t2) const { return t1->pt() > t2->pt(); }
   };
   ComparePt ptComparator;
 
   const bool applyBasicCuts_, applyNHighestPt_, applyMultiplicityFilter_;
   const int seedOnlyFromAbove_;
-  const bool applyIsolation_, chargeCheck_ ;
+  const bool applyIsolation_, chargeCheck_;
   const int nHighestPt_, minMultiplicity_, maxMultiplicity_;
-  const bool multiplicityOnInput_; /// if true, cut min/maxMultiplicity on input instead of on final result
-  const double ptMin_,ptMax_,etaMin_,etaMax_,phiMin_,phiMax_,nHitMin_,nHitMax_,chi2nMax_;
+  const bool multiplicityOnInput_;  /// if true, cut min/maxMultiplicity on input
+                                    /// instead of on final result
+  const double ptMin_, ptMax_, etaMin_, etaMax_, phiMin_, phiMax_, nHitMin_, nHitMax_, chi2nMax_;
   const double minHitChargeStrip_, minHitIsolation_;
   const edm::InputTag rphirecHitsTag_;
   const edm::InputTag matchedrecHitsTag_;
   const unsigned int nHitMin2D_;
   const int minHitsinTIB_, minHitsinTOB_, minHitsinTID_, minHitsinTEC_, minHitsinBPIX_, minHitsinFPIX_;
-
 };
 
 #endif
-
diff --git a/Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotFromDB.cc b/Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotFromDB.cc
index 9a72fa6470668..80a56b9ef2b60 100644
--- a/Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotFromDB.cc
+++ b/Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotFromDB.cc
@@ -1,7 +1,7 @@
 /**_________________________________________________________________
    class:   AlcaBeamSpotFromDB.cc
    package: RecoVertex/BeamSpotProducer
-   
+
 
 
  author: Francisco Yumiceva, Fermilab (yumiceva@fnal.gov)
@@ -9,98 +9,77 @@
 
 ________________________________________________________________**/
 
-
 // C++ standard
 #include <string>
 // CMS
-#include "DataFormats/BeamSpot/interface/BeamSpot.h"
 #include "Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotFromDB.h"
+#include "DataFormats/BeamSpot/interface/BeamSpot.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
+#include "CondFormats/BeamSpotObjects/interface/BeamSpotObjects.h"
+#include "CondFormats/DataRecord/interface/BeamSpotObjectsRcd.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/IOVSyncValue.h"
 #include "FWCore/Framework/interface/LuminosityBlock.h"
-#include "CondFormats/DataRecord/interface/BeamSpotObjectsRcd.h"
-#include "CondFormats/BeamSpotObjects/interface/BeamSpotObjects.h"
-
-
-AlcaBeamSpotFromDB::AlcaBeamSpotFromDB(const edm::ParameterSet& iConfig)
-{
 
-  produces<reco::BeamSpot, edm::Transition::EndLuminosityBlock>("alcaBeamSpot");  
+AlcaBeamSpotFromDB::AlcaBeamSpotFromDB(const edm::ParameterSet &iConfig) {
+  produces<reco::BeamSpot, edm::Transition::EndLuminosityBlock>("alcaBeamSpot");
 }
 
+AlcaBeamSpotFromDB::~AlcaBeamSpotFromDB() {}
 
-AlcaBeamSpotFromDB::~AlcaBeamSpotFromDB()
-{
-	
-}
-
-//--------------------------------------------------------------------------------------------------                                                                      
-void AlcaBeamSpotFromDB::produce(edm::Event& iEvent, const edm::EventSetup& iSetup){
+//--------------------------------------------------------------------------------------------------
+void AlcaBeamSpotFromDB::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {}
 
-}
-
-//--------------------------------------------------------------------------------------------------                                                                      
-void AlcaBeamSpotFromDB::endLuminosityBlockProduce(edm::LuminosityBlock& lumiSeg, const edm::EventSetup& iSetup)
-{
+//--------------------------------------------------------------------------------------------------
+void AlcaBeamSpotFromDB::endLuminosityBlockProduce(edm::LuminosityBlock &lumiSeg, const edm::EventSetup &iSetup) {
   // read DB object
-  edm::ESHandle< BeamSpotObjects > beamhandle;
+  edm::ESHandle<BeamSpotObjects> beamhandle;
   iSetup.get<BeamSpotObjectsRcd>().get(beamhandle);
   const BeamSpotObjects *spotDB = beamhandle.product();
 
   // translate from BeamSpotObjects to reco::BeamSpot
-  reco::BeamSpot::Point apoint( spotDB->GetX(), spotDB->GetY(), spotDB->GetZ() );
-  
+  reco::BeamSpot::Point apoint(spotDB->GetX(), spotDB->GetY(), spotDB->GetZ());
+
   reco::BeamSpot::CovarianceMatrix matrix;
-  for ( int i=0; i<7; ++i ) {
-    for ( int j=0; j<7; ++j ) {
-      matrix(i,j) = spotDB->GetCovariance(i,j);
+  for (int i = 0; i < 7; ++i) {
+    for (int j = 0; j < 7; ++j) {
+      matrix(i, j) = spotDB->GetCovariance(i, j);
     }
   }
-  
+
   reco::BeamSpot aSpot;
   // this assume beam width same in x and y
-  aSpot = reco::BeamSpot( apoint,
-			  spotDB->GetSigmaZ(),
-			  spotDB->Getdxdz(),
-			  spotDB->Getdydz(),
-			  spotDB->GetBeamWidthX(),
-			  matrix );
-  aSpot.setBeamWidthY( spotDB->GetBeamWidthY() );
-  aSpot.setEmittanceX( spotDB->GetEmittanceX() );
-  aSpot.setEmittanceY( spotDB->GetEmittanceY() );
-  aSpot.setbetaStar( spotDB->GetBetaStar() );
-
-  if ( spotDB->GetBeamType() == 2 ) {
-    aSpot.setType( reco::BeamSpot::Tracker );
-  } else{
-    aSpot.setType( reco::BeamSpot::Fake );
+  aSpot = reco::BeamSpot(
+      apoint, spotDB->GetSigmaZ(), spotDB->Getdxdz(), spotDB->Getdydz(), spotDB->GetBeamWidthX(), matrix);
+  aSpot.setBeamWidthY(spotDB->GetBeamWidthY());
+  aSpot.setEmittanceX(spotDB->GetEmittanceX());
+  aSpot.setEmittanceY(spotDB->GetEmittanceY());
+  aSpot.setbetaStar(spotDB->GetBetaStar());
+
+  if (spotDB->GetBeamType() == 2) {
+    aSpot.setType(reco::BeamSpot::Tracker);
+  } else {
+    aSpot.setType(reco::BeamSpot::Fake);
   }
 
   auto result = std::make_unique<reco::BeamSpot>();
   *result = aSpot;
   lumiSeg.put(std::move(result), std::string("alcaBeamSpot"));
 
-  //std::cout << " for runs: " << iEvent.id().run() << " - " << iEvent.id().run() << std::endl;
+  // std::cout << " for runs: " << iEvent.id().run() << " - " <<
+  // iEvent.id().run() << std::endl;
   std::cout << aSpot << std::endl;
-
 }
 
+void AlcaBeamSpotFromDB::beginJob() {}
 
-void
-AlcaBeamSpotFromDB::beginJob()
-{
-}
-
-void
-AlcaBeamSpotFromDB::endJob() {
-}
+void AlcaBeamSpotFromDB::endJob() {}
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(AlcaBeamSpotFromDB);
diff --git a/Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotHarvester.cc b/Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotHarvester.cc
index fe414538e41b7..4fcdd3d108748 100644
--- a/Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotHarvester.cc
+++ b/Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotHarvester.cc
@@ -6,48 +6,53 @@
  */
 
 #include "Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotHarvester.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/Run.h"
-#include "FWCore/Framework/interface/LuminosityBlock.h"
-#include "FWCore/Framework/interface/FileBlock.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/FileBlock.h"
+#include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/MessageLogger/interface/JobReport.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
 
+#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 #include "CondFormats/BeamSpotObjects/interface/BeamSpotObjects.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 //#include "CondCore/Utilities/bin/cmscond_export_iov.cpp"
 //#include "CondCore/Utilities/interface/Utilities.h"
 // #include "FWCore/MessageLogger/interface/JobReport.h"
 
-#include <iostream>
 #include <cstring>
+#include <iostream>
 
 using namespace edm;
 using namespace reco;
-//using namespace std;
+// using namespace std;
 
 //--------------------------------------------------------------------------------------------------
-AlcaBeamSpotHarvester::AlcaBeamSpotHarvester(const edm::ParameterSet& iConfig) :
-  beamSpotOutputBase_    (iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<std::string>("BeamSpotOutputBase")),
-  outputrecordName_      (iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<std::string>("outputRecordName", "BeamSpotObjectsRcd")),
-  sigmaZValue_           (iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<double>("SigmaZValue")),
-  sigmaZCut_           (iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<double>("SigmaZCut")),
-  dumpTxt_               (iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<bool>("DumpTxt")),
-  outTxtFileName_        (iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<std::string>("TxtFileName")),
-  theAlcaBeamSpotManager_(iConfig, consumesCollector()) {
-}
+AlcaBeamSpotHarvester::AlcaBeamSpotHarvester(const edm::ParameterSet &iConfig)
+    : beamSpotOutputBase_(iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters")
+                              .getUntrackedParameter<std::string>("BeamSpotOutputBase")),
+      outputrecordName_(iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters")
+                            .getUntrackedParameter<std::string>("outputRecordName", "BeamSpotObjectsRcd")),
+      sigmaZValue_(iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters")
+                       .getUntrackedParameter<double>("SigmaZValue")),
+      sigmaZCut_(iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters")
+                     .getUntrackedParameter<double>("SigmaZCut")),
+      dumpTxt_(
+          iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<bool>("DumpTxt")),
+      outTxtFileName_(iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters")
+                          .getUntrackedParameter<std::string>("TxtFileName")),
+      theAlcaBeamSpotManager_(iConfig, consumesCollector()) {}
 
 //--------------------------------------------------------------------------------------------------
-AlcaBeamSpotHarvester::~AlcaBeamSpotHarvester(){}
+AlcaBeamSpotHarvester::~AlcaBeamSpotHarvester() {}
 
 //--------------------------------------------------------------------------------------------------
 void AlcaBeamSpotHarvester::beginJob() {}
@@ -56,38 +61,36 @@ void AlcaBeamSpotHarvester::beginJob() {}
 void AlcaBeamSpotHarvester::endJob() {}
 
 //--------------------------------------------------------------------------------------------------
-void AlcaBeamSpotHarvester::analyze(const edm::Event& iEvent, const edm::EventSetup&) {
-//  edm::LogInfo("AlcaBeamSpotHarvester")
-//      << "Lumi: " << iEvent.luminosityBlock()
-//      << " Time: " << iEvent.time().unixTime()
-//      << std::endl;
+void AlcaBeamSpotHarvester::analyze(const edm::Event &iEvent, const edm::EventSetup &) {
+  //  edm::LogInfo("AlcaBeamSpotHarvester")
+  //      << "Lumi: " << iEvent.luminosityBlock()
+  //      << " Time: " << iEvent.time().unixTime()
+  //      << std::endl;
 }
 
 //--------------------------------------------------------------------------------------------------
-void AlcaBeamSpotHarvester::beginRun(const edm::Run&, const edm::EventSetup&){
-  theAlcaBeamSpotManager_.reset();
-}
+void AlcaBeamSpotHarvester::beginRun(const edm::Run &, const edm::EventSetup &) { theAlcaBeamSpotManager_.reset(); }
 
 //--------------------------------------------------------------------------------------------------
-void AlcaBeamSpotHarvester::endRun(const edm::Run& iRun, const edm::EventSetup&){
+void AlcaBeamSpotHarvester::endRun(const edm::Run &iRun, const edm::EventSetup &) {
   theAlcaBeamSpotManager_.createWeightedPayloads();
-  std::map<edm::LuminosityBlockNumber_t,std::pair<edm::Timestamp,reco::BeamSpot>> beamSpotMap = theAlcaBeamSpotManager_.getPayloads();
+  std::map<edm::LuminosityBlockNumber_t, std::pair<edm::Timestamp, reco::BeamSpot>> beamSpotMap =
+      theAlcaBeamSpotManager_.getPayloads();
   Service<cond::service::PoolDBOutputService> poolDbService;
-//  cond::ExportIOVUtilities utilities;
+  //  cond::ExportIOVUtilities utilities;
 
   std::string outTxt = Form("%s_Run%d.txt", outTxtFileName_.c_str(), iRun.id().run());
   std::ofstream outFile;
-  outFile.open(outTxt.c_str(),std::ios::app);
+  outFile.open(outTxt.c_str(), std::ios::app);
 
-  if(poolDbService.isAvailable() ) {
-    for(AlcaBeamSpotManager::bsMap_iterator it=beamSpotMap.begin(); it!=beamSpotMap.end();it++){
+  if (poolDbService.isAvailable()) {
+    for (AlcaBeamSpotManager::bsMap_iterator it = beamSpotMap.begin(); it != beamSpotMap.end(); it++) {
       BeamSpotObjects *aBeamSpot = new BeamSpotObjects();
       aBeamSpot->SetType(it->second.second.type());
-      aBeamSpot->SetPosition(it->second.second.x0(),it->second.second.y0(),it->second.second.z0());
-      if(sigmaZValue_ == -1){
+      aBeamSpot->SetPosition(it->second.second.x0(), it->second.second.y0(), it->second.second.z0());
+      if (sigmaZValue_ == -1) {
         aBeamSpot->SetSigmaZ(it->second.second.sigmaZ());
-      }
-      else{
+      } else {
         aBeamSpot->SetSigmaZ(sigmaZValue_);
       }
       aBeamSpot->Setdxdz(it->second.second.dxdz());
@@ -96,111 +99,105 @@ void AlcaBeamSpotHarvester::endRun(const edm::Run& iRun, const edm::EventSetup&)
       aBeamSpot->SetBeamWidthY(it->second.second.BeamWidthY());
       aBeamSpot->SetEmittanceX(it->second.second.emittanceX());
       aBeamSpot->SetEmittanceY(it->second.second.emittanceY());
-      aBeamSpot->SetBetaStar(it->second.second.betaStar() );
+      aBeamSpot->SetBetaStar(it->second.second.betaStar());
 
-      for (int i=0; i<7; ++i) {
-	for (int j=0; j<7; ++j) {
-	  aBeamSpot->SetCovariance(i,j,it->second.second.covariance(i,j));
-	}
+      for (int i = 0; i < 7; ++i) {
+        for (int j = 0; j < 7; ++j) {
+          aBeamSpot->SetCovariance(i, j, it->second.second.covariance(i, j));
+        }
       }
 
-      if(sigmaZValue_ > 0){
-        aBeamSpot->SetCovariance(3,3,0.000025);
+      if (sigmaZValue_ > 0) {
+        aBeamSpot->SetCovariance(3, 3, 0.000025);
       }
 
       cond::Time_t thisIOV = 1;
 
       beamspot::BeamSpotContainer currentBS;
 
-
       // run based
-      if (beamSpotOutputBase_ == "runbased" ) {
-	thisIOV = (cond::Time_t) iRun.id().run();
+      if (beamSpotOutputBase_ == "runbased") {
+        thisIOV = (cond::Time_t)iRun.id().run();
       }
       // lumi based
-      else if (beamSpotOutputBase_ == "lumibased" ) {
-	edm::LuminosityBlockID lu(iRun.id().run(),it->first);
-	thisIOV = (cond::Time_t)(lu.value());
-
-	currentBS.beamspot       = it -> second.second;
-	currentBS.run            = iRun.id().run()    ;
-	currentBS.beginLumiOfFit = it->first;
-	currentBS.endLumiOfFit   = it->first; // endLumi = initLumi
-
-	std::time_t lumi_t_begin = it -> second.first.unixTime(); 
-	std::time_t lumi_t_end   = it -> second.first.unixTime(); // begin time == end time
-	strftime(currentBS.beginTimeOfFit, sizeof currentBS.beginTimeOfFit, "%Y.%m.%d %H:%M:%S GMT", gmtime(&lumi_t_begin));
-	strftime(currentBS.endTimeOfFit,   sizeof currentBS.endTimeOfFit,   "%Y.%m.%d %H:%M:%S GMT", gmtime(&lumi_t_end));
-
-	currentBS.reftime[0] = lumi_t_begin;
-	currentBS.reftime[1] = lumi_t_end;
-
+      else if (beamSpotOutputBase_ == "lumibased") {
+        edm::LuminosityBlockID lu(iRun.id().run(), it->first);
+        thisIOV = (cond::Time_t)(lu.value());
+
+        currentBS.beamspot = it->second.second;
+        currentBS.run = iRun.id().run();
+        currentBS.beginLumiOfFit = it->first;
+        currentBS.endLumiOfFit = it->first;  // endLumi = initLumi
+
+        std::time_t lumi_t_begin = it->second.first.unixTime();
+        std::time_t lumi_t_end = it->second.first.unixTime();  // begin time == end time
+        strftime(
+            currentBS.beginTimeOfFit, sizeof currentBS.beginTimeOfFit, "%Y.%m.%d %H:%M:%S GMT", gmtime(&lumi_t_begin));
+        strftime(currentBS.endTimeOfFit, sizeof currentBS.endTimeOfFit, "%Y.%m.%d %H:%M:%S GMT", gmtime(&lumi_t_end));
+
+        currentBS.reftime[0] = lumi_t_begin;
+        currentBS.reftime[1] = lumi_t_end;
       }
-      if (poolDbService->isNewTagRequest(outputrecordName_) ) {
-          edm::LogInfo("AlcaBeamSpotHarvester")
-              << "new tag requested" << std::endl;
-          //poolDbService->createNewIOV<BeamSpotObjects>(aBeamSpot, poolDbService->beginOfTime(),poolDbService->endOfTime(),"BeamSpotObjectsRcd");
-	  //poolDbService->createNewIOV<BeamSpotObjects>(aBeamSpot, poolDbService->currentTime(), poolDbService->endOfTime(),"BeamSpotObjectsRcd");
-	  poolDbService->writeOne<BeamSpotObjects>(aBeamSpot, thisIOV, outputrecordName_);
-          if (dumpTxt_ && beamSpotOutputBase_ == "lumibased"){
-              beamspot::dumpBeamSpotTxt(outFile, currentBS);
-
-	            edm::Service<edm::JobReport> jr;
-      	      if (jr.isAvailable()) {
-            		std::map<std::string, std::string> jrInfo;
-            		jrInfo["Source"] = std::string("AlcaHarvesting");
-            		jrInfo["FileClass"] = std::string("ALCATXT");
-            		jr->reportAnalysisFile(outTxt, jrInfo);
-      	      }
-
+      if (poolDbService->isNewTagRequest(outputrecordName_)) {
+        edm::LogInfo("AlcaBeamSpotHarvester") << "new tag requested" << std::endl;
+        // poolDbService->createNewIOV<BeamSpotObjects>(aBeamSpot,
+        // poolDbService->beginOfTime(),poolDbService->endOfTime(),"BeamSpotObjectsRcd");
+        // poolDbService->createNewIOV<BeamSpotObjects>(aBeamSpot,
+        // poolDbService->currentTime(),
+        // poolDbService->endOfTime(),"BeamSpotObjectsRcd");
+        poolDbService->writeOne<BeamSpotObjects>(aBeamSpot, thisIOV, outputrecordName_);
+        if (dumpTxt_ && beamSpotOutputBase_ == "lumibased") {
+          beamspot::dumpBeamSpotTxt(outFile, currentBS);
+
+          edm::Service<edm::JobReport> jr;
+          if (jr.isAvailable()) {
+            std::map<std::string, std::string> jrInfo;
+            jrInfo["Source"] = std::string("AlcaHarvesting");
+            jrInfo["FileClass"] = std::string("ALCATXT");
+            jr->reportAnalysisFile(outTxt, jrInfo);
           }
-      }
-      else {
-        edm::LogInfo("AlcaBeamSpotHarvester")
-            << "no new tag requested, appending IOV" << std::endl;
-        //poolDbService->appendSinceTime<BeamSpotObjects>(aBeamSpot, poolDbService->currentTime(),"BeamSpotObjectsRcd");
-	poolDbService->writeOne<BeamSpotObjects>(aBeamSpot, thisIOV, outputrecordName_);
-        if (dumpTxt_ && beamSpotOutputBase_ == "lumibased"){
-            beamspot::dumpBeamSpotTxt(outFile, currentBS);
+        }
+      } else {
+        edm::LogInfo("AlcaBeamSpotHarvester") << "no new tag requested, appending IOV" << std::endl;
+        // poolDbService->appendSinceTime<BeamSpotObjects>(aBeamSpot,
+        // poolDbService->currentTime(),"BeamSpotObjectsRcd");
+        poolDbService->writeOne<BeamSpotObjects>(aBeamSpot, thisIOV, outputrecordName_);
+        if (dumpTxt_ && beamSpotOutputBase_ == "lumibased") {
+          beamspot::dumpBeamSpotTxt(outFile, currentBS);
         }
       }
 
-
-
-/*
-      int         argc = 15;
-      const char* argv[] = {"endRun"
-                           ,"-d","sqlite_file:combined.db"
-                           ,"-s","sqlite_file:testbs2.db"
-                           ,"-l","sqlite_file:log.db"
-			   ,"-i","TestLSBasedBS"
-			   ,"-t","TestLSBasedBS"
-			   ,"-b","1"
-			   ,"-e","10"
-			   };
-
-      edm::LogInfo("AlcaBeamSpotHarvester")
-        << "Running utilities!"
-	<< utilities.run(argc,(char**)argv);
-      edm::LogInfo("AlcaBeamSpotHarvester")
-        << "Run utilities!"
-	<< std::endl;
-*/
+      /*
+            int         argc = 15;
+            const char* argv[] = {"endRun"
+                                 ,"-d","sqlite_file:combined.db"
+                                 ,"-s","sqlite_file:testbs2.db"
+                                 ,"-l","sqlite_file:log.db"
+                                 ,"-i","TestLSBasedBS"
+                                 ,"-t","TestLSBasedBS"
+                                 ,"-b","1"
+                                 ,"-e","10"
+                                 };
+
+            edm::LogInfo("AlcaBeamSpotHarvester")
+              << "Running utilities!"
+              << utilities.run(argc,(char**)argv);
+            edm::LogInfo("AlcaBeamSpotHarvester")
+              << "Run utilities!"
+              << std::endl;
+      */
     }
-
   }
 
   outFile.close();
-
 }
 
 //--------------------------------------------------------------------------------------------------
-void AlcaBeamSpotHarvester::beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&) {}
+void AlcaBeamSpotHarvester::beginLuminosityBlock(const edm::LuminosityBlock &, const edm::EventSetup &) {}
 
 //--------------------------------------------------------------------------------------------------
-void AlcaBeamSpotHarvester::endLuminosityBlock(const edm::LuminosityBlock& iLumi, const edm::EventSetup&) {
+void AlcaBeamSpotHarvester::endLuminosityBlock(const edm::LuminosityBlock &iLumi, const edm::EventSetup &) {
   theAlcaBeamSpotManager_.readLumi(iLumi);
 }
 
-
 DEFINE_FWK_MODULE(AlcaBeamSpotHarvester);
diff --git a/Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotProducer.cc b/Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotProducer.cc
index 214ba3e8040ed..c90866c7e3335 100644
--- a/Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotProducer.cc
+++ b/Calibration/TkAlCaRecoProducers/plugins/AlcaBeamSpotProducer.cc
@@ -1,7 +1,7 @@
 /**_________________________________________________________________
    class:   AlcaBeamSpotProducer.cc
    package: RecoVertex/BeamSpotProducer
-   
+
 
 
    author: Francisco Yumiceva, Fermilab (yumiceva@fnal.gov)
@@ -10,36 +10,39 @@
 
    ________________________________________________________________**/
 
-
 // C++ standard
 #include <string>
 // CMS
-#include "DataFormats/BeamSpot/interface/BeamSpot.h"
 #include "Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotProducer.h"
+#include "DataFormats/BeamSpot/interface/BeamSpot.h"
 #include "RecoVertex/BeamSpotProducer/interface/BSFitter.h"
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
+#include "CondFormats/BeamSpotObjects/interface/BeamSpotObjects.h"
+#include "CondFormats/DataRecord/interface/BeamSpotObjectsRcd.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/LuminosityBlock.h"
-#include "CondFormats/DataRecord/interface/BeamSpotObjectsRcd.h"
-#include "CondFormats/BeamSpotObjects/interface/BeamSpotObjects.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "TMath.h"
 
 //--------------------------------------------------------------------------------------------------
-AlcaBeamSpotProducer::AlcaBeamSpotProducer(const edm::ParameterSet& iConfig){
+AlcaBeamSpotProducer::AlcaBeamSpotProducer(const edm::ParameterSet &iConfig) {
   // get parameter
-  write2DB_        = iConfig.getParameter<edm::ParameterSet>("AlcaBeamSpotProducerParameters").getParameter<bool>("WriteToDB");
-  runallfitters_   = iConfig.getParameter<edm::ParameterSet>("AlcaBeamSpotProducerParameters").getParameter<bool>("RunAllFitters");
-  fitNLumi_        = iConfig.getParameter<edm::ParameterSet>("AlcaBeamSpotProducerParameters").getUntrackedParameter<int>("fitEveryNLumi",-1);
-  resetFitNLumi_   = iConfig.getParameter<edm::ParameterSet>("AlcaBeamSpotProducerParameters").getUntrackedParameter<int>("resetEveryNLumi",-1);
-  runbeamwidthfit_ = iConfig.getParameter<edm::ParameterSet>("AlcaBeamSpotProducerParameters").getParameter<bool>("RunBeamWidthFit");
-  
+  write2DB_ = iConfig.getParameter<edm::ParameterSet>("AlcaBeamSpotProducerParameters").getParameter<bool>("WriteToDB");
+  runallfitters_ =
+      iConfig.getParameter<edm::ParameterSet>("AlcaBeamSpotProducerParameters").getParameter<bool>("RunAllFitters");
+  fitNLumi_ = iConfig.getParameter<edm::ParameterSet>("AlcaBeamSpotProducerParameters")
+                  .getUntrackedParameter<int>("fitEveryNLumi", -1);
+  resetFitNLumi_ = iConfig.getParameter<edm::ParameterSet>("AlcaBeamSpotProducerParameters")
+                       .getUntrackedParameter<int>("resetEveryNLumi", -1);
+  runbeamwidthfit_ =
+      iConfig.getParameter<edm::ParameterSet>("AlcaBeamSpotProducerParameters").getParameter<bool>("RunBeamWidthFit");
+
   theBeamFitter = new BeamFitter(iConfig, consumesCollector());
   theBeamFitter->resetTrkVector();
   theBeamFitter->resetLSRange();
@@ -51,97 +54,95 @@ AlcaBeamSpotProducer::AlcaBeamSpotProducer(const edm::ParameterSet& iConfig){
   ftmprun0 = ftmprun = -1;
   countLumi_ = 0;
   beginLumiOfBSFit_ = endLumiOfBSFit_ = -1;
-  
+
   produces<reco::BeamSpot, edm::Transition::EndLuminosityBlock>("alcaBeamSpot");
 }
 
 //--------------------------------------------------------------------------------------------------
-AlcaBeamSpotProducer::~AlcaBeamSpotProducer(){
-  delete theBeamFitter;
-}
+AlcaBeamSpotProducer::~AlcaBeamSpotProducer() { delete theBeamFitter; }
 
 //--------------------------------------------------------------------------------------------------
-void AlcaBeamSpotProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup){
+void AlcaBeamSpotProducer::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   ftotalevents++;
   theBeamFitter->readEvent(iEvent);
   ftmprun = iEvent.id().run();
 }
 
 //--------------------------------------------------------------------------------------------------
-void AlcaBeamSpotProducer::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup){
+void AlcaBeamSpotProducer::beginLuminosityBlock(edm::LuminosityBlock const &lumiSeg, const edm::EventSetup &iSetup) {
   const edm::TimeValue_t fbegintimestamp = lumiSeg.beginTime().value();
   const std::time_t ftmptime = fbegintimestamp >> 32;
 
-  if ( countLumi_ == 0 || (resetFitNLumi_ > 0 && countLumi_%resetFitNLumi_ == 0) ) {
+  if (countLumi_ == 0 || (resetFitNLumi_ > 0 && countLumi_ % resetFitNLumi_ == 0)) {
     ftmprun0 = lumiSeg.run();
     ftmprun = ftmprun0;
     beginLumiOfBSFit_ = lumiSeg.luminosityBlock();
     refBStime[0] = ftmptime;
   }
-    
+
   countLumi_++;
-  
 }
 
 //--------------------------------------------------------------------------------------------------
-void AlcaBeamSpotProducer::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& iSetup){
-}
+void AlcaBeamSpotProducer::endLuminosityBlock(edm::LuminosityBlock const &lumiSeg, const edm::EventSetup &iSetup) {}
 
 //--------------------------------------------------------------------------------------------------
-void AlcaBeamSpotProducer::endLuminosityBlockProduce(edm::LuminosityBlock& lumiSeg, const edm::EventSetup& iSetup){
+void AlcaBeamSpotProducer::endLuminosityBlockProduce(edm::LuminosityBlock &lumiSeg, const edm::EventSetup &iSetup) {
   const edm::TimeValue_t fendtimestamp = lumiSeg.endTime().value();
   const std::time_t fendtime = fendtimestamp >> 32;
   refBStime[1] = fendtime;
-    
+
   endLumiOfBSFit_ = lumiSeg.luminosityBlock();
-    
-  if ( fitNLumi_ == -1 && resetFitNLumi_ == -1 ) return;
-	
-  if (fitNLumi_ > 0 && countLumi_%fitNLumi_!=0) return;
 
-  theBeamFitter->setFitLSRange(beginLumiOfBSFit_,endLumiOfBSFit_);
-  theBeamFitter->setRefTime(refBStime[0],refBStime[1]);
+  if (fitNLumi_ == -1 && resetFitNLumi_ == -1)
+    return;
+
+  if (fitNLumi_ > 0 && countLumi_ % fitNLumi_ != 0)
+    return;
+
+  theBeamFitter->setFitLSRange(beginLumiOfBSFit_, endLumiOfBSFit_);
+  theBeamFitter->setRefTime(refBStime[0], refBStime[1]);
   theBeamFitter->setRun(ftmprun0);
-    
-  std::pair<int,int> LSRange = theBeamFitter->getFitLSRange();
+
+  std::pair<int, int> LSRange = theBeamFitter->getFitLSRange();
 
   reco::BeamSpot bs;
-  if (theBeamFitter->runPVandTrkFitter()){
+  if (theBeamFitter->runPVandTrkFitter()) {
     bs = theBeamFitter->getBeamSpot();
-    edm::LogInfo("AlcaBeamSpotProducer")
-        << "\n RESULTS OF DEFAULT FIT " << std::endl
-        << " for runs: " << ftmprun0 << " - " << ftmprun << std::endl
-        << " for lumi blocks : " << LSRange.first << " - " << LSRange.second << std::endl
-        << " lumi counter # " << countLumi_ << std::endl
-        << bs << std::endl
-        << "fit done. \n" << std::endl;	
-  }
-  else { // Fill in empty beam spot if beamfit fails
+    edm::LogInfo("AlcaBeamSpotProducer") << "\n RESULTS OF DEFAULT FIT " << std::endl
+                                         << " for runs: " << ftmprun0 << " - " << ftmprun << std::endl
+                                         << " for lumi blocks : " << LSRange.first << " - " << LSRange.second
+                                         << std::endl
+                                         << " lumi counter # " << countLumi_ << std::endl
+                                         << bs << std::endl
+                                         << "fit done. \n"
+                                         << std::endl;
+  } else {  // Fill in empty beam spot if beamfit fails
     bs.setType(reco::BeamSpot::Fake);
-    edm::LogInfo("AlcaBeamSpotProducer")
-        << "\n Empty Beam spot fit" << std::endl
-        << " for runs: " << ftmprun0 << " - " << ftmprun << std::endl
-        << " for lumi blocks : " << LSRange.first << " - " << LSRange.second << std::endl
-        << " lumi counter # " << countLumi_ << std::endl
-        << bs << std::endl
-        << "fit failed \n" << std::endl;
+    edm::LogInfo("AlcaBeamSpotProducer") << "\n Empty Beam spot fit" << std::endl
+                                         << " for runs: " << ftmprun0 << " - " << ftmprun << std::endl
+                                         << " for lumi blocks : " << LSRange.first << " - " << LSRange.second
+                                         << std::endl
+                                         << " lumi counter # " << countLumi_ << std::endl
+                                         << bs << std::endl
+                                         << "fit failed \n"
+                                         << std::endl;
   }
 
   auto result = std::make_unique<reco::BeamSpot>();
   *result = bs;
   lumiSeg.put(std::move(result), std::string("alcaBeamSpot"));
-	
-  if (resetFitNLumi_ > 0 && countLumi_%resetFitNLumi_ == 0) {
+
+  if (resetFitNLumi_ > 0 && countLumi_ % resetFitNLumi_ == 0) {
     std::vector<BSTrkParameters> theBSvector = theBeamFitter->getBSvector();
-    edm::LogInfo("AlcaBeamSpotProducer")
-        << "Total number of tracks accumulated = " << theBSvector.size() << std::endl
-        << "Reset track collection for beam fit" <<std::endl;
+    edm::LogInfo("AlcaBeamSpotProducer") << "Total number of tracks accumulated = " << theBSvector.size() << std::endl
+                                         << "Reset track collection for beam fit" << std::endl;
     theBeamFitter->resetTrkVector();
     theBeamFitter->resetLSRange();
     theBeamFitter->resetCutFlow();
     theBeamFitter->resetRefTime();
     theBeamFitter->resetPVFitter();
-    countLumi_=0;
+    countLumi_ = 0;
   }
 }
 
diff --git a/Calibration/TkAlCaRecoProducers/plugins/CalibrationTrackSelectorFromDetIdList.cc b/Calibration/TkAlCaRecoProducers/plugins/CalibrationTrackSelectorFromDetIdList.cc
index d4f51723cab94..48911c476b72b 100644
--- a/Calibration/TkAlCaRecoProducers/plugins/CalibrationTrackSelectorFromDetIdList.cc
+++ b/Calibration/TkAlCaRecoProducers/plugins/CalibrationTrackSelectorFromDetIdList.cc
@@ -3,8 +3,11 @@
 // Package:    CalibrationTrackSelectorFromDetIdList
 // Class:      CalibrationTrackSelectorFromDetIdList
 //
-/**\class CalibrationTrackSelectorFromDetIdList CalibrationTrackSelectorFromDetIdList.cc Calibration/TkAlCaRecoProducers/plugins/CalibrationTrackSelectorFromDetIdList.cc
-Description: Selects tracks that have at leaast one valid hit on a given set of Tracker DetIds
+/**\class CalibrationTrackSelectorFromDetIdList
+CalibrationTrackSelectorFromDetIdList.cc
+Calibration/TkAlCaRecoProducers/plugins/CalibrationTrackSelectorFromDetIdList.cc
+Description: Selects tracks that have at leaast one valid hit on a given set of
+Tracker DetIds
 */
 //
 // Original Author:  Marco Musich
@@ -39,28 +42,30 @@ Description: Selects tracks that have at leaast one valid hit on a given set of
 
 class dso_hidden CalibrationTrackSelectorFromDetIdList final : public edm::stream::EDProducer<> {
 public:
-  explicit CalibrationTrackSelectorFromDetIdList(const edm::ParameterSet&);
+  explicit CalibrationTrackSelectorFromDetIdList(const edm::ParameterSet &);
   ~CalibrationTrackSelectorFromDetIdList() override;
 
 private:
-  void beginRun(edm::Run const& run, const edm::EventSetup&) override;
-  void produce(edm::Event&, const edm::EventSetup&) override;
+  void beginRun(edm::Run const &run, const edm::EventSetup &) override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
   edm::EDGetTokenT<reco::TrackCollection> m_label;
-  TrackCandidate makeCandidate(const reco::Track &tk, std::vector<const TrackingRecHit*>::iterator hitsBegin, std::vector<const TrackingRecHit*>::iterator hitsEnd);
+  TrackCandidate makeCandidate(const reco::Track &tk,
+                               std::vector<const TrackingRecHit *>::iterator hitsBegin,
+                               std::vector<const TrackingRecHit *>::iterator hitsEnd);
 
   std::vector<DetIdSelector> detidsels_;
   bool m_verbose;
 
   edm::ESHandle<TrackerGeometry> theGeometry;
   edm::ESHandle<MagneticField> theMagField;
-
 };
 
-CalibrationTrackSelectorFromDetIdList::CalibrationTrackSelectorFromDetIdList(const edm::ParameterSet& iConfig):  detidsels_() {
+CalibrationTrackSelectorFromDetIdList::CalibrationTrackSelectorFromDetIdList(const edm::ParameterSet &iConfig)
+    : detidsels_() {
+  std::vector<edm::ParameterSet> selconfigs = iConfig.getParameter<std::vector<edm::ParameterSet>>("selections");
 
-  std::vector<edm::ParameterSet> selconfigs = iConfig.getParameter<std::vector<edm::ParameterSet> >("selections");
-   
-  for(std::vector<edm::ParameterSet>::const_iterator selconfig=selconfigs.begin();selconfig!=selconfigs.end();++selconfig) {
+  for (std::vector<edm::ParameterSet>::const_iterator selconfig = selconfigs.begin(); selconfig != selconfigs.end();
+       ++selconfig) {
     DetIdSelector selection(*selconfig);
     detidsels_.push_back(selection);
   }
@@ -70,7 +75,6 @@ CalibrationTrackSelectorFromDetIdList::CalibrationTrackSelectorFromDetIdList(con
   produces<TrackCandidateCollection>();
 }
 
-
 CalibrationTrackSelectorFromDetIdList::~CalibrationTrackSelectorFromDetIdList() {}
 
 //
@@ -78,92 +82,91 @@ CalibrationTrackSelectorFromDetIdList::~CalibrationTrackSelectorFromDetIdList()
 //
 
 // ------------ method called to produce the data  ------------
-void CalibrationTrackSelectorFromDetIdList::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
+void CalibrationTrackSelectorFromDetIdList::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace edm;
   using namespace std;
 
-  edm::Handle<std::vector<reco::Track> > trackCollectionHandle;
+  edm::Handle<std::vector<reco::Track>> trackCollectionHandle;
   iEvent.getByToken(m_label, trackCollectionHandle);
-  auto const & tracks = *trackCollectionHandle;
+  auto const &tracks = *trackCollectionHandle;
 
   auto output = std::make_unique<TrackCandidateCollection>();
-  
+
   // loop on tracks
-  for(auto &trk : tracks){
+  for (auto &trk : tracks) {
+    std::vector<const TrackingRecHit *> hits;
 
-    std::vector<const TrackingRecHit*>  hits; 
-   
     bool saveTrack(false);
 
-    for(auto const& hit : trk.recHits()) {
+    for (auto const &hit : trk.recHits()) {
       DetId detid = hit->geographicalId();
-      
-      for (const auto &detidsel : detidsels_){
-	if(detidsel.isSelected(detid)) {
-	  LogDebug("CalibrationTrackSelectorFromDetIdList") << "Selected by selection " << detid;
-	  saveTrack=true;
-	  break;
-	}
+
+      for (const auto &detidsel : detidsels_) {
+        if (detidsel.isSelected(detid)) {
+          LogDebug("CalibrationTrackSelectorFromDetIdList") << "Selected by selection " << detid;
+          saveTrack = true;
+          break;
+        }
       }
 
       // here there will be the selection
       hits.emplace_back(hit);
-
     }
 
-    if(saveTrack){
-      output->push_back( makeCandidate (trk, hits.begin(), hits.end() ) );
+    if (saveTrack) {
+      output->push_back(makeCandidate(trk, hits.begin(), hits.end()));
     }
-
   }
   iEvent.put(std::move(output));
 }
 
-TrackCandidate
-CalibrationTrackSelectorFromDetIdList::makeCandidate(const reco::Track &tk, std::vector<const TrackingRecHit*>::iterator hitsBegin, std::vector<const TrackingRecHit*>::iterator hitsEnd) {
-  
-  PropagationDirection   pdir = tk.seedDirection();
+TrackCandidate CalibrationTrackSelectorFromDetIdList::makeCandidate(
+    const reco::Track &tk,
+    std::vector<const TrackingRecHit *>::iterator hitsBegin,
+    std::vector<const TrackingRecHit *>::iterator hitsEnd) {
+  PropagationDirection pdir = tk.seedDirection();
   PTrajectoryStateOnDet state;
-  if ( pdir == anyDirection ) throw cms::Exception("UnimplementedFeature") << "Cannot work with tracks that have 'anyDirecton' \n";
+  if (pdir == anyDirection)
+    throw cms::Exception("UnimplementedFeature") << "Cannot work with tracks that have 'anyDirecton' \n";
 
-  if ( (pdir == alongMomentum) == (  (tk.outerPosition()-tk.innerPosition()).Dot(tk.momentum()) >= 0 ) ) {
+  if ((pdir == alongMomentum) == ((tk.outerPosition() - tk.innerPosition()).Dot(tk.momentum()) >= 0)) {
     // use inner state
-    TrajectoryStateOnSurface originalTsosIn(trajectoryStateTransform::innerStateOnSurface(tk, *theGeometry, &*theMagField));
-    state = trajectoryStateTransform::persistentState( originalTsosIn, DetId(tk.innerDetId()) );
+    TrajectoryStateOnSurface originalTsosIn(
+        trajectoryStateTransform::innerStateOnSurface(tk, *theGeometry, &*theMagField));
+    state = trajectoryStateTransform::persistentState(originalTsosIn, DetId(tk.innerDetId()));
   } else {
     // use outer state
-    TrajectoryStateOnSurface originalTsosOut(trajectoryStateTransform::outerStateOnSurface(tk, *theGeometry, &*theMagField));
-    state = trajectoryStateTransform::persistentState( originalTsosOut, DetId(tk.outerDetId()) );
+    TrajectoryStateOnSurface originalTsosOut(
+        trajectoryStateTransform::outerStateOnSurface(tk, *theGeometry, &*theMagField));
+    state = trajectoryStateTransform::persistentState(originalTsosOut, DetId(tk.outerDetId()));
   }
   TrajectorySeed seed(state, TrackCandidate::RecHitContainer(), pdir);
   TrackCandidate::RecHitContainer ownHits;
   ownHits.reserve(hitsEnd - hitsBegin);
-  for ( ; hitsBegin != hitsEnd; ++hitsBegin) {
-    ownHits.push_back( (*hitsBegin)->clone() );
+  for (; hitsBegin != hitsEnd; ++hitsBegin) {
+    ownHits.push_back((*hitsBegin)->clone());
   }
 
   TrackCandidate cand(ownHits, seed, state, tk.seedRef());
-  
+
   return cand;
 }
 
-void CalibrationTrackSelectorFromDetIdList::beginRun(edm::Run const& run, const edm::EventSetup& iSetup) {
+void CalibrationTrackSelectorFromDetIdList::beginRun(edm::Run const &run, const edm::EventSetup &iSetup) {
   iSetup.get<TrackerDigiGeometryRecord>().get(theGeometry);
   iSetup.get<IdealMagneticFieldRecord>().get(theMagField);
 
-  if(m_verbose){
-    for (const auto &detidsel : detidsels_){
+  if (m_verbose) {
+    for (const auto &detidsel : detidsels_) {
       auto theDetIds = theGeometry.product()->detIds();
-      for(const auto &theDet : theDetIds){
-	if(detidsel.isSelected(theDet)) {
-	  LogDebug("CalibrationTrackSelectorFromDetIdList") << "detid: " << theDet.rawId() << " is taken" << std::endl;
-	}
-      } 
+      for (const auto &theDet : theDetIds) {
+        if (detidsel.isSelected(theDet)) {
+          LogDebug("CalibrationTrackSelectorFromDetIdList") << "detid: " << theDet.rawId() << " is taken" << std::endl;
+        }
+      }
     }
   }
-
 }
 
-
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(CalibrationTrackSelectorFromDetIdList);
diff --git a/Calibration/TkAlCaRecoProducers/plugins/CalibrationTrackSelectorModule.cc b/Calibration/TkAlCaRecoProducers/plugins/CalibrationTrackSelectorModule.cc
index 778d844a3ff40..0284415aec6af 100644
--- a/Calibration/TkAlCaRecoProducers/plugins/CalibrationTrackSelectorModule.cc
+++ b/Calibration/TkAlCaRecoProducers/plugins/CalibrationTrackSelectorModule.cc
@@ -1,9 +1,9 @@
 
+#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
 
-//the selectores used to select the tracks
+// the selectores used to select the tracks
 #include "Calibration/TkAlCaRecoProducers/interface/CalibrationTrackSelector.h"
 
 // the following include is necessary to clone all track branches
@@ -13,37 +13,28 @@
 #include "CommonTools/RecoAlgos/interface/TrackSelector.h"
 
 struct SiStripCalTrackConfigSelector {
-
-  typedef std::vector<const reco::Track*> container;
+  typedef std::vector<const reco::Track *> container;
   typedef container::const_iterator const_iterator;
   typedef reco::TrackCollection collection;
 
- SiStripCalTrackConfigSelector( const edm::ParameterSet & cfg, edm::ConsumesCollector && iC ) :
-    theBaseSelector(cfg)
-  {
-    //TODO Wrap the BaseSelector into its own PSet
-    theBaseSwitch =
-      cfg.getParameter<bool>("applyBasicCuts") ||
-      cfg.getParameter<bool>("minHitsPerSubDet") ||
-      cfg.getParameter<bool>("applyNHighestPt") ||
-      cfg.getParameter<bool>("applyMultiplicityFilter");
-
+  SiStripCalTrackConfigSelector(const edm::ParameterSet &cfg, edm::ConsumesCollector &&iC) : theBaseSelector(cfg) {
+    // TODO Wrap the BaseSelector into its own PSet
+    theBaseSwitch = cfg.getParameter<bool>("applyBasicCuts") || cfg.getParameter<bool>("minHitsPerSubDet") ||
+                    cfg.getParameter<bool>("applyNHighestPt") || cfg.getParameter<bool>("applyMultiplicityFilter");
   }
 
   const_iterator begin() const { return theSelectedTracks.begin(); }
   const_iterator end() const { return theSelectedTracks.end(); }
   size_t size() const { return theSelectedTracks.size(); }
 
-  void select( const edm::Handle<reco::TrackCollection> & c,  const edm::Event & evt,
-               const edm::EventSetup &/*dummy*/)
-  {
+  void select(const edm::Handle<reco::TrackCollection> &c, const edm::Event &evt, const edm::EventSetup & /*dummy*/) {
     theSelectedTracks.clear();
-    for( reco::TrackCollection::const_iterator i=c.product()->begin();i!=c.product()->end();++i){
-      theSelectedTracks.push_back(& * i );
+    for (reco::TrackCollection::const_iterator i = c.product()->begin(); i != c.product()->end(); ++i) {
+      theSelectedTracks.push_back(&*i);
     }
     // might add EvetSetup to the select(...) method of the Selectors
-    if(theBaseSwitch)
-      theSelectedTracks=theBaseSelector.select(theSelectedTracks,evt);
+    if (theBaseSwitch)
+      theSelectedTracks = theBaseSelector.select(theSelectedTracks, evt);
   }
 
 private:
@@ -51,9 +42,8 @@ struct SiStripCalTrackConfigSelector {
 
   bool theBaseSwitch;
   CalibrationTrackSelector theBaseSelector;
-
 };
 
-typedef ObjectSelectorStream<SiStripCalTrackConfigSelector>  CalibrationTrackSelectorModule;
+typedef ObjectSelectorStream<SiStripCalTrackConfigSelector> CalibrationTrackSelectorModule;
 
-DEFINE_FWK_MODULE( CalibrationTrackSelectorModule );
+DEFINE_FWK_MODULE(CalibrationTrackSelectorModule);
diff --git a/Calibration/TkAlCaRecoProducers/plugins/PCLMetadataWriter.cc b/Calibration/TkAlCaRecoProducers/plugins/PCLMetadataWriter.cc
index bb5620b9407c6..3d0c782b69b0c 100644
--- a/Calibration/TkAlCaRecoProducers/plugins/PCLMetadataWriter.cc
+++ b/Calibration/TkAlCaRecoProducers/plugins/PCLMetadataWriter.cc
@@ -9,107 +9,95 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
-#include "FWCore/MessageLogger/interface/JobReport.h"
+#include "CondFormats/Common/interface/DropBoxMetadata.h"
+#include "CondFormats/DataRecord/interface/DropBoxMetadataRcd.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "CondFormats/DataRecord/interface/DropBoxMetadataRcd.h"
-#include "CondFormats/Common/interface/DropBoxMetadata.h"
+#include "FWCore/MessageLogger/interface/JobReport.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include <iostream>
 
 using namespace std;
 using namespace edm;
 
-PCLMetadataWriter::PCLMetadataWriter(const edm::ParameterSet& pSet){
-  
+PCLMetadataWriter::PCLMetadataWriter(const edm::ParameterSet &pSet) {
   readFromDB = pSet.getParameter<bool>("readFromDB");
-  
-
-  vector<ParameterSet> recordsToMap = pSet.getParameter<vector<ParameterSet> >("recordsToMap");
-  for(vector<ParameterSet>::const_iterator recordPset = recordsToMap.begin();
-      recordPset != recordsToMap.end();
-      ++recordPset) {
 
-    // record is the key which identifies one set of metadata in DropBoxMetadataRcd
-    // (not necessarily a record in the strict framework sense)
+  vector<ParameterSet> recordsToMap = pSet.getParameter<vector<ParameterSet>>("recordsToMap");
+  for (vector<ParameterSet>::const_iterator recordPset = recordsToMap.begin(); recordPset != recordsToMap.end();
+       ++recordPset) {
+    // record is the key which identifies one set of metadata in
+    // DropBoxMetadataRcd (not necessarily a record in the strict framework
+    // sense)
     string record = (*recordPset).getUntrackedParameter<string>("record");
 
     map<string, string> jrInfo;
-    if(!readFromDB) {
+    if (!readFromDB) {
       vector<string> paramKeys = (*recordPset).getParameterNames();
-      for(vector<string>::const_iterator key = paramKeys.begin();
-	  key != paramKeys.end();
-	  ++key) {
-	jrInfo["Source"] = "AlcaHarvesting";
-	jrInfo["FileClass"] = "ALCA";
-	if(*key != "record") {
-	  jrInfo[*key] = (*recordPset).getUntrackedParameter<string>(*key);
-	}
+      for (vector<string>::const_iterator key = paramKeys.begin(); key != paramKeys.end(); ++key) {
+        jrInfo["Source"] = "AlcaHarvesting";
+        jrInfo["FileClass"] = "ALCA";
+        if (*key != "record") {
+          jrInfo[*key] = (*recordPset).getUntrackedParameter<string>(*key);
+        }
       }
     }
     recordMap[record] = jrInfo;
-
   }
-
 }
 
-PCLMetadataWriter::~PCLMetadataWriter(){}
-
-
-void PCLMetadataWriter::analyze(const edm::Event& event, const edm::EventSetup& eSetup) {}
+PCLMetadataWriter::~PCLMetadataWriter() {}
 
+void PCLMetadataWriter::analyze(const edm::Event &event, const edm::EventSetup &eSetup) {}
 
-void PCLMetadataWriter::beginRun(const edm::Run& run, const edm::EventSetup& eSetup) {} 
-
-void PCLMetadataWriter::endRun(const edm::Run& run, const edm::EventSetup& eSetup) {
+void PCLMetadataWriter::beginRun(const edm::Run &run, const edm::EventSetup &eSetup) {}
 
+void PCLMetadataWriter::endRun(const edm::Run &run, const edm::EventSetup &eSetup) {
   const DropBoxMetadata *metadata = nullptr;
 
-  if(readFromDB) {
+  if (readFromDB) {
     // Read the objects
     edm::ESHandle<DropBoxMetadata> mdPayload;
     eSetup.get<DropBoxMetadataRcd>().get(mdPayload);
-    
+
     metadata = mdPayload.product();
   }
 
   // get the PoolDBOutputService
   Service<cond::service::PoolDBOutputService> poolDbService;
-  if(poolDbService.isAvailable() ) {
+  if (poolDbService.isAvailable()) {
     edm::Service<edm::JobReport> jr;
     if (jr.isAvailable()) {
       // the filename is unique for all records
       string filename = poolDbService->session().connectionString();
 
       // loop over all records
-      for(map<string,  map<string, string> >::const_iterator recordAndMap = recordMap.begin();
-	  recordAndMap != recordMap.end();
-	  ++recordAndMap) {
-
-	string record = (*recordAndMap).first;
-
-	// this is the map of metadata that we write in the JR
-	map<string, string> jrInfo = (*recordAndMap).second;
-	if(readFromDB) {
-	  if(metadata->knowsRecord(record)) {
-	    jrInfo = metadata->getRecordParameters(record).getParameterMap();
-	  }
-	}
-	
-	// name of the the input tag in the metadata for the condUploader metadata
-	// needs to be the same as the tag written out by the harvesting step
-	jrInfo["inputtag"] = poolDbService->tag(record);
-	
-	// actually write in the job report
-	jr->reportAnalysisFile(filename, jrInfo);
-
+      for (map<string, map<string, string>>::const_iterator recordAndMap = recordMap.begin();
+           recordAndMap != recordMap.end();
+           ++recordAndMap) {
+        string record = (*recordAndMap).first;
+
+        // this is the map of metadata that we write in the JR
+        map<string, string> jrInfo = (*recordAndMap).second;
+        if (readFromDB) {
+          if (metadata->knowsRecord(record)) {
+            jrInfo = metadata->getRecordParameters(record).getParameterMap();
+          }
+        }
+
+        // name of the the input tag in the metadata for the condUploader
+        // metadata needs to be the same as the tag written out by the
+        // harvesting step
+        jrInfo["inputtag"] = poolDbService->tag(record);
+
+        // actually write in the job report
+        jr->reportAnalysisFile(filename, jrInfo);
       }
     }
   }
 }
 
-
 #include "FWCore/Framework/interface/MakerMacros.h"
 DEFINE_FWK_MODULE(PCLMetadataWriter);
diff --git a/Calibration/TkAlCaRecoProducers/plugins/PCLMetadataWriter.h b/Calibration/TkAlCaRecoProducers/plugins/PCLMetadataWriter.h
index fa3a6712c2b67..7a123aff0a49e 100644
--- a/Calibration/TkAlCaRecoProducers/plugins/PCLMetadataWriter.h
+++ b/Calibration/TkAlCaRecoProducers/plugins/PCLMetadataWriter.h
@@ -12,34 +12,30 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include <vector>
 #include <string>
+#include <vector>
 
-
-class PCLMetadataWriter  : public edm::EDAnalyzer {
+class PCLMetadataWriter : public edm::EDAnalyzer {
 public:
   /// Constructor
-  PCLMetadataWriter(const edm::ParameterSet&);
+  PCLMetadataWriter(const edm::ParameterSet &);
 
   /// Destructor
   ~PCLMetadataWriter() override;
 
   // Operations
-//   virtual void beginJob            (void);
-//   virtual void endJob              (void);  
-  void analyze             (const edm::Event&          , const edm::EventSetup&) override;
-  void beginRun            (const edm::Run&            , const edm::EventSetup&) override;
-  void endRun              (const edm::Run&            , const edm::EventSetup&) override;
-//   virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const edm::EventSetup&);
-//   virtual void endLuminosityBlock  (const edm::LuminosityBlock&, const edm::EventSetup&);
+  //   virtual void beginJob            (void);
+  //   virtual void endJob              (void);
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void beginRun(const edm::Run &, const edm::EventSetup &) override;
+  void endRun(const edm::Run &, const edm::EventSetup &) override;
+  //   virtual void beginLuminosityBlock(const edm::LuminosityBlock&, const
+  //   edm::EventSetup&); virtual void endLuminosityBlock  (const
+  //   edm::LuminosityBlock&, const edm::EventSetup&);
 
 protected:
-
 private:
   bool readFromDB;
-  std::map<std::string,  std::map<std::string, std::string> > recordMap;
-  
-
+  std::map<std::string, std::map<std::string, std::string>> recordMap;
 };
 #endif
-
diff --git a/Calibration/TkAlCaRecoProducers/src/AlcaBeamSpotManager.cc b/Calibration/TkAlCaRecoProducers/src/AlcaBeamSpotManager.cc
index 728a9a144a78e..9c14de9691c05 100644
--- a/Calibration/TkAlCaRecoProducers/src/AlcaBeamSpotManager.cc
+++ b/Calibration/TkAlCaRecoProducers/src/AlcaBeamSpotManager.cc
@@ -5,418 +5,415 @@
  */
 
 #include "Calibration/TkAlCaRecoProducers/interface/AlcaBeamSpotManager.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
-#include <vector>
-#include <cmath>
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <climits>
+#include <cmath>
+#include <vector>
 
 using namespace edm;
 using namespace reco;
 using namespace std;
 
 //--------------------------------------------------------------------------------------------------
-AlcaBeamSpotManager::AlcaBeamSpotManager(void){
-}
+AlcaBeamSpotManager::AlcaBeamSpotManager(void) {}
 
 //--------------------------------------------------------------------------------------------------
-AlcaBeamSpotManager::AlcaBeamSpotManager(const ParameterSet& iConfig, edm::ConsumesCollector&& iC) :
-  beamSpotOutputBase_(iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<std::string>("BeamSpotOutputBase")),
-  beamSpotModuleName_(iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<std::string>("BeamSpotModuleName")),
-  beamSpotLabel_     (iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<std::string>("BeamSpotLabel")),
-  sigmaZCut_    (iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters").getUntrackedParameter<double>("SigmaZCut"))
-{
+AlcaBeamSpotManager::AlcaBeamSpotManager(const ParameterSet &iConfig, edm::ConsumesCollector &&iC)
+    : beamSpotOutputBase_(iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters")
+                              .getUntrackedParameter<std::string>("BeamSpotOutputBase")),
+      beamSpotModuleName_(iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters")
+                              .getUntrackedParameter<std::string>("BeamSpotModuleName")),
+      beamSpotLabel_(iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters")
+                         .getUntrackedParameter<std::string>("BeamSpotLabel")),
+      sigmaZCut_(iConfig.getParameter<ParameterSet>("AlcaBeamSpotHarvesterParameters")
+                     .getUntrackedParameter<double>("SigmaZCut")) {
   edm::InputTag beamSpotTag_(beamSpotModuleName_, beamSpotLabel_);
-  beamSpotToken_ = iC.consumes<reco::BeamSpot,edm::InLumi>(beamSpotTag_);
-  LogInfo("AlcaBeamSpotManager") 
-    << "Output base: " << beamSpotOutputBase_ 
-    << std::endl;
+  beamSpotToken_ = iC.consumes<reco::BeamSpot, edm::InLumi>(beamSpotTag_);
+  LogInfo("AlcaBeamSpotManager") << "Output base: " << beamSpotOutputBase_ << std::endl;
   reset();
 }
 
 //--------------------------------------------------------------------------------------------------
-AlcaBeamSpotManager::~AlcaBeamSpotManager(void){
-}
+AlcaBeamSpotManager::~AlcaBeamSpotManager(void) {}
 
 //--------------------------------------------------------------------------------------------------
-void AlcaBeamSpotManager::reset(void){
-  beamSpotMap_.clear();
-}
+void AlcaBeamSpotManager::reset(void) { beamSpotMap_.clear(); }
 //--------------------------------------------------------------------------------------------------
-void AlcaBeamSpotManager::readLumi(const LuminosityBlock& iLumi){
-
+void AlcaBeamSpotManager::readLumi(const LuminosityBlock &iLumi) {
   Handle<BeamSpot> beamSpotHandle;
   iLumi.getByToken(beamSpotToken_, beamSpotHandle);
 
-  if(beamSpotHandle.isValid()) { // check the product
-    std::pair<edm::Timestamp,reco::BeamSpot> time_bs (iLumi.beginTime(), *beamSpotHandle);
+  if (beamSpotHandle.isValid()) {  // check the product
+    std::pair<edm::Timestamp, reco::BeamSpot> time_bs(iLumi.beginTime(), *beamSpotHandle);
     beamSpotMap_[iLumi.luminosityBlock()] = time_bs;
-    const BeamSpot* aBeamSpot =  &beamSpotMap_[iLumi.luminosityBlock()].second;
+    const BeamSpot *aBeamSpot = &beamSpotMap_[iLumi.luminosityBlock()].second;
     aBeamSpot = beamSpotHandle.product();
-    LogInfo("AlcaBeamSpotManager")
-      << "Lumi: " << iLumi.luminosityBlock() << std::endl;
-    LogInfo("AlcaBeamSpotManager")
-      << *aBeamSpot << std::endl;
-  }
-  else {
-    LogInfo("AlcaBeamSpotManager")
-        << "Lumi: " << iLumi.luminosityBlock() << std::endl;
-    LogInfo("AlcaBeamSpotManager")
-        << "   BS is not valid!" << std::endl;
+    LogInfo("AlcaBeamSpotManager") << "Lumi: " << iLumi.luminosityBlock() << std::endl;
+    LogInfo("AlcaBeamSpotManager") << *aBeamSpot << std::endl;
+  } else {
+    LogInfo("AlcaBeamSpotManager") << "Lumi: " << iLumi.luminosityBlock() << std::endl;
+    LogInfo("AlcaBeamSpotManager") << "   BS is not valid!" << std::endl;
   }
-
 }
 
 //--------------------------------------------------------------------------------------------------
-void AlcaBeamSpotManager::createWeightedPayloads(void){
+void AlcaBeamSpotManager::createWeightedPayloads(void) {
   vector<bsMap_iterator> listToErase;
-  for(bsMap_iterator it=beamSpotMap_.begin(); it!=beamSpotMap_.end();it++){
-    if(it->second.second.type() != BeamSpot::Tracker || it->second.second.sigmaZ()<sigmaZCut_ ) {
+  for (bsMap_iterator it = beamSpotMap_.begin(); it != beamSpotMap_.end(); it++) {
+    if (it->second.second.type() != BeamSpot::Tracker || it->second.second.sigmaZ() < sigmaZCut_) {
       listToErase.push_back(it);
     }
   }
-  for(vector<bsMap_iterator>::iterator it=listToErase.begin(); it !=listToErase.end(); it++){
+  for (vector<bsMap_iterator>::iterator it = listToErase.begin(); it != listToErase.end(); it++) {
     beamSpotMap_.erase(*it);
   }
-  if(beamSpotMap_.size() <= 1){
+  if (beamSpotMap_.size() <= 1) {
     return;
   }
-  //Return only if lumibased since the collapsing alghorithm requires the next and next to next lumi sections
-  else if(beamSpotMap_.size() == 2 && beamSpotOutputBase_ == "lumibased"){
+  // Return only if lumibased since the collapsing alghorithm requires the next
+  // and next to next lumi sections
+  else if (beamSpotMap_.size() == 2 && beamSpotOutputBase_ == "lumibased") {
     return;
   }
-  if(beamSpotOutputBase_ == "lumibased"){
-//    bsMap_iterator referenceBS = beamSpotMap_.begin();
-    bsMap_iterator firstBS     = beamSpotMap_.begin();
-//    bsMap_iterator lastBS      = beamSpotMap_.begin();
-    bsMap_iterator currentBS   = beamSpotMap_.begin();
-    bsMap_iterator nextBS      = ++beamSpotMap_.begin();
-    bsMap_iterator nextNextBS  = ++(++(beamSpotMap_.begin()));
-    
+  if (beamSpotOutputBase_ == "lumibased") {
+    //    bsMap_iterator referenceBS = beamSpotMap_.begin();
+    bsMap_iterator firstBS = beamSpotMap_.begin();
+    //    bsMap_iterator lastBS      = beamSpotMap_.begin();
+    bsMap_iterator currentBS = beamSpotMap_.begin();
+    bsMap_iterator nextBS = ++beamSpotMap_.begin();
+    bsMap_iterator nextNextBS = ++(++(beamSpotMap_.begin()));
+
     reco::BeamSpot currentBSObj;
     reco::BeamSpot nextBSObj;
 
-    map<LuminosityBlockNumber_t,std::pair<edm::Timestamp, BeamSpot>> tmpBeamSpotMap_;
+    map<LuminosityBlockNumber_t, std::pair<edm::Timestamp, BeamSpot>> tmpBeamSpotMap_;
     bool docreate = true;
-    bool endOfRun = false;//Added
-    bool docheck = true;//Added
+    bool endOfRun = false;  // Added
+    bool docheck = true;    // Added
     bool foundShift = false;
-    long countlumi = 0;//Added
-    string tmprun = "";//Added
-    long maxNlumis = 20;//Added
-//    if weighted:
-//        maxNlumis = 999999999
-
+    long countlumi = 0;   // Added
+    string tmprun = "";   // Added
+    long maxNlumis = 20;  // Added
+    //    if weighted:
+    //        maxNlumis = 999999999
 
     unsigned int iteration = 0;
-    //while(nextNextBS!=beamSpotMap_.end()){
-    while(nextBS!=beamSpotMap_.end()){
-      LogInfo("AlcaBeamSpotManager")
-        << "Iteration: " << iteration << " size: " << beamSpotMap_.size() << "\n"
-        << "Lumi: " << currentBS->first  << "\n" 
-        << currentBS->second.second
-        << "\n" << nextBS->first     << "\n" << nextBS->second.second
-        << endl;  
-      if (nextNextBS!=beamSpotMap_.end())
-	LogInfo("AlcaBeamSpotManager")
-	  << nextNextBS->first << "\n" << nextNextBS->second.second
-	  << endl;
-
-
-      if(docreate){																																    
-	firstBS = currentBS;																												    
-        docreate = false;//Added																															    
+    // while(nextNextBS!=beamSpotMap_.end()){
+    while (nextBS != beamSpotMap_.end()) {
+      LogInfo("AlcaBeamSpotManager") << "Iteration: " << iteration << " size: " << beamSpotMap_.size() << "\n"
+                                     << "Lumi: " << currentBS->first << "\n"
+                                     << currentBS->second.second << "\n"
+                                     << nextBS->first << "\n"
+                                     << nextBS->second.second << endl;
+      if (nextNextBS != beamSpotMap_.end())
+        LogInfo("AlcaBeamSpotManager") << nextNextBS->first << "\n" << nextNextBS->second.second << endl;
+
+      if (docreate) {
+        firstBS = currentBS;
+        docreate = false;  // Added
       }
-      //if(iteration >= beamSpotMap_.size()-3){
-      if(iteration >= beamSpotMap_.size()-2){
-        LogInfo("AlcaBeamSpotManager")
-	  << "Reached lumi " << currentBS->first
-	  << " now close payload because end of data has been reached.";																										    
-          docreate = true;
-	  endOfRun = true;																															    
-      }    
-      // check we run over the same run 																													    
-//      if (ibeam->first.Run() != inextbeam->first.Run()){																											    
-//        LogInfo("AlcaBeamSpotManager")																													    
-//          << "close payload because end of run.";																												    
-//        docreate = true;																															    
-//      }																																	    
+      // if(iteration >= beamSpotMap_.size()-3){
+      if (iteration >= beamSpotMap_.size() - 2) {
+        LogInfo("AlcaBeamSpotManager") << "Reached lumi " << currentBS->first
+                                       << " now close payload because end of data has been reached.";
+        docreate = true;
+        endOfRun = true;
+      }
+      // check we run over the same run
+      //      if (ibeam->first.Run() != inextbeam->first.Run()){
+      //        LogInfo("AlcaBeamSpotManager")
+      //          << "close payload because end of run.";
+      //        docreate = true;
+      //      }
       // check maximum lumi counts
-      if (countlumi == maxNlumis -1){																														    
-        LogInfo("AlcaBeamSpotManager")																														    
-          << "close payload because maximum lumi sections accumulated within run ";																								    
-        docreate = true;																															    
-        countlumi = 0;																																    
+      if (countlumi == maxNlumis - 1) {
+        LogInfo("AlcaBeamSpotManager") << "close payload because maximum lumi "
+                                          "sections accumulated within run ";
+        docreate = true;
+        countlumi = 0;
       }
-//      if weighted:																																    
-//          docheck = False																															    
-      // check offsets																																    
-      if(docheck){																																    
-	foundShift = false;
-	LogInfo("AlcaBeamSpotManager")																											  		    
-          << "Checking checking!" << endl;
-	float limit = 0;																														  	    
-        pair<float,float> adelta1;																												  		    
-        pair<float,float> adelta2;																												  		    
-        pair<float,float> adelta;																												  
-        pair<float,float> adelta1dxdz;
-        pair<float,float> adelta2dxdz;
-        pair<float,float> adelta1dydz;
-        pair<float,float> adelta2dydz;
-        pair<float,float> adelta1widthX;
-        pair<float,float> adelta2widthX;
-        pair<float,float> adelta1widthY;
-        pair<float,float> adelta2widthY;
-        pair<float,float> adelta1z0;
-        pair<float,float> adelta1sigmaZ;
+      //      if weighted:
+      //          docheck = False
+      // check offsets
+      if (docheck) {
+        foundShift = false;
+        LogInfo("AlcaBeamSpotManager") << "Checking checking!" << endl;
+        float limit = 0;
+        pair<float, float> adelta1;
+        pair<float, float> adelta2;
+        pair<float, float> adelta;
+        pair<float, float> adelta1dxdz;
+        pair<float, float> adelta2dxdz;
+        pair<float, float> adelta1dydz;
+        pair<float, float> adelta2dydz;
+        pair<float, float> adelta1widthX;
+        pair<float, float> adelta2widthX;
+        pair<float, float> adelta1widthY;
+        pair<float, float> adelta2widthY;
+        pair<float, float> adelta1z0;
+        pair<float, float> adelta1sigmaZ;
 
         // define minimum limit
         float min_limit = 0.0025;
-        
+
         // limit for x and y
-        limit = currentBS->second.second.BeamWidthX()/2.;
-        if(limit < min_limit){
-	  limit = min_limit;
+        limit = currentBS->second.second.BeamWidthX() / 2.;
+        if (limit < min_limit) {
+          limit = min_limit;
+        }
+
+        currentBSObj = currentBS->second.second;
+        nextBSObj = nextBS->second.second;
+
+        // check movements in X
+        adelta1 = delta(currentBSObj.x0(), currentBSObj.x0Error(), nextBSObj.x0(), nextBSObj.x0Error());
+        adelta2 = pair<float, float>(0., 1.e9);
+        if (nextNextBS->second.second.type() != -1) {
+          adelta2 = delta(nextBS->second.second.x0(),
+                          nextBSObj.x0Error(),
+                          nextNextBS->second.second.x0(),
+                          nextNextBS->second.second.x0Error());
+        }
+        bool deltaX = (deltaSig(adelta1.first, adelta1.second) > 3.5 && adelta1.first >= limit) ? true : false;
+        if (iteration < beamSpotMap_.size() - 2) {
+          if (!deltaX && adelta1.first * adelta2.first > 0. && fabs(adelta1.first + adelta2.first) >= limit) {
+            LogInfo("AlcaBeamSpotManager")
+                << " positive, " << (adelta1.first + adelta2.first) << " limit=" << limit << endl;
+            deltaX = true;
+          } else if (deltaX && adelta1.first * adelta2.first < 0 && adelta2.first != 0 &&
+                     fabs(adelta1.first / adelta2.first) > 0.33 && fabs(adelta1.first / adelta2.first) < 3) {
+            LogInfo("AlcaBeamSpotManager") << " negative, " << adelta1.first / adelta2.first << endl;
+            deltaX = false;
+          }
         }
-	
-	currentBSObj = currentBS->second.second;
-	nextBSObj = nextBS->second.second;
-	
-	//check movements in X																														  		    
-	adelta1 = delta(currentBSObj.x0(), currentBSObj.x0Error(), nextBSObj.x0(), nextBSObj.x0Error());
-        adelta2 = pair<float,float>(0.,1.e9);																													    
-        if (nextNextBS->second.second.type() != -1){
-            adelta2 = delta(nextBS->second.second.x0(), nextBSObj.x0Error(), nextNextBS->second.second.x0(), nextNextBS->second.second.x0Error());
-        }																															  		    
-        bool deltaX = (deltaSig(adelta1.first,adelta1.second) > 3.5 && adelta1.first >= limit)?true:false;																			  		    
-        if(iteration < beamSpotMap_.size()-2){  																										  		    
-            if( !deltaX && adelta1.first*adelta2.first > 0. &&  fabs(adelta1.first+adelta2.first) >= limit){																			  		    
-              LogInfo("AlcaBeamSpotManager")																											  		    
-        	<< " positive, " << (adelta1.first+adelta2.first) << " limit=" << limit << endl;																				  		    
-        	deltaX = true;  																												  		    
-            }
-            else if( deltaX && adelta1.first*adelta2.first < 0 && adelta2.first != 0 && fabs(adelta1.first/adelta2.first) > 0.33 && fabs(adelta1.first/adelta2.first) < 3){ 													  		    
-              LogInfo("AlcaBeamSpotManager")																											  		    
-        	<< " negative, " << adelta1.first/adelta2.first << endl;																							  		    
-        	deltaX = false; 																												  		    
-            }
-        }																															  
 
-        //calculating all deltas																														  		    
+        // calculating all deltas
         adelta1dxdz = delta(currentBSObj.dxdz(), currentBSObj.dxdzError(), nextBSObj.dxdz(), nextBSObj.dxdzError());
-        adelta2dxdz = pair<float,float>(0.,1.e9);
+        adelta2dxdz = pair<float, float>(0., 1.e9);
         adelta1dydz = delta(currentBSObj.dydz(), currentBSObj.dydzError(), nextBSObj.dydz(), nextBSObj.dydzError());
-        adelta2dydz = pair<float,float>(0.,1.e9);
-        adelta1widthX = delta(currentBSObj.BeamWidthX(), currentBSObj.BeamWidthXError(), nextBSObj.BeamWidthX(), nextBSObj.BeamWidthXError());
-        adelta2widthX = pair<float,float>(0.,1.e9);
-        adelta1widthY = delta(currentBSObj.BeamWidthY(), currentBSObj.BeamWidthYError(), nextBSObj.BeamWidthY(), nextBSObj.BeamWidthYError());
-        adelta2widthY = pair<float,float>(0.,1.e9);
-	adelta1z0 = delta(currentBSObj.z0(), currentBSObj.z0Error(), nextBSObj.z0(), nextBSObj.z0Error());
-	adelta1sigmaZ = delta(currentBSObj.sigmaZ(), currentBSObj.sigmaZ0Error(), nextBSObj.sigmaZ(), nextBSObj.sigmaZ0Error());
-	
-	//check movements in Y
+        adelta2dydz = pair<float, float>(0., 1.e9);
+        adelta1widthX = delta(currentBSObj.BeamWidthX(),
+                              currentBSObj.BeamWidthXError(),
+                              nextBSObj.BeamWidthX(),
+                              nextBSObj.BeamWidthXError());
+        adelta2widthX = pair<float, float>(0., 1.e9);
+        adelta1widthY = delta(currentBSObj.BeamWidthY(),
+                              currentBSObj.BeamWidthYError(),
+                              nextBSObj.BeamWidthY(),
+                              nextBSObj.BeamWidthYError());
+        adelta2widthY = pair<float, float>(0., 1.e9);
+        adelta1z0 = delta(currentBSObj.z0(), currentBSObj.z0Error(), nextBSObj.z0(), nextBSObj.z0Error());
+        adelta1sigmaZ =
+            delta(currentBSObj.sigmaZ(), currentBSObj.sigmaZ0Error(), nextBSObj.sigmaZ(), nextBSObj.sigmaZ0Error());
+
+        // check movements in Y
         adelta1 = delta(currentBSObj.y0(), currentBSObj.y0Error(), nextBSObj.y0(), nextBSObj.y0Error());
-        adelta2 = pair<float,float>(0.,1.e9);
-        if( nextNextBS->second.second.type() != BeamSpot::Unknown){
-          adelta2 = delta(nextBSObj.y0(), nextBSObj.y0Error(), nextNextBS->second.second.y0(), nextNextBS->second.second.y0Error());
-          adelta2dxdz = delta(nextBSObj.dxdz(), nextBSObj.dxdzError(), nextNextBS->second.second.dxdz(), nextNextBS->second.second.dxdzError());
-          adelta2dydz = delta(nextBSObj.dydz(), nextBSObj.dydzError(), nextNextBS->second.second.dydz(), nextNextBS->second.second.dydzError());
-          adelta2widthX = delta(nextBSObj.BeamWidthX(), nextBSObj.BeamWidthXError(), nextNextBS->second.second.BeamWidthX(), nextNextBS->second.second.BeamWidthXError());
-          adelta2widthY = delta(nextBSObj.BeamWidthY(), nextBSObj.BeamWidthYError(), nextNextBS->second.second.BeamWidthY(), nextNextBS->second.second.BeamWidthYError());
-
+        adelta2 = pair<float, float>(0., 1.e9);
+        if (nextNextBS->second.second.type() != BeamSpot::Unknown) {
+          adelta2 = delta(
+              nextBSObj.y0(), nextBSObj.y0Error(), nextNextBS->second.second.y0(), nextNextBS->second.second.y0Error());
+          adelta2dxdz = delta(nextBSObj.dxdz(),
+                              nextBSObj.dxdzError(),
+                              nextNextBS->second.second.dxdz(),
+                              nextNextBS->second.second.dxdzError());
+          adelta2dydz = delta(nextBSObj.dydz(),
+                              nextBSObj.dydzError(),
+                              nextNextBS->second.second.dydz(),
+                              nextNextBS->second.second.dydzError());
+          adelta2widthX = delta(nextBSObj.BeamWidthX(),
+                                nextBSObj.BeamWidthXError(),
+                                nextNextBS->second.second.BeamWidthX(),
+                                nextNextBS->second.second.BeamWidthXError());
+          adelta2widthY = delta(nextBSObj.BeamWidthY(),
+                                nextBSObj.BeamWidthYError(),
+                                nextNextBS->second.second.BeamWidthY(),
+                                nextNextBS->second.second.BeamWidthYError());
         }
-        bool deltaY = (deltaSig(adelta1.first,adelta1.second) > 3.5 && adelta1.first >= limit)?true:false;
-        if(iteration < beamSpotMap_.size()-2){
-          if( !deltaY && adelta1.first*adelta2.first > 0. &&  fabs(adelta1.first+adelta2.first) >= limit){
+        bool deltaY = (deltaSig(adelta1.first, adelta1.second) > 3.5 && adelta1.first >= limit) ? true : false;
+        if (iteration < beamSpotMap_.size() - 2) {
+          if (!deltaY && adelta1.first * adelta2.first > 0. && fabs(adelta1.first + adelta2.first) >= limit) {
             LogInfo("AlcaBeamSpotManager")
-              << " positive, " << (adelta1.first+adelta2.first) << " limit=" << limit << endl; 
-              deltaY = true;
-          }
-          else if( deltaY && adelta1.first*adelta2.first < 0 && adelta2.first != 0 && fabs(adelta1.first/adelta2.first) > 0.33 && fabs(adelta1.first/adelta2.first) < 3){  
-            LogInfo("AlcaBeamSpotManager")  
-              << " negative, " << adelta1.first/adelta2.first << endl;    
-              deltaY = false;	  
+                << " positive, " << (adelta1.first + adelta2.first) << " limit=" << limit << endl;
+            deltaY = true;
+          } else if (deltaY && adelta1.first * adelta2.first < 0 && adelta2.first != 0 &&
+                     fabs(adelta1.first / adelta2.first) > 0.33 && fabs(adelta1.first / adelta2.first) < 3) {
+            LogInfo("AlcaBeamSpotManager") << " negative, " << adelta1.first / adelta2.first << endl;
+            deltaY = false;
           }
-	}
+        }
 
-	limit = currentBSObj.sigmaZ()/2.;    
-	bool deltaZ = (deltaSig(adelta1z0.first,adelta1z0.second) > 3.5 && fabs(adelta1z0.first) >= limit)?true:false;      
-	adelta = delta(currentBSObj.sigmaZ(), currentBSObj.sigmaZ0Error(), nextBSObj.sigmaZ(), nextBSObj.sigmaZ0Error());     
-	bool deltasigmaZ = (deltaSig(adelta.first,adelta.second) > 5.0)?true:false;    
-	bool deltadxdz = false;
+        limit = currentBSObj.sigmaZ() / 2.;
+        bool deltaZ =
+            (deltaSig(adelta1z0.first, adelta1z0.second) > 3.5 && fabs(adelta1z0.first) >= limit) ? true : false;
+        adelta =
+            delta(currentBSObj.sigmaZ(), currentBSObj.sigmaZ0Error(), nextBSObj.sigmaZ(), nextBSObj.sigmaZ0Error());
+        bool deltasigmaZ = (deltaSig(adelta.first, adelta.second) > 5.0) ? true : false;
+        bool deltadxdz = false;
         bool deltadydz = false;
         bool deltawidthX = false;
         bool deltawidthY = false;
 
-	if(iteration < beamSpotMap_.size()-2){                                                                                                                                                              
-
+        if (iteration < beamSpotMap_.size() - 2) {
           adelta = delta(currentBSObj.dxdz(), currentBSObj.dxdzError(), nextBSObj.dxdz(), nextBSObj.dxdzError());
-          deltadxdz   = (deltaSig(adelta.first,adelta.second) > 5.0)?true:false;
-          if(deltadxdz && (adelta1dxdz.first*adelta2dxdz.first) < 0 && adelta2dxdz.first != 0 && fabs(adelta1dxdz.first/adelta2dxdz.first) > 0.33 && fabs(adelta1dxdz.first/adelta2dxdz.first) < 3){
+          deltadxdz = (deltaSig(adelta.first, adelta.second) > 5.0) ? true : false;
+          if (deltadxdz && (adelta1dxdz.first * adelta2dxdz.first) < 0 && adelta2dxdz.first != 0 &&
+              fabs(adelta1dxdz.first / adelta2dxdz.first) > 0.33 && fabs(adelta1dxdz.first / adelta2dxdz.first) < 3) {
             deltadxdz = false;
-	  }
+          }
 
           adelta = delta(currentBSObj.dydz(), currentBSObj.dydzError(), nextBSObj.dydz(), nextBSObj.dydzError());
-          deltadydz   = (deltaSig(adelta.first,adelta.second) > 5.0)?true:false;
-          if(deltadydz && (adelta1dydz.first*adelta2dydz.first) < 0 && adelta2dydz.first != 0 && fabs(adelta1dydz.first/adelta2dydz.first) > 0.33 && fabs(adelta1dydz.first/adelta2dydz.first) < 3){
+          deltadydz = (deltaSig(adelta.first, adelta.second) > 5.0) ? true : false;
+          if (deltadydz && (adelta1dydz.first * adelta2dydz.first) < 0 && adelta2dydz.first != 0 &&
+              fabs(adelta1dydz.first / adelta2dydz.first) > 0.33 && fabs(adelta1dydz.first / adelta2dydz.first) < 3) {
             deltadydz = false;
-	  }
+          }
 
-          adelta = delta(currentBSObj.BeamWidthX(), currentBSObj.BeamWidthXError(), nextBSObj.BeamWidthX(), nextBSObj.BeamWidthXError());
-          deltawidthX = (deltaSig(adelta.first,adelta.second) > 5.0)?true:false;
-          if(deltawidthX && (adelta1widthX.first*adelta2widthX.first) < 0 && adelta2widthX.first != 0 && fabs(adelta1widthX.first/adelta2widthX.first) > 0.33 && fabs(adelta1widthX.first/adelta2widthX.first) < 3){
+          adelta = delta(currentBSObj.BeamWidthX(),
+                         currentBSObj.BeamWidthXError(),
+                         nextBSObj.BeamWidthX(),
+                         nextBSObj.BeamWidthXError());
+          deltawidthX = (deltaSig(adelta.first, adelta.second) > 5.0) ? true : false;
+          if (deltawidthX && (adelta1widthX.first * adelta2widthX.first) < 0 && adelta2widthX.first != 0 &&
+              fabs(adelta1widthX.first / adelta2widthX.first) > 0.33 &&
+              fabs(adelta1widthX.first / adelta2widthX.first) < 3) {
             deltawidthX = false;
-	  }
+          }
 
-          adelta = delta(currentBSObj.BeamWidthY(), currentBSObj.BeamWidthYError(), nextBSObj.BeamWidthY(), nextBSObj.BeamWidthYError());
-          deltawidthY = (deltaSig(adelta.first,adelta.second) > 5.0)?true:false;
-          if(deltawidthY && (adelta1widthY.first*adelta2widthY.first) < 0 && adelta2widthY.first != 0 && fabs(adelta1widthY.first/adelta2widthY.first) > 0.33 && fabs(adelta1widthY.first/adelta2widthY.first) < 3){
+          adelta = delta(currentBSObj.BeamWidthY(),
+                         currentBSObj.BeamWidthYError(),
+                         nextBSObj.BeamWidthY(),
+                         nextBSObj.BeamWidthYError());
+          deltawidthY = (deltaSig(adelta.first, adelta.second) > 5.0) ? true : false;
+          if (deltawidthY && (adelta1widthY.first * adelta2widthY.first) < 0 && adelta2widthY.first != 0 &&
+              fabs(adelta1widthY.first / adelta2widthY.first) > 0.33 &&
+              fabs(adelta1widthY.first / adelta2widthY.first) < 3) {
             deltawidthY = false;
-	  }
-
-	}
-	if (deltaX || deltaY || deltaZ || deltasigmaZ || deltadxdz || deltadydz || deltawidthX || deltawidthY){						    														
-	  docreate = true;
-	  foundShift = true;
-	  LogInfo("AlcaBeamSpotManager")															    														
-	    << "close payload because of movement in" 													    														
-	    <<  " X=" << deltaX 
-	    << ", Y=" << deltaY 
-	    << ", Z=" << deltaZ 
-	    << ", sigmaZ=" << deltasigmaZ 
-	    << ", dxdz=" << deltadxdz 
-	    << ", dydz=" << deltadydz
-	    << ", widthX=" << deltawidthX
-	    << ", widthY=" << deltawidthY
-	    << endl;  
-	}
-
+          }
+        }
+        if (deltaX || deltaY || deltaZ || deltasigmaZ || deltadxdz || deltadydz || deltawidthX || deltawidthY) {
+          docreate = true;
+          foundShift = true;
+          LogInfo("AlcaBeamSpotManager") << "close payload because of movement in"
+                                         << " X=" << deltaX << ", Y=" << deltaY << ", Z=" << deltaZ
+                                         << ", sigmaZ=" << deltasigmaZ << ", dxdz=" << deltadxdz
+                                         << ", dydz=" << deltadydz << ", widthX=" << deltawidthX
+                                         << ", widthY=" << deltawidthY << endl;
+        }
       }
-      if(docreate){
-        std::pair<edm::Timestamp,reco::BeamSpot> thepair;
-	if(foundShift){
-	  thepair = std::make_pair( currentBS->second.first, weight(firstBS,nextBS));
-	  tmpBeamSpotMap_[firstBS->first] = thepair;
-	  if (endOfRun){ 
-	    //if we're here, then we need to found a shift in the last LS
-	    //We already created a new IOV, now create one just for the last LS
-  	    thepair = std::make_pair( nextBS->second.first, nextBSObj);
-      	    tmpBeamSpotMap_[nextBS->first] = thepair;
-	  }
-	}
-	else if(!foundShift && !endOfRun){ //maxLS reached
-          thepair = std::make_pair( currentBS->second.first, weight(firstBS,nextBS));
+      if (docreate) {
+        std::pair<edm::Timestamp, reco::BeamSpot> thepair;
+        if (foundShift) {
+          thepair = std::make_pair(currentBS->second.first, weight(firstBS, nextBS));
+          tmpBeamSpotMap_[firstBS->first] = thepair;
+          if (endOfRun) {
+            // if we're here, then we need to found a shift in the last LS
+            // We already created a new IOV, now create one just for the last LS
+            thepair = std::make_pair(nextBS->second.first, nextBSObj);
+            tmpBeamSpotMap_[nextBS->first] = thepair;
+          }
+        } else if (!foundShift && !endOfRun) {  // maxLS reached
+          thepair = std::make_pair(currentBS->second.first, weight(firstBS, nextBS));
           tmpBeamSpotMap_[firstBS->first] = thepair;
-	}
-	else { // end of run with no shift detectred in last LS
-          thepair = std::make_pair( currentBS->second.first, weight(firstBS,beamSpotMap_.end()));
+        } else {  // end of run with no shift detectred in last LS
+          thepair = std::make_pair(currentBS->second.first, weight(firstBS, beamSpotMap_.end()));
           tmpBeamSpotMap_[firstBS->first] = thepair;
-	}
-	firstBS = nextBS;
-          countlumi = 0;
-	  																															    
+        }
+        firstBS = nextBS;
+        countlumi = 0;
       }
-      //tmprun = currentBS->second.Run																														    
-      // increase the counter by one only if the IOV hasn't been closed																														    
-      if (!docreate) ++countlumi;																																    
-      
+      // tmprun = currentBS->second.Run
+      // increase the counter by one only if the IOV hasn't been closed
+      if (!docreate)
+        ++countlumi;
+
       currentBS = nextBS;
-      nextBS	= nextNextBS;
+      nextBS = nextNextBS;
       nextNextBS++;
       ++iteration;
     }
     beamSpotMap_.clear();
     beamSpotMap_ = tmpBeamSpotMap_;
-  }
-  else if(beamSpotOutputBase_ == "runbased"){
+  } else if (beamSpotOutputBase_ == "runbased") {
     LuminosityBlockNumber_t firstLumi = beamSpotMap_.begin()->first;
-    std::pair<edm::Timestamp,reco::BeamSpot> thepair (beamSpotMap_.begin()->second.first, weight(beamSpotMap_.begin(),beamSpotMap_.end()));
+    std::pair<edm::Timestamp, reco::BeamSpot> thepair(beamSpotMap_.begin()->second.first,
+                                                      weight(beamSpotMap_.begin(), beamSpotMap_.end()));
     beamSpotMap_.clear();
     beamSpotMap_[firstLumi] = thepair;
-  }
-  else{
-    LogInfo("AlcaBeamSpotManager")
-      << "Unrecognized BeamSpotOutputBase parameter: " << beamSpotOutputBase_
-      << endl;    
+  } else {
+    LogInfo("AlcaBeamSpotManager") << "Unrecognized BeamSpotOutputBase parameter: " << beamSpotOutputBase_ << endl;
   }
 }
 
 //--------------------------------------------------------------------------------------------------
-BeamSpot AlcaBeamSpotManager::weight(const bsMap_iterator& begin,
-                                     const bsMap_iterator& end){
-  double x,xError = 0;
-  double y,yError = 0;
-  double z,zError = 0;
-  double sigmaZ,sigmaZError = 0;
-  double dxdz,dxdzError = 0;
-  double dydz,dydzError = 0;
-  double widthX,widthXError = 0;
-  double widthY,widthYError = 0;
-  LogInfo("AlcaBeamSpotManager")
-    << "Weighted BeamSpot will span lumi " 
-    << begin->first << " to " << end->first
-    << endl;
+BeamSpot AlcaBeamSpotManager::weight(const bsMap_iterator &begin, const bsMap_iterator &end) {
+  double x, xError = 0;
+  double y, yError = 0;
+  double z, zError = 0;
+  double sigmaZ, sigmaZError = 0;
+  double dxdz, dxdzError = 0;
+  double dydz, dydzError = 0;
+  double widthX, widthXError = 0;
+  double widthY, widthYError = 0;
+  LogInfo("AlcaBeamSpotManager") << "Weighted BeamSpot will span lumi " << begin->first << " to " << end->first << endl;
 
   BeamSpot::BeamType type = BeamSpot::Unknown;
-  for(bsMap_iterator it=begin; it!=end; it++){
-    weight(x     , xError     , it->second.second.x0()        , it->second.second.x0Error());
-    weight(y     , yError     , it->second.second.y0()        , it->second.second.y0Error());
-    weight(z     , zError     , it->second.second.z0()        , it->second.second.z0Error());
-    weight(sigmaZ, sigmaZError, it->second.second.sigmaZ()    , it->second.second.sigmaZ0Error());
-    weight(dxdz  , dxdzError  , it->second.second.dxdz()      , it->second.second.dxdzError());
-    weight(dydz  , dydzError  , it->second.second.dydz()      , it->second.second.dydzError());
+  for (bsMap_iterator it = begin; it != end; it++) {
+    weight(x, xError, it->second.second.x0(), it->second.second.x0Error());
+    weight(y, yError, it->second.second.y0(), it->second.second.y0Error());
+    weight(z, zError, it->second.second.z0(), it->second.second.z0Error());
+    weight(sigmaZ, sigmaZError, it->second.second.sigmaZ(), it->second.second.sigmaZ0Error());
+    weight(dxdz, dxdzError, it->second.second.dxdz(), it->second.second.dxdzError());
+    weight(dydz, dydzError, it->second.second.dydz(), it->second.second.dydzError());
     weight(widthX, widthXError, it->second.second.BeamWidthX(), it->second.second.BeamWidthXError());
     weight(widthY, widthYError, it->second.second.BeamWidthY(), it->second.second.BeamWidthYError());
-    if(it->second.second.type() == BeamSpot::Tracker){
+    if (it->second.second.type() == BeamSpot::Tracker) {
       type = BeamSpot::Tracker;
     }
   }
-  BeamSpot::Point bsPosition(x,y,z);
+  BeamSpot::Point bsPosition(x, y, z);
   BeamSpot::CovarianceMatrix error;
-  error(0,0) = xError*xError;
-  error(1,1) = yError*yError;
-  error(2,2) = zError*zError;
-  error(3,3) = sigmaZError*sigmaZError;
-  error(4,4) = dxdzError*dxdzError;
-  error(5,5) = dydzError*dydzError;
-  error(6,6) = widthXError*widthXError;
-  BeamSpot weightedBeamSpot(bsPosition,sigmaZ,dxdz,dydz,widthX,error,type);
+  error(0, 0) = xError * xError;
+  error(1, 1) = yError * yError;
+  error(2, 2) = zError * zError;
+  error(3, 3) = sigmaZError * sigmaZError;
+  error(4, 4) = dxdzError * dxdzError;
+  error(5, 5) = dydzError * dydzError;
+  error(6, 6) = widthXError * widthXError;
+  BeamSpot weightedBeamSpot(bsPosition, sigmaZ, dxdz, dydz, widthX, error, type);
   weightedBeamSpot.setBeamWidthY(widthY);
-  LogInfo("AlcaBeamSpotManager")
-    << "Weighted BeamSpot will be:" <<'\n'
-    << weightedBeamSpot
-    << endl;
+  LogInfo("AlcaBeamSpotManager") << "Weighted BeamSpot will be:" << '\n' << weightedBeamSpot << endl;
   return weightedBeamSpot;
 }
 
 //--------------------------------------------------------------------------------------------------
-void AlcaBeamSpotManager::weight(double& mean,double& meanError,const double& val,const double& valError){
-    double tmpError = 0;
-    if (meanError < 1e-8){
-	tmpError = 1/(valError*valError);
-	mean = val*tmpError;
-    }
-    else{
-	tmpError = 1/(meanError*meanError) + 1/(valError*valError);
-	mean = mean/(meanError*meanError) + val/(valError*valError);
-    }
-    mean = mean/tmpError;
-    meanError = sqrt(1/tmpError);
+void AlcaBeamSpotManager::weight(double &mean, double &meanError, const double &val, const double &valError) {
+  double tmpError = 0;
+  if (meanError < 1e-8) {
+    tmpError = 1 / (valError * valError);
+    mean = val * tmpError;
+  } else {
+    tmpError = 1 / (meanError * meanError) + 1 / (valError * valError);
+    mean = mean / (meanError * meanError) + val / (valError * valError);
+  }
+  mean = mean / tmpError;
+  meanError = sqrt(1 / tmpError);
 }
 
 //--------------------------------------------------------------------------------------------------
-pair<float,float> AlcaBeamSpotManager::delta(const float& x, const float& xError, const float& nextX, const float& nextXError){
-  return pair<float,float>(x - nextX, sqrt(pow(xError,2) + pow(nextXError,2)) );
+pair<float, float> AlcaBeamSpotManager::delta(const float &x,
+                                              const float &xError,
+                                              const float &nextX,
+                                              const float &nextXError) {
+  return pair<float, float>(x - nextX, sqrt(pow(xError, 2) + pow(nextXError, 2)));
 }
 
 //--------------------------------------------------------------------------------------------------
-float AlcaBeamSpotManager::deltaSig(const float& num, const float& den){
-  if(den != 0){
-    return fabs(num/den);
-  }
-  else{
+float AlcaBeamSpotManager::deltaSig(const float &num, const float &den) {
+  if (den != 0) {
+    return fabs(num / den);
+  } else {
     return float(LONG_MAX);
   }
 }
-
diff --git a/Calibration/TkAlCaRecoProducers/src/CalibrationTrackSelector.cc b/Calibration/TkAlCaRecoProducers/src/CalibrationTrackSelector.cc
index c72dfbef9ee5d..f36ddcbf7ecfa 100644
--- a/Calibration/TkAlCaRecoProducers/src/CalibrationTrackSelector.cc
+++ b/Calibration/TkAlCaRecoProducers/src/CalibrationTrackSelector.cc
@@ -5,156 +5,141 @@
 
 #include "FWCore/Framework/interface/Event.h"
 
-#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
-#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"
+#include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
 #include "DataFormats/TrackerRecHit2D/interface/ProjectedSiStripRecHit2D.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2D.h"
-#include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2DCollection.h"
+#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h"
+#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
 
 #include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 
 const int kBPIX = PixelSubdetector::PixelBarrel;
 const int kFPIX = PixelSubdetector::PixelEndcap;
 
 // constructor ----------------------------------------------------------------
 
-CalibrationTrackSelector::CalibrationTrackSelector(const edm::ParameterSet & cfg) :
-  applyBasicCuts_( cfg.getParameter<bool>( "applyBasicCuts" ) ),
-  applyNHighestPt_( cfg.getParameter<bool>( "applyNHighestPt" ) ),
-  applyMultiplicityFilter_( cfg.getParameter<bool>( "applyMultiplicityFilter" ) ),
-  seedOnlyFromAbove_( cfg.getParameter<int>( "seedOnlyFrom" ) ),
-  applyIsolation_( cfg.getParameter<bool>( "applyIsolationCut" ) ),
-  chargeCheck_( cfg.getParameter<bool>( "applyChargeCheck" ) ),
-  nHighestPt_( cfg.getParameter<int>( "nHighestPt" ) ),
-  minMultiplicity_ ( cfg.getParameter<int>( "minMultiplicity" ) ),
-  maxMultiplicity_ ( cfg.getParameter<int>( "maxMultiplicity" ) ),
-  multiplicityOnInput_ ( cfg.getParameter<bool>( "multiplicityOnInput" ) ),
-  ptMin_( cfg.getParameter<double>( "ptMin" ) ),
-  ptMax_( cfg.getParameter<double>( "ptMax" ) ),
-  etaMin_( cfg.getParameter<double>( "etaMin" ) ),
-  etaMax_( cfg.getParameter<double>( "etaMax" ) ),
-  phiMin_( cfg.getParameter<double>( "phiMin" ) ),
-  phiMax_( cfg.getParameter<double>( "phiMax" ) ),
-  nHitMin_( cfg.getParameter<double>( "nHitMin" ) ),
-  nHitMax_( cfg.getParameter<double>( "nHitMax" ) ),
-  chi2nMax_( cfg.getParameter<double>( "chi2nMax" ) ),
-  minHitChargeStrip_( cfg.getParameter<double>( "minHitChargeStrip" ) ),
-  minHitIsolation_( cfg.getParameter<double>( "minHitIsolation" ) ),
-  rphirecHitsTag_( cfg.getParameter<edm::InputTag>("rphirecHits") ),
-  matchedrecHitsTag_( cfg.getParameter<edm::InputTag>("matchedrecHits") ),
-  nHitMin2D_( cfg.getParameter<unsigned int>( "nHitMin2D" ) ),
-  // Ugly to use the same getParameter 6 times, but this allows const cut variables...
-  minHitsinTIB_(cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inTIB" ) ),
-  minHitsinTOB_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inTOB" ) ),
-  minHitsinTID_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inTID" ) ),
-  minHitsinTEC_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inTEC" ) ),
-  minHitsinBPIX_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inBPIX" ) ),
-  minHitsinFPIX_ (cfg.getParameter<edm::ParameterSet>( "minHitsPerSubDet" ).getParameter<int>( "inFPIX" ) )
-{
-
+CalibrationTrackSelector::CalibrationTrackSelector(const edm::ParameterSet &cfg)
+    : applyBasicCuts_(cfg.getParameter<bool>("applyBasicCuts")),
+      applyNHighestPt_(cfg.getParameter<bool>("applyNHighestPt")),
+      applyMultiplicityFilter_(cfg.getParameter<bool>("applyMultiplicityFilter")),
+      seedOnlyFromAbove_(cfg.getParameter<int>("seedOnlyFrom")),
+      applyIsolation_(cfg.getParameter<bool>("applyIsolationCut")),
+      chargeCheck_(cfg.getParameter<bool>("applyChargeCheck")),
+      nHighestPt_(cfg.getParameter<int>("nHighestPt")),
+      minMultiplicity_(cfg.getParameter<int>("minMultiplicity")),
+      maxMultiplicity_(cfg.getParameter<int>("maxMultiplicity")),
+      multiplicityOnInput_(cfg.getParameter<bool>("multiplicityOnInput")),
+      ptMin_(cfg.getParameter<double>("ptMin")),
+      ptMax_(cfg.getParameter<double>("ptMax")),
+      etaMin_(cfg.getParameter<double>("etaMin")),
+      etaMax_(cfg.getParameter<double>("etaMax")),
+      phiMin_(cfg.getParameter<double>("phiMin")),
+      phiMax_(cfg.getParameter<double>("phiMax")),
+      nHitMin_(cfg.getParameter<double>("nHitMin")),
+      nHitMax_(cfg.getParameter<double>("nHitMax")),
+      chi2nMax_(cfg.getParameter<double>("chi2nMax")),
+      minHitChargeStrip_(cfg.getParameter<double>("minHitChargeStrip")),
+      minHitIsolation_(cfg.getParameter<double>("minHitIsolation")),
+      rphirecHitsTag_(cfg.getParameter<edm::InputTag>("rphirecHits")),
+      matchedrecHitsTag_(cfg.getParameter<edm::InputTag>("matchedrecHits")),
+      nHitMin2D_(cfg.getParameter<unsigned int>("nHitMin2D")),
+      // Ugly to use the same getParameter 6 times, but this allows const cut
+      // variables...
+      minHitsinTIB_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inTIB")),
+      minHitsinTOB_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inTOB")),
+      minHitsinTID_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inTID")),
+      minHitsinTEC_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inTEC")),
+      minHitsinBPIX_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inBPIX")),
+      minHitsinFPIX_(cfg.getParameter<edm::ParameterSet>("minHitsPerSubDet").getParameter<int>("inFPIX")) {
   if (applyBasicCuts_)
-	edm::LogInfo("CalibrationTrackSelector") 
-	  << "applying basic track cuts ..."
-	  << "\nptmin,ptmax:     " << ptMin_   << "," << ptMax_ 
-	  << "\netamin,etamax:   " << etaMin_  << "," << etaMax_
-	  << "\nphimin,phimax:   " << phiMin_  << "," << phiMax_
-	  << "\nnhitmin,nhitmax: " << nHitMin_ << "," << nHitMax_
-          << "\nnhitmin2D:       " << nHitMin2D_
-	  << "\nchi2nmax:        " << chi2nMax_;
+    edm::LogInfo("CalibrationTrackSelector")
+        << "applying basic track cuts ..."
+        << "\nptmin,ptmax:     " << ptMin_ << "," << ptMax_ << "\netamin,etamax:   " << etaMin_ << "," << etaMax_
+        << "\nphimin,phimax:   " << phiMin_ << "," << phiMax_ << "\nnhitmin,nhitmax: " << nHitMin_ << "," << nHitMax_
+        << "\nnhitmin2D:       " << nHitMin2D_ << "\nchi2nmax:        " << chi2nMax_;
 
   if (applyNHighestPt_)
-	edm::LogInfo("CalibrationTrackSelector") 
-	  << "filter N tracks with highest Pt N=" << nHighestPt_;
+    edm::LogInfo("CalibrationTrackSelector") << "filter N tracks with highest Pt N=" << nHighestPt_;
 
   if (applyMultiplicityFilter_)
-	edm::LogInfo("CalibrationTrackSelector") 
-	  << "apply multiplicity filter N>= " << minMultiplicity_ << "and N<= " << maxMultiplicity_
-          << " on " << (multiplicityOnInput_ ? "input" : "output");
+    edm::LogInfo("CalibrationTrackSelector")
+        << "apply multiplicity filter N>= " << minMultiplicity_ << "and N<= " << maxMultiplicity_ << " on "
+        << (multiplicityOnInput_ ? "input" : "output");
 
   if (applyIsolation_)
-    edm::LogInfo("CalibrationTrackSelector") 
-      << "only retain tracks isolated at least by " << minHitIsolation_ << 
-      " cm from other rechits"; 
+    edm::LogInfo("CalibrationTrackSelector")
+        << "only retain tracks isolated at least by " << minHitIsolation_ << " cm from other rechits";
 
   if (chargeCheck_)
-    edm::LogInfo("CalibrationTrackSelector") 
-      << "only retain hits with at least " << minHitChargeStrip_ <<  
-      " ADC counts of total cluster charge"; 
-
-  edm::LogInfo("CalibrationTrackSelector") 
-    << "Minimum number of hits in TIB/TID/TOB/TEC/BPIX/FPIX = " 
-    << minHitsinTIB_ << "/" << minHitsinTID_ << "/" << minHitsinTOB_
-    << "/" << minHitsinTEC_ << "/" << minHitsinBPIX_ << "/" << minHitsinFPIX_;
+    edm::LogInfo("CalibrationTrackSelector")
+        << "only retain hits with at least " << minHitChargeStrip_ << " ADC counts of total cluster charge";
 
+  edm::LogInfo("CalibrationTrackSelector")
+      << "Minimum number of hits in TIB/TID/TOB/TEC/BPIX/FPIX = " << minHitsinTIB_ << "/" << minHitsinTID_ << "/"
+      << minHitsinTOB_ << "/" << minHitsinTEC_ << "/" << minHitsinBPIX_ << "/" << minHitsinFPIX_;
 }
 
 // destructor -----------------------------------------------------------------
 
-CalibrationTrackSelector::~CalibrationTrackSelector()
-{}
-
+CalibrationTrackSelector::~CalibrationTrackSelector() {}
 
 // do selection ---------------------------------------------------------------
 
-CalibrationTrackSelector::Tracks 
-CalibrationTrackSelector::select(const Tracks& tracks, const edm::Event& evt) const 
-{
-  
-  if (applyMultiplicityFilter_ && multiplicityOnInput_ && 
-      (tracks.size() < static_cast<unsigned int>(minMultiplicity_) 
-       || tracks.size() > static_cast<unsigned int>(maxMultiplicity_))) {
-    return Tracks(); // empty collection
+CalibrationTrackSelector::Tracks CalibrationTrackSelector::select(const Tracks &tracks, const edm::Event &evt) const {
+  if (applyMultiplicityFilter_ && multiplicityOnInput_ &&
+      (tracks.size() < static_cast<unsigned int>(minMultiplicity_) ||
+       tracks.size() > static_cast<unsigned int>(maxMultiplicity_))) {
+    return Tracks();  // empty collection
   }
-  
+
   Tracks result = tracks;
   // apply basic track cuts (if selected)
-  if (applyBasicCuts_) result= this->basicCuts(result, evt);
-  
+  if (applyBasicCuts_)
+    result = this->basicCuts(result, evt);
+
   // filter N tracks with highest Pt (if selected)
-  if (applyNHighestPt_) result = this->theNHighestPtTracks(result);
-  
+  if (applyNHighestPt_)
+    result = this->theNHighestPtTracks(result);
+
   // apply minimum multiplicity requirement (if selected)
   if (applyMultiplicityFilter_ && !multiplicityOnInput_) {
-    if (result.size() < static_cast<unsigned int>(minMultiplicity_) 
-        || result.size() > static_cast<unsigned int>(maxMultiplicity_) ) {
-
+    if (result.size() < static_cast<unsigned int>(minMultiplicity_) ||
+        result.size() > static_cast<unsigned int>(maxMultiplicity_)) {
       result.clear();
     }
   }
-  
-  // edm::LogDebug("CalibrationTrackSelector") << "tracks all,kept: " << tracks.size() << "," << result.size();
-  
+
+  // edm::LogDebug("CalibrationTrackSelector") << "tracks all,kept: " <<
+  // tracks.size() << "," << result.size();
+
   return result;
 }
 
 // make basic cuts ------------------------------------------------------------
 
-CalibrationTrackSelector::Tracks 
-CalibrationTrackSelector::basicCuts(const Tracks& tracks, const edm::Event& evt) const 
-{
+CalibrationTrackSelector::Tracks CalibrationTrackSelector::basicCuts(const Tracks &tracks,
+                                                                     const edm::Event &evt) const {
   Tracks result;
 
-  for (Tracks::const_iterator it=tracks.begin(); it != tracks.end(); ++it) {
-    const reco::Track* trackp=*it;
-    float pt=trackp->pt();
-    float eta=trackp->eta();
-    float phi=trackp->phi();
-    int nhit = trackp->numberOfValidHits(); 
+  for (Tracks::const_iterator it = tracks.begin(); it != tracks.end(); ++it) {
+    const reco::Track *trackp = *it;
+    float pt = trackp->pt();
+    float eta = trackp->eta();
+    float phi = trackp->phi();
+    int nhit = trackp->numberOfValidHits();
     float chi2n = trackp->normalizedChi2();
 
     // edm::LogDebug("CalibrationTrackSelector") << " pt,eta,phi,nhit: "
     //  <<pt<<","<<eta<<","<<phi<<","<<nhit;
 
-    if (pt>ptMin_ && pt<ptMax_ 
-       && eta>etaMin_ && eta<etaMax_ 
-       && phi>phiMin_ && phi<phiMax_ 
-       && nhit>=nHitMin_ && nhit<=nHitMax_
-       && chi2n<chi2nMax_) {
-      if (this->detailedHitsCheck(trackp, evt)) result.push_back(trackp);
+    if (pt > ptMin_ && pt < ptMax_ && eta > etaMin_ && eta < etaMax_ && phi > phiMin_ && phi < phiMax_ &&
+        nhit >= nHitMin_ && nhit <= nHitMax_ && chi2n < chi2nMax_) {
+      if (this->detailedHitsCheck(trackp, evt))
+        result.push_back(trackp);
     }
   }
 
@@ -163,75 +148,88 @@ CalibrationTrackSelector::basicCuts(const Tracks& tracks, const edm::Event& evt)
 
 //-----------------------------------------------------------------------------
 
-bool CalibrationTrackSelector::detailedHitsCheck(const reco::Track *trackp, const edm::Event& evt) const
-{
+bool CalibrationTrackSelector::detailedHitsCheck(const reco::Track *trackp, const edm::Event &evt) const {
   // checking hit requirements beyond simple number of valid hits
 
-  if (minHitsinTIB_ || minHitsinTOB_ || minHitsinTID_ || minHitsinTEC_
-      || minHitsinFPIX_ || minHitsinBPIX_ || nHitMin2D_ || chargeCheck_
-      || applyIsolation_) { // any detailed hit cut is active, so have to check
-    
+  if (minHitsinTIB_ || minHitsinTOB_ || minHitsinTID_ || minHitsinTEC_ || minHitsinFPIX_ || minHitsinBPIX_ ||
+      nHitMin2D_ || chargeCheck_ || applyIsolation_) {  // any detailed hit cut is active, so have to check
+
     int nhitinTIB = 0, nhitinTOB = 0, nhitinTID = 0;
     int nhitinTEC = 0, nhitinBPIX = 0, nhitinFPIX = 0;
     unsigned int nHit2D = 0;
     unsigned int thishit = 0;
 
-    for(auto const& hit : trackp->recHits()) {
-
+    for (auto const &hit : trackp->recHits()) {
       thishit++;
-      int type = hit->geographicalId().subdetId(); 
+      int type = hit->geographicalId().subdetId();
 
-      // *** thishit == 1 means last hit in CTF *** 
-      // (FIXME: assumption might change or not be valid for all tracking algorthms)
+      // *** thishit == 1 means last hit in CTF ***
+      // (FIXME: assumption might change or not be valid for all tracking
+      // algorthms)
       // ==> for cosmics
       // seedOnlyFrom = 1 is TIB-TOB-TEC tracks only
-      // seedOnlyFrom = 2 is TOB-TEC tracks only 
-      if (seedOnlyFromAbove_ == 1 && thishit == 1 && (type == int(StripSubdetector::TOB) || type == int(StripSubdetector::TEC))) return false; 
+      // seedOnlyFrom = 2 is TOB-TEC tracks only
+      if (seedOnlyFromAbove_ == 1 && thishit == 1 &&
+          (type == int(StripSubdetector::TOB) || type == int(StripSubdetector::TEC)))
+        return false;
 
-      if (seedOnlyFromAbove_ == 2 && thishit == 1 && type == int(StripSubdetector::TIB)) return false;  
+      if (seedOnlyFromAbove_ == 2 && thishit == 1 && type == int(StripSubdetector::TIB))
+        return false;
 
-      if (!hit->isValid()) continue; // only real hits count as in trackp->numberOfValidHits()
+      if (!hit->isValid())
+        continue;  // only real hits count as in trackp->numberOfValidHits()
       const DetId detId(hit->geographicalId());
       if (detId.det() != DetId::Tracker) {
-        edm::LogError("DetectorMismatch") << "@SUB=CalibrationTrackSelector::detailedHitsCheck"
-                                          << "DetId.det() != DetId::Tracker (=" << DetId::Tracker
-                                          << "), but " << detId.det() << ".";
+        edm::LogError("DetectorMismatch")
+            << "@SUB=CalibrationTrackSelector::detailedHitsCheck"
+            << "DetId.det() != DetId::Tracker (=" << DetId::Tracker << "), but " << detId.det() << ".";
       }
-      if (chargeCheck_ && !(this->isOkCharge(hit))) return false;
-      if (applyIsolation_ && (!this->isIsolated(hit, evt))) return false;
-      if      (StripSubdetector::TIB == detId.subdetId()) ++nhitinTIB;
-      else if (StripSubdetector::TOB == detId.subdetId()) ++nhitinTOB;
-      else if (StripSubdetector::TID == detId.subdetId()) ++nhitinTID;
-      else if (StripSubdetector::TEC == detId.subdetId()) ++nhitinTEC;
-      else if (                kBPIX == detId.subdetId()) ++nhitinBPIX;
-      else if (                kFPIX == detId.subdetId()) ++nhitinFPIX;
-      // Do not call isHit2D(..) if already enough 2D hits for performance reason:
-      if (nHit2D < nHitMin2D_ && this->isHit2D(*hit)) ++nHit2D;
-    } // end loop on hits
-    return (nhitinTIB >= minHitsinTIB_ && nhitinTOB >= minHitsinTOB_ 
-            && nhitinTID >= minHitsinTID_ && nhitinTEC >= minHitsinTEC_ 
-            && nhitinBPIX >= minHitsinBPIX_ && nhitinFPIX >= minHitsinFPIX_ 
-            && nHit2D >= nHitMin2D_);
-  } else { // no cuts set, so we are just fine and can avoid loop on hits
+      if (chargeCheck_ && !(this->isOkCharge(hit)))
+        return false;
+      if (applyIsolation_ && (!this->isIsolated(hit, evt)))
+        return false;
+      if (StripSubdetector::TIB == detId.subdetId())
+        ++nhitinTIB;
+      else if (StripSubdetector::TOB == detId.subdetId())
+        ++nhitinTOB;
+      else if (StripSubdetector::TID == detId.subdetId())
+        ++nhitinTID;
+      else if (StripSubdetector::TEC == detId.subdetId())
+        ++nhitinTEC;
+      else if (kBPIX == detId.subdetId())
+        ++nhitinBPIX;
+      else if (kFPIX == detId.subdetId())
+        ++nhitinFPIX;
+      // Do not call isHit2D(..) if already enough 2D hits for performance
+      // reason:
+      if (nHit2D < nHitMin2D_ && this->isHit2D(*hit))
+        ++nHit2D;
+    }  // end loop on hits
+    return (nhitinTIB >= minHitsinTIB_ && nhitinTOB >= minHitsinTOB_ && nhitinTID >= minHitsinTID_ &&
+            nhitinTEC >= minHitsinTEC_ && nhitinBPIX >= minHitsinBPIX_ && nhitinFPIX >= minHitsinFPIX_ &&
+            nHit2D >= nHitMin2D_);
+  } else {  // no cuts set, so we are just fine and can avoid loop on hits
     return true;
   }
 }
 
 //-----------------------------------------------------------------------------
 
-bool CalibrationTrackSelector::isHit2D(const TrackingRecHit &hit) const
-{
+bool CalibrationTrackSelector::isHit2D(const TrackingRecHit &hit) const {
   if (hit.dimension() < 2) {
-    return false; // some (muon...) stuff really has RecHit1D
+    return false;  // some (muon...) stuff really has RecHit1D
   } else {
     const DetId detId(hit.geographicalId());
     if (detId.det() == DetId::Tracker) {
       if (detId.subdetId() == kBPIX || detId.subdetId() == kFPIX) {
-        return true; // pixel is always 2D
-      } else { // should be SiStrip now
-        if (dynamic_cast<const SiStripRecHit2D*>(&hit)) return false; // normal hit
-        else if (dynamic_cast<const SiStripMatchedRecHit2D*>(&hit)) return true; // matched is 2D
-        else if (dynamic_cast<const ProjectedSiStripRecHit2D*>(&hit)) return false; // crazy hit...
+        return true;  // pixel is always 2D
+      } else {        // should be SiStrip now
+        if (dynamic_cast<const SiStripRecHit2D *>(&hit))
+          return false;  // normal hit
+        else if (dynamic_cast<const SiStripMatchedRecHit2D *>(&hit))
+          return true;  // matched is 2D
+        else if (dynamic_cast<const ProjectedSiStripRecHit2D *>(&hit))
+          return false;  // crazy hit...
         else {
           edm::LogError("UnkownType") << "@SUB=CalibrationTrackSelector::isHit2D"
                                       << "Tracker hit not in pixel and neither SiStripRecHit2D nor "
@@ -239,10 +237,10 @@ bool CalibrationTrackSelector::isHit2D(const TrackingRecHit &hit) const
           return false;
         }
       }
-    } else { // not tracker??
+    } else {  // not tracker??
       edm::LogWarning("DetectorMismatch") << "@SUB=CalibrationTrackSelector::isHit2D"
                                           << "Hit not in tracker with 'official' dimension >=2.";
-      return true; // dimension() >= 2 so accept that...
+      return true;  // dimension() >= 2 so accept that...
     }
   }
   // never reached...
@@ -250,114 +248,113 @@ bool CalibrationTrackSelector::isHit2D(const TrackingRecHit &hit) const
 
 //-----------------------------------------------------------------------------
 
-bool CalibrationTrackSelector::isOkCharge(const TrackingRecHit* therechit) const
-{
+bool CalibrationTrackSelector::isOkCharge(const TrackingRecHit *therechit) const {
   float charge1 = 0;
   float charge2 = 0;
-  const SiStripMatchedRecHit2D* matchedhit = dynamic_cast<const SiStripMatchedRecHit2D*>(therechit);
-  const SiStripRecHit2D* hit = dynamic_cast<const SiStripRecHit2D*>(therechit);
-  const ProjectedSiStripRecHit2D* unmatchedhit = dynamic_cast<const ProjectedSiStripRecHit2D*>(therechit);
-  
-  if (matchedhit) {  
-    const SiStripCluster & monocluster = matchedhit->monoCluster();
-    const std::vector<uint16_t> amplitudesmono( monocluster.amplitudes().begin(),
-						monocluster.amplitudes().end());
-    for(size_t ia=0; ia<amplitudesmono.size();++ia)
-      { charge1+=amplitudesmono[ia];} 
-    
-    const SiStripCluster & stereocluster = matchedhit->stereoCluster();
-    const std::vector<uint16_t> amplitudesstereo( stereocluster.amplitudes().begin(),
-						  stereocluster.amplitudes().end());
-    for(size_t ia=0; ia<amplitudesstereo.size();++ia)
-      {charge2+=amplitudesstereo[ia];}
+  const SiStripMatchedRecHit2D *matchedhit = dynamic_cast<const SiStripMatchedRecHit2D *>(therechit);
+  const SiStripRecHit2D *hit = dynamic_cast<const SiStripRecHit2D *>(therechit);
+  const ProjectedSiStripRecHit2D *unmatchedhit = dynamic_cast<const ProjectedSiStripRecHit2D *>(therechit);
+
+  if (matchedhit) {
+    const SiStripCluster &monocluster = matchedhit->monoCluster();
+    const std::vector<uint16_t> amplitudesmono(monocluster.amplitudes().begin(), monocluster.amplitudes().end());
+    for (size_t ia = 0; ia < amplitudesmono.size(); ++ia) {
+      charge1 += amplitudesmono[ia];
+    }
+
+    const SiStripCluster &stereocluster = matchedhit->stereoCluster();
+    const std::vector<uint16_t> amplitudesstereo(stereocluster.amplitudes().begin(), stereocluster.amplitudes().end());
+    for (size_t ia = 0; ia < amplitudesstereo.size(); ++ia) {
+      charge2 += amplitudesstereo[ia];
+    }
     // std::cout << "charge1 = " << charge1 << "\n";
     // std::cout << "charge2 = " << charge2 << "\n";
-    if (charge1 < minHitChargeStrip_ || charge2 < minHitChargeStrip_) return false;
-  }
-  else if (hit) {
-    
-    const SiStripCluster* cluster = &*(hit->cluster());
-    const std::vector<uint16_t> amplitudes( cluster->amplitudes().begin(),
-					    cluster->amplitudes().end());
-    for(size_t ia=0; ia<amplitudes.size();++ia)
-      {charge1+=amplitudes[ia];}
+    if (charge1 < minHitChargeStrip_ || charge2 < minHitChargeStrip_)
+      return false;
+  } else if (hit) {
+    const SiStripCluster *cluster = &*(hit->cluster());
+    const std::vector<uint16_t> amplitudes(cluster->amplitudes().begin(), cluster->amplitudes().end());
+    for (size_t ia = 0; ia < amplitudes.size(); ++ia) {
+      charge1 += amplitudes[ia];
+    }
     // std::cout << "charge1 = " << charge1 << "\n";
-    if (charge1 < minHitChargeStrip_) return false;
-  }
-  else if (unmatchedhit) {
-    
-    const SiStripRecHit2D &orighit = unmatchedhit->originalHit(); 
-    const SiStripCluster* origcluster = &*(orighit.cluster());
-    const std::vector<uint16_t> amplitudes( origcluster->amplitudes().begin(),
-					    origcluster->amplitudes().end());
-    for(size_t ia=0; ia<amplitudes.size();++ia)
-      {charge1+=amplitudes[ia];}
+    if (charge1 < minHitChargeStrip_)
+      return false;
+  } else if (unmatchedhit) {
+    const SiStripRecHit2D &orighit = unmatchedhit->originalHit();
+    const SiStripCluster *origcluster = &*(orighit.cluster());
+    const std::vector<uint16_t> amplitudes(origcluster->amplitudes().begin(), origcluster->amplitudes().end());
+    for (size_t ia = 0; ia < amplitudes.size(); ++ia) {
+      charge1 += amplitudes[ia];
+    }
     // std::cout << "charge1 = " << charge1 << "\n";
-    if (charge1 < minHitChargeStrip_) return false;
-  } 
+    if (charge1 < minHitChargeStrip_)
+      return false;
+  }
   return true;
-} 
+}
 
 //-----------------------------------------------------------------------------
 
-bool CalibrationTrackSelector::isIsolated(const TrackingRecHit* therechit, const edm::Event& evt) const
-{
-	   
+bool CalibrationTrackSelector::isIsolated(const TrackingRecHit *therechit, const edm::Event &evt) const {
   // edm::ESHandle<TrackerGeometry> tracker;
   edm::Handle<SiStripRecHit2DCollection> rphirecHits;
   edm::Handle<SiStripMatchedRecHit2DCollection> matchedrecHits;
   // es.get<TrackerDigiGeometryRecord>().get(tracker);
-  evt.getByLabel( rphirecHitsTag_, rphirecHits );
-  evt.getByLabel( matchedrecHitsTag_, matchedrecHits ); 
-
-  SiStripRecHit2DCollection::DataContainer::const_iterator istripSt; 
-  SiStripMatchedRecHit2DCollection::DataContainer::const_iterator istripStm; 
-  const SiStripRecHit2DCollection& stripcollSt = *rphirecHits;
-  const SiStripMatchedRecHit2DCollection& stripcollStm = *matchedrecHits;
-  
-  DetId idet = therechit->geographicalId(); 
-  
-  // FIXME: instead of looping the full hit collection, we should explore the features of 
-  // SiStripRecHit2DCollection::rangeRphi = rphirecHits.get(idet) and loop
-  // only from rangeRphi.first until rangeRphi.second
-  for( istripSt=stripcollSt.data().begin(); istripSt!=stripcollSt.data().end(); ++istripSt ) {
+  evt.getByLabel(rphirecHitsTag_, rphirecHits);
+  evt.getByLabel(matchedrecHitsTag_, matchedrecHits);
+
+  SiStripRecHit2DCollection::DataContainer::const_iterator istripSt;
+  SiStripMatchedRecHit2DCollection::DataContainer::const_iterator istripStm;
+  const SiStripRecHit2DCollection &stripcollSt = *rphirecHits;
+  const SiStripMatchedRecHit2DCollection &stripcollStm = *matchedrecHits;
+
+  DetId idet = therechit->geographicalId();
+
+  // FIXME: instead of looping the full hit collection, we should explore the
+  // features of SiStripRecHit2DCollection::rangeRphi = rphirecHits.get(idet)
+  // and loop only from rangeRphi.first until rangeRphi.second
+  for (istripSt = stripcollSt.data().begin(); istripSt != stripcollSt.data().end(); ++istripSt) {
     const SiStripRecHit2D *aHit = &*(istripSt);
-    DetId mydet1 = aHit->geographicalId(); 
-    if (idet.rawId() != mydet1.rawId()) continue; 
-    float theDistance = ( therechit->localPosition() - aHit->localPosition() ).mag();
+    DetId mydet1 = aHit->geographicalId();
+    if (idet.rawId() != mydet1.rawId())
+      continue;
+    float theDistance = (therechit->localPosition() - aHit->localPosition()).mag();
     // std::cout << "theDistance1 = " << theDistance << "\n";
-    if (theDistance > 0.001 && theDistance < minHitIsolation_) return false;
+    if (theDistance > 0.001 && theDistance < minHitIsolation_)
+      return false;
   }
-  
+
   // FIXME: see above
-  for( istripStm=stripcollStm.data().begin(); istripStm!=stripcollStm.data().end(); ++istripStm ) {
+  for (istripStm = stripcollStm.data().begin(); istripStm != stripcollStm.data().end(); ++istripStm) {
     const SiStripMatchedRecHit2D *aHit = &*(istripStm);
-    DetId mydet2 = aHit->geographicalId(); 
-    if (idet.rawId() != mydet2.rawId()) continue;
+    DetId mydet2 = aHit->geographicalId();
+    if (idet.rawId() != mydet2.rawId())
+      continue;
     float theDistance = (therechit->localPosition() - aHit->localPosition()).mag();
     // std::cout << "theDistance1 = " << theDistance << "\n";
-    if (theDistance > 0.001 && theDistance < minHitIsolation_) return false;
+    if (theDistance > 0.001 && theDistance < minHitIsolation_)
+      return false;
   }
   return true;
 }
 //-----------------------------------------------------------------------------
 
-CalibrationTrackSelector::Tracks 
-CalibrationTrackSelector::theNHighestPtTracks(const Tracks& tracks) const
-{
-  Tracks sortedTracks=tracks;
+CalibrationTrackSelector::Tracks CalibrationTrackSelector::theNHighestPtTracks(const Tracks &tracks) const {
+  Tracks sortedTracks = tracks;
   Tracks result;
 
   // sort in pt
-  std::sort(sortedTracks.begin(),sortedTracks.end(),ptComparator);
+  std::sort(sortedTracks.begin(), sortedTracks.end(), ptComparator);
 
   // copy theTrackMult highest pt tracks to result vector
-  int n=0;
-  for (Tracks::const_iterator it=sortedTracks.begin();
-	   it!=sortedTracks.end(); ++it) {
-	if (n<nHighestPt_) { result.push_back(*it); n++; }
+  int n = 0;
+  for (Tracks::const_iterator it = sortedTracks.begin(); it != sortedTracks.end(); ++it) {
+    if (n < nHighestPt_) {
+      result.push_back(*it);
+      n++;
+    }
   }
 
   return result;
 }
-
diff --git a/Calibration/TkAlCaRecoProducers/test/DQMRootFileReader.cc b/Calibration/TkAlCaRecoProducers/test/DQMRootFileReader.cc
index e4f0cbaf5fe70..fc050ed1bf212 100644
--- a/Calibration/TkAlCaRecoProducers/test/DQMRootFileReader.cc
+++ b/Calibration/TkAlCaRecoProducers/test/DQMRootFileReader.cc
@@ -1,10 +1,11 @@
 // -*- C++ -*-
 //
 // Class:      DQMRootFileReader
-// 
+//
 /**\class DQMRootFileReader
 
-Description: Simple example showing how to read MonitorElements from a DQM plain ROOT file
+Description: Simple example showing how to read MonitorElements from a DQM plain
+ROOT file
 
 Implementation:
 <Notes on implementation>
@@ -13,11 +14,10 @@ Description: Simple example showing how to read MonitorElements from a DQM plain
 //
 //
 
-
 // system include files
+#include <iostream>
 #include <string>
 #include <vector>
-#include <iostream>
 
 // user include files
 #include "FWCore/Framework/interface/EDAnalyzer.h"
@@ -29,7 +29,6 @@ Description: Simple example showing how to read MonitorElements from a DQM plain
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-
 using std::cout;
 using std::endl;
 
@@ -38,62 +37,53 @@ using std::endl;
 //
 class DQMRootFileReader : public edm::EDAnalyzer {
 public:
-  explicit DQMRootFileReader( const edm::ParameterSet& );
+  explicit DQMRootFileReader(const edm::ParameterSet &);
   ~DQMRootFileReader();
-  
-  virtual void analyze( const edm::Event&, const edm::EventSetup& );
-  
+
+  virtual void analyze(const edm::Event &, const edm::EventSetup &);
+
   virtual void endJob(void);
 
 private:
   // ----------member data ---------------------------
-  
+
   // back-end interface
-  DQMStore * dbe;
+  DQMStore *dbe;
   std::string filename;
 };
 
 //
 // constructors and destructor
 //
-DQMRootFileReader::DQMRootFileReader(const edm::ParameterSet& iConfig ) {
+DQMRootFileReader::DQMRootFileReader(const edm::ParameterSet &iConfig) {
   // get hold of back-end interface
   dbe = edm::Service<DQMStore>().operator->();
 
   filename = iConfig.getUntrackedParameter<std::string>("RootFileName", "test_playback.root");
 }
 
-
-
 DQMRootFileReader::~DQMRootFileReader() {
   // do anything here that needs to be done at desctruction time
   // (e.g. close files, deallocate resources etc.)
-  
 }
 
-
-void DQMRootFileReader::endJob(void)
-{
+void DQMRootFileReader::endJob(void) {
   cout << "Dumping DQMStore dir structure:" << endl;
   dbe->showDirStructure();
-  // dbe->save("test.root");  
+  // dbe->save("test.root");
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void DQMRootFileReader::analyze(const edm::Event& iEvent, 
-					 const edm::EventSetup& iSetup )
-{
-  // NOTE: this is here just because we need it after the beginRun of MEtoEDMCoverter which calls a Reset on all MEs.
-  dbe->open(filename, false, "","",DQMStore::OpenRunDirs::StripRunDirs);
+void DQMRootFileReader::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  // NOTE: this is here just because we need it after the beginRun of
+  // MEtoEDMCoverter which calls a Reset on all MEs.
+  dbe->open(filename, false, "", "", DQMStore::OpenRunDirs::StripRunDirs);
   dbe->showDirStructure();
-
 }
 
 // define this as a plug-in
 DEFINE_FWK_MODULE(DQMRootFileReader);
-
diff --git a/Calibration/Tools/bin/mergeXMLEB.cpp b/Calibration/Tools/bin/mergeXMLEB.cpp
index 676bef12225bd..d03bf2ab92af6 100644
--- a/Calibration/Tools/bin/mergeXMLEB.cpp
+++ b/Calibration/Tools/bin/mergeXMLEB.cpp
@@ -146,7 +146,7 @@ int main (int argc, char* argv[])
 
   /* TODOS
    - inizio con EB
-  
+
    - leggi l'intervallo di validita'
    - cerca i XML file in funzione di quello che sta scritto nel parser
      (qui bisogna conoscere gia' la cartella e costruire i nomi allo stesso
diff --git a/Calibration/Tools/bin/mergeXMLEE.cpp b/Calibration/Tools/bin/mergeXMLEE.cpp
index 668605637de93..ee7a821bae674 100644
--- a/Calibration/Tools/bin/mergeXMLEE.cpp
+++ b/Calibration/Tools/bin/mergeXMLEE.cpp
@@ -178,7 +178,7 @@ int main (int argc, char* argv[])
 
   /* TODOS
    - inizio con EB
-  
+
    - leggi l'intervallo di validita'
    - cerca i XML file in funzione di quello che sta scritto nel parser
      (qui bisogna conoscere gia' la cartella e costruire i nomi allo stesso
diff --git a/CaloOnlineTools/EcalTools/interface/EcalFedMap.h b/CaloOnlineTools/EcalTools/interface/EcalFedMap.h
index 039dc93cec310..9572f86611d05 100644
--- a/CaloOnlineTools/EcalTools/interface/EcalFedMap.h
+++ b/CaloOnlineTools/EcalTools/interface/EcalFedMap.h
@@ -4,22 +4,20 @@
 #include <map>
 #include <string>
 
-class EcalFedMap{
-
- public: 
-
+class EcalFedMap {
+public:
   EcalFedMap();
   ~EcalFedMap();
   int getFedFromSlice(std::string);
   std::string getSliceFromFed(int);
 
- private:
+private:
   // use:
   // #include <boost/bimap.hpp>
-  // bimap< int, std::string > bm; 
+  // bimap< int, std::string > bm;
   // when available
 
-  std::map<int,  std::string> fedToSliceMap_;
-  std::map<std::string, int>  sliceToFedMap_;
+  std::map<int, std::string> fedToSliceMap_;
+  std::map<std::string, int> sliceToFedMap_;
 };
 #endif
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalBxOrbitNumberGrapher.cc b/CaloOnlineTools/EcalTools/plugins/EcalBxOrbitNumberGrapher.cc
index af24680629d61..b9de47b9c0a8f 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalBxOrbitNumberGrapher.cc
+++ b/CaloOnlineTools/EcalTools/plugins/EcalBxOrbitNumberGrapher.cc
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 //
-// Package:   EcalBxOrbitNumberGrapher 
-// Class:     EcalBxOrbitNumberGrapher 
-// 
+// Package:   EcalBxOrbitNumberGrapher
+// Class:     EcalBxOrbitNumberGrapher
+//
 /**\class EcalBxOrbitNumberGrapher EcalBxOrbitNumberGrapher.cc
 
  Description: <one line class summary>
@@ -35,126 +35,93 @@ using namespace std;
 //
 // constructors and destructor
 //
-EcalBxOrbitNumberGrapher::EcalBxOrbitNumberGrapher(const edm::ParameterSet& iConfig) :
-  digiProducer_(iConfig.getParameter<std::string>("RawDigis")),
-  runNum_(-1),
-  fileName_ (iConfig.getUntrackedParameter<std::string>("fileName", std::string("ecalURechHitHists")))
-{
-  
-  
-}
-
-
-EcalBxOrbitNumberGrapher::~EcalBxOrbitNumberGrapher()
-{
-}
+EcalBxOrbitNumberGrapher::EcalBxOrbitNumberGrapher(const edm::ParameterSet& iConfig)
+    : digiProducer_(iConfig.getParameter<std::string>("RawDigis")),
+      runNum_(-1),
+      fileName_(iConfig.getUntrackedParameter<std::string>("fileName", std::string("ecalURechHitHists"))) {}
 
+EcalBxOrbitNumberGrapher::~EcalBxOrbitNumberGrapher() {}
 
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-EcalBxOrbitNumberGrapher::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void EcalBxOrbitNumberGrapher::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   using namespace edm;
-   using namespace cms;
+  using namespace cms;
   //int ievt = iEvent.id().event();
   int orbit = -100;
   int bx = -100;
   int numorbiterrors = 0;
   bool orbiterror = false;
 
-  
   edm::Handle<EcalRawDataCollection> DCCHeaders;
   iEvent.getByLabel(digiProducer_, DCCHeaders);
   if (!DCCHeaders.isValid()) {
-	edm::LogError("BxOrbitNumber") << "can't get the product for EcalRawDataCollection";
+    edm::LogError("BxOrbitNumber") << "can't get the product for EcalRawDataCollection";
   }
 
   //-----------------BX STuff here
-   for ( EcalRawDataCollection::const_iterator headerItr= DCCHeaders->begin();headerItr != DCCHeaders->end(); 
-	  ++headerItr ) {
+  for (EcalRawDataCollection::const_iterator headerItr = DCCHeaders->begin(); headerItr != DCCHeaders->end();
+       ++headerItr) {
     headerItr->getEventSettings();
     int myorbit = headerItr->getOrbit();
     int mybx = headerItr->getBX();
-    
-    if ( orbit == -100 )
-    {
+
+    if (orbit == -100) {
       orbit = myorbit;
+    } else if (orbit != myorbit) {
+      std::cout << " NOOOO This header has a conflicting orbit OTHER " << orbit << " new " << myorbit << std::endl;
+      orbiterror = true;
+      numorbiterrors++;
+      orbitErrorBxDiffPlot_->Fill(myorbit - orbit);
     }
-    else if (orbit != myorbit)
-    {
-       std::cout << " NOOOO This header has a conflicting orbit OTHER " << orbit << " new " << myorbit  << std::endl;
-       orbiterror = true; 
-       numorbiterrors++;
-       orbitErrorBxDiffPlot_->Fill(myorbit - orbit);
-    }
-    
-    if ( bx == -100 )
-    {
+
+    if (bx == -100) {
       bx = mybx;
-    }
-    else if (bx != mybx)
-    {
-       std::cout << " NOOOO This header has a conflicting bx OTHER " << bx << " new " << mybx  << std::endl; 
+    } else if (bx != mybx) {
+      std::cout << " NOOOO This header has a conflicting bx OTHER " << bx << " new " << mybx << std::endl;
     }
     //LogDebug("EcalTimingCosmic") << " Lambda " << lambda; //hmm... this isn't good, I should keep a record of the wavelength in the headers as an inactive SM might have a different wavelength for this field and make this not go through.
   }
-  
-  if ( (bx != -100) & ( orbit != -100) )
-  {
-     std::cout << " Interesting event Orbit " << orbit << " BX " << bx << std::endl;
-     bxnumberPlot_->Fill(bx);
-     if (orbiterror) 
-     {
-        orbitErrorPlot_->Fill(bx);	
-     }
+
+  if ((bx != -100) & (orbit != -100)) {
+    std::cout << " Interesting event Orbit " << orbit << " BX " << bx << std::endl;
+    bxnumberPlot_->Fill(bx);
+    if (orbiterror) {
+      orbitErrorPlot_->Fill(bx);
+    }
   }
   numberofOrbitDiffPlot_->Fill(numorbiterrors);
-  
-  
-  if(runNum_==-1)
-  {
+
+  if (runNum_ == -1) {
     runNum_ = iEvent.id().run();
   }
 }
 
-
 // insert the hist map into the map keyed by FED number
-void EcalBxOrbitNumberGrapher::initHists(int FED)
-{
- 
-  
-}
+void EcalBxOrbitNumberGrapher::initHists(int FED) {}
 
 // ------------ method called once each job just before starting event loop  ------------
-void 
-EcalBxOrbitNumberGrapher::beginJob()
-{
-  bxnumberPlot_ = new TH1F("bxnumber", "BX number of interexting events",3600, 0., 3600.);
-  orbitErrorPlot_ = new TH1F("bxOfOrbitDiffs", "BX number of interexting events with orbit changes",3600, 0., 3600.);
-  orbitErrorBxDiffPlot_ = new TH1F("orbitErrorDiffPlot","Orbit Difference of those HEADERS that have a difference",20,-10.,10.);
-  numberofOrbitDiffPlot_ = new TH1F("numberOfOrbitDiffsPlot","Number of Orbit Differences",54,0., 54.);
+void EcalBxOrbitNumberGrapher::beginJob() {
+  bxnumberPlot_ = new TH1F("bxnumber", "BX number of interexting events", 3600, 0., 3600.);
+  orbitErrorPlot_ = new TH1F("bxOfOrbitDiffs", "BX number of interexting events with orbit changes", 3600, 0., 3600.);
+  orbitErrorBxDiffPlot_ =
+      new TH1F("orbitErrorDiffPlot", "Orbit Difference of those HEADERS that have a difference", 20, -10., 10.);
+  numberofOrbitDiffPlot_ = new TH1F("numberOfOrbitDiffsPlot", "Number of Orbit Differences", 54, 0., 54.);
 }
 
 // ------------ method called once each job just after ending the event loop  ------------
-void 
-EcalBxOrbitNumberGrapher::endJob()
-{
+void EcalBxOrbitNumberGrapher::endJob() {
   using namespace std;
   fileName_ += ".bx.root";
 
-  TFile root_file_(fileName_.c_str() , "RECREATE");
+  TFile root_file_(fileName_.c_str(), "RECREATE");
 
   bxnumberPlot_->Write();
   orbitErrorPlot_->Write();
   numberofOrbitDiffPlot_->Write();
   orbitErrorBxDiffPlot_->Write();
   root_file_.Close();
-
 }
-
-
-
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalBxOrbitNumberGrapher.h b/CaloOnlineTools/EcalTools/plugins/EcalBxOrbitNumberGrapher.h
index b7d105a25a5ae..7f681e6bd7296 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalBxOrbitNumberGrapher.h
+++ b/CaloOnlineTools/EcalTools/plugins/EcalBxOrbitNumberGrapher.h
@@ -1,9 +1,9 @@
 
 // -*- C++ -*-
 //
-// Package:   EcalBxOrbitNumberGrapher 
-// Class:     EcalBxOrbitNumberGrapher 
-// 
+// Package:   EcalBxOrbitNumberGrapher
+// Class:     EcalBxOrbitNumberGrapher
+//
 /**\class EcalBxOrbitNumberGrapher EcalBxOrbitNumberGrapher.cc
 
  Description: <one line class summary>
@@ -17,7 +17,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <vector>
@@ -37,31 +36,26 @@
 
 #include "DataFormats/EcalRawData/interface/EcalRawDataCollections.h"
 
-
-
 #include "TFile.h"
 #include "TH1F.h"
 
-
 //
 // class declaration
 //
 
 class EcalBxOrbitNumberGrapher : public edm::EDAnalyzer {
-   public:
-      explicit EcalBxOrbitNumberGrapher(const edm::ParameterSet&);
-      ~EcalBxOrbitNumberGrapher() override;
-
+public:
+  explicit EcalBxOrbitNumberGrapher(const edm::ParameterSet&);
+  ~EcalBxOrbitNumberGrapher() override;
 
-   private:
-      void beginJob() override;
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      void endJob() override ;
-      void initHists(int);
+private:
+  void beginJob() override;
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void endJob() override;
+  void initHists(int);
 
-    // ----------member data ---------------------------
+  // ----------member data ---------------------------
 
- 
   std::string digiProducer_;
   int runNum_;
   std::string fileName_;
@@ -72,5 +66,4 @@ class EcalBxOrbitNumberGrapher : public edm::EDAnalyzer {
   TH1F* numberofOrbitDiffPlot_;
 
   TFile* file;
-  
 };
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalCosmicsHists.cc b/CaloOnlineTools/EcalTools/plugins/EcalCosmicsHists.cc
index 6d9c50ec77536..06c1f402fd151 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalCosmicsHists.cc
+++ b/CaloOnlineTools/EcalTools/plugins/EcalCosmicsHists.cc
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 //
-// Package:   EcalCosmicsHists 
-// Class:     EcalCosmicsHists  
-// 
+// Package:   EcalCosmicsHists
+// Class:     EcalCosmicsHists
+//
 /**\class EcalCosmicsHists EcalCosmicsHists.cc
 
  Description: <one line class summary>
@@ -11,7 +11,6 @@
      <Notes on implementation>
 */
 
- 
 #include "CaloOnlineTools/EcalTools/plugins/EcalCosmicsHists.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "Geometry/CaloTopology/interface/CaloTopology.h"
@@ -36,11 +35,9 @@
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
 #include "CondFormats/DataRecord/interface/EcalADCToGeVConstantRcd.h"
 
-
 #include <vector>
 #include "TLine.h"
 
- 
 using namespace cms;
 using namespace edm;
 using namespace std;
@@ -56,28 +53,27 @@ using namespace std;
 //
 // constructors and destructor
 //
-EcalCosmicsHists::EcalCosmicsHists(const edm::ParameterSet& iConfig) :
-  ecalRawDataColl_(iConfig.getParameter<edm::InputTag>("ecalRawDataColl")),
-  ecalRecHitCollectionEB_ (iConfig.getParameter<edm::InputTag>("ecalRecHitCollectionEB")),
-  ecalRecHitCollectionEE_ (iConfig.getParameter<edm::InputTag>("ecalRecHitCollectionEE")),
-  barrelClusterCollection_ (iConfig.getParameter<edm::InputTag>("barrelClusterCollection")),
-  endcapClusterCollection_ (iConfig.getParameter<edm::InputTag>("endcapClusterCollection")),
-  l1GTReadoutRecTag_ (iConfig.getUntrackedParameter<std::string>("L1GlobalReadoutRecord","gtDigis")),
-  l1GMTReadoutRecTag_ (iConfig.getUntrackedParameter<std::string>("L1GlobalMuonReadoutRecord","gtDigis")),
-  runNum_(-1),
-  histRangeMax_ (iConfig.getUntrackedParameter<double>("histogramMaxRange",1.8)),
-  histRangeMin_ (iConfig.getUntrackedParameter<double>("histogramMinRange",0.0)),
-  minTimingAmpEB_ (iConfig.getUntrackedParameter<double>("MinTimingAmpEB",0.100)),
-  minTimingAmpEE_ (iConfig.getUntrackedParameter<double>("MinTimingAmpEE",0.100)),
-  minRecHitAmpEB_(iConfig.getUntrackedParameter<double>("MinRecHitAmpEB",0.027)),
-  minRecHitAmpEE_(iConfig.getUntrackedParameter<double>("MinRecHitAmpEE",0.18)),
-  minHighEnergy_(iConfig.getUntrackedParameter<double>("MinHighEnergy",2.0)),
-  fileName_ (iConfig.getUntrackedParameter<std::string>("fileName", std::string("ecalCosmicHists"))),
-  runInFileName_(iConfig.getUntrackedParameter<bool>("runInFileName",true)),
-  startTime_ (iConfig.getUntrackedParameter<double>("TimeStampStart",1215107133.)),
-  runTimeLength_ (iConfig.getUntrackedParameter<double>("TimeStampLength",3.)),
-  numTimingBins_(iConfig.getUntrackedParameter<int>("TimeStampBins",1800))
-{
+EcalCosmicsHists::EcalCosmicsHists(const edm::ParameterSet& iConfig)
+    : ecalRawDataColl_(iConfig.getParameter<edm::InputTag>("ecalRawDataColl")),
+      ecalRecHitCollectionEB_(iConfig.getParameter<edm::InputTag>("ecalRecHitCollectionEB")),
+      ecalRecHitCollectionEE_(iConfig.getParameter<edm::InputTag>("ecalRecHitCollectionEE")),
+      barrelClusterCollection_(iConfig.getParameter<edm::InputTag>("barrelClusterCollection")),
+      endcapClusterCollection_(iConfig.getParameter<edm::InputTag>("endcapClusterCollection")),
+      l1GTReadoutRecTag_(iConfig.getUntrackedParameter<std::string>("L1GlobalReadoutRecord", "gtDigis")),
+      l1GMTReadoutRecTag_(iConfig.getUntrackedParameter<std::string>("L1GlobalMuonReadoutRecord", "gtDigis")),
+      runNum_(-1),
+      histRangeMax_(iConfig.getUntrackedParameter<double>("histogramMaxRange", 1.8)),
+      histRangeMin_(iConfig.getUntrackedParameter<double>("histogramMinRange", 0.0)),
+      minTimingAmpEB_(iConfig.getUntrackedParameter<double>("MinTimingAmpEB", 0.100)),
+      minTimingAmpEE_(iConfig.getUntrackedParameter<double>("MinTimingAmpEE", 0.100)),
+      minRecHitAmpEB_(iConfig.getUntrackedParameter<double>("MinRecHitAmpEB", 0.027)),
+      minRecHitAmpEE_(iConfig.getUntrackedParameter<double>("MinRecHitAmpEE", 0.18)),
+      minHighEnergy_(iConfig.getUntrackedParameter<double>("MinHighEnergy", 2.0)),
+      fileName_(iConfig.getUntrackedParameter<std::string>("fileName", std::string("ecalCosmicHists"))),
+      runInFileName_(iConfig.getUntrackedParameter<bool>("runInFileName", true)),
+      startTime_(iConfig.getUntrackedParameter<double>("TimeStampStart", 1215107133.)),
+      runTimeLength_(iConfig.getUntrackedParameter<double>("TimeStampLength", 3.)),
+      numTimingBins_(iConfig.getUntrackedParameter<int>("TimeStampBins", 1800)) {
   naiveEvtNum_ = 0;
   cosmicCounter_ = 0;
   cosmicCounterEB_ = 0;
@@ -88,100 +84,88 @@ EcalCosmicsHists::EcalCosmicsHists(const edm::ParameterSet& iConfig) :
   // TrackAssociator parameters
   edm::ParameterSet trkParameters = iConfig.getParameter<edm::ParameterSet>("TrackAssociatorParameters");
   edm::ConsumesCollector iC = consumesCollector();
-  trackParameters_.loadParameters( trkParameters, iC );
+  trackParameters_.loadParameters(trkParameters, iC);
   trackAssociator_.useDefaultPropagator();
-  
+
   string title1 = "Seed Energy for All Feds; Seed Energy (GeV)";
   string name1 = "SeedEnergyAllFEDs";
-  int numBins = 200;//(int)round(histRangeMax_-histRangeMin_)+1;
-  allFedsHist_ = new TH1F(name1.c_str(),title1.c_str(),numBins,histRangeMin_,histRangeMax_);
-  
-  fedMap_ = new EcalFedMap();
-}
+  int numBins = 200;  //(int)round(histRangeMax_-histRangeMin_)+1;
+  allFedsHist_ = new TH1F(name1.c_str(), title1.c_str(), numBins, histRangeMin_, histRangeMax_);
 
-
-EcalCosmicsHists::~EcalCosmicsHists()
-{
+  fedMap_ = new EcalFedMap();
 }
 
+EcalCosmicsHists::~EcalCosmicsHists() {}
 
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-EcalCosmicsHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSetup)
-{
+void EcalCosmicsHists::analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup) {
   bool hasEndcapClusters = true;
   int ievt = iEvent.id().event();
-  
-  edm::Handle<reco::SuperClusterCollection> bscHandle;  
-  edm::Handle<reco::SuperClusterCollection> escHandle;  
-  
+
+  edm::Handle<reco::SuperClusterCollection> bscHandle;
+  edm::Handle<reco::SuperClusterCollection> escHandle;
+
   naiveEvtNum_++;
-  
+
   //LogDebug("EcalCosmicsHists")<< "  My Event: " << naiveEvtNum_ << " " << iEvent.id().run() << " " << iEvent.id().event() << " " << iEvent.time().value();
   //LogDebug("EcalCosmicsHists")<< "Timestamp: " << iEvent.id().run() << " " << iEvent.id().event() << " " << iEvent.time().value();
-  
 
   // check DB payload
   edm::ESHandle<EcalADCToGeVConstant> pAgc;
   iSetup.get<EcalADCToGeVConstantRcd>().get(pAgc);
   const EcalADCToGeVConstant* agc = pAgc.product();
-  if (naiveEvtNum_<=1) {
-    LogWarning("EcalCosmicsHists") << "Global EB ADC->GeV scale: " << agc->getEBValue() << " GeV/ADC count" ;
-    LogWarning("EcalCosmicsHists") << "Global EE ADC->GeV scale: " << agc->getEEValue() << " GeV/ADC count" ;
+  if (naiveEvtNum_ <= 1) {
+    LogWarning("EcalCosmicsHists") << "Global EB ADC->GeV scale: " << agc->getEBValue() << " GeV/ADC count";
+    LogWarning("EcalCosmicsHists") << "Global EE ADC->GeV scale: " << agc->getEEValue() << " GeV/ADC count";
   }
-    //float adcEBconst = agc->getEBValue();
-    //float adcEEconst = agc->getEEValue();
-
+  //float adcEBconst = agc->getEBValue();
+  //float adcEEconst = agc->getEEValue();
 
   //
 
   //===================TIMESTAMP INFORMTION=================================
   // Code added to get the time in seconds
-  unsigned int  timeStampLow = ( 0xFFFFFFFF & iEvent.time().value() );
-  unsigned int  timeStampHigh = ( iEvent.time().value() >> 32 );
-  double rawEventTime = ( double)(timeStampHigh)+((double )(timeStampLow)/1000000.);
-  double eventTime = rawEventTime - startTime_; //Notice the subtraction of the "starttime"
-  //std::cout << "Event Time " << eventTime << " High " <<timeStampHigh<< " low"<<timeStampLow <<" value " <<iEvent.time().value() << std::endl;  
+  unsigned int timeStampLow = (0xFFFFFFFF & iEvent.time().value());
+  unsigned int timeStampHigh = (iEvent.time().value() >> 32);
+  double rawEventTime = (double)(timeStampHigh) + ((double)(timeStampLow) / 1000000.);
+  double eventTime = rawEventTime - startTime_;  //Notice the subtraction of the "starttime"
+  //std::cout << "Event Time " << eventTime << " High " <<timeStampHigh<< " low"<<timeStampLow <<" value " <<iEvent.time().value() << std::endl;
   //========================================================================
 
   iEvent.getByLabel(barrelClusterCollection_, bscHandle);
-  if (!(bscHandle.isValid())) 
-    {
-      LogWarning("EcalCosmicsHists") << barrelClusterCollection_ << " not available";
-      return;
-    }
+  if (!(bscHandle.isValid())) {
+    LogWarning("EcalCosmicsHists") << barrelClusterCollection_ << " not available";
+    return;
+  }
   LogDebug("EcalCosmicsHists") << "event " << ievt;
-  
+
   iEvent.getByLabel(endcapClusterCollection_, escHandle);
-  if (!(escHandle.isValid())) 
-    {
-      LogWarning("EcalCosmicsHists") << endcapClusterCollection_ << " not available";
-      hasEndcapClusters = false;
-      //return;
-    }
-  
+  if (!(escHandle.isValid())) {
+    LogWarning("EcalCosmicsHists") << endcapClusterCollection_ << " not available";
+    hasEndcapClusters = false;
+    //return;
+  }
+
   Handle<EcalRecHitCollection> hits;
   iEvent.getByLabel(ecalRecHitCollectionEB_, hits);
-  if (!(hits.isValid())) 
-    {
-      LogWarning("EcalCosmicsHists") << ecalRecHitCollectionEB_ << " not available";
-      return;
-    }
+  if (!(hits.isValid())) {
+    LogWarning("EcalCosmicsHists") << ecalRecHitCollectionEB_ << " not available";
+    return;
+  }
   Handle<EcalRecHitCollection> hitsEE;
   iEvent.getByLabel(ecalRecHitCollectionEE_, hitsEE);
-  if (!(hitsEE.isValid())) 
-    {
-      LogWarning("EcalCosmicsHists") << ecalRecHitCollectionEE_ << " not available";
-      return;
-    }
-  
+  if (!(hitsEE.isValid())) {
+    LogWarning("EcalCosmicsHists") << ecalRecHitCollectionEE_ << " not available";
+    return;
+  }
+
   Handle<EcalRawDataCollection> DCCHeaders;
   iEvent.getByLabel(ecalRawDataColl_, DCCHeaders);
-  if(!DCCHeaders.isValid())
+  if (!DCCHeaders.isValid())
     LogWarning("EcalCosmicsHists") << "DCC headers not available";
 
   //make the bx histos right here
@@ -190,399 +174,406 @@ EcalCosmicsHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSe
   int bx = -100;
   int runType = -100;
 
-  for(EcalRawDataCollection::const_iterator headerItr= DCCHeaders->begin();headerItr != DCCHeaders->end(); 
-      ++headerItr) {
+  for (EcalRawDataCollection::const_iterator headerItr = DCCHeaders->begin(); headerItr != DCCHeaders->end();
+       ++headerItr) {
     headerItr->getEventSettings();
     int myorbit = headerItr->getOrbit();
     int mybx = headerItr->getBX();
     int myRunType = headerItr->getRunType();
     int FEDid = headerItr->fedId();
     TH2F* dccRuntypeHist = FEDsAndDCCRuntypeVsBxHists_[FEDid];
-    if(dccRuntypeHist==nullptr)
-    {
+    if (dccRuntypeHist == nullptr) {
       initHists(FEDid);
       dccRuntypeHist = FEDsAndDCCRuntypeVsBxHists_[FEDid];
     }
-    dccRuntypeHist->Fill(mybx,myRunType);
-    
-    if (bx == -100)
-    {
+    dccRuntypeHist->Fill(mybx, myRunType);
+
+    if (bx == -100) {
       bx = mybx;
-    }
-    else if (bx != mybx)
-    {
+    } else if (bx != mybx) {
       LogWarning("EcalCosmicsHists") << "This header has a conflicting bx OTHERS were " << bx << " here " << mybx;
       dccBXErrorByFEDHist_->Fill(headerItr->fedId());
-      if(bx != -100)
-      {
-        dccErrorVsBxHist_->Fill(bx,0);
+      if (bx != -100) {
+        dccErrorVsBxHist_->Fill(bx, 0);
       }
     }
 
-    if (runType == -100)
-    {
+    if (runType == -100) {
       runType = myRunType;
-    }
-    else if (runType != myRunType)
-    {
+    } else if (runType != myRunType) {
       LogWarning("EcalCosmicsHists") << "This header has a conflicting runType OTHERS were " << bx << " here " << mybx;
       dccRuntypeErrorByFEDHist_->Fill(headerItr->fedId());
-      if(bx != -100)
-        dccErrorVsBxHist_->Fill(bx,2);
+      if (bx != -100)
+        dccErrorVsBxHist_->Fill(bx, 2);
     }
-    
-    
-    if (orbit == -100)
-    {
+
+    if (orbit == -100) {
       orbit = myorbit;
-    }
-    else if (orbit != myorbit)
-    {
-      LogWarning("EcalCosmicsHists") << "This header has a conflicting orbit; OTHERS were " << orbit << " here " << myorbit;
+    } else if (orbit != myorbit) {
+      LogWarning("EcalCosmicsHists") << "This header has a conflicting orbit; OTHERS were " << orbit << " here "
+                                     << myorbit;
       dccOrbitErrorByFEDHist_->Fill(headerItr->fedId());
-      if(bx != -100)
-        dccErrorVsBxHist_->Fill(bx,1);
+      if (bx != -100)
+        dccErrorVsBxHist_->Fill(bx, 1);
     }
   }
-  dccEventVsBxHist_->Fill(bx,runType);
+  dccEventVsBxHist_->Fill(bx, runType);
   dccRuntypeHist_->Fill(runType);
 
-
-  
-  std::vector<bool> l1Triggers = determineTriggers(iEvent, iSetup);      
+  std::vector<bool> l1Triggers = determineTriggers(iEvent, iSetup);
   bool isEcalL1 = l1Triggers[4];
   bool isHCALL1 = l1Triggers[3];
   bool isRPCL1 = l1Triggers[2];
   bool isCSCL1 = l1Triggers[1];
   bool isDTL1 = l1Triggers[0];
-  
-  if(runNum_==-1)
-    {
-      runNum_ = iEvent.id().run();
-    }      
-  
-  int  numberOfCosmics = 0;
-  int  numberOfCosmicsEB = 0;
-  int  numberOfCosmicsEEP = 0;
-  int  numberOfCosmicsEEM = 0;
-  int  numberOfCosmicsTop = 0;
-  int  numberOfCosmicsBottom = 0;
-  int  numberOfHighEClusters = 0;
+
+  if (runNum_ == -1) {
+    runNum_ = iEvent.id().run();
+  }
+
+  int numberOfCosmics = 0;
+  int numberOfCosmicsEB = 0;
+  int numberOfCosmicsEEP = 0;
+  int numberOfCosmicsEEM = 0;
+  int numberOfCosmicsTop = 0;
+  int numberOfCosmicsBottom = 0;
+  int numberOfHighEClusters = 0;
   //int eventnum = iEvent.id().event();
   std::vector<EBDetId> seeds;
-  
+
   //++++++++++++++++++BEGIN LOOP OVER EB SUPERCLUSTERS+++++++++++++++++++++++++//
 
-  const reco::SuperClusterCollection *clusterCollection_p = bscHandle.product();
-  for (reco::SuperClusterCollection::const_iterator clus = clusterCollection_p->begin(); clus != clusterCollection_p->end(); ++clus) 
-   {
-     double energy = clus->energy();
-     double phi    = clus->phi();
-     double eta    = clus->eta();
-     double time = -1000.0;
-     double ampli = 0.;
-     double secondMin = 0.;
-     double secondTime = -1000.;
-     int numXtalsinCluster = 0;
-     
-     EBDetId maxDet;
-     EBDetId secDet;
-     
-     numberofBCinSC_->Fill(clus->clustersSize());
-     numberofBCinSCphi_->Fill(phi,clus->clustersSize());     
-     
-     for (reco::CaloCluster_iterator bclus = (clus->clustersBegin()); bclus != (clus->clustersEnd()); ++bclus) 
-       {
-	 double cphi = (*bclus)->phi();
-	 double ceta = (*bclus)->eta();     
-	 TrueBCOccupancy_->Fill(cphi,ceta);
-	 TrueBCOccupancyCoarse_->Fill(cphi,ceta);
-       }
-     
-     std::vector< std::pair<DetId, float> > clusterDetIds = clus->hitsAndFractions();//get these from the cluster
-     for(std::vector<std::pair<DetId, float> >::const_iterator detitr = clusterDetIds.begin(); detitr != clusterDetIds.end(); ++detitr) 
-       {
-	 //Here I use the "find" on a digi collection... I have been warned...
-	 if ((*detitr).first.det() != DetId::Ecal) { std::cout << " det is " <<(*detitr).first.det() << std::endl;continue;}
-	 if ((*detitr).first.subdetId() != EcalBarrel) {std::cout << " subdet is " <<(*detitr).first.subdetId() << std::endl; continue; }
-	 EcalRecHitCollection::const_iterator thishit = hits->find((*detitr).first);
-	 if (thishit == hits->end()) continue;
-	 //The checking above should no longer be needed...... as only those in the cluster would already have rechits..
-	 
-	 EcalRecHit myhit = (*thishit);
-	 
-	 double thisamp = myhit.energy();
-	 if (thisamp > minRecHitAmpEB_) {numXtalsinCluster++; }
-	 if (thisamp > secondMin) {secondMin = thisamp; secondTime = myhit.time(); secDet = (EBDetId)(*detitr).first;}
-	 if (secondMin > ampli) {std::swap(ampli,secondMin); std::swap(time,secondTime); std::swap(maxDet,secDet);}
-       }
-     
-     double fullnumXtalsinCluster = clusterDetIds.size();     
-     
-     float E2 = ampli + secondMin;
-     EcalElectronicsId elecId = ecalElectronicsMap_->getElectronicsId((EBDetId) maxDet);
-     int FEDid = 600+elecId.dccId();
-     
-     numberOfCosmics++;
-     numberOfCosmicsEB++;
-     
-     //Set some more values
-     seeds.push_back(maxDet);
-     int ieta = maxDet.ieta();
-     int iphi = maxDet.iphi();
-     int ietaSM = maxDet.ietaSM();
-     int iphiSM = maxDet.iphiSM();
-     
-     int LM = ecalElectronicsMap_->getLMNumber(maxDet) ;//FIX ME
-     
-     // top and bottom clusters
-     if (iphi>0&&iphi<180) { 
-       numberOfCosmicsTop++;
-     } else {
-       numberOfCosmicsBottom++;
-     }      
-     
-     // fill the proper hist
-     TH1F* uRecHist = FEDsAndHists_[FEDid];
-     TH1F* E2uRecHist = FEDsAndE2Hists_[FEDid];
-     TH1F* energyuRecHist = FEDsAndenergyHists_[FEDid];
-     TH1F* timingHist = FEDsAndTimingHists_[FEDid];
-     TH1F* freqHist = FEDsAndFrequencyHists_[FEDid];
-     TH1F* iphiProfileHist = FEDsAndiPhiProfileHists_[FEDid];
-     TH1F* ietaProfileHist = FEDsAndiEtaProfileHists_[FEDid];
-     TH2F* timingHistVsFreq = FEDsAndTimingVsFreqHists_[FEDid];
-     TH2F* timingHistVsAmp = FEDsAndTimingVsAmpHists_[FEDid];
-     TH2F* E2vsE1uRecHist = FEDsAndE2vsE1Hists_[FEDid];
-     TH2F* energyvsE1uRecHist = FEDsAndenergyvsE1Hists_[FEDid];
-     TH2F* occupHist = FEDsAndOccupancyHists_[FEDid];
-     TH2F* timingHistVsPhi = FEDsAndTimingVsPhiHists_[FEDid];
-     TH2F* timingHistVsModule = FEDsAndTimingVsModuleHists_[FEDid];
-     
-     if(uRecHist==nullptr)
-       {
-	 initHists(FEDid);
-	 uRecHist = FEDsAndHists_[FEDid];
-	 E2uRecHist = FEDsAndE2Hists_[FEDid];
-	 energyuRecHist = FEDsAndenergyHists_[FEDid];
-	 timingHist = FEDsAndTimingHists_[FEDid];
-	 freqHist = FEDsAndFrequencyHists_[FEDid];
-	 timingHistVsFreq = FEDsAndTimingVsFreqHists_[FEDid];
-	 timingHistVsAmp = FEDsAndTimingVsAmpHists_[FEDid];
-	 iphiProfileHist = FEDsAndiPhiProfileHists_[FEDid];
-	 ietaProfileHist = FEDsAndiEtaProfileHists_[FEDid];
-	 E2vsE1uRecHist = FEDsAndE2vsE1Hists_[FEDid];
-	 energyvsE1uRecHist = FEDsAndenergyvsE1Hists_[FEDid];
-	 occupHist = FEDsAndOccupancyHists_[FEDid];
-	 timingHistVsPhi = FEDsAndTimingVsPhiHists_[FEDid];
-	 timingHistVsModule = FEDsAndTimingVsModuleHists_[FEDid];
-       }
-     
-     uRecHist->Fill(ampli);
-     E2uRecHist->Fill(E2);
-     E2vsE1uRecHist->Fill(ampli,E2);
-     energyuRecHist->Fill(energy);
-     energyvsE1uRecHist->Fill(ampli,energy);
-     allFedsHist_->Fill(ampli);
-     allFedsE2Hist_->Fill(E2); 
-     allFedsenergyHist_->Fill(energy);
-     allFedsenergyHighHist_->Fill(energy);
-     allFedsE2vsE1Hist_->Fill(ampli,E2);
-     allFedsenergyvsE1Hist_->Fill(ampli,energy);
-     freqHist->Fill(naiveEvtNum_);
-     iphiProfileHist->Fill(iphi);
-     ietaProfileHist->Fill(ieta);
-     
-     allFedsFrequencyHist_->Fill(naiveEvtNum_);
-     allFedsiPhiProfileHist_->Fill(iphi);
-     allFedsiEtaProfileHist_->Fill(ieta);
-     allOccupancy_->Fill(iphi, ieta);
-     TrueOccupancy_->Fill(phi, eta);
-     allOccupancyCoarse_->Fill(iphi, ieta);
-     TrueOccupancyCoarse_->Fill(phi, eta);
-     allFedsNumXtalsInClusterHist_->Fill(numXtalsinCluster);
-     NumXtalsInClusterHist_->Fill(fullnumXtalsinCluster);
-     numxtalsVsEnergy_->Fill(energy,numXtalsinCluster);
-     numxtalsVsHighEnergy_->Fill(energy,numXtalsinCluster);
-     
-     //Fill the hists for the time stamp information
-     allFedsFreqTimeVsPhiHist_->Fill(iphi,eventTime);
-     allFedsFreqTimeVsPhiTTHist_->Fill(iphi,eventTime);
-     allFedsFreqTimeVsEtaHist_->Fill(eventTime,ieta);
-     allFedsFreqTimeVsEtaTTHist_->Fill(eventTime,ieta);
-     //end time stamp hists
-     
-     occupHist->Fill(ietaSM,iphiSM);
-     if (fullnumXtalsinCluster==1) {
-       allOccupancySingleXtal_->Fill(iphi, ieta);
-       energySingleXtalHist_->Fill(energy);
-     }
-     
-     // Exclusive trigger plots
-     
-     if(isEcalL1&&!isDTL1&&!isRPCL1&&!isCSCL1&&!isHCALL1) {
-       allOccupancyExclusiveECAL_->Fill(iphi, ieta);
-       allOccupancyCoarseExclusiveECAL_->Fill(iphi, ieta);
-       if (ampli > minTimingAmpEB_) {
-	 allFedsTimingHistECAL_->Fill(time);
-	 allFedsTimingPhiEtaHistECAL_->Fill(iphi,ieta,time);
-	 allFedsTimingTTHistECAL_->Fill(iphi,ieta,time);
-	 allFedsTimingLMHistECAL_->Fill(LM,time);
-       }      
-       triggerExclusiveHist_->Fill(0);
-     } 
-     
-     if(!isEcalL1&&!isDTL1&&!isRPCL1&&!isCSCL1&&isHCALL1) {   
-       allOccupancyExclusiveHCAL_->Fill(iphi, ieta);
-       allOccupancyCoarseExclusiveHCAL_->Fill(iphi, ieta);
-       if (ampli > minTimingAmpEB_) {
-	 allFedsTimingHistHCAL_->Fill(time);
-	 allFedsTimingPhiEtaHistHCAL_->Fill(iphi,ieta,time);
-	 allFedsTimingTTHistHCAL_->Fill(iphi,ieta,time);
-	 allFedsTimingLMHistHCAL_->Fill(LM,time);
-       }      
-       triggerExclusiveHist_->Fill(1);
-     }
-     
-     if(!isEcalL1&&isDTL1&&!isRPCL1&&!isCSCL1&&!isHCALL1) {
-       allOccupancyExclusiveDT_->Fill(iphi, ieta);
-       allOccupancyCoarseExclusiveDT_->Fill(iphi, ieta);
-       if (ampli > minTimingAmpEB_) {
-	 allFedsTimingHistDT_->Fill(time);
-	 allFedsTimingPhiEtaHistDT_->Fill(iphi,ieta,time);
-	 allFedsTimingTTHistDT_->Fill(iphi,ieta,time);
-	 allFedsTimingLMHistDT_->Fill(LM,time);
-       }      
-       triggerExclusiveHist_->Fill(2);
-     }
-     
-     if(!isEcalL1&&!isDTL1&&isRPCL1&&!isCSCL1&&!isHCALL1) {
-       allOccupancyExclusiveRPC_->Fill(iphi, ieta);
-       allOccupancyCoarseExclusiveRPC_->Fill(iphi, ieta);
-       if (ampli > minTimingAmpEB_) {
-	 allFedsTimingHistRPC_->Fill(time);
-	 allFedsTimingPhiEtaHistRPC_->Fill(iphi,ieta,time);
-	 allFedsTimingTTHistRPC_->Fill(iphi,ieta,time);
-	 allFedsTimingLMHistRPC_->Fill(LM,time);
-       }      
-       triggerExclusiveHist_->Fill(3);
-     }
-     
-     if(!isEcalL1&&!isDTL1&&!isRPCL1&&isCSCL1&&!isHCALL1) {   
-       allOccupancyExclusiveCSC_->Fill(iphi, ieta);
-       allOccupancyCoarseExclusiveCSC_->Fill(iphi, ieta);
-       if (ampli > minTimingAmpEB_) {
-	 allFedsTimingHistCSC_->Fill(time);
-	 allFedsTimingPhiEtaHistCSC_->Fill(iphi,ieta,time);
-	 allFedsTimingTTHistCSC_->Fill(iphi,ieta,time);
-	 allFedsTimingLMHistCSC_->Fill(LM,time);
-       }      
-       triggerExclusiveHist_->Fill(4);
-     }
-     
-     // Inclusive trigger plots
-     
-     if (isEcalL1) { 
-       triggerHist_->Fill(0);
-       allOccupancyECAL_->Fill(iphi, ieta);
-       allOccupancyCoarseECAL_->Fill(iphi, ieta);
-     }
-     if (isHCALL1) {
-       triggerHist_->Fill(1);
-       allOccupancyHCAL_->Fill(iphi, ieta);
-       allOccupancyCoarseHCAL_->Fill(iphi, ieta);
-     }
-     if (isDTL1)   {
-       triggerHist_->Fill(2);
-       allOccupancyDT_->Fill(iphi, ieta);
-       allOccupancyCoarseDT_->Fill(iphi, ieta);
-     }
-     if (isRPCL1)  {
-       triggerHist_->Fill(3);
-       allOccupancyRPC_->Fill(iphi, ieta);
-       allOccupancyCoarseRPC_->Fill(iphi, ieta);
-     }
-     if (isCSCL1)  {
-       triggerHist_->Fill(4);
-       allOccupancyCSC_->Fill(iphi, ieta);
-       allOccupancyCoarseCSC_->Fill(iphi, ieta);
-     }
-     
-     // Fill histo for Ecal+muon coincidence
-     if(isEcalL1&&(isCSCL1||isRPCL1||isDTL1)&&!isHCALL1)
-       allFedsTimingHistEcalMuon_->Fill(time);
-     
-     if (ampli > minTimingAmpEB_) {
-       timingHist->Fill(time);
-       timingHistVsFreq->Fill(time, naiveEvtNum_);
-       timingHistVsAmp->Fill(time, ampli);
-       allFedsTimingHist_->Fill(time);
-       allFedsTimingVsAmpHist_->Fill(time, ampli);
-       allFedsTimingVsFreqHist_->Fill(time, naiveEvtNum_);
-       timingHistVsPhi->Fill(time, iphiSM);
-       timingHistVsModule->Fill(time, ietaSM);
-       allFedsTimingPhiHist_->Fill(iphi,time);
-       allFedsTimingPhiEtaHist_->Fill(iphi,ieta,time);
-       allFedsTimingTTHist_->Fill(iphi,ieta,time);
-       allFedsTimingLMHist_->Fill(LM,time);
-       if (FEDid>=610&&FEDid<=627)  allFedsTimingPhiEbmHist_->Fill(iphi,time);
-       if (FEDid>=628&&FEDid<=645)  allFedsTimingPhiEbpHist_->Fill(iphi,time);
-       
-       if (FEDid>=610&&FEDid<=627)  allFedsTimingEbmHist_->Fill(time);
-       if (FEDid>=628&&FEDid<=645)  allFedsTimingEbpHist_->Fill(time);
-       if (FEDid>=613&&FEDid<=616)  allFedsTimingEbmTopHist_->Fill(time);
-       if (FEDid>=631&&FEDid<=634)  allFedsTimingEbpTopHist_->Fill(time);
-       if (FEDid>=622&&FEDid<=625)  allFedsTimingEbmBottomHist_->Fill(time);
-       if (FEDid>=640&&FEDid<=643)  allFedsTimingEbpBottomHist_->Fill(time);
-     }         
-     
-     // *** High Energy Clusters Analysis ** //
-     
-     if (energy>minHighEnergy_) {
-       
-       LogInfo("EcalCosmicsHists") << "High energy event " << iEvent.id().run() << " : " 
-				   << iEvent.id().event() << " " << naiveEvtNum_  
-				   << " : " << energy << " " << numXtalsinCluster
-				   << " : " << iphi << " " << ieta 
-				   << " : " << isEcalL1 << isHCALL1 << isDTL1 << isRPCL1 << isCSCL1 ;
-       
-       numberOfHighEClusters++;
-       allOccupancyHighEnergy_->Fill(iphi, ieta);
-       allOccupancyHighEnergyCoarse_->Fill(iphi, ieta);    
-       allFedsOccupancyHighEnergyHist_->Fill(iphi,ieta,energy);
-       allFedsenergyOnlyHighHist_->Fill(energy);
-       
-       HighEnergy_2GeV_occuCoarse->Fill(iphi,ieta);    
-       HighEnergy_2GeV_occu3D->Fill(iphi,ieta,energy);
-       
-       HighEnergy_NumXtal->Fill(fullnumXtalsinCluster);
-       HighEnergy_NumXtalFedId->Fill(FEDid,fullnumXtalsinCluster);
-       HighEnergy_NumXtaliphi->Fill(iphi,fullnumXtalsinCluster);
-       HighEnergy_energy3D->Fill(iphi,ieta,energy);
-       HighEnergy_energyNumXtal->Fill(fullnumXtalsinCluster,energy);
-       
-       if (energy>100.0) {
-	 LogInfo("EcalCosmicsHists") << "Very high energy event " << iEvent.id().run() << " : " 
-				     << iEvent.id().event() << " " << naiveEvtNum_  
-				     << " : " << energy << " " << numXtalsinCluster 
-				     << " : " << iphi << " " << ieta 
-				     << " : " << isEcalL1 << isHCALL1 << isDTL1 << isRPCL1 << isCSCL1 ;
-	 
-	 HighEnergy_100GeV_occuCoarse->Fill(iphi,ieta);    
-	 HighEnergy_100GeV_occu3D->Fill(iphi,ieta,energy);
-	 
-       }
-       
-     }  
-     
-     // *** end of High Energy Clusters analysis *** //
-     
-   }//++++++++++++++++++END LOOP OVER EB SUPERCLUSTERS+++++++++++++++++++++++//
-  
+  const reco::SuperClusterCollection* clusterCollection_p = bscHandle.product();
+  for (reco::SuperClusterCollection::const_iterator clus = clusterCollection_p->begin();
+       clus != clusterCollection_p->end();
+       ++clus) {
+    double energy = clus->energy();
+    double phi = clus->phi();
+    double eta = clus->eta();
+    double time = -1000.0;
+    double ampli = 0.;
+    double secondMin = 0.;
+    double secondTime = -1000.;
+    int numXtalsinCluster = 0;
+
+    EBDetId maxDet;
+    EBDetId secDet;
+
+    numberofBCinSC_->Fill(clus->clustersSize());
+    numberofBCinSCphi_->Fill(phi, clus->clustersSize());
+
+    for (reco::CaloCluster_iterator bclus = (clus->clustersBegin()); bclus != (clus->clustersEnd()); ++bclus) {
+      double cphi = (*bclus)->phi();
+      double ceta = (*bclus)->eta();
+      TrueBCOccupancy_->Fill(cphi, ceta);
+      TrueBCOccupancyCoarse_->Fill(cphi, ceta);
+    }
+
+    std::vector<std::pair<DetId, float> > clusterDetIds = clus->hitsAndFractions();  //get these from the cluster
+    for (std::vector<std::pair<DetId, float> >::const_iterator detitr = clusterDetIds.begin();
+         detitr != clusterDetIds.end();
+         ++detitr) {
+      //Here I use the "find" on a digi collection... I have been warned...
+      if ((*detitr).first.det() != DetId::Ecal) {
+        std::cout << " det is " << (*detitr).first.det() << std::endl;
+        continue;
+      }
+      if ((*detitr).first.subdetId() != EcalBarrel) {
+        std::cout << " subdet is " << (*detitr).first.subdetId() << std::endl;
+        continue;
+      }
+      EcalRecHitCollection::const_iterator thishit = hits->find((*detitr).first);
+      if (thishit == hits->end())
+        continue;
+      //The checking above should no longer be needed...... as only those in the cluster would already have rechits..
+
+      EcalRecHit myhit = (*thishit);
+
+      double thisamp = myhit.energy();
+      if (thisamp > minRecHitAmpEB_) {
+        numXtalsinCluster++;
+      }
+      if (thisamp > secondMin) {
+        secondMin = thisamp;
+        secondTime = myhit.time();
+        secDet = (EBDetId)(*detitr).first;
+      }
+      if (secondMin > ampli) {
+        std::swap(ampli, secondMin);
+        std::swap(time, secondTime);
+        std::swap(maxDet, secDet);
+      }
+    }
+
+    double fullnumXtalsinCluster = clusterDetIds.size();
+
+    float E2 = ampli + secondMin;
+    EcalElectronicsId elecId = ecalElectronicsMap_->getElectronicsId((EBDetId)maxDet);
+    int FEDid = 600 + elecId.dccId();
+
+    numberOfCosmics++;
+    numberOfCosmicsEB++;
+
+    //Set some more values
+    seeds.push_back(maxDet);
+    int ieta = maxDet.ieta();
+    int iphi = maxDet.iphi();
+    int ietaSM = maxDet.ietaSM();
+    int iphiSM = maxDet.iphiSM();
+
+    int LM = ecalElectronicsMap_->getLMNumber(maxDet);  //FIX ME
+
+    // top and bottom clusters
+    if (iphi > 0 && iphi < 180) {
+      numberOfCosmicsTop++;
+    } else {
+      numberOfCosmicsBottom++;
+    }
+
+    // fill the proper hist
+    TH1F* uRecHist = FEDsAndHists_[FEDid];
+    TH1F* E2uRecHist = FEDsAndE2Hists_[FEDid];
+    TH1F* energyuRecHist = FEDsAndenergyHists_[FEDid];
+    TH1F* timingHist = FEDsAndTimingHists_[FEDid];
+    TH1F* freqHist = FEDsAndFrequencyHists_[FEDid];
+    TH1F* iphiProfileHist = FEDsAndiPhiProfileHists_[FEDid];
+    TH1F* ietaProfileHist = FEDsAndiEtaProfileHists_[FEDid];
+    TH2F* timingHistVsFreq = FEDsAndTimingVsFreqHists_[FEDid];
+    TH2F* timingHistVsAmp = FEDsAndTimingVsAmpHists_[FEDid];
+    TH2F* E2vsE1uRecHist = FEDsAndE2vsE1Hists_[FEDid];
+    TH2F* energyvsE1uRecHist = FEDsAndenergyvsE1Hists_[FEDid];
+    TH2F* occupHist = FEDsAndOccupancyHists_[FEDid];
+    TH2F* timingHistVsPhi = FEDsAndTimingVsPhiHists_[FEDid];
+    TH2F* timingHistVsModule = FEDsAndTimingVsModuleHists_[FEDid];
+
+    if (uRecHist == nullptr) {
+      initHists(FEDid);
+      uRecHist = FEDsAndHists_[FEDid];
+      E2uRecHist = FEDsAndE2Hists_[FEDid];
+      energyuRecHist = FEDsAndenergyHists_[FEDid];
+      timingHist = FEDsAndTimingHists_[FEDid];
+      freqHist = FEDsAndFrequencyHists_[FEDid];
+      timingHistVsFreq = FEDsAndTimingVsFreqHists_[FEDid];
+      timingHistVsAmp = FEDsAndTimingVsAmpHists_[FEDid];
+      iphiProfileHist = FEDsAndiPhiProfileHists_[FEDid];
+      ietaProfileHist = FEDsAndiEtaProfileHists_[FEDid];
+      E2vsE1uRecHist = FEDsAndE2vsE1Hists_[FEDid];
+      energyvsE1uRecHist = FEDsAndenergyvsE1Hists_[FEDid];
+      occupHist = FEDsAndOccupancyHists_[FEDid];
+      timingHistVsPhi = FEDsAndTimingVsPhiHists_[FEDid];
+      timingHistVsModule = FEDsAndTimingVsModuleHists_[FEDid];
+    }
+
+    uRecHist->Fill(ampli);
+    E2uRecHist->Fill(E2);
+    E2vsE1uRecHist->Fill(ampli, E2);
+    energyuRecHist->Fill(energy);
+    energyvsE1uRecHist->Fill(ampli, energy);
+    allFedsHist_->Fill(ampli);
+    allFedsE2Hist_->Fill(E2);
+    allFedsenergyHist_->Fill(energy);
+    allFedsenergyHighHist_->Fill(energy);
+    allFedsE2vsE1Hist_->Fill(ampli, E2);
+    allFedsenergyvsE1Hist_->Fill(ampli, energy);
+    freqHist->Fill(naiveEvtNum_);
+    iphiProfileHist->Fill(iphi);
+    ietaProfileHist->Fill(ieta);
+
+    allFedsFrequencyHist_->Fill(naiveEvtNum_);
+    allFedsiPhiProfileHist_->Fill(iphi);
+    allFedsiEtaProfileHist_->Fill(ieta);
+    allOccupancy_->Fill(iphi, ieta);
+    TrueOccupancy_->Fill(phi, eta);
+    allOccupancyCoarse_->Fill(iphi, ieta);
+    TrueOccupancyCoarse_->Fill(phi, eta);
+    allFedsNumXtalsInClusterHist_->Fill(numXtalsinCluster);
+    NumXtalsInClusterHist_->Fill(fullnumXtalsinCluster);
+    numxtalsVsEnergy_->Fill(energy, numXtalsinCluster);
+    numxtalsVsHighEnergy_->Fill(energy, numXtalsinCluster);
+
+    //Fill the hists for the time stamp information
+    allFedsFreqTimeVsPhiHist_->Fill(iphi, eventTime);
+    allFedsFreqTimeVsPhiTTHist_->Fill(iphi, eventTime);
+    allFedsFreqTimeVsEtaHist_->Fill(eventTime, ieta);
+    allFedsFreqTimeVsEtaTTHist_->Fill(eventTime, ieta);
+    //end time stamp hists
+
+    occupHist->Fill(ietaSM, iphiSM);
+    if (fullnumXtalsinCluster == 1) {
+      allOccupancySingleXtal_->Fill(iphi, ieta);
+      energySingleXtalHist_->Fill(energy);
+    }
+
+    // Exclusive trigger plots
+
+    if (isEcalL1 && !isDTL1 && !isRPCL1 && !isCSCL1 && !isHCALL1) {
+      allOccupancyExclusiveECAL_->Fill(iphi, ieta);
+      allOccupancyCoarseExclusiveECAL_->Fill(iphi, ieta);
+      if (ampli > minTimingAmpEB_) {
+        allFedsTimingHistECAL_->Fill(time);
+        allFedsTimingPhiEtaHistECAL_->Fill(iphi, ieta, time);
+        allFedsTimingTTHistECAL_->Fill(iphi, ieta, time);
+        allFedsTimingLMHistECAL_->Fill(LM, time);
+      }
+      triggerExclusiveHist_->Fill(0);
+    }
+
+    if (!isEcalL1 && !isDTL1 && !isRPCL1 && !isCSCL1 && isHCALL1) {
+      allOccupancyExclusiveHCAL_->Fill(iphi, ieta);
+      allOccupancyCoarseExclusiveHCAL_->Fill(iphi, ieta);
+      if (ampli > minTimingAmpEB_) {
+        allFedsTimingHistHCAL_->Fill(time);
+        allFedsTimingPhiEtaHistHCAL_->Fill(iphi, ieta, time);
+        allFedsTimingTTHistHCAL_->Fill(iphi, ieta, time);
+        allFedsTimingLMHistHCAL_->Fill(LM, time);
+      }
+      triggerExclusiveHist_->Fill(1);
+    }
+
+    if (!isEcalL1 && isDTL1 && !isRPCL1 && !isCSCL1 && !isHCALL1) {
+      allOccupancyExclusiveDT_->Fill(iphi, ieta);
+      allOccupancyCoarseExclusiveDT_->Fill(iphi, ieta);
+      if (ampli > minTimingAmpEB_) {
+        allFedsTimingHistDT_->Fill(time);
+        allFedsTimingPhiEtaHistDT_->Fill(iphi, ieta, time);
+        allFedsTimingTTHistDT_->Fill(iphi, ieta, time);
+        allFedsTimingLMHistDT_->Fill(LM, time);
+      }
+      triggerExclusiveHist_->Fill(2);
+    }
+
+    if (!isEcalL1 && !isDTL1 && isRPCL1 && !isCSCL1 && !isHCALL1) {
+      allOccupancyExclusiveRPC_->Fill(iphi, ieta);
+      allOccupancyCoarseExclusiveRPC_->Fill(iphi, ieta);
+      if (ampli > minTimingAmpEB_) {
+        allFedsTimingHistRPC_->Fill(time);
+        allFedsTimingPhiEtaHistRPC_->Fill(iphi, ieta, time);
+        allFedsTimingTTHistRPC_->Fill(iphi, ieta, time);
+        allFedsTimingLMHistRPC_->Fill(LM, time);
+      }
+      triggerExclusiveHist_->Fill(3);
+    }
+
+    if (!isEcalL1 && !isDTL1 && !isRPCL1 && isCSCL1 && !isHCALL1) {
+      allOccupancyExclusiveCSC_->Fill(iphi, ieta);
+      allOccupancyCoarseExclusiveCSC_->Fill(iphi, ieta);
+      if (ampli > minTimingAmpEB_) {
+        allFedsTimingHistCSC_->Fill(time);
+        allFedsTimingPhiEtaHistCSC_->Fill(iphi, ieta, time);
+        allFedsTimingTTHistCSC_->Fill(iphi, ieta, time);
+        allFedsTimingLMHistCSC_->Fill(LM, time);
+      }
+      triggerExclusiveHist_->Fill(4);
+    }
+
+    // Inclusive trigger plots
+
+    if (isEcalL1) {
+      triggerHist_->Fill(0);
+      allOccupancyECAL_->Fill(iphi, ieta);
+      allOccupancyCoarseECAL_->Fill(iphi, ieta);
+    }
+    if (isHCALL1) {
+      triggerHist_->Fill(1);
+      allOccupancyHCAL_->Fill(iphi, ieta);
+      allOccupancyCoarseHCAL_->Fill(iphi, ieta);
+    }
+    if (isDTL1) {
+      triggerHist_->Fill(2);
+      allOccupancyDT_->Fill(iphi, ieta);
+      allOccupancyCoarseDT_->Fill(iphi, ieta);
+    }
+    if (isRPCL1) {
+      triggerHist_->Fill(3);
+      allOccupancyRPC_->Fill(iphi, ieta);
+      allOccupancyCoarseRPC_->Fill(iphi, ieta);
+    }
+    if (isCSCL1) {
+      triggerHist_->Fill(4);
+      allOccupancyCSC_->Fill(iphi, ieta);
+      allOccupancyCoarseCSC_->Fill(iphi, ieta);
+    }
+
+    // Fill histo for Ecal+muon coincidence
+    if (isEcalL1 && (isCSCL1 || isRPCL1 || isDTL1) && !isHCALL1)
+      allFedsTimingHistEcalMuon_->Fill(time);
+
+    if (ampli > minTimingAmpEB_) {
+      timingHist->Fill(time);
+      timingHistVsFreq->Fill(time, naiveEvtNum_);
+      timingHistVsAmp->Fill(time, ampli);
+      allFedsTimingHist_->Fill(time);
+      allFedsTimingVsAmpHist_->Fill(time, ampli);
+      allFedsTimingVsFreqHist_->Fill(time, naiveEvtNum_);
+      timingHistVsPhi->Fill(time, iphiSM);
+      timingHistVsModule->Fill(time, ietaSM);
+      allFedsTimingPhiHist_->Fill(iphi, time);
+      allFedsTimingPhiEtaHist_->Fill(iphi, ieta, time);
+      allFedsTimingTTHist_->Fill(iphi, ieta, time);
+      allFedsTimingLMHist_->Fill(LM, time);
+      if (FEDid >= 610 && FEDid <= 627)
+        allFedsTimingPhiEbmHist_->Fill(iphi, time);
+      if (FEDid >= 628 && FEDid <= 645)
+        allFedsTimingPhiEbpHist_->Fill(iphi, time);
+
+      if (FEDid >= 610 && FEDid <= 627)
+        allFedsTimingEbmHist_->Fill(time);
+      if (FEDid >= 628 && FEDid <= 645)
+        allFedsTimingEbpHist_->Fill(time);
+      if (FEDid >= 613 && FEDid <= 616)
+        allFedsTimingEbmTopHist_->Fill(time);
+      if (FEDid >= 631 && FEDid <= 634)
+        allFedsTimingEbpTopHist_->Fill(time);
+      if (FEDid >= 622 && FEDid <= 625)
+        allFedsTimingEbmBottomHist_->Fill(time);
+      if (FEDid >= 640 && FEDid <= 643)
+        allFedsTimingEbpBottomHist_->Fill(time);
+    }
+
+    // *** High Energy Clusters Analysis ** //
+
+    if (energy > minHighEnergy_) {
+      LogInfo("EcalCosmicsHists") << "High energy event " << iEvent.id().run() << " : " << iEvent.id().event() << " "
+                                  << naiveEvtNum_ << " : " << energy << " " << numXtalsinCluster << " : " << iphi << " "
+                                  << ieta << " : " << isEcalL1 << isHCALL1 << isDTL1 << isRPCL1 << isCSCL1;
+
+      numberOfHighEClusters++;
+      allOccupancyHighEnergy_->Fill(iphi, ieta);
+      allOccupancyHighEnergyCoarse_->Fill(iphi, ieta);
+      allFedsOccupancyHighEnergyHist_->Fill(iphi, ieta, energy);
+      allFedsenergyOnlyHighHist_->Fill(energy);
+
+      HighEnergy_2GeV_occuCoarse->Fill(iphi, ieta);
+      HighEnergy_2GeV_occu3D->Fill(iphi, ieta, energy);
+
+      HighEnergy_NumXtal->Fill(fullnumXtalsinCluster);
+      HighEnergy_NumXtalFedId->Fill(FEDid, fullnumXtalsinCluster);
+      HighEnergy_NumXtaliphi->Fill(iphi, fullnumXtalsinCluster);
+      HighEnergy_energy3D->Fill(iphi, ieta, energy);
+      HighEnergy_energyNumXtal->Fill(fullnumXtalsinCluster, energy);
+
+      if (energy > 100.0) {
+        LogInfo("EcalCosmicsHists") << "Very high energy event " << iEvent.id().run() << " : " << iEvent.id().event()
+                                    << " " << naiveEvtNum_ << " : " << energy << " " << numXtalsinCluster << " : "
+                                    << iphi << " " << ieta << " : " << isEcalL1 << isHCALL1 << isDTL1 << isRPCL1
+                                    << isCSCL1;
+
+        HighEnergy_100GeV_occuCoarse->Fill(iphi, ieta);
+        HighEnergy_100GeV_occu3D->Fill(iphi, ieta, energy);
+      }
+    }
+
+    // *** end of High Energy Clusters analysis *** //
+
+  }  //++++++++++++++++++END LOOP OVER EB SUPERCLUSTERS+++++++++++++++++++++++//
+
   //+++++++++++++++++++LOOP OVER ENDCAP EE CLUSTERS++++++++++++++++++++//
-  
-  if(hasEndcapClusters) {
+
+  if (hasEndcapClusters) {
     clusterCollection_p = escHandle.product();
-    for (reco::SuperClusterCollection::const_iterator clus = clusterCollection_p->begin(); clus != clusterCollection_p->end(); ++clus) {
+    for (reco::SuperClusterCollection::const_iterator clus = clusterCollection_p->begin();
+         clus != clusterCollection_p->end();
+         ++clus) {
       double energy = clus->energy();
       //double phi    = clus->phi();
       //double eta    = clus->eta();
@@ -592,83 +583,98 @@ EcalCosmicsHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSe
       double secondTime = -1000.;
       int clusSize = clus->clustersSize();
       int numXtalsinCluster = 0;
-      
+
       EEDetId maxDet;
       EEDetId secDet;
       //LogInfo("EcalCosmicsHists") << "Here is what we initialized the maxDet to: " << maxDet;
-      
- //      for (reco::basicCluster_iterator bclus = (clus->clustersBegin()); bclus != (clus->clustersEnd()); ++bclus) {
-// 	//double cphi = (*bclus)->phi();
-// 	//double ceta = (*bclus)->eta();	
-//         //TODO: extend histos to EE
-//         //TrueBCOccupancy_->Fill(cphi,ceta);
-//         //TrueBCOccupancyCoarse_->Fill(cphi,ceta);
-//       }
-      
-      std::vector<std::pair<DetId, float> > clusterDetIds = clus->hitsAndFractions();//get these from the cluster
-      for(std::vector<std::pair<DetId, float> >::const_iterator detitr = clusterDetIds.begin(); detitr != clusterDetIds.end(); ++detitr) {
-	
-	//LogInfo("EcalCosmicsHists") << " Here is the DetId inside the cluster: " << (EEDetId)(*detitr);
-	//Here I use the "find" on a digi collection... I have been warned...
-	
-	if ((*detitr).first.det() != DetId::Ecal) {
-	  LogError("EcalCosmicsHists") << " det is " <<(*detitr).first.det(); continue;
-	}
+
+      //      for (reco::basicCluster_iterator bclus = (clus->clustersBegin()); bclus != (clus->clustersEnd()); ++bclus) {
+      // 	//double cphi = (*bclus)->phi();
+      // 	//double ceta = (*bclus)->eta();
+      //         //TODO: extend histos to EE
+      //         //TrueBCOccupancy_->Fill(cphi,ceta);
+      //         //TrueBCOccupancyCoarse_->Fill(cphi,ceta);
+      //       }
+
+      std::vector<std::pair<DetId, float> > clusterDetIds = clus->hitsAndFractions();  //get these from the cluster
+      for (std::vector<std::pair<DetId, float> >::const_iterator detitr = clusterDetIds.begin();
+           detitr != clusterDetIds.end();
+           ++detitr) {
+        //LogInfo("EcalCosmicsHists") << " Here is the DetId inside the cluster: " << (EEDetId)(*detitr);
+        //Here I use the "find" on a digi collection... I have been warned...
+
+        if ((*detitr).first.det() != DetId::Ecal) {
+          LogError("EcalCosmicsHists") << " det is " << (*detitr).first.det();
+          continue;
+        }
         if ((*detitr).first.subdetId() != EcalEndcap) {
-	  LogError("EcalCosmicsHists") << " subdet is " <<(*detitr).first.subdetId(); continue; 
-	}
+          LogError("EcalCosmicsHists") << " subdet is " << (*detitr).first.subdetId();
+          continue;
+        }
 
         EcalRecHitCollection::const_iterator thishit = hitsEE->find((*detitr).first);
-	
+
         if (thishit == hitsEE->end()) {
           LogInfo("EcalCosmicsHists") << " WARNING: EEDetId not found in the RecHit collection!";
           continue;
         }
-        // The checking above should no longer be needed...... 
-	// as only those in the cluster would already have rechits..
-	
+        // The checking above should no longer be needed......
+        // as only those in the cluster would already have rechits..
+
         EcalRecHit myhit = (*thishit);
-	
+
         //LogInfo("EcalCosmicsHists") << " Found hit for DetId: " << (EEDetId)(*detitr);
         double thisamp = myhit.energy();
-        if (thisamp > minRecHitAmpEE_) {numXtalsinCluster++; }
-        if (thisamp > secondMin) {secondMin = thisamp; secondTime = myhit.time(); secDet = (EEDetId)(*detitr).first;}
-        if (secondMin > ampli) {std::swap(ampli,secondMin); std::swap(time,secondTime); std::swap(maxDet,secDet);}
-	
+        if (thisamp > minRecHitAmpEE_) {
+          numXtalsinCluster++;
+        }
+        if (thisamp > secondMin) {
+          secondMin = thisamp;
+          secondTime = myhit.time();
+          secDet = (EEDetId)(*detitr).first;
+        }
+        if (secondMin > ampli) {
+          std::swap(ampli, secondMin);
+          std::swap(time, secondTime);
+          std::swap(maxDet, secDet);
+        }
+
         //LogInfo("EcalCosmicsHists") << "maxDetId is now: " << (EEDetId)(maxDet);
       }
-      
-      double fullnumXtalsinCluster = clusterDetIds.size();     
-      
+
+      double fullnumXtalsinCluster = clusterDetIds.size();
+
       float E2 = ampli + secondMin;
-      
-      ecalElectronicsMap_->getElectronicsId((EEDetId) maxDet);      
-      //int FEDid = 600+elecId.dccId();           
+
+      ecalElectronicsMap_->getElectronicsId((EEDetId)maxDet);
+      //int FEDid = 600+elecId.dccId();
 
       //Set some more values
       //TODO: need to fix the seeds vector to be DetId or have another one for EE
       //seeds.push_back(maxDet);
-      
+
       int ix = maxDet.ix();
       int iy = maxDet.iy();
       int iz = maxDet.zside();
-     
-      //      LogWarning("EcalCosmicsHists") << "EE cluster (x,y,z) : ( " 
-      //				     << ix << " , " << iy << " , " << iz 
+
+      //      LogWarning("EcalCosmicsHists") << "EE cluster (x,y,z) : ( "
+      //				     << ix << " , " << iy << " , " << iz
       //				     << " ) " << std::endl;
 
-      if (!EEDetId::validDetId(ix,iy,iz)) {
-	LogWarning("EcalCosmicsHists") << "INVALID EE DetId !!!" << endl;
-	return;
+      if (!EEDetId::validDetId(ix, iy, iz)) {
+        LogWarning("EcalCosmicsHists") << "INVALID EE DetId !!!" << endl;
+        return;
       }
 
-
       numberOfCosmics++;
-      if (iz<0) { numberOfCosmicsEEM++; }
-      else { numberOfCosmicsEEP++; }
+      if (iz < 0) {
+        numberOfCosmicsEEM++;
+      } else {
+        numberOfCosmicsEEP++;
+      }
 
       //int LM = ecalElectronicsMap_->getLMNumber(maxDet) ;//FIX ME
-      
+
       //TODO: extend histos to EE
       //TH1F* uRecHist = FEDsAndHists_[FEDid];
       //TH1F* E2uRecHist = FEDsAndE2Hists_[FEDid];
@@ -681,7 +687,7 @@ EcalCosmicsHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSe
       //TH2F* timingHistVsAmp = FEDsAndTimingVsAmpHists_[FEDid];
       //TH2F* E2vsE1uRecHist = FEDsAndE2vsE1Hists_[FEDid];
       //TH2F* energyvsE1uRecHist = FEDsAndenergyvsE1Hists_[FEDid];
-      //TH1F* numXtalInClusterHist = FEDsAndNumXtalsInClusterHists_[FEDid];    
+      //TH1F* numXtalInClusterHist = FEDsAndNumXtalsInClusterHists_[FEDid];
       //TH2F* occupHist = FEDsAndOccupancyHists_[FEDid];
       //TH2F* timingHistVsPhi = FEDsAndTimingVsPhiHists_[FEDid];
       //TH2F* timingHistVsModule = FEDsAndTimingVsModuleHists_[FEDid];
@@ -711,280 +717,272 @@ EcalCosmicsHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSe
       //energyvsE1uRecHist->Fill(ampli,energy);
       //allFedsHist_->Fill(ampli);
 
-      if (iz<0) {
-	EEM_FedsSeedEnergyHist_->Fill(ampli);
-	EEM_FedsenergyHist_->Fill(energy);
-	EEM_FedsenergyHighHist_->Fill(energy);
-	EEM_FedsE2Hist_->Fill(E2); 
-	EEM_FedsE2vsE1Hist_->Fill(ampli,E2);
-	EEM_FedsenergyvsE1Hist_->Fill(ampli,energy);
-	EEM_AllOccupancyCoarse_->Fill(ix-0.5,iy-0.5);
-	EEM_AllOccupancy_->Fill(ix-0.5,iy-0.5);
-
-	EEM_FedsNumXtalsInClusterHist_->Fill(numXtalsinCluster);
-	EEM_NumXtalsInClusterHist_->Fill(fullnumXtalsinCluster);
-	EEM_numxtalsVsEnergy_->Fill(energy,numXtalsinCluster);
-	EEM_numxtalsVsHighEnergy_->Fill(energy,numXtalsinCluster);
-	EEM_numberofBCinSC_->Fill(clusSize);
-
-	if (fullnumXtalsinCluster==1) {
-	  EEM_OccupancySingleXtal_->Fill(ix-0.5,iy-0.5);
-	  EEM_energySingleXtalHist_->Fill(energy);
-	}
-
-	if (ampli > minTimingAmpEE_) {
-	  EEM_FedsTimingHist_->Fill(time);
-	  EEM_FedsTimingVsAmpHist_->Fill(time, ampli);
-	  EEM_FedsTimingTTHist_->Fill(ix-0.5,iy-0.5,time);
-	}
-
-	// Exclusive trigger plots
-	
-	if(isEcalL1&&!isDTL1&&!isRPCL1&&!isCSCL1&&!isHCALL1) {
-	  EEM_OccupancyExclusiveECAL_->Fill(ix-0.5,iy-0.5);
-	  EEM_OccupancyCoarseExclusiveECAL_->Fill(ix-0.5,iy-0.5);
-	  if (ampli > minTimingAmpEE_) {
-	    EEM_FedsTimingHistECAL_->Fill(time);
-	    EEM_FedsTimingTTHistECAL_->Fill(ix-0.5,iy-0.5,time);
-	  }      
-	  EEM_triggerExclusiveHist_->Fill(0);
-	} 
-	
-	if(!isEcalL1&&!isDTL1&&!isRPCL1&&!isCSCL1&&isHCALL1) {   
-	  EEM_OccupancyExclusiveHCAL_->Fill(ix-0.5,iy-0.5);
-	  EEM_OccupancyCoarseExclusiveHCAL_->Fill(ix-0.5,iy-0.5);
-	  if (ampli > minTimingAmpEE_) {
-	    EEM_FedsTimingHistHCAL_->Fill(time);
-	    EEM_FedsTimingTTHistHCAL_->Fill(ix-0.5,iy-0.5,time);
-	  }      
-	  EEM_triggerExclusiveHist_->Fill(1);
-	}
-	
-	if(!isEcalL1&&isDTL1&&!isRPCL1&&!isCSCL1&&!isHCALL1) {
-	  EEM_OccupancyExclusiveDT_->Fill(ix-0.5,iy-0.5);
-	  EEM_OccupancyCoarseExclusiveDT_->Fill(ix-0.5,iy-0.5);
-	  if (ampli > minTimingAmpEE_) {
-	    EEM_FedsTimingHistDT_->Fill(time);
-	    EEM_FedsTimingTTHistDT_->Fill(ix-0.5,iy-0.5,time);
-	  }      
-	  EEM_triggerExclusiveHist_->Fill(2);
-	}
-	
-	if(!isEcalL1&&!isDTL1&&isRPCL1&&!isCSCL1&&!isHCALL1) {
-	  EEM_OccupancyExclusiveRPC_->Fill(ix-0.5,iy-0.5);
-	  EEM_OccupancyCoarseExclusiveRPC_->Fill(ix-0.5,iy-0.5);
-	  if (ampli > minTimingAmpEE_) {
-	    EEM_FedsTimingHistRPC_->Fill(time);
-	    EEM_FedsTimingTTHistRPC_->Fill(ix-0.5,iy-0.5,time);
-	  }      
-	  EEM_triggerExclusiveHist_->Fill(3);
-	}
-	
-	if(!isEcalL1&&!isDTL1&&!isRPCL1&&isCSCL1&&!isHCALL1) {   
-	  EEM_OccupancyExclusiveCSC_->Fill(ix-0.5,iy-0.5);
-	  EEM_OccupancyCoarseExclusiveCSC_->Fill(ix-0.5,iy-0.5);
-	  if (ampli > minTimingAmpEE_) {
-	    EEM_FedsTimingHistCSC_->Fill(time);
-	    EEM_FedsTimingTTHistCSC_->Fill(ix-0.5,iy-0.5,time);
-	  }      
-	  EEM_triggerExclusiveHist_->Fill(4);
-	}
-	
-	// Inclusive trigger plots
-	
-	if (isEcalL1) { 
-	  EEM_triggerHist_->Fill(0);
-	  EEM_OccupancyECAL_->Fill(ix-0.5,iy-0.5);
-	  EEM_OccupancyCoarseECAL_->Fill(ix-0.5,iy-0.5);
-	}
-	if (isHCALL1) {
-	  EEM_triggerHist_->Fill(1);
-	  EEM_OccupancyHCAL_->Fill(ix-0.5,iy-0.5);
-	  EEM_OccupancyCoarseHCAL_->Fill(ix-0.5,iy-0.5);
-	}
-	if (isDTL1)   {
-	  EEM_triggerHist_->Fill(2);
-	  EEM_OccupancyDT_->Fill(ix-0.5,iy-0.5);
-	  EEM_OccupancyCoarseDT_->Fill(ix-0.5,iy-0.5);
-	}
-	if (isRPCL1)  {
-	  EEM_triggerHist_->Fill(3);
-	  EEM_OccupancyRPC_->Fill(ix-0.5,iy-0.5);
-	  EEM_OccupancyCoarseRPC_->Fill(ix-0.5,iy-0.5);
-	}
-	if (isCSCL1)  {
-	  EEM_triggerHist_->Fill(4);
-	  EEM_OccupancyCSC_->Fill(ix-0.5,iy-0.5);
-	  EEM_OccupancyCoarseCSC_->Fill(ix-0.5,iy-0.5);
-	}		
+      if (iz < 0) {
+        EEM_FedsSeedEnergyHist_->Fill(ampli);
+        EEM_FedsenergyHist_->Fill(energy);
+        EEM_FedsenergyHighHist_->Fill(energy);
+        EEM_FedsE2Hist_->Fill(E2);
+        EEM_FedsE2vsE1Hist_->Fill(ampli, E2);
+        EEM_FedsenergyvsE1Hist_->Fill(ampli, energy);
+        EEM_AllOccupancyCoarse_->Fill(ix - 0.5, iy - 0.5);
+        EEM_AllOccupancy_->Fill(ix - 0.5, iy - 0.5);
+
+        EEM_FedsNumXtalsInClusterHist_->Fill(numXtalsinCluster);
+        EEM_NumXtalsInClusterHist_->Fill(fullnumXtalsinCluster);
+        EEM_numxtalsVsEnergy_->Fill(energy, numXtalsinCluster);
+        EEM_numxtalsVsHighEnergy_->Fill(energy, numXtalsinCluster);
+        EEM_numberofBCinSC_->Fill(clusSize);
+
+        if (fullnumXtalsinCluster == 1) {
+          EEM_OccupancySingleXtal_->Fill(ix - 0.5, iy - 0.5);
+          EEM_energySingleXtalHist_->Fill(energy);
+        }
+
+        if (ampli > minTimingAmpEE_) {
+          EEM_FedsTimingHist_->Fill(time);
+          EEM_FedsTimingVsAmpHist_->Fill(time, ampli);
+          EEM_FedsTimingTTHist_->Fill(ix - 0.5, iy - 0.5, time);
+        }
+
+        // Exclusive trigger plots
+
+        if (isEcalL1 && !isDTL1 && !isRPCL1 && !isCSCL1 && !isHCALL1) {
+          EEM_OccupancyExclusiveECAL_->Fill(ix - 0.5, iy - 0.5);
+          EEM_OccupancyCoarseExclusiveECAL_->Fill(ix - 0.5, iy - 0.5);
+          if (ampli > minTimingAmpEE_) {
+            EEM_FedsTimingHistECAL_->Fill(time);
+            EEM_FedsTimingTTHistECAL_->Fill(ix - 0.5, iy - 0.5, time);
+          }
+          EEM_triggerExclusiveHist_->Fill(0);
+        }
+
+        if (!isEcalL1 && !isDTL1 && !isRPCL1 && !isCSCL1 && isHCALL1) {
+          EEM_OccupancyExclusiveHCAL_->Fill(ix - 0.5, iy - 0.5);
+          EEM_OccupancyCoarseExclusiveHCAL_->Fill(ix - 0.5, iy - 0.5);
+          if (ampli > minTimingAmpEE_) {
+            EEM_FedsTimingHistHCAL_->Fill(time);
+            EEM_FedsTimingTTHistHCAL_->Fill(ix - 0.5, iy - 0.5, time);
+          }
+          EEM_triggerExclusiveHist_->Fill(1);
+        }
+
+        if (!isEcalL1 && isDTL1 && !isRPCL1 && !isCSCL1 && !isHCALL1) {
+          EEM_OccupancyExclusiveDT_->Fill(ix - 0.5, iy - 0.5);
+          EEM_OccupancyCoarseExclusiveDT_->Fill(ix - 0.5, iy - 0.5);
+          if (ampli > minTimingAmpEE_) {
+            EEM_FedsTimingHistDT_->Fill(time);
+            EEM_FedsTimingTTHistDT_->Fill(ix - 0.5, iy - 0.5, time);
+          }
+          EEM_triggerExclusiveHist_->Fill(2);
+        }
+
+        if (!isEcalL1 && !isDTL1 && isRPCL1 && !isCSCL1 && !isHCALL1) {
+          EEM_OccupancyExclusiveRPC_->Fill(ix - 0.5, iy - 0.5);
+          EEM_OccupancyCoarseExclusiveRPC_->Fill(ix - 0.5, iy - 0.5);
+          if (ampli > minTimingAmpEE_) {
+            EEM_FedsTimingHistRPC_->Fill(time);
+            EEM_FedsTimingTTHistRPC_->Fill(ix - 0.5, iy - 0.5, time);
+          }
+          EEM_triggerExclusiveHist_->Fill(3);
+        }
+
+        if (!isEcalL1 && !isDTL1 && !isRPCL1 && isCSCL1 && !isHCALL1) {
+          EEM_OccupancyExclusiveCSC_->Fill(ix - 0.5, iy - 0.5);
+          EEM_OccupancyCoarseExclusiveCSC_->Fill(ix - 0.5, iy - 0.5);
+          if (ampli > minTimingAmpEE_) {
+            EEM_FedsTimingHistCSC_->Fill(time);
+            EEM_FedsTimingTTHistCSC_->Fill(ix - 0.5, iy - 0.5, time);
+          }
+          EEM_triggerExclusiveHist_->Fill(4);
+        }
+
+        // Inclusive trigger plots
+
+        if (isEcalL1) {
+          EEM_triggerHist_->Fill(0);
+          EEM_OccupancyECAL_->Fill(ix - 0.5, iy - 0.5);
+          EEM_OccupancyCoarseECAL_->Fill(ix - 0.5, iy - 0.5);
+        }
+        if (isHCALL1) {
+          EEM_triggerHist_->Fill(1);
+          EEM_OccupancyHCAL_->Fill(ix - 0.5, iy - 0.5);
+          EEM_OccupancyCoarseHCAL_->Fill(ix - 0.5, iy - 0.5);
+        }
+        if (isDTL1) {
+          EEM_triggerHist_->Fill(2);
+          EEM_OccupancyDT_->Fill(ix - 0.5, iy - 0.5);
+          EEM_OccupancyCoarseDT_->Fill(ix - 0.5, iy - 0.5);
+        }
+        if (isRPCL1) {
+          EEM_triggerHist_->Fill(3);
+          EEM_OccupancyRPC_->Fill(ix - 0.5, iy - 0.5);
+          EEM_OccupancyCoarseRPC_->Fill(ix - 0.5, iy - 0.5);
+        }
+        if (isCSCL1) {
+          EEM_triggerHist_->Fill(4);
+          EEM_OccupancyCSC_->Fill(ix - 0.5, iy - 0.5);
+          EEM_OccupancyCoarseCSC_->Fill(ix - 0.5, iy - 0.5);
+        }
 
       } else {
+        EEP_FedsSeedEnergyHist_->Fill(ampli);
+        EEP_FedsenergyHist_->Fill(energy);
+        EEP_FedsenergyHighHist_->Fill(energy);
+        EEP_FedsE2Hist_->Fill(E2);
+        EEP_FedsE2vsE1Hist_->Fill(ampli, E2);
+        EEP_FedsenergyvsE1Hist_->Fill(ampli, energy);
+        EEP_AllOccupancyCoarse_->Fill(ix - 0.5, iy - 0.5);
+        EEP_AllOccupancy_->Fill(ix - 0.5, iy - 0.5);
+
+        EEP_FedsNumXtalsInClusterHist_->Fill(numXtalsinCluster);
+        EEP_NumXtalsInClusterHist_->Fill(fullnumXtalsinCluster);
+        EEP_numxtalsVsEnergy_->Fill(energy, numXtalsinCluster);
+        EEP_numxtalsVsHighEnergy_->Fill(energy, numXtalsinCluster);
+        EEP_numberofBCinSC_->Fill(clusSize);
+
+        if (fullnumXtalsinCluster == 1) {
+          EEP_OccupancySingleXtal_->Fill(ix - 0.5, iy - 0.5);
+          EEP_energySingleXtalHist_->Fill(energy);
+        }
 
-	EEP_FedsSeedEnergyHist_->Fill(ampli);
-	EEP_FedsenergyHist_->Fill(energy);
-	EEP_FedsenergyHighHist_->Fill(energy);
-	EEP_FedsE2Hist_->Fill(E2); 
-	EEP_FedsE2vsE1Hist_->Fill(ampli,E2);
-	EEP_FedsenergyvsE1Hist_->Fill(ampli,energy);
-	EEP_AllOccupancyCoarse_->Fill(ix-0.5,iy-0.5);
-	EEP_AllOccupancy_->Fill(ix-0.5,iy-0.5);
-
-	EEP_FedsNumXtalsInClusterHist_->Fill(numXtalsinCluster);
-	EEP_NumXtalsInClusterHist_->Fill(fullnumXtalsinCluster);
-	EEP_numxtalsVsEnergy_->Fill(energy,numXtalsinCluster);
-	EEP_numxtalsVsHighEnergy_->Fill(energy,numXtalsinCluster);
-	EEP_numberofBCinSC_->Fill(clusSize);
-
-	if (fullnumXtalsinCluster==1) {
-	  EEP_OccupancySingleXtal_->Fill(ix-0.5,iy-0.5);
-	  EEP_energySingleXtalHist_->Fill(energy);
-	}
-
-	if (ampli > minTimingAmpEE_) {
-	  EEP_FedsTimingHist_->Fill(time);
-	  EEP_FedsTimingVsAmpHist_->Fill(time, ampli);
-	  EEP_FedsTimingTTHist_->Fill(ix-0.5,iy-0.5,time);
-	}
-
-	// Exclusive trigger plots
-	
-	if(isEcalL1&&!isDTL1&&!isRPCL1&&!isCSCL1&&!isHCALL1) {
-	  EEP_OccupancyExclusiveECAL_->Fill(ix-0.5,iy-0.5);
-	  EEP_OccupancyCoarseExclusiveECAL_->Fill(ix-0.5,iy-0.5);
-	  if (ampli > minTimingAmpEE_) {
-	    EEP_FedsTimingHistECAL_->Fill(time);
-	    EEP_FedsTimingTTHistECAL_->Fill(ix-0.5,iy-0.5,time);
-	  }      
-	  EEP_triggerExclusiveHist_->Fill(0);
-	} 
-	
-	if(!isEcalL1&&!isDTL1&&!isRPCL1&&!isCSCL1&&isHCALL1) {   
-	  EEP_OccupancyExclusiveHCAL_->Fill(ix-0.5,iy-0.5);
-	  EEP_OccupancyCoarseExclusiveHCAL_->Fill(ix-0.5,iy-0.5);
-	  if (ampli > minTimingAmpEE_) {
-	    EEP_FedsTimingHistHCAL_->Fill(time);
-	    EEP_FedsTimingTTHistHCAL_->Fill(ix-0.5,iy-0.5,time);
-	  }      
-	  EEP_triggerExclusiveHist_->Fill(1);
-	}
-	
-	if(!isEcalL1&&isDTL1&&!isRPCL1&&!isCSCL1&&!isHCALL1) {
-	  EEP_OccupancyExclusiveDT_->Fill(ix-0.5,iy-0.5);
-	  EEP_OccupancyCoarseExclusiveDT_->Fill(ix-0.5,iy-0.5);
-	  if (ampli > minTimingAmpEE_) {
-	    EEP_FedsTimingHistDT_->Fill(time);
-	    EEP_FedsTimingTTHistDT_->Fill(ix-0.5,iy-0.5,time);
-	  }      
-	  EEP_triggerExclusiveHist_->Fill(2);
-	}
-	
-	if(!isEcalL1&&!isDTL1&&isRPCL1&&!isCSCL1&&!isHCALL1) {
-	  EEP_OccupancyExclusiveRPC_->Fill(ix-0.5,iy-0.5);
-	  EEP_OccupancyCoarseExclusiveRPC_->Fill(ix-0.5,iy-0.5);
-	  if (ampli > minTimingAmpEE_) {
-	    EEP_FedsTimingHistRPC_->Fill(time);
-	    EEP_FedsTimingTTHistRPC_->Fill(ix-0.5,iy-0.5,time);
-	  }      
-	  EEP_triggerExclusiveHist_->Fill(3);
-	}
-	
-	if(!isEcalL1&&!isDTL1&&!isRPCL1&&isCSCL1&&!isHCALL1) {   
-	  EEP_OccupancyExclusiveCSC_->Fill(ix-0.5,iy-0.5);
-	  EEP_OccupancyCoarseExclusiveCSC_->Fill(ix-0.5,iy-0.5);
-	  if (ampli > minTimingAmpEE_) {
-	    EEP_FedsTimingHistCSC_->Fill(time);
-	    EEP_FedsTimingTTHistCSC_->Fill(ix-0.5,iy-0.5,time);
-	  }      
-	  EEP_triggerExclusiveHist_->Fill(4);
-	}
-	
-	// Inclusive trigger plots
-	
-	if (isEcalL1) { 
-	  EEP_triggerHist_->Fill(0);
-	  EEP_OccupancyECAL_->Fill(ix-0.5,iy-0.5);
-	  EEP_OccupancyCoarseECAL_->Fill(ix-0.5,iy-0.5);
-	}
-	if (isHCALL1) {
-	  EEP_triggerHist_->Fill(1);
-	  EEP_OccupancyHCAL_->Fill(ix-0.5,iy-0.5);
-	  EEP_OccupancyCoarseHCAL_->Fill(ix-0.5,iy-0.5);
-	}
-	if (isDTL1)   {
-	  EEP_triggerHist_->Fill(2);
-	  EEP_OccupancyDT_->Fill(ix-0.5,iy-0.5);
-	  EEP_OccupancyCoarseDT_->Fill(ix-0.5,iy-0.5);
-	}
-	if (isRPCL1)  {
-	  EEP_triggerHist_->Fill(3);
-	  EEP_OccupancyRPC_->Fill(ix-0.5,iy-0.5);
-	  EEP_OccupancyCoarseRPC_->Fill(ix-0.5,iy-0.5);
-	}
-	if (isCSCL1)  {
-	  EEP_triggerHist_->Fill(4);
-	  EEP_OccupancyCSC_->Fill(ix-0.5,iy-0.5);
-	  EEP_OccupancyCoarseCSC_->Fill(ix-0.5,iy-0.5);
-	}	
+        if (ampli > minTimingAmpEE_) {
+          EEP_FedsTimingHist_->Fill(time);
+          EEP_FedsTimingVsAmpHist_->Fill(time, ampli);
+          EEP_FedsTimingTTHist_->Fill(ix - 0.5, iy - 0.5, time);
+        }
 
+        // Exclusive trigger plots
+
+        if (isEcalL1 && !isDTL1 && !isRPCL1 && !isCSCL1 && !isHCALL1) {
+          EEP_OccupancyExclusiveECAL_->Fill(ix - 0.5, iy - 0.5);
+          EEP_OccupancyCoarseExclusiveECAL_->Fill(ix - 0.5, iy - 0.5);
+          if (ampli > minTimingAmpEE_) {
+            EEP_FedsTimingHistECAL_->Fill(time);
+            EEP_FedsTimingTTHistECAL_->Fill(ix - 0.5, iy - 0.5, time);
+          }
+          EEP_triggerExclusiveHist_->Fill(0);
+        }
+
+        if (!isEcalL1 && !isDTL1 && !isRPCL1 && !isCSCL1 && isHCALL1) {
+          EEP_OccupancyExclusiveHCAL_->Fill(ix - 0.5, iy - 0.5);
+          EEP_OccupancyCoarseExclusiveHCAL_->Fill(ix - 0.5, iy - 0.5);
+          if (ampli > minTimingAmpEE_) {
+            EEP_FedsTimingHistHCAL_->Fill(time);
+            EEP_FedsTimingTTHistHCAL_->Fill(ix - 0.5, iy - 0.5, time);
+          }
+          EEP_triggerExclusiveHist_->Fill(1);
+        }
+
+        if (!isEcalL1 && isDTL1 && !isRPCL1 && !isCSCL1 && !isHCALL1) {
+          EEP_OccupancyExclusiveDT_->Fill(ix - 0.5, iy - 0.5);
+          EEP_OccupancyCoarseExclusiveDT_->Fill(ix - 0.5, iy - 0.5);
+          if (ampli > minTimingAmpEE_) {
+            EEP_FedsTimingHistDT_->Fill(time);
+            EEP_FedsTimingTTHistDT_->Fill(ix - 0.5, iy - 0.5, time);
+          }
+          EEP_triggerExclusiveHist_->Fill(2);
+        }
+
+        if (!isEcalL1 && !isDTL1 && isRPCL1 && !isCSCL1 && !isHCALL1) {
+          EEP_OccupancyExclusiveRPC_->Fill(ix - 0.5, iy - 0.5);
+          EEP_OccupancyCoarseExclusiveRPC_->Fill(ix - 0.5, iy - 0.5);
+          if (ampli > minTimingAmpEE_) {
+            EEP_FedsTimingHistRPC_->Fill(time);
+            EEP_FedsTimingTTHistRPC_->Fill(ix - 0.5, iy - 0.5, time);
+          }
+          EEP_triggerExclusiveHist_->Fill(3);
+        }
+
+        if (!isEcalL1 && !isDTL1 && !isRPCL1 && isCSCL1 && !isHCALL1) {
+          EEP_OccupancyExclusiveCSC_->Fill(ix - 0.5, iy - 0.5);
+          EEP_OccupancyCoarseExclusiveCSC_->Fill(ix - 0.5, iy - 0.5);
+          if (ampli > minTimingAmpEE_) {
+            EEP_FedsTimingHistCSC_->Fill(time);
+            EEP_FedsTimingTTHistCSC_->Fill(ix - 0.5, iy - 0.5, time);
+          }
+          EEP_triggerExclusiveHist_->Fill(4);
+        }
+
+        // Inclusive trigger plots
+
+        if (isEcalL1) {
+          EEP_triggerHist_->Fill(0);
+          EEP_OccupancyECAL_->Fill(ix - 0.5, iy - 0.5);
+          EEP_OccupancyCoarseECAL_->Fill(ix - 0.5, iy - 0.5);
+        }
+        if (isHCALL1) {
+          EEP_triggerHist_->Fill(1);
+          EEP_OccupancyHCAL_->Fill(ix - 0.5, iy - 0.5);
+          EEP_OccupancyCoarseHCAL_->Fill(ix - 0.5, iy - 0.5);
+        }
+        if (isDTL1) {
+          EEP_triggerHist_->Fill(2);
+          EEP_OccupancyDT_->Fill(ix - 0.5, iy - 0.5);
+          EEP_OccupancyCoarseDT_->Fill(ix - 0.5, iy - 0.5);
+        }
+        if (isRPCL1) {
+          EEP_triggerHist_->Fill(3);
+          EEP_OccupancyRPC_->Fill(ix - 0.5, iy - 0.5);
+          EEP_OccupancyCoarseRPC_->Fill(ix - 0.5, iy - 0.5);
+        }
+        if (isCSCL1) {
+          EEP_triggerHist_->Fill(4);
+          EEP_OccupancyCSC_->Fill(ix - 0.5, iy - 0.5);
+          EEP_OccupancyCoarseCSC_->Fill(ix - 0.5, iy - 0.5);
+        }
       }
-      
 
       // *** High Energy Clusters Analysis ** //
-      
-      if (energy>minHighEnergy_) {
-	
-        LogInfo("EcalCosmicsHists") << "High energy event in EE " << iEvent.id().run() << " : " 
-				    << iEvent.id().event() << " " << naiveEvtNum_  
-				    << " : " << energy << " " << numXtalsinCluster
-				    << " : " << ix << " " << iy 
-				    << " : " << isEcalL1 << isHCALL1 << isDTL1 << isRPCL1 << isCSCL1 ;
-	
-	//  numberOfHighEClusters++;
-	//  allOccupancyHighEnergy_->Fill(iphi, ieta);
-	//  allOccupancyHighEnergyCoarse_->Fill(iphi, ieta);    
-	//  allFedsOccupancyHighEnergyHist_->Fill(iphi,ieta,energy);
-	if (iz<0) {
-	  EEM_FedsenergyOnlyHighHist_->Fill(energy);
-	  EEM_OccupancyHighEnergy_->Fill(ix-0.5,iy-0.5);
-	  EEM_OccupancyHighEnergyCoarse_->Fill(ix-0.5,iy-0.5);    
-	} else {
-	  EEP_FedsenergyOnlyHighHist_->Fill(energy);
-	}
-	//  HighEnergy_2GeV_occuCoarse->Fill(iphi,ieta);    
-	//  HighEnergy_2GeV_occu3D->Fill(iphi,ieta,energy);
-	
-	//  HighEnergy_NumXtal->Fill(fullnumXtalsinCluster);
-	//  HighEnergy_NumXtalFedId->Fill(FEDid,fullnumXtalsinCluster);
-	//  HighEnergy_NumXtaliphi->Fill(iphi,fullnumXtalsinCluster);
-	//  HighEnergy_energy3D->Fill(iphi,ieta,energy);
-	//  HighEnergy_energyNumXtal->Fill(fullnumXtalsinCluster,energy);
-	
-	if (energy>100.0) {
-	  LogInfo("EcalCosmicsHists") << "Very high energy event in EE " << iEvent.id().run() << " : " 
-				      << iEvent.id().event() << " " << naiveEvtNum_  
-				      << " : " << energy << " " << numXtalsinCluster
-				      << " : " << ix << " " << iy 
-				      << " : " << isEcalL1 << isHCALL1 << isDTL1 << isRPCL1 << isCSCL1 ;
-	  //    HighEnergy_100GeV_occuCoarse->Fill(iphi,ieta);    
-	  //    HighEnergy_100GeV_occu3D->Fill(iphi,ieta,energy);
-	}
-	
-      }  
-      
+
+      if (energy > minHighEnergy_) {
+        LogInfo("EcalCosmicsHists") << "High energy event in EE " << iEvent.id().run() << " : " << iEvent.id().event()
+                                    << " " << naiveEvtNum_ << " : " << energy << " " << numXtalsinCluster << " : " << ix
+                                    << " " << iy << " : " << isEcalL1 << isHCALL1 << isDTL1 << isRPCL1 << isCSCL1;
+
+        //  numberOfHighEClusters++;
+        //  allOccupancyHighEnergy_->Fill(iphi, ieta);
+        //  allOccupancyHighEnergyCoarse_->Fill(iphi, ieta);
+        //  allFedsOccupancyHighEnergyHist_->Fill(iphi,ieta,energy);
+        if (iz < 0) {
+          EEM_FedsenergyOnlyHighHist_->Fill(energy);
+          EEM_OccupancyHighEnergy_->Fill(ix - 0.5, iy - 0.5);
+          EEM_OccupancyHighEnergyCoarse_->Fill(ix - 0.5, iy - 0.5);
+        } else {
+          EEP_FedsenergyOnlyHighHist_->Fill(energy);
+        }
+        //  HighEnergy_2GeV_occuCoarse->Fill(iphi,ieta);
+        //  HighEnergy_2GeV_occu3D->Fill(iphi,ieta,energy);
+
+        //  HighEnergy_NumXtal->Fill(fullnumXtalsinCluster);
+        //  HighEnergy_NumXtalFedId->Fill(FEDid,fullnumXtalsinCluster);
+        //  HighEnergy_NumXtaliphi->Fill(iphi,fullnumXtalsinCluster);
+        //  HighEnergy_energy3D->Fill(iphi,ieta,energy);
+        //  HighEnergy_energyNumXtal->Fill(fullnumXtalsinCluster,energy);
+
+        if (energy > 100.0) {
+          LogInfo("EcalCosmicsHists") << "Very high energy event in EE " << iEvent.id().run() << " : "
+                                      << iEvent.id().event() << " " << naiveEvtNum_ << " : " << energy << " "
+                                      << numXtalsinCluster << " : " << ix << " " << iy << " : " << isEcalL1 << isHCALL1
+                                      << isDTL1 << isRPCL1 << isCSCL1;
+          //    HighEnergy_100GeV_occuCoarse->Fill(iphi,ieta);
+          //    HighEnergy_100GeV_occu3D->Fill(iphi,ieta,energy);
+        }
+      }
+
       // *** end of High Energy Clusters analysis *** //
-      
-    }//++++++++++++++++++END LOOP OVER EE SUPERCLUSTERS+++++++++++++++++++++++++++++++++++
+
+    }  //++++++++++++++++++END LOOP OVER EE SUPERCLUSTERS+++++++++++++++++++++++++++++++++++
   }
-  
+
   HighEnergy_numClusHighEn->Fill(numberOfHighEClusters);
-  HighEnergy_ratioClusters->Fill((double(numberOfHighEClusters))/(double(numberOfCosmics)));
-  
+  HighEnergy_ratioClusters->Fill((double(numberOfHighEClusters)) / (double(numberOfCosmics)));
+
   numberofCosmicsHist_->Fill(numberOfCosmics);
   EEP_numberofCosmicsHist_->Fill(numberOfCosmicsEEP);
   EEM_numberofCosmicsHist_->Fill(numberOfCosmicsEEM);
   numberofCosmicsHistEB_->Fill(numberOfCosmicsEB);
-  
-  if ( numberOfCosmics > 0 ) {
+
+  if (numberOfCosmics > 0) {
     cosmicCounter_++;
     numberofGoodEvtFreq_->Fill(naiveEvtNum_);
     allFedsFreqTimeHist_->Fill(eventTime);
@@ -993,36 +991,39 @@ EcalCosmicsHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSe
     //std::cout << " BX " << iEvent.experimentType() << std::endl;
   }
 
-  if ( numberOfCosmicsEB > 0 ) cosmicCounterEB_++;
-  if ( numberOfCosmicsEEP > 0 ) cosmicCounterEEP_++;
-  if ( numberOfCosmicsEEM > 0 ) cosmicCounterEEM_++;
+  if (numberOfCosmicsEB > 0)
+    cosmicCounterEB_++;
+  if (numberOfCosmicsEEP > 0)
+    cosmicCounterEEP_++;
+  if (numberOfCosmicsEEM > 0)
+    cosmicCounterEEM_++;
 
-  if (numberOfCosmicsTop&&numberOfCosmicsBottom) {
+  if (numberOfCosmicsTop && numberOfCosmicsBottom) {
     cosmicCounterTopBottom_++;
-    numberofCosmicsTopBottomHist_->Fill(numberOfCosmicsTop+numberOfCosmicsBottom);
+    numberofCosmicsTopBottomHist_->Fill(numberOfCosmicsTop + numberOfCosmicsBottom);
   }
-  
+
   // *** TrackAssociator *** //
-  
-  // get reco tracks 
+
+  // get reco tracks
   edm::Handle<reco::TrackCollection> recoTracks;
-  iEvent.getByLabel("cosmicMuons", recoTracks);  
-  
-  if ( recoTracks.isValid() ) {
+  iEvent.getByLabel("cosmicMuons", recoTracks);
+
+  if (recoTracks.isValid()) {
     //    LogWarning("EcalCosmicsHists") << "... Valid TrackAssociator recoTracks !!! " << recoTracks.product()->size();
-    std::map<int,std::vector<DetId> > trackDetIdMap;
+    std::map<int, std::vector<DetId> > trackDetIdMap;
     int tracks = 0;
-    for(reco::TrackCollection::const_iterator recoTrack = recoTracks->begin(); recoTrack != recoTracks->end(); ++recoTrack){
-      
-      if(fabs(recoTrack->d0())>70 || fabs(recoTrack->dz())>70)
+    for (reco::TrackCollection::const_iterator recoTrack = recoTracks->begin(); recoTrack != recoTracks->end();
+         ++recoTrack) {
+      if (fabs(recoTrack->d0()) > 70 || fabs(recoTrack->dz()) > 70)
         continue;
-      if(recoTrack->numberOfValidHits()<20)
+      if (recoTrack->numberOfValidHits() < 20)
         continue;
-      
-      //if (recoTrack->pt() < 2) continue; // skip low Pt tracks       
-      
-      TrackDetMatchInfo info = trackAssociator_.associate(iEvent, iSetup, *recoTrack, trackParameters_);      
-      
+
+      //if (recoTrack->pt() < 2) continue; // skip low Pt tracks
+
+      TrackDetMatchInfo info = trackAssociator_.associate(iEvent, iSetup, *recoTrack, trackParameters_);
+
       //       edm::LogVerbatim("TrackAssociator") << "\n-------------------------------------------------------\n Track (pt,eta,phi): " <<
       //    recoTrack->pt() << " , " << recoTrack->eta() << " , " << recoTrack->phi() ;
       //       edm::LogVerbatim("TrackAssociator") << "Ecal energy in crossed crystals based on RecHits: " <<
@@ -1034,7 +1035,7 @@ EcalCosmicsHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSe
       //       edm::LogVerbatim("TrackAssociator") << "Hcal energy in 3x3 towers based on RecHits: " <<
       //    info.nXnEnergy(TrackDetMatchInfo::HcalRecHits, 1);
       //       edm::LogVerbatim("TrackAssociator") << "Number of muon segment matches: " << info.numberOfSegments();
-      
+
       //       std::cout << "\n-------------------------------------------------------\n Track (pt,eta,phi): " <<
       //    recoTrack->pt() << " , " << recoTrack->eta() << " , " << recoTrack->phi() << std::endl;
       //       std::cout << "Ecal energy in crossed crystals based on RecHits: " <<
@@ -1045,41 +1046,41 @@ EcalCosmicsHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSe
       //    info.crossedEnergy(TrackDetMatchInfo::HcalRecHits) << std::endl;
       //       std::cout << "Hcal energy in 3x3 towers based on RecHits: " <<
       //    info.nXnEnergy(TrackDetMatchInfo::HcalRecHits, 1) << std::endl;
-      
-      for (unsigned int i=0; i<info.crossedEcalIds.size(); i++) {	 
-	// only checks for barrel
-	if (info.crossedEcalIds[i].det() == DetId::Ecal && info.crossedEcalIds[i].subdetId() == 1) {	     
-	  EBDetId ebDetId (info.crossedEcalIds[i]);	   
-	  trackAssoc_muonsEcal_->Fill(ebDetId.iphi(), ebDetId.ieta());
-	  //std::cout << "Crossed iphi: " << ebDetId.iphi() 
-	  //    << " ieta: " << ebDetId.ieta() << " : nCross " << info.crossedEcalIds.size() << std::endl;
-
-	  EcalRecHitCollection::const_iterator thishit = hits->find(ebDetId);
-	  if (thishit == hits->end()) continue;
-	  
-	  //EcalRecHit myhit = (*thishit);	 
-	  //double thisamp = myhit.energy();
-	  //std::cout << " Crossed energy: " << thisamp << " : nCross " << info.crossedEcalIds.size() << std::endl;	  
-	}
+
+      for (unsigned int i = 0; i < info.crossedEcalIds.size(); i++) {
+        // only checks for barrel
+        if (info.crossedEcalIds[i].det() == DetId::Ecal && info.crossedEcalIds[i].subdetId() == 1) {
+          EBDetId ebDetId(info.crossedEcalIds[i]);
+          trackAssoc_muonsEcal_->Fill(ebDetId.iphi(), ebDetId.ieta());
+          //std::cout << "Crossed iphi: " << ebDetId.iphi()
+          //    << " ieta: " << ebDetId.ieta() << " : nCross " << info.crossedEcalIds.size() << std::endl;
+
+          EcalRecHitCollection::const_iterator thishit = hits->find(ebDetId);
+          if (thishit == hits->end())
+            continue;
+
+          //EcalRecHit myhit = (*thishit);
+          //double thisamp = myhit.energy();
+          //std::cout << " Crossed energy: " << thisamp << " : nCross " << info.crossedEcalIds.size() << std::endl;
+        }
       }
-      
+
       //edm::LogVerbatim("TrackAssociator") << " crossedEcalIds size: " << info.crossedEcalIds.size()
       //				  << " crossedEcalRecHits size: " << info.crossedEcalRecHits.size();
       numberofCrossedEcalIdsHist_->Fill(info.crossedEcalIds.size());
       tracks++;
-      if(!info.crossedEcalIds.empty())
-        trackDetIdMap.insert(std::pair<int,std::vector<DetId> > (tracks,info.crossedEcalIds));
-    }      
-    
+      if (!info.crossedEcalIds.empty())
+        trackDetIdMap.insert(std::pair<int, std::vector<DetId> >(tracks, info.crossedEcalIds));
+    }
+
     // Now to match recoTracks with cosmic clusters
-    
+
     int numAssocTracks = 0;
     int numAssocClusters = 0;
     edm::LogVerbatim("TrackAssociator") << "Matching cosmic clusters to tracks...";
     int numSeeds = seeds.size();
     int numTracks = trackDetIdMap.size();
-    while(!seeds.empty() && !trackDetIdMap.empty())
-    {
+    while (!seeds.empty() && !trackDetIdMap.empty()) {
       double bestDr = 1000;
       double bestDPhi = 1000;
       double bestDEta = 1000;
@@ -1090,28 +1091,28 @@ EcalCosmicsHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSe
       EBDetId bestTrackDet;
       EBDetId bestSeed;
       int bestTrack = -1;
-      std::map<EBDetId,EBDetId> trackDetIdToSeedMap;
+      std::map<EBDetId, EBDetId> trackDetIdToSeedMap;
 
       //edm::LogVerbatim("TrackAssociator") << "NumTracks:" << trackDetIdMap.size() << " numClusters:" << seeds.size();
 
-      for(std::vector<EBDetId>::const_iterator seedItr = seeds.begin(); seedItr != seeds.end(); ++seedItr) {
-        for(std::map<int,std::vector<DetId> >::const_iterator mapItr = trackDetIdMap.begin();
-            mapItr != trackDetIdMap.end(); ++mapItr) {
-          for(unsigned int i=0; i<mapItr->second.size(); i++) {
+      for (std::vector<EBDetId>::const_iterator seedItr = seeds.begin(); seedItr != seeds.end(); ++seedItr) {
+        for (std::map<int, std::vector<DetId> >::const_iterator mapItr = trackDetIdMap.begin();
+             mapItr != trackDetIdMap.end();
+             ++mapItr) {
+          for (unsigned int i = 0; i < mapItr->second.size(); i++) {
             // only checks for barrel
-            if(mapItr->second[i].det() == DetId::Ecal && mapItr->second[i].subdetId() == 1) {
+            if (mapItr->second[i].det() == DetId::Ecal && mapItr->second[i].subdetId() == 1) {
               EBDetId ebDet = (mapItr->second[i]);
               double seedEta = seedItr->ieta();
-              double deta = ebDet.ieta()-seedEta;
-              if(seedEta * ebDet.ieta() < 0 )
-                deta > 0 ? (deta=deta-1.) : (deta=deta+1.); 
+              double deta = ebDet.ieta() - seedEta;
+              if (seedEta * ebDet.ieta() < 0)
+                deta > 0 ? (deta = deta - 1.) : (deta = deta + 1.);
               double dR;
-              double dphi = ebDet.iphi()-seedItr->iphi();
+              double dphi = ebDet.iphi() - seedItr->iphi();
               if (abs(dphi) > 180)
-                dphi > 0 ?  (dphi=360-dphi) : (dphi=-360-dphi);
-              dR = sqrt(deta*deta + dphi*dphi);
-              if(dR < bestDr)
-              {
+                dphi > 0 ? (dphi = 360 - dphi) : (dphi = -360 - dphi);
+              dR = sqrt(deta * deta + dphi * dphi);
+              if (dR < bestDr) {
                 bestDr = dR;
                 bestDPhi = dphi;
                 bestDEta = deta;
@@ -1127,133 +1128,149 @@ EcalCosmicsHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSe
           }
         }
       }
-      if(bestDr < 1000) {
+      if (bestDr < 1000) {
         //edm::LogVerbatim("TrackAssociator") << "Best deltaR from matched DetId's to cluster:" << bestDr;
         deltaRHist_->Fill(bestDr);
         deltaPhiHist_->Fill(bestDPhi);
         deltaEtaHist_->Fill(bestDEta);
-        deltaEtaDeltaPhiHist_->Fill(bestDEta,bestDPhi);
-        seedTrackEtaHist_->Fill(bestEtaSeed,bestEtaTrack);
-        seedTrackPhiHist_->Fill(bestPhiSeed,bestPhiTrack);
-        seeds.erase(find(seeds.begin(),seeds.end(), bestSeed));
+        deltaEtaDeltaPhiHist_->Fill(bestDEta, bestDPhi);
+        seedTrackEtaHist_->Fill(bestEtaSeed, bestEtaTrack);
+        seedTrackPhiHist_->Fill(bestPhiSeed, bestPhiTrack);
+        seeds.erase(find(seeds.begin(), seeds.end(), bestSeed));
         trackDetIdMap.erase(trackDetIdMap.find(bestTrack));
         trackDetIdToSeedMap[bestTrackDet] = bestSeed;
         numAssocTracks++;
         numAssocClusters++;
 
-	// for high energy analysis
-	if(bestDPhi < 1.5 && bestDEta < 1.8 ) {
-	  //edm::LogVerbatim("TrackAssociator") << "Best seed ieta and iphi: (" 
-	  //					<< bestSeed.ieta() << ", " << bestSeed.iphi() << ") ";
-	  //check if the bestSeed is a High Energy one
-	  EcalRecHitCollection::const_iterator Ecalhit = hits->find(bestSeed);
-	  if (Ecalhit == hits->end()) {
-	    continue;
-	  }
-	  double EcalhitEnergy = Ecalhit->energy();
-	  //edm::LogVerbatim("TrackAssociator") << "Best seed energy: " << EcalhitEnergy ;
-	  HighEnergy_bestSeed->Fill(EcalhitEnergy);
-	  HighEnergy_bestSeedOccupancy->Fill(bestSeed.iphi(), bestSeed.ieta());
-	}
-      }
-      else {
-	edm::LogVerbatim("TrackAssociator") << "could not match cluster seed to track." << bestDr;
-	break; // no match found
+        // for high energy analysis
+        if (bestDPhi < 1.5 && bestDEta < 1.8) {
+          //edm::LogVerbatim("TrackAssociator") << "Best seed ieta and iphi: ("
+          //					<< bestSeed.ieta() << ", " << bestSeed.iphi() << ") ";
+          //check if the bestSeed is a High Energy one
+          EcalRecHitCollection::const_iterator Ecalhit = hits->find(bestSeed);
+          if (Ecalhit == hits->end()) {
+            continue;
+          }
+          double EcalhitEnergy = Ecalhit->energy();
+          //edm::LogVerbatim("TrackAssociator") << "Best seed energy: " << EcalhitEnergy ;
+          HighEnergy_bestSeed->Fill(EcalhitEnergy);
+          HighEnergy_bestSeedOccupancy->Fill(bestSeed.iphi(), bestSeed.ieta());
+        }
+      } else {
+        edm::LogVerbatim("TrackAssociator") << "could not match cluster seed to track." << bestDr;
+        break;  // no match found
       }
     }
-    if(numSeeds>0 && numTracks>0) {
-      ratioAssocClustersHist_->AddBinContent(1,numAssocClusters);
-      ratioAssocClustersHist_->AddBinContent(2,numSeeds);
+    if (numSeeds > 0 && numTracks > 0) {
+      ratioAssocClustersHist_->AddBinContent(1, numAssocClusters);
+      ratioAssocClustersHist_->AddBinContent(2, numSeeds);
     }
-    if(numTracks>0) {
-      ratioAssocTracksHist_->AddBinContent(1,numAssocTracks);
-      ratioAssocTracksHist_->AddBinContent(2,numTracks);
+    if (numTracks > 0) {
+      ratioAssocTracksHist_->AddBinContent(1, numAssocTracks);
+      ratioAssocTracksHist_->AddBinContent(2, numTracks);
       numberofCosmicsWTrackHist_->Fill(numSeeds);
     }
   } else {
-    //    LogWarning("EcalCosmicsHists") << "!!! No TrackAssociator recoTracks !!!";    
+    //    LogWarning("EcalCosmicsHists") << "!!! No TrackAssociator recoTracks !!!";
   }
-  
-  
+
   // Study on Tracks for High Energy events
   edm::Handle<reco::TrackCollection> recoTracksBarrel;
   iEvent.getByLabel("cosmicMuonsBarrelOnly", recoTracksBarrel);
-  if ( !recoTracksBarrel.isValid() ) {
+  if (!recoTracksBarrel.isValid()) {
     //edm::LogWarning("EcalCosmicsHists") << "RecoTracksBarrel not valid!! " ;
-  }
-  else {
+  } else {
     //edm::LogWarning("EcalCosmicsHists") << "Number of barrel reco tracks found in the event: " << recoTracksBarrel->size() ;
     HighEnergy_numRecoTrackBarrel->Fill(recoTracksBarrel->size());
-    for(reco::TrackCollection::const_iterator recoTrack = recoTracksBarrel->begin(); recoTrack != recoTracksBarrel->end(); ++recoTrack) {
+    for (reco::TrackCollection::const_iterator recoTrack = recoTracksBarrel->begin();
+         recoTrack != recoTracksBarrel->end();
+         ++recoTrack) {
       //edm::LogWarning("EcalCosmicsHists") << "Track (pt,eta,phi): " << recoTrack->pt() << " , " << recoTrack->eta() << " , " << recoTrack->phi() ;
       //edm::LogWarning("EcalCosmicsHists") << "Track innermost hit: " << recoTrack->innerPosition().phi() ;
     }
-    
-    for (reco::SuperClusterCollection::const_iterator clus = clusterCollection_p->begin(); clus != clusterCollection_p->end(); ++clus) {
+
+    for (reco::SuperClusterCollection::const_iterator clus = clusterCollection_p->begin();
+         clus != clusterCollection_p->end();
+         ++clus) {
       double energy = clus->energy();
-      double phi    = clus->phi();
-      double eta    = clus->eta();
-      
-      if (recoTracksBarrel->empty()) HighEnergy_0tracks_occu3D->Fill(phi,eta,energy);
-      if (recoTracksBarrel->size()==1) HighEnergy_1tracks_occu3D->Fill(phi,eta,energy);
-      if (recoTracksBarrel->size()==2) HighEnergy_2tracks_occu3D->Fill(phi,eta,energy);
-      
-      std::vector<std::pair<DetId, float> > clusterDetIds = clus->hitsAndFractions();//get these from the cluster
-      for(std::vector< std::pair<DetId, float> >::const_iterator detitr = clusterDetIds.begin(); detitr != clusterDetIds.end(); ++detitr)
-	{
-	  if ((*detitr).first.det() != DetId::Ecal) {continue;}
-	  if ((*detitr).first.subdetId() != EcalBarrel) {continue; }
-	  EcalRecHitCollection::const_iterator thishit = hits->find((*detitr).first);
-	  if (thishit == hits->end()) {continue;}
-	  
-	  double rechitenergy = thishit->energy();
-	  int ieta = ((EBDetId)(*detitr).first).ieta();
-	  int iphi = ((EBDetId)(*detitr).first).iphi();
-	  if (rechitenergy > minRecHitAmpEB_) {
-	    if (recoTracksBarrel->empty()) HighEnergy_0tracks_occu3DXtal->Fill(iphi,ieta,rechitenergy);
-	    if (recoTracksBarrel->size()==1) HighEnergy_1tracks_occu3DXtal->Fill(iphi,ieta,rechitenergy);
-	    if (recoTracksBarrel->size()==2) HighEnergy_2tracks_occu3DXtal->Fill(iphi,ieta,rechitenergy);
-	    
-	    if (rechitenergy > 10 ) edm::LogWarning("EcalCosmicsHists") << "!!!!! Crystal with energy " << rechitenergy << " at (ieta,iphi) (" << ieta << " ," << iphi << "); Id: " << (*detitr).first.det();
-	  }
-	}
+      double phi = clus->phi();
+      double eta = clus->eta();
+
+      if (recoTracksBarrel->empty())
+        HighEnergy_0tracks_occu3D->Fill(phi, eta, energy);
+      if (recoTracksBarrel->size() == 1)
+        HighEnergy_1tracks_occu3D->Fill(phi, eta, energy);
+      if (recoTracksBarrel->size() == 2)
+        HighEnergy_2tracks_occu3D->Fill(phi, eta, energy);
+
+      std::vector<std::pair<DetId, float> > clusterDetIds = clus->hitsAndFractions();  //get these from the cluster
+      for (std::vector<std::pair<DetId, float> >::const_iterator detitr = clusterDetIds.begin();
+           detitr != clusterDetIds.end();
+           ++detitr) {
+        if ((*detitr).first.det() != DetId::Ecal) {
+          continue;
+        }
+        if ((*detitr).first.subdetId() != EcalBarrel) {
+          continue;
+        }
+        EcalRecHitCollection::const_iterator thishit = hits->find((*detitr).first);
+        if (thishit == hits->end()) {
+          continue;
+        }
+
+        double rechitenergy = thishit->energy();
+        int ieta = ((EBDetId)(*detitr).first).ieta();
+        int iphi = ((EBDetId)(*detitr).first).iphi();
+        if (rechitenergy > minRecHitAmpEB_) {
+          if (recoTracksBarrel->empty())
+            HighEnergy_0tracks_occu3DXtal->Fill(iphi, ieta, rechitenergy);
+          if (recoTracksBarrel->size() == 1)
+            HighEnergy_1tracks_occu3DXtal->Fill(iphi, ieta, rechitenergy);
+          if (recoTracksBarrel->size() == 2)
+            HighEnergy_2tracks_occu3DXtal->Fill(iphi, ieta, rechitenergy);
+
+          if (rechitenergy > 10)
+            edm::LogWarning("EcalCosmicsHists") << "!!!!! Crystal with energy " << rechitenergy << " at (ieta,iphi) ("
+                                                << ieta << " ," << iphi << "); Id: " << (*detitr).first.det();
+        }
+      }
     }
-    
+
     // look at angle between 2 recoTracks
-    if ( recoTracksBarrel->size() == 2 ) {
+    if (recoTracksBarrel->size() == 2) {
       reco::TrackCollection::const_iterator Track1 = recoTracksBarrel->begin();
-      reco::TrackCollection::const_iterator Track2 = (recoTracksBarrel->begin())+1;
-      float angle = (acos(sin(Track1->theta()) * cos(Track1->phi()) * sin(Track2->theta()) * cos(Track2->phi()) + sin(Track1->theta()) * sin(Track1->phi()) * sin(Track2->theta()) * sin(Track2->phi()) + cos(Track1->theta()) * cos(Track2->theta())))/0.017453292519943;
+      reco::TrackCollection::const_iterator Track2 = (recoTracksBarrel->begin()) + 1;
+      float angle = (acos(sin(Track1->theta()) * cos(Track1->phi()) * sin(Track2->theta()) * cos(Track2->phi()) +
+                          sin(Track1->theta()) * sin(Track1->phi()) * sin(Track2->theta()) * sin(Track2->phi()) +
+                          cos(Track1->theta()) * cos(Track2->theta()))) /
+                    0.017453292519943;
       //edm::LogWarning("EcalCosmicsHists") << "Tracks angle: " << angle;
       HighEnergy_TracksAngle->Fill(angle);
-      if ( (Track1->innerPosition().phi()) > 0  && (Track2->innerPosition().phi()) < 0 ) {
-	//edm::LogWarning("EcalCosmicsHists") << "Top-bottom tracks";
-	HighEnergy_TracksAngleTopBottom->Fill(angle);
+      if ((Track1->innerPosition().phi()) > 0 && (Track2->innerPosition().phi()) < 0) {
+        //edm::LogWarning("EcalCosmicsHists") << "Top-bottom tracks";
+        HighEnergy_TracksAngleTopBottom->Fill(angle);
       }
-      
-      
     }
   }
-  
+
   // *** end of TrackAssociator code *** //
-  
-  
+
   // *** HCAL RecHits code *** //
-  
+
   //hcal rechits
   edm::Handle<HBHERecHitCollection> hbhe;
   iEvent.getByLabel("hbhereco", hbhe);
-  
+
   edm::Handle<HFRecHitCollection> hfrh;
-  iEvent.getByLabel("hfreco",hfrh);
-  
-  edm::Handle<HORecHitCollection> horh; 
+  iEvent.getByLabel("hfreco", hfrh);
+
+  edm::Handle<HORecHitCollection> horh;
   iEvent.getByLabel("horeco", horh);
-  
-  if ( hbhe.isValid() ) {
-    //    LogInfo("EcalCosmicHists") << "event " << ievt << " HBHE RecHits collection size " << hbhe->size();    
+
+  if (hbhe.isValid()) {
+    //    LogInfo("EcalCosmicHists") << "event " << ievt << " HBHE RecHits collection size " << hbhe->size();
     const HBHERecHitCollection hbheHit = *(hbhe.product());
-    for (HBHERecHitCollection::const_iterator hhit=hbheHit.begin(); hhit!=hbheHit.end(); hhit++) {
+    for (HBHERecHitCollection::const_iterator hhit = hbheHit.begin(); hhit != hbheHit.end(); hhit++) {
       //      if (hhit->energy() > 0.6){
       hcalEnergy_HBHE_->Fill(hhit->energy());
       //      }
@@ -1261,21 +1278,21 @@ EcalCosmicsHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSe
   } else {
     //    LogWarning("EcalCosmicHists") << " HBHE RecHits **NOT** VALID!! " << endl;
   }
-  
-  if ( hfrh.isValid() ) {
+
+  if (hfrh.isValid()) {
     //    LogInfo("EcalCosmicHists") << "event " << ievt << " HF RecHits collection size " << hfrh->size();
     const HFRecHitCollection hfHit = *(hfrh.product());
-    for (HFRecHitCollection::const_iterator hhit=hfHit.begin(); hhit!=hfHit.end(); hhit++) {
+    for (HFRecHitCollection::const_iterator hhit = hfHit.begin(); hhit != hfHit.end(); hhit++) {
       hcalEnergy_HF_->Fill(hhit->energy());
     }
   } else {
     //    LogWarning("EcalCosmicHists") << " HF RecHits **NOT** VALID!! " << endl;
-  } 
-  
-  if ( horh.isValid() ) {
+  }
+
+  if (horh.isValid()) {
     //    LogInfo("EcalCosmicHists") << "event " << ievt << " HO RecHits collection size " << horh->size();
     const HORecHitCollection hoHit = *(horh.product());
-    for (HORecHitCollection::const_iterator hhit=hoHit.begin(); hhit!=hoHit.end(); hhit++) {
+    for (HORecHitCollection::const_iterator hhit = hoHit.begin(); hhit != hoHit.end(); hhit++) {
       //     if (hhit->energy() > 0.6){
       hcalEnergy_HO_->Fill(hhit->energy());
       //     }
@@ -1283,41 +1300,38 @@ EcalCosmicsHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSe
   } else {
     //    LogWarning("EcalCosmicHists") << " HO RecHits **NOT** VALID!! " << endl;
   }
-  
+
   // *** end of HCAL code *** //
 }
 
-
-
-std::vector<bool> EcalCosmicsHists::determineTriggers(const edm::Event& iEvent, const edm::EventSetup& eventSetup)
-{
-  std::vector<bool> l1Triggers; //DT,CSC,RPC,HCAL,ECAL
-                                //0 , 1 , 2 , 3  , 4
-  for(int i=0;i<5;i++)
+std::vector<bool> EcalCosmicsHists::determineTriggers(const edm::Event& iEvent, const edm::EventSetup& eventSetup) {
+  std::vector<bool> l1Triggers;  //DT,CSC,RPC,HCAL,ECAL
+                                 //0 , 1 , 2 , 3  , 4
+  for (int i = 0; i < 5; i++)
     l1Triggers.push_back(false);
-  
+
   // get the GMTReadoutCollection
-  Handle<L1MuGMTReadoutCollection> gmtrc_handle; 
-  iEvent.getByLabel(l1GMTReadoutRecTag_,gmtrc_handle);
+  Handle<L1MuGMTReadoutCollection> gmtrc_handle;
+  iEvent.getByLabel(l1GMTReadoutRecTag_, gmtrc_handle);
   L1MuGMTReadoutCollection const* gmtrc = gmtrc_handle.product();
-  if (!(gmtrc_handle.isValid())) 
-    {
-      LogWarning("EcalCosmicsHists") << "l1MuGMTReadoutCollection" << " not available";
-      return l1Triggers;
-    }
+  if (!(gmtrc_handle.isValid())) {
+    LogWarning("EcalCosmicsHists") << "l1MuGMTReadoutCollection"
+                                   << " not available";
+    return l1Triggers;
+  }
   // get hold of L1GlobalReadoutRecord
   Handle<L1GlobalTriggerReadoutRecord> L1GTRR;
-  iEvent.getByLabel(l1GTReadoutRecTag_,L1GTRR);
-  
+  iEvent.getByLabel(l1GTReadoutRecTag_, L1GTRR);
+
   //Ecal
   edm::ESHandle<L1GtTriggerMenu> menuRcd;
-  eventSetup.get<L1GtTriggerMenuRcd>().get(menuRcd) ;
+  eventSetup.get<L1GtTriggerMenuRcd>().get(menuRcd);
   const L1GtTriggerMenu* menu = menuRcd.product();
-  edm::Handle< L1GlobalTriggerReadoutRecord > gtRecord;
-  iEvent.getByLabel( edm::InputTag("gtDigis"), gtRecord);
+  edm::Handle<L1GlobalTriggerReadoutRecord> gtRecord;
+  iEvent.getByLabel(edm::InputTag("gtDigis"), gtRecord);
   // Get dWord after masking disabled bits
   const DecisionWord dWord = gtRecord->decisionWord();
-  
+
   bool l1SingleEG1 = menu->gtAlgorithmResult("L1_SingleEG1", dWord);
   bool l1SingleEG5 = menu->gtAlgorithmResult("L1_SingleEG5", dWord);
   bool l1SingleEG8 = menu->gtAlgorithmResult("L1_SingleEG8", dWord);
@@ -1329,668 +1343,1518 @@ std::vector<bool> EcalCosmicsHists::determineTriggers(const edm::Event& iEvent,
   bool l1DoubleNoIsoEGBTBtight = menu->gtAlgorithmResult("L1_DoubleNoIsoEG_BTB_tight", dWord);
   bool l1DoubleNoIsoEGBTBloose = menu->gtAlgorithmResult("L1_DoubleNoIsoEG_BTB_loose ", dWord);
   bool l1DoubleNoIsoEGTopBottom = menu->gtAlgorithmResult("L1_DoubleNoIsoEGTopBottom", dWord);
-  bool l1DoubleNoIsoEGTopBottomCen  = menu->gtAlgorithmResult("L1_DoubleNoIsoEGTopBottomCen", dWord);
-  bool l1DoubleNoIsoEGTopBottomCen2  = menu->gtAlgorithmResult("L1_DoubleNoIsoEGTopBottomCen2", dWord);
-  bool l1DoubleNoIsoEGTopBottomCenVert  = menu->gtAlgorithmResult("L1_DoubleNoIsoEGTopBottomCenVert", dWord);
-  
-  l1Triggers[4] = l1SingleEG1 || l1SingleEG5 || l1SingleEG8 || l1SingleEG10 || l1SingleEG12 || l1SingleEG15
-    || l1SingleEG20 || l1SingleEG25 || l1DoubleNoIsoEGBTBtight || l1DoubleNoIsoEGBTBloose
-    || l1DoubleNoIsoEGTopBottom || l1DoubleNoIsoEGTopBottomCen || l1DoubleNoIsoEGTopBottomCen2
-    || l1DoubleNoIsoEGTopBottomCenVert;
-  
+  bool l1DoubleNoIsoEGTopBottomCen = menu->gtAlgorithmResult("L1_DoubleNoIsoEGTopBottomCen", dWord);
+  bool l1DoubleNoIsoEGTopBottomCen2 = menu->gtAlgorithmResult("L1_DoubleNoIsoEGTopBottomCen2", dWord);
+  bool l1DoubleNoIsoEGTopBottomCenVert = menu->gtAlgorithmResult("L1_DoubleNoIsoEGTopBottomCenVert", dWord);
+
+  l1Triggers[4] = l1SingleEG1 || l1SingleEG5 || l1SingleEG8 || l1SingleEG10 || l1SingleEG12 || l1SingleEG15 ||
+                  l1SingleEG20 || l1SingleEG25 || l1DoubleNoIsoEGBTBtight || l1DoubleNoIsoEGBTBloose ||
+                  l1DoubleNoIsoEGTopBottom || l1DoubleNoIsoEGTopBottomCen || l1DoubleNoIsoEGTopBottomCen2 ||
+                  l1DoubleNoIsoEGTopBottomCenVert;
+
   std::vector<L1MuGMTReadoutRecord> gmt_records = gmtrc->getRecords();
   std::vector<L1MuGMTReadoutRecord>::const_iterator igmtrr;
-  for(igmtrr=gmt_records.begin(); igmtrr!=gmt_records.end(); igmtrr++) {
+  for (igmtrr = gmt_records.begin(); igmtrr != gmt_records.end(); igmtrr++) {
     std::vector<L1MuRegionalCand>::const_iterator iter1;
     std::vector<L1MuRegionalCand> rmc;
-    
+
     //DT triggers
     int idt = 0;
     rmc = igmtrr->getDTBXCands();
-    for(iter1=rmc.begin(); iter1!=rmc.end(); iter1++) {
-      if ( !(*iter1).empty() ) {
+    for (iter1 = rmc.begin(); iter1 != rmc.end(); iter1++) {
+      if (!(*iter1).empty()) {
         idt++;
       }
     }
-    //if(idt>0) std::cout << "Found " << idt << " valid DT candidates in bx wrt. L1A = " 
+    //if(idt>0) std::cout << "Found " << idt << " valid DT candidates in bx wrt. L1A = "
     //  << igmtrr->getBxInEvent() << std::endl;
-    if(igmtrr->getBxInEvent()==0 && idt>0) l1Triggers[0] = true;
-    
+    if (igmtrr->getBxInEvent() == 0 && idt > 0)
+      l1Triggers[0] = true;
+
     //RPC triggers
     int irpcb = 0;
     rmc = igmtrr->getBrlRPCCands();
-    for(iter1=rmc.begin(); iter1!=rmc.end(); iter1++) {
-      if ( !(*iter1).empty() ) {
+    for (iter1 = rmc.begin(); iter1 != rmc.end(); iter1++) {
+      if (!(*iter1).empty()) {
         irpcb++;
       }
     }
-    //if(irpcb>0) std::cout << "Found " << irpcb << " valid RPC candidates in bx wrt. L1A = " 
+    //if(irpcb>0) std::cout << "Found " << irpcb << " valid RPC candidates in bx wrt. L1A = "
     //  << igmtrr->getBxInEvent() << std::endl;
-    if(igmtrr->getBxInEvent()==0 && irpcb>0) l1Triggers[2] = true;
-    
+    if (igmtrr->getBxInEvent() == 0 && irpcb > 0)
+      l1Triggers[2] = true;
+
     //CSC Triggers
     int icsc = 0;
     rmc = igmtrr->getCSCCands();
-    for(iter1=rmc.begin(); iter1!=rmc.end(); iter1++) {
-      if ( !(*iter1).empty() ) {
+    for (iter1 = rmc.begin(); iter1 != rmc.end(); iter1++) {
+      if (!(*iter1).empty()) {
         icsc++;
       }
     }
-    //if(icsc>0) std::cout << "Found " << icsc << " valid CSC candidates in bx wrt. L1A = " 
+    //if(icsc>0) std::cout << "Found " << icsc << " valid CSC candidates in bx wrt. L1A = "
     //  << igmtrr->getBxInEvent() << std::endl;
-    if(igmtrr->getBxInEvent()==0 && icsc>0) l1Triggers[1] = true;
+    if (igmtrr->getBxInEvent() == 0 && icsc > 0)
+      l1Triggers[1] = true;
   }
-  
+
   L1GlobalTriggerReadoutRecord const* gtrr = L1GTRR.product();
-  
-  for(int ibx=-1; ibx<=1; ibx++) {
+
+  for (int ibx = -1; ibx <= 1; ibx++) {
     bool hcal_top = false;
     bool hcal_bot = false;
-    const L1GtPsbWord psb = gtrr->gtPsbWord(0xbb0d,ibx);
+    const L1GtPsbWord psb = gtrr->gtPsbWord(0xbb0d, ibx);
     std::vector<int> valid_phi;
-    if((psb.aData(4)&0x3f) >= 1) {valid_phi.push_back( (psb.aData(4)>>10)&0x1f ); }
-    if((psb.bData(4)&0x3f) >= 1) {valid_phi.push_back( (psb.bData(4)>>10)&0x1f ); }
-    if((psb.aData(5)&0x3f) >= 1) {valid_phi.push_back( (psb.aData(5)>>10)&0x1f ); }
-    if((psb.bData(5)&0x3f) >= 1) {valid_phi.push_back( (psb.bData(5)>>10)&0x1f ); }
+    if ((psb.aData(4) & 0x3f) >= 1) {
+      valid_phi.push_back((psb.aData(4) >> 10) & 0x1f);
+    }
+    if ((psb.bData(4) & 0x3f) >= 1) {
+      valid_phi.push_back((psb.bData(4) >> 10) & 0x1f);
+    }
+    if ((psb.aData(5) & 0x3f) >= 1) {
+      valid_phi.push_back((psb.aData(5) >> 10) & 0x1f);
+    }
+    if ((psb.bData(5) & 0x3f) >= 1) {
+      valid_phi.push_back((psb.bData(5) >> 10) & 0x1f);
+    }
     std::vector<int>::const_iterator iphi;
-    for(iphi=valid_phi.begin(); iphi!=valid_phi.end(); iphi++) {
+    for (iphi = valid_phi.begin(); iphi != valid_phi.end(); iphi++) {
       //std::cout << "Found HCAL mip with phi=" << *iphi << " in bx wrt. L1A = " << ibx << std::endl;
-      if(*iphi<9) hcal_top=true;
-      if(*iphi>8) hcal_bot=true;
+      if (*iphi < 9)
+        hcal_top = true;
+      if (*iphi > 8)
+        hcal_bot = true;
     }
-    if(ibx==0 && hcal_top && hcal_bot) l1Triggers[3]=true;
+    if (ibx == 0 && hcal_top && hcal_bot)
+      l1Triggers[3] = true;
   }
-  
+
   edm::LogInfo("EcalCosmicsHists") << "**** Trigger SourceSource ****";
-  if(l1Triggers[0]) edm::LogInfo("EcalCosmicsHists") << "DT";
-  if(l1Triggers[2]) edm::LogInfo("EcalCosmicsHists") << "RPC";
-  if(l1Triggers[1]) edm::LogInfo("EcalCosmicsHists") << "CSC";
-  if(l1Triggers[3]) edm::LogInfo("EcalCosmicsHists") << "HCAL";
-  if(l1Triggers[4]) edm::LogInfo("EcalCosmicsHists") << "ECAL";
+  if (l1Triggers[0])
+    edm::LogInfo("EcalCosmicsHists") << "DT";
+  if (l1Triggers[2])
+    edm::LogInfo("EcalCosmicsHists") << "RPC";
+  if (l1Triggers[1])
+    edm::LogInfo("EcalCosmicsHists") << "CSC";
+  if (l1Triggers[3])
+    edm::LogInfo("EcalCosmicsHists") << "HCAL";
+  if (l1Triggers[4])
+    edm::LogInfo("EcalCosmicsHists") << "ECAL";
   edm::LogInfo("EcalCosmicsHists") << "************************";
-  
+
   return l1Triggers;
 }
 
 // insert the hist map into the map keyed by FED number
-void EcalCosmicsHists::initHists(int FED)
-{
+void EcalCosmicsHists::initHists(int FED) {
   using namespace std;
-  
+
   string FEDid = intToString(FED);
   string title1 = "Energy of Seed Crystal ";
   title1.append(fedMap_->getSliceFromFed(FED));
   title1.append(";Seed Energy (GeV);Number of Cosmics");
   string name1 = "SeedEnergyFED";
   name1.append(intToString(FED));
-  int numBins = 200;//(int)round(histRangeMax_-histRangeMin_)+1;
-  TH1F* hist = new TH1F(name1.c_str(),title1.c_str(), numBins, histRangeMin_, histRangeMax_);
+  int numBins = 200;  //(int)round(histRangeMax_-histRangeMin_)+1;
+  TH1F* hist = new TH1F(name1.c_str(), title1.c_str(), numBins, histRangeMin_, histRangeMax_);
   FEDsAndHists_[FED] = hist;
   FEDsAndHists_[FED]->SetDirectory(nullptr);
-  
-  TH1F* E2hist = new TH1F(Form("E2_FED_%d",FED),Form("E2_FED_%d",FED), numBins, histRangeMin_, histRangeMax_);
+
+  TH1F* E2hist = new TH1F(Form("E2_FED_%d", FED), Form("E2_FED_%d", FED), numBins, histRangeMin_, histRangeMax_);
   FEDsAndE2Hists_[FED] = E2hist;
   FEDsAndE2Hists_[FED]->SetDirectory(nullptr);
-  
-  TH1F* energyhist = new TH1F(Form("Energy_FED_%d",FED),Form("Energy_FED_%d",FED), numBins, histRangeMin_, histRangeMax_);
+
+  TH1F* energyhist =
+      new TH1F(Form("Energy_FED_%d", FED), Form("Energy_FED_%d", FED), numBins, histRangeMin_, histRangeMax_);
   FEDsAndenergyHists_[FED] = energyhist;
   FEDsAndenergyHists_[FED]->SetDirectory(nullptr);
-  
-  TH2F* E2vsE1hist = new TH2F(Form("E2vsE1_FED_%d",FED),Form("E2vsE1_FED_%d",FED), numBins, histRangeMin_, histRangeMax_, numBins, histRangeMin_, histRangeMax_);
+
+  TH2F* E2vsE1hist = new TH2F(Form("E2vsE1_FED_%d", FED),
+                              Form("E2vsE1_FED_%d", FED),
+                              numBins,
+                              histRangeMin_,
+                              histRangeMax_,
+                              numBins,
+                              histRangeMin_,
+                              histRangeMax_);
   FEDsAndE2vsE1Hists_[FED] = E2vsE1hist;
   FEDsAndE2vsE1Hists_[FED]->SetDirectory(nullptr);
-  
-  TH2F* energyvsE1hist = new TH2F(Form("EnergyvsE1_FED_%d",FED),Form("EnergyvsE1_FED_%d",FED), numBins, histRangeMin_, histRangeMax_, numBins, histRangeMin_, histRangeMax_);
+
+  TH2F* energyvsE1hist = new TH2F(Form("EnergyvsE1_FED_%d", FED),
+                                  Form("EnergyvsE1_FED_%d", FED),
+                                  numBins,
+                                  histRangeMin_,
+                                  histRangeMax_,
+                                  numBins,
+                                  histRangeMin_,
+                                  histRangeMax_);
   FEDsAndenergyvsE1Hists_[FED] = energyvsE1hist;
   FEDsAndenergyvsE1Hists_[FED]->SetDirectory(nullptr);
-  
+
   title1 = "Time for ";
   title1.append(fedMap_->getSliceFromFed(FED));
   title1.append(";Relative Time (1 clock = 25ns);Events");
   name1 = "TimeFED";
   name1.append(intToString(FED));
-  TH1F* timingHist = new TH1F(name1.c_str(),title1.c_str(),78,-7,7);
+  TH1F* timingHist = new TH1F(name1.c_str(), title1.c_str(), 78, -7, 7);
   FEDsAndTimingHists_[FED] = timingHist;
   FEDsAndTimingHists_[FED]->SetDirectory(nullptr);
-  
-  TH1F* freqHist = new TH1F(Form("Frequency_FED_%d",FED),Form("Frequency for FED %d;Event Number",FED),100,0.,100000);
+
+  TH1F* freqHist =
+      new TH1F(Form("Frequency_FED_%d", FED), Form("Frequency for FED %d;Event Number", FED), 100, 0., 100000);
   FEDsAndFrequencyHists_[FED] = freqHist;
   FEDsAndFrequencyHists_[FED]->SetDirectory(nullptr);
-  
-  TH1F* iphiProfileHist = new TH1F(Form("iPhi_Profile_FED_%d",FED),Form("iPhi Profile for FED %d",FED),360,1.,361);
+
+  TH1F* iphiProfileHist =
+      new TH1F(Form("iPhi_Profile_FED_%d", FED), Form("iPhi Profile for FED %d", FED), 360, 1., 361);
   FEDsAndiPhiProfileHists_[FED] = iphiProfileHist;
   FEDsAndiPhiProfileHists_[FED]->SetDirectory(nullptr);
-  
-  TH1F* ietaProfileHist = new TH1F(Form("iEta_Profile_FED_%d",FED),Form("iEta Profile for FED %d",FED),172,-86,86);
+
+  TH1F* ietaProfileHist =
+      new TH1F(Form("iEta_Profile_FED_%d", FED), Form("iEta Profile for FED %d", FED), 172, -86, 86);
   FEDsAndiEtaProfileHists_[FED] = ietaProfileHist;
   FEDsAndiEtaProfileHists_[FED]->SetDirectory(nullptr);
-  
-  TH2F* timingHistVsFreq = new TH2F(Form("timeVsFreqFED_%d",FED),Form("time Vs Freq FED %d",FED),78,-7,7,100,0.,100000);
+
+  TH2F* timingHistVsFreq =
+      new TH2F(Form("timeVsFreqFED_%d", FED), Form("time Vs Freq FED %d", FED), 78, -7, 7, 100, 0., 100000);
   FEDsAndTimingVsFreqHists_[FED] = timingHistVsFreq;
   FEDsAndTimingVsFreqHists_[FED]->SetDirectory(nullptr);
-  
-  TH2F* timingHistVsAmp = new TH2F(Form("timeVsAmpFED_%d",FED),Form("time Vs Amp FED %d",FED),78,-7,7,numBins,histRangeMin_,histRangeMax_);
+
+  TH2F* timingHistVsAmp = new TH2F(
+      Form("timeVsAmpFED_%d", FED), Form("time Vs Amp FED %d", FED), 78, -7, 7, numBins, histRangeMin_, histRangeMax_);
   FEDsAndTimingVsAmpHists_[FED] = timingHistVsAmp;
   FEDsAndTimingVsAmpHists_[FED]->SetDirectory(nullptr);
-  
-  TH1F* numXtalInClusterHist = new TH1F(Form("NumXtalsInCluster_FED_%d",FED),Form("Num active Xtals In Cluster for FED %d;Num Active Xtals",FED),25,0,25);
+
+  TH1F* numXtalInClusterHist = new TH1F(Form("NumXtalsInCluster_FED_%d", FED),
+                                        Form("Num active Xtals In Cluster for FED %d;Num Active Xtals", FED),
+                                        25,
+                                        0,
+                                        25);
   FEDsAndNumXtalsInClusterHists_[FED] = numXtalInClusterHist;
   FEDsAndNumXtalsInClusterHists_[FED]->SetDirectory(nullptr);
-  
-  TH2F* OccupHist = new TH2F(Form("occupFED_%d",FED),Form("Occupancy FED %d;i#eta;i#phi",FED),85,1,86,20,1,21);
+
+  TH2F* OccupHist = new TH2F(Form("occupFED_%d", FED), Form("Occupancy FED %d;i#eta;i#phi", FED), 85, 1, 86, 20, 1, 21);
   FEDsAndOccupancyHists_[FED] = OccupHist;
   FEDsAndOccupancyHists_[FED]->SetDirectory(nullptr);
-  
-  TH2F* timingHistVsPhi = new TH2F(Form("timeVsPhiFED_%d",FED),Form("time Vs Phi FED %d;Relative Time (1 clock = 25ns);i#phi",FED),78,-7,7,20,1,21);
+
+  TH2F* timingHistVsPhi = new TH2F(Form("timeVsPhiFED_%d", FED),
+                                   Form("time Vs Phi FED %d;Relative Time (1 clock = 25ns);i#phi", FED),
+                                   78,
+                                   -7,
+                                   7,
+                                   20,
+                                   1,
+                                   21);
   FEDsAndTimingVsPhiHists_[FED] = timingHistVsPhi;
   FEDsAndTimingVsPhiHists_[FED]->SetDirectory(nullptr);
-  
-  TH2F* timingHistVsModule = new TH2F(Form("timeVsModuleFED_%d",FED),Form("time Vs Module FED %d;Relative Time (1 clock = 25ns);i#eta",FED),78,-7,7,4,1,86);
+
+  TH2F* timingHistVsModule = new TH2F(Form("timeVsModuleFED_%d", FED),
+                                      Form("time Vs Module FED %d;Relative Time (1 clock = 25ns);i#eta", FED),
+                                      78,
+                                      -7,
+                                      7,
+                                      4,
+                                      1,
+                                      86);
   FEDsAndTimingVsModuleHists_[FED] = timingHistVsModule;
   FEDsAndTimingVsModuleHists_[FED]->SetDirectory(nullptr);
 
-  TH2F* dccRuntypeVsBxFED = new TH2F(Form("DCCRuntypeVsBxFED_%d",FED),Form("DCC Runtype vs. BX FED %d",FED),3600,0,3600,24,0,24);
+  TH2F* dccRuntypeVsBxFED =
+      new TH2F(Form("DCCRuntypeVsBxFED_%d", FED), Form("DCC Runtype vs. BX FED %d", FED), 3600, 0, 3600, 24, 0, 24);
   FEDsAndDCCRuntypeVsBxHists_[FED] = dccRuntypeVsBxFED;
-  FEDsAndDCCRuntypeVsBxHists_[FED]->SetDirectory(nullptr); 
-  
+  FEDsAndDCCRuntypeVsBxHists_[FED]->SetDirectory(nullptr);
 }
 
 // ------------ method called once each job just before starting event loop  ------------
-void 
-EcalCosmicsHists::beginRun(edm::Run const &, edm::EventSetup const & eventSetup)
-{
-  edm::ESHandle< EcalElectronicsMapping > handle;
-  eventSetup.get< EcalMappingRcd >().get(handle);
+void EcalCosmicsHists::beginRun(edm::Run const&, edm::EventSetup const& eventSetup) {
+  edm::ESHandle<EcalElectronicsMapping> handle;
+  eventSetup.get<EcalMappingRcd>().get(handle);
   ecalElectronicsMap_ = handle.product();
-  
+
   //Here I will init some of the specific histograms
-  int numBins = 200;//(int)round(histRangeMax_-histRangeMin_)+1;
-  
+  int numBins = 200;  //(int)round(histRangeMax_-histRangeMin_)+1;
+
   //=============Special Bins for TT and Modules borders=============================
-  double ttEtaBins[36] = {-85, -80, -75, -70, -65, -60, -55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0, 1, 6, 11, 16, 21, 26, 31, 36, 41, 46, 51, 56, 61, 66, 71, 76, 81, 86 };
-  double modEtaBins[10]={-85, -65, -45, -25, 0, 1, 26, 46, 66, 86};
+  double ttEtaBins[36] = {-85, -80, -75, -70, -65, -60, -55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0,
+                          1,   6,   11,  16,  21,  26,  31,  36,  41,  46,  51,  56,  61,  66,  71,  76,  81, 86};
+  double modEtaBins[10] = {-85, -65, -45, -25, 0, 1, 26, 46, 66, 86};
   double ttPhiBins[73];
   double modPhiBins[19];
   double timingBins[79];
   double highEBins[11];
-  for (int i = 0; i < 79; ++i)
-    {
-      timingBins[i]=-7.+double(i)*14./78.;
-      if (i<73) 
-	{
-          ttPhiBins[i]=1+5*i;
-          if ( i < 19) 
-	    {
-              modPhiBins[i]=1+20*i;
-              if (i < 11)
-		{
-		  highEBins[i]=10.+double(i)*20.;
-		}
-	    }
-	}
-      
+  for (int i = 0; i < 79; ++i) {
+    timingBins[i] = -7. + double(i) * 14. / 78.;
+    if (i < 73) {
+      ttPhiBins[i] = 1 + 5 * i;
+      if (i < 19) {
+        modPhiBins[i] = 1 + 20 * i;
+        if (i < 11) {
+          highEBins[i] = 10. + double(i) * 20.;
+        }
+      }
     }
+  }
   //=============END Special Bins for TT and Modules borders===========================
-  
+
   //====================Frequency for Event timing information=========================
-  double timingEndInSeconds = runTimeLength_*3600.;  
-  double timingBinWidth     = timingEndInSeconds/double(numTimingBins_);
+  double timingEndInSeconds = runTimeLength_ * 3600.;
+  double timingBinWidth = timingEndInSeconds / double(numTimingBins_);
   //====================END Frequency for Event timing information=====================
-  
-
-  allFedsenergyHist_           = new TH1F("energy_AllClusters","energy_AllClusters;Cluster Energy (GeV)",numBins,histRangeMin_,histRangeMax_);
-  allFedsenergyHighHist_       = new TH1F("energyHigh_AllClusters","energyHigh_AllClusters;Cluster Energy (GeV)",numBins,histRangeMin_,200.0);
-  allFedsenergyOnlyHighHist_       = new TH1F("energyHigh_HighEnergyClusters","energy of High Energy Clusters;Cluster Energy (GeV)",numBins,histRangeMin_,200.0);
-  allFedsE2Hist_           = new TH1F("E2_AllClusters","E2_AllClusters;Seed+highest neighbor energy (GeV)",numBins,histRangeMin_,histRangeMax_);
-  allFedsE2vsE1Hist_       = new TH2F("E2vsE1_AllClusters","E2vsE1_AllClusters;Seed Energy (GeV);Seed+highest neighbor energy (GeV)",numBins,histRangeMin_,histRangeMax_,numBins,histRangeMin_,histRangeMax_);
-  allFedsenergyvsE1Hist_       = new TH2F("energyvsE1_AllClusters","energyvsE1_AllClusters;Seed Energy (GeV);Energy(GeV)",numBins,histRangeMin_,histRangeMax_,numBins,histRangeMin_,histRangeMax_);
-  allFedsTimingHist_       = new TH1F("timeForAllFeds","timeForAllFeds;Relative Time (1 clock = 25ns)",78,-7,7);
-  allFedsTimingVsFreqHist_ = new TH2F("timeVsFreqAllEvent","time Vs Freq All events;Relative Time (1 clock = 25ns);Event Number",78,-7,7,2000,0.,200000);
-  allFedsTimingVsAmpHist_  = new TH2F("timeVsAmpAllEvents","time Vs Amp All Events;Relative Time (1 clock = 25ns);Amplitude (GeV)",78,-7,7,numBins,histRangeMin_,histRangeMax_);
-  allFedsFrequencyHist_    = new TH1F("FrequencyAllEvent","Frequency for All events;Event Number",2000,0.,200000);
-  
+
+  allFedsenergyHist_ =
+      new TH1F("energy_AllClusters", "energy_AllClusters;Cluster Energy (GeV)", numBins, histRangeMin_, histRangeMax_);
+  allFedsenergyHighHist_ =
+      new TH1F("energyHigh_AllClusters", "energyHigh_AllClusters;Cluster Energy (GeV)", numBins, histRangeMin_, 200.0);
+  allFedsenergyOnlyHighHist_ = new TH1F("energyHigh_HighEnergyClusters",
+                                        "energy of High Energy Clusters;Cluster Energy (GeV)",
+                                        numBins,
+                                        histRangeMin_,
+                                        200.0);
+  allFedsE2Hist_ = new TH1F(
+      "E2_AllClusters", "E2_AllClusters;Seed+highest neighbor energy (GeV)", numBins, histRangeMin_, histRangeMax_);
+  allFedsE2vsE1Hist_ = new TH2F("E2vsE1_AllClusters",
+                                "E2vsE1_AllClusters;Seed Energy (GeV);Seed+highest neighbor energy (GeV)",
+                                numBins,
+                                histRangeMin_,
+                                histRangeMax_,
+                                numBins,
+                                histRangeMin_,
+                                histRangeMax_);
+  allFedsenergyvsE1Hist_ = new TH2F("energyvsE1_AllClusters",
+                                    "energyvsE1_AllClusters;Seed Energy (GeV);Energy(GeV)",
+                                    numBins,
+                                    histRangeMin_,
+                                    histRangeMax_,
+                                    numBins,
+                                    histRangeMin_,
+                                    histRangeMax_);
+  allFedsTimingHist_ = new TH1F("timeForAllFeds", "timeForAllFeds;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  allFedsTimingVsFreqHist_ = new TH2F("timeVsFreqAllEvent",
+                                      "time Vs Freq All events;Relative Time (1 clock = 25ns);Event Number",
+                                      78,
+                                      -7,
+                                      7,
+                                      2000,
+                                      0.,
+                                      200000);
+  allFedsTimingVsAmpHist_ = new TH2F("timeVsAmpAllEvents",
+                                     "time Vs Amp All Events;Relative Time (1 clock = 25ns);Amplitude (GeV)",
+                                     78,
+                                     -7,
+                                     7,
+                                     numBins,
+                                     histRangeMin_,
+                                     histRangeMax_);
+  allFedsFrequencyHist_ = new TH1F("FrequencyAllEvent", "Frequency for All events;Event Number", 2000, 0., 200000);
+
   //--------Special Hists for times stamp info----------------------------------------------
-  allFedsFreqTimeHist_     = new TH1F("FrequencyAllEventsInTime",Form("Time of Cosmic Events; Time (s);Passing Event rate/%5g s",timingBinWidth),numTimingBins_,0.,timingEndInSeconds);
-  allFedsFreqTimeVsPhiHist_= new TH2F("FrequencyAllEventsInTimeVsPhi",Form("Time of Cosmic Events vs iPhi; iPhi;Time (s)/%5g s",timingBinWidth*360.),360,1.,361.,numTimingBins_/360,0.,timingEndInSeconds);
-  allFedsFreqTimeVsPhiTTHist_= new TH2F("FrequencyAllEventsInTimeVsTTPhi",Form("Time of Cosmic Events vs iPhi (TT bins); iPhi;Time (s)/%5g s",timingBinWidth*72.),72,1.,361.,numTimingBins_/72,0.,timingEndInSeconds);
-  allFedsFreqTimeVsEtaHist_= new TH2F("FrequencyAllEventsInTimeVsEta",Form("Time of Cosmic Events vs iEta; Time (s)/%5g s; iEta" ,timingBinWidth*172.),numTimingBins_/172,0.,timingEndInSeconds,172,-86.,86.);
-  allFedsFreqTimeVsEtaTTHist_= new TH2F("FrequencyAllEventsInTimeVsTTEta",Form("Time of Cosmic Events vs Eta (TT bins);Time (s)/%5g s; iEta" ,timingBinWidth*35.),numTimingBins_/35,0.,timingEndInSeconds,35,ttEtaBins);
+  allFedsFreqTimeHist_ = new TH1F("FrequencyAllEventsInTime",
+                                  Form("Time of Cosmic Events; Time (s);Passing Event rate/%5g s", timingBinWidth),
+                                  numTimingBins_,
+                                  0.,
+                                  timingEndInSeconds);
+  allFedsFreqTimeVsPhiHist_ =
+      new TH2F("FrequencyAllEventsInTimeVsPhi",
+               Form("Time of Cosmic Events vs iPhi; iPhi;Time (s)/%5g s", timingBinWidth * 360.),
+               360,
+               1.,
+               361.,
+               numTimingBins_ / 360,
+               0.,
+               timingEndInSeconds);
+  allFedsFreqTimeVsPhiTTHist_ =
+      new TH2F("FrequencyAllEventsInTimeVsTTPhi",
+               Form("Time of Cosmic Events vs iPhi (TT bins); iPhi;Time (s)/%5g s", timingBinWidth * 72.),
+               72,
+               1.,
+               361.,
+               numTimingBins_ / 72,
+               0.,
+               timingEndInSeconds);
+  allFedsFreqTimeVsEtaHist_ =
+      new TH2F("FrequencyAllEventsInTimeVsEta",
+               Form("Time of Cosmic Events vs iEta; Time (s)/%5g s; iEta", timingBinWidth * 172.),
+               numTimingBins_ / 172,
+               0.,
+               timingEndInSeconds,
+               172,
+               -86.,
+               86.);
+  allFedsFreqTimeVsEtaTTHist_ =
+      new TH2F("FrequencyAllEventsInTimeVsTTEta",
+               Form("Time of Cosmic Events vs Eta (TT bins);Time (s)/%5g s; iEta", timingBinWidth * 35.),
+               numTimingBins_ / 35,
+               0.,
+               timingEndInSeconds,
+               35,
+               ttEtaBins);
   //--------END Special Hists for times stamp info------------------------------------------
-  
-  allFedsiPhiProfileHist_  = new TH1F("iPhiProfileAllEvents","iPhi Profile all events;i#phi",360,1.,361.);
-  allFedsiEtaProfileHist_  = new TH1F("iEtaProfileAllEvents","iEta Profile all events;i#eta",172,-86,86);
-  
-  allOccupancy_            = new TH2F("OccupancyAllEvents","Occupancy all events;i#phi;i#eta",360,1.,361.,172,-86,86);  
-  TrueOccupancy_            = new TH2F("TrueOccupancyAllEvents","True Occupancy all events;#phi;#eta",360,-3.14159,3.14159,172,-1.5,1.5);
-  allOccupancyCoarse_      = new TH2F("OccupancyAllEventsCoarse","Occupancy all events Coarse;i#phi;i#eta",360/5,1,361.,35,ttEtaBins);  
-  TrueOccupancyCoarse_      = new TH2F("TrueOccupancyAllEventsCoarse","True Occupancy all events Coarse;#phi;#eta",360/5,-3.14159,3.14159,34,-1.5,1.5);
-  
-  
+
+  allFedsiPhiProfileHist_ = new TH1F("iPhiProfileAllEvents", "iPhi Profile all events;i#phi", 360, 1., 361.);
+  allFedsiEtaProfileHist_ = new TH1F("iEtaProfileAllEvents", "iEta Profile all events;i#eta", 172, -86, 86);
+
+  allOccupancy_ = new TH2F("OccupancyAllEvents", "Occupancy all events;i#phi;i#eta", 360, 1., 361., 172, -86, 86);
+  TrueOccupancy_ =
+      new TH2F("TrueOccupancyAllEvents", "True Occupancy all events;#phi;#eta", 360, -3.14159, 3.14159, 172, -1.5, 1.5);
+  allOccupancyCoarse_ =
+      new TH2F("OccupancyAllEventsCoarse", "Occupancy all events Coarse;i#phi;i#eta", 360 / 5, 1, 361., 35, ttEtaBins);
+  TrueOccupancyCoarse_ = new TH2F("TrueOccupancyAllEventsCoarse",
+                                  "True Occupancy all events Coarse;#phi;#eta",
+                                  360 / 5,
+                                  -3.14159,
+                                  3.14159,
+                                  34,
+                                  -1.5,
+                                  1.5);
+
   // single xtal cluster occupancy
-  allOccupancySingleXtal_  = new TH2F("OccupancySingleXtal","Occupancy single xtal clusters;i#phi;i#eta",360,1.,361.,172,-86,86);
-  energySingleXtalHist_    = new TH1F("energy_SingleXtalClusters","Energy single xtal clusters;Cluster Energy (GeV)",numBins,histRangeMin_,200.0);
-  
-  allFedsTimingPhiHist_          = new TH2F("timePhiAllFEDs","time vs Phi for all FEDs (TT binning);i#phi;Relative Time (1 clock = 25ns)",72,1,361,78,-7,7);
-  allFedsTimingPhiEbpHist_       = new TH2F("timePhiEBP","time vs Phi for FEDs in EB+ (TT binning) ;i#phi;Relative Time (1 clock = 25ns)",72,1,361,78,-7,7);
-  allFedsTimingPhiEbmHist_       = new TH2F("timePhiEBM","time vs Phi for FEDs in EB- (TT binning);i#phi;Relative Time (1 clock = 25ns)",72,1,361,78,-7,7);
-  allFedsTimingPhiEtaHist_       = new TH3F("timePhiEtaAllFEDs","(Phi,Eta,time) for all FEDs (SM,M binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",18,modPhiBins,9,modEtaBins,78,timingBins);  
-  allFedsTimingTTHist_           = new TH3F("timeTTAllFEDs","(Phi,Eta,time) for all FEDs (SM,TT binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",72,ttPhiBins,35,ttEtaBins,78,timingBins); 
-  allFedsTimingLMHist_           = new TH2F("timeLMAllFEDs","(LM,time) for all FEDs (SM,LM binning);LM;Relative Time (1 clock = 25ns)",92, 1, 92,78,-7,7);
-  
-  allFedsTimingEbpHist_       = new TH1F("timeEBP","time for FEDs in EB+;Relative Time (1 clock = 25ns)",78,-7,7);
-  allFedsTimingEbmHist_       = new TH1F("timeEBM","time for FEDs in EB-;Relative Time (1 clock = 25ns)",78,-7,7);
-  allFedsTimingEbpTopHist_    = new TH1F("timeEBPTop","time for FEDs in EB+ Top;Relative Time (1 clock = 25ns)",78,-7,7);
-  allFedsTimingEbmTopHist_    = new TH1F("timeEBMTop","time for FEDs in EB- Top;Relative Time (1 clock = 25ns)",78,-7,7);
-  allFedsTimingEbpBottomHist_ = new TH1F("timeEBPBottom","time for FEDs in EB+ Bottom;Relative Time (1 clock = 25ns)",78,-7,7);
-  allFedsTimingEbmBottomHist_ = new TH1F("timeEBMBottom","time for FEDs in EB- Bottom;Relative Time (1 clock = 25ns)",78,-7,7);
-  
-  numberofCosmicsHist_ = new TH1F("numberofCosmicsPerEvent","Number of cosmics per event;Number of Cosmics",30,0,30);
-  numberofCosmicsHistEB_ = new TH1F("numberofCosmicsPerEvent_EB","Number of cosmics per event EB;Number of Cosmics",30,0,30);
-
-  numberofCosmicsWTrackHist_ = new TH1F("numberofCosmicsWTrackPerEvent","Number of cosmics with track per event",30,0,30);
-  numberofCosmicsTopBottomHist_ = new TH1F("numberofCosmicsTopBottomPerEvent","Number of top bottom cosmics per event;Number of Cosmics",30,0,30);
-  numberofGoodEvtFreq_  = new TH1F("frequencyOfGoodEvents","Number of events with cosmic vs Event;Event Number;Number of Good Events/100 Events",2000,0,200000);
-  
-  numberofCrossedEcalIdsHist_ = new TH1F("numberofCrossedEcalCosmicsPerEvent","Number of crossed ECAL cosmics per event;Number of Crossed Cosmics",10,0,10);
-  
-  allOccupancyExclusiveECAL_            = new TH2F("OccupancyAllEvents_ExclusiveECAL","Occupancy all events Exclusive ECAL ;i#phi;i#eta",360,1.,361.,172,-86,86);
-  allOccupancyCoarseExclusiveECAL_      = new TH2F("OccupancyAllEventsCoarse_ExclusiveECAL","Occupancy all events Coarse Exclusive ECAL;i#phi;i#eta",360/5,ttPhiBins,35, ttEtaBins);
-  allOccupancyECAL_            = new TH2F("OccupancyAllEvents_ECAL","Occupancy all events ECAL;i#phi;i#eta",360,1.,361.,172,-86,86);
-  allOccupancyCoarseECAL_      = new TH2F("OccupancyAllEventsCoarse_ECAL","Occupancy all events Coarse ECAL;i#phi;i#eta",360/5,ttPhiBins,35, ttEtaBins);
-  allFedsTimingHistECAL_       = new TH1F("timeForAllFeds_ECAL","timeForAllFeds ECAL;Relative Time (1 clock = 25ns)",78,-7,7);
-  allFedsTimingPhiEtaHistECAL_ = new TH3F("timePhiEtaAllFEDs_ECAL","ECAL (Phi,Eta,time) for all FEDs (SM,M binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",18,modPhiBins,9, modEtaBins,78,timingBins); 
-  allFedsTimingTTHistECAL_     = new TH3F("timeTTAllFEDs_ECAL","ECAL (Phi,Eta,time) for all FEDs (SM,TT binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",72,ttPhiBins,35,ttEtaBins,78,timingBins); 
-  allFedsTimingLMHistECAL_     = new TH2F("timeLMAllFEDs_ECAL","ECAL (LM,time) for all FEDs (SM,LM binning);LM;Relative Time (1 clock = 25ns)",92, 1, 92,78,-7,7); 
-  
-  allOccupancyExclusiveDT_            = new TH2F("OccupancyAllEvents_ExclusiveDT","Occupancy all events Exclusive DT;i#phi;i#eta",360,1.,361.,172,-86,86);
-  allOccupancyCoarseExclusiveDT_      = new TH2F("OccupancyAllEventsCoarse_ExclusiveDT","Occupancy all events Coarse Exclusive DT;i#phi;i#eta",360/5,1,361.,35,ttEtaBins);
-  allOccupancyDT_            = new TH2F("OccupancyAllEvents_DT","Occupancy all events DT;i#phi;i#eta",360,1.,361.,172,-86,86);
-  allOccupancyCoarseDT_      = new TH2F("OccupancyAllEventsCoarse_DT","Occupancy all events Coarse DT;i#phi;i#eta",360/5,1,361.,35,ttEtaBins);
-  allFedsTimingHistDT_       = new TH1F("timeForAllFeds_DT","timeForAllFeds DT;Relative Time (1 clock = 25ns)",78,-7,7);
-  allFedsTimingPhiEtaHistDT_ = new TH3F("timePhiEtaAllFEDs_DT","DT (Phi,Eta,time) for all FEDs (SM,M binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",18,modPhiBins,9, modEtaBins,78,timingBins);  
-  allFedsTimingTTHistDT_   = new TH3F("timeTTAllFEDs_DT","DT (Phi,Eta,time) for all FEDs (SM,TT binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",72,ttPhiBins,35,ttEtaBins,78,timingBins); 
-  allFedsTimingLMHistDT_   = new TH2F("timeLMAllFEDs_DT","DT (LM,time) for all FEDs (SM,LM binning);LM;Relative Time (1 clock = 25ns)",92, 1, 92,78,-7,7); 
-  
-  allOccupancyExclusiveRPC_            = new TH2F("OccupancyAllEvents_ExclusiveRPC","Occupancy all events Exclusive RPC;i#phi;i#eta",360,1.,361.,172,-86,86);
-  allOccupancyCoarseExclusiveRPC_      = new TH2F("OccupancyAllEventsCoarse_ExclusiveRPC","Occupancy all events Coarse Exclusive RPC;i#phi;i#eta",360/5,1,361.,35, ttEtaBins);
-  allOccupancyRPC_            = new TH2F("OccupancyAllEvents_RPC","Occupancy all events RPC;i#phi;i#eta",360,1.,361.,172,-86,86);
-  allOccupancyCoarseRPC_      = new TH2F("OccupancyAllEventsCoarse_RPC","Occupancy all events Coarse RPC;i#phi;i#eta",360/5,1,361.,35, ttEtaBins);
-  allFedsTimingHistRPC_       = new TH1F("timeForAllFeds_RPC","timeForAllFeds RPC;Relative Time (1 clock = 25ns)",78,-7,7);
-  allFedsTimingPhiEtaHistRPC_ = new TH3F("timePhiEtaAllFEDs_RPC","RPC (Phi,Eta,time) for all FEDs (SM,M binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",18,modPhiBins,9, modEtaBins,78,timingBins);  
-  allFedsTimingTTHistRPC_     = new TH3F("timeTTAllFEDs_RPC","RPC (Phi,Eta,time) for all FEDs (SM,TT binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",72,ttPhiBins,35,ttEtaBins,78,timingBins); 
-  allFedsTimingLMHistRPC_     = new TH2F("timeLMAllFEDs_RPC","RPC (LM,time) for all FEDs (SM,LM binning);LM;Relative Time (1 clock = 25ns)",92, 1, 92,78,-7,7); 
-  
-  allOccupancyExclusiveCSC_            = new TH2F("OccupancyAllEvents_ExclusiveCSC","Occupancy all events Exclusive CSC;i#phi;i#eta",360,1.,361.,172,-86,86);
-  allOccupancyCoarseExclusiveCSC_      = new TH2F("OccupancyAllEventsCoarse_ExclusiveCSC","Occupancy all events Coarse Exclusive CSC;i#phi;i#eta",360/5,1,361.,35, ttEtaBins);
-  allOccupancyCSC_            = new TH2F("OccupancyAllEvents_CSC","Occupancy all events CSC;i#phi;i#eta",360,1.,361.,172,-86,86);
-  allOccupancyCoarseCSC_      = new TH2F("OccupancyAllEventsCoarse_CSC","Occupancy all events Coarse CSC;i#phi;i#eta",360/5,1,361.,35, ttEtaBins);
-  allFedsTimingHistCSC_       = new TH1F("timeForAllFeds_CSC","timeForAllFeds CSC;Relative Time (1 clock = 25ns)",78,-7,7);
-  allFedsTimingPhiEtaHistCSC_ = new TH3F("timePhiEtaAllFEDs_CSC","CSC (Phi,Eta,time) for all FEDs (SM,M binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",18,modPhiBins,9, modEtaBins,78,timingBins);  
-  allFedsTimingTTHistCSC_    = new TH3F("timeTTAllFEDs_CSC","CSC (Phi,Eta,time) for all FEDs (SM,TT binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",72,ttPhiBins,35,ttEtaBins,78,timingBins); 
-  allFedsTimingLMHistCSC_    = new TH2F("timeLMAllFEDs_CSC","CSC (LM,time) for all FEDs (SM,LM binning);LM;Relative Time (1 clock = 25ns)",92, 1, 62,78,-7,7); 
-  
-  allOccupancyExclusiveHCAL_            = new TH2F("OccupancyAllEvents_ExclusiveHCAL","Occupancy all events Exclusive HCAL;i#phi;i#eta",360,1.,361.,172,-86,86);
-  allOccupancyCoarseExclusiveHCAL_      = new TH2F("OccupancyAllEventsCoarse_ExclusiveHCAL","Occupancy all events Coarse Exclusive HCAL;i#phi;i#eta",360/5,1,361.,35, ttEtaBins);
-  allOccupancyHCAL_            = new TH2F("OccupancyAllEvents_HCAL","Occupancy all events HCAL;i#phi;i#eta",360,1.,361.,172,-86,86);
-  allOccupancyCoarseHCAL_      = new TH2F("OccupancyAllEventsCoarse_HCAL","Occupancy all events Coarse HCAL;i#phi;i#eta",360/5,1,361.,35, ttEtaBins);
-  allFedsTimingHistHCAL_       = new TH1F("timeForAllFeds_HCAL","timeForAllFeds HCAL;Relative Time (1 clock = 25ns)",78,-7,7);
-  allFedsTimingPhiEtaHistHCAL_ = new TH3F("timePhiEtaAllFEDs_HCAL","HCAL (Phi,Eta,time) for all FEDs (SM,M binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",18,modPhiBins,9, modEtaBins,78,timingBins);  
-  allFedsTimingTTHistHCAL_     = new TH3F("timeTTAllFEDs_HCAL","HCAL (Phi,Eta,time) for all FEDs (SM,TT binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",72,ttPhiBins,35,ttEtaBins,78,timingBins); 
-  allFedsTimingLMHistHCAL_     = new TH2F("timeLMAllFEDs_HCAL","HCAL (LM,time) for all FEDs (SM,LM binning);LM;Relative Time (1 clock = 25ns)",92, 1, 92,78,-7,7); 
-  
-  TrueBCOccupancy_            = new TH2F("BCTrueOccupancyAllEvents","True SB Occupancy all events;#phi;#eta",360,-3.14159,3.14159,172,-1.5,1.5);
-  TrueBCOccupancyCoarse_      = new TH2F("BCTrueOccupancyAllEventsCoarse","True BC Occupancy all events Coarse;#phi;#eta",360/5,-3.14159,3.14159,34,-1.5 ,1.5);
-  
-  numberofBCinSC_ = new TH1F("numberofBCinSC","Number of Basic Clusters in Super Cluster;Num Basic Clusters",20,0,20);//SC
-  numberofBCinSCphi_ = new TH2F("numberofBCinSCphi","Number of Basic Clusters in Super Cluster;phi;Num Basic Clusters",360/5,-3.14159,3.14159,20,0,20);//SC
-  
-  allFedsTimingHistEcalMuon_   = new TH1F("timeForAllFeds_EcalMuon","timeForAllFeds Ecal+Muon;Relative Time (1 clock = 25ns)",78,-7,7);
-  
-  triggerHist_ = new TH1F("triggerHist","Trigger Number",5,0,5);
-  triggerHist_->GetXaxis()->SetBinLabel(1,"ECAL");
-  triggerHist_->GetXaxis()->SetBinLabel(2,"HCAL");
-  triggerHist_->GetXaxis()->SetBinLabel(3,"DT");
-  triggerHist_->GetXaxis()->SetBinLabel(4,"RPC");
-  triggerHist_->GetXaxis()->SetBinLabel(5,"CSC");
-  
-  triggerExclusiveHist_ = new TH1F("triggerExclusiveHist","Trigger Number (Mutually Exclusive)",5,0,5);  triggerExclusiveHist_->GetXaxis()->SetBinLabel(1,"ECAL");
-  triggerExclusiveHist_->GetXaxis()->SetBinLabel(2,"HCAL");
-  triggerExclusiveHist_->GetXaxis()->SetBinLabel(3,"DT");
-  triggerExclusiveHist_->GetXaxis()->SetBinLabel(4,"RPC");
-  triggerExclusiveHist_->GetXaxis()->SetBinLabel(5,"CSC");
-  
-  runNumberHist_ = new TH1F("runNumberHist","Run Number",1,0,1);
-  
-  deltaRHist_ = new TH1F("deltaRHist","deltaR",500,-0.5,499.5); 
-  deltaEtaHist_ = new TH1F("deltaIEtaHist","deltaIEta",170,-85.5,84.5);
-  deltaPhiHist_ = new TH1F("deltaIPhiHist","deltaIPhi",720,-360.5,359.5);
-  ratioAssocTracksHist_ = new TH1F("ratioAssocTracks","num assoc. tracks/tracks through Ecal",11,0,1.1);
-  ratioAssocClustersHist_ = new TH1F("ratioAssocClusters","num assoc. clusters/total clusters",11,0,1.1);
-  trackAssoc_muonsEcal_= new TH2F("trackAssoc_muonsEcal","Map of muon hits in Ecal", 360,1.,361.,172,-86,86);//360, 0 , 360, 170,-85 ,85);
-  deltaEtaDeltaPhiHist_ = new TH2F("deltaEtaDeltaPhi","Delta ieta vs. delta iphi",170,-85.5,84.5,720,-360.5,359.5); 
-  seedTrackEtaHist_ = new TH2F("seedTrackEta","track ieta vs. seed ieta",170,-85.5,84.5,170,-85.5,84.5); 
-  seedTrackPhiHist_ = new TH2F("seedTrackPhi","track iphi vs. seed iphi",720,-360.5,359.5,720,-360.5,359.5); 
-
-  dccEventVsBxHist_ = new TH2F("dccEventVsBx","DCC Runtype vs. bunch crossing",3600,0,3600,24,0,24);
-  dccBXErrorByFEDHist_ = new TH1F("dccBXErrorByFED","Incorrect BX number by FED",54,601,655);
-  dccOrbitErrorByFEDHist_ = new TH1F("dccOrbitErrorByFED","Incorrect orbit number by FED",54,601,655);
-  dccRuntypeErrorByFEDHist_ = new TH1F("dccRuntypeErrorByFED","Incorrect DCC Runtype by FED",54,601,655);
-  dccRuntypeHist_ = new TH1F("dccRuntype","DCC Runtype frequency",24,0,24);
-  dccErrorVsBxHist_ = new TH2F("dccErrorVsBX","DCC Errors vs. BX",3600,0,3600,3,0,3);
-  
-  hcalEnergy_HBHE_ = new TH1F("hcalEnergy_HBHE","RecHit Energy HBHE",440,-10,100);
-  hcalEnergy_HF_   = new TH1F("hcalEnergy_HF","RecHit Energy HF",440,-10,100);
-  hcalEnergy_HO_   = new TH1F("hcalEnergy_HO","RecHit Energy HO",440,-10,100);
-  hcalHEHBecalEB_  = new TH2F("hcalHEHBecalEB","HCAL HBHE RecHit energy vs ECAL EB energy",numBins,histRangeMin_,300.0,40,-5,5);
-  
-  NumXtalsInClusterHist_              = new TH1F("NumXtalsInClusterAllHist","Number of Xtals in Cluster;NumXtals",150,0,150);
-  numxtalsVsEnergy_                   = new TH2F("NumXtalsVsEnergy","Number of Xtals in Cluster vs Energy;Energy (GeV);Number of Xtals in Cluster",numBins,histRangeMin_,histRangeMax_, 150,0,150);
-  numxtalsVsHighEnergy_               = new TH2F("NumXtalsVsHighEnergy","Number of Xtals in Cluster vs Energy;Energy (GeV);Number of Xtals in Cluster",numBins,histRangeMin_,200., 150,0,150);
-  
+  allOccupancySingleXtal_ =
+      new TH2F("OccupancySingleXtal", "Occupancy single xtal clusters;i#phi;i#eta", 360, 1., 361., 172, -86, 86);
+  energySingleXtalHist_ = new TH1F(
+      "energy_SingleXtalClusters", "Energy single xtal clusters;Cluster Energy (GeV)", numBins, histRangeMin_, 200.0);
+
+  allFedsTimingPhiHist_ = new TH2F("timePhiAllFEDs",
+                                   "time vs Phi for all FEDs (TT binning);i#phi;Relative Time (1 clock = 25ns)",
+                                   72,
+                                   1,
+                                   361,
+                                   78,
+                                   -7,
+                                   7);
+  allFedsTimingPhiEbpHist_ = new TH2F("timePhiEBP",
+                                      "time vs Phi for FEDs in EB+ (TT binning) ;i#phi;Relative Time (1 clock = 25ns)",
+                                      72,
+                                      1,
+                                      361,
+                                      78,
+                                      -7,
+                                      7);
+  allFedsTimingPhiEbmHist_ = new TH2F("timePhiEBM",
+                                      "time vs Phi for FEDs in EB- (TT binning);i#phi;Relative Time (1 clock = 25ns)",
+                                      72,
+                                      1,
+                                      361,
+                                      78,
+                                      -7,
+                                      7);
+  allFedsTimingPhiEtaHist_ =
+      new TH3F("timePhiEtaAllFEDs",
+               "(Phi,Eta,time) for all FEDs (SM,M binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",
+               18,
+               modPhiBins,
+               9,
+               modEtaBins,
+               78,
+               timingBins);
+  allFedsTimingTTHist_ =
+      new TH3F("timeTTAllFEDs",
+               "(Phi,Eta,time) for all FEDs (SM,TT binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",
+               72,
+               ttPhiBins,
+               35,
+               ttEtaBins,
+               78,
+               timingBins);
+  allFedsTimingLMHist_ = new TH2F(
+      "timeLMAllFEDs", "(LM,time) for all FEDs (SM,LM binning);LM;Relative Time (1 clock = 25ns)", 92, 1, 92, 78, -7, 7);
+
+  allFedsTimingEbpHist_ = new TH1F("timeEBP", "time for FEDs in EB+;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  allFedsTimingEbmHist_ = new TH1F("timeEBM", "time for FEDs in EB-;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  allFedsTimingEbpTopHist_ =
+      new TH1F("timeEBPTop", "time for FEDs in EB+ Top;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  allFedsTimingEbmTopHist_ =
+      new TH1F("timeEBMTop", "time for FEDs in EB- Top;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  allFedsTimingEbpBottomHist_ =
+      new TH1F("timeEBPBottom", "time for FEDs in EB+ Bottom;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  allFedsTimingEbmBottomHist_ =
+      new TH1F("timeEBMBottom", "time for FEDs in EB- Bottom;Relative Time (1 clock = 25ns)", 78, -7, 7);
+
+  numberofCosmicsHist_ =
+      new TH1F("numberofCosmicsPerEvent", "Number of cosmics per event;Number of Cosmics", 30, 0, 30);
+  numberofCosmicsHistEB_ =
+      new TH1F("numberofCosmicsPerEvent_EB", "Number of cosmics per event EB;Number of Cosmics", 30, 0, 30);
+
+  numberofCosmicsWTrackHist_ =
+      new TH1F("numberofCosmicsWTrackPerEvent", "Number of cosmics with track per event", 30, 0, 30);
+  numberofCosmicsTopBottomHist_ = new TH1F(
+      "numberofCosmicsTopBottomPerEvent", "Number of top bottom cosmics per event;Number of Cosmics", 30, 0, 30);
+  numberofGoodEvtFreq_ = new TH1F("frequencyOfGoodEvents",
+                                  "Number of events with cosmic vs Event;Event Number;Number of Good Events/100 Events",
+                                  2000,
+                                  0,
+                                  200000);
+
+  numberofCrossedEcalIdsHist_ = new TH1F("numberofCrossedEcalCosmicsPerEvent",
+                                         "Number of crossed ECAL cosmics per event;Number of Crossed Cosmics",
+                                         10,
+                                         0,
+                                         10);
+
+  allOccupancyExclusiveECAL_ = new TH2F("OccupancyAllEvents_ExclusiveECAL",
+                                        "Occupancy all events Exclusive ECAL ;i#phi;i#eta",
+                                        360,
+                                        1.,
+                                        361.,
+                                        172,
+                                        -86,
+                                        86);
+  allOccupancyCoarseExclusiveECAL_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveECAL",
+                                              "Occupancy all events Coarse Exclusive ECAL;i#phi;i#eta",
+                                              360 / 5,
+                                              ttPhiBins,
+                                              35,
+                                              ttEtaBins);
+  allOccupancyECAL_ =
+      new TH2F("OccupancyAllEvents_ECAL", "Occupancy all events ECAL;i#phi;i#eta", 360, 1., 361., 172, -86, 86);
+  allOccupancyCoarseECAL_ = new TH2F("OccupancyAllEventsCoarse_ECAL",
+                                     "Occupancy all events Coarse ECAL;i#phi;i#eta",
+                                     360 / 5,
+                                     ttPhiBins,
+                                     35,
+                                     ttEtaBins);
+  allFedsTimingHistECAL_ =
+      new TH1F("timeForAllFeds_ECAL", "timeForAllFeds ECAL;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  allFedsTimingPhiEtaHistECAL_ =
+      new TH3F("timePhiEtaAllFEDs_ECAL",
+               "ECAL (Phi,Eta,time) for all FEDs (SM,M binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",
+               18,
+               modPhiBins,
+               9,
+               modEtaBins,
+               78,
+               timingBins);
+  allFedsTimingTTHistECAL_ =
+      new TH3F("timeTTAllFEDs_ECAL",
+               "ECAL (Phi,Eta,time) for all FEDs (SM,TT binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",
+               72,
+               ttPhiBins,
+               35,
+               ttEtaBins,
+               78,
+               timingBins);
+  allFedsTimingLMHistECAL_ = new TH2F("timeLMAllFEDs_ECAL",
+                                      "ECAL (LM,time) for all FEDs (SM,LM binning);LM;Relative Time (1 clock = 25ns)",
+                                      92,
+                                      1,
+                                      92,
+                                      78,
+                                      -7,
+                                      7);
+
+  allOccupancyExclusiveDT_ = new TH2F(
+      "OccupancyAllEvents_ExclusiveDT", "Occupancy all events Exclusive DT;i#phi;i#eta", 360, 1., 361., 172, -86, 86);
+  allOccupancyCoarseExclusiveDT_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveDT",
+                                            "Occupancy all events Coarse Exclusive DT;i#phi;i#eta",
+                                            360 / 5,
+                                            1,
+                                            361.,
+                                            35,
+                                            ttEtaBins);
+  allOccupancyDT_ =
+      new TH2F("OccupancyAllEvents_DT", "Occupancy all events DT;i#phi;i#eta", 360, 1., 361., 172, -86, 86);
+  allOccupancyCoarseDT_ = new TH2F(
+      "OccupancyAllEventsCoarse_DT", "Occupancy all events Coarse DT;i#phi;i#eta", 360 / 5, 1, 361., 35, ttEtaBins);
+  allFedsTimingHistDT_ = new TH1F("timeForAllFeds_DT", "timeForAllFeds DT;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  allFedsTimingPhiEtaHistDT_ =
+      new TH3F("timePhiEtaAllFEDs_DT",
+               "DT (Phi,Eta,time) for all FEDs (SM,M binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",
+               18,
+               modPhiBins,
+               9,
+               modEtaBins,
+               78,
+               timingBins);
+  allFedsTimingTTHistDT_ =
+      new TH3F("timeTTAllFEDs_DT",
+               "DT (Phi,Eta,time) for all FEDs (SM,TT binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",
+               72,
+               ttPhiBins,
+               35,
+               ttEtaBins,
+               78,
+               timingBins);
+  allFedsTimingLMHistDT_ = new TH2F("timeLMAllFEDs_DT",
+                                    "DT (LM,time) for all FEDs (SM,LM binning);LM;Relative Time (1 clock = 25ns)",
+                                    92,
+                                    1,
+                                    92,
+                                    78,
+                                    -7,
+                                    7);
+
+  allOccupancyExclusiveRPC_ = new TH2F(
+      "OccupancyAllEvents_ExclusiveRPC", "Occupancy all events Exclusive RPC;i#phi;i#eta", 360, 1., 361., 172, -86, 86);
+  allOccupancyCoarseExclusiveRPC_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveRPC",
+                                             "Occupancy all events Coarse Exclusive RPC;i#phi;i#eta",
+                                             360 / 5,
+                                             1,
+                                             361.,
+                                             35,
+                                             ttEtaBins);
+  allOccupancyRPC_ =
+      new TH2F("OccupancyAllEvents_RPC", "Occupancy all events RPC;i#phi;i#eta", 360, 1., 361., 172, -86, 86);
+  allOccupancyCoarseRPC_ = new TH2F(
+      "OccupancyAllEventsCoarse_RPC", "Occupancy all events Coarse RPC;i#phi;i#eta", 360 / 5, 1, 361., 35, ttEtaBins);
+  allFedsTimingHistRPC_ =
+      new TH1F("timeForAllFeds_RPC", "timeForAllFeds RPC;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  allFedsTimingPhiEtaHistRPC_ =
+      new TH3F("timePhiEtaAllFEDs_RPC",
+               "RPC (Phi,Eta,time) for all FEDs (SM,M binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",
+               18,
+               modPhiBins,
+               9,
+               modEtaBins,
+               78,
+               timingBins);
+  allFedsTimingTTHistRPC_ =
+      new TH3F("timeTTAllFEDs_RPC",
+               "RPC (Phi,Eta,time) for all FEDs (SM,TT binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",
+               72,
+               ttPhiBins,
+               35,
+               ttEtaBins,
+               78,
+               timingBins);
+  allFedsTimingLMHistRPC_ = new TH2F("timeLMAllFEDs_RPC",
+                                     "RPC (LM,time) for all FEDs (SM,LM binning);LM;Relative Time (1 clock = 25ns)",
+                                     92,
+                                     1,
+                                     92,
+                                     78,
+                                     -7,
+                                     7);
+
+  allOccupancyExclusiveCSC_ = new TH2F(
+      "OccupancyAllEvents_ExclusiveCSC", "Occupancy all events Exclusive CSC;i#phi;i#eta", 360, 1., 361., 172, -86, 86);
+  allOccupancyCoarseExclusiveCSC_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveCSC",
+                                             "Occupancy all events Coarse Exclusive CSC;i#phi;i#eta",
+                                             360 / 5,
+                                             1,
+                                             361.,
+                                             35,
+                                             ttEtaBins);
+  allOccupancyCSC_ =
+      new TH2F("OccupancyAllEvents_CSC", "Occupancy all events CSC;i#phi;i#eta", 360, 1., 361., 172, -86, 86);
+  allOccupancyCoarseCSC_ = new TH2F(
+      "OccupancyAllEventsCoarse_CSC", "Occupancy all events Coarse CSC;i#phi;i#eta", 360 / 5, 1, 361., 35, ttEtaBins);
+  allFedsTimingHistCSC_ =
+      new TH1F("timeForAllFeds_CSC", "timeForAllFeds CSC;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  allFedsTimingPhiEtaHistCSC_ =
+      new TH3F("timePhiEtaAllFEDs_CSC",
+               "CSC (Phi,Eta,time) for all FEDs (SM,M binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",
+               18,
+               modPhiBins,
+               9,
+               modEtaBins,
+               78,
+               timingBins);
+  allFedsTimingTTHistCSC_ =
+      new TH3F("timeTTAllFEDs_CSC",
+               "CSC (Phi,Eta,time) for all FEDs (SM,TT binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",
+               72,
+               ttPhiBins,
+               35,
+               ttEtaBins,
+               78,
+               timingBins);
+  allFedsTimingLMHistCSC_ = new TH2F("timeLMAllFEDs_CSC",
+                                     "CSC (LM,time) for all FEDs (SM,LM binning);LM;Relative Time (1 clock = 25ns)",
+                                     92,
+                                     1,
+                                     62,
+                                     78,
+                                     -7,
+                                     7);
+
+  allOccupancyExclusiveHCAL_ = new TH2F("OccupancyAllEvents_ExclusiveHCAL",
+                                        "Occupancy all events Exclusive HCAL;i#phi;i#eta",
+                                        360,
+                                        1.,
+                                        361.,
+                                        172,
+                                        -86,
+                                        86);
+  allOccupancyCoarseExclusiveHCAL_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveHCAL",
+                                              "Occupancy all events Coarse Exclusive HCAL;i#phi;i#eta",
+                                              360 / 5,
+                                              1,
+                                              361.,
+                                              35,
+                                              ttEtaBins);
+  allOccupancyHCAL_ =
+      new TH2F("OccupancyAllEvents_HCAL", "Occupancy all events HCAL;i#phi;i#eta", 360, 1., 361., 172, -86, 86);
+  allOccupancyCoarseHCAL_ = new TH2F(
+      "OccupancyAllEventsCoarse_HCAL", "Occupancy all events Coarse HCAL;i#phi;i#eta", 360 / 5, 1, 361., 35, ttEtaBins);
+  allFedsTimingHistHCAL_ =
+      new TH1F("timeForAllFeds_HCAL", "timeForAllFeds HCAL;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  allFedsTimingPhiEtaHistHCAL_ =
+      new TH3F("timePhiEtaAllFEDs_HCAL",
+               "HCAL (Phi,Eta,time) for all FEDs (SM,M binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",
+               18,
+               modPhiBins,
+               9,
+               modEtaBins,
+               78,
+               timingBins);
+  allFedsTimingTTHistHCAL_ =
+      new TH3F("timeTTAllFEDs_HCAL",
+               "HCAL (Phi,Eta,time) for all FEDs (SM,TT binning);i#phi;i#eta;Relative Time (1 clock = 25ns)",
+               72,
+               ttPhiBins,
+               35,
+               ttEtaBins,
+               78,
+               timingBins);
+  allFedsTimingLMHistHCAL_ = new TH2F("timeLMAllFEDs_HCAL",
+                                      "HCAL (LM,time) for all FEDs (SM,LM binning);LM;Relative Time (1 clock = 25ns)",
+                                      92,
+                                      1,
+                                      92,
+                                      78,
+                                      -7,
+                                      7);
+
+  TrueBCOccupancy_ = new TH2F(
+      "BCTrueOccupancyAllEvents", "True SB Occupancy all events;#phi;#eta", 360, -3.14159, 3.14159, 172, -1.5, 1.5);
+  TrueBCOccupancyCoarse_ = new TH2F("BCTrueOccupancyAllEventsCoarse",
+                                    "True BC Occupancy all events Coarse;#phi;#eta",
+                                    360 / 5,
+                                    -3.14159,
+                                    3.14159,
+                                    34,
+                                    -1.5,
+                                    1.5);
+
+  numberofBCinSC_ =
+      new TH1F("numberofBCinSC", "Number of Basic Clusters in Super Cluster;Num Basic Clusters", 20, 0, 20);  //SC
+  numberofBCinSCphi_ = new TH2F("numberofBCinSCphi",
+                                "Number of Basic Clusters in Super Cluster;phi;Num Basic Clusters",
+                                360 / 5,
+                                -3.14159,
+                                3.14159,
+                                20,
+                                0,
+                                20);  //SC
+
+  allFedsTimingHistEcalMuon_ =
+      new TH1F("timeForAllFeds_EcalMuon", "timeForAllFeds Ecal+Muon;Relative Time (1 clock = 25ns)", 78, -7, 7);
+
+  triggerHist_ = new TH1F("triggerHist", "Trigger Number", 5, 0, 5);
+  triggerHist_->GetXaxis()->SetBinLabel(1, "ECAL");
+  triggerHist_->GetXaxis()->SetBinLabel(2, "HCAL");
+  triggerHist_->GetXaxis()->SetBinLabel(3, "DT");
+  triggerHist_->GetXaxis()->SetBinLabel(4, "RPC");
+  triggerHist_->GetXaxis()->SetBinLabel(5, "CSC");
+
+  triggerExclusiveHist_ = new TH1F("triggerExclusiveHist", "Trigger Number (Mutually Exclusive)", 5, 0, 5);
+  triggerExclusiveHist_->GetXaxis()->SetBinLabel(1, "ECAL");
+  triggerExclusiveHist_->GetXaxis()->SetBinLabel(2, "HCAL");
+  triggerExclusiveHist_->GetXaxis()->SetBinLabel(3, "DT");
+  triggerExclusiveHist_->GetXaxis()->SetBinLabel(4, "RPC");
+  triggerExclusiveHist_->GetXaxis()->SetBinLabel(5, "CSC");
+
+  runNumberHist_ = new TH1F("runNumberHist", "Run Number", 1, 0, 1);
+
+  deltaRHist_ = new TH1F("deltaRHist", "deltaR", 500, -0.5, 499.5);
+  deltaEtaHist_ = new TH1F("deltaIEtaHist", "deltaIEta", 170, -85.5, 84.5);
+  deltaPhiHist_ = new TH1F("deltaIPhiHist", "deltaIPhi", 720, -360.5, 359.5);
+  ratioAssocTracksHist_ = new TH1F("ratioAssocTracks", "num assoc. tracks/tracks through Ecal", 11, 0, 1.1);
+  ratioAssocClustersHist_ = new TH1F("ratioAssocClusters", "num assoc. clusters/total clusters", 11, 0, 1.1);
+  trackAssoc_muonsEcal_ = new TH2F(
+      "trackAssoc_muonsEcal", "Map of muon hits in Ecal", 360, 1., 361., 172, -86, 86);  //360, 0 , 360, 170,-85 ,85);
+  deltaEtaDeltaPhiHist_ =
+      new TH2F("deltaEtaDeltaPhi", "Delta ieta vs. delta iphi", 170, -85.5, 84.5, 720, -360.5, 359.5);
+  seedTrackEtaHist_ = new TH2F("seedTrackEta", "track ieta vs. seed ieta", 170, -85.5, 84.5, 170, -85.5, 84.5);
+  seedTrackPhiHist_ = new TH2F("seedTrackPhi", "track iphi vs. seed iphi", 720, -360.5, 359.5, 720, -360.5, 359.5);
+
+  dccEventVsBxHist_ = new TH2F("dccEventVsBx", "DCC Runtype vs. bunch crossing", 3600, 0, 3600, 24, 0, 24);
+  dccBXErrorByFEDHist_ = new TH1F("dccBXErrorByFED", "Incorrect BX number by FED", 54, 601, 655);
+  dccOrbitErrorByFEDHist_ = new TH1F("dccOrbitErrorByFED", "Incorrect orbit number by FED", 54, 601, 655);
+  dccRuntypeErrorByFEDHist_ = new TH1F("dccRuntypeErrorByFED", "Incorrect DCC Runtype by FED", 54, 601, 655);
+  dccRuntypeHist_ = new TH1F("dccRuntype", "DCC Runtype frequency", 24, 0, 24);
+  dccErrorVsBxHist_ = new TH2F("dccErrorVsBX", "DCC Errors vs. BX", 3600, 0, 3600, 3, 0, 3);
+
+  hcalEnergy_HBHE_ = new TH1F("hcalEnergy_HBHE", "RecHit Energy HBHE", 440, -10, 100);
+  hcalEnergy_HF_ = new TH1F("hcalEnergy_HF", "RecHit Energy HF", 440, -10, 100);
+  hcalEnergy_HO_ = new TH1F("hcalEnergy_HO", "RecHit Energy HO", 440, -10, 100);
+  hcalHEHBecalEB_ =
+      new TH2F("hcalHEHBecalEB", "HCAL HBHE RecHit energy vs ECAL EB energy", numBins, histRangeMin_, 300.0, 40, -5, 5);
+
+  NumXtalsInClusterHist_ = new TH1F("NumXtalsInClusterAllHist", "Number of Xtals in Cluster;NumXtals", 150, 0, 150);
+  numxtalsVsEnergy_ = new TH2F("NumXtalsVsEnergy",
+                               "Number of Xtals in Cluster vs Energy;Energy (GeV);Number of Xtals in Cluster",
+                               numBins,
+                               histRangeMin_,
+                               histRangeMax_,
+                               150,
+                               0,
+                               150);
+  numxtalsVsHighEnergy_ = new TH2F("NumXtalsVsHighEnergy",
+                                   "Number of Xtals in Cluster vs Energy;Energy (GeV);Number of Xtals in Cluster",
+                                   numBins,
+                                   histRangeMin_,
+                                   200.,
+                                   150,
+                                   0,
+                                   150);
+
   // high energy analysis
-  allOccupancyHighEnergy_             = new TH2F("OccupancyHighEnergyEvents","Occupancy high energy events;i#phi;i#eta",360,1.,361.,172,-86,86);
-  allOccupancyHighEnergyCoarse_       = new TH2F("OccupancyHighEnergyEventsCoarse","Occupancy high energy events Coarse;i#phi;i#eta",72,ttPhiBins,35,ttEtaBins); 
-  allFedsOccupancyHighEnergyHist_     = new TH3F("OccupancyHighEnergyEvents3D","(Phi,Eta,energy) for all high energy events;i#phi;i#eta;energy (GeV)",18,modPhiBins,9,modEtaBins,10,highEBins);
-  allFedsNumXtalsInClusterHist_       = new TH1F("NumActiveXtalsInClusterAllHist","Number of active Xtals in Cluster;NumXtals",100,0,100);
-  
-  HighEnergy_NumXtal                  = new TH1F("HighEnergy_NumXtal","Num crystals in high E clusters;num crystals",150,0,150);
-  HighEnergy_NumXtalFedId             = new TH2F("HighEnergy_NumXtalFedId","Num crystals in cluster vs FedId;FedId;num crystals",36,610.,645.,150,0,150);
-  HighEnergy_NumXtaliphi              = new TH2F("HighEnergy_NumXtaliphi","Num crystals in cluster vs iphi;i#phi;num crystals",360,1.,361.,150,0,150);
-  HighEnergy_energy3D                 = new TH3F("HighEnergy_energy3D","(Phi,Eta,energy) for all high energy events;i#phi;i#eta;energy (GeV)",72,ttPhiBins,35,ttEtaBins,10,highEBins);
-  
-  HighEnergy_energyNumXtal            = new TH2F("HighEnergy_energyNumXtal","Energy in cluster vs Num crystals in cluster;num crystals;energy",150,0,150,200,0.,200.);
-  
-  HighEnergy_bestSeed                 = new TH1F("HighEnergy_bestSeedEnergy","BestSeed Energy from TrackAss",200,0.,200.);
-  HighEnergy_bestSeedOccupancy        = new TH2F("HighEnergy_bestSeedOccupancy","Occupancy HighEn events from TrackAss;i#phi;i#eta",360,1.,361.,172,-86,86);
-  
-  HighEnergy_numClusHighEn            = new TH1F("HighEnergy_numClusHighEn","Num High Energy Clusters",7,0,7);
-  HighEnergy_ratioClusters            = new TH1F("HighEnergy_ratioClusters","Num High Energy Clusters/Num tot Clusters",100,0.,1.1);
-  
-  HighEnergy_numRecoTrackBarrel       = new TH1F("HighEnergy_numRecoTracksBarrel","Num BarrelRecoTracks",10,0,10);
-  HighEnergy_TracksAngle              = new TH1F("HighEnergy_TracksAngle","Angle between tracks",720,0.,180.);
-  HighEnergy_TracksAngleTopBottom     = new TH1F("HighEnergy_TopBottomTracksAngle","Angle between top-bottom tracks",720,0.,180.);
-  
-  HighEnergy_2GeV_occuCoarse          = new TH2F("HighEnergy_occu2GeV_Coarse","Occupancy high energy events with more than 2 GeV;i#phi;i#eta",72,ttPhiBins,35,ttEtaBins); 
-  HighEnergy_2GeV_occu3D              = new TH3F("HighEnergy_2GeV_energy3D","(iphi,ieta,energy) for all high energy events w > 10 GeV;i#phi;i#eta;energy (GeV)",72,ttPhiBins,35,ttEtaBins,10,highEBins);
-  HighEnergy_100GeV_occuCoarse        = new TH2F("HighEnergy_occu100GeV_Coarse","Occupancy high energy events with more than 100 GeV;i#phi;i#eta",72,ttPhiBins,35,ttEtaBins); 
-  HighEnergy_100GeV_occu3D            = new TH3F("HighEnergy_100GeV_energy3D","(iphi,ieta,energy) for all high energy events more than 100 GeV;i#phi;i#eta;energy (GeV)",72,ttPhiBins,35,ttEtaBins,10,highEBins);
-  HighEnergy_0tracks_occu3D           = new TH3F("HighEnergy_0Tracks_energy3D","(iphi,ieta,energy) for all events with 0 tracks;i#phi;i#eta;energy (GeV)",72,ttPhiBins,35,ttEtaBins,10,highEBins);
-  HighEnergy_1tracks_occu3D           = new TH3F("HighEnergy_1Tracks_energy3D","(iphi,ieta,energy) for all events with 1 tracks;i#phi;i#eta;energy (GeV)",72,ttPhiBins,35,ttEtaBins,10,highEBins);
-  HighEnergy_2tracks_occu3D           = new TH3F("HighEnergy_2Tracks_energy3D","(iphi,ieta,energy) for all events with 2 tracks;i#phi;i#eta;energy (GeV)",72,ttPhiBins,35,ttEtaBins,10,highEBins);
-  HighEnergy_0tracks_occu3DXtal       = new TH3F("HighEnergy_0Tracks_energy3DXtal","(iphi,ieta,energy) for all events with 0 tracks;i#phi;i#eta;energy (GeV)",360,1.,361.,172,-86,86,200,0.,200.);
-  HighEnergy_1tracks_occu3DXtal       = new TH3F("HighEnergy_1Tracks_energy3DXtal","(iphi,ieta,energy) for all events with 1 tracks;i#phi;i#eta;energy (GeV)",360,1.,361.,172,-86,86,200,0.,200.);
-  HighEnergy_2tracks_occu3DXtal       = new TH3F("HighEnergy_2Tracks_energy3DXtal","(iphi,ieta,energy) for all events with 2 tracks;i#phi;i#eta;energy (GeV)",360,1.,361.,172,-86,86,200,0.,200.);
+  allOccupancyHighEnergy_ =
+      new TH2F("OccupancyHighEnergyEvents", "Occupancy high energy events;i#phi;i#eta", 360, 1., 361., 172, -86, 86);
+  allOccupancyHighEnergyCoarse_ = new TH2F("OccupancyHighEnergyEventsCoarse",
+                                           "Occupancy high energy events Coarse;i#phi;i#eta",
+                                           72,
+                                           ttPhiBins,
+                                           35,
+                                           ttEtaBins);
+  allFedsOccupancyHighEnergyHist_ = new TH3F("OccupancyHighEnergyEvents3D",
+                                             "(Phi,Eta,energy) for all high energy events;i#phi;i#eta;energy (GeV)",
+                                             18,
+                                             modPhiBins,
+                                             9,
+                                             modEtaBins,
+                                             10,
+                                             highEBins);
+  allFedsNumXtalsInClusterHist_ =
+      new TH1F("NumActiveXtalsInClusterAllHist", "Number of active Xtals in Cluster;NumXtals", 100, 0, 100);
+
+  HighEnergy_NumXtal = new TH1F("HighEnergy_NumXtal", "Num crystals in high E clusters;num crystals", 150, 0, 150);
+  HighEnergy_NumXtalFedId = new TH2F(
+      "HighEnergy_NumXtalFedId", "Num crystals in cluster vs FedId;FedId;num crystals", 36, 610., 645., 150, 0, 150);
+  HighEnergy_NumXtaliphi = new TH2F(
+      "HighEnergy_NumXtaliphi", "Num crystals in cluster vs iphi;i#phi;num crystals", 360, 1., 361., 150, 0, 150);
+  HighEnergy_energy3D = new TH3F("HighEnergy_energy3D",
+                                 "(Phi,Eta,energy) for all high energy events;i#phi;i#eta;energy (GeV)",
+                                 72,
+                                 ttPhiBins,
+                                 35,
+                                 ttEtaBins,
+                                 10,
+                                 highEBins);
+
+  HighEnergy_energyNumXtal = new TH2F("HighEnergy_energyNumXtal",
+                                      "Energy in cluster vs Num crystals in cluster;num crystals;energy",
+                                      150,
+                                      0,
+                                      150,
+                                      200,
+                                      0.,
+                                      200.);
+
+  HighEnergy_bestSeed = new TH1F("HighEnergy_bestSeedEnergy", "BestSeed Energy from TrackAss", 200, 0., 200.);
+  HighEnergy_bestSeedOccupancy = new TH2F(
+      "HighEnergy_bestSeedOccupancy", "Occupancy HighEn events from TrackAss;i#phi;i#eta", 360, 1., 361., 172, -86, 86);
+
+  HighEnergy_numClusHighEn = new TH1F("HighEnergy_numClusHighEn", "Num High Energy Clusters", 7, 0, 7);
+  HighEnergy_ratioClusters =
+      new TH1F("HighEnergy_ratioClusters", "Num High Energy Clusters/Num tot Clusters", 100, 0., 1.1);
+
+  HighEnergy_numRecoTrackBarrel = new TH1F("HighEnergy_numRecoTracksBarrel", "Num BarrelRecoTracks", 10, 0, 10);
+  HighEnergy_TracksAngle = new TH1F("HighEnergy_TracksAngle", "Angle between tracks", 720, 0., 180.);
+  HighEnergy_TracksAngleTopBottom =
+      new TH1F("HighEnergy_TopBottomTracksAngle", "Angle between top-bottom tracks", 720, 0., 180.);
+
+  HighEnergy_2GeV_occuCoarse = new TH2F("HighEnergy_occu2GeV_Coarse",
+                                        "Occupancy high energy events with more than 2 GeV;i#phi;i#eta",
+                                        72,
+                                        ttPhiBins,
+                                        35,
+                                        ttEtaBins);
+  HighEnergy_2GeV_occu3D = new TH3F("HighEnergy_2GeV_energy3D",
+                                    "(iphi,ieta,energy) for all high energy events w > 10 GeV;i#phi;i#eta;energy (GeV)",
+                                    72,
+                                    ttPhiBins,
+                                    35,
+                                    ttEtaBins,
+                                    10,
+                                    highEBins);
+  HighEnergy_100GeV_occuCoarse = new TH2F("HighEnergy_occu100GeV_Coarse",
+                                          "Occupancy high energy events with more than 100 GeV;i#phi;i#eta",
+                                          72,
+                                          ttPhiBins,
+                                          35,
+                                          ttEtaBins);
+  HighEnergy_100GeV_occu3D =
+      new TH3F("HighEnergy_100GeV_energy3D",
+               "(iphi,ieta,energy) for all high energy events more than 100 GeV;i#phi;i#eta;energy (GeV)",
+               72,
+               ttPhiBins,
+               35,
+               ttEtaBins,
+               10,
+               highEBins);
+  HighEnergy_0tracks_occu3D = new TH3F("HighEnergy_0Tracks_energy3D",
+                                       "(iphi,ieta,energy) for all events with 0 tracks;i#phi;i#eta;energy (GeV)",
+                                       72,
+                                       ttPhiBins,
+                                       35,
+                                       ttEtaBins,
+                                       10,
+                                       highEBins);
+  HighEnergy_1tracks_occu3D = new TH3F("HighEnergy_1Tracks_energy3D",
+                                       "(iphi,ieta,energy) for all events with 1 tracks;i#phi;i#eta;energy (GeV)",
+                                       72,
+                                       ttPhiBins,
+                                       35,
+                                       ttEtaBins,
+                                       10,
+                                       highEBins);
+  HighEnergy_2tracks_occu3D = new TH3F("HighEnergy_2Tracks_energy3D",
+                                       "(iphi,ieta,energy) for all events with 2 tracks;i#phi;i#eta;energy (GeV)",
+                                       72,
+                                       ttPhiBins,
+                                       35,
+                                       ttEtaBins,
+                                       10,
+                                       highEBins);
+  HighEnergy_0tracks_occu3DXtal = new TH3F("HighEnergy_0Tracks_energy3DXtal",
+                                           "(iphi,ieta,energy) for all events with 0 tracks;i#phi;i#eta;energy (GeV)",
+                                           360,
+                                           1.,
+                                           361.,
+                                           172,
+                                           -86,
+                                           86,
+                                           200,
+                                           0.,
+                                           200.);
+  HighEnergy_1tracks_occu3DXtal = new TH3F("HighEnergy_1Tracks_energy3DXtal",
+                                           "(iphi,ieta,energy) for all events with 1 tracks;i#phi;i#eta;energy (GeV)",
+                                           360,
+                                           1.,
+                                           361.,
+                                           172,
+                                           -86,
+                                           86,
+                                           200,
+                                           0.,
+                                           200.);
+  HighEnergy_2tracks_occu3DXtal = new TH3F("HighEnergy_2Tracks_energy3DXtal",
+                                           "(iphi,ieta,energy) for all events with 2 tracks;i#phi;i#eta;energy (GeV)",
+                                           360,
+                                           1.,
+                                           361.,
+                                           172,
+                                           -86,
+                                           86,
+                                           200,
+                                           0.,
+                                           200.);
 
   //EE histograms
 
   // EE-
-  EEM_FedsSeedEnergyHist_           = new TH1F("SeedEnergyAllFEDs","Seed Energy for EEM Feds; Seed Energy (GeV)",200,histRangeMin_,10.0);
-
-  EEM_AllOccupancyCoarse_           = new TH2F("OccupancyAllEventsCoarse","Occupancy all events Coarse EEM;ix;iy",20,0,100,20,0,100);
-  EEM_AllOccupancy_                 = new TH2F("OccupancyAllEvents","Occupancy all events EEM;ix;iy",100,0,100,100,0,100);
-  EEM_FedsenergyHist_               = new TH1F("energy_AllClusters","energy_AllClusters_EEM;Cluster Energy (GeV)",numBins,histRangeMin_,10.0);
-  EEM_FedsenergyHighHist_           = new TH1F("energyHigh_AllClusters","energyHigh_AllClusters in EEM;Cluster Energy (GeV)",numBins,histRangeMin_,200.0);
-  EEM_FedsenergyOnlyHighHist_       = new TH1F("energyHigh_HighEnergyClusters","energy of High Energy Clusters in EEM;Cluster Energy (GeV)",numBins,histRangeMin_,200.0);
-  EEM_FedsE2Hist_                   = new TH1F("E2_AllClusters","E2_AllClusters_EEM;Seed+highest neighbor energy (GeV)",numBins,histRangeMin_,10.0);
-  EEM_FedsE2vsE1Hist_               = new TH2F("E2vsE1_AllClusters","E2vsE1_AllClusters_EEM;Seed Energy (GeV);Seed+highest neighbor energy (GeV)",numBins,histRangeMin_,10.0,numBins,histRangeMin_,10.0);
-  EEM_FedsenergyvsE1Hist_           = new TH2F("energyvsE1_AllClusters","energyvsE1_AllClusters_EEM;Seed Energy (GeV);Energy(GeV)",numBins,histRangeMin_,10.0,numBins,histRangeMin_,10.0);
-  EEM_FedsTimingHist_               = new TH1F("timeForAllFeds","timeForAllFeds_EEM;Relative Time (1 clock = 25ns)",78,-7,7);
-  EEM_numberofCosmicsHist_ = new TH1F("numberofCosmicsPerEvent","Number of cosmics per event EEM;Number of Cosmics",30,0,30);
-  
-  EEM_FedsTimingVsAmpHist_          = new TH2F("timeVsAmpAllEvents","time Vs Amp All Events EEM;Relative Time (1 clock = 25ns);Amplitude (GeV)",78,-7,7,numBins,histRangeMin_,10.0);
-  EEM_FedsTimingTTHist_             = new TH3F("timeTTAllFEDs","(ix,iy,time) for all FEDs (SM,TT binning) EEM;ix;iy;Relative Time (1 clock = 25ns)",20,0,100,20,0,100,78,-7,7); 
-  
-  EEM_OccupancySingleXtal_          = new TH2F("OccupancySingleXtal","Occupancy single xtal clusters EEM;ix;iy",100,0,100,100,0,100);
-  EEM_energySingleXtalHist_         = new TH1F("energy_SingleXtalClusters","Energy single xtal clusters EEM;Cluster Energy (GeV)",numBins,histRangeMin_,200.0);
-  
-  EEM_OccupancyExclusiveECAL_       = new TH2F("OccupancyAllEvents_ExclusiveECAL","Occupancy all events Exclusive ECAL  EEM;ix;iy",100,0,100,100,0,100);
-  EEM_OccupancyCoarseExclusiveECAL_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveECAL","Occupancy all events Coarse Exclusive ECAL EEM;ix;iy",20,0,100,20,0,100);
-  EEM_OccupancyECAL_                = new TH2F("OccupancyAllEvents_ECAL","Occupancy all events ECAL EEM;ix;iy",100,0,100,100,0,100);
-  EEM_OccupancyCoarseECAL_          = new TH2F("OccupancyAllEventsCoarse_ECAL","Occupancy all events Coarse ECAL EEM;ix;iy",20,0,100,20,0,100);
-  EEM_FedsTimingHistECAL_           = new TH1F("timeForAllFeds_ECAL","timeForAllFeds ECAL EEM;Relative Time (1 clock = 25ns)",78,-7,7);
-  EEM_FedsTimingTTHistECAL_         = new TH3F("timeTTAllFEDs_ECAL","(ix,iy,time) for all FEDs (SM,TT binning) ECAL EEM;ix;iy;Relative Time (1 clock = 25ns)",20,0,100,20,0,100,78,-7,7); 
-  
-  EEM_OccupancyExclusiveDT_         = new TH2F("OccupancyAllEvents_ExclusiveDT","Occupancy all events Exclusive DT EEM;ix;iy",100,0,100,100,0,100);
-  EEM_OccupancyCoarseExclusiveDT_   = new TH2F("OccupancyAllEventsCoarse_ExclusiveDT","Occupancy all events Coarse Exclusive DT EEM;ix;iy",20,0,100,20,0,100);
-  EEM_OccupancyDT_                  = new TH2F("OccupancyAllEvents_DT","Occupancy all events DT EEM;ix;iy",100,0,100,100,0,100);
-  EEM_OccupancyCoarseDT_            = new TH2F("OccupancyAllEventsCoarse_DT","Occupancy all events Coarse DT EEM;ix;iy",20,0,100,20,0,100);
-  EEM_FedsTimingHistDT_             = new TH1F("timeForAllFeds_DT","timeForAllFeds DT EEM;Relative Time (1 clock = 25ns)",78,-7,7);
-  EEM_FedsTimingTTHistDT_         = new TH3F("timeTTAllFEDs_DT","(ix,iy,time) for all FEDs (SM,TT binning) DT EEM;ix;iy;Relative Time (1 clock = 25ns)",20,0,100,20,0,100,78,-7,7); 
-  
-  EEM_OccupancyExclusiveRPC_        = new TH2F("OccupancyAllEvents_ExclusiveRPC","Occupancy all events Exclusive RPC EEM;ix;iy",100,0,100,100,0,100);
-  EEM_OccupancyCoarseExclusiveRPC_  = new TH2F("OccupancyAllEventsCoarse_ExclusiveRPC","Occupancy all events Coarse Exclusive RPC EEM;ix;iy",20,0,100,20,0,100);
-  EEM_OccupancyRPC_                 = new TH2F("OccupancyAllEvents_RPC","Occupancy all events RPC EEM;ix;iy",100,0,100,100,0,100);
-  EEM_OccupancyCoarseRPC_           = new TH2F("OccupancyAllEventsCoarse_RPC","Occupancy all events Coarse RPC EEM;ix;iy",20,0,100,20,0,100);
-  EEM_FedsTimingHistRPC_            = new TH1F("timeForAllFeds_RPC","timeForAllFeds RPC EEM;Relative Time (1 clock = 25ns)",78,-7,7);
-  EEM_FedsTimingTTHistRPC_          = new TH3F("timeTTAllFEDs_RPC","(ix,iy,time) for all FEDs (SM,TT binning) RPC EEM;ix;iy;Relative Time (1 clock = 25ns)",20,0,100,20,0,100,78,-7,7); 
-  
-  EEM_OccupancyExclusiveCSC_        = new TH2F("OccupancyAllEvents_ExclusiveCSC","Occupancy all events Exclusive CSC EEM;ix;iy",100,0,100,100,0,100);
-  EEM_OccupancyCoarseExclusiveCSC_  = new TH2F("OccupancyAllEventsCoarse_ExclusiveCSC","Occupancy all events Coarse Exclusive CSC EEM;ix;iy",20,0,100,20,0,100);
-  EEM_OccupancyCSC_                 = new TH2F("OccupancyAllEvents_CSC","Occupancy all events CSC EEM;ix;iy",100,0,100,100,0,100);
-  EEM_OccupancyCoarseCSC_           = new TH2F("OccupancyAllEventsCoarse_CSC","Occupancy all events Coarse CSC EEM;ix;iy",20,0,100,20,0,100);
-  EEM_FedsTimingHistCSC_            = new TH1F("timeForAllFeds_CSC","timeForAllFeds CSC EEM;Relative Time (1 clock = 25ns)",78,-7,7);
-  EEM_FedsTimingTTHistCSC_          = new TH3F("timeTTAllFEDs_CSC","(ix,iy,time) for all FEDs (SM,TT binning) CSC EEM;ix;iy;Relative Time (1 clock = 25ns)",20,0,100,20,0,100,78,-7,7); 
-  
-  EEM_OccupancyExclusiveHCAL_       = new TH2F("OccupancyAllEvents_ExclusiveHCAL","Occupancy all events Exclusive HCAL EEM;ix;iy",100,0,100,100,0,100);
-  EEM_OccupancyCoarseExclusiveHCAL_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveHCAL","Occupancy all events Coarse Exclusive HCAL EEM;ix;iy",20,0,100,20,0,100);
-  EEM_OccupancyHCAL_                = new TH2F("OccupancyAllEvents_HCAL","Occupancy all events HCAL EEM;ix;iy",100,0,100,100,0,100);
-  EEM_OccupancyCoarseHCAL_          = new TH2F("OccupancyAllEventsCoarse_HCAL","Occupancy all events Coarse HCAL EEM;ix;iy",20,0,100,20,0,100);
-  EEM_FedsTimingHistHCAL_           = new TH1F("timeForAllFeds_HCAL","timeForAllFeds HCAL EEM;Relative Time (1 clock = 25ns)",78,-7,7);
-  EEM_FedsTimingTTHistHCAL_         = new TH3F("timeTTAllFEDs_HCAL","(ix,iy,time) for all FEDs (SM,TT binning) HCAL EEM;ix;iy;Relative Time (1 clock = 25ns)",20,0,100,20,0,100,78,-7,7); 
-  
-  EEM_numberofBCinSC_               = new TH1F("numberofBCinSC","Number of Basic Clusters in Super Cluster EEM;Num Basic Clusters",20,0,20);
-  
-  EEM_triggerHist_                  = new TH1F("triggerHist","Trigger Number EEM",5,0,5);
-  EEM_triggerHist_->GetXaxis()->SetBinLabel(1,"ECAL");
-  EEM_triggerHist_->GetXaxis()->SetBinLabel(2,"HCAL");
-  EEM_triggerHist_->GetXaxis()->SetBinLabel(3,"DT");
-  EEM_triggerHist_->GetXaxis()->SetBinLabel(4,"RPC");
-  EEM_triggerHist_->GetXaxis()->SetBinLabel(5,"CSC");
-  
-  EEM_triggerExclusiveHist_         = new TH1F("triggerExclusiveHist","Trigger Number (Mutually Exclusive) EEM",5,0,5);  triggerExclusiveHist_->GetXaxis()->SetBinLabel(1,"ECAL");
-  EEM_triggerExclusiveHist_->GetXaxis()->SetBinLabel(2,"HCAL");
-  EEM_triggerExclusiveHist_->GetXaxis()->SetBinLabel(3,"DT");
-  EEM_triggerExclusiveHist_->GetXaxis()->SetBinLabel(4,"RPC");
-  EEM_triggerExclusiveHist_->GetXaxis()->SetBinLabel(5,"CSC");
-  
-  EEM_NumXtalsInClusterHist_        = new TH1F("NumXtalsInClusterAllHist","Number of Xtals in Cluster EEM;NumXtals",150,0,150);
-  EEM_numxtalsVsEnergy_             = new TH2F("NumXtalsVsEnergy","Number of Xtals in Cluster vs Energy EEM;Energy (GeV);Number of Xtals in Cluster",numBins,histRangeMin_,10.0, 150,0,150);
-  EEM_numxtalsVsHighEnergy_         = new TH2F("NumXtalsVsHighEnergy","Number of Xtals in Cluster vs Energy EEM;Energy (GeV);Number of Xtals in Cluster",numBins,histRangeMin_,200., 150,0,150);
-  
-  EEM_OccupancyHighEnergy_          = new TH2F("OccupancyHighEnergyEvents","Occupancy high energy events EEM;ix;iy",100,0,100,100,0,100);
-  EEM_OccupancyHighEnergyCoarse_    = new TH2F("OccupancyHighEnergyEventsCoarse","Occupancy high energy events Coarse EEM;ix;iy",20,0,100,20,0,100);
-  
-  EEM_FedsNumXtalsInClusterHist_    = new TH1F("NumActiveXtalsInClusterAllHist","Number of active Xtals in Cluster EEM;NumXtals",100,0,100);
-
-  
-  // EE+
-  EEP_FedsSeedEnergyHist_           = new TH1F("SeedEnergyAllFEDs","Seed Energy for EEP Feds; Seed Energy (GeV)",200,histRangeMin_,10.0);
-
-  EEP_AllOccupancyCoarse_           = new TH2F("OccupancyAllEventsCoarse","Occupancy all events Coarse EEP;ix;iy",20,0,100,20,0,100);
-  EEP_AllOccupancy_                 = new TH2F("OccupancyAllEvents","Occupancy all events EEP;ix;iy",100,0,100,100,0,100);
-  EEP_FedsenergyHist_               = new TH1F("energy_AllClusters","energy_AllClusters_EEP;Cluster Energy (GeV)",numBins,histRangeMin_,10.0);
-  EEP_FedsenergyHighHist_           = new TH1F("energyHigh_AllClusters","energyHigh_AllClusters in EEP;Cluster Energy (GeV)",numBins,histRangeMin_,200.0);
-  EEP_FedsenergyOnlyHighHist_       = new TH1F("energyHigh_HighEnergyClusters","energy of High Energy Clusters in EEP;Cluster Energy (GeV)",numBins,histRangeMin_,200.0);
-  EEP_FedsE2Hist_                   = new TH1F("E2_AllClusters","E2_AllClusters_EEP;Seed+highest neighbor energy (GeV)",numBins,histRangeMin_,10.0);
-  EEP_FedsE2vsE1Hist_               = new TH2F("E2vsE1_AllClusters","E2vsE1_AllClusters_EEP;Seed Energy (GeV);Seed+highest neighbor energy (GeV)",numBins,histRangeMin_,10.0,numBins,histRangeMin_,10.0);
-  EEP_FedsenergyvsE1Hist_           = new TH2F("energyvsE1_AllClusters","energyvsE1_AllClusters_EEP;Seed Energy (GeV);Energy(GeV)",numBins,histRangeMin_,10.0,numBins,histRangeMin_,10.0);
-  EEP_FedsTimingHist_               = new TH1F("timeForAllFeds","timeForAllFeds_EEP;Relative Time (1 clock = 25ns)",78,-7,7);
-  EEP_numberofCosmicsHist_ = new TH1F("numberofCosmicsPerEvent","Number of cosmics per event EEP;Number of Cosmics",30,0,30);
-
-  EEP_FedsTimingVsAmpHist_          = new TH2F("timeVsAmpAllEvents","time Vs Amp All Events EEP;Relative Time (1 clock = 25ns);Amplitude (GeV)",78,-7,7,numBins,histRangeMin_,10.0);
-  EEP_FedsTimingTTHist_             = new TH3F("timeTTAllFEDs","(ix,iy,time) for all FEDs (SM,TT binning) EEP;ix;iy;Relative Time (1 clock = 25ns)",20,0,100,20,0,100,78,-7,7); 
-  
-  EEP_OccupancySingleXtal_          = new TH2F("OccupancySingleXtal","Occupancy single xtal clusters EEP;ix;iy",100,0,100,100,0,100);
-  EEP_energySingleXtalHist_         = new TH1F("energy_SingleXtalClusters","Energy single xtal clusters EEP;Cluster Energy (GeV)",numBins,histRangeMin_,200.0);
-  
-  EEP_OccupancyExclusiveECAL_       = new TH2F("OccupancyAllEvents_ExclusiveECAL","Occupancy all events Exclusive ECAL  EEP;ix;iy",100,0,100,100,0,100);
-  EEP_OccupancyCoarseExclusiveECAL_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveECAL","Occupancy all events Coarse Exclusive ECAL EEP;ix;iy",20,0,100,20,0,100);
-  EEP_OccupancyECAL_                = new TH2F("OccupancyAllEvents_ECAL","Occupancy all events ECAL EEP;ix;iy",100,0,100,100,0,100);
-  EEP_OccupancyCoarseECAL_          = new TH2F("OccupancyAllEventsCoarse_ECAL","Occupancy all events Coarse ECAL EEP;ix;iy",20,0,100,20,0,100);
-  EEP_FedsTimingHistECAL_           = new TH1F("timeForAllFeds_ECAL","timeForAllFeds ECAL EEP;Relative Time (1 clock = 25ns)",78,-7,7);
-  EEP_FedsTimingTTHistECAL_         = new TH3F("timeTTAllFEDs_ECAL","(ix,iy,time) for all FEDs (SM,TT binning) ECAL EEP;ix;iy;Relative Time (1 clock = 25ns)",20,0,100,20,0,100,78,-7,7); 
-  
-  EEP_OccupancyExclusiveDT_         = new TH2F("OccupancyAllEvents_ExclusiveDT","Occupancy all events Exclusive DT EEP;ix;iy",100,0,100,100,0,100);
-  EEP_OccupancyCoarseExclusiveDT_   = new TH2F("OccupancyAllEventsCoarse_ExclusiveDT","Occupancy all events Coarse Exclusive DT EEP;ix;iy",20,0,100,20,0,100);
-  EEP_OccupancyDT_                  = new TH2F("OccupancyAllEvents_DT","Occupancy all events DT EEP;ix;iy",100,0,100,100,0,100);
-  EEP_OccupancyCoarseDT_            = new TH2F("OccupancyAllEventsCoarse_DT","Occupancy all events Coarse DT EEP;ix;iy",20,0,100,20,0,100);
-  EEP_FedsTimingHistDT_             = new TH1F("timeForAllFeds_DT","timeForAllFeds DT EEP;Relative Time (1 clock = 25ns)",78,-7,7);
-  EEP_FedsTimingTTHistDT_         = new TH3F("timeTTAllFEDs_DT","(ix,iy,time) for all FEDs (SM,TT binning) DT EEP;ix;iy;Relative Time (1 clock = 25ns)",20,0,100,20,0,100,78,-7,7); 
-  
-  EEP_OccupancyExclusiveRPC_        = new TH2F("OccupancyAllEvents_ExclusiveRPC","Occupancy all events Exclusive RPC EEP;ix;iy",100,0,100,100,0,100);
-  EEP_OccupancyCoarseExclusiveRPC_  = new TH2F("OccupancyAllEventsCoarse_ExclusiveRPC","Occupancy all events Coarse Exclusive RPC EEP;ix;iy",20,0,100,20,0,100);
-  EEP_OccupancyRPC_                 = new TH2F("OccupancyAllEvents_RPC","Occupancy all events RPC EEP;ix;iy",100,0,100,100,0,100);
-  EEP_OccupancyCoarseRPC_           = new TH2F("OccupancyAllEventsCoarse_RPC","Occupancy all events Coarse RPC EEP;ix;iy",20,0,100,20,0,100);
-  EEP_FedsTimingHistRPC_            = new TH1F("timeForAllFeds_RPC","timeForAllFeds RPC EEP;Relative Time (1 clock = 25ns)",78,-7,7);
-  EEP_FedsTimingTTHistRPC_          = new TH3F("timeTTAllFEDs_RPC","(ix,iy,time) for all FEDs (SM,TT binning) RPC EEP;ix;iy;Relative Time (1 clock = 25ns)",20,0,100,20,0,100,78,-7,7); 
-  
-  EEP_OccupancyExclusiveCSC_        = new TH2F("OccupancyAllEvents_ExclusiveCSC","Occupancy all events Exclusive CSC EEP;ix;iy",100,0,100,100,0,100);
-  EEP_OccupancyCoarseExclusiveCSC_  = new TH2F("OccupancyAllEventsCoarse_ExclusiveCSC","Occupancy all events Coarse Exclusive CSC EEP;ix;iy",20,0,100,20,0,100);
-  EEP_OccupancyCSC_                 = new TH2F("OccupancyAllEvents_CSC","Occupancy all events CSC EEP;ix;iy",100,0,100,100,0,100);
-  EEP_OccupancyCoarseCSC_           = new TH2F("OccupancyAllEventsCoarse_CSC","Occupancy all events Coarse CSC EEP;ix;iy",20,0,100,20,0,100);
-  EEP_FedsTimingHistCSC_            = new TH1F("timeForAllFeds_CSC","timeForAllFeds CSC EEP;Relative Time (1 clock = 25ns)",78,-7,7);
-  EEP_FedsTimingTTHistCSC_          = new TH3F("timeTTAllFEDs_CSC","(ix,iy,time) for all FEDs (SM,TT binning) CSC EEP;ix;iy;Relative Time (1 clock = 25ns)",20,0,100,20,0,100,78,-7,7); 
-  
-  EEP_OccupancyExclusiveHCAL_       = new TH2F("OccupancyAllEvents_ExclusiveHCAL","Occupancy all events Exclusive HCAL EEP;ix;iy",100,0,100,100,0,100);
-  EEP_OccupancyCoarseExclusiveHCAL_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveHCAL","Occupancy all events Coarse Exclusive HCAL EEP;ix;iy",20,0,100,20,0,100);
-  EEP_OccupancyHCAL_                = new TH2F("OccupancyAllEvents_HCAL","Occupancy all events HCAL EEP;ix;iy",100,0,100,100,0,100);
-  EEP_OccupancyCoarseHCAL_          = new TH2F("OccupancyAllEventsCoarse_HCAL","Occupancy all events Coarse HCAL EEP;ix;iy",20,0,100,20,0,100);
-  EEP_FedsTimingHistHCAL_           = new TH1F("timeForAllFeds_HCAL","timeForAllFeds HCAL EEP;Relative Time (1 clock = 25ns)",78,-7,7);
-  EEP_FedsTimingTTHistHCAL_         = new TH3F("timeTTAllFEDs_HCAL","(ix,iy,time) for all FEDs (SM,TT binning) HCAL EEP;ix;iy;Relative Time (1 clock = 25ns)",20,0,100,20,0,100,78,-7,7); 
-  
-  EEP_numberofBCinSC_               = new TH1F("numberofBCinSC","Number of Basic Clusters in Super Cluster EEP;Num Basic Clusters",20,0,20);
-  
-  EEP_triggerHist_                  = new TH1F("triggerHist","Trigger Number EEP",5,0,5);
-  EEP_triggerHist_->GetXaxis()->SetBinLabel(1,"ECAL");
-  EEP_triggerHist_->GetXaxis()->SetBinLabel(2,"HCAL");
-  EEP_triggerHist_->GetXaxis()->SetBinLabel(3,"DT");
-  EEP_triggerHist_->GetXaxis()->SetBinLabel(4,"RPC");
-  EEP_triggerHist_->GetXaxis()->SetBinLabel(5,"CSC");
-  
-  EEP_triggerExclusiveHist_         = new TH1F("triggerExclusiveHist","Trigger Number (Mutually Exclusive) EEP",5,0,5);  
-  EEP_triggerExclusiveHist_->GetXaxis()->SetBinLabel(1,"ECAL");
-  EEP_triggerExclusiveHist_->GetXaxis()->SetBinLabel(2,"HCAL");
-  EEP_triggerExclusiveHist_->GetXaxis()->SetBinLabel(3,"DT");
-  EEP_triggerExclusiveHist_->GetXaxis()->SetBinLabel(4,"RPC");
-  EEP_triggerExclusiveHist_->GetXaxis()->SetBinLabel(5,"CSC");
-  
-  EEP_NumXtalsInClusterHist_        = new TH1F("NumXtalsInClusterAllHist","Number of Xtals in Cluster EEP;NumXtals",150,0,150);
-  EEP_numxtalsVsEnergy_             = new TH2F("NumXtalsVsEnergy","Number of Xtals in Cluster vs Energy EEP;Energy (GeV);Number of Xtals in Cluster",numBins,histRangeMin_,10.0, 150,0,150);
-  EEP_numxtalsVsHighEnergy_         = new TH2F("NumXtalsVsHighEnergy","Number of Xtals in Cluster vs Energy EEP;Energy (GeV);Number of Xtals in Cluster",numBins,histRangeMin_,200., 150,0,150);
-  
-  EEP_OccupancyHighEnergy_          = new TH2F("OccupancyHighEnergyEvents","Occupancy high energy events EEP;ix;iy",100,0,100,100,0,100);
-  EEP_OccupancyHighEnergyCoarse_    = new TH2F("OccupancyHighEnergyEventsCoarse","Occupancy high energy events Coarse EEP;ix;iy",20,0,100,20,0,100);
-  
-  EEP_FedsNumXtalsInClusterHist_    = new TH1F("NumActiveXtalsInClusterAllHist","Number of active Xtals in Cluster EEP;NumXtals",100,0,100);
-  
+  EEM_FedsSeedEnergyHist_ =
+      new TH1F("SeedEnergyAllFEDs", "Seed Energy for EEM Feds; Seed Energy (GeV)", 200, histRangeMin_, 10.0);
+
+  EEM_AllOccupancyCoarse_ =
+      new TH2F("OccupancyAllEventsCoarse", "Occupancy all events Coarse EEM;ix;iy", 20, 0, 100, 20, 0, 100);
+  EEM_AllOccupancy_ = new TH2F("OccupancyAllEvents", "Occupancy all events EEM;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEM_FedsenergyHist_ =
+      new TH1F("energy_AllClusters", "energy_AllClusters_EEM;Cluster Energy (GeV)", numBins, histRangeMin_, 10.0);
+  EEM_FedsenergyHighHist_ = new TH1F(
+      "energyHigh_AllClusters", "energyHigh_AllClusters in EEM;Cluster Energy (GeV)", numBins, histRangeMin_, 200.0);
+  EEM_FedsenergyOnlyHighHist_ = new TH1F("energyHigh_HighEnergyClusters",
+                                         "energy of High Energy Clusters in EEM;Cluster Energy (GeV)",
+                                         numBins,
+                                         histRangeMin_,
+                                         200.0);
+  EEM_FedsE2Hist_ =
+      new TH1F("E2_AllClusters", "E2_AllClusters_EEM;Seed+highest neighbor energy (GeV)", numBins, histRangeMin_, 10.0);
+  EEM_FedsE2vsE1Hist_ = new TH2F("E2vsE1_AllClusters",
+                                 "E2vsE1_AllClusters_EEM;Seed Energy (GeV);Seed+highest neighbor energy (GeV)",
+                                 numBins,
+                                 histRangeMin_,
+                                 10.0,
+                                 numBins,
+                                 histRangeMin_,
+                                 10.0);
+  EEM_FedsenergyvsE1Hist_ = new TH2F("energyvsE1_AllClusters",
+                                     "energyvsE1_AllClusters_EEM;Seed Energy (GeV);Energy(GeV)",
+                                     numBins,
+                                     histRangeMin_,
+                                     10.0,
+                                     numBins,
+                                     histRangeMin_,
+                                     10.0);
+  EEM_FedsTimingHist_ = new TH1F("timeForAllFeds", "timeForAllFeds_EEM;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  EEM_numberofCosmicsHist_ =
+      new TH1F("numberofCosmicsPerEvent", "Number of cosmics per event EEM;Number of Cosmics", 30, 0, 30);
+
+  EEM_FedsTimingVsAmpHist_ = new TH2F("timeVsAmpAllEvents",
+                                      "time Vs Amp All Events EEM;Relative Time (1 clock = 25ns);Amplitude (GeV)",
+                                      78,
+                                      -7,
+                                      7,
+                                      numBins,
+                                      histRangeMin_,
+                                      10.0);
+  EEM_FedsTimingTTHist_ = new TH3F("timeTTAllFEDs",
+                                   "(ix,iy,time) for all FEDs (SM,TT binning) EEM;ix;iy;Relative Time (1 clock = 25ns)",
+                                   20,
+                                   0,
+                                   100,
+                                   20,
+                                   0,
+                                   100,
+                                   78,
+                                   -7,
+                                   7);
+
+  EEM_OccupancySingleXtal_ =
+      new TH2F("OccupancySingleXtal", "Occupancy single xtal clusters EEM;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEM_energySingleXtalHist_ = new TH1F("energy_SingleXtalClusters",
+                                       "Energy single xtal clusters EEM;Cluster Energy (GeV)",
+                                       numBins,
+                                       histRangeMin_,
+                                       200.0);
+
+  EEM_OccupancyExclusiveECAL_ = new TH2F(
+      "OccupancyAllEvents_ExclusiveECAL", "Occupancy all events Exclusive ECAL  EEM;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEM_OccupancyCoarseExclusiveECAL_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveECAL",
+                                               "Occupancy all events Coarse Exclusive ECAL EEM;ix;iy",
+                                               20,
+                                               0,
+                                               100,
+                                               20,
+                                               0,
+                                               100);
+  EEM_OccupancyECAL_ =
+      new TH2F("OccupancyAllEvents_ECAL", "Occupancy all events ECAL EEM;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEM_OccupancyCoarseECAL_ =
+      new TH2F("OccupancyAllEventsCoarse_ECAL", "Occupancy all events Coarse ECAL EEM;ix;iy", 20, 0, 100, 20, 0, 100);
+  EEM_FedsTimingHistECAL_ =
+      new TH1F("timeForAllFeds_ECAL", "timeForAllFeds ECAL EEM;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  EEM_FedsTimingTTHistECAL_ =
+      new TH3F("timeTTAllFEDs_ECAL",
+               "(ix,iy,time) for all FEDs (SM,TT binning) ECAL EEM;ix;iy;Relative Time (1 clock = 25ns)",
+               20,
+               0,
+               100,
+               20,
+               0,
+               100,
+               78,
+               -7,
+               7);
+
+  EEM_OccupancyExclusiveDT_ = new TH2F(
+      "OccupancyAllEvents_ExclusiveDT", "Occupancy all events Exclusive DT EEM;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEM_OccupancyCoarseExclusiveDT_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveDT",
+                                             "Occupancy all events Coarse Exclusive DT EEM;ix;iy",
+                                             20,
+                                             0,
+                                             100,
+                                             20,
+                                             0,
+                                             100);
+  EEM_OccupancyDT_ = new TH2F("OccupancyAllEvents_DT", "Occupancy all events DT EEM;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEM_OccupancyCoarseDT_ =
+      new TH2F("OccupancyAllEventsCoarse_DT", "Occupancy all events Coarse DT EEM;ix;iy", 20, 0, 100, 20, 0, 100);
+  EEM_FedsTimingHistDT_ =
+      new TH1F("timeForAllFeds_DT", "timeForAllFeds DT EEM;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  EEM_FedsTimingTTHistDT_ =
+      new TH3F("timeTTAllFEDs_DT",
+               "(ix,iy,time) for all FEDs (SM,TT binning) DT EEM;ix;iy;Relative Time (1 clock = 25ns)",
+               20,
+               0,
+               100,
+               20,
+               0,
+               100,
+               78,
+               -7,
+               7);
+
+  EEM_OccupancyExclusiveRPC_ = new TH2F(
+      "OccupancyAllEvents_ExclusiveRPC", "Occupancy all events Exclusive RPC EEM;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEM_OccupancyCoarseExclusiveRPC_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveRPC",
+                                              "Occupancy all events Coarse Exclusive RPC EEM;ix;iy",
+                                              20,
+                                              0,
+                                              100,
+                                              20,
+                                              0,
+                                              100);
+  EEM_OccupancyRPC_ =
+      new TH2F("OccupancyAllEvents_RPC", "Occupancy all events RPC EEM;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEM_OccupancyCoarseRPC_ =
+      new TH2F("OccupancyAllEventsCoarse_RPC", "Occupancy all events Coarse RPC EEM;ix;iy", 20, 0, 100, 20, 0, 100);
+  EEM_FedsTimingHistRPC_ =
+      new TH1F("timeForAllFeds_RPC", "timeForAllFeds RPC EEM;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  EEM_FedsTimingTTHistRPC_ =
+      new TH3F("timeTTAllFEDs_RPC",
+               "(ix,iy,time) for all FEDs (SM,TT binning) RPC EEM;ix;iy;Relative Time (1 clock = 25ns)",
+               20,
+               0,
+               100,
+               20,
+               0,
+               100,
+               78,
+               -7,
+               7);
+
+  EEM_OccupancyExclusiveCSC_ = new TH2F(
+      "OccupancyAllEvents_ExclusiveCSC", "Occupancy all events Exclusive CSC EEM;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEM_OccupancyCoarseExclusiveCSC_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveCSC",
+                                              "Occupancy all events Coarse Exclusive CSC EEM;ix;iy",
+                                              20,
+                                              0,
+                                              100,
+                                              20,
+                                              0,
+                                              100);
+  EEM_OccupancyCSC_ =
+      new TH2F("OccupancyAllEvents_CSC", "Occupancy all events CSC EEM;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEM_OccupancyCoarseCSC_ =
+      new TH2F("OccupancyAllEventsCoarse_CSC", "Occupancy all events Coarse CSC EEM;ix;iy", 20, 0, 100, 20, 0, 100);
+  EEM_FedsTimingHistCSC_ =
+      new TH1F("timeForAllFeds_CSC", "timeForAllFeds CSC EEM;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  EEM_FedsTimingTTHistCSC_ =
+      new TH3F("timeTTAllFEDs_CSC",
+               "(ix,iy,time) for all FEDs (SM,TT binning) CSC EEM;ix;iy;Relative Time (1 clock = 25ns)",
+               20,
+               0,
+               100,
+               20,
+               0,
+               100,
+               78,
+               -7,
+               7);
+
+  EEM_OccupancyExclusiveHCAL_ = new TH2F(
+      "OccupancyAllEvents_ExclusiveHCAL", "Occupancy all events Exclusive HCAL EEM;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEM_OccupancyCoarseExclusiveHCAL_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveHCAL",
+                                               "Occupancy all events Coarse Exclusive HCAL EEM;ix;iy",
+                                               20,
+                                               0,
+                                               100,
+                                               20,
+                                               0,
+                                               100);
+  EEM_OccupancyHCAL_ =
+      new TH2F("OccupancyAllEvents_HCAL", "Occupancy all events HCAL EEM;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEM_OccupancyCoarseHCAL_ =
+      new TH2F("OccupancyAllEventsCoarse_HCAL", "Occupancy all events Coarse HCAL EEM;ix;iy", 20, 0, 100, 20, 0, 100);
+  EEM_FedsTimingHistHCAL_ =
+      new TH1F("timeForAllFeds_HCAL", "timeForAllFeds HCAL EEM;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  EEM_FedsTimingTTHistHCAL_ =
+      new TH3F("timeTTAllFEDs_HCAL",
+               "(ix,iy,time) for all FEDs (SM,TT binning) HCAL EEM;ix;iy;Relative Time (1 clock = 25ns)",
+               20,
+               0,
+               100,
+               20,
+               0,
+               100,
+               78,
+               -7,
+               7);
+
+  EEM_numberofBCinSC_ =
+      new TH1F("numberofBCinSC", "Number of Basic Clusters in Super Cluster EEM;Num Basic Clusters", 20, 0, 20);
+
+  EEM_triggerHist_ = new TH1F("triggerHist", "Trigger Number EEM", 5, 0, 5);
+  EEM_triggerHist_->GetXaxis()->SetBinLabel(1, "ECAL");
+  EEM_triggerHist_->GetXaxis()->SetBinLabel(2, "HCAL");
+  EEM_triggerHist_->GetXaxis()->SetBinLabel(3, "DT");
+  EEM_triggerHist_->GetXaxis()->SetBinLabel(4, "RPC");
+  EEM_triggerHist_->GetXaxis()->SetBinLabel(5, "CSC");
+
+  EEM_triggerExclusiveHist_ = new TH1F("triggerExclusiveHist", "Trigger Number (Mutually Exclusive) EEM", 5, 0, 5);
+  triggerExclusiveHist_->GetXaxis()->SetBinLabel(1, "ECAL");
+  EEM_triggerExclusiveHist_->GetXaxis()->SetBinLabel(2, "HCAL");
+  EEM_triggerExclusiveHist_->GetXaxis()->SetBinLabel(3, "DT");
+  EEM_triggerExclusiveHist_->GetXaxis()->SetBinLabel(4, "RPC");
+  EEM_triggerExclusiveHist_->GetXaxis()->SetBinLabel(5, "CSC");
+
+  EEM_NumXtalsInClusterHist_ =
+      new TH1F("NumXtalsInClusterAllHist", "Number of Xtals in Cluster EEM;NumXtals", 150, 0, 150);
+  EEM_numxtalsVsEnergy_ = new TH2F("NumXtalsVsEnergy",
+                                   "Number of Xtals in Cluster vs Energy EEM;Energy (GeV);Number of Xtals in Cluster",
+                                   numBins,
+                                   histRangeMin_,
+                                   10.0,
+                                   150,
+                                   0,
+                                   150);
+  EEM_numxtalsVsHighEnergy_ =
+      new TH2F("NumXtalsVsHighEnergy",
+               "Number of Xtals in Cluster vs Energy EEM;Energy (GeV);Number of Xtals in Cluster",
+               numBins,
+               histRangeMin_,
+               200.,
+               150,
+               0,
+               150);
+
+  EEM_OccupancyHighEnergy_ =
+      new TH2F("OccupancyHighEnergyEvents", "Occupancy high energy events EEM;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEM_OccupancyHighEnergyCoarse_ = new TH2F(
+      "OccupancyHighEnergyEventsCoarse", "Occupancy high energy events Coarse EEM;ix;iy", 20, 0, 100, 20, 0, 100);
+
+  EEM_FedsNumXtalsInClusterHist_ =
+      new TH1F("NumActiveXtalsInClusterAllHist", "Number of active Xtals in Cluster EEM;NumXtals", 100, 0, 100);
 
+  // EE+
+  EEP_FedsSeedEnergyHist_ =
+      new TH1F("SeedEnergyAllFEDs", "Seed Energy for EEP Feds; Seed Energy (GeV)", 200, histRangeMin_, 10.0);
+
+  EEP_AllOccupancyCoarse_ =
+      new TH2F("OccupancyAllEventsCoarse", "Occupancy all events Coarse EEP;ix;iy", 20, 0, 100, 20, 0, 100);
+  EEP_AllOccupancy_ = new TH2F("OccupancyAllEvents", "Occupancy all events EEP;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEP_FedsenergyHist_ =
+      new TH1F("energy_AllClusters", "energy_AllClusters_EEP;Cluster Energy (GeV)", numBins, histRangeMin_, 10.0);
+  EEP_FedsenergyHighHist_ = new TH1F(
+      "energyHigh_AllClusters", "energyHigh_AllClusters in EEP;Cluster Energy (GeV)", numBins, histRangeMin_, 200.0);
+  EEP_FedsenergyOnlyHighHist_ = new TH1F("energyHigh_HighEnergyClusters",
+                                         "energy of High Energy Clusters in EEP;Cluster Energy (GeV)",
+                                         numBins,
+                                         histRangeMin_,
+                                         200.0);
+  EEP_FedsE2Hist_ =
+      new TH1F("E2_AllClusters", "E2_AllClusters_EEP;Seed+highest neighbor energy (GeV)", numBins, histRangeMin_, 10.0);
+  EEP_FedsE2vsE1Hist_ = new TH2F("E2vsE1_AllClusters",
+                                 "E2vsE1_AllClusters_EEP;Seed Energy (GeV);Seed+highest neighbor energy (GeV)",
+                                 numBins,
+                                 histRangeMin_,
+                                 10.0,
+                                 numBins,
+                                 histRangeMin_,
+                                 10.0);
+  EEP_FedsenergyvsE1Hist_ = new TH2F("energyvsE1_AllClusters",
+                                     "energyvsE1_AllClusters_EEP;Seed Energy (GeV);Energy(GeV)",
+                                     numBins,
+                                     histRangeMin_,
+                                     10.0,
+                                     numBins,
+                                     histRangeMin_,
+                                     10.0);
+  EEP_FedsTimingHist_ = new TH1F("timeForAllFeds", "timeForAllFeds_EEP;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  EEP_numberofCosmicsHist_ =
+      new TH1F("numberofCosmicsPerEvent", "Number of cosmics per event EEP;Number of Cosmics", 30, 0, 30);
+
+  EEP_FedsTimingVsAmpHist_ = new TH2F("timeVsAmpAllEvents",
+                                      "time Vs Amp All Events EEP;Relative Time (1 clock = 25ns);Amplitude (GeV)",
+                                      78,
+                                      -7,
+                                      7,
+                                      numBins,
+                                      histRangeMin_,
+                                      10.0);
+  EEP_FedsTimingTTHist_ = new TH3F("timeTTAllFEDs",
+                                   "(ix,iy,time) for all FEDs (SM,TT binning) EEP;ix;iy;Relative Time (1 clock = 25ns)",
+                                   20,
+                                   0,
+                                   100,
+                                   20,
+                                   0,
+                                   100,
+                                   78,
+                                   -7,
+                                   7);
+
+  EEP_OccupancySingleXtal_ =
+      new TH2F("OccupancySingleXtal", "Occupancy single xtal clusters EEP;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEP_energySingleXtalHist_ = new TH1F("energy_SingleXtalClusters",
+                                       "Energy single xtal clusters EEP;Cluster Energy (GeV)",
+                                       numBins,
+                                       histRangeMin_,
+                                       200.0);
+
+  EEP_OccupancyExclusiveECAL_ = new TH2F(
+      "OccupancyAllEvents_ExclusiveECAL", "Occupancy all events Exclusive ECAL  EEP;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEP_OccupancyCoarseExclusiveECAL_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveECAL",
+                                               "Occupancy all events Coarse Exclusive ECAL EEP;ix;iy",
+                                               20,
+                                               0,
+                                               100,
+                                               20,
+                                               0,
+                                               100);
+  EEP_OccupancyECAL_ =
+      new TH2F("OccupancyAllEvents_ECAL", "Occupancy all events ECAL EEP;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEP_OccupancyCoarseECAL_ =
+      new TH2F("OccupancyAllEventsCoarse_ECAL", "Occupancy all events Coarse ECAL EEP;ix;iy", 20, 0, 100, 20, 0, 100);
+  EEP_FedsTimingHistECAL_ =
+      new TH1F("timeForAllFeds_ECAL", "timeForAllFeds ECAL EEP;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  EEP_FedsTimingTTHistECAL_ =
+      new TH3F("timeTTAllFEDs_ECAL",
+               "(ix,iy,time) for all FEDs (SM,TT binning) ECAL EEP;ix;iy;Relative Time (1 clock = 25ns)",
+               20,
+               0,
+               100,
+               20,
+               0,
+               100,
+               78,
+               -7,
+               7);
+
+  EEP_OccupancyExclusiveDT_ = new TH2F(
+      "OccupancyAllEvents_ExclusiveDT", "Occupancy all events Exclusive DT EEP;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEP_OccupancyCoarseExclusiveDT_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveDT",
+                                             "Occupancy all events Coarse Exclusive DT EEP;ix;iy",
+                                             20,
+                                             0,
+                                             100,
+                                             20,
+                                             0,
+                                             100);
+  EEP_OccupancyDT_ = new TH2F("OccupancyAllEvents_DT", "Occupancy all events DT EEP;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEP_OccupancyCoarseDT_ =
+      new TH2F("OccupancyAllEventsCoarse_DT", "Occupancy all events Coarse DT EEP;ix;iy", 20, 0, 100, 20, 0, 100);
+  EEP_FedsTimingHistDT_ =
+      new TH1F("timeForAllFeds_DT", "timeForAllFeds DT EEP;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  EEP_FedsTimingTTHistDT_ =
+      new TH3F("timeTTAllFEDs_DT",
+               "(ix,iy,time) for all FEDs (SM,TT binning) DT EEP;ix;iy;Relative Time (1 clock = 25ns)",
+               20,
+               0,
+               100,
+               20,
+               0,
+               100,
+               78,
+               -7,
+               7);
+
+  EEP_OccupancyExclusiveRPC_ = new TH2F(
+      "OccupancyAllEvents_ExclusiveRPC", "Occupancy all events Exclusive RPC EEP;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEP_OccupancyCoarseExclusiveRPC_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveRPC",
+                                              "Occupancy all events Coarse Exclusive RPC EEP;ix;iy",
+                                              20,
+                                              0,
+                                              100,
+                                              20,
+                                              0,
+                                              100);
+  EEP_OccupancyRPC_ =
+      new TH2F("OccupancyAllEvents_RPC", "Occupancy all events RPC EEP;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEP_OccupancyCoarseRPC_ =
+      new TH2F("OccupancyAllEventsCoarse_RPC", "Occupancy all events Coarse RPC EEP;ix;iy", 20, 0, 100, 20, 0, 100);
+  EEP_FedsTimingHistRPC_ =
+      new TH1F("timeForAllFeds_RPC", "timeForAllFeds RPC EEP;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  EEP_FedsTimingTTHistRPC_ =
+      new TH3F("timeTTAllFEDs_RPC",
+               "(ix,iy,time) for all FEDs (SM,TT binning) RPC EEP;ix;iy;Relative Time (1 clock = 25ns)",
+               20,
+               0,
+               100,
+               20,
+               0,
+               100,
+               78,
+               -7,
+               7);
+
+  EEP_OccupancyExclusiveCSC_ = new TH2F(
+      "OccupancyAllEvents_ExclusiveCSC", "Occupancy all events Exclusive CSC EEP;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEP_OccupancyCoarseExclusiveCSC_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveCSC",
+                                              "Occupancy all events Coarse Exclusive CSC EEP;ix;iy",
+                                              20,
+                                              0,
+                                              100,
+                                              20,
+                                              0,
+                                              100);
+  EEP_OccupancyCSC_ =
+      new TH2F("OccupancyAllEvents_CSC", "Occupancy all events CSC EEP;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEP_OccupancyCoarseCSC_ =
+      new TH2F("OccupancyAllEventsCoarse_CSC", "Occupancy all events Coarse CSC EEP;ix;iy", 20, 0, 100, 20, 0, 100);
+  EEP_FedsTimingHistCSC_ =
+      new TH1F("timeForAllFeds_CSC", "timeForAllFeds CSC EEP;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  EEP_FedsTimingTTHistCSC_ =
+      new TH3F("timeTTAllFEDs_CSC",
+               "(ix,iy,time) for all FEDs (SM,TT binning) CSC EEP;ix;iy;Relative Time (1 clock = 25ns)",
+               20,
+               0,
+               100,
+               20,
+               0,
+               100,
+               78,
+               -7,
+               7);
+
+  EEP_OccupancyExclusiveHCAL_ = new TH2F(
+      "OccupancyAllEvents_ExclusiveHCAL", "Occupancy all events Exclusive HCAL EEP;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEP_OccupancyCoarseExclusiveHCAL_ = new TH2F("OccupancyAllEventsCoarse_ExclusiveHCAL",
+                                               "Occupancy all events Coarse Exclusive HCAL EEP;ix;iy",
+                                               20,
+                                               0,
+                                               100,
+                                               20,
+                                               0,
+                                               100);
+  EEP_OccupancyHCAL_ =
+      new TH2F("OccupancyAllEvents_HCAL", "Occupancy all events HCAL EEP;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEP_OccupancyCoarseHCAL_ =
+      new TH2F("OccupancyAllEventsCoarse_HCAL", "Occupancy all events Coarse HCAL EEP;ix;iy", 20, 0, 100, 20, 0, 100);
+  EEP_FedsTimingHistHCAL_ =
+      new TH1F("timeForAllFeds_HCAL", "timeForAllFeds HCAL EEP;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  EEP_FedsTimingTTHistHCAL_ =
+      new TH3F("timeTTAllFEDs_HCAL",
+               "(ix,iy,time) for all FEDs (SM,TT binning) HCAL EEP;ix;iy;Relative Time (1 clock = 25ns)",
+               20,
+               0,
+               100,
+               20,
+               0,
+               100,
+               78,
+               -7,
+               7);
+
+  EEP_numberofBCinSC_ =
+      new TH1F("numberofBCinSC", "Number of Basic Clusters in Super Cluster EEP;Num Basic Clusters", 20, 0, 20);
+
+  EEP_triggerHist_ = new TH1F("triggerHist", "Trigger Number EEP", 5, 0, 5);
+  EEP_triggerHist_->GetXaxis()->SetBinLabel(1, "ECAL");
+  EEP_triggerHist_->GetXaxis()->SetBinLabel(2, "HCAL");
+  EEP_triggerHist_->GetXaxis()->SetBinLabel(3, "DT");
+  EEP_triggerHist_->GetXaxis()->SetBinLabel(4, "RPC");
+  EEP_triggerHist_->GetXaxis()->SetBinLabel(5, "CSC");
+
+  EEP_triggerExclusiveHist_ = new TH1F("triggerExclusiveHist", "Trigger Number (Mutually Exclusive) EEP", 5, 0, 5);
+  EEP_triggerExclusiveHist_->GetXaxis()->SetBinLabel(1, "ECAL");
+  EEP_triggerExclusiveHist_->GetXaxis()->SetBinLabel(2, "HCAL");
+  EEP_triggerExclusiveHist_->GetXaxis()->SetBinLabel(3, "DT");
+  EEP_triggerExclusiveHist_->GetXaxis()->SetBinLabel(4, "RPC");
+  EEP_triggerExclusiveHist_->GetXaxis()->SetBinLabel(5, "CSC");
+
+  EEP_NumXtalsInClusterHist_ =
+      new TH1F("NumXtalsInClusterAllHist", "Number of Xtals in Cluster EEP;NumXtals", 150, 0, 150);
+  EEP_numxtalsVsEnergy_ = new TH2F("NumXtalsVsEnergy",
+                                   "Number of Xtals in Cluster vs Energy EEP;Energy (GeV);Number of Xtals in Cluster",
+                                   numBins,
+                                   histRangeMin_,
+                                   10.0,
+                                   150,
+                                   0,
+                                   150);
+  EEP_numxtalsVsHighEnergy_ =
+      new TH2F("NumXtalsVsHighEnergy",
+               "Number of Xtals in Cluster vs Energy EEP;Energy (GeV);Number of Xtals in Cluster",
+               numBins,
+               histRangeMin_,
+               200.,
+               150,
+               0,
+               150);
+
+  EEP_OccupancyHighEnergy_ =
+      new TH2F("OccupancyHighEnergyEvents", "Occupancy high energy events EEP;ix;iy", 100, 0, 100, 100, 0, 100);
+  EEP_OccupancyHighEnergyCoarse_ = new TH2F(
+      "OccupancyHighEnergyEventsCoarse", "Occupancy high energy events Coarse EEP;ix;iy", 20, 0, 100, 20, 0, 100);
+
+  EEP_FedsNumXtalsInClusterHist_ =
+      new TH1F("NumActiveXtalsInClusterAllHist", "Number of active Xtals in Cluster EEP;NumXtals", 100, 0, 100);
 }
 
 // ------------ method called once each job just after ending the event loop  ------------
-void 
-EcalCosmicsHists::endJob()
-{
+void EcalCosmicsHists::endJob() {
   using namespace std;
   if (runInFileName_) {
-    fileName_ += "-"+intToString(runNum_)+".graph.root";
+    fileName_ += "-" + intToString(runNum_) + ".graph.root";
   } else {
     fileName_ += ".root";
   }
-  
-  TFile root_file_(fileName_.c_str() , "RECREATE");
-  
-  for(map<int,TH1F*>::const_iterator itr = FEDsAndHists_.begin();
-      itr != FEDsAndHists_.end(); ++itr) {
+
+  TFile root_file_(fileName_.c_str(), "RECREATE");
+
+  for (map<int, TH1F*>::const_iterator itr = FEDsAndHists_.begin(); itr != FEDsAndHists_.end(); ++itr) {
     string dir = fedMap_->getSliceFromFed(itr->first);
     TDirectory* FEDdir = gDirectory->mkdir(dir.c_str());
     FEDdir->cd();
-    
+
     TH1F* hist = itr->second;
-    if(hist!=nullptr)
+    if (hist != nullptr)
       hist->Write();
     else {
       cerr << "EcalCosmicsHists: Error: This shouldn't happen!" << endl;
     }
     // Write out timing hist
     hist = FEDsAndTimingHists_[itr->first];
-    if(hist!=nullptr)
+    if (hist != nullptr)
       hist->Write();
     else {
       cerr << "EcalCosmicsHists: Error: This shouldn't happen!" << endl;
     }
-    
+
     hist = FEDsAndFrequencyHists_[itr->first];
     hist->Write();
-    
+
     hist = FEDsAndiPhiProfileHists_[itr->first];
     hist->Write();
-    
+
     hist = FEDsAndiEtaProfileHists_[itr->first];
     hist->Write();
-    
+
     hist = FEDsAndE2Hists_[itr->first];
     hist->Write();
-    
+
     hist = FEDsAndenergyHists_[itr->first];
     hist->Write();
-    
+
     hist = FEDsAndNumXtalsInClusterHists_[itr->first];
     hist->Write();
-    
+
     TH2F* hist2 = FEDsAndTimingVsAmpHists_[itr->first];
     hist2->Write();
-    
+
     hist2 = FEDsAndTimingVsFreqHists_[itr->first];
     hist2->Write();
-    
+
     hist2 = FEDsAndE2vsE1Hists_[itr->first];
     hist2->Write();
-    
+
     hist2 = FEDsAndenergyvsE1Hists_[itr->first];
     hist2->Write();
-    
+
     hist2 = FEDsAndOccupancyHists_[itr->first];
     hist2->Write();
-    
+
     hist2 = FEDsAndTimingVsPhiHists_[itr->first];
     hist2->Write();
-    
+
     hist2 = FEDsAndTimingVsModuleHists_[itr->first];
     hist2->Write();
 
     //2d hist
-    map<int,TH2F*>::const_iterator itr2d;
+    map<int, TH2F*>::const_iterator itr2d;
     itr2d = FEDsAndDCCRuntypeVsBxHists_.find(itr->first);
-    if(itr2d != FEDsAndDCCRuntypeVsBxHists_.end())
-    {
+    if (itr2d != FEDsAndDCCRuntypeVsBxHists_.end()) {
       TH2F* hist2 = itr2d->second;
-      hist2->GetYaxis()->SetBinLabel(1,"COSMIC");
-      hist2->GetYaxis()->SetBinLabel(2,"BEAMH4");
-      hist2->GetYaxis()->SetBinLabel(3,"BEAMH2");
-      hist2->GetYaxis()->SetBinLabel(4,"MTCC");
-      hist2->GetYaxis()->SetBinLabel(5,"LASER_STD");
-      hist2->GetYaxis()->SetBinLabel(6,"LASER_POWER_SCAN");
-      hist2->GetYaxis()->SetBinLabel(7,"LASER_DELAY_SCAN");
-      hist2->GetYaxis()->SetBinLabel(8,"TESTPULSE_SCAN_MEM");
-      hist2->GetYaxis()->SetBinLabel(9,"TESTPULSE_MGPA");
-      hist2->GetYaxis()->SetBinLabel(10,"PEDESTAL_STD");
-      hist2->GetYaxis()->SetBinLabel(11,"PEDESTAL_OFFSET_SCAN");
-      hist2->GetYaxis()->SetBinLabel(12,"PEDESTAL_25NS_SCAN");
-      hist2->GetYaxis()->SetBinLabel(13,"LED_STD");
-      hist2->GetYaxis()->SetBinLabel(14,"PHYSICS_GLOBAL");
-      hist2->GetYaxis()->SetBinLabel(15,"COSMICS_GLOBAL");
-      hist2->GetYaxis()->SetBinLabel(16,"HALO_GLOBAL");
-      hist2->GetYaxis()->SetBinLabel(17,"LASER_GAP");
-      hist2->GetYaxis()->SetBinLabel(18,"TESTPULSE_GAP");
-      hist2->GetYaxis()->SetBinLabel(19,"PEDESTAL_GAP");
-      hist2->GetYaxis()->SetBinLabel(20,"LED_GAP");
-      hist2->GetYaxis()->SetBinLabel(21,"PHYSICS_LOCAL");
-      hist2->GetYaxis()->SetBinLabel(22,"COSMICS_LOCAL");
-      hist2->GetYaxis()->SetBinLabel(23,"HALO_LOCAL");
-      hist2->GetYaxis()->SetBinLabel(24,"CALIB_LOCAL");
+      hist2->GetYaxis()->SetBinLabel(1, "COSMIC");
+      hist2->GetYaxis()->SetBinLabel(2, "BEAMH4");
+      hist2->GetYaxis()->SetBinLabel(3, "BEAMH2");
+      hist2->GetYaxis()->SetBinLabel(4, "MTCC");
+      hist2->GetYaxis()->SetBinLabel(5, "LASER_STD");
+      hist2->GetYaxis()->SetBinLabel(6, "LASER_POWER_SCAN");
+      hist2->GetYaxis()->SetBinLabel(7, "LASER_DELAY_SCAN");
+      hist2->GetYaxis()->SetBinLabel(8, "TESTPULSE_SCAN_MEM");
+      hist2->GetYaxis()->SetBinLabel(9, "TESTPULSE_MGPA");
+      hist2->GetYaxis()->SetBinLabel(10, "PEDESTAL_STD");
+      hist2->GetYaxis()->SetBinLabel(11, "PEDESTAL_OFFSET_SCAN");
+      hist2->GetYaxis()->SetBinLabel(12, "PEDESTAL_25NS_SCAN");
+      hist2->GetYaxis()->SetBinLabel(13, "LED_STD");
+      hist2->GetYaxis()->SetBinLabel(14, "PHYSICS_GLOBAL");
+      hist2->GetYaxis()->SetBinLabel(15, "COSMICS_GLOBAL");
+      hist2->GetYaxis()->SetBinLabel(16, "HALO_GLOBAL");
+      hist2->GetYaxis()->SetBinLabel(17, "LASER_GAP");
+      hist2->GetYaxis()->SetBinLabel(18, "TESTPULSE_GAP");
+      hist2->GetYaxis()->SetBinLabel(19, "PEDESTAL_GAP");
+      hist2->GetYaxis()->SetBinLabel(20, "LED_GAP");
+      hist2->GetYaxis()->SetBinLabel(21, "PHYSICS_LOCAL");
+      hist2->GetYaxis()->SetBinLabel(22, "COSMICS_LOCAL");
+      hist2->GetYaxis()->SetBinLabel(23, "HALO_LOCAL");
+      hist2->GetYaxis()->SetBinLabel(24, "CALIB_LOCAL");
       hist2->Write();
     }
-    
+
     root_file_.cd();
   }
   allFedsHist_->Write();
@@ -2029,14 +2893,14 @@ EcalCosmicsHists::endJob()
   allFedsTimingLMHist_->Write();
   allFedsOccupancyHighEnergyHist_->Write();
 
-  numberofBCinSC_->Write();//SC
-  numberofBCinSCphi_->Write();//SC
-  TrueBCOccupancyCoarse_->Write();//BC
-  TrueBCOccupancy_->Write(); //BC
+  numberofBCinSC_->Write();         //SC
+  numberofBCinSCphi_->Write();      //SC
+  TrueBCOccupancyCoarse_->Write();  //BC
+  TrueBCOccupancy_->Write();        //BC
 
   numxtalsVsEnergy_->Write();
   numxtalsVsHighEnergy_->Write();
-  
+
   allOccupancyExclusiveECAL_->Write();
   allOccupancyCoarseExclusiveECAL_->Write();
   allOccupancyECAL_->Write();
@@ -2088,15 +2952,15 @@ EcalCosmicsHists::endJob()
   TDirectory* EEMinusDir = gDirectory->mkdir("EEMinus");
   EEMinusDir->cd();
   EEM_FedsSeedEnergyHist_->Write();
-  EEM_AllOccupancyCoarse_->Write(); 
-  EEM_AllOccupancy_->Write(); 
+  EEM_AllOccupancyCoarse_->Write();
+  EEM_AllOccupancy_->Write();
   EEM_FedsenergyHist_->Write();
   EEM_FedsenergyHighHist_->Write();
   EEM_FedsenergyOnlyHighHist_->Write();
   EEM_FedsE2Hist_->Write();
   EEM_FedsE2vsE1Hist_->Write();
   EEM_FedsenergyvsE1Hist_->Write();
-  EEM_FedsTimingHist_->Write();        
+  EEM_FedsTimingHist_->Write();
   EEM_numberofCosmicsHist_->Write();
   EEM_FedsTimingVsAmpHist_->Write();
   EEM_FedsTimingTTHist_->Write();
@@ -2146,15 +3010,15 @@ EcalCosmicsHists::endJob()
   TDirectory* EEPlusDir = gDirectory->mkdir("EEPlus");
   EEPlusDir->cd();
   EEP_FedsSeedEnergyHist_->Write();
-  EEP_AllOccupancyCoarse_->Write(); 
-  EEP_AllOccupancy_->Write(); 
+  EEP_AllOccupancyCoarse_->Write();
+  EEP_AllOccupancy_->Write();
   EEP_FedsenergyHist_->Write();
   EEP_FedsenergyHighHist_->Write();
   EEP_FedsenergyOnlyHighHist_->Write();
   EEP_FedsE2Hist_->Write();
   EEP_FedsE2vsE1Hist_->Write();
   EEP_FedsenergyvsE1Hist_->Write();
-  EEP_FedsTimingHist_->Write();        
+  EEP_FedsTimingHist_->Write();
   EEP_numberofCosmicsHist_->Write();
   EEP_FedsTimingVsAmpHist_->Write();
   EEP_FedsTimingTTHist_->Write();
@@ -2205,7 +3069,7 @@ EcalCosmicsHists::endJob()
   triggerExclusiveHist_->Write();
 
   NumXtalsInClusterHist_->Write();
-  
+
   numberofCosmicsHist_->Write();
   numberofCosmicsHistEB_->Write();
 
@@ -2214,7 +3078,7 @@ EcalCosmicsHists::endJob()
   numberofGoodEvtFreq_->Write();
   numberofCrossedEcalIdsHist_->Write();
 
-  runNumberHist_->SetBinContent(1,runNum_);
+  runNumberHist_->SetBinContent(1, runNum_);
   runNumberHist_->Write();
 
   deltaRHist_->Write();
@@ -2231,7 +3095,7 @@ EcalCosmicsHists::endJob()
   dccRuntypeErrorByFEDHist_->Write();
   dccErrorVsBxHist_->Write();
   dccRuntypeHist_->Write();
-  
+
   trackAssoc_muonsEcal_->Write();
 
   hcalEnergy_HBHE_->Write();
@@ -2243,7 +3107,7 @@ EcalCosmicsHists::endJob()
   highEnergyDir->cd();
   HighEnergy_NumXtal->Write();
   HighEnergy_NumXtalFedId->Write();
-  HighEnergy_NumXtaliphi->Write();  
+  HighEnergy_NumXtaliphi->Write();
   HighEnergy_energy3D->Write();
   HighEnergy_energyNumXtal->Write();
   HighEnergy_bestSeed->Write();
@@ -2272,27 +3136,27 @@ EcalCosmicsHists::endJob()
   allFedsFreqTimeVsPhiHist_->Write();
   allFedsFreqTimeVsPhiTTHist_->Write();
   allFedsFreqTimeVsEtaHist_->Write();
-  allFedsFreqTimeVsEtaTTHist_->Write(); 
+  allFedsFreqTimeVsEtaTTHist_->Write();
 
   root_file_.cd();
 
   root_file_.Close();
 
-  LogWarning("EcalCosmicsHists") << "---> Number of cosmic events: " << cosmicCounter_ << " in " << naiveEvtNum_ << " events.";
-  LogWarning("EcalCosmicsHists") << "---> Number of EB cosmic events: " << cosmicCounterEB_ << " in " << naiveEvtNum_ << " events.";
-  LogWarning("EcalCosmicsHists") << "---> Number of EE- cosmic events: " << cosmicCounterEEM_ << " in " << naiveEvtNum_ << " events.";
-  LogWarning("EcalCosmicsHists") << "---> Number of EE+ cosmic events: " << cosmicCounterEEP_ << " in " << naiveEvtNum_ << " events.";
+  LogWarning("EcalCosmicsHists") << "---> Number of cosmic events: " << cosmicCounter_ << " in " << naiveEvtNum_
+                                 << " events.";
+  LogWarning("EcalCosmicsHists") << "---> Number of EB cosmic events: " << cosmicCounterEB_ << " in " << naiveEvtNum_
+                                 << " events.";
+  LogWarning("EcalCosmicsHists") << "---> Number of EE- cosmic events: " << cosmicCounterEEM_ << " in " << naiveEvtNum_
+                                 << " events.";
+  LogWarning("EcalCosmicsHists") << "---> Number of EE+ cosmic events: " << cosmicCounterEEP_ << " in " << naiveEvtNum_
+                                 << " events.";
 
   //  LogWarning("EcalCosmicsHists") << "---> Number of top+bottom cosmic events: " << cosmicCounterTopBottom_ << " in " << cosmicCounter_ << " cosmics in " << naiveEvtNum_ << " events.";
-
 }
 
-
-std::string EcalCosmicsHists::intToString(int num)
-{
-    using namespace std;
-    ostringstream myStream;
-    myStream << num << flush;
-    return(myStream.str()); //returns the string form of the stringstream object
+std::string EcalCosmicsHists::intToString(int num) {
+  using namespace std;
+  ostringstream myStream;
+  myStream << num << flush;
+  return (myStream.str());  //returns the string form of the stringstream object
 }
-
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalCosmicsHists.h b/CaloOnlineTools/EcalTools/plugins/EcalCosmicsHists.h
index 2f9fee93c1d19..08873493370a3 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalCosmicsHists.h
+++ b/CaloOnlineTools/EcalTools/plugins/EcalCosmicsHists.h
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 //
-// Package:   EcalCosmicsHists 
-// Class:     EcalCosmicsHists 
-// 
+// Package:   EcalCosmicsHists
+// Class:     EcalCosmicsHists
+//
 /**\class EcalCosmicsHists EcalCosmicsHists.cc
 
  Description: <one line class summary>
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <vector>
@@ -52,7 +51,6 @@
 #include "TGraph.h"
 #include "TNtuple.h"
 
-
 // *** for TrackAssociation
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/Common/interface/Handle.h"
@@ -68,21 +66,20 @@
 //
 
 class EcalCosmicsHists : public edm::EDAnalyzer {
-   public:
-      explicit EcalCosmicsHists(const edm::ParameterSet&);
-      ~EcalCosmicsHists() override;
-
-
-   private:
-      void beginRun(edm::Run const &, edm::EventSetup const &) override ;
-      void analyze(edm::Event const &, edm::EventSetup const &) override;
-      void endJob() override ;
-      std::string intToString(int num);
-      void initHists(int);
-      std::vector<bool> determineTriggers(const edm::Event&, const edm::EventSetup& eventSetup);
+public:
+  explicit EcalCosmicsHists(const edm::ParameterSet&);
+  ~EcalCosmicsHists() override;
+
+private:
+  void beginRun(edm::Run const&, edm::EventSetup const&) override;
+  void analyze(edm::Event const&, edm::EventSetup const&) override;
+  void endJob() override;
+  std::string intToString(int num);
+  void initHists(int);
+  std::vector<bool> determineTriggers(const edm::Event&, const edm::EventSetup& eventSetup);
 
   // ----------member data ---------------------------
-  
+
   edm::InputTag ecalRawDataColl_;
   edm::InputTag ecalRecHitCollectionEB_;
   edm::InputTag ecalRecHitCollectionEE_;
@@ -90,7 +87,7 @@ class EcalCosmicsHists : public edm::EDAnalyzer {
   edm::InputTag endcapClusterCollection_;
   edm::InputTag l1GTReadoutRecTag_;
   edm::InputTag l1GMTReadoutRecTag_;
-  
+
   int runNum_;
   double histRangeMax_, histRangeMin_;
   double minTimingAmpEB_;
@@ -98,32 +95,32 @@ class EcalCosmicsHists : public edm::EDAnalyzer {
   double minRecHitAmpEB_;
   double minRecHitAmpEE_;
   double minHighEnergy_;
-  
-  double *ttEtaBins;
-  double *modEtaBins;
+
+  double* ttEtaBins;
+  double* modEtaBins;
   std::string fileName_;
   bool runInFileName_;
 
   double startTime_, runTimeLength_;
-  int numTimingBins_; 
-  
-  std::map<int,TH1F*> FEDsAndHists_;
-  std::map<int,TH1F*> FEDsAndE2Hists_;
-  std::map<int,TH1F*> FEDsAndenergyHists_;
-  std::map<int,TH1F*> FEDsAndTimingHists_;
-  std::map<int,TH1F*> FEDsAndFrequencyHists_;
-  std::map<int,TH1F*> FEDsAndiPhiProfileHists_;
-  std::map<int,TH1F*> FEDsAndNumXtalsInClusterHists_;
-  std::map<int,TH1F*> FEDsAndiEtaProfileHists_;
-  std::map<int,TH2F*> FEDsAndTimingVsFreqHists_;
-  std::map<int,TH2F*> FEDsAndTimingVsAmpHists_;
-  std::map<int,TH2F*> FEDsAndE2vsE1Hists_;
-  std::map<int,TH2F*> FEDsAndenergyvsE1Hists_;
-  std::map<int,TH2F*> FEDsAndOccupancyHists_;  
-  std::map<int,TH2F*> FEDsAndTimingVsPhiHists_;  
-  std::map<int,TH2F*> FEDsAndTimingVsEtaHists_;  
-  std::map<int,TH2F*> FEDsAndTimingVsModuleHists_;  
-  std::map<int,TH2F*> FEDsAndDCCRuntypeVsBxHists_;
+  int numTimingBins_;
+
+  std::map<int, TH1F*> FEDsAndHists_;
+  std::map<int, TH1F*> FEDsAndE2Hists_;
+  std::map<int, TH1F*> FEDsAndenergyHists_;
+  std::map<int, TH1F*> FEDsAndTimingHists_;
+  std::map<int, TH1F*> FEDsAndFrequencyHists_;
+  std::map<int, TH1F*> FEDsAndiPhiProfileHists_;
+  std::map<int, TH1F*> FEDsAndNumXtalsInClusterHists_;
+  std::map<int, TH1F*> FEDsAndiEtaProfileHists_;
+  std::map<int, TH2F*> FEDsAndTimingVsFreqHists_;
+  std::map<int, TH2F*> FEDsAndTimingVsAmpHists_;
+  std::map<int, TH2F*> FEDsAndE2vsE1Hists_;
+  std::map<int, TH2F*> FEDsAndenergyvsE1Hists_;
+  std::map<int, TH2F*> FEDsAndOccupancyHists_;
+  std::map<int, TH2F*> FEDsAndTimingVsPhiHists_;
+  std::map<int, TH2F*> FEDsAndTimingVsEtaHists_;
+  std::map<int, TH2F*> FEDsAndTimingVsModuleHists_;
+  std::map<int, TH2F*> FEDsAndDCCRuntypeVsBxHists_;
 
   TH1F* allFedsHist_;
   TH1F* allFedsE2Hist_;
@@ -143,8 +140,8 @@ class EcalCosmicsHists : public edm::EDAnalyzer {
   TH1F* numberofCosmicsHistEB_;
 
   //TH1F* numberofSCCosmicsHist_;//SC Num cosmics
-  TH1F* numberofBCinSC_;//SC Num cosmics
-  TH2F* numberofBCinSCphi_;//SC
+  TH1F* numberofBCinSC_;     //SC Num cosmics
+  TH2F* numberofBCinSCphi_;  //SC
 
   TH2F* TrueBCOccupancy_;
   TH2F* TrueBCOccupancyCoarse_;
@@ -154,10 +151,10 @@ class EcalCosmicsHists : public edm::EDAnalyzer {
 
   TH2F* allFedsE2vsE1Hist_;
   TH2F* allFedsenergyvsE1Hist_;
-  TH2F* allOccupancy_; //New file to do eta-phi occupancy
-  TH2F* TrueOccupancy_; //New file to do eta-phi occupancy
-  TH2F* allOccupancyCoarse_; //New file to do eta-phi occupancy
-  TH2F* TrueOccupancyCoarse_; //New file to do eta-phi occupancy
+  TH2F* allOccupancy_;         //New file to do eta-phi occupancy
+  TH2F* TrueOccupancy_;        //New file to do eta-phi occupancy
+  TH2F* allOccupancyCoarse_;   //New file to do eta-phi occupancy
+  TH2F* TrueOccupancyCoarse_;  //New file to do eta-phi occupancy
 
   // single xtal clusters
   TH2F* allOccupancySingleXtal_;
@@ -180,58 +177,58 @@ class EcalCosmicsHists : public edm::EDAnalyzer {
   TH1F* allFedsTimingEbpBottomHist_;
   TH1F* allFedsTimingEbmBottomHist_;
 
-  TH2F* allOccupancyECAL_; 
-  TH2F* allOccupancyCoarseECAL_; 
-  TH2F* allOccupancyExclusiveECAL_; 
-  TH2F* allOccupancyCoarseExclusiveECAL_; 
+  TH2F* allOccupancyECAL_;
+  TH2F* allOccupancyCoarseECAL_;
+  TH2F* allOccupancyExclusiveECAL_;
+  TH2F* allOccupancyCoarseExclusiveECAL_;
   TH1F* allFedsTimingHistECAL_;
   TH3F* allFedsTimingPhiEtaHistECAL_;
   TH3F* allFedsTimingTTHistECAL_;
   TH2F* allFedsTimingLMHistECAL_;
 
-  TH2F* allOccupancyDT_; 
-  TH2F* allOccupancyCoarseDT_; 
-  TH2F* allOccupancyExclusiveDT_; 
-  TH2F* allOccupancyCoarseExclusiveDT_; 
+  TH2F* allOccupancyDT_;
+  TH2F* allOccupancyCoarseDT_;
+  TH2F* allOccupancyExclusiveDT_;
+  TH2F* allOccupancyCoarseExclusiveDT_;
   TH1F* allFedsTimingHistDT_;
   TH3F* allFedsTimingPhiEtaHistDT_;
   TH3F* allFedsTimingTTHistDT_;
   TH2F* allFedsTimingLMHistDT_;
 
-  TH2F* allOccupancyRPC_; 
-  TH2F* allOccupancyCoarseRPC_; 
-  TH2F* allOccupancyExclusiveRPC_; 
-  TH2F* allOccupancyCoarseExclusiveRPC_; 
+  TH2F* allOccupancyRPC_;
+  TH2F* allOccupancyCoarseRPC_;
+  TH2F* allOccupancyExclusiveRPC_;
+  TH2F* allOccupancyCoarseExclusiveRPC_;
   TH1F* allFedsTimingHistRPC_;
   TH3F* allFedsTimingPhiEtaHistRPC_;
   TH3F* allFedsTimingTTHistRPC_;
   TH2F* allFedsTimingLMHistRPC_;
 
-  TH2F* allOccupancyCSC_; 
-  TH2F* allOccupancyCoarseCSC_; 
-  TH2F* allOccupancyExclusiveCSC_; 
-  TH2F* allOccupancyCoarseExclusiveCSC_; 
+  TH2F* allOccupancyCSC_;
+  TH2F* allOccupancyCoarseCSC_;
+  TH2F* allOccupancyExclusiveCSC_;
+  TH2F* allOccupancyCoarseExclusiveCSC_;
   TH1F* allFedsTimingHistCSC_;
   TH3F* allFedsTimingPhiEtaHistCSC_;
   TH3F* allFedsTimingTTHistCSC_;
   TH2F* allFedsTimingLMHistCSC_;
 
-  TH2F* allOccupancyHCAL_; 
-  TH2F* allOccupancyCoarseHCAL_; 
-  TH2F* allOccupancyExclusiveHCAL_; 
-  TH2F* allOccupancyCoarseExclusiveHCAL_; 
+  TH2F* allOccupancyHCAL_;
+  TH2F* allOccupancyCoarseHCAL_;
+  TH2F* allOccupancyExclusiveHCAL_;
+  TH2F* allOccupancyCoarseExclusiveHCAL_;
   TH1F* allFedsTimingHistHCAL_;
   TH3F* allFedsTimingPhiEtaHistHCAL_;
   TH3F* allFedsTimingTTHistHCAL_;
   TH2F* allFedsTimingLMHistHCAL_;
 
   TH1F* allFedsTimingHistEcalMuon_;
-  
+
   TH1F* triggerHist_;
   TH1F* triggerExclusiveHist_;
 
-  TH2F* allOccupancyHighEnergy_; 
-  TH2F* allOccupancyHighEnergyCoarse_; 
+  TH2F* allOccupancyHighEnergy_;
+  TH2F* allOccupancyHighEnergyCoarse_;
   TH3F* allFedsOccupancyHighEnergyHist_;
 
   TH1F* runNumberHist_;
@@ -251,7 +248,7 @@ class EcalCosmicsHists : public edm::EDAnalyzer {
   TH1F* dccRuntypeErrorByFEDHist_;
   TH1F* dccRuntypeHist_;
   TH2F* dccErrorVsBxHist_;
-  
+
   // track association
   TH2F* trackAssoc_muonsEcal_;
   TrackDetectorAssociator trackAssociator_;
@@ -263,10 +260,10 @@ class EcalCosmicsHists : public edm::EDAnalyzer {
   int cosmicCounterTopBottom_;
 
   // hcal energy
-  TH1F * hcalEnergy_HBHE_;
-  TH1F * hcalEnergy_HF_;
-  TH1F * hcalEnergy_HO_;
-  TH2F * hcalHEHBecalEB_;
+  TH1F* hcalEnergy_HBHE_;
+  TH1F* hcalEnergy_HF_;
+  TH1F* hcalEnergy_HO_;
+  TH2F* hcalHEHBecalEB_;
 
   // high energy analysis (inherited from serena)
   TH1F* HighEnergy_NumXtal;
@@ -296,14 +293,14 @@ class EcalCosmicsHists : public edm::EDAnalyzer {
   TH3F* HighEnergy_0tracks_occu3DXtal;
   TH3F* HighEnergy_1tracks_occu3DXtal;
   TH3F* HighEnergy_2tracks_occu3DXtal;
-  
+
   //for timestamp information
   TH1F* allFedsFreqTimeHist_;
   TH2F* allFedsFreqTimeVsPhiHist_;
   TH2F* allFedsFreqTimeVsPhiTTHist_;
   TH2F* allFedsFreqTimeVsEtaHist_;
   TH2F* allFedsFreqTimeVsEtaTTHist_;
-  
+
   // Plots for EE
   TH2F* EEP_AllOccupancyCoarse_;
   TH2F* EEP_AllOccupancy_;
@@ -326,50 +323,50 @@ class EcalCosmicsHists : public edm::EDAnalyzer {
   TH2F* EEP_OccupancySingleXtal_;
   TH1F* EEP_energySingleXtalHist_;
 
-  TH1F* EEP_FedsTimingHist_;        
+  TH1F* EEP_FedsTimingHist_;
   TH2F* EEP_FedsTimingVsAmpHist_;
   TH3F* EEP_FedsTimingTTHist_;
 
-  TH2F* EEP_OccupancyECAL_; 
-  TH2F* EEP_OccupancyCoarseECAL_; 
-  TH2F* EEP_OccupancyExclusiveECAL_; 
-  TH2F* EEP_OccupancyCoarseExclusiveECAL_; 
+  TH2F* EEP_OccupancyECAL_;
+  TH2F* EEP_OccupancyCoarseECAL_;
+  TH2F* EEP_OccupancyExclusiveECAL_;
+  TH2F* EEP_OccupancyCoarseExclusiveECAL_;
   TH1F* EEP_FedsTimingHistECAL_;
   TH3F* EEP_FedsTimingTTHistECAL_;
 
-  TH2F* EEP_OccupancyDT_; 
-  TH2F* EEP_OccupancyCoarseDT_; 
-  TH2F* EEP_OccupancyExclusiveDT_; 
-  TH2F* EEP_OccupancyCoarseExclusiveDT_; 
+  TH2F* EEP_OccupancyDT_;
+  TH2F* EEP_OccupancyCoarseDT_;
+  TH2F* EEP_OccupancyExclusiveDT_;
+  TH2F* EEP_OccupancyCoarseExclusiveDT_;
   TH1F* EEP_FedsTimingHistDT_;
   TH3F* EEP_FedsTimingTTHistDT_;
 
-  TH2F* EEP_OccupancyRPC_; 
-  TH2F* EEP_OccupancyCoarseRPC_; 
-  TH2F* EEP_OccupancyExclusiveRPC_; 
-  TH2F* EEP_OccupancyCoarseExclusiveRPC_; 
+  TH2F* EEP_OccupancyRPC_;
+  TH2F* EEP_OccupancyCoarseRPC_;
+  TH2F* EEP_OccupancyExclusiveRPC_;
+  TH2F* EEP_OccupancyCoarseExclusiveRPC_;
   TH1F* EEP_FedsTimingHistRPC_;
   TH3F* EEP_FedsTimingTTHistRPC_;
 
-  TH2F* EEP_OccupancyCSC_; 
-  TH2F* EEP_OccupancyCoarseCSC_; 
-  TH2F* EEP_OccupancyExclusiveCSC_; 
-  TH2F* EEP_OccupancyCoarseExclusiveCSC_; 
+  TH2F* EEP_OccupancyCSC_;
+  TH2F* EEP_OccupancyCoarseCSC_;
+  TH2F* EEP_OccupancyExclusiveCSC_;
+  TH2F* EEP_OccupancyCoarseExclusiveCSC_;
   TH1F* EEP_FedsTimingHistCSC_;
   TH3F* EEP_FedsTimingTTHistCSC_;
 
-  TH2F* EEP_OccupancyHCAL_; 
-  TH2F* EEP_OccupancyCoarseHCAL_; 
-  TH2F* EEP_OccupancyExclusiveHCAL_; 
-  TH2F* EEP_OccupancyCoarseExclusiveHCAL_; 
+  TH2F* EEP_OccupancyHCAL_;
+  TH2F* EEP_OccupancyCoarseHCAL_;
+  TH2F* EEP_OccupancyExclusiveHCAL_;
+  TH2F* EEP_OccupancyCoarseExclusiveHCAL_;
   TH1F* EEP_FedsTimingHistHCAL_;
   TH3F* EEP_FedsTimingTTHistHCAL_;
 
   TH1F* EEP_triggerHist_;
   TH1F* EEP_triggerExclusiveHist_;
 
-  TH2F* EEP_OccupancyHighEnergy_; 
-  TH2F* EEP_OccupancyHighEnergyCoarse_; 
+  TH2F* EEP_OccupancyHighEnergy_;
+  TH2F* EEP_OccupancyHighEnergyCoarse_;
 
   // EE-
   TH2F* EEM_AllOccupancyCoarse_;
@@ -393,56 +390,56 @@ class EcalCosmicsHists : public edm::EDAnalyzer {
   TH2F* EEM_OccupancySingleXtal_;
   TH1F* EEM_energySingleXtalHist_;
 
-  TH1F* EEM_FedsTimingHist_;        
+  TH1F* EEM_FedsTimingHist_;
   TH2F* EEM_FedsTimingVsAmpHist_;
   TH3F* EEM_FedsTimingTTHist_;
 
-  TH2F* EEM_OccupancyECAL_; 
-  TH2F* EEM_OccupancyCoarseECAL_; 
-  TH2F* EEM_OccupancyExclusiveECAL_; 
-  TH2F* EEM_OccupancyCoarseExclusiveECAL_; 
+  TH2F* EEM_OccupancyECAL_;
+  TH2F* EEM_OccupancyCoarseECAL_;
+  TH2F* EEM_OccupancyExclusiveECAL_;
+  TH2F* EEM_OccupancyCoarseExclusiveECAL_;
   TH1F* EEM_FedsTimingHistECAL_;
   TH3F* EEM_FedsTimingTTHistECAL_;
 
-  TH2F* EEM_OccupancyDT_; 
-  TH2F* EEM_OccupancyCoarseDT_; 
-  TH2F* EEM_OccupancyExclusiveDT_; 
-  TH2F* EEM_OccupancyCoarseExclusiveDT_; 
+  TH2F* EEM_OccupancyDT_;
+  TH2F* EEM_OccupancyCoarseDT_;
+  TH2F* EEM_OccupancyExclusiveDT_;
+  TH2F* EEM_OccupancyCoarseExclusiveDT_;
   TH1F* EEM_FedsTimingHistDT_;
   TH3F* EEM_FedsTimingTTHistDT_;
 
-  TH2F* EEM_OccupancyRPC_; 
-  TH2F* EEM_OccupancyCoarseRPC_; 
-  TH2F* EEM_OccupancyExclusiveRPC_; 
-  TH2F* EEM_OccupancyCoarseExclusiveRPC_; 
+  TH2F* EEM_OccupancyRPC_;
+  TH2F* EEM_OccupancyCoarseRPC_;
+  TH2F* EEM_OccupancyExclusiveRPC_;
+  TH2F* EEM_OccupancyCoarseExclusiveRPC_;
   TH1F* EEM_FedsTimingHistRPC_;
   TH3F* EEM_FedsTimingTTHistRPC_;
 
-  TH2F* EEM_OccupancyCSC_; 
-  TH2F* EEM_OccupancyCoarseCSC_; 
-  TH2F* EEM_OccupancyExclusiveCSC_; 
-  TH2F* EEM_OccupancyCoarseExclusiveCSC_; 
+  TH2F* EEM_OccupancyCSC_;
+  TH2F* EEM_OccupancyCoarseCSC_;
+  TH2F* EEM_OccupancyExclusiveCSC_;
+  TH2F* EEM_OccupancyCoarseExclusiveCSC_;
   TH1F* EEM_FedsTimingHistCSC_;
   TH3F* EEM_FedsTimingTTHistCSC_;
 
-  TH2F* EEM_OccupancyHCAL_; 
-  TH2F* EEM_OccupancyCoarseHCAL_; 
-  TH2F* EEM_OccupancyExclusiveHCAL_; 
-  TH2F* EEM_OccupancyCoarseExclusiveHCAL_; 
+  TH2F* EEM_OccupancyHCAL_;
+  TH2F* EEM_OccupancyCoarseHCAL_;
+  TH2F* EEM_OccupancyExclusiveHCAL_;
+  TH2F* EEM_OccupancyCoarseExclusiveHCAL_;
   TH1F* EEM_FedsTimingHistHCAL_;
   TH3F* EEM_FedsTimingTTHistHCAL_;
-  
+
   TH1F* EEM_triggerHist_;
   TH1F* EEM_triggerExclusiveHist_;
 
-  TH2F* EEM_OccupancyHighEnergy_; 
-  TH2F* EEM_OccupancyHighEnergyCoarse_; 
+  TH2F* EEM_OccupancyHighEnergy_;
+  TH2F* EEM_OccupancyHighEnergyCoarse_;
 
   EcalFedMap* fedMap_;
 
   TFile* file;
-  
-  int naiveEvtNum_; 
+
+  int naiveEvtNum_;
   int cosmicCounter_;
   int cosmicCounterEB_;
   int cosmicCounterEEP_;
@@ -452,5 +449,4 @@ class EcalCosmicsHists : public edm::EDAnalyzer {
   std::vector<std::string> l1Names_;
 
   const EcalElectronicsMapping* ecalElectronicsMap_;
-
 };
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalDCCHeaderDisplay.cc b/CaloOnlineTools/EcalTools/plugins/EcalDCCHeaderDisplay.cc
index 182cd93c9988a..7eccdfce7eaf1 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalDCCHeaderDisplay.cc
+++ b/CaloOnlineTools/EcalTools/plugins/EcalDCCHeaderDisplay.cc
@@ -9,77 +9,74 @@
 
 #include "CaloOnlineTools/EcalTools/plugins/EcalDCCHeaderDisplay.h"
 
-EcalDCCHeaderDisplay::EcalDCCHeaderDisplay(const edm::ParameterSet& iConfig){
+EcalDCCHeaderDisplay::EcalDCCHeaderDisplay(const edm::ParameterSet& iConfig) {
   EcalDCCHeaderCollection_ = iConfig.getParameter<edm::InputTag>("EcalDCCHeaderCollection");
 }
 
-
-void EcalDCCHeaderDisplay::analyze( const edm::Event & e, const  edm::EventSetup& c){
-    
+void EcalDCCHeaderDisplay::analyze(const edm::Event& e, const edm::EventSetup& c) {
   edm::Handle<EcalRawDataCollection> DCCHeaders;
   e.getByLabel(EcalDCCHeaderCollection_, DCCHeaders);
-    
 
-  std::cout << "\n\n ^^^^^^^^^^^^^^^^^^ [EcalDCCHeaderDisplay]  DCCHeaders collection size " << DCCHeaders->size() << std::endl;
-  std::cout << "          [EcalDCCHeaderDisplay]  the Header(s)\n"  << std::endl;
-  //short dumpConter =0;      
+  std::cout << "\n\n ^^^^^^^^^^^^^^^^^^ [EcalDCCHeaderDisplay]  DCCHeaders collection size " << DCCHeaders->size()
+            << std::endl;
+  std::cout << "          [EcalDCCHeaderDisplay]  the Header(s)\n" << std::endl;
+  //short dumpConter =0;
 
-  for ( EcalRawDataCollection::const_iterator headerItr= DCCHeaders->begin();headerItr != DCCHeaders->end(); 
-	++headerItr ) {
-    //      int nevt =headerItr->getLV1(); 
+  for (EcalRawDataCollection::const_iterator headerItr = DCCHeaders->begin(); headerItr != DCCHeaders->end();
+       ++headerItr) {
+    //      int nevt =headerItr->getLV1();
     bool skip = false;
 
-    if(skip){continue;}
-    std::cout<<"###################################################################### \n";
-    std::cout << "FedId: "<< headerItr->fedId() <<"\n";
-      
-    std::cout << "DCCErrors: "<<headerItr->getDCCErrors()<<"\n";
-    std::cout<<"Run Number: "<<headerItr->getRunNumber()<<"\n";
-    std::cout<<"Event number (LV1): "<<headerItr->getLV1()<<"\n";
-    std::cout<<"Orbit: "<<headerItr->getOrbit()<<"\n";
-    std::cout<<"BX: "<<headerItr->getBX()<<"\n";
-    std::cout<<"TRIGGER TYPE: "<< headerItr->getBasicTriggerType()<<"\n";
-      
-    std::cout<<"RUNTYPE: "<< headerItr->getRunType()<<"\n";
-    std::cout<<"Half: "<<headerItr->getRtHalf()<<"\n";
-    std::cout<<"DCCIdInTCCCommand: "<<headerItr->getDccInTCCCommand()<<"\n";
-    std::cout<<"MGPA gain: "<<headerItr->getMgpaGain()<<"\n";
-    std::cout<<"MEM gain: "<<headerItr->getMemGain()<<"\n";
+    if (skip) {
+      continue;
+    }
+    std::cout << "###################################################################### \n";
+    std::cout << "FedId: " << headerItr->fedId() << "\n";
+
+    std::cout << "DCCErrors: " << headerItr->getDCCErrors() << "\n";
+    std::cout << "Run Number: " << headerItr->getRunNumber() << "\n";
+    std::cout << "Event number (LV1): " << headerItr->getLV1() << "\n";
+    std::cout << "Orbit: " << headerItr->getOrbit() << "\n";
+    std::cout << "BX: " << headerItr->getBX() << "\n";
+    std::cout << "TRIGGER TYPE: " << headerItr->getBasicTriggerType() << "\n";
+
+    std::cout << "RUNTYPE: " << headerItr->getRunType() << "\n";
+    std::cout << "Half: " << headerItr->getRtHalf() << "\n";
+    std::cout << "DCCIdInTCCCommand: " << headerItr->getDccInTCCCommand() << "\n";
+    std::cout << "MGPA gain: " << headerItr->getMgpaGain() << "\n";
+    std::cout << "MEM gain: " << headerItr->getMemGain() << "\n";
     EcalDCCHeaderBlock::EcalDCCEventSettings settings = headerItr->getEventSettings();
-    std::cout<<"LaserPower: "<<  settings.LaserPower<<"\n";
-    std::cout <<"LAserFilter: "<<settings.LaserFilter<<"\n";
-    std::cout<<"Wavelenght: "<<settings.wavelength<<"\n";
-    std::cout<<"delay: "<<settings.delay<<"\n";
-    std::cout<<"MEM Vinj: "<< settings.MEMVinj<<"\n";
-    std::cout<<"MGPA content: "<<settings.mgpa_content<<"\n";
-    std::cout<<"Ped offset dac: "<<settings.ped_offset<<"\n";
+    std::cout << "LaserPower: " << settings.LaserPower << "\n";
+    std::cout << "LAserFilter: " << settings.LaserFilter << "\n";
+    std::cout << "Wavelenght: " << settings.wavelength << "\n";
+    std::cout << "delay: " << settings.delay << "\n";
+    std::cout << "MEM Vinj: " << settings.MEMVinj << "\n";
+    std::cout << "MGPA content: " << settings.mgpa_content << "\n";
+    std::cout << "Ped offset dac: " << settings.ped_offset << "\n";
 
-    std::cout<<"Selective Readout: "<<headerItr->getSelectiveReadout()<<"\n";
-    std::cout<<"ZS: "<<headerItr->getZeroSuppression()<<"\n";
-    std::cout <<"TZS: "<<headerItr->getTestZeroSuppression()<<"\n";
-    std::cout<<"SRStatus: "<<headerItr->getSrpStatus()<<"\n";
+    std::cout << "Selective Readout: " << headerItr->getSelectiveReadout() << "\n";
+    std::cout << "ZS: " << headerItr->getZeroSuppression() << "\n";
+    std::cout << "TZS: " << headerItr->getTestZeroSuppression() << "\n";
+    std::cout << "SRStatus: " << headerItr->getSrpStatus() << "\n";
 
     std::vector<short> TCCStatus = headerItr->getTccStatus();
-    std::cout<<"TCC Status size: "<<TCCStatus.size()<<std::endl;
-    std::cout<<"TCC Status: ";
-    for(unsigned u =0;u<TCCStatus.size();u++){
-      std::cout<<TCCStatus[u]<<" ";
+    std::cout << "TCC Status size: " << TCCStatus.size() << std::endl;
+    std::cout << "TCC Status: ";
+    for (unsigned u = 0; u < TCCStatus.size(); u++) {
+      std::cout << TCCStatus[u] << " ";
     }
-    std::cout<<std::endl;
-      
+    std::cout << std::endl;
+
     std::vector<short> TTStatus = headerItr->getFEStatus();
-    std::cout<<"TT Status size: "<<TTStatus.size()<<std::endl;
-    std::cout<<"TT Statuses: ";
-    for(unsigned u =0;u<TTStatus.size();u++){
-      if ( !(u%14) ) std::cout<<std::endl; // TODO: add space after first six in a row
-      std::cout<<TTStatus[u]<<" ";
+    std::cout << "TT Status size: " << TTStatus.size() << std::endl;
+    std::cout << "TT Statuses: ";
+    for (unsigned u = 0; u < TTStatus.size(); u++) {
+      if (!(u % 14))
+        std::cout << std::endl;  // TODO: add space after first six in a row
+      std::cout << TTStatus[u] << " ";
     }
-    std::cout<<std::endl;
-    std::cout<<"######################################################################"<<std::endl;;
-
-  }	
-     
-} 
-
-
-
+    std::cout << std::endl;
+    std::cout << "######################################################################" << std::endl;
+    ;
+  }
+}
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalDCCHeaderDisplay.h b/CaloOnlineTools/EcalTools/plugins/EcalDCCHeaderDisplay.h
index 365b1d135ad4a..792b7e02a4605 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalDCCHeaderDisplay.h
+++ b/CaloOnlineTools/EcalTools/plugins/EcalDCCHeaderDisplay.h
@@ -15,19 +15,13 @@
 #include <iostream>
 #include <vector>
 
-
-
-class EcalDCCHeaderDisplay: public edm::EDAnalyzer{
-  
+class EcalDCCHeaderDisplay : public edm::EDAnalyzer {
 public:
   EcalDCCHeaderDisplay(const edm::ParameterSet& ps);
-  
-protected:
 
-  void analyze( const edm::Event & e, const  edm::EventSetup& c) override;
+protected:
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
 
 private:
   edm::InputTag EcalDCCHeaderCollection_;
-
 };
-
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalDigiDisplay.cc b/CaloOnlineTools/EcalTools/plugins/EcalDigiDisplay.cc
index 49ce4a99ca936..d9ba84b8ba0ef 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalDigiDisplay.cc
+++ b/CaloOnlineTools/EcalTools/plugins/EcalDigiDisplay.cc
@@ -31,120 +31,119 @@
 
 //==========================================================================
 EcalDigiDisplay::EcalDigiDisplay(const edm::ParameterSet& ps) {
-//=========================================================================
-  
+  //=========================================================================
+
   ebDigiCollection_ = ps.getParameter<std::string>("ebDigiCollection");
   eeDigiCollection_ = ps.getParameter<std::string>("eeDigiCollection");
-  digiProducer_     = ps.getParameter<std::string>("digiProducer");
+  digiProducer_ = ps.getParameter<std::string>("digiProducer");
 
   requestedFeds_ = ps.getUntrackedParameter<std::vector<int> >("requestedFeds");
-  requestedEbs_  = ps.getUntrackedParameter<std::vector<std::string> >("requestedEbs");
+  requestedEbs_ = ps.getUntrackedParameter<std::vector<std::string> >("requestedEbs");
+
+  cryDigi = ps.getUntrackedParameter<bool>("cryDigi");
+  ttDigi = ps.getUntrackedParameter<bool>("ttDigi");
+  pnDigi = ps.getUntrackedParameter<bool>("pnDigi");
 
-  cryDigi       = ps.getUntrackedParameter<bool>("cryDigi");
-  ttDigi        = ps.getUntrackedParameter<bool>("ttDigi");
-  pnDigi      = ps.getUntrackedParameter<bool>("pnDigi");
-   
-  mode           = ps.getUntrackedParameter<int>("mode");
-  listChannels   = ps.getUntrackedParameter<std::vector<int> >("listChannels");
-  listTowers     = ps.getUntrackedParameter<std::vector<int> >("listTowers");
-  listPns        = ps.getUntrackedParameter<std::vector<int> >("listPns");
+  mode = ps.getUntrackedParameter<int>("mode");
+  listChannels = ps.getUntrackedParameter<std::vector<int> >("listChannels");
+  listTowers = ps.getUntrackedParameter<std::vector<int> >("listTowers");
+  listPns = ps.getUntrackedParameter<std::vector<int> >("listPns");
 
   std::vector<int> listDefaults;
   listDefaults.push_back(-1);
-  requestedFeds_ = ps.getUntrackedParameter<std::vector<int> >("requestedFeds",listDefaults);
+  requestedFeds_ = ps.getUntrackedParameter<std::vector<int> >("requestedFeds", listDefaults);
   bool fedIsGiven = false;
-  
+
   std::vector<std::string> ebDefaults;
   ebDefaults.push_back("none");
-  requestedEbs_  = ps.getUntrackedParameter<std::vector<std::string> >("requestedEbs",ebDefaults);
+  requestedEbs_ = ps.getUntrackedParameter<std::vector<std::string> >("requestedEbs", ebDefaults);
   // FEDs and EBs
-  if ( requestedFeds_[0] != -1 ) {
+  if (requestedFeds_[0] != -1) {
     edm::LogInfo("EcalDigiDisplay") << "FED id is given! Goining to beginRun! ";
     fedIsGiven = true;
-  }else {
-    if ( requestedEbs_[0] !="none" ) {
+  } else {
+    if (requestedEbs_[0] != "none") {
       //EB id is given and convert to FED id
       requestedFeds_.clear();
       fedMap = new EcalFedMap();
-      for (std::vector<std::string>::const_iterator ebItr = requestedEbs_.begin(); 
-	   ebItr!= requestedEbs_.end();  ++ebItr) {
-	requestedFeds_.push_back(fedMap->getFedFromSlice(*ebItr));
+      for (std::vector<std::string>::const_iterator ebItr = requestedEbs_.begin(); ebItr != requestedEbs_.end();
+           ++ebItr) {
+        requestedFeds_.push_back(fedMap->getFedFromSlice(*ebItr));
       }
       delete fedMap;
     } else {
       //Select all FEDs in the Event
-      for ( int i=601; i<655; ++i){
-	requestedFeds_.push_back(i);
+      for (int i = 601; i < 655; ++i) {
+        requestedFeds_.push_back(i);
       }
     }
   }
 
   //Channel list
-  listChannels = ps.getUntrackedParameter<std::vector<int> >("listChannels",listDefaults);
+  listChannels = ps.getUntrackedParameter<std::vector<int> >("listChannels", listDefaults);
   //Tower list
-  listTowers     = ps.getUntrackedParameter<std::vector<int> >("listTowers", listDefaults);
-  
+  listTowers = ps.getUntrackedParameter<std::vector<int> >("listTowers", listDefaults);
+
   //Consistancy checks:
   std::vector<int>::iterator fedIter;
   std::vector<int>::iterator intIter;
   inputIsOk = true;
 
-  if ( fedIsGiven ) {
-    for ( fedIter = requestedFeds_.begin(); fedIter!=requestedFeds_.end(); ++fedIter) {  
-      if ( (*fedIter) < 601 || (*fedIter) > 655 ) {
-	edm::LogError("EcalDigiDisplay") << " FED value: " << (*fedIter) << " found in requetsedFeds. "
-					 << " Valid range is 601-654. Returning.";
-	inputIsOk = false;
-	return;
-      }//Loop over requetsed FEDS
-    } 
+  if (fedIsGiven) {
+    for (fedIter = requestedFeds_.begin(); fedIter != requestedFeds_.end(); ++fedIter) {
+      if ((*fedIter) < 601 || (*fedIter) > 655) {
+        edm::LogError("EcalDigiDisplay") << " FED value: " << (*fedIter) << " found in requetsedFeds. "
+                                         << " Valid range is 601-654. Returning.";
+        inputIsOk = false;
+        return;
+      }  //Loop over requetsed FEDS
+    }
   }
-  bool barrelSM  = false;  
+  bool barrelSM = false;
   //Loop over and Check if Barrel SM is picked up
-  for (fedIter = requestedFeds_.begin(); fedIter!=requestedFeds_.end(); ++fedIter) {
-    if ( (*fedIter) > 609 && (*fedIter) < 646 && inputIsOk )      // if EB SM is being picked up
+  for (fedIter = requestedFeds_.begin(); fedIter != requestedFeds_.end(); ++fedIter) {
+    if ((*fedIter) > 609 && (*fedIter) < 646 && inputIsOk)  // if EB SM is being picked up
       barrelSM = true;
   }
-  
-  if ( barrelSM ) {
-    if ( cryDigi ) {
-    // Check with channels in Barrel
-      for (intIter = listChannels.begin(); intIter != listChannels.end(); intIter++)  {  
-	if ( ((*intIter) < 1) ||  (1700 < (*intIter)) )       {  
-	  edm::LogError("EcalDigiDisplay") << " ic value: " << (*intIter) << " found in listChannels. "
-					   << " Valid range is 1-1700. Returning.";
-	  inputIsOk = false;
-	  return;
-	}
+
+  if (barrelSM) {
+    if (cryDigi) {
+      // Check with channels in Barrel
+      for (intIter = listChannels.begin(); intIter != listChannels.end(); intIter++) {
+        if (((*intIter) < 1) || (1700 < (*intIter))) {
+          edm::LogError("EcalDigiDisplay") << " ic value: " << (*intIter) << " found in listChannels. "
+                                           << " Valid range is 1-1700. Returning.";
+          inputIsOk = false;
+          return;
+        }
       }
     }
     //Check with Towers in Barrel
-    if ( ttDigi ) {
+    if (ttDigi) {
       for (intIter = listTowers.begin(); intIter != listTowers.end(); intIter++) {
-	
-	if ( ((*intIter) < 1) ||  (70 < (*intIter)) )       {  
-	  edm::LogError("EcalDigiDisplay") << " TT value: " << (*intIter) << " found in listTowers. "
-					   << " Valid range for EB SM is 1-70. Returning.";
-	  inputIsOk = false;
-	  return;
-	}
+        if (((*intIter) < 1) || (70 < (*intIter))) {
+          edm::LogError("EcalDigiDisplay") << " TT value: " << (*intIter) << " found in listTowers. "
+                                           << " Valid range for EB SM is 1-70. Returning.";
+          inputIsOk = false;
+          return;
+        }
       }
     }
-  }else  //if EE DCC is being picked up  
-    if (ttDigi) {
-      //Check with Towers in Endcap
-      for (intIter = listTowers.begin(); intIter != listTowers.end(); intIter++) { 
-	if ( (*intIter) > 34 )       { 
-	  edm::LogError("EcalDigiDisplay") << " TT value: " << (*intIter) << " found in listTowers. "
-					   << " Valid range for EE DCC is 1-34. Returning.";
-	  inputIsOk = false;
-	  return;
-	}
+  } else  //if EE DCC is being picked up
+      if (ttDigi) {
+    //Check with Towers in Endcap
+    for (intIter = listTowers.begin(); intIter != listTowers.end(); intIter++) {
+      if ((*intIter) > 34) {
+        edm::LogError("EcalDigiDisplay") << " TT value: " << (*intIter) << " found in listTowers. "
+                                         << " Valid range for EE DCC is 1-34. Returning.";
+        inputIsOk = false;
+        return;
       }
     }
+  }
 
   //PNs
-  listPns     = ps.getUntrackedParameter<std::vector<int> >("listPns",listDefaults);
+  listPns = ps.getUntrackedParameter<std::vector<int> >("listPns", listDefaults);
   /*
   if ( listPns[0] != -1 ) pnDigi = true;
   else {
@@ -154,76 +153,77 @@ EcalDigiDisplay::EcalDigiDisplay(const edm::ParameterSet& ps) {
     }
   }
   */
-  if ( pnDigi ) {
+  if (pnDigi) {
     for (intIter = listPns.begin(); intIter != listPns.end(); intIter++) {
-      if ( ((*intIter) < 1) ||  (10 < (*intIter)) )       {  
-	edm::LogError("EcalDigiDisplay") << " Pn number : " << (*intIter) << " found in listPns. "
-					 << " Valid range is 1-10. Returning.";
-	inputIsOk = false;
-	return;
+      if (((*intIter) < 1) || (10 < (*intIter))) {
+        edm::LogError("EcalDigiDisplay") << " Pn number : " << (*intIter) << " found in listPns. "
+                                         << " Valid range is 1-10. Returning.";
+        inputIsOk = false;
+        return;
       }
     }
   }
 }
 //=========================================================================
 EcalDigiDisplay::~EcalDigiDisplay() {
-//=========================================================================
+  //=========================================================================
   //delete *;
 }
-    
-//========================================================================
-void EcalDigiDisplay::beginRun(edm::Run const &, edm::EventSetup const& c) {
+
 //========================================================================
+void EcalDigiDisplay::beginRun(edm::Run const&, edm::EventSetup const& c) {
+  //========================================================================
   edm::LogInfo("EcalDigiDisplay") << "entering beginRun! ";
 
   edm::ESHandle<EcalElectronicsMapping> elecHandle;
-    c.get<EcalMappingRcd>().get(elecHandle);
+  c.get<EcalMappingRcd>().get(elecHandle);
   ecalElectronicsMap_ = elecHandle.product();
 }
 
 //========================================================================
-void EcalDigiDisplay::analyze( edm::Event const & e, edm::EventSetup const & c) {
-//========================================================================
+void EcalDigiDisplay::analyze(edm::Event const& e, edm::EventSetup const& c) {
+  //========================================================================
+
+  if (!inputIsOk)
+    return;
 
-  if (!inputIsOk) return;
-  
   //Get DCC headers
   edm::Handle<EcalRawDataCollection> dccHeader;
   try {
-    e.getByLabel(digiProducer_,dccHeader);
+    e.getByLabel(digiProducer_, dccHeader);
   } catch (cms::Exception& ex) {
     edm::LogError("EcalDigiUnpackerModule") << "Can't get DCC Headers!";
   }
-    
+
   //
   bool ebDigisFound = false;
   bool eeDigisFound = false;
   bool pnDigisFound = false;
   // retrieving crystal data from Event
-  edm::Handle<EBDigiCollection>  eb_digis;    
+  edm::Handle<EBDigiCollection> eb_digis;
   try {
-    e.getByLabel(digiProducer_,ebDigiCollection_, eb_digis);
-    if ( !eb_digis->empty() )
+    e.getByLabel(digiProducer_, ebDigiCollection_, eb_digis);
+    if (!eb_digis->empty())
       ebDigisFound = true;
   } catch (cms::Exception& ex) {
     edm::LogError("EcalDigiUnpackerModule") << "EB Digis were not found!";
   }
-  
+
   //
-  edm::Handle<EEDigiCollection>  ee_digis;    
+  edm::Handle<EEDigiCollection> ee_digis;
   try {
-    e.getByLabel(digiProducer_,eeDigiCollection_, ee_digis);
-    if ( !ee_digis->empty() )
+    e.getByLabel(digiProducer_, eeDigiCollection_, ee_digis);
+    if (!ee_digis->empty())
       eeDigisFound = true;
   } catch (cms::Exception& ex) {
     edm::LogError("EcalDigiUnpackerModule") << "EE Digis were not found!";
   }
-  
+
   // retrieving crystal PN diodes from Event
-  edm::Handle<EcalPnDiodeDigiCollection>  pn_digis;
+  edm::Handle<EcalPnDiodeDigiCollection> pn_digis;
   try {
     e.getByLabel(digiProducer_, pn_digis);
-    if ( !pn_digis->empty())
+    if (!pn_digis->empty())
       pnDigisFound = true;
   } catch (cms::Exception& ex) {
     edm::LogError("EcalDigiUnpackerModule") << "PNs were not found!";
@@ -232,18 +232,18 @@ void EcalDigiDisplay::analyze( edm::Event const & e, edm::EventSetup const & c)
   //=============================
   //Call for funcitons
   //=============================
-  if ( cryDigi || ttDigi ) {
-    if ( ebDigisFound )
+  if (cryDigi || ttDigi) {
+    if (ebDigisFound)
       readEBDigis(eb_digis, mode);
-    if ( eeDigisFound )
+    if (eeDigisFound)
       readEEDigis(ee_digis, mode);
-    if ( !(ebDigisFound || eeDigisFound) ) {
+    if (!(ebDigisFound || eeDigisFound)) {
       edm::LogWarning("EcalDigiUnpackerModule") << "No Digis were found! Returning..";
       return;
     }
   }
-  if ( pnDigi ) {
-    if (pnDigisFound )
+  if (pnDigi) {
+    if (pnDigisFound)
       readPNDigis(pn_digis, mode);
   }
 }
@@ -252,152 +252,153 @@ void EcalDigiDisplay::analyze( edm::Event const & e, edm::EventSetup const & c)
 // FUNCTIONS
 //////////////////////////////////
 
-void EcalDigiDisplay::readEBDigis (edm::Handle<EBDigiCollection> digis, int Mode) {
-
-  for ( EBDigiCollection::const_iterator digiItr= digis->begin();digiItr != digis->end(); 
-	++digiItr ) {		
-
+void EcalDigiDisplay::readEBDigis(edm::Handle<EBDigiCollection> digis, int Mode) {
+  for (EBDigiCollection::const_iterator digiItr = digis->begin(); digiItr != digis->end(); ++digiItr) {
     EBDetId detId = EBDetId((*digiItr).id());
     EcalElectronicsId elecId = ecalElectronicsMap_->getElectronicsId(detId);
 
     int FEDid = elecId.dccId() + 600;
-    std::vector<int>::iterator fedIter = find(requestedFeds_.begin(), requestedFeds_.end(), FEDid); 
-    if (fedIter ==  requestedFeds_.end()) continue;
+    std::vector<int>::iterator fedIter = find(requestedFeds_.begin(), requestedFeds_.end(), FEDid);
+    if (fedIter == requestedFeds_.end())
+      continue;
 
     int ic = EBDetId((*digiItr).id()).ic();
     int tt = EBDetId((*digiItr).id()).tower().iTT();
 
-    //Check if Mode is set 1 or 2 
-    if ( Mode ==1 ) {
-      edm::LogInfo("EcalDigiDisplay") << "\n\n^^^^^^^^^^^^^^^^^^ [EcalDigiDisplay]  digi cry collection size " << digis->size();
-      edm::LogInfo("EcalDigiDisplay") << "                       [EcalDigiDisplay]  dumping first " << listChannels[0] << " crystals\n";
+    //Check if Mode is set 1 or 2
+    if (Mode == 1) {
+      edm::LogInfo("EcalDigiDisplay") << "\n\n^^^^^^^^^^^^^^^^^^ [EcalDigiDisplay]  digi cry collection size "
+                                      << digis->size();
+      edm::LogInfo("EcalDigiDisplay") << "                       [EcalDigiDisplay]  dumping first " << listChannels[0]
+                                      << " crystals\n";
       //It will break if all required digis are dumpped
-      if( ic  > listChannels[0]) continue;  
-    } else if  ( Mode==2 ) {
-
+      if (ic > listChannels[0])
+        continue;
+    } else if (Mode == 2) {
       std::vector<int>::iterator icIterCh;
       std::vector<int>::iterator icIterTt;
       icIterCh = find(listChannels.begin(), listChannels.end(), ic);
       icIterTt = find(listTowers.begin(), listTowers.end(), tt);
-      if (icIterCh == listChannels.end() && icIterTt == listTowers.end() ) continue;   
-      edm::LogInfo("EcalDigiDisplay") << "\n\n^^^^^^^^^^^^^^^^^^ [EcalDigiDisplay]  digi cry collection size " << digis->size();
+      if (icIterCh == listChannels.end() && icIterTt == listTowers.end())
+        continue;
+      edm::LogInfo("EcalDigiDisplay") << "\n\n^^^^^^^^^^^^^^^^^^ [EcalDigiDisplay]  digi cry collection size "
+                                      << digis->size();
     } else {
       edm::LogInfo("EcalDigiDisplay") << "[EcalDigiDisplay] parameter mode set to: " << Mode
-				      << ". Only mode 1 and 2 are allowed. Returning...";
+                                      << ". Only mode 1 and 2 are allowed. Returning...";
       inputIsOk = false;
       return;
     }
     std::cout << "FEDID: " << FEDid << std::endl;
-    std::cout << "Tower: " << EBDetId((*digiItr).id()).tower().iTT()
-	      <<" ic-cry: " 
-	      << EBDetId((*digiItr).id()).ic() << " i-phi: " 
-	      << EBDetId((*digiItr).id()).iphi() << " j-eta: " 
-	      << EBDetId((*digiItr).id()).ieta() << std::endl;
+    std::cout << "Tower: " << EBDetId((*digiItr).id()).tower().iTT() << " ic-cry: " << EBDetId((*digiItr).id()).ic()
+              << " i-phi: " << EBDetId((*digiItr).id()).iphi() << " j-eta: " << EBDetId((*digiItr).id()).ieta()
+              << std::endl;
     //Get Samples
-    for ( unsigned int i=0; i< (*digiItr).size() ; ++i ) {
-      EBDataFrame df( *digiItr );
-      if (!(i%3)  )  std::cout << "\n\t";
-      std::cout << "sId: " << (i+1) << " " <<  df.sample(i) << "\t";
-    } 
+    for (unsigned int i = 0; i < (*digiItr).size(); ++i) {
+      EBDataFrame df(*digiItr);
+      if (!(i % 3))
+        std::cout << "\n\t";
+      std::cout << "sId: " << (i + 1) << " " << df.sample(i) << "\t";
+    }
     std::cout << " " << std::endl;
   }
 }
 
 //Function for EE Digis
-void EcalDigiDisplay::readEEDigis (edm::Handle<EEDigiCollection> digis, int Mode) {
-
+void EcalDigiDisplay::readEEDigis(edm::Handle<EEDigiCollection> digis, int Mode) {
   //For Endcap so far works only  Mode 2
-  if ( Mode!=2 ) {
+  if (Mode != 2) {
     std::cout << "For Endcap mode needs to be set to 2" << std::endl;
     return;
   }
-  
-  for ( EEDigiCollection::const_iterator digiItr= digis->begin();digiItr != digis->end(); 
-	++digiItr ) {		
-    
+
+  for (EEDigiCollection::const_iterator digiItr = digis->begin(); digiItr != digis->end(); ++digiItr) {
     //Make sure that digis are form requested place
     EEDetId detId = EEDetId((*digiItr).id());
     EcalElectronicsId elecId = ecalElectronicsMap_->getElectronicsId(detId);
 
     int FEDid = elecId.dccId() + 600;
     std::vector<int>::iterator fedIter = find(requestedFeds_.begin(), requestedFeds_.end(), FEDid);
-    if (fedIter ==  requestedFeds_.end()) continue;
+    if (fedIter == requestedFeds_.end())
+      continue;
+
+    edm::LogInfo("EcalDigiDisplay") << "\n\n^^^^^^^^^^^^^^^^^^ [EcalDigiDisplay]  digi cry collection size "
+                                    << digis->size();
 
-    edm::LogInfo("EcalDigiDisplay") << "\n\n^^^^^^^^^^^^^^^^^^ [EcalDigiDisplay]  digi cry collection size " << digis->size();
-    
-    int crystalId = 10000 * FEDid + 100 * elecId.towerId() + 5 * (elecId.stripId()-1)+elecId.xtalId();
-    int chId = elecId.towerId();    // this is a channel in Endcap DCC, sometimes also called as Super Crystal
+    int crystalId = 10000 * FEDid + 100 * elecId.towerId() + 5 * (elecId.stripId() - 1) + elecId.xtalId();
+    int chId = elecId.towerId();  // this is a channel in Endcap DCC, sometimes also called as Super Crystal
 
     std::vector<int>::iterator icIterCh;
     std::vector<int>::iterator icIterTt;
     icIterCh = find(listChannels.begin(), listChannels.end(), crystalId);
     icIterTt = find(listTowers.begin(), listTowers.end(), chId);
-    if ( icIterCh == listChannels.end() &&  icIterTt == listTowers.end() ) continue; 
-    
+    if (icIterCh == listChannels.end() && icIterTt == listTowers.end())
+      continue;
+
     std::cout << "FEDID: " << FEDid << std::endl;
-    std::cout << "Tower: " << elecId.towerId()    
-	      << "crystalId: " 
-	      << crystalId << " i-x: " 
-	      << EEDetId((*digiItr).id()).ix() << " j-y: " 
-	      << EEDetId((*digiItr).id()).iy() << std::endl;
-    
-    //Get samples 
-    for ( unsigned int i=0; i< (*digiItr).size() ; ++i ) {
-      EEDataFrame df( *digiItr );
-      if (!(i%3)  )  std::cout << "\n\t";
-      std::cout << "sId: " << (i+1) << " " <<  df.sample(i) << "\t";
-    }       
+    std::cout << "Tower: " << elecId.towerId() << "crystalId: " << crystalId
+              << " i-x: " << EEDetId((*digiItr).id()).ix() << " j-y: " << EEDetId((*digiItr).id()).iy() << std::endl;
+
+    //Get samples
+    for (unsigned int i = 0; i < (*digiItr).size(); ++i) {
+      EEDataFrame df(*digiItr);
+      if (!(i % 3))
+        std::cout << "\n\t";
+      std::cout << "sId: " << (i + 1) << " " << df.sample(i) << "\t";
+    }
     std::cout << " " << std::endl;
   }
 }
 
 void EcalDigiDisplay::readPNDigis(edm::Handle<EcalPnDiodeDigiCollection> PNs, int Mode) {
-
   int pnDigiCounter = 0;
 
   //Loop over PN digis
-  for ( EcalPnDiodeDigiCollection::const_iterator pnItr = PNs->begin(); pnItr != PNs->end(); ++pnItr ) {
+  for (EcalPnDiodeDigiCollection::const_iterator pnItr = PNs->begin(); pnItr != PNs->end(); ++pnItr) {
     EcalPnDiodeDetId pnDetId = EcalPnDiodeDetId((*pnItr).id());
     //Make sure that we look at the requested place
     int FEDid = pnDetId.iDCCId() + 600;
     std::vector<int>::iterator fedIter = find(requestedFeds_.begin(), requestedFeds_.end(), FEDid);
-    if (fedIter ==  requestedFeds_.end()) continue;
+    if (fedIter == requestedFeds_.end())
+      continue;
     int pnNum = (*pnItr).id().iPnId();
-    
-    if ( Mode == 1) {
-      edm::LogInfo("EcalDigiDisplay") << "\n\n^^^^^^^^^^^^^^^^^^ EcalDigiDisplay  digi PN collection.  Size: " << PNs->size();
-      edm::LogInfo("EcalDigiDisplay") << "                       [EcalDigiDisplay]  dumping first " << listPns[0] << " PNs ";
-      
-      if ( (pnDigiCounter++) >= listPns[0] ) break;
-    } else if ( Mode == 2) {
-      edm::LogInfo("EcalDigiDisplay") << "\n\n^^^^^^^^^^^^^^^^^^ EcalDigiDisplay  digi PN collection.  Size: " << PNs->size();
-      
+
+    if (Mode == 1) {
+      edm::LogInfo("EcalDigiDisplay") << "\n\n^^^^^^^^^^^^^^^^^^ EcalDigiDisplay  digi PN collection.  Size: "
+                                      << PNs->size();
+      edm::LogInfo("EcalDigiDisplay") << "                       [EcalDigiDisplay]  dumping first " << listPns[0]
+                                      << " PNs ";
+
+      if ((pnDigiCounter++) >= listPns[0])
+        break;
+    } else if (Mode == 2) {
+      edm::LogInfo("EcalDigiDisplay") << "\n\n^^^^^^^^^^^^^^^^^^ EcalDigiDisplay  digi PN collection.  Size: "
+                                      << PNs->size();
+
       // Check that we look at PN from the given list
       std::vector<int>::iterator pnIter;
       pnIter = find(listPns.begin(), listPns.end(), pnNum);
-      if (pnIter == listPns.end())  continue; 
+      if (pnIter == listPns.end())
+        continue;
     } else {
-      edm::LogError("EcalDigiDisplay")<< "[EcalDigiDisplay] parameter mode set to: " << Mode
-				      << ". Only mode 1 and 2 are allowed. Returning...";
+      edm::LogError("EcalDigiDisplay") << "[EcalDigiDisplay] parameter mode set to: " << Mode
+                                       << ". Only mode 1 and 2 are allowed. Returning...";
       inputIsOk = false;
       return;
     }
-    
+
     std::cout << "DCCID: " << pnDetId.iDCCId() << std::endl;
     std::cout << "\nPN num: " << (*pnItr).id().iPnId();
-    for ( int samId=0; samId < (*pnItr).size() ; samId++ ) {
-      if (!(samId%3)  )  std::cout << "\n\t";
-      std::cout <<  "sId: " << (samId+1) << " "
-		<< (*pnItr).sample(samId) 
-		<< "\t";
+    for (int samId = 0; samId < (*pnItr).size(); samId++) {
+      if (!(samId % 3))
+        std::cout << "\n\t";
+      std::cout << "sId: " << (samId + 1) << " " << (*pnItr).sample(samId) << "\t";
     }
   }
 }
 
 //===================================================
 void EcalDigiDisplay::endJob() {
-//==================================================
-  edm::LogInfo("EcalDigiDisplay") << "DONE!.... " ;
+  //==================================================
+  edm::LogInfo("EcalDigiDisplay") << "DONE!.... ";
 }
-
-
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalDigiDisplay.h b/CaloOnlineTools/EcalTools/plugins/EcalDigiDisplay.h
index 8fe4065fdca24..a7c98140496d2 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalDigiDisplay.h
+++ b/CaloOnlineTools/EcalTools/plugins/EcalDigiDisplay.h
@@ -18,22 +18,22 @@
 // class declaration
 
 class EcalDigiDisplay : public edm::EDAnalyzer {
- public:
+public:
   //Constractor
   EcalDigiDisplay(const edm::ParameterSet& ps);
   //Distractor
   ~EcalDigiDisplay() override;
-  
- private:
-  void analyze( edm::Event const & e, edm::EventSetup const & c) override;
-  void beginRun(edm::Run const &, edm::EventSetup const & c) override;
+
+private:
+  void analyze(edm::Event const& e, edm::EventSetup const& c) override;
+  void beginRun(edm::Run const&, edm::EventSetup const& c) override;
   void endJob() override;
-  
- protected:
-  void readEBDigis (edm::Handle<EBDigiCollection> digis, int Mode);
-  void readEEDigis (edm::Handle<EEDigiCollection> digis, int Mode);
-  void readPNDigis (edm::Handle<EcalPnDiodeDigiCollection> PNs, int Mode);
-  
+
+protected:
+  void readEBDigis(edm::Handle<EBDigiCollection> digis, int Mode);
+  void readEEDigis(edm::Handle<EEDigiCollection> digis, int Mode);
+  void readPNDigis(edm::Handle<EcalPnDiodeDigiCollection> PNs, int Mode);
+
   EcalFedMap* fedMap;
 
   std::string ebDigiCollection_;
@@ -47,13 +47,13 @@ class EcalDigiDisplay : public edm::EDAnalyzer {
   bool cryDigi;
   bool ttDigi;
   bool pnDigi;
-  
+
   int mode;
- 
+
   std::vector<int> listChannels;
   std::vector<int> listTowers;
   std::vector<int> listPns;
-  
+
   const EcalElectronicsMapping* ecalElectronicsMap_;
 };
 #endif
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalDisplaysByEvent.cc b/CaloOnlineTools/EcalTools/plugins/EcalDisplaysByEvent.cc
index f291772c0f820..589521f9b2ab4 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalDisplaysByEvent.cc
+++ b/CaloOnlineTools/EcalTools/plugins/EcalDisplaysByEvent.cc
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 //
-// Package:   EcalDisplaysByEvent 
-// Class:     EcalDisplaysByEvent 
-// 
+// Package:   EcalDisplaysByEvent
+// Class:     EcalDisplaysByEvent
+//
 /**\class EcalDisplaysByEvent EcalDisplaysByEvent.cc
 
  Description: <one line class summary>
@@ -21,9 +21,9 @@
 #include "TLatex.h"
 #include "TLine.h"
 #include "TProfile2D.h"
-#include <utility> 
-#include <string> 
-#include <vector> 
+#include <utility>
+#include <string>
+#include <vector>
 using namespace edm;
 using namespace std;
 
@@ -34,119 +34,103 @@ using namespace std;
 //
 // static data member definitions
 //
-float EcalDisplaysByEvent::gainRatio[3] = { 1., 2. , 12. }; 
+float EcalDisplaysByEvent::gainRatio[3] = {1., 2., 12.};
 edm::Service<TFileService> EcalDisplaysByEvent::fileService;
 
 //
 // constructors and destructor
 //
-EcalDisplaysByEvent::EcalDisplaysByEvent(const edm::ParameterSet& iConfig) :
-  EBRecHitCollection_ (iConfig.getParameter<edm::InputTag>("EcalRecHitCollectionEB")),
-  EERecHitCollection_ (iConfig.getParameter<edm::InputTag>("EcalRecHitCollectionEE")),
-  EBDigis_ (iConfig.getParameter<edm::InputTag>("EBDigiCollection")),
-  EEDigis_ (iConfig.getParameter<edm::InputTag>("EEDigiCollection")),
-  headerProducer_ (iConfig.getParameter<edm::InputTag> ("headerProducer")),
-  runNum_(-1),
-  side_ (iConfig.getUntrackedParameter<int>("side", 3)),
-  threshold_ (iConfig.getUntrackedParameter<double>("amplitudeThreshold", 0.5)),
-  minTimingAmp_ (iConfig.getUntrackedParameter<double>("minimumTimingAmplitude", 0.100)),
-  makeDigiGraphs_ (iConfig.getUntrackedParameter<bool>("makeDigiGraphs", false)),
-  makeTimingHistos_ (iConfig.getUntrackedParameter<bool>("makeTimingHistos", true)),
-  makeEnergyHistos_ (iConfig.getUntrackedParameter<bool>("makeEnergyHistos", true)),
-  makeOccupancyHistos_ (iConfig.getUntrackedParameter<bool>("makeOccupancyHistos", true)),
-  histRangeMin_ (iConfig.getUntrackedParameter<double>("histogramMinRange",0.0)),
-  histRangeMax_ (iConfig.getUntrackedParameter<double>("histogramMaxRange",1.8)),
-  minTimingEnergyEB_ (iConfig.getUntrackedParameter<double>("minTimingEnergyEB",0.0)),
-  minTimingEnergyEE_ (iConfig.getUntrackedParameter<double>("minTimingEnergyEE",0.0))
-{
+EcalDisplaysByEvent::EcalDisplaysByEvent(const edm::ParameterSet& iConfig)
+    : EBRecHitCollection_(iConfig.getParameter<edm::InputTag>("EcalRecHitCollectionEB")),
+      EERecHitCollection_(iConfig.getParameter<edm::InputTag>("EcalRecHitCollectionEE")),
+      EBDigis_(iConfig.getParameter<edm::InputTag>("EBDigiCollection")),
+      EEDigis_(iConfig.getParameter<edm::InputTag>("EEDigiCollection")),
+      headerProducer_(iConfig.getParameter<edm::InputTag>("headerProducer")),
+      runNum_(-1),
+      side_(iConfig.getUntrackedParameter<int>("side", 3)),
+      threshold_(iConfig.getUntrackedParameter<double>("amplitudeThreshold", 0.5)),
+      minTimingAmp_(iConfig.getUntrackedParameter<double>("minimumTimingAmplitude", 0.100)),
+      makeDigiGraphs_(iConfig.getUntrackedParameter<bool>("makeDigiGraphs", false)),
+      makeTimingHistos_(iConfig.getUntrackedParameter<bool>("makeTimingHistos", true)),
+      makeEnergyHistos_(iConfig.getUntrackedParameter<bool>("makeEnergyHistos", true)),
+      makeOccupancyHistos_(iConfig.getUntrackedParameter<bool>("makeOccupancyHistos", true)),
+      histRangeMin_(iConfig.getUntrackedParameter<double>("histogramMinRange", 0.0)),
+      histRangeMax_(iConfig.getUntrackedParameter<double>("histogramMaxRange", 1.8)),
+      minTimingEnergyEB_(iConfig.getUntrackedParameter<double>("minTimingEnergyEB", 0.0)),
+      minTimingEnergyEE_(iConfig.getUntrackedParameter<double>("minTimingEnergyEE", 0.0)) {
   vector<int> listDefaults;
   listDefaults.push_back(-1);
-  
+
   maskedChannels_ = iConfig.getUntrackedParameter<vector<int> >("maskedChannels", listDefaults);
   maskedFEDs_ = iConfig.getUntrackedParameter<vector<int> >("maskedFEDs", listDefaults);
-  seedCrys_ = iConfig.getUntrackedParameter<vector<int> >("seedCrys",listDefaults);
+  seedCrys_ = iConfig.getUntrackedParameter<vector<int> >("seedCrys", listDefaults);
 
   vector<string> defaultMaskedEBs;
   defaultMaskedEBs.push_back("none");
-  maskedEBs_ =  iConfig.getUntrackedParameter<vector<string> >("maskedEBs",defaultMaskedEBs);
-  
+  maskedEBs_ = iConfig.getUntrackedParameter<vector<string> >("maskedEBs", defaultMaskedEBs);
+
   fedMap_ = new EcalFedMap();
 
   string title1 = "Jitter for all FEDs all events";
   string name1 = "JitterAllFEDsAllEvents";
-  allFedsTimingHist_ = fileService->make<TH1F>(name1.c_str(),title1.c_str(),150,-7,7);
+  allFedsTimingHist_ = fileService->make<TH1F>(name1.c_str(), title1.c_str(), 150, -7, 7);
 
   // load up the maskedFED list with the proper FEDids
-  if(maskedFEDs_[0]==-1)
-  {
+  if (maskedFEDs_[0] == -1) {
     //if "actual" EB id given, then convert to FEDid and put in listFEDs_
-    if(maskedEBs_[0] != "none")
-    {
+    if (maskedEBs_[0] != "none") {
       maskedFEDs_.clear();
-      for(vector<string>::const_iterator ebItr = maskedEBs_.begin(); ebItr != maskedEBs_.end(); ++ebItr)
-      {
+      for (vector<string>::const_iterator ebItr = maskedEBs_.begin(); ebItr != maskedEBs_.end(); ++ebItr) {
         maskedFEDs_.push_back(fedMap_->getFedFromSlice(*ebItr));
       }
     }
   }
-  
-  for (int i=0; i<10; i++)        
+
+  for (int i = 0; i < 10; i++)
     abscissa[i] = i;
-  
+
   naiveEvtNum_ = 0;
 
   initAllEventHistos();
 }
 
-
-EcalDisplaysByEvent::~EcalDisplaysByEvent()
-{
-}
-
+EcalDisplaysByEvent::~EcalDisplaysByEvent() {}
 
 //
 // member functions
 //
 
 // ------------ method called once each job just before starting event loop  ------------
-void 
-EcalDisplaysByEvent::beginRun(edm::Run const &, edm::EventSetup const & c)
-{
-  edm::ESHandle< EcalElectronicsMapping > handle;
-  c.get< EcalMappingRcd >().get(handle);
+void EcalDisplaysByEvent::beginRun(edm::Run const&, edm::EventSetup const& c) {
+  edm::ESHandle<EcalElectronicsMapping> handle;
+  c.get<EcalMappingRcd>().get(handle);
   ecalElectronicsMap_ = handle.product();
 }
 
 // ------------ method called to for each event  ------------
-void
-EcalDisplaysByEvent::analyze(edm::Event const & iEvent, edm::EventSetup const & iSetup)
-{
-
+void EcalDisplaysByEvent::analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup) {
   // get the headers
   // (one header for each supermodule)
   edm::Handle<EcalRawDataCollection> DCCHeaders;
   iEvent.getByLabel(headerProducer_, DCCHeaders);
 
-  for (EcalRawDataCollection::const_iterator headerItr= DCCHeaders->begin();
-		  headerItr != DCCHeaders->end (); 
-		  ++headerItr) 
-  {
-    FEDsAndDCCHeaders_[headerItr->id()+600] = *headerItr;
+  for (EcalRawDataCollection::const_iterator headerItr = DCCHeaders->begin(); headerItr != DCCHeaders->end();
+       ++headerItr) {
+    FEDsAndDCCHeaders_[headerItr->id() + 600] = *headerItr;
   }
 
   int ievt = iEvent.id().event();
   naiveEvtNum_++;
 
-  if(runNum_==-1)
-  {
+  if (runNum_ == -1) {
     runNum_ = iEvent.id().run();
-    canvasNames_ = fileService->make<TTree>("canvasNames","Names of written canvases");
+    canvasNames_ = fileService->make<TTree>("canvasNames", "Names of written canvases");
     names = new std::vector<string>();
-    canvasNames_->Branch("names","vector<string>",&names);
-    
-    histoCanvasNames_ = fileService->make<TTree>("histoCanvasNames","Names of written canvases with histos");
+    canvasNames_->Branch("names", "vector<string>", &names);
+
+    histoCanvasNames_ = fileService->make<TTree>("histoCanvasNames", "Names of written canvases with histos");
     histoCanvasNamesVector = new std::vector<string>();
-    histoCanvasNames_->Branch("histoCanvasNamesVector","vector<string>",&histoCanvasNamesVector);
+    histoCanvasNames_->Branch("histoCanvasNamesVector", "vector<string>", &histoCanvasNamesVector);
   }
 
   //We only want the 3x3's for this event...
@@ -165,109 +149,95 @@ EcalDisplaysByEvent::analyze(edm::Event const & iEvent, edm::EventSetup const &
 
   // Initialize histos for this event
   initEvtByEvtHists(naiveEvtNum_, ievt);
-  
+
   bool hasEBdigis = false;
   bool hasEEdigis = false;
-  if(!EBdigisHandle->empty())
+  if (!EBdigisHandle->empty())
     hasEBdigis = true;
-  if(!EEdigisHandle->empty())
+  if (!EEdigisHandle->empty())
     hasEEdigis = true;
 
   // Produce the digi graphs
-  if(makeDigiGraphs_)
-  {
-    if(hasEBdigis) //if event has digis, it should have hits
+  if (makeDigiGraphs_) {
+    if (hasEBdigis)  //if event has digis, it should have hits
       selectHits(EBhits, ievt, caloTopo);
-    if(hasEEdigis)
+    if (hasEEdigis)
       selectHits(EEhits, ievt, caloTopo);
   }
 
   // Produce the histos
-  if(hasEBdigis)
-  {
+  if (hasEBdigis) {
     makeHistos(EBdigisHandle);
     makeHistos(EBhits);
   }
-  if(hasEEdigis)
-  {
+  if (hasEEdigis) {
     makeHistos(EEdigisHandle);
     makeHistos(EEhits);
   }
 
-  if(hasEBdigis || hasEEdigis)
+  if (hasEBdigis || hasEEdigis)
     drawHistos();
 
   deleteEvtByEvtHists();
 }
 
-
-void EcalDisplaysByEvent::selectHits(Handle<EcalRecHitCollection> hits,
-    int ievt, ESHandle<CaloTopology> caloTopo)
-{
-  for (EcalRecHitCollection::const_iterator hitItr = hits->begin(); hitItr != hits->end(); ++hitItr)
-  {
+void EcalDisplaysByEvent::selectHits(Handle<EcalRecHitCollection> hits, int ievt, ESHandle<CaloTopology> caloTopo) {
+  for (EcalRecHitCollection::const_iterator hitItr = hits->begin(); hitItr != hits->end(); ++hitItr) {
     EcalRecHit hit = (*hitItr);
     DetId det = hit.id();
     EcalElectronicsId elecId = ecalElectronicsMap_->getElectronicsId(det);
-    int FEDid = 600+elecId.dccId();
+    int FEDid = 600 + elecId.dccId();
     bool isBarrel = true;
-    if(FEDid < 610 || FEDid > 645)
+    if (FEDid < 610 || FEDid > 645)
       isBarrel = false;
     int cryIndex = isBarrel ? ((EBDetId)det).hashedIndex() : getEEIndex(elecId);
     int ic = isBarrel ? ((EBDetId)det).ic() : getEEIndex(elecId);
-    
+
     float ampli = hit.energy();
 
     vector<int>::iterator result;
     result = find(maskedFEDs_.begin(), maskedFEDs_.end(), FEDid);
-    if(result != maskedFEDs_.end())
-    {
+    if (result != maskedFEDs_.end()) {
       //LogWarning("EcalDisplaysByEvent") << "skipping uncalRecHit for FED " << FEDid << " ; amplitude " << ampli;
       continue;
-    }      
+    }
     result = find(maskedChannels_.begin(), maskedChannels_.end(), cryIndex);
-    if  (result != maskedChannels_.end())
-    {
+    if (result != maskedChannels_.end()) {
       //LogWarning("EcalDisplaysByEvent") << "skipping uncalRecHit for channel: " << cryIndex << " in fed: " << FEDid << " with amplitude " << ampli ;
       continue;
-    } 
+    }
     bool cryIsInList = false;
     result = find(seedCrys_.begin(), seedCrys_.end(), cryIndex);
-    if  (result != seedCrys_.end())
+    if (result != seedCrys_.end())
       cryIsInList = true;
 
     // Either we must have a user-requested cry (in which case there is no amplitude selection)
     // Or we pick all crys that pass the amplitude cut (in which case there is no fixed crystal selection)
-    if(cryIsInList || (seedCrys_.empty() && ampli > threshold_))
-    {
+    if (cryIsInList || (seedCrys_.empty() && ampli > threshold_)) {
       // We have a winner!
       crysAndAmplitudesMap_[cryIndex] = ampli;
-      string name = "Digis_Event" + intToString(naiveEvtNum_) + "_ic" + intToString(ic)
-        + "_FED" + intToString(FEDid);
+      string name = "Digis_Event" + intToString(naiveEvtNum_) + "_ic" + intToString(ic) + "_FED" + intToString(FEDid);
       string title = "Digis";
       string seed = "ic" + intToString(ic) + "_FED" + intToString(FEDid);
-      int freq=1;
-      pair<map<string,int>::iterator,bool> pair = seedFrequencyMap_.insert(make_pair(seed,freq));
-      if(!pair.second)
-      {
+      int freq = 1;
+      pair<map<string, int>::iterator, bool> pair = seedFrequencyMap_.insert(make_pair(seed, freq));
+      if (!pair.second) {
         ++(pair.first->second);
       }
-      
+
       //TODO: move this also to TFileService
-      TCanvas can(name.c_str(),title.c_str(),200,50,900,900);
-      can.Divide(side_,side_);
+      TCanvas can(name.c_str(), title.c_str(), 200, 50, 900, 900);
+      can.Divide(side_, side_);
       TGraph* myGraph;
 
-      CaloNavigator<DetId> cursor = CaloNavigator<DetId>(det,caloTopo->getSubdetectorTopology(det));
+      CaloNavigator<DetId> cursor = CaloNavigator<DetId>(det, caloTopo->getSubdetectorTopology(det));
       //Now put each graph in one by one
-      for(int j=side_/2; j>=-side_/2; --j)
-      {
-        for(int i=-side_/2; i<=side_/2; ++i)
-        {
+      for (int j = side_ / 2; j >= -side_ / 2; --j) {
+        for (int i = -side_ / 2; i <= side_ / 2; ++i) {
           cursor.home();
-          cursor.offsetBy(i,j);
-          can.cd(i+1+side_/2+side_*(1-j));
-          myGraph = selectDigi(*cursor,ievt);
+          cursor.offsetBy(i, j);
+          can.cd(i + 1 + side_ / 2 + side_ * (1 - j));
+          myGraph = selectDigi(*cursor, ievt);
           myGraph->Draw("A*");
         }
       }
@@ -277,106 +247,99 @@ void EcalDisplaysByEvent::selectHits(Handle<EcalRecHitCollection> hits,
   }
 }
 
-TGraph* EcalDisplaysByEvent::selectDigi(DetId thisDet, int ievt)
-{
+TGraph* EcalDisplaysByEvent::selectDigi(DetId thisDet, int ievt) {
   int emptyY[10];
-  for (int i=0; i<10; i++)
+  for (int i = 0; i < 10; i++)
     emptyY[i] = 0;
   TGraph* emptyGraph = fileService->make<TGraph>(10, abscissa, emptyY);
   emptyGraph->SetTitle("NOT ECAL");
-  
+
   //If the DetId is not from Ecal, return
-  if(thisDet.det() != DetId::Ecal)
+  if (thisDet.det() != DetId::Ecal)
     return emptyGraph;
-  
+
   emptyGraph->SetTitle("NO DIGIS");
-  //find digi we need  -- can't get find() to work; need DataFrame(DetId det) to work? 
+  //find digi we need  -- can't get find() to work; need DataFrame(DetId det) to work?
   EcalElectronicsId elecId = ecalElectronicsMap_->getElectronicsId(thisDet);
-  int FEDid = 600+elecId.dccId();
+  int FEDid = 600 + elecId.dccId();
   bool isBarrel = true;
-  if(FEDid < 610 || FEDid > 645)
+  if (FEDid < 610 || FEDid > 645)
     isBarrel = false;
   int cryIndex = isBarrel ? ((EBDetId)thisDet).hashedIndex() : getEEIndex(elecId);
   int ic = isBarrel ? ((EBDetId)thisDet).ic() : cryIndex;
 
   string sliceName = fedMap_->getSliceFromFed(FEDid);
   EcalDataFrame df;
-  if(isBarrel)
-  {
+  if (isBarrel) {
     EBDigiCollection::const_iterator digiItr = EBdigisHandle->begin();
-    while(digiItr != EBdigisHandle->end() && ((*digiItr).id() != (EBDetId)thisDet))
-    {
+    while (digiItr != EBdigisHandle->end() && ((*digiItr).id() != (EBDetId)thisDet)) {
       ++digiItr;
     }
-    if(digiItr==EBdigisHandle->end())
-    {
+    if (digiItr == EBdigisHandle->end()) {
       //LogWarning("EcalDisplaysByEvent") << "Cannot find digi for ic:" << ic
       //  << " FED:" << FEDid << " evt:" << naiveEvtNum_;
       return emptyGraph;
-    }
-    else
+    } else
       df = *digiItr;
-  }
-  else
-  {
+  } else {
     EEDigiCollection::const_iterator digiItr = EEdigisHandle->begin();
-    while(digiItr != EEdigisHandle->end() && ((*digiItr).id() != (EEDetId)thisDet))
-    {
+    while (digiItr != EEdigisHandle->end() && ((*digiItr).id() != (EEDetId)thisDet)) {
       ++digiItr;
     }
-    if(digiItr==EEdigisHandle->end())
-    {
+    if (digiItr == EEdigisHandle->end()) {
       //LogWarning("EcalDisplaysByEvent") << "Cannot find digi for ic:" << ic
       //  << " FED:" << FEDid << " evt:" << naiveEvtNum_;
       return emptyGraph;
-    }
-    else df = *digiItr;
+    } else
+      df = *digiItr;
   }
 
   int gainId = FEDsAndDCCHeaders_[FEDid].getMgpaGain();
   int gainHuman;
-  if      (gainId ==1) gainHuman =12;
-  else if (gainId ==2) gainHuman =6;
-  else if (gainId ==3) gainHuman =1;
-  else                 gainHuman =-1; 
+  if (gainId == 1)
+    gainHuman = 12;
+  else if (gainId == 2)
+    gainHuman = 6;
+  else if (gainId == 3)
+    gainHuman = 1;
+  else
+    gainHuman = -1;
 
   double pedestal = 200;
 
   emptyGraph->SetTitle("FIRST TWO SAMPLES NOT GAIN12");
-  if(df.sample(0).gainId()!=1 || df.sample(1).gainId()!=1) return emptyGraph; //goes to the next digi
+  if (df.sample(0).gainId() != 1 || df.sample(1).gainId() != 1)
+    return emptyGraph;  //goes to the next digi
   else {
     ordinate[0] = df.sample(0).adc();
     ordinate[1] = df.sample(1).adc();
-    pedestal = (double)(ordinate[0]+ordinate[1])/(double)2;
-  } 
-
+    pedestal = (double)(ordinate[0] + ordinate[1]) / (double)2;
+  }
 
-  for (int i=0; i < df.size(); ++i ) {
+  for (int i = 0; i < df.size(); ++i) {
     if (df.sample(i).gainId() != 0)
-      ordinate[i] = (int)(pedestal+(df.sample(i).adc()-pedestal)*gainRatio[df.sample(i).gainId()-1]);
+      ordinate[i] = (int)(pedestal + (df.sample(i).adc() - pedestal) * gainRatio[df.sample(i).gainId() - 1]);
     else
-      ordinate[i] = 49152; //Saturation of gain1 
+      ordinate[i] = 49152;  //Saturation of gain1
   }
 
   TGraph* oneGraph = fileService->make<TGraph>(10, abscissa, ordinate);
-  string name = "Graph_ev" + intToString(naiveEvtNum_) + "_ic" + intToString(ic)
-    + "_FED" + intToString(FEDid);
-  string gainString = (gainId==1) ? "Free" : intToString(gainHuman);
-  string title = "Event" + intToString(naiveEvtNum_) + "_lv1a" + intToString(ievt) +
-    "_ic" + intToString(ic) + "_" + sliceName + "_gain" + gainString;
-    
+  string name = "Graph_ev" + intToString(naiveEvtNum_) + "_ic" + intToString(ic) + "_FED" + intToString(FEDid);
+  string gainString = (gainId == 1) ? "Free" : intToString(gainHuman);
+  string title = "Event" + intToString(naiveEvtNum_) + "_lv1a" + intToString(ievt) + "_ic" + intToString(ic) + "_" +
+                 sliceName + "_gain" + gainString;
+
   float energy = 0;
-  map<int,float>::const_iterator itr;
+  map<int, float>::const_iterator itr;
   itr = crysAndAmplitudesMap_.find(cryIndex);
-  if(itr!=crysAndAmplitudesMap_.end())
-  {
+  if (itr != crysAndAmplitudesMap_.end()) {
     //edm::LogWarning("EcalDisplaysByEvent")<< "itr->second(ampli)="<< itr->second;
-    energy = (float) itr->second;
+    energy = (float)itr->second;
   }
   //else
   //edm::LogWarning("EcalDisplaysByEvent") << "cry " << ic << "not found in ampMap";
 
-  title+="_Energy"+floatToString(round(energy*1000));
+  title += "_Energy" + floatToString(round(energy * 1000));
 
   oneGraph->SetTitle(title.c_str());
   oneGraph->SetName(name.c_str());
@@ -385,206 +348,169 @@ TGraph* EcalDisplaysByEvent::selectDigi(DetId thisDet, int ievt)
   return oneGraph;
 }
 
-int EcalDisplaysByEvent::getEEIndex(EcalElectronicsId elecId)
-{
-  int FEDid = 600+elecId.dccId();
-  return 10000*FEDid+100*elecId.towerId()+5*(elecId.stripId()-1)+elecId.xtalId();
+int EcalDisplaysByEvent::getEEIndex(EcalElectronicsId elecId) {
+  int FEDid = 600 + elecId.dccId();
+  return 10000 * FEDid + 100 * elecId.towerId() + 5 * (elecId.stripId() - 1) + elecId.xtalId();
 }
 
 void EcalDisplaysByEvent::makeHistos(Handle<EBDigiCollection> ebDigiHandle) {
-   const EBDigiCollection* ebDigis = ebDigiHandle.product();
-   for(EBDigiCollection::const_iterator digiItr = ebDigis->begin(); digiItr != ebDigis->end(); ++digiItr) {
-      EBDetId digiId = digiItr->id();
-      int ieta = digiId.ieta();
-      int iphi = digiId.iphi();
-      digiOccupancyEBAll_->Fill(iphi,ieta);
-      digiOccupancyEBcoarseAll_->Fill(iphi,ieta);
-      if(makeOccupancyHistos_)
-      {
-        digiOccupancyEB_->Fill(iphi,ieta);
-        digiOccupancyEBcoarse_->Fill(iphi,ieta);
-      }
-   }
+  const EBDigiCollection* ebDigis = ebDigiHandle.product();
+  for (EBDigiCollection::const_iterator digiItr = ebDigis->begin(); digiItr != ebDigis->end(); ++digiItr) {
+    EBDetId digiId = digiItr->id();
+    int ieta = digiId.ieta();
+    int iphi = digiId.iphi();
+    digiOccupancyEBAll_->Fill(iphi, ieta);
+    digiOccupancyEBcoarseAll_->Fill(iphi, ieta);
+    if (makeOccupancyHistos_) {
+      digiOccupancyEB_->Fill(iphi, ieta);
+      digiOccupancyEBcoarse_->Fill(iphi, ieta);
+    }
+  }
 }
 
 void EcalDisplaysByEvent::makeHistos(Handle<EEDigiCollection> eeDigiHandle) {
-   const EEDigiCollection* eeDigis = eeDigiHandle.product();
-   for(EEDigiCollection::const_iterator digiItr = eeDigis->begin(); digiItr != eeDigis->end(); ++digiItr) {
-      DetId det = digiItr->id();
-      EcalElectronicsId elecId = ecalElectronicsMap_->getElectronicsId(det);
-      size_t FEDid = 600+elecId.dccId();
-      bool isEEM = false;
-      if(FEDid < 610)
-	isEEM = true;
-      EEDetId digiId = digiItr->id();
-      int ieta = digiId.iy();
-      int iphi = digiId.ix();
-      if(isEEM)
-      {
-	 digiOccupancyEEMAll_->Fill(iphi,ieta);
-	 digiOccupancyEEMcoarseAll_->Fill(iphi,ieta);
-         if(makeOccupancyHistos_)
-         {
-           digiOccupancyEEMcoarse_->Fill(iphi,ieta);
-           digiOccupancyEEM_->Fill(iphi,ieta);
-         }
+  const EEDigiCollection* eeDigis = eeDigiHandle.product();
+  for (EEDigiCollection::const_iterator digiItr = eeDigis->begin(); digiItr != eeDigis->end(); ++digiItr) {
+    DetId det = digiItr->id();
+    EcalElectronicsId elecId = ecalElectronicsMap_->getElectronicsId(det);
+    size_t FEDid = 600 + elecId.dccId();
+    bool isEEM = false;
+    if (FEDid < 610)
+      isEEM = true;
+    EEDetId digiId = digiItr->id();
+    int ieta = digiId.iy();
+    int iphi = digiId.ix();
+    if (isEEM) {
+      digiOccupancyEEMAll_->Fill(iphi, ieta);
+      digiOccupancyEEMcoarseAll_->Fill(iphi, ieta);
+      if (makeOccupancyHistos_) {
+        digiOccupancyEEMcoarse_->Fill(iphi, ieta);
+        digiOccupancyEEM_->Fill(iphi, ieta);
       }
-      else
-      {
-	 digiOccupancyEEPAll_->Fill(iphi,ieta);
-	 digiOccupancyEEPcoarseAll_->Fill(iphi,ieta);
-         if(makeOccupancyHistos_)
-         {
-           digiOccupancyEEP_->Fill(iphi,ieta);
-           digiOccupancyEEPcoarse_->Fill(iphi,ieta);
-         }
-      }  
-   }
+    } else {
+      digiOccupancyEEPAll_->Fill(iphi, ieta);
+      digiOccupancyEEPcoarseAll_->Fill(iphi, ieta);
+      if (makeOccupancyHistos_) {
+        digiOccupancyEEP_->Fill(iphi, ieta);
+        digiOccupancyEEPcoarse_->Fill(iphi, ieta);
+      }
+    }
+  }
 }
 
-void EcalDisplaysByEvent::makeHistos(Handle<EcalRecHitCollection> hits)
-{
-  for (EcalRecHitCollection::const_iterator hitItr = hits->begin(); hitItr != hits->end(); ++hitItr)
-  {
+void EcalDisplaysByEvent::makeHistos(Handle<EcalRecHitCollection> hits) {
+  for (EcalRecHitCollection::const_iterator hitItr = hits->begin(); hitItr != hits->end(); ++hitItr) {
     EcalRecHit hit = (*hitItr);
     DetId det = hit.id();
     EcalElectronicsId elecId = ecalElectronicsMap_->getElectronicsId(det);
-    int FEDid = 600+elecId.dccId();
+    int FEDid = 600 + elecId.dccId();
     bool isBarrel = true;
     bool isEEM = false;
-    if(FEDid < 610 || FEDid > 645)
-    {
+    if (FEDid < 610 || FEDid > 645) {
       isBarrel = false;
-      if(FEDid < 610)
+      if (FEDid < 610)
         isEEM = true;
     }
     int iphi = isBarrel ? ((EBDetId)det).iphi() : ((EEDetId)det).ix();
     int ieta = isBarrel ? ((EBDetId)det).ieta() : ((EEDetId)det).iy();
     float energy = hit.energy();
     float time = hit.time();
-    
+
     // Fill energy histos
-    if(makeEnergyHistos_)
-    {
-      if(isBarrel)
-      {
+    if (makeEnergyHistos_) {
+      if (isBarrel) {
         energyEB_->Fill(energy);
-        energyMapEB_->Fill(iphi,ieta,energy);
-        energyMapEBcoarse_->Fill(iphi,ieta,energy);
-      }
-      else if(isEEM)
-      {
+        energyMapEB_->Fill(iphi, ieta, energy);
+        energyMapEBcoarse_->Fill(iphi, ieta, energy);
+      } else if (isEEM) {
         energyEEM_->Fill(energy);
-        energyMapEEM_->Fill(iphi,ieta,energy);
-        energyMapEEMcoarse_->Fill(iphi,ieta,energy);
-      }
-      else
-      {
+        energyMapEEM_->Fill(iphi, ieta, energy);
+        energyMapEEMcoarse_->Fill(iphi, ieta, energy);
+      } else {
         energyEEP_->Fill(energy);
-        energyMapEEP_->Fill(iphi,ieta,energy);
-        energyMapEEPcoarse_->Fill(iphi,ieta,energy);
+        energyMapEEP_->Fill(iphi, ieta, energy);
+        energyMapEEPcoarse_->Fill(iphi, ieta, energy);
       }
     }
     // Fill occupancy histos
-    if(makeOccupancyHistos_)
-    {
-      if(isBarrel)
-      {
-        recHitOccupancyEB_->Fill(iphi,ieta);
-        recHitOccupancyEBcoarse_->Fill(iphi,ieta);
-      }
-      else if(isEEM)
-      {
-	 recHitOccupancyEEM_->Fill(iphi,ieta);
-	 recHitOccupancyEEMcoarse_->Fill(iphi,ieta);
-      }
-      else
-      {
-	 recHitOccupancyEEP_->Fill(iphi,ieta);
-	 recHitOccupancyEEPcoarse_->Fill(iphi,ieta);
+    if (makeOccupancyHistos_) {
+      if (isBarrel) {
+        recHitOccupancyEB_->Fill(iphi, ieta);
+        recHitOccupancyEBcoarse_->Fill(iphi, ieta);
+      } else if (isEEM) {
+        recHitOccupancyEEM_->Fill(iphi, ieta);
+        recHitOccupancyEEMcoarse_->Fill(iphi, ieta);
+      } else {
+        recHitOccupancyEEP_->Fill(iphi, ieta);
+        recHitOccupancyEEPcoarse_->Fill(iphi, ieta);
       }
     }
 
     // Fill timing histos
-    if(makeTimingHistos_)
-    {
-      if(isBarrel) {
+    if (makeTimingHistos_) {
+      if (isBarrel) {
         timingEB_->Fill(time);
-	if(energy > minTimingEnergyEB_) {
-	   timingMapEB_->Fill(iphi,ieta,time);
-	   //timingMapEBCoarse_->Fill(iphi,ieta,time);
-	}
-      }
-      else if(isEEM) {
-	 timingEEM_->Fill(time);
-	 if(energy > minTimingEnergyEE_)
-         {
-	    timingMapEEM_->Fill(iphi,ieta,time);
-	    //timingMapEEMCoarse_->Fill(iphi,ieta,time);
-         }
-      }
-      else {
-	 timingEEP_->Fill(time);
-	 if(energy > minTimingEnergyEE_)
-         {
-	    timingMapEEP_->Fill(iphi,ieta,time);
-	    //timingMapEEPCoarse_->Fill(iphi,ieta,time);
-         }
+        if (energy > minTimingEnergyEB_) {
+          timingMapEB_->Fill(iphi, ieta, time);
+          //timingMapEBCoarse_->Fill(iphi,ieta,time);
+        }
+      } else if (isEEM) {
+        timingEEM_->Fill(time);
+        if (energy > minTimingEnergyEE_) {
+          timingMapEEM_->Fill(iphi, ieta, time);
+          //timingMapEEMCoarse_->Fill(iphi,ieta,time);
+        }
+      } else {
+        timingEEP_->Fill(time);
+        if (energy > minTimingEnergyEE_) {
+          timingMapEEP_->Fill(iphi, ieta, time);
+          //timingMapEEPCoarse_->Fill(iphi,ieta,time);
+        }
       }
     }
 
     //All events
-    if(isBarrel)
-    {
+    if (isBarrel) {
       energyEBAll_->Fill(energy);
-      energyMapEBAll_->Fill(iphi,ieta,energy);
-      energyMapEBcoarseAll_->Fill(iphi,ieta,energy);
-      recHitOccupancyEBAll_->Fill(iphi,ieta);
-      recHitOccupancyEBcoarseAll_->Fill(iphi,ieta);
+      energyMapEBAll_->Fill(iphi, ieta, energy);
+      energyMapEBcoarseAll_->Fill(iphi, ieta, energy);
+      recHitOccupancyEBAll_->Fill(iphi, ieta);
+      recHitOccupancyEBcoarseAll_->Fill(iphi, ieta);
       timingEBAll_->Fill(time);
-      if(energy > minTimingEnergyEB_)
-      {
-        timingMapEBAll_->Fill(iphi,ieta,time);
-        timingMapEBCoarseAll_->Fill(iphi,ieta,time);
+      if (energy > minTimingEnergyEB_) {
+        timingMapEBAll_->Fill(iphi, ieta, time);
+        timingMapEBCoarseAll_->Fill(iphi, ieta, time);
       }
-    }
-    else if(isEEM)
-    {
+    } else if (isEEM) {
       energyEEMAll_->Fill(energy);
-      energyMapEEMAll_->Fill(iphi,ieta,energy);
-      energyMapEEMcoarseAll_->Fill(iphi,ieta,energy);
-      recHitOccupancyEEMAll_->Fill(iphi,ieta);
-      recHitOccupancyEEMcoarseAll_->Fill(iphi,ieta);
+      energyMapEEMAll_->Fill(iphi, ieta, energy);
+      energyMapEEMcoarseAll_->Fill(iphi, ieta, energy);
+      recHitOccupancyEEMAll_->Fill(iphi, ieta);
+      recHitOccupancyEEMcoarseAll_->Fill(iphi, ieta);
       timingEEMAll_->Fill(time);
-      if(energy > minTimingEnergyEE_)
-      {
-        timingMapEEMAll_->Fill(iphi,ieta,time);
-        timingMapEEMCoarseAll_->Fill(iphi,ieta,time);
+      if (energy > minTimingEnergyEE_) {
+        timingMapEEMAll_->Fill(iphi, ieta, time);
+        timingMapEEMCoarseAll_->Fill(iphi, ieta, time);
       }
-    }
-    else
-    {
+    } else {
       energyEEPAll_->Fill(energy);
-      energyMapEEPAll_->Fill(iphi,ieta,energy);
-      energyMapEEPcoarseAll_->Fill(iphi,ieta,energy);
-      recHitOccupancyEEPAll_->Fill(iphi,ieta);
-      recHitOccupancyEEPcoarseAll_->Fill(iphi,ieta);
+      energyMapEEPAll_->Fill(iphi, ieta, energy);
+      energyMapEEPcoarseAll_->Fill(iphi, ieta, energy);
+      recHitOccupancyEEPAll_->Fill(iphi, ieta);
+      recHitOccupancyEEPcoarseAll_->Fill(iphi, ieta);
       timingEEPAll_->Fill(time);
-      if(energy > minTimingEnergyEE_)
-      {
-        timingMapEEPAll_->Fill(iphi,ieta,time);
-        timingMapEEPCoarseAll_->Fill(iphi,ieta,time);
+      if (energy > minTimingEnergyEE_) {
+        timingMapEEPAll_->Fill(iphi, ieta, time);
+        timingMapEEPCoarseAll_->Fill(iphi, ieta, time);
       }
     }
     // Fill FED-by-FED timing histos (all events)
     TH1F* timingHist = FEDsAndTimingHists_[FEDid];
-    if(timingHist==nullptr)
-    {
+    if (timingHist == nullptr) {
       initHists(FEDid);
       timingHist = FEDsAndTimingHists_[FEDid];
     }
-    if(energy > minTimingAmp_)
-    {
+    if (energy > minTimingAmp_) {
       timingHist->Fill(hit.time());
       allFedsTimingHist_->Fill(hit.time());
     }
@@ -592,196 +518,185 @@ void EcalDisplaysByEvent::makeHistos(Handle<EcalRecHitCollection> hits)
 }
 
 // ------------ method called once each job just after ending the event loop  ------------
-void 
-EcalDisplaysByEvent::endJob()
-{
+void EcalDisplaysByEvent::endJob() {
   //All-event canvases
-  drawCanvas(timingCanvasAll_,timingEEMAll_,timingEBAll_,timingEEPAll_);
-  drawCanvas(timingMapCanvasAll_,timingMapEEMAll_,timingMapEBAll_,timingMapEEPAll_);
-  drawCanvas(energyCanvasAll_,energyEEMAll_,energyEBAll_,energyEEPAll_);
-  drawCanvas(energyMapCanvasAll_,energyMapEEMAll_,energyMapEBAll_,energyMapEEPAll_);
-  drawCanvas(energyMapCoarseCanvasAll_,energyMapEEMcoarseAll_,energyMapEBcoarseAll_,energyMapEEPcoarseAll_);
-  drawCanvas(recHitOccupancyCanvasAll_,recHitOccupancyEEMAll_,recHitOccupancyEBAll_,recHitOccupancyEEPAll_);
-  drawCanvas(recHitOccupancyCoarseCanvasAll_,recHitOccupancyEEMcoarseAll_,recHitOccupancyEBcoarseAll_,recHitOccupancyEEPcoarseAll_);
-  drawCanvas(digiOccupancyCanvasAll_,digiOccupancyEEMAll_,digiOccupancyEBAll_,digiOccupancyEEPAll_);
-  drawCanvas(digiOccupancyCoarseCanvasAll_,digiOccupancyEEMcoarseAll_,digiOccupancyEBcoarseAll_,digiOccupancyEEPcoarseAll_);
-
-  if(runNum_ != -1) {
+  drawCanvas(timingCanvasAll_, timingEEMAll_, timingEBAll_, timingEEPAll_);
+  drawCanvas(timingMapCanvasAll_, timingMapEEMAll_, timingMapEBAll_, timingMapEEPAll_);
+  drawCanvas(energyCanvasAll_, energyEEMAll_, energyEBAll_, energyEEPAll_);
+  drawCanvas(energyMapCanvasAll_, energyMapEEMAll_, energyMapEBAll_, energyMapEEPAll_);
+  drawCanvas(energyMapCoarseCanvasAll_, energyMapEEMcoarseAll_, energyMapEBcoarseAll_, energyMapEEPcoarseAll_);
+  drawCanvas(recHitOccupancyCanvasAll_, recHitOccupancyEEMAll_, recHitOccupancyEBAll_, recHitOccupancyEEPAll_);
+  drawCanvas(recHitOccupancyCoarseCanvasAll_,
+             recHitOccupancyEEMcoarseAll_,
+             recHitOccupancyEBcoarseAll_,
+             recHitOccupancyEEPcoarseAll_);
+  drawCanvas(digiOccupancyCanvasAll_, digiOccupancyEEMAll_, digiOccupancyEBAll_, digiOccupancyEEPAll_);
+  drawCanvas(
+      digiOccupancyCoarseCanvasAll_, digiOccupancyEEMcoarseAll_, digiOccupancyEBcoarseAll_, digiOccupancyEEPcoarseAll_);
+
+  if (runNum_ != -1) {
     canvasNames_->Fill();
     histoCanvasNames_->Fill();
   }
 
   string frequencies = "";
-  for(std::map<std::string,int>::const_iterator itr = seedFrequencyMap_.begin();
-      itr != seedFrequencyMap_.end(); ++itr)
-  {
-    if(itr->second > 1)
-    {
-      frequencies+=itr->first;
-      frequencies+=" Frequency: ";
-      frequencies+=intToString(itr->second);
-      frequencies+="\n";
+  for (std::map<std::string, int>::const_iterator itr = seedFrequencyMap_.begin(); itr != seedFrequencyMap_.end();
+       ++itr) {
+    if (itr->second > 1) {
+      frequencies += itr->first;
+      frequencies += " Frequency: ";
+      frequencies += intToString(itr->second);
+      frequencies += "\n";
     }
   }
-  LogWarning("EcalDisplaysByEvent") << "Found seeds with frequency > 1: " << "\n\n" << frequencies;
-  
+  LogWarning("EcalDisplaysByEvent") << "Found seeds with frequency > 1: "
+                                    << "\n\n"
+                                    << frequencies;
+
   std::string channels;
-  for(std::vector<int>::const_iterator itr = maskedChannels_.begin();
-      itr != maskedChannels_.end(); ++itr)
-  {
-    channels+=intToString(*itr);
-    channels+=",";
+  for (std::vector<int>::const_iterator itr = maskedChannels_.begin(); itr != maskedChannels_.end(); ++itr) {
+    channels += intToString(*itr);
+    channels += ",";
   }
-  
+
   std::string feds;
-  for(std::vector<int>::const_iterator itr = maskedFEDs_.begin();
-      itr != maskedFEDs_.end(); ++itr)
-  {
-    feds+=intToString(*itr);
-    feds+=",";
+  for (std::vector<int>::const_iterator itr = maskedFEDs_.begin(); itr != maskedFEDs_.end(); ++itr) {
+    feds += intToString(*itr);
+    feds += ",";
   }
 
   LogWarning("EcalDisplaysByEvent") << "Masked channels are: " << channels;
   LogWarning("EcalDisplaysByEvent") << "Masked FEDs are: " << feds << " and that is all!";
 }
 
-std::string EcalDisplaysByEvent::intToString(int num)
-{
-    using namespace std;
-    ostringstream myStream;
-    myStream << num << flush;
-    return(myStream.str()); //returns the string form of the stringstream object
+std::string EcalDisplaysByEvent::intToString(int num) {
+  using namespace std;
+  ostringstream myStream;
+  myStream << num << flush;
+  return (myStream.str());  //returns the string form of the stringstream object
 }
 
-std::string EcalDisplaysByEvent::floatToString(float num)
-{
-    using namespace std;
-    ostringstream myStream;
-    myStream << num << flush;
-    return(myStream.str()); //returns the string form of the stringstream object
+std::string EcalDisplaysByEvent::floatToString(float num) {
+  using namespace std;
+  ostringstream myStream;
+  myStream << num << flush;
+  return (myStream.str());  //returns the string form of the stringstream object
 }
 
 // insert the hist map into the map keyed by FED number
-void EcalDisplaysByEvent::initHists(int FED)
-{
+void EcalDisplaysByEvent::initHists(int FED) {
   using namespace std;
-  
+
   string title1 = "Jitter for ";
   title1.append(fedMap_->getSliceFromFed(FED));
   string name1 = "JitterFED";
   name1.append(intToString(FED));
-  TH1F* timingHist = fileService->make<TH1F>(name1.c_str(),title1.c_str(),150,-7,7);
+  TH1F* timingHist = fileService->make<TH1F>(name1.c_str(), title1.c_str(), 150, -7, 7);
   FEDsAndTimingHists_[FED] = timingHist;
 }
 
-void EcalDisplaysByEvent::initEvtByEvtHists(int naiveEvtNum_, int ievt)
-{
-  string lastPart = intToString(naiveEvtNum_)+"_LV1a"+intToString(ievt);
-  if(makeTimingHistos_)
-  {
-    string canvasTitle = "Timing_Event"+lastPart;
-    timingEB_ = new TH1F("timeForAllFedsEB","timeForAllFeds;Relative Time (1 clock = 25ns)",78,-7,7);
-    timingEEM_ = new TH1F("timeForAllFedsEEM","timeForAllFeds_EEM;Relative Time (1 clock = 25ns)",78,-7,7);
-    timingEEP_ = new TH1F("timeForAllFedsEEP","timeForAllFeds_EEP;Relative Time (1 clock = 25ns)",78,-7,7);
-    timingCanvas_ = new TCanvas(canvasTitle.c_str(), canvasTitle.c_str(),300,60,500,200);
+void EcalDisplaysByEvent::initEvtByEvtHists(int naiveEvtNum_, int ievt) {
+  string lastPart = intToString(naiveEvtNum_) + "_LV1a" + intToString(ievt);
+  if (makeTimingHistos_) {
+    string canvasTitle = "Timing_Event" + lastPart;
+    timingEB_ = new TH1F("timeForAllFedsEB", "timeForAllFeds;Relative Time (1 clock = 25ns)", 78, -7, 7);
+    timingEEM_ = new TH1F("timeForAllFedsEEM", "timeForAllFeds_EEM;Relative Time (1 clock = 25ns)", 78, -7, 7);
+    timingEEP_ = new TH1F("timeForAllFedsEEP", "timeForAllFeds_EEP;Relative Time (1 clock = 25ns)", 78, -7, 7);
+    timingCanvas_ = new TCanvas(canvasTitle.c_str(), canvasTitle.c_str(), 300, 60, 500, 200);
     timingMapEB_ = init3DEcalHist("TimingMap", EB_FINE);
     timingMapEEM_ = init3DEcalHist("TimingMap", EEM_FINE);
     timingMapEEP_ = init3DEcalHist("TimingMap", EEP_FINE);
-    timingMapCanvas_ = init2DEcalCanvas("TimingMap_Event"+lastPart);
+    timingMapCanvas_ = init2DEcalCanvas("TimingMap_Event" + lastPart);
     //timingMapEBCoarse_ = init3DEcalHist("TimingMap", EB_COARSE);
     timingMapEEMCoarse_ = init3DEcalHist("TimingMap", EEM_COARSE);
     timingMapEEPCoarse_ = init3DEcalHist("TimingMap", EEP_COARSE);
-    //timingMapCoarseCanvas_ = init2DEcalCanvas("TimingMapCoarse_Event"+lastPart);  
+    //timingMapCoarseCanvas_ = init2DEcalCanvas("TimingMapCoarse_Event"+lastPart);
   }
-  if(makeEnergyHistos_)
-  {
-    energyEB_ = new TH1F("energyEB","Energy for EB Feds (GeV)",200,histRangeMin_,histRangeMax_);
-    energyEEM_ = new TH1F("energyEEM","Energy for EEM Feds (GeV)",200,histRangeMin_,10.0);
-    energyEEP_ = new TH1F("energyEEP","Energy for EEP Feds (GeV)",200,histRangeMin_,10.0);
-    string canvasTitle = "Energy_Event"+lastPart;
-    energyCanvas_ = new TCanvas(canvasTitle.c_str(), canvasTitle.c_str(),300,60,500,200);
+  if (makeEnergyHistos_) {
+    energyEB_ = new TH1F("energyEB", "Energy for EB Feds (GeV)", 200, histRangeMin_, histRangeMax_);
+    energyEEM_ = new TH1F("energyEEM", "Energy for EEM Feds (GeV)", 200, histRangeMin_, 10.0);
+    energyEEP_ = new TH1F("energyEEP", "Energy for EEP Feds (GeV)", 200, histRangeMin_, 10.0);
+    string canvasTitle = "Energy_Event" + lastPart;
+    energyCanvas_ = new TCanvas(canvasTitle.c_str(), canvasTitle.c_str(), 300, 60, 500, 200);
 
     // Energy map hists
-    energyMapEB_            = init2DEcalHist("EnergyMap",EB_FINE);
-    energyMapEBcoarse_      = init2DEcalHist("EnergyMap",EB_COARSE);
-    energyMapEEMcoarse_           = init2DEcalHist("EnergyMap",EEM_COARSE);
-    energyMapEEM_                 = init2DEcalHist("EnergyMap",EEM_FINE);
-    energyMapEEPcoarse_           = init2DEcalHist("EnergyMap",EEP_COARSE);
-    energyMapEEP_                 = init2DEcalHist("EnergyMap",EEP_FINE);
-    energyMapCanvas_ = init2DEcalCanvas("EnergyMap_Event"+lastPart);
-    energyMapCoarseCanvas_ = init2DEcalCanvas("EnergyMapCoarse_Event"+lastPart);
+    energyMapEB_ = init2DEcalHist("EnergyMap", EB_FINE);
+    energyMapEBcoarse_ = init2DEcalHist("EnergyMap", EB_COARSE);
+    energyMapEEMcoarse_ = init2DEcalHist("EnergyMap", EEM_COARSE);
+    energyMapEEM_ = init2DEcalHist("EnergyMap", EEM_FINE);
+    energyMapEEPcoarse_ = init2DEcalHist("EnergyMap", EEP_COARSE);
+    energyMapEEP_ = init2DEcalHist("EnergyMap", EEP_FINE);
+    energyMapCanvas_ = init2DEcalCanvas("EnergyMap_Event" + lastPart);
+    energyMapCoarseCanvas_ = init2DEcalCanvas("EnergyMapCoarse_Event" + lastPart);
   }
-  if(makeOccupancyHistos_) 
-  {
-     // RecHit Occupancy
-    recHitOccupancyEB_ = init2DEcalHist("RecHitOccupancy",EB_FINE);
-    recHitOccupancyEBcoarse_ = init2DEcalHist("RecHitOccupancy",EB_COARSE);
-    recHitOccupancyEEMcoarse_ = init2DEcalHist("RecHitOccupancy",EEM_COARSE);
-    recHitOccupancyEEM_ = init2DEcalHist("RecHitOccupancy",EEM_FINE);
-    recHitOccupancyEEPcoarse_ = init2DEcalHist("RecHitOccupancy",EEP_COARSE);
-    recHitOccupancyEEP_ = init2DEcalHist("RecHitOccupancy",EEP_FINE);
-    recHitOccupancyCanvas_ = init2DEcalCanvas("RecHitOccupancy_Event"+lastPart);
-    recHitOccupancyCoarseCanvas_ =init2DEcalCanvas("RecHitOccupancyCoarse_Event"+lastPart);
+  if (makeOccupancyHistos_) {
+    // RecHit Occupancy
+    recHitOccupancyEB_ = init2DEcalHist("RecHitOccupancy", EB_FINE);
+    recHitOccupancyEBcoarse_ = init2DEcalHist("RecHitOccupancy", EB_COARSE);
+    recHitOccupancyEEMcoarse_ = init2DEcalHist("RecHitOccupancy", EEM_COARSE);
+    recHitOccupancyEEM_ = init2DEcalHist("RecHitOccupancy", EEM_FINE);
+    recHitOccupancyEEPcoarse_ = init2DEcalHist("RecHitOccupancy", EEP_COARSE);
+    recHitOccupancyEEP_ = init2DEcalHist("RecHitOccupancy", EEP_FINE);
+    recHitOccupancyCanvas_ = init2DEcalCanvas("RecHitOccupancy_Event" + lastPart);
+    recHitOccupancyCoarseCanvas_ = init2DEcalCanvas("RecHitOccupancyCoarse_Event" + lastPart);
 
     //DigiOccupancy
-    digiOccupancyEB_ = init2DEcalHist("DigiOccupancy",EB_FINE);
+    digiOccupancyEB_ = init2DEcalHist("DigiOccupancy", EB_FINE);
     digiOccupancyEBcoarse_ = init2DEcalHist("DigiOccupancy", EB_COARSE);
-    digiOccupancyEEMcoarse_ = init2DEcalHist("DigiOccupancy",EEM_COARSE);
-    digiOccupancyEEM_ = init2DEcalHist("DigiOccupancy",EEM_FINE);
-    digiOccupancyEEPcoarse_ = init2DEcalHist("DigiOccupancy",EEP_COARSE);
-    digiOccupancyEEP_ = init2DEcalHist("DigiOccupancy",EEP_FINE);
-    digiOccupancyCanvas_ = init2DEcalCanvas("DigiOccupancy_Event"+lastPart);
-    digiOccupancyCoarseCanvas_ = init2DEcalCanvas("DigiOccupancyCoarse_Event"+lastPart);
+    digiOccupancyEEMcoarse_ = init2DEcalHist("DigiOccupancy", EEM_COARSE);
+    digiOccupancyEEM_ = init2DEcalHist("DigiOccupancy", EEM_FINE);
+    digiOccupancyEEPcoarse_ = init2DEcalHist("DigiOccupancy", EEP_COARSE);
+    digiOccupancyEEP_ = init2DEcalHist("DigiOccupancy", EEP_FINE);
+    digiOccupancyCanvas_ = init2DEcalCanvas("DigiOccupancy_Event" + lastPart);
+    digiOccupancyCoarseCanvas_ = init2DEcalCanvas("DigiOccupancyCoarse_Event" + lastPart);
   }
 }
 
-void EcalDisplaysByEvent::deleteEvtByEvtHists()
-{
-    delete timingEB_;
-    delete timingEEM_;
-    delete timingEEP_;
-    delete timingMapEB_;
-    delete timingMapEEM_;
-    delete timingMapEEP_;
-    delete timingCanvas_;
-    delete timingMapCanvas_;
-    delete energyEB_;
-    delete energyEEM_;
-    delete energyEEP_;
-    delete energyMapEB_;
-    delete energyMapEEM_;
-    delete energyMapEEP_;
-    delete energyMapEBcoarse_;
-    delete energyMapEEMcoarse_;
-    delete energyMapEEPcoarse_;
-    delete energyCanvas_;
-    delete energyMapCanvas_;
-    delete energyMapCoarseCanvas_;
-    delete recHitOccupancyEB_;
-    delete recHitOccupancyEEP_;
-    delete recHitOccupancyEEM_;
-    delete recHitOccupancyEBcoarse_;
-    delete recHitOccupancyEEMcoarse_;
-    delete recHitOccupancyEEPcoarse_;
-    delete digiOccupancyEB_;
-    delete digiOccupancyEEM_;
-    delete digiOccupancyEEP_;
-    delete digiOccupancyEBcoarse_;
-    delete digiOccupancyEEMcoarse_;
-    delete digiOccupancyEEPcoarse_;
-    delete recHitOccupancyCanvas_;
-    delete recHitOccupancyCoarseCanvas_;
-    delete digiOccupancyCanvas_;
-    delete digiOccupancyCoarseCanvas_;
+void EcalDisplaysByEvent::deleteEvtByEvtHists() {
+  delete timingEB_;
+  delete timingEEM_;
+  delete timingEEP_;
+  delete timingMapEB_;
+  delete timingMapEEM_;
+  delete timingMapEEP_;
+  delete timingCanvas_;
+  delete timingMapCanvas_;
+  delete energyEB_;
+  delete energyEEM_;
+  delete energyEEP_;
+  delete energyMapEB_;
+  delete energyMapEEM_;
+  delete energyMapEEP_;
+  delete energyMapEBcoarse_;
+  delete energyMapEEMcoarse_;
+  delete energyMapEEPcoarse_;
+  delete energyCanvas_;
+  delete energyMapCanvas_;
+  delete energyMapCoarseCanvas_;
+  delete recHitOccupancyEB_;
+  delete recHitOccupancyEEP_;
+  delete recHitOccupancyEEM_;
+  delete recHitOccupancyEBcoarse_;
+  delete recHitOccupancyEEMcoarse_;
+  delete recHitOccupancyEEPcoarse_;
+  delete digiOccupancyEB_;
+  delete digiOccupancyEEM_;
+  delete digiOccupancyEEP_;
+  delete digiOccupancyEBcoarse_;
+  delete digiOccupancyEEMcoarse_;
+  delete digiOccupancyEEPcoarse_;
+  delete recHitOccupancyCanvas_;
+  delete recHitOccupancyCoarseCanvas_;
+  delete digiOccupancyCanvas_;
+  delete digiOccupancyCoarseCanvas_;
 }
 
-void EcalDisplaysByEvent::initAllEventHistos()
-{
+void EcalDisplaysByEvent::initAllEventHistos() {
   string canvasTitle = "Timing_AllEvents";
-  timingEBAll_ = new TH1F("timeForAllFedsEBAll","timeForAllFeds;Relative Time (1 clock = 25ns)",78,-7,7);
-  timingEEMAll_ = new TH1F("timeForAllFedsEEMAll","timeForAllFeds_EEM;Relative Time (1 clock = 25ns)",78,-7,7);
-  timingEEPAll_ = new TH1F("timeForAllFedsEEPAll","timeForAllFeds_EEP;Relative Time (1 clock = 25ns)",78,-7,7);
-  timingCanvasAll_ = new TCanvas(canvasTitle.c_str(), canvasTitle.c_str(),300,60,500,200);
+  timingEBAll_ = new TH1F("timeForAllFedsEBAll", "timeForAllFeds;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  timingEEMAll_ = new TH1F("timeForAllFedsEEMAll", "timeForAllFeds_EEM;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  timingEEPAll_ = new TH1F("timeForAllFedsEEPAll", "timeForAllFeds_EEP;Relative Time (1 clock = 25ns)", 78, -7, 7);
+  timingCanvasAll_ = new TCanvas(canvasTitle.c_str(), canvasTitle.c_str(), 300, 60, 500, 200);
   timingMapEBAll_ = init3DEcalHist("TimingMapA", EB_FINE);
   timingMapEEMAll_ = init3DEcalHist("TimingMapA", EEM_FINE);
   timingMapEEPAll_ = init3DEcalHist("TimingMapA", EEP_FINE);
@@ -789,212 +704,195 @@ void EcalDisplaysByEvent::initAllEventHistos()
   timingMapEBCoarseAll_ = init3DEcalHist("TimingMapA", EB_COARSE);
   timingMapEEMCoarseAll_ = init3DEcalHist("TimingMapA", EEM_COARSE);
   timingMapEEPCoarseAll_ = init3DEcalHist("TimingMapA", EEP_COARSE);
-  //timingMapCoarseCanvasAll_ = init2DEcalCanvas("TimingMapCoarse_AllEvents"); 
-  energyEBAll_ = new TH1F("energyEBAllEvents","Energy for EB Feds (GeV)",200,histRangeMin_,histRangeMax_);
-  energyEEMAll_ = new TH1F("energyEEMAllEvents","Energy for EEM Feds (GeV)",200,histRangeMin_,10.0);
-  energyEEPAll_ = new TH1F("energyEEPAllEvents","Energy for EEP Feds (GeV)",200,histRangeMin_,10.0);
+  //timingMapCoarseCanvasAll_ = init2DEcalCanvas("TimingMapCoarse_AllEvents");
+  energyEBAll_ = new TH1F("energyEBAllEvents", "Energy for EB Feds (GeV)", 200, histRangeMin_, histRangeMax_);
+  energyEEMAll_ = new TH1F("energyEEMAllEvents", "Energy for EEM Feds (GeV)", 200, histRangeMin_, 10.0);
+  energyEEPAll_ = new TH1F("energyEEPAllEvents", "Energy for EEP Feds (GeV)", 200, histRangeMin_, 10.0);
   canvasTitle = "Energy_AllEvents";
-  energyCanvasAll_ = new TCanvas(canvasTitle.c_str(), canvasTitle.c_str(),300,60,500,200);
+  energyCanvasAll_ = new TCanvas(canvasTitle.c_str(), canvasTitle.c_str(), 300, 60, 500, 200);
 
   // Energy map hists
-  energyMapEBAll_            = init2DEcalHist("EnergyMapA",EB_FINE);
-  energyMapEBcoarseAll_      = init2DEcalHist("EnergyMapA",EB_COARSE);
-  energyMapEEMcoarseAll_           = init2DEcalHist("EnergyMapA",EEM_COARSE);
-  energyMapEEMAll_                 = init2DEcalHist("EnergyMapA",EEM_FINE);
-  energyMapEEPcoarseAll_           = init2DEcalHist("EnergyMapA",EEP_COARSE);
-  energyMapEEPAll_                 = init2DEcalHist("EnergyMapA",EEP_FINE);
+  energyMapEBAll_ = init2DEcalHist("EnergyMapA", EB_FINE);
+  energyMapEBcoarseAll_ = init2DEcalHist("EnergyMapA", EB_COARSE);
+  energyMapEEMcoarseAll_ = init2DEcalHist("EnergyMapA", EEM_COARSE);
+  energyMapEEMAll_ = init2DEcalHist("EnergyMapA", EEM_FINE);
+  energyMapEEPcoarseAll_ = init2DEcalHist("EnergyMapA", EEP_COARSE);
+  energyMapEEPAll_ = init2DEcalHist("EnergyMapA", EEP_FINE);
   energyMapCanvasAll_ = init2DEcalCanvas("EnergyMap_AllEvents");
   energyMapCoarseCanvasAll_ = init2DEcalCanvas("EnergyMapCoarse_AllEvents");
   // RecHit Occupancy
-  recHitOccupancyEBAll_ = init2DEcalHist("RecHitOccupancyA",EB_FINE);
-  recHitOccupancyEBcoarseAll_ = init2DEcalHist("RecHitOccupancyA",EB_COARSE);
-  recHitOccupancyEEMcoarseAll_ = init2DEcalHist("RecHitOccupancyA",EEM_COARSE);
-  recHitOccupancyEEMAll_ = init2DEcalHist("RecHitOccupancyA",EEM_FINE);
-  recHitOccupancyEEPcoarseAll_ = init2DEcalHist("RecHitOccupancyA",EEP_COARSE);
-  recHitOccupancyEEPAll_ = init2DEcalHist("RecHitOccupancyA",EEP_FINE);
+  recHitOccupancyEBAll_ = init2DEcalHist("RecHitOccupancyA", EB_FINE);
+  recHitOccupancyEBcoarseAll_ = init2DEcalHist("RecHitOccupancyA", EB_COARSE);
+  recHitOccupancyEEMcoarseAll_ = init2DEcalHist("RecHitOccupancyA", EEM_COARSE);
+  recHitOccupancyEEMAll_ = init2DEcalHist("RecHitOccupancyA", EEM_FINE);
+  recHitOccupancyEEPcoarseAll_ = init2DEcalHist("RecHitOccupancyA", EEP_COARSE);
+  recHitOccupancyEEPAll_ = init2DEcalHist("RecHitOccupancyA", EEP_FINE);
   recHitOccupancyCanvasAll_ = init2DEcalCanvas("RecHitOccupancy_AllEvents");
-  recHitOccupancyCoarseCanvasAll_ =init2DEcalCanvas("RecHitOccupancyCoarse_AllEvents");
+  recHitOccupancyCoarseCanvasAll_ = init2DEcalCanvas("RecHitOccupancyCoarse_AllEvents");
 
   //DigiOccupancy
-  digiOccupancyEBAll_ = init2DEcalHist("DigiOccupancyA",EB_FINE);
+  digiOccupancyEBAll_ = init2DEcalHist("DigiOccupancyA", EB_FINE);
   digiOccupancyEBcoarseAll_ = init2DEcalHist("DigiOccupancyA", EB_COARSE);
-  digiOccupancyEEMcoarseAll_ = init2DEcalHist("DigiOccupancyA",EEM_COARSE);
-  digiOccupancyEEMAll_ = init2DEcalHist("DigiOccupancyA",EEM_FINE);
-  digiOccupancyEEPcoarseAll_ = init2DEcalHist("DigiOccupancyA",EEP_COARSE);
-  digiOccupancyEEPAll_ = init2DEcalHist("DigiOccupancyA",EEP_FINE);
+  digiOccupancyEEMcoarseAll_ = init2DEcalHist("DigiOccupancyA", EEM_COARSE);
+  digiOccupancyEEMAll_ = init2DEcalHist("DigiOccupancyA", EEM_FINE);
+  digiOccupancyEEPcoarseAll_ = init2DEcalHist("DigiOccupancyA", EEP_COARSE);
+  digiOccupancyEEPAll_ = init2DEcalHist("DigiOccupancyA", EEP_FINE);
   digiOccupancyCanvasAll_ = init2DEcalCanvas("DigiOccupancy_AllEvents");
   digiOccupancyCoarseCanvasAll_ = init2DEcalCanvas("DigiOccupancyCoarse_AllEvents");
-
 }
 
-
 TH3F* EcalDisplaysByEvent::init3DEcalHist(std::string histTypeName, int subDet) {
-   TH3F* hist;
-   bool isBarrel = (subDet == EB_FINE || subDet == EB_COARSE) ? true : false;
-   bool isCoarse = (subDet == EB_COARSE || subDet == EEM_COARSE || subDet == EEP_COARSE) ? true : false; 
-   bool isEEM = (subDet == EEM_FINE || subDet == EEM_COARSE) ? true : false;
-   std::string histName = histTypeName;
-   std::string histTitle = histTypeName;
-   double ttEtaBins[36] = {-85, -80, -75, -70, -65, -60, -55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0, 1, 6, 11, 16, 21, 26, 31, 36, 41, 46, 51, 56, 61, 66, 71, 76, 81, 86 };
-   double modEtaBins[10]={-85, -65, -45, -25, 0, 1, 26, 46, 66, 86};
-   double ttPhiBins[73];
-   double modPhiBins[19];
-   double timingBins[79];
-   for (int i = 0; i < 79; ++i)
-   {
-      timingBins[i]= 6 - 7. + double(i) * 14. / 78.;
-      if (i<73)  
-      {       
-	 ttPhiBins[i]=1+5*i;
-	 if ( i < 19) 
-	 {       
-	    modPhiBins[i]=1+20*i;
-	 }       
-      }       
-
-   }
-
-   if(isBarrel) {
-      histName = histName + "EB";
-      histTitle = histTitle + " EB";
-      if(isCoarse) {
-	 histName = histName + "Coarse";
-	 histTitle = histTitle + " by Module Nominal value = 6;iphi;ieta ";
-	 hist = new TH3F(histName.c_str(),histTitle.c_str(),18,modPhiBins,9,modEtaBins,78,timingBins);
-      }
-      else {
-	 histTitle = histTitle + " by TT Nominal value = 6;iphi;ieta";
-	 hist = new TH3F(histName.c_str(),histTitle.c_str(),360/5,ttPhiBins,35,ttEtaBins,78,timingBins);
-      }
-   }
-   else {
-      double ttXBins[21];
-      double ttYBins[21];
-      for(int i=0;i!=21;++i) {
-	 ttXBins[i] = 1 + 5*i;
-	 ttYBins[i] = 1 + 5*i;
-      }
-      if(isEEM) {
-	 histName = histName + "EEM";
-	 histTitle = histTitle + " EEM";
-      }
-      else {
-	 histName = histName + "EEP";
-	 histTitle = histTitle + " EEP";
+  TH3F* hist;
+  bool isBarrel = (subDet == EB_FINE || subDet == EB_COARSE) ? true : false;
+  bool isCoarse = (subDet == EB_COARSE || subDet == EEM_COARSE || subDet == EEP_COARSE) ? true : false;
+  bool isEEM = (subDet == EEM_FINE || subDet == EEM_COARSE) ? true : false;
+  std::string histName = histTypeName;
+  std::string histTitle = histTypeName;
+  double ttEtaBins[36] = {-85, -80, -75, -70, -65, -60, -55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0,
+                          1,   6,   11,  16,  21,  26,  31,  36,  41,  46,  51,  56,  61,  66,  71,  76,  81, 86};
+  double modEtaBins[10] = {-85, -65, -45, -25, 0, 1, 26, 46, 66, 86};
+  double ttPhiBins[73];
+  double modPhiBins[19];
+  double timingBins[79];
+  for (int i = 0; i < 79; ++i) {
+    timingBins[i] = 6 - 7. + double(i) * 14. / 78.;
+    if (i < 73) {
+      ttPhiBins[i] = 1 + 5 * i;
+      if (i < 19) {
+        modPhiBins[i] = 1 + 20 * i;
       }
-      if(isCoarse) {
-	 histName = histName + "Coarse";
-	 histTitle = histTitle + " by Module Nominal value = 6;ix;iy";
-	 hist = new TH3F(histName.c_str(),histTitle.c_str(),20,ttXBins,20,ttYBins,78,timingBins);
-      }
-      else {
-	 histTitle = histTitle + " by TT Nominal value = 6;ix;iy";
-	 hist = new TH3F(histName.c_str(),histTitle.c_str(),20,ttXBins,20,ttYBins,78,timingBins);
-      }
-   }
-   return hist;
+    }
+  }
+
+  if (isBarrel) {
+    histName = histName + "EB";
+    histTitle = histTitle + " EB";
+    if (isCoarse) {
+      histName = histName + "Coarse";
+      histTitle = histTitle + " by Module Nominal value = 6;iphi;ieta ";
+      hist = new TH3F(histName.c_str(), histTitle.c_str(), 18, modPhiBins, 9, modEtaBins, 78, timingBins);
+    } else {
+      histTitle = histTitle + " by TT Nominal value = 6;iphi;ieta";
+      hist = new TH3F(histName.c_str(), histTitle.c_str(), 360 / 5, ttPhiBins, 35, ttEtaBins, 78, timingBins);
+    }
+  } else {
+    double ttXBins[21];
+    double ttYBins[21];
+    for (int i = 0; i != 21; ++i) {
+      ttXBins[i] = 1 + 5 * i;
+      ttYBins[i] = 1 + 5 * i;
+    }
+    if (isEEM) {
+      histName = histName + "EEM";
+      histTitle = histTitle + " EEM";
+    } else {
+      histName = histName + "EEP";
+      histTitle = histTitle + " EEP";
+    }
+    if (isCoarse) {
+      histName = histName + "Coarse";
+      histTitle = histTitle + " by Module Nominal value = 6;ix;iy";
+      hist = new TH3F(histName.c_str(), histTitle.c_str(), 20, ttXBins, 20, ttYBins, 78, timingBins);
+    } else {
+      histTitle = histTitle + " by TT Nominal value = 6;ix;iy";
+      hist = new TH3F(histName.c_str(), histTitle.c_str(), 20, ttXBins, 20, ttYBins, 78, timingBins);
+    }
+  }
+  return hist;
 }
 
 TH2F* EcalDisplaysByEvent::init2DEcalHist(std::string histTypeName, int subDet) {
-   TH2F* hist;
-   bool isBarrel = (subDet == EB_FINE || subDet == EB_COARSE) ? true : false;
-   bool isCoarse = (subDet == EB_COARSE || subDet == EEM_COARSE || subDet == EEP_COARSE) ? true : false; 
-   bool isEEM = (subDet == EEM_FINE || subDet == EEM_COARSE) ? true : false;
-   std::string histName = histTypeName;
-   std::string histTitle = histTypeName;
-   if(isBarrel) {
-      histName = histName + "EB";
-      histTitle = histTitle + " EB";
-      if(isCoarse) {
-	 histName = histName + "Coarse";
-	 histTitle = histTitle + " Coarse;iphi;ieta";
-	 double ttEtaBins[36] = {-85, -80, -75, -70, -65, -60, -55, -50, -45, -40, 
-	    -35, -30, -25, -20, -15, -10, -5, 0, 1, 6, 11, 16, 
-	    21, 26, 31, 36, 41, 46, 51, 56, 61, 66, 71, 76, 81, 86 };
-	 hist = new TH2F(histName.c_str(),histTitle.c_str(),360/5,1,361.,35,ttEtaBins);
-      }
-      else {
-	 histTitle = histTitle + ";iphi;ieta";
-	 hist = new TH2F(histName.c_str(),histTitle.c_str(),360,1,361.,172,-86,86);
-      }
-   }
-   else {
-      if(isEEM) {
-	 histName = histName + "EEM";
-	 histTitle = histTitle + " EEM";
-      }
-      else {
-	 histName = histName + "EEP";
-	 histTitle = histTitle + " EEP";
-      }
-      if(isCoarse) {
-	 histName = histName + "Coarse";
-	 histTitle = histTitle + " Coarse;ix;iy";
-	 hist = new TH2F(histName.c_str(),histTitle.c_str(),20,1,101,20,1,101);
-      }
-      else {
-	 histTitle = histTitle + ";ix;iy";
-	 hist = new TH2F(histName.c_str(),histTitle.c_str(),100,1,101,100,1,101);
-      }
-   }
-   return hist;
+  TH2F* hist;
+  bool isBarrel = (subDet == EB_FINE || subDet == EB_COARSE) ? true : false;
+  bool isCoarse = (subDet == EB_COARSE || subDet == EEM_COARSE || subDet == EEP_COARSE) ? true : false;
+  bool isEEM = (subDet == EEM_FINE || subDet == EEM_COARSE) ? true : false;
+  std::string histName = histTypeName;
+  std::string histTitle = histTypeName;
+  if (isBarrel) {
+    histName = histName + "EB";
+    histTitle = histTitle + " EB";
+    if (isCoarse) {
+      histName = histName + "Coarse";
+      histTitle = histTitle + " Coarse;iphi;ieta";
+      double ttEtaBins[36] = {-85, -80, -75, -70, -65, -60, -55, -50, -45, -40, -35, -30, -25, -20, -15, -10, -5, 0,
+                              1,   6,   11,  16,  21,  26,  31,  36,  41,  46,  51,  56,  61,  66,  71,  76,  81, 86};
+      hist = new TH2F(histName.c_str(), histTitle.c_str(), 360 / 5, 1, 361., 35, ttEtaBins);
+    } else {
+      histTitle = histTitle + ";iphi;ieta";
+      hist = new TH2F(histName.c_str(), histTitle.c_str(), 360, 1, 361., 172, -86, 86);
+    }
+  } else {
+    if (isEEM) {
+      histName = histName + "EEM";
+      histTitle = histTitle + " EEM";
+    } else {
+      histName = histName + "EEP";
+      histTitle = histTitle + " EEP";
+    }
+    if (isCoarse) {
+      histName = histName + "Coarse";
+      histTitle = histTitle + " Coarse;ix;iy";
+      hist = new TH2F(histName.c_str(), histTitle.c_str(), 20, 1, 101, 20, 1, 101);
+    } else {
+      histTitle = histTitle + ";ix;iy";
+      hist = new TH2F(histName.c_str(), histTitle.c_str(), 100, 1, 101, 100, 1, 101);
+    }
+  }
+  return hist;
 }
 
 TCanvas* EcalDisplaysByEvent::init2DEcalCanvas(std::string canvasTitle) {
-    TCanvas* canvas = new TCanvas(canvasTitle.c_str(), canvasTitle.c_str(),300,60,500,200);
-    return canvas;
+  TCanvas* canvas = new TCanvas(canvasTitle.c_str(), canvasTitle.c_str(), 300, 60, 500, 200);
+  return canvas;
 }
 
-void EcalDisplaysByEvent::drawHistos()
-{
-  if(makeTimingHistos_)
-  {
+void EcalDisplaysByEvent::drawHistos() {
+  if (makeTimingHistos_) {
     // Put the timing canvas together
-    drawCanvas(timingCanvas_,timingEEM_,timingEB_,timingEEP_);
+    drawCanvas(timingCanvas_, timingEEM_, timingEB_, timingEEP_);
     //   drawCanvas(timingMapCoarseCanvas_,timingMapEEMCoarse_,timingMapEBCoarse_,timingMapEEPCoarse_);
-    drawCanvas(timingMapCanvas_,timingMapEEM_,timingMapEB_,timingMapEEP_);
+    drawCanvas(timingMapCanvas_, timingMapEEM_, timingMapEB_, timingMapEEP_);
   }
-  if(makeEnergyHistos_)
-  {
+  if (makeEnergyHistos_) {
     // Put the energy canvas together
-    drawCanvas(energyCanvas_,energyEEM_,energyEB_,energyEEP_);
+    drawCanvas(energyCanvas_, energyEEM_, energyEB_, energyEEP_);
     // Put the energy map canvas together
-    drawCanvas(energyMapCanvas_,energyMapEEM_,energyMapEB_,energyMapEEP_);
-    drawCanvas(energyMapCoarseCanvas_,energyMapEEMcoarse_,energyMapEBcoarse_,energyMapEEPcoarse_);
+    drawCanvas(energyMapCanvas_, energyMapEEM_, energyMapEB_, energyMapEEP_);
+    drawCanvas(energyMapCoarseCanvas_, energyMapEEMcoarse_, energyMapEBcoarse_, energyMapEEPcoarse_);
   }
-  if(makeOccupancyHistos_)
-  {
+  if (makeOccupancyHistos_) {
     // Put the occupancy canvas together
-    drawCanvas(recHitOccupancyCanvas_,recHitOccupancyEEM_,recHitOccupancyEB_,recHitOccupancyEEP_);
-    drawCanvas(recHitOccupancyCoarseCanvas_,recHitOccupancyEEMcoarse_,recHitOccupancyEBcoarse_,recHitOccupancyEEPcoarse_);
+    drawCanvas(recHitOccupancyCanvas_, recHitOccupancyEEM_, recHitOccupancyEB_, recHitOccupancyEEP_);
+    drawCanvas(
+        recHitOccupancyCoarseCanvas_, recHitOccupancyEEMcoarse_, recHitOccupancyEBcoarse_, recHitOccupancyEEPcoarse_);
     // And the same for the digis
-    drawCanvas(digiOccupancyCanvas_,digiOccupancyEEM_,digiOccupancyEB_,digiOccupancyEEP_);
-    drawCanvas(digiOccupancyCoarseCanvas_,digiOccupancyEEMcoarse_,digiOccupancyEBcoarse_,digiOccupancyEEPcoarse_);
+    drawCanvas(digiOccupancyCanvas_, digiOccupancyEEM_, digiOccupancyEB_, digiOccupancyEEP_);
+    drawCanvas(digiOccupancyCoarseCanvas_, digiOccupancyEEMcoarse_, digiOccupancyEBcoarse_, digiOccupancyEEPcoarse_);
   }
 }
 
 void EcalDisplaysByEvent::drawCanvas(TCanvas* canvas, TH1F* hist1, TH1F* hist2, TH1F* hist3) {
-  canvas->Divide(1,2); 
-  canvas->cd(1)->Divide(2,1); 
+  canvas->Divide(1, 2);
+  canvas->cd(1)->Divide(2, 1);
   canvas->cd(1)->cd(1);
   hist1->Draw();
-  canvas->cd(2); 
+  canvas->cd(2);
   hist2->Draw();
   canvas->cd(1)->cd(2);
-  hist3->Draw(); 
+  hist3->Draw();
   histoCanvasNamesVector->push_back(canvas->GetName());
-  canvas->SetCanvasSize(500,500);
+  canvas->SetCanvasSize(500, 500);
   canvas->SetFixedAspectRatio(true);
   canvas->Write();
 }
 
 void EcalDisplaysByEvent::drawCanvas(TCanvas* canvas, TH2F* hist1, TH2F* hist2, TH2F* hist3) {
-  canvas->Divide(1,2);
-  canvas->cd(1)->Divide(2,1);
+  canvas->Divide(1, 2);
+  canvas->cd(1)->Divide(2, 1);
   // EEM
   canvas->cd(1)->cd(1);
   hist1->Draw("colz");
-  drawEELines();  
+  drawEELines();
   // EB
   canvas->cd(2);
   hist2->Draw("colz");
@@ -1005,107 +903,116 @@ void EcalDisplaysByEvent::drawCanvas(TCanvas* canvas, TH2F* hist1, TH2F* hist2,
   // EEP
   canvas->cd(1)->cd(2);
   hist3->Draw("colz");
-  drawEELines();  
+  drawEELines();
   histoCanvasNamesVector->push_back(canvas->GetName());
-  canvas->SetCanvasSize(500,500);
+  canvas->SetCanvasSize(500, 500);
   canvas->SetFixedAspectRatio(true);
   canvas->Write();
 }
 
 void EcalDisplaysByEvent::drawCanvas(TCanvas* canvas, TH3F* hist1, TH3F* hist2, TH3F* hist3) {
-   if(canvas == timingMapCoarseCanvas_) {
-      canvas->cd();
-      TProfile2D* profile2 = (TProfile2D*) hist2->Project3DProfile("yx");
-      profile2->Draw("colz");
-      drawTimingErrors(profile2);
-   }
-   else {
-      canvas->Divide(1,2);
-      canvas->cd(1)->Divide(2,1);
-      // EEM
-      canvas->cd(1)->cd(1);
-      TProfile2D* profile1 = (TProfile2D*) hist1->Project3DProfile("yx");
-      profile1->Draw("colz");
-      drawEELines();  
-      // EB
-      canvas->cd(2);
-      TProfile2D* profile2 = (TProfile2D*) hist2->Project3DProfile("yx");
-      profile2->Draw("colz");
-      profile2->GetXaxis()->SetNdivisions(-18);
-      profile2->GetYaxis()->SetNdivisions(2);
-      canvas->GetPad(2)->SetGridx(1);
-      canvas->GetPad(2)->SetGridy(1);
-      // EEP
-      canvas->cd(1)->cd(2);
-      TProfile2D* profile3 = (TProfile2D*) hist3->Project3DProfile("yx");
-      profile3->Draw("colz");
-      drawEELines();  
-   }
-   histoCanvasNamesVector->push_back(canvas->GetName());
-   canvas->SetCanvasSize(500,500);
-   canvas->SetFixedAspectRatio(true);
-   canvas->Write();
+  if (canvas == timingMapCoarseCanvas_) {
+    canvas->cd();
+    TProfile2D* profile2 = (TProfile2D*)hist2->Project3DProfile("yx");
+    profile2->Draw("colz");
+    drawTimingErrors(profile2);
+  } else {
+    canvas->Divide(1, 2);
+    canvas->cd(1)->Divide(2, 1);
+    // EEM
+    canvas->cd(1)->cd(1);
+    TProfile2D* profile1 = (TProfile2D*)hist1->Project3DProfile("yx");
+    profile1->Draw("colz");
+    drawEELines();
+    // EB
+    canvas->cd(2);
+    TProfile2D* profile2 = (TProfile2D*)hist2->Project3DProfile("yx");
+    profile2->Draw("colz");
+    profile2->GetXaxis()->SetNdivisions(-18);
+    profile2->GetYaxis()->SetNdivisions(2);
+    canvas->GetPad(2)->SetGridx(1);
+    canvas->GetPad(2)->SetGridy(1);
+    // EEP
+    canvas->cd(1)->cd(2);
+    TProfile2D* profile3 = (TProfile2D*)hist3->Project3DProfile("yx");
+    profile3->Draw("colz");
+    drawEELines();
+  }
+  histoCanvasNamesVector->push_back(canvas->GetName());
+  canvas->SetCanvasSize(500, 500);
+  canvas->SetFixedAspectRatio(true);
+  canvas->Write();
 }
 
 void EcalDisplaysByEvent::drawTimingErrors(TProfile2D* profile) {
-   int nxb = profile->GetNbinsX();
-   int nyb = profile->GetNbinsY();
-   char tempErr[200];
-   for(int i=0;i!=nxb;++i) {
-      for(int j=0;j!=nyb;++j) {
-	 int xb = i+1;
-	 int yb = j+1;
-//   std::cout << "xb: " << xb << "\tyb: " << yb << std::endl;
-	 double xcorr = profile->GetBinCenter(xb);
-	 double ycorr = profile->GetBinCenter(yb);
-	 sprintf(tempErr,"%0.2f",profile->GetBinError(xb,yb));
-	 int nBin = profile->GetBin(xb,yb,0);
-	 int nBinEntries = (int) profile->GetBinEntries(nBin);
-	 if(nBinEntries != 0) {
-	    TLatex* tex = new TLatex(xcorr,ycorr,tempErr);
-	    tex->SetTextAlign(23);
-	    tex->SetTextSize(42);
-	    tex->SetTextSize(0.025);
-	    tex->SetLineWidth(2);
-	    tex->Draw();
-            delete tex;
-	 }
-	 sprintf(tempErr,"%i",nBinEntries);
-	 if(nBinEntries!=0) {
-	    TLatex* tex = new TLatex(xcorr,ycorr,tempErr);
-	    tex->SetTextAlign(21);
-	    tex->SetTextFont(42);
-	    tex->SetTextSize(0.025);
-	    tex->SetLineWidth(2);
-	    tex->Draw();
-            delete tex;
-	 }
+  int nxb = profile->GetNbinsX();
+  int nyb = profile->GetNbinsY();
+  char tempErr[200];
+  for (int i = 0; i != nxb; ++i) {
+    for (int j = 0; j != nyb; ++j) {
+      int xb = i + 1;
+      int yb = j + 1;
+      //   std::cout << "xb: " << xb << "\tyb: " << yb << std::endl;
+      double xcorr = profile->GetBinCenter(xb);
+      double ycorr = profile->GetBinCenter(yb);
+      sprintf(tempErr, "%0.2f", profile->GetBinError(xb, yb));
+      int nBin = profile->GetBin(xb, yb, 0);
+      int nBinEntries = (int)profile->GetBinEntries(nBin);
+      if (nBinEntries != 0) {
+        TLatex* tex = new TLatex(xcorr, ycorr, tempErr);
+        tex->SetTextAlign(23);
+        tex->SetTextSize(42);
+        tex->SetTextSize(0.025);
+        tex->SetLineWidth(2);
+        tex->Draw();
+        delete tex;
+      }
+      sprintf(tempErr, "%i", nBinEntries);
+      if (nBinEntries != 0) {
+        TLatex* tex = new TLatex(xcorr, ycorr, tempErr);
+        tex->SetTextAlign(21);
+        tex->SetTextFont(42);
+        tex->SetTextSize(0.025);
+        tex->SetLineWidth(2);
+        tex->Draw();
+        delete tex;
       }
-   }
+    }
+  }
 }
 
 void EcalDisplaysByEvent::drawEELines() {
+  int ixSectorsEE[202] = {
+      61, 61, 60, 60, 59, 59, 58, 58, 57, 57, 55, 55, 45, 45, 43, 43, 42, 42, 41, 41,  40,  40,  39,  39, 40, 40,
+      41, 41, 42, 42, 43, 43, 45, 45, 55, 55, 57, 57, 58, 58, 59, 59, 60, 60, 61, 61,  0,   100, 100, 97, 97, 95,
+      95, 92, 92, 87, 87, 85, 85, 80, 80, 75, 75, 65, 65, 60, 60, 40, 40, 35, 35, 25,  25,  20,  20,  15, 15, 13,
+      13, 8,  8,  5,  5,  3,  3,  0,  0,  3,  3,  5,  5,  8,  8,  13, 13, 15, 15, 20,  20,  25,  25,  35, 35, 40,
+      40, 60, 60, 65, 65, 75, 75, 80, 80, 85, 85, 87, 87, 92, 92, 95, 95, 97, 97, 100, 100, 0,   61,  65, 65, 70,
+      70, 80, 80, 90, 90, 92, 0,  61, 65, 65, 90, 90, 97, 0,  57, 60, 60, 65, 65, 70,  70,  75,  75,  80, 80, 0,
+      50, 50, 0,  43, 40, 40, 35, 35, 30, 30, 25, 25, 20, 20, 0,  39, 35, 35, 10, 10,  3,   0,   39,  35, 35, 30,
+      30, 20, 20, 10, 10, 8,  0,  45, 45, 40, 40, 35, 35, 0,  55, 55, 60, 60, 65, 65};
+
+  int iySectorsEE[202] = {50, 55, 55, 57, 57, 58, 58, 59, 59, 60, 60, 61, 61, 60, 60, 59, 59, 58, 58, 57,  57,  55,  55,
+                          45, 45, 43, 43, 42, 42, 41, 41, 40, 40, 39, 39, 40, 40, 41, 41, 42, 42, 43, 43,  45,  45,  50,
+                          0,  50, 60, 60, 65, 65, 75, 75, 80, 80, 85, 85, 87, 87, 92, 92, 95, 95, 97, 97,  100, 100, 97,
+                          97, 95, 95, 92, 92, 87, 87, 85, 85, 80, 80, 75, 75, 65, 65, 60, 60, 40, 40, 35,  35,  25,  25,
+                          20, 20, 15, 15, 13, 13, 8,  8,  5,  5,  3,  3,  0,  0,  3,  3,  5,  5,  8,  8,   13,  13,  15,
+                          15, 20, 20, 25, 25, 35, 35, 40, 40, 50, 0,  45, 45, 40, 40, 35, 35, 30, 30, 25,  25,  0,   50,
+                          50, 55, 55, 60, 60, 0,  60, 60, 65, 65, 70, 70, 75, 75, 85, 85, 87, 0,  61, 100, 0,   60,  60,
+                          65, 65, 70, 70, 75, 75, 85, 85, 87, 0,  50, 50, 55, 55, 60, 60, 0,  45, 45, 40,  40,  35,  35,
+                          30, 30, 25, 25, 0,  39, 30, 30, 15, 15, 5,  0,  39, 30, 30, 15, 15, 5};
+
+  for (int i = 0; i < 202; i++) {
+    ixSectorsEE[i] += 1;
+    iySectorsEE[i] += 1;
+    //   std::cout << i << " " << ixSectorsEE[i] << " " << iySectorsEE[i] << std::endl;
+  }
 
-  int ixSectorsEE[202] = {61, 61, 60, 60, 59, 59, 58, 58, 57, 57, 55, 55, 45, 45, 43, 43, 42, 42, 41, 41, 40, 40, 39, 39, 40, 40, 41, 41, 42, 42, 43, 43, 45, 45, 55, 55, 57, 57, 58, 58, 59, 59, 60, 60, 61, 61, 0,100,100, 97, 97, 95, 95, 92, 92, 87, 87, 85, 85, 80, 80, 75, 75, 65, 65, 60, 60, 40, 40, 35, 35, 25, 25, 20, 20, 15, 15, 13, 13,  8,  8,  5,  5,  3,  3,  0,  0,  3,  3,  5,  5,  8,  8, 13, 13, 15, 15, 20, 20, 25, 25, 35, 35, 40, 40, 60, 60, 65, 65, 75, 75, 80, 80, 85, 85, 87, 87, 92, 92, 95, 95, 97, 97,100,100,  0, 61, 65, 65, 70, 70, 80, 80, 90, 90, 92,  0, 61, 65, 65, 90, 90, 97,  0, 57, 60, 60, 65, 65, 70, 70, 75, 75, 80, 80,  0, 50, 50,  0, 43, 40, 40, 35, 35, 30, 30, 25, 25, 20, 20,  0, 39, 35, 35, 10, 10,  3,  0, 39, 35, 35, 30, 30, 20, 20, 10, 10,  8,  0, 45, 45, 40, 40, 35, 35,  0, 55, 55, 60, 60, 65, 65};
- 
-  int iySectorsEE[202] = {50, 55, 55, 57, 57, 58, 58, 59, 59, 60, 60, 61, 61, 60, 60, 59, 59, 58, 58, 57, 57, 55, 55, 45, 45, 43, 43, 42, 42, 41, 41, 40, 40, 39, 39, 40, 40, 41, 41, 42, 42, 43, 43, 45, 45, 50,  0, 50, 60, 60, 65, 65, 75, 75, 80, 80, 85, 85, 87, 87, 92, 92, 95, 95, 97, 97,100,100, 97, 97, 95, 95, 92, 92, 87, 87, 85, 85, 80, 80, 75, 75, 65, 65, 60, 60, 40, 40, 35, 35, 25, 25, 20, 20, 15, 15, 13, 13,  8,  8,  5,  5,  3,  3,  0,  0,  3,  3,  5,  5,  8,  8, 13, 13, 15, 15, 20, 20, 25, 25, 35, 35, 40, 40, 50,  0, 45, 45, 40, 40, 35, 35, 30, 30, 25, 25,  0, 50, 50, 55, 55, 60, 60,  0, 60, 60, 65, 65, 70, 70, 75, 75, 85, 85, 87,  0, 61,100,  0, 60, 60, 65, 65, 70, 70, 75, 75, 85, 85, 87,  0, 50, 50, 55, 55, 60, 60,  0, 45, 45, 40, 40, 35, 35, 30, 30, 25, 25,  0, 39, 30, 30, 15, 15,  5,  0, 39, 30, 30, 15, 15,  5};
-
-
- for ( int i=0; i<202; i++) {
-   ixSectorsEE[i] += 1;
-   iySectorsEE[i] += 1;
-//   std::cout << i << " " << ixSectorsEE[i] << " " << iySectorsEE[i] << std::endl;
- }
-
- TLine l;
- l.SetLineWidth(1);
- for ( int i=0; i<201; i=i+1) {
-   if ( (ixSectorsEE[i]!=1 || iySectorsEE[i]!=1) && 
-	(ixSectorsEE[i+1]!=1 || iySectorsEE[i+1]!=1) ) {
-     l.DrawLine(ixSectorsEE[i], iySectorsEE[i], 
-		ixSectorsEE[i+1], iySectorsEE[i+1]);
-   }
- }
-
-
+  TLine l;
+  l.SetLineWidth(1);
+  for (int i = 0; i < 201; i = i + 1) {
+    if ((ixSectorsEE[i] != 1 || iySectorsEE[i] != 1) && (ixSectorsEE[i + 1] != 1 || iySectorsEE[i + 1] != 1)) {
+      l.DrawLine(ixSectorsEE[i], iySectorsEE[i], ixSectorsEE[i + 1], iySectorsEE[i + 1]);
+    }
+  }
 }
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalDisplaysByEvent.h b/CaloOnlineTools/EcalTools/plugins/EcalDisplaysByEvent.h
index c69c892553fce..352bb599b2e8a 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalDisplaysByEvent.h
+++ b/CaloOnlineTools/EcalTools/plugins/EcalDisplaysByEvent.h
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 //
-// Package:   EcalDisplaysByEvent 
-// Class:     EcalDisplaysByEvent 
-// 
+// Package:   EcalDisplaysByEvent
+// Class:     EcalDisplaysByEvent
+//
 /**\class EcalDisplaysByEvent EcalDisplaysByEvent.cc
 
  Description: <one line class summary>
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <vector>
@@ -56,53 +55,43 @@
 #include "TTree.h"
 #include "TCanvas.h"
 
-
 //
 // class declaration
 //
 
 class EcalDisplaysByEvent : public edm::EDAnalyzer {
-   public:
-      explicit EcalDisplaysByEvent(const edm::ParameterSet&);
-      ~EcalDisplaysByEvent() override;
-
-
-   private:
-      void beginRun(edm::Run const &, edm::EventSetup const &) override ;
-      void analyze(edm::Event const &, edm::EventSetup const &) override;
-      void endJob() override ;
-      std::string intToString(int num);
-      std::string floatToString(float num);
-      void initHists(int);
-      void initEvtByEvtHists(int naiveEvtNum_, int ievt);
-      void deleteEvtByEvtHists();
-      void initAllEventHistos();
-      enum Ecal2DHistSubDetType {
-	 EB_FINE 	= 0,
-	 EB_COARSE 	= 1,
-	 EEM_FINE	= 2,
-	 EEM_COARSE	= 3,
-	 EEP_FINE	= 4,
-	 EEP_COARSE	= 5
-      };
-      TH2F* init2DEcalHist(std::string histTypeName, int subDet);
-      TH3F* init3DEcalHist(std::string histTypeName, int dubDet);
-      TCanvas* init2DEcalCanvas(std::string canvasName);
-      void selectHits(edm::Handle<EcalRecHitCollection> hits,
-          int ievt, edm::ESHandle<CaloTopology> caloTopo);
-      TGraph* selectDigi(DetId det, int ievt);
-      int getEEIndex(EcalElectronicsId elecId);
-      void makeHistos(edm::Handle<EBDigiCollection> ebDigis);
-      void makeHistos(edm::Handle<EEDigiCollection> eeDigis);
-      void makeHistos(edm::Handle<EcalRecHitCollection> hits);
-      void drawHistos();
-      void drawCanvas(TCanvas* canvas, TH1F* hist1, TH1F* hist2, TH1F* hist3);
-      void drawCanvas(TCanvas* canvas, TH2F* hist1, TH2F* hist2, TH2F* hist3);
-      void drawCanvas(TCanvas* canvas, TH3F* hist1, TH3F* hist2, TH3F* hist3);
-      void drawTimingErrors(TProfile2D* profile);
-      void drawEELines();
-
-    // ----------member data ---------------------------
+public:
+  explicit EcalDisplaysByEvent(const edm::ParameterSet&);
+  ~EcalDisplaysByEvent() override;
+
+private:
+  void beginRun(edm::Run const&, edm::EventSetup const&) override;
+  void analyze(edm::Event const&, edm::EventSetup const&) override;
+  void endJob() override;
+  std::string intToString(int num);
+  std::string floatToString(float num);
+  void initHists(int);
+  void initEvtByEvtHists(int naiveEvtNum_, int ievt);
+  void deleteEvtByEvtHists();
+  void initAllEventHistos();
+  enum Ecal2DHistSubDetType { EB_FINE = 0, EB_COARSE = 1, EEM_FINE = 2, EEM_COARSE = 3, EEP_FINE = 4, EEP_COARSE = 5 };
+  TH2F* init2DEcalHist(std::string histTypeName, int subDet);
+  TH3F* init3DEcalHist(std::string histTypeName, int dubDet);
+  TCanvas* init2DEcalCanvas(std::string canvasName);
+  void selectHits(edm::Handle<EcalRecHitCollection> hits, int ievt, edm::ESHandle<CaloTopology> caloTopo);
+  TGraph* selectDigi(DetId det, int ievt);
+  int getEEIndex(EcalElectronicsId elecId);
+  void makeHistos(edm::Handle<EBDigiCollection> ebDigis);
+  void makeHistos(edm::Handle<EEDigiCollection> eeDigis);
+  void makeHistos(edm::Handle<EcalRecHitCollection> hits);
+  void drawHistos();
+  void drawCanvas(TCanvas* canvas, TH1F* hist1, TH1F* hist2, TH1F* hist3);
+  void drawCanvas(TCanvas* canvas, TH2F* hist1, TH2F* hist2, TH2F* hist3);
+  void drawCanvas(TCanvas* canvas, TH3F* hist1, TH3F* hist2, TH3F* hist3);
+  void drawTimingErrors(TProfile2D* profile);
+  void drawEELines();
+
+  // ----------member data ---------------------------
 
   edm::InputTag EBRecHitCollection_;
   edm::InputTag EERecHitCollection_;
@@ -128,7 +117,7 @@ class EcalDisplaysByEvent : public edm::EDAnalyzer {
 
   std::set<EBDetId> listEBChannels;
   std::set<EEDetId> listEEChannels;
-    
+
   int abscissa[10];
   int ordinate[10];
 
@@ -141,11 +130,11 @@ class EcalDisplaysByEvent : public edm::EDAnalyzer {
   std::vector<int> maskedFEDs_;
   std::vector<int> seedCrys_;
   std::vector<std::string> maskedEBs_;
-  std::map<int,TH1F*> FEDsAndTimingHists_;
-  std::map<int,float> crysAndAmplitudesMap_;
-  std::map<int,EcalDCCHeaderBlock> FEDsAndDCCHeaders_;
-  std::map<std::string,int> seedFrequencyMap_;
-  
+  std::map<int, TH1F*> FEDsAndTimingHists_;
+  std::map<int, float> crysAndAmplitudesMap_;
+  std::map<int, EcalDCCHeaderBlock> FEDsAndDCCHeaders_;
+  std::map<std::string, int> seedFrequencyMap_;
+
   TH1F* allFedsTimingHist_;
   // For event-by-evet histos
   TH1F* timingEB_;
@@ -230,11 +219,11 @@ class EcalDisplaysByEvent : public edm::EDAnalyzer {
   TCanvas* digiOccupancyCoarseCanvasAll_;
   TCanvas* timingMapCoarseCanvasAll_;
   TCanvas* timingMapCanvasAll_;
-  
+
   TTree* canvasNames_;
   TTree* histoCanvasNames_;
   EcalFedMap* fedMap_;
   const EcalElectronicsMapping* ecalElectronicsMap_;
- 
-  int naiveEvtNum_; 
+
+  int naiveEvtNum_;
 };
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalExclusiveTrigFilter.cc b/CaloOnlineTools/EcalTools/plugins/EcalExclusiveTrigFilter.cc
index cca7dab4f007e..172d82dec8c19 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalExclusiveTrigFilter.cc
+++ b/CaloOnlineTools/EcalTools/plugins/EcalExclusiveTrigFilter.cc
@@ -2,7 +2,7 @@
 //
 // Package:    EcalExclusiveTrigFilter
 // Class:      EcalExclusiveTrigFilter
-// 
+//
 /**\class EcalExclusiveTrigFilter EcalExclusiveTrigFilter.cc CaloOnlineTools/EcalExclusiveTrigFilter/src/EcalExclusiveTrigFilter.cc
 
  Description: <one line class summary>
@@ -33,77 +33,61 @@ using namespace std;
 //
 // constructors and destructor
 //
-EcalExclusiveTrigFilter::EcalExclusiveTrigFilter(const edm::ParameterSet& iConfig) :
-  l1GTReadoutRecTag_ (iConfig.getUntrackedParameter<std::string>("L1GlobalReadoutRecord","gtDigis"))
-{
-   //now do what ever initialization is needed
-
+EcalExclusiveTrigFilter::EcalExclusiveTrigFilter(const edm::ParameterSet& iConfig)
+    : l1GTReadoutRecTag_(iConfig.getUntrackedParameter<std::string>("L1GlobalReadoutRecord", "gtDigis")) {
+  //now do what ever initialization is needed
 }
 
-
-EcalExclusiveTrigFilter::~EcalExclusiveTrigFilter()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+EcalExclusiveTrigFilter::~EcalExclusiveTrigFilter() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called on each new Event  ------------
-bool
-EcalExclusiveTrigFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+bool EcalExclusiveTrigFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   // get the GMTReadoutCollection
-  Handle<L1MuGMTReadoutCollection> gmtrc_handle; 
-  iEvent.getByLabel(l1GTReadoutRecTag_,gmtrc_handle);
+  Handle<L1MuGMTReadoutCollection> gmtrc_handle;
+  iEvent.getByLabel(l1GTReadoutRecTag_, gmtrc_handle);
   L1MuGMTReadoutCollection const* gmtrc = gmtrc_handle.product();
-  if (!(gmtrc_handle.isValid())) 
-  {
-    LogWarning("EcalExclusiveTrigFilter") << "l1MuGMTReadoutCollection" << " not available";
+  if (!(gmtrc_handle.isValid())) {
+    LogWarning("EcalExclusiveTrigFilter") << "l1MuGMTReadoutCollection"
+                                          << " not available";
     //return;
   }
 
   // get hold of L1GlobalReadoutRecord
   Handle<L1GlobalTriggerReadoutRecord> L1GTRR;
-  iEvent.getByLabel(l1GTReadoutRecTag_,L1GTRR);
+  iEvent.getByLabel(l1GTReadoutRecTag_, L1GTRR);
   bool isEcalL1 = false;
   const unsigned int sizeOfDecisionWord(L1GTRR->decisionWord().size());
-  if (!(L1GTRR.isValid()))
-  {
+  if (!(L1GTRR.isValid())) {
     LogWarning("EcalExclusiveTrigFilter") << l1GTReadoutRecTag_ << " not available";
     //return;
-  }
-  else if(sizeOfDecisionWord<128)
-  {
-    LogWarning("EcalExclusiveTrigFilter") << "size of L1 decisionword is " << sizeOfDecisionWord
-      << "; L1 Ecal triggering bits not available";
-  }
-  else
-  {
+  } else if (sizeOfDecisionWord < 128) {
+    LogWarning("EcalExclusiveTrigFilter")
+        << "size of L1 decisionword is " << sizeOfDecisionWord << "; L1 Ecal triggering bits not available";
+  } else {
     l1Names_.resize(sizeOfDecisionWord);
     l1Accepts_.resize(sizeOfDecisionWord);
-    for (unsigned int i=0; i!=sizeOfDecisionWord; ++i) {
-      l1Accepts_[i]=0;
-      l1Names_[i]="NameNotAvailable";
+    for (unsigned int i = 0; i != sizeOfDecisionWord; ++i) {
+      l1Accepts_[i] = 0;
+      l1Names_[i] = "NameNotAvailable";
     }
-    for (unsigned int i=0; i!=sizeOfDecisionWord; ++i) {
-      if (L1GTRR->decisionWord()[i])
-      {
+    for (unsigned int i = 0; i != sizeOfDecisionWord; ++i) {
+      if (L1GTRR->decisionWord()[i]) {
         l1Accepts_[i]++;
         //cout << "L1A bit: " << i << endl;
       }
     }
 
-    if(l1Accepts_[14] || l1Accepts_[15] || l1Accepts_[16] || l1Accepts_[17]
-        || l1Accepts_[18] || l1Accepts_[19] || l1Accepts_[20])
+    if (l1Accepts_[14] || l1Accepts_[15] || l1Accepts_[16] || l1Accepts_[17] || l1Accepts_[18] || l1Accepts_[19] ||
+        l1Accepts_[20])
       isEcalL1 = true;
-    if(l1Accepts_[73] || l1Accepts_[74] || l1Accepts_[75] || l1Accepts_[76]
-        || l1Accepts_[77] || l1Accepts_[78])
+    if (l1Accepts_[73] || l1Accepts_[74] || l1Accepts_[75] || l1Accepts_[76] || l1Accepts_[77] || l1Accepts_[78])
       isEcalL1 = true;
   }
 
@@ -115,78 +99,95 @@ EcalExclusiveTrigFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetu
   std::vector<L1MuGMTReadoutRecord> gmt_records = gmtrc->getRecords();
   std::vector<L1MuGMTReadoutRecord>::const_iterator igmtrr;
 
-    for(igmtrr=gmt_records.begin(); igmtrr!=gmt_records.end(); igmtrr++) {
-
-      std::vector<L1MuRegionalCand>::const_iterator iter1;
-      std::vector<L1MuRegionalCand> rmc;
-
-      //DT triggers
-      int idt = 0;
-      rmc = igmtrr->getDTBXCands();
-      for(iter1=rmc.begin(); iter1!=rmc.end(); iter1++) {
-        if ( !(*iter1).empty() ) {
-          idt++;
-        }
-      }
+  for (igmtrr = gmt_records.begin(); igmtrr != gmt_records.end(); igmtrr++) {
+    std::vector<L1MuRegionalCand>::const_iterator iter1;
+    std::vector<L1MuRegionalCand> rmc;
 
-      //if(idt>0) std::cout << "Found " << idt << " valid DT candidates in bx wrt. L1A = " 
-      //  << igmtrr->getBxInEvent() << std::endl;
-      if(igmtrr->getBxInEvent()==0 && idt>0) isDTL1 = true;
-
-      //RPC triggers
-      int irpcb = 0;
-      rmc = igmtrr->getBrlRPCCands();
-      for(iter1=rmc.begin(); iter1!=rmc.end(); iter1++) {
-        if ( !(*iter1).empty() ) {
-          irpcb++;
-        }
+    //DT triggers
+    int idt = 0;
+    rmc = igmtrr->getDTBXCands();
+    for (iter1 = rmc.begin(); iter1 != rmc.end(); iter1++) {
+      if (!(*iter1).empty()) {
+        idt++;
       }
+    }
 
-      //if(irpcb>0) std::cout << "Found " << irpcb << " valid RPC candidates in bx wrt. L1A = " 
-      //  << igmtrr->getBxInEvent() << std::endl;
-      if(igmtrr->getBxInEvent()==0 && irpcb>0) isRPCL1 = true;
-
-      //CSC Triggers
-      int icsc = 0;
-      rmc = igmtrr->getCSCCands();
-      for(iter1=rmc.begin(); iter1!=rmc.end(); iter1++) {
-        if ( !(*iter1).empty() ) {
-          icsc++;
-        }
+    //if(idt>0) std::cout << "Found " << idt << " valid DT candidates in bx wrt. L1A = "
+    //  << igmtrr->getBxInEvent() << std::endl;
+    if (igmtrr->getBxInEvent() == 0 && idt > 0)
+      isDTL1 = true;
+
+    //RPC triggers
+    int irpcb = 0;
+    rmc = igmtrr->getBrlRPCCands();
+    for (iter1 = rmc.begin(); iter1 != rmc.end(); iter1++) {
+      if (!(*iter1).empty()) {
+        irpcb++;
       }
-      //if(icsc>0) std::cout << "Found " << icsc << " valid CSC candidates in bx wrt. L1A = " 
-      //    //  << igmtrr->getBxInEvent() << std::endl;
-      if(igmtrr->getBxInEvent()==0 && icsc>0) isCSCL1 = true;
     }
 
-    L1GlobalTriggerReadoutRecord const* gtrr = L1GTRR.product();
-
-    for(int ibx=-1; ibx<=1; ibx++) {
-      bool hcal_top = false;
-      bool hcal_bot = false;
-      const L1GtPsbWord psb = gtrr->gtPsbWord(0xbb0d,ibx);
-      std::vector<int> valid_phi;
-      if((psb.aData(4)&0x3f) >= 1) {valid_phi.push_back( (psb.aData(4)>>10)&0x1f ); }
-      if((psb.bData(4)&0x3f) >= 1) {valid_phi.push_back( (psb.bData(4)>>10)&0x1f ); }
-      if((psb.aData(5)&0x3f) >= 1) {valid_phi.push_back( (psb.aData(5)>>10)&0x1f ); }
-      if((psb.bData(5)&0x3f) >= 1) {valid_phi.push_back( (psb.bData(5)>>10)&0x1f ); }
-      std::vector<int>::const_iterator iphi;
-      for(iphi=valid_phi.begin(); iphi!=valid_phi.end(); iphi++) {
-        //std::cout << "Found HCAL mip with phi=" << *iphi << " in bx wrt. L1A = " << ibx << std::endl;
-        if(*iphi<9) hcal_top=true;
-        if(*iphi>8) hcal_bot=true;
+    //if(irpcb>0) std::cout << "Found " << irpcb << " valid RPC candidates in bx wrt. L1A = "
+    //  << igmtrr->getBxInEvent() << std::endl;
+    if (igmtrr->getBxInEvent() == 0 && irpcb > 0)
+      isRPCL1 = true;
+
+    //CSC Triggers
+    int icsc = 0;
+    rmc = igmtrr->getCSCCands();
+    for (iter1 = rmc.begin(); iter1 != rmc.end(); iter1++) {
+      if (!(*iter1).empty()) {
+        icsc++;
       }
-      if(ibx==0 && hcal_top && hcal_bot) isHCALL1=true;
     }
+    //if(icsc>0) std::cout << "Found " << icsc << " valid CSC candidates in bx wrt. L1A = "
+    //    //  << igmtrr->getBxInEvent() << std::endl;
+    if (igmtrr->getBxInEvent() == 0 && icsc > 0)
+      isCSCL1 = true;
+  }
 
-    std::cout << "**** Trigger Source ****" << std::endl;
-    if(isDTL1) std::cout << "DT" << std::endl;
-    if(isRPCL1) std::cout << "RPC" << std::endl;
-    if(isCSCL1) cout << "CSC" << endl;
-    if(isHCALL1) std::cout << "HCAL" << std::endl;
-    if(isEcalL1) std::cout << "ECAL" << std::endl;
-    std::cout << "************************" << std::endl;
+  L1GlobalTriggerReadoutRecord const* gtrr = L1GTRR.product();
 
-    return(isEcalL1 && !isDTL1 && !isRPCL1 && !isCSCL1 && !isHCALL1);
+  for (int ibx = -1; ibx <= 1; ibx++) {
+    bool hcal_top = false;
+    bool hcal_bot = false;
+    const L1GtPsbWord psb = gtrr->gtPsbWord(0xbb0d, ibx);
+    std::vector<int> valid_phi;
+    if ((psb.aData(4) & 0x3f) >= 1) {
+      valid_phi.push_back((psb.aData(4) >> 10) & 0x1f);
+    }
+    if ((psb.bData(4) & 0x3f) >= 1) {
+      valid_phi.push_back((psb.bData(4) >> 10) & 0x1f);
+    }
+    if ((psb.aData(5) & 0x3f) >= 1) {
+      valid_phi.push_back((psb.aData(5) >> 10) & 0x1f);
+    }
+    if ((psb.bData(5) & 0x3f) >= 1) {
+      valid_phi.push_back((psb.bData(5) >> 10) & 0x1f);
+    }
+    std::vector<int>::const_iterator iphi;
+    for (iphi = valid_phi.begin(); iphi != valid_phi.end(); iphi++) {
+      //std::cout << "Found HCAL mip with phi=" << *iphi << " in bx wrt. L1A = " << ibx << std::endl;
+      if (*iphi < 9)
+        hcal_top = true;
+      if (*iphi > 8)
+        hcal_bot = true;
+    }
+    if (ibx == 0 && hcal_top && hcal_bot)
+      isHCALL1 = true;
+  }
 
+  std::cout << "**** Trigger Source ****" << std::endl;
+  if (isDTL1)
+    std::cout << "DT" << std::endl;
+  if (isRPCL1)
+    std::cout << "RPC" << std::endl;
+  if (isCSCL1)
+    cout << "CSC" << endl;
+  if (isHCALL1)
+    std::cout << "HCAL" << std::endl;
+  if (isEcalL1)
+    std::cout << "ECAL" << std::endl;
+  std::cout << "************************" << std::endl;
+
+  return (isEcalL1 && !isDTL1 && !isRPCL1 && !isCSCL1 && !isHCALL1);
 }
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalExclusiveTrigFilter.h b/CaloOnlineTools/EcalTools/plugins/EcalExclusiveTrigFilter.h
index 1050d7b8d0977..7ff429f84b896 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalExclusiveTrigFilter.h
+++ b/CaloOnlineTools/EcalTools/plugins/EcalExclusiveTrigFilter.h
@@ -2,7 +2,7 @@
 //
 // Package:    EcalExclusiveTrigFilter
 // Class:      EcalExclusiveTrigFilter
-// 
+//
 /**\class EcalExclusiveTrigFilter EcalExclusiveTrigFilter.cc CaloOnlineTools/EcalExclusiveTrigFilter/src/EcalExclusiveTrigFilter.cc
 
  Description: <one line class summary>
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -36,15 +35,15 @@
 //
 
 class EcalExclusiveTrigFilter : public edm::EDFilter {
-   public:
-      explicit EcalExclusiveTrigFilter(const edm::ParameterSet&);
-      ~EcalExclusiveTrigFilter() override;
-
-   private:
-      bool filter(edm::Event&, const edm::EventSetup&) override;
-      
-      // ----------member data ---------------------------
-        edm::InputTag l1GTReadoutRecTag_;        
-        std::vector<int> l1Accepts_;
-        std::vector<std::string> l1Names_;
+public:
+  explicit EcalExclusiveTrigFilter(const edm::ParameterSet&);
+  ~EcalExclusiveTrigFilter() override;
+
+private:
+  bool filter(edm::Event&, const edm::EventSetup&) override;
+
+  // ----------member data ---------------------------
+  edm::InputTag l1GTReadoutRecTag_;
+  std::vector<int> l1Accepts_;
+  std::vector<std::string> l1Names_;
 };
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalFEDErrorFilter.cc b/CaloOnlineTools/EcalTools/plugins/EcalFEDErrorFilter.cc
index ade10690e9599..61c412be05727 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalFEDErrorFilter.cc
+++ b/CaloOnlineTools/EcalTools/plugins/EcalFEDErrorFilter.cc
@@ -18,70 +18,59 @@ Description: <one line class summary>
 
 #include "CaloOnlineTools/EcalTools/plugins/EcalFEDErrorFilter.h"
 
-
 //
 // constructors and destructor
 //
-EcalFEDErrorFilter::EcalFEDErrorFilter(const edm::ParameterSet& iConfig) :
-  HLTFilter(iConfig)
-{
+EcalFEDErrorFilter::EcalFEDErrorFilter(const edm::ParameterSet& iConfig) : HLTFilter(iConfig) {
   //now do what ever initialization is needed
 
-  DataLabel_     = iConfig.getParameter<edm::InputTag>("InputLabel");
-  fedUnpackList_ = iConfig.getUntrackedParameter< std::vector<int> >("FEDs", std::vector<int>());
+  DataLabel_ = iConfig.getParameter<edm::InputTag>("InputLabel");
+  fedUnpackList_ = iConfig.getUntrackedParameter<std::vector<int> >("FEDs", std::vector<int>());
   if (fedUnpackList_.empty())
-    for (int i=FEDNumbering::MINECALFEDID; i<=FEDNumbering::MAXECALFEDID; i++)
+    for (int i = FEDNumbering::MINECALFEDID; i <= FEDNumbering::MAXECALFEDID; i++)
       fedUnpackList_.push_back(i);
 }
 
-
-EcalFEDErrorFilter::~EcalFEDErrorFilter()
-{
-
+EcalFEDErrorFilter::~EcalFEDErrorFilter() {
   // do anything here that needs to be done at desctruction time
   // (e.g. close files, deallocate resources etc.)
-
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called on each new Event  ------------
-bool
-EcalFEDErrorFilter::hltFilter(edm::Event& iEvent, const edm::EventSetup& iSetup, trigger::TriggerFilterObjectWithRefs & filterproduct) const
-{
+bool EcalFEDErrorFilter::hltFilter(edm::Event& iEvent,
+                                   const edm::EventSetup& iSetup,
+                                   trigger::TriggerFilterObjectWithRefs& filterproduct) const {
   using namespace edm;
 
   edm::Handle<FEDRawDataCollection> rawdata;
-  iEvent.getByLabel(DataLabel_,rawdata);
+  iEvent.getByLabel(DataLabel_, rawdata);
 
   // get fed raw data and SM id
 
   // loop over FEDS
-  for (std::vector<int>::const_iterator i=fedUnpackList_.begin(); i!=fedUnpackList_.end(); i++)
-    {
-
-      // get fed raw data and SM id
-      const FEDRawData & fedData = rawdata->FEDData(*i);
-      int length = fedData.size()/sizeof(uint64_t);
-
-      //    LogDebug("EcalRawToDigi") << "raw data length: " << length ;
-      //if data size is not null interpret data
-      if ( length >= 1 )
-	{
-      	    uint64_t * pData = (uint64_t *)(fedData.data());
-	    //When crc error is found return true
-	    uint64_t * fedTrailer = pData + (length - 1);
-	    bool crcError = (*fedTrailer >> 2 ) & 0x1;
-	    if (crcError)
-	      {
-		std::cout << "CRCERROR in FED " << *i << " trailer is " << std::setw(8)   << std::hex << (*fedTrailer) << std::endl;
-		return true;
-	      }
-	}
+  for (std::vector<int>::const_iterator i = fedUnpackList_.begin(); i != fedUnpackList_.end(); i++) {
+    // get fed raw data and SM id
+    const FEDRawData& fedData = rawdata->FEDData(*i);
+    int length = fedData.size() / sizeof(uint64_t);
+
+    //    LogDebug("EcalRawToDigi") << "raw data length: " << length ;
+    //if data size is not null interpret data
+    if (length >= 1) {
+      uint64_t* pData = (uint64_t*)(fedData.data());
+      //When crc error is found return true
+      uint64_t* fedTrailer = pData + (length - 1);
+      bool crcError = (*fedTrailer >> 2) & 0x1;
+      if (crcError) {
+        std::cout << "CRCERROR in FED " << *i << " trailer is " << std::setw(8) << std::hex << (*fedTrailer)
+                  << std::endl;
+        return true;
+      }
     }
+  }
 
   return false;
 }
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalFEDErrorFilter.h b/CaloOnlineTools/EcalTools/plugins/EcalFEDErrorFilter.h
index 304a20e366751..2158be50bdfba 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalFEDErrorFilter.h
+++ b/CaloOnlineTools/EcalTools/plugins/EcalFEDErrorFilter.h
@@ -16,7 +16,6 @@ Description: <one line class summary>
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -48,11 +47,12 @@ class EcalFEDErrorFilter : public HLTFilter {
   ~EcalFEDErrorFilter() override;
 
 private:
-  bool hltFilter(edm::Event&, const edm::EventSetup&, trigger::TriggerFilterObjectWithRefs & filterproduct) const override;
+  bool hltFilter(edm::Event&,
+                 const edm::EventSetup&,
+                 trigger::TriggerFilterObjectWithRefs& filterproduct) const override;
 
   // ----------member data ---------------------------
 
-  edm::InputTag     DataLabel_;
+  edm::InputTag DataLabel_;
   std::vector<int> fedUnpackList_;
-
 };
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalFEDWithCRCErrorProducer.cc b/CaloOnlineTools/EcalTools/plugins/EcalFEDWithCRCErrorProducer.cc
index 4c7950842ac3a..f43c284c22ab6 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalFEDWithCRCErrorProducer.cc
+++ b/CaloOnlineTools/EcalTools/plugins/EcalFEDWithCRCErrorProducer.cc
@@ -2,7 +2,7 @@
 //
 // Package:    EcalFEDWithCRCErrorProducer
 // Class:      EcalFEDWithCRCErrorProducer
-// 
+//
 /**\class EcalFEDWithCRCErrorProducer EcalFEDWithCRCErrorProducer.cc filter/EcalFEDWithCRCErrorProducer/src/EcalFEDWithCRCErrorProducer.cc
 
 Description: <one line class summary>
@@ -16,7 +16,6 @@ Description: <one line class summary>
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -42,104 +41,87 @@ Description: <one line class summary>
 // class declaration
 //
 
-class EcalFEDWithCRCErrorProducer : public edm::EDProducer 
-{
+class EcalFEDWithCRCErrorProducer : public edm::EDProducer {
 public:
   explicit EcalFEDWithCRCErrorProducer(const edm::ParameterSet&);
   ~EcalFEDWithCRCErrorProducer() override;
-  
+
 private:
   void produce(edm::Event&, const edm::EventSetup&) override;
-  
+
   // ----------member data ---------------------------
-  
-  edm::InputTag     DataLabel_;
+
+  edm::InputTag DataLabel_;
   std::vector<int> fedUnpackList_;
   bool writeAllEcalFEDs_;
 };
 
-
-
 //
 // constructors and destructor
 //
-EcalFEDWithCRCErrorProducer::EcalFEDWithCRCErrorProducer(const edm::ParameterSet& iConfig)
-{
+EcalFEDWithCRCErrorProducer::EcalFEDWithCRCErrorProducer(const edm::ParameterSet& iConfig) {
   //now do what ever initialization is needed
 
-  DataLabel_     = iConfig.getParameter<edm::InputTag>("InputLabel");
-  fedUnpackList_ = iConfig.getUntrackedParameter< std::vector<int> >("FEDs", std::vector<int>());
-  writeAllEcalFEDs_ = iConfig.getUntrackedParameter<bool >("writeAllEcalFED", false);
-  if (fedUnpackList_.empty()) 
-    for (int i=FEDNumbering::MINECALFEDID; i<=FEDNumbering::MAXECALFEDID; i++)
+  DataLabel_ = iConfig.getParameter<edm::InputTag>("InputLabel");
+  fedUnpackList_ = iConfig.getUntrackedParameter<std::vector<int> >("FEDs", std::vector<int>());
+  writeAllEcalFEDs_ = iConfig.getUntrackedParameter<bool>("writeAllEcalFED", false);
+  if (fedUnpackList_.empty())
+    for (int i = FEDNumbering::MINECALFEDID; i <= FEDNumbering::MAXECALFEDID; i++)
       fedUnpackList_.push_back(i);
 
-  produces< FEDRawDataCollection >();
+  produces<FEDRawDataCollection>();
 }
 
-
-EcalFEDWithCRCErrorProducer::~EcalFEDWithCRCErrorProducer()
-{
- 
+EcalFEDWithCRCErrorProducer::~EcalFEDWithCRCErrorProducer() {
   // do anything here that needs to be done at desctruction time
   // (e.g. close files, deallocate resources etc.)
-
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called on each new Event  ------------
-void
-EcalFEDWithCRCErrorProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void EcalFEDWithCRCErrorProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   using namespace edm;
 
-  edm::Handle<FEDRawDataCollection> rawdata;  
-  iEvent.getByLabel(DataLabel_,rawdata);
+  edm::Handle<FEDRawDataCollection> rawdata;
+  iEvent.getByLabel(DataLabel_, rawdata);
 
   auto producedData = std::make_unique<FEDRawDataCollection>();
   // get fed raw data and SM id
 
   // loop over FEDS
-  for (std::vector<int>::const_iterator i=fedUnpackList_.begin(); i!=fedUnpackList_.end(); i++) 
-    {
-
-      // get fed raw data and SM id
-      const FEDRawData & fedData = rawdata->FEDData(*i);
-      int length = fedData.size()/sizeof(uint64_t);
-
-      //    LogDebug("EcalRawToDigi") << "raw data length: " << length ;
-      //if data size is not null interpret data
-      if ( length >= 1 )
-	{
-      	    uint64_t * pData = (uint64_t *)(fedData.data());
-	    //When crc error is found return true
-	    uint64_t * fedTrailer = pData + (length - 1);
-	    bool crcError = (*fedTrailer >> 2 ) & 0x1; 
-	    // this fed has data -- lets copy it
-	    if (writeAllEcalFEDs_ || crcError)
-	      {
-		FEDRawData & fedDataProd = producedData->FEDData(*i);
-		if ( fedDataProd.size() != 0 ) 
-		  {
-		    //                std::cout << " More than one FEDRawDataCollection with data in FED ";
-		    //                std::cout << j << " Skipping the 2nd\n";
-		    continue;
-		  }
-		fedDataProd.resize(fedData.size());
-		unsigned char *dataProd=fedDataProd.data();
-		const unsigned char *data=fedData.data();
-		for ( unsigned int k=0; k<fedData.size(); ++k ) 
-		  {
-		    dataProd[k]=data[k];
-		  }
-	      }
-	}
+  for (std::vector<int>::const_iterator i = fedUnpackList_.begin(); i != fedUnpackList_.end(); i++) {
+    // get fed raw data and SM id
+    const FEDRawData& fedData = rawdata->FEDData(*i);
+    int length = fedData.size() / sizeof(uint64_t);
+
+    //    LogDebug("EcalRawToDigi") << "raw data length: " << length ;
+    //if data size is not null interpret data
+    if (length >= 1) {
+      uint64_t* pData = (uint64_t*)(fedData.data());
+      //When crc error is found return true
+      uint64_t* fedTrailer = pData + (length - 1);
+      bool crcError = (*fedTrailer >> 2) & 0x1;
+      // this fed has data -- lets copy it
+      if (writeAllEcalFEDs_ || crcError) {
+        FEDRawData& fedDataProd = producedData->FEDData(*i);
+        if (fedDataProd.size() != 0) {
+          //                std::cout << " More than one FEDRawDataCollection with data in FED ";
+          //                std::cout << j << " Skipping the 2nd\n";
+          continue;
+        }
+        fedDataProd.resize(fedData.size());
+        unsigned char* dataProd = fedDataProd.data();
+        const unsigned char* data = fedData.data();
+        for (unsigned int k = 0; k < fedData.size(); ++k) {
+          dataProd[k] = data[k];
+        }
+      }
     }
-  
+  }
+
   iEvent.put(std::move(producedData));
 }
 
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalHexDisplay.cc b/CaloOnlineTools/EcalTools/plugins/EcalHexDisplay.cc
index 9a1c54c48dac2..7184e2c95c9f6 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalHexDisplay.cc
+++ b/CaloOnlineTools/EcalTools/plugins/EcalHexDisplay.cc
@@ -6,71 +6,60 @@
 
 #include "CaloOnlineTools/EcalTools/plugins/EcalHexDisplay.h"
 
-EcalHexDisplay::EcalHexDisplay(const edm::ParameterSet& ps) :
-    verbosity_ (ps.getUntrackedParameter<int>("verbosity",1)),
-    beg_fed_id_ (ps.getUntrackedParameter<int>("beg_fed_id",0)),
-    end_fed_id_ (ps.getUntrackedParameter<int>("end_fed_id",654)),
-    first_event_ (ps.getUntrackedParameter<int>("first_event",1)),
-    last_event_  (ps.getUntrackedParameter<int>("last_event",9999999)),
-    event_ (0),
-    writeDcc_ (ps.getUntrackedParameter<bool>("writeDCC",false)),
-    filename_ (ps.getUntrackedParameter<std::string>("filename","dump.bin")),
-    fedRawDataCollectionTag_(ps.getParameter<edm::InputTag>("fedRawDataCollectionTag"))
-{  
-}
+EcalHexDisplay::EcalHexDisplay(const edm::ParameterSet& ps)
+    : verbosity_(ps.getUntrackedParameter<int>("verbosity", 1)),
+      beg_fed_id_(ps.getUntrackedParameter<int>("beg_fed_id", 0)),
+      end_fed_id_(ps.getUntrackedParameter<int>("end_fed_id", 654)),
+      first_event_(ps.getUntrackedParameter<int>("first_event", 1)),
+      last_event_(ps.getUntrackedParameter<int>("last_event", 9999999)),
+      event_(0),
+      writeDcc_(ps.getUntrackedParameter<bool>("writeDCC", false)),
+      filename_(ps.getUntrackedParameter<std::string>("filename", "dump.bin")),
+      fedRawDataCollectionTag_(ps.getParameter<edm::InputTag>("fedRawDataCollectionTag")) {}
 
-void EcalHexDisplay::analyze( const edm::Event & e, const  edm::EventSetup& c){
-  
+void EcalHexDisplay::analyze(const edm::Event& e, const edm::EventSetup& c) {
   event_++;
-  if (event_ < first_event_ || last_event_ < event_) return;
-  
+  if (event_ < first_event_ || last_event_ < event_)
+    return;
 
   edm::Handle<FEDRawDataCollection> rawdata;
-  e.getByLabel(fedRawDataCollectionTag_, rawdata);  
+  e.getByLabel(fedRawDataCollectionTag_, rawdata);
+
+  std::ofstream dumpFile(filename_.c_str(), std::ios::app);
 
-  std::ofstream dumpFile (filename_.c_str(),std::ios::app );
-  
-  for (int id= 0; id<=FEDNumbering::MAXFEDID; ++id){ 
-    
-    if (id < beg_fed_id_ || end_fed_id_ < id) continue;
+  for (int id = 0; id <= FEDNumbering::MAXFEDID; ++id) {
+    if (id < beg_fed_id_ || end_fed_id_ < id)
+      continue;
 
     const FEDRawData& data = rawdata->FEDData(id);
-    
-    if (data.size()>4){      
-      
-      std::cout << "\n\n\n[EcalHexDumperModule] Event: " 
-		<< std::dec << event_ 
-		<< " fed_id: " << id 
-		<< " size_fed: " << data.size() << "\n"<< std::endl;
-      
-      if ( ( data.size() %16 ) !=0)
-	{
-	  std::cout << "***********************************************" << std::endl;
-	  std::cout<< "Fed size in bits not multiple of 64, strange." << std::endl;
-	  std::cout << "***********************************************" << std::endl;
-	}
-      
-      
+
+    if (data.size() > 4) {
+      std::cout << "\n\n\n[EcalHexDumperModule] Event: " << std::dec << event_ << " fed_id: " << id
+                << " size_fed: " << data.size() << "\n"
+                << std::endl;
+
+      if ((data.size() % 16) != 0) {
+        std::cout << "***********************************************" << std::endl;
+        std::cout << "Fed size in bits not multiple of 64, strange." << std::endl;
+        std::cout << "***********************************************" << std::endl;
+      }
+
       int length = data.size();
-      const unsigned long               * pData     = ( reinterpret_cast<unsigned long*>(const_cast<unsigned char*> ( data.data())));
+      const unsigned long* pData = (reinterpret_cast<unsigned long*>(const_cast<unsigned char*>(data.data())));
       std::cout << std::setfill('0');
-      for (int words=0; words < length/4; (words+=2)  )
-	{
-	  std::cout << std::setw(8)   << std::hex << pData[words+1] << " ";
-	  std::cout << std::setw(8)   << std::hex << pData[words] << std::endl;
-	}
+      for (int words = 0; words < length / 4; (words += 2)) {
+        std::cout << std::setw(8) << std::hex << pData[words + 1] << " ";
+        std::cout << std::setw(8) << std::hex << pData[words] << std::endl;
+      }
 
       std::cout << "\n";
 
-
-      if (beg_fed_id_ <= id && id <= end_fed_id_ && writeDcc_)
-	{
-	  dumpFile.write( reinterpret_cast <const char *> (pData), length);
-	}
+      if (beg_fed_id_ <= id && id <= end_fed_id_ && writeDcc_) {
+        dumpFile.write(reinterpret_cast<const char*>(pData), length);
+      }
     }
-    
   }
-  dumpFile.close();    
-  if (! writeDcc_) remove(filename_.c_str()); 
+  dumpFile.close();
+  if (!writeDcc_)
+    remove(filename_.c_str());
 }
-
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalHexDisplay.h b/CaloOnlineTools/EcalTools/plugins/EcalHexDisplay.h
index 134685e031152..96d753aba6f4b 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalHexDisplay.h
+++ b/CaloOnlineTools/EcalTools/plugins/EcalHexDisplay.h
@@ -4,7 +4,6 @@
  *
  */
 
-
 #include <FWCore/Framework/interface/EDAnalyzer.h>
 #include <FWCore/Framework/interface/Event.h>
 #include <FWCore/Framework/interface/MakerMacros.h>
@@ -21,26 +20,24 @@
 #include <cstdio>
 #include <fstream>
 
-#include <iomanip> 
-
-
-class EcalHexDisplay: public edm::EDAnalyzer {
+#include <iomanip>
 
-  public:
-    EcalHexDisplay(const edm::ParameterSet& ps);
+class EcalHexDisplay : public edm::EDAnalyzer {
+public:
+  EcalHexDisplay(const edm::ParameterSet& ps);
 
-  protected:
-    int      verbosity_;
-    int      beg_fed_id_;
-    int      end_fed_id_;
-    int      first_event_;
-    int      last_event_;
-    int      event_;
-    bool     writeDcc_;
-    std::string   filename_;
+protected:
+  int verbosity_;
+  int beg_fed_id_;
+  int end_fed_id_;
+  int first_event_;
+  int last_event_;
+  int event_;
+  bool writeDcc_;
+  std::string filename_;
 
-    void analyze(const edm::Event & e, const  edm::EventSetup& c) override;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
 
-  private:
-    edm::InputTag fedRawDataCollectionTag_;
+private:
+  edm::InputTag fedRawDataCollectionTag_;
 };
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalMipGraphs.cc b/CaloOnlineTools/EcalTools/plugins/EcalMipGraphs.cc
index c5fc99d28aae8..2ea7ddf32a69f 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalMipGraphs.cc
+++ b/CaloOnlineTools/EcalTools/plugins/EcalMipGraphs.cc
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 //
-// Package:   EcalMipGraphs 
-// Class:     EcalMipGraphs 
-// 
+// Package:   EcalMipGraphs
+// Class:     EcalMipGraphs
+//
 /**\class EcalMipGraphs EcalMipGraphs.cc
 
  Description: <one line class summary>
@@ -33,97 +33,82 @@ using namespace std;
 //
 // static data member definitions
 //
-float EcalMipGraphs::gainRatio[3] = { 1., 2. , 12. }; 
+float EcalMipGraphs::gainRatio[3] = {1., 2., 12.};
 edm::Service<TFileService> EcalMipGraphs::fileService;
 
 //
 // constructors and destructor
 //
-EcalMipGraphs::EcalMipGraphs(const edm::ParameterSet& iConfig) :
-  EBRecHitCollection_ (iConfig.getParameter<edm::InputTag>("EcalRecHitCollectionEB")),
-  EERecHitCollection_ (iConfig.getParameter<edm::InputTag>("EcalRecHitCollectionEE")),
-  EBDigis_ (iConfig.getParameter<edm::InputTag>("EBDigiCollection")),
-  EEDigis_ (iConfig.getParameter<edm::InputTag>("EEDigiCollection")),
-  headerProducer_ (iConfig.getParameter<edm::InputTag> ("headerProducer")),
-  runNum_(-1),
-  side_ (iConfig.getUntrackedParameter<int>("side", 3)),
-  threshold_ (iConfig.getUntrackedParameter<double>("amplitudeThreshold", 12.0)),
-  minTimingAmp_ (iConfig.getUntrackedParameter<double>("minimumTimingAmplitude", 0.100))
-{
+EcalMipGraphs::EcalMipGraphs(const edm::ParameterSet& iConfig)
+    : EBRecHitCollection_(iConfig.getParameter<edm::InputTag>("EcalRecHitCollectionEB")),
+      EERecHitCollection_(iConfig.getParameter<edm::InputTag>("EcalRecHitCollectionEE")),
+      EBDigis_(iConfig.getParameter<edm::InputTag>("EBDigiCollection")),
+      EEDigis_(iConfig.getParameter<edm::InputTag>("EEDigiCollection")),
+      headerProducer_(iConfig.getParameter<edm::InputTag>("headerProducer")),
+      runNum_(-1),
+      side_(iConfig.getUntrackedParameter<int>("side", 3)),
+      threshold_(iConfig.getUntrackedParameter<double>("amplitudeThreshold", 12.0)),
+      minTimingAmp_(iConfig.getUntrackedParameter<double>("minimumTimingAmplitude", 0.100)) {
   vector<int> listDefaults;
   listDefaults.push_back(-1);
-  
+
   maskedChannels_ = iConfig.getUntrackedParameter<vector<int> >("maskedChannels", listDefaults);
   maskedFEDs_ = iConfig.getUntrackedParameter<vector<int> >("maskedFEDs", listDefaults);
-  seedCrys_ = iConfig.getUntrackedParameter<vector<int> >("seedCrys",vector<int>());
+  seedCrys_ = iConfig.getUntrackedParameter<vector<int> >("seedCrys", vector<int>());
 
   vector<string> defaultMaskedEBs;
   defaultMaskedEBs.push_back("none");
-  maskedEBs_ =  iConfig.getUntrackedParameter<vector<string> >("maskedEBs",defaultMaskedEBs);
-  
+  maskedEBs_ = iConfig.getUntrackedParameter<vector<string> >("maskedEBs", defaultMaskedEBs);
+
   fedMap_ = new EcalFedMap();
 
   string title1 = "Jitter for all FEDs";
   string name1 = "JitterAllFEDs";
-  allFedsTimingHist_ = fileService->make<TH1F>(name1.c_str(),title1.c_str(),150,-7,7);
-  
+  allFedsTimingHist_ = fileService->make<TH1F>(name1.c_str(), title1.c_str(), 150, -7, 7);
+
   // load up the maskedFED list with the proper FEDids
-  if(maskedFEDs_[0]==-1)
-  {
+  if (maskedFEDs_[0] == -1) {
     //if "actual" EB id given, then convert to FEDid and put in listFEDs_
-    if(maskedEBs_[0] != "none")
-    {
+    if (maskedEBs_[0] != "none") {
       maskedFEDs_.clear();
-      for(vector<string>::const_iterator ebItr = maskedEBs_.begin(); ebItr != maskedEBs_.end(); ++ebItr)
-      {
+      for (vector<string>::const_iterator ebItr = maskedEBs_.begin(); ebItr != maskedEBs_.end(); ++ebItr) {
         maskedFEDs_.push_back(fedMap_->getFedFromSlice(*ebItr));
       }
     }
   }
-  
-  for (int i=0; i<10; i++)        
-    abscissa[i] = i;
-  
-  naiveEvtNum_ = 0;
-
-}
 
+  for (int i = 0; i < 10; i++)
+    abscissa[i] = i;
 
-EcalMipGraphs::~EcalMipGraphs()
-{
+  naiveEvtNum_ = 0;
 }
 
+EcalMipGraphs::~EcalMipGraphs() {}
 
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-EcalMipGraphs::analyze(edm::Event const & iEvent, edm::EventSetup const & iSetup)
-{
-
+void EcalMipGraphs::analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup) {
   // get the headers
   // (one header for each supermodule)
   edm::Handle<EcalRawDataCollection> DCCHeaders;
   iEvent.getByLabel(headerProducer_, DCCHeaders);
 
-  for (EcalRawDataCollection::const_iterator headerItr= DCCHeaders->begin();
-		  headerItr != DCCHeaders->end (); 
-		  ++headerItr) 
-  {
-    FEDsAndDCCHeaders_[headerItr->id()+600] = *headerItr;
+  for (EcalRawDataCollection::const_iterator headerItr = DCCHeaders->begin(); headerItr != DCCHeaders->end();
+       ++headerItr) {
+    FEDsAndDCCHeaders_[headerItr->id() + 600] = *headerItr;
   }
 
   int ievt = iEvent.id().event();
   naiveEvtNum_++;
 
-  if(runNum_==-1)
-  {
+  if (runNum_ == -1) {
     runNum_ = iEvent.id().run();
-    canvasNames_ = fileService->make<TTree>("canvasNames","Names of written canvases");
+    canvasNames_ = fileService->make<TTree>("canvasNames", "Names of written canvases");
     names = new std::vector<string>();
-    canvasNames_->Branch("names","vector<string>",&names);
+    canvasNames_->Branch("names", "vector<string>", &names);
   }
 
   //We only want the 3x3's for this event...
@@ -144,110 +129,101 @@ EcalMipGraphs::analyze(edm::Event const & iEvent, edm::EventSetup const & iSetup
 
   selectHits(EBhits, ievt, caloTopo);
   selectHits(EEhits, ievt, caloTopo);
-  
 }
 
-
-TGraph* EcalMipGraphs::selectDigi(DetId thisDet, int ievt)
-{
+TGraph* EcalMipGraphs::selectDigi(DetId thisDet, int ievt) {
   int emptyY[10];
-  for (int i=0; i<10; i++)
+  for (int i = 0; i < 10; i++)
     emptyY[i] = 0;
   TGraph* emptyGraph = fileService->make<TGraph>(10, abscissa, emptyY);
   emptyGraph->SetTitle("NOT ECAL");
-  
+
   //If the DetId is not from Ecal, return
-  if(thisDet.det() != DetId::Ecal)
+  if (thisDet.det() != DetId::Ecal)
     return emptyGraph;
-  
+
   emptyGraph->SetTitle("NO DIGIS");
-  //find digi we need  -- can't get find() to work; need DataFrame(DetId det) to work? 
+  //find digi we need  -- can't get find() to work; need DataFrame(DetId det) to work?
   EcalElectronicsId elecId = ecalElectronicsMap_->getElectronicsId(thisDet);
-  int FEDid = 600+elecId.dccId();
+  int FEDid = 600 + elecId.dccId();
   bool isBarrel = true;
-  if(FEDid < 610 || FEDid > 645)
+  if (FEDid < 610 || FEDid > 645)
     isBarrel = false;
   int cryIndex = isBarrel ? ((EBDetId)thisDet).hashedIndex() : getEEIndex(elecId);
   int ic = isBarrel ? ((EBDetId)thisDet).ic() : cryIndex;
 
   string sliceName = fedMap_->getSliceFromFed(FEDid);
   EcalDataFrame df;
-  if(isBarrel)
-  {
+  if (isBarrel) {
     EBDigiCollection::const_iterator digiItr = EBdigisHandle->begin();
-    while(digiItr != EBdigisHandle->end() && ((*digiItr).id() != (EBDetId)thisDet))
-    {
+    while (digiItr != EBdigisHandle->end() && ((*digiItr).id() != (EBDetId)thisDet)) {
       ++digiItr;
     }
-    if(digiItr==EBdigisHandle->end())
-    {
+    if (digiItr == EBdigisHandle->end()) {
       //LogWarning("EcalMipGraphs") << "Cannot find digi for ic:" << ic
       //  << " FED:" << FEDid << " evt:" << naiveEvtNum_;
       return emptyGraph;
-    }
-    else
+    } else
       df = *digiItr;
-  }
-  else
-  {
+  } else {
     EEDigiCollection::const_iterator digiItr = EEdigisHandle->begin();
-    while(digiItr != EEdigisHandle->end() && ((*digiItr).id() != (EEDetId)thisDet))
-    {
+    while (digiItr != EEdigisHandle->end() && ((*digiItr).id() != (EEDetId)thisDet)) {
       ++digiItr;
     }
-    if(digiItr==EEdigisHandle->end())
-    {
+    if (digiItr == EEdigisHandle->end()) {
       //LogWarning("EcalMipGraphs") << "Cannot find digi for ic:" << ic
       //  << " FED:" << FEDid << " evt:" << naiveEvtNum_;
       return emptyGraph;
-    }
-    else df = *digiItr;
+    } else
+      df = *digiItr;
   }
 
   int gainId = FEDsAndDCCHeaders_[FEDid].getMgpaGain();
   int gainHuman;
-  if      (gainId ==1) gainHuman =12;
-  else if (gainId ==2) gainHuman =6;
-  else if (gainId ==3) gainHuman =1;
-  else                 gainHuman =-1; 
+  if (gainId == 1)
+    gainHuman = 12;
+  else if (gainId == 2)
+    gainHuman = 6;
+  else if (gainId == 3)
+    gainHuman = 1;
+  else
+    gainHuman = -1;
 
   double pedestal = 200;
 
   emptyGraph->SetTitle("FIRST TWO SAMPLES NOT GAIN12");
-  if(df.sample(0).gainId()!=1 || df.sample(1).gainId()!=1) return emptyGraph; //goes to the next digi
+  if (df.sample(0).gainId() != 1 || df.sample(1).gainId() != 1)
+    return emptyGraph;  //goes to the next digi
   else {
     ordinate[0] = df.sample(0).adc();
     ordinate[1] = df.sample(1).adc();
-    pedestal = (double)(ordinate[0]+ordinate[1])/(double)2;
-  } 
-
+    pedestal = (double)(ordinate[0] + ordinate[1]) / (double)2;
+  }
 
-  for (int i=0; i < df.size(); ++i ) {
+  for (int i = 0; i < df.size(); ++i) {
     if (df.sample(i).gainId() != 0)
-      ordinate[i] = (int)(pedestal+(df.sample(i).adc()-pedestal)*gainRatio[df.sample(i).gainId()-1]);
+      ordinate[i] = (int)(pedestal + (df.sample(i).adc() - pedestal) * gainRatio[df.sample(i).gainId() - 1]);
     else
-      ordinate[i] = 49152; //Saturation of gain1 
+      ordinate[i] = 49152;  //Saturation of gain1
   }
 
   TGraph* oneGraph = fileService->make<TGraph>(10, abscissa, ordinate);
-  string name = "Graph_ev" + intToString(naiveEvtNum_) + "_ic" + intToString(ic)
-    + "_FED" + intToString(FEDid);
-  string gainString = (gainId==1) ? "Free" : intToString(gainHuman);
-  string title = "Event" + intToString(naiveEvtNum_) + "_lv1a" + intToString(ievt) +
-    "_ic" + intToString(ic) + "_" + sliceName + "_gain" + gainString;
-    
+  string name = "Graph_ev" + intToString(naiveEvtNum_) + "_ic" + intToString(ic) + "_FED" + intToString(FEDid);
+  string gainString = (gainId == 1) ? "Free" : intToString(gainHuman);
+  string title = "Event" + intToString(naiveEvtNum_) + "_lv1a" + intToString(ievt) + "_ic" + intToString(ic) + "_" +
+                 sliceName + "_gain" + gainString;
+
   float energy = 0;
-  map<int,float>::const_iterator itr;
+  map<int, float>::const_iterator itr;
   itr = crysAndAmplitudesMap_.find(cryIndex);
-  if(itr!=crysAndAmplitudesMap_.end())
-  {
+  if (itr != crysAndAmplitudesMap_.end()) {
     //edm::LogWarning("EcalMipGraphs")<< "itr->second(ampli)="<< itr->second;
-    energy = (float) itr->second;
+    energy = (float)itr->second;
   }
   //else
   //edm::LogWarning("EcalMipGraphs") << "cry " << ic << "not found in ampMap";
 
-  title+="_Energy"+floatToString(round(energy*1000));
+  title += "_Energy" + floatToString(round(energy * 1000));
 
   oneGraph->SetTitle(title.c_str());
   oneGraph->SetName(name.c_str());
@@ -256,73 +232,63 @@ TGraph* EcalMipGraphs::selectDigi(DetId thisDet, int ievt)
   return oneGraph;
 }
 
-void EcalMipGraphs::selectHits(Handle<EcalRecHitCollection> hits,
-    int ievt, ESHandle<CaloTopology> caloTopo)
-{
-  for (EcalRecHitCollection::const_iterator hitItr = hits->begin(); hitItr != hits->end(); ++hitItr)
-  {
+void EcalMipGraphs::selectHits(Handle<EcalRecHitCollection> hits, int ievt, ESHandle<CaloTopology> caloTopo) {
+  for (EcalRecHitCollection::const_iterator hitItr = hits->begin(); hitItr != hits->end(); ++hitItr) {
     EcalRecHit hit = (*hitItr);
     DetId det = hit.id();
     EcalElectronicsId elecId = ecalElectronicsMap_->getElectronicsId(det);
-    int FEDid = 600+elecId.dccId();
+    int FEDid = 600 + elecId.dccId();
     bool isBarrel = true;
-    if(FEDid < 610 || FEDid > 645)
+    if (FEDid < 610 || FEDid > 645)
       isBarrel = false;
     int cryIndex = isBarrel ? ((EBDetId)det).hashedIndex() : ((EEDetId)det).hashedIndex();
     int ic = isBarrel ? ((EBDetId)det).ic() : getEEIndex(elecId);
-    
+
     float ampli = hit.energy();
 
     vector<int>::iterator result;
     result = find(maskedFEDs_.begin(), maskedFEDs_.end(), FEDid);
-    if(result != maskedFEDs_.end())
-    {
+    if (result != maskedFEDs_.end()) {
       //LogWarning("EcalMipGraphs") << "skipping uncalRecHit for FED " << FEDid << " ; amplitude " << ampli;
       continue;
-    }      
+    }
     result = find(maskedChannels_.begin(), maskedChannels_.end(), cryIndex);
-    if  (result != maskedChannels_.end())
-    {
+    if (result != maskedChannels_.end()) {
       //LogWarning("EcalMipGraphs") << "skipping uncalRecHit for channel: " << cryIndex << " in fed: " << FEDid << " with amplitude " << ampli ;
       continue;
-    } 
+    }
     bool cryIsInList = false;
     result = find(seedCrys_.begin(), seedCrys_.end(), cryIndex);
-    if  (result != seedCrys_.end())
+    if (result != seedCrys_.end())
       cryIsInList = true;
 
     // Either we must have a user-requested cry (in which case there is no amplitude selection)
     // Or we pick all crys that pass the amplitude cut (in which case there is no fixed crystal selection)
-    if(cryIsInList || (seedCrys_.empty() && ampli > threshold_))
-    {
+    if (cryIsInList || (seedCrys_.empty() && ampli > threshold_)) {
       // We have a winner!
       crysAndAmplitudesMap_[cryIndex] = ampli;
-      string name = "Event" + intToString(naiveEvtNum_) + "_ic" + intToString(ic)
-        + "_FED" + intToString(FEDid);
+      string name = "Event" + intToString(naiveEvtNum_) + "_ic" + intToString(ic) + "_FED" + intToString(FEDid);
       string title = "Digis";
       string seed = "ic" + intToString(ic) + "_FED" + intToString(FEDid);
-      int freq=1;
-      pair<map<string,int>::iterator,bool> pair = seedFrequencyMap_.insert(make_pair(seed,freq));
-      if(!pair.second)
-      {
+      int freq = 1;
+      pair<map<string, int>::iterator, bool> pair = seedFrequencyMap_.insert(make_pair(seed, freq));
+      if (!pair.second) {
         ++(pair.first->second);
       }
-      
-      TCanvas can(name.c_str(),title.c_str(),200,50,900,900);
-      can.Divide(side_,side_);
+
+      TCanvas can(name.c_str(), title.c_str(), 200, 50, 900, 900);
+      can.Divide(side_, side_);
       TGraph* myGraph;
       int canvasNum = 1;
 
-      CaloNavigator<DetId> cursor = CaloNavigator<DetId>(det,caloTopo->getSubdetectorTopology(det));
+      CaloNavigator<DetId> cursor = CaloNavigator<DetId>(det, caloTopo->getSubdetectorTopology(det));
       //Now put each graph in one by one
-      for(int j=side_/2; j>=-side_/2; --j)
-      {
-        for(int i=-side_/2; i<=side_/2; ++i)
-        {
+      for (int j = side_ / 2; j >= -side_ / 2; --j) {
+        for (int i = -side_ / 2; i <= side_ / 2; ++i) {
           cursor.home();
-          cursor.offsetBy(i,j);
+          cursor.offsetBy(i, j);
           can.cd(canvasNum);
-          myGraph = selectDigi(*cursor,ievt);
+          myGraph = selectDigi(*cursor, ievt);
           myGraph->Draw("A*");
           canvasNum++;
         }
@@ -330,102 +296,87 @@ void EcalMipGraphs::selectHits(Handle<EcalRecHitCollection> hits,
       can.Write();
       names->push_back(name);
     }
-    
+
     TH1F* timingHist = FEDsAndTimingHists_[FEDid];
-    if(timingHist==nullptr)
-    {
+    if (timingHist == nullptr) {
       initHists(FEDid);
       timingHist = FEDsAndTimingHists_[FEDid];
     }
-    if(ampli > minTimingAmp_)
-    {
+    if (ampli > minTimingAmp_) {
       timingHist->Fill(hit.time());
       allFedsTimingHist_->Fill(hit.time());
     }
   }
 }
 
-int EcalMipGraphs::getEEIndex(EcalElectronicsId elecId)
-{
-  int FEDid = 600+elecId.dccId();
-  return 10000*FEDid+100*elecId.towerId()+5*(elecId.stripId()-1)+elecId.xtalId();
+int EcalMipGraphs::getEEIndex(EcalElectronicsId elecId) {
+  int FEDid = 600 + elecId.dccId();
+  return 10000 * FEDid + 100 * elecId.towerId() + 5 * (elecId.stripId() - 1) + elecId.xtalId();
 }
 
 // insert the hist map into the map keyed by FED number
-void EcalMipGraphs::initHists(int FED)
-{
+void EcalMipGraphs::initHists(int FED) {
   using namespace std;
-  
+
   string title1 = "Jitter for ";
   title1.append(fedMap_->getSliceFromFed(FED));
   string name1 = "JitterFED";
   name1.append(intToString(FED));
-  TH1F* timingHist = fileService->make<TH1F>(name1.c_str(),title1.c_str(),150,-7,7);
+  TH1F* timingHist = fileService->make<TH1F>(name1.c_str(), title1.c_str(), 150, -7, 7);
   FEDsAndTimingHists_[FED] = timingHist;
 }
 
 // ------------ method called once each job just before starting event loop  ------------
-void 
-EcalMipGraphs::beginRun(edm::Run const &, edm::EventSetup const & c)
-{
-  edm::ESHandle< EcalElectronicsMapping > handle;
-  c.get< EcalMappingRcd >().get(handle);
+void EcalMipGraphs::beginRun(edm::Run const&, edm::EventSetup const& c) {
+  edm::ESHandle<EcalElectronicsMapping> handle;
+  c.get<EcalMappingRcd>().get(handle);
   ecalElectronicsMap_ = handle.product();
 }
 
 // ------------ method called once each job just after ending the event loop  ------------
-void 
-EcalMipGraphs::endJob()
-{
+void EcalMipGraphs::endJob() {
   canvasNames_->Fill();
 
   string frequencies = "";
-  for(std::map<std::string,int>::const_iterator itr = seedFrequencyMap_.begin();
-      itr != seedFrequencyMap_.end(); ++itr)
-  {
-    if(itr->second > 1)
-    {
-      frequencies+=itr->first;
-      frequencies+=" Frequency: ";
-      frequencies+=intToString(itr->second);
-      frequencies+="\n";
+  for (std::map<std::string, int>::const_iterator itr = seedFrequencyMap_.begin(); itr != seedFrequencyMap_.end();
+       ++itr) {
+    if (itr->second > 1) {
+      frequencies += itr->first;
+      frequencies += " Frequency: ";
+      frequencies += intToString(itr->second);
+      frequencies += "\n";
     }
   }
-  LogWarning("EcalMipGraphs") << "Found seeds with frequency > 1: " << "\n\n" << frequencies;
-  
+  LogWarning("EcalMipGraphs") << "Found seeds with frequency > 1: "
+                              << "\n\n"
+                              << frequencies;
+
   std::string channels;
-  for(std::vector<int>::const_iterator itr = maskedChannels_.begin();
-      itr != maskedChannels_.end(); ++itr)
-  {
-    channels+=intToString(*itr);
-    channels+=",";
+  for (std::vector<int>::const_iterator itr = maskedChannels_.begin(); itr != maskedChannels_.end(); ++itr) {
+    channels += intToString(*itr);
+    channels += ",";
   }
-  
+
   std::string feds;
-  for(std::vector<int>::const_iterator itr = maskedFEDs_.begin();
-      itr != maskedFEDs_.end(); ++itr)
-  {
-    feds+=intToString(*itr);
-    feds+=",";
+  for (std::vector<int>::const_iterator itr = maskedFEDs_.begin(); itr != maskedFEDs_.end(); ++itr) {
+    feds += intToString(*itr);
+    feds += ",";
   }
 
   LogWarning("EcalMipGraphs") << "Masked channels are: " << channels;
   LogWarning("EcalMipGraphs") << "Masked FEDs are: " << feds << " and that is all!";
 }
 
-
-std::string EcalMipGraphs::intToString(int num)
-{
-    using namespace std;
-    ostringstream myStream;
-    myStream << num << flush;
-    return(myStream.str()); //returns the string form of the stringstream object
+std::string EcalMipGraphs::intToString(int num) {
+  using namespace std;
+  ostringstream myStream;
+  myStream << num << flush;
+  return (myStream.str());  //returns the string form of the stringstream object
 }
 
-std::string EcalMipGraphs::floatToString(float num)
-{
-    using namespace std;
-    ostringstream myStream;
-    myStream << num << flush;
-    return(myStream.str()); //returns the string form of the stringstream object
+std::string EcalMipGraphs::floatToString(float num) {
+  using namespace std;
+  ostringstream myStream;
+  myStream << num << flush;
+  return (myStream.str());  //returns the string form of the stringstream object
 }
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalMipGraphs.h b/CaloOnlineTools/EcalTools/plugins/EcalMipGraphs.h
index 75ea80ef19b5a..18cd34278629e 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalMipGraphs.h
+++ b/CaloOnlineTools/EcalTools/plugins/EcalMipGraphs.h
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 //
-// Package:   EcalMipGraphs 
-// Class:     EcalMipGraphs 
-// 
+// Package:   EcalMipGraphs
+// Class:     EcalMipGraphs
+//
 /**\class EcalMipGraphs EcalMipGraphs.cc
 
  Description: <one line class summary>
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <vector>
@@ -53,31 +52,28 @@
 #include "TGraph.h"
 #include "TTree.h"
 
-
 //
 // class declaration
 //
 
 class EcalMipGraphs : public edm::EDAnalyzer {
-   public:
-      explicit EcalMipGraphs(const edm::ParameterSet&);
-      ~EcalMipGraphs() override;
-
-
-   private:
-      void beginRun(edm::Run const &, edm::EventSetup const &) override ;
-      void analyze(edm::Event const &, edm::EventSetup const &) override;
-      void endJob() override ;
-      std::string intToString(int num);
-      std::string floatToString(float num);
-      void writeGraphs();
-      void initHists(int);
-      void selectHits(edm::Handle<EcalRecHitCollection> hits,
-          int ievt, edm::ESHandle<CaloTopology> caloTopo);
-      TGraph* selectDigi(DetId det, int ievt);
-      int getEEIndex(EcalElectronicsId elecId);
-
-    // ----------member data ---------------------------
+public:
+  explicit EcalMipGraphs(const edm::ParameterSet&);
+  ~EcalMipGraphs() override;
+
+private:
+  void beginRun(edm::Run const&, edm::EventSetup const&) override;
+  void analyze(edm::Event const&, edm::EventSetup const&) override;
+  void endJob() override;
+  std::string intToString(int num);
+  std::string floatToString(float num);
+  void writeGraphs();
+  void initHists(int);
+  void selectHits(edm::Handle<EcalRecHitCollection> hits, int ievt, edm::ESHandle<CaloTopology> caloTopo);
+  TGraph* selectDigi(DetId det, int ievt);
+  int getEEIndex(EcalElectronicsId elecId);
+
+  // ----------member data ---------------------------
 
   edm::InputTag EBRecHitCollection_;
   edm::InputTag EERecHitCollection_;
@@ -95,7 +91,7 @@ class EcalMipGraphs : public edm::EDAnalyzer {
 
   std::set<EBDetId> listEBChannels;
   std::set<EEDetId> listEEChannels;
-    
+
   int abscissa[10];
   int ordinate[10];
 
@@ -107,17 +103,17 @@ class EcalMipGraphs : public edm::EDAnalyzer {
   std::vector<int> maskedFEDs_;
   std::vector<int> seedCrys_;
   std::vector<std::string> maskedEBs_;
-  std::map<int,TH1F*> FEDsAndTimingHists_;
-  std::map<int,float> crysAndAmplitudesMap_;
-  std::map<int,EcalDCCHeaderBlock> FEDsAndDCCHeaders_;
-  std::map<std::string,int> seedFrequencyMap_;
-  
+  std::map<int, TH1F*> FEDsAndTimingHists_;
+  std::map<int, float> crysAndAmplitudesMap_;
+  std::map<int, EcalDCCHeaderBlock> FEDsAndDCCHeaders_;
+  std::map<std::string, int> seedFrequencyMap_;
+
   TH1F* allFedsTimingHist_;
-  
+
   TFile* file_;
   TTree* canvasNames_;
   EcalFedMap* fedMap_;
   const EcalElectronicsMapping* ecalElectronicsMap_;
- 
-  int naiveEvtNum_; 
+
+  int naiveEvtNum_;
 };
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalPedHists.cc b/CaloOnlineTools/EcalTools/plugins/EcalPedHists.cc
index e0a80035469f6..eed22b89f5238 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalPedHists.cc
+++ b/CaloOnlineTools/EcalTools/plugins/EcalPedHists.cc
@@ -10,13 +10,12 @@
 
 #include "CaloOnlineTools/EcalTools/plugins/EcalPedHists.h"
 
-EcalPedHists::EcalPedHists(const edm::ParameterSet& ps) :
-  runNum_(-1),
-  fileName_ (ps.getUntrackedParameter<std::string>("fileName", std::string("ecalPedDigiDump"))),
-  barrelDigiCollection_ (ps.getParameter<edm::InputTag> ("EBdigiCollection")),
-  endcapDigiCollection_ (ps.getParameter<edm::InputTag> ("EEdigiCollection")),
-  headerProducer_ (ps.getParameter<edm::InputTag> ("headerProducer"))
-{
+EcalPedHists::EcalPedHists(const edm::ParameterSet& ps)
+    : runNum_(-1),
+      fileName_(ps.getUntrackedParameter<std::string>("fileName", std::string("ecalPedDigiDump"))),
+      barrelDigiCollection_(ps.getParameter<edm::InputTag>("EBdigiCollection")),
+      endcapDigiCollection_(ps.getParameter<edm::InputTag>("EEdigiCollection")),
+      headerProducer_(ps.getParameter<edm::InputTag>("headerProducer")) {
   using namespace std;
 
   fedMap_ = new EcalFedMap();
@@ -24,60 +23,48 @@ EcalPedHists::EcalPedHists(const edm::ParameterSet& ps) :
   //for(int i=601; i<655; ++i)
   //{
   //  listDefaults.push_back(i);
-  //} 
+  //}
   listFEDs_ = ps.getUntrackedParameter<vector<int> >("listFEDs");
   listEBs_ = ps.getUntrackedParameter<vector<string> >("listEBs");
- 
-  if(listFEDs_.empty())
-  {
+
+  if (listFEDs_.empty()) {
     allFEDsSelected_ = false;
     //if "actual" EB id given, then convert to FEDid and put in listFEDs_
-    if(!listEBs_.empty())
-    {
+    if (!listEBs_.empty()) {
       listFEDs_.clear();
-      for(vector<string>::const_iterator itr = listEBs_.begin(); itr != listEBs_.end(); ++itr)
-      {
+      for (vector<string>::const_iterator itr = listEBs_.begin(); itr != listEBs_.end(); ++itr) {
         listFEDs_.push_back(fedMap_->getFedFromSlice(*itr));
       }
     }
-  }
-  else if(listFEDs_[0]==-1)
-  {
-  // Apply no selection if -1 is passed in FED list
+  } else if (listFEDs_[0] == -1) {
+    // Apply no selection if -1 is passed in FED list
     allFEDsSelected_ = true;
     //debug
     //cout << "no selection on FEDs!" << endl;
     //inputIsOk_=false;
     //return;
     //listFEDs_ = listDefaults;
-  }
-  else
-  {
+  } else {
     //in this case, listFEDs should be populated
     allFEDsSelected_ = false;
   }
 
-  if(!allFEDsSelected_)
-  {
+  if (!allFEDsSelected_) {
     // Verify FED numbers are valid
-    for (vector<int>::const_iterator intIter = listFEDs_.begin(); intIter != listFEDs_.end(); intIter++)
-    {  
-      if ( ((*intIter) < 601)||(654 < (*intIter)) )
-      {  
+    for (vector<int>::const_iterator intIter = listFEDs_.begin(); intIter != listFEDs_.end(); intIter++) {
+      if (((*intIter) < 601) || (654 < (*intIter))) {
         cout << "[EcalPedHists] FED value: " << (*intIter) << " found in listFEDs. "
-          << " Valid range is 601-654. Returning." << endl;
+             << " Valid range is 601-654. Returning." << endl;
         inputIsOk_ = false;
         return;
-      }
-      else
+      } else
         theRealFedSet_.insert(*intIter);
     }
   }
 
   vector<int> listDefaults = vector<int>();
   listDefaults.clear();
-  for(int i=1; i<1701; ++i)
-  {
+  for (int i = 1; i < 1701; ++i) {
     listDefaults.push_back(i);
   }
   listChannels_ = ps.getUntrackedParameter<vector<int> >("listChannels", listDefaults);
@@ -87,89 +74,77 @@ EcalPedHists::EcalPedHists(const edm::ParameterSet& ps) :
   listDefaults.push_back(1);
   listDefaults.push_back(2);
   listSamples_ = ps.getUntrackedParameter<vector<int> >("listSamples", listDefaults);
-  
+
   inputIsOk_ = true;
   vector<int>::iterator intIter;
-  
+
   // Verify crystal numbers are valid
-  for (intIter = listChannels_.begin(); intIter != listChannels_.end(); ++intIter)
-  { 
-      //TODO: Fix crystal index checking?
-      //if ( ((*intIter) < 1)||(1700 < (*intIter)) )       
-      //{  
-      //  cout << "[EcalPedHists] ic value: " << (*intIter) << " found in listChannels. "
-      //  	  << " Valid range is 1-1700. Returning." << endl;
-      //  inputIsOk_ = false;
-      //  return;
-      //}
+  for (intIter = listChannels_.begin(); intIter != listChannels_.end(); ++intIter) {
+    //TODO: Fix crystal index checking?
+    //if ( ((*intIter) < 1)||(1700 < (*intIter)) )
+    //{
+    //  cout << "[EcalPedHists] ic value: " << (*intIter) << " found in listChannels. "
+    //  	  << " Valid range is 1-1700. Returning." << endl;
+    //  inputIsOk_ = false;
+    //  return;
+    //}
   }
   // Verify sample numbers are valid
-  for (intIter = listSamples_.begin(); intIter != listSamples_.end(); intIter++)
-  {  
-      if ( ((*intIter) < 1)||(10 < (*intIter)) )
-      {  
-	cout << "[EcalPedHists] sample number: " << (*intIter) << " found in listSamples. "
-		  << " Valid range is 1-10. Returning." << endl;
-	inputIsOk_ = false;
-	return;
-      }
+  for (intIter = listSamples_.begin(); intIter != listSamples_.end(); intIter++) {
+    if (((*intIter) < 1) || (10 < (*intIter))) {
+      cout << "[EcalPedHists] sample number: " << (*intIter) << " found in listSamples. "
+           << " Valid range is 1-10. Returning." << endl;
+      inputIsOk_ = false;
+      return;
+    }
   }
-
 }
 
-EcalPedHists::~EcalPedHists() 
-{
-}
+EcalPedHists::~EcalPedHists() {}
 
-void EcalPedHists::beginRun(edm::Run const &, edm::EventSetup const & c)
-{
+void EcalPedHists::beginRun(edm::Run const&, edm::EventSetup const& c) {
   edm::ESHandle<EcalElectronicsMapping> elecHandle;
   c.get<EcalMappingRcd>().get(elecHandle);
   ecalElectronicsMap_ = elecHandle.product();
 }
 
-void EcalPedHists::endJob(void)
-{
+void EcalPedHists::endJob(void) {
   using namespace std;
-  if(inputIsOk_)
-  { 
+  if (inputIsOk_) {
     //debug
     //cout << "endJob:creating root file!" << endl;
-    
-    fileName_ += "-"+intToString(runNum_)+".graph.root";
 
-    TFile root_file_(fileName_.c_str() , "RECREATE");
+    fileName_ += "-" + intToString(runNum_) + ".graph.root";
+
+    TFile root_file_(fileName_.c_str(), "RECREATE");
     //Loop over FEDs first
-    for(set<int>::const_iterator FEDitr = theRealFedSet_.begin(); FEDitr != theRealFedSet_.end(); ++FEDitr)
-    {
-      if(!histsFilled_)
+    for (set<int>::const_iterator FEDitr = theRealFedSet_.begin(); FEDitr != theRealFedSet_.end(); ++FEDitr) {
+      if (!histsFilled_)
         break;
       string dir = fedMap_->getSliceFromFed(*FEDitr);
       TDirectory* FEDdir = gDirectory->mkdir(dir.c_str());
       FEDdir->cd();
       //root_file_.mkdir(dir.c_str());
       //root_file_.cd(dir.c_str());
-      map<string,TH1F*> mapHistos = FEDsAndHistMaps_[*FEDitr];
-      
+      map<string, TH1F*> mapHistos = FEDsAndHistMaps_[*FEDitr];
+
       //Loop over channels; write histos and directory structure
-      for (vector<int>::const_iterator itr = listChannels_.begin(); itr!=listChannels_.end(); itr++)
-      {
+      for (vector<int>::const_iterator itr = listChannels_.begin(); itr != listChannels_.end(); itr++) {
         //debug
         //cout << "loop over channels" << endl;
-        
+
         TH1F* hist = nullptr;
         string chnl = intToString(*itr);
         string name1 = "Cry";
-        name1.append(chnl+"Gain1");
+        name1.append(chnl + "Gain1");
         string name2 = "Cry";
-        name2.append(chnl+"Gain6");
+        name2.append(chnl + "Gain6");
         string name3 = "Cry";
-        name3.append(chnl+"Gain12");
+        name3.append(chnl + "Gain12");
         hist = mapHistos[name1];
         // This is a sanity check only
-        if(hist!=nullptr)
-        {
-          string cryDirName = "Cry_"+chnl;
+        if (hist != nullptr) {
+          string cryDirName = "Cry_" + chnl;
           TDirectory* cryDir = FEDdir->mkdir(cryDirName.c_str());
           cryDir->cd();
           hist->SetDirectory(cryDir);
@@ -182,9 +157,7 @@ void EcalPedHists::endJob(void)
           hist->Write();
           //root_file_.cd(dir.c_str());
           root_file_.cd();
-        }
-        else
-        {
+        } else {
           cerr << "EcalPedHists: Error: This shouldn't happen!" << endl;
         }
       }
@@ -194,45 +167,39 @@ void EcalPedHists::endJob(void)
   }
 }
 
-void EcalPedHists::analyze(const edm::Event& e, const edm::EventSetup& c)
-{
+void EcalPedHists::analyze(const edm::Event& e, const edm::EventSetup& c) {
   using namespace std;
   using namespace edm;
 
   if (!inputIsOk_)
     return;
-  
+
   // loop over the headers, this is to detect missing FEDs if all are selected
-  if(allFEDsSelected_)
-  {
+  if (allFEDsSelected_) {
     edm::Handle<EcalRawDataCollection> DCCHeaders;
     try {
-      e.getByLabel (headerProducer_, DCCHeaders);
-    } catch ( std::exception& ex ) {
-      edm::LogError ("EcalPedHists") << "Error! can't get the product " 
-        << headerProducer_;
+      e.getByLabel(headerProducer_, DCCHeaders);
+    } catch (std::exception& ex) {
+      edm::LogError("EcalPedHists") << "Error! can't get the product " << headerProducer_;
       return;
     }
 
-    for (EcalRawDataCollection::const_iterator headerItr= DCCHeaders->begin();
-        headerItr != DCCHeaders->end (); 
-        ++headerItr) 
-    {
-      int FEDid = 600+headerItr->id();
+    for (EcalRawDataCollection::const_iterator headerItr = DCCHeaders->begin(); headerItr != DCCHeaders->end();
+         ++headerItr) {
+      int FEDid = 600 + headerItr->id();
       theRealFedSet_.insert(FEDid);
     }
   }
 
   // loop over fed list and make sure that there are histo maps
-  for(set<int>::const_iterator fedItr = theRealFedSet_.begin(); fedItr != theRealFedSet_.end(); ++fedItr)
-  {
-    if(FEDsAndHistMaps_.find(*fedItr)==FEDsAndHistMaps_.end())
+  for (set<int>::const_iterator fedItr = theRealFedSet_.begin(); fedItr != theRealFedSet_.end(); ++fedItr) {
+    if (FEDsAndHistMaps_.find(*fedItr) == FEDsAndHistMaps_.end())
       initHists(*fedItr);
   }
-  
+
   //debug
   //cout << "analyze...input is ok? " << inputIsOk_ << endl;
-  
+
   bool barrelDigisFound = true;
   bool endcapDigisFound = true;
   // get the barrel digis
@@ -240,11 +207,9 @@ void EcalPedHists::analyze(const edm::Event& e, const edm::EventSetup& c)
   // TODO; SIC: fix this behavior
   Handle<EBDigiCollection> barrelDigis;
   try {
-    e.getByLabel (barrelDigiCollection_, barrelDigis);
-  } catch ( std::exception& ex ) 
-  {
-    edm::LogError ("EcalPedOffset") << "Error! can't get the product " 
-      << barrelDigiCollection_;
+    e.getByLabel(barrelDigiCollection_, barrelDigis);
+  } catch (std::exception& ex) {
+    edm::LogError("EcalPedOffset") << "Error! can't get the product " << barrelDigiCollection_;
     barrelDigisFound = false;
   }
   // get the endcap digis
@@ -252,75 +217,68 @@ void EcalPedHists::analyze(const edm::Event& e, const edm::EventSetup& c)
   // TODO; SIC: fix this behavior
   Handle<EEDigiCollection> endcapDigis;
   try {
-    e.getByLabel (endcapDigiCollection_, endcapDigis);
-  } catch ( std::exception& ex ) 
-  {
-    edm::LogError ("EcalPedOffset") << "Error! can't get the product " 
-      << endcapDigiCollection_;
+    e.getByLabel(endcapDigiCollection_, endcapDigis);
+  } catch (std::exception& ex) {
+    edm::LogError("EcalPedOffset") << "Error! can't get the product " << endcapDigiCollection_;
     endcapDigisFound = false;
   }
-  
-  if(barrelDigisFound)
+
+  if (barrelDigisFound)
     readEBdigis(barrelDigis);
-  if(endcapDigisFound)
+  if (endcapDigisFound)
     readEEdigis(endcapDigis);
-  if(!barrelDigisFound && !endcapDigisFound)
-    edm::LogError ("EcalPedOffset") << "No digis found in the event!";
-  
-  if(runNum_==-1)
+  if (!barrelDigisFound && !endcapDigisFound)
+    edm::LogError("EcalPedOffset") << "No digis found in the event!";
+
+  if (runNum_ == -1)
     runNum_ = e.id().run();
 }
 
 // insert the 3-entry hist map into the map keyed by FED number
-void EcalPedHists::initHists(int FED)
-{
+void EcalPedHists::initHists(int FED) {
   using namespace std;
   //using namespace edm;
 
-  std::map<string,TH1F*> histMap;
+  std::map<string, TH1F*> histMap;
   //debug
   //cout << "Initializing map for FED:" << *FEDitr << endl;
-  for (vector<int>::const_iterator intIter = listChannels_.begin(); intIter != listChannels_.end(); ++intIter)
-  { 
+  for (vector<int>::const_iterator intIter = listChannels_.begin(); intIter != listChannels_.end(); ++intIter) {
     //Put 3 histos (1 per gain) for the channel into the map
     string FEDid = intToString(FED);
     string chnl = intToString(*intIter);
     string title1 = "Gain1 ADC Counts for channel ";
     title1.append(chnl);
     string name1 = "Cry";
-    name1.append(chnl+"Gain1");
+    name1.append(chnl + "Gain1");
     string title2 = "Gain6 ADC Counts for channel ";
     title2.append(chnl);
     string name2 = "Cry";
-    name2.append(chnl+"Gain6");
+    name2.append(chnl + "Gain6");
     string title3 = "Gain12 ADC Counts for channel ";
     title3.append(chnl);
     string name3 = "Cry";
-    name3.append(chnl+"Gain12");
-    histMap.insert(make_pair(name1,new TH1F(name1.c_str(),title1.c_str(),75,175.0,250.0)));
+    name3.append(chnl + "Gain12");
+    histMap.insert(make_pair(name1, new TH1F(name1.c_str(), title1.c_str(), 75, 175.0, 250.0)));
     histMap[name1]->SetDirectory(nullptr);
-    histMap.insert(make_pair(name2,new TH1F(name2.c_str(),title2.c_str(),75,175.0,250.0)));
+    histMap.insert(make_pair(name2, new TH1F(name2.c_str(), title2.c_str(), 75, 175.0, 250.0)));
     histMap[name2]->SetDirectory(nullptr);
-    histMap.insert(make_pair(name3,new TH1F(name3.c_str(),title3.c_str(),75,175.0,250.0)));
+    histMap.insert(make_pair(name3, new TH1F(name3.c_str(), title3.c_str(), 75, 175.0, 250.0)));
     histMap[name3]->SetDirectory(nullptr);
   }
-  FEDsAndHistMaps_.insert(make_pair(FED,histMap));
+  FEDsAndHistMaps_.insert(make_pair(FED, histMap));
 }
 
-
-void EcalPedHists::readEBdigis(edm::Handle<EBDigiCollection> digis)
-{
+void EcalPedHists::readEBdigis(edm::Handle<EBDigiCollection> digis) {
   using namespace std;
   using namespace edm;
   //debug
   //cout << "readEBdigis" << endl;
-  
+
   // Loop over digis
-  for (EBDigiCollection::const_iterator digiItr= digis->begin();digiItr != digis->end(); ++digiItr )
-  {
+  for (EBDigiCollection::const_iterator digiItr = digis->begin(); digiItr != digis->end(); ++digiItr) {
     EBDetId detId = EBDetId(digiItr->id());
     EcalElectronicsId elecId = ecalElectronicsMap_->getElectronicsId(detId);
-    int FEDid = 600+elecId.dccId();
+    int FEDid = 600 + elecId.dccId();
     int crystalId = detId.ic();
 
     //debug
@@ -339,47 +297,43 @@ void EcalPedHists::readEBdigis(edm::Handle<EBDigiCollection> digis)
 
     // Get the adc counts from the selected samples and fill the corresponding histogram
     // Must subtract 1 from user-given sample list (e.g., user's sample 1 -> sample 0)
-    for (vector<int>::iterator itr = listSamples_.begin(); itr!=listSamples_.end(); itr++)
-    {
+    for (vector<int>::iterator itr = listSamples_.begin(); itr != listSamples_.end(); itr++) {
       histsFilled_ = true;
-      map<string,TH1F*> mapHistos = FEDsAndHistMaps_[FEDid];
+      map<string, TH1F*> mapHistos = FEDsAndHistMaps_[FEDid];
       string chnl = intToString(crystalId);
       string name1 = "Cry";
-      name1.append(chnl+"Gain1");
+      name1.append(chnl + "Gain1");
       string name2 = "Cry";
-      name2.append(chnl+"Gain6");
+      name2.append(chnl + "Gain6");
       string name3 = "Cry";
-      name3.append(chnl+"Gain12");
+      name3.append(chnl + "Gain12");
       TH1F* hist = nullptr;
-      if(((EBDataFrame)(*digiItr)).sample(*itr-1).gainId()==3)
+      if (((EBDataFrame)(*digiItr)).sample(*itr - 1).gainId() == 3)
         hist = mapHistos[name1];
-      if(((EBDataFrame)(*digiItr)).sample(*itr-1).gainId()==2)
+      if (((EBDataFrame)(*digiItr)).sample(*itr - 1).gainId() == 2)
         hist = mapHistos[name2];
-      if(((EBDataFrame)(*digiItr)).sample(*itr-1).gainId()==1)
+      if (((EBDataFrame)(*digiItr)).sample(*itr - 1).gainId() == 1)
         hist = mapHistos[name3];
-      if(hist!=nullptr)
-        hist->Fill(((EBDataFrame)(*digiItr)).sample(*itr-1).adc());
+      if (hist != nullptr)
+        hist->Fill(((EBDataFrame)(*digiItr)).sample(*itr - 1).adc());
       else
         cerr << "EcalPedHistDumper: Error: This shouldn't happen!" << endl;
     }
   }
 }
 
-
-void EcalPedHists::readEEdigis(edm::Handle<EEDigiCollection> digis)
-{
+void EcalPedHists::readEEdigis(edm::Handle<EEDigiCollection> digis) {
   using namespace std;
   using namespace edm;
   //debug
   //cout << "readEEdigis" << endl;
-  
+
   // Loop over digis
-  for (EEDigiCollection::const_iterator digiItr= digis->begin();digiItr != digis->end(); ++digiItr )
-  {
+  for (EEDigiCollection::const_iterator digiItr = digis->begin(); digiItr != digis->end(); ++digiItr) {
     EEDetId detId = EEDetId(digiItr->id());
     EcalElectronicsId elecId = ecalElectronicsMap_->getElectronicsId(detId);
-    int FEDid = 600+elecId.dccId();
-    int crystalId = 10000*FEDid+100*elecId.towerId()+5*(elecId.stripId()-1)+elecId.xtalId();
+    int FEDid = 600 + elecId.dccId();
+    int crystalId = 10000 * FEDid + 100 * elecId.towerId() + 5 * (elecId.stripId() - 1) + elecId.xtalId();
 
     //Select desired FEDs only
     set<int>::const_iterator fedIter = find(theRealFedSet_.begin(), theRealFedSet_.end(), FEDid);
@@ -394,43 +348,38 @@ void EcalPedHists::readEEdigis(edm::Handle<EEDigiCollection> digis)
 
     // Get the adc counts from the selected samples and fill the corresponding histogram
     // Must subtract 1 from user-given sample list (e.g., user's sample 1 -> sample 0)
-    for (vector<int>::iterator itr = listSamples_.begin(); itr!=listSamples_.end(); itr++)
-    {
+    for (vector<int>::iterator itr = listSamples_.begin(); itr != listSamples_.end(); itr++) {
       histsFilled_ = true;
-      map<string,TH1F*> mapHistos = FEDsAndHistMaps_[FEDid];
+      map<string, TH1F*> mapHistos = FEDsAndHistMaps_[FEDid];
       string chnl = intToString(crystalId);
       string name1 = "Cry";
-      name1.append(chnl+"Gain1");
+      name1.append(chnl + "Gain1");
       string name2 = "Cry";
-      name2.append(chnl+"Gain6");
+      name2.append(chnl + "Gain6");
       string name3 = "Cry";
-      name3.append(chnl+"Gain12");
+      name3.append(chnl + "Gain12");
       TH1F* hist = nullptr;
-      if(((EBDataFrame)(*digiItr)).sample(*itr-1).gainId()==3)
+      if (((EBDataFrame)(*digiItr)).sample(*itr - 1).gainId() == 3)
         hist = mapHistos[name1];
-      if(((EBDataFrame)(*digiItr)).sample(*itr-1).gainId()==2)
+      if (((EBDataFrame)(*digiItr)).sample(*itr - 1).gainId() == 2)
         hist = mapHistos[name2];
-      if(((EBDataFrame)(*digiItr)).sample(*itr-1).gainId()==1)
+      if (((EBDataFrame)(*digiItr)).sample(*itr - 1).gainId() == 1)
         hist = mapHistos[name3];
-      if(hist!=nullptr)
-        hist->Fill(((EBDataFrame)(*digiItr)).sample(*itr-1).adc());
+      if (hist != nullptr)
+        hist->Fill(((EBDataFrame)(*digiItr)).sample(*itr - 1).adc());
       else
         cerr << "EcalPedHistDumper: Error: This shouldn't happen!" << endl;
     }
   }
 }
 
-
-std::string EcalPedHists::intToString(int num)
-{
+std::string EcalPedHists::intToString(int num) {
   using namespace std;
   //
   // outputs the number into the string stream and then flushes
   // the buffer (makes sure the output is put into the stream)
   //
-  ostringstream myStream; //creates an ostringstream object
+  ostringstream myStream;  //creates an ostringstream object
   myStream << num << flush;
-  return(myStream.str()); //returns the string form of the stringstream object
+  return (myStream.str());  //returns the string form of the stringstream object
 }
-
-
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalPedHists.h b/CaloOnlineTools/EcalTools/plugins/EcalPedHists.h
index d827059e22c4d..dc1ee2a45f4c0 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalPedHists.h
+++ b/CaloOnlineTools/EcalTools/plugins/EcalPedHists.h
@@ -29,40 +29,39 @@
 #include "TH1.h"
 #include "TDirectory.h"
 
-typedef std::map<std::string,TH1F*> stringHistMap;
+typedef std::map<std::string, TH1F*> stringHistMap;
 
-class EcalPedHists: public edm::EDAnalyzer
-{ 
-  public:
-    EcalPedHists(const edm::ParameterSet& ps);   
-    ~EcalPedHists() override;
+class EcalPedHists : public edm::EDAnalyzer {
+public:
+  EcalPedHists(const edm::ParameterSet& ps);
+  ~EcalPedHists() override;
 
-  protected:
-    void analyze(const edm::Event & e, const  edm::EventSetup& c) override;
-    void beginRun(edm::Run const &, edm::EventSetup const & c) override;
-    void endJob(void) override;
+protected:
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  void beginRun(edm::Run const&, edm::EventSetup const& c) override;
+  void endJob(void) override;
 
-  private:
-    std::string intToString(int num);
-    void readEBdigis(edm::Handle<EBDigiCollection> digis);
-    void readEEdigis(edm::Handle<EEDigiCollection> digis);
-    void initHists(int FED);
+private:
+  std::string intToString(int num);
+  void readEBdigis(edm::Handle<EBDigiCollection> digis);
+  void readEEdigis(edm::Handle<EEDigiCollection> digis);
+  void initHists(int FED);
 
-    int runNum_;
-    bool inputIsOk_;
-    bool allFEDsSelected_;
-    bool histsFilled_;
-    std::string fileName_;
-    edm::InputTag barrelDigiCollection_;
-    edm::InputTag endcapDigiCollection_;
-    edm::InputTag headerProducer_;
-    std::vector<int> listChannels_;
-    std::vector<int> listSamples_;
-    std::vector<int> listFEDs_;
-    std::vector<std::string> listEBs_;
-    std::map<int,stringHistMap> FEDsAndHistMaps_;
-    std::set<int> theRealFedSet_;
-    EcalFedMap* fedMap_;
-    TFile * root_file_;
-    const EcalElectronicsMapping* ecalElectronicsMap_;
+  int runNum_;
+  bool inputIsOk_;
+  bool allFEDsSelected_;
+  bool histsFilled_;
+  std::string fileName_;
+  edm::InputTag barrelDigiCollection_;
+  edm::InputTag endcapDigiCollection_;
+  edm::InputTag headerProducer_;
+  std::vector<int> listChannels_;
+  std::vector<int> listSamples_;
+  std::vector<int> listFEDs_;
+  std::vector<std::string> listEBs_;
+  std::map<int, stringHistMap> FEDsAndHistMaps_;
+  std::set<int> theRealFedSet_;
+  EcalFedMap* fedMap_;
+  TFile* root_file_;
+  const EcalElectronicsMapping* ecalElectronicsMap_;
 };
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalPnGraphs.cc b/CaloOnlineTools/EcalTools/plugins/EcalPnGraphs.cc
index 095ae5d5cde2a..d5209a3b67d5b 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalPnGraphs.cc
+++ b/CaloOnlineTools/EcalTools/plugins/EcalPnGraphs.cc
@@ -26,112 +26,112 @@
 #include "TFile.h"
 #include "TGraph.h"
 
-
-//=============================================================================
-EcalPnGraphs::EcalPnGraphs(const edm::ParameterSet& ps){  
 //=============================================================================
+EcalPnGraphs::EcalPnGraphs(const edm::ParameterSet& ps) {
+  //=============================================================================
 
-  digiProducer_     = ps.getParameter<std::string>("digiProducer");
-  fileName = ps.getUntrackedParameter<std::string >("fileName", std::string("toto") );
+  digiProducer_ = ps.getParameter<std::string>("digiProducer");
+  fileName = ps.getUntrackedParameter<std::string>("fileName", std::string("toto"));
 
   first_Pn = 0;
 
   listPns = ps.getUntrackedParameter<std::vector<int> >("listPns", std::vector<int>());
-  numPn   = ps.getUntrackedParameter< int >("numPn");
+  numPn = ps.getUntrackedParameter<int>("numPn");
 
   std::vector<int> listDefaults;
   listDefaults.push_back(-1);
-  feds_ = ps.getUntrackedParameter<std::vector<int> > ("requestedFeds",listDefaults);
+  feds_ = ps.getUntrackedParameter<std::vector<int> >("requestedFeds", listDefaults);
   bool fedIsGiven = false;
 
   std::vector<std::string> ebDefaults;
   ebDefaults.push_back("none");
-  ebs_  = ps.getUntrackedParameter<std::vector<std::string> >("requestedEbs",ebDefaults);
+  ebs_ = ps.getUntrackedParameter<std::vector<std::string> >("requestedEbs", ebDefaults);
 
   //FEDs and EBs
-  if ( feds_[0] != -1 ) {
+  if (feds_[0] != -1) {
     edm::LogInfo("EcalPnGraphs") << "FED id is given! Goining to beginJob! ";
     fedIsGiven = true;
-  }else {
+  } else {
     feds_.clear();
-    if ( ebs_[0] !="none" ) {
+    if (ebs_[0] != "none") {
       //EB id is given and convert to FED id
-      fedMap = new EcalFedMap(); 
-      for (std::vector<std::string>::const_iterator ebItr = ebs_.begin(); 
-	   ebItr!= ebs_.end();  ++ebItr) {
-	feds_.push_back(fedMap->getFedFromSlice(*ebItr));
+      fedMap = new EcalFedMap();
+      for (std::vector<std::string>::const_iterator ebItr = ebs_.begin(); ebItr != ebs_.end(); ++ebItr) {
+        feds_.push_back(fedMap->getFedFromSlice(*ebItr));
       }
       delete fedMap;
     } else {
       //Select all FEDs in the Event
-      for ( int i=601; i<655; ++i){
-	feds_.push_back(i);
+      for (int i = 601; i < 655; ++i) {
+        feds_.push_back(i);
       }
     }
   }
-  
+
   // consistency checks checks
-  inputIsOk       = true;
+  inputIsOk = true;
   //check with FEDs
-  if ( fedIsGiven ) {
+  if (fedIsGiven) {
     std::vector<int>::iterator fedIter;
-    for (fedIter = feds_.begin(); fedIter!=feds_.end(); ++fedIter) {
-      if ( (*fedIter) < 601 || (*fedIter) > 654) {                      
-	std::cout << "[EcalPnGraphs] pn number : " << (*fedIter) << " found in listFeds. "
-		  << " Valid range is [601-654]. Returning." << std::endl;
-	inputIsOk = false;
-	return;
+    for (fedIter = feds_.begin(); fedIter != feds_.end(); ++fedIter) {
+      if ((*fedIter) < 601 || (*fedIter) > 654) {
+        std::cout << "[EcalPnGraphs] pn number : " << (*fedIter) << " found in listFeds. "
+                  << " Valid range is [601-654]. Returning." << std::endl;
+        inputIsOk = false;
+        return;
       }
     }
   }
 
   //Check with Pns
-  if ( listPns[0] != -1 ) { 
+  if (listPns[0] != -1) {
     std::vector<int>::iterator intIter;
-    for (intIter = listPns.begin(); intIter != listPns.end(); intIter++)  {  
-      if ( ((*intIter) < 1) ||  (10 < (*intIter)) )       {  
-	std::cout << "[EcalPnGraphs] pn number : " << (*intIter) << " found in listPns. "
-		  << " Valid range is 1-10. Returning." << std::endl;
-	inputIsOk = false;
-	return;
+    for (intIter = listPns.begin(); intIter != listPns.end(); intIter++) {
+      if (((*intIter) < 1) || (10 < (*intIter))) {
+        std::cout << "[EcalPnGraphs] pn number : " << (*intIter) << " found in listPns. "
+                  << " Valid range is 1-10. Returning." << std::endl;
+        inputIsOk = false;
+        return;
       }
-      if (!first_Pn )   first_Pn = (*intIter);	
+      if (!first_Pn)
+        first_Pn = (*intIter);
     }
   } else {
     listPns.clear();
-    listPns.push_back(5); 
-    listPns.push_back(6); 
+    listPns.push_back(5);
+    listPns.push_back(6);
   }
-  
+
   // setting the abcissa array once for all
-  for (int i=0; i<50; i++)        abscissa[i] = i;
-  
+  for (int i = 0; i < 50; i++)
+    abscissa[i] = i;
+
   // local event counter (in general different from LV1)
-  eventCounter =0;
+  eventCounter = 0;
 }
 
-
-//=============================================================================
-EcalPnGraphs::~EcalPnGraphs(){  
 //=============================================================================
+EcalPnGraphs::~EcalPnGraphs() {
+  //=============================================================================
   //delete *;
 }
 
 //=============================================================================
 void EcalPnGraphs::beginJob() {
-//=============================================================================
-  edm::LogInfo("EcalPhGraphs") << "entering beginJob! " ;
+  //=============================================================================
+  edm::LogInfo("EcalPhGraphs") << "entering beginJob! ";
 }
 
 //=============================================================================
-void EcalPnGraphs::analyze( const edm::Event & e, const  edm::EventSetup& c){
-//=============================================================================
+void EcalPnGraphs::analyze(const edm::Event& e, const edm::EventSetup& c) {
+  //=============================================================================
 
   eventCounter++;
-  if (!inputIsOk) return;
+  if (!inputIsOk)
+    return;
 
   // retrieving crystal PN diodes from Event
-  edm::Handle<EcalPnDiodeDigiCollection>  pn_digis;
+  edm::Handle<EcalPnDiodeDigiCollection> pn_digis;
   try {
     e.getByLabel(digiProducer_, pn_digis);
   } catch (cms::Exception& ex) {
@@ -142,81 +142,80 @@ void EcalPnGraphs::analyze( const edm::Event & e, const  edm::EventSetup& c){
   // - listPns is the list as given by the user
   // -numPn is the number of Pns (centered at Pn from listPns) for which graphs are required
   std::vector<int>::iterator pn_it;
-  for ( pn_it = listPns.begin();  pn_it != listPns.end() ; pn_it++  )
-    {
-      int ipn    = (*pn_it);
-      int hpn = numPn;
-      
-      for (int u = (-hpn) ; u<=hpn; u++){	  
-	  int ipn_c = ipn + u;
-	  if (ipn_c < 1 || ipn_c > 10) continue;
-	  std::vector<int>::iterator notInList = find(listAllPns.begin(), listAllPns.end(), ipn_c);
-	  if ( notInList == listAllPns.end() ) {
-	    listAllPns.push_back ( ipn_c );
-	  }
+  for (pn_it = listPns.begin(); pn_it != listPns.end(); pn_it++) {
+    int ipn = (*pn_it);
+    int hpn = numPn;
+
+    for (int u = (-hpn); u <= hpn; u++) {
+      int ipn_c = ipn + u;
+      if (ipn_c < 1 || ipn_c > 10)
+        continue;
+      std::vector<int>::iterator notInList = find(listAllPns.begin(), listAllPns.end(), ipn_c);
+      if (notInList == listAllPns.end()) {
+        listAllPns.push_back(ipn_c);
       }
     }
-  
+  }
+
   //Loop over PN digis
-  for ( EcalPnDiodeDigiCollection::const_iterator pnItr = pn_digis->begin(); pnItr != pn_digis->end(); ++pnItr )  {
+  for (EcalPnDiodeDigiCollection::const_iterator pnItr = pn_digis->begin(); pnItr != pn_digis->end(); ++pnItr) {
     //Get PNid of a digi
     int ipn = (*pnItr).id().iPnId();
     //Get DCC id where the digi is from
-    int ieb    = EcalPnDiodeDetId((*pnItr).id()).iDCCId();
-    
+    int ieb = EcalPnDiodeDetId((*pnItr).id()).iDCCId();
+
     //Make sure that these are PnDigis from the requested FEDid
     int FEDid = ieb + 600;
 
     std::vector<int>::iterator fedIter = find(feds_.begin(), feds_.end(), FEDid);
 
-    if ( fedIter == feds_.end() ) {
-      edm::LogWarning("EcalPnGraphs")<< "For Event " << eventCounter << " PnDigis are not found from requested SM!. returning...";
+    if (fedIter == feds_.end()) {
+      edm::LogWarning("EcalPnGraphs") << "For Event " << eventCounter
+                                      << " PnDigis are not found from requested SM!. returning...";
       return;
     }
     // selecting desired Pns only
     std::vector<int>::iterator iPnIter;
-    iPnIter     = find( listAllPns.begin() , listAllPns.end() , ipn);
-    if (iPnIter == listAllPns.end()) continue; 
-    
-    for ( int i=0; i< (*pnItr).size() && i<50; ++i ) {
+    iPnIter = find(listAllPns.begin(), listAllPns.end(), ipn);
+    if (iPnIter == listAllPns.end())
+      continue;
+
+    for (int i = 0; i < (*pnItr).size() && i < 50; ++i) {
       ordinate[i] = (*pnItr).sample(i).adc();
     }
     //make grapn of ph digis
-    TGraph oneGraph(50, abscissa,ordinate);
+    TGraph oneGraph(50, abscissa, ordinate);
     std::string title;
-    title = "Graph_ev" + intToString( eventCounter )
-          + "_FED" + intToString( FEDid )
-          + "_ipn" + intToString( ipn );
+    title = "Graph_ev" + intToString(eventCounter) + "_FED" + intToString(FEDid) + "_ipn" + intToString(ipn);
     oneGraph.SetTitle(title.c_str());
     oneGraph.SetName(title.c_str());
     graphs.push_back(oneGraph);
-    
-  }// loop over Pn digis
+
+  }  // loop over Pn digis
 }
 
-std::string EcalPnGraphs::intToString(int num)
-{
+std::string EcalPnGraphs::intToString(int num) {
   //
   // outputs the number into the string stream and then flushes
   // the buffer (makes sure the output is put into the stream)
   //
-  std::ostringstream myStream; //creates an ostringstream object
+  std::ostringstream myStream;  //creates an ostringstream object
   myStream << num << std::flush;
-  
-  return(myStream.str()); //returns the string form of the stringstream object
-} 
+
+  return (myStream.str());  //returns the string form of the stringstream object
+}
 
 //=============================================================================
 void EcalPnGraphs::endJob() {
-//=============================================================================
-  fileName +=  ( std::string("_Pn")    + intToString(first_Pn) ); 
+  //=============================================================================
+  fileName += (std::string("_Pn") + intToString(first_Pn));
   fileName += ".graph.root";
 
-  root_file = new TFile( fileName.c_str() , "RECREATE" );
+  root_file = new TFile(fileName.c_str(), "RECREATE");
   std::vector<TGraph>::iterator gr_it;
-  for ( gr_it = graphs.begin(); gr_it !=  graphs.end(); gr_it++ )      (*gr_it).Write();
+  for (gr_it = graphs.begin(); gr_it != graphs.end(); gr_it++)
+    (*gr_it).Write();
   root_file->Close();
 
-  edm::LogInfo("EcalPnGraphs") << "DONE!.... " ;
+  edm::LogInfo("EcalPnGraphs") << "DONE!.... ";
 }
-
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalPnGraphs.h b/CaloOnlineTools/EcalTools/plugins/EcalPnGraphs.h
index d8549f5807c1f..49a89831faa23 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalPnGraphs.h
+++ b/CaloOnlineTools/EcalTools/plugins/EcalPnGraphs.h
@@ -17,28 +17,23 @@
 #include "TFile.h"
 #include "TGraph.h"
 
-
-
-class EcalPnGraphs: public edm::EDAnalyzer{
-  
+class EcalPnGraphs : public edm::EDAnalyzer {
 public:
-
-  EcalPnGraphs(const edm::ParameterSet& ps);   
+  EcalPnGraphs(const edm::ParameterSet& ps);
   ~EcalPnGraphs() override;
-    
+
 private:
-  void analyze(const edm::Event & e, const  edm::EventSetup& c) override;
+  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
   void beginJob() override;
   void endJob() override;
- 
+
   //  void pnGraphs (edm::Handle<EcalPnDiodeDigiCollection> PNs );
 
   std::string intToString(int num);
 
   EcalFedMap* fedMap;
-  
-protected:
 
+protected:
   //  std::string ebDigiCollection_;
   //std::string eeDigiCollection_;
   std::string digiProducer_;
@@ -48,10 +43,9 @@ class EcalPnGraphs: public edm::EDAnalyzer{
 
   int verbosity;
   int eventCounter;
-   
+
   //  std::vector<int ieb_id;
   int first_Pn;
-  
 
   bool inputIsOk;
 
@@ -66,12 +60,10 @@ class EcalPnGraphs: public edm::EDAnalyzer{
 
   int abscissa[50];
   int ordinate[50];
-  
+
   std::vector<TGraph> graphs;
-  
-  TFile * root_file;
-  
+
+  TFile* root_file;
 };
 
 #endif
-
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalPulseShapeGrapher.cc b/CaloOnlineTools/EcalTools/plugins/EcalPulseShapeGrapher.cc
index a4f75278ea730..c4d24720360b1 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalPulseShapeGrapher.cc
+++ b/CaloOnlineTools/EcalTools/plugins/EcalPulseShapeGrapher.cc
@@ -2,7 +2,7 @@
 //
 // Package:    EcalPulseShapeGrapher
 // Class:      EcalPulseShapeGrapher
-// 
+//
 /**\class EcalPulseShapeGrapher EcalPulseShapeGrapher.cc Analyzers/EcalPulseShapeGrapher/src/EcalPulseShapeGrapher.cc
 
  Description: <one line class summary>
@@ -29,267 +29,246 @@
 //
 // constructors and destructor
 //
-EcalPulseShapeGrapher::EcalPulseShapeGrapher(const edm::ParameterSet& iConfig) :
-EBUncalibratedRecHitCollection_ (iConfig.getParameter<edm::InputTag>("EBUncalibratedRecHitCollection")),
-EBDigis_ (iConfig.getParameter<edm::InputTag>("EBDigiCollection")),
-EEUncalibratedRecHitCollection_ (iConfig.getParameter<edm::InputTag>("EEUncalibratedRecHitCollection")),
-EEDigis_ (iConfig.getParameter<edm::InputTag>("EEDigiCollection")),
-ampCut_ (iConfig.getUntrackedParameter<int>("AmplitudeCutADC", 13)),
-rootFilename_ (iConfig.getUntrackedParameter<std::string>("rootFilename","pulseShapeGrapher"))
-{
-   //now do what ever initialization is needed
-
-   std::vector<int> listDefaults;
-   listDefaults.push_back(-1);
-   listChannels_ = iConfig.getUntrackedParameter<std::vector<int> >("listChannels", listDefaults);
-
-   for(std::vector<int>::const_iterator itr = listChannels_.begin(); itr != listChannels_.end(); ++itr)
-   {
-     std::string title = "Amplitude of cry "+intToString(*itr);
-     std::string name = "ampOfCry"+intToString(*itr);
-     ampHistMap_[*itr] = new TH1F(name.c_str(),title.c_str(),100,0,100);
-     ampHistMap_[*itr]->GetXaxis()->SetTitle("ADC");
-
-     title = "Amplitude (over 13 ADC) of cry "+intToString(*itr);
-     name = "cutAmpOfCry"+intToString(*itr);
-     cutAmpHistMap_[*itr] = new TH1F(name.c_str(),title.c_str(),100,0,100);
-     cutAmpHistMap_[*itr]->GetXaxis()->SetTitle("ADC");
-
-     title = "Pulse shape of cry "+intToString(*itr);
-     name = "PulseShapeCry"+intToString(*itr);
-     pulseShapeHistMap_[*itr] = new TH2F(name.c_str(),title.c_str(),10,0,10,220,-20,2);
-     pulseShapeHistMap_[*itr]->GetXaxis()->SetTitle("sample");
-
-     title = "Raw Pulse shape of cry "+intToString(*itr);
-     name = "RawPulseShapeCry"+intToString(*itr);
-     rawPulseShapeHistMap_[*itr] = new TH2F(name.c_str(),title.c_str(),10,0,10,500,0,500);
-     rawPulseShapeHistMap_[*itr]->GetXaxis()->SetTitle("sample");
-     
-     title = "Amplitude of first sample, cry "+intToString(*itr);
-     name = "AmpOfFirstSampleCry"+intToString(*itr);
-     firstSampleHistMap_[*itr] = new TH1F(name.c_str(),title.c_str(),300,100,400);
-     firstSampleHistMap_[*itr]->GetXaxis()->SetTitle("ADC");
-   }
-   
-   fedMap_ = new EcalFedMap();
-   
-   for (int i=0; i<10; i++)
-     abscissa[i] = i;
+EcalPulseShapeGrapher::EcalPulseShapeGrapher(const edm::ParameterSet& iConfig)
+    : EBUncalibratedRecHitCollection_(iConfig.getParameter<edm::InputTag>("EBUncalibratedRecHitCollection")),
+      EBDigis_(iConfig.getParameter<edm::InputTag>("EBDigiCollection")),
+      EEUncalibratedRecHitCollection_(iConfig.getParameter<edm::InputTag>("EEUncalibratedRecHitCollection")),
+      EEDigis_(iConfig.getParameter<edm::InputTag>("EEDigiCollection")),
+      ampCut_(iConfig.getUntrackedParameter<int>("AmplitudeCutADC", 13)),
+      rootFilename_(iConfig.getUntrackedParameter<std::string>("rootFilename", "pulseShapeGrapher")) {
+  //now do what ever initialization is needed
+
+  std::vector<int> listDefaults;
+  listDefaults.push_back(-1);
+  listChannels_ = iConfig.getUntrackedParameter<std::vector<int> >("listChannels", listDefaults);
+
+  for (std::vector<int>::const_iterator itr = listChannels_.begin(); itr != listChannels_.end(); ++itr) {
+    std::string title = "Amplitude of cry " + intToString(*itr);
+    std::string name = "ampOfCry" + intToString(*itr);
+    ampHistMap_[*itr] = new TH1F(name.c_str(), title.c_str(), 100, 0, 100);
+    ampHistMap_[*itr]->GetXaxis()->SetTitle("ADC");
+
+    title = "Amplitude (over 13 ADC) of cry " + intToString(*itr);
+    name = "cutAmpOfCry" + intToString(*itr);
+    cutAmpHistMap_[*itr] = new TH1F(name.c_str(), title.c_str(), 100, 0, 100);
+    cutAmpHistMap_[*itr]->GetXaxis()->SetTitle("ADC");
+
+    title = "Pulse shape of cry " + intToString(*itr);
+    name = "PulseShapeCry" + intToString(*itr);
+    pulseShapeHistMap_[*itr] = new TH2F(name.c_str(), title.c_str(), 10, 0, 10, 220, -20, 2);
+    pulseShapeHistMap_[*itr]->GetXaxis()->SetTitle("sample");
+
+    title = "Raw Pulse shape of cry " + intToString(*itr);
+    name = "RawPulseShapeCry" + intToString(*itr);
+    rawPulseShapeHistMap_[*itr] = new TH2F(name.c_str(), title.c_str(), 10, 0, 10, 500, 0, 500);
+    rawPulseShapeHistMap_[*itr]->GetXaxis()->SetTitle("sample");
+
+    title = "Amplitude of first sample, cry " + intToString(*itr);
+    name = "AmpOfFirstSampleCry" + intToString(*itr);
+    firstSampleHistMap_[*itr] = new TH1F(name.c_str(), title.c_str(), 300, 100, 400);
+    firstSampleHistMap_[*itr]->GetXaxis()->SetTitle("ADC");
+  }
+
+  fedMap_ = new EcalFedMap();
+
+  for (int i = 0; i < 10; i++)
+    abscissa[i] = i;
 }
 
-
-EcalPulseShapeGrapher::~EcalPulseShapeGrapher()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+EcalPulseShapeGrapher::~EcalPulseShapeGrapher() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-EcalPulseShapeGrapher::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace edm;
-   using namespace std;
-
-   int numHitsWithActivity = 0;
-   
-   //int eventNum = iEvent.id().event();
-   //vector<EcalUncalibratedRecHit> sampleHitsPastCut;
-   
-   Handle<EcalUncalibratedRecHitCollection> EBHits;
-   iEvent.getByLabel(EBUncalibratedRecHitCollection_, EBHits);
-   Handle<EcalUncalibratedRecHitCollection> EEHits;
-   iEvent.getByLabel(EEUncalibratedRecHitCollection_, EEHits);
-   //cout << "event: " << eventNum << " sample hits collection size: " << sampleHits->size() << endl;
-   //Handle<EcalUncalibratedRecHitCollection> fittedHits;
-   //iEvent.getByLabel(FittedUncalibratedRecHitCollection_, fittedHits);
-   Handle<EBDigiCollection>  EBdigis;
-   iEvent.getByLabel(EBDigis_, EBdigis);
-   Handle<EEDigiCollection>  EEdigis;
-   iEvent.getByLabel(EEDigis_, EEdigis);
-   //cout << "event: " << eventNum << " digi collection size: " << digis->size() << endl;
-
-   unique_ptr<EcalElectronicsMapping> ecalElectronicsMap(new EcalElectronicsMapping);
-
-   // Loop over the hits
-   for(EcalUncalibratedRecHitCollection::const_iterator hitItr = EBHits->begin(); hitItr != EBHits->end(); ++hitItr)
-   {
-     EcalUncalibratedRecHit hit = (*hitItr);
-     float amplitude = hit.amplitude();
-     EBDetId hitDetId = hit.id();
-
-     // Get the Fedid
-     EcalElectronicsId elecId = ecalElectronicsMap->getElectronicsId(hitDetId);
-     int FEDid = 600+elecId.dccId();
-     string SMname = fedMap_->getSliceFromFed(FEDid);
-     
-     vector<int>::const_iterator itr = listChannels_.begin();
-     while(itr != listChannels_.end() && (*itr) != hitDetId.hashedIndex())
-     {
-       itr++;
-     }
-     if(itr==listChannels_.end())
-       continue;
-
-     ampHistMap_[hitDetId.hashedIndex()]->Fill(amplitude);
-     //cout << "Cry hash:" << hitDetId.hashedIndex() << " amplitude: " << amplitude << endl;
-     if(amplitude < ampCut_)
-       continue;
-
-     cutAmpHistMap_[hitDetId.hashedIndex()]->Fill(amplitude);
-     numHitsWithActivity++;
-     EBDigiCollection::const_iterator digiItr= EBdigis->begin();
-     while(digiItr != EBdigis->end() && digiItr->id() != hitItr->id())
-     {
-       digiItr++;
-     }
-     if(digiItr == EBdigis->end())
-       continue;
-
-     double sampleADC[10];
-     EBDataFrame df(*digiItr);
-     double pedestal = 200;
-
-     if(df.sample(0).gainId()!=1 || df.sample(1).gainId()!=1) continue; //goes to the next digi
-     else {
-       sampleADC[0] = df.sample(0).adc();
-       sampleADC[1] = df.sample(1).adc();
-       pedestal = (double)(sampleADC[0]+sampleADC[1])/(double)2;
-     } 
-
-     for (int i=0; (unsigned int)i< digiItr->size(); ++i ) {
-       EBDataFrame df(*digiItr);
-       double gain = 12.;
-       if(df.sample(i).gainId()==1)
-         gain = 1.;
-       else if(df.sample(i).gainId()==2)
-         gain = 2.;
-       sampleADC[i] = pedestal+(df.sample(i).adc()-pedestal)*gain;
-     }
-
-     //cout << "1) maxsample amp:" << maxSampleAmp << " maxSampleIndex:" << maxSampleIndex << endl;
-     for(int i=0; i<10;++i)
-     {
-       //cout << "Filling hist for:" << hitDetId.hashedIndex() << " with sample:" << i 
-         //<< " amp:" <<(float)(df.sample(i).adc()-baseline)/(maxSampleAmp-baseline) << endl;
-       //cout << "ADC of sample:" << df.sample(i).adc() << " baseline:" << baseline << " maxSampleAmp:" 
-         //<< maxSampleAmp << endl << endl;
-       pulseShapeHistMap_[hitDetId.hashedIndex()]->Fill(i, (float)(sampleADC[i]-pedestal)/amplitude);
-       rawPulseShapeHistMap_[hitDetId.hashedIndex()]->Fill(i, (float)(sampleADC[i]));
-     }
-     firstSampleHistMap_[hitDetId.hashedIndex()]->Fill(sampleADC[0]);
-   }
-
-   // Now do the same for the EE hits
-   for(EcalUncalibratedRecHitCollection::const_iterator hitItr = EEHits->begin(); hitItr != EEHits->end(); ++hitItr)
-   {
-     EcalUncalibratedRecHit hit = (*hitItr);
-     float amplitude = hit.amplitude();
-     EEDetId hitDetId = hit.id();
-
-     // Get the Fedid
-     EcalElectronicsId elecId = ecalElectronicsMap->getElectronicsId(hitDetId);
-     int FEDid = 600+elecId.dccId();
-     string SMname = fedMap_->getSliceFromFed(FEDid);
-     
-     vector<int>::const_iterator itr = listChannels_.begin();
-     while(itr != listChannels_.end() && (*itr) != hitDetId.hashedIndex())
-     {
-       itr++;
-     }
-     if(itr==listChannels_.end())
-       continue;
-
-     ampHistMap_[hitDetId.hashedIndex()]->Fill(amplitude);
-     //cout << "Cry hash:" << hitDetId.hashedIndex() << " amplitude: " << amplitude << endl;
-     if(amplitude < ampCut_)
-       continue;
-
-     cutAmpHistMap_[hitDetId.hashedIndex()]->Fill(amplitude);
-     numHitsWithActivity++;
-     EEDigiCollection::const_iterator digiItr= EEdigis->begin();
-     while(digiItr != EEdigis->end() && digiItr->id() != hitItr->id())
-     {
-       digiItr++;
-     }
-     if(digiItr == EEdigis->end())
-       continue;
-
-     double sampleADC[10];
-     EEDataFrame df(*digiItr);
-     double pedestal = 200;
-
-     if(df.sample(0).gainId()!=1 || df.sample(1).gainId()!=1) continue; //goes to the next digi
-     else {
-       sampleADC[0] = df.sample(0).adc();
-       sampleADC[1] = df.sample(1).adc();
-       pedestal = (double)(sampleADC[0]+sampleADC[1])/(double)2;
-     } 
-
-     for (int i=0; (unsigned int)i< digiItr->size(); ++i ) {
-       EEDataFrame df(*digiItr);
-       double gain = 12.;
-       if(df.sample(i).gainId()==1)
-         gain = 1.;
-       else if(df.sample(i).gainId()==2)
-         gain = 2.;
-       sampleADC[i] = pedestal+(df.sample(i).adc()-pedestal)*gain;
-     }
-
-     //cout << "1) maxsample amp:" << maxSampleAmp << " maxSampleIndex:" << maxSampleIndex << endl;
-     for(int i=0; i<10;++i)
-     {
-       //cout << "Filling hist for:" << hitDetId.hashedIndex() << " with sample:" << i 
-         //<< " amp:" <<(float)(df.sample(i).adc()-baseline)/(maxSampleAmp-baseline) << endl;
-       //cout << "ADC of sample:" << df.sample(i).adc() << " baseline:" << baseline << " maxSampleAmp:" 
-         //<< maxSampleAmp << endl << endl;
-       pulseShapeHistMap_[hitDetId.hashedIndex()]->Fill(i, (float)(sampleADC[i]-pedestal)/amplitude);
-       rawPulseShapeHistMap_[hitDetId.hashedIndex()]->Fill(i, (float)(sampleADC[i]));
-     }
-     firstSampleHistMap_[hitDetId.hashedIndex()]->Fill(sampleADC[0]);
-   }
-}
+void EcalPulseShapeGrapher::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
+  using namespace edm;
+  using namespace std;
 
+  int numHitsWithActivity = 0;
+
+  //int eventNum = iEvent.id().event();
+  //vector<EcalUncalibratedRecHit> sampleHitsPastCut;
+
+  Handle<EcalUncalibratedRecHitCollection> EBHits;
+  iEvent.getByLabel(EBUncalibratedRecHitCollection_, EBHits);
+  Handle<EcalUncalibratedRecHitCollection> EEHits;
+  iEvent.getByLabel(EEUncalibratedRecHitCollection_, EEHits);
+  //cout << "event: " << eventNum << " sample hits collection size: " << sampleHits->size() << endl;
+  //Handle<EcalUncalibratedRecHitCollection> fittedHits;
+  //iEvent.getByLabel(FittedUncalibratedRecHitCollection_, fittedHits);
+  Handle<EBDigiCollection> EBdigis;
+  iEvent.getByLabel(EBDigis_, EBdigis);
+  Handle<EEDigiCollection> EEdigis;
+  iEvent.getByLabel(EEDigis_, EEdigis);
+  //cout << "event: " << eventNum << " digi collection size: " << digis->size() << endl;
+
+  unique_ptr<EcalElectronicsMapping> ecalElectronicsMap(new EcalElectronicsMapping);
+
+  // Loop over the hits
+  for (EcalUncalibratedRecHitCollection::const_iterator hitItr = EBHits->begin(); hitItr != EBHits->end(); ++hitItr) {
+    EcalUncalibratedRecHit hit = (*hitItr);
+    float amplitude = hit.amplitude();
+    EBDetId hitDetId = hit.id();
+
+    // Get the Fedid
+    EcalElectronicsId elecId = ecalElectronicsMap->getElectronicsId(hitDetId);
+    int FEDid = 600 + elecId.dccId();
+    string SMname = fedMap_->getSliceFromFed(FEDid);
+
+    vector<int>::const_iterator itr = listChannels_.begin();
+    while (itr != listChannels_.end() && (*itr) != hitDetId.hashedIndex()) {
+      itr++;
+    }
+    if (itr == listChannels_.end())
+      continue;
+
+    ampHistMap_[hitDetId.hashedIndex()]->Fill(amplitude);
+    //cout << "Cry hash:" << hitDetId.hashedIndex() << " amplitude: " << amplitude << endl;
+    if (amplitude < ampCut_)
+      continue;
+
+    cutAmpHistMap_[hitDetId.hashedIndex()]->Fill(amplitude);
+    numHitsWithActivity++;
+    EBDigiCollection::const_iterator digiItr = EBdigis->begin();
+    while (digiItr != EBdigis->end() && digiItr->id() != hitItr->id()) {
+      digiItr++;
+    }
+    if (digiItr == EBdigis->end())
+      continue;
+
+    double sampleADC[10];
+    EBDataFrame df(*digiItr);
+    double pedestal = 200;
+
+    if (df.sample(0).gainId() != 1 || df.sample(1).gainId() != 1)
+      continue;  //goes to the next digi
+    else {
+      sampleADC[0] = df.sample(0).adc();
+      sampleADC[1] = df.sample(1).adc();
+      pedestal = (double)(sampleADC[0] + sampleADC[1]) / (double)2;
+    }
+
+    for (int i = 0; (unsigned int)i < digiItr->size(); ++i) {
+      EBDataFrame df(*digiItr);
+      double gain = 12.;
+      if (df.sample(i).gainId() == 1)
+        gain = 1.;
+      else if (df.sample(i).gainId() == 2)
+        gain = 2.;
+      sampleADC[i] = pedestal + (df.sample(i).adc() - pedestal) * gain;
+    }
+
+    //cout << "1) maxsample amp:" << maxSampleAmp << " maxSampleIndex:" << maxSampleIndex << endl;
+    for (int i = 0; i < 10; ++i) {
+      //cout << "Filling hist for:" << hitDetId.hashedIndex() << " with sample:" << i
+      //<< " amp:" <<(float)(df.sample(i).adc()-baseline)/(maxSampleAmp-baseline) << endl;
+      //cout << "ADC of sample:" << df.sample(i).adc() << " baseline:" << baseline << " maxSampleAmp:"
+      //<< maxSampleAmp << endl << endl;
+      pulseShapeHistMap_[hitDetId.hashedIndex()]->Fill(i, (float)(sampleADC[i] - pedestal) / amplitude);
+      rawPulseShapeHistMap_[hitDetId.hashedIndex()]->Fill(i, (float)(sampleADC[i]));
+    }
+    firstSampleHistMap_[hitDetId.hashedIndex()]->Fill(sampleADC[0]);
+  }
+
+  // Now do the same for the EE hits
+  for (EcalUncalibratedRecHitCollection::const_iterator hitItr = EEHits->begin(); hitItr != EEHits->end(); ++hitItr) {
+    EcalUncalibratedRecHit hit = (*hitItr);
+    float amplitude = hit.amplitude();
+    EEDetId hitDetId = hit.id();
+
+    // Get the Fedid
+    EcalElectronicsId elecId = ecalElectronicsMap->getElectronicsId(hitDetId);
+    int FEDid = 600 + elecId.dccId();
+    string SMname = fedMap_->getSliceFromFed(FEDid);
+
+    vector<int>::const_iterator itr = listChannels_.begin();
+    while (itr != listChannels_.end() && (*itr) != hitDetId.hashedIndex()) {
+      itr++;
+    }
+    if (itr == listChannels_.end())
+      continue;
+
+    ampHistMap_[hitDetId.hashedIndex()]->Fill(amplitude);
+    //cout << "Cry hash:" << hitDetId.hashedIndex() << " amplitude: " << amplitude << endl;
+    if (amplitude < ampCut_)
+      continue;
+
+    cutAmpHistMap_[hitDetId.hashedIndex()]->Fill(amplitude);
+    numHitsWithActivity++;
+    EEDigiCollection::const_iterator digiItr = EEdigis->begin();
+    while (digiItr != EEdigis->end() && digiItr->id() != hitItr->id()) {
+      digiItr++;
+    }
+    if (digiItr == EEdigis->end())
+      continue;
+
+    double sampleADC[10];
+    EEDataFrame df(*digiItr);
+    double pedestal = 200;
+
+    if (df.sample(0).gainId() != 1 || df.sample(1).gainId() != 1)
+      continue;  //goes to the next digi
+    else {
+      sampleADC[0] = df.sample(0).adc();
+      sampleADC[1] = df.sample(1).adc();
+      pedestal = (double)(sampleADC[0] + sampleADC[1]) / (double)2;
+    }
+
+    for (int i = 0; (unsigned int)i < digiItr->size(); ++i) {
+      EEDataFrame df(*digiItr);
+      double gain = 12.;
+      if (df.sample(i).gainId() == 1)
+        gain = 1.;
+      else if (df.sample(i).gainId() == 2)
+        gain = 2.;
+      sampleADC[i] = pedestal + (df.sample(i).adc() - pedestal) * gain;
+    }
+
+    //cout << "1) maxsample amp:" << maxSampleAmp << " maxSampleIndex:" << maxSampleIndex << endl;
+    for (int i = 0; i < 10; ++i) {
+      //cout << "Filling hist for:" << hitDetId.hashedIndex() << " with sample:" << i
+      //<< " amp:" <<(float)(df.sample(i).adc()-baseline)/(maxSampleAmp-baseline) << endl;
+      //cout << "ADC of sample:" << df.sample(i).adc() << " baseline:" << baseline << " maxSampleAmp:"
+      //<< maxSampleAmp << endl << endl;
+      pulseShapeHistMap_[hitDetId.hashedIndex()]->Fill(i, (float)(sampleADC[i] - pedestal) / amplitude);
+      rawPulseShapeHistMap_[hitDetId.hashedIndex()]->Fill(i, (float)(sampleADC[i]));
+    }
+    firstSampleHistMap_[hitDetId.hashedIndex()]->Fill(sampleADC[0]);
+  }
+}
 
 // ------------ method called once each job just after ending the event loop  ------------
-void 
-EcalPulseShapeGrapher::endJob() {
-  
-   rootFilename_+=".root";
-   file_ = new TFile(rootFilename_.c_str(),"RECREATE");
-   TH1::AddDirectory(false);
-  
-   for(std::vector<int>::const_iterator itr = listChannels_.begin(); itr != listChannels_.end(); ++itr)
-   {
-     ampHistMap_[*itr]->Write();
-     cutAmpHistMap_[*itr]->Write();
-     firstSampleHistMap_[*itr]->Write();
-
-     rawPulseShapeHistMap_[*itr]->Write();
-     TProfile* t2 = (TProfile*) (rawPulseShapeHistMap_[*itr]->ProfileX());
-     t2->Write();
-     //TODO: fix the normalization so these are correct
-     //pulseShapeHistMap_[*itr]->Write();
-     //TProfile* t1 = (TProfile*) (pulseShapeHistMap_[*itr]->ProfileX());
-     //t1->Write();
-   }
-
-   
+void EcalPulseShapeGrapher::endJob() {
+  rootFilename_ += ".root";
+  file_ = new TFile(rootFilename_.c_str(), "RECREATE");
+  TH1::AddDirectory(false);
+
+  for (std::vector<int>::const_iterator itr = listChannels_.begin(); itr != listChannels_.end(); ++itr) {
+    ampHistMap_[*itr]->Write();
+    cutAmpHistMap_[*itr]->Write();
+    firstSampleHistMap_[*itr]->Write();
+
+    rawPulseShapeHistMap_[*itr]->Write();
+    TProfile* t2 = (TProfile*)(rawPulseShapeHistMap_[*itr]->ProfileX());
+    t2->Write();
+    //TODO: fix the normalization so these are correct
+    //pulseShapeHistMap_[*itr]->Write();
+    //TProfile* t1 = (TProfile*) (pulseShapeHistMap_[*itr]->ProfileX());
+    //t1->Write();
+  }
+
   file_->Write();
   file_->Close();
 }
 
-std::string EcalPulseShapeGrapher::intToString(int num)
-{
+std::string EcalPulseShapeGrapher::intToString(int num) {
   using namespace std;
   ostringstream myStream;
   myStream << num << flush;
-  return(myStream.str()); //returns the string form of the stringstream object
+  return (myStream.str());  //returns the string form of the stringstream object
 }
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalPulseShapeGrapher.h b/CaloOnlineTools/EcalTools/plugins/EcalPulseShapeGrapher.h
index eb96b510d81dc..c1d7081c83b32 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalPulseShapeGrapher.h
+++ b/CaloOnlineTools/EcalTools/plugins/EcalPulseShapeGrapher.h
@@ -2,7 +2,7 @@
 //
 // Package:    EcalPulseShapeGrapher
 // Class:      EcalPulseShapeGrapher
-// 
+//
 /**\class EcalPulseShapeGrapher EcalPulseShapeGrapher.cc EcalPulseShapeGrapher.h
 
  Description: <one line class summary>
@@ -44,36 +44,35 @@
 //
 
 class EcalPulseShapeGrapher : public edm::EDAnalyzer {
-   public:
-      explicit EcalPulseShapeGrapher(const edm::ParameterSet&);
-      ~EcalPulseShapeGrapher() override;
+public:
+  explicit EcalPulseShapeGrapher(const edm::ParameterSet&);
+  ~EcalPulseShapeGrapher() override;
+
+private:
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void endJob() override;
 
+  std::string intToString(int);
 
-   private:
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      void endJob() override ;
+  edm::InputTag EBUncalibratedRecHitCollection_;
+  edm::InputTag EBDigis_;
+  edm::InputTag EEUncalibratedRecHitCollection_;
+  edm::InputTag EEDigis_;
 
-      std::string intToString(int);
+  int abscissa[10];
+  int ordinate[10];
+  std::vector<int> listChannels_;
+  std::map<int, TH1F*> ampHistMap_;
+  std::map<int, TH2F*> pulseShapeHistMap_;
+  std::map<int, TH1F*> firstSampleHistMap_;
+  std::map<int, TH2F*> rawPulseShapeHistMap_;
+  std::map<int, TH1F*> cutAmpHistMap_;
 
-      edm::InputTag EBUncalibratedRecHitCollection_;
-      edm::InputTag EBDigis_;
-      edm::InputTag EEUncalibratedRecHitCollection_;
-      edm::InputTag EEDigis_;
+  int ampCut_;
+  std::string rootFilename_;
 
-      int abscissa[10];
-      int ordinate[10];
-      std::vector<int> listChannels_;
-      std::map<int,TH1F*> ampHistMap_;
-      std::map<int,TH2F*> pulseShapeHistMap_;
-      std::map<int,TH1F*> firstSampleHistMap_;
-      std::map<int,TH2F*> rawPulseShapeHistMap_;
-      std::map<int,TH1F*> cutAmpHistMap_;
-      
-      int ampCut_;
-      std::string rootFilename_;
+  TFile* file_;
 
-      TFile* file_;
-         
-      EcalFedMap* fedMap_;
-      // ----------member data ---------------------------
+  EcalFedMap* fedMap_;
+  // ----------member data ---------------------------
 };
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.cc b/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.cc
index d6e2f97ade1ba..9549766a88e90 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.cc
+++ b/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.cc
@@ -5,8 +5,7 @@
 //
 //class EcalHighEnCosmicFilter EcalHighEnCosmicFilter.cc
 //
-// Original Author:  
-
+// Original Author:
 
 #include <memory>
 #include <vector>
@@ -36,58 +35,50 @@ using namespace std;
 using namespace reco;
 
 //
-EcalRecHitsFilter::EcalRecHitsFilter(const edm::ParameterSet& iConfig) :
-  NumBadXtalsThreshold_ (iConfig.getUntrackedParameter<int>("NumberXtalsThreshold")),
-  EBRecHitCollection_ (iConfig.getParameter<edm::InputTag>("EcalRecHitCollectionEB"))
+EcalRecHitsFilter::EcalRecHitsFilter(const edm::ParameterSet& iConfig)
+    : NumBadXtalsThreshold_(iConfig.getUntrackedParameter<int>("NumberXtalsThreshold")),
+      EBRecHitCollection_(iConfig.getParameter<edm::InputTag>("EcalRecHitCollectionEB"))
 
 {
   EnergyCut = (iConfig.getUntrackedParameter<double>("energycut"));
 }
 
-EcalRecHitsFilter::~EcalRecHitsFilter()
-{
-}
+EcalRecHitsFilter::~EcalRecHitsFilter() {}
 
-bool EcalRecHitsFilter::filter( edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+bool EcalRecHitsFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   //int ievt = iEvent.id().event();
   Handle<EcalRecHitCollection> EBhits;
-  iEvent.getByLabel(EBRecHitCollection_,EBhits);
+  iEvent.getByLabel(EBRecHitCollection_, EBhits);
 
   bool accepted = true;
   int nRecHitsGreater1GevPerEvent = 0;
 
-  for (EcalRecHitCollection::const_iterator hitItr = EBhits->begin(); hitItr != EBhits->end(); ++hitItr)
-    {
+  for (EcalRecHitCollection::const_iterator hitItr = EBhits->begin(); hitItr != EBhits->end(); ++hitItr) {
+    EcalRecHit hit = (*hitItr);
+    EBDetId det = hit.id();
 
-      EcalRecHit hit = (*hitItr);
-      EBDetId det = hit.id();
-  
-      float ampli = hit.energy();
-      if(ampli > EnergyCut /*1GeV*/)
- 	{
-	  nRecHitsGreater1GevPerEvent++;
- 	  nRecHitsGreater1GevPerEvent_hist_MAP->Fill(det.iphi(),det.ieta());
- 	}
+    float ampli = hit.energy();
+    if (ampli > EnergyCut /*1GeV*/) {
+      nRecHitsGreater1GevPerEvent++;
+      nRecHitsGreater1GevPerEvent_hist_MAP->Fill(det.iphi(), det.ieta());
     }
+  }
   nRecHitsGreater1GevPerEvent_hist->Fill(nRecHitsGreater1GevPerEvent);
-  if(nRecHitsGreater1GevPerEvent > NumBadXtalsThreshold_ ) accepted = false;
+  if (nRecHitsGreater1GevPerEvent > NumBadXtalsThreshold_)
+    accepted = false;
   return accepted;
 }
 
-void 
-EcalRecHitsFilter::beginJob()
-{
-  nRecHitsGreater1GevPerEvent_hist = new TH1F("nRecHitsGreater1GevPerEvent_hist","nRecHitsGreater1GevPerEvent_hist",65000,0.,65000.);
-  nRecHitsGreater1GevPerEvent_hist_MAP = new TH2F("nRecHitsGreater1GevPerEvent_hist_MAP","nRecHitsGreater1GevPerEvent_hist_MAP",360,1.,361.,171,-85.,86.);
+void EcalRecHitsFilter::beginJob() {
+  nRecHitsGreater1GevPerEvent_hist =
+      new TH1F("nRecHitsGreater1GevPerEvent_hist", "nRecHitsGreater1GevPerEvent_hist", 65000, 0., 65000.);
+  nRecHitsGreater1GevPerEvent_hist_MAP = new TH2F(
+      "nRecHitsGreater1GevPerEvent_hist_MAP", "nRecHitsGreater1GevPerEvent_hist_MAP", 360, 1., 361., 171, -85., 86.);
 }
 
-
-void 
-EcalRecHitsFilter::endJob()
-{
+void EcalRecHitsFilter::endJob() {
   cout << "------EcalRecHitsFilter EndJob------>>>>>>>>>>" << endl;
-  file = new TFile("RecHitFilter.root" , "RECREATE");
+  file = new TFile("RecHitFilter.root", "RECREATE");
   file->cd();
   nRecHitsGreater1GevPerEvent_hist_MAP->Write();
   nRecHitsGreater1GevPerEvent_hist->Write();
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.h b/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.h
index ed7f8c21ace33..90c9743c4d9ce 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.h
+++ b/CaloOnlineTools/EcalTools/plugins/EcalRecHitsFilter.h
@@ -5,14 +5,13 @@
 //
 //class EcalRecHitsFilter EcalRecHitsFilter.cc
 //
-// Original Author:  
+// Original Author:
 //         Created:  We May 14 10:10:52 CEST 2008
 //
 
 #ifndef EcalRecHitsFilter_H
 #define EcalRecHitsFilter_H
 
-
 // system include files
 #include <memory>
 #include <vector>
@@ -45,23 +44,22 @@
 //
 
 class EcalRecHitsFilter : public edm::EDFilter {
-   public:
-      explicit EcalRecHitsFilter(const edm::ParameterSet &);
-      ~EcalRecHitsFilter() override;
+public:
+  explicit EcalRecHitsFilter(const edm::ParameterSet&);
+  ~EcalRecHitsFilter() override;
 
-   private:
-      void beginJob() override ;
-      bool filter ( edm::Event &, const edm::EventSetup &) override;
-      void endJob() override ;
+private:
+  void beginJob() override;
+  bool filter(edm::Event&, const edm::EventSetup&) override;
+  void endJob() override;
 
-      double EnergyCut;  
-      int NumBadXtalsThreshold_; 
-      edm::InputTag EBRecHitCollection_;
-    
+  double EnergyCut;
+  int NumBadXtalsThreshold_;
+  edm::InputTag EBRecHitCollection_;
 
-      TH1F* nRecHitsGreater1GevPerEvent_hist;
-      TH2F* nRecHitsGreater1GevPerEvent_hist_MAP;
-      TFile* file;
+  TH1F* nRecHitsGreater1GevPerEvent_hist;
+  TH2F* nRecHitsGreater1GevPerEvent_hist_MAP;
+  TFile* file;
 };
 
 #endif
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalTPGAnalyzer.cc b/CaloOnlineTools/EcalTools/plugins/EcalTPGAnalyzer.cc
index 300f27983ed87..680c25371e7b5 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalTPGAnalyzer.cc
+++ b/CaloOnlineTools/EcalTools/plugins/EcalTPGAnalyzer.cc
@@ -7,7 +7,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <utility>
@@ -48,162 +47,147 @@
 using namespace edm;
 class CaloSubdetectorGeometry;
 
-EcalTPGAnalyzer::EcalTPGAnalyzer(const edm::ParameterSet&  iConfig)
-{
-  tpCollection_ = iConfig.getParameter<edm::InputTag>("TPCollection") ;
-  tpEmulatorCollection_ = iConfig.getParameter<edm::InputTag>("TPEmulatorCollection") ;
-  digiCollectionEB_ = iConfig.getParameter<edm::InputTag>("DigiCollectionEB") ;
-  digiCollectionEE_ = iConfig.getParameter<edm::InputTag>("DigiCollectionEE") ;
-  gtRecordCollectionTag_ = iConfig.getParameter<std::string>("GTRecordCollection") ;
+EcalTPGAnalyzer::EcalTPGAnalyzer(const edm::ParameterSet& iConfig) {
+  tpCollection_ = iConfig.getParameter<edm::InputTag>("TPCollection");
+  tpEmulatorCollection_ = iConfig.getParameter<edm::InputTag>("TPEmulatorCollection");
+  digiCollectionEB_ = iConfig.getParameter<edm::InputTag>("DigiCollectionEB");
+  digiCollectionEE_ = iConfig.getParameter<edm::InputTag>("DigiCollectionEE");
+  gtRecordCollectionTag_ = iConfig.getParameter<std::string>("GTRecordCollection");
 
   allowTP_ = iConfig.getParameter<bool>("ReadTriggerPrimitives");
   useEE_ = iConfig.getParameter<bool>("UseEndCap");
   print_ = iConfig.getParameter<bool>("Print");
 
   // file
-  file_ = new TFile("ECALTPGtree.root","RECREATE");
-  file_->cd() ;
+  file_ = new TFile("ECALTPGtree.root", "RECREATE");
+  file_->cd();
 
   // tree
-  tree_ = new TTree( "EcalTPGAnalysis","EcalTPGAnalysis" );
-
-  tree_->Branch("runNb",&treeVariables_.runNb,"runNb/i"); //
-  tree_->Branch("evtNb",&treeVariables_.evtNb,"evtNb/i"); //
-  tree_->Branch("bxNb",&treeVariables_.bxNb,"bxNb/i"); //
-  tree_->Branch("orbitNb",&treeVariables_.orbitNb,"orbitNb/i"); //
-  tree_->Branch("nbOfActiveTriggers",&treeVariables_.nbOfActiveTriggers,"nbOfActiveTriggers/i"); //
-  tree_->Branch("activeTriggers",treeVariables_.activeTriggers,"activeTriggers[nbOfActiveTriggers]/I"); //
-
-  tree_->Branch("nbOfTowers",&treeVariables_.nbOfTowers,"nbOfTowers/i"); //
-  tree_->Branch("ieta", treeVariables_.ieta,"ieta[nbOfTowers]/I");//
-  tree_->Branch("iphi", treeVariables_.iphi,"iphi[nbOfTowers]/I");//
-  tree_->Branch("nbOfXtals", treeVariables_.nbOfXtals,"nbOfXtals[nbOfTowers]/I");//
-  tree_->Branch("rawTPData", treeVariables_.rawTPData,"rawTPData[nbOfTowers]/I");//
-  tree_->Branch("rawTPEmul1", treeVariables_.rawTPEmul1,"rawTPEmul1[nbOfTowers]/I");//
-  tree_->Branch("rawTPEmul2", treeVariables_.rawTPEmul2,"rawTPEmul2[nbOfTowers]/I");//
-  tree_->Branch("rawTPEmul3", treeVariables_.rawTPEmul3,"rawTPEmul3[nbOfTowers]/I");//
-  tree_->Branch("rawTPEmul4", treeVariables_.rawTPEmul4,"rawTPEmul4[nbOfTowers]/I");//
-  tree_->Branch("rawTPEmul5", treeVariables_.rawTPEmul5,"rawTPEmul5[nbOfTowers]/I");//
-  tree_->Branch("eRec", treeVariables_.eRec,"eRec[nbOfTowers]/F");//
+  tree_ = new TTree("EcalTPGAnalysis", "EcalTPGAnalysis");
+
+  tree_->Branch("runNb", &treeVariables_.runNb, "runNb/i");                                                //
+  tree_->Branch("evtNb", &treeVariables_.evtNb, "evtNb/i");                                                //
+  tree_->Branch("bxNb", &treeVariables_.bxNb, "bxNb/i");                                                   //
+  tree_->Branch("orbitNb", &treeVariables_.orbitNb, "orbitNb/i");                                          //
+  tree_->Branch("nbOfActiveTriggers", &treeVariables_.nbOfActiveTriggers, "nbOfActiveTriggers/i");         //
+  tree_->Branch("activeTriggers", treeVariables_.activeTriggers, "activeTriggers[nbOfActiveTriggers]/I");  //
+
+  tree_->Branch("nbOfTowers", &treeVariables_.nbOfTowers, "nbOfTowers/i");             //
+  tree_->Branch("ieta", treeVariables_.ieta, "ieta[nbOfTowers]/I");                    //
+  tree_->Branch("iphi", treeVariables_.iphi, "iphi[nbOfTowers]/I");                    //
+  tree_->Branch("nbOfXtals", treeVariables_.nbOfXtals, "nbOfXtals[nbOfTowers]/I");     //
+  tree_->Branch("rawTPData", treeVariables_.rawTPData, "rawTPData[nbOfTowers]/I");     //
+  tree_->Branch("rawTPEmul1", treeVariables_.rawTPEmul1, "rawTPEmul1[nbOfTowers]/I");  //
+  tree_->Branch("rawTPEmul2", treeVariables_.rawTPEmul2, "rawTPEmul2[nbOfTowers]/I");  //
+  tree_->Branch("rawTPEmul3", treeVariables_.rawTPEmul3, "rawTPEmul3[nbOfTowers]/I");  //
+  tree_->Branch("rawTPEmul4", treeVariables_.rawTPEmul4, "rawTPEmul4[nbOfTowers]/I");  //
+  tree_->Branch("rawTPEmul5", treeVariables_.rawTPEmul5, "rawTPEmul5[nbOfTowers]/I");  //
+  tree_->Branch("eRec", treeVariables_.eRec, "eRec[nbOfTowers]/F");                    //
 }
 
-
-EcalTPGAnalyzer::~EcalTPGAnalyzer()
-{
+EcalTPGAnalyzer::~EcalTPGAnalyzer() {
   file_->cd();
   tree_->Write();
   file_->Close();
 }
 
-void EcalTPGAnalyzer::beginRun(edm::Run const &, edm::EventSetup const & evtSetup)
-{
+void EcalTPGAnalyzer::beginRun(edm::Run const&, edm::EventSetup const& evtSetup) {
   // geometry
   ESHandle<CaloGeometry> theGeometry;
   ESHandle<CaloSubdetectorGeometry> theEndcapGeometry_handle, theBarrelGeometry_handle;
 
-  evtSetup.get<CaloGeometryRecord>().get( theGeometry );
-  evtSetup.get<EcalEndcapGeometryRecord>().get("EcalEndcap",theEndcapGeometry_handle);
-  evtSetup.get<EcalBarrelGeometryRecord>().get("EcalBarrel",theBarrelGeometry_handle);
+  evtSetup.get<CaloGeometryRecord>().get(theGeometry);
+  evtSetup.get<EcalEndcapGeometryRecord>().get("EcalEndcap", theEndcapGeometry_handle);
+  evtSetup.get<EcalBarrelGeometryRecord>().get("EcalBarrel", theBarrelGeometry_handle);
 
   evtSetup.get<IdealGeometryRecord>().get(eTTmap_);
   theEndcapGeometry_ = &(*theEndcapGeometry_handle);
   theBarrelGeometry_ = &(*theBarrelGeometry_handle);
 }
 
-
-void EcalTPGAnalyzer::analyze(edm::Event const & iEvent, edm::EventSetup const & iSetup)
-{
-
-
+void EcalTPGAnalyzer::analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup) {
   using namespace edm;
   using namespace std;
 
-  if (print_) std::cout<<"==========="<<iEvent.id()<<std::endl ;
-
-
-  map<EcalTrigTowerDetId, towerEner> mapTower ;
-  map<EcalTrigTowerDetId, towerEner>::iterator itTT ;
-
+  if (print_)
+    std::cout << "===========" << iEvent.id() << std::endl;
 
+  map<EcalTrigTowerDetId, towerEner> mapTower;
+  map<EcalTrigTowerDetId, towerEner>::iterator itTT;
 
   ///////////////////////////
   // get Evts info
   ///////////////////////////
 
-  treeVariables_.runNb = iEvent.id().run() ;
-  treeVariables_.evtNb = iEvent.id().event() ;
-  treeVariables_.bxNb = iEvent.bunchCrossing() ;
-  treeVariables_.orbitNb = iEvent.orbitNumber() ;
-  
+  treeVariables_.runNb = iEvent.id().run();
+  treeVariables_.evtNb = iEvent.id().event();
+  treeVariables_.bxNb = iEvent.bunchCrossing();
+  treeVariables_.orbitNb = iEvent.orbitNumber();
 
   ///////////////////////////
   // get L1 info
   ///////////////////////////
-  
-  edm::Handle< L1GlobalTriggerReadoutRecord > gtRecord;
-  iEvent.getByLabel( edm::InputTag(gtRecordCollectionTag_), gtRecord);
-  DecisionWord dWord = gtRecord->decisionWord();   // this will get the decision word *before* masking disabled bits
 
-  edm::ESHandle< L1GtTriggerMask > l1GtTmAlgo;
-  iSetup.get< L1GtTriggerMaskAlgoTrigRcd >().get( l1GtTmAlgo );        
+  edm::Handle<L1GlobalTriggerReadoutRecord> gtRecord;
+  iEvent.getByLabel(edm::InputTag(gtRecordCollectionTag_), gtRecord);
+  DecisionWord dWord = gtRecord->decisionWord();  // this will get the decision word *before* masking disabled bits
+
+  edm::ESHandle<L1GtTriggerMask> l1GtTmAlgo;
+  iSetup.get<L1GtTriggerMaskAlgoTrigRcd>().get(l1GtTmAlgo);
   std::vector<unsigned int> triggerMaskAlgoTrig = l1GtTmAlgo.product()->gtTriggerMask();
 
-  // apply masks on algo    
+  // apply masks on algo
   int iDaq = 0;
   int iBit = -1;
-  treeVariables_.nbOfActiveTriggers = 0 ;
-  for (std::vector<bool>::iterator itBit = dWord.begin(); itBit != dWord.end(); ++itBit) {        
+  treeVariables_.nbOfActiveTriggers = 0;
+  for (std::vector<bool>::iterator itBit = dWord.begin(); itBit != dWord.end(); ++itBit) {
     iBit++;
     int maskBit = triggerMaskAlgoTrig[iBit] & (1 << iDaq);
-    if (maskBit) *itBit = false;
+    if (maskBit)
+      *itBit = false;
     if (*itBit) {
-      treeVariables_.activeTriggers[treeVariables_.nbOfActiveTriggers] = iBit ;
-      treeVariables_.nbOfActiveTriggers++ ;      
+      treeVariables_.activeTriggers[treeVariables_.nbOfActiveTriggers] = iBit;
+      treeVariables_.nbOfActiveTriggers++;
     }
   }
 
-
-
-
-
-  /////////////////////////// 
-  // Get TP data  
+  ///////////////////////////
+  // Get TP data
   ///////////////////////////
 
   edm::Handle<EcalTrigPrimDigiCollection> tp;
-  iEvent.getByLabel(tpCollection_,tp);
-  if (print_) std::cout<<"TP collection size="<<tp.product()->size()<<std::endl ;
+  iEvent.getByLabel(tpCollection_, tp);
+  if (print_)
+    std::cout << "TP collection size=" << tp.product()->size() << std::endl;
 
-  for (unsigned int i=0;i<tp.product()->size();i++) {
+  for (unsigned int i = 0; i < tp.product()->size(); i++) {
     EcalTriggerPrimitiveDigi d = (*(tp.product()))[i];
-    const EcalTrigTowerDetId TPtowid= d.id();
-    towerEner tE ;
-    tE.iphi_ = TPtowid.iphi() ;
-    tE.ieta_ = TPtowid.ieta() ;
-    tE.tpgADC_ = d[0].raw() ;
-    mapTower[TPtowid] = tE ;
+    const EcalTrigTowerDetId TPtowid = d.id();
+    towerEner tE;
+    tE.iphi_ = TPtowid.iphi();
+    tE.ieta_ = TPtowid.ieta();
+    tE.tpgADC_ = d[0].raw();
+    mapTower[TPtowid] = tE;
   }
 
-
-
   ///////////////////////////
   // Get Emulators TP
   ///////////////////////////
 
-  edm::Handle<EcalTrigPrimDigiCollection> tpEmul ;
+  edm::Handle<EcalTrigPrimDigiCollection> tpEmul;
   iEvent.getByLabel(tpEmulatorCollection_, tpEmul);
-  if (print_) std::cout<<"TPEmulator collection size="<<tpEmul.product()->size()<<std::endl ;
+  if (print_)
+    std::cout << "TPEmulator collection size=" << tpEmul.product()->size() << std::endl;
 
-  for (unsigned int i=0;i<tpEmul.product()->size();i++) {
+  for (unsigned int i = 0; i < tpEmul.product()->size(); i++) {
     EcalTriggerPrimitiveDigi d = (*(tpEmul.product()))[i];
-    const EcalTrigTowerDetId TPtowid= d.id();
-    itTT = mapTower.find(TPtowid) ;
+    const EcalTrigTowerDetId TPtowid = d.id();
+    itTT = mapTower.find(TPtowid);
     if (itTT != mapTower.end())
-      for (int j=0 ; j<5 ; j++) (itTT->second).tpgEmul_[j] = d[j].raw() ;
+      for (int j = 0; j < 5; j++)
+        (itTT->second).tpgEmul_[j] = d[j].raw();
   }
 
-
-
   ///////////////////////////
   // Get nb of crystals read out
   ///////////////////////////
@@ -212,59 +196,54 @@ void EcalTPGAnalyzer::analyze(edm::Event const & iEvent, edm::EventSetup const &
   edm::Handle<EBDigiCollection> digiEB;
   iEvent.getByLabel(digiCollectionEB_, digiEB);
 
-  for (unsigned int i=0;i<digiEB.product()->size();i++) {
-    const EBDataFrame & df = (*(digiEB.product()))[i];    
-    const EBDetId & id = df.id();
+  for (unsigned int i = 0; i < digiEB.product()->size(); i++) {
+    const EBDataFrame& df = (*(digiEB.product()))[i];
+    const EBDetId& id = df.id();
     const EcalTrigTowerDetId towid = id.tower();
-    itTT = mapTower.find(towid) ;
-    if (itTT != mapTower.end()) (itTT->second).nbXtal_++ ;
+    itTT = mapTower.find(towid);
+    if (itTT != mapTower.end())
+      (itTT->second).nbXtal_++;
   }
 
   if (useEE_) {
     // Get EE xtal digi inputs
     edm::Handle<EEDigiCollection> digiEE;
     iEvent.getByLabel(digiCollectionEE_, digiEE);
-    for (unsigned int i=0;i<digiEE.product()->size();i++) {
-      const EEDataFrame & df = (*(digiEE.product()))[i];
-      const EEDetId & id = df.id();
+    for (unsigned int i = 0; i < digiEE.product()->size(); i++) {
+      const EEDataFrame& df = (*(digiEE.product()))[i];
+      const EEDetId& id = df.id();
       const EcalTrigTowerDetId towid = (*eTTmap_).towerOf(id);
-      itTT = mapTower.find(towid) ;
-      if (itTT != mapTower.end()) (itTT->second).nbXtal_++ ;
+      itTT = mapTower.find(towid);
+      if (itTT != mapTower.end())
+        (itTT->second).nbXtal_++;
     }
   }
 
-  ///////////////////////////  
+  ///////////////////////////
   // Get rechits
   ///////////////////////////
 
   //... to be completed
 
-
-
-
-
-  ///////////////////////////  
+  ///////////////////////////
   // fill tree
-  ///////////////////////////  
-
-  treeVariables_.nbOfTowers = mapTower.size() ;
-  int towerNb = 0 ;
-  for (itTT = mapTower.begin() ; itTT != mapTower.end() ; ++itTT) {
-    treeVariables_.ieta[towerNb] = (itTT->second).ieta_ ;
-    treeVariables_.iphi[towerNb] = (itTT->second).iphi_ ;
-    treeVariables_.nbOfXtals[towerNb] = (itTT->second).nbXtal_ ;
-    treeVariables_.rawTPData[towerNb] = (itTT->second).tpgADC_ ;
-    treeVariables_.rawTPEmul1[towerNb] = (itTT->second).tpgEmul_[0] ;
-    treeVariables_.rawTPEmul2[towerNb] = (itTT->second).tpgEmul_[1] ;
-    treeVariables_.rawTPEmul3[towerNb] = (itTT->second).tpgEmul_[2] ;
-    treeVariables_.rawTPEmul4[towerNb] = (itTT->second).tpgEmul_[3] ;
-    treeVariables_.rawTPEmul5[towerNb] = (itTT->second).tpgEmul_[4] ;
-    treeVariables_.eRec[towerNb] = (itTT->second).eRec_ ;
-    towerNb++ ;
-  }
+  ///////////////////////////
 
-  tree_->Fill() ;
+  treeVariables_.nbOfTowers = mapTower.size();
+  int towerNb = 0;
+  for (itTT = mapTower.begin(); itTT != mapTower.end(); ++itTT) {
+    treeVariables_.ieta[towerNb] = (itTT->second).ieta_;
+    treeVariables_.iphi[towerNb] = (itTT->second).iphi_;
+    treeVariables_.nbOfXtals[towerNb] = (itTT->second).nbXtal_;
+    treeVariables_.rawTPData[towerNb] = (itTT->second).tpgADC_;
+    treeVariables_.rawTPEmul1[towerNb] = (itTT->second).tpgEmul_[0];
+    treeVariables_.rawTPEmul2[towerNb] = (itTT->second).tpgEmul_[1];
+    treeVariables_.rawTPEmul3[towerNb] = (itTT->second).tpgEmul_[2];
+    treeVariables_.rawTPEmul4[towerNb] = (itTT->second).tpgEmul_[3];
+    treeVariables_.rawTPEmul5[towerNb] = (itTT->second).tpgEmul_[4];
+    treeVariables_.eRec[towerNb] = (itTT->second).eRec_;
+    towerNb++;
+  }
 
+  tree_->Fill();
 }
-
-
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalTPGAnalyzer.h b/CaloOnlineTools/EcalTools/plugins/EcalTPGAnalyzer.h
index cad99ae245d25..1944085121448 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalTPGAnalyzer.h
+++ b/CaloOnlineTools/EcalTools/plugins/EcalTPGAnalyzer.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // Class:      EcalTPGAnalyzer
-// 
+//
 //
 // Original Author:  Pascal Paganini
 //
@@ -17,76 +17,68 @@
 #include <TFile.h>
 #include <TTree.h>
 
-class CaloSubdetectorGeometry ;
-
+class CaloSubdetectorGeometry;
 
 // Auxiliary class
-class towerEner {   
- public:
-  float eRec_ ;
-  int tpgEmul_[5] ;
-  int tpgADC_; 
-  int iphi_, ieta_, nbXtal_ ;
-  towerEner()
-    : eRec_(0), tpgADC_(0),  
-      iphi_(-999), ieta_(-999), nbXtal_(0)
-  { 
-    for (int i=0 ; i<5 ; i ++) tpgEmul_[i] = 0 ; 
+class towerEner {
+public:
+  float eRec_;
+  int tpgEmul_[5];
+  int tpgADC_;
+  int iphi_, ieta_, nbXtal_;
+  towerEner() : eRec_(0), tpgADC_(0), iphi_(-999), ieta_(-999), nbXtal_(0) {
+    for (int i = 0; i < 5; i++)
+      tpgEmul_[i] = 0;
   }
 };
 
-
 class EcalTPGAnalyzer : public edm::EDAnalyzer {
 public:
-  explicit EcalTPGAnalyzer(const edm::ParameterSet&);
-  ~EcalTPGAnalyzer() override;  
+  explicit EcalTPGAnalyzer(const edm::ParameterSet &);
+  ~EcalTPGAnalyzer() override;
   void analyze(edm::Event const &, edm::EventSetup const &) override;
-  void beginRun(edm::Run const &, edm::EventSetup const &) override ;
-  
+  void beginRun(edm::Run const &, edm::EventSetup const &) override;
+
 private:
-  struct EcalTPGVariables
-  {
+  struct EcalTPGVariables {
     // event variables
-    unsigned int runNb ;
-    unsigned int evtNb ;
-    unsigned int bxNb ;
-    unsigned int orbitNb ;
-    unsigned int nbOfActiveTriggers ;
-    int activeTriggers[128] ;
+    unsigned int runNb;
+    unsigned int evtNb;
+    unsigned int bxNb;
+    unsigned int orbitNb;
+    unsigned int nbOfActiveTriggers;
+    int activeTriggers[128];
 
     // tower variables
-    unsigned int nbOfTowers ; //max 4032 EB+EE
-    int ieta[4032] ;
-    int iphi[4032] ;
-    int nbOfXtals[4032] ;
-    int rawTPData[4032] ;
-    int rawTPEmul1[4032] ;
-    int rawTPEmul2[4032] ;
-    int rawTPEmul3[4032] ;
-    int rawTPEmul4[4032] ;
-    int rawTPEmul5[4032] ;
-    float eRec[4032] ;
-  } ;
+    unsigned int nbOfTowers;  //max 4032 EB+EE
+    int ieta[4032];
+    int iphi[4032];
+    int nbOfXtals[4032];
+    int rawTPData[4032];
+    int rawTPEmul1[4032];
+    int rawTPEmul2[4032];
+    int rawTPEmul3[4032];
+    int rawTPEmul4[4032];
+    int rawTPEmul5[4032];
+    float eRec[4032];
+  };
 
 private:
-  TFile * file_;
-  TTree * tree_ ;
-  EcalTPGVariables treeVariables_ ;
+  TFile *file_;
+  TTree *tree_;
+  EcalTPGVariables treeVariables_;
 
-  edm::InputTag tpCollection_ ;
-  edm::InputTag tpEmulatorCollection_ ;
-  edm::InputTag digiCollectionEB_ ;
-  edm::InputTag digiCollectionEE_ ;
-  std::string gtRecordCollectionTag_ ;
+  edm::InputTag tpCollection_;
+  edm::InputTag tpEmulatorCollection_;
+  edm::InputTag digiCollectionEB_;
+  edm::InputTag digiCollectionEE_;
+  std::string gtRecordCollectionTag_;
 
-  bool allowTP_ ;
-  bool useEE_ ;
-  bool print_ ;
+  bool allowTP_;
+  bool useEE_;
+  bool print_;
 
-  const CaloSubdetectorGeometry * theEndcapGeometry_ ;
-  const CaloSubdetectorGeometry * theBarrelGeometry_ ;
+  const CaloSubdetectorGeometry *theEndcapGeometry_;
+  const CaloSubdetectorGeometry *theBarrelGeometry_;
   edm::ESHandle<EcalTrigTowerConstituentsMap> eTTmap_;
-
-
 };
-
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalURecHitHists.cc b/CaloOnlineTools/EcalTools/plugins/EcalURecHitHists.cc
index 82e734346ccf9..77c847ec7eb72 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalURecHitHists.cc
+++ b/CaloOnlineTools/EcalTools/plugins/EcalURecHitHists.cc
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 //
-// Package:   EcalURecHitHists 
-// Class:     EcalURecHitHists 
-// 
+// Package:   EcalURecHitHists
+// Class:     EcalURecHitHists
+//
 /**\class EcalURecHitHists EcalURecHitHists.cc
 
  Description: <one line class summary>
@@ -33,62 +33,52 @@ using namespace std;
 //
 // constructors and destructor
 //
-EcalURecHitHists::EcalURecHitHists(const edm::ParameterSet& iConfig) :
-  EBUncalibratedRecHitCollection_ (iConfig.getParameter<edm::InputTag>("EBUncalibratedRecHitCollection")),
-  EEUncalibratedRecHitCollection_ (iConfig.getParameter<edm::InputTag>("EEUncalibratedRecHitCollection")),
-  runNum_(-1),
-  histRangeMax_ (iConfig.getUntrackedParameter<double>("histogramMaxRange",200.0)),
-  histRangeMin_ (iConfig.getUntrackedParameter<double>("histogramMinRange",-10.0)),
-  fileName_ (iConfig.getUntrackedParameter<std::string>("fileName", std::string("ecalURechHitHists")))
-{
+EcalURecHitHists::EcalURecHitHists(const edm::ParameterSet& iConfig)
+    : EBUncalibratedRecHitCollection_(iConfig.getParameter<edm::InputTag>("EBUncalibratedRecHitCollection")),
+      EEUncalibratedRecHitCollection_(iConfig.getParameter<edm::InputTag>("EEUncalibratedRecHitCollection")),
+      runNum_(-1),
+      histRangeMax_(iConfig.getUntrackedParameter<double>("histogramMaxRange", 200.0)),
+      histRangeMin_(iConfig.getUntrackedParameter<double>("histogramMinRange", -10.0)),
+      fileName_(iConfig.getUntrackedParameter<std::string>("fileName", std::string("ecalURechHitHists"))) {
   vector<int> listDefaults;
   listDefaults.push_back(-1);
-  
+
   maskedChannels_ = iConfig.getUntrackedParameter<vector<int> >("maskedChannels", listDefaults);
   maskedFEDs_ = iConfig.getUntrackedParameter<vector<int> >("maskedFEDs", listDefaults);
 
   vector<string> defaultMaskedEBs;
   defaultMaskedEBs.push_back("none");
-  maskedEBs_ =  iConfig.getUntrackedParameter<vector<string> >("maskedEBs",defaultMaskedEBs);
-  
+  maskedEBs_ = iConfig.getUntrackedParameter<vector<string> >("maskedEBs", defaultMaskedEBs);
+
   fedMap_ = new EcalFedMap();
   string title1 = "Uncalib Rec Hits (ADC counts)";
   string name1 = "URecHitsAllFEDs";
-  int numBins = (int)round(histRangeMax_-histRangeMin_)+1;
-  allFedsHist_ = new TH1F(name1.c_str(),title1.c_str(),numBins,histRangeMin_,histRangeMax_);
+  int numBins = (int)round(histRangeMax_ - histRangeMin_) + 1;
+  allFedsHist_ = new TH1F(name1.c_str(), title1.c_str(), numBins, histRangeMin_, histRangeMax_);
   title1 = "Jitter for all FEDs";
   name1 = "JitterAllFEDs";
-  allFedsTimingHist_ = new TH1F(name1.c_str(),title1.c_str(),14,-7,7);
+  allFedsTimingHist_ = new TH1F(name1.c_str(), title1.c_str(), 14, -7, 7);
 
   // load up the maskedFED list with the proper FEDids
-  if(maskedFEDs_[0]==-1)
-  {
+  if (maskedFEDs_[0] == -1) {
     //if "actual" EB id given, then convert to FEDid and put in listFEDs_
-    if(maskedEBs_[0] != "none")
-    {
+    if (maskedEBs_[0] != "none") {
       maskedFEDs_.clear();
-      for(vector<string>::const_iterator ebItr = maskedEBs_.begin(); ebItr != maskedEBs_.end(); ++ebItr)
-      {
+      for (vector<string>::const_iterator ebItr = maskedEBs_.begin(); ebItr != maskedEBs_.end(); ++ebItr) {
         maskedFEDs_.push_back(fedMap_->getFedFromSlice(*ebItr));
       }
     }
   }
 }
 
-
-EcalURecHitHists::~EcalURecHitHists()
-{
-}
-
+EcalURecHitHists::~EcalURecHitHists() {}
 
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-EcalURecHitHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSetup)
-{
+void EcalURecHitHists::analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup) {
   int ievt = iEvent.id().event();
   Handle<EcalUncalibratedRecHitCollection> EBhits;
   Handle<EcalUncalibratedRecHitCollection> EEhits;
@@ -99,158 +89,139 @@ EcalURecHitHists::analyze(edm::Event const & iEvent, edm::EventSetup const & iSe
   iEvent.getByLabel(EEUncalibratedRecHitCollection_, EEhits);
   LogDebug("EcalURecHitHists") << "event " << ievt << " hits collection size " << EEhits->size();
 
-  for (EcalUncalibratedRecHitCollection::const_iterator hitItr = EBhits->begin(); hitItr != EBhits->end(); ++hitItr)
-  {
+  for (EcalUncalibratedRecHitCollection::const_iterator hitItr = EBhits->begin(); hitItr != EBhits->end(); ++hitItr) {
     EcalUncalibratedRecHit hit = (*hitItr);
     EBDetId ebDet = hit.id();
     int ic = ebDet.ic();
     int hashedIndex = ebDet.hashedIndex();
     EcalElectronicsId elecId = ecalElectronicsMap_->getElectronicsId(ebDet);
-    int FEDid = 600+elecId.dccId();
+    int FEDid = 600 + elecId.dccId();
     float ampli = hit.amplitude();
 
     vector<int>::iterator result;
     result = find(maskedFEDs_.begin(), maskedFEDs_.end(), FEDid);
-    if(result != maskedFEDs_.end())
-    {
+    if (result != maskedFEDs_.end()) {
       LogWarning("EcalURecHitHists") << "skipping uncalRecHit for FED " << FEDid << " ; amplitude " << ampli;
       continue;
-    }      
+    }
 
     result = find(maskedChannels_.begin(), maskedChannels_.end(), hashedIndex);
-    if  (result != maskedChannels_.end())
-    {
-      LogWarning("EcalURecHitHists") << "skipping uncalRecHit for channel: " << ic << " with amplitude " << ampli ;
+    if (result != maskedChannels_.end()) {
+      LogWarning("EcalURecHitHists") << "skipping uncalRecHit for channel: " << ic << " with amplitude " << ampli;
       continue;
-    }      
+    }
 
     // fill the proper hist
     TH1F* uRecHist = FEDsAndHists_[FEDid];
     TH1F* timingHist = FEDsAndTimingHists_[FEDid];
-    if(uRecHist==nullptr)
-    {
+    if (uRecHist == nullptr) {
       initHists(FEDid);
       uRecHist = FEDsAndHists_[FEDid];
       timingHist = FEDsAndTimingHists_[FEDid];
     }
-    
+
     uRecHist->Fill(ampli);
     allFedsHist_->Fill(ampli);
     timingHist->Fill(hit.jitter());
     allFedsTimingHist_->Fill(hit.jitter());
   }
-  
+
   // Again for the endcap
-  for (EcalUncalibratedRecHitCollection::const_iterator hitItr = EEhits->begin(); hitItr != EEhits->end(); ++hitItr)
-  {
+  for (EcalUncalibratedRecHitCollection::const_iterator hitItr = EEhits->begin(); hitItr != EEhits->end(); ++hitItr) {
     EcalUncalibratedRecHit hit = (*hitItr);
     EEDetId eeDet = hit.id();
     int ic = eeDet.ic();
     int hashedIndex = eeDet.hashedIndex();
     EcalElectronicsId elecId = ecalElectronicsMap_->getElectronicsId(eeDet);
-    int FEDid = 600+elecId.dccId();
+    int FEDid = 600 + elecId.dccId();
     float ampli = hit.amplitude();
 
     vector<int>::iterator result;
     result = find(maskedFEDs_.begin(), maskedFEDs_.end(), FEDid);
-    if(result != maskedFEDs_.end())
-    {
+    if (result != maskedFEDs_.end()) {
       LogWarning("EcalURecHitHists") << "skipping uncalRecHit for FED " << FEDid << " ; amplitude " << ampli;
       continue;
-    }      
+    }
 
     result = find(maskedChannels_.begin(), maskedChannels_.end(), hashedIndex);
-    if  (result != maskedChannels_.end())
-    {
-      LogWarning("EcalURecHitHists") << "skipping uncalRecHit for channel: " << ic << " with amplitude " << ampli ;
+    if (result != maskedChannels_.end()) {
+      LogWarning("EcalURecHitHists") << "skipping uncalRecHit for channel: " << ic << " with amplitude " << ampli;
       continue;
-    }      
+    }
 
     // fill the proper hist
     TH1F* uRecHist = FEDsAndHists_[FEDid];
     TH1F* timingHist = FEDsAndTimingHists_[FEDid];
-    if(uRecHist==nullptr)
-    {
+    if (uRecHist == nullptr) {
       initHists(FEDid);
       uRecHist = FEDsAndHists_[FEDid];
       timingHist = FEDsAndTimingHists_[FEDid];
     }
-    
+
     uRecHist->Fill(ampli);
     allFedsHist_->Fill(ampli);
     timingHist->Fill(hit.jitter());
     allFedsTimingHist_->Fill(hit.jitter());
   }
 
-  if(runNum_==-1)
-  {
+  if (runNum_ == -1) {
     runNum_ = iEvent.id().run();
   }
 }
 
-
 // insert the hist map into the map keyed by FED number
-void EcalURecHitHists::initHists(int FED)
-{
+void EcalURecHitHists::initHists(int FED) {
   using namespace std;
-  
+
   string FEDid = intToString(FED);
   string title1 = "Uncalib Rec Hits (ADC counts) for ";
   title1.append(fedMap_->getSliceFromFed(FED));
   string name1 = "URecHitsFED";
   name1.append(intToString(FED));
-  int numBins = (int)round(histRangeMax_-histRangeMin_)+1;
-  TH1F* hist = new TH1F(name1.c_str(),title1.c_str(), numBins, histRangeMin_, histRangeMax_);
+  int numBins = (int)round(histRangeMax_ - histRangeMin_) + 1;
+  TH1F* hist = new TH1F(name1.c_str(), title1.c_str(), numBins, histRangeMin_, histRangeMax_);
   FEDsAndHists_[FED] = hist;
   FEDsAndHists_[FED]->SetDirectory(nullptr);
-  
+
   title1 = "Jitter for ";
   title1.append(fedMap_->getSliceFromFed(FED));
   name1 = "JitterFED";
   name1.append(intToString(FED));
-  TH1F* timingHist = new TH1F(name1.c_str(),title1.c_str(),14,-7,7);
+  TH1F* timingHist = new TH1F(name1.c_str(), title1.c_str(), 14, -7, 7);
   FEDsAndTimingHists_[FED] = timingHist;
   FEDsAndTimingHists_[FED]->SetDirectory(nullptr);
 }
 
 // ------------ method called once each job just before starting event loop  ------------
-void 
-EcalURecHitHists::beginRun(edm::Run const &, edm::EventSetup const & c)
-{
+void EcalURecHitHists::beginRun(edm::Run const&, edm::EventSetup const& c) {
   edm::ESHandle<EcalElectronicsMapping> elecHandle;
   c.get<EcalMappingRcd>().get(elecHandle);
   ecalElectronicsMap_ = elecHandle.product();
 }
 
 // ------------ method called once each job just after ending the event loop  ------------
-void 
-EcalURecHitHists::endJob()
-{
+void EcalURecHitHists::endJob() {
   using namespace std;
-  fileName_ += "-"+intToString(runNum_)+".graph.root";
+  fileName_ += "-" + intToString(runNum_) + ".graph.root";
 
-  TFile root_file_(fileName_.c_str() , "RECREATE");
+  TFile root_file_(fileName_.c_str(), "RECREATE");
 
-  for(map<int,TH1F*>::const_iterator itr = FEDsAndHists_.begin();
-      itr != FEDsAndHists_.end(); ++itr)
-  {
+  for (map<int, TH1F*>::const_iterator itr = FEDsAndHists_.begin(); itr != FEDsAndHists_.end(); ++itr) {
     string dir = fedMap_->getSliceFromFed(itr->first);
     TDirectory* FEDdir = gDirectory->mkdir(dir.c_str());
     FEDdir->cd();
 
     TH1F* hist = itr->second;
-    if(hist!=nullptr)
+    if (hist != nullptr)
       hist->Write();
-    else
-    {
+    else {
       cerr << "EcalPedHists: Error: This shouldn't happen!" << endl;
     }
     // Write out timing hist
     hist = FEDsAndTimingHists_[itr->first];
-    if(hist!=nullptr)
+    if (hist != nullptr)
       hist->Write();
-    else
-    {
+    else {
       cerr << "EcalPedHists: Error: This shouldn't happen!" << endl;
     }
     root_file_.cd();
@@ -260,22 +231,17 @@ EcalURecHitHists::endJob()
   root_file_.Close();
 
   std::string channels;
-  for(std::vector<int>::const_iterator itr = maskedChannels_.begin();
-      itr != maskedChannels_.end(); ++itr)
-  {
-    channels+=intToString(*itr);
-    channels+=",";
+  for (std::vector<int>::const_iterator itr = maskedChannels_.begin(); itr != maskedChannels_.end(); ++itr) {
+    channels += intToString(*itr);
+    channels += ",";
   }
-  
+
   LogWarning("EcalMipGraphs") << "Masked channels are: " << channels << " and that is all!";
 }
 
-
-std::string EcalURecHitHists::intToString(int num)
-{
-    using namespace std;
-    ostringstream myStream;
-    myStream << num << flush;
-    return(myStream.str()); //returns the string form of the stringstream object
+std::string EcalURecHitHists::intToString(int num) {
+  using namespace std;
+  ostringstream myStream;
+  myStream << num << flush;
+  return (myStream.str());  //returns the string form of the stringstream object
 }
-
diff --git a/CaloOnlineTools/EcalTools/plugins/EcalURecHitHists.h b/CaloOnlineTools/EcalTools/plugins/EcalURecHitHists.h
index af23a23d87791..48707e4c99df9 100644
--- a/CaloOnlineTools/EcalTools/plugins/EcalURecHitHists.h
+++ b/CaloOnlineTools/EcalTools/plugins/EcalURecHitHists.h
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 //
-// Package:   EcalURecHitHists 
-// Class:     EcalURecHitHists 
-// 
+// Package:   EcalURecHitHists
+// Class:     EcalURecHitHists
+//
 /**\class EcalURecHitHists EcalURecHitHists.cc
 
  Description: <one line class summary>
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <vector>
@@ -53,19 +52,18 @@
 //
 
 class EcalURecHitHists : public edm::EDAnalyzer {
-   public:
-      explicit EcalURecHitHists(const edm::ParameterSet&);
-      ~EcalURecHitHists() override;
-
+public:
+  explicit EcalURecHitHists(const edm::ParameterSet&);
+  ~EcalURecHitHists() override;
 
-   private:
-      void beginRun(edm::Run const &, edm::EventSetup const &) override ;
-      void analyze(edm::Event const &, edm::EventSetup const &) override;
-      void endJob() override ;
-      std::string intToString(int num);
-      void initHists(int);
+private:
+  void beginRun(edm::Run const&, edm::EventSetup const&) override;
+  void analyze(edm::Event const&, edm::EventSetup const&) override;
+  void endJob() override;
+  std::string intToString(int num);
+  void initHists(int);
 
-    // ----------member data ---------------------------
+  // ----------member data ---------------------------
 
   edm::InputTag EBUncalibratedRecHitCollection_;
   edm::InputTag EEUncalibratedRecHitCollection_;
@@ -76,8 +74,8 @@ class EcalURecHitHists : public edm::EDAnalyzer {
   std::vector<int> maskedChannels_;
   std::vector<int> maskedFEDs_;
   std::vector<std::string> maskedEBs_;
-  std::map<int,TH1F*> FEDsAndHists_;
-  std::map<int,TH1F*> FEDsAndTimingHists_;
+  std::map<int, TH1F*> FEDsAndHists_;
+  std::map<int, TH1F*> FEDsAndTimingHists_;
 
   TH1F* allFedsHist_;
   TH1F* allFedsTimingHist_;
diff --git a/CaloOnlineTools/EcalTools/plugins/plugins.cc b/CaloOnlineTools/EcalTools/plugins/plugins.cc
index bbf85970331e0..ff875f99bb249 100644
--- a/CaloOnlineTools/EcalTools/plugins/plugins.cc
+++ b/CaloOnlineTools/EcalTools/plugins/plugins.cc
@@ -15,7 +15,6 @@
 #include "CaloOnlineTools/EcalTools/plugins/EcalDisplaysByEvent.h"
 #include "CaloOnlineTools/EcalTools/plugins/EcalFEDErrorFilter.h"
 
-
 DEFINE_FWK_MODULE(EcalDigiDisplay);
 DEFINE_FWK_MODULE(EcalPnGraphs);
 DEFINE_FWK_MODULE(EcalDCCHeaderDisplay);
diff --git a/CaloOnlineTools/EcalTools/src/EcalFedMap.cc b/CaloOnlineTools/EcalTools/src/EcalFedMap.cc
index fc0d4b639b625..9165074dcd0d3 100644
--- a/CaloOnlineTools/EcalTools/src/EcalFedMap.cc
+++ b/CaloOnlineTools/EcalTools/src/EcalFedMap.cc
@@ -1,83 +1,78 @@
 #include "CaloOnlineTools/EcalTools/interface/EcalFedMap.h"
 #include <iostream>
-#include <cctype> // for toupper
+#include <cctype>  // for toupper
 #include <algorithm>
 
-EcalFedMap::~EcalFedMap(){}
-
-EcalFedMap::EcalFedMap(){
+EcalFedMap::~EcalFedMap() {}
 
+EcalFedMap::EcalFedMap() {
   // EE-
-  fedToSliceMap_.insert( std::make_pair(601, "EE-07") );
-  fedToSliceMap_.insert( std::make_pair(602, "EE-08") );
-  fedToSliceMap_.insert( std::make_pair(603, "EE-09") );
-  fedToSliceMap_.insert( std::make_pair(604, "EE-01") );
-  fedToSliceMap_.insert( std::make_pair(605, "EE-02") );
-  fedToSliceMap_.insert( std::make_pair(606, "EE-03") );
-  fedToSliceMap_.insert( std::make_pair(607, "EE-04") );
-  fedToSliceMap_.insert( std::make_pair(608, "EE-05") );
-  fedToSliceMap_.insert( std::make_pair(609, "EE-06") );
+  fedToSliceMap_.insert(std::make_pair(601, "EE-07"));
+  fedToSliceMap_.insert(std::make_pair(602, "EE-08"));
+  fedToSliceMap_.insert(std::make_pair(603, "EE-09"));
+  fedToSliceMap_.insert(std::make_pair(604, "EE-01"));
+  fedToSliceMap_.insert(std::make_pair(605, "EE-02"));
+  fedToSliceMap_.insert(std::make_pair(606, "EE-03"));
+  fedToSliceMap_.insert(std::make_pair(607, "EE-04"));
+  fedToSliceMap_.insert(std::make_pair(608, "EE-05"));
+  fedToSliceMap_.insert(std::make_pair(609, "EE-06"));
 
   // EB-
-  fedToSliceMap_.insert( std::make_pair(610, "EB-01") );
-  fedToSliceMap_.insert( std::make_pair(611, "EB-02") );
-  fedToSliceMap_.insert( std::make_pair(612, "EB-03") );
-  fedToSliceMap_.insert( std::make_pair(613, "EB-04") );
-  fedToSliceMap_.insert( std::make_pair(614, "EB-05") );
-  fedToSliceMap_.insert( std::make_pair(615, "EB-06") );
-  fedToSliceMap_.insert( std::make_pair(616, "EB-07") );
-  fedToSliceMap_.insert( std::make_pair(617, "EB-08") );
-  fedToSliceMap_.insert( std::make_pair(618, "EB-09") );
-  fedToSliceMap_.insert( std::make_pair(619, "EB-10") );
-  fedToSliceMap_.insert( std::make_pair(620, "EB-11") );
-  fedToSliceMap_.insert( std::make_pair(621, "EB-12") );
-  fedToSliceMap_.insert( std::make_pair(622, "EB-13") );
-  fedToSliceMap_.insert( std::make_pair(623, "EB-14") );
-  fedToSliceMap_.insert( std::make_pair(624, "EB-15") );
-  fedToSliceMap_.insert( std::make_pair(625, "EB-16") );
-  fedToSliceMap_.insert( std::make_pair(626, "EB-17") );
-  fedToSliceMap_.insert( std::make_pair(627, "EB-18") );
+  fedToSliceMap_.insert(std::make_pair(610, "EB-01"));
+  fedToSliceMap_.insert(std::make_pair(611, "EB-02"));
+  fedToSliceMap_.insert(std::make_pair(612, "EB-03"));
+  fedToSliceMap_.insert(std::make_pair(613, "EB-04"));
+  fedToSliceMap_.insert(std::make_pair(614, "EB-05"));
+  fedToSliceMap_.insert(std::make_pair(615, "EB-06"));
+  fedToSliceMap_.insert(std::make_pair(616, "EB-07"));
+  fedToSliceMap_.insert(std::make_pair(617, "EB-08"));
+  fedToSliceMap_.insert(std::make_pair(618, "EB-09"));
+  fedToSliceMap_.insert(std::make_pair(619, "EB-10"));
+  fedToSliceMap_.insert(std::make_pair(620, "EB-11"));
+  fedToSliceMap_.insert(std::make_pair(621, "EB-12"));
+  fedToSliceMap_.insert(std::make_pair(622, "EB-13"));
+  fedToSliceMap_.insert(std::make_pair(623, "EB-14"));
+  fedToSliceMap_.insert(std::make_pair(624, "EB-15"));
+  fedToSliceMap_.insert(std::make_pair(625, "EB-16"));
+  fedToSliceMap_.insert(std::make_pair(626, "EB-17"));
+  fedToSliceMap_.insert(std::make_pair(627, "EB-18"));
 
   // EB+
-  fedToSliceMap_.insert( std::make_pair(628, "EB+01") );
-  fedToSliceMap_.insert( std::make_pair(629, "EB+02") );
-  fedToSliceMap_.insert( std::make_pair(630, "EB+03") );
-  fedToSliceMap_.insert( std::make_pair(631, "EB+04") );
-  fedToSliceMap_.insert( std::make_pair(632, "EB+05") );
-  fedToSliceMap_.insert( std::make_pair(633, "EB+06") );
-  fedToSliceMap_.insert( std::make_pair(634, "EB+07") );
-  fedToSliceMap_.insert( std::make_pair(635, "EB+08") );
-  fedToSliceMap_.insert( std::make_pair(636, "EB+09") );
-  fedToSliceMap_.insert( std::make_pair(637, "EB+10") );
-  fedToSliceMap_.insert( std::make_pair(638, "EB+11") );
-  fedToSliceMap_.insert( std::make_pair(639, "EB+12") );
-  fedToSliceMap_.insert( std::make_pair(640, "EB+13") );
-  fedToSliceMap_.insert( std::make_pair(641, "EB+14") );
-  fedToSliceMap_.insert( std::make_pair(642, "EB+15") );
-  fedToSliceMap_.insert( std::make_pair(643, "EB+16") );
-  fedToSliceMap_.insert( std::make_pair(644, "EB+17") );
-  fedToSliceMap_.insert( std::make_pair(645, "EB+18") );
+  fedToSliceMap_.insert(std::make_pair(628, "EB+01"));
+  fedToSliceMap_.insert(std::make_pair(629, "EB+02"));
+  fedToSliceMap_.insert(std::make_pair(630, "EB+03"));
+  fedToSliceMap_.insert(std::make_pair(631, "EB+04"));
+  fedToSliceMap_.insert(std::make_pair(632, "EB+05"));
+  fedToSliceMap_.insert(std::make_pair(633, "EB+06"));
+  fedToSliceMap_.insert(std::make_pair(634, "EB+07"));
+  fedToSliceMap_.insert(std::make_pair(635, "EB+08"));
+  fedToSliceMap_.insert(std::make_pair(636, "EB+09"));
+  fedToSliceMap_.insert(std::make_pair(637, "EB+10"));
+  fedToSliceMap_.insert(std::make_pair(638, "EB+11"));
+  fedToSliceMap_.insert(std::make_pair(639, "EB+12"));
+  fedToSliceMap_.insert(std::make_pair(640, "EB+13"));
+  fedToSliceMap_.insert(std::make_pair(641, "EB+14"));
+  fedToSliceMap_.insert(std::make_pair(642, "EB+15"));
+  fedToSliceMap_.insert(std::make_pair(643, "EB+16"));
+  fedToSliceMap_.insert(std::make_pair(644, "EB+17"));
+  fedToSliceMap_.insert(std::make_pair(645, "EB+18"));
 
   // EE+
-  fedToSliceMap_.insert( std::make_pair(646, "EE+07") );
-  fedToSliceMap_.insert( std::make_pair(647, "EE+08") );
-  fedToSliceMap_.insert( std::make_pair(648, "EE+09") );
-  fedToSliceMap_.insert( std::make_pair(649, "EE+01") );
-  fedToSliceMap_.insert( std::make_pair(650, "EE+02") );
-  fedToSliceMap_.insert( std::make_pair(651, "EE+03") );
-  fedToSliceMap_.insert( std::make_pair(652, "EE+04") );
-  fedToSliceMap_.insert( std::make_pair(653, "EE+05") );
-  fedToSliceMap_.insert( std::make_pair(654, "EE+06") );
-
+  fedToSliceMap_.insert(std::make_pair(646, "EE+07"));
+  fedToSliceMap_.insert(std::make_pair(647, "EE+08"));
+  fedToSliceMap_.insert(std::make_pair(648, "EE+09"));
+  fedToSliceMap_.insert(std::make_pair(649, "EE+01"));
+  fedToSliceMap_.insert(std::make_pair(650, "EE+02"));
+  fedToSliceMap_.insert(std::make_pair(651, "EE+03"));
+  fedToSliceMap_.insert(std::make_pair(652, "EE+04"));
+  fedToSliceMap_.insert(std::make_pair(653, "EE+05"));
+  fedToSliceMap_.insert(std::make_pair(654, "EE+06"));
 
   std::map<int, std::string>::iterator it;
-  for (it = fedToSliceMap_.begin();
-       it != fedToSliceMap_.end();
-       it++)
-    {
-      //  std::cout<<  "fed: "<< (*it).first << " slice: " << (*it).second << std::endl;
-      sliceToFedMap_.insert( std::make_pair( (*it).second, (*it).first) );
-    }
+  for (it = fedToSliceMap_.begin(); it != fedToSliceMap_.end(); it++) {
+    //  std::cout<<  "fed: "<< (*it).first << " slice: " << (*it).second << std::endl;
+    sliceToFedMap_.insert(std::make_pair((*it).second, (*it).first));
+  }
 
   //  std::map<std::string, int>::iterator ti;
   //  for (ti = sliceToFedMap_.begin();
@@ -86,30 +81,25 @@ EcalFedMap::EcalFedMap(){
   //    {
   //      //      std::cout<<  "slice: "<< (*ti).first << " fed: " << (*ti).second << std::endl;
   //    }
-
 }
 
-
-std::string EcalFedMap::getSliceFromFed(int fedNumber)
-{
+std::string EcalFedMap::getSliceFromFed(int fedNumber) {
   //std::cout << "received: " << fedNumber << std::endl;
-  std::map< int, std::string >::iterator found  = fedToSliceMap_.find(fedNumber);
-  
-  if ( found != fedToSliceMap_.end() ) 
-    return (* found).second;
+  std::map<int, std::string>::iterator found = fedToSliceMap_.find(fedNumber);
+
+  if (found != fedToSliceMap_.end())
+    return (*found).second;
   else
     return std::string("invalid Fed");
 }
 
-int EcalFedMap::getFedFromSlice(std::string slice)
-{
-
+int EcalFedMap::getFedFromSlice(std::string slice) {
   transform(slice.begin(), slice.end(), slice.begin(), toupper);
 
-  std::map< std::string , int>::iterator found  = sliceToFedMap_.find(slice);
-  
-  if ( found != sliceToFedMap_.end() ) 
-    return (* found).second;
+  std::map<std::string, int>::iterator found = sliceToFedMap_.find(slice);
+
+  if (found != sliceToFedMap_.end())
+    return (*found).second;
   else
     return -999;
 }
diff --git a/CaloOnlineTools/HcalOnlineDb/test/template.py b/CaloOnlineTools/HcalOnlineDb/test/template.py
index 387b2ac4a0e87..252cbf1054511 100644
--- a/CaloOnlineTools/HcalOnlineDb/test/template.py
+++ b/CaloOnlineTools/HcalOnlineDb/test/template.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process("TEST", eras.Run2_2018)
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+process = cms.Process("TEST", Run2_2018)
 
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
 process.MessageLogger.categories.append('LUT')
diff --git a/CommonTools/MVAUtils/interface/GBRForestTools.h b/CommonTools/MVAUtils/interface/GBRForestTools.h
index 9979113edd572..2be0532c1e5f8 100644
--- a/CommonTools/MVAUtils/interface/GBRForestTools.h
+++ b/CommonTools/MVAUtils/interface/GBRForestTools.h
@@ -10,18 +10,18 @@
 // Author: Jonas Rembser
 //--------------------------------------------------------------------------------------------------
 
-
 #include "CondFormats/EgammaObjects/interface/GBRForest.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 
 #include <memory>
 
 // Create a GBRForest from an XML weight file
-std::unique_ptr<const GBRForest> createGBRForest(const std::string     &weightsFile);
+std::unique_ptr<const GBRForest> createGBRForest(const std::string &weightsFile);
 std::unique_ptr<const GBRForest> createGBRForest(const edm::FileInPath &weightsFile);
 
 // Overloaded versions which are taking string vectors by reference to strore the variable names in
-std::unique_ptr<const GBRForest> createGBRForest(const std::string     &weightsFile, std::vector<std::string> &varNames);
-std::unique_ptr<const GBRForest> createGBRForest(const edm::FileInPath &weightsFile, std::vector<std::string> &varNames);
+std::unique_ptr<const GBRForest> createGBRForest(const std::string &weightsFile, std::vector<std::string> &varNames);
+std::unique_ptr<const GBRForest> createGBRForest(const edm::FileInPath &weightsFile,
+                                                 std::vector<std::string> &varNames);
 
 #endif
diff --git a/CommonTools/MVAUtils/interface/TMVAEvaluator.h b/CommonTools/MVAUtils/interface/TMVAEvaluator.h
index 3c141b69d3c1f..ac857e70162da 100644
--- a/CommonTools/MVAUtils/interface/TMVAEvaluator.h
+++ b/CommonTools/MVAUtils/interface/TMVAEvaluator.h
@@ -14,37 +14,44 @@
 #include "TMVA/Reader.h"
 
 class TMVAEvaluator {
-
 public:
-    TMVAEvaluator();
-
-    void initialize(const std::string& options, const std::string& method, const std::string& weightFile,
-        const std::vector<std::string>& variables, const std::vector<std::string>& spectators,
-        bool useGBRForest = false, bool useAdaBoost = false);
-
-    void initializeGBRForest(const GBRForest* gbrForest, const std::vector<std::string>& variables,
-        const std::vector<std::string>& spectators, bool useAdaBoost = false);
-
-    void initializeGBRForest(const edm::EventSetup& iSetup, const std::string& label,
-        const std::vector<std::string>& variables, const std::vector<std::string>& spectators,
-        bool useAdaBoost = false);
-
-    float evaluateTMVA(const std::map<std::string, float>& inputs, bool useSpectators) const;
-    float evaluateGBRForest(const std::map<std::string, float>& inputs) const;
-    float evaluate(const std::map<std::string, float>& inputs, bool useSpectators = false) const;
+  TMVAEvaluator();
+
+  void initialize(const std::string& options,
+                  const std::string& method,
+                  const std::string& weightFile,
+                  const std::vector<std::string>& variables,
+                  const std::vector<std::string>& spectators,
+                  bool useGBRForest = false,
+                  bool useAdaBoost = false);
+
+  void initializeGBRForest(const GBRForest* gbrForest,
+                           const std::vector<std::string>& variables,
+                           const std::vector<std::string>& spectators,
+                           bool useAdaBoost = false);
+
+  void initializeGBRForest(const edm::EventSetup& iSetup,
+                           const std::string& label,
+                           const std::vector<std::string>& variables,
+                           const std::vector<std::string>& spectators,
+                           bool useAdaBoost = false);
+
+  float evaluateTMVA(const std::map<std::string, float>& inputs, bool useSpectators) const;
+  float evaluateGBRForest(const std::map<std::string, float>& inputs) const;
+  float evaluate(const std::map<std::string, float>& inputs, bool useSpectators = false) const;
 
 private:
-    bool mIsInitialized;
-    bool mUsingGBRForest;
-    bool mUseAdaBoost;
+  bool mIsInitialized;
+  bool mUsingGBRForest;
+  bool mUseAdaBoost;
 
-    std::string mMethod;
-    mutable std::mutex m_mutex;
-    CMS_THREAD_GUARD(m_mutex) std::unique_ptr<TMVA::Reader> mReader;
-    std::shared_ptr<const GBRForest> mGBRForest;
+  std::string mMethod;
+  mutable std::mutex m_mutex;
+  CMS_THREAD_GUARD(m_mutex) std::unique_ptr<TMVA::Reader> mReader;
+  std::shared_ptr<const GBRForest> mGBRForest;
 
-    CMS_THREAD_GUARD(m_mutex) mutable std::map<std::string, std::pair<size_t, float>> mVariables;
-    CMS_THREAD_GUARD(m_mutex) mutable std::map<std::string, std::pair<size_t, float>> mSpectators;
+  CMS_THREAD_GUARD(m_mutex) mutable std::map<std::string, std::pair<size_t, float>> mVariables;
+  CMS_THREAD_GUARD(m_mutex) mutable std::map<std::string, std::pair<size_t, float>> mSpectators;
 };
 
-#endif // CommonTools_Utils_TMVAEvaluator_h
+#endif  // CommonTools_Utils_TMVAEvaluator_h
diff --git a/CommonTools/MVAUtils/interface/TMVAZipReader.h b/CommonTools/MVAUtils/interface/TMVAZipReader.h
index 64aa6af65d9ce..b0ec192616ed0 100644
--- a/CommonTools/MVAUtils/interface/TMVAZipReader.h
+++ b/CommonTools/MVAUtils/interface/TMVAZipReader.h
@@ -29,12 +29,14 @@
 
 namespace reco::details {
 
-    bool hasEnding(std::string const& fullString, std::string const& ending);
-    char* readGzipFile(const std::string& weightFile);
+  bool hasEnding(std::string const& fullString, std::string const& ending);
+  char* readGzipFile(const std::string& weightFile);
 
-    TMVA::IMethod* loadTMVAWeights(
-        TMVA::Reader* reader, const std::string& method, const std::string& weightFile, bool verbose = false);
+  TMVA::IMethod* loadTMVAWeights(TMVA::Reader* reader,
+                                 const std::string& method,
+                                 const std::string& weightFile,
+                                 bool verbose = false);
 
-}
+}  // namespace reco::details
 
 #endif
diff --git a/CommonTools/MVAUtils/plugins/GBRForestWriter.cc b/CommonTools/MVAUtils/plugins/GBRForestWriter.cc
index 02d72639295b3..285d181c139f8 100644
--- a/CommonTools/MVAUtils/plugins/GBRForestWriter.cc
+++ b/CommonTools/MVAUtils/plugins/GBRForestWriter.cc
@@ -1,84 +1,185 @@
-#include "CommonTools/MVAUtils/plugins/GBRForestWriter.h"
+/** \class GBRForestWriter
+ *
+ * Read GBRForest objects from ROOT file input
+ * and store it in SQL-lite output file
+ *
+ * \authors Christian Veelken, LLR
+ *
+ */
 
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/Exception.h"
-
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-
 #include "CommonTools/MVAUtils/interface/GBRForestTools.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 
 #include <TFile.h>
+#include <string>
+#include <vector>
 
-GBRForestWriter::GBRForestWriter(const edm::ParameterSet& cfg)
-    : moduleLabel_(cfg.getParameter<std::string>("@module_label"))
-{
-    edm::VParameterSet cfgJobs = cfg.getParameter<edm::VParameterSet>("jobs");
-    for (edm::VParameterSet::const_iterator cfgJob = cfgJobs.begin(); cfgJob != cfgJobs.end(); ++cfgJob) {
-        jobEntryType* job = new jobEntryType(*cfgJob);
-        jobs_.push_back(job);
-    }
-}
+class GBRForestWriter : public edm::EDAnalyzer {
+public:
+  GBRForestWriter(const edm::ParameterSet&);
+  ~GBRForestWriter() override;
 
-GBRForestWriter::~GBRForestWriter()
-{
-    for (std::vector<jobEntryType*>::iterator it = jobs_.begin(); it != jobs_.end(); ++it) {
+private:
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
+
+  std::string moduleLabel_;
+
+  bool hasRun_;
+
+  typedef std::vector<std::string> vstring;
+
+  struct categoryEntryType {
+    categoryEntryType(const edm::ParameterSet& cfg) {
+      if (cfg.existsAs<edm::FileInPath>("inputFileName")) {
+        edm::FileInPath inputFileName_fip = cfg.getParameter<edm::FileInPath>("inputFileName");
+        inputFileName_ = inputFileName_fip.fullPath();
+      } else if (cfg.existsAs<std::string>("inputFileName")) {
+        inputFileName_ = cfg.getParameter<std::string>("inputFileName");
+      } else
+        throw cms::Exception("GBRForestWriter") << " Undefined Configuration Parameter 'inputFileName !!\n";
+      std::string inputFileType_string = cfg.getParameter<std::string>("inputFileType");
+      if (inputFileType_string == "XML")
+        inputFileType_ = kXML;
+      else if (inputFileType_string == "GBRForest")
+        inputFileType_ = kGBRForest;
+      else
+        throw cms::Exception("GBRForestWriter")
+            << " Invalid Configuration Parameter 'inputFileType' = " << inputFileType_string << " !!\n";
+      if (inputFileType_ == kXML) {
+        inputVariables_ = cfg.getParameter<vstring>("inputVariables");
+        spectatorVariables_ = cfg.getParameter<vstring>("spectatorVariables");
+        methodName_ = cfg.getParameter<std::string>("methodName");
+        gbrForestName_ =
+            (cfg.existsAs<std::string>("gbrForestName") ? cfg.getParameter<std::string>("gbrForestName") : methodName_);
+      } else {
+        gbrForestName_ = cfg.getParameter<std::string>("gbrForestName");
+      }
+    }
+    ~categoryEntryType() {}
+    std::string inputFileName_;
+    enum { kXML, kGBRForest };
+    int inputFileType_;
+    vstring inputVariables_;
+    vstring spectatorVariables_;
+    std::string gbrForestName_;
+    std::string methodName_;
+  };
+  struct jobEntryType {
+    jobEntryType(const edm::ParameterSet& cfg) {
+      if (cfg.exists("categories")) {
+        edm::VParameterSet cfgCategories = cfg.getParameter<edm::VParameterSet>("categories");
+        for (edm::VParameterSet::const_iterator cfgCategory = cfgCategories.begin(); cfgCategory != cfgCategories.end();
+             ++cfgCategory) {
+          categoryEntryType* category = new categoryEntryType(*cfgCategory);
+          categories_.push_back(category);
+        }
+      } else {
+        categoryEntryType* category = new categoryEntryType(cfg);
+        categories_.push_back(category);
+      }
+      std::string outputFileType_string = cfg.getParameter<std::string>("outputFileType");
+      if (outputFileType_string == "GBRForest")
+        outputFileType_ = kGBRForest;
+      else if (outputFileType_string == "SQLLite")
+        outputFileType_ = kSQLLite;
+      else
+        throw cms::Exception("GBRForestWriter")
+            << " Invalid Configuration Parameter 'outputFileType' = " << outputFileType_string << " !!\n";
+      if (outputFileType_ == kGBRForest) {
+        outputFileName_ = cfg.getParameter<std::string>("outputFileName");
+      }
+      if (outputFileType_ == kSQLLite) {
+        outputRecord_ = cfg.getParameter<std::string>("outputRecord");
+      }
+    }
+    ~jobEntryType() {
+      for (std::vector<categoryEntryType*>::iterator it = categories_.begin(); it != categories_.end(); ++it) {
         delete (*it);
+      }
     }
+    std::vector<categoryEntryType*> categories_;
+    enum { kGBRForest, kSQLLite };
+    int outputFileType_;
+    std::string outputFileName_;
+    std::string outputRecord_;
+  };
+  std::vector<jobEntryType*> jobs_;
+};
+
+GBRForestWriter::GBRForestWriter(const edm::ParameterSet& cfg)
+    : moduleLabel_(cfg.getParameter<std::string>("@module_label")) {
+  edm::VParameterSet cfgJobs = cfg.getParameter<edm::VParameterSet>("jobs");
+  for (edm::VParameterSet::const_iterator cfgJob = cfgJobs.begin(); cfgJob != cfgJobs.end(); ++cfgJob) {
+    jobEntryType* job = new jobEntryType(*cfgJob);
+    jobs_.push_back(job);
+  }
 }
 
-void GBRForestWriter::analyze(const edm::Event&, const edm::EventSetup&)
-{
+GBRForestWriter::~GBRForestWriter() {
+  for (std::vector<jobEntryType*>::iterator it = jobs_.begin(); it != jobs_.end(); ++it) {
+    delete (*it);
+  }
+}
 
-    for (std::vector<jobEntryType*>::iterator job = jobs_.begin(); job != jobs_.end(); ++job) {
-        std::map<std::string, const GBRForest*> gbrForests; // key = name
-        for (std::vector<categoryEntryType*>::iterator category = (*job)->categories_.begin();
-             category != (*job)->categories_.end(); ++category) {
-            const GBRForest* gbrForest = nullptr;
-            if ((*category)->inputFileType_ == categoryEntryType::kXML) {
-                gbrForest = createGBRForest((*category)->inputFileName_).release();
-            } else if ((*category)->inputFileType_ == categoryEntryType::kGBRForest) {
-                TFile* inputFile = new TFile((*category)->inputFileName_.data());
-                // gbrForest = dynamic_cast<GBRForest*>(inputFile->Get((*category)->gbrForestName_.data())); // CV:
-                // dynamic_cast<GBRForest*> fails for some reason ?!
-                gbrForest = (GBRForest*)inputFile->Get((*category)->gbrForestName_.data());
-                delete inputFile;
-            }
-            if (!gbrForest)
-                throw cms::Exception("GBRForestWriter")
-                    << " Failed to load GBRForest = " << (*category)->gbrForestName_.data()
-                    << " from file = " << (*category)->inputFileName_ << " !!\n";
-            gbrForests[(*category)->gbrForestName_] = gbrForest;
-        }
-        if ((*job)->outputFileType_ == jobEntryType::kGBRForest) {
-            TFile* outputFile = new TFile((*job)->outputFileName_.data(), "RECREATE");
+void GBRForestWriter::analyze(const edm::Event&, const edm::EventSetup&) {
+  for (std::vector<jobEntryType*>::iterator job = jobs_.begin(); job != jobs_.end(); ++job) {
+    std::map<std::string, const GBRForest*> gbrForests;  // key = name
+    for (std::vector<categoryEntryType*>::iterator category = (*job)->categories_.begin();
+         category != (*job)->categories_.end();
+         ++category) {
+      const GBRForest* gbrForest = nullptr;
+      if ((*category)->inputFileType_ == categoryEntryType::kXML) {
+        gbrForest = createGBRForest((*category)->inputFileName_).release();
+      } else if ((*category)->inputFileType_ == categoryEntryType::kGBRForest) {
+        TFile* inputFile = new TFile((*category)->inputFileName_.data());
+        // gbrForest = dynamic_cast<GBRForest*>(inputFile->Get((*category)->gbrForestName_.data())); // CV:
+        // dynamic_cast<GBRForest*> fails for some reason ?!
+        gbrForest = (GBRForest*)inputFile->Get((*category)->gbrForestName_.data());
+        delete inputFile;
+      }
+      if (!gbrForest)
+        throw cms::Exception("GBRForestWriter") << " Failed to load GBRForest = " << (*category)->gbrForestName_.data()
+                                                << " from file = " << (*category)->inputFileName_ << " !!\n";
+      gbrForests[(*category)->gbrForestName_] = gbrForest;
+    }
+    if ((*job)->outputFileType_ == jobEntryType::kGBRForest) {
+      TFile* outputFile = new TFile((*job)->outputFileName_.data(), "RECREATE");
 
-            for (std::map<std::string, const GBRForest*>::iterator gbrForest = gbrForests.begin();
-                 gbrForest != gbrForests.end(); ++gbrForest) {
-                outputFile->WriteObject(gbrForest->second, gbrForest->first.data());
-            }
-            delete outputFile;
-        } else if ((*job)->outputFileType_ == jobEntryType::kSQLLite) {
-            edm::Service<cond::service::PoolDBOutputService> dbService;
-            if (!dbService.isAvailable())
-                throw cms::Exception("GBRForestWriter") << " Failed to access PoolDBOutputService !!\n";
+      for (std::map<std::string, const GBRForest*>::iterator gbrForest = gbrForests.begin();
+           gbrForest != gbrForests.end();
+           ++gbrForest) {
+        outputFile->WriteObject(gbrForest->second, gbrForest->first.data());
+      }
+      delete outputFile;
+    } else if ((*job)->outputFileType_ == jobEntryType::kSQLLite) {
+      edm::Service<cond::service::PoolDBOutputService> dbService;
+      if (!dbService.isAvailable())
+        throw cms::Exception("GBRForestWriter") << " Failed to access PoolDBOutputService !!\n";
 
-            for (std::map<std::string, const GBRForest*>::iterator gbrForest = gbrForests.begin();
-                 gbrForest != gbrForests.end(); ++gbrForest) {
-                std::string outputRecord = (*job)->outputRecord_;
-                if (gbrForests.size() > 1)
-                    outputRecord.append("_").append(gbrForest->first);
-                dbService->writeOne(gbrForest->second, dbService->beginOfTime(), outputRecord);
-            }
-        }
+      for (std::map<std::string, const GBRForest*>::iterator gbrForest = gbrForests.begin();
+           gbrForest != gbrForests.end();
+           ++gbrForest) {
+        std::string outputRecord = (*job)->outputRecord_;
+        if (gbrForests.size() > 1)
+          outputRecord.append("_").append(gbrForest->first);
+        dbService->writeOne(gbrForest->second, dbService->beginOfTime(), outputRecord);
+      }
+    }
 
-        // gbrforest deletion
-        for (std::map<std::string, const GBRForest*>::iterator gbrForest = gbrForests.begin();
-             gbrForest != gbrForests.end(); ++gbrForest) {
-            delete gbrForest->second;
-        }
+    // gbrforest deletion
+    for (std::map<std::string, const GBRForest*>::iterator gbrForest = gbrForests.begin();
+         gbrForest != gbrForests.end();
+         ++gbrForest) {
+      delete gbrForest->second;
     }
+  }
 }
 
-#include "FWCore/Framework/interface/MakerMacros.h"
-
 DEFINE_FWK_MODULE(GBRForestWriter);
diff --git a/CommonTools/MVAUtils/plugins/GBRForestWriter.h b/CommonTools/MVAUtils/plugins/GBRForestWriter.h
deleted file mode 100644
index 38111f30fe390..0000000000000
--- a/CommonTools/MVAUtils/plugins/GBRForestWriter.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef CommonTools_MVAUtils_GBRForestWriter_h
-#define CommonTools_MVAUtils_GBRForestWriter_h
-
-/** \class GBRForestWriter
- *
- * Read GBRForest objects from ROOT file input
- * and store it in SQL-lite output file
- *
- * \authors Christian Veelken, LLR
- *
- */
-
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-
-#include <string>
-#include <vector>
-
-class GBRForestWriter : public edm::EDAnalyzer {
-public:
-    GBRForestWriter(const edm::ParameterSet&);
-    ~GBRForestWriter() override;
-
-private:
-    void analyze(const edm::Event&, const edm::EventSetup&) override;
-
-    std::string moduleLabel_;
-
-    bool hasRun_;
-
-    typedef std::vector<std::string> vstring;
-
-    struct categoryEntryType {
-        categoryEntryType(const edm::ParameterSet& cfg)
-        {
-            if (cfg.existsAs<edm::FileInPath>("inputFileName")) {
-                edm::FileInPath inputFileName_fip = cfg.getParameter<edm::FileInPath>("inputFileName");
-                inputFileName_ = inputFileName_fip.fullPath();
-            } else if (cfg.existsAs<std::string>("inputFileName")) {
-                inputFileName_ = cfg.getParameter<std::string>("inputFileName");
-            } else
-                throw cms::Exception("GBRForestWriter") << " Undefined Configuration Parameter 'inputFileName !!\n";
-            std::string inputFileType_string = cfg.getParameter<std::string>("inputFileType");
-            if (inputFileType_string == "XML")
-                inputFileType_ = kXML;
-            else if (inputFileType_string == "GBRForest")
-                inputFileType_ = kGBRForest;
-            else
-                throw cms::Exception("GBRForestWriter")
-                    << " Invalid Configuration Parameter 'inputFileType' = " << inputFileType_string << " !!\n";
-            if (inputFileType_ == kXML) {
-                inputVariables_ = cfg.getParameter<vstring>("inputVariables");
-                spectatorVariables_ = cfg.getParameter<vstring>("spectatorVariables");
-                methodName_ = cfg.getParameter<std::string>("methodName");
-                gbrForestName_
-                    = (cfg.existsAs<std::string>("gbrForestName") ? cfg.getParameter<std::string>("gbrForestName")
-                                                                  : methodName_);
-            } else {
-                gbrForestName_ = cfg.getParameter<std::string>("gbrForestName");
-            }
-        }
-        ~categoryEntryType() {}
-        std::string inputFileName_;
-        enum { kXML, kGBRForest };
-        int inputFileType_;
-        vstring inputVariables_;
-        vstring spectatorVariables_;
-        std::string gbrForestName_;
-        std::string methodName_;
-    };
-    struct jobEntryType {
-        jobEntryType(const edm::ParameterSet& cfg)
-        {
-            if (cfg.exists("categories")) {
-                edm::VParameterSet cfgCategories = cfg.getParameter<edm::VParameterSet>("categories");
-                for (edm::VParameterSet::const_iterator cfgCategory = cfgCategories.begin();
-                     cfgCategory != cfgCategories.end(); ++cfgCategory) {
-                    categoryEntryType* category = new categoryEntryType(*cfgCategory);
-                    categories_.push_back(category);
-                }
-            } else {
-                categoryEntryType* category = new categoryEntryType(cfg);
-                categories_.push_back(category);
-            }
-            std::string outputFileType_string = cfg.getParameter<std::string>("outputFileType");
-            if (outputFileType_string == "GBRForest")
-                outputFileType_ = kGBRForest;
-            else if (outputFileType_string == "SQLLite")
-                outputFileType_ = kSQLLite;
-            else
-                throw cms::Exception("GBRForestWriter")
-                    << " Invalid Configuration Parameter 'outputFileType' = " << outputFileType_string << " !!\n";
-            if (outputFileType_ == kGBRForest) {
-                outputFileName_ = cfg.getParameter<std::string>("outputFileName");
-            }
-            if (outputFileType_ == kSQLLite) {
-                outputRecord_ = cfg.getParameter<std::string>("outputRecord");
-            }
-        }
-        ~jobEntryType()
-        {
-            for (std::vector<categoryEntryType*>::iterator it = categories_.begin(); it != categories_.end(); ++it) {
-                delete (*it);
-            }
-        }
-        std::vector<categoryEntryType*> categories_;
-        enum { kGBRForest, kSQLLite };
-        int outputFileType_;
-        std::string outputFileName_;
-        std::string outputRecord_;
-    };
-    std::vector<jobEntryType*> jobs_;
-};
-
-#endif
diff --git a/CommonTools/MVAUtils/src/GBRForestTools.cc b/CommonTools/MVAUtils/src/GBRForestTools.cc
index 63bfe6b3a0cb1..6f40fd3059cd5 100644
--- a/CommonTools/MVAUtils/src/GBRForestTools.cc
+++ b/CommonTools/MVAUtils/src/GBRForestTools.cc
@@ -11,294 +11,260 @@
 
 namespace {
 
-    size_t readVariables(tinyxml2::XMLElement* root, const char * key, std::vector<std::string>& names)
-    {
-      size_t n = 0;
-      names.clear();
-
-      if (root != nullptr) {
-          for(tinyxml2::XMLElement* e = root->FirstChildElement(key);
-                  e != nullptr; e = e->NextSiblingElement(key))
-          {
-              names.push_back(e->Attribute("Expression"));
-              ++n;
-          }
+  size_t readVariables(tinyxml2::XMLElement* root, const char* key, std::vector<std::string>& names) {
+    size_t n = 0;
+    names.clear();
+
+    if (root != nullptr) {
+      for (tinyxml2::XMLElement* e = root->FirstChildElement(key); e != nullptr; e = e->NextSiblingElement(key)) {
+        names.push_back(e->Attribute("Expression"));
+        ++n;
       }
-
-      return n;
     }
 
-    bool isTerminal(tinyxml2::XMLElement* node)
-    {
-      bool is = true;
-      for(tinyxml2::XMLElement* e = node->FirstChildElement("Node");
-              e != nullptr; e = e->NextSiblingElement("Node")) {
-          is = false;
-      }
-      return is;
-    }
+    return n;
+  }
 
-    unsigned int countIntermediateNodes(tinyxml2::XMLElement* node)
-    {
-
-      unsigned int count = 0;
-      for(tinyxml2::XMLElement* e = node->FirstChildElement("Node");
-              e != nullptr; e = e->NextSiblingElement("Node")) {
-          count += countIntermediateNodes(e);
-      }
-      return count > 0 ? count + 1 : 0;
-      
+  bool isTerminal(tinyxml2::XMLElement* node) {
+    bool is = true;
+    for (tinyxml2::XMLElement* e = node->FirstChildElement("Node"); e != nullptr; e = e->NextSiblingElement("Node")) {
+      is = false;
     }
+    return is;
+  }
 
-    unsigned int countTerminalNodes(tinyxml2::XMLElement* node)
-    {
-      
-      unsigned int count = 0;
-      for(tinyxml2::XMLElement* e = node->FirstChildElement("Node");
-              e != nullptr; e = e->NextSiblingElement("Node")) {
-          count += countTerminalNodes(e);
-      }
-      return count > 0 ? count : 1;
-      
+  unsigned int countIntermediateNodes(tinyxml2::XMLElement* node) {
+    unsigned int count = 0;
+    for (tinyxml2::XMLElement* e = node->FirstChildElement("Node"); e != nullptr; e = e->NextSiblingElement("Node")) {
+      count += countIntermediateNodes(e);
     }
+    return count > 0 ? count + 1 : 0;
+  }
 
-    void addNode(GBRTree& tree, tinyxml2::XMLElement* node,
-            double scale, bool isRegression, bool useYesNoLeaf,
-            bool adjustboundary, bool isAdaClassifier)
-    {
-
-      bool nodeIsTerminal = isTerminal(node);
-      if (nodeIsTerminal) {
-        double response = 0.;
-        if (isRegression) {
-          node->QueryDoubleAttribute("res", &response);
-        }
-        else {
-          if (useYesNoLeaf) {
-            node->QueryDoubleAttribute("nType", &response);
-          }
-          else {
-            if (isAdaClassifier) {
-                node->QueryDoubleAttribute("purity", &response);
-            } else {
-                node->QueryDoubleAttribute("res", &response);
-            }
+  unsigned int countTerminalNodes(tinyxml2::XMLElement* node) {
+    unsigned int count = 0;
+    for (tinyxml2::XMLElement* e = node->FirstChildElement("Node"); e != nullptr; e = e->NextSiblingElement("Node")) {
+      count += countTerminalNodes(e);
+    }
+    return count > 0 ? count : 1;
+  }
+
+  void addNode(GBRTree& tree,
+               tinyxml2::XMLElement* node,
+               double scale,
+               bool isRegression,
+               bool useYesNoLeaf,
+               bool adjustboundary,
+               bool isAdaClassifier) {
+    bool nodeIsTerminal = isTerminal(node);
+    if (nodeIsTerminal) {
+      double response = 0.;
+      if (isRegression) {
+        node->QueryDoubleAttribute("res", &response);
+      } else {
+        if (useYesNoLeaf) {
+          node->QueryDoubleAttribute("nType", &response);
+        } else {
+          if (isAdaClassifier) {
+            node->QueryDoubleAttribute("purity", &response);
+          } else {
+            node->QueryDoubleAttribute("res", &response);
           }
         }
-        response *= scale;
-        tree.Responses().push_back(response);
       }
-      else {    
-
-        int thisidx = tree.CutIndices().size(); 
-        
-        int selector; 
-        float cutval; 
-        bool ctype; 
+      response *= scale;
+      tree.Responses().push_back(response);
+    } else {
+      int thisidx = tree.CutIndices().size();
 
-        node->QueryIntAttribute("IVar", &selector);
-        node->QueryFloatAttribute("Cut", &cutval);
-        node->QueryBoolAttribute("cType", &ctype);
+      int selector;
+      float cutval;
+      bool ctype;
 
-        tree.CutIndices().push_back(static_cast<unsigned char>(selector)); 
+      node->QueryIntAttribute("IVar", &selector);
+      node->QueryFloatAttribute("Cut", &cutval);
+      node->QueryBoolAttribute("cType", &ctype);
 
-        //newer tmva versions use >= instead of > in decision tree splits, so adjust cut value
-        //to reproduce the correct behaviour
-        if (adjustboundary) {
-          cutval = std::nextafter(cutval,std::numeric_limits<float>::lowest());
-        }
-        tree.CutVals().push_back(cutval);
-        tree.LeftIndices().push_back(0);   
-        tree.RightIndices().push_back(0);
-        
-        tinyxml2::XMLElement* left = nullptr;
-        tinyxml2::XMLElement* right = nullptr;
-        for(tinyxml2::XMLElement* e = node->FirstChildElement("Node");
-                e != nullptr; e = e->NextSiblingElement("Node")) {
-            if (*(e->Attribute("pos")) == 'l') left = e;
-            else if (*(e->Attribute("pos")) == 'r') right = e;
-        }
-        if (!ctype) {
-          std::swap(left, right);
-        }
+      tree.CutIndices().push_back(static_cast<unsigned char>(selector));
 
-        tree.LeftIndices()[thisidx] = isTerminal(left) ? -tree.Responses().size() : tree.CutIndices().size() ;
-        addNode(tree, left, scale, isRegression, useYesNoLeaf, adjustboundary,isAdaClassifier);
-        
-        tree.RightIndices()[thisidx] = isTerminal(right) ? -tree.Responses().size() : tree.CutIndices().size() ;
-        addNode(tree, right, scale, isRegression, useYesNoLeaf, adjustboundary,isAdaClassifier);
-        
+      //newer tmva versions use >= instead of > in decision tree splits, so adjust cut value
+      //to reproduce the correct behaviour
+      if (adjustboundary) {
+        cutval = std::nextafter(cutval, std::numeric_limits<float>::lowest());
+      }
+      tree.CutVals().push_back(cutval);
+      tree.LeftIndices().push_back(0);
+      tree.RightIndices().push_back(0);
+
+      tinyxml2::XMLElement* left = nullptr;
+      tinyxml2::XMLElement* right = nullptr;
+      for (tinyxml2::XMLElement* e = node->FirstChildElement("Node"); e != nullptr; e = e->NextSiblingElement("Node")) {
+        if (*(e->Attribute("pos")) == 'l')
+          left = e;
+        else if (*(e->Attribute("pos")) == 'r')
+          right = e;
+      }
+      if (!ctype) {
+        std::swap(left, right);
       }
-  
-    }
 
-    std::unique_ptr<GBRForest> init(const std::string& weightsFileFullPath,
-                                    std::vector<std::string>& varNames)
-    {
+      tree.LeftIndices()[thisidx] = isTerminal(left) ? -tree.Responses().size() : tree.CutIndices().size();
+      addNode(tree, left, scale, isRegression, useYesNoLeaf, adjustboundary, isAdaClassifier);
 
-      //
-      // Load weights file, for gzipped or raw xml file
-      //
-      tinyxml2::XMLDocument xmlDoc;
+      tree.RightIndices()[thisidx] = isTerminal(right) ? -tree.Responses().size() : tree.CutIndices().size();
+      addNode(tree, right, scale, isRegression, useYesNoLeaf, adjustboundary, isAdaClassifier);
+    }
+  }
+
+  std::unique_ptr<GBRForest> init(const std::string& weightsFileFullPath, std::vector<std::string>& varNames) {
+    //
+    // Load weights file, for gzipped or raw xml file
+    //
+    tinyxml2::XMLDocument xmlDoc;
+
+    using namespace reco::details;
+
+    if (hasEnding(weightsFileFullPath, ".xml")) {
+      xmlDoc.LoadFile(weightsFileFullPath.c_str());
+    } else if (hasEnding(weightsFileFullPath, ".gz") || hasEnding(weightsFileFullPath, ".gzip")) {
+      char* buffer = readGzipFile(weightsFileFullPath);
+      xmlDoc.Parse(buffer);
+      free(buffer);
+    }
 
-      using namespace reco::details;
+    tinyxml2::XMLElement* root = xmlDoc.FirstChildElement("MethodSetup");
+    readVariables(root->FirstChildElement("Variables"), "Variable", varNames);
 
-      if (hasEnding(weightsFileFullPath, ".xml")) {
-          xmlDoc.LoadFile(weightsFileFullPath.c_str());
-      } else if (hasEnding(weightsFileFullPath, ".gz") ||
-                 hasEnding(weightsFileFullPath, ".gzip")) {
-          char * buffer = readGzipFile(weightsFileFullPath);
-          xmlDoc.Parse(buffer);
-          free(buffer);
-      }
+    // Read in the TMVA general info
+    std::map<std::string, std::string> info;
+    tinyxml2::XMLElement* infoElem = xmlDoc.FirstChildElement("MethodSetup")->FirstChildElement("GeneralInfo");
+    if (infoElem == nullptr) {
+      throw cms::Exception("XMLError") << "No GeneralInfo found in " << weightsFileFullPath << " !!\n";
+    }
+    for (tinyxml2::XMLElement* e = infoElem->FirstChildElement("Info"); e != nullptr;
+         e = e->NextSiblingElement("Info")) {
+      const char* name;
+      const char* value;
+      e->QueryStringAttribute("name", &name);
+      e->QueryStringAttribute("value", &value);
+      info[name] = value;
+    }
 
-      tinyxml2::XMLElement* root = xmlDoc.FirstChildElement("MethodSetup");
-      readVariables(root->FirstChildElement("Variables"), "Variable", varNames);
+    // Read in the TMVA options
+    std::map<std::string, std::string> options;
+    tinyxml2::XMLElement* optionsElem = xmlDoc.FirstChildElement("MethodSetup")->FirstChildElement("Options");
+    if (optionsElem == nullptr) {
+      throw cms::Exception("XMLError") << "No Options found in " << weightsFileFullPath << " !!\n";
+    }
+    for (tinyxml2::XMLElement* e = optionsElem->FirstChildElement("Option"); e != nullptr;
+         e = e->NextSiblingElement("Option")) {
+      const char* name;
+      e->QueryStringAttribute("name", &name);
+      options[name] = e->GetText();
+    }
 
-      // Read in the TMVA general info
-      std::map <std::string, std::string> info; 
-      tinyxml2::XMLElement* infoElem = xmlDoc.FirstChildElement("MethodSetup")->FirstChildElement("GeneralInfo");
-      if (infoElem == nullptr) {
-          throw cms::Exception("XMLError")
-              << "No GeneralInfo found in " << weightsFileFullPath << " !!\n";
-      }
-      for(tinyxml2::XMLElement* e = infoElem->FirstChildElement("Info");
-              e != nullptr; e = e->NextSiblingElement("Info"))
-      {
-          const char * name;
-          const char * value;
-          e->QueryStringAttribute("name",  &name);
-          e->QueryStringAttribute("value", &value);
-          info[name] = value;
-      }
+    // Get root version number if available
+    int rootTrainingVersion(0);
+    if (info.find("ROOT Release") != info.end()) {
+      std::string s = info["ROOT Release"];
+      rootTrainingVersion = std::stoi(s.substr(s.find("[") + 1, s.find("]") - s.find("[") - 1));
+    }
 
-      // Read in the TMVA options
-      std::map <std::string, std::string> options; 
-      tinyxml2::XMLElement* optionsElem = xmlDoc.FirstChildElement("MethodSetup")->FirstChildElement("Options");
-      if (optionsElem == nullptr) {
-          throw cms::Exception("XMLError")
-              << "No Options found in " << weightsFileFullPath << " !!\n";
-      }
-      for(tinyxml2::XMLElement* e = optionsElem->FirstChildElement("Option");
-              e != nullptr; e = e->NextSiblingElement("Option"))
-      {
-          const char * name;
-          e->QueryStringAttribute("name",  &name);
-          options[name] = e->GetText();
-      }
+    // Get the boosting weights
+    std::vector<double> boostWeights;
+    tinyxml2::XMLElement* weightsElem = xmlDoc.FirstChildElement("MethodSetup")->FirstChildElement("Weights");
+    if (weightsElem == nullptr) {
+      throw cms::Exception("XMLError") << "No Weights found in " << weightsFileFullPath << " !!\n";
+    }
+    bool hasTrees = false;
+    for (tinyxml2::XMLElement* e = weightsElem->FirstChildElement("BinaryTree"); e != nullptr;
+         e = e->NextSiblingElement("BinaryTree")) {
+      hasTrees = true;
+      double w;
+      e->QueryDoubleAttribute("boostWeight", &w);
+      boostWeights.push_back(w);
+    }
+    if (!hasTrees) {
+      throw cms::Exception("XMLError") << "No BinaryTrees found in " << weightsFileFullPath << " !!\n";
+    }
 
-      // Get root version number if available
-      int rootTrainingVersion(0);
-      if (info.find("ROOT Release") != info.end()) {
-        std::string s = info["ROOT Release"];
-        rootTrainingVersion = std::stoi(s.substr(s.find("[")+1,s.find("]")-s.find("[")-1));
-      }
+    bool isRegression = info["AnalysisType"] == "Regression";
 
-      // Get the boosting weights
-      std::vector<double> boostWeights;
-      tinyxml2::XMLElement* weightsElem = xmlDoc.FirstChildElement("MethodSetup")->FirstChildElement("Weights");
-      if (weightsElem == nullptr) {
-          throw cms::Exception("XMLError")
-              << "No Weights found in " << weightsFileFullPath << " !!\n";
-      }
-      bool hasTrees = false;
-      for(tinyxml2::XMLElement* e = weightsElem->FirstChildElement("BinaryTree");
-              e != nullptr; e = e->NextSiblingElement("BinaryTree"))
-      {
-          hasTrees = true;
-          double w;
-          e->QueryDoubleAttribute("boostWeight", &w);
-          boostWeights.push_back(w);
-      }
-      if (!hasTrees) {
-          throw cms::Exception("XMLError")
-              << "No BinaryTrees found in " << weightsFileFullPath << " !!\n";
-      }
+    //special handling for non-gradient-boosted (ie ADABoost) classifiers, where tree responses
+    //need to be renormalized after the training for evaluation purposes
+    bool isAdaClassifier = !isRegression && options["BoostType"] != "Grad";
+    bool useYesNoLeaf = isAdaClassifier && options["UseYesNoLeaf"] == "True";
 
-      bool isRegression = info["AnalysisType"] == "Regression";
+    //newer tmva versions use >= instead of > in decision tree splits, so adjust cut value
+    //to reproduce the correct behaviour
+    bool adjustBoundaries =
+        (rootTrainingVersion >= ROOT_VERSION(5, 34, 20) && rootTrainingVersion < ROOT_VERSION(6, 0, 0)) ||
+        rootTrainingVersion >= ROOT_VERSION(6, 2, 0);
 
-      //special handling for non-gradient-boosted (ie ADABoost) classifiers, where tree responses
-      //need to be renormalized after the training for evaluation purposes
-      bool isAdaClassifier = !isRegression && options["BoostType"] != "Grad";
-      bool useYesNoLeaf = isAdaClassifier && options["UseYesNoLeaf"] == "True";
+    auto forest = std::make_unique<GBRForest>();
+    forest->SetInitialResponse(isRegression ? boostWeights[0] : 0.);
 
-      //newer tmva versions use >= instead of > in decision tree splits, so adjust cut value
-      //to reproduce the correct behaviour  
-      bool adjustBoundaries = (rootTrainingVersion>=ROOT_VERSION(5,34,20) &&
-              rootTrainingVersion<ROOT_VERSION(6,0,0)) || rootTrainingVersion>=ROOT_VERSION(6,2,0);
-        
-      auto forest = std::make_unique<GBRForest>();
-      forest->SetInitialResponse(isRegression ? boostWeights[0] : 0.);
-      
-      double norm = 0;
-      if (isAdaClassifier) {
-        for (double w : boostWeights) {
-          norm += w;
-        }
+    double norm = 0;
+    if (isAdaClassifier) {
+      for (double w : boostWeights) {
+        norm += w;
       }
+    }
 
-      forest->Trees().reserve(boostWeights.size());
-      size_t itree = 0;
-      // Loop over tree estimators
-      for(tinyxml2::XMLElement* e = weightsElem->FirstChildElement("BinaryTree");
-              e != nullptr; e = e->NextSiblingElement("BinaryTree")) {
-        double scale = isAdaClassifier ? boostWeights[itree]/norm : 1.0;
-
-        tinyxml2::XMLElement* root = e->FirstChildElement("Node");
-        forest->Trees().push_back(GBRTree(countIntermediateNodes(root), countTerminalNodes(root)));
-        auto & tree = forest->Trees().back();
-
-        addNode(tree, root, scale, isRegression, useYesNoLeaf, adjustBoundaries, isAdaClassifier);
-
-        //special case, root node is terminal, create fake intermediate node at root
-        if (tree.CutIndices().empty()) {
-          tree.CutIndices().push_back(0);
-          tree.CutVals().push_back(0);
-          tree.LeftIndices().push_back(0);
-          tree.RightIndices().push_back(0);
-        }
+    forest->Trees().reserve(boostWeights.size());
+    size_t itree = 0;
+    // Loop over tree estimators
+    for (tinyxml2::XMLElement* e = weightsElem->FirstChildElement("BinaryTree"); e != nullptr;
+         e = e->NextSiblingElement("BinaryTree")) {
+      double scale = isAdaClassifier ? boostWeights[itree] / norm : 1.0;
+
+      tinyxml2::XMLElement* root = e->FirstChildElement("Node");
+      forest->Trees().push_back(GBRTree(countIntermediateNodes(root), countTerminalNodes(root)));
+      auto& tree = forest->Trees().back();
+
+      addNode(tree, root, scale, isRegression, useYesNoLeaf, adjustBoundaries, isAdaClassifier);
 
-        ++itree;
+      //special case, root node is terminal, create fake intermediate node at root
+      if (tree.CutIndices().empty()) {
+        tree.CutIndices().push_back(0);
+        tree.CutVals().push_back(0);
+        tree.LeftIndices().push_back(0);
+        tree.RightIndices().push_back(0);
       }
 
-      return forest;
+      ++itree;
     }
 
-}
+    return forest;
+  }
+
+}  // namespace
 
 // Create a GBRForest from an XML weight file
-std::unique_ptr<const GBRForest>
-createGBRForest(const std::string &weightsFile)
-{
-    std::vector<std::string> varNames;
-    return createGBRForest(weightsFile, varNames);
+std::unique_ptr<const GBRForest> createGBRForest(const std::string& weightsFile) {
+  std::vector<std::string> varNames;
+  return createGBRForest(weightsFile, varNames);
 }
 
-std::unique_ptr<const GBRForest>
-createGBRForest(const edm::FileInPath &weightsFile)
-{
-    std::vector<std::string> varNames;
-    return createGBRForest(weightsFile.fullPath(), varNames);
+std::unique_ptr<const GBRForest> createGBRForest(const edm::FileInPath& weightsFile) {
+  std::vector<std::string> varNames;
+  return createGBRForest(weightsFile.fullPath(), varNames);
 }
 
 // Overloaded versions which are taking string vectors by reference to store the variable names in
-std::unique_ptr<const GBRForest>
-createGBRForest(const std::string &weightsFile, std::vector<std::string> &varNames)
-{
-    std::unique_ptr<GBRForest> gbrForest;
-
-    if(weightsFile[0] == '/') {
-        gbrForest = init(weightsFile, varNames);
-    }
-    else {
-        edm::FileInPath weightsFileEdm(weightsFile);
-        gbrForest = init( weightsFileEdm.fullPath(), varNames);
-    }
-    return gbrForest;
+std::unique_ptr<const GBRForest> createGBRForest(const std::string& weightsFile, std::vector<std::string>& varNames) {
+  std::unique_ptr<GBRForest> gbrForest;
+
+  if (weightsFile[0] == '/') {
+    gbrForest = init(weightsFile, varNames);
+  } else {
+    edm::FileInPath weightsFileEdm(weightsFile);
+    gbrForest = init(weightsFileEdm.fullPath(), varNames);
+  }
+  return gbrForest;
 }
 
-std::unique_ptr<const GBRForest>
-createGBRForest(const edm::FileInPath &weightsFile, std::vector<std::string> &varNames)
-{
-    return createGBRForest(weightsFile.fullPath(), varNames);
+std::unique_ptr<const GBRForest> createGBRForest(const edm::FileInPath& weightsFile,
+                                                 std::vector<std::string>& varNames) {
+  return createGBRForest(weightsFile.fullPath(), varNames);
 }
diff --git a/CommonTools/MVAUtils/src/TMVAEvaluator.cc b/CommonTools/MVAUtils/src/TMVAEvaluator.cc
index 62d8902876dd4..8051b76a579c7 100644
--- a/CommonTools/MVAUtils/src/TMVAEvaluator.cc
+++ b/CommonTools/MVAUtils/src/TMVAEvaluator.cc
@@ -6,170 +6,168 @@
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-TMVAEvaluator::TMVAEvaluator()
-    : mIsInitialized(false)
-    , mUsingGBRForest(false)
-    , mUseAdaBoost(false)
-{
-}
-
-void TMVAEvaluator::initialize(const std::string& options, const std::string& method, const std::string& weightFile,
-    const std::vector<std::string>& variables, const std::vector<std::string>& spectators, bool useGBRForest,
-    bool useAdaBoost)
-{
-    // initialize the TMVA reader
-    mReader.reset(new TMVA::Reader(options.c_str()));
-    mReader->SetVerbose(false);
-    mMethod = method;
-
-    // add input variables
-    for (std::vector<std::string>::const_iterator it = variables.begin(); it != variables.end(); ++it) {
-        mVariables.insert(std::make_pair(*it, std::make_pair(it - variables.begin(), 0.)));
-        mReader->AddVariable(it->c_str(), &(mVariables.at(*it).second));
-    }
-
-    // add spectator variables
-    for (std::vector<std::string>::const_iterator it = spectators.begin(); it != spectators.end(); ++it) {
-        mSpectators.insert(std::make_pair(*it, std::make_pair(it - spectators.begin(), 0.)));
-        mReader->AddSpectator(it->c_str(), &(mSpectators.at(*it).second));
-    }
-
-    // load the TMVA weights
-    reco::details::loadTMVAWeights(mReader.get(), mMethod, weightFile);
-
-    if (useGBRForest) {
-        mGBRForest = createGBRForest(weightFile);
+TMVAEvaluator::TMVAEvaluator() : mIsInitialized(false), mUsingGBRForest(false), mUseAdaBoost(false) {}
+
+void TMVAEvaluator::initialize(const std::string& options,
+                               const std::string& method,
+                               const std::string& weightFile,
+                               const std::vector<std::string>& variables,
+                               const std::vector<std::string>& spectators,
+                               bool useGBRForest,
+                               bool useAdaBoost) {
+  // initialize the TMVA reader
+  mReader.reset(new TMVA::Reader(options.c_str()));
+  mReader->SetVerbose(false);
+  mMethod = method;
+
+  // add input variables
+  for (std::vector<std::string>::const_iterator it = variables.begin(); it != variables.end(); ++it) {
+    mVariables.insert(std::make_pair(*it, std::make_pair(it - variables.begin(), 0.)));
+    mReader->AddVariable(it->c_str(), &(mVariables.at(*it).second));
+  }
+
+  // add spectator variables
+  for (std::vector<std::string>::const_iterator it = spectators.begin(); it != spectators.end(); ++it) {
+    mSpectators.insert(std::make_pair(*it, std::make_pair(it - spectators.begin(), 0.)));
+    mReader->AddSpectator(it->c_str(), &(mSpectators.at(*it).second));
+  }
+
+  // load the TMVA weights
+  reco::details::loadTMVAWeights(mReader.get(), mMethod, weightFile);
+
+  if (useGBRForest) {
+    mGBRForest = createGBRForest(weightFile);
+
+    // now can free some memory
+    mReader.reset(nullptr);
 
-        // now can free some memory
-        mReader.reset(nullptr);
-
-        mUsingGBRForest = true;
-        mUseAdaBoost = useAdaBoost;
-    }
+    mUsingGBRForest = true;
+    mUseAdaBoost = useAdaBoost;
+  }
 
-    mIsInitialized = true;
+  mIsInitialized = true;
 }
 
-void TMVAEvaluator::initializeGBRForest(const GBRForest* gbrForest, const std::vector<std::string>& variables,
-    const std::vector<std::string>& spectators, bool useAdaBoost)
-{
-    // add input variables
-    for (std::vector<std::string>::const_iterator it = variables.begin(); it != variables.end(); ++it)
-        mVariables.insert(std::make_pair(*it, std::make_pair(it - variables.begin(), 0.)));
+void TMVAEvaluator::initializeGBRForest(const GBRForest* gbrForest,
+                                        const std::vector<std::string>& variables,
+                                        const std::vector<std::string>& spectators,
+                                        bool useAdaBoost) {
+  // add input variables
+  for (std::vector<std::string>::const_iterator it = variables.begin(); it != variables.end(); ++it)
+    mVariables.insert(std::make_pair(*it, std::make_pair(it - variables.begin(), 0.)));
 
-    // add spectator variables
-    for (std::vector<std::string>::const_iterator it = spectators.begin(); it != spectators.end(); ++it)
-        mSpectators.insert(std::make_pair(*it, std::make_pair(it - spectators.begin(), 0.)));
+  // add spectator variables
+  for (std::vector<std::string>::const_iterator it = spectators.begin(); it != spectators.end(); ++it)
+    mSpectators.insert(std::make_pair(*it, std::make_pair(it - spectators.begin(), 0.)));
 
-    // do not take ownership if getting GBRForest from an external source
-    mGBRForest = std::shared_ptr<const GBRForest>(gbrForest, [](const GBRForest*) {});
+  // do not take ownership if getting GBRForest from an external source
+  mGBRForest = std::shared_ptr<const GBRForest>(gbrForest, [](const GBRForest*) {});
 
-    mIsInitialized = true;
-    mUsingGBRForest = true;
-    mUseAdaBoost = useAdaBoost;
+  mIsInitialized = true;
+  mUsingGBRForest = true;
+  mUseAdaBoost = useAdaBoost;
 }
 
-void TMVAEvaluator::initializeGBRForest(const edm::EventSetup& iSetup, const std::string& label,
-    const std::vector<std::string>& variables, const std::vector<std::string>& spectators, bool useAdaBoost)
-{
-    edm::ESHandle<GBRForest> gbrForestHandle;
+void TMVAEvaluator::initializeGBRForest(const edm::EventSetup& iSetup,
+                                        const std::string& label,
+                                        const std::vector<std::string>& variables,
+                                        const std::vector<std::string>& spectators,
+                                        bool useAdaBoost) {
+  edm::ESHandle<GBRForest> gbrForestHandle;
 
-    iSetup.get<GBRWrapperRcd>().get(label.c_str(), gbrForestHandle);
+  iSetup.get<GBRWrapperRcd>().get(label.c_str(), gbrForestHandle);
 
-    initializeGBRForest(gbrForestHandle.product(), variables, spectators, useAdaBoost);
+  initializeGBRForest(gbrForestHandle.product(), variables, spectators, useAdaBoost);
 }
 
-float TMVAEvaluator::evaluateTMVA(const std::map<std::string, float>& inputs, bool useSpectators) const
-{
-    // default value
-    float value = -99.;
-
-    // TMVA::Reader is not thread safe
-    std::lock_guard<std::mutex> lock(m_mutex);
-
-    // set the input variable values
-    for (auto it = mVariables.begin(); it != mVariables.end(); ++it) {
-        if (inputs.count(it->first) > 0)
-            it->second.second = inputs.at(it->first);
-        else
-            edm::LogError("MissingInputVariable")
-                << "Input variable " << it->first
-                << " is missing from the list of inputs. The returned discriminator value might not be sensible.";
-    }
+float TMVAEvaluator::evaluateTMVA(const std::map<std::string, float>& inputs, bool useSpectators) const {
+  // default value
+  float value = -99.;
 
-    // if using spectator variables
-    if (useSpectators) {
-        // set the spectator variable values
-        for (auto it = mSpectators.begin(); it != mSpectators.end(); ++it) {
-            if (inputs.count(it->first) > 0)
-                it->second.second = inputs.at(it->first);
-            else
-                edm::LogError("MissingSpectatorVariable")
-                    << "Spectator variable " << it->first
-                    << " is missing from the list of inputs. The returned discriminator value might not be sensible.";
-        }
+  // TMVA::Reader is not thread safe
+  std::lock_guard<std::mutex> lock(m_mutex);
+
+  // set the input variable values
+  for (auto it = mVariables.begin(); it != mVariables.end(); ++it) {
+    if (inputs.count(it->first) > 0)
+      it->second.second = inputs.at(it->first);
+    else
+      edm::LogError("MissingInputVariable")
+          << "Input variable " << it->first
+          << " is missing from the list of inputs. The returned discriminator value might not be sensible.";
+  }
+
+  // if using spectator variables
+  if (useSpectators) {
+    // set the spectator variable values
+    for (auto it = mSpectators.begin(); it != mSpectators.end(); ++it) {
+      if (inputs.count(it->first) > 0)
+        it->second.second = inputs.at(it->first);
+      else
+        edm::LogError("MissingSpectatorVariable")
+            << "Spectator variable " << it->first
+            << " is missing from the list of inputs. The returned discriminator value might not be sensible.";
     }
+  }
 
-    // evaluate the MVA
-    value = mReader->EvaluateMVA(mMethod.c_str());
+  // evaluate the MVA
+  value = mReader->EvaluateMVA(mMethod.c_str());
 
-    return value;
+  return value;
 }
 
-float TMVAEvaluator::evaluateGBRForest(const std::map<std::string, float>& inputs) const
-{
-    // default value
-    float value = -99.;
-
-    std::unique_ptr<float[]> vars(new float[mVariables.size()]); // allocate n floats
-
-    // set the input variable values
-    for (auto it = mVariables.begin(); it != mVariables.end(); ++it) {
-        if (inputs.count(it->first) > 0)
-            vars[it->second.first] = inputs.at(it->first);
-        else
-            edm::LogError("MissingInputVariable")
-                << "Input variable " << it->first
-                << " is missing from the list of inputs. The returned discriminator value might not be sensible.";
-    }
+float TMVAEvaluator::evaluateGBRForest(const std::map<std::string, float>& inputs) const {
+  // default value
+  float value = -99.;
 
-    // evaluate the MVA
-    if (mUseAdaBoost)
-        value = mGBRForest->GetAdaBoostClassifier(vars.get());
-    else
-        value = mGBRForest->GetGradBoostClassifier(vars.get());
+  std::unique_ptr<float[]> vars(new float[mVariables.size()]);  // allocate n floats
 
-    return value;
+  // set the input variable values
+  for (auto it = mVariables.begin(); it != mVariables.end(); ++it) {
+    if (inputs.count(it->first) > 0)
+      vars[it->second.first] = inputs.at(it->first);
+    else
+      edm::LogError("MissingInputVariable")
+          << "Input variable " << it->first
+          << " is missing from the list of inputs. The returned discriminator value might not be sensible.";
+  }
+
+  // evaluate the MVA
+  if (mUseAdaBoost)
+    value = mGBRForest->GetAdaBoostClassifier(vars.get());
+  else
+    value = mGBRForest->GetGradBoostClassifier(vars.get());
+
+  return value;
 }
 
-float TMVAEvaluator::evaluate(const std::map<std::string, float>& inputs, bool useSpectators) const
-{
-    // default value
-    float value = -99.;
+float TMVAEvaluator::evaluate(const std::map<std::string, float>& inputs, bool useSpectators) const {
+  // default value
+  float value = -99.;
 
-    if (!mIsInitialized) {
-        edm::LogError("InitializationError") << "TMVAEvaluator not properly initialized.";
-        return value;
-    }
+  if (!mIsInitialized) {
+    edm::LogError("InitializationError") << "TMVAEvaluator not properly initialized.";
+    return value;
+  }
 
-    if (useSpectators && inputs.size() < (mVariables.size() + mSpectators.size())) {
-        edm::LogError("MissingInputs") << "Too few inputs provided (" << inputs.size() << " provided but "
-                                       << mVariables.size() << " input and " << mSpectators.size()
-                                       << " spectator variables expected).";
-        return value;
-    } else if (inputs.size() < mVariables.size()) {
-        edm::LogError("MissingInputVariable(s)") << "Too few input variables provided (" << inputs.size()
-                                                 << " provided but " << mVariables.size() << " expected).";
-        return value;
-    }
+  if (useSpectators && inputs.size() < (mVariables.size() + mSpectators.size())) {
+    edm::LogError("MissingInputs") << "Too few inputs provided (" << inputs.size() << " provided but "
+                                   << mVariables.size() << " input and " << mSpectators.size()
+                                   << " spectator variables expected).";
+    return value;
+  } else if (inputs.size() < mVariables.size()) {
+    edm::LogError("MissingInputVariable(s)") << "Too few input variables provided (" << inputs.size()
+                                             << " provided but " << mVariables.size() << " expected).";
+    return value;
+  }
 
-    if (mUsingGBRForest) {
-        if (useSpectators)
-            edm::LogWarning("UnsupportedFunctionality")
-                << "Use of spectator variables with GBRForest is not supported. Spectator variables will be ignored.";
-        value = evaluateGBRForest(inputs);
-    } else
-        value = evaluateTMVA(inputs, useSpectators);
+  if (mUsingGBRForest) {
+    if (useSpectators)
+      edm::LogWarning("UnsupportedFunctionality")
+          << "Use of spectator variables with GBRForest is not supported. Spectator variables will be ignored.";
+    value = evaluateGBRForest(inputs);
+  } else
+    value = evaluateTMVA(inputs, useSpectators);
 
-    return value;
+  return value;
 }
diff --git a/CommonTools/MVAUtils/src/TMVAZipReader.cc b/CommonTools/MVAUtils/src/TMVAZipReader.cc
index 0188978a732a9..b8df74170f3fe 100644
--- a/CommonTools/MVAUtils/src/TMVAZipReader.cc
+++ b/CommonTools/MVAUtils/src/TMVAZipReader.cc
@@ -8,105 +8,102 @@
 using namespace std;
 
 // From http://stackoverflow.com/questions/874134/find-if-string-endswith-another-string-in-c
-bool reco::details::hasEnding(std::string const& fullString, std::string const& ending)
-{
-    if (fullString.length() >= ending.length()) {
-        return (0 == fullString.compare(fullString.length() - ending.length(), ending.length(), ending));
-    } else {
-        return false;
-    }
+bool reco::details::hasEnding(std::string const& fullString, std::string const& ending) {
+  if (fullString.length() >= ending.length()) {
+    return (0 == fullString.compare(fullString.length() - ending.length(), ending.length(), ending));
+  } else {
+    return false;
+  }
 }
 
-char* reco::details::readGzipFile(const std::string& weightFile)
-{
-    FILE* f = fopen(weightFile.c_str(), "r");
-    if (f == nullptr) {
-        throw cms::Exception("InvalidFileState") << "Failed to open MVA file = " << weightFile << " !!\n";
-    }
-    int magic;
-    int size;
-    fread(&magic, 4, 1, f);
-    fseek(f, -4, SEEK_END);
-    fread(&size, 4, 1, f);
-    fclose(f);
-    // printf("%x, %i\n", magic, size);
+char* reco::details::readGzipFile(const std::string& weightFile) {
+  FILE* f = fopen(weightFile.c_str(), "r");
+  if (f == nullptr) {
+    throw cms::Exception("InvalidFileState") << "Failed to open MVA file = " << weightFile << " !!\n";
+  }
+  int magic;
+  int size;
+  fread(&magic, 4, 1, f);
+  fseek(f, -4, SEEK_END);
+  fread(&size, 4, 1, f);
+  fclose(f);
+  // printf("%x, %i\n", magic, size);
 
-    gzFile file = gzopen(weightFile.c_str(), "r");
+  gzFile file = gzopen(weightFile.c_str(), "r");
 
-    int bytes_read;
-    char* buffer = (char*)malloc(size);
-    bytes_read = gzread(file, buffer, size - 1);
-    buffer[bytes_read] = '\0';
-    if (!gzeof(file)) {
-        int err;
-        const char* error_string;
-        error_string = gzerror(file, &err);
-        if (err) {
-            free(buffer);
-            throw cms::Exception("InvalidFileState") << "Error while reading gzipped file = "
-                                                     << weightFile << " !!\n" << error_string;
-        }
+  int bytes_read;
+  char* buffer = (char*)malloc(size);
+  bytes_read = gzread(file, buffer, size - 1);
+  buffer[bytes_read] = '\0';
+  if (!gzeof(file)) {
+    int err;
+    const char* error_string;
+    error_string = gzerror(file, &err);
+    if (err) {
+      free(buffer);
+      throw cms::Exception("InvalidFileState") << "Error while reading gzipped file = " << weightFile << " !!\n"
+                                               << error_string;
     }
-    gzclose(file);
-    return buffer;
+  }
+  gzclose(file);
+  return buffer;
 }
 
-TMVA::IMethod* reco::details::loadTMVAWeights(
-    TMVA::Reader* reader, const std::string& method, const std::string& weightFile, bool verbose)
-{
+TMVA::IMethod* reco::details::loadTMVAWeights(TMVA::Reader* reader,
+                                              const std::string& method,
+                                              const std::string& weightFile,
+                                              bool verbose) {
+  TMVA::IMethod* ptr = nullptr;
 
-    TMVA::IMethod* ptr = nullptr;
+  verbose = false;
+  if (verbose)
+    std::cout << "Booking TMVA Reader with " << method << " and weight file: " << weightFile << std::endl;
 
-    verbose = false;
+  if (reco::details::hasEnding(weightFile, ".xml")) {
     if (verbose)
-        std::cout << "Booking TMVA Reader with " << method << " and weight file: " << weightFile << std::endl;
-
-    if (reco::details::hasEnding(weightFile, ".xml")) {
-        if (verbose)
-            std::cout << "Weight file is pure xml." << std::endl;
-        // Let TMVA read the file
-        ptr = reader->BookMVA(method, weightFile);
-    } else if (reco::details::hasEnding(weightFile, ".gz") || reco::details::hasEnding(weightFile, ".gzip")) {
-        if (verbose)
-            std::cout << "Unzipping file." << std::endl;
-        char* c = readGzipFile(weightFile);
-
-        // We can't use tmpnam, gcc emits a warning about security.
-        // This is also technically insecure in the same way, since we append
-        // a suffix and then open another file.
-        char tmpFilename[] = "/tmp/tmva.XXXXXX";
-        int fdToUselessFile = mkstemp(tmpFilename);
-        std::string weight_file_name(tmpFilename);
-        weight_file_name += ".xml";
-        FILE* theActualFile = fopen(weight_file_name.c_str(), "w");
-        if (theActualFile != nullptr) {
-            // write xml
-            fputs(c, theActualFile);
-            fputs("\n", theActualFile);
-            fclose(theActualFile);
-            close(fdToUselessFile);
-        } else {
-            throw cms::Exception("CannotWriteFile") << "Error while writing file = " << weight_file_name << " !!\n";
-        }
-        if (verbose)
-            std::cout << "Booking MvA" << std::endl;
-        ptr = reader->BookMVA(method, weight_file_name);
-        if (verbose)
-            std::cout << "Cleaning up" << std::endl;
-        remove(weight_file_name.c_str());
-        remove(tmpFilename);
+      std::cout << "Weight file is pure xml." << std::endl;
+    // Let TMVA read the file
+    ptr = reader->BookMVA(method, weightFile);
+  } else if (reco::details::hasEnding(weightFile, ".gz") || reco::details::hasEnding(weightFile, ".gzip")) {
+    if (verbose)
+      std::cout << "Unzipping file." << std::endl;
+    char* c = readGzipFile(weightFile);
 
-        // Someday this will work.
-        // reader->BookMVA(TMVA::Types::Instance().GetMethodType(TString(method)), c);
-        if (verbose) {
-            std::cout << "Reader booked" << std::endl;
-        }
-        free(c);
+    // We can't use tmpnam, gcc emits a warning about security.
+    // This is also technically insecure in the same way, since we append
+    // a suffix and then open another file.
+    char tmpFilename[] = "/tmp/tmva.XXXXXX";
+    int fdToUselessFile = mkstemp(tmpFilename);
+    std::string weight_file_name(tmpFilename);
+    weight_file_name += ".xml";
+    FILE* theActualFile = fopen(weight_file_name.c_str(), "w");
+    if (theActualFile != nullptr) {
+      // write xml
+      fputs(c, theActualFile);
+      fputs("\n", theActualFile);
+      fclose(theActualFile);
+      close(fdToUselessFile);
     } else {
-        throw cms::Exception("BadTMVAWeightFilename")
-            << "I don't understand the extension on the filename: " << weightFile
-            << ", it should be .xml, .gz, or .gzip" << std::endl;
+      throw cms::Exception("CannotWriteFile") << "Error while writing file = " << weight_file_name << " !!\n";
+    }
+    if (verbose)
+      std::cout << "Booking MvA" << std::endl;
+    ptr = reader->BookMVA(method, weight_file_name);
+    if (verbose)
+      std::cout << "Cleaning up" << std::endl;
+    remove(weight_file_name.c_str());
+    remove(tmpFilename);
+
+    // Someday this will work.
+    // reader->BookMVA(TMVA::Types::Instance().GetMethodType(TString(method)), c);
+    if (verbose) {
+      std::cout << "Reader booked" << std::endl;
     }
+    free(c);
+  } else {
+    throw cms::Exception("BadTMVAWeightFilename") << "I don't understand the extension on the filename: " << weightFile
+                                                  << ", it should be .xml, .gz, or .gzip" << std::endl;
+  }
 
-    return ptr;
+  return ptr;
 }
diff --git a/RecoPixelVertexing/PixelTriplets/plugins/KDTreeLinkerAlgo.h b/CommonTools/RecoAlgos/interface/KDTreeLinkerAlgo.h
similarity index 58%
rename from RecoPixelVertexing/PixelTriplets/plugins/KDTreeLinkerAlgo.h
rename to CommonTools/RecoAlgos/interface/KDTreeLinkerAlgo.h
index aa85c146cd6f4..848b7cf067117 100644
--- a/RecoPixelVertexing/PixelTriplets/plugins/KDTreeLinkerAlgo.h
+++ b/CommonTools/RecoAlgos/interface/KDTreeLinkerAlgo.h
@@ -6,102 +6,83 @@
 #include <cassert>
 #include <vector>
 
-// Class that implements the KDTree partition of 2D space and 
+// Class that implements the KDTree partition of 2D space and
 // a closest point search algorithme.
 
 template <typename DATA>
-class KDTreeLinkerAlgo
-{
- public:
+class KDTreeLinkerAlgo {
+public:
   KDTreeLinkerAlgo();
-  
+
   // Dtor calls clear()
   ~KDTreeLinkerAlgo();
-  
+
   // Here we build the KD tree from the "eltList" in the space define by "region".
-  void build(std::vector<KDTreeNodeInfo<DATA> > 	&eltList,
-	     const KDTreeBox				&region);
-  
-  // Here we search in the KDTree for all points that would be 
+  void build(std::vector<KDTreeNodeInfo<DATA> > &eltList, const KDTreeBox &region);
+
+  // Here we search in the KDTree for all points that would be
   // contained in the given searchbox. The founded points are stored in resRecHitList.
-  void search(const KDTreeBox				&searchBox,
-	      std::vector<DATA>	&resRecHitList);
+  void search(const KDTreeBox &searchBox, std::vector<DATA> &resRecHitList);
 
   // This reurns true if the tree is empty
-  bool empty() {return nodePool_.empty();}
+  bool empty() { return nodePool_.empty(); }
 
   // This returns the number of nodes + leaves in the tree
   // (nElements should be (size() +1)/2)
-  int size() { return nodePool_.size();}
+  int size() { return nodePool_.size(); }
 
   // This method clears all allocated structures.
   void clear();
-  
- private:
+
+private:
   // The node pool allow us to do just 1 call to new for each tree building.
   KDTreeNodes<DATA> nodePool_;
-  
-  std::vector<DATA>	*closestNeighbour;
-  std::vector<KDTreeNodeInfo<DATA> >	*initialEltList;
-  
- private:
- 
+
+  std::vector<DATA> *closestNeighbour;
+  std::vector<KDTreeNodeInfo<DATA> > *initialEltList;
+
+private:
   //Fast median search with Wirth algorithm in eltList between low and high indexes.
-  int medianSearch(int					low,
-		   int					high,
-		   int					treeDepth);
+  int medianSearch(int low, int high, int treeDepth);
 
   // Recursif kdtree builder. Is called by build()
-  int recBuild(int				low,
-               int				hight,
-               int				depth);
+  int recBuild(int low, int hight, int depth);
 
   // Recursif kdtree search. Is called by search()
-  void recSearch(int			current,
-                 float dimCurrMin, float dimCurrMax,
-                 float dimOtherMin, float dimOtherMax);
+  void recSearch(int current, float dimCurrMin, float dimCurrMax, float dimOtherMin, float dimOtherMax);
 
-  // This method frees the KDTree.     
+  // This method frees the KDTree.
   void clearTree();
 };
 
-
 //Implementation
 
-template < typename DATA >
-void
-KDTreeLinkerAlgo<DATA>::build(std::vector<KDTreeNodeInfo<DATA> >	&eltList, 
-			      const KDTreeBox				&region)
-{
+template <typename DATA>
+void KDTreeLinkerAlgo<DATA>::build(std::vector<KDTreeNodeInfo<DATA> > &eltList, const KDTreeBox &region) {
   if (!eltList.empty()) {
     initialEltList = &eltList;
-    
+
     size_t size = initialEltList->size();
     nodePool_.build(size);
-    
+
     // Here we build the KDTree
     int root = recBuild(0, size, 0);
     assert(root == 0);
-    
+
     initialEltList = nullptr;
   }
 }
- 
+
 //Fast median search with Wirth algorithm in eltList between low and high indexes.
-template < typename DATA >
-int
-KDTreeLinkerAlgo<DATA>::medianSearch(int	low,
-				     int	high,
-				     int	treeDepth)
-{
+template <typename DATA>
+int KDTreeLinkerAlgo<DATA>::medianSearch(int low, int high, int treeDepth) {
   int nbrElts = high - low;
-  int median = (nbrElts & 1)	? nbrElts / 2 
-				: nbrElts / 2 - 1;
+  int median = (nbrElts & 1) ? nbrElts / 2 : nbrElts / 2 - 1;
   median += low;
 
   int l = low;
   int m = high - 1;
-  
+
   while (l < m) {
     KDTreeNodeInfo<DATA> elt = (*initialEltList)[median];
     int i = l;
@@ -111,33 +92,34 @@ KDTreeLinkerAlgo<DATA>::medianSearch(int	low,
       // The even depth is associated to dim1 dimension
       // The odd one to dim2 dimension
       if (treeDepth & 1) {
-	while ((*initialEltList)[i].dim[1] < elt.dim[1]) i++;
-	while ((*initialEltList)[j].dim[1] > elt.dim[1]) j--;
+        while ((*initialEltList)[i].dim[1] < elt.dim[1])
+          i++;
+        while ((*initialEltList)[j].dim[1] > elt.dim[1])
+          j--;
       } else {
-	while ((*initialEltList)[i].dim[0] < elt.dim[0]) i++;
-	while ((*initialEltList)[j].dim[0] > elt.dim[0]) j--;
+        while ((*initialEltList)[i].dim[0] < elt.dim[0])
+          i++;
+        while ((*initialEltList)[j].dim[0] > elt.dim[0])
+          j--;
       }
 
-      if (i <= j){
-	std::swap((*initialEltList)[i], (*initialEltList)[j]);
-	i++; 
-	j--;
+      if (i <= j) {
+        std::swap((*initialEltList)[i], (*initialEltList)[j]);
+        i++;
+        j--;
       }
     } while (i <= j);
-    if (j < median) l = i;
-    if (i > median) m = j;
+    if (j < median)
+      l = i;
+    if (i > median)
+      m = j;
   }
 
   return median;
 }
 
-
-
-template < typename DATA >
-void
-KDTreeLinkerAlgo<DATA>::search(const KDTreeBox		&trackBox,
-			 std::vector<DATA> &recHits)
-{
+template <typename DATA>
+void KDTreeLinkerAlgo<DATA>::search(const KDTreeBox &trackBox, std::vector<DATA> &recHits) {
   if (!empty()) {
     closestNeighbour = &recHits;
     recSearch(0, trackBox.dim1min, trackBox.dim1max, trackBox.dim2min, trackBox.dim2max);
@@ -145,20 +127,16 @@ KDTreeLinkerAlgo<DATA>::search(const KDTreeBox		&trackBox,
   }
 }
 
-
-template < typename DATA >
-void 
-KDTreeLinkerAlgo<DATA>::recSearch(int	current,
-                                  float dimCurrMin, float dimCurrMax,
-                                  float dimOtherMin, float dimOtherMax)
-{
+template <typename DATA>
+void KDTreeLinkerAlgo<DATA>::recSearch(
+    int current, float dimCurrMin, float dimCurrMax, float dimOtherMin, float dimOtherMax) {
   // Iterate until leaf is found, or there are no children in the
   // search window. If search has to proceed on both children, proceed
   // the search to left child via recursion. Swap search window
   // dimension on alternate levels.
-  while(true) {
+  while (true) {
     int right = nodePool_.right[current];
-    if(nodePool_.isLeaf(right)) {
+    if (nodePool_.isLeaf(right)) {
       float dimCurr = nodePool_.median[current];
 
       // If point inside the rectangle/area
@@ -166,15 +144,14 @@ KDTreeLinkerAlgo<DATA>::recSearch(int	current,
       // performance. It is faster to always do all comparisons than to
       // allow use of branches to not do some if any of the first ones
       // is false.
-      if((dimCurr >= dimCurrMin) & (dimCurr <= dimCurrMax)) {
+      if ((dimCurr >= dimCurrMin) & (dimCurr <= dimCurrMax)) {
         float dimOther = nodePool_.dimOther[current];
-        if((dimOther >= dimOtherMin) & (dimOther <= dimOtherMax)) {
+        if ((dimOther >= dimOtherMin) & (dimOther <= dimOtherMax)) {
           closestNeighbour->push_back(nodePool_.data[current]);
         }
       }
       break;
-    }
-    else {
+    } else {
       float median = nodePool_.median[current];
 
       bool goLeft = (dimCurrMin <= median);
@@ -183,19 +160,16 @@ KDTreeLinkerAlgo<DATA>::recSearch(int	current,
       // Swap dimension for the next search level
       std::swap(dimCurrMin, dimOtherMin);
       std::swap(dimCurrMax, dimOtherMax);
-      if(goLeft & goRight) {
-        int left = current+1;
+      if (goLeft & goRight) {
+        int left = current + 1;
         recSearch(left, dimCurrMin, dimCurrMax, dimOtherMin, dimOtherMax);
         // continue with right
         current = right;
-      }
-      else if(goLeft) {
+      } else if (goLeft) {
         ++current;
-      }
-      else if(goRight) {
+      } else if (goRight) {
         current = right;
-      }
-      else {
+      } else {
         break;
       }
     }
@@ -203,52 +177,39 @@ KDTreeLinkerAlgo<DATA>::recSearch(int	current,
 }
 
 template <typename DATA>
-KDTreeLinkerAlgo<DATA>::KDTreeLinkerAlgo()
-{
-}
+KDTreeLinkerAlgo<DATA>::KDTreeLinkerAlgo() {}
 
 template <typename DATA>
-KDTreeLinkerAlgo<DATA>::~KDTreeLinkerAlgo()
-{
+KDTreeLinkerAlgo<DATA>::~KDTreeLinkerAlgo() {
   clear();
 }
 
-
 template <typename DATA>
-void 
-KDTreeLinkerAlgo<DATA>::clearTree()
-{
+void KDTreeLinkerAlgo<DATA>::clearTree() {
   nodePool_.clear();
 }
 
 template <typename DATA>
-void 
-KDTreeLinkerAlgo<DATA>::clear()
-{
+void KDTreeLinkerAlgo<DATA>::clear() {
   clearTree();
 }
 
-
 template <typename DATA>
-int
-KDTreeLinkerAlgo<DATA>::recBuild(int					low, 
-                                 int					high, 
-                                 int					depth)
-{
+int KDTreeLinkerAlgo<DATA>::recBuild(int low, int high, int depth) {
   int portionSize = high - low;
-  int dimIndex = depth&1;
+  int dimIndex = depth & 1;
 
-  if (portionSize == 1) { // Leaf case
+  if (portionSize == 1) {  // Leaf case
     int leaf = nodePool_.getNextNode();
-    const KDTreeNodeInfo<DATA>& info = (*initialEltList)[low];
+    const KDTreeNodeInfo<DATA> &info = (*initialEltList)[low];
     nodePool_.right[leaf] = 0;
-    nodePool_.median[leaf] = info.dim[dimIndex]; // dimCurrent
-    nodePool_.dimOther[leaf] = info.dim[1-dimIndex];
+    nodePool_.median[leaf] = info.dim[dimIndex];  // dimCurrent
+    nodePool_.dimOther[leaf] = info.dim[1 - dimIndex];
     nodePool_.data[leaf] = info.data;
     return leaf;
 
-  } else { // Node case
-    
+  } else {  // Node case
+
     // The even depth is associated to dim1 dimension
     // The odd one to dim2 dimension
     int medianId = medianSearch(low, high, depth);
@@ -263,7 +224,7 @@ KDTreeLinkerAlgo<DATA>::recBuild(int					low,
 
     // We recursively build the son nodes
     int left = recBuild(low, medianId, depth);
-    assert(nodeInd+1 == left);
+    assert(nodeInd + 1 == left);
     nodePool_.right[nodeInd] = recBuild(medianId, high, depth);
 
     return nodeInd;
diff --git a/RecoPixelVertexing/PixelTriplets/plugins/KDTreeLinkerTools.h b/CommonTools/RecoAlgos/interface/KDTreeLinkerTools.h
similarity index 70%
rename from RecoPixelVertexing/PixelTriplets/plugins/KDTreeLinkerTools.h
rename to CommonTools/RecoAlgos/interface/KDTreeLinkerTools.h
index 3cddaea54b7c4..857790fe62180 100644
--- a/RecoPixelVertexing/PixelTriplets/plugins/KDTreeLinkerTools.h
+++ b/CommonTools/RecoAlgos/interface/KDTreeLinkerTools.h
@@ -8,50 +8,35 @@
 // It's used in KDTree building step to divide the detector
 // space (ECAL, HCAL...) and in searching step to create a bounding
 // box around the demanded point (Track collision point, PS projection...).
-struct KDTreeBox
-{
+struct KDTreeBox {
   float dim1min, dim1max;
   float dim2min, dim2max;
-  
-  public:
-
-  KDTreeBox(float d1min, float d1max, 
-	    float d2min, float d2max)
-    : dim1min (d1min), dim1max(d1max)
-    , dim2min (d2min), dim2max(d2max)
-  {}
-
-  KDTreeBox()
-    : dim1min (0), dim1max(0)
-    , dim2min (0), dim2max(0)
-  {}
+
+public:
+  KDTreeBox(float d1min, float d1max, float d2min, float d2max)
+      : dim1min(d1min), dim1max(d1max), dim2min(d2min), dim2max(d2max) {}
+
+  KDTreeBox() : dim1min(0), dim1max(0), dim2min(0), dim2max(0) {}
 };
 
-  
 // Data stored in each KDTree node.
 // The dim1/dim2 fields are usually the duplication of some PFRecHit values
 // (eta/phi or x/y). But in some situations, phi field is shifted by +-2.Pi
 template <typename DATA>
-struct KDTreeNodeInfo 
-{
+struct KDTreeNodeInfo {
   DATA data;
   float dim[2];
-  enum {kDim1=0, kDim2=1};
-
-  public:
-  KDTreeNodeInfo()
-  {}
-  
-  KDTreeNodeInfo(const DATA&	d,
-		 float		dim_1,
-		 float		dim_2)
-    : data(d), dim{dim_1, dim_2}
-  {}
+  enum { kDim1 = 0, kDim2 = 1 };
+
+public:
+  KDTreeNodeInfo() {}
+
+  KDTreeNodeInfo(const DATA& d, float dim_1, float dim_2) : data(d), dim{dim_1, dim_2} {}
 };
 
 template <typename DATA>
 struct KDTreeNodes {
-  std::vector<float> median; // or dimCurrent;
+  std::vector<float> median;  // or dimCurrent;
   std::vector<int> right;
   std::vector<float> dimOther;
   std::vector<DATA> data;
@@ -59,7 +44,7 @@ struct KDTreeNodes {
   int poolSize;
   int poolPos;
 
-  constexpr KDTreeNodes(): poolSize(-1), poolPos(-1) {}
+  constexpr KDTreeNodes() : poolSize(-1), poolPos(-1) {}
 
   bool empty() const { return poolPos == -1; }
   int size() const { return poolPos + 1; }
@@ -79,7 +64,7 @@ struct KDTreeNodes {
   }
 
   void build(int sizeData) {
-    poolSize = sizeData*2-1;
+    poolSize = sizeData * 2 - 1;
     median.resize(poolSize);
     right.resize(poolSize);
     dimOther.resize(poolSize);
@@ -94,9 +79,7 @@ struct KDTreeNodes {
     return right < 2;
   }
 
-  bool isLeafIndex(int index) const {
-    return isLeaf(right[index]);
-  }
+  bool isLeafIndex(int index) const { return isLeaf(right[index]); }
 };
 
 #endif
diff --git a/CommonTools/RecoAlgos/interface/PixelMatchGsfElectronSelector.h b/CommonTools/RecoAlgos/interface/PixelMatchGsfElectronSelector.h
deleted file mode 100755
index 361d7ab3fcfd4..0000000000000
--- a/CommonTools/RecoAlgos/interface/PixelMatchGsfElectronSelector.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#warning This file moved. Please, include #include "CommonTools/RecoAlgos/interface/GsfElectronbSelector.h"
-#include "CommonTools/RecoAlgos/interface/GsfElectronbSelector.h"
diff --git a/CommonTools/TriggerUtils/plugins/CandidateTriggerObjectProducer.cc b/CommonTools/TriggerUtils/plugins/CandidateTriggerObjectProducer.cc
index 3b750618d6a26..82cf43608d0cb 100644
--- a/CommonTools/TriggerUtils/plugins/CandidateTriggerObjectProducer.cc
+++ b/CommonTools/TriggerUtils/plugins/CandidateTriggerObjectProducer.cc
@@ -147,7 +147,8 @@ CandidateTriggerObjectProducer::produce(edm::Event & iEvent, const edm::EventSet
  	  // check whether the module is packed up in TriggerEvent product
 	  const unsigned int filterIndex(triggerEventHandle_->filterIndex(InputTag(moduleLabel,"",triggerEventTag_.process())));
 	  if (filterIndex<triggerEventHandle_->sizeFilters()) {
-	    //	    std::cout << " 'L3' filter in slot " << imodule << " - label/type " << moduleLabel << "/" << moduleType << std::endl;
+	    //	    std::cout << " 'L3' filter in slot " << imodule 
+	    //	              << " - label/type " << moduleLabel << "/" << moduleType << std::endl;
 	    const Vids& VIDS (triggerEventHandle_->filterIds(filterIndex));
 	    const Keys& KEYS(triggerEventHandle_->filterKeys(filterIndex));
 	    const size_type nI(VIDS.size());
@@ -160,8 +161,8 @@ CandidateTriggerObjectProducer::produce(edm::Event & iEvent, const edm::EventSet
 	      const TriggerObject& TO(TOC[KEYS[i]]);
 	      coll->push_back(reco::LeafCandidate( 0, TO.particle().p4(), reco::Particle::Point( 0., 0., 0. ), TO.id() ));
 // 	      std::cout << "   " << i << " " << VIDS[i] << "/" << KEYS[i] << ": "
-// 			<< TO.id() << " " << TO.pt() << " " << TO.eta() << " " << TO.phi() << " " << TO.mass()
-// 			<< std::endl;
+//                      << TO.id() << " " << TO.pt() << " " << TO.eta() << " " << TO.phi() << " " << TO.mass()
+//                      << std::endl;
 	    }
 	  }
 	}
diff --git a/CommonTools/Utils/BuildFile.xml b/CommonTools/Utils/BuildFile.xml
index d03fe200870cb..3da01739443ba 100644
--- a/CommonTools/Utils/BuildFile.xml
+++ b/CommonTools/Utils/BuildFile.xml
@@ -1,6 +1,5 @@
 <use   name="FWCore/Utilities"/>
 <use   name="FWCore/MessageLogger"/>
-<use   name="CondFormats/DataRecord"/>
 <use   name="boost"/>
 <use   name="roothistmatrix"/>
 <export>
diff --git a/CondCore/EcalPlugins/plugins/EcalPedestals_PayloadInspector.cc b/CondCore/EcalPlugins/plugins/EcalPedestals_PayloadInspector.cc
index 678c7184926f5..9f89d70580963 100755
--- a/CondCore/EcalPlugins/plugins/EcalPedestals_PayloadInspector.cc
+++ b/CondCore/EcalPlugins/plugins/EcalPedestals_PayloadInspector.cc
@@ -460,7 +460,7 @@ namespace {
 			EErms[0] = EErms[0] + diff * diff;
 			EEtot[0]++;
 		      }
-		      //		      else std::cout << " gain 12 chan " << index << " diff " << diff << std::endl;
+		      //else std::cout << " gain 12 chan " << index << " diff " << diff << std::endl;
 		      endc_p_m[1]->Fill(ix, iy, (*payload)[rawid].mean_x6 - meanEE[1][index]);
 		      diff = (*payload)[rawid].rms_x6 - rmsEE[1][index];
 		      endc_p_r[1]->Fill(ix, iy, diff);
@@ -469,7 +469,7 @@ namespace {
 			EErms[1] = EErms[1] + diff * diff;
 			EEtot[1]++;
 		      }
-		      //		      else std::cout << " gain 6 chan " << index << " diff " << diff << std::endl;
+		      //else std::cout << " gain 6 chan " << index << " diff " << diff << std::endl;
 		      endc_p_m[2]->Fill(ix, iy, (*payload)[rawid].mean_x1 - meanEE[2][index]);
 		      diff = (*payload)[rawid].rms_x1 - rmsEE[2][index];
 		      endc_p_r[2]->Fill(ix, iy, diff);
@@ -478,7 +478,7 @@ namespace {
 			EErms[2] = EErms[2] + diff * diff;
 			EEtot[2]++;
 		      }
-		      //		      else std::cout << " gain 1 chan " << index << " diff " << diff << std::endl;
+		      //else std::cout << " gain 1 chan " << index << " diff " << diff << std::endl;
 		    }// EE+
 		    else { 
 		      endc_m_m[0]->Fill(ix, iy, (*payload)[rawid].mean_x12 - meanEE[0][index]);
@@ -489,7 +489,7 @@ namespace {
 			EErms[0] = EErms[0] + diff * diff;
 			EEtot[0]++;
 		      }
-		      //		      else std::cout << " gain 12 chan " << index << " diff " << diff << std::endl;
+		      //else std::cout << " gain 12 chan " << index << " diff " << diff << std::endl;
 		      endc_m_m[1]->Fill(ix, iy, (*payload)[rawid].mean_x6 - meanEE[1][index]);
 		      diff = (*payload)[rawid].rms_x6 - rmsEE[1][index];
 		      endc_m_r[1]->Fill(ix, iy, diff);
@@ -498,7 +498,7 @@ namespace {
 			EErms[1] = EErms[1] + diff * diff;
 			EEtot[1]++;
 		      }
-		      //		      else std::cout << " gain 6 chan " << index << " diff " << diff << std::endl;
+		      //else std::cout << " gain 6 chan " << index << " diff " << diff << std::endl;
 		      endc_m_m[2]->Fill(ix, iy, (*payload)[rawid].mean_x1 - meanEE[2][index]);
 		      diff = (*payload)[rawid].rms_x1 - rmsEE[2][index];
 		      endc_m_r[2]->Fill(ix, iy, diff);
@@ -507,7 +507,7 @@ namespace {
 			EErms[2] = EErms[2] + diff * diff;
 			EEtot[2]++;
 		      }
-		      //		      else std::cout << " gain 1 chan " << index << " diff " << diff << std::endl;
+		      //else std::cout << " gain 1 chan " << index << " diff " << diff << std::endl;
 		    }// EE-
 		  } // second run
 		}  // validDetId
diff --git a/CondCore/PluginSystem/interface/registration_macros.h b/CondCore/PluginSystem/interface/registration_macros.h
index abfbac5448be7..30a65cb215e6c 100644
--- a/CondCore/PluginSystem/interface/registration_macros.h
+++ b/CondCore/PluginSystem/interface/registration_macros.h
@@ -1 +1 @@
-#include "CondCore/ESSources/interface/registration_macros.h"   
+#include "CondCore/ESSources/interface/registration_macros.h"
diff --git a/CondFormats/MFObjects/interface/MagFieldConfig.h b/CondFormats/MFObjects/interface/MagFieldConfig.h
index 665497f7e1abd..fa1fc8a583e47 100644
--- a/CondFormats/MFObjects/interface/MagFieldConfig.h
+++ b/CondFormats/MFObjects/interface/MagFieldConfig.h
@@ -15,21 +15,21 @@
 #include <vector>
 #include <map>
 
-namespace edm {class ParameterSet;}
+namespace edm {
+  class ParameterSet;
+}
 
 namespace magneticfield {
   typedef std::map<int, std::pair<std::string, int> > TableFileMap;
 }
 
-
 class MagFieldConfig {
 public:
-
-  MagFieldConfig(){}
+  MagFieldConfig() {}
 
   /// Constructor
-  MagFieldConfig(const edm::ParameterSet& pset, bool debug=false);
-  
+  MagFieldConfig(const edm::ParameterSet& pset, bool debug = false);
+
   // Operations
 public:
   std::vector<unsigned> expandList(const std::string& list);
@@ -38,7 +38,7 @@ class MagFieldConfig {
   int geometryVersion;
 
   /// Version of the data tables to be used
-  std::string version;  
+  std::string version;
 
   /// Specification of which data table is to be used for each volume
   magneticfield::TableFileMap gridFiles;
@@ -46,17 +46,15 @@ class MagFieldConfig {
   /// Scaling factors for the field in specific volumes
   std::vector<int> keys;
   std::vector<double> values;
-  
+
   /// Label or type of the tracker parametrization
   std::string slaveFieldVersion;
 
   /// Parameters for the tracker parametrization
-  /// (not used in legacy producers where slaveFieldVersion is the label of the 
+  /// (not used in legacy producers where slaveFieldVersion is the label of the
   /// parametrization in the EventSetup)
   std::vector<double> slaveFieldParameters;
 
   COND_SERIALIZABLE;
 };
 #endif
-
-
diff --git a/CondFormats/MFObjects/src/MagFieldConfig.cc b/CondFormats/MFObjects/src/MagFieldConfig.cc
index 75067cb837e96..4b3853e9a0752 100644
--- a/CondFormats/MFObjects/src/MagFieldConfig.cc
+++ b/CondFormats/MFObjects/src/MagFieldConfig.cc
@@ -17,47 +17,45 @@
 using namespace std;
 using namespace magneticfield;
 
-
 MagFieldConfig::MagFieldConfig(const edm::ParameterSet& pset, bool debug) {
-  
   version = pset.getParameter<std::string>("version");
   geometryVersion = pset.getParameter<int>("geometryVersion");
 
-
   // Get specification for the grid tables to be used.
   typedef vector<edm::ParameterSet> VPSet;
-  
+
   VPSet fileSpec = pset.getParameter<VPSet>("gridFiles");
   if (!fileSpec.empty()) {
-    for(VPSet::const_iterator rule = fileSpec.begin(); rule != fileSpec.end(); ++rule){
+    for (VPSet::const_iterator rule = fileSpec.begin(); rule != fileSpec.end(); ++rule) {
       string s_volumes = rule->getParameter<string>("volumes");
-      string s_sectors = rule->getParameter<string>("sectors"); // 0 means all volumes
-      int master       = rule->getParameter<int>("master");
-      string path      = rule->getParameter<string>("path");
+      string s_sectors = rule->getParameter<string>("sectors");  // 0 means all volumes
+      int master = rule->getParameter<int>("master");
+      string path = rule->getParameter<string>("path");
 
       vector<unsigned> volumes = expandList(s_volumes);
       vector<unsigned> sectors = expandList(s_sectors);
 
       if (debug) {
-	cout << "Volumes: " << s_volumes <<" Sectors: " << s_sectors 
-	     << " Master: " << master << " Path:   " << path << endl;
-	cout << " Expanded volumes: ";
-	copy(volumes.begin(), volumes.end(), ostream_iterator<unsigned>(cout, " "));
-	cout << endl;
-	cout << " Expanded sectors: ";
-	copy(sectors.begin(), sectors.end(), ostream_iterator<unsigned>(cout, " "));
-	cout << endl;
+        cout << "Volumes: " << s_volumes << " Sectors: " << s_sectors << " Master: " << master << " Path:   " << path
+             << endl;
+        cout << " Expanded volumes: ";
+        copy(volumes.begin(), volumes.end(), ostream_iterator<unsigned>(cout, " "));
+        cout << endl;
+        cout << " Expanded sectors: ";
+        copy(sectors.begin(), sectors.end(), ostream_iterator<unsigned>(cout, " "));
+        cout << endl;
       }
-	
-      for (vector<unsigned>::iterator i = volumes.begin(); i!=volumes.end(); ++i){
-	for (vector<unsigned>::iterator j = sectors.begin(); j!=sectors.end(); ++j){
-	  unsigned vpacked = (*i)*100+(*j);
-	  if (gridFiles.find(vpacked)==gridFiles.end()) {
-	    gridFiles[vpacked] = make_pair(path, master);
-	  } else {
-	    throw cms::Exception("ConfigurationError") << "VolumeBasedMagneticFieldESProducer: malformed gridFiles config parameter" << endl;
-	  }
-	}
+
+      for (vector<unsigned>::iterator i = volumes.begin(); i != volumes.end(); ++i) {
+        for (vector<unsigned>::iterator j = sectors.begin(); j != sectors.end(); ++j) {
+          unsigned vpacked = (*i) * 100 + (*j);
+          if (gridFiles.find(vpacked) == gridFiles.end()) {
+            gridFiles[vpacked] = make_pair(path, master);
+          } else {
+            throw cms::Exception("ConfigurationError")
+                << "VolumeBasedMagneticFieldESProducer: malformed gridFiles config parameter" << endl;
+          }
+        }
       }
     }
   }
@@ -66,15 +64,13 @@ MagFieldConfig::MagFieldConfig(const edm::ParameterSet& pset, bool debug) {
   keys = pset.getParameter<vector<int> >("scalingVolumes");
   values = pset.getParameter<vector<double> >("scalingFactors");
 
-
-  // Slave field label. Either a label of an existing map (legacy support), or the 
+  // Slave field label. Either a label of an existing map (legacy support), or the
   // type of parametrization to be constructed with the "paramData" parameters.
   slaveFieldVersion = pset.getParameter<string>("paramLabel");
   // Check for compatibility with older configurations
   if (pset.existsAs<vector<double> >("paramData")) {
     slaveFieldParameters = pset.getParameter<vector<double> >("paramData");
   }
-
 }
 
 vector<unsigned> MagFieldConfig::expandList(const string& list) {
@@ -82,15 +78,16 @@ vector<unsigned> MagFieldConfig::expandList(const string& list) {
   vector<unsigned> values;
   vstring v1;
   boost::split(v1, list, boost::is_any_of(","));
-  for (vstring::const_iterator i= v1.begin(); i!=v1.end(); ++i){
+  for (vstring::const_iterator i = v1.begin(); i != v1.end(); ++i) {
     vstring v2;
-    boost::split(v2, *i, boost::is_any_of("-"));	
+    boost::split(v2, *i, boost::is_any_of("-"));
     unsigned start = boost::lexical_cast<unsigned>(v2.front());
-    unsigned end   = boost::lexical_cast<unsigned>(v2.back());
-    if ((v2.size()>2) || (start>end)) {
-      throw cms::Exception("ConfigurationError") << "VolumeBasedMagneticFieldESProducerFromDB: malformed configuration" << list << endl;
+    unsigned end = boost::lexical_cast<unsigned>(v2.back());
+    if ((v2.size() > 2) || (start > end)) {
+      throw cms::Exception("ConfigurationError")
+          << "VolumeBasedMagneticFieldESProducerFromDB: malformed configuration" << list << endl;
     }
-    for (unsigned k = start; k<=end; ++k){
+    for (unsigned k = start; k <= end; ++k) {
       values.push_back(k);
     }
   }
diff --git a/CondFormats/MFObjects/src/classes.h b/CondFormats/MFObjects/src/classes.h
index 989908011df42..b738dc7a1a0ab 100644
--- a/CondFormats/MFObjects/src/classes.h
+++ b/CondFormats/MFObjects/src/classes.h
@@ -4,4 +4,4 @@ namespace CondFormats_MFObjects {
   struct dictionary {
     MagFieldConfig conf;
   };
-}
+}  // namespace CondFormats_MFObjects
diff --git a/CondFormats/MFObjects/test/MagFieldConfigDBWriter.cc b/CondFormats/MFObjects/test/MagFieldConfigDBWriter.cc
index 11807d956c7f3..47f1f5e4080e6 100644
--- a/CondFormats/MFObjects/test/MagFieldConfigDBWriter.cc
+++ b/CondFormats/MFObjects/test/MagFieldConfigDBWriter.cc
@@ -13,59 +13,54 @@
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
 #include "CondFormats/MFObjects/interface/MagFieldConfig.h"
 
-
 class MagFieldConfigDBWriter : public edm::EDAnalyzer {
- public:
+public:
   /// Constructor
   MagFieldConfigDBWriter(const edm::ParameterSet& pset);
 
   /// Destructor
   ~MagFieldConfigDBWriter();
-  
+
   virtual void beginRun(const edm::Run& run, const edm::EventSetup& setup){};
 
-  virtual void analyze(const edm::Event& event, const edm::EventSetup& setup){}
- 
+  virtual void analyze(const edm::Event& event, const edm::EventSetup& setup) {}
+
   virtual void endJob();
-  
- private:
-  MagFieldConfig* conf;
 
+private:
+  MagFieldConfig* conf;
 };
 
-MagFieldConfigDBWriter::MagFieldConfigDBWriter(const edm::ParameterSet& pset){
-  conf = new MagFieldConfig(pset, false);  
-}
-
-MagFieldConfigDBWriter::~MagFieldConfigDBWriter(){
-  delete conf;
+MagFieldConfigDBWriter::MagFieldConfigDBWriter(const edm::ParameterSet& pset) {
+  conf = new MagFieldConfig(pset, false);
 }
 
+MagFieldConfigDBWriter::~MagFieldConfigDBWriter() { delete conf; }
 
 void MagFieldConfigDBWriter::endJob() {
-  std::string record = "MagFieldConfigRcd";  
-    // Write the ttrig object to DB
+  std::string record = "MagFieldConfigRcd";
+  // Write the ttrig object to DB
   edm::Service<cond::service::PoolDBOutputService> dbOutputSvc;
-  if(dbOutputSvc.isAvailable()){
-    try{
-      if(dbOutputSvc->isNewTagRequest(record)){
-	//create mode
-	dbOutputSvc->writeOne<MagFieldConfig>(conf, dbOutputSvc->beginOfTime(),record);
-      }else{
-	//append mode. Note: correct PoolDBESSource must be loaded
-	dbOutputSvc->writeOne<MagFieldConfig>(conf, dbOutputSvc->currentTime(),record);
+  if (dbOutputSvc.isAvailable()) {
+    try {
+      if (dbOutputSvc->isNewTagRequest(record)) {
+        //create mode
+        dbOutputSvc->writeOne<MagFieldConfig>(conf, dbOutputSvc->beginOfTime(), record);
+      } else {
+        //append mode. Note: correct PoolDBESSource must be loaded
+        dbOutputSvc->writeOne<MagFieldConfig>(conf, dbOutputSvc->currentTime(), record);
       }
-    }catch(const cond::Exception& er){
+    } catch (const cond::Exception& er) {
       std::cout << er.what() << std::endl;
-    }catch(const std::exception& er){
+    } catch (const std::exception& er) {
       std::cout << "[MagFieldConfigDBWriter] caught std::exception " << er.what() << std::endl;
-    }catch(...){
+    } catch (...) {
       std::cout << "[MagFieldConfigDBWriter] Unexpected exception" << std::endl;
     }
-  }else{
+  } else {
     std::cout << "Service PoolDBOutputService is unavailable" << std::endl;
   }
 }
 
 #include "FWCore/Framework/interface/MakerMacros.h"
-DEFINE_FWK_MODULE(MagFieldConfigDBWriter);                                                                                       
+DEFINE_FWK_MODULE(MagFieldConfigDBWriter);
diff --git a/CondFormats/MFObjects/test/testSerializationMFObjects.cpp b/CondFormats/MFObjects/test/testSerializationMFObjects.cpp
index 0c15ba94e1940..a784f9544152c 100644
--- a/CondFormats/MFObjects/test/testSerializationMFObjects.cpp
+++ b/CondFormats/MFObjects/test/testSerializationMFObjects.cpp
@@ -2,9 +2,7 @@
 
 #include "CondFormats/MFObjects/src/headers.h"
 
-
-int main()
-{
+int main() {
   testSerialization<MagFieldConfig>();
   return 0;
 }
diff --git a/CondFormats/PhysicsToolsObjects/interface/PerformanceResult.h b/CondFormats/PhysicsToolsObjects/interface/PerformanceResult.h
index 838ad68e91ba1..0b09534f30dad 100644
--- a/CondFormats/PhysicsToolsObjects/interface/PerformanceResult.h
+++ b/CondFormats/PhysicsToolsObjects/interface/PerformanceResult.h
@@ -31,8 +31,11 @@ class PerformanceResult {
     PFfaEta_BARRELH = 3011, PFfaEta_ENDCAPH = 3012, 
     PFfbEta_BARRELH = 3013, PFfbEta_ENDCAPH = 3014, 
     PFfaEta_BARRELEH = 3015, PFfaEta_ENDCAPEH = 3016, 
-    PFfbEta_BARRELEH = 3017, PFfbEta_ENDCAPEH = 3018 
-    
+    PFfbEta_BARRELEH = 3017, PFfbEta_ENDCAPEH = 3018,
+    //added by bhumika Nov 2018
+    PFfcEta_BARRELH=3019, PFfcEta_BARRELEH = 3020,
+    PFfcEta_ENDCAPH = 3021, PFfcEta_ENDCAPEH = 3022,
+    PFfdEta_ENDCAPH = 3023, PFfdEta_ENDCAPEH =3024
     
 };
   
diff --git a/CondFormats/SiPixelObjects/test/FastSiPixelFEDChannelContainerFromQuality.cc b/CondFormats/SiPixelObjects/test/FastSiPixelFEDChannelContainerFromQuality.cc
new file mode 100644
index 0000000000000..aa00bb36a5717
--- /dev/null
+++ b/CondFormats/SiPixelObjects/test/FastSiPixelFEDChannelContainerFromQuality.cc
@@ -0,0 +1,404 @@
+// -*- C++ -*-
+//
+// Package:    CondFormats/SiPixelObjects
+// Class:      FastSiPixelFEDChannelContainerFromQuality
+// 
+/**\class FastSiPixelFEDChannelContainerFromQuality FastSiPixelFEDChannelContainerFromQuality.cc CondFormats/SiPixelObjects/plugins/FastSiPixelFEDChannelContainerFromQuality.cc
+ Description: class to build the SiPixelFEDChannelContainer payloads
+*/
+//
+// Original Author:  Marco Musich
+//         Created:  Tue, 25 Apr 2019 12:04:36 GMT
+//
+//
+
+#include "CondCore/CondDB/interface/ConnectionPool.h"
+#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
+#include "CondFormats/Common/interface/Time.h"
+#include "CondFormats/Common/interface/TimeConversions.h"
+#include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
+#include "CondFormats/DataRecord/interface/SiPixelQualityFromDbRcd.h"
+#include "CondFormats/SiPixelObjects/interface/CablingPathToDetUnit.h"
+#include "CondFormats/SiPixelObjects/interface/PixelROC.h"
+#include "CondFormats/SiPixelObjects/interface/SiPixelFEDChannelContainer.h"
+#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
+#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingTree.h"
+#include "CondFormats/SiPixelObjects/interface/SiPixelQuality.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ESWatcher.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+
+#include <iomanip>      // std::setw
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+#include <TROOT.h>
+#include <TSystem.h>
+#include <TCanvas.h>
+#include <TFile.h>
+#include <TLegend.h>
+#include <TGraph.h>
+#include <TH1.h>
+
+namespace SiPixelFEDChannelUtils {
+  std::pair<unsigned int,unsigned int> unpack(cond::Time_t since){
+    auto kLowMask = 0XFFFFFFFF;
+    auto run  = (since >> 32);
+    auto lumi = (since & kLowMask);
+    return std::make_pair(run,lumi);
+  }
+}
+
+class FastSiPixelFEDChannelContainerFromQuality : public edm::one::EDAnalyzer<> {
+public:
+
+  explicit FastSiPixelFEDChannelContainerFromQuality(const edm::ParameterSet& iConfig );
+  ~FastSiPixelFEDChannelContainerFromQuality() override;
+  void analyze( const edm::Event& evt, const edm::EventSetup& evtSetup) override;
+  void endJob() override;
+  static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
+  SiPixelFEDChannelContainer::SiPixelFEDChannelCollection createFromSiPixelQuality(const SiPixelQuality & theQuality, const SiPixelFedCablingMap& theFedCabling,const SiPixelFedCablingTree& theCablingTree);
+
+private:
+
+  cond::persistency::ConnectionPool m_connectionPool;
+  const std::string m_condDbQuality;
+  const std::string m_condDbCabling;
+  const std::string m_QualityTagName;
+  const std::string m_CablingTagName; 
+  const std::string m_record;
+
+  // Specify output text file name. Leave empty if do not want to dump in a file
+  const std::string m_output;
+
+  // Manually specify the start/end time.
+  unsigned long long m_startTime;
+  unsigned long long m_endTime;    
+
+  const bool printdebug_;
+  const bool isMC_;
+  const bool removeEmptyPayloads_;
+
+  SiPixelFEDChannelContainer* myQualities;
+
+  inline unsigned int closest_from_above(std::vector<unsigned int> const& vec, unsigned int value) {
+    auto const it = std::lower_bound(vec.begin(), vec.end(), value);
+    return vec.at(it-vec.begin()-1);
+  }
+
+  inline unsigned int closest_from_below(std::vector<unsigned int> const& vec, unsigned int value) {
+    auto const it = std::upper_bound(vec.begin(), vec.end(), value);
+    return vec.at(it-vec.begin()-1);
+  }
+
+
+};
+
+FastSiPixelFEDChannelContainerFromQuality::FastSiPixelFEDChannelContainerFromQuality(const edm::ParameterSet& iConfig):
+  m_connectionPool(),
+  m_condDbQuality   ( iConfig.getParameter< std::string >("condDBQuality") ),
+  m_condDbCabling   ( iConfig.getParameter< std::string >("condDBCabling") ),
+  m_QualityTagName  ( iConfig.getParameter< std::string >("qualityTagName") ),
+  m_CablingTagName  ( iConfig.getParameter< std::string >("cablingMapTagName") ),
+  m_record   ( iConfig.getParameter<std::string>("record")),
+  m_output   ( iConfig.getParameter< std::string >("output") ),
+  m_startTime( iConfig.getParameter< unsigned long long >("startIOV") ),
+  m_endTime  ( iConfig.getParameter< unsigned long long >("endIOV") ),
+  printdebug_( iConfig.getUntrackedParameter<bool>("printDebug",false)),
+  isMC_      ( iConfig.getUntrackedParameter<bool>("isMC",true)),
+  removeEmptyPayloads_( iConfig.getUntrackedParameter<bool>("removeEmptyPayloads",false))
+{
+  m_connectionPool.setParameters( iConfig.getParameter<edm::ParameterSet>("DBParameters")  );
+  m_connectionPool.configure();
+
+  //now do what ever initialization is needed
+  myQualities = new SiPixelFEDChannelContainer();
+
+}
+
+FastSiPixelFEDChannelContainerFromQuality::~FastSiPixelFEDChannelContainerFromQuality() {
+  delete myQualities;
+}
+
+void FastSiPixelFEDChannelContainerFromQuality::analyze(const edm::Event& evt, const edm::EventSetup& evtSetup) {
+
+  std::stringstream ss;
+  
+  cond::Time_t startIov = m_startTime; 
+  cond::Time_t endIov   = m_endTime;   
+  if (startIov > endIov)
+    throw cms::Exception("endTime must be greater than startTime!");
+  edm::LogInfo("FastSiPixelFEDChannelContainerFromQuality") << "[FastSiPixelFEDChannelContainerFromQuality::" << __func__ << "] "
+							    << "Set start time " << startIov 
+							    << "\n ... Set end time " << endIov;
+
+  // open db session for the quality
+  edm::LogInfo("FastSiPixelFEDChannelContainerFromQuality") << "[FastSiPixelFEDChannelContainerFromQuality::" << __func__ << "] "
+							    << "Query the condition database " << m_condDbQuality;
+
+  cond::persistency::Session condDbSession = m_connectionPool.createSession( m_condDbQuality );
+  condDbSession.transaction().start( true );
+
+  // query the database
+  edm::LogInfo("FastSiPixelFEDChannelContainerFromQuality") << "[FastSiPixelFEDChannelContainerFromQuality::" << __func__ << "] "
+							    << "Reading IOVs from tag " << m_QualityTagName;
+
+  // open db session for the cabling map
+  edm::LogInfo("FastSiPixelFEDChannelContainerFromQuality") << "[FastSiPixelFEDChannelContainerFromQuality::" << __func__ << "] "
+							    << "Query the condition database " << m_condDbCabling;
+
+  cond::persistency::Session condDbSession2 = m_connectionPool.createSession( m_condDbCabling );
+  condDbSession2.transaction().start( true );
+
+  // query the database
+  edm::LogInfo("FastSiPixelFEDChannelContainerFromQuality") << "[FastSiPixelFEDChannelContainerFromQuality::" << __func__ << "] "
+							    << "Reading IOVs from tag " << m_CablingTagName;
+
+  // get the list of payloads for the SiPixelQuality tag
+  std::vector<std::tuple<cond::Time_t,cond::Hash> > m_iovs;
+  condDbSession.getIovRange(m_QualityTagName,startIov,endIov, m_iovs);
+  
+  const auto MIN_VAL = cond::timeTypeSpecs[cond::runnumber].beginValue;
+  const auto MAX_VAL = cond::timeTypeSpecs[cond::runnumber].endValue;
+
+  // get the list of payloads for the Cabling Map 
+  std::vector<std::tuple<cond::Time_t,cond::Hash> > m_cabling_iovs;
+  condDbSession2.getIovRange(m_CablingTagName,MIN_VAL,MAX_VAL,m_cabling_iovs);
+
+  // create here the unpacked list of IOVs (run numbers)
+  std::vector<unsigned int> listOfIOVs;
+  std::transform(m_iovs.begin(), m_iovs.end(), std::back_inserter(listOfIOVs),
+		 [](std::tuple<cond::Time_t,cond::Hash> myIOV) -> unsigned int { return SiPixelFEDChannelUtils::unpack(std::get<0>(myIOV)).first; });
+
+  std::vector<unsigned int> listOfCablingIOVs;
+  std::transform(m_cabling_iovs.begin(), m_cabling_iovs.end(), std::back_inserter(listOfCablingIOVs),
+		 [](std::tuple<cond::Time_t,cond::Hash> myIOV2) -> unsigned int { return std::get<0>(myIOV2); });
+
+  edm::LogInfo("FastSiPixelFEDChannelContainerFromQuality")<<" Number of SiPixelQuality paloyads to analyze: " << listOfIOVs.size() << " Number of SiPixelFedCablngMap payloads: " << listOfCablingIOVs.size() << std::endl; 
+  
+  if(listOfCablingIOVs.size()>1){
+    if( closest_from_below(listOfCablingIOVs,listOfIOVs.front()) != closest_from_above(listOfCablingIOVs,listOfIOVs.back()) ){
+      throw cms::Exception("")<< " The Pixel FED Cabling map does not cover all the requested SiPixelQuality IOVs in the same interval of validity \n";
+    }
+  } else {
+    if(listOfIOVs.front() < listOfCablingIOVs.front() ){
+      throw cms::Exception("")<< " The Pixel FED Cabling map does not cover all the requested IOVs \n";
+    }
+  }
+
+  edm::LogInfo("FastSiPixelFEDChannelContainerFromQuality")<< " First run covered by SiPixelQuality tag: " << listOfIOVs.front() << " / last run covered by SiPixelQuality tag: " << listOfIOVs.back() << std::endl;
+
+  edm::LogVerbatim("FastSiPixelFEDChannelContainerFromQuality")<< " SiPixel Cabling Map IOVs in the interval: " ;
+  for(const auto& cb : m_cabling_iovs ){
+    edm::LogVerbatim("FastSiPixelFEDChannelContainerFromQuality")<< " " << std::setw(6) << std::get<0>(cb) << " : " << std::get<1>(cb);
+  }
+  edm::LogVerbatim("FastSiPixelFEDChannelContainerFromQuality")<< std::endl;
+
+  if(printdebug_){
+    edm::LogInfo("FastSiPixelFEDChannelContainerFromQuality")<< " closest_from_above(listOfCablingIOVs,listOfIOVs.back()): "  << closest_from_above(listOfCablingIOVs,listOfIOVs.back()) << std::endl;
+    edm::LogInfo("FastSiPixelFEDChannelContainerFromQuality")<< " closest_from_below(listOfCablingIOVs,listOfIOVs.front()): " << closest_from_below(listOfCablingIOVs,listOfIOVs.front()) << std::endl;
+  }  
+
+  auto it = std::find(listOfCablingIOVs.begin(),listOfCablingIOVs.end(),closest_from_below(listOfCablingIOVs,listOfIOVs.front()));
+  int index = std::distance(listOfCablingIOVs.begin(),it);  
+
+  edm::LogInfo("FastSiPixelFEDChannelContainerFromQuality")<< " using the SiPixelFedCablingMap with hash: " << std::get<1>(m_cabling_iovs.at(index)) << std::endl;
+
+  auto theCablingMapPayload = condDbSession2.fetchPayload<SiPixelFedCablingMap>(std::get<1>(m_cabling_iovs.at(index)));
+  auto theCablingTree = (*theCablingMapPayload).cablingTree();
+
+  printf("Progressing Bar                               :0%%       20%%       40%%       60%%       80%%       100%%\n");
+  printf("Translating into SiPixelFEDChannelCollection  :");
+  int step = m_iovs.size()/50;
+
+  int niov = 0;
+  for (const auto & myIOV : m_iovs){
+    
+    if(niov%step==0){printf(".");fflush(stdout);}
+    auto payload = condDbSession.fetchPayload<SiPixelQuality>(std::get<1>(myIOV));
+    auto runLS = SiPixelFEDChannelUtils::unpack(std::get<0>(myIOV));
+    
+    // print IOVs summary
+    ss  << runLS.first << ","<< runLS.second << " ("<< std::get<0>(myIOV)  <<")" << " [hash: " << std::get<1>(myIOV)  << "] \n";
+    
+    std::string scenario = std::to_string(runLS.first)+"_"+std::to_string(runLS.second);
+ 
+    if(printdebug_){
+      edm::LogInfo("FastSiPixelFEDChannelContainerFromQuality")<<"Found IOV:" << runLS.first  <<"("<<  runLS.second <<")"<<std::endl;
+    }    
+
+    auto theSiPixelFEDChannelCollection = this->createFromSiPixelQuality(*payload,*theCablingMapPayload,*theCablingTree);
+
+    if(removeEmptyPayloads_ && theSiPixelFEDChannelCollection.empty()) return;
+
+    myQualities->setScenario(scenario,theSiPixelFEDChannelCollection);
+    
+    ++niov;
+  }
+
+  edm::LogInfo("FastSiPixelFEDChannelContainerFromQuality") << "[FastSiPixelFEDChannelContainerFromQuality::" << __func__ << "] "
+							    << "Read " << niov << " IOVs from tag " << m_QualityTagName << " corresponding to the specified time interval.\n\n" << ss.str();
+
+  if(printdebug_){
+    edm::LogInfo("FastSiPixelFEDChannelContainerFromQuality") << "[FastSiPixelFEDChannelContainerFromQuality::" << __func__ << "] "
+							      << ss.str();
+  }
+
+  condDbSession.transaction().commit();
+  condDbSession2.transaction().commit();
+  
+  if (!m_output.empty()) {
+    std::ofstream fout;
+    fout.open(m_output);
+    fout << ss.str();
+    fout.close();
+  }  
+}
+
+// ------------ method called once each job just before starting event loop  ------------
+SiPixelFEDChannelContainer::SiPixelFEDChannelCollection
+FastSiPixelFEDChannelContainerFromQuality::createFromSiPixelQuality(const SiPixelQuality & theQuality, const SiPixelFedCablingMap& theFedCabling,const SiPixelFedCablingTree& theCablingTree)
+{
+  auto fedid_ = theFedCabling.det2fedMap();
+
+  SiPixelFEDChannelContainer::SiPixelFEDChannelCollection theBadChannelCollection;
+
+  auto theDisabledModules = theQuality.getBadComponentList();
+  for (const auto &mod : theDisabledModules){
+    //mod.DetID, mod.errorType,mod.BadRocs
+    
+    int coded_badRocs = mod.BadRocs;
+    std::vector<PixelFEDChannel> disabledChannelsDetSet;
+    std::vector<sipixelobjects::CablingPathToDetUnit> path = theFedCabling.pathToDetUnit(mod.DetID);
+    unsigned int nrocs_inLink(0);
+    if (path.size() != 0){
+      const sipixelobjects::PixelFEDCabling * aFed = theCablingTree.fed(path.at(0).fed);
+      const sipixelobjects::PixelFEDLink    * link = aFed->link(path.at(0).link);
+      nrocs_inLink = link->numberOfROCs();
+    }	
+    
+    std::bitset<16> bad_rocs(coded_badRocs);	  
+    unsigned int n_ch = bad_rocs.size()/nrocs_inLink;
+	  
+    for (unsigned int i_roc = 0; i_roc < n_ch; ++i_roc){
+      
+      unsigned int first_idx = nrocs_inLink*i_roc;
+      unsigned int sec_idx   = nrocs_inLink*(i_roc+1)-1;
+      unsigned int mask      = pow(2,nrocs_inLink)-1;
+      unsigned int n_setbits = (coded_badRocs >> (i_roc*nrocs_inLink)) & mask;
+
+      if (n_setbits==0){
+	continue;
+      }
+
+      if(n_setbits != mask){
+	if(printdebug_){      
+	  edm::LogWarning("FastSiPixelFEDChannelContainerFromQuality")  << "Mismatch! DetId: "<< mod.DetID << " " << n_setbits <<  " " <<  mask << std::endl;
+	}
+	continue;
+      }
+	    
+      if(printdebug_){      
+	edm::LogVerbatim("FastSiPixelFEDChannelContainerFromQuality") << "passed" << std::endl;
+      }
+
+      unsigned int link_id = 99999;
+      unsigned int fed_id = 99999;
+	    
+      for (auto const& p: path){
+	const sipixelobjects::PixelFEDCabling * aFed = theCablingTree.fed(p.fed);
+	const sipixelobjects::PixelFEDLink * link = aFed->link(p.link);
+	const sipixelobjects::PixelROC * roc = link->roc(p.roc);
+	unsigned int first_roc = roc->idInDetUnit();
+	
+	if (first_roc == first_idx){	
+	  link_id = p.link;
+	  fed_id = p.fed;
+	  break; 
+	}
+      }
+
+      if(printdebug_){
+	edm::LogVerbatim("FastSiPixelFEDChannelContainerFromQuality") << " " << fed_id << " " << link_id << " " << first_idx << "  " << sec_idx << std::endl;
+      }	 
+
+      PixelFEDChannel ch = {fed_id, link_id, first_idx, sec_idx};
+      disabledChannelsDetSet.push_back(ch);
+      
+      if(printdebug_){
+	edm::LogVerbatim("FastSiPixelFEDChannelContainerFromQuality") << i_roc << " " << coded_badRocs <<  " " << first_idx << " " << sec_idx << std::endl;
+	edm::LogVerbatim("FastSiPixelFEDChannelContainerFromQuality") << "=======================================" << std::endl;
+      }
+    }
+    
+    if (!disabledChannelsDetSet.empty()) {
+      theBadChannelCollection[mod.DetID] = disabledChannelsDetSet;
+    }
+  }
+  return theBadChannelCollection;
+}
+
+
+void
+FastSiPixelFEDChannelContainerFromQuality::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
+
+  edm::ParameterSetDescription desc;
+  desc.setComment("Writes payloads of type SiPixelFEDChannelContainer");
+  desc.addUntracked<bool>("printDebug",false);
+  desc.addUntracked<bool>("removeEmptyPayloads",false);
+  desc.add<std::string>("record","SiPixelStatusScenariosRcd");
+  desc.add<std::string>("condDBQuality","frontier://FrontierPrep/CMS_CONDITIONS");
+  desc.add<std::string>("qualityTagName","SiPixelQualityOffline_2017_threshold1percent_stuckTBM");
+  desc.add<std::string>("condDBCabling","frontier://FrontierProd/CMS_CONDITIONS");
+  desc.add<std::string>("cablingMapTagName","SiPixelFedCablingMap_v1");
+  desc.add<unsigned long long>("startIOV",1310841198608821);
+  desc.add<unsigned long long>("endIOV",1312696624480350);
+  desc.add<std::string>("output","summary.txt");
+  desc.add<std::string>("connect","");
+
+  edm::ParameterSetDescription descDBParameters;
+  descDBParameters.addUntracked<std::string>("authenticationPath","");  
+  descDBParameters.addUntracked<int>("authenticationSystem",0);  
+  descDBParameters.addUntracked<std::string>("security","");  
+  descDBParameters.addUntracked<int>("messageLevel",0);  
+
+  desc.add<edm::ParameterSetDescription>("DBParameters",descDBParameters);
+  descriptions.add("FastSiPixelFEDChannelContainerFromQuality", desc);
+}
+
+
+void 
+FastSiPixelFEDChannelContainerFromQuality::endJob() {
+
+  //  edm::LogInfo("FastSiPixelFEDChannelContainerFromQuality")<<"Analyzed "<<IOVcount_<<" IOVs"<<std::endl;
+  edm::LogInfo("FastSiPixelFEDChannelContainerFromQuality")<<"Size of SiPixelFEDChannelContainer object "<< myQualities->size() <<std::endl<<std::endl;
+  
+  if(printdebug_){
+    edm::LogInfo("FastSiPixelFEDChannelContainerFromQuality")<<"Content of SiPixelFEDChannelContainer "<<std::endl;
+    
+    // use built-in method in the CondFormat
+     myQualities->printAll();
+  }
+
+  // Form the data here
+  edm::Service<cond::service::PoolDBOutputService> poolDbService;
+  if( poolDbService.isAvailable() ){
+    cond::Time_t valid_time = poolDbService->currentTime(); 
+    // this writes the payload to begin in current run defined in cfg
+    if(!isMC_){
+      poolDbService->writeOne(myQualities,valid_time, m_record);
+    } else {
+      // for MC IOV since=1
+      poolDbService->writeOne(myQualities,1, m_record);
+    }
+  } 
+}
+
+DEFINE_FWK_MODULE(FastSiPixelFEDChannelContainerFromQuality);
diff --git a/CondFormats/SiPixelObjects/test/FastSiPixelFEDChannelContainerFromQuality_cfg.py b/CondFormats/SiPixelObjects/test/FastSiPixelFEDChannelContainerFromQuality_cfg.py
new file mode 100644
index 0000000000000..9d3b108680f96
--- /dev/null
+++ b/CondFormats/SiPixelObjects/test/FastSiPixelFEDChannelContainerFromQuality_cfg.py
@@ -0,0 +1,73 @@
+import FWCore.ParameterSet.Config as cms
+import os
+
+process = cms.Process("summary")
+
+##
+## MessageLogger
+##
+process.load('FWCore.MessageService.MessageLogger_cfi')   
+process.MessageLogger.categories.append("FastSiPixelFEDChannelContainerFromQuality")  
+process.MessageLogger.categories.append("SiPixelFEDChannelContainer")  
+process.MessageLogger.destinations = cms.untracked.vstring("cout")
+process.MessageLogger.cout = cms.untracked.PSet(
+    threshold = cms.untracked.string("INFO"),
+    default   = cms.untracked.PSet(limit = cms.untracked.int32(0)),                       
+    FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1),
+                                   reportEvery = cms.untracked.int32(1000)
+                                   ),                                                      
+    FastSiPixelFEDChannelContainerFromQuality = cms.untracked.PSet( limit = cms.untracked.int32(-1)),
+    SiPixelFEDChannelContainer           = cms.untracked.PSet( limit = cms.untracked.int32(-1))
+    )
+process.MessageLogger.statistics.append('cout')  
+  
+##
+## Empty Source
+##                                      
+process.source = cms.Source("EmptySource",
+    numberEventsInRun = cms.untracked.uint32(1),
+    firstRun = cms.untracked.uint32(1)
+)
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(1)
+)
+
+##
+## Output database (in this case local sqlite file)
+##
+process.load("CondCore.CondDB.CondDB_cfi")
+process.CondDB.connect = 'sqlite_file:SiPixelStatusScenarios_2017StuckTBM.db'
+#process.CondDB.connect = 'sqlite_file:SiPixelStatusScenarios_2017Prompt.db'
+#process.CondDB.connect = 'sqlite_file:SiPixelStatusScenarios_2017Other.db'
+process.PoolDBOutputService = cms.Service("PoolDBOutputService",
+                                          process.CondDB,
+                                          timetype = cms.untracked.string('runnumber'),
+                                          toPut = cms.VPSet(cms.PSet(record = cms.string('SiPixelStatusScenariosRcd'),
+                                                                     tag = cms.string('SiPixelFEDChannelContainer_StuckTBM_2017_v1_mc')
+                                                                     #tag = cms.string('SiPixelFEDChannelContainer_Prompt_2017_v1_mc')
+                                                                     #tag = cms.string('SiPixelFEDChannelContainer_Other_2017_v1_mc')
+                                                                     )
+                                                            )
+                                          )
+
+##
+## Configuration of the module
+##
+process.load("CondFormats.SiPixelObjects.FastSiPixelFEDChannelContainerFromQuality_cfi")
+process.FastSiPixelFEDChannelContainerFromQuality.qualityTagName  = "SiPixelQualityOffline_2017_threshold1percent_stuckTBM"
+process.FastSiPixelFEDChannelContainerFromQuality.startIOV = 1268368267018245
+process.FastSiPixelFEDChannelContainerFromQuality.endIOV   = 1318907147191631
+process.FastSiPixelFEDChannelContainerFromQuality.output   = "summary2017_StuckTBM.txt"
+
+#process.FastSiPixelFEDChannelContainerFromQuality.qualityTagName  = "SiPixelQualityOffline_2017_threshold1percent_prompt"
+#process.FastSiPixelFEDChannelContainerFromQuality.startIOV = 1268368267018245
+#process.FastSiPixelFEDChannelContainerFromQuality.endIOV   = 1318907147191657
+#process.FastSiPixelFEDChannelContainerFromQuality.output   = "summary2017_Prompt.txt"
+
+#process.FastSiPixelFEDChannelContainerFromQuality.qualityTagName  = "SiPixelQualityOffline_2017_threshold1percent_other"
+#process.FastSiPixelFEDChannelContainerFromQuality.startIOV = 1268368267018245
+#process.FastSiPixelFEDChannelContainerFromQuality.endIOV   = 1318907147191657
+#process.FastSiPixelFEDChannelContainerFromQuality.output   = "summary2017_Other.txt"
+
+process.p = cms.Path(process.FastSiPixelFEDChannelContainerFromQuality)
diff --git a/CondTools/Ecal/test/alpha/create_alpha_trivial_byLaser_v6.py b/CondTools/Ecal/test/alpha/create_alpha_trivial_byLaser_v6.py
new file mode 100644
index 0000000000000..ee4d2e1e0e021
--- /dev/null
+++ b/CondTools/Ecal/test/alpha/create_alpha_trivial_byLaser_v6.py
@@ -0,0 +1,63 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("TEST")
+
+process.load("CalibCalorimetry.EcalTrivialCondModules.EcalTrivialCondRetriever_cfi")
+process.EcalTrivialConditionRetriever.producedEcalLaserAlphas =  cms.untracked.bool(True)
+
+process.EcalTrivialConditionRetriever.getLaserAlphaFromTypeEB =  cms.untracked.bool(True)
+process.EcalTrivialConditionRetriever.getLaserAlphaFromTypeEE =  cms.untracked.bool(True)
+process.EcalTrivialConditionRetriever.laserAlphaMeanEBR = cms.untracked.double(1.52)
+process.EcalTrivialConditionRetriever.laserAlphaMeanEBC = cms.untracked.double(1.50)
+process.EcalTrivialConditionRetriever.laserAlphaMeanEER = cms.untracked.double(1.16)
+process.EcalTrivialConditionRetriever.laserAlphaMeanEEC = cms.untracked.double(1.00)
+
+# uses CalibCalorimetry/EcalTrivialCondModules/data/EBLaserAlpha.txt for Russian/Chinese Xtals distinction
+# uses CalibCalorimetry/EcalTrivialCondModules/data/EELaserAlpha.txt for Russian/Chinese Xtals distinction
+
+process.EcalTrivialConditionRetriever.getLaserAlphaFromFileEB =  cms.untracked.bool(False)
+process.EcalTrivialConditionRetriever.getLaserAlphaFromFileEE =  cms.untracked.bool(False)
+#process.EcalTrivialConditionRetriever.EBLaserAlphaFile = cms.untracked.string('CalibCalorimetry/EcalTrivialCondModules/data/EBLaserAlpha_fromFile.txt')
+#process.EcalTrivialConditionRetriever.EELaserAlphaFile = cms.untracked.string('CalibCalorimetry/EcalTrivialCondModules/data/EELaserAlpha_fromFile.txt')
+process.EcalTrivialConditionRetriever.EELaserAlphaFile2 = cms.untracked.string('CalibCalorimetry/EcalTrivialCondModules/data/LaserLossRing.txt')
+# ieta, iphi, alpha for EB
+# iz, ix, iy, alpha for EE
+
+process.load("CondCore.CondDB.CondDB_cfi")
+# process.CondDBCommon.connect = 'oracle://cms_orcoff_prep/CMS_COND_ECAL'
+process.CondDB.connect = 'sqlite_file:EcalLaserAlphas_EB152-150_EE116_107_SICoptimized17.db'
+# process.CondDBCommon.DBParameters.authenticationPath = '/afs/cern.ch/cms/DB/conddb/'
+
+
+process.MessageLogger = cms.Service("MessageLogger",
+    debugModules = cms.untracked.vstring('*'),
+    destinations = cms.untracked.vstring('cout')
+)
+
+process.source = cms.Source("EmptyIOVSource",
+    firstValue = cms.uint64(1),
+    lastValue = cms.uint64(1),
+    timetype = cms.string('runnumber'),
+    interval = cms.uint64(1)
+)
+
+process.PoolDBOutputService = cms.Service("PoolDBOutputService",
+    process.CondDB,
+    toPut = cms.VPSet(cms.PSet(
+        record = cms.string('EcalLaserAlphasRcd'),
+        tag = cms.string('EcalLaserAlphas_EB152-150_EE116_107_SICoptimized17')
+        ))
+)
+
+process.dbCopy = cms.EDAnalyzer("EcalDBCopy",
+    timetype = cms.string('runnumber'),
+    toCopy = cms.VPSet(cms.PSet(
+        record = cms.string('EcalLaserAlphasRcd'),
+        container = cms.string('EcalLaserAlphas')
+        ))
+)
+
+
+
+process.p = cms.Path(process.dbCopy)
+
diff --git a/CondTools/SiPixel/interface/PixelPopConDCSSourceHandler.h b/CondTools/SiPixel/interface/PixelPopConDCSSourceHandler.h
deleted file mode 100644
index a889edb20fc79..0000000000000
--- a/CondTools/SiPixel/interface/PixelPopConDCSSourceHandler.h
+++ /dev/null
@@ -1,122 +0,0 @@
-#ifndef CondTools_SiPixel_PixelPopConDCSSourceHandler_h
-#define CondTools_SiPixel_PixelPopConDCSSourceHandler_h
-
-/** \class PixelPopConDCSSourceHandler
- *
- *  Template class for the source handler of DCS data.
- *
- *  Specify the object type via the template parameter Type.
- *
- *  $Date: 2008/11/30 19:41:09 $
- *  $Revision: 1.2 $
- *  \author Chung Khim Lae
- */
-
-#include "CoralBase/Attribute.h"
-#include "CoralBase/AttributeList.h"
-#include "RelationalAccess/ICursor.h"
-
-#include "CondCore/PopCon/interface/PopConSourceHandler.h"
-#include "CondFormats/SiPixelObjects/interface/PixelDCSObject.h"
-#include "CondTools/SiPixel/interface/PixelDCSBase.h"
-
-template <class Type>
-class PixelPopConDCSSourceHandler:
-  public PixelDCSBase,
-  public popcon::PopConSourceHandler< PixelDCSObject<Type> >
-{
-  public:
-
-  /// Init PixelDCSBase from cfg file.
-  PixelPopConDCSSourceHandler( const edm::ParameterSet& );
-
-  /// Get data from DB by calling PixelDCSBase::getData().
-  virtual void getNewObjects();
-
-  /// Name of this source handler.
-  virtual std::string id() const;
-
-  private:
-
-  /// Specialise this template to assign values to a non-POD object type from a row in DB.
-  static inline void setValue( Type& value, const coral::AttributeList& );
-
-  /// Fill object from all rows in DB.
-  virtual void fillObject( coral::ICursor& );
-};
-
-template <class Type>
-PixelPopConDCSSourceHandler<Type>::PixelPopConDCSSourceHandler(const edm::ParameterSet& cfg):
-  PixelDCSBase(cfg)
-{
-}
-
-template <class Type>
-void PixelPopConDCSSourceHandler<Type>::setValue(Type& value, const coral::AttributeList& row)
-{
-  const size_t nTable = row.size() - 1; // row includes name
-
-  if (1 != nTable)
-  {
-    throw cms::Exception("PixelPopConDCSSourceHandler")
-        << "Found " << nTable << " last value tables instead of 1. "
-        << "Check your cfg.\n";
-  }
-
-  value = row[0].data<float>();
-}
-
-template <>
-void PixelPopConDCSSourceHandler<CaenChannel>::setValue(CaenChannel& value, const coral::AttributeList& row)
-{
-  const size_t nTable = row.size() - 1; // row includes name
-
-  if (3 != nTable)
-  {
-    throw cms::Exception("PixelPopConDCSSourceHandler<CaenChannel>")
-        << "CaenChannel has 3 values (isOn, iMon, vMon) "
-        << "but your cfg has " << nTable << " last value tables.\n";
-  }
-
-  value.isOn = row[0].data<float>();
-  value.iMon = row[1].data<float>();
-  value.vMon = row[2].data<float>();
-}
-
-template <class Type>
-void PixelPopConDCSSourceHandler<Type>::fillObject(coral::ICursor& cursor)
-{
-  PixelDCSObject<Type>* data = new PixelDCSObject<Type>;
-
-  while ( cursor.next() )
-  {
-    const coral::AttributeList& row = cursor.currentRow();
-
-    typename PixelDCSObject<Type>::Item datum;
-
-    datum.name = row["name"].data<std::string>();
-    setValue(datum.value, row);
-    data->items.push_back(datum);
-  }
-
-  this->m_to_transfer.push_back( std::make_pair(data, 1) );
-}
-
-template <class Type>
-void PixelPopConDCSSourceHandler<Type>::getNewObjects()
-{
-  getData();
-}
-
-template <class Type>
-std::string PixelPopConDCSSourceHandler<Type>::id() const
-{
-  std::string name = "PixelPopCon";
-
-  name += typeid(Type).name();
-  name += "SourceHandler";
-
-  return name;
-}
-
-#endif
diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py
index cab253b1b16c0..5072d07a99d51 100644
--- a/Configuration/AlCa/python/autoCond.py
+++ b/Configuration/AlCa/python/autoCond.py
@@ -24,16 +24,16 @@
     # GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run2
     'run2_mc_pa'        :   '106X_mcRun2_pA_v2',
     # GlobalTag for Run1 data reprocessing
-    'run1_data'         :   '106X_dataRun2_v8',
+    'run1_data'         :   '106X_dataRun2_v10',
     # GlobalTag for Run2 data reprocessing
-    'run2_data'         :   '106X_dataRun2_v8',
+    'run2_data'         :   '106X_dataRun2_v10',
     # GlobalTag for Run2 data relvals: allows customization to run with fixed L1 menu
-    'run2_data_relval'  :   '106X_dataRun2_relval_v6',
+    'run2_data_relval'  :   '106X_dataRun2_relval_v9',
     # GlobalTag for Run2 data 2018B relvals only: HEM-15-16 fail
-    'run2_data_promptlike_HEfail' : '106X_dataRun2_PromptLike_HEfail_v4',
+    'run2_data_promptlike_HEfail' : '106X_dataRun2_PromptLike_HEfail_v5',
     # GlobalTag for Run2 data 2016H relvals only: Prompt Conditions + fixed L1 menu (to be removed)
-    'run2_data_promptlike'    : '106X_dataRun2_PromptLike_v4',
-    'run2_data_promptlike_hi' : '106X_dataRun2_PromptLike_HI_v4',
+    'run2_data_promptlike'    : '106X_dataRun2_PromptLike_v6',
+    'run2_data_promptlike_hi' : '106X_dataRun2_PromptLike_HI_v6',
     # GlobalTag for Run1 HLT: it points to the online GT
     'run1_hlt'          :   '101X_dataRun2_HLT_frozen_v9',
     # GlobalTag for Run2 HLT: it points to the online GT
@@ -63,10 +63,12 @@
     'phase1_2018_cosmics'      :   '106X_upgrade2018cosmics_realistic_deco_v3',
     # GlobalTag for MC production (cosmics) with realistic conditions for full Phase1 2018 detector,  Strip tracker in PEAK mode
     'phase1_2018_cosmics_peak' :   '106X_upgrade2018cosmics_realistic_peak_v3',
-    # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2019
-    'phase1_2019_design'       : '106X_postLS2_design_v4', # GT containing design conditions for postLS2
-    # GlobalTag for MC production with realistic conditions for Phase1 2019
-    'phase1_2019_realistic'    : '106X_postLS2_realistic_v4', # GT containing realistic conditions for postLS2
+    # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2021
+    'phase1_2021_design'       : '106X_postLS2_design_v4', # GT containing design conditions for postLS2
+    # GlobalTag for MC production with realistic conditions for Phase1 2021
+    'phase1_2021_realistic'    : '106X_postLS2_realistic_v4', # GT containing realistic conditions for postLS2
+    # GlobalTag for MC production (cosmics) with realistic conditions for Phase1 2021,  Strip tracker in DECO mode
+    'phase1_2021_cosmics'      : '106X_upgrade2021cosmics_realistic_deco_v1',
     # GlobalTag for MC production with realistic conditions for Phase2 2023
     'phase2_realistic'         : '106X_upgrade2023_realistic_v2'
 }
@@ -97,5 +99,5 @@
 autoCond['upgradePLS1']      = ( autoCond['run2_mc'] )
 autoCond['upgradePLS150ns']  = ( autoCond['run2_mc_50ns'] )
 autoCond['upgrade2017']      = ( autoCond['phase1_2017_design'] )
-autoCond['upgrade2019']      = ( autoCond['phase1_2019_design'] )
+autoCond['upgrade2021']      = ( autoCond['phase1_2021_design'] )
 autoCond['upgradePLS3']      = ( autoCond['phase2_realistic'] )
diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py
index 8fd8f2d3eada7..0cc3b8ffa3454 100644
--- a/Configuration/Applications/python/ConfigBuilder.py
+++ b/Configuration/Applications/python/ConfigBuilder.py
@@ -2072,13 +2072,14 @@ def create_process(self):
         # now set up the modifies
         modifiers=[]
         modifierStrings=[]
-        modifierImports=['from Configuration.StandardSequences.Eras import eras']
+        modifierImports=[]
 
         if hasattr(self._options,"era") and self._options.era :
         # Multiple eras can be specified in a comma seperated list
             from Configuration.StandardSequences.Eras import eras
             for requestedEra in self._options.era.split(",") :
-                modifierStrings.append("eras."+requestedEra)
+                modifierStrings.append(requestedEra)
+                modifierImports.append(eras.pythonCfgLines[requestedEra])
                 modifiers.append(getattr(eras,requestedEra))
 
 
diff --git a/Configuration/Applications/python/cmsDriverOptions.py b/Configuration/Applications/python/cmsDriverOptions.py
index 0e6c31acfe876..08fa4c4859f83 100755
--- a/Configuration/Applications/python/cmsDriverOptions.py
+++ b/Configuration/Applications/python/cmsDriverOptions.py
@@ -12,6 +12,9 @@
 import traceback
 from functools import reduce
 
+def checkModifier(era):
+    from FWCore.ParameterSet.Config import Modifier, ModifierChain
+    return isinstance( era, Modifier ) or isinstance( era, ModifierChain )
 
 def checkOptions():
     return
@@ -242,15 +245,14 @@ def OptionsFromItems(items):
     # If an "era" argument was supplied make sure it is one of the valid possibilities
     if options.era :
         from Configuration.StandardSequences.Eras import eras
-        from FWCore.ParameterSet.Config import Modifier, ModifierChain
         # Split the string by commas to check individual eras
         requestedEras = options.era.split(",")
         # Check that the entry is a valid era
         for eraName in requestedEras :
-            if not hasattr( eras, eraName ) : # Not valid, so print a helpful message
+            if not hasattr( eras, eraName ) or not checkModifier(getattr(eras,eraName)): # Not valid, so print a helpful message
                 validOptions="" # Create a stringified list of valid options to print to the user
                 for key in eras.__dict__ :
-                    if isinstance( eras.__dict__[key], Modifier ) or isinstance( eras.__dict__[key], ModifierChain ) :
+                    if checkModifier(eras.__dict__[key]):
                         if validOptions!="" : validOptions+=", " 
                         validOptions+="'"+key+"'"
                 raise Exception( "'%s' is not a valid option for '--era'. Valid options are %s." % (eraName, validOptions) )
diff --git a/Configuration/Eras/python/Era_Run2_2016_cff.py b/Configuration/Eras/python/Era_Run2_2016_cff.py
index b928c51073904..809e0787e0f19 100644
--- a/Configuration/Eras/python/Era_Run2_2016_cff.py
+++ b/Configuration/Eras/python/Era_Run2_2016_cff.py
@@ -5,6 +5,9 @@
 from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
 from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
 from Configuration.Eras.Modifier_run2_HLTconditions_2016_cff import run2_HLTconditions_2016
+from Configuration.Eras.Modifier_run2_muon_2016_cff import run2_muon_2016
+from Configuration.Eras.Modifier_run2_L1prefiring_cff import run2_L1prefiring
 
-Run2_2016 = cms.ModifierChain(run2_common, run2_25ns_specific, stage2L1Trigger, ctpps_2016, run2_HLTconditions_2016)
+Run2_2016 = cms.ModifierChain(run2_common, run2_25ns_specific,
+ stage2L1Trigger, ctpps_2016, run2_HLTconditions_2016, run2_muon_2016, run2_L1prefiring)
 
diff --git a/Configuration/Eras/python/Era_Run2_2017_cff.py b/Configuration/Eras/python/Era_Run2_2017_cff.py
index 28ec88e2cabf3..76b556aa7fa5a 100644
--- a/Configuration/Eras/python/Era_Run2_2017_cff.py
+++ b/Configuration/Eras/python/Era_Run2_2017_cff.py
@@ -11,6 +11,10 @@
 from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017
 from Configuration.Eras.Modifier_stage2L1Trigger_2017_cff import stage2L1Trigger_2017
 from Configuration.Eras.Modifier_run2_HLTconditions_2017_cff import run2_HLTconditions_2017
+from Configuration.Eras.Modifier_run2_muon_2017_cff import run2_muon_2017
+from Configuration.Eras.Modifier_run2_muon_2016_cff import run2_muon_2016
 
-Run2_2017 = cms.ModifierChain(Run2_2016, phase1Pixel, run2_ECAL_2017, run2_HF_2017, run2_HCAL_2017, run2_HE_2017, run2_HEPlan1_2017, trackingPhase1, run2_GEM_2017, stage2L1Trigger_2017, run2_HLTconditions_2017)
+Run2_2017 = cms.ModifierChain(Run2_2016.copyAndExclude([run2_muon_2016]), 
+phase1Pixel, run2_ECAL_2017, run2_HF_2017, run2_HCAL_2017, run2_HE_2017, run2_HEPlan1_2017, 
+trackingPhase1, run2_GEM_2017, stage2L1Trigger_2017, run2_HLTconditions_2017, run2_muon_2017)
 
diff --git a/Configuration/Eras/python/Era_Run2_2018_cff.py b/Configuration/Eras/python/Era_Run2_2018_cff.py
index 6b73a4ec20641..4b5bf8d965d67 100644
--- a/Configuration/Eras/python/Era_Run2_2018_cff.py
+++ b/Configuration/Eras/python/Era_Run2_2018_cff.py
@@ -2,7 +2,6 @@
 
 from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
 from Configuration.Eras.Modifier_run2_HEPlan1_2017_cff import run2_HEPlan1_2017
-
 from Configuration.Eras.Modifier_run2_CSC_2018_cff import run2_CSC_2018
 from Configuration.Eras.Modifier_run2_HB_2018_cff import run2_HB_2018
 from Configuration.Eras.Modifier_run2_HE_2018_cff import run2_HE_2018
@@ -10,5 +9,10 @@
 from Configuration.Eras.Modifier_run2_DT_2018_cff import run2_DT_2018
 from Configuration.Eras.Modifier_run2_SiPixel_2018_cff import run2_SiPixel_2018
 from Configuration.Eras.Modifier_run2_HLTconditions_2018_cff import run2_HLTconditions_2018
+from Configuration.Eras.Modifier_run2_muon_2018_cff import run2_muon_2018
+from Configuration.Eras.Modifier_run2_muon_2017_cff import run2_muon_2017
+from Configuration.Eras.Modifier_run2_L1prefiring_cff import run2_L1prefiring
 
-Run2_2018 = cms.ModifierChain(Run2_2017.copyAndExclude([run2_HEPlan1_2017]), run2_CSC_2018, run2_HCAL_2018, run2_HB_2018, run2_HE_2018,run2_DT_2018, run2_SiPixel_2018, run2_HLTconditions_2018)
+Run2_2018 = cms.ModifierChain(Run2_2017.copyAndExclude([run2_HEPlan1_2017, run2_muon_2017, run2_L1prefiring]),
+run2_CSC_2018, run2_HCAL_2018, run2_HB_2018, run2_HE_2018,run2_DT_2018, run2_SiPixel_2018, 
+run2_HLTconditions_2018, run2_muon_2018)
diff --git a/Configuration/Eras/python/Modifier_run2_L1prefiring_cff.py b/Configuration/Eras/python/Modifier_run2_L1prefiring_cff.py
new file mode 100644
index 0000000000000..57f31cb09f773
--- /dev/null
+++ b/Configuration/Eras/python/Modifier_run2_L1prefiring_cff.py
@@ -0,0 +1,4 @@
+import FWCore.ParameterSet.Config as cms
+
+run2_L1prefiring =  cms.Modifier()
+
diff --git a/Configuration/Eras/python/Modifier_run2_muon_2016_cff.py b/Configuration/Eras/python/Modifier_run2_muon_2016_cff.py
new file mode 100644
index 0000000000000..7267a502b6a2a
--- /dev/null
+++ b/Configuration/Eras/python/Modifier_run2_muon_2016_cff.py
@@ -0,0 +1,3 @@
+import FWCore.ParameterSet.Config as cms
+
+run2_muon_2016 =cms.Modifier()
diff --git a/Configuration/Eras/python/Modifier_run2_muon_2017_cff.py b/Configuration/Eras/python/Modifier_run2_muon_2017_cff.py
new file mode 100644
index 0000000000000..2ef7c6f3ee1c2
--- /dev/null
+++ b/Configuration/Eras/python/Modifier_run2_muon_2017_cff.py
@@ -0,0 +1,3 @@
+import FWCore.ParameterSet.Config as cms
+
+run2_muon_2017 =cms.Modifier()
diff --git a/Configuration/Eras/python/Modifier_run2_muon_2018_cff.py b/Configuration/Eras/python/Modifier_run2_muon_2018_cff.py
new file mode 100644
index 0000000000000..2b8f85c625d80
--- /dev/null
+++ b/Configuration/Eras/python/Modifier_run2_muon_2018_cff.py
@@ -0,0 +1,3 @@
+import FWCore.ParameterSet.Config as cms
+
+run2_muon_2018 =cms.Modifier()
diff --git a/Configuration/Generator/python/CloseByParticle_Photon_ERZRanges_cfi.py b/Configuration/Generator/python/CloseByParticle_Photon_ERZRanges_cfi.py
index b1ffef164cd27..6a0bb01fe4df0 100644
--- a/Configuration/Generator/python/CloseByParticle_Photon_ERZRanges_cfi.py
+++ b/Configuration/Generator/python/CloseByParticle_Photon_ERZRanges_cfi.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 generator = cms.EDProducer("CloseByParticleGunProducer",
-    PGunParameters = cms.PSet(PartID = cms.vint32(22),
+    PGunParameters = cms.PSet(PartID = cms.vint32(22, 11, 13, 111),
         EnMin = cms.double(25.),
         EnMax = cms.double(200.),
         RMin = cms.double(60),
@@ -11,6 +11,8 @@
         Delta = cms.double(2.5),
         Pointing = cms.bool(True),
         Overlapping = cms.bool(False),
+        RandomShoot = cms.bool(False),
+        NParticles = cms.int32(5),
         MaxEta = cms.double(2.7),
         MinEta = cms.double(1.7),
         MaxPhi = cms.double(3.14159265359/6.),
@@ -19,7 +21,7 @@
     ),
     Verbosity = cms.untracked.int32(10),
     
-    psethack = cms.string('single gamma random energy'),
+    psethack = cms.string('random particles in phi and r windows'),
     AddAntiParticle = cms.bool(False),
     firstRun = cms.untracked.uint32(1)
 )
diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md
index c68c82ec5619f..e3de02d865900 100644
--- a/Configuration/Geometry/README.md
+++ b/Configuration/Geometry/README.md
@@ -6,9 +6,8 @@ Tracker:
 * T5: Phase2 tilted tracker (v6.1.3) w/ phase 2 pixel (v4.0.2.5) 
 * T6: Phase2 tilted tracker (v6.1.4) w/ phase 2 pixel (v4.0.4) (TEDD slighly rotated + Inner Tracker barrel has lower radii than TDR T5 geometry)
 * T11: Phase2 tilted tracker (v6.1.4) w/ phase 2 pixel (v4.0.5) (same as T6 but 50x50 in all modules)
-* T12: Phase2 tilted tracker (v6.1.4) w/ phase 2 pixel (v4.6.1) (same as T6 but includes latest Tracker MB (notably, significant increase in IT modules Caps RL). OTST update not included yet. Slightly tuned LpGBTs Z positions over service cylinder.
-* T13: Phase2 tilted tracker (v6.1.4) w/ phase 2 pixel (v4.6.0) (same as T12 but TBPX Lp GBTs placed over TBPX)
 * T14: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v6.1.3) (Based from T12. OT: reduced envelope. IT: new chip size, different radii, 2x2 modules everywhere in TEPX, new ring paradigm in TEPX)
+* T15: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v6.1.3) (Active geometry: same as T14. Material Budget: major update in IT, gathering info from recent Mechanical designs.)
 
 Calorimeters:
 * C3: HGCal (v8) + Phase2 HCAL and EB
@@ -53,11 +52,10 @@ Several detector combinations have been generated:
 * D33 = T6+C3+M2+I5+O2+F2 
 * D34 = T6+C3+M2+I6+O2+F2 
 * D35 = T6+C4+M2+I5+O2+F2 
-* D36 = T12+C3+M2+I1+O2+F2
-* D37 = T13+C3+M2+I1+O2+F2
 * D38 = T6+C4+M2+I7+O2+F2
 * D39 = T6+C4+M2+I8+O2+F2
 * D40 = T14+C3+M2+I1+O2+F2
 * D41 = T14+C8+M3+I9+O3+F2
+* D42 = T15+C3+M2+I1+O2+F2
 
 Currently, D17 is considered to be the baseline for the Phase 2 Muon and Barrel TDRs.
diff --git a/Configuration/Geometry/python/GeometryExtended2019Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2021Reco_cff.py
similarity index 95%
rename from Configuration/Geometry/python/GeometryExtended2019Reco_cff.py
rename to Configuration/Geometry/python/GeometryExtended2021Reco_cff.py
index d17217fb2f679..230b463ab5696 100644
--- a/Configuration/Geometry/python/GeometryExtended2019Reco_cff.py
+++ b/Configuration/Geometry/python/GeometryExtended2021Reco_cff.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 # Ideal geometry, needed for transient ECAL alignement
-from Configuration.Geometry.GeometryExtended2019_cff import *
+from Configuration.Geometry.GeometryExtended2021_cff import *
 
 
 
diff --git a/Configuration/Geometry/python/GeometryExtended2019_cff.py b/Configuration/Geometry/python/GeometryExtended2021_cff.py
similarity index 83%
rename from Configuration/Geometry/python/GeometryExtended2019_cff.py
rename to Configuration/Geometry/python/GeometryExtended2021_cff.py
index 36e4c5c804fda..e6850d1aa49b9 100644
--- a/Configuration/Geometry/python/GeometryExtended2019_cff.py
+++ b/Configuration/Geometry/python/GeometryExtended2021_cff.py
@@ -4,7 +4,7 @@
 # Geometry master configuration
 #
 # Ideal geometry, needed for simulation
-from Geometry.CMSCommonData.cmsExtendedGeometry2019XML_cfi import *
+from Geometry.CMSCommonData.cmsExtendedGeometry2021XML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.HcalCommonData.hcalParameters_cfi      import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
diff --git a/Configuration/Geometry/python/GeometryExtended2023D36Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023D36Reco_cff.py
deleted file mode 100644
index 8aaffcca8225b..0000000000000
--- a/Configuration/Geometry/python/GeometryExtended2023D36Reco_cff.py
+++ /dev/null
@@ -1,50 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2023Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-from Configuration.Geometry.GeometryExtended2023D36_cff import *
-
-# tracker
-from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *
-from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
-from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
-from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
-trackerGeometry.applyAlignment = cms.bool(False)
-
-# calo
-from Geometry.CaloEventSetup.HGCalV6Topology_cfi import *
-from Geometry.HGCalGeometry.HGCalV6GeometryESProducer_cfi import *
-from Geometry.CaloEventSetup.CaloTopology_cfi import *
-from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
-CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
-    SelectedCalos = cms.vstring("HCAL"                   ,
-                                "ZDC"                    ,
-                                "EcalBarrel"             ,
-                                "TOWER"                  ,
-                                "HGCalEESensitive"       ,
-                                "HGCalHESiliconSensitive" 
-    )
-)
-from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
-from Geometry.HcalEventSetup.HcalGeometry_cfi import *
-from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
-from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
-from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
-from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
-from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
-from Geometry.EcalMapping.EcalMapping_cfi import *
-from Geometry.EcalMapping.EcalMappingRecord_cfi import *
-
-# muon
-from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
-from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
-from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
-from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
-from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
-
-# forward
-from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
-
diff --git a/Configuration/Geometry/python/GeometryExtended2023D37_cff.py b/Configuration/Geometry/python/GeometryExtended2023D37_cff.py
deleted file mode 100644
index 71804f08b1f22..0000000000000
--- a/Configuration/Geometry/python/GeometryExtended2023D37_cff.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2023Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-from Geometry.CMSCommonData.cmsExtendedGeometry2023D37XML_cfi import *
-from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
-from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import *
-from Geometry.HcalCommonData.hcalParameters_cfi      import *
-from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
-from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import *
-from Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi import *
diff --git a/Configuration/Geometry/python/GeometryExtended2023D37Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2023D42Reco_cff.py
similarity index 97%
rename from Configuration/Geometry/python/GeometryExtended2023D37Reco_cff.py
rename to Configuration/Geometry/python/GeometryExtended2023D42Reco_cff.py
index 6c66f6923730e..d9643f0818cb8 100644
--- a/Configuration/Geometry/python/GeometryExtended2023D37Reco_cff.py
+++ b/Configuration/Geometry/python/GeometryExtended2023D42Reco_cff.py
@@ -3,7 +3,7 @@
 # This config was generated automatically using generate2023Geometry.py
 # If you notice a mistake, please update the generating script, not just this config
 
-from Configuration.Geometry.GeometryExtended2023D37_cff import *
+from Configuration.Geometry.GeometryExtended2023D42_cff import *
 
 # tracker
 from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *
diff --git a/Configuration/Geometry/python/GeometryExtended2023D36_cff.py b/Configuration/Geometry/python/GeometryExtended2023D42_cff.py
similarity index 79%
rename from Configuration/Geometry/python/GeometryExtended2023D36_cff.py
rename to Configuration/Geometry/python/GeometryExtended2023D42_cff.py
index e62d65df157a7..578eeba84e072 100644
--- a/Configuration/Geometry/python/GeometryExtended2023D36_cff.py
+++ b/Configuration/Geometry/python/GeometryExtended2023D42_cff.py
@@ -3,9 +3,9 @@
 # This config was generated automatically using generate2023Geometry.py
 # If you notice a mistake, please update the generating script, not just this config
 
-from Geometry.CMSCommonData.cmsExtendedGeometry2023D36XML_cfi import *
+from Geometry.CMSCommonData.cmsExtendedGeometry2023D42XML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
-from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import *
+from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *
 from Geometry.HcalCommonData.hcalParameters_cfi      import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
 from Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi import *
diff --git a/Configuration/Geometry/python/dict2023Geometry.py b/Configuration/Geometry/python/dict2023Geometry.py
index 67f58079ee220..8050f0eda9b6f 100644
--- a/Configuration/Geometry/python/dict2023Geometry.py
+++ b/Configuration/Geometry/python/dict2023Geometry.py
@@ -168,66 +168,31 @@
             'trackerGeometry.applyAlignment = cms.bool(False)',
         ],
         "era" : "phase2_tracker, trackingPhase2PU140",
-    }, 
-    "T12" : {
-        1 : [
-            'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
-            'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/pixfwd.xml', 
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', 
-            'Geometry/TrackerCommonData/data/trackermaterial.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/tracker.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/pixel.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-            'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker461/trackerRecoMaterial.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
-            'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
-            'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        ],
-        "sim" : [
-            'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *',
-            'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import *',
-        ],
-        "reco" : [
-            'from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *',
-            'from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *',
-            'from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *',
-            'from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *',
-            'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
-            'trackerGeometry.applyAlignment = cms.bool(False)',
-        ],
-        "era" : "phase2_tracker, trackingPhase2PU140",
     },
-    "T13" : {
+    "T14" : {
         1 : [
             'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
             'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/pixfwd.xml', 
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixfwd.xml', 
             'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', 
             'Geometry/TrackerCommonData/data/trackermaterial.xml',
             'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/tracker.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker460/pixel.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/tracker.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixel.xml',
             'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
             'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
             'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
             'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
             'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-            'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker461/trackerRecoMaterial.xml',
+            'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613/trackerRecoMaterial.xml',
             'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
             'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
             'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         ],
         "sim" : [
             'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *',
-            'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT6_cff import *',
+            'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *',
         ],
         "reco" : [
             'from Geometry.CommonDetUnit.globalTrackingGeometry_cfi import *',
@@ -239,23 +204,23 @@
         ],
         "era" : "phase2_tracker, trackingPhase2PU140",
     },
-    "T14" : {
+    "T15" : {
         1 : [
             'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
             'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixfwd.xml', 
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml', 
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml', 
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml', 
             'Geometry/TrackerCommonData/data/trackermaterial.xml',
             'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/tracker.xml',
-            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixel.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml',
+            'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixel.xml',
             'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
             'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
             'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
             'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
             'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
             'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-            'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613/trackerRecoMaterial.xml',
+            'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml',
             'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
             'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
             'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
@@ -273,7 +238,7 @@
             'trackerGeometry.applyAlignment = cms.bool(False)',
         ],
         "era" : "phase2_tracker, trackingPhase2PU140",
-    }          
+    }
 }
 
 caloDict = {
@@ -1134,13 +1099,12 @@
     ("O2","T6","C3","M2","F2","I5") : "D33",
     ("O2","T6","C3","M2","F2","I6") : "D34",
     ("O2","T6","C4","M2","F2","I5") : "D35",
-    ("O2","T12","C3","M2","F2","I1") : "D36",
-    ("O2","T13","C3","M2","F2","I1") : "D37",
     ("O2","T6","C4","M2","F2","I7") : "D38",
     ("O2","T6","C4","M2","F2","I8") : "D39",
     ("O2","T14","C3","M2","F2","I1") : "D40",
     ("O3","T14","C8","M3","F2","I9") : "D41",
+    ("O2","T15","C3","M2","F2","I1") : "D42",
 }
 
-deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D18", "D20", "D22", "D23", "D26", "D27" ])
-deprecatedSubdets = set([ "T1", "T2" ,"T3", "T4", "T7", "T8", "T9", "T10", "C1", "C2", "M1", "O1", "F1" ])
+deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D18", "D20", "D22", "D23", "D26", "D27", "D36", "D37" ])
+deprecatedSubdets = set([ "T1", "T2" ,"T3", "T4", "T7", "T8", "T9", "T10", "T12", "T13", "C1", "C2", "M1", "O1", "F1" ])
diff --git a/Configuration/ProcessModifiers/python/recoFromReco_cff.py b/Configuration/ProcessModifiers/python/recoFromReco_cff.py
new file mode 100644
index 0000000000000..d8343922efd54
--- /dev/null
+++ b/Configuration/ProcessModifiers/python/recoFromReco_cff.py
@@ -0,0 +1,4 @@
+import FWCore.ParameterSet.Config as cms
+
+# This modifier sets the flag used to run the showerDigiInfo off in the reco from reco step4
+recoFromReco = cms.Modifier()
diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py
index 1891cac97950a..c54e8b490e092 100644
--- a/Configuration/PyReleaseValidation/python/relval_2017.py
+++ b/Configuration/PyReleaseValidation/python/relval_2017.py
@@ -23,7 +23,7 @@
 #         he collapse: TTbar, TTbar PU, TTbar design
 #         killStuckTBM: TTbar, ZMM
 #         ParkingBPH: TTbar
-#   2019 (ZMM, TTbar, ZEE, MinBias, TTbar PU, ZEE PU, TTbar design)
+#   2021 (ZMM, TTbar, ZEE, MinBias, TTbar PU, ZEE PU, TTbar design)
 numWFIB = [10001.0,10002.0,10003.0,10004.0,10005.0,10006.0,10007.0,10008.0,10009.0,10059.0,10071.0,
            10042.0,10024.0,10025.0,10026.0,10023.0,10224.0,10225.0,10424.0,
            10024.1,10024.2,10024.3,10024.4,10024.5,
diff --git a/Configuration/PyReleaseValidation/python/relval_2023.py b/Configuration/PyReleaseValidation/python/relval_2023.py
index 950e4b26f5d3d..c55ef4eb412f6 100644
--- a/Configuration/PyReleaseValidation/python/relval_2023.py
+++ b/Configuration/PyReleaseValidation/python/relval_2023.py
@@ -21,10 +21,9 @@
 numWFIB.extend([22434.0]) #2023D24
 numWFIB.extend([24034.0]) #2023D28
 numWFIB.extend([27434.0,27434.21,27634.21]) #2023D35, prodlike, prodlike PU
-numWFIB.extend([23234.0]) #2023D36
-numWFIB.extend([23634.0]) #2023D37
 numWFIB.extend([27834.0]) #2023D38
 numWFIB.extend([28634.0]) #2023D40
 numWFIB.extend([29034.0]) #2023D41
+numWFIB.extend([29434.0]) #2023D42
 for numWF in numWFIB:
     workflows[numWF] = _upgrade_workflows[numWF]
diff --git a/Configuration/PyReleaseValidation/python/relval_standard.py b/Configuration/PyReleaseValidation/python/relval_standard.py
index 3664598d431a6..a777902e8367c 100644
--- a/Configuration/PyReleaseValidation/python/relval_standard.py
+++ b/Configuration/PyReleaseValidation/python/relval_standard.py
@@ -351,7 +351,7 @@
 workflows[136.8562] = ['',['RunZeroBias1_hBStarRP','HLTDR2_2018_hBStar','RECODR2_2018reHLT_Offline_hBStar','HARVEST2018_hBStar']]
 
 ### NANOAOD wf on 2018 prompt reco MINIADD
-workflows[136.8521] = ['',['RunJetHT2018A_nano','NANOEDM2018','HARVESTNANOAOD2018']]
+workflows[136.8521] = ['',['RunJetHT2018A_nano','NANOEDM2018_102Xv1','HARVESTNANOAOD2018_102Xv1']]
 
 ### run 2018B ###
 workflows[136.861] = ['',['RunHLTPhy2018B','HLTDR2_2018','RECODR2_2018reHLT_Offline','HARVEST2018']]
@@ -511,10 +511,14 @@
 workflows[7.20] = ['', ['Cosmics_UP18','DIGICOS_UP18','RECOCOS_UP18','ALCACOS_UP18','HARVESTCOS_UP18']]#2018
 workflows[7.21] = ['', ['Cosmics_UP17','DIGICOS_UP17','RECOCOS_UP17','ALCACOS_UP17','HARVESTCOS_UP17']]#2017
 workflows[7.22] = ['', ['Cosmics_UP16','DIGICOS_UP16','RECOCOS_UP16','ALCACOS_UP16','HARVESTCOS_UP16']]#2016
+workflows[7.23] = ['', ['Cosmics_UP21','DIGICOS_UP21','RECOCOS_UP21','ALCACOS_UP21','HARVESTCOS_UP21']]#2021
 workflows[7.3] = ['', ['CosmicsSPLoose_UP18','DIGICOS_UP18','RECOCOS_UP18','ALCACOS_UP18','HARVESTCOS_UP18']]
 workflows[7.4] = ['', ['Cosmics_UP18','DIGICOSPEAK_UP18','RECOCOSPEAK_UP18','ALCACOS_UP18','HARVESTCOS_UP18']]
 
 workflows[8]  = ['', ['BeamHalo','DIGICOS','RECOCOS','ALCABH','HARVESTCOS']]
+workflows[8.1] = ['', ['BeamHalo_UP18','DIGICOS_UP18','RECOCOS_UP18','ALCABH_UP18','HARVESTCOS_UP18']]
+workflows[8.2] = ['', ['BeamHalo_UP21','DIGICOS_UP21','RECOCOS_UP21','ALCABH_UP21','HARVESTCOS_UP21']]
+
 workflows[11] = ['', ['MinBias','DIGI','RECOMIN','HARVEST','ALCAMIN']]
 workflows[28] = ['', ['QCD_Pt_80_120','DIGI','RECO','HARVEST']]
 workflows[27] = ['', ['WM','DIGI','RECO','HARVEST']]
diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
index c6a5e70af7a0c..f10fa4b67839e 100644
--- a/Configuration/PyReleaseValidation/python/relval_steps.py
+++ b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -43,58 +43,58 @@
 #### data ####
 Run2010ASk=[138937,138934,138924,138923,139790,139789,139788,139787,144086,144085,144084,144083,144011]
 Run2010BSk=[146644,147115,147929,148822,149011,149181,149182,149291,149294,149442]
-steps['MinimumBias2010A']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2010A-valskim-v6/RAW-RECO',label='run2010A',location='STD',run=Run2010ASk)}
-steps['MinimumBias2010B']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2010B-valskim-v2/RAW-RECO',label='run2010B',run=Run2010BSk)}
-steps['WZMuSkim2010A']={'INPUT':InputInfo(dataSet='/Mu/Run2010A-WZMu-Nov4Skim_v1/RAW-RECO',label='wzMu2010A',run=Run2010ASk)}
-steps['WZMuSkim2010B']={'INPUT':InputInfo(dataSet='/Mu/Run2010B-WZMu-Nov4Skim_v1/RAW-RECO',label='wzMu2010B',run=Run2010BSk)}
-steps['WZEGSkim2010A']={'INPUT':InputInfo(dataSet='/EG/Run2010A-WZEG-Nov4Skim_v1/RAW-RECO',label='wzEG2010A',run=Run2010ASk)}
-steps['WZEGSkim2010B']={'INPUT':InputInfo(dataSet='/Electron/Run2010B-WZEG-Nov4Skim_v1/RAW-RECO',label='wzEG2010B',run=Run2010BSk)}
-
-steps['RunCosmicsA']={'INPUT':InputInfo(dataSet='/Cosmics/Run2010A-v1/RAW',label='cos2010A',run=[142089],events=100000)}
+steps['MinimumBias2010A']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2010A-valskim-v6/RAW-RECO',label='2010A',location='STD',run=Run2010ASk)}
+steps['MinimumBias2010B']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2010B-valskim-v2/RAW-RECO',label='2010B',run=Run2010BSk)}
+steps['WZMuSkim2010A']={'INPUT':InputInfo(dataSet='/Mu/Run2010A-WZMu-Nov4Skim_v1/RAW-RECO',label='2010A',run=Run2010ASk)}
+steps['WZMuSkim2010B']={'INPUT':InputInfo(dataSet='/Mu/Run2010B-WZMu-Nov4Skim_v1/RAW-RECO',label='2010B',run=Run2010BSk)}
+steps['WZEGSkim2010A']={'INPUT':InputInfo(dataSet='/EG/Run2010A-WZEG-Nov4Skim_v1/RAW-RECO',label='2010A',run=Run2010ASk)}
+steps['WZEGSkim2010B']={'INPUT':InputInfo(dataSet='/Electron/Run2010B-WZEG-Nov4Skim_v1/RAW-RECO',label='2010B',run=Run2010BSk)}
+
+steps['RunCosmicsA']={'INPUT':InputInfo(dataSet='/Cosmics/Run2010A-v1/RAW',label='2010A',run=[142089],events=100000)}
 Run2010B=[149011]
-steps['RunMinBias2010B']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2010B-RelValRawSkim-v1/RAW',label='mb2010B',run=Run2010B,events=100000)}
-steps['RunMu2010B']={'INPUT':InputInfo(dataSet='/Mu/Run2010B-RelValRawSkim-v1/RAW',label='mu2010B',run=Run2010B,events=100000)}
-steps['RunElectron2010B']={'INPUT':InputInfo(dataSet='/Electron/Run2010B-RelValRawSkim-v1/RAW',label='electron2010B',run=Run2010B,events=100000)}
-steps['RunPhoton2010B']={'INPUT':InputInfo(dataSet='/Photon/Run2010B-RelValRawSkim-v1/RAW',label='photon2010B',run=Run2010B,events=100000)}
-steps['RunJet2010B']={'INPUT':InputInfo(dataSet='/Jet/Run2010B-RelValRawSkim-v1/RAW',label='jet2010B',run=Run2010B,events=100000)}
+steps['RunMinBias2010B']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2010B-RelValRawSkim-v1/RAW',label='2010B',run=Run2010B,events=100000)}
+steps['RunMu2010B']={'INPUT':InputInfo(dataSet='/Mu/Run2010B-RelValRawSkim-v1/RAW',label='2010B',run=Run2010B,events=100000)}
+steps['RunElectron2010B']={'INPUT':InputInfo(dataSet='/Electron/Run2010B-RelValRawSkim-v1/RAW',label='2010B',run=Run2010B,events=100000)}
+steps['RunPhoton2010B']={'INPUT':InputInfo(dataSet='/Photon/Run2010B-RelValRawSkim-v1/RAW',label='2010B',run=Run2010B,events=100000)}
+steps['RunJet2010B']={'INPUT':InputInfo(dataSet='/Jet/Run2010B-RelValRawSkim-v1/RAW',label='2010B',run=Run2010B,events=100000)}
 
 #list of run to harvest 2011A: 165121, 172802,
 Run2011ASk=[165121,172802]
-steps['ValSkim2011A']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2011A-ValSkim-08Nov2011-v1/RAW-RECO',ib_block='239c497e-0fae-11e1-a8b1-00221959e72f',label='run2011A',location='STD',run=Run2011ASk)}
-steps['WMuSkim2011A']={'INPUT':InputInfo(dataSet='/SingleMu/Run2011A-WMu-08Nov2011-v1/RAW-RECO',ib_block='388c2990-0de6-11e1-bb7e-00221959e72f',label='wMu2011A',location='STD',run=Run2011ASk)}
-steps['WElSkim2011A']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2011A-WElectron-08Nov2011-v1/RAW-RECO',ib_block='9c48c4ea-0db2-11e1-b62c-00221959e69e',label='wEl2011A',location='STD',run=Run2011ASk)}
-steps['ZMuSkim2011A']={'INPUT':InputInfo(dataSet='/DoubleMu/Run2011A-ZMu-08Nov2011-v1/RAW-RECO',label='zMu2011A',location='STD',run=Run2011ASk)}
-steps['ZElSkim2011A']={'INPUT':InputInfo(dataSet='/DoubleElectron/Run2011A-ZElectron-08Nov2011-v1/RAW-RECO',label='zEl2011A',location='STD',run=Run2011ASk)}
-steps['HighMet2011A']={'INPUT':InputInfo(dataSet='/Jet/Run2011A-HighMET-08Nov2011-v1/RAW-RECO',ib_block='3c764584-0b59-11e1-b62c-00221959e69e',label='hMet2011A',location='STD',run=Run2011ASk)}
-
-steps['RunCosmics2011A']={'INPUT':InputInfo(dataSet='/Cosmics/Run2011A-v1/RAW',label='cos2011A',run=[160960],events=100000,location='STD')}
+steps['ValSkim2011A']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2011A-ValSkim-08Nov2011-v1/RAW-RECO',ib_block='239c497e-0fae-11e1-a8b1-00221959e72f',label='2011A',location='STD',run=Run2011ASk)}
+steps['WMuSkim2011A']={'INPUT':InputInfo(dataSet='/SingleMu/Run2011A-WMu-08Nov2011-v1/RAW-RECO',ib_block='388c2990-0de6-11e1-bb7e-00221959e72f',label='2011A',location='STD',run=Run2011ASk)}
+steps['WElSkim2011A']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2011A-WElectron-08Nov2011-v1/RAW-RECO',ib_block='9c48c4ea-0db2-11e1-b62c-00221959e69e',label='2011A',location='STD',run=Run2011ASk)}
+steps['ZMuSkim2011A']={'INPUT':InputInfo(dataSet='/DoubleMu/Run2011A-ZMu-08Nov2011-v1/RAW-RECO',label='2011A',location='STD',run=Run2011ASk)}
+steps['ZElSkim2011A']={'INPUT':InputInfo(dataSet='/DoubleElectron/Run2011A-ZElectron-08Nov2011-v1/RAW-RECO',label='2011A',location='STD',run=Run2011ASk)}
+steps['HighMet2011A']={'INPUT':InputInfo(dataSet='/Jet/Run2011A-HighMET-08Nov2011-v1/RAW-RECO',ib_block='3c764584-0b59-11e1-b62c-00221959e69e',label='2011A',location='STD',run=Run2011ASk)}
+
+steps['RunCosmics2011A']={'INPUT':InputInfo(dataSet='/Cosmics/Run2011A-v1/RAW',label='2011A',run=[160960],events=100000,location='STD')}
 Run2011A=[165121]
 Run2017BTE=[299149]
 Run2016HALP=[283383]
-steps['RunMinBias2011A']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2011A-v1/RAW',label='mb2011A',run=Run2011A,events=100000,location='STD')}
-steps['RunMu2011A']={'INPUT':InputInfo(dataSet='/SingleMu/Run2011A-v1/RAW',label='mu2011A',run=Run2011A,events=100000)}
-steps['RunElectron2011A']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2011A-v1/RAW',label='electron2011A',run=Run2011A,events=100000)}
-steps['RunPhoton2011A']={'INPUT':InputInfo(dataSet='/Photon/Run2011A-v1/RAW',label='photon2011A',run=Run2011A,events=100000)}
-steps['RunJet2011A']={'INPUT':InputInfo(dataSet='/Jet/Run2011A-v1/RAW',label='jet2011A',run=Run2011A,events=100000)}
-steps['TestEnableEcalHCAL2017B']={'INPUT':InputInfo(dataSet='/TestEnablesEcalHcal/Run2017B-v1/RAW',label='te2017B',run=Run2017BTE,events=100000,location='STD')}
+steps['RunMinBias2011A']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2011A-v1/RAW',label='2011A',run=Run2011A,events=100000,location='STD')}
+steps['RunMu2011A']={'INPUT':InputInfo(dataSet='/SingleMu/Run2011A-v1/RAW',label='2011A',run=Run2011A,events=100000)}
+steps['RunElectron2011A']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2011A-v1/RAW',label='2011A',run=Run2011A,events=100000)}
+steps['RunPhoton2011A']={'INPUT':InputInfo(dataSet='/Photon/Run2011A-v1/RAW',label='2011A',run=Run2011A,events=100000)}
+steps['RunJet2011A']={'INPUT':InputInfo(dataSet='/Jet/Run2011A-v1/RAW',label='2011A',run=Run2011A,events=100000)}
+steps['TestEnableEcalHCAL2017B']={'INPUT':InputInfo(dataSet='/TestEnablesEcalHcal/Run2017B-v1/RAW',label='2017B',run=Run2017BTE,events=100000,location='STD')}
 
-steps['AlCaLumiPixels2016H']={'INPUT':InputInfo(dataSet='/AlCaLumiPixels1/Run2016H-v1/RAW',label='alcalp2016H',run=Run2016HALP,events=100000,location='STD')}
+steps['AlCaLumiPixels2016H']={'INPUT':InputInfo(dataSet='/AlCaLumiPixels1/Run2016H-v1/RAW',label='2016H',run=Run2016HALP,events=100000,location='STD')}
 
 
 Run2011B=[177719]
 Run2011BSk=[177719,177790,177096,175874]
-steps['RunMinBias2011B']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2011B-v1/RAW',label='mb2011B',run=Run2011B,events=100000,location='STD')}
-steps['RunMu2011B']={'INPUT':InputInfo(dataSet='/SingleMu/Run2011B-v1/RAW',label='mu2011B',run=Run2011B,events=100000)}
-steps['RunElectron2011B']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2011B-v1/RAW',label='electron2011B',run=Run2011B,events=100000)}
-steps['RunPhoton2011B']={'INPUT':InputInfo(dataSet='/Photon/Run2011B-v1/RAW',label='photon2011B',run=Run2011B,events=100000)}
-steps['RunJet2011B']={'INPUT':InputInfo(dataSet='/Jet/Run2011B-v1/RAW',label='jet2011B',run=Run2011B,events=100000)}
-
-steps['ValSkim2011B']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2011B-ValSkim-19Nov2011-v1/RAW-RECO',label='run2011B',location='STD',run=Run2011BSk)}
-steps['WMuSkim2011B']={'INPUT':InputInfo(dataSet='/SingleMu/Run2011B-WMu-19Nov2011-v1/RAW-RECO',ib_block='19110c74-1b66-11e1-a98b-003048f02c8a',label='wMu2011B',location='STD',run=Run2011BSk)}
-steps['WElSkim2011B']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2011B-WElectron-19Nov2011-v1/RAW-RECO',ib_block='d75771a4-1b3f-11e1-aef4-003048f02c8a',label='wEl2011B',location='STD',run=Run2011BSk)}
-steps['ZMuSkim2011B']={'INPUT':InputInfo(dataSet='/DoubleMu/Run2011B-ZMu-19Nov2011-v1/RAW-RECO',label='zMu2011B',location='STD',run=Run2011BSk)}
-steps['ZElSkim2011B']={'INPUT':InputInfo(dataSet='/DoubleElectron/Run2011B-ZElectron-19Nov2011-v1/RAW-RECO',label='zEl2011B',run=Run2011BSk)}
-steps['HighMet2011B']={'INPUT':InputInfo(dataSet='/Jet/Run2011B-HighMET-19Nov2011-v1/RAW-RECO',label='hMet2011B',run=Run2011BSk)}
+steps['RunMinBias2011B']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2011B-v1/RAW',label='2011B',run=Run2011B,events=100000,location='STD')}
+steps['RunMu2011B']={'INPUT':InputInfo(dataSet='/SingleMu/Run2011B-v1/RAW',label='2011B',run=Run2011B,events=100000)}
+steps['RunElectron2011B']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2011B-v1/RAW',label='2011B',run=Run2011B,events=100000)}
+steps['RunPhoton2011B']={'INPUT':InputInfo(dataSet='/Photon/Run2011B-v1/RAW',label='2011B',run=Run2011B,events=100000)}
+steps['RunJet2011B']={'INPUT':InputInfo(dataSet='/Jet/Run2011B-v1/RAW',label='2011B',run=Run2011B,events=100000)}
+
+steps['ValSkim2011B']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2011B-ValSkim-19Nov2011-v1/RAW-RECO',label='2011B',location='STD',run=Run2011BSk)}
+steps['WMuSkim2011B']={'INPUT':InputInfo(dataSet='/SingleMu/Run2011B-WMu-19Nov2011-v1/RAW-RECO',ib_block='19110c74-1b66-11e1-a98b-003048f02c8a',label='2011B',location='STD',run=Run2011BSk)}
+steps['WElSkim2011B']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2011B-WElectron-19Nov2011-v1/RAW-RECO',ib_block='d75771a4-1b3f-11e1-aef4-003048f02c8a',label='2011B',location='STD',run=Run2011BSk)}
+steps['ZMuSkim2011B']={'INPUT':InputInfo(dataSet='/DoubleMu/Run2011B-ZMu-19Nov2011-v1/RAW-RECO',label='2011B',location='STD',run=Run2011BSk)}
+steps['ZElSkim2011B']={'INPUT':InputInfo(dataSet='/DoubleElectron/Run2011B-ZElectron-19Nov2011-v1/RAW-RECO',label='2011B',run=Run2011BSk)}
+steps['HighMet2011B']={'INPUT':InputInfo(dataSet='/Jet/Run2011B-HighMET-19Nov2011-v1/RAW-RECO',label='2011B',run=Run2011BSk)}
 
 steps['RunHI2010']={'INPUT':InputInfo(dataSet='/HIAllPhysics/HIRun2010-v1/RAW',label='hi2010',run=[152698],events=10000,location='STD')}
 steps['RunHI2011']={'INPUT':InputInfo(dataSet='/HIMinBiasUPC/HIRun2011-v1/RAW',label='hi2011',run=[182124],events=10000,location='STD')}
@@ -112,67 +112,67 @@
 
 Run2012A=[191226]
 Run2012ASk=Run2012A+[]
-steps['RunMinBias2012A']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2012A-v1/RAW',label='mb2012A',run=Run2012A, events=100000,location='STD')}
-steps['RunTau2012A']={'INPUT':InputInfo(dataSet='/Tau/Run2012A-v1/RAW',label='tau2012A', run=Run2012A, events=100000,location='STD')}
-steps['RunMET2012A']={'INPUT':InputInfo(dataSet='/MET/Run2012A-v1/RAW',label='met2012A', run=Run2012A, events=100000,location='STD')}
-steps['RunMu2012A']={'INPUT':InputInfo(dataSet='/SingleMu/Run2012A-v1/RAW',label='mu2012A', run=Run2012A, events=100000,location='STD')}
-steps['RunElectron2012A']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012A-v1/RAW',label='electron2012A', run=Run2012A, events=100000,location='STD')}
-steps['RunJet2012A']={'INPUT':InputInfo(dataSet='/Jet/Run2012A-v1/RAW',label='jet2012A', run=Run2012A, events=100000,location='STD')}
+steps['RunMinBias2012A']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2012A-v1/RAW',label='2012A',run=Run2012A, events=100000,location='STD')}
+steps['RunTau2012A']={'INPUT':InputInfo(dataSet='/Tau/Run2012A-v1/RAW',label='2012A', run=Run2012A, events=100000,location='STD')}
+steps['RunMET2012A']={'INPUT':InputInfo(dataSet='/MET/Run2012A-v1/RAW',label='2012A', run=Run2012A, events=100000,location='STD')}
+steps['RunMu2012A']={'INPUT':InputInfo(dataSet='/SingleMu/Run2012A-v1/RAW',label='2012A', run=Run2012A, events=100000,location='STD')}
+steps['RunElectron2012A']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012A-v1/RAW',label='2012A', run=Run2012A, events=100000,location='STD')}
+steps['RunJet2012A']={'INPUT':InputInfo(dataSet='/Jet/Run2012A-v1/RAW',label='2012A', run=Run2012A, events=100000,location='STD')}
 
-steps['WElSkim2012A']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012A-WElectron-13Jul2012-v1/USER',label='wEl2012A',location='STD',run=Run2012ASk)}
-steps['ZMuSkim2012A']={'INPUT':InputInfo(dataSet='/SingleMu/Run2012A-ZMu-13Jul2012-v1/RAW-RECO',label='zMu2012A',location='STD',run=Run2012ASk)}
-steps['ZElSkim2012A']={'INPUT':InputInfo(dataSet='/DoubleElectron/Run2012A-ZElectron-13Jul2012-v1/RAW-RECO',label='zEl2012A',run=Run2012ASk)}
-steps['HighMet2012A']={'INPUT':InputInfo(dataSet='/HT/Run2012A-HighMET-13Jul2012-v1/RAW-RECO',label='hMet2012A',run=Run2012ASk)}
+steps['WElSkim2012A']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012A-WElectron-13Jul2012-v1/USER',label='2012A',location='STD',run=Run2012ASk)}
+steps['ZMuSkim2012A']={'INPUT':InputInfo(dataSet='/SingleMu/Run2012A-ZMu-13Jul2012-v1/RAW-RECO',label='2012A',location='STD',run=Run2012ASk)}
+steps['ZElSkim2012A']={'INPUT':InputInfo(dataSet='/DoubleElectron/Run2012A-ZElectron-13Jul2012-v1/RAW-RECO',label='2012A',run=Run2012ASk)}
+steps['HighMet2012A']={'INPUT':InputInfo(dataSet='/HT/Run2012A-HighMET-13Jul2012-v1/RAW-RECO',label='2012A',run=Run2012ASk)}
 
 
 Run2012B=[194533]
 Run2012Bsk=Run2012B+[194912,195016]
-steps['RunMinBias2012B']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2012B-v1/RAW',label='mb2012B',run=Run2012B, events=100000,location='STD')}
-steps['RunMu2012B']={'INPUT':InputInfo(dataSet='/SingleMu/Run2012B-v1/RAW',label='mu2012B',location='STD',run=Run2012B)}
-steps['RunPhoton2012B']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2012B-v1/RAW',ib_block='28d7fcc8-a2a0-11e1-86c7-003048caaace',label='photon2012B',location='STD',run=Run2012B)}
-steps['RunEl2012B']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012B-v1/RAW',label='electron2012B',location='STD',run=Run2012B)}
-steps['RunJet2012B']={'INPUT':InputInfo(dataSet='/JetHT/Run2012B-v1/RAW',label='jet2012B',location='STD',run=Run2012B)}
-steps['ZMuSkim2012B']={'INPUT':InputInfo(dataSet='/SingleMu/Run2012B-ZMu-13Jul2012-v1/RAW-RECO',label='zMu2012B',location='CAF',run=Run2012Bsk)}
-steps['WElSkim2012B']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012B-WElectron-13Jul2012-v1/USER',label='wEl2012B',location='STD',run=Run2012Bsk)}
-steps['ZElSkim2012B']={'INPUT':InputInfo(dataSet='/DoubleElectron/Run2012B-ZElectron-22Jan2013-v1/RAW-RECO',ib_block='1f13b876-69fb-11e2-a7eb-00221959e72f',label='zEl2012B',location='STD',run=Run2012Bsk)}
+steps['RunMinBias2012B']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2012B-v1/RAW',label='2012B',run=Run2012B, events=100000,location='STD')}
+steps['RunMu2012B']={'INPUT':InputInfo(dataSet='/SingleMu/Run2012B-v1/RAW',label='2012B',location='STD',run=Run2012B)}
+steps['RunPhoton2012B']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2012B-v1/RAW',ib_block='28d7fcc8-a2a0-11e1-86c7-003048caaace',label='2012B',location='STD',run=Run2012B)}
+steps['RunEl2012B']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012B-v1/RAW',label='2012B',location='STD',run=Run2012B)}
+steps['RunJet2012B']={'INPUT':InputInfo(dataSet='/JetHT/Run2012B-v1/RAW',label='2012B',location='STD',run=Run2012B)}
+steps['ZMuSkim2012B']={'INPUT':InputInfo(dataSet='/SingleMu/Run2012B-ZMu-13Jul2012-v1/RAW-RECO',label='2012B',location='CAF',run=Run2012Bsk)}
+steps['WElSkim2012B']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012B-WElectron-13Jul2012-v1/USER',label='2012B',location='STD',run=Run2012Bsk)}
+steps['ZElSkim2012B']={'INPUT':InputInfo(dataSet='/DoubleElectron/Run2012B-ZElectron-22Jan2013-v1/RAW-RECO',ib_block='1f13b876-69fb-11e2-a7eb-00221959e72f',label='2012B',location='STD',run=Run2012Bsk)}
 
 Run2012C=[199812]
 Run2012Csk=Run2012C+[203002]
-steps['RunMinBias2012C']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2012C-v1/RAW',label='mb2012C',run=Run2012C, events=100000,location='STD')}
-steps['RunMu2012C']={'INPUT':InputInfo(dataSet='/SingleMu/Run2012C-v1/RAW',label='mu2012C',location='STD',run=Run2012C)}
-steps['RunPhoton2012C']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2012C-v1/RAW',label='photon2012C',location='STD',run=Run2012C)}
-steps['RunEl2012C']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012C-v1/RAW',label='electron2012C',location='STD',run=Run2012C)}
-steps['RunJet2012C']={'INPUT':InputInfo(dataSet='/JetHT/Run2012C-v1/RAW',label='jet2012C',location='STD',run=Run2012C)}
-steps['ZMuSkim2012C']={'INPUT':InputInfo(dataSet='/SingleMu/Run2012C-ZMu-PromptSkim-v3/RAW-RECO',label='zMu2012C',location='CAF',run=Run2012Csk)}
-steps['WElSkim2012C']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012C-WElectron-PromptSkim-v3/USER',label='wEl2012C',location='STD',run=Run2012Csk)}
-steps['ZElSkim2012C']={'INPUT':InputInfo(dataSet='/DoubleElectron/Run2012C-ZElectron-22Jan2013-v1/RAW-RECO',label='zEl2012C',location='STD',run=Run2012Csk)}
+steps['RunMinBias2012C']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2012C-v1/RAW',label='2012C',run=Run2012C, events=100000,location='STD')}
+steps['RunMu2012C']={'INPUT':InputInfo(dataSet='/SingleMu/Run2012C-v1/RAW',label='2012C',location='STD',run=Run2012C)}
+steps['RunPhoton2012C']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2012C-v1/RAW',label='2012C',location='STD',run=Run2012C)}
+steps['RunEl2012C']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012C-v1/RAW',label='2012C',location='STD',run=Run2012C)}
+steps['RunJet2012C']={'INPUT':InputInfo(dataSet='/JetHT/Run2012C-v1/RAW',label='2012C',location='STD',run=Run2012C)}
+steps['ZMuSkim2012C']={'INPUT':InputInfo(dataSet='/SingleMu/Run2012C-ZMu-PromptSkim-v3/RAW-RECO',label='2012C',location='CAF',run=Run2012Csk)}
+steps['WElSkim2012C']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012C-WElectron-PromptSkim-v3/USER',label='2012C',location='STD',run=Run2012Csk)}
+steps['ZElSkim2012C']={'INPUT':InputInfo(dataSet='/DoubleElectron/Run2012C-ZElectron-22Jan2013-v1/RAW-RECO',label='2012C',location='STD',run=Run2012Csk)}
 
 Run2012D=[208307]
 Run2012Dsk=Run2012D+[207454]
-steps['RunMinBias2012D']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2012D-v1/RAW',label='mb2012D',run=Run2012D, events=100000,location='STD')}
-steps['RunMu2012D']={'INPUT':InputInfo(dataSet='/SingleMu/Run2012D-v1/RAW',label='mu2012D',location='STD',run=Run2012D)}
-steps['RunPhoton2012D']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2012D-v1/RAW',label='photon2012D',location='STD',run=Run2012D)}
-steps['RunEl2012D']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012D-v1/RAW',label='electron2012D',location='STD',run=Run2012D)}
-steps['RunJet2012D']={'INPUT':InputInfo(dataSet='/JetHT/Run2012D-v1/RAW',label='jet2012D',location='STD',run=Run2012D)}
+steps['RunMinBias2012D']={'INPUT':InputInfo(dataSet='/MinimumBias/Run2012D-v1/RAW',label='2012D',run=Run2012D, events=100000,location='STD')}
+steps['RunMu2012D']={'INPUT':InputInfo(dataSet='/SingleMu/Run2012D-v1/RAW',label='2012D',location='STD',run=Run2012D)}
+steps['RunPhoton2012D']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2012D-v1/RAW',label='2012D',location='STD',run=Run2012D)}
+steps['RunEl2012D']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012D-v1/RAW',label='2012D',location='STD',run=Run2012D)}
+steps['RunJet2012D']={'INPUT':InputInfo(dataSet='/JetHT/Run2012D-v1/RAW',label='2012D',location='STD',run=Run2012D)}
 # the previous  /SingleMu/Run2012D-ZMu-15Apr2014-v1/RAW-RECO is deprecated in DAS
-steps['ZMuSkim2012D']={'INPUT':InputInfo(dataSet='/SingleMu/Run2012D-ZMu-15Apr2014-v1/RAW-RECO',label='zMu2012D',location='STD',run=Run2012Dsk)}
+steps['ZMuSkim2012D']={'INPUT':InputInfo(dataSet='/SingleMu/Run2012D-ZMu-15Apr2014-v1/RAW-RECO',label='2012D',location='STD',run=Run2012Dsk)}
 # the previous /SingleElectron/Run2012D-WElectron-PromptSkim-v1/USER is deprecated in DAS
-steps['WElSkim2012D']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012D-WElectron-22Jan2013-v1/USER',label='wEl2012D',location='STD',run=Run2012Dsk)}
-steps['ZElSkim2012D']={'INPUT':InputInfo(dataSet='/DoubleElectron/Run2012D-ZElectron-22Jan2013-v1/RAW-RECO',label='zEl2012D',location='STD',run=Run2012Dsk)}
+steps['WElSkim2012D']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2012D-WElectron-22Jan2013-v1/USER',label='2012D',location='STD',run=Run2012Dsk)}
+steps['ZElSkim2012D']={'INPUT':InputInfo(dataSet='/DoubleElectron/Run2012D-ZElectron-22Jan2013-v1/RAW-RECO',label='2012D',location='STD',run=Run2012Dsk)}
 
 #### run2 2015B ####
 # Run2015B=[251642] #  251561 251638 251642
 Run2015B=selectedLS([251251])
-steps['RunHLTPhy2015B']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2015B-v1/RAW',label='hltPhy2015B',events=100000,location='STD', ls=Run2015B)}
-steps['RunDoubleEG2015B']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2015B-v1/RAW',label='doubEG2015B',events=100000,location='STD', ls=Run2015B)}
-steps['RunDoubleMuon2015B']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2015B-v1/RAW',label='doubMu2015B',events=100000,location='STD', ls=Run2015B)}
-steps['RunJetHT2015B']={'INPUT':InputInfo(dataSet='/JetHT/Run2015B-v1/RAW',label='jetHT2015B',events=100000,location='STD', ls=Run2015B)}
-steps['RunMET2015B']={'INPUT':InputInfo(dataSet='/MET/Run2015B-v1/RAW',label='met2015B',events=100000,location='STD', ls=Run2015B)}
-steps['RunMuonEG2015B']={'INPUT':InputInfo(dataSet='/MuonEG/Run2015B-v1/RAW',label='muEG2015B',events=100000,location='STD', ls=Run2015B)}
-steps['RunSingleEl2015B']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2015B-v1/RAW',label='sigEl2015B',events=100000,location='STD', ls=Run2015B)}
-steps['RunSingleMu2015B']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2015B-v1/RAW',label='sigMu2015B',events=100000,location='STD', ls=Run2015B)}
-steps['RunSinglePh2015B']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2015B-v1/RAW',label='sigPh2015B',events=100000,location='STD', ls=Run2015B)}
-steps['RunZeroBias2015B']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2015B-v1/RAW',label='zb2015B',events=100000,location='STD', ls=Run2015B)}
+steps['RunHLTPhy2015B']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2015B-v1/RAW',label='2015B',events=100000,location='STD', ls=Run2015B)}
+steps['RunDoubleEG2015B']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2015B-v1/RAW',label='2015B',events=100000,location='STD', ls=Run2015B)}
+steps['RunDoubleMuon2015B']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2015B-v1/RAW',label='2015B',events=100000,location='STD', ls=Run2015B)}
+steps['RunJetHT2015B']={'INPUT':InputInfo(dataSet='/JetHT/Run2015B-v1/RAW',label='2015B',events=100000,location='STD', ls=Run2015B)}
+steps['RunMET2015B']={'INPUT':InputInfo(dataSet='/MET/Run2015B-v1/RAW',label='2015B',events=100000,location='STD', ls=Run2015B)}
+steps['RunMuonEG2015B']={'INPUT':InputInfo(dataSet='/MuonEG/Run2015B-v1/RAW',label='2015B',events=100000,location='STD', ls=Run2015B)}
+steps['RunSingleEl2015B']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2015B-v1/RAW',label='2015B',events=100000,location='STD', ls=Run2015B)}
+steps['RunSingleMu2015B']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2015B-v1/RAW',label='2015B',events=100000,location='STD', ls=Run2015B)}
+steps['RunSinglePh2015B']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2015B-v1/RAW',label='2015B',events=100000,location='STD', ls=Run2015B)}
+steps['RunZeroBias2015B']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2015B-v1/RAW',label='2015B',events=100000,location='STD', ls=Run2015B)}
 
 
 
@@ -181,224 +181,224 @@
 # Run2015C, 25ns: 254790 (852 LS and 65 files), 254852 (126 LS and 5 files), 254879 (178 LS and 11 files)
 Run2015C=selectedLS([254790])
 Run2015C_full=selectedLS([254790, 254852, 254879])
-steps['RunHLTPhy2015C']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2015C-v1/RAW',label='hltPhy2015C',events=100000,location='STD', ls=Run2015C)}
-steps['RunDoubleEG2015C']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2015C-v1/RAW',label='doubEG2015C',events=100000,location='STD', ls=Run2015C)}
-steps['RunDoubleMuon2015C']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2015C-v1/RAW',label='doubMu2015C',events=100000,location='STD', ls=Run2015C)}
-steps['RunJetHT2015C']={'INPUT':InputInfo(dataSet='/JetHT/Run2015C-v1/RAW',label='jetHT2015C',events=100000,location='STD', ls=Run2015C)}
-steps['RunMET2015C']={'INPUT':InputInfo(dataSet='/MET/Run2015C-v1/RAW',label='met2015C',events=100000,location='STD', ls=Run2015C)}
-steps['RunMuonEG2015C']={'INPUT':InputInfo(dataSet='/MuonEG/Run2015C-v1/RAW',label='muEG2015C',events=100000,location='STD', ls=Run2015C)}
-steps['RunDoubleEGPrpt2015C']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2015C-ZElectron-PromptReco-v1/RAW-RECO',label='dbEGPrpt2015C',events=100000,location='STD', ls=Run2015C_full)}
-steps['RunSingleMuPrpt2015C']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2015C-ZMu-PromptReco-v1/RAW-RECO',label='sgMuPrpt2015C',events=100000,location='STD', ls=Run2015C_full)}
-steps['RunSingleEl2015C']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2015C-v1/RAW',label='sigEl2015C',events=100000,location='STD', ls=Run2015C)}
-steps['RunSingleMu2015C']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2015C-v1/RAW',label='sigMu2015C',events=100000,location='STD', ls=Run2015C)}
-steps['RunSinglePh2015C']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2015C-v1/RAW',label='sigPh2015C',events=100000,location='STD', ls=Run2015C)}
-steps['RunZeroBias2015C']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2015C-v1/RAW',label='zb2015C',events=100000,location='STD', ls=Run2015C)}
+steps['RunHLTPhy2015C']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2015C-v1/RAW',label='2015C',events=100000,location='STD', ls=Run2015C)}
+steps['RunDoubleEG2015C']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2015C-v1/RAW',label='2015C',events=100000,location='STD', ls=Run2015C)}
+steps['RunDoubleMuon2015C']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2015C-v1/RAW',label='2015C',events=100000,location='STD', ls=Run2015C)}
+steps['RunJetHT2015C']={'INPUT':InputInfo(dataSet='/JetHT/Run2015C-v1/RAW',label='2015C',events=100000,location='STD', ls=Run2015C)}
+steps['RunMET2015C']={'INPUT':InputInfo(dataSet='/MET/Run2015C-v1/RAW',label='2015C',events=100000,location='STD', ls=Run2015C)}
+steps['RunMuonEG2015C']={'INPUT':InputInfo(dataSet='/MuonEG/Run2015C-v1/RAW',label='2015C',events=100000,location='STD', ls=Run2015C)}
+steps['RunDoubleEGPrpt2015C']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2015C-ZElectron-PromptReco-v1/RAW-RECO',label='2015C',events=100000,location='STD', ls=Run2015C_full)}
+steps['RunSingleMuPrpt2015C']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2015C-ZMu-PromptReco-v1/RAW-RECO',label='2015C',events=100000,location='STD', ls=Run2015C_full)}
+steps['RunSingleEl2015C']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2015C-v1/RAW',label='2015C',events=100000,location='STD', ls=Run2015C)}
+steps['RunSingleMu2015C']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2015C-v1/RAW',label='2015C',events=100000,location='STD', ls=Run2015C)}
+steps['RunSinglePh2015C']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2015C-v1/RAW',label='2015C',events=100000,location='STD', ls=Run2015C)}
+steps['RunZeroBias2015C']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2015C-v1/RAW',label='2015C',events=100000,location='STD', ls=Run2015C)}
 
 
 #### run2 2015D ####
 # Run2015D, 25ns: 256677
 Run2015D=selectedLS([256677])
-steps['RunHLTPhy2015D']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2015D-v1/RAW',label='hltPhy2015D',events=100000,location='STD', ls=Run2015D)}
-steps['RunDoubleEG2015D']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2015D-v1/RAW',label='doubEG2015D',events=100000,location='STD', ls=Run2015D)}
-steps['RunDoubleMuon2015D']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2015D-v1/RAW',label='doubMu2015D',events=100000,location='STD', ls=Run2015D)}
-steps['RunJetHT2015D']={'INPUT':InputInfo(dataSet='/JetHT/Run2015D-v1/RAW',label='jetHT2015D',events=100000,location='STD', ls=Run2015D)}
-steps['RunMET2015D']={'INPUT':InputInfo(dataSet='/MET/Run2015D-v1/RAW',label='met2015D',events=100000,location='STD', ls=Run2015D)}
-steps['RunMuonEG2015D']={'INPUT':InputInfo(dataSet='/MuonEG/Run2015D-v1/RAW',label='muEG2015D',events=100000,location='STD', ls=Run2015D)}
-steps['RunDoubleEGPrpt2015D']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2015D-ZElectron-PromptReco-v3/RAW-RECO',label='dbEGPrpt2015D',events=100000,location='STD', ls=Run2015D)}
-steps['RunSingleMuPrpt2015D']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2015D-ZMu-PromptReco-v3/RAW-RECO',label='sgMuPrpt2015D',events=100000,location='STD', ls=Run2015D)}
-steps['RunSingleEl2015D']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2015D-v1/RAW',label='sigEl2015D',events=100000,location='STD', ls=Run2015D)}
-steps['RunSingleMu2015D']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2015D-v1/RAW',label='sigMu2015D',events=100000,location='STD', ls=Run2015D)}
-steps['RunSinglePh2015D']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2015D-v1/RAW',label='sigPh2015D',events=100000,location='STD', ls=Run2015D)}
-steps['RunZeroBias2015D']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2015D-v1/RAW',label='zb2015D',events=100000,location='STD',ib_block='38d4cab6-5d5f-11e5-824b-001e67ac06a0',ls=Run2015D)}
+steps['RunHLTPhy2015D']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2015D-v1/RAW',label='2015D',events=100000,location='STD', ls=Run2015D)}
+steps['RunDoubleEG2015D']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2015D-v1/RAW',label='2015D',events=100000,location='STD', ls=Run2015D)}
+steps['RunDoubleMuon2015D']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2015D-v1/RAW',label='2015D',events=100000,location='STD', ls=Run2015D)}
+steps['RunJetHT2015D']={'INPUT':InputInfo(dataSet='/JetHT/Run2015D-v1/RAW',label='2015D',events=100000,location='STD', ls=Run2015D)}
+steps['RunMET2015D']={'INPUT':InputInfo(dataSet='/MET/Run2015D-v1/RAW',label='2015D',events=100000,location='STD', ls=Run2015D)}
+steps['RunMuonEG2015D']={'INPUT':InputInfo(dataSet='/MuonEG/Run2015D-v1/RAW',label='2015D',events=100000,location='STD', ls=Run2015D)}
+steps['RunDoubleEGPrpt2015D']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2015D-ZElectron-PromptReco-v3/RAW-RECO',label='2015D',events=100000,location='STD', ls=Run2015D)}
+steps['RunSingleMuPrpt2015D']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2015D-ZMu-PromptReco-v3/RAW-RECO',label='2015D',events=100000,location='STD', ls=Run2015D)}
+steps['RunSingleEl2015D']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2015D-v1/RAW',label='2015D',events=100000,location='STD', ls=Run2015D)}
+steps['RunSingleMu2015D']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2015D-v1/RAW',label='2015D',events=100000,location='STD', ls=Run2015D)}
+steps['RunSinglePh2015D']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2015D-v1/RAW',label='2015D',events=100000,location='STD', ls=Run2015D)}
+steps['RunZeroBias2015D']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2015D-v1/RAW',label='2015D',events=100000,location='STD',ib_block='38d4cab6-5d5f-11e5-824b-001e67ac06a0',ls=Run2015D)}
 
 #### run2 2016B ####
 # Run2016B, 25ns: 274160
 #Run2016B=selectedLS([274160],l_json=data_json2016)
 Run2016B={274199: [[1, 180]]}
-steps['RunHLTPhy2016B']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2016B-v2/RAW',label='hltPhy2016B',events=100000,location='STD', ls=Run2016B)}
-steps['RunDoubleEG2016B']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2016B-v2/RAW',label='doubEG2016B',events=100000,location='STD', ls=Run2016B)}
-steps['RunDoubleMuon2016B']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2016B-v2/RAW',label='doubMu2016B',events=100000,location='STD', ls=Run2016B)}
-steps['RunJetHT2016B']={'INPUT':InputInfo(dataSet='/JetHT/Run2016B-v2/RAW',label='jetHT2016B',events=100000,location='STD', ls=Run2016B)}
-steps['RunMET2016B']={'INPUT':InputInfo(dataSet='/MET/Run2016B-v2/RAW',label='met2016B',events=100000,location='STD', ls=Run2016B)}
-steps['RunMuonEG2016B']={'INPUT':InputInfo(dataSet='/MuonEG/Run2016B-v2/RAW',label='muEG2016B',events=100000,location='STD', ls=Run2016B)}
-steps['RunDoubleEGPrpt2016B']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2016B-ZElectron-PromptReco-v2/RAW-RECO',label='dbEGPrpt2016B',events=100000,location='STD', ls=Run2016B)}
-steps['RunSingleMuPrpt2016B']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2016B-ZMu-PromptReco-v2/RAW-RECO',label='sgMuPrpt2016B',events=100000,location='STD', ls=Run2016B)}
-steps['RunSingleEl2016B']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2016B-v2/RAW',label='sigEl2016B',events=100000,location='STD', ls={274199: [[1, 120]]})}
-steps['RunSingleMu2016B']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2016B-v2/RAW',label='sigMu2016B',events=100000,location='STD', ls={274199: [[1, 120]]})}
-steps['RunSinglePh2016B']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2016B-v2/RAW',label='sigPh2016B',events=100000,location='STD', ls=Run2016B)}
-steps['RunZeroBias2016B']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2016B-v2/RAW',label='zb2016B',events=100000,location='STD', ls=Run2016B)}
-steps['RunMuOnia2016B']={'INPUT':InputInfo(dataSet='/MuOnia/Run2016B-v2/RAW',label='muOnia2016B',events=100000,location='STD', ls=Run2016B)}
-steps['RunNoBPTX2016B']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2016B-v2/RAW',label='noBptx2016B',events=100000,location='STD', ls=Run2016B)}
+steps['RunHLTPhy2016B']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2016B-v2/RAW',label='2016B',events=100000,location='STD', ls=Run2016B)}
+steps['RunDoubleEG2016B']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2016B-v2/RAW',label='2016B',events=100000,location='STD', ls=Run2016B)}
+steps['RunDoubleMuon2016B']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2016B-v2/RAW',label='2016B',events=100000,location='STD', ls=Run2016B)}
+steps['RunJetHT2016B']={'INPUT':InputInfo(dataSet='/JetHT/Run2016B-v2/RAW',label='2016B',events=100000,location='STD', ls=Run2016B)}
+steps['RunMET2016B']={'INPUT':InputInfo(dataSet='/MET/Run2016B-v2/RAW',label='2016B',events=100000,location='STD', ls=Run2016B)}
+steps['RunMuonEG2016B']={'INPUT':InputInfo(dataSet='/MuonEG/Run2016B-v2/RAW',label='2016B',events=100000,location='STD', ls=Run2016B)}
+steps['RunDoubleEGPrpt2016B']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2016B-ZElectron-PromptReco-v2/RAW-RECO',label='2016B',events=100000,location='STD', ls=Run2016B)}
+steps['RunSingleMuPrpt2016B']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2016B-ZMu-PromptReco-v2/RAW-RECO',label='2016B',events=100000,location='STD', ls=Run2016B)}
+steps['RunSingleEl2016B']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2016B-v2/RAW',label='2016B',events=100000,location='STD', ls={274199: [[1, 120]]})}
+steps['RunSingleMu2016B']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2016B-v2/RAW',label='2016B',events=100000,location='STD', ls={274199: [[1, 120]]})}
+steps['RunSinglePh2016B']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2016B-v2/RAW',label='2016B',events=100000,location='STD', ls=Run2016B)}
+steps['RunZeroBias2016B']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2016B-v2/RAW',label='2016B',events=100000,location='STD', ls=Run2016B)}
+steps['RunMuOnia2016B']={'INPUT':InputInfo(dataSet='/MuOnia/Run2016B-v2/RAW',label='2016B',events=100000,location='STD', ls=Run2016B)}
+steps['RunNoBPTX2016B']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2016B-v2/RAW',label='2016B',events=100000,location='STD', ls=Run2016B)}
 
 #### run2 2016C ####
 Run2016C={276092: [[115, 149]]}
-steps['RunHLTPhy2016C']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2016C-v2/RAW',label='hltPhy2016C',events=100000,location='STD', ls=Run2016C)}
-steps['RunDoubleEG2016C']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2016C-v2/RAW',label='doubEG2016C',events=100000,location='STD', ls=Run2016C)}
-steps['RunDoubleMuon2016C']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2016C-v2/RAW',label='doubMu2016C',events=100000,location='STD', ls=Run2016C)}
-steps['RunJetHT2016C']={'INPUT':InputInfo(dataSet='/JetHT/Run2016C-v2/RAW',label='jetHT2016C',events=100000,location='STD', ls=Run2016C)}
-steps['RunMET2016C']={'INPUT':InputInfo(dataSet='/MET/Run2016C-v2/RAW',label='met2016C',events=100000,location='STD', ls=Run2016C)}
-steps['RunMuonEG2016C']={'INPUT':InputInfo(dataSet='/MuonEG/Run2016C-v2/RAW',label='muEG2016C',events=100000,location='STD', ls=Run2016C)}
-steps['RunSingleEl2016C']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2016C-v2/RAW',label='sigEl2016C',events=100000,location='STD', ls=Run2016C)}
-steps['RunSingleMu2016C']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2016C-v2/RAW',label='sigMu2016C',events=100000,location='STD', ls=Run2016C)}
-steps['RunSinglePh2016C']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2016C-v2/RAW',label='sigPh2016C',events=100000,location='STD', ls=Run2016C)}
-steps['RunZeroBias2016C']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2016C-v2/RAW',label='zb2016C',events=100000,location='STD', ls=Run2016C)}
-steps['RunMuOnia2016C']={'INPUT':InputInfo(dataSet='/MuOnia/Run2016C-v2/RAW',label='muOnia2016C',events=100000,location='STD', ls=Run2016C)}
+steps['RunHLTPhy2016C']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2016C-v2/RAW',label='2016C',events=100000,location='STD', ls=Run2016C)}
+steps['RunDoubleEG2016C']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2016C-v2/RAW',label='2016C',events=100000,location='STD', ls=Run2016C)}
+steps['RunDoubleMuon2016C']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2016C-v2/RAW',label='2016C',events=100000,location='STD', ls=Run2016C)}
+steps['RunJetHT2016C']={'INPUT':InputInfo(dataSet='/JetHT/Run2016C-v2/RAW',label='2016C',events=100000,location='STD', ls=Run2016C)}
+steps['RunMET2016C']={'INPUT':InputInfo(dataSet='/MET/Run2016C-v2/RAW',label='2016C',events=100000,location='STD', ls=Run2016C)}
+steps['RunMuonEG2016C']={'INPUT':InputInfo(dataSet='/MuonEG/Run2016C-v2/RAW',label='2016C',events=100000,location='STD', ls=Run2016C)}
+steps['RunSingleEl2016C']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2016C-v2/RAW',label='2016C',events=100000,location='STD', ls=Run2016C)}
+steps['RunSingleMu2016C']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2016C-v2/RAW',label='2016C',events=100000,location='STD', ls=Run2016C)}
+steps['RunSinglePh2016C']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2016C-v2/RAW',label='2016C',events=100000,location='STD', ls=Run2016C)}
+steps['RunZeroBias2016C']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2016C-v2/RAW',label='2016C',events=100000,location='STD', ls=Run2016C)}
+steps['RunMuOnia2016C']={'INPUT':InputInfo(dataSet='/MuOnia/Run2016C-v2/RAW',label='2016C',events=100000,location='STD', ls=Run2016C)}
 
 #### run2 2016D ####
 Run2016D={276807: [[66, 100]]}
-steps['RunHLTPhy2016D']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2016D-v2/RAW',label='hltPhy2016D',events=100000,location='STD', ls=Run2016D)}
-steps['RunDoubleEG2016D']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2016D-v2/RAW',label='doubEG2016D',events=100000,location='STD', ls=Run2016D)}
-steps['RunDoubleMuon2016D']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2016D-v2/RAW',label='doubMu2016D',events=100000,location='STD', ls=Run2016D)}
-steps['RunJetHT2016D']={'INPUT':InputInfo(dataSet='/JetHT/Run2016D-v2/RAW',label='jetHT2016D',events=100000,location='STD', ls=Run2016D)}
-steps['RunMET2016D']={'INPUT':InputInfo(dataSet='/MET/Run2016D-v2/RAW',label='met2016D',events=100000,location='STD', ls=Run2016D)}
-steps['RunMuonEG2016D']={'INPUT':InputInfo(dataSet='/MuonEG/Run2016D-v2/RAW',label='muEG2016D',events=100000,location='STD', ls=Run2016D)}
-steps['RunSingleEl2016D']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2016D-v2/RAW',label='sigEl2016D',events=100000,location='STD', ls=Run2016D)}
-steps['RunSingleMu2016D']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2016D-v2/RAW',label='sigMu2016D',events=100000,location='STD', ls=Run2016D)}
-steps['RunSinglePh2016D']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2016D-v2/RAW',label='sigPh2016D',events=100000,location='STD', ls=Run2016D)}
-steps['RunZeroBias2016D']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2016D-v2/RAW',label='zb2016D',events=100000,location='STD', ls=Run2016D)}
-steps['RunMuOnia2016D']={'INPUT':InputInfo(dataSet='/MuOnia/Run2016D-v2/RAW',label='muOnia2016D',events=100000,location='STD', ls=Run2016D)}
+steps['RunHLTPhy2016D']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2016D-v2/RAW',label='2016D',events=100000,location='STD', ls=Run2016D)}
+steps['RunDoubleEG2016D']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2016D-v2/RAW',label='2016D',events=100000,location='STD', ls=Run2016D)}
+steps['RunDoubleMuon2016D']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2016D-v2/RAW',label='2016D',events=100000,location='STD', ls=Run2016D)}
+steps['RunJetHT2016D']={'INPUT':InputInfo(dataSet='/JetHT/Run2016D-v2/RAW',label='2016D',events=100000,location='STD', ls=Run2016D)}
+steps['RunMET2016D']={'INPUT':InputInfo(dataSet='/MET/Run2016D-v2/RAW',label='2016D',events=100000,location='STD', ls=Run2016D)}
+steps['RunMuonEG2016D']={'INPUT':InputInfo(dataSet='/MuonEG/Run2016D-v2/RAW',label='2016D',events=100000,location='STD', ls=Run2016D)}
+steps['RunSingleEl2016D']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2016D-v2/RAW',label='2016D',events=100000,location='STD', ls=Run2016D)}
+steps['RunSingleMu2016D']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2016D-v2/RAW',label='2016D',events=100000,location='STD', ls=Run2016D)}
+steps['RunSinglePh2016D']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2016D-v2/RAW',label='2016D',events=100000,location='STD', ls=Run2016D)}
+steps['RunZeroBias2016D']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2016D-v2/RAW',label='2016D',events=100000,location='STD', ls=Run2016D)}
+steps['RunMuOnia2016D']={'INPUT':InputInfo(dataSet='/MuOnia/Run2016D-v2/RAW',label='2016D',events=100000,location='STD', ls=Run2016D)}
 
 #### run2 2016E ####
 Run2016E={277069: [[81, 120]]}
-steps['RunHLTPhy2016E']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2016E-v2/RAW',label='hltPhy2016E',events=100000,location='STD', ls=Run2016E)}
-steps['RunDoubleEG2016E']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2016E-v2/RAW',label='doubEG2016E',events=100000,location='STD', ls=Run2016E)}
-steps['RunDoubleMuon2016E']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2016E-v2/RAW',label='doubMu2016E',events=100000,location='STD', ls=Run2016E)}
-steps['RunJetHT2016E']={'INPUT':InputInfo(dataSet='/JetHT/Run2016E-v2/RAW',label='jetHT2016E',events=100000,location='STD', ls=Run2016E)}
-steps['RunMET2016E']={'INPUT':InputInfo(dataSet='/MET/Run2016E-v2/RAW',label='met2016E',events=100000,location='STD', ls=Run2016E)}
-steps['RunMuonEG2016E']={'INPUT':InputInfo(dataSet='/MuonEG/Run2016E-v2/RAW',label='muEG2016E',events=100000,location='STD', ls=Run2016E)}
-steps['RunSingleEl2016E']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2016E-v2/RAW',label='sigEl2016E',events=100000,location='STD', ls=Run2016E)}
-steps['RunSingleMu2016E']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2016E-v2/RAW',label='sigMu2016E',events=100000,location='STD', ls=Run2016E)}
-steps['RunSinglePh2016E']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2016E-v2/RAW',label='sigPh2016E',events=100000,location='STD', ls=Run2016E)}
-steps['RunZeroBias2016E']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2016E-v2/RAW',label='zb2016E',events=100000,location='STD', ls=Run2016E)}
-steps['RunMuOnia2016E']={'INPUT':InputInfo(dataSet='/MuOnia/Run2016E-v2/RAW',label='muOnia2016E',events=100000,location='STD', ls=Run2016E)}
-steps['RunJetHT2016E_reminiaod']={'INPUT':InputInfo(dataSet='/JetHT/Run2016E-18Apr2017-v1/AOD',label='rmaod_jetHT2016E',events=100000,location='STD', ls=Run2016E)}
+steps['RunHLTPhy2016E']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2016E-v2/RAW',label='2016E',events=100000,location='STD', ls=Run2016E)}
+steps['RunDoubleEG2016E']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2016E-v2/RAW',label='2016E',events=100000,location='STD', ls=Run2016E)}
+steps['RunDoubleMuon2016E']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2016E-v2/RAW',label='2016E',events=100000,location='STD', ls=Run2016E)}
+steps['RunJetHT2016E']={'INPUT':InputInfo(dataSet='/JetHT/Run2016E-v2/RAW',label='2016E',events=100000,location='STD', ls=Run2016E)}
+steps['RunMET2016E']={'INPUT':InputInfo(dataSet='/MET/Run2016E-v2/RAW',label='2016E',events=100000,location='STD', ls=Run2016E)}
+steps['RunMuonEG2016E']={'INPUT':InputInfo(dataSet='/MuonEG/Run2016E-v2/RAW',label='2016E',events=100000,location='STD', ls=Run2016E)}
+steps['RunSingleEl2016E']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2016E-v2/RAW',label='2016E',events=100000,location='STD', ls=Run2016E)}
+steps['RunSingleMu2016E']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2016E-v2/RAW',label='2016E',events=100000,location='STD', ls=Run2016E)}
+steps['RunSinglePh2016E']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2016E-v2/RAW',label='2016E',events=100000,location='STD', ls=Run2016E)}
+steps['RunZeroBias2016E']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2016E-v2/RAW',label='2016E',events=100000,location='STD', ls=Run2016E)}
+steps['RunMuOnia2016E']={'INPUT':InputInfo(dataSet='/MuOnia/Run2016E-v2/RAW',label='2016E',events=100000,location='STD', ls=Run2016E)}
+steps['RunJetHT2016E_reminiaod']={'INPUT':InputInfo(dataSet='/JetHT/Run2016E-18Apr2017-v1/AOD',label='2016Ermaod',events=100000,location='STD', ls=Run2016E)}
 
 #### run2 2016H ####
 Run2016H={283877: [[1, 45]]}
-steps['RunHLTPhy2016H']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2016H-v1/RAW',label='hltPhy2016H',events=100000,location='STD', ls=Run2016H)}
-steps['RunDoubleEG2016H']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2016H-v1/RAW',label='doubEG2016H',events=100000,location='STD', ls=Run2016H)}
-steps['RunDoubleMuon2016H']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2016H-v1/RAW',label='doubMu2016H',events=100000,location='STD', ls=Run2016H)}
-steps['RunJetHT2016H']={'INPUT':InputInfo(dataSet='/JetHT/Run2016H-v1/RAW',label='jetHT2016H',events=100000,location='STD', ls=Run2016H)}
-steps['RunMET2016H']={'INPUT':InputInfo(dataSet='/MET/Run2016H-v1/RAW',label='met2016H',events=100000,location='STD', ls=Run2016H)}
-steps['RunMuonEG2016H']={'INPUT':InputInfo(dataSet='/MuonEG/Run2016H-v1/RAW',label='muEG2016H',events=100000,location='STD', ls=Run2016H)}
-steps['RunSingleEl2016H']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2016H-v1/RAW',label='sigEl2016H',events=100000,location='STD', ls=Run2016H)}
-steps['RunSingleMu2016H']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2016H-v1/RAW',label='sigMu2016H',events=100000,location='STD', ls=Run2016H)}
-steps['RunSinglePh2016H']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2016H-v1/RAW',label='sigPh2016H',events=100000,location='STD', ls=Run2016H)}
-steps['RunZeroBias2016H']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2016H-v1/RAW',label='zb2016H',events=100000,location='STD', ls=Run2016H)}
-steps['RunMuOnia2016H']={'INPUT':InputInfo(dataSet='/MuOnia/Run2016H-v1/RAW',label='muOnia2016H',events=100000,location='STD', ls=Run2016H)}
-steps['RunJetHT2016H_reminiaod']={'INPUT':InputInfo(dataSet='/JetHT/Run2016H-18Apr2017-v1/AOD',label='rmaod_jetHT2016H',events=100000,location='STD', ls=Run2016H)}
-steps['RunJetHT2016H_nano']={'INPUT':InputInfo(dataSet='/JetHT/Run2016H-18Apr2017-v1/MINIAOD',label='nano_jetHT2016H',events=100000,location='STD', ls=Run2016H)}
+steps['RunHLTPhy2016H']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2016H-v1/RAW',label='2016H',events=100000,location='STD', ls=Run2016H)}
+steps['RunDoubleEG2016H']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2016H-v1/RAW',label='2016H',events=100000,location='STD', ls=Run2016H)}
+steps['RunDoubleMuon2016H']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2016H-v1/RAW',label='2016H',events=100000,location='STD', ls=Run2016H)}
+steps['RunJetHT2016H']={'INPUT':InputInfo(dataSet='/JetHT/Run2016H-v1/RAW',label='2016H',events=100000,location='STD', ls=Run2016H)}
+steps['RunMET2016H']={'INPUT':InputInfo(dataSet='/MET/Run2016H-v1/RAW',label='2016H',events=100000,location='STD', ls=Run2016H)}
+steps['RunMuonEG2016H']={'INPUT':InputInfo(dataSet='/MuonEG/Run2016H-v1/RAW',label='2016H',events=100000,location='STD', ls=Run2016H)}
+steps['RunSingleEl2016H']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2016H-v1/RAW',label='2016H',events=100000,location='STD', ls=Run2016H)}
+steps['RunSingleMu2016H']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2016H-v1/RAW',label='2016H',events=100000,location='STD', ls=Run2016H)}
+steps['RunSinglePh2016H']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2016H-v1/RAW',label='2016H',events=100000,location='STD', ls=Run2016H)}
+steps['RunZeroBias2016H']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2016H-v1/RAW',label='2016H',events=100000,location='STD', ls=Run2016H)}
+steps['RunMuOnia2016H']={'INPUT':InputInfo(dataSet='/MuOnia/Run2016H-v1/RAW',label='2016H',events=100000,location='STD', ls=Run2016H)}
+steps['RunJetHT2016H_reminiaod']={'INPUT':InputInfo(dataSet='/JetHT/Run2016H-18Apr2017-v1/AOD',label='2016Hrmaod',events=100000,location='STD', ls=Run2016H)}
+steps['RunJetHT2016H_nano']={'INPUT':InputInfo(dataSet='/JetHT/Run2016H-18Apr2017-v1/MINIAOD',label='2016Hnano',events=100000,location='STD', ls=Run2016H)}
 
 #### run2 2017B ####
 Run2017BlowPU={297227: [[1, 45]]}
 Run2017B={297557: [[8, 167]]}
-steps['RunHLTPhy2017B']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2017B-v1/RAW',label='hltPhy2017B',events=100000,location='STD', ls=Run2017B)}
-steps['RunDoubleEG2017B']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2017B-v1/RAW',label='doubEG2017B',events=100000,location='STD', ls=Run2017B)}
-steps['RunDoubleMuon2017B']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2017B-v1/RAW',label='doubMu2017B',events=100000,location='STD', ls=Run2017B)}
-steps['RunJetHT2017B']={'INPUT':InputInfo(dataSet='/JetHT/Run2017B-v1/RAW',label='jetHT2017B',events=100000,location='STD', ls=Run2017B)}
-steps['RunMET2017B']={'INPUT':InputInfo(dataSet='/MET/Run2017B-v1/RAW',label='met2017B',events=100000,location='STD', ls=Run2017B)}
-steps['RunMuonEG2017B']={'INPUT':InputInfo(dataSet='/MuonEG/Run2017B-v1/RAW',label='muEG2017B',events=100000,location='STD', ls=Run2017B)}
-steps['RunSingleEl2017B']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2017B-v1/RAW',label='sigEl2017B',events=100000,location='STD', ls=Run2017B)}
-steps['RunSingleMu2017B']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2017B-v1/RAW',label='sigMu2017B',events=100000,location='STD', ls=Run2017B)}
-steps['RunSinglePh2017B']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2017B-v1/RAW',label='sigPh2017B',events=100000,location='STD', ls=Run2017B)}
-steps['RunZeroBias2017B']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2017B-v1/RAW',label='zb2017B',events=100000,location='STD', ls=Run2017B)}
-steps['RunMuOnia2017B']={'INPUT':InputInfo(dataSet='/MuOnia/Run2017B-v1/RAW',label='muOnia2017B',events=100000,location='STD', ls=Run2017B)}
-steps['RunCharmonium2017B']={'INPUT':InputInfo(dataSet='/Charmonium/Run2017B-v1/RAW',label='charm2017B',events=100000,location='STD', ls=Run2017B)}
-steps['RunNoBPTX2017B']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2017B-v1/RAW',label='noBptx2017B',events=100000,location='STD', ls=Run2017B)}
-steps['RunHLTPhy2017B_AOD']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2017B-PromptReco-v1/AOD',label='hltPhy2017Baod',events=100000,location='STD', ls=Run2017BlowPU)}
-steps['RunHLTPhy2017B_AODextra']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2017B-PromptReco-v1/AOD',label='hltPhy2017Baodex',events=100000,location='STD', ls=Run2017BlowPU)}
-steps['RunHLTPhy2017B_RAWAOD']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2017B-PromptReco-v1/AOD',dataSetParent='/HLTPhysics/Run2017B-v1/RAW',label='hltPhy2017Brawaod',events=100000,location='STD', ls=Run2017B)}
+steps['RunHLTPhy2017B']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2017B-v1/RAW',label='2017B',events=100000,location='STD', ls=Run2017B)}
+steps['RunDoubleEG2017B']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2017B-v1/RAW',label='2017B',events=100000,location='STD', ls=Run2017B)}
+steps['RunDoubleMuon2017B']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2017B-v1/RAW',label='2017B',events=100000,location='STD', ls=Run2017B)}
+steps['RunJetHT2017B']={'INPUT':InputInfo(dataSet='/JetHT/Run2017B-v1/RAW',label='2017B',events=100000,location='STD', ls=Run2017B)}
+steps['RunMET2017B']={'INPUT':InputInfo(dataSet='/MET/Run2017B-v1/RAW',label='2017B',events=100000,location='STD', ls=Run2017B)}
+steps['RunMuonEG2017B']={'INPUT':InputInfo(dataSet='/MuonEG/Run2017B-v1/RAW',label='2017B',events=100000,location='STD', ls=Run2017B)}
+steps['RunSingleEl2017B']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2017B-v1/RAW',label='2017B',events=100000,location='STD', ls=Run2017B)}
+steps['RunSingleMu2017B']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2017B-v1/RAW',label='2017B',events=100000,location='STD', ls=Run2017B)}
+steps['RunSinglePh2017B']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2017B-v1/RAW',label='2017B',events=100000,location='STD', ls=Run2017B)}
+steps['RunZeroBias2017B']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2017B-v1/RAW',label='2017B',events=100000,location='STD', ls=Run2017B)}
+steps['RunMuOnia2017B']={'INPUT':InputInfo(dataSet='/MuOnia/Run2017B-v1/RAW',label='2017B',events=100000,location='STD', ls=Run2017B)}
+steps['RunCharmonium2017B']={'INPUT':InputInfo(dataSet='/Charmonium/Run2017B-v1/RAW',label='2017B',events=100000,location='STD', ls=Run2017B)}
+steps['RunNoBPTX2017B']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2017B-v1/RAW',label='2017B',events=100000,location='STD', ls=Run2017B)}
+steps['RunHLTPhy2017B_AOD']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2017B-PromptReco-v1/AOD',label='2017Baod',events=100000,location='STD', ls=Run2017BlowPU)}
+steps['RunHLTPhy2017B_AODextra']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2017B-PromptReco-v1/AOD',label='2017Baodex',events=100000,location='STD', ls=Run2017BlowPU)}
+steps['RunHLTPhy2017B_RAWAOD']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2017B-PromptReco-v1/AOD',dataSetParent='/HLTPhysics/Run2017B-v1/RAW',label='2017Brawaod',events=100000,location='STD', ls=Run2017B)}
 
 #### run2 2017C ####
 Run2017C={301998: [[1, 150]]}
-steps['RunHLTPhy2017C']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2017C-v1/RAW',label='hltPhy2017C',events=100000,location='STD', ls=Run2017C)}
-steps['RunDoubleEG2017C']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2017C-v1/RAW',label='doubEG2017C',events=100000,location='STD', ls=Run2017C)}
-steps['RunDoubleMuon2017C']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2017C-v1/RAW',label='doubMu2017C',events=100000,location='STD', ls=Run2017C)}
-steps['RunJetHT2017C']={'INPUT':InputInfo(dataSet='/JetHT/Run2017C-v1/RAW',label='jetHT2017C',events=100000,location='STD', ls=Run2017C)}
-steps['RunDisplacedJet2017C']={'INPUT':InputInfo(dataSet='/DisplacedJet/Run2017C-v1/RAW',label='displacedJet2017C',events=100000,location='STD', ls=Run2017C)}
-steps['RunMET2017C']={'INPUT':InputInfo(dataSet='/MET/Run2017C-v1/RAW',label='met2017C',events=100000,location='STD', ls=Run2017C)}
-steps['RunMuonEG2017C']={'INPUT':InputInfo(dataSet='/MuonEG/Run2017C-v1/RAW',label='muEG2017C',events=100000,location='STD', ls=Run2017C)}
-steps['RunSingleEl2017C']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2017C-v1/RAW',label='sigEl2017C',events=100000,location='STD', ls=Run2017C)}
-steps['RunSingleMu2017C']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2017C-v1/RAW',label='sigMu2017C',events=100000,location='STD', ls=Run2017C)}
-steps['RunSinglePh2017C']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2017C-v1/RAW',label='sigPh2017C',events=100000,location='STD', ls=Run2017C)}
-steps['RunZeroBias2017C']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2017C-v1/RAW',label='zb2017C',events=100000,location='STD', ls=Run2017C)}
-steps['RunMuOnia2017C']={'INPUT':InputInfo(dataSet='/MuOnia/Run2017C-v1/RAW',label='muOnia2017C',events=100000,location='STD', ls=Run2017C)}
-steps['RunCharmonium2017C']={'INPUT':InputInfo(dataSet='/Charmonium/Run2017C-v1/RAW',label='charm2017C',events=100000,location='STD', ls=Run2017C)}
-steps['RunNoBPTX2017C']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2017C-v1/RAW',label='noBptx2017C',events=100000,location='STD', ls=Run2017C)}
+steps['RunHLTPhy2017C']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2017C-v1/RAW',label='2017C',events=100000,location='STD', ls=Run2017C)}
+steps['RunDoubleEG2017C']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2017C-v1/RAW',label='2017C',events=100000,location='STD', ls=Run2017C)}
+steps['RunDoubleMuon2017C']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2017C-v1/RAW',label='2017C',events=100000,location='STD', ls=Run2017C)}
+steps['RunJetHT2017C']={'INPUT':InputInfo(dataSet='/JetHT/Run2017C-v1/RAW',label='2017C',events=100000,location='STD', ls=Run2017C)}
+steps['RunDisplacedJet2017C']={'INPUT':InputInfo(dataSet='/DisplacedJet/Run2017C-v1/RAW',label='2017C',events=100000,location='STD', ls=Run2017C)}
+steps['RunMET2017C']={'INPUT':InputInfo(dataSet='/MET/Run2017C-v1/RAW',label='2017C',events=100000,location='STD', ls=Run2017C)}
+steps['RunMuonEG2017C']={'INPUT':InputInfo(dataSet='/MuonEG/Run2017C-v1/RAW',label='2017C',events=100000,location='STD', ls=Run2017C)}
+steps['RunSingleEl2017C']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2017C-v1/RAW',label='2017C',events=100000,location='STD', ls=Run2017C)}
+steps['RunSingleMu2017C']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2017C-v1/RAW',label='2017C',events=100000,location='STD', ls=Run2017C)}
+steps['RunSinglePh2017C']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2017C-v1/RAW',label='2017C',events=100000,location='STD', ls=Run2017C)}
+steps['RunZeroBias2017C']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2017C-v1/RAW',label='2017C',events=100000,location='STD', ls=Run2017C)}
+steps['RunMuOnia2017C']={'INPUT':InputInfo(dataSet='/MuOnia/Run2017C-v1/RAW',label='2017C',events=100000,location='STD', ls=Run2017C)}
+steps['RunCharmonium2017C']={'INPUT':InputInfo(dataSet='/Charmonium/Run2017C-v1/RAW',label='2017C',events=100000,location='STD', ls=Run2017C)}
+steps['RunNoBPTX2017C']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2017C-v1/RAW',label='2017C',events=100000,location='STD', ls=Run2017C)}
 
 
 
 #### run2 2017D ####
 Run2017D={302663: [[1, 100]]}  #AVGPU 36
-steps['RunHLTPhy2017D']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2017D-v1/RAW',label='hltPhy2017D',events=100000,location='STD', ls=Run2017D)}
-steps['RunDoubleEG2017D']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2017D-v1/RAW',label='doubEG2017D',events=100000,location='STD', ls=Run2017D)}
-steps['RunDoubleMuon2017D']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2017D-v1/RAW',label='doubMu2017D',events=100000,location='STD', ls=Run2017D)}
-steps['RunJetHT2017D']={'INPUT':InputInfo(dataSet='/JetHT/Run2017D-v1/RAW',label='jetHT2017D',events=100000,location='STD', ls=Run2017D)}
-steps['RunDisplacedJet2017D']={'INPUT':InputInfo(dataSet='/DisplacedJet/Run2017D-v1/RAW',label='displacedJet2017D',events=100000,location='STD', ls=Run2017D)}
-steps['RunMET2017D']={'INPUT':InputInfo(dataSet='/MET/Run2017D-v1/RAW',label='met2017D',events=100000,location='STD', ls=Run2017D)}
-steps['RunMuonEG2017D']={'INPUT':InputInfo(dataSet='/MuonEG/Run2017D-v1/RAW',label='muEG2017D',events=100000,location='STD', ls=Run2017D)}
-steps['RunSingleEl2017D']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2017D-v1/RAW',label='sigEl2017D',events=100000,location='STD', ls=Run2017D)}
-steps['RunSingleMu2017D']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2017D-v1/RAW',label='sigMu2017D',events=100000,location='STD', ls=Run2017D)}
-steps['RunSinglePh2017D']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2017D-v1/RAW',label='sigPh2017D',events=100000,location='STD', ls=Run2017D)}
-steps['RunZeroBias2017D']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2017D-v1/RAW',label='zb2017D',events=100000,location='STD', ls=Run2017D)}
-steps['RunMuOnia2017D']={'INPUT':InputInfo(dataSet='/MuOnia/Run2017D-v1/RAW',label='muOnia2017D',events=100000,location='STD', ls=Run2017D)}
-steps['RunCharmonium2017D']={'INPUT':InputInfo(dataSet='/Charmonium/Run2017D-v1/RAW',label='charm2017D',events=100000,location='STD', ls=Run2017D)}
-steps['RunNoBPTX2017D']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2017D-v1/RAW',label='noBptx2017D',events=100000,location='STD', ls=Run2017D)}
+steps['RunHLTPhy2017D']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2017D-v1/RAW',label='2017D',events=100000,location='STD', ls=Run2017D)}
+steps['RunDoubleEG2017D']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2017D-v1/RAW',label='2017D',events=100000,location='STD', ls=Run2017D)}
+steps['RunDoubleMuon2017D']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2017D-v1/RAW',label='2017D',events=100000,location='STD', ls=Run2017D)}
+steps['RunJetHT2017D']={'INPUT':InputInfo(dataSet='/JetHT/Run2017D-v1/RAW',label='2017D',events=100000,location='STD', ls=Run2017D)}
+steps['RunDisplacedJet2017D']={'INPUT':InputInfo(dataSet='/DisplacedJet/Run2017D-v1/RAW',label='2017D',events=100000,location='STD', ls=Run2017D)}
+steps['RunMET2017D']={'INPUT':InputInfo(dataSet='/MET/Run2017D-v1/RAW',label='2017D',events=100000,location='STD', ls=Run2017D)}
+steps['RunMuonEG2017D']={'INPUT':InputInfo(dataSet='/MuonEG/Run2017D-v1/RAW',label='2017D',events=100000,location='STD', ls=Run2017D)}
+steps['RunSingleEl2017D']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2017D-v1/RAW',label='2017D',events=100000,location='STD', ls=Run2017D)}
+steps['RunSingleMu2017D']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2017D-v1/RAW',label='2017D',events=100000,location='STD', ls=Run2017D)}
+steps['RunSinglePh2017D']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2017D-v1/RAW',label='2017D',events=100000,location='STD', ls=Run2017D)}
+steps['RunZeroBias2017D']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2017D-v1/RAW',label='2017D',events=100000,location='STD', ls=Run2017D)}
+steps['RunMuOnia2017D']={'INPUT':InputInfo(dataSet='/MuOnia/Run2017D-v1/RAW',label='2017D',events=100000,location='STD', ls=Run2017D)}
+steps['RunCharmonium2017D']={'INPUT':InputInfo(dataSet='/Charmonium/Run2017D-v1/RAW',label='2017D',events=100000,location='STD', ls=Run2017D)}
+steps['RunNoBPTX2017D']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2017D-v1/RAW',label='2017D',events=100000,location='STD', ls=Run2017D)}
 
 
 #### run2 2017E ####
 Run2017E={304125: [[1, 100]]} #AVGPU 46
-steps['RunHLTPhy2017E']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2017E-v1/RAW',label='hltPhy2017E',events=100000,location='STD', ls=Run2017E)}
-steps['RunDoubleEG2017E']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2017E-v1/RAW',label='doubEG2017E',events=100000,location='STD', ls=Run2017E)}
-steps['RunDoubleMuon2017E']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2017E-v1/RAW',label='doubMu2017E',events=100000,location='STD', ls=Run2017E)}
-steps['RunJetHT2017E']={'INPUT':InputInfo(dataSet='/JetHT/Run2017E-v1/RAW',label='jetHT2017E',events=100000,location='STD', ls=Run2017E)}
-steps['RunDisplacedJet2017E']={'INPUT':InputInfo(dataSet='/DisplacedJet/Run2017E-v1/RAW',label='displacedJet2017E',events=100000,location='STD', ls=Run2017E)}
-steps['RunMET2017E']={'INPUT':InputInfo(dataSet='/MET/Run2017E-v1/RAW',label='met2017E',events=100000,location='STD', ls=Run2017E)}
-steps['RunMuonEG2017E']={'INPUT':InputInfo(dataSet='/MuonEG/Run2017E-v1/RAW',label='muEG2017E',events=100000,location='STD', ls=Run2017E)}
-steps['RunSingleEl2017E']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2017E-v1/RAW',label='sigEl2017E',events=100000,location='STD', ls=Run2017E)}
-steps['RunSingleMu2017E']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2017E-v1/RAW',label='sigMu2017E',events=100000,location='STD', ls=Run2017E)}
-steps['RunSinglePh2017E']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2017E-v1/RAW',label='sigPh2017E',events=100000,location='STD', ls=Run2017E)}
-steps['RunZeroBias2017E']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2017E-v1/RAW',label='zb2017E',events=100000,location='STD', ls=Run2017E)}
-steps['RunMuOnia2017E']={'INPUT':InputInfo(dataSet='/MuOnia/Run2017E-v1/RAW',label='muOnia2017E',events=100000,location='STD', ls=Run2017E)}
-steps['RunCharmonium2017E']={'INPUT':InputInfo(dataSet='/Charmonium/Run2017E-v1/RAW',label='charm2017E',events=100000,location='STD', ls=Run2017E)}
-steps['RunNoBPTX2017E']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2017E-v1/RAW',label='noBptx2017E',events=100000,location='STD', ls=Run2017E)}
+steps['RunHLTPhy2017E']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2017E-v1/RAW',label='2017E',events=100000,location='STD', ls=Run2017E)}
+steps['RunDoubleEG2017E']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2017E-v1/RAW',label='2017E',events=100000,location='STD', ls=Run2017E)}
+steps['RunDoubleMuon2017E']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2017E-v1/RAW',label='2017E',events=100000,location='STD', ls=Run2017E)}
+steps['RunJetHT2017E']={'INPUT':InputInfo(dataSet='/JetHT/Run2017E-v1/RAW',label='2017E',events=100000,location='STD', ls=Run2017E)}
+steps['RunDisplacedJet2017E']={'INPUT':InputInfo(dataSet='/DisplacedJet/Run2017E-v1/RAW',label='2017E',events=100000,location='STD', ls=Run2017E)}
+steps['RunMET2017E']={'INPUT':InputInfo(dataSet='/MET/Run2017E-v1/RAW',label='2017E',events=100000,location='STD', ls=Run2017E)}
+steps['RunMuonEG2017E']={'INPUT':InputInfo(dataSet='/MuonEG/Run2017E-v1/RAW',label='2017E',events=100000,location='STD', ls=Run2017E)}
+steps['RunSingleEl2017E']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2017E-v1/RAW',label='2017E',events=100000,location='STD', ls=Run2017E)}
+steps['RunSingleMu2017E']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2017E-v1/RAW',label='2017E',events=100000,location='STD', ls=Run2017E)}
+steps['RunSinglePh2017E']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2017E-v1/RAW',label='2017E',events=100000,location='STD', ls=Run2017E)}
+steps['RunZeroBias2017E']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2017E-v1/RAW',label='2017E',events=100000,location='STD', ls=Run2017E)}
+steps['RunMuOnia2017E']={'INPUT':InputInfo(dataSet='/MuOnia/Run2017E-v1/RAW',label='2017E',events=100000,location='STD', ls=Run2017E)}
+steps['RunCharmonium2017E']={'INPUT':InputInfo(dataSet='/Charmonium/Run2017E-v1/RAW',label='2017E',events=100000,location='STD', ls=Run2017E)}
+steps['RunNoBPTX2017E']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2017E-v1/RAW',label='2017E',events=100000,location='STD', ls=Run2017E)}
 
 #### run2 2017F ####
 Run2017F={305064: [[2, 101]]} #AVGPU 51
-steps['RunHLTPhy2017F']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2017F-v1/RAW',label='hltPhy2017F',events=100000,location='STD', ls=Run2017F)}
-steps['RunDoubleEG2017F']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2017F-v1/RAW',label='doubEG2017F',events=100000,location='STD', ls=Run2017F)}
-steps['RunDoubleMuon2017F']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2017F-v1/RAW',label='doubMu2017F',events=100000,location='STD', ls=Run2017F)}
-steps['RunJetHT2017F']={'INPUT':InputInfo(dataSet='/JetHT/Run2017F-v1/RAW',label='jetHT2017F',events=100000,location='STD', ls=Run2017F)}
-steps['RunDisplacedJet2017F']={'INPUT':InputInfo(dataSet='/DisplacedJet/Run2017F-v1/RAW',label='displacedJet2017F',events=100000,location='STD', ls=Run2017F)}
-steps['RunMET2017F']={'INPUT':InputInfo(dataSet='/MET/Run2017F-v1/RAW',label='met2017F',events=100000,location='STD', ls=Run2017F)}
-steps['RunMuonEG2017F']={'INPUT':InputInfo(dataSet='/MuonEG/Run2017F-v1/RAW',label='muEG2017F',events=100000,location='STD', ls=Run2017F)}
-steps['RunSingleEl2017F']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2017F-v1/RAW',label='sigEl2017F',events=100000,location='STD', ls=Run2017F)}
-steps['RunSingleMu2017F']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2017F-v1/RAW',label='sigMu2017F',events=100000,location='STD', ls=Run2017F)}
-steps['RunSinglePh2017F']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2017F-v1/RAW',label='sigPh2017F',events=100000,location='STD', ls=Run2017F)}
-steps['RunZeroBias2017F']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2017F-v1/RAW',label='zb2017F',events=100000,location='STD', ls=Run2017F)}
-steps['RunMuOnia2017F']={'INPUT':InputInfo(dataSet='/MuOnia/Run2017F-v1/RAW',label='muOnia2017F',events=100000,location='STD', ls=Run2017F)}
-steps['RunCharmonium2017F']={'INPUT':InputInfo(dataSet='/Charmonium/Run2017F-v1/RAW',label='charm2017F',events=100000,location='STD', ls=Run2017F)}
-steps['RunNoBPTX2017F']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2017F-v1/RAW',label='noBptx2017F',events=100000,location='STD', ls=Run2017F)}
-steps['RunExpressPhy2017F']={'INPUT':InputInfo(dataSet='/ExpressPhysics/Run2017F-Express-v1/FEVT',label='expressPhy2017F',events=100000,location='STD', ls=Run2017F)}
-
-steps['RunJetHT2017F_reminiaod']={'INPUT':InputInfo(dataSet='/JetHT/Run2017F-17Nov2017-v1/AOD',label='rmaod_jetHT2017F',events=100000,location='STD', ls=Run2017F)}
-
-steps['RunJetHT2017C_94Xv2NanoAODINPUT']={'INPUT':InputInfo(dataSet='/JetHT/CMSSW_9_4_5_cand1-94X_dataRun2_relval_v11_RelVal_rmaod_jetHT2017C-v1/MINIAOD',label='nano_jetHT2017C',events=100000,location='STD', ls=Run2017C)}
+steps['RunHLTPhy2017F']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2017F-v1/RAW',label='2017F',events=100000,location='STD', ls=Run2017F)}
+steps['RunDoubleEG2017F']={'INPUT':InputInfo(dataSet='/DoubleEG/Run2017F-v1/RAW',label='2017F',events=100000,location='STD', ls=Run2017F)}
+steps['RunDoubleMuon2017F']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2017F-v1/RAW',label='2017F',events=100000,location='STD', ls=Run2017F)}
+steps['RunJetHT2017F']={'INPUT':InputInfo(dataSet='/JetHT/Run2017F-v1/RAW',label='2017F',events=100000,location='STD', ls=Run2017F)}
+steps['RunDisplacedJet2017F']={'INPUT':InputInfo(dataSet='/DisplacedJet/Run2017F-v1/RAW',label='2017F',events=100000,location='STD', ls=Run2017F)}
+steps['RunMET2017F']={'INPUT':InputInfo(dataSet='/MET/Run2017F-v1/RAW',label='2017F',events=100000,location='STD', ls=Run2017F)}
+steps['RunMuonEG2017F']={'INPUT':InputInfo(dataSet='/MuonEG/Run2017F-v1/RAW',label='2017F',events=100000,location='STD', ls=Run2017F)}
+steps['RunSingleEl2017F']={'INPUT':InputInfo(dataSet='/SingleElectron/Run2017F-v1/RAW',label='2017F',events=100000,location='STD', ls=Run2017F)}
+steps['RunSingleMu2017F']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2017F-v1/RAW',label='2017F',events=100000,location='STD', ls=Run2017F)}
+steps['RunSinglePh2017F']={'INPUT':InputInfo(dataSet='/SinglePhoton/Run2017F-v1/RAW',label='2017F',events=100000,location='STD', ls=Run2017F)}
+steps['RunZeroBias2017F']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2017F-v1/RAW',label='2017F',events=100000,location='STD', ls=Run2017F)}
+steps['RunMuOnia2017F']={'INPUT':InputInfo(dataSet='/MuOnia/Run2017F-v1/RAW',label='2017F',events=100000,location='STD', ls=Run2017F)}
+steps['RunCharmonium2017F']={'INPUT':InputInfo(dataSet='/Charmonium/Run2017F-v1/RAW',label='2017F',events=100000,location='STD', ls=Run2017F)}
+steps['RunNoBPTX2017F']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2017F-v1/RAW',label='2017F',events=100000,location='STD', ls=Run2017F)}
+steps['RunExpressPhy2017F']={'INPUT':InputInfo(dataSet='/ExpressPhysics/Run2017F-Express-v1/FEVT',label='2017F',events=100000,location='STD', ls=Run2017F)}
+
+steps['RunJetHT2017F_reminiaod']={'INPUT':InputInfo(dataSet='/JetHT/Run2017F-17Nov2017-v1/AOD',label='2017Frmaod',events=100000,location='STD', ls=Run2017F)}
+
+steps['RunJetHT2017C_94Xv2NanoAODINPUT']={'INPUT':InputInfo(dataSet='/JetHT/CMSSW_9_4_5_cand1-94X_dataRun2_relval_v11_RelVal_rmaod_jetHT2017C-v1/MINIAOD',label='2017Cnano',events=100000,location='STD', ls=Run2017C)}
 
 #### run2 2018A ####
 Run2018A={315489: [[1, 100]]} #AVGPU 35
-steps['RunHLTPhy2018A']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2018A-v1/RAW',label='hltPhy2018A',events=100000,location='STD', ls=Run2018A)}
-steps['RunEGamma2018A']={'INPUT':InputInfo(dataSet='/EGamma/Run2018A-v1/RAW',label='EGamma2018A',events=100000,location='STD', ls=Run2018A)}
-steps['RunDoubleMuon2018A']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2018A-v1/RAW',label='doubMu2018A',events=100000,location='STD', ls=Run2018A)}
-steps['RunJetHT2018A']={'INPUT':InputInfo(dataSet='/JetHT/Run2018A-v1/RAW',label='jetHT2018A',events=100000,location='STD', ls=Run2018A)}
-steps['RunMET2018A']={'INPUT':InputInfo(dataSet='/MET/Run2018A-v1/RAW',label='met2018A',events=100000,location='STD', ls=Run2018A)}
-steps['RunMuonEG2018A']={'INPUT':InputInfo(dataSet='/MuonEG/Run2018A-v1/RAW',label='muEG2018A',events=100000,location='STD', ls=Run2018A)}
-steps['RunSingleMu2018A']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2018A-v1/RAW',label='sigMu2018A',events=100000,location='STD', ls=Run2018A)}
-steps['RunZeroBias2018A']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2018A-v1/RAW',label='zb2018A',events=100000,location='STD', ls=Run2018A)}
-steps['RunMuOnia2018A']={'INPUT':InputInfo(dataSet='/MuOnia/Run2018A-v1/RAW',label='muOnia2018A',events=100000,location='STD', ls=Run2018A)}
-steps['RunNoBPTX2018A']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2018A-v1/RAW',label='noBptx2018A',events=100000,location='STD', ls=Run2018A)}
-steps['RunDisplacedJet2018A']={'INPUT':InputInfo(dataSet='/DisplacedJet/Run2018A-v1/RAW',label='displacedJet2018A',events=100000,location='STD', ls=Run2018A)}
-steps['RunCharmonium2018A']={'INPUT':InputInfo(dataSet='/Charmonium/Run2018A-v1/RAW',label='charm2018A',events=100000,location='STD', ls=Run2018A)}
+steps['RunHLTPhy2018A']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2018A-v1/RAW',label='2018A',events=100000,location='STD', ls=Run2018A)}
+steps['RunEGamma2018A']={'INPUT':InputInfo(dataSet='/EGamma/Run2018A-v1/RAW',label='2018A',events=100000,location='STD', ls=Run2018A)}
+steps['RunDoubleMuon2018A']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2018A-v1/RAW',label='2018A',events=100000,location='STD', ls=Run2018A)}
+steps['RunJetHT2018A']={'INPUT':InputInfo(dataSet='/JetHT/Run2018A-v1/RAW',label='2018A',events=100000,location='STD', ls=Run2018A)}
+steps['RunMET2018A']={'INPUT':InputInfo(dataSet='/MET/Run2018A-v1/RAW',label='2018A',events=100000,location='STD', ls=Run2018A)}
+steps['RunMuonEG2018A']={'INPUT':InputInfo(dataSet='/MuonEG/Run2018A-v1/RAW',label='2018A',events=100000,location='STD', ls=Run2018A)}
+steps['RunSingleMu2018A']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2018A-v1/RAW',label='2018A',events=100000,location='STD', ls=Run2018A)}
+steps['RunZeroBias2018A']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2018A-v1/RAW',label='2018A',events=100000,location='STD', ls=Run2018A)}
+steps['RunMuOnia2018A']={'INPUT':InputInfo(dataSet='/MuOnia/Run2018A-v1/RAW',label='2018A',events=100000,location='STD', ls=Run2018A)}
+steps['RunNoBPTX2018A']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2018A-v1/RAW',label='2018A',events=100000,location='STD', ls=Run2018A)}
+steps['RunDisplacedJet2018A']={'INPUT':InputInfo(dataSet='/DisplacedJet/Run2018A-v1/RAW',label='2018A',events=100000,location='STD', ls=Run2018A)}
+steps['RunCharmonium2018A']={'INPUT':InputInfo(dataSet='/Charmonium/Run2018A-v1/RAW',label='2018A',events=100000,location='STD', ls=Run2018A)}
 #### for 90 m beta* Totem run relvals ####
 RunhBStarTk={314890: [[500, 700]]} #for central tracking system
 steps['RunZeroBias_hBStarTk']={'INPUT':InputInfo(dataSet='/ZeroBias/Commissioning2018-v1/RAW',label='zbhBSTk',events=100000,location='STD', ls=RunhBStarTk)}
@@ -406,74 +406,74 @@
 steps['RunZeroBias1_hBStarRP']={'INPUT':InputInfo(dataSet='/ZeroBias1/Commissioning2018-v1/RAW',label='zbhBSRP',events=100000,location='STD', ls=RunhBStarRP)}
 
 #### 2018 NANOAOD from prompt reco  2018 MINIAOD ####
-steps['RunJetHT2018A_nano']={'INPUT':InputInfo(dataSet='/JetHT/Run2018A-PromptReco-v1/MINIAOD',label='nano_jetHT2018A',events=100000,location='STD', ls=Run2018A)}
+steps['RunJetHT2018A_nano']={'INPUT':InputInfo(dataSet='/JetHT/Run2018A-PromptReco-v1/MINIAOD',label='2018Anano',events=100000,location='STD', ls=Run2018A)}
 
 #### run2 2018B ####
 Run2018B={317435: [[1, 100]]}
 Run2018B_parkingBPH={317661: [[301, 400]]}
-steps['RunHLTPhy2018B']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2018B-v1/RAW',label='hltPhy2018B',events=100000,location='STD', ls=Run2018B)}
-steps['RunEGamma2018B']={'INPUT':InputInfo(dataSet='/EGamma/Run2018B-v1/RAW',label='EGamma2018B',events=100000,location='STD', ls=Run2018B)}
-steps['RunDoubleMuon2018B']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2018B-v1/RAW',label='doubMu2018B',events=100000,location='STD', ls=Run2018B)}
-steps['RunJetHT2018B']={'INPUT':InputInfo(dataSet='/JetHT/Run2018B-v1/RAW',label='jetHT2018B',events=100000,location='STD', ls=Run2018B)}
-steps['RunMET2018B']={'INPUT':InputInfo(dataSet='/MET/Run2018B-v1/RAW',label='met2018B',events=100000,location='STD', ls=Run2018B)}
-steps['RunMuonEG2018B']={'INPUT':InputInfo(dataSet='/MuonEG/Run2018B-v1/RAW',label='muEG2018B',events=100000,location='STD', ls=Run2018B)}
-steps['RunSingleMu2018B']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2018B-v1/RAW',label='sigMu2018B',events=100000,location='STD', ls=Run2018B)}
-steps['RunZeroBias2018B']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2018B-v1/RAW',label='zb2018B',events=100000,location='STD', ls=Run2018B)}
-steps['RunMuOnia2018B']={'INPUT':InputInfo(dataSet='/MuOnia/Run2018B-v1/RAW',label='muOnia2018B',events=100000,location='STD', ls=Run2018B)}
-steps['RunNoBPTX2018B']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2018B-v1/RAW',label='noBptx2018B',events=100000,location='STD', ls=Run2018B)}
-steps['RunDisplacedJet2018B']={'INPUT':InputInfo(dataSet='/DisplacedJet/Run2018B-v1/RAW',label='displacedJet2018B',events=100000,location='STD', ls=Run2018B)}
-steps['RunCharmonium2018B']={'INPUT':InputInfo(dataSet='/Charmonium/Run2018B-v1/RAW',label='charm2018B',events=100000,location='STD', ls=Run2018B)}
-steps['RunParkingBPH2018B']={'INPUT':InputInfo(dataSet='/ParkingBPH5/Run2018B-v1/RAW',label='parkingBPH2018B',events=100000,location='STD', ls=Run2018B_parkingBPH)}
+steps['RunHLTPhy2018B']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2018B-v1/RAW',label='2018B',events=100000,location='STD', ls=Run2018B)}
+steps['RunEGamma2018B']={'INPUT':InputInfo(dataSet='/EGamma/Run2018B-v1/RAW',label='2018B',events=100000,location='STD', ls=Run2018B)}
+steps['RunDoubleMuon2018B']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2018B-v1/RAW',label='2018B',events=100000,location='STD', ls=Run2018B)}
+steps['RunJetHT2018B']={'INPUT':InputInfo(dataSet='/JetHT/Run2018B-v1/RAW',label='2018B',events=100000,location='STD', ls=Run2018B)}
+steps['RunMET2018B']={'INPUT':InputInfo(dataSet='/MET/Run2018B-v1/RAW',label='2018B',events=100000,location='STD', ls=Run2018B)}
+steps['RunMuonEG2018B']={'INPUT':InputInfo(dataSet='/MuonEG/Run2018B-v1/RAW',label='2018B',events=100000,location='STD', ls=Run2018B)}
+steps['RunSingleMu2018B']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2018B-v1/RAW',label='2018B',events=100000,location='STD', ls=Run2018B)}
+steps['RunZeroBias2018B']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2018B-v1/RAW',label='2018B',events=100000,location='STD', ls=Run2018B)}
+steps['RunMuOnia2018B']={'INPUT':InputInfo(dataSet='/MuOnia/Run2018B-v1/RAW',label='2018B',events=100000,location='STD', ls=Run2018B)}
+steps['RunNoBPTX2018B']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2018B-v1/RAW',label='2018B',events=100000,location='STD', ls=Run2018B)}
+steps['RunDisplacedJet2018B']={'INPUT':InputInfo(dataSet='/DisplacedJet/Run2018B-v1/RAW',label='2018B',events=100000,location='STD', ls=Run2018B)}
+steps['RunCharmonium2018B']={'INPUT':InputInfo(dataSet='/Charmonium/Run2018B-v1/RAW',label='2018B',events=100000,location='STD', ls=Run2018B)}
+steps['RunParkingBPH2018B']={'INPUT':InputInfo(dataSet='/ParkingBPH5/Run2018B-v1/RAW',label='2018B',events=100000,location='STD', ls=Run2018B_parkingBPH)}
 steps['RunJetHT2018BHEfail']={'INPUT':InputInfo(dataSet='/JetHT/Run2018B-v1/RAW',label='HEfail',events=100000,location='STD', ls=Run2018B)}
 steps['RunJetHT2018BBadHcalMitig']={'INPUT':InputInfo(dataSet='/JetHT/Run2018B-v1/RAW',label='BadHcalMitig',events=100000,location='STD', ls=Run2018B)}
 
 #### run2 2018C ####
 Run2018C={319450: [[1, 100]]}
-steps['RunHLTPhy2018C']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2018C-v1/RAW',label='hltPhy2018C',events=100000,location='STD', ls=Run2018C)}
-steps['RunEGamma2018C']={'INPUT':InputInfo(dataSet='/EGamma/Run2018C-v1/RAW',label='EGamma2018C',events=100000,location='STD', ls=Run2018C)}
-steps['RunDoubleMuon2018C']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2018C-v1/RAW',label='doubMu2018C',events=100000,location='STD', ls=Run2018C)}
-steps['RunJetHT2018C']={'INPUT':InputInfo(dataSet='/JetHT/Run2018C-v1/RAW',label='jetHT2018C',events=100000,location='STD', ls=Run2018C)}
-steps['RunMET2018C']={'INPUT':InputInfo(dataSet='/MET/Run2018C-v1/RAW',label='met2018C',events=100000,location='STD', ls=Run2018C)}
-steps['RunMuonEG2018C']={'INPUT':InputInfo(dataSet='/MuonEG/Run2018C-v1/RAW',label='muEG2018C',events=100000,location='STD', ls=Run2018C)}
-steps['RunSingleMu2018C']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2018C-v1/RAW',label='sigMu2018C',events=100000,location='STD', ls=Run2018C)}
-steps['RunZeroBias2018C']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2018C-v1/RAW',label='zb2018C',events=100000,location='STD', ls=Run2018C)}
-steps['RunMuOnia2018C']={'INPUT':InputInfo(dataSet='/MuOnia/Run2018C-v1/RAW',label='muOnia2018C',events=100000,location='STD', ls=Run2018C)}
-steps['RunNoBPTX2018C']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2018C-v1/RAW',label='noBptx2018C',events=100000,location='STD', ls=Run2018C)}
-steps['RunDisplacedJet2018C']={'INPUT':InputInfo(dataSet='/DisplacedJet/Run2018C-v1/RAW',label='displacedJet2018C',events=100000,location='STD', ls=Run2018C)}
-steps['RunCharmonium2018C']={'INPUT':InputInfo(dataSet='/Charmonium/Run2018C-v1/RAW',label='charm2018C',events=100000,location='STD', ls=Run2018C)}
+steps['RunHLTPhy2018C']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2018C-v1/RAW',label='2018C',events=100000,location='STD', ls=Run2018C)}
+steps['RunEGamma2018C']={'INPUT':InputInfo(dataSet='/EGamma/Run2018C-v1/RAW',label='2018C',events=100000,location='STD', ls=Run2018C)}
+steps['RunDoubleMuon2018C']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2018C-v1/RAW',label='2018C',events=100000,location='STD', ls=Run2018C)}
+steps['RunJetHT2018C']={'INPUT':InputInfo(dataSet='/JetHT/Run2018C-v1/RAW',label='2018C',events=100000,location='STD', ls=Run2018C)}
+steps['RunMET2018C']={'INPUT':InputInfo(dataSet='/MET/Run2018C-v1/RAW',label='2018C',events=100000,location='STD', ls=Run2018C)}
+steps['RunMuonEG2018C']={'INPUT':InputInfo(dataSet='/MuonEG/Run2018C-v1/RAW',label='2018C',events=100000,location='STD', ls=Run2018C)}
+steps['RunSingleMu2018C']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2018C-v1/RAW',label='2018C',events=100000,location='STD', ls=Run2018C)}
+steps['RunZeroBias2018C']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2018C-v1/RAW',label='2018C',events=100000,location='STD', ls=Run2018C)}
+steps['RunMuOnia2018C']={'INPUT':InputInfo(dataSet='/MuOnia/Run2018C-v1/RAW',label='2018C',events=100000,location='STD', ls=Run2018C)}
+steps['RunNoBPTX2018C']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2018C-v1/RAW',label='2018C',events=100000,location='STD', ls=Run2018C)}
+steps['RunDisplacedJet2018C']={'INPUT':InputInfo(dataSet='/DisplacedJet/Run2018C-v1/RAW',label='2018C',events=100000,location='STD', ls=Run2018C)}
+steps['RunCharmonium2018C']={'INPUT':InputInfo(dataSet='/Charmonium/Run2018C-v1/RAW',label='2018C',events=100000,location='STD', ls=Run2018C)}
 
 #### run2 2018D ####
 Run2018D={320822: [[1, 100]]}
-steps['RunHLTPhy2018D']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2018D-v1/RAW',label='hltPhy2018D',events=100000,location='STD', ls=Run2018D)}
-steps['RunEGamma2018D']={'INPUT':InputInfo(dataSet='/EGamma/Run2018D-v1/RAW',label='EGamma2018D',events=100000,location='STD', ls=Run2018D)}
-steps['RunDoubleMuon2018D']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2018D-v1/RAW',label='doubMu2018D',events=100000,location='STD', ls=Run2018D)}
-steps['RunJetHT2018D']={'INPUT':InputInfo(dataSet='/JetHT/Run2018D-v1/RAW',label='jetHT2018D',events=100000,location='STD', ls=Run2018D)}
-steps['RunMET2018D']={'INPUT':InputInfo(dataSet='/MET/Run2018D-v1/RAW',label='met2018D',events=100000,location='STD', ls=Run2018D)}
-steps['RunMuonEG2018D']={'INPUT':InputInfo(dataSet='/MuonEG/Run2018D-v1/RAW',label='muEG2018D',events=100000,location='STD', ls=Run2018D)}
-steps['RunSingleMu2018D']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2018D-v1/RAW',label='sigMu2018D',events=100000,location='STD', ls=Run2018D)}
-steps['RunZeroBias2018D']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2018D-v1/RAW',label='zb2018D',events=100000,location='STD', ls=Run2018D)}
-steps['RunMuOnia2018D']={'INPUT':InputInfo(dataSet='/MuOnia/Run2018D-v1/RAW',label='muOnia2018D',events=100000,location='STD', ls=Run2018D)}
-steps['RunNoBPTX2018D']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2018D-v1/RAW',label='noBptx2018D',events=100000,location='STD', ls=Run2018D)}
-steps['RunDisplacedJet2018D']={'INPUT':InputInfo(dataSet='/DisplacedJet/Run2018D-v1/RAW',label='displacedJet2018D',events=100000,location='STD', ls=Run2018D)}
-steps['RunCharmonium2018D']={'INPUT':InputInfo(dataSet='/Charmonium/Run2018D-v1/RAW',label='charm2018D',events=100000,location='STD', ls=Run2018D)}
+steps['RunHLTPhy2018D']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2018D-v1/RAW',label='2018D',events=100000,location='STD', ls=Run2018D)}
+steps['RunEGamma2018D']={'INPUT':InputInfo(dataSet='/EGamma/Run2018D-v1/RAW',label='2018D',events=100000,location='STD', ls=Run2018D)}
+steps['RunDoubleMuon2018D']={'INPUT':InputInfo(dataSet='/DoubleMuon/Run2018D-v1/RAW',label='2018D',events=100000,location='STD', ls=Run2018D)}
+steps['RunJetHT2018D']={'INPUT':InputInfo(dataSet='/JetHT/Run2018D-v1/RAW',label='2018D',events=100000,location='STD', ls=Run2018D)}
+steps['RunMET2018D']={'INPUT':InputInfo(dataSet='/MET/Run2018D-v1/RAW',label='2018D',events=100000,location='STD', ls=Run2018D)}
+steps['RunMuonEG2018D']={'INPUT':InputInfo(dataSet='/MuonEG/Run2018D-v1/RAW',label='2018D',events=100000,location='STD', ls=Run2018D)}
+steps['RunSingleMu2018D']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2018D-v1/RAW',label='2018D',events=100000,location='STD', ls=Run2018D)}
+steps['RunZeroBias2018D']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2018D-v1/RAW',label='2018D',events=100000,location='STD', ls=Run2018D)}
+steps['RunMuOnia2018D']={'INPUT':InputInfo(dataSet='/MuOnia/Run2018D-v1/RAW',label='2018D',events=100000,location='STD', ls=Run2018D)}
+steps['RunNoBPTX2018D']={'INPUT':InputInfo(dataSet='/NoBPTX/Run2018D-v1/RAW',label='2018D',events=100000,location='STD', ls=Run2018D)}
+steps['RunDisplacedJet2018D']={'INPUT':InputInfo(dataSet='/DisplacedJet/Run2018D-v1/RAW',label='2018D',events=100000,location='STD', ls=Run2018D)}
+steps['RunCharmonium2018D']={'INPUT':InputInfo(dataSet='/Charmonium/Run2018D-v1/RAW',label='2018D',events=100000,location='STD', ls=Run2018D)}
 
 # Highstat HLTPhysics
 Run2015DHS=selectedLS([258712,258713,258714,258741,258742,258745,258749,258750,259626,259637,259683,259685,259686,259721,259809,259810,259818,259820,259821,259822,259862,259890,259891])
-steps['RunHLTPhy2015DHS']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2015D-v1/RAW',label='hltPhy2015DHS',events=100000,location='STD', ls=Run2015DHS)}
+steps['RunHLTPhy2015DHS']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2015D-v1/RAW',label='2015DHS',events=100000,location='STD', ls=Run2015DHS)}
 
 
 #### run2 2015 HighLumi High Stat workflows ##
 # Run2015HLHS, 25ns, run 260627, JetHT: 2.9M, SingleMuon: 5.7M, ZeroBias: 1.6M
 Run2015HLHS=selectedLS([260627])
-steps['RunJetHT2015HLHS']={'INPUT':InputInfo(dataSet='/JetHT/Run2015D-v1/RAW',label='jetHT2015HLHT',events=100000,location='STD', ls=Run2015HLHS)}
-steps['RunZeroBias2015HLHS']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2015D-v1/RAW',label='zb2015HLHT',events=100000,location='STD', ls=Run2015HLHS)}
-steps['RunSingleMu2015HLHS']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2015D-v1/RAW',label='sigMu2015HLHT',events=100000,location='STD', ls=Run2015HLHS)}
+steps['RunJetHT2015HLHS']={'INPUT':InputInfo(dataSet='/JetHT/Run2015D-v1/RAW',label='2015DHLHS',events=100000,location='STD', ls=Run2015HLHS)}
+steps['RunZeroBias2015HLHS']={'INPUT':InputInfo(dataSet='/ZeroBias/Run2015D-v1/RAW',label='2015DHLHS',events=100000,location='STD', ls=Run2015HLHS)}
+steps['RunSingleMu2015HLHS']={'INPUT':InputInfo(dataSet='/SingleMuon/Run2015D-v1/RAW',label='2015DHLHS',events=100000,location='STD', ls=Run2015HLHS)}
 
 #### run2 Cosmic ####
 ##Run 256259 @ 0T 2015C###
 ##Run 272133 @ 3.8T 2016B###
-steps['RunCosmics2015C']={'INPUT':InputInfo(dataSet='/Cosmics/Run2015C-v1/RAW',label='cos2015C',run=[256259],events=100000,location='STD')}
-steps['RunCosmics2016B']={'INPUT':InputInfo(dataSet='/Cosmics/Run2016B-v1/RAW',label='cos2016B',run=[272133],events=100000,location='STD')}
+steps['RunCosmics2015C']={'INPUT':InputInfo(dataSet='/Cosmics/Run2015C-v1/RAW',label='2015C',run=[256259],events=100000,location='STD')}
+steps['RunCosmics2016B']={'INPUT':InputInfo(dataSet='/Cosmics/Run2016B-v1/RAW',label='2016B',run=[272133],events=100000,location='STD')}
 
 def gen(fragment,howMuch):
     global step1Defaults
@@ -869,10 +869,13 @@ def genS(fragment,howMuch):
 steps['Cosmics_UP16']=merge([{'cfg':'UndergroundCosmicMu_cfi.py','-n':'500','--conditions':'auto:run2_mc_cosmics','--scenario':'cosmics','--era':'Run2_2016'},Kby(666,100000),step1Defaults])
 steps['Cosmics_UP17']=merge([{'cfg':'UndergroundCosmicMu_cfi.py','-n':'500','--conditions':'auto:phase1_2017_cosmics','--scenario':'cosmics','--era':'Run2_2017'},Kby(666,100000),step1Defaults])
 steps['Cosmics_UP18']=merge([{'cfg':'UndergroundCosmicMu_cfi.py','-n':'500','--conditions':'auto:phase1_2018_cosmics','--scenario':'cosmics','--era':'Run2_2018'},Kby(666,100000),step1Defaults])
+steps['Cosmics_UP21']=merge([{'cfg':'UndergroundCosmicMu_cfi.py','-n':'500','--conditions':'auto:phase1_2021_cosmics','--scenario':'cosmics','--era':'Run3'},Kby(666,100000),step1Defaults])
 steps['CosmicsSPLoose_UP17']=merge([{'cfg':'UndergroundCosmicSPLooseMu_cfi.py','-n':'2000','--conditions':'auto:phase1_2017_cosmics','--scenario':'cosmics','--era':'Run2_2017'},Kby(5000,500000),step1Up2015Defaults])
 steps['CosmicsSPLoose_UP18']=merge([{'cfg':'UndergroundCosmicSPLooseMu_cfi.py','-n':'2000','--conditions':'auto:phase1_2018_cosmics','--scenario':'cosmics','--era':'Run2_2018'},Kby(5000,500000),step1Up2015Defaults])
 steps['BeamHalo']=merge([{'cfg':'BeamHalo_cfi.py','--scenario':'cosmics'},Kby(9,100),step1Defaults])
 steps['BeamHalo_13']=merge([{'cfg':'BeamHalo_13TeV_cfi.py','--scenario':'cosmics'},Kby(9,100),step1Up2015Defaults])
+steps['BeamHalo_UP18']=merge([{'cfg':'BeamHalo_13TeV_cfi.py','-n':'500','--conditions':'auto:phase1_2018_cosmics','--scenario':'cosmics','--era':'Run2_2018','--beamspot':'Realistic25ns13TeVEarly2018Collision'},Kby(666,100000),step1Defaults])
+steps['BeamHalo_UP21']=merge([{'cfg':'BeamHalo_13TeV_cfi.py','-n':'500','--conditions':'auto:phase1_2021_cosmics','--scenario':'cosmics','--era':'Run3','--beamspot':'Realistic25ns13TeVEarly2017Collision'},Kby(666,100000),step1Defaults])
 
 # GF re-introduce INPUT command once GEN-SIM will be available
 # steps['CosmicsINPUT']={'INPUT':InputInfo(dataSet='/RelValCosmics/%s/GEN-SIM'%(baseDataSetRelease[0],),location='STD')}
@@ -1571,6 +1574,7 @@ def lhegensim2018(fragment,howMuch):
 steps['DIGICOS_UP16']=merge([{'--conditions':'auto:run2_mc_cosmics','-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval2016','--scenario':'cosmics','--eventcontent':'FEVTDEBUG','--datatier':'GEN-SIM-DIGI-RAW', '--era' : 'Run2_2016'},step2Upg2015Defaults])
 steps['DIGICOS_UP17']=merge([{'--conditions':'auto:phase1_2017_cosmics','-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval2017','--scenario':'cosmics','--eventcontent':'FEVTDEBUG','--datatier':'GEN-SIM-DIGI-RAW', '--era' : 'Run2_2017'},step2Upg2015Defaults])
 steps['DIGICOS_UP18']=merge([{'--conditions':'auto:phase1_2018_cosmics','-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval2018','--scenario':'cosmics','--eventcontent':'FEVTDEBUG','--datatier':'GEN-SIM-DIGI-RAW', '--era' : 'Run2_2018'},step2Upg2015Defaults])
+steps['DIGICOS_UP21']=merge([{'--conditions':'auto:phase1_2021_cosmics','-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval2017','--scenario':'cosmics','--eventcontent':'FEVTDEBUG','--datatier':'GEN-SIM-DIGI-RAW', '--era' : 'Run3'},step2Upg2015Defaults])
 steps['DIGICOSPEAK_UP17']=merge([{'--conditions':'auto:phase1_2017_cosmics_peak','-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval2017','--customise_commands': '"process.mix.digitizers.strip.APVpeakmode=cms.bool(True)"','--scenario':'cosmics','--eventcontent':'FEVTDEBUG','--datatier':'GEN-SIM-DIGI-RAW', '--era' : 'Run2_2017'},step2Upg2015Defaults])
 steps['DIGICOSPEAK_UP18']=merge([{'--conditions':'auto:phase1_2018_cosmics_peak','-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval2018','--customise_commands': '"process.mix.digitizers.strip.APVpeakmode=cms.bool(True)"','--scenario':'cosmics','--eventcontent':'FEVTDEBUG','--datatier':'GEN-SIM-DIGI-RAW', '--era' : 'Run2_2018'},step2Upg2015Defaults])
 
@@ -2220,6 +2224,7 @@ def gen2018HiMix(fragment,howMuch):
 steps['RECOCOS_UP16']=merge([{'--conditions':'auto:run2_mc_cosmics','-s':'RAW2DIGI,L1Reco,RECO,ALCA:MuAlGlobalCosmics,DQM','--scenario':'cosmics','--era':'Run2_2016'},step3Up2015Hal])
 steps['RECOCOS_UP17']=merge([{'--conditions':'auto:phase1_2017_cosmics','-s':'RAW2DIGI,L1Reco,RECO,ALCA:MuAlGlobalCosmics,DQM','--scenario':'cosmics','--era':'Run2_2017'},step3Up2015Hal])
 steps['RECOCOS_UP18']=merge([{'--conditions':'auto:phase1_2018_cosmics','-s':'RAW2DIGI,L1Reco,RECO,ALCA:MuAlGlobalCosmics,DQM','--scenario':'cosmics','--era':'Run2_2018'},step3Up2015Hal])
+steps['RECOCOS_UP21']=merge([{'--conditions':'auto:phase1_2021_cosmics','-s':'RAW2DIGI,L1Reco,RECO,ALCA:MuAlGlobalCosmics,DQM','--scenario':'cosmics','--era':'Run3'},step3Up2015Hal])
 steps['RECOCOSPEAK_UP17']=merge([{'--conditions':'auto:phase1_2017_cosmics_peak','-s':'RAW2DIGI,L1Reco,RECO,ALCA:MuAlGlobalCosmics,DQM','--scenario':'cosmics','--era':'Run2_2017'},step3Up2015Hal])
 steps['RECOCOSPEAK_UP18']=merge([{'--conditions':'auto:phase1_2018_cosmics_peak','-s':'RAW2DIGI,L1Reco,RECO,ALCA:MuAlGlobalCosmics,DQM','--scenario':'cosmics','--era':'Run2_2018'},step3Up2015Hal])
 
@@ -2387,11 +2392,15 @@ def gen2018HiMix(fragment,howMuch):
 steps['ALCAMINUP15']=merge([{'-s':'ALCA:TkAlMinBias','--filein':'file:step3.root'},step4Up2015Defaults])
 steps['ALCACOS']=merge([{'-s':'ALCA:TkAlCosmics0T+MuAlGlobalCosmics+HcalCalHOCosmics'},stCond,step4Defaults])
 steps['ALCABH']=merge([{'-s':'ALCA:TkAlBeamHalo+MuAlBeamHaloOverlaps+MuAlBeamHalo'},stCond,step4Defaults])
+steps['ALCABH_UP18']=merge([{'--conditions':'auto:phase1_2018_cosmics','-s':'ALCA:TkAlBeamHalo+MuAlBeamHaloOverlaps+MuAlBeamHalo','--era':'Run2_2018'},step4Up2015Defaults])
+steps['ALCABH_UP21']=merge([{'--conditions':'auto:phase1_2021_cosmics','-s':'ALCA:TkAlBeamHalo+MuAlBeamHaloOverlaps+MuAlBeamHalo','--era':'Run3'},step4Up2015Defaults])
+
 steps['ALCAHAL']=merge([{'-s':'ALCA:TkAlBeamHalo+MuAlBeamHaloOverlaps+MuAlBeamHalo'},step4Up2015Defaults])
 steps['ALCACOS_UP15']=merge([{'--conditions':'auto:run2_mc_cosmics','-s':'ALCA:TkAlBeamHalo+MuAlBeamHaloOverlaps+MuAlBeamHalo'},step4Up2015Defaults])
 steps['ALCACOS_UP16']=merge([{'--conditions':'auto:run2_mc_cosmics','-s':'ALCA:TkAlCosmics0T+SiStripCalCosmics+TkAlBeamHalo+MuAlBeamHaloOverlaps+MuAlBeamHalo','--era':'Run2_2016'},step4Up2015Defaults])
 steps['ALCACOS_UP17']=merge([{'--conditions':'auto:phase1_2017_cosmics','-s':'ALCA:TkAlCosmics0T+SiStripCalCosmics+TkAlBeamHalo+MuAlBeamHaloOverlaps+MuAlBeamHalo','--era':'Run2_2017'},step4Up2015Defaults])
 steps['ALCACOS_UP18']=merge([{'--conditions':'auto:phase1_2018_cosmics','-s':'ALCA:TkAlCosmics0T+SiStripCalCosmics+TkAlBeamHalo+MuAlBeamHaloOverlaps+MuAlBeamHalo','--era':'Run2_2018'},step4Up2015Defaults])
+steps['ALCACOS_UP21']=merge([{'--conditions':'auto:phase1_2021_cosmics','-s':'ALCA:TkAlCosmics0T+SiStripCalCosmics+TkAlBeamHalo+MuAlBeamHaloOverlaps+MuAlBeamHalo','--era':'Run3'},step4Up2015Defaults])
 steps['ALCAHARVD']={'-s':'ALCAHARVEST:BeamSpotByRun+BeamSpotByLumi+SiStripQuality',
                     '--conditions':'auto:run1_data',
                     '--scenario':'pp',
@@ -2621,6 +2630,16 @@ def gen2018HiMix(fragment,howMuch):
                           '--era' : 'Run2_2018'
                           }
 
+steps['HARVESTCOS_UP21']={'-s'          :'HARVESTING:dqmHarvesting',
+                          '--conditions':'auto:phase1_2021_cosmics',
+                          '--mc'        :'',
+                          '--filein'    :'file:step3_inDQM.root',
+                          '--scenario'    :'cosmics',
+                          '--filein':'file:step3_inDQM.root', # unnnecessary
+                          '--filetype':'DQM',
+                          '--era' : 'Run3'
+                          }
+
 steps['HARVESTFS']={'-s':'HARVESTING:validationHarvesting',
                    '--conditions':'auto:run1_mc',
                    '--mc':'',
@@ -2742,6 +2761,7 @@ def gen2018HiMix(fragment,howMuch):
                               '--process':'reRECO',
                               '--datatier':'AODSIM',
                               '--eventcontent':'AODSIM',
+                              '--procModifiers':'recoFromReco', 
                               },
                              stCond,step3Defaults])
 
@@ -2874,6 +2894,7 @@ def gen2018HiMix(fragment,howMuch):
 steps['NANOEDM2017_94XMiniAODv2'] = merge([{'--era': 'Run2_2017,run2_nanoAOD_94XMiniAODv2'}, steps['NANOEDM2017'] ])
 steps['NANOEDM2016_80X'] = merge([{'--era': 'Run2_2016,run2_miniAOD_80XLegacy'}, steps['NANOEDM2017'] ])
 steps['NANOEDM2018'] = merge([ {'--conditions': 'auto:run2_data_promptlike', '--era': 'Run2_2018'}, stepNanoEDMData ])
+steps['NANOEDM2018_102Xv1'] = merge([ {'--era': 'Run2_2018,run2_nanoAOD_102Xv1'}, steps['NANOEDM2018'] ])
 
 steps['HARVESTNANOAODMC2017']=merge([{'-s':'HARVESTING:@nanoAODDQM','--conditions': 'auto:phase1_2017_realistic','--era': 'Run2_2017'},steps['HARVESTUP15']])
 steps['HARVESTNANOAODMC2017_94XMiniAODv1']=merge([{'--era': 'Run2_2017,run2_nanoAOD_94XMiniAODv1'},steps['HARVESTNANOAODMC2017']])
@@ -2885,6 +2906,7 @@ def gen2018HiMix(fragment,howMuch):
 steps['HARVESTNANOAOD2017_94XMiniAODv2']=merge([{'--era': 'Run2_2017,run2_nanoAOD_94XMiniAODv2'},steps['HARVESTNANOAOD2017']])
 steps['HARVESTNANOAOD2016_80X']=merge([{'--era': 'Run2_2016,run2_miniAOD_80XLegacy'},steps['HARVESTNANOAOD2017']])
 steps['HARVESTNANOAOD2018']=merge([{'--conditions': 'auto:run2_data_promptlike', '--era':'Run2_2018'}, steps['HARVESTNANOAOD2017']])
+steps['HARVESTNANOAOD2018_102Xv1']=merge([{'--era':'Run2_2018,run2_nanoAOD_102Xv1'}, steps['HARVESTNANOAOD2018']])
 
 steps['NANOMERGE'] = { '-s': 'ENDJOB', '-n': 1000 , '--eventcontent' : 'NANOAODSIM','--datatier': 'NANOAODSIM', '--conditions': 'auto:run2_mc' }
 
@@ -2932,8 +2954,8 @@ def gen2018HiMix(fragment,howMuch):
 defaultDataSets['2017Design']='CMSSW_10_0_0_pre2-100X_mc2017_design_IdealBS_v1-v'
 defaultDataSets['2018']='CMSSW_10_5_0_pre1-103X_upgrade2018_realistic_v8-v'
 defaultDataSets['2018Design']='CMSSW_10_5_0_pre1-103X_upgrade2018_design_v4-v'
-#defaultDataSets['2019']=''
-#defaultDataSets['2019Design']=''
+defaultDataSets['2021']='CMSSW_10_6_0_pre3-105X_postLS2_realistic_v6-v'
+defaultDataSets['2021Design']='CMSSW_10_6_0_pre3-105X_postLS2_realistic_v6-v'
 defaultDataSets['2023D17']='CMSSW_10_2_0_pre2-101X_upgrade2023_realistic_v5_2023D17noPU-v'
 defaultDataSets['2023D19']=''
 defaultDataSets['2023D21']=''
@@ -2946,12 +2968,11 @@ def gen2018HiMix(fragment,howMuch):
 defaultDataSets['2023D33']=''
 defaultDataSets['2023D34']=''
 defaultDataSets['2023D35']='CMSSW_10_4_0_mtd3-103X_upgrade2023_realistic_v2_2023D35noPU_2-v'
-defaultDataSets['2023D36']=''
-defaultDataSets['2023D37']=''
 defaultDataSets['2023D38']=''
 defaultDataSets['2023D39']=''
 defaultDataSets['2023D40']=''
 defaultDataSets['2023D41']=''
+defaultDataSets['2023D42']=''
 
 keys=defaultDataSets.keys()
 for key in keys:
@@ -2977,6 +2998,8 @@ def gen2018HiMix(fragment,howMuch):
     	PUDataSets[ds]={'-n':10,'--pileup':'AVE_35_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(name,)}
     elif '2018' in name:
     	PUDataSets[ds]={'-n':10,'--pileup':'AVE_50_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(name,)}
+    elif 'postLS2' in name:
+    	PUDataSets[ds]={'-n':10,'--pileup':'AVE_50_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(name,)}
     elif '2023' in name:
     	PUDataSets[ds]={'-n':10,'--pileup':'AVE_200_BX_25ns','--pileup_input':'das:/RelValMinBias_14TeV/%s/GEN-SIM'%(name,)}
     else:
diff --git a/Configuration/PyReleaseValidation/python/relval_upgrade.py b/Configuration/PyReleaseValidation/python/relval_upgrade.py
index 149d55a2485de..adea600d06110 100644
--- a/Configuration/PyReleaseValidation/python/relval_upgrade.py
+++ b/Configuration/PyReleaseValidation/python/relval_upgrade.py
@@ -15,7 +15,7 @@ def makeStepNameSim(key,frag,step,suffix):
 def makeStepName(key,frag,step,suffix):
    return step+suffix+'_'+key
 
-neutronKeys = ['2023D17','2023D19','2023D21','2023D24','2023D25','2023D28','2023D29','2023D30','2023D31','2023D33','2023D34','2023D35','2023D36','2023D37','2023D38','2023D39','2023D40','2023D41']
+neutronKeys = ['2023D17','2023D19','2023D21','2023D24','2023D25','2023D28','2023D29','2023D30','2023D31','2023D33','2023D34','2023D35','2023D38','2023D39','2023D40','2023D41','2023D42']
 neutronFrags = ['ZMM_14','MinBias_14TeV']
 
 tbmFrags = ['TTbar_13','ZMM_13']
diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
index f4cc0c2577f4f..ba498c721e76b 100644
--- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
+++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
@@ -13,10 +13,10 @@
     '2018PU',
     '2018Design',
     '2018DesignPU',
-    '2019',
-#    '2019PU',
-    '2019Design',
-#    '2019DesignPU',
+    '2021',
+    '2021PU',
+    '2021Design',
+    '2021DesignPU',
 ]
 
 upgradeKeys[2023] = [
@@ -30,10 +30,6 @@
     '2023D24PU',
     '2023D25',
     '2023D25PU',
-    '2023D36',
-    '2023D36PU',
-    '2023D37',
-    '2023D37PU',
     '2023D28',
     '2023D28PU',
     '2023D29',
@@ -56,6 +52,8 @@
     '2023D40PU',
     '2023D41',
     '2023D41PU',
+    '2023D42',
+    '2023D42PU',
 ]
 
 # pre-generation of WF numbers
@@ -65,7 +63,7 @@
 }
 numWFSkip=200
 # temporary measure to keep other WF numbers the same
-numWFConflict = [[11800,12000],[12200,12400],[20800,21200],[21600,22400],[25000,26000],[50000,51000]]
+numWFConflict = [[20800,21200],[21600,22400],[23200,24000],[25000,26000],[50000,51000]]
 numWFAll={
     2017: [],
     2023: []
@@ -278,16 +276,16 @@
         'BeamSpot': 'GaussSigmaZ4cm',
         'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
     },
-    '2019' : {
+    '2021' : {
         'Geom' : 'DB:Extended',
-        'GT' : 'auto:phase1_2019_realistic',
+        'GT' : 'auto:phase1_2021_realistic',
         'HLTmenu': '@relval2017',
         'Era' : 'Run3',
         'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull','ALCAFull'],
     },
-    '2019Design' : {
+    '2021Design' : {
         'Geom' : 'DB:Extended',
-        'GT' : 'auto:phase1_2019_design',
+        'GT' : 'auto:phase1_2021_design',
         'HLTmenu': '@relval2017',
         'Era' : 'Run3',
         'BeamSpot': 'GaussSigmaZ4cm',
@@ -299,11 +297,17 @@
 upgradeProperties[2017]['2017PU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU']
 upgradeProperties[2017]['2017DesignPU'] = deepcopy(upgradeProperties[2017]['2017Design'])
 upgradeProperties[2017]['2017DesignPU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU']
+
 upgradeProperties[2017]['2018PU'] = deepcopy(upgradeProperties[2017]['2018'])
 upgradeProperties[2017]['2018PU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU','NanoFull']
 upgradeProperties[2017]['2018DesignPU'] = deepcopy(upgradeProperties[2017]['2018Design'])
 upgradeProperties[2017]['2018DesignPU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU']
 
+upgradeProperties[2017]['2021PU'] = deepcopy(upgradeProperties[2017]['2021'])
+upgradeProperties[2017]['2021PU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU','NanoFull']
+upgradeProperties[2017]['2021DesignPU'] = deepcopy(upgradeProperties[2017]['2021Design'])
+upgradeProperties[2017]['2021DesignPU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU']
+
 upgradeProperties[2023] = {
     '2023D17' : {
         'Geom' : 'Extended2023D17',
@@ -340,20 +344,6 @@
         'Era' : 'Phase2_timing_layer_bar',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
     },
-    '2023D36' : {
-        'Geom' : 'Extended2023D36',
-        'HLTmenu': '@fake2',
-        'GT' : 'auto:phase2_realistic',
-        'Era' : 'Phase2',
-        'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
-     },
-    '2023D37' : {
-        'Geom' : 'Extended2023D37',
-        'HLTmenu': '@fake2',
-        'GT' : 'auto:phase2_realistic',
-        'Era' : 'Phase2',
-        'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
-     },
     '2023D28' : {
         'Geom' : 'Extended2023D28',
         'HLTmenu': '@fake2',
@@ -431,6 +421,13 @@
         'Era' : 'Phase2C8_timing_layer_bar',
         'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
     },
+    '2023D42' : {
+        'Geom' : 'Extended2023D42',
+        'HLTmenu': '@fake2',
+        'GT' : 'auto:phase2_realistic',
+        'Era' : 'Phase2',
+        'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
+    },
 }
 
 
@@ -446,10 +443,6 @@
 upgradeProperties[2023]['2023D24PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
 upgradeProperties[2023]['2023D25PU'] = deepcopy(upgradeProperties[2023]['2023D25'])
 upgradeProperties[2023]['2023D25PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
-upgradeProperties[2023]['2023D36PU'] = deepcopy(upgradeProperties[2023]['2023D36'])
-upgradeProperties[2023]['2023D36PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
-upgradeProperties[2023]['2023D37PU'] = deepcopy(upgradeProperties[2023]['2023D37'])
-upgradeProperties[2023]['2023D37PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
 upgradeProperties[2023]['2023D28PU'] = deepcopy(upgradeProperties[2023]['2023D28'])
 upgradeProperties[2023]['2023D28PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
 upgradeProperties[2023]['2023D29PU'] = deepcopy(upgradeProperties[2023]['2023D29'])
@@ -472,6 +465,8 @@
 upgradeProperties[2023]['2023D40PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
 upgradeProperties[2023]['2023D41PU'] = deepcopy(upgradeProperties[2023]['2023D41'])
 upgradeProperties[2023]['2023D41PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
+upgradeProperties[2023]['2023D42PU'] = deepcopy(upgradeProperties[2023]['2023D42'])
+upgradeProperties[2023]['2023D42PU']['ScenToRun'] = ['GenSimHLBeamSpotFull','DigiFullTriggerPU','RecoFullGlobalPU', 'HARVESTFullGlobalPU']
 
 
 from  Configuration.PyReleaseValidation.relval_steps import Kby
diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py
index 753d3350e1c64..aad73d543cad3 100755
--- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py
+++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py
@@ -74,7 +74,7 @@ def runSelected(opt):
                      10024.0, #2017 ttbar
                      10224.0, #2017 ttbar PU
                      10824.0, #2018 ttbar
-                     11624.0, #2019 ttbar
+                     11624.0, #2021 ttbar
                      20034.0, #2023D17 ttbar (TDR baseline Muon/Barrel)
                      21234.0, #2023D21 ttbar (Inner Tracker with lower radii than in TDR)
                      27434.0, #2023D35 to exercise new HGCal + new MTD
diff --git a/Configuration/Skimming/test/test_MONOPOLEskim.py b/Configuration/Skimming/test/test_MONOPOLEskim.py
index ad8c0bb77d22b..8da03bb56a76b 100644
--- a/Configuration/Skimming/test/test_MONOPOLEskim.py
+++ b/Configuration/Skimming/test/test_MONOPOLEskim.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('RECO',eras.Run2_2016)
+from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
+process = cms.Process('RECO',Run2_2016)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/Configuration/StandardSequences/python/DataMixerPreMix_cff.py b/Configuration/StandardSequences/python/DataMixerPreMix_cff.py
index 2dce6b5e13037..596e4c13069f1 100644
--- a/Configuration/StandardSequences/python/DataMixerPreMix_cff.py
+++ b/Configuration/StandardSequences/python/DataMixerPreMix_cff.py
@@ -34,11 +34,11 @@
 DMEcalPreshowerDigis.digiProducer = cms.string('mixData')
 #DMEcalPreshowerDigis.ESdigiCollection = cms.string('ESDigiCollectionDM')
 
-ecalDigiSequenceDM = cms.Sequence(DMEcalTriggerPrimitiveDigis*DMEcalDigis*DMEcalPreshowerDigis)
+ecalDigiTaskDM = cms.Task(DMEcalTriggerPrimitiveDigis, DMEcalDigis, DMEcalPreshowerDigis)
 from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
-_phase2_ecalDigiSequenceDM = ecalDigiSequenceDM.copy()
-_phase2_ecalDigiSequenceDM.insert(0,DMEcalEBTriggerPrimitiveDigis)
-phase2_common.toReplaceWith(ecalDigiSequenceDM, _phase2_ecalDigiSequenceDM)
+_phase2_ecalDigiTaskDM = ecalDigiTaskDM.copy()
+_phase2_ecalDigiTaskDM.add(DMEcalEBTriggerPrimitiveDigis)
+phase2_common.toReplaceWith(ecalDigiTaskDM, _phase2_ecalDigiTaskDM)
 
 # same for Hcal:
 
@@ -54,9 +54,9 @@
 DMHcalDigis.digiLabel = cms.string('mixData')
 DMHcalTTPDigis.HFDigiCollection = cms.InputTag("mixData")
 
-hcalDigiSequenceDM = cms.Sequence(DMHcalTriggerPrimitiveDigis+DMHcalDigis*DMHcalTTPDigis)
+hcalDigiTaskDM = cms.Task(DMHcalTriggerPrimitiveDigis, DMHcalDigis, DMHcalTTPDigis)
 
-postDMDigi = cms.Sequence(ecalDigiSequenceDM+hcalDigiSequenceDM+muonDigi)
+postDMDigi = cms.Task(ecalDigiTaskDM, hcalDigiTaskDM, muonDigiTask)
 
 # disable adding noise to HCAL cells with no MC signal
 #mixData.doEmpty = False
@@ -68,8 +68,8 @@
 from SimGeneral.PileupInformation.AddPileupSummary_cfi import *
 
 
-
-pdatamix = cms.Sequence(mixData+postDMDigi+addPileupInfo)
+pdatamixTask = cms.Task(mixData, postDMDigi, addPileupInfo)
+pdatamix = cms.Sequence(pdatamixTask)
 
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
 def _fastSimDigis(process):
diff --git a/Configuration/StandardSequences/python/DigiCosmics_cff.py b/Configuration/StandardSequences/python/DigiCosmics_cff.py
index 26d86798b14b4..7ba866321ac3e 100644
--- a/Configuration/StandardSequences/python/DigiCosmics_cff.py
+++ b/Configuration/StandardSequences/python/DigiCosmics_cff.py
@@ -51,7 +51,10 @@
 simHcalDigis.HOlevel   = cms.int32(-10000)
 simHcalDigis.HFlevel   = cms.int32(-10000)
 
-doAllDigi = cms.Sequence(calDigi+muonDigi)
-pdigi = cms.Sequence(cms.SequencePlaceholder("randomEngineStateProducer")*cms.SequencePlaceholder("mix")*doAllDigi)
-pdigi_valid = cms.Sequence(pdigi)
+doAllDigiTask = cms.Task(calDigiTask, muonDigiTask)
+pdigiTask = cms.Task(cms.TaskPlaceholder("randomEngineStateProducer"), cms.TaskPlaceholder("mix"), doAllDigiTask)
+
+doAllDigi = cms.Sequence(doAllDigiTask)
+pdigi = cms.Sequence(pdigiTask)
+pdigi_valid = cms.Sequence(pdigiTask)
 
diff --git a/Configuration/StandardSequences/python/DigiDM_cff.py b/Configuration/StandardSequences/python/DigiDM_cff.py
index 0ff1d626c3e2e..b233c95aa6201 100644
--- a/Configuration/StandardSequences/python/DigiDM_cff.py
+++ b/Configuration/StandardSequences/python/DigiDM_cff.py
@@ -39,15 +39,15 @@
 
 # remove unnecessary modules from 'pdigi' sequence - run after DataMixing
 # standard mixing module now makes unsuppressed digis for calorimeter
-pdigi.remove(simEcalTriggerPrimitiveDigis)
-pdigi.remove(simEcalEBTriggerPrimitiveDigis) # phase2
-pdigi.remove(simEcalDigis)  # does zero suppression
-pdigi.remove(simEcalPreshowerDigis)  # does zero suppression
-pdigi.remove(simHcalDigis)
-pdigi.remove(simHcalTTPDigis)
+pdigiTask.remove(simEcalTriggerPrimitiveDigis)
+pdigiTask.remove(simEcalEBTriggerPrimitiveDigis) # phase2
+pdigiTask.remove(simEcalDigis)  # does zero suppression
+pdigiTask.remove(simEcalPreshowerDigis)  # does zero suppression
+pdigiTask.remove(simHcalDigis)
+pdigiTask.remove(simHcalTTPDigis)
 
 # premixing stage2 runs addPileupInfo, and muon digis after PreMixingModule (configured in DataMixerPreMix_cff)
-premix_stage2.toReplaceWith(pdigi, pdigi.copyAndExclude([addPileupInfo, genPUProtons, muonDigi]))
+premix_stage2.toReplaceWith(pdigiTask, pdigiTask.copyAndExclude([addPileupInfo, genPUProtons, muonDigiTask]))
 
 # genPUProtons, on the other hand, is an EDAlias. In principle it is
 # already loaded with digitizers_cfi, but in practice that gets
diff --git a/Configuration/StandardSequences/python/DigiToRawDM_cff.py b/Configuration/StandardSequences/python/DigiToRawDM_cff.py
index 1d4a938a6b2c6..bbad69aa54244 100644
--- a/Configuration/StandardSequences/python/DigiToRawDM_cff.py
+++ b/Configuration/StandardSequences/python/DigiToRawDM_cff.py
@@ -32,7 +32,7 @@
 (~premix_stage2).toModify(dtpacker, digiColl = 'mixData')
 (~premix_stage2).toModify(rpcpacker, InputLabel = "mixData")
 
-DigiToRaw.remove(castorRawData)
+DigiToRawTask.remove(castorRawData)
 
 #castorRawData.CASTOR = cms.untracked.InputTag("castorDigis")
 #
diff --git a/Configuration/StandardSequences/python/DigiToRaw_Repack_cff.py b/Configuration/StandardSequences/python/DigiToRaw_Repack_cff.py
index a785a8b620d16..f0fc531db37a0 100644
--- a/Configuration/StandardSequences/python/DigiToRaw_Repack_cff.py
+++ b/Configuration/StandardSequences/python/DigiToRaw_Repack_cff.py
@@ -48,7 +48,11 @@
 ## Repacked DigiToRaw Sequence
 ##
 
-DigiToRawRepack = cms.Sequence( SiStripDigiToZSRaw * rawDataRepacker )
-DigiToHybridRawRepack = cms.Sequence( SiStripDigiToHybridRaw * hybridRawDataRepacker )
-DigiToVirginRawRepack = cms.Sequence( SiStripRawDigiToVirginRaw * virginRawDataRepacker )
-DigiToSplitRawRepack = cms.Sequence( DigiToRawRepack + DigiToVirginRawRepack )
+DigiToRawRepackTask = cms.Task(SiStripDigiToZSRaw, rawDataRepacker)
+DigiToHybridRawRepackTask = cms.Task(SiStripDigiToHybridRaw, hybridRawDataRepacker)
+DigiToVirginRawRepackTask = cms.Task(SiStripRawDigiToVirginRaw, virginRawDataRepacker)
+
+DigiToRawRepack = cms.Sequence( DigiToRawRepackTask )
+DigiToHybridRawRepack = cms.Sequence( DigiToHybridRawRepackTask )
+DigiToVirginRawRepack = cms.Sequence( DigiToVirginRawRepackTask )
+DigiToSplitRawRepack = cms.Sequence( DigiToRawRepackTask, DigiToVirginRawRepackTask )
diff --git a/Configuration/StandardSequences/python/DigiToRaw_cff.py b/Configuration/StandardSequences/python/DigiToRaw_cff.py
index 82a17951e99a1..0df921bc98efe 100644
--- a/Configuration/StandardSequences/python/DigiToRaw_cff.py
+++ b/Configuration/StandardSequences/python/DigiToRaw_cff.py
@@ -18,8 +18,8 @@
 from EventFilter.RawDataCollector.rawDataCollector_cfi import *
 from L1Trigger.Configuration.L1TDigiToRaw_cff import *
 
-#DigiToRaw = cms.Sequence(L1TDigiToRaw*siPixelRawData*SiStripDigiToRaw*ecalPacker*esDigiToRaw*hcalRawData*cscpacker*dtpacker*rpcpacker*rawDataCollector)
-DigiToRaw = cms.Sequence(L1TDigiToRaw*siPixelRawData*SiStripDigiToRaw*ecalPacker*esDigiToRaw*hcalRawData*cscpacker*dtpacker*rpcpacker*castorRawData*rawDataCollector)
+DigiToRawTask = cms.Task(L1TDigiToRawTask, siPixelRawData, SiStripDigiToRaw, ecalPacker, esDigiToRaw, hcalRawDataTask, cscpacker, dtpacker, rpcpacker, castorRawData, rawDataCollector)
+DigiToRaw = cms.Sequence(DigiToRawTask)
 
 ecalPacker.Label = 'simEcalDigis'
 ecalPacker.InstanceEB = 'ebDigis'
@@ -28,28 +28,28 @@
 ecalPacker.labelEESRFlags = "simEcalDigis:eeSrFlags"
 
 from Configuration.Eras.Modifier_run3_common_cff import run3_common
-run3_common.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([castorRawData]))
+run3_common.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([castorRawData]))
 
 #if we don't have hcal raw data
 from Configuration.Eras.Modifier_hcalSkipPacker_cff import hcalSkipPacker
-hcalSkipPacker.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([hcalRawData]))
+hcalSkipPacker.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([hcalRawDataTask]))
 
 # Remove siPixelRawData until we have phase1 pixel digis
 from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
-phase2_tracker.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([siPixelRawData])) # FIXME
+phase2_tracker.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([siPixelRawData])) # FIXME
 
 # GEM settings
-_gem_DigiToRaw = DigiToRaw.copy()
-_gem_DigiToRaw.insert(-2,gemPacker)
+_gem_DigiToRawTask = DigiToRawTask.copy()
+_gem_DigiToRawTask.add(gemPacker)
 
 from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017
-run2_GEM_2017.toReplaceWith(DigiToRaw, _gem_DigiToRaw)
+run2_GEM_2017.toReplaceWith(DigiToRawTask, _gem_DigiToRawTask)
 
 from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
-run3_GEM.toReplaceWith(DigiToRaw, _gem_DigiToRaw)
+run3_GEM.toReplaceWith(DigiToRawTask, _gem_DigiToRawTask)
 
 from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon
-phase2_muon.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([rpcpacker]))
+phase2_muon.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([rpcpacker]))
 
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
-fastSim.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([siPixelRawData,SiStripDigiToRaw,castorRawData]))
+fastSim.toReplaceWith(DigiToRawTask, DigiToRawTask.copyAndExclude([siPixelRawData,SiStripDigiToRaw,castorRawData]))
diff --git a/Configuration/StandardSequences/python/Digi_cff.py b/Configuration/StandardSequences/python/Digi_cff.py
index 40c56b48afa2f..3a353d3190fb9 100644
--- a/Configuration/StandardSequences/python/Digi_cff.py
+++ b/Configuration/StandardSequences/python/Digi_cff.py
@@ -30,15 +30,21 @@
 from GeneratorInterface.Core.generatorSmeared_cfi import *
 from SimGeneral.PileupInformation.genPUProtons_cfi import *
 
-doAllDigi = cms.Sequence(generatorSmeared*calDigi+muonDigi)
-pdigi = cms.Sequence(generatorSmeared*fixGenInfo*cms.SequencePlaceholder("randomEngineStateProducer")*cms.SequencePlaceholder("mix")*doAllDigi*addPileupInfo*genPUProtons)
-pdigi_valid = cms.Sequence(pdigi)
-pdigi_nogen=cms.Sequence(generatorSmeared*cms.SequencePlaceholder("randomEngineStateProducer")*cms.SequencePlaceholder("mix")*doAllDigi*addPileupInfo*genPUProtons)
-pdigi_valid_nogen=cms.Sequence(pdigi_nogen)
+doAllDigiTask = cms.Task(generatorSmeared, calDigiTask, muonDigiTask)
+pdigiTask_nogen = cms.Task(generatorSmeared, cms.TaskPlaceholder("randomEngineStateProducer"), cms.TaskPlaceholder("mix"), doAllDigiTask, addPileupInfo, genPUProtons)
+pdigiTask = cms.Task(pdigiTask_nogen, fixGenInfoTask)
+
+doAllDigi = cms.Sequence(doAllDigiTask)
+pdigi = cms.Sequence(pdigiTask)
+pdigi_valid = cms.Sequence(pdigiTask)
+pdigi_nogen=cms.Sequence(pdigiTask_nogen)
+pdigi_valid_nogen=cms.Sequence(pdigiTask_nogen)
 
 from GeneratorInterface.HiGenCommon.HeavyIon_cff import *
-pdigi_hi=cms.Sequence(pdigi+heavyIon)
-pdigi_hi_nogen=cms.Sequence(pdigi_nogen+genJetMET+heavyIon)
+pdigiTask_hi = cms.Task(pdigiTask, heavyIon)
+pdigiTask_hi_nogen = cms.Task(pdigiTask_nogen, genJetMETTask, heavyIon)
+pdigi_hi=cms.Sequence(pdigiTask_hi)
+pdigi_hi_nogen=cms.Sequence(pdigiTask_hi_nogen)
 
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
 def _fastSimDigis(process):
diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py
index 716cbcb1f72c5..c13ab308e3eff 100644
--- a/Configuration/StandardSequences/python/Eras.py
+++ b/Configuration/StandardSequences/python/Eras.py
@@ -68,18 +68,22 @@ def __init__(self):
                            'bParking']
         internalUseModChains = ['run2_2017_noTrackingModifier']
 
+        self.pythonCfgLines = {}
 
         for e in allEras:
             eObj=getattr(__import__('Configuration.Eras.Era_'+e+'_cff',globals(),locals(),[e],0),e)
             self.addEra(e,eObj)
+            self.pythonCfgLines[e] = 'from Configuration.Eras.Era_'+e+'_cff import '+e
 
         for e in internalUseMods:
             eObj=getattr(__import__('Configuration.Eras.Modifier_'+e+'_cff',globals(),locals(),[e],0),e)
             self.addEra(e,eObj)
+            self.pythonCfgLines[e] = 'from Configuration.Eras.Modifier_'+e+'_cff import '+e
 
         for e in internalUseModChains:
             eObj=getattr(__import__('Configuration.Eras.ModifierChain_'+e+'_cff',globals(),locals(),[e],0),e)
             self.addEra(e,eObj)
+            self.pythonCfgLines[e] = 'from Configuration.Eras.ModifierChain_'+e+'_cff import '+e
 
 
     def addEra(self,name,obj):
diff --git a/Configuration/StandardSequences/python/Generator_cff.py b/Configuration/StandardSequences/python/Generator_cff.py
index 4a94fb646c79a..05fa303750296 100644
--- a/Configuration/StandardSequences/python/Generator_cff.py
+++ b/Configuration/StandardSequences/python/Generator_cff.py
@@ -47,11 +47,13 @@
 #   }
 # }
 
+GeneInfoTask = cms.Task(genParticles)
+genJetMETTask = cms.Task(genJetParticlesTask, recoGenJetsTask, genMETParticlesTask, recoGenMETTask)
 
 VertexSmearing = cms.Sequence(cms.SequencePlaceholder("VtxSmeared"))
 GenSmeared = cms.Sequence(generatorSmeared)
-GeneInfo = cms.Sequence(genParticles)
-genJetMET = cms.Sequence(genJetParticles*recoGenJets+genMETParticles*recoGenMET)
+GeneInfo = cms.Sequence(GeneInfoTask)
+genJetMET = cms.Sequence(genJetMETTask)
 
 pgen = cms.Sequence(cms.SequencePlaceholder("randomEngineStateProducer")+VertexSmearing+GenSmeared+GeneInfo+genJetMET)
 
@@ -59,7 +61,8 @@
 
 pgen_genonly = cms.Sequence(cms.SequencePlaceholder("randomEngineStateProducer"))
 
-fixGenInfo = cms.Sequence(GeneInfo * genJetMET)
+fixGenInfoTask = cms.Task(GeneInfoTask, genJetMETTask)
+fixGenInfo = cms.Sequence(fixGenInfoTask)
 
 
 import HLTrigger.HLTfilters.triggerResultsFilter_cfi
diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py
index cfecde9dddf34..73499172b23f8 100644
--- a/Configuration/StandardSequences/python/GeometryConf.py
+++ b/Configuration/StandardSequences/python/GeometryConf.py
@@ -9,7 +9,7 @@
     'DBExtended2017'   : 'DB:Extended',
     'DBExtended2017ZeroMaterial'    : 'DB:Extended2017ZeroMaterial',
     'DBExtended2018'    : 'DB:Extended',
-    'DBExtended2019'    : 'DB:Extended2019',
+    'DBExtended2021'    : 'DB:Extended',
     'DBExtended2023'    : 'DB:Extended2023',
     'DBIdeal2015'       : 'DB:Ideal2015',
     'DBIdeal2015dev'    : 'DB:Ideal2015dev',
@@ -23,7 +23,7 @@
     'Extended2018'   : 'Extended2018,Extended2018Reco',
     'Extended2017Plan1' : 'Extended2017Plan1,Extended2017Plan1Reco',
     'Extended2017Plan1ZeroMaterial' : 'Extended2017Plan1ZeroMaterial,Extended2017Plan1ZeroMaterialReco',
-    'Extended2019'   : 'Extended2019,Extended2019Reco',
+    'Extended2021'   : 'Extended2021,Extended2021Reco',
     'All'         : 'Configuration.Geometry.GeometrySimAll_cff,Reco',
     'ECALHCAL'    : 'Configuration.Geometry.GeometrySimECALHCAL_cff,Configuration.Geometry.GeometryRecoECALHCAL_cff',
     'TrackerOnly' : 'Configuration.Geometry.GeometrySimTracker_cff,Configuration.Geometry.GeometryRecoTracker_cff',
@@ -41,10 +41,9 @@
     'Extended2023D33' : 'Extended2023D33,Extended2023D33Reco',
     'Extended2023D34' : 'Extended2023D34,Extended2023D34Reco',
     'Extended2023D35' : 'Extended2023D35,Extended2023D35Reco',
-    'Extended2023D36' : 'Extended2023D36,Extended2023D36Reco',
-    'Extended2023D37' : 'Extended2023D37,Extended2023D37Reco',
     'Extended2023D38' : 'Extended2023D38,Extended2023D38Reco',
     'Extended2023D39' : 'Extended2023D39,Extended2023D39Reco',
     'Extended2023D40' : 'Extended2023D40,Extended2023D40Reco',
     'Extended2023D41' : 'Extended2023D41,Extended2023D41Reco',
+    'Extended2023D42' : 'Extended2023D42,Extended2023D42Reco',
     }
diff --git a/Configuration/StandardSequences/python/Mixing.py b/Configuration/StandardSequences/python/Mixing.py
index f49f666ea6122..d1bccca5e739a 100644
--- a/Configuration/StandardSequences/python/Mixing.py
+++ b/Configuration/StandardSequences/python/Mixing.py
@@ -115,6 +115,7 @@ def addMixingScenario(label,dict):
 addMixingScenario("2016_25ns_Moriond17MC_PoissonOOTPU",{'file': 'SimGeneral.MixingModule.mix_2016_25ns_Moriond17MC_PoissonOOTPU_cfi'})
 addMixingScenario("mix_2016_PoissonOOTPU_HighPUTrains_Fill5412",{'file': 'SimGeneral.MixingModule.mix_2016_PoissonOOTPU_HighPUTrains_Fill5412_cfi'})
 addMixingScenario("2017_25ns_WinterMC_PUScenarioV1_PoissonOOTPU",{'file': 'SimGeneral.MixingModule.mix_2017_25ns_WinterMC_PUScenarioV1_PoissonOOTPU_cfi'})
+addMixingScenario("2017_25ns_UltraLegacy_PoissonOOTPU",{'file': 'SimGeneral.MixingModule.mix_2017_25ns_UltraLegacy_PoissonOOTPU_cfi'})
 addMixingScenario("2018_25ns_ProjectedPileup_PoissonOOTPU",{'file': 'SimGeneral.MixingModule.mix_2018_25ns_ProjectedPileup_PoissonOOTPU_cfi'})
 addMixingScenario("2018_25ns_JuneProjectionFull18_PoissonOOTPU",{'file': 'SimGeneral.MixingModule.mix_2018_25ns_JuneProjectionFull18_PoissonOOTPU_cfi'})
 addMixingScenario("ProdStep2",{'file': 'SimGeneral.MixingModule.mixProdStep2_cfi'})
diff --git a/Configuration/StandardSequences/python/SimExtended_cff.py b/Configuration/StandardSequences/python/SimExtended_cff.py
index ee412374ebbe8..7b2898b28121f 100644
--- a/Configuration/StandardSequences/python/SimExtended_cff.py
+++ b/Configuration/StandardSequences/python/SimExtended_cff.py
@@ -9,6 +9,7 @@
 # use Hector output instead of the generator one
 g4SimHits.Generator.HepMCProductLabel = cms.string('LHCTransport')
 
-psim = cms.Sequence(cms.SequencePlaceholder("randomEngineStateProducer")*LHCTransport*g4SimHits)
+psimTask = cms.Task(cms.TaskPlaceholder("randomEngineStateProducer"), LHCTransport, g4SimHits)
+psim = cms.Sequence(psimTask)
 
 
diff --git a/Configuration/StandardSequences/python/SimIdeal_cff.py b/Configuration/StandardSequences/python/SimIdeal_cff.py
index 71f2243f814a4..866d4702107b8 100644
--- a/Configuration/StandardSequences/python/SimIdeal_cff.py
+++ b/Configuration/StandardSequences/python/SimIdeal_cff.py
@@ -3,4 +3,5 @@
 # CMSSW/Geant4 interface
 from SimG4Core.Configuration.SimG4Core_cff import *
 
-psim = cms.Sequence(cms.SequencePlaceholder("randomEngineStateProducer")*g4SimHits)
+psimTask = cms.Task(cms.TaskPlaceholder("randomEngineStateProducer"), g4SimHits)
+psim = cms.Sequence(psimTask)
diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_CalouGT_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_CalouGT_cff.py
index 731664cd89fd3..030a44286178d 100644
--- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_CalouGT_cff.py
+++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_CalouGT_cff.py
@@ -122,7 +122,8 @@ def _print(ignored):
     )
 
 
-SimL1Emulator = cms.Sequence()
-stage2L1Trigger.toReplaceWith(SimL1Emulator, cms.Sequence(unpackEcal+unpackHcal+unpackCSC+unpackDT+unpackRPC+unpackEmtf+unpackCsctf+unpackBmtf+unpackGtStage2
-                                 +SimL1EmulatorCore+packCaloStage2
-                                 +packGtStage2+rawDataCollector))
+SimL1EmulatorTask = cms.Task()
+stage2L1Trigger.toReplaceWith(SimL1EmulatorTask, cms.Task(unpackEcal,unpackHcal,unpackCSC,unpackDT,unpackRPC,unpackEmtf,unpackCsctf,unpackBmtf,unpackGtStage2
+                                 ,SimL1EmulatorCoreTask,packCaloStage2
+                                 ,packGtStage2,rawDataCollector))
+SimL1Emulator = cms.Sequence(SimL1EmulatorTask)
diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full2015Data_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full2015Data_cff.py
index 37ab83947121b..1e489c545bcf3 100644
--- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full2015Data_cff.py
+++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full2015Data_cff.py
@@ -95,7 +95,8 @@ def _print(ignored):
     )
 
 
-SimL1Emulator = cms.Sequence()
-stage2L1Trigger.toReplaceWith(SimL1Emulator, cms.Sequence(unpackEcal+unpackHcal+unpackCSC+unpackDT+unpackRPC+unpackDttf+unpackCsctf
-                                 +simHcalTriggerPrimitiveDigis+SimL1EmulatorCore+packCaloStage2
-                                 +packGmtStage2+packGtStage2+rawDataCollector))
+SimL1EmulatorTask = cms.Task()
+stage2L1Trigger.toReplaceWith(SimL1EmulatorTask, cms.Task(unpackEcal,unpackHcal,unpackCSC,unpackDT,unpackRPC,unpackDttf,unpackCsctf
+                                 ,simHcalTriggerPrimitiveDigis,SimL1EmulatorCoreTask,packCaloStage2
+                                 ,packGmtStage2,packGtStage2,rawDataCollector))
+SimL1Emulator = cms.Sequence(SimL1EmulatorTask)
diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py
index 99fa9933d2cd1..a24d0ece093f6 100644
--- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py
+++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py
@@ -101,16 +101,17 @@ def _print(ignored):
         ]
     )
 
-SimL1Emulator = cms.Sequence()
-stage2L1Trigger.toReplaceWith(SimL1Emulator, cms.Sequence(unpackRPC
-                                                          + unpackDT
-                                                          + unpackCSC
-                                                          + unpackEcal
-                                                          + unpackHcal
-                                                          #+ simEcalTriggerPrimitiveDigis
-                                                          + simHcalTriggerPrimitiveDigis
-                                                          + SimL1EmulatorCore
-                                                          + packCaloStage2
-                                                          + packGmtStage2
-                                                          + packGtStage2
-                                                          + rawDataCollector))
+SimL1EmulatorTask = cms.Task()
+stage2L1Trigger.toReplaceWith(SimL1EmulatorTask, cms.Task(unpackRPC
+                                                          , unpackDT
+                                                          , unpackCSC
+                                                          , unpackEcal
+                                                          , unpackHcal
+                                                          #, simEcalTriggerPrimitiveDigis
+                                                          , simHcalTriggerPrimitiveDigis
+                                                          , SimL1EmulatorCoreTask
+                                                          , packCaloStage2
+                                                          , packGmtStage2
+                                                          , packGtStage2
+                                                          , rawDataCollector))
+SimL1Emulator = cms.Sequence(SimL1EmulatorTask)
diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py
index 1bc0d61031e77..90f8d42cc5513 100644
--- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py
+++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py
@@ -113,9 +113,11 @@ def _print(ignored):
         ]
     )
 
-SimL1Emulator = cms.Sequence()
-stage2L1Trigger.toReplaceWith(SimL1Emulator, cms.Sequence(unpackEcal+unpackHcal+unpackCSC+unpackDT+unpackRPC+unpackEmtf+unpackCsctf+unpackBmtf
-                                 +simEcalTriggerPrimitiveDigis
-                                 +simHcalTriggerPrimitiveDigis
-                                 +SimL1EmulatorCore+packCaloStage2
-                                 +packGmtStage2+packGtStage2+rawDataCollector))
+
+SimL1EmulatorTask = cms.Task()
+stage2L1Trigger.toReplaceWith(SimL1EmulatorTask, cms.Task(unpackEcal,unpackHcal,unpackCSC,unpackDT,unpackRPC,unpackEmtf,unpackCsctf,unpackBmtf
+                                 ,simEcalTriggerPrimitiveDigis
+                                 ,simHcalTriggerPrimitiveDigis
+                                 ,SimL1EmulatorCoreTask,packCaloStage2
+                                 ,packGmtStage2,packGtStage2,rawDataCollector))
+SimL1Emulator = cms.Sequence(SimL1EmulatorTask)
diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full_cff.py
index 61671c9438141..ed16decddc813 100644
--- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full_cff.py
+++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full_cff.py
@@ -151,10 +151,10 @@ def _print(ignored):
     )
 
 
-SimL1Emulator = cms.Sequence()
-stage2L1Trigger.toReplaceWith(SimL1Emulator, cms.Sequence(unpackEcal+unpackHcal+unpackCSC+unpackDT+unpackRPC+unpackRPCTwinMux+unpackTwinMux+unpackOmtf+unpackEmtf+unpackCsctf+unpackBmtf
-                                                          +unpackLayer1
-                                                          +unpackTcds
-                                                          +SimL1EmulatorCore+packCaloStage2
-                                                          +packGmtStage2+packGtStage2+rawDataCollector))
-
+SimL1EmulatorTask = cms.Task()
+stage2L1Trigger.toReplaceWith(SimL1EmulatorTask, cms.Task(unpackEcal,unpackHcal,unpackCSC,unpackDT,unpackRPC,unpackRPCTwinMux,unpackTwinMux,unpackOmtf,unpackEmtf,unpackCsctf,unpackBmtf
+                                                          ,unpackLayer1
+                                                          ,unpackTcds
+                                                          ,SimL1EmulatorCoreTask,packCaloStage2
+                                                          ,packGmtStage2,packGtStage2,rawDataCollector))
+SimL1Emulator = cms.Sequence(SimL1EmulatorTask)
diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_GCTGT_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_GCTGT_cff.py
index 1059887102998..834b4249888f3 100644
--- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_GCTGT_cff.py
+++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_GCTGT_cff.py
@@ -93,14 +93,15 @@
 ## construct SimL1Emulator sequence
 ##
 
-SimL1Emulator = cms.Sequence(
-      unpackGtDigis      +
-      unpackCastorDigis  +
-      L1TCaloStage1_PPFromRaw +
-      newGtDigis         +
-      packGctDigis       +
-      packL1tDigis       +
-      packL1Gt           +
-      packL1GtEvm        +
+SimL1EmulatorTask = cms.Task(
+      unpackGtDigis      ,
+      unpackCastorDigis  ,
+      L1TCaloStage1_PPFromRawTask ,
+      newGtDigis         ,
+      packGctDigis       ,
+      packL1tDigis       ,
+      packL1Gt           ,
+      packL1GtEvm        ,
       rawDataCollector
 )
+SimL1Emulator = cms.Sequence(SimL1EmulatorTask)
diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_GT1_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_GT1_cff.py
index 5ebda5cfdb837..dc026fb5bc2d6 100644
--- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_GT1_cff.py
+++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_GT1_cff.py
@@ -67,12 +67,13 @@
 ## construct SimL1Emulator sequence
 ##
 
-SimL1Emulator = cms.Sequence(
-      unpackGctDigis     +
-      unpackGtDigis      +
-      unpackCastorDigis  +
-      newGtDigis         +
-      packL1Gt           +
-      packL1GtEvm        +
+SimL1EmulatorTask = cms.Task(
+      unpackGctDigis     ,
+      unpackGtDigis      ,
+      unpackCastorDigis  ,
+      newGtDigis         ,
+      packL1Gt           ,
+      packL1GtEvm        ,
       rawDataCollector
 )
+SimL1Emulator = cms.Sequence(SimL1EmulatorTask)
diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_GT2_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_GT2_cff.py
index ca74888766662..a7d613c973bad 100644
--- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_GT2_cff.py
+++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_GT2_cff.py
@@ -76,13 +76,14 @@
 ## construct SimL1Emulator sequence
 ##
 
-SimL1Emulator = cms.Sequence(
-      unpackGctStage1    +
-      unpackGctDigis     +
-      unpackGtDigis      +
-      unpackCastorDigis  +
-      newGtDigis         +
-      packL1Gt           +
-      packL1GtEvm        +
+SimL1EmulatorTask = cms.Task(
+      unpackGctStage1    ,
+      unpackGctDigis     ,
+      unpackGtDigis      ,
+      unpackCastorDigis  ,
+      newGtDigis         ,
+      packL1Gt           ,
+      packL1GtEvm        ,
       rawDataCollector
 )
+SimL1Emulator = cms.Sequence(SimL1EmulatorTask)
diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_GT_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_GT_cff.py
index 35624825f3423..10fdf032e54a0 100644
--- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_GT_cff.py
+++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_GT_cff.py
@@ -61,13 +61,13 @@
     )
 )
 
-SimL1Emulator = cms.Sequence(
+SimL1EmulatorTask = cms.Task(
       unpackGctDigis
-    + unpackGtDigis
-    + unpackCastorDigis
-    + simGtDigis
-    + l1GtPack
-    + l1GtEvmPack
-    + rawDataCollector
+    , unpackGtDigis
+    , unpackCastorDigis
+    , simGtDigis
+    , l1GtPack
+    , l1GtEvmPack
+    , rawDataCollector
 )
-
+SimL1Emulator = cms.Sequence(SimL1EmulatorTask)
diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_uGT_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_uGT_cff.py
index 88a8bbcdc7a25..77d42a519bd52 100644
--- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_uGT_cff.py
+++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_uGT_cff.py
@@ -57,10 +57,11 @@ def _print(ignored):
     )
 
 
-SimL1Emulator = cms.Sequence()
-stage2L1Trigger.toReplaceWith(SimL1Emulator, cms.Sequence(unpackGtStage2
-                                                          +unpackTcds
-                                                          +SimL1TechnicalTriggers
-                                                          +SimL1TGlobal
-                                                          +packGtStage2
-                                                          +rawDataCollector))
+SimL1EmulatorTask = cms.Task()
+stage2L1Trigger.toReplaceWith(SimL1EmulatorTask, cms.Task(unpackGtStage2
+                                                          ,unpackTcds
+                                                          ,SimL1TechnicalTriggersTask
+                                                          ,SimL1TGlobalTask
+                                                          ,packGtStage2
+                                                          ,rawDataCollector))
+SimL1Emulator = cms.Sequence(SimL1EmulatorTask)
diff --git a/Configuration/StandardSequences/python/SimNOBEAM_cff.py b/Configuration/StandardSequences/python/SimNOBEAM_cff.py
index 0e1c10ca6120a..752464a4b251b 100644
--- a/Configuration/StandardSequences/python/SimNOBEAM_cff.py
+++ b/Configuration/StandardSequences/python/SimNOBEAM_cff.py
@@ -7,6 +7,7 @@
 g4SimHits.Generator.HepMCProductLabel = cms.InputTag('generatorSmeared')
 g4SimHits.Generator.ApplyEtaCuts = cms.bool(False)
 
-psim = cms.Sequence(cms.SequencePlaceholder("randomEngineStateProducer")*g4SimHits)
+psimTask = cms.Task(cms.TaskPlaceholder("randomEngineStateProducer"), g4SimHits)
+psim = cms.Sequence(psimTask)
 
 
diff --git a/Configuration/StandardSequences/python/Simulation_cff.py b/Configuration/StandardSequences/python/Simulation_cff.py
index f95a0d40a3951..fb064d88ecb8a 100644
--- a/Configuration/StandardSequences/python/Simulation_cff.py
+++ b/Configuration/StandardSequences/python/Simulation_cff.py
@@ -35,6 +35,7 @@
 #
 from Configuration.StandardSequences.Digi_cff import *
 from SimGeneral.HepPDTESSource.pythiapdt_cfi import *
-simulation = cms.Sequence(psim*pdigi)
+simulationTask = cms.Task(psimTask)
+simulation = cms.Sequence(pdigi, simulationTask)
 
 
diff --git a/DPGAnalysis/SiStripTools/test/APVShot_Selector_cfg.py b/DPGAnalysis/SiStripTools/test/APVShot_Selector_cfg.py
index 99e95d7f75291..cd973678b4302 100644
--- a/DPGAnalysis/SiStripTools/test/APVShot_Selector_cfg.py
+++ b/DPGAnalysis/SiStripTools/test/APVShot_Selector_cfg.py
@@ -5,9 +5,9 @@
 
 process = cms.Process("APVShotAnalyzer")
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('APVShotAnalyzer',eras.Run2_2016)
+from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
+process = cms.Process('APVShotAnalyzer',Run2_2016)
 
 #prepare options
 
diff --git a/DPGAnalysis/Skims/python/cosmicSPSkim_cff.py b/DPGAnalysis/Skims/python/cosmicSPSkim_cff.py
index 04d103db9d2ca..1f44dc23f0c52 100644
--- a/DPGAnalysis/Skims/python/cosmicSPSkim_cff.py
+++ b/DPGAnalysis/Skims/python/cosmicSPSkim_cff.py
@@ -7,6 +7,9 @@
     PropagatorName = cms.string("SteppingHelixPropagatorAny"),
     radius = cms.double(10.0),
     maxZ = cms.double(50.0),
+    PixHits = cms.uint32(0),
+    TkLayers = cms.uint32(0),
+    MuonHits = cms.uint32(0),                              
 )
 
 cosmicMuonsFilter = cms.EDFilter("HLTMuonPointingFilter",
@@ -14,6 +17,9 @@
     PropagatorName = cms.string("SteppingHelixPropagatorAny"),
     radius = cms.double(10.0),
     maxZ = cms.double(50.0),
+    PixHits = cms.uint32(0),
+    TkLayers = cms.uint32(0),
+    MuonHits = cms.uint32(0),                              
 )
 
 cosmicMuons1LegFilter = cms.EDFilter("HLTMuonPointingFilter",
@@ -21,6 +27,9 @@
     PropagatorName = cms.string("SteppingHelixPropagatorAny"),
     radius = cms.double(10.0),
     maxZ = cms.double(50.0),
+    PixHits = cms.uint32(0),
+    TkLayers = cms.uint32(0),
+    MuonHits = cms.uint32(0),                              
 )
 
 globalCosmicMuonsBarrelOnlyFilter = cms.EDFilter("HLTMuonPointingFilter",
@@ -28,6 +37,9 @@
     PropagatorName = cms.string("SteppingHelixPropagatorAny"),
     radius = cms.double(10.0),
     maxZ = cms.double(50.0),
+    PixHits = cms.uint32(0),
+    TkLayers = cms.uint32(0),
+    MuonHits = cms.uint32(0),                              
 )
 
 cosmictrackfinderP5Filter = cms.EDFilter("HLTMuonPointingFilter",
@@ -35,6 +47,9 @@
     PropagatorName = cms.string("SteppingHelixPropagatorAny"),
     radius = cms.double(10.0),
     maxZ = cms.double(50.0),
+    PixHits = cms.uint32(0),
+    TkLayers = cms.uint32(0),
+    MuonHits = cms.uint32(0),                              
 )
 
 globalCosmicMuonsFilter = cms.EDFilter("HLTMuonPointingFilter",
@@ -42,6 +57,9 @@
     PropagatorName = cms.string("SteppingHelixPropagatorAny"),
     radius = cms.double(10.0),
     maxZ = cms.double(50.0),
+    PixHits = cms.uint32(0),
+    TkLayers = cms.uint32(0),
+    MuonHits = cms.uint32(0),                              
 )
 
 rsWithMaterialTracksP5Filter = cms.EDFilter("HLTMuonPointingFilter",
@@ -49,6 +67,9 @@
     PropagatorName = cms.string("SteppingHelixPropagatorAny"),
     radius = cms.double(10.0),
     maxZ = cms.double(50.0),
+    PixHits = cms.uint32(0),
+    TkLayers = cms.uint32(0),
+    MuonHits = cms.uint32(0),                              
 )
 
 globalCosmicMuons1LegFilter = cms.EDFilter("HLTMuonPointingFilter",
@@ -56,13 +77,19 @@
     PropagatorName = cms.string("SteppingHelixPropagatorAny"),
     radius = cms.double(10.0),
     maxZ = cms.double(50.0),
+    PixHits = cms.uint32(0),
+    TkLayers = cms.uint32(0),
+    MuonHits = cms.uint32(0),                              
 )
 
 ctfWithMaterialTracksP5Filter = cms.EDFilter("HLTMuonPointingFilter",
     SALabel = cms.InputTag("ctfWithMaterialTracksP5"),
     PropagatorName = cms.string("SteppingHelixPropagatorAny"),
     radius = cms.double(10.0),
-    maxZ = cms.double(50.0),
+    maxZ = cms.double(50.00),
+    PixHits = cms.uint32(0),
+    TkLayers = cms.uint32(0),
+    MuonHits = cms.uint32(0),                              
 )
 
 
diff --git a/DQM/CTPPS/test/all_ctpps_dqm_test_from_aod_cfg.py b/DQM/CTPPS/test/all_ctpps_dqm_test_from_aod_cfg.py
index e11ff031bd276..b6ed61915d7fa 100644
--- a/DQM/CTPPS/test/all_ctpps_dqm_test_from_aod_cfg.py
+++ b/DQM/CTPPS/test/all_ctpps_dqm_test_from_aod_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process('ctppsDQMfromAOD', eras.ctpps_2016)
+from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
+process = cms.Process('ctppsDQMfromAOD', ctpps_2016)
 
 # minimum of logs
 process.MessageLogger = cms.Service("MessageLogger",
diff --git a/DQM/CTPPS/test/all_ctpps_dqm_test_from_dat_cfg.py b/DQM/CTPPS/test/all_ctpps_dqm_test_from_dat_cfg.py
index 53f2b322e9ea0..dede9519e51f1 100644
--- a/DQM/CTPPS/test/all_ctpps_dqm_test_from_dat_cfg.py
+++ b/DQM/CTPPS/test/all_ctpps_dqm_test_from_dat_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process('ctppsDQMfromRAW', eras.ctpps_2016)
+from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
+process = cms.Process('ctppsDQMfromRAW', ctpps_2016)
 
 # minimum of logs
 process.MessageLogger = cms.Service("MessageLogger",
diff --git a/DQM/CTPPS/test/all_ctpps_dqm_test_from_raw_cfg.py b/DQM/CTPPS/test/all_ctpps_dqm_test_from_raw_cfg.py
index b8e07878ee2ed..f5b62d294a0d2 100644
--- a/DQM/CTPPS/test/all_ctpps_dqm_test_from_raw_cfg.py
+++ b/DQM/CTPPS/test/all_ctpps_dqm_test_from_raw_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process('ctppsDQMfromRAW', eras.ctpps_2016)
+from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
+process = cms.Process('ctppsDQMfromRAW', ctpps_2016)
 
 # minimum of logs
 process.MessageLogger = cms.Service("MessageLogger",
diff --git a/DQM/CastorMonitor/interface/CastorDigiMonitor.h b/DQM/CastorMonitor/interface/CastorDigiMonitor.h
index 0bcf6c1628972..2082a612e68de 100644
--- a/DQM/CastorMonitor/interface/CastorDigiMonitor.h
+++ b/DQM/CastorMonitor/interface/CastorDigiMonitor.h
@@ -3,35 +3,34 @@
 
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 
-#include "CondFormats/CastorObjects/interface/CastorPedestal.h"
-#include "CondFormats/CastorObjects/interface/CastorPedestalWidth.h"
 #include "CalibFormats/CastorObjects/interface/CastorCoderDb.h"
 #include "CalibFormats/CastorObjects/interface/CastorDbService.h"
+#include "CondFormats/CastorObjects/interface/CastorPedestal.h"
+#include "CondFormats/CastorObjects/interface/CastorPedestalWidth.h"
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DataFormats/Common/interface/TriggerResults.h"
 #include "FWCore/Common/interface/TriggerNames.h"
 
 //#include "FWCore/Framework/interface/Run.h"
 
-
 class CastorDigiMonitor {
-
 public:
-  CastorDigiMonitor(const edm::ParameterSet& ps); 
-  ~CastorDigiMonitor(); 
+  CastorDigiMonitor(const edm::ParameterSet &ps);
+  ~CastorDigiMonitor();
 
- void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &);
- void processEvent(edm::Event const& event, const CastorDigiCollection& cast, 
-       const edm::TriggerResults& trig, const CastorDbService& cond);
- void endRun();
- void getDbData(const edm::EventSetup& iSetup);
- int ModSecToIndex(int module, int sector);
- void fillTrigRes(edm::Event const& event,const edm::TriggerResults& TrigResults,
-	 double Etot);
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &);
+  void processEvent(edm::Event const &event,
+                    const CastorDigiCollection &cast,
+                    const edm::TriggerResults &trig,
+                    const CastorDbService &cond);
+  void endRun();
+  void getDbData(const edm::EventSetup &iSetup);
+  int ModSecToIndex(int module, int sector);
+  void fillTrigRes(edm::Event const &event, const edm::TriggerResults &TrigResults, double Etot);
 
 private:
   std::string subsystemname_;
@@ -40,21 +39,21 @@ class CastorDigiMonitor {
   float Qrms_DEAD;
 
   MonitorElement *hBX, *hpBXtrig;
-  MonitorElement* hpTrigRes;
-  MonitorElement* h2QrmsTSvsCh;
-  MonitorElement* hQIErms[10];
-  MonitorElement* hTSratio;
-  MonitorElement* h2TSratio;
-  MonitorElement* h2status;
-  MonitorElement* h2digierr;
-  MonitorElement* h2repsum;
-  MonitorElement* h2qualityMap;
-  MonitorElement* hReport;
+  MonitorElement *hpTrigRes;
+  MonitorElement *h2QrmsTSvsCh;
+  MonitorElement *hQIErms[10];
+  MonitorElement *hTSratio;
+  MonitorElement *h2TSratio;
+  MonitorElement *h2status;
+  MonitorElement *h2digierr;
+  MonitorElement *h2repsum;
+  MonitorElement *h2qualityMap;
+  MonitorElement *hReport;
   MonitorElement *h2QmeantsvsCh;
   MonitorElement *h2QmeanMap;
   MonitorElement *hModule;
   MonitorElement *hSector;
-  MonitorElement* hdigisize;
+  MonitorElement *hdigisize;
   MonitorElement *h2towEMvsHAD;
   MonitorElement *htowE;
 
diff --git a/DQM/CastorMonitor/interface/CastorLEDMonitor.h b/DQM/CastorMonitor/interface/CastorLEDMonitor.h
index f7a20408b2f34..8382405a131ee 100644
--- a/DQM/CastorMonitor/interface/CastorLEDMonitor.h
+++ b/DQM/CastorMonitor/interface/CastorLEDMonitor.h
@@ -1,50 +1,37 @@
 #ifndef DQM_CASTORMONITOR_CASTORLEDMONITOR_H
 #define DQM_CASTORMONITOR_CASTORLEDMONITOR_H
 
-#include "DataFormats/HcalDigi/interface/HcalUnpackerReport.h"
+#include "CalibFormats/CastorObjects/interface/CastorDbRecord.h"
+#include "CalibFormats/CastorObjects/interface/CastorDbService.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
-#include "CalibFormats/CastorObjects/interface/CastorDbService.h"
-#include "CalibFormats/CastorObjects/interface/CastorDbRecord.h"
+#include "DataFormats/HcalDigi/interface/HcalUnpackerReport.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 
-static const float LedMonAdc2fc[128]=
-     { -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5,
-	8.5,  9.5, 10.5, 11.5, 12.5, 13.5, 15., 17., 
-	19., 21., 23., 25., 27., 29.5,
-	32.5, 35.5, 38.5, 42., 46., 50., 54.5, 59.5, 
-	64.5, 59.5, 64.5, 69.5, 74.5,
-	79.5, 84.5, 89.5, 94.5, 99.5, 104.5, 109.5, 
-	114.5, 119.5, 124.5, 129.5, 137.,
-	147., 157., 167., 177., 187., 197., 209.5, 224.5, 
-	239.5, 254.5, 272., 292.,
-	312., 334.5, 359.5, 384.5, 359.5, 384.5, 409.5, 
-	434.5, 459.5, 484.5, 509.5,
-	534.5, 559.5, 584.5, 609.5, 634.5, 659.5, 684.5, 709.5, 
-	747., 797., 847.,
-	897.,  947., 997., 1047., 1109.5, 1184.5, 1259.5, 
-	1334.5, 1422., 1522., 1622.,
-	1734.5, 1859.5, 1984.5, 1859.5, 1984.5, 2109.5, 
-	2234.5, 2359.5, 2484.5,
-	2609.5, 2734.5, 2859.5, 2984.5, 3109.5, 
-	3234.5, 3359.5, 3484.5, 3609.5, 3797.,
-	4047., 4297., 4547., 4797., 5047., 5297., 
-	5609.5, 5984.5, 6359.5, 6734.5,
-	7172., 7672., 8172., 8734.5, 9359.5, 9984.5};
-
-//class CastorLEDMonitor: public CastorBaseMonitor {
-//class CastorLEDMonitor: public DQMEDHarvester {
-//class CastorLEDMonitor: public CastorMonitorModule {
+static const float LedMonAdc2fc[128] = {
+    -0.5,   0.5,    1.5,    2.5,    3.5,    4.5,    5.5,    6.5,    7.5,    8.5,    9.5,    10.5,   11.5,
+    12.5,   13.5,   15.,    17.,    19.,    21.,    23.,    25.,    27.,    29.5,   32.5,   35.5,   38.5,
+    42.,    46.,    50.,    54.5,   59.5,   64.5,   59.5,   64.5,   69.5,   74.5,   79.5,   84.5,   89.5,
+    94.5,   99.5,   104.5,  109.5,  114.5,  119.5,  124.5,  129.5,  137.,   147.,   157.,   167.,   177.,
+    187.,   197.,   209.5,  224.5,  239.5,  254.5,  272.,   292.,   312.,   334.5,  359.5,  384.5,  359.5,
+    384.5,  409.5,  434.5,  459.5,  484.5,  509.5,  534.5,  559.5,  584.5,  609.5,  634.5,  659.5,  684.5,
+    709.5,  747.,   797.,   847.,   897.,   947.,   997.,   1047.,  1109.5, 1184.5, 1259.5, 1334.5, 1422.,
+    1522.,  1622.,  1734.5, 1859.5, 1984.5, 1859.5, 1984.5, 2109.5, 2234.5, 2359.5, 2484.5, 2609.5, 2734.5,
+    2859.5, 2984.5, 3109.5, 3234.5, 3359.5, 3484.5, 3609.5, 3797.,  4047.,  4297.,  4547.,  4797.,  5047.,
+    5297.,  5609.5, 5984.5, 6359.5, 6734.5, 7172.,  7672.,  8172.,  8734.5, 9359.5, 9984.5};
+
+// class CastorLEDMonitor: public CastorBaseMonitor {
+// class CastorLEDMonitor: public DQMEDHarvester {
+// class CastorLEDMonitor: public CastorMonitorModule {
 
 class CastorLEDMonitor {
-
 public:
-  CastorLEDMonitor(const edm::ParameterSet& ps); 
-  ~CastorLEDMonitor(); 
+  CastorLEDMonitor(const edm::ParameterSet &ps);
+  ~CastorLEDMonitor();
 
- void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &);
- void processEvent(const CastorDigiCollection& cast, const CastorDbService& cond);
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &);
+  void processEvent(const CastorDigiCollection &cast, const CastorDbService &cond);
 
 private:
   int ievt_;
diff --git a/DQM/CastorMonitor/interface/CastorMonitorModule.h b/DQM/CastorMonitor/interface/CastorMonitorModule.h
index 6d9706868b403..d1cab089ea5ca 100644
--- a/DQM/CastorMonitor/interface/CastorMonitorModule.h
+++ b/DQM/CastorMonitor/interface/CastorMonitorModule.h
@@ -1,56 +1,56 @@
 #ifndef CastorMonitorModule_H
 #define CastorMonitorModule_H
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Run.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DataFormats/L1TGlobal/interface/GlobalAlgBlk.h"
 #include "DataFormats/L1TGlobal/interface/GlobalExtBlk.h"
 #include "DataFormats/L1Trigger/interface/BXVector.h"
 #include "L1Trigger/L1TGlobal/interface/L1TGlobalUtil.h"
 
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
-#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
+#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
+#include "Geometry/Records/interface/IdealGeometryRecord.h"
 
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
-#include "SimG4CMS/Calo/interface/CaloHit.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
+#include "SimG4CMS/Calo/interface/CaloHit.h"
 
+#include "DataFormats/Provenance/interface/EventID.h"
 #include "FWCore/Utilities/interface/CPUTimer.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
-#include "DataFormats/Provenance/interface/EventID.h"  
 
 #include "DataFormats/Common/interface/TriggerResults.h"
 #include "FWCore/Common/interface/TriggerNames.h"
 
-#include "DataFormats/CastorReco/interface/CastorTower.h"
 #include "DataFormats/CastorReco/interface/CastorCluster.h"
 #include "DataFormats/CastorReco/interface/CastorJet.h"
-#include "DataFormats/JetReco/interface/CastorJetID.h"
-#include "RecoJets/JetProducers/interface/CastorJetIDHelper.h"
-#include "RecoJets/JetProducers/plugins/CastorJetIDProducer.h"
+#include "DataFormats/CastorReco/interface/CastorTower.h"
 #include "DataFormats/JetReco/interface/BasicJet.h"
 #include "DataFormats/JetReco/interface/BasicJetCollection.h"
+#include "DataFormats/JetReco/interface/CastorJetID.h"
 #include "DataFormats/JetReco/interface/Jet.h"
+#include "RecoJets/JetProducers/interface/CastorJetIDHelper.h"
+#include "RecoJets/JetProducers/plugins/CastorJetIDProducer.h"
 
-#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 #include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/HcalDigi/interface/HcalUnpackerReport.h" //no CastorUnpackerReport at the moment
+#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 #include "DataFormats/HcalDetId/interface/HcalCastorDetId.h"
+#include "DataFormats/HcalDigi/interface/HcalUnpackerReport.h"  //no CastorUnpackerReport at the moment
 
 //#include "DQM/CastorMonitor/interface/CastorMonitorSelector.h"
 #include "DQM/CastorMonitor/interface/CastorDigiMonitor.h"
@@ -59,65 +59,62 @@
 #include "DQM/CastorMonitor/interface/CastorLEDMonitor.h"
 //#include "DQM/CastorMonitor/interface/CastorTowerJetMonitor.h"
 
-#include "CalibCalorimetry/CastorCalib/interface/CastorDbASCIIIO.h" //-- use to get/dump Calib to DB 
-#include "CondFormats/CastorObjects/interface/CastorChannelQuality.h" //-- use to get/hold channel status
+#include "CalibCalorimetry/CastorCalib/interface/CastorDbASCIIIO.h"    //-- use to get/dump Calib to DB
+#include "CondFormats/CastorObjects/interface/CastorChannelQuality.h"  //-- use to get/hold channel status
 #include "CondFormats/DataRecord/interface/CastorChannelQualityRcd.h"
 
-#include <memory>
-#include <iostream>
 #include <fstream>
-#include <vector>
+#include <iostream>
+#include <memory>
 #include <string>
 #include <sys/time.h>
+#include <vector>
 
-class CastorMonitorModule : public DQMEDAnalyzer{
-
+class CastorMonitorModule : public DQMEDAnalyzer {
 public:
-  
-  CastorMonitorModule(const edm::ParameterSet& ps);
+  CastorMonitorModule(const edm::ParameterSet &ps);
   ~CastorMonitorModule() override;
-  
+
 protected:
-  
-  void analyze(const edm::Event& iEvent, const edm::EventSetup& eventSetup) override;
-  
+  void analyze(const edm::Event &iEvent, const edm::EventSetup &eventSetup) override;
+
   void dqmBeginRun(const edm::Run &, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
-  void endRun(const edm::Run& run, const edm::EventSetup& eventSetup) override;
+  void endRun(const edm::Run &run, const edm::EventSetup &eventSetup) override;
 
 private:
-
-  int fVerbosity;  
+  int fVerbosity;
   std::string subsystemname_;
-//  int NBunchesOrbit;
+  //  int NBunchesOrbit;
   int ievt_;
-//  edm::EDGetTokenT<GlobalAlgBlkBxCollection> l1tStage2uGtSource_;//for L1 uGT DAQ readout record
-//  edm::EDGetTokenT<GlobalAlgBlkBxCollection> TokenL1TStage2uGtSource;
+  //  edm::EDGetTokenT<GlobalAlgBlkBxCollection> l1tStage2uGtSource_;//for L1
+  //  uGT DAQ readout record edm::EDGetTokenT<GlobalAlgBlkBxCollection>
+  //  TokenL1TStage2uGtSource;
 
   edm::EDGetTokenT<edm::TriggerResults> tokenTriggerResults;
   edm::EDGetTokenT<FEDRawDataCollection> inputTokenRaw_;
   edm::EDGetTokenT<HcalUnpackerReport> inputTokenReport_;
   edm::EDGetTokenT<CastorDigiCollection> inputTokenDigi_;
   edm::EDGetTokenT<CastorRecHitCollection> inputTokenRecHitCASTOR_;
-   typedef std::vector<reco::CastorTower> CastorTowerCollection;
+  typedef std::vector<reco::CastorTower> CastorTowerCollection;
   edm::EDGetTokenT<CastorTowerCollection> inputTokenCastorTowers_;
-   typedef std::vector<reco::BasicJet> BasicJetCollection;
+  typedef std::vector<reco::BasicJet> BasicJetCollection;
   edm::EDGetTokenT<BasicJetCollection> JetAlgorithm;
 
-//  std::shared_ptr<l1t::L1TGlobalUtil> gtUtil_;
+  //  std::shared_ptr<l1t::L1TGlobalUtil> gtUtil_;
 
-  std::unique_ptr<CastorRecHitMonitor>      RecHitMon_;
-  std::unique_ptr<CastorDigiMonitor>        DigiMon_;
-  std::unique_ptr<CastorLEDMonitor>         LedMon_;
+  std::unique_ptr<CastorRecHitMonitor> RecHitMon_;
+  std::unique_ptr<CastorDigiMonitor> DigiMon_;
+  std::unique_ptr<CastorLEDMonitor> LedMon_;
 
-//  MonitorElement* algoBits_before_bxmask_bx_inEvt;
-//  MonitorElement* algoBits_before_bxmask_bx_global;
-  MonitorElement* CastorEventProduct;
-  MonitorElement* hunpkrep;
+  //  MonitorElement* algoBits_before_bxmask_bx_inEvt;
+  //  MonitorElement* algoBits_before_bxmask_bx_global;
+  MonitorElement *CastorEventProduct;
+  MonitorElement *hunpkrep;
 
-  bool showTiming_; 
-  edm::CPUTimer cpu_timer; 
+  bool showTiming_;
+  edm::CPUTimer cpu_timer;
 };
 
 #endif
diff --git a/DQM/CastorMonitor/interface/CastorRecHitMonitor.h b/DQM/CastorMonitor/interface/CastorRecHitMonitor.h
index a76517ba51fdc..981cee91c0592 100644
--- a/DQM/CastorMonitor/interface/CastorRecHitMonitor.h
+++ b/DQM/CastorMonitor/interface/CastorRecHitMonitor.h
@@ -6,49 +6,50 @@
 //#include "DataFormats/HcalRecHit/interface/CastorRecHit.h"
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 
-#include "DataFormats/CastorReco/interface/CastorTower.h"
 #include "DataFormats/CastorReco/interface/CastorCluster.h"
 #include "DataFormats/CastorReco/interface/CastorJet.h"
-#include "DataFormats/JetReco/interface/CastorJetID.h"
-#include "RecoJets/JetProducers/interface/CastorJetIDHelper.h"
-#include "RecoJets/JetProducers/plugins/CastorJetIDProducer.h"
+#include "DataFormats/CastorReco/interface/CastorTower.h"
 #include "DataFormats/JetReco/interface/BasicJet.h"
 #include "DataFormats/JetReco/interface/BasicJetCollection.h"
+#include "DataFormats/JetReco/interface/CastorJetID.h"
 #include "DataFormats/JetReco/interface/Jet.h"
+#include "RecoJets/JetProducers/interface/CastorJetIDHelper.h"
+#include "RecoJets/JetProducers/plugins/CastorJetIDProducer.h"
 
 #include "DataFormats/Common/interface/TriggerResults.h"
 
 class CastorRecHitMonitor {
 public:
-  CastorRecHitMonitor(const edm::ParameterSet& ps); 
-  ~CastorRecHitMonitor(); 
-
- void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &);
-  void processEvent(const CastorRecHitCollection& castorHits);
- void processEventTowers(const reco::CastorTowerCollection& castorTowers);
- void processEventJets(const reco::BasicJetCollection& Jets);
-private:  
- int fVerbosity = 0;
- int ievt_;
- float energyInEachChannel[14][16];
- std::string subsystemname;
-
- MonitorElement *hTowerE;
- MonitorElement *hTowerDepth;
- MonitorElement *h2TowerEMhad;
- MonitorElement *hTowerMultipl;
- MonitorElement *hJetsMultipl;
- MonitorElement *hJetEnergy;
- MonitorElement *hJetEta;
- MonitorElement *hJetPhi;
-
- TH2F *h2RecHitMap;
- MonitorElement* h2RHchan;
- MonitorElement* h2RHvsSec;
- MonitorElement* h2RHmap;
- MonitorElement* h2RHoccmap;
- MonitorElement* h2RHentriesMap;
- MonitorElement* hRHtime, *hallchan;
+  CastorRecHitMonitor(const edm::ParameterSet &ps);
+  ~CastorRecHitMonitor();
+
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &);
+  void processEvent(const CastorRecHitCollection &castorHits);
+  void processEventTowers(const reco::CastorTowerCollection &castorTowers);
+  void processEventJets(const reco::BasicJetCollection &Jets);
+
+private:
+  int fVerbosity = 0;
+  int ievt_;
+  float energyInEachChannel[14][16];
+  std::string subsystemname;
+
+  MonitorElement *hTowerE;
+  MonitorElement *hTowerDepth;
+  MonitorElement *h2TowerEMhad;
+  MonitorElement *hTowerMultipl;
+  MonitorElement *hJetsMultipl;
+  MonitorElement *hJetEnergy;
+  MonitorElement *hJetEta;
+  MonitorElement *hJetPhi;
+
+  TH2F *h2RecHitMap;
+  MonitorElement *h2RHchan;
+  MonitorElement *h2RHvsSec;
+  MonitorElement *h2RHmap;
+  MonitorElement *h2RHoccmap;
+  MonitorElement *h2RHentriesMap;
+  MonitorElement *hRHtime, *hallchan;
 };
 
 #endif
diff --git a/DQM/CastorMonitor/src/CastorDigiMonitor.cc b/DQM/CastorMonitor/src/CastorDigiMonitor.cc
index 70f0eb2ee0f3a..f3ed3a73de171 100644
--- a/DQM/CastorMonitor/src/CastorDigiMonitor.cc
+++ b/DQM/CastorMonitor/src/CastorDigiMonitor.cc
@@ -4,15 +4,14 @@
 //********** Date  : 29.08.2008 (first version) ******//
 ////---- digi values in Castor r/o channels
 //// last revision: 31.05.2011 (Panos Katsas) to remove selecting N events for
-///filling the histograms
+/// filling the histograms
 //****************************************************//
 //---- critical revision 26.06.2014 (Vladimir Popov)
 //     add rms check, DB   15.04.2015 (Vladimir Popov)
 //==================================================================//
 
-#include "DQM/CastorMonitor/interface/CastorDigiMonitor.h"
-#include <string>
 #include "CondFormats/CastorObjects/interface/CastorChannelQuality.h"
+#include "DQM/CastorMonitor/interface/CastorDigiMonitor.h"
 #include "DQM/CastorMonitor/interface/CastorLEDMonitor.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
@@ -20,45 +19,45 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include <string>
 
 using namespace std;
 using namespace edm;
 
 namespace {
-vector<std::string> HltPaths_;
-int StatusBadChannel = 1;
-int ChannelStatus[14][16] {};
-int N_GoodChannels = 224;
-int EtowerLastModule = 5;
-int TrigIndexMax = 0;
-}
-
-CastorDigiMonitor::CastorDigiMonitor(const edm::ParameterSet& ps) {
+  vector<std::string> HltPaths_;
+  int StatusBadChannel = 1;
+  int ChannelStatus[14][16]{};
+  int N_GoodChannels = 224;
+  int EtowerLastModule = 5;
+  int TrigIndexMax = 0;
+}  // namespace
+
+CastorDigiMonitor::CastorDigiMonitor(const edm::ParameterSet &ps) {
   fVerbosity = ps.getUntrackedParameter<int>("debug", 0);
-  subsystemname_ =
-      ps.getUntrackedParameter<std::string>("subSystemFolder", "Castor");
+  subsystemname_ = ps.getUntrackedParameter<std::string>("subSystemFolder", "Castor");
   EtowerLastModule = ps.getUntrackedParameter<int>("towerLastModule", 6);
   RatioThresh1 = ps.getUntrackedParameter<double>("ratioThreshold", 0.9);
   Qrms_DEAD = ps.getUntrackedParameter<double>("QrmsDead", 0.01);  // fC
-  HltPaths_ = ps.getParameter<vector<string> >("HltPaths");
+  HltPaths_ = ps.getParameter<vector<string>>("HltPaths");
 
   Qrms_DEAD = Qrms_DEAD * Qrms_DEAD;
   TS_MAX = ps.getUntrackedParameter<double>("qieTSmax", 6);
   StatusBadChannel = CastorChannelStatus::StatusBit::BAD;
   if (fVerbosity > 0)
-    LogPrint("CastorDigi") << "enum CastorChannelStatus::StatusBit::BAD="
-                           << StatusBadChannel
+    LogPrint("CastorDigi") << "enum CastorChannelStatus::StatusBit::BAD=" << StatusBadChannel
                            << "EtowerLastModule = " << EtowerLastModule << endl;
 }
 
 CastorDigiMonitor::~CastorDigiMonitor() {}
 
-void CastorDigiMonitor::bookHistograms(DQMStore::IBooker& ibooker,
-                                       const edm::Run& iRun,
-                                       const edm::EventSetup& iSetup) {
+void CastorDigiMonitor::bookHistograms(DQMStore::IBooker &ibooker,
+                                       const edm::Run &iRun,
+                                       const edm::EventSetup &iSetup) {
   char s[60];
   string st;
-  if (fVerbosity > 0) LogPrint("CastorMonitorModule") << "Digi bookHist(start)";
+  if (fVerbosity > 0)
+    LogPrint("CastorMonitorModule") << "Digi bookHist(start)";
 
   getDbData(iSetup);
 
@@ -68,29 +67,29 @@ void CastorDigiMonitor::bookHistograms(DQMStore::IBooker& ibooker,
   ievt_ = 0;
 
   ibooker.setCurrentFolder(subsystemname_);
-  hBX = ibooker.bookProfile("average E(digi) in BX",
-                            "Castor average E (digi);Event.BX;fC", 3601, -0.5,
-                            3600.5, 0., 1.e10, "");
+  hBX = ibooker.bookProfile(
+      "average E(digi) in BX", "Castor average E (digi);Event.BX;fC", 3601, -0.5, 3600.5, 0., 1.e10, "");
   hBX->getTProfile()->SetOption("hist");
 
   string trname = HltPaths_[0];
-  hpBXtrig = ibooker.bookProfile(
-      "average E(digi) in BXtrig",
-      "Castor average E (digi) trigger:'" + trname + "';Event.BX;fC", 3601,
-      -0.5, 3600.5, 0., 1.e10, "");
+  hpBXtrig = ibooker.bookProfile("average E(digi) in BXtrig",
+                                 "Castor average E (digi) trigger:'" + trname + "';Event.BX;fC",
+                                 3601,
+                                 -0.5,
+                                 3600.5,
+                                 0.,
+                                 1.e10,
+                                 "");
   hpBXtrig->getTProfile()->SetOption("hist");
 
   hpTrigRes = ibooker.bookProfile(
-      "E(digi)vsTriggerIndex",
-      "Castor average E(digi) by triggerIndex;triggerIndex;fC", 512, 0., 512,
-      0., 1.e10, "");
+      "E(digi)vsTriggerIndex", "Castor average E(digi) by triggerIndex;triggerIndex;fC", 512, 0., 512, 0., 1.e10, "");
   hpTrigRes->getTProfile()->SetOption("hist");
 
   ibooker.setCurrentFolder(subsystemname_ + "/CastorDigiMonitor");
 
   std::string s2 = "CASTOR QIE_capID+er+dv";
-  h2digierr = ibooker.bookProfile2D(s2, s2, 14, 0., 14., 16, 0., 16., 100, 0,
-                                    1.e10, "");
+  h2digierr = ibooker.bookProfile2D(s2, s2, 14, 0., 14., 16, 0., 16., 100, 0, 1.e10, "");
   h2digierr->getTProfile2D()->GetXaxis()->SetTitle("Module Z");
   h2digierr->getTProfile2D()->GetYaxis()->SetTitle("Sector #phi");
   h2digierr->getTProfile2D()->SetMaximum(1.);
@@ -98,8 +97,7 @@ void CastorDigiMonitor::bookHistograms(DQMStore::IBooker& ibooker,
   h2digierr->getTProfile2D()->SetOption("colz");
 
   sprintf(s, "CASTORreportSummaryMap");
-  h2repsum =
-      ibooker.bookProfile2D(s, s, 14, 0., 14., 16, 0., 16., 100, 0, 1.e10, "");
+  h2repsum = ibooker.bookProfile2D(s, s, 14, 0., 14., 16, 0., 16., 100, 0, 1.e10, "");
   h2repsum->getTProfile2D()->GetXaxis()->SetTitle("Module Z");
   h2repsum->getTProfile2D()->GetYaxis()->SetTitle("Sector #phi");
   h2repsum->getTProfile2D()->SetMaximum(1.);
@@ -134,13 +132,11 @@ void CastorDigiMonitor::bookHistograms(DQMStore::IBooker& ibooker,
 
   st = "Castor cells avr digi(fC) per event Map TS vs Channel";
   h2QmeantsvsCh =
-      ibooker.bookProfile2D(st, st + ";" + string(sTileIndex) + ";TS", 224, 0.,
-                            224., 10, 0., 10., 0., 1.e10, "");
+      ibooker.bookProfile2D(st, st + ";" + string(sTileIndex) + ";TS", 224, 0., 224., 10, 0., 10., 0., 1.e10, "");
   h2QmeantsvsCh->getTProfile2D()->SetOption("colz");
 
   st = "Castor cells avr digiRMS(fC) per event Map TS vs Channel";
-  h2QrmsTSvsCh = ibooker.book2D(st, st + ";" + string(sTileIndex) + ";TS", 224,
-                                0., 224., 10, 0., 10.);
+  h2QrmsTSvsCh = ibooker.book2D(st, st + ";" + string(sTileIndex) + ";TS", 224, 0., 224., 10, 0., 10.);
   h2QrmsTSvsCh->getTH2F()->SetOption("colz");
 
   sprintf(s, "CASTOR data quality");
@@ -169,9 +165,12 @@ void CastorDigiMonitor::bookHistograms(DQMStore::IBooker& ibooker,
   ETower[0] = 0.;
   ETower[1] = E0tow;
   double lnBtow = log(1.8);  // 2.
-  for (int j = 1; j < NEtow; j++) EMTow[j + 1] = E0tow * exp(j * lnBtow);
-  for (int j = 1; j < NEtow; j++) EhadTow[j + 1] = E0tow * exp(j * lnBtow);
-  for (int j = 1; j <= NEtow; j++) ETower[j + 1] = E0tow * exp(j * lnBtow);
+  for (int j = 1; j < NEtow; j++)
+    EMTow[j + 1] = E0tow * exp(j * lnBtow);
+  for (int j = 1; j < NEtow; j++)
+    EhadTow[j + 1] = E0tow * exp(j * lnBtow);
+  for (int j = 1; j <= NEtow; j++)
+    ETower[j + 1] = E0tow * exp(j * lnBtow);
 
   sprintf(s, "CASTOR_Tower_EMvsEhad(fC)");
   h2towEMvsHAD = ibooker.book2D(s, s, NEtow, EhadTow, NEtow, EMTow);
@@ -190,33 +189,36 @@ void CastorDigiMonitor::bookHistograms(DQMStore::IBooker& ibooker,
   }
 
   for (int ind = 0; ind < 224; ind++)
-    for (int ts = 0; ts < 10; ts++) QrmsTS[ind][ts] = QmeanTS[ind][ts] = 0.;
+    for (int ts = 0; ts < 10; ts++)
+      QrmsTS[ind][ts] = QmeanTS[ind][ts] = 0.;
 
   return;
 }
 
-void CastorDigiMonitor::processEvent(edm::Event const& event,
-                                     const CastorDigiCollection& castorDigis,
-                                     const edm::TriggerResults& TrigResults,
-                                     const CastorDbService& cond) {
-  if (fVerbosity > 1) LogPrint("CastorDigiMonitor") << "processEvent(begin)";
+void CastorDigiMonitor::processEvent(edm::Event const &event,
+                                     const CastorDigiCollection &castorDigis,
+                                     const edm::TriggerResults &TrigResults,
+                                     const CastorDbService &cond) {
+  if (fVerbosity > 1)
+    LogPrint("CastorDigiMonitor") << "processEvent(begin)";
 
   if (castorDigis.empty()) {
     for (int mod = 0; mod < 14; mod++)
-      for (int sec = 0; sec < 16; sec++) h2repsum->Fill(mod, sec, 0.);
+      for (int sec = 0; sec < 16; sec++)
+        h2repsum->Fill(mod, sec, 0.);
     hBX->Fill(event.bunchCrossing(), 0.);
     fillTrigRes(event, TrigResults, 0.);
     return;
   }
 
-  float Ecell[14][16] {};
-  for (CastorDigiCollection::const_iterator j = castorDigis.begin();
-       j != castorDigis.end(); j++) {
+  float Ecell[14][16]{};
+  for (CastorDigiCollection::const_iterator j = castorDigis.begin(); j != castorDigis.end(); j++) {
     const CastorDataFrame digi = (const CastorDataFrame)(*j);
 
     int module = digi.id().module() - 1;
     int sector = digi.id().sector() - 1;
-    if (ChannelStatus[module][sector] == StatusBadChannel) continue;
+    if (ChannelStatus[module][sector] == StatusBadChannel)
+      continue;
 
     int capid1 = digi.sample(0).capid();
     hdigisize->Fill(digi.size());
@@ -239,10 +241,8 @@ void CastorDigiMonitor::processEvent(edm::Event const& event,
       QrmsTS[ind][i] += (q * q);
       QmeanTS[ind][i] += q;
       if (err != 0 && fVerbosity > 0)
-        LogPrint("CastorDigiMonitor")
-            << "event/idigi=" << ievt_ << "/" << i
-            << " cap=cap1_dv_er_err: " << capid << "=" << capid1 << " " << dv
-            << " " << er << " " << err;
+        LogPrint("CastorDigiMonitor") << "event/idigi=" << ievt_ << "/" << i << " cap=cap1_dv_er_err: " << capid << "="
+                                      << capid1 << " " << dv << " " << er << " " << err;
       if (capid1 < 3)
         capid1 = capid + 1;
       else
@@ -256,25 +256,30 @@ void CastorDigiMonitor::processEvent(edm::Event const& event,
 
   double Etotal = 0.;
   for (int sec = 0; sec < 16; sec++)
-    for (int mod = 0; mod < 14; mod++) Etotal = Ecell[mod][sec];
+    for (int mod = 0; mod < 14; mod++)
+      Etotal = Ecell[mod][sec];
   hBX->Fill(event.bunchCrossing(), Etotal);
   fillTrigRes(event, TrigResults, Etotal);
 
   for (int sec = 0; sec < 16; sec++) {
     float em = Ecell[0][sec] + Ecell[1][sec];
     double ehad = 0.;
-    for (int mod = 2; mod < EtowerLastModule; mod++) ehad += Ecell[mod][sec];
+    for (int mod = 2; mod < EtowerLastModule; mod++)
+      ehad += Ecell[mod][sec];
     h2towEMvsHAD->Fill(em, ehad);
     htowE->Fill(em + ehad);
   }
 
   const float repChanBAD = 0.9;
   const float repChanWarning = 0.95;
-  if (ievt_ % 100 != 0) return;
+  if (ievt_ % 100 != 0)
+    return;
 
   float ModuleSum[14], SectorSum[16];
-  for (int m = 0; m < 14; m++) ModuleSum[m] = 0.;
-  for (int s = 0; s < 16; s++) SectorSum[s] = 0.;
+  for (int m = 0; m < 14; m++)
+    ModuleSum[m] = 0.;
+  for (int s = 0; s < 16; s++)
+    SectorSum[s] = 0.;
   for (int mod = 0; mod < 14; mod++)
     for (int sec = 0; sec < 16; sec++) {
       for (int ts = 0; ts <= 1; ts++) {
@@ -310,20 +315,22 @@ void CastorDigiMonitor::processEvent(edm::Event const& event,
   hTSratio->Reset();
   for (int mod = 0; mod < 14; mod++)
     for (int sec = 0; sec < 16; sec++) {
-      if (ChannelStatus[mod][sec] == StatusBadChannel) continue;
+      if (ChannelStatus[mod][sec] == StatusBadChannel)
+        continue;
       int ind = ModSecToIndex(mod, sec);
       double Qmean = QmeanTS[ind][TSped] / ievt_;
       double Qrms = QrmsTS[ind][TSped] / ievt_ - Qmean * Qmean;
       float ChanStatus = 0.;
-      if (Qrms < Qrms_DEAD) ChanStatus = 1.;
+      if (Qrms < Qrms_DEAD)
+        ChanStatus = 1.;
       h2status->getTH2F()->SetBinContent(mod + 1, sec + 1, ChanStatus);
 
       float am = 0.;
       for (int ts = 0; ts < TS_MAX - 1; ts++) {
-        float a =
-            h2QmeantsvsCh->getTProfile2D()->GetBinContent(ind + 1, ts + 1) +
-            h2QmeantsvsCh->getTProfile2D()->GetBinContent(ind + 1, ts + 2);
-        if (am < a) am = a;
+        float a = h2QmeantsvsCh->getTProfile2D()->GetBinContent(ind + 1, ts + 1) +
+                  h2QmeantsvsCh->getTProfile2D()->GetBinContent(ind + 1, ts + 2);
+        if (am < a)
+          am = a;
       }
 
       double sum = 0.;
@@ -331,7 +338,8 @@ void CastorDigiMonitor::processEvent(edm::Event const& event,
         sum += h2QmeantsvsCh->getTProfile2D()->GetBinContent(ind + 1, ts + 1);
 
       float r = 0.;  // worth case - no peak
-      if (am > 0.) r = 1. - (sum - am) / (TS_MAX - 2) / am * 2.;
+      if (am > 0.)
+        r = 1. - (sum - am) / (TS_MAX - 2) / am * 2.;
       // if(r<0.|| r>1.) cout<<"ievt="<<ievt<<" r="<<r<<" amax= "<<am<<"
       // sum="<<sum<<endl;
       h2TSratio->getTH2F()->SetBinContent(mod + 1, sec + 1, r);
@@ -343,9 +351,11 @@ void CastorDigiMonitor::processEvent(edm::Event const& event,
       else if (r > 0.99)
         statusTS = repChanBAD;
       float gChanStatus = statusTS;
-      if (ChanStatus > 0.) gChanStatus = repChanBAD;  // RMS
+      if (ChanStatus > 0.)
+        gChanStatus = repChanBAD;  // RMS
       h2qualityMap->getTH2F()->SetBinContent(mod + 1, sec + 1, gChanStatus);
-      if (gChanStatus > repChanBAD) ++nGoodCh;
+      if (gChanStatus > repChanBAD)
+        ++nGoodCh;
     }
   hReport->Fill(float(nGoodCh) / N_GoodChannels);
   return;
@@ -353,62 +363,56 @@ void CastorDigiMonitor::processEvent(edm::Event const& event,
 
 void CastorDigiMonitor::endRun() {
   if (fVerbosity > 0)
-    LogPrint("CastorDigiMonitor")
-        << "DigiMonitor::endRun: trigger max index = " << TrigIndexMax
-        << "  TriggerIndexies(N):" << endl;
+    LogPrint("CastorDigiMonitor") << "DigiMonitor::endRun: trigger max index = " << TrigIndexMax
+                                  << "  TriggerIndexies(N):" << endl;
   for (int i = 1; i < hpTrigRes->getTProfile()->GetNbinsX(); i++)
     if (hpTrigRes->getTProfile()->GetBinContent(i) > 0)
-      LogPrint("CastorDigiMonitor")
-          << i - 1 << "(" << hpTrigRes->getTProfile()->GetBinContent(i) << ") ";
+      LogPrint("CastorDigiMonitor") << i - 1 << "(" << hpTrigRes->getTProfile()->GetBinContent(i) << ") ";
 }
 
-void CastorDigiMonitor::fillTrigRes(edm::Event const& event,
-                                    const edm::TriggerResults& TrigResults,
-                                    double Etotal) {
+void CastorDigiMonitor::fillTrigRes(edm::Event const &event, const edm::TriggerResults &TrigResults, double Etotal) {
   int nTriggers = TrigResults.size();
-  const edm::TriggerNames& trigName = event.triggerNames(TrigResults);
+  const edm::TriggerNames &trigName = event.triggerNames(TrigResults);
   bool event_triggered = false;
   if (nTriggers > 0)
     for (int iTrig = 0; iTrig < nTriggers; ++iTrig) {
       if (TrigResults.accept(iTrig)) {
         int index = trigName.triggerIndex(trigName.triggerName(iTrig));
-        if (TrigIndexMax < index) TrigIndexMax = index;
+        if (TrigIndexMax < index)
+          TrigIndexMax = index;
         if (fVerbosity > 0)
-          LogPrint("CastorDigi")
-              << "trigger[" << iTrig << "] name:" << trigName.triggerName(iTrig)
-              << " index= " << index << endl;
+          LogPrint("CastorDigi") << "trigger[" << iTrig << "] name:" << trigName.triggerName(iTrig)
+                                 << " index= " << index << endl;
         hpTrigRes->Fill(index, Etotal);
         for (int n = 0; n < int(HltPaths_.size()); n++) {
-          if (trigName.triggerName(iTrig).find(HltPaths_[n]) !=
-              std::string::npos)
+          if (trigName.triggerName(iTrig).find(HltPaths_[n]) != std::string::npos)
             event_triggered = true;
         }
       }  // end if(TrigResults.accept(iTrig)
     }
 
-  if (event_triggered) hpBXtrig->Fill(event.bunchCrossing(), Etotal);
+  if (event_triggered)
+    hpBXtrig->Fill(event.bunchCrossing(), Etotal);
   return;
 }
 
-void CastorDigiMonitor::getDbData(const edm::EventSetup& iSetup) {
+void CastorDigiMonitor::getDbData(const edm::EventSetup &iSetup) {
   edm::ESHandle<CastorChannelQuality> dbChQuality;
   iSetup.get<CastorChannelQualityRcd>().get(dbChQuality);
   if (fVerbosity > 0) {
-    LogPrint("CastorDigiMonitor")
-        << " CastorChQuality in CondDB=" << dbChQuality.isValid() << endl;
+    LogPrint("CastorDigiMonitor") << " CastorChQuality in CondDB=" << dbChQuality.isValid() << endl;
   }
 
   int chInd = 0;
   for (int mod = 0; mod < 14; mod++)
-    for (int sec = 0; sec < 16; sec++) ChannelStatus[mod][sec] = 0;
+    for (int sec = 0; sec < 16; sec++)
+      ChannelStatus[mod][sec] = 0;
   std::vector<DetId> channels = dbChQuality->getAllChannels();
   N_GoodChannels = 224 - channels.size();
   if (fVerbosity > 0)
-    LogPrint("CastorDigiMonitor")
-        << "CastorDigiMonitor::getDBData: QualityRcdSize=" << channels.size();
-  for (std::vector<DetId>::iterator ch = channels.begin(); ch != channels.end();
-       ch++) {
-    const CastorChannelStatus* quality = dbChQuality->getValues(*ch);
+    LogPrint("CastorDigiMonitor") << "CastorDigiMonitor::getDBData: QualityRcdSize=" << channels.size();
+  for (std::vector<DetId>::iterator ch = channels.begin(); ch != channels.end(); ch++) {
+    const CastorChannelStatus *quality = dbChQuality->getValues(*ch);
     int value = quality->getValue();
     int rawId = quality->rawId();
     chInd++;
@@ -417,15 +421,15 @@ void CastorDigiMonitor::getDbData(const edm::EventSetup& iSetup) {
     if (mod > 0 && mod < 16 && sec > 0 && sec < 16)
       ChannelStatus[mod][sec] = value;
     if (fVerbosity > 0)
-      LogPrint("CastorDigiMonitor")
-          << chInd << " module=" << mod << " sec=" << sec << " rawId=" << rawId
-          << " value=" << value << endl;
+      LogPrint("CastorDigiMonitor") << chInd << " module=" << mod << " sec=" << sec << " rawId=" << rawId
+                                    << " value=" << value << endl;
   }  // end for(std::vector<DetId>::it...
   return;
 }
 
 int CastorDigiMonitor::ModSecToIndex(int module, int sector) {
   int ind = sector + module * 16;
-  if (ind > 223) ind = 223;
+  if (ind > 223)
+    ind = 223;
   return (ind);
 }
diff --git a/DQM/CastorMonitor/src/CastorLEDMonitor.cc b/DQM/CastorMonitor/src/CastorLEDMonitor.cc
index e5f9d274f3b77..c8963fbc35d46 100644
--- a/DQM/CastorMonitor/src/CastorLEDMonitor.cc
+++ b/DQM/CastorMonitor/src/CastorLEDMonitor.cc
@@ -11,20 +11,17 @@
 //---- critical revision 26.06.2014 (Vladimir Popov)
 //==================================================================//
 
-CastorLEDMonitor::CastorLEDMonitor(const edm::ParameterSet& ps) {
+CastorLEDMonitor::CastorLEDMonitor(const edm::ParameterSet &ps) {
   fVerbosity = ps.getUntrackedParameter<int>("debug", 0);
   if (fVerbosity > 0)
     std::cout << "CastorLEDMonitor Constructor: " << this << std::endl;
-  subsystemname =
-      ps.getUntrackedParameter<std::string>("subSystemFolder", "Castor");
+  subsystemname = ps.getUntrackedParameter<std::string>("subSystemFolder", "Castor");
   ievt_ = 0;
 }
 
 CastorLEDMonitor::~CastorLEDMonitor() {}
 
-void CastorLEDMonitor::bookHistograms(DQMStore::IBooker& ibooker,
-                                      const edm::Run& iRun,
-                                      const edm::EventSetup& iSetup) {
+void CastorLEDMonitor::bookHistograms(DQMStore::IBooker &ibooker, const edm::Run &iRun, const edm::EventSetup &iSetup) {
   char s[60];
 
   ibooker.setCurrentFolder(subsystemname + "/CastorLEDMonitor");
@@ -42,8 +39,7 @@ void CastorLEDMonitor::bookHistograms(DQMStore::IBooker& ibooker,
   return;
 }
 
-void CastorLEDMonitor::processEvent(const CastorDigiCollection& castorDigis,
-                                    const CastorDbService& cond) {
+void CastorLEDMonitor::processEvent(const CastorDigiCollection &castorDigis, const CastorDbService &cond) {
   if (fVerbosity > 0)
     std::cout << "CastorLEDMonitor::processEvent (start)" << std::endl;
 
@@ -56,13 +52,11 @@ void CastorLEDMonitor::processEvent(const CastorDigiCollection& castorDigis,
 
   if (castorDigis.empty()) {
     if (fVerbosity > 0)
-      std::cout << "CastorLEDMonitor::processEvent NO Castor Digis"
-                << std::endl;
+      std::cout << "CastorLEDMonitor::processEvent NO Castor Digis" << std::endl;
     return;
   }
 
-  for (CastorDigiCollection::const_iterator j = castorDigis.begin();
-       j != castorDigis.end(); j++) {
+  for (CastorDigiCollection::const_iterator j = castorDigis.begin(); j != castorDigis.end(); j++) {
     const CastorDataFrame digi = (const CastorDataFrame)(*j);
     int module = digi.id().module() - 1;
     int sector = digi.id().sector() - 1;
diff --git a/DQM/CastorMonitor/src/CastorMonitorModule.cc b/DQM/CastorMonitor/src/CastorMonitorModule.cc
index 8c35de15df438..c8ea4a6759608 100644
--- a/DQM/CastorMonitor/src/CastorMonitorModule.cc
+++ b/DQM/CastorMonitor/src/CastorMonitorModule.cc
@@ -1,10 +1,10 @@
-#include <DQM/CastorMonitor/interface/CastorMonitorModule.h>
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DataFormats/FEDRawData/interface/FEDNumbering.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include <DQM/CastorMonitor/interface/CastorMonitorModule.h>
 //#include "CondFormats/CastorObjects/interface/CastorChannelQuality.h"
 #include <string>
 
@@ -26,24 +26,16 @@
 using namespace std;
 using namespace edm;
 
-CastorMonitorModule::CastorMonitorModule(const edm::ParameterSet& ps) {
+CastorMonitorModule::CastorMonitorModule(const edm::ParameterSet &ps) {
   fVerbosity = ps.getUntrackedParameter<int>("debug", 0);
-  subsystemname_ =
-      ps.getUntrackedParameter<std::string>("subSystemFolder", "Castor");
-  inputTokenRaw_ = consumes<FEDRawDataCollection>(
-      ps.getParameter<edm::InputTag>("rawLabel"));
-  inputTokenReport_ = consumes<HcalUnpackerReport>(
-      ps.getParameter<edm::InputTag>("unpackerReportLabel"));
-  inputTokenDigi_ = consumes<CastorDigiCollection>(
-      ps.getParameter<edm::InputTag>("digiLabel"));
-  inputTokenRecHitCASTOR_ = consumes<CastorRecHitCollection>(
-      ps.getParameter<edm::InputTag>("CastorRecHitLabel"));
-  inputTokenCastorTowers_ = consumes<CastorTowerCollection>(
-      ps.getParameter<edm::InputTag>("CastorTowerLabel"));
-  JetAlgorithm = consumes<BasicJetCollection>(
-      ps.getParameter<edm::InputTag>("CastorBasicJetsLabel"));
-  tokenTriggerResults = consumes<edm::TriggerResults>(
-      ps.getParameter<edm::InputTag>("tagTriggerResults"));
+  subsystemname_ = ps.getUntrackedParameter<std::string>("subSystemFolder", "Castor");
+  inputTokenRaw_ = consumes<FEDRawDataCollection>(ps.getParameter<edm::InputTag>("rawLabel"));
+  inputTokenReport_ = consumes<HcalUnpackerReport>(ps.getParameter<edm::InputTag>("unpackerReportLabel"));
+  inputTokenDigi_ = consumes<CastorDigiCollection>(ps.getParameter<edm::InputTag>("digiLabel"));
+  inputTokenRecHitCASTOR_ = consumes<CastorRecHitCollection>(ps.getParameter<edm::InputTag>("CastorRecHitLabel"));
+  inputTokenCastorTowers_ = consumes<CastorTowerCollection>(ps.getParameter<edm::InputTag>("CastorTowerLabel"));
+  JetAlgorithm = consumes<BasicJetCollection>(ps.getParameter<edm::InputTag>("CastorBasicJetsLabel"));
+  tokenTriggerResults = consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>("tagTriggerResults"));
 
   showTiming_ = ps.getUntrackedParameter<bool>("showTiming", false);
 
@@ -59,25 +51,23 @@ CastorMonitorModule::CastorMonitorModule(const edm::ParameterSet& ps) {
   ievt_ = 0;
 }
 
-CastorMonitorModule::~CastorMonitorModule() {
-}
-
-void CastorMonitorModule::dqmBeginRun(const edm::Run& iRun,
-                                      const edm::EventSetup& iSetup) {
-  if (fVerbosity > 0) LogPrint("CastorMonitorModule") << "dqmBeginRun(start)";
+CastorMonitorModule::~CastorMonitorModule() {}
 
+void CastorMonitorModule::dqmBeginRun(const edm::Run &iRun, const edm::EventSetup &iSetup) {
+  if (fVerbosity > 0)
+    LogPrint("CastorMonitorModule") << "dqmBeginRun(start)";
 }
 
-void CastorMonitorModule::bookHistograms(DQMStore::IBooker& ibooker,
-                                         const edm::Run& iRun,
-                                         const edm::EventSetup& iSetup) {
-  if (DigiMon_ ) {
+void CastorMonitorModule::bookHistograms(DQMStore::IBooker &ibooker,
+                                         const edm::Run &iRun,
+                                         const edm::EventSetup &iSetup) {
+  if (DigiMon_) {
     DigiMon_->bookHistograms(ibooker, iRun, iSetup);
   }
-  if (RecHitMon_ ) {
+  if (RecHitMon_) {
     RecHitMon_->bookHistograms(ibooker, iRun, iSetup);
   }
-  if (LedMon_ ) {
+  if (LedMon_) {
     LedMon_->bookHistograms(ibooker, iRun, iSetup);
   }
 
@@ -86,7 +76,7 @@ void CastorMonitorModule::bookHistograms(DQMStore::IBooker& ibooker,
   sprintf(s, "CastorEventProducts");
   CastorEventProduct = ibooker.book1DD(s, s, 6, -0.5, 5.5);
   CastorEventProduct->getTH1D()->GetYaxis()->SetTitle("Events");
-  TAxis* xa = CastorEventProduct->getTH1D()->GetXaxis();
+  TAxis *xa = CastorEventProduct->getTH1D()->GetXaxis();
   xa->SetBinLabel(1, "FEDs/3");
   xa->SetBinLabel(2, "RawData");
   xa->SetBinLabel(3, "Digi");
@@ -106,16 +96,15 @@ void CastorMonitorModule::bookHistograms(DQMStore::IBooker& ibooker,
   return;
 }
 
-void CastorMonitorModule::endRun(const edm::Run& r,
-                                 const edm::EventSetup& context) {
+void CastorMonitorModule::endRun(const edm::Run &r, const edm::EventSetup &context) {
   if (DigiMon_) {
     DigiMon_->endRun();
   }
 }
 
-void CastorMonitorModule::analyze(const edm::Event& iEvent,
-                                  const edm::EventSetup& iSetup) {
-  if (fVerbosity > 1) LogPrint("CastorMonitorModule") << "analyze (start)";
+void CastorMonitorModule::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  if (fVerbosity > 1)
+    LogPrint("CastorMonitorModule") << "analyze (start)";
 
   ievt_++;
 
@@ -129,7 +118,8 @@ void CastorMonitorModule::analyze(const edm::Event& iEvent,
 
   edm::Handle<FEDRawDataCollection> RawData;
   iEvent.getByToken(inputTokenRaw_, RawData);
-  if (!RawData.isValid()) rawOK_ = false;
+  if (!RawData.isValid())
+    rawOK_ = false;
 
   float fedsUnpacked = 0.;
   edm::Handle<HcalUnpackerReport> report;
@@ -176,12 +166,11 @@ void CastorMonitorModule::analyze(const edm::Event& iEvent,
     jetsOK_ = false;
 
   if (fVerbosity > 0)
-    LogPrint("CastorMonitorModule")
-        << "CastorProductValid(size): RawDataValid=" << RawData.isValid()
-        << " Digi=" << digiOK_ << "(" << nDigi << ") Hits=" << rechitOK_ << "("
-        << nrecHits << ")"
-        << " Towers=" << towerOK_ << "(" << nTowers << ")"
-        << " Jets=" << jetsOK_ << "(" << nJets << ")";
+    LogPrint("CastorMonitorModule") << "CastorProductValid(size): RawDataValid=" << RawData.isValid()
+                                    << " Digi=" << digiOK_ << "(" << nDigi << ") Hits=" << rechitOK_ << "(" << nrecHits
+                                    << ")"
+                                    << " Towers=" << towerOK_ << "(" << nTowers << ")"
+                                    << " Jets=" << jetsOK_ << "(" << nJets << ")";
 
   CastorEventProduct->Fill(0, fedsUnpacked / 3.);
   CastorEventProduct->Fill(1, rawOK_);
@@ -191,32 +180,33 @@ void CastorMonitorModule::analyze(const edm::Event& iEvent,
   CastorEventProduct->Fill(5, jetsOK_);
 
   if (digiOK_) {
-     edm::ESHandle<CastorDbService> conditions;
-     iSetup.get<CastorDbRecord>().get(conditions);
+    edm::ESHandle<CastorDbService> conditions;
+    iSetup.get<CastorDbRecord>().get(conditions);
 
-     DigiMon_->processEvent(iEvent, *CastorDigi, *TrigResults, *conditions);
+    DigiMon_->processEvent(iEvent, *CastorDigi, *TrigResults, *conditions);
   }
   if (showTiming_) {
     cpu_timer.stop();
     if (DigiMon_ != nullptr)
-      std::cout << "TIMER:: DIGI MONITOR ->" << cpu_timer.cpuTime()
-                << std::endl;
+      std::cout << "TIMER:: DIGI MONITOR ->" << cpu_timer.cpuTime() << std::endl;
     cpu_timer.reset();
     cpu_timer.start();
   }
 
-  if (rechitOK_) RecHitMon_->processEvent(*CastorHits);
+  if (rechitOK_)
+    RecHitMon_->processEvent(*CastorHits);
   if (showTiming_) {
     cpu_timer.stop();
     if (RecHitMon_ != nullptr)
-      std::cout << "TIMER:: RECHIT MONITOR->" << cpu_timer.cpuTime()
-                << std::endl;
+      std::cout << "TIMER:: RECHIT MONITOR->" << cpu_timer.cpuTime() << std::endl;
     cpu_timer.reset();
     cpu_timer.start();
   }
 
-  if (towerOK_) RecHitMon_->processEventTowers(*castorTowers);
-  if (jetsOK_) RecHitMon_->processEventJets(*jets);
+  if (towerOK_)
+    RecHitMon_->processEventTowers(*castorTowers);
+  if (jetsOK_)
+    RecHitMon_->processEventJets(*jets);
 
   if (fVerbosity > 0 && ievt_ % 100 == 0)
     LogPrint("CastorMonitorModule") << "processed " << ievt_ << " events";
diff --git a/DQM/CastorMonitor/src/CastorRecHitMonitor.cc b/DQM/CastorMonitor/src/CastorRecHitMonitor.cc
index 693845a184c70..ad5891f2dcbd1 100644
--- a/DQM/CastorMonitor/src/CastorRecHitMonitor.cc
+++ b/DQM/CastorMonitor/src/CastorRecHitMonitor.cc
@@ -8,26 +8,25 @@
 //***************************************************
 
 #include "DQM/CastorMonitor/interface/CastorRecHitMonitor.h"
-#include <string>
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include <string>
 
 using namespace std;
 
-CastorRecHitMonitor::CastorRecHitMonitor(const edm::ParameterSet& ps) {
+CastorRecHitMonitor::CastorRecHitMonitor(const edm::ParameterSet &ps) {
   fVerbosity = ps.getUntrackedParameter<int>("debug", 0);
   if (fVerbosity > 0)
     std::cout << "CastorRecHitMonitor Constructor: " << this << std::endl;
-  subsystemname =
-      ps.getUntrackedParameter<std::string>("subSystemFolder", "Castor");
+  subsystemname = ps.getUntrackedParameter<std::string>("subSystemFolder", "Castor");
   ievt_ = 0;
 }
 
 CastorRecHitMonitor::~CastorRecHitMonitor() {}
 
-void CastorRecHitMonitor::bookHistograms(DQMStore::IBooker& ibooker,
-                                         const edm::Run& iRun,
-                                         const edm::EventSetup& iSetup) {
+void CastorRecHitMonitor::bookHistograms(DQMStore::IBooker &ibooker,
+                                         const edm::Run &iRun,
+                                         const edm::EventSetup &iSetup) {
   char s[60];
   if (fVerbosity > 0)
     std::cout << "CastorRecHitMonitor::bookHistograms" << std::endl;
@@ -41,8 +40,10 @@ void CastorRecHitMonitor::bookHistograms(DQMStore::IBooker& ibooker,
   ySec[0] = 0.;
   ySec[1] = E0sec;
   double lnBsec = log(2.);
-  for (int j = 1; j < nySec; j++) ySec[j + 1] = E0sec * exp(j * lnBsec);
-  for (int i = 0; i <= N_Sec; i++) xSec[i] = i;
+  for (int j = 1; j < nySec; j++)
+    ySec[j + 1] = E0sec * exp(j * lnBsec);
+  for (int i = 0; i <= N_Sec; i++)
+    xSec[i] = i;
 
   sprintf(s, "Castor Energy by Sectors #Phi");
   h2RHvsSec = ibooker.book2D(s, s, N_Sec, xSec, nySec, ySec);
@@ -54,16 +55,17 @@ void CastorRecHitMonitor::bookHistograms(DQMStore::IBooker& ibooker,
   const int nyE = 18;
   float xCh[nxCh + 1];
   float yErh[nyE + 1];
-  for (int i = 0; i <= nxCh; i++) xCh[i] = i;
+  for (int i = 0; i <= nxCh; i++)
+    xCh[i] = i;
   double E0 = 1. / 1024.;
   double lnA = log(2.);
   yErh[0] = 0.;
   yErh[1] = E0;
-  for (int j = 1; j < nyE; j++) yErh[j + 1] = E0 * exp(j * lnA);
+  for (int j = 1; j < nyE; j++)
+    yErh[j + 1] = E0 * exp(j * lnA);
 
   string st = "Castor Cell Energy Map (cell-wise)";
-  h2RHchan = ibooker.book2D(st, st + ";moduleZ*16 + sector #Phi;RecHit / GeV",
-                            nxCh, xCh, nyE, yErh);
+  h2RHchan = ibooker.book2D(st, st + ";moduleZ*16 + sector #Phi;RecHit / GeV", nxCh, xCh, nyE, yErh);
   h2RHchan->getTH2F()->SetOption("colz");
 
   sprintf(s, "Castor Cell Energy");
@@ -71,8 +73,7 @@ void CastorRecHitMonitor::bookHistograms(DQMStore::IBooker& ibooker,
   hallchan->getTH1F()->GetXaxis()->SetTitle("GeV");
 
   st = "Castor cell avr Energy per event Map Z-Phi";
-  h2RHoccmap = ibooker.bookProfile2D(st, st + ";module Z;sector Phi", 14, 0, 14,
-                                     16, 0, 16, 0., 1.e10, "");
+  h2RHoccmap = ibooker.bookProfile2D(st, st + ";module Z;sector Phi", 14, 0, 14, 16, 0, 16, 0., 1.e10, "");
   h2RHoccmap->getTProfile2D()->SetOption("colz");
 
   sprintf(s, "CastorRecHitEntriesMap");
@@ -103,9 +104,12 @@ void CastorRecHitMonitor::bookHistograms(DQMStore::IBooker& ibooker,
   ETower[0] = 0.;
   ETower[1] = E0tow;
   double lnBtow = log(2.);
-  for (int j = 1; j < NEtow; j++) EMTow[j + 1] = E0tow * exp(j * lnBtow);
-  for (int j = 1; j < NEtow; j++) EhadTow[j + 1] = E0tow * exp(j * lnBtow);
-  for (int j = 1; j <= NEtow; j++) ETower[j + 1] = E0tow * exp(j * lnBtow);
+  for (int j = 1; j < NEtow; j++)
+    EMTow[j + 1] = E0tow * exp(j * lnBtow);
+  for (int j = 1; j < NEtow; j++)
+    EhadTow[j + 1] = E0tow * exp(j * lnBtow);
+  for (int j = 1; j <= NEtow; j++)
+    ETower[j + 1] = E0tow * exp(j * lnBtow);
 
   sprintf(s, "CASTORTowerEMvsEhad");
   h2TowerEMhad = ibooker.book2D(s, s, NEtow, EhadTow, NEtow, EMTow);
@@ -134,14 +138,13 @@ void CastorRecHitMonitor::bookHistograms(DQMStore::IBooker& ibooker,
   return;
 }
 
-void CastorRecHitMonitor::processEventTowers(
-    const reco::CastorTowerCollection& castorTowers) {
-  if (castorTowers.empty()) return;
+void CastorRecHitMonitor::processEventTowers(const reco::CastorTowerCollection &castorTowers) {
+  if (castorTowers.empty())
+    return;
   int nTowers = 0;
 
-  for (reco::CastorTowerCollection::const_iterator iTower =
-           castorTowers.begin();
-       iTower != castorTowers.end(); iTower++) {
+  for (reco::CastorTowerCollection::const_iterator iTower = castorTowers.begin(); iTower != castorTowers.end();
+       iTower++) {
     hTowerE->Fill(iTower->energy() * 0.001);
     h2TowerEMhad->Fill(iTower->hadEnergy() * 0.001, iTower->emEnergy() * 0.001);
     hTowerDepth->Fill(iTower->depth());
@@ -150,25 +153,26 @@ void CastorRecHitMonitor::processEventTowers(
   hTowerMultipl->Fill(nTowers);
 }
 
-void CastorRecHitMonitor::processEvent(
-    const CastorRecHitCollection& castorHits) {
+void CastorRecHitMonitor::processEvent(const CastorRecHitCollection &castorHits) {
   if (fVerbosity > 0)
     std::cout << "CastorRecHitMonitor::processEvent (begin)" << std::endl;
   ievt_++;
   for (int z = 0; z < 14; z++)
-    for (int phi = 0; phi < 16; phi++) energyInEachChannel[z][phi] = 0.;
+    for (int phi = 0; phi < 16; phi++)
+      energyInEachChannel[z][phi] = 0.;
 
   CastorRecHitCollection::const_iterator CASTORiter;
   // if (showTiming)  { cpu_timer.reset(); cpu_timer.start(); }
 
-  if (castorHits.empty()) return;
+  if (castorHits.empty())
+    return;
 
-  for (CASTORiter = castorHits.begin(); CASTORiter != castorHits.end();
-       ++CASTORiter) {
+  for (CASTORiter = castorHits.begin(); CASTORiter != castorHits.end(); ++CASTORiter) {
     float energy = CASTORiter->energy();
     float time = CASTORiter->time();
     float time2 = time;
-    if (time < -100.) time2 = -100.;
+    if (time < -100.)
+      time2 = -100.;
     hRHtime->Fill(time2);
 
     HcalCastorDetId id(CASTORiter->detid().rawId());
@@ -190,7 +194,8 @@ void CastorRecHitMonitor::processEvent(
       //    int ind = phi*14 + z +1;
       h2RHchan->Fill(ind, rh);
       hallchan->Fill(rh);
-      if (rh < 0.) continue;
+      if (rh < 0.)
+        continue;
       h2RHoccmap->Fill(z, phi, rh);
       es += rh;
     }
@@ -203,13 +208,10 @@ void CastorRecHitMonitor::processEvent(
   return;
 }
 
-void CastorRecHitMonitor::processEventJets(
-    const reco::BasicJetCollection& Jets) {
+void CastorRecHitMonitor::processEventJets(const reco::BasicJetCollection &Jets) {
   int nJets = 0;
-  for (reco::BasicJetCollection::const_iterator ibegin = Jets.begin(),
-                                                iend = Jets.end(),
-                                                ijet = ibegin;
-       ijet != iend; ++ijet) {
+  for (reco::BasicJetCollection::const_iterator ibegin = Jets.begin(), iend = Jets.end(), ijet = ibegin; ijet != iend;
+       ++ijet) {
     nJets++;
     float energy = ijet->energy() * 0.001;
     hJetEnergy->Fill(energy);
diff --git a/DQM/DTMonitorModule/interface/DTDigiTask.h b/DQM/DTMonitorModule/interface/DTDigiTask.h
index e41aa244ad256..236370e8a3aae 100644
--- a/DQM/DTMonitorModule/interface/DTDigiTask.h
+++ b/DQM/DTMonitorModule/interface/DTDigiTask.h
@@ -156,6 +156,9 @@ class DTDigiTask: public one::DQMEDAnalyzer<edm::one::WatchLuminosityBlocks> {
   bool lookForSyncNoise;
   bool filterSyncNoise;
 
+  bool sliceTestMode;
+  int  tdcPedestal;
+
   bool doLayerTimeBoxes;
 
   std::map<DTChamberId, int> nSynchNoiseEvents;
diff --git a/DQM/DTMonitorModule/python/dtDigiTask_TP_cfi.py b/DQM/DTMonitorModule/python/dtDigiTask_TP_cfi.py
index bef941f74b2d5..b35cb72b389e3 100644
--- a/DQM/DTMonitorModule/python/dtDigiTask_TP_cfi.py
+++ b/DQM/DTMonitorModule/python/dtDigiTask_TP_cfi.py
@@ -33,6 +33,10 @@
     doInTimeOccupancies = cms.untracked.bool(True),                                
     # switch on the mode for running on test pulses (different top folder)
     testPulseMode = cms.untracked.bool(True),
+    # switch on the mode for running on slice test (different top folder and customizations)
+    sliceTestMode = cms.untracked.bool(False),
+    # time pedestal to be subtracted if sliceTestMode is true
+    tdcPedestal = cms.untracked.int32(105100),
     # switch for filtering on synch noise events (threshold on # of digis per chamber)
     filterSyncNoise = cms.untracked.bool(False),
     # threshold on # of digis per chamber to define sync noise
diff --git a/DQM/DTMonitorModule/python/dtDigiTask_cfi.py b/DQM/DTMonitorModule/python/dtDigiTask_cfi.py
index 3dd44f89c4137..6a9a4510d7408 100644
--- a/DQM/DTMonitorModule/python/dtDigiTask_cfi.py
+++ b/DQM/DTMonitorModule/python/dtDigiTask_cfi.py
@@ -32,13 +32,17 @@
     doInTimeOccupancies = cms.untracked.bool(False),                                
     # switch on the mode for running on test pulses (different top folder)
     testPulseMode = cms.untracked.bool(False),
+    # switch on the mode for running on slice test (different top folder and customizations)
+    sliceTestMode = cms.untracked.bool(False),
+    # time pedestal to be subtracted if sliceTestMode is true
+    tdcPedestal = cms.untracked.int32(105100),
     # switch for filtering on synch noise events (threshold on # of digis per chamber)
     filterSyncNoise = cms.untracked.bool(False),
     # look for synch noise events
     lookForSyncNoise = cms.untracked.bool(False),
     # threshold on # of digis per chamber to define sync noise
     maxTDCHitsPerChamber = cms.untracked.int32(100),
-    # switch for time boxes with layer granularity (commissioning only)                           
+    # switch for time boxes with layer granularity (commissioning only)
     doLayerTimeBoxes = cms.untracked.bool(False)
 )
 
diff --git a/DQM/DTMonitorModule/python/slice_test_customizations_cff.py b/DQM/DTMonitorModule/python/slice_test_customizations_cff.py
new file mode 100644
index 0000000000000..100c7463af883
--- /dev/null
+++ b/DQM/DTMonitorModule/python/slice_test_customizations_cff.py
@@ -0,0 +1,34 @@
+from __future__ import print_function
+import FWCore.ParameterSet.Config as cms                                                
+
+def customise_for_slice_test(process): 
+
+    print("[customise_for_slice_test]: cloning unpacker and DTDigiTask + customising AB7 sequence")
+
+    # This is commented out as the AB7 unpacker is not in CMSSW
+    # at present, the following lines need to be uncommented in the P5 setup
+
+    # from EventFilter.DTRawToDigi.dtab7unpacker_cfi import dtAB7unpacker
+    # process.dtAB7Unpacker = dtAB7unpacker.clone()
+
+    # Here using the uROS unpacker as proxy, the following lines
+    # need to be commented out in the setup running @ P5
+
+    from EventFilter.DTRawToDigi.dturosunpacker_cfi import dturosunpacker
+    process.dtAB7Unpacker = dturosunpacker.clone()
+    
+    from DQM.DTMonitorModule.dtDigiTask_cfi import dtDigiMonitor
+    process.dtAB7DigiMonitor = dtDigiMonitor.clone()
+
+    process.dtAB7DigiMonitor.dtDigiLabel = cms.InputTag("dtAB7Unpacker")
+    process.dtAB7DigiMonitor.sliceTestMode = True
+
+    process.dtAB7DigiMonitor.performPerWireT0Calibration = False
+
+    if hasattr(process,"dtDQMTask") :
+        print("[customise_for_slice_test]: extending dtDQMTask sequence to include AB7 monitoring")
+        process.dtDQMTask.replace(process.dtDigiMonitor, process.dtDigiMonitor +\
+                                                         process.dtAB7Unpacker +\
+                                                         process.dtAB7DigiMonitor) 
+
+    return process
diff --git a/DQM/DTMonitorModule/python/test/dtDqmPythonTypes.py b/DQM/DTMonitorModule/python/test/dtDqmPythonTypes.py
new file mode 100644
index 0000000000000..900f5879552ef
--- /dev/null
+++ b/DQM/DTMonitorModule/python/test/dtDqmPythonTypes.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+from FWCore.ParameterSet.Types import PSet
+import FWCore.ParameterSet.Config as cms
+
+class DTDQMConfig( PSet ):
+
+  # constructor
+
+  def __init__( self ):
+    PSet.__init__( self )       
+    self.__processAB7Digis = False
+    self.__processAB7TPs   = False
+    self.__runWithLargeTB  = False
+    self.__tbTDCPedestal   = 0
+  
+  # getters
+  
+  def getProcessAB7Digis( self ):
+    return self.__processAB7Digis
+    
+  def getProcessAB7TPs( self ):
+    return self.__processAB7TPs
+
+  def getRunWithLargeTB( self ):
+    return self.__runWithLargeTB
+
+  def getTBTDCPedestal( self ):
+    return self.__tbTDCPedestal
+    
+  # setters
+
+  def setProcessAB7Digis( self, processAB7Digis ):
+      self.__processAB7Digis = processAB7Digis
+    
+  def setProcessAB7TPs( self, processAB7TPs ):
+      self.__processAB7TPs = processAB7TPs
+    
+  def setRunWithLargeTB( self,runWithLargeTB ):
+      self.__runWithLargeTB = runWithLargeTB
+
+  def setTBTDCPedestal( self, tbTDCPedestal ):
+      self.__tbTDCPedestal = tbTDCPedestal
+    
+  # str and repr
+
+  def __str__( self ):
+    return "DTDQMConfig: processAB7Digis='%r' processAB7TPs='%r' runWithLargeTB='%r' tbTDCPedestal='%d'" % (self.__processAB7Digis, \
+                                                                                                            self.__processAB7TPs,   \
+                                                                                                            self.__runWithLargeTB,  \
+                                                                                                            self.__tbTDCPedestal)
+    
+  def __repr__( self ):
+    return "DTDQMConfig: processAB7Digis='%r' processAB7TPs='%r' runWithLargeTB='%r' tbTDCPedestal='%d'" % (self.__processAB7Digis, \
+                                                                                                            self.__processAB7TPs,   \
+                                                                                                            self.__runWithLargeTB,  \
+                                                                                                            self.__tbTDCPedestal)
diff --git a/DQM/DTMonitorModule/python/test/dt_dqm_sourceclient-live_cfg.py b/DQM/DTMonitorModule/python/test/dt_dqm_sourceclient-live_cfg.py
new file mode 100644
index 0000000000000..5988069727248
--- /dev/null
+++ b/DQM/DTMonitorModule/python/test/dt_dqm_sourceclient-live_cfg.py
@@ -0,0 +1,114 @@
+from __future__ import print_function
+import FWCore.ParameterSet.Config as cms
+import FWCore.ParameterSet.VarParsing as VarParsing
+
+process = cms.Process("DTDQM")
+
+#----------------------------
+#### Event Source
+#----------------------------
+# for live online DQM in P5
+process.load("DQM.DTMonitorModule.test.inputsource_live_cfi")
+
+# for testing in lxplus
+#process.load("DQM.Integration.config.fileinputsource_cfi")
+
+#----------------------------
+#### DQM Environment
+#----------------------------
+process.load("DQM.Integration.config.environment_cfi")
+process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/dt_reference.root'
+#process.DQMStore.referenceFileName = "DT_reference.root"
+process.dqmRunConfig.collectorHost = 'fu-c2f11-23-01.cms'
+process.dqmSaver.path = "./"
+
+#----------------------------
+#### DQM Live Environment
+#----------------------------
+process.dqmEnv.subSystemFolder = 'DT'
+process.dqmSaver.tag = "DT"
+#-----------------------------
+
+# Enable HLT*Mu* filtering to monitor on Muon events
+# OR HLT_Physics* to monitor FEDs in commissioning runs
+# process.source.SelectEvents = cms.untracked.vstring("HLT*Mu*","HLT_*Physics*")
+
+# DT reco and DQM sequences
+process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
+process.load("Configuration/StandardSequences/MagneticField_cff")
+process.load("DQM.DTMonitorModule.dt_dqm_sourceclient_common_cff")
+#---- for P5 (online) DB access
+process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
+#---- for offline DB: change and possibly customise the GT
+#from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
+#process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
+
+# message logger
+process.MessageLogger = cms.Service("MessageLogger",
+                                    destinations = cms.untracked.vstring('cout'),
+                                    cout = cms.untracked.PSet(threshold = cms.untracked.string('WARNING'))
+                                    )
+
+process.dqmmodules = cms.Sequence(process.dqmEnv + process.dqmSaver)
+
+process.dtDQMPathPhys = cms.Path(process.unpackers + process.dqmmodules + process.physicsEventsFilter *  process.dtDQMPhysSequence)
+
+#process.dtDQMPathCalib = cms.Path(process.unpackers + process.dqmmodules + process.calibrationEventsFilter * process.dtDQMCalib)
+
+process.twinMuxStage2Digis.DTTM7_FED_Source = cms.InputTag("rawDataCollector")
+process.dtunpacker.inputLabel = cms.InputTag("rawDataCollector")
+process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataCollector")
+process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataCollector")
+
+print("Running with run type = ", process.runType.getRunType())
+
+#----------------------------
+#### pp run settings 
+#----------------------------
+
+if (process.runType.getRunType() == process.runType.pp_run):
+    process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/dt_reference_pp.root'
+
+
+#----------------------------
+#### cosmic run settings 
+#----------------------------
+
+if (process.runType.getRunType() == process.runType.cosmic_run):
+    process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/dt_reference_cosmic.root'
+
+
+#----------------------------
+#### HI run settings 
+#----------------------------
+
+if (process.runType.getRunType() == process.runType.hi_run):
+    process.twinMuxStage2Digis.DTTM7_FED_Source = cms.InputTag("rawDataRepacker")
+    process.dtunpacker.inputLabel = cms.InputTag("rawDataRepacker")
+    process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataRepacker")
+    process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker")
+    
+    process.dtDigiMonitor.ResetCycle = cms.untracked.int32(9999)
+
+    process.DQMStore.referenceFileName = '/dqmdata/dqm/reference/dt_reference_hi.root'
+
+
+### process customisations included here
+from DQM.Integration.config.online_customizations_cfi import *
+process = customise(process)
+
+### DT slice test specific customisations
+if (process.dtDqmConfig.getProcessAB7Digis()) :
+    from DQM.DTMonitorModule.slice_test_customizations_cff import *
+    process = customise_for_slice_test(process)
+
+### DT digi customisation
+if (process.dtDqmConfig.getRunWithLargeTB()) :
+    process.dtDigiMonitor.maxTTMounts = 6400
+
+if (process.dtDqmConfig.getProcessAB7Digis()) :
+
+    if (process.dtDqmConfig.getRunWithLargeTB()) :
+        process.dtAB7DigiMonitor.maxTTMounts = 6400
+
+    process.dtAB7DigiMonitor.tdcPedestal = process.dtDqmConfig.getTBTDCPedestal()
diff --git a/DQM/DTMonitorModule/python/test/inputsource_live_cfi.py b/DQM/DTMonitorModule/python/test/inputsource_live_cfi.py
new file mode 100644
index 0000000000000..a1ec7c7edceb8
--- /dev/null
+++ b/DQM/DTMonitorModule/python/test/inputsource_live_cfi.py
@@ -0,0 +1,129 @@
+from __future__ import print_function
+import FWCore.ParameterSet.Config as cms
+import FWCore.ParameterSet.VarParsing as VarParsing
+
+import sys
+
+from DQM.Integration.config.dqmPythonTypes import RunType 
+from DQM.DTMonitorModule.test.dtDqmPythonTypes import DTDQMConfig 
+
+options = VarParsing.VarParsing('analysis')
+
+# options.inputFiles are inherited from 'analysis'
+options.register('runNumber',
+                 111,
+                 VarParsing.VarParsing.multiplicity.singleton,
+                 VarParsing.VarParsing.varType.int,
+                 "Run number.")
+
+options.register('runInputDir',
+                 '/tmp',
+                 VarParsing.VarParsing.multiplicity.singleton,
+                 VarParsing.VarParsing.varType.string,
+                 "Directory where the DQM files will appear.")
+
+options.register('scanOnce',
+                 False, # default value
+                 VarParsing.VarParsing.multiplicity.singleton,
+                 VarParsing.VarParsing.varType.bool,
+                 "Don't repeat file scans: use what was found during the initial scan. EOR file is ignored and the state is set to 'past end of run'.")
+
+options.register('minEventsPerLumi',
+                 1, # default value
+                 VarParsing.VarParsing.multiplicity.singleton,
+                 VarParsing.VarParsing.varType.int,
+                 "If scanOnce is tue, sets the minimal # of events per LS to be processed before switching to the next LS (and file).")
+
+options.register('skipFirstLumis',
+                 False, # default value
+                 VarParsing.VarParsing.multiplicity.singleton,
+                 VarParsing.VarParsing.varType.bool,
+                 "Skip (and ignore the minEventsPerLumi parameter) for the files which have been available at the begining of the processing. ")
+
+# Parameters for runType
+
+options.register ('runkey',
+          'pp_run',
+          VarParsing.VarParsing.multiplicity.singleton,
+          VarParsing.VarParsing.varType.string,
+          "Run Keys of CMS")
+
+# parameters for DT configuration
+
+options.register('processAB7Digis',
+                 False, # default value
+                 VarParsing.VarParsing.multiplicity.singleton,
+                 VarParsing.VarParsing.varType.bool,
+                 "Enable processing of AB7 DT digi data (duplicate occupancy plot and other customisations to DT digi monitoring)")
+
+options.register('processAB7TPs',
+                 False, # default value
+                 VarParsing.VarParsing.multiplicity.singleton,
+                 VarParsing.VarParsing.varType.bool,
+                 "Enable processing of AB7 DT local trigger data (DOES NOTHING FOR NOW)")
+
+options.register('runWithLargeTimeBox',
+                 False, # default value
+                 VarParsing.VarParsing.multiplicity.singleton,
+                 VarParsing.VarParsing.varType.bool,
+                 "Runs DTDigiTask with a timebox plot window of 6400 TDC Counts")
+
+options.register('timeBoxTDCPedestal',
+                 105100, # default value
+                 VarParsing.VarParsing.multiplicity.singleton,
+                 VarParsing.VarParsing.varType.int,
+                 "Pedestal to subtract to TDC counts for AB7")
+
+
+options.parseArguments()
+
+runType = RunType()
+if not options.runkey.strip():
+  options.runkey = 'pp_run'
+
+dtDqmConfig = DTDQMConfig()
+dtDqmConfig.setProcessAB7Digis(options.processAB7Digis)
+dtDqmConfig.setProcessAB7TPs(options.processAB7TPs)
+
+dtDqmConfig.setRunWithLargeTB(options.runWithLargeTimeBox)
+dtDqmConfig.setTBTDCPedestal(options.timeBoxTDCPedestal)
+
+runType.setRunType(options.runkey.strip())
+
+if not options.inputFiles:
+    # Input source
+    nextLumiTimeoutMillis = 240000
+    endOfRunKills = True
+    
+    if options.scanOnce:
+        endOfRunKills = False
+        nextLumiTimeoutMillis = 0
+        minEventsPerLumi = options.minEventsPerLumi
+    
+    source = cms.Source("DQMStreamerReader",
+        runNumber = cms.untracked.uint32(options.runNumber),
+        runInputDir = cms.untracked.string(options.runInputDir),
+        SelectEvents = cms.untracked.vstring('*'),
+        streamLabel = cms.untracked.string('streamDQM'),
+        scanOnce = cms.untracked.bool(options.scanOnce),
+        minEventsPerLumi = cms.untracked.int32(minEventsPerLumi),
+        delayMillis = cms.untracked.uint32(500),
+        nextLumiTimeoutMillis = cms.untracked.int32(nextLumiTimeoutMillis),
+        skipFirstLumis = cms.untracked.bool(options.skipFirstLumis),
+        deleteDatFiles = cms.untracked.bool(False),
+        endOfRunKills  = cms.untracked.bool(endOfRunKills),
+    )
+else:
+    print("The list of input files is provided. Disabling discovery and running on everything.")
+    files = map(lambda x: "file://" + x, options.inputFiles)
+    source = cms.Source("PoolSource",
+        fileNames = cms.untracked.vstring(files),
+        secondaryFileNames = cms.untracked.vstring()
+    )
+
+print("Source:", source)
+
+print("RunType:", runType)
+
+print("DTDQMConfig:", dtDqmConfig)
+
diff --git a/DQM/DTMonitorModule/src/DTDigiTask.cc b/DQM/DTMonitorModule/src/DTDigiTask.cc
index 0765b34918f73..a8614d0872003 100644
--- a/DQM/DTMonitorModule/src/DTDigiTask.cc
+++ b/DQM/DTMonitorModule/src/DTDigiTask.cc
@@ -90,6 +90,12 @@ DTDigiTask::DTDigiTask(const edm::ParameterSet& ps){
   filterSyncNoise = ps.getUntrackedParameter<bool>("filterSyncNoise", false);
   // look for synch noisy events, produce histograms but do not filter them
   lookForSyncNoise = ps.getUntrackedParameter<bool>("lookForSyncNoise", false);
+
+  // switch on the mode for running on slice test (different top folder and other customizations)
+  sliceTestMode = ps.getUntrackedParameter<bool>("sliceTestMode", false);
+  // time pedestal to be subtracted if sliceTestMode is true
+  tdcPedestal = ps.getUntrackedParameter<int>("tdcPedestal", 105100);
+
   // switch on production of time-boxes with layer granularity
   doLayerTimeBoxes = ps.getUntrackedParameter<bool>("doLayerTimeBoxes", false);
 
@@ -613,7 +619,12 @@ void DTDigiTask::analyze(const edm::Event& event, const edm::EventSetup& c) {
         tdcTime += int(round(t0));
       }
 
-
+      if (sliceTestMode)
+	{
+	  tdcTime -= tdcPedestal;
+	  tdcTime = std::max(1,std::min(maxTTMounts-1,tdcTime));
+	  // std::cout << tdcTime << std::endl;
+	}
 
       // Fill Time-Boxes
       // NOTE: avoid to fill TB and PhotoPeak with noise. Occupancy are filled anyway
@@ -732,6 +743,7 @@ string DTDigiTask::triggerSource() {
 string DTDigiTask::topFolder() const {
 
   if(tpMode) return string("DT/10-TestPulses/");
+  else if(sliceTestMode) return string("DT/01-SliceTestDigi/");
   return string("DT/01-Digi/");
 
 }
diff --git a/DQM/DataScouting/interface/AlphaTVarProducer.h b/DQM/DataScouting/interface/AlphaTVarProducer.h
index 8dedc7cff4274..b4863c823df82 100644
--- a/DQM/DataScouting/interface/AlphaTVarProducer.h
+++ b/DQM/DataScouting/interface/AlphaTVarProducer.h
@@ -1,36 +1,35 @@
 #ifndef AlphaTVarProducer_h
 #define AlphaTVarProducer_h
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-#include "TLorentzVector.h"
-#include "DataFormats/METReco/interface/CaloMETFwd.h"
 #include "DataFormats/JetReco/interface/CaloJetCollection.h"
+#include "DataFormats/METReco/interface/CaloMETFwd.h"
+#include "TLorentzVector.h"
 
 #include <vector>
 
 class AlphaTVarProducer : public edm::EDProducer {
- public: 
-  explicit AlphaTVarProducer(const edm::ParameterSet&);
+public:
+  explicit AlphaTVarProducer(const edm::ParameterSet &);
   ~AlphaTVarProducer() override;
-  void produce(edm::Event&, const edm::EventSetup&) override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
- private:
-  double CalcAlphaT(const std::vector<TLorentzVector>&);
-  static double CalcHT(const std::vector<TLorentzVector>&);
-  static double CalcMHT(const std::vector<TLorentzVector>&);
-  static double deltaHt(const std::vector<double>&);
+private:
+  double CalcAlphaT(const std::vector<TLorentzVector> &);
+  static double CalcHT(const std::vector<TLorentzVector> &);
+  static double CalcMHT(const std::vector<TLorentzVector> &);
+  static double deltaHt(const std::vector<double> &);
   static double alphaT(const double, const double, const double);
-  
-  
-  edm::InputTag inputJetTag_; // input tag identifying product
 
-  //define Token(-s)
+  edm::InputTag inputJetTag_;  // input tag identifying product
+
+  // define Token(-s)
   edm::EDGetTokenT<reco::CaloJetCollection> inputJetTagToken_;
 };
 
-#endif //AlphaTVarProducer_h
+#endif  // AlphaTVarProducer_h
diff --git a/DQM/DataScouting/interface/DiJetVarProducer.h b/DQM/DataScouting/interface/DiJetVarProducer.h
index cfc1148e093ca..f8dd000fcd920 100644
--- a/DQM/DataScouting/interface/DiJetVarProducer.h
+++ b/DQM/DataScouting/interface/DiJetVarProducer.h
@@ -1,35 +1,33 @@
 #ifndef DiJetVarProducer_h
 #define DiJetVarProducer_h
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-#include "TVector3.h"
 #include "TLorentzVector.h"
+#include "TVector3.h"
 
 #include "DataFormats/Common/interface/View.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
 #include "DataFormats/JetReco/interface/CaloJetCollection.h"
 
-#include<vector>
+#include <vector>
 
 class DiJetVarProducer : public edm::EDProducer {
- public: 
-  explicit DiJetVarProducer(const edm::ParameterSet&);
+public:
+  explicit DiJetVarProducer(const edm::ParameterSet &);
   ~DiJetVarProducer() override;
-  void produce(edm::Event&, const edm::EventSetup&) override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
- private:
+private:
+  edm::InputTag inputJetTag_;  // input tag jets
+  double wideJetDeltaR_;       // Radius parameter for wide jets
 
-  edm::InputTag inputJetTag_; // input tag jets
-  double wideJetDeltaR_; // Radius parameter for wide jets
-
-  //set Token(-s)
+  // set Token(-s)
   edm::EDGetTokenT<reco::CaloJetCollection> inputJetTagToken_;
-
 };
 
-#endif //DiJetVarProducer_h
+#endif  // DiJetVarProducer_h
diff --git a/DQM/DataScouting/interface/RazorVarProducer.h b/DQM/DataScouting/interface/RazorVarProducer.h
index d2c97cbb80d04..83631eb3be255 100644
--- a/DQM/DataScouting/interface/RazorVarProducer.h
+++ b/DQM/DataScouting/interface/RazorVarProducer.h
@@ -1,34 +1,37 @@
 #ifndef RazorVarProducer_h
 #define RazorVarProducer_h
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-#include "TLorentzVector.h"
 #include "DataFormats/METReco/interface/CaloMETFwd.h"
 #include "DataFormats/Math/interface/LorentzVectorFwd.h"
+#include "TLorentzVector.h"
 #include <vector>
 
 class RazorVarProducer : public edm::EDProducer {
- public: 
-  explicit RazorVarProducer(const edm::ParameterSet&);
+public:
+  explicit RazorVarProducer(const edm::ParameterSet &);
   ~RazorVarProducer() override;
-  void produce(edm::Event&, const edm::EventSetup&) override;
-
-  double CalcMR(TLorentzVector ja,TLorentzVector jb);
-  double CalcR(double MR, const TLorentzVector& ja, const TLorentzVector& jb, edm::Handle<reco::CaloMETCollection> met, const std::vector<math::XYZTLorentzVector>& muons);
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
- private:
+  double CalcMR(TLorentzVector ja, TLorentzVector jb);
+  double CalcR(double MR,
+               const TLorentzVector &ja,
+               const TLorentzVector &jb,
+               edm::Handle<reco::CaloMETCollection> met,
+               const std::vector<math::XYZTLorentzVector> &muons);
 
-  edm::InputTag inputTag_; // input tag identifying product
-  edm::InputTag inputMetTag_; // input tag identifying MET product
+private:
+  edm::InputTag inputTag_;     // input tag identifying product
+  edm::InputTag inputMetTag_;  // input tag identifying MET product
 
-  //define Token(-s)
-  edm::EDGetTokenT<std::vector<math::XYZTLorentzVector> > inputTagToken_;
+  // define Token(-s)
+  edm::EDGetTokenT<std::vector<math::XYZTLorentzVector>> inputTagToken_;
   edm::EDGetTokenT<reco::CaloMETCollection> inputMetTagToken_;
 };
 
-#endif //RazorVarProducer_h
+#endif  // RazorVarProducer_h
diff --git a/DQM/DataScouting/interface/ScoutingAnalyzerBase.h b/DQM/DataScouting/interface/ScoutingAnalyzerBase.h
index f6fe800b5f450..62cf1c0af9ac7 100644
--- a/DQM/DataScouting/interface/ScoutingAnalyzerBase.h
+++ b/DQM/DataScouting/interface/ScoutingAnalyzerBase.h
@@ -1,116 +1,148 @@
 #ifndef ScoutingAnalyzerBase_h
 #define ScoutingAnalyzerBase_h
 
-/* This class, as this whole package, was inspired by the EGamma monitoring 
- * by David Chamont. The idea is to provide a base class for all the monitoring 
+/* This class, as this whole package, was inspired by the EGamma monitoring
+ * by David Chamont. The idea is to provide a base class for all the monitoring
  * modules implemented as plugins.
- * The methods of the base class will spare the developer the pain of allocating 
- * all the ME, make projections and manipulations with extremely ugly copy&paste 
+ * The methods of the base class will spare the developer the pain of allocating
+ * all the ME, make projections and manipulations with extremely ugly copy&paste
  * code sections
  * */
-class DQMStore ;
-class MonitorElement ;
+class DQMStore;
+class MonitorElement;
 
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
 #include <Rtypes.h>
 
 class ScoutingAnalyzerBase : public DQMEDAnalyzer {
-  protected:
-    explicit ScoutingAnalyzerBase( const edm::ParameterSet & conf );
-    ~ScoutingAnalyzerBase() override;
-    //virtual void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &);
-    void analyze( const edm::Event & e, const edm::EventSetup & c ) override {}
-
-    std::string newName(const std::string & name);
-
-    void prepareBooking(DQMStore::IBooker &);
-
-    // Members for ME booking
-    MonitorElement * bookH1
-     ( DQMStore::IBooker &,
-       const std::string & name, const std::string & title,
-       int nchX, double lowX, double highX,
-       const std::string & titleX ="", const std::string & titleY ="Events",
-       Option_t * option = "E1 P" ) ;
-
-    MonitorElement * bookH1withSumw2
-     ( DQMStore::IBooker &,
-       const std::string & name, const std::string & title,
-       int nchX, double lowX, double highX,
-       const std::string & titleX ="", const std::string & titleY ="Events",
-       Option_t * option = "E1 P"  ) ;
-
-    MonitorElement * bookH1BinArray
-     ( DQMStore::IBooker &,
-       const std::string & name, const std::string & title,
-       int nchX, float *xbinsize,
-       const std::string & titleX ="", const std::string & titleY ="Events",
-       Option_t * option = "E1 P" ) ;
-
-    MonitorElement * bookH1withSumw2BinArray
-     ( DQMStore::IBooker &,
-       const std::string & name, const std::string & title,
-       int nchX, float *xbinsize,
-       const std::string & titleX ="", const std::string & titleY ="Events",
-       Option_t * option = "E1 P"  ) ;
-
-    MonitorElement * bookH2
-     ( DQMStore::IBooker &,
-       const std::string & name, const std::string & title,
-       int nchX, double lowX, double highX,
-       int nchY, double lowY, double highY,
-       const std::string & titleX ="", const std::string & titleY ="",
-       Option_t * option = "COLZ"  ) ;
-
-    MonitorElement * bookH2withSumw2
-     ( DQMStore::IBooker &,
-       const std::string & name, const std::string & title,
-       int nchX, double lowX, double highX,
-       int nchY, double lowY, double highY,
-       const std::string & titleX ="", const std::string & titleY ="",
-       Option_t * option = "COLZ"  ) ;
-
-    MonitorElement * bookP1
-     ( DQMStore::IBooker &,
-       const std::string & name, const std::string & title,
-       int nchX, double lowX, double highX,
-                 double lowY, double highY,
-       const std::string & titleX ="", const std::string & titleY ="",
-       Option_t * option = "E1 P"  ) ;
-
-    MonitorElement * bookH1andDivide
-     ( DQMStore::IBooker &,
-       const std::string & name, MonitorElement * num, MonitorElement * denom,
-       const std::string & titleX, const std::string & titleY,
-       const std::string & title ="" ) ;
-
-    MonitorElement * bookH2andDivide
-     ( DQMStore::IBooker &,
-       const std::string & name, MonitorElement * num, MonitorElement * denom,
-       const std::string & titleX, const std::string & titleY,
-       const std::string & title ="" ) ;
-    
-    MonitorElement * profileX
-     ( DQMStore::IBooker &,
-       MonitorElement * me2d,
-       const std::string & title ="", const std::string & titleX ="", const std::string & titleY ="",
-       Double_t minimum = -1111, Double_t maximum = -1111 ) ;
-
-    MonitorElement * profileY
-     ( DQMStore::IBooker &,
-       MonitorElement * me2d,
-       const std::string & title ="", const std::string & titleX ="", const std::string & titleY ="",
-       Double_t minimum = -1111, Double_t maximum = -1111 ) ;
-
-  private: 
-    std::string m_modulePath;
-    std::string m_MEsPath;
-    unsigned m_verbosityLevel;
+protected:
+  explicit ScoutingAnalyzerBase(const edm::ParameterSet &conf);
+  ~ScoutingAnalyzerBase() override;
+  // virtual void bookHistograms(DQMStore::IBooker &, edm::Run const &,
+  // edm::EventSetup const &);
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override {}
+
+  std::string newName(const std::string &name);
+
+  void prepareBooking(DQMStore::IBooker &);
+
+  // Members for ME booking
+  MonitorElement *bookH1(DQMStore::IBooker &,
+                         const std::string &name,
+                         const std::string &title,
+                         int nchX,
+                         double lowX,
+                         double highX,
+                         const std::string &titleX = "",
+                         const std::string &titleY = "Events",
+                         Option_t *option = "E1 P");
+
+  MonitorElement *bookH1withSumw2(DQMStore::IBooker &,
+                                  const std::string &name,
+                                  const std::string &title,
+                                  int nchX,
+                                  double lowX,
+                                  double highX,
+                                  const std::string &titleX = "",
+                                  const std::string &titleY = "Events",
+                                  Option_t *option = "E1 P");
+
+  MonitorElement *bookH1BinArray(DQMStore::IBooker &,
+                                 const std::string &name,
+                                 const std::string &title,
+                                 int nchX,
+                                 float *xbinsize,
+                                 const std::string &titleX = "",
+                                 const std::string &titleY = "Events",
+                                 Option_t *option = "E1 P");
+
+  MonitorElement *bookH1withSumw2BinArray(DQMStore::IBooker &,
+                                          const std::string &name,
+                                          const std::string &title,
+                                          int nchX,
+                                          float *xbinsize,
+                                          const std::string &titleX = "",
+                                          const std::string &titleY = "Events",
+                                          Option_t *option = "E1 P");
+
+  MonitorElement *bookH2(DQMStore::IBooker &,
+                         const std::string &name,
+                         const std::string &title,
+                         int nchX,
+                         double lowX,
+                         double highX,
+                         int nchY,
+                         double lowY,
+                         double highY,
+                         const std::string &titleX = "",
+                         const std::string &titleY = "",
+                         Option_t *option = "COLZ");
+
+  MonitorElement *bookH2withSumw2(DQMStore::IBooker &,
+                                  const std::string &name,
+                                  const std::string &title,
+                                  int nchX,
+                                  double lowX,
+                                  double highX,
+                                  int nchY,
+                                  double lowY,
+                                  double highY,
+                                  const std::string &titleX = "",
+                                  const std::string &titleY = "",
+                                  Option_t *option = "COLZ");
+
+  MonitorElement *bookP1(DQMStore::IBooker &,
+                         const std::string &name,
+                         const std::string &title,
+                         int nchX,
+                         double lowX,
+                         double highX,
+                         double lowY,
+                         double highY,
+                         const std::string &titleX = "",
+                         const std::string &titleY = "",
+                         Option_t *option = "E1 P");
+
+  MonitorElement *bookH1andDivide(DQMStore::IBooker &,
+                                  const std::string &name,
+                                  MonitorElement *num,
+                                  MonitorElement *denom,
+                                  const std::string &titleX,
+                                  const std::string &titleY,
+                                  const std::string &title = "");
+
+  MonitorElement *bookH2andDivide(DQMStore::IBooker &,
+                                  const std::string &name,
+                                  MonitorElement *num,
+                                  MonitorElement *denom,
+                                  const std::string &titleX,
+                                  const std::string &titleY,
+                                  const std::string &title = "");
+
+  MonitorElement *profileX(DQMStore::IBooker &,
+                           MonitorElement *me2d,
+                           const std::string &title = "",
+                           const std::string &titleX = "",
+                           const std::string &titleY = "",
+                           Double_t minimum = -1111,
+                           Double_t maximum = -1111);
+
+  MonitorElement *profileY(DQMStore::IBooker &,
+                           MonitorElement *me2d,
+                           const std::string &title = "",
+                           const std::string &titleX = "",
+                           const std::string &titleY = "",
+                           Double_t minimum = -1111,
+                           Double_t maximum = -1111);
+
+private:
+  std::string m_modulePath;
+  std::string m_MEsPath;
+  unsigned m_verbosityLevel;
 };
 
 #endif
-
diff --git a/DQM/DataScouting/plugins/AlphaTVarAnalyzer.cc b/DQM/DataScouting/plugins/AlphaTVarAnalyzer.cc
index cb3dc56e90057..6b6e7572a9a67 100644
--- a/DQM/DataScouting/plugins/AlphaTVarAnalyzer.cc
+++ b/DQM/DataScouting/plugins/AlphaTVarAnalyzer.cc
@@ -11,53 +11,53 @@
 
 #include <cmath>
 
-// A simple constructor which takes as input only the name of the PF jet collection
-AlphaTVarAnalyzer::AlphaTVarAnalyzer( const edm::ParameterSet & conf ):
-  ScoutingAnalyzerBase(conf),
-  m_jetCollectionTag(conf.getUntrackedParameter<edm::InputTag>("jetCollectionName",edm::InputTag("hltCaloJetIDPassed"))),
-  m_alphaTVarCollectionTag(conf.getUntrackedParameter<edm::InputTag>("alphaTVarCollectionName")) {
-  //set Token(-s)
-  m_alphaTVarCollectionTagToken_ = consumes<std::vector<double> >(conf.getUntrackedParameter<edm::InputTag>("alphaTVarCollectionName"));
+// A simple constructor which takes as input only the name of the PF jet
+// collection
+AlphaTVarAnalyzer::AlphaTVarAnalyzer(const edm::ParameterSet &conf)
+    : ScoutingAnalyzerBase(conf),
+      m_jetCollectionTag(
+          conf.getUntrackedParameter<edm::InputTag>("jetCollectionName", edm::InputTag("hltCaloJetIDPassed"))),
+      m_alphaTVarCollectionTag(conf.getUntrackedParameter<edm::InputTag>("alphaTVarCollectionName")) {
+  // set Token(-s)
+  m_alphaTVarCollectionTagToken_ =
+      consumes<std::vector<double>>(conf.getUntrackedParameter<edm::InputTag>("alphaTVarCollectionName"));
 }
 
 AlphaTVarAnalyzer::~AlphaTVarAnalyzer() {}
 
 // Function to book the Monitoring Elements.
-void AlphaTVarAnalyzer::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const &, edm::EventSetup const &) {
+void AlphaTVarAnalyzer::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, edm::EventSetup const &) {
   ScoutingAnalyzerBase::prepareBooking(iBooker);
-  //the full inclusive histograms
-  m_HTAlphaT = bookH2withSumw2(
-      iBooker,
-      "HTvsAlphaT",
-      "H_{T} vs #alpha_{T} (All Events)",
-      400,0.,4000.,
-      50,0.,1.,
-      "H_{T} [GeV]",
-      "#alpha_{T}");
-  m_HTAlphaTg0p55 = bookH1withSumw2(
-      iBooker,
-      "HTvsAlphaTg0p55",
-      "H_{T} (#alpha_{T} > 0.55)",
-      400,0.,4000.,
-      "H_{T} [GeV]");
-  m_HTAlphaTg0p60 = bookH1withSumw2(
-      iBooker,
-      "HTvsAlphaTg0p60",
-      "H_{T} (#alpha_{T} > 0.60)",
-      400,0.,4000.,
-      "H_{T} [GeV]");
-} 
+  // the full inclusive histograms
+  m_HTAlphaT = bookH2withSumw2(iBooker,
+                               "HTvsAlphaT",
+                               "H_{T} vs #alpha_{T} (All Events)",
+                               400,
+                               0.,
+                               4000.,
+                               50,
+                               0.,
+                               1.,
+                               "H_{T} [GeV]",
+                               "#alpha_{T}");
+  m_HTAlphaTg0p55 =
+      bookH1withSumw2(iBooker, "HTvsAlphaTg0p55", "H_{T} (#alpha_{T} > 0.55)", 400, 0., 4000., "H_{T} [GeV]");
+  m_HTAlphaTg0p60 =
+      bookH1withSumw2(iBooker, "HTvsAlphaTg0p60", "H_{T} (#alpha_{T} > 0.60)", 400, 0., 4000., "H_{T} [GeV]");
+}
 
 // Usual analyze method
-void AlphaTVarAnalyzer::analyze( const edm::Event & iEvent, const edm::EventSetup & c ) {
-  edm::Handle<std::vector<double> > alphaTvar_handle;
+void AlphaTVarAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &c) {
+  edm::Handle<std::vector<double>> alphaTvar_handle;
   iEvent.getByToken(m_alphaTVarCollectionTagToken_, alphaTvar_handle);
 
-  if(alphaTvar_handle->size() > 1){
+  if (alphaTvar_handle->size() > 1) {
     const double AlphaT = alphaTvar_handle->at(0);
     const double HT = alphaTvar_handle->at(1);
-    m_HTAlphaT->Fill(HT,AlphaT);
-    if(AlphaT > 0.55) m_HTAlphaTg0p55->Fill(HT);
-    if(AlphaT > 0.60) m_HTAlphaTg0p60->Fill(HT);
+    m_HTAlphaT->Fill(HT, AlphaT);
+    if (AlphaT > 0.55)
+      m_HTAlphaTg0p55->Fill(HT);
+    if (AlphaT > 0.60)
+      m_HTAlphaTg0p60->Fill(HT);
   }
 }
diff --git a/DQM/DataScouting/plugins/AlphaTVarAnalyzer.h b/DQM/DataScouting/plugins/AlphaTVarAnalyzer.h
index 73f3be6a56ae7..f6592185f868e 100644
--- a/DQM/DataScouting/plugins/AlphaTVarAnalyzer.h
+++ b/DQM/DataScouting/plugins/AlphaTVarAnalyzer.h
@@ -4,19 +4,20 @@
 #include "DQM/DataScouting/interface/ScoutingAnalyzerBase.h"
 
 class AlphaTVarAnalyzer : public ScoutingAnalyzerBase {
-  public:
-    explicit AlphaTVarAnalyzer( const edm::ParameterSet &  ) ;
-    ~AlphaTVarAnalyzer() override ;
-    void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-    void analyze( const edm::Event & , const edm::EventSetup &  ) override;
-  private: 
-    edm::InputTag m_jetCollectionTag;
-    edm::InputTag m_alphaTVarCollectionTag;
-    //inclusive histograms by jet number
-    MonitorElement * m_HTAlphaT;
-    MonitorElement * m_HTAlphaTg0p55;
-    MonitorElement * m_HTAlphaTg0p60;
-    //define Token(-s)
-    edm::EDGetTokenT<std::vector<double> > m_alphaTVarCollectionTagToken_;
+public:
+  explicit AlphaTVarAnalyzer(const edm::ParameterSet &);
+  ~AlphaTVarAnalyzer() override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+
+private:
+  edm::InputTag m_jetCollectionTag;
+  edm::InputTag m_alphaTVarCollectionTag;
+  // inclusive histograms by jet number
+  MonitorElement *m_HTAlphaT;
+  MonitorElement *m_HTAlphaTg0p55;
+  MonitorElement *m_HTAlphaTg0p60;
+  // define Token(-s)
+  edm::EDGetTokenT<std::vector<double>> m_alphaTVarCollectionTagToken_;
 };
 #endif
diff --git a/DQM/DataScouting/plugins/DiJetVarAnalyzer.cc b/DQM/DataScouting/plugins/DiJetVarAnalyzer.cc
index 79b7dcd05d57a..f25349967d137 100644
--- a/DQM/DataScouting/plugins/DiJetVarAnalyzer.cc
+++ b/DQM/DataScouting/plugins/DiJetVarAnalyzer.cc
@@ -1,11 +1,11 @@
 #include "DQM/DataScouting/plugins/DiJetVarAnalyzer.h"
 
+#include "DataFormats/EgammaCandidates/interface/Electron.h"
+#include "DataFormats/EgammaCandidates/interface/ElectronFwd.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
 #include "DataFormats/JetReco/interface/CaloJetCollection.h"
 #include "DataFormats/METReco/interface/CaloMET.h"
 #include "DataFormats/METReco/interface/CaloMETCollection.h"
-#include "DataFormats/EgammaCandidates/interface/Electron.h"
-#include "DataFormats/EgammaCandidates/interface/ElectronFwd.h"
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h"
 
@@ -17,433 +17,380 @@
 
 #include <cmath>
 
-// A simple constructor which takes as inoput only the name of the PF jet collection
-DiJetVarAnalyzer::DiJetVarAnalyzer( const edm::ParameterSet & conf ):
-  ScoutingAnalyzerBase(conf),
-  jetCollectionTag_        (conf.getUntrackedParameter<edm::InputTag>("jetCollectionTag")),
-  widejetsCollectionTag_   (conf.getUntrackedParameter<edm::InputTag>("widejetsCollectionTag")),
-  metCollectionTag_        (conf.getUntrackedParameter<edm::InputTag>("metCollectionTag")),
-  metCleanCollectionTag_   (conf.getUntrackedParameter<edm::InputTag>("metCleanCollectionTag")),
-  numwidejets_             (conf.getParameter<unsigned int>("numwidejets")),
-  etawidejets_             (conf.getParameter<double>("etawidejets")),
-  ptwidejets_              (conf.getParameter<double>("ptwidejets")),
-  detawidejets_            (conf.getParameter<double>("detawidejets")),
-  dphiwidejets_            (conf.getParameter<double>("dphiwidejets")),
-  maxEMfraction_           (conf.getParameter<double>("maxEMfraction")),
-  maxHADfraction_          (conf.getParameter<double>("maxHADfraction")),
-  HLTpathMain_             (triggerExpression::parse( conf.getParameter<std::string>("HLTpathMain") )),
-  HLTpathMonitor_          (triggerExpression::parse( conf.getParameter<std::string>("HLTpathMonitor") )),
-  triggerConfiguration_    (conf.getParameterSet("triggerConfiguration"),consumesCollector()) {
-  //set Token(-s)
-  jetCollectionTagToken_ = consumes<reco::CaloJetCollection>(conf.getUntrackedParameter<edm::InputTag>("jetCollectionTag"));
-  widejetsCollectionTagToken_ = consumes<std::vector<math::PtEtaPhiMLorentzVector> >(conf.getUntrackedParameter<edm::InputTag>("widejetsCollectionTag"));
-  metCollectionTagToken_ = consumes<reco::CaloMETCollection>(conf.getUntrackedParameter<edm::InputTag>("metCollectionTag"));
-  metCleanCollectionTagToken_ = consumes<reco::CaloMETCollection>(conf.getUntrackedParameter<edm::InputTag>("metCleanCollectionTag"));
+// A simple constructor which takes as inoput only the name of the PF jet
+// collection
+DiJetVarAnalyzer::DiJetVarAnalyzer(const edm::ParameterSet &conf)
+    : ScoutingAnalyzerBase(conf),
+      jetCollectionTag_(conf.getUntrackedParameter<edm::InputTag>("jetCollectionTag")),
+      widejetsCollectionTag_(conf.getUntrackedParameter<edm::InputTag>("widejetsCollectionTag")),
+      metCollectionTag_(conf.getUntrackedParameter<edm::InputTag>("metCollectionTag")),
+      metCleanCollectionTag_(conf.getUntrackedParameter<edm::InputTag>("metCleanCollectionTag")),
+      numwidejets_(conf.getParameter<unsigned int>("numwidejets")),
+      etawidejets_(conf.getParameter<double>("etawidejets")),
+      ptwidejets_(conf.getParameter<double>("ptwidejets")),
+      detawidejets_(conf.getParameter<double>("detawidejets")),
+      dphiwidejets_(conf.getParameter<double>("dphiwidejets")),
+      maxEMfraction_(conf.getParameter<double>("maxEMfraction")),
+      maxHADfraction_(conf.getParameter<double>("maxHADfraction")),
+      HLTpathMain_(triggerExpression::parse(conf.getParameter<std::string>("HLTpathMain"))),
+      HLTpathMonitor_(triggerExpression::parse(conf.getParameter<std::string>("HLTpathMonitor"))),
+      triggerConfiguration_(conf.getParameterSet("triggerConfiguration"), consumesCollector()) {
+  // set Token(-s)
+  jetCollectionTagToken_ =
+      consumes<reco::CaloJetCollection>(conf.getUntrackedParameter<edm::InputTag>("jetCollectionTag"));
+  widejetsCollectionTagToken_ = consumes<std::vector<math::PtEtaPhiMLorentzVector>>(
+      conf.getUntrackedParameter<edm::InputTag>("widejetsCollectionTag"));
+  metCollectionTagToken_ =
+      consumes<reco::CaloMETCollection>(conf.getUntrackedParameter<edm::InputTag>("metCollectionTag"));
+  metCleanCollectionTagToken_ =
+      consumes<reco::CaloMETCollection>(conf.getUntrackedParameter<edm::InputTag>("metCleanCollectionTag"));
 }
 
-DiJetVarAnalyzer::~DiJetVarAnalyzer() {} 
+DiJetVarAnalyzer::~DiJetVarAnalyzer() {}
 
 // Function to book the Monitoring Elements.
-void DiJetVarAnalyzer::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const &, edm::EventSetup const &) {
+void DiJetVarAnalyzer::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, edm::EventSetup const &) {
   ScoutingAnalyzerBase::prepareBooking(iBooker);
   // ==> TO BE UPDATED FOR sqrt(s)=8 TeV
-  const int N_mass_bins=83;
-  float massBins[N_mass_bins+1] = {1, 3, 6, 10, 16, 23, 31, 40, 50, 61, 74, 88, 103, 119, 137, 156, 176, 197, 220, 244, 270, 296, 325, 354, 386, 419, 453, 489, 526, 565, 606, 649, 693, 740, 788, 838, 890, 944, 1000, 1058, 1118, 1181, 1246, 1313, 1383, 1455, 1530, 1607, 1687, 1770, 1856, 1945, 2037, 2132, 2231, 2332, 2438, 2546, 2659, 2775, 2895, 3019, 3147, 3279, 3416, 3558, 3704, 3854, 4010, 4171, 4337, 4509, 4686, 4869, 5058, 5253, 5455, 5663, 5877, 6099, 6328, 6564, 6808, 7000};
+  const int N_mass_bins = 83;
+  float massBins[N_mass_bins + 1] = {
+      1,    3,    6,    10,   16,   23,   31,   40,   50,   61,   74,   88,   103,  119,  137,  156,  176,
+      197,  220,  244,  270,  296,  325,  354,  386,  419,  453,  489,  526,  565,  606,  649,  693,  740,
+      788,  838,  890,  944,  1000, 1058, 1118, 1181, 1246, 1313, 1383, 1455, 1530, 1607, 1687, 1770, 1856,
+      1945, 2037, 2132, 2231, 2332, 2438, 2546, 2659, 2775, 2895, 3019, 3147, 3279, 3416, 3558, 3704, 3854,
+      4010, 4171, 4337, 4509, 4686, 4869, 5058, 5253, 5455, 5663, 5877, 6099, 6328, 6564, 6808, 7000};
 
   // 1D histograms
-  m_cutFlow = bookH1withSumw2(
-      iBooker,
-      "h1_cutFlow",
-      "Cut Flow",
-      7,0.,7.,
-      "Cut",
-      "Number of events"
-      );
-  m_cutFlow->getTH1()->GetXaxis()->SetBinLabel(1,"No cut");
-  m_cutFlow->getTH1()->GetXaxis()->SetBinLabel(2,"N(WideJets)>=2");
-  m_cutFlow->getTH1()->GetXaxis()->SetBinLabel(3,"|#eta|<2.5 , pT>30");
-  m_cutFlow->getTH1()->GetXaxis()->SetBinLabel(4,"|#Delta#eta|<1.3");
-  m_cutFlow->getTH1()->GetXaxis()->SetBinLabel(5,"JetID");
-  m_cutFlow->getTH1()->GetXaxis()->SetBinLabel(6,"|#Delta#phi|>#pi/3");
-  m_cutFlow->getTH1()->GetXaxis()->SetBinLabel(7,"|met-metClean|>0.1");
-
-  m_MjjWide_finalSel = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_finalSel",
-      "M_{jj} WideJets (final selection)",
-      8000,0.,8000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_finalSel_varbin = bookH1withSumw2BinArray(
-      iBooker,
-      "h1_MjjWide_finalSel_varbin",
-      "M_{jj} WideJets (final selection)",
-      N_mass_bins, massBins,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_finalSel_WithoutNoiseFilter = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_finalSel_WithoutNoiseFilter",
-      "M_{jj} WideJets (final selection, without noise filters)",
-      8000,0.,8000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_finalSel_WithoutNoiseFilter_varbin = bookH1withSumw2BinArray(
-      iBooker,
-      "h1_MjjWide_finalSel_WithoutNoiseFilter_varbin",
-      "M_{jj} WideJets (final selection, without noise filters)",
-      N_mass_bins, massBins,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_deta_0p0_0p5 = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_deta_0p0_0p5",
-      "M_{jj} WideJets (0.0<=#Delta#eta<0.5)",
-      8000,0.,8000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_deta_0p5_1p0 = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_deta_0p5_1p0",
-      "M_{jj} WideJets (0.5<=#Delta#eta<1.0)",
-      8000,0.,8000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_deta_1p0_1p5 = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_deta_1p0_1p5",
-      "M_{jj} WideJets (1.0<=#Delta#eta<1.5)",
-      8000,0.,8000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_deta_1p5_2p0 = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_deta_1p5_2p0",
-      "M_{jj} WideJets (1.5<=#Delta#eta<2.0)",
-      8000,0.,8000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_deta_2p0_2p5 = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_deta_2p0_2p5",
-      "M_{jj} WideJets (2.0<=#Delta#eta<2.5)",
-      8000,0.,8000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_deta_2p5_3p0 = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_deta_2p5_3p0",
-      "M_{jj} WideJets (2.5<=#Delta#eta<3.0)",
-      8000,0.,8000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_deta_3p0_inf = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_deta_3p0_inf",
-      "M_{jj} WideJets (#Delta#eta>=3.0)",
-      8000,0.,8000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_den_NOdeta = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_den_NOdeta",
-      "HLT Efficiency Studies (no deta cut)",
-      400,0.,2000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_num_NOdeta = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_num_NOdeta",
-      "HLT Efficiency Studies (no deta cut)",
-      400,0.,2000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_den_detaL4 = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_den_detaL4",
-      "HLT Efficiency Studies (deta cut < 4.0)",
-      400,0.,2000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_num_detaL4 = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_num_detaL4",
-      "HLT Efficiency Studies (deta cut < 4.0)",
-      400,0.,2000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_den_detaL3 = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_den_detaL3",
-      "HLT Efficiency Studies (deta cut < 3.0)",
-      400,0.,2000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_num_detaL3 = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_num_detaL3",
-      "HLT Efficiency Studies (deta cut < 3.0)",
-      400,0.,2000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_den_detaL2 = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_den_detaL2",
-      "HLT Efficiency Studies (deta cut < 2.0)",
-      400,0.,2000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_num_detaL2 = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_num_detaL2",
-      "HLT Efficiency Studies (deta cut < 2.0)",
-      400,0.,2000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_den = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_den",
-      "HLT Efficiency Studies (default deta cut)",
-      400,0.,2000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_MjjWide_num = bookH1withSumw2(
-      iBooker,
-      "h1_MjjWide_num",
-      "HLT Efficiency Studies (default deta cut)",
-      400,0.,2000.,
-      "M_{jj} WideJets [GeV]",
-      "Number of events"
-      );
-
-  m_DetajjWide_finalSel = bookH1withSumw2(
-      iBooker,
-      "h1_DetajjWide_finalSel",
-      "#Delta#eta_{jj} WideJets (final selection)",
-      100,0.,5.,
-      "#Delta#eta_{jj} WideJets",
-      "Number of events"
-      );
-
-  m_DetajjWide = bookH1withSumw2(
-      iBooker,
-      "h1_DetajjWide",
-      "#Delta#eta_{jj} WideJets (final selection except #Delta#eta cut)",
-      100,0.,5.,
-      "#Delta#eta_{jj} WideJets",
-      "Number of events"
-      );
-
-  m_DphijjWide_finalSel = bookH1withSumw2(
-      iBooker,
-      "h1_DphijjWide_finalSel",
-      "#Delta#phi_{jj} WideJets (final selection)",
-      100,0.,TMath::Pi()+0.0001,
-      "#Delta#phi_{jj} WideJets [rad.]",
-      "Number of events"
-      );
-
+  m_cutFlow = bookH1withSumw2(iBooker, "h1_cutFlow", "Cut Flow", 7, 0., 7., "Cut", "Number of events");
+  m_cutFlow->getTH1()->GetXaxis()->SetBinLabel(1, "No cut");
+  m_cutFlow->getTH1()->GetXaxis()->SetBinLabel(2, "N(WideJets)>=2");
+  m_cutFlow->getTH1()->GetXaxis()->SetBinLabel(3, "|#eta|<2.5 , pT>30");
+  m_cutFlow->getTH1()->GetXaxis()->SetBinLabel(4, "|#Delta#eta|<1.3");
+  m_cutFlow->getTH1()->GetXaxis()->SetBinLabel(5, "JetID");
+  m_cutFlow->getTH1()->GetXaxis()->SetBinLabel(6, "|#Delta#phi|>#pi/3");
+  m_cutFlow->getTH1()->GetXaxis()->SetBinLabel(7, "|met-metClean|>0.1");
+
+  m_MjjWide_finalSel = bookH1withSumw2(iBooker,
+                                       "h1_MjjWide_finalSel",
+                                       "M_{jj} WideJets (final selection)",
+                                       8000,
+                                       0.,
+                                       8000.,
+                                       "M_{jj} WideJets [GeV]",
+                                       "Number of events");
+
+  m_MjjWide_finalSel_varbin = bookH1withSumw2BinArray(iBooker,
+                                                      "h1_MjjWide_finalSel_varbin",
+                                                      "M_{jj} WideJets (final selection)",
+                                                      N_mass_bins,
+                                                      massBins,
+                                                      "M_{jj} WideJets [GeV]",
+                                                      "Number of events");
+
+  m_MjjWide_finalSel_WithoutNoiseFilter = bookH1withSumw2(iBooker,
+                                                          "h1_MjjWide_finalSel_WithoutNoiseFilter",
+                                                          "M_{jj} WideJets (final selection, without noise filters)",
+                                                          8000,
+                                                          0.,
+                                                          8000.,
+                                                          "M_{jj} WideJets [GeV]",
+                                                          "Number of events");
+
+  m_MjjWide_finalSel_WithoutNoiseFilter_varbin =
+      bookH1withSumw2BinArray(iBooker,
+                              "h1_MjjWide_finalSel_WithoutNoiseFilter_varbin",
+                              "M_{jj} WideJets (final selection, without noise filters)",
+                              N_mass_bins,
+                              massBins,
+                              "M_{jj} WideJets [GeV]",
+                              "Number of events");
+
+  m_MjjWide_deta_0p0_0p5 = bookH1withSumw2(iBooker,
+                                           "h1_MjjWide_deta_0p0_0p5",
+                                           "M_{jj} WideJets (0.0<=#Delta#eta<0.5)",
+                                           8000,
+                                           0.,
+                                           8000.,
+                                           "M_{jj} WideJets [GeV]",
+                                           "Number of events");
+
+  m_MjjWide_deta_0p5_1p0 = bookH1withSumw2(iBooker,
+                                           "h1_MjjWide_deta_0p5_1p0",
+                                           "M_{jj} WideJets (0.5<=#Delta#eta<1.0)",
+                                           8000,
+                                           0.,
+                                           8000.,
+                                           "M_{jj} WideJets [GeV]",
+                                           "Number of events");
+
+  m_MjjWide_deta_1p0_1p5 = bookH1withSumw2(iBooker,
+                                           "h1_MjjWide_deta_1p0_1p5",
+                                           "M_{jj} WideJets (1.0<=#Delta#eta<1.5)",
+                                           8000,
+                                           0.,
+                                           8000.,
+                                           "M_{jj} WideJets [GeV]",
+                                           "Number of events");
+
+  m_MjjWide_deta_1p5_2p0 = bookH1withSumw2(iBooker,
+                                           "h1_MjjWide_deta_1p5_2p0",
+                                           "M_{jj} WideJets (1.5<=#Delta#eta<2.0)",
+                                           8000,
+                                           0.,
+                                           8000.,
+                                           "M_{jj} WideJets [GeV]",
+                                           "Number of events");
+
+  m_MjjWide_deta_2p0_2p5 = bookH1withSumw2(iBooker,
+                                           "h1_MjjWide_deta_2p0_2p5",
+                                           "M_{jj} WideJets (2.0<=#Delta#eta<2.5)",
+                                           8000,
+                                           0.,
+                                           8000.,
+                                           "M_{jj} WideJets [GeV]",
+                                           "Number of events");
+
+  m_MjjWide_deta_2p5_3p0 = bookH1withSumw2(iBooker,
+                                           "h1_MjjWide_deta_2p5_3p0",
+                                           "M_{jj} WideJets (2.5<=#Delta#eta<3.0)",
+                                           8000,
+                                           0.,
+                                           8000.,
+                                           "M_{jj} WideJets [GeV]",
+                                           "Number of events");
+
+  m_MjjWide_deta_3p0_inf = bookH1withSumw2(iBooker,
+                                           "h1_MjjWide_deta_3p0_inf",
+                                           "M_{jj} WideJets (#Delta#eta>=3.0)",
+                                           8000,
+                                           0.,
+                                           8000.,
+                                           "M_{jj} WideJets [GeV]",
+                                           "Number of events");
+
+  m_MjjWide_den_NOdeta = bookH1withSumw2(iBooker,
+                                         "h1_MjjWide_den_NOdeta",
+                                         "HLT Efficiency Studies (no deta cut)",
+                                         400,
+                                         0.,
+                                         2000.,
+                                         "M_{jj} WideJets [GeV]",
+                                         "Number of events");
+
+  m_MjjWide_num_NOdeta = bookH1withSumw2(iBooker,
+                                         "h1_MjjWide_num_NOdeta",
+                                         "HLT Efficiency Studies (no deta cut)",
+                                         400,
+                                         0.,
+                                         2000.,
+                                         "M_{jj} WideJets [GeV]",
+                                         "Number of events");
+
+  m_MjjWide_den_detaL4 = bookH1withSumw2(iBooker,
+                                         "h1_MjjWide_den_detaL4",
+                                         "HLT Efficiency Studies (deta cut < 4.0)",
+                                         400,
+                                         0.,
+                                         2000.,
+                                         "M_{jj} WideJets [GeV]",
+                                         "Number of events");
+
+  m_MjjWide_num_detaL4 = bookH1withSumw2(iBooker,
+                                         "h1_MjjWide_num_detaL4",
+                                         "HLT Efficiency Studies (deta cut < 4.0)",
+                                         400,
+                                         0.,
+                                         2000.,
+                                         "M_{jj} WideJets [GeV]",
+                                         "Number of events");
+
+  m_MjjWide_den_detaL3 = bookH1withSumw2(iBooker,
+                                         "h1_MjjWide_den_detaL3",
+                                         "HLT Efficiency Studies (deta cut < 3.0)",
+                                         400,
+                                         0.,
+                                         2000.,
+                                         "M_{jj} WideJets [GeV]",
+                                         "Number of events");
+
+  m_MjjWide_num_detaL3 = bookH1withSumw2(iBooker,
+                                         "h1_MjjWide_num_detaL3",
+                                         "HLT Efficiency Studies (deta cut < 3.0)",
+                                         400,
+                                         0.,
+                                         2000.,
+                                         "M_{jj} WideJets [GeV]",
+                                         "Number of events");
+
+  m_MjjWide_den_detaL2 = bookH1withSumw2(iBooker,
+                                         "h1_MjjWide_den_detaL2",
+                                         "HLT Efficiency Studies (deta cut < 2.0)",
+                                         400,
+                                         0.,
+                                         2000.,
+                                         "M_{jj} WideJets [GeV]",
+                                         "Number of events");
+
+  m_MjjWide_num_detaL2 = bookH1withSumw2(iBooker,
+                                         "h1_MjjWide_num_detaL2",
+                                         "HLT Efficiency Studies (deta cut < 2.0)",
+                                         400,
+                                         0.,
+                                         2000.,
+                                         "M_{jj} WideJets [GeV]",
+                                         "Number of events");
+
+  m_MjjWide_den = bookH1withSumw2(iBooker,
+                                  "h1_MjjWide_den",
+                                  "HLT Efficiency Studies (default deta cut)",
+                                  400,
+                                  0.,
+                                  2000.,
+                                  "M_{jj} WideJets [GeV]",
+                                  "Number of events");
+
+  m_MjjWide_num = bookH1withSumw2(iBooker,
+                                  "h1_MjjWide_num",
+                                  "HLT Efficiency Studies (default deta cut)",
+                                  400,
+                                  0.,
+                                  2000.,
+                                  "M_{jj} WideJets [GeV]",
+                                  "Number of events");
+
+  m_DetajjWide_finalSel = bookH1withSumw2(iBooker,
+                                          "h1_DetajjWide_finalSel",
+                                          "#Delta#eta_{jj} WideJets (final selection)",
+                                          100,
+                                          0.,
+                                          5.,
+                                          "#Delta#eta_{jj} WideJets",
+                                          "Number of events");
+
+  m_DetajjWide = bookH1withSumw2(iBooker,
+                                 "h1_DetajjWide",
+                                 "#Delta#eta_{jj} WideJets (final selection except #Delta#eta cut)",
+                                 100,
+                                 0.,
+                                 5.,
+                                 "#Delta#eta_{jj} WideJets",
+                                 "Number of events");
+
+  m_DphijjWide_finalSel = bookH1withSumw2(iBooker,
+                                          "h1_DphijjWide_finalSel",
+                                          "#Delta#phi_{jj} WideJets (final selection)",
+                                          100,
+                                          0.,
+                                          TMath::Pi() + 0.0001,
+                                          "#Delta#phi_{jj} WideJets [rad.]",
+                                          "Number of events");
 
   m_selJets_pt = bookH1withSumw2(
-      iBooker,
-      "h1_selJets_pt",
-      "Selected CaloJets",
-      500,0.,5000.,
-      "Jet Pt [GeV]",
-      "Number of events"
-      );
-
-  m_selJets_eta = bookH1withSumw2(
-      iBooker,
-      "h1_selJets_eta",
-      "Selected CaloJets",
-      100,-5.,5.,
-      "#eta",
-      "Number of events"
-      );
+      iBooker, "h1_selJets_pt", "Selected CaloJets", 500, 0., 5000., "Jet Pt [GeV]", "Number of events");
+
+  m_selJets_eta =
+      bookH1withSumw2(iBooker, "h1_selJets_eta", "Selected CaloJets", 100, -5., 5., "#eta", "Number of events");
 
   m_selJets_phi = bookH1withSumw2(
-      iBooker,
-      "h1_selJets_phi",
-      "Selected CaloJets",
-      100,-TMath::Pi(),TMath::Pi(),
-      "#phi (rad.)",
-      "Number of events"
-      );
-
-  m_selJets_hadEnergyFraction = bookH1withSumw2(
-      iBooker,
-      "h1_selJets_hadEnergyFraction",
-      "Selected CaloJets",
-      110,0.,1.1,
-      "HAD Energy Fraction",
-      "Number of events"
-      );
-
-  m_selJets_emEnergyFraction = bookH1withSumw2(
-      iBooker,
-      "h1_selJets_emEnergyFraction",
-      "Selected CaloJets",
-      110,0.,1.1,
-      "EM Energy Fraction",
-      "Number of events"
-      );
+      iBooker, "h1_selJets_phi", "Selected CaloJets", 100, -TMath::Pi(), TMath::Pi(), "#phi (rad.)", "Number of events");
+
+  m_selJets_hadEnergyFraction = bookH1withSumw2(iBooker,
+                                                "h1_selJets_hadEnergyFraction",
+                                                "Selected CaloJets",
+                                                110,
+                                                0.,
+                                                1.1,
+                                                "HAD Energy Fraction",
+                                                "Number of events");
+
+  m_selJets_emEnergyFraction = bookH1withSumw2(iBooker,
+                                               "h1_selJets_emEnergyFraction",
+                                               "Selected CaloJets",
+                                               110,
+                                               0.,
+                                               1.1,
+                                               "EM Energy Fraction",
+                                               "Number of events");
 
   m_selJets_towersArea = bookH1withSumw2(
-      iBooker,
-      "h1_selJets_towersArea",
-      "Selected CaloJets",
-      200,0.,2.,
-      "towers area",
-      "Number of events"
-      );
+      iBooker, "h1_selJets_towersArea", "Selected CaloJets", 200, 0., 2., "towers area", "Number of events");
 
   m_metDiff = bookH1withSumw2(
-      iBooker,
-      "h1_metDiff",
-      "Met - MetCleaned",
-      500,-1000.,1000.,
-      "met - metcleaned [GeV]",
-      "Number of events"
-      );
-
-  m_metCases = bookH1withSumw2(
-      iBooker,
-      "h1_metCases",
-      "Met cases",
-      3,0.,3.,
-      "case",
-      "Number of events"
-      );
-  m_metCases->getTH1()->GetXaxis()->SetBinLabel(1,"met , metclean");
-  m_metCases->getTH1()->GetXaxis()->SetBinLabel(2,"met , !metclean");
-  m_metCases->getTH1()->GetXaxis()->SetBinLabel(3,"!met , metclean");
+      iBooker, "h1_metDiff", "Met - MetCleaned", 500, -1000., 1000., "met - metcleaned [GeV]", "Number of events");
+
+  m_metCases = bookH1withSumw2(iBooker, "h1_metCases", "Met cases", 3, 0., 3., "case", "Number of events");
+  m_metCases->getTH1()->GetXaxis()->SetBinLabel(1, "met , metclean");
+  m_metCases->getTH1()->GetXaxis()->SetBinLabel(2, "met , !metclean");
+  m_metCases->getTH1()->GetXaxis()->SetBinLabel(3, "!met , metclean");
 
   m_metCaseNoMetClean = bookH1withSumw2(
-      iBooker,
-      "h1_metCaseNoMetClean",
-      "Met - MetCleaned",
-      1000,0.,2000.,
-      "MET [GeV]",
-      "Number of events"
-      );  
-
-  m_HT_inclusive = bookH1withSumw2(
-      iBooker,
-      "h1_HT_inclusive",
-      "HT (inclusive)",
-      150,0.,15000.,
-      "HT [GeV]",
-      "Number of events"
-      );  
+      iBooker, "h1_metCaseNoMetClean", "Met - MetCleaned", 1000, 0., 2000., "MET [GeV]", "Number of events");
+
+  m_HT_inclusive =
+      bookH1withSumw2(iBooker, "h1_HT_inclusive", "HT (inclusive)", 150, 0., 15000., "HT [GeV]", "Number of events");
 
   m_HT_finalSel = bookH1withSumw2(
-      iBooker,
-      "h1_HT_finalSel",
-      "HT (final selection)",
-      150,0.,15000.,
-      "HT [GeV]",
-      "Number of events"
-      );  
+      iBooker, "h1_HT_finalSel", "HT (final selection)", 150, 0., 15000., "HT [GeV]", "Number of events");
 
   // 2D histograms
-  m_DetajjVsMjjWide = bookH2withSumw2(
-      iBooker,
-      "h2_DetajjVsMjjWide",
-      "#Delta#eta_{jj} vs M_{jj} WideJets",
-      8000,0.,8000.,
-      100,0.,5.,
-      "M_{jj} WideJets [GeV]",
-      "#Delta#eta_{jj} WideJets");
-
-  m_DetajjVsMjjWide_rebin = bookH2withSumw2(
-      iBooker,
-      "h2_DetajjVsMjjWide_rebin",
-      "#Delta#eta_{jj} vs M_{jj} WideJets",
-      400,0.,8000.,
-      50,0.,5.,
-      "M_{jj} WideJets [GeV]",
-      "#Delta#eta_{jj} WideJets");
+  m_DetajjVsMjjWide = bookH2withSumw2(iBooker,
+                                      "h2_DetajjVsMjjWide",
+                                      "#Delta#eta_{jj} vs M_{jj} WideJets",
+                                      8000,
+                                      0.,
+                                      8000.,
+                                      100,
+                                      0.,
+                                      5.,
+                                      "M_{jj} WideJets [GeV]",
+                                      "#Delta#eta_{jj} WideJets");
+
+  m_DetajjVsMjjWide_rebin = bookH2withSumw2(iBooker,
+                                            "h2_DetajjVsMjjWide_rebin",
+                                            "#Delta#eta_{jj} vs M_{jj} WideJets",
+                                            400,
+                                            0.,
+                                            8000.,
+                                            50,
+                                            0.,
+                                            5.,
+                                            "M_{jj} WideJets [GeV]",
+                                            "#Delta#eta_{jj} WideJets");
 
   m_metVSmetclean = bookH2withSumw2(
-      iBooker,
-      "h2_metVSmetclean",
-      "MET clean vs MET",
-      100,0.,2000.,
-      100,0.,2000.,
-      "MET [GeV]",
-      "MET clean [GeV]");
+      iBooker, "h2_metVSmetclean", "MET clean vs MET", 100, 0., 2000., 100, 0., 2000., "MET [GeV]", "MET clean [GeV]");
 }
 
 // Usual analyze method
-void DiJetVarAnalyzer::analyze( const edm::Event & iEvent, const edm::EventSetup & c ) {
+void DiJetVarAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &c) {
   using namespace std;
   using namespace edm;
   using namespace reco;
 
   // ## Get jet collection
   edm::Handle<reco::CaloJetCollection> calojets_handle;
-  iEvent.getByToken(jetCollectionTagToken_,calojets_handle);
+  iEvent.getByToken(jetCollectionTagToken_, calojets_handle);
 
-  // Loop over all the selected jets ( defined at DQM/DataScouting/python/dijetScouting_cff.py )  
+  // Loop over all the selected jets ( defined at
+  // DQM/DataScouting/python/dijetScouting_cff.py )
   double thisHT = 0.;
-  for(reco::CaloJetCollection::const_iterator it = calojets_handle->begin(); it != calojets_handle->end(); ++it)
-  {
-    //cout << "== jet: " << it->pt() << " " << it->eta() << " " << it->phi() << endl;
-    m_selJets_pt->Fill( it->pt() );
-    m_selJets_eta->Fill( it->eta() );
-    m_selJets_phi->Fill( it->phi() );
-    m_selJets_hadEnergyFraction->Fill( it->energyFractionHadronic() );
-    m_selJets_emEnergyFraction->Fill( it->emEnergyFraction() );
-    m_selJets_towersArea->Fill( it->towersArea() );
+  for (reco::CaloJetCollection::const_iterator it = calojets_handle->begin(); it != calojets_handle->end(); ++it) {
+    // cout << "== jet: " << it->pt() << " " << it->eta() << " " << it->phi() <<
+    // endl;
+    m_selJets_pt->Fill(it->pt());
+    m_selJets_eta->Fill(it->eta());
+    m_selJets_phi->Fill(it->phi());
+    m_selJets_hadEnergyFraction->Fill(it->energyFractionHadronic());
+    m_selJets_emEnergyFraction->Fill(it->emEnergyFraction());
+    m_selJets_towersArea->Fill(it->towersArea());
     thisHT += it->pt();
   }
 
   // HT
-  m_HT_inclusive->Fill(thisHT);      
+  m_HT_inclusive->Fill(thisHT);
 
-  // ## Get widejets 
-  edm::Handle< vector<math::PtEtaPhiMLorentzVector> > widejets_handle;
+  // ## Get widejets
+  edm::Handle<vector<math::PtEtaPhiMLorentzVector>> widejets_handle;
   iEvent.getByToken(widejetsCollectionTagToken_, widejets_handle);
 
   TLorentzVector wj1;
@@ -454,20 +401,18 @@ void DiJetVarAnalyzer::analyze( const edm::Event & iEvent, const edm::EventSetup
   double DeltaEtaJJWide = -1;
   double DeltaPhiJJWide = -1;
 
-  if( widejets_handle->size() >= 2 ) {
+  if (widejets_handle->size() >= 2) {
     wj1.SetPtEtaPhiM(widejets_handle->at(0).pt(),
-        widejets_handle->at(0).eta(),
-        widejets_handle->at(0).phi(),
-        widejets_handle->at(0).mass()
-        );
+                     widejets_handle->at(0).eta(),
+                     widejets_handle->at(0).phi(),
+                     widejets_handle->at(0).mass());
     wj2.SetPtEtaPhiM(widejets_handle->at(1).pt(),
-        widejets_handle->at(1).eta(),
-        widejets_handle->at(1).phi(),
-        widejets_handle->at(1).mass()
-        );
+                     widejets_handle->at(1).eta(),
+                     widejets_handle->at(1).phi(),
+                     widejets_handle->at(1).mass());
     wdijet = wj1 + wj2;
     MJJWide = wdijet.M();
-    DeltaEtaJJWide = fabs(wj1.Eta()-wj2.Eta());
+    DeltaEtaJJWide = fabs(wj1.Eta() - wj2.Eta());
     DeltaPhiJJWide = fabs(wj1.DeltaPhi(wj2));
   }
 
@@ -479,170 +424,167 @@ void DiJetVarAnalyzer::analyze( const edm::Event & iEvent, const edm::EventSetup
   edm::Handle<reco::CaloMETCollection> calometClean_handle;
   iEvent.getByToken(metCleanCollectionTagToken_, calometClean_handle);
 
-  if( calomet_handle.isValid() && calometClean_handle.isValid() ) {
-    //       std::cout << "---" << std::endl;
-    //       std::cout << "== calomet: " << (calomet_handle->front()).pt() << " " << (calomet_handle->front()).phi() << std::endl;
-    //       std::cout << "== calometClean: " << (calometClean_handle->front()).pt() << " " << (calometClean_handle->front()).phi() << std::endl;
-    //       std::cout << "== calomet - calometClean: " << (calomet_handle->front()).pt() - (calometClean_handle->front()).pt() << std::endl;
+  if (calomet_handle.isValid() && calometClean_handle.isValid()) {
     //       std::cout << "---" << std::endl;
+    //       std::cout << "== calomet: " << (calomet_handle->front()).pt() << "
+    //       " << (calomet_handle->front()).phi() << std::endl; std::cout << "==
+    //       calometClean: " << (calometClean_handle->front()).pt() << " " <<
+    //       (calometClean_handle->front()).phi() << std::endl; std::cout << "==
+    //       calomet - calometClean: " << (calomet_handle->front()).pt() -
+    //       (calometClean_handle->front()).pt() << std::endl; std::cout <<
+    //       "---" << std::endl;
     m_metCases->Fill(0);
-    m_metDiff->Fill( (calomet_handle->front()).pt() - (calometClean_handle->front()).pt() );
-    m_metVSmetclean->Fill( (calomet_handle->front()).pt() , (calometClean_handle->front()).pt() );      
-  }
-  else if( calomet_handle.isValid() && !calometClean_handle.isValid() )
-  {
+    m_metDiff->Fill((calomet_handle->front()).pt() - (calometClean_handle->front()).pt());
+    m_metVSmetclean->Fill((calomet_handle->front()).pt(), (calometClean_handle->front()).pt());
+  } else if (calomet_handle.isValid() && !calometClean_handle.isValid()) {
     m_metCases->Fill(1);
     m_metCaseNoMetClean->Fill((calomet_handle->front()).pt());
-  }
-  else if( !calomet_handle.isValid() && calometClean_handle.isValid() )
-  {
+  } else if (!calomet_handle.isValid() && calometClean_handle.isValid()) {
     m_metCases->Fill(2);
   }
 
   // ## Event Selection
-  bool pass_nocut=false;
-  bool pass_twowidejets=false;
-  bool pass_etaptcuts=false;
-  bool pass_deta=false;
-  bool pass_JetIDtwojets=true;
-  bool pass_dphi=false;
-  bool pass_metFilter=true;
+  bool pass_nocut = false;
+  bool pass_twowidejets = false;
+  bool pass_etaptcuts = false;
+  bool pass_deta = false;
+  bool pass_JetIDtwojets = true;
+  bool pass_dphi = false;
+  bool pass_metFilter = true;
   //--
-  bool pass_deta_L4=false;
-  bool pass_deta_L3=false;
-  bool pass_deta_L2=false;
+  bool pass_deta_L4 = false;
+  bool pass_deta_L3 = false;
+  bool pass_deta_L2 = false;
 
-  bool pass_fullsel_NOdeta=false;
-  bool pass_fullsel_detaL4=false;
-  bool pass_fullsel_detaL3=false;
-  bool pass_fullsel_detaL2=false;
-  bool pass_fullsel=false;
+  bool pass_fullsel_NOdeta = false;
+  bool pass_fullsel_detaL4 = false;
+  bool pass_fullsel_detaL3 = false;
+  bool pass_fullsel_detaL2 = false;
+  bool pass_fullsel = false;
 
   // No cut
-  pass_nocut=true;
+  pass_nocut = true;
 
   // Two wide jets
-  if( widejets_handle->size() >= numwidejets_ ) {
+  if (widejets_handle->size() >= numwidejets_) {
     // Two wide jets
-    pass_twowidejets=true;
+    pass_twowidejets = true;
 
     // Eta/pt cuts
-    if( fabs(wj1.Eta())<etawidejets_ && wj1.Pt()>ptwidejets_ 
-        &&
-        fabs(wj2.Eta())<etawidejets_ && wj2.Pt()>ptwidejets_
-      ) {
-      pass_etaptcuts=true;
+    if (fabs(wj1.Eta()) < etawidejets_ && wj1.Pt() > ptwidejets_ && fabs(wj2.Eta()) < etawidejets_ &&
+        wj2.Pt() > ptwidejets_) {
+      pass_etaptcuts = true;
     }
 
     // Deta cut
-    if( DeltaEtaJJWide < detawidejets_ )
-      pass_deta=true;
+    if (DeltaEtaJJWide < detawidejets_)
+      pass_deta = true;
 
     // Dphi cut
-    if( DeltaPhiJJWide > dphiwidejets_ )
-      pass_dphi=true;
+    if (DeltaPhiJJWide > dphiwidejets_)
+      pass_dphi = true;
 
     // Other Deta cuts
-    if( DeltaEtaJJWide < 4.0 )
-      pass_deta_L4=true;
+    if (DeltaEtaJJWide < 4.0)
+      pass_deta_L4 = true;
 
-    if( DeltaEtaJJWide < 3.0 )
-      pass_deta_L3=true;
+    if (DeltaEtaJJWide < 3.0)
+      pass_deta_L3 = true;
 
-    if( DeltaEtaJJWide < 2.0 )
-      pass_deta_L2=true;
+    if (DeltaEtaJJWide < 2.0)
+      pass_deta_L2 = true;
   }
   // Jet id two leading jets
-  if( calojets_handle->size() >= numwidejets_ )
-  {
+  if (calojets_handle->size() >= numwidejets_) {
     //   first jet
     reco::CaloJetCollection::const_iterator thisJet = calojets_handle->begin();
-    //cout << "== thisJet1: " << thisJet->pt() << " " << thisJet->eta() << " " << thisJet->phi() << endl;
-    if( thisJet->energyFractionHadronic()>maxHADfraction_ || thisJet->emEnergyFraction()>maxEMfraction_ )
-      pass_JetIDtwojets=false;
+    // cout << "== thisJet1: " << thisJet->pt() << " " << thisJet->eta() << " "
+    // << thisJet->phi() << endl;
+    if (thisJet->energyFractionHadronic() > maxHADfraction_ || thisJet->emEnergyFraction() > maxEMfraction_)
+      pass_JetIDtwojets = false;
 
     //   second jet
     ++thisJet;
-    //cout << "== thisJet2: " << thisJet->pt() << " " << thisJet->eta() << " " << thisJet->phi() << endl;
-    if( thisJet->energyFractionHadronic()>maxHADfraction_ || thisJet->emEnergyFraction()>maxEMfraction_ )
-      pass_JetIDtwojets=false;
-  }      
+    // cout << "== thisJet2: " << thisJet->pt() << " " << thisJet->eta() << " "
+    // << thisJet->phi() << endl;
+    if (thisJet->energyFractionHadronic() > maxHADfraction_ || thisJet->emEnergyFraction() > maxEMfraction_)
+      pass_JetIDtwojets = false;
+  }
   // Met filter
-  if( calomet_handle.isValid() && calometClean_handle.isValid() )
-  {
-    if( fabs ( (calomet_handle->front()).pt() - (calometClean_handle->front()).pt() ) > 0.1 )
-      pass_metFilter=false;
+  if (calomet_handle.isValid() && calometClean_handle.isValid()) {
+    if (fabs((calomet_handle->front()).pt() - (calometClean_handle->front()).pt()) > 0.1)
+      pass_metFilter = false;
   }
   // Full selection (no deta cut)
-  if( pass_nocut && pass_twowidejets && pass_etaptcuts && pass_JetIDtwojets && pass_dphi && pass_metFilter )
-    pass_fullsel_NOdeta=true;
+  if (pass_nocut && pass_twowidejets && pass_etaptcuts && pass_JetIDtwojets && pass_dphi && pass_metFilter)
+    pass_fullsel_NOdeta = true;
   // Full selection (various deta cuts)
-  if( pass_nocut && pass_twowidejets && pass_etaptcuts && pass_JetIDtwojets && pass_dphi && pass_metFilter && pass_deta_L4 )
-    pass_fullsel_detaL4=true;
-  if( pass_nocut && pass_twowidejets && pass_etaptcuts && pass_JetIDtwojets && pass_dphi && pass_metFilter && pass_deta_L3 )
-    pass_fullsel_detaL3=true;
-  if( pass_nocut && pass_twowidejets && pass_etaptcuts && pass_JetIDtwojets && pass_dphi && pass_metFilter && pass_deta_L2 )
-    pass_fullsel_detaL2=true;
+  if (pass_nocut && pass_twowidejets && pass_etaptcuts && pass_JetIDtwojets && pass_dphi && pass_metFilter &&
+      pass_deta_L4)
+    pass_fullsel_detaL4 = true;
+  if (pass_nocut && pass_twowidejets && pass_etaptcuts && pass_JetIDtwojets && pass_dphi && pass_metFilter &&
+      pass_deta_L3)
+    pass_fullsel_detaL3 = true;
+  if (pass_nocut && pass_twowidejets && pass_etaptcuts && pass_JetIDtwojets && pass_dphi && pass_metFilter &&
+      pass_deta_L2)
+    pass_fullsel_detaL2 = true;
   // Full selection (default deta cut)
-  if( pass_nocut && pass_twowidejets && pass_etaptcuts && pass_deta && pass_JetIDtwojets && pass_dphi && pass_metFilter )
-    pass_fullsel=true;
+  if (pass_nocut && pass_twowidejets && pass_etaptcuts && pass_deta && pass_JetIDtwojets && pass_dphi && pass_metFilter)
+    pass_fullsel = true;
 
-  // ## Fill Histograms 
+  // ## Fill Histograms
   // Cut-flow plot
-  if( pass_nocut )
+  if (pass_nocut)
     m_cutFlow->Fill(0);
-  if( pass_nocut && pass_twowidejets )
+  if (pass_nocut && pass_twowidejets)
     m_cutFlow->Fill(1);
-  if( pass_nocut && pass_twowidejets && pass_etaptcuts )
+  if (pass_nocut && pass_twowidejets && pass_etaptcuts)
     m_cutFlow->Fill(2);
-  if( pass_nocut && pass_twowidejets && pass_etaptcuts && pass_deta )
+  if (pass_nocut && pass_twowidejets && pass_etaptcuts && pass_deta)
     m_cutFlow->Fill(3);
-  if( pass_nocut && pass_twowidejets && pass_etaptcuts && pass_deta && pass_JetIDtwojets )
+  if (pass_nocut && pass_twowidejets && pass_etaptcuts && pass_deta && pass_JetIDtwojets)
     m_cutFlow->Fill(4);
-  if( pass_nocut && pass_twowidejets && pass_etaptcuts && pass_deta && pass_JetIDtwojets && pass_dphi )
+  if (pass_nocut && pass_twowidejets && pass_etaptcuts && pass_deta && pass_JetIDtwojets && pass_dphi)
     m_cutFlow->Fill(5);
-  if( pass_fullsel )
+  if (pass_fullsel)
     m_cutFlow->Fill(6);
 
   // After full selection
-  if( pass_fullsel ) 
-  {
+  if (pass_fullsel) {
     // 1D histograms
     m_MjjWide_finalSel->Fill(MJJWide);
     m_MjjWide_finalSel_varbin->Fill(MJJWide);
     m_DetajjWide_finalSel->Fill(DeltaEtaJJWide);
-    m_DphijjWide_finalSel->Fill(DeltaPhiJJWide);      
-    m_HT_finalSel->Fill(thisHT);      
-  }      
+    m_DphijjWide_finalSel->Fill(DeltaPhiJJWide);
+    m_HT_finalSel->Fill(thisHT);
+  }
   // After full selection (without "noise" filters)
-  if( pass_nocut && pass_twowidejets && pass_etaptcuts && pass_deta )
-  {
+  if (pass_nocut && pass_twowidejets && pass_etaptcuts && pass_deta) {
     m_MjjWide_finalSel_WithoutNoiseFilter->Fill(MJJWide);
     m_MjjWide_finalSel_WithoutNoiseFilter_varbin->Fill(MJJWide);
   }
   // After full selection (except DeltaEta cut)
-  if( pass_fullsel_NOdeta )
-  {
+  if (pass_fullsel_NOdeta) {
     // 1D histograms
     m_DetajjWide->Fill(DeltaEtaJJWide);
-    if( DeltaEtaJJWide >= 0.0 && DeltaEtaJJWide < 0.5 )
+    if (DeltaEtaJJWide >= 0.0 && DeltaEtaJJWide < 0.5)
       m_MjjWide_deta_0p0_0p5->Fill(MJJWide);
-    if( DeltaEtaJJWide >= 0.5 && DeltaEtaJJWide < 1.0 )
+    if (DeltaEtaJJWide >= 0.5 && DeltaEtaJJWide < 1.0)
       m_MjjWide_deta_0p5_1p0->Fill(MJJWide);
-    if( DeltaEtaJJWide >= 1.0 && DeltaEtaJJWide < 1.5 )
+    if (DeltaEtaJJWide >= 1.0 && DeltaEtaJJWide < 1.5)
       m_MjjWide_deta_1p0_1p5->Fill(MJJWide);
-    if( DeltaEtaJJWide >= 1.5 && DeltaEtaJJWide < 2.0 )
+    if (DeltaEtaJJWide >= 1.5 && DeltaEtaJJWide < 2.0)
       m_MjjWide_deta_1p5_2p0->Fill(MJJWide);
-    if( DeltaEtaJJWide >= 2.0 && DeltaEtaJJWide < 2.5 )
+    if (DeltaEtaJJWide >= 2.0 && DeltaEtaJJWide < 2.5)
       m_MjjWide_deta_2p0_2p5->Fill(MJJWide);
-    if( DeltaEtaJJWide >= 2.5 && DeltaEtaJJWide < 3.0 )
+    if (DeltaEtaJJWide >= 2.5 && DeltaEtaJJWide < 3.0)
       m_MjjWide_deta_2p5_3p0->Fill(MJJWide);
-    if( DeltaEtaJJWide >= 3.0 )
+    if (DeltaEtaJJWide >= 3.0)
       m_MjjWide_deta_3p0_inf->Fill(MJJWide);
 
     // 2D histograms
-    m_DetajjVsMjjWide->Fill(MJJWide,DeltaEtaJJWide);            
-    m_DetajjVsMjjWide_rebin->Fill(MJJWide,DeltaEtaJJWide);
+    m_DetajjVsMjjWide->Fill(MJJWide, DeltaEtaJJWide);
+    m_DetajjVsMjjWide_rebin->Fill(MJJWide, DeltaEtaJJWide);
   }
 
   // ## Get Trigger Info
@@ -652,12 +594,13 @@ void DiJetVarAnalyzer::analyze( const edm::Event & iEvent, const edm::EventSetup
   //  DST_L1HTT_Or_L1MultiJet_v1
   //  DST_Mu5_HT250_v1
   //  DST_Ele8_CaloIdL_CaloIsoVL_TrkIdVL_TrkIsoVL_HT250_v1
-  int HLTpathMain_fired    = -1;
+  int HLTpathMain_fired = -1;
   int HLTpathMonitor_fired = -1;
   if (HLTpathMain_ and HLTpathMonitor_ and triggerConfiguration_.setEvent(iEvent, c)) {
     // invalid HLT configuration, skip the processing
 
-    // if the L1 or HLT configurations have changed, (re)initialize the filters (including during the first event)
+    // if the L1 or HLT configurations have changed, (re)initialize the filters
+    // (including during the first event)
     if (triggerConfiguration_.configurationUpdated()) {
       HLTpathMain_->init(triggerConfiguration_);
       HLTpathMonitor_->init(triggerConfiguration_);
@@ -668,71 +611,62 @@ void DiJetVarAnalyzer::analyze( const edm::Event & iEvent, const edm::EventSetup
       // std::cout << "HLTpathMonitor: " << *HLTpathMonitor_ << std::endl;
     }
 
-    HLTpathMain_fired    = (*HLTpathMain_)(triggerConfiguration_);
+    HLTpathMain_fired = (*HLTpathMain_)(triggerConfiguration_);
     HLTpathMonitor_fired = (*HLTpathMonitor_)(triggerConfiguration_);
 
     // The OR of the two should always be "1"
-    // std::cout << *HLTpathMain_ << ": " << HLTpathMain_fired << " -- " << *HLTpathMonitor_ << ": " << HLTpathMonitor_fired << std::endl;
+    // std::cout << *HLTpathMain_ << ": " << HLTpathMain_fired << " -- " <<
+    // *HLTpathMonitor_ << ": " << HLTpathMonitor_fired << std::endl;
   }
 
   // ## Trigger Efficiency Curves
 
-  //denominator - full sel NO deta cut
-  if( pass_fullsel_NOdeta && HLTpathMonitor_fired == 1 )
-  {
+  // denominator - full sel NO deta cut
+  if (pass_fullsel_NOdeta && HLTpathMonitor_fired == 1) {
     m_MjjWide_den_NOdeta->Fill(MJJWide);
 
-    //numerator  
-    if( HLTpathMain_fired == 1)
-    {
+    // numerator
+    if (HLTpathMain_fired == 1) {
       m_MjjWide_num_NOdeta->Fill(MJJWide);
     }
   }
 
-  //denominator - full sel deta < 4.0
-  if( pass_fullsel_detaL4 && HLTpathMonitor_fired == 1 )
-  {
+  // denominator - full sel deta < 4.0
+  if (pass_fullsel_detaL4 && HLTpathMonitor_fired == 1) {
     m_MjjWide_den_detaL4->Fill(MJJWide);
 
-    //numerator  
-    if( HLTpathMain_fired == 1)
-    {
+    // numerator
+    if (HLTpathMain_fired == 1) {
       m_MjjWide_num_detaL4->Fill(MJJWide);
     }
   }
 
-  //denominator - full sel deta < 3.0
-  if( pass_fullsel_detaL3 && HLTpathMonitor_fired == 1 )
-  {
+  // denominator - full sel deta < 3.0
+  if (pass_fullsel_detaL3 && HLTpathMonitor_fired == 1) {
     m_MjjWide_den_detaL3->Fill(MJJWide);
 
-    //numerator  
-    if( HLTpathMain_fired == 1)
-    {
+    // numerator
+    if (HLTpathMain_fired == 1) {
       m_MjjWide_num_detaL3->Fill(MJJWide);
     }
   }
 
-  //denominator - full sel deta < 2.0
-  if( pass_fullsel_detaL2 && HLTpathMonitor_fired == 1 )
-  {
+  // denominator - full sel deta < 2.0
+  if (pass_fullsel_detaL2 && HLTpathMonitor_fired == 1) {
     m_MjjWide_den_detaL2->Fill(MJJWide);
 
-    //numerator  
-    if( HLTpathMain_fired == 1)
-    {
+    // numerator
+    if (HLTpathMain_fired == 1) {
       m_MjjWide_num_detaL2->Fill(MJJWide);
     }
   }
 
-  //denominator - full sel default deta cut (typically 1.3)
-  if( pass_fullsel && HLTpathMonitor_fired == 1 )
-  {
+  // denominator - full sel default deta cut (typically 1.3)
+  if (pass_fullsel && HLTpathMonitor_fired == 1) {
     m_MjjWide_den->Fill(MJJWide);
 
-    //numerator  
-    if( HLTpathMain_fired == 1)
-    {
+    // numerator
+    if (HLTpathMain_fired == 1) {
       m_MjjWide_num->Fill(MJJWide);
     }
   }
diff --git a/DQM/DataScouting/plugins/DiJetVarAnalyzer.h b/DQM/DataScouting/plugins/DiJetVarAnalyzer.h
index 74680d7a3d08f..7350fcbaa6b0e 100644
--- a/DQM/DataScouting/plugins/DiJetVarAnalyzer.h
+++ b/DQM/DataScouting/plugins/DiJetVarAnalyzer.h
@@ -2,95 +2,96 @@
 #define DiJetVarAnalyzer_h
 
 #include "DQM/DataScouting/interface/ScoutingAnalyzerBase.h"
-#include "HLTrigger/HLTcore/interface/TriggerExpressionData.h"
-#include "HLTrigger/HLTcore/interface/TriggerExpressionEvaluator.h"
 #include "DataFormats/JetReco/interface/CaloJetCollection.h"
 #include "DataFormats/METReco/interface/CaloMETCollection.h"
+#include "HLTrigger/HLTcore/interface/TriggerExpressionData.h"
+#include "HLTrigger/HLTcore/interface/TriggerExpressionEvaluator.h"
 
 #include "TLorentzVector.h"
-#include <vector>
 #include <cmath>
+#include <vector>
 
 class DiJetVarAnalyzer : public ScoutingAnalyzerBase {
-  public:
-    explicit DiJetVarAnalyzer( const edm::ParameterSet &  ) ;
-    ~DiJetVarAnalyzer() override ;
-    void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-    void analyze( const edm::Event & , const edm::EventSetup &  ) override;
-  private: 
-    edm::InputTag jetCollectionTag_;
-    edm::InputTag widejetsCollectionTag_;
-    edm::InputTag metCollectionTag_;
-    edm::InputTag metCleanCollectionTag_;
-    edm::InputTag hltInputTag_;
+public:
+  explicit DiJetVarAnalyzer(const edm::ParameterSet &);
+  ~DiJetVarAnalyzer() override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+
+private:
+  edm::InputTag jetCollectionTag_;
+  edm::InputTag widejetsCollectionTag_;
+  edm::InputTag metCollectionTag_;
+  edm::InputTag metCleanCollectionTag_;
+  edm::InputTag hltInputTag_;
 
-    unsigned int     numwidejets_;    
-    double  etawidejets_;
-    double  ptwidejets_;
-    double  detawidejets_;
-    double  dphiwidejets_;
-    double  maxEMfraction_;
-    double  maxHADfraction_;
+  unsigned int numwidejets_;
+  double etawidejets_;
+  double ptwidejets_;
+  double detawidejets_;
+  double dphiwidejets_;
+  double maxEMfraction_;
+  double maxHADfraction_;
 
-    // trigger conditions
-    triggerExpression::Evaluator * HLTpathMain_;
-    triggerExpression::Evaluator * HLTpathMonitor_;
-    // cache some data from the Event for faster access by the trigger conditions
-    triggerExpression::Data triggerConfiguration_;
-    //1D histograms
-    MonitorElement * m_cutFlow;
-    MonitorElement * m_MjjWide_finalSel;
-    MonitorElement * m_MjjWide_finalSel_varbin;
-    MonitorElement * m_MjjWide_finalSel_WithoutNoiseFilter;
-    MonitorElement * m_MjjWide_finalSel_WithoutNoiseFilter_varbin;    
-    MonitorElement * m_MjjWide_deta_0p0_0p5;
-    MonitorElement * m_MjjWide_deta_0p5_1p0;
-    MonitorElement * m_MjjWide_deta_1p0_1p5;
-    MonitorElement * m_MjjWide_deta_1p5_2p0;
-    MonitorElement * m_MjjWide_deta_2p0_2p5;
-    MonitorElement * m_MjjWide_deta_2p5_3p0;
-    MonitorElement * m_MjjWide_deta_3p0_inf;
+  // trigger conditions
+  triggerExpression::Evaluator *HLTpathMain_;
+  triggerExpression::Evaluator *HLTpathMonitor_;
+  // cache some data from the Event for faster access by the trigger conditions
+  triggerExpression::Data triggerConfiguration_;
+  // 1D histograms
+  MonitorElement *m_cutFlow;
+  MonitorElement *m_MjjWide_finalSel;
+  MonitorElement *m_MjjWide_finalSel_varbin;
+  MonitorElement *m_MjjWide_finalSel_WithoutNoiseFilter;
+  MonitorElement *m_MjjWide_finalSel_WithoutNoiseFilter_varbin;
+  MonitorElement *m_MjjWide_deta_0p0_0p5;
+  MonitorElement *m_MjjWide_deta_0p5_1p0;
+  MonitorElement *m_MjjWide_deta_1p0_1p5;
+  MonitorElement *m_MjjWide_deta_1p5_2p0;
+  MonitorElement *m_MjjWide_deta_2p0_2p5;
+  MonitorElement *m_MjjWide_deta_2p5_3p0;
+  MonitorElement *m_MjjWide_deta_3p0_inf;
 
-    MonitorElement * m_DetajjWide_finalSel;
-    MonitorElement * m_DetajjWide;
+  MonitorElement *m_DetajjWide_finalSel;
+  MonitorElement *m_DetajjWide;
 
-    MonitorElement * m_DphijjWide_finalSel;
+  MonitorElement *m_DphijjWide_finalSel;
 
-    MonitorElement * m_selJets_pt; 
-    MonitorElement * m_selJets_eta;
-    MonitorElement * m_selJets_phi;
-    MonitorElement * m_selJets_hadEnergyFraction;
-    MonitorElement * m_selJets_emEnergyFraction;
-    MonitorElement * m_selJets_towersArea;
+  MonitorElement *m_selJets_pt;
+  MonitorElement *m_selJets_eta;
+  MonitorElement *m_selJets_phi;
+  MonitorElement *m_selJets_hadEnergyFraction;
+  MonitorElement *m_selJets_emEnergyFraction;
+  MonitorElement *m_selJets_towersArea;
 
-    MonitorElement * m_MjjWide_den_NOdeta;
-    MonitorElement * m_MjjWide_num_NOdeta;
-    MonitorElement * m_MjjWide_den_detaL4;
-    MonitorElement * m_MjjWide_num_detaL4;
-    MonitorElement * m_MjjWide_den_detaL3;
-    MonitorElement * m_MjjWide_num_detaL3;
-    MonitorElement * m_MjjWide_den_detaL2;
-    MonitorElement * m_MjjWide_num_detaL2;
-    MonitorElement * m_MjjWide_den;
-    MonitorElement * m_MjjWide_num;
+  MonitorElement *m_MjjWide_den_NOdeta;
+  MonitorElement *m_MjjWide_num_NOdeta;
+  MonitorElement *m_MjjWide_den_detaL4;
+  MonitorElement *m_MjjWide_num_detaL4;
+  MonitorElement *m_MjjWide_den_detaL3;
+  MonitorElement *m_MjjWide_num_detaL3;
+  MonitorElement *m_MjjWide_den_detaL2;
+  MonitorElement *m_MjjWide_num_detaL2;
+  MonitorElement *m_MjjWide_den;
+  MonitorElement *m_MjjWide_num;
 
-    MonitorElement * m_metCases;
-    MonitorElement * m_metDiff;
-    MonitorElement * m_metCaseNoMetClean;
+  MonitorElement *m_metCases;
+  MonitorElement *m_metDiff;
+  MonitorElement *m_metCaseNoMetClean;
 
-    MonitorElement * m_HT_inclusive;
-    MonitorElement * m_HT_finalSel;
+  MonitorElement *m_HT_inclusive;
+  MonitorElement *m_HT_finalSel;
 
-    //2D histograms
-    MonitorElement * m_DetajjVsMjjWide;
-    MonitorElement * m_DetajjVsMjjWide_rebin;
+  // 2D histograms
+  MonitorElement *m_DetajjVsMjjWide;
+  MonitorElement *m_DetajjVsMjjWide_rebin;
 
-    MonitorElement * m_metVSmetclean;
+  MonitorElement *m_metVSmetclean;
 
-    //define Token(-s)
-    edm::EDGetTokenT<reco::CaloJetCollection> jetCollectionTagToken_;
-    edm::EDGetTokenT<std::vector<math::PtEtaPhiMLorentzVector> > widejetsCollectionTagToken_;
-    edm::EDGetTokenT<reco::CaloMETCollection> metCollectionTagToken_;
-    edm::EDGetTokenT<reco::CaloMETCollection> metCleanCollectionTagToken_;
+  // define Token(-s)
+  edm::EDGetTokenT<reco::CaloJetCollection> jetCollectionTagToken_;
+  edm::EDGetTokenT<std::vector<math::PtEtaPhiMLorentzVector>> widejetsCollectionTagToken_;
+  edm::EDGetTokenT<reco::CaloMETCollection> metCollectionTagToken_;
+  edm::EDGetTokenT<reco::CaloMETCollection> metCleanCollectionTagToken_;
 };
 #endif
diff --git a/DQM/DataScouting/plugins/RazorVarAnalyzer.cc b/DQM/DataScouting/plugins/RazorVarAnalyzer.cc
index 6d7867b303fee..9d7f4a5f153df 100644
--- a/DQM/DataScouting/plugins/RazorVarAnalyzer.cc
+++ b/DQM/DataScouting/plugins/RazorVarAnalyzer.cc
@@ -11,240 +11,173 @@
 
 #include <cmath>
 
-// A simple constructor which takes as inoput only the name of the PF jet collection
-RazorVarAnalyzer::RazorVarAnalyzer( const edm::ParameterSet & conf ):
-  ScoutingAnalyzerBase(conf),
-  m_eleCollectionTag(conf.getUntrackedParameter<edm::InputTag>("eleCollectionName",edm::InputTag("hltPixelMatchElectronsActivity"))),
-  m_jetCollectionTag(conf.getUntrackedParameter<edm::InputTag>("jetCollectionName",edm::InputTag("hltCaloJetIDPassed"))),
-  m_muCollectionTag(conf.getUntrackedParameter<edm::InputTag>("muCollectionName",edm::InputTag("hltL3MuonCandidates"))),
-  m_razorVarCollectionTag(conf.getUntrackedParameter<edm::InputTag>("razorVarCollectionName")) {
-    //set Token(-s)
-    m_jetCollectionTagToken_ = consumes<reco::CaloJetCollection>(conf.getUntrackedParameter<edm::InputTag>("jetCollectionName",edm::InputTag("hltCaloJetIDPassed")));
-    m_muCollectionTagToken_ = consumes<std::vector<reco::RecoChargedCandidate> >(conf.getUntrackedParameter<edm::InputTag>("muCollectionName",edm::InputTag("hltL3MuonCandidates")));
-    m_eleCollectionTagToken_ = consumes<reco::ElectronCollection>(conf.getUntrackedParameter<edm::InputTag>("eleCollectionName",edm::InputTag("hltPixelMatchElectronsActivity")));
-    m_razorVarCollectionTagToken_ = consumes<std::vector<double> >(conf.getUntrackedParameter<edm::InputTag>("razorVarCollectionName"));
+// A simple constructor which takes as inoput only the name of the PF jet
+// collection
+RazorVarAnalyzer::RazorVarAnalyzer(const edm::ParameterSet &conf)
+    : ScoutingAnalyzerBase(conf),
+      m_eleCollectionTag(conf.getUntrackedParameter<edm::InputTag>("eleCollectionName",
+                                                                   edm::InputTag("hltPixelMatchElectronsActivity"))),
+      m_jetCollectionTag(
+          conf.getUntrackedParameter<edm::InputTag>("jetCollectionName", edm::InputTag("hltCaloJetIDPassed"))),
+      m_muCollectionTag(
+          conf.getUntrackedParameter<edm::InputTag>("muCollectionName", edm::InputTag("hltL3MuonCandidates"))),
+      m_razorVarCollectionTag(conf.getUntrackedParameter<edm::InputTag>("razorVarCollectionName")) {
+  // set Token(-s)
+  m_jetCollectionTagToken_ = consumes<reco::CaloJetCollection>(
+      conf.getUntrackedParameter<edm::InputTag>("jetCollectionName", edm::InputTag("hltCaloJetIDPassed")));
+  m_muCollectionTagToken_ = consumes<std::vector<reco::RecoChargedCandidate>>(
+      conf.getUntrackedParameter<edm::InputTag>("muCollectionName", edm::InputTag("hltL3MuonCandidates")));
+  m_eleCollectionTagToken_ = consumes<reco::ElectronCollection>(
+      conf.getUntrackedParameter<edm::InputTag>("eleCollectionName", edm::InputTag("hltPixelMatchElectronsActivity")));
+  m_razorVarCollectionTagToken_ =
+      consumes<std::vector<double>>(conf.getUntrackedParameter<edm::InputTag>("razorVarCollectionName"));
 }
 
 RazorVarAnalyzer::~RazorVarAnalyzer() {}
 
 // Function to book the Monitoring Elements.
-void RazorVarAnalyzer::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const &, edm::EventSetup const &) {
+void RazorVarAnalyzer::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, edm::EventSetup const &) {
   ScoutingAnalyzerBase::prepareBooking(iBooker);
-  //the full inclusive histograms
+  // the full inclusive histograms
   m_rsqMRFullyInc = bookH2withSumw2(
-      iBooker,
-      "rsqMRFullyInc",
-      "M_{R} vs R^{2} (All Events)",
-      400,0.,4000.,
-      50,0.,1.,
-      "M_{R} [GeV]",
-      "R^{2}");
+      iBooker, "rsqMRFullyInc", "M_{R} vs R^{2} (All Events)", 400, 0., 4000., 50, 0., 1., "M_{R} [GeV]", "R^{2}");
   m_rsqMRInc4J = bookH2withSumw2(
-      iBooker,
-      "rsqMRInc4J",
-      "M_{R} vs R^{2} (>= 4j)",
-      400,0.,4000.,
-      50,0.,1.,
-      "M_{R} [GeV]",
-      "R^{2}");
+      iBooker, "rsqMRInc4J", "M_{R} vs R^{2} (>= 4j)", 400, 0., 4000., 50, 0., 1., "M_{R} [GeV]", "R^{2}");
   m_rsqMRInc6J = bookH2withSumw2(
-      iBooker,
-      "rsqMRInc6J",
-      "M_{R} vs R^{2} (>= 6j)",
-      400,0.,4000.,
-      50,0.,1.,
-      "M_{R} [GeV]",
-      "R^{2}");
+      iBooker, "rsqMRInc6J", "M_{R} vs R^{2} (>= 6j)", 400, 0., 4000., 50, 0., 1., "M_{R} [GeV]", "R^{2}");
   m_rsqMRInc8J = bookH2withSumw2(
-      iBooker,
-      "rsqMRInc8J",
-      "M_{R} vs R^{2} (>= 8j)",
-      400,0.,4000.,
-      50,0.,1.,
-      "M_{R} [GeV]",
-      "R^{2}");
+      iBooker, "rsqMRInc8J", "M_{R} vs R^{2} (>= 8j)", 400, 0., 4000., 50, 0., 1., "M_{R} [GeV]", "R^{2}");
   m_rsqMRInc10J = bookH2withSumw2(
-      iBooker,
-      "rsqMRInc10J",
-      "M_{R} vs R^{2} (>= 10j)",
-      400,0.,4000.,
-      50,0.,1.,
-      "M_{R} [GeV]",
-      "R^{2}");
+      iBooker, "rsqMRInc10J", "M_{R} vs R^{2} (>= 10j)", 400, 0., 4000., 50, 0., 1., "M_{R} [GeV]", "R^{2}");
   m_rsqMRInc12J = bookH2withSumw2(
-      iBooker,
-      "rsqMRInc12J",
-      "M_{R} vs R^{2} (>= 12j)",
-      400,0.,4000.,
-      50,0.,1.,
-      "M_{R} [GeV]",
-      "R^{2}");
+      iBooker, "rsqMRInc12J", "M_{R} vs R^{2} (>= 12j)", 400, 0., 4000., 50, 0., 1., "M_{R} [GeV]", "R^{2}");
   m_rsqMRInc14J = bookH2withSumw2(
-      iBooker,
-      "rsqMRInc14J",
-      "M_{R} vs R^{2} (>= 14j)",
-      400,0.,4000.,
-      50,0.,1.,
-      "M_{R} [GeV]",
-      "R^{2}");
-
-  //the by box histograms
+      iBooker, "rsqMRInc14J", "M_{R} vs R^{2} (>= 14j)", 400, 0., 4000., 50, 0., 1., "M_{R} [GeV]", "R^{2}");
+
+  // the by box histograms
   m_rsqMREleMu = bookH2withSumw2(
-      iBooker,
-      "rsqMREleMu",
-      "M_{R} vs R^{2} (EleMu box)",
-      400,0.,4000.,
-      50,0.,1.,
-      "M_{R} [GeV]",
-      "R^{2}");
+      iBooker, "rsqMREleMu", "M_{R} vs R^{2} (EleMu box)", 400, 0., 4000., 50, 0., 1., "M_{R} [GeV]", "R^{2}");
   m_rsqMRMuMu = bookH2withSumw2(
-      iBooker,
-      "rsqMRMuMu",
-      "M_{R} vs R^{2} (MuMu box)",
-      400,0.,4000.,
-      50,0.,1.,
-      "M_{R} [GeV]",
-      "R^{2}");
+      iBooker, "rsqMRMuMu", "M_{R} vs R^{2} (MuMu box)", 400, 0., 4000., 50, 0., 1., "M_{R} [GeV]", "R^{2}");
   m_rsqMREleEle = bookH2withSumw2(
-      iBooker,
-      "rsqMREleEle",
-      "M_{R} vs R^{2} (EleEle box)",
-      400,0.,4000.,
-      50,0.,1.,
-      "M_{R} [GeV]",
-      "R^{2}");
+      iBooker, "rsqMREleEle", "M_{R} vs R^{2} (EleEle box)", 400, 0., 4000., 50, 0., 1., "M_{R} [GeV]", "R^{2}");
   m_rsqMRMu = bookH2withSumw2(
-      iBooker,
-      "rsqMRMu",
-      "M_{R} vs R^{2} (Mu box)",
-      400,0.,4000.,
-      50,0.,1.,
-      "M_{R} [GeV]",
-      "R^{2}");
+      iBooker, "rsqMRMu", "M_{R} vs R^{2} (Mu box)", 400, 0., 4000., 50, 0., 1., "M_{R} [GeV]", "R^{2}");
   m_rsqMREle = bookH2withSumw2(
-      iBooker,
-      "rsqMREle",
-      "M_{R} vs R^{2} (Ele box)",
-      400,0.,4000.,
-      50,0.,1.,
-      "M_{R} [GeV]",
-      "R^{2}");
+      iBooker, "rsqMREle", "M_{R} vs R^{2} (Ele box)", 400, 0., 4000., 50, 0., 1., "M_{R} [GeV]", "R^{2}");
   m_rsqMRHad = bookH2withSumw2(
-      iBooker,
-      "rsqMRHad",
-      "M_{R} vs R^{2} (Had box)",
-      400,0.,4000.,
-      50,0.,1.,
-      "M_{R} [GeV]",
-      "R^{2}");
-
-  //the by box histograms
+      iBooker, "rsqMRHad", "M_{R} vs R^{2} (Had box)", 400, 0., 4000., 50, 0., 1., "M_{R} [GeV]", "R^{2}");
+
+  // the by box histograms
   m_rsqMRMuMJ = bookH2withSumw2(
-      iBooker,
-      "rsqMRMuMJ",
-      "M_{R} vs R^{2} (Mu box >= 4j)",
-      400,0.,4000.,
-      50,0.,1.,
-      "M_{R} [GeV]",
-      "R^{2}");
+      iBooker, "rsqMRMuMJ", "M_{R} vs R^{2} (Mu box >= 4j)", 400, 0., 4000., 50, 0., 1., "M_{R} [GeV]", "R^{2}");
   m_rsqMREleMJ = bookH2withSumw2(
-      iBooker,
-      "rsqMREleMJ",
-      "M_{R} vs R^{2} (Ele box >= 5j)",
-      400,0.,4000.,
-      50,0.,1.,
-      "M_{R} [GeV]",
-      "R^{2}");
+      iBooker, "rsqMREleMJ", "M_{R} vs R^{2} (Ele box >= 5j)", 400, 0., 4000., 50, 0., 1., "M_{R} [GeV]", "R^{2}");
   m_rsqMRHadMJ = bookH2withSumw2(
-      iBooker,
-      "rsqMRHadMJ",
-      "M_{R} vs R^{2} (Had box >= 6j)",
-      400,0.,4000.,
-      50,0.,1.,
-      "M_{R} [GeV]",
-      "R^{2}");
+      iBooker, "rsqMRHadMJ", "M_{R} vs R^{2} (Had box >= 6j)", 400, 0., 4000., 50, 0., 1., "M_{R} [GeV]", "R^{2}");
 }
 
 // Usual analyze method
-void RazorVarAnalyzer::analyze( const edm::Event & iEvent, const edm::EventSetup & c ) {
-  //count the number of jets with a minimal selection
+void RazorVarAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &c) {
+  // count the number of jets with a minimal selection
   edm::Handle<reco::CaloJetCollection> calojets_handle;
   iEvent.getByToken(m_jetCollectionTagToken_, calojets_handle);
 
   unsigned int njets = 0;
-  for(reco::CaloJetCollection::const_iterator it = calojets_handle->begin(); it != calojets_handle->end(); ++it){
-    if(it->pt() >= 30. && fabs(it->eta()) <= 3.0){
+  for (reco::CaloJetCollection::const_iterator it = calojets_handle->begin(); it != calojets_handle->end(); ++it) {
+    if (it->pt() >= 30. && fabs(it->eta()) <= 3.0) {
       njets++;
     }
   }
 
-  //count the number of muons
-  edm::Handle<std::vector<reco::RecoChargedCandidate> > muon_handle;
+  // count the number of muons
+  edm::Handle<std::vector<reco::RecoChargedCandidate>> muon_handle;
   iEvent.getByToken(m_muCollectionTagToken_, muon_handle);
 
   unsigned int nmu_loose = 0;
   unsigned int nmu_tight = 0;
-  if(muon_handle.isValid()){
-    for(std::vector<reco::RecoChargedCandidate>::const_iterator it = muon_handle->begin(); it != muon_handle->end(); ++it){
-      if(it->pt() >= 15 && fabs(it->eta()) <= 2.1) nmu_tight++;
-      if(it->pt() >= 10 && fabs(it->eta()) <= 2.4) nmu_loose++;
+  if (muon_handle.isValid()) {
+    for (std::vector<reco::RecoChargedCandidate>::const_iterator it = muon_handle->begin(); it != muon_handle->end();
+         ++it) {
+      if (it->pt() >= 15 && fabs(it->eta()) <= 2.1)
+        nmu_tight++;
+      if (it->pt() >= 10 && fabs(it->eta()) <= 2.4)
+        nmu_loose++;
     }
   }
 
-  //count the number of electrons
+  // count the number of electrons
   edm::Handle<reco::ElectronCollection> ele_handle;
   iEvent.getByToken(m_eleCollectionTagToken_, ele_handle);
 
   unsigned int nele_loose = 0;
   unsigned int nele_tight = 0;
-  if(ele_handle.isValid()){
-    for(reco::ElectronCollection::const_iterator it = ele_handle->begin(); it != ele_handle->end(); ++it){
-      if(it->pt() >= 20 && fabs(it->eta()) <= 2.5) nele_tight++;
-      if(it->pt() >= 10 && fabs(it->eta()) <= 2.5) nele_loose++;
+  if (ele_handle.isValid()) {
+    for (reco::ElectronCollection::const_iterator it = ele_handle->begin(); it != ele_handle->end(); ++it) {
+      if (it->pt() >= 20 && fabs(it->eta()) <= 2.5)
+        nele_tight++;
+      if (it->pt() >= 10 && fabs(it->eta()) <= 2.5)
+        nele_loose++;
     }
   }
 
-  //now get the box number: {'MuEle':0,'MuMu':1,'EleEle':2,'Mu':3,'Ele':4,'Had':5}
+  // now get the box number:
+  // {'MuEle':0,'MuMu':1,'EleEle':2,'Mu':3,'Ele':4,'Had':5}
   unsigned int box_num = 5;
-  if(nmu_tight > 0 && nele_tight > 0){
+  if (nmu_tight > 0 && nele_tight > 0) {
     box_num = 0;
-  }else if(nmu_tight > 0 && nmu_loose > 1){
+  } else if (nmu_tight > 0 && nmu_loose > 1) {
     box_num = 1;
-  }else if(nele_tight > 0 && nele_loose > 1){
+  } else if (nele_tight > 0 && nele_loose > 1) {
     box_num = 2;
-  }else if(nmu_tight > 0){
+  } else if (nmu_tight > 0) {
     box_num = 3;
-  }else if(nele_tight > 0){
+  } else if (nele_tight > 0) {
     box_num = 4;
   }
 
-  edm::Handle<std::vector<double> > razorvar_handle;
+  edm::Handle<std::vector<double>> razorvar_handle;
   iEvent.getByToken(m_razorVarCollectionTagToken_, razorvar_handle);
-  if(razorvar_handle->size() > 1){
+  if (razorvar_handle->size() > 1) {
     const double MR = razorvar_handle->at(0);
     const double R = razorvar_handle->at(1);
-    m_rsqMRFullyInc->Fill(MR,R*R);
-    if(njets >= 4) m_rsqMRInc4J->Fill(MR,R*R);
-    if(njets >= 6) m_rsqMRInc6J->Fill(MR,R*R);
-    if(njets >= 8) m_rsqMRInc8J->Fill(MR,R*R);
-    if(njets >= 10) m_rsqMRInc10J->Fill(MR,R*R);
-    if(njets >= 12) m_rsqMRInc12J->Fill(MR,R*R);
-    if(njets >= 14) m_rsqMRInc14J->Fill(MR,R*R);
-
-    //now fill the boxes
-    if(box_num == 0) m_rsqMREleMu->Fill(MR,R*R);
-    if(box_num == 1) m_rsqMRMuMu->Fill(MR,R*R);
-    if(box_num == 2) m_rsqMREleEle->Fill(MR,R*R);
-    if(box_num == 3) m_rsqMRMu->Fill(MR,R*R);
-    if(box_num == 4) m_rsqMREle->Fill(MR,R*R);
-    if(box_num == 5) m_rsqMRHad->Fill(MR,R*R);
-
-    //finally the multijet boxes - think ttbar
-    //muon boxes: muons are not in jets
-    if( box_num == 3 && njets >= 4) m_rsqMRMuMJ->Fill(MR,R*R);
-    //ele boxes: electrons are in jets
-    else if( box_num == 4 && njets >= 5) m_rsqMREleMJ->Fill(MR,R*R);
-    //fill the Had box
-    else if( box_num == 5 && njets >= 6) m_rsqMRHadMJ->Fill(MR,R*R);
+    m_rsqMRFullyInc->Fill(MR, R * R);
+    if (njets >= 4)
+      m_rsqMRInc4J->Fill(MR, R * R);
+    if (njets >= 6)
+      m_rsqMRInc6J->Fill(MR, R * R);
+    if (njets >= 8)
+      m_rsqMRInc8J->Fill(MR, R * R);
+    if (njets >= 10)
+      m_rsqMRInc10J->Fill(MR, R * R);
+    if (njets >= 12)
+      m_rsqMRInc12J->Fill(MR, R * R);
+    if (njets >= 14)
+      m_rsqMRInc14J->Fill(MR, R * R);
+
+    // now fill the boxes
+    if (box_num == 0)
+      m_rsqMREleMu->Fill(MR, R * R);
+    if (box_num == 1)
+      m_rsqMRMuMu->Fill(MR, R * R);
+    if (box_num == 2)
+      m_rsqMREleEle->Fill(MR, R * R);
+    if (box_num == 3)
+      m_rsqMRMu->Fill(MR, R * R);
+    if (box_num == 4)
+      m_rsqMREle->Fill(MR, R * R);
+    if (box_num == 5)
+      m_rsqMRHad->Fill(MR, R * R);
+
+    // finally the multijet boxes - think ttbar
+    // muon boxes: muons are not in jets
+    if (box_num == 3 && njets >= 4)
+      m_rsqMRMuMJ->Fill(MR, R * R);
+    // ele boxes: electrons are in jets
+    else if (box_num == 4 && njets >= 5)
+      m_rsqMREleMJ->Fill(MR, R * R);
+    // fill the Had box
+    else if (box_num == 5 && njets >= 6)
+      m_rsqMRHadMJ->Fill(MR, R * R);
   }
-} 
+}
diff --git a/DQM/DataScouting/plugins/RazorVarAnalyzer.h b/DQM/DataScouting/plugins/RazorVarAnalyzer.h
index c5401d95db469..5e9e1eef6bfcf 100644
--- a/DQM/DataScouting/plugins/RazorVarAnalyzer.h
+++ b/DQM/DataScouting/plugins/RazorVarAnalyzer.h
@@ -8,43 +8,44 @@
 #include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h"
 
 class RazorVarAnalyzer : public ScoutingAnalyzerBase {
-  public:
-    explicit RazorVarAnalyzer( const edm::ParameterSet &  ) ;
-    ~RazorVarAnalyzer() override ;
-    void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-    void analyze( const edm::Event & , const edm::EventSetup &  ) override;
-  private: 
-    edm::InputTag m_eleCollectionTag;    
-    edm::InputTag m_jetCollectionTag;
-    edm::InputTag m_muCollectionTag;
-    edm::InputTag m_razorVarCollectionTag;
-
-    //inclusive histograms by jet number
-    MonitorElement * m_rsqMRFullyInc;
-    MonitorElement * m_rsqMRInc4J;
-    MonitorElement * m_rsqMRInc6J;
-    MonitorElement * m_rsqMRInc8J;
-    MonitorElement * m_rsqMRInc10J;
-    MonitorElement * m_rsqMRInc12J;
-    MonitorElement * m_rsqMRInc14J;
-
-    //per box histograms
-    MonitorElement * m_rsqMREleMu;
-    MonitorElement * m_rsqMRMuMu;
-    MonitorElement * m_rsqMREleEle;
-    MonitorElement * m_rsqMRMu;
-    MonitorElement * m_rsqMREle;
-    MonitorElement * m_rsqMRHad;
-
-    //now per box multijet
-    MonitorElement * m_rsqMRMuMJ;
-    MonitorElement * m_rsqMREleMJ;
-    MonitorElement * m_rsqMRHadMJ;
-
-    //define Token(-s)
-    edm::EDGetTokenT<reco::CaloJetCollection> m_jetCollectionTagToken_;
-    edm::EDGetTokenT<std::vector<reco::RecoChargedCandidate> > m_muCollectionTagToken_;
-    edm::EDGetTokenT<reco::ElectronCollection> m_eleCollectionTagToken_;
-    edm::EDGetTokenT<std::vector<double> > m_razorVarCollectionTagToken_;
+public:
+  explicit RazorVarAnalyzer(const edm::ParameterSet &);
+  ~RazorVarAnalyzer() override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+
+private:
+  edm::InputTag m_eleCollectionTag;
+  edm::InputTag m_jetCollectionTag;
+  edm::InputTag m_muCollectionTag;
+  edm::InputTag m_razorVarCollectionTag;
+
+  // inclusive histograms by jet number
+  MonitorElement *m_rsqMRFullyInc;
+  MonitorElement *m_rsqMRInc4J;
+  MonitorElement *m_rsqMRInc6J;
+  MonitorElement *m_rsqMRInc8J;
+  MonitorElement *m_rsqMRInc10J;
+  MonitorElement *m_rsqMRInc12J;
+  MonitorElement *m_rsqMRInc14J;
+
+  // per box histograms
+  MonitorElement *m_rsqMREleMu;
+  MonitorElement *m_rsqMRMuMu;
+  MonitorElement *m_rsqMREleEle;
+  MonitorElement *m_rsqMRMu;
+  MonitorElement *m_rsqMREle;
+  MonitorElement *m_rsqMRHad;
+
+  // now per box multijet
+  MonitorElement *m_rsqMRMuMJ;
+  MonitorElement *m_rsqMREleMJ;
+  MonitorElement *m_rsqMRHadMJ;
+
+  // define Token(-s)
+  edm::EDGetTokenT<reco::CaloJetCollection> m_jetCollectionTagToken_;
+  edm::EDGetTokenT<std::vector<reco::RecoChargedCandidate>> m_muCollectionTagToken_;
+  edm::EDGetTokenT<reco::ElectronCollection> m_eleCollectionTagToken_;
+  edm::EDGetTokenT<std::vector<double>> m_razorVarCollectionTagToken_;
 };
 #endif
diff --git a/DQM/DataScouting/plugins/ScoutingTestAnalyzer.cc b/DQM/DataScouting/plugins/ScoutingTestAnalyzer.cc
index 2385c104c7fc0..27ce6f85a16d3 100644
--- a/DQM/DataScouting/plugins/ScoutingTestAnalyzer.cc
+++ b/DQM/DataScouting/plugins/ScoutingTestAnalyzer.cc
@@ -3,69 +3,69 @@
 #include "DQM/DataScouting/plugins/ScoutingTestAnalyzer.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
 
-// A simple constructor which takes as inoput only the name of the PF jet collection
-ScoutingTestAnalyzer::ScoutingTestAnalyzer( const edm::ParameterSet & conf )
-  :ScoutingAnalyzerBase(conf) {
+// A simple constructor which takes as inoput only the name of the PF jet
+// collection
+ScoutingTestAnalyzer::ScoutingTestAnalyzer(const edm::ParameterSet &conf) : ScoutingAnalyzerBase(conf) {
   m_pfJetsCollectionTag = conf.getUntrackedParameter<edm::InputTag>("pfJetsCollectionName");
-  //set Token(-s)
-  m_pfJetsCollectionTagToken_ = consumes<reco::CaloJetCollection>(conf.getUntrackedParameter<edm::InputTag>("pfJetsCollectionName"));
+  // set Token(-s)
+  m_pfJetsCollectionTagToken_ =
+      consumes<reco::CaloJetCollection>(conf.getUntrackedParameter<edm::InputTag>("pfJetsCollectionName"));
 }
 
-ScoutingTestAnalyzer::~ScoutingTestAnalyzer(){}
+ScoutingTestAnalyzer::~ScoutingTestAnalyzer() {}
 
 // Function to book the Monitoring Elements.
-void ScoutingTestAnalyzer::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const &, edm::EventSetup const &) {
+void ScoutingTestAnalyzer::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, edm::EventSetup const &) {
   ScoutingAnalyzerBase::prepareBooking(iBooker);
   std::string collection_name = m_pfJetsCollectionTag.label();
 
-  /* This method allows us to book an Histogram in one line in a completely 
+  /* This method allows us to book an Histogram in one line in a completely
    * transparent way. Take your time to put axis titles!!!!*/
   m_jetPt = bookH1withSumw2(
-      iBooker,
-      collection_name+"_pt",
-      collection_name+" Jet P_{T}",
-      50,0.,500.,
-      "Jet P_{T} [GeV]");
+      iBooker, collection_name + "_pt", collection_name + " Jet P_{T}", 50, 0., 500., "Jet P_{T} [GeV]");
 
-  m_jetEtaPhi = bookH2withSumw2(
-      iBooker,
-      collection_name+"_etaphi",
-      collection_name+" #eta #phi",
-      50,-5,5,
-      50,-3.1415,+3.1415,
-      "#eta^{Jet}",
-      "#phi^{Jet}");
+  m_jetEtaPhi = bookH2withSumw2(iBooker,
+                                collection_name + "_etaphi",
+                                collection_name + " #eta #phi",
+                                50,
+                                -5,
+                                5,
+                                50,
+                                -3.1415,
+                                +3.1415,
+                                "#eta^{Jet}",
+                                "#phi^{Jet}");
 }
 
 // Usual analyze method
-void ScoutingTestAnalyzer::analyze( const edm::Event & iEvent, const edm::EventSetup & c ) {
-  edm::Handle<reco::CaloJetCollection> calojets_handle ;
+void ScoutingTestAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &c) {
+  edm::Handle<reco::CaloJetCollection> calojets_handle;
   iEvent.getByToken(m_pfJetsCollectionTagToken_, calojets_handle);
-  /* This is an example of how C++11 can simplify or lifes. The auto keyword 
-     make the compiler figure out by itself which is the type of the pfjets object.
-     The qualifier const of course still apply.
-     Poor's man explaination: "compiler, make pfjets a const ref and figure out 
-     for me the type"*/
-  auto const& calojets = *calojets_handle;
+  /* This is an example of how C++11 can simplify or lifes. The auto keyword
+     make the compiler figure out by itself which is the type of the pfjets
+     object. The qualifier const of course still apply. Poor's man explaination:
+     "compiler, make pfjets a const ref and figure out for me the type"*/
+  auto const &calojets = *calojets_handle;
 
   // Again, C++11. A loop on a std::vector becomes as simple as this!
-  for (auto const & calojet: calojets){
+  for (auto const &calojet : calojets) {
     m_jetPt->Fill(calojet.pt());
-    m_jetEtaPhi->Fill(calojet.eta(),calojet.phi());
+    m_jetEtaPhi->Fill(calojet.eta(), calojet.phi());
   }
 }
 
-/* Method called at the end of the Run. Ideal to finalise stuff within the 
+/* Method called at the end of the Run. Ideal to finalise stuff within the
  * DQM infrastructure, which is entirely Run based. */
-void ScoutingTestAnalyzer::endRun( edm::Run const &, edm::EventSetup const & ) {
+void ScoutingTestAnalyzer::endRun(edm::Run const &, edm::EventSetup const &) {
   std::string collection_name = m_pfJetsCollectionTag.label();
-  /* This function is specific of this class and allows us to make a 
-   * projection in one line 
+  /* This function is specific of this class and allows us to make a
+   * projection in one line
    * The following code form the original TestAnalyser tried to book histograms
    * in the endRun step. This is not allowed anymore.
-   * Since this is just a test class, there is no point in trying to fix the impossible.
-   * The profileX and profileY methods are only used in this test class anyway.
-   * */ 
+   * Since this is just a test class, there is no point in trying to fix the
+   * impossible. The profileX and profileY methods are only used in this test
+   * class anyway.
+   * */
   ////profileX(m_jetEtaPhi,
   ////    collection_name+" Jets #eta (projection)",
   ////    "#eta^{Jet}");
diff --git a/DQM/DataScouting/plugins/ScoutingTestAnalyzer.h b/DQM/DataScouting/plugins/ScoutingTestAnalyzer.h
index 71a64ee97fd1c..80da1b846ecee 100644
--- a/DQM/DataScouting/plugins/ScoutingTestAnalyzer.h
+++ b/DQM/DataScouting/plugins/ScoutingTestAnalyzer.h
@@ -2,22 +2,23 @@
 #define ScoutingTestAnalyzer_h
 
 // This class is used to test the functionalities of the package
-#include "DataFormats/JetReco/interface/CaloJet.h"
 #include "DQM/DataScouting/interface/ScoutingAnalyzerBase.h"
+#include "DataFormats/JetReco/interface/CaloJet.h"
 
 class ScoutingTestAnalyzer : public ScoutingAnalyzerBase {
-  public:
-    explicit ScoutingTestAnalyzer( const edm::ParameterSet &  ) ;
-    ~ScoutingTestAnalyzer() override ;
-    void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-    void analyze( const edm::Event & , const edm::EventSetup &  ) override;
-    void endRun( edm::Run const &, edm::EventSetup const & ) override ;
-  private: 
-    // histograms
-    edm::InputTag m_pfJetsCollectionTag;
-    MonitorElement * m_jetPt;
-    MonitorElement * m_jetEtaPhi;
-    //define Token(-s)
-    edm::EDGetTokenT<reco::CaloJetCollection> m_pfJetsCollectionTagToken_;
+public:
+  explicit ScoutingTestAnalyzer(const edm::ParameterSet &);
+  ~ScoutingTestAnalyzer() override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endRun(edm::Run const &, edm::EventSetup const &) override;
+
+private:
+  // histograms
+  edm::InputTag m_pfJetsCollectionTag;
+  MonitorElement *m_jetPt;
+  MonitorElement *m_jetEtaPhi;
+  // define Token(-s)
+  edm::EDGetTokenT<reco::CaloJetCollection> m_pfJetsCollectionTagToken_;
 };
 #endif
diff --git a/DQM/DataScouting/plugins/SealModule.cc b/DQM/DataScouting/plugins/SealModule.cc
index cb52fad2592f1..bcb2b8eff3269 100644
--- a/DQM/DataScouting/plugins/SealModule.cc
+++ b/DQM/DataScouting/plugins/SealModule.cc
@@ -1,9 +1,9 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 
-#include "DQM/DataScouting/plugins/RazorVarAnalyzer.h"
 #include "DQM/DataScouting/plugins/AlphaTVarAnalyzer.h"
 #include "DQM/DataScouting/plugins/DiJetVarAnalyzer.h"
+#include "DQM/DataScouting/plugins/RazorVarAnalyzer.h"
 #include "DQM/DataScouting/plugins/ScoutingTestAnalyzer.h"
 
 DEFINE_FWK_MODULE(RazorVarAnalyzer);
diff --git a/DQM/DataScouting/src/AlphaTVarProducer.cc b/DQM/DataScouting/src/AlphaTVarProducer.cc
index 3dbc3c0d0c67b..0cfd2d02269d9 100644
--- a/DQM/DataScouting/src/AlphaTVarProducer.cc
+++ b/DQM/DataScouting/src/AlphaTVarProducer.cc
@@ -23,109 +23,106 @@
 //
 // constructors and destructor
 //
-AlphaTVarProducer::AlphaTVarProducer(const edm::ParameterSet& iConfig) :
-  inputJetTag_    (iConfig.getParameter<edm::InputTag>("inputJetTag")){
+AlphaTVarProducer::AlphaTVarProducer(const edm::ParameterSet &iConfig)
+    : inputJetTag_(iConfig.getParameter<edm::InputTag>("inputJetTag")) {
+  produces<std::vector<double>>();
 
-  produces<std::vector<double> >();
-
-  //set Token(-s)
+  // set Token(-s)
   inputJetTagToken_ = consumes<reco::CaloJetCollection>(iConfig.getParameter<edm::InputTag>("inputJetTag"));
 
-  LogDebug("") << "Inputs: "
-	       << inputJetTag_.encode() << " ";
-}
-
-AlphaTVarProducer::~AlphaTVarProducer()
-{
+  LogDebug("") << "Inputs: " << inputJetTag_.encode() << " ";
 }
 
-// ------------ method called to produce the data  ------------ 
-void
-AlphaTVarProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace std;
-   using namespace edm;
-   using namespace reco;
-
-
-   // get hold of collection of objects
-   edm::Handle<reco::CaloJetCollection> calojet_handle; 
-   iEvent.getByToken(inputJetTagToken_, calojet_handle);
-
-   std::unique_ptr<std::vector<double> > result(new std::vector<double>); 
-   // check the the input collections are available
-   if (calojet_handle.isValid()){
-     std::vector<TLorentzVector> myJets;
-     reco::CaloJetCollection::const_iterator jetIt;
-     for(jetIt = calojet_handle->begin(); jetIt != calojet_handle->end(); jetIt++){
-       TLorentzVector j; j.SetPtEtaPhiE(jetIt->pt(),jetIt->eta(), jetIt->phi(), jetIt->energy());
-       myJets.push_back(j);
-     }
-
-     double alphaT = CalcAlphaT(myJets);
-     double HT     = CalcHT(myJets);
-
-     result->push_back(alphaT);
-     result->push_back(HT);
-   }
-   iEvent.put(std::move(result));
+AlphaTVarProducer::~AlphaTVarProducer() {}
+
+// ------------ method called to produce the data  ------------
+void AlphaTVarProducer::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  using namespace std;
+  using namespace edm;
+  using namespace reco;
+
+  // get hold of collection of objects
+  edm::Handle<reco::CaloJetCollection> calojet_handle;
+  iEvent.getByToken(inputJetTagToken_, calojet_handle);
+
+  std::unique_ptr<std::vector<double>> result(new std::vector<double>);
+  // check the the input collections are available
+  if (calojet_handle.isValid()) {
+    std::vector<TLorentzVector> myJets;
+    reco::CaloJetCollection::const_iterator jetIt;
+    for (jetIt = calojet_handle->begin(); jetIt != calojet_handle->end(); jetIt++) {
+      TLorentzVector j;
+      j.SetPtEtaPhiE(jetIt->pt(), jetIt->eta(), jetIt->phi(), jetIt->energy());
+      myJets.push_back(j);
+    }
+
+    double alphaT = CalcAlphaT(myJets);
+    double HT = CalcHT(myJets);
+
+    result->push_back(alphaT);
+    result->push_back(HT);
+  }
+  iEvent.put(std::move(result));
 }
 
-double 
-AlphaTVarProducer::CalcAlphaT(const std::vector<TLorentzVector>& jets){
-	std::vector<double> ETs;
-	TVector3 MHT{CalcMHT(jets),0.0,0.0};
-	float HT = CalcHT(jets);
-	//float HT = 0;
-	for(unsigned int i = 0; i < jets.size(); i++){
-		if(jets[i].Et() > 50. && fabs(jets[i].Eta()) < 2.5) ETs.push_back(jets[i].Et());
-		//HT += jets[i].Et();
-	}
-	if(ETs.size() < 2.) return 0.0;
-	if(ETs.size() > 16.) return 0.0;
-	float DHT = deltaHt(ETs);
-	
-	float AlphaT = alphaT(HT,DHT,MHT.Mag());
-	
-	return AlphaT;
-	
+double AlphaTVarProducer::CalcAlphaT(const std::vector<TLorentzVector> &jets) {
+  std::vector<double> ETs;
+  TVector3 MHT{CalcMHT(jets), 0.0, 0.0};
+  float HT = CalcHT(jets);
+  // float HT = 0;
+  for (unsigned int i = 0; i < jets.size(); i++) {
+    if (jets[i].Et() > 50. && fabs(jets[i].Eta()) < 2.5)
+      ETs.push_back(jets[i].Et());
+    // HT += jets[i].Et();
+  }
+  if (ETs.size() < 2.)
+    return 0.0;
+  if (ETs.size() > 16.)
+    return 0.0;
+  float DHT = deltaHt(ETs);
+
+  float AlphaT = alphaT(HT, DHT, MHT.Mag());
+
+  return AlphaT;
 }
 
-double AlphaTVarProducer::deltaHt(const std::vector<double>& ETs) {
-  if(ETs.size() > 16.) return 9999999;
-	std::vector<double> diff( 1<<(ETs.size()-1) , 0. );
-	for(unsigned i=0; i < diff.size(); i++)
-		for(unsigned j=0; j < ETs.size(); j++)
-			diff[i] += ETs[j] * ( 1 - 2 * (int(i>>j)&1) ) ;
-	std::vector<double>::const_iterator it;
-	double min=9999999;
-	for(it = diff.begin(); it !=diff.end(); it++) if(*it<min) min = *it;
-	return min;
+double AlphaTVarProducer::deltaHt(const std::vector<double> &ETs) {
+  if (ETs.size() > 16.)
+    return 9999999;
+  std::vector<double> diff(1 << (ETs.size() - 1), 0.);
+  for (unsigned i = 0; i < diff.size(); i++)
+    for (unsigned j = 0; j < ETs.size(); j++)
+      diff[i] += ETs[j] * (1 - 2 * (int(i >> j) & 1));
+  std::vector<double>::const_iterator it;
+  double min = 9999999;
+  for (it = diff.begin(); it != diff.end(); it++)
+    if (*it < min)
+      min = *it;
+  return min;
 }
 
 double AlphaTVarProducer::alphaT(const double HT, const double DHT, const double MHT) {
-	return 0.5 * ( HT - DHT ) / sqrt( HT*HT - MHT*MHT );
+  return 0.5 * (HT - DHT) / sqrt(HT * HT - MHT * MHT);
 }
 
-double 
-AlphaTVarProducer::CalcHT(const std::vector<TLorentzVector>& jets){
+double AlphaTVarProducer::CalcHT(const std::vector<TLorentzVector> &jets) {
+  double HT = 0;
+  for (unsigned int i = 0; i < jets.size(); i++) {
+    if (jets[i].Et() > 50. && fabs(jets[i].Eta()) < 2.5)
+      HT += jets[i].Et();
+  }
 
-	double HT = 0;
-	for(unsigned int i = 0; i < jets.size(); i++){
-		if(jets[i].Et() > 50. && fabs(jets[i].Eta()) < 2.5) HT += jets[i].Et();
-	}
-	
-	return HT;
-	
+  return HT;
 }
 
-double AlphaTVarProducer::CalcMHT(const std::vector<TLorentzVector>& jets){
-	TVector3 MHT;
-	for(unsigned int i = 0; i < jets.size(); i++){
-		if(jets[i].Et() > 50. && fabs(jets[i].Eta()) < 2.5) MHT -= jets[i].Vect();
-	}
-	MHT.SetZ(0.0);
-	return MHT.Mag();
+double AlphaTVarProducer::CalcMHT(const std::vector<TLorentzVector> &jets) {
+  TVector3 MHT;
+  for (unsigned int i = 0; i < jets.size(); i++) {
+    if (jets[i].Et() > 50. && fabs(jets[i].Eta()) < 2.5)
+      MHT -= jets[i].Vect();
+  }
+  MHT.SetZ(0.0);
+  return MHT.Mag();
 }
 
 DEFINE_FWK_MODULE(AlphaTVarProducer);
diff --git a/DQM/DataScouting/src/DiJetVarProducer.cc b/DQM/DataScouting/src/DiJetVarProducer.cc
index 3c1d02f349282..955b536740bf8 100644
--- a/DQM/DataScouting/src/DiJetVarProducer.cc
+++ b/DQM/DataScouting/src/DiJetVarProducer.cc
@@ -12,8 +12,8 @@
 
 #include "DQM/DataScouting/interface/DiJetVarProducer.h"
 
-#include "TVector3.h"
 #include "TLorentzVector.h"
+#include "TVector3.h"
 
 #include <memory>
 #include <vector>
@@ -21,130 +21,126 @@
 //
 // constructors and destructor
 //
-DiJetVarProducer::DiJetVarProducer(const edm::ParameterSet& iConfig) :
-  inputJetTag_    (iConfig.getParameter<edm::InputTag>("inputJetTag")),
-  wideJetDeltaR_   (iConfig.getParameter<double>("wideJetDeltaR"))
-{
-  //register your products
-  //produces<std::vector<double> >("dijetvariables");
-  produces<std::vector<math::PtEtaPhiMLorentzVector> >("widejets");
-
-  //set Token(-s)
+DiJetVarProducer::DiJetVarProducer(const edm::ParameterSet &iConfig)
+    : inputJetTag_(iConfig.getParameter<edm::InputTag>("inputJetTag")),
+      wideJetDeltaR_(iConfig.getParameter<double>("wideJetDeltaR")) {
+  // register your products
+  // produces<std::vector<double> >("dijetvariables");
+  produces<std::vector<math::PtEtaPhiMLorentzVector>>("widejets");
+
+  // set Token(-s)
   inputJetTagToken_ = consumes<reco::CaloJetCollection>(iConfig.getParameter<edm::InputTag>("inputJetTag"));
-  
+
   LogDebug("") << "Input Jet Tag: " << inputJetTag_.encode() << " ";
   LogDebug("") << "Radius Parameter Wide Jet: " << wideJetDeltaR_ << ".";
 }
 
-DiJetVarProducer::~DiJetVarProducer()
-{
-}
-
-// ------------ method called to produce the data  ------------ 
-void
-DiJetVarProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace std;
-   using namespace edm;
-   using namespace reco;
-
-   // ## The output collections        
-   //std::unique_ptr<std::vector<double> > dijetvariables(new std::vector<double>); 
-   std::unique_ptr<std::vector<math::PtEtaPhiMLorentzVector> > widejets(new std::vector<math::PtEtaPhiMLorentzVector>); 
-
-   // ## Get jet collection
-   edm::Handle<reco::CaloJetCollection> calojets_handle;
-   iEvent.getByToken(inputJetTagToken_, calojets_handle);
-   //cout << "size: " << calojets_handle->size() << endl;              
-   
-   // ## Wide Jet Algorithm
-   // At least two jets
-   if( calojets_handle->size() >=2 )
-     {
-       TLorentzVector wj1_tmp;
-       TLorentzVector wj2_tmp;
-       TLorentzVector wj1;
-       TLorentzVector wj2;
-       TLorentzVector wdijet;
-       
-       //        // Loop over all the input jets
-       //        for(reco::CaloJetCollection::const_iterator it = calojets_handle->begin(); it != calojets_handle->end(); ++it)
-       //        	 {
-       // 	   cout << "jet: " << it->pt() << " " << it->eta() << " " << it->phi() << endl;
-       //        	 }
-       
-       // Find two leading jets
-       TLorentzVector jet1, jet2;
-
-       reco::CaloJetCollection::const_iterator j1 = calojets_handle->begin();
-       reco::CaloJetCollection::const_iterator j2 = j1; ++j2;       
-
-       jet1.SetPtEtaPhiM(j1->pt(),j1->eta(),j1->phi(),j1->mass());
-       jet2.SetPtEtaPhiM(j2->pt(),j2->eta(),j2->phi(),j2->mass());       
-
-       //cout << "j1: " << jet1.Pt() << " " << jet1.Eta() << " " << jet1.Phi() << endl;
-       //cout << "j2: " << jet2.Pt() << " " << jet2.Eta() << " " << jet2.Phi() << endl;
-
-       // Create wide jets (radiation recovery algorithm)
-       for(reco::CaloJetCollection::const_iterator it = calojets_handle->begin(); it != calojets_handle->end(); ++it)
-	 {
-	   TLorentzVector currentJet;
-	   currentJet.SetPtEtaPhiM(it->pt(),it->eta(),it->phi(),it->mass());
-
-	   double DeltaR1 = currentJet.DeltaR(jet1);
-	   double DeltaR2 = currentJet.DeltaR(jet2);
-
-	   if(DeltaR1 < DeltaR2 && DeltaR1 < wideJetDeltaR_) {
-	     wj1_tmp += currentJet;
-	   } else if(DeltaR2 < wideJetDeltaR_) {
-	     wj2_tmp += currentJet;
-	   }
-	 }       
-
-       // Re-order the wide jets in pT
-       if( wj1_tmp.Pt() > wj2_tmp.Pt() )	
-	 { 
-	   wj1 = wj1_tmp;
-	   wj2 = wj2_tmp;
-	 }
-       else
-	 {
-	   wj1 = wj2_tmp;
-	   wj2 = wj1_tmp;
-	 }
-
-       // Create dijet system
-       wdijet = wj1 + wj2;
-
-       //        cout << "j1 wide: " << wj1.Pt() << " " << wj1.Eta() << " " << wj1.Phi() << " " << wj1.M() << endl;
-       //        cout << "j2 wide: " << wj2.Pt() << " " << wj2.Eta() << " " << wj2.Phi() << " " << wj2.M() << endl;
-       //        cout << "MJJWide: " << wdijet.M() << endl;
-       //        cout << "DeltaEtaJJWide: " << fabs(wj1.Eta()-wj2.Eta()) << endl;
-       //        cout << "DeltaPhiJJWide: " << fabs(wj1.DeltaPhi(wj2)) << endl;
- 
-       //        // Put variables in the container
-       //        dijetvariables->push_back( wdijet.M() );                 //0 = MJJWide
-       //        dijetvariables->push_back( fabs(wj1.Eta()-wj2.Eta()) );  //1 = DeltaEtaJJWide       
-       //        dijetvariables->push_back( fabs(wj1.DeltaPhi(wj2)) );    //2 = DeltaPhiJJWide             
-
-       // Put widejets in the container 
-       math::PtEtaPhiMLorentzVector wj1math(wj1.Pt(), wj1.Eta(), wj1.Phi(), wj1.M());
-       math::PtEtaPhiMLorentzVector wj2math(wj2.Pt(), wj2.Eta(), wj2.Phi(), wj2.M());
-       widejets->push_back( wj1math );
-       widejets->push_back( wj2math );
-     }
-   //    else
-   //      {
-   //        // Put variables in the container
-   //        dijetvariables->push_back( -1 );                //0 = MJJWide
-   //        dijetvariables->push_back( -1 );                //1 = DeltaEtaJJWide       
-   //        dijetvariables->push_back( -1 );                //2 = DeltaPhiJJWide       
-   //      }
-
-   // ## Put objects in the Event
-   //iEvent.put(std::move(dijetvariables), "dijetvariables");
-   iEvent.put(std::move(widejets), "widejets");
-
+DiJetVarProducer::~DiJetVarProducer() {}
+
+// ------------ method called to produce the data  ------------
+void DiJetVarProducer::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  using namespace std;
+  using namespace edm;
+  using namespace reco;
+
+  // ## The output collections
+  // std::unique_ptr<std::vector<double> > dijetvariables(new
+  // std::vector<double>);
+  std::unique_ptr<std::vector<math::PtEtaPhiMLorentzVector>> widejets(new std::vector<math::PtEtaPhiMLorentzVector>);
+
+  // ## Get jet collection
+  edm::Handle<reco::CaloJetCollection> calojets_handle;
+  iEvent.getByToken(inputJetTagToken_, calojets_handle);
+  // cout << "size: " << calojets_handle->size() << endl;
+
+  // ## Wide Jet Algorithm
+  // At least two jets
+  if (calojets_handle->size() >= 2) {
+    TLorentzVector wj1_tmp;
+    TLorentzVector wj2_tmp;
+    TLorentzVector wj1;
+    TLorentzVector wj2;
+    TLorentzVector wdijet;
+
+    //        // Loop over all the input jets
+    //        for(reco::CaloJetCollection::const_iterator it =
+    //        calojets_handle->begin(); it != calojets_handle->end(); ++it)
+    //        	 {
+    // 	   cout << "jet: " << it->pt() << " " << it->eta() << " " << it->phi()
+    // << endl;
+    //        	 }
+
+    // Find two leading jets
+    TLorentzVector jet1, jet2;
+
+    reco::CaloJetCollection::const_iterator j1 = calojets_handle->begin();
+    reco::CaloJetCollection::const_iterator j2 = j1;
+    ++j2;
+
+    jet1.SetPtEtaPhiM(j1->pt(), j1->eta(), j1->phi(), j1->mass());
+    jet2.SetPtEtaPhiM(j2->pt(), j2->eta(), j2->phi(), j2->mass());
+
+    // cout << "j1: " << jet1.Pt() << " " << jet1.Eta() << " " << jet1.Phi() <<
+    // endl; cout << "j2: " << jet2.Pt() << " " << jet2.Eta() << " " <<
+    // jet2.Phi() << endl;
+
+    // Create wide jets (radiation recovery algorithm)
+    for (reco::CaloJetCollection::const_iterator it = calojets_handle->begin(); it != calojets_handle->end(); ++it) {
+      TLorentzVector currentJet;
+      currentJet.SetPtEtaPhiM(it->pt(), it->eta(), it->phi(), it->mass());
+
+      double DeltaR1 = currentJet.DeltaR(jet1);
+      double DeltaR2 = currentJet.DeltaR(jet2);
+
+      if (DeltaR1 < DeltaR2 && DeltaR1 < wideJetDeltaR_) {
+        wj1_tmp += currentJet;
+      } else if (DeltaR2 < wideJetDeltaR_) {
+        wj2_tmp += currentJet;
+      }
+    }
+
+    // Re-order the wide jets in pT
+    if (wj1_tmp.Pt() > wj2_tmp.Pt()) {
+      wj1 = wj1_tmp;
+      wj2 = wj2_tmp;
+    } else {
+      wj1 = wj2_tmp;
+      wj2 = wj1_tmp;
+    }
+
+    // Create dijet system
+    wdijet = wj1 + wj2;
+
+    //        cout << "j1 wide: " << wj1.Pt() << " " << wj1.Eta() << " " <<
+    //        wj1.Phi() << " " << wj1.M() << endl; cout << "j2 wide: " <<
+    //        wj2.Pt() << " " << wj2.Eta() << " " << wj2.Phi() << " " << wj2.M()
+    //        << endl; cout << "MJJWide: " << wdijet.M() << endl; cout <<
+    //        "DeltaEtaJJWide: " << fabs(wj1.Eta()-wj2.Eta()) << endl; cout <<
+    //        "DeltaPhiJJWide: " << fabs(wj1.DeltaPhi(wj2)) << endl;
+
+    //        // Put variables in the container
+    //        dijetvariables->push_back( wdijet.M() );                 //0 =
+    //        MJJWide dijetvariables->push_back( fabs(wj1.Eta()-wj2.Eta()) );
+    //        //1 = DeltaEtaJJWide dijetvariables->push_back(
+    //        fabs(wj1.DeltaPhi(wj2)) );    //2 = DeltaPhiJJWide
+
+    // Put widejets in the container
+    math::PtEtaPhiMLorentzVector wj1math(wj1.Pt(), wj1.Eta(), wj1.Phi(), wj1.M());
+    math::PtEtaPhiMLorentzVector wj2math(wj2.Pt(), wj2.Eta(), wj2.Phi(), wj2.M());
+    widejets->push_back(wj1math);
+    widejets->push_back(wj2math);
+  }
+  //    else
+  //      {
+  //        // Put variables in the container
+  //        dijetvariables->push_back( -1 );                //0 = MJJWide
+  //        dijetvariables->push_back( -1 );                //1 = DeltaEtaJJWide
+  //        dijetvariables->push_back( -1 );                //2 = DeltaPhiJJWide
+  //      }
+
+  // ## Put objects in the Event
+  // iEvent.put(std::move(dijetvariables), "dijetvariables");
+  iEvent.put(std::move(widejets), "widejets");
 }
 
 DEFINE_FWK_MODULE(DiJetVarProducer);
diff --git a/DQM/DataScouting/src/RazorVarProducer.cc b/DQM/DataScouting/src/RazorVarProducer.cc
index dd44def894763..e2c49de1d396c 100644
--- a/DQM/DataScouting/src/RazorVarProducer.cc
+++ b/DQM/DataScouting/src/RazorVarProducer.cc
@@ -23,111 +23,102 @@
 //
 // constructors and destructor
 //
-RazorVarProducer::RazorVarProducer(const edm::ParameterSet& iConfig) :
-  inputTag_    (iConfig.getParameter<edm::InputTag>("inputTag")),
-  inputMetTag_ (iConfig.getParameter<edm::InputTag>("inputMetTag")){
-
-  //set Token(-s)
-  inputTagToken_ = consumes<std::vector<math::XYZTLorentzVector> >(iConfig.getParameter<edm::InputTag>("inputTag"));
+RazorVarProducer::RazorVarProducer(const edm::ParameterSet &iConfig)
+    : inputTag_(iConfig.getParameter<edm::InputTag>("inputTag")),
+      inputMetTag_(iConfig.getParameter<edm::InputTag>("inputMetTag")) {
+  // set Token(-s)
+  inputTagToken_ = consumes<std::vector<math::XYZTLorentzVector>>(iConfig.getParameter<edm::InputTag>("inputTag"));
   inputMetTagToken_ = consumes<reco::CaloMETCollection>(iConfig.getParameter<edm::InputTag>("inputMetTag"));
 
-  produces<std::vector<double> >();
+  produces<std::vector<double>>();
 
-  LogDebug("") << "Inputs: "
-	       << inputTag_.encode() << " "
-	       << inputMetTag_.encode() << ".";
+  LogDebug("") << "Inputs: " << inputTag_.encode() << " " << inputMetTag_.encode() << ".";
 }
 
-RazorVarProducer::~RazorVarProducer()
-{
+RazorVarProducer::~RazorVarProducer() {}
+
+// ------------ method called to produce the data  ------------
+void RazorVarProducer::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  using namespace std;
+  using namespace edm;
+  using namespace reco;
+
+  // get hold of collection of objects
+  Handle<vector<math::XYZTLorentzVector>> hemispheres;
+  iEvent.getByToken(inputTagToken_, hemispheres);
+
+  // get hold of the MET Collection
+  Handle<CaloMETCollection> inputMet;
+  iEvent.getByToken(inputMetTagToken_, inputMet);
+
+  std::unique_ptr<std::vector<double>> result(new std::vector<double>);
+  // check the the input collections are available
+  if (hemispheres.isValid() && inputMet.isValid() && hemispheres->size() > 1) {
+    TLorentzVector ja(hemispheres->at(0).x(), hemispheres->at(0).y(), hemispheres->at(0).z(), hemispheres->at(0).t());
+    TLorentzVector jb(hemispheres->at(1).x(), hemispheres->at(1).y(), hemispheres->at(1).z(), hemispheres->at(1).t());
+
+    std::vector<math::XYZTLorentzVector> muonVec;
+    const double MR = CalcMR(ja, jb);
+    const double R = CalcR(MR, ja, jb, inputMet, muonVec);
+    result->push_back(MR);
+    result->push_back(R);
+  }
+  iEvent.put(std::move(result));
 }
 
-// ------------ method called to produce the data  ------------ 
-void
-RazorVarProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace std;
-   using namespace edm;
-   using namespace reco;
-
-
-   // get hold of collection of objects
-   Handle< vector<math::XYZTLorentzVector> > hemispheres;
-   iEvent.getByToken (inputTagToken_, hemispheres);
-
-   // get hold of the MET Collection
-   Handle<CaloMETCollection> inputMet;
-   iEvent.getByToken(inputMetTagToken_, inputMet);
-
-   std::unique_ptr<std::vector<double> > result(new std::vector<double>); 
-   // check the the input collections are available
-   if (hemispheres.isValid() && inputMet.isValid() && hemispheres->size() > 1){
-
-     TLorentzVector ja(hemispheres->at(0).x(),hemispheres->at(0).y(),hemispheres->at(0).z(),hemispheres->at(0).t());
-     TLorentzVector jb(hemispheres->at(1).x(),hemispheres->at(1).y(),hemispheres->at(1).z(),hemispheres->at(1).t());
-
-     std::vector<math::XYZTLorentzVector> muonVec;
-     const double MR = CalcMR(ja,jb);
-     const double R  = CalcR(MR,ja,jb,inputMet,muonVec);
-     result->push_back(MR);
-     result->push_back(R);
-     
-   }
-   iEvent.put(std::move(result));
-}
+double RazorVarProducer::CalcMR(TLorentzVector ja, TLorentzVector jb) {
+  if (ja.Pt() <= 0.1)
+    return -1;
 
-double 
-RazorVarProducer::CalcMR(TLorentzVector ja, TLorentzVector jb){
-  if(ja.Pt()<=0.1) return -1;
+  ja.SetPtEtaPhiM(ja.Pt(), ja.Eta(), ja.Phi(), 0.0);
+  jb.SetPtEtaPhiM(jb.Pt(), jb.Eta(), jb.Phi(), 0.0);
 
-  ja.SetPtEtaPhiM(ja.Pt(),ja.Eta(),ja.Phi(),0.0);
-  jb.SetPtEtaPhiM(jb.Pt(),jb.Eta(),jb.Phi(),0.0);
-  
-  if(ja.Pt() > jb.Pt()){
+  if (ja.Pt() > jb.Pt()) {
     TLorentzVector temp = ja;
     ja = jb;
     jb = temp;
   }
-  
+
   double A = ja.P();
   double B = jb.P();
   double az = ja.Pz();
   double bz = jb.Pz();
   TVector3 jaT, jbT;
-  jaT.SetXYZ(ja.Px(),ja.Py(),0.0);
-  jbT.SetXYZ(jb.Px(),jb.Py(),0.0);
-  double ATBT = (jaT+jbT).Mag2();
-  
-  double MR = sqrt((A+B)*(A+B)-(az+bz)*(az+bz)-
-		   (jbT.Dot(jbT)-jaT.Dot(jaT))*(jbT.Dot(jbT)-jaT.Dot(jaT))/(jaT+jbT).Mag2());
-  
-  double mybeta = (jbT.Dot(jbT)-jaT.Dot(jaT))/
-    sqrt(ATBT*((A+B)*(A+B)-(az+bz)*(az+bz)));
-  
-  double mygamma = 1./sqrt(1.-mybeta*mybeta);
-  
-  //use gamma times MRstar
-  return MR*mygamma;  
+  jaT.SetXYZ(ja.Px(), ja.Py(), 0.0);
+  jbT.SetXYZ(jb.Px(), jb.Py(), 0.0);
+  double ATBT = (jaT + jbT).Mag2();
+
+  double MR = sqrt((A + B) * (A + B) - (az + bz) * (az + bz) -
+                   (jbT.Dot(jbT) - jaT.Dot(jaT)) * (jbT.Dot(jbT) - jaT.Dot(jaT)) / (jaT + jbT).Mag2());
+
+  double mybeta = (jbT.Dot(jbT) - jaT.Dot(jaT)) / sqrt(ATBT * ((A + B) * (A + B) - (az + bz) * (az + bz)));
+
+  double mygamma = 1. / sqrt(1. - mybeta * mybeta);
+
+  // use gamma times MRstar
+  return MR * mygamma;
 }
 
-double 
-RazorVarProducer::CalcR(double MR, const TLorentzVector& ja, const TLorentzVector& jb, edm::Handle<reco::CaloMETCollection> inputMet, const std::vector<math::XYZTLorentzVector>& muons){
-  //now we can calculate MTR
+double RazorVarProducer::CalcR(double MR,
+                               const TLorentzVector &ja,
+                               const TLorentzVector &jb,
+                               edm::Handle<reco::CaloMETCollection> inputMet,
+                               const std::vector<math::XYZTLorentzVector> &muons) {
+  // now we can calculate MTR
   TVector3 met;
-  met.SetPtEtaPhi((inputMet->front()).pt(),0.0,(inputMet->front()).phi());
-  
+  met.SetPtEtaPhi((inputMet->front()).pt(), 0.0, (inputMet->front()).phi());
+
   std::vector<math::XYZTLorentzVector>::const_iterator muonIt;
-  for(muonIt = muons.begin(); muonIt!=muons.end(); muonIt++){
+  for (muonIt = muons.begin(); muonIt != muons.end(); muonIt++) {
     TVector3 tmp;
-    tmp.SetPtEtaPhi(muonIt->pt(),0,muonIt->phi());
-    met-=tmp;
+    tmp.SetPtEtaPhi(muonIt->pt(), 0, muonIt->phi());
+    met -= tmp;
   }
 
-  double MTR = sqrt(0.5*(met.Mag()*(ja.Pt()+jb.Pt()) - met.Dot(ja.Vect()+jb.Vect())));
-  
-  //filter events
-  return float(MTR)/float(MR); //R
-  
+  double MTR = sqrt(0.5 * (met.Mag() * (ja.Pt() + jb.Pt()) - met.Dot(ja.Vect() + jb.Vect())));
+
+  // filter events
+  return float(MTR) / float(MR);  // R
 }
 
 DEFINE_FWK_MODULE(RazorVarProducer);
diff --git a/DQM/DataScouting/src/ScoutingAnalyzerBase.cc b/DQM/DataScouting/src/ScoutingAnalyzerBase.cc
index c4ecf4f28fe52..06f4608ef0203 100644
--- a/DQM/DataScouting/src/ScoutingAnalyzerBase.cc
+++ b/DQM/DataScouting/src/ScoutingAnalyzerBase.cc
@@ -1,199 +1,299 @@
 #include "DQM/DataScouting/interface/ScoutingAnalyzerBase.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include <iostream>
 #include <sstream>
 
-ScoutingAnalyzerBase::ScoutingAnalyzerBase( const edm::ParameterSet& conf ) {
-  m_MEsPath = conf.getUntrackedParameter<std::string>("rootPath","DataScouting") ;
-  m_modulePath = conf.getUntrackedParameter<std::string>("modulePath","DataScouting") ;
-  m_verbosityLevel = conf.getUntrackedParameter<unsigned int>("verbosityLevel", 0) ;
+ScoutingAnalyzerBase::ScoutingAnalyzerBase(const edm::ParameterSet &conf) {
+  m_MEsPath = conf.getUntrackedParameter<std::string>("rootPath", "DataScouting");
+  m_modulePath = conf.getUntrackedParameter<std::string>("modulePath", "DataScouting");
+  m_verbosityLevel = conf.getUntrackedParameter<unsigned int>("verbosityLevel", 0);
   if (!m_modulePath.empty()) {
-    m_MEsPath+="/"+m_modulePath;
+    m_MEsPath += "/" + m_modulePath;
   }
 }
 
 ScoutingAnalyzerBase::~ScoutingAnalyzerBase() {}
 
-inline std::string ScoutingAnalyzerBase::newName(const std::string & name) {
+inline std::string ScoutingAnalyzerBase::newName(const std::string &name) {
   // let's keep it in case we need massage
   return name;
 }
 
-void ScoutingAnalyzerBase::prepareBooking(DQMStore::IBooker & iBooker) {
-  iBooker.setCurrentFolder(m_MEsPath);
-}
+void ScoutingAnalyzerBase::prepareBooking(DQMStore::IBooker &iBooker) { iBooker.setCurrentFolder(m_MEsPath); }
 
-MonitorElement * ScoutingAnalyzerBase::bookH1
-( DQMStore::IBooker & iBooker,
-  const std::string & name, const std::string & title,
-  int nchX, double lowX, double highX,
-  const std::string & titleX, const std::string & titleY,
-  Option_t * option ) {
-  MonitorElement * me = iBooker.book1DD(newName(name),title,nchX,lowX,highX) ;
-  if (titleX!="") { me->getTH1()->GetXaxis()->SetTitle(titleX.c_str()) ; }
-  if (titleY!="") { me->getTH1()->GetYaxis()->SetTitle(titleY.c_str()) ; }
-  if (TString(option)!="") { me->getTH1()->SetOption(option) ; }
-  return me ;
+MonitorElement *ScoutingAnalyzerBase::bookH1(DQMStore::IBooker &iBooker,
+                                             const std::string &name,
+                                             const std::string &title,
+                                             int nchX,
+                                             double lowX,
+                                             double highX,
+                                             const std::string &titleX,
+                                             const std::string &titleY,
+                                             Option_t *option) {
+  MonitorElement *me = iBooker.book1DD(newName(name), title, nchX, lowX, highX);
+  if (!titleX.empty()) {
+    me->getTH1()->GetXaxis()->SetTitle(titleX.c_str());
+  }
+  if (!titleY.empty()) {
+    me->getTH1()->GetYaxis()->SetTitle(titleY.c_str());
+  }
+  if (TString(option) != "") {
+    me->getTH1()->SetOption(option);
+  }
+  return me;
 }
 
-MonitorElement * ScoutingAnalyzerBase::bookH1withSumw2
-( DQMStore::IBooker & iBooker,
-  const std::string & name, const std::string & title,
-  int nchX, double lowX, double highX,
-  const std::string & titleX, const std::string & titleY,
-  Option_t * option ) {
+MonitorElement *ScoutingAnalyzerBase::bookH1withSumw2(DQMStore::IBooker &iBooker,
+                                                      const std::string &name,
+                                                      const std::string &title,
+                                                      int nchX,
+                                                      double lowX,
+                                                      double highX,
+                                                      const std::string &titleX,
+                                                      const std::string &titleY,
+                                                      Option_t *option) {
   std::cout << newName(name) << std::endl;
-  MonitorElement * me = iBooker.book1DD(newName(name),title,nchX,lowX,highX) ;
-  me->getTH1()->Sumw2() ;
-  if (titleX!="") { me->getTH1()->GetXaxis()->SetTitle(titleX.c_str()) ; }
-  if (titleY!="") { me->getTH1()->GetYaxis()->SetTitle(titleY.c_str()) ; }
-  if (TString(option)!="") { me->getTH1()->SetOption(option) ; }
-  return me ;
+  MonitorElement *me = iBooker.book1DD(newName(name), title, nchX, lowX, highX);
+  me->getTH1()->Sumw2();
+  if (!titleX.empty()) {
+    me->getTH1()->GetXaxis()->SetTitle(titleX.c_str());
+  }
+  if (!titleY.empty()) {
+    me->getTH1()->GetYaxis()->SetTitle(titleY.c_str());
+  }
+  if (TString(option) != "") {
+    me->getTH1()->SetOption(option);
+  }
+  return me;
 }
 
-MonitorElement * ScoutingAnalyzerBase::bookH1BinArray
-( DQMStore::IBooker & iBooker,
-  const std::string & name, const std::string & title,
-  int nchX, float *xbinsize,
-  const std::string & titleX, const std::string & titleY,
-  Option_t * option ) {
-  MonitorElement * me = iBooker.book1D(newName(name),title,nchX,xbinsize) ;
-  //book1DD not implemented in DQMServices/Core/src/DQMStore.cc
-  if (titleX!="") { me->getTH1()->GetXaxis()->SetTitle(titleX.c_str()) ; }
-  if (titleY!="") { me->getTH1()->GetYaxis()->SetTitle(titleY.c_str()) ; }
-  if (TString(option)!="") { me->getTH1()->SetOption(option) ; }
-  return me ;
+MonitorElement *ScoutingAnalyzerBase::bookH1BinArray(DQMStore::IBooker &iBooker,
+                                                     const std::string &name,
+                                                     const std::string &title,
+                                                     int nchX,
+                                                     float *xbinsize,
+                                                     const std::string &titleX,
+                                                     const std::string &titleY,
+                                                     Option_t *option) {
+  MonitorElement *me = iBooker.book1D(newName(name), title, nchX, xbinsize);
+  // book1DD not implemented in DQMServices/Core/src/DQMStore.cc
+  if (!titleX.empty()) {
+    me->getTH1()->GetXaxis()->SetTitle(titleX.c_str());
+  }
+  if (!titleY.empty()) {
+    me->getTH1()->GetYaxis()->SetTitle(titleY.c_str());
+  }
+  if (TString(option) != "") {
+    me->getTH1()->SetOption(option);
+  }
+  return me;
 }
 
-MonitorElement * ScoutingAnalyzerBase::bookH1withSumw2BinArray
-( DQMStore::IBooker & iBooker,
-  const std::string & name, const std::string & title,
-  int nchX, float *xbinsize,
-  const std::string & titleX, const std::string & titleY,
-  Option_t * option ) {
+MonitorElement *ScoutingAnalyzerBase::bookH1withSumw2BinArray(DQMStore::IBooker &iBooker,
+                                                              const std::string &name,
+                                                              const std::string &title,
+                                                              int nchX,
+                                                              float *xbinsize,
+                                                              const std::string &titleX,
+                                                              const std::string &titleY,
+                                                              Option_t *option) {
   std::cout << newName(name) << std::endl;
-  MonitorElement * me = iBooker.book1D(newName(name),title,nchX,xbinsize) ;
-  //book1DD not implemented in DQMServices/Core/src/DQMStore.cc
-  me->getTH1()->Sumw2() ;
-  if (titleX!="") { me->getTH1()->GetXaxis()->SetTitle(titleX.c_str()) ; }
-  if (titleY!="") { me->getTH1()->GetYaxis()->SetTitle(titleY.c_str()) ; }
-  if (TString(option)!="") { me->getTH1()->SetOption(option) ; }
-  return me ;
+  MonitorElement *me = iBooker.book1D(newName(name), title, nchX, xbinsize);
+  // book1DD not implemented in DQMServices/Core/src/DQMStore.cc
+  me->getTH1()->Sumw2();
+  if (!titleX.empty()) {
+    me->getTH1()->GetXaxis()->SetTitle(titleX.c_str());
+  }
+  if (!titleY.empty()) {
+    me->getTH1()->GetYaxis()->SetTitle(titleY.c_str());
+  }
+  if (TString(option) != "") {
+    me->getTH1()->SetOption(option);
+  }
+  return me;
 }
 
-MonitorElement * ScoutingAnalyzerBase::bookH2
-( DQMStore::IBooker & iBooker,
-  const std::string & name, const std::string & title,
-  int nchX, double lowX, double highX,
-  int nchY, double lowY, double highY,
-  const std::string & titleX, const std::string & titleY,
-  Option_t * option ) {
-  MonitorElement * me = iBooker.book2DD(newName(name),title,nchX,lowX,highX,nchY,lowY,highY) ;
-  if (titleX!="") { me->getTH1()->GetXaxis()->SetTitle(titleX.c_str()) ; }
-  if (titleY!="") { me->getTH1()->GetYaxis()->SetTitle(titleY.c_str()) ; }
-  if (TString(option)!="") { me->getTH1()->SetOption(option) ; }
-  return me ;
+MonitorElement *ScoutingAnalyzerBase::bookH2(DQMStore::IBooker &iBooker,
+                                             const std::string &name,
+                                             const std::string &title,
+                                             int nchX,
+                                             double lowX,
+                                             double highX,
+                                             int nchY,
+                                             double lowY,
+                                             double highY,
+                                             const std::string &titleX,
+                                             const std::string &titleY,
+                                             Option_t *option) {
+  MonitorElement *me = iBooker.book2DD(newName(name), title, nchX, lowX, highX, nchY, lowY, highY);
+  if (!titleX.empty()) {
+    me->getTH1()->GetXaxis()->SetTitle(titleX.c_str());
+  }
+  if (!titleY.empty()) {
+    me->getTH1()->GetYaxis()->SetTitle(titleY.c_str());
+  }
+  if (TString(option) != "") {
+    me->getTH1()->SetOption(option);
+  }
+  return me;
 }
 
-MonitorElement * ScoutingAnalyzerBase::bookH2withSumw2
-( DQMStore::IBooker & iBooker,
-  const std::string & name, const std::string & title,
-  int nchX, double lowX, double highX,
-  int nchY, double lowY, double highY,
-  const std::string & titleX, const std::string & titleY,
-  Option_t * option ) {
-  MonitorElement * me = iBooker.book2DD(newName(name),title,nchX,lowX,highX,nchY,lowY,highY) ;
-  me->getTH1()->Sumw2() ;
-  if (titleX!="") { me->getTH1()->GetXaxis()->SetTitle(titleX.c_str()) ; }
-  if (titleY!="") { me->getTH1()->GetYaxis()->SetTitle(titleY.c_str()) ; }
-  if (TString(option)!="") { me->getTH1()->SetOption(option) ; }
-  return me ;
+MonitorElement *ScoutingAnalyzerBase::bookH2withSumw2(DQMStore::IBooker &iBooker,
+                                                      const std::string &name,
+                                                      const std::string &title,
+                                                      int nchX,
+                                                      double lowX,
+                                                      double highX,
+                                                      int nchY,
+                                                      double lowY,
+                                                      double highY,
+                                                      const std::string &titleX,
+                                                      const std::string &titleY,
+                                                      Option_t *option) {
+  MonitorElement *me = iBooker.book2DD(newName(name), title, nchX, lowX, highX, nchY, lowY, highY);
+  me->getTH1()->Sumw2();
+  if (!titleX.empty()) {
+    me->getTH1()->GetXaxis()->SetTitle(titleX.c_str());
+  }
+  if (!titleY.empty()) {
+    me->getTH1()->GetYaxis()->SetTitle(titleY.c_str());
+  }
+  if (TString(option) != "") {
+    me->getTH1()->SetOption(option);
+  }
+  return me;
 }
 
-MonitorElement * ScoutingAnalyzerBase::bookP1
-( DQMStore::IBooker & iBooker,
-  const std::string & name, const std::string & title,
-  int nchX, double lowX, double highX,
-  double lowY, double highY,
-  const std::string & titleX, const std::string & titleY,
-  Option_t * option ) {
-  MonitorElement * me = iBooker.bookProfile(newName(name),title,nchX,lowX,highX,lowY,highY," ") ;
-  if (titleX!="") { me->getTProfile()->GetXaxis()->SetTitle(titleX.c_str()) ; }
-  if (titleY!="") { me->getTProfile()->GetYaxis()->SetTitle(titleY.c_str()) ; }
-  if (TString(option)!="") { me->getTProfile()->SetOption(option) ; }
-  return me ;
+MonitorElement *ScoutingAnalyzerBase::bookP1(DQMStore::IBooker &iBooker,
+                                             const std::string &name,
+                                             const std::string &title,
+                                             int nchX,
+                                             double lowX,
+                                             double highX,
+                                             double lowY,
+                                             double highY,
+                                             const std::string &titleX,
+                                             const std::string &titleY,
+                                             Option_t *option) {
+  MonitorElement *me = iBooker.bookProfile(newName(name), title, nchX, lowX, highX, lowY, highY, " ");
+  if (!titleX.empty()) {
+    me->getTProfile()->GetXaxis()->SetTitle(titleX.c_str());
+  }
+  if (!titleY.empty()) {
+    me->getTProfile()->GetYaxis()->SetTitle(titleY.c_str());
+  }
+  if (TString(option) != "") {
+    me->getTProfile()->SetOption(option);
+  }
+  return me;
 }
 
-MonitorElement * ScoutingAnalyzerBase::bookH1andDivide
-( DQMStore::IBooker & iBooker,
-  const std::string & name, MonitorElement * num, MonitorElement * denom,
-  const std::string & titleX, const std::string & titleY,
-  const std::string & title ) {
-  std::string name2 = newName(name) ;
-  TH1D * h_temp = dynamic_cast<TH1D*>(num->getTH1()->Clone(name2.c_str()) );
-  h_temp->Reset() ;
-  h_temp->Divide(num->getTH1(),denom->getTH1(),1,1,"b") ;
-  h_temp->GetXaxis()->SetTitle(titleX.c_str()) ;
-  h_temp->GetYaxis()->SetTitle(titleY.c_str()) ;
-  if (title!="") { h_temp->SetTitle(title.c_str()) ; }
-  if (m_verbosityLevel>0) { h_temp->Print() ; }
-  MonitorElement * me = iBooker.book1DD(name2,h_temp) ;
-  delete h_temp ;
-  return me ;
+MonitorElement *ScoutingAnalyzerBase::bookH1andDivide(DQMStore::IBooker &iBooker,
+                                                      const std::string &name,
+                                                      MonitorElement *num,
+                                                      MonitorElement *denom,
+                                                      const std::string &titleX,
+                                                      const std::string &titleY,
+                                                      const std::string &title) {
+  std::string name2 = newName(name);
+  TH1D *h_temp = dynamic_cast<TH1D *>(num->getTH1()->Clone(name2.c_str()));
+  h_temp->Reset();
+  h_temp->Divide(num->getTH1(), denom->getTH1(), 1, 1, "b");
+  h_temp->GetXaxis()->SetTitle(titleX.c_str());
+  h_temp->GetYaxis()->SetTitle(titleY.c_str());
+  if (!title.empty()) {
+    h_temp->SetTitle(title.c_str());
+  }
+  if (m_verbosityLevel > 0) {
+    h_temp->Print();
+  }
+  MonitorElement *me = iBooker.book1DD(name2, h_temp);
+  delete h_temp;
+  return me;
 }
 
-MonitorElement * ScoutingAnalyzerBase::bookH2andDivide
-( DQMStore::IBooker & iBooker,
-  const std::string & name, MonitorElement * num, MonitorElement * denom,
-  const std::string & titleX, const std::string & titleY,
-  const std::string & title ) {
-  std::string name2 = newName(name) ;
-  TH2D * h_temp = dynamic_cast<TH2D*>(num->getTH1()->Clone(name2.c_str()) );
-  h_temp->Reset() ;
-  h_temp->Divide(num->getTH1(),denom->getTH1(),1,1,"b") ;
-  h_temp->GetXaxis()->SetTitle(titleX.c_str()) ;
-  h_temp->GetYaxis()->SetTitle(titleY.c_str()) ;
-  if (title!="") { h_temp->SetTitle(title.c_str()) ; }
-  if (m_verbosityLevel>0) { h_temp->Print() ; }
-  MonitorElement * me = iBooker.book2DD(name2,h_temp) ;
-  delete h_temp ;
-  return me ;
+MonitorElement *ScoutingAnalyzerBase::bookH2andDivide(DQMStore::IBooker &iBooker,
+                                                      const std::string &name,
+                                                      MonitorElement *num,
+                                                      MonitorElement *denom,
+                                                      const std::string &titleX,
+                                                      const std::string &titleY,
+                                                      const std::string &title) {
+  std::string name2 = newName(name);
+  TH2D *h_temp = dynamic_cast<TH2D *>(num->getTH1()->Clone(name2.c_str()));
+  h_temp->Reset();
+  h_temp->Divide(num->getTH1(), denom->getTH1(), 1, 1, "b");
+  h_temp->GetXaxis()->SetTitle(titleX.c_str());
+  h_temp->GetYaxis()->SetTitle(titleY.c_str());
+  if (!title.empty()) {
+    h_temp->SetTitle(title.c_str());
+  }
+  if (m_verbosityLevel > 0) {
+    h_temp->Print();
+  }
+  MonitorElement *me = iBooker.book2DD(name2, h_temp);
+  delete h_temp;
+  return me;
 }
 
-MonitorElement * ScoutingAnalyzerBase::profileX
-( DQMStore::IBooker & iBooker,
-  MonitorElement * me2d,
-  const std::string & title, const std::string & titleX, const std::string & titleY,
-  Double_t minimum, Double_t maximum ) {
-  std::string name2 = me2d->getName()+"_pfx" ;
-  TProfile * p1_temp = me2d->getTH2D()->ProfileX() ;
-  if (title!="") { p1_temp->SetTitle(title.c_str()) ; }
-  if (titleX!="") { p1_temp->GetXaxis()->SetTitle(titleX.c_str()) ; }
-  if (titleY!="") { p1_temp->GetYaxis()->SetTitle(titleY.c_str()) ; }
-  if (minimum!=-1111) { p1_temp->SetMinimum(minimum) ; }
-  if (maximum!=-1111) { p1_temp->SetMaximum(maximum) ; }
-  MonitorElement * me = iBooker.bookProfile(name2,p1_temp) ;
-  delete p1_temp ;
-  return me ;
+MonitorElement *ScoutingAnalyzerBase::profileX(DQMStore::IBooker &iBooker,
+                                               MonitorElement *me2d,
+                                               const std::string &title,
+                                               const std::string &titleX,
+                                               const std::string &titleY,
+                                               Double_t minimum,
+                                               Double_t maximum) {
+  std::string name2 = me2d->getName() + "_pfx";
+  TProfile *p1_temp = me2d->getTH2D()->ProfileX();
+  if (!title.empty()) {
+    p1_temp->SetTitle(title.c_str());
+  }
+  if (!titleX.empty()) {
+    p1_temp->GetXaxis()->SetTitle(titleX.c_str());
+  }
+  if (!titleY.empty()) {
+    p1_temp->GetYaxis()->SetTitle(titleY.c_str());
+  }
+  if (minimum != -1111) {
+    p1_temp->SetMinimum(minimum);
+  }
+  if (maximum != -1111) {
+    p1_temp->SetMaximum(maximum);
+  }
+  MonitorElement *me = iBooker.bookProfile(name2, p1_temp);
+  delete p1_temp;
+  return me;
 }
 
-MonitorElement * ScoutingAnalyzerBase::profileY
-( DQMStore::IBooker & iBooker,
-  MonitorElement * me2d,
-  const std::string & title, const std::string & titleX, const std::string & titleY,
-  Double_t minimum, Double_t maximum ) {
-  std::string name2 = me2d->getName()+"_pfy" ;
-  TProfile * p1_temp = me2d->getTH2D()->ProfileY() ;
-  if (title!="") { p1_temp->SetTitle(title.c_str()) ; }
-  if (titleX!="") { p1_temp->GetXaxis()->SetTitle(titleX.c_str()) ; }
-  if (titleY!="") { p1_temp->GetYaxis()->SetTitle(titleY.c_str()) ; }
-  if (minimum!=-1111) { p1_temp->SetMinimum(minimum) ; }
-  if (maximum!=-1111) { p1_temp->SetMaximum(maximum) ; }
-  MonitorElement * me = iBooker.bookProfile(name2,p1_temp) ;
-  delete p1_temp ;
-  return me ;
+MonitorElement *ScoutingAnalyzerBase::profileY(DQMStore::IBooker &iBooker,
+                                               MonitorElement *me2d,
+                                               const std::string &title,
+                                               const std::string &titleX,
+                                               const std::string &titleY,
+                                               Double_t minimum,
+                                               Double_t maximum) {
+  std::string name2 = me2d->getName() + "_pfy";
+  TProfile *p1_temp = me2d->getTH2D()->ProfileY();
+  if (!title.empty()) {
+    p1_temp->SetTitle(title.c_str());
+  }
+  if (!titleX.empty()) {
+    p1_temp->GetXaxis()->SetTitle(titleX.c_str());
+  }
+  if (!titleY.empty()) {
+    p1_temp->GetYaxis()->SetTitle(titleY.c_str());
+  }
+  if (minimum != -1111) {
+    p1_temp->SetMinimum(minimum);
+  }
+  if (maximum != -1111) {
+    p1_temp->SetMaximum(maximum);
+  }
+  MonitorElement *me = iBooker.bookProfile(name2, p1_temp);
+  delete p1_temp;
+  return me;
 }
diff --git a/DQM/EcalCommon/interface/DQWorker.h b/DQM/EcalCommon/interface/DQWorker.h
index 3b35b320f4607..67560bdaaddd3 100644
--- a/DQM/EcalCommon/interface/DQWorker.h
+++ b/DQM/EcalCommon/interface/DQWorker.h
@@ -1,27 +1,27 @@
 #ifndef DQWorker_H
 #define DQWorker_H
 
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
 
 #include "DQM/EcalCommon/interface/MESet.h"
 
-#include "DataFormats/Provenance/interface/RunID.h"
 #include "DataFormats/Provenance/interface/EventID.h"
+#include "DataFormats/Provenance/interface/RunID.h"
 
 #include "tbb/concurrent_unordered_map.h"
 
-namespace edm{
+namespace edm {
   class Run;
   class LuminosityBlock;
   class Event;
   class EventSetup;
   class ParameterSet;
   class ParameterSetDescription;
-}
+}  // namespace edm
 
-namespace ecaldqm{
+namespace ecaldqm {
 
   class WorkerFactoryStore;
 
@@ -39,25 +39,25 @@ namespace ecaldqm{
 
   protected:
     void setVerbosity(int _verbosity) { verbosity_ = _verbosity; }
-    void initialize(std::string const& _name, edm::ParameterSet const&);
+    void initialize(std::string const &_name, edm::ParameterSet const &);
 
-    virtual void setME(edm::ParameterSet const&);
-    virtual void setSource(edm::ParameterSet const&) {} // for clients
-    virtual void setParams(edm::ParameterSet const&) {}
+    virtual void setME(edm::ParameterSet const &);
+    virtual void setSource(edm::ParameterSet const &) {}  // for clients
+    virtual void setParams(edm::ParameterSet const &) {}
 
   public:
     DQWorker();
     virtual ~DQWorker() noexcept(false);
 
-    static void fillDescriptions(edm::ParameterSetDescription& _desc);
+    static void fillDescriptions(edm::ParameterSetDescription &_desc);
 
-    virtual void beginRun(edm::Run const&, edm::EventSetup const&) {}
-    virtual void endRun(edm::Run const&, edm::EventSetup const&) {}
+    virtual void beginRun(edm::Run const &, edm::EventSetup const &) {}
+    virtual void endRun(edm::Run const &, edm::EventSetup const &) {}
 
-    virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {}
-    virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {}
+    virtual void beginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) {}
+    virtual void endLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) {}
 
-    virtual void bookMEs(DQMStore::IBooker&);
+    virtual void bookMEs(DQMStore::IBooker &);
     virtual void releaseMEs();
 
     void setTime(time_t _t) { timestamp_.now = _t; }
@@ -65,11 +65,11 @@ namespace ecaldqm{
     void setLumiNumber(edm::LuminosityBlockNumber_t _l) { timestamp_.iLumi = _l; }
     void setEventNumber(edm::EventNumber_t _e) { timestamp_.iEvt = _e; }
 
-    std::string const& getName() const { return name_; }
-    bool onlineMode() const { return onlineMode_; } 
+    std::string const &getName() const { return name_; }
+    bool onlineMode() const { return onlineMode_; }
 
   protected:
-    void print_(std::string const&, int = 0) const;
+    void print_(std::string const &, int = 0) const;
 
     std::string name_;
     MESetCollection MEs_;
@@ -83,29 +83,29 @@ namespace ecaldqm{
     bool willConvertToEDM_;
   };
 
-
-  typedef DQWorker* (*WorkerFactory)();
+  typedef DQWorker *(*WorkerFactory)();
 
   // to be instantiated after the implementation of each worker module
   class WorkerFactoryStore {
   public:
-    template<typename Worker>
+    template <typename Worker>
     struct Registration {
-      Registration(std::string const& _name){ WorkerFactoryStore::singleton()->registerFactory(_name, []() -> DQWorker* { return new Worker(); }); }
+      Registration(std::string const &_name) {
+        WorkerFactoryStore::singleton()->registerFactory(_name, []() -> DQWorker * { return new Worker(); });
+      }
     };
-    
-    void registerFactory(std::string const& _name, WorkerFactory _f) { workerFactories_[_name] = _f; }
-    DQWorker* getWorker(std::string const&, int, edm::ParameterSet const&, edm::ParameterSet const&) const;
 
-    static WorkerFactoryStore* singleton();
+    void registerFactory(std::string const &_name, WorkerFactory _f) { workerFactories_[_name] = _f; }
+    DQWorker *getWorker(std::string const &, int, edm::ParameterSet const &, edm::ParameterSet const &) const;
+
+    static WorkerFactoryStore *singleton();
 
   private:
     tbb::concurrent_unordered_map<std::string, WorkerFactory> workerFactories_;
   };
 
-}
+}  // namespace ecaldqm
 
-#define DEFINE_ECALDQM_WORKER(TYPE) \
-  WorkerFactoryStore::Registration<TYPE> ecaldqm##TYPE##Registration(#TYPE)
+#define DEFINE_ECALDQM_WORKER(TYPE) WorkerFactoryStore::Registration<TYPE> ecaldqm##TYPE##Registration(#TYPE)
 
 #endif
diff --git a/DQM/EcalCommon/interface/EcalDQMCommonUtils.h b/DQM/EcalCommon/interface/EcalDQMCommonUtils.h
index de3efaa80b983..b08b7a001479c 100644
--- a/DQM/EcalCommon/interface/EcalDQMCommonUtils.h
+++ b/DQM/EcalCommon/interface/EcalDQMCommonUtils.h
@@ -1,39 +1,91 @@
 #ifndef EcalDQMCommonUtils_H
 #define EcalDQMCommonUtils_H
 
-#include <iomanip>
 #include <algorithm>
 #include <cmath>
+#include <iomanip>
 
-#include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h"
-#include "Geometry/CaloTopology/interface/EcalTrigTowerConstituentsMap.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloTopology/interface/CaloTopology.h"
+#include "Geometry/CaloTopology/interface/EcalTrigTowerConstituentsMap.h"
+#include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h"
 
-#include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
 #include "DataFormats/EcalDetId/interface/EEDetId.h"
+#include "DataFormats/EcalDetId/interface/EcalElectronicsId.h"
+#include "DataFormats/EcalDetId/interface/EcalPnDiodeDetId.h"
 #include "DataFormats/EcalDetId/interface/EcalScDetId.h"
+#include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 #include "DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h"
-#include "DataFormats/EcalDetId/interface/EcalElectronicsId.h"
 #include "DataFormats/EcalDetId/interface/EcalTriggerElectronicsId.h"
-#include "DataFormats/EcalDetId/interface/EcalPnDiodeDetId.h"
 
 #include "FWCore/Utilities/interface/Exception.h"
 
 namespace ecaldqm {
 
   enum SMName {
-    kEEm07, kEEm08, kEEm09, kEEm01, kEEm02, kEEm03, kEEm04, kEEm05, kEEm06,
-    kEBm01, kEBm02, kEBm03, kEBm04, kEBm05, kEBm06, kEBm07, kEBm08, kEBm09,
-    kEBm10, kEBm11, kEBm12, kEBm13, kEBm14, kEBm15, kEBm16, kEBm17, kEBm18,
-    kEBp01, kEBp02, kEBp03, kEBp04, kEBp05, kEBp06, kEBp07, kEBp08, kEBp09,
-    kEBp10, kEBp11, kEBp12, kEBp13, kEBp14, kEBp15, kEBp16, kEBp17, kEBp18,
-    kEEp07, kEEp08, kEEp09, kEEp01, kEEp02, kEEp03, kEEp04, kEEp05, kEEp06,
-    kEEmLow = kEEm07, kEEmHigh = kEEm06,
-    kEEpLow = kEEp07, kEEpHigh = kEEp06,
-    kEBmLow = kEBm01, kEBmHigh = kEBm18,
-    kEBpLow = kEBp01, kEBpHigh = kEBp18
+    kEEm07,
+    kEEm08,
+    kEEm09,
+    kEEm01,
+    kEEm02,
+    kEEm03,
+    kEEm04,
+    kEEm05,
+    kEEm06,
+    kEBm01,
+    kEBm02,
+    kEBm03,
+    kEBm04,
+    kEBm05,
+    kEBm06,
+    kEBm07,
+    kEBm08,
+    kEBm09,
+    kEBm10,
+    kEBm11,
+    kEBm12,
+    kEBm13,
+    kEBm14,
+    kEBm15,
+    kEBm16,
+    kEBm17,
+    kEBm18,
+    kEBp01,
+    kEBp02,
+    kEBp03,
+    kEBp04,
+    kEBp05,
+    kEBp06,
+    kEBp07,
+    kEBp08,
+    kEBp09,
+    kEBp10,
+    kEBp11,
+    kEBp12,
+    kEBp13,
+    kEBp14,
+    kEBp15,
+    kEBp16,
+    kEBp17,
+    kEBp18,
+    kEEp07,
+    kEEp08,
+    kEEp09,
+    kEEp01,
+    kEEp02,
+    kEEp03,
+    kEEp04,
+    kEEp05,
+    kEEp06,
+    kEEmLow = kEEm07,
+    kEEmHigh = kEEm06,
+    kEEpLow = kEEp07,
+    kEEpHigh = kEEp06,
+    kEBmLow = kEBm01,
+    kEBmHigh = kEBm18,
+    kEBpLow = kEBp01,
+    kEBpHigh = kEBp18
   };
 
   enum Constants {
@@ -52,9 +104,12 @@ namespace ecaldqm {
     // 28 bins are required).
 
     nTCC = 108,
-    kEEmTCCLow = 0, kEEmTCCHigh = 35,
-    kEEpTCCLow = 72, kEEpTCCHigh = 107,
-    kEBTCCLow = 36, kEBTCCHigh = 71,
+    kEEmTCCLow = 0,
+    kEEmTCCHigh = 35,
+    kEEpTCCLow = 72,
+    kEEpTCCHigh = 107,
+    kEBTCCLow = 36,
+    kEBTCCHigh = 71,
 
     nChannels = EBDetId::kSizeForDenseIndexing + EEDetId::kSizeForDenseIndexing,
     nTowers = EcalTrigTowerDetId::kEBTotalTowers + EcalScDetId::kSizeForDenseIndexing
@@ -65,50 +120,50 @@ namespace ecaldqm {
   extern double const etaBound;
 
   // returns DCC ID (1 - 54)
-  unsigned dccId(DetId const&);
-  unsigned dccId(EcalElectronicsId const&);
+  unsigned dccId(DetId const &);
+  unsigned dccId(EcalElectronicsId const &);
 
-  unsigned memDCCId(unsigned); // convert from dccId skipping DCCs without MEM
-  unsigned memDCCIndex(unsigned); // reverse conversion
+  unsigned memDCCId(unsigned);     // convert from dccId skipping DCCs without MEM
+  unsigned memDCCIndex(unsigned);  // reverse conversion
 
   // returns TCC ID (1 - 108)
-  unsigned tccId(DetId const&);
-  unsigned tccId(EcalElectronicsId const&);
+  unsigned tccId(DetId const &);
+  unsigned tccId(EcalElectronicsId const &);
 
-  // returns the data tower id - pass only 
-  unsigned towerId(DetId const&);
-  unsigned towerId(EcalElectronicsId const&);
+  // returns the data tower id - pass only
+  unsigned towerId(DetId const &);
+  unsigned towerId(EcalElectronicsId const &);
 
-  unsigned ttId(DetId const&);
-  unsigned ttId(EcalElectronicsId const&);
+  unsigned ttId(DetId const &);
+  unsigned ttId(EcalElectronicsId const &);
 
-  unsigned rtHalf(DetId const&);
+  unsigned rtHalf(DetId const &);
 
   std::pair<unsigned, unsigned> innerTCCs(unsigned);
   std::pair<unsigned, unsigned> outerTCCs(unsigned);
 
-  std::vector<DetId> scConstituents(EcalScDetId const&);
+  std::vector<DetId> scConstituents(EcalScDetId const &);
 
-  EcalPnDiodeDetId pnForCrystal(DetId const&, char);
+  EcalPnDiodeDetId pnForCrystal(DetId const &, char);
 
-  unsigned dccId(std::string const&);
+  unsigned dccId(std::string const &);
   std::string smName(unsigned);
 
-  int zside(DetId const&);
+  int zside(DetId const &);
 
-  double eta(EBDetId const&);
-  double eta(EEDetId const&);
-  double phi(EBDetId const&);
-  double phi(EEDetId const&);
-  double phi(EcalTrigTowerDetId const&);
+  double eta(EBDetId const &);
+  double eta(EEDetId const &);
+  double phi(EBDetId const &);
+  double phi(EEDetId const &);
+  double phi(EcalTrigTowerDetId const &);
   double phi(double);
 
-  bool isForward(DetId const&);
+  bool isForward(DetId const &);
 
-  bool isCrystalId(DetId const&);
-  bool isSingleChannelId(DetId const&);
-  bool isEcalScDetId(DetId const&);
-  bool isEndcapTTId(DetId const&);
+  bool isCrystalId(DetId const &);
+  bool isSingleChannelId(DetId const &);
+  bool isEcalScDetId(DetId const &);
+  bool isEndcapTTId(DetId const &);
 
   unsigned nCrystals(unsigned);
   unsigned nSuperCrystals(unsigned);
@@ -116,20 +171,20 @@ namespace ecaldqm {
   bool ccuExists(unsigned, unsigned);
 
   bool checkElectronicsMap(bool = true);
-  EcalElectronicsMapping const* getElectronicsMap();
-  void setElectronicsMap(EcalElectronicsMapping const*);
+  EcalElectronicsMapping const *getElectronicsMap();
+  void setElectronicsMap(EcalElectronicsMapping const *);
 
   bool checkTrigTowerMap(bool = true);
-  EcalTrigTowerConstituentsMap const* getTrigTowerMap();
-  void setTrigTowerMap(EcalTrigTowerConstituentsMap const*);
+  EcalTrigTowerConstituentsMap const *getTrigTowerMap();
+  void setTrigTowerMap(EcalTrigTowerConstituentsMap const *);
 
   bool checkGeometry(bool = true);
-  CaloGeometry const* getGeometry();
-  void setGeometry(CaloGeometry const*);
+  CaloGeometry const *getGeometry();
+  void setGeometry(CaloGeometry const *);
 
   bool checkTopology(bool = true);
-  CaloTopology const* getTopology();
-  void setTopology(CaloTopology const*);
-}
+  CaloTopology const *getTopology();
+  void setTopology(CaloTopology const *);
+}  // namespace ecaldqm
 
 #endif
diff --git a/DQM/EcalCommon/interface/EcalDQMonitor.h b/DQM/EcalCommon/interface/EcalDQMonitor.h
index 473879513be3a..c434cc314a2a6 100644
--- a/DQM/EcalCommon/interface/EcalDQMonitor.h
+++ b/DQM/EcalCommon/interface/EcalDQMonitor.h
@@ -6,55 +6,58 @@
 
 #include "DQWorker.h"
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-namespace edm
-{
+namespace edm {
   class ParameterSet;
   class Run;
   class LuminosityBlock;
   class EventSetup;
-}
+}  // namespace edm
 
-namespace ecaldqm
-{
+namespace ecaldqm {
   class EcalDQMonitor {
   public:
-    EcalDQMonitor(edm::ParameterSet const&);
+    EcalDQMonitor(edm::ParameterSet const &);
     virtual ~EcalDQMonitor() noexcept(false);
 
-    static void fillDescriptions(edm::ParameterSetDescription&);
+    static void fillDescriptions(edm::ParameterSetDescription &);
 
   protected:
-    void ecaldqmGetSetupObjects(edm::EventSetup const&);
-    void ecaldqmBeginRun(edm::Run const&, edm::EventSetup const&);
-    void ecaldqmEndRun(edm::Run const&, edm::EventSetup const&);
-    void ecaldqmBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&);
-    void ecaldqmEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&);
-
-    template<typename FuncOnWorker> void executeOnWorkers_(FuncOnWorker, std::string const&, std::string const& = "", int = 1); // loop over workers and capture exceptions
- 
-    std::vector<DQWorker*> workers_;
+    void ecaldqmGetSetupObjects(edm::EventSetup const &);
+    void ecaldqmBeginRun(edm::Run const &, edm::EventSetup const &);
+    void ecaldqmEndRun(edm::Run const &, edm::EventSetup const &);
+    void ecaldqmBeginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &);
+    void ecaldqmEndLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &);
+
+    template <typename FuncOnWorker>
+    void executeOnWorkers_(FuncOnWorker,
+                           std::string const &,
+                           std::string const & = "",
+                           int = 1);  // loop over workers and capture exceptions
+
+    std::vector<DQWorker *> workers_;
     std::string const moduleName_;
     int const verbosity_;
   };
 
-  template<typename FuncOnWorker>
-    void
-    EcalDQMonitor::executeOnWorkers_(FuncOnWorker _func, std::string const& _context, std::string const& _message/* = ""*/, int _verbThreshold/* = 1*/)
-    {
-      std::for_each(workers_.begin(), workers_.end(), [&](DQWorker* worker){
-          if(verbosity_ > _verbThreshold && _message != "") edm::LogInfo("EcalDQM") << moduleName_ << ": " << _message << " @ " << worker->getName();
-          try{
-            _func(worker);
-          }
-          catch(std::exception&){
-            edm::LogError("EcalDQM") << moduleName_ << ": Exception in " << _context << " @ " << worker->getName();
-            throw;
-          }
-        });
-    }
-}
+  template <typename FuncOnWorker>
+  void EcalDQMonitor::executeOnWorkers_(FuncOnWorker _func,
+                                        std::string const &_context,
+                                        std::string const &_message /* = ""*/,
+                                        int _verbThreshold /* = 1*/) {
+    std::for_each(workers_.begin(), workers_.end(), [&](DQWorker *worker) {
+      if (verbosity_ > _verbThreshold && !_message.empty())
+        edm::LogInfo("EcalDQM") << moduleName_ << ": " << _message << " @ " << worker->getName();
+      try {
+        _func(worker);
+      } catch (std::exception &) {
+        edm::LogError("EcalDQM") << moduleName_ << ": Exception in " << _context << " @ " << worker->getName();
+        throw;
+      }
+    });
+  }
+}  // namespace ecaldqm
 
 #endif
diff --git a/DQM/EcalCommon/interface/EcalMEFormatter.h b/DQM/EcalCommon/interface/EcalMEFormatter.h
index 886a7234aee99..aa208fe6b413c 100644
--- a/DQM/EcalCommon/interface/EcalMEFormatter.h
+++ b/DQM/EcalCommon/interface/EcalMEFormatter.h
@@ -7,18 +7,21 @@
 #include "DQM/EcalCommon/interface/MESet.h"
 
 class EcalMEFormatter : public DQMEDHarvester, public ecaldqm::DQWorker {
- public:
-  EcalMEFormatter(edm::ParameterSet const&);
-  ~EcalMEFormatter() override {};
+public:
+  EcalMEFormatter(edm::ParameterSet const &);
+  ~EcalMEFormatter() override{};
 
-  static void fillDescriptions(edm::ConfigurationDescriptions&);
+  static void fillDescriptions(edm::ConfigurationDescriptions &);
 
- private:
-  void dqmEndLuminosityBlock(DQMStore::IBooker&, DQMStore::IGetter&, edm::LuminosityBlock const&, edm::EventSetup const&) override;
-  void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override;
+private:
+  void dqmEndLuminosityBlock(DQMStore::IBooker &,
+                             DQMStore::IGetter &,
+                             edm::LuminosityBlock const &,
+                             edm::EventSetup const &) override;
+  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
 
-  void format_(DQMStore::IGetter&, bool);
-  void formatDet2D_(ecaldqm::MESet&);
+  void format_(DQMStore::IGetter &, bool);
+  void formatDet2D_(ecaldqm::MESet &);
 };
 
 #endif
diff --git a/DQM/EcalCommon/interface/EcalMonitorPrescaler.h b/DQM/EcalCommon/interface/EcalMonitorPrescaler.h
index 44ab3342a9481..d92b5f8bfc46d 100644
--- a/DQM/EcalCommon/interface/EcalMonitorPrescaler.h
+++ b/DQM/EcalCommon/interface/EcalMonitorPrescaler.h
@@ -1,30 +1,21 @@
 #ifndef EcalMonitorPrescaler_H
 #define EcalMonitorPrescaler_H
 
-#include "FWCore/Framework/interface/EDFilter.h"
 #include "DataFormats/EcalRawData/interface/EcalRawDataCollections.h"
+#include "FWCore/Framework/interface/EDFilter.h"
 
 #include <utility>
 
-class EcalMonitorPrescaler: public edm::EDFilter {
- public:
-  EcalMonitorPrescaler(edm::ParameterSet const&);
+class EcalMonitorPrescaler : public edm::EDFilter {
+public:
+  EcalMonitorPrescaler(edm::ParameterSet const &);
   ~EcalMonitorPrescaler() override;
 
-  void beginRun(edm::Run const&, edm::EventSetup const&) override;
-  bool filter(edm::Event&, edm::EventSetup const&) override;
-
- private:
-  enum Prescalers {
-    kPhysics,
-    kCosmics,
-    kCalibration,
-    kLaser,
-    kLed,
-    kTestPulse,
-    kPedestal,
-    nPrescalers
-  };
+  void beginRun(edm::Run const &, edm::EventSetup const &) override;
+  bool filter(edm::Event &, edm::EventSetup const &) override;
+
+private:
+  enum Prescalers { kPhysics, kCosmics, kCalibration, kLaser, kLed, kTestPulse, kPedestal, nPrescalers };
 
   static uint32_t filterBits_[nPrescalers];
 
@@ -33,4 +24,4 @@ class EcalMonitorPrescaler: public edm::EDFilter {
   std::pair<unsigned, unsigned> prescalers_[nPrescalers];
 };
 
-#endif // EcalMonitorPrescaler_H
+#endif  // EcalMonitorPrescaler_H
diff --git a/DQM/EcalCommon/interface/FEFlags.h b/DQM/EcalCommon/interface/FEFlags.h
index c8e415382d20f..4ded45c7b981a 100644
--- a/DQM/EcalCommon/interface/FEFlags.h
+++ b/DQM/EcalCommon/interface/FEFlags.h
@@ -3,7 +3,8 @@
 
 namespace ecaldqm {
 
-  // partially taken from EventFilter/EcalRawToDigi/interface/DCCRawDataDefinitions.h
+  // partially taken from
+  // EventFilter/EcalRawToDigi/interface/DCCRawDataDefinitions.h
   enum FEFlags {
     Enabled = 0,
     Disabled = 1,
@@ -24,6 +25,6 @@ namespace ecaldqm {
     nFEFlags = 16
   };
 
-}
+}  // namespace ecaldqm
 
 #endif
diff --git a/DQM/EcalCommon/interface/MESet.h b/DQM/EcalCommon/interface/MESet.h
index d56396f101d17..d14cfd5b084d9 100644
--- a/DQM/EcalCommon/interface/MESet.h
+++ b/DQM/EcalCommon/interface/MESet.h
@@ -3,8 +3,8 @@
 
 #include "DQM/EcalCommon/interface/MESetBinningUtils.h"
 
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/EcalDetId/interface/EcalElectronicsId.h"
@@ -16,13 +16,12 @@
 
 #include "boost/ptr_container/ptr_map.hpp"
 
-namespace ecaldqm
-{
+namespace ecaldqm {
   /*
-    class MESet
-    Base class for MonitorElement wrappers
-    Interface between ME bins and DetId
-  */
+  class MESet
+  Base class for MonitorElement wrappers
+  Interface between ME bins and DetId
+*/
 
   class StatusManager;
 
@@ -31,76 +30,76 @@ namespace ecaldqm
     typedef std::map<std::string, std::string> PathReplacements;
 
     MESet();
-    MESet(std::string const&, binning::ObjectType, binning::BinningType, MonitorElement::Kind);
-    MESet(MESet const&);
+    MESet(std::string const &, binning::ObjectType, binning::BinningType, MonitorElement::Kind);
+    MESet(MESet const &);
     virtual ~MESet();
 
-    virtual MESet& operator=(MESet const&);
+    virtual MESet &operator=(MESet const &);
 
-    virtual MESet* clone(std::string const& = "") const;
+    virtual MESet *clone(std::string const & = "") const;
 
-    virtual void book(DQMStore::IBooker&) {}
-    virtual bool retrieve(DQMStore::IGetter&, std::string* = nullptr) const { return false; }
+    virtual void book(DQMStore::IBooker &) {}
+    virtual bool retrieve(DQMStore::IGetter &, std::string * = nullptr) const { return false; }
     virtual void clear() const;
 
-    virtual void fill(DetId const&, double = 1., double = 1., double = 1.) {}
-    virtual void fill(EcalElectronicsId const&, double = 1., double = 1., double = 1.) {}
+    virtual void fill(DetId const &, double = 1., double = 1., double = 1.) {}
+    virtual void fill(EcalElectronicsId const &, double = 1., double = 1., double = 1.) {}
     virtual void fill(int, double = 1., double = 1., double = 1.) {}
     virtual void fill(double, double = 1., double = 1.) {}
 
-    virtual void setBinContent(DetId const&, double) {}
-    virtual void setBinContent(EcalElectronicsId const&, double) {}
+    virtual void setBinContent(DetId const &, double) {}
+    virtual void setBinContent(EcalElectronicsId const &, double) {}
     virtual void setBinContent(int, double) {}
-    virtual void setBinContent(DetId const&, int, double) {}
-    virtual void setBinContent(EcalElectronicsId const&, int, double) {}
+    virtual void setBinContent(DetId const &, int, double) {}
+    virtual void setBinContent(EcalElectronicsId const &, int, double) {}
     virtual void setBinContent(int, int, double) {}
 
-    virtual void setBinError(DetId const&, double) {}
-    virtual void setBinError(EcalElectronicsId const&, double) {}
+    virtual void setBinError(DetId const &, double) {}
+    virtual void setBinError(EcalElectronicsId const &, double) {}
     virtual void setBinError(int, double) {}
-    virtual void setBinError(DetId const&, int, double) {}
-    virtual void setBinError(EcalElectronicsId const&, int, double) {}
+    virtual void setBinError(DetId const &, int, double) {}
+    virtual void setBinError(EcalElectronicsId const &, int, double) {}
     virtual void setBinError(int, int, double) {}
 
-    virtual void setBinEntries(DetId const&, double) {}
-    virtual void setBinEntries(EcalElectronicsId const&, double) {}
+    virtual void setBinEntries(DetId const &, double) {}
+    virtual void setBinEntries(EcalElectronicsId const &, double) {}
     virtual void setBinEntries(int, double) {}
-    virtual void setBinEntries(DetId const&, int, double) {}
-    virtual void setBinEntries(EcalElectronicsId const&, int, double) {}
+    virtual void setBinEntries(DetId const &, int, double) {}
+    virtual void setBinEntries(EcalElectronicsId const &, int, double) {}
     virtual void setBinEntries(int, int, double) {}
 
-    virtual double getBinContent(DetId const&, int = 0) const { return 0.; }
-    virtual double getBinContent(EcalElectronicsId const&, int = 0) const { return 0.; }
+    virtual double getBinContent(DetId const &, int = 0) const { return 0.; }
+    virtual double getBinContent(EcalElectronicsId const &, int = 0) const { return 0.; }
     virtual double getBinContent(int, int = 0) const { return 0.; }
 
-    virtual double getBinError(DetId const&, int = 0) const { return 0.; }
-    virtual double getBinError(EcalElectronicsId const&, int = 0) const { return 0.; }
+    virtual double getBinError(DetId const &, int = 0) const { return 0.; }
+    virtual double getBinError(EcalElectronicsId const &, int = 0) const { return 0.; }
     virtual double getBinError(int, int = 0) const { return 0.; }
 
-    virtual double getBinEntries(DetId const&, int = 0) const { return 0.; }
-    virtual double getBinEntries(EcalElectronicsId const&, int = 0) const { return 0.; }
+    virtual double getBinEntries(DetId const &, int = 0) const { return 0.; }
+    virtual double getBinEntries(EcalElectronicsId const &, int = 0) const { return 0.; }
     virtual double getBinEntries(int, int = 0) const { return 0.; }
 
     // title, axis
-    virtual void setAxisTitle(std::string const&, int = 1);
+    virtual void setAxisTitle(std::string const &, int = 1);
 
     virtual void reset(double = 0., double = 0., double = 0.);
     virtual void resetAll(double = 0., double = 0., double = 0.);
 
-    virtual bool maskMatches(DetId const&, uint32_t, StatusManager const*) const;
+    virtual bool maskMatches(DetId const &, uint32_t, StatusManager const *) const;
 
-    virtual std::string const& getPath() const { return path_; }
+    virtual std::string const &getPath() const { return path_; }
     binning::ObjectType getObjType() const { return otype_; }
     binning::BinningType getBinType() const { return btype_; }
     MonitorElement::Kind getKind() const { return kind_; }
-    bool isActive() const { return active_; } // booked or retrieved
+    bool isActive() const { return active_; }  // booked or retrieved
     virtual bool isVariableBinning() const { return false; }
-    virtual MonitorElement const* getME(unsigned _iME) const { return (_iME < mes_.size() ? mes_[_iME] : nullptr); }
-    virtual MonitorElement* getME(unsigned _iME) { return (_iME < mes_.size() ? mes_[_iME] : nullptr); }
+    virtual MonitorElement const *getME(unsigned _iME) const { return (_iME < mes_.size() ? mes_[_iME] : nullptr); }
+    virtual MonitorElement *getME(unsigned _iME) { return (_iME < mes_.size() ? mes_[_iME] : nullptr); }
     virtual void softReset();
     virtual void recoverStats();
 
-    std::string formPath(PathReplacements const&) const;
+    std::string formPath(PathReplacements const &) const;
 
     void setLumiFlag() { lumiFlag_ = true; };
     bool getLumiFlag() const { return lumiFlag_; }
@@ -112,217 +111,242 @@ namespace ecaldqm
     virtual void fill_(unsigned, int, double, double);
     virtual void fill_(unsigned, double, double, double);
 
-    virtual void checkME_(unsigned _iME) const
-    {
-      if(!getME(_iME)){
+    virtual void checkME_(unsigned _iME) const {
+      if (!getME(_iME)) {
         std::stringstream ss;
         ss << "ME does not exist at index " << _iME;
         throw_(ss.str());
       }
     }
 
-    void throw_(std::string const& _message) const
-    {
-      throw cms::Exception("EcalDQM") << path_ << ": " << _message;
-    }
+    void throw_(std::string const &_message) const { throw cms::Exception("EcalDQM") << path_ << ": " << _message; }
 
-    mutable std::vector<MonitorElement*> mes_;
+    mutable std::vector<MonitorElement *> mes_;
 
     mutable std::string path_;
     binning::ObjectType otype_;
     binning::BinningType btype_;
     MonitorElement::Kind kind_;
-    bool lumiFlag_; // when true, histograms will be saved every lumi section (default false)
-    bool batchMode_; // when true, histograms are not GUI-ready (default false)
+    bool lumiFlag_;   // when true, histograms will be saved every lumi section
+                      // (default false)
+    bool batchMode_;  // when true, histograms are not GUI-ready (default false)
 
     mutable bool active_;
 
   public:
-
     struct ConstBin {
-      protected:
-      MESet const* meSet_;
+    protected:
+      MESet const *meSet_;
 
-      public:
+    public:
       unsigned iME;
       int iBin;
       binning::ObjectType otype;
 
       ConstBin() : meSet_(nullptr), iME(-1), iBin(-1), otype(binning::nObjType) {}
-      ConstBin(MESet const&, unsigned = 0, int = 1);
-      ConstBin(ConstBin const& _orig) : meSet_(_orig.meSet_), iME(_orig.iME), iBin(_orig.iBin), otype(_orig.otype) {}
-      ConstBin& operator=(ConstBin const&);
-      bool operator==(ConstBin const& _rhs) const
-      {
+      ConstBin(MESet const &, unsigned = 0, int = 1);
+      ConstBin(ConstBin const &_orig) : meSet_(_orig.meSet_), iME(_orig.iME), iBin(_orig.iBin), otype(_orig.otype) {}
+      ConstBin &operator=(ConstBin const &);
+      bool operator==(ConstBin const &_rhs) const {
         return meSet_ != nullptr && meSet_ == _rhs.meSet_ && iME == _rhs.iME && iBin == _rhs.iBin;
       }
-      bool isChannel() const
-      {
-        if(meSet_) return binning::isValidIdBin(otype, meSet_->getBinType(), iME, iBin);
-        else return false;
+      bool isChannel() const {
+        if (meSet_)
+          return binning::isValidIdBin(otype, meSet_->getBinType(), iME, iBin);
+        else
+          return false;
       }
-      uint32_t getId() const
-      {
-        if(meSet_) return binning::idFromBin(otype, meSet_->getBinType(), iME, iBin);
-        else return 0;
+      uint32_t getId() const {
+        if (meSet_)
+          return binning::idFromBin(otype, meSet_->getBinType(), iME, iBin);
+        else
+          return 0;
       }
-      double getBinContent() const
-      {
-        if(meSet_ && iME != unsigned(-1)) return meSet_->getME(iME)->getBinContent(iBin);
-        else return 0.;
+      double getBinContent() const {
+        if (meSet_ && iME != unsigned(-1))
+          return meSet_->getME(iME)->getBinContent(iBin);
+        else
+          return 0.;
       }
-      double getBinError() const
-      {
-        if(meSet_ && iME != unsigned(-1)) return meSet_->getME(iME)->getBinError(iBin);
-        else return 0.;
+      double getBinError() const {
+        if (meSet_ && iME != unsigned(-1))
+          return meSet_->getME(iME)->getBinError(iBin);
+        else
+          return 0.;
       }
-      double getBinEntries() const
-      {
-        if(meSet_ && iME != unsigned(-1)) return meSet_->getME(iME)->getBinEntries(iBin);
-        else return 0.;
+      double getBinEntries() const {
+        if (meSet_ && iME != unsigned(-1))
+          return meSet_->getME(iME)->getBinEntries(iBin);
+        else
+          return 0.;
       }
-      MonitorElement const* getME() const
-      {
-        if(meSet_ && iME != unsigned(-1)) return meSet_->getME(iME);
-        else return nullptr;
+      MonitorElement const *getME() const {
+        if (meSet_ && iME != unsigned(-1))
+          return meSet_->getME(iME);
+        else
+          return nullptr;
       }
-      void setMESet(MESet const& _meSet) { meSet_ = &_meSet; }
-      MESet const* getMESet() const { return meSet_; }
+      void setMESet(MESet const &_meSet) { meSet_ = &_meSet; }
+      MESet const *getMESet() const { return meSet_; }
     };
 
     struct Bin : public ConstBin {
-      protected:
-      MESet* meSet_;
+    protected:
+      MESet *meSet_;
 
-      public:
+    public:
       Bin() : ConstBin(), meSet_(nullptr) {}
-      Bin(MESet& _set, unsigned _iME = 0, int _iBin = 1) : ConstBin(_set, _iME, _iBin), meSet_(&_set) {}
-      Bin(Bin const& _orig) : ConstBin(_orig), meSet_(_orig.meSet_) {}
-      ConstBin& operator=(Bin const& _rhs)
-      {
+      Bin(MESet &_set, unsigned _iME = 0, int _iBin = 1) : ConstBin(_set, _iME, _iBin), meSet_(&_set) {}
+      Bin(Bin const &_orig) : ConstBin(_orig), meSet_(_orig.meSet_) {}
+      ConstBin &operator=(Bin const &_rhs) {
         bool wasNull(ConstBin::meSet_ == nullptr);
         ConstBin::operator=(_rhs);
-        if(wasNull) meSet_ = _rhs.meSet_;
+        if (wasNull)
+          meSet_ = _rhs.meSet_;
         return *this;
       }
-      void fill(double _w = 1.)
-      {
-        if(meSet_) meSet_->fill_(iME, iBin, _w);
+      void fill(double _w = 1.) {
+        if (meSet_)
+          meSet_->fill_(iME, iBin, _w);
+      }
+      void fill(double _y, double _w = 1.) {
+        if (meSet_)
+          meSet_->fill_(iME, iBin, _y, _w);
       }
-      void fill(double _y, double _w = 1.)
-      {
-        if(meSet_) meSet_->fill_(iME, iBin, _y, _w);
+      void setBinContent(double _content) {
+        if (meSet_ && iME != unsigned(-1))
+          meSet_->getME(iME)->setBinContent(iBin, _content);
       }
-      void setBinContent(double _content)
-      {
-        if(meSet_ && iME != unsigned(-1)) meSet_->getME(iME)->setBinContent(iBin, _content);
+      void setBinError(double _error) {
+        if (meSet_ && iME != unsigned(-1))
+          meSet_->getME(iME)->setBinError(iBin, _error);
       }
-      void setBinError(double _error)
-      {
-        if(meSet_ && iME != unsigned(-1)) meSet_->getME(iME)->setBinError(iBin, _error);
+      void setBinEntries(double _entries) {
+        if (meSet_ && iME != unsigned(-1))
+          meSet_->getME(iME)->setBinEntries(iBin, _entries);
       }
-      void setBinEntries(double _entries)
-      {
-        if(meSet_ && iME != unsigned(-1)) meSet_->getME(iME)->setBinEntries(iBin, _entries);
+      MonitorElement *getME() const {
+        if (meSet_ && iME != unsigned(-1))
+          return meSet_->getME(iME);
+        else
+          return nullptr;
       }
-      MonitorElement* getME() const
-      {
-        if(meSet_ && iME != unsigned(-1)) return meSet_->getME(iME);
-        else return nullptr;
+      void setMESet(MESet &_meSet) {
+        ConstBin::meSet_ = &_meSet;
+        meSet_ = &_meSet;
       }
-      void setMESet(MESet& _meSet) { ConstBin::meSet_ = &_meSet; meSet_ = &_meSet; }
-      MESet* getMESet() const { return meSet_; }
+      MESet *getMESet() const { return meSet_; }
     };
 
     /* const_iterator
-       iterates over bins
-       supports automatic transition between MEs in the same set
-       underflow -> bin == 0 overflow -> bin == -1
-    */
+     iterates over bins
+     supports automatic transition between MEs in the same set
+     underflow -> bin == 0 overflow -> bin == -1
+  */
     struct const_iterator {
       const_iterator() : bin_() {}
-      const_iterator(MESet const& _meSet, unsigned _iME = 0, int _iBin = 1) : bin_(_meSet, _iME, _iBin) {}
-      const_iterator(MESet const&, DetId const&);
-      const_iterator(const_iterator const& _orig) : bin_(_orig.bin_) {}
-      const_iterator& operator=(const_iterator const& _rhs) { bin_ = _rhs.bin_; return *this; }
-      bool operator==(const_iterator const& _rhs) const { return bin_ == _rhs.bin_; }
-      bool operator!=(const_iterator const& _rhs) const { return !(bin_ == _rhs.bin_); }
-      ConstBin const* operator->() const { return &bin_; }
-      const_iterator& operator++();
-      const_iterator& toNextChannel();
+      const_iterator(MESet const &_meSet, unsigned _iME = 0, int _iBin = 1) : bin_(_meSet, _iME, _iBin) {}
+      const_iterator(MESet const &, DetId const &);
+      const_iterator(const_iterator const &_orig) : bin_(_orig.bin_) {}
+      const_iterator &operator=(const_iterator const &_rhs) {
+        bin_ = _rhs.bin_;
+        return *this;
+      }
+      bool operator==(const_iterator const &_rhs) const { return bin_ == _rhs.bin_; }
+      bool operator!=(const_iterator const &_rhs) const { return !(bin_ == _rhs.bin_); }
+      ConstBin const *operator->() const { return &bin_; }
+      const_iterator &operator++();
+      const_iterator &toNextChannel();
       bool up();
       bool down();
       bool left();
       bool right();
 
-      protected:
+    protected:
       ConstBin bin_;
     };
 
     struct iterator : public const_iterator {
       iterator() : const_iterator(), bin_() {}
-      iterator(MESet& _meSet, unsigned _iME = 0, int _iBin = 1) : const_iterator(_meSet, _iME, _iBin), bin_(_meSet) { bin_.ConstBin::operator=(const_iterator::bin_); }
-      iterator(MESet& _meSet, DetId const& _id) : const_iterator(_meSet, _id), bin_(_meSet) { bin_.ConstBin::operator=(const_iterator::bin_); }
-      iterator(iterator const& _orig) : const_iterator(_orig), bin_(_orig.bin_) {}
-      iterator& operator=(const_iterator const& _rhs) { const_iterator::operator=(_rhs); bin_.ConstBin::operator=(const_iterator::bin_); return *this; }
-      Bin* operator->() { return &bin_; }
-      Bin const* operator->() const { return &bin_; }
-      const_iterator& operator++() { const_iterator::operator++(); bin_.ConstBin::operator=(const_iterator::bin_); return *this; }
-      const_iterator& toNextChannel() { const_iterator::toNextChannel(); bin_.ConstBin::operator=(const_iterator::bin_); return *this; }
-      bool up() { bool res(const_iterator::up()); bin_.ConstBin::operator=(const_iterator::bin_); return res; }
-      bool down() { bool res(const_iterator::down()); bin_.ConstBin::operator=(const_iterator::bin_); return res; }
-      bool left() { bool res(const_iterator::left()); bin_.ConstBin::operator=(const_iterator::bin_); return res; }
-      bool right() { bool res(const_iterator::right()); bin_.ConstBin::operator=(const_iterator::bin_); return res; }
-
-      private:
+      iterator(MESet &_meSet, unsigned _iME = 0, int _iBin = 1) : const_iterator(_meSet, _iME, _iBin), bin_(_meSet) {
+        bin_.ConstBin::operator=(const_iterator::bin_);
+      }
+      iterator(MESet &_meSet, DetId const &_id) : const_iterator(_meSet, _id), bin_(_meSet) {
+        bin_.ConstBin::operator=(const_iterator::bin_);
+      }
+      iterator(iterator const &_orig) : const_iterator(_orig), bin_(_orig.bin_) {}
+      iterator &operator=(const_iterator const &_rhs) {
+        const_iterator::operator=(_rhs);
+        bin_.ConstBin::operator=(const_iterator::bin_);
+        return *this;
+      }
+      Bin *operator->() { return &bin_; }
+      Bin const *operator->() const { return &bin_; }
+      const_iterator &operator++() {
+        const_iterator::operator++();
+        bin_.ConstBin::operator=(const_iterator::bin_);
+        return *this;
+      }
+      const_iterator &toNextChannel() {
+        const_iterator::toNextChannel();
+        bin_.ConstBin::operator=(const_iterator::bin_);
+        return *this;
+      }
+      bool up() {
+        bool res(const_iterator::up());
+        bin_.ConstBin::operator=(const_iterator::bin_);
+        return res;
+      }
+      bool down() {
+        bool res(const_iterator::down());
+        bin_.ConstBin::operator=(const_iterator::bin_);
+        return res;
+      }
+      bool left() {
+        bool res(const_iterator::left());
+        bin_.ConstBin::operator=(const_iterator::bin_);
+        return res;
+      }
+      bool right() {
+        bool res(const_iterator::right());
+        bin_.ConstBin::operator=(const_iterator::bin_);
+        return res;
+      }
+
+    private:
       Bin bin_;
     };
 
-    virtual const_iterator begin() const
-    {
-      return const_iterator(*this);
-    }
+    virtual const_iterator begin() const { return const_iterator(*this); }
 
-    virtual const_iterator end() const
-    {
-      return const_iterator(*this, -1, -1);
-    }
+    virtual const_iterator end() const { return const_iterator(*this, -1, -1); }
 
-    virtual const_iterator beginChannel() const
-    {
+    virtual const_iterator beginChannel() const {
       const_iterator itr(*this, 0, 0);
       return itr.toNextChannel();
     }
 
-    virtual iterator begin()
-    {
-      return iterator(*this);
-    }
+    virtual iterator begin() { return iterator(*this); }
 
-    virtual iterator end()
-    {
-      return iterator(*this, -1, -1);
-    }
+    virtual iterator end() { return iterator(*this, -1, -1); }
 
-    virtual iterator beginChannel()
-    {
+    virtual iterator beginChannel() {
       iterator itr(*this, 0, 0);
       itr.toNextChannel();
       return itr;
     }
-    
   };
 
-}
+}  // namespace ecaldqm
 
-namespace boost
-{
-  template<> inline ecaldqm::MESet* new_clone<ecaldqm::MESet>(ecaldqm::MESet const&);
-  template<> void delete_clone<ecaldqm::MESet>(ecaldqm::MESet const*);
-}
+namespace boost {
+  template <>
+  inline ecaldqm::MESet *new_clone<ecaldqm::MESet>(ecaldqm::MESet const &);
+  template <>
+  void delete_clone<ecaldqm::MESet>(ecaldqm::MESet const *);
+}  // namespace boost
 
-namespace ecaldqm
-{
+namespace ecaldqm {
   typedef boost::ptr_map<std::string, MESet> MESetCollection;
 }
 
diff --git a/DQM/EcalCommon/interface/MESetBinningUtils.h b/DQM/EcalCommon/interface/MESetBinningUtils.h
index 222abec0e21fe..378725192ee9b 100644
--- a/DQM/EcalCommon/interface/MESetBinningUtils.h
+++ b/DQM/EcalCommon/interface/MESetBinningUtils.h
@@ -7,16 +7,13 @@
 
 class DetId;
 class EcalElectronicsId;
-namespace edm
-{
+namespace edm {
   class ParameterSet;
   class ParameterSetDescription;
-}
+}  // namespace edm
 
-namespace ecaldqm
-{
-  namespace binning
-  {
+namespace ecaldqm {
+  namespace binning {
     enum ObjectType {
       kEB,
       kEE,
@@ -62,10 +59,10 @@ namespace ecaldqm
       nEBSMEta = 85,
       nEBSMPhi = 20,
       nEESMX = 40,
-      nEESMXRed = 30, // for EE+-01&05&09
-      nEESMXExt = 45, // for EE+-02&08
+      nEESMXRed = 30,  // for EE+-01&05&09
+      nEESMXExt = 45,  // for EE+-02&08
       nEESMY = 40,
-      nEESMYRed = 35, // for EE+-03&07
+      nEESMYRed = 35,  // for EE+-03&07
 
       nEBEtaBins = 34,
       nEEEtaBins = 20,
@@ -75,56 +72,71 @@ namespace ecaldqm
     struct AxisSpecs {
       int nbins;
       float low, high;
-      float* edges;
-      std::string* labels;
+      float *edges;
+      std::string *labels;
       std::string title;
       AxisSpecs() : nbins(0), low(0.), high(0.), edges(nullptr), labels(nullptr), title("") {}
-      AxisSpecs(AxisSpecs const& _specs) :
-        nbins(_specs.nbins), low(_specs.low), high(_specs.high), edges(nullptr), labels(nullptr), title(_specs.title)
-      {
-        if(_specs.edges){
+      AxisSpecs(AxisSpecs const &_specs)
+          : nbins(_specs.nbins),
+            low(_specs.low),
+            high(_specs.high),
+            edges(nullptr),
+            labels(nullptr),
+            title(_specs.title) {
+        if (_specs.edges) {
           edges = new float[nbins + 1];
-          for(int i(0); i <= nbins; i++) edges[i] = _specs.edges[i];
+          for (int i(0); i <= nbins; i++)
+            edges[i] = _specs.edges[i];
         }
-        if(_specs.labels){
+        if (_specs.labels) {
           labels = new std::string[nbins];
-          for(int i(0); i < nbins; i++) labels[i] = _specs.labels[i];
+          for (int i(0); i < nbins; i++)
+            labels[i] = _specs.labels[i];
         }
       }
-      AxisSpecs& operator=(AxisSpecs const& _rhs)
-      {
-        if(edges){ delete [] edges; edges = nullptr; }
-        if(labels){ delete [] labels; labels = nullptr; }
-        nbins = _rhs.nbins; low = _rhs.low; high = _rhs.high; title = _rhs.title;
-        if(_rhs.edges){
+      AxisSpecs &operator=(AxisSpecs const &_rhs) {
+        if (edges) {
+          delete[] edges;
+          edges = nullptr;
+        }
+        if (labels) {
+          delete[] labels;
+          labels = nullptr;
+        }
+        nbins = _rhs.nbins;
+        low = _rhs.low;
+        high = _rhs.high;
+        title = _rhs.title;
+        if (_rhs.edges) {
           edges = new float[nbins + 1];
-          for(int i(0); i <= nbins; i++) edges[i] = _rhs.edges[i];
+          for (int i(0); i <= nbins; i++)
+            edges[i] = _rhs.edges[i];
         }
-        if(_rhs.labels){
+        if (_rhs.labels) {
           labels = new std::string[nbins];
-          for(int i(0); i < nbins; i++) labels[i] = _rhs.labels[i];
+          for (int i(0); i < nbins; i++)
+            labels[i] = _rhs.labels[i];
         }
         return *this;
       }
-      ~AxisSpecs()
-      { 
-        delete [] edges;
-        delete [] labels;
+      ~AxisSpecs() {
+        delete[] edges;
+        delete[] labels;
       }
     };
 
     AxisSpecs getBinning(ObjectType, BinningType, bool, int, unsigned);
 
-    int findBin1D(ObjectType, BinningType, DetId const&);
-    int findBin1D(ObjectType, BinningType, EcalElectronicsId const&);
+    int findBin1D(ObjectType, BinningType, DetId const &);
+    int findBin1D(ObjectType, BinningType, EcalElectronicsId const &);
     int findBin1D(ObjectType, BinningType, int);
 
-    int findBin2D(ObjectType, BinningType, DetId const&);
-    int findBin2D(ObjectType, BinningType, EcalElectronicsId const&);
+    int findBin2D(ObjectType, BinningType, DetId const &);
+    int findBin2D(ObjectType, BinningType, EcalElectronicsId const &);
     int findBin2D(ObjectType, BinningType, int);
 
-    unsigned findPlotIndex(ObjectType, DetId const&);
-    unsigned findPlotIndex(ObjectType, EcalElectronicsId const&);
+    unsigned findPlotIndex(ObjectType, DetId const &);
+    unsigned findPlotIndex(ObjectType, EcalElectronicsId const &);
     unsigned findPlotIndex(ObjectType, int, BinningType _btype = kDCC);
 
     ObjectType getObject(ObjectType, unsigned);
@@ -134,16 +146,16 @@ namespace ecaldqm
     bool isValidIdBin(ObjectType, BinningType, unsigned, int);
 
     std::string channelName(uint32_t, BinningType _btype = kDCC);
-  
-    uint32_t idFromName(std::string const&);
+
+    uint32_t idFromName(std::string const &);
     uint32_t idFromBin(ObjectType, BinningType, unsigned, int);
 
-    AxisSpecs formAxis(edm::ParameterSet const&);
-    void fillAxisDescriptions(edm::ParameterSetDescription&);
+    AxisSpecs formAxis(edm::ParameterSet const &);
+    void fillAxisDescriptions(edm::ParameterSetDescription &);
 
-    ObjectType translateObjectType(std::string const&);
-    BinningType translateBinningType(std::string const&);
-    MonitorElement::Kind translateKind(std::string const&);
+    ObjectType translateObjectType(std::string const &);
+    BinningType translateBinningType(std::string const &);
+    MonitorElement::Kind translateKind(std::string const &);
 
     /* Functions used only internally within binning namespace */
 
@@ -158,14 +170,14 @@ namespace ecaldqm
     AxisSpecs getBinningEcal_(BinningType, bool, int);
     AxisSpecs getBinningMEM_(BinningType, bool, int, int);
 
-    int findBinCrystal_(ObjectType, DetId const&, int = -1);
-    int findBinCrystal_(ObjectType, EcalElectronicsId const&);
-    int findBinTriggerTower_(ObjectType, DetId const&);
-    int findBinPseudoStrip_(ObjectType, DetId const&);
-    int findBinRCT_(ObjectType, DetId const&);
-    int findBinSuperCrystal_(ObjectType, DetId const&, int = -1);
-    int findBinSuperCrystal_(ObjectType, EcalElectronicsId const&);
-  }
-}
+    int findBinCrystal_(ObjectType, DetId const &, int = -1);
+    int findBinCrystal_(ObjectType, EcalElectronicsId const &);
+    int findBinTriggerTower_(ObjectType, DetId const &);
+    int findBinPseudoStrip_(ObjectType, DetId const &);
+    int findBinRCT_(ObjectType, DetId const &);
+    int findBinSuperCrystal_(ObjectType, DetId const &, int = -1);
+    int findBinSuperCrystal_(ObjectType, EcalElectronicsId const &);
+  }  // namespace binning
+}  // namespace ecaldqm
 
 #endif
diff --git a/DQM/EcalCommon/interface/MESetDet0D.h b/DQM/EcalCommon/interface/MESetDet0D.h
index acabd50fa46aa..97976ee0ab08a 100644
--- a/DQM/EcalCommon/interface/MESetDet0D.h
+++ b/DQM/EcalCommon/interface/MESetDet0D.h
@@ -3,37 +3,35 @@
 
 #include "MESetEcal.h"
 
-namespace ecaldqm
-{
+namespace ecaldqm {
   /* class MESetDet0D
-     subdetector-based MonitorElement wrapper
-     represents single float MEs (DQM_KIND_REAL)
-     fill = setBinContent
-  */
-
-  class MESetDet0D : public MESetEcal
-  {
-  public :
-    MESetDet0D(std::string const&, binning::ObjectType, binning::BinningType, MonitorElement::Kind);
-    MESetDet0D(MESetDet0D const&);
+   subdetector-based MonitorElement wrapper
+   represents single float MEs (DQM_KIND_REAL)
+   fill = setBinContent
+*/
+
+  class MESetDet0D : public MESetEcal {
+  public:
+    MESetDet0D(std::string const &, binning::ObjectType, binning::BinningType, MonitorElement::Kind);
+    MESetDet0D(MESetDet0D const &);
     ~MESetDet0D() override;
 
-    MESet* clone(std::string const& = "") const override;
+    MESet *clone(std::string const & = "") const override;
 
-    void fill(DetId const&, double, double = 0., double = 0.) override;
-    void fill(EcalElectronicsId const&, double, double = 0., double = 0.) override;
+    void fill(DetId const &, double, double = 0., double = 0.) override;
+    void fill(EcalElectronicsId const &, double, double = 0., double = 0.) override;
     void fill(int, double, double = 0., double = 0.) override;
 
-    void setBinContent(DetId const& _id, int, double _value) override { fill(_id, _value); }
-    void setBinContent(EcalElectronicsId const& _id, int, double _value) override { fill(_id, _value); }
+    void setBinContent(DetId const &_id, int, double _value) override { fill(_id, _value); }
+    void setBinContent(EcalElectronicsId const &_id, int, double _value) override { fill(_id, _value); }
     void setBinContent(int _dcctccid, int, double _value) override { fill(_dcctccid, _value); }
 
-    double getBinContent(DetId const&, int = 0) const override;
-    double getBinContent(EcalElectronicsId const&, int = 0) const override;
+    double getBinContent(DetId const &, int = 0) const override;
+    double getBinContent(EcalElectronicsId const &, int = 0) const override;
     double getBinContent(int, int = 0) const override;
 
     void reset(double = 0., double = 0., double = 0.) override;
   };
-}
+}  // namespace ecaldqm
 
 #endif
diff --git a/DQM/EcalCommon/interface/MESetDet1D.h b/DQM/EcalCommon/interface/MESetDet1D.h
index 1c09a3b77f127..318855215eb51 100644
--- a/DQM/EcalCommon/interface/MESetDet1D.h
+++ b/DQM/EcalCommon/interface/MESetDet1D.h
@@ -3,71 +3,73 @@
 
 #include "MESetEcal.h"
 
-namespace ecaldqm
-{
+namespace ecaldqm {
   /*
-    class MESetDet1D
-    channel ID-based MonitorElement wrapper
-    channel id <-> x axis bin
-  */
+  class MESetDet1D
+  channel ID-based MonitorElement wrapper
+  channel id <-> x axis bin
+*/
 
-  class MESetDet1D : public MESetEcal
-  {
-  public :
-    MESetDet1D(std::string const&, binning::ObjectType, binning::BinningType, MonitorElement::Kind, binning::AxisSpecs const* = nullptr);
-    MESetDet1D(MESetDet1D const&);
+  class MESetDet1D : public MESetEcal {
+  public:
+    MESetDet1D(std::string const &,
+               binning::ObjectType,
+               binning::BinningType,
+               MonitorElement::Kind,
+               binning::AxisSpecs const * = nullptr);
+    MESetDet1D(MESetDet1D const &);
     ~MESetDet1D() override;
 
-    MESet* clone(std::string const& = "") const override;
+    MESet *clone(std::string const & = "") const override;
 
-    void book(DQMStore::IBooker&) override;
+    void book(DQMStore::IBooker &) override;
 
-    void fill(DetId const&, double = 1., double = 1., double = 0.) override;
-    void fill(EcalElectronicsId const&, double = 1., double = 1., double = 0.) override;
+    void fill(DetId const &, double = 1., double = 1., double = 0.) override;
+    void fill(EcalElectronicsId const &, double = 1., double = 1., double = 0.) override;
     void fill(int, double = 1., double = 1., double = 0.) override;
 
-    void setBinContent(DetId const&, double) override;
-    void setBinContent(EcalElectronicsId const&, double) override;
+    void setBinContent(DetId const &, double) override;
+    void setBinContent(EcalElectronicsId const &, double) override;
     void setBinContent(int, double) override;
-    void setBinContent(DetId const&, int, double) override;
-    void setBinContent(EcalElectronicsId const&, int, double) override;
+    void setBinContent(DetId const &, int, double) override;
+    void setBinContent(EcalElectronicsId const &, int, double) override;
     void setBinContent(int, int, double) override;
 
-    void setBinError(DetId const&, double) override;
-    void setBinError(EcalElectronicsId const&, double) override;
+    void setBinError(DetId const &, double) override;
+    void setBinError(EcalElectronicsId const &, double) override;
     void setBinError(int, double) override;
-    void setBinError(DetId const&, int, double) override;
-    void setBinError(EcalElectronicsId const&, int, double) override;
+    void setBinError(DetId const &, int, double) override;
+    void setBinError(EcalElectronicsId const &, int, double) override;
     void setBinError(int, int, double) override;
 
-    void setBinEntries(DetId const&, double) override;
-    void setBinEntries(EcalElectronicsId const&, double) override;
+    void setBinEntries(DetId const &, double) override;
+    void setBinEntries(EcalElectronicsId const &, double) override;
     void setBinEntries(int, double) override;
-    void setBinEntries(DetId const&, int, double) override;
-    void setBinEntries(EcalElectronicsId const&, int, double) override;
+    void setBinEntries(DetId const &, int, double) override;
+    void setBinEntries(EcalElectronicsId const &, int, double) override;
     void setBinEntries(int, int, double) override;
 
-    double getBinContent(DetId const&, int = 0) const override;
-    double getBinContent(EcalElectronicsId const&, int = 0) const override;
+    double getBinContent(DetId const &, int = 0) const override;
+    double getBinContent(EcalElectronicsId const &, int = 0) const override;
     double getBinContent(int, int = 0) const override;
 
-    double getBinError(DetId const&, int = 0) const override;
-    double getBinError(EcalElectronicsId const&, int = 0) const override;
+    double getBinError(DetId const &, int = 0) const override;
+    double getBinError(EcalElectronicsId const &, int = 0) const override;
     double getBinError(int, int = 0) const override;
 
-    double getBinEntries(DetId const&, int = 0) const override;
-    double getBinEntries(EcalElectronicsId const&, int = 0) const override;
+    double getBinEntries(DetId const &, int = 0) const override;
+    double getBinEntries(EcalElectronicsId const &, int = 0) const override;
     double getBinEntries(int, int = 0) const override;
 
-    int findBin(DetId const&) const;
-    int findBin(EcalElectronicsId const&) const;
+    int findBin(DetId const &) const;
+    int findBin(EcalElectronicsId const &) const;
     int findBin(int) const;
-    int findBin(DetId const&, double, double = 0.) const override;
-    int findBin(EcalElectronicsId const&, double, double = 0.) const override;
+    int findBin(DetId const &, double, double = 0.) const override;
+    int findBin(EcalElectronicsId const &, double, double = 0.) const override;
     int findBin(int, double, double = 0.) const override;
 
     void reset(double = 0., double = 0., double = 0.) override;
   };
-}
+}  // namespace ecaldqm
 
 #endif
diff --git a/DQM/EcalCommon/interface/MESetDet2D.h b/DQM/EcalCommon/interface/MESetDet2D.h
index a82ceb90fc2c9..b8116b93a81ec 100644
--- a/DQM/EcalCommon/interface/MESetDet2D.h
+++ b/DQM/EcalCommon/interface/MESetDet2D.h
@@ -3,60 +3,62 @@
 
 #include "MESetEcal.h"
 
-namespace ecaldqm
-{
+namespace ecaldqm {
   /* class MESetDet2D
-     channel ID-based MonitorElement wrapper
-     channel id <-> 2D cell
-  */
-  class MESetDet2D : public MESetEcal
-  {
-  public :
-    MESetDet2D(std::string const&, binning::ObjectType, binning::BinningType, MonitorElement::Kind, binning::AxisSpecs const* = nullptr);
-    MESetDet2D(MESetDet2D const&);
+   channel ID-based MonitorElement wrapper
+   channel id <-> 2D cell
+*/
+  class MESetDet2D : public MESetEcal {
+  public:
+    MESetDet2D(std::string const &,
+               binning::ObjectType,
+               binning::BinningType,
+               MonitorElement::Kind,
+               binning::AxisSpecs const * = nullptr);
+    MESetDet2D(MESetDet2D const &);
     ~MESetDet2D() override;
 
-    MESet* clone(std::string const& = "") const override;
+    MESet *clone(std::string const & = "") const override;
 
-    void book(DQMStore::IBooker&) override;
+    void book(DQMStore::IBooker &) override;
 
-    void fill(DetId const&, double = 1., double = 0., double = 0.) override;
-    void fill(EcalElectronicsId const&, double = 1., double = 0., double = 0.) override;
+    void fill(DetId const &, double = 1., double = 0., double = 0.) override;
+    void fill(EcalElectronicsId const &, double = 1., double = 0., double = 0.) override;
     void fill(int, double = 1., double = 1., double = 1.) override;
 
     using MESetEcal::setBinContent;
-    void setBinContent(DetId const&, double) override;
-    void setBinContent(EcalElectronicsId const&, double) override;
+    void setBinContent(DetId const &, double) override;
+    void setBinContent(EcalElectronicsId const &, double) override;
     void setBinContent(int, double) override;
 
     using MESetEcal::setBinError;
-    void setBinError(DetId const&, double) override;
-    void setBinError(EcalElectronicsId const&, double) override;
+    void setBinError(DetId const &, double) override;
+    void setBinError(EcalElectronicsId const &, double) override;
     void setBinError(int, double) override;
 
     using MESetEcal::setBinEntries;
-    void setBinEntries(DetId const&, double) override;
-    void setBinEntries(EcalElectronicsId const&, double) override;
+    void setBinEntries(DetId const &, double) override;
+    void setBinEntries(EcalElectronicsId const &, double) override;
     void setBinEntries(int, double) override;
 
     using MESetEcal::getBinContent;
-    double getBinContent(DetId const&, int = 0) const override;
-    double getBinContent(EcalElectronicsId const&, int = 0) const override;
+    double getBinContent(DetId const &, int = 0) const override;
+    double getBinContent(EcalElectronicsId const &, int = 0) const override;
     double getBinContent(int, int = 0) const override;
 
     using MESetEcal::getBinError;
-    double getBinError(DetId const&, int = 0) const override;
-    double getBinError(EcalElectronicsId const&, int = 0) const override;
+    double getBinError(DetId const &, int = 0) const override;
+    double getBinError(EcalElectronicsId const &, int = 0) const override;
     double getBinError(int, int = 0) const override;
 
     using MESetEcal::getBinEntries;
-    double getBinEntries(DetId const&, int = 0) const override;
-    double getBinEntries(EcalElectronicsId const&, int = 0) const override;
+    double getBinEntries(DetId const &, int = 0) const override;
+    double getBinEntries(EcalElectronicsId const &, int = 0) const override;
     double getBinEntries(int, int) const override;
 
     using MESetEcal::findBin;
-    int findBin(DetId const&) const;
-    int findBin(EcalElectronicsId const&) const;
+    int findBin(DetId const &) const;
+    int findBin(EcalElectronicsId const &) const;
 
     void reset(double = 0., double = 0., double = 0.) override;
 
@@ -67,6 +69,6 @@ namespace ecaldqm
     void fill_(unsigned, int, double, double) override;
     void fill_(unsigned, double, double, double) override;
   };
-}
+}  // namespace ecaldqm
 
 #endif
diff --git a/DQM/EcalCommon/interface/MESetEcal.h b/DQM/EcalCommon/interface/MESetEcal.h
index 4ffbedff5426d..135354ccb14a3 100644
--- a/DQM/EcalCommon/interface/MESetEcal.h
+++ b/DQM/EcalCommon/interface/MESetEcal.h
@@ -3,76 +3,83 @@
 
 #include "MESet.h"
 
-namespace ecaldqm
-{
+namespace ecaldqm {
 
   /* class MESetEcal
-     implements plot <-> detector part relationship
-     base class for channel-binned histograms
-     MESetEcal is only filled given an object identifier and a bin (channel id does not give a bin)
-  */
-
-  class MESetEcal : public MESet
-  {
-  public :
-    MESetEcal(std::string const&, binning::ObjectType, binning::BinningType, MonitorElement::Kind, unsigned, binning::AxisSpecs const* = nullptr, binning::AxisSpecs const* = nullptr, binning::AxisSpecs const* = nullptr);
-    MESetEcal(MESetEcal const&);
+   implements plot <-> detector part relationship
+   base class for channel-binned histograms
+   MESetEcal is only filled given an object identifier and a bin (channel id
+   does not give a bin)
+*/
+
+  class MESetEcal : public MESet {
+  public:
+    MESetEcal(std::string const &,
+              binning::ObjectType,
+              binning::BinningType,
+              MonitorElement::Kind,
+              unsigned,
+              binning::AxisSpecs const * = nullptr,
+              binning::AxisSpecs const * = nullptr,
+              binning::AxisSpecs const * = nullptr);
+    MESetEcal(MESetEcal const &);
     ~MESetEcal() override;
 
-    MESet& operator=(MESet const&) override;
+    MESet &operator=(MESet const &) override;
 
-    MESet* clone(std::string const& = "") const override;
+    MESet *clone(std::string const & = "") const override;
 
-    void book(DQMStore::IBooker&) override;
-    bool retrieve(DQMStore::IGetter&, std::string* = nullptr) const override;
+    void book(DQMStore::IBooker &) override;
+    bool retrieve(DQMStore::IGetter &, std::string * = nullptr) const override;
 
-    void fill(DetId const&, double = 1., double = 1., double = 1.) override;
-    void fill(EcalElectronicsId const&, double = 1., double = 1., double = 1.) override;
+    void fill(DetId const &, double = 1., double = 1., double = 1.) override;
+    void fill(EcalElectronicsId const &, double = 1., double = 1., double = 1.) override;
     void fill(int, double = 1., double = 1., double = 1.) override;
     void fill(double, double = 1., double = 1.) override;
 
-    void setBinContent(DetId const&, int, double) override;
-    void setBinContent(EcalElectronicsId const&, int, double) override;
+    void setBinContent(DetId const &, int, double) override;
+    void setBinContent(EcalElectronicsId const &, int, double) override;
     void setBinContent(int, int, double) override;
 
-    void setBinError(DetId const&, int, double) override;
-    void setBinError(EcalElectronicsId const&, int, double) override;
+    void setBinError(DetId const &, int, double) override;
+    void setBinError(EcalElectronicsId const &, int, double) override;
     void setBinError(int, int, double) override;
 
-    void setBinEntries(DetId const&, int, double) override;
-    void setBinEntries(EcalElectronicsId const&, int, double) override;
+    void setBinEntries(DetId const &, int, double) override;
+    void setBinEntries(EcalElectronicsId const &, int, double) override;
     void setBinEntries(int, int, double) override;
 
-    double getBinContent(DetId const&, int) const override;
-    double getBinContent(EcalElectronicsId const&, int) const override;
+    double getBinContent(DetId const &, int) const override;
+    double getBinContent(EcalElectronicsId const &, int) const override;
     double getBinContent(int, int) const override;
 
-    double getBinError(DetId const&, int) const override;
-    double getBinError(EcalElectronicsId const&, int) const override;
+    double getBinError(DetId const &, int) const override;
+    double getBinError(EcalElectronicsId const &, int) const override;
     double getBinError(int, int) const override;
 
-    double getBinEntries(DetId const&, int) const override;
-    double getBinEntries(EcalElectronicsId const&, int) const override;
+    double getBinEntries(DetId const &, int) const override;
+    double getBinEntries(EcalElectronicsId const &, int) const override;
     double getBinEntries(int, int) const override;
 
-    virtual int findBin(DetId const&, double, double = 0.) const;
-    virtual int findBin(EcalElectronicsId const&, double, double = 0.) const;
+    virtual int findBin(DetId const &, double, double = 0.) const;
+    virtual int findBin(EcalElectronicsId const &, double, double = 0.) const;
     virtual int findBin(int, double, double = 0.) const;
 
     bool isVariableBinning() const override;
 
     std::vector<std::string> generatePaths() const;
 
-  protected :
+  protected:
     unsigned logicalDimensions_;
-    binning::AxisSpecs const* xaxis_;
-    binning::AxisSpecs const* yaxis_;
-    binning::AxisSpecs const* zaxis_;
+    binning::AxisSpecs const *xaxis_;
+    binning::AxisSpecs const *yaxis_;
+    binning::AxisSpecs const *zaxis_;
 
   private:
-    template<class Bookable> void doBook_(Bookable&);
+    template <class Bookable>
+    void doBook_(Bookable &);
   };
 
-}
+}  // namespace ecaldqm
 
 #endif
diff --git a/DQM/EcalCommon/interface/MESetMulti.h b/DQM/EcalCommon/interface/MESetMulti.h
index 68b828bd208c8..43804ca226693 100644
--- a/DQM/EcalCommon/interface/MESetMulti.h
+++ b/DQM/EcalCommon/interface/MESetMulti.h
@@ -3,83 +3,120 @@
 
 #include "MESet.h"
 
-namespace ecaldqm
-{
+namespace ecaldqm {
   /* class MESetMulti
-     wrapper for a set of MESets
-     limit() filters out unused MESets
-     use() method sets the MESet to be used
-  */
+   wrapper for a set of MESets
+   limit() filters out unused MESets
+   use() method sets the MESet to be used
+*/
 
   class MESetMulti : public MESet {
   public:
-    typedef std::map<std::string, std::vector<std::string> > ReplCandidates;
+    typedef std::map<std::string, std::vector<std::string>> ReplCandidates;
 
-    MESetMulti(MESet const&, ReplCandidates const&);
-    MESetMulti(MESetMulti const&);
+    MESetMulti(MESet const &, ReplCandidates const &);
+    MESetMulti(MESetMulti const &);
     ~MESetMulti() override;
 
-    MESet& operator=(MESet const&) override;
+    MESet &operator=(MESet const &) override;
 
-    MESet* clone(std::string const& = "") const override;
+    MESet *clone(std::string const & = "") const override;
 
-    void book(DQMStore::IBooker&) override;
-    bool retrieve(DQMStore::IGetter&, std::string* = nullptr) const override;
+    void book(DQMStore::IBooker &) override;
+    bool retrieve(DQMStore::IGetter &, std::string * = nullptr) const override;
     void clear() const override;
 
-    void fill(DetId const& _id, double _xyw = 1., double _yw = 1., double _w = 1.) override { current_->fill(_id, _xyw, _yw, _w); }
-    void fill(EcalElectronicsId const& _id, double _xyw = 1., double _yw = 1., double _w = 1.) override { current_->fill(_id, _xyw, _yw, _w); }
-    void fill(int _dcctccid, double _xyw = 1., double _yw = 1., double _w = 1.) override { current_->fill(_dcctccid, _xyw, _yw, _w); }
+    void fill(DetId const &_id, double _xyw = 1., double _yw = 1., double _w = 1.) override {
+      current_->fill(_id, _xyw, _yw, _w);
+    }
+    void fill(EcalElectronicsId const &_id, double _xyw = 1., double _yw = 1., double _w = 1.) override {
+      current_->fill(_id, _xyw, _yw, _w);
+    }
+    void fill(int _dcctccid, double _xyw = 1., double _yw = 1., double _w = 1.) override {
+      current_->fill(_dcctccid, _xyw, _yw, _w);
+    }
     void fill(double _x, double _yw = 1., double _w = 1.) override { current_->fill(_x, _yw, _w); }
 
-    void setBinContent(DetId const& _id, double _content) override { current_->setBinContent(_id, _content); }
-    void setBinContent(EcalElectronicsId const& _id, double _content) override { current_->setBinContent(_id, _content); }
+    void setBinContent(DetId const &_id, double _content) override { current_->setBinContent(_id, _content); }
+    void setBinContent(EcalElectronicsId const &_id, double _content) override {
+      current_->setBinContent(_id, _content);
+    }
     void setBinContent(int _dcctccid, double _content) override { current_->setBinContent(_dcctccid, _content); }
-    void setBinContent(DetId const& _id, int _bin, double _content) override { current_->setBinContent(_id, _bin, _content); }
-    void setBinContent(EcalElectronicsId const& _id, int _bin, double _content) override { current_->setBinContent(_id, _bin, _content); }
-    void setBinContent(int _dcctccid, int _bin, double _content) override { current_->setBinContent(_dcctccid, _bin, _content); }
-
-    void setBinError(DetId const& _id, double _error) override { current_->setBinError(_id, _error); }
-    void setBinError(EcalElectronicsId const& _id, double _error) override { current_->setBinError(_id, _error); }
+    void setBinContent(DetId const &_id, int _bin, double _content) override {
+      current_->setBinContent(_id, _bin, _content);
+    }
+    void setBinContent(EcalElectronicsId const &_id, int _bin, double _content) override {
+      current_->setBinContent(_id, _bin, _content);
+    }
+    void setBinContent(int _dcctccid, int _bin, double _content) override {
+      current_->setBinContent(_dcctccid, _bin, _content);
+    }
+
+    void setBinError(DetId const &_id, double _error) override { current_->setBinError(_id, _error); }
+    void setBinError(EcalElectronicsId const &_id, double _error) override { current_->setBinError(_id, _error); }
     void setBinError(int _dcctccid, double _error) override { current_->setBinError(_dcctccid, _error); }
-    void setBinError(DetId const& _id, int _bin, double _error) override { current_->setBinError(_id, _bin, _error); }
-    void setBinError(EcalElectronicsId const& _id, int _bin, double _error) override { current_->setBinError(_id, _bin, _error); }
-    void setBinError(int _dcctccid, int _bin, double _error) override { current_->setBinError(_dcctccid, _bin, _error); }
-
-    void setBinEntries(DetId const& _id, double _entries) override { current_->setBinEntries(_id, _entries); }
-    void setBinEntries(EcalElectronicsId const& _id, double _entries) override { current_->setBinEntries(_id, _entries); }
+    void setBinError(DetId const &_id, int _bin, double _error) override { current_->setBinError(_id, _bin, _error); }
+    void setBinError(EcalElectronicsId const &_id, int _bin, double _error) override {
+      current_->setBinError(_id, _bin, _error);
+    }
+    void setBinError(int _dcctccid, int _bin, double _error) override {
+      current_->setBinError(_dcctccid, _bin, _error);
+    }
+
+    void setBinEntries(DetId const &_id, double _entries) override { current_->setBinEntries(_id, _entries); }
+    void setBinEntries(EcalElectronicsId const &_id, double _entries) override {
+      current_->setBinEntries(_id, _entries);
+    }
     void setBinEntries(int _dcctccid, double _entries) override { current_->setBinEntries(_dcctccid, _entries); }
-    void setBinEntries(DetId const& _id, int _bin, double _entries) override { current_->setBinEntries(_id, _bin, _entries); }
-    void setBinEntries(EcalElectronicsId const& _id, int _bin, double _entries) override { current_->setBinEntries(_id, _bin, _entries); }
-    void setBinEntries(int _dcctccid, int _bin, double _entries) override { current_->setBinEntries(_dcctccid, _bin, _entries); }
-
-    double getBinContent(DetId const& _id, int _bin = 0) const override { return current_->getBinContent(_id, _bin); }
-    double getBinContent(EcalElectronicsId const& _id, int _bin = 0) const override { return current_->getBinContent(_id, _bin); }
-    double getBinContent(int _dcctccid, int _bin = 0) const override { return current_->getBinContent(_dcctccid, _bin); }
-
-    double getBinError(DetId const& _id, int _bin = 0) const override { return current_->getBinError(_id, _bin); }
-    double getBinError(EcalElectronicsId const& _id, int _bin = 0) const override { return current_->getBinError(_id, _bin); }
+    void setBinEntries(DetId const &_id, int _bin, double _entries) override {
+      current_->setBinEntries(_id, _bin, _entries);
+    }
+    void setBinEntries(EcalElectronicsId const &_id, int _bin, double _entries) override {
+      current_->setBinEntries(_id, _bin, _entries);
+    }
+    void setBinEntries(int _dcctccid, int _bin, double _entries) override {
+      current_->setBinEntries(_dcctccid, _bin, _entries);
+    }
+
+    double getBinContent(DetId const &_id, int _bin = 0) const override { return current_->getBinContent(_id, _bin); }
+    double getBinContent(EcalElectronicsId const &_id, int _bin = 0) const override {
+      return current_->getBinContent(_id, _bin);
+    }
+    double getBinContent(int _dcctccid, int _bin = 0) const override {
+      return current_->getBinContent(_dcctccid, _bin);
+    }
+
+    double getBinError(DetId const &_id, int _bin = 0) const override { return current_->getBinError(_id, _bin); }
+    double getBinError(EcalElectronicsId const &_id, int _bin = 0) const override {
+      return current_->getBinError(_id, _bin);
+    }
     double getBinError(int _dcctccid, int _bin = 0) const override { return current_->getBinError(_dcctccid, _bin); }
 
-    double getBinEntries(DetId const& _id, int _bin = 0) const override { return current_->getBinEntries(_id, _bin); }
-    double getBinEntries(EcalElectronicsId const& _id, int _bin = 0) const override { return current_->getBinEntries(_id, _bin); }
-    double getBinEntries(int _dcctccid, int _bin = 0) const override { return current_->getBinEntries(_dcctccid, _bin); }
+    double getBinEntries(DetId const &_id, int _bin = 0) const override { return current_->getBinEntries(_id, _bin); }
+    double getBinEntries(EcalElectronicsId const &_id, int _bin = 0) const override {
+      return current_->getBinEntries(_id, _bin);
+    }
+    double getBinEntries(int _dcctccid, int _bin = 0) const override {
+      return current_->getBinEntries(_dcctccid, _bin);
+    }
 
     void reset(double = 0., double = 0., double = 0.) override;
     void resetAll(double = 0., double = 0., double = 0.) override;
 
-    bool maskMatches(DetId const& _id, uint32_t _mask, StatusManager const* _statusManager) const override { return current_ && current_->maskMatches(_id, _mask, _statusManager); }
+    bool maskMatches(DetId const &_id, uint32_t _mask, StatusManager const *_statusManager) const override {
+      return current_ && current_->maskMatches(_id, _mask, _statusManager);
+    }
 
     bool isVariableBinning() const override { return current_->isVariableBinning(); }
 
-    std::string const& getPath() const override { return current_->getPath(); }
-    MonitorElement const* getME(unsigned _iME) const override { return current_->getME(_iME); }
-    MonitorElement* getME(unsigned _iME) override { return current_->getME(_iME); }
+    std::string const &getPath() const override { return current_->getPath(); }
+    MonitorElement const *getME(unsigned _iME) const override { return current_->getME(_iME); }
+    MonitorElement *getME(unsigned _iME) override { return current_->getME(_iME); }
 
     void use(unsigned) const;
-    MESet* getCurrent() const { return current_; }
+    MESet *getCurrent() const { return current_; }
     unsigned getMultiplicity() const { return sets_.size(); }
-    unsigned getIndex(PathReplacements const&) const;
+    unsigned getIndex(PathReplacements const &) const;
 
     const_iterator begin() const override { return const_iterator(*current_); }
     const_iterator end() const override { return const_iterator(*current_, -1, -1); }
@@ -89,10 +126,10 @@ namespace ecaldqm
     iterator beginChannel() override { return current_->beginChannel(); }
 
   protected:
-    mutable MESet* current_;
-    std::vector<MESet*> sets_;
+    mutable MESet *current_;
+    std::vector<MESet *> sets_;
     ReplCandidates replCandidates_;
   };
-}
+}  // namespace ecaldqm
 
 #endif
diff --git a/DQM/EcalCommon/interface/MESetNonObject.h b/DQM/EcalCommon/interface/MESetNonObject.h
index eab2579c1ccd8..9ff584ef2b949 100644
--- a/DQM/EcalCommon/interface/MESetNonObject.h
+++ b/DQM/EcalCommon/interface/MESetNonObject.h
@@ -3,21 +3,25 @@
 
 #include "MESet.h"
 
-namespace ecaldqm
-{
-  class MESetNonObject : public MESet
-  {
-  public :
-    MESetNonObject(std::string const&, binning::ObjectType, binning::BinningType, MonitorElement::Kind, binning::AxisSpecs const* = nullptr, binning::AxisSpecs const* = nullptr, binning::AxisSpecs const* = nullptr);
-    MESetNonObject(MESetNonObject const&);
+namespace ecaldqm {
+  class MESetNonObject : public MESet {
+  public:
+    MESetNonObject(std::string const &,
+                   binning::ObjectType,
+                   binning::BinningType,
+                   MonitorElement::Kind,
+                   binning::AxisSpecs const * = nullptr,
+                   binning::AxisSpecs const * = nullptr,
+                   binning::AxisSpecs const * = nullptr);
+    MESetNonObject(MESetNonObject const &);
     ~MESetNonObject() override;
 
-    MESet& operator=(MESet const&) override;
+    MESet &operator=(MESet const &) override;
 
-    MESet* clone(std::string const& = "") const override;
+    MESet *clone(std::string const & = "") const override;
 
-    void book(DQMStore::IBooker&) override;
-    bool retrieve(DQMStore::IGetter&, std::string* = nullptr) const override;
+    void book(DQMStore::IBooker &) override;
+    bool retrieve(DQMStore::IGetter &, std::string * = nullptr) const override;
 
     void fill(double, double = 1., double = 1.) override;
 
@@ -40,11 +44,10 @@ namespace ecaldqm
     bool isVariableBinning() const override;
 
   protected:
-    binning::AxisSpecs const* xaxis_;
-    binning::AxisSpecs const* yaxis_;
-    binning::AxisSpecs const* zaxis_;
+    binning::AxisSpecs const *xaxis_;
+    binning::AxisSpecs const *yaxis_;
+    binning::AxisSpecs const *zaxis_;
   };
-}
-
+}  // namespace ecaldqm
 
 #endif
diff --git a/DQM/EcalCommon/interface/MESetProjection.h b/DQM/EcalCommon/interface/MESetProjection.h
index c54dedd927f34..08f7579fc1a56 100644
--- a/DQM/EcalCommon/interface/MESetProjection.h
+++ b/DQM/EcalCommon/interface/MESetProjection.h
@@ -3,43 +3,46 @@
 
 #include "MESetEcal.h"
 
-namespace ecaldqm
-{
+namespace ecaldqm {
 
   /* class MESetProjection
-     MonitorElement wrapper for projection type 1D MEs
-  */
+   MonitorElement wrapper for projection type 1D MEs
+*/
 
   class MESetProjection : public MESetEcal {
-  public :
-    MESetProjection(std::string const&, binning::ObjectType, binning::BinningType, MonitorElement::Kind, binning::AxisSpecs const* = nullptr);
-    MESetProjection(MESetProjection const&);
+  public:
+    MESetProjection(std::string const &,
+                    binning::ObjectType,
+                    binning::BinningType,
+                    MonitorElement::Kind,
+                    binning::AxisSpecs const * = nullptr);
+    MESetProjection(MESetProjection const &);
     ~MESetProjection() override;
 
-    MESet* clone(std::string const& = "") const override;
+    MESet *clone(std::string const & = "") const override;
 
-    void fill(DetId const&, double = 1., double = 0., double = 0.) override;
+    void fill(DetId const &, double = 1., double = 0., double = 0.) override;
     void fill(int, double = 1., double = 1., double = 0.) override;
     void fill(double, double = 1., double = 0.) override;
 
     using MESetEcal::setBinContent;
-    void setBinContent(DetId const&, double) override;
+    void setBinContent(DetId const &, double) override;
 
     using MESetEcal::setBinError;
-    void setBinError(DetId const&, double) override;
+    void setBinError(DetId const &, double) override;
 
     using MESetEcal::setBinEntries;
-    void setBinEntries(DetId const&, double) override;
+    void setBinEntries(DetId const &, double) override;
 
     using MESetEcal::getBinContent;
-    double getBinContent(DetId const&, int = 0) const override;
+    double getBinContent(DetId const &, int = 0) const override;
 
     using MESetEcal::getBinError;
-    double getBinError(DetId const&, int = 0) const override;
+    double getBinError(DetId const &, int = 0) const override;
 
     using MESetEcal::getBinEntries;
-    double getBinEntries(DetId const&, int = 0) const override;
+    double getBinEntries(DetId const &, int = 0) const override;
   };
-}
+}  // namespace ecaldqm
 
 #endif
diff --git a/DQM/EcalCommon/interface/MESetTrend.h b/DQM/EcalCommon/interface/MESetTrend.h
index f38d372415088..c8548396016f5 100644
--- a/DQM/EcalCommon/interface/MESetTrend.h
+++ b/DQM/EcalCommon/interface/MESetTrend.h
@@ -3,33 +3,36 @@
 
 #include "MESetEcal.h"
 
-namespace ecaldqm
-{
+namespace ecaldqm {
   /* class MESetTrend
-     time on xaxis
-     channel id is used to identify the plot
-  */
-
-  class MESetTrend : public MESetEcal
-  {
-  public :
-    MESetTrend(std::string const&, binning::ObjectType, binning::BinningType, MonitorElement::Kind, binning::AxisSpecs const* = nullptr, binning::AxisSpecs const* = nullptr);
-    MESetTrend(MESetTrend const&);
+   time on xaxis
+   channel id is used to identify the plot
+*/
+
+  class MESetTrend : public MESetEcal {
+  public:
+    MESetTrend(std::string const &,
+               binning::ObjectType,
+               binning::BinningType,
+               MonitorElement::Kind,
+               binning::AxisSpecs const * = nullptr,
+               binning::AxisSpecs const * = nullptr);
+    MESetTrend(MESetTrend const &);
     ~MESetTrend() override {}
 
-    MESet& operator=(MESet const&) override;
+    MESet &operator=(MESet const &) override;
 
-    MESet* clone(std::string const& = "") const override;
+    MESet *clone(std::string const & = "") const override;
 
-    void book(DQMStore::IBooker&) override;
+    void book(DQMStore::IBooker &) override;
 
-    void fill(DetId const&, double, double = 1., double = 1.) override;
-    void fill(EcalElectronicsId const&, double, double = 1., double = 1.) override;
+    void fill(DetId const &, double, double = 1., double = 1.) override;
+    void fill(EcalElectronicsId const &, double, double = 1., double = 1.) override;
     void fill(int, double, double = 1., double = 1.) override;
     void fill(double, double = 1., double = 1.) override;
 
-    int findBin(DetId const&, double, double = 0.) const override;
-    int findBin(EcalElectronicsId const&, double, double = 0.) const override;
+    int findBin(DetId const &, double, double = 0.) const override;
+    int findBin(EcalElectronicsId const &, double, double = 0.) const override;
     int findBin(int, double, double = 0.) const override;
     int findBin(double, double = 0.) const;
 
@@ -45,10 +48,10 @@ namespace ecaldqm
   private:
     bool shift_(unsigned);
 
-    bool minutely_; // if true, bins in minutes instead of lumis
-    bool shiftAxis_; // if true, shift x values
-    int currentBin_; // only used for cumulative case
+    bool minutely_;   // if true, bins in minutes instead of lumis
+    bool shiftAxis_;  // if true, shift x values
+    int currentBin_;  // only used for cumulative case
   };
-}
+}  // namespace ecaldqm
 
 #endif
diff --git a/DQM/EcalCommon/interface/MESetUtils.h b/DQM/EcalCommon/interface/MESetUtils.h
index 4e776cf02eca4..d62a965dc17f2 100644
--- a/DQM/EcalCommon/interface/MESetUtils.h
+++ b/DQM/EcalCommon/interface/MESetUtils.h
@@ -6,16 +6,14 @@
 #include <map>
 #include <string>
 
-namespace edm
-{
+namespace edm {
   class ParameterSet;
   class ParameterSetDescription;
-}
+}  // namespace edm
 
-namespace ecaldqm
-{
-  MESet* createMESet(edm::ParameterSet const&);
-  void fillMESetDescriptions(edm::ParameterSetDescription&);
-}
+namespace ecaldqm {
+  MESet *createMESet(edm::ParameterSet const &);
+  void fillMESetDescriptions(edm::ParameterSetDescription &);
+}  // namespace ecaldqm
 
 #endif
diff --git a/DQM/EcalCommon/interface/StatusManager.h b/DQM/EcalCommon/interface/StatusManager.h
index da931705d5a29..364de187efa4f 100644
--- a/DQM/EcalCommon/interface/StatusManager.h
+++ b/DQM/EcalCommon/interface/StatusManager.h
@@ -1,26 +1,25 @@
 #ifndef StatusManager_H
 #define StatusManager_H
 
-#include <iostream>
 #include <cstdint>
-#include <vector>
+#include <iostream>
 #include <map>
+#include <vector>
 
 #include "CondFormats/EcalObjects/interface/EcalDQMChannelStatus.h"
 #include "CondFormats/EcalObjects/interface/EcalDQMTowerStatus.h"
 
-namespace ecaldqm
-{
+namespace ecaldqm {
 
   class StatusManager {
   public:
     StatusManager();
     ~StatusManager() {}
 
-    void readFromStream(std::istream&);
-    void readFromObj(EcalDQMChannelStatus const&, EcalDQMTowerStatus const&);
-    void writeToStream(std::ostream&) const;
-    void writeToObj(EcalDQMChannelStatus&, EcalDQMTowerStatus&) const;
+    void readFromStream(std::istream &);
+    void readFromObj(EcalDQMChannelStatus const &, EcalDQMTowerStatus const &);
+    void writeToStream(std::ostream &) const;
+    void writeToObj(EcalDQMChannelStatus &, EcalDQMTowerStatus &) const;
 
     uint32_t getStatus(uint32_t) const;
 
@@ -29,6 +28,6 @@ namespace ecaldqm
     std::map<uint32_t, uint32_t> status_;
   };
 
-}
+}  // namespace ecaldqm
 
 #endif
diff --git a/DQM/EcalCommon/plugins/EcalMEFormatter.cc b/DQM/EcalCommon/plugins/EcalMEFormatter.cc
index 473a00c6794f6..dd7331f27a662 100644
--- a/DQM/EcalCommon/plugins/EcalMEFormatter.cc
+++ b/DQM/EcalCommon/plugins/EcalMEFormatter.cc
@@ -2,27 +2,22 @@
 
 #include "DQM/EcalCommon/interface/MESetDet2D.h"
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include <limits>
 
-EcalMEFormatter::EcalMEFormatter(edm::ParameterSet const& _ps) :
-  DQMEDHarvester(),
-  ecaldqm::DQWorker()
-{
+EcalMEFormatter::EcalMEFormatter(edm::ParameterSet const &_ps) : DQMEDHarvester(), ecaldqm::DQWorker() {
   initialize("EcalMEFormatter", _ps);
   setME(_ps.getUntrackedParameterSet("MEs"));
   verbosity_ = _ps.getUntrackedParameter<int>("verbosity", 0);
 }
 
 /*static*/
-void
-EcalMEFormatter::fillDescriptions(edm::ConfigurationDescriptions& _descs)
-{
+void EcalMEFormatter::fillDescriptions(edm::ConfigurationDescriptions &_descs) {
   edm::ParameterSetDescription desc;
   ecaldqm::DQWorker::fillDescriptions(desc);
   desc.addUntracked<int>("verbosity", 0);
@@ -30,40 +25,35 @@ EcalMEFormatter::fillDescriptions(edm::ConfigurationDescriptions& _descs)
   _descs.addDefault(desc);
 }
 
-void
-EcalMEFormatter::dqmEndLuminosityBlock(DQMStore::IBooker&, DQMStore::IGetter& _igetter, edm::LuminosityBlock const&, edm::EventSetup const&)
-{
+void EcalMEFormatter::dqmEndLuminosityBlock(DQMStore::IBooker &,
+                                            DQMStore::IGetter &_igetter,
+                                            edm::LuminosityBlock const &,
+                                            edm::EventSetup const &) {
   format_(_igetter, true);
 }
 
-void
-EcalMEFormatter::dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter& _igetter)
-{
-  format_(_igetter, false);
-}
+void EcalMEFormatter::dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &_igetter) { format_(_igetter, false); }
 
-void
-EcalMEFormatter::format_(DQMStore::IGetter& _igetter, bool _checkLumi)
-{
+void EcalMEFormatter::format_(DQMStore::IGetter &_igetter, bool _checkLumi) {
   std::string failedPath;
-    
-  for(ecaldqm::MESetCollection::iterator mItr(MEs_.begin()); mItr != MEs_.end(); ++mItr){
-    if(_checkLumi && !mItr->second->getLumiFlag()) continue;
+
+  for (ecaldqm::MESetCollection::iterator mItr(MEs_.begin()); mItr != MEs_.end(); ++mItr) {
+    if (_checkLumi && !mItr->second->getLumiFlag())
+      continue;
     mItr->second->clear();
-    if(!mItr->second->retrieve(_igetter, &failedPath)){
-      if(verbosity_ > 0) edm::LogWarning("EcalDQM") << "Could not find ME " << mItr->first << "@" << failedPath;
+    if (!mItr->second->retrieve(_igetter, &failedPath)) {
+      if (verbosity_ > 0)
+        edm::LogWarning("EcalDQM") << "Could not find ME " << mItr->first << "@" << failedPath;
       continue;
     }
-    if(verbosity_ > 1) edm::LogInfo("EcalDQM") << "Retrieved " << mItr->first << " from DQMStore";
+    if (verbosity_ > 1)
+      edm::LogInfo("EcalDQM") << "Retrieved " << mItr->first << " from DQMStore";
 
-    if(dynamic_cast<ecaldqm::MESetDet2D*>(mItr->second)) formatDet2D_(*mItr->second);
+    if (dynamic_cast<ecaldqm::MESetDet2D *>(mItr->second))
+      formatDet2D_(*mItr->second);
   }
 }
 
-void
-EcalMEFormatter::formatDet2D_(ecaldqm::MESet& _meSet)
-{
-  return;
-}
+void EcalMEFormatter::formatDet2D_(ecaldqm::MESet &_meSet) { return; }
 
 DEFINE_FWK_MODULE(EcalMEFormatter);
diff --git a/DQM/EcalCommon/plugins/EcalMonitorPrescaler.cc b/DQM/EcalCommon/plugins/EcalMonitorPrescaler.cc
index 6c1d27ba326e7..909a41f5403b6 100644
--- a/DQM/EcalCommon/plugins/EcalMonitorPrescaler.cc
+++ b/DQM/EcalCommon/plugins/EcalMonitorPrescaler.cc
@@ -4,43 +4,33 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include <cmath>
 #include <iostream>
 
 uint32_t EcalMonitorPrescaler::filterBits_[EcalMonitorPrescaler::nPrescalers] = {
-  (1 << EcalDCCHeaderBlock::MTCC) |
-  (1 << EcalDCCHeaderBlock::PHYSICS_GLOBAL) |
-  (1 << EcalDCCHeaderBlock::PHYSICS_LOCAL), // kPhysics
-  (1 << EcalDCCHeaderBlock::COSMIC) |
-  (1 << EcalDCCHeaderBlock::COSMICS_GLOBAL) |
-  (1 << EcalDCCHeaderBlock::COSMICS_LOCAL), // kCosmics
-  (1 << EcalDCCHeaderBlock::LASER_STD) |
-  (1 << EcalDCCHeaderBlock::LASER_GAP) |
-  (1 << EcalDCCHeaderBlock::LED_STD) |
-  (1 << EcalDCCHeaderBlock::LED_GAP) |
-  (1 << EcalDCCHeaderBlock::PEDESTAL_STD) |
-  (1 << EcalDCCHeaderBlock::PEDESTAL_GAP) |
-  (1 << EcalDCCHeaderBlock::TESTPULSE_MGPA) |
-  (1 << EcalDCCHeaderBlock::TESTPULSE_GAP) |
-  (1 << EcalDCCHeaderBlock::PEDESTAL_OFFSET_SCAN), // kCalibration
-  (1 << EcalDCCHeaderBlock::LASER_STD) |
-  (1 << EcalDCCHeaderBlock::LASER_GAP), // kLaser
-  (1 << EcalDCCHeaderBlock::LED_STD) |
-  (1 << EcalDCCHeaderBlock::LED_GAP), // kLed
-  (1 << EcalDCCHeaderBlock::TESTPULSE_MGPA) |
-  (1 << EcalDCCHeaderBlock::TESTPULSE_GAP), // kTestPulse
-  (1 << EcalDCCHeaderBlock::PEDESTAL_STD) |
-  (1 << EcalDCCHeaderBlock::PEDESTAL_GAP) |
-  (1 << EcalDCCHeaderBlock::PEDESTAL_OFFSET_SCAN) // kPedestal
+    (1 << EcalDCCHeaderBlock::MTCC) | (1 << EcalDCCHeaderBlock::PHYSICS_GLOBAL) |
+        (1 << EcalDCCHeaderBlock::PHYSICS_LOCAL),  // kPhysics
+    (1 << EcalDCCHeaderBlock::COSMIC) | (1 << EcalDCCHeaderBlock::COSMICS_GLOBAL) |
+        (1 << EcalDCCHeaderBlock::COSMICS_LOCAL),  // kCosmics
+    (1 << EcalDCCHeaderBlock::LASER_STD) | (1 << EcalDCCHeaderBlock::LASER_GAP) | (1 << EcalDCCHeaderBlock::LED_STD) |
+        (1 << EcalDCCHeaderBlock::LED_GAP) | (1 << EcalDCCHeaderBlock::PEDESTAL_STD) |
+        (1 << EcalDCCHeaderBlock::PEDESTAL_GAP) | (1 << EcalDCCHeaderBlock::TESTPULSE_MGPA) |
+        (1 << EcalDCCHeaderBlock::TESTPULSE_GAP) | (1 << EcalDCCHeaderBlock::PEDESTAL_OFFSET_SCAN),  // kCalibration
+    (1 << EcalDCCHeaderBlock::LASER_STD) | (1 << EcalDCCHeaderBlock::LASER_GAP),                     // kLaser
+    (1 << EcalDCCHeaderBlock::LED_STD) | (1 << EcalDCCHeaderBlock::LED_GAP),                         // kLed
+    (1 << EcalDCCHeaderBlock::TESTPULSE_MGPA) | (1 << EcalDCCHeaderBlock::TESTPULSE_GAP),            // kTestPulse
+    (1 << EcalDCCHeaderBlock::PEDESTAL_STD) | (1 << EcalDCCHeaderBlock::PEDESTAL_GAP) |
+        (1 << EcalDCCHeaderBlock::PEDESTAL_OFFSET_SCAN)  // kPedestal
 };
 
-EcalMonitorPrescaler::EcalMonitorPrescaler(edm::ParameterSet const& _ps):
-  EcalRawDataCollection_(consumes<EcalRawDataCollection>(_ps.getParameter<edm::InputTag>("EcalRawDataCollection")))
-{
-  for(unsigned iP(0); iP != nPrescalers; ++iP) prescalers_[iP].first = 0;
+EcalMonitorPrescaler::EcalMonitorPrescaler(edm::ParameterSet const &_ps)
+    : EcalRawDataCollection_(
+          consumes<EcalRawDataCollection>(_ps.getParameter<edm::InputTag>("EcalRawDataCollection"))) {
+  for (unsigned iP(0); iP != nPrescalers; ++iP)
+    prescalers_[iP].first = 0;
 
   prescalers_[kPhysics].second = _ps.getUntrackedParameter<unsigned>("physics", -1);
   prescalers_[kCosmics].second = _ps.getUntrackedParameter<unsigned>("cosmics", -1);
@@ -51,47 +41,57 @@ EcalMonitorPrescaler::EcalMonitorPrescaler(edm::ParameterSet const& _ps):
   prescalers_[kPedestal].second = _ps.getUntrackedParameter<unsigned>("pedestal", -1);
 
   // Backward compatibility
-  prescalers_[kPhysics].second = std::min(prescalers_[kPhysics].second, (unsigned int)(_ps.getUntrackedParameter<int>("occupancyPrescaleFactor", -1)));
-  prescalers_[kPhysics].second = std::min(prescalers_[kPhysics].second, (unsigned int)(_ps.getUntrackedParameter<int>("integrityPrescaleFactor", -1)));
-  prescalers_[kCosmics].second = std::min(prescalers_[kCosmics].second, (unsigned int)(_ps.getUntrackedParameter<int>("cosmicPrescaleFactor", -1)));
-  prescalers_[kLaser].second = std::min(prescalers_[kLaser].second, (unsigned int)(_ps.getUntrackedParameter<int>("laserPrescaleFactor", -1)));
-  prescalers_[kLed].second = std::min(prescalers_[kLed].second, (unsigned int)(_ps.getUntrackedParameter<int>("ledPrescaleFactor", -1)));
-  prescalers_[kPedestal].second = std::min(prescalers_[kPedestal].second, (unsigned int)(_ps.getUntrackedParameter<int>("pedestalPrescaleFactor", -1)));
-  prescalers_[kPedestal].second = std::min(prescalers_[kPedestal].second, (unsigned int)(_ps.getUntrackedParameter<int>("pedestalonlinePrescaleFactor", -1)));
-  prescalers_[kTestPulse].second = std::min(prescalers_[kTestPulse].second, (unsigned int)(_ps.getUntrackedParameter<int>("testpulsePrescaleFactor", -1)));
-  prescalers_[kPedestal].second = std::min(prescalers_[kPedestal].second, (unsigned int)(_ps.getUntrackedParameter<int>("pedestaloffsetPrescaleFactor", -1)));
-  prescalers_[kPhysics].second = std::min(prescalers_[kPhysics].second, (unsigned int)(_ps.getUntrackedParameter<int>("triggertowerPrescaleFactor", -1)));
-  prescalers_[kPhysics].second = std::min(prescalers_[kPhysics].second, (unsigned int)(_ps.getUntrackedParameter<int>("timingPrescaleFactor", -1)));
-  prescalers_[kPhysics].second = std::min(prescalers_[kPhysics].second, (unsigned int)(_ps.getUntrackedParameter<int>("physicsPrescaleFactor", -1)));
-  prescalers_[kPhysics].second = std::min(prescalers_[kPhysics].second, (unsigned int)(_ps.getUntrackedParameter<int>("clusterPrescaleFactor", -1)));
-}
-    
-EcalMonitorPrescaler::~EcalMonitorPrescaler()
-{
+  prescalers_[kPhysics].second = std::min(
+      prescalers_[kPhysics].second, (unsigned int)(_ps.getUntrackedParameter<int>("occupancyPrescaleFactor", -1)));
+  prescalers_[kPhysics].second = std::min(
+      prescalers_[kPhysics].second, (unsigned int)(_ps.getUntrackedParameter<int>("integrityPrescaleFactor", -1)));
+  prescalers_[kCosmics].second = std::min(prescalers_[kCosmics].second,
+                                          (unsigned int)(_ps.getUntrackedParameter<int>("cosmicPrescaleFactor", -1)));
+  prescalers_[kLaser].second =
+      std::min(prescalers_[kLaser].second, (unsigned int)(_ps.getUntrackedParameter<int>("laserPrescaleFactor", -1)));
+  prescalers_[kLed].second =
+      std::min(prescalers_[kLed].second, (unsigned int)(_ps.getUntrackedParameter<int>("ledPrescaleFactor", -1)));
+  prescalers_[kPedestal].second = std::min(
+      prescalers_[kPedestal].second, (unsigned int)(_ps.getUntrackedParameter<int>("pedestalPrescaleFactor", -1)));
+  prescalers_[kPedestal].second =
+      std::min(prescalers_[kPedestal].second,
+               (unsigned int)(_ps.getUntrackedParameter<int>("pedestalonlinePrescaleFactor", -1)));
+  prescalers_[kTestPulse].second = std::min(
+      prescalers_[kTestPulse].second, (unsigned int)(_ps.getUntrackedParameter<int>("testpulsePrescaleFactor", -1)));
+  prescalers_[kPedestal].second =
+      std::min(prescalers_[kPedestal].second,
+               (unsigned int)(_ps.getUntrackedParameter<int>("pedestaloffsetPrescaleFactor", -1)));
+  prescalers_[kPhysics].second = std::min(
+      prescalers_[kPhysics].second, (unsigned int)(_ps.getUntrackedParameter<int>("triggertowerPrescaleFactor", -1)));
+  prescalers_[kPhysics].second = std::min(prescalers_[kPhysics].second,
+                                          (unsigned int)(_ps.getUntrackedParameter<int>("timingPrescaleFactor", -1)));
+  prescalers_[kPhysics].second = std::min(prescalers_[kPhysics].second,
+                                          (unsigned int)(_ps.getUntrackedParameter<int>("physicsPrescaleFactor", -1)));
+  prescalers_[kPhysics].second = std::min(prescalers_[kPhysics].second,
+                                          (unsigned int)(_ps.getUntrackedParameter<int>("clusterPrescaleFactor", -1)));
 }
 
-void
-EcalMonitorPrescaler::beginRun(edm::Run const&, edm::EventSetup const&)
-{
-  for(unsigned iP(0); iP != nPrescalers; ++iP) prescalers_[iP].first = 0;
+EcalMonitorPrescaler::~EcalMonitorPrescaler() {}
+
+void EcalMonitorPrescaler::beginRun(edm::Run const &, edm::EventSetup const &) {
+  for (unsigned iP(0); iP != nPrescalers; ++iP)
+    prescalers_[iP].first = 0;
 }
 
-bool
-EcalMonitorPrescaler::filter(edm::Event& _event, edm::EventSetup const&)
-{
+bool EcalMonitorPrescaler::filter(edm::Event &_event, edm::EventSetup const &) {
   edm::Handle<EcalRawDataCollection> dcchs;
 
-  if(!_event.getByToken(EcalRawDataCollection_, dcchs)){
+  if (!_event.getByToken(EcalRawDataCollection_, dcchs)) {
     edm::LogWarning("EcalMonitorPrescaler") << "EcalRawDataCollection not available";
     return false;
   }
 
   uint32_t eventBits(0);
-  for(EcalRawDataCollection::const_iterator dcchItr(dcchs->begin()); dcchItr != dcchs->end(); ++dcchItr)
+  for (EcalRawDataCollection::const_iterator dcchItr(dcchs->begin()); dcchItr != dcchs->end(); ++dcchItr)
     eventBits |= (1 << dcchItr->getRunType());
 
-  for(unsigned iP(0); iP != nPrescalers; ++iP){
-    if((eventBits & filterBits_[iP]) != 0 && ++prescalers_[iP].first % prescalers_[iP].second == 0)
+  for (unsigned iP(0); iP != nPrescalers; ++iP) {
+    if ((eventBits & filterBits_[iP]) != 0 && ++prescalers_[iP].first % prescalers_[iP].second == 0)
       return true;
   }
 
diff --git a/DQM/EcalCommon/src/DQWorker.cc b/DQM/EcalCommon/src/DQWorker.cc
index 33543f04baa45..4f3757bc8b482 100644
--- a/DQM/EcalCommon/src/DQWorker.cc
+++ b/DQM/EcalCommon/src/DQWorker.cc
@@ -2,41 +2,29 @@
 
 #include "DQM/EcalCommon/interface/MESetUtils.h"
 
-#include "FWCore/Utilities/interface/Exception.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
 #include "DataFormats/Provenance/interface/EventID.h"
 
-namespace ecaldqm
-{
-  DQWorker::DQWorker() :
-    name_(""),
-    MEs_(),
-    booked_(false),
-    timestamp_(),
-    verbosity_(0),
-    onlineMode_(false),
-    willConvertToEDM_(true)
-  {
-  }
+namespace ecaldqm {
+  DQWorker::DQWorker()
+      : name_(""), MEs_(), booked_(false), timestamp_(), verbosity_(0), onlineMode_(false), willConvertToEDM_(true) {}
 
-  DQWorker::~DQWorker() noexcept(false)
-  {
-  }
+  DQWorker::~DQWorker() noexcept(false) {}
 
   /*static*/
-  void
-  DQWorker::fillDescriptions(edm::ParameterSetDescription& _desc)
-  {
+  void DQWorker::fillDescriptions(edm::ParameterSetDescription &_desc) {
     _desc.addUntracked<bool>("onlineMode", false);
     _desc.addUntracked<bool>("willConvertToEDM", true);
 
     edm::ParameterSetDescription meParameters;
     edm::ParameterSetDescription meNodeParameters;
     fillMESetDescriptions(meNodeParameters);
-    meParameters.addNode(edm::ParameterWildcard<edm::ParameterSetDescription>("*", edm::RequireZeroOrMore, false, meNodeParameters));
+    meParameters.addNode(
+        edm::ParameterWildcard<edm::ParameterSetDescription>("*", edm::RequireZeroOrMore, false, meNodeParameters));
     _desc.addUntracked("MEs", meParameters);
 
     edm::ParameterSetDescription workerParameters;
@@ -44,81 +32,69 @@ namespace ecaldqm
     _desc.addUntracked("params", workerParameters);
   }
 
-  void
-  DQWorker::initialize(std::string const& _name, edm::ParameterSet const& _commonParams)
-  {
+  void DQWorker::initialize(std::string const &_name, edm::ParameterSet const &_commonParams) {
     name_ = _name;
     onlineMode_ = _commonParams.getUntrackedParameter<bool>("onlineMode");
     willConvertToEDM_ = _commonParams.getUntrackedParameter<bool>("willConvertToEDM");
   }
 
-  void
-  DQWorker::setME(edm::ParameterSet const& _meParams)
-  {
-    std::vector<std::string> const& MENames(_meParams.getParameterNames());
+  void DQWorker::setME(edm::ParameterSet const &_meParams) {
+    std::vector<std::string> const &MENames(_meParams.getParameterNames());
 
-    for(unsigned iME(0); iME != MENames.size(); iME++){
+    for (unsigned iME(0); iME != MENames.size(); iME++) {
       std::string name(MENames[iME]);
-      edm::ParameterSet const& params(_meParams.getUntrackedParameterSet(name));
+      edm::ParameterSet const &params(_meParams.getUntrackedParameterSet(name));
 
-      if(!onlineMode_ && params.getUntrackedParameter<bool>("online")) continue;
+      if (!onlineMode_ && params.getUntrackedParameter<bool>("online"))
+        continue;
 
-      try{
+      try {
         MEs_.insert(name, createMESet(params));
-      }
-      catch(std::exception&){
+      } catch (std::exception &) {
         edm::LogError("EcalDQM") << "Exception caught while constructing MESet " << name;
         throw;
       }
     }
   }
 
-  void
-  DQWorker::releaseMEs()
-  {
-    for(MESetCollection::iterator mItr(MEs_.begin()); mItr != MEs_.end(); ++mItr)
+  void DQWorker::releaseMEs() {
+    for (MESetCollection::iterator mItr(MEs_.begin()); mItr != MEs_.end(); ++mItr)
       mItr->second->clear();
     booked_ = false;
   }
 
-  void
-  DQWorker::bookMEs(DQMStore::IBooker& _booker)
-  {
-    if(booked_) return;
-    for(MESetCollection::iterator mItr(MEs_.begin()); mItr != MEs_.end(); ++mItr)
+  void DQWorker::bookMEs(DQMStore::IBooker &_booker) {
+    if (booked_)
+      return;
+    for (MESetCollection::iterator mItr(MEs_.begin()); mItr != MEs_.end(); ++mItr)
       mItr->second->book(_booker);
     booked_ = true;
   }
 
-  void
-  DQWorker::print_(std::string const& _message, int _threshold/* = 0*/) const
-  {
-    if(verbosity_ > _threshold)
+  void DQWorker::print_(std::string const &_message, int _threshold /* = 0*/) const {
+    if (verbosity_ > _threshold)
       edm::LogInfo("EcalDQM") << name_ << ": " << _message;
   }
 
-
-  DQWorker*
-  WorkerFactoryStore::getWorker(std::string const& _name, int _verbosity, edm::ParameterSet const& _commonParams, edm::ParameterSet const& _workerParams) const
-  {
-    DQWorker* worker(workerFactories_.at(_name)());
+  DQWorker *WorkerFactoryStore::getWorker(std::string const &_name,
+                                          int _verbosity,
+                                          edm::ParameterSet const &_commonParams,
+                                          edm::ParameterSet const &_workerParams) const {
+    DQWorker *worker(workerFactories_.at(_name)());
     worker->setVerbosity(_verbosity);
     worker->initialize(_name, _commonParams);
     worker->setME(_workerParams.getUntrackedParameterSet("MEs"));
-    if(_workerParams.existsAs<edm::ParameterSet>("sources", false))
+    if (_workerParams.existsAs<edm::ParameterSet>("sources", false))
       worker->setSource(_workerParams.getUntrackedParameterSet("sources"));
-    if(_workerParams.existsAs<edm::ParameterSet>("params", false))
+    if (_workerParams.existsAs<edm::ParameterSet>("params", false))
       worker->setParams(_workerParams.getUntrackedParameterSet("params"));
     return worker;
   }
 
   /*static*/
-  WorkerFactoryStore*
-  WorkerFactoryStore::singleton()
-  {
+  WorkerFactoryStore *WorkerFactoryStore::singleton() {
     static WorkerFactoryStore workerFactoryStore;
     return &workerFactoryStore;
   }
 
-}
-
+}  // namespace ecaldqm
diff --git a/DQM/EcalCommon/src/EcalDQMCommonUtils.cc b/DQM/EcalCommon/src/EcalDQMCommonUtils.cc
index 283ef8a7e50d0..8243dc99ae1a1 100644
--- a/DQM/EcalCommon/src/EcalDQMCommonUtils.cc
+++ b/DQM/EcalCommon/src/EcalDQMCommonUtils.cc
@@ -4,73 +4,69 @@
 
 #include <mutex>
 
-namespace ecaldqm
-{
-  unsigned memarr[] = {kEEm07, kEEm08, kEEm02, kEEm03,
-                       kEBm01, kEBm02, kEBm03, kEBm04, kEBm05, kEBm06, kEBm07, kEBm08, kEBm09,
-                       kEBm10, kEBm11, kEBm12, kEBm13, kEBm14, kEBm15, kEBm16, kEBm17, kEBm18,
-                       kEBp01, kEBp02, kEBp03, kEBp04, kEBp05, kEBp06, kEBp07, kEBp08, kEBp09,
-                       kEBp10, kEBp11, kEBp12, kEBp13, kEBp14, kEBp15, kEBp16, kEBp17, kEBp18,
-                       kEEp07, kEEp08, kEEp02, kEEp03};
+namespace ecaldqm {
+  unsigned memarr[] = {kEEm07, kEEm08, kEEm02, kEEm03, kEBm01, kEBm02, kEBm03, kEBm04, kEBm05, kEBm06, kEBm07,
+                       kEBm08, kEBm09, kEBm10, kEBm11, kEBm12, kEBm13, kEBm14, kEBm15, kEBm16, kEBm17, kEBm18,
+                       kEBp01, kEBp02, kEBp03, kEBp04, kEBp05, kEBp06, kEBp07, kEBp08, kEBp09, kEBp10, kEBp11,
+                       kEBp12, kEBp13, kEBp14, kEBp15, kEBp16, kEBp17, kEBp18, kEEp07, kEEp08, kEEp02, kEEp03};
   const std::vector<unsigned> memDCC(memarr, memarr + 44);
 
   const double etaBound(1.479);
 
-  unsigned
-  dccId(const DetId &_id)
-  {
-    EcalElectronicsMapping const* map(getElectronicsMap());
+  unsigned dccId(const DetId &_id) {
+    EcalElectronicsMapping const *map(getElectronicsMap());
 
     unsigned subdet(_id.subdetId());
 
-    if(subdet == EcalBarrel) return map->DCCid(EBDetId(_id));
-    else if(subdet == EcalTriggerTower) return map->DCCid(EcalTrigTowerDetId(_id));
-    else if(subdet == EcalEndcap){
-      if(isEcalScDetId(_id)) return map->getDCCandSC(EcalScDetId(_id)).first;
-      else return map->getElectronicsId(EEDetId(_id)).dccId();
-    }
-    else if(subdet == EcalLaserPnDiode) return EcalPnDiodeDetId(_id).iDCCId();
+    if (subdet == EcalBarrel)
+      return map->DCCid(EBDetId(_id));
+    else if (subdet == EcalTriggerTower)
+      return map->DCCid(EcalTrigTowerDetId(_id));
+    else if (subdet == EcalEndcap) {
+      if (isEcalScDetId(_id))
+        return map->getDCCandSC(EcalScDetId(_id)).first;
+      else
+        return map->getElectronicsId(EEDetId(_id)).dccId();
+    } else if (subdet == EcalLaserPnDiode)
+      return EcalPnDiodeDetId(_id).iDCCId();
 
     throw cms::Exception("InvalidDetId") << "EcalDQMCommonUtils::dccId(" << _id.rawId() << ")" << std::endl;
 
     return 0;
   }
 
-  unsigned
-  dccId(const EcalElectronicsId &_id)
-  {
-    return _id.dccId();
-  }
+  unsigned dccId(const EcalElectronicsId &_id) { return _id.dccId(); }
 
-  unsigned
-  memDCCId(unsigned _index)
-  {
-    // for DCCs with no MEM - map the index in an array of DCCs with no MEM to the DCC ID
-    if(_index >= memDCC.size()) return 0;
+  unsigned memDCCId(unsigned _index) {
+    // for DCCs with no MEM - map the index in an array of DCCs with no MEM to the
+    // DCC ID
+    if (_index >= memDCC.size())
+      return 0;
     return memDCC.at(_index) + 1;
   }
 
-  unsigned
-  memDCCIndex(unsigned _dccid)
-  {
+  unsigned memDCCIndex(unsigned _dccid) {
     std::vector<unsigned>::const_iterator itr(std::find(memDCC.begin(), memDCC.end(), _dccid - 1));
-    if(itr == memDCC.end()) return -1;
+    if (itr == memDCC.end())
+      return -1;
 
     return (itr - memDCC.begin());
   }
 
-  unsigned
-  tccId(const DetId &_id)
-  {
-    EcalElectronicsMapping const* map(getElectronicsMap());
+  unsigned tccId(const DetId &_id) {
+    EcalElectronicsMapping const *map(getElectronicsMap());
 
     unsigned subdet(_id.subdetId());
 
-    if(subdet == EcalBarrel) return map->TCCid(EBDetId(_id));
-    else if(subdet == EcalTriggerTower) return map->TCCid(EcalTrigTowerDetId(_id));
-    else if(subdet == EcalEndcap){
-      if(isEcalScDetId(_id)) return 0; // incompatible
-      else return map->getTriggerElectronicsId(EEDetId(_id)).tccId();
+    if (subdet == EcalBarrel)
+      return map->TCCid(EBDetId(_id));
+    else if (subdet == EcalTriggerTower)
+      return map->TCCid(EcalTrigTowerDetId(_id));
+    else if (subdet == EcalEndcap) {
+      if (isEcalScDetId(_id))
+        return 0;  // incompatible
+      else
+        return map->getTriggerElectronicsId(EEDetId(_id)).tccId();
     }
 
     throw cms::Exception("InvalidDetId") << "EcalDQMCommonUtils::tccId(" << uint32_t(_id) << ")" << std::endl;
@@ -78,127 +74,111 @@ namespace ecaldqm
     return 0;
   }
 
-  unsigned
-  tccId(const EcalElectronicsId &_id)
-  {
-    return getElectronicsMap()->getTriggerElectronicsId(_id).tccId();
-  }
-
+  unsigned tccId(const EcalElectronicsId &_id) { return getElectronicsMap()->getTriggerElectronicsId(_id).tccId(); }
 
-  unsigned
-  towerId(const DetId &_id)
-  {
+  unsigned towerId(const DetId &_id) {
     unsigned subdet(_id.subdetId());
 
-    if(subdet == EcalBarrel) return EBDetId(_id).tower().iTT();
-    else if(subdet == EcalTriggerTower) return EcalTrigTowerDetId(_id).iTT();
-    else if(subdet == EcalEndcap){
-      if(isEcalScDetId(_id)) return getElectronicsMap()->getDCCandSC(EcalScDetId(_id)).second;
-      else return getElectronicsMap()->getElectronicsId(EEDetId(_id)).towerId();
+    if (subdet == EcalBarrel)
+      return EBDetId(_id).tower().iTT();
+    else if (subdet == EcalTriggerTower)
+      return EcalTrigTowerDetId(_id).iTT();
+    else if (subdet == EcalEndcap) {
+      if (isEcalScDetId(_id))
+        return getElectronicsMap()->getDCCandSC(EcalScDetId(_id)).second;
+      else
+        return getElectronicsMap()->getElectronicsId(EEDetId(_id)).towerId();
     }
 
-    throw cms::Exception("InvalidDetId") << "EcalDQMCommonUtils::towerId(" << std::hex << uint32_t(_id) << ")" << std::endl;
+    throw cms::Exception("InvalidDetId") << "EcalDQMCommonUtils::towerId(" << std::hex << uint32_t(_id) << ")"
+                                         << std::endl;
 
     return 0;
   }
 
-  unsigned
-  towerId(const EcalElectronicsId &_id)
-  {
-    return _id.towerId();
-  }
+  unsigned towerId(const EcalElectronicsId &_id) { return _id.towerId(); }
 
-  unsigned
-  ttId(const DetId& _id)
-  {
+  unsigned ttId(const DetId &_id) {
     unsigned subdet(_id.subdetId());
 
-    if(subdet == EcalBarrel)
+    if (subdet == EcalBarrel)
       return EBDetId(_id).tower().iTT();
-    else if(subdet == EcalTriggerTower)
+    else if (subdet == EcalTriggerTower)
       return getElectronicsMap()->iTT(EcalTrigTowerDetId(_id));
-    else if(subdet == EcalEndcap && !isEcalScDetId(_id))
+    else if (subdet == EcalEndcap && !isEcalScDetId(_id))
       return getElectronicsMap()->getTriggerElectronicsId(_id).ttId();
 
-    throw cms::Exception("InvalidDetId") << "EcalDQMCommonUtils::ttId(" << std::hex << uint32_t(_id) << ")" << std::endl;
+    throw cms::Exception("InvalidDetId") << "EcalDQMCommonUtils::ttId(" << std::hex << uint32_t(_id) << ")"
+                                         << std::endl;
 
     return 0;
   }
 
-  unsigned
-  ttId(const EcalElectronicsId &_id)
-  {
-    return getElectronicsMap()->getTriggerElectronicsId(_id).ttId();
-  }
+  unsigned ttId(const EcalElectronicsId &_id) { return getElectronicsMap()->getTriggerElectronicsId(_id).ttId(); }
 
-  unsigned
-  rtHalf(DetId const& _id)
-  {
-    if(_id.subdetId() == EcalBarrel){
+  unsigned rtHalf(DetId const &_id) {
+    if (_id.subdetId() == EcalBarrel) {
       int ic(EBDetId(_id).ic());
-      if((ic - 1) / 20 > 4 && (ic - 1) % 20 < 10) return 1;
-    }
-    else{
+      if ((ic - 1) / 20 > 4 && (ic - 1) % 20 < 10)
+        return 1;
+    } else {
       unsigned iDCC(dccId(_id) - 1);
-      if((iDCC == kEEm05 || iDCC == kEEp05) && EEDetId(_id).ix() > 50) return 1;
+      if ((iDCC == kEEm05 || iDCC == kEEp05) && EEDetId(_id).ix() > 50)
+        return 1;
     }
 
     return 0;
   }
 
-  std::pair<unsigned, unsigned>
-  innerTCCs(unsigned _dccId)
-  {
+  std::pair<unsigned, unsigned> innerTCCs(unsigned _dccId) {
     int iDCC(_dccId - 1);
     std::pair<unsigned, unsigned> res;
-    if(iDCC <= kEEmHigh){
+    if (iDCC <= kEEmHigh) {
       res.first = (iDCC - kEEmLow) * 2;
-      if(res.first == 0) res.first = 18;
+      if (res.first == 0)
+        res.first = 18;
       res.second = (iDCC - kEEmLow) * 2 + 1;
-    }
-    else if(iDCC <- kEBpHigh)
+    } else if (iDCC < -kEBpHigh)
       res.first = res.second = _dccId + 27;
-    else{
+    else {
       res.first = (iDCC - kEEpLow) * 2 + 90;
-      if(res.first == 90) res.first = 108;
+      if (res.first == 90)
+        res.first = 108;
       res.second = (iDCC - kEEpLow) * 2 + 91;
     }
 
     return res;
   }
 
-  std::pair<unsigned, unsigned>
-  outerTCCs(unsigned _dccId)
-  {
+  std::pair<unsigned, unsigned> outerTCCs(unsigned _dccId) {
     int iDCC(_dccId - 1);
     std::pair<unsigned, unsigned> res;
-    if(iDCC <= kEEmHigh){
+    if (iDCC <= kEEmHigh) {
       res.first = (iDCC - kEEmLow) * 2 + 18;
-      if(res.first == 18) res.first = 36;
+      if (res.first == 18)
+        res.first = 36;
       res.second = (iDCC - kEEmLow) * 2 + 19;
-    }
-    else if(iDCC <= kEBpHigh)
+    } else if (iDCC <= kEBpHigh)
       res.first = res.second = _dccId + 27;
-    else{
+    else {
       res.first = (iDCC - kEEpLow) * 2 + 72;
-      if(res.first == 72) res.first = 90;
+      if (res.first == 72)
+        res.first = 90;
       res.second = (iDCC - kEEpLow) * 2 + 73;
     }
 
     return res;
   }
 
-  std::vector<DetId>
-  scConstituents(EcalScDetId const& _scid)
-  {
+  std::vector<DetId> scConstituents(EcalScDetId const &_scid) {
     std::vector<DetId> res;
 
     int ixbase((_scid.ix() - 1) * 5);
     int iybase((_scid.iy() - 1) * 5);
 
-    for(int ix(1); ix <= 5; ++ix){
-      for(int iy(1); iy <= 5; ++iy){
-        if(EEDetId::validDetId(ixbase + ix, iybase + iy, _scid.zside()))
+    for (int ix(1); ix <= 5; ++ix) {
+      for (int iy(1); iy <= 5; ++iy) {
+        if (EEDetId::validDetId(ixbase + ix, iybase + iy, _scid.zside()))
           res.push_back(EEDetId(ixbase + ix, iybase + iy, _scid.zside()));
       }
     }
@@ -206,355 +186,323 @@ namespace ecaldqm
     return res;
   }
 
-  int
-  zside(const DetId& _id)
-  {
+  int zside(const DetId &_id) {
     uint32_t rawId(_id);
 
-    switch(_id.subdetId()){
-    case EcalBarrel:
-      return (((rawId >> 16) & 0x1) == 1 ? 1 : -1);
-    case EcalEndcap:
-      return (((rawId >> 14) & 0x1) == 1 ? 1 : -1);
-    case EcalTriggerTower:
-      return (((rawId >> 15) & 0x1) == 1 ? 1 : -1);
-    case EcalLaserPnDiode:
-      return (((rawId >> 4) & 0x7f) > kEBpLow ? 1 : -1);
-    default:
-      throw cms::Exception("InvalidDetId") << "EcalDQMCommonUtils::zside(" << std::hex << uint32_t(_id) << ")" << std::endl;
+    switch (_id.subdetId()) {
+      case EcalBarrel:
+        return (((rawId >> 16) & 0x1) == 1 ? 1 : -1);
+      case EcalEndcap:
+        return (((rawId >> 14) & 0x1) == 1 ? 1 : -1);
+      case EcalTriggerTower:
+        return (((rawId >> 15) & 0x1) == 1 ? 1 : -1);
+      case EcalLaserPnDiode:
+        return (((rawId >> 4) & 0x7f) > kEBpLow ? 1 : -1);
+      default:
+        throw cms::Exception("InvalidDetId")
+            << "EcalDQMCommonUtils::zside(" << std::hex << uint32_t(_id) << ")" << std::endl;
     }
 
     return 0;
   }
 
-  double
-  eta(const EBDetId& _ebid)
-  {
+  double eta(const EBDetId &_ebid) {
     return _ebid.approxEta() + (_ebid.zside() < 0 ? 0.5 : -0.5) * EBDetId::crystalUnitToEta;
   }
 
-  double
-  eta(const EEDetId& _id)
-  {
-    return getGeometry()->getPosition(_id).eta();
-  }
+  double eta(const EEDetId &_id) { return getGeometry()->getPosition(_id).eta(); }
 
-  double
-  phi(EBDetId const& _ebid)
-  {
+  double phi(EBDetId const &_ebid) {
     const double degToRad(0.0174533);
     return (_ebid.iphi() - 10.5) * degToRad;
   }
 
-  double
-  phi(EEDetId const& _eeid)
-  {
+  double phi(EEDetId const &_eeid) {
     const double degToRad(0.0174533);
     double p(std::atan2(_eeid.ix() - 50.5, _eeid.iy() - 50.5));
-    if(p < -10. * degToRad) p += 360. * degToRad;
+    if (p < -10. * degToRad)
+      p += 360. * degToRad;
     return p;
   }
 
-  double
-  phi(EcalTrigTowerDetId const& _ttid)
-  {
+  double phi(EcalTrigTowerDetId const &_ttid) {
     const double degToRad(0.0174533);
     double p((_ttid.iphi() - 0.5) * 5. * degToRad);
-    if(p > 350. * degToRad) p -= 360. * degToRad;
+    if (p > 350. * degToRad)
+      p -= 360. * degToRad;
     return p;
   }
 
-  double
-  phi(double _phi)
-  {
+  double phi(double _phi) {
     const double degToRad(0.0174533);
-    if(_phi < -10. * degToRad) _phi += 360. * degToRad;
+    if (_phi < -10. * degToRad)
+      _phi += 360. * degToRad;
     return _phi;
   }
 
-  bool
-  isForward(DetId const& _id)
-  {
+  bool isForward(DetId const &_id) {
     // the numbers here roughly corresponds to a cut at |eta| > 2.2
     // cf hepwww.rl.ac.uk/CMSecal/Dee-layout.html
-    if(_id.subdetId() != EcalEndcap) return false;
-    if(isEcalScDetId(_id)){
+    if (_id.subdetId() != EcalEndcap)
+      return false;
+    if (isEcalScDetId(_id)) {
       EcalScDetId scid(_id);
       return (scid.ix() - 10) * (scid.ix() - 10) + (scid.iy() - 10) * (scid.iy() - 10) < 25.;
-    }
-    else{
+    } else {
       EEDetId eeid(_id);
       return (eeid.ix() - 50) * (eeid.ix() - 50) + (eeid.iy() - 50) * (eeid.iy() - 50) < 625.;
     }
   }
 
-  bool
-  isCrystalId(const DetId& _id)
-  {
-    return (_id.det() == DetId::Ecal) && ((_id.subdetId() == EcalBarrel) || ((_id.subdetId() == EcalEndcap) && (((_id.rawId() >> 15) &  0x1) == 0)));
+  bool isCrystalId(const DetId &_id) {
+    return (_id.det() == DetId::Ecal) &&
+           ((_id.subdetId() == EcalBarrel) || ((_id.subdetId() == EcalEndcap) && (((_id.rawId() >> 15) & 0x1) == 0)));
   }
 
-  bool
-  isSingleChannelId(const DetId& _id)
-  {
+  bool isSingleChannelId(const DetId &_id) {
     return (_id.det() == DetId::Ecal) && (isCrystalId(_id) || (_id.subdetId() == EcalLaserPnDiode));
   }
 
-  bool
-  isEcalScDetId(const DetId& _id)
-  {
-    return (_id.det() == DetId::Ecal) && ((_id.subdetId() == EcalEndcap) && ((_id.rawId() >> 15) &  0x1));
+  bool isEcalScDetId(const DetId &_id) {
+    return (_id.det() == DetId::Ecal) && ((_id.subdetId() == EcalEndcap) && ((_id.rawId() >> 15) & 0x1));
   }
 
-  bool
-  isEndcapTTId(const DetId& _id)
-  {
+  bool isEndcapTTId(const DetId &_id) {
     return (_id.det() == DetId::Ecal) && ((_id.subdetId() == EcalTriggerTower) && (((_id.rawId() >> 7) & 0x7f) > 17));
   }
 
-  unsigned
-  dccId(std::string const& _smName)
-  {
+  unsigned dccId(std::string const &_smName) {
     unsigned smNumber(std::atoi(_smName.substr(3).c_str()));
 
-    if(_smName.find("EE-") == 0)
+    if (_smName.find("EE-") == 0)
       return kEEmLow + 1 + ((smNumber + 2) % 9);
-    else if(_smName.find("EB-") == 0)
+    else if (_smName.find("EB-") == 0)
       return kEBmLow + 1 + smNumber;
-    else if(_smName.find("EB+") == 0)
+    else if (_smName.find("EB+") == 0)
       return kEBpLow + 1 + smNumber;
-    else if(_smName.find("EE+") == 0)
+    else if (_smName.find("EE+") == 0)
       return kEEpLow + 1 + ((smNumber + 2) % 9);
     else
       return 0;
   }
 
-  std::string
-  smName(unsigned _dccId)
-  {
+  std::string smName(unsigned _dccId) {
     std::stringstream ss;
 
     unsigned iSM(_dccId - 1);
 
-    if(iSM <= kEEmHigh)
+    if (iSM <= kEEmHigh)
       ss << "EE-" << std::setw(2) << std::setfill('0') << (((iSM - kEEmLow + 6) % 9) + 1);
-    else if(iSM <= kEBmHigh)
+    else if (iSM <= kEBmHigh)
       ss << "EB-" << std::setw(2) << std::setfill('0') << (iSM - kEBmLow + 1);
-    else if(iSM <= kEBpHigh)
+    else if (iSM <= kEBpHigh)
       ss << "EB+" << std::setw(2) << std::setfill('0') << (iSM - kEBpLow + 1);
-    else if(iSM <= kEEpHigh)
+    else if (iSM <= kEEpHigh)
       ss << "EE+" << std::setw(2) << std::setfill('0') << (((iSM - kEEpLow + 6) % 9) + 1);
 
     return ss.str();
   }
 
   // numbers from CalibCalorimetry/EcalLaserAnalyzer/src/MEEEGeom.cc
-  unsigned
-  EEPnDCC(unsigned _dee, unsigned _ab)
-  {
-    switch(_dee){
-    case 1: // EE+F -> FEDs 649-653/0
-      if(_ab == 0) return 50;
-      else return 51;
-    case 2: // EE+N -> FEDs 646-648, 653/1, 654
-      if(_ab == 0) return 47;
-      else return 46;
-    case 3: // EE-N -> FEDs 601-603, 608/1, 609
-      if(_ab == 0) return 1;
-      else return 2;
-    case 4: // EE-F -> FEDs 604-608/0
-      if(_ab == 0) return 5;
-      else return 6;
-    default:
-      return 0;
+  unsigned EEPnDCC(unsigned _dee, unsigned _ab) {
+    switch (_dee) {
+      case 1:  // EE+F -> FEDs 649-653/0
+        if (_ab == 0)
+          return 50;
+        else
+          return 51;
+      case 2:  // EE+N -> FEDs 646-648, 653/1, 654
+        if (_ab == 0)
+          return 47;
+        else
+          return 46;
+      case 3:  // EE-N -> FEDs 601-603, 608/1, 609
+        if (_ab == 0)
+          return 1;
+        else
+          return 2;
+      case 4:  // EE-F -> FEDs 604-608/0
+        if (_ab == 0)
+          return 5;
+        else
+          return 6;
+      default:
+        return 0;
     }
   }
 
-  unsigned
-  nCrystals(unsigned _dccId)
-  {
+  unsigned nCrystals(unsigned _dccId) {
     unsigned iSM(_dccId - 1);
 
-    if(iSM >= kEBmLow && iSM <= kEBpHigh) return 1700;
-
-    switch(iSM){
-    case kEEm05:
-    case kEEp05:
-      return 810;
-    case kEEm07:
-    case kEEm03:
-    case kEEp07:
-    case kEEp03:
-      return 830;
-    case kEEm09:
-    case kEEm01:
-    case kEEp09:
-    case kEEp01:
-      return 815;
-    case kEEm08:
-    case kEEm02:
-    case kEEp08:
-    case kEEp02:
-      return 791;
-    case kEEm04:
-    case kEEm06:
-    case kEEp04:
-    case kEEp06:
-      return 821;
-    default:
-      return 0;
+    if (iSM >= kEBmLow && iSM <= kEBpHigh)
+      return 1700;
+
+    switch (iSM) {
+      case kEEm05:
+      case kEEp05:
+        return 810;
+      case kEEm07:
+      case kEEm03:
+      case kEEp07:
+      case kEEp03:
+        return 830;
+      case kEEm09:
+      case kEEm01:
+      case kEEp09:
+      case kEEp01:
+        return 815;
+      case kEEm08:
+      case kEEm02:
+      case kEEp08:
+      case kEEp02:
+        return 791;
+      case kEEm04:
+      case kEEm06:
+      case kEEp04:
+      case kEEp06:
+        return 821;
+      default:
+        return 0;
     }
   }
 
-  unsigned
-  nSuperCrystals(unsigned _dccId)
-  {
+  unsigned nSuperCrystals(unsigned _dccId) {
     unsigned iSM(_dccId - 1);
 
-    if(iSM >= kEBmLow && iSM <= kEBpHigh) return 68;
-
-    switch(iSM){
-    case kEEm05:
-    case kEEp05:
-      return 41;
-    case kEEm07:
-    case kEEm03:
-    case kEEp07:
-    case kEEp03:
-      return 34;
-    case kEEm09:
-    case kEEm01:
-    case kEEm04:
-    case kEEm06:
-    case kEEp09:
-    case kEEp01:
-    case kEEp04:
-    case kEEp06:
-      return 33;
-    case kEEm08:
-    case kEEm02:
-    case kEEp08:
-    case kEEp02:
-      return 32;
-    default:
-      return 0;
+    if (iSM >= kEBmLow && iSM <= kEBpHigh)
+      return 68;
+
+    switch (iSM) {
+      case kEEm05:
+      case kEEp05:
+        return 41;
+      case kEEm07:
+      case kEEm03:
+      case kEEp07:
+      case kEEp03:
+        return 34;
+      case kEEm09:
+      case kEEm01:
+      case kEEm04:
+      case kEEm06:
+      case kEEp09:
+      case kEEp01:
+      case kEEp04:
+      case kEEp06:
+        return 33;
+      case kEEm08:
+      case kEEm02:
+      case kEEp08:
+      case kEEp02:
+        return 32;
+      default:
+        return 0;
     }
   }
 
-  bool
-  ccuExists(unsigned _dccId, unsigned _towerId)
-  {
-    if(_towerId == 69 || _towerId == 70) return true;
-    else if((_dccId == 8 || _dccId == 53) && _towerId >= 18 && _towerId <= 24) return false;
-    else if(_dccId <= kEEmHigh + 1 || _dccId >= kEEpLow + 1) return _towerId <= nSuperCrystals(_dccId);
-    else return _towerId <= 68;
+  bool ccuExists(unsigned _dccId, unsigned _towerId) {
+    if (_towerId == 69 || _towerId == 70)
+      return true;
+    else if ((_dccId == 8 || _dccId == 53) && _towerId >= 18 && _towerId <= 24)
+      return false;
+    else if (_dccId <= kEEmHigh + 1 || _dccId >= kEEpLow + 1)
+      return _towerId <= nSuperCrystals(_dccId);
+    else
+      return _towerId <= 68;
   }
 
-
   /*
-    Note on concurrency compatibility:           
-    Call to getters bellow must always happen after
-    EcalDQMonitor::ecaldqmGetSetupObjects or equivalent.
-    As long as check-set-get are executed in this order
-    within each thread, the following functions are
-    thread-safe.
-  */
+  Note on concurrency compatibility:
+  Call to getters bellow must always happen after
+  EcalDQMonitor::ecaldqmGetSetupObjects or equivalent.
+  As long as check-set-get are executed in this order
+  within each thread, the following functions are
+  thread-safe.
+*/
 
   std::mutex mapMutex;
-  EcalElectronicsMapping const* electronicsMap(nullptr);
-  EcalTrigTowerConstituentsMap const* trigtowerMap(nullptr);
-  CaloGeometry const* geometry(nullptr);
-  CaloTopology const* topology(nullptr);
-
-  bool
-  checkElectronicsMap(bool _throw/* = true*/)
-  {
+  EcalElectronicsMapping const *electronicsMap(nullptr);
+  EcalTrigTowerConstituentsMap const *trigtowerMap(nullptr);
+  CaloGeometry const *geometry(nullptr);
+  CaloTopology const *topology(nullptr);
+
+  bool checkElectronicsMap(bool _throw /* = true*/) {
     std::lock_guard<std::mutex> lock(mapMutex);
-    if(electronicsMap) return true;
-    if(_throw) throw cms::Exception("InvalidCall") << "ElectronicsMapping not initialized";
+    if (electronicsMap)
+      return true;
+    if (_throw)
+      throw cms::Exception("InvalidCall") << "ElectronicsMapping not initialized";
     return false;
   }
 
-  EcalElectronicsMapping const*
-  getElectronicsMap()
-  {
-    if(!electronicsMap) checkElectronicsMap();
+  EcalElectronicsMapping const *getElectronicsMap() {
+    if (!electronicsMap)
+      checkElectronicsMap();
     return electronicsMap;
   }
 
-  void
-  setElectronicsMap(EcalElectronicsMapping const* _map)
-  {
+  void setElectronicsMap(EcalElectronicsMapping const *_map) {
     std::lock_guard<std::mutex> lock(mapMutex);
     electronicsMap = _map;
   }
 
-  bool
-  checkTrigTowerMap(bool _throw/* = true*/)
-  {
+  bool checkTrigTowerMap(bool _throw /* = true*/) {
     std::lock_guard<std::mutex> lock(mapMutex);
-    if(trigtowerMap) return true;
-    if(_throw) throw cms::Exception("InvalidCall") << "TrigTowerConstituentsMap not initialized";
+    if (trigtowerMap)
+      return true;
+    if (_throw)
+      throw cms::Exception("InvalidCall") << "TrigTowerConstituentsMap not initialized";
     return false;
   }
 
-  EcalTrigTowerConstituentsMap const*
-  getTrigTowerMap()
-  {
-    if(!trigtowerMap) checkTrigTowerMap();
+  EcalTrigTowerConstituentsMap const *getTrigTowerMap() {
+    if (!trigtowerMap)
+      checkTrigTowerMap();
     return trigtowerMap;
   }
 
-  void
-  setTrigTowerMap(EcalTrigTowerConstituentsMap const* _map)
-  {
+  void setTrigTowerMap(EcalTrigTowerConstituentsMap const *_map) {
     std::lock_guard<std::mutex> lock(mapMutex);
     trigtowerMap = _map;
   }
 
-  bool
-  checkGeometry(bool _throw/* = true*/)
-  {
+  bool checkGeometry(bool _throw /* = true*/) {
     std::lock_guard<std::mutex> lock(mapMutex);
-    if(geometry) return true;
-    if(_throw) throw cms::Exception("InvalidCall") << "CaloGeometry not initialized";
+    if (geometry)
+      return true;
+    if (_throw)
+      throw cms::Exception("InvalidCall") << "CaloGeometry not initialized";
     return false;
   }
 
-  CaloGeometry const*
-  getGeometry()
-  {
-    if(!geometry) checkGeometry();
+  CaloGeometry const *getGeometry() {
+    if (!geometry)
+      checkGeometry();
     return geometry;
   }
 
-  void
-  setGeometry(CaloGeometry const* _geom)
-  {
+  void setGeometry(CaloGeometry const *_geom) {
     std::lock_guard<std::mutex> lock(mapMutex);
     geometry = _geom;
   }
 
-  bool
-  checkTopology(bool _throw/* = true*/)
-  {
+  bool checkTopology(bool _throw /* = true*/) {
     std::lock_guard<std::mutex> lock(mapMutex);
-    if(topology) return true;
-    if(_throw) throw cms::Exception("InvalidCall") << "CaloTopology not initialized";
+    if (topology)
+      return true;
+    if (_throw)
+      throw cms::Exception("InvalidCall") << "CaloTopology not initialized";
     return false;
   }
 
-  CaloTopology const*
-  getTopology()
-  {
-    if(!topology) checkTopology();
+  CaloTopology const *getTopology() {
+    if (!topology)
+      checkTopology();
     return topology;
   }
 
-  void
-  setTopology(CaloTopology const* _geom)
-  {
+  void setTopology(CaloTopology const *_geom) {
     std::lock_guard<std::mutex> lock(mapMutex);
     topology = _geom;
   }
-}
+}  // namespace ecaldqm
diff --git a/DQM/EcalCommon/src/EcalDQMCommonUtils2.cc b/DQM/EcalCommon/src/EcalDQMCommonUtils2.cc
index 22d5175f69144..da44a7bfc9157 100644
--- a/DQM/EcalCommon/src/EcalDQMCommonUtils2.cc
+++ b/DQM/EcalCommon/src/EcalDQMCommonUtils2.cc
@@ -6,632 +6,1073 @@
 #include "CalibCalorimetry/EcalLaserAnalyzer/interface/MEEBGeom.h"
 #include "CalibCalorimetry/EcalLaserAnalyzer/interface/MEEEGeom.h"
 
-namespace ecaldqm
-{
-  EcalPnDiodeDetId
-  pnForCrystal(DetId const& _id, char _ab)
-  {
+namespace ecaldqm {
+  EcalPnDiodeDetId pnForCrystal(DetId const &_id, char _ab) {
     bool pnA(_ab == 'a' || _ab == 'A');
 
-    if(!isCrystalId(_id)) return EcalPnDiodeDetId(0);
+    if (!isCrystalId(_id))
+      return EcalPnDiodeDetId(0);
 
-    if(_id.subdetId() == EcalBarrel){
+    if (_id.subdetId() == EcalBarrel) {
       EBDetId ebid(_id);
       int lmmod(MEEBGeom::lmmod(ebid.ieta(), ebid.iphi()));
 
-      switch(dccId(_id)){
-      case 10:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 10, 1) : EcalPnDiodeDetId(EcalBarrel, 10, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 10, 2) : EcalPnDiodeDetId(EcalBarrel, 10, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 10, 2) : EcalPnDiodeDetId(EcalBarrel, 10, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 10, 3) : EcalPnDiodeDetId(EcalBarrel, 10, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 10, 3) : EcalPnDiodeDetId(EcalBarrel, 10, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 10, 4) : EcalPnDiodeDetId(EcalBarrel, 10, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 10, 4) : EcalPnDiodeDetId(EcalBarrel, 10, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 10, 5) : EcalPnDiodeDetId(EcalBarrel, 10, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 10, 5) : EcalPnDiodeDetId(EcalBarrel, 10, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 11:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 11, 1) : EcalPnDiodeDetId(EcalBarrel, 11, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 11, 2) : EcalPnDiodeDetId(EcalBarrel, 11, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 11, 2) : EcalPnDiodeDetId(EcalBarrel, 11, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 11, 3) : EcalPnDiodeDetId(EcalBarrel, 11, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 11, 3) : EcalPnDiodeDetId(EcalBarrel, 11, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 11, 4) : EcalPnDiodeDetId(EcalBarrel, 11, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 11, 4) : EcalPnDiodeDetId(EcalBarrel, 11, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 11, 5) : EcalPnDiodeDetId(EcalBarrel, 11, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 11, 5) : EcalPnDiodeDetId(EcalBarrel, 11, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 12:
-        switch(lmmod){
-        case 1: return /*pnA ? EcalPnDiodeDetId(EcalBarrel, 12, 1) :*/ EcalPnDiodeDetId(EcalBarrel, 12, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 12, 2) : EcalPnDiodeDetId(EcalBarrel, 12, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 12, 2) : EcalPnDiodeDetId(EcalBarrel, 12, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 12, 3) : EcalPnDiodeDetId(EcalBarrel, 12, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 12, 3) : EcalPnDiodeDetId(EcalBarrel, 12, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 12, 4) : EcalPnDiodeDetId(EcalBarrel, 12, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 12, 4) : EcalPnDiodeDetId(EcalBarrel, 12, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 12, 5) : EcalPnDiodeDetId(EcalBarrel, 12, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 12, 5) : EcalPnDiodeDetId(EcalBarrel, 12, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 13:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 13, 1) : EcalPnDiodeDetId(EcalBarrel, 13, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 13, 2) : EcalPnDiodeDetId(EcalBarrel, 13, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 13, 2) : EcalPnDiodeDetId(EcalBarrel, 13, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 13, 3) : EcalPnDiodeDetId(EcalBarrel, 13, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 13, 3) : EcalPnDiodeDetId(EcalBarrel, 13, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 13, 4) : EcalPnDiodeDetId(EcalBarrel, 13, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 13, 4) : EcalPnDiodeDetId(EcalBarrel, 13, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 13, 5) : EcalPnDiodeDetId(EcalBarrel, 13, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 13, 5) : EcalPnDiodeDetId(EcalBarrel, 13, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 14:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 14, 1) : EcalPnDiodeDetId(EcalBarrel, 14, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 14, 2) : EcalPnDiodeDetId(EcalBarrel, 14, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 14, 2) : EcalPnDiodeDetId(EcalBarrel, 14, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 14, 3) : EcalPnDiodeDetId(EcalBarrel, 14, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 14, 3) : EcalPnDiodeDetId(EcalBarrel, 14, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 14, 4) : EcalPnDiodeDetId(EcalBarrel, 14, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 14, 4) : EcalPnDiodeDetId(EcalBarrel, 14, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 14, 5) : EcalPnDiodeDetId(EcalBarrel, 14, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 14, 5) : EcalPnDiodeDetId(EcalBarrel, 14, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 15:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 15, 1) : EcalPnDiodeDetId(EcalBarrel, 15, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 15, 2) : EcalPnDiodeDetId(EcalBarrel, 15, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 15, 2) : EcalPnDiodeDetId(EcalBarrel, 15, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 15, 3) : EcalPnDiodeDetId(EcalBarrel, 15, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 15, 3) : EcalPnDiodeDetId(EcalBarrel, 15, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 15, 4) : EcalPnDiodeDetId(EcalBarrel, 15, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 15, 4) : EcalPnDiodeDetId(EcalBarrel, 15, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 15, 5) : EcalPnDiodeDetId(EcalBarrel, 15, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 15, 5) : EcalPnDiodeDetId(EcalBarrel, 15, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 16:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 16, 1) : EcalPnDiodeDetId(EcalBarrel, 16, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 16, 2) : EcalPnDiodeDetId(EcalBarrel, 16, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 16, 2) : EcalPnDiodeDetId(EcalBarrel, 16, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 16, 3) : EcalPnDiodeDetId(EcalBarrel, 16, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 16, 3) : EcalPnDiodeDetId(EcalBarrel, 16, 8);
-        case 6: return pnA ? /*EcalPnDiodeDetId(EcalBarrel, 16, 4)*/ EcalPnDiodeDetId(EcalBarrel, 16, 1) : EcalPnDiodeDetId(EcalBarrel, 16, 9);
-        case 7: return /*pnA ? EcalPnDiodeDetId(EcalBarrel, 16, 4) :*/ EcalPnDiodeDetId(EcalBarrel, 16, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 16, 5) : EcalPnDiodeDetId(EcalBarrel, 16, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 16, 5) : EcalPnDiodeDetId(EcalBarrel, 16, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 17:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 17, 1) : EcalPnDiodeDetId(EcalBarrel, 17, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 17, 2) : EcalPnDiodeDetId(EcalBarrel, 17, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 17, 2) : EcalPnDiodeDetId(EcalBarrel, 17, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 17, 3) : EcalPnDiodeDetId(EcalBarrel, 17, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 17, 3) : EcalPnDiodeDetId(EcalBarrel, 17, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 17, 4) : EcalPnDiodeDetId(EcalBarrel, 17, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 17, 4) : EcalPnDiodeDetId(EcalBarrel, 17, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 17, 5) : EcalPnDiodeDetId(EcalBarrel, 17, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 17, 5) : EcalPnDiodeDetId(EcalBarrel, 17, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 18:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 18, 1) : EcalPnDiodeDetId(EcalBarrel, 18, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 18, 2) : EcalPnDiodeDetId(EcalBarrel, 18, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 18, 2) : EcalPnDiodeDetId(EcalBarrel, 18, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 18, 3) : EcalPnDiodeDetId(EcalBarrel, 18, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 18, 3) : EcalPnDiodeDetId(EcalBarrel, 18, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 18, 4) : EcalPnDiodeDetId(EcalBarrel, 18, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 18, 4) : EcalPnDiodeDetId(EcalBarrel, 18, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 18, 5) : EcalPnDiodeDetId(EcalBarrel, 18, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 18, 5) : EcalPnDiodeDetId(EcalBarrel, 18, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 19:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 19, 1) : EcalPnDiodeDetId(EcalBarrel, 19, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 19, 2) : EcalPnDiodeDetId(EcalBarrel, 19, 8);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 19, 2) : EcalPnDiodeDetId(EcalBarrel, 19, 8);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 19, 3) : EcalPnDiodeDetId(EcalBarrel, 19, 7);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 19, 3) : EcalPnDiodeDetId(EcalBarrel, 19, 7);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 19, 4) : EcalPnDiodeDetId(EcalBarrel, 19, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 19, 4) : EcalPnDiodeDetId(EcalBarrel, 19, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 19, 5) : EcalPnDiodeDetId(EcalBarrel, 19, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 19, 5) : EcalPnDiodeDetId(EcalBarrel, 19, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 20:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 20, 1) : EcalPnDiodeDetId(EcalBarrel, 20, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 20, 2) : EcalPnDiodeDetId(EcalBarrel, 20, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 20, 2) : EcalPnDiodeDetId(EcalBarrel, 20, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 20, 3) : EcalPnDiodeDetId(EcalBarrel, 20, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 20, 3) : EcalPnDiodeDetId(EcalBarrel, 20, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 20, 4) : EcalPnDiodeDetId(EcalBarrel, 20, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 20, 4) : EcalPnDiodeDetId(EcalBarrel, 20, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 20, 5) : EcalPnDiodeDetId(EcalBarrel, 20, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 20, 5) : EcalPnDiodeDetId(EcalBarrel, 20, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 21:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 21, 1) : EcalPnDiodeDetId(EcalBarrel, 21, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 21, 2) : EcalPnDiodeDetId(EcalBarrel, 21, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 21, 2) : EcalPnDiodeDetId(EcalBarrel, 21, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 21, 3) : EcalPnDiodeDetId(EcalBarrel, 21, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 21, 3) : EcalPnDiodeDetId(EcalBarrel, 21, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 21, 4) : EcalPnDiodeDetId(EcalBarrel, 21, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 21, 4) : EcalPnDiodeDetId(EcalBarrel, 21, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 21, 5) : EcalPnDiodeDetId(EcalBarrel, 21, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 21, 5) : EcalPnDiodeDetId(EcalBarrel, 21, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 22:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 22, 1) : EcalPnDiodeDetId(EcalBarrel, 22, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 22, 2) : EcalPnDiodeDetId(EcalBarrel, 22, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 22, 2) : EcalPnDiodeDetId(EcalBarrel, 22, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 22, 3) : EcalPnDiodeDetId(EcalBarrel, 22, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 22, 3) : EcalPnDiodeDetId(EcalBarrel, 22, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 22, 4) : EcalPnDiodeDetId(EcalBarrel, 22, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 22, 4) : EcalPnDiodeDetId(EcalBarrel, 22, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 22, 5) : EcalPnDiodeDetId(EcalBarrel, 22, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 22, 5) : EcalPnDiodeDetId(EcalBarrel, 22, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 23:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 23, 1) : EcalPnDiodeDetId(EcalBarrel, 23, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 23, 2) : EcalPnDiodeDetId(EcalBarrel, 23, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 23, 2) : EcalPnDiodeDetId(EcalBarrel, 23, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 23, 3) : EcalPnDiodeDetId(EcalBarrel, 23, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 23, 3) : EcalPnDiodeDetId(EcalBarrel, 23, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 23, 4) : EcalPnDiodeDetId(EcalBarrel, 23, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 23, 4) : EcalPnDiodeDetId(EcalBarrel, 23, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 23, 5) : EcalPnDiodeDetId(EcalBarrel, 23, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 23, 5) : EcalPnDiodeDetId(EcalBarrel, 23, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 24:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 24, 1) : EcalPnDiodeDetId(EcalBarrel, 24, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 24, 2) : EcalPnDiodeDetId(EcalBarrel, 24, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 24, 2) : EcalPnDiodeDetId(EcalBarrel, 24, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 24, 3) : EcalPnDiodeDetId(EcalBarrel, 24, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 24, 3) : EcalPnDiodeDetId(EcalBarrel, 24, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 24, 4) : EcalPnDiodeDetId(EcalBarrel, 24, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 24, 4) : EcalPnDiodeDetId(EcalBarrel, 24, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 24, 5) : EcalPnDiodeDetId(EcalBarrel, 24, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 24, 5) : EcalPnDiodeDetId(EcalBarrel, 24, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 25:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 25, 2) : EcalPnDiodeDetId(EcalBarrel, 25, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 25, 1) : EcalPnDiodeDetId(EcalBarrel, 25, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 25, 1) : EcalPnDiodeDetId(EcalBarrel, 25, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 25, 3) : EcalPnDiodeDetId(EcalBarrel, 25, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 25, 3) : EcalPnDiodeDetId(EcalBarrel, 25, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 25, 4) : EcalPnDiodeDetId(EcalBarrel, 25, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 25, 4) : EcalPnDiodeDetId(EcalBarrel, 25, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 25, 5) : EcalPnDiodeDetId(EcalBarrel, 25, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 25, 5) : EcalPnDiodeDetId(EcalBarrel, 25, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 26:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 26, 1) : EcalPnDiodeDetId(EcalBarrel, 26, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 26, 2) : EcalPnDiodeDetId(EcalBarrel, 26, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 26, 2) : EcalPnDiodeDetId(EcalBarrel, 26, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 26, 3) : EcalPnDiodeDetId(EcalBarrel, 26, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 26, 3) : EcalPnDiodeDetId(EcalBarrel, 26, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 26, 4) : EcalPnDiodeDetId(EcalBarrel, 26, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 26, 4) : EcalPnDiodeDetId(EcalBarrel, 26, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 26, 5) : EcalPnDiodeDetId(EcalBarrel, 26, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 26, 5) : EcalPnDiodeDetId(EcalBarrel, 26, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 27:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 27, 1) : EcalPnDiodeDetId(EcalBarrel, 27, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 27, 2) : EcalPnDiodeDetId(EcalBarrel, 27, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 27, 2) : EcalPnDiodeDetId(EcalBarrel, 27, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 27, 3) : EcalPnDiodeDetId(EcalBarrel, 27, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 27, 3) : EcalPnDiodeDetId(EcalBarrel, 27, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 27, 4) : EcalPnDiodeDetId(EcalBarrel, 27, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 27, 4) : EcalPnDiodeDetId(EcalBarrel, 27, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 27, 5) : EcalPnDiodeDetId(EcalBarrel, 27, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 27, 5) : EcalPnDiodeDetId(EcalBarrel, 27, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 28:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 28, 1) : EcalPnDiodeDetId(EcalBarrel, 28, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 28, 2) : EcalPnDiodeDetId(EcalBarrel, 28, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 28, 2) : EcalPnDiodeDetId(EcalBarrel, 28, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 28, 3) : EcalPnDiodeDetId(EcalBarrel, 28, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 28, 3) : EcalPnDiodeDetId(EcalBarrel, 28, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 28, 4) : EcalPnDiodeDetId(EcalBarrel, 28, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 28, 4) : EcalPnDiodeDetId(EcalBarrel, 28, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 28, 5) : EcalPnDiodeDetId(EcalBarrel, 28, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 28, 5) : EcalPnDiodeDetId(EcalBarrel, 28, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 29:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 29, 1) : EcalPnDiodeDetId(EcalBarrel, 29, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 29, 2) : EcalPnDiodeDetId(EcalBarrel, 29, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 29, 2) : EcalPnDiodeDetId(EcalBarrel, 29, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 29, 3) : EcalPnDiodeDetId(EcalBarrel, 29, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 29, 3) : EcalPnDiodeDetId(EcalBarrel, 29, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 29, 4) : EcalPnDiodeDetId(EcalBarrel, 29, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 29, 4) : EcalPnDiodeDetId(EcalBarrel, 29, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 29, 5) : EcalPnDiodeDetId(EcalBarrel, 29, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 29, 5) : EcalPnDiodeDetId(EcalBarrel, 29, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 30:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 30, 1) : EcalPnDiodeDetId(EcalBarrel, 30, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 30, 2) : EcalPnDiodeDetId(EcalBarrel, 30, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 30, 2) : EcalPnDiodeDetId(EcalBarrel, 30, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 30, 3) : EcalPnDiodeDetId(EcalBarrel, 30, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 30, 3) : EcalPnDiodeDetId(EcalBarrel, 30, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 30, 4) : EcalPnDiodeDetId(EcalBarrel, 30, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 30, 4) : EcalPnDiodeDetId(EcalBarrel, 30, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 30, 5) : EcalPnDiodeDetId(EcalBarrel, 30, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 30, 5) : EcalPnDiodeDetId(EcalBarrel, 30, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 31:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 31, 1) : EcalPnDiodeDetId(EcalBarrel, 31, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 31, 2) : EcalPnDiodeDetId(EcalBarrel, 31, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 31, 2) : EcalPnDiodeDetId(EcalBarrel, 31, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 31, 3) : EcalPnDiodeDetId(EcalBarrel, 31, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 31, 3) : EcalPnDiodeDetId(EcalBarrel, 31, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 31, 4) : EcalPnDiodeDetId(EcalBarrel, 31, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 31, 4) : EcalPnDiodeDetId(EcalBarrel, 31, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 31, 5) : EcalPnDiodeDetId(EcalBarrel, 31, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 31, 5) : EcalPnDiodeDetId(EcalBarrel, 31, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 32:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 32, 1) : EcalPnDiodeDetId(EcalBarrel, 32, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 32, 2) : EcalPnDiodeDetId(EcalBarrel, 32, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 32, 2) : EcalPnDiodeDetId(EcalBarrel, 32, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 32, 3) : EcalPnDiodeDetId(EcalBarrel, 32, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 32, 3) : EcalPnDiodeDetId(EcalBarrel, 32, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 32, 5) : EcalPnDiodeDetId(EcalBarrel, 32, 10);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 32, 5) : EcalPnDiodeDetId(EcalBarrel, 32, 10);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 32, 4) : EcalPnDiodeDetId(EcalBarrel, 32, 9);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 32, 4) : EcalPnDiodeDetId(EcalBarrel, 32, 9);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 33:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 33, 1) : EcalPnDiodeDetId(EcalBarrel, 33, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 33, 2) : EcalPnDiodeDetId(EcalBarrel, 33, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 33, 2) : EcalPnDiodeDetId(EcalBarrel, 33, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 33, 3) : EcalPnDiodeDetId(EcalBarrel, 33, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 33, 3) : EcalPnDiodeDetId(EcalBarrel, 33, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 33, 4) : EcalPnDiodeDetId(EcalBarrel, 33, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 33, 4) : EcalPnDiodeDetId(EcalBarrel, 33, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 33, 5) : EcalPnDiodeDetId(EcalBarrel, 33, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 33, 5) : EcalPnDiodeDetId(EcalBarrel, 33, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 34:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 34, 1) : EcalPnDiodeDetId(EcalBarrel, 34, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 34, 2) : EcalPnDiodeDetId(EcalBarrel, 34, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 34, 2) : EcalPnDiodeDetId(EcalBarrel, 34, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 34, 3) : EcalPnDiodeDetId(EcalBarrel, 34, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 34, 3) : EcalPnDiodeDetId(EcalBarrel, 34, 8);
-        case 6: return pnA ? /*EcalPnDiodeDetId(EcalBarrel, 34, 4)*/ EcalPnDiodeDetId(EcalBarrel, 34, 1) : EcalPnDiodeDetId(EcalBarrel, 34, 9);
-        case 7: return /*pnA ? EcalPnDiodeDetId(EcalBarrel, 34, 4) :*/ EcalPnDiodeDetId(EcalBarrel, 34, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 34, 5) : EcalPnDiodeDetId(EcalBarrel, 34, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 34, 5) : EcalPnDiodeDetId(EcalBarrel, 34, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 35:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 35, 1) : EcalPnDiodeDetId(EcalBarrel, 35, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 35, 2) : EcalPnDiodeDetId(EcalBarrel, 35, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 35, 2) : EcalPnDiodeDetId(EcalBarrel, 35, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 35, 3) : EcalPnDiodeDetId(EcalBarrel, 35, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 35, 3) : EcalPnDiodeDetId(EcalBarrel, 35, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 35, 4) : EcalPnDiodeDetId(EcalBarrel, 35, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 35, 4) : EcalPnDiodeDetId(EcalBarrel, 35, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 35, 5) : EcalPnDiodeDetId(EcalBarrel, 35, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 35, 5) : EcalPnDiodeDetId(EcalBarrel, 35, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 36:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 36, 1) : EcalPnDiodeDetId(EcalBarrel, 36, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 36, 2) : EcalPnDiodeDetId(EcalBarrel, 36, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 36, 2) : EcalPnDiodeDetId(EcalBarrel, 36, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 36, 3) : EcalPnDiodeDetId(EcalBarrel, 36, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 36, 3) : EcalPnDiodeDetId(EcalBarrel, 36, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 36, 4) : EcalPnDiodeDetId(EcalBarrel, 36, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 36, 4) : EcalPnDiodeDetId(EcalBarrel, 36, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 36, 5) : EcalPnDiodeDetId(EcalBarrel, 36, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 36, 5) : EcalPnDiodeDetId(EcalBarrel, 36, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 37:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 37, 1) : EcalPnDiodeDetId(EcalBarrel, 37, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 37, 2) : EcalPnDiodeDetId(EcalBarrel, 37, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 37, 2) : EcalPnDiodeDetId(EcalBarrel, 37, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 37, 3) : EcalPnDiodeDetId(EcalBarrel, 37, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 37, 3) : EcalPnDiodeDetId(EcalBarrel, 37, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 37, 4) : EcalPnDiodeDetId(EcalBarrel, 37, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 37, 4) : EcalPnDiodeDetId(EcalBarrel, 37, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 37, 5) : EcalPnDiodeDetId(EcalBarrel, 37, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 37, 5) : EcalPnDiodeDetId(EcalBarrel, 37, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 38:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 38, 1) : EcalPnDiodeDetId(EcalBarrel, 38, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 38, 2) : EcalPnDiodeDetId(EcalBarrel, 38, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 38, 2) : EcalPnDiodeDetId(EcalBarrel, 38, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 38, 3) : EcalPnDiodeDetId(EcalBarrel, 38, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 38, 3) : EcalPnDiodeDetId(EcalBarrel, 38, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 38, 4) : EcalPnDiodeDetId(EcalBarrel, 38, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 38, 4) : EcalPnDiodeDetId(EcalBarrel, 38, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 38, 5) : EcalPnDiodeDetId(EcalBarrel, 38, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 38, 5) : EcalPnDiodeDetId(EcalBarrel, 38, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 39:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 39, 1) : EcalPnDiodeDetId(EcalBarrel, 39, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 39, 2) : EcalPnDiodeDetId(EcalBarrel, 39, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 39, 2) : EcalPnDiodeDetId(EcalBarrel, 39, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 39, 3) : EcalPnDiodeDetId(EcalBarrel, 39, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 39, 3) : EcalPnDiodeDetId(EcalBarrel, 39, 8);
-        case 6: return pnA ? /*EcalPnDiodeDetId(EcalBarrel, 39, 4)*/ EcalPnDiodeDetId(EcalBarrel, 39, 1) : EcalPnDiodeDetId(EcalBarrel, 39, 9);
-        case 7: return /*pnA ? EcalPnDiodeDetId(EcalBarrel, 39, 4) :*/ EcalPnDiodeDetId(EcalBarrel, 39, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 39, 5) : EcalPnDiodeDetId(EcalBarrel, 39, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 39, 5) : EcalPnDiodeDetId(EcalBarrel, 39, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 40:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 40, 1) : EcalPnDiodeDetId(EcalBarrel, 40, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 40, 2) : EcalPnDiodeDetId(EcalBarrel, 40, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 40, 2) : EcalPnDiodeDetId(EcalBarrel, 40, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 40, 3) : EcalPnDiodeDetId(EcalBarrel, 40, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 40, 3) : EcalPnDiodeDetId(EcalBarrel, 40, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 40, 4) : EcalPnDiodeDetId(EcalBarrel, 40, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 40, 4) : EcalPnDiodeDetId(EcalBarrel, 40, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 40, 5) : EcalPnDiodeDetId(EcalBarrel, 40, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 40, 5) : EcalPnDiodeDetId(EcalBarrel, 40, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 41:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 41, 1) : EcalPnDiodeDetId(EcalBarrel, 41, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 41, 2) : EcalPnDiodeDetId(EcalBarrel, 41, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 41, 2) : EcalPnDiodeDetId(EcalBarrel, 41, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 41, 3) : EcalPnDiodeDetId(EcalBarrel, 41, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 41, 3) : EcalPnDiodeDetId(EcalBarrel, 41, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 41, 4) : EcalPnDiodeDetId(EcalBarrel, 41, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 41, 4) : EcalPnDiodeDetId(EcalBarrel, 41, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 41, 5) : EcalPnDiodeDetId(EcalBarrel, 41, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 41, 5) : EcalPnDiodeDetId(EcalBarrel, 41, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 42:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 42, 1) : EcalPnDiodeDetId(EcalBarrel, 42, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 42, 2) : EcalPnDiodeDetId(EcalBarrel, 42, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 42, 2) : EcalPnDiodeDetId(EcalBarrel, 42, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 42, 3) : EcalPnDiodeDetId(EcalBarrel, 42, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 42, 3) : EcalPnDiodeDetId(EcalBarrel, 42, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 42, 4) : EcalPnDiodeDetId(EcalBarrel, 42, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 42, 4) : EcalPnDiodeDetId(EcalBarrel, 42, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 42, 5) : EcalPnDiodeDetId(EcalBarrel, 42, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 42, 5) : EcalPnDiodeDetId(EcalBarrel, 42, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 43:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 43, 1) : EcalPnDiodeDetId(EcalBarrel, 43, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 43, 2) : EcalPnDiodeDetId(EcalBarrel, 43, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 43, 2) : EcalPnDiodeDetId(EcalBarrel, 43, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 43, 3) : EcalPnDiodeDetId(EcalBarrel, 43, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 43, 3) : EcalPnDiodeDetId(EcalBarrel, 43, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 43, 4) : EcalPnDiodeDetId(EcalBarrel, 43, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 43, 4) : EcalPnDiodeDetId(EcalBarrel, 43, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 43, 5) : EcalPnDiodeDetId(EcalBarrel, 43, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 43, 5) : EcalPnDiodeDetId(EcalBarrel, 43, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 44:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 44, 1) : EcalPnDiodeDetId(EcalBarrel, 44, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 44, 2) : EcalPnDiodeDetId(EcalBarrel, 44, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 44, 2) : EcalPnDiodeDetId(EcalBarrel, 44, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 44, 3) : EcalPnDiodeDetId(EcalBarrel, 44, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 44, 3) : EcalPnDiodeDetId(EcalBarrel, 44, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 44, 4) : EcalPnDiodeDetId(EcalBarrel, 44, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 44, 4) : EcalPnDiodeDetId(EcalBarrel, 44, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 44, 5) : EcalPnDiodeDetId(EcalBarrel, 44, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 44, 5) : EcalPnDiodeDetId(EcalBarrel, 44, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      case 45:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalBarrel, 45, 1) : EcalPnDiodeDetId(EcalBarrel, 45, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalBarrel, 45, 2) : EcalPnDiodeDetId(EcalBarrel, 45, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalBarrel, 45, 2) : EcalPnDiodeDetId(EcalBarrel, 45, 7);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalBarrel, 45, 3) : EcalPnDiodeDetId(EcalBarrel, 45, 8);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalBarrel, 45, 3) : EcalPnDiodeDetId(EcalBarrel, 45, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalBarrel, 45, 4) : EcalPnDiodeDetId(EcalBarrel, 45, 9);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalBarrel, 45, 4) : EcalPnDiodeDetId(EcalBarrel, 45, 9);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalBarrel, 45, 5) : EcalPnDiodeDetId(EcalBarrel, 45, 10);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalBarrel, 45, 5) : EcalPnDiodeDetId(EcalBarrel, 45, 10);
-        default: return EcalPnDiodeDetId(0);
-        }
-        break;
-      default: return EcalPnDiodeDetId(0);
+      switch (dccId(_id)) {
+        case 10:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 10, 1) : EcalPnDiodeDetId(EcalBarrel, 10, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 10, 2) : EcalPnDiodeDetId(EcalBarrel, 10, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 10, 2) : EcalPnDiodeDetId(EcalBarrel, 10, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 10, 3) : EcalPnDiodeDetId(EcalBarrel, 10, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 10, 3) : EcalPnDiodeDetId(EcalBarrel, 10, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 10, 4) : EcalPnDiodeDetId(EcalBarrel, 10, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 10, 4) : EcalPnDiodeDetId(EcalBarrel, 10, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 10, 5) : EcalPnDiodeDetId(EcalBarrel, 10, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 10, 5) : EcalPnDiodeDetId(EcalBarrel, 10, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 11:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 11, 1) : EcalPnDiodeDetId(EcalBarrel, 11, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 11, 2) : EcalPnDiodeDetId(EcalBarrel, 11, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 11, 2) : EcalPnDiodeDetId(EcalBarrel, 11, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 11, 3) : EcalPnDiodeDetId(EcalBarrel, 11, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 11, 3) : EcalPnDiodeDetId(EcalBarrel, 11, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 11, 4) : EcalPnDiodeDetId(EcalBarrel, 11, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 11, 4) : EcalPnDiodeDetId(EcalBarrel, 11, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 11, 5) : EcalPnDiodeDetId(EcalBarrel, 11, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 11, 5) : EcalPnDiodeDetId(EcalBarrel, 11, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 12:
+          switch (lmmod) {
+            case 1:
+              return /*pnA ? EcalPnDiodeDetId(EcalBarrel, 12, 1) :*/ EcalPnDiodeDetId(EcalBarrel, 12, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 12, 2) : EcalPnDiodeDetId(EcalBarrel, 12, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 12, 2) : EcalPnDiodeDetId(EcalBarrel, 12, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 12, 3) : EcalPnDiodeDetId(EcalBarrel, 12, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 12, 3) : EcalPnDiodeDetId(EcalBarrel, 12, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 12, 4) : EcalPnDiodeDetId(EcalBarrel, 12, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 12, 4) : EcalPnDiodeDetId(EcalBarrel, 12, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 12, 5) : EcalPnDiodeDetId(EcalBarrel, 12, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 12, 5) : EcalPnDiodeDetId(EcalBarrel, 12, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 13:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 13, 1) : EcalPnDiodeDetId(EcalBarrel, 13, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 13, 2) : EcalPnDiodeDetId(EcalBarrel, 13, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 13, 2) : EcalPnDiodeDetId(EcalBarrel, 13, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 13, 3) : EcalPnDiodeDetId(EcalBarrel, 13, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 13, 3) : EcalPnDiodeDetId(EcalBarrel, 13, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 13, 4) : EcalPnDiodeDetId(EcalBarrel, 13, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 13, 4) : EcalPnDiodeDetId(EcalBarrel, 13, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 13, 5) : EcalPnDiodeDetId(EcalBarrel, 13, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 13, 5) : EcalPnDiodeDetId(EcalBarrel, 13, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 14:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 14, 1) : EcalPnDiodeDetId(EcalBarrel, 14, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 14, 2) : EcalPnDiodeDetId(EcalBarrel, 14, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 14, 2) : EcalPnDiodeDetId(EcalBarrel, 14, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 14, 3) : EcalPnDiodeDetId(EcalBarrel, 14, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 14, 3) : EcalPnDiodeDetId(EcalBarrel, 14, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 14, 4) : EcalPnDiodeDetId(EcalBarrel, 14, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 14, 4) : EcalPnDiodeDetId(EcalBarrel, 14, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 14, 5) : EcalPnDiodeDetId(EcalBarrel, 14, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 14, 5) : EcalPnDiodeDetId(EcalBarrel, 14, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 15:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 15, 1) : EcalPnDiodeDetId(EcalBarrel, 15, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 15, 2) : EcalPnDiodeDetId(EcalBarrel, 15, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 15, 2) : EcalPnDiodeDetId(EcalBarrel, 15, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 15, 3) : EcalPnDiodeDetId(EcalBarrel, 15, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 15, 3) : EcalPnDiodeDetId(EcalBarrel, 15, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 15, 4) : EcalPnDiodeDetId(EcalBarrel, 15, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 15, 4) : EcalPnDiodeDetId(EcalBarrel, 15, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 15, 5) : EcalPnDiodeDetId(EcalBarrel, 15, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 15, 5) : EcalPnDiodeDetId(EcalBarrel, 15, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 16:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 16, 1) : EcalPnDiodeDetId(EcalBarrel, 16, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 16, 2) : EcalPnDiodeDetId(EcalBarrel, 16, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 16, 2) : EcalPnDiodeDetId(EcalBarrel, 16, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 16, 3) : EcalPnDiodeDetId(EcalBarrel, 16, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 16, 3) : EcalPnDiodeDetId(EcalBarrel, 16, 8);
+            case 6:
+              return pnA ? /*EcalPnDiodeDetId(EcalBarrel, 16, 4)*/ EcalPnDiodeDetId(EcalBarrel, 16, 1)
+                         : EcalPnDiodeDetId(EcalBarrel, 16, 9);
+            case 7:
+              return /*pnA ? EcalPnDiodeDetId(EcalBarrel, 16, 4) :*/ EcalPnDiodeDetId(EcalBarrel, 16, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 16, 5) : EcalPnDiodeDetId(EcalBarrel, 16, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 16, 5) : EcalPnDiodeDetId(EcalBarrel, 16, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 17:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 17, 1) : EcalPnDiodeDetId(EcalBarrel, 17, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 17, 2) : EcalPnDiodeDetId(EcalBarrel, 17, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 17, 2) : EcalPnDiodeDetId(EcalBarrel, 17, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 17, 3) : EcalPnDiodeDetId(EcalBarrel, 17, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 17, 3) : EcalPnDiodeDetId(EcalBarrel, 17, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 17, 4) : EcalPnDiodeDetId(EcalBarrel, 17, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 17, 4) : EcalPnDiodeDetId(EcalBarrel, 17, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 17, 5) : EcalPnDiodeDetId(EcalBarrel, 17, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 17, 5) : EcalPnDiodeDetId(EcalBarrel, 17, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 18:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 18, 1) : EcalPnDiodeDetId(EcalBarrel, 18, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 18, 2) : EcalPnDiodeDetId(EcalBarrel, 18, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 18, 2) : EcalPnDiodeDetId(EcalBarrel, 18, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 18, 3) : EcalPnDiodeDetId(EcalBarrel, 18, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 18, 3) : EcalPnDiodeDetId(EcalBarrel, 18, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 18, 4) : EcalPnDiodeDetId(EcalBarrel, 18, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 18, 4) : EcalPnDiodeDetId(EcalBarrel, 18, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 18, 5) : EcalPnDiodeDetId(EcalBarrel, 18, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 18, 5) : EcalPnDiodeDetId(EcalBarrel, 18, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 19:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 19, 1) : EcalPnDiodeDetId(EcalBarrel, 19, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 19, 2) : EcalPnDiodeDetId(EcalBarrel, 19, 8);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 19, 2) : EcalPnDiodeDetId(EcalBarrel, 19, 8);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 19, 3) : EcalPnDiodeDetId(EcalBarrel, 19, 7);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 19, 3) : EcalPnDiodeDetId(EcalBarrel, 19, 7);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 19, 4) : EcalPnDiodeDetId(EcalBarrel, 19, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 19, 4) : EcalPnDiodeDetId(EcalBarrel, 19, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 19, 5) : EcalPnDiodeDetId(EcalBarrel, 19, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 19, 5) : EcalPnDiodeDetId(EcalBarrel, 19, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 20:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 20, 1) : EcalPnDiodeDetId(EcalBarrel, 20, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 20, 2) : EcalPnDiodeDetId(EcalBarrel, 20, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 20, 2) : EcalPnDiodeDetId(EcalBarrel, 20, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 20, 3) : EcalPnDiodeDetId(EcalBarrel, 20, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 20, 3) : EcalPnDiodeDetId(EcalBarrel, 20, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 20, 4) : EcalPnDiodeDetId(EcalBarrel, 20, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 20, 4) : EcalPnDiodeDetId(EcalBarrel, 20, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 20, 5) : EcalPnDiodeDetId(EcalBarrel, 20, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 20, 5) : EcalPnDiodeDetId(EcalBarrel, 20, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 21:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 21, 1) : EcalPnDiodeDetId(EcalBarrel, 21, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 21, 2) : EcalPnDiodeDetId(EcalBarrel, 21, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 21, 2) : EcalPnDiodeDetId(EcalBarrel, 21, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 21, 3) : EcalPnDiodeDetId(EcalBarrel, 21, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 21, 3) : EcalPnDiodeDetId(EcalBarrel, 21, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 21, 4) : EcalPnDiodeDetId(EcalBarrel, 21, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 21, 4) : EcalPnDiodeDetId(EcalBarrel, 21, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 21, 5) : EcalPnDiodeDetId(EcalBarrel, 21, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 21, 5) : EcalPnDiodeDetId(EcalBarrel, 21, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 22:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 22, 1) : EcalPnDiodeDetId(EcalBarrel, 22, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 22, 2) : EcalPnDiodeDetId(EcalBarrel, 22, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 22, 2) : EcalPnDiodeDetId(EcalBarrel, 22, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 22, 3) : EcalPnDiodeDetId(EcalBarrel, 22, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 22, 3) : EcalPnDiodeDetId(EcalBarrel, 22, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 22, 4) : EcalPnDiodeDetId(EcalBarrel, 22, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 22, 4) : EcalPnDiodeDetId(EcalBarrel, 22, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 22, 5) : EcalPnDiodeDetId(EcalBarrel, 22, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 22, 5) : EcalPnDiodeDetId(EcalBarrel, 22, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 23:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 23, 1) : EcalPnDiodeDetId(EcalBarrel, 23, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 23, 2) : EcalPnDiodeDetId(EcalBarrel, 23, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 23, 2) : EcalPnDiodeDetId(EcalBarrel, 23, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 23, 3) : EcalPnDiodeDetId(EcalBarrel, 23, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 23, 3) : EcalPnDiodeDetId(EcalBarrel, 23, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 23, 4) : EcalPnDiodeDetId(EcalBarrel, 23, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 23, 4) : EcalPnDiodeDetId(EcalBarrel, 23, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 23, 5) : EcalPnDiodeDetId(EcalBarrel, 23, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 23, 5) : EcalPnDiodeDetId(EcalBarrel, 23, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 24:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 24, 1) : EcalPnDiodeDetId(EcalBarrel, 24, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 24, 2) : EcalPnDiodeDetId(EcalBarrel, 24, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 24, 2) : EcalPnDiodeDetId(EcalBarrel, 24, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 24, 3) : EcalPnDiodeDetId(EcalBarrel, 24, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 24, 3) : EcalPnDiodeDetId(EcalBarrel, 24, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 24, 4) : EcalPnDiodeDetId(EcalBarrel, 24, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 24, 4) : EcalPnDiodeDetId(EcalBarrel, 24, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 24, 5) : EcalPnDiodeDetId(EcalBarrel, 24, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 24, 5) : EcalPnDiodeDetId(EcalBarrel, 24, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 25:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 25, 2) : EcalPnDiodeDetId(EcalBarrel, 25, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 25, 1) : EcalPnDiodeDetId(EcalBarrel, 25, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 25, 1) : EcalPnDiodeDetId(EcalBarrel, 25, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 25, 3) : EcalPnDiodeDetId(EcalBarrel, 25, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 25, 3) : EcalPnDiodeDetId(EcalBarrel, 25, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 25, 4) : EcalPnDiodeDetId(EcalBarrel, 25, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 25, 4) : EcalPnDiodeDetId(EcalBarrel, 25, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 25, 5) : EcalPnDiodeDetId(EcalBarrel, 25, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 25, 5) : EcalPnDiodeDetId(EcalBarrel, 25, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 26:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 26, 1) : EcalPnDiodeDetId(EcalBarrel, 26, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 26, 2) : EcalPnDiodeDetId(EcalBarrel, 26, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 26, 2) : EcalPnDiodeDetId(EcalBarrel, 26, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 26, 3) : EcalPnDiodeDetId(EcalBarrel, 26, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 26, 3) : EcalPnDiodeDetId(EcalBarrel, 26, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 26, 4) : EcalPnDiodeDetId(EcalBarrel, 26, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 26, 4) : EcalPnDiodeDetId(EcalBarrel, 26, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 26, 5) : EcalPnDiodeDetId(EcalBarrel, 26, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 26, 5) : EcalPnDiodeDetId(EcalBarrel, 26, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 27:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 27, 1) : EcalPnDiodeDetId(EcalBarrel, 27, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 27, 2) : EcalPnDiodeDetId(EcalBarrel, 27, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 27, 2) : EcalPnDiodeDetId(EcalBarrel, 27, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 27, 3) : EcalPnDiodeDetId(EcalBarrel, 27, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 27, 3) : EcalPnDiodeDetId(EcalBarrel, 27, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 27, 4) : EcalPnDiodeDetId(EcalBarrel, 27, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 27, 4) : EcalPnDiodeDetId(EcalBarrel, 27, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 27, 5) : EcalPnDiodeDetId(EcalBarrel, 27, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 27, 5) : EcalPnDiodeDetId(EcalBarrel, 27, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 28:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 28, 1) : EcalPnDiodeDetId(EcalBarrel, 28, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 28, 2) : EcalPnDiodeDetId(EcalBarrel, 28, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 28, 2) : EcalPnDiodeDetId(EcalBarrel, 28, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 28, 3) : EcalPnDiodeDetId(EcalBarrel, 28, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 28, 3) : EcalPnDiodeDetId(EcalBarrel, 28, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 28, 4) : EcalPnDiodeDetId(EcalBarrel, 28, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 28, 4) : EcalPnDiodeDetId(EcalBarrel, 28, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 28, 5) : EcalPnDiodeDetId(EcalBarrel, 28, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 28, 5) : EcalPnDiodeDetId(EcalBarrel, 28, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 29:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 29, 1) : EcalPnDiodeDetId(EcalBarrel, 29, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 29, 2) : EcalPnDiodeDetId(EcalBarrel, 29, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 29, 2) : EcalPnDiodeDetId(EcalBarrel, 29, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 29, 3) : EcalPnDiodeDetId(EcalBarrel, 29, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 29, 3) : EcalPnDiodeDetId(EcalBarrel, 29, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 29, 4) : EcalPnDiodeDetId(EcalBarrel, 29, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 29, 4) : EcalPnDiodeDetId(EcalBarrel, 29, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 29, 5) : EcalPnDiodeDetId(EcalBarrel, 29, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 29, 5) : EcalPnDiodeDetId(EcalBarrel, 29, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 30:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 30, 1) : EcalPnDiodeDetId(EcalBarrel, 30, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 30, 2) : EcalPnDiodeDetId(EcalBarrel, 30, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 30, 2) : EcalPnDiodeDetId(EcalBarrel, 30, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 30, 3) : EcalPnDiodeDetId(EcalBarrel, 30, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 30, 3) : EcalPnDiodeDetId(EcalBarrel, 30, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 30, 4) : EcalPnDiodeDetId(EcalBarrel, 30, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 30, 4) : EcalPnDiodeDetId(EcalBarrel, 30, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 30, 5) : EcalPnDiodeDetId(EcalBarrel, 30, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 30, 5) : EcalPnDiodeDetId(EcalBarrel, 30, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 31:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 31, 1) : EcalPnDiodeDetId(EcalBarrel, 31, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 31, 2) : EcalPnDiodeDetId(EcalBarrel, 31, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 31, 2) : EcalPnDiodeDetId(EcalBarrel, 31, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 31, 3) : EcalPnDiodeDetId(EcalBarrel, 31, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 31, 3) : EcalPnDiodeDetId(EcalBarrel, 31, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 31, 4) : EcalPnDiodeDetId(EcalBarrel, 31, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 31, 4) : EcalPnDiodeDetId(EcalBarrel, 31, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 31, 5) : EcalPnDiodeDetId(EcalBarrel, 31, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 31, 5) : EcalPnDiodeDetId(EcalBarrel, 31, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 32:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 32, 1) : EcalPnDiodeDetId(EcalBarrel, 32, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 32, 2) : EcalPnDiodeDetId(EcalBarrel, 32, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 32, 2) : EcalPnDiodeDetId(EcalBarrel, 32, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 32, 3) : EcalPnDiodeDetId(EcalBarrel, 32, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 32, 3) : EcalPnDiodeDetId(EcalBarrel, 32, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 32, 5) : EcalPnDiodeDetId(EcalBarrel, 32, 10);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 32, 5) : EcalPnDiodeDetId(EcalBarrel, 32, 10);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 32, 4) : EcalPnDiodeDetId(EcalBarrel, 32, 9);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 32, 4) : EcalPnDiodeDetId(EcalBarrel, 32, 9);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 33:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 33, 1) : EcalPnDiodeDetId(EcalBarrel, 33, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 33, 2) : EcalPnDiodeDetId(EcalBarrel, 33, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 33, 2) : EcalPnDiodeDetId(EcalBarrel, 33, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 33, 3) : EcalPnDiodeDetId(EcalBarrel, 33, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 33, 3) : EcalPnDiodeDetId(EcalBarrel, 33, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 33, 4) : EcalPnDiodeDetId(EcalBarrel, 33, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 33, 4) : EcalPnDiodeDetId(EcalBarrel, 33, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 33, 5) : EcalPnDiodeDetId(EcalBarrel, 33, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 33, 5) : EcalPnDiodeDetId(EcalBarrel, 33, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 34:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 34, 1) : EcalPnDiodeDetId(EcalBarrel, 34, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 34, 2) : EcalPnDiodeDetId(EcalBarrel, 34, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 34, 2) : EcalPnDiodeDetId(EcalBarrel, 34, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 34, 3) : EcalPnDiodeDetId(EcalBarrel, 34, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 34, 3) : EcalPnDiodeDetId(EcalBarrel, 34, 8);
+            case 6:
+              return pnA ? /*EcalPnDiodeDetId(EcalBarrel, 34, 4)*/ EcalPnDiodeDetId(EcalBarrel, 34, 1)
+                         : EcalPnDiodeDetId(EcalBarrel, 34, 9);
+            case 7:
+              return /*pnA ? EcalPnDiodeDetId(EcalBarrel, 34, 4) :*/ EcalPnDiodeDetId(EcalBarrel, 34, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 34, 5) : EcalPnDiodeDetId(EcalBarrel, 34, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 34, 5) : EcalPnDiodeDetId(EcalBarrel, 34, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 35:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 35, 1) : EcalPnDiodeDetId(EcalBarrel, 35, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 35, 2) : EcalPnDiodeDetId(EcalBarrel, 35, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 35, 2) : EcalPnDiodeDetId(EcalBarrel, 35, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 35, 3) : EcalPnDiodeDetId(EcalBarrel, 35, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 35, 3) : EcalPnDiodeDetId(EcalBarrel, 35, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 35, 4) : EcalPnDiodeDetId(EcalBarrel, 35, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 35, 4) : EcalPnDiodeDetId(EcalBarrel, 35, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 35, 5) : EcalPnDiodeDetId(EcalBarrel, 35, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 35, 5) : EcalPnDiodeDetId(EcalBarrel, 35, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 36:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 36, 1) : EcalPnDiodeDetId(EcalBarrel, 36, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 36, 2) : EcalPnDiodeDetId(EcalBarrel, 36, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 36, 2) : EcalPnDiodeDetId(EcalBarrel, 36, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 36, 3) : EcalPnDiodeDetId(EcalBarrel, 36, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 36, 3) : EcalPnDiodeDetId(EcalBarrel, 36, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 36, 4) : EcalPnDiodeDetId(EcalBarrel, 36, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 36, 4) : EcalPnDiodeDetId(EcalBarrel, 36, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 36, 5) : EcalPnDiodeDetId(EcalBarrel, 36, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 36, 5) : EcalPnDiodeDetId(EcalBarrel, 36, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 37:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 37, 1) : EcalPnDiodeDetId(EcalBarrel, 37, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 37, 2) : EcalPnDiodeDetId(EcalBarrel, 37, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 37, 2) : EcalPnDiodeDetId(EcalBarrel, 37, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 37, 3) : EcalPnDiodeDetId(EcalBarrel, 37, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 37, 3) : EcalPnDiodeDetId(EcalBarrel, 37, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 37, 4) : EcalPnDiodeDetId(EcalBarrel, 37, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 37, 4) : EcalPnDiodeDetId(EcalBarrel, 37, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 37, 5) : EcalPnDiodeDetId(EcalBarrel, 37, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 37, 5) : EcalPnDiodeDetId(EcalBarrel, 37, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 38:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 38, 1) : EcalPnDiodeDetId(EcalBarrel, 38, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 38, 2) : EcalPnDiodeDetId(EcalBarrel, 38, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 38, 2) : EcalPnDiodeDetId(EcalBarrel, 38, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 38, 3) : EcalPnDiodeDetId(EcalBarrel, 38, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 38, 3) : EcalPnDiodeDetId(EcalBarrel, 38, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 38, 4) : EcalPnDiodeDetId(EcalBarrel, 38, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 38, 4) : EcalPnDiodeDetId(EcalBarrel, 38, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 38, 5) : EcalPnDiodeDetId(EcalBarrel, 38, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 38, 5) : EcalPnDiodeDetId(EcalBarrel, 38, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 39:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 39, 1) : EcalPnDiodeDetId(EcalBarrel, 39, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 39, 2) : EcalPnDiodeDetId(EcalBarrel, 39, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 39, 2) : EcalPnDiodeDetId(EcalBarrel, 39, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 39, 3) : EcalPnDiodeDetId(EcalBarrel, 39, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 39, 3) : EcalPnDiodeDetId(EcalBarrel, 39, 8);
+            case 6:
+              return pnA ? /*EcalPnDiodeDetId(EcalBarrel, 39, 4)*/ EcalPnDiodeDetId(EcalBarrel, 39, 1)
+                         : EcalPnDiodeDetId(EcalBarrel, 39, 9);
+            case 7:
+              return /*pnA ? EcalPnDiodeDetId(EcalBarrel, 39, 4) :*/ EcalPnDiodeDetId(EcalBarrel, 39, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 39, 5) : EcalPnDiodeDetId(EcalBarrel, 39, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 39, 5) : EcalPnDiodeDetId(EcalBarrel, 39, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 40:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 40, 1) : EcalPnDiodeDetId(EcalBarrel, 40, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 40, 2) : EcalPnDiodeDetId(EcalBarrel, 40, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 40, 2) : EcalPnDiodeDetId(EcalBarrel, 40, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 40, 3) : EcalPnDiodeDetId(EcalBarrel, 40, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 40, 3) : EcalPnDiodeDetId(EcalBarrel, 40, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 40, 4) : EcalPnDiodeDetId(EcalBarrel, 40, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 40, 4) : EcalPnDiodeDetId(EcalBarrel, 40, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 40, 5) : EcalPnDiodeDetId(EcalBarrel, 40, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 40, 5) : EcalPnDiodeDetId(EcalBarrel, 40, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 41:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 41, 1) : EcalPnDiodeDetId(EcalBarrel, 41, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 41, 2) : EcalPnDiodeDetId(EcalBarrel, 41, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 41, 2) : EcalPnDiodeDetId(EcalBarrel, 41, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 41, 3) : EcalPnDiodeDetId(EcalBarrel, 41, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 41, 3) : EcalPnDiodeDetId(EcalBarrel, 41, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 41, 4) : EcalPnDiodeDetId(EcalBarrel, 41, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 41, 4) : EcalPnDiodeDetId(EcalBarrel, 41, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 41, 5) : EcalPnDiodeDetId(EcalBarrel, 41, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 41, 5) : EcalPnDiodeDetId(EcalBarrel, 41, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 42:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 42, 1) : EcalPnDiodeDetId(EcalBarrel, 42, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 42, 2) : EcalPnDiodeDetId(EcalBarrel, 42, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 42, 2) : EcalPnDiodeDetId(EcalBarrel, 42, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 42, 3) : EcalPnDiodeDetId(EcalBarrel, 42, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 42, 3) : EcalPnDiodeDetId(EcalBarrel, 42, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 42, 4) : EcalPnDiodeDetId(EcalBarrel, 42, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 42, 4) : EcalPnDiodeDetId(EcalBarrel, 42, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 42, 5) : EcalPnDiodeDetId(EcalBarrel, 42, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 42, 5) : EcalPnDiodeDetId(EcalBarrel, 42, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 43:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 43, 1) : EcalPnDiodeDetId(EcalBarrel, 43, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 43, 2) : EcalPnDiodeDetId(EcalBarrel, 43, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 43, 2) : EcalPnDiodeDetId(EcalBarrel, 43, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 43, 3) : EcalPnDiodeDetId(EcalBarrel, 43, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 43, 3) : EcalPnDiodeDetId(EcalBarrel, 43, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 43, 4) : EcalPnDiodeDetId(EcalBarrel, 43, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 43, 4) : EcalPnDiodeDetId(EcalBarrel, 43, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 43, 5) : EcalPnDiodeDetId(EcalBarrel, 43, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 43, 5) : EcalPnDiodeDetId(EcalBarrel, 43, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 44:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 44, 1) : EcalPnDiodeDetId(EcalBarrel, 44, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 44, 2) : EcalPnDiodeDetId(EcalBarrel, 44, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 44, 2) : EcalPnDiodeDetId(EcalBarrel, 44, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 44, 3) : EcalPnDiodeDetId(EcalBarrel, 44, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 44, 3) : EcalPnDiodeDetId(EcalBarrel, 44, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 44, 4) : EcalPnDiodeDetId(EcalBarrel, 44, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 44, 4) : EcalPnDiodeDetId(EcalBarrel, 44, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 44, 5) : EcalPnDiodeDetId(EcalBarrel, 44, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 44, 5) : EcalPnDiodeDetId(EcalBarrel, 44, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        case 45:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 45, 1) : EcalPnDiodeDetId(EcalBarrel, 45, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 45, 2) : EcalPnDiodeDetId(EcalBarrel, 45, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 45, 2) : EcalPnDiodeDetId(EcalBarrel, 45, 7);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 45, 3) : EcalPnDiodeDetId(EcalBarrel, 45, 8);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 45, 3) : EcalPnDiodeDetId(EcalBarrel, 45, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 45, 4) : EcalPnDiodeDetId(EcalBarrel, 45, 9);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 45, 4) : EcalPnDiodeDetId(EcalBarrel, 45, 9);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 45, 5) : EcalPnDiodeDetId(EcalBarrel, 45, 10);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalBarrel, 45, 5) : EcalPnDiodeDetId(EcalBarrel, 45, 10);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+          break;
+        default:
+          return EcalPnDiodeDetId(0);
       }
 
-    }
-    else{
+    } else {
       EcalScDetId scid(EEDetId(_id).sc());
       int ix(scid.ix());
       int iy(scid.iy());
       int dee(MEEEGeom::dee(ix, iy, scid.zside()));
       int lmmod(MEEEGeom::lmmod(ix, iy));
 
-      switch(dee){
-      case 1:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 1) : EcalPnDiodeDetId(EcalEndcap, 50, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 2) : EcalPnDiodeDetId(EcalEndcap, 50, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 3) : EcalPnDiodeDetId(EcalEndcap, 50, 8);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 4) : EcalPnDiodeDetId(EcalEndcap, 50, 9);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 3) : EcalPnDiodeDetId(EcalEndcap, 50, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 1) : EcalPnDiodeDetId(EcalEndcap, 50, 6);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 2) : EcalPnDiodeDetId(EcalEndcap, 50, 7);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 4) : EcalPnDiodeDetId(EcalEndcap, 50, 9);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 6) : EcalPnDiodeDetId(EcalEndcap, 50, 1);
-        case 10: return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 7) : EcalPnDiodeDetId(EcalEndcap, 50, 2);
-        case 11: return /*pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 8) :*/ EcalPnDiodeDetId(EcalEndcap, 50, 3);
-        case 12: return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 9) : EcalPnDiodeDetId(EcalEndcap, 50, 4);
-        case 13: return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 10) : EcalPnDiodeDetId(EcalEndcap, 50, 5);
-        case 14: return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 8) : EcalPnDiodeDetId(EcalEndcap, 50, 3);
-        case 15: return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 6) : EcalPnDiodeDetId(EcalEndcap, 50, 1);
-        case 16: return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 7) : EcalPnDiodeDetId(EcalEndcap, 50, 2);
-        case 17: return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 10) : EcalPnDiodeDetId(EcalEndcap, 50, 5);
-        case 18: return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 5) : EcalPnDiodeDetId(EcalEndcap, 50, 10);
-        case 19: return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 9) : EcalPnDiodeDetId(EcalEndcap, 50, 4);
-        default: return EcalPnDiodeDetId(0);
-        }
-      case 2:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 1) : EcalPnDiodeDetId(EcalEndcap, 46, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 2) : EcalPnDiodeDetId(EcalEndcap, 46, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 3) : EcalPnDiodeDetId(EcalEndcap, 46, 8);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 4) : EcalPnDiodeDetId(EcalEndcap, 46, 9);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 3) : EcalPnDiodeDetId(EcalEndcap, 46, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 1) : EcalPnDiodeDetId(EcalEndcap, 46, 6);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 2) : EcalPnDiodeDetId(EcalEndcap, 46, 7);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 4) : EcalPnDiodeDetId(EcalEndcap, 46, 9);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 6) : EcalPnDiodeDetId(EcalEndcap, 46, 1);
-        case 10: return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 7) : EcalPnDiodeDetId(EcalEndcap, 46, 2);
-        case 11: return /*pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 8) :*/ EcalPnDiodeDetId(EcalEndcap, 46, 3);
-        case 12: return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 9) : EcalPnDiodeDetId(EcalEndcap, 46, 4);
-        case 13: return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 10) : EcalPnDiodeDetId(EcalEndcap, 46, 5);
-        case 14: return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 8) : EcalPnDiodeDetId(EcalEndcap, 46, 3);
-        case 15: return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 6) : EcalPnDiodeDetId(EcalEndcap, 46, 1);
-        case 16: return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 7) : EcalPnDiodeDetId(EcalEndcap, 46, 2);
-        case 17: return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 10) : EcalPnDiodeDetId(EcalEndcap, 46, 5);
-        case 18: return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 5) : EcalPnDiodeDetId(EcalEndcap, 46, 10);
-        case 19: return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 9) : EcalPnDiodeDetId(EcalEndcap, 46, 4);
-        default: return EcalPnDiodeDetId(0);
-        }
-      case 3:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 1) : EcalPnDiodeDetId(EcalEndcap, 1, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 2) : EcalPnDiodeDetId(EcalEndcap, 1, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 3) : EcalPnDiodeDetId(EcalEndcap, 1, 8);
-        case 4: return /*pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 4) :*/ EcalPnDiodeDetId(EcalEndcap, 1, 9);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 3) : EcalPnDiodeDetId(EcalEndcap, 1, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 1) : EcalPnDiodeDetId(EcalEndcap, 1, 6);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 2) : EcalPnDiodeDetId(EcalEndcap, 1, 7);
-        case 8: return /*pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 4) :*/ EcalPnDiodeDetId(EcalEndcap, 1, 9);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 6) : EcalPnDiodeDetId(EcalEndcap, 1, 1);
-        case 10: return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 7) : EcalPnDiodeDetId(EcalEndcap, 1, 2);
-        case 11: return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 8) : EcalPnDiodeDetId(EcalEndcap, 1, 3);
-        case 12: return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 9) : EcalPnDiodeDetId(EcalEndcap, 1, 4);
-        case 13: return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 10) : EcalPnDiodeDetId(EcalEndcap, 1, 5);
-        case 14: return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 8) : EcalPnDiodeDetId(EcalEndcap, 1, 3);
-        case 15: return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 6) : EcalPnDiodeDetId(EcalEndcap, 1, 1);
-        case 16: return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 7) : EcalPnDiodeDetId(EcalEndcap, 1, 2);
-        case 17: return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 10) : EcalPnDiodeDetId(EcalEndcap, 1, 5);
-        case 18: return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 5) : EcalPnDiodeDetId(EcalEndcap, 1, 10);
-        case 19: return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 9) : EcalPnDiodeDetId(EcalEndcap, 1, 4);
-        default: return EcalPnDiodeDetId(0);
-        }
-      case 4:
-        switch(lmmod){
-        case 1: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 1) : EcalPnDiodeDetId(EcalEndcap, 5, 6);
-        case 2: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 2) : EcalPnDiodeDetId(EcalEndcap, 5, 7);
-        case 3: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 3) : EcalPnDiodeDetId(EcalEndcap, 5, 8);
-        case 4: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 4) : EcalPnDiodeDetId(EcalEndcap, 5, 9);
-        case 5: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 3) : EcalPnDiodeDetId(EcalEndcap, 5, 8);
-        case 6: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 1) : EcalPnDiodeDetId(EcalEndcap, 5, 6);
-        case 7: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 2) : EcalPnDiodeDetId(EcalEndcap, 5, 7);
-        case 8: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 4) : EcalPnDiodeDetId(EcalEndcap, 5, 9);
-        case 9: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 6) : EcalPnDiodeDetId(EcalEndcap, 5, 1);
-        case 10: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 7) : EcalPnDiodeDetId(EcalEndcap, 5, 2);
-        case 11: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 8) : EcalPnDiodeDetId(EcalEndcap, 5, 3);
-        case 12: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 9) : EcalPnDiodeDetId(EcalEndcap, 5, 4);
-        case 13: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 10) : EcalPnDiodeDetId(EcalEndcap, 5, 5);
-        case 14: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 8) : EcalPnDiodeDetId(EcalEndcap, 5, 3);
-        case 15: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 6) : EcalPnDiodeDetId(EcalEndcap, 5, 1);
-        case 16: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 7) : EcalPnDiodeDetId(EcalEndcap, 5, 2);
-        case 17: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 10) : EcalPnDiodeDetId(EcalEndcap, 5, 5);
-        case 18: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 5) : EcalPnDiodeDetId(EcalEndcap, 5, 10);
-        case 19: return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 9) : EcalPnDiodeDetId(EcalEndcap, 5, 4);
-        default: return EcalPnDiodeDetId(0);
-        }
-      default: return EcalPnDiodeDetId(0);
+      switch (dee) {
+        case 1:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 1) : EcalPnDiodeDetId(EcalEndcap, 50, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 2) : EcalPnDiodeDetId(EcalEndcap, 50, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 3) : EcalPnDiodeDetId(EcalEndcap, 50, 8);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 4) : EcalPnDiodeDetId(EcalEndcap, 50, 9);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 3) : EcalPnDiodeDetId(EcalEndcap, 50, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 1) : EcalPnDiodeDetId(EcalEndcap, 50, 6);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 2) : EcalPnDiodeDetId(EcalEndcap, 50, 7);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 4) : EcalPnDiodeDetId(EcalEndcap, 50, 9);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 6) : EcalPnDiodeDetId(EcalEndcap, 50, 1);
+            case 10:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 7) : EcalPnDiodeDetId(EcalEndcap, 50, 2);
+            case 11:
+              return /*pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 8) :*/ EcalPnDiodeDetId(EcalEndcap, 50, 3);
+            case 12:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 9) : EcalPnDiodeDetId(EcalEndcap, 50, 4);
+            case 13:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 10) : EcalPnDiodeDetId(EcalEndcap, 50, 5);
+            case 14:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 8) : EcalPnDiodeDetId(EcalEndcap, 50, 3);
+            case 15:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 6) : EcalPnDiodeDetId(EcalEndcap, 50, 1);
+            case 16:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 7) : EcalPnDiodeDetId(EcalEndcap, 50, 2);
+            case 17:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 10) : EcalPnDiodeDetId(EcalEndcap, 50, 5);
+            case 18:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 5) : EcalPnDiodeDetId(EcalEndcap, 50, 10);
+            case 19:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 51, 9) : EcalPnDiodeDetId(EcalEndcap, 50, 4);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+        case 2:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 1) : EcalPnDiodeDetId(EcalEndcap, 46, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 2) : EcalPnDiodeDetId(EcalEndcap, 46, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 3) : EcalPnDiodeDetId(EcalEndcap, 46, 8);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 4) : EcalPnDiodeDetId(EcalEndcap, 46, 9);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 3) : EcalPnDiodeDetId(EcalEndcap, 46, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 1) : EcalPnDiodeDetId(EcalEndcap, 46, 6);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 2) : EcalPnDiodeDetId(EcalEndcap, 46, 7);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 4) : EcalPnDiodeDetId(EcalEndcap, 46, 9);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 6) : EcalPnDiodeDetId(EcalEndcap, 46, 1);
+            case 10:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 7) : EcalPnDiodeDetId(EcalEndcap, 46, 2);
+            case 11:
+              return /*pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 8) :*/ EcalPnDiodeDetId(EcalEndcap, 46, 3);
+            case 12:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 9) : EcalPnDiodeDetId(EcalEndcap, 46, 4);
+            case 13:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 10) : EcalPnDiodeDetId(EcalEndcap, 46, 5);
+            case 14:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 8) : EcalPnDiodeDetId(EcalEndcap, 46, 3);
+            case 15:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 6) : EcalPnDiodeDetId(EcalEndcap, 46, 1);
+            case 16:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 7) : EcalPnDiodeDetId(EcalEndcap, 46, 2);
+            case 17:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 10) : EcalPnDiodeDetId(EcalEndcap, 46, 5);
+            case 18:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 5) : EcalPnDiodeDetId(EcalEndcap, 46, 10);
+            case 19:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 47, 9) : EcalPnDiodeDetId(EcalEndcap, 46, 4);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+        case 3:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 1) : EcalPnDiodeDetId(EcalEndcap, 1, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 2) : EcalPnDiodeDetId(EcalEndcap, 1, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 3) : EcalPnDiodeDetId(EcalEndcap, 1, 8);
+            case 4:
+              return /*pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 4) :*/ EcalPnDiodeDetId(EcalEndcap, 1, 9);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 3) : EcalPnDiodeDetId(EcalEndcap, 1, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 1) : EcalPnDiodeDetId(EcalEndcap, 1, 6);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 2) : EcalPnDiodeDetId(EcalEndcap, 1, 7);
+            case 8:
+              return /*pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 4) :*/ EcalPnDiodeDetId(EcalEndcap, 1, 9);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 6) : EcalPnDiodeDetId(EcalEndcap, 1, 1);
+            case 10:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 7) : EcalPnDiodeDetId(EcalEndcap, 1, 2);
+            case 11:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 8) : EcalPnDiodeDetId(EcalEndcap, 1, 3);
+            case 12:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 9) : EcalPnDiodeDetId(EcalEndcap, 1, 4);
+            case 13:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 10) : EcalPnDiodeDetId(EcalEndcap, 1, 5);
+            case 14:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 8) : EcalPnDiodeDetId(EcalEndcap, 1, 3);
+            case 15:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 6) : EcalPnDiodeDetId(EcalEndcap, 1, 1);
+            case 16:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 7) : EcalPnDiodeDetId(EcalEndcap, 1, 2);
+            case 17:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 10) : EcalPnDiodeDetId(EcalEndcap, 1, 5);
+            case 18:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 5) : EcalPnDiodeDetId(EcalEndcap, 1, 10);
+            case 19:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 2, 9) : EcalPnDiodeDetId(EcalEndcap, 1, 4);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+        case 4:
+          switch (lmmod) {
+            case 1:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 1) : EcalPnDiodeDetId(EcalEndcap, 5, 6);
+            case 2:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 2) : EcalPnDiodeDetId(EcalEndcap, 5, 7);
+            case 3:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 3) : EcalPnDiodeDetId(EcalEndcap, 5, 8);
+            case 4:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 4) : EcalPnDiodeDetId(EcalEndcap, 5, 9);
+            case 5:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 3) : EcalPnDiodeDetId(EcalEndcap, 5, 8);
+            case 6:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 1) : EcalPnDiodeDetId(EcalEndcap, 5, 6);
+            case 7:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 2) : EcalPnDiodeDetId(EcalEndcap, 5, 7);
+            case 8:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 4) : EcalPnDiodeDetId(EcalEndcap, 5, 9);
+            case 9:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 6) : EcalPnDiodeDetId(EcalEndcap, 5, 1);
+            case 10:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 7) : EcalPnDiodeDetId(EcalEndcap, 5, 2);
+            case 11:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 8) : EcalPnDiodeDetId(EcalEndcap, 5, 3);
+            case 12:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 9) : EcalPnDiodeDetId(EcalEndcap, 5, 4);
+            case 13:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 10) : EcalPnDiodeDetId(EcalEndcap, 5, 5);
+            case 14:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 8) : EcalPnDiodeDetId(EcalEndcap, 5, 3);
+            case 15:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 6) : EcalPnDiodeDetId(EcalEndcap, 5, 1);
+            case 16:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 7) : EcalPnDiodeDetId(EcalEndcap, 5, 2);
+            case 17:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 10) : EcalPnDiodeDetId(EcalEndcap, 5, 5);
+            case 18:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 5) : EcalPnDiodeDetId(EcalEndcap, 5, 10);
+            case 19:
+              return pnA ? EcalPnDiodeDetId(EcalEndcap, 6, 9) : EcalPnDiodeDetId(EcalEndcap, 5, 4);
+            default:
+              return EcalPnDiodeDetId(0);
+          }
+        default:
+          return EcalPnDiodeDetId(0);
       }
-
     }
- }
+  }
 
-}
+}  // namespace ecaldqm
diff --git a/DQM/EcalCommon/src/EcalDQMonitor.cc b/DQM/EcalCommon/src/EcalDQMonitor.cc
index fe3b6fcc648ff..86f19334cd83d 100644
--- a/DQM/EcalCommon/src/EcalDQMonitor.cc
+++ b/DQM/EcalCommon/src/EcalDQMonitor.cc
@@ -2,61 +2,57 @@
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/Run.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/LuminosityBlock.h"
+#include "FWCore/Framework/interface/Run.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 #include "Geometry/EcalMapping/interface/EcalMappingRcd.h"
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "Geometry/Records/interface/CaloTopologyRecord.h"
+#include "Geometry/Records/interface/IdealGeometryRecord.h"
 
-#include <sstream>
 #include <ctime>
+#include <sstream>
 
-namespace ecaldqm
-{
-  EcalDQMonitor::EcalDQMonitor(edm::ParameterSet const& _ps) :
-    workers_(),
-    moduleName_(_ps.getUntrackedParameter<std::string>("moduleName")),
-    verbosity_(_ps.getUntrackedParameter<int>("verbosity"))
-  {
-    std::vector<std::string> workerNames(_ps.getUntrackedParameter<std::vector<std::string> >("workers"));
-    edm::ParameterSet const& workerParams(_ps.getUntrackedParameterSet("workerParameters"));
-    edm::ParameterSet const& commonParams(_ps.getUntrackedParameterSet("commonParameters"));
-
-    std::for_each(workerNames.begin(), workerNames.end(), [&](std::string const& name){
-        if(verbosity_ > 0) edm::LogInfo("EcalDQM") << moduleName_ << ": Setting up " << name << std::endl;
-        try{
-          DQWorker* worker(WorkerFactoryStore::singleton()->getWorker(name, verbosity_, commonParams, workerParams.getUntrackedParameterSet(name)));
-          if(worker->onlineMode()) worker->setTime(time(nullptr));
-          workers_.push_back(worker);
-        }
-        catch(std::exception&){
-          edm::LogError("EcalDQM") << "Worker " << name << " not defined";
-          throw;
-        }
-      });
+namespace ecaldqm {
+  EcalDQMonitor::EcalDQMonitor(edm::ParameterSet const &_ps)
+      : workers_(),
+        moduleName_(_ps.getUntrackedParameter<std::string>("moduleName")),
+        verbosity_(_ps.getUntrackedParameter<int>("verbosity")) {
+    std::vector<std::string> workerNames(_ps.getUntrackedParameter<std::vector<std::string>>("workers"));
+    edm::ParameterSet const &workerParams(_ps.getUntrackedParameterSet("workerParameters"));
+    edm::ParameterSet const &commonParams(_ps.getUntrackedParameterSet("commonParameters"));
+
+    std::for_each(workerNames.begin(), workerNames.end(), [&](std::string const &name) {
+      if (verbosity_ > 0)
+        edm::LogInfo("EcalDQM") << moduleName_ << ": Setting up " << name << std::endl;
+      try {
+        DQWorker *worker(WorkerFactoryStore::singleton()->getWorker(
+            name, verbosity_, commonParams, workerParams.getUntrackedParameterSet(name)));
+        if (worker->onlineMode())
+          worker->setTime(time(nullptr));
+        workers_.push_back(worker);
+      } catch (std::exception &) {
+        edm::LogError("EcalDQM") << "Worker " << name << " not defined";
+        throw;
+      }
+    });
   }
 
-  EcalDQMonitor::~EcalDQMonitor() noexcept(false)
-  {
-    if(verbosity_ > 2) edm::LogInfo("EcalDQM") << moduleName_ << ": Deleting workers";
+  EcalDQMonitor::~EcalDQMonitor() noexcept(false) {
+    if (verbosity_ > 2)
+      edm::LogInfo("EcalDQM") << moduleName_ << ": Deleting workers";
 
-    executeOnWorkers_([](DQWorker* worker){
-        delete worker;
-      }, "Dtor");
+    executeOnWorkers_([](DQWorker *worker) { delete worker; }, "Dtor");
   }
 
   /*static*/
-  void
-  EcalDQMonitor::fillDescriptions(edm::ParameterSetDescription& _desc)
-  {
+  void EcalDQMonitor::fillDescriptions(edm::ParameterSetDescription &_desc) {
     _desc.addUntracked<std::string>("moduleName", "Ecal Monitor Module");
-    _desc.addUntracked<std::vector<std::string> >("workers");
+    _desc.addUntracked<std::vector<std::string>>("workers");
     _desc.addUntracked<int>("verbosity", 0);
 
     edm::ParameterSetDescription commonParameters;
@@ -65,10 +61,8 @@ namespace ecaldqm
     _desc.addUntracked("commonParameters", commonParameters);
   }
 
-  void
-  EcalDQMonitor::ecaldqmGetSetupObjects(edm::EventSetup const& _es)
-  {
-    //NB: a more minimal solution may rely on ESWatchers
+  void EcalDQMonitor::ecaldqmGetSetupObjects(edm::EventSetup const &_es) {
+    // NB: a more minimal solution may rely on ESWatchers
     //    but then here the cost is rather minimal
     // set up electronicsMap in EcalDQMCommonUtils
     edm::ESHandle<EcalElectronicsMapping> elecMapHandle;
@@ -90,51 +84,59 @@ namespace ecaldqm
     setTopology(topoHandle.product());
   }
 
-  void
-  EcalDQMonitor::ecaldqmBeginRun(edm::Run const& _run, edm::EventSetup const& _es)
-  {
-    executeOnWorkers_([&_run, &_es](DQWorker* worker){
-        if(worker->onlineMode()) worker->setTime(time(nullptr));
-        worker->setRunNumber(_run.run());
-        worker->beginRun(_run, _es);
-      }, "beginRun");
-
-    if(verbosity_ > 0) edm::LogInfo("EcalDQM") << moduleName_ << "::ecaldqmBeginRun";
+  void EcalDQMonitor::ecaldqmBeginRun(edm::Run const &_run, edm::EventSetup const &_es) {
+    executeOnWorkers_(
+        [&_run, &_es](DQWorker *worker) {
+          if (worker->onlineMode())
+            worker->setTime(time(nullptr));
+          worker->setRunNumber(_run.run());
+          worker->beginRun(_run, _es);
+        },
+        "beginRun");
+
+    if (verbosity_ > 0)
+      edm::LogInfo("EcalDQM") << moduleName_ << "::ecaldqmBeginRun";
   }
 
-  void
-  EcalDQMonitor::ecaldqmEndRun(edm::Run const& _run, edm::EventSetup const& _es)
-  {
-    executeOnWorkers_([&_run, &_es](DQWorker* worker){
-        if(worker->onlineMode()) worker->setTime(time(nullptr));
-        worker->setRunNumber(_run.run());
-        worker->endRun(_run, _es);
-      }, "endRun");
-
-    if(verbosity_ > 0) edm::LogInfo("EcalDQM") << moduleName_ << "::ecaldqmEndRun";
+  void EcalDQMonitor::ecaldqmEndRun(edm::Run const &_run, edm::EventSetup const &_es) {
+    executeOnWorkers_(
+        [&_run, &_es](DQWorker *worker) {
+          if (worker->onlineMode())
+            worker->setTime(time(nullptr));
+          worker->setRunNumber(_run.run());
+          worker->endRun(_run, _es);
+        },
+        "endRun");
+
+    if (verbosity_ > 0)
+      edm::LogInfo("EcalDQM") << moduleName_ << "::ecaldqmEndRun";
   }
 
-  void
-  EcalDQMonitor::ecaldqmBeginLuminosityBlock(edm::LuminosityBlock const& _lumi, edm::EventSetup const& _es)
-  {
-    executeOnWorkers_([&_lumi, &_es](DQWorker* worker){
-        if(worker->onlineMode()) worker->setTime(time(nullptr));
-        worker->setLumiNumber(_lumi.luminosityBlock());
-        worker->beginLuminosityBlock(_lumi, _es);
-      }, "beginLumi");
-
-    if(verbosity_ > 1) edm::LogInfo("EcalDQM") << moduleName_ << "::ecaldqmBeginLuminosityBlock";
+  void EcalDQMonitor::ecaldqmBeginLuminosityBlock(edm::LuminosityBlock const &_lumi, edm::EventSetup const &_es) {
+    executeOnWorkers_(
+        [&_lumi, &_es](DQWorker *worker) {
+          if (worker->onlineMode())
+            worker->setTime(time(nullptr));
+          worker->setLumiNumber(_lumi.luminosityBlock());
+          worker->beginLuminosityBlock(_lumi, _es);
+        },
+        "beginLumi");
+
+    if (verbosity_ > 1)
+      edm::LogInfo("EcalDQM") << moduleName_ << "::ecaldqmBeginLuminosityBlock";
   }
 
-  void
-  EcalDQMonitor::ecaldqmEndLuminosityBlock(edm::LuminosityBlock const& _lumi, edm::EventSetup const& _es)
-  {
-    executeOnWorkers_([&_lumi, &_es](DQWorker* worker){
-        if(worker->onlineMode()) worker->setTime(time(nullptr));
-        worker->setLumiNumber(_lumi.luminosityBlock());
-        worker->endLuminosityBlock(_lumi, _es);
-      }, "endLumi");
-
-    if(verbosity_ > 2) edm::LogInfo("EcalDQM") << moduleName_ << "::ecaldqmEndLuminosityBlock";
+  void EcalDQMonitor::ecaldqmEndLuminosityBlock(edm::LuminosityBlock const &_lumi, edm::EventSetup const &_es) {
+    executeOnWorkers_(
+        [&_lumi, &_es](DQWorker *worker) {
+          if (worker->onlineMode())
+            worker->setTime(time(nullptr));
+          worker->setLumiNumber(_lumi.luminosityBlock());
+          worker->endLuminosityBlock(_lumi, _es);
+        },
+        "endLumi");
+
+    if (verbosity_ > 2)
+      edm::LogInfo("EcalDQM") << moduleName_ << "::ecaldqmEndLuminosityBlock";
   }
-}
+}  // namespace ecaldqm
diff --git a/DQM/EcalCommon/src/MESet.cc b/DQM/EcalCommon/src/MESet.cc
index 3c4853779ab1d..9586963e2b380 100644
--- a/DQM/EcalCommon/src/MESet.cc
+++ b/DQM/EcalCommon/src/MESet.cc
@@ -4,71 +4,64 @@
 #include "DQM/EcalCommon/interface/MESetUtils.h"
 #include "DQM/EcalCommon/interface/StatusManager.h"
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include "TString.h"
 #include "TPRegexp.h"
+#include "TString.h"
 
-namespace ecaldqm
-{
-  MESet::MESet() :
-    mes_(0),
-    path_(""),
-    otype_(binning::nObjType),
-    btype_(binning::nBinType),
-    kind_(MonitorElement::DQM_KIND_INVALID),
-    lumiFlag_(false),
-    batchMode_(false),
-    active_(false)
-  {
-  }
-
-  MESet::MESet(std::string const& _path, binning::ObjectType _otype, binning::BinningType _btype, MonitorElement::Kind _kind) :
-    mes_(0),
-    path_(_path),
-    otype_(_otype),
-    btype_(_btype),
-    kind_(_kind),
-    lumiFlag_(false),
-    batchMode_(false),
-    active_(false)
-  {
-    if(path_.empty() || path_.find("/") == std::string::npos ||
-       (otype_ != binning::kChannel && path_.find("/") == path_.size() - 1))
+namespace ecaldqm {
+  MESet::MESet()
+      : mes_(0),
+        path_(""),
+        otype_(binning::nObjType),
+        btype_(binning::nBinType),
+        kind_(MonitorElement::DQM_KIND_INVALID),
+        lumiFlag_(false),
+        batchMode_(false),
+        active_(false) {}
+
+  MESet::MESet(std::string const &_path,
+               binning::ObjectType _otype,
+               binning::BinningType _btype,
+               MonitorElement::Kind _kind)
+      : mes_(0),
+        path_(_path),
+        otype_(_otype),
+        btype_(_btype),
+        kind_(_kind),
+        lumiFlag_(false),
+        batchMode_(false),
+        active_(false) {
+    if (path_.empty() || path_.find("/") == std::string::npos ||
+        (otype_ != binning::kChannel && path_.find("/") == path_.size() - 1))
       throw_(_path + " cannot be used for ME path name");
 
-    switch(kind_){
-    case MonitorElement::DQM_KIND_REAL:
-    case MonitorElement::DQM_KIND_TH1F:
-    case MonitorElement::DQM_KIND_TPROFILE:
-    case MonitorElement::DQM_KIND_TH2F:
-    case MonitorElement::DQM_KIND_TPROFILE2D:
-      break;
-    default:
-      throw_("Unsupported MonitorElement kind");
+    switch (kind_) {
+      case MonitorElement::DQM_KIND_REAL:
+      case MonitorElement::DQM_KIND_TH1F:
+      case MonitorElement::DQM_KIND_TPROFILE:
+      case MonitorElement::DQM_KIND_TH2F:
+      case MonitorElement::DQM_KIND_TPROFILE2D:
+        break;
+      default:
+        throw_("Unsupported MonitorElement kind");
     }
   }
 
-  MESet::MESet(MESet const& _orig) :
-    mes_(_orig.mes_),
-    path_(_orig.path_),
-    otype_(_orig.otype_),
-    btype_(_orig.btype_),
-    kind_(_orig.kind_),
-    lumiFlag_(_orig.lumiFlag_),
-    batchMode_(_orig.batchMode_),
-    active_(_orig.active_)
-  {
-  }
+  MESet::MESet(MESet const &_orig)
+      : mes_(_orig.mes_),
+        path_(_orig.path_),
+        otype_(_orig.otype_),
+        btype_(_orig.btype_),
+        kind_(_orig.kind_),
+        lumiFlag_(_orig.lumiFlag_),
+        batchMode_(_orig.batchMode_),
+        active_(_orig.active_) {}
 
-  MESet::~MESet()
-  {
-  }
+  MESet::~MESet() {}
 
-  MESet&
-  MESet::operator=(MESet const& _rhs)
-  {
+  MESet &MESet::operator=(MESet const &_rhs) {
     mes_ = _rhs.mes_;
     path_ = _rhs.path_;
     otype_ = _rhs.otype_;
@@ -79,92 +72,86 @@ namespace ecaldqm
     return *this;
   }
 
-  MESet*
-  MESet::clone(std::string const& _path/* = ""*/) const
-  {
+  MESet *MESet::clone(std::string const &_path /* = ""*/) const {
     std::string path(path_);
-    if(_path != "") path_ = _path;
-    MESet* copy(new MESet(*this));
+    if (!_path.empty())
+      path_ = _path;
+    MESet *copy(new MESet(*this));
     path_ = path;
     return copy;
   }
 
-  void
-  MESet::clear() const
-  {
+  void MESet::clear() const {
     active_ = false;
     mes_.clear();
   }
 
-  void
-  MESet::setAxisTitle(std::string const& _title, int _axis/* = 1*/)
-  {
-    if(!active_) return;
+  void MESet::setAxisTitle(std::string const &_title, int _axis /* = 1*/) {
+    if (!active_)
+      return;
 
     unsigned nME(mes_.size());
-    for(unsigned iME(0); iME < nME; iME++)
+    for (unsigned iME(0); iME < nME; iME++)
       mes_[iME]->setAxisTitle(_title, _axis);
   }
 
-  void
-  MESet::reset(double _content/* = 0.*/, double _err/* = 0.*/, double _entries/* = 0.*/)
-  {
-    if(!active_) return;
+  void MESet::reset(double _content /* = 0.*/, double _err /* = 0.*/, double _entries /* = 0.*/) {
+    if (!active_)
+      return;
 
     resetAll(_content, _err, _entries);
   }
 
-  void
-  MESet::resetAll(double _content/* = 0.*/, double _err/* = 0.*/, double _entries/* = 0.*/)
-  {
-    if(!active_) return;
+  void MESet::resetAll(double _content /* = 0.*/, double _err /* = 0.*/, double _entries /* = 0.*/) {
+    if (!active_)
+      return;
 
     unsigned nME(mes_.size());
 
-    if(kind_ == MonitorElement::DQM_KIND_REAL){
-      for(unsigned iME(0); iME < nME; iME++)
+    if (kind_ == MonitorElement::DQM_KIND_REAL) {
+      for (unsigned iME(0); iME < nME; iME++)
         mes_[iME]->Fill(_content);
       return;
     }
 
     bool simple(true);
-    if(_content != 0. || _err != 0. || _entries != 0.) simple = false;
+    if (_content != 0. || _err != 0. || _entries != 0.)
+      simple = false;
 
-    for(unsigned iME(0); iME < nME; iME++){
-      TH1* h(mes_[iME]->getTH1());
+    for (unsigned iME(0); iME < nME; iME++) {
+      TH1 *h(mes_[iME]->getTH1());
       h->Reset();
-      if(simple) continue;
+      if (simple)
+        continue;
 
       int nbinsX(h->GetNbinsX());
       int nbinsY(h->GetNbinsY());
       double entries(0.);
-      for(int ix(1); ix <= nbinsX; ix++){
-        for(int iy(1); iy <= nbinsY; iy++){
+      for (int ix(1); ix <= nbinsX; ix++) {
+        for (int iy(1); iy <= nbinsY; iy++) {
           int bin(h->GetBin(ix, iy));
           h->SetBinContent(bin, _content);
           h->SetBinError(bin, _err);
-          if(kind_ == MonitorElement::DQM_KIND_TPROFILE){
-            static_cast<TProfile*>(h)->SetBinEntries(bin, _entries);
+          if (kind_ == MonitorElement::DQM_KIND_TPROFILE) {
+            static_cast<TProfile *>(h)->SetBinEntries(bin, _entries);
             entries += _entries;
-          }
-          else if(kind_ == MonitorElement::DQM_KIND_TPROFILE2D){
-            static_cast<TProfile2D*>(h)->SetBinEntries(bin, _entries);
+          } else if (kind_ == MonitorElement::DQM_KIND_TPROFILE2D) {
+            static_cast<TProfile2D *>(h)->SetBinEntries(bin, _entries);
             entries += _entries;
           }
         }
       }
-      if(entries == 0.) entries = _entries;
+      if (entries == 0.)
+        entries = _entries;
       h->SetEntries(_entries);
     }
   }
 
-
-  std::string
-  MESet::formPath(std::map<std::string, std::string> const& _replacements) const
-  {
+  std::string MESet::formPath(std::map<std::string, std::string> const &_replacements) const {
     TString path(path_);
 
-    for(typename MESet::PathReplacements::const_iterator repItr(_replacements.begin()); repItr != _replacements.end(); ++repItr){
+    for (typename MESet::PathReplacements::const_iterator repItr(_replacements.begin()); repItr != _replacements.end();
+         ++repItr) {
       TString pattern("\\%\\(");
       pattern += repItr->first;
       pattern += "\\)s";
@@ -177,12 +164,12 @@ namespace ecaldqm
     return path.Data();
   }
 
-  bool
-  MESet::maskMatches(DetId const& _id, uint32_t _mask, StatusManager const* _statusManager) const
-  {
-    if(!_statusManager) return false;
+  bool MESet::maskMatches(DetId const &_id, uint32_t _mask, StatusManager const *_statusManager) const {
+    if (!_statusManager)
+      return false;
 
-    if((_statusManager->getStatus(_id.rawId()) & _mask) != 0) return true;
+    if ((_statusManager->getStatus(_id.rawId()) & _mask) != 0)
+      return true;
 
     int subdet(_id.subdetId());
 
@@ -191,120 +178,122 @@ namespace ecaldqm
     // turn off masking for good channel for the time being
     // update the RenderPlugin then enable again
 
-    switch(subdet){
-    case EcalBarrel: // this is a DetId for single crystal in barrel
+    switch (subdet) {
+      case EcalBarrel:  // this is a DetId for single crystal in barrel
       {
         EBDetId ebId(_id);
         EcalTrigTowerDetId ttId(ebId.tower());
-        if((_statusManager->getStatus(ttId.rawId()) & _mask) != 0) return true;
+        if ((_statusManager->getStatus(ttId.rawId()) & _mask) != 0)
+          return true;
 
-        if(searchNeighborsInTower){
+        if (searchNeighborsInTower) {
           std::vector<DetId> ids(getTrigTowerMap()->constituentsOf(ttId));
-          for(std::vector<DetId>::iterator idItr(ids.begin()); idItr != ids.end(); ++idItr)
-            if((_statusManager->getStatus(idItr->rawId()) & _mask) != 0) return true;
-        }
-      }
-      break;
-
-    case EcalEndcap:
-      if(isEcalScDetId(_id)){
-        EcalScDetId scId(_id);
-        for(int ix(1); ix <= 5; ix++){
-          for(int iy(1); iy <= 5; iy++){
-            int iix((scId.ix() - 1) * 5 + ix);
-            int iiy((scId.iy() - 1) * 5 + iy);
-            if(!EEDetId::validDetId(iix, iiy, scId.zside())) continue;
-            if((_statusManager->getStatus(EEDetId(iix, iiy, scId.zside()).rawId()) & _mask) != 0) return true;
-          }
+          for (std::vector<DetId>::iterator idItr(ids.begin()); idItr != ids.end(); ++idItr)
+            if ((_statusManager->getStatus(idItr->rawId()) & _mask) != 0)
+              return true;
         }
-      }
-      else{
-        EEDetId eeId(_id);
-        EcalScDetId scId(eeId.sc());
-        if((_statusManager->getStatus(scId.rawId()) & _mask) != 0) return true;
-
-        if(searchNeighborsInTower){
-          for(int ix(1); ix <= 5; ix++){
-            for(int iy(1); iy <= 5; iy++){
+      } break;
+
+      case EcalEndcap:
+        if (isEcalScDetId(_id)) {
+          EcalScDetId scId(_id);
+          for (int ix(1); ix <= 5; ix++) {
+            for (int iy(1); iy <= 5; iy++) {
               int iix((scId.ix() - 1) * 5 + ix);
               int iiy((scId.iy() - 1) * 5 + iy);
-              if(!EEDetId::validDetId(iix, iiy, scId.zside())) continue;
-              if((_statusManager->getStatus(EEDetId(iix, iiy, scId.zside()).rawId()) & _mask) != 0) return true;
+              if (!EEDetId::validDetId(iix, iiy, scId.zside()))
+                continue;
+              if ((_statusManager->getStatus(EEDetId(iix, iiy, scId.zside()).rawId()) & _mask) != 0)
+                return true;
+            }
+          }
+        } else {
+          EEDetId eeId(_id);
+          EcalScDetId scId(eeId.sc());
+          if ((_statusManager->getStatus(scId.rawId()) & _mask) != 0)
+            return true;
+
+          if (searchNeighborsInTower) {
+            for (int ix(1); ix <= 5; ix++) {
+              for (int iy(1); iy <= 5; iy++) {
+                int iix((scId.ix() - 1) * 5 + ix);
+                int iiy((scId.iy() - 1) * 5 + iy);
+                if (!EEDetId::validDetId(iix, iiy, scId.zside()))
+                  continue;
+                if ((_statusManager->getStatus(EEDetId(iix, iiy, scId.zside()).rawId()) & _mask) != 0)
+                  return true;
+              }
             }
           }
         }
-      }
-      break;
+        break;
 
-    case EcalTriggerTower:
-      {
+      case EcalTriggerTower: {
         EcalTrigTowerDetId ttId(_id);
         std::vector<DetId> ids(getTrigTowerMap()->constituentsOf(ttId));
-        for(std::vector<DetId>::iterator idItr(ids.begin()); idItr != ids.end(); ++idItr)
-          if((_statusManager->getStatus(idItr->rawId()) & _mask) != 0) return true;
-      }
-      break;
+        for (std::vector<DetId>::iterator idItr(ids.begin()); idItr != ids.end(); ++idItr)
+          if ((_statusManager->getStatus(idItr->rawId()) & _mask) != 0)
+            return true;
+      } break;
 
-    default:
-      break;
+      default:
+        break;
     }
 
     return false;
   }
 
-  void
-  MESet::softReset()
-  {
-    if(!active_) return;
+  void MESet::softReset() {
+    if (!active_)
+      return;
 
-    DQMStore& store(*edm::Service<DQMStore>());
+    DQMStore &store(*edm::Service<DQMStore>());
 
-    for(unsigned iME(0); iME < mes_.size(); ++iME)
+    for (unsigned iME(0); iME < mes_.size(); ++iME)
       store.softReset(mes_[iME]);
   }
 
-  void
-  MESet::recoverStats()
-  {
-    if(!active_) return;
+  void MESet::recoverStats() {
+    if (!active_)
+      return;
 
-    DQMStore& store(*edm::Service<DQMStore>());
+    DQMStore &store(*edm::Service<DQMStore>());
 
-    for(unsigned iME(0); iME < mes_.size(); ++iME)
+    for (unsigned iME(0); iME < mes_.size(); ++iME)
       store.disableSoftReset(mes_[iME]);
   }
 
-  void
-  MESet::fill_(unsigned _iME, int _bin, double _w)
-  {
-    if(kind_ == MonitorElement::DQM_KIND_REAL) return;
+  void MESet::fill_(unsigned _iME, int _bin, double _w) {
+    if (kind_ == MonitorElement::DQM_KIND_REAL)
+      return;
 
-    MonitorElement* me(mes_[_iME]);
-    if(!me) return;
+    MonitorElement *me(mes_[_iME]);
+    if (!me)
+      return;
 
-    TH1* h(me->getTH1());
+    TH1 *h(me->getTH1());
 
     int nbinsX(h->GetNbinsX());
 
     double x(h->GetXaxis()->GetBinCenter(_bin % (nbinsX + 2)));
 
-    if(kind_ == MonitorElement::DQM_KIND_TH1F || kind_ == MonitorElement::DQM_KIND_TPROFILE)
+    if (kind_ == MonitorElement::DQM_KIND_TH1F || kind_ == MonitorElement::DQM_KIND_TPROFILE)
       me->Fill(x, _w);
-    else{
+    else {
       double y(h->GetYaxis()->GetBinCenter(_bin / (nbinsX + 2)));
       me->Fill(x, y, _w);
     }
   }
 
-  void
-  MESet::fill_(unsigned _iME, int _bin, double _y, double _w)
-  {
-    if(kind_ != MonitorElement::DQM_KIND_TH2F && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESet::fill_(unsigned _iME, int _bin, double _y, double _w) {
+    if (kind_ != MonitorElement::DQM_KIND_TH2F && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
-    MonitorElement* me(mes_[_iME]);
-    if(!me) return;
+    MonitorElement *me(mes_[_iME]);
+    if (!me)
+      return;
 
-    TH1* h(me->getTH1());
+    TH1 *h(me->getTH1());
 
     int nbinsX(h->GetNbinsX());
 
@@ -312,76 +301,69 @@ namespace ecaldqm
     me->Fill(x, _y, _w);
   }
 
-  void
-  MESet::fill_(unsigned _iME, double _x, double _wy, double _w)
-  {
-    MonitorElement* me(mes_[_iME]);
-    if(!me) return;
+  void MESet::fill_(unsigned _iME, double _x, double _wy, double _w) {
+    MonitorElement *me(mes_[_iME]);
+    if (!me)
+      return;
 
-    if(kind_ == MonitorElement::DQM_KIND_REAL)
+    if (kind_ == MonitorElement::DQM_KIND_REAL)
       me->Fill(_x);
-    else if(kind_ == MonitorElement::DQM_KIND_TH1F || kind_ == MonitorElement::DQM_KIND_TPROFILE)
+    else if (kind_ == MonitorElement::DQM_KIND_TH1F || kind_ == MonitorElement::DQM_KIND_TPROFILE)
       me->Fill(_x, _wy);
     else
       me->Fill(_x, _wy, _w);
   }
 
+  MESet::ConstBin::ConstBin(MESet const &_meSet, unsigned _iME /* = 0*/, int _iBin /* = 1*/)
+      : meSet_(&_meSet), iME(_iME), iBin(_iBin), otype(binning::nObjType) {
+    if (iME == unsigned(-1))
+      return;
 
-
-  MESet::ConstBin::ConstBin(MESet const& _meSet, unsigned _iME/* = 0*/, int _iBin/* = 1*/) :
-    meSet_(&_meSet),
-    iME(_iME),
-    iBin(_iBin),
-    otype(binning::nObjType)
-  {
-    if(iME == unsigned(-1)) return;
-
-    // current internal bin numbering scheme does not allow 1D histograms (overflow & underflow in each y)
+    // current internal bin numbering scheme does not allow 1D histograms
+    // (overflow & underflow in each y)
     MonitorElement::Kind kind(meSet_->getKind());
-    //    if(kind != MonitorElement::DQM_KIND_TH1F && kind != MonitorElement::DQM_KIND_TPROFILE &&
-    if(kind != MonitorElement::DQM_KIND_TH2F && kind != MonitorElement::DQM_KIND_TPROFILE2D)
-      throw cms::Exception("InvalidOperation") << "MESet::ConstBin::Ctor: const_iterator only available for MESet of 2D histograms";
+    //    if(kind != MonitorElement::DQM_KIND_TH1F && kind !=
+    //    MonitorElement::DQM_KIND_TPROFILE &&
+    if (kind != MonitorElement::DQM_KIND_TH2F && kind != MonitorElement::DQM_KIND_TPROFILE2D)
+      throw cms::Exception("InvalidOperation") << "MESet::ConstBin::Ctor: const_iterator only available for MESet of "
+                                                  "2D histograms";
 
-    MonitorElement const* me(meSet_->getME(iME));
+    MonitorElement const *me(meSet_->getME(iME));
 
-    if(!me)
-      throw cms::Exception("InvalidOperation") << "MESet::ConstBin::Ctor: ME " << iME << " does not exist for MESet " << meSet_->getPath();
+    if (!me)
+      throw cms::Exception("InvalidOperation")
+          << "MESet::ConstBin::Ctor: ME " << iME << " does not exist for MESet " << meSet_->getPath();
 
-    if(iBin == 1 && (kind == MonitorElement::DQM_KIND_TH2F || kind == MonitorElement::DQM_KIND_TPROFILE2D))
+    if (iBin == 1 && (kind == MonitorElement::DQM_KIND_TH2F || kind == MonitorElement::DQM_KIND_TPROFILE2D))
       iBin = me->getNbinsX() + 3;
 
     otype = binning::getObject(meSet_->getObjType(), iME);
   }
 
-  MESet::ConstBin&
-  MESet::ConstBin::operator=(ConstBin const& _rhs)
-  {
-    if(meSet_->getObjType() != _rhs.meSet_->getObjType() ||
-       meSet_->getBinType() != _rhs.meSet_->getBinType())
+  MESet::ConstBin &MESet::ConstBin::operator=(ConstBin const &_rhs) {
+    if (meSet_->getObjType() != _rhs.meSet_->getObjType() || meSet_->getBinType() != _rhs.meSet_->getBinType())
       throw cms::Exception("IncompatibleAssignment")
-        << "Iterator of otype " << _rhs.meSet_->getObjType() << " and btype " << _rhs.meSet_->getBinType()
-        << " to otype " << meSet_->getObjType() << " and btype " << meSet_->getBinType()
-        << " (" << _rhs.meSet_->getPath() << " to " << meSet_->getPath() << ")";
+          << "Iterator of otype " << _rhs.meSet_->getObjType() << " and btype " << _rhs.meSet_->getBinType()
+          << " to otype " << meSet_->getObjType() << " and btype " << meSet_->getBinType() << " ("
+          << _rhs.meSet_->getPath() << " to " << meSet_->getPath() << ")";
 
     iME = _rhs.iME;
     iBin = _rhs.iBin;
     otype = _rhs.otype;
-      
+
     return *this;
   }
 
-
-
-  MESet::const_iterator::const_iterator(MESet const& _meSet, DetId const& _id) :
-    bin_()
-  {
+  MESet::const_iterator::const_iterator(MESet const &_meSet, DetId const &_id) : bin_() {
     binning::ObjectType otype(_meSet.getObjType());
     unsigned iME(binning::findPlotIndex(otype, _id));
-    if(iME == unsigned(-1)) return;
+    if (iME == unsigned(-1))
+      return;
 
     binning::BinningType btype(_meSet.getBinType());
     int bin(binning::findBin2D(otype, btype, _id));
-    if(bin == 0) return;
+    if (bin == 0)
+      return;
 
     bin_.setMESet(_meSet);
     bin_.iME = iME;
@@ -389,144 +371,150 @@ namespace ecaldqm
     bin_.otype = otype;
   }
 
-  MESet::const_iterator&
-  MESet::const_iterator::operator++()
-  {
-    unsigned& iME(bin_.iME);
-    MESet const* meSet(bin_.getMESet());
+  MESet::const_iterator &MESet::const_iterator::operator++() {
+    unsigned &iME(bin_.iME);
+    MESet const *meSet(bin_.getMESet());
 
-    if(iME == unsigned(-1)) return *this;
+    if (iME == unsigned(-1))
+      return *this;
 
-    int& bin(bin_.iBin);
-    binning::ObjectType& otype(bin_.otype);
+    int &bin(bin_.iBin);
+    binning::ObjectType &otype(bin_.otype);
 
     MonitorElement::Kind kind(meSet->getKind());
-    MonitorElement const* me(meSet->getME(iME));
+    MonitorElement const *me(meSet->getME(iME));
 
     int nbinsX(me->getNbinsX());
-      
+
     ++bin;
-    if(bin == 1){
+    if (bin == 1) {
       iME = 0;
       me = meSet->getME(iME);
       nbinsX = me->getNbinsX();
-      if(kind == MonitorElement::DQM_KIND_TH2F || kind == MonitorElement::DQM_KIND_TPROFILE2D)
+      if (kind == MonitorElement::DQM_KIND_TH2F || kind == MonitorElement::DQM_KIND_TPROFILE2D)
         bin = nbinsX + 3;
       otype = binning::getObject(meSet->getObjType(), iME);
     }
 
-    if(bin % (nbinsX + 2) == nbinsX + 1){
-      if(kind == MonitorElement::DQM_KIND_TH1F || kind == MonitorElement::DQM_KIND_TPROFILE ||
-         bin / (nbinsX + 2) == me->getNbinsY()){
+    if (bin % (nbinsX + 2) == nbinsX + 1) {
+      if (kind == MonitorElement::DQM_KIND_TH1F || kind == MonitorElement::DQM_KIND_TPROFILE ||
+          bin / (nbinsX + 2) == me->getNbinsY()) {
         iME += 1;
         me = meSet->getME(iME);
-        if(!me){
+        if (!me) {
           iME = unsigned(-1);
           bin = -1;
           otype = binning::nObjType;
-        }
-        else{
+        } else {
           nbinsX = me->getNbinsX();
-          if(kind == MonitorElement::DQM_KIND_TH2F || kind == MonitorElement::DQM_KIND_TPROFILE2D)
+          if (kind == MonitorElement::DQM_KIND_TH2F || kind == MonitorElement::DQM_KIND_TPROFILE2D)
             bin = nbinsX + 3;
           else
             bin = 1;
-            
+
           otype = binning::getObject(meSet->getObjType(), iME);
         }
-      }
-      else 
+      } else
         bin += 2;
     }
 
     return *this;
   }
 
-  MESet::const_iterator&
-  MESet::const_iterator::toNextChannel()
-  {
-    if(!bin_.getMESet()) return *this;
-    do operator++();
-    while(bin_.iME != unsigned(-1) && !bin_.isChannel());
+  MESet::const_iterator &MESet::const_iterator::toNextChannel() {
+    if (!bin_.getMESet())
+      return *this;
+    do
+      operator++();
+    while (bin_.iME != unsigned(-1) && !bin_.isChannel());
 
     return *this;
   }
 
-  bool
-  MESet::const_iterator::up()
-  {
-    MESet const* meSet(bin_.getMESet());
-    if(bin_.iME == unsigned(-1) || bin_.iBin < 1) return false;
+  bool MESet::const_iterator::up() {
+    MESet const *meSet(bin_.getMESet());
+    if (bin_.iME == unsigned(-1) || bin_.iBin < 1)
+      return false;
 
     MonitorElement::Kind kind(meSet->getKind());
-    if(kind != MonitorElement::DQM_KIND_TH2F && kind != MonitorElement::DQM_KIND_TPROFILE2D) return false;
+    if (kind != MonitorElement::DQM_KIND_TH2F && kind != MonitorElement::DQM_KIND_TPROFILE2D)
+      return false;
 
-    MonitorElement const* me(meSet->getME(bin_.iME));
+    MonitorElement const *me(meSet->getME(bin_.iME));
 
-    if(bin_.iBin / (me->getNbinsX() + 2) >= me->getNbinsY()) return false;
+    if (bin_.iBin / (me->getNbinsX() + 2) >= me->getNbinsY())
+      return false;
 
     bin_.iBin += me->getNbinsX() + 2;
 
     return true;
   }
 
-  bool
-  MESet::const_iterator::down()
-  {
-    MESet const* meSet(bin_.getMESet());
-    if(bin_.iME == unsigned(-1) || bin_.iBin < 1) return false;
+  bool MESet::const_iterator::down() {
+    MESet const *meSet(bin_.getMESet());
+    if (bin_.iME == unsigned(-1) || bin_.iBin < 1)
+      return false;
 
     MonitorElement::Kind kind(meSet->getKind());
-    if(kind != MonitorElement::DQM_KIND_TH2F && kind != MonitorElement::DQM_KIND_TPROFILE2D) return false;
+    if (kind != MonitorElement::DQM_KIND_TH2F && kind != MonitorElement::DQM_KIND_TPROFILE2D)
+      return false;
 
-    MonitorElement const* me(meSet->getME(bin_.iME));
+    MonitorElement const *me(meSet->getME(bin_.iME));
 
-    if(bin_.iBin / (me->getNbinsX() + 2) <= 1) return false;
+    if (bin_.iBin / (me->getNbinsX() + 2) <= 1)
+      return false;
 
     bin_.iBin -= me->getNbinsX() + 2;
 
     return true;
   }
 
-  bool
-  MESet::const_iterator::left()
-  {
-    MESet const* meSet(bin_.getMESet());
-    if(bin_.iME == unsigned(-1) || bin_.iBin < 1) return false;
+  bool MESet::const_iterator::left() {
+    MESet const *meSet(bin_.getMESet());
+    if (bin_.iME == unsigned(-1) || bin_.iBin < 1)
+      return false;
 
     MonitorElement::Kind kind(meSet->getKind());
-    if(kind != MonitorElement::DQM_KIND_TH2F && kind != MonitorElement::DQM_KIND_TPROFILE2D) return false;
+    if (kind != MonitorElement::DQM_KIND_TH2F && kind != MonitorElement::DQM_KIND_TPROFILE2D)
+      return false;
 
-    MonitorElement const* me(meSet->getME(bin_.iME));
+    MonitorElement const *me(meSet->getME(bin_.iME));
 
-    if(bin_.iBin % (me->getNbinsX() + 2) <= 1) return false;
+    if (bin_.iBin % (me->getNbinsX() + 2) <= 1)
+      return false;
 
     bin_.iBin -= 1;
 
     return true;
   }
 
-  bool
-  MESet::const_iterator::right()
-  {
-    MESet const* meSet(bin_.getMESet());
-    if(bin_.iME == unsigned(-1) || bin_.iBin < 1) return false;
+  bool MESet::const_iterator::right() {
+    MESet const *meSet(bin_.getMESet());
+    if (bin_.iME == unsigned(-1) || bin_.iBin < 1)
+      return false;
 
     MonitorElement::Kind kind(meSet->getKind());
-    if(kind != MonitorElement::DQM_KIND_TH2F && kind != MonitorElement::DQM_KIND_TPROFILE2D) return false;
+    if (kind != MonitorElement::DQM_KIND_TH2F && kind != MonitorElement::DQM_KIND_TPROFILE2D)
+      return false;
 
-    MonitorElement const* me(meSet->getME(bin_.iME));
+    MonitorElement const *me(meSet->getME(bin_.iME));
 
-    if(bin_.iBin % (me->getNbinsX() + 2) >= me->getNbinsX()) return false;
+    if (bin_.iBin % (me->getNbinsX() + 2) >= me->getNbinsX())
+      return false;
 
     bin_.iBin += 1;
 
     return true;
   }
-}
+}  // namespace ecaldqm
 
-namespace boost
-{
-  template<> inline ecaldqm::MESet* new_clone<ecaldqm::MESet>(ecaldqm::MESet const& _s){ return _s.clone(); }
-  template<> void delete_clone<ecaldqm::MESet>(ecaldqm::MESet const* _s){ checked_delete(_s); }
-}
+namespace boost {
+  template <>
+  inline ecaldqm::MESet *new_clone<ecaldqm::MESet>(ecaldqm::MESet const &_s) {
+    return _s.clone();
+  }
+  template <>
+  void delete_clone<ecaldqm::MESet>(ecaldqm::MESet const *_s) {
+    checked_delete(_s);
+  }
+}  // namespace boost
diff --git a/DQM/EcalCommon/src/MESetBinningUtils.cc b/DQM/EcalCommon/src/MESetBinningUtils.cc
index 59fae3a3eb7f3..3b9f5e765b567 100644
--- a/DQM/EcalCommon/src/MESetBinningUtils.cc
+++ b/DQM/EcalCommon/src/MESetBinningUtils.cc
@@ -2,545 +2,581 @@
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "TPRegexp.h"
 
-namespace ecaldqm
-{
-  namespace binning
-  {
-    AxisSpecs
-    getBinning(ObjectType _otype, BinningType _btype, bool _isMap, int _axis, unsigned _iME)
-    {
-      if(_otype >= nObjType || _btype >= unsigned(nPresetBinnings))
-        return AxisSpecs(); // you are on your own
-
-      switch(_otype){
-      case kEB:
-        return getBinningEB_(_btype, _isMap, _axis);
-      case kEE:
-        return getBinningEE_(_btype, _isMap, 0, _axis);
-      case kEEm:
-        return getBinningEE_(_btype, _isMap, -1, _axis);
-      case kEEp:
-        return getBinningEE_(_btype, _isMap, 1, _axis);
-      case kSM:
-        return getBinningSM_(_btype, _isMap, _iME, _axis);
-      case kEBSM:
-        return getBinningSM_(_btype, _isMap, _iME + 9, _axis);
-      case kEESM:
-        if(_iME <= kEEmHigh) return getBinningSM_(_btype, _isMap, _iME, _axis);
-        else return getBinningSM_(_btype, _isMap, _iME + nEBDCC, _axis);
-      case kSMMEM:
-        return getBinningSMMEM_(_btype, _isMap, _iME, _axis);
-      case kEBSMMEM:
-        return getBinningSMMEM_(_btype, _isMap, _iME + nEEDCCMEM / 2, _axis);
-      case kEESMMEM: 
-        if(_iME <= kEEmHigh) return getBinningSMMEM_(_btype, _isMap, _iME, _axis);
-        else return getBinningSMMEM_(_btype, _isMap, _iME + nEBDCC, _axis);
-      case kEcal:
-        return getBinningEcal_(_btype, _isMap, _axis);
-      case kMEM:
-        return getBinningMEM_(_btype, _isMap, -1, _axis);
-      case kEBMEM:
-        return getBinningMEM_(_btype, _isMap, EcalBarrel, _axis);
-      case kEEMEM:
-        return getBinningMEM_(_btype, _isMap, EcalEndcap, _axis);
-      default:
-        return AxisSpecs();
+namespace ecaldqm {
+  namespace binning {
+    AxisSpecs getBinning(ObjectType _otype, BinningType _btype, bool _isMap, int _axis, unsigned _iME) {
+      if (_otype >= nObjType || _btype >= unsigned(nPresetBinnings))
+        return AxisSpecs();  // you are on your own
+
+      switch (_otype) {
+        case kEB:
+          return getBinningEB_(_btype, _isMap, _axis);
+        case kEE:
+          return getBinningEE_(_btype, _isMap, 0, _axis);
+        case kEEm:
+          return getBinningEE_(_btype, _isMap, -1, _axis);
+        case kEEp:
+          return getBinningEE_(_btype, _isMap, 1, _axis);
+        case kSM:
+          return getBinningSM_(_btype, _isMap, _iME, _axis);
+        case kEBSM:
+          return getBinningSM_(_btype, _isMap, _iME + 9, _axis);
+        case kEESM:
+          if (_iME <= kEEmHigh)
+            return getBinningSM_(_btype, _isMap, _iME, _axis);
+          else
+            return getBinningSM_(_btype, _isMap, _iME + nEBDCC, _axis);
+        case kSMMEM:
+          return getBinningSMMEM_(_btype, _isMap, _iME, _axis);
+        case kEBSMMEM:
+          return getBinningSMMEM_(_btype, _isMap, _iME + nEEDCCMEM / 2, _axis);
+        case kEESMMEM:
+          if (_iME <= kEEmHigh)
+            return getBinningSMMEM_(_btype, _isMap, _iME, _axis);
+          else
+            return getBinningSMMEM_(_btype, _isMap, _iME + nEBDCC, _axis);
+        case kEcal:
+          return getBinningEcal_(_btype, _isMap, _axis);
+        case kMEM:
+          return getBinningMEM_(_btype, _isMap, -1, _axis);
+        case kEBMEM:
+          return getBinningMEM_(_btype, _isMap, EcalBarrel, _axis);
+        case kEEMEM:
+          return getBinningMEM_(_btype, _isMap, EcalEndcap, _axis);
+        default:
+          return AxisSpecs();
       }
     }
 
-    int
-    findBin1D(ObjectType _otype, BinningType _btype, const DetId& _id)
-    {
-      switch(_otype){
-      case kSM:
-      case kEBSM:
-      case kEESM:
-        if(_btype == kSuperCrystal)
-          return towerId(_id);
-        else if(_btype == kTriggerTower){
-          unsigned tccid(tccId(_id));
-          if(tccid <= 36 || tccid >= 73){ // EE
-            unsigned bin(ttId(_id));
-            bool outer((tccid >= 19 && tccid <= 36) || (tccid >= 73 && tccid <= 90));
-            // For the following, the constants nTTInner and nTTOuter are defined in
-            // EcalDQMCommonUtils.h.
-            if(outer) bin += 2*nTTInner; // For outer TCCs, sets bin number to increment
-            // by twice the number of TTs in inner TCCs, because numbering of bins
-            // is in the order (inner1, inner2, outer1, outer2).
-            // ("inner"" := closer to the beam)
-            bin += (tccid % 2) * (outer ? nTTOuter : nTTInner); // Yields x-axis bin number
-            // in the format above; TTs in even-numbered TCCs are filled in inner1 or outer1,
-            // and those in odd-numbered TCC are filled in inner2 and outer2.
+    int findBin1D(ObjectType _otype, BinningType _btype, const DetId &_id) {
+      switch (_otype) {
+        case kSM:
+        case kEBSM:
+        case kEESM:
+          if (_btype == kSuperCrystal)
+            return towerId(_id);
+          else if (_btype == kTriggerTower) {
+            unsigned tccid(tccId(_id));
+            if (tccid <= 36 || tccid >= 73) {  // EE
+              unsigned bin(ttId(_id));
+              bool outer((tccid >= 19 && tccid <= 36) || (tccid >= 73 && tccid <= 90));
+              // For the following, the constants nTTInner and nTTOuter are defined in
+              // EcalDQMCommonUtils.h.
+              if (outer)
+                bin += 2 * nTTInner;  // For outer TCCs, sets bin number to increment
+              // by twice the number of TTs in inner TCCs, because numbering of bins
+              // is in the order (inner1, inner2, outer1, outer2).
+              // ("inner"" := closer to the beam)
+              bin += (tccid % 2) * (outer ? nTTOuter : nTTInner);  // Yields x-axis bin number
+              // in the format above; TTs in even-numbered TCCs are filled in inner1
+              // or outer1, and those in odd-numbered TCC are filled in inner2 and
+              // outer2.
+              return bin;
+            } else
+              return ttId(_id);
+          } else
+            break;
+        case kEcal:
+          if (_btype == kDCC)
+            return dccId(_id);
+          else if (_btype == kTCC)
+            return tccId(_id);
+          else
+            break;
+        case kEB:
+          if (_btype == kDCC)
+            return dccId(_id) - 9;
+          else if (_btype == kTCC)
+            return tccId(_id) - 36;
+          else
+            break;
+        case kEEm:
+          if (_btype == kDCC)
+            return dccId(_id);
+          else if (_btype == kTCC)
+            return tccId(_id);
+          else
+            break;
+        case kEEp:
+          if (_btype == kDCC)
+            return dccId(_id) - 45;
+          else if (_btype == kTCC)
+            return tccId(_id) - 72;
+          else
+            break;
+        case kEE:
+          if (_btype == kDCC) {
+            int bin(dccId(_id));
+            if (bin >= 46)
+              bin -= 36;
             return bin;
-          }
+          } else if (_btype == kTCC) {
+            int bin(tccId(_id));
+            if (bin >= 72)
+              bin -= 36;
+            return bin;
+          } else
+            break;
+        case kSMMEM:
+        case kEBSMMEM:
+        case kEESMMEM:
+          if (_btype == kCrystal)
+            return EcalPnDiodeDetId(_id).iPnId();
           else
-            return ttId(_id);
-        }
-        else
-          break;
-      case kEcal:
-        if(_btype == kDCC)
-          return dccId(_id);
-        else if(_btype == kTCC)
-          return tccId(_id);
-        else
-          break;
-      case kEB:
-        if(_btype == kDCC)
-          return dccId(_id) - 9;
-        else if(_btype == kTCC)
-          return tccId(_id) - 36;
-        else
-          break;
-      case kEEm:
-        if(_btype == kDCC)
-          return dccId(_id);
-        else if(_btype == kTCC)
-          return tccId(_id);
-        else
-          break;
-      case kEEp:
-        if(_btype == kDCC)
-          return dccId(_id) - 45;
-        else if(_btype == kTCC)
-          return tccId(_id) - 72;
-        else
-          break;
-      case kEE:
-        if(_btype == kDCC){
-          int bin(dccId(_id));
-          if(bin >= 46) bin -= 36;
-          return bin;
-        }
-        else if(_btype == kTCC){
-          int bin(tccId(_id));
-          if(bin >= 72) bin -= 36;
-          return bin;
-        }
-        else
-          break;
-      case kSMMEM:
-      case kEBSMMEM:
-      case kEESMMEM:
-        if(_btype == kCrystal)
-          return EcalPnDiodeDetId(_id).iPnId();
-        else
+            break;
+        default:
           break;
-      default:
-        break;
       }
 
       return 0;
     }
 
-    int
-    findBin1D(ObjectType _otype, BinningType _btype, const EcalElectronicsId& _id)
-    {
-      switch(_otype){
-      case kSM:
-      case kEBSM:
-      case kEESM:
-        if(_btype == kSuperCrystal)
-          return towerId(_id);
-        else if(_btype == kTriggerTower){
-          unsigned tccid(tccId(_id));
-          if(tccid <= 36 || tccid >= 73){ // EE
-            unsigned bin(ttId(_id));
-            bool outer((tccid >= 19 && tccid <= 36) || (tccid >= 73 && tccid <= 90));
-            // For the following, the constants nTTInner and nTTOuter are defined in
-            // EcalDQMCommonUtils.h.
-            if(outer) bin += 2*nTTInner; // For outer TCCs, sets bin number to increment
-            // by twice the number of TTs in inner TCCs, because numbering of bins
-            // is in the order (inner1, inner2, outer1, outer2).
-            // ("inner"" := closer to the beam)
-            bin += (tccid % 2) * (outer ? nTTOuter : nTTInner); // Yields x-axis bin number
-            // in the format above; TTs in even-numbered TCCs are filled in inner1 or outer1,
-            // and those in odd-numbered TCC are filled in inner2 and outer2.
-            return bin;
-          }
+    int findBin1D(ObjectType _otype, BinningType _btype, const EcalElectronicsId &_id) {
+      switch (_otype) {
+        case kSM:
+        case kEBSM:
+        case kEESM:
+          if (_btype == kSuperCrystal)
+            return towerId(_id);
+          else if (_btype == kTriggerTower) {
+            unsigned tccid(tccId(_id));
+            if (tccid <= 36 || tccid >= 73) {  // EE
+              unsigned bin(ttId(_id));
+              bool outer((tccid >= 19 && tccid <= 36) || (tccid >= 73 && tccid <= 90));
+              // For the following, the constants nTTInner and nTTOuter are defined in
+              // EcalDQMCommonUtils.h.
+              if (outer)
+                bin += 2 * nTTInner;  // For outer TCCs, sets bin number to increment
+              // by twice the number of TTs in inner TCCs, because numbering of bins
+              // is in the order (inner1, inner2, outer1, outer2).
+              // ("inner"" := closer to the beam)
+              bin += (tccid % 2) * (outer ? nTTOuter : nTTInner);  // Yields x-axis bin number
+              // in the format above; TTs in even-numbered TCCs are filled in inner1
+              // or outer1, and those in odd-numbered TCC are filled in inner2 and
+              // outer2.
+              return bin;
+            } else
+              return ttId(_id);
+          } else
+            break;
+        case kEcal:
+          if (_btype == kDCC)
+            return dccId(_id);
+          else if (_btype == kTCC)
+            return tccId(_id);
           else
-            return ttId(_id);
-        }
-        else
-          break;
-      case kEcal:
-        if(_btype == kDCC)
-          return dccId(_id);
-        else if(_btype == kTCC)
-          return tccId(_id);
-        else
-          break;
-      case kEB:
-        if(_btype == kDCC)
-          return dccId(_id) - 9;
-        else if(_btype == kTCC)
-          return tccId(_id) - 36;
-        else
-          break;
-      case kEEm:
-        if(_btype == kDCC)
-          return dccId(_id);
-        else if(_btype == kTCC)
-          return tccId(_id);
-        else
-          break;
-      case kEEp:
-        if(_btype == kDCC)
-          return dccId(_id) - 45;
-        else if(_btype == kTCC)
-          return tccId(_id) - 72;
-        else
-          break;
-      case kEE:
-        if(_btype == kDCC){
-          int bin(dccId(_id));
-          if(bin >= 46) bin -= 36;
-          return bin;
-        }
-        else if(_btype == kTCC){
-          int bin(tccId(_id));
-          if(bin >= 72) bin -= 36;
-          return bin;
-        }
-        else
+            break;
+        case kEB:
+          if (_btype == kDCC)
+            return dccId(_id) - 9;
+          else if (_btype == kTCC)
+            return tccId(_id) - 36;
+          else
+            break;
+        case kEEm:
+          if (_btype == kDCC)
+            return dccId(_id);
+          else if (_btype == kTCC)
+            return tccId(_id);
+          else
+            break;
+        case kEEp:
+          if (_btype == kDCC)
+            return dccId(_id) - 45;
+          else if (_btype == kTCC)
+            return tccId(_id) - 72;
+          else
+            break;
+        case kEE:
+          if (_btype == kDCC) {
+            int bin(dccId(_id));
+            if (bin >= 46)
+              bin -= 36;
+            return bin;
+          } else if (_btype == kTCC) {
+            int bin(tccId(_id));
+            if (bin >= 72)
+              bin -= 36;
+            return bin;
+          } else
+            break;
+        default:
           break;
-      default:
-        break;
       }
 
       return 0;
     }
 
-    int
-    findBin1D(ObjectType _otype, BinningType _btype, int _dcctccid)
-    {
-      if(_otype == kEcal && _btype == kDCC)
+    int findBin1D(ObjectType _otype, BinningType _btype, int _dcctccid) {
+      if (_otype == kEcal && _btype == kDCC)
         return _dcctccid;
-      else if(_otype == kEcal && _btype == kTCC)
+      else if (_otype == kEcal && _btype == kTCC)
         return _dcctccid;
-      if(_otype == kEB && _btype == kDCC)
+      if (_otype == kEB && _btype == kDCC)
         return _dcctccid - 9;
-      else if(_otype == kEB && _btype == kTCC)
+      else if (_otype == kEB && _btype == kTCC)
         return _dcctccid - 36;
-      else if(_otype == kEEm && _btype == kDCC)
+      else if (_otype == kEEm && _btype == kDCC)
         return _dcctccid;
-      else if(_otype == kEEm && _btype == kTCC)
+      else if (_otype == kEEm && _btype == kTCC)
         return _dcctccid;
-      else if(_otype == kEEp && _btype == kDCC)
+      else if (_otype == kEEp && _btype == kDCC)
         return _dcctccid - 45;
-      else if(_otype == kEEp && _btype == kTCC)
+      else if (_otype == kEEp && _btype == kTCC)
         return _dcctccid - 72;
-      else if(_otype == kEE && _btype == kDCC)
+      else if (_otype == kEE && _btype == kDCC)
         return _dcctccid <= 9 ? _dcctccid : _dcctccid - 36;
-      else if(_otype == kEE && _btype == kTCC)
+      else if (_otype == kEE && _btype == kTCC)
         return _dcctccid <= 36 ? _dcctccid : _dcctccid - 36;
 
       return 0;
     }
 
-    int
-    findBin2D(ObjectType _otype, BinningType _btype, const DetId& _id)
-    {
-      if(_otype >= nObjType || _btype >= unsigned(nPresetBinnings)) return 0;
-
-      switch(_btype){
-      case kCrystal:
-        return findBinCrystal_(_otype, _id);
-        break;
-      case kTriggerTower:
-        return findBinTriggerTower_(_otype, _id);
-        break;
-      case kSuperCrystal:
-        return findBinSuperCrystal_(_otype, _id);
-        break;
-      case kPseudoStrip:
-        return findBinPseudoStrip_(_otype, _id);
-        break;
-      case kRCT:
-        return findBinRCT_(_otype, _id);
-        break;
-      default :
+    int findBin2D(ObjectType _otype, BinningType _btype, const DetId &_id) {
+      if (_otype >= nObjType || _btype >= unsigned(nPresetBinnings))
         return 0;
+
+      switch (_btype) {
+        case kCrystal:
+          return findBinCrystal_(_otype, _id);
+          break;
+        case kTriggerTower:
+          return findBinTriggerTower_(_otype, _id);
+          break;
+        case kSuperCrystal:
+          return findBinSuperCrystal_(_otype, _id);
+          break;
+        case kPseudoStrip:
+          return findBinPseudoStrip_(_otype, _id);
+          break;
+        case kRCT:
+          return findBinRCT_(_otype, _id);
+          break;
+        default:
+          return 0;
       }
     }
 
-    int
-    findBin2D(ObjectType _otype, BinningType _btype, const EcalElectronicsId &_id)
-    {
-      if(_otype >= nObjType || _btype >= unsigned(nPresetBinnings)) return 0;
-
-      switch(_btype){
-      case kCrystal:
-        return findBinCrystal_(_otype, _id);
-        break;
-      case kSuperCrystal:
-        return findBinSuperCrystal_(_otype, _id);
-        break;
-      default :
+    int findBin2D(ObjectType _otype, BinningType _btype, const EcalElectronicsId &_id) {
+      if (_otype >= nObjType || _btype >= unsigned(nPresetBinnings))
         return 0;
+
+      switch (_btype) {
+        case kCrystal:
+          return findBinCrystal_(_otype, _id);
+          break;
+        case kSuperCrystal:
+          return findBinSuperCrystal_(_otype, _id);
+          break;
+        default:
+          return 0;
       }
     }
 
-    int
-    findBin2D(ObjectType _otype, BinningType _btype, int _dccid)
-    {
-      if(_otype != kEcal || _btype != kDCC) return 0;
+    int findBin2D(ObjectType _otype, BinningType _btype, int _dccid) {
+      if (_otype != kEcal || _btype != kDCC)
+        return 0;
 
       int nbinsX(9);
       unsigned iDCC(_dccid - 1);
       int xbin(0);
-      if(iDCC <= kEEmHigh || iDCC >= kEEpLow) xbin = (iDCC + 6) % nbinsX + 1;
-      else xbin = iDCC % nbinsX + 1;
+      if (iDCC <= kEEmHigh || iDCC >= kEEpLow)
+        xbin = (iDCC + 6) % nbinsX + 1;
+      else
+        xbin = iDCC % nbinsX + 1;
       int ybin(6 - iDCC / nbinsX);
 
       return (nbinsX + 2) * ybin + xbin;
     }
 
-    unsigned
-    findPlotIndex(ObjectType _otype, const DetId &_id)
-    {
-      if(getNObjects(_otype) == 1) return 0;
-
-      switch(_otype){
-      case kEcal3P:
-        if(_id.subdetId() == EcalBarrel) return 1;
-        else if(_id.subdetId() == EcalEndcap && zside(_id) > 0) return 2;
-        else if(_id.subdetId() == EcalTriggerTower){
-          if(!isEndcapTTId(_id)) return 1;
-          else{
-            if(zside(_id) > 0) return 2;
-            else return 0;
-          }
-        }
-        else return 0;
-
-      case kEcal2P:
-        if(_id.subdetId() == EcalBarrel) return 1;
-        else if(_id.subdetId() == EcalTriggerTower && !isEndcapTTId(_id)) return 1;
-        else return 0;
-
-      case kEE2P:
-        if(zside(_id) > 0) return 1;
-        else return 0;
-
-      case kMEM2P:
-        if(_id.subdetId() == EcalLaserPnDiode){
-          unsigned iDCC(dccId(_id) - 1);
-          if(iDCC >= kEBmLow && iDCC <= kEBpHigh) return 1;
-          else return 0;
-        }
-        else return -1;
+    unsigned findPlotIndex(ObjectType _otype, const DetId &_id) {
+      if (getNObjects(_otype) == 1)
+        return 0;
 
-      default:
-        return findPlotIndex(_otype, dccId(_id));
+      switch (_otype) {
+        case kEcal3P:
+          if (_id.subdetId() == EcalBarrel)
+            return 1;
+          else if (_id.subdetId() == EcalEndcap && zside(_id) > 0)
+            return 2;
+          else if (_id.subdetId() == EcalTriggerTower) {
+            if (!isEndcapTTId(_id))
+              return 1;
+            else {
+              if (zside(_id) > 0)
+                return 2;
+              else
+                return 0;
+            }
+          } else
+            return 0;
+
+        case kEcal2P:
+          if (_id.subdetId() == EcalBarrel)
+            return 1;
+          else if (_id.subdetId() == EcalTriggerTower && !isEndcapTTId(_id))
+            return 1;
+          else
+            return 0;
+
+        case kEE2P:
+          if (zside(_id) > 0)
+            return 1;
+          else
+            return 0;
+
+        case kMEM2P:
+          if (_id.subdetId() == EcalLaserPnDiode) {
+            unsigned iDCC(dccId(_id) - 1);
+            if (iDCC >= kEBmLow && iDCC <= kEBpHigh)
+              return 1;
+            else
+              return 0;
+          } else
+            return -1;
+
+        default:
+          return findPlotIndex(_otype, dccId(_id));
       }
     }
 
-    unsigned
-    findPlotIndex(ObjectType _otype, const EcalElectronicsId &_id)
-    {
-      if(getNObjects(_otype) == 1) return 0;
+    unsigned findPlotIndex(ObjectType _otype, const EcalElectronicsId &_id) {
+      if (getNObjects(_otype) == 1)
+        return 0;
 
       return findPlotIndex(_otype, _id.dccId());
     }
 
-    unsigned
-    findPlotIndex(ObjectType _otype, int _dcctccid, BinningType _btype/* = kDCC*/)
-    {
-      if(getNObjects(_otype) == 1) return 0;
+    unsigned findPlotIndex(ObjectType _otype, int _dcctccid, BinningType _btype /* = kDCC*/) {
+      if (getNObjects(_otype) == 1)
+        return 0;
 
       int iSM(_dcctccid - 1);
 
-      switch(_otype){
-      case kSM:
-        if(_btype == kPseudoStrip){
-          iSM = iSM <= kEEmTCCHigh ? (iSM + 1) % 18 / 2 : iSM >= kEEpTCCLow ? (iSM + 1 - 72) % 18 / 2 + 45: (iSM + 1) - kEEmTCCHigh;
-          return iSM;
-        } 
-        else return iSM;
-
-      case kEBSM:
-        return iSM - 9;
-
-      case kEESM:
-        if(iSM <= kEEmHigh) return iSM;
-        else return iSM - nEBDCC;
-
-      case kSMMEM:
-        return memDCCIndex(_dcctccid);
+      switch (_otype) {
+        case kSM:
+          if (_btype == kPseudoStrip) {
+            iSM = iSM <= kEEmTCCHigh ? (iSM + 1) % 18 / 2
+                                     : iSM >= kEEpTCCLow ? (iSM + 1 - 72) % 18 / 2 + 45 : (iSM + 1) - kEEmTCCHigh;
+            return iSM;
+          } else
+            return iSM;
+
+        case kEBSM:
+          return iSM - 9;
+
+        case kEESM:
+          if (iSM <= kEEmHigh)
+            return iSM;
+          else
+            return iSM - nEBDCC;
 
-      case kEBSMMEM:
-        return memDCCIndex(_dcctccid) - nEEDCCMEM / 2;
+        case kSMMEM:
+          return memDCCIndex(_dcctccid);
 
-      case kEESMMEM:
-        if(iSM <= kEEmHigh) return memDCCIndex(_dcctccid);
-        else return memDCCIndex(_dcctccid) - nEBDCC;
+        case kEBSMMEM:
+          return memDCCIndex(_dcctccid) - nEEDCCMEM / 2;
 
-      case kEcal2P:
-        if(_btype == kDCC){
-          if(iSM <= kEEmHigh || iSM >= kEEpLow) return 0;
-          else return 1;
-        }
-        else if(_btype == kTCC){
-          if(iSM <= kEEmTCCHigh || iSM >= kEEpTCCLow) return 0;
-          else return 1;
-        }
-        else{
-          if(iSM == EcalBarrel - 1) return 1;
-          else return 0;
-        }
+        case kEESMMEM:
+          if (iSM <= kEEmHigh)
+            return memDCCIndex(_dcctccid);
+          else
+            return memDCCIndex(_dcctccid) - nEBDCC;
+
+        case kEcal2P:
+          if (_btype == kDCC) {
+            if (iSM <= kEEmHigh || iSM >= kEEpLow)
+              return 0;
+            else
+              return 1;
+          } else if (_btype == kTCC) {
+            if (iSM <= kEEmTCCHigh || iSM >= kEEpTCCLow)
+              return 0;
+            else
+              return 1;
+          } else {
+            if (iSM == EcalBarrel - 1)
+              return 1;
+            else
+              return 0;
+          }
 
-      case kEcal3P:
-        if(_btype == kDCC){
-          if(iSM <= kEEmHigh) return 0;
-          else if(iSM <= kEBpHigh) return 1;
-          else return 2;
-        }
-        else if(_btype == kTCC){
-          if(iSM <= kEEmTCCHigh) return 0;
-          else if(iSM <= kEBTCCHigh) return 1;
-          else return 2;
-        }
-        else{
-          if(iSM == -EcalEndcap - 1) return 0;
-          else if(iSM == EcalBarrel - 1) return 1;
-          else return 2;
-        }
+        case kEcal3P:
+          if (_btype == kDCC) {
+            if (iSM <= kEEmHigh)
+              return 0;
+            else if (iSM <= kEBpHigh)
+              return 1;
+            else
+              return 2;
+          } else if (_btype == kTCC) {
+            if (iSM <= kEEmTCCHigh)
+              return 0;
+            else if (iSM <= kEBTCCHigh)
+              return 1;
+            else
+              return 2;
+          } else {
+            if (iSM == -EcalEndcap - 1)
+              return 0;
+            else if (iSM == EcalBarrel - 1)
+              return 1;
+            else
+              return 2;
+          }
 
-      case kEE2P:
-        if(_btype == kDCC){
-          if(iSM >= kEEpLow) return 1;
-          else return 0;
-        }
-        else{
-          if(iSM >= kEEpTCCLow) return 1;
-          else return 0;
-        }
+        case kEE2P:
+          if (_btype == kDCC) {
+            if (iSM >= kEEpLow)
+              return 1;
+            else
+              return 0;
+          } else {
+            if (iSM >= kEEpTCCLow)
+              return 1;
+            else
+              return 0;
+          }
 
-      case kMEM2P:
-        if(_btype == kDCC){
-          if(iSM <= kEEmHigh || iSM >= kEEpLow) return 0;
-          else return 1;
-        }
-        else if(_btype == kTCC) return -1;
-        else{
-          if(iSM == kEB) return 1;
-          else return 0;
-        }
-      default:
-        return -1;
+        case kMEM2P:
+          if (_btype == kDCC) {
+            if (iSM <= kEEmHigh || iSM >= kEEpLow)
+              return 0;
+            else
+              return 1;
+          } else if (_btype == kTCC)
+            return -1;
+          else {
+            if (iSM == kEB)
+              return 1;
+            else
+              return 0;
+          }
+        default:
+          return -1;
       }
     }
 
-    ObjectType
-    getObject(ObjectType _otype, unsigned _iObj)
-    {
-      switch(_otype){
-      case kEcal3P:
-        switch(_iObj){
-        case 0: return kEEm;
-        case 1: return kEB;
-        case 2: return kEEp;
-        default: return nObjType;
-        }
-      case kEcal2P:
-        switch(_iObj){
-        case 0: return kEE;
-        case 1: return kEB;
-        default: return nObjType;
-        }
-      case kEE2P:
-        switch(_iObj){
-        case 0: return kEEm;
-        case 1: return kEEp;
-        default: return nObjType;
-        }
-      case kMEM2P:
-        switch(_iObj){
-        case 0: return kEEMEM;
-        case 1: return kEBMEM;
-        default: return nObjType;
-        }
-      default:
-        return _otype;
+    ObjectType getObject(ObjectType _otype, unsigned _iObj) {
+      switch (_otype) {
+        case kEcal3P:
+          switch (_iObj) {
+            case 0:
+              return kEEm;
+            case 1:
+              return kEB;
+            case 2:
+              return kEEp;
+            default:
+              return nObjType;
+          }
+        case kEcal2P:
+          switch (_iObj) {
+            case 0:
+              return kEE;
+            case 1:
+              return kEB;
+            default:
+              return nObjType;
+          }
+        case kEE2P:
+          switch (_iObj) {
+            case 0:
+              return kEEm;
+            case 1:
+              return kEEp;
+            default:
+              return nObjType;
+          }
+        case kMEM2P:
+          switch (_iObj) {
+            case 0:
+              return kEEMEM;
+            case 1:
+              return kEBMEM;
+            default:
+              return nObjType;
+          }
+        default:
+          return _otype;
       }
     }
 
-    unsigned
-    getNObjects(ObjectType _otype)
-    {
-      switch(_otype){
-      case kSM:
-        return nDCC;
-      case kEBSM:
-        return nEBDCC;
-      case kEESM:
-        return nEEDCC;
-      case kSMMEM:
-        return nDCCMEM;
-      case kEBSMMEM:
-        return nEBDCC;
-      case kEESMMEM:
-        return nEEDCCMEM;
-      case kEcal2P:
-        return 2;
-      case kEcal3P:
-        return 3;
-      case kEE2P:
-        return 2;
-      case kMEM2P:
-        return 2;
-      default:
-        return 1;
+    unsigned getNObjects(ObjectType _otype) {
+      switch (_otype) {
+        case kSM:
+          return nDCC;
+        case kEBSM:
+          return nEBDCC;
+        case kEESM:
+          return nEEDCC;
+        case kSMMEM:
+          return nDCCMEM;
+        case kEBSMMEM:
+          return nEBDCC;
+        case kEESMMEM:
+          return nEEDCCMEM;
+        case kEcal2P:
+          return 2;
+        case kEcal3P:
+          return 3;
+        case kEE2P:
+          return 2;
+        case kMEM2P:
+          return 2;
+        default:
+          return 1;
       }
     }
 
-    bool
-    isValidIdBin(ObjectType _otype, BinningType _btype, unsigned _iME, int _bin)
-    {
-      if(_otype == kEEm || _otype == kEEp){
-        if(_btype == kCrystal || _btype == kTriggerTower)
+    bool isValidIdBin(ObjectType _otype, BinningType _btype, unsigned _iME, int _bin) {
+      if (_otype == kEEm || _otype == kEEp) {
+        if (_btype == kCrystal || _btype == kTriggerTower)
           return EEDetId::validDetId(_bin % 102, _bin / 102, 1);
-        else if(_btype == kSuperCrystal)
+        else if (_btype == kSuperCrystal)
           return EcalScDetId::validDetId(_bin % 22, _bin / 22, 1);
-      }
-      else if(_otype == kEE){
-        if(_btype == kCrystal || _btype == kTriggerTower){
+      } else if (_otype == kEE) {
+        if (_btype == kCrystal || _btype == kTriggerTower) {
           int ix(_bin % 202);
-          if(ix > 100) ix = (ix - 100) % 101;
+          if (ix > 100)
+            ix = (ix - 100) % 101;
           return EEDetId::validDetId(ix, _bin / 202, 1);
-        }
-        else if(_btype == kSuperCrystal){
+        } else if (_btype == kSuperCrystal) {
           int ix(_bin % 42);
-          if(ix > 20) ix = (ix - 20) % 21;
+          if (ix > 20)
+            ix = (ix - 20) % 21;
           return EcalScDetId::validDetId(ix, _bin / 42, 1);
         }
-      }
-      else if(_otype == kSM || _otype == kEESM){
+      } else if (_otype == kSM || _otype == kEESM) {
         unsigned iSM(_iME);
-        if(_otype == kEESM && iSM > kEEmHigh) iSM += nEBDCC;
+        if (_otype == kEESM && iSM > kEEmHigh)
+          iSM += nEBDCC;
 
-        if(iSM >= kEBmLow && iSM <= kEBpHigh) return true;
-    
-        if(_btype == kCrystal || _btype == kTriggerTower){
+        if (iSM >= kEBmLow && iSM <= kEBpHigh)
+          return true;
+
+        if (_btype == kCrystal || _btype == kTriggerTower) {
           int nX(nEESMX);
-          if(iSM == kEEm02 || iSM == kEEm08 || iSM == kEEp02 || iSM == kEEp08) nX = nEESMXExt;
-          if(iSM == kEEm01 || iSM == kEEm05 || iSM == kEEm09 || iSM == kEEp01 || iSM == kEEp05 || iSM == kEEp09) nX = nEESMXRed;
+          if (iSM == kEEm02 || iSM == kEEm08 || iSM == kEEp02 || iSM == kEEp08)
+            nX = nEESMXExt;
+          if (iSM == kEEm01 || iSM == kEEm05 || iSM == kEEm09 || iSM == kEEp01 || iSM == kEEp05 || iSM == kEEp09)
+            nX = nEESMXRed;
           int ix(_bin % (nX + 2) + xlow_(iSM));
           int iy(_bin / (nX + 2) + ylow_(iSM));
           int z(iSM <= kEEmHigh ? -1 : 1);
           return EEDetId::validDetId(ix, iy, 1) && iSM == dccId(EEDetId(ix, iy, z)) - 1;
-        }
-        else if(_btype == kSuperCrystal){
+        } else if (_btype == kSuperCrystal) {
           int nX(nEESMX / 5);
-          if(iSM == kEEm02 || iSM == kEEm08 || iSM == kEEp02 || iSM == kEEp08) nX = nEESMXExt / 5;
-          if(iSM == kEEm01 || iSM == kEEm05 || iSM == kEEm09 || iSM == kEEp01 || iSM == kEEp05 || iSM == kEEp09) nX = nEESMXRed / 5;
+          if (iSM == kEEm02 || iSM == kEEm08 || iSM == kEEp02 || iSM == kEEp08)
+            nX = nEESMXExt / 5;
+          if (iSM == kEEm01 || iSM == kEEm05 || iSM == kEEm09 || iSM == kEEp01 || iSM == kEEp05 || iSM == kEEp09)
+            nX = nEESMXRed / 5;
           int ix(_bin % (nX + 2) + xlow_(iSM) / 5);
           int iy(_bin / (nX + 2) + ylow_(iSM) / 5);
           int z(iSM <= kEEmHigh ? -1 : 1);
@@ -551,9 +587,7 @@ namespace ecaldqm
       return true;
     }
 
-    std::string
-    channelName(uint32_t _rawId, BinningType _btype/* = kDCC*/)
-    {
+    std::string channelName(uint32_t _rawId, BinningType _btype /* = kDCC*/) {
       // assume the following IDs for respective binning types:
       // Crystal: EcalElectronicsId
       // TriggerTower: EcalTriggerElectronicsId (pstrip and channel ignored)
@@ -563,203 +597,199 @@ namespace ecaldqm
 
       std::stringstream ss;
 
-      switch(_btype){
-      case kCrystal:
-        {
-          // EB-03 DCC 12 CCU 12 strip 3 xtal 1 (EB ieta -13 iphi 60) (TCC 39 TT 12 pstrip 3 chan 1)
+      switch (_btype) {
+        case kCrystal: {
+          // EB-03 DCC 12 CCU 12 strip 3 xtal 1 (EB ieta -13 iphi 60) (TCC 39 TT 12
+          // pstrip 3 chan 1)
           EcalElectronicsId eid(_rawId);
-          if(eid.towerId() >= 69)
+          if (eid.towerId() >= 69)
             ss << smName(eid.dccId()) << " DCC " << eid.dccId() << " CCU " << eid.towerId() << " PN " << eid.xtalId();
-          else{
-            ss << smName(eid.dccId()) << " DCC " << eid.dccId() << " CCU " << eid.towerId() << " strip " << eid.stripId() << " xtal " << eid.xtalId();
+          else {
+            ss << smName(eid.dccId()) << " DCC " << eid.dccId() << " CCU " << eid.towerId() << " strip "
+               << eid.stripId() << " xtal " << eid.xtalId();
 
-            if(eid.dccId() >= kEBmLow + 1 && eid.dccId() <= kEBpHigh + 1){
+            if (eid.dccId() >= kEBmLow + 1 && eid.dccId() <= kEBpHigh + 1) {
               EBDetId ebid(getElectronicsMap()->getDetId(eid));
               ss << " (EB ieta " << std::showpos << ebid.ieta() << std::noshowpos << " iphi " << ebid.iphi() << ")";
-            }
-            else{
+            } else {
               EEDetId eeid(getElectronicsMap()->getDetId(eid));
               ss << " (EE ix " << eeid.ix() << " iy " << eeid.iy() << ")";
             }
             EcalTriggerElectronicsId teid(getElectronicsMap()->getTriggerElectronicsId(eid));
-            ss << " (TCC " << teid.tccId() << " TT " << teid.ttId() << " pstrip " << teid.pseudoStripId() << " chan " << teid.channelId() << ")";
+            ss << " (TCC " << teid.tccId() << " TT " << teid.ttId() << " pstrip " << teid.pseudoStripId() << " chan "
+               << teid.channelId() << ")";
             break;
           }
         }
-      case kTriggerTower:
-        {
+        case kTriggerTower: {
           // EB-03 DCC 12 TCC 18 TT 3
           EcalTriggerElectronicsId teid(_rawId);
           EcalElectronicsId eid(getElectronicsMap()->getElectronicsId(teid));
           ss << smName(eid.dccId()) << " DCC " << eid.dccId() << " TCC " << teid.tccId() << " TT " << teid.ttId();
           break;
         }
-      case kSuperCrystal:
-        {
+        case kSuperCrystal: {
           // EB-03 DCC 12 CCU 18 (EBTT ieta -13 iphi 60)
           EcalElectronicsId eid(_rawId);
           ss << smName(eid.dccId()) << " DCC " << eid.dccId() << " CCU " << eid.towerId();
-          if(eid.dccId() >= kEBmLow + 1 && eid.dccId() <= kEBpHigh + 1){
+          if (eid.dccId() >= kEBmLow + 1 && eid.dccId() <= kEBpHigh + 1) {
             EcalTrigTowerDetId ttid(EBDetId(getElectronicsMap()->getDetId(eid)).tower());
             ss << " (EBTT ieta " << std::showpos << ttid.ieta() << std::noshowpos << " iphi " << ttid.iphi() << ")";
-          }
-          else{
+          } else {
             EcalScDetId scid(EEDetId(getElectronicsMap()->getDetId(eid)).sc());
             ss << " (EESC ix " << scid.ix() << " iy " << scid.iy() << ")";
           }
           break;
         }
-      case kTCC:
-        {
+        case kTCC: {
           // EB-03 TCC 12
           int tccid(_rawId - nDCC);
           int dccid(getElectronicsMap()->DCCid(getElectronicsMap()->getTrigTowerDetId(tccid, 1)));
           ss << smName(dccid) << " TCC " << (_rawId - nDCC);
           break;
         }
-      case kDCC:
-        ss << smName(_rawId);
-        break;
-      default:
-        break;
+        case kDCC:
+          ss << smName(_rawId);
+          break;
+        default:
+          break;
       }
 
       return ss.str();
     }
 
-    uint32_t
-    idFromName(std::string const& _name)
-    {
+    uint32_t idFromName(std::string const &_name) {
       TString name(_name);
-      TPRegexp re("(EB|EE)([+-][0-9][0-9])(?: TCC ([0-9]+)| DCC ([0-9]+) (CCU|TCC) ([0-9]+)(?: (TT|strip|PN) ([0-9]+)(?: xtal ([0-9]+)|)|)|)");
-      //            1      2                       3             4        5         6           7             8                9
+      TPRegexp re(
+          "(EB|EE)([+-][0-9][0-9])(?: TCC ([0-9]+)| DCC ([0-9]+) (CCU|TCC) "
+          "([0-9]+)(?: (TT|strip|PN) ([0-9]+)(?: xtal ([0-9]+)|)|)|)");
+      //            1      2                       3             4        5 6 7 8 9
       uint32_t rawId(0);
 
-      TObjArray* matches(re.MatchS(name));
+      TObjArray *matches(re.MatchS(name));
       matches->SetOwner(true);
-      if(matches->GetEntries() == 0) return 0;
-      else if(matches->GetEntries() == 3){
-        TString subdet(static_cast<TObjString*>(matches->At(1))->GetString());
-        if(subdet == "EB"){
-          int dccid(static_cast<TObjString*>(matches->At(2))->GetString().Atoi());
+      if (matches->GetEntries() == 0)
+        return 0;
+      else if (matches->GetEntries() == 3) {
+        TString subdet(static_cast<TObjString *>(matches->At(1))->GetString());
+        if (subdet == "EB") {
+          int dccid(static_cast<TObjString *>(matches->At(2))->GetString().Atoi());
           unsigned offset(0);
-          if(dccid < 0){
+          if (dccid < 0) {
             dccid *= -1;
             offset = kEEmLow;
-          }
-          else offset = kEEpLow;
+          } else
+            offset = kEEpLow;
           rawId = (dccid + 2) % 9 + 1 + offset;
-        }
-        else{
-          int dccid(static_cast<TObjString*>(matches->At(2))->GetString().Atoi());
-          if(dccid < 0) dccid *= -1;
-          else dccid += 18;
+        } else {
+          int dccid(static_cast<TObjString *>(matches->At(2))->GetString().Atoi());
+          if (dccid < 0)
+            dccid *= -1;
+          else
+            dccid += 18;
           rawId = kEBmLow + dccid;
         }
-      }
-      else if(matches->GetEntries() == 4)
-        rawId = static_cast<TObjString*>(matches->At(3))->GetString().Atoi() + nDCC;
-      else{
-        TString subtype(static_cast<TObjString*>(matches->At(5))->GetString());
-        if(subtype == "TCC"){
-          int tccid(static_cast<TObjString*>(matches->At(6))->GetString().Atoi());
-          int ttid(static_cast<TObjString*>(matches->At(8))->GetString().Atoi());
+      } else if (matches->GetEntries() == 4)
+        rawId = static_cast<TObjString *>(matches->At(3))->GetString().Atoi() + nDCC;
+      else {
+        TString subtype(static_cast<TObjString *>(matches->At(5))->GetString());
+        if (subtype == "TCC") {
+          int tccid(static_cast<TObjString *>(matches->At(6))->GetString().Atoi());
+          int ttid(static_cast<TObjString *>(matches->At(8))->GetString().Atoi());
           rawId = EcalTriggerElectronicsId(tccid, ttid, 1, 1).rawId();
-        }
-        else{
-          int dccid(static_cast<TObjString*>(matches->At(4))->GetString().Atoi());
-          int towerid(static_cast<TObjString*>(matches->At(6))->GetString().Atoi());
-          if(matches->GetEntries() == 7)
+        } else {
+          int dccid(static_cast<TObjString *>(matches->At(4))->GetString().Atoi());
+          int towerid(static_cast<TObjString *>(matches->At(6))->GetString().Atoi());
+          if (matches->GetEntries() == 7)
             rawId = EcalElectronicsId(dccid, towerid, 1, 1).rawId();
-          else{
-            TString chType(static_cast<TObjString*>(matches->At(7))->GetString());
-            int stripOrPNid(static_cast<TObjString*>(matches->At(8))->GetString().Atoi());
-            if(chType == "PN")
+          else {
+            TString chType(static_cast<TObjString *>(matches->At(7))->GetString());
+            int stripOrPNid(static_cast<TObjString *>(matches->At(8))->GetString().Atoi());
+            if (chType == "PN")
               rawId = EcalElectronicsId(dccid, towerid, 1, stripOrPNid).rawId();
-            else if(chType == "strip"){
-              int xtalid(static_cast<TObjString*>(matches->At(9))->GetString().Atoi());
+            else if (chType == "strip") {
+              int xtalid(static_cast<TObjString *>(matches->At(9))->GetString().Atoi());
               rawId = EcalElectronicsId(dccid, towerid, stripOrPNid, xtalid).rawId();
             }
             // case "TT" is already taken care of
           }
         }
       }
-  
+
       delete matches;
 
       return rawId;
     }
 
-    uint32_t
-    idFromBin(ObjectType _otype, BinningType _btype, unsigned _iME, int _bin)
-    {
-      if(_otype == kEB){
-        if(_btype == kCrystal){
+    uint32_t idFromBin(ObjectType _otype, BinningType _btype, unsigned _iME, int _bin) {
+      if (_otype == kEB) {
+        if (_btype == kCrystal) {
           int ieta(_bin / 362 - 86);
-          if(ieta >= 0) ++ieta;
+          if (ieta >= 0)
+            ++ieta;
           return EBDetId(ieta, _bin % 362);
-        }
-        else if(_btype == kTriggerTower || _btype == kSuperCrystal){
+        } else if (_btype == kTriggerTower || _btype == kSuperCrystal) {
           int ieta(_bin / 74 - 17);
           int z(1);
-          if(ieta <= 0){
+          if (ieta <= 0) {
             z = -1;
             ieta = -ieta + 1;
           }
           return EcalTrigTowerDetId(z, EcalBarrel, ieta, (_bin % 74 + 69) % 72 + 1);
         }
-      }
-      else if(_otype == kEEm || _otype == kEEp){
+      } else if (_otype == kEEm || _otype == kEEp) {
         int z(_otype == kEEm ? -1 : 1);
-        if(_btype == kCrystal || _btype == kTriggerTower)
+        if (_btype == kCrystal || _btype == kTriggerTower)
           return EEDetId(_bin % 102, _bin / 102, z).rawId();
-        else if(_btype == kSuperCrystal)
+        else if (_btype == kSuperCrystal)
           return EcalScDetId(_bin % 22, _bin / 22, z).rawId();
-      }
-      else if(_otype == kEE){
-        if(_btype == kCrystal || _btype == kTriggerTower){
+      } else if (_otype == kEE) {
+        if (_btype == kCrystal || _btype == kTriggerTower) {
           int ix(_bin % 202);
           int z(ix > 100 ? 1 : -1);
-          if(z > 0) ix = (ix - 100) % 101;
+          if (z > 0)
+            ix = (ix - 100) % 101;
           return EEDetId(ix, _bin / 202, z).rawId();
-        }
-        else if(_btype == kSuperCrystal){
+        } else if (_btype == kSuperCrystal) {
           int ix(_bin % 42);
           int z(ix > 20 ? 1 : -1);
-          if(z > 0) ix = (ix - 20) % 21;
+          if (z > 0)
+            ix = (ix - 20) % 21;
           return EcalScDetId(ix, _bin / 42, z).rawId();
         }
-      }
-      else if(_otype == kSM || _otype == kEBSM || _otype == kEESM){
+      } else if (_otype == kSM || _otype == kEBSM || _otype == kEESM) {
         unsigned iSM(_iME);
-        if(_otype == kEBSM) iSM += 9;
-        else if(_otype == kEESM && iSM > kEEmHigh) iSM += nEBDCC;
+        if (_otype == kEBSM)
+          iSM += 9;
+        else if (_otype == kEESM && iSM > kEEmHigh)
+          iSM += nEBDCC;
 
         int z(iSM <= kEBmHigh ? -1 : 1);
 
-        if((iSM >= kEBmLow && iSM <= kEBmHigh) || (iSM >= kEBpLow && iSM <= kEBpHigh)){
-          if(_btype == kCrystal){
+        if ((iSM >= kEBmLow && iSM <= kEBmHigh) || (iSM >= kEBpLow && iSM <= kEBpHigh)) {
+          if (_btype == kCrystal) {
             int iphi(((iSM - 9) % 18) * 20 + (z < 0 ? _bin / 87 : 21 - _bin / 87));
             int ieta((_bin % 87) * z);
             return EBDetId(ieta, iphi).rawId();
-          }
-          else if(_btype == kTriggerTower || _btype == kSuperCrystal){
+          } else if (_btype == kTriggerTower || _btype == kSuperCrystal) {
             int iphi((((iSM - 9) % 18) * 4 + (z < 0 ? _bin / 19 : 5 - _bin / 19) + 69) % 72 + 1);
             int ieta(_bin % 19);
             return EcalTrigTowerDetId(z, EcalBarrel, ieta, iphi).rawId();
           }
-        }
-        else{
-          if(_btype == kCrystal || _btype == kTriggerTower){
+        } else {
+          if (_btype == kCrystal || _btype == kTriggerTower) {
             int nX(nEESMX);
-            if(iSM == kEEm02 || iSM == kEEm08 || iSM == kEEp02 || iSM == kEEp08) nX = nEESMXExt;
-            if(iSM == kEEm01 || iSM == kEEm05 || iSM == kEEm09 || iSM == kEEp01 || iSM == kEEp05 || iSM == kEEp09) nX = nEESMXRed;
+            if (iSM == kEEm02 || iSM == kEEm08 || iSM == kEEp02 || iSM == kEEp08)
+              nX = nEESMXExt;
+            if (iSM == kEEm01 || iSM == kEEm05 || iSM == kEEm09 || iSM == kEEp01 || iSM == kEEp05 || iSM == kEEp09)
+              nX = nEESMXRed;
             return EEDetId(_bin % (nX + 2) + xlow_(iSM), _bin / (nX + 2) + ylow_(iSM), z).rawId();
-          }
-          else if(_btype == kSuperCrystal){
+          } else if (_btype == kSuperCrystal) {
             int nX(nEESMX / 5);
-            if(iSM == kEEm02 || iSM == kEEm08 || iSM == kEEp02 || iSM == kEEp08) nX = nEESMXExt / 5;
-            if(iSM == kEEm01 || iSM == kEEm05 || iSM == kEEm09 || iSM == kEEp01 || iSM == kEEp05 || iSM == kEEp09) nX = nEESMXRed / 5;
+            if (iSM == kEEm02 || iSM == kEEm08 || iSM == kEEp02 || iSM == kEEp08)
+              nX = nEESMXExt / 5;
+            if (iSM == kEEm01 || iSM == kEEm05 || iSM == kEEm09 || iSM == kEEp01 || iSM == kEEp05 || iSM == kEEp09)
+              nX = nEESMXRed / 5;
             return EcalScDetId(_bin % (nX + 2) + xlow_(iSM) / 5, _bin / (nX + 2) + ylow_(iSM) / 5, z).rawId();
           }
         }
@@ -768,37 +798,34 @@ namespace ecaldqm
       return 0;
     }
 
-    AxisSpecs
-    formAxis(edm::ParameterSet const& _axisParams)
-    {
+    AxisSpecs formAxis(edm::ParameterSet const &_axisParams) {
       AxisSpecs axis;
 
-      if(_axisParams.existsAs<std::vector<double> >("edges", false)){
-        std::vector<double> const& vEdges(_axisParams.getUntrackedParameter<std::vector<double> >("edges"));
+      if (_axisParams.existsAs<std::vector<double>>("edges", false)) {
+        std::vector<double> const &vEdges(_axisParams.getUntrackedParameter<std::vector<double>>("edges"));
         axis.nbins = vEdges.size() - 1;
         axis.edges = new float[vEdges.size()];
         std::copy(vEdges.begin(), vEdges.end(), axis.edges);
-      }
-      else{
+      } else {
         axis.nbins = _axisParams.getUntrackedParameter<int>("nbins");
         axis.low = _axisParams.getUntrackedParameter<double>("low");
         bool highSet(_axisParams.existsAs<double>("high", false));
         bool perBinSet(_axisParams.existsAs<double>("unitsPerBin", false));
-        if(highSet){
-          if(perBinSet) edm::LogWarning("EcalDQM") << "Maximum and bin width both set in an axis; using the former";
+        if (highSet) {
+          if (perBinSet)
+            edm::LogWarning("EcalDQM") << "Maximum and bin width both set in an axis; using the former";
           axis.high = _axisParams.getUntrackedParameter<double>("high");
-        }
-        else if(perBinSet)
+        } else if (perBinSet)
           axis.high = axis.low + _axisParams.getUntrackedParameter<double>("unitsPerBin") * axis.nbins;
         else
           axis.high = 0.;
       }
 
-      if(_axisParams.existsAs<std::vector<std::string> >("labels", false)){
-        std::vector<std::string> const& labels(_axisParams.getUntrackedParameter<std::vector<std::string> >("labels"));
-        if(int(labels.size()) == axis.nbins){
+      if (_axisParams.existsAs<std::vector<std::string>>("labels", false)) {
+        std::vector<std::string> const &labels(_axisParams.getUntrackedParameter<std::vector<std::string>>("labels"));
+        if (int(labels.size()) == axis.nbins) {
           axis.labels = new std::string[axis.nbins];
-          for(int iB(0); iB != axis.nbins; ++iB)
+          for (int iB(0); iB != axis.nbins; ++iB)
             axis.labels[iB] = labels[iB];
         }
       }
@@ -808,72 +835,104 @@ namespace ecaldqm
       return axis;
     }
 
-    void
-    fillAxisDescriptions(edm::ParameterSetDescription& _desc)
-    {
+    void fillAxisDescriptions(edm::ParameterSetDescription &_desc) {
       _desc.addUntracked<std::string>("title", "");
       _desc.addUntracked<int>("nbins", 0);
       _desc.addUntracked<double>("low", 0.);
-      _desc.addOptionalNode(edm::ParameterDescription<double>("high", 0., false) ^ edm::ParameterDescription<double>("unitsPerBin", 0., false), false);
-      _desc.addOptionalUntracked<std::vector<double> >("edges");
-      _desc.addOptionalUntracked<std::vector<std::string> >("labels");
+      _desc.addOptionalNode(edm::ParameterDescription<double>("high", 0., false) ^
+                                edm::ParameterDescription<double>("unitsPerBin", 0., false),
+                            false);
+      _desc.addOptionalUntracked<std::vector<double>>("edges");
+      _desc.addOptionalUntracked<std::vector<std::string>>("labels");
     }
 
-    ObjectType
-    translateObjectType(std::string const& _otypeName)
-    {
-      if(_otypeName == "EB") return kEB;
-      else if(_otypeName == "EE") return kEE;
-      else if(_otypeName == "EEm") return kEEm;
-      else if(_otypeName == "EEp") return kEEp;
-      else if(_otypeName == "SM") return kSM;
-      else if(_otypeName == "EBSM") return kEBSM;
-      else if(_otypeName == "EESM") return kEESM;
-      else if(_otypeName == "SMMEM") return kSMMEM;
-      else if(_otypeName == "EBSMMEM") return kEBSMMEM;
-      else if(_otypeName == "EESMMEM") return kEESMMEM;
-      else if(_otypeName == "Ecal") return kEcal;
-      else if(_otypeName == "MEM") return kMEM;
-      else if(_otypeName == "EBMEM") return kEBMEM;
-      else if(_otypeName == "EEMEM") return kEEMEM;
-      else if(_otypeName == "Ecal2P") return kEcal2P;
-      else if(_otypeName == "Ecal3P") return kEcal3P;
-      else if(_otypeName == "EE2P") return kEE2P;
-      else if(_otypeName == "MEM2P") return kMEM2P;
-      else if(_otypeName == "Channel") return kChannel;
-      else if(_otypeName == "None") return nObjType;
+    ObjectType translateObjectType(std::string const &_otypeName) {
+      if (_otypeName == "EB")
+        return kEB;
+      else if (_otypeName == "EE")
+        return kEE;
+      else if (_otypeName == "EEm")
+        return kEEm;
+      else if (_otypeName == "EEp")
+        return kEEp;
+      else if (_otypeName == "SM")
+        return kSM;
+      else if (_otypeName == "EBSM")
+        return kEBSM;
+      else if (_otypeName == "EESM")
+        return kEESM;
+      else if (_otypeName == "SMMEM")
+        return kSMMEM;
+      else if (_otypeName == "EBSMMEM")
+        return kEBSMMEM;
+      else if (_otypeName == "EESMMEM")
+        return kEESMMEM;
+      else if (_otypeName == "Ecal")
+        return kEcal;
+      else if (_otypeName == "MEM")
+        return kMEM;
+      else if (_otypeName == "EBMEM")
+        return kEBMEM;
+      else if (_otypeName == "EEMEM")
+        return kEEMEM;
+      else if (_otypeName == "Ecal2P")
+        return kEcal2P;
+      else if (_otypeName == "Ecal3P")
+        return kEcal3P;
+      else if (_otypeName == "EE2P")
+        return kEE2P;
+      else if (_otypeName == "MEM2P")
+        return kMEM2P;
+      else if (_otypeName == "Channel")
+        return kChannel;
+      else if (_otypeName == "None")
+        return nObjType;
 
       throw cms::Exception("InvalidConfiguration") << "No object type " << _otypeName << " defined";
     }
 
-    BinningType
-    translateBinningType(std::string const& _btypeName)
-    {
-      if(_btypeName == "Crystal") return kCrystal;
-      else if(_btypeName == "TriggerTower") return kTriggerTower;
-      else if(_btypeName == "SuperCrystal") return kSuperCrystal;
-      else if(_btypeName == "PseudoStrip") return kPseudoStrip;
-      else if(_btypeName == "TCC") return kTCC;
-      else if(_btypeName == "DCC") return kDCC;
-      else if(_btypeName == "ProjEta") return kProjEta;
-      else if(_btypeName == "ProjPhi") return kProjPhi;
-      else if(_btypeName == "RCT") return kRCT;
-      else if(_btypeName == "User") return kUser;
-      else if(_btypeName == "Report") return kReport;
-      else if(_btypeName == "Trend") return kTrend;
+    BinningType translateBinningType(std::string const &_btypeName) {
+      if (_btypeName == "Crystal")
+        return kCrystal;
+      else if (_btypeName == "TriggerTower")
+        return kTriggerTower;
+      else if (_btypeName == "SuperCrystal")
+        return kSuperCrystal;
+      else if (_btypeName == "PseudoStrip")
+        return kPseudoStrip;
+      else if (_btypeName == "TCC")
+        return kTCC;
+      else if (_btypeName == "DCC")
+        return kDCC;
+      else if (_btypeName == "ProjEta")
+        return kProjEta;
+      else if (_btypeName == "ProjPhi")
+        return kProjPhi;
+      else if (_btypeName == "RCT")
+        return kRCT;
+      else if (_btypeName == "User")
+        return kUser;
+      else if (_btypeName == "Report")
+        return kReport;
+      else if (_btypeName == "Trend")
+        return kTrend;
 
       throw cms::Exception("InvalidConfiguration") << "No binning type " << _btypeName << " defined";
     }
 
-    MonitorElement::Kind
-    translateKind(std::string const& _kindName)
-    {
-      if(_kindName == "REAL") return MonitorElement::DQM_KIND_REAL;
-      else if(_kindName == "TH1F") return MonitorElement::DQM_KIND_TH1F;
-      else if(_kindName == "TProfile") return MonitorElement::DQM_KIND_TPROFILE;
-      else if(_kindName == "TH2F") return MonitorElement::DQM_KIND_TH2F;
-      else if(_kindName == "TProfile2D") return MonitorElement::DQM_KIND_TPROFILE2D;
-      else return MonitorElement::DQM_KIND_INVALID;
+    MonitorElement::Kind translateKind(std::string const &_kindName) {
+      if (_kindName == "REAL")
+        return MonitorElement::DQM_KIND_REAL;
+      else if (_kindName == "TH1F")
+        return MonitorElement::DQM_KIND_TH1F;
+      else if (_kindName == "TProfile")
+        return MonitorElement::DQM_KIND_TPROFILE;
+      else if (_kindName == "TH2F")
+        return MonitorElement::DQM_KIND_TH2F;
+      else if (_kindName == "TProfile2D")
+        return MonitorElement::DQM_KIND_TPROFILE2D;
+      else
+        return MonitorElement::DQM_KIND_INVALID;
     }
-  }
-}
+  }  // namespace binning
+}  // namespace ecaldqm
diff --git a/DQM/EcalCommon/src/MESetBinningUtils2.cc b/DQM/EcalCommon/src/MESetBinningUtils2.cc
index 754eb064b2576..2f1810a1e3979 100644
--- a/DQM/EcalCommon/src/MESetBinningUtils2.cc
+++ b/DQM/EcalCommon/src/MESetBinningUtils2.cc
@@ -8,109 +8,140 @@
 
 #include "TMath.h"
 
-namespace ecaldqm
-{
-  namespace binning
-  {
-    int
-    xlow_(int _iSM)
-    {
-      switch(_iSM){
-      case kEEm01: case kEEp01: return 20;
-      case kEEm02: case kEEp02: return 0;
-      case kEEm03: case kEEp03: return 0;
-      case kEEm04: case kEEp04: return 5;
-      case kEEm05: case kEEp05: return 35;
-      case kEEm06: case kEEp06: return 55;
-      case kEEm07: case kEEp07: return 60;
-      case kEEm08: case kEEp08: return 55;
-      case kEEm09: case kEEp09: return 50;
-      default: break;
+namespace ecaldqm {
+  namespace binning {
+    int xlow_(int _iSM) {
+      switch (_iSM) {
+        case kEEm01:
+        case kEEp01:
+          return 20;
+        case kEEm02:
+        case kEEp02:
+          return 0;
+        case kEEm03:
+        case kEEp03:
+          return 0;
+        case kEEm04:
+        case kEEp04:
+          return 5;
+        case kEEm05:
+        case kEEp05:
+          return 35;
+        case kEEm06:
+        case kEEp06:
+          return 55;
+        case kEEm07:
+        case kEEp07:
+          return 60;
+        case kEEm08:
+        case kEEp08:
+          return 55;
+        case kEEm09:
+        case kEEp09:
+          return 50;
+        default:
+          break;
       }
 
-      if(_iSM >= kEBmLow && _iSM <= kEBpHigh) return 0;
+      if (_iSM >= kEBmLow && _iSM <= kEBpHigh)
+        return 0;
 
       return 0;
     }
 
-    int
-    ylow_(int _iSM)
-    {
-      switch(_iSM){
-      case kEEm01: case kEEp01: case kEEm09: case kEEp09: return 60;
-      case kEEm02: case kEEp02: case kEEm08: case kEEp08: return 50;
-      case kEEm03: case kEEp03: case kEEm07: case kEEp07: return 25;
-      case kEEm04: case kEEp04: case kEEm06: case kEEp06: return 5;
-      case kEEm05: case kEEp05: return 0;
-      default: break;
+    int ylow_(int _iSM) {
+      switch (_iSM) {
+        case kEEm01:
+        case kEEp01:
+        case kEEm09:
+        case kEEp09:
+          return 60;
+        case kEEm02:
+        case kEEp02:
+        case kEEm08:
+        case kEEp08:
+          return 50;
+        case kEEm03:
+        case kEEp03:
+        case kEEm07:
+        case kEEp07:
+          return 25;
+        case kEEm04:
+        case kEEp04:
+        case kEEm06:
+        case kEEp06:
+          return 5;
+        case kEEm05:
+        case kEEp05:
+          return 0;
+        default:
+          break;
       }
 
-      if(_iSM >= kEBmLow && _iSM <= kEBmHigh) return ((_iSM - kEBmLow) % 18) * 20;
-      if(_iSM >= kEBpLow && _iSM <= kEBpHigh) return (-1 - ((_iSM - kEBpLow) % 18)) * 20;
+      if (_iSM >= kEBmLow && _iSM <= kEBmHigh)
+        return ((_iSM - kEBmLow) % 18) * 20;
+      if (_iSM >= kEBpLow && _iSM <= kEBpHigh)
+        return (-1 - ((_iSM - kEBpLow) % 18)) * 20;
 
       return 0;
     }
 
-    AxisSpecs
-    getBinningEB_(BinningType _btype, bool _isMap, int _axis)
-    {
+    AxisSpecs getBinningEB_(BinningType _btype, bool _isMap, int _axis) {
       AxisSpecs specs;
 
-      if(!_isMap){
-        switch(_btype){
-        case kTCC:
-          specs.nbins = 36;
-          specs.low = 9.;
-          specs.high = 45.;
-          specs.title = "iTCC";
-          break;
-        case kDCC:
-          specs.nbins = 36;
-          specs.low = 9.;
-          specs.high = 45.;
-          break;
-        case kProjEta:
-          specs.nbins = nEBEtaBins;
-          specs.low = -etaBound;
-          specs.high = etaBound;
-          specs.title = "eta";
-          break;
-        case kProjPhi:
-          specs.nbins = nPhiBins;
-          specs.low = -TMath::Pi() / 18.;
-          specs.high = TMath::Pi() * 35./18.;
-          specs.title = "phi";
-          break;
-        default:
-          break;
+      if (!_isMap) {
+        switch (_btype) {
+          case kTCC:
+            specs.nbins = 36;
+            specs.low = 9.;
+            specs.high = 45.;
+            specs.title = "iTCC";
+            break;
+          case kDCC:
+            specs.nbins = 36;
+            specs.low = 9.;
+            specs.high = 45.;
+            break;
+          case kProjEta:
+            specs.nbins = nEBEtaBins;
+            specs.low = -etaBound;
+            specs.high = etaBound;
+            specs.title = "eta";
+            break;
+          case kProjPhi:
+            specs.nbins = nPhiBins;
+            specs.low = -TMath::Pi() / 18.;
+            specs.high = TMath::Pi() * 35. / 18.;
+            specs.title = "phi";
+            break;
+          default:
+            break;
         }
-      }
-      else{
-        switch(_btype){
-        case kCrystal:
-          if(_axis == 1)
-            specs.nbins = 360;
-          else if(_axis == 2)
-            specs.nbins = 170;
-          break;
-        case kSuperCrystal:
-        case kTriggerTower:
-        case kPseudoStrip:
-          if(_axis == 1)
-            specs.nbins = 72;
-          else if(_axis == 2)
-            specs.nbins = 34;
-          break;
-        default:
-          return specs;
+      } else {
+        switch (_btype) {
+          case kCrystal:
+            if (_axis == 1)
+              specs.nbins = 360;
+            else if (_axis == 2)
+              specs.nbins = 170;
+            break;
+          case kSuperCrystal:
+          case kTriggerTower:
+          case kPseudoStrip:
+            if (_axis == 1)
+              specs.nbins = 72;
+            else if (_axis == 2)
+              specs.nbins = 34;
+            break;
+          default:
+            return specs;
         }
 
-        if(_axis == 1){
+        if (_axis == 1) {
           specs.low = 0.;
           specs.high = 360.;
           specs.title = "iphi";
-        }
-        else if(_axis == 2){
+        } else if (_axis == 2) {
           specs.low = -85.;
           specs.high = 85.;
           specs.title = "ieta";
@@ -120,72 +151,68 @@ namespace ecaldqm
       return specs;
     }
 
-    AxisSpecs
-    getBinningEE_(BinningType _btype, bool _isMap, int _zside, int _axis)
-    {
+    AxisSpecs getBinningEE_(BinningType _btype, bool _isMap, int _zside, int _axis) {
       AxisSpecs specs;
 
-      if(!_isMap){
-        switch(_btype){
-        case kTCC:
-          specs.nbins = _zside ? 36 : 72;
-          specs.low = 0.;
-          specs.high = _zside ? 36. : 72.;
-          specs.title = "iTCC";
-          break;
-        case kDCC:
-          specs.nbins = _zside ? 9 : 18;
-          specs.low = 0.;
-          specs.high = _zside ? 9. : 18.;
-          break;
-        case kProjEta:
-          if(_zside == 0){
-            specs.nbins = nEEEtaBins / (3. - etaBound) * 6.;
-            specs.low = -3.;
-            specs.high = 3.;
-          }
-          else{
-            specs.nbins = nEEEtaBins;
-            specs.low = _zside < 0 ? -3. : etaBound;
-            specs.high = _zside < 0 ? -etaBound : 3.;
-          }
-          specs.title = "eta";
-          break;
-        case kProjPhi:
-          specs.nbins = nPhiBins;
-          specs.low = -TMath::Pi() / 18.;
-          specs.high = TMath::Pi() * 35./18.;
-          specs.title = "phi";
-          break;
-        default:
-          break;
+      if (!_isMap) {
+        switch (_btype) {
+          case kTCC:
+            specs.nbins = _zside ? 36 : 72;
+            specs.low = 0.;
+            specs.high = _zside ? 36. : 72.;
+            specs.title = "iTCC";
+            break;
+          case kDCC:
+            specs.nbins = _zside ? 9 : 18;
+            specs.low = 0.;
+            specs.high = _zside ? 9. : 18.;
+            break;
+          case kProjEta:
+            if (_zside == 0) {
+              specs.nbins = nEEEtaBins / (3. - etaBound) * 6.;
+              specs.low = -3.;
+              specs.high = 3.;
+            } else {
+              specs.nbins = nEEEtaBins;
+              specs.low = _zside < 0 ? -3. : etaBound;
+              specs.high = _zside < 0 ? -etaBound : 3.;
+            }
+            specs.title = "eta";
+            break;
+          case kProjPhi:
+            specs.nbins = nPhiBins;
+            specs.low = -TMath::Pi() / 18.;
+            specs.high = TMath::Pi() * 35. / 18.;
+            specs.title = "phi";
+            break;
+          default:
+            break;
         }
-      }else{
-        switch(_btype){
-        case kCrystal:
-        case kTriggerTower:
-        case kPseudoStrip:
-          if(_axis == 1)
-            specs.nbins = _zside ? 100 : 200;
-              if(_axis == 2)
-                specs.nbins = 100;
-              break;
-        case kSuperCrystal:
-          if(_axis == 1)
-            specs.nbins = _zside ? 20 : 40;
-              if(_axis == 2)
-                specs.nbins = 20;
-              break;
-        default:
-          return specs;
+      } else {
+        switch (_btype) {
+          case kCrystal:
+          case kTriggerTower:
+          case kPseudoStrip:
+            if (_axis == 1)
+              specs.nbins = _zside ? 100 : 200;
+            if (_axis == 2)
+              specs.nbins = 100;
+            break;
+          case kSuperCrystal:
+            if (_axis == 1)
+              specs.nbins = _zside ? 20 : 40;
+            if (_axis == 2)
+              specs.nbins = 20;
+            break;
+          default:
+            return specs;
         }
 
-        if(_axis == 1){
+        if (_axis == 1) {
           specs.low = 0.;
           specs.high = _zside ? 100. : 200.;
           specs.title = "ix";
-        }
-        else if(_axis == 2){
+        } else if (_axis == 2) {
           specs.low = 0.;
           specs.high = 100.;
           specs.title = "iy";
@@ -195,77 +222,78 @@ namespace ecaldqm
       return specs;
     }
 
-    AxisSpecs
-    getBinningSM_(BinningType _btype, bool _isMap, unsigned _iObj, int _axis)
-    {
+    AxisSpecs getBinningSM_(BinningType _btype, bool _isMap, unsigned _iObj, int _axis) {
       AxisSpecs specs;
 
       unsigned iSM(_iObj);
 
       const bool isBarrel(iSM >= kEBmLow && iSM <= kEBpHigh);
 
-      if(!_isMap){
-        switch(_btype){
-        case kCrystal:
-          specs.nbins = isBarrel ? 1700 : getElectronicsMap()->dccConstituents(iSM + 1).size();
-          specs.low = 0.;
-          specs.high = specs.nbins;
-          specs.title = "crystal";
-          break;
-        case kTriggerTower:
-        case kPseudoStrip:
-          specs.nbins = isBarrel ? 68 : (2*nTTOuter + 2*nTTInner); // For EE: numbering of bins
-          // is in the order (inner1, inner2, outer1, outer2). ("inner"" := closer to the beam)
-          specs.low = 1.;
-          specs.high = specs.nbins + specs.low;
-          specs.title = "tower";
-          break;
-        case kSuperCrystal:
-          specs.nbins = isBarrel ? 68 : nSuperCrystals(iSM + 1);
-          specs.low = 1.;
-          specs.high = specs.nbins + specs.low;
-          specs.title = "tower";
-          break;
-        default:
-          break;
+      if (!_isMap) {
+        switch (_btype) {
+          case kCrystal:
+            specs.nbins = isBarrel ? 1700 : getElectronicsMap()->dccConstituents(iSM + 1).size();
+            specs.low = 0.;
+            specs.high = specs.nbins;
+            specs.title = "crystal";
+            break;
+          case kTriggerTower:
+          case kPseudoStrip:
+            specs.nbins = isBarrel ? 68 : (2 * nTTOuter + 2 * nTTInner);  // For EE: numbering of bins
+            // is in the order (inner1, inner2, outer1, outer2). ("inner"" := closer
+            // to the beam)
+            specs.low = 1.;
+            specs.high = specs.nbins + specs.low;
+            specs.title = "tower";
+            break;
+          case kSuperCrystal:
+            specs.nbins = isBarrel ? 68 : nSuperCrystals(iSM + 1);
+            specs.low = 1.;
+            specs.high = specs.nbins + specs.low;
+            specs.title = "tower";
+            break;
+          default:
+            break;
         }
-      }else{
+      } else {
         int nEEX(nEESMX);
         int nEEY(nEESMY);
-        if(iSM == kEEm02 || iSM == kEEm08 || iSM == kEEp02 || iSM == kEEp08) nEEX = nEESMXExt;
-        if(iSM == kEEm01 || iSM == kEEm05 || iSM == kEEm09 || iSM == kEEp01 || iSM == kEEp05 || iSM == kEEp09) nEEX = nEESMXRed;
-        if(iSM == kEEm03 || iSM == kEEm07 || iSM == kEEp03 || iSM == kEEp07) nEEY = nEESMYRed;
-
-        switch(_btype){
-        case kCrystal:
-          if(_axis == 1)
-            specs.nbins = isBarrel ? nEBSMEta : nEEX;
-          else if(_axis == 2)
-            specs.nbins = isBarrel ? nEBSMPhi : nEEY;
-              break;
-        case kTriggerTower:
-        case kPseudoStrip:
-          if(_axis == 1)
-            specs.nbins = isBarrel ? nEBSMEta / 5 : nEEX;
-          else if(_axis == 2)
-            specs.nbins = isBarrel ? nEBSMPhi / 5 : nEEY;
-              break;
-        case kSuperCrystal:
-          if(_axis == 1)
-            specs.nbins = isBarrel ? nEBSMEta / 5 : nEEX / 5;
-          else if(_axis == 2)
-            specs.nbins = isBarrel ? nEBSMPhi / 5 : nEEY / 5;
-              break;
-        default:
-          return specs;
+        if (iSM == kEEm02 || iSM == kEEm08 || iSM == kEEp02 || iSM == kEEp08)
+          nEEX = nEESMXExt;
+        if (iSM == kEEm01 || iSM == kEEm05 || iSM == kEEm09 || iSM == kEEp01 || iSM == kEEp05 || iSM == kEEp09)
+          nEEX = nEESMXRed;
+        if (iSM == kEEm03 || iSM == kEEm07 || iSM == kEEp03 || iSM == kEEp07)
+          nEEY = nEESMYRed;
+
+        switch (_btype) {
+          case kCrystal:
+            if (_axis == 1)
+              specs.nbins = isBarrel ? nEBSMEta : nEEX;
+            else if (_axis == 2)
+              specs.nbins = isBarrel ? nEBSMPhi : nEEY;
+            break;
+          case kTriggerTower:
+          case kPseudoStrip:
+            if (_axis == 1)
+              specs.nbins = isBarrel ? nEBSMEta / 5 : nEEX;
+            else if (_axis == 2)
+              specs.nbins = isBarrel ? nEBSMPhi / 5 : nEEY;
+            break;
+          case kSuperCrystal:
+            if (_axis == 1)
+              specs.nbins = isBarrel ? nEBSMEta / 5 : nEEX / 5;
+            else if (_axis == 2)
+              specs.nbins = isBarrel ? nEBSMPhi / 5 : nEEY / 5;
+            break;
+          default:
+            return specs;
         }
 
-        if(_axis == 1){
+        if (_axis == 1) {
           specs.low = xlow_(iSM);
           specs.high = specs.low + (isBarrel ? nEBSMEta : nEEX);
           specs.title = isBarrel ? (iSM < kEBpLow ? "-ieta" : "ieta") : "ix";
-        }
-        else if(_axis == 2){
+        } else if (_axis == 2) {
           specs.low = ylow_(iSM);
           specs.high = specs.low + (isBarrel ? nEBSMPhi : nEEY);
           specs.title = isBarrel ? "iphi" : "iy";
@@ -275,23 +303,23 @@ namespace ecaldqm
       return specs;
     }
 
-    AxisSpecs
-    getBinningSMMEM_(BinningType _btype, bool _isMap, unsigned _iObj, int _axis)
-    {
+    AxisSpecs getBinningSMMEM_(BinningType _btype, bool _isMap, unsigned _iObj, int _axis) {
       AxisSpecs specs;
 
       unsigned iSM(memDCCId(_iObj) - 1);
 
-      if(iSM == unsigned(-1) || _btype != kCrystal) return specs;
+      if (iSM == unsigned(-1) || _btype != kCrystal)
+        return specs;
 
-      if(_axis == 1){
+      if (_axis == 1) {
         specs.nbins = 10;
         specs.low = 0.;
         specs.high = 10.;
-        if(_isMap) specs.title = "pseudo-strip";
-        else specs.title = "iPN";
-      }
-      else if(_axis == 2){
+        if (_isMap)
+          specs.title = "pseudo-strip";
+        else
+          specs.title = "iPN";
+      } else if (_axis == 2) {
         specs.nbins = 1;
         specs.low = 0.;
         specs.high = 5.;
@@ -301,99 +329,94 @@ namespace ecaldqm
       return specs;
     }
 
-    AxisSpecs
-    getBinningEcal_(BinningType _btype, bool _isMap, int _axis)
-    {
+    AxisSpecs getBinningEcal_(BinningType _btype, bool _isMap, int _axis) {
       AxisSpecs specs;
 
-      if(!_isMap){
-        switch(_btype){
-        case kTCC:
-          specs.nbins = 108;
-          specs.low = 0.;
-          specs.high = 108.;
-          specs.title = "iTCC";
-          break;
-        case kDCC:
-          specs.nbins = 54;
-          specs.low = 0.;
-          specs.high = 54.;
-          specs.title = "iDCC";
-          break;
-        case kProjEta:
-          specs.nbins = nEBEtaBins + 2 * nEEEtaBins;
-          specs.edges = new float[specs.nbins + 1];
-          for(int i(0); i <= nEEEtaBins; i++)
-            specs.edges[i] = -3. + (3. - etaBound) / nEEEtaBins * i;
-          for(int i(1); i <= nEBEtaBins; i++)
-            specs.edges[i + nEEEtaBins] = -etaBound + 2. * etaBound / nEBEtaBins * i;
-          for(int i(1); i <= nEEEtaBins; i++)
-            specs.edges[i + nEEEtaBins + nEBEtaBins] = etaBound + (3. - etaBound) / nEEEtaBins * i;
-          specs.title = "eta";
-          break;
-        case kProjPhi:
-          specs.nbins = nPhiBins;
-          specs.low = -TMath::Pi() / 18.;
-          specs.high = TMath::Pi() * 35./18.;
-          specs.title = "phi";
-          break;
-        default:
-          break;
-        }
-      }
-      else{
-        switch(_btype){
-        case kDCC:
-          if(_axis == 1){
-            specs.nbins = 9;
+      if (!_isMap) {
+        switch (_btype) {
+          case kTCC:
+            specs.nbins = 108;
             specs.low = 0.;
-            specs.high = 9.;
-          }
-          else if(_axis == 2){
-            specs.nbins = 6;
-            specs.low = 0.;
-            specs.high = 6.;
-          }
-          break;
-        case kRCT:
-          if(_axis == 1){
-            specs.nbins = 64;
-            specs.low = -32.;
-            specs.high = 32.;
-            specs.title = "RCT iEta";
-          }
-          else if(_axis == 2){
-            specs.nbins = 72;
+            specs.high = 108.;
+            specs.title = "iTCC";
+            break;
+          case kDCC:
+            specs.nbins = 54;
             specs.low = 0.;
-            specs.high = 72.;
-            specs.title = "RCT Phi";
-          }
-          break;
-        default:
-          break;
+            specs.high = 54.;
+            specs.title = "iDCC";
+            break;
+          case kProjEta:
+            specs.nbins = nEBEtaBins + 2 * nEEEtaBins;
+            specs.edges = new float[specs.nbins + 1];
+            for (int i(0); i <= nEEEtaBins; i++)
+              specs.edges[i] = -3. + (3. - etaBound) / nEEEtaBins * i;
+            for (int i(1); i <= nEBEtaBins; i++)
+              specs.edges[i + nEEEtaBins] = -etaBound + 2. * etaBound / nEBEtaBins * i;
+            for (int i(1); i <= nEEEtaBins; i++)
+              specs.edges[i + nEEEtaBins + nEBEtaBins] = etaBound + (3. - etaBound) / nEEEtaBins * i;
+            specs.title = "eta";
+            break;
+          case kProjPhi:
+            specs.nbins = nPhiBins;
+            specs.low = -TMath::Pi() / 18.;
+            specs.high = TMath::Pi() * 35. / 18.;
+            specs.title = "phi";
+            break;
+          default:
+            break;
+        }
+      } else {
+        switch (_btype) {
+          case kDCC:
+            if (_axis == 1) {
+              specs.nbins = 9;
+              specs.low = 0.;
+              specs.high = 9.;
+            } else if (_axis == 2) {
+              specs.nbins = 6;
+              specs.low = 0.;
+              specs.high = 6.;
+            }
+            break;
+          case kRCT:
+            if (_axis == 1) {
+              specs.nbins = 64;
+              specs.low = -32.;
+              specs.high = 32.;
+              specs.title = "RCT iEta";
+            } else if (_axis == 2) {
+              specs.nbins = 72;
+              specs.low = 0.;
+              specs.high = 72.;
+              specs.title = "RCT Phi";
+            }
+            break;
+          default:
+            break;
         }
       }
 
       return specs;
     }
 
-    AxisSpecs
-    getBinningMEM_(BinningType _btype, bool _isMap, int _subdet, int _axis)
-    {
+    AxisSpecs getBinningMEM_(BinningType _btype, bool _isMap, int _subdet, int _axis) {
       AxisSpecs specs;
 
-      if(_btype != kCrystal) return specs;
+      if (_btype != kCrystal)
+        return specs;
 
       int nbins(44);
-      if(_subdet == EcalBarrel) nbins = 36;
-      else if(_subdet == EcalEndcap) nbins = 8;
+      if (_subdet == EcalBarrel)
+        nbins = 36;
+      else if (_subdet == EcalEndcap)
+        nbins = 8;
 
-      if(_axis == 1){
+      if (_axis == 1) {
         specs.nbins = nbins;
         specs.low = 0.;
         specs.high = nbins;
-      }
-      else if(_axis == 2){
+      } else if (_axis == 2) {
         specs.nbins = 10;
         specs.low = 0.;
         specs.high = 10.;
@@ -403,110 +426,101 @@ namespace ecaldqm
       return specs;
     }
 
-    int
-    findBinCrystal_(ObjectType _otype, const DetId& _id, int _iSM/* = -1*/)
-    {
+    int findBinCrystal_(ObjectType _otype, const DetId &_id, int _iSM /* = -1*/) {
       int xbin(0), ybin(0);
       int nbinsX(0);
       int subdet(_id.subdetId());
 
-      if(subdet == EcalBarrel){
+      if (subdet == EcalBarrel) {
         EBDetId ebid(_id);
         int iphi(ebid.iphi());
         int ieta(ebid.ieta());
-        switch(_otype){
-        case kEB:
-          xbin = iphi;
-          ybin = ieta < 0 ? ieta + 86 : ieta + 85;
-          nbinsX = 360;
-          break;
-        case kSM:
-        case kEBSM:
-          xbin = ieta < 0 ? -ieta : ieta;
-          ybin = ieta < 0 ? (iphi - 1) % 20 + 1 : 20 - (iphi - 1) % 20;
-          nbinsX = nEBSMEta;
-          break;
-        default:
-          break;
+        switch (_otype) {
+          case kEB:
+            xbin = iphi;
+            ybin = ieta < 0 ? ieta + 86 : ieta + 85;
+            nbinsX = 360;
+            break;
+          case kSM:
+          case kEBSM:
+            xbin = ieta < 0 ? -ieta : ieta;
+            ybin = ieta < 0 ? (iphi - 1) % 20 + 1 : 20 - (iphi - 1) % 20;
+            nbinsX = nEBSMEta;
+            break;
+          default:
+            break;
         }
-      }
-      else if(subdet == EcalEndcap){
+      } else if (subdet == EcalEndcap) {
         EEDetId eeid(_id);
         int ix(eeid.ix());
         int iy(eeid.iy());
-        switch(_otype){
-        case kEE:
-          xbin = eeid.zside() < 0 ? ix : ix + 100;
-          ybin = iy;
-          nbinsX = 200;
-          break;
-        case kEEm:
-        case kEEp:
-          xbin = ix;
-          ybin = iy;
-          nbinsX = 100;
-          break;
-        case kSM:
-        case kEESM:
-          {
+        switch (_otype) {
+          case kEE:
+            xbin = eeid.zside() < 0 ? ix : ix + 100;
+            ybin = iy;
+            nbinsX = 200;
+            break;
+          case kEEm:
+          case kEEp:
+            xbin = ix;
+            ybin = iy;
+            nbinsX = 100;
+            break;
+          case kSM:
+          case kEESM: {
             int iSM(_iSM >= 0 ? _iSM : dccId(_id) - 1);
             xbin = ix - xlow_(iSM);
             ybin = iy - ylow_(iSM);
-            if(iSM == kEEm02 || iSM == kEEm08 || iSM == kEEp02 || iSM == kEEp08) 
+            if (iSM == kEEm02 || iSM == kEEm08 || iSM == kEEp02 || iSM == kEEp08)
               nbinsX = nEESMXExt;
-            else if(iSM == kEEm01 || iSM == kEEm05 || iSM == kEEm09 || iSM == kEEp01 || iSM == kEEp05 || iSM == kEEp09)
+            else if (iSM == kEEm01 || iSM == kEEm05 || iSM == kEEm09 || iSM == kEEp01 || iSM == kEEp05 || iSM == kEEp09)
               nbinsX = nEESMXRed;
             else
               nbinsX = nEESMX;
-          }
-          break;
-        default:
-          break;
+          } break;
+          default:
+            break;
         }
-      }
-      else if(subdet == EcalLaserPnDiode){
+      } else if (subdet == EcalLaserPnDiode) {
         EcalPnDiodeDetId pnid(_id);
-        switch(_otype){
-        case kSMMEM:
-        case kEBSMMEM:
-        case kEESMMEM:
-          xbin = pnid.iPnId();
-          ybin = 1;
-          nbinsX = 10;
-          break;
-        case kMEM:
-          xbin = memDCCIndex(dccId(_id)) + 1;
-          ybin = pnid.iPnId();
-          nbinsX = 44;
-          break;
-        case kEBMEM:
-          xbin = memDCCIndex(dccId(_id)) - 3;
-          ybin = pnid.iPnId();
-          nbinsX = 36;
-          break;
-        case kEEMEM:
-          xbin = memDCCIndex(dccId(_id)) + 1;
-          if(xbin > kEEmHigh + 1) xbin -= 36;
-          ybin = pnid.iPnId();
-          nbinsX = 8;
-          break;
-        default:
-          break;
+        switch (_otype) {
+          case kSMMEM:
+          case kEBSMMEM:
+          case kEESMMEM:
+            xbin = pnid.iPnId();
+            ybin = 1;
+            nbinsX = 10;
+            break;
+          case kMEM:
+            xbin = memDCCIndex(dccId(_id)) + 1;
+            ybin = pnid.iPnId();
+            nbinsX = 44;
+            break;
+          case kEBMEM:
+            xbin = memDCCIndex(dccId(_id)) - 3;
+            ybin = pnid.iPnId();
+            nbinsX = 36;
+            break;
+          case kEEMEM:
+            xbin = memDCCIndex(dccId(_id)) + 1;
+            if (xbin > kEEmHigh + 1)
+              xbin -= 36;
+            ybin = pnid.iPnId();
+            nbinsX = 8;
+            break;
+          default:
+            break;
         }
       }
 
       return (nbinsX + 2) * ybin + xbin;
     }
 
-    int
-    findBinCrystal_(ObjectType _otype, EcalElectronicsId const& _id)
-    {
+    int findBinCrystal_(ObjectType _otype, EcalElectronicsId const &_id) {
       return findBinCrystal_(_otype, getElectronicsMap()->getDetId(_id));
     }
 
-    int
-    findBinRCT_(ObjectType _otype, DetId const& _id)
-    {
+    int findBinRCT_(ObjectType _otype, DetId const &_id) {
       int xbin(0);
       int ybin(0);
       int nbinsX(0);
@@ -515,49 +529,48 @@ namespace ecaldqm
       int ieta(ttid.ieta());
       int iphi((ttid.iphi() + 1) % 72 + 1);
 
-      xbin = ieta < 0? ieta + 33: ieta + 32;
+      xbin = ieta < 0 ? ieta + 33 : ieta + 32;
       ybin = iphi;
       nbinsX = 64;
 
       return (nbinsX + 2) * ybin + xbin;
     }
 
-    int
-    findBinTriggerTower_(ObjectType _otype, DetId const& _id)
-    {
+    int findBinTriggerTower_(ObjectType _otype, DetId const &_id) {
       int xbin(0);
       int ybin(0);
       int nbinsX(0);
       int subdet(_id.subdetId());
 
-      if((subdet == EcalTriggerTower && !isEndcapTTId(_id)) || subdet == EcalBarrel){
+      if ((subdet == EcalTriggerTower && !isEndcapTTId(_id)) || subdet == EcalBarrel) {
         EcalTrigTowerDetId ttid;
-        if(subdet == EcalBarrel) ttid = EBDetId(_id).tower();
-        else ttid = _id;
+        if (subdet == EcalBarrel)
+          ttid = EBDetId(_id).tower();
+        else
+          ttid = _id;
 
         int ieta(ttid.ieta());
         int iphi((ttid.iphi() + 1) % 72 + 1);
-        switch(_otype){
-        case kEB:
-          xbin = iphi;
-          ybin = ieta < 0 ? ieta + 18 : ieta + 17;
-          nbinsX = 72;
-          break;
-        case kSM:
-        case kEBSM:
-          xbin = ieta < 0 ? -ieta : ieta;
-          ybin = ieta < 0 ? (iphi - 1) % 4 + 1 : 4 - (iphi - 1) % 4;
-          nbinsX = 17;
-          break;
-        case kEcal:
-          xbin = ieta < 0? ieta + 33: ieta + 32;
-          ybin = iphi > 70? iphi-70: iphi+2;
-          nbinsX = 64;
-        default:
-          break;
+        switch (_otype) {
+          case kEB:
+            xbin = iphi;
+            ybin = ieta < 0 ? ieta + 18 : ieta + 17;
+            nbinsX = 72;
+            break;
+          case kSM:
+          case kEBSM:
+            xbin = ieta < 0 ? -ieta : ieta;
+            ybin = ieta < 0 ? (iphi - 1) % 4 + 1 : 4 - (iphi - 1) % 4;
+            nbinsX = 17;
+            break;
+          case kEcal:
+            xbin = ieta < 0 ? ieta + 33 : ieta + 32;
+            ybin = iphi > 70 ? iphi - 70 : iphi + 2;
+            nbinsX = 64;
+          default:
+            break;
         }
-      }
-      else if(subdet == EcalEndcap){
+      } else if (subdet == EcalEndcap) {
         unsigned tccid(tccId(_id));
         unsigned iSM(tccid <= 36 ? tccid % 18 / 2 : (tccid - 72) % 18 / 2);
         return findBinCrystal_(_otype, _id, iSM);
@@ -566,18 +579,15 @@ namespace ecaldqm
       return (nbinsX + 2) * ybin + xbin;
     }
 
-    int 
-    findBinPseudoStrip_(ObjectType _otype, DetId const& _id){
-    
+    int findBinPseudoStrip_(ObjectType _otype, DetId const &_id) {
       int xbin(0);
       int ybin(0);
       int nbinsX(0);
       int subdet(_id.subdetId());
 
-      if((subdet == EcalTriggerTower && !isEndcapTTId(_id)) || subdet == EcalBarrel){
+      if ((subdet == EcalTriggerTower && !isEndcapTTId(_id)) || subdet == EcalBarrel) {
         return findBinTriggerTower_(_otype, _id);
-      }
-      else if(subdet == EcalEndcap){
+      } else if (subdet == EcalEndcap) {
         unsigned tccid(tccId(_id));
         unsigned iSM(tccid <= 36 ? tccid % 18 / 2 : (tccid - 72) % 18 / 2);
         return findBinCrystal_(_otype, _id, iSM);
@@ -586,163 +596,151 @@ namespace ecaldqm
       return (nbinsX + 2) * ybin + xbin;
     }
 
-    int
-    findBinSuperCrystal_(ObjectType _otype, const DetId& _id, int _iSM/* -1*/)
-    {
+    int findBinSuperCrystal_(ObjectType _otype, const DetId &_id, int _iSM /* -1*/) {
       int xbin(0);
       int ybin(0);
       int nbinsX(0);
       int subdet(_id.subdetId());
 
-      if(subdet == EcalBarrel){
+      if (subdet == EcalBarrel) {
         EBDetId ebid(_id);
         int iphi(ebid.iphi());
         int ieta(ebid.ieta());
-        switch(_otype){
-        case kEB:
-          xbin = (iphi - 1) / 5 + 1;
-          ybin = (ieta < 0 ? ieta + 85 : ieta + 84) / 5 + 1;
-          nbinsX = 72;
-          break;
-        case kSM:
-        case kEBSM:
-          xbin = (ieta < 0 ? -ieta - 1 : ieta - 1) / 5 + 1;
-          ybin = (ieta < 0 ? (iphi - 1) % 20 : 19 - (iphi - 1) % 20) / 5 + 1;
-          nbinsX = nEBSMEta / 5;
-          break;
-        default:
-          break;
+        switch (_otype) {
+          case kEB:
+            xbin = (iphi - 1) / 5 + 1;
+            ybin = (ieta < 0 ? ieta + 85 : ieta + 84) / 5 + 1;
+            nbinsX = 72;
+            break;
+          case kSM:
+          case kEBSM:
+            xbin = (ieta < 0 ? -ieta - 1 : ieta - 1) / 5 + 1;
+            ybin = (ieta < 0 ? (iphi - 1) % 20 : 19 - (iphi - 1) % 20) / 5 + 1;
+            nbinsX = nEBSMEta / 5;
+            break;
+          default:
+            break;
         }
-      }
-      else if(subdet == EcalEndcap){
-        if(isEcalScDetId(_id)){
+      } else if (subdet == EcalEndcap) {
+        if (isEcalScDetId(_id)) {
           EcalScDetId scid(_id);
           int ix(scid.ix());
           int iy(scid.iy());
-          switch(_otype){
-          case kEE:
-            {
+          switch (_otype) {
+            case kEE: {
               int zside(scid.zside());
               xbin = zside < 0 ? ix : ix + 20;
               ybin = iy;
               nbinsX = 40;
-            }
-            break;
-          case kEEm:
-          case kEEp:
-            xbin = ix;
-            ybin = iy;
-            nbinsX = 20;
-            break;
-          case kSM:
-          case kEESM:
-            {
+            } break;
+            case kEEm:
+            case kEEp:
+              xbin = ix;
+              ybin = iy;
+              nbinsX = 20;
+              break;
+            case kSM:
+            case kEESM: {
               int iSM(_iSM >= 0 ? _iSM : dccId(_id) - 1);
               xbin = ix - xlow_(iSM) / 5;
               ybin = iy - ylow_(iSM) / 5;
-              if(iSM == kEEm02 || iSM == kEEm08 || iSM == kEEp02 || iSM == kEEp08) 
+              if (iSM == kEEm02 || iSM == kEEm08 || iSM == kEEp02 || iSM == kEEp08)
                 nbinsX = nEESMXExt / 5;
-              else if(iSM == kEEm01 || iSM == kEEm05 || iSM == kEEm09 || iSM == kEEp01 || iSM == kEEp05 || iSM == kEEp09)
+              else if (iSM == kEEm01 || iSM == kEEm05 || iSM == kEEm09 || iSM == kEEp01 || iSM == kEEp05 ||
+                       iSM == kEEp09)
                 nbinsX = nEESMXRed / 5;
               else
                 nbinsX = nEESMX / 5;
-            }
-            break;
-          default:
-            break;
+            } break;
+            default:
+              break;
           }
-        }
-        else{
+        } else {
           EEDetId eeid(_id);
           int ix(eeid.ix());
           int iy(eeid.iy());
-          switch(_otype){
-          case kEE:
-            xbin = (eeid.zside() < 0 ? ix - 1 : ix + 99) / 5 + 1;
-            ybin = (iy - 1) / 5 + 1;
-            nbinsX = 40;
-            break;
-          case kEEm:
-          case kEEp:
-            xbin = (ix - 1) / 5 + 1;
-            ybin = (iy - 1) / 5 + 1;
-            nbinsX = 20;
-            break;
-          case kSM:
-          case kEESM:
-            {
+          switch (_otype) {
+            case kEE:
+              xbin = (eeid.zside() < 0 ? ix - 1 : ix + 99) / 5 + 1;
+              ybin = (iy - 1) / 5 + 1;
+              nbinsX = 40;
+              break;
+            case kEEm:
+            case kEEp:
+              xbin = (ix - 1) / 5 + 1;
+              ybin = (iy - 1) / 5 + 1;
+              nbinsX = 20;
+              break;
+            case kSM:
+            case kEESM: {
               int iSM(_iSM >= 0 ? _iSM : dccId(_id) - 1);
               xbin = (ix - xlow_(iSM) - 1) / 5 + 1;
               ybin = (iy - ylow_(iSM) - 1) / 5 + 1;
-              if(iSM == kEEm02 || iSM == kEEm08 || iSM == kEEp02 || iSM == kEEp08) 
+              if (iSM == kEEm02 || iSM == kEEm08 || iSM == kEEp02 || iSM == kEEp08)
                 nbinsX = nEESMXExt / 5;
-              else if(iSM == kEEm01 || iSM == kEEm05 || iSM == kEEm09 || iSM == kEEp01 || iSM == kEEp05 || iSM == kEEp09)
+              else if (iSM == kEEm01 || iSM == kEEm05 || iSM == kEEm09 || iSM == kEEp01 || iSM == kEEp05 ||
+                       iSM == kEEp09)
                 nbinsX = nEESMXRed / 5;
               else
                 nbinsX = nEESMX / 5;
-            }
-            break;
-          default:
-            break;
+            } break;
+            default:
+              break;
           }
         }
-      }
-      else if(subdet == EcalTriggerTower && !isEndcapTTId(_id)){
+      } else if (subdet == EcalTriggerTower && !isEndcapTTId(_id)) {
         EcalTrigTowerDetId ttid(_id);
         int ieta(ttid.ieta());
         int iphi((ttid.iphi() + 1) % 72 + 1);
-        switch(_otype){
-        case kEB:
-          xbin = iphi;
-          ybin = ieta < 0 ? ieta + 18 : ieta + 17;
-          nbinsX = 72;
-          break;
-        case kSM:
-        case kEBSM:
-          xbin = ieta < 0 ? -ieta : ieta;
-          ybin = ieta < 0 ? (iphi - 1) % 4 + 1 : 4 - (iphi - 1) % 4;
-          nbinsX = nEBSMEta / 5;
-          break;
-        default:
-          break;
+        switch (_otype) {
+          case kEB:
+            xbin = iphi;
+            ybin = ieta < 0 ? ieta + 18 : ieta + 17;
+            nbinsX = 72;
+            break;
+          case kSM:
+          case kEBSM:
+            xbin = ieta < 0 ? -ieta : ieta;
+            ybin = ieta < 0 ? (iphi - 1) % 4 + 1 : 4 - (iphi - 1) % 4;
+            nbinsX = nEBSMEta / 5;
+            break;
+          default:
+            break;
         }
       }
 
       return (nbinsX + 2) * ybin + xbin;
     }
 
-    int
-    findBinSuperCrystal_(ObjectType _otype, const EcalElectronicsId& _id)
-    {
+    int findBinSuperCrystal_(ObjectType _otype, const EcalElectronicsId &_id) {
       int xbin(0);
       int ybin(0);
       int nbinsX(0);
       int iDCC(_id.dccId() - 1);
 
-      if(iDCC >= kEBmLow && iDCC <= kEBpHigh){
+      if (iDCC >= kEBmLow && iDCC <= kEBpHigh) {
         unsigned towerid(_id.towerId());
         bool isEBm(iDCC <= kEBmHigh);
-        switch(_otype){
-        case kEB:
-          xbin = 4 * ((iDCC - 9) % 18) + (isEBm ? towerid - 1 : 68 - towerid) % 4 + 1;
-          ybin = (towerid - 1) / 4 * (isEBm ? -1 : 1) + (isEBm ? 18 : 17);
-          nbinsX = 72;
-          break;
-        case kSM:
-        case kEBSM:
-          xbin = (towerid - 1) / 4 + 1;
-          ybin = (isEBm ? towerid - 1 : 68 - towerid) % 4 + 1;
-          nbinsX = 17;
-          break;
-        default:
-          break;
+        switch (_otype) {
+          case kEB:
+            xbin = 4 * ((iDCC - 9) % 18) + (isEBm ? towerid - 1 : 68 - towerid) % 4 + 1;
+            ybin = (towerid - 1) / 4 * (isEBm ? -1 : 1) + (isEBm ? 18 : 17);
+            nbinsX = 72;
+            break;
+          case kSM:
+          case kEBSM:
+            xbin = (towerid - 1) / 4 + 1;
+            ybin = (isEBm ? towerid - 1 : 68 - towerid) % 4 + 1;
+            nbinsX = 17;
+            break;
+          default:
+            break;
         }
-      }
-      else{
+      } else {
         return findBinSuperCrystal_(_otype, EEDetId(getElectronicsMap()->getDetId(_id)).sc());
       }
 
       return (nbinsX + 2) * ybin + xbin;
     }
-  }
-}
+  }  // namespace binning
+}  // namespace ecaldqm
diff --git a/DQM/EcalCommon/src/MESetDet0D.cc b/DQM/EcalCommon/src/MESetDet0D.cc
index bb7f1a6aeb04f..7da47c2b379c9 100644
--- a/DQM/EcalCommon/src/MESetDet0D.cc
+++ b/DQM/EcalCommon/src/MESetDet0D.cc
@@ -1,41 +1,35 @@
 #include "DQM/EcalCommon/interface/MESetDet0D.h"
 
-namespace ecaldqm
-{
-  MESetDet0D::MESetDet0D(std::string const& _fullPath, binning::ObjectType _otype, binning::BinningType _btype, MonitorElement::Kind _kind) :
-    MESetEcal(_fullPath, _otype, _btype, _kind, 0, nullptr, nullptr)
-  {
-    switch(kind_){
-    case MonitorElement::DQM_KIND_REAL:
-      break;
-    default:
-      throw_("Unsupported MonitorElement kind");
+namespace ecaldqm {
+  MESetDet0D::MESetDet0D(std::string const &_fullPath,
+                         binning::ObjectType _otype,
+                         binning::BinningType _btype,
+                         MonitorElement::Kind _kind)
+      : MESetEcal(_fullPath, _otype, _btype, _kind, 0, nullptr, nullptr) {
+    switch (kind_) {
+      case MonitorElement::DQM_KIND_REAL:
+        break;
+      default:
+        throw_("Unsupported MonitorElement kind");
     }
   }
 
-  MESetDet0D::MESetDet0D(MESetDet0D const& _orig) :
-    MESetEcal(_orig)
-  {
-  }
+  MESetDet0D::MESetDet0D(MESetDet0D const &_orig) : MESetEcal(_orig) {}
 
-  MESetDet0D::~MESetDet0D()
-  {
-  }
+  MESetDet0D::~MESetDet0D() {}
 
-  MESet*
-  MESetDet0D::clone(std::string const& _path/* = ""*/) const
-  {
+  MESet *MESetDet0D::clone(std::string const &_path /* = ""*/) const {
     std::string path(path_);
-    if(_path != "") path_ = _path;
-    MESet* copy(new MESetDet0D(*this));
+    if (!_path.empty())
+      path_ = _path;
+    MESet *copy(new MESetDet0D(*this));
     path_ = path;
     return copy;
   }
 
-  void
-  MESetDet0D::fill(DetId const& _id, double _value, double, double)
-  {
-    if(!active_) return;
+  void MESetDet0D::fill(DetId const &_id, double _value, double, double) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -43,10 +37,9 @@ namespace ecaldqm
     mes_[iME]->Fill(_value);
   }
 
-  void
-  MESetDet0D::fill(EcalElectronicsId const& _id, double _value, double, double)
-  {
-    if(!active_) return;
+  void MESetDet0D::fill(EcalElectronicsId const &_id, double _value, double, double) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -54,10 +47,9 @@ namespace ecaldqm
     mes_[iME]->Fill(_value);
   }
 
-  void
-  MESetDet0D::fill(int _dcctccid, double _value, double, double)
-  {
-    if(!active_) return;
+  void MESetDet0D::fill(int _dcctccid, double _value, double, double) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
@@ -65,10 +57,9 @@ namespace ecaldqm
     mes_[iME]->Fill(_value);
   }
 
-  double
-  MESetDet0D::getBinContent(DetId const& _id, int) const
-  {
-    if(!active_) return 0.;
+  double MESetDet0D::getBinContent(DetId const &_id, int) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -76,10 +67,9 @@ namespace ecaldqm
     return mes_[iME]->getFloatValue();
   }
 
-  double
-  MESetDet0D::getBinContent(EcalElectronicsId const& _id, int) const
-  {
-    if(!active_) return 0.;
+  double MESetDet0D::getBinContent(EcalElectronicsId const &_id, int) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -87,10 +77,9 @@ namespace ecaldqm
     return mes_[iME]->getFloatValue();
   }
 
-  double
-  MESetDet0D::getBinContent(int _dcctccid, int) const
-  {
-    if(!active_) return 0.;
+  double MESetDet0D::getBinContent(int _dcctccid, int) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
@@ -98,11 +87,9 @@ namespace ecaldqm
     return mes_[iME]->getFloatValue();
   }
 
-  void
-  MESetDet0D::reset(double _value/* = 0.*/, double, double)
-  {
+  void MESetDet0D::reset(double _value /* = 0.*/, double, double) {
     unsigned nME(mes_.size());
-    for(unsigned iME(0); iME < nME; iME++)
+    for (unsigned iME(0); iME < nME; iME++)
       mes_[iME]->Fill(_value);
   }
-}
+}  // namespace ecaldqm
diff --git a/DQM/EcalCommon/src/MESetDet1D.cc b/DQM/EcalCommon/src/MESetDet1D.cc
index 39476b9d82a81..d4fce80619aed 100644
--- a/DQM/EcalCommon/src/MESetDet1D.cc
+++ b/DQM/EcalCommon/src/MESetDet1D.cc
@@ -2,82 +2,74 @@
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 
-namespace ecaldqm
-{
-
-  MESetDet1D::MESetDet1D(std::string const& _fullPath, binning::ObjectType _otype, binning::BinningType _btype, MonitorElement::Kind _kind, binning::AxisSpecs const* _yaxis/* = 0*/) :
-    MESetEcal(_fullPath, _otype, _btype, _kind, 1, nullptr, _yaxis, nullptr)
-  {
-    switch(kind_){
-    case MonitorElement::DQM_KIND_TH1F:
-    case MonitorElement::DQM_KIND_TPROFILE:
-    case MonitorElement::DQM_KIND_TH2F:
-    case MonitorElement::DQM_KIND_TPROFILE2D:
-      break;
-    default:
-      throw_("Unsupported MonitorElement kind");
+namespace ecaldqm {
+
+  MESetDet1D::MESetDet1D(std::string const &_fullPath,
+                         binning::ObjectType _otype,
+                         binning::BinningType _btype,
+                         MonitorElement::Kind _kind,
+                         binning::AxisSpecs const *_yaxis /* = 0*/)
+      : MESetEcal(_fullPath, _otype, _btype, _kind, 1, nullptr, _yaxis, nullptr) {
+    switch (kind_) {
+      case MonitorElement::DQM_KIND_TH1F:
+      case MonitorElement::DQM_KIND_TPROFILE:
+      case MonitorElement::DQM_KIND_TH2F:
+      case MonitorElement::DQM_KIND_TPROFILE2D:
+        break;
+      default:
+        throw_("Unsupported MonitorElement kind");
     }
   }
 
-  MESetDet1D::MESetDet1D(MESetDet1D const& _orig) :
-    MESetEcal(_orig)
-  {
-  }
+  MESetDet1D::MESetDet1D(MESetDet1D const &_orig) : MESetEcal(_orig) {}
 
-  MESetDet1D::~MESetDet1D()
-  {
-  }
+  MESetDet1D::~MESetDet1D() {}
 
-  MESet*
-  MESetDet1D::clone(std::string const& _path/* = ""*/) const
-  {
+  MESet *MESetDet1D::clone(std::string const &_path /* = ""*/) const {
     std::string path(path_);
-    if(_path != "") path_ = _path;
-    MESet* copy(new MESetDet1D(*this));
+    if (!_path.empty())
+      path_ = _path;
+    MESet *copy(new MESetDet1D(*this));
     path_ = path;
     return copy;
   }
 
-  void
-  MESetDet1D::book(DQMStore::IBooker& _ibooker)
-  {
+  void MESetDet1D::book(DQMStore::IBooker &_ibooker) {
     MESetEcal::book(_ibooker);
 
-    if(btype_ == binning::kDCC){
-      for(unsigned iME(0); iME < mes_.size(); iME++){
-        MonitorElement* me(mes_[iME]);
+    if (btype_ == binning::kDCC) {
+      for (unsigned iME(0); iME < mes_.size(); iME++) {
+        MonitorElement *me(mes_[iME]);
 
         binning::ObjectType actualObject(binning::getObject(otype_, iME));
-        if(actualObject == binning::kEB){
-          for(int iBin(1); iBin <= me->getNbinsX(); iBin++)
+        if (actualObject == binning::kEB) {
+          for (int iBin(1); iBin <= me->getNbinsX(); iBin++)
             me->setBinLabel(iBin, binning::channelName(iBin + kEBmLow));
-        }
-        else if(actualObject == binning::kEE){
-          for(int iBin(1); iBin <= me->getNbinsX() / 2; iBin++){
+        } else if (actualObject == binning::kEE) {
+          for (int iBin(1); iBin <= me->getNbinsX() / 2; iBin++) {
             me->setBinLabel(iBin, binning::channelName(iBin));
             me->setBinLabel(iBin + me->getNbinsX() / 2, binning::channelName(iBin + 45));
           }
-        }
-        else if(actualObject == binning::kEEm){
-          for(int iBin(1); iBin <= me->getNbinsX(); iBin++)
+        } else if (actualObject == binning::kEEm) {
+          for (int iBin(1); iBin <= me->getNbinsX(); iBin++)
             me->setBinLabel(iBin, binning::channelName(iBin));
-        }
-        else if(actualObject == binning::kEEp){
-          for(int iBin(1); iBin <= me->getNbinsX(); iBin++)
+        } else if (actualObject == binning::kEEp) {
+          for (int iBin(1); iBin <= me->getNbinsX(); iBin++)
             me->setBinLabel(iBin, binning::channelName(iBin + 45));
         }
       }
-    }
-    else if(btype_ == binning::kTriggerTower){
-      for(unsigned iME(0); iME < mes_.size(); iME++){
-        MonitorElement* me(mes_[iME]);
+    } else if (btype_ == binning::kTriggerTower) {
+      for (unsigned iME(0); iME < mes_.size(); iME++) {
+        MonitorElement *me(mes_[iME]);
 
         binning::ObjectType actualObject(binning::getObject(otype_, iME));
         unsigned dccid(0);
-        if(actualObject == binning::kSM && (iME <= kEEmHigh || iME >= kEEpLow)) dccid = iME + 1;
-        else if(actualObject == binning::kEESM) dccid = iME <= kEEmHigh ? iME + 1 : iME + 37;
+        if (actualObject == binning::kSM && (iME <= kEEmHigh || iME >= kEEpLow))
+          dccid = iME + 1;
+        else if (actualObject == binning::kEESM)
+          dccid = iME <= kEEmHigh ? iME + 1 : iME + 37;
 
-        if(dccid > 0){
+        if (dccid > 0) {
           std::stringstream ss;
           std::pair<unsigned, unsigned> inner(innerTCCs(iME + 1));
           std::pair<unsigned, unsigned> outer(outerTCCs(iME + 1));
@@ -85,23 +77,27 @@ namespace ecaldqm
           me->setBinLabel(1, ss.str());
           ss.str("");
           ss << "TCC" << inner.second << " TT1";
-          me->setBinLabel(1+nTTInner, ss.str());
+          me->setBinLabel(1 + nTTInner, ss.str());
           ss.str("");
           ss << "TCC" << outer.first << " TT1";
-          me->setBinLabel(1+2*nTTInner, ss.str());
+          me->setBinLabel(1 + 2 * nTTInner, ss.str());
           ss.str("");
           ss << "TCC" << outer.second << " TT1";
-          me->setBinLabel(1+2*nTTInner+nTTOuter, ss.str());
+          me->setBinLabel(1 + 2 * nTTInner + nTTOuter, ss.str());
           // Bins are numbered:
           // inner1:(1)-->(nTTInner)
           // inner2:(1+nTTInner)-->(1+nTTInner + nTTInner-1 = 2*nTTInner)
           // outer1:(1+2*nTTInner)-->(1+2*nTTInner+nTTOuter-1=2*nTTInner+nTTOuter)
-          // outer2:(1+2*nTTInner+nTTOuter)-->(1+2*nTTInner+nTTOuter + nTTOuter-1 = 2*nTTInner+2*nTTOuter)
+          // outer2:(1+2*nTTInner+nTTOuter)-->(1+2*nTTInner+nTTOuter + nTTOuter-1
+          // = 2*nTTInner+2*nTTOuter)
           int offset(0);
-          for(int iBin(4); iBin <= (2*nTTOuter + 2*nTTInner); iBin += 4){
-            if(iBin == 4+nTTInner) offset = nTTInner;
-            else if(iBin == 4+2*nTTInner) offset = 2*nTTInner;
-            else if(iBin == 4+2*nTTInner+nTTOuter) offset = 2*nTTInner+nTTOuter;
+          for (int iBin(4); iBin <= (2 * nTTOuter + 2 * nTTInner); iBin += 4) {
+            if (iBin == 4 + nTTInner)
+              offset = nTTInner;
+            else if (iBin == 4 + 2 * nTTInner)
+              offset = 2 * nTTInner;
+            else if (iBin == 4 + 2 * nTTInner + nTTOuter)
+              offset = 2 * nTTInner + nTTOuter;
             ss.str("");
             ss << iBin - offset;
             me->setBinLabel(iBin, ss.str());
@@ -111,10 +107,9 @@ namespace ecaldqm
     }
   }
 
-  void
-  MESetDet1D::fill(DetId const& _id, double _wy/* = 1.*/, double _w/* = 1.*/, double)
-  {
-    if(!active_) return;
+  void MESetDet1D::fill(DetId const &_id, double _wy /* = 1.*/, double _w /* = 1.*/, double) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -122,16 +117,15 @@ namespace ecaldqm
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
 
-    if(kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D)
+    if (kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D)
       fill_(iME, xbin, _wy, _w);
     else
       fill_(iME, xbin, _wy);
   }
 
-  void
-  MESetDet1D::fill(EcalElectronicsId const& _id, double _wy/* = 1.*/, double _w/* = 1.*/, double)
-  {
-    if(!active_) return;
+  void MESetDet1D::fill(EcalElectronicsId const &_id, double _wy /* = 1.*/, double _w /* = 1.*/, double) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -139,16 +133,15 @@ namespace ecaldqm
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
 
-    if(kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D)
+    if (kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D)
       fill_(iME, xbin, _wy, _w);
     else
       fill_(iME, xbin, _wy);
   }
 
-  void
-  MESetDet1D::fill(int _dcctccid, double _wy/* = 1.*/, double _w/* = 1.*/, double)
-  {
-    if(!active_) return;
+  void MESetDet1D::fill(int _dcctccid, double _wy /* = 1.*/, double _w /* = 1.*/, double) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
@@ -156,322 +149,307 @@ namespace ecaldqm
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _dcctccid));
 
-    if(kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D)
+    if (kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D)
       fill_(iME, xbin, _wy, _w);
     else
       fill_(iME, xbin, _wy);
   }
 
-  void
-  MESetDet1D::setBinContent(DetId const& _id, double _content)
-  {
-    if(!active_) return;
+  void MESetDet1D::setBinContent(DetId const &_id, double _content) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
 
-    if(kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D){
+    if (kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D) {
       int nbinsY(me->getTH1()->GetNbinsY());
-      for(int iY(1); iY <= nbinsY; iY++)
+      for (int iY(1); iY <= nbinsY; iY++)
         me->setBinContent(xbin, iY, _content);
-    }
-    else
+    } else
       me->setBinContent(xbin, _content);
   }
 
-  void
-  MESetDet1D::setBinContent(EcalElectronicsId const& _id, double _content)
-  {
-    if(!active_) return;
+  void MESetDet1D::setBinContent(EcalElectronicsId const &_id, double _content) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
 
-    if(kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D){
+    if (kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D) {
       int nbinsY(me->getTH1()->GetNbinsY());
-      for(int iY(1); iY <= nbinsY; iY++)
+      for (int iY(1); iY <= nbinsY; iY++)
         me->setBinContent(xbin, iY, _content);
-    }
-    else
+    } else
       me->setBinContent(xbin, _content);
   }
 
-  void
-  MESetDet1D::setBinContent(int _dcctccid, double _content)
-  {
-    if(!active_) return;
+  void MESetDet1D::setBinContent(int _dcctccid, double _content) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _dcctccid));
 
-    if(kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D){
+    if (kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D) {
       int nbinsY(me->getTH1()->GetNbinsY());
-      for(int iY(1); iY <= nbinsY; iY++)
+      for (int iY(1); iY <= nbinsY; iY++)
         me->setBinContent(xbin, iY, _content);
-    }
-    else
+    } else
       me->setBinContent(xbin, _content);
   }
 
-  void
-  MESetDet1D::setBinContent(DetId const& _id, int _ybin, double _content)
-  {
-    if(!active_) return;
-    if(kind_ != MonitorElement::DQM_KIND_TH2F && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESetDet1D::setBinContent(DetId const &_id, int _ybin, double _content) {
+    if (!active_)
+      return;
+    if (kind_ != MonitorElement::DQM_KIND_TH2F && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
     me->setBinContent(xbin, _ybin, _content);
   }
 
-  void
-  MESetDet1D::setBinContent(EcalElectronicsId const& _id, int _ybin, double _content)
-  {
-    if(!active_) return;
-    if(kind_ != MonitorElement::DQM_KIND_TH2F && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESetDet1D::setBinContent(EcalElectronicsId const &_id, int _ybin, double _content) {
+    if (!active_)
+      return;
+    if (kind_ != MonitorElement::DQM_KIND_TH2F && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
     me->setBinContent(xbin, _ybin, _content);
   }
 
-  void
-  MESetDet1D::setBinContent(int _dcctccid, int _ybin, double _content)
-  {
-    if(!active_) return;
-    if(kind_ != MonitorElement::DQM_KIND_TH2F && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESetDet1D::setBinContent(int _dcctccid, int _ybin, double _content) {
+    if (!active_)
+      return;
+    if (kind_ != MonitorElement::DQM_KIND_TH2F && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _dcctccid));
     me->setBinContent(xbin, _ybin, _content);
   }
 
-  void
-  MESetDet1D::setBinError(DetId const& _id, double _error)
-  {
-    if(!active_) return;
+  void MESetDet1D::setBinError(DetId const &_id, double _error) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
 
-    if(kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D){
+    if (kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D) {
       int nbinsY(me->getTH1()->GetNbinsY());
-      for(int iY(1); iY <= nbinsY; iY++)
+      for (int iY(1); iY <= nbinsY; iY++)
         me->setBinError(xbin, iY, _error);
-    }
-    else
+    } else
       me->setBinError(xbin, _error);
   }
 
-  void
-  MESetDet1D::setBinError(EcalElectronicsId const& _id, double _error)
-  {
-    if(!active_) return;
+  void MESetDet1D::setBinError(EcalElectronicsId const &_id, double _error) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
 
-    if(kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D){
+    if (kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D) {
       int nbinsY(me->getTH1()->GetNbinsY());
-      for(int iY(1); iY <= nbinsY; iY++)
+      for (int iY(1); iY <= nbinsY; iY++)
         me->setBinError(xbin, iY, _error);
-    }
-    else
+    } else
       me->setBinError(xbin, _error);
   }
 
-  void
-  MESetDet1D::setBinError(int _dcctccid, double _error)
-  {
-    if(!active_) return;
+  void MESetDet1D::setBinError(int _dcctccid, double _error) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _dcctccid));
 
-    if(kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D){
+    if (kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D) {
       int nbinsY(me->getTH1()->GetNbinsY());
-      for(int iY(1); iY <= nbinsY; iY++)
+      for (int iY(1); iY <= nbinsY; iY++)
         me->setBinError(xbin, iY, _error);
-    }
-    else
+    } else
       me->setBinError(xbin, _error);
   }
 
-  void
-  MESetDet1D::setBinError(DetId const& _id, int _ybin, double _error)
-  {
-    if(!active_) return;
-    if(kind_ != MonitorElement::DQM_KIND_TH2F && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESetDet1D::setBinError(DetId const &_id, int _ybin, double _error) {
+    if (!active_)
+      return;
+    if (kind_ != MonitorElement::DQM_KIND_TH2F && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
     me->setBinError(xbin, _ybin, _error);
   }
 
-  void
-  MESetDet1D::setBinError(EcalElectronicsId const& _id, int _ybin, double _error)
-  {
-    if(!active_) return;
-    if(kind_ != MonitorElement::DQM_KIND_TH2F && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESetDet1D::setBinError(EcalElectronicsId const &_id, int _ybin, double _error) {
+    if (!active_)
+      return;
+    if (kind_ != MonitorElement::DQM_KIND_TH2F && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
     me->setBinError(xbin, _ybin, _error);
   }
 
-  void
-  MESetDet1D::setBinError(int _dcctccid, int _ybin, double _error)
-  {
-    if(!active_) return;
-    if(kind_ != MonitorElement::DQM_KIND_TH2F && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESetDet1D::setBinError(int _dcctccid, int _ybin, double _error) {
+    if (!active_)
+      return;
+    if (kind_ != MonitorElement::DQM_KIND_TH2F && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _dcctccid));
     me->setBinError(xbin, _ybin, _error);
   }
 
-  void
-  MESetDet1D::setBinEntries(DetId const& _id, double _entries)
-  {
-    if(!active_) return;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESetDet1D::setBinEntries(DetId const &_id, double _entries) {
+    if (!active_)
+      return;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
 
-    if(kind_ == MonitorElement::DQM_KIND_TPROFILE2D){
+    if (kind_ == MonitorElement::DQM_KIND_TPROFILE2D) {
       int nbinsX(me->getTH1()->GetNbinsX());
       int nbinsY(me->getTH1()->GetNbinsY());
-      for(int iY(1); iY <= nbinsY; iY++)
+      for (int iY(1); iY <= nbinsY; iY++)
         me->setBinEntries((nbinsX + 2) * iY + xbin, _entries);
-    }
-    else
+    } else
       me->setBinEntries(xbin, _entries);
   }
 
-  void
-  MESetDet1D::setBinEntries(EcalElectronicsId const& _id, double _entries)
-  {
-    if(!active_) return;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESetDet1D::setBinEntries(EcalElectronicsId const &_id, double _entries) {
+    if (!active_)
+      return;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
 
-    if(kind_ == MonitorElement::DQM_KIND_TPROFILE2D){
+    if (kind_ == MonitorElement::DQM_KIND_TPROFILE2D) {
       int nbinsX(me->getTH1()->GetNbinsX());
       int nbinsY(me->getTH1()->GetNbinsY());
-      for(int iY(1); iY <= nbinsY; iY++)
+      for (int iY(1); iY <= nbinsY; iY++)
         me->setBinEntries((nbinsX + 2) * iY + xbin, _entries);
-    }
-    else
+    } else
       me->setBinEntries(xbin, _entries);
   }
 
-  void
-  MESetDet1D::setBinEntries(int _dcctccid, double _entries)
-  {
-    if(!active_) return;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESetDet1D::setBinEntries(int _dcctccid, double _entries) {
+    if (!active_)
+      return;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _dcctccid));
 
-    if(kind_ == MonitorElement::DQM_KIND_TPROFILE2D){
+    if (kind_ == MonitorElement::DQM_KIND_TPROFILE2D) {
       int nbinsX(me->getTH1()->GetNbinsX());
       int nbinsY(me->getTH1()->GetNbinsY());
-      for(int iY(1); iY <= nbinsY; iY++)
+      for (int iY(1); iY <= nbinsY; iY++)
         me->setBinEntries((nbinsX + 2) * iY + xbin, _entries);
-    }
-    else
+    } else
       me->setBinEntries(xbin, _entries);
   }
 
-  void
-  MESetDet1D::setBinEntries(DetId const& _id, int _ybin, double _entries)
-  {
-    if(!active_) return;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESetDet1D::setBinEntries(DetId const &_id, int _ybin, double _entries) {
+    if (!active_)
+      return;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
@@ -479,16 +457,16 @@ namespace ecaldqm
     me->setBinEntries((nbinsX + 2) * _ybin + xbin, _entries);
   }
 
-  void
-  MESetDet1D::setBinEntries(EcalElectronicsId const& _id, int _ybin, double _entries)
-  {
-    if(!active_) return;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESetDet1D::setBinEntries(EcalElectronicsId const &_id, int _ybin, double _entries) {
+    if (!active_)
+      return;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
@@ -496,16 +474,16 @@ namespace ecaldqm
     me->setBinEntries((nbinsX + 2) * _ybin + xbin, _entries);
   }
 
-  void
-  MESetDet1D::setBinEntries(int _dcctccid, int _ybin, double _entries)
-  {
-    if(!active_) return;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESetDet1D::setBinEntries(int _dcctccid, int _ybin, double _entries) {
+    if (!active_)
+      return;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _dcctccid));
@@ -513,15 +491,14 @@ namespace ecaldqm
     me->setBinEntries((nbinsX + 2) * _ybin + xbin, _entries);
   }
 
-  double
-  MESetDet1D::getBinContent(DetId const& _id, int _ybin/* = 0*/) const
-  {
-    if(!active_) return 0.;
+  double MESetDet1D::getBinContent(DetId const &_id, int _ybin /* = 0*/) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
@@ -530,15 +507,14 @@ namespace ecaldqm
     return me->getBinContent((nbinsX + 2) * _ybin + xbin);
   }
 
-  double
-  MESetDet1D::getBinContent(EcalElectronicsId const& _id, int _ybin/* = 0*/) const
-  {
-    if(!active_) return 0.;
+  double MESetDet1D::getBinContent(EcalElectronicsId const &_id, int _ybin /* = 0*/) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
@@ -547,15 +523,14 @@ namespace ecaldqm
     return me->getBinContent((nbinsX + 2) * _ybin + xbin);
   }
 
-  double
-  MESetDet1D::getBinContent(int _dcctccid, int _ybin/* = 0*/) const
-  {
-    if(!active_) return 0.;
+  double MESetDet1D::getBinContent(int _dcctccid, int _ybin /* = 0*/) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _dcctccid));
@@ -564,15 +539,14 @@ namespace ecaldqm
     return me->getBinContent((nbinsX + 2) * _ybin + xbin);
   }
 
-  double
-  MESetDet1D::getBinError(DetId const& _id, int _ybin/* = 0*/) const
-  {
-    if(!active_) return 0.;
+  double MESetDet1D::getBinError(DetId const &_id, int _ybin /* = 0*/) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
@@ -581,15 +555,14 @@ namespace ecaldqm
     return me->getBinError((nbinsX + 2) * _ybin + xbin);
   }
 
-  double
-  MESetDet1D::getBinError(EcalElectronicsId const& _id, int _ybin/* = 0*/) const
-  {
-    if(!active_) return 0.;
+  double MESetDet1D::getBinError(EcalElectronicsId const &_id, int _ybin /* = 0*/) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
@@ -598,15 +571,14 @@ namespace ecaldqm
     return me->getBinError((nbinsX + 2) * _ybin + xbin);
   }
 
-  double
-  MESetDet1D::getBinError(int _dcctccid, int _ybin/* = 0*/) const
-  {
-    if(!active_) return 0.;
+  double MESetDet1D::getBinError(int _dcctccid, int _ybin /* = 0*/) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _dcctccid));
@@ -615,16 +587,16 @@ namespace ecaldqm
     return me->getBinError((nbinsX + 2) * _ybin + xbin);
   }
 
-  double
-  MESetDet1D::getBinEntries(DetId const& _id, int _ybin/* = 0*/) const
-  {
-    if(!active_) return 0.;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return 0.;
+  double MESetDet1D::getBinEntries(DetId const &_id, int _ybin /* = 0*/) const {
+    if (!active_)
+      return 0.;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
@@ -633,16 +605,16 @@ namespace ecaldqm
     return me->getBinEntries((nbinsX + 2) * _ybin + xbin);
   }
 
-  double
-  MESetDet1D::getBinEntries(EcalElectronicsId const& _id, int _ybin/* = 0*/) const
-  {
-    if(!active_) return 0.;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return 0.;
+  double MESetDet1D::getBinEntries(EcalElectronicsId const &_id, int _ybin /* = 0*/) const {
+    if (!active_)
+      return 0.;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
@@ -651,16 +623,16 @@ namespace ecaldqm
     return me->getBinEntries((nbinsX + 2) * _ybin + xbin);
   }
 
-  double
-  MESetDet1D::getBinEntries(int _dcctccid, int _ybin/* = 0*/) const
-  {
-    if(!active_) return 0.;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return 0.;
+  double MESetDet1D::getBinEntries(int _dcctccid, int _ybin /* = 0*/) const {
+    if (!active_)
+      return 0.;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _dcctccid));
@@ -669,11 +641,11 @@ namespace ecaldqm
     return me->getBinEntries((nbinsX + 2) * _ybin + xbin);
   }
 
-  int
-  MESetDet1D::findBin(DetId const& _id) const
-  {
-    if(!active_) return -1;
-    if(kind_ == MonitorElement::DQM_KIND_TPROFILE || kind_ == MonitorElement::DQM_KIND_TPROFILE2D) return -1;
+  int MESetDet1D::findBin(DetId const &_id) const {
+    if (!active_)
+      return -1;
+    if (kind_ == MonitorElement::DQM_KIND_TPROFILE || kind_ == MonitorElement::DQM_KIND_TPROFILE2D)
+      return -1;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -682,11 +654,11 @@ namespace ecaldqm
     return binning::findBin1D(obj, btype_, _id);
   }
 
-  int
-  MESetDet1D::findBin(EcalElectronicsId const& _id) const
-  {
-    if(!active_) return -1;
-    if(kind_ == MonitorElement::DQM_KIND_TPROFILE || kind_ == MonitorElement::DQM_KIND_TPROFILE2D) return -1;
+  int MESetDet1D::findBin(EcalElectronicsId const &_id) const {
+    if (!active_)
+      return -1;
+    if (kind_ == MonitorElement::DQM_KIND_TPROFILE || kind_ == MonitorElement::DQM_KIND_TPROFILE2D)
+      return -1;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -695,11 +667,11 @@ namespace ecaldqm
     return binning::findBin1D(obj, btype_, _id);
   }
 
-  int
-  MESetDet1D::findBin(int _dcctccid) const
-  {
-    if(!active_) return -1;
-    if(kind_ == MonitorElement::DQM_KIND_TPROFILE || kind_ == MonitorElement::DQM_KIND_TPROFILE2D) return -1;
+  int MESetDet1D::findBin(int _dcctccid) const {
+    if (!active_)
+      return -1;
+    if (kind_ == MonitorElement::DQM_KIND_TPROFILE || kind_ == MonitorElement::DQM_KIND_TPROFILE2D)
+      return -1;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid));
     checkME_(iME);
@@ -708,16 +680,16 @@ namespace ecaldqm
     return binning::findBin1D(obj, btype_, _dcctccid);
   }
 
-  int
-  MESetDet1D::findBin(DetId const& _id, double _y, double) const
-  {
-    if(!active_) return -1;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return -1;
+  int MESetDet1D::findBin(DetId const &_id, double _y, double) const {
+    if (!active_)
+      return -1;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return -1;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
@@ -725,16 +697,16 @@ namespace ecaldqm
     return xbin + (nbinsX + 2) * me->getTH1()->GetYaxis()->FindBin(_y);
   }
 
-  int
-  MESetDet1D::findBin(EcalElectronicsId const& _id, double _y, double) const
-  {
-    if(!active_) return -1;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return -1;
+  int MESetDet1D::findBin(EcalElectronicsId const &_id, double _y, double) const {
+    if (!active_)
+      return -1;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return -1;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _id));
@@ -742,16 +714,16 @@ namespace ecaldqm
     return xbin + (nbinsX + 2) * me->getTH1()->GetYaxis()->FindBin(_y);
   }
 
-  int
-  MESetDet1D::findBin(int _dcctccid, double _y, double) const
-  {
-    if(!active_) return -1;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return -1;
+  int MESetDet1D::findBin(int _dcctccid, double _y, double) const {
+    if (!active_)
+      return -1;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return -1;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
     int xbin(binning::findBin1D(obj, btype_, _dcctccid));
@@ -759,28 +731,26 @@ namespace ecaldqm
     return xbin + (nbinsX + 2) * me->getTH1()->GetYaxis()->FindBin(_y);
   }
 
-  void
-  MESetDet1D::reset(double _content/* = 0.*/, double _err/* = 0.*/, double _entries/* = 0.*/)
-  {
+  void MESetDet1D::reset(double _content /* = 0.*/, double _err /* = 0.*/, double _entries /* = 0.*/) {
     unsigned nME(binning::getNObjects(otype_));
 
     bool isProfile(kind_ == MonitorElement::DQM_KIND_TPROFILE || kind_ == MonitorElement::DQM_KIND_TPROFILE2D);
     bool is2D(kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D);
 
-    for(unsigned iME(0); iME < nME; iME++) {
-      MonitorElement* me(mes_[iME]);
+    for (unsigned iME(0); iME < nME; iME++) {
+      MonitorElement *me(mes_[iME]);
 
       int nbinsX(me->getTH1()->GetNbinsX());
       int nbinsY(me->getTH1()->GetNbinsY());
-      for(int ix(1); ix <= nbinsX; ix++){
-        for(int iy(1); iy <= nbinsY; iy++){
+      for (int ix(1); ix <= nbinsX; ix++) {
+        for (int iy(1); iy <= nbinsY; iy++) {
           int bin(is2D ? (nbinsX + 2) * iy + ix : ix);
           me->setBinContent(bin, _content);
           me->setBinError(bin, _err);
-          if(isProfile) me->setBinEntries(bin, _entries);
+          if (isProfile)
+            me->setBinEntries(bin, _entries);
         }
       }
     }
   }
-}
-
+}  // namespace ecaldqm
diff --git a/DQM/EcalCommon/src/MESetDet2D.cc b/DQM/EcalCommon/src/MESetDet2D.cc
index c660ec23a85fd..c74f98bdf5f79 100644
--- a/DQM/EcalCommon/src/MESetDet2D.cc
+++ b/DQM/EcalCommon/src/MESetDet2D.cc
@@ -2,71 +2,64 @@
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 
-namespace ecaldqm
-{
-  MESetDet2D::MESetDet2D(std::string const& _fullPath, binning::ObjectType _otype, binning::BinningType _btype, MonitorElement::Kind _kind, binning::AxisSpecs const* _zaxis/* = 0*/) :
-    MESetEcal(_fullPath, _otype, _btype, _kind, 2, nullptr, nullptr, _zaxis)
-  {
-    switch(kind_){
-    case MonitorElement::DQM_KIND_TH2F:
-    case MonitorElement::DQM_KIND_TPROFILE2D:
-      break;
-    default:
-      throw_("Unsupported MonitorElement kind");
+namespace ecaldqm {
+  MESetDet2D::MESetDet2D(std::string const &_fullPath,
+                         binning::ObjectType _otype,
+                         binning::BinningType _btype,
+                         MonitorElement::Kind _kind,
+                         binning::AxisSpecs const *_zaxis /* = 0*/)
+      : MESetEcal(_fullPath, _otype, _btype, _kind, 2, nullptr, nullptr, _zaxis) {
+    switch (kind_) {
+      case MonitorElement::DQM_KIND_TH2F:
+      case MonitorElement::DQM_KIND_TPROFILE2D:
+        break;
+      default:
+        throw_("Unsupported MonitorElement kind");
     }
   }
 
-  MESetDet2D::MESetDet2D(MESetDet2D const& _orig) :
-    MESetEcal(_orig)
-  {
-  }
+  MESetDet2D::MESetDet2D(MESetDet2D const &_orig) : MESetEcal(_orig) {}
 
-  MESetDet2D::~MESetDet2D()
-  {
-  }
+  MESetDet2D::~MESetDet2D() {}
 
-  MESet*
-  MESetDet2D::clone(std::string const& _path/* = ""*/) const
-  {
+  MESet *MESetDet2D::clone(std::string const &_path /* = ""*/) const {
     std::string path(path_);
-    if(_path != "") path_ = _path;
-    MESet* copy(new MESetDet2D(*this));
+    if (!_path.empty())
+      path_ = _path;
+    MESet *copy(new MESetDet2D(*this));
     path_ = path;
     return copy;
   }
 
-  void
-  MESetDet2D::book(DQMStore::IBooker& _ibooker)
-  {
+  void MESetDet2D::book(DQMStore::IBooker &_ibooker) {
     MESetEcal::book(_ibooker);
 
-    if(btype_ == binning::kCrystal){
-      for(unsigned iME(0); iME < mes_.size(); iME++){
-        MonitorElement* me(mes_[iME]);
+    if (btype_ == binning::kCrystal) {
+      for (unsigned iME(0); iME < mes_.size(); iME++) {
+        MonitorElement *me(mes_[iME]);
 
         binning::ObjectType actualObject(binning::getObject(otype_, iME));
-        if(actualObject == binning::kMEM){
-          for(int iBin(1); iBin <= me->getNbinsX(); ++iBin)
+        if (actualObject == binning::kMEM) {
+          for (int iBin(1); iBin <= me->getNbinsX(); ++iBin)
             me->setBinLabel(iBin, binning::channelName(memDCCId(iBin - 1)));
         }
-        if(actualObject == binning::kEBMEM){
-          for(int iBin(1); iBin <= me->getNbinsX(); ++iBin)
+        if (actualObject == binning::kEBMEM) {
+          for (int iBin(1); iBin <= me->getNbinsX(); ++iBin)
             me->setBinLabel(iBin, binning::channelName(iBin + kEBmLow));
         }
-        if(actualObject == binning::kEEMEM){
-          for(int iBin(1); iBin <= me->getNbinsX() / 2; ++iBin){
+        if (actualObject == binning::kEEMEM) {
+          for (int iBin(1); iBin <= me->getNbinsX() / 2; ++iBin) {
             me->setBinLabel(iBin, binning::channelName(memDCCId(iBin - 1)));
             me->setBinLabel(iBin + me->getNbinsX() / 2, binning::channelName(memDCCId(iBin + 39)));
           }
         }
       }
-    }
-    else if(btype_ == binning::kDCC){
-      for(unsigned iME(0); iME < mes_.size(); iME++){
-        MonitorElement* me(mes_[iME]);
+    } else if (btype_ == binning::kDCC) {
+      for (unsigned iME(0); iME < mes_.size(); iME++) {
+        MonitorElement *me(mes_[iME]);
 
         binning::ObjectType actualObject(binning::getObject(otype_, iME));
-        if(actualObject == binning::kEcal){
+        if (actualObject == binning::kEcal) {
           me->setBinLabel(1, "EE", 2);
           me->setBinLabel(6, "EE", 2);
           me->setBinLabel(3, "EB", 2);
@@ -75,16 +68,16 @@ namespace ecaldqm
       }
     }
 
-    // To avoid the ambiguity between "content == 0 because the mean is 0" and "content == 0 because the entry is 0"
-    // RenderPlugin must be configured accordingly
-    if(!batchMode_ && kind_ == MonitorElement::DQM_KIND_TPROFILE2D)
+    // To avoid the ambiguity between "content == 0 because the mean is 0" and
+    // "content == 0 because the entry is 0" RenderPlugin must be configured
+    // accordingly
+    if (!batchMode_ && kind_ == MonitorElement::DQM_KIND_TPROFILE2D)
       resetAll(0., 0., -1.);
   }
 
-  void
-  MESetDet2D::fill(DetId const& _id, double _w/* = 1.*/, double, double)
-  {
-    if(!active_) return;
+  void MESetDet2D::fill(DetId const &_id, double _w /* = 1.*/, double, double) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -93,59 +86,57 @@ namespace ecaldqm
 
     int bin;
 
-    if(btype_ == binning::kRCT){
+    if (btype_ == binning::kRCT) {
       bin = binning::findBin2D(obj, btype_, _id);
       fill_(iME, bin, _w);
-    }
-    else{
-      if(isEndcapTTId(_id)){
+    } else {
+      if (isEndcapTTId(_id)) {
         std::vector<DetId> ids(getTrigTowerMap()->constituentsOf(EcalTrigTowerDetId(_id)));
         unsigned nId(ids.size());
-        for(unsigned iId(0); iId < nId; iId++){
+        for (unsigned iId(0); iId < nId; iId++) {
           bin = binning::findBin2D(obj, binning::kTriggerTower, ids[iId]);
           fill_(iME, bin, _w);
         }
-      }
-      else{
+      } else {
         bin = binning::findBin2D(obj, btype_, _id);
         fill_(iME, bin, _w);
       }
     }
   }
 
-  void
-  MESetDet2D::fill(EcalElectronicsId const& _id, double _w/* = 1.*/, double, double)
-  {
-    if(!active_) return;
+  void MESetDet2D::fill(EcalElectronicsId const &_id, double _w /* = 1.*/, double, double) {
+    if (!active_)
+      return;
 
     unsigned iME(0);
-    if(btype_ == binning::kPseudoStrip) iME = binning::findPlotIndex(otype_, _id.dccId(),binning::kPseudoStrip);
-    else iME = binning::findPlotIndex(otype_, _id);
+    if (btype_ == binning::kPseudoStrip)
+      iME = binning::findPlotIndex(otype_, _id.dccId(), binning::kPseudoStrip);
+    else
+      iME = binning::findPlotIndex(otype_, _id);
     checkME_(iME);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
 
     int bin;
 
-    if(btype_ == binning::kPseudoStrip){
+    if (btype_ == binning::kPseudoStrip) {
       EcalElectronicsId stid(_id);
-      std::vector<DetId> ids(getElectronicsMap()->pseudoStripConstituents(stid.dccId(), stid.towerId(), stid.stripId()));
+      std::vector<DetId> ids(
+          getElectronicsMap()->pseudoStripConstituents(stid.dccId(), stid.towerId(), stid.stripId()));
       unsigned nId(ids.size());
-      for(unsigned iId(0); iId < nId; iId++){
-         bin = binning::findBin2D(obj, btype_ , ids[iId]);
-         fill_(iME, bin, _w);
+      for (unsigned iId(0); iId < nId; iId++) {
+        bin = binning::findBin2D(obj, btype_, ids[iId]);
+        fill_(iME, bin, _w);
       }
-    }
-    else{
+    } else {
       bin = binning::findBin2D(obj, btype_, _id);
       fill_(iME, bin, _w);
     }
   }
 
-  void
-  MESetDet2D::fill(int _dcctccid, double _w/* = 1.*/, double, double)
-  {
-    if(!active_) return;
+  void MESetDet2D::fill(int _dcctccid, double _w /* = 1.*/, double, double) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid));
     checkME_(iME);
@@ -156,10 +147,9 @@ namespace ecaldqm
     fill_(iME, bin, _w);
   }
 
-  void
-  MESetDet2D::setBinContent(DetId const& _id, double _content)
-  {
-    if(!active_) return;
+  void MESetDet2D::setBinContent(DetId const &_id, double _content) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -168,24 +158,22 @@ namespace ecaldqm
 
     int bin;
 
-    if(isEndcapTTId(_id)){
+    if (isEndcapTTId(_id)) {
       std::vector<DetId> ids(getTrigTowerMap()->constituentsOf(EcalTrigTowerDetId(_id)));
       unsigned nId(ids.size());
-      for(unsigned iId(0); iId < nId; iId++){
+      for (unsigned iId(0); iId < nId; iId++) {
         bin = binning::findBin2D(obj, binning::kTriggerTower, ids[iId]);
         mes_[iME]->setBinContent(bin, _content);
       }
-    }
-    else{
+    } else {
       bin = binning::findBin2D(obj, btype_, _id);
       mes_[iME]->setBinContent(bin, _content);
     }
   }
 
-  void
-  MESetDet2D::setBinContent(EcalElectronicsId const& _id, double _content)
-  {
-    if(!active_) return;
+  void MESetDet2D::setBinContent(EcalElectronicsId const &_id, double _content) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -196,10 +184,9 @@ namespace ecaldqm
     mes_[iME]->setBinContent(bin, _content);
   }
 
-  void
-  MESetDet2D::setBinContent(int _dcctccid, double _content)
-  {
-    if(!active_) return;
+  void MESetDet2D::setBinContent(int _dcctccid, double _content) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid));
     checkME_(iME);
@@ -210,10 +197,9 @@ namespace ecaldqm
     mes_[iME]->setBinContent(bin, _content);
   }
 
-  void
-  MESetDet2D::setBinError(DetId const& _id, double _error)
-  {
-    if(!active_) return;
+  void MESetDet2D::setBinError(DetId const &_id, double _error) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -222,24 +208,22 @@ namespace ecaldqm
 
     int bin;
 
-    if(isEndcapTTId(_id)){
+    if (isEndcapTTId(_id)) {
       std::vector<DetId> ids(getTrigTowerMap()->constituentsOf(EcalTrigTowerDetId(_id)));
       unsigned nId(ids.size());
-      for(unsigned iId(0); iId < nId; iId++){
+      for (unsigned iId(0); iId < nId; iId++) {
         bin = binning::findBin2D(obj, binning::kTriggerTower, ids[iId]);
         mes_[iME]->setBinError(bin, _error);
       }
-    }
-    else{
+    } else {
       bin = binning::findBin2D(obj, btype_, _id);
       mes_[iME]->setBinError(bin, _error);
     }
   }
 
-  void
-  MESetDet2D::setBinError(EcalElectronicsId const& _id, double _error)
-  {
-    if(!active_) return;
+  void MESetDet2D::setBinError(EcalElectronicsId const &_id, double _error) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -250,10 +234,9 @@ namespace ecaldqm
     mes_[iME]->setBinError(bin, _error);
   }
 
-  void
-  MESetDet2D::setBinError(int _dcctccid, double _error)
-  {
-    if(!active_) return;
+  void MESetDet2D::setBinError(int _dcctccid, double _error) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid));
     checkME_(iME);
@@ -264,11 +247,11 @@ namespace ecaldqm
     mes_[iME]->setBinError(bin, _error);
   }
 
-  void
-  MESetDet2D::setBinEntries(DetId const& _id, double _entries)
-  {
-    if(!active_) return;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESetDet2D::setBinEntries(DetId const &_id, double _entries) {
+    if (!active_)
+      return;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -277,25 +260,24 @@ namespace ecaldqm
 
     int bin;
 
-    if(isEndcapTTId(_id)){
+    if (isEndcapTTId(_id)) {
       std::vector<DetId> ids(getTrigTowerMap()->constituentsOf(EcalTrigTowerDetId(_id)));
       unsigned nId(ids.size());
-      for(unsigned iId(0); iId < nId; iId++){
+      for (unsigned iId(0); iId < nId; iId++) {
         bin = binning::findBin2D(obj, binning::kTriggerTower, ids[iId]);
         mes_[iME]->setBinEntries(bin, _entries);
       }
-    }
-    else{
+    } else {
       bin = binning::findBin2D(obj, btype_, _id);
       mes_[iME]->setBinEntries(bin, _entries);
     }
   }
 
-  void
-  MESetDet2D::setBinEntries(EcalElectronicsId const& _id, double _entries)
-  {
-    if(!active_) return;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESetDet2D::setBinEntries(EcalElectronicsId const &_id, double _entries) {
+    if (!active_)
+      return;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -306,10 +288,9 @@ namespace ecaldqm
     mes_[iME]->setBinEntries(bin, _entries);
   }
 
-  void
-  MESetDet2D::setBinEntries(int _dcctccid, double _entries)
-  {
-    if(!active_) return;
+  void MESetDet2D::setBinEntries(int _dcctccid, double _entries) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid));
     checkME_(iME);
@@ -320,10 +301,9 @@ namespace ecaldqm
     mes_[iME]->setBinEntries(bin, _entries);
   }
 
-  double
-  MESetDet2D::getBinContent(DetId const& _id, int) const
-  {
-    if(!active_) return 0.;
+  double MESetDet2D::getBinContent(DetId const &_id, int) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -332,21 +312,19 @@ namespace ecaldqm
 
     int bin;
 
-    if(isEndcapTTId(_id)){
+    if (isEndcapTTId(_id)) {
       std::vector<DetId> ids(getTrigTowerMap()->constituentsOf(EcalTrigTowerDetId(_id)));
       bin = binning::findBin2D(obj, binning::kTriggerTower, ids[0]);
-    }
-    else{
+    } else {
       bin = binning::findBin2D(obj, btype_, _id);
     }
-    
+
     return mes_[iME]->getBinContent(bin);
   }
-  
-  double
-  MESetDet2D::getBinContent(EcalElectronicsId const& _id, int) const
-  {
-    if(!active_) return 0.;
+
+  double MESetDet2D::getBinContent(EcalElectronicsId const &_id, int) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -354,14 +332,13 @@ namespace ecaldqm
     binning::ObjectType obj(binning::getObject(otype_, iME));
 
     int bin(binning::findBin2D(obj, btype_, _id));
-    
+
     return mes_[iME]->getBinContent(bin);
   }
 
-  double
-  MESetDet2D::getBinContent(int _dcctccid, int) const
-  {
-    if(!active_) return 0.;
+  double MESetDet2D::getBinContent(int _dcctccid, int) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid));
     checkME_(iME);
@@ -369,14 +346,13 @@ namespace ecaldqm
     binning::ObjectType obj(binning::getObject(otype_, iME));
 
     int bin(binning::findBin2D(obj, btype_, _dcctccid));
-    
+
     return mes_[iME]->getBinContent(bin);
   }
 
-  double
-  MESetDet2D::getBinError(DetId const& _id, int) const
-  {
-    if(!active_) return 0.;
+  double MESetDet2D::getBinError(DetId const &_id, int) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -385,21 +361,19 @@ namespace ecaldqm
 
     int bin;
 
-    if(isEndcapTTId(_id)){
+    if (isEndcapTTId(_id)) {
       std::vector<DetId> ids(getTrigTowerMap()->constituentsOf(EcalTrigTowerDetId(_id)));
       bin = binning::findBin2D(obj, binning::kTriggerTower, ids[0]);
-    }
-    else{
+    } else {
       bin = binning::findBin2D(obj, btype_, _id);
     }
-    
+
     return mes_[iME]->getBinError(bin);
   }
 
-  double
-  MESetDet2D::getBinError(EcalElectronicsId const& _id, int) const
-  {
-    if(!active_) return 0.;
+  double MESetDet2D::getBinError(EcalElectronicsId const &_id, int) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -407,14 +381,13 @@ namespace ecaldqm
     binning::ObjectType obj(binning::getObject(otype_, iME));
 
     int bin(binning::findBin2D(obj, btype_, _id));
-    
+
     return mes_[iME]->getBinError(bin);
   }
 
-  double
-  MESetDet2D::getBinError(int _dcctccid, int) const
-  {
-    if(!active_) return 0.;
+  double MESetDet2D::getBinError(int _dcctccid, int) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid));
     checkME_(iME);
@@ -422,15 +395,15 @@ namespace ecaldqm
     binning::ObjectType obj(binning::getObject(otype_, iME));
 
     int bin(binning::findBin2D(obj, btype_, _dcctccid));
-    
+
     return mes_[iME]->getBinError(bin);
   }
 
-  double
-  MESetDet2D::getBinEntries(DetId const& _id, int) const
-  {
-    if(!active_) return 0.;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return 0.;
+  double MESetDet2D::getBinEntries(DetId const &_id, int) const {
+    if (!active_)
+      return 0.;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -439,24 +412,25 @@ namespace ecaldqm
 
     int bin;
 
-    if(isEndcapTTId(_id)){
+    if (isEndcapTTId(_id)) {
       std::vector<DetId> ids(getTrigTowerMap()->constituentsOf(EcalTrigTowerDetId(_id)));
       bin = binning::findBin2D(obj, binning::kTriggerTower, ids[0]);
-    }
-    else{
+    } else {
       bin = binning::findBin2D(obj, btype_, _id);
     }
 
     double entries(mes_[iME]->getBinEntries(bin));
-    if(entries < 0.) return 0.;
-    else return entries;
+    if (entries < 0.)
+      return 0.;
+    else
+      return entries;
   }
-  
-  double
-  MESetDet2D::getBinEntries(EcalElectronicsId const& _id, int) const
-  {
-    if(!active_) return 0.;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return 0.;
+
+  double MESetDet2D::getBinEntries(EcalElectronicsId const &_id, int) const {
+    if (!active_)
+      return 0.;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -464,16 +438,17 @@ namespace ecaldqm
     binning::ObjectType obj(binning::getObject(otype_, iME));
 
     int bin(binning::findBin2D(obj, btype_, _id));
-    
+
     double entries(mes_[iME]->getBinEntries(bin));
-    if(entries < 0.) return 0.;
-    else return entries;
+    if (entries < 0.)
+      return 0.;
+    else
+      return entries;
   }
 
-  double
-  MESetDet2D::getBinEntries(int _dcctccid, int) const
-  {
-    if(!active_) return 0.;
+  double MESetDet2D::getBinEntries(int _dcctccid, int) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid));
     checkME_(iME);
@@ -481,34 +456,33 @@ namespace ecaldqm
     binning::ObjectType obj(binning::getObject(otype_, iME));
 
     int bin(binning::findBin2D(obj, btype_, _dcctccid));
-    
+
     double entries(mes_[iME]->getBinEntries(bin));
-    if(entries < 0.) return 0.;
-    else return entries;
+    if (entries < 0.)
+      return 0.;
+    else
+      return entries;
   }
 
-  int
-  MESetDet2D::findBin(DetId const& _id) const
-  {
-    if(!active_) return 0;
+  int MESetDet2D::findBin(DetId const &_id) const {
+    if (!active_)
+      return 0;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
     binning::ObjectType obj(binning::getObject(otype_, iME));
 
-    if(isEndcapTTId(_id)){
+    if (isEndcapTTId(_id)) {
       std::vector<DetId> ids(getTrigTowerMap()->constituentsOf(EcalTrigTowerDetId(_id)));
       return binning::findBin2D(obj, binning::kTriggerTower, ids[0]);
-    }
-    else
+    } else
       return binning::findBin2D(obj, btype_, _id);
   }
 
-  int
-  MESetDet2D::findBin(EcalElectronicsId const& _id) const
-  {
-    if(!active_) return 0;
+  int MESetDet2D::findBin(EcalElectronicsId const &_id) const {
+    if (!active_)
+      return 0;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -518,46 +492,42 @@ namespace ecaldqm
     return binning::findBin2D(obj, btype_, _id);
   }
 
-  void
-  MESetDet2D::reset(double _content/* = 0.*/, double _err/* = 0.*/, double _entries/* = 0.*/)
-  {
+  void MESetDet2D::reset(double _content /* = 0.*/, double _err /* = 0.*/, double _entries /* = 0.*/) {
     unsigned nME(binning::getNObjects(otype_));
 
     bool isProfile(kind_ == MonitorElement::DQM_KIND_TPROFILE2D);
 
-    for(unsigned iME(0); iME < nME; iME++) {
-      MonitorElement* me(mes_[iME]);
+    for (unsigned iME(0); iME < nME; iME++) {
+      MonitorElement *me(mes_[iME]);
 
       binning::ObjectType obj(binning::getObject(otype_, iME));
 
       int nbinsX(me->getTH1()->GetNbinsX());
       int nbinsY(me->getTH1()->GetNbinsY());
-      for(int ix(1); ix <= nbinsX; ix++){
-        for(int iy(1); iy <= nbinsY; iy++){
+      for (int ix(1); ix <= nbinsX; ix++) {
+        for (int iy(1); iy <= nbinsY; iy++) {
           int bin((nbinsX + 2) * iy + ix);
-          if(!binning::isValidIdBin(obj, btype_, iME, bin)) continue;
+          if (!binning::isValidIdBin(obj, btype_, iME, bin))
+            continue;
           me->setBinContent(bin, _content);
           me->setBinError(bin, _err);
-          if(isProfile) me->setBinEntries(bin, _entries);
+          if (isProfile)
+            me->setBinEntries(bin, _entries);
         }
       }
     }
   }
 
-  void
-  MESetDet2D::softReset()
-  {
+  void MESetDet2D::softReset() {
     MESet::softReset();
-    if(!batchMode_ && kind_ == MonitorElement::DQM_KIND_TPROFILE2D)
+    if (!batchMode_ && kind_ == MonitorElement::DQM_KIND_TPROFILE2D)
       resetAll(0., 0., -1.);
   }
 
-  void
-  MESetDet2D::fill_(unsigned _iME, int _bin, double _w)
-  {
-    if(kind_ == MonitorElement::DQM_KIND_TPROFILE2D){
-      MonitorElement* me(mes_.at(_iME));
-      if(me->getBinEntries(_bin) < 0.){
+  void MESetDet2D::fill_(unsigned _iME, int _bin, double _w) {
+    if (kind_ == MonitorElement::DQM_KIND_TPROFILE2D) {
+      MonitorElement *me(mes_.at(_iME));
+      if (me->getBinEntries(_bin) < 0.) {
         me->setBinContent(_bin, 0.);
         me->setBinEntries(_bin, 0.);
         me->getTProfile2D()->SetEntries(me->getTProfile2D()->GetEntries() + 1.);
@@ -567,12 +537,10 @@ namespace ecaldqm
     MESet::fill_(_iME, _bin, _w);
   }
 
-  void
-  MESetDet2D::fill_(unsigned _iME, int _bin, double _y, double _w)
-  {
-    if(kind_ == MonitorElement::DQM_KIND_TPROFILE2D){
-      MonitorElement* me(mes_.at(_iME));
-      if(me->getBinEntries(_bin) < 0.){
+  void MESetDet2D::fill_(unsigned _iME, int _bin, double _y, double _w) {
+    if (kind_ == MonitorElement::DQM_KIND_TPROFILE2D) {
+      MonitorElement *me(mes_.at(_iME));
+      if (me->getBinEntries(_bin) < 0.) {
         me->setBinContent(_bin, 0.);
         me->setBinEntries(_bin, 0.);
         me->getTProfile2D()->SetEntries(me->getTProfile2D()->GetEntries() + 1.);
@@ -582,13 +550,11 @@ namespace ecaldqm
     MESet::fill_(_iME, _bin, _y, _w);
   }
 
-  void
-  MESetDet2D::fill_(unsigned _iME, double _x, double _wy, double _w)
-  {
-    if(kind_ == MonitorElement::DQM_KIND_TPROFILE2D){
-      MonitorElement* me(mes_.at(_iME));
+  void MESetDet2D::fill_(unsigned _iME, double _x, double _wy, double _w) {
+    if (kind_ == MonitorElement::DQM_KIND_TPROFILE2D) {
+      MonitorElement *me(mes_.at(_iME));
       int bin(me->getTProfile2D()->FindBin(_x, _wy));
-      if(me->getBinEntries(bin) < 0.){
+      if (me->getBinEntries(bin) < 0.) {
         me->setBinContent(bin, 0.);
         me->setBinEntries(bin, 0.);
         me->getTProfile2D()->SetEntries(me->getTProfile2D()->GetEntries() + 1.);
@@ -597,4 +563,4 @@ namespace ecaldqm
 
     MESet::fill_(_iME, _x, _wy, _w);
   }
-}
+}  // namespace ecaldqm
diff --git a/DQM/EcalCommon/src/MESetEcal.cc b/DQM/EcalCommon/src/MESetEcal.cc
index e13f19b1597b5..9674ffb19e33a 100644
--- a/DQM/EcalCommon/src/MESetEcal.cc
+++ b/DQM/EcalCommon/src/MESetEcal.cc
@@ -6,38 +6,38 @@
 #include <limits>
 #include <sstream>
 
-namespace ecaldqm
-{
-  MESetEcal::MESetEcal(std::string const& _fullPath, binning::ObjectType _otype, binning::BinningType _btype, MonitorElement::Kind _kind, unsigned _logicalDimensions, binning::AxisSpecs const* _xaxis/* = 0*/, binning::AxisSpecs const* _yaxis/* = 0*/, binning::AxisSpecs const* _zaxis/* = 0*/) :
-    MESet(_fullPath, _otype, _btype, _kind),
-    logicalDimensions_(_logicalDimensions),
-    xaxis_(_xaxis ? new binning::AxisSpecs(*_xaxis) : nullptr),
-    yaxis_(_yaxis ? new binning::AxisSpecs(*_yaxis) : nullptr),
-    zaxis_(_zaxis ? new binning::AxisSpecs(*_zaxis) : nullptr)
-  {
-    if(btype_ == binning::kUser && ((logicalDimensions_ > 0 && !xaxis_) || (logicalDimensions_ > 1 && !yaxis_)))
+namespace ecaldqm {
+  MESetEcal::MESetEcal(std::string const &_fullPath,
+                       binning::ObjectType _otype,
+                       binning::BinningType _btype,
+                       MonitorElement::Kind _kind,
+                       unsigned _logicalDimensions,
+                       binning::AxisSpecs const *_xaxis /* = 0*/,
+                       binning::AxisSpecs const *_yaxis /* = 0*/,
+                       binning::AxisSpecs const *_zaxis /* = 0*/)
+      : MESet(_fullPath, _otype, _btype, _kind),
+        logicalDimensions_(_logicalDimensions),
+        xaxis_(_xaxis ? new binning::AxisSpecs(*_xaxis) : nullptr),
+        yaxis_(_yaxis ? new binning::AxisSpecs(*_yaxis) : nullptr),
+        zaxis_(_zaxis ? new binning::AxisSpecs(*_zaxis) : nullptr) {
+    if (btype_ == binning::kUser && ((logicalDimensions_ > 0 && !xaxis_) || (logicalDimensions_ > 1 && !yaxis_)))
       throw_("Need axis specifications");
   }
 
-  MESetEcal::MESetEcal(MESetEcal const& _orig) :
-    MESet(_orig),
-    logicalDimensions_(_orig.logicalDimensions_),
-    xaxis_(_orig.xaxis_ ? new binning::AxisSpecs(*_orig.xaxis_) : nullptr),
-    yaxis_(_orig.yaxis_ ? new binning::AxisSpecs(*_orig.yaxis_) : nullptr),
-    zaxis_(_orig.zaxis_ ? new binning::AxisSpecs(*_orig.zaxis_) : nullptr)
-  {
-  }
+  MESetEcal::MESetEcal(MESetEcal const &_orig)
+      : MESet(_orig),
+        logicalDimensions_(_orig.logicalDimensions_),
+        xaxis_(_orig.xaxis_ ? new binning::AxisSpecs(*_orig.xaxis_) : nullptr),
+        yaxis_(_orig.yaxis_ ? new binning::AxisSpecs(*_orig.yaxis_) : nullptr),
+        zaxis_(_orig.zaxis_ ? new binning::AxisSpecs(*_orig.zaxis_) : nullptr) {}
 
-  MESetEcal::~MESetEcal()
-  {
+  MESetEcal::~MESetEcal() {
     delete xaxis_;
     delete yaxis_;
     delete zaxis_;
   }
 
-  MESet&
-  MESetEcal::operator=(MESet const& _rhs)
-  {
+  MESet &MESetEcal::operator=(MESet const &_rhs) {
     delete xaxis_;
     delete yaxis_;
     delete zaxis_;
@@ -45,38 +45,38 @@ namespace ecaldqm
     yaxis_ = nullptr;
     zaxis_ = nullptr;
 
-    MESetEcal const* pRhs(dynamic_cast<MESetEcal const*>(&_rhs));
-    if(pRhs){
+    MESetEcal const *pRhs(dynamic_cast<MESetEcal const *>(&_rhs));
+    if (pRhs) {
       logicalDimensions_ = pRhs->logicalDimensions_;
-      if(pRhs->xaxis_) xaxis_ = new binning::AxisSpecs(*pRhs->xaxis_);
-      if(pRhs->yaxis_) yaxis_ = new binning::AxisSpecs(*pRhs->yaxis_);
-      if(pRhs->zaxis_) zaxis_ = new binning::AxisSpecs(*pRhs->zaxis_);
+      if (pRhs->xaxis_)
+        xaxis_ = new binning::AxisSpecs(*pRhs->xaxis_);
+      if (pRhs->yaxis_)
+        yaxis_ = new binning::AxisSpecs(*pRhs->yaxis_);
+      if (pRhs->zaxis_)
+        zaxis_ = new binning::AxisSpecs(*pRhs->zaxis_);
     }
     return MESet::operator=(_rhs);
   }
 
-  MESet*
-  MESetEcal::clone(std::string const& _path/* = ""*/) const
-  {
+  MESet *MESetEcal::clone(std::string const &_path /* = ""*/) const {
     std::string path(path_);
-    if(!_path.empty()) path_ = _path;
-    MESet* copy(new MESetEcal(*this));
+    if (!_path.empty())
+      path_ = _path;
+    MESet *copy(new MESetEcal(*this));
     path_ = path;
     return copy;
   }
 
-  void
-  MESetEcal::book(DQMStore::IBooker& _ibooker)
-  {
+  void MESetEcal::book(DQMStore::IBooker &_ibooker) {
     using namespace std;
 
     clear();
 
     vector<string> mePaths(generatePaths());
 
-    for(unsigned iME(0); iME < mePaths.size(); iME++){
-      string& path(mePaths[iME]);
-      if(path.find('%') != string::npos)
+    for (unsigned iME(0); iME < mePaths.size(); iME++) {
+      string &path(mePaths[iME]);
+      if (path.find('%') != string::npos)
         throw_("book() called with incompletely formed path [" + path + "]");
 
       binning::ObjectType actualObject(binning::getObject(otype_, iME));
@@ -86,46 +86,46 @@ namespace ecaldqm
       bool isHistogram(logicalDimensions_ > 0);
       bool isMap(logicalDimensions_ > 1);
 
-      if(isHistogram){
+      if (isHistogram) {
+        if (xaxis_)
+          xaxis = *xaxis_;
+        if (yaxis_)
+          yaxis = *yaxis_;
+        if (zaxis_)
+          zaxis = *zaxis_;
 
-        if(xaxis_) xaxis = *xaxis_;
-        if(yaxis_) yaxis = *yaxis_;
-        if(zaxis_) zaxis = *zaxis_;
-        
-        if(xaxis.nbins == 0){ // uses preset
+        if (xaxis.nbins == 0) {  // uses preset
           binning::AxisSpecs xdef(binning::getBinning(actualObject, btype_, isMap, 1, iME));
-          if(xaxis.labels || !xaxis.title.empty()){ // PSet specifies title / label only
-            std::string* labels(xaxis.labels);
+          if (xaxis.labels || !xaxis.title.empty()) {  // PSet specifies title / label only
+            std::string *labels(xaxis.labels);
             std::string title(xaxis.title);
             xaxis = xdef;
-            delete [] xaxis.labels;
+            delete[] xaxis.labels;
             xaxis.labels = labels;
             xaxis.title = title;
-          }
-          else
+          } else
             xaxis = xdef;
         }
 
-        if(isMap && yaxis.nbins == 0){
+        if (isMap && yaxis.nbins == 0) {
           binning::AxisSpecs ydef(binning::getBinning(actualObject, btype_, isMap, 2, iME));
-          if(yaxis.labels || !yaxis.title.empty()){ // PSet specifies title / label only
-            std::string* labels(yaxis.labels);
+          if (yaxis.labels || !yaxis.title.empty()) {  // PSet specifies title / label only
+            std::string *labels(yaxis.labels);
             std::string title(yaxis.title);
             yaxis = ydef;
-            delete [] yaxis.labels;
+            delete[] yaxis.labels;
             yaxis.labels = labels;
             yaxis.title = title;
-          }
-          else
+          } else
             yaxis = ydef;
         }
 
-        if(yaxis.high - yaxis.low < 1.e-10){
+        if (yaxis.high - yaxis.low < 1.e-10) {
           yaxis.low = -numeric_limits<double>::max();
           yaxis.high = numeric_limits<double>::max();
         }
 
-        if(zaxis.high - zaxis.low < 1.e-10){
+        if (zaxis.high - zaxis.low < 1.e-10) {
           zaxis.low = -numeric_limits<double>::max();
           zaxis.high = numeric_limits<double>::max();
         }
@@ -136,116 +136,136 @@ namespace ecaldqm
       _ibooker.cd();
       _ibooker.setCurrentFolder(path.substr(0, slashPos));
 
-      MonitorElement* me(nullptr);
+      MonitorElement *me(nullptr);
 
-      switch(kind_) {
-      case MonitorElement::DQM_KIND_REAL :
-        me = _ibooker.bookFloat(name);
+      switch (kind_) {
+        case MonitorElement::DQM_KIND_REAL:
+          me = _ibooker.bookFloat(name);
 
-        break;
+          break;
 
-      case MonitorElement::DQM_KIND_TH1F :
-        if(xaxis.edges)
-          me = _ibooker.book1D(name, name, xaxis.nbins, xaxis.edges);
-        else
-          me = _ibooker.book1D(name, name, xaxis.nbins, xaxis.low, xaxis.high);
-
-        break;
-
-      case MonitorElement::DQM_KIND_TPROFILE :
-        if(xaxis.edges){
-          // DQMStore bookProfile interface uses double* for bin edges
-          double* edges(new double[xaxis.nbins + 1]);
-          std::copy(xaxis.edges, xaxis.edges + xaxis.nbins + 1, edges);
-          me = _ibooker.bookProfile(name, name, xaxis.nbins, edges, yaxis.low, yaxis.high, "");
-          delete [] edges;
-        }
-        else
-          me = _ibooker.bookProfile(name, name, xaxis.nbins, xaxis.low, xaxis.high, yaxis.low, yaxis.high, "");
-
-        break;
-
-      case MonitorElement::DQM_KIND_TH2F :
-        if(xaxis.edges || yaxis.edges) {
-          binning::AxisSpecs* specs[] = {&xaxis, &yaxis};
-          for(int iSpec(0); iSpec < 2; iSpec++){
-            if(!specs[iSpec]->edges){
-              specs[iSpec]->edges = new float[specs[iSpec]->nbins + 1];
-              int nbins(specs[iSpec]->nbins);
-              double low(specs[iSpec]->low), high(specs[iSpec]->high);
-              for(int i(0); i < nbins + 1; i++)
-                specs[iSpec]->edges[i] = low + (high - low) / nbins * i;
+        case MonitorElement::DQM_KIND_TH1F:
+          if (xaxis.edges)
+            me = _ibooker.book1D(name, name, xaxis.nbins, xaxis.edges);
+          else
+            me = _ibooker.book1D(name, name, xaxis.nbins, xaxis.low, xaxis.high);
+
+          break;
+
+        case MonitorElement::DQM_KIND_TPROFILE:
+          if (xaxis.edges) {
+            // DQMStore bookProfile interface uses double* for bin edges
+            double *edges(new double[xaxis.nbins + 1]);
+            std::copy(xaxis.edges, xaxis.edges + xaxis.nbins + 1, edges);
+            me = _ibooker.bookProfile(name, name, xaxis.nbins, edges, yaxis.low, yaxis.high, "");
+            delete[] edges;
+          } else
+            me = _ibooker.bookProfile(name, name, xaxis.nbins, xaxis.low, xaxis.high, yaxis.low, yaxis.high, "");
+
+          break;
+
+        case MonitorElement::DQM_KIND_TH2F:
+          if (xaxis.edges || yaxis.edges) {
+            binning::AxisSpecs *specs[] = {&xaxis, &yaxis};
+            for (int iSpec(0); iSpec < 2; iSpec++) {
+              if (!specs[iSpec]->edges) {
+                specs[iSpec]->edges = new float[specs[iSpec]->nbins + 1];
+                int nbins(specs[iSpec]->nbins);
+                double low(specs[iSpec]->low), high(specs[iSpec]->high);
+                for (int i(0); i < nbins + 1; i++)
+                  specs[iSpec]->edges[i] = low + (high - low) / nbins * i;
+              }
             }
-          }
-          me = _ibooker.book2D(name, name, xaxis.nbins, xaxis.edges, yaxis.nbins, yaxis.edges);
-        }
-        else
-          me = _ibooker.book2D(name, name, xaxis.nbins, xaxis.low, xaxis.high, yaxis.nbins, yaxis.low, yaxis.high);
-
-        break;
+            me = _ibooker.book2D(name, name, xaxis.nbins, xaxis.edges, yaxis.nbins, yaxis.edges);
+          } else
+            me = _ibooker.book2D(name, name, xaxis.nbins, xaxis.low, xaxis.high, yaxis.nbins, yaxis.low, yaxis.high);
 
-      case MonitorElement::DQM_KIND_TPROFILE2D :
-        if(zaxis.edges) {
-          zaxis.low = zaxis.edges[0];
-          zaxis.high = zaxis.edges[zaxis.nbins];
-        }
-        if(xaxis.edges || yaxis.edges)
-          throw_("Variable bin size for 2D profile not implemented");
-        me = _ibooker.bookProfile2D(name, name, xaxis.nbins, xaxis.low, xaxis.high, yaxis.nbins, yaxis.low, yaxis.high, zaxis.low, zaxis.high, "");
+          break;
 
-        break;
-
-      default :
-        break;
+        case MonitorElement::DQM_KIND_TPROFILE2D:
+          if (zaxis.edges) {
+            zaxis.low = zaxis.edges[0];
+            zaxis.high = zaxis.edges[zaxis.nbins];
+          }
+          if (xaxis.edges || yaxis.edges)
+            throw_("Variable bin size for 2D profile not implemented");
+          me = _ibooker.bookProfile2D(name,
+                                      name,
+                                      xaxis.nbins,
+                                      xaxis.low,
+                                      xaxis.high,
+                                      yaxis.nbins,
+                                      yaxis.low,
+                                      yaxis.high,
+                                      zaxis.low,
+                                      zaxis.high,
+                                      "");
+
+          break;
+
+        default:
+          break;
       }
 
-      if(!me)
+      if (!me)
         throw_("ME could not be booked");
 
-      if(isHistogram){
+      if (isHistogram) {
         me->setAxisTitle(xaxis.title, 1);
         me->setAxisTitle(yaxis.title, 2);
-        if(isMap) me->setAxisTitle(zaxis.title, 3);
+        if (isMap)
+          me->setAxisTitle(zaxis.title, 3);
 
-        if(xaxis.labels){
-          for(int iBin(1); iBin <= xaxis.nbins; ++iBin)
+        if (xaxis.labels) {
+          for (int iBin(1); iBin <= xaxis.nbins; ++iBin)
             me->setBinLabel(iBin, xaxis.labels[iBin - 1], 1);
         }
-        if(yaxis.labels){
-          for(int iBin(1); iBin <= yaxis.nbins; ++iBin)
+        if (yaxis.labels) {
+          for (int iBin(1); iBin <= yaxis.nbins; ++iBin)
             me->setBinLabel(iBin, yaxis.labels[iBin - 1], 2);
         }
-        if(zaxis.labels){
-          for(int iBin(1); iBin <= zaxis.nbins; ++iBin)
+        if (zaxis.labels) {
+          for (int iBin(1); iBin <= zaxis.nbins; ++iBin)
             me->setBinLabel(iBin, zaxis.labels[iBin - 1], 3);
         }
 
-        /* FIX: In ROOT 6.0.12 bit 20 is used by ROOT (bit 19 was already in use in 6.0.x). Talking with the ROOT team, users
-           should never use SetBit for their own purpose since those bits are reserved for ROOT internally.
-           See https://github.com/cms-sw/cmssw/issues/21423 for some alternative ways of attaching
-           additional information to a TH1
-
-        // For plot tagging in RenderPlugin; default values are 1 for both
-        // bits 19 - 23 are free in TH1::fBits
-        // can only pack object + logical dimensions into 5 bits (4 bits for object, 1 bit for dim (1 -> dim >= 2))
-        me->getTH1()->SetBit(uint32_t(actualObject + 1) << 20);
-        if(isMap) me->getTH1()->SetBit(0x1 << 19);
-        */
-
-        // The render plugin requires some metadata in order to set the correct rendering for each plot.
-        // The original solution was to use bits number 19 to 23 in TH1::fBits, but these were meant for ROOT's internal usage and eventually started breaking things, see: https://github.com/cms-sw/cmssw/issues/21423
-        // The current solution is to use the UniqueID field in the parent TObject, which is expected to work if there is no TRef pointing to the TObject.
-
-        // To check that indeed there is no such TRef, one can use TestBit(kIsReferenced), e.g.
-        // std::cout << "Need to set unique ID at path = " << path << "; for this path, TestBit(kIsReferenced) is: " << (me->getTH1()->TestBit(kIsReferenced)? "true": "false") << std::endl; // should always output false for the solution to work
-
-        // Originally, bit 19 in TH1::fBits was set to isMap, while bits 20-23 contained (actualObject+1).
-        // The idea is to make sure that both these variables are easily recoverable in the render plugin,
-        // as in this solution, where isMap is the last bit.
-        me->getTH1()->SetUniqueID(uint32_t(2*(actualObject + 1) + (isMap? 1: 0)));
+        /* FIX: In ROOT 6.0.12 bit 20 is used by ROOT (bit 19 was already in use
+      in 6.0.x). Talking with the ROOT team, users should never use SetBit for
+      their own purpose since those bits are reserved for ROOT internally. See
+      https://github.com/cms-sw/cmssw/issues/21423 for some alternative ways of
+      attaching additional information to a TH1
+
+      // For plot tagging in RenderPlugin; default values are 1 for both
+      // bits 19 - 23 are free in TH1::fBits
+      // can only pack object + logical dimensions into 5 bits (4 bits for
+      object, 1 bit for dim (1 -> dim >= 2))
+      me->getTH1()->SetBit(uint32_t(actualObject + 1) << 20);
+      if(isMap) me->getTH1()->SetBit(0x1 << 19);
+      */
+
+        // The render plugin requires some metadata in order to set the correct
+        // rendering for each plot. The original solution was to use bits number
+        // 19 to 23 in TH1::fBits, but these were meant for ROOT's internal usage
+        // and eventually started breaking things, see:
+        // https://github.com/cms-sw/cmssw/issues/21423 The current solution is to
+        // use the UniqueID field in the parent TObject, which is expected to work
+        // if there is no TRef pointing to the TObject.
+
+        // To check that indeed there is no such TRef, one can use
+        // TestBit(kIsReferenced), e.g. std::cout << "Need to set unique ID at
+        // path = " << path << "; for this path, TestBit(kIsReferenced) is: " <<
+        // (me->getTH1()->TestBit(kIsReferenced)? "true": "false") << std::endl;
+        // // should always output false for the solution to work
+
+        // Originally, bit 19 in TH1::fBits was set to isMap, while bits 20-23
+        // contained (actualObject+1). The idea is to make sure that both these
+        // variables are easily recoverable in the render plugin, as in this
+        // solution, where isMap is the last bit.
+        me->getTH1()->SetUniqueID(uint32_t(2 * (actualObject + 1) + (isMap ? 1 : 0)));
       }
 
-      if(lumiFlag_) me->setLumiFlag();
+      if (lumiFlag_)
+        me->setLumiFlag();
 
       mes_.push_back(me);
     }
@@ -253,27 +273,28 @@ namespace ecaldqm
     active_ = true;
   }
 
-  bool
-  MESetEcal::retrieve(DQMStore::IGetter& _igetter, std::string* _failedPath/* = 0*/) const
-  {
+  bool MESetEcal::retrieve(DQMStore::IGetter &_igetter, std::string *_failedPath /* = 0*/) const {
     clear();
 
     std::vector<std::string> mePaths(generatePaths());
-    if(mePaths.empty()){
-      if(_failedPath) _failedPath->clear();
+    if (mePaths.empty()) {
+      if (_failedPath)
+        _failedPath->clear();
       return false;
     }
 
-    for(unsigned iME(0); iME < mePaths.size(); iME++){
-      std::string& path(mePaths[iME]);
-      if(path.find('%') != std::string::npos)
+    for (unsigned iME(0); iME < mePaths.size(); iME++) {
+      std::string &path(mePaths[iME]);
+      if (path.find('%') != std::string::npos)
         throw_("retrieve() called with incompletely formed path [" + path + "]");
 
-      MonitorElement* me(_igetter.get(path));
-      if(me) mes_.push_back(me);
-      else{
+      MonitorElement *me(_igetter.get(path));
+      if (me)
+        mes_.push_back(me);
+      else {
         clear();
-        if(_failedPath) *_failedPath = path;
+        if (_failedPath)
+          *_failedPath = path;
         return false;
       }
     }
@@ -282,10 +303,9 @@ namespace ecaldqm
     return true;
   }
 
-  void
-  MESetEcal::fill(DetId const& _id, double _x/* = 1.*/, double _wy/* = 1.*/, double _w/* = 1.*/)
-  {
-    if(!active_) return;
+  void MESetEcal::fill(DetId const &_id, double _x /* = 1.*/, double _wy /* = 1.*/, double _w /* = 1.*/) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -293,10 +313,9 @@ namespace ecaldqm
     fill_(iME, _x, _wy, _w);
   }
 
-  void
-  MESetEcal::fill(EcalElectronicsId const& _id, double _x/* = 1.*/, double _wy/* = 1.*/, double _w/* = 1.*/)
-  {
-    if(!active_) return;
+  void MESetEcal::fill(EcalElectronicsId const &_id, double _x /* = 1.*/, double _wy /* = 1.*/, double _w /* = 1.*/) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -304,10 +323,9 @@ namespace ecaldqm
     fill_(iME, _x, _wy, _w);
   }
 
-  void
-  MESetEcal::fill(int _dcctccid, double _x/* = 1.*/, double _wy/* = 1.*/, double _w/* = 1.*/)
-  {
-    if(!active_) return;
+  void MESetEcal::fill(int _dcctccid, double _x /* = 1.*/, double _wy /* = 1.*/, double _w /* = 1.*/) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
@@ -315,20 +333,19 @@ namespace ecaldqm
     fill_(iME, _x, _wy, _w);
   }
 
-  void
-  MESetEcal::fill(double _x, double _wy/* = 1.*/, double _w/* = 1.*/)
-  {
-    if(!active_) return;
+  void MESetEcal::fill(double _x, double _wy /* = 1.*/, double _w /* = 1.*/) {
+    if (!active_)
+      return;
 
-    if(mes_.size() != 1) return;
+    if (mes_.size() != 1)
+      return;
 
     fill_(0, _x, _wy, _w);
   }
 
-  void
-  MESetEcal::setBinContent(DetId const& _id, int _bin, double _content)
-  {
-    if(!active_) return;
+  void MESetEcal::setBinContent(DetId const &_id, int _bin, double _content) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -336,10 +353,9 @@ namespace ecaldqm
     mes_[iME]->setBinContent(_bin, _content);
   }
 
-  void
-  MESetEcal::setBinContent(EcalElectronicsId const& _id, int _bin, double _content)
-  {
-    if(!active_) return;
+  void MESetEcal::setBinContent(EcalElectronicsId const &_id, int _bin, double _content) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -347,10 +363,9 @@ namespace ecaldqm
     mes_[iME]->setBinContent(_bin, _content);
   }
 
-  void
-  MESetEcal::setBinContent(int _dcctccid, int _bin, double _content)
-  {
-    if(!active_) return;
+  void MESetEcal::setBinContent(int _dcctccid, int _bin, double _content) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
@@ -358,10 +373,9 @@ namespace ecaldqm
     mes_[iME]->setBinContent(_bin, _content);
   }
 
-  void
-  MESetEcal::setBinError(DetId const& _id, int _bin, double _error)
-  {
-    if(!active_) return;
+  void MESetEcal::setBinError(DetId const &_id, int _bin, double _error) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -369,10 +383,9 @@ namespace ecaldqm
     mes_[iME]->setBinError(_bin, _error);
   }
 
-  void
-  MESetEcal::setBinError(EcalElectronicsId const& _id, int _bin, double _error)
-  {
-    if(!active_) return;
+  void MESetEcal::setBinError(EcalElectronicsId const &_id, int _bin, double _error) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -380,10 +393,9 @@ namespace ecaldqm
     mes_[iME]->setBinError(_bin, _error);
   }
 
-  void
-  MESetEcal::setBinError(int _dcctccid, int _bin, double _error)
-  {
-    if(!active_) return;
+  void MESetEcal::setBinError(int _dcctccid, int _bin, double _error) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
@@ -391,11 +403,11 @@ namespace ecaldqm
     mes_[iME]->setBinError(_bin, _error);
   }
 
-  void
-  MESetEcal::setBinEntries(DetId const& _id, int _bin, double _entries)
-  {
-    if(!active_) return;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESetEcal::setBinEntries(DetId const &_id, int _bin, double _entries) {
+    if (!active_)
+      return;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -403,11 +415,11 @@ namespace ecaldqm
     mes_[iME]->setBinEntries(_bin, _entries);
   }
 
-  void
-  MESetEcal::setBinEntries(EcalElectronicsId const& _id, int _bin, double _entries)
-  {
-    if(!active_) return;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESetEcal::setBinEntries(EcalElectronicsId const &_id, int _bin, double _entries) {
+    if (!active_)
+      return;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -415,11 +427,11 @@ namespace ecaldqm
     mes_[iME]->setBinEntries(_bin, _entries);
   }
 
-  void
-  MESetEcal::setBinEntries(int _dcctccid, int _bin, double _entries)
-  {
-    if(!active_) return;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESetEcal::setBinEntries(int _dcctccid, int _bin, double _entries) {
+    if (!active_)
+      return;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
@@ -427,10 +439,9 @@ namespace ecaldqm
     mes_[iME]->setBinEntries(_bin, _entries);
   }
 
-  double
-  MESetEcal::getBinContent(DetId const& _id, int _bin) const
-  {
-    if(!active_) return 0.;
+  double MESetEcal::getBinContent(DetId const &_id, int _bin) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -438,10 +449,9 @@ namespace ecaldqm
     return mes_[iME]->getBinContent(_bin);
   }
 
-  double
-  MESetEcal::getBinContent(EcalElectronicsId const& _id, int _bin) const
-  {
-    if(!active_) return 0.;
+  double MESetEcal::getBinContent(EcalElectronicsId const &_id, int _bin) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -449,10 +459,9 @@ namespace ecaldqm
     return mes_[iME]->getBinContent(_bin);
   }
 
-  double
-  MESetEcal::getBinContent(int _dcctccid, int _bin) const
-  {
-    if(!active_) return 0.;
+  double MESetEcal::getBinContent(int _dcctccid, int _bin) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
@@ -460,10 +469,9 @@ namespace ecaldqm
     return mes_[iME]->getBinContent(_bin);
   }
 
-  double
-  MESetEcal::getBinError(DetId const& _id, int _bin) const
-  {
-    if(!active_) return 0.;
+  double MESetEcal::getBinError(DetId const &_id, int _bin) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -471,10 +479,9 @@ namespace ecaldqm
     return mes_[iME]->getBinError(_bin);
   }
 
-  double
-  MESetEcal::getBinError(EcalElectronicsId const& _id, int _bin) const
-  {
-    if(!active_) return 0.;
+  double MESetEcal::getBinError(EcalElectronicsId const &_id, int _bin) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -482,10 +489,9 @@ namespace ecaldqm
     return mes_[iME]->getBinError(_bin);
   }
 
-  double
-  MESetEcal::getBinError(int _dcctccid, int _bin) const
-  {
-    if(!active_) return 0.;
+  double MESetEcal::getBinError(int _dcctccid, int _bin) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
@@ -493,11 +499,11 @@ namespace ecaldqm
     return mes_[iME]->getBinError(_bin);
   }
 
-  double
-  MESetEcal::getBinEntries(DetId const& _id, int _bin) const
-  {
-    if(!active_) return 0.;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return 0.;
+  double MESetEcal::getBinEntries(DetId const &_id, int _bin) const {
+    if (!active_)
+      return 0.;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -505,11 +511,11 @@ namespace ecaldqm
     return mes_[iME]->getBinEntries(_bin);
   }
 
-  double
-  MESetEcal::getBinEntries(EcalElectronicsId const& _id, int _bin) const
-  {
-    if(!active_) return 0.;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return 0.;
+  double MESetEcal::getBinEntries(EcalElectronicsId const &_id, int _bin) const {
+    if (!active_)
+      return 0.;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -517,11 +523,11 @@ namespace ecaldqm
     return mes_[iME]->getBinEntries(_bin);
   }
 
-  double
-  MESetEcal::getBinEntries(int _dcctccid, int _bin) const
-  {
-    if(!active_) return 0.;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return 0.;
+  double MESetEcal::getBinEntries(int _dcctccid, int _bin) const {
+    if (!active_)
+      return 0.;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
@@ -529,10 +535,9 @@ namespace ecaldqm
     return mes_[iME]->getBinEntries(_bin);
   }
 
-  int
-  MESetEcal::findBin(DetId const& _id, double _x, double _y/* = 0.*/) const
-  {
-    if(!active_) return -1;
+  int MESetEcal::findBin(DetId const &_id, double _x, double _y /* = 0.*/) const {
+    if (!active_)
+      return -1;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -540,10 +545,9 @@ namespace ecaldqm
     return mes_[iME]->getTH1()->FindBin(_x, _y);
   }
 
-  int
-  MESetEcal::findBin(EcalElectronicsId const& _id, double _x, double _y/* = 0.*/) const
-  {
-    if(!active_) return -1;
+  int MESetEcal::findBin(EcalElectronicsId const &_id, double _x, double _y /* = 0.*/) const {
+    if (!active_)
+      return -1;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -551,10 +555,9 @@ namespace ecaldqm
     return mes_[iME]->getTH1()->FindBin(_x, _y);
   }
 
-  int
-  MESetEcal::findBin(int _dcctccid, double _x, double _y/* = 0.*/) const
-  {
-    if(!active_) return -1;
+  int MESetEcal::findBin(int _dcctccid, double _x, double _y /* = 0.*/) const {
+    if (!active_)
+      return -1;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
@@ -562,118 +565,107 @@ namespace ecaldqm
     return mes_[iME]->getTH1()->FindBin(_x, _y);
   }
 
-  bool
-  MESetEcal::isVariableBinning() const
-  {
+  bool MESetEcal::isVariableBinning() const {
     return (xaxis_ && xaxis_->edges) || (yaxis_ && yaxis_->edges) || (zaxis_ && zaxis_->edges);
   }
 
-  std::vector<std::string>
-  MESetEcal::generatePaths() const
-  {
+  std::vector<std::string> MESetEcal::generatePaths() const {
     using namespace std;
 
     vector<string> paths(0);
 
     unsigned nME(binning::getNObjects(otype_));
 
-    for(unsigned iME(0); iME < nME; iME++) {
+    for (unsigned iME(0); iME < nME; iME++) {
       binning::ObjectType obj(binning::getObject(otype_, iME));
 
       string path(path_);
       map<string, string> replacements;
 
-      switch(obj){
-      case binning::kEB:
-      case binning::kEBMEM:
-        replacements["subdet"] = "EcalBarrel";
-        replacements["prefix"] = "EB";
-        replacements["suffix"] = "";
-        replacements["subdetshort"] = "EB";
-        replacements["subdetshortsig"] = "EB";
-        replacements["supercrystal"] = "trigger tower";
-        break;
-      case binning::kEE:
-      case binning::kEEMEM:
-        replacements["subdet"] = "EcalEndcap";
-        replacements["prefix"] = "EE";
-        replacements["subdetshort"] = "EE";
-        replacements["subdetshortsig"] = "EE";
-        replacements["supercrystal"] = "super crystal";
-        break;
-      case binning::kEEm:
-        replacements["subdet"] = "EcalEndcap";
-        replacements["prefix"] = "EE";
-        replacements["suffix"] = " EE -";
-        replacements["subdetshort"] = "EE";
-        replacements["subdetshortsig"] = "EEM";
-        replacements["supercrystal"] = "super crystal";
-        break;
-      case binning::kEEp:
-        replacements["subdet"] = "EcalEndcap";
-        replacements["prefix"] = "EE";
-        replacements["suffix"] = " EE +";
-        replacements["subdetshort"] = "EE";
-        replacements["subdetshortsig"] = "EEP";
-        replacements["supercrystal"] = "super crystal";
-        break;
-      case binning::kSM:
-        if(iME <= kEEmHigh || iME >= kEEpLow){
+      switch (obj) {
+        case binning::kEB:
+        case binning::kEBMEM:
+          replacements["subdet"] = "EcalBarrel";
+          replacements["prefix"] = "EB";
+          replacements["suffix"] = "";
+          replacements["subdetshort"] = "EB";
+          replacements["subdetshortsig"] = "EB";
+          replacements["supercrystal"] = "trigger tower";
+          break;
+        case binning::kEE:
+        case binning::kEEMEM:
           replacements["subdet"] = "EcalEndcap";
           replacements["prefix"] = "EE";
+          replacements["subdetshort"] = "EE";
+          replacements["subdetshortsig"] = "EE";
           replacements["supercrystal"] = "super crystal";
-        }
-        else{
+          break;
+        case binning::kEEm:
+          replacements["subdet"] = "EcalEndcap";
+          replacements["prefix"] = "EE";
+          replacements["suffix"] = " EE -";
+          replacements["subdetshort"] = "EE";
+          replacements["subdetshortsig"] = "EEM";
+          replacements["supercrystal"] = "super crystal";
+          break;
+        case binning::kEEp:
+          replacements["subdet"] = "EcalEndcap";
+          replacements["prefix"] = "EE";
+          replacements["suffix"] = " EE +";
+          replacements["subdetshort"] = "EE";
+          replacements["subdetshortsig"] = "EEP";
+          replacements["supercrystal"] = "super crystal";
+          break;
+        case binning::kSM:
+          if (iME <= kEEmHigh || iME >= kEEpLow) {
+            replacements["subdet"] = "EcalEndcap";
+            replacements["prefix"] = "EE";
+            replacements["supercrystal"] = "super crystal";
+          } else {
+            replacements["subdet"] = "EcalBarrel";
+            replacements["prefix"] = "EB";
+            replacements["supercrystal"] = "trigger tower";
+          }
+          replacements["sm"] = binning::channelName(iME + 1);
+          break;
+        case binning::kEBSM:
           replacements["subdet"] = "EcalBarrel";
           replacements["prefix"] = "EB";
+          replacements["sm"] = binning::channelName(iME + kEBmLow + 1);
           replacements["supercrystal"] = "trigger tower";
-        }
-        replacements["sm"] = binning::channelName(iME + 1);
-        break;
-      case binning::kEBSM:
-        replacements["subdet"] = "EcalBarrel";
-        replacements["prefix"] = "EB";
-        replacements["sm"] = binning::channelName(iME + kEBmLow + 1);
-        replacements["supercrystal"] = "trigger tower";
-        break;
-      case binning::kEESM:
-        replacements["subdet"] = "EcalEndcap";
-        replacements["prefix"] = "EE";
-        replacements["sm"] = binning::channelName(iME <= kEEmHigh ? iME + 1 : iME + 37);
-        replacements["supercrystal"] = "super crystal";
-        break;
-      case binning::kSMMEM:
-        {
+          break;
+        case binning::kEESM:
+          replacements["subdet"] = "EcalEndcap";
+          replacements["prefix"] = "EE";
+          replacements["sm"] = binning::channelName(iME <= kEEmHigh ? iME + 1 : iME + 37);
+          replacements["supercrystal"] = "super crystal";
+          break;
+        case binning::kSMMEM: {
           unsigned iDCC(memDCCId(iME) - 1);
-          //dccId(unsigned) skips DCCs without MEM
-          if(iDCC <= kEEmHigh || iDCC >= kEEpLow){
+          // dccId(unsigned) skips DCCs without MEM
+          if (iDCC <= kEEmHigh || iDCC >= kEEpLow) {
             replacements["subdet"] = "EcalEndcap";
             replacements["prefix"] = "EE";
-          }
-          else{
+          } else {
             replacements["subdet"] = "EcalBarrel";
             replacements["prefix"] = "EB";
           }
           replacements["sm"] = binning::channelName(iDCC + 1);
-        }
-        break;
-      case binning::kEBSMMEM:
-        {
+        } break;
+        case binning::kEBSMMEM: {
           unsigned iDCC(memDCCId(iME + 4) - 1);
           replacements["subdet"] = "EcalBarrel";
           replacements["prefix"] = "EB";
           replacements["sm"] = binning::channelName(iDCC + 1);
-        }
-        break;
-      case binning::kEESMMEM:
-        {
+        } break;
+        case binning::kEESMMEM: {
           unsigned iDCC(memDCCId(iME < 4 ? iME : iME + 36) - 1);
           replacements["subdet"] = "EcalEndcap";
           replacements["prefix"] = "EE";
           replacements["sm"] = binning::channelName(iDCC + 1);
         }
-      default:
-        break;
+        default:
+          break;
       }
 
       paths.push_back(formPath(replacements));
@@ -681,4 +673,4 @@ namespace ecaldqm
 
     return paths;
   }
-}
+}  // namespace ecaldqm
diff --git a/DQM/EcalCommon/src/MESetMulti.cc b/DQM/EcalCommon/src/MESetMulti.cc
index 84b7802a845fd..e6f0cd6a17b0e 100644
--- a/DQM/EcalCommon/src/MESetMulti.cc
+++ b/DQM/EcalCommon/src/MESetMulti.cc
@@ -1,87 +1,82 @@
 #include "DQM/EcalCommon/interface/MESetMulti.h"
 
-namespace ecaldqm
-{
-  MESetMulti::MESetMulti(MESet const& _seed, ReplCandidates const& _replCandidates) :
-    MESet(_seed),
-    current_(nullptr),
-    sets_(),
-    replCandidates_(_replCandidates)
-  {
+namespace ecaldqm {
+  MESetMulti::MESetMulti(MESet const &_seed, ReplCandidates const &_replCandidates)
+      : MESet(_seed), current_(nullptr), sets_(), replCandidates_(_replCandidates) {
     PathReplacements replacements;
     std::map<std::string, unsigned> indices;
     // recursive function to set replacements
     // indices gives the multi index in each dimension
     // dimensions are alphanumerically ordered from the use of std::map
-    std::function<bool(typename ReplCandidates::const_iterator&)> setReplacements([&setReplacements, &replacements, &indices, this](typename ReplCandidates::const_iterator& _rItr){
-        unsigned& index(indices[_rItr->first]);
-        replacements[_rItr->first] = _rItr->second[index];
-        // one dimension set, go to next
-        ++_rItr;
-        if(_rItr == this->replCandidates_.end()){
-          // this is the last dimension. Increment the index and retutn to the first
-          _rItr = this->replCandidates_.begin();
-          ++index;
-        }
-        else if(setReplacements(_rItr))
-          ++index;
-
-        if(index != _rItr->second.size()) return false;
-        // index has counted to the maximum of this dimension, carry over
-        index = 0;
-        return true;
-      });
+    std::function<bool(typename ReplCandidates::const_iterator &)> setReplacements(
+        [&setReplacements, &replacements, &indices, this](typename ReplCandidates::const_iterator &_rItr) {
+          unsigned &index(indices[_rItr->first]);
+          replacements[_rItr->first] = _rItr->second[index];
+          // one dimension set, go to next
+          ++_rItr;
+          if (_rItr == this->replCandidates_.end()) {
+            // this is the last dimension. Increment the index and retutn to the
+            // first
+            _rItr = this->replCandidates_.begin();
+            ++index;
+          } else if (setReplacements(_rItr))
+            ++index;
+
+          if (index != _rItr->second.size())
+            return false;
+          // index has counted to the maximum of this dimension, carry over
+          index = 0;
+          return true;
+        });
 
     // [dim0 = 0, dim1 = 0] -> 0, [dim0 = 0, dim1 = 1] -> 1, ...
     unsigned iM(0);
-    while(true){
+    while (true) {
       replacements.clear();
       typename ReplCandidates::const_iterator rItr(replCandidates_.begin());
       bool last(setReplacements(rItr));
       sets_.push_back(_seed.clone(formPath(replacements)));
-      if(last) break;
+      if (last)
+        break;
       ++iM;
     }
 
     current_ = sets_[0];
   }
 
-  MESetMulti::MESetMulti(MESetMulti const& _orig) :
-    MESet(_orig),
-    current_(nullptr),
-    sets_(_orig.sets_.size(), nullptr),
-    replCandidates_(_orig.replCandidates_)
-  {
-    if(sets_.empty()) return;
+  MESetMulti::MESetMulti(MESetMulti const &_orig)
+      : MESet(_orig), current_(nullptr), sets_(_orig.sets_.size(), nullptr), replCandidates_(_orig.replCandidates_) {
+    if (sets_.empty())
+      return;
 
-    for(unsigned iS(0); iS < sets_.size(); ++iS){
-      if(!_orig.sets_[iS]) continue;
+    for (unsigned iS(0); iS < sets_.size(); ++iS) {
+      if (!_orig.sets_[iS])
+        continue;
       sets_[iS] = _orig.sets_[iS]->clone();
-      if(_orig.sets_[iS] == _orig.current_) current_ = sets_[iS];
+      if (_orig.sets_[iS] == _orig.current_)
+        current_ = sets_[iS];
     }
   }
 
-  MESetMulti::~MESetMulti()
-  {
-    for(unsigned iS(0); iS < sets_.size(); ++iS)
+  MESetMulti::~MESetMulti() {
+    for (unsigned iS(0); iS < sets_.size(); ++iS)
       delete sets_[iS];
   }
 
-  MESet&
-  MESetMulti::operator=(MESet const& _rhs)
-  {
-    for(unsigned iS(0); iS < sets_.size(); ++iS)
+  MESet &MESetMulti::operator=(MESet const &_rhs) {
+    for (unsigned iS(0); iS < sets_.size(); ++iS)
       delete sets_[iS];
     sets_.clear();
     current_ = nullptr;
 
-    MESetMulti const* pRhs(dynamic_cast<MESetMulti const*>(&_rhs));
-    if(pRhs){
+    MESetMulti const *pRhs(dynamic_cast<MESetMulti const *>(&_rhs));
+    if (pRhs) {
       sets_.assign(pRhs->sets_.size(), nullptr);
 
-      for(unsigned iS(0); iS < pRhs->sets_.size(); ++iS){
+      for (unsigned iS(0); iS < pRhs->sets_.size(); ++iS) {
         sets_[iS] = pRhs->sets_[iS]->clone();
-        if(pRhs->sets_[iS] == pRhs->current_) current_ = sets_[iS];
+        if (pRhs->sets_[iS] == pRhs->current_)
+          current_ = sets_[iS];
       }
 
       replCandidates_ = pRhs->replCandidates_;
@@ -90,81 +85,69 @@ namespace ecaldqm
     return MESet::operator=(_rhs);
   }
 
-  MESet*
-  MESetMulti::clone(std::string const& _path/* = ""*/) const
-  {
+  MESet *MESetMulti::clone(std::string const &_path /* = ""*/) const {
     std::string path(path_);
-    if(_path != "") path_ = _path;
-    MESet* copy(new MESetMulti(*this));
+    if (!_path.empty())
+      path_ = _path;
+    MESet *copy(new MESetMulti(*this));
     path_ = path;
     return copy;
   }
 
-  void
-  MESetMulti::book(DQMStore::IBooker& _ibooker)
-  {
-    for(unsigned iS(0); iS < sets_.size(); ++iS)
+  void MESetMulti::book(DQMStore::IBooker &_ibooker) {
+    for (unsigned iS(0); iS < sets_.size(); ++iS)
       sets_[iS]->book(_ibooker);
 
     active_ = true;
   }
 
-  bool
-  MESetMulti::retrieve(DQMStore::IGetter& _igetter, std::string* _failedPath/* = 0*/) const
-  {
-    for(unsigned iS(0); iS < sets_.size(); ++iS)
-      if(!sets_[iS]->retrieve(_igetter, _failedPath)) return false;
+  bool MESetMulti::retrieve(DQMStore::IGetter &_igetter, std::string *_failedPath /* = 0*/) const {
+    for (unsigned iS(0); iS < sets_.size(); ++iS)
+      if (!sets_[iS]->retrieve(_igetter, _failedPath))
+        return false;
 
     active_ = true;
     return true;
   }
 
-  void
-  MESetMulti::clear() const
-  {
-    for(unsigned iS(0); iS < sets_.size(); ++iS)
+  void MESetMulti::clear() const {
+    for (unsigned iS(0); iS < sets_.size(); ++iS)
       sets_[iS]->clear();
 
     active_ = false;
   }
 
-  void
-  MESetMulti::reset(double _content/* = 0*/, double _error/* = 0.*/, double _entries/* = 0.*/)
-  {
-    for(unsigned iS(0); iS < sets_.size(); ++iS)
+  void MESetMulti::reset(double _content /* = 0*/, double _error /* = 0.*/, double _entries /* = 0.*/) {
+    for (unsigned iS(0); iS < sets_.size(); ++iS)
       sets_[iS]->reset(_content, _error, _entries);
   }
 
-  void
-  MESetMulti::resetAll(double _content/* = 0*/, double _error/* = 0.*/, double _entries/* = 0.*/)
-  {
-    for(unsigned iS(0); iS < sets_.size(); ++iS)
+  void MESetMulti::resetAll(double _content /* = 0*/, double _error /* = 0.*/, double _entries /* = 0.*/) {
+    for (unsigned iS(0); iS < sets_.size(); ++iS)
       sets_[iS]->resetAll(_content, _error, _entries);
   }
 
-  void
-  MESetMulti::use(unsigned _iSet) const
-  {
-    if(_iSet >= sets_.size())
+  void MESetMulti::use(unsigned _iSet) const {
+    if (_iSet >= sets_.size())
       throw_("MESetMulti index out of range");
 
     current_ = sets_[_iSet];
   }
 
-  unsigned
-  MESetMulti::getIndex(PathReplacements const& _replacements) const
-  {
+  unsigned MESetMulti::getIndex(PathReplacements const &_replacements) const {
     unsigned index(0);
     unsigned base(1);
-    for(typename ReplCandidates::const_reverse_iterator cItr(replCandidates_.rbegin()); cItr != replCandidates_.rend(); ++cItr){
+    for (typename ReplCandidates::const_reverse_iterator cItr(replCandidates_.rbegin()); cItr != replCandidates_.rend();
+         ++cItr) {
       typename PathReplacements::const_iterator rItr(_replacements.find(cItr->first));
-      if(rItr == _replacements.end())
+      if (rItr == _replacements.end())
         throw_(cItr->first + " not given in the key for getIndex");
       unsigned nC(cItr->second.size());
       unsigned iR(0);
-      for(; iR != nC; ++iR)
-        if(rItr->second == cItr->second[iR]) break;
-      if(iR == nC)
+      for (; iR != nC; ++iR)
+        if (rItr->second == cItr->second[iR])
+          break;
+      if (iR == nC)
         throw_(rItr->second + " not found in replacement candidates");
       index += iR * base;
       base *= nC;
@@ -172,4 +155,4 @@ namespace ecaldqm
 
     return index;
   }
-}
+}  // namespace ecaldqm
diff --git a/DQM/EcalCommon/src/MESetNonObject.cc b/DQM/EcalCommon/src/MESetNonObject.cc
index b0823f771756d..c9f71c0a9b07a 100644
--- a/DQM/EcalCommon/src/MESetNonObject.cc
+++ b/DQM/EcalCommon/src/MESetNonObject.cc
@@ -1,33 +1,31 @@
 #include "DQM/EcalCommon/interface/MESetNonObject.h"
 
-namespace ecaldqm
-{
-  MESetNonObject::MESetNonObject(std::string const& _fullPath, binning::ObjectType _otype, binning::BinningType _btype, MonitorElement::Kind _kind, binning::AxisSpecs const* _xaxis/* = 0*/, binning::AxisSpecs const* _yaxis/* = 0*/, binning::AxisSpecs const* _zaxis/* = 0*/) :
-    MESet(_fullPath, _otype, _btype, _kind),
-    xaxis_(_xaxis ? new binning::AxisSpecs(*_xaxis) : nullptr),
-    yaxis_(_yaxis ? new binning::AxisSpecs(*_yaxis) : nullptr),
-    zaxis_(_zaxis ? new binning::AxisSpecs(*_zaxis) : nullptr)
-  {
-  }
-
-  MESetNonObject::MESetNonObject(MESetNonObject const& _orig) :
-    MESet(_orig),
-    xaxis_(_orig.xaxis_ ? new binning::AxisSpecs(*_orig.xaxis_) : nullptr),
-    yaxis_(_orig.yaxis_ ? new binning::AxisSpecs(*_orig.yaxis_) : nullptr),
-    zaxis_(_orig.zaxis_ ? new binning::AxisSpecs(*_orig.zaxis_) : nullptr)
-  {
-  }
-
-  MESetNonObject::~MESetNonObject()
-  {
+namespace ecaldqm {
+  MESetNonObject::MESetNonObject(std::string const &_fullPath,
+                                 binning::ObjectType _otype,
+                                 binning::BinningType _btype,
+                                 MonitorElement::Kind _kind,
+                                 binning::AxisSpecs const *_xaxis /* = 0*/,
+                                 binning::AxisSpecs const *_yaxis /* = 0*/,
+                                 binning::AxisSpecs const *_zaxis /* = 0*/)
+      : MESet(_fullPath, _otype, _btype, _kind),
+        xaxis_(_xaxis ? new binning::AxisSpecs(*_xaxis) : nullptr),
+        yaxis_(_yaxis ? new binning::AxisSpecs(*_yaxis) : nullptr),
+        zaxis_(_zaxis ? new binning::AxisSpecs(*_zaxis) : nullptr) {}
+
+  MESetNonObject::MESetNonObject(MESetNonObject const &_orig)
+      : MESet(_orig),
+        xaxis_(_orig.xaxis_ ? new binning::AxisSpecs(*_orig.xaxis_) : nullptr),
+        yaxis_(_orig.yaxis_ ? new binning::AxisSpecs(*_orig.yaxis_) : nullptr),
+        zaxis_(_orig.zaxis_ ? new binning::AxisSpecs(*_orig.zaxis_) : nullptr) {}
+
+  MESetNonObject::~MESetNonObject() {
     delete xaxis_;
     delete yaxis_;
     delete zaxis_;
   }
 
-  MESet&
-  MESetNonObject::operator=(MESet const& _rhs)
-  {
+  MESet &MESetNonObject::operator=(MESet const &_rhs) {
     delete xaxis_;
     delete yaxis_;
     delete zaxis_;
@@ -35,158 +33,159 @@ namespace ecaldqm
     yaxis_ = nullptr;
     zaxis_ = nullptr;
 
-    MESetNonObject const* pRhs(dynamic_cast<MESetNonObject const*>(&_rhs));
-    if(pRhs){
-      if(pRhs->xaxis_) xaxis_ = new binning::AxisSpecs(*pRhs->xaxis_);
-      if(pRhs->yaxis_) yaxis_ = new binning::AxisSpecs(*pRhs->yaxis_);
-      if(pRhs->zaxis_) zaxis_ = new binning::AxisSpecs(*pRhs->zaxis_);
+    MESetNonObject const *pRhs(dynamic_cast<MESetNonObject const *>(&_rhs));
+    if (pRhs) {
+      if (pRhs->xaxis_)
+        xaxis_ = new binning::AxisSpecs(*pRhs->xaxis_);
+      if (pRhs->yaxis_)
+        yaxis_ = new binning::AxisSpecs(*pRhs->yaxis_);
+      if (pRhs->zaxis_)
+        zaxis_ = new binning::AxisSpecs(*pRhs->zaxis_);
     }
     return MESet::operator=(_rhs);
   }
 
-  MESet*
-  MESetNonObject::clone(std::string const& _path/* = ""*/) const
-  {
+  MESet *MESetNonObject::clone(std::string const &_path /* = ""*/) const {
     std::string path(path_);
-    if(!_path.empty()) path_ = _path;
-    MESet* copy(new MESetNonObject(*this));
+    if (!_path.empty())
+      path_ = _path;
+    MESet *copy(new MESetNonObject(*this));
     path_ = path;
     return copy;
   }
 
-  void
-  MESetNonObject::book(DQMStore::IBooker& _ibooker)
-  {
+  void MESetNonObject::book(DQMStore::IBooker &_ibooker) {
     using namespace std;
 
     clear();
 
-    if(path_.find('%') != string::npos)
+    if (path_.find('%') != string::npos)
       throw_("book() called with incompletely formed path");
 
     size_t slashPos(path_.find_last_of('/'));
     string name(path_.substr(slashPos + 1));
     _ibooker.setCurrentFolder(path_.substr(0, slashPos));
 
-    MonitorElement* me(nullptr);
+    MonitorElement *me(nullptr);
 
-    switch(kind_) {
-    case MonitorElement::DQM_KIND_REAL :
-      me = _ibooker.bookFloat(name);
-      break;
+    switch (kind_) {
+      case MonitorElement::DQM_KIND_REAL:
+        me = _ibooker.bookFloat(name);
+        break;
 
-    case MonitorElement::DQM_KIND_TH1F :
-      {
-        if(!xaxis_)
+      case MonitorElement::DQM_KIND_TH1F: {
+        if (!xaxis_)
           throw_("No xaxis found for MESetNonObject");
 
-        if(xaxis_->edges)
+        if (xaxis_->edges)
           me = _ibooker.book1D(name, name, xaxis_->nbins, xaxis_->edges);
         else
           me = _ibooker.book1D(name, name, xaxis_->nbins, xaxis_->low, xaxis_->high);
-      }
-      break;
+      } break;
 
-    case MonitorElement::DQM_KIND_TPROFILE :
-      {
-        if(!xaxis_)
+      case MonitorElement::DQM_KIND_TPROFILE: {
+        if (!xaxis_)
           throw_("No xaxis found for MESetNonObject");
 
         double ylow, yhigh;
-        if(!yaxis_){
+        if (!yaxis_) {
           ylow = -numeric_limits<double>::max();
           yhigh = numeric_limits<double>::max();
-        }
-        else{
+        } else {
           ylow = yaxis_->low;
           yhigh = yaxis_->high;
         }
-        if(xaxis_->edges){
+        if (xaxis_->edges) {
           // DQMStore bookProfile interface uses double* for bin edges
-          double* edges(new double[xaxis_->nbins + 1]);
+          double *edges(new double[xaxis_->nbins + 1]);
           std::copy(xaxis_->edges, xaxis_->edges + xaxis_->nbins + 1, edges);
           me = _ibooker.bookProfile(name, name, xaxis_->nbins, edges, ylow, yhigh, "");
           delete[] edges;
-        }
-        else
+        } else
           me = _ibooker.bookProfile(name, name, xaxis_->nbins, xaxis_->low, xaxis_->high, ylow, yhigh, "");
-      }
-      break;
+      } break;
 
-    case MonitorElement::DQM_KIND_TH2F :
-      {
-        if(!xaxis_ || !yaxis_)
+      case MonitorElement::DQM_KIND_TH2F: {
+        if (!xaxis_ || !yaxis_)
           throw_("No x/yaxis found for MESetNonObject");
 
-        if(!xaxis_->edges || !yaxis_->edges) // unlike MESetEcal, if either of X or Y is not set as variable, binning will be fixed
-          me = _ibooker.book2D(name, name, xaxis_->nbins, xaxis_->low, xaxis_->high, yaxis_->nbins, yaxis_->low, yaxis_->high);
+        if (!xaxis_->edges || !yaxis_->edges)  // unlike MESetEcal, if either of X or Y is not set as
+                                               // variable, binning will be fixed
+          me = _ibooker.book2D(
+              name, name, xaxis_->nbins, xaxis_->low, xaxis_->high, yaxis_->nbins, yaxis_->low, yaxis_->high);
         else
           me = _ibooker.book2D(name, name, xaxis_->nbins, xaxis_->edges, yaxis_->nbins, yaxis_->edges);
-      }
-      break;
+      } break;
 
-    case MonitorElement::DQM_KIND_TPROFILE2D :
-      {
-        if(!xaxis_ || !yaxis_)
+      case MonitorElement::DQM_KIND_TPROFILE2D: {
+        if (!xaxis_ || !yaxis_)
           throw_("No x/yaxis found for MESetNonObject");
-        if(xaxis_->edges || yaxis_->edges)
+        if (xaxis_->edges || yaxis_->edges)
           throw_("Variable bin size for 2D profile not implemented");
 
         double high(0.), low(0.);
-        if(zaxis_){
+        if (zaxis_) {
           low = zaxis_->low;
           high = zaxis_->high;
-        }
-        else{
+        } else {
           low = -numeric_limits<double>::max();
           high = numeric_limits<double>::max();
         }
 
-        me = _ibooker.bookProfile2D(name, name, xaxis_->nbins, xaxis_->low, xaxis_->high, yaxis_->nbins, yaxis_->low, yaxis_->high, low, high, "");
-      }
-      break;
-
-    default :
-      throw_("Unsupported MonitorElement kind");
+        me = _ibooker.bookProfile2D(name,
+                                    name,
+                                    xaxis_->nbins,
+                                    xaxis_->low,
+                                    xaxis_->high,
+                                    yaxis_->nbins,
+                                    yaxis_->low,
+                                    yaxis_->high,
+                                    low,
+                                    high,
+                                    "");
+      } break;
+
+      default:
+        throw_("Unsupported MonitorElement kind");
     }
 
-    if(xaxis_){
+    if (xaxis_) {
       me->setAxisTitle(xaxis_->title, 1);
-      if(xaxis_->labels){
-        for(int iBin(1); iBin <= xaxis_->nbins; ++iBin)
+      if (xaxis_->labels) {
+        for (int iBin(1); iBin <= xaxis_->nbins; ++iBin)
           me->setBinLabel(iBin, xaxis_->labels[iBin - 1], 1);
       }
     }
-    if(yaxis_){
+    if (yaxis_) {
       me->setAxisTitle(yaxis_->title, 2);
-      if(yaxis_->labels){
-        for(int iBin(1); iBin <= yaxis_->nbins; ++iBin)
+      if (yaxis_->labels) {
+        for (int iBin(1); iBin <= yaxis_->nbins; ++iBin)
           me->setBinLabel(iBin, yaxis_->labels[iBin - 1], 2);
       }
     }
-    if(zaxis_){
+    if (zaxis_) {
       me->setAxisTitle(zaxis_->title, 3);
-      if(zaxis_->labels){
-        for(int iBin(1); iBin <= zaxis_->nbins; ++iBin)
+      if (zaxis_->labels) {
+        for (int iBin(1); iBin <= zaxis_->nbins; ++iBin)
           me->setBinLabel(iBin, zaxis_->labels[iBin - 1], 3);
       }
     }
 
-    if(lumiFlag_) me->setLumiFlag();
+    if (lumiFlag_)
+      me->setLumiFlag();
 
     mes_.push_back(me);
 
     active_ = true;
   }
 
-  bool
-  MESetNonObject::retrieve(DQMStore::IGetter& _igetter, std::string* _failedPath/* = 0*/) const
-  {
+  bool MESetNonObject::retrieve(DQMStore::IGetter &_igetter, std::string *_failedPath /* = 0*/) const {
     mes_.clear();
 
-    MonitorElement* me(_igetter.get(path_));
-    if(!me){
-      if(_failedPath) *_failedPath = path_;
+    MonitorElement *me(_igetter.get(path_));
+    if (!me) {
+      if (_failedPath)
+        *_failedPath = path_;
       return false;
     }
 
@@ -196,121 +195,125 @@ namespace ecaldqm
     return true;
   }
 
-  void
-  MESetNonObject::fill(double _x, double _wy/* = 1.*/, double _w/* = 1.*/)
-  {
-    if(!active_) return;
-
-    if(mes_.empty() || !mes_[0]) return;
-
-    switch(kind_) {
-    case MonitorElement::DQM_KIND_REAL :
-      mes_[0]->Fill(_x);
-      break;
-    case MonitorElement::DQM_KIND_TH1F :
-    case MonitorElement::DQM_KIND_TPROFILE :
-      mes_[0]->Fill(_x, _wy);
-      break;
-    case MonitorElement::DQM_KIND_TH2F :
-    case MonitorElement::DQM_KIND_TPROFILE2D :
-      mes_[0]->Fill(_x, _wy, _w);
-      break;
-    default :
-      break;
+  void MESetNonObject::fill(double _x, double _wy /* = 1.*/, double _w /* = 1.*/) {
+    if (!active_)
+      return;
+
+    if (mes_.empty() || !mes_[0])
+      return;
+
+    switch (kind_) {
+      case MonitorElement::DQM_KIND_REAL:
+        mes_[0]->Fill(_x);
+        break;
+      case MonitorElement::DQM_KIND_TH1F:
+      case MonitorElement::DQM_KIND_TPROFILE:
+        mes_[0]->Fill(_x, _wy);
+        break;
+      case MonitorElement::DQM_KIND_TH2F:
+      case MonitorElement::DQM_KIND_TPROFILE2D:
+        mes_[0]->Fill(_x, _wy, _w);
+        break;
+      default:
+        break;
     }
   }
 
-  void
-  MESetNonObject::setBinContent(int _bin, double _content)
-  {
-    if(!active_) return;
-    if(kind_ == MonitorElement::DQM_KIND_REAL) return;
+  void MESetNonObject::setBinContent(int _bin, double _content) {
+    if (!active_)
+      return;
+    if (kind_ == MonitorElement::DQM_KIND_REAL)
+      return;
 
-    if(mes_.empty() || !mes_[0]) return;
+    if (mes_.empty() || !mes_[0])
+      return;
 
     mes_[0]->setBinContent(_bin, _content);
   }
 
-  void
-  MESetNonObject::setBinError(int _bin, double _error)
-  {
-    if(!active_) return;
-    if(kind_ == MonitorElement::DQM_KIND_REAL) return;
+  void MESetNonObject::setBinError(int _bin, double _error) {
+    if (!active_)
+      return;
+    if (kind_ == MonitorElement::DQM_KIND_REAL)
+      return;
 
-    if(mes_.empty() || !mes_[0]) return;
+    if (mes_.empty() || !mes_[0])
+      return;
 
     mes_[0]->setBinError(_bin, _error);
   }
 
-  void
-  MESetNonObject::setBinEntries(int _bin, double _entries)
-  {
-    if(!active_) return;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return;
+  void MESetNonObject::setBinEntries(int _bin, double _entries) {
+    if (!active_)
+      return;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return;
 
-    if(mes_.empty() || !mes_[0]) return;
+    if (mes_.empty() || !mes_[0])
+      return;
 
     mes_[0]->setBinEntries(_bin, _entries);
   }
 
-  double
-  MESetNonObject::getBinContent(int _bin, int) const
-  {
-    if(!active_) return 0.;
-    if(kind_ == MonitorElement::DQM_KIND_REAL) return 0.;
+  double MESetNonObject::getBinContent(int _bin, int) const {
+    if (!active_)
+      return 0.;
+    if (kind_ == MonitorElement::DQM_KIND_REAL)
+      return 0.;
 
-    if(mes_.empty() || !mes_[0]) return 0.;
+    if (mes_.empty() || !mes_[0])
+      return 0.;
 
     return mes_[0]->getBinContent(_bin);
   }
 
-  double
-  MESetNonObject::getFloatValue() const
-  {
-    if(kind_ == MonitorElement::DQM_KIND_REAL) return mes_[0]->getFloatValue();
-    else return 0.;
+  double MESetNonObject::getFloatValue() const {
+    if (kind_ == MonitorElement::DQM_KIND_REAL)
+      return mes_[0]->getFloatValue();
+    else
+      return 0.;
   }
 
-  double
-  MESetNonObject::getBinError(int _bin, int) const
-  {
-    if(!active_) return 0.;
-    if(kind_ == MonitorElement::DQM_KIND_REAL) return 0.;
+  double MESetNonObject::getBinError(int _bin, int) const {
+    if (!active_)
+      return 0.;
+    if (kind_ == MonitorElement::DQM_KIND_REAL)
+      return 0.;
 
-    if(mes_.empty() || !mes_[0]) return 0.;
+    if (mes_.empty() || !mes_[0])
+      return 0.;
 
     return mes_[0]->getBinError(_bin);
   }
 
-  double
-  MESetNonObject::getBinEntries(int _bin, int) const
-  {
-    if(!active_) return 0.;
-    if(kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D) return 0.;
+  double MESetNonObject::getBinEntries(int _bin, int) const {
+    if (!active_)
+      return 0.;
+    if (kind_ != MonitorElement::DQM_KIND_TPROFILE && kind_ != MonitorElement::DQM_KIND_TPROFILE2D)
+      return 0.;
 
-    if(mes_.empty() || !mes_[0]) return 0.;
+    if (mes_.empty() || !mes_[0])
+      return 0.;
 
     return mes_[0]->getBinEntries(_bin);
   }
 
-  int
-  MESetNonObject::findBin(double _x, double _y/* = 0.*/) const
-  {
-    if(!active_) return 0;
+  int MESetNonObject::findBin(double _x, double _y /* = 0.*/) const {
+    if (!active_)
+      return 0;
 
-    if(mes_.empty() || !mes_[0]) return 0;
+    if (mes_.empty() || !mes_[0])
+      return 0;
 
-    if(kind_ == MonitorElement::DQM_KIND_TH1F || kind_ == MonitorElement::DQM_KIND_TPROFILE)
+    if (kind_ == MonitorElement::DQM_KIND_TH1F || kind_ == MonitorElement::DQM_KIND_TPROFILE)
       return mes_[0]->getTH1()->FindBin(_x);
-    else if(kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D)
+    else if (kind_ == MonitorElement::DQM_KIND_TH2F || kind_ == MonitorElement::DQM_KIND_TPROFILE2D)
       return mes_[0]->getTH1()->FindBin(_x, _y);
     else
       return 0;
   }
 
-  bool
-  MESetNonObject::isVariableBinning() const
-  {
+  bool MESetNonObject::isVariableBinning() const {
     return (xaxis_ && xaxis_->edges) || (yaxis_ && yaxis_->edges) || (zaxis_ && zaxis_->edges);
   }
-}
+}  // namespace ecaldqm
diff --git a/DQM/EcalCommon/src/MESetProjection.cc b/DQM/EcalCommon/src/MESetProjection.cc
index 3e080848155db..0413af4e0fc58 100644
--- a/DQM/EcalCommon/src/MESetProjection.cc
+++ b/DQM/EcalCommon/src/MESetProjection.cc
@@ -2,156 +2,150 @@
 
 #include "DQM/EcalCommon/interface/EcalDQMCommonUtils.h"
 
-namespace ecaldqm
-{
-  MESetProjection::MESetProjection(std::string const& _fullPath, binning::ObjectType _otype, binning::BinningType _btype, MonitorElement::Kind _kind, binning::AxisSpecs const* _yaxis/* = 0*/) :
-    MESetEcal(_fullPath, _otype, _btype, _kind, 1, nullptr, _yaxis)
-  {
-    switch(kind_){
-    case MonitorElement::DQM_KIND_TH1F:
-    case MonitorElement::DQM_KIND_TPROFILE:
-      break;
-    default:
-      throw_("Unsupported MonitorElement kind");
+namespace ecaldqm {
+  MESetProjection::MESetProjection(std::string const &_fullPath,
+                                   binning::ObjectType _otype,
+                                   binning::BinningType _btype,
+                                   MonitorElement::Kind _kind,
+                                   binning::AxisSpecs const *_yaxis /* = 0*/)
+      : MESetEcal(_fullPath, _otype, _btype, _kind, 1, nullptr, _yaxis) {
+    switch (kind_) {
+      case MonitorElement::DQM_KIND_TH1F:
+      case MonitorElement::DQM_KIND_TPROFILE:
+        break;
+      default:
+        throw_("Unsupported MonitorElement kind");
     }
 
-    switch(btype_){
-    case binning::kProjEta:
-    case binning::kProjPhi:
-      break;
-    default:
-      throw_("Unsupported binning");
+    switch (btype_) {
+      case binning::kProjEta:
+      case binning::kProjPhi:
+        break;
+      default:
+        throw_("Unsupported binning");
     }
   }
 
-  MESetProjection::MESetProjection(MESetProjection const& _orig) :
-    MESetEcal(_orig)
-  {
-  }
+  MESetProjection::MESetProjection(MESetProjection const &_orig) : MESetEcal(_orig) {}
 
-  MESetProjection::~MESetProjection()
-  {
-  }
+  MESetProjection::~MESetProjection() {}
 
-  MESet*
-  MESetProjection::clone(std::string const& _path/* = ""*/) const
-  {
+  MESet *MESetProjection::clone(std::string const &_path /* = ""*/) const {
     std::string path(path_);
-    if(_path != "") path_ = _path;
-    MESet* copy(new MESetProjection(*this));
+    if (!_path.empty())
+      path_ = _path;
+    MESet *copy(new MESetProjection(*this));
     path_ = path;
     return copy;
   }
 
-  void
-  MESetProjection::fill(DetId const& _id, double _w/* = 1.*/, double, double)
-  {
-    if(!active_) return;
+  void MESetProjection::fill(DetId const &_id, double _w /* = 1.*/, double, double) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
     int subdet(_id.subdetId());
 
-    if(subdet == EcalBarrel){
+    if (subdet == EcalBarrel) {
       EBDetId ebid(_id);
-      if(btype_ == binning::kProjEta)
+      if (btype_ == binning::kProjEta)
         fill_(iME, eta(ebid), _w, 0.);
-      else if(btype_ == binning::kProjPhi)
+      else if (btype_ == binning::kProjPhi)
         fill_(iME, phi(ebid), _w, 0.);
-    }
-    else if(subdet == EcalEndcap){
+    } else if (subdet == EcalEndcap) {
       EEDetId eeid(_id);
-      if(btype_ == binning::kProjEta)
+      if (btype_ == binning::kProjEta)
         fill_(iME, eta(eeid), _w, 0.);
-      if(btype_ == binning::kProjPhi){
+      if (btype_ == binning::kProjPhi) {
         fill_(iME, phi(eeid), _w, 0.);
       }
-    }
-    else if(isEndcapTTId(_id)){
+    } else if (isEndcapTTId(_id)) {
       EcalTrigTowerDetId ttid(_id);
       std::vector<DetId> ids(getTrigTowerMap()->constituentsOf(ttid));
       unsigned nIds(ids.size());
-      if(btype_ == binning::kProjEta){
-        for(unsigned iId(0); iId < nIds; iId++)
+      if (btype_ == binning::kProjEta) {
+        for (unsigned iId(0); iId < nIds; iId++)
           fill_(iME, eta(EEDetId(ids[iId])), _w / nIds, 0.);
-      }
-      else if(btype_ == binning::kProjPhi){
-        for(unsigned iId(0); iId < nIds; iId++)
+      } else if (btype_ == binning::kProjPhi) {
+        for (unsigned iId(0); iId < nIds; iId++)
           fill_(iME, phi(EEDetId(ids[iId])), _w / nIds, 0.);
       }
-    }
-    else if(subdet == EcalTriggerTower){
+    } else if (subdet == EcalTriggerTower) {
       EcalTrigTowerDetId ttid(_id);
-      if(btype_ == binning::kProjEta){
+      if (btype_ == binning::kProjEta) {
         int ieta(ttid.ieta());
-        if(ieta < 18 && ieta > 0)
+        if (ieta < 18 && ieta > 0)
           fill_(iME, (ieta * 5 - 2.5) * EBDetId::crystalUnitToEta, _w, 0.);
-        else if(ieta > -18 && ieta < 0)
+        else if (ieta > -18 && ieta < 0)
           fill_(iME, (ieta * 5 + 2.5) * EBDetId::crystalUnitToEta, _w, 0.);
-      }
-      else if(btype_ == binning::kProjPhi)
+      } else if (btype_ == binning::kProjPhi)
         fill_(iME, phi(ttid), _w, 0.);
     }
   }
 
-  void
-  MESetProjection::fill(int _subdet, double _x/* = 1.*/, double _w/* = 1.*/, double)
-  {
-    if(!active_) return;
+  void MESetProjection::fill(int _subdet, double _x /* = 1.*/, double _w /* = 1.*/, double) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _subdet, btype_));
     checkME_(iME);
 
-    if(btype_ == binning::kProjPhi) _x = phi(_x);
+    if (btype_ == binning::kProjPhi)
+      _x = phi(_x);
 
     mes_[iME]->Fill(_x, _w);
   }
 
-  void
-  MESetProjection::fill(double _x, double _w/* = 1.*/, double)
-  {
-    if(!active_) return;
-    if(btype_ != binning::kProjEta) return;
+  void MESetProjection::fill(double _x, double _w /* = 1.*/, double) {
+    if (!active_)
+      return;
+    if (btype_ != binning::kProjEta)
+      return;
 
     unsigned iME;
-    if(_x < -etaBound) iME = 0;
-    else if(_x < etaBound) iME = 1;
-    else iME = 2;
+    if (_x < -etaBound)
+      iME = 0;
+    else if (_x < etaBound)
+      iME = 1;
+    else
+      iME = 2;
 
-    if(otype_ == binning::kEcal2P && iME == 2) iME = 0;
+    if (otype_ == binning::kEcal2P && iME == 2)
+      iME = 0;
 
     checkME_(iME);
 
     mes_[iME]->Fill(_x, _w);
   }
 
-  void
-  MESetProjection::setBinContent(DetId const& _id, double _content)
-  {
-    if(!active_) return;
+  void MESetProjection::setBinContent(DetId const &_id, double _content) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
-    if(isEndcapTTId(_id)){
+    if (isEndcapTTId(_id)) {
       EcalTrigTowerDetId ttid(_id);
       std::vector<DetId> ids(getTrigTowerMap()->constituentsOf(ttid));
       unsigned nIds(ids.size());
       std::set<int> bins;
-      if(btype_ == binning::kProjEta){
-        for(unsigned iId(0); iId < nIds; iId++){
+      if (btype_ == binning::kProjEta) {
+        for (unsigned iId(0); iId < nIds; iId++) {
           int bin(me->getTH1()->FindBin(eta(EEDetId(ids[iId]))));
-          if(bins.find(bin) != bins.end()) continue;
+          if (bins.find(bin) != bins.end())
+            continue;
           me->setBinContent(bin, _content);
         }
-      }
-      else if(btype_ == binning::kProjPhi){
-        for(unsigned iId(0); iId < nIds; iId++){
+      } else if (btype_ == binning::kProjPhi) {
+        for (unsigned iId(0); iId < nIds; iId++) {
           int bin(me->getTH1()->FindBin(phi(EEDetId(ids[iId]))));
-          if(bins.find(bin) != bins.end()) continue;
+          if (bins.find(bin) != bins.end())
+            continue;
           me->setBinContent(bin, _content);
         }
       }
@@ -160,29 +154,26 @@ namespace ecaldqm
 
     double x(0.);
     int subdet(_id.subdetId());
-    if(subdet == EcalBarrel){
+    if (subdet == EcalBarrel) {
       EBDetId ebid(_id);
-      if(btype_ == binning::kProjEta)
+      if (btype_ == binning::kProjEta)
         x = eta(ebid);
-      else if(btype_ == binning::kProjPhi)
+      else if (btype_ == binning::kProjPhi)
         x = phi(ebid);
-    }
-    else if(subdet == EcalEndcap){
-      if(btype_ == binning::kProjEta)
+    } else if (subdet == EcalEndcap) {
+      if (btype_ == binning::kProjEta)
         x = eta(EEDetId(_id));
-      else if(btype_ == binning::kProjPhi)
+      else if (btype_ == binning::kProjPhi)
         x = phi(EEDetId(_id));
-    }
-    else if(subdet == EcalTriggerTower){
+    } else if (subdet == EcalTriggerTower) {
       EcalTrigTowerDetId ttid(_id);
-      if(btype_ == binning::kProjEta){
+      if (btype_ == binning::kProjEta) {
         int ieta(ttid.ieta());
-        if(ieta < 18 && ieta > 0)
+        if (ieta < 18 && ieta > 0)
           x = (ieta * 5 - 2.5) * EBDetId::crystalUnitToEta;
-        else if(ieta > -18 && ieta < 0)
+        else if (ieta > -18 && ieta < 0)
           x = (ieta * 5 + 2.5) * EBDetId::crystalUnitToEta;
-      }
-      else if(btype_ == binning::kProjPhi)
+      } else if (btype_ == binning::kProjPhi)
         x = phi(ttid);
     }
 
@@ -190,32 +181,32 @@ namespace ecaldqm
     me->setBinContent(bin, _content);
   }
 
-  void
-  MESetProjection::setBinError(DetId const& _id, double _error)
-  {
-    if(!active_) return;
+  void MESetProjection::setBinError(DetId const &_id, double _error) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
-    if(isEndcapTTId(_id)){
+    if (isEndcapTTId(_id)) {
       EcalTrigTowerDetId ttid(_id);
       std::vector<DetId> ids(getTrigTowerMap()->constituentsOf(ttid));
       unsigned nIds(ids.size());
       std::set<int> bins;
-      if(btype_ == binning::kProjEta){
-        for(unsigned iId(0); iId < nIds; iId++){
+      if (btype_ == binning::kProjEta) {
+        for (unsigned iId(0); iId < nIds; iId++) {
           int bin(me->getTH1()->FindBin(eta(EEDetId(ids[iId]))));
-          if(bins.find(bin) != bins.end()) continue;
+          if (bins.find(bin) != bins.end())
+            continue;
           me->setBinError(bin, _error);
         }
-      }
-      else if(btype_ == binning::kProjPhi){
-        for(unsigned iId(0); iId < nIds; iId++){
+      } else if (btype_ == binning::kProjPhi) {
+        for (unsigned iId(0); iId < nIds; iId++) {
           int bin(me->getTH1()->FindBin(phi(EEDetId(ids[iId]))));
-          if(bins.find(bin) != bins.end()) continue;
+          if (bins.find(bin) != bins.end())
+            continue;
           me->setBinError(bin, _error);
         }
       }
@@ -224,29 +215,26 @@ namespace ecaldqm
 
     double x(0.);
     int subdet(_id.subdetId());
-    if(subdet == EcalBarrel){
+    if (subdet == EcalBarrel) {
       EBDetId ebid(_id);
-      if(btype_ == binning::kProjEta)
+      if (btype_ == binning::kProjEta)
         x = eta(ebid);
-      else if(btype_ == binning::kProjPhi)
+      else if (btype_ == binning::kProjPhi)
         x = phi(ebid);
-    }
-    else if(subdet == EcalEndcap){
-      if(btype_ == binning::kProjEta)
+    } else if (subdet == EcalEndcap) {
+      if (btype_ == binning::kProjEta)
         x = eta(EEDetId(_id));
-      else if(btype_ == binning::kProjPhi)
+      else if (btype_ == binning::kProjPhi)
         x = phi(EEDetId(_id));
-     }
-    else if(subdet == EcalTriggerTower){
+    } else if (subdet == EcalTriggerTower) {
       EcalTrigTowerDetId ttid(_id);
-      if(btype_ == binning::kProjEta){
+      if (btype_ == binning::kProjEta) {
         int ieta(ttid.ieta());
-        if(ieta < 18 && ieta > 0)
+        if (ieta < 18 && ieta > 0)
           x = (ieta * 5 - 2.5) * EBDetId::crystalUnitToEta;
-        else if(ieta > -18 && ieta < 0)
+        else if (ieta > -18 && ieta < 0)
           x = (ieta * 5 + 2.5) * EBDetId::crystalUnitToEta;
-      }
-      else if(btype_ == binning::kProjPhi)
+      } else if (btype_ == binning::kProjPhi)
         x = phi(ttid);
     }
 
@@ -254,32 +242,32 @@ namespace ecaldqm
     me->setBinError(bin, _error);
   }
 
-  void
-  MESetProjection::setBinEntries(DetId const& _id, double _entries)
-  {
-    if(!active_) return;
+  void MESetProjection::setBinEntries(DetId const &_id, double _entries) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
-    if(isEndcapTTId(_id)){
+    if (isEndcapTTId(_id)) {
       EcalTrigTowerDetId ttid(_id);
       std::vector<DetId> ids(getTrigTowerMap()->constituentsOf(ttid));
       unsigned nIds(ids.size());
       std::set<int> bins;
-      if(btype_ == binning::kProjEta){
-        for(unsigned iId(0); iId < nIds; iId++){
+      if (btype_ == binning::kProjEta) {
+        for (unsigned iId(0); iId < nIds; iId++) {
           int bin(me->getTH1()->FindBin(eta(EEDetId(ids[iId]))));
-          if(bins.find(bin) != bins.end()) continue;
+          if (bins.find(bin) != bins.end())
+            continue;
           me->setBinEntries(bin, _entries);
         }
-      }
-      else if(btype_ == binning::kProjPhi){
-        for(unsigned iId(0); iId < nIds; iId++){
+      } else if (btype_ == binning::kProjPhi) {
+        for (unsigned iId(0); iId < nIds; iId++) {
           int bin(me->getTH1()->FindBin(phi(EEDetId(ids[iId]))));
-          if(bins.find(bin) != bins.end()) continue;
+          if (bins.find(bin) != bins.end())
+            continue;
           me->setBinEntries(bin, _entries);
         }
       }
@@ -288,29 +276,26 @@ namespace ecaldqm
 
     double x(0.);
     int subdet(_id.subdetId());
-    if(subdet == EcalBarrel){
+    if (subdet == EcalBarrel) {
       EBDetId ebid(_id);
-      if(btype_ == binning::kProjEta)
+      if (btype_ == binning::kProjEta)
         x = eta(ebid);
-      else if(btype_ == binning::kProjPhi)
+      else if (btype_ == binning::kProjPhi)
         x = phi(ebid);
-    }
-    else if(subdet == EcalEndcap){
-      if(btype_ == binning::kProjEta)
+    } else if (subdet == EcalEndcap) {
+      if (btype_ == binning::kProjEta)
         x = eta(EEDetId(_id));
-      else if(btype_ == binning::kProjPhi)
+      else if (btype_ == binning::kProjPhi)
         x = phi(EEDetId(_id));
-    }
-    else if(subdet == EcalTriggerTower){
+    } else if (subdet == EcalTriggerTower) {
       EcalTrigTowerDetId ttid(_id);
-      if(btype_ == binning::kProjEta){
+      if (btype_ == binning::kProjEta) {
         int ieta(ttid.ieta());
-        if(ieta < 18 && ieta > 0)
+        if (ieta < 18 && ieta > 0)
           x = (ieta * 5 - 2.5) * EBDetId::crystalUnitToEta;
-        else if(ieta > -18 && ieta < 0)
+        else if (ieta > -18 && ieta < 0)
           x = (ieta * 5 + 2.5) * EBDetId::crystalUnitToEta;
-      }
-      else if(btype_ == binning::kProjPhi)
+      } else if (btype_ == binning::kProjPhi)
         x = phi(ttid);
     }
 
@@ -318,24 +303,22 @@ namespace ecaldqm
     me->setBinEntries(bin, _entries);
   }
 
-  double
-  MESetProjection::getBinContent(DetId const& _id, int) const
-  {
-    if(!active_) return 0.;
+  double MESetProjection::getBinContent(DetId const &_id, int) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
-    if(isEndcapTTId(_id)){
+    if (isEndcapTTId(_id)) {
       EcalTrigTowerDetId ttid(_id);
       std::vector<DetId> ids(getTrigTowerMap()->constituentsOf(ttid));
-      if(btype_ == binning::kProjEta){
+      if (btype_ == binning::kProjEta) {
         int bin(me->getTH1()->FindBin(eta(EEDetId(ids[0]))));
         return me->getBinContent(bin);
-      }
-      else if(btype_ == binning::kProjPhi){
+      } else if (btype_ == binning::kProjPhi) {
         int bin(me->getTH1()->FindBin(phi(EEDetId(ids[0]))));
         return me->getBinContent(bin);
       }
@@ -344,29 +327,26 @@ namespace ecaldqm
 
     double x(0.);
     int subdet(_id.subdetId());
-    if(subdet == EcalBarrel){
+    if (subdet == EcalBarrel) {
       EBDetId ebid(_id);
-      if(btype_ == binning::kProjEta)
+      if (btype_ == binning::kProjEta)
         x = eta(ebid);
-      else if(btype_ == binning::kProjPhi)
+      else if (btype_ == binning::kProjPhi)
         x = phi(ebid);
-    }
-    else if(subdet == EcalEndcap){
-      if(btype_ == binning::kProjEta)
+    } else if (subdet == EcalEndcap) {
+      if (btype_ == binning::kProjEta)
         x = eta(EEDetId(_id));
-      else if(btype_ == binning::kProjPhi)
+      else if (btype_ == binning::kProjPhi)
         x = phi(EEDetId(_id));
-    }
-    else if(subdet == EcalTriggerTower){
+    } else if (subdet == EcalTriggerTower) {
       EcalTrigTowerDetId ttid(_id);
-      if(btype_ == binning::kProjEta){
+      if (btype_ == binning::kProjEta) {
         int ieta(ttid.ieta());
-        if(ieta < 18 && ieta > 0)
+        if (ieta < 18 && ieta > 0)
           x = (ieta * 5 - 2.5) * EBDetId::crystalUnitToEta;
-        else if(ieta > -18 && ieta < 0)
+        else if (ieta > -18 && ieta < 0)
           x = (ieta * 5 + 2.5) * EBDetId::crystalUnitToEta;
-      }
-      else if(btype_ == binning::kProjPhi)
+      } else if (btype_ == binning::kProjPhi)
         x = phi(ttid);
     }
 
@@ -374,24 +354,22 @@ namespace ecaldqm
     return me->getBinContent(bin);
   }
 
-  double
-  MESetProjection::getBinError(DetId const& _id, int) const
-  {
-    if(!active_) return 0.;
+  double MESetProjection::getBinError(DetId const &_id, int) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
-    if(isEndcapTTId(_id)){
+    if (isEndcapTTId(_id)) {
       EcalTrigTowerDetId ttid(_id);
       std::vector<DetId> ids(getTrigTowerMap()->constituentsOf(ttid));
-      if(btype_ == binning::kProjEta){
+      if (btype_ == binning::kProjEta) {
         int bin(me->getTH1()->FindBin(eta(EEDetId(ids[0]))));
         return me->getBinError(bin);
-      }
-      else if(btype_ == binning::kProjPhi){
+      } else if (btype_ == binning::kProjPhi) {
         int bin(me->getTH1()->FindBin(phi(EEDetId(ids[0]))));
         return me->getBinError(bin);
       }
@@ -400,29 +378,26 @@ namespace ecaldqm
 
     double x(0.);
     int subdet(_id.subdetId());
-    if(subdet == EcalBarrel){
+    if (subdet == EcalBarrel) {
       EBDetId ebid(_id);
-      if(btype_ == binning::kProjEta)
+      if (btype_ == binning::kProjEta)
         x = eta(ebid);
-      else if(btype_ == binning::kProjPhi)
+      else if (btype_ == binning::kProjPhi)
         x = phi(ebid);
-    }
-    else if(subdet == EcalEndcap){
-      if(btype_ == binning::kProjEta)
+    } else if (subdet == EcalEndcap) {
+      if (btype_ == binning::kProjEta)
         x = eta(EEDetId(_id));
-      else if(btype_ == binning::kProjPhi)
+      else if (btype_ == binning::kProjPhi)
         x = phi(EEDetId(_id));
-    }
-    else if(subdet == EcalTriggerTower){
+    } else if (subdet == EcalTriggerTower) {
       EcalTrigTowerDetId ttid(_id);
-      if(btype_ == binning::kProjEta){
+      if (btype_ == binning::kProjEta) {
         int ieta(ttid.ieta());
-        if(ieta < 18 && ieta > 0)
+        if (ieta < 18 && ieta > 0)
           x = (ieta * 5 - 2.5) * EBDetId::crystalUnitToEta;
-        else if(ieta > -18 && ieta < 0)
+        else if (ieta > -18 && ieta < 0)
           x = (ieta * 5 + 2.5) * EBDetId::crystalUnitToEta;
-      }
-      else if(btype_ == binning::kProjPhi)
+      } else if (btype_ == binning::kProjPhi)
         x = phi(ttid);
     }
 
@@ -430,24 +405,22 @@ namespace ecaldqm
     return me->getBinError(bin);
   }
 
-  double
-  MESetProjection::getBinEntries(DetId const& _id, int) const
-  {
-    if(!active_) return 0.;
+  double MESetProjection::getBinEntries(DetId const &_id, int) const {
+    if (!active_)
+      return 0.;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    MonitorElement* me(mes_[iME]);
+    MonitorElement *me(mes_[iME]);
 
-    if(isEndcapTTId(_id)){
+    if (isEndcapTTId(_id)) {
       EcalTrigTowerDetId ttid(_id);
       std::vector<DetId> ids(getTrigTowerMap()->constituentsOf(ttid));
-      if(btype_ == binning::kProjEta){
+      if (btype_ == binning::kProjEta) {
         int bin(me->getTH1()->FindBin(eta(EEDetId(ids[0]))));
         return me->getBinEntries(bin);
-      }
-      else if(btype_ == binning::kProjPhi){
+      } else if (btype_ == binning::kProjPhi) {
         int bin(me->getTH1()->FindBin(phi(EEDetId(ids[0]))));
         return me->getBinEntries(bin);
       }
@@ -456,29 +429,26 @@ namespace ecaldqm
 
     double x(0.);
     int subdet(_id.subdetId());
-    if(subdet == EcalBarrel){
+    if (subdet == EcalBarrel) {
       EBDetId ebid(_id);
-      if(btype_ == binning::kProjEta)
+      if (btype_ == binning::kProjEta)
         x = eta(ebid);
-      else if(btype_ == binning::kProjPhi)
+      else if (btype_ == binning::kProjPhi)
         x = phi(ebid);
-    }
-    else if(subdet == EcalEndcap){
-      if(btype_ == binning::kProjEta)
+    } else if (subdet == EcalEndcap) {
+      if (btype_ == binning::kProjEta)
         x = eta(EEDetId(_id));
-      else if(btype_ == binning::kProjPhi)
+      else if (btype_ == binning::kProjPhi)
         x = phi(EEDetId(_id));
-    }
-    else if(subdet == EcalTriggerTower){
+    } else if (subdet == EcalTriggerTower) {
       EcalTrigTowerDetId ttid(_id);
-      if(btype_ == binning::kProjEta){
+      if (btype_ == binning::kProjEta) {
         int ieta(ttid.ieta());
-        if(ieta < 18 && ieta > 0)
+        if (ieta < 18 && ieta > 0)
           x = (ieta * 5 - 2.5) * EBDetId::crystalUnitToEta;
-        else if(ieta > -18 && ieta < 0)
+        else if (ieta > -18 && ieta < 0)
           x = (ieta * 5 + 2.5) * EBDetId::crystalUnitToEta;
-      }
-      else if(btype_ == binning::kProjPhi)
+      } else if (btype_ == binning::kProjPhi)
         x = phi(ttid);
     }
 
@@ -486,4 +456,4 @@ namespace ecaldqm
     return me->getBinEntries(bin);
   }
 
-}
+}  // namespace ecaldqm
diff --git a/DQM/EcalCommon/src/MESetTrend.cc b/DQM/EcalCommon/src/MESetTrend.cc
index c281dad435498..6d437db566125 100644
--- a/DQM/EcalCommon/src/MESetTrend.cc
+++ b/DQM/EcalCommon/src/MESetTrend.cc
@@ -4,36 +4,33 @@
 
 namespace ecaldqm {
 
-  MESetTrend::MESetTrend(std::string const& _fullPath, binning::ObjectType _otype, binning::BinningType _btype, MonitorElement::Kind _kind, binning::AxisSpecs const* _xaxis/* = 0*/, binning::AxisSpecs const* _yaxis/* = 0*/) :
-    MESetEcal(_fullPath, _otype, _btype, _kind, 1, _xaxis, _yaxis),
-    minutely_(false),
-    shiftAxis_(false),
-    currentBin_(-1)
-  {
-    switch(kind_){
-    case MonitorElement::DQM_KIND_TH1F:
-    case MonitorElement::DQM_KIND_TH2F:
-    case MonitorElement::DQM_KIND_TPROFILE:
-    case MonitorElement::DQM_KIND_TPROFILE2D:
-      break;
-    default:
-      throw_("Unsupported MonitorElement kind");
+  MESetTrend::MESetTrend(std::string const &_fullPath,
+                         binning::ObjectType _otype,
+                         binning::BinningType _btype,
+                         MonitorElement::Kind _kind,
+                         binning::AxisSpecs const *_xaxis /* = 0*/,
+                         binning::AxisSpecs const *_yaxis /* = 0*/)
+      : MESetEcal(_fullPath, _otype, _btype, _kind, 1, _xaxis, _yaxis),
+        minutely_(false),
+        shiftAxis_(false),
+        currentBin_(-1) {
+    switch (kind_) {
+      case MonitorElement::DQM_KIND_TH1F:
+      case MonitorElement::DQM_KIND_TH2F:
+      case MonitorElement::DQM_KIND_TPROFILE:
+      case MonitorElement::DQM_KIND_TPROFILE2D:
+        break;
+      default:
+        throw_("Unsupported MonitorElement kind");
     }
   }
 
-  MESetTrend::MESetTrend(MESetTrend const& _orig) :
-    MESetEcal(_orig),
-    minutely_(_orig.minutely_),
-    shiftAxis_(_orig.shiftAxis_),
-    currentBin_(_orig.currentBin_)
-  {
-  }
+  MESetTrend::MESetTrend(MESetTrend const &_orig)
+      : MESetEcal(_orig), minutely_(_orig.minutely_), shiftAxis_(_orig.shiftAxis_), currentBin_(_orig.currentBin_) {}
 
-  MESet&
-  MESetTrend::operator=(MESet const& _rhs)
-  {
-    MESetTrend const* pRhs(dynamic_cast<MESetTrend const*>(&_rhs));
-    if(pRhs){
+  MESet &MESetTrend::operator=(MESet const &_rhs) {
+    MESetTrend const *pRhs(dynamic_cast<MESetTrend const *>(&_rhs));
+    if (pRhs) {
       minutely_ = pRhs->minutely_;
       shiftAxis_ = pRhs->shiftAxis_;
       currentBin_ = pRhs->currentBin_;
@@ -42,105 +39,99 @@ namespace ecaldqm {
     return MESetEcal::operator=(_rhs);
   }
 
-  MESet*
-  MESetTrend::clone(std::string const& _path/* = ""*/) const
-  {
+  MESet *MESetTrend::clone(std::string const &_path /* = ""*/) const {
     std::string path(path_);
-    if(_path != "") path_ = _path;
-    MESet* copy(new MESetTrend(*this));
+    if (!_path.empty())
+      path_ = _path;
+    MESet *copy(new MESetTrend(*this));
     path_ = path;
     return copy;
   }
 
-  void
-  MESetTrend::book(DQMStore::IBooker& _ibooker)
-  {
+  void MESetTrend::book(DQMStore::IBooker &_ibooker) {
     binning::AxisSpecs xaxis;
-    if(xaxis_) xaxis = *xaxis_;
-    else{
+    if (xaxis_)
+      xaxis = *xaxis_;
+    else {
       xaxis.nbins = 200;
       xaxis.low = 0.;
       xaxis.high = 2000.;
     }
 
-    if(minutely_){
+    if (minutely_) {
       time_t localTime(time(nullptr));
       struct tm timeBuffer;
-      gmtime_r(&localTime, &timeBuffer); // gmtime() is not thread safe
+      gmtime_r(&localTime, &timeBuffer);  // gmtime() is not thread safe
       unsigned utcTime(mktime(&timeBuffer));
 
       xaxis.low = utcTime;
-      if(xaxis_) xaxis.high = utcTime + xaxis_->high - xaxis_->low;
-      else xaxis.high = xaxis.low + 200 * 60.;
+      if (xaxis_)
+        xaxis.high = utcTime + xaxis_->high - xaxis_->low;
+      else
+        xaxis.high = xaxis.low + 200 * 60.;
     }
 
-    binning::AxisSpecs const* xaxisTemp(xaxis_);
+    binning::AxisSpecs const *xaxisTemp(xaxis_);
     xaxis_ = &xaxis;
 
     MESetEcal::book(_ibooker);
 
     xaxis_ = xaxisTemp;
 
-    if(minutely_){
-      for(unsigned iME(0); iME < mes_.size(); ++iME)
+    if (minutely_) {
+      for (unsigned iME(0); iME < mes_.size(); ++iME)
         mes_[iME]->getTH1()->GetXaxis()->SetTimeDisplay(1);
       setAxisTitle("UTC");
-    }
-    else
+    } else
       setAxisTitle("LumiSections");
   }
 
-  void
-  MESetTrend::fill(DetId const& _id, double _t, double _wy/* = 1.*/, double _w/* = 1.*/)
-  {
-    if(!active_) return;
+  void MESetTrend::fill(DetId const &_id, double _t, double _wy /* = 1.*/, double _w /* = 1.*/) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    if(shift_(unsigned(_t)))
+    if (shift_(unsigned(_t)))
       fill_(iME, _t + 0.5, _wy, _w);
   }
 
-  void
-  MESetTrend::fill(EcalElectronicsId const& _id, double _t, double _wy/* = 1.*/, double _w/* = 1.*/)
-  {
-    if(!active_) return;
+  void MESetTrend::fill(EcalElectronicsId const &_id, double _t, double _wy /* = 1.*/, double _w /* = 1.*/) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
 
-    if(shift_(unsigned(_t)))
+    if (shift_(unsigned(_t)))
       fill_(iME, _t + 0.5, _wy, _w);
   }
 
-  void
-  MESetTrend::fill(int _dcctccid, double _t, double _wy/* = 1.*/, double _w/* = 1.*/)
-  {
-    if(!active_) return;
+  void MESetTrend::fill(int _dcctccid, double _t, double _wy /* = 1.*/, double _w /* = 1.*/) {
+    if (!active_)
+      return;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
 
-    if(shift_(unsigned(_t)))
+    if (shift_(unsigned(_t)))
       fill_(iME, _t + 0.5, _wy, _w);
   }
 
-  void
-  MESetTrend::fill(double _t, double _wy/* = 1.*/, double _w/* = 1.*/)
-  {
-    if(!active_) return;
-    if(mes_.size() != 1)
+  void MESetTrend::fill(double _t, double _wy /* = 1.*/, double _w /* = 1.*/) {
+    if (!active_)
+      return;
+    if (mes_.size() != 1)
       throw_("MESet type incompatible");
 
-    if(shift_(unsigned(_t)))
+    if (shift_(unsigned(_t)))
       fill_(0, _t + 0.5, _wy, _w);
   }
 
-  int
-  MESetTrend::findBin(DetId const& _id, double _t, double _y/* = 0.*/) const
-  {
-    if(!active_) return -1;
+  int MESetTrend::findBin(DetId const &_id, double _t, double _y /* = 0.*/) const {
+    if (!active_)
+      return -1;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -148,10 +139,9 @@ namespace ecaldqm {
     return mes_[iME]->getTH1()->FindBin(_t + 0.5, _y);
   }
 
-  int
-  MESetTrend::findBin(EcalElectronicsId const& _id, double _t, double _y/* = 0.*/) const
-  {
-    if(!active_) return -1;
+  int MESetTrend::findBin(EcalElectronicsId const &_id, double _t, double _y /* = 0.*/) const {
+    if (!active_)
+      return -1;
 
     unsigned iME(binning::findPlotIndex(otype_, _id));
     checkME_(iME);
@@ -159,10 +149,9 @@ namespace ecaldqm {
     return mes_[iME]->getTH1()->FindBin(_t + 0.5, _y);
   }
 
-  int
-  MESetTrend::findBin(int _dcctccid, double _t, double _y/* = 0.*/) const
-  {
-    if(!active_) return -1;
+  int MESetTrend::findBin(int _dcctccid, double _t, double _y /* = 0.*/) const {
+    if (!active_)
+      return -1;
 
     unsigned iME(binning::findPlotIndex(otype_, _dcctccid, btype_));
     checkME_(iME);
@@ -170,50 +159,47 @@ namespace ecaldqm {
     return mes_[iME]->getTH1()->FindBin(_t + 0.5, _y);
   }
 
-  int
-  MESetTrend::findBin(double _t, double _y/* = 0.*/) const
-  {
-    if(!active_) return -1;
-    if(mes_.size() != 1)
+  int MESetTrend::findBin(double _t, double _y /* = 0.*/) const {
+    if (!active_)
+      return -1;
+    if (mes_.size() != 1)
       throw_("MESet type incompatible");
 
     return mes_[0]->getTH1()->FindBin(_t + 0.5, _y);
   }
 
-  void
-  MESetTrend::setCumulative()
-  {
-    if(kind_ == MonitorElement::DQM_KIND_TPROFILE || kind_ == MonitorElement::DQM_KIND_TPROFILE2D)
+  void MESetTrend::setCumulative() {
+    if (kind_ == MonitorElement::DQM_KIND_TPROFILE || kind_ == MonitorElement::DQM_KIND_TPROFILE2D)
       throw_("Cumulative flag set for a profile plot");
     currentBin_ = 1;
   }
 
-  bool
-  MESetTrend::shift_(unsigned _t)
-  {
-    TAxis* tAxis(mes_[0]->getTH1()->GetXaxis());
+  bool MESetTrend::shift_(unsigned _t) {
+    TAxis *tAxis(mes_[0]->getTH1()->GetXaxis());
     int nbinsX(tAxis->GetNbins());
     unsigned tLow(tAxis->GetBinLowEdge(1));
     unsigned tHigh(tAxis->GetBinUpEdge(nbinsX));
 
-    if(!shiftAxis_) return _t >= tLow && _t < tHigh;
+    if (!shiftAxis_)
+      return _t >= tLow && _t < tHigh;
 
     int dBin(0);
     int unitsPerBin((tHigh - tLow) / nbinsX);
 
-    if(_t >= tLow && _t < tHigh){
-      if(currentBin_ > 0){
+    if (_t >= tLow && _t < tHigh) {
+      if (currentBin_ > 0) {
         int thisBin(tAxis->FindBin(_t + 0.5));
-        if(thisBin < currentBin_) return false;
-        else if(thisBin > currentBin_){
-          for(unsigned iME(0); iME < mes_.size(); iME++){
-            MonitorElement* me(mes_[iME]);
+        if (thisBin < currentBin_)
+          return false;
+        else if (thisBin > currentBin_) {
+          for (unsigned iME(0); iME < mes_.size(); iME++) {
+            MonitorElement *me(mes_[iME]);
             int nbinsY(me->getTH1()->GetNbinsY());
-            for(int iy(1); iy <= nbinsY; ++iy){
+            for (int iy(1); iy <= nbinsY; ++iy) {
               int orig(me->getTH1()->GetBin(currentBin_, iy));
               double currentContent(me->getBinContent(orig));
               double currentError(me->getBinError(orig));
-              for(int ix(currentBin_); ix <= thisBin; ++ix){
+              for (int ix(currentBin_); ix <= thisBin; ++ix) {
                 int dest(me->getTH1()->GetBin(ix, iy));
                 me->setBinContent(dest, currentContent);
                 me->setBinError(dest, currentError);
@@ -224,54 +210,58 @@ namespace ecaldqm {
       }
 
       return true;
-    }
-    else if(_t >= tHigh){
+    } else if (_t >= tHigh) {
       dBin = (_t - tHigh) / unitsPerBin + 1;
-      if(currentBin_ > 0) currentBin_ = nbinsX;
-    }
-    else if(_t < tLow){
-      if(currentBin_ > 0) return false; // no going back in time in case of cumulative history
+      if (currentBin_ > 0)
+        currentBin_ = nbinsX;
+    } else if (_t < tLow) {
+      if (currentBin_ > 0)
+        return false;  // no going back in time in case of cumulative history
 
       int maxBin(0);
 
-      for(unsigned iME(0); iME < mes_.size(); iME++){
-	MonitorElement* me(mes_[iME]);
-
-	bool filled(false);
-	int iMax(nbinsX + 1);
-	while(--iMax > 0 && !filled){
-	  switch(kind_){
-	  case  MonitorElement::DQM_KIND_TH1F:
-	    if(me->getBinContent(iMax) != 0) filled = true;
-	    break;
-	  case MonitorElement::DQM_KIND_TPROFILE:
-	    if(me->getBinEntries(iMax) != 0) filled = true;
-	    break;
-	  case MonitorElement::DQM_KIND_TH2F:
-	    for(int iy(1); iy <= me->getNbinsY(); iy++){
-	      if(me->getBinContent(me->getTH1()->GetBin(iMax, iy)) != 0){
+      for (unsigned iME(0); iME < mes_.size(); iME++) {
+        MonitorElement *me(mes_[iME]);
+
+        bool filled(false);
+        int iMax(nbinsX + 1);
+        while (--iMax > 0 && !filled) {
+          switch (kind_) {
+            case MonitorElement::DQM_KIND_TH1F:
+              if (me->getBinContent(iMax) != 0)
                 filled = true;
-                break;
-              }
-            }
-	    break;
-	  case MonitorElement::DQM_KIND_TPROFILE2D:
-	    for(int iy(1); iy <= me->getNbinsY(); iy++){
-	      if(me->getBinEntries(me->getTH1()->GetBin(iMax, iy)) != 0){
+              break;
+            case MonitorElement::DQM_KIND_TPROFILE:
+              if (me->getBinEntries(iMax) != 0)
                 filled = true;
-                break;
+              break;
+            case MonitorElement::DQM_KIND_TH2F:
+              for (int iy(1); iy <= me->getNbinsY(); iy++) {
+                if (me->getBinContent(me->getTH1()->GetBin(iMax, iy)) != 0) {
+                  filled = true;
+                  break;
+                }
               }
-            }
-	    break;
-	  default:
-            break;
-	  }
-	}
+              break;
+            case MonitorElement::DQM_KIND_TPROFILE2D:
+              for (int iy(1); iy <= me->getNbinsY(); iy++) {
+                if (me->getBinEntries(me->getTH1()->GetBin(iMax, iy)) != 0) {
+                  filled = true;
+                  break;
+                }
+              }
+              break;
+            default:
+              break;
+          }
+        }
 
-	if(iMax > maxBin) maxBin = iMax;
+        if (iMax > maxBin)
+          maxBin = iMax;
       }
 
-      if(_t < tLow - (nbinsX - maxBin) * unitsPerBin) return false;
+      if (_t < tLow - (nbinsX - maxBin) * unitsPerBin)
+        return false;
 
       dBin = (_t - tLow) / unitsPerBin - 1;
     }
@@ -283,12 +273,12 @@ namespace ecaldqm {
     tLow += dBin * unitsPerBin;
     tHigh += dBin * unitsPerBin;
 
-    for(unsigned iME(0); iME < mes_.size(); iME++){
-      MonitorElement* me(mes_[iME]);
+    for (unsigned iME(0); iME < mes_.size(); iME++) {
+      MonitorElement *me(mes_[iME]);
 
       me->getTH1()->GetXaxis()->SetLimits(tLow, tHigh);
 
-      if((end - start) / step < 0){
+      if ((end - start) / step < 0) {
         me->Reset();
         continue;
       }
@@ -296,11 +286,10 @@ namespace ecaldqm {
       me->setEntries(0.);
       double entries(0.);
 
-      switch(kind_){
-      case MonitorElement::DQM_KIND_TH1F:
-        {
+      switch (kind_) {
+        case MonitorElement::DQM_KIND_TH1F: {
           int ix(start);
-          for(; ix != end; ix += step){
+          for (; ix != end; ix += step) {
             double binContent(me->getBinContent(ix));
             entries += binContent;
             me->setBinContent(ix - dBin, binContent);
@@ -309,43 +298,38 @@ namespace ecaldqm {
           ix = end - dBin - 1 * step;
           double lastContent(currentBin_ > 0 ? me->getBinContent(ix) : 0.);
           double lastError(currentBin_ > 0 ? me->getBinContent(ix) : 0.);
-          for(ix += step; ix != end; ix += step){
+          for (ix += step; ix != end; ix += step) {
             me->setBinContent(ix, lastContent);
             me->setBinError(ix, lastError);
           }
-        }
-        break;
-      case MonitorElement::DQM_KIND_TPROFILE:
-        {
+        } break;
+        case MonitorElement::DQM_KIND_TPROFILE: {
           int ix(start);
-          for(; ix != end; ix += step){
+          for (; ix != end; ix += step) {
             double binEntries(me->getBinEntries(ix));
             double binContent(me->getBinContent(ix));
             entries += binEntries;
             me->setBinEntries(ix - dBin, binEntries);
             me->setBinContent(ix - dBin, binContent * binEntries);
-            if(binEntries > 0){
+            if (binEntries > 0) {
               double rms(me->getBinError(ix) * std::sqrt(binEntries));
               double sumw2((rms * rms + binContent * binContent) * binEntries);
               me->setBinError(ix - dBin, std::sqrt(sumw2));
-            }
-            else
+            } else
               me->setBinError(ix - dBin, 0.);
           }
           ix = end - dBin;
-          for(; ix != end; ix += step){
+          for (; ix != end; ix += step) {
             me->setBinEntries(ix, 0.);
             me->setBinContent(ix, 0.);
             me->setBinError(ix, 0.);
           }
-        }
-        break;
-      case MonitorElement::DQM_KIND_TH2F:
-        {
+        } break;
+        case MonitorElement::DQM_KIND_TH2F: {
           int ix(start);
           int nbinsY(me->getNbinsY());
-          for(; ix != end; ix += step){
-            for(int iy(1); iy <= nbinsY; iy++){
+          for (; ix != end; ix += step) {
+            for (int iy(1); iy <= nbinsY; iy++) {
               int orig(me->getTH1()->GetBin(ix, iy));
               int dest(me->getTH1()->GetBin(ix - dBin, iy));
               double binContent(me->getBinContent(orig));
@@ -360,25 +344,23 @@ namespace ecaldqm {
           ix = end - dBin - 1 * step;
           std::vector<double> lastContent;
           std::vector<double> lastError;
-          for(int iy(1); iy <= nbinsY; iy++){
+          for (int iy(1); iy <= nbinsY; iy++) {
             lastContent.push_back(currentBin_ > 0 ? me->getBinContent(ix, iy) : 0.);
             lastError.push_back(currentBin_ > 0 ? me->getBinError(ix, iy) : 0.);
           }
-          for(ix += step; ix != end; ix += step){
-            for(int iy(1); iy <= nbinsY; iy++){
+          for (ix += step; ix != end; ix += step) {
+            for (int iy(1); iy <= nbinsY; iy++) {
               int bin(me->getTH1()->GetBin(ix, iy));
               me->setBinContent(bin, lastContent[iy - 1]);
               me->setBinError(bin, lastError[iy - 1]);
             }
           }
-        }
-        break;
-      case MonitorElement::DQM_KIND_TPROFILE2D:
-        {
+        } break;
+        case MonitorElement::DQM_KIND_TPROFILE2D: {
           int ix(start);
           int nbinsY(me->getNbinsY());
-          for(; ix != end; ix += step){
-            for(int iy(1); iy <= nbinsY; iy++){
+          for (; ix != end; ix += step) {
+            for (int iy(1); iy <= nbinsY; iy++) {
               int orig(me->getTH1()->GetBin(ix, iy));
               int dest(me->getTH1()->GetBin(ix - dBin, iy));
               double binEntries(me->getBinEntries(orig));
@@ -386,28 +368,26 @@ namespace ecaldqm {
               entries += binEntries;
               me->setBinEntries(dest, binEntries);
               me->setBinContent(dest, binContent * binEntries);
-              if(binEntries > 0){
+              if (binEntries > 0) {
                 double rms(me->getBinError(orig) * std::sqrt(binEntries));
                 double sumw2((rms * rms + binContent * binContent) * binEntries);
                 me->setBinError(dest, std::sqrt(sumw2));
-              }
-              else
+              } else
                 me->setBinError(dest, 0.);
             }
           }
           ix = end - dBin;
-          for(; ix != end; ix += step){
-            for(int iy(1); iy <= nbinsY; iy++){
+          for (; ix != end; ix += step) {
+            for (int iy(1); iy <= nbinsY; iy++) {
               int bin(me->getTH1()->GetBin(ix, iy));
               me->setBinEntries(bin, 0.);
               me->setBinContent(bin, 0.);
               me->setBinError(bin, 0.);
             }
           }
-        }
-        break;
-      default:
-        break;
+        } break;
+        default:
+          break;
       }
 
       me->setEntries(entries);
@@ -416,4 +396,4 @@ namespace ecaldqm {
     return true;
   }
 
-}
+}  // namespace ecaldqm
diff --git a/DQM/EcalCommon/src/MESetUtils.cc b/DQM/EcalCommon/src/MESetUtils.cc
index 7b86b1376e5c7..6ed3f75b8a4d9 100644
--- a/DQM/EcalCommon/src/MESetUtils.cc
+++ b/DQM/EcalCommon/src/MESetUtils.cc
@@ -1,23 +1,20 @@
 #include "DQM/EcalCommon/interface/MESetUtils.h"
 
-#include "DQM/EcalCommon/interface/MESetNonObject.h"
 #include "DQM/EcalCommon/interface/MESetChannel.h"
-#include "DQM/EcalCommon/interface/MESetEcal.h"
 #include "DQM/EcalCommon/interface/MESetDet0D.h"
 #include "DQM/EcalCommon/interface/MESetDet1D.h"
 #include "DQM/EcalCommon/interface/MESetDet2D.h"
+#include "DQM/EcalCommon/interface/MESetEcal.h"
+#include "DQM/EcalCommon/interface/MESetMulti.h"
+#include "DQM/EcalCommon/interface/MESetNonObject.h"
 #include "DQM/EcalCommon/interface/MESetProjection.h"
 #include "DQM/EcalCommon/interface/MESetTrend.h"
-#include "DQM/EcalCommon/interface/MESetMulti.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
-namespace ecaldqm
-{
-  MESet*
-  createMESet(edm::ParameterSet const& _MEParam)
-  {
+namespace ecaldqm {
+  MESet *createMESet(edm::ParameterSet const &_MEParam) {
     std::string path(_MEParam.getUntrackedParameter<std::string>("path"));
     binning::ObjectType otype(binning::translateObjectType(_MEParam.getUntrackedParameter<std::string>("otype")));
     binning::BinningType btype(binning::translateBinningType(_MEParam.getUntrackedParameter<std::string>("btype")));
@@ -25,109 +22,125 @@ namespace ecaldqm
 
     binning::AxisSpecs xaxis, yaxis, zaxis;
     bool hasXaxis(_MEParam.existsAs<edm::ParameterSet>("xaxis", false));
-    if(hasXaxis)
+    if (hasXaxis)
       xaxis = binning::formAxis(_MEParam.getUntrackedParameterSet("xaxis"));
     bool hasYaxis(_MEParam.existsAs<edm::ParameterSet>("yaxis", false));
-    if(hasYaxis)
+    if (hasYaxis)
       yaxis = binning::formAxis(_MEParam.getUntrackedParameterSet("yaxis"));
     bool hasZaxis(_MEParam.existsAs<edm::ParameterSet>("zaxis", false));
-    if(hasZaxis)
+    if (hasZaxis)
       zaxis = binning::formAxis(_MEParam.getUntrackedParameterSet("zaxis"));
 
-    MESet* set(nullptr);
+    MESet *set(nullptr);
 
-    if(btype == binning::kTrend){
-      MESetTrend* setTrend(new MESetTrend(path, otype, btype, kind, hasYaxis ? &yaxis : nullptr));
-      if(_MEParam.existsAs<bool>("minutely", false) && _MEParam.getUntrackedParameter<bool>("minutely")) setTrend->setMinutely();
-      if(_MEParam.existsAs<bool>("cumulative", false) && _MEParam.getUntrackedParameter<bool>("cumulative")) setTrend->setCumulative();
-      if(_MEParam.existsAs<bool>("shiftAxis", false) && _MEParam.getUntrackedParameter<bool>("shiftAxis")) setTrend->setShiftAxis();
+    if (btype == binning::kTrend) {
+      MESetTrend *setTrend(new MESetTrend(path, otype, btype, kind, hasYaxis ? &yaxis : nullptr));
+      if (_MEParam.existsAs<bool>("minutely", false) && _MEParam.getUntrackedParameter<bool>("minutely"))
+        setTrend->setMinutely();
+      if (_MEParam.existsAs<bool>("cumulative", false) && _MEParam.getUntrackedParameter<bool>("cumulative"))
+        setTrend->setCumulative();
+      if (_MEParam.existsAs<bool>("shiftAxis", false) && _MEParam.getUntrackedParameter<bool>("shiftAxis"))
+        setTrend->setShiftAxis();
       set = setTrend;
-    }
-    else if(otype == binning::nObjType)
-      set = new MESetNonObject(path, otype, btype, kind, hasXaxis ? &xaxis : nullptr, hasYaxis ? &yaxis : nullptr, hasZaxis ? &zaxis : nullptr);
-    else if(otype == binning::kChannel)
+    } else if (otype == binning::nObjType)
+      set = new MESetNonObject(path,
+                               otype,
+                               btype,
+                               kind,
+                               hasXaxis ? &xaxis : nullptr,
+                               hasYaxis ? &yaxis : nullptr,
+                               hasZaxis ? &zaxis : nullptr);
+    else if (otype == binning::kChannel)
 // Class removed until concurrency issue is finalized
 #if 0
       set = new MESetChannel(path, otype, btype, kind);
 #else
       set = nullptr;
 #endif
-    else if(btype == binning::kProjEta || btype == binning::kProjPhi)
-      set = new MESetProjection(path, otype, btype, kind, hasYaxis ? &yaxis : nullptr);
-    else{
+      else if (btype == binning::kProjEta || btype == binning::kProjPhi) set =
+          new MESetProjection(path, otype, btype, kind, hasYaxis ? &yaxis : nullptr);
+    else {
       unsigned logicalDimensions(-1);
-      switch(kind){
-      case MonitorElement::DQM_KIND_REAL:
-        logicalDimensions = 0;
-        break;
-      case MonitorElement::DQM_KIND_TH1F:
-      case MonitorElement::DQM_KIND_TPROFILE:
-        logicalDimensions = 1;
-        break;
-      case MonitorElement::DQM_KIND_TH2F:
-      case MonitorElement::DQM_KIND_TPROFILE2D:
-        logicalDimensions = 2;
-        break;
-      default:
-        break;
+      switch (kind) {
+        case MonitorElement::DQM_KIND_REAL:
+          logicalDimensions = 0;
+          break;
+        case MonitorElement::DQM_KIND_TH1F:
+        case MonitorElement::DQM_KIND_TPROFILE:
+          logicalDimensions = 1;
+          break;
+        case MonitorElement::DQM_KIND_TH2F:
+        case MonitorElement::DQM_KIND_TPROFILE2D:
+          logicalDimensions = 2;
+          break;
+        default:
+          break;
       }
 
-      // example case: Ecal/TriggerPrimitives/EmulMatching/TrigPrimTask matching index
-      if(logicalDimensions == 2 && hasYaxis && btype != binning::kUser) logicalDimensions = 1;
+      // example case: Ecal/TriggerPrimitives/EmulMatching/TrigPrimTask matching
+      // index
+      if (logicalDimensions == 2 && hasYaxis && btype != binning::kUser)
+        logicalDimensions = 1;
 
-      if(logicalDimensions > 2 || (btype == binning::kReport && logicalDimensions != 0))
+      if (logicalDimensions > 2 || (btype == binning::kReport && logicalDimensions != 0))
         throw cms::Exception("InvalidConfiguration") << "Cannot create MESet at " << path;
 
-      if(btype == binning::kUser)
-        set = new MESetEcal(path, otype, btype, kind, logicalDimensions, hasXaxis ? &xaxis : nullptr, hasYaxis ? &yaxis : nullptr, hasZaxis ? &zaxis : nullptr);
-      else if(logicalDimensions == 0)
+      if (btype == binning::kUser)
+        set = new MESetEcal(path,
+                            otype,
+                            btype,
+                            kind,
+                            logicalDimensions,
+                            hasXaxis ? &xaxis : nullptr,
+                            hasYaxis ? &yaxis : nullptr,
+                            hasZaxis ? &zaxis : nullptr);
+      else if (logicalDimensions == 0)
         set = new MESetDet0D(path, otype, btype, kind);
-      else if(logicalDimensions == 1)
+      else if (logicalDimensions == 1)
         set = new MESetDet1D(path, otype, btype, kind, hasYaxis ? &yaxis : nullptr);
-      else if(logicalDimensions == 2)
+      else if (logicalDimensions == 2)
         set = new MESetDet2D(path, otype, btype, kind, hasZaxis ? &zaxis : nullptr);
     }
 
-    if(_MEParam.existsAs<edm::ParameterSet>("multi", false)){
+    if (_MEParam.existsAs<edm::ParameterSet>("multi", false)) {
       typedef std::vector<std::string> VString;
-        
-      edm::ParameterSet const& multiParams(_MEParam.getUntrackedParameterSet("multi"));
+
+      edm::ParameterSet const &multiParams(_MEParam.getUntrackedParameterSet("multi"));
       VString replacementNames(multiParams.getParameterNames());
-      if(replacementNames.empty())
+      if (replacementNames.empty())
         throw cms::Exception("InvalidConfiguration") << "0 multiplicity for MESet at " << path;
 
       MESetMulti::ReplCandidates candidates;
-      for(unsigned iD(0); iD != replacementNames.size(); ++iD){
+      for (unsigned iD(0); iD != replacementNames.size(); ++iD) {
         VString reps;
-        if(multiParams.existsAs<VString>(replacementNames[iD], false))
+        if (multiParams.existsAs<VString>(replacementNames[iD], false))
           reps = multiParams.getUntrackedParameter<VString>(replacementNames[iD]);
-        else if(multiParams.existsAs<std::vector<int> >(replacementNames[iD], false)){
-          std::vector<int> repInts(multiParams.getUntrackedParameter<std::vector<int> >(replacementNames[iD]));
-          for(unsigned iR(0); iR != repInts.size(); ++iR)
+        else if (multiParams.existsAs<std::vector<int>>(replacementNames[iD], false)) {
+          std::vector<int> repInts(multiParams.getUntrackedParameter<std::vector<int>>(replacementNames[iD]));
+          for (unsigned iR(0); iR != repInts.size(); ++iR)
             reps.push_back(std::to_string(repInts[iR]));
         }
 
-        if(reps.empty())
+        if (reps.empty())
           throw cms::Exception("InvalidConfiguration") << "0 multiplicity for MESet at " << path;
 
         candidates[replacementNames[iD]] = reps;
       }
-      MESetMulti* multi(new MESetMulti(*set, candidates));
+      MESetMulti *multi(new MESetMulti(*set, candidates));
       delete set;
       set = multi;
     }
 
-    if(!set) throw cms::Exception("InvalidConfiguration") << "MESet " << path << " could not be initialized";
+    if (!set)
+      throw cms::Exception("InvalidConfiguration") << "MESet " << path << " could not be initialized";
 
-    if(_MEParam.getUntrackedParameter<bool>("perLumi"))
+    if (_MEParam.getUntrackedParameter<bool>("perLumi"))
       set->setLumiFlag();
 
     return set;
   }
 
-  void
-  fillMESetDescriptions(edm::ParameterSetDescription& _desc)
-  {
+  void fillMESetDescriptions(edm::ParameterSetDescription &_desc) {
     _desc.addUntracked<std::string>("path");
     _desc.addUntracked<std::string>("kind");
     _desc.addUntracked<std::string>("otype");
@@ -146,8 +159,8 @@ namespace ecaldqm
     _desc.addOptionalUntracked("zaxis", axisParameters);
 
     edm::ParameterSetDescription multiParameters;
-    multiParameters.addWildcardUntracked<std::vector<std::string> >("*");
-    multiParameters.addWildcardUntracked<std::vector<int> >("*");
+    multiParameters.addWildcardUntracked<std::vector<std::string>>("*");
+    multiParameters.addWildcardUntracked<std::vector<int>>("*");
     _desc.addOptionalUntracked("multi", multiParameters);
   }
-}
+}  // namespace ecaldqm
diff --git a/DQM/EcalCommon/src/StatusManager.cc b/DQM/EcalCommon/src/StatusManager.cc
index 08a599543ac5a..779c95a48152f 100644
--- a/DQM/EcalCommon/src/StatusManager.cc
+++ b/DQM/EcalCommon/src/StatusManager.cc
@@ -8,20 +8,16 @@
 
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
 #include "DataFormats/EcalDetId/interface/EEDetId.h"
-#include "DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h"
 #include "DataFormats/EcalDetId/interface/EcalScDetId.h"
+#include "DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h"
 
-#include "TPRegexp.h"
 #include "TObjArray.h"
+#include "TPRegexp.h"
 #include "TString.h"
 
-namespace ecaldqm
-{
+namespace ecaldqm {
 
-  StatusManager::StatusManager() :
-    dictionary_(),
-    status_()
-  {
+  StatusManager::StatusManager() : dictionary_(), status_() {
     dictionary_["CH_ID_ERROR"] = 0x1 << EcalDQMStatusHelper::CH_ID_ERROR;
     dictionary_["CH_GAIN_ZERO_ERROR"] = 0x1 << EcalDQMStatusHelper::CH_GAIN_ZERO_ERROR;
     dictionary_["CH_GAIN_SWITCH_ERROR"] = 0x1 << EcalDQMStatusHelper::CH_GAIN_SWITCH_ERROR;
@@ -35,8 +31,10 @@ namespace ecaldqm
     dictionary_["PEDESTAL_MIDDLE_GAIN_RMS_ERROR"] = 0x1 << EcalDQMStatusHelper::PEDESTAL_MIDDLE_GAIN_RMS_ERROR;
     dictionary_["PEDESTAL_HIGH_GAIN_RMS_ERROR"] = 0x1 << EcalDQMStatusHelper::PEDESTAL_HIGH_GAIN_RMS_ERROR;
 
-    dictionary_["PEDESTAL_ONLINE_HIGH_GAIN_MEAN_ERROR"] = 0x1 << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_MEAN_ERROR;
-    dictionary_["PEDESTAL_ONLINE_HIGH_GAIN_RMS_ERROR"] = 0x1 << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_RMS_ERROR;
+    dictionary_["PEDESTAL_ONLINE_HIGH_GAIN_MEAN_ERROR"] = 0x1
+                                                          << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_MEAN_ERROR;
+    dictionary_["PEDESTAL_ONLINE_HIGH_GAIN_RMS_ERROR"] = 0x1
+                                                         << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_RMS_ERROR;
 
     dictionary_["TESTPULSE_LOW_GAIN_MEAN_ERROR"] = 0x1 << EcalDQMStatusHelper::TESTPULSE_LOW_GAIN_MEAN_ERROR;
     dictionary_["TESTPULSE_MIDDLE_GAIN_MEAN_ERROR"] = 0x1 << EcalDQMStatusHelper::TESTPULSE_MIDDLE_GAIN_MEAN_ERROR;
@@ -61,96 +59,83 @@ namespace ecaldqm
     dictionary_["PHYSICS_BAD_CHANNEL_ERROR"] = 0x1 << EcalDQMStatusHelper::PHYSICS_BAD_CHANNEL_ERROR;
 
     dictionary_["disabled_channel"] =
-      0x1 << EcalDQMStatusHelper::TT_SIZE_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_LOW_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_MIDDLE_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_HIGH_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::TESTPULSE_LOW_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::TESTPULSE_MIDDLE_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::TESTPULSE_HIGH_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::LASER_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::LED_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::PHYSICS_BAD_CHANNEL_WARNING |
-      0x1 << EcalDQMStatusHelper::PHYSICS_BAD_CHANNEL_ERROR;
+        0x1 << EcalDQMStatusHelper::TT_SIZE_ERROR | 0x1 << EcalDQMStatusHelper::PEDESTAL_LOW_GAIN_MEAN_ERROR |
+        0x1 << EcalDQMStatusHelper::PEDESTAL_MIDDLE_GAIN_MEAN_ERROR |
+        0x1 << EcalDQMStatusHelper::PEDESTAL_HIGH_GAIN_MEAN_ERROR |
+        0x1 << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_MEAN_ERROR |
+        0x1 << EcalDQMStatusHelper::TESTPULSE_LOW_GAIN_MEAN_ERROR |
+        0x1 << EcalDQMStatusHelper::TESTPULSE_MIDDLE_GAIN_MEAN_ERROR |
+        0x1 << EcalDQMStatusHelper::TESTPULSE_HIGH_GAIN_MEAN_ERROR | 0x1 << EcalDQMStatusHelper::LASER_MEAN_ERROR |
+        0x1 << EcalDQMStatusHelper::LED_MEAN_ERROR | 0x1 << EcalDQMStatusHelper::PHYSICS_BAD_CHANNEL_WARNING |
+        0x1 << EcalDQMStatusHelper::PHYSICS_BAD_CHANNEL_ERROR;
 
     dictionary_["dead_channel"] =
-      0x1 << EcalDQMStatusHelper::PEDESTAL_LOW_GAIN_MEAN_ERROR | 
-      0x1 << EcalDQMStatusHelper::PEDESTAL_LOW_GAIN_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_MIDDLE_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_MIDDLE_GAIN_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_HIGH_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_HIGH_GAIN_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::TESTPULSE_LOW_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::TESTPULSE_LOW_GAIN_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::TESTPULSE_MIDDLE_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::TESTPULSE_MIDDLE_GAIN_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::TESTPULSE_HIGH_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::TESTPULSE_HIGH_GAIN_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::LASER_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::LASER_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::LASER_TIMING_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::LASER_TIMING_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::LED_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::LED_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::LED_TIMING_MEAN_ERROR | 
-      0x1 << EcalDQMStatusHelper::LED_TIMING_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::PHYSICS_BAD_CHANNEL_WARNING |
-      0x1 << EcalDQMStatusHelper::PHYSICS_BAD_CHANNEL_ERROR;
-
-    dictionary_["pedestal_problem"] =
-      0x1 << EcalDQMStatusHelper::PEDESTAL_LOW_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_LOW_GAIN_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_MIDDLE_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_MIDDLE_GAIN_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_HIGH_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_HIGH_GAIN_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_RMS_ERROR;
-
-    dictionary_["testpulse_problem"] =
-      0x1 << EcalDQMStatusHelper::TESTPULSE_LOW_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::TESTPULSE_LOW_GAIN_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::TESTPULSE_MIDDLE_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::TESTPULSE_MIDDLE_GAIN_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::TESTPULSE_HIGH_GAIN_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::TESTPULSE_HIGH_GAIN_RMS_ERROR;
+        0x1 << EcalDQMStatusHelper::PEDESTAL_LOW_GAIN_MEAN_ERROR |
+        0x1 << EcalDQMStatusHelper::PEDESTAL_LOW_GAIN_RMS_ERROR |
+        0x1 << EcalDQMStatusHelper::PEDESTAL_MIDDLE_GAIN_MEAN_ERROR |
+        0x1 << EcalDQMStatusHelper::PEDESTAL_MIDDLE_GAIN_RMS_ERROR |
+        0x1 << EcalDQMStatusHelper::PEDESTAL_HIGH_GAIN_MEAN_ERROR |
+        0x1 << EcalDQMStatusHelper::PEDESTAL_HIGH_GAIN_RMS_ERROR |
+        0x1 << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_MEAN_ERROR |
+        0x1 << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_RMS_ERROR |
+        0x1 << EcalDQMStatusHelper::TESTPULSE_LOW_GAIN_MEAN_ERROR |
+        0x1 << EcalDQMStatusHelper::TESTPULSE_LOW_GAIN_RMS_ERROR |
+        0x1 << EcalDQMStatusHelper::TESTPULSE_MIDDLE_GAIN_MEAN_ERROR |
+        0x1 << EcalDQMStatusHelper::TESTPULSE_MIDDLE_GAIN_RMS_ERROR |
+        0x1 << EcalDQMStatusHelper::TESTPULSE_HIGH_GAIN_MEAN_ERROR |
+        0x1 << EcalDQMStatusHelper::TESTPULSE_HIGH_GAIN_RMS_ERROR | 0x1 << EcalDQMStatusHelper::LASER_MEAN_ERROR |
+        0x1 << EcalDQMStatusHelper::LASER_RMS_ERROR | 0x1 << EcalDQMStatusHelper::LASER_TIMING_MEAN_ERROR |
+        0x1 << EcalDQMStatusHelper::LASER_TIMING_RMS_ERROR | 0x1 << EcalDQMStatusHelper::LED_MEAN_ERROR |
+        0x1 << EcalDQMStatusHelper::LED_RMS_ERROR | 0x1 << EcalDQMStatusHelper::LED_TIMING_MEAN_ERROR |
+        0x1 << EcalDQMStatusHelper::LED_TIMING_RMS_ERROR | 0x1 << EcalDQMStatusHelper::PHYSICS_BAD_CHANNEL_WARNING |
+        0x1 << EcalDQMStatusHelper::PHYSICS_BAD_CHANNEL_ERROR;
+
+    dictionary_["pedestal_problem"] = 0x1 << EcalDQMStatusHelper::PEDESTAL_LOW_GAIN_MEAN_ERROR |
+                                      0x1 << EcalDQMStatusHelper::PEDESTAL_LOW_GAIN_RMS_ERROR |
+                                      0x1 << EcalDQMStatusHelper::PEDESTAL_MIDDLE_GAIN_MEAN_ERROR |
+                                      0x1 << EcalDQMStatusHelper::PEDESTAL_MIDDLE_GAIN_RMS_ERROR |
+                                      0x1 << EcalDQMStatusHelper::PEDESTAL_HIGH_GAIN_MEAN_ERROR |
+                                      0x1 << EcalDQMStatusHelper::PEDESTAL_HIGH_GAIN_RMS_ERROR |
+                                      0x1 << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_MEAN_ERROR |
+                                      0x1 << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_RMS_ERROR;
+
+    dictionary_["testpulse_problem"] = 0x1 << EcalDQMStatusHelper::TESTPULSE_LOW_GAIN_MEAN_ERROR |
+                                       0x1 << EcalDQMStatusHelper::TESTPULSE_LOW_GAIN_RMS_ERROR |
+                                       0x1 << EcalDQMStatusHelper::TESTPULSE_MIDDLE_GAIN_MEAN_ERROR |
+                                       0x1 << EcalDQMStatusHelper::TESTPULSE_MIDDLE_GAIN_RMS_ERROR |
+                                       0x1 << EcalDQMStatusHelper::TESTPULSE_HIGH_GAIN_MEAN_ERROR |
+                                       0x1 << EcalDQMStatusHelper::TESTPULSE_HIGH_GAIN_RMS_ERROR;
 
     dictionary_["laser_problem"] =
-      0x1 << EcalDQMStatusHelper::LASER_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::LASER_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::LASER_TIMING_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::LASER_TIMING_RMS_ERROR;
+        0x1 << EcalDQMStatusHelper::LASER_MEAN_ERROR | 0x1 << EcalDQMStatusHelper::LASER_RMS_ERROR |
+        0x1 << EcalDQMStatusHelper::LASER_TIMING_MEAN_ERROR | 0x1 << EcalDQMStatusHelper::LASER_TIMING_RMS_ERROR;
 
     dictionary_["led_problem"] =
-      0x1 << EcalDQMStatusHelper::LED_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::LED_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::LED_TIMING_MEAN_ERROR |
-      0x1 << EcalDQMStatusHelper::LED_TIMING_RMS_ERROR;
-
-    dictionary_["noise_problem"] =
-      0x1 << EcalDQMStatusHelper::PEDESTAL_LOW_GAIN_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_MIDDLE_GAIN_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_HIGH_GAIN_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_RMS_ERROR |
-      0x1 << EcalDQMStatusHelper::PHYSICS_BAD_CHANNEL_ERROR;
+        0x1 << EcalDQMStatusHelper::LED_MEAN_ERROR | 0x1 << EcalDQMStatusHelper::LED_RMS_ERROR |
+        0x1 << EcalDQMStatusHelper::LED_TIMING_MEAN_ERROR | 0x1 << EcalDQMStatusHelper::LED_TIMING_RMS_ERROR;
+
+    dictionary_["noise_problem"] = 0x1 << EcalDQMStatusHelper::PEDESTAL_LOW_GAIN_RMS_ERROR |
+                                   0x1 << EcalDQMStatusHelper::PEDESTAL_MIDDLE_GAIN_RMS_ERROR |
+                                   0x1 << EcalDQMStatusHelper::PEDESTAL_HIGH_GAIN_RMS_ERROR |
+                                   0x1 << EcalDQMStatusHelper::PEDESTAL_ONLINE_HIGH_GAIN_RMS_ERROR |
+                                   0x1 << EcalDQMStatusHelper::PHYSICS_BAD_CHANNEL_ERROR;
   }
 
-  void
-  StatusManager::readFromStream(std::istream& _input)
-  {
-    TPRegexp linePat("^[ ]*(Crystal|TT|PN)[ ]+(EB[0-9+-]*|EE[0-9+-]*|[0-9]+)[ ]+([0-9]+)[ ]([a-zA-Z_]+)");
+  void StatusManager::readFromStream(std::istream &_input) {
+    TPRegexp linePat(
+        "^[ ]*(Crystal|TT|PN)[ ]+(EB[0-9+-]*|EE[0-9+-]*|[0-9]+)[ "
+        "]+([0-9]+)[ ]([a-zA-Z_]+)");
 
     std::string line;
-    while(true){
+    while (true) {
       std::getline(_input, line);
-      if(!_input.good()) break;
+      if (!_input.good())
+        break;
 
-      if(!linePat.MatchB(line)) continue;
+      if (!linePat.MatchB(line))
+        continue;
 
-      TObjArray* matches(linePat.MatchS(line));
+      TObjArray *matches(linePat.MatchS(line));
       TString channelType(matches->At(1)->GetName());
       TString module(matches->At(2)->GetName());
       unsigned channel(TString(matches->At(3)->GetName()).Atoi());
@@ -158,50 +143,51 @@ namespace ecaldqm
       delete matches;
 
       std::map<std::string, uint32_t>::const_iterator dItr(dictionary_.find(statusName.Data()));
-      if(dItr == dictionary_.end()) continue;
+      if (dItr == dictionary_.end())
+        continue;
       uint32_t statusVal(dItr->second);
 
-      if(channelType == "Crystal"){
+      if (channelType == "Crystal") {
         // module: Subdetector name, channel: dense ID
-        // Store using EBDetId and EEDetId as keys (following EcalDQMChannelStatus)
+        // Store using EBDetId and EEDetId as keys (following
+        // EcalDQMChannelStatus)
 
-        if(module == "EB"){
-          if(!EBDetId::validDenseIndex(channel)) continue;
+        if (module == "EB") {
+          if (!EBDetId::validDenseIndex(channel))
+            continue;
           status_.insert(std::pair<uint32_t, uint32_t>(EBDetId::unhashIndex(channel).rawId(), statusVal));
-        }
-        else if(module == "EE"){
-          if(!EEDetId::validDenseIndex(channel)) continue;
+        } else if (module == "EE") {
+          if (!EEDetId::validDenseIndex(channel))
+            continue;
           status_.insert(std::pair<uint32_t, uint32_t>(EEDetId::unhashIndex(channel).rawId(), statusVal));
         }
-      }
-      else if(channelType == "TT"){
+      } else if (channelType == "TT") {
         // module: Supermodule name, channel: RU ID (electronics ID tower)
-        // Store using EcalTrigTowerDetId and EcalScDetId as keys (following EcalDQMTowerStatus)
+        // Store using EcalTrigTowerDetId and EcalScDetId as keys (following
+        // EcalDQMTowerStatus)
 
-        if(module.Contains("EB")){
+        if (module.Contains("EB")) {
           /* TODO CHECK THIS */
 
           int iEta((channel - 1) / 4 + 1);
           int zside(0);
           int iPhi(0);
-          if(module(3) == '-'){
+          if (module(3) == '-') {
             zside = -1;
             iPhi = (channel - 1) % 4 + 1;
-          }
-          else{
+          } else {
             zside = 1;
             iPhi = (68 - channel) % 4 + 1;
           }
 
-          status_.insert(std::pair<uint32_t, uint32_t>(EcalTrigTowerDetId(zside, EcalBarrel, iEta, iPhi).rawId(), statusVal));
-        }
-        else if(module.Contains("EE")){
+          status_.insert(
+              std::pair<uint32_t, uint32_t>(EcalTrigTowerDetId(zside, EcalBarrel, iEta, iPhi).rawId(), statusVal));
+        } else if (module.Contains("EE")) {
           std::vector<EcalScDetId> scIds(getElectronicsMap()->getEcalScDetId(dccId(module.Data()), channel, false));
-          for(unsigned iS(0); iS != scIds.size(); ++iS)
+          for (unsigned iS(0); iS != scIds.size(); ++iS)
             status_.insert(std::pair<uint32_t, uint32_t>(scIds[iS].rawId(), statusVal));
         }
-      }
-      else if(channelType == "PN"){
+      } else if (channelType == "PN") {
         // module: DCC ID, channel: iPN
         // Store using EcalPnDiodeDetId as keys
         unsigned iDCC(module.Atoi() - 1);
@@ -211,62 +197,57 @@ namespace ecaldqm
     }
   }
 
-  void
-  StatusManager::readFromObj(EcalDQMChannelStatus const& _channelStatus, EcalDQMTowerStatus const& _towerStatus)
-  {
-    EcalDQMChannelStatus::Items const& barrelChStatus(_channelStatus.barrelItems());
-    for(unsigned iC(0); iC != EBDetId::kSizeForDenseIndexing; ++iC)
-      status_.insert(std::pair<uint32_t, uint32_t>(EBDetId::unhashIndex(iC).rawId(), barrelChStatus[iC].getStatusCode()));
-
-    EcalDQMChannelStatus::Items const& endcapChStatus(_channelStatus.endcapItems());
-    for(unsigned iC(0); iC != EEDetId::kSizeForDenseIndexing; ++iC)
-      status_.insert(std::pair<uint32_t, uint32_t>(EEDetId::unhashIndex(iC).rawId(), endcapChStatus[iC].getStatusCode()));
-
-    EcalDQMTowerStatus::Items const& barrelTowStatus(_towerStatus.barrelItems());
-    for(unsigned iC(0); iC != EcalTrigTowerDetId::kEBTotalTowers; ++iC)
-      status_.insert(std::pair<uint32_t, uint32_t>(EcalTrigTowerDetId::detIdFromDenseIndex(iC).rawId(), barrelTowStatus[iC].getStatusCode()));
-
-    EcalDQMTowerStatus::Items const& endcapTowStatus(_towerStatus.endcapItems());
-    for(unsigned iC(0); iC != EcalScDetId::kSizeForDenseIndexing; ++iC)
-      status_.insert(std::pair<uint32_t, uint32_t>(EcalScDetId::unhashIndex(iC).rawId(), endcapTowStatus[iC].getStatusCode()));
+  void StatusManager::readFromObj(EcalDQMChannelStatus const &_channelStatus, EcalDQMTowerStatus const &_towerStatus) {
+    EcalDQMChannelStatus::Items const &barrelChStatus(_channelStatus.barrelItems());
+    for (unsigned iC(0); iC != EBDetId::kSizeForDenseIndexing; ++iC)
+      status_.insert(
+          std::pair<uint32_t, uint32_t>(EBDetId::unhashIndex(iC).rawId(), barrelChStatus[iC].getStatusCode()));
+
+    EcalDQMChannelStatus::Items const &endcapChStatus(_channelStatus.endcapItems());
+    for (unsigned iC(0); iC != EEDetId::kSizeForDenseIndexing; ++iC)
+      status_.insert(
+          std::pair<uint32_t, uint32_t>(EEDetId::unhashIndex(iC).rawId(), endcapChStatus[iC].getStatusCode()));
+
+    EcalDQMTowerStatus::Items const &barrelTowStatus(_towerStatus.barrelItems());
+    for (unsigned iC(0); iC != EcalTrigTowerDetId::kEBTotalTowers; ++iC)
+      status_.insert(std::pair<uint32_t, uint32_t>(EcalTrigTowerDetId::detIdFromDenseIndex(iC).rawId(),
+                                                   barrelTowStatus[iC].getStatusCode()));
+
+    EcalDQMTowerStatus::Items const &endcapTowStatus(_towerStatus.endcapItems());
+    for (unsigned iC(0); iC != EcalScDetId::kSizeForDenseIndexing; ++iC)
+      status_.insert(
+          std::pair<uint32_t, uint32_t>(EcalScDetId::unhashIndex(iC).rawId(), endcapTowStatus[iC].getStatusCode()));
   }
 
-  void
-  StatusManager::writeToStream(std::ostream& _output) const
-  {
-
-  }
+  void StatusManager::writeToStream(std::ostream &_output) const {}
 
-  void
-  StatusManager::writeToObj(EcalDQMChannelStatus& _channelStatus, EcalDQMTowerStatus& _towerStatus) const
-  {
-    for(unsigned iC(0); iC != EBDetId::kSizeForDenseIndexing; ++iC){
+  void StatusManager::writeToObj(EcalDQMChannelStatus &_channelStatus, EcalDQMTowerStatus &_towerStatus) const {
+    for (unsigned iC(0); iC != EBDetId::kSizeForDenseIndexing; ++iC) {
       uint32_t key(EBDetId::unhashIndex(iC).rawId());
       _channelStatus.setValue(key, EcalDQMStatusCode(getStatus(key)));
     }
 
-    for(unsigned iC(0); iC != EEDetId::kSizeForDenseIndexing; ++iC){
+    for (unsigned iC(0); iC != EEDetId::kSizeForDenseIndexing; ++iC) {
       uint32_t key(EEDetId::unhashIndex(iC).rawId());
       _channelStatus.setValue(key, EcalDQMStatusCode(getStatus(key)));
     }
 
-    for(unsigned iC(0); iC != EcalTrigTowerDetId::kEBTotalTowers; ++iC){
+    for (unsigned iC(0); iC != EcalTrigTowerDetId::kEBTotalTowers; ++iC) {
       uint32_t key(EcalTrigTowerDetId::detIdFromDenseIndex(iC));
       _towerStatus.setValue(key, EcalDQMStatusCode(getStatus(key)));
     }
 
-    for(unsigned iC(0); iC != EcalScDetId::kSizeForDenseIndexing; ++iC){
+    for (unsigned iC(0); iC != EcalScDetId::kSizeForDenseIndexing; ++iC) {
       uint32_t key(EcalScDetId::unhashIndex(iC));
       _towerStatus.setValue(key, EcalDQMStatusCode(getStatus(key)));
     }
   }
 
-  uint32_t
-  StatusManager::getStatus(uint32_t _key) const
-  {
+  uint32_t StatusManager::getStatus(uint32_t _key) const {
     std::map<uint32_t, uint32_t>::const_iterator itr(status_.find(_key));
-    if(itr == status_.end()) return 0;
+    if (itr == status_.end())
+      return 0;
     return itr->second;
   }
 
-}
+}  // namespace ecaldqm
diff --git a/DQM/EcalMonitorDbModule/interface/DBReaderWorkers.h b/DQM/EcalMonitorDbModule/interface/DBReaderWorkers.h
index 9a8f6773babdb..77e751fb5091e 100644
--- a/DQM/EcalMonitorDbModule/interface/DBReaderWorkers.h
+++ b/DQM/EcalMonitorDbModule/interface/DBReaderWorkers.h
@@ -10,18 +10,17 @@
 
 #include <map>
 
-namespace ecaldqm
-{
+namespace ecaldqm {
   class DBReaderWorker {
   public:
-    DBReaderWorker(std::string const& _name, edm::ParameterSet const&) : name_(_name), verbosity_(0) {}
+    DBReaderWorker(std::string const &_name, edm::ParameterSet const &) : name_(_name), verbosity_(0) {}
     virtual ~DBReaderWorker() {}
 
-    virtual std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) = 0;
+    virtual std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) = 0;
 
     void setVerbosity(int _v) { verbosity_ = _v; }
 
-    std::string const& getName() const { return name_; }
+    std::string const &getName() const { return name_; }
 
   protected:
     std::string const name_;
@@ -30,227 +29,228 @@ namespace ecaldqm
 
   class CrystalConsistencyReader : public DBReaderWorker {
   public:
-    CrystalConsistencyReader(edm::ParameterSet const& _ps) : DBReaderWorker("CrystalConsistencyReader", _ps) {}
-    ~CrystalConsistencyReader() {}
+    CrystalConsistencyReader(edm::ParameterSet const &_ps) : DBReaderWorker("CrystalConsistencyReader", _ps) {}
+    ~CrystalConsistencyReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class TTConsistencyReader : public DBReaderWorker {
   public:
-    TTConsistencyReader(edm::ParameterSet const& _ps) : DBReaderWorker("TTConsistencyReader", _ps) {}
-    ~TTConsistencyReader() {}
+    TTConsistencyReader(edm::ParameterSet const &_ps) : DBReaderWorker("TTConsistencyReader", _ps) {}
+    ~TTConsistencyReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class MemChConsistencyReader : public DBReaderWorker {
   public:
-    MemChConsistencyReader(edm::ParameterSet const& _ps) : DBReaderWorker("MemChConsistencyReader", _ps) {}
-    ~MemChConsistencyReader() {}
+    MemChConsistencyReader(edm::ParameterSet const &_ps) : DBReaderWorker("MemChConsistencyReader", _ps) {}
+    ~MemChConsistencyReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class MemTTConsistencyReader : public DBReaderWorker {
   public:
-    MemTTConsistencyReader(edm::ParameterSet const& _ps) : DBReaderWorker("MemTTConsistencyReader", _ps) {}
-    ~MemTTConsistencyReader() {}
+    MemTTConsistencyReader(edm::ParameterSet const &_ps) : DBReaderWorker("MemTTConsistencyReader", _ps) {}
+    ~MemTTConsistencyReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class LaserBlueReader : public DBReaderWorker {
   public:
-    LaserBlueReader(edm::ParameterSet const& _ps) : DBReaderWorker("LaserBlueReader", _ps) {}
-    ~LaserBlueReader() {}
+    LaserBlueReader(edm::ParameterSet const &_ps) : DBReaderWorker("LaserBlueReader", _ps) {}
+    ~LaserBlueReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class TimingLaserBlueCrystalReader : public DBReaderWorker {
   public:
-    TimingLaserBlueCrystalReader(edm::ParameterSet const& _ps) : DBReaderWorker("TimingLaserBlueCrystalReader", _ps) {}
-    ~TimingLaserBlueCrystalReader() {}
+    TimingLaserBlueCrystalReader(edm::ParameterSet const &_ps) : DBReaderWorker("TimingLaserBlueCrystalReader", _ps) {}
+    ~TimingLaserBlueCrystalReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class PNBlueReader : public DBReaderWorker {
   public:
-    PNBlueReader(edm::ParameterSet const& _ps) : DBReaderWorker("PNBlueReader", _ps) {}
-    ~PNBlueReader() {}
+    PNBlueReader(edm::ParameterSet const &_ps) : DBReaderWorker("PNBlueReader", _ps) {}
+    ~PNBlueReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class LaserGreenReader : public DBReaderWorker {
   public:
-    LaserGreenReader(edm::ParameterSet const& _ps) : DBReaderWorker("LaserGreenReader", _ps) {}
-    ~LaserGreenReader() {}
+    LaserGreenReader(edm::ParameterSet const &_ps) : DBReaderWorker("LaserGreenReader", _ps) {}
+    ~LaserGreenReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class TimingLaserGreenCrystalReader : public DBReaderWorker {
   public:
-    TimingLaserGreenCrystalReader(edm::ParameterSet const& _ps) : DBReaderWorker("TimingLaserGreenCrystalReader", _ps) {}
-    ~TimingLaserGreenCrystalReader() {}
+    TimingLaserGreenCrystalReader(edm::ParameterSet const &_ps)
+        : DBReaderWorker("TimingLaserGreenCrystalReader", _ps) {}
+    ~TimingLaserGreenCrystalReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class PNGreenReader : public DBReaderWorker {
   public:
-    PNGreenReader(edm::ParameterSet const& _ps) : DBReaderWorker("PNGreenReader", _ps) {}
-    ~PNGreenReader() {}
+    PNGreenReader(edm::ParameterSet const &_ps) : DBReaderWorker("PNGreenReader", _ps) {}
+    ~PNGreenReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class LaserIRedReader : public DBReaderWorker {
   public:
-    LaserIRedReader(edm::ParameterSet const& _ps) : DBReaderWorker("LaserIRedReader", _ps) {}
-    ~LaserIRedReader() {}
+    LaserIRedReader(edm::ParameterSet const &_ps) : DBReaderWorker("LaserIRedReader", _ps) {}
+    ~LaserIRedReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class TimingLaserIRedCrystalReader : public DBReaderWorker {
   public:
-    TimingLaserIRedCrystalReader(edm::ParameterSet const& _ps) : DBReaderWorker("TimingLaserIRedCrystalReader", _ps) {}
-    ~TimingLaserIRedCrystalReader() {}
+    TimingLaserIRedCrystalReader(edm::ParameterSet const &_ps) : DBReaderWorker("TimingLaserIRedCrystalReader", _ps) {}
+    ~TimingLaserIRedCrystalReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class PNIRedReader : public DBReaderWorker {
   public:
-    PNIRedReader(edm::ParameterSet const& _ps) : DBReaderWorker("PNIRedReader", _ps) {}
-    ~PNIRedReader() {}
+    PNIRedReader(edm::ParameterSet const &_ps) : DBReaderWorker("PNIRedReader", _ps) {}
+    ~PNIRedReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class LaserRedReader : public DBReaderWorker {
   public:
-    LaserRedReader(edm::ParameterSet const& _ps) : DBReaderWorker("LaserRedReader", _ps) {}
-    ~LaserRedReader() {}
+    LaserRedReader(edm::ParameterSet const &_ps) : DBReaderWorker("LaserRedReader", _ps) {}
+    ~LaserRedReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class TimingLaserRedCrystalReader : public DBReaderWorker {
   public:
-    TimingLaserRedCrystalReader(edm::ParameterSet const& _ps) : DBReaderWorker("TimingLaserRedCrystalReader", _ps) {}
-    ~TimingLaserRedCrystalReader() {}
+    TimingLaserRedCrystalReader(edm::ParameterSet const &_ps) : DBReaderWorker("TimingLaserRedCrystalReader", _ps) {}
+    ~TimingLaserRedCrystalReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class PNRedReader : public DBReaderWorker {
   public:
-    PNRedReader(edm::ParameterSet const& _ps) : DBReaderWorker("PNRedReader", _ps) {}
-    ~PNRedReader() {}
+    PNRedReader(edm::ParameterSet const &_ps) : DBReaderWorker("PNRedReader", _ps) {}
+    ~PNRedReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class PedestalsReader : public DBReaderWorker {
   public:
-    PedestalsReader(edm::ParameterSet const& _ps) : DBReaderWorker("PedestalsReader", _ps) {}
-    ~PedestalsReader() {}
+    PedestalsReader(edm::ParameterSet const &_ps) : DBReaderWorker("PedestalsReader", _ps) {}
+    ~PedestalsReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class PNPedReader : public DBReaderWorker {
   public:
-    PNPedReader(edm::ParameterSet const& _ps) : DBReaderWorker("PNPedReader", _ps) {}
-    ~PNPedReader() {}
+    PNPedReader(edm::ParameterSet const &_ps) : DBReaderWorker("PNPedReader", _ps) {}
+    ~PNPedReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class PedestalsOnlineReader : public DBReaderWorker {
   public:
-    PedestalsOnlineReader(edm::ParameterSet const& _ps) : DBReaderWorker("PedestalsOnlineReader", _ps) {}
-    ~PedestalsOnlineReader() {}
+    PedestalsOnlineReader(edm::ParameterSet const &_ps) : DBReaderWorker("PedestalsOnlineReader", _ps) {}
+    ~PedestalsOnlineReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class TestPulseReader : public DBReaderWorker {
   public:
-    TestPulseReader(edm::ParameterSet const& _ps) : DBReaderWorker("TestPulseReader", _ps) {}
-    ~TestPulseReader() {}
+    TestPulseReader(edm::ParameterSet const &_ps) : DBReaderWorker("TestPulseReader", _ps) {}
+    ~TestPulseReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class PulseShapeReader : public DBReaderWorker {
   public:
-    PulseShapeReader(edm::ParameterSet const& _ps) : DBReaderWorker("PulseShapeReader", _ps) {}
-    ~PulseShapeReader() {}
+    PulseShapeReader(edm::ParameterSet const &_ps) : DBReaderWorker("PulseShapeReader", _ps) {}
+    ~PulseShapeReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class PNMGPAReader : public DBReaderWorker {
   public:
-    PNMGPAReader(edm::ParameterSet const& _ps) : DBReaderWorker("PNMGPAReader", _ps) {}
-    ~PNMGPAReader() {}
+    PNMGPAReader(edm::ParameterSet const &_ps) : DBReaderWorker("PNMGPAReader", _ps) {}
+    ~PNMGPAReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class TimingCrystalReader : public DBReaderWorker {
   public:
-    TimingCrystalReader(edm::ParameterSet const& _ps) : DBReaderWorker("TimingCrystalReader", _ps) {}
-    ~TimingCrystalReader() {}
+    TimingCrystalReader(edm::ParameterSet const &_ps) : DBReaderWorker("TimingCrystalReader", _ps) {}
+    ~TimingCrystalReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class Led1Reader : public DBReaderWorker {
   public:
-    Led1Reader(edm::ParameterSet const& _ps) : DBReaderWorker("Led1Reader", _ps) {}
-    ~Led1Reader() {}
+    Led1Reader(edm::ParameterSet const &_ps) : DBReaderWorker("Led1Reader", _ps) {}
+    ~Led1Reader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class TimingLed1CrystalReader : public DBReaderWorker {
   public:
-    TimingLed1CrystalReader(edm::ParameterSet const& _ps) : DBReaderWorker("TimingLed1CrystalReader", _ps) {}
-    ~TimingLed1CrystalReader() {}
+    TimingLed1CrystalReader(edm::ParameterSet const &_ps) : DBReaderWorker("TimingLed1CrystalReader", _ps) {}
+    ~TimingLed1CrystalReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class Led2Reader : public DBReaderWorker {
   public:
-    Led2Reader(edm::ParameterSet const& _ps) : DBReaderWorker("Led2Reader", _ps) {}
-    ~Led2Reader() {}
+    Led2Reader(edm::ParameterSet const &_ps) : DBReaderWorker("Led2Reader", _ps) {}
+    ~Led2Reader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class TimingLed2CrystalReader : public DBReaderWorker {
   public:
-    TimingLed2CrystalReader(edm::ParameterSet const& _ps) : DBReaderWorker("TimingLed2CrystalReader", _ps) {}
-    ~TimingLed2CrystalReader() {}
+    TimingLed2CrystalReader(edm::ParameterSet const &_ps) : DBReaderWorker("TimingLed2CrystalReader", _ps) {}
+    ~TimingLed2CrystalReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-  
+
   class OccupancyReader : public DBReaderWorker {
   public:
-    OccupancyReader(edm::ParameterSet const& _ps) : DBReaderWorker("OccupancyReader", _ps) {}
-    ~OccupancyReader() {}
+    OccupancyReader(edm::ParameterSet const &_ps) : DBReaderWorker("OccupancyReader", _ps) {}
+    ~OccupancyReader() override {}
 
-    std::map<DetId, double> run(EcalCondDBInterface*, MonRunIOV&, std::string const&) override;
+    std::map<DetId, double> run(EcalCondDBInterface *, MonRunIOV &, std::string const &) override;
   };
-}
+}  // namespace ecaldqm
 
 #endif
diff --git a/DQM/EcalMonitorDbModule/interface/DBWriterWorkers.h b/DQM/EcalMonitorDbModule/interface/DBWriterWorkers.h
index 319b1162836bc..9537cd1a01e51 100644
--- a/DQM/EcalMonitorDbModule/interface/DBWriterWorkers.h
+++ b/DQM/EcalMonitorDbModule/interface/DBWriterWorkers.h
@@ -1,13 +1,13 @@
 #ifndef DBWriterWorkers_H
 #define DBWriterWorkers_H
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DQM/EcalCommon/interface/MESet.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 
-#include "OnlineDB/EcalCondDB/interface/MonRunDat.h"
 #include "OnlineDB/EcalCondDB/interface/EcalCondDBInterface.h"
+#include "OnlineDB/EcalCondDB/interface/MonRunDat.h"
 
 #include <map>
 
@@ -17,17 +17,17 @@ namespace ecaldqm {
 
   class DBWriterWorker {
   public:
-    DBWriterWorker(std::string const&, edm::ParameterSet const&);
+    DBWriterWorker(std::string const &, edm::ParameterSet const &);
     virtual ~DBWriterWorker() {}
 
-    void retrieveSource(DQMStore::IGetter&);
-    virtual bool run(EcalCondDBInterface*, MonRunIOV&) = 0;
+    void retrieveSource(DQMStore::IGetter &);
+    virtual bool run(EcalCondDBInterface *, MonRunIOV &) = 0;
 
-    bool runsOn(std::string const& _runType) const { return runTypes_.find(_runType) != runTypes_.end(); }
+    bool runsOn(std::string const &_runType) const { return runTypes_.find(_runType) != runTypes_.end(); }
 
     void setVerbosity(int _v) { verbosity_ = _v; }
 
-    std::string const& getName() const { return name_; }
+    std::string const &getName() const { return name_; }
     bool isActive() const { return active_; }
 
   protected:
@@ -40,18 +40,18 @@ namespace ecaldqm {
 
   class IntegrityWriter : public DBWriterWorker {
   public:
-    IntegrityWriter(edm::ParameterSet const& _ps) : DBWriterWorker("Integrity", _ps) {}
-    ~IntegrityWriter() {}
+    IntegrityWriter(edm::ParameterSet const &_ps) : DBWriterWorker("Integrity", _ps) {}
+    ~IntegrityWriter() override {}
 
-    bool run(EcalCondDBInterface*, MonRunIOV&) override;
+    bool run(EcalCondDBInterface *, MonRunIOV &) override;
   };
 
   class LaserWriter : public DBWriterWorker {
   public:
-    LaserWriter(edm::ParameterSet const&);
-    ~LaserWriter() {}
+    LaserWriter(edm::ParameterSet const &);
+    ~LaserWriter() override {}
 
-    bool run(EcalCondDBInterface*, MonRunIOV&) override;
+    bool run(EcalCondDBInterface *, MonRunIOV &) override;
 
   private:
     std::map<int, unsigned> wlToME_;
@@ -59,10 +59,10 @@ namespace ecaldqm {
 
   class PedestalWriter : public DBWriterWorker {
   public:
-    PedestalWriter(edm::ParameterSet const&);
-    ~PedestalWriter() {}
+    PedestalWriter(edm::ParameterSet const &);
+    ~PedestalWriter() override {}
 
-    bool run(EcalCondDBInterface*, MonRunIOV&) override;
+    bool run(EcalCondDBInterface *, MonRunIOV &) override;
 
   private:
     std::map<int, unsigned> gainToME_;
@@ -71,18 +71,18 @@ namespace ecaldqm {
 
   class PresampleWriter : public DBWriterWorker {
   public:
-    PresampleWriter(edm::ParameterSet const& _ps) : DBWriterWorker("Presample", _ps) {}
-    ~PresampleWriter() {}
+    PresampleWriter(edm::ParameterSet const &_ps) : DBWriterWorker("Presample", _ps) {}
+    ~PresampleWriter() override {}
 
-    bool run(EcalCondDBInterface*, MonRunIOV&) override;
+    bool run(EcalCondDBInterface *, MonRunIOV &) override;
   };
 
   class TestPulseWriter : public DBWriterWorker {
   public:
-    TestPulseWriter(edm::ParameterSet const&);
-    ~TestPulseWriter() {}
+    TestPulseWriter(edm::ParameterSet const &);
+    ~TestPulseWriter() override {}
 
-    bool run(EcalCondDBInterface*, MonRunIOV&) override;
+    bool run(EcalCondDBInterface *, MonRunIOV &) override;
 
   private:
     std::map<int, unsigned> gainToME_;
@@ -91,18 +91,18 @@ namespace ecaldqm {
 
   class TimingWriter : public DBWriterWorker {
   public:
-    TimingWriter(edm::ParameterSet const& _ps) : DBWriterWorker("Timing", _ps) {}
-    ~TimingWriter() {}
+    TimingWriter(edm::ParameterSet const &_ps) : DBWriterWorker("Timing", _ps) {}
+    ~TimingWriter() override {}
 
-    bool run(EcalCondDBInterface*, MonRunIOV&) override;
+    bool run(EcalCondDBInterface *, MonRunIOV &) override;
   };
 
   class LedWriter : public DBWriterWorker {
   public:
-    LedWriter(edm::ParameterSet const&);
-    ~LedWriter() {}
+    LedWriter(edm::ParameterSet const &);
+    ~LedWriter() override {}
 
-    bool run(EcalCondDBInterface*, MonRunIOV&) override;
+    bool run(EcalCondDBInterface *, MonRunIOV &) override;
 
   private:
     std::map<int, unsigned> wlToME_;
@@ -110,27 +110,28 @@ namespace ecaldqm {
 
   class OccupancyWriter : public DBWriterWorker {
   public:
-    OccupancyWriter(edm::ParameterSet const& _ps) : DBWriterWorker("Occupancy", _ps) {}
-    ~OccupancyWriter() {}
+    OccupancyWriter(edm::ParameterSet const &_ps) : DBWriterWorker("Occupancy", _ps) {}
+    ~OccupancyWriter() override {}
 
-    bool run(EcalCondDBInterface*, MonRunIOV&) override;
+    bool run(EcalCondDBInterface *, MonRunIOV &) override;
   };
 
   class SummaryWriter : public DBWriterWorker {
   public:
-    SummaryWriter(edm::ParameterSet const& _ps) : DBWriterWorker("Summary", _ps), taskList_(0), outcome_(0), processedEvents_(0) {}
-    ~SummaryWriter() {}
+    SummaryWriter(edm::ParameterSet const &_ps)
+        : DBWriterWorker("Summary", _ps), taskList_(0), outcome_(0), processedEvents_(0) {}
+    ~SummaryWriter() override {}
 
     void setTaskList(int _list) { taskList_ = _list; }
     void setOutcome(int _outcome) { outcome_ = _outcome; }
     void setProcessedEvents(unsigned _n) { processedEvents_ = _n; }
-    bool run(EcalCondDBInterface*, MonRunIOV&) override;
+    bool run(EcalCondDBInterface *, MonRunIOV &) override;
 
   private:
     int taskList_;
     int outcome_;
     unsigned processedEvents_;
   };
-}
+}  // namespace ecaldqm
 
 #endif
diff --git a/DQM/EcalMonitorDbModule/interface/EcalBarrelMonitorDbModule.h b/DQM/EcalMonitorDbModule/interface/EcalBarrelMonitorDbModule.h
index d23636729a531..c1eff2063c8e9 100644
--- a/DQM/EcalMonitorDbModule/interface/EcalBarrelMonitorDbModule.h
+++ b/DQM/EcalMonitorDbModule/interface/EcalBarrelMonitorDbModule.h
@@ -6,7 +6,7 @@
  *
  * \author G. Della Ricca
  *
-*/
+ */
 
 #include <string>
 
@@ -22,32 +22,28 @@ class DQMStore;
 
 class MonitorElementsDb;
 
-class EcalBarrelMonitorDbModule: public edm::EDAnalyzer{
-
- public:
-
+class EcalBarrelMonitorDbModule : public edm::EDAnalyzer {
+public:
   /// Constructor
-  EcalBarrelMonitorDbModule( const edm::ParameterSet& ps );
+  EcalBarrelMonitorDbModule(const edm::ParameterSet &ps);
 
   /// Destructor
-  virtual ~EcalBarrelMonitorDbModule();
-
- protected:
+  ~EcalBarrelMonitorDbModule() override;
 
+protected:
   /// Analyze
-  void analyze( const edm::Event& e, const edm::EventSetup& c );
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
   // BeginJob
-  void beginJob( void );
+  void beginJob(void) override;
 
   // EndJob
-  void endJob( void );
+  void endJob(void) override;
 
- private:
-  
+private:
   int icycle_;
- 
-  DQMStore* dqmStore_;
+
+  DQMStore *dqmStore_;
 
   std::string prefixME_;
 
@@ -55,12 +51,11 @@ class EcalBarrelMonitorDbModule: public edm::EDAnalyzer{
 
   std::string xmlFile_;
 
-  MonitorElementsDb* ME_Db_;
+  MonitorElementsDb *ME_Db_;
 
   unsigned int sleepTime_;
 
-  coral::ISessionProxy* session_;
-
+  coral::ISessionProxy *session_;
 };
 
 #endif
diff --git a/DQM/EcalMonitorDbModule/interface/EcalCondDBReader.h b/DQM/EcalMonitorDbModule/interface/EcalCondDBReader.h
index 41261d6e53e6c..107104a387b7d 100644
--- a/DQM/EcalMonitorDbModule/interface/EcalCondDBReader.h
+++ b/DQM/EcalMonitorDbModule/interface/EcalCondDBReader.h
@@ -1,18 +1,18 @@
 #ifndef EcalCondDBReader_H
 #define EcalCondDBReader_H
 
+#include "DBReaderWorkers.h"
+#include "DQM/EcalCommon/interface/MESet.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
 #include "OnlineDB/EcalCondDB/interface/EcalCondDBInterface.h"
-#include "DQM/EcalCommon/interface/MESet.h"
-#include "DBReaderWorkers.h"
 
 class EcalCondDBReader : public DQMEDHarvester {
- public:
-  EcalCondDBReader(edm::ParameterSet const&);
-  ~EcalCondDBReader();
+public:
+  EcalCondDBReader(edm::ParameterSet const &);
+  ~EcalCondDBReader() override;
 
- private:
-  void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override;
+private:
+  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
 
   // DON'T CHANGE - ORDER MATTERS IN DB
   enum Tasks {
@@ -33,11 +33,11 @@ class EcalCondDBReader : public DQMEDHarvester {
     nTasks = 14
   };
 
-  EcalCondDBInterface* db_;
+  EcalCondDBInterface *db_;
   MonRunIOV monIOV_;
-  ecaldqm::DBReaderWorker* worker_;
+  ecaldqm::DBReaderWorker *worker_;
   std::string formula_;
-  ecaldqm::MESet* meSet_;
+  ecaldqm::MESet *meSet_;
 
   int verbosity_;
   bool executed_;
diff --git a/DQM/EcalMonitorDbModule/interface/EcalCondDBWriter.h b/DQM/EcalMonitorDbModule/interface/EcalCondDBWriter.h
index 56b081d9f1901..8ac0a7ca16976 100644
--- a/DQM/EcalMonitorDbModule/interface/EcalCondDBWriter.h
+++ b/DQM/EcalMonitorDbModule/interface/EcalCondDBWriter.h
@@ -8,12 +8,12 @@
 #include "OnlineDB/EcalCondDB/interface/EcalCondDBInterface.h"
 
 class EcalCondDBWriter : public DQMEDHarvester {
- public:
-  EcalCondDBWriter(edm::ParameterSet const&);
-  ~EcalCondDBWriter();
+public:
+  EcalCondDBWriter(edm::ParameterSet const &);
+  ~EcalCondDBWriter() override;
 
- private:
-  void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override;
+private:
+  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
 
   // DON'T CHANGE - ORDER MATTERS IN DB
   enum Tasks {
@@ -35,13 +35,13 @@ class EcalCondDBWriter : public DQMEDHarvester {
   };
 
   int runNumber_;
-  EcalCondDBInterface* db_;
+  EcalCondDBInterface *db_;
   std::string location_;
   std::string runType_;
   std::string runGeneralTag_;
   std::string monRunGeneralTag_;
   std::vector<std::string> inputRootFiles_;
-  ecaldqm::DBWriterWorker* workers_[nTasks];
+  ecaldqm::DBWriterWorker *workers_[nTasks];
   ecaldqm::SummaryWriter summaryWriter_;
 
   int verbosity_;
diff --git a/DQM/EcalMonitorDbModule/interface/EcalDQMStatusWriter.h b/DQM/EcalMonitorDbModule/interface/EcalDQMStatusWriter.h
index 85c5740c1ba63..f0a1822f731f7 100644
--- a/DQM/EcalMonitorDbModule/interface/EcalDQMStatusWriter.h
+++ b/DQM/EcalMonitorDbModule/interface/EcalDQMStatusWriter.h
@@ -7,12 +7,12 @@
 #include "CondFormats/EcalObjects/interface/EcalDQMTowerStatus.h"
 
 class EcalDQMStatusWriter : public edm::EDAnalyzer {
- public:
-  EcalDQMStatusWriter(edm::ParameterSet const&);
-  ~EcalDQMStatusWriter() {}
+public:
+  EcalDQMStatusWriter(edm::ParameterSet const &);
+  ~EcalDQMStatusWriter() override {}
 
- private:
-  void analyze(edm::Event const&, edm::EventSetup const&) override;
+private:
+  void analyze(edm::Event const &, edm::EventSetup const &) override;
 
   EcalDQMChannelStatus channelStatus_;
   EcalDQMTowerStatus towerStatus_;
diff --git a/DQM/EcalMonitorDbModule/interface/LogicIDTranslation.h b/DQM/EcalMonitorDbModule/interface/LogicIDTranslation.h
index 76895f25a1913..6634889562eea 100644
--- a/DQM/EcalMonitorDbModule/interface/LogicIDTranslation.h
+++ b/DQM/EcalMonitorDbModule/interface/LogicIDTranslation.h
@@ -3,25 +3,24 @@
 
 #include "OnlineDB/EcalCondDB/interface/EcalLogicID.h"
 
-#include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
 #include "DataFormats/EcalDetId/interface/EEDetId.h"
-#include "DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h"
-#include "DataFormats/EcalDetId/interface/EcalScDetId.h"
 #include "DataFormats/EcalDetId/interface/EcalElectronicsId.h"
 #include "DataFormats/EcalDetId/interface/EcalPnDiodeDetId.h"
+#include "DataFormats/EcalDetId/interface/EcalScDetId.h"
+#include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
+#include "DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h"
 
-namespace ecaldqm
-{
+namespace ecaldqm {
   EcalLogicID ecalID();
   EcalLogicID subdetID(EcalSubdetector);
-  EcalLogicID crystalID(DetId const&);
-  EcalLogicID towerID(EcalElectronicsId const&);
-  EcalLogicID memChannelID(EcalPnDiodeDetId const&);
-  EcalLogicID memTowerID(EcalElectronicsId const&);
-  EcalLogicID lmPNID(EcalPnDiodeDetId const&);
+  EcalLogicID crystalID(DetId const &);
+  EcalLogicID towerID(EcalElectronicsId const &);
+  EcalLogicID memChannelID(EcalPnDiodeDetId const &);
+  EcalLogicID memTowerID(EcalElectronicsId const &);
+  EcalLogicID lmPNID(EcalPnDiodeDetId const &);
 
-  DetId toDetId(EcalLogicID const&);
-}
+  DetId toDetId(EcalLogicID const &);
+}  // namespace ecaldqm
 
 #endif
diff --git a/DQM/EcalMonitorDbModule/interface/MonitorElementsDb.h b/DQM/EcalMonitorDbModule/interface/MonitorElementsDb.h
index ca1a0f3d928a0..c622b2c55f200 100644
--- a/DQM/EcalMonitorDbModule/interface/MonitorElementsDb.h
+++ b/DQM/EcalMonitorDbModule/interface/MonitorElementsDb.h
@@ -5,10 +5,9 @@
 /*!
   \file MonitorElementsDb.h
   \brief Generate a Monitor Element from DB data
-  \author B. Gobbo 
+  \author B. Gobbo
 */
 
-
 #include <string>
 #include <vector>
 
@@ -25,44 +24,39 @@
 class MonitorElement;
 class DQMStore;
 
-class MonitorElementsDb{
-
+class MonitorElementsDb {
   friend class EcalBarrelMonitorDbModule;
 
- public:
-
+public:
   /// Constructors
-  MonitorElementsDb(const edm::ParameterSet& ps, std::string& xmlFile );
+  MonitorElementsDb(const edm::ParameterSet &ps, std::string &xmlFile);
 
   /// Destructor
   virtual ~MonitorElementsDb();
 
- protected:
-
+protected:
   /// Analyze
-  void analyze( const edm::Event& e, const edm::EventSetup& c, coral::ISessionProxy* s );
+  void analyze(const edm::Event &e, const edm::EventSetup &c, coral::ISessionProxy *s);
 
   // BeginJob
-  void beginJob( void );
+  void beginJob(void);
 
   // EndJob
-  void endJob( void ); 
- 
-  // HtmlOutput
-  void htmlOutput( std::string& htmlDir );
-
-  void startSession( void );
+  void endJob(void);
 
- private:
-
-  std::string                   prefixME_;
-  std::string                   xmlFile_;
-  MonitorXMLParser*             parser_;
-  std::vector<DB_ME>            MEinfo_;
-  std::vector<MonitorElement*>  MEs_;
-  int                           ievt_;
-  DQMStore*        dqmStore_;
-  
+  // HtmlOutput
+  void htmlOutput(std::string &htmlDir);
+
+  void startSession(void);
+
+private:
+  std::string prefixME_;
+  std::string xmlFile_;
+  MonitorXMLParser *parser_;
+  std::vector<DB_ME> MEinfo_;
+  std::vector<MonitorElement *> MEs_;
+  int ievt_;
+  DQMStore *dqmStore_;
 };
 
 #endif  // MonitorElementsDb_H
diff --git a/DQM/EcalMonitorDbModule/interface/MonitorXMLParser.h b/DQM/EcalMonitorDbModule/interface/MonitorXMLParser.h
index 1b17d5cb70a3c..fa3feced8fa92 100644
--- a/DQM/EcalMonitorDbModule/interface/MonitorXMLParser.h
+++ b/DQM/EcalMonitorDbModule/interface/MonitorXMLParser.h
@@ -2,17 +2,17 @@
 /*!
   \file MonitorXMLParser.h
   \brief monitor db xml elements parsing tool
-  \author B. Gobbo 
+  \author B. Gobbo
 */
 
 #ifndef MonitorXMLParser_h
 #define MonitorXMLParser_h
 
-#include <string>
+#include <iostream>
+#include <map>
 #include <sstream>
+#include <string>
 #include <vector>
-#include <map>
-#include <iostream>
 
 #include <xercesc/dom/DOM.hpp>
 #include <xercesc/dom/DOMElement.hpp>
@@ -20,163 +20,154 @@
 
 // - - - - - - - - - - - - - - - - - - - -
 
-enum { ERROR_ARGS = 1 ,
-       ERROR_XERCES_INIT ,
-       ERROR_PARSE ,
-       ERROR_EMPTY_DOCUMENT
-};
+enum { ERROR_ARGS = 1, ERROR_XERCES_INIT, ERROR_PARSE, ERROR_EMPTY_DOCUMENT };
 
 // - - - - - - - - - - - - - - - - - - - -
 
-struct DbQuery { std::string query;
-                 std::string arg;
-                 std::string alias; };
+struct DbQuery {
+  std::string query;
+  std::string arg;
+  std::string alias;
+};
 
-struct DB_ME { std::string type;
-               std::string title;
-               int xbins; double xfrom; double xto; 
-               int ybins; double yfrom; double yto;
-               int zbins; double zfrom; double zto;
-               unsigned int ncycle;
-               unsigned int loop;
-               std::vector< DbQuery > queries; };
+struct DB_ME {
+  std::string type;
+  std::string title;
+  int xbins;
+  double xfrom;
+  double xto;
+  int ybins;
+  double yfrom;
+  double yto;
+  int zbins;
+  double zfrom;
+  double zto;
+  unsigned int ncycle;
+  unsigned int loop;
+  std::vector<DbQuery> queries;
+};
 
 // - - - - - - - - - - - - - - - - - - - -
 
 class TagNames {
-
 public:
-  XMLCh* TAG_DBE;
-  XMLCh* TAG_ME;
-  XMLCh* TAG_1D;
-  XMLCh* TAG_2D;
-  XMLCh* TAG_TPROFILE;
-  XMLCh* TAG_TPROFILE2D;
-  XMLCh* TAG_QUERY;
-
-  XMLCh* ATTR_TITLE;
-  XMLCh* ATTR_XBINS;
-  XMLCh* ATTR_XFROM;
-  XMLCh* ATTR_XTO;
-  XMLCh* ATTR_YBINS;
-  XMLCh* ATTR_YFROM;
-  XMLCh* ATTR_YTO;
-  XMLCh* ATTR_ZBINS;
-  XMLCh* ATTR_ZFROM;
-  XMLCh* ATTR_ZTO;
-  XMLCh* ATTR_NCYCLE;
-  XMLCh* ATTR_LOOP;
-  XMLCh* ATTR_NAME;
-  XMLCh* ATTR_ARG;
-  XMLCh* ATTR_ALIAS;  
-
-  TagNames() :
-    TAG_DBE( xercesc::XMLString::transcode( "dbelements" ) ),
-    TAG_ME( xercesc::XMLString::transcode( "me" ) ),
-    TAG_1D( xercesc::XMLString::transcode( "th1d" ) ),
-    TAG_2D( xercesc::XMLString::transcode( "th2d" ) ),
-    TAG_TPROFILE( xercesc::XMLString::transcode( "tprofile" ) ),
-    TAG_TPROFILE2D( xercesc::XMLString::transcode( "tprofile2d" ) ),
-    TAG_QUERY( xercesc::XMLString::transcode( "query" ) ),
-
-    ATTR_TITLE( xercesc::XMLString::transcode( "title" ) ),
-    ATTR_XBINS( xercesc::XMLString::transcode( "xbins" ) ),   
-    ATTR_XFROM( xercesc::XMLString::transcode( "xfrom" ) ),
-    ATTR_XTO( xercesc::XMLString::transcode( "xto" ) ),
-    ATTR_YBINS( xercesc::XMLString::transcode( "ybins" ) ),
-    ATTR_YFROM( xercesc::XMLString::transcode( "yfrom" ) ),
-    ATTR_YTO( xercesc::XMLString::transcode( "yto" ) ),
-    ATTR_ZBINS( xercesc::XMLString::transcode( "ybins" ) ),
-    ATTR_ZFROM( xercesc::XMLString::transcode( "yfrom" ) ),
-    ATTR_ZTO( xercesc::XMLString::transcode( "yto" ) ),
-    ATTR_NCYCLE( xercesc::XMLString::transcode( "ncycle" ) ),
-    ATTR_LOOP( xercesc::XMLString::transcode( "loop" ) ),
-    ATTR_NAME( xercesc::XMLString::transcode( "name" ) ),
-    ATTR_ARG( xercesc::XMLString::transcode( "arg" ) ),
-    ATTR_ALIAS( xercesc::XMLString::transcode( "alias" ) )  { 
-
-    return ;
-
+  XMLCh *TAG_DBE;
+  XMLCh *TAG_ME;
+  XMLCh *TAG_1D;
+  XMLCh *TAG_2D;
+  XMLCh *TAG_TPROFILE;
+  XMLCh *TAG_TPROFILE2D;
+  XMLCh *TAG_QUERY;
+
+  XMLCh *ATTR_TITLE;
+  XMLCh *ATTR_XBINS;
+  XMLCh *ATTR_XFROM;
+  XMLCh *ATTR_XTO;
+  XMLCh *ATTR_YBINS;
+  XMLCh *ATTR_YFROM;
+  XMLCh *ATTR_YTO;
+  XMLCh *ATTR_ZBINS;
+  XMLCh *ATTR_ZFROM;
+  XMLCh *ATTR_ZTO;
+  XMLCh *ATTR_NCYCLE;
+  XMLCh *ATTR_LOOP;
+  XMLCh *ATTR_NAME;
+  XMLCh *ATTR_ARG;
+  XMLCh *ATTR_ALIAS;
+
+  TagNames()
+      : TAG_DBE(xercesc::XMLString::transcode("dbelements")),
+        TAG_ME(xercesc::XMLString::transcode("me")),
+        TAG_1D(xercesc::XMLString::transcode("th1d")),
+        TAG_2D(xercesc::XMLString::transcode("th2d")),
+        TAG_TPROFILE(xercesc::XMLString::transcode("tprofile")),
+        TAG_TPROFILE2D(xercesc::XMLString::transcode("tprofile2d")),
+        TAG_QUERY(xercesc::XMLString::transcode("query")),
+
+        ATTR_TITLE(xercesc::XMLString::transcode("title")),
+        ATTR_XBINS(xercesc::XMLString::transcode("xbins")),
+        ATTR_XFROM(xercesc::XMLString::transcode("xfrom")),
+        ATTR_XTO(xercesc::XMLString::transcode("xto")),
+        ATTR_YBINS(xercesc::XMLString::transcode("ybins")),
+        ATTR_YFROM(xercesc::XMLString::transcode("yfrom")),
+        ATTR_YTO(xercesc::XMLString::transcode("yto")),
+        ATTR_ZBINS(xercesc::XMLString::transcode("ybins")),
+        ATTR_ZFROM(xercesc::XMLString::transcode("yfrom")),
+        ATTR_ZTO(xercesc::XMLString::transcode("yto")),
+        ATTR_NCYCLE(xercesc::XMLString::transcode("ncycle")),
+        ATTR_LOOP(xercesc::XMLString::transcode("loop")),
+        ATTR_NAME(xercesc::XMLString::transcode("name")),
+        ATTR_ARG(xercesc::XMLString::transcode("arg")),
+        ATTR_ALIAS(xercesc::XMLString::transcode("alias")) {
+    return;
   }
 
+  ~TagNames() noexcept(false) {
+    try {
+      xercesc::XMLString::release(&TAG_DBE);
+      xercesc::XMLString::release(&TAG_ME);
+      xercesc::XMLString::release(&TAG_1D);
+      xercesc::XMLString::release(&TAG_2D);
+      xercesc::XMLString::release(&TAG_TPROFILE);
+      xercesc::XMLString::release(&TAG_TPROFILE2D);
+      xercesc::XMLString::release(&TAG_QUERY);
+
+      xercesc::XMLString::release(&ATTR_TITLE);
+      xercesc::XMLString::release(&ATTR_XFROM);
+      xercesc::XMLString::release(&ATTR_XTO);
+      xercesc::XMLString::release(&ATTR_XBINS);
+      xercesc::XMLString::release(&ATTR_YFROM);
+      xercesc::XMLString::release(&ATTR_YTO);
+      xercesc::XMLString::release(&ATTR_YBINS);
+      xercesc::XMLString::release(&ATTR_NCYCLE);
+      xercesc::XMLString::release(&ATTR_LOOP);
+      xercesc::XMLString::release(&ATTR_NAME);
+      xercesc::XMLString::release(&ATTR_ARG);
+      xercesc::XMLString::release(&ATTR_ALIAS);
+
+    } catch (xercesc::XMLException &e) {
+      char *message = xercesc::XMLString::transcode(e.getMessage());
 
-  ~TagNames() noexcept(false){
-    
-    try{
-
-      xercesc::XMLString::release( &TAG_DBE ) ;
-      xercesc::XMLString::release( &TAG_ME ) ;
-      xercesc::XMLString::release( &TAG_1D ) ;
-      xercesc::XMLString::release( &TAG_2D ) ;
-      xercesc::XMLString::release( &TAG_TPROFILE ) ;
-      xercesc::XMLString::release( &TAG_TPROFILE2D ) ;
-      xercesc::XMLString::release( &TAG_QUERY ) ;
-      
-      xercesc::XMLString::release( &ATTR_TITLE ) ;
-      xercesc::XMLString::release( &ATTR_XFROM ) ;
-      xercesc::XMLString::release( &ATTR_XTO ) ;
-      xercesc::XMLString::release( &ATTR_XBINS ) ;
-      xercesc::XMLString::release( &ATTR_YFROM ) ;
-      xercesc::XMLString::release( &ATTR_YTO ) ;
-      xercesc::XMLString::release( &ATTR_YBINS ) ;
-      xercesc::XMLString::release( &ATTR_NCYCLE ) ;
-      xercesc::XMLString::release( &ATTR_LOOP ) ;
-      xercesc::XMLString::release( &ATTR_NAME ) ;
-      xercesc::XMLString::release( &ATTR_ARG ) ;
-      xercesc::XMLString::release( &ATTR_ALIAS ) ;
-
-    }catch( xercesc::XMLException& e ){
-   
-      char* message = xercesc::XMLString::transcode( e.getMessage() );
-   
-      std::ostringstream buf ;
+      std::ostringstream buf;
       buf << "Error parsing file: " << message << std::flush;
-   
-      xercesc::XMLString::release( &message );
-   
-      throw( std::runtime_error( buf.str() ) );
-   
-    }catch( const xercesc::DOMException& e ){
-   
-      char* message = xercesc::XMLString::transcode( e.getMessage() );
-   
+
+      xercesc::XMLString::release(&message);
+
+      throw(std::runtime_error(buf.str()));
+
+    } catch (const xercesc::DOMException &e) {
+      char *message = xercesc::XMLString::transcode(e.getMessage());
+
       std::ostringstream buf;
       buf << "Encountered DOM Exception: " << message << std::flush;
-   
-      xercesc::XMLString::release( &message );
-   
-      throw( std::runtime_error( buf.str() ) );
-   
-    }
 
-  } 
+      xercesc::XMLString::release(&message);
 
-}; // class TagNames
+      throw(std::runtime_error(buf.str()));
+    }
+  }
 
+};  // class TagNames
 
 // - - - - - - - - - - - - - - - - - - - -
 
-
 class MonitorXMLParser {
-
 private:
-  
-  std::vector< DB_ME >      DBMonitoringElements_;
-  std::string               xmlFile_;
-  xercesc::XercesDOMParser* parser_;
-  TagNames*                 tags_;
-  void handleElement( xercesc::DOMElement* element );
+  std::vector<DB_ME> DBMonitoringElements_;
+  std::string xmlFile_;
+  xercesc::XercesDOMParser *parser_;
+  TagNames *tags_;
+  void handleElement(xercesc::DOMElement *element);
 
 public:
-
-  MonitorXMLParser( const std::string& fromFile );
+  MonitorXMLParser(const std::string &fromFile);
 
   ~MonitorXMLParser() throw();
 
-  const std::vector< DB_ME > & getDB_ME( void ) const { return (DBMonitoringElements_ ); }
+  const std::vector<DB_ME> &getDB_ME(void) const { return (DBMonitoringElements_); }
 
   void load() noexcept(false);
 
-}; // class MonitorXMLParser
+};  // class MonitorXMLParser
 
-#endif // MonitorXMLParser_h
+#endif  // MonitorXMLParser_h
diff --git a/DQM/EcalMonitorDbModule/plugins/EcalBarrelMonitorDbModule.cc b/DQM/EcalMonitorDbModule/plugins/EcalBarrelMonitorDbModule.cc
index 370de342e8f42..4d422283f9295 100644
--- a/DQM/EcalMonitorDbModule/plugins/EcalBarrelMonitorDbModule.cc
+++ b/DQM/EcalMonitorDbModule/plugins/EcalBarrelMonitorDbModule.cc
@@ -3,17 +3,17 @@
  *
  * \author G. Della Ricca
  *
-*/
+ */
 
 #include "DQM/EcalMonitorDbModule/interface/EcalBarrelMonitorDbModule.h"
 
 #include <unistd.h>
 
-#include <iostream>
 #include <cmath>
+#include <iostream>
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "RelationalAccess/IConnectionService.h"
 #include "RelationalAccess/IConnectionServiceConfiguration.h"
@@ -25,98 +25,93 @@
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-EcalBarrelMonitorDbModule::EcalBarrelMonitorDbModule(const edm::ParameterSet& ps){
-
+EcalBarrelMonitorDbModule::EcalBarrelMonitorDbModule(const edm::ParameterSet &ps) {
   dqmStore_ = edm::Service<DQMStore>().operator->();
 
   prefixME_ = ps.getUntrackedParameter<std::string>("prefixME", "");
 
-  xmlFile_ = ps.getUntrackedParameter<std::string>( "xmlFile", "" );
-  if ( !xmlFile_.empty() ) {
+  xmlFile_ = ps.getUntrackedParameter<std::string>("xmlFile", "");
+  if (!xmlFile_.empty()) {
     std::cout << "Monitor Elements from DB xml source file is " << xmlFile_ << std::endl;
   }
 
-  sleepTime_ = ps.getUntrackedParameter<int>( "sleepTime", 0 );
+  sleepTime_ = ps.getUntrackedParameter<int>("sleepTime", 0);
   std::cout << "Sleep time is " << sleepTime_ << " second(s)." << std::endl;
 
   // html output directory
   htmlDir_ = ps.getUntrackedParameter<std::string>("htmlDir", ".");
 
-  if ( !htmlDir_.empty() ) {
+  if (!htmlDir_.empty()) {
     std::cout << " HTML output will go to"
-	      << " htmlDir = " << htmlDir_ << std::endl;
+              << " htmlDir = " << htmlDir_ << std::endl;
   } else {
     std::cout << " HTML output is disabled" << std::endl;
   }
 
-  ME_Db_ = new MonitorElementsDb( ps, xmlFile_ );
+  ME_Db_ = new MonitorElementsDb(ps, xmlFile_);
 
-  if ( dqmStore_ ) dqmStore_->showDirStructure();
+  if (dqmStore_)
+    dqmStore_->showDirStructure();
 
   icycle_ = 0;
   session_ = nullptr;
 }
 
-EcalBarrelMonitorDbModule::~EcalBarrelMonitorDbModule(){
-
-  if ( ME_Db_ ) delete ME_Db_;
-
+EcalBarrelMonitorDbModule::~EcalBarrelMonitorDbModule() {
+  if (ME_Db_)
+    delete ME_Db_;
 }
 
-void EcalBarrelMonitorDbModule::beginJob(void){
-
+void EcalBarrelMonitorDbModule::beginJob(void) {
   icycle_ = 0;
 
-  if ( ME_Db_ ) ME_Db_->beginJob();
-
+  if (ME_Db_)
+    ME_Db_->beginJob();
 }
 
 void EcalBarrelMonitorDbModule::endJob(void) {
-
-  if ( ME_Db_ ) ME_Db_->endJob();
+  if (ME_Db_)
+    ME_Db_->endJob();
 
   std::cout << "EcalBarrelMonitorDbModule: endJob, icycle = " << icycle_ << std::endl;
-
 }
 
-void EcalBarrelMonitorDbModule::analyze(const edm::Event& e, const edm::EventSetup& c){
-
+void EcalBarrelMonitorDbModule::analyze(const edm::Event &e, const edm::EventSetup &c) {
   icycle_++;
 
   std::cout << "EcalBarrelMonitorDbModule: icycle = " << icycle_ << std::endl;
 
   try {
-    coral::Context& context = coral::Context::instance();
+    coral::Context &context = coral::Context::instance();
     context.loadComponent("CORAL/Services/ConnectionService");
     context.loadComponent("CORAL/Services/EnvironmentAuthenticationService");
-    coral::IHandle<coral::IConnectionService> connectionService = context.query<coral::IConnectionService>("CORAL/Services/ConnectionService");
+    coral::IHandle<coral::IConnectionService> connectionService =
+        context.query<coral::IConnectionService>("CORAL/Services/ConnectionService");
     context.loadComponent("CORAL/RelationalPlugins/oracle");
 
     // Set configuration parameters
-    coral::IConnectionServiceConfiguration& config = connectionService->configuration();
+    coral::IConnectionServiceConfiguration &config = connectionService->configuration();
     config.setConnectionRetrialPeriod(1);
     config.setConnectionRetrialTimeOut(10);
 
     session_ = connectionService->connect("ECAL CondDB", coral::ReadOnly);
 
-    if ( ME_Db_ ) ME_Db_->analyze(e, c, session_ );
+    if (ME_Db_)
+      ME_Db_->analyze(e, c, session_);
 
-  } catch (coral::Exception& e) {
+  } catch (coral::Exception &e) {
     std::cerr << "CORAL Exception : " << e.what() << std::endl;
-  } catch (std::exception& e) {
+  } catch (std::exception &e) {
     std::cerr << "Standard C++ exception : " << e.what() << std::endl;
   }
 
-  if ( !htmlDir_.empty() ) {
-
-    ME_Db_->htmlOutput( htmlDir_ );
-
+  if (!htmlDir_.empty()) {
+    ME_Db_->htmlOutput(htmlDir_);
   }
 
   delete session_;
 
-  sleep( sleepTime_ );
-
+  sleep(sleepTime_);
 }
 
 DEFINE_FWK_MODULE(EcalBarrelMonitorDbModule);
diff --git a/DQM/EcalMonitorDbModule/plugins/EcalCondDBReader.cc b/DQM/EcalMonitorDbModule/plugins/EcalCondDBReader.cc
index dc0483de57df9..5d0e8823aacdb 100644
--- a/DQM/EcalMonitorDbModule/plugins/EcalCondDBReader.cc
+++ b/DQM/EcalMonitorDbModule/plugins/EcalCondDBReader.cc
@@ -3,51 +3,78 @@
 #include "DQM/EcalCommon/interface/MESetUtils.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-EcalCondDBReader::EcalCondDBReader(edm::ParameterSet const& _ps) :
-  db_(nullptr),
-  monIOV_(),
-  worker_(nullptr),
-  formula_(_ps.getUntrackedParameter<std::string>("formula")),
-  meSet_(ecaldqm::createMESet(_ps.getUntrackedParameterSet("plot"))),
-  verbosity_(_ps.getUntrackedParameter<int>("verbosity"))
-{
+EcalCondDBReader::EcalCondDBReader(edm::ParameterSet const &_ps)
+    : db_(nullptr),
+      monIOV_(),
+      worker_(nullptr),
+      formula_(_ps.getUntrackedParameter<std::string>("formula")),
+      meSet_(ecaldqm::createMESet(_ps.getUntrackedParameterSet("plot"))),
+      verbosity_(_ps.getUntrackedParameter<int>("verbosity")) {
   std::string table(_ps.getUntrackedParameter<std::string>("table"));
-  edm::ParameterSet const& workerParams(_ps.getUntrackedParameterSet("workerParams"));
-
-  if(table == "CrystalConsistency") worker_ = new ecaldqm::CrystalConsistencyReader(workerParams);
-  if(table == "TTConsistency") worker_ = new ecaldqm::TTConsistencyReader(workerParams);
-  if(table == "MemChConsistency") worker_ = new ecaldqm::MemChConsistencyReader(workerParams);
-  if(table == "MemTTConsistency") worker_ = new ecaldqm::MemTTConsistencyReader(workerParams);
-  if(table == "LaserBlue") worker_ = new ecaldqm::LaserBlueReader(workerParams);
-  if(table == "TimingLaserBlueCrystal") worker_ = new ecaldqm::TimingLaserBlueCrystalReader(workerParams);
-  if(table == "PNBlue") worker_ = new ecaldqm::PNBlueReader(workerParams);
-  if(table == "LaserGreen") worker_ = new ecaldqm::LaserGreenReader(workerParams);
-  if(table == "TimingLaserGreenCrystal") worker_ = new ecaldqm::TimingLaserGreenCrystalReader(workerParams);
-  if(table == "PNGreen") worker_ = new ecaldqm::PNGreenReader(workerParams);
-  if(table == "LaserIRed") worker_ = new ecaldqm::LaserIRedReader(workerParams);
-  if(table == "TimingLaserIRedCrystal") worker_ = new ecaldqm::TimingLaserIRedCrystalReader(workerParams);
-  if(table == "PNIRed") worker_ = new ecaldqm::PNIRedReader(workerParams);
-  if(table == "LaserRed") worker_ = new ecaldqm::LaserRedReader(workerParams);
-  if(table == "TimingLaserRedCrystal") worker_ = new ecaldqm::TimingLaserRedCrystalReader(workerParams);
-  if(table == "PNRed") worker_ = new ecaldqm::PNRedReader(workerParams);
-  if(table == "Pedestals") worker_ = new ecaldqm::PedestalsReader(workerParams);
-  if(table == "PNPed") worker_ = new ecaldqm::PNPedReader(workerParams);
-  if(table == "PedestalsOnline") worker_ = new ecaldqm::PedestalsOnlineReader(workerParams);
-  if(table == "TestPulse") worker_ = new ecaldqm::TestPulseReader(workerParams);
-  if(table == "PulseShape") worker_ = new ecaldqm::PulseShapeReader(workerParams);
-  if(table == "PNMGPA") worker_ = new ecaldqm::PNMGPAReader(workerParams);
-  if(table == "TimingCrystal") worker_ = new ecaldqm::TimingCrystalReader(workerParams);
-  if(table == "Led1") worker_ = new ecaldqm::Led1Reader(workerParams);
-  if(table == "TimingLed1Crystal") worker_ = new ecaldqm::TimingLed1CrystalReader(workerParams);
-  if(table == "Led2") worker_ = new ecaldqm::Led2Reader(workerParams);
-  if(table == "TimingLed2Crystal") worker_ = new ecaldqm::TimingLed2CrystalReader(workerParams);
-  if(table == "Occupancy") worker_ = new ecaldqm::OccupancyReader(workerParams);
-
-  if(!worker_)
+  edm::ParameterSet const &workerParams(_ps.getUntrackedParameterSet("workerParams"));
+
+  if (table == "CrystalConsistency")
+    worker_ = new ecaldqm::CrystalConsistencyReader(workerParams);
+  if (table == "TTConsistency")
+    worker_ = new ecaldqm::TTConsistencyReader(workerParams);
+  if (table == "MemChConsistency")
+    worker_ = new ecaldqm::MemChConsistencyReader(workerParams);
+  if (table == "MemTTConsistency")
+    worker_ = new ecaldqm::MemTTConsistencyReader(workerParams);
+  if (table == "LaserBlue")
+    worker_ = new ecaldqm::LaserBlueReader(workerParams);
+  if (table == "TimingLaserBlueCrystal")
+    worker_ = new ecaldqm::TimingLaserBlueCrystalReader(workerParams);
+  if (table == "PNBlue")
+    worker_ = new ecaldqm::PNBlueReader(workerParams);
+  if (table == "LaserGreen")
+    worker_ = new ecaldqm::LaserGreenReader(workerParams);
+  if (table == "TimingLaserGreenCrystal")
+    worker_ = new ecaldqm::TimingLaserGreenCrystalReader(workerParams);
+  if (table == "PNGreen")
+    worker_ = new ecaldqm::PNGreenReader(workerParams);
+  if (table == "LaserIRed")
+    worker_ = new ecaldqm::LaserIRedReader(workerParams);
+  if (table == "TimingLaserIRedCrystal")
+    worker_ = new ecaldqm::TimingLaserIRedCrystalReader(workerParams);
+  if (table == "PNIRed")
+    worker_ = new ecaldqm::PNIRedReader(workerParams);
+  if (table == "LaserRed")
+    worker_ = new ecaldqm::LaserRedReader(workerParams);
+  if (table == "TimingLaserRedCrystal")
+    worker_ = new ecaldqm::TimingLaserRedCrystalReader(workerParams);
+  if (table == "PNRed")
+    worker_ = new ecaldqm::PNRedReader(workerParams);
+  if (table == "Pedestals")
+    worker_ = new ecaldqm::PedestalsReader(workerParams);
+  if (table == "PNPed")
+    worker_ = new ecaldqm::PNPedReader(workerParams);
+  if (table == "PedestalsOnline")
+    worker_ = new ecaldqm::PedestalsOnlineReader(workerParams);
+  if (table == "TestPulse")
+    worker_ = new ecaldqm::TestPulseReader(workerParams);
+  if (table == "PulseShape")
+    worker_ = new ecaldqm::PulseShapeReader(workerParams);
+  if (table == "PNMGPA")
+    worker_ = new ecaldqm::PNMGPAReader(workerParams);
+  if (table == "TimingCrystal")
+    worker_ = new ecaldqm::TimingCrystalReader(workerParams);
+  if (table == "Led1")
+    worker_ = new ecaldqm::Led1Reader(workerParams);
+  if (table == "TimingLed1Crystal")
+    worker_ = new ecaldqm::TimingLed1CrystalReader(workerParams);
+  if (table == "Led2")
+    worker_ = new ecaldqm::Led2Reader(workerParams);
+  if (table == "TimingLed2Crystal")
+    worker_ = new ecaldqm::TimingLed2CrystalReader(workerParams);
+  if (table == "Occupancy")
+    worker_ = new ecaldqm::OccupancyReader(workerParams);
+
+  if (!worker_)
     throw cms::Exception("Configuration") << "Invalid worker type";
 
   std::string DBName(_ps.getUntrackedParameter<std::string>("DBName"));
@@ -58,21 +85,20 @@ EcalCondDBReader::EcalCondDBReader(edm::ParameterSet const& _ps) :
 
   std::unique_ptr<EcalCondDBInterface> db(nullptr);
 
-  if(verbosity_ > 0) edm::LogInfo("EcalDQM") << "Establishing DB connection";
+  if (verbosity_ > 0)
+    edm::LogInfo("EcalDQM") << "Establishing DB connection";
 
-  try{
+  try {
     db = std::unique_ptr<EcalCondDBInterface>(new EcalCondDBInterface(DBName, userName, password));
-  }
-  catch(std::runtime_error& re){
-    if(!hostName.empty()){
-      try{
-        db = std::unique_ptr<EcalCondDBInterface>(new EcalCondDBInterface(hostName, DBName, userName, password, hostPort));
-      }
-      catch(std::runtime_error& re2){
+  } catch (std::runtime_error &re) {
+    if (!hostName.empty()) {
+      try {
+        db = std::unique_ptr<EcalCondDBInterface>(
+            new EcalCondDBInterface(hostName, DBName, userName, password, hostPort));
+      } catch (std::runtime_error &re2) {
         throw cms::Exception("DBError") << re2.what();
       }
-    }
-    else
+    } else
       throw cms::Exception("DBError") << re.what();
   }
 
@@ -82,47 +108,46 @@ EcalCondDBReader::EcalCondDBReader(edm::ParameterSet const& _ps) :
   int runNumber(_ps.getUntrackedParameter<int>("runNumber"));
   std::string monRunGeneralTag(_ps.getUntrackedParameter<std::string>("monRunGeneralTag"));
 
-  if(verbosity_ > 0) edm::LogInfo("EcalDQM") << "Initializing DB entry";
+  if (verbosity_ > 0)
+    edm::LogInfo("EcalDQM") << "Initializing DB entry";
 
   RunTag runTag;
 
-  try{
+  try {
     runTag = db_->fetchRunIOV(location, runNumber).getRunTag();
-  }
-  catch(std::exception&){
+  } catch (std::exception &) {
     edm::LogError("EcalDQM") << "Cannot fetch RunIOV for location=" << location << " runNumber=" << runNumber;
     throw;
   }
 
   MonVersionDef versionDef;
-  versionDef.setMonitoringVersion("test01"); // the only mon_ver in mon_version_def table as of September 2012
+  versionDef.setMonitoringVersion("test01");  // the only mon_ver in mon_version_def table as of September
+                                              // 2012
   MonRunTag monTag;
   monTag.setMonVersionDef(versionDef);
   monTag.setGeneralTag(monRunGeneralTag);
 
-  try{
+  try {
     monIOV_ = db_->fetchMonRunIOV(&runTag, &monTag, runNumber, 1);
-  }
-  catch(std::runtime_error& e){
-    edm::LogError("EcalDQM") << "Cannot fetch MonRunIOV for location=" << location << " runNumber=" << runNumber << " monVersion=test01 monRunGeneralTag=" << monRunGeneralTag;
+  } catch (std::runtime_error &e) {
+    edm::LogError("EcalDQM") << "Cannot fetch MonRunIOV for location=" << location << " runNumber=" << runNumber
+                             << " monVersion=test01 monRunGeneralTag=" << monRunGeneralTag;
     throw;
   }
 
-  if(verbosity_ > 0) edm::LogInfo("EcalDQM") << " Done.";
+  if (verbosity_ > 0)
+    edm::LogInfo("EcalDQM") << " Done.";
 }
 
-EcalCondDBReader::~EcalCondDBReader()
-{
+EcalCondDBReader::~EcalCondDBReader() {
   delete worker_;
   delete meSet_;
 }
- 
-void
-EcalCondDBReader::dqmEndJob(DQMStore::IBooker& _ibooker, DQMStore::IGetter&)
-{
+
+void EcalCondDBReader::dqmEndJob(DQMStore::IBooker &_ibooker, DQMStore::IGetter &) {
   meSet_->book(_ibooker);
 
   std::map<DetId, double> values(worker_->run(db_, monIOV_, formula_));
-  for(std::map<DetId, double>::const_iterator vItr(values.begin()); vItr != values.end(); ++vItr)
+  for (std::map<DetId, double>::const_iterator vItr(values.begin()); vItr != values.end(); ++vItr)
     meSet_->setBinContent(vItr->first, vItr->second);
 }
diff --git a/DQM/EcalMonitorDbModule/plugins/EcalCondDBWriter.cc b/DQM/EcalMonitorDbModule/plugins/EcalCondDBWriter.cc
index 8de2aae054981..ed58f3101c407 100644
--- a/DQM/EcalMonitorDbModule/plugins/EcalCondDBWriter.cc
+++ b/DQM/EcalMonitorDbModule/plugins/EcalCondDBWriter.cc
@@ -2,61 +2,54 @@
 
 #include "DQMServices/Core/interface/DQMStore.h"
 
-#include "FWCore/Utilities/interface/Exception.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
 #include "TObjArray.h"
 #include "TPRegexp.h"
 #include "TString.h"
 
-void
-setBit(int& _bitArray, unsigned _iBit)
-{
-  _bitArray |= (0x1 << _iBit);
-}
+void setBit(int &_bitArray, unsigned _iBit) { _bitArray |= (0x1 << _iBit); }
 
-bool
-getBit(int& _bitArray, unsigned _iBit)
-{
-  return (_bitArray & (0x1 << _iBit)) != 0;
-}
+bool getBit(int &_bitArray, unsigned _iBit) { return (_bitArray & (0x1 << _iBit)) != 0; }
+
+EcalCondDBWriter::EcalCondDBWriter(edm::ParameterSet const &_ps)
+    : runNumber_(0),
+      db_(nullptr),
+      location_(_ps.getUntrackedParameter<std::string>("location")),
+      runType_(_ps.getUntrackedParameter<std::string>("runType")),
+      runGeneralTag_(_ps.getUntrackedParameter<std::string>("runGeneralTag")),
+      monRunGeneralTag_(_ps.getUntrackedParameter<std::string>("monRunGeneralTag")),
+      summaryWriter_(_ps.getUntrackedParameterSet("workerParams")),
+      verbosity_(_ps.getUntrackedParameter<int>("verbosity")),
+      executed_(false) {
+  std::vector<std::string> inputRootFiles(_ps.getUntrackedParameter<std::vector<std::string>>("inputRootFiles"));
 
-EcalCondDBWriter::EcalCondDBWriter(edm::ParameterSet const& _ps) :
-  runNumber_(0),
-  db_(nullptr),
-  location_(_ps.getUntrackedParameter<std::string>("location")),
-  runType_(_ps.getUntrackedParameter<std::string>("runType")),
-  runGeneralTag_(_ps.getUntrackedParameter<std::string>("runGeneralTag")),
-  monRunGeneralTag_(_ps.getUntrackedParameter<std::string>("monRunGeneralTag")),
-  summaryWriter_(_ps.getUntrackedParameterSet("workerParams")),
-  verbosity_(_ps.getUntrackedParameter<int>("verbosity")),
-  executed_(false)
-{
-  std::vector<std::string> inputRootFiles(_ps.getUntrackedParameter<std::vector<std::string> >("inputRootFiles"));
-
-  if(inputRootFiles.empty())
+  if (inputRootFiles.empty())
     throw cms::Exception("Configuration") << "No input ROOT file given";
 
-  if(verbosity_ > 0) edm::LogInfo("EcalDQM") << "Initializing DQMStore from input ROOT files";
+  if (verbosity_ > 0)
+    edm::LogInfo("EcalDQM") << "Initializing DQMStore from input ROOT files";
 
-  DQMStore& dqmStore(*edm::Service<DQMStore>());
+  DQMStore &dqmStore(*edm::Service<DQMStore>());
 
-  for(unsigned iF(0); iF < inputRootFiles.size(); ++iF){
-    std::string& fileName(inputRootFiles[iF]);
+  for (unsigned iF(0); iF < inputRootFiles.size(); ++iF) {
+    std::string &fileName(inputRootFiles[iF]);
 
-    if(verbosity_ > 1) edm::LogInfo("EcalDQM") << " " << fileName;
+    if (verbosity_ > 1)
+      edm::LogInfo("EcalDQM") << " " << fileName;
 
     TPRegexp pat("DQM_V[0-9]+(?:|_[0-9a-zA-Z]+)_R([0-9]+)");
     std::unique_ptr<TObjArray> matches(pat.MatchS(fileName.c_str()));
-    if(matches->GetEntries() == 0)
+    if (matches->GetEntries() == 0)
       throw cms::Exception("Configuration") << "Input file " << fileName << " is not an DQM output";
 
-    if(iF == 0)
+    if (iF == 0)
       runNumber_ = TString(matches->At(1)->GetName()).Atoi();
-    else if(TString(matches->At(1)->GetName()).Atoi() != runNumber_)
+    else if (TString(matches->At(1)->GetName()).Atoi() != runNumber_)
       throw cms::Exception("Configuration") << "Input files disagree in run number";
 
     dqmStore.open(fileName, false, "", "", DQMStore::StripRunDirs);
@@ -70,29 +63,29 @@ EcalCondDBWriter::EcalCondDBWriter(edm::ParameterSet const& _ps) :
 
   std::unique_ptr<EcalCondDBInterface> db(nullptr);
 
-  if(verbosity_ > 0) edm::LogInfo("EcalDQM") << "Establishing DB connection";
+  if (verbosity_ > 0)
+    edm::LogInfo("EcalDQM") << "Establishing DB connection";
 
-  try{
+  try {
     db = std::unique_ptr<EcalCondDBInterface>(new EcalCondDBInterface(DBName, userName, password));
-  }
-  catch(std::runtime_error& re){
-    if(!hostName.empty()){
-      try{
-        db = std::unique_ptr<EcalCondDBInterface>(new EcalCondDBInterface(hostName, DBName, userName, password, hostPort));
-      }
-      catch(std::runtime_error& re2){
+  } catch (std::runtime_error &re) {
+    if (!hostName.empty()) {
+      try {
+        db = std::unique_ptr<EcalCondDBInterface>(
+            new EcalCondDBInterface(hostName, DBName, userName, password, hostPort));
+      } catch (std::runtime_error &re2) {
         throw cms::Exception("DBError") << re2.what();
       }
-    }
-    else
+    } else
       throw cms::Exception("DBError") << re.what();
   }
 
   db_ = db.release();
 
-  if(verbosity_ > 0) edm::LogInfo("EcalDQM") << " Done.";
+  if (verbosity_ > 0)
+    edm::LogInfo("EcalDQM") << " Done.";
 
-  edm::ParameterSet const& workerParams(_ps.getUntrackedParameterSet("workerParams"));
+  edm::ParameterSet const &workerParams(_ps.getUntrackedParameterSet("workerParams"));
 
   workers_[Integrity] = new ecaldqm::IntegrityWriter(workerParams);
   workers_[Cosmic] = nullptr;
@@ -109,89 +102,95 @@ EcalCondDBWriter::EcalCondDBWriter(edm::ParameterSet const& _ps) :
   workers_[RawData] = nullptr;
   workers_[Occupancy] = new ecaldqm::OccupancyWriter(workerParams);
 
-  for(unsigned iC(0); iC < nTasks; ++iC)
-    if(workers_[iC]) workers_[iC]->setVerbosity(verbosity_);
+  for (unsigned iC(0); iC < nTasks; ++iC)
+    if (workers_[iC])
+      workers_[iC]->setVerbosity(verbosity_);
 }
 
-EcalCondDBWriter::~EcalCondDBWriter()
-{
-  try{
+EcalCondDBWriter::~EcalCondDBWriter() {
+  try {
     delete db_;
-  }
-  catch(std::runtime_error& e){
+  } catch (std::runtime_error &e) {
     throw cms::Exception("DBError") << e.what();
   }
 
-  for(unsigned iC(0); iC < nTasks; ++iC)
+  for (unsigned iC(0); iC < nTasks; ++iC)
     delete workers_[iC];
 }
 
-void
-EcalCondDBWriter::dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter& _igetter)
-{
-  if(executed_) return;
+void EcalCondDBWriter::dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &_igetter) {
+  if (executed_)
+    return;
 
   /////////////////////// INPUT INITIALIZATION /////////////////////////
 
-  if(verbosity_ > 1) edm::LogInfo("EcalDQM") << " Searching event info";
+  if (verbosity_ > 1)
+    edm::LogInfo("EcalDQM") << " Searching event info";
 
   uint64_t timeStampInFile(0);
   unsigned processedEvents(0);
 
   _igetter.cd();
   std::vector<std::string> dirs(_igetter.getSubdirs());
-  for(unsigned iD(0); iD < dirs.size(); ++iD){
-    if(!_igetter.dirExists(dirs[iD] + "/EventInfo")) continue;
+  for (unsigned iD(0); iD < dirs.size(); ++iD) {
+    if (!_igetter.dirExists(dirs[iD] + "/EventInfo"))
+      continue;
 
-    MonitorElement* timeStampME(_igetter.get(dirs[iD] + "/EventInfo/runStartTimeStamp"));
-    if(timeStampME){
+    MonitorElement *timeStampME(_igetter.get(dirs[iD] + "/EventInfo/runStartTimeStamp"));
+    if (timeStampME) {
       double timeStampValue(timeStampME->getFloatValue());
       uint64_t seconds(timeStampValue);
       uint64_t microseconds((timeStampValue - seconds) * 1.e6);
       timeStampInFile = (seconds << 32) | microseconds;
     }
 
-    MonitorElement* eventsME(_igetter.get(dirs[iD] + "/EventInfo/processedEvents"));
-    if(eventsME)
+    MonitorElement *eventsME(_igetter.get(dirs[iD] + "/EventInfo/processedEvents"));
+    if (eventsME)
       processedEvents = eventsME->getIntValue();
 
-    if(timeStampInFile != 0 && processedEvents != 0){
-      if(verbosity_ > 1) edm::LogInfo("EcalDQM") << " Event info found; timestamp=" << timeStampInFile << " processedEvents=" << processedEvents;
+    if (timeStampInFile != 0 && processedEvents != 0) {
+      if (verbosity_ > 1)
+        edm::LogInfo("EcalDQM") << " Event info found; timestamp=" << timeStampInFile
+                                << " processedEvents=" << processedEvents;
       break;
     }
   }
 
-  if(verbosity_ > 0) edm::LogInfo("EcalDQM") << " Done.";
+  if (verbosity_ > 0)
+    edm::LogInfo("EcalDQM") << " Done.";
 
   //////////////////////// SOURCE INITIALIZATION //////////////////////////
 
-  if(verbosity_ > 0) edm::LogInfo("EcalDQM") << "Setting up source MonitorElements for given run type " << runType_;
+  if (verbosity_ > 0)
+    edm::LogInfo("EcalDQM") << "Setting up source MonitorElements for given run type " << runType_;
 
   int taskList(0);
-  for(unsigned iC(0); iC < nTasks; ++iC){
-    if(!workers_[iC] || !workers_[iC]->runsOn(runType_)) continue;
+  for (unsigned iC(0); iC < nTasks; ++iC) {
+    if (!workers_[iC] || !workers_[iC]->runsOn(runType_))
+      continue;
 
     workers_[iC]->retrieveSource(_igetter);
 
     setBit(taskList, iC);
   }
 
-  if(verbosity_ > 0) edm::LogInfo("EcalDQM") << " Done.";
+  if (verbosity_ > 0)
+    edm::LogInfo("EcalDQM") << " Done.";
 
   //////////////////////// DB INITIALIZATION //////////////////////////
 
-  if(verbosity_ > 0) edm::LogInfo("EcalDQM") << "Initializing DB entry";
+  if (verbosity_ > 0)
+    edm::LogInfo("EcalDQM") << "Initializing DB entry";
 
   RunIOV runIOV;
   RunTag runTag;
-  try{
+  try {
     runIOV = db_->fetchRunIOV(location_, runNumber_);
     runTag = runIOV.getRunTag();
-  }
-  catch(std::runtime_error& e){
+  } catch (std::runtime_error &e) {
     std::cerr << e.what();
 
-    if(timeStampInFile == 0)
+    if (timeStampInFile == 0)
       throw cms::Exception("Initialization") << "Time stamp for the run could not be found";
 
     LocationDef locationDef;
@@ -206,31 +205,32 @@ EcalCondDBWriter::dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter& _igetter)
     runIOV.setRunNumber(runNumber_);
     runIOV.setRunTag(runTag);
 
-    try{
+    try {
       db_->insertRunIOV(&runIOV);
       runIOV = db_->fetchRunIOV(&runTag, runNumber_);
-    }
-    catch(std::runtime_error& e){
+    } catch (std::runtime_error &e) {
       throw cms::Exception("DBError") << e.what();
     }
   }
 
   // No filtering - DAQ definitions change time to time..
-//   if(runType_ != runIOV.getRunTag().getRunTypeDef().getRunType())
-//     throw cms::Exception("Configuration") << "Given run type " << runType_ << " does not match the run type in DB " << runIOV.getRunTag().getRunTypeDef().getRunType();
+  //   if(runType_ != runIOV.getRunTag().getRunTypeDef().getRunType())
+  //     throw cms::Exception("Configuration") << "Given run type " << runType_
+  //     << " does not match the run type in DB " <<
+  //     runIOV.getRunTag().getRunTypeDef().getRunType();
 
   MonVersionDef versionDef;
-  versionDef.setMonitoringVersion("test01"); // the only mon_ver in mon_version_def table as of September 2012
+  versionDef.setMonitoringVersion("test01");  // the only mon_ver in mon_version_def table as of September
+                                              // 2012
   MonRunTag monTag;
   monTag.setMonVersionDef(versionDef);
   monTag.setGeneralTag(monRunGeneralTag_);
 
   MonRunIOV monIOV;
 
-  try{
+  try {
     monIOV = db_->fetchMonRunIOV(&runTag, &monTag, runNumber_, 1);
-  }
-  catch(std::runtime_error& e){
+  } catch (std::runtime_error &e) {
     std::cerr << e.what();
 
     monIOV.setRunIOV(runIOV);
@@ -239,40 +239,47 @@ EcalCondDBWriter::dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter& _igetter)
     monIOV.setSubRunEnd(runIOV.getRunEnd());
     monIOV.setMonRunTag(monTag);
 
-    try{
+    try {
       db_->insertMonRunIOV(&monIOV);
       monIOV = db_->fetchMonRunIOV(&runTag, &monTag, runNumber_, 1);
-    }
-    catch(std::runtime_error& e){
+    } catch (std::runtime_error &e) {
       throw cms::Exception("DBError") << e.what();
     }
   }
 
-  if(verbosity_ > 0) edm::LogInfo("EcalDQM") << " Done.";
+  if (verbosity_ > 0)
+    edm::LogInfo("EcalDQM") << " Done.";
 
   //////////////////////// DB WRITING //////////////////////////
 
-  if(verbosity_ > 0) edm::LogInfo("EcalDQM") << "Writing to DB";
+  if (verbosity_ > 0)
+    edm::LogInfo("EcalDQM") << "Writing to DB";
 
   int outcome(0);
-  for(unsigned iC(0); iC < nTasks; ++iC){
-    if(!getBit(taskList, iC)) continue;
+  for (unsigned iC(0); iC < nTasks; ++iC) {
+    if (!getBit(taskList, iC))
+      continue;
 
-    if(verbosity_ > 1) edm::LogInfo("EcalDQM") << " " << workers_[iC]->getName();
+    if (verbosity_ > 1)
+      edm::LogInfo("EcalDQM") << " " << workers_[iC]->getName();
 
-    if(workers_[iC]->isActive() && workers_[iC]->run(db_, monIOV)) setBit(outcome, iC);
+    if (workers_[iC]->isActive() && workers_[iC]->run(db_, monIOV))
+      setBit(outcome, iC);
   }
 
-  if(verbosity_ > 0) edm::LogInfo("EcalDQM") << " Done.";
+  if (verbosity_ > 0)
+    edm::LogInfo("EcalDQM") << " Done.";
 
-  if(verbosity_ > 0) edm::LogInfo("EcalDQM") << "Registering the outcome of DB writing";
+  if (verbosity_ > 0)
+    edm::LogInfo("EcalDQM") << "Registering the outcome of DB writing";
 
   summaryWriter_.setTaskList(taskList);
   summaryWriter_.setOutcome(outcome);
   summaryWriter_.setProcessedEvents(processedEvents);
   summaryWriter_.run(db_, monIOV);
 
-  if(verbosity_ > 0) edm::LogInfo("EcalDQM") << " Done.";
+  if (verbosity_ > 0)
+    edm::LogInfo("EcalDQM") << " Done.";
 
   executed_ = true;
 }
diff --git a/DQM/EcalMonitorDbModule/plugins/EcalDQMStatusWriter.cc b/DQM/EcalMonitorDbModule/plugins/EcalDQMStatusWriter.cc
index 1e6697948fb46..2379a69517665 100644
--- a/DQM/EcalMonitorDbModule/plugins/EcalDQMStatusWriter.cc
+++ b/DQM/EcalMonitorDbModule/plugins/EcalDQMStatusWriter.cc
@@ -2,8 +2,8 @@
 
 #include "DQM/EcalCommon/interface/StatusManager.h"
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "CommonTools/Utils/interface/Exception.h"
 
@@ -11,13 +11,10 @@
 
 #include <fstream>
 
-EcalDQMStatusWriter::EcalDQMStatusWriter(edm::ParameterSet const& _ps) :
-  channelStatus_(),
-  towerStatus_(),
-  firstRun_(_ps.getUntrackedParameter<unsigned>("firstRun"))
-{
+EcalDQMStatusWriter::EcalDQMStatusWriter(edm::ParameterSet const &_ps)
+    : channelStatus_(), towerStatus_(), firstRun_(_ps.getUntrackedParameter<unsigned>("firstRun")) {
   std::ifstream inputFile(_ps.getUntrackedParameter<std::string>("inputFile"));
-  if(!inputFile.is_open())
+  if (!inputFile.is_open())
     throw cms::Exception("Invalid input for EcalDQMStatusWriter");
 
   ecaldqm::StatusManager statusManager;
@@ -26,16 +23,15 @@ EcalDQMStatusWriter::EcalDQMStatusWriter(edm::ParameterSet const& _ps) :
   statusManager.writeToObj(channelStatus_, towerStatus_);
 }
 
-void
-EcalDQMStatusWriter::analyze(edm::Event const&, edm::EventSetup const& _es)
-{
-  cond::service::PoolDBOutputService& dbOutput(*edm::Service<cond::service::PoolDBOutputService>());
-  if(firstRun_ == dbOutput.endOfTime()) return; 
+void EcalDQMStatusWriter::analyze(edm::Event const &, edm::EventSetup const &_es) {
+  cond::service::PoolDBOutputService &dbOutput(*edm::Service<cond::service::PoolDBOutputService>());
+  if (firstRun_ == dbOutput.endOfTime())
+    return;
 
   dbOutput.writeOne(&channelStatus_, firstRun_, "EcalDQMChannelStatusRcd");
   dbOutput.writeOne(&towerStatus_, firstRun_, "EcalDQMTowerStatusRcd");
 
-  firstRun_ = dbOutput.endOfTime(); // avoid accidentally re-writing the conditions
+  firstRun_ = dbOutput.endOfTime();  // avoid accidentally re-writing the conditions
 }
 
 DEFINE_FWK_MODULE(EcalDQMStatusWriter);
diff --git a/DQM/EcalMonitorDbModule/src/DBReaderWorkers.cc b/DQM/EcalMonitorDbModule/src/DBReaderWorkers.cc
index e1a69188b515b..2fef1d257a6cb 100644
--- a/DQM/EcalMonitorDbModule/src/DBReaderWorkers.cc
+++ b/DQM/EcalMonitorDbModule/src/DBReaderWorkers.cc
@@ -5,89 +5,92 @@
 
 #include "OnlineDB/EcalCondDB/interface/EcalLogicID.h"
 #include "OnlineDB/EcalCondDB/interface/MonCrystalConsistencyDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonTTConsistencyDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonMemChConsistencyDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonMemTTConsistencyDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonLaserBlueDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonLaserGreenDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonLaserIRedDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonLaserRedDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonLed1Dat.h"
+#include "OnlineDB/EcalCondDB/interface/MonLed2Dat.h"
+#include "OnlineDB/EcalCondDB/interface/MonMemChConsistencyDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonMemTTConsistencyDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonPNBlueDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonPNGreenDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonPNIRedDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonPNMGPADat.h"
+#include "OnlineDB/EcalCondDB/interface/MonPNPedDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonPNRedDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonTimingLaserBlueCrystalDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonTimingLaserGreenCrystalDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonTimingLaserIRedCrystalDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonTimingLaserRedCrystalDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonPedestalsDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonPNPedDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonPedestalsOnlineDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonTestPulseDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonPulseShapeDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonPNMGPADat.h"
+#include "OnlineDB/EcalCondDB/interface/MonTTConsistencyDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonTestPulseDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonTimingCrystalDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonLed1Dat.h"
-#include "OnlineDB/EcalCondDB/interface/MonLed2Dat.h"
+#include "OnlineDB/EcalCondDB/interface/MonTimingLaserBlueCrystalDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonTimingLaserGreenCrystalDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonTimingLaserIRedCrystalDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonTimingLaserRedCrystalDat.h"
 // #include "OnlineDB/EcalCondDB/interface/MonPNLed1Dat.h"
 // #include "OnlineDB/EcalCondDB/interface/MonPNLed2Dat.h"
-#include "OnlineDB/EcalCondDB/interface/MonTimingLed1CrystalDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonTimingLed2CrystalDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonOccupancyDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonRunDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonTimingLed1CrystalDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonTimingLed2CrystalDat.h"
 
-#include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
 #include "DataFormats/EcalDetId/interface/EEDetId.h"
-#include "DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h"
-#include "DataFormats/EcalDetId/interface/EcalScDetId.h"
 #include "DataFormats/EcalDetId/interface/EcalElectronicsId.h"
 #include "DataFormats/EcalDetId/interface/EcalPnDiodeDetId.h"
+#include "DataFormats/EcalDetId/interface/EcalScDetId.h"
+#include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
+#include "DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h"
 
-#include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
 #include "TFormula.h"
 #include "TString.h"
 
-namespace ecaldqm
-{
+namespace ecaldqm {
   typedef std::map<DetId, double> ReturnType;
 
-  template<typename DataType>
-  ReturnType
-  fetchAndFill(std::map<std::string, double(*)(DataType const&)> const& _extractors, EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
+  template <typename DataType>
+  ReturnType fetchAndFill(std::map<std::string, double (*)(DataType const &)> const &_extractors,
+                          EcalCondDBInterface *_db,
+                          MonRunIOV &_iov,
+                          std::string const &_formula) {
     typedef std::map<EcalLogicID, DataType> DataSet;
-    typedef double (*DataExtractor)(DataType const&);
+    typedef double (*DataExtractor)(DataType const &);
     typedef std::map<std::string, DataExtractor> ExtractorList;
 
     ExtractorList varMap;
 
-    for(typename ExtractorList::const_iterator eItr(_extractors.begin()); eItr != _extractors.end(); ++eItr)
-      if(_formula.find(eItr->first) != std::string::npos) varMap[eItr->first] = eItr->second;
+    for (typename ExtractorList::const_iterator eItr(_extractors.begin()); eItr != _extractors.end(); ++eItr)
+      if (_formula.find(eItr->first) != std::string::npos)
+        varMap[eItr->first] = eItr->second;
 
-    if(varMap.size() > 4) throw cms::Exception("EcalDQM") << _formula << " has too many variables";
+    if (varMap.size() > 4)
+      throw cms::Exception("EcalDQM") << _formula << " has too many variables";
 
     TString formula(_formula);
-    
+
     unsigned iV(0);
     char varChars[4][2] = {"x", "y", "z", "t"};
-    for(typename ExtractorList::iterator vItr(varMap.begin()); vItr != varMap.end(); ++vItr)
+    for (typename ExtractorList::iterator vItr(varMap.begin()); vItr != varMap.end(); ++vItr)
       formula.ReplaceAll(vItr->first, varChars[iV++]);
 
     TFormula tformula("formula", formula);
-    if(tformula.Compile() != 0) throw cms::Exception("EcalDQM") << _formula << " could not be compiled";
+    if (tformula.Compile() != 0)
+      throw cms::Exception("EcalDQM") << _formula << " could not be compiled";
 
     DataSet dataSet;
     _db->fetchDataSet(&dataSet, &_iov);
 
     ReturnType result;
 
-    for(typename DataSet::const_iterator dItr(dataSet.begin()); dItr != dataSet.end(); ++dItr){
+    for (typename DataSet::const_iterator dItr(dataSet.begin()); dItr != dataSet.end(); ++dItr) {
       double vars[4];
-      iV = 0; 
-      for(typename ExtractorList::iterator vItr(varMap.begin()); vItr != varMap.end(); ++vItr)
+      iV = 0;
+      for (typename ExtractorList::iterator vItr(varMap.begin()); vItr != varMap.end(); ++vItr)
         vars[iV++] = vItr->second(dItr->second);
 
       result[toDetId(dItr->first)] = tformula.EvalPar(vars);
@@ -95,372 +98,330 @@ namespace ecaldqm
 
     return result;
   }
- 
-  ReturnType
-  CrystalConsistencyReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonCrystalConsistencyDat const&)> extList;
-
-    extList["processed_events"] = [](MonCrystalConsistencyDat const& dat){ return double(dat.getProcessedEvents()); };
-    extList["problematic_events"] = [](MonCrystalConsistencyDat const& dat){ return double(dat.getProblematicEvents()); };
-    extList["problems_id"] = [](MonCrystalConsistencyDat const& dat){ return double(dat.getProblemsID()); };
-    extList["problems_gain_zero"] = [](MonCrystalConsistencyDat const& dat){ return double(dat.getProblemsGainZero()); };
-    extList["problems_gain_switch"] = [](MonCrystalConsistencyDat const& dat){ return double(dat.getProblemsGainSwitch()); };
+
+  ReturnType CrystalConsistencyReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonCrystalConsistencyDat const &)> extList;
+
+    extList["processed_events"] = [](MonCrystalConsistencyDat const &dat) { return double(dat.getProcessedEvents()); };
+    extList["problematic_events"] = [](MonCrystalConsistencyDat const &dat) {
+      return double(dat.getProblematicEvents());
+    };
+    extList["problems_id"] = [](MonCrystalConsistencyDat const &dat) { return double(dat.getProblemsID()); };
+    extList["problems_gain_zero"] = [](MonCrystalConsistencyDat const &dat) {
+      return double(dat.getProblemsGainZero());
+    };
+    extList["problems_gain_switch"] = [](MonCrystalConsistencyDat const &dat) {
+      return double(dat.getProblemsGainSwitch());
+    };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  TTConsistencyReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonTTConsistencyDat const&)> extList;
+  ReturnType TTConsistencyReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonTTConsistencyDat const &)> extList;
 
-    extList["processed_events"] = [](MonTTConsistencyDat const& dat){ return double(dat.getProcessedEvents()); };
-    extList["problematic_events"] = [](MonTTConsistencyDat const& dat){ return double(dat.getProblematicEvents()); };
-    extList["problems_id"] = [](MonTTConsistencyDat const& dat){ return double(dat.getProblemsID()); };
-    extList["problems_size"] = [](MonTTConsistencyDat const& dat){ return double(dat.getProblemsSize()); };
-    extList["problems_LV1"] = [](MonTTConsistencyDat const& dat){ return double(dat.getProblemsLV1()); };
-    extList["problems_bunch_X"] = [](MonTTConsistencyDat const& dat){ return double(dat.getProblemsBunchX()); };
+    extList["processed_events"] = [](MonTTConsistencyDat const &dat) { return double(dat.getProcessedEvents()); };
+    extList["problematic_events"] = [](MonTTConsistencyDat const &dat) { return double(dat.getProblematicEvents()); };
+    extList["problems_id"] = [](MonTTConsistencyDat const &dat) { return double(dat.getProblemsID()); };
+    extList["problems_size"] = [](MonTTConsistencyDat const &dat) { return double(dat.getProblemsSize()); };
+    extList["problems_LV1"] = [](MonTTConsistencyDat const &dat) { return double(dat.getProblemsLV1()); };
+    extList["problems_bunch_X"] = [](MonTTConsistencyDat const &dat) { return double(dat.getProblemsBunchX()); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  MemChConsistencyReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonMemChConsistencyDat const&)> extList;
+  ReturnType MemChConsistencyReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonMemChConsistencyDat const &)> extList;
 
-    extList["processed_events"] = [](MonMemChConsistencyDat const& dat){ return double(dat.getProcessedEvents()); };
-    extList["problematic_events"] = [](MonMemChConsistencyDat const& dat){ return double(dat.getProblematicEvents()); };
-    extList["problems_id"] = [](MonMemChConsistencyDat const& dat){ return double(dat.getProblemsID()); };
-    extList["problems_gain_zero"] = [](MonMemChConsistencyDat const& dat){ return double(dat.getProblemsGainZero()); };
-    extList["problems_gain_switch"] = [](MonMemChConsistencyDat const& dat){ return double(dat.getProblemsGainSwitch()); };
+    extList["processed_events"] = [](MonMemChConsistencyDat const &dat) { return double(dat.getProcessedEvents()); };
+    extList["problematic_events"] = [](MonMemChConsistencyDat const &dat) {
+      return double(dat.getProblematicEvents());
+    };
+    extList["problems_id"] = [](MonMemChConsistencyDat const &dat) { return double(dat.getProblemsID()); };
+    extList["problems_gain_zero"] = [](MonMemChConsistencyDat const &dat) { return double(dat.getProblemsGainZero()); };
+    extList["problems_gain_switch"] = [](MonMemChConsistencyDat const &dat) {
+      return double(dat.getProblemsGainSwitch());
+    };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  MemTTConsistencyReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonMemTTConsistencyDat const&)> extList;
+  ReturnType MemTTConsistencyReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonMemTTConsistencyDat const &)> extList;
 
-    extList["processed_events"] = [](MonMemTTConsistencyDat const& dat){ return double(dat.getProcessedEvents()); };
-    extList["problematic_events"] = [](MonMemTTConsistencyDat const& dat){ return double(dat.getProblematicEvents()); };
-    extList["problems_id"] = [](MonMemTTConsistencyDat const& dat){ return double(dat.getProblemsID()); };
-    extList["problems_size"] = [](MonMemTTConsistencyDat const& dat){ return double(dat.getProblemsSize()); };
-    extList["problems_LV1"] = [](MonMemTTConsistencyDat const& dat){ return double(dat.getProblemsLV1()); };
-    extList["problems_bunch_X"] = [](MonMemTTConsistencyDat const& dat){ return double(dat.getProblemsBunchX()); };
+    extList["processed_events"] = [](MonMemTTConsistencyDat const &dat) { return double(dat.getProcessedEvents()); };
+    extList["problematic_events"] = [](MonMemTTConsistencyDat const &dat) {
+      return double(dat.getProblematicEvents());
+    };
+    extList["problems_id"] = [](MonMemTTConsistencyDat const &dat) { return double(dat.getProblemsID()); };
+    extList["problems_size"] = [](MonMemTTConsistencyDat const &dat) { return double(dat.getProblemsSize()); };
+    extList["problems_LV1"] = [](MonMemTTConsistencyDat const &dat) { return double(dat.getProblemsLV1()); };
+    extList["problems_bunch_X"] = [](MonMemTTConsistencyDat const &dat) { return double(dat.getProblemsBunchX()); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  LaserBlueReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonLaserBlueDat const&)> extList;
+  ReturnType LaserBlueReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonLaserBlueDat const &)> extList;
 
-    extList["apd_mean"] = [](MonLaserBlueDat const& dat){ return double(dat.getAPDMean()); };
-    extList["apd_rms"] = [](MonLaserBlueDat const& dat){ return double(dat.getAPDRMS()); };
-    extList["apd_over_pn_mean"] = [](MonLaserBlueDat const& dat){ return double(dat.getAPDOverPNMean()); };
-    extList["apd_over_pn_rms"] = [](MonLaserBlueDat const& dat){ return double(dat.getAPDOverPNRMS()); };
+    extList["apd_mean"] = [](MonLaserBlueDat const &dat) { return double(dat.getAPDMean()); };
+    extList["apd_rms"] = [](MonLaserBlueDat const &dat) { return double(dat.getAPDRMS()); };
+    extList["apd_over_pn_mean"] = [](MonLaserBlueDat const &dat) { return double(dat.getAPDOverPNMean()); };
+    extList["apd_over_pn_rms"] = [](MonLaserBlueDat const &dat) { return double(dat.getAPDOverPNRMS()); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  TimingLaserBlueCrystalReader::run(EcalCondDBInterface*, MonRunIOV&, std::string const&)
-  {
+  ReturnType TimingLaserBlueCrystalReader::run(EcalCondDBInterface *, MonRunIOV &, std::string const &) {
     return ReturnType();
   }
 
-  ReturnType
-  PNBlueReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonPNBlueDat const&)> extList;
+  ReturnType PNBlueReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonPNBlueDat const &)> extList;
 
-    extList["adc_mean_g1"] = [](MonPNBlueDat const& dat){ return double(dat.getADCMeanG1()); };
-    extList["adc_rms_g1"] = [](MonPNBlueDat const& dat){ return double(dat.getADCRMSG1()); };
-    extList["ped_mean_g1"] = [](MonPNBlueDat const& dat){ return double(dat.getPedMeanG1()); };
-    extList["ped_rms_g1"] = [](MonPNBlueDat const& dat){ return double(dat.getPedRMSG1()); };
-    extList["adc_mean_g16"] = [](MonPNBlueDat const& dat){ return double(dat.getADCMeanG16()); };
-    extList["adc_rms_g16"] = [](MonPNBlueDat const& dat){ return double(dat.getADCRMSG16()); };
-    extList["ped_mean_g16"] = [](MonPNBlueDat const& dat){ return double(dat.getPedMeanG16()); };
-    extList["ped_rms_g16"] = [](MonPNBlueDat const& dat){ return double(dat.getPedMeanG16()); };
+    extList["adc_mean_g1"] = [](MonPNBlueDat const &dat) { return double(dat.getADCMeanG1()); };
+    extList["adc_rms_g1"] = [](MonPNBlueDat const &dat) { return double(dat.getADCRMSG1()); };
+    extList["ped_mean_g1"] = [](MonPNBlueDat const &dat) { return double(dat.getPedMeanG1()); };
+    extList["ped_rms_g1"] = [](MonPNBlueDat const &dat) { return double(dat.getPedRMSG1()); };
+    extList["adc_mean_g16"] = [](MonPNBlueDat const &dat) { return double(dat.getADCMeanG16()); };
+    extList["adc_rms_g16"] = [](MonPNBlueDat const &dat) { return double(dat.getADCRMSG16()); };
+    extList["ped_mean_g16"] = [](MonPNBlueDat const &dat) { return double(dat.getPedMeanG16()); };
+    extList["ped_rms_g16"] = [](MonPNBlueDat const &dat) { return double(dat.getPedMeanG16()); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  LaserGreenReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonLaserGreenDat const&)> extList;
+  ReturnType LaserGreenReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonLaserGreenDat const &)> extList;
 
-    extList["apd_mean"] = [](MonLaserGreenDat const& dat){ return double(dat.getAPDMean()); };
-    extList["apd_rms"] = [](MonLaserGreenDat const& dat){ return double(dat.getAPDRMS()); };
-    extList["apd_over_pn_mean"] = [](MonLaserGreenDat const& dat){ return double(dat.getAPDOverPNMean()); };
-    extList["apd_over_pn_rms"] = [](MonLaserGreenDat const& dat){ return double(dat.getAPDOverPNRMS()); };
+    extList["apd_mean"] = [](MonLaserGreenDat const &dat) { return double(dat.getAPDMean()); };
+    extList["apd_rms"] = [](MonLaserGreenDat const &dat) { return double(dat.getAPDRMS()); };
+    extList["apd_over_pn_mean"] = [](MonLaserGreenDat const &dat) { return double(dat.getAPDOverPNMean()); };
+    extList["apd_over_pn_rms"] = [](MonLaserGreenDat const &dat) { return double(dat.getAPDOverPNRMS()); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  TimingLaserGreenCrystalReader::run(EcalCondDBInterface*, MonRunIOV&, std::string const&)
-  {
+  ReturnType TimingLaserGreenCrystalReader::run(EcalCondDBInterface *, MonRunIOV &, std::string const &) {
     return ReturnType();
   }
 
-  ReturnType
-  PNGreenReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonPNGreenDat const&)> extList;
+  ReturnType PNGreenReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonPNGreenDat const &)> extList;
 
-    extList["adc_mean_g1"] = [](MonPNGreenDat const& dat){ return double(dat.getADCMeanG1()); };
-    extList["adc_rms_g1"] = [](MonPNGreenDat const& dat){ return double(dat.getADCRMSG1()); };
-    extList["ped_mean_g1"] = [](MonPNGreenDat const& dat){ return double(dat.getPedMeanG1()); };
-    extList["ped_rms_g1"] = [](MonPNGreenDat const& dat){ return double(dat.getPedRMSG1()); };
-    extList["adc_mean_g16"] = [](MonPNGreenDat const& dat){ return double(dat.getADCMeanG16()); };
-    extList["adc_rms_g16"] = [](MonPNGreenDat const& dat){ return double(dat.getADCRMSG16()); };
-    extList["ped_mean_g16"] = [](MonPNGreenDat const& dat){ return double(dat.getPedMeanG16()); };
-    extList["ped_rms_g16"] = [](MonPNGreenDat const& dat){ return double(dat.getPedMeanG16()); };
+    extList["adc_mean_g1"] = [](MonPNGreenDat const &dat) { return double(dat.getADCMeanG1()); };
+    extList["adc_rms_g1"] = [](MonPNGreenDat const &dat) { return double(dat.getADCRMSG1()); };
+    extList["ped_mean_g1"] = [](MonPNGreenDat const &dat) { return double(dat.getPedMeanG1()); };
+    extList["ped_rms_g1"] = [](MonPNGreenDat const &dat) { return double(dat.getPedRMSG1()); };
+    extList["adc_mean_g16"] = [](MonPNGreenDat const &dat) { return double(dat.getADCMeanG16()); };
+    extList["adc_rms_g16"] = [](MonPNGreenDat const &dat) { return double(dat.getADCRMSG16()); };
+    extList["ped_mean_g16"] = [](MonPNGreenDat const &dat) { return double(dat.getPedMeanG16()); };
+    extList["ped_rms_g16"] = [](MonPNGreenDat const &dat) { return double(dat.getPedMeanG16()); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  LaserIRedReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonLaserIRedDat const&)> extList;
+  ReturnType LaserIRedReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonLaserIRedDat const &)> extList;
 
-    extList["apd_mean"] = [](MonLaserIRedDat const& dat){ return double(dat.getAPDMean()); };
-    extList["apd_rms"] = [](MonLaserIRedDat const& dat){ return double(dat.getAPDRMS()); };
-    extList["apd_over_pn_mean"] = [](MonLaserIRedDat const& dat){ return double(dat.getAPDOverPNMean()); };
-    extList["apd_over_pn_rms"] = [](MonLaserIRedDat const& dat){ return double(dat.getAPDOverPNRMS()); };
+    extList["apd_mean"] = [](MonLaserIRedDat const &dat) { return double(dat.getAPDMean()); };
+    extList["apd_rms"] = [](MonLaserIRedDat const &dat) { return double(dat.getAPDRMS()); };
+    extList["apd_over_pn_mean"] = [](MonLaserIRedDat const &dat) { return double(dat.getAPDOverPNMean()); };
+    extList["apd_over_pn_rms"] = [](MonLaserIRedDat const &dat) { return double(dat.getAPDOverPNRMS()); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  TimingLaserIRedCrystalReader::run(EcalCondDBInterface*, MonRunIOV&, std::string const&)
-  {
+  ReturnType TimingLaserIRedCrystalReader::run(EcalCondDBInterface *, MonRunIOV &, std::string const &) {
     return ReturnType();
   }
 
-  ReturnType
-  PNIRedReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonPNIRedDat const&)> extList;
+  ReturnType PNIRedReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonPNIRedDat const &)> extList;
 
-    extList["adc_mean_g1"] = [](MonPNIRedDat const& dat){ return double(dat.getADCMeanG1()); };
-    extList["adc_rms_g1"] = [](MonPNIRedDat const& dat){ return double(dat.getADCRMSG1()); };
-    extList["ped_mean_g1"] = [](MonPNIRedDat const& dat){ return double(dat.getPedMeanG1()); };
-    extList["ped_rms_g1"] = [](MonPNIRedDat const& dat){ return double(dat.getPedRMSG1()); };
-    extList["adc_mean_g16"] = [](MonPNIRedDat const& dat){ return double(dat.getADCMeanG16()); };
-    extList["adc_rms_g16"] = [](MonPNIRedDat const& dat){ return double(dat.getADCRMSG16()); };
-    extList["ped_mean_g16"] = [](MonPNIRedDat const& dat){ return double(dat.getPedMeanG16()); };
-    extList["ped_rms_g16"] = [](MonPNIRedDat const& dat){ return double(dat.getPedMeanG16()); };
+    extList["adc_mean_g1"] = [](MonPNIRedDat const &dat) { return double(dat.getADCMeanG1()); };
+    extList["adc_rms_g1"] = [](MonPNIRedDat const &dat) { return double(dat.getADCRMSG1()); };
+    extList["ped_mean_g1"] = [](MonPNIRedDat const &dat) { return double(dat.getPedMeanG1()); };
+    extList["ped_rms_g1"] = [](MonPNIRedDat const &dat) { return double(dat.getPedRMSG1()); };
+    extList["adc_mean_g16"] = [](MonPNIRedDat const &dat) { return double(dat.getADCMeanG16()); };
+    extList["adc_rms_g16"] = [](MonPNIRedDat const &dat) { return double(dat.getADCRMSG16()); };
+    extList["ped_mean_g16"] = [](MonPNIRedDat const &dat) { return double(dat.getPedMeanG16()); };
+    extList["ped_rms_g16"] = [](MonPNIRedDat const &dat) { return double(dat.getPedMeanG16()); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  LaserRedReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonLaserRedDat const&)> extList;
+  ReturnType LaserRedReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonLaserRedDat const &)> extList;
 
-    extList["apd_mean"] = [](MonLaserRedDat const& dat){ return double(dat.getAPDMean()); };
-    extList["apd_rms"] = [](MonLaserRedDat const& dat){ return double(dat.getAPDRMS()); };
-    extList["apd_over_pn_mean"] = [](MonLaserRedDat const& dat){ return double(dat.getAPDOverPNMean()); };
-    extList["apd_over_pn_rms"] = [](MonLaserRedDat const& dat){ return double(dat.getAPDOverPNRMS()); };
+    extList["apd_mean"] = [](MonLaserRedDat const &dat) { return double(dat.getAPDMean()); };
+    extList["apd_rms"] = [](MonLaserRedDat const &dat) { return double(dat.getAPDRMS()); };
+    extList["apd_over_pn_mean"] = [](MonLaserRedDat const &dat) { return double(dat.getAPDOverPNMean()); };
+    extList["apd_over_pn_rms"] = [](MonLaserRedDat const &dat) { return double(dat.getAPDOverPNRMS()); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  TimingLaserRedCrystalReader::run(EcalCondDBInterface*, MonRunIOV&, std::string const&)
-  {
+  ReturnType TimingLaserRedCrystalReader::run(EcalCondDBInterface *, MonRunIOV &, std::string const &) {
     return ReturnType();
   }
 
-  ReturnType
-  PNRedReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonPNRedDat const&)> extList;
+  ReturnType PNRedReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonPNRedDat const &)> extList;
 
-    extList["adc_mean_g1"] = [](MonPNRedDat const& dat){ return double(dat.getADCMeanG1()); };
-    extList["adc_rms_g1"] = [](MonPNRedDat const& dat){ return double(dat.getADCRMSG1()); };
-    extList["ped_mean_g1"] = [](MonPNRedDat const& dat){ return double(dat.getPedMeanG1()); };
-    extList["ped_rms_g1"] = [](MonPNRedDat const& dat){ return double(dat.getPedRMSG1()); };
-    extList["adc_mean_g16"] = [](MonPNRedDat const& dat){ return double(dat.getADCMeanG16()); };
-    extList["adc_rms_g16"] = [](MonPNRedDat const& dat){ return double(dat.getADCRMSG16()); };
-    extList["ped_mean_g16"] = [](MonPNRedDat const& dat){ return double(dat.getPedMeanG16()); };
-    extList["ped_rms_g16"] = [](MonPNRedDat const& dat){ return double(dat.getPedMeanG16()); };
+    extList["adc_mean_g1"] = [](MonPNRedDat const &dat) { return double(dat.getADCMeanG1()); };
+    extList["adc_rms_g1"] = [](MonPNRedDat const &dat) { return double(dat.getADCRMSG1()); };
+    extList["ped_mean_g1"] = [](MonPNRedDat const &dat) { return double(dat.getPedMeanG1()); };
+    extList["ped_rms_g1"] = [](MonPNRedDat const &dat) { return double(dat.getPedRMSG1()); };
+    extList["adc_mean_g16"] = [](MonPNRedDat const &dat) { return double(dat.getADCMeanG16()); };
+    extList["adc_rms_g16"] = [](MonPNRedDat const &dat) { return double(dat.getADCRMSG16()); };
+    extList["ped_mean_g16"] = [](MonPNRedDat const &dat) { return double(dat.getPedMeanG16()); };
+    extList["ped_rms_g16"] = [](MonPNRedDat const &dat) { return double(dat.getPedMeanG16()); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  PedestalsReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonPedestalsDat const&)> extList;
+  ReturnType PedestalsReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonPedestalsDat const &)> extList;
 
-    extList["ped_mean_g1"] = [](MonPedestalsDat const& dat){ return double(dat.getPedMeanG1()); };
-    extList["ped_rms_g1"] = [](MonPedestalsDat const& dat){ return double(dat.getPedRMSG1()); };
-    extList["ped_mean_g6"] = [](MonPedestalsDat const& dat){ return double(dat.getPedMeanG6()); };
-    extList["ped_rms_g6"] = [](MonPedestalsDat const& dat){ return double(dat.getPedRMSG6()); };
-    extList["ped_mean_g12"] = [](MonPedestalsDat const& dat){ return double(dat.getPedMeanG12()); };
-    extList["ped_rms_g12"] = [](MonPedestalsDat const& dat){ return double(dat.getPedRMSG12()); };
+    extList["ped_mean_g1"] = [](MonPedestalsDat const &dat) { return double(dat.getPedMeanG1()); };
+    extList["ped_rms_g1"] = [](MonPedestalsDat const &dat) { return double(dat.getPedRMSG1()); };
+    extList["ped_mean_g6"] = [](MonPedestalsDat const &dat) { return double(dat.getPedMeanG6()); };
+    extList["ped_rms_g6"] = [](MonPedestalsDat const &dat) { return double(dat.getPedRMSG6()); };
+    extList["ped_mean_g12"] = [](MonPedestalsDat const &dat) { return double(dat.getPedMeanG12()); };
+    extList["ped_rms_g12"] = [](MonPedestalsDat const &dat) { return double(dat.getPedRMSG12()); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  PNPedReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonPNPedDat const&)> extList;
+  ReturnType PNPedReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonPNPedDat const &)> extList;
 
-    extList["ped_mean_g1"] = [](MonPNPedDat const& dat){ return double(dat.getPedMeanG1()); };
-    extList["ped_rms_g1"] = [](MonPNPedDat const& dat){ return double(dat.getPedRMSG1()); };
-    extList["ped_mean_g16"] = [](MonPNPedDat const& dat){ return double(dat.getPedMeanG16()); };
-    extList["ped_rms_g16"] = [](MonPNPedDat const& dat){ return double(dat.getPedRMSG16()); };
+    extList["ped_mean_g1"] = [](MonPNPedDat const &dat) { return double(dat.getPedMeanG1()); };
+    extList["ped_rms_g1"] = [](MonPNPedDat const &dat) { return double(dat.getPedRMSG1()); };
+    extList["ped_mean_g16"] = [](MonPNPedDat const &dat) { return double(dat.getPedMeanG16()); };
+    extList["ped_rms_g16"] = [](MonPNPedDat const &dat) { return double(dat.getPedRMSG16()); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  PedestalsOnlineReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonPedestalsOnlineDat const&)> extList;
+  ReturnType PedestalsOnlineReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonPedestalsOnlineDat const &)> extList;
 
-    extList["adc_mean_g12"] = [](MonPedestalsOnlineDat const& dat){ return double(dat.getADCMeanG12()); };
-    extList["adc_rms_g12"] = [](MonPedestalsOnlineDat const& dat){ return double(dat.getADCRMSG12()); };
+    extList["adc_mean_g12"] = [](MonPedestalsOnlineDat const &dat) { return double(dat.getADCMeanG12()); };
+    extList["adc_rms_g12"] = [](MonPedestalsOnlineDat const &dat) { return double(dat.getADCRMSG12()); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  TestPulseReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonTestPulseDat const&)> extList;
+  ReturnType TestPulseReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonTestPulseDat const &)> extList;
 
-    extList["adc_mean_g1"] = [](MonTestPulseDat const& dat){ return double(dat.getADCMeanG1()); };
-    extList["adc_rms_g1"] = [](MonTestPulseDat const& dat){ return double(dat.getADCRMSG1()); };
-    extList["adc_mean_g6"] = [](MonTestPulseDat const& dat){ return double(dat.getADCMeanG6()); };
-    extList["adc_rms_g6"] = [](MonTestPulseDat const& dat){ return double(dat.getADCRMSG6()); };
-    extList["adc_mean_g12"] = [](MonTestPulseDat const& dat){ return double(dat.getADCMeanG12()); };
-    extList["adc_rms_g12"] = [](MonTestPulseDat const& dat){ return double(dat.getADCRMSG12()); };
+    extList["adc_mean_g1"] = [](MonTestPulseDat const &dat) { return double(dat.getADCMeanG1()); };
+    extList["adc_rms_g1"] = [](MonTestPulseDat const &dat) { return double(dat.getADCRMSG1()); };
+    extList["adc_mean_g6"] = [](MonTestPulseDat const &dat) { return double(dat.getADCMeanG6()); };
+    extList["adc_rms_g6"] = [](MonTestPulseDat const &dat) { return double(dat.getADCRMSG6()); };
+    extList["adc_mean_g12"] = [](MonTestPulseDat const &dat) { return double(dat.getADCMeanG12()); };
+    extList["adc_rms_g12"] = [](MonTestPulseDat const &dat) { return double(dat.getADCRMSG12()); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  PulseShapeReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonPulseShapeDat const&)> extList;
-
-    extList["g1_avg_sample_01"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(1)[0]); };
-    extList["g1_avg_sample_02"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(1)[1]); };
-    extList["g1_avg_sample_03"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(1)[2]); };
-    extList["g1_avg_sample_04"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(1)[3]); };
-    extList["g1_avg_sample_05"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(1)[4]); };
-    extList["g1_avg_sample_06"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(1)[5]); };
-    extList["g1_avg_sample_07"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(1)[6]); };
-    extList["g1_avg_sample_08"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(1)[7]); };
-    extList["g1_avg_sample_09"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(1)[8]); };
-    extList["g1_avg_sample_10"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(1)[9]); };
-    extList["g6_avg_sample_01"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(6)[0]); };
-    extList["g6_avg_sample_02"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(6)[1]); };
-    extList["g6_avg_sample_03"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(6)[2]); };
-    extList["g6_avg_sample_04"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(6)[3]); };
-    extList["g6_avg_sample_05"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(6)[4]); };
-    extList["g6_avg_sample_06"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(6)[5]); };
-    extList["g6_avg_sample_07"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(6)[6]); };
-    extList["g6_avg_sample_08"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(6)[7]); };
-    extList["g6_avg_sample_09"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(6)[8]); };
-    extList["g6_avg_sample_10"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(6)[9]); };
-    extList["g12_avg_sample_01"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(12)[0]); };
-    extList["g12_avg_sample_02"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(12)[1]); };
-    extList["g12_avg_sample_03"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(12)[2]); };
-    extList["g12_avg_sample_04"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(12)[3]); };
-    extList["g12_avg_sample_05"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(12)[4]); };
-    extList["g12_avg_sample_06"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(12)[5]); };
-    extList["g12_avg_sample_07"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(12)[6]); };
-    extList["g12_avg_sample_08"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(12)[7]); };
-    extList["g12_avg_sample_09"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(12)[8]); };
-    extList["g12_avg_sample_10"] = [](MonPulseShapeDat const& dat){ return double(dat.getSamples(12)[9]); };
+  ReturnType PulseShapeReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonPulseShapeDat const &)> extList;
+
+    extList["g1_avg_sample_01"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(1)[0]); };
+    extList["g1_avg_sample_02"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(1)[1]); };
+    extList["g1_avg_sample_03"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(1)[2]); };
+    extList["g1_avg_sample_04"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(1)[3]); };
+    extList["g1_avg_sample_05"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(1)[4]); };
+    extList["g1_avg_sample_06"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(1)[5]); };
+    extList["g1_avg_sample_07"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(1)[6]); };
+    extList["g1_avg_sample_08"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(1)[7]); };
+    extList["g1_avg_sample_09"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(1)[8]); };
+    extList["g1_avg_sample_10"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(1)[9]); };
+    extList["g6_avg_sample_01"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(6)[0]); };
+    extList["g6_avg_sample_02"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(6)[1]); };
+    extList["g6_avg_sample_03"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(6)[2]); };
+    extList["g6_avg_sample_04"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(6)[3]); };
+    extList["g6_avg_sample_05"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(6)[4]); };
+    extList["g6_avg_sample_06"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(6)[5]); };
+    extList["g6_avg_sample_07"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(6)[6]); };
+    extList["g6_avg_sample_08"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(6)[7]); };
+    extList["g6_avg_sample_09"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(6)[8]); };
+    extList["g6_avg_sample_10"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(6)[9]); };
+    extList["g12_avg_sample_01"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(12)[0]); };
+    extList["g12_avg_sample_02"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(12)[1]); };
+    extList["g12_avg_sample_03"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(12)[2]); };
+    extList["g12_avg_sample_04"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(12)[3]); };
+    extList["g12_avg_sample_05"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(12)[4]); };
+    extList["g12_avg_sample_06"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(12)[5]); };
+    extList["g12_avg_sample_07"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(12)[6]); };
+    extList["g12_avg_sample_08"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(12)[7]); };
+    extList["g12_avg_sample_09"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(12)[8]); };
+    extList["g12_avg_sample_10"] = [](MonPulseShapeDat const &dat) { return double(dat.getSamples(12)[9]); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  PNMGPAReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonPNMGPADat const&)> extList;
+  ReturnType PNMGPAReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonPNMGPADat const &)> extList;
 
-    extList["adc_mean_g1"] = [](MonPNMGPADat const& dat){ return double(dat.getADCMeanG1()); };
-    extList["adc_rms_g1"] = [](MonPNMGPADat const& dat){ return double(dat.getADCRMSG1()); };
-    extList["ped_mean_g1"] = [](MonPNMGPADat const& dat){ return double(dat.getPedMeanG1()); };
-    extList["ped_rms_g1"] = [](MonPNMGPADat const& dat){ return double(dat.getPedRMSG1()); };
-    extList["adc_mean_g16"] = [](MonPNMGPADat const& dat){ return double(dat.getADCMeanG16()); };
-    extList["adc_rms_g16"] = [](MonPNMGPADat const& dat){ return double(dat.getADCRMSG16()); };
-    extList["ped_mean_g16"] = [](MonPNMGPADat const& dat){ return double(dat.getPedMeanG16()); };
-    extList["ped_rms_g16"] = [](MonPNMGPADat const& dat){ return double(dat.getPedRMSG16()); };
+    extList["adc_mean_g1"] = [](MonPNMGPADat const &dat) { return double(dat.getADCMeanG1()); };
+    extList["adc_rms_g1"] = [](MonPNMGPADat const &dat) { return double(dat.getADCRMSG1()); };
+    extList["ped_mean_g1"] = [](MonPNMGPADat const &dat) { return double(dat.getPedMeanG1()); };
+    extList["ped_rms_g1"] = [](MonPNMGPADat const &dat) { return double(dat.getPedRMSG1()); };
+    extList["adc_mean_g16"] = [](MonPNMGPADat const &dat) { return double(dat.getADCMeanG16()); };
+    extList["adc_rms_g16"] = [](MonPNMGPADat const &dat) { return double(dat.getADCRMSG16()); };
+    extList["ped_mean_g16"] = [](MonPNMGPADat const &dat) { return double(dat.getPedMeanG16()); };
+    extList["ped_rms_g16"] = [](MonPNMGPADat const &dat) { return double(dat.getPedRMSG16()); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  TimingCrystalReader::run(EcalCondDBInterface*, MonRunIOV&, std::string const&)
-  {
-    return ReturnType();
-  }
+  ReturnType TimingCrystalReader::run(EcalCondDBInterface *, MonRunIOV &, std::string const &) { return ReturnType(); }
 
-  ReturnType
-  Led1Reader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonLed1Dat const&)> extList;
+  ReturnType Led1Reader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonLed1Dat const &)> extList;
 
-    extList["vpt_mean"] = [](MonLed1Dat const& dat){ return double(dat.getVPTMean()); };
-    extList["vpt_rms"] = [](MonLed1Dat const& dat){ return double(dat.getVPTRMS()); };
-    extList["vpt_over_pn_mean"] = [](MonLed1Dat const& dat){ return double(dat.getVPTOverPNMean()); };
-    extList["vpt_over_pn_rms"] = [](MonLed1Dat const& dat){ return double(dat.getVPTOverPNRMS()); };
+    extList["vpt_mean"] = [](MonLed1Dat const &dat) { return double(dat.getVPTMean()); };
+    extList["vpt_rms"] = [](MonLed1Dat const &dat) { return double(dat.getVPTRMS()); };
+    extList["vpt_over_pn_mean"] = [](MonLed1Dat const &dat) { return double(dat.getVPTOverPNMean()); };
+    extList["vpt_over_pn_rms"] = [](MonLed1Dat const &dat) { return double(dat.getVPTOverPNRMS()); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  TimingLed1CrystalReader::run(EcalCondDBInterface*, MonRunIOV&, std::string const&)
-  {
+  ReturnType TimingLed1CrystalReader::run(EcalCondDBInterface *, MonRunIOV &, std::string const &) {
     return ReturnType();
   }
 
-  ReturnType
-  Led2Reader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonLed2Dat const&)> extList;
+  ReturnType Led2Reader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonLed2Dat const &)> extList;
 
-    extList["vpt_mean"] = [](MonLed2Dat const& dat){ return double(dat.getVPTMean()); };
-    extList["vpt_rms"] = [](MonLed2Dat const& dat){ return double(dat.getVPTRMS()); };
-    extList["vpt_over_pn_mean"] = [](MonLed2Dat const& dat){ return double(dat.getVPTOverPNMean()); };
-    extList["vpt_over_pn_rms"] = [](MonLed2Dat const& dat){ return double(dat.getVPTOverPNRMS()); };
+    extList["vpt_mean"] = [](MonLed2Dat const &dat) { return double(dat.getVPTMean()); };
+    extList["vpt_rms"] = [](MonLed2Dat const &dat) { return double(dat.getVPTRMS()); };
+    extList["vpt_over_pn_mean"] = [](MonLed2Dat const &dat) { return double(dat.getVPTOverPNMean()); };
+    extList["vpt_over_pn_rms"] = [](MonLed2Dat const &dat) { return double(dat.getVPTOverPNRMS()); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
 
-  ReturnType
-  TimingLed2CrystalReader::run(EcalCondDBInterface*, MonRunIOV&, std::string const&)
-  {
+  ReturnType TimingLed2CrystalReader::run(EcalCondDBInterface *, MonRunIOV &, std::string const &) {
     return ReturnType();
   }
 
-  ReturnType
-  OccupancyReader::run(EcalCondDBInterface* _db, MonRunIOV& _iov, std::string const& _formula)
-  {
-    std::map<std::string, double(*)(MonOccupancyDat const&)> extList;
+  ReturnType OccupancyReader::run(EcalCondDBInterface *_db, MonRunIOV &_iov, std::string const &_formula) {
+    std::map<std::string, double (*)(MonOccupancyDat const &)> extList;
 
-    extList["events_over_low_threshold"] = [](MonOccupancyDat const& dat){ return double(dat.getEventsOverLowThreshold()); };
-    extList["events_over_high_threshold"] = [](MonOccupancyDat const& dat){ return double(dat.getEventsOverHighThreshold()); };
-    extList["avg_energy"] = [](MonOccupancyDat const& dat){ return double(dat.getAvgEnergy()); };
+    extList["events_over_low_threshold"] = [](MonOccupancyDat const &dat) {
+      return double(dat.getEventsOverLowThreshold());
+    };
+    extList["events_over_high_threshold"] = [](MonOccupancyDat const &dat) {
+      return double(dat.getEventsOverHighThreshold());
+    };
+    extList["avg_energy"] = [](MonOccupancyDat const &dat) { return double(dat.getAvgEnergy()); };
 
     return fetchAndFill(extList, _db, _iov, _formula);
   }
-}
+}  // namespace ecaldqm
diff --git a/DQM/EcalMonitorDbModule/src/DBWriterWorkers.cc b/DQM/EcalMonitorDbModule/src/DBWriterWorkers.cc
index 6147011330e82..7fecd416f3339 100644
--- a/DQM/EcalMonitorDbModule/src/DBWriterWorkers.cc
+++ b/DQM/EcalMonitorDbModule/src/DBWriterWorkers.cc
@@ -8,122 +8,104 @@
 
 #include "OnlineDB/EcalCondDB/interface/EcalLogicID.h"
 #include "OnlineDB/EcalCondDB/interface/MonCrystalConsistencyDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonTTConsistencyDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonMemChConsistencyDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonMemTTConsistencyDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonLaserBlueDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonLaserGreenDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonLaserIRedDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonLaserRedDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonLed1Dat.h"
+#include "OnlineDB/EcalCondDB/interface/MonLed2Dat.h"
+#include "OnlineDB/EcalCondDB/interface/MonMemChConsistencyDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonMemTTConsistencyDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonPNBlueDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonPNGreenDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonPNIRedDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonPNMGPADat.h"
+#include "OnlineDB/EcalCondDB/interface/MonPNPedDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonPNRedDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonTimingLaserBlueCrystalDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonTimingLaserGreenCrystalDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonTimingLaserIRedCrystalDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonTimingLaserRedCrystalDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonPedestalsDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonPNPedDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonPedestalsOnlineDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonTestPulseDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonPulseShapeDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonPNMGPADat.h"
+#include "OnlineDB/EcalCondDB/interface/MonTTConsistencyDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonTestPulseDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonTimingCrystalDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonLed1Dat.h"
-#include "OnlineDB/EcalCondDB/interface/MonLed2Dat.h"
+#include "OnlineDB/EcalCondDB/interface/MonTimingLaserBlueCrystalDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonTimingLaserGreenCrystalDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonTimingLaserIRedCrystalDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonTimingLaserRedCrystalDat.h"
 // #include "OnlineDB/EcalCondDB/interface/MonPNLed1Dat.h"
 // #include "OnlineDB/EcalCondDB/interface/MonPNLed2Dat.h"
-#include "OnlineDB/EcalCondDB/interface/MonTimingLed1CrystalDat.h"
-#include "OnlineDB/EcalCondDB/interface/MonTimingLed2CrystalDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonOccupancyDat.h"
 #include "OnlineDB/EcalCondDB/interface/MonRunDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonTimingLed1CrystalDat.h"
+#include "OnlineDB/EcalCondDB/interface/MonTimingLed2CrystalDat.h"
 
-#include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
 #include "DataFormats/EcalDetId/interface/EEDetId.h"
-#include "DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h"
-#include "DataFormats/EcalDetId/interface/EcalScDetId.h"
 #include "DataFormats/EcalDetId/interface/EcalElectronicsId.h"
 #include "DataFormats/EcalDetId/interface/EcalPnDiodeDetId.h"
+#include "DataFormats/EcalDetId/interface/EcalScDetId.h"
+#include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
+#include "DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h"
 
-#include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
 namespace ecaldqm {
-  enum Quality {
-    kBad = 0,
-    kGood = 1,
-    kUnknown = 2,
-    kMBad = 3,
-    kMGood = 4,
-    kMUnknown = 5
-  };
-
-  bool
-  qualityOK(int _quality)
-  {
-    return (_quality != kBad && _quality != kUnknown);
-  }
+  enum Quality { kBad = 0, kGood = 1, kUnknown = 2, kMBad = 3, kMGood = 4, kMUnknown = 5 };
+
+  bool qualityOK(int _quality) { return (_quality != kBad && _quality != kUnknown); }
 
-  DBWriterWorker::DBWriterWorker(std::string const& _name, edm::ParameterSet const& _ps) :
-    name_(_name),
-    runTypes_(),
-    source_(),
-    active_(false)
-  {
-    edm::ParameterSet const& params(_ps.getUntrackedParameterSet(name_));
+  DBWriterWorker::DBWriterWorker(std::string const &_name, edm::ParameterSet const &_ps)
+      : name_(_name), runTypes_(), source_(), active_(false) {
+    edm::ParameterSet const &params(_ps.getUntrackedParameterSet(name_));
 
-    std::vector<std::string> runTypes(params.getUntrackedParameter<std::vector<std::string> >("runTypes"));
-    for(unsigned iT(0); iT < runTypes.size(); ++iT)
+    std::vector<std::string> runTypes(params.getUntrackedParameter<std::vector<std::string>>("runTypes"));
+    for (unsigned iT(0); iT < runTypes.size(); ++iT)
       runTypes_.insert(runTypes[iT]);
 
-    if(!params.existsAs<edm::ParameterSet>("source", false)) return;
+    if (!params.existsAs<edm::ParameterSet>("source", false))
+      return;
 
-    edm::ParameterSet const& sourceParams(params.getUntrackedParameterSet("source"));
-    std::vector<std::string> const& meNames(sourceParams.getParameterNames());
-    for(unsigned iP(0); iP < meNames.size(); ++iP){
+    edm::ParameterSet const &sourceParams(params.getUntrackedParameterSet("source"));
+    std::vector<std::string> const &meNames(sourceParams.getParameterNames());
+    for (unsigned iP(0); iP < meNames.size(); ++iP) {
       std::string meName(meNames[iP]);
-      edm::ParameterSet const& meParam(sourceParams.getUntrackedParameterSet(meName));
+      edm::ParameterSet const &meParam(sourceParams.getUntrackedParameterSet(meName));
       source_.insert(meName, createMESet(meParam));
     }
   }
 
-  void
-  DBWriterWorker::retrieveSource(DQMStore::IGetter& _igetter)
-  {
+  void DBWriterWorker::retrieveSource(DQMStore::IGetter &_igetter) {
     std::string failedPath;
-    for(MESetCollection::iterator sItr(this->source_.begin()); sItr != this->source_.end(); ++sItr){
-      if(!sItr->second->retrieve(_igetter, &failedPath)){
+    for (MESetCollection::iterator sItr(this->source_.begin()); sItr != this->source_.end(); ++sItr) {
+      if (!sItr->second->retrieve(_igetter, &failedPath)) {
         edm::LogError("EcalDQM") << name_ << ": MESet " << sItr->first << "@" << failedPath << " not found";
         this->active_ = false;
         return;
       }
     }
   }
- 
-  bool
-  IntegrityWriter::run(EcalCondDBInterface* _db, MonRunIOV& _iov)
-  {
+
+  bool IntegrityWriter::run(EcalCondDBInterface *_db, MonRunIOV &_iov) {
     /*
-      uses
-      OccupancyTask.Digi (h_)
-      PNDiodeTask.Occupancy (hmem_)
-      IntegrityTask.Gain (h01_)
-      IntegrityTask.ChId (h02_)
-      IntegrityTask.GainSwitch (h03_)
-      IntegrityTask.TowerId (h04_)
-      IntegrityTask.BlockSize (h05_)
-      RawDataTask.L1AFE
-      RawDataTask.BXFE
-      PNDiodeTask.MemChId (h06_)
-      PNDiodeTask.MemGain (h07_)
-      PNDiodeTask.MemTowerId (h08_)
-      PNDiodeTask.MomBlockSize (h09_)
-      IntegrityClient.Quality
-      PNIntegrityClient.QualitySummary
-    */
+    uses
+    OccupancyTask.Digi (h_)
+    PNDiodeTask.Occupancy (hmem_)
+    IntegrityTask.Gain (h01_)
+    IntegrityTask.ChId (h02_)
+    IntegrityTask.GainSwitch (h03_)
+    IntegrityTask.TowerId (h04_)
+    IntegrityTask.BlockSize (h05_)
+    RawDataTask.L1AFE
+    RawDataTask.BXFE
+    PNDiodeTask.MemChId (h06_)
+    PNDiodeTask.MemGain (h07_)
+    PNDiodeTask.MemTowerId (h08_)
+    PNDiodeTask.MomBlockSize (h09_)
+    IntegrityClient.Quality
+    PNIntegrityClient.QualitySummary
+  */
 
     bool result(true);
 
@@ -132,30 +114,31 @@ namespace ecaldqm {
     std::map<EcalLogicID, MonMemChConsistencyDat> memChannelConsistencies;
     std::map<EcalLogicID, MonMemTTConsistencyDat> memTowerConsistencies;
 
-    MESet const& digiME(source_.at("Digi"));
-    MESet const& gainME(source_.at("Gain"));
-    MESet const& chidME(source_.at("ChId"));
-    MESet const& gainswitchME(source_.at("GainSwitch"));
-    MESet const& qualityME(source_.at("Quality"));
+    MESet const &digiME(source_.at("Digi"));
+    MESet const &gainME(source_.at("Gain"));
+    MESet const &chidME(source_.at("ChId"));
+    MESet const &gainswitchME(source_.at("GainSwitch"));
+    MESet const &qualityME(source_.at("Quality"));
 
-    MESet const& toweridME(source_.at("TowerId"));
-    MESet const& blocksizeME(source_.at("BlockSize"));
-    MESet const& l1aME(source_.at("L1AFE"));
-    MESet const& bxME(source_.at("BXFE"));
+    MESet const &toweridME(source_.at("TowerId"));
+    MESet const &blocksizeME(source_.at("BlockSize"));
+    MESet const &l1aME(source_.at("L1AFE"));
+    MESet const &bxME(source_.at("BXFE"));
 
-    MESet const& memdigiME(source_.at("MEMDigi"));
-    MESet const& memchidME(source_.at("MEMChId"));
-    MESet const& memgainME(source_.at("MEMGain"));
-    MESet const& pnqualityME(source_.at("PNQuality"));
+    MESet const &memdigiME(source_.at("MEMDigi"));
+    MESet const &memchidME(source_.at("MEMChId"));
+    MESet const &memgainME(source_.at("MEMGain"));
+    MESet const &pnqualityME(source_.at("PNQuality"));
 
-    MESet const& memtoweridME(source_.at("MEMTowerId"));
-    MESet const& memblocksizeME(source_.at("MEMBlockSize"));
+    MESet const &memtoweridME(source_.at("MEMTowerId"));
+    MESet const &memblocksizeME(source_.at("MEMBlockSize"));
 
-    if(verbosity_ > 1) edm::LogInfo("EcalDQM") << " Looping over crystals";
+    if (verbosity_ > 1)
+      edm::LogInfo("EcalDQM") << " Looping over crystals";
 
     MESet::const_iterator dEnd(digiME.end());
     MESet::const_iterator qItr(qualityME);
-    for(MESet::const_iterator dItr(digiME.beginChannel()); dItr != dEnd; dItr.toNextChannel()){
+    for (MESet::const_iterator dItr(digiME.beginChannel()); dItr != dEnd; dItr.toNextChannel()) {
       DetId id(dItr->getId());
 
       int nDigis(dItr->getBinContent());
@@ -164,8 +147,8 @@ namespace ecaldqm {
       int gainswitch(gainswitchME.getBinContent(id));
       qItr = dItr;
 
-      if(gain > 0 || chid > 0 || gainswitch > 0){
-        MonCrystalConsistencyDat& data(crystalConsistencies[crystalID(id)]);
+      if (gain > 0 || chid > 0 || gainswitch > 0) {
+        MonCrystalConsistencyDat &data(crystalConsistencies[crystalID(id)]);
         data.setProcessedEvents(nDigis);
         data.setProblematicEvents(gain + chid + gainswitch);
         data.setProblemsGainZero(gain);
@@ -180,21 +163,25 @@ namespace ecaldqm {
       }
     }
 
-    if(verbosity_ > 1) edm::LogInfo("EcalDQM") << " Looping over towers";
+    if (verbosity_ > 1)
+      edm::LogInfo("EcalDQM") << " Looping over towers";
 
-    for(unsigned iDCC(kEEmLow); iDCC <= kEBpHigh; ++iDCC){
-      for(unsigned iTower(1); iTower <= 68; ++iTower){
-        if(!ccuExists(iDCC + 1, iTower)) continue;
+    for (unsigned iDCC(kEEmLow); iDCC <= kEBpHigh; ++iDCC) {
+      for (unsigned iTower(1); iTower <= 68; ++iTower) {
+        if (!ccuExists(iDCC + 1, iTower))
+          continue;
 
         EcalElectronicsId eid(iDCC + 1, iTower, 1, 1);
         std::vector<DetId> channels(getElectronicsMap()->dccTowerConstituents(iDCC + 1, iTower));
         int nDigis(0);
         bool towerBad(false);
-        for(unsigned iD(0); iD < channels.size(); ++iD){
+        for (unsigned iD(0); iD < channels.size(); ++iD) {
           int n(digiME.getBinContent(channels[iD]));
-          if(n > nDigis) nDigis = n;
+          if (n > nDigis)
+            nDigis = n;
           int channelStatus(qualityME.getBinContent(channels[iD]));
-          if(channelStatus == kBad || channelStatus == kMBad) towerBad = true;
+          if (channelStatus == kBad || channelStatus == kMBad)
+            towerBad = true;
         }
 
         int towerid(toweridME.getBinContent(eid));
@@ -202,8 +189,8 @@ namespace ecaldqm {
         int l1a(l1aME.getBinContent(iDCC + 1, iTower));
         int bx(bxME.getBinContent(iDCC + 1, iTower));
 
-        if(towerid > 0 || blocksize > 0 || l1a > 0 || bx > 0){
-          MonTTConsistencyDat& data(towerConsistencies[towerID(eid)]);
+        if (towerid > 0 || blocksize > 0 || l1a > 0 || bx > 0) {
+          MonTTConsistencyDat &data(towerConsistencies[towerID(eid)]);
           data.setProcessedEvents(nDigis);
           data.setProblematicEvents(towerid + blocksize + l1a + bx);
           data.setProblemsID(towerid);
@@ -217,22 +204,23 @@ namespace ecaldqm {
       }
     }
 
-    if(verbosity_ > 1) edm::LogInfo("EcalDQM") << " Looping over MEM channels and towers";
+    if (verbosity_ > 1)
+      edm::LogInfo("EcalDQM") << " Looping over MEM channels and towers";
 
-    for(unsigned iMD(0); iMD < memDCC.size(); ++iMD){
+    for (unsigned iMD(0); iMD < memDCC.size(); ++iMD) {
       unsigned iDCC(memDCC[iMD]);
 
       int subdet(iDCC <= kEEmHigh || iDCC >= kEEpLow ? EcalEndcap : EcalBarrel);
 
-      for(unsigned iPN(1); iPN <= 10; ++iPN){
+      for (unsigned iPN(1); iPN <= 10; ++iPN) {
         EcalPnDiodeDetId pnid(subdet, iDCC + 1, iPN);
 
         int nDigis(memdigiME.getBinContent(pnid));
         int memchid(memchidME.getBinContent(pnid));
         int memgain(memgainME.getBinContent(pnid));
 
-        if(memchid > 0 || memgain > 0){
-          MonMemChConsistencyDat& data(memChannelConsistencies[memChannelID(pnid)]);
+        if (memchid > 0 || memgain > 0) {
+          MonMemChConsistencyDat &data(memChannelConsistencies[memChannelID(pnid)]);
 
           data.setProcessedEvents(nDigis);
           data.setProblematicEvents(memchid + memgain);
@@ -247,24 +235,26 @@ namespace ecaldqm {
         }
       }
 
-      for(unsigned iTower(69); iTower <= 70; ++iTower){
+      for (unsigned iTower(69); iTower <= 70; ++iTower) {
         EcalElectronicsId eid(iDCC + 1, iTower, 1, 1);
 
         int nDigis(0);
         bool towerBad(false);
-        for(unsigned iPN(1); iPN <= 10; ++iPN){
+        for (unsigned iPN(1); iPN <= 10; ++iPN) {
           EcalPnDiodeDetId pnid(subdet, iDCC + 1, iPN);
           int n(memdigiME.getBinContent(pnid));
-          if(n > nDigis) nDigis = n;
+          if (n > nDigis)
+            nDigis = n;
           int channelStatus(pnqualityME.getBinContent(pnid));
-          if(channelStatus == kBad || channelStatus == kMBad) towerBad = true;
+          if (channelStatus == kBad || channelStatus == kMBad)
+            towerBad = true;
         }
 
         int towerid(memtoweridME.getBinContent(eid));
         int blocksize(memblocksizeME.getBinContent(eid));
 
-        if(towerid > 0 || blocksize > 0){
-          MonMemTTConsistencyDat& data(memTowerConsistencies[memTowerID(eid)]);
+        if (towerid > 0 || blocksize > 0) {
+          MonMemTTConsistencyDat &data(memTowerConsistencies[memTowerID(eid)]);
 
           data.setProcessedEvents(nDigis);
           data.setProblematicEvents(towerid + blocksize);
@@ -277,28 +267,32 @@ namespace ecaldqm {
       }
     }
 
-    if(verbosity_ > 1) edm::LogInfo("EcalDQM") << " Inserting data";
+    if (verbosity_ > 1)
+      edm::LogInfo("EcalDQM") << " Inserting data";
 
-    try{
-      if(!crystalConsistencies.empty()){
-        if(verbosity_ > 2) edm::LogInfo("EcalDQM") << " crystalConsistencies";
+    try {
+      if (!crystalConsistencies.empty()) {
+        if (verbosity_ > 2)
+          edm::LogInfo("EcalDQM") << " crystalConsistencies";
         _db->insertDataArraySet(&crystalConsistencies, &_iov);
       }
-      if(!towerConsistencies.empty()){
-        if(verbosity_ > 2) edm::LogInfo("EcalDQM") << " towerConsistencies";
+      if (!towerConsistencies.empty()) {
+        if (verbosity_ > 2)
+          edm::LogInfo("EcalDQM") << " towerConsistencies";
         _db->insertDataArraySet(&towerConsistencies, &_iov);
       }
-      if(!memChannelConsistencies.empty()){
-        if(verbosity_ > 2) edm::LogInfo("EcalDQM") << " memChannelConsistencies";
+      if (!memChannelConsistencies.empty()) {
+        if (verbosity_ > 2)
+          edm::LogInfo("EcalDQM") << " memChannelConsistencies";
         _db->insertDataArraySet(&memChannelConsistencies, &_iov);
       }
-      if(!memTowerConsistencies.empty()){
-        if(verbosity_ > 2) edm::LogInfo("EcalDQM") << " memTowerConsistencies";
+      if (!memTowerConsistencies.empty()) {
+        if (verbosity_ > 2)
+          edm::LogInfo("EcalDQM") << " memTowerConsistencies";
         _db->insertDataArraySet(&memTowerConsistencies, &_iov);
       }
-    }
-    catch(std::runtime_error& e){
-      if(std::string(e.what()).find("unique constraint") != std::string::npos)
+    } catch (std::runtime_error &e) {
+      if (std::string(e.what()).find("unique constraint") != std::string::npos)
         edm::LogWarning("EcalDQM") << e.what();
       else
         throw cms::Exception("DBError") << e.what();
@@ -307,11 +301,8 @@ namespace ecaldqm {
     return result;
   }
 
-  LaserWriter::LaserWriter(edm::ParameterSet const& _ps) :
-    DBWriterWorker("Laser", _ps),
-    wlToME_()
-  {
-    std::vector<int> laserWavelengths(_ps.getUntrackedParameter<std::vector<int> >("laserWavelengths"));
+  LaserWriter::LaserWriter(edm::ParameterSet const &_ps) : DBWriterWorker("Laser", _ps), wlToME_() {
+    std::vector<int> laserWavelengths(_ps.getUntrackedParameter<std::vector<int>>("laserWavelengths"));
 
     // wavelengths are not necessarily ordered
     // create a map wl -> MESet index
@@ -319,29 +310,28 @@ namespace ecaldqm {
 
     MESet::PathReplacements repl;
 
-    MESetMulti const& amplitude(static_cast<MESetMulti const&>(source_.at("Amplitude")));
+    MESetMulti const &amplitude(static_cast<MESetMulti const &>(source_.at("Amplitude")));
     unsigned nWL(laserWavelengths.size());
-    for(unsigned iWL(0); iWL != nWL; ++iWL){
+    for (unsigned iWL(0); iWL != nWL; ++iWL) {
       int wl(laserWavelengths[iWL]);
-      if(wl <= 0 || wl >= 5) throw cms::Exception("InvalidConfiguration") << "Laser Wavelength";
+      if (wl <= 0 || wl >= 5)
+        throw cms::Exception("InvalidConfiguration") << "Laser Wavelength";
       repl["wl"] = std::to_string(wl);
       wlToME_[wl] = amplitude.getIndex(repl);
     }
   }
 
-  bool
-  LaserWriter::run(EcalCondDBInterface* _db, MonRunIOV& _iov)
-  {
+  bool LaserWriter::run(EcalCondDBInterface *_db, MonRunIOV &_iov) {
     /*
-      uses
-      LaserTask.Amplitude (h01, h03, h05, h07)
-      LaserTask.AOverP (h02, h04, h06, h08)
-      LaserTask.Timing (h09, h10, h11, h12)
-      LaserClient.Quality (meg01, meg02, meg03, meg04)
-      LaserTask.PNAmplitude (i09, i10, i11, i12)
-      LaserClient.PNQualitySummary (meg09, meg10, meg11, meg12)
-      PNDiodeTask.Pedestal (i13, i14, i15, i16)
-    */
+    uses
+    LaserTask.Amplitude (h01, h03, h05, h07)
+    LaserTask.AOverP (h02, h04, h06, h08)
+    LaserTask.Timing (h09, h10, h11, h12)
+    LaserClient.Quality (meg01, meg02, meg03, meg04)
+    LaserTask.PNAmplitude (i09, i10, i11, i12)
+    LaserClient.PNQualitySummary (meg09, meg10, meg11, meg12)
+    PNDiodeTask.Pedestal (i13, i14, i15, i16)
+  */
 
     bool result(true);
 
@@ -358,33 +348,34 @@ namespace ecaldqm {
     std::map<EcalLogicID, MonTimingLaserRedCrystalDat> l4Time;
     std::map<EcalLogicID, MonPNRedDat> l4PN;
 
-    MESet const& ampME(source_.at("Amplitude"));
-    MESet const& aopME(source_.at("AOverP"));
-    MESet const& timeME(source_.at("Timing"));
-    MESet const& qualityME(source_.at("Quality"));
+    MESet const &ampME(source_.at("Amplitude"));
+    MESet const &aopME(source_.at("AOverP"));
+    MESet const &timeME(source_.at("Timing"));
+    MESet const &qualityME(source_.at("Quality"));
 
-    MESet const& pnME(source_.at("PNAmplitude"));
-    MESet const& pnQualityME(source_.at("PNQuality"));
-    MESet const& pnPedestalME(source_.at("PNPedestal"));
+    MESet const &pnME(source_.at("PNAmplitude"));
+    MESet const &pnQualityME(source_.at("PNQuality"));
+    MESet const &pnPedestalME(source_.at("PNPedestal"));
 
-    for(std::map<int, unsigned>::iterator wlItr(wlToME_.begin()); wlItr != wlToME_.end(); ++wlItr){
+    for (std::map<int, unsigned>::iterator wlItr(wlToME_.begin()); wlItr != wlToME_.end(); ++wlItr) {
       int wl(wlItr->first);
       unsigned iM(wlItr->second);
 
-      static_cast<MESetMulti const&>(ampME).use(iM);
-      static_cast<MESetMulti const&>(aopME).use(iM);
-      static_cast<MESetMulti const&>(timeME).use(iM);
-      static_cast<MESetMulti const&>(qualityME).use(iM);
-      static_cast<MESetMulti const&>(pnME).use(iM);
-      static_cast<MESetMulti const&>(pnQualityME).use(iM);
+      static_cast<MESetMulti const &>(ampME).use(iM);
+      static_cast<MESetMulti const &>(aopME).use(iM);
+      static_cast<MESetMulti const &>(timeME).use(iM);
+      static_cast<MESetMulti const &>(qualityME).use(iM);
+      static_cast<MESetMulti const &>(pnME).use(iM);
+      static_cast<MESetMulti const &>(pnQualityME).use(iM);
 
       MESet::const_iterator aEnd(ampME.end());
       MESet::const_iterator qItr(qualityME);
       MESet::const_iterator oItr(aopME);
       MESet::const_iterator tItr(timeME);
-      for(MESet::const_iterator aItr(ampME.beginChannel()); aItr != aEnd; aItr.toNextChannel()){
+      for (MESet::const_iterator aItr(ampME.beginChannel()); aItr != aEnd; aItr.toNextChannel()) {
         float aEntries(aItr->getBinEntries());
-        if(aEntries < 1.) continue;
+        if (aEntries < 1.)
+          continue;
 
         qItr = aItr;
         oItr = aItr;
@@ -408,81 +399,74 @@ namespace ecaldqm {
 
         EcalLogicID logicID(crystalID(id));
 
-        switch(wl){
-        case 1:
-          {
-            MonLaserBlueDat& aData(l1Amp[logicID]);
+        switch (wl) {
+          case 1: {
+            MonLaserBlueDat &aData(l1Amp[logicID]);
             aData.setAPDMean(ampMean);
             aData.setAPDRMS(ampRms);
             aData.setAPDOverPNMean(aopMean);
             aData.setAPDOverPNRMS(aopRms);
             aData.setTaskStatus(channelBad);
- 
-            MonTimingLaserBlueCrystalDat& tData(l1Time[logicID]);
+
+            MonTimingLaserBlueCrystalDat &tData(l1Time[logicID]);
             tData.setTimingMean(timeMean);
             tData.setTimingRMS(timeRms);
             tData.setTaskStatus(channelBad);
-          }
-          break;
-        case 2:
-          {
-            MonLaserGreenDat& aData(l2Amp[logicID]);
+          } break;
+          case 2: {
+            MonLaserGreenDat &aData(l2Amp[logicID]);
             aData.setAPDMean(ampMean);
             aData.setAPDRMS(ampRms);
             aData.setAPDOverPNMean(aopMean);
             aData.setAPDOverPNRMS(aopRms);
             aData.setTaskStatus(channelBad);
- 
-            MonTimingLaserGreenCrystalDat& tData(l2Time[logicID]);
+
+            MonTimingLaserGreenCrystalDat &tData(l2Time[logicID]);
             tData.setTimingMean(timeMean);
             tData.setTimingRMS(timeRms);
             tData.setTaskStatus(channelBad);
-          }
-          break;
-        case 3:
-          {
-            MonLaserIRedDat& aData(l3Amp[logicID]);
+          } break;
+          case 3: {
+            MonLaserIRedDat &aData(l3Amp[logicID]);
             aData.setAPDMean(ampMean);
             aData.setAPDRMS(ampRms);
             aData.setAPDOverPNMean(aopMean);
             aData.setAPDOverPNRMS(aopRms);
             aData.setTaskStatus(channelBad);
 
-            MonTimingLaserIRedCrystalDat& tData(l3Time[logicID]);
+            MonTimingLaserIRedCrystalDat &tData(l3Time[logicID]);
             tData.setTimingMean(timeMean);
             tData.setTimingRMS(timeRms);
             tData.setTaskStatus(channelBad);
-          }
-          break;
-        case 4:
-          {
-            MonLaserRedDat& aData(l4Amp[logicID]);
+          } break;
+          case 4: {
+            MonLaserRedDat &aData(l4Amp[logicID]);
             aData.setAPDMean(ampMean);
             aData.setAPDRMS(ampRms);
             aData.setAPDOverPNMean(aopMean);
             aData.setAPDOverPNRMS(aopRms);
             aData.setTaskStatus(channelBad);
 
-            MonTimingLaserRedCrystalDat& tData(l4Time[logicID]);
+            MonTimingLaserRedCrystalDat &tData(l4Time[logicID]);
             tData.setTimingMean(timeMean);
             tData.setTimingRMS(timeRms);
             tData.setTaskStatus(channelBad);
-          }
-          break;
+          } break;
         }
         result &= qualityOK(channelStatus);
       }
 
-      for(unsigned iMD(0); iMD < memDCC.size(); ++iMD){
+      for (unsigned iMD(0); iMD < memDCC.size(); ++iMD) {
         unsigned iDCC(memDCC[iMD]);
 
         int subdet(iDCC <= kEEmHigh || iDCC >= kEEpLow ? EcalEndcap : EcalBarrel);
 
-        for(unsigned iPN(1); iPN <= 10; ++iPN){
+        for (unsigned iPN(1); iPN <= 10; ++iPN) {
           EcalPnDiodeDetId pnid(subdet, iDCC + 1, iPN);
 
           float entries(pnME.getBinEntries(pnid));
-          if(entries < 1.) continue;
+          if (entries < 1.)
+            continue;
 
           float mean(pnME.getBinContent(pnid));
           float rms(pnME.getBinError(pnid) * std::sqrt(entries));
@@ -494,10 +478,9 @@ namespace ecaldqm {
           int channelStatus(pnQualityME.getBinContent(pnid));
           bool channelBad(channelStatus == kBad || channelStatus == kMBad);
 
-          switch(wl){
-          case 1:
-            {
-              MonPNBlueDat& data(l1PN[lmPNID(pnid)]);
+          switch (wl) {
+            case 1: {
+              MonPNBlueDat &data(l1PN[lmPNID(pnid)]);
               data.setADCMeanG1(-1.);
               data.setADCRMSG1(-1.);
               data.setPedMeanG1(-1.);
@@ -507,11 +490,9 @@ namespace ecaldqm {
               data.setPedMeanG16(pedestalMean);
               data.setPedRMSG16(pedestalRms);
               data.setTaskStatus(channelBad);
-            }
-            break;
-          case 2:
-            {
-              MonPNGreenDat& data(l2PN[lmPNID(pnid)]);
+            } break;
+            case 2: {
+              MonPNGreenDat &data(l2PN[lmPNID(pnid)]);
               data.setADCMeanG1(-1.);
               data.setADCRMSG1(-1.);
               data.setPedMeanG1(-1.);
@@ -521,11 +502,9 @@ namespace ecaldqm {
               data.setPedMeanG16(pedestalMean);
               data.setPedRMSG16(pedestalRms);
               data.setTaskStatus(channelBad);
-            }
-            break;
-          case 3:
-            {
-              MonPNIRedDat& data(l3PN[lmPNID(pnid)]);
+            } break;
+            case 3: {
+              MonPNIRedDat &data(l3PN[lmPNID(pnid)]);
               data.setADCMeanG1(-1.);
               data.setADCRMSG1(-1.);
               data.setPedMeanG1(-1.);
@@ -535,11 +514,9 @@ namespace ecaldqm {
               data.setPedMeanG16(pedestalMean);
               data.setPedRMSG16(pedestalRms);
               data.setTaskStatus(channelBad);
-            }
-            break;
-          case 4:
-            {
-              MonPNRedDat& data(l4PN[lmPNID(pnid)]);
+            } break;
+            case 4: {
+              MonPNRedDat &data(l4PN[lmPNID(pnid)]);
               data.setADCMeanG1(-1.);
               data.setADCRMSG1(-1.);
               data.setPedMeanG1(-1.);
@@ -549,44 +526,41 @@ namespace ecaldqm {
               data.setPedMeanG16(pedestalMean);
               data.setPedRMSG16(pedestalRms);
               data.setTaskStatus(channelBad);
-            }
-            break;
+            } break;
           }
 
           result &= qualityOK(channelStatus);
-
         }
       }
     }
 
-    try{
-      if(!l1Amp.empty())
+    try {
+      if (!l1Amp.empty())
         _db->insertDataArraySet(&l1Amp, &_iov);
-      if(!l1Time.empty())
+      if (!l1Time.empty())
         _db->insertDataArraySet(&l1Time, &_iov);
-      if(!l1PN.empty())
+      if (!l1PN.empty())
         _db->insertDataArraySet(&l1PN, &_iov);
-      if(!l2Amp.empty())
+      if (!l2Amp.empty())
         _db->insertDataArraySet(&l2Amp, &_iov);
-      if(!l2Time.empty())
+      if (!l2Time.empty())
         _db->insertDataArraySet(&l2Time, &_iov);
-      if(!l2PN.empty())
+      if (!l2PN.empty())
         _db->insertDataArraySet(&l2PN, &_iov);
-      if(!l3Amp.empty())
+      if (!l3Amp.empty())
         _db->insertDataArraySet(&l3Amp, &_iov);
-      if(!l3Time.empty())
+      if (!l3Time.empty())
         _db->insertDataArraySet(&l3Time, &_iov);
-      if(!l3PN.empty())
+      if (!l3PN.empty())
         _db->insertDataArraySet(&l3PN, &_iov);
-      if(!l4Amp.empty())
+      if (!l4Amp.empty())
         _db->insertDataArraySet(&l4Amp, &_iov);
-      if(!l4Time.empty())
+      if (!l4Time.empty())
         _db->insertDataArraySet(&l4Time, &_iov);
-      if(!l4PN.empty())
+      if (!l4PN.empty())
         _db->insertDataArraySet(&l4PN, &_iov);
-    }
-    catch(std::runtime_error& e){
-      if(std::string(e.what()).find("unique constraint") != std::string::npos)
+    } catch (std::runtime_error &e) {
+      if (std::string(e.what()).find("unique constraint") != std::string::npos)
         edm::LogWarning("EcalDQM") << e.what();
       else
         throw cms::Exception("DBError") << e.what();
@@ -595,71 +569,69 @@ namespace ecaldqm {
     return result;
   }
 
-  PedestalWriter::PedestalWriter(edm::ParameterSet const& _ps) :
-    DBWriterWorker("Pedestal", _ps),
-    gainToME_(),
-    pnGainToME_()
-  {
-    std::vector<int> MGPAGains(_ps.getUntrackedParameter<std::vector<int> >("MGPAGains"));
-    std::vector<int> MGPAGainsPN(_ps.getUntrackedParameter<std::vector<int> >("MGPAGainsPN"));
+  PedestalWriter::PedestalWriter(edm::ParameterSet const &_ps)
+      : DBWriterWorker("Pedestal", _ps), gainToME_(), pnGainToME_() {
+    std::vector<int> MGPAGains(_ps.getUntrackedParameter<std::vector<int>>("MGPAGains"));
+    std::vector<int> MGPAGainsPN(_ps.getUntrackedParameter<std::vector<int>>("MGPAGainsPN"));
 
     MESet::PathReplacements repl;
 
-    MESetMulti const& pedestal(static_cast<MESetMulti const&>(source_.at("Pedestal")));
+    MESetMulti const &pedestal(static_cast<MESetMulti const &>(source_.at("Pedestal")));
     unsigned nG(MGPAGains.size());
-    for(unsigned iG(0); iG != nG; ++iG){
+    for (unsigned iG(0); iG != nG; ++iG) {
       int gain(MGPAGains[iG]);
-      if(gain != 1 && gain != 6 && gain != 12) throw cms::Exception("InvalidConfiguration") << "MGPA gain";
+      if (gain != 1 && gain != 6 && gain != 12)
+        throw cms::Exception("InvalidConfiguration") << "MGPA gain";
       repl["gain"] = std::to_string(gain);
       gainToME_[gain] = pedestal.getIndex(repl);
     }
 
     repl.clear();
 
-    MESetMulti const& pnPedestal(static_cast<MESetMulti const&>(source_.at("PNPedestal")));
+    MESetMulti const &pnPedestal(static_cast<MESetMulti const &>(source_.at("PNPedestal")));
     unsigned nGPN(MGPAGainsPN.size());
-    for(unsigned iG(0); iG != nGPN; ++iG){
+    for (unsigned iG(0); iG != nGPN; ++iG) {
       int gain(MGPAGainsPN[iG]);
-      if(gain != 1 && gain != 16) throw cms::Exception("InvalidConfiguration") << "PN MGPA gain";
+      if (gain != 1 && gain != 16)
+        throw cms::Exception("InvalidConfiguration") << "PN MGPA gain";
       repl["pngain"] = std::to_string(gain);
       pnGainToME_[gain] = pnPedestal.getIndex(repl);
     }
   }
 
-  bool
-  PedestalWriter::run(EcalCondDBInterface* _db, MonRunIOV& _iov)
-  {
+  bool PedestalWriter::run(EcalCondDBInterface *_db, MonRunIOV &_iov) {
     /*
-      uses
-      PedestalTask.Pedestal (h01, h02, h03)
-      PedestalTask.PNPedestal (i01, i02)
-      PedestalClient.Quality (meg01, meg02, meg03)
-      PedestalClient.PNQualitySummary (meg04, meg05)
-    */
+    uses
+    PedestalTask.Pedestal (h01, h02, h03)
+    PedestalTask.PNPedestal (i01, i02)
+    PedestalClient.Quality (meg01, meg02, meg03)
+    PedestalClient.PNQualitySummary (meg04, meg05)
+  */
 
     bool result(true);
 
     std::map<EcalLogicID, MonPedestalsDat> pedestals;
     std::map<EcalLogicID, MonPNPedDat> pnPedestals;
 
-    MESet const& pedestalME(source_.at("Pedestal"));
-    MESet const& qualityME(source_.at("Quality"));
+    MESet const &pedestalME(source_.at("Pedestal"));
+    MESet const &qualityME(source_.at("Quality"));
 
-    MESet const& pnPedestalME(source_.at("PNPedestal"));
-    MESet const& pnQualityME(source_.at("PNQuality"));
+    MESet const &pnPedestalME(source_.at("PNPedestal"));
+    MESet const &pnQualityME(source_.at("PNQuality"));
 
-    for(std::map<int, unsigned>::iterator gainItr(gainToME_.begin()); gainItr != gainToME_.end(); ++gainItr){
+    for (std::map<int, unsigned>::iterator gainItr(gainToME_.begin()); gainItr != gainToME_.end(); ++gainItr) {
       int gain(gainItr->first);
       int iM(gainItr->second);
 
-      static_cast<MESetMulti const&>(pedestalME).use(iM);
-      static_cast<MESetMulti const&>(qualityME).use(iM);
+      static_cast<MESetMulti const &>(pedestalME).use(iM);
+      static_cast<MESetMulti const &>(qualityME).use(iM);
 
       MESet::const_iterator pEnd(pedestalME.end());
       MESet::const_iterator qItr(qualityME);
-      for(MESet::const_iterator pItr(pedestalME.beginChannel()); pItr != pEnd; pItr.toNextChannel()){
+      for (MESet::const_iterator pItr(pedestalME.beginChannel()); pItr != pEnd; pItr.toNextChannel()) {
         float entries(pItr->getBinEntries());
-        if(entries < 1.) continue;
+        if (entries < 1.)
+          continue;
 
         qItr = pItr;
 
@@ -667,8 +639,8 @@ namespace ecaldqm {
         float rms(pItr->getBinError() * std::sqrt(entries));
 
         EcalLogicID logicID(crystalID(pItr->getId()));
-        if(pedestals.find(logicID) == pedestals.end()){
-          MonPedestalsDat& insertion(pedestals[logicID]);
+        if (pedestals.find(logicID) == pedestals.end()) {
+          MonPedestalsDat &insertion(pedestals[logicID]);
           insertion.setPedMeanG1(-1.);
           insertion.setPedRMSG1(-1.);
           insertion.setPedMeanG6(-1.);
@@ -678,55 +650,56 @@ namespace ecaldqm {
           insertion.setTaskStatus(false);
         }
 
-        MonPedestalsDat& data(pedestals[logicID]);
-        switch(gain){
-        case 1:
-          data.setPedMeanG1(mean);
-          data.setPedRMSG1(rms);
-          break;
-        case 6:
-          data.setPedMeanG6(mean);
-          data.setPedRMSG6(rms);
-          break;
-        case 12:
-          data.setPedMeanG12(mean);
-          data.setPedRMSG12(rms);
-          break;
+        MonPedestalsDat &data(pedestals[logicID]);
+        switch (gain) {
+          case 1:
+            data.setPedMeanG1(mean);
+            data.setPedRMSG1(rms);
+            break;
+          case 6:
+            data.setPedMeanG6(mean);
+            data.setPedRMSG6(rms);
+            break;
+          case 12:
+            data.setPedMeanG12(mean);
+            data.setPedRMSG12(rms);
+            break;
         }
 
         int channelStatus(qItr->getBinContent());
         bool channelBad(channelStatus == kBad || channelStatus == kMBad);
-        if(channelBad)
+        if (channelBad)
           data.setTaskStatus(true);
 
         result &= qualityOK(channelStatus);
       }
     }
 
-    for(std::map<int, unsigned>::iterator gainItr(pnGainToME_.begin()); gainItr != pnGainToME_.end(); ++gainItr){
+    for (std::map<int, unsigned>::iterator gainItr(pnGainToME_.begin()); gainItr != pnGainToME_.end(); ++gainItr) {
       int gain(gainItr->first);
       int iM(gainItr->second);
 
-      static_cast<MESetMulti const&>(pnPedestalME).use(iM);
-      static_cast<MESetMulti const&>(pnQualityME).use(iM);
+      static_cast<MESetMulti const &>(pnPedestalME).use(iM);
+      static_cast<MESetMulti const &>(pnQualityME).use(iM);
 
-      for(unsigned iMD(0); iMD < memDCC.size(); ++iMD){
+      for (unsigned iMD(0); iMD < memDCC.size(); ++iMD) {
         unsigned iDCC(memDCC[iMD]);
 
         int subdet(iDCC <= kEEmHigh || iDCC >= kEEpLow ? EcalEndcap : EcalBarrel);
 
-        for(unsigned iPN(1); iPN <= 10; ++iPN){
+        for (unsigned iPN(1); iPN <= 10; ++iPN) {
           EcalPnDiodeDetId pnid(subdet, iDCC + 1, iPN);
 
           float entries(pnPedestalME.getBinEntries(pnid));
-          if(entries < 1.) continue;
+          if (entries < 1.)
+            continue;
 
           float mean(pnPedestalME.getBinContent(pnid));
           float rms(pnPedestalME.getBinError(pnid) * std::sqrt(entries));
 
           EcalLogicID logicID(lmPNID(pnid));
-          if(pnPedestals.find(logicID) == pnPedestals.end()){
-            MonPNPedDat& insertion(pnPedestals[logicID]);
+          if (pnPedestals.find(logicID) == pnPedestals.end()) {
+            MonPNPedDat &insertion(pnPedestals[logicID]);
             insertion.setPedMeanG1(-1.);
             insertion.setPedRMSG1(-1.);
             insertion.setPedMeanG16(-1.);
@@ -734,21 +707,21 @@ namespace ecaldqm {
             insertion.setTaskStatus(false);
           }
 
-          MonPNPedDat& data(pnPedestals[lmPNID(pnid)]);
-          switch(gain){
-          case 1:
-            data.setPedMeanG1(mean);
-            data.setPedRMSG1(rms);
-            break;
-          case 16:
-            data.setPedMeanG16(mean);
-            data.setPedRMSG16(rms);
-            break;
+          MonPNPedDat &data(pnPedestals[lmPNID(pnid)]);
+          switch (gain) {
+            case 1:
+              data.setPedMeanG1(mean);
+              data.setPedRMSG1(rms);
+              break;
+            case 16:
+              data.setPedMeanG16(mean);
+              data.setPedRMSG16(rms);
+              break;
           }
 
           int channelStatus(pnQualityME.getBinContent(pnid));
           bool channelBad(channelStatus == kBad || channelStatus == kMBad);
-          if(channelBad)
+          if (channelBad)
             data.setTaskStatus(true);
 
           result &= qualityOK(channelStatus);
@@ -756,14 +729,13 @@ namespace ecaldqm {
       }
     }
 
-    try{
-      if(!pedestals.empty())
+    try {
+      if (!pedestals.empty())
         _db->insertDataArraySet(&pedestals, &_iov);
-      if(!pnPedestals.empty())
+      if (!pnPedestals.empty())
         _db->insertDataArraySet(&pnPedestals, &_iov);
-    }
-    catch(std::runtime_error& e){
-      if(std::string(e.what()).find("unique constraint") != std::string::npos)
+    } catch (std::runtime_error &e) {
+      if (std::string(e.what()).find("unique constraint") != std::string::npos)
         edm::LogWarning("EcalDQM") << e.what();
       else
         throw cms::Exception("DBError") << e.what();
@@ -772,34 +744,33 @@ namespace ecaldqm {
     return result;
   }
 
-  bool
-  PresampleWriter::run(EcalCondDBInterface* _db, MonRunIOV& _iov)
-  {
+  bool PresampleWriter::run(EcalCondDBInterface *_db, MonRunIOV &_iov) {
     /*
-      uses
-      PresampleTask.Pedestal (h03)
-      PresampleClient.Quality (meg03)
-    */
+    uses
+    PresampleTask.Pedestal (h03)
+    PresampleClient.Quality (meg03)
+  */
 
     bool result(true);
 
     std::map<EcalLogicID, MonPedestalsOnlineDat> pedestals;
 
-    MESet const& pedestalME(source_.at("Pedestal"));
-    MESet const& qualityME(source_.at("Quality"));
+    MESet const &pedestalME(source_.at("Pedestal"));
+    MESet const &qualityME(source_.at("Quality"));
 
     MESet::const_iterator pEnd(pedestalME.end());
     MESet::const_iterator qItr(qualityME);
-    for(MESet::const_iterator pItr(pedestalME.beginChannel()); pItr != pEnd; pItr.toNextChannel()){
+    for (MESet::const_iterator pItr(pedestalME.beginChannel()); pItr != pEnd; pItr.toNextChannel()) {
       float entries(pItr->getBinEntries());
-      if(entries < 1.) continue;
+      if (entries < 1.)
+        continue;
 
       qItr = pItr;
 
       float mean(pItr->getBinContent());
       float rms(pItr->getBinError() * std::sqrt(entries));
 
-      MonPedestalsOnlineDat& data(pedestals[crystalID(pItr->getId())]);
+      MonPedestalsOnlineDat &data(pedestals[crystalID(pItr->getId())]);
       data.setADCMeanG12(mean);
       data.setADCRMSG12(rms);
 
@@ -810,12 +781,11 @@ namespace ecaldqm {
       result &= qualityOK(channelStatus);
     }
 
-    try{
-      if(!pedestals.empty())
+    try {
+      if (!pedestals.empty())
         _db->insertDataArraySet(&pedestals, &_iov);
-    }
-    catch(std::runtime_error& e){
-      if(std::string(e.what()).find("unique constraint") != std::string::npos)
+    } catch (std::runtime_error &e) {
+      if (std::string(e.what()).find("unique constraint") != std::string::npos)
         edm::LogWarning("EcalDQM") << e.what();
       else
         throw cms::Exception("DBError") << e.what();
@@ -824,49 +794,46 @@ namespace ecaldqm {
     return result;
   }
 
-  TestPulseWriter::TestPulseWriter(edm::ParameterSet const& _ps) :
-    DBWriterWorker("TestPulse", _ps),
-    gainToME_(),
-    pnGainToME_()
-  {
-    std::vector<int> MGPAGains(_ps.getUntrackedParameter<std::vector<int> >("MGPAGains"));
-    std::vector<int> MGPAGainsPN(_ps.getUntrackedParameter<std::vector<int> >("MGPAGainsPN"));
+  TestPulseWriter::TestPulseWriter(edm::ParameterSet const &_ps)
+      : DBWriterWorker("TestPulse", _ps), gainToME_(), pnGainToME_() {
+    std::vector<int> MGPAGains(_ps.getUntrackedParameter<std::vector<int>>("MGPAGains"));
+    std::vector<int> MGPAGainsPN(_ps.getUntrackedParameter<std::vector<int>>("MGPAGainsPN"));
 
     MESet::PathReplacements repl;
 
-    MESetMulti const& amplitude(static_cast<MESetMulti const&>(source_.at("Amplitude")));
+    MESetMulti const &amplitude(static_cast<MESetMulti const &>(source_.at("Amplitude")));
     unsigned nG(MGPAGains.size());
-    for(unsigned iG(0); iG != nG; ++iG){
+    for (unsigned iG(0); iG != nG; ++iG) {
       int gain(MGPAGains[iG]);
-      if(gain != 1 && gain != 6 && gain != 12) throw cms::Exception("InvalidConfiguration") << "MGPA gain";
+      if (gain != 1 && gain != 6 && gain != 12)
+        throw cms::Exception("InvalidConfiguration") << "MGPA gain";
       repl["gain"] = std::to_string(gain);
       gainToME_[gain] = amplitude.getIndex(repl);
     }
 
     repl.clear();
 
-    MESetMulti const& pnAmplitude(static_cast<MESetMulti const&>(source_.at("PNAmplitude")));
+    MESetMulti const &pnAmplitude(static_cast<MESetMulti const &>(source_.at("PNAmplitude")));
     unsigned nGPN(MGPAGainsPN.size());
-    for(unsigned iG(0); iG != nGPN; ++iG){
+    for (unsigned iG(0); iG != nGPN; ++iG) {
       int gain(MGPAGainsPN[iG]);
-      if(gain != 1 && gain != 16) throw cms::Exception("InvalidConfiguration") << "PN MGPA gain";
+      if (gain != 1 && gain != 16)
+        throw cms::Exception("InvalidConfiguration") << "PN MGPA gain";
       repl["pngain"] = std::to_string(gain);
       pnGainToME_[gain] = pnAmplitude.getIndex(repl);
     }
   }
 
-  bool
-  TestPulseWriter::run(EcalCondDBInterface* _db, MonRunIOV& _iov)
-  {
+  bool TestPulseWriter::run(EcalCondDBInterface *_db, MonRunIOV &_iov) {
     /*
-      uses
-      TestPulseTask.Amplitude (ha01, ha02, ha03)
-      TestPulseTask.Shape (me_hs01, me_hs02, me_hs03)
-      TestPulseTask.PNAmplitude (i01, i02)
-      PNDiodeTask.Pedestal (i03, i04)
-      TestPulseClient.Quality (meg01, meg02, meg03)
-      TestPulseClient.PNQualitySummary (meg04, meg05)
-    */
+    uses
+    TestPulseTask.Amplitude (ha01, ha02, ha03)
+    TestPulseTask.Shape (me_hs01, me_hs02, me_hs03)
+    TestPulseTask.PNAmplitude (i01, i02)
+    PNDiodeTask.Pedestal (i03, i04)
+    TestPulseClient.Quality (meg01, meg02, meg03)
+    TestPulseClient.PNQualitySummary (meg04, meg05)
+  */
 
     bool result(true);
 
@@ -874,27 +841,28 @@ namespace ecaldqm {
     std::map<EcalLogicID, MonPulseShapeDat> shape;
     std::map<EcalLogicID, MonPNMGPADat> pnAmplitude;
 
-    MESet const& amplitudeME(source_.at("Amplitude"));
-    MESet const& shapeME(source_.at("Shape"));
-    MESet const& qualityME(source_.at("Quality"));
+    MESet const &amplitudeME(source_.at("Amplitude"));
+    MESet const &shapeME(source_.at("Shape"));
+    MESet const &qualityME(source_.at("Quality"));
 
-    MESet const& pnAmplitudeME(source_.at("PNAmplitude"));
-    MESet const& pnPedestalME(source_.at("PNPedestal"));
-    MESet const& pnQualityME(source_.at("PNQuality"));
+    MESet const &pnAmplitudeME(source_.at("PNAmplitude"));
+    MESet const &pnPedestalME(source_.at("PNPedestal"));
+    MESet const &pnQualityME(source_.at("PNQuality"));
 
-    for(std::map<int, unsigned>::iterator gainItr(gainToME_.begin()); gainItr != gainToME_.end(); ++gainItr){
+    for (std::map<int, unsigned>::iterator gainItr(gainToME_.begin()); gainItr != gainToME_.end(); ++gainItr) {
       int gain(gainItr->first);
       int iM(gainItr->second);
 
-      static_cast<MESetMulti const&>(amplitudeME).use(iM);
-      static_cast<MESetMulti const&>(shapeME).use(iM);
-      static_cast<MESetMulti const&>(qualityME).use(iM);
+      static_cast<MESetMulti const &>(amplitudeME).use(iM);
+      static_cast<MESetMulti const &>(shapeME).use(iM);
+      static_cast<MESetMulti const &>(qualityME).use(iM);
 
       MESet::const_iterator aEnd(amplitudeME.end());
       MESet::const_iterator qItr(qualityME);
-      for(MESet::const_iterator aItr(amplitudeME.beginChannel()); aItr != aEnd; aItr.toNextChannel()){
+      for (MESet::const_iterator aItr(amplitudeME.beginChannel()); aItr != aEnd; aItr.toNextChannel()) {
         float entries(aItr->getBinEntries());
-        if(entries < 1.) continue;
+        if (entries < 1.)
+          continue;
 
         qItr = aItr;
 
@@ -902,8 +870,8 @@ namespace ecaldqm {
         float rms(aItr->getBinError() * std::sqrt(entries));
 
         EcalLogicID logicID(crystalID(aItr->getId()));
-        if(amplitude.find(logicID) == amplitude.end()){
-          MonTestPulseDat& insertion(amplitude[logicID]);
+        if (amplitude.find(logicID) == amplitude.end()) {
+          MonTestPulseDat &insertion(amplitude[logicID]);
           insertion.setADCMeanG1(-1.);
           insertion.setADCRMSG1(-1.);
           insertion.setADCMeanG6(-1.);
@@ -913,84 +881,88 @@ namespace ecaldqm {
           insertion.setTaskStatus(false);
         }
 
-        MonTestPulseDat& data(amplitude[logicID]);
-        switch(gain){
-        case 1:
-          data.setADCMeanG1(mean);
-          data.setADCRMSG1(rms);
-          break;
-        case 6:
-          data.setADCMeanG6(mean);
-          data.setADCRMSG6(rms);
-          break;
-        case 12:
-          data.setADCMeanG12(mean);
-          data.setADCRMSG12(rms);
-          break;
+        MonTestPulseDat &data(amplitude[logicID]);
+        switch (gain) {
+          case 1:
+            data.setADCMeanG1(mean);
+            data.setADCRMSG1(rms);
+            break;
+          case 6:
+            data.setADCMeanG6(mean);
+            data.setADCRMSG6(rms);
+            break;
+          case 12:
+            data.setADCMeanG12(mean);
+            data.setADCRMSG12(rms);
+            break;
         }
 
         int channelStatus(qItr->getBinContent());
         bool channelBad(channelStatus == kBad || channelStatus == kMBad);
-        if(channelBad)
+        if (channelBad)
           data.setTaskStatus(true);
 
         result &= qualityOK(channelStatus);
       }
 
-      for(unsigned iSM(0); iSM < 54; ++iSM){
+      for (unsigned iSM(0); iSM < 54; ++iSM) {
         std::vector<float> samples(10, 0.);
         std::vector<DetId> ids(getElectronicsMap()->dccConstituents(iSM + 1));
         unsigned nId(ids.size());
         unsigned nChannels(0);
         EcalLogicID logicID;
-        for(unsigned iD(0); iD < nId; ++iD){
-          DetId& id(ids[iD]);
+        for (unsigned iD(0); iD < nId; ++iD) {
+          DetId &id(ids[iD]);
 
-          if(iD == 0) logicID = crystalID(id);
+          if (iD == 0)
+            logicID = crystalID(id);
 
-          if(shapeME.getBinEntries(id, 1) < 1.) continue;
+          if (shapeME.getBinEntries(id, 1) < 1.)
+            continue;
 
           ++nChannels;
 
-          for(int i(0); i < 10; ++i)
+          for (int i(0); i < 10; ++i)
             samples[i] += shapeME.getBinContent(id, i + 1);
         }
 
-	if(nChannels == 0) continue;
+        if (nChannels == 0)
+          continue;
 
-        for(int i(0); i < 10; ++i)
+        for (int i(0); i < 10; ++i)
           samples[i] /= nChannels;
 
-        if(shape.find(logicID) == shape.end()){
-          MonPulseShapeDat& insertion(shape[logicID]);
+        if (shape.find(logicID) == shape.end()) {
+          MonPulseShapeDat &insertion(shape[logicID]);
           std::vector<float> defval(10, -1.);
           insertion.setSamples(defval, 1);
           insertion.setSamples(defval, 6);
           insertion.setSamples(defval, 12);
         }
 
-        MonPulseShapeDat& data(shape[logicID]);
+        MonPulseShapeDat &data(shape[logicID]);
         data.setSamples(samples, gain);
       }
     }
 
-    for(std::map<int, unsigned>::iterator gainItr(pnGainToME_.begin()); gainItr != pnGainToME_.end(); ++gainItr){
+    for (std::map<int, unsigned>::iterator gainItr(pnGainToME_.begin()); gainItr != pnGainToME_.end(); ++gainItr) {
       int gain(gainItr->first);
       int iM(gainItr->second);
 
-      static_cast<MESetMulti const&>(pnAmplitudeME).use(iM);
-      static_cast<MESetMulti const&>(pnQualityME).use(iM);
+      static_cast<MESetMulti const &>(pnAmplitudeME).use(iM);
+      static_cast<MESetMulti const &>(pnQualityME).use(iM);
 
-      for(unsigned iMD(0); iMD < memDCC.size(); ++iMD){
+      for (unsigned iMD(0); iMD < memDCC.size(); ++iMD) {
         unsigned iDCC(memDCC[iMD]);
 
         int subdet(iDCC <= kEEmHigh || iDCC >= kEEpLow ? EcalEndcap : EcalBarrel);
 
-        for(unsigned iPN(1); iPN <= 10; ++iPN){
+        for (unsigned iPN(1); iPN <= 10; ++iPN) {
           EcalPnDiodeDetId pnid(subdet, iDCC + 1, iPN);
 
           float entries(pnAmplitudeME.getBinEntries(pnid));
-          if(entries < 1.) continue;
+          if (entries < 1.)
+            continue;
 
           float mean(pnAmplitudeME.getBinContent(pnid));
           float rms(pnAmplitudeME.getBinError(pnid) * std::sqrt(entries));
@@ -999,8 +971,8 @@ namespace ecaldqm {
           float pedestalRms(pnPedestalME.getBinError(pnid) * std::sqrt(pedestalEntries));
 
           EcalLogicID logicID(lmPNID(pnid));
-          if(pnAmplitude.find(logicID) == pnAmplitude.end()){
-            MonPNMGPADat& insertion(pnAmplitude[logicID]);
+          if (pnAmplitude.find(logicID) == pnAmplitude.end()) {
+            MonPNMGPADat &insertion(pnAmplitude[logicID]);
             insertion.setADCMeanG1(-1.);
             insertion.setADCRMSG1(-1.);
             insertion.setPedMeanG1(-1.);
@@ -1012,26 +984,26 @@ namespace ecaldqm {
             insertion.setTaskStatus(false);
           }
 
-          MonPNMGPADat& data(pnAmplitude[lmPNID(pnid)]);
-          switch(gain){
-          case 1:
-            data.setADCMeanG1(mean);
-            data.setADCRMSG1(rms);
-            // dynamic pedestal not measured for G1
-//             data.setPedMeanG1(pedestalMean);
-//             data.setPedRMSG1(pedestalRms);
-            break;
-          case 16:
-            data.setADCMeanG16(mean);
-            data.setADCRMSG16(rms);
-            data.setPedMeanG16(pedestalMean);
-            data.setPedRMSG16(pedestalRms);
-            break;
+          MonPNMGPADat &data(pnAmplitude[lmPNID(pnid)]);
+          switch (gain) {
+            case 1:
+              data.setADCMeanG1(mean);
+              data.setADCRMSG1(rms);
+              // dynamic pedestal not measured for G1
+              //             data.setPedMeanG1(pedestalMean);
+              //             data.setPedRMSG1(pedestalRms);
+              break;
+            case 16:
+              data.setADCMeanG16(mean);
+              data.setADCRMSG16(rms);
+              data.setPedMeanG16(pedestalMean);
+              data.setPedRMSG16(pedestalRms);
+              break;
           }
 
           int channelStatus(pnQualityME.getBinContent(pnid));
           bool channelBad(channelStatus == kBad || channelStatus == kMBad);
-          if(channelBad)
+          if (channelBad)
             data.setTaskStatus(true);
 
           result &= qualityOK(channelStatus);
@@ -1039,16 +1011,15 @@ namespace ecaldqm {
       }
     }
 
-    try{
-      if(!amplitude.empty())
+    try {
+      if (!amplitude.empty())
         _db->insertDataArraySet(&amplitude, &_iov);
-      if(!shape.empty())
+      if (!shape.empty())
         _db->insertDataSet(&shape, &_iov);
-      if(!pnAmplitude.empty())
+      if (!pnAmplitude.empty())
         _db->insertDataArraySet(&pnAmplitude, &_iov);
-    }
-    catch(std::runtime_error& e){
-      if(std::string(e.what()).find("unique constraint") != std::string::npos)
+    } catch (std::runtime_error &e) {
+      if (std::string(e.what()).find("unique constraint") != std::string::npos)
         edm::LogWarning("EcalDQM") << e.what();
       else
         throw cms::Exception("DBError") << e.what();
@@ -1057,34 +1028,33 @@ namespace ecaldqm {
     return result;
   }
 
-  bool
-  TimingWriter::run(EcalCondDBInterface* _db, MonRunIOV& _iov)
-  {
+  bool TimingWriter::run(EcalCondDBInterface *_db, MonRunIOV &_iov) {
     /*
-      uses
-      TimingTask.TimeMap (h01)
-      TimingClient.Quality (meg01)
-    */
+    uses
+    TimingTask.TimeMap (h01)
+    TimingClient.Quality (meg01)
+  */
 
     bool result(true);
 
     std::map<EcalLogicID, MonTimingCrystalDat> timing;
 
-    MESet const& timingME(source_.at("Timing"));
-    MESet const& qualityME(source_.at("Quality"));
+    MESet const &timingME(source_.at("Timing"));
+    MESet const &qualityME(source_.at("Quality"));
 
     MESet::const_iterator tEnd(timingME.end());
     MESet::const_iterator qItr(qualityME);
-    for(MESet::const_iterator tItr(timingME.beginChannel()); tItr != tEnd; tItr.toNextChannel()){
+    for (MESet::const_iterator tItr(timingME.beginChannel()); tItr != tEnd; tItr.toNextChannel()) {
       float entries(tItr->getBinEntries());
-      if(entries < 1.) continue;
+      if (entries < 1.)
+        continue;
 
       qItr = tItr;
 
       float mean(tItr->getBinContent());
       float rms(tItr->getBinError() * std::sqrt(entries));
 
-      MonTimingCrystalDat& data(timing[crystalID(tItr->getId())]);
+      MonTimingCrystalDat &data(timing[crystalID(tItr->getId())]);
       data.setTimingMean(mean);
       data.setTimingRMS(rms);
 
@@ -1095,12 +1065,11 @@ namespace ecaldqm {
       result &= qualityOK(channelStatus);
     }
 
-    try{
-      if(!timing.empty())
+    try {
+      if (!timing.empty())
         _db->insertDataArraySet(&timing, &_iov);
-    }
-    catch(std::runtime_error& e){
-      if(std::string(e.what()).find("unique constraint") != std::string::npos)
+    } catch (std::runtime_error &e) {
+      if (std::string(e.what()).find("unique constraint") != std::string::npos)
         edm::LogWarning("EcalDQM") << e.what();
       else
         throw cms::Exception("DBError") << e.what();
@@ -1109,11 +1078,8 @@ namespace ecaldqm {
     return result;
   }
 
-  LedWriter::LedWriter(edm::ParameterSet const& _ps) :
-    DBWriterWorker("Led", _ps),
-    wlToME_()
-  {
-    std::vector<int> ledWavelengths(_ps.getUntrackedParameter<std::vector<int> >("ledWavelengths"));
+  LedWriter::LedWriter(edm::ParameterSet const &_ps) : DBWriterWorker("Led", _ps), wlToME_() {
+    std::vector<int> ledWavelengths(_ps.getUntrackedParameter<std::vector<int>>("ledWavelengths"));
 
     // wavelengths are not necessarily ordered
     // create a map wl -> MESet index
@@ -1121,66 +1087,66 @@ namespace ecaldqm {
 
     MESet::PathReplacements repl;
 
-    MESetMulti const& amplitude(static_cast<MESetMulti const&>(source_.at("Amplitude")));
+    MESetMulti const &amplitude(static_cast<MESetMulti const &>(source_.at("Amplitude")));
     unsigned nWL(ledWavelengths.size());
-    for(unsigned iWL(0); iWL != nWL; ++iWL){
+    for (unsigned iWL(0); iWL != nWL; ++iWL) {
       int wl(ledWavelengths[iWL]);
-      if(wl != 1 && wl != 2) throw cms::Exception("InvalidConfiguration") << "Led Wavelength";
+      if (wl != 1 && wl != 2)
+        throw cms::Exception("InvalidConfiguration") << "Led Wavelength";
       repl["wl"] = std::to_string(wl);
       wlToME_[wl] = amplitude.getIndex(repl);
     }
   }
 
-  bool
-  LedWriter::run(EcalCondDBInterface* _db, MonRunIOV& _iov)
-  {
+  bool LedWriter::run(EcalCondDBInterface *_db, MonRunIOV &_iov) {
     /*
-      uses
-      LedTask.Amplitude (h01, h03)
-      LedTask.AOverP (h02, h04)
-      LedTask.Timing (h09, h10)
-      LedClient.Quality (meg01, meg02)
-      LedTask.PNAmplitude (i09, i10)
+    uses
+    LedTask.Amplitude (h01, h03)
+    LedTask.AOverP (h02, h04)
+    LedTask.Timing (h09, h10)
+    LedClient.Quality (meg01, meg02)
+    LedTask.PNAmplitude (i09, i10)
 x      LedClient.PNQualitySummary (meg09, meg10)
 x      PNDiodeTask.Pedestal (i13, i14)
-    */
+  */
 
     bool result(true);
 
     std::map<EcalLogicID, MonLed1Dat> l1Amp;
     std::map<EcalLogicID, MonTimingLed1CrystalDat> l1Time;
-//     std::map<EcalLogicID, MonPNLed1Dat> l1PN;
+    //     std::map<EcalLogicID, MonPNLed1Dat> l1PN;
     std::map<EcalLogicID, MonLed2Dat> l2Amp;
     std::map<EcalLogicID, MonTimingLed2CrystalDat> l2Time;
-//     std::map<EcalLogicID, MonPNLed2Dat> l2PN;
+    //     std::map<EcalLogicID, MonPNLed2Dat> l2PN;
 
-    MESet const& ampME(source_.at("Amplitude"));
-    MESet const& aopME(source_.at("AOverP"));
-    MESet const& timeME(source_.at("Timing"));
-    MESet const& qualityME(source_.at("Quality"));
+    MESet const &ampME(source_.at("Amplitude"));
+    MESet const &aopME(source_.at("AOverP"));
+    MESet const &timeME(source_.at("Timing"));
+    MESet const &qualityME(source_.at("Quality"));
 
-//     MESet const& pnME(source_.at("PNAmplitude"));
-//     MESet const& pnQualityME(source_.at("PNQuality"));
-//     MESet const& pnPedestalME(source_.at("PNPedestal"));
+    //     MESet const& pnME(source_.at("PNAmplitude"));
+    //     MESet const& pnQualityME(source_.at("PNQuality"));
+    //     MESet const& pnPedestalME(source_.at("PNPedestal"));
 
-    for(std::map<int, unsigned>::iterator wlItr(wlToME_.begin()); wlItr != wlToME_.end(); ++wlItr){
+    for (std::map<int, unsigned>::iterator wlItr(wlToME_.begin()); wlItr != wlToME_.end(); ++wlItr) {
       int wl(wlItr->first);
       unsigned iM(wlItr->second);
 
-      static_cast<MESetMulti const&>(ampME).use(iM);
-      static_cast<MESetMulti const&>(aopME).use(iM);
-      static_cast<MESetMulti const&>(timeME).use(iM);
-      static_cast<MESetMulti const&>(qualityME).use(iM);
-//       static_cast<MESetMulti const&>(pnME).use(iM);
-//       static_cast<MESetMulti const&>(pnQualityME).use(iM);
+      static_cast<MESetMulti const &>(ampME).use(iM);
+      static_cast<MESetMulti const &>(aopME).use(iM);
+      static_cast<MESetMulti const &>(timeME).use(iM);
+      static_cast<MESetMulti const &>(qualityME).use(iM);
+      //       static_cast<MESetMulti const&>(pnME).use(iM);
+      //       static_cast<MESetMulti const&>(pnQualityME).use(iM);
 
       MESet::const_iterator aEnd(ampME.end());
       MESet::const_iterator qItr(qualityME);
       MESet::const_iterator oItr(aopME);
       MESet::const_iterator tItr(timeME);
-      for(MESet::const_iterator aItr(ampME.beginChannel()); aItr != aEnd; aItr.toNextChannel()){
+      for (MESet::const_iterator aItr(ampME.beginChannel()); aItr != aEnd; aItr.toNextChannel()) {
         float aEntries(aItr->getBinEntries());
-        if(aEntries < 1.) continue;
+        if (aEntries < 1.)
+          continue;
 
         qItr = aItr;
         oItr = aItr;
@@ -1204,115 +1170,112 @@ x      PNDiodeTask.Pedestal (i13, i14)
 
         EcalLogicID logicID(crystalID(id));
 
-        switch(wl){
-        case 1:
-          {
-            MonLed1Dat& aData(l1Amp[logicID]);
+        switch (wl) {
+          case 1: {
+            MonLed1Dat &aData(l1Amp[logicID]);
             aData.setVPTMean(ampMean);
             aData.setVPTRMS(ampRms);
             aData.setVPTOverPNMean(aopMean);
             aData.setVPTOverPNRMS(aopRms);
             aData.setTaskStatus(channelBad);
- 
-            MonTimingLed1CrystalDat& tData(l1Time[logicID]);
+
+            MonTimingLed1CrystalDat &tData(l1Time[logicID]);
             tData.setTimingMean(timeMean);
             tData.setTimingRMS(timeRms);
             tData.setTaskStatus(channelBad);
-          }
-          break;
-        case 2:
-          {
-            MonLed2Dat& aData(l2Amp[logicID]);
+          } break;
+          case 2: {
+            MonLed2Dat &aData(l2Amp[logicID]);
             aData.setVPTMean(ampMean);
             aData.setVPTRMS(ampRms);
             aData.setVPTOverPNMean(aopMean);
             aData.setVPTOverPNRMS(aopRms);
             aData.setTaskStatus(channelBad);
- 
-            MonTimingLed2CrystalDat& tData(l2Time[logicID]);
+
+            MonTimingLed2CrystalDat &tData(l2Time[logicID]);
             tData.setTimingMean(timeMean);
             tData.setTimingRMS(timeRms);
             tData.setTaskStatus(channelBad);
-          }
-          break;
+          } break;
         }
         result &= qualityOK(channelStatus);
       }
 
-//       for(unsigned iMD(0); iMD < memDCC.size(); ++iMD){
-//         unsigned iDCC(memDCC[iMD]);
-
-//         if(iDCC >= kEBmLow && iDCC <= kEBpHigh) continue;
-
-//         for(unsigned iPN(1); iPN <= 10; ++iPN){
-//           EcalPnDiodeDetId pnid(EcalEndcap, iDCC + 1, iPN);
-
-//           float entries(pnME.getBinEntries(pnid));
-//           if(entries < 1.) continue;
-
-//           float mean(pnME.getBinContent(pnid));
-//           float rms(pnME.getBinError(pnid) * std::sqrt(entries));
-
-//           float pedestalEntries(pnPedestalME.getBinEntries(pnid));
-//           float pedestalMean(pnPedestalME.getBinContent(pnid));
-//           float pedestalRms(pnPedestalME.getBinError(pnid) * std::sqrt(pedestalEntries));
-
-//           int channelStatus(pnQualityME.getBinContent(pnid));
-//           bool channelBad(channelStatus == kBad || channelStatus == kMBad);
-
-//           switch(wl){
-//           case 1:
-//             {
-//               MonPNLed1Dat& data(l1PN[lmPNID(pnid)]);
-//               data.setADCMeanG1(-1.);
-//               data.setADCRMSG1(-1.);
-//               data.setPedMeanG1(-1.);
-//               data.setPedRMSG1(-1.);
-//               data.setADCMeanG16(mean);
-//               data.setADCRMSG16(rms);
-//               data.setPedMeanG16(pedestalMean);
-//               data.setPedRMSG16(pedestalRms);
-//               data.setTaskStatus(channelBad);
-//             }
-//             break;
-//           case 2:
-//             {
-//               MonPNLed2Dat& data(l2PN[lmPNID(pnid)]);
-//               data.setADCMeanG1(-1.);
-//               data.setADCRMSG1(-1.);
-//               data.setPedMeanG1(-1.);
-//               data.setPedRMSG1(-1.);
-//               data.setADCMeanG16(mean);
-//               data.setADCRMSG16(rms);
-//               data.setPedMeanG16(pedestalMean);
-//               data.setPedRMSG16(pedestalRms);
-//               data.setTaskStatus(channelBad);
-//             }
-//             break;
-//           }
-
-//           result &= qualityOK(channelStatus);
-
-//         }
-//       }
+      //       for(unsigned iMD(0); iMD < memDCC.size(); ++iMD){
+      //         unsigned iDCC(memDCC[iMD]);
+
+      //         if(iDCC >= kEBmLow && iDCC <= kEBpHigh) continue;
+
+      //         for(unsigned iPN(1); iPN <= 10; ++iPN){
+      //           EcalPnDiodeDetId pnid(EcalEndcap, iDCC + 1, iPN);
+
+      //           float entries(pnME.getBinEntries(pnid));
+      //           if(entries < 1.) continue;
+
+      //           float mean(pnME.getBinContent(pnid));
+      //           float rms(pnME.getBinError(pnid) * std::sqrt(entries));
+
+      //           float pedestalEntries(pnPedestalME.getBinEntries(pnid));
+      //           float pedestalMean(pnPedestalME.getBinContent(pnid));
+      //           float pedestalRms(pnPedestalME.getBinError(pnid) *
+      //           std::sqrt(pedestalEntries));
+
+      //           int channelStatus(pnQualityME.getBinContent(pnid));
+      //           bool channelBad(channelStatus == kBad || channelStatus ==
+      //           kMBad);
+
+      //           switch(wl){
+      //           case 1:
+      //             {
+      //               MonPNLed1Dat& data(l1PN[lmPNID(pnid)]);
+      //               data.setADCMeanG1(-1.);
+      //               data.setADCRMSG1(-1.);
+      //               data.setPedMeanG1(-1.);
+      //               data.setPedRMSG1(-1.);
+      //               data.setADCMeanG16(mean);
+      //               data.setADCRMSG16(rms);
+      //               data.setPedMeanG16(pedestalMean);
+      //               data.setPedRMSG16(pedestalRms);
+      //               data.setTaskStatus(channelBad);
+      //             }
+      //             break;
+      //           case 2:
+      //             {
+      //               MonPNLed2Dat& data(l2PN[lmPNID(pnid)]);
+      //               data.setADCMeanG1(-1.);
+      //               data.setADCRMSG1(-1.);
+      //               data.setPedMeanG1(-1.);
+      //               data.setPedRMSG1(-1.);
+      //               data.setADCMeanG16(mean);
+      //               data.setADCRMSG16(rms);
+      //               data.setPedMeanG16(pedestalMean);
+      //               data.setPedRMSG16(pedestalRms);
+      //               data.setTaskStatus(channelBad);
+      //             }
+      //             break;
+      //           }
+
+      //           result &= qualityOK(channelStatus);
+
+      //         }
+      //       }
     }
 
-    try{
-      if(!l1Amp.empty())
+    try {
+      if (!l1Amp.empty())
         _db->insertDataArraySet(&l1Amp, &_iov);
-      if(!l1Time.empty())
+      if (!l1Time.empty())
         _db->insertDataArraySet(&l1Time, &_iov);
-//       if(l1PN.size() > 0)
-//         _db->insertDataArraySet(&l1PN, &_iov);
-      if(!l2Amp.empty())
+      //       if(l1PN.size() > 0)
+      //         _db->insertDataArraySet(&l1PN, &_iov);
+      if (!l2Amp.empty())
         _db->insertDataArraySet(&l2Amp, &_iov);
-      if(!l2Time.empty())
+      if (!l2Time.empty())
         _db->insertDataArraySet(&l2Time, &_iov);
-//       if(l2PN.size() > 0)
-//         _db->insertDataArraySet(&l2PN, &_iov);
-    }
-    catch(std::runtime_error& e){
-      if(std::string(e.what()).find("unique constraint") != std::string::npos)
+      //       if(l2PN.size() > 0)
+      //         _db->insertDataArraySet(&l2PN, &_iov);
+    } catch (std::runtime_error &e) {
+      if (std::string(e.what()).find("unique constraint") != std::string::npos)
         edm::LogWarning("EcalDQM") << e.what();
       else
         throw cms::Exception("DBError") << e.what();
@@ -1321,45 +1284,43 @@ x      PNDiodeTask.Pedestal (i13, i14)
     return result;
   }
 
-  bool
-  OccupancyWriter::run(EcalCondDBInterface* _db, MonRunIOV& _iov)
-  {
+  bool OccupancyWriter::run(EcalCondDBInterface *_db, MonRunIOV &_iov) {
     /*
-      uses
-      OccupancyTask.Digi (i01)
-      EnergyTask.HitMap (i02)
-    */
+    uses
+    OccupancyTask.Digi (i01)
+    EnergyTask.HitMap (i02)
+  */
     std::map<EcalLogicID, MonOccupancyDat> occupancy;
 
-    MESet const& occupancyME(source_.at("Occupancy"));
-    MESet const& energyME(source_.at("Energy"));
+    MESet const &occupancyME(source_.at("Occupancy"));
+    MESet const &energyME(source_.at("Energy"));
 
     MESet::const_iterator oEnd(occupancyME.end());
     MESet::const_iterator eItr(energyME);
-    for(MESet::const_iterator oItr(occupancyME.beginChannel()); oItr != oEnd; oItr.toNextChannel()){
-
-      if(oItr->getME()->getTH1()->GetEntries() < 1000.) continue;
+    for (MESet::const_iterator oItr(occupancyME.beginChannel()); oItr != oEnd; oItr.toNextChannel()) {
+      if (oItr->getME()->getTH1()->GetEntries() < 1000.)
+        continue;
 
       int entries(oItr->getBinContent());
-      if(entries < 10) continue;
+      if (entries < 10)
+        continue;
 
       eItr = oItr;
 
       int eEntries(eItr->getBinEntries());
       float energy(eEntries > 10 ? eItr->getBinContent() : -1.);
 
-      MonOccupancyDat& data(occupancy[crystalID(oItr->getId())]);
+      MonOccupancyDat &data(occupancy[crystalID(oItr->getId())]);
       data.setEventsOverLowThreshold(entries);
       data.setEventsOverHighThreshold(eEntries);
       data.setAvgEnergy(energy);
     }
 
-    try{
-      if(!occupancy.empty())
+    try {
+      if (!occupancy.empty())
         _db->insertDataArraySet(&occupancy, &_iov);
-    }
-    catch(std::runtime_error& e){
-      if(std::string(e.what()).find("unique constraint") != std::string::npos)
+    } catch (std::runtime_error &e) {
+      if (std::string(e.what()).find("unique constraint") != std::string::npos)
         edm::LogWarning("EcalDQM") << e.what();
       else
         throw cms::Exception("DBError") << e.what();
@@ -1368,11 +1329,9 @@ x      PNDiodeTask.Pedestal (i13, i14)
     return true;
   }
 
-  bool
-  SummaryWriter::run(EcalCondDBInterface* _db, MonRunIOV& _iov)
-  {
+  bool SummaryWriter::run(EcalCondDBInterface *_db, MonRunIOV &_iov) {
     std::map<EcalLogicID, MonRunDat> dataset;
-    MonRunDat& runDat(dataset[ecalID()]);
+    MonRunDat &runDat(dataset[ecalID()]);
 
     // CURRENTLY ONLY WRITING SUCCESS
     MonRunOutcomeDef outcomeDef;
@@ -1383,11 +1342,10 @@ x      PNDiodeTask.Pedestal (i13, i14)
     runDat.setTaskList(taskList_);
     runDat.setTaskOutcome(outcome_);
 
-    try{
+    try {
       _db->insertDataSet(&dataset, &_iov);
-    }
-    catch(std::runtime_error& e){
-      if(std::string(e.what()).find("unique constraint") != std::string::npos)
+    } catch (std::runtime_error &e) {
+      if (std::string(e.what()).find("unique constraint") != std::string::npos)
         edm::LogWarning("EcalDQM") << e.what();
       else
         throw cms::Exception("DBError") << e.what();
@@ -1395,4 +1353,4 @@ x      PNDiodeTask.Pedestal (i13, i14)
 
     return true;
   }
-}
+}  // namespace ecaldqm
diff --git a/DQM/EcalMonitorDbModule/src/LogicIDTranslation.cc b/DQM/EcalMonitorDbModule/src/LogicIDTranslation.cc
index 2449886e8d31a..85149bb24976c 100644
--- a/DQM/EcalMonitorDbModule/src/LogicIDTranslation.cc
+++ b/DQM/EcalMonitorDbModule/src/LogicIDTranslation.cc
@@ -4,121 +4,80 @@
 
 #include "FWCore/Utilities/interface/Exception.h"
 
-namespace ecaldqm
-{
-  EcalLogicID
-  ecalID()
-  {
-    return EcalLogicID("ECAL", 1);
-  }
+namespace ecaldqm {
+  EcalLogicID ecalID() { return EcalLogicID("ECAL", 1); }
 
-  EcalLogicID
-  subdetID(EcalSubdetector _subdet)
-  {
-    switch(_subdet){
-    case EcalBarrel:
-      return EcalLogicID("EB", 1000000000UL);
-    case EcalEndcap:
-      return EcalLogicID("EE", 2000000000UL);
-    default:
-      throw cms::Exception("UndefinedLogicID");
+  EcalLogicID subdetID(EcalSubdetector _subdet) {
+    switch (_subdet) {
+      case EcalBarrel:
+        return EcalLogicID("EB", 1000000000UL);
+      case EcalEndcap:
+        return EcalLogicID("EE", 2000000000UL);
+      default:
+        throw cms::Exception("UndefinedLogicID");
     }
   }
 
-  EcalLogicID
-  crystalID(DetId const& _id)
-  {
+  EcalLogicID crystalID(DetId const &_id) {
     unsigned iDCC(dccId(_id) - 1);
-    if(iDCC <= kEEmHigh || iDCC >= kEEpLow){
+    if (iDCC <= kEEmHigh || iDCC >= kEEpLow) {
       EEDetId eeid(_id);
       return EcalLogicID("EE_crystal_number",
                          2010000000UL + 1000000 * (eeid.positiveZ() ? 2 : 0) + 1000 * eeid.ix() + eeid.iy(),
-                         eeid.zside(), eeid.ix(), eeid.iy());
-    }
-    else{
+                         eeid.zside(),
+                         eeid.ix(),
+                         eeid.iy());
+    } else {
       int ism(iDCC <= kEBmHigh ? 19 + iDCC - kEBmLow : 1 + iDCC - kEBpLow);
       EBDetId ebid(_id);
-      return EcalLogicID("EB_crystal_number",
-                         1011000000UL + 10000 * ism + ebid.ic(),
-                         ism, ebid.ic());
+      return EcalLogicID("EB_crystal_number", 1011000000UL + 10000 * ism + ebid.ic(), ism, ebid.ic());
     }
   }
 
-  EcalLogicID
-  towerID(EcalElectronicsId const& _id)
-  {
+  EcalLogicID towerID(EcalElectronicsId const &_id) {
     unsigned iDCC(_id.dccId() - 1);
-    if(iDCC <= kEEmHigh || iDCC >= kEEpLow){
-      return EcalLogicID("EE_readout_tower",
-                         2110000000UL + 100 * (601 + iDCC) + _id.towerId(),
-                         601 + iDCC, _id.towerId());
-    }
-    else{
+    if (iDCC <= kEEmHigh || iDCC >= kEEpLow) {
+      return EcalLogicID(
+          "EE_readout_tower", 2110000000UL + 100 * (601 + iDCC) + _id.towerId(), 601 + iDCC, _id.towerId());
+    } else {
       int ism(iDCC <= kEBmHigh ? 19 + iDCC - kEBmLow : 1 + iDCC - kEBpLow);
-      return EcalLogicID("EB_trigger_tower",
-                         1021000000UL + 10000 * ism + _id.towerId(),
-                         ism, _id.towerId());
+      return EcalLogicID("EB_trigger_tower", 1021000000UL + 10000 * ism + _id.towerId(), ism, _id.towerId());
     }
   }
 
-  EcalLogicID
-  memChannelID(EcalPnDiodeDetId const& _id)
-  {
-    // using the PN ID degenerates the logic ID - 50 time samples are actually split into 5 channels each
+  EcalLogicID memChannelID(EcalPnDiodeDetId const &_id) {
+    // using the PN ID degenerates the logic ID - 50 time samples are actually
+    // split into 5 channels each
     unsigned iDCC(_id.iDCCId() - 1);
     int memId((_id.iPnId() - 1) % 5 + ((_id.iPnId() - 1) / 5) * 25 + 1);
-    if(iDCC <= kEEmHigh || iDCC >= kEEpLow){
-      return EcalLogicID("EE_mem_channel",
-                         100 * (601 + iDCC) + memId,
-                         601 + iDCC, memId);
-    }
-    else{
+    if (iDCC <= kEEmHigh || iDCC >= kEEpLow) {
+      return EcalLogicID("EE_mem_channel", 100 * (601 + iDCC) + memId, 601 + iDCC, memId);
+    } else {
       int ism(iDCC <= kEBmHigh ? 19 + iDCC - kEBmLow : 1 + iDCC - kEBpLow);
-      return EcalLogicID("EB_mem_channel",
-                         1191000000UL + 10000 * ism + memId,
-                         ism, memId);
+      return EcalLogicID("EB_mem_channel", 1191000000UL + 10000 * ism + memId, ism, memId);
     }
   }
 
-  EcalLogicID
-  memTowerID(EcalElectronicsId const& _id)
-  {
+  EcalLogicID memTowerID(EcalElectronicsId const &_id) {
     unsigned iDCC(_id.dccId() - 1);
-    if(iDCC <= kEEmHigh || iDCC >= kEEpLow){
-      return EcalLogicID("EE_mem_TT",
-                         100 * (601 + iDCC) + _id.towerId(),
-                         601 + iDCC, _id.towerId());
-    }
-    else{
+    if (iDCC <= kEEmHigh || iDCC >= kEEpLow) {
+      return EcalLogicID("EE_mem_TT", 100 * (601 + iDCC) + _id.towerId(), 601 + iDCC, _id.towerId());
+    } else {
       int ism(iDCC <= kEBmHigh ? 19 + iDCC - kEBmLow : 1 + iDCC - kEBpLow);
-      return EcalLogicID("EB_mem_TT",
-                         1181000000UL + 10000 * ism + _id.towerId(),
-                         ism, _id.towerId());
+      return EcalLogicID("EB_mem_TT", 1181000000UL + 10000 * ism + _id.towerId(), ism, _id.towerId());
     }
   }
 
-  EcalLogicID
-  lmPNID(EcalPnDiodeDetId const& _id)
-  {
+  EcalLogicID lmPNID(EcalPnDiodeDetId const &_id) {
     unsigned iDCC(_id.iDCCId() - 1);
     int pnid(_id.iPnId());
-    if(iDCC <= kEEmHigh || iDCC >= kEEpLow){
-      return EcalLogicID("EE_LM_PN",
-                         100 * (601 + iDCC) + pnid,
-                         601 + iDCC, pnid);
-    }
-    else{
+    if (iDCC <= kEEmHigh || iDCC >= kEEpLow) {
+      return EcalLogicID("EE_LM_PN", 100 * (601 + iDCC) + pnid, 601 + iDCC, pnid);
+    } else {
       int ism(iDCC <= kEBmHigh ? 19 + iDCC - kEBmLow : 1 + iDCC - kEBpLow);
-      return EcalLogicID("EB_LM_PN",
-                         1131000000UL + 10000 * ism + pnid,
-                         ism, pnid);
+      return EcalLogicID("EB_LM_PN", 1131000000UL + 10000 * ism + pnid, ism, pnid);
     }
   }
 
-  DetId
-  toDetId(EcalLogicID const& _id)
-  {
-    return DetId();
-  }
-}
-
+  DetId toDetId(EcalLogicID const &_id) { return DetId(); }
+}  // namespace ecaldqm
diff --git a/DQM/EcalMonitorDbModule/src/MonitorElementsDb.cc b/DQM/EcalMonitorDbModule/src/MonitorElementsDb.cc
index 876141f323057..63a9b8fdb75cc 100644
--- a/DQM/EcalMonitorDbModule/src/MonitorElementsDb.cc
+++ b/DQM/EcalMonitorDbModule/src/MonitorElementsDb.cc
@@ -6,18 +6,18 @@
 
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include <iostream>
-#include <fstream>
 #include <cmath>
+#include <fstream>
+#include <iostream>
 
 #include "DQMServices/Core/interface/MonitorElement.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 
-#include "RelationalAccess/ITransaction.h"
-#include "RelationalAccess/ISchema.h"
-#include "RelationalAccess/IQuery.h"
 #include "RelationalAccess/ICursor.h"
+#include "RelationalAccess/IQuery.h"
+#include "RelationalAccess/ISchema.h"
+#include "RelationalAccess/ITransaction.h"
 
 #include "CoralBase/Attribute.h"
 #include "CoralBase/AttributeList.h"
@@ -31,82 +31,85 @@
 
 #include "DQM/EcalMonitorDbModule/interface/MonitorElementsDb.h"
 
-MonitorElementsDb::MonitorElementsDb( const edm::ParameterSet& ps, std::string& xmlFile ){
-
+MonitorElementsDb::MonitorElementsDb(const edm::ParameterSet &ps, std::string &xmlFile) {
   xmlFile_ = xmlFile;
 
   dqmStore_ = edm::Service<DQMStore>().operator->();
 
   prefixME_ = ps.getUntrackedParameter<std::string>("prefixME", "");
 
-  if ( dqmStore_ ) {
-
-    dqmStore_->setCurrentFolder( prefixME_ );
+  if (dqmStore_) {
+    dqmStore_->setCurrentFolder(prefixME_);
 
-    parser_ = new MonitorXMLParser( xmlFile_ );
+    parser_ = new MonitorXMLParser(xmlFile_);
     try {
       parser_->load();
-    } catch( std::runtime_error const& e ) {
+    } catch (std::runtime_error const &e) {
       delete parser_;
       parser_ = nullptr;
       std::cerr << "Error loading parser: " << e.what() << std::endl;
     }
 
-    if(parser_) MEinfo_ = parser_->getDB_ME();
-
-    for( unsigned int i=0; i< MEinfo_.size(); i++ ) {
+    if (parser_)
+      MEinfo_ = parser_->getDB_ME();
 
-      MonitorElement* tmp;
+    for (unsigned int i = 0; i < MEinfo_.size(); i++) {
+      MonitorElement *tmp;
       tmp = nullptr;
-      if( strcmp(MEinfo_[i].type.c_str(), "th1d") == 0 ) {
-        tmp = dqmStore_->book1D( MEinfo_[i].title, MEinfo_[i].title, MEinfo_[i].xbins, MEinfo_[i].xfrom, MEinfo_[i].xto );
-      }
-      else if( strcmp(MEinfo_[i].type.c_str(), "th2d") == 0 ) {
-        tmp = dqmStore_->book2D( MEinfo_[i].title, MEinfo_[i].title, MEinfo_[i].xbins, MEinfo_[i].xfrom, MEinfo_[i].xto,
-        		    MEinfo_[i].ybins, MEinfo_[i].yfrom, MEinfo_[i].yto );
-      }
-      else if( strcmp(MEinfo_[i].type.c_str(), "tprofile") == 0 ) {
-      tmp = dqmStore_->bookProfile( MEinfo_[i].title, MEinfo_[i].title, MEinfo_[i].xbins, MEinfo_[i].xfrom, MEinfo_[i].xto,
-        		       MEinfo_[i].ybins, MEinfo_[i].yfrom, MEinfo_[i].yto );
-      }
-      else if( strcmp(MEinfo_[i].type.c_str(), "tprofile2d") == 0 ) {
-        tmp = dqmStore_->bookProfile2D( MEinfo_[i].title, MEinfo_[i].title, MEinfo_[i].xbins, MEinfo_[i].xfrom, MEinfo_[i].xto,
-        			   MEinfo_[i].ybins, MEinfo_[i].yfrom, MEinfo_[i].yto,
-        			   MEinfo_[i].zbins, MEinfo_[i].zfrom, MEinfo_[i].zto );
+      if (strcmp(MEinfo_[i].type.c_str(), "th1d") == 0) {
+        tmp = dqmStore_->book1D(MEinfo_[i].title, MEinfo_[i].title, MEinfo_[i].xbins, MEinfo_[i].xfrom, MEinfo_[i].xto);
+      } else if (strcmp(MEinfo_[i].type.c_str(), "th2d") == 0) {
+        tmp = dqmStore_->book2D(MEinfo_[i].title,
+                                MEinfo_[i].title,
+                                MEinfo_[i].xbins,
+                                MEinfo_[i].xfrom,
+                                MEinfo_[i].xto,
+                                MEinfo_[i].ybins,
+                                MEinfo_[i].yfrom,
+                                MEinfo_[i].yto);
+      } else if (strcmp(MEinfo_[i].type.c_str(), "tprofile") == 0) {
+        tmp = dqmStore_->bookProfile(MEinfo_[i].title,
+                                     MEinfo_[i].title,
+                                     MEinfo_[i].xbins,
+                                     MEinfo_[i].xfrom,
+                                     MEinfo_[i].xto,
+                                     MEinfo_[i].ybins,
+                                     MEinfo_[i].yfrom,
+                                     MEinfo_[i].yto);
+      } else if (strcmp(MEinfo_[i].type.c_str(), "tprofile2d") == 0) {
+        tmp = dqmStore_->bookProfile2D(MEinfo_[i].title,
+                                       MEinfo_[i].title,
+                                       MEinfo_[i].xbins,
+                                       MEinfo_[i].xfrom,
+                                       MEinfo_[i].xto,
+                                       MEinfo_[i].ybins,
+                                       MEinfo_[i].yfrom,
+                                       MEinfo_[i].yto,
+                                       MEinfo_[i].zbins,
+                                       MEinfo_[i].zfrom,
+                                       MEinfo_[i].zto);
       }
 
-      MEs_.push_back( tmp );
+      MEs_.push_back(tmp);
     }
-
   }
 
   ievt_ = 0;
-
 }
 
-MonitorElementsDb::~MonitorElementsDb(){
-
-  delete parser_;
-
-}
-
-void MonitorElementsDb::beginJob( void ){
-
-  ievt_ = 0;
-
-}
+MonitorElementsDb::~MonitorElementsDb() { delete parser_; }
 
-void MonitorElementsDb::endJob( void ){
+void MonitorElementsDb::beginJob(void) { ievt_ = 0; }
 
+void MonitorElementsDb::endJob(void) {
   std::cout << "MonitorElementsDb: analyzed " << ievt_ << " events" << std::endl;
-  for( unsigned int i = 0; i<MEs_.size(); i++ ) {
-    if( MEs_[i] != nullptr ) dqmStore_->removeElement( MEs_[i]->getName() );
+  for (unsigned int i = 0; i < MEs_.size(); i++) {
+    if (MEs_[i] != nullptr)
+      dqmStore_->removeElement(MEs_[i]->getName());
   }
-
 }
 
-void MonitorElementsDb::analyze( const edm::Event& e, const edm::EventSetup& c, coral::ISessionProxy* session ){
-
+void MonitorElementsDb::analyze(const edm::Event &e, const edm::EventSetup &c, coral::ISessionProxy *session) {
   ievt_++;
 
   bool atLeastAQuery;
@@ -114,155 +117,137 @@ void MonitorElementsDb::analyze( const edm::Event& e, const edm::EventSetup& c,
 
   std::vector<std::string> vars;
 
-  if ( session )  {
-
-    for( unsigned int i=0; i<MEinfo_.size(); i++ ) {
-
+  if (session) {
+    for (unsigned int i = 0; i < MEinfo_.size(); i++) {
       // i-th ME...
 
-      if( MEs_[i] != nullptr && ( ievt_ % MEinfo_[i].ncycle ) == 0 ) {
-
+      if (MEs_[i] != nullptr && (ievt_ % MEinfo_[i].ncycle) == 0) {
         MEs_[i]->Reset();
 
         vars.clear();
 
         try {
-
           atLeastAQuery = true;
 
           session->transaction().start(true);
 
-          coral::ISchema& schema = session->nominalSchema();
+          coral::ISchema &schema = session->nominalSchema();
 
-          coral::IQuery* query = schema.newQuery();
+          coral::IQuery *query = schema.newQuery();
 
-          for( unsigned int j=0; j<MEinfo_[i].queries.size(); j++ ) {
-            if( strcmp(MEinfo_[i].queries[j].query.c_str(), "addToTableList") == 0 ) {
-              query->addToTableList( MEinfo_[i].queries[j].arg );
-            }
-            else if( strcmp(MEinfo_[i].queries[j].query.c_str(), "addToOutputList") == 0 ) {
-              query->addToOutputList( MEinfo_[i].queries[j].arg, MEinfo_[i].queries[j].alias );
-              vars.push_back( MEinfo_[i].queries[j].alias );
-            }
-            else if( strcmp(MEinfo_[i].queries[j].query.c_str(), "setCondition") == 0 ) {
-              query->setCondition( MEinfo_[i].queries[j].arg, coral::AttributeList() );
-            }
-            else if( strcmp(MEinfo_[i].queries[j].query.c_str(), "addToOrderList") == 0 ) {
-              query->addToOrderList( MEinfo_[i].queries[j].arg );
+          for (unsigned int j = 0; j < MEinfo_[i].queries.size(); j++) {
+            if (strcmp(MEinfo_[i].queries[j].query.c_str(), "addToTableList") == 0) {
+              query->addToTableList(MEinfo_[i].queries[j].arg);
+            } else if (strcmp(MEinfo_[i].queries[j].query.c_str(), "addToOutputList") == 0) {
+              query->addToOutputList(MEinfo_[i].queries[j].arg, MEinfo_[i].queries[j].alias);
+              vars.push_back(MEinfo_[i].queries[j].alias);
+            } else if (strcmp(MEinfo_[i].queries[j].query.c_str(), "setCondition") == 0) {
+              query->setCondition(MEinfo_[i].queries[j].arg, coral::AttributeList());
+            } else if (strcmp(MEinfo_[i].queries[j].query.c_str(), "addToOrderList") == 0) {
+              query->addToOrderList(MEinfo_[i].queries[j].arg);
             }
           }
 
-          coral::ICursor& cursor = query->execute();
+          coral::ICursor &cursor = query->execute();
 
           unsigned int k = 0;
 
-          while ( cursor.next() && k < MEinfo_[i].loop ) {
-            //while ( cursor.next() ) {
+          while (cursor.next() && k < MEinfo_[i].loop) {
+            // while ( cursor.next() ) {
 
-            const coral::AttributeList& row = cursor.currentRow();
+            const coral::AttributeList &row = cursor.currentRow();
 
             std::vector<float> vvars;
             vvars.clear();
-            for( unsigned int l=0; l<vars.size(); l++ ) {
-              if( !vars[l].empty() ) {
-        	vvars.push_back( row[vars[l]].data<float>() );
+            for (unsigned int l = 0; l < vars.size(); l++) {
+              if (!vars[l].empty()) {
+                vvars.push_back(row[vars[l]].data<float>());
               }
             }
-            if( vvars.size() == 2 ) {
-              //std::cout << k << " -- " << vvars[0] << " -- " << vvars[1] << std::endl;
-              MEs_[i]->Fill( vvars[0], vvars[1] );
-            }
-            else if( vvars.size() == 3 ) {
-              //std::cout << k << " -- " << vvars[0] << " -- " << vvars[1] << " -- " << vvars[2] << std::endl;
-              MEs_[i]->Fill( vvars[0], vvars[1], vvars[2] );
-            }
-            else if( vvars.size() == 4 ) {
-              //std::cout << k << " -- " << vvars[0] << " -- " << vvars[1] << " -- " << vvars[2] << " -- " << vvars[3] << std::endl;
-              MEs_[i]->Fill( vvars[0], vvars[1], vvars[2], vvars[3] );
-            }
-            else{
+            if (vvars.size() == 2) {
+              // std::cout << k << " -- " << vvars[0] << " -- " << vvars[1] <<
+              // std::endl;
+              MEs_[i]->Fill(vvars[0], vvars[1]);
+            } else if (vvars.size() == 3) {
+              // std::cout << k << " -- " << vvars[0] << " -- " << vvars[1] << "
+              // -- " << vvars[2] << std::endl;
+              MEs_[i]->Fill(vvars[0], vvars[1], vvars[2]);
+            } else if (vvars.size() == 4) {
+              // std::cout << k << " -- " << vvars[0] << " -- " << vvars[1] << "
+              // -- " << vvars[2] << " -- " << vvars[3] << std::endl;
+              MEs_[i]->Fill(vvars[0], vvars[1], vvars[2], vvars[3]);
+            } else {
               std::cerr << "Too many variables to plot..." << std::endl;
               exit(1);
             }
 
             k++;
-
           }
 
           delete query;
 
-        } catch ( coral::Exception& e ) {
+        } catch (coral::Exception &e) {
           std::cerr << "CORAL Exception : " << e.what() << std::endl;
-        } catch ( std::exception& e ) {
+        } catch (std::exception &e) {
           std::cerr << "Standard C++ exception : " << e.what() << std::endl;
         }
       }
-
     }
 
-    if( atLeastAQuery ) session->transaction().commit();
-
+    if (atLeastAQuery)
+      session->transaction().commit();
   }
-
 }
 
-void MonitorElementsDb::htmlOutput(std::string& htmlDir){
-
+void MonitorElementsDb::htmlOutput(std::string &htmlDir) {
   gStyle->SetOptStat(0);
   gStyle->SetOptFit();
-  gStyle->SetPalette(1,nullptr);
-
-  for( unsigned int i=0; i<MEinfo_.size(); i++ ) {
-
-    if( MEs_[i] != nullptr && ( ievt_ % MEinfo_[i].ncycle ) == 0 ) {
-
-      TCanvas* c1;
-      int n = MEinfo_[i].xbins > MEinfo_[i].ybins ? int( round( float( MEinfo_[i].xbins ) / float( MEinfo_[i].ybins ) ) ) :
-        int( round( float( MEinfo_[i].ybins ) / float( MEinfo_[i].xbins ) ) );
-      if( MEinfo_[i].xbins > MEinfo_[i].ybins ) {
-        c1 = new TCanvas( "c1", "dummy", 400*n, 400 );
-      }
-      else {
-        c1 = new TCanvas( "c1", "dummy", 400, 400*n );
+  gStyle->SetPalette(1, nullptr);
+
+  for (unsigned int i = 0; i < MEinfo_.size(); i++) {
+    if (MEs_[i] != nullptr && (ievt_ % MEinfo_[i].ncycle) == 0) {
+      TCanvas *c1;
+      int n = MEinfo_[i].xbins > MEinfo_[i].ybins ? int(round(float(MEinfo_[i].xbins) / float(MEinfo_[i].ybins)))
+                                                  : int(round(float(MEinfo_[i].ybins) / float(MEinfo_[i].xbins)));
+      if (MEinfo_[i].xbins > MEinfo_[i].ybins) {
+        c1 = new TCanvas("c1", "dummy", 400 * n, 400);
+      } else {
+        c1 = new TCanvas("c1", "dummy", 400, 400 * n);
       }
       c1->SetGrid();
       c1->cd();
 
       const double histMax = 1.e15;
 
-      TObject* ob = const_cast<MonitorElement*>(MEs_[i])->getRootObject();
-      if ( ob ) {
-        if( dynamic_cast<TH1F*>( ob ) ) {
-          TH1F* h = dynamic_cast<TH1F*> ( ob );
-          h->Draw( );
-        }
-        else if( dynamic_cast<TH2F*>( ob ) ) {
-          TH2F* h = dynamic_cast<TH2F*>( ob );
-          if( h->GetMaximum(histMax) > 1.e4 ) {
+      TObject *ob = const_cast<MonitorElement *>(MEs_[i])->getRootObject();
+      if (ob) {
+        if (dynamic_cast<TH1F *>(ob)) {
+          TH1F *h = dynamic_cast<TH1F *>(ob);
+          h->Draw();
+        } else if (dynamic_cast<TH2F *>(ob)) {
+          TH2F *h = dynamic_cast<TH2F *>(ob);
+          if (h->GetMaximum(histMax) > 1.e4) {
             gPad->SetLogz(1);
           } else {
             gPad->SetLogz(0);
           }
-          h->Draw( "colz" );
-        }
-        else if( dynamic_cast<TProfile*>( ob ) ) {
-          TProfile* h = dynamic_cast<TProfile*>( ob );
-          if( h->GetMaximum(histMax) > 1.e4 ) {
+          h->Draw("colz");
+        } else if (dynamic_cast<TProfile *>(ob)) {
+          TProfile *h = dynamic_cast<TProfile *>(ob);
+          if (h->GetMaximum(histMax) > 1.e4) {
             gPad->SetLogz(1);
           } else {
             gPad->SetLogz(0);
           }
-          h->Draw( "colz" );
+          h->Draw("colz");
         }
       }
 
       c1->Update();
       std::string name = htmlDir + "/" + MEinfo_[i].title + ".png";
-      c1->SaveAs( name.c_str() );
+      c1->SaveAs(name.c_str());
 
       delete c1;
-
     }
   }
 }
-
diff --git a/DQM/EcalMonitorDbModule/src/MonitorXMLParser.cc b/DQM/EcalMonitorDbModule/src/MonitorXMLParser.cc
index acb406ba3d6ba..53ffe81aaf478 100644
--- a/DQM/EcalMonitorDbModule/src/MonitorXMLParser.cc
+++ b/DQM/EcalMonitorDbModule/src/MonitorXMLParser.cc
@@ -15,107 +15,100 @@
 
 #include "DQM/EcalMonitorDbModule/interface/MonitorXMLParser.h"
 
-MonitorXMLParser::MonitorXMLParser( const std::string& fromFile ) {
-
-  try{
-
+MonitorXMLParser::MonitorXMLParser(const std::string &fromFile) {
+  try {
     cms::concurrency::xercesInitialize();
 
-  }catch( xercesc::XMLException& e ){
-
-    char* message = xercesc::XMLString::transcode( e.getMessage() ) ;
+  } catch (xercesc::XMLException &e) {
+    char *message = xercesc::XMLString::transcode(e.getMessage());
 
     std::cerr << "XML toolkit initialization error: " << message << std::endl;
 
-    xercesc::XMLString::release( &message );
-
-    exit( ERROR_XERCES_INIT );
+    xercesc::XMLString::release(&message);
 
+    exit(ERROR_XERCES_INIT);
   }
 
   xmlFile_ = fromFile;
-  parser_  = new xercesc::XercesDOMParser();
-  tags_    = new TagNames();
-
+  parser_ = new xercesc::XercesDOMParser();
+  tags_ = new TagNames();
 }
 
 // - - - - - - - - - - - - - - - - -
 
 MonitorXMLParser::~MonitorXMLParser() throw() {
-
-  try{
+  try {
     cms::concurrency::xercesTerminate();
-  } catch ( xercesc::XMLException& e ){
-    char* message = xercesc::XMLString::transcode( e.getMessage() );
+  } catch (xercesc::XMLException &e) {
+    char *message = xercesc::XMLString::transcode(e.getMessage());
     std::cerr << "XML toolkit teardown error: " << message << std::endl;
-    xercesc::XMLString::release( &message ) ;
+    xercesc::XMLString::release(&message);
   }
 
   delete parser_;
   delete tags_;
-
 }
 
-
-
 // - - - - - - - - - - - - - - - - -
 
-void MonitorXMLParser::handleElement( xercesc::DOMElement* element ){
-
-  if( xercesc::XMLString::equals( tags_->TAG_ME, element->getTagName() ) ) {
-
-    char* c;
+void MonitorXMLParser::handleElement(xercesc::DOMElement *element) {
+  if (xercesc::XMLString::equals(tags_->TAG_ME, element->getTagName())) {
+    char *c;
     std::stringstream s;
     DB_ME me;
     bool meok;
 
     meok = false;
 
-    xercesc::DOMNodeList* d1Nodes = element->getElementsByTagName( tags_->TAG_1D );
+    xercesc::DOMNodeList *d1Nodes = element->getElementsByTagName(tags_->TAG_1D);
     const XMLSize_t d1Count = d1Nodes->getLength();
 
-    for( XMLSize_t d1Index = 0; d1Index < d1Count; ++d1Index ){
+    for (XMLSize_t d1Index = 0; d1Index < d1Count; ++d1Index) {
+      xercesc::DOMNode *d1Node = d1Nodes->item(d1Index);
 
-      xercesc::DOMNode* d1Node = d1Nodes->item( d1Index ) ;
+      xercesc::DOMElement *d1Element = dynamic_cast<xercesc::DOMElement *>(d1Node);
 
-      xercesc::DOMElement* d1Element = dynamic_cast< xercesc::DOMElement* >( d1Node ) ;
-
-      const XMLCh* d1titleXMLCh = d1Element->getAttribute( tags_->ATTR_TITLE ) ;
-      c = xercesc::XMLString::transcode( d1titleXMLCh );
+      const XMLCh *d1titleXMLCh = d1Element->getAttribute(tags_->ATTR_TITLE);
+      c = xercesc::XMLString::transcode(d1titleXMLCh);
       me.type = "th1d";
       me.title = c;
       meok = true;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* d1xbinsXMLCh = d1Element->getAttribute( tags_->ATTR_XBINS ) ;
-      c = xercesc::XMLString::transcode( d1xbinsXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *d1xbinsXMLCh = d1Element->getAttribute(tags_->ATTR_XBINS);
+      c = xercesc::XMLString::transcode(d1xbinsXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.xbins;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* d1xfromXMLCh = d1Element->getAttribute( tags_->ATTR_XFROM ) ;
-      c = xercesc::XMLString::transcode( d1xfromXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *d1xfromXMLCh = d1Element->getAttribute(tags_->ATTR_XFROM);
+      c = xercesc::XMLString::transcode(d1xfromXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.xfrom;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* d1xtoXMLCh = d1Element->getAttribute( tags_->ATTR_XTO ) ;
-      c = xercesc::XMLString::transcode( d1xtoXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *d1xtoXMLCh = d1Element->getAttribute(tags_->ATTR_XTO);
+      c = xercesc::XMLString::transcode(d1xtoXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.xto;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* d1ncycleXMLCh = d1Element->getAttribute( tags_->ATTR_NCYCLE ) ;
-      c = xercesc::XMLString::transcode( d1ncycleXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *d1ncycleXMLCh = d1Element->getAttribute(tags_->ATTR_NCYCLE);
+      c = xercesc::XMLString::transcode(d1ncycleXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.ncycle;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* d1loopXMLCh = d1Element->getAttribute( tags_->ATTR_LOOP ) ;
-      c = xercesc::XMLString::transcode( d1loopXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *d1loopXMLCh = d1Element->getAttribute(tags_->ATTR_LOOP);
+      c = xercesc::XMLString::transcode(d1loopXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.loop;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
       me.ybins = 0;
       me.yfrom = 0.0;
@@ -123,341 +116,348 @@ void MonitorXMLParser::handleElement( xercesc::DOMElement* element ){
       me.zbins = 0;
       me.zfrom = 0.0;
       me.zto = 0.0;
-
     }
 
-    xercesc::DOMNodeList* d2Nodes = element->getElementsByTagName( tags_->TAG_2D );
+    xercesc::DOMNodeList *d2Nodes = element->getElementsByTagName(tags_->TAG_2D);
     const XMLSize_t d2Count = d2Nodes->getLength();
 
-    for( XMLSize_t d2Index = 0; d2Index < d2Count; ++d2Index ){
+    for (XMLSize_t d2Index = 0; d2Index < d2Count; ++d2Index) {
+      xercesc::DOMNode *d2Node = d2Nodes->item(d2Index);
 
-      xercesc::DOMNode* d2Node = d2Nodes->item( d2Index ) ;
+      xercesc::DOMElement *d2Element = dynamic_cast<xercesc::DOMElement *>(d2Node);
 
-      xercesc::DOMElement* d2Element = dynamic_cast< xercesc::DOMElement* >( d2Node ) ;
-
-      const XMLCh* d2titleXMLCh = d2Element->getAttribute( tags_->ATTR_TITLE ) ;
-      c = xercesc::XMLString::transcode( d2titleXMLCh );
+      const XMLCh *d2titleXMLCh = d2Element->getAttribute(tags_->ATTR_TITLE);
+      c = xercesc::XMLString::transcode(d2titleXMLCh);
       me.type = "th2d";
       me.title = c;
       meok = true;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* d2xbinsXMLCh = d2Element->getAttribute( tags_->ATTR_XBINS ) ;
-      c = xercesc::XMLString::transcode( d2xbinsXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *d2xbinsXMLCh = d2Element->getAttribute(tags_->ATTR_XBINS);
+      c = xercesc::XMLString::transcode(d2xbinsXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.xbins;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* d2xfromXMLCh = d2Element->getAttribute( tags_->ATTR_XFROM ) ;
-      c = xercesc::XMLString::transcode( d2xfromXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *d2xfromXMLCh = d2Element->getAttribute(tags_->ATTR_XFROM);
+      c = xercesc::XMLString::transcode(d2xfromXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.xfrom;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* d2xtoXMLCh = d2Element->getAttribute( tags_->ATTR_XTO ) ;
-      c = xercesc::XMLString::transcode( d2xtoXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *d2xtoXMLCh = d2Element->getAttribute(tags_->ATTR_XTO);
+      c = xercesc::XMLString::transcode(d2xtoXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.xto;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* d2ybinsXMLCh = d2Element->getAttribute( tags_->ATTR_YBINS ) ;
-      c = xercesc::XMLString::transcode( d2ybinsXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *d2ybinsXMLCh = d2Element->getAttribute(tags_->ATTR_YBINS);
+      c = xercesc::XMLString::transcode(d2ybinsXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.ybins;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* d2yfromXMLCh = d2Element->getAttribute( tags_->ATTR_YFROM ) ;
-      c = xercesc::XMLString::transcode( d2yfromXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *d2yfromXMLCh = d2Element->getAttribute(tags_->ATTR_YFROM);
+      c = xercesc::XMLString::transcode(d2yfromXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.yfrom;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* d2ytoXMLCh = d2Element->getAttribute( tags_->ATTR_YTO ) ;
-      c = xercesc::XMLString::transcode( d2ytoXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *d2ytoXMLCh = d2Element->getAttribute(tags_->ATTR_YTO);
+      c = xercesc::XMLString::transcode(d2ytoXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.yto;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* d2ncycleXMLCh = d2Element->getAttribute( tags_->ATTR_NCYCLE ) ;
-      c = xercesc::XMLString::transcode( d2ncycleXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *d2ncycleXMLCh = d2Element->getAttribute(tags_->ATTR_NCYCLE);
+      c = xercesc::XMLString::transcode(d2ncycleXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.ncycle;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* d2loopXMLCh = d2Element->getAttribute( tags_->ATTR_LOOP ) ;
-      c = xercesc::XMLString::transcode( d2loopXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *d2loopXMLCh = d2Element->getAttribute(tags_->ATTR_LOOP);
+      c = xercesc::XMLString::transcode(d2loopXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.loop;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
       me.zbins = 0;
       me.zfrom = 0.0;
       me.zto = 0.0;
-
     }
 
-    xercesc::DOMNodeList* tpNodes = element->getElementsByTagName( tags_->TAG_TPROFILE );
+    xercesc::DOMNodeList *tpNodes = element->getElementsByTagName(tags_->TAG_TPROFILE);
     const XMLSize_t tpCount = tpNodes->getLength();
 
-    for( XMLSize_t tpIndex = 0; tpIndex < tpCount; ++tpIndex ){
+    for (XMLSize_t tpIndex = 0; tpIndex < tpCount; ++tpIndex) {
+      xercesc::DOMNode *tpNode = tpNodes->item(tpIndex);
 
-      xercesc::DOMNode* tpNode = tpNodes->item( tpIndex ) ;
+      xercesc::DOMElement *tpElement = dynamic_cast<xercesc::DOMElement *>(tpNode);
 
-      xercesc::DOMElement* tpElement = dynamic_cast< xercesc::DOMElement* >( tpNode ) ;
-
-      const XMLCh* tptitleXMLCh = tpElement->getAttribute( tags_->ATTR_TITLE ) ;
-      c = xercesc::XMLString::transcode( tptitleXMLCh );
+      const XMLCh *tptitleXMLCh = tpElement->getAttribute(tags_->ATTR_TITLE);
+      c = xercesc::XMLString::transcode(tptitleXMLCh);
       me.type = "tprofile";
       me.title = c;
       meok = true;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tpxbinsXMLCh = tpElement->getAttribute( tags_->ATTR_XBINS ) ;
-      c = xercesc::XMLString::transcode( tpxbinsXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tpxbinsXMLCh = tpElement->getAttribute(tags_->ATTR_XBINS);
+      c = xercesc::XMLString::transcode(tpxbinsXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.xbins;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tpxfromXMLCh = tpElement->getAttribute( tags_->ATTR_XFROM ) ;
-      c = xercesc::XMLString::transcode( tpxfromXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tpxfromXMLCh = tpElement->getAttribute(tags_->ATTR_XFROM);
+      c = xercesc::XMLString::transcode(tpxfromXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.xfrom;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tpxtoXMLCh = tpElement->getAttribute( tags_->ATTR_XTO ) ;
-      c = xercesc::XMLString::transcode( tpxtoXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tpxtoXMLCh = tpElement->getAttribute(tags_->ATTR_XTO);
+      c = xercesc::XMLString::transcode(tpxtoXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.xto;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tpybinsXMLCh = tpElement->getAttribute( tags_->ATTR_YBINS ) ;
-      c = xercesc::XMLString::transcode( tpybinsXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tpybinsXMLCh = tpElement->getAttribute(tags_->ATTR_YBINS);
+      c = xercesc::XMLString::transcode(tpybinsXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.ybins;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tpyfromXMLCh = tpElement->getAttribute( tags_->ATTR_YFROM ) ;
-      c = xercesc::XMLString::transcode( tpyfromXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tpyfromXMLCh = tpElement->getAttribute(tags_->ATTR_YFROM);
+      c = xercesc::XMLString::transcode(tpyfromXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.yfrom;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tpytoXMLCh = tpElement->getAttribute( tags_->ATTR_YTO ) ;
-      c = xercesc::XMLString::transcode( tpytoXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tpytoXMLCh = tpElement->getAttribute(tags_->ATTR_YTO);
+      c = xercesc::XMLString::transcode(tpytoXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.yto;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tpncycleXMLCh = tpElement->getAttribute( tags_->ATTR_NCYCLE ) ;
-      c = xercesc::XMLString::transcode( tpncycleXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tpncycleXMLCh = tpElement->getAttribute(tags_->ATTR_NCYCLE);
+      c = xercesc::XMLString::transcode(tpncycleXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.ncycle;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tploopXMLCh = tpElement->getAttribute( tags_->ATTR_LOOP ) ;
-      c = xercesc::XMLString::transcode( tploopXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tploopXMLCh = tpElement->getAttribute(tags_->ATTR_LOOP);
+      c = xercesc::XMLString::transcode(tploopXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.loop;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
       me.zbins = 0;
       me.zfrom = 0.0;
       me.zto = 0.0;
-
     }
 
-    xercesc::DOMNodeList* tp2dNodes = element->getElementsByTagName( tags_->TAG_TPROFILE2D );
+    xercesc::DOMNodeList *tp2dNodes = element->getElementsByTagName(tags_->TAG_TPROFILE2D);
     const XMLSize_t tp2dCount = tp2dNodes->getLength();
 
-    for( XMLSize_t tp2dIndex = 0; tp2dIndex < tp2dCount; ++tp2dIndex ){
+    for (XMLSize_t tp2dIndex = 0; tp2dIndex < tp2dCount; ++tp2dIndex) {
+      xercesc::DOMNode *tp2dNode = tp2dNodes->item(tp2dIndex);
 
-      xercesc::DOMNode* tp2dNode = tp2dNodes->item( tp2dIndex ) ;
+      xercesc::DOMElement *tp2dElement = dynamic_cast<xercesc::DOMElement *>(tp2dNode);
 
-      xercesc::DOMElement* tp2dElement = dynamic_cast< xercesc::DOMElement* >( tp2dNode ) ;
-
-      const XMLCh* tp2dtitleXMLCh = tp2dElement->getAttribute( tags_->ATTR_TITLE ) ;
-      c = xercesc::XMLString::transcode( tp2dtitleXMLCh );
+      const XMLCh *tp2dtitleXMLCh = tp2dElement->getAttribute(tags_->ATTR_TITLE);
+      c = xercesc::XMLString::transcode(tp2dtitleXMLCh);
       me.type = "tprofile2d";
       me.title = c;
       meok = true;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tp2dxbinsXMLCh = tp2dElement->getAttribute( tags_->ATTR_XBINS ) ;
-      c = xercesc::XMLString::transcode( tp2dxbinsXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tp2dxbinsXMLCh = tp2dElement->getAttribute(tags_->ATTR_XBINS);
+      c = xercesc::XMLString::transcode(tp2dxbinsXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.xbins;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tp2dxfromXMLCh = tp2dElement->getAttribute( tags_->ATTR_XFROM ) ;
-      c = xercesc::XMLString::transcode( tp2dxfromXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tp2dxfromXMLCh = tp2dElement->getAttribute(tags_->ATTR_XFROM);
+      c = xercesc::XMLString::transcode(tp2dxfromXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.xfrom;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tp2dxtoXMLCh = tp2dElement->getAttribute( tags_->ATTR_XTO ) ;
-      c = xercesc::XMLString::transcode( tp2dxtoXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tp2dxtoXMLCh = tp2dElement->getAttribute(tags_->ATTR_XTO);
+      c = xercesc::XMLString::transcode(tp2dxtoXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.xto;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tp2dybinsXMLCh = tp2dElement->getAttribute( tags_->ATTR_YBINS ) ;
-      c = xercesc::XMLString::transcode( tp2dybinsXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tp2dybinsXMLCh = tp2dElement->getAttribute(tags_->ATTR_YBINS);
+      c = xercesc::XMLString::transcode(tp2dybinsXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.ybins;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tp2dyfromXMLCh = tp2dElement->getAttribute( tags_->ATTR_YFROM ) ;
-      c = xercesc::XMLString::transcode( tp2dyfromXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tp2dyfromXMLCh = tp2dElement->getAttribute(tags_->ATTR_YFROM);
+      c = xercesc::XMLString::transcode(tp2dyfromXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.yfrom;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tp2dytoXMLCh = tp2dElement->getAttribute( tags_->ATTR_YTO ) ;
-      c = xercesc::XMLString::transcode( tp2dytoXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tp2dytoXMLCh = tp2dElement->getAttribute(tags_->ATTR_YTO);
+      c = xercesc::XMLString::transcode(tp2dytoXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.yto;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tp2dzbinsXMLCh = tp2dElement->getAttribute( tags_->ATTR_ZBINS ) ;
-      c = xercesc::XMLString::transcode( tp2dzbinsXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tp2dzbinsXMLCh = tp2dElement->getAttribute(tags_->ATTR_ZBINS);
+      c = xercesc::XMLString::transcode(tp2dzbinsXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.zbins;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tp2dzfromXMLCh = tp2dElement->getAttribute( tags_->ATTR_ZFROM ) ;
-      c = xercesc::XMLString::transcode( tp2dzfromXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tp2dzfromXMLCh = tp2dElement->getAttribute(tags_->ATTR_ZFROM);
+      c = xercesc::XMLString::transcode(tp2dzfromXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.zfrom;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tp2dztoXMLCh = tp2dElement->getAttribute( tags_->ATTR_ZTO ) ;
-      c = xercesc::XMLString::transcode( tp2dztoXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tp2dztoXMLCh = tp2dElement->getAttribute(tags_->ATTR_ZTO);
+      c = xercesc::XMLString::transcode(tp2dztoXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.zto;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tp2dncycleXMLCh = tp2dElement->getAttribute( tags_->ATTR_NCYCLE ) ;
-      c = xercesc::XMLString::transcode( tp2dncycleXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tp2dncycleXMLCh = tp2dElement->getAttribute(tags_->ATTR_NCYCLE);
+      c = xercesc::XMLString::transcode(tp2dncycleXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.ncycle;
-      xercesc::XMLString::release( &c );
+      xercesc::XMLString::release(&c);
 
-      const XMLCh* tp2dloopXMLCh = tp2dElement->getAttribute( tags_->ATTR_LOOP ) ;
-      c = xercesc::XMLString::transcode( tp2dloopXMLCh );
-      s.clear(); s.str( c );
+      const XMLCh *tp2dloopXMLCh = tp2dElement->getAttribute(tags_->ATTR_LOOP);
+      c = xercesc::XMLString::transcode(tp2dloopXMLCh);
+      s.clear();
+      s.str(c);
       s >> me.loop;
-      xercesc::XMLString::release( &c );
-
+      xercesc::XMLString::release(&c);
     }
 
-
-    xercesc::DOMNodeList* qNodes = element->getElementsByTagName( tags_->TAG_QUERY );
+    xercesc::DOMNodeList *qNodes = element->getElementsByTagName(tags_->TAG_QUERY);
     const XMLSize_t qCount = qNodes->getLength();
 
-    for( XMLSize_t qIndex = 0; qIndex < qCount; ++qIndex ){
+    for (XMLSize_t qIndex = 0; qIndex < qCount; ++qIndex) {
+      xercesc::DOMNode *qNode = qNodes->item(qIndex);
 
-      xercesc::DOMNode* qNode = qNodes->item( qIndex ) ;
+      xercesc::DOMElement *qElement = dynamic_cast<xercesc::DOMElement *>(qNode);
 
-      xercesc::DOMElement* qElement = dynamic_cast< xercesc::DOMElement* >( qNode ) ;
+      const XMLCh *nameXMLCh = qElement->getAttribute(tags_->ATTR_NAME);
+      c = xercesc::XMLString::transcode(nameXMLCh);
 
-      const XMLCh* nameXMLCh = qElement->getAttribute( tags_->ATTR_NAME ) ;
-      c = xercesc::XMLString::transcode( nameXMLCh );
+      const XMLCh *argXMLCh = qElement->getAttribute(tags_->ATTR_ARG);
+      char *d = xercesc::XMLString::transcode(argXMLCh);
 
-      const XMLCh* argXMLCh = qElement->getAttribute( tags_->ATTR_ARG ) ;
-      char* d = xercesc::XMLString::transcode( argXMLCh );
-
-      const XMLCh* aliasXMLCh = qElement->getAttribute( tags_->ATTR_ALIAS ) ;
-      char* e = xercesc::XMLString::transcode( aliasXMLCh );
+      const XMLCh *aliasXMLCh = qElement->getAttribute(tags_->ATTR_ALIAS);
+      char *e = xercesc::XMLString::transcode(aliasXMLCh);
 
       DbQuery tmpQuery;
       tmpQuery.query = c;
       tmpQuery.arg = d;
       tmpQuery.alias = e;
 
-      me.queries.push_back( tmpQuery );
-
-      xercesc::XMLString::release( &c );
-      xercesc::XMLString::release( &d );
-      xercesc::XMLString::release( &e );
-
+      me.queries.push_back(tmpQuery);
 
+      xercesc::XMLString::release(&c);
+      xercesc::XMLString::release(&d);
+      xercesc::XMLString::release(&e);
     }
 
-    if( meok ) DBMonitoringElements_.push_back( me );
-
+    if (meok)
+      DBMonitoringElements_.push_back(me);
   }
-} // handleElement()
-
+}  // handleElement()
 
 // - - - - - - - - - - - - - - - - - - -
 
 void MonitorXMLParser::load() noexcept(false) {
+  parser_->setValidationScheme(xercesc::XercesDOMParser::Val_Never);
+  parser_->setDoNamespaces(false);
+  parser_->setDoSchema(false);
+  parser_->setLoadExternalDTD(false);
 
-  parser_->setValidationScheme( xercesc::XercesDOMParser::Val_Never );
-  parser_->setDoNamespaces( false );
-  parser_->setDoSchema( false );
-  parser_->setLoadExternalDTD( false );
-
-  try{
+  try {
+    parser_->parse(xmlFile_.c_str());
 
-    parser_->parse( xmlFile_.c_str() );
+    xercesc::DOMDocument *xmlDoc = parser_->getDocument();
 
-    xercesc::DOMDocument* xmlDoc = parser_->getDocument();
+    xercesc::DOMElement *dbe = xmlDoc->getDocumentElement();
 
-    xercesc::DOMElement* dbe = xmlDoc->getDocumentElement();
-
-    if( nullptr == dbe ){
-      throw( std::runtime_error( "empty XML document" ) ) ;
+    if (nullptr == dbe) {
+      throw(std::runtime_error("empty XML document"));
     }
 
-    if( xercesc::XMLString::equals( tags_->TAG_DBE, dbe->getTagName() ) ) {
-
-      xercesc::DOMNodeList* children = dbe->getChildNodes();
+    if (xercesc::XMLString::equals(tags_->TAG_DBE, dbe->getTagName())) {
+      xercesc::DOMNodeList *children = dbe->getChildNodes();
       const XMLSize_t nodeCount = children->getLength();
 
-      for( XMLSize_t ix = 0 ; ix < nodeCount ; ++ix ){
-	xercesc::DOMNode* currentNode = children->item( ix );
-	if( nullptr == currentNode ){
-	  // null node...
-	  continue;
-	}
+      for (XMLSize_t ix = 0; ix < nodeCount; ++ix) {
+        xercesc::DOMNode *currentNode = children->item(ix);
+        if (nullptr == currentNode) {
+          // null node...
+          continue;
+        }
 
-	if( xercesc::DOMNode::ELEMENT_NODE != currentNode->getNodeType() ){
-	  continue;
-	}
+        if (xercesc::DOMNode::ELEMENT_NODE != currentNode->getNodeType()) {
+          continue;
+        }
 
-	xercesc::DOMElement* currentElement = dynamic_cast< xercesc::DOMElement* >( currentNode );
-
-	handleElement( currentElement );
+        xercesc::DOMElement *currentElement = dynamic_cast<xercesc::DOMElement *>(currentNode);
 
+        handleElement(currentElement);
       }
     }
 
-  }catch( xercesc::XMLException& e ){
-
-    char* message = xercesc::XMLString::transcode( e.getMessage() );
+  } catch (xercesc::XMLException &e) {
+    char *message = xercesc::XMLString::transcode(e.getMessage());
 
-    std::ostringstream buf ;
+    std::ostringstream buf;
     buf << "Error parsing file: " << message << std::endl;
 
-    xercesc::XMLString::release( &message );
-
-    throw( std::runtime_error( buf.str() ) );
+    xercesc::XMLString::release(&message);
 
-  }catch( const xercesc::DOMException& e ){
+    throw(std::runtime_error(buf.str()));
 
-    char* message = xercesc::XMLString::transcode( e.getMessage() );
+  } catch (const xercesc::DOMException &e) {
+    char *message = xercesc::XMLString::transcode(e.getMessage());
 
     std::ostringstream buf;
     buf << "Encountered DOM Exception: " << message << std::endl;
 
-    xercesc::XMLString::release( &message );
-
-    throw( std::runtime_error( buf.str() ) );
+    xercesc::XMLString::release(&message);
 
+    throw(std::runtime_error(buf.str()));
   }
 
   return;
 
-} // load()
-
+}  // load()
diff --git a/DQM/EcalPreshowerMonitorClient/interface/ESClient.h b/DQM/EcalPreshowerMonitorClient/interface/ESClient.h
index 950d9c4b1e1bb..8f7dfaff57a15 100644
--- a/DQM/EcalPreshowerMonitorClient/interface/ESClient.h
+++ b/DQM/EcalPreshowerMonitorClient/interface/ESClient.h
@@ -3,60 +3,58 @@
 
 #include <string>
 
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 
 namespace edm {
   class ParameterSet;
 }
 
 class ESClient {
-
- public:
-
-  ESClient(edm::ParameterSet const&);
+public:
+  ESClient(edm::ParameterSet const &);
   virtual ~ESClient() {}
 
-  virtual void endLumiAnalyze(DQMStore::IGetter&) {}
-  virtual void endJobAnalyze(DQMStore::IGetter&) {}
+  virtual void endLumiAnalyze(DQMStore::IGetter &) {}
+  virtual void endJobAnalyze(DQMStore::IGetter &) {}
 
-  void setup(DQMStore::IBooker&);
+  void setup(DQMStore::IBooker &);
 
-  template<typename T> T* getHisto(MonitorElement*, bool = false, T* = 0) const;
+  template <typename T>
+  T *getHisto(MonitorElement *, bool = false, T * = 0) const;
 
- protected:
-  virtual void book(DQMStore::IBooker&) {}
+protected:
+  virtual void book(DQMStore::IBooker &) {}
 
   bool initialized_;
   std::string prefixME_;
   bool cloneME_;
   bool verbose_;
   bool debug_;
-
 };
 
-template<typename T>
-T*
-ESClient::getHisto(MonitorElement* _me, bool _clone/* = false*/, T* _current/* = 0*/) const
-{
-  if(!_me){
-    if(_clone) return _current;
-    else return nullptr;
+template <typename T>
+T *ESClient::getHisto(MonitorElement *_me, bool _clone /* = false*/, T *_current /* = 0*/) const {
+  if (!_me) {
+    if (_clone)
+      return _current;
+    else
+      return nullptr;
   }
 
-  TObject* obj(_me->getRootObject());
+  TObject *obj(_me->getRootObject());
 
-  if(!obj) return nullptr;
+  if (!obj)
+    return nullptr;
 
-  if(_clone){
+  if (_clone) {
     delete _current;
-    _current = dynamic_cast<T*>(obj->Clone(("ME " + _me->getName()).c_str()));
-    if(_current) _current->SetDirectory(nullptr);
+    _current = dynamic_cast<T *>(obj->Clone(("ME " + _me->getName()).c_str()));
+    if (_current)
+      _current->SetDirectory(nullptr);
     return _current;
-  }
-  else
-    return dynamic_cast<T*>(obj);
+  } else
+    return dynamic_cast<T *>(obj);
 }
 
-#endif // ESClient_H
-
+#endif  // ESClient_H
diff --git a/DQM/EcalPreshowerMonitorClient/interface/ESIntegrityClient.h b/DQM/EcalPreshowerMonitorClient/interface/ESIntegrityClient.h
index 247f839b6e50e..973a41bad2ec5 100644
--- a/DQM/EcalPreshowerMonitorClient/interface/ESIntegrityClient.h
+++ b/DQM/EcalPreshowerMonitorClient/interface/ESIntegrityClient.h
@@ -7,43 +7,41 @@
 #include "TH2F.h"
 
 class ESIntegrityClient : public ESClient {
- public:
-  
+public:
   /// Constructor
-  ESIntegrityClient(const edm::ParameterSet& ps);
-  
+  ESIntegrityClient(const edm::ParameterSet &ps);
+
   /// Destructor
   ~ESIntegrityClient() override;
-  
+
   /// Analyze
-  void endLumiAnalyze(DQMStore::IGetter&) override;
-  
- private:
-  void book(DQMStore::IBooker&) override;
-  
-  int fed_[2][2][40][40];  
-  int kchip_[2][2][40][40];  
-  int fiber_[2][2][40][40];  
+  void endLumiAnalyze(DQMStore::IGetter &) override;
+
+private:
+  void book(DQMStore::IBooker &) override;
+
+  int fed_[2][2][40][40];
+  int kchip_[2][2][40][40];
+  int fiber_[2][2][40][40];
   int fedStatus_[56];
   int fiberStatus_[56][36];
   int syncStatus_[56];
   int slinkCRCStatus_[56];
 
-  MonitorElement* meFED_[2][2];
-  MonitorElement* meKCHIP_[2][2];
+  MonitorElement *meFED_[2][2];
+  MonitorElement *meKCHIP_[2][2];
 
-  TH1F *hFED_;  
+  TH1F *hFED_;
   TH2F *hFiberOff_;
   TH2F *hFiberBadStatus_;
   TH2F *hKF1_;
   TH2F *hKF2_;
   TH1F *hKBC_;
-  TH1F *hKEC_; 
+  TH1F *hKEC_;
   TH1F *hL1ADiff_;
   TH1F *hBXDiff_;
   TH1F *hOrbitNumberDiff_;
-  TH1F *hSLinkCRCErr_; 
-
+  TH1F *hSLinkCRCErr_;
 };
 
 #endif
diff --git a/DQM/EcalPreshowerMonitorClient/interface/ESPedestalClient.h b/DQM/EcalPreshowerMonitorClient/interface/ESPedestalClient.h
index 91fd87a3658a2..3aa16d88d72a1 100644
--- a/DQM/EcalPreshowerMonitorClient/interface/ESPedestalClient.h
+++ b/DQM/EcalPreshowerMonitorClient/interface/ESPedestalClient.h
@@ -11,27 +11,26 @@
 // class decleration
 //
 
-class ESPedestalClient : public ESClient{
-   public:
-   ESPedestalClient(const edm::ParameterSet&);
-   ~ESPedestalClient() override;
-   void endJobAnalyze(DQMStore::IGetter&) override;
+class ESPedestalClient : public ESClient {
+public:
+  ESPedestalClient(const edm::ParameterSet &);
+  ~ESPedestalClient() override;
+  void endJobAnalyze(DQMStore::IGetter &) override;
 
-   private:
-   void book(DQMStore::IBooker&) override;
+private:
+  void book(DQMStore::IBooker &) override;
 
-   bool fitPedestal_;
+  bool fitPedestal_;
 
-   MonitorElement *hPed_[2][2][40][40];
-   MonitorElement *hTotN_[2][2][40][40];
+  MonitorElement *hPed_[2][2][40][40];
+  MonitorElement *hTotN_[2][2][40][40];
 
-   TF1* fg_;
-
-   std::vector<int> senZ_;
-   std::vector<int> senP_;
-   std::vector<int> senX_;
-   std::vector<int> senY_;
+  TF1 *fg_;
 
+  std::vector<int> senZ_;
+  std::vector<int> senP_;
+  std::vector<int> senX_;
+  std::vector<int> senY_;
 };
 
-#endif  //ESPedestalClient_H
+#endif  // ESPedestalClient_H
diff --git a/DQM/EcalPreshowerMonitorClient/interface/ESSummaryClient.h b/DQM/EcalPreshowerMonitorClient/interface/ESSummaryClient.h
index 247cea19652e5..1738f987a8e49 100644
--- a/DQM/EcalPreshowerMonitorClient/interface/ESSummaryClient.h
+++ b/DQM/EcalPreshowerMonitorClient/interface/ESSummaryClient.h
@@ -4,27 +4,25 @@
 #include "DQM/EcalPreshowerMonitorClient/interface/ESClient.h"
 
 class ESSummaryClient : public ESClient {
+public:
+  /// Constructor
+  ESSummaryClient(const edm::ParameterSet &ps);
 
-   public:
+  /// Destructor
+  ~ESSummaryClient() override;
 
-      /// Constructor
-      ESSummaryClient(const edm::ParameterSet& ps);
+  /// Analyze
+  void endLumiAnalyze(DQMStore::IGetter &) override;
+  void endJobAnalyze(DQMStore::IGetter &) override;
 
-      /// Destructor
-      ~ESSummaryClient() override;
+private:
+  void book(DQMStore::IBooker &) override;
 
-      /// Analyze
-      void endLumiAnalyze(DQMStore::IGetter&) override;
-      void endJobAnalyze(DQMStore::IGetter&) override;
+  void fillReportSummary(DQMStore::IGetter &);
 
- private:
-      void book(DQMStore::IBooker&) override;
-
-      void fillReportSummary(DQMStore::IGetter&);
-
-      MonitorElement* meReportSummary_;
-      MonitorElement* meReportSummaryContents_[2][2];
-      MonitorElement* meReportSummaryMap_;
+  MonitorElement *meReportSummary_;
+  MonitorElement *meReportSummaryContents_[2][2];
+  MonitorElement *meReportSummaryMap_;
 };
 
 #endif
diff --git a/DQM/EcalPreshowerMonitorClient/interface/EcalPreshowerMonitorClient.h b/DQM/EcalPreshowerMonitorClient/interface/EcalPreshowerMonitorClient.h
index 8c92b7ddbcb20..f65f72ebed58f 100644
--- a/DQM/EcalPreshowerMonitorClient/interface/EcalPreshowerMonitorClient.h
+++ b/DQM/EcalPreshowerMonitorClient/interface/EcalPreshowerMonitorClient.h
@@ -6,27 +6,28 @@
 class ESClient;
 
 class EcalPreshowerMonitorClient : public DQMEDHarvester {
-
- public:
-
-  EcalPreshowerMonitorClient(const edm::ParameterSet&);
+public:
+  EcalPreshowerMonitorClient(const edm::ParameterSet &);
   ~EcalPreshowerMonitorClient() override;
 
-  static void fillDescriptions(edm::ConfigurationDescriptions&);
+  static void fillDescriptions(edm::ConfigurationDescriptions &);
+
+private:
+  void dqmEndLuminosityBlock(DQMStore::IBooker &,
+                             DQMStore::IGetter &,
+                             const edm::LuminosityBlock &,
+                             const edm::EventSetup &) override;
+  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
 
- private:
-  
-  void dqmEndLuminosityBlock(DQMStore::IBooker&, DQMStore::IGetter&, const edm::LuminosityBlock &, const edm::EventSetup &) override;
-  void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override;
-  
   // ----------member data ---------------------------
   bool debug_;
   bool verbose_;
-  
-  std::vector<ESClient*> clients_;
 
-  // Data members existed below could not have been used in any way, yet was consuming O(100kB) of memory.
-  // Removed together with htmlOutput, which was a private function that was not called from anywhere. (yiiyama, Sep 18 2014)
+  std::vector<ESClient *> clients_;
+
+  // Data members existed below could not have been used in any way, yet was
+  // consuming O(100kB) of memory. Removed together with htmlOutput, which was a
+  // private function that was not called from anywhere. (yiiyama, Sep 18 2014)
 };
 
 #endif
diff --git a/DQM/EcalPreshowerMonitorClient/src/ESClient.cc b/DQM/EcalPreshowerMonitorClient/src/ESClient.cc
index 6937a47561bf4..ee7e87df74aba 100644
--- a/DQM/EcalPreshowerMonitorClient/src/ESClient.cc
+++ b/DQM/EcalPreshowerMonitorClient/src/ESClient.cc
@@ -2,19 +2,16 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-ESClient::ESClient(edm::ParameterSet const& _ps) :
-  initialized_(false),
-  prefixME_(_ps.getUntrackedParameter<std::string>("prefixME")),
-  cloneME_(_ps.getUntrackedParameter<bool>("cloneME")),
-  verbose_(_ps.getUntrackedParameter<bool>("verbose")),
-  debug_(_ps.getUntrackedParameter<bool>("debug"))
-{
-}
+ESClient::ESClient(edm::ParameterSet const &_ps)
+    : initialized_(false),
+      prefixME_(_ps.getUntrackedParameter<std::string>("prefixME")),
+      cloneME_(_ps.getUntrackedParameter<bool>("cloneME")),
+      verbose_(_ps.getUntrackedParameter<bool>("verbose")),
+      debug_(_ps.getUntrackedParameter<bool>("debug")) {}
 
-void
-ESClient::setup(DQMStore::IBooker& _ibooker)
-{
-  if(initialized_) return;
+void ESClient::setup(DQMStore::IBooker &_ibooker) {
+  if (initialized_)
+    return;
   book(_ibooker);
   initialized_ = true;
 }
diff --git a/DQM/EcalPreshowerMonitorClient/src/ESIntegrityClient.cc b/DQM/EcalPreshowerMonitorClient/src/ESIntegrityClient.cc
index e389e2feec911..c0c1c1e0701ae 100644
--- a/DQM/EcalPreshowerMonitorClient/src/ESIntegrityClient.cc
+++ b/DQM/EcalPreshowerMonitorClient/src/ESIntegrityClient.cc
@@ -1,49 +1,48 @@
 #include "DQM/EcalPreshowerMonitorClient/interface/ESIntegrityClient.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include <memory>
-#include <iostream>
 #include <fstream>
 #include <iomanip>
+#include <iostream>
+#include <memory>
 
 using namespace std;
 
-ESIntegrityClient::ESIntegrityClient(const edm::ParameterSet& ps) :
-  ESClient(ps),
-  hFED_(nullptr),
-  hFiberOff_(nullptr),
-  hFiberBadStatus_(nullptr),
-  hKF1_(nullptr),
-  hKF2_(nullptr),
-  hKBC_(nullptr),
-  hKEC_(nullptr), 
-  hL1ADiff_(nullptr),
-  hBXDiff_(nullptr),
-  hOrbitNumberDiff_(nullptr),
-  hSLinkCRCErr_(nullptr)
-{
+ESIntegrityClient::ESIntegrityClient(const edm::ParameterSet &ps)
+    : ESClient(ps),
+      hFED_(nullptr),
+      hFiberOff_(nullptr),
+      hFiberBadStatus_(nullptr),
+      hKF1_(nullptr),
+      hKF2_(nullptr),
+      hKBC_(nullptr),
+      hKEC_(nullptr),
+      hL1ADiff_(nullptr),
+      hBXDiff_(nullptr),
+      hOrbitNumberDiff_(nullptr),
+      hSLinkCRCErr_(nullptr) {
   // read in look-up table
-  for (int i=0; i<2; ++i) 
-    for (int j=0; j<2; ++j) 
-      for (int k=0; k<40; ++k) 
-	for (int m=0; m<40; ++m) {
-	  fed_[i][j][k][m] = -1; 
-	  kchip_[i][j][k][m] = -1;
+  for (int i = 0; i < 2; ++i)
+    for (int j = 0; j < 2; ++j)
+      for (int k = 0; k < 40; ++k)
+        for (int m = 0; m < 40; ++m) {
+          fed_[i][j][k][m] = -1;
+          kchip_[i][j][k][m] = -1;
           fiber_[i][j][k][m] = -1;
-	}
+        }
 
-  for (int i=0; i<56; ++i) {
+  for (int i = 0; i < 56; ++i) {
     fedStatus_[i] = -1;
     syncStatus_[i] = -1;
     slinkCRCStatus_[i] = -1;
-    for (int j=0; j<36; ++j)
+    for (int j = 0; j < 36; ++j)
       fiberStatus_[i][j] = -1;
   }
 
-  for(int i=0; i<2; ++i)
-    for(int j=0; j<2; ++j){
+  for (int i = 0; i < 2; ++i)
+    for (int j = 0; j < 2; ++j) {
       meFED_[i][j] = nullptr;
       meKCHIP_[i][j] = nullptr;
     }
@@ -53,57 +52,53 @@ ESIntegrityClient::ESIntegrityClient(const edm::ParameterSet& ps) :
   int nLines, z, iz, ip, ix, iy, fed, kchip, pace, bundle, fiber, optorx;
   ifstream file(lutPath);
 
-  if( file.is_open() ) {
-    
+  if (file.is_open()) {
     file >> nLines;
-    
-    for (int i=0; i<nLines; ++i) {
-      file>> iz >> ip >> ix >> iy >> fed >> kchip >> pace >> bundle >> fiber >> optorx;
-      
-      z = (iz==-1) ? 2:iz;
-      fed_[z-1][ip-1][ix-1][iy-1] = fed;
-      kchip_[z-1][ip-1][ix-1][iy-1] = kchip;
-      fiber_[z-1][ip-1][ix-1][iy-1] = (fiber-1)+(optorx-1)*12;
+
+    for (int i = 0; i < nLines; ++i) {
+      file >> iz >> ip >> ix >> iy >> fed >> kchip >> pace >> bundle >> fiber >> optorx;
+
+      z = (iz == -1) ? 2 : iz;
+      fed_[z - 1][ip - 1][ix - 1][iy - 1] = fed;
+      kchip_[z - 1][ip - 1][ix - 1][iy - 1] = kchip;
+      fiber_[z - 1][ip - 1][ix - 1][iy - 1] = (fiber - 1) + (optorx - 1) * 12;
     }
 
     file.close();
-  } 
-  else {
-    cout<<"ESIntegrityClient : Look up table file can not be found in "<<lutPath<<endl;
+  } else {
+    cout << "ESIntegrityClient : Look up table file can not be found in " << lutPath << endl;
   }
 }
 
-ESIntegrityClient::~ESIntegrityClient() {
-}
-
-void ESIntegrityClient::book(DQMStore::IBooker& _ibooker) {
+ESIntegrityClient::~ESIntegrityClient() {}
 
+void ESIntegrityClient::book(DQMStore::IBooker &_ibooker) {
   char histo[200];
 
-  _ibooker.setCurrentFolder( prefixME_ + "/ESIntegrityClient" );
+  _ibooker.setCurrentFolder(prefixME_ + "/ESIntegrityClient");
 
-  for (int i=0 ; i<2; ++i) 
-    for (int j=0 ; j<2; ++j) {
-      int iz = (i==0)? 1:-1;
-      snprintf(histo, 200, "ES Integrity Summary 1 Z %d P %d", iz, j+1);
+  for (int i = 0; i < 2; ++i)
+    for (int j = 0; j < 2; ++j) {
+      int iz = (i == 0) ? 1 : -1;
+      snprintf(histo, 200, "ES Integrity Summary 1 Z %d P %d", iz, j + 1);
       meFED_[i][j] = _ibooker.book2D(histo, histo, 40, 0.5, 40.5, 40, 0.5, 40.5);
       meFED_[i][j]->setAxisTitle("Si X", 1);
       meFED_[i][j]->setAxisTitle("Si Y", 2);
-      
-      snprintf(histo, 200, "ES Integrity Summary 2 Z %d P %d", iz, j+1);
+
+      snprintf(histo, 200, "ES Integrity Summary 2 Z %d P %d", iz, j + 1);
       meKCHIP_[i][j] = _ibooker.book2D(histo, histo, 40, 0.5, 40.5, 40, 0.5, 40.5);
       meKCHIP_[i][j]->setAxisTitle("Si X", 1);
       meKCHIP_[i][j]->setAxisTitle("Si Y", 2);
     }
 }
 
-void ESIntegrityClient::endLumiAnalyze(DQMStore::IGetter& _igetter) {
-
+void ESIntegrityClient::endLumiAnalyze(DQMStore::IGetter &_igetter) {
   double nDI_FedErr[56];
-  for (int i=0; i<56; ++i) nDI_FedErr[i] = 0;
+  for (int i = 0; i < 56; ++i)
+    nDI_FedErr[i] = 0;
+
+  MonitorElement *me = nullptr;
 
-  MonitorElement* me = nullptr;
-  
   me = _igetter.get(prefixME_ + "/ESIntegrityTask/ES FEDs used for data taking");
   hFED_ = getHisto(me, cloneME_, hFED_);
 
@@ -114,167 +109,170 @@ void ESIntegrityClient::endLumiAnalyze(DQMStore::IGetter& _igetter) {
   hFiberBadStatus_ = getHisto(me, cloneME_, hFiberBadStatus_);
 
   me = _igetter.get(prefixME_ + "/ESIntegrityTask/ES SLink CRC Errors");
-  hSLinkCRCErr_ = getHisto(me, cloneME_, hSLinkCRCErr_); 
+  hSLinkCRCErr_ = getHisto(me, cloneME_, hSLinkCRCErr_);
 
   int xval = 0;
   int nevFEDs = 0;
   if (hFED_) {
-    for (int i=1; i<=56; ++i) 
+    for (int i = 1; i <= 56; ++i)
       if (nevFEDs < hFED_->GetBinContent(i))
-	nevFEDs = (int) hFED_->GetBinContent(i);
+        nevFEDs = (int)hFED_->GetBinContent(i);
   }
 
   // FED integrity
-  for (int i=1; i<=56; ++i) {
+  for (int i = 1; i <= 56; ++i) {
     if (hFED_) {
-      if (hFED_->GetBinContent(i) > 0) 
-	fedStatus_[i-1] = 1;      
+      if (hFED_->GetBinContent(i) > 0)
+        fedStatus_[i - 1] = 1;
     }
     if (hSLinkCRCErr_) {
-      if (hSLinkCRCErr_->GetBinContent(i) > 0) 
-	slinkCRCStatus_[i-1] = 1;
+      if (hSLinkCRCErr_->GetBinContent(i) > 0)
+        slinkCRCStatus_[i - 1] = 1;
     }
-    for (int j=0; j<36; ++j) {
+    for (int j = 0; j < 36; ++j) {
       if (hFiberBadStatus_) {
-	if (hFiberBadStatus_->GetBinContent(i, j+1) > 0) 
-	  fiberStatus_[i-1][j] = 2; // bad
-	else 
-	  fiberStatus_[i-1][j] = 1; // good
+        if (hFiberBadStatus_->GetBinContent(i, j + 1) > 0)
+          fiberStatus_[i - 1][j] = 2;  // bad
+        else
+          fiberStatus_[i - 1][j] = 1;  // good
       }
-      if (hFiberOff_) 
-	if (hFiberOff_->GetBinContent(i, j+1) > 0) {
-	  fiberStatus_[i-1][j] = 0; // off
-	}
+      if (hFiberOff_)
+        if (hFiberOff_->GetBinContent(i, j + 1) > 0) {
+          fiberStatus_[i - 1][j] = 0;  // off
+        }
     }
   }
 
   // obtain MEs from ESRawDataTask
   me = _igetter.get(prefixME_ + "/ESRawDataTask/ES L1A DCC errors");
-  hL1ADiff_ = getHisto(me, cloneME_, hL1ADiff_); 
+  hL1ADiff_ = getHisto(me, cloneME_, hL1ADiff_);
 
   me = _igetter.get(prefixME_ + "/ESRawDataTask/ES BX DCC errors");
-  hBXDiff_ = getHisto(me, cloneME_, hBXDiff_); 
+  hBXDiff_ = getHisto(me, cloneME_, hBXDiff_);
 
   me = _igetter.get(prefixME_ + "/ESRawDataTask/ES Orbit Number DCC errors");
-  hOrbitNumberDiff_ = getHisto(me, cloneME_, hOrbitNumberDiff_); 
+  hOrbitNumberDiff_ = getHisto(me, cloneME_, hOrbitNumberDiff_);
 
-  for (int i=1; i<=56; ++i) {
+  for (int i = 1; i <= 56; ++i) {
     if (hL1ADiff_ && hBXDiff_) {
       if (hL1ADiff_->GetBinContent(i) > 0 || hBXDiff_->GetBinContent(i) > 0) {
-	syncStatus_[i-1] = 1;
-	if (hL1ADiff_->GetBinContent(i) > nDI_FedErr[i-1]) nDI_FedErr[i-1] = hL1ADiff_->GetBinContent(i);
-	if (hBXDiff_->GetBinContent(i) > nDI_FedErr[i-1]) nDI_FedErr[i-1] = hBXDiff_->GetBinContent(i);
+        syncStatus_[i - 1] = 1;
+        if (hL1ADiff_->GetBinContent(i) > nDI_FedErr[i - 1])
+          nDI_FedErr[i - 1] = hL1ADiff_->GetBinContent(i);
+        if (hBXDiff_->GetBinContent(i) > nDI_FedErr[i - 1])
+          nDI_FedErr[i - 1] = hBXDiff_->GetBinContent(i);
       }
     }
-    //if (hOrbitNumberDiff_->GetBinContent(i) > 0) syncStatus_[i-1] = 1;
+    // if (hOrbitNumberDiff_->GetBinContent(i) > 0) syncStatus_[i-1] = 1;
   }
 
   // KCHIP integrity
   me = _igetter.get(prefixME_ + "/ESIntegrityTask/ES KChip Flag 1 Error codes");
-  hKF1_ = getHisto(me, cloneME_, hKF1_); 
+  hKF1_ = getHisto(me, cloneME_, hKF1_);
 
   me = _igetter.get(prefixME_ + "/ESIntegrityTask/ES KChip Flag 2 Error codes");
-  hKF2_ = getHisto(me, cloneME_, hKF2_); 
+  hKF2_ = getHisto(me, cloneME_, hKF2_);
 
   me = _igetter.get(prefixME_ + "/ESIntegrityTask/ES KChip BC mismatch with OptoRX");
-  hKBC_ = getHisto(me, cloneME_, hKBC_); 
+  hKBC_ = getHisto(me, cloneME_, hKBC_);
 
   me = _igetter.get(prefixME_ + "/ESIntegrityTask/ES KChip EC mismatch with OptoRX");
-  hKEC_ = getHisto(me, cloneME_, hKEC_); 
+  hKEC_ = getHisto(me, cloneME_, hKEC_);
 
   Int_t kchip_xval[1550];
-  for (int i=0; i<1550; ++i) {
-
+  for (int i = 0; i < 1550; ++i) {
     xval = 3;
     Int_t kErr = 0;
-    for (int j=1; j<16; ++j) { 
+    for (int j = 1; j < 16; ++j) {
       if (hKF1_) {
-	if (hKF1_->GetBinContent(i, j+1)>0) {
-	  xval = 2;
-	  kErr++;
-	}
+        if (hKF1_->GetBinContent(i, j + 1) > 0) {
+          xval = 2;
+          kErr++;
+        }
       }
       if (hKF2_) {
-	if (hKF2_->GetBinContent(i, j+1)>0) {
-	  xval = 4;
-	  kErr++;
-	}
+        if (hKF2_->GetBinContent(i, j + 1) > 0) {
+          xval = 4;
+          kErr++;
+        }
       }
     }
     if (hKBC_) {
-      if (hKBC_->GetBinContent(i)>0) {
-	xval = 5;
-	kErr++;
-      } 
+      if (hKBC_->GetBinContent(i) > 0) {
+        xval = 5;
+        kErr++;
+      }
     }
     if (hKEC_) {
-      if (hKEC_->GetBinContent(i)>0) {
-	xval = 6;
-	kErr++;
-      } 
+      if (hKEC_->GetBinContent(i) > 0) {
+        xval = 6;
+        kErr++;
+      }
     }
-    if (kErr>1) xval = 7; 
+    if (kErr > 1)
+      xval = 7;
     kchip_xval[i] = xval;
   }
 
   // detailed KCHIP summary (i.e. summary 2)
-  for (int iz=0; iz<2; ++iz) 
-    for (int ip=0; ip<2; ++ip)
-      for (int ix=0; ix<40; ++ix)
-	for (int iy=0; iy<40; ++iy) {
-	  if (fed_[iz][ip][ix][iy] == -1) continue;
-	  if (fedStatus_[fed_[iz][ip][ix][iy]-520]==-1 || fiberStatus_[fed_[iz][ip][ix][iy]-520][fiber_[iz][ip][ix][iy]] == 0)
-	    kchip_xval[kchip_[iz][ip][ix][iy]-1] = 0;
-	  if ((kchip_[iz][ip][ix][iy]-2) >= 0) 
-	    meKCHIP_[iz][ip]->setBinContent(ix+1, iy+1, kchip_xval[kchip_[iz][ip][ix][iy]-2]); 
-	}
-
-  // FED, Fiber, KCHIP summary (i.e. summary 1) 
+  for (int iz = 0; iz < 2; ++iz)
+    for (int ip = 0; ip < 2; ++ip)
+      for (int ix = 0; ix < 40; ++ix)
+        for (int iy = 0; iy < 40; ++iy) {
+          if (fed_[iz][ip][ix][iy] == -1)
+            continue;
+          if (fedStatus_[fed_[iz][ip][ix][iy] - 520] == -1 ||
+              fiberStatus_[fed_[iz][ip][ix][iy] - 520][fiber_[iz][ip][ix][iy]] == 0)
+            kchip_xval[kchip_[iz][ip][ix][iy] - 1] = 0;
+          if ((kchip_[iz][ip][ix][iy] - 2) >= 0)
+            meKCHIP_[iz][ip]->setBinContent(ix + 1, iy + 1, kchip_xval[kchip_[iz][ip][ix][iy] - 2]);
+        }
+
+  // FED, Fiber, KCHIP summary (i.e. summary 1)
   Int_t nErr = 0;
-  for (int iz=0; iz<2; ++iz) 
-    for (int ip=0; ip<2; ++ip)
-      for (int ix=0; ix<40; ++ix)
-	for (int iy=0; iy<40; ++iy) {
-
-	  if (fed_[iz][ip][ix][iy] == -1) continue;
-	  nErr = 0;
-
-	  if (fedStatus_[fed_[iz][ip][ix][iy]-520] == 1) {
-
-	    if (hFED_) {
-	      if (hFED_->GetBinContent(fed_[iz][ip][ix][iy]-520+1) == nevFEDs) 
-		xval = 3;
-	      else {
-		xval = 4; // FED problem
-		nErr++;
-	      }
-	    }
-
-	    if (fiberStatus_[fed_[iz][ip][ix][iy]-520][fiber_[iz][ip][ix][iy]] == 2) {
-	      xval = 2; // fiber problem
-	      nErr++;
-	    }
-	    if (fiberStatus_[fed_[iz][ip][ix][iy]-520][fiber_[iz][ip][ix][iy]] == 0) {
-	      xval = 0; // fiber off
-	    } 
-	    if (kchip_xval[kchip_[iz][ip][ix][iy]-1] != 3 && kchip_xval[kchip_[iz][ip][ix][iy]-1] != 0) {
-	      xval = 5; // kchip problem
-	      nErr++;
-	    }
-	    if (syncStatus_[fed_[iz][ip][ix][iy]-520] == 1) {
-	      xval = 6;
-	      nErr++;
-	    }
-	    if (slinkCRCStatus_[fed_[iz][ip][ix][iy]-520] == 1) {
-	      xval = 8;
-	      nErr++;
-	    }
-	    if (nErr > 1) xval = 7;
-	  } else if (fedStatus_[fed_[iz][ip][ix][iy]-520] == -1) {
-	    xval = 0;
-	  } 
-	  
-	  meFED_[iz][ip]->setBinContent(ix+1, iy+1, xval); 
-	}
-  
+  for (int iz = 0; iz < 2; ++iz)
+    for (int ip = 0; ip < 2; ++ip)
+      for (int ix = 0; ix < 40; ++ix)
+        for (int iy = 0; iy < 40; ++iy) {
+          if (fed_[iz][ip][ix][iy] == -1)
+            continue;
+          nErr = 0;
+
+          if (fedStatus_[fed_[iz][ip][ix][iy] - 520] == 1) {
+            if (hFED_) {
+              if (hFED_->GetBinContent(fed_[iz][ip][ix][iy] - 520 + 1) == nevFEDs)
+                xval = 3;
+              else {
+                xval = 4;  // FED problem
+                nErr++;
+              }
+            }
+
+            if (fiberStatus_[fed_[iz][ip][ix][iy] - 520][fiber_[iz][ip][ix][iy]] == 2) {
+              xval = 2;  // fiber problem
+              nErr++;
+            }
+            if (fiberStatus_[fed_[iz][ip][ix][iy] - 520][fiber_[iz][ip][ix][iy]] == 0) {
+              xval = 0;  // fiber off
+            }
+            if (kchip_xval[kchip_[iz][ip][ix][iy] - 1] != 3 && kchip_xval[kchip_[iz][ip][ix][iy] - 1] != 0) {
+              xval = 5;  // kchip problem
+              nErr++;
+            }
+            if (syncStatus_[fed_[iz][ip][ix][iy] - 520] == 1) {
+              xval = 6;
+              nErr++;
+            }
+            if (slinkCRCStatus_[fed_[iz][ip][ix][iy] - 520] == 1) {
+              xval = 8;
+              nErr++;
+            }
+            if (nErr > 1)
+              xval = 7;
+          } else if (fedStatus_[fed_[iz][ip][ix][iy] - 520] == -1) {
+            xval = 0;
+          }
+
+          meFED_[iz][ip]->setBinContent(ix + 1, iy + 1, xval);
+        }
 }
diff --git a/DQM/EcalPreshowerMonitorClient/src/ESPedestalClient.cc b/DQM/EcalPreshowerMonitorClient/src/ESPedestalClient.cc
index a906125902622..1574758aaa495 100644
--- a/DQM/EcalPreshowerMonitorClient/src/ESPedestalClient.cc
+++ b/DQM/EcalPreshowerMonitorClient/src/ESPedestalClient.cc
@@ -1,132 +1,126 @@
 #include "DQM/EcalPreshowerMonitorClient/interface/ESPedestalClient.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include <memory>
-#include <iostream>
 #include <fstream>
+#include <iostream>
+#include <memory>
 #include <string>
 
 using namespace std;
 
-ESPedestalClient::ESPedestalClient(const edm::ParameterSet& ps) :
-  ESClient(ps),
-  fitPedestal_(ps.getUntrackedParameter<bool>("fitPedestal")),
-  fg_(new TF1("fg", "gaus")),
-  senZ_(),
-  senP_(),
-  senX_(),
-  senY_()
-{
-  for (int i=0; i<2; i++) 
-    for (int j=0; j<2; j++) 
-      for (int k=0; k<40; k++) 
-	for (int m=0; m<40; m++) {
-	  hPed_[i][j][k][m] = nullptr;
-	  hTotN_[i][j][k][m] = nullptr;
-	}
-
-   std::string lutPath(ps.getUntrackedParameter<edm::FileInPath>("LookupTable").fullPath());
-
-   // read in look-up table
-   int nLines, iz, ip, ix, iy, fed, kchip, pace, bundle, fiber, optorx;
-   ifstream file(lutPath);
-
-   if( file.is_open() ) {
-
-      file >> nLines;
-
-      for (int i=0; i<nLines; ++i) {
-	 file>> iz >> ip >> ix >> iy >> fed >> kchip >> pace >> bundle >> fiber >> optorx;
-
-	 senZ_.push_back(iz);
-	 senP_.push_back(ip);
-	 senX_.push_back(ix);
-	 senY_.push_back(iy);
-      }
-
-      file.close();
-   } else {
-      cout<<"ESPedestalClient : Look up table file can not be found in "<<lutPath<<endl;
-   }
-}
-
-ESPedestalClient::~ESPedestalClient() {
-  delete fg_;
+ESPedestalClient::ESPedestalClient(const edm::ParameterSet &ps)
+    : ESClient(ps),
+      fitPedestal_(ps.getUntrackedParameter<bool>("fitPedestal")),
+      fg_(new TF1("fg", "gaus")),
+      senZ_(),
+      senP_(),
+      senX_(),
+      senY_() {
+  for (int i = 0; i < 2; i++)
+    for (int j = 0; j < 2; j++)
+      for (int k = 0; k < 40; k++)
+        for (int m = 0; m < 40; m++) {
+          hPed_[i][j][k][m] = nullptr;
+          hTotN_[i][j][k][m] = nullptr;
+        }
+
+  std::string lutPath(ps.getUntrackedParameter<edm::FileInPath>("LookupTable").fullPath());
+
+  // read in look-up table
+  int nLines, iz, ip, ix, iy, fed, kchip, pace, bundle, fiber, optorx;
+  ifstream file(lutPath);
+
+  if (file.is_open()) {
+    file >> nLines;
+
+    for (int i = 0; i < nLines; ++i) {
+      file >> iz >> ip >> ix >> iy >> fed >> kchip >> pace >> bundle >> fiber >> optorx;
+
+      senZ_.push_back(iz);
+      senP_.push_back(ip);
+      senX_.push_back(ix);
+      senY_.push_back(iy);
+    }
+
+    file.close();
+  } else {
+    cout << "ESPedestalClient : Look up table file can not be found in " << lutPath << endl;
+  }
 }
 
-void ESPedestalClient::endJobAnalyze(DQMStore::IGetter& _igetter) {
-
-   if ( debug_ ) cout << "ESPedestalClient: endJob" << endl;
-
-   // Preform pedestal fit
-   char hname[300];
-   int iz = 0;
-   if (fitPedestal_) {
-
-      if ( verbose_ ) cout<<"ESPedestalClient: Fit Pedestal"<<endl;
-
-      for (unsigned i=0; i<senZ_.size(); ++i) {
-
-	 iz = (senZ_[i]==1) ? 0:1; 
-
-	 for (int is=0; is<32; ++is) {
-
-	    string dirname = prefixME_ + "/ESPedestalTask/";
-	    sprintf(hname, "ADC Z %d P %d X %d Y %d Str %d", senZ_[i], senP_[i], senX_[i], senY_[i], is+1);
-	    MonitorElement *meFit = _igetter.get(dirname+hname);
-
-	    if (meFit==nullptr) continue;
-	    TH1F *rootHisto = meFit->getTH1F();
-
-	    rootHisto->Fit(fg_, "Q", "", 500, 1800);
-	    rootHisto->Fit(fg_, "RQ", "", fg_->GetParameter(1)-2.*fg_->GetParameter(2),fg_->GetParameter(1)+2.*fg_->GetParameter(2));
-	    hPed_[iz][senP_[i]-1][senX_[i]-1][senY_[i]-1]->setBinContent(is+1, (int)(fg_->GetParameter(1)+0.5));
-	    hTotN_[iz][senP_[i]-1][senX_[i]-1][senY_[i]-1]->setBinContent(is+1, fg_->GetParameter(2));
-	 }
-      } 
-
-   } else {
-
-      if ( verbose_ ) cout<<"ESPedestalClient: Use Histogram Mean"<<endl;
-
-      for (unsigned i=0; i<senZ_.size(); ++i) {
+ESPedestalClient::~ESPedestalClient() { delete fg_; }
+
+void ESPedestalClient::endJobAnalyze(DQMStore::IGetter &_igetter) {
+  if (debug_)
+    cout << "ESPedestalClient: endJob" << endl;
+
+  // Preform pedestal fit
+  char hname[300];
+  int iz = 0;
+  if (fitPedestal_) {
+    if (verbose_)
+      cout << "ESPedestalClient: Fit Pedestal" << endl;
+
+    for (unsigned i = 0; i < senZ_.size(); ++i) {
+      iz = (senZ_[i] == 1) ? 0 : 1;
+
+      for (int is = 0; is < 32; ++is) {
+        string dirname = prefixME_ + "/ESPedestalTask/";
+        sprintf(hname, "ADC Z %d P %d X %d Y %d Str %d", senZ_[i], senP_[i], senX_[i], senY_[i], is + 1);
+        MonitorElement *meFit = _igetter.get(dirname + hname);
+
+        if (meFit == nullptr)
+          continue;
+        TH1F *rootHisto = meFit->getTH1F();
+
+        rootHisto->Fit(fg_, "Q", "", 500, 1800);
+        rootHisto->Fit(fg_,
+                       "RQ",
+                       "",
+                       fg_->GetParameter(1) - 2. * fg_->GetParameter(2),
+                       fg_->GetParameter(1) + 2. * fg_->GetParameter(2));
+        hPed_[iz][senP_[i] - 1][senX_[i] - 1][senY_[i] - 1]->setBinContent(is + 1, (int)(fg_->GetParameter(1) + 0.5));
+        hTotN_[iz][senP_[i] - 1][senX_[i] - 1][senY_[i] - 1]->setBinContent(is + 1, fg_->GetParameter(2));
+      }
+    }
 
-	 iz = (senZ_[i]==1) ? 0:1; 
+  } else {
+    if (verbose_)
+      cout << "ESPedestalClient: Use Histogram Mean" << endl;
 
-	 for (int is=0; is<32; ++is) {
+    for (unsigned i = 0; i < senZ_.size(); ++i) {
+      iz = (senZ_[i] == 1) ? 0 : 1;
 
-	    string dirname = prefixME_ + "/ESPedestalTask/";
-	    sprintf(hname, "ADC Z %d P %d X %d Y %d Str %d", senZ_[i], senP_[i], senX_[i], senY_[i], is+1);
-	    MonitorElement *meMean = _igetter.get(dirname+hname);
-	    
-	    if (meMean==nullptr) continue;
-	    TH1F *rootHisto = meMean->getTH1F();
+      for (int is = 0; is < 32; ++is) {
+        string dirname = prefixME_ + "/ESPedestalTask/";
+        sprintf(hname, "ADC Z %d P %d X %d Y %d Str %d", senZ_[i], senP_[i], senX_[i], senY_[i], is + 1);
+        MonitorElement *meMean = _igetter.get(dirname + hname);
 
-	    hPed_[iz][senP_[i]-1][senX_[i]-1][senY_[i]-1]->setBinContent(is+1, (int)(rootHisto->GetMean()+0.5));
-	    hTotN_[iz][senP_[i]-1][senX_[i]-1][senY_[i]-1]->setBinContent(is+1, rootHisto->GetRMS());
+        if (meMean == nullptr)
+          continue;
+        TH1F *rootHisto = meMean->getTH1F();
 
-	 } 
+        hPed_[iz][senP_[i] - 1][senX_[i] - 1][senY_[i] - 1]->setBinContent(is + 1, (int)(rootHisto->GetMean() + 0.5));
+        hTotN_[iz][senP_[i] - 1][senX_[i] - 1][senY_[i] - 1]->setBinContent(is + 1, rootHisto->GetRMS());
       }
-   }
+    }
+  }
 }
 
-void ESPedestalClient::book(DQMStore::IBooker& _ibooker) {
-
-   // define histograms
-   _ibooker.setCurrentFolder(prefixME_+"/ESPedestalClient");
-
-   char hname[300];
-   for (unsigned i=0; i<senZ_.size(); ++i) {
+void ESPedestalClient::book(DQMStore::IBooker &_ibooker) {
+  // define histograms
+  _ibooker.setCurrentFolder(prefixME_ + "/ESPedestalClient");
 
-     int iz = (senZ_[i]==1) ? 0:1;
+  char hname[300];
+  for (unsigned i = 0; i < senZ_.size(); ++i) {
+    int iz = (senZ_[i] == 1) ? 0 : 1;
 
-      sprintf(hname, "Ped Z %d P %d X %d Y %d", senZ_[i], senP_[i], senX_[i], senY_[i]);
-      hPed_[iz][senP_[i]-1][senX_[i]-1][senY_[i]-1] = _ibooker.book1D(hname, hname, 32, 0, 32);
-      
-      sprintf(hname, "Total Noise Z %d P %d X %d Y %d", senZ_[i], senP_[i], senX_[i], senY_[i]);
-      hTotN_[iz][senP_[i]-1][senX_[i]-1][senY_[i]-1] = _ibooker.book1D(hname, hname, 32, 0, 32);
-   }
+    sprintf(hname, "Ped Z %d P %d X %d Y %d", senZ_[i], senP_[i], senX_[i], senY_[i]);
+    hPed_[iz][senP_[i] - 1][senX_[i] - 1][senY_[i] - 1] = _ibooker.book1D(hname, hname, 32, 0, 32);
 
+    sprintf(hname, "Total Noise Z %d P %d X %d Y %d", senZ_[i], senP_[i], senX_[i], senY_[i]);
+    hTotN_[iz][senP_[i] - 1][senX_[i] - 1][senY_[i] - 1] = _ibooker.book1D(hname, hname, 32, 0, 32);
+  }
 }
diff --git a/DQM/EcalPreshowerMonitorClient/src/ESSummaryClient.cc b/DQM/EcalPreshowerMonitorClient/src/ESSummaryClient.cc
index 14fe62872da1c..3fd1941f16242 100644
--- a/DQM/EcalPreshowerMonitorClient/src/ESSummaryClient.cc
+++ b/DQM/EcalPreshowerMonitorClient/src/ESSummaryClient.cc
@@ -1,59 +1,52 @@
-#include <memory>
-#include <iostream>
 #include <fstream>
 #include <iomanip>
+#include <iostream>
+#include <memory>
 
 #include "DQM/EcalPreshowerMonitorClient/interface/ESSummaryClient.h"
 
 using namespace std;
 
-ESSummaryClient::ESSummaryClient(const edm::ParameterSet& ps) :
-  ESClient(ps),
-  meReportSummary_(nullptr),
-  meReportSummaryMap_(nullptr)
-{
-  for(unsigned iZ(0); iZ != 2; ++iZ)
-    for(unsigned iD(0); iD != 2; ++iD)
+ESSummaryClient::ESSummaryClient(const edm::ParameterSet &ps)
+    : ESClient(ps), meReportSummary_(nullptr), meReportSummaryMap_(nullptr) {
+  for (unsigned iZ(0); iZ != 2; ++iZ)
+    for (unsigned iD(0); iD != 2; ++iD)
       meReportSummaryContents_[iZ][iD] = nullptr;
 }
 
-ESSummaryClient::~ESSummaryClient() {
-}
-
-void ESSummaryClient::book(DQMStore::IBooker& _ibooker) {
+ESSummaryClient::~ESSummaryClient() {}
 
-   if ( debug_ ) cout << "ESSummaryClient: setup" << endl;
+void ESSummaryClient::book(DQMStore::IBooker &_ibooker) {
+  if (debug_)
+    cout << "ESSummaryClient: setup" << endl;
 
-   _ibooker.setCurrentFolder( prefixME_ + "/EventInfo" );
+  _ibooker.setCurrentFolder(prefixME_ + "/EventInfo");
 
-   meReportSummary_ = _ibooker.bookFloat("reportSummary");
+  meReportSummary_ = _ibooker.bookFloat("reportSummary");
 
-   _ibooker.setCurrentFolder( prefixME_ + "/EventInfo/reportSummaryContents" );
+  _ibooker.setCurrentFolder(prefixME_ + "/EventInfo/reportSummaryContents");
 
-   char histo[200];
-
-   for (int i=0 ; i<2; ++i){
-      for (int j=0 ; j<2; ++j){
-	 int iz = (i==0)? 1:-1;
-	 sprintf(histo, "EcalPreshower Z %d P %d", iz, j+1);
-         meReportSummaryContents_[i][j] = _ibooker.bookFloat(histo);
-      }
-   }
+  char histo[200];
 
-   _ibooker.setCurrentFolder( prefixME_ + "/EventInfo" );
+  for (int i = 0; i < 2; ++i) {
+    for (int j = 0; j < 2; ++j) {
+      int iz = (i == 0) ? 1 : -1;
+      sprintf(histo, "EcalPreshower Z %d P %d", iz, j + 1);
+      meReportSummaryContents_[i][j] = _ibooker.bookFloat(histo);
+    }
+  }
 
-   meReportSummaryMap_ = _ibooker.book2D("reportSummaryMap", "reportSummaryMap", 80, 0.5, 80.5, 80, 0.5, 80.5);
-   meReportSummaryMap_->setAxisTitle("Si X", 1);
-   meReportSummaryMap_->setAxisTitle("Si Y", 2);
+  _ibooker.setCurrentFolder(prefixME_ + "/EventInfo");
 
+  meReportSummaryMap_ = _ibooker.book2D("reportSummaryMap", "reportSummaryMap", 80, 0.5, 80.5, 80, 0.5, 80.5);
+  meReportSummaryMap_->setAxisTitle("Si X", 1);
+  meReportSummaryMap_->setAxisTitle("Si Y", 2);
 }
 
-void
-ESSummaryClient::fillReportSummary(DQMStore::IGetter& _igetter)
-{
-  for ( int i = 0; i < 80; i++ ) {
-    for ( int j = 0; j < 80; j++ ) {
-      meReportSummaryMap_->setBinContent( i+1, j+1, -1. );
+void ESSummaryClient::fillReportSummary(DQMStore::IGetter &_igetter) {
+  for (int i = 0; i < 80; i++) {
+    for (int j = 0; j < 80; j++) {
+      meReportSummaryMap_->setBinContent(i + 1, j + 1, -1.);
     }
   }
 
@@ -63,83 +56,79 @@ ESSummaryClient::fillReportSummary(DQMStore::IGetter& _igetter)
   float DCC[80][80];
   float eCount;
 
-  MonitorElement* me;
+  MonitorElement *me;
 
-  for (int i=0; i<80; ++i) 
-    for (int j=0; j<80; ++j) {
+  for (int i = 0; i < 80; ++i)
+    for (int j = 0; j < 80; ++j) {
       nDI_FedErr[i][j] = -1;
-      DCC[i][j]=0;
+      DCC[i][j] = 0;
     }
 
-  for (int i=0; i<2; ++i) {
-    for (int j=0; j<2; ++j) {
-
-      int iz = (i==0)? 1:-1;
+  for (int i = 0; i < 2; ++i) {
+    for (int j = 0; j < 2; ++j) {
+      int iz = (i == 0) ? 1 : -1;
 
-      sprintf(histo, "ES Integrity Errors Z %d P %d", iz, j+1);
+      sprintf(histo, "ES Integrity Errors Z %d P %d", iz, j + 1);
       me = _igetter.get(prefixME_ + "/ESIntegrityTask/" + histo);
-      if (me) 
-        for (int x=0; x<40; ++x) 
-          for (int y=0; y<40; ++y) 
-            nDI_FedErr[i*40+x][(1-j)*40+y] = me->getBinContent(x+1, y+1);
-	 
-      sprintf(histo, "ES Integrity Summary 1 Z %d P %d", iz, j+1);
+      if (me)
+        for (int x = 0; x < 40; ++x)
+          for (int y = 0; y < 40; ++y)
+            nDI_FedErr[i * 40 + x][(1 - j) * 40 + y] = me->getBinContent(x + 1, y + 1);
+
+      sprintf(histo, "ES Integrity Summary 1 Z %d P %d", iz, j + 1);
       me = _igetter.get(prefixME_ + "/ESIntegrityClient/" + histo);
       if (me)
-        for (int x=0; x<40; ++x)
-          for (int y=0; y<40; ++y) 
-            DCC[i*40+x][(1-j)*40+y] = me->getBinContent(x+1, y+1);
-	 
-      sprintf(histo, "ES RecHit 2D Occupancy Z %d P %d", iz, j+1);
+        for (int x = 0; x < 40; ++x)
+          for (int y = 0; y < 40; ++y)
+            DCC[i * 40 + x][(1 - j) * 40 + y] = me->getBinContent(x + 1, y + 1);
+
+      sprintf(histo, "ES RecHit 2D Occupancy Z %d P %d", iz, j + 1);
       me = _igetter.get(prefixME_ + "/ESOccupancyTask/" + histo);
       if (me)
-        eCount = me->getBinContent(40,40);
-      else 
+        eCount = me->getBinContent(40, 40);
+      else
         eCount = 1.;
-	 
     }
   }
-   
-  //The global-summary
-  //ReportSummary Map 
+
+  // The global-summary
+  // ReportSummary Map
   //  ES+F  ES-F
   //  ES+R  ES-R
-  float nValidChannels=0; 
-  float nGlobalErrors=0;
-  float nValidChannelsES[2][2]={}; 
-  float nGlobalErrorsES[2][2]={};
-
-  for (int x=0; x<80; ++x) {
-    if (eCount < 1) break; //Fill reportSummaryMap after have 1 event
-    for (int y=0; y<80; ++y) {
-
-      int z = (x<40) ? 0:1;
-      int p = (y>=40) ? 0:1;
-	  
-      if (DCC[x][y]==0.) {
-        meReportSummaryMap_->setBinContent(x+1, y+1, -1.);	  
+  float nValidChannels = 0;
+  float nGlobalErrors = 0;
+  float nValidChannelsES[2][2] = {};
+  float nGlobalErrorsES[2][2] = {};
+
+  for (int x = 0; x < 80; ++x) {
+    if (eCount < 1)
+      break;  // Fill reportSummaryMap after have 1 event
+    for (int y = 0; y < 80; ++y) {
+      int z = (x < 40) ? 0 : 1;
+      int p = (y >= 40) ? 0 : 1;
+
+      if (DCC[x][y] == 0.) {
+        meReportSummaryMap_->setBinContent(x + 1, y + 1, -1.);
       } else {
         if (nDI_FedErr[x][y] >= 0) {
-          meReportSummaryMap_->setBinContent(x+1, y+1, 1-(nDI_FedErr[x][y]/eCount));
-	      
+          meReportSummaryMap_->setBinContent(x + 1, y + 1, 1 - (nDI_FedErr[x][y] / eCount));
+
           nValidChannels++;
-          nGlobalErrors += nDI_FedErr[x][y]/eCount;
-	      
+          nGlobalErrors += nDI_FedErr[x][y] / eCount;
+
           nValidChannelsES[z][p]++;
-          nGlobalErrorsES[z][p] += nDI_FedErr[x][y]/eCount;
-        }
-        else {
-          meReportSummaryMap_->setBinContent(x+1, y+1, -1.);
+          nGlobalErrorsES[z][p] += nDI_FedErr[x][y] / eCount;
+        } else {
+          meReportSummaryMap_->setBinContent(x + 1, y + 1, -1.);
         }
       }
-	  
     }
   }
 
-  for(unsigned iZ(0); iZ != 2; ++iZ){
-    for(unsigned iD(0); iD != 2; ++iD){
+  for (unsigned iZ(0); iZ != 2; ++iZ) {
+    for (unsigned iD(0); iD != 2; ++iD) {
       float reportSummaryES(-1.);
-      if(nValidChannelsES[iZ][iD] != 0)
+      if (nValidChannelsES[iZ][iD] != 0)
         reportSummaryES = 1. - nGlobalErrorsES[iZ][iD] / nValidChannelsES[iZ][iD];
 
       meReportSummaryContents_[iZ][iD]->Fill(reportSummaryES);
@@ -147,36 +136,33 @@ ESSummaryClient::fillReportSummary(DQMStore::IGetter& _igetter)
   }
 
   float reportSummary(-1.);
-  if(nValidChannels != 0)
+  if (nValidChannels != 0)
     reportSummary = 1. - nGlobalErrors / nValidChannels;
-  
+
   meReportSummary_->Fill(reportSummary);
 }
 
-void ESSummaryClient::endLumiAnalyze(DQMStore::IGetter& _igetter) {
-
+void ESSummaryClient::endLumiAnalyze(DQMStore::IGetter &_igetter) {
   fillReportSummary(_igetter);
 
-  // The following overwrites the report summary if LS-based Good Channel Fraction histogram is available
-  // The source is turned off by default in ESIntegrityTask
+  // The following overwrites the report summary if LS-based Good Channel
+  // Fraction histogram is available The source is turned off by default in
+  // ESIntegrityTask
 
-  MonitorElement* source(_igetter.get(prefixME_+"/ESIntegrityTask/ES Good Channel Fraction"));
-  if (!source) return;
+  MonitorElement *source(_igetter.get(prefixME_ + "/ESIntegrityTask/ES Good Channel Fraction"));
+  if (!source)
+    return;
 
   meReportSummary_->Fill(-1.0);
-  for(unsigned iZ(0); iZ != 2; ++iZ)
-    for(unsigned iD(0); iD != 2; ++iD)
+  for (unsigned iZ(0); iZ != 2; ++iZ)
+    for (unsigned iD(0); iD != 2; ++iD)
       meReportSummaryContents_[iZ][iD]->Fill(-1.);
 
-  for (int i=0; i<2; ++i)
-    for (int j=0; j<2; ++j)
-      meReportSummaryContents_[i][j]->Fill(source->getBinContent(i+1, j+1));  
+  for (int i = 0; i < 2; ++i)
+    for (int j = 0; j < 2; ++j)
+      meReportSummaryContents_[i][j]->Fill(source->getBinContent(i + 1, j + 1));
 
-  meReportSummary_->Fill(source->getBinContent(3,3));
+  meReportSummary_->Fill(source->getBinContent(3, 3));
 }
 
-void
-ESSummaryClient::endJobAnalyze(DQMStore::IGetter& _igetter)
-{
-  fillReportSummary(_igetter);
-}
+void ESSummaryClient::endJobAnalyze(DQMStore::IGetter &_igetter) { fillReportSummary(_igetter); }
diff --git a/DQM/EcalPreshowerMonitorClient/src/EcalPreshowerMonitorClient.cc b/DQM/EcalPreshowerMonitorClient/src/EcalPreshowerMonitorClient.cc
index dc9f095878cea..e04816436bfea 100644
--- a/DQM/EcalPreshowerMonitorClient/src/EcalPreshowerMonitorClient.cc
+++ b/DQM/EcalPreshowerMonitorClient/src/EcalPreshowerMonitorClient.cc
@@ -1,72 +1,65 @@
 #include "DQM/EcalPreshowerMonitorClient/interface/EcalPreshowerMonitorClient.h"
 
 #include "DQM/EcalPreshowerMonitorClient/interface/ESClient.h"
-#include "DQM/EcalPreshowerMonitorClient/interface/ESPedestalClient.h"
 #include "DQM/EcalPreshowerMonitorClient/interface/ESIntegrityClient.h"
+#include "DQM/EcalPreshowerMonitorClient/interface/ESPedestalClient.h"
 #include "DQM/EcalPreshowerMonitorClient/interface/ESSummaryClient.h"
 
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
-#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include <memory>
 #include <iostream>
+#include <memory>
 #include <string>
 #include <vector>
 
-EcalPreshowerMonitorClient::EcalPreshowerMonitorClient(const edm::ParameterSet& ps) :
-  debug_(ps.getUntrackedParameter<bool>("debug")),
-  verbose_(ps.getUntrackedParameter<bool>("verbose")),
-  clients_()
-{
-   std::vector<std::string> enabledClients(ps.getUntrackedParameter<std::vector<std::string> >("enabledClients"));
-
-   if ( verbose_ ) {
-      std::cout << " Enabled Clients:";
-      for ( unsigned int i = 0; i < enabledClients.size(); i++ ) {
-	 std::cout << " " << enabledClients[i];
-      }
-      std::cout << std::endl;
-   }
-
-   //Setup Clients
-   if ( find(enabledClients.begin(), enabledClients.end(), "Integrity" ) != enabledClients.end() ){
-      clients_.push_back( new ESIntegrityClient(ps) );
-   }
-
-   if ( find(enabledClients.begin(), enabledClients.end(), "Pedestal" ) != enabledClients.end() ){
-      clients_.push_back( new ESPedestalClient(ps) );
-   }
-
-   if ( find(enabledClients.begin(), enabledClients.end(), "Summary" ) != enabledClients.end() ){
-      clients_.push_back( new ESSummaryClient(ps) );
-   }
+EcalPreshowerMonitorClient::EcalPreshowerMonitorClient(const edm::ParameterSet &ps)
+    : debug_(ps.getUntrackedParameter<bool>("debug")), verbose_(ps.getUntrackedParameter<bool>("verbose")), clients_() {
+  std::vector<std::string> enabledClients(ps.getUntrackedParameter<std::vector<std::string>>("enabledClients"));
 
-}
+  if (verbose_) {
+    std::cout << " Enabled Clients:";
+    for (unsigned int i = 0; i < enabledClients.size(); i++) {
+      std::cout << " " << enabledClients[i];
+    }
+    std::cout << std::endl;
+  }
 
-EcalPreshowerMonitorClient::~EcalPreshowerMonitorClient() {
+  // Setup Clients
+  if (find(enabledClients.begin(), enabledClients.end(), "Integrity") != enabledClients.end()) {
+    clients_.push_back(new ESIntegrityClient(ps));
+  }
 
-   if ( verbose_ ) std::cout << "Finish EcalPreshowerMonitorClient" << std::endl;
+  if (find(enabledClients.begin(), enabledClients.end(), "Pedestal") != enabledClients.end()) {
+    clients_.push_back(new ESPedestalClient(ps));
+  }
 
-   for ( unsigned int i=0; i<clients_.size(); i++ ) {
-      delete clients_[i];
-   }
+  if (find(enabledClients.begin(), enabledClients.end(), "Summary") != enabledClients.end()) {
+    clients_.push_back(new ESSummaryClient(ps));
+  }
+}
 
+EcalPreshowerMonitorClient::~EcalPreshowerMonitorClient() {
+  if (verbose_)
+    std::cout << "Finish EcalPreshowerMonitorClient" << std::endl;
+
+  for (unsigned int i = 0; i < clients_.size(); i++) {
+    delete clients_[i];
+  }
 }
 
 /*static*/
-void
-EcalPreshowerMonitorClient::fillDescriptions(edm::ConfigurationDescriptions& _descs)
-{
+void EcalPreshowerMonitorClient::fillDescriptions(edm::ConfigurationDescriptions &_descs) {
   edm::ParameterSetDescription desc;
 
   std::vector<std::string> clientsDefault;
   clientsDefault.push_back("Integrity");
   clientsDefault.push_back("Pedestal");
   clientsDefault.push_back("Summary");
-  desc.addUntracked<std::vector<std::string> >("enabledClients", clientsDefault);
+  desc.addUntracked<std::vector<std::string>>("enabledClients", clientsDefault);
   desc.addUntracked<edm::FileInPath>("LookupTable");
   desc.addUntracked<std::string>("prefixME", "EcalPreshower");
   desc.addUntracked<bool>("fitPedestal", true);
@@ -77,27 +70,26 @@ EcalPreshowerMonitorClient::fillDescriptions(edm::ConfigurationDescriptions& _de
   _descs.addDefault(desc);
 }
 
-void EcalPreshowerMonitorClient::dqmEndJob(DQMStore::IBooker& _ibooker, DQMStore::IGetter& _igetter) {
-
-   if (debug_) { 
-      std::cout << "EcalPreshowerMonitorClient: endJob" << std::endl;
-   }
-   
-   for ( unsigned int i=0; i<clients_.size(); i++ ) {
-     clients_[i]->setup(_ibooker);
-     clients_[i]->endJobAnalyze(_igetter);
-   }
+void EcalPreshowerMonitorClient::dqmEndJob(DQMStore::IBooker &_ibooker, DQMStore::IGetter &_igetter) {
+  if (debug_) {
+    std::cout << "EcalPreshowerMonitorClient: endJob" << std::endl;
+  }
 
+  for (unsigned int i = 0; i < clients_.size(); i++) {
+    clients_[i]->setup(_ibooker);
+    clients_[i]->endJobAnalyze(_igetter);
+  }
 }
 
-void EcalPreshowerMonitorClient::dqmEndLuminosityBlock(DQMStore::IBooker& _ibooker, DQMStore::IGetter& _igetter, const edm::LuminosityBlock &, const edm::EventSetup &) {
-
-  for ( unsigned int i=0; i<clients_.size(); i++ ) {
+void EcalPreshowerMonitorClient::dqmEndLuminosityBlock(DQMStore::IBooker &_ibooker,
+                                                       DQMStore::IGetter &_igetter,
+                                                       const edm::LuminosityBlock &,
+                                                       const edm::EventSetup &) {
+  for (unsigned int i = 0; i < clients_.size(); i++) {
     clients_[i]->setup(_ibooker);
     clients_[i]->endLumiAnalyze(_igetter);
   }
-   
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(EcalPreshowerMonitorClient);
diff --git a/DQM/HLTEvF/plugins/PSMonitor.cc b/DQM/HLTEvF/plugins/PSMonitor.cc
index 7d879b19458b4..334d3aa86f758 100644
--- a/DQM/HLTEvF/plugins/PSMonitor.cc
+++ b/DQM/HLTEvF/plugins/PSMonitor.cc
@@ -28,97 +28,98 @@ namespace {
   struct Histograms {
     ConcurrentMonitorElement psColumnIndexVsLS;
   };
-}
+}  // namespace
 
 //
 // class declaration
 //
 
-class PSMonitor : public DQMGlobalEDAnalyzer<Histograms>
-{
+class PSMonitor : public DQMGlobalEDAnalyzer<Histograms> {
 public:
-  PSMonitor( const edm::ParameterSet& );
+  PSMonitor(const edm::ParameterSet&);
   ~PSMonitor() override = default;
-  static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
-  static void fillHistoPSetDescription(edm::ParameterSetDescription & pset, int value);
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+  static void fillHistoPSetDescription(edm::ParameterSetDescription& pset, int value);
 
 protected:
-
-  void bookHistograms(DQMStore::ConcurrentBooker &, edm::Run const&, edm::EventSetup const&, Histograms &) const override;
+  void bookHistograms(DQMStore::ConcurrentBooker&, edm::Run const&, edm::EventSetup const&, Histograms&) const override;
   void dqmAnalyze(edm::Event const& event, edm::EventSetup const& setup, Histograms const&) const override;
 
 private:
-
   void getHistoPSet(edm::ParameterSet& pset, MEbinning& mebinning);
 
   std::string folderName_;
 
   edm::EDGetTokenT<GlobalAlgBlkBxCollection> ugtBXToken_;
-  
+
   MEbinning ps_binning_;
   MEbinning ls_binning_;
 };
 
-
-
 // -----------------------------
 //  constructors and destructor
 // -----------------------------
 
-PSMonitor::PSMonitor( const edm::ParameterSet& config ) : 
-  folderName_   (config.getParameter<std::string>("FolderName"))
-  , ugtBXToken_ (consumes<GlobalAlgBlkBxCollection>(config.getParameter<edm::InputTag>("ugtBXInputTag")))
-{
-  edm::ParameterSet histoPSet    = config.getParameter<edm::ParameterSet>("histoPSet");
+PSMonitor::PSMonitor(const edm::ParameterSet& config)
+    : folderName_(config.getParameter<std::string>("FolderName")),
+      ugtBXToken_(consumes<GlobalAlgBlkBxCollection>(config.getParameter<edm::InputTag>("ugtBXInputTag"))) {
+  edm::ParameterSet histoPSet = config.getParameter<edm::ParameterSet>("histoPSet");
   edm::ParameterSet psColumnPSet = histoPSet.getParameter<edm::ParameterSet>("psColumnPSet");
-  edm::ParameterSet lsPSet       = histoPSet.getParameter<edm::ParameterSet>("lsPSet");
+  edm::ParameterSet lsPSet = histoPSet.getParameter<edm::ParameterSet>("lsPSet");
 
   getHistoPSet(psColumnPSet, ps_binning_);
-  getHistoPSet(lsPSet,       ls_binning_);
-
+  getHistoPSet(lsPSet, ls_binning_);
 }
 
-void PSMonitor::getHistoPSet(edm::ParameterSet& pset, MEbinning& mebinning)
-{
+void PSMonitor::getHistoPSet(edm::ParameterSet& pset, MEbinning& mebinning) {
   mebinning.nbins = pset.getParameter<int32_t>("nbins");
-  mebinning.xmin  = 0.;
-  mebinning.xmax  = double(pset.getParameter<int32_t>("nbins"));
+  mebinning.xmin = 0.;
+  mebinning.xmax = double(pset.getParameter<int32_t>("nbins"));
 }
 
-
-void PSMonitor::bookHistograms(DQMStore::ConcurrentBooker & booker, edm::Run const& run, edm::EventSetup const& setup, Histograms & histograms) const
-{  
-  
+void PSMonitor::bookHistograms(DQMStore::ConcurrentBooker& booker,
+                               edm::Run const& run,
+                               edm::EventSetup const& setup,
+                               Histograms& histograms) const {
   std::string histname, histtitle;
 
-  std::string currentFolder = folderName_ ;
+  std::string currentFolder = folderName_;
   booker.setCurrentFolder(currentFolder);
 
-  std::vector<std::string> const& psLabels = edm::Service<edm::service::PrescaleService>()->getLvl1Labels();
-  int nbins   = ( !psLabels.empty() ? psLabels.size()         : ps_binning_.nbins );
-  double xmin = ( !psLabels.empty() ? 0.                      : ps_binning_.xmin  );
-  double xmax = ( !psLabels.empty() ? double(psLabels.size()) : ps_binning_.xmax  );
+  int nbins;
+  double xmin, xmax;
+  std::vector<std::string> labels;
+  edm::Service<edm::service::PrescaleService> prescaleService;
+  if (prescaleService.isAvailable() and not prescaleService->getLvl1Labels().empty()) {
+    labels = prescaleService->getLvl1Labels();
+    nbins = labels.size();
+    xmin = 0.;
+    xmax = double(labels.size());
+  } else {
+    nbins = ps_binning_.nbins;
+    xmin = ps_binning_.xmin;
+    xmax = ps_binning_.xmax;
+    labels.resize(nbins, "");
+  }
 
-  histname = "psColumnIndexVsLS"; histtitle = "PS column index vs LS";
-  histograms.psColumnIndexVsLS = booker.book2D(histname, histtitle, 
-                                      ls_binning_.nbins, ls_binning_.xmin, ls_binning_.xmax,
-                                      nbins, xmin, xmax);
+  histname = "psColumnIndexVsLS";
+  histtitle = "PS column index vs LS";
+  histograms.psColumnIndexVsLS =
+      booker.book2D(histname, histtitle, ls_binning_.nbins, ls_binning_.xmin, ls_binning_.xmax, nbins, xmin, xmax);
   histograms.psColumnIndexVsLS.setAxisTitle("LS", 1);
   histograms.psColumnIndexVsLS.setAxisTitle("PS column index", 2);
-  
-  int ibin = 1;
-  for ( auto l : psLabels ) {
-    histograms.psColumnIndexVsLS.setBinLabel(ibin, l, 2);
-    ibin++;
-  }
 
+  int bin = 1;
+  for (auto const& l : labels) {
+    histograms.psColumnIndexVsLS.setBinLabel(bin, l, 2);
+    bin++;
+  }
 }
 
-void PSMonitor::dqmAnalyze(edm::Event const& event, edm::EventSetup const& setup, Histograms const& histograms) const
-{
+void PSMonitor::dqmAnalyze(edm::Event const& event, edm::EventSetup const& setup, Histograms const& histograms) const {
   int ls = event.id().luminosityBlock();
   int psColumn = -1;
-  
+
   edm::Handle<GlobalAlgBlkBxCollection> ugtBXhandle;
   event.getByToken(ugtBXToken_, ugtBXhandle);
   if (ugtBXhandle.isValid() and not ugtBXhandle->isEmpty(0)) {
@@ -127,16 +128,14 @@ void PSMonitor::dqmAnalyze(edm::Event const& event, edm::EventSetup const& setup
   histograms.psColumnIndexVsLS.fill(ls, psColumn);
 }
 
-void PSMonitor::fillHistoPSetDescription(edm::ParameterSetDescription & pset, int value)
-{
+void PSMonitor::fillHistoPSetDescription(edm::ParameterSetDescription& pset, int value) {
   pset.add<int>("nbins", value);
 }
 
-void PSMonitor::fillDescriptions(edm::ConfigurationDescriptions & descriptions)
-{
+void PSMonitor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
-  desc.add<edm::InputTag>( "ugtBXInputTag", edm::InputTag("hltGtStage2Digis") );
-  desc.add<std::string>  ( "FolderName",    "HLT/PSMonitoring" );
+  desc.add<edm::InputTag>("ugtBXInputTag", edm::InputTag("hltGtStage2Digis"));
+  desc.add<std::string>("FolderName", "HLT/PSMonitoring");
 
   edm::ParameterSetDescription histoPSet;
 
diff --git a/DQM/HLXMonitor/interface/HLXMonitor.h b/DQM/HLXMonitor/interface/HLXMonitor.h
old mode 100755
new mode 100644
index 4166f5941b766..284058ef8d15d
--- a/DQM/HLXMonitor/interface/HLXMonitor.h
+++ b/DQM/HLXMonitor/interface/HLXMonitor.h
@@ -21,11 +21,11 @@ Description: DQM Source for HLX histograms
 #define _HLXMONITOR_H_
 
 // system include fileshlx_dqm_sourceclient-live.cfg
+#include <cstdlib>
+#include <iomanip>
 #include <iostream>
-#include <string>
 #include <memory>
-#include <iomanip>
-#include <cstdlib>
+#include <string>
 #include <sys/time.h>
 
 // user include files
@@ -36,177 +36,174 @@ Description: DQM Source for HLX histograms
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include "RecoLuminosity/TCPReceiver/interface/TCPReceiver.h"
 #include "RecoLuminosity/TCPReceiver/interface/LumiStructures.hh"
+#include "RecoLuminosity/TCPReceiver/interface/TCPReceiver.h"
 
 class HLXMonitor : public DQMEDAnalyzer {
- public:
+public:
   typedef HCAL_HLX::LUMI_SECTION LUMI_SECTION;
   typedef HCAL_HLX::TCPReceiver TCPReceiver;
-  explicit HLXMonitor(const edm::ParameterSet&);
+  explicit HLXMonitor(const edm::ParameterSet &);
   ~HLXMonitor() override;
 
- private:
-  void bookHistograms(DQMStore::IBooker&, edm::Run const&,
-                      edm::EventSetup const&) override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+private:
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
   void connectHLXTCP();
 
-  void SetupHists(DQMStore::IBooker&);
-  void SetupEventInfo(DQMStore::IBooker&);
+  void SetupHists(DQMStore::IBooker &);
+  void SetupEventInfo(DQMStore::IBooker &);
 
-  void FillHistograms(const LUMI_SECTION&);
-  void FillHistoHFCompare(const LUMI_SECTION&);
+  void FillHistograms(const LUMI_SECTION &);
+  void FillHistoHFCompare(const LUMI_SECTION &);
   void FillReportSummary();
-  void FillEventInfo(const LUMI_SECTION&, const edm::Event& e);
+  void FillEventInfo(const LUMI_SECTION &, const edm::Event &e);
 
   void ResetAll();
 
   void EndRun();
 
-  double getUTCtime(timeval* a, timeval* b = nullptr);
+  double getUTCtime(timeval *a, timeval *b = nullptr);
 
   // ----------member data ---------------------------
   TCPReceiver HLXTCP;
 
-  MonitorElement* Set1Below[36];
-  MonitorElement* Set1Between[36];
-  MonitorElement* Set1Above[36];
-  MonitorElement* Set2Below[36];
-  MonitorElement* Set2Between[36];
-  MonitorElement* Set2Above[36];
-  MonitorElement* ETSum[36];
-
-  MonitorElement* HFCompareEtSum;
-  MonitorElement* HFCompareOccBelowSet1;
-  MonitorElement* HFCompareOccBetweenSet1;
-  MonitorElement* HFCompareOccAboveSet1;
-  MonitorElement* HFCompareOccBelowSet2;
-  MonitorElement* HFCompareOccBetweenSet2;
-  MonitorElement* HFCompareOccAboveSet2;
-
-  MonitorElement* AvgEtSum;
-  MonitorElement* AvgOccBelowSet1;
-  MonitorElement* AvgOccBetweenSet1;
-  MonitorElement* AvgOccAboveSet1;
-  MonitorElement* AvgOccBelowSet2;
-  MonitorElement* AvgOccBetweenSet2;
-  MonitorElement* AvgOccAboveSet2;
+  MonitorElement *Set1Below[36];
+  MonitorElement *Set1Between[36];
+  MonitorElement *Set1Above[36];
+  MonitorElement *Set2Below[36];
+  MonitorElement *Set2Between[36];
+  MonitorElement *Set2Above[36];
+  MonitorElement *ETSum[36];
+
+  MonitorElement *HFCompareEtSum;
+  MonitorElement *HFCompareOccBelowSet1;
+  MonitorElement *HFCompareOccBetweenSet1;
+  MonitorElement *HFCompareOccAboveSet1;
+  MonitorElement *HFCompareOccBelowSet2;
+  MonitorElement *HFCompareOccBetweenSet2;
+  MonitorElement *HFCompareOccAboveSet2;
+
+  MonitorElement *AvgEtSum;
+  MonitorElement *AvgOccBelowSet1;
+  MonitorElement *AvgOccBetweenSet1;
+  MonitorElement *AvgOccAboveSet1;
+  MonitorElement *AvgOccBelowSet2;
+  MonitorElement *AvgOccBetweenSet2;
+  MonitorElement *AvgOccAboveSet2;
 
   // Luminosity Monitoring
-  MonitorElement* LumiAvgEtSum;
-  MonitorElement* LumiAvgOccSet1;
-  MonitorElement* LumiAvgOccSet2;
-  MonitorElement* LumiInstantEtSum;
-  MonitorElement* LumiInstantOccSet1;
-  MonitorElement* LumiInstantOccSet2;
-  MonitorElement* LumiIntegratedEtSum;
-  MonitorElement* LumiIntegratedOccSet1;
-  MonitorElement* LumiIntegratedOccSet2;
+  MonitorElement *LumiAvgEtSum;
+  MonitorElement *LumiAvgOccSet1;
+  MonitorElement *LumiAvgOccSet2;
+  MonitorElement *LumiInstantEtSum;
+  MonitorElement *LumiInstantOccSet1;
+  MonitorElement *LumiInstantOccSet2;
+  MonitorElement *LumiIntegratedEtSum;
+  MonitorElement *LumiIntegratedOccSet1;
+  MonitorElement *LumiIntegratedOccSet2;
 
   // Sanity Check for Occupancy
-  MonitorElement* SumAllOccSet1;
-  MonitorElement* SumAllOccSet2;
-  MonitorElement* MissingDQMDataCheck;
+  MonitorElement *SumAllOccSet1;
+  MonitorElement *SumAllOccSet2;
+  MonitorElement *MissingDQMDataCheck;
 
   // Signal and Background Levels
-  MonitorElement* MaxInstLumiBX1;
-  MonitorElement* MaxInstLumiBX2;
-  MonitorElement* MaxInstLumiBX3;
-  MonitorElement* MaxInstLumiBX4;
+  MonitorElement *MaxInstLumiBX1;
+  MonitorElement *MaxInstLumiBX2;
+  MonitorElement *MaxInstLumiBX3;
+  MonitorElement *MaxInstLumiBX4;
 
-  MonitorElement* MaxInstLumiBXNum1;
-  MonitorElement* MaxInstLumiBXNum2;
-  MonitorElement* MaxInstLumiBXNum3;
-  MonitorElement* MaxInstLumiBXNum4;
+  MonitorElement *MaxInstLumiBXNum1;
+  MonitorElement *MaxInstLumiBXNum2;
+  MonitorElement *MaxInstLumiBXNum3;
+  MonitorElement *MaxInstLumiBXNum4;
 
   // History plots - fill once per LS
-  MonitorElement* HistAvgEtSumHFP;
-  MonitorElement* HistAvgEtSumHFM;
-  MonitorElement* HistAvgOccBelowSet1HFP;
-  MonitorElement* HistAvgOccBelowSet1HFM;
-  MonitorElement* HistAvgOccBetweenSet1HFP;
-  MonitorElement* HistAvgOccBetweenSet1HFM;
-  MonitorElement* HistAvgOccAboveSet1HFP;
-  MonitorElement* HistAvgOccAboveSet1HFM;
-  MonitorElement* HistAvgOccBelowSet2HFP;
-  MonitorElement* HistAvgOccBelowSet2HFM;
-  MonitorElement* HistAvgOccBetweenSet2HFP;
-  MonitorElement* HistAvgOccBetweenSet2HFM;
-  MonitorElement* HistAvgOccAboveSet2HFP;
-  MonitorElement* HistAvgOccAboveSet2HFM;
-  MonitorElement* BXvsTimeAvgEtSumHFP;
-  MonitorElement* BXvsTimeAvgEtSumHFM;
-
-  MonitorElement* HistAvgLumiEtSum;
-  MonitorElement* HistAvgLumiOccSet1;
-  MonitorElement* HistAvgLumiOccSet2;
-  MonitorElement* HistInstantLumiEtSum;
-  MonitorElement* HistInstantLumiOccSet1;
-  MonitorElement* HistInstantLumiOccSet2;
-  MonitorElement* HistInstantLumiEtSumError;
-  MonitorElement* HistInstantLumiOccSet1Error;
-  MonitorElement* HistInstantLumiOccSet2Error;
-  MonitorElement* HistIntegratedLumiEtSum;
-  MonitorElement* HistIntegratedLumiOccSet1;
-  MonitorElement* HistIntegratedLumiOccSet2;
-
-  MonitorElement* RecentInstantLumiEtSum;
-  MonitorElement* RecentInstantLumiOccSet1;
-  MonitorElement* RecentInstantLumiOccSet2;
-  MonitorElement* RecentIntegratedLumiEtSum;
-  MonitorElement* RecentIntegratedLumiOccSet1;
-  MonitorElement* RecentIntegratedLumiOccSet2;
+  MonitorElement *HistAvgEtSumHFP;
+  MonitorElement *HistAvgEtSumHFM;
+  MonitorElement *HistAvgOccBelowSet1HFP;
+  MonitorElement *HistAvgOccBelowSet1HFM;
+  MonitorElement *HistAvgOccBetweenSet1HFP;
+  MonitorElement *HistAvgOccBetweenSet1HFM;
+  MonitorElement *HistAvgOccAboveSet1HFP;
+  MonitorElement *HistAvgOccAboveSet1HFM;
+  MonitorElement *HistAvgOccBelowSet2HFP;
+  MonitorElement *HistAvgOccBelowSet2HFM;
+  MonitorElement *HistAvgOccBetweenSet2HFP;
+  MonitorElement *HistAvgOccBetweenSet2HFM;
+  MonitorElement *HistAvgOccAboveSet2HFP;
+  MonitorElement *HistAvgOccAboveSet2HFM;
+  MonitorElement *BXvsTimeAvgEtSumHFP;
+  MonitorElement *BXvsTimeAvgEtSumHFM;
+
+  MonitorElement *HistAvgLumiEtSum;
+  MonitorElement *HistAvgLumiOccSet1;
+  MonitorElement *HistAvgLumiOccSet2;
+  MonitorElement *HistInstantLumiEtSum;
+  MonitorElement *HistInstantLumiOccSet1;
+  MonitorElement *HistInstantLumiOccSet2;
+  MonitorElement *HistInstantLumiEtSumError;
+  MonitorElement *HistInstantLumiOccSet1Error;
+  MonitorElement *HistInstantLumiOccSet2Error;
+  MonitorElement *HistIntegratedLumiEtSum;
+  MonitorElement *HistIntegratedLumiOccSet1;
+  MonitorElement *HistIntegratedLumiOccSet2;
+
+  MonitorElement *RecentInstantLumiEtSum;
+  MonitorElement *RecentInstantLumiOccSet1;
+  MonitorElement *RecentInstantLumiOccSet2;
+  MonitorElement *RecentIntegratedLumiEtSum;
+  MonitorElement *RecentIntegratedLumiOccSet1;
+  MonitorElement *RecentIntegratedLumiOccSet2;
 
   // EventInfo Clone
   //////////////////////////////////////////////////////////////////
   /// These MEs are filled with the info from the most recent event
   ///   by the module
   //////////////////////////////////////////////////////////////////
-  MonitorElement* runId_;
-  MonitorElement* runStartTimeStamp_;  /// UTC time of the run start
-  MonitorElement* eventId_;
-  MonitorElement* lumisecId_;
-  MonitorElement* eventTimeStamp_;
+  MonitorElement *runId_;
+  MonitorElement *runStartTimeStamp_;  /// UTC time of the run start
+  MonitorElement *eventId_;
+  MonitorElement *lumisecId_;
+  MonitorElement *eventTimeStamp_;
 
   //////////////////////////////////////////////////////////////////
   /// These MEs are either static or updated upon each analyze() call
   //////////////////////////////////////////////////////////////////
-  MonitorElement* nUpdates_;   /// Number of collector updates (TBD)
-  MonitorElement* processId_;  /// The PID associated with this job
-  MonitorElement*
-      processStartTimeStamp_;  /// The UTC time of the first event processed
-  MonitorElement* processTimeStamp_;  /// The UTC time of the last event
-  MonitorElement* processLatency_;    /// Time elapsed since the last event
-  MonitorElement* processEventRate_;  /// Avg # of events in programmable window
-                                      /// (default: 5 min)
-  MonitorElement* processEvents_;     ///# of event processed so far
-  MonitorElement* hostName_;          /// Hostname of the local machine
-  MonitorElement* processName_;       /// DQM "name" of the job (eg, Hcal or DT)
-  MonitorElement* workingDir_;        /// Current working directory of the job
-  MonitorElement* cmsswVer_;          /// CMSSW version run for this job
-  MonitorElement* dqmPatch_;          /// DQM patch version for this job
-  MonitorElement* errSummary_;  /// Subdetector-specific error summary (float)
-  MonitorElement*
-      errSummaryEtaPhi_;  /// Subdetector-specific etaPhi summary (float)
-  MonitorElement* errSummarySegment_[10];
+  MonitorElement *nUpdates_;               /// Number of collector updates (TBD)
+  MonitorElement *processId_;              /// The PID associated with this job
+  MonitorElement *processStartTimeStamp_;  /// The UTC time of the first event processed
+  MonitorElement *processTimeStamp_;       /// The UTC time of the last event
+  MonitorElement *processLatency_;         /// Time elapsed since the last event
+  MonitorElement *processEventRate_;       /// Avg # of events in programmable window
+                                           /// (default: 5 min)
+  MonitorElement *processEvents_;          ///# of event processed so far
+  MonitorElement *hostName_;               /// Hostname of the local machine
+  MonitorElement *processName_;            /// DQM "name" of the job (eg, Hcal or DT)
+  MonitorElement *workingDir_;             /// Current working directory of the job
+  MonitorElement *cmsswVer_;               /// CMSSW version run for this job
+  MonitorElement *dqmPatch_;               /// DQM patch version for this job
+  MonitorElement *errSummary_;             /// Subdetector-specific error summary (float)
+  MonitorElement *errSummaryEtaPhi_;       /// Subdetector-specific etaPhi summary (float)
+  MonitorElement *errSummarySegment_[10];
 
   // Report Summary
-  MonitorElement* reportSummary_;
-  MonitorElement* reportSummaryMap_;
+  MonitorElement *reportSummary_;
+  MonitorElement *reportSummaryMap_;
 
   unsigned int numActiveTowersSet1;
   unsigned int numActiveTowersSet2;
 
   unsigned int counter;
-  unsigned char* rData;
+  unsigned char *rData;
   short int SectionComplete;
 
   // Parameters
diff --git a/DQM/HLXMonitor/src/HLXMonitor.cc b/DQM/HLXMonitor/src/HLXMonitor.cc
old mode 100755
new mode 100644
index 8f95a7aa027cd..8af1005d1aaea
--- a/DQM/HLXMonitor/src/HLXMonitor.cc
+++ b/DQM/HLXMonitor/src/HLXMonitor.cc
@@ -7,20 +7,19 @@
 
 // STL Headers
 
+#include <TSystem.h>
 #include <cmath>
 #include <iomanip>
-#include <TSystem.h>
 
 using std::cout;
 using std::endl;
 
-HLXMonitor::HLXMonitor(const edm::ParameterSet& iConfig) {
+HLXMonitor::HLXMonitor(const edm::ParameterSet &iConfig) {
   NUM_HLX = iConfig.getUntrackedParameter<unsigned int>("numHlx", 36);
   NUM_BUNCHES = iConfig.getUntrackedParameter<unsigned int>("numBunches", 3564);
   MAX_LS = iConfig.getUntrackedParameter<unsigned int>("maximumNumLS", 480);
   listenPort = iConfig.getUntrackedParameter<unsigned int>("SourcePort", 51001);
-  OutputFilePrefix =
-      iConfig.getUntrackedParameter<std::string>("outputFile", "lumi");
+  OutputFilePrefix = iConfig.getUntrackedParameter<std::string>("outputFile", "lumi");
   OutputDir = iConfig.getUntrackedParameter<std::string>("outputDir", "  data");
   SavePeriod = iConfig.getUntrackedParameter<unsigned int>("SavePeriod", 10);
   NBINS = iConfig.getUntrackedParameter<unsigned int>("NBINS",
@@ -31,22 +30,15 @@ HLXMonitor::HLXMonitor(const edm::ParameterSet& iConfig) {
   AquireMode = iConfig.getUntrackedParameter<unsigned int>("AquireMode", 0);
   Accumulate = iConfig.getUntrackedParameter<bool>("Accumulate", true);  // all
   TriggerBX = iConfig.getUntrackedParameter<unsigned int>("TriggerBX", 50);
-  MinLSBeforeSave =
-      iConfig.getUntrackedParameter<unsigned int>("MinLSBeforeSave", 1);
-  reconnTime =
-      iConfig.getUntrackedParameter<unsigned int>("ReconnectionTime", 5);
-  DistribIP1 = iConfig.getUntrackedParameter<std::string>("PrimaryHLXDAQIP",
-                                                          "vmepcs2f17-18");
-  DistribIP2 = iConfig.getUntrackedParameter<std::string>("SecondaryHLXDAQIP",
-                                                          "vmepcs2f17-19");
+  MinLSBeforeSave = iConfig.getUntrackedParameter<unsigned int>("MinLSBeforeSave", 1);
+  reconnTime = iConfig.getUntrackedParameter<unsigned int>("ReconnectionTime", 5);
+  DistribIP1 = iConfig.getUntrackedParameter<std::string>("PrimaryHLXDAQIP", "vmepcs2f17-18");
+  DistribIP2 = iConfig.getUntrackedParameter<std::string>("SecondaryHLXDAQIP", "vmepcs2f17-19");
   ResetAtNewRun = iConfig.getUntrackedParameter<bool>("NewRun_Reset", true);
 
-  eventInfoFolderHLX_ = iConfig.getUntrackedParameter<std::string>(
-      "eventInfoFolderHLX", "EventInfoHLX");
-  eventInfoFolder_ = iConfig.getUntrackedParameter<std::string>(
-      "eventInfoFolder", "EventInfo");
-  subSystemName_ =
-      iConfig.getUntrackedParameter<std::string>("subSystemName", "HLX");
+  eventInfoFolderHLX_ = iConfig.getUntrackedParameter<std::string>("eventInfoFolderHLX", "EventInfoHLX");
+  eventInfoFolder_ = iConfig.getUntrackedParameter<std::string>("eventInfoFolder", "EventInfo");
+  subSystemName_ = iConfig.getUntrackedParameter<std::string>("subSystemName", "HLX");
 
   // Set the lumi section counter
   lsBinOld = 0;
@@ -71,21 +63,23 @@ HLXMonitor::HLXMonitor(const edm::ParameterSet& iConfig) {
   runNumLength = 9;
   secNumLength = 8;
 
-  if (NUM_HLX > 36) NUM_HLX = 36;
+  if (NUM_HLX > 36)
+    NUM_HLX = 36;
 
-  if (NUM_BUNCHES > 3564) NUM_BUNCHES = 3564;
+  if (NUM_BUNCHES > 3564)
+    NUM_BUNCHES = 3564;
 
   if (XMAX <= XMIN) {
     XMIN = 0;
-    if (XMAX <= 0) XMAX = 3564;
+    if (XMAX <= 0)
+      XMAX = 3564;
   }
 
   if ((Style == "History") || (NBINS == 0)) {
     NBINS = (unsigned int)(XMAX - XMIN);
   }
 
-  monitorName_ =
-      iConfig.getUntrackedParameter<std::string>("monitorName", "HLX");
+  monitorName_ = iConfig.getUntrackedParameter<std::string>("monitorName", "HLX");
   // cout << "Monitor name = " << monitorName_ << endl;
   prescaleEvt_ = iConfig.getUntrackedParameter<int>("prescaleEvt", -1);
   // cout << "===>DQM event prescale = " << prescaleEvt_ << " events "<< endl;
@@ -109,7 +103,7 @@ HLXMonitor::HLXMonitor(const edm::ParameterSet& iConfig) {
 
   num4NibblePerLS_ = 16.0;
 
-  connectHLXTCP(); // this was originally done in beginJob()
+  connectHLXTCP();  // this was originally done in beginJob()
 }
 
 HLXMonitor::~HLXMonitor() {
@@ -132,7 +126,8 @@ void HLXMonitor::connectHLXTCP() {
       sleep(1);
       std::cout << "Trying " << DistribIP2 << std::endl;
       HLXTCP.SetIP(DistribIP2);
-      if (HLXTCP.Connect() == 1) break;
+      if (HLXTCP.Connect() == 1)
+        break;
       std::cout << "Failed to connect to " << DistribIP2 << "." << std::endl;
       std::cout << " Reconnect in " << reconnTime << " seconds." << std::endl;
       sleep(reconnTime);
@@ -144,56 +139,38 @@ void HLXMonitor::connectHLXTCP() {
 }
 
 // ------------ Setup the monitoring elements ---------------
-void HLXMonitor::bookHistograms(DQMStore::IBooker& iBooker, edm::Run const&,
-                                edm::EventSetup const&) {
+void HLXMonitor::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, edm::EventSetup const &) {
   SetupHists(iBooker);
   SetupEventInfo(iBooker);
 }
 
-void HLXMonitor::SetupHists(DQMStore::IBooker& iBooker) {
+void HLXMonitor::SetupHists(DQMStore::IBooker &iBooker) {
   iBooker.setCurrentFolder(monitorName_ + "/HFPlus");
 
   for (unsigned int iWedge = 0; iWedge < 18 && iWedge < NUM_HLX; ++iWedge) {
     std::ostringstream tempStreamer;
-    tempStreamer << std::dec << std::setw(2) << std::setfill('0')
-                 << (iWedge + 1);
+    tempStreamer << std::dec << std::setw(2) << std::setfill('0') << (iWedge + 1);
 
     std::ostringstream wedgeNum;
     wedgeNum << std::dec << (iWedge % 18) + 1;
 
-    iBooker.setCurrentFolder(monitorName_ + "/HFPlus/Wedge" +
-                             tempStreamer.str());
+    iBooker.setCurrentFolder(monitorName_ + "/HFPlus/Wedge" + tempStreamer.str());
 
-    Set1Below[iWedge] = iBooker.book1D(
-        "Set1_Below",
-        "HF+ Wedge " + wedgeNum.str() + ": Below Threshold 1 - Set 1", NBINS,
-        XMIN, XMAX);
+    Set1Below[iWedge] =
+        iBooker.book1D("Set1_Below", "HF+ Wedge " + wedgeNum.str() + ": Below Threshold 1 - Set 1", NBINS, XMIN, XMAX);
     Set1Between[iWedge] = iBooker.book1D(
-        "Set1_Between",
-        "HF+ Wedge " + wedgeNum.str() + ": Between Threshold 1 & 2 - Set 1",
-        NBINS, XMIN, XMAX);
-    Set1Above[iWedge] = iBooker.book1D(
-        "Set1_Above",
-        "HF+ Wedge " + wedgeNum.str() + ": Above Threshold 2 - Set 1", NBINS,
-        XMIN, XMAX);
-    Set2Below[iWedge] = iBooker.book1D(
-        "Set2_Below",
-        "HF+ Wedge " + wedgeNum.str() + ": Below Threshold 1 - Set 2", NBINS,
-        XMIN, XMAX);
+        "Set1_Between", "HF+ Wedge " + wedgeNum.str() + ": Between Threshold 1 & 2 - Set 1", NBINS, XMIN, XMAX);
+    Set1Above[iWedge] =
+        iBooker.book1D("Set1_Above", "HF+ Wedge " + wedgeNum.str() + ": Above Threshold 2 - Set 1", NBINS, XMIN, XMAX);
+    Set2Below[iWedge] =
+        iBooker.book1D("Set2_Below", "HF+ Wedge " + wedgeNum.str() + ": Below Threshold 1 - Set 2", NBINS, XMIN, XMAX);
     Set2Between[iWedge] = iBooker.book1D(
-        "Set2_Between",
-        "HF+ Wedge " + wedgeNum.str() + ": Between Threshold 1 & 2 - Set 2",
-        NBINS, XMIN, XMAX);
-    Set2Above[iWedge] = iBooker.book1D(
-        "Set2_Above",
-        "HF+ Wedge " + wedgeNum.str() + ": Above Threshold 2 - Set 2", NBINS,
-        XMIN, XMAX);
-    ETSum[iWedge] = iBooker.book1D(
-        "ETSum", "HF+ Wedge " + wedgeNum.str() + ": Transverse Energy", NBINS,
-        XMIN, XMAX);
-
-    iBooker.tagContents(monitorName_ + "/HFPlus/Wedge" + tempStreamer.str(),
-                        iWedge + 1);
+        "Set2_Between", "HF+ Wedge " + wedgeNum.str() + ": Between Threshold 1 & 2 - Set 2", NBINS, XMIN, XMAX);
+    Set2Above[iWedge] =
+        iBooker.book1D("Set2_Above", "HF+ Wedge " + wedgeNum.str() + ": Above Threshold 2 - Set 2", NBINS, XMIN, XMAX);
+    ETSum[iWedge] = iBooker.book1D("ETSum", "HF+ Wedge " + wedgeNum.str() + ": Transverse Energy", NBINS, XMIN, XMAX);
+
+    iBooker.tagContents(monitorName_ + "/HFPlus/Wedge" + tempStreamer.str(), iWedge + 1);
   }
 
   if (NUM_HLX > 17) {
@@ -201,44 +178,27 @@ void HLXMonitor::SetupHists(DQMStore::IBooker& iBooker) {
 
     for (unsigned int iWedge = 18; iWedge < NUM_HLX; ++iWedge) {
       std::ostringstream tempStreamer;
-      tempStreamer << std::dec << std::setw(2) << std::setfill('0')
-                   << (iWedge + 1);
+      tempStreamer << std::dec << std::setw(2) << std::setfill('0') << (iWedge + 1);
 
       std::ostringstream wedgeNum;
       wedgeNum << std::dec << (iWedge % 18) + 1;
 
-      iBooker.setCurrentFolder(monitorName_ + "/HFMinus/Wedge" +
-                               tempStreamer.str());
+      iBooker.setCurrentFolder(monitorName_ + "/HFMinus/Wedge" + tempStreamer.str());
       Set1Below[iWedge] = iBooker.book1D(
-          "Set1_Below",
-          "HF- Wedge " + wedgeNum.str() + ": Below Threshold 1 - Set 1", NBINS,
-          XMIN, XMAX);
+          "Set1_Below", "HF- Wedge " + wedgeNum.str() + ": Below Threshold 1 - Set 1", NBINS, XMIN, XMAX);
       Set1Between[iWedge] = iBooker.book1D(
-          "Set1_Between",
-          "HF- Wedge " + wedgeNum.str() + ": Between Threshold 1 & 2 - Set 1",
-          NBINS, XMIN, XMAX);
+          "Set1_Between", "HF- Wedge " + wedgeNum.str() + ": Between Threshold 1 & 2 - Set 1", NBINS, XMIN, XMAX);
       Set1Above[iWedge] = iBooker.book1D(
-          "Set1_Above",
-          "HF- Wedge " + wedgeNum.str() + ": Above Threshold 2 - Set 1", NBINS,
-          XMIN, XMAX);
+          "Set1_Above", "HF- Wedge " + wedgeNum.str() + ": Above Threshold 2 - Set 1", NBINS, XMIN, XMAX);
       Set2Below[iWedge] = iBooker.book1D(
-          "Set2_Below",
-          "HF- Wedge " + wedgeNum.str() + ": Below Threshold 1 - Set 2", NBINS,
-          XMIN, XMAX);
+          "Set2_Below", "HF- Wedge " + wedgeNum.str() + ": Below Threshold 1 - Set 2", NBINS, XMIN, XMAX);
       Set2Between[iWedge] = iBooker.book1D(
-          "Set2_Between",
-          "HF- Wedge " + wedgeNum.str() + ": Between Threshold 1 & 2 - Set 2",
-          NBINS, XMIN, XMAX);
+          "Set2_Between", "HF- Wedge " + wedgeNum.str() + ": Between Threshold 1 & 2 - Set 2", NBINS, XMIN, XMAX);
       Set2Above[iWedge] = iBooker.book1D(
-          "Set2_Above",
-          "HF- Wedge " + wedgeNum.str() + ": Above Threshold 2 - Set 2", NBINS,
-          XMIN, XMAX);
-      ETSum[iWedge] = iBooker.book1D(
-          "ETSum", "HF- Wedge " + wedgeNum.str() + ": Transverse Energy", NBINS,
-          XMIN, XMAX);
-
-      iBooker.tagContents(monitorName_ + "/HFMinus/Wedge" + tempStreamer.str(),
-                          iWedge + 1);
+          "Set2_Above", "HF- Wedge " + wedgeNum.str() + ": Above Threshold 2 - Set 2", NBINS, XMIN, XMAX);
+      ETSum[iWedge] = iBooker.book1D("ETSum", "HF- Wedge " + wedgeNum.str() + ": Transverse Energy", NBINS, XMIN, XMAX);
+
+      iBooker.tagContents(monitorName_ + "/HFMinus/Wedge" + tempStreamer.str(), iWedge + 1);
     }
   }
 
@@ -291,44 +251,37 @@ void HLXMonitor::SetupHists(DQMStore::IBooker& iBooker) {
   std::string CompEtSumYTitle = "E_{T} Sum per active tower";
   std::string CompOccYTitle = "Occupancy per active tower";
 
-  HFCompareEtSum =
-      iBooker.book1D("HFCompareEtSum", "E_{T} Sum", NUM_HLX, 0, NUM_HLX);
+  HFCompareEtSum = iBooker.book1D("HFCompareEtSum", "E_{T} Sum", NUM_HLX, 0, NUM_HLX);
   HFCompareEtSum->setAxisTitle(CompXTitle, 1);
   HFCompareEtSum->setAxisTitle(CompEtSumYTitle, 2);
 
-  HFCompareOccBelowSet1 = iBooker.book1D("HFCompareOccBelowSet1",
-                                         "Occupancy Below Threshold 1 - Set 1",
-                                         NUM_HLX, 0, NUM_HLX);
+  HFCompareOccBelowSet1 =
+      iBooker.book1D("HFCompareOccBelowSet1", "Occupancy Below Threshold 1 - Set 1", NUM_HLX, 0, NUM_HLX);
   HFCompareOccBelowSet1->setAxisTitle(CompXTitle, 1);
   HFCompareOccBelowSet1->setAxisTitle(CompOccYTitle, 2);
 
-  HFCompareOccBetweenSet1 = iBooker.book1D(
-      "HFCompareOccBetweenSet1", "Occupancy Between Threshold 1 & 2 - Set 1",
-      NUM_HLX, 0, NUM_HLX);
+  HFCompareOccBetweenSet1 =
+      iBooker.book1D("HFCompareOccBetweenSet1", "Occupancy Between Threshold 1 & 2 - Set 1", NUM_HLX, 0, NUM_HLX);
   HFCompareOccBetweenSet1->setAxisTitle(CompXTitle, 1);
   HFCompareOccBetweenSet1->setAxisTitle(CompOccYTitle, 2);
 
-  HFCompareOccAboveSet1 = iBooker.book1D("HFCompareOccAboveSet1",
-                                         "Occupancy Above Threshold 2 - Set 1",
-                                         NUM_HLX, 0, NUM_HLX);
+  HFCompareOccAboveSet1 =
+      iBooker.book1D("HFCompareOccAboveSet1", "Occupancy Above Threshold 2 - Set 1", NUM_HLX, 0, NUM_HLX);
   HFCompareOccAboveSet1->setAxisTitle(CompXTitle, 1);
   HFCompareOccAboveSet1->setAxisTitle(CompOccYTitle, 2);
 
-  HFCompareOccBelowSet2 = iBooker.book1D("HFCompareOccBelowSet2",
-                                         "Occupancy Below Threshold 1 - Set 2",
-                                         NUM_HLX, 0, NUM_HLX);
+  HFCompareOccBelowSet2 =
+      iBooker.book1D("HFCompareOccBelowSet2", "Occupancy Below Threshold 1 - Set 2", NUM_HLX, 0, NUM_HLX);
   HFCompareOccBelowSet2->setAxisTitle(CompXTitle, 1);
   HFCompareOccBelowSet2->setAxisTitle(CompOccYTitle, 2);
 
-  HFCompareOccBetweenSet2 = iBooker.book1D(
-      "HFCompareOccBetweenSet2", "Occupancy Between Threshold 1 & 2 - Set 2",
-      NUM_HLX, 0, NUM_HLX);
+  HFCompareOccBetweenSet2 =
+      iBooker.book1D("HFCompareOccBetweenSet2", "Occupancy Between Threshold 1 & 2 - Set 2", NUM_HLX, 0, NUM_HLX);
   HFCompareOccBetweenSet2->setAxisTitle(CompXTitle, 1);
   HFCompareOccBetweenSet2->setAxisTitle(CompOccYTitle, 2);
 
-  HFCompareOccAboveSet2 = iBooker.book1D("HFCompareOccAboveSet2",
-                                         "Occupancy Above Threshold 2 - Set 2",
-                                         NUM_HLX, 0, NUM_HLX);
+  HFCompareOccAboveSet2 =
+      iBooker.book1D("HFCompareOccAboveSet2", "Occupancy Above Threshold 2 - Set 2", NUM_HLX, 0, NUM_HLX);
   HFCompareOccAboveSet2->setAxisTitle(CompXTitle, 1);
   HFCompareOccAboveSet2->setAxisTitle(CompOccYTitle, 2);
 
@@ -343,8 +296,7 @@ void HLXMonitor::SetupHists(DQMStore::IBooker& iBooker) {
   int EtSumBins = 10000;  // This does absolutely nothing.  The Variable is not
                           // used in the function.
   double EtSumMin = 0;
-  double EtSumMax =
-      0;  // If min and max are zero, no bounds on the data are set.
+  double EtSumMax = 0;  // If min and max are zero, no bounds on the data are set.
 
   std::string errorOpt = "i";
 
@@ -352,44 +304,79 @@ void HLXMonitor::SetupHists(DQMStore::IBooker& iBooker) {
   std::string AvgEtSumYTitle = "Average E_{T} Sum";
   std::string AvgOccYTitle = "Average Tower Occupancy";
 
-  AvgEtSum = iBooker.bookProfile("AvgEtSum", "Average E_{T} Sum", NUM_HLX, 0,
-                                 NUM_HLX, EtSumBins, EtSumMin, EtSumMax);
+  AvgEtSum = iBooker.bookProfile("AvgEtSum", "Average E_{T} Sum", NUM_HLX, 0, NUM_HLX, EtSumBins, EtSumMin, EtSumMax);
   AvgEtSum->setAxisTitle(AvgXTitle, 1);
   AvgEtSum->setAxisTitle(AvgEtSumYTitle, 2);
 
-  AvgOccBelowSet1 = iBooker.bookProfile(
-      "AvgOccBelowSet1", "Average Occupancy Below Threshold 1 - Set1", NUM_HLX,
-      0, NUM_HLX, OccBins, OccMin, OccMax, errorOpt.c_str());
+  AvgOccBelowSet1 = iBooker.bookProfile("AvgOccBelowSet1",
+                                        "Average Occupancy Below Threshold 1 - Set1",
+                                        NUM_HLX,
+                                        0,
+                                        NUM_HLX,
+                                        OccBins,
+                                        OccMin,
+                                        OccMax,
+                                        errorOpt.c_str());
   AvgOccBelowSet1->setAxisTitle(AvgXTitle, 1);
   AvgOccBelowSet1->setAxisTitle(AvgOccYTitle, 2);
 
-  AvgOccBetweenSet1 = iBooker.bookProfile(
-      "AvgOccBetweenSet1", "Average Occupancy Between Threhold 1 & 2 - Set1",
-      NUM_HLX, 0, NUM_HLX, OccBins, OccMin, OccMax, errorOpt.c_str());
+  AvgOccBetweenSet1 = iBooker.bookProfile("AvgOccBetweenSet1",
+                                          "Average Occupancy Between Threhold 1 & 2 - Set1",
+                                          NUM_HLX,
+                                          0,
+                                          NUM_HLX,
+                                          OccBins,
+                                          OccMin,
+                                          OccMax,
+                                          errorOpt.c_str());
   AvgOccBetweenSet1->setAxisTitle(AvgXTitle, 1);
   AvgOccBetweenSet1->setAxisTitle(AvgOccYTitle, 2);
 
-  AvgOccAboveSet1 = iBooker.bookProfile(
-      "AvgOccAboveSet1", "Average Occupancy Above Threshold 2 - Set1", NUM_HLX,
-      0, NUM_HLX, OccBins, OccMin, OccMax, errorOpt.c_str());
+  AvgOccAboveSet1 = iBooker.bookProfile("AvgOccAboveSet1",
+                                        "Average Occupancy Above Threshold 2 - Set1",
+                                        NUM_HLX,
+                                        0,
+                                        NUM_HLX,
+                                        OccBins,
+                                        OccMin,
+                                        OccMax,
+                                        errorOpt.c_str());
   AvgOccAboveSet1->setAxisTitle(AvgXTitle, 1);
   AvgOccAboveSet1->setAxisTitle(AvgOccYTitle, 2);
 
-  AvgOccBelowSet2 = iBooker.bookProfile(
-      "AvgOccBelowSet2", "Average Occupancy Below Threshold 1 - Set2", NUM_HLX,
-      0, NUM_HLX, OccBins, OccMin, OccMax, errorOpt.c_str());
+  AvgOccBelowSet2 = iBooker.bookProfile("AvgOccBelowSet2",
+                                        "Average Occupancy Below Threshold 1 - Set2",
+                                        NUM_HLX,
+                                        0,
+                                        NUM_HLX,
+                                        OccBins,
+                                        OccMin,
+                                        OccMax,
+                                        errorOpt.c_str());
   AvgOccBelowSet2->setAxisTitle(AvgXTitle, 1);
   AvgOccBelowSet2->setAxisTitle(AvgOccYTitle, 2);
 
-  AvgOccBetweenSet2 = iBooker.bookProfile(
-      "AvgOccBetweenSet2", "Average Occupancy Between Threshold 1 & 2 - Set2",
-      NUM_HLX, 0, NUM_HLX, OccBins, OccMin, OccMax, errorOpt.c_str());
+  AvgOccBetweenSet2 = iBooker.bookProfile("AvgOccBetweenSet2",
+                                          "Average Occupancy Between Threshold 1 & 2 - Set2",
+                                          NUM_HLX,
+                                          0,
+                                          NUM_HLX,
+                                          OccBins,
+                                          OccMin,
+                                          OccMax,
+                                          errorOpt.c_str());
   AvgOccBetweenSet2->setAxisTitle(AvgXTitle, 1);
   AvgOccBetweenSet2->setAxisTitle(AvgOccYTitle, 2);
 
-  AvgOccAboveSet2 = iBooker.bookProfile(
-      "AvgOccAboveSet2", "Average Occupancy Above Threshold 2 - Set2", NUM_HLX,
-      0, NUM_HLX, OccBins, OccMin, OccMax, errorOpt.c_str());
+  AvgOccAboveSet2 = iBooker.bookProfile("AvgOccAboveSet2",
+                                        "Average Occupancy Above Threshold 2 - Set2",
+                                        NUM_HLX,
+                                        0,
+                                        NUM_HLX,
+                                        OccBins,
+                                        OccMin,
+                                        OccMax,
+                                        errorOpt.c_str());
   AvgOccAboveSet2->setAxisTitle(AvgXTitle, 1);
   AvgOccAboveSet2->setAxisTitle(AvgOccYTitle, 2);
 
@@ -400,57 +387,46 @@ void HLXMonitor::SetupHists(DQMStore::IBooker& iBooker) {
   std::string LumiEtSumYTitle = "Luminosity: E_{T} Sum";
   std::string LumiOccYTitle = "Luminosity: Occupancy";
 
-  LumiAvgEtSum = iBooker.bookProfile("LumiAvgEtSum", "Average Luminosity ",
-                                     int(XMAX - XMIN), XMIN, XMAX, EtSumBins,
-                                     EtSumMin, EtSumMax);
+  LumiAvgEtSum = iBooker.bookProfile(
+      "LumiAvgEtSum", "Average Luminosity ", int(XMAX - XMIN), XMIN, XMAX, EtSumBins, EtSumMin, EtSumMax);
   LumiAvgEtSum->setAxisTitle(LumiXTitle, 1);
   LumiAvgEtSum->setAxisTitle(LumiEtSumYTitle, 2);
 
   LumiAvgOccSet1 = iBooker.bookProfile(
-      "LumiAvgOccSet1", "Average Luminosity - Set 1", int(XMAX - XMIN), XMIN,
-      XMAX, OccBins, OccMax, OccMin);
+      "LumiAvgOccSet1", "Average Luminosity - Set 1", int(XMAX - XMIN), XMIN, XMAX, OccBins, OccMax, OccMin);
   LumiAvgOccSet1->setAxisTitle(LumiXTitle, 1);
   LumiAvgOccSet1->setAxisTitle(LumiOccYTitle, 2);
 
   LumiAvgOccSet2 = iBooker.bookProfile(
-      "LumiAvgOccSet2", "Average Luminosity - Set 2", int(XMAX - XMIN), XMIN,
-      XMAX, OccBins, OccMax, OccMin);
+      "LumiAvgOccSet2", "Average Luminosity - Set 2", int(XMAX - XMIN), XMIN, XMAX, OccBins, OccMax, OccMin);
   LumiAvgOccSet2->setAxisTitle(LumiXTitle, 1);
   LumiAvgOccSet2->setAxisTitle(LumiOccYTitle, 2);
 
-  LumiInstantEtSum =
-      iBooker.book1D("LumiInstantEtSum", "Instantaneous Luminosity ",
-                     int(XMAX - XMIN), XMIN, XMAX);
+  LumiInstantEtSum = iBooker.book1D("LumiInstantEtSum", "Instantaneous Luminosity ", int(XMAX - XMIN), XMIN, XMAX);
   LumiInstantEtSum->setAxisTitle(LumiXTitle, 1);
   LumiInstantEtSum->setAxisTitle(LumiEtSumYTitle, 2);
 
   LumiInstantOccSet1 =
-      iBooker.book1D("LumiInstantOccSet1", "Instantaneous Luminosity - Set 1",
-                     int(XMAX - XMIN), XMIN, XMAX);
+      iBooker.book1D("LumiInstantOccSet1", "Instantaneous Luminosity - Set 1", int(XMAX - XMIN), XMIN, XMAX);
   LumiInstantOccSet1->setAxisTitle(LumiXTitle, 1);
   LumiInstantOccSet1->setAxisTitle(LumiOccYTitle, 2);
 
   LumiInstantOccSet2 =
-      iBooker.book1D("LumiInstantOccSet2", "Instantaneous Luminosity - Set 2",
-                     int(XMAX - XMIN), XMIN, XMAX);
+      iBooker.book1D("LumiInstantOccSet2", "Instantaneous Luminosity - Set 2", int(XMAX - XMIN), XMIN, XMAX);
   LumiInstantOccSet2->setAxisTitle(LumiXTitle, 1);
   LumiInstantOccSet2->setAxisTitle(LumiOccYTitle, 2);
 
-  LumiIntegratedEtSum =
-      iBooker.book1D("LumiIntegratedEtSum", "Integrated Luminosity ",
-                     int(XMAX - XMIN), XMIN, XMAX);
+  LumiIntegratedEtSum = iBooker.book1D("LumiIntegratedEtSum", "Integrated Luminosity ", int(XMAX - XMIN), XMIN, XMAX);
   LumiIntegratedEtSum->setAxisTitle(LumiXTitle, 1);
   LumiIntegratedEtSum->setAxisTitle(LumiEtSumYTitle, 2);
 
   LumiIntegratedOccSet1 =
-      iBooker.book1D("LumiIntegratedOccSet1", "Integrated Luminosity - Set 1",
-                     int(XMAX - XMIN), XMIN, XMAX);
+      iBooker.book1D("LumiIntegratedOccSet1", "Integrated Luminosity - Set 1", int(XMAX - XMIN), XMIN, XMAX);
   LumiIntegratedOccSet1->setAxisTitle(LumiXTitle, 1);
   LumiIntegratedOccSet1->setAxisTitle(LumiOccYTitle, 2);
 
   LumiIntegratedOccSet2 =
-      iBooker.book1D("LumiIntegratedOccSet2", "Integrated Luminosity - Set 2",
-                     int(XMAX - XMIN), XMIN, XMAX);
+      iBooker.book1D("LumiIntegratedOccSet2", "Integrated Luminosity - Set 2", int(XMAX - XMIN), XMIN, XMAX);
   LumiIntegratedOccSet2->setAxisTitle(LumiXTitle, 1);
   LumiIntegratedOccSet2->setAxisTitle(LumiOccYTitle, 2);
 
@@ -461,60 +437,45 @@ void HLXMonitor::SetupHists(DQMStore::IBooker& iBooker) {
   std::string sumYTitle = "Occupancy Sum (Below+Above+Between)";
 
   SumAllOccSet1 =
-      iBooker.bookProfile("SumAllOccSet1", "Occupancy Check - Set 1", NUM_HLX,
-                          0, NUM_HLX, OccBins, OccMax, OccMin);
+      iBooker.bookProfile("SumAllOccSet1", "Occupancy Check - Set 1", NUM_HLX, 0, NUM_HLX, OccBins, OccMax, OccMin);
   SumAllOccSet1->setAxisTitle(sumXTitle, 1);
   SumAllOccSet1->setAxisTitle(sumYTitle, 2);
 
   SumAllOccSet2 =
-      iBooker.bookProfile("SumAllOccSet2", "Occupancy Check - Set 2", NUM_HLX,
-                          0, NUM_HLX, OccBins, OccMax, OccMin);
+      iBooker.bookProfile("SumAllOccSet2", "Occupancy Check - Set 2", NUM_HLX, 0, NUM_HLX, OccBins, OccMax, OccMin);
   SumAllOccSet2->setAxisTitle(sumXTitle, 1);
   SumAllOccSet2->setAxisTitle(sumYTitle, 2);
 
-  MissingDQMDataCheck =
-      iBooker.book1D("MissingDQMDataCheck", "Missing Data Count", 1, 0, 1);
+  MissingDQMDataCheck = iBooker.book1D("MissingDQMDataCheck", "Missing Data Count", 1, 0, 1);
   MissingDQMDataCheck->setAxisTitle("", 1);
   MissingDQMDataCheck->setAxisTitle("Number Missing Nibbles", 2);
 
   // Signal & Background monitoring histograms
   iBooker.setCurrentFolder(monitorName_ + "/SigBkgLevels");
 
-  MaxInstLumiBX1 =
-      iBooker.book1D("MaxInstLumiBX1", "Max Instantaneous Luminosity BX: 1st",
-                     10000, -1e-5, 0.01);
+  MaxInstLumiBX1 = iBooker.book1D("MaxInstLumiBX1", "Max Instantaneous Luminosity BX: 1st", 10000, -1e-5, 0.01);
   MaxInstLumiBX1->setAxisTitle("Max Inst. L (10^{30}cm^{-2}s^{-1})", 1);
   MaxInstLumiBX1->setAxisTitle("Entries", 2);
-  MaxInstLumiBX2 =
-      iBooker.book1D("MaxInstLumiBX2", "Max Instantaneous Luminosity BX: 2nd",
-                     10000, -1e-5, 0.01);
+  MaxInstLumiBX2 = iBooker.book1D("MaxInstLumiBX2", "Max Instantaneous Luminosity BX: 2nd", 10000, -1e-5, 0.01);
   MaxInstLumiBX2->setAxisTitle("Max Inst. L (10^{30}cm^{-2}s^{-1})", 1);
   MaxInstLumiBX2->setAxisTitle("Entries", 2);
-  MaxInstLumiBX3 =
-      iBooker.book1D("MaxInstLumiBX3", "Max Instantaneous Luminosity BX: 3rd",
-                     10000, -1e-5, 0.01);
+  MaxInstLumiBX3 = iBooker.book1D("MaxInstLumiBX3", "Max Instantaneous Luminosity BX: 3rd", 10000, -1e-5, 0.01);
   MaxInstLumiBX3->setAxisTitle("Max Inst. L (10^{30}cm^{-2}s^{-1})", 1);
   MaxInstLumiBX3->setAxisTitle("Entries", 2);
-  MaxInstLumiBX4 =
-      iBooker.book1D("MaxInstLumiBX4", "Max Instantaneous Luminosity BX: 4th",
-                     10000, -1e-5, 0.01);
+  MaxInstLumiBX4 = iBooker.book1D("MaxInstLumiBX4", "Max Instantaneous Luminosity BX: 4th", 10000, -1e-5, 0.01);
   MaxInstLumiBX4->setAxisTitle("Max Inst. L (10^{30}cm^{-2}s^{-1})", 1);
   MaxInstLumiBX4->setAxisTitle("Entries", 2);
 
-  MaxInstLumiBXNum1 = iBooker.book1D("MaxInstLumiBXNum1",
-                                     "BX Number of Max: 1st", 3564, 0, 3564);
+  MaxInstLumiBXNum1 = iBooker.book1D("MaxInstLumiBXNum1", "BX Number of Max: 1st", 3564, 0, 3564);
   MaxInstLumiBXNum1->setAxisTitle("BX", 1);
   MaxInstLumiBXNum1->setAxisTitle("Num Time Max", 2);
-  MaxInstLumiBXNum2 = iBooker.book1D("MaxInstLumiBXNum2",
-                                     "BX Number of Max: 2nd", 3564, 0, 3564);
+  MaxInstLumiBXNum2 = iBooker.book1D("MaxInstLumiBXNum2", "BX Number of Max: 2nd", 3564, 0, 3564);
   MaxInstLumiBXNum2->setAxisTitle("BX", 1);
   MaxInstLumiBXNum2->setAxisTitle("Num Time Max", 2);
-  MaxInstLumiBXNum3 = iBooker.book1D("MaxInstLumiBXNum3",
-                                     "BX Number of Max: 3rd", 3564, 0, 3564);
+  MaxInstLumiBXNum3 = iBooker.book1D("MaxInstLumiBXNum3", "BX Number of Max: 3rd", 3564, 0, 3564);
   MaxInstLumiBXNum3->setAxisTitle("BX", 1);
   MaxInstLumiBXNum3->setAxisTitle("Num Time Max", 2);
-  MaxInstLumiBXNum4 = iBooker.book1D("MaxInstLumiBXNum4",
-                                     "BX Number of Max: 4th", 3564, 0, 3564);
+  MaxInstLumiBXNum4 = iBooker.book1D("MaxInstLumiBXNum4", "BX Number of Max: 4th", 3564, 0, 3564);
   MaxInstLumiBXNum4->setAxisTitle("BX", 1);
   MaxInstLumiBXNum4->setAxisTitle("Num Time Max", 2);
 
@@ -531,176 +492,250 @@ void HLXMonitor::SetupHists(DQMStore::IBooker& iBooker) {
   std::string BXvsTimeYTitle = "BX";
 
   // Et Sum histories
-  HistAvgEtSumHFP =
-      iBooker.bookProfile("HistAvgEtSumHFP", "Average Et Sum: HF+", MAX_LS, 0.5,
-                          (double)MAX_LS + 0.5, EtSumBins, EtSumMin, EtSumMax);
+  HistAvgEtSumHFP = iBooker.bookProfile(
+      "HistAvgEtSumHFP", "Average Et Sum: HF+", MAX_LS, 0.5, (double)MAX_LS + 0.5, EtSumBins, EtSumMin, EtSumMax);
   HistAvgEtSumHFP->setAxisTitle(HistXTitle, 1);
   HistAvgEtSumHFP->setAxisTitle(HistEtSumYTitle, 2);
 
-  HistAvgEtSumHFM =
-      iBooker.bookProfile("HistAvgEtSumHFM", "Average Et Sum: HF-", MAX_LS, 0.5,
-                          (double)MAX_LS + 0.5, EtSumBins, EtSumMin, EtSumMax);
+  HistAvgEtSumHFM = iBooker.bookProfile(
+      "HistAvgEtSumHFM", "Average Et Sum: HF-", MAX_LS, 0.5, (double)MAX_LS + 0.5, EtSumBins, EtSumMin, EtSumMax);
   HistAvgEtSumHFM->setAxisTitle(HistXTitle, 1);
   HistAvgEtSumHFM->setAxisTitle(HistEtSumYTitle, 2);
 
   // Tower Occupancy Histories
-  HistAvgOccBelowSet1HFP = iBooker.bookProfile(
-      "HistAvgOccBelowSet1HFP", "Average Occ Set1Below: HF+", MAX_LS, 0.5,
-      (double)MAX_LS + 0.5, OccBins, OccMin, OccMax);
+  HistAvgOccBelowSet1HFP = iBooker.bookProfile("HistAvgOccBelowSet1HFP",
+                                               "Average Occ Set1Below: HF+",
+                                               MAX_LS,
+                                               0.5,
+                                               (double)MAX_LS + 0.5,
+                                               OccBins,
+                                               OccMin,
+                                               OccMax);
   HistAvgOccBelowSet1HFP->setAxisTitle(HistXTitle, 1);
   HistAvgOccBelowSet1HFP->setAxisTitle(HistOccYTitle, 2);
 
-  HistAvgOccBelowSet1HFM = iBooker.bookProfile(
-      "HistAvgOccBelowSet1HFM", "Average Occ Set1Below: HF-", MAX_LS, 0.5,
-      (double)MAX_LS + 0.5, OccBins, OccMin, OccMax);
+  HistAvgOccBelowSet1HFM = iBooker.bookProfile("HistAvgOccBelowSet1HFM",
+                                               "Average Occ Set1Below: HF-",
+                                               MAX_LS,
+                                               0.5,
+                                               (double)MAX_LS + 0.5,
+                                               OccBins,
+                                               OccMin,
+                                               OccMax);
   HistAvgOccBelowSet1HFM->setAxisTitle(HistXTitle, 1);
   HistAvgOccBelowSet1HFM->setAxisTitle(HistOccYTitle, 2);
 
-  HistAvgOccBetweenSet1HFP = iBooker.bookProfile(
-      "HistAvgOccBetweenSet1HFP", "Average Occ Set1Between: HF+", MAX_LS, 0.5,
-      (double)MAX_LS + 0.5, OccBins, OccMin, OccMax);
+  HistAvgOccBetweenSet1HFP = iBooker.bookProfile("HistAvgOccBetweenSet1HFP",
+                                                 "Average Occ Set1Between: HF+",
+                                                 MAX_LS,
+                                                 0.5,
+                                                 (double)MAX_LS + 0.5,
+                                                 OccBins,
+                                                 OccMin,
+                                                 OccMax);
   HistAvgOccBetweenSet1HFP->setAxisTitle(HistXTitle, 1);
   HistAvgOccBetweenSet1HFP->setAxisTitle(HistOccYTitle, 2);
 
-  HistAvgOccBetweenSet1HFM = iBooker.bookProfile(
-      "HistAvgOccBetweenSet1HFM", "Average Occ Set1Between: HF-", MAX_LS, 0.5,
-      (double)MAX_LS + 0.5, OccBins, OccMin, OccMax);
+  HistAvgOccBetweenSet1HFM = iBooker.bookProfile("HistAvgOccBetweenSet1HFM",
+                                                 "Average Occ Set1Between: HF-",
+                                                 MAX_LS,
+                                                 0.5,
+                                                 (double)MAX_LS + 0.5,
+                                                 OccBins,
+                                                 OccMin,
+                                                 OccMax);
   HistAvgOccBetweenSet1HFM->setAxisTitle(HistXTitle, 1);
   HistAvgOccBetweenSet1HFM->setAxisTitle(HistOccYTitle, 2);
 
-  HistAvgOccAboveSet1HFP = iBooker.bookProfile(
-      "HistAvgOccAboveSet1HFP", "Average Occ Set1Above: HF+", MAX_LS, 0.5,
-      (double)MAX_LS + 0.5, OccBins, OccMin, OccMax);
+  HistAvgOccAboveSet1HFP = iBooker.bookProfile("HistAvgOccAboveSet1HFP",
+                                               "Average Occ Set1Above: HF+",
+                                               MAX_LS,
+                                               0.5,
+                                               (double)MAX_LS + 0.5,
+                                               OccBins,
+                                               OccMin,
+                                               OccMax);
   HistAvgOccAboveSet1HFP->setAxisTitle(HistXTitle, 1);
   HistAvgOccAboveSet1HFP->setAxisTitle(HistOccYTitle, 2);
 
-  HistAvgOccAboveSet1HFM = iBooker.bookProfile(
-      "HistAvgOccAboveSet1HFM", "Average Occ Set1Above: HF-", MAX_LS, 0.5,
-      (double)MAX_LS + 0.5, OccBins, OccMin, OccMax);
+  HistAvgOccAboveSet1HFM = iBooker.bookProfile("HistAvgOccAboveSet1HFM",
+                                               "Average Occ Set1Above: HF-",
+                                               MAX_LS,
+                                               0.5,
+                                               (double)MAX_LS + 0.5,
+                                               OccBins,
+                                               OccMin,
+                                               OccMax);
   HistAvgOccAboveSet1HFM->setAxisTitle(HistXTitle, 1);
   HistAvgOccAboveSet1HFM->setAxisTitle(HistOccYTitle, 2);
 
-  HistAvgOccBelowSet2HFP = iBooker.bookProfile(
-      "HistAvgOccBelowSet2HFP", "Average Occ Set2Below: HF+", MAX_LS, 0.5,
-      (double)MAX_LS + 0.5, OccBins, OccMin, OccMax);
+  HistAvgOccBelowSet2HFP = iBooker.bookProfile("HistAvgOccBelowSet2HFP",
+                                               "Average Occ Set2Below: HF+",
+                                               MAX_LS,
+                                               0.5,
+                                               (double)MAX_LS + 0.5,
+                                               OccBins,
+                                               OccMin,
+                                               OccMax);
   HistAvgOccBelowSet2HFP->setAxisTitle(HistXTitle, 1);
   HistAvgOccBelowSet2HFP->setAxisTitle(HistOccYTitle, 2);
 
-  HistAvgOccBelowSet2HFM = iBooker.bookProfile(
-      "HistAvgOccBelowSet2HFM", "Average Occ Set2Below: HF-", MAX_LS, 0.5,
-      (double)MAX_LS + 0.5, OccBins, OccMin, OccMax);
+  HistAvgOccBelowSet2HFM = iBooker.bookProfile("HistAvgOccBelowSet2HFM",
+                                               "Average Occ Set2Below: HF-",
+                                               MAX_LS,
+                                               0.5,
+                                               (double)MAX_LS + 0.5,
+                                               OccBins,
+                                               OccMin,
+                                               OccMax);
   HistAvgOccBelowSet2HFM->setAxisTitle(HistXTitle, 1);
   HistAvgOccBelowSet2HFM->setAxisTitle(HistOccYTitle, 2);
 
-  HistAvgOccBetweenSet2HFP = iBooker.bookProfile(
-      "HistAvgOccBetweenSet2HFP", "Average Occ Set2Between: HF+", MAX_LS, 0.5,
-      (double)MAX_LS + 0.5, OccBins, OccMin, OccMax);
+  HistAvgOccBetweenSet2HFP = iBooker.bookProfile("HistAvgOccBetweenSet2HFP",
+                                                 "Average Occ Set2Between: HF+",
+                                                 MAX_LS,
+                                                 0.5,
+                                                 (double)MAX_LS + 0.5,
+                                                 OccBins,
+                                                 OccMin,
+                                                 OccMax);
   HistAvgOccBetweenSet2HFP->setAxisTitle(HistXTitle, 1);
   HistAvgOccBetweenSet2HFP->setAxisTitle(HistOccYTitle, 2);
 
-  HistAvgOccBetweenSet2HFM = iBooker.bookProfile(
-      "HistAvgOccBetweenSet2HFM", "Average Occ Set2Between: HF-", MAX_LS, 0.5,
-      (double)MAX_LS + 0.5, OccBins, OccMin, OccMax);
+  HistAvgOccBetweenSet2HFM = iBooker.bookProfile("HistAvgOccBetweenSet2HFM",
+                                                 "Average Occ Set2Between: HF-",
+                                                 MAX_LS,
+                                                 0.5,
+                                                 (double)MAX_LS + 0.5,
+                                                 OccBins,
+                                                 OccMin,
+                                                 OccMax);
   HistAvgOccBetweenSet2HFM->setAxisTitle(HistXTitle, 1);
   HistAvgOccBetweenSet2HFM->setAxisTitle(HistOccYTitle, 2);
 
-  HistAvgOccAboveSet2HFP = iBooker.bookProfile(
-      "HistAvgOccAboveSet2HFP", "Average Occ Set2Above: HF+", MAX_LS, 0.5,
-      (double)MAX_LS + 0.5, OccBins, OccMin, OccMax);
+  HistAvgOccAboveSet2HFP = iBooker.bookProfile("HistAvgOccAboveSet2HFP",
+                                               "Average Occ Set2Above: HF+",
+                                               MAX_LS,
+                                               0.5,
+                                               (double)MAX_LS + 0.5,
+                                               OccBins,
+                                               OccMin,
+                                               OccMax);
   HistAvgOccAboveSet2HFP->setAxisTitle(HistXTitle, 1);
   HistAvgOccAboveSet2HFP->setAxisTitle(HistOccYTitle, 2);
 
-  HistAvgOccAboveSet2HFM = iBooker.bookProfile(
-      "HistAvgOccAboveSet2HFM", "Average Occ Set2Above: HF-", MAX_LS, 0.5,
-      (double)MAX_LS + 0.5, OccBins, OccMin, OccMax);
+  HistAvgOccAboveSet2HFM = iBooker.bookProfile("HistAvgOccAboveSet2HFM",
+                                               "Average Occ Set2Above: HF-",
+                                               MAX_LS,
+                                               0.5,
+                                               (double)MAX_LS + 0.5,
+                                               OccBins,
+                                               OccMin,
+                                               OccMax);
   HistAvgOccAboveSet2HFM->setAxisTitle(HistXTitle, 1);
   HistAvgOccAboveSet2HFM->setAxisTitle(HistOccYTitle, 2);
 
   // Et Sum histories
-  BXvsTimeAvgEtSumHFP =
-      iBooker.book2D("BXvsTimeAvgEtSumHFP", "Average Et Sum: HF+", MAX_LS, 0.5,
-                     (double)MAX_LS + 0.5, NBINS, (double)XMIN, (double)XMAX);
+  BXvsTimeAvgEtSumHFP = iBooker.book2D("BXvsTimeAvgEtSumHFP",
+                                       "Average Et Sum: HF+",
+                                       MAX_LS,
+                                       0.5,
+                                       (double)MAX_LS + 0.5,
+                                       NBINS,
+                                       (double)XMIN,
+                                       (double)XMAX);
   BXvsTimeAvgEtSumHFP->setAxisTitle(BXvsTimeXTitle, 1);
   BXvsTimeAvgEtSumHFP->setAxisTitle(BXvsTimeYTitle, 2);
 
-  BXvsTimeAvgEtSumHFM =
-      iBooker.book2D("BXvsTimeAvgEtSumHFM", "Average Et Sum: HF-", MAX_LS, 0.5,
-                     (double)MAX_LS + 0.5, NBINS, (double)XMIN, (double)XMAX);
+  BXvsTimeAvgEtSumHFM = iBooker.book2D("BXvsTimeAvgEtSumHFM",
+                                       "Average Et Sum: HF-",
+                                       MAX_LS,
+                                       0.5,
+                                       (double)MAX_LS + 0.5,
+                                       NBINS,
+                                       (double)XMIN,
+                                       (double)XMAX);
   BXvsTimeAvgEtSumHFM->setAxisTitle(BXvsTimeXTitle, 1);
   BXvsTimeAvgEtSumHFM->setAxisTitle(BXvsTimeYTitle, 2);
 
   iBooker.setCurrentFolder(monitorName_ + "/HistoryLumi");
 
   // Lumi Histories
-  HistAvgLumiEtSum = iBooker.bookProfile(
-      "HistAvgLumiEtSum", "Average Instant Luminosity: Et Sum", MAX_LS, 0.5,
-      (double)MAX_LS + 0.5, EtSumBins, EtSumMin, EtSumMax);
+  HistAvgLumiEtSum = iBooker.bookProfile("HistAvgLumiEtSum",
+                                         "Average Instant Luminosity: Et Sum",
+                                         MAX_LS,
+                                         0.5,
+                                         (double)MAX_LS + 0.5,
+                                         EtSumBins,
+                                         EtSumMin,
+                                         EtSumMax);
   HistAvgLumiEtSum->setAxisTitle(HistXTitle, 1);
   HistAvgLumiEtSum->setAxisTitle(HistLumiYTitle, 2);
 
-  HistAvgLumiOccSet1 = iBooker.bookProfile(
-      "HistAvgLumiOccSet1", "Average Instant Luminosity: Occ Set1", MAX_LS, 0.5,
-      (double)MAX_LS + 0.5, OccBins, OccMin, OccMax);
+  HistAvgLumiOccSet1 = iBooker.bookProfile("HistAvgLumiOccSet1",
+                                           "Average Instant Luminosity: Occ Set1",
+                                           MAX_LS,
+                                           0.5,
+                                           (double)MAX_LS + 0.5,
+                                           OccBins,
+                                           OccMin,
+                                           OccMax);
   HistAvgLumiOccSet1->setAxisTitle(HistXTitle, 1);
   HistAvgLumiOccSet1->setAxisTitle(HistLumiYTitle, 2);
 
-  HistAvgLumiOccSet2 = iBooker.bookProfile(
-      "HistAvgLumiOccSet2", "Average Instant Luminosity: Occ Set2", MAX_LS, 0.5,
-      (double)MAX_LS + 0.5, OccBins, OccMin, OccMax);
+  HistAvgLumiOccSet2 = iBooker.bookProfile("HistAvgLumiOccSet2",
+                                           "Average Instant Luminosity: Occ Set2",
+                                           MAX_LS,
+                                           0.5,
+                                           (double)MAX_LS + 0.5,
+                                           OccBins,
+                                           OccMin,
+                                           OccMax);
   HistAvgLumiOccSet2->setAxisTitle(HistXTitle, 1);
   HistAvgLumiOccSet2->setAxisTitle(HistLumiYTitle, 2);
 
   HistInstantLumiEtSum =
-      iBooker.book1D("HistInstantLumiEtSum", "Instant Luminosity: Et Sum",
-                     MAX_LS, 0.5, (double)MAX_LS + 0.5);
+      iBooker.book1D("HistInstantLumiEtSum", "Instant Luminosity: Et Sum", MAX_LS, 0.5, (double)MAX_LS + 0.5);
   HistInstantLumiEtSum->setAxisTitle(HistXTitle, 1);
   HistInstantLumiEtSum->setAxisTitle(HistLumiYTitle, 2);
 
   HistInstantLumiOccSet1 =
-      iBooker.book1D("HistInstantLumiOccSet1", "Instant Luminosity: Occ Set1",
-                     MAX_LS, 0.5, (double)MAX_LS + 0.5);
+      iBooker.book1D("HistInstantLumiOccSet1", "Instant Luminosity: Occ Set1", MAX_LS, 0.5, (double)MAX_LS + 0.5);
   HistInstantLumiOccSet1->setAxisTitle(HistXTitle, 1);
   HistInstantLumiOccSet1->setAxisTitle(HistLumiYTitle, 2);
 
   HistInstantLumiOccSet2 =
-      iBooker.book1D("HistInstantLumiOccSet2", "Instant Luminosity: Occ Set2",
-                     MAX_LS, 0.5, (double)MAX_LS + 0.5);
+      iBooker.book1D("HistInstantLumiOccSet2", "Instant Luminosity: Occ Set2", MAX_LS, 0.5, (double)MAX_LS + 0.5);
   HistInstantLumiOccSet2->setAxisTitle(HistXTitle, 1);
   HistInstantLumiOccSet2->setAxisTitle(HistLumiYTitle, 2);
 
   HistInstantLumiEtSumError =
-      iBooker.book1D("HistInstantLumiEtSumError", "Luminosity Error: Et Sum",
-                     MAX_LS, 0.5, (double)MAX_LS + 0.5);
+      iBooker.book1D("HistInstantLumiEtSumError", "Luminosity Error: Et Sum", MAX_LS, 0.5, (double)MAX_LS + 0.5);
   HistInstantLumiEtSumError->setAxisTitle(HistXTitle, 1);
   HistInstantLumiEtSumError->setAxisTitle(HistLumiErrorYTitle, 2);
 
-  HistInstantLumiOccSet1Error = iBooker.book1D(
-      "HistInstantLumiOccSet1Error", "Luminosity Error: Occ Set1", MAX_LS, 0.5,
-      (double)MAX_LS + 0.5);
+  HistInstantLumiOccSet1Error =
+      iBooker.book1D("HistInstantLumiOccSet1Error", "Luminosity Error: Occ Set1", MAX_LS, 0.5, (double)MAX_LS + 0.5);
   HistInstantLumiOccSet1Error->setAxisTitle(HistXTitle, 1);
   HistInstantLumiOccSet1Error->setAxisTitle(HistLumiErrorYTitle, 2);
 
-  HistInstantLumiOccSet2Error = iBooker.book1D(
-      "HistInstantLumiOccSet2Error", "Luminosity Error: Occ Set2", MAX_LS, 0.5,
-      (double)MAX_LS + 0.5);
+  HistInstantLumiOccSet2Error =
+      iBooker.book1D("HistInstantLumiOccSet2Error", "Luminosity Error: Occ Set2", MAX_LS, 0.5, (double)MAX_LS + 0.5);
   HistInstantLumiOccSet2Error->setAxisTitle(HistXTitle, 1);
   HistInstantLumiOccSet2Error->setAxisTitle(HistLumiErrorYTitle, 2);
 
   HistIntegratedLumiEtSum =
-      iBooker.book1D("HistIntegratedLumiEtSum", "Integrated Luminosity: Et Sum",
-                     MAX_LS, 0.5, (double)MAX_LS + 0.5);
+      iBooker.book1D("HistIntegratedLumiEtSum", "Integrated Luminosity: Et Sum", MAX_LS, 0.5, (double)MAX_LS + 0.5);
   HistIntegratedLumiEtSum->setAxisTitle(HistXTitle, 1);
   HistIntegratedLumiEtSum->setAxisTitle(HistLumiYTitle, 2);
 
-  HistIntegratedLumiOccSet1 = iBooker.book1D("HistIntegratedLumiOccSet1",
-                                             "Integrated Luminosity: Occ Set1",
-                                             MAX_LS, 0.5, (double)MAX_LS + 0.5);
+  HistIntegratedLumiOccSet1 =
+      iBooker.book1D("HistIntegratedLumiOccSet1", "Integrated Luminosity: Occ Set1", MAX_LS, 0.5, (double)MAX_LS + 0.5);
   HistIntegratedLumiOccSet1->setAxisTitle(HistXTitle, 1);
   HistIntegratedLumiOccSet1->setAxisTitle(HistLumiYTitle, 2);
 
-  HistIntegratedLumiOccSet2 = iBooker.book1D("HistIntegratedLumiOccSet2",
-                                             "Integrated Luminosity: Occ Set2",
-                                             MAX_LS, 0.5, (double)MAX_LS + 0.5);
+  HistIntegratedLumiOccSet2 =
+      iBooker.book1D("HistIntegratedLumiOccSet2", "Integrated Luminosity: Occ Set2", MAX_LS, 0.5, (double)MAX_LS + 0.5);
   HistIntegratedLumiOccSet2->setAxisTitle(HistXTitle, 1);
   HistIntegratedLumiOccSet2->setAxisTitle(HistLumiYTitle, 2);
 
@@ -708,43 +743,37 @@ void HLXMonitor::SetupHists(DQMStore::IBooker& iBooker) {
 
   // Lumi Recent Histories (past 128 short sections)
   RecentInstantLumiEtSum =
-      iBooker.book1D("RecentInstantLumiEtSum", "Instant Luminosity: Et Sum",
-                     128, 0.5, (double)128 + 0.5);
+      iBooker.book1D("RecentInstantLumiEtSum", "Instant Luminosity: Et Sum", 128, 0.5, (double)128 + 0.5);
   RecentInstantLumiEtSum->setAxisTitle(RecentHistXTitle, 1);
   RecentInstantLumiEtSum->setAxisTitle(HistLumiYTitle, 2);
 
   RecentInstantLumiOccSet1 =
-      iBooker.book1D("RecentInstantLumiOccSet1", "Instant Luminosity: Occ Set1",
-                     128, 0.5, (double)128 + 0.5);
+      iBooker.book1D("RecentInstantLumiOccSet1", "Instant Luminosity: Occ Set1", 128, 0.5, (double)128 + 0.5);
   RecentInstantLumiOccSet1->setAxisTitle(RecentHistXTitle, 1);
   RecentInstantLumiOccSet1->setAxisTitle(HistLumiYTitle, 2);
 
   RecentInstantLumiOccSet2 =
-      iBooker.book1D("RecentInstantLumiOccSet2", "Instant Luminosity: Occ Set2",
-                     128, 0.5, (double)128 + 0.5);
+      iBooker.book1D("RecentInstantLumiOccSet2", "Instant Luminosity: Occ Set2", 128, 0.5, (double)128 + 0.5);
   RecentInstantLumiOccSet2->setAxisTitle(RecentHistXTitle, 1);
   RecentInstantLumiOccSet2->setAxisTitle(HistLumiYTitle, 2);
 
-  RecentIntegratedLumiEtSum = iBooker.book1D("RecentIntegratedLumiEtSum",
-                                             "Integrated Luminosity: Et Sum",
-                                             128, 0.5, (double)128 + 0.5);
+  RecentIntegratedLumiEtSum =
+      iBooker.book1D("RecentIntegratedLumiEtSum", "Integrated Luminosity: Et Sum", 128, 0.5, (double)128 + 0.5);
   RecentIntegratedLumiEtSum->setAxisTitle(RecentHistXTitle, 1);
   RecentIntegratedLumiEtSum->setAxisTitle(HistLumiYTitle, 2);
 
-  RecentIntegratedLumiOccSet1 = iBooker.book1D(
-      "RecentIntegratedLumiOccSet1", "Integrated Luminosity: Occ Set1", 128,
-      0.5, (double)128 + 0.5);
+  RecentIntegratedLumiOccSet1 =
+      iBooker.book1D("RecentIntegratedLumiOccSet1", "Integrated Luminosity: Occ Set1", 128, 0.5, (double)128 + 0.5);
   RecentIntegratedLumiOccSet1->setAxisTitle(RecentHistXTitle, 1);
   RecentIntegratedLumiOccSet1->setAxisTitle(HistLumiYTitle, 2);
 
-  RecentIntegratedLumiOccSet2 = iBooker.book1D(
-      "RecentIntegratedLumiOccSet2", "Integrated Luminosity: Occ Set2", 128,
-      0.5, (double)128 + 0.5);
+  RecentIntegratedLumiOccSet2 =
+      iBooker.book1D("RecentIntegratedLumiOccSet2", "Integrated Luminosity: Occ Set2", 128, 0.5, (double)128 + 0.5);
   RecentIntegratedLumiOccSet2->setAxisTitle(RecentHistXTitle, 1);
   RecentIntegratedLumiOccSet2->setAxisTitle(HistLumiYTitle, 2);
 }
 
-void HLXMonitor::SetupEventInfo(DQMStore::IBooker& iBooker) {
+void HLXMonitor::SetupEventInfo(DQMStore::IBooker &iBooker) {
   using std::string;
 
   string currentfolder = subSystemName_ + "/" + eventInfoFolderHLX_;
@@ -796,13 +825,12 @@ void HLXMonitor::SetupEventInfo(DQMStore::IBooker& iBooker) {
   iBooker.setCurrentFolder(currentfolder);
 
   reportSummary_ = iBooker.bookFloat("reportSummary");
-  reportSummaryMap_ = iBooker.book2D("reportSummaryMap", "reportSummaryMap", 18,
-                                     0., 18., 2, -1.5, 1.5);
+  reportSummaryMap_ = iBooker.book2D("reportSummaryMap", "reportSummaryMap", 18, 0., 18., 2, -1.5, 1.5);
 
   currentfolder = subSystemName_ + "/" + eventInfoFolderHLX_;
   iBooker.setCurrentFolder(currentfolder);
 
-  TH2F* summaryHist = reportSummaryMap_->getTH2F();
+  TH2F *summaryHist = reportSummaryMap_->getTH2F();
   summaryHist->GetYaxis()->SetBinLabel(1, "HF-");
   summaryHist->GetYaxis()->SetBinLabel(2, "HF+");
   summaryHist->GetXaxis()->SetTitle("Wedge #");
@@ -823,8 +851,7 @@ void HLXMonitor::SetupEventInfo(DQMStore::IBooker& iBooker) {
 }
 
 // ------------ method called to for each event  ------------
-void HLXMonitor::analyze(const edm::Event& iEvent,
-                         const edm::EventSetup& iSetup) {
+void HLXMonitor::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace edm;
 
   while (HLXTCP.IsConnected() == false) {
@@ -834,7 +861,8 @@ void HLXMonitor::analyze(const edm::Event& iEvent,
       sleep(1);
       std::cout << "Trying " << DistribIP2 << std::endl;
       HLXTCP.SetIP(DistribIP2);
-      if (HLXTCP.Connect() == 1) break;
+      if (HLXTCP.Connect() == 1)
+        break;
       std::cout << "Failed to connect to " << DistribIP2 << "." << std::endl;
       std::cout << " Reconnect in " << reconnTime << " seconds." << std::endl;
       sleep(reconnTime);
@@ -864,8 +892,7 @@ void HLXMonitor::analyze(const edm::Event& iEvent,
     FillEventInfo(lumiSection, iEvent);
     FillReportSummary();
 
-    cout << "Run: " << lumiSection.hdr.runNumber
-         << " Section: " << lumiSection.hdr.sectionNumber
+    cout << "Run: " << lumiSection.hdr.runNumber << " Section: " << lumiSection.hdr.sectionNumber
          << " Orbit: " << lumiSection.hdr.startOrbit << endl;
     cout << "Et Lumi: " << lumiSection.lumiSummary.InstantETLumi << endl;
     cout << "Occ Lumi 1: " << lumiSection.lumiSummary.InstantOccLumi[0] << endl;
@@ -881,10 +908,12 @@ void HLXMonitor::EndRun() {
 
   // Do some things that should be done at the end of the run ...
   expectedNibbles_ = 0;
-  for (unsigned int iHLX = 0; iHLX < NUM_HLX; ++iHLX) totalNibbles_[iHLX] = 0;
+  for (unsigned int iHLX = 0; iHLX < NUM_HLX; ++iHLX)
+    totalNibbles_[iHLX] = 0;
 
   std::cout << "** Here in end run **" << std::endl;
-  if (ResetAtNewRun) ResetAll();
+  if (ResetAtNewRun)
+    ResetAll();
   runNumber_ = 0;
   currentRunEnded_ = true;
   sectionInstantSumEt = 0;
@@ -899,7 +928,7 @@ void HLXMonitor::EndRun() {
   previousSection = 0;
 }
 
-void HLXMonitor::FillHistograms(const LUMI_SECTION& section) {
+void HLXMonitor::FillHistograms(const LUMI_SECTION &section) {
   // Check for missing data
   if (previousSection != (section.hdr.sectionNumber - 1)) {
     double weight = (double)(section.hdr.sectionNumber - previousSection - 1);
@@ -919,70 +948,56 @@ void HLXMonitor::FillHistograms(const LUMI_SECTION& section) {
     // If we are already more than 2 LS's in, move everything back by one bin
     // and fill the last bin with the new value.
     for (int iBin = 1; iBin < 128; ++iBin) {
-      RecentInstantLumiEtSum->setBinContent(
-          iBin, RecentInstantLumiEtSum->getBinContent(iBin + 1));
-      RecentInstantLumiOccSet1->setBinContent(
-          iBin, RecentInstantLumiOccSet1->getBinContent(iBin + 1));
-      RecentInstantLumiOccSet2->setBinContent(
-          iBin, RecentInstantLumiOccSet2->getBinContent(iBin + 1));
-      RecentIntegratedLumiEtSum->setBinContent(
-          iBin, RecentIntegratedLumiEtSum->getBinContent(iBin + 1));
-      RecentIntegratedLumiOccSet1->setBinContent(
-          iBin, RecentIntegratedLumiOccSet1->getBinContent(iBin + 1));
-      RecentIntegratedLumiOccSet2->setBinContent(
-          iBin, RecentIntegratedLumiOccSet2->getBinContent(iBin + 1));
+      RecentInstantLumiEtSum->setBinContent(iBin, RecentInstantLumiEtSum->getBinContent(iBin + 1));
+      RecentInstantLumiOccSet1->setBinContent(iBin, RecentInstantLumiOccSet1->getBinContent(iBin + 1));
+      RecentInstantLumiOccSet2->setBinContent(iBin, RecentInstantLumiOccSet2->getBinContent(iBin + 1));
+      RecentIntegratedLumiEtSum->setBinContent(iBin, RecentIntegratedLumiEtSum->getBinContent(iBin + 1));
+      RecentIntegratedLumiOccSet1->setBinContent(iBin, RecentIntegratedLumiOccSet1->getBinContent(iBin + 1));
+      RecentIntegratedLumiOccSet2->setBinContent(iBin, RecentIntegratedLumiOccSet2->getBinContent(iBin + 1));
     }
     fillBin = 128;
   }
 
-  RecentInstantLumiEtSum->setBinContent(fillBin,
-                                        section.lumiSummary.InstantETLumi);
-  RecentInstantLumiEtSum->setBinError(fillBin,
-                                      section.lumiSummary.InstantETLumiErr);
-  RecentInstantLumiOccSet1->setBinContent(
-      fillBin, section.lumiSummary.InstantOccLumi[0]);
-  RecentInstantLumiOccSet1->setBinError(
-      fillBin, section.lumiSummary.InstantOccLumiErr[0]);
-  RecentInstantLumiOccSet2->setBinContent(
-      fillBin, section.lumiSummary.InstantOccLumi[1]);
-  RecentInstantLumiOccSet2->setBinError(
-      fillBin, section.lumiSummary.InstantOccLumiErr[1]);
-
-  double recentOldBinContent =
-      RecentIntegratedLumiEtSum->getBinContent(fillBin - 1);
-  if (fillBin == 1) recentOldBinContent = 0;
-  double recentNewBinContent =
-      recentOldBinContent + section.lumiSummary.InstantETLumi;
+  RecentInstantLumiEtSum->setBinContent(fillBin, section.lumiSummary.InstantETLumi);
+  RecentInstantLumiEtSum->setBinError(fillBin, section.lumiSummary.InstantETLumiErr);
+  RecentInstantLumiOccSet1->setBinContent(fillBin, section.lumiSummary.InstantOccLumi[0]);
+  RecentInstantLumiOccSet1->setBinError(fillBin, section.lumiSummary.InstantOccLumiErr[0]);
+  RecentInstantLumiOccSet2->setBinContent(fillBin, section.lumiSummary.InstantOccLumi[1]);
+  RecentInstantLumiOccSet2->setBinError(fillBin, section.lumiSummary.InstantOccLumiErr[1]);
+
+  double recentOldBinContent = RecentIntegratedLumiEtSum->getBinContent(fillBin - 1);
+  if (fillBin == 1)
+    recentOldBinContent = 0;
+  double recentNewBinContent = recentOldBinContent + section.lumiSummary.InstantETLumi;
   RecentIntegratedLumiEtSum->setBinContent(fillBin, recentNewBinContent);
   recentOldBinContent = RecentIntegratedLumiOccSet1->getBinContent(fillBin - 1);
-  if (fillBin == 1) recentOldBinContent = 0;
-  recentNewBinContent =
-      recentOldBinContent + section.lumiSummary.InstantOccLumi[0];
+  if (fillBin == 1)
+    recentOldBinContent = 0;
+  recentNewBinContent = recentOldBinContent + section.lumiSummary.InstantOccLumi[0];
   RecentIntegratedLumiOccSet1->setBinContent(fillBin, recentNewBinContent);
   recentOldBinContent = RecentIntegratedLumiOccSet2->getBinContent(fillBin - 1);
-  if (fillBin == 1) recentOldBinContent = 0;
-  recentNewBinContent =
-      recentOldBinContent + section.lumiSummary.InstantOccLumi[0];
+  if (fillBin == 1)
+    recentOldBinContent = 0;
+  recentNewBinContent = recentOldBinContent + section.lumiSummary.InstantOccLumi[0];
   RecentIntegratedLumiOccSet2->setBinContent(fillBin, recentNewBinContent);
 
-  double recentOldBinError =
-      RecentIntegratedLumiEtSum->getBinError(fillBin - 1);
-  if (fillBin == 1) recentOldBinError = 0;
+  double recentOldBinError = RecentIntegratedLumiEtSum->getBinError(fillBin - 1);
+  if (fillBin == 1)
+    recentOldBinError = 0;
   double recentNewBinError = sqrt(recentOldBinError * recentOldBinError +
-                                  section.lumiSummary.InstantETLumiErr *
-                                      section.lumiSummary.InstantETLumiErr);
+                                  section.lumiSummary.InstantETLumiErr * section.lumiSummary.InstantETLumiErr);
   RecentIntegratedLumiEtSum->setBinError(fillBin, recentNewBinError);
   recentOldBinError = RecentIntegratedLumiOccSet1->getBinError(fillBin - 1);
-  if (fillBin == 1) recentOldBinError = 0;
+  if (fillBin == 1)
+    recentOldBinError = 0;
   recentNewBinError = sqrt(recentOldBinError * recentOldBinError +
-                           section.lumiSummary.InstantOccLumiErr[0] *
-                               section.lumiSummary.InstantOccLumiErr[0]);
+                           section.lumiSummary.InstantOccLumiErr[0] * section.lumiSummary.InstantOccLumiErr[0]);
   RecentIntegratedLumiOccSet1->setBinError(fillBin, recentNewBinError);
   recentOldBinError = RecentIntegratedLumiOccSet2->getBinError(fillBin - 1);
-  if (fillBin == 1) recentOldBinError = 0;
+  if (fillBin == 1)
+    recentOldBinError = 0;
   recentNewBinError = sqrt(recentOldBinError * recentOldBinError +
-                           section.lumiSummary.InstantOccLumiErr[1] *
-                               section.lumiSummary.InstantOccLumiErr[1]);
+                           section.lumiSummary.InstantOccLumiErr[1] * section.lumiSummary.InstantOccLumiErr[1]);
   RecentIntegratedLumiOccSet2->setBinError(fillBin, recentNewBinError);
 
   if (lsBinOld != lsBin) {
@@ -994,11 +1009,14 @@ void HLXMonitor::FillHistograms(const LUMI_SECTION& section) {
     HistInstantLumiOccSet2->setBinError(lsBin, sqrt(sectionInstantErrSumOcc2));
 
     double etDenom = fabs(sectionInstantSumEt);
-    if (etDenom < 1e-10) etDenom = 1e-10;
+    if (etDenom < 1e-10)
+      etDenom = 1e-10;
     double occ1Denom = fabs(sectionInstantSumOcc1);
-    if (occ1Denom < 1e-10) occ1Denom = 1e-10;
+    if (occ1Denom < 1e-10)
+      occ1Denom = 1e-10;
     double occ2Denom = fabs(sectionInstantSumOcc2);
-    if (occ2Denom < 1e-10) occ2Denom = 1e-10;
+    if (occ2Denom < 1e-10)
+      occ2Denom = 1e-10;
     double etError = 100.0 * sqrt(sectionInstantErrSumEt) / etDenom;
     double occ1Error = 100.0 * sqrt(sectionInstantErrSumOcc1) / occ1Denom;
     double occ2Error = 100.0 * sqrt(sectionInstantErrSumOcc2) / occ2Denom;
@@ -1007,32 +1025,35 @@ void HLXMonitor::FillHistograms(const LUMI_SECTION& section) {
     HistInstantLumiOccSet2Error->setBinContent(lsBinOld, occ2Error);
 
     double histOldBinContent = HistIntegratedLumiEtSum->getBinContent(lsBinOld);
-    if (lsBinOld == 0) histOldBinContent = 0;
+    if (lsBinOld == 0)
+      histOldBinContent = 0;
     double histNewBinContent = histOldBinContent + sectionInstantSumEt;
     HistIntegratedLumiEtSum->setBinContent(lsBin, histNewBinContent);
     histOldBinContent = HistIntegratedLumiOccSet1->getBinContent(lsBinOld);
-    if (lsBinOld == 0) histOldBinContent = 0;
+    if (lsBinOld == 0)
+      histOldBinContent = 0;
     histNewBinContent = histOldBinContent + sectionInstantSumOcc1;
     HistIntegratedLumiOccSet1->setBinContent(lsBin, histNewBinContent);
     histOldBinContent = HistIntegratedLumiOccSet2->getBinContent(lsBinOld);
-    if (lsBinOld == 0) histOldBinContent = 0;
+    if (lsBinOld == 0)
+      histOldBinContent = 0;
     histNewBinContent = histOldBinContent + sectionInstantSumOcc2;
     HistIntegratedLumiOccSet2->setBinContent(lsBin, histNewBinContent);
 
     double histOldBinError = HistIntegratedLumiEtSum->getBinError(lsBinOld);
-    if (lsBinOld == 0) histOldBinError = 0;
-    double histNewBinError =
-        sqrt(histOldBinError * histOldBinError + sectionInstantErrSumEt);
+    if (lsBinOld == 0)
+      histOldBinError = 0;
+    double histNewBinError = sqrt(histOldBinError * histOldBinError + sectionInstantErrSumEt);
     HistIntegratedLumiEtSum->setBinError(lsBin, histNewBinError);
     histOldBinError = HistIntegratedLumiOccSet1->getBinError(lsBinOld);
-    if (lsBinOld == 0) histOldBinError = 0;
-    histNewBinError =
-        sqrt(histOldBinError * histOldBinError + sectionInstantErrSumOcc1);
+    if (lsBinOld == 0)
+      histOldBinError = 0;
+    histNewBinError = sqrt(histOldBinError * histOldBinError + sectionInstantErrSumOcc1);
     HistIntegratedLumiOccSet1->setBinError(lsBin, histNewBinError);
     histOldBinError = HistIntegratedLumiOccSet2->getBinError(lsBinOld);
-    if (lsBinOld == 0) histOldBinError = 0;
-    histNewBinError =
-        sqrt(histOldBinError * histOldBinError + sectionInstantErrSumOcc2);
+    if (lsBinOld == 0)
+      histOldBinError = 0;
+    histNewBinError = sqrt(histOldBinError * histOldBinError + sectionInstantErrSumOcc2);
     HistIntegratedLumiOccSet2->setBinError(lsBin, histNewBinError);
 
     sectionInstantSumEt = 0;
@@ -1046,14 +1067,11 @@ void HLXMonitor::FillHistograms(const LUMI_SECTION& section) {
   }
 
   sectionInstantSumEt += section.lumiSummary.InstantETLumi;
-  sectionInstantErrSumEt += section.lumiSummary.InstantETLumiErr *
-                            section.lumiSummary.InstantETLumiErr;
+  sectionInstantErrSumEt += section.lumiSummary.InstantETLumiErr * section.lumiSummary.InstantETLumiErr;
   sectionInstantSumOcc1 += section.lumiSummary.InstantOccLumi[0];
-  sectionInstantErrSumOcc1 += section.lumiSummary.InstantOccLumiErr[0] *
-                              section.lumiSummary.InstantOccLumiErr[0];
+  sectionInstantErrSumOcc1 += section.lumiSummary.InstantOccLumiErr[0] * section.lumiSummary.InstantOccLumiErr[0];
   sectionInstantSumOcc2 += section.lumiSummary.InstantOccLumi[1];
-  sectionInstantErrSumOcc2 += section.lumiSummary.InstantOccLumiErr[1] *
-                              section.lumiSummary.InstantOccLumiErr[1];
+  sectionInstantErrSumOcc2 += section.lumiSummary.InstantOccLumiErr[1] * section.lumiSummary.InstantOccLumiErr[1];
   ++sectionInstantNorm;
 
   LumiInstantEtSum->softReset();
@@ -1072,32 +1090,21 @@ void HLXMonitor::FillHistograms(const LUMI_SECTION& section) {
         norm[0] += section.occupancy[iHLX].data[set1BelowIndex][iBX];
         norm[0] += section.occupancy[iHLX].data[set1BetweenIndex][iBX];
         norm[0] += section.occupancy[iHLX].data[set1AboveIndex][iBX];
-        if (norm[0] == 0) norm[0] = 1;
+        if (norm[0] == 0)
+          norm[0] = 1;
         norm[1] += section.occupancy[iHLX].data[set2BelowIndex][iBX];
         norm[1] += section.occupancy[iHLX].data[set2BetweenIndex][iBX];
         norm[1] += section.occupancy[iHLX].data[set2AboveIndex][iBX];
-        if (norm[1] == 0) norm[1] = 1;
-
-        double normEt =
-            section.etSum[iHLX].data[iBX] / (double)(norm[0] + norm[1]);
-        double normOccSet1Below =
-            (double)section.occupancy[iHLX].data[set1BelowIndex][iBX] /
-            (double)norm[0];
-        double normOccSet1Between =
-            (double)section.occupancy[iHLX].data[set1BetweenIndex][iBX] /
-            (double)norm[0];
-        double normOccSet1Above =
-            (double)section.occupancy[iHLX].data[set1AboveIndex][iBX] /
-            (double)norm[0];
-        double normOccSet2Below =
-            (double)section.occupancy[iHLX].data[set2BelowIndex][iBX] /
-            (double)norm[1];
-        double normOccSet2Between =
-            (double)section.occupancy[iHLX].data[set2BetweenIndex][iBX] /
-            (double)norm[1];
-        double normOccSet2Above =
-            (double)section.occupancy[iHLX].data[set2AboveIndex][iBX] /
-            (double)norm[1];
+        if (norm[1] == 0)
+          norm[1] = 1;
+
+        double normEt = section.etSum[iHLX].data[iBX] / (double)(norm[0] + norm[1]);
+        double normOccSet1Below = (double)section.occupancy[iHLX].data[set1BelowIndex][iBX] / (double)norm[0];
+        double normOccSet1Between = (double)section.occupancy[iHLX].data[set1BetweenIndex][iBX] / (double)norm[0];
+        double normOccSet1Above = (double)section.occupancy[iHLX].data[set1AboveIndex][iBX] / (double)norm[0];
+        double normOccSet2Below = (double)section.occupancy[iHLX].data[set2BelowIndex][iBX] / (double)norm[1];
+        double normOccSet2Between = (double)section.occupancy[iHLX].data[set2BetweenIndex][iBX] / (double)norm[1];
+        double normOccSet2Above = (double)section.occupancy[iHLX].data[set2AboveIndex][iBX] / (double)norm[1];
 
         // Averages & check sum
         if (iBX < NUM_BUNCHES - 100) {
@@ -1121,8 +1128,7 @@ void HLXMonitor::FillHistograms(const LUMI_SECTION& section) {
             HistAvgOccAboveSet2HFP->Fill(lsBin, normOccSet2Above);
 
             if (iBX >= (XMIN - 1) && iBX <= (XMAX - 1))
-              BXvsTimeAvgEtSumHFP->Fill(
-                  lsBinBX, iBX, normEt / (num4NibblePerLS_ * 18.0 * 12.0));
+              BXvsTimeAvgEtSumHFP->Fill(lsBinBX, iBX, normEt / (num4NibblePerLS_ * 18.0 * 12.0));
           } else {
             HistAvgEtSumHFM->Fill(lsBin, normEt);
             HistAvgOccBelowSet1HFM->Fill(lsBin, normOccSet1Below);
@@ -1133,8 +1139,7 @@ void HLXMonitor::FillHistograms(const LUMI_SECTION& section) {
             HistAvgOccAboveSet2HFM->Fill(lsBin, normOccSet2Above);
 
             if (iBX >= (XMIN - 1) && iBX <= (XMAX - 1))
-              BXvsTimeAvgEtSumHFM->Fill(
-                  lsBinBX, iBX, normEt / (num4NibblePerLS_ * 18.0 * 12.0));
+              BXvsTimeAvgEtSumHFM->Fill(lsBinBX, iBX, normEt / (num4NibblePerLS_ * 18.0 * 12.0));
           }
 
           utotal1 += section.occupancy[iHLX].data[set1BelowIndex][iBX];
@@ -1148,47 +1153,34 @@ void HLXMonitor::FillHistograms(const LUMI_SECTION& section) {
 
         if (Style == "BX") {
           // Get the correct bin ...
-          TH1F* Set1BelowHist = Set1Below[iWedge]->getTH1F();
+          TH1F *Set1BelowHist = Set1Below[iWedge]->getTH1F();
           int iBin = Set1BelowHist->FindBin((float)iBX);
 
           // Adjust the old bin content to make the new, unnormalize and
           // renormalize
           if (lumiSectionCount > 0) {
-            double oldNormOccSet1Below =
-                (Set1Below[iWedge]->getBinContent(iBin)) *
-                (double)(lumiSectionCount);
+            double oldNormOccSet1Below = (Set1Below[iWedge]->getBinContent(iBin)) * (double)(lumiSectionCount);
             normOccSet1Below += oldNormOccSet1Below;
             normOccSet1Below /= (double)(lumiSectionCount + 1);
-            double oldNormOccSet2Below =
-                (Set2Below[iWedge]->getBinContent(iBin)) *
-                (double)(lumiSectionCount);
+            double oldNormOccSet2Below = (Set2Below[iWedge]->getBinContent(iBin)) * (double)(lumiSectionCount);
             normOccSet2Below += oldNormOccSet2Below;
             normOccSet2Below /= (double)(lumiSectionCount + 1);
 
-            double oldNormOccSet1Between =
-                (Set1Between[iWedge]->getBinContent(iBin)) *
-                (double)(lumiSectionCount);
+            double oldNormOccSet1Between = (Set1Between[iWedge]->getBinContent(iBin)) * (double)(lumiSectionCount);
             normOccSet1Between += oldNormOccSet1Between;
             normOccSet1Between /= (double)(lumiSectionCount + 1);
-            double oldNormOccSet2Between =
-                (Set2Between[iWedge]->getBinContent(iBin)) *
-                (double)(lumiSectionCount);
+            double oldNormOccSet2Between = (Set2Between[iWedge]->getBinContent(iBin)) * (double)(lumiSectionCount);
             normOccSet2Between += oldNormOccSet2Between;
             normOccSet2Between /= (double)(lumiSectionCount + 1);
 
-            double oldNormOccSet1Above =
-                (Set1Above[iWedge]->getBinContent(iBin)) *
-                (double)(lumiSectionCount);
+            double oldNormOccSet1Above = (Set1Above[iWedge]->getBinContent(iBin)) * (double)(lumiSectionCount);
             normOccSet1Above += oldNormOccSet1Above;
             normOccSet1Above /= (double)(lumiSectionCount + 1);
-            double oldNormOccSet2Above =
-                (Set2Above[iWedge]->getBinContent(iBin)) *
-                (double)(lumiSectionCount);
+            double oldNormOccSet2Above = (Set2Above[iWedge]->getBinContent(iBin)) * (double)(lumiSectionCount);
             normOccSet2Above += oldNormOccSet2Above;
             normOccSet2Above /= (double)(lumiSectionCount + 1);
 
-            double oldNormEt =
-                ETSum[iWedge]->getBinContent(iBin) * (double)(lumiSectionCount);
+            double oldNormEt = ETSum[iWedge]->getBinContent(iBin) * (double)(lumiSectionCount);
             normEt += oldNormEt;
             normEt /= (double)(lumiSectionCount + 1);
           }
@@ -1263,46 +1255,45 @@ void HLXMonitor::FillHistograms(const LUMI_SECTION& section) {
     int iBin = iBX - (int)XMIN + 1;
     if (iBin <= int(XMAX - XMIN) && iBin >= 1) {
       LumiInstantEtSum->setBinContent(iBin, section.lumiDetail.ETLumi[iBX]);
-      LumiInstantOccSet1->setBinContent(iBin,
-                                        section.lumiDetail.OccLumi[0][iBX]);
-      LumiInstantOccSet2->setBinContent(iBin,
-                                        section.lumiDetail.OccLumi[1][iBX]);
+      LumiInstantOccSet1->setBinContent(iBin, section.lumiDetail.OccLumi[0][iBX]);
+      LumiInstantOccSet2->setBinContent(iBin, section.lumiDetail.OccLumi[1][iBX]);
       LumiInstantEtSum->setBinError(iBin, section.lumiDetail.ETLumiErr[iBX]);
-      LumiInstantOccSet1->setBinError(iBin,
-                                      section.lumiDetail.OccLumiErr[0][iBX]);
-      LumiInstantOccSet2->setBinError(iBin,
-                                      section.lumiDetail.OccLumiErr[1][iBX]);
+      LumiInstantOccSet1->setBinError(iBin, section.lumiDetail.OccLumiErr[0][iBX]);
+      LumiInstantOccSet2->setBinError(iBin, section.lumiDetail.OccLumiErr[1][iBX]);
 
       double oldBinContent = LumiIntegratedEtSum->getBinContent(iBin);
-      if (lumiSectionCount == 0) oldBinContent = 0;
+      if (lumiSectionCount == 0)
+        oldBinContent = 0;
       double newBinContent = oldBinContent + section.lumiDetail.ETLumi[iBX];
       LumiIntegratedEtSum->setBinContent(iBin, newBinContent);
       oldBinContent = LumiIntegratedOccSet1->getBinContent(iBin);
-      if (lumiSectionCount == 0) oldBinContent = 0;
+      if (lumiSectionCount == 0)
+        oldBinContent = 0;
       newBinContent = oldBinContent + section.lumiDetail.OccLumi[0][iBX];
       LumiIntegratedOccSet1->setBinContent(iBin, newBinContent);
       oldBinContent = LumiIntegratedOccSet2->getBinContent(iBin);
-      if (lumiSectionCount == 0) oldBinContent = 0;
+      if (lumiSectionCount == 0)
+        oldBinContent = 0;
       newBinContent = oldBinContent + section.lumiDetail.OccLumi[1][iBX];
       LumiIntegratedOccSet2->setBinContent(iBin, newBinContent);
 
       double oldBinError = LumiIntegratedEtSum->getBinError(iBin);
-      if (lumiSectionCount == 0) oldBinError = 0;
-      double newBinError = sqrt(oldBinError * oldBinError +
-                                section.lumiDetail.ETLumiErr[iBX] *
-                                    section.lumiDetail.ETLumiErr[iBX]);
+      if (lumiSectionCount == 0)
+        oldBinError = 0;
+      double newBinError =
+          sqrt(oldBinError * oldBinError + section.lumiDetail.ETLumiErr[iBX] * section.lumiDetail.ETLumiErr[iBX]);
       LumiIntegratedEtSum->setBinError(iBin, newBinError);
       oldBinError = LumiIntegratedOccSet1->getBinError(iBin);
-      if (lumiSectionCount == 0) oldBinError = 0;
+      if (lumiSectionCount == 0)
+        oldBinError = 0;
       newBinError = sqrt(oldBinError * oldBinError +
-                         section.lumiDetail.OccLumiErr[0][iBX] *
-                             section.lumiDetail.OccLumiErr[0][iBX]);
+                         section.lumiDetail.OccLumiErr[0][iBX] * section.lumiDetail.OccLumiErr[0][iBX]);
       LumiIntegratedOccSet1->setBinError(iBin, newBinError);
       oldBinError = LumiIntegratedOccSet1->getBinError(iBin);
-      if (lumiSectionCount == 0) oldBinError = 0;
+      if (lumiSectionCount == 0)
+        oldBinError = 0;
       newBinError = sqrt(oldBinError * oldBinError +
-                         section.lumiDetail.OccLumiErr[1][iBX] *
-                             section.lumiDetail.OccLumiErr[1][iBX]);
+                         section.lumiDetail.OccLumiErr[1][iBX] * section.lumiDetail.OccLumiErr[1][iBX]);
       LumiIntegratedOccSet2->setBinError(iBin, newBinError);
     }
   }
@@ -1337,7 +1328,7 @@ void HLXMonitor::FillHistograms(const LUMI_SECTION& section) {
   MaxInstLumiBX4->Fill(max[3] * 0.9e1);
   MaxInstLumiBXNum4->Fill(bxmax[3]);
 
-  TH1F* tmpHist = MaxInstLumiBX1->getTH1F();
+  TH1F *tmpHist = MaxInstLumiBX1->getTH1F();
   double minX = tmpHist->GetBinLowEdge(1);
   double maxX = tmpHist->GetBinLowEdge(tmpHist->GetNbinsX() + 1);
 
@@ -1368,20 +1359,18 @@ void HLXMonitor::FillHistograms(const LUMI_SECTION& section) {
   ++lumiSectionCount;
 }
 
-void HLXMonitor::FillHistoHFCompare(const LUMI_SECTION& section) {
+void HLXMonitor::FillHistoHFCompare(const LUMI_SECTION &section) {
   for (unsigned int iHLX = 0; iHLX < NUM_HLX; ++iHLX) {
     unsigned int iWedge = HLXHFMap[iHLX];
 
     if (section.occupancy[iHLX].hdr.numNibbles != 0) {
-      float nActvTwrsSet1 =
-          section.occupancy[iHLX].data[set1AboveIndex][TriggerBX] +
-          section.occupancy[iHLX].data[set1BetweenIndex][TriggerBX] +
-          section.occupancy[iHLX].data[set1BelowIndex][TriggerBX];
+      float nActvTwrsSet1 = section.occupancy[iHLX].data[set1AboveIndex][TriggerBX] +
+                            section.occupancy[iHLX].data[set1BetweenIndex][TriggerBX] +
+                            section.occupancy[iHLX].data[set1BelowIndex][TriggerBX];
 
-      float nActvTwrsSet2 =
-          section.occupancy[iHLX].data[set2AboveIndex][TriggerBX] +
-          section.occupancy[iHLX].data[set2BetweenIndex][TriggerBX] +
-          section.occupancy[iHLX].data[set2BelowIndex][TriggerBX];
+      float nActvTwrsSet2 = section.occupancy[iHLX].data[set2AboveIndex][TriggerBX] +
+                            section.occupancy[iHLX].data[set2BetweenIndex][TriggerBX] +
+                            section.occupancy[iHLX].data[set2BelowIndex][TriggerBX];
 
       float total = nActvTwrsSet1 + nActvTwrsSet2;
 
@@ -1392,44 +1381,31 @@ void HLXMonitor::FillHistoHFCompare(const LUMI_SECTION& section) {
       }
 
       if (nActvTwrsSet1 > 0) {
-        float tempData =
-            (float)section.occupancy[iHLX].data[set1BelowIndex][TriggerBX] /
-            nActvTwrsSet1;
+        float tempData = (float)section.occupancy[iHLX].data[set1BelowIndex][TriggerBX] / nActvTwrsSet1;
         HFCompareOccBelowSet1->Fill(iWedge, tempData);
 
-        tempData =
-            (float)section.occupancy[iHLX].data[set1BetweenIndex][TriggerBX] /
-            nActvTwrsSet1;
+        tempData = (float)section.occupancy[iHLX].data[set1BetweenIndex][TriggerBX] / nActvTwrsSet1;
         HFCompareOccBetweenSet1->Fill(iWedge, tempData);
 
-        tempData =
-            (float)section.occupancy[iHLX].data[set1AboveIndex][TriggerBX] /
-            nActvTwrsSet1;
+        tempData = (float)section.occupancy[iHLX].data[set1AboveIndex][TriggerBX] / nActvTwrsSet1;
         HFCompareOccAboveSet1->Fill(iWedge, tempData);
       }
 
       if (nActvTwrsSet2 > 0) {
-        float tempData =
-            (float)section.occupancy[iHLX].data[set2BelowIndex][TriggerBX] /
-            nActvTwrsSet2;
+        float tempData = (float)section.occupancy[iHLX].data[set2BelowIndex][TriggerBX] / nActvTwrsSet2;
         HFCompareOccBelowSet2->Fill(iWedge, tempData);
 
-        tempData =
-            (float)section.occupancy[iHLX].data[set2BetweenIndex][TriggerBX] /
-            nActvTwrsSet2;
+        tempData = (float)section.occupancy[iHLX].data[set2BetweenIndex][TriggerBX] / nActvTwrsSet2;
         HFCompareOccBetweenSet2->Fill(iWedge, tempData);
 
-        tempData =
-            (float)section.occupancy[iHLX].data[set2AboveIndex][TriggerBX] /
-            nActvTwrsSet2;
+        tempData = (float)section.occupancy[iHLX].data[set2AboveIndex][TriggerBX] / nActvTwrsSet2;
         HFCompareOccAboveSet2->Fill(iWedge, tempData);
       }
     }
   }
 }
 
-void HLXMonitor::FillEventInfo(const LUMI_SECTION& section,
-                               const edm::Event& e) {
+void HLXMonitor::FillEventInfo(const LUMI_SECTION &section, const edm::Event &e) {
   // New run .. set the run number and fill run summaries ...
   // std::cout << "Run number " << runNumber_ << " Section hdr run number "
   //	     << section.hdr.runNumber << std::endl;
@@ -1483,7 +1459,8 @@ void HLXMonitor::FillReportSummary() {
   }
 
   overall /= (float)NUM_HLX;
-  if (overall > 1.0) overall = 0.0;
+  if (overall > 1.0)
+    overall = 0.0;
   // std::cout << "Filling report summary! Main. " << overall << std::endl;
   reportSummary_->Fill(overall);
 }
@@ -1585,9 +1562,10 @@ void HLXMonitor::ResetAll() {
   BXvsTimeAvgEtSumHFM->softReset();
 }
 
-double HLXMonitor::getUTCtime(timeval* a, timeval* b) {
+double HLXMonitor::getUTCtime(timeval *a, timeval *b) {
   double deltaT = (*a).tv_sec * 1000.0 + (*a).tv_usec / 1000.0;
-  if (b != nullptr) deltaT = (*b).tv_sec * 1000.0 + (*b).tv_usec / 1000.0 - deltaT;
+  if (b != nullptr)
+    deltaT = (*b).tv_sec * 1000.0 + (*b).tv_usec / 1000.0 - deltaT;
   return deltaT / 1000.0;
 }
 
diff --git a/DQM/HcalCommon/interface/Constants.h b/DQM/HcalCommon/interface/Constants.h
index 3634a45a76fca..cc5f25a76a45e 100644
--- a/DQM/HcalCommon/interface/Constants.h
+++ b/DQM/HcalCommon/interface/Constants.h
@@ -5,350 +5,301 @@
 
 #include <vector>
 
-namespace hcaldqm
-{
-	namespace constants
-	{
-		/*
-		 *	Detector Subsystem Status States
-		 */
-		double const GOOD = 1.0;
-		double const PROBLEMATIC = 0.9;
-		double const BAD = 0.5;
-		double const VERY_LOW = 0.5;
-		double const VERY_LOW_XXX = 0;
-		double const NOT_APPLICABLE = -1;
-		double const DELTA = 0.005;
-
-		/*
-		 *	Electronics Constants
-		 */
-		//	FED2Crate array and CRATE2FED array
-		//	use conversion functions in Utilities.h
-		//	For fast look up
-		//	This is for uTCA Crates/FEDs only - no other way...
-		std::map<unsigned int, unsigned int> const crate2fed_map = {
-			{24, 1100},
-			{20, 1102},
-			{21, 1104},
-			{25, 1106},
-			{31, 1108},
-			{35, 1110},
-			{37, 1112},
-			{34, 1114},
-			{30, 1116},
-			{22, 1118},
-			{29, 1120},
-			{32, 1122},
-			{38, 1134},
-			{3, 724},
-			{7, 726},
-			{6, 728},
-			{13, 730},
-		};
-
-		std::map<unsigned int, unsigned int> const fed2crate_map = {
-			{724, 3},
-			{725, 3},
-			{726, 7},
-			{727, 7},
-			{728, 6},
-			{729, 6},
-			{730, 13},
-			{731, 13},
-			{1100, 24},
-			{1101, 24},
-			{1102, 20},
-			{1103, 20},
-			{1104, 21},
-			{1105, 21},
-			{1106, 25},
-			{1107, 25},
-			{1108, 31},
-			{1109, 31},
-			{1110, 35},
-			{1111, 35},
-			{1112, 37},
-			{1113, 37},
-			{1114, 34},
-			{1115, 34},
-			{1116, 30},
-			{1117, 30},
-			{1118, 22},
-			{1119, 22},
-			{1120, 29},
-			{1121, 29},
-			{1122, 32},
-			{1123, 32},
-			{1134, 38},
-			{1135, 38},	
-		};
-
-		std::vector<unsigned int> const fedList = {724,725,726,727,728,729,730,731,1100,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,1117,1118,1119,1120,1121,1122,1123,1134,1135};
-		std::vector<unsigned int> const fedListuTCA = {1100,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,1117,1118,1119,1120,1121,1122,1123,1134,1135};
-		std::vector<unsigned int> const fedListVME = {724,725,726,727,728,729,730,731};
-		std::vector<unsigned int> const crateList = {3,6,7,13,20,21,22,24,25,29,30,31,32,34,35,37,38};
-		std::vector<unsigned int> const crateListuTCA = {20,21,22,24,25,29,30,31,32,34,35,37,38};
-		std::vector<unsigned int> const crateListVME = {3,6,7,13};
-		std::vector<unsigned int> const crateListHF = {22,29,32};
-
-		int const FED_uTCA_MAX_REAL = 50;
-
-		//	FEDs use the first 50 uTCA FED numbers only everywhere
-		int const FED_VME_MIN = FEDNumbering::MINHCALFEDID;
-		int const FED_VME_MAX = FEDNumbering::MAXHCALFEDID;
-		int const FED_VME_DELTA = 1;
-		int const FED_VME_NUM = FED_VME_MAX-FED_VME_MIN+1;
-
-		int const FED_uTCA_MIN = FEDNumbering::MINHCALuTCAFEDID;
-//		int const FED_uTCA_MAX = FEDNumbering::MAXHCALuTCAFEDID;
-		int const FED_uTCA_MAX = FED_uTCA_MIN + FED_uTCA_MAX_REAL-1;
-		int const FED_uTCA_NUM = FED_uTCA_MAX - FED_uTCA_MIN + 1;
-		int const FED_uTCA_DELTA = 1;
-		int const FED_TOTAL_NUM = FED_VME_NUM+FED_uTCA_NUM;
-		
-		//	Crates
-		int const CRATE_VME_MIN = 0;
-		int const CRATE_VME_MAX = 18;
-		int const CRATE_VME_DELTA = 1;
-		int const CRATE_VME_NUM = CRATE_VME_MAX-CRATE_VME_MIN+1;
-
-		int const CRATE_uTCA_MIN = 20;
-		int const CRATE_uTCA_MAX = 37;
-		int const CRATE_uTCA_DELTA = 1;
-		int const CRATE_uTCA_NUM = CRATE_uTCA_MAX-CRATE_uTCA_MIN+1;
-		int const CRATE_TOTAL_NUM = CRATE_VME_NUM + CRATE_uTCA_NUM;
-
-		//	Slots
-		int const SLOT_uTCA_MIN = 1;
-		int const SLOT_uTCA_MAX = 12;
-		int const SLOT_uTCA_DELTA = 1;
-		int const SLOT_uTCA_NUM = SLOT_uTCA_MAX-SLOT_uTCA_MIN+1;
-
-		int const SLOT_VME_MIN1 = 2;
-		int const SLOT_VME_MAX1 = 7;
-		int const SLOT_VME_MIN2 = 13;
-		int const SLOT_VME_MAX2 = 18;
-		int const SLOT_VME_NUM1 = SLOT_VME_MAX1-SLOT_VME_MIN1+1;
-		int const SLOT_VME_NUM2 = SLOT_VME_MAX2-SLOT_VME_MIN2+1;
-		int const SLOT_VME_NUM = SLOT_VME_NUM1+SLOT_VME_NUM2;
-
-		int const SPIGOT_MIN = 0;
-		int const SPIGOT_MAX = 11;
-		int const SPIGOT_NUM = SPIGOT_MAX-SPIGOT_MIN+1;
-
-		//	Fibers
-		int const FIBER_VME_MIN = 1;
-		int const FIBER_VME_MAX = 8;
-		int const FIBER_VME_NUM = FIBER_VME_MAX-FIBER_VME_MIN+1;
-		int const FIBER_uTCA_MIN1 = 0;
-		int const FIBER_uTCA_MAX1 = 11;
-		int const FIBER_uTCA_MIN2 = 12;
-		int const FIBER_uTCA_MAX2 = 23;
-		int const FIBER_uTCA_NUM = FIBER_uTCA_MAX1-FIBER_uTCA_MIN1+1 + 
-			FIBER_uTCA_MAX2-FIBER_uTCA_MIN2+1;
-
-		int const FIBERCH_MIN = 0;
-		int const FIBERCH_MAX = 5;
-		int const FIBERCH_NUM = FIBERCH_MAX-FIBERCH_MIN+1;
-
-		//	TP SLBs, Fibers
-		int const SLB_MIN = 1;
-		int const SLB_MAX = 6;
-		int const SLB_NUM = SLB_MAX-SLB_MIN+1;
-
-		int const TPFIBER_MIN = 0;
-		int const TPFIBER_MAX = 5;
-		int const TPFIBER_NUM = TPFIBER_MAX-TPFIBER_MIN+1;
-
-		int const SLBCH_MIN = 0;
-		int const SLBCH_MAX = 3;
-		int const SLBCH_NUM = SLBCH_MAX-SLBCH_MIN+1;
-
-		int const TPFIBERCH_MIN = 0;
-		int const TPFIBERCH_MAX = 7;
-		int const TPFIBERCH_NUM = TPFIBERCH_MAX-TPFIBERCH_MIN+1;
-
-		/*
-		 *	Detector Constants
-		 */
-		
-		//	Hcal Subdetector
-		int const HB = 1;
-		int const HE = 2;
-		int const HO = 3;
-		int const HF = 4;
-		int const SUBDET_NUM = 4;
-		int const TPSUBDET_NUM = 2;
-		std::string const SUBDET_NAME[SUBDET_NUM]={"HB", "HE", "HO", "HF"};
-		std::string const SUBDETPM_NAME[2*SUBDET_NUM] = { "HBM", "HBP",
-			"HEM", "HEP", "HOM", "HOP", "HFM", "HFP"};
-		std::string const SUBSYSTEM = "Hcal";
-		std::string const TPSUBDET_NAME[TPSUBDET_NUM] = {"HBHE", "HF"};
-		std::string const TPSUBDETPM_NAME[2*TPSUBDET_NUM] = {
-			"HBHEM", "HBHEP", "HFM", "HFP"};
-
-		//	iphis
-		int const IPHI_MIN = 1;
-		int const IPHI_MAX = 72;
-		int const IPHI_NUM = 72;
-		int const IPHI_NUM_HF = 36;
-		int const IPHI_NUM_TPHF = 18;
-		int const IPHI_DELTA = 1;
-		int const IPHI_DELTA_HF = 2;
-		int const IPHI_DELTA_TPHF = 4;
-		
-		//	ietas
-		int const IETA_MIN=1;
-		int const IETA_DELTA = 1;
-		int const IETA_MAX=41;
-		int const IETA_NUM=2*(IETA_MAX-IETA_MIN+1)+1;
-		int const IETA_MIN_HB = 1;
-		int const IETA_MAX_HB = 16;
-		int const IETA_MIN_HE = 16;
-		int const IETA_MAX_HE = 29;
-		int const IETA_MIN_HO = 1;
-		int const IETA_MAX_HO = 15;
-		int const IETA_MIN_HF = 29;
-		int const IETA_MAX_HF = 41;
-
-		int const IETA_MAX_TPHBHE = 28;
-		int const IETA_MAX_TPHF = 32;
-
-		//	Depth
-		int const DEPTH_MIN = 1;
-		int const DEPTH_DELTA = 1;
-		int const DEPTH_MAX = 4;
-		int const DEPTH_NUM = 4;
-
-		//	Caps
-		int const CAPS_NUM = 4;
-
-		//	Number of FG Bits
-		int const NUM_FGBITS = 6;
-
-		/*
-		 *	Number of Channels Constants
-		 */
-		int const CHS_NUM[SUBDET_NUM] = { 2592, 2592,2192, 1728};	// HO ??!
-		int const TPCHS_NUM[TPSUBDET_NUM] = {2*28*72, 144};
-
-		/*
-		 *	Number of Time Samples
-		 */
-		int const TS_NUM[SUBDET_NUM] = {10, 10, 10, 4};
-
-		/*
-		 *	Value Constants
-		 */
-		double const AXIS_ENERGY_MIN = -10.;
-		double const AXIS_ENERGY_MAX = 200;
-		int const AXIS_ENERGY_NBINS = 400;
-		double const AXIS_TIME_MIN = -50.;
-		double const AXIS_TIME_MAX = 50;
-		int const AXIS_TIME_NBINS = 200;
-		int const AXIS_ADC_NBINS_PED = 100;
-		double const AXIS_ADC_MAX_PED = 5;
-		int const AXIS_ADC_NBINS = 128;
-		double const AXIS_ADC_MIN = 0;
-		double const AXIS_ADC_MAX = 128;
-		int const AXIS_NOMFC_NBINS_3000 = 300;
-		double const AXIS_NOMFC_MAX_3000 = 3000.;
-		int const AXIS_NOMFC_NBINS = 300;
-		double const AXIS_NOMFC_MIN = 0;
-		double const AXIS_NOMFC_MAX = 3000.;
-		int const AXIS_TIMETS_NBINS = 10;
-		double const AXIS_TIMETS_MIN = 0;
-		double const AXIS_TIMETS_MAX = 10;
-
-		int const CALIBEVENTS_MIN = 100;
-		int const GARBAGE_VALUE = -1000;
-		int const FIBEROFFSET_INVALID = -1000;
-
-		int const RAW_EMPTY = 16;
-		int const UTCA_DATAFLAVOR = 0x5;
-
-		double const adc2fC[256] = {
-			1.58, 4.73, 7.88, 11.0, 14.2, 17.3, 20.5, 23.6, 
-			26.8, 29.9, 33.1, 36.2, 39.4, 42.5, 45.7, 48.8,
-	  		53.6, 60.1, 66.6, 73.0, 79.5, 86.0, 92.5, 98.9,
-	    		105, 112, 118, 125, 131, 138, 144, 151,
-		 	157, 164, 170, 177, 186, 199, 212, 225,
-		   	238, 251, 264, 277, 289, 302, 315, 328,
-		     	341, 354, 367, 380, 393, 406, 418, 431,
-			444, 464, 490, 516, 542, 568, 594, 620,
-	  		569, 594, 619, 645, 670, 695, 720, 745,
-	    		771, 796, 821, 846, 871, 897, 922, 947,
-		  	960, 1010, 1060, 1120, 1170, 1220, 1270, 1320,
-		    	1370, 1430, 1480, 1530, 1580, 1630, 1690, 1740,
-	  		1790, 1840, 1890, 1940,  2020, 2120, 2230, 2330,
-	    		2430, 2540, 2640, 2740, 2850, 2950, 3050, 3150,
-		  	3260, 3360, 3460, 3570, 3670, 3770, 3880, 3980,
-		    	4080, 4240, 4450, 4650, 4860, 5070, 5280, 5490,
-
-	  		5080, 5280, 5480, 5680, 5880, 6080, 6280, 6480,
-	    		6680, 6890, 7090, 7290, 7490, 7690, 7890, 8090,
-		  	8400, 8810, 9220, 9630, 10000, 10400, 10900, 11300,
-		    	11700, 12100, 12500, 12900, 13300, 13700, 14100, 14500,
-	  		15000, 15400, 15800, 16200, 16800, 17600, 18400, 19300,
-	    		20100, 20900, 21700, 22500, 23400, 24200, 25000, 25800,
-		  	26600, 27500, 28300, 29100, 29900, 30700, 31600, 32400,
-		    	33200, 34400, 36100, 37700, 39400, 41000, 42700, 44300,
-	  		41100, 42700, 44300, 45900, 47600, 49200, 50800, 52500,
-	    		54100, 55700, 57400, 59000, 60600, 62200, 63900, 65500,
-	  		68000, 71300, 74700, 78000, 81400, 84700, 88000, 91400,
-	    		94700, 98100, 101000, 105000, 108000, 111000, 115000, 118000,
-	  		121000, 125000, 128000, 131000, 137000, 145000, 152000, 160000,
-	    		168000, 176000, 183000, 191000, 199000, 206000, 214000, 222000,
-	  		230000, 237000, 245000, 253000, 261000, 268000, 276000, 284000,
-	    		291000, 302000, 316000, 329000, 343000, 356000, 370000, 384000
-		};
-
-		/*
-		 *	TObject Related. The first 3 bits are set by the Axis Class
-		 *	0 - log X axis
-		 *	1 - log Y axis
-		 *	2 - log Z axis
-		 */	
-		int const BIT_OFFSET = 19;
-		int const BIT_AXIS_XLOG = 0;
-		int const BIT_AXIS_YLOG = 1;
-		int const BIT_AXIS_ZLOG = 2;
-		int const BIT_AXIS_LS = 3;
-		int const BIT_AXIS_FLAG = 4;
-
-		/*
-		 *	Orbit Gap Operations enum
-		 */
-		uint8_t const EVENTTYPE_PEDESTAL = 1;
-		uint8_t const EVENTTYPE_LASER    = 14;
-		uint8_t const EVENTTYPE_LED      = 15;
-		enum OrbitGapType
-		{
-			tNull = 0,
-			tPedestal = 1,
-			tLED = 2,
-			tHFRaddam = 3,
-			tHBHEHPD = 4,
-			tHO = 5,
-			tHF = 6,
-			tZDC = 7,
-			tHEPMega = 8,
-			tHEMMega = 9,
-			tHBPMega = 10,
-			tHBMMega = 11,
-			tSomething = 12,
-			tCRF = 13,
-			tCalib = 14,
-			tSafe = 15,
-			tUnknown = 16,
-			nOrbitGapType = 17
-		};
-	}
-}
+namespace hcaldqm {
+  namespace constants {
+    /*
+ *	Detector Subsystem Status States
+ */
+    double const GOOD = 1.0;
+    double const PROBLEMATIC = 0.9;
+    double const BAD = 0.5;
+    double const VERY_LOW = 0.5;
+    double const VERY_LOW_XXX = 0;
+    double const NOT_APPLICABLE = -1;
+    double const DELTA = 0.005;
+
+    /*
+ *	Electronics Constants
+ */
+    //	FED2Crate array and CRATE2FED array
+    //	use conversion functions in Utilities.h
+    //	For fast look up
+    //	This is for uTCA Crates/FEDs only - no other way...
+    std::map<unsigned int, unsigned int> const crate2fed_map = {
+        {24, 1100},
+        {20, 1102},
+        {21, 1104},
+        {25, 1106},
+        {31, 1108},
+        {35, 1110},
+        {37, 1112},
+        {34, 1114},
+        {30, 1116},
+        {22, 1118},
+        {29, 1120},
+        {32, 1122},
+        {38, 1134},
+        {3, 724},
+        {7, 726},
+        {6, 728},
+        {13, 730},
+    };
+
+    std::map<unsigned int, unsigned int> const fed2crate_map = {
+        {724, 3},   {725, 3},   {726, 7},   {727, 7},   {728, 6},   {729, 6},   {730, 13},  {731, 13},  {1100, 24},
+        {1101, 24}, {1102, 20}, {1103, 20}, {1104, 21}, {1105, 21}, {1106, 25}, {1107, 25}, {1108, 31}, {1109, 31},
+        {1110, 35}, {1111, 35}, {1112, 37}, {1113, 37}, {1114, 34}, {1115, 34}, {1116, 30}, {1117, 30}, {1118, 22},
+        {1119, 22}, {1120, 29}, {1121, 29}, {1122, 32}, {1123, 32}, {1134, 38}, {1135, 38},
+    };
+
+    std::vector<unsigned int> const fedList = {724,  725,  726,  727,  728,  729,  730,  731,  1100, 1101, 1102, 1103,
+                                               1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115,
+                                               1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1134, 1135};
+    std::vector<unsigned int> const fedListuTCA = {1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108,
+                                                   1109, 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117,
+                                                   1118, 1119, 1120, 1121, 1122, 1123, 1134, 1135};
+    std::vector<unsigned int> const fedListVME = {724, 725, 726, 727, 728, 729, 730, 731};
+    std::vector<unsigned int> const crateList = {3, 6, 7, 13, 20, 21, 22, 24, 25, 29, 30, 31, 32, 34, 35, 37, 38};
+    std::vector<unsigned int> const crateListuTCA = {20, 21, 22, 24, 25, 29, 30, 31, 32, 34, 35, 37, 38};
+    std::vector<unsigned int> const crateListVME = {3, 6, 7, 13};
+    std::vector<unsigned int> const crateListHF = {22, 29, 32};
+
+    int const FED_uTCA_MAX_REAL = 50;
+
+    //	FEDs use the first 50 uTCA FED numbers only everywhere
+    int const FED_VME_MIN = FEDNumbering::MINHCALFEDID;
+    int const FED_VME_MAX = FEDNumbering::MAXHCALFEDID;
+    int const FED_VME_DELTA = 1;
+    int const FED_VME_NUM = FED_VME_MAX - FED_VME_MIN + 1;
+
+    int const FED_uTCA_MIN = FEDNumbering::MINHCALuTCAFEDID;
+    //		int const FED_uTCA_MAX = FEDNumbering::MAXHCALuTCAFEDID;
+    int const FED_uTCA_MAX = FED_uTCA_MIN + FED_uTCA_MAX_REAL - 1;
+    int const FED_uTCA_NUM = FED_uTCA_MAX - FED_uTCA_MIN + 1;
+    int const FED_uTCA_DELTA = 1;
+    int const FED_TOTAL_NUM = FED_VME_NUM + FED_uTCA_NUM;
+
+    //	Crates
+    int const CRATE_VME_MIN = 0;
+    int const CRATE_VME_MAX = 18;
+    int const CRATE_VME_DELTA = 1;
+    int const CRATE_VME_NUM = CRATE_VME_MAX - CRATE_VME_MIN + 1;
+
+    int const CRATE_uTCA_MIN = 20;
+    int const CRATE_uTCA_MAX = 37;
+    int const CRATE_uTCA_DELTA = 1;
+    int const CRATE_uTCA_NUM = CRATE_uTCA_MAX - CRATE_uTCA_MIN + 1;
+    int const CRATE_TOTAL_NUM = CRATE_VME_NUM + CRATE_uTCA_NUM;
+
+    //	Slots
+    int const SLOT_uTCA_MIN = 1;
+    int const SLOT_uTCA_MAX = 12;
+    int const SLOT_uTCA_DELTA = 1;
+    int const SLOT_uTCA_NUM = SLOT_uTCA_MAX - SLOT_uTCA_MIN + 1;
+
+    int const SLOT_VME_MIN1 = 2;
+    int const SLOT_VME_MAX1 = 7;
+    int const SLOT_VME_MIN2 = 13;
+    int const SLOT_VME_MAX2 = 18;
+    int const SLOT_VME_NUM1 = SLOT_VME_MAX1 - SLOT_VME_MIN1 + 1;
+    int const SLOT_VME_NUM2 = SLOT_VME_MAX2 - SLOT_VME_MIN2 + 1;
+    int const SLOT_VME_NUM = SLOT_VME_NUM1 + SLOT_VME_NUM2;
+
+    int const SPIGOT_MIN = 0;
+    int const SPIGOT_MAX = 11;
+    int const SPIGOT_NUM = SPIGOT_MAX - SPIGOT_MIN + 1;
+
+    //	Fibers
+    int const FIBER_VME_MIN = 1;
+    int const FIBER_VME_MAX = 8;
+    int const FIBER_VME_NUM = FIBER_VME_MAX - FIBER_VME_MIN + 1;
+    int const FIBER_uTCA_MIN1 = 0;
+    int const FIBER_uTCA_MAX1 = 11;
+    int const FIBER_uTCA_MIN2 = 12;
+    int const FIBER_uTCA_MAX2 = 23;
+    int const FIBER_uTCA_NUM = FIBER_uTCA_MAX1 - FIBER_uTCA_MIN1 + 1 + FIBER_uTCA_MAX2 - FIBER_uTCA_MIN2 + 1;
+
+    int const FIBERCH_MIN = 0;
+    int const FIBERCH_MAX = 5;
+    int const FIBERCH_NUM = FIBERCH_MAX - FIBERCH_MIN + 1;
+
+    //	TP SLBs, Fibers
+    int const SLB_MIN = 1;
+    int const SLB_MAX = 6;
+    int const SLB_NUM = SLB_MAX - SLB_MIN + 1;
+
+    int const TPFIBER_MIN = 0;
+    int const TPFIBER_MAX = 5;
+    int const TPFIBER_NUM = TPFIBER_MAX - TPFIBER_MIN + 1;
+
+    int const SLBCH_MIN = 0;
+    int const SLBCH_MAX = 3;
+    int const SLBCH_NUM = SLBCH_MAX - SLBCH_MIN + 1;
+
+    int const TPFIBERCH_MIN = 0;
+    int const TPFIBERCH_MAX = 7;
+    int const TPFIBERCH_NUM = TPFIBERCH_MAX - TPFIBERCH_MIN + 1;
+
+    /*
+ *	Detector Constants
+ */
+
+    //	Hcal Subdetector
+    int const HB = 1;
+    int const HE = 2;
+    int const HO = 3;
+    int const HF = 4;
+    int const SUBDET_NUM = 4;
+    int const TPSUBDET_NUM = 2;
+    std::string const SUBDET_NAME[SUBDET_NUM] = {"HB", "HE", "HO", "HF"};
+    std::string const SUBDETPM_NAME[2 * SUBDET_NUM] = {"HBM", "HBP", "HEM", "HEP", "HOM", "HOP", "HFM", "HFP"};
+    std::string const SUBSYSTEM = "Hcal";
+    std::string const TPSUBDET_NAME[TPSUBDET_NUM] = {"HBHE", "HF"};
+    std::string const TPSUBDETPM_NAME[2 * TPSUBDET_NUM] = {"HBHEM", "HBHEP", "HFM", "HFP"};
+
+    //	iphis
+    int const IPHI_MIN = 1;
+    int const IPHI_MAX = 72;
+    int const IPHI_NUM = 72;
+    int const IPHI_NUM_HF = 36;
+    int const IPHI_NUM_TPHF = 18;
+    int const IPHI_DELTA = 1;
+    int const IPHI_DELTA_HF = 2;
+    int const IPHI_DELTA_TPHF = 4;
+
+    //	ietas
+    int const IETA_MIN = 1;
+    int const IETA_DELTA = 1;
+    int const IETA_MAX = 41;
+    int const IETA_NUM = 2 * (IETA_MAX - IETA_MIN + 1) + 1;
+    int const IETA_MIN_HB = 1;
+    int const IETA_MAX_HB = 16;
+    int const IETA_MIN_HE = 16;
+    int const IETA_MAX_HE = 29;
+    int const IETA_MIN_HO = 1;
+    int const IETA_MAX_HO = 15;
+    int const IETA_MIN_HF = 29;
+    int const IETA_MAX_HF = 41;
+
+    int const IETA_MAX_TPHBHE = 28;
+    int const IETA_MAX_TPHF = 32;
+
+    //	Depth
+    int const DEPTH_MIN = 1;
+    int const DEPTH_DELTA = 1;
+    int const DEPTH_MAX = 4;
+    int const DEPTH_NUM = 4;
+
+    //	Caps
+    int const CAPS_NUM = 4;
+
+    //	Number of FG Bits
+    int const NUM_FGBITS = 6;
+
+    /*
+ *	Number of Channels Constants
+ */
+    int const CHS_NUM[SUBDET_NUM] = {2592, 2592, 2192, 1728};  // HO ??!
+    int const TPCHS_NUM[TPSUBDET_NUM] = {2 * 28 * 72, 144};
+
+    /*
+ *	Number of Time Samples
+ */
+    int const TS_NUM[SUBDET_NUM] = {10, 10, 10, 4};
+
+    /*
+ *	Value Constants
+ */
+    double const AXIS_ENERGY_MIN = -10.;
+    double const AXIS_ENERGY_MAX = 200;
+    int const AXIS_ENERGY_NBINS = 400;
+    double const AXIS_TIME_MIN = -50.;
+    double const AXIS_TIME_MAX = 50;
+    int const AXIS_TIME_NBINS = 200;
+    int const AXIS_ADC_NBINS_PED = 100;
+    double const AXIS_ADC_MAX_PED = 5;
+    int const AXIS_ADC_NBINS = 128;
+    double const AXIS_ADC_MIN = 0;
+    double const AXIS_ADC_MAX = 128;
+    int const AXIS_NOMFC_NBINS_3000 = 300;
+    double const AXIS_NOMFC_MAX_3000 = 3000.;
+    int const AXIS_NOMFC_NBINS = 300;
+    double const AXIS_NOMFC_MIN = 0;
+    double const AXIS_NOMFC_MAX = 3000.;
+    int const AXIS_TIMETS_NBINS = 10;
+    double const AXIS_TIMETS_MIN = 0;
+    double const AXIS_TIMETS_MAX = 10;
+
+    int const CALIBEVENTS_MIN = 100;
+    int const GARBAGE_VALUE = -1000;
+    int const FIBEROFFSET_INVALID = -1000;
+
+    int const RAW_EMPTY = 16;
+    int const UTCA_DATAFLAVOR = 0x5;
+
+    double const adc2fC[256] = {
+        1.58,   4.73,   7.88,   11.0,   14.2,   17.3,   20.5,   23.6,   26.8,   29.9,   33.1,   36.2,   39.4,
+        42.5,   45.7,   48.8,   53.6,   60.1,   66.6,   73.0,   79.5,   86.0,   92.5,   98.9,   105,    112,
+        118,    125,    131,    138,    144,    151,    157,    164,    170,    177,    186,    199,    212,
+        225,    238,    251,    264,    277,    289,    302,    315,    328,    341,    354,    367,    380,
+        393,    406,    418,    431,    444,    464,    490,    516,    542,    568,    594,    620,    569,
+        594,    619,    645,    670,    695,    720,    745,    771,    796,    821,    846,    871,    897,
+        922,    947,    960,    1010,   1060,   1120,   1170,   1220,   1270,   1320,   1370,   1430,   1480,
+        1530,   1580,   1630,   1690,   1740,   1790,   1840,   1890,   1940,   2020,   2120,   2230,   2330,
+        2430,   2540,   2640,   2740,   2850,   2950,   3050,   3150,   3260,   3360,   3460,   3570,   3670,
+        3770,   3880,   3980,   4080,   4240,   4450,   4650,   4860,   5070,   5280,   5490,
+
+        5080,   5280,   5480,   5680,   5880,   6080,   6280,   6480,   6680,   6890,   7090,   7290,   7490,
+        7690,   7890,   8090,   8400,   8810,   9220,   9630,   10000,  10400,  10900,  11300,  11700,  12100,
+        12500,  12900,  13300,  13700,  14100,  14500,  15000,  15400,  15800,  16200,  16800,  17600,  18400,
+        19300,  20100,  20900,  21700,  22500,  23400,  24200,  25000,  25800,  26600,  27500,  28300,  29100,
+        29900,  30700,  31600,  32400,  33200,  34400,  36100,  37700,  39400,  41000,  42700,  44300,  41100,
+        42700,  44300,  45900,  47600,  49200,  50800,  52500,  54100,  55700,  57400,  59000,  60600,  62200,
+        63900,  65500,  68000,  71300,  74700,  78000,  81400,  84700,  88000,  91400,  94700,  98100,  101000,
+        105000, 108000, 111000, 115000, 118000, 121000, 125000, 128000, 131000, 137000, 145000, 152000, 160000,
+        168000, 176000, 183000, 191000, 199000, 206000, 214000, 222000, 230000, 237000, 245000, 253000, 261000,
+        268000, 276000, 284000, 291000, 302000, 316000, 329000, 343000, 356000, 370000, 384000};
+
+    /*
+ *	TObject Related. The first 3 bits are set by the Axis Class
+ *	0 - log X axis
+ *	1 - log Y axis
+ *	2 - log Z axis
+ */
+    int const BIT_OFFSET = 19;
+    int const BIT_AXIS_XLOG = 0;
+    int const BIT_AXIS_YLOG = 1;
+    int const BIT_AXIS_ZLOG = 2;
+    int const BIT_AXIS_LS = 3;
+    int const BIT_AXIS_FLAG = 4;
+
+    /*
+ *	Orbit Gap Operations enum
+ */
+    uint8_t const EVENTTYPE_PEDESTAL = 1;
+    uint8_t const EVENTTYPE_LASER = 14;
+    uint8_t const EVENTTYPE_LED = 15;
+    enum OrbitGapType {
+      tNull = 0,
+      tPedestal = 1,
+      tLED = 2,
+      tHFRaddam = 3,
+      tHBHEHPD = 4,
+      tHO = 5,
+      tHF = 6,
+      tZDC = 7,
+      tHEPMega = 8,
+      tHEMMega = 9,
+      tHBPMega = 10,
+      tHBMMega = 11,
+      tSomething = 12,
+      tCRF = 13,
+      tCalib = 14,
+      tSafe = 15,
+      tUnknown = 16,
+      nOrbitGapType = 17
+    };
+  }  // namespace constants
+}  // namespace hcaldqm
 
 #endif
-
-
-
-
diff --git a/DQM/HcalCommon/interface/Container.h b/DQM/HcalCommon/interface/Container.h
index e5e3336c7b485..95673821a3e5f 100644
--- a/DQM/HcalCommon/interface/Container.h
+++ b/DQM/HcalCommon/interface/Container.h
@@ -14,25 +14,17 @@
 #include "DQM/HcalCommon/interface/HcalCommonHeaders.h"
 #include "DQM/HcalCommon/interface/Logger.h"
 
-#include <vector>
 #include <string>
+#include <vector>
 
-namespace hcaldqm
-{
-  class Container
-  {
+namespace hcaldqm {
+  class Container {
   public:
-    Container():
-      _folder("HcalInfo"), _qname("SomeQuantity")
-    {}
-    Container(std::string const& folder, std::string const& qname):
-      _folder(folder), _qname(qname)
-    {}
+    Container() : _folder("HcalInfo"), _qname("SomeQuantity") {}
+    Container(std::string const &folder, std::string const &qname) : _folder(folder), _qname(qname) {}
     virtual ~Container() {}
 
-    virtual void initialize(std::string const &folder,
-                            std::string const& qname, int debug=0)
-    {
+    virtual void initialize(std::string const &folder, std::string const &qname, int debug = 0) {
       _folder = folder;
       _qname = qname;
       _logger.set(_qname, debug);
@@ -41,9 +33,8 @@ namespace hcaldqm
   protected:
     std::string _folder;
     std::string _qname;
-    Logger      _logger;
+    Logger _logger;
   };
-}
-
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/Container1D.h b/DQM/HcalCommon/interface/Container1D.h
index 14d559334e2b0..78135e90e0e43 100644
--- a/DQM/HcalCommon/interface/Container1D.h
+++ b/DQM/HcalCommon/interface/Container1D.h
@@ -8,33 +8,31 @@
  *      Description:
  *              1D Container
  */
+#include "DQM/HcalCommon/interface/Container.h"
 #include "DQM/HcalCommon/interface/DetectorQuantity.h"
 #include "DQM/HcalCommon/interface/ElectronicsQuantity.h"
-#include "DQM/HcalCommon/interface/TrigTowerQuantity.h"
-#include "DQM/HcalCommon/interface/ValueQuantity.h"
-#include "DQM/HcalCommon/interface/Container.h"
-#include "DQM/HcalCommon/interface/HashMapper.h"
 #include "DQM/HcalCommon/interface/HashFilter.h"
+#include "DQM/HcalCommon/interface/HashMapper.h"
+#include "DQM/HcalCommon/interface/TrigTowerQuantity.h"
 #include "DQM/HcalCommon/interface/Utilities.h"
+#include "DQM/HcalCommon/interface/ValueQuantity.h"
 
-#include <vector>
 #include "boost/unordered_map.hpp"
 #include <string>
+#include <vector>
 
-namespace hcaldqm
-{
-  class Container1D : public Container
-  {
+namespace hcaldqm {
+  class Container1D : public Container {
   public:
     Container1D();
     //      Initialize Container
     //      @folder - folder name where to start saving - root.
     //      By default it will be the Task's name.
     //
-    Container1D(std::string const& folder,
+    Container1D(std::string const &folder,
                 hashfunctions::HashType,
-                quantity::Quantity*,
-                quantity::Quantity *qy =  new quantity::ValueQuantity(quantity::fN));
+                quantity::Quantity *,
+                quantity::Quantity *qy = new quantity::ValueQuantity(quantity::fN));
     ~Container1D() override;
 
     //      Initialize Container
@@ -42,17 +40,19 @@ namespace hcaldqm
     //      Tasks's name
     //      @nametitle - namebase of the name and of the title
     //
-    virtual void initialize(std::string const& folder,
-                            hashfunctions::HashType,  quantity::Quantity*,
+    virtual void initialize(std::string const &folder,
+                            hashfunctions::HashType,
+                            quantity::Quantity *,
                             quantity::Quantity *qy = new quantity::ValueQuantity(quantity::fN),
-                            int debug=0);
+                            int debug = 0);
 
     //      @qname - to replace the QyvsQx naming
-    virtual void initialize(std::string const& folder,
+    virtual void initialize(std::string const &folder,
                             std::string const &qname,
-                            hashfunctions::HashType,  quantity::Quantity*,
+                            hashfunctions::HashType,
+                            quantity::Quantity *,
                             quantity::Quantity *qy = new quantity::ValueQuantity(quantity::fN),
-                            int debug=0);
+                            int debug = 0);
     using Container::initialize;
 
     //      filling by hash
@@ -64,210 +64,135 @@ namespace hcaldqm
     virtual void fill(uint32_t, double, double);
 
     //      using DetId as mapper
-    virtual void fill(HcalDetId const&);
-    virtual void fill(HcalDetId const&, int);
-    virtual void fill(HcalDetId const&, double);
-    virtual void fill(HcalDetId const&, int, double);
-    virtual void fill(HcalDetId const&, int, int);
-    virtual void fill(HcalDetId const&, double, double);
-
-    virtual double getBinEntries(HcalDetId const&);
-    virtual double getBinEntries(HcalDetId const&, int);
-    virtual double getBinEntries(HcalDetId const&, double);
-    virtual double getBinEntries(HcalDetId const& did, int x, int)
-    {return getBinEntries(did, x);}
-    virtual double getBinEntries(HcalDetId const& did, int x, double)
-    {return getBinEntries(did, x);}
-    virtual double getBinEntries(HcalDetId const& did, double x, double)
-    {return getBinEntries(did, x);}
-
-    virtual double getBinContent(HcalDetId const&);
-    virtual double getBinContent(HcalDetId const&, int);
-    virtual double getBinContent(HcalDetId const&, double);
-    virtual double getBinContent(HcalDetId const& did, int x, int)
-    {return getBinContent(did, x);}
-    virtual double getBinContent(HcalDetId const& did, int x, double)
-    {return getBinContent(did, x);}
-    virtual double getBinContent(HcalDetId const& did, double x, double)
-    {return getBinContent(did, x);}
-    virtual double getMean(HcalDetId const&, int axis=1);
-    virtual double getRMS(HcalDetId const&, int axix=1);
-
-    virtual void setBinContent(HcalDetId const&, int);
-    virtual void setBinContent(HcalDetId const&, double);
-    virtual void setBinContent(HcalDetId const&, int, int);
-    virtual void setBinContent(HcalDetId const&, int, double);
-    virtual void setBinContent(HcalDetId const&, double, double);
-    virtual void setBinContent(HcalDetId const&, double, int);
-    virtual void setBinContent(HcalDetId const& id, int x, int y, int)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalDetId const& id, int x, double y,
-                               int)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalDetId const& id, double x, int y,
-                               int)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalDetId const& id, double x, double y,
-                               int)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalDetId const& id, int x, int y,
-                               double)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalDetId const& id, int x, double y,
-                               double)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalDetId const& id, double x, int y,
-                               double)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalDetId const& id, double x, double y,
-                               double)
-    {setBinContent(id, x, y);}
+    virtual void fill(HcalDetId const &);
+    virtual void fill(HcalDetId const &, int);
+    virtual void fill(HcalDetId const &, double);
+    virtual void fill(HcalDetId const &, int, double);
+    virtual void fill(HcalDetId const &, int, int);
+    virtual void fill(HcalDetId const &, double, double);
+
+    virtual double getBinEntries(HcalDetId const &);
+    virtual double getBinEntries(HcalDetId const &, int);
+    virtual double getBinEntries(HcalDetId const &, double);
+    virtual double getBinEntries(HcalDetId const &did, int x, int) { return getBinEntries(did, x); }
+    virtual double getBinEntries(HcalDetId const &did, int x, double) { return getBinEntries(did, x); }
+    virtual double getBinEntries(HcalDetId const &did, double x, double) { return getBinEntries(did, x); }
+
+    virtual double getBinContent(HcalDetId const &);
+    virtual double getBinContent(HcalDetId const &, int);
+    virtual double getBinContent(HcalDetId const &, double);
+    virtual double getBinContent(HcalDetId const &did, int x, int) { return getBinContent(did, x); }
+    virtual double getBinContent(HcalDetId const &did, int x, double) { return getBinContent(did, x); }
+    virtual double getBinContent(HcalDetId const &did, double x, double) { return getBinContent(did, x); }
+    virtual double getMean(HcalDetId const &, int axis = 1);
+    virtual double getRMS(HcalDetId const &, int axix = 1);
+
+    virtual void setBinContent(HcalDetId const &, int);
+    virtual void setBinContent(HcalDetId const &, double);
+    virtual void setBinContent(HcalDetId const &, int, int);
+    virtual void setBinContent(HcalDetId const &, int, double);
+    virtual void setBinContent(HcalDetId const &, double, double);
+    virtual void setBinContent(HcalDetId const &, double, int);
+    virtual void setBinContent(HcalDetId const &id, int x, int y, int) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalDetId const &id, int x, double y, int) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalDetId const &id, double x, int y, int) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalDetId const &id, double x, double y, int) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalDetId const &id, int x, int y, double) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalDetId const &id, int x, double y, double) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalDetId const &id, double x, int y, double) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalDetId const &id, double x, double y, double) { setBinContent(id, x, y); }
 
     //      using ElectronicsId
-    virtual void fill(HcalElectronicsId const&);
-    virtual void fill(HcalElectronicsId const&, int);
-    virtual void fill(HcalElectronicsId const&, double);
-    virtual void fill(HcalElectronicsId const&, int, double);
-    virtual void fill(HcalElectronicsId const&, int, int);
-    virtual void fill(HcalElectronicsId const&, double, double);
-
-    virtual double getBinEntries(HcalElectronicsId const&);
-    virtual double getBinEntries(HcalElectronicsId const&, int);
-    virtual double getBinEntries(HcalElectronicsId const&, double);
-    virtual double getBinEntries(HcalElectronicsId const& eid, int x,
-                                 int)
-    {return getBinEntries(eid, x);}
-    virtual double getBinEntries(HcalElectronicsId const& eid, int x,
-                                 double)
-    {return getBinEntries(eid, x);}
-    virtual double getBinEntries(HcalElectronicsId const& eid,
-                                 double x, double)
-    {return getBinEntries(eid, x);}
-
-    virtual double getBinContent(HcalElectronicsId const&);
-    virtual double getBinContent(HcalElectronicsId const&, int);
-    virtual double getBinContent(HcalElectronicsId const&, double);
-    virtual double getBinContent(HcalElectronicsId const& eid,
-                                 int x, int)
-    {return getBinContent(eid, x);}
-    virtual double getBinContent(HcalElectronicsId const& eid,
-                                 int x, double)
-    {return getBinContent(eid, x);}
-    virtual double getBinContent(HcalElectronicsId const& eid,
-                                 double x, double)
-    {return getBinContent(eid, x);}
-    virtual double getMean(HcalElectronicsId const&, int axis=1);
-    virtual double getRMS(HcalElectronicsId const&, int axis=1);
-
-    virtual void setBinContent(HcalElectronicsId const&, int);
-    virtual void setBinContent(HcalElectronicsId const&, double);
-    virtual void setBinContent(HcalElectronicsId const&, int, int);
-    virtual void setBinContent(HcalElectronicsId const&, int, double);
-    virtual void setBinContent(HcalElectronicsId const&, double, double);
-    virtual void setBinContent(HcalElectronicsId const&, double, int);
-    virtual void setBinContent(HcalElectronicsId const& id, int x, int y
-                               , int)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalElectronicsId const& id, int x,
-                               double y, int)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalElectronicsId const& id, double x,
-                               int y, int)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalElectronicsId const& id, double x,
-                               double y, int)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalElectronicsId const& id, int x,
-                               int y, double)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalElectronicsId const& id, int x,
-                               double y, double)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalElectronicsId const& id, double x,
-                               int y, double)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalElectronicsId const& id, double x,
-                               double y, double)
-    {setBinContent(id, x, y);}
+    virtual void fill(HcalElectronicsId const &);
+    virtual void fill(HcalElectronicsId const &, int);
+    virtual void fill(HcalElectronicsId const &, double);
+    virtual void fill(HcalElectronicsId const &, int, double);
+    virtual void fill(HcalElectronicsId const &, int, int);
+    virtual void fill(HcalElectronicsId const &, double, double);
+
+    virtual double getBinEntries(HcalElectronicsId const &);
+    virtual double getBinEntries(HcalElectronicsId const &, int);
+    virtual double getBinEntries(HcalElectronicsId const &, double);
+    virtual double getBinEntries(HcalElectronicsId const &eid, int x, int) { return getBinEntries(eid, x); }
+    virtual double getBinEntries(HcalElectronicsId const &eid, int x, double) { return getBinEntries(eid, x); }
+    virtual double getBinEntries(HcalElectronicsId const &eid, double x, double) { return getBinEntries(eid, x); }
+
+    virtual double getBinContent(HcalElectronicsId const &);
+    virtual double getBinContent(HcalElectronicsId const &, int);
+    virtual double getBinContent(HcalElectronicsId const &, double);
+    virtual double getBinContent(HcalElectronicsId const &eid, int x, int) { return getBinContent(eid, x); }
+    virtual double getBinContent(HcalElectronicsId const &eid, int x, double) { return getBinContent(eid, x); }
+    virtual double getBinContent(HcalElectronicsId const &eid, double x, double) { return getBinContent(eid, x); }
+    virtual double getMean(HcalElectronicsId const &, int axis = 1);
+    virtual double getRMS(HcalElectronicsId const &, int axis = 1);
+
+    virtual void setBinContent(HcalElectronicsId const &, int);
+    virtual void setBinContent(HcalElectronicsId const &, double);
+    virtual void setBinContent(HcalElectronicsId const &, int, int);
+    virtual void setBinContent(HcalElectronicsId const &, int, double);
+    virtual void setBinContent(HcalElectronicsId const &, double, double);
+    virtual void setBinContent(HcalElectronicsId const &, double, int);
+    virtual void setBinContent(HcalElectronicsId const &id, int x, int y, int) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalElectronicsId const &id, int x, double y, int) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalElectronicsId const &id, double x, int y, int) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalElectronicsId const &id, double x, double y, int) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalElectronicsId const &id, int x, int y, double) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalElectronicsId const &id, int x, double y, double) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalElectronicsId const &id, double x, int y, double) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalElectronicsId const &id, double x, double y, double) { setBinContent(id, x, y); }
 
     //      using DetId as mapper
-    virtual void fill(HcalTrigTowerDetId const&);
-    virtual void fill(HcalTrigTowerDetId const&, int);
-    virtual void fill(HcalTrigTowerDetId const&, double);
-    virtual void fill(HcalTrigTowerDetId const&, int, double);
-    virtual void fill(HcalTrigTowerDetId const&, int, int);
-    virtual void fill(HcalTrigTowerDetId const&, double, double);
-
-    virtual double getBinEntries(HcalTrigTowerDetId const&);
-    virtual double getBinEntries(HcalTrigTowerDetId const&, int);
-    virtual double getBinEntries(HcalTrigTowerDetId const&, double);
-    virtual double getBinEntries(HcalTrigTowerDetId const& tid, int x,
-                                 int)
-    {return getBinEntries(tid, x);}
-    virtual double getBinEntries(HcalTrigTowerDetId const& tid, int x,
-                                 double)
-    {return getBinEntries(tid, x);}
-    virtual double getBinEntries(HcalTrigTowerDetId const& tid,
-                                 double x, double)
-    {return getBinEntries(tid, x);}
-
-    virtual double getBinContent(HcalTrigTowerDetId const&);
-    virtual double getBinContent(HcalTrigTowerDetId const&, int);
-    virtual double getBinContent(HcalTrigTowerDetId const&, double);
-    virtual double getBinContent(HcalTrigTowerDetId const& tid,
-                                 int x, int)
-    {return getBinContent(tid, x);}
-    virtual double getBinContent(HcalTrigTowerDetId const& tid,
-                                 int x, double)
-    {return getBinContent(tid, x);}
-    virtual double getBinContent(HcalTrigTowerDetId const& tid,
-                                 double x, double)
-    {return getBinContent(tid, x);}
-    virtual double getMean(HcalTrigTowerDetId const&, int axis=1);
-    virtual double getRMS(HcalTrigTowerDetId const&, int axis=1);
-
-    virtual void setBinContent(HcalTrigTowerDetId const&, int);
-    virtual void setBinContent(HcalTrigTowerDetId const&, double);
-    virtual void setBinContent(HcalTrigTowerDetId const&, int, int);
-    virtual void setBinContent(HcalTrigTowerDetId const&, int, double);
-    virtual void setBinContent(HcalTrigTowerDetId const&, double,
-                               double);
-    virtual void setBinContent(HcalTrigTowerDetId const&, double, int);
-    virtual void setBinContent(HcalTrigTowerDetId const& id, int x,
-                               int y, int)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalTrigTowerDetId const& id, int x,
-                               double y, int)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalTrigTowerDetId const& id, double x,
-                               int y, int)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalTrigTowerDetId const& id, double x,
-                               double y, int)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalTrigTowerDetId const& id, int x,
-                               int y, double)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalTrigTowerDetId const& id, int x,
-                               double y, double)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalTrigTowerDetId const& id, double x,
-                               int y, double)
-    {setBinContent(id, x, y);}
-    virtual void setBinContent(HcalTrigTowerDetId const& id, double x,
-                               double y, double)
-    {setBinContent(id, x, y);}
+    virtual void fill(HcalTrigTowerDetId const &);
+    virtual void fill(HcalTrigTowerDetId const &, int);
+    virtual void fill(HcalTrigTowerDetId const &, double);
+    virtual void fill(HcalTrigTowerDetId const &, int, double);
+    virtual void fill(HcalTrigTowerDetId const &, int, int);
+    virtual void fill(HcalTrigTowerDetId const &, double, double);
+
+    virtual double getBinEntries(HcalTrigTowerDetId const &);
+    virtual double getBinEntries(HcalTrigTowerDetId const &, int);
+    virtual double getBinEntries(HcalTrigTowerDetId const &, double);
+    virtual double getBinEntries(HcalTrigTowerDetId const &tid, int x, int) { return getBinEntries(tid, x); }
+    virtual double getBinEntries(HcalTrigTowerDetId const &tid, int x, double) { return getBinEntries(tid, x); }
+    virtual double getBinEntries(HcalTrigTowerDetId const &tid, double x, double) { return getBinEntries(tid, x); }
+
+    virtual double getBinContent(HcalTrigTowerDetId const &);
+    virtual double getBinContent(HcalTrigTowerDetId const &, int);
+    virtual double getBinContent(HcalTrigTowerDetId const &, double);
+    virtual double getBinContent(HcalTrigTowerDetId const &tid, int x, int) { return getBinContent(tid, x); }
+    virtual double getBinContent(HcalTrigTowerDetId const &tid, int x, double) { return getBinContent(tid, x); }
+    virtual double getBinContent(HcalTrigTowerDetId const &tid, double x, double) { return getBinContent(tid, x); }
+    virtual double getMean(HcalTrigTowerDetId const &, int axis = 1);
+    virtual double getRMS(HcalTrigTowerDetId const &, int axis = 1);
+
+    virtual void setBinContent(HcalTrigTowerDetId const &, int);
+    virtual void setBinContent(HcalTrigTowerDetId const &, double);
+    virtual void setBinContent(HcalTrigTowerDetId const &, int, int);
+    virtual void setBinContent(HcalTrigTowerDetId const &, int, double);
+    virtual void setBinContent(HcalTrigTowerDetId const &, double, double);
+    virtual void setBinContent(HcalTrigTowerDetId const &, double, int);
+    virtual void setBinContent(HcalTrigTowerDetId const &id, int x, int y, int) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalTrigTowerDetId const &id, int x, double y, int) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalTrigTowerDetId const &id, double x, int y, int) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalTrigTowerDetId const &id, double x, double y, int) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalTrigTowerDetId const &id, int x, int y, double) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalTrigTowerDetId const &id, int x, double y, double) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalTrigTowerDetId const &id, double x, int y, double) { setBinContent(id, x, y); }
+    virtual void setBinContent(HcalTrigTowerDetId const &id, double x, double y, double) { setBinContent(id, x, y); }
 
     //      booking using IBooker
     //      @aux - typically a cut or anything else
     //      @subsystem - subsystem under which to save
     //
-    virtual void book(DQMStore::IBooker&, HcalElectronicsMap const*,
-                      std::string subsystem="Hcal",
-                      std::string aux="");
-    virtual void book(DQMStore::IBooker&, HcalElectronicsMap const*,
-                      filter::HashFilter const&, std::string subsystem="Hcal",
-                      std::string aux="");
+    virtual void book(DQMStore::IBooker &,
+                      HcalElectronicsMap const *,
+                      std::string subsystem = "Hcal",
+                      std::string aux = "");
+    virtual void book(DQMStore::IBooker &,
+                      HcalElectronicsMap const *,
+                      filter::HashFilter const &,
+                      std::string subsystem = "Hcal",
+                      std::string aux = "");
 
     //      loading using DQMStore
     //      @DQMStore
@@ -278,13 +203,15 @@ namespace hcaldqm
     //      @mode - if StripRunDirs - then there will be no Run Summary
     //      otherwise there is Run Summary folde. Used for retrieving
     //      MEs which were loaded into the DQM store from a file
-    virtual void load(DQMStore::IGetter&, HcalElectronicsMap const*,
-                      std::string const& subsystem="Hcal",
-                      std::string const& aux="");
-    virtual void load(DQMStore::IGetter&, HcalElectronicsMap const*,
-                      filter::HashFilter const&,
-                      std::string const& subsystem="Hcal",
-                      std::string const& aux="");
+    virtual void load(DQMStore::IGetter &,
+                      HcalElectronicsMap const *,
+                      std::string const &subsystem = "Hcal",
+                      std::string const &aux = "");
+    virtual void load(DQMStore::IGetter &,
+                      HcalElectronicsMap const *,
+                      filter::HashFilter const &,
+                      std::string const &subsystem = "Hcal",
+                      std::string const &aux = "");
 
     //      reset all the elements
     virtual void reset();
@@ -302,14 +229,14 @@ namespace hcaldqm
     virtual void showOverflowY(bool showOverflow);
 
   protected:
-    virtual void customize(MonitorElement*);
+    virtual void customize(MonitorElement *);
 
-    typedef boost::unordered_map<uint32_t, MonitorElement*> MEMap;
-    MEMap              _mes;
+    typedef boost::unordered_map<uint32_t, MonitorElement *> MEMap;
+    MEMap _mes;
     mapper::HashMapper _hashmap;
-    quantity::Quantity* _qx;
-    quantity::Quantity* _qy;
+    quantity::Quantity *_qx;
+    quantity::Quantity *_qy;
   };
-}
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/Container2D.h b/DQM/HcalCommon/interface/Container2D.h
index 7221bdf6a372f..447ec68fc3899 100644
--- a/DQM/HcalCommon/interface/Container2D.h
+++ b/DQM/HcalCommon/interface/Container2D.h
@@ -12,169 +12,167 @@
 
 #include "DQM/HcalCommon/interface/Container1D.h"
 
-#include <vector>
 #include <string>
+#include <vector>
 
-namespace hcaldqm
-{
-  class Container2D : public Container1D
-  {
+namespace hcaldqm {
+  class Container2D : public Container1D {
   public:
     Container2D();
-    Container2D(std::string const& folder,
-                hashfunctions::HashType, quantity::Quantity*, quantity::Quantity*,
+    Container2D(std::string const &folder,
+                hashfunctions::HashType,
+                quantity::Quantity *,
+                quantity::Quantity *,
                 quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fN));
     ~Container2D() override;
 
     //	Initialize Container
     //	@folder
     //	@nametitle,
-    virtual void initialize(std::string const& folder,
-                            hashfunctions::HashType, quantity::Quantity*, quantity::Quantity*,
+    virtual void initialize(std::string const &folder,
+                            hashfunctions::HashType,
+                            quantity::Quantity *,
+                            quantity::Quantity *,
                             quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fN),
-                            int debug=0);
+                            int debug = 0);
 
     //	@qname - quantity name replacer
-    virtual void initialize(std::string const& folder,
-                            std::string const& qname,
-                            hashfunctions::HashType, quantity::Quantity*, quantity::Quantity*,
+    virtual void initialize(std::string const &folder,
+                            std::string const &qname,
+                            hashfunctions::HashType,
+                            quantity::Quantity *,
+                            quantity::Quantity *,
                             quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fN),
-                            int debug=0);
+                            int debug = 0);
     using Container::initialize;
     using Container1D::initialize;
     //	redeclare what to override
-    void fill(HcalDetId const&) override ;
-    void fill(HcalDetId const&, int) override;
-    void fill(HcalDetId const&, double) override;
-    void fill(HcalDetId const&, int, double) override;
-    void fill(HcalDetId const&, int, int) override;
-    void fill(HcalDetId const&, double, double) override;
-
-    double getBinEntries(HcalDetId const&) override;
-    double getBinEntries(HcalDetId const&, int) override;
-    double getBinEntries(HcalDetId const&, double) override;
-    double getBinEntries(HcalDetId const&, int, int) override;
-    double getBinEntries(HcalDetId const&, int, double) override;
-    double getBinEntries(HcalDetId const&, double, double) override;
-
-    double getBinContent(HcalDetId const&) override;
-    double getBinContent(HcalDetId const&, int) override;
-    double getBinContent(HcalDetId const&, double) override;
-    double getBinContent(HcalDetId const&, int, int) override;
-    double getBinContent(HcalDetId const&, int, double) override;
-    double getBinContent(HcalDetId const&, double, double) override;
-
-    void setBinContent(HcalDetId const&, int) override;
-    void setBinContent(HcalDetId const&, double) override;
-    void setBinContent(HcalDetId const&, int, int) override;
-    void setBinContent(HcalDetId const&, int, double) override;
-    void setBinContent(HcalDetId const&, double, int) override;
-    void setBinContent(HcalDetId const&, double, double) override;
-    void setBinContent(HcalDetId const&, int, int, int) override;
-    void setBinContent(HcalDetId const&, int, double, int) override;
-    void setBinContent(HcalDetId const&, double, int, int) override;
-    void setBinContent(HcalDetId const&, double, double, int) override;
-    void setBinContent(HcalDetId const&, int, int, double) override;
-    void setBinContent(HcalDetId const&, int, double, double) override;
-    void setBinContent(HcalDetId const&, double, int, double) override;
-    void setBinContent(HcalDetId const&, double, double,
-                       double) override;
-
-    void fill(HcalElectronicsId const&) override;
-    void fill(HcalElectronicsId const&, int) override;
-    void fill(HcalElectronicsId const&, double) override;
-    void fill(HcalElectronicsId const&, int, double) override;
-    void fill(HcalElectronicsId const&, int, int) override;
-    void fill(HcalElectronicsId const&, double, double) override;
-
-    double getBinEntries(HcalElectronicsId const&) override;
-    double getBinEntries(HcalElectronicsId const&, int) override;
-    double getBinEntries(HcalElectronicsId const&, double) override;
-    double getBinEntries(HcalElectronicsId const&, int, int) override;
-    double getBinEntries(HcalElectronicsId const&, int, double) override;
-    double getBinEntries(HcalElectronicsId const&, double,
-                         double) override;
-
-    double getBinContent(HcalElectronicsId const&) override;
-    double getBinContent(HcalElectronicsId const&, int) override;
-    double getBinContent(HcalElectronicsId const&, double) override;
-    double getBinContent(HcalElectronicsId const&, int, int) override;
-    double getBinContent(HcalElectronicsId const&, int, double) override;
-    double getBinContent(HcalElectronicsId const&, double,
-                         double) override;
-
-    void setBinContent(HcalElectronicsId const&, int) override;
-    void setBinContent(HcalElectronicsId const&, double) override;
-    void setBinContent(HcalElectronicsId const&, int, int) override;
-    void setBinContent(HcalElectronicsId const&, int, double) override;
-    void setBinContent(HcalElectronicsId const&, double, int) override;
-    void setBinContent(HcalElectronicsId const&, double, double) override;
-    void setBinContent(HcalElectronicsId const&, int, int, int) override;
-    void setBinContent(HcalElectronicsId const&, int, double, int) override;
-    void setBinContent(HcalElectronicsId const&, double, int, int) override;
-    void setBinContent(HcalElectronicsId const&, double, double, int) override;
-    void setBinContent(HcalElectronicsId const&, int, int, double) override;
-    void setBinContent(HcalElectronicsId const&, int, double, double) override;
-    void setBinContent(HcalElectronicsId const&, double, int, double) override;
-    void setBinContent(HcalElectronicsId const&, double, double,
-                       double) override;
-
-    void fill(HcalTrigTowerDetId const&) override;
-    void fill(HcalTrigTowerDetId const&, int) override;
-    void fill(HcalTrigTowerDetId const&, double) override;
-    void fill(HcalTrigTowerDetId const&, int, int) override;
-    void fill(HcalTrigTowerDetId const&, int, double) override;
-    void fill(HcalTrigTowerDetId const&, double, double) override;
-
-    double getBinEntries(HcalTrigTowerDetId const&) override;
-    double getBinEntries(HcalTrigTowerDetId const&, int) override;
-    double getBinEntries(HcalTrigTowerDetId const&, double) override;
-    double getBinEntries(HcalTrigTowerDetId const&, int, int) override;
-    double getBinEntries(HcalTrigTowerDetId const&, int,
-                         double) override;
-    double getBinEntries(HcalTrigTowerDetId const&,
-                         double, double) override;
-
-    double getBinContent(HcalTrigTowerDetId const&) override;
-    double  getBinContent(HcalTrigTowerDetId const&, int) override;
-    double getBinContent(HcalTrigTowerDetId const&, double) override;
-    double getBinContent(HcalTrigTowerDetId const&, int, int) override;
-    double getBinContent(HcalTrigTowerDetId const&, int, double) override;
-    double getBinContent(HcalTrigTowerDetId const&,
-                         double, double) override;
-
-    void setBinContent(HcalTrigTowerDetId const&, int) override;
-    void setBinContent(HcalTrigTowerDetId const&, double) override;
-    void setBinContent(HcalTrigTowerDetId const&, int, int) override;
-    void setBinContent(HcalTrigTowerDetId const&, int, double) override;
-    void setBinContent(HcalTrigTowerDetId const&, double, int) override;
-    void setBinContent(HcalTrigTowerDetId const&, double, double) override;
-    void setBinContent(HcalTrigTowerDetId const&, int, int, int) override;
-    void setBinContent(HcalTrigTowerDetId const&, int, double, int) override;
-    void setBinContent(HcalTrigTowerDetId const&, double, int, int) override;
-    void setBinContent(HcalTrigTowerDetId const&, double, double, int) override;
-    void setBinContent(HcalTrigTowerDetId const&, int, int, double) override;
-    void setBinContent(HcalTrigTowerDetId const&, int, double, double) override;
-    void setBinContent(HcalTrigTowerDetId const&, double, int, double) override;
-    void setBinContent(HcalTrigTowerDetId const&, double, double,
-                       double) override;
+    void fill(HcalDetId const &) override;
+    void fill(HcalDetId const &, int) override;
+    void fill(HcalDetId const &, double) override;
+    void fill(HcalDetId const &, int, double) override;
+    void fill(HcalDetId const &, int, int) override;
+    void fill(HcalDetId const &, double, double) override;
+
+    double getBinEntries(HcalDetId const &) override;
+    double getBinEntries(HcalDetId const &, int) override;
+    double getBinEntries(HcalDetId const &, double) override;
+    double getBinEntries(HcalDetId const &, int, int) override;
+    double getBinEntries(HcalDetId const &, int, double) override;
+    double getBinEntries(HcalDetId const &, double, double) override;
+
+    double getBinContent(HcalDetId const &) override;
+    double getBinContent(HcalDetId const &, int) override;
+    double getBinContent(HcalDetId const &, double) override;
+    double getBinContent(HcalDetId const &, int, int) override;
+    double getBinContent(HcalDetId const &, int, double) override;
+    double getBinContent(HcalDetId const &, double, double) override;
+
+    void setBinContent(HcalDetId const &, int) override;
+    void setBinContent(HcalDetId const &, double) override;
+    void setBinContent(HcalDetId const &, int, int) override;
+    void setBinContent(HcalDetId const &, int, double) override;
+    void setBinContent(HcalDetId const &, double, int) override;
+    void setBinContent(HcalDetId const &, double, double) override;
+    void setBinContent(HcalDetId const &, int, int, int) override;
+    void setBinContent(HcalDetId const &, int, double, int) override;
+    void setBinContent(HcalDetId const &, double, int, int) override;
+    void setBinContent(HcalDetId const &, double, double, int) override;
+    void setBinContent(HcalDetId const &, int, int, double) override;
+    void setBinContent(HcalDetId const &, int, double, double) override;
+    void setBinContent(HcalDetId const &, double, int, double) override;
+    void setBinContent(HcalDetId const &, double, double, double) override;
+
+    void fill(HcalElectronicsId const &) override;
+    void fill(HcalElectronicsId const &, int) override;
+    void fill(HcalElectronicsId const &, double) override;
+    void fill(HcalElectronicsId const &, int, double) override;
+    void fill(HcalElectronicsId const &, int, int) override;
+    void fill(HcalElectronicsId const &, double, double) override;
+
+    double getBinEntries(HcalElectronicsId const &) override;
+    double getBinEntries(HcalElectronicsId const &, int) override;
+    double getBinEntries(HcalElectronicsId const &, double) override;
+    double getBinEntries(HcalElectronicsId const &, int, int) override;
+    double getBinEntries(HcalElectronicsId const &, int, double) override;
+    double getBinEntries(HcalElectronicsId const &, double, double) override;
+
+    double getBinContent(HcalElectronicsId const &) override;
+    double getBinContent(HcalElectronicsId const &, int) override;
+    double getBinContent(HcalElectronicsId const &, double) override;
+    double getBinContent(HcalElectronicsId const &, int, int) override;
+    double getBinContent(HcalElectronicsId const &, int, double) override;
+    double getBinContent(HcalElectronicsId const &, double, double) override;
+
+    void setBinContent(HcalElectronicsId const &, int) override;
+    void setBinContent(HcalElectronicsId const &, double) override;
+    void setBinContent(HcalElectronicsId const &, int, int) override;
+    void setBinContent(HcalElectronicsId const &, int, double) override;
+    void setBinContent(HcalElectronicsId const &, double, int) override;
+    void setBinContent(HcalElectronicsId const &, double, double) override;
+    void setBinContent(HcalElectronicsId const &, int, int, int) override;
+    void setBinContent(HcalElectronicsId const &, int, double, int) override;
+    void setBinContent(HcalElectronicsId const &, double, int, int) override;
+    void setBinContent(HcalElectronicsId const &, double, double, int) override;
+    void setBinContent(HcalElectronicsId const &, int, int, double) override;
+    void setBinContent(HcalElectronicsId const &, int, double, double) override;
+    void setBinContent(HcalElectronicsId const &, double, int, double) override;
+    void setBinContent(HcalElectronicsId const &, double, double, double) override;
+
+    void fill(HcalTrigTowerDetId const &) override;
+    void fill(HcalTrigTowerDetId const &, int) override;
+    void fill(HcalTrigTowerDetId const &, double) override;
+    void fill(HcalTrigTowerDetId const &, int, int) override;
+    void fill(HcalTrigTowerDetId const &, int, double) override;
+    void fill(HcalTrigTowerDetId const &, double, double) override;
+
+    double getBinEntries(HcalTrigTowerDetId const &) override;
+    double getBinEntries(HcalTrigTowerDetId const &, int) override;
+    double getBinEntries(HcalTrigTowerDetId const &, double) override;
+    double getBinEntries(HcalTrigTowerDetId const &, int, int) override;
+    double getBinEntries(HcalTrigTowerDetId const &, int, double) override;
+    double getBinEntries(HcalTrigTowerDetId const &, double, double) override;
+
+    double getBinContent(HcalTrigTowerDetId const &) override;
+    double getBinContent(HcalTrigTowerDetId const &, int) override;
+    double getBinContent(HcalTrigTowerDetId const &, double) override;
+    double getBinContent(HcalTrigTowerDetId const &, int, int) override;
+    double getBinContent(HcalTrigTowerDetId const &, int, double) override;
+    double getBinContent(HcalTrigTowerDetId const &, double, double) override;
+
+    void setBinContent(HcalTrigTowerDetId const &, int) override;
+    void setBinContent(HcalTrigTowerDetId const &, double) override;
+    void setBinContent(HcalTrigTowerDetId const &, int, int) override;
+    void setBinContent(HcalTrigTowerDetId const &, int, double) override;
+    void setBinContent(HcalTrigTowerDetId const &, double, int) override;
+    void setBinContent(HcalTrigTowerDetId const &, double, double) override;
+    void setBinContent(HcalTrigTowerDetId const &, int, int, int) override;
+    void setBinContent(HcalTrigTowerDetId const &, int, double, int) override;
+    void setBinContent(HcalTrigTowerDetId const &, double, int, int) override;
+    void setBinContent(HcalTrigTowerDetId const &, double, double, int) override;
+    void setBinContent(HcalTrigTowerDetId const &, int, int, double) override;
+    void setBinContent(HcalTrigTowerDetId const &, int, double, double) override;
+    void setBinContent(HcalTrigTowerDetId const &, double, int, double) override;
+    void setBinContent(HcalTrigTowerDetId const &, double, double, double) override;
 
     //	booking. see Container1D.h
-    void book(DQMStore::IBooker&,
-              HcalElectronicsMap const*,
-              std::string subsystem="Hcal", std::string aux="") override;
-    void book(DQMStore::IBooker&,
-              HcalElectronicsMap const*, filter::HashFilter const&,
-              std::string subsystem="Hcal", std::string aux="") override;
+    void book(DQMStore::IBooker &,
+              HcalElectronicsMap const *,
+              std::string subsystem = "Hcal",
+              std::string aux = "") override;
+    void book(DQMStore::IBooker &,
+              HcalElectronicsMap const *,
+              filter::HashFilter const &,
+              std::string subsystem = "Hcal",
+              std::string aux = "") override;
 
     void showOverflowZ(bool showOverflow);
 
   protected:
-    quantity::Quantity* _qz;
+    quantity::Quantity *_qz;
 
-    void customize(MonitorElement*) override;
+    void customize(MonitorElement *) override;
   };
-}
-
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/ContainerI.h b/DQM/HcalCommon/interface/ContainerI.h
index ea6c1cd204ab9..0503919e7aaa6 100644
--- a/DQM/HcalCommon/interface/ContainerI.h
+++ b/DQM/HcalCommon/interface/ContainerI.h
@@ -3,42 +3,29 @@
 
 #include "DQM/HcalCommon/interface/Container.h"
 
-namespace hcaldqm
-{
-  class ContainerI : public Container
-  {
+namespace hcaldqm {
+  class ContainerI : public Container {
   public:
-    ContainerI():
-      Container()
-    {}
-    ContainerI(std::string const& folder, std::string const& name):
-      Container(folder, name)
-    {}
+    ContainerI() : Container() {}
+    ContainerI(std::string const &folder, std::string const &name) : Container(folder, name) {}
     ~ContainerI() override {}
 
-    void initialize(std::string const& folder,
-                    std::string const& name, int debug=0) override
-    {
+    void initialize(std::string const &folder, std::string const &name, int debug = 0) override {
       _folder = folder;
       _qname = name;
       _logger.set(_qname, debug);
     }
 
-    virtual void fill(int x)
-    {
-      _me->Fill(x);
-    }
+    virtual void fill(int x) { _me->Fill(x); }
 
-    virtual void book(DQMStore::IBooker& ib,
-                      std::string subsystem="Hcal", std::string aux="")
-    {
-      ib.setCurrentFolder(subsystem+"/"+_folder +aux);
+    virtual void book(DQMStore::IBooker &ib, std::string subsystem = "Hcal", std::string aux = "") {
+      ib.setCurrentFolder(subsystem + "/" + _folder + aux);
       _me = ib.bookInt(_qname);
     }
 
   protected:
-    MonitorElement* _me;
+    MonitorElement *_me;
   };
-}
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/ContainerProf1D.h b/DQM/HcalCommon/interface/ContainerProf1D.h
index ca2a1e4219ad0..d0eff6f939993 100644
--- a/DQM/HcalCommon/interface/ContainerProf1D.h
+++ b/DQM/HcalCommon/interface/ContainerProf1D.h
@@ -13,40 +13,40 @@
 
 #include "DQM/HcalCommon/interface/Container1D.h"
 
-#include <vector>
 #include <string>
+#include <vector>
 
-namespace hcaldqm
-{
-  class ContainerProf1D : public Container1D
-  {
+namespace hcaldqm {
+  class ContainerProf1D : public Container1D {
   public:
     ContainerProf1D();
-    ContainerProf1D(std::string const& folder,
-                    hashfunctions::HashType,
-                    quantity::Quantity *, quantity::Quantity*);
+    ContainerProf1D(std::string const &folder, hashfunctions::HashType, quantity::Quantity *, quantity::Quantity *);
     ~ContainerProf1D() override {}
 
-    void initialize(std::string const& folder,
+    void initialize(std::string const &folder,
                     hashfunctions::HashType,
-                    quantity::Quantity*, quantity::Quantity*,
-                    int debug=0) override;
+                    quantity::Quantity *,
+                    quantity::Quantity *,
+                    int debug = 0) override;
 
-    void initialize(std::string const& folder,
-                    std::string const& qname,
+    void initialize(std::string const &folder,
+                    std::string const &qname,
                     hashfunctions::HashType,
-                    quantity::Quantity*, quantity::Quantity*,
-                    int debug=0) override;
+                    quantity::Quantity *,
+                    quantity::Quantity *,
+                    int debug = 0) override;
 
     //  booking
-    void book(DQMStore::IBooker&,
-              HcalElectronicsMap const*,
-              std::string subsystem="Hcal", std::string aux="") override;
-    void book(DQMStore::IBooker&,
-              HcalElectronicsMap const*, filter::HashFilter const&,
-              std::string subsystem="Hcal", std::string aux="") override;
+    void book(DQMStore::IBooker &,
+              HcalElectronicsMap const *,
+              std::string subsystem = "Hcal",
+              std::string aux = "") override;
+    void book(DQMStore::IBooker &,
+              HcalElectronicsMap const *,
+              filter::HashFilter const &,
+              std::string subsystem = "Hcal",
+              std::string aux = "") override;
   };
-}
-
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/ContainerProf2D.h b/DQM/HcalCommon/interface/ContainerProf2D.h
index 1edd25f298e6a..eef3fd7f6d88c 100644
--- a/DQM/HcalCommon/interface/ContainerProf2D.h
+++ b/DQM/HcalCommon/interface/ContainerProf2D.h
@@ -12,68 +12,72 @@
 
 #include "DQM/HcalCommon/interface/Container2D.h"
 
-#include <vector>
 #include <string>
+#include <vector>
 
-namespace hcaldqm
-{
-  class ContainerProf2D : public Container2D
-  {
+namespace hcaldqm {
+  class ContainerProf2D : public Container2D {
   public:
     ContainerProf2D();
-    ContainerProf2D(std::string const& folder,
+    ContainerProf2D(std::string const &folder,
                     hashfunctions::HashType,
-                    quantity::Quantity*, quantity::Quantity*,
-                    quantity::Quantity* qz = new quantity::ValueQuantity(quantity::fEnergy));
+                    quantity::Quantity *,
+                    quantity::Quantity *,
+                    quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fEnergy));
     ~ContainerProf2D() override {}
 
-    void initialize(std::string const& folder,
+    void initialize(std::string const &folder,
                     hashfunctions::HashType,
-                    quantity::Quantity*, quantity::Quantity*,
+                    quantity::Quantity *,
+                    quantity::Quantity *,
                     quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fEnergy),
-                    int debug=0) override;
+                    int debug = 0) override;
 
-    void initialize(std::string const& folder,
-                    std::string const& qname,
+    void initialize(std::string const &folder,
+                    std::string const &qname,
                     hashfunctions::HashType,
-                    quantity::Quantity*, quantity::Quantity*,
+                    quantity::Quantity *,
+                    quantity::Quantity *,
                     quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fEnergy),
-                    int debug=0) override;
+                    int debug = 0) override;
 
-    void book(DQMStore::IBooker&,
-              HcalElectronicsMap const*,
-              std::string subsystem="Hcal", std::string aux="") override;
-    void book(DQMStore::IBooker&,
-              HcalElectronicsMap const*, filter::HashFilter const&,
-              std::string subsystem="Hcal", std::string aux="") override;
+    void book(DQMStore::IBooker &,
+              HcalElectronicsMap const *,
+              std::string subsystem = "Hcal",
+              std::string aux = "") override;
+    void book(DQMStore::IBooker &,
+              HcalElectronicsMap const *,
+              filter::HashFilter const &,
+              std::string subsystem = "Hcal",
+              std::string aux = "") override;
 
-    void fill(HcalDetId const&) override ;
-    void fill(HcalDetId const&, int) override;
-    void fill(HcalDetId const&, double) override;
-    void fill(HcalDetId const&, int, double) override;
-    void fill(HcalDetId const&, int, int) override;
-    void fill(HcalDetId const&, double, double) override;
+    void fill(HcalDetId const &) override;
+    void fill(HcalDetId const &, int) override;
+    void fill(HcalDetId const &, double) override;
+    void fill(HcalDetId const &, int, double) override;
+    void fill(HcalDetId const &, int, int) override;
+    void fill(HcalDetId const &, double, double) override;
 
-    void fill(HcalElectronicsId const&) override;
-    void fill(HcalElectronicsId const&, int) override;
-    void fill(HcalElectronicsId const&, double) override;
-    void fill(HcalElectronicsId const&, int, double) override;
-    void fill(HcalElectronicsId const&, int, int) override;
-    void fill(HcalElectronicsId const&, double, double) override;
+    void fill(HcalElectronicsId const &) override;
+    void fill(HcalElectronicsId const &, int) override;
+    void fill(HcalElectronicsId const &, double) override;
+    void fill(HcalElectronicsId const &, int, double) override;
+    void fill(HcalElectronicsId const &, int, int) override;
+    void fill(HcalElectronicsId const &, double, double) override;
 
-    void fill(HcalTrigTowerDetId const&) override;
-    void fill(HcalTrigTowerDetId const&, int) override;
-    void fill(HcalTrigTowerDetId const&, double) override;
-    void fill(HcalTrigTowerDetId const&, int, int) override;
-    void fill(HcalTrigTowerDetId const&, int, double) override;
-    void fill(HcalTrigTowerDetId const&, double, double) override;
+    void fill(HcalTrigTowerDetId const &) override;
+    void fill(HcalTrigTowerDetId const &, int) override;
+    void fill(HcalTrigTowerDetId const &, double) override;
+    void fill(HcalTrigTowerDetId const &, int, int) override;
+    void fill(HcalTrigTowerDetId const &, int, double) override;
+    void fill(HcalTrigTowerDetId const &, double, double) override;
 
-    void fill(HcalDetId const&, double, double, double);
-    void fill(HcalElectronicsId const&, double, double, double);
-    void fill(HcalTrigTowerDetId const&, double, double, double);
+    void fill(HcalDetId const &, double, double, double);
+    void fill(HcalElectronicsId const &, double, double, double);
+    void fill(HcalTrigTowerDetId const &, double, double, double);
 
   protected:
   };
-}
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/ContainerS.h b/DQM/HcalCommon/interface/ContainerS.h
index 42b6296691234..efd40476d082f 100644
--- a/DQM/HcalCommon/interface/ContainerS.h
+++ b/DQM/HcalCommon/interface/ContainerS.h
@@ -1,43 +1,32 @@
 #ifndef ContainerS_h
 #define ContainerS_h
 
-#include "DQM/HcalCommon/interface/Container.h"
 #include "DQM/HcalCommon/interface/Constants.h"
+#include "DQM/HcalCommon/interface/Container.h"
 
-namespace hcaldqm
-{
-  class ContainerS : public Container
-  {
+namespace hcaldqm {
+  class ContainerS : public Container {
   public:
-    ContainerS(): Container() {}
-    ContainerS(std::string const& folder, std::string const& name):
-      Container(folder, name)
-    {}
+    ContainerS() : Container() {}
+    ContainerS(std::string const &folder, std::string const &name) : Container(folder, name) {}
     ~ContainerS() override {}
 
-    void initialize(std::string const& folder,
-                    std::string const& name, int debug=0) override
-    {
+    void initialize(std::string const &folder, std::string const &name, int debug = 0) override {
       _folder = folder;
       _qname = name;
       _logger.set(_qname, debug);
     }
 
-    virtual void fill(std::string const& x)
-    {
-      _me->Fill((std::string&)x);
-    }
+    virtual void fill(std::string const &x) { _me->Fill((std::string &)x); }
 
-    virtual void book(DQMStore::IBooker &ib,
-                      std::string subsystem="Hcal", std::string aux="")
-    {
-      ib.setCurrentFolder(subsystem+"/"+_folder+aux);
+    virtual void book(DQMStore::IBooker &ib, std::string subsystem = "Hcal", std::string aux = "") {
+      ib.setCurrentFolder(subsystem + "/" + _folder + aux);
       _me = ib.bookString(_qname, "NameToStart");
     }
 
   protected:
-    MonitorElement* _me;
+    MonitorElement *_me;
   };
-}
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/ContainerSingle1D.h b/DQM/HcalCommon/interface/ContainerSingle1D.h
index b38db14d8a5ee..c5c85861c06f9 100644
--- a/DQM/HcalCommon/interface/ContainerSingle1D.h
+++ b/DQM/HcalCommon/interface/ContainerSingle1D.h
@@ -6,7 +6,8 @@
  *      Author:                 Viktor Khristenko
  *
  *      Description:
- *              Container to hold a single ME - for convenience of initialization
+ *              Container to hold a single ME - for convenience of
+ * initialization
  */
 
 #include "DQM/HcalCommon/interface/Container.h"
@@ -14,36 +15,33 @@
 
 #include <string>
 
-namespace hcaldqm
-{
-  class ContainerSingle1D : public Container
-  {
+namespace hcaldqm {
+  class ContainerSingle1D : public Container {
   public:
     ContainerSingle1D();
-    ContainerSingle1D(std::string const& folder,
-                      quantity::Quantity*,
+    ContainerSingle1D(std::string const &folder,
+                      quantity::Quantity *,
                       quantity::Quantity *qy = new quantity::ValueQuantity(quantity::fN));
-    ContainerSingle1D(std::string const& folder,
-                      std::string const&,
-                      quantity::Quantity*,
+    ContainerSingle1D(std::string const &folder,
+                      std::string const &,
+                      quantity::Quantity *,
                       quantity::Quantity *qy = new quantity::ValueQuantity(quantity::fN));
-    ContainerSingle1D(ContainerSingle1D const&);
+    ContainerSingle1D(ContainerSingle1D const &);
     ~ContainerSingle1D() override;
 
-    virtual void initialize(std::string const& folder,
-                            quantity::Quantity*,
+    virtual void initialize(std::string const &folder,
+                            quantity::Quantity *,
                             quantity::Quantity *qy = new quantity::ValueQuantity(quantity::fN),
-                            int debug=0);
+                            int debug = 0);
 
-    virtual void initialize(std::string const& folder,
-                            std::string const&,
-                            quantity::Quantity*,
+    virtual void initialize(std::string const &folder,
+                            std::string const &,
+                            quantity::Quantity *,
                             quantity::Quantity *qy = new quantity::ValueQuantity(quantity::fN),
-                            int debug=0);
+                            int debug = 0);
     using Container::initialize;
     //  booking
-    virtual void book(DQMStore::IBooker&,
-                      std::string subsystem="Hcal", std::string aux="");
+    virtual void book(DQMStore::IBooker &, std::string subsystem = "Hcal", std::string aux = "");
     //  filling
     virtual void fill(int);
     virtual void fill(double);
@@ -52,7 +50,7 @@ namespace hcaldqm
     virtual void fill(double, int);
     virtual void fill(double, double);
 
-    virtual double getBinContent(int) ;
+    virtual double getBinContent(int);
     virtual double getBinContent(double);
     virtual double getBinEntries(int);
     virtual double getBinEntries(double);
@@ -62,38 +60,38 @@ namespace hcaldqm
     virtual void setBinContent(double, int);
     virtual void setBinContent(double, double);
 
-    virtual void fill(HcalDetId const&);
-    virtual void fill(HcalDetId const&, double);
-    virtual void fill(HcalDetId const&, double, double);
+    virtual void fill(HcalDetId const &);
+    virtual void fill(HcalDetId const &, double);
+    virtual void fill(HcalDetId const &, double, double);
 
-    virtual double getBinContent(HcalDetId const&);
-    virtual double getBinEntries(HcalDetId const&);
+    virtual double getBinContent(HcalDetId const &);
+    virtual double getBinEntries(HcalDetId const &);
 
-    virtual void setBinContent(HcalDetId const&, int);
-    virtual void setBinContent(HcalDetId const&, double);
+    virtual void setBinContent(HcalDetId const &, int);
+    virtual void setBinContent(HcalDetId const &, double);
 
-    virtual void fill(HcalElectronicsId const&);
-    virtual void fill(HcalElectronicsId const&, double);
-    virtual void fill(HcalElectronicsId const&, double, double);
+    virtual void fill(HcalElectronicsId const &);
+    virtual void fill(HcalElectronicsId const &, double);
+    virtual void fill(HcalElectronicsId const &, double, double);
 
-    virtual double getBinContent(HcalElectronicsId const&);
-    virtual double getBinEntries(HcalElectronicsId const&);
+    virtual double getBinContent(HcalElectronicsId const &);
+    virtual double getBinEntries(HcalElectronicsId const &);
 
-    virtual void setBinContent(HcalElectronicsId const&, int);
-    virtual void setBinContent(HcalElectronicsId const&, double);
+    virtual void setBinContent(HcalElectronicsId const &, int);
+    virtual void setBinContent(HcalElectronicsId const &, double);
 
-    virtual void fill(HcalTrigTowerDetId const&);
-    virtual void fill(HcalTrigTowerDetId const&, double);
-    virtual void fill(HcalTrigTowerDetId const&, double, double);
+    virtual void fill(HcalTrigTowerDetId const &);
+    virtual void fill(HcalTrigTowerDetId const &, double);
+    virtual void fill(HcalTrigTowerDetId const &, double, double);
 
-    virtual double getBinContent(HcalTrigTowerDetId const&);
-    virtual double getBinEntries(HcalTrigTowerDetId const&);
+    virtual double getBinContent(HcalTrigTowerDetId const &);
+    virtual double getBinEntries(HcalTrigTowerDetId const &);
 
-    virtual void setBinContent(HcalTrigTowerDetId const&, int);
-    virtual void setBinContent(HcalTrigTowerDetId const&, double);
+    virtual void setBinContent(HcalTrigTowerDetId const &, int);
+    virtual void setBinContent(HcalTrigTowerDetId const &, double);
 
-    virtual void reset() {_me->Reset();}
-    virtual void print() {std::cout << _qname << std::endl;}
+    virtual void reset() { _me->Reset(); }
+    virtual void print() { std::cout << _qname << std::endl; }
 
     virtual void extendAxisRange(int);
 
@@ -101,12 +99,12 @@ namespace hcaldqm
     virtual void showOverflowY(bool showOverflow);
 
   protected:
-    MonitorElement*     _me;
-    quantity::Quantity* _qx;
-    quantity::Quantity* _qy;
+    MonitorElement *_me;
+    quantity::Quantity *_qx;
+    quantity::Quantity *_qy;
 
     virtual void customize();
   };
-}
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/ContainerSingle2D.h b/DQM/HcalCommon/interface/ContainerSingle2D.h
index 67802a00ed60c..2af49a7badc8e 100644
--- a/DQM/HcalCommon/interface/ContainerSingle2D.h
+++ b/DQM/HcalCommon/interface/ContainerSingle2D.h
@@ -6,7 +6,8 @@
  *      Author:                 Viktor Khristenko
  *
  *      Description:
- *              Container to hold a single ME - for convenience of initialization
+ *              Container to hold a single ME - for convenience of
+ * initialization
  */
 
 #include "DQM/HcalCommon/interface/Container.h"
@@ -15,37 +16,38 @@
 
 #include <string>
 
-namespace hcaldqm
-{
-  class ContainerSingle2D : public Container
-  {
+namespace hcaldqm {
+  class ContainerSingle2D : public Container {
   public:
     ContainerSingle2D();
-    ContainerSingle2D(std::string const& folder,
-                      quantity::Quantity*, quantity::Quantity*,
+    ContainerSingle2D(std::string const &folder,
+                      quantity::Quantity *,
+                      quantity::Quantity *,
                       quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fN));
-    ContainerSingle2D(std::string const& folder,
-                      std::string const&,
-                      quantity::Quantity*, quantity::Quantity*,
+    ContainerSingle2D(std::string const &folder,
+                      std::string const &,
+                      quantity::Quantity *,
+                      quantity::Quantity *,
                       quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fN),
-                      int debug=0);
-    ContainerSingle2D(ContainerSingle2D const&);
+                      int debug = 0);
+    ContainerSingle2D(ContainerSingle2D const &);
     ~ContainerSingle2D() override;
 
-    virtual void initialize(std::string const& folder,
-                            quantity::Quantity*, quantity::Quantity*,
+    virtual void initialize(std::string const &folder,
+                            quantity::Quantity *,
+                            quantity::Quantity *,
                             quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fN),
-                            int debug=0);
+                            int debug = 0);
 
-    virtual void initialize(std::string const& folder,
-                            std::string const&,
-                            quantity::Quantity*, quantity::Quantity*,
+    virtual void initialize(std::string const &folder,
+                            std::string const &,
+                            quantity::Quantity *,
+                            quantity::Quantity *,
                             quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fN),
-                            int debug=0);
+                            int debug = 0);
     using Container::initialize;
     //  booking
-    virtual void book(DQMStore::IBooker&,
-                      std::string subsystem="Hcal", std::string aux="");
+    virtual void book(DQMStore::IBooker &, std::string subsystem = "Hcal", std::string aux = "");
     //  filling
     virtual void fill(int, int);
     virtual void fill(int, double);
@@ -74,91 +76,89 @@ namespace hcaldqm
     virtual void setBinContent(double, int, double);
     virtual void setBinContent(double, double, double);
 
-    virtual void fill(HcalDetId const&);
-    virtual void fill(HcalDetId const&, int);
-    virtual void fill(HcalDetId const&, double);
-    virtual void fill(HcalDetId const&, int, int);
-    virtual void fill(HcalDetId const&, int, double);
-    virtual void fill(HcalDetId const&, double, double);
-
-    virtual double getBinContent(HcalDetId const&);
-    virtual double getBinContent(HcalDetId const&, int);
-    virtual double getBinContent(HcalDetId const&, double);
-    virtual double getBinEntries(HcalDetId const&);
-    virtual double getBinEntries(HcalDetId const&, int);
-    virtual double getBinEntries(HcalDetId const&, double);
-
-    virtual void setBinContent(HcalDetId const&, int);
-    virtual void setBinContent(HcalDetId const&, double);
-    virtual void setBinContent(HcalDetId const&, int, int);
-    virtual void setBinContent(HcalDetId const&, int, double);
-    virtual void setBinContent(HcalDetId const&, double, int);
-    virtual void setBinContent(HcalDetId const&, double, double);
-
-    virtual void fill(HcalElectronicsId const&);
-    virtual void fill(HcalElectronicsId const&, int);
-    virtual void fill(HcalElectronicsId const&, double);
-    virtual void fill(HcalElectronicsId const&, int, int);
-    virtual void fill(HcalElectronicsId const&, int, double);
-    virtual void fill(HcalElectronicsId const&, double, double);
-
-    virtual void fill(HcalDetId const&, HcalElectronicsId const&);
-    virtual void fill(HcalDetId const&, HcalElectronicsId const&,
-                      double);
-
-    virtual double getBinContent(HcalElectronicsId const&);
-    virtual double getBinContent(HcalElectronicsId const&, int);
-    virtual double getBinContent(HcalElectronicsId const&, double);
-    virtual double getBinEntries(HcalElectronicsId const&);
-    virtual double getBinEntries(HcalElectronicsId const&, int);
-    virtual double getBinEntries(HcalElectronicsId const&, double);
-
-    virtual void setBinContent(HcalElectronicsId const&, int);
-    virtual void setBinContent(HcalElectronicsId const&, double);
-    virtual void setBinContent(HcalElectronicsId const&, int, int);
-    virtual void setBinContent(HcalElectronicsId const&, int, double);
-    virtual void setBinContent(HcalElectronicsId const&, double, int);
-    virtual void setBinContent(HcalElectronicsId const&, double, double);
-
-    virtual void fill(HcalTrigTowerDetId const&);
-    virtual void fill(HcalTrigTowerDetId const&, int);
-    virtual void fill(HcalTrigTowerDetId const&, double);
-    virtual void fill(HcalTrigTowerDetId const&, int, int);
-    virtual void fill(HcalTrigTowerDetId const&, int, double);
-    virtual void fill(HcalTrigTowerDetId const&, double, double);
-
-    virtual double getBinContent(HcalTrigTowerDetId const&);
-    virtual double getBinContent(HcalTrigTowerDetId const&, int);
-    virtual double getBinContent(HcalTrigTowerDetId const&, double);
-    virtual double getBinEntries(HcalTrigTowerDetId const&);
-    virtual double getBinEntries(HcalTrigTowerDetId const&, int);
-    virtual double getBinEntries(HcalTrigTowerDetId const&, double);
-
-    virtual void setBinContent(HcalTrigTowerDetId const&, int);
-    virtual void setBinContent(HcalTrigTowerDetId const&, double);
-    virtual void setBinContent(HcalTrigTowerDetId const&, int, int);
-    virtual void setBinContent(HcalTrigTowerDetId const&, int, double);
-    virtual void setBinContent(HcalTrigTowerDetId const&, double, int);
-    virtual void setBinContent(HcalTrigTowerDetId const&, double, double);
-
-    virtual void reset() {_me->Reset();}
-    virtual void print() {std::cout << _qname << std::endl;}
-
-    virtual void load(DQMStore::IGetter&, std::string subsystem="Hcal",
-                      std::string aux="");
+    virtual void fill(HcalDetId const &);
+    virtual void fill(HcalDetId const &, int);
+    virtual void fill(HcalDetId const &, double);
+    virtual void fill(HcalDetId const &, int, int);
+    virtual void fill(HcalDetId const &, int, double);
+    virtual void fill(HcalDetId const &, double, double);
+
+    virtual double getBinContent(HcalDetId const &);
+    virtual double getBinContent(HcalDetId const &, int);
+    virtual double getBinContent(HcalDetId const &, double);
+    virtual double getBinEntries(HcalDetId const &);
+    virtual double getBinEntries(HcalDetId const &, int);
+    virtual double getBinEntries(HcalDetId const &, double);
+
+    virtual void setBinContent(HcalDetId const &, int);
+    virtual void setBinContent(HcalDetId const &, double);
+    virtual void setBinContent(HcalDetId const &, int, int);
+    virtual void setBinContent(HcalDetId const &, int, double);
+    virtual void setBinContent(HcalDetId const &, double, int);
+    virtual void setBinContent(HcalDetId const &, double, double);
+
+    virtual void fill(HcalElectronicsId const &);
+    virtual void fill(HcalElectronicsId const &, int);
+    virtual void fill(HcalElectronicsId const &, double);
+    virtual void fill(HcalElectronicsId const &, int, int);
+    virtual void fill(HcalElectronicsId const &, int, double);
+    virtual void fill(HcalElectronicsId const &, double, double);
+
+    virtual void fill(HcalDetId const &, HcalElectronicsId const &);
+    virtual void fill(HcalDetId const &, HcalElectronicsId const &, double);
+
+    virtual double getBinContent(HcalElectronicsId const &);
+    virtual double getBinContent(HcalElectronicsId const &, int);
+    virtual double getBinContent(HcalElectronicsId const &, double);
+    virtual double getBinEntries(HcalElectronicsId const &);
+    virtual double getBinEntries(HcalElectronicsId const &, int);
+    virtual double getBinEntries(HcalElectronicsId const &, double);
+
+    virtual void setBinContent(HcalElectronicsId const &, int);
+    virtual void setBinContent(HcalElectronicsId const &, double);
+    virtual void setBinContent(HcalElectronicsId const &, int, int);
+    virtual void setBinContent(HcalElectronicsId const &, int, double);
+    virtual void setBinContent(HcalElectronicsId const &, double, int);
+    virtual void setBinContent(HcalElectronicsId const &, double, double);
+
+    virtual void fill(HcalTrigTowerDetId const &);
+    virtual void fill(HcalTrigTowerDetId const &, int);
+    virtual void fill(HcalTrigTowerDetId const &, double);
+    virtual void fill(HcalTrigTowerDetId const &, int, int);
+    virtual void fill(HcalTrigTowerDetId const &, int, double);
+    virtual void fill(HcalTrigTowerDetId const &, double, double);
+
+    virtual double getBinContent(HcalTrigTowerDetId const &);
+    virtual double getBinContent(HcalTrigTowerDetId const &, int);
+    virtual double getBinContent(HcalTrigTowerDetId const &, double);
+    virtual double getBinEntries(HcalTrigTowerDetId const &);
+    virtual double getBinEntries(HcalTrigTowerDetId const &, int);
+    virtual double getBinEntries(HcalTrigTowerDetId const &, double);
+
+    virtual void setBinContent(HcalTrigTowerDetId const &, int);
+    virtual void setBinContent(HcalTrigTowerDetId const &, double);
+    virtual void setBinContent(HcalTrigTowerDetId const &, int, int);
+    virtual void setBinContent(HcalTrigTowerDetId const &, int, double);
+    virtual void setBinContent(HcalTrigTowerDetId const &, double, int);
+    virtual void setBinContent(HcalTrigTowerDetId const &, double, double);
+
+    virtual void reset() { _me->Reset(); }
+    virtual void print() { std::cout << _qname << std::endl; }
+
+    virtual void load(DQMStore::IGetter &, std::string subsystem = "Hcal", std::string aux = "");
 
     virtual void extendAxisRange(int);
 
     void showOverflowZ(bool showOverflow);
 
   protected:
-    MonitorElement*     _me;
-    quantity::Quantity* _qx;
-    quantity::Quantity* _qy;
-    quantity::Quantity* _qz;
+    MonitorElement *_me;
+    quantity::Quantity *_qx;
+    quantity::Quantity *_qy;
+    quantity::Quantity *_qz;
 
     virtual void customize();
   };
-}
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/ContainerSingleProf1D.h b/DQM/HcalCommon/interface/ContainerSingleProf1D.h
index ad0764fbd0ba0..184e34bacac4f 100644
--- a/DQM/HcalCommon/interface/ContainerSingleProf1D.h
+++ b/DQM/HcalCommon/interface/ContainerSingleProf1D.h
@@ -6,38 +6,36 @@
  *      Author:                 Viktor Khristenko
  *
  *      Description:
- *              Container to hold a single ME - for convenience of initialization
+ *              Container to hold a single ME - for convenience of
+ * initialization
  */
 
 #include "DQM/HcalCommon/interface/ContainerSingle1D.h"
 
 #include <string>
 
-namespace hcaldqm
-{
-  class ContainerSingleProf1D : public ContainerSingle1D
-  {
+namespace hcaldqm {
+  class ContainerSingleProf1D : public ContainerSingle1D {
   public:
     ContainerSingleProf1D();
-    ContainerSingleProf1D(std::string const& folder,
-                          quantity::Quantity*,
+    ContainerSingleProf1D(std::string const &folder,
+                          quantity::Quantity *,
                           quantity::Quantity *qy = new quantity::ValueQuantity(quantity::fN));
     ~ContainerSingleProf1D() override {}
 
-    void initialize(std::string const& folder,
-                    quantity::Quantity*,
+    void initialize(std::string const &folder,
+                    quantity::Quantity *,
                     quantity::Quantity *qy = new quantity::ValueQuantity(quantity::fN),
-                    int debug=0) override;
-    void initialize(std::string const& folder,
-                    std::string const&,
-                    quantity::Quantity*,
+                    int debug = 0) override;
+    void initialize(std::string const &folder,
+                    std::string const &,
+                    quantity::Quantity *,
                     quantity::Quantity *qy = new quantity::ValueQuantity(quantity::fN),
-                    int debug=0) override;
+                    int debug = 0) override;
 
     //  booking
-    void book(DQMStore::IBooker&,
-              std::string subsystem="Hcal", std::string aux="") override;
+    void book(DQMStore::IBooker &, std::string subsystem = "Hcal", std::string aux = "") override;
   };
-}
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/ContainerSingleProf2D.h b/DQM/HcalCommon/interface/ContainerSingleProf2D.h
index fbc682fbf017f..40a2d32197a6d 100644
--- a/DQM/HcalCommon/interface/ContainerSingleProf2D.h
+++ b/DQM/HcalCommon/interface/ContainerSingleProf2D.h
@@ -6,38 +6,39 @@
  *	Author:			Viktor Khristenko
  *
  *	Description:
- *		Container to hold a single ME - for convenience of initialization
+ *		Container to hold a single ME - for convenience of
+ *initialization
  */
 
 #include "DQM/HcalCommon/interface/ContainerSingle2D.h"
 
 #include <string>
 
-namespace hcaldqm
-{
-  class ContainerSingleProf2D : public ContainerSingle2D
-  {
+namespace hcaldqm {
+  class ContainerSingleProf2D : public ContainerSingle2D {
   public:
     ContainerSingleProf2D();
-    ContainerSingleProf2D(std::string const& folder,
-                          quantity::Quantity*, quantity::Quantity*,
+    ContainerSingleProf2D(std::string const &folder,
+                          quantity::Quantity *,
+                          quantity::Quantity *,
                           quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fN));
     ~ContainerSingleProf2D() override {}
 
-    void initialize(std::string const& folder,
-                    quantity::Quantity*, quantity::Quantity*,
+    void initialize(std::string const &folder,
+                    quantity::Quantity *,
+                    quantity::Quantity *,
                     quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fN),
-                    int debug=0) override;
+                    int debug = 0) override;
 
-    void initialize(std::string const& folder,
-                    std::string const&,
-                    quantity::Quantity*, quantity::Quantity*,
+    void initialize(std::string const &folder,
+                    std::string const &,
+                    quantity::Quantity *,
+                    quantity::Quantity *,
                     quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fN),
-                    int debug=0) override;
+                    int debug = 0) override;
 
     //	booking
-    void book(DQMStore::IBooker&,
-              std::string subsystem="Hcal", std::string aux="") override;
+    void book(DQMStore::IBooker &, std::string subsystem = "Hcal", std::string aux = "") override;
 
     void fill(int, int) override;
     void fill(int, double) override;
@@ -48,31 +49,30 @@ namespace hcaldqm
     void fill(double, double) override;
     void fill(double, double, double) override;
 
-    void fill(HcalDetId const&) override;
-    void fill(HcalDetId const&, int) override;
-    void fill(HcalDetId const&, double) override;
-    void fill(HcalDetId const&, int, int) override;
-    void fill(HcalDetId const&, int, double) override;
-    void fill(HcalDetId const&, double, double) override;
+    void fill(HcalDetId const &) override;
+    void fill(HcalDetId const &, int) override;
+    void fill(HcalDetId const &, double) override;
+    void fill(HcalDetId const &, int, int) override;
+    void fill(HcalDetId const &, int, double) override;
+    void fill(HcalDetId const &, double, double) override;
 
-    void fill(HcalElectronicsId const&) override;
-    void fill(HcalElectronicsId const&, int) override;
-    void fill(HcalElectronicsId const&, double) override;
-    void fill(HcalElectronicsId const&, int, int) override;
-    void fill(HcalElectronicsId const&, int, double) override;
-    void fill(HcalElectronicsId const&, double, double) override;
+    void fill(HcalElectronicsId const &) override;
+    void fill(HcalElectronicsId const &, int) override;
+    void fill(HcalElectronicsId const &, double) override;
+    void fill(HcalElectronicsId const &, int, int) override;
+    void fill(HcalElectronicsId const &, int, double) override;
+    void fill(HcalElectronicsId const &, double, double) override;
 
-    void fill(HcalDetId const&, HcalElectronicsId const&) override;
-    void fill(HcalDetId const&, HcalElectronicsId const&,
-              double) override;
+    void fill(HcalDetId const &, HcalElectronicsId const &) override;
+    void fill(HcalDetId const &, HcalElectronicsId const &, double) override;
 
-    void fill(HcalTrigTowerDetId const&) override;
-    void fill(HcalTrigTowerDetId const&, int) override;
-    void fill(HcalTrigTowerDetId const&, double) override;
-    void fill(HcalTrigTowerDetId const&, int, int) override;
-    void fill(HcalTrigTowerDetId const&, int, double) override;
-    void fill(HcalTrigTowerDetId const&, double, double) override;
+    void fill(HcalTrigTowerDetId const &) override;
+    void fill(HcalTrigTowerDetId const &, int) override;
+    void fill(HcalTrigTowerDetId const &, double) override;
+    void fill(HcalTrigTowerDetId const &, int, int) override;
+    void fill(HcalTrigTowerDetId const &, int, double) override;
+    void fill(HcalTrigTowerDetId const &, double, double) override;
   };
-}
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/ContainerXXX.h b/DQM/HcalCommon/interface/ContainerXXX.h
index f80ae02e36e0a..5bf641c136879 100644
--- a/DQM/HcalCommon/interface/ContainerXXX.h
+++ b/DQM/HcalCommon/interface/ContainerXXX.h
@@ -11,380 +11,304 @@
 #include "DQM/HcalCommon/interface/Container1D.h"
 #include <cmath>
 
-namespace hcaldqm
-{
+namespace hcaldqm {
   typedef boost::unordered_map<uint32_t, double> doubleCompactMap;
   typedef boost::unordered_map<uint32_t, int> intCompactMap;
   typedef boost::unordered_map<uint32_t, uint32_t> uintCompactMap;
 
-  template<typename STDTYPE>
-  class ContainerXXX
-  {
+  template <typename STDTYPE>
+  class ContainerXXX {
   public:
     ContainerXXX() {}
-    ContainerXXX(hashfunctions::HashType ht) : _hashmap(ht)
-    {}
-    ContainerXXX(ContainerXXX const& x);
-    virtual ~ContainerXXX() {_cmap.clear();}
+    ContainerXXX(hashfunctions::HashType ht) : _hashmap(ht) {}
+    ContainerXXX(ContainerXXX const &x);
+    virtual ~ContainerXXX() { _cmap.clear(); }
 
     //  initialize, booking. booking is done from Electronicsmap.
-    virtual void initialize(hashfunctions::HashType,int debug=0);
-    virtual void book(HcalElectronicsMap const*);
-    virtual void book(HcalElectronicsMap const*,
-                      filter::HashFilter const&);
+    virtual void initialize(hashfunctions::HashType, int debug = 0);
+    virtual void book(HcalElectronicsMap const *);
+    virtual void book(HcalElectronicsMap const *, filter::HashFilter const &);
 
     //  setters
-    virtual void set(HcalDetId const&, STDTYPE);
-    virtual void set(HcalElectronicsId const&, STDTYPE);
-    virtual void set(HcalTrigTowerDetId const&, STDTYPE);
+    virtual void set(HcalDetId const &, STDTYPE);
+    virtual void set(HcalElectronicsId const &, STDTYPE);
+    virtual void set(HcalTrigTowerDetId const &, STDTYPE);
 
     //  getters
-    virtual STDTYPE& get(HcalDetId const&);
-    virtual STDTYPE& get(HcalElectronicsId const&);
-    virtual STDTYPE& get(HcalTrigTowerDetId const&);
+    virtual STDTYPE &get(HcalDetId const &);
+    virtual STDTYPE &get(HcalElectronicsId const &);
+    virtual STDTYPE &get(HcalTrigTowerDetId const &);
 
     //  pushers/adders - not a push_back.
     //  ignored if already is present
-    virtual void push(HcalDetId const&, STDTYPE);
-    virtual void push(HcalElectronicsId const&, STDTYPE);
-    virtual void push(HcalTrigTowerDetId const&, STDTYPE);
+    virtual void push(HcalDetId const &, STDTYPE);
+    virtual void push(HcalElectronicsId const &, STDTYPE);
+    virtual void push(HcalTrigTowerDetId const &, STDTYPE);
 
     //  finders, note true/false - no pointer to the actual guy...
     //  I know, I know not the best coding...
-    virtual bool exists(HcalDetId const&);
-    virtual bool exists(HcalElectronicsId const&);
-    virtual bool exists(HcalTrigTowerDetId const&);
+    virtual bool exists(HcalDetId const &);
+    virtual bool exists(HcalElectronicsId const &);
+    virtual bool exists(HcalTrigTowerDetId const &);
 
-    virtual void dump(Container1D*);
-    virtual void dump(std::vector<Container1D*> const&);
+    virtual void dump(Container1D *);
+    virtual void dump(std::vector<Container1D *> const &);
 
-    virtual void load(Container1D*);
+    virtual void load(Container1D *);
     virtual void reset();
     virtual uint32_t size();
     virtual void print();
 
   protected:
     typedef boost::unordered_map<uint32_t, STDTYPE> CompactMap;
-    CompactMap              _cmap;
-    mapper::HashMapper      _hashmap;
-    Logger                  _logger;
+    CompactMap _cmap;
+    mapper::HashMapper _hashmap;
+    Logger _logger;
 
   public:
-    virtual typename CompactMap::const_iterator begin()
-    {return _cmap.begin();}
-    virtual typename CompactMap::const_iterator end()
-    {return _cmap.end();}
+    virtual typename CompactMap::const_iterator begin() { return _cmap.begin(); }
+    virtual typename CompactMap::const_iterator end() { return _cmap.end(); }
   };
 
-  template<typename STDTYPE>
-  ContainerXXX<STDTYPE>::ContainerXXX(ContainerXXX const& x)
-  {
-    for(auto& p : _cmap)
-      {
-        _cmap.insert(std::make_pair(p.first, p.second));
-      }
+  template <typename STDTYPE>
+  ContainerXXX<STDTYPE>::ContainerXXX(ContainerXXX const &x) {
+    for (auto &p : _cmap) {
+      _cmap.insert(std::make_pair(p.first, p.second));
+    }
   }
 
-  template<typename STDTYPE>
-  void ContainerXXX<STDTYPE>::initialize(hashfunctions::HashType ht,
-                                         int debug)
-  {
+  template <typename STDTYPE>
+  void ContainerXXX<STDTYPE>::initialize(hashfunctions::HashType ht, int debug) {
     _hashmap.initialize(ht);
     _logger.set("XXX", debug);
   }
 
-  template<typename STDTYPE>
-  void ContainerXXX<STDTYPE>::book(HcalElectronicsMap const* emap)
-  {
-    if (_hashmap.isDHash())
-      {
-        std::vector<HcalGenericDetId> dids =
-          emap->allPrecisionId();
-        for (std::vector<HcalGenericDetId>::const_iterator it=
-               dids.begin(); it!=dids.end(); ++it)
-          {
-            if (!it->isHcalDetId())
-              continue;
-
-            HcalDetId did = HcalDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(did);
-            _logger.debug(_hashmap.getName(did));
-            typename CompactMap::iterator mit = _cmap.find(hash);
-            if (mit!=_cmap.end())
-              continue;
-
-            _cmap.insert(
-                         std::make_pair(hash, STDTYPE(0)));
-          }
+  template <typename STDTYPE>
+  void ContainerXXX<STDTYPE>::book(HcalElectronicsMap const *emap) {
+    if (_hashmap.isDHash()) {
+      std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
+      for (std::vector<HcalGenericDetId>::const_iterator it = dids.begin(); it != dids.end(); ++it) {
+        if (!it->isHcalDetId())
+          continue;
+
+        HcalDetId did = HcalDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(did);
+        _logger.debug(_hashmap.getName(did));
+        typename CompactMap::iterator mit = _cmap.find(hash);
+        if (mit != _cmap.end())
+          continue;
+
+        _cmap.insert(std::make_pair(hash, STDTYPE(0)));
       }
-    else if (_hashmap.isEHash())
-      {
-        std::vector<HcalElectronicsId> eids =
-          emap->allElectronicsIdPrecision();
-        for (std::vector<HcalElectronicsId>::const_iterator it=
-               eids.begin(); it!=eids.end(); ++it)
-          {
-            HcalElectronicsId eid = HcalElectronicsId(it->rawId());
-            uint32_t hash = _hashmap.getHash(eid);
-            _logger.debug(_hashmap.getName(eid));
-            typename CompactMap::iterator mit = _cmap.find(hash);
-            if (mit!=_cmap.end())
-              continue;
-
-            _cmap.insert(
-                         std::make_pair(hash, STDTYPE(0)));
-          }
+    } else if (_hashmap.isEHash()) {
+      std::vector<HcalElectronicsId> eids = emap->allElectronicsIdPrecision();
+      for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+        HcalElectronicsId eid = HcalElectronicsId(it->rawId());
+        uint32_t hash = _hashmap.getHash(eid);
+        _logger.debug(_hashmap.getName(eid));
+        typename CompactMap::iterator mit = _cmap.find(hash);
+        if (mit != _cmap.end())
+          continue;
+
+        _cmap.insert(std::make_pair(hash, STDTYPE(0)));
       }
-    else if (_hashmap.isTHash())
-      {
-        std::vector<HcalTrigTowerDetId> tids = emap->allTriggerId();
-        for (std::vector<HcalTrigTowerDetId>::const_iterator it=
-               tids.begin(); it!=tids.end(); ++it)
-          {
-            HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(tid);
-            _logger.debug(_hashmap.getName(tid));
-            typename CompactMap::iterator mit = _cmap.find(hash);
-            if (mit!=_cmap.end())
-              continue;
-
-            _cmap.insert(
-                         std::make_pair(hash, STDTYPE(0)));
-          }
+    } else if (_hashmap.isTHash()) {
+      std::vector<HcalTrigTowerDetId> tids = emap->allTriggerId();
+      for (std::vector<HcalTrigTowerDetId>::const_iterator it = tids.begin(); it != tids.end(); ++it) {
+        HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(tid);
+        _logger.debug(_hashmap.getName(tid));
+        typename CompactMap::iterator mit = _cmap.find(hash);
+        if (mit != _cmap.end())
+          continue;
+
+        _cmap.insert(std::make_pair(hash, STDTYPE(0)));
       }
+    }
   }
 
-  template<typename STDTYPE>
-  void ContainerXXX<STDTYPE>::book(HcalElectronicsMap const* emap,
-                                   filter::HashFilter const& filter)
-  {
-    if (_hashmap.isDHash())
-      {
-        std::vector<HcalGenericDetId> dids =
-          emap->allPrecisionId();
-        for (std::vector<HcalGenericDetId>::const_iterator it=
-               dids.begin(); it!=dids.end(); ++it)
-          {
-            if (!it->isHcalDetId())
-              continue;
-
-            HcalDetId did = HcalDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(did);
-            typename CompactMap::iterator mit = _cmap.find(hash);
-            if (mit!=_cmap.end())
-              continue;
-            if (filter.filter(did))
-              continue;
-
-            _logger.debug(_hashmap.getName(did));
-
-            _cmap.insert(
-                         std::make_pair(hash, STDTYPE(0)));
-          }
+  template <typename STDTYPE>
+  void ContainerXXX<STDTYPE>::book(HcalElectronicsMap const *emap, filter::HashFilter const &filter) {
+    if (_hashmap.isDHash()) {
+      std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
+      for (std::vector<HcalGenericDetId>::const_iterator it = dids.begin(); it != dids.end(); ++it) {
+        if (!it->isHcalDetId())
+          continue;
+
+        HcalDetId did = HcalDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(did);
+        typename CompactMap::iterator mit = _cmap.find(hash);
+        if (mit != _cmap.end())
+          continue;
+        if (filter.filter(did))
+          continue;
+
+        _logger.debug(_hashmap.getName(did));
+
+        _cmap.insert(std::make_pair(hash, STDTYPE(0)));
       }
-    else if (_hashmap.isEHash())
-      {
-        std::vector<HcalElectronicsId> eids =
-          emap->allElectronicsIdPrecision();
-        for (std::vector<HcalElectronicsId>::const_iterator it=
-               eids.begin(); it!=eids.end(); ++it)
-          {
-            HcalElectronicsId eid = HcalElectronicsId(it->rawId());
-            uint32_t hash = _hashmap.getHash(eid);
-            typename CompactMap::iterator mit = _cmap.find(hash);
-            if (filter.filter(eid))
-              continue;
-            if (mit!=_cmap.end())
-              continue;
-            _logger.debug(eid);
-
-            _cmap.insert(
-                         std::make_pair(hash, STDTYPE(0)));
-          }
+    } else if (_hashmap.isEHash()) {
+      std::vector<HcalElectronicsId> eids = emap->allElectronicsIdPrecision();
+      for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+        HcalElectronicsId eid = HcalElectronicsId(it->rawId());
+        uint32_t hash = _hashmap.getHash(eid);
+        typename CompactMap::iterator mit = _cmap.find(hash);
+        if (filter.filter(eid))
+          continue;
+        if (mit != _cmap.end())
+          continue;
+        _logger.debug(eid);
+
+        _cmap.insert(std::make_pair(hash, STDTYPE(0)));
       }
-    else if (_hashmap.isTHash())
-      {
-        std::vector<HcalTrigTowerDetId> tids = emap->allTriggerId();
-        for (std::vector<HcalTrigTowerDetId>::const_iterator it=
-               tids.begin(); it!=tids.end(); ++it)
-          {
-            HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(tid);
-            typename CompactMap::iterator mit = _cmap.find(hash);
-            if (mit!=_cmap.end())
-              continue;
-            if (filter.filter(tid))
-              continue;
-            _logger.debug(_hashmap.getName(tid));
-
-            _cmap.insert(
-                         std::make_pair(hash, STDTYPE(0)));
-          }
+    } else if (_hashmap.isTHash()) {
+      std::vector<HcalTrigTowerDetId> tids = emap->allTriggerId();
+      for (std::vector<HcalTrigTowerDetId>::const_iterator it = tids.begin(); it != tids.end(); ++it) {
+        HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(tid);
+        typename CompactMap::iterator mit = _cmap.find(hash);
+        if (mit != _cmap.end())
+          continue;
+        if (filter.filter(tid))
+          continue;
+        _logger.debug(_hashmap.getName(tid));
+
+        _cmap.insert(std::make_pair(hash, STDTYPE(0)));
       }
+    }
   }
 
-  template<typename STDTYPE>
-  void ContainerXXX<STDTYPE>::set(HcalDetId const& did, STDTYPE x)
-  {
+  template <typename STDTYPE>
+  void ContainerXXX<STDTYPE>::set(HcalDetId const &did, STDTYPE x) {
     _cmap[_hashmap.getHash(did)] = x;
   }
 
-  template<typename STDTYPE>
-  void ContainerXXX<STDTYPE>::set(HcalElectronicsId const& did,
-                                  STDTYPE x)
-  {
+  template <typename STDTYPE>
+  void ContainerXXX<STDTYPE>::set(HcalElectronicsId const &did, STDTYPE x) {
     _cmap[_hashmap.getHash(did)] = x;
   }
 
-  template<typename STDTYPE>
-  void ContainerXXX<STDTYPE>::set(HcalTrigTowerDetId const& did,
-                                  STDTYPE x)
-  {
+  template <typename STDTYPE>
+  void ContainerXXX<STDTYPE>::set(HcalTrigTowerDetId const &did, STDTYPE x) {
     _cmap[_hashmap.getHash(did)] = x;
   }
 
-  template<typename STDTYPE>
-  STDTYPE& ContainerXXX<STDTYPE>::get(HcalDetId const& did)
-  {
+  template <typename STDTYPE>
+  STDTYPE &ContainerXXX<STDTYPE>::get(HcalDetId const &did) {
     return _cmap[_hashmap.getHash(did)];
   }
 
-  template<typename STDTYPE>
-  STDTYPE& ContainerXXX<STDTYPE>::get(HcalElectronicsId const& eid)
-  {
+  template <typename STDTYPE>
+  STDTYPE &ContainerXXX<STDTYPE>::get(HcalElectronicsId const &eid) {
     return _cmap[_hashmap.getHash(eid)];
   }
 
-  template<typename STDTYPE>
-  STDTYPE& ContainerXXX<STDTYPE>::get(HcalTrigTowerDetId const& tid)
-  {
+  template <typename STDTYPE>
+  STDTYPE &ContainerXXX<STDTYPE>::get(HcalTrigTowerDetId const &tid) {
     return _cmap[_hashmap.getHash(tid)];
   }
 
-  template<typename STDTYPE>
-  bool ContainerXXX<STDTYPE>::exists(HcalDetId const& id)
-  {
-    return _cmap.find(id.rawId())!=_cmap.end();
+  template <typename STDTYPE>
+  bool ContainerXXX<STDTYPE>::exists(HcalDetId const &id) {
+    return _cmap.find(id.rawId()) != _cmap.end();
   }
 
-  template<typename STDTYPE>
-  bool ContainerXXX<STDTYPE>::exists(HcalElectronicsId const& id)
-  {
-    return _cmap.find(id.rawId())!=_cmap.end();
+  template <typename STDTYPE>
+  bool ContainerXXX<STDTYPE>::exists(HcalElectronicsId const &id) {
+    return _cmap.find(id.rawId()) != _cmap.end();
   }
 
-  template<typename STDTYPE>
-  bool ContainerXXX<STDTYPE>::exists(HcalTrigTowerDetId const& id)
-  {
-    return _cmap.find(id.rawId())!=_cmap.end();
+  template <typename STDTYPE>
+  bool ContainerXXX<STDTYPE>::exists(HcalTrigTowerDetId const &id) {
+    return _cmap.find(id.rawId()) != _cmap.end();
   }
 
-  template<typename STDTYPE>
-  void ContainerXXX<STDTYPE>::push(HcalDetId const& did, STDTYPE x)
-  {
+  template <typename STDTYPE>
+  void ContainerXXX<STDTYPE>::push(HcalDetId const &did, STDTYPE x) {
     uint32_t hash = did.rawId();
-    typename CompactMap::iterator mit=_cmap.find(hash);
-    if (mit!=_cmap.end())
+    typename CompactMap::iterator mit = _cmap.find(hash);
+    if (mit != _cmap.end())
       return;
-    _cmap.insert(
-                 std::make_pair(hash, x));
+    _cmap.insert(std::make_pair(hash, x));
   }
 
-  template<typename STDTYPE>
-  void ContainerXXX<STDTYPE>::push(HcalElectronicsId const& eid, STDTYPE x)
-  {
+  template <typename STDTYPE>
+  void ContainerXXX<STDTYPE>::push(HcalElectronicsId const &eid, STDTYPE x) {
     uint32_t hash = eid.rawId();
-    typename CompactMap::iterator mit=_cmap.find(hash);
-    if (mit!=_cmap.end())
+    typename CompactMap::iterator mit = _cmap.find(hash);
+    if (mit != _cmap.end())
       return;
-    _cmap.insert(
-                 std::make_pair(hash, x));
+    _cmap.insert(std::make_pair(hash, x));
   }
 
-  template<typename STDTYPE>
-  void ContainerXXX<STDTYPE>::push(HcalTrigTowerDetId const& tid, STDTYPE x)
-  {
+  template <typename STDTYPE>
+  void ContainerXXX<STDTYPE>::push(HcalTrigTowerDetId const &tid, STDTYPE x) {
     uint32_t hash = tid.rawId();
-    typename CompactMap::iterator mit=_cmap.find(hash);
-    if (mit!=_cmap.end())
+    typename CompactMap::iterator mit = _cmap.find(hash);
+    if (mit != _cmap.end())
       return;
-    _cmap.insert(
-                 std::make_pair(hash, x));
+    _cmap.insert(std::make_pair(hash, x));
   }
 
-  template<typename STDTYPE>
-  uint32_t ContainerXXX<STDTYPE>::size()
-  {
+  template <typename STDTYPE>
+  uint32_t ContainerXXX<STDTYPE>::size() {
     return (uint32_t)(_cmap.size());
   }
 
-  template<typename STDTYPE>
-  void ContainerXXX<STDTYPE>::dump(Container1D* c)
-  {
-    for(auto& p : _cmap)
-      {
-        STDTYPE &x = p.second;
-        uint32_t hash = p.first;
-        c->fill(hash, (double)x);
-      }
+  template <typename STDTYPE>
+  void ContainerXXX<STDTYPE>::dump(Container1D *c) {
+    for (auto &p : _cmap) {
+      STDTYPE &x = p.second;
+      uint32_t hash = p.first;
+      c->fill(hash, (double)x);
+    }
   }
 
-  template<typename STDTYPE>
-  void ContainerXXX<STDTYPE>::dump(std::vector<Container1D*> const &vc)
-  {
-    for(auto& p : _cmap)
-      {
-        STDTYPE &x = p.second;
-        uint32_t hash = p.first;
-
-        for (std::vector<Container1D*>::const_iterator it=vc.begin();
-             it!=vc.end(); ++it)
-          (*it)->fill(hash, (double)x);
-      }
+  template <typename STDTYPE>
+  void ContainerXXX<STDTYPE>::dump(std::vector<Container1D *> const &vc) {
+    for (auto &p : _cmap) {
+      STDTYPE &x = p.second;
+      uint32_t hash = p.first;
+
+      for (std::vector<Container1D *>::const_iterator it = vc.begin(); it != vc.end(); ++it)
+        (*it)->fill(hash, (double)x);
+    }
   }
 
-  template<typename STDTYPE>
-  void ContainerXXX<STDTYPE>::print()
-  {
+  template <typename STDTYPE>
+  void ContainerXXX<STDTYPE>::print() {
     std::cout << "Container by " << _hashmap.getHashTypeName() << std::endl;
-    for(auto& p : _cmap)
-      {
-        if (_hashmap.isDHash())
-          std::cout << HcalDetId(p.first) << p.second << std::endl;
-        else if (_hashmap.isEHash())
-          std::cout << HcalElectronicsId(p.first) << p.second
-                    << std::endl;
-        else if (_hashmap.isTHash())
-          std::cout << HcalTrigTowerDetId(p.first) << p.second
-                    << std::endl;
-      }
+    for (auto &p : _cmap) {
+      if (_hashmap.isDHash())
+        std::cout << HcalDetId(p.first) << p.second << std::endl;
+      else if (_hashmap.isEHash())
+        std::cout << HcalElectronicsId(p.first) << p.second << std::endl;
+      else if (_hashmap.isTHash())
+        std::cout << HcalTrigTowerDetId(p.first) << p.second << std::endl;
+    }
   }
 
-  template<typename STDTYPE>
-  void ContainerXXX<STDTYPE>::reset()
-  {
-    for(auto& p : _cmap)
-      {
-        p.second = 0;
-      }
+  template <typename STDTYPE>
+  void ContainerXXX<STDTYPE>::reset() {
+    for (auto &p : _cmap) {
+      p.second = 0;
+    }
   }
 
-  template<typename STDTYPE>
-  void ContainerXXX<STDTYPE>::load(Container1D* cont)
-  {
-    for(auto& p : _cmap)
-      {
-        STDTYPE &x = p.second;
-        uint32_t hash = p.first;
-
-        if (_hashmap.isDHash())
-          x = cont->getBinContent(HcalDetId(hash));
-        else if (_hashmap.isEHash())
-          x = cont->getBinContent(HcalElectronicsId(hash));
-        else if (_hashmap.isTHash())
-          x = cont->getBinContent(HcalTrigTowerDetId(hash));
-      }
+  template <typename STDTYPE>
+  void ContainerXXX<STDTYPE>::load(Container1D *cont) {
+    for (auto &p : _cmap) {
+      STDTYPE &x = p.second;
+      uint32_t hash = p.first;
+
+      if (_hashmap.isDHash())
+        x = cont->getBinContent(HcalDetId(hash));
+      else if (_hashmap.isEHash())
+        x = cont->getBinContent(HcalElectronicsId(hash));
+      else if (_hashmap.isTHash())
+        x = cont->getBinContent(HcalTrigTowerDetId(hash));
+    }
   }
-}
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/DQClient.h b/DQM/HcalCommon/interface/DQClient.h
index 7db66b91f3382..3216d92cc31a3 100644
--- a/DQM/HcalCommon/interface/DQClient.h
+++ b/DQM/HcalCommon/interface/DQClient.h
@@ -7,69 +7,65 @@
  *	Description:
  */
 
-#include "DQM/HcalCommon/interface/DQModule.h"
-#include "DQM/HcalCommon/interface/Utilities.h"
-#include "DQM/HcalCommon/interface/Flag.h"
-#include "DQM/HcalCommon/interface/ContainerXXX.h"
-#include "DQM/HcalCommon/interface/Container2D.h"
 #include "DQM/HcalCommon/interface/Container1D.h"
-#include "DQM/HcalCommon/interface/ContainerProf2D.h"
+#include "DQM/HcalCommon/interface/Container2D.h"
 #include "DQM/HcalCommon/interface/ContainerProf1D.h"
+#include "DQM/HcalCommon/interface/ContainerProf2D.h"
 #include "DQM/HcalCommon/interface/ContainerSingle1D.h"
 #include "DQM/HcalCommon/interface/ContainerSingle2D.h"
+#include "DQM/HcalCommon/interface/ContainerXXX.h"
+#include "DQM/HcalCommon/interface/DQModule.h"
+#include "DQM/HcalCommon/interface/Flag.h"
 #include "DQM/HcalCommon/interface/HashFilter.h"
 #include "DQM/HcalCommon/interface/Utilities.h"
 
-namespace hcaldqm
-{
-	class DQClient : public DQModule
-	{
-		public:
-			DQClient(std::string const&,
-				std::string const&, edm::ParameterSet const&);
-			~DQClient() override {}
+namespace hcaldqm {
+  class DQClient : public DQModule {
+  public:
+    DQClient(std::string const &, std::string const &, edm::ParameterSet const &);
+    ~DQClient() override {}
 
-			virtual void beginRun(edm::Run const&, edm::EventSetup const&);
-			virtual void beginLuminosityBlock(DQMStore::IBooker&,
-				DQMStore::IGetter&, edm::LuminosityBlock const& lb,
-				edm::EventSetup const&);
-			virtual void endLuminosityBlock(DQMStore::IBooker&,
-				DQMStore::IGetter&,
-				edm::LuminosityBlock const&, edm::EventSetup const&);
-			virtual std::vector<flag::Flag> endJob(DQMStore::IBooker&, 
-				DQMStore::IGetter&);
+    virtual void beginRun(edm::Run const &, edm::EventSetup const &);
+    virtual void beginLuminosityBlock(DQMStore::IBooker &,
+                                      DQMStore::IGetter &,
+                                      edm::LuminosityBlock const &lb,
+                                      edm::EventSetup const &);
+    virtual void endLuminosityBlock(DQMStore::IBooker &,
+                                    DQMStore::IGetter &,
+                                    edm::LuminosityBlock const &,
+                                    edm::EventSetup const &);
+    virtual std::vector<flag::Flag> endJob(DQMStore::IBooker &, DQMStore::IGetter &);
 
-		protected:
-			struct LSSummary
-			{
-				//	vector of flags per each FED
-				std::vector<std::vector<flag::Flag> > _vflags;
-				int _LS;
-			};
-			//	task name
-			std::string _taskname;
+  protected:
+    struct LSSummary {
+      //	vector of flags per each FED
+      std::vector<std::vector<flag::Flag>> _vflags;
+      int _LS;
+    };
+    //	task name
+    std::string _taskname;
 
-			//	counters
-			int _totalLS;
-			int _maxProcessedLS;
+    //	counters
+    int _totalLS;
+    int _maxProcessedLS;
 
-			//	emap
-			HcalElectronicsMap const* _emap;
+    //	emap
+    HcalElectronicsMap const *_emap;
 
-			// Crate and crate eid lists
-			std::vector<int> _vCrates;
-			std::vector<uint32_t> _vhashCrates;
+    // Crate and crate eid lists
+    std::vector<int> _vCrates;
+    std::vector<uint32_t> _vhashCrates;
 
-			//	FED and FED Eids lists
-			std::vector<int> _vFEDs;
-			std::vector<uint32_t> _vhashFEDs;
+    //	FED and FED Eids lists
+    std::vector<int> _vFEDs;
+    std::vector<uint32_t> _vhashFEDs;
 
-			//	Container of Quality masks
-			ContainerXXX<uint32_t> _xQuality;
+    //	Container of Quality masks
+    ContainerXXX<uint32_t> _xQuality;
 
-			//	vector of FEDs registered at cDAQ
-			std::vector<uint32_t> _vcdaqEids;
-	};
-}
+    //	vector of FEDs registered at cDAQ
+    std::vector<uint32_t> _vcdaqEids;
+  };
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/DQHarvester.h b/DQM/HcalCommon/interface/DQHarvester.h
index b7b9b342f1223..3304137b503ae 100644
--- a/DQM/HcalCommon/interface/DQHarvester.h
+++ b/DQM/HcalCommon/interface/DQHarvester.h
@@ -6,64 +6,56 @@
  *	Author:		VK
  */
 
+#include "DQM/HcalCommon/interface/ContainerXXX.h"
 #include "DQM/HcalCommon/interface/DQModule.h"
 #include "DQM/HcalCommon/interface/Utilities.h"
-#include "DQM/HcalCommon/interface/ContainerXXX.h"
 
-#include <vector>
 #include <string>
+#include <vector>
 
-namespace hcaldqm
-{
-	class DQHarvester : public DQMEDHarvester, public DQModule
-	{
-		public:
-			DQHarvester(edm::ParameterSet const&);
-			~DQHarvester() override {}
-
-			void beginRun(edm::Run const&, edm::EventSetup const&) override;
-			void dqmBeginLuminosityBlock(
-				DQMStore::IBooker& ib, DQMStore::IGetter& ig,
-				edm::LuminosityBlock const& lb, edm::EventSetup const& es);
-			void dqmEndLuminosityBlock(
-				DQMStore::IBooker&, DQMStore::IGetter&, 
-				edm::LuminosityBlock const&, edm::EventSetup const&) override;
-			void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override;
-
-		protected:
-			//	empa
-			HcalElectronicsMap const* _emap;
-
-			//	some counters
-			int _totalLS;
-
-			// Crate and crate eid lists
-			std::vector<int> _vCrates;
-			std::vector<uint32_t> _vhashCrates;
-
-			//	all FEDs
-			std::vector<int>		_vFEDs;
-			std::vector<uint32_t>	_vhashFEDs;
-			//	container of quality masks from conddb
-			ContainerXXX<uint32_t> _xQuality;
-			//	vector of Electronics raw Ids of HCAL FEDs
-			//	that were registered at cDAQ for the Run
-			std::vector<uint32_t> _vcdaqEids;
-
-			virtual void _dqmEndLuminosityBlock(
-				DQMStore::IBooker&, DQMStore::IGetter&, 
-				edm::LuminosityBlock const&, edm::EventSetup const&) = 0;
-			virtual void _dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) = 0;
-	};
-}
+namespace hcaldqm {
+  class DQHarvester : public DQMEDHarvester, public DQModule {
+  public:
+    DQHarvester(edm::ParameterSet const &);
+    ~DQHarvester() override {}
+
+    void beginRun(edm::Run const &, edm::EventSetup const &) override;
+    void dqmBeginLuminosityBlock(DQMStore::IBooker &ib,
+                                 DQMStore::IGetter &ig,
+                                 edm::LuminosityBlock const &lb,
+                                 edm::EventSetup const &es);
+    void dqmEndLuminosityBlock(DQMStore::IBooker &,
+                               DQMStore::IGetter &,
+                               edm::LuminosityBlock const &,
+                               edm::EventSetup const &) override;
+    void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
+
+  protected:
+    //	empa
+    HcalElectronicsMap const *_emap;
+
+    //	some counters
+    int _totalLS;
+
+    // Crate and crate eid lists
+    std::vector<int> _vCrates;
+    std::vector<uint32_t> _vhashCrates;
+
+    //	all FEDs
+    std::vector<int> _vFEDs;
+    std::vector<uint32_t> _vhashFEDs;
+    //	container of quality masks from conddb
+    ContainerXXX<uint32_t> _xQuality;
+    //	vector of Electronics raw Ids of HCAL FEDs
+    //	that were registered at cDAQ for the Run
+    std::vector<uint32_t> _vcdaqEids;
+
+    virtual void _dqmEndLuminosityBlock(DQMStore::IBooker &,
+                                        DQMStore::IGetter &,
+                                        edm::LuminosityBlock const &,
+                                        edm::EventSetup const &) = 0;
+    virtual void _dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) = 0;
+  };
+}  // namespace hcaldqm
 
 #endif
-
-
-
-
-
-
-
-
-
diff --git a/DQM/HcalCommon/interface/DQModule.h b/DQM/HcalCommon/interface/DQModule.h
index a55894b8537b8..c94c14cbbadbb 100644
--- a/DQM/HcalCommon/interface/DQModule.h
+++ b/DQM/HcalCommon/interface/DQModule.h
@@ -10,75 +10,49 @@
 #include "DQM/HcalCommon/interface/HcalCommonHeaders.h"
 #include "DQM/HcalCommon/interface/Logger.h"
 
+#include <iostream>
 #include <string>
 #include <vector>
-#include <iostream>
-
-namespace hcaldqm
-{
-	//	Module Types:
-	//	1) Tasks - process every event
-	//	2) Clients - get loaded into the Harvester and processed sequentially
-	//		used only for Online/Offline World Harvesting. Prefer standalone
-	//		Harvesters
-	//	3) Harvester - Client Manager - per lumi processing
-	enum ModuleType
-	{
-		fTask = 0,
-		fHarvester = 1,
-		fClient = 2,
-		nModuleType = 3
-	};
-
-	enum ProcessingType
-	{
-		fOnline = 0,
-		fOffline = 1,
-		fLocal = 2,
-		nProcessingType = 3
-	};
-
-	std::string const pTypeNames[nProcessingType] = {
-		"Online", "Offline", "Local"
-	};
 
-	class DQModule
-	{
-		public:
-			DQModule(edm::ParameterSet const&);
-			virtual ~DQModule() noexcept(false) {}
-
-		protected:
-			//	Member variables	
-			//	@name - module's name
-			//	@ptype - Processing Type
-			//	@mtype - Module Type
-			//	@ctype - Calibration Type of the Module. All we want is 0 or 1 
-			std::string				_name;
-			ModuleType				_mtype;
-			ProcessingType			_ptype;
-			int						_debug;
-
-			int						_runkeyVal;
-			std::string				_runkeyName;
-			std::string				_subsystem;
-
-			int						_evsTotal;
-			int						_evsPerLS;
-			int						_currentLS;
-			int						_maxLS;
-			Logger					_logger;
-	};
-}
+namespace hcaldqm {
+  //	Module Types:
+  //	1) Tasks - process every event
+  //	2) Clients - get loaded into the Harvester and processed sequentially
+  //		used only for Online/Offline World Harvesting. Prefer standalone
+  //		Harvesters
+  //	3) Harvester - Client Manager - per lumi processing
+  enum ModuleType { fTask = 0, fHarvester = 1, fClient = 2, nModuleType = 3 };
+
+  enum ProcessingType { fOnline = 0, fOffline = 1, fLocal = 2, nProcessingType = 3 };
+
+  std::string const pTypeNames[nProcessingType] = {"Online", "Offline", "Local"};
+
+  class DQModule {
+  public:
+    DQModule(edm::ParameterSet const &);
+    virtual ~DQModule() noexcept(false) {}
+
+  protected:
+    //	Member variables
+    //	@name - module's name
+    //	@ptype - Processing Type
+    //	@mtype - Module Type
+    //	@ctype - Calibration Type of the Module. All we want is 0 or 1
+    std::string _name;
+    ModuleType _mtype;
+    ProcessingType _ptype;
+    int _debug;
+
+    int _runkeyVal;
+    std::string _runkeyName;
+    std::string _subsystem;
+
+    int _evsTotal;
+    int _evsPerLS;
+    int _currentLS;
+    int _maxLS;
+    Logger _logger;
+  };
+}  // namespace hcaldqm
 
 #endif
-
-
-
-
-
-
-
-
-
-
diff --git a/DQM/HcalCommon/interface/DQTask.h b/DQM/HcalCommon/interface/DQTask.h
index d7fb3c8890b37..44edcf69c2ac6 100644
--- a/DQM/HcalCommon/interface/DQTask.h
+++ b/DQM/HcalCommon/interface/DQTask.h
@@ -7,76 +7,57 @@
  *	Date:		13.10.2015
  */
 
-#include "DQM/HcalCommon/interface/DQModule.h"
 #include "DQM/HcalCommon/interface/ContainerI.h"
 #include "DQM/HcalCommon/interface/ContainerS.h"
 #include "DQM/HcalCommon/interface/ContainerXXX.h"
+#include "DQM/HcalCommon/interface/DQModule.h"
 
-namespace hcaldqm
-{
-	enum UpdateFreq
-	{
-		fEvent = 0,
-		f1LS = 1,
-		f10LS = 2,
-		f50LS = 3,
-		f100LS = 4,
-		nUpdateFreq = 5
-	};
-	class DQTask : public one::DQMEDAnalyzer<one::DQMLuminosityBlockElements>, public DQModule
-	{
-		public:
-
-			//	constructor
-			DQTask(edm::ParameterSet const&);
-			~DQTask() override{}
-
-			//	base inheritance to override from DQMEDAnalyzer
-			void analyze(edm::Event const&, edm::EventSetup const&) override;
-			void bookHistograms(DQMStore::IBooker &, edm::Run const&,
-				edm::EventSetup const&) override;
-			void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override;
-			void beginLuminosityBlock(edm::LuminosityBlock const&,
-				edm::EventSetup const&) override;
-			void endLuminosityBlock(edm::LuminosityBlock const&,
-				edm::EventSetup const&) override;
-
-		protected:
-			// protected funcs
-			virtual void _resetMonitors(UpdateFreq);
-			virtual void _process(edm::Event const&, edm::EventSetup const&) = 0;
-			virtual bool _isApplicable(edm::Event const&) {return true;}
-			virtual int _getCalibType(edm::Event const&);
-
-			//	protected vars
-			ContainerI _cEvsTotal;
-			ContainerI _cEvsPerLS;
-			ContainerI _cRunKeyVal;
-			ContainerS _cRunKeyName;
-			ContainerS _cProcessingTypeName;
-
-			//	counters
-			int			_procLSs;
-
-			//	container of quality masks from conddb
-			ContainerXXX<uint32_t> _xQuality;
-			//	vector of Electronics raw Ids of HCAL FEDs 
-			//	registered at cDAQ for the Run
-			std::vector<uint32_t> _vcdaqEids;
-
-			//	Tags and corresponding Tokens
-			edm::InputTag		_tagRaw;
-			edm::EDGetTokenT<FEDRawDataCollection> _tokRaw;
-
-			// Conditions and emap
-			edm::ESHandle<HcalDbService> _dbService;
-			HcalElectronicsMap const* _emap;
-	};
-}
+namespace hcaldqm {
+  enum UpdateFreq { fEvent = 0, f1LS = 1, f10LS = 2, f50LS = 3, f100LS = 4, nUpdateFreq = 5 };
+  class DQTask : public one::DQMEDAnalyzer<one::DQMLuminosityBlockElements>, public DQModule {
+  public:
+    //	constructor
+    DQTask(edm::ParameterSet const &);
+    ~DQTask() override {}
+
+    //	base inheritance to override from DQMEDAnalyzer
+    void analyze(edm::Event const &, edm::EventSetup const &) override;
+    void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+    void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
+    void beginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
+    void endLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
+
+  protected:
+    // protected funcs
+    virtual void _resetMonitors(UpdateFreq);
+    virtual void _process(edm::Event const &, edm::EventSetup const &) = 0;
+    virtual bool _isApplicable(edm::Event const &) { return true; }
+    virtual int _getCalibType(edm::Event const &);
+
+    //	protected vars
+    ContainerI _cEvsTotal;
+    ContainerI _cEvsPerLS;
+    ContainerI _cRunKeyVal;
+    ContainerS _cRunKeyName;
+    ContainerS _cProcessingTypeName;
+
+    //	counters
+    int _procLSs;
+
+    //	container of quality masks from conddb
+    ContainerXXX<uint32_t> _xQuality;
+    //	vector of Electronics raw Ids of HCAL FEDs
+    //	registered at cDAQ for the Run
+    std::vector<uint32_t> _vcdaqEids;
+
+    //	Tags and corresponding Tokens
+    edm::InputTag _tagRaw;
+    edm::EDGetTokenT<FEDRawDataCollection> _tokRaw;
+
+    // Conditions and emap
+    edm::ESHandle<HcalDbService> _dbService;
+    HcalElectronicsMap const *_emap;
+  };
+}  // namespace hcaldqm
 
 #endif
-
-
-
-
-
diff --git a/DQM/HcalCommon/interface/DetectorQuantity.h b/DQM/HcalCommon/interface/DetectorQuantity.h
index 8462909a0cb10..f42946812b939 100644
--- a/DQM/HcalCommon/interface/DetectorQuantity.h
+++ b/DQM/HcalCommon/interface/DetectorQuantity.h
@@ -8,101 +8,75 @@
 
 #include "DQM/HcalCommon/interface/Quantity.h"
 
-namespace hcaldqm
-{
-	namespace quantity
-	{
-		enum DetectorQuantityType
-		{
-			fiphi = 0,
-			fieta = 1,
-			fdepth = 2,
-			fSubdet = 3,
-			fSubdetPM = 4,
-			nDetectorQuantityType = 5
-		};
-		int getValue_iphi(HcalDetId const&);
-		int getValue_ieta(HcalDetId const&);
-		int getValue_depth(HcalDetId const&);
-		int getValue_Subdet(HcalDetId const&);
-		int getValue_SubdetPM(HcalDetId const&);
-		uint32_t getBin_iphi(HcalDetId const&);
-		uint32_t getBin_ieta(HcalDetId const&);
-		uint32_t getBin_depth(HcalDetId const&);
-		uint32_t getBin_Subdet(HcalDetId const&);
-		uint32_t getBin_SubdetPM(HcalDetId const&);
-		HcalDetId getDid_iphi(int);
-		HcalDetId getDid_ieta(int);
-		HcalDetId getDid_depth(int);
-		HcalDetId getDid_Subdet(int);
-		HcalDetId getDid_SubdetPM(int);
-		std::vector<std::string> getLabels_iphi();
-		std::vector<std::string> getLabels_ieta();
-		std::vector<std::string> getLabels_depth();
-		std::vector<std::string> getLabels_Subdet();
-		std::vector<std::string> getLabels_SubdetPM();
+namespace hcaldqm {
+  namespace quantity {
+    enum DetectorQuantityType {
+      fiphi = 0,
+      fieta = 1,
+      fdepth = 2,
+      fSubdet = 3,
+      fSubdetPM = 4,
+      nDetectorQuantityType = 5
+    };
+    int getValue_iphi(HcalDetId const &);
+    int getValue_ieta(HcalDetId const &);
+    int getValue_depth(HcalDetId const &);
+    int getValue_Subdet(HcalDetId const &);
+    int getValue_SubdetPM(HcalDetId const &);
+    uint32_t getBin_iphi(HcalDetId const &);
+    uint32_t getBin_ieta(HcalDetId const &);
+    uint32_t getBin_depth(HcalDetId const &);
+    uint32_t getBin_Subdet(HcalDetId const &);
+    uint32_t getBin_SubdetPM(HcalDetId const &);
+    HcalDetId getDid_iphi(int);
+    HcalDetId getDid_ieta(int);
+    HcalDetId getDid_depth(int);
+    HcalDetId getDid_Subdet(int);
+    HcalDetId getDid_SubdetPM(int);
+    std::vector<std::string> getLabels_iphi();
+    std::vector<std::string> getLabels_ieta();
+    std::vector<std::string> getLabels_depth();
+    std::vector<std::string> getLabels_Subdet();
+    std::vector<std::string> getLabels_SubdetPM();
 
-		typedef int (*getValueType_did)(HcalDetId const&);
-		typedef uint32_t (*getBinType_did)(HcalDetId const&);
-		typedef HcalDetId (*getDid_did)(int);
-		typedef std::vector<std::string> (*getLabels_did)();
-		getValueType_did const getValue_functions_did[nDetectorQuantityType] = {
-			getValue_iphi, getValue_ieta, getValue_depth,
-			getValue_Subdet, getValue_SubdetPM
-		};
-		getBinType_did const getBin_functions_did[nDetectorQuantityType] = {
-			getBin_iphi, getBin_ieta, getBin_depth,
-			getBin_Subdet, getBin_SubdetPM
-		};
-		getDid_did const getDid_functions_did[nDetectorQuantityType] = {
-			getDid_iphi, getDid_ieta, getDid_depth, 
-			getDid_Subdet, getDid_SubdetPM
-		};
-		getLabels_did const getLabels_functions_did[nDetectorQuantityType] = {
-			getLabels_iphi, getLabels_ieta, getLabels_depth,
-			getLabels_Subdet, getLabels_SubdetPM
-		};
-		std::string const name_did[nDetectorQuantityType] = {
-			"iphi", "ieta", "depth", "Subdet", "SubdetPM"
-		};
-		double const min_did[nDetectorQuantityType] = {
-			0.5, 0, 0.5, 0, 0
-		};
-		double const max_did[nDetectorQuantityType] = {
-			72.5, 84, 4.5, 4, 8
-		};
-		int const nbins_did[nDetectorQuantityType] = {
-			72, 84, 4, 4, 8
-		};
+    typedef int (*getValueType_did)(HcalDetId const &);
+    typedef uint32_t (*getBinType_did)(HcalDetId const &);
+    typedef HcalDetId (*getDid_did)(int);
+    typedef std::vector<std::string> (*getLabels_did)();
+    getValueType_did const getValue_functions_did[nDetectorQuantityType] = {
+        getValue_iphi, getValue_ieta, getValue_depth, getValue_Subdet, getValue_SubdetPM};
+    getBinType_did const getBin_functions_did[nDetectorQuantityType] = {
+        getBin_iphi, getBin_ieta, getBin_depth, getBin_Subdet, getBin_SubdetPM};
+    getDid_did const getDid_functions_did[nDetectorQuantityType] = {
+        getDid_iphi, getDid_ieta, getDid_depth, getDid_Subdet, getDid_SubdetPM};
+    getLabels_did const getLabels_functions_did[nDetectorQuantityType] = {
+        getLabels_iphi, getLabels_ieta, getLabels_depth, getLabels_Subdet, getLabels_SubdetPM};
+    std::string const name_did[nDetectorQuantityType] = {"iphi", "ieta", "depth", "Subdet", "SubdetPM"};
+    double const min_did[nDetectorQuantityType] = {0.5, 0, 0.5, 0, 0};
+    double const max_did[nDetectorQuantityType] = {72.5, 84, 4.5, 4, 8};
+    int const nbins_did[nDetectorQuantityType] = {72, 84, 4, 4, 8};
 
-		class DetectorQuantity : public Quantity
-		{
-			public:
-				DetectorQuantity() {}
-				DetectorQuantity(DetectorQuantityType type, bool isLog=false) :
-					Quantity(name_did[type], isLog), _type(type)
-				{}
-				~DetectorQuantity() override {}
-				DetectorQuantity* makeCopy() override
-				{return new DetectorQuantity(_type, _isLog);}
+    class DetectorQuantity : public Quantity {
+    public:
+      DetectorQuantity() {}
+      DetectorQuantity(DetectorQuantityType type, bool isLog = false) : Quantity(name_did[type], isLog), _type(type) {}
+      ~DetectorQuantity() override {}
+      DetectorQuantity *makeCopy() override { return new DetectorQuantity(_type, _isLog); }
 
-				int getValue(HcalDetId const& did) override 
-				{return getValue_functions_did[_type](did);}
-				uint32_t getBin(HcalDetId const& did) override
-				{return getBin_functions_did[_type](did);}
+      int getValue(HcalDetId const &did) override { return getValue_functions_did[_type](did); }
+      uint32_t getBin(HcalDetId const &did) override { return getBin_functions_did[_type](did); }
 
-				QuantityType type() override {return fDetectorQuantity;}
-				int nbins() override {return nbins_did[_type];}
-				double min() override {return min_did[_type];}
-				double max() override {return max_did[_type];}
-				bool isCoordinate() override {return true;}
-				std::vector<std::string> getLabels() override
-				{return getLabels_functions_did[_type]();}
+      QuantityType type() override { return fDetectorQuantity; }
+      int nbins() override { return nbins_did[_type]; }
+      double min() override { return min_did[_type]; }
+      double max() override { return max_did[_type]; }
+      bool isCoordinate() override { return true; }
+      std::vector<std::string> getLabels() override { return getLabels_functions_did[_type](); }
 
-			protected:
-				DetectorQuantityType	_type;
-		};
-	}
-}
+    protected:
+      DetectorQuantityType _type;
+    };
+  }  // namespace quantity
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/ElectronicsMap.h b/DQM/HcalCommon/interface/ElectronicsMap.h
index 6db8e992e0ac9..8020382d801fb 100644
--- a/DQM/HcalCommon/interface/ElectronicsMap.h
+++ b/DQM/HcalCommon/interface/ElectronicsMap.h
@@ -6,70 +6,58 @@
  *	Author:		Viktor Khristenko
  *
  *	Description:
- *		HcalElectronicsMap is slow. Upon beginRun hash what you need from 
- *		emap. Preserve only uint32_t. When you look things up, you know
- *		what is the key and you know what is the output as you define it up
- *		infront.
+ *		HcalElectronicsMap is slow. Upon beginRun hash what you need
+ *from emap. Preserve only uint32_t. When you look things up, you know what is
+ *the key and you know what is the output as you define it up infront.
  */
 
-#include "DQM/HcalCommon/interface/HcalCommonHeaders.h"
-#include "DQM/HcalCommon/interface/HashMapper.h"
 #include "DQM/HcalCommon/interface/HashFilter.h"
+#include "DQM/HcalCommon/interface/HashMapper.h"
+#include "DQM/HcalCommon/interface/HcalCommonHeaders.h"
 
 #include "boost/unordered_map.hpp"
 #include "string"
 
-namespace hcaldqm
-{
-	namespace electronicsmap
-	{
-		enum ElectronicsMapType
-		{
-			fHcalElectronicsMap = 0,
-			fD2EHashMap = 1,
-			fT2EHashMap = 2,
-			fE2DHashMap = 3,
-			fE2THashMap = 4,
-			nElectronicsMapType = 5
-		};
-
-		class ElectronicsMap
-		{
-			public:
-				ElectronicsMap() :
-					_emap(nullptr)
-				{}
-				//	define how to use upon construction
-				ElectronicsMap(ElectronicsMapType etype) : 
-					_etype(etype), _emap(nullptr)
-				{}
-				~ElectronicsMap() {}
-
-				void initialize(HcalElectronicsMap const*, ElectronicsMapType
-					etype=fHcalElectronicsMap);
-
-				//	filter is to filter things you do not need out
-				void initialize(HcalElectronicsMap const*, ElectronicsMapType,
-					filter::HashFilter const&);
-				uint32_t lookup(DetId const&);
-				uint32_t lookup(HcalDetId const&);
-				uint32_t lookup(HcalElectronicsId const&);
-
-				void print();
-				
-
-			private:
-				//	configures how to use emap
-				ElectronicsMapType	_etype;
-
-				//	2 choices either use as HcalElectronicsMap or as ur hash
-				typedef boost::unordered_map<uint32_t, uint32_t> EMapType;
-				EMapType			_ids;
-
-				//	
-				HcalElectronicsMap const* _emap;
-		};
-	}
-}
+namespace hcaldqm {
+  namespace electronicsmap {
+    enum ElectronicsMapType {
+      fHcalElectronicsMap = 0,
+      fD2EHashMap = 1,
+      fT2EHashMap = 2,
+      fE2DHashMap = 3,
+      fE2THashMap = 4,
+      nElectronicsMapType = 5
+    };
+
+    class ElectronicsMap {
+    public:
+      ElectronicsMap() : _emap(nullptr) {}
+      //	define how to use upon construction
+      ElectronicsMap(ElectronicsMapType etype) : _etype(etype), _emap(nullptr) {}
+      ~ElectronicsMap() {}
+
+      void initialize(HcalElectronicsMap const *, ElectronicsMapType etype = fHcalElectronicsMap);
+
+      //	filter is to filter things you do not need out
+      void initialize(HcalElectronicsMap const *, ElectronicsMapType, filter::HashFilter const &);
+      uint32_t lookup(DetId const &);
+      uint32_t lookup(HcalDetId const &);
+      uint32_t lookup(HcalElectronicsId const &);
+
+      void print();
+
+    private:
+      //	configures how to use emap
+      ElectronicsMapType _etype;
+
+      //	2 choices either use as HcalElectronicsMap or as ur hash
+      typedef boost::unordered_map<uint32_t, uint32_t> EMapType;
+      EMapType _ids;
+
+      //
+      HcalElectronicsMap const *_emap;
+    };
+  }  // namespace electronicsmap
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/ElectronicsQuantity.h b/DQM/HcalCommon/interface/ElectronicsQuantity.h
index a740e81461156..0be467d40c053 100644
--- a/DQM/HcalCommon/interface/ElectronicsQuantity.h
+++ b/DQM/HcalCommon/interface/ElectronicsQuantity.h
@@ -9,441 +9,422 @@
 #include "DQM/HcalCommon/interface/Quantity.h"
 #include "boost/unordered_map.hpp"
 
-namespace hcaldqm
-{
-	namespace quantity
-	{
-		enum ElectronicsQuantityType
-		{
-			fFED = 0,
-			fFEDuTCA = 1,
-			fFEDVME = 2,
-			fCrate = 3,
-			fCrateuTCA = 4,
-			fCrateVME = 5,
-			fSlotuTCA = 6,
-			fSlotVME = 7,
-			fSpigot = 8,
-			fFiberuTCA = 9,
-			fFiberVME = 10,
-			fFiberCh = 11,
+namespace hcaldqm {
+  namespace quantity {
+    enum ElectronicsQuantityType {
+      fFED = 0,
+      fFEDuTCA = 1,
+      fFEDVME = 2,
+      fCrate = 3,
+      fCrateuTCA = 4,
+      fCrateVME = 5,
+      fSlotuTCA = 6,
+      fSlotVME = 7,
+      fSpigot = 8,
+      fFiberuTCA = 9,
+      fFiberVME = 10,
+      fFiberCh = 11,
 
-			//	Complex Quantities
-			fFEDuTCASlot = 12,
-			fFEDVMESpigot = 13,
-			fFiberuTCAFiberCh = 14,
-			fFiberVMEFiberCh = 15,
+      //	Complex Quantities
+      fFEDuTCASlot = 12,
+      fFEDVMESpigot = 13,
+      fFiberuTCAFiberCh = 14,
+      fFiberVMEFiberCh = 15,
 
-			//	Adding Trigger Quantities for VME
-			fSLB = 16,
-			fSLBCh = 17,
-			fSLBSLBCh = 18,
+      //	Adding Trigger Quantities for VME
+      fSLB = 16,
+      fSLBCh = 17,
+      fSLBSLBCh = 18,
 
-			//	Adding Trigger Quantities for uTCA
-			fFiberuTCATP = 19,
-			fFiberChuTCATP = 20,
-			fFiberuTCATPFiberChuTCATP = 21,
+      //	Adding Trigger Quantities for uTCA
+      fFiberuTCATP = 19,
+      fFiberChuTCATP = 20,
+      fFiberuTCATPFiberChuTCATP = 21,
 
-			nElectronicsQuantityType = 22
-		};
+      nElectronicsQuantityType = 22
+    };
 
-		int getValue_FED(HcalElectronicsId const&);
-		int getValue_FEDuTCA(HcalElectronicsId const&);
-		int getValue_FEDVME(HcalElectronicsId const&);
-		int getValue_Crate(HcalElectronicsId const&);
-		int getValue_CrateuTCA(HcalElectronicsId const&);
-		int getValue_CrateVME(HcalElectronicsId const&);
-		int getValue_SlotuTCA(HcalElectronicsId const&);
-		int getValue_SlotVME(HcalElectronicsId const&);
-		int getValue_Spigot(HcalElectronicsId const&);
-		int getValue_FiberuTCA(HcalElectronicsId const&);
-		int getValue_FiberVME(HcalElectronicsId const&);
-		int getValue_FiberCh(HcalElectronicsId const&);
-		int getValue_FEDuTCASlot(HcalElectronicsId const&);
-		int getValue_FEDVMESpigot(HcalElectronicsId const&);
-		int getValue_FiberuTCAFiberCh(HcalElectronicsId const&);
-		int getValue_FiberVMEFiberCh(HcalElectronicsId const&);
-		int getValue_SLB(HcalElectronicsId const&);
-		int getValue_SLBCh(HcalElectronicsId const&);
-		int getValue_SLBSLBCh(HcalElectronicsId const&);
-		int getValue_FiberuTCATP(HcalElectronicsId const&);
-		int getValue_FiberChuTCATP(HcalElectronicsId const&);
-		int getValue_FiberuTCATPFiberChuTCATP(HcalElectronicsId const&);
-		uint32_t getBin_FED(HcalElectronicsId const&);
-		uint32_t getBin_FEDuTCA(HcalElectronicsId const&);
-		uint32_t getBin_FEDVME(HcalElectronicsId const&);
-		uint32_t getBin_Crate(HcalElectronicsId const&);
-		uint32_t getBin_CrateuTCA(HcalElectronicsId const&);
-		uint32_t getBin_CrateVME(HcalElectronicsId const&);
-		uint32_t getBin_SlotuTCA(HcalElectronicsId const&);
-		uint32_t getBin_SlotVME(HcalElectronicsId const&);
-		uint32_t getBin_Spigot(HcalElectronicsId const&);
-		uint32_t getBin_FiberuTCA(HcalElectronicsId const&);
-		uint32_t getBin_FiberVME(HcalElectronicsId const&);
-		uint32_t getBin_FiberCh(HcalElectronicsId const&);
-		uint32_t getBin_FEDuTCASlot(HcalElectronicsId const&);
-		uint32_t getBin_FEDVMESpigot(HcalElectronicsId const&);
-		uint32_t getBin_FiberuTCAFiberCh(HcalElectronicsId const&);
-		uint32_t getBin_FiberVMEFiberCh(HcalElectronicsId const&);
-		uint32_t getBin_SLB(HcalElectronicsId const&);
-		uint32_t getBin_SLBCh(HcalElectronicsId const&);
-		uint32_t getBin_SLBSLBCh(HcalElectronicsId const&);
-		uint32_t getBin_FiberuTCATP(HcalElectronicsId const&);
-		uint32_t getBin_FiberChuTCATP(HcalElectronicsId const&);
-		uint32_t getBin_FiberuTCATPFiberChuTCATP(HcalElectronicsId const&);
-		HcalElectronicsId getEid_FED(int);
-		HcalElectronicsId getEid_FEDuTCA(int);
-		HcalElectronicsId getEid_FEDVME(int);
-		HcalElectronicsId getEid_Crate(int);
-		HcalElectronicsId getEid_CrateuTCA(int);
-		HcalElectronicsId getEid_CrateVME(int);
-		HcalElectronicsId getEid_SlotuTCA(int);
-		HcalElectronicsId getEid_SlotVME(int);
-		HcalElectronicsId getEid_Spigot(int);
-		HcalElectronicsId getEid_FiberuTCA(int);
-		HcalElectronicsId getEid_FiberVME(int);
-		HcalElectronicsId getEid_FiberCh(int);
-		HcalElectronicsId getEid_FEDuTCASlot(int);
-		HcalElectronicsId getEid_FEDVMESpigot(int);
-		HcalElectronicsId getEid_FiberuTCAFiberCh(int);
-		HcalElectronicsId getEid_FiberVMEFiberCh(int);
-		HcalElectronicsId getEid_SLB(int);
-		HcalElectronicsId getEid_SLBCh(int);
-		HcalElectronicsId getEid_SLBSLBCh(int);
-		HcalElectronicsId getEid_FiberuTCATP(int);
-		HcalElectronicsId getEid_FiberChuTCATP(int);
-		HcalElectronicsId getEid_FiberuTCATPFiberChuTCATP(int);
-		std::vector<std::string> getLabels_FED();
-		std::vector<std::string> getLabels_FEDuTCA();
-		std::vector<std::string> getLabels_FEDVME();
-		std::vector<std::string> getLabels_Crate();
-		std::vector<std::string> getLabels_CrateuTCA();
-		std::vector<std::string> getLabels_CrateVME();
-		std::vector<std::string> getLabels_SlotuTCA();
-		std::vector<std::string> getLabels_SlotVME();
-		std::vector<std::string> getLabels_Spigot();
-		std::vector<std::string> getLabels_FiberuTCA();
-		std::vector<std::string> getLabels_FiberVME();
-		std::vector<std::string> getLabels_FiberCh();
-		std::vector<std::string> getLabels_FEDuTCASlot();
-		std::vector<std::string> getLabels_FEDVMESpigot();
-		std::vector<std::string> getLabels_FiberuTCAFiberCh();
-		std::vector<std::string> getLabels_FiberVMEFiberCh();
-		std::vector<std::string> getLabels_SLB();
-		std::vector<std::string> getLabels_SLBCh();
-		std::vector<std::string> getLabels_SLBSLBCh();
-		std::vector<std::string> getLabels_FiberuTCATP();
-		std::vector<std::string> getLabels_FiberChuTCATP();
-		std::vector<std::string> getLabels_FiberuTCATPFiberChuTCATP();
+    int getValue_FED(HcalElectronicsId const &);
+    int getValue_FEDuTCA(HcalElectronicsId const &);
+    int getValue_FEDVME(HcalElectronicsId const &);
+    int getValue_Crate(HcalElectronicsId const &);
+    int getValue_CrateuTCA(HcalElectronicsId const &);
+    int getValue_CrateVME(HcalElectronicsId const &);
+    int getValue_SlotuTCA(HcalElectronicsId const &);
+    int getValue_SlotVME(HcalElectronicsId const &);
+    int getValue_Spigot(HcalElectronicsId const &);
+    int getValue_FiberuTCA(HcalElectronicsId const &);
+    int getValue_FiberVME(HcalElectronicsId const &);
+    int getValue_FiberCh(HcalElectronicsId const &);
+    int getValue_FEDuTCASlot(HcalElectronicsId const &);
+    int getValue_FEDVMESpigot(HcalElectronicsId const &);
+    int getValue_FiberuTCAFiberCh(HcalElectronicsId const &);
+    int getValue_FiberVMEFiberCh(HcalElectronicsId const &);
+    int getValue_SLB(HcalElectronicsId const &);
+    int getValue_SLBCh(HcalElectronicsId const &);
+    int getValue_SLBSLBCh(HcalElectronicsId const &);
+    int getValue_FiberuTCATP(HcalElectronicsId const &);
+    int getValue_FiberChuTCATP(HcalElectronicsId const &);
+    int getValue_FiberuTCATPFiberChuTCATP(HcalElectronicsId const &);
+    uint32_t getBin_FED(HcalElectronicsId const &);
+    uint32_t getBin_FEDuTCA(HcalElectronicsId const &);
+    uint32_t getBin_FEDVME(HcalElectronicsId const &);
+    uint32_t getBin_Crate(HcalElectronicsId const &);
+    uint32_t getBin_CrateuTCA(HcalElectronicsId const &);
+    uint32_t getBin_CrateVME(HcalElectronicsId const &);
+    uint32_t getBin_SlotuTCA(HcalElectronicsId const &);
+    uint32_t getBin_SlotVME(HcalElectronicsId const &);
+    uint32_t getBin_Spigot(HcalElectronicsId const &);
+    uint32_t getBin_FiberuTCA(HcalElectronicsId const &);
+    uint32_t getBin_FiberVME(HcalElectronicsId const &);
+    uint32_t getBin_FiberCh(HcalElectronicsId const &);
+    uint32_t getBin_FEDuTCASlot(HcalElectronicsId const &);
+    uint32_t getBin_FEDVMESpigot(HcalElectronicsId const &);
+    uint32_t getBin_FiberuTCAFiberCh(HcalElectronicsId const &);
+    uint32_t getBin_FiberVMEFiberCh(HcalElectronicsId const &);
+    uint32_t getBin_SLB(HcalElectronicsId const &);
+    uint32_t getBin_SLBCh(HcalElectronicsId const &);
+    uint32_t getBin_SLBSLBCh(HcalElectronicsId const &);
+    uint32_t getBin_FiberuTCATP(HcalElectronicsId const &);
+    uint32_t getBin_FiberChuTCATP(HcalElectronicsId const &);
+    uint32_t getBin_FiberuTCATPFiberChuTCATP(HcalElectronicsId const &);
+    HcalElectronicsId getEid_FED(int);
+    HcalElectronicsId getEid_FEDuTCA(int);
+    HcalElectronicsId getEid_FEDVME(int);
+    HcalElectronicsId getEid_Crate(int);
+    HcalElectronicsId getEid_CrateuTCA(int);
+    HcalElectronicsId getEid_CrateVME(int);
+    HcalElectronicsId getEid_SlotuTCA(int);
+    HcalElectronicsId getEid_SlotVME(int);
+    HcalElectronicsId getEid_Spigot(int);
+    HcalElectronicsId getEid_FiberuTCA(int);
+    HcalElectronicsId getEid_FiberVME(int);
+    HcalElectronicsId getEid_FiberCh(int);
+    HcalElectronicsId getEid_FEDuTCASlot(int);
+    HcalElectronicsId getEid_FEDVMESpigot(int);
+    HcalElectronicsId getEid_FiberuTCAFiberCh(int);
+    HcalElectronicsId getEid_FiberVMEFiberCh(int);
+    HcalElectronicsId getEid_SLB(int);
+    HcalElectronicsId getEid_SLBCh(int);
+    HcalElectronicsId getEid_SLBSLBCh(int);
+    HcalElectronicsId getEid_FiberuTCATP(int);
+    HcalElectronicsId getEid_FiberChuTCATP(int);
+    HcalElectronicsId getEid_FiberuTCATPFiberChuTCATP(int);
+    std::vector<std::string> getLabels_FED();
+    std::vector<std::string> getLabels_FEDuTCA();
+    std::vector<std::string> getLabels_FEDVME();
+    std::vector<std::string> getLabels_Crate();
+    std::vector<std::string> getLabels_CrateuTCA();
+    std::vector<std::string> getLabels_CrateVME();
+    std::vector<std::string> getLabels_SlotuTCA();
+    std::vector<std::string> getLabels_SlotVME();
+    std::vector<std::string> getLabels_Spigot();
+    std::vector<std::string> getLabels_FiberuTCA();
+    std::vector<std::string> getLabels_FiberVME();
+    std::vector<std::string> getLabels_FiberCh();
+    std::vector<std::string> getLabels_FEDuTCASlot();
+    std::vector<std::string> getLabels_FEDVMESpigot();
+    std::vector<std::string> getLabels_FiberuTCAFiberCh();
+    std::vector<std::string> getLabels_FiberVMEFiberCh();
+    std::vector<std::string> getLabels_SLB();
+    std::vector<std::string> getLabels_SLBCh();
+    std::vector<std::string> getLabels_SLBSLBCh();
+    std::vector<std::string> getLabels_FiberuTCATP();
+    std::vector<std::string> getLabels_FiberChuTCATP();
+    std::vector<std::string> getLabels_FiberuTCATPFiberChuTCATP();
 
-		typedef int(*getValueType_eid)(HcalElectronicsId const&);
-		typedef uint32_t (*getBinType_eid)(HcalElectronicsId const&);
-		typedef HcalElectronicsId (*getEid_eid)(int);
-		typedef std::vector<std::string> (*getLabels_eid)();
-		const std::map<ElectronicsQuantityType, getValueType_eid> getValue_functions_eid = {
-			{fFED,getValue_FED},
-			{fFEDuTCA,getValue_FEDuTCA},
-			{fFEDVME,getValue_FEDVME},
-			{fCrate,getValue_Crate},
-			{fCrateuTCA,getValue_CrateuTCA},
-			{fCrateVME,getValue_CrateVME},
-			{fSlotuTCA,getValue_SlotuTCA},
-			{fSlotVME,getValue_SlotVME},
-			{fSpigot,getValue_Spigot},
-			{fFiberuTCA,getValue_FiberuTCA},
-			{fFiberVME,getValue_FiberVME},
-			{fFiberCh,getValue_FiberCh},
-			{fFEDuTCASlot,getValue_FEDuTCASlot},
-			{fFEDVMESpigot,getValue_FEDVMESpigot},
-			{fFiberuTCAFiberCh,getValue_FiberuTCAFiberCh},
-			{fFiberVMEFiberCh,getValue_FiberVMEFiberCh},
-			{fSLB,getValue_SLB},
-			{fSLBCh,getValue_SLBCh},
-			{fSLBSLBCh,getValue_SLBSLBCh},
-			{fFiberuTCATP,getValue_FiberuTCATP},
-			{fFiberChuTCATP,getValue_FiberChuTCATP},
-			{fFiberuTCATPFiberChuTCATP,getValue_FiberuTCATPFiberChuTCATP},
-		};
-		const std::map<ElectronicsQuantityType, getBinType_eid> getBin_functions_eid = {
-			{fFED,getBin_FED},
-			{fFEDuTCA,getBin_FEDuTCA},
-			{fFEDVME,getBin_FEDVME},
-			{fCrate,getBin_Crate},
-			{fCrateuTCA,getBin_CrateuTCA},
-			{fCrateVME,getBin_CrateVME},
-			{fSlotuTCA,getBin_SlotuTCA},
-			{fSlotVME,getBin_SlotVME},
-			{fSpigot,getBin_Spigot},
-			{fFiberuTCA,getBin_FiberuTCA},
-			{fFiberVME,getBin_FiberVME},
-			{fFiberCh,getBin_FiberCh},
-			{fFEDuTCASlot,getBin_FEDuTCASlot},
-			{fFEDVMESpigot,getBin_FEDVMESpigot},
-			{fFiberuTCAFiberCh,getBin_FiberuTCAFiberCh},
-			{fFiberVMEFiberCh,getBin_FiberVMEFiberCh},
-			{fSLB,getBin_SLB},
-			{fSLBCh,getBin_SLBCh},
-			{fSLBSLBCh,getBin_SLBSLBCh},
-			{fFiberuTCATP,getBin_FiberuTCATP},
-			{fFiberChuTCATP,getBin_FiberChuTCATP},
-			{fFiberuTCATPFiberChuTCATP,getBin_FiberuTCATPFiberChuTCATP},
-		};
-		const std::map<ElectronicsQuantityType, getEid_eid> getEid_functions_eid = {
-			{fFED,getEid_FED},
-			{fFEDuTCA,getEid_FEDuTCA},
-			{fFEDVME,getEid_FEDVME},
-			{fCrate,getEid_Crate},
-			{fCrateuTCA,getEid_CrateuTCA},
-			{fCrateVME,getEid_CrateVME},
-			{fSlotuTCA,getEid_SlotuTCA},
-			{fSlotVME,getEid_SlotVME},
-			{fSpigot,getEid_Spigot},
-			{fFiberuTCA,getEid_FiberuTCA},
-			{fFiberVME,getEid_FiberVME},
-			{fFiberCh,getEid_FiberCh},
-			{fFEDuTCASlot,getEid_FEDuTCASlot},
-			{fFEDVMESpigot,getEid_FEDVMESpigot},
-			{fFiberuTCAFiberCh,getEid_FiberuTCAFiberCh},
-			{fFiberVMEFiberCh,getEid_FiberVMEFiberCh},
-			{fSLB,getEid_SLB},
-			{fSLBCh,getEid_SLBCh},
-			{fSLBSLBCh,getEid_SLBSLBCh},
-			{fFiberuTCATP,getEid_FiberuTCATP},
-			{fFiberChuTCATP,getEid_FiberChuTCATP},
-			{fFiberuTCATPFiberChuTCATP,getEid_FiberuTCATPFiberChuTCATP},
-		};
-		const std::map<ElectronicsQuantityType, getLabels_eid> getLabels_functions_eid = {
-			{fFED,getLabels_FED},
-			{fFEDuTCA,getLabels_FEDuTCA},
-			{fFEDVME,getLabels_FEDVME},
-			{fCrate,getLabels_Crate},
-			{fCrateuTCA,getLabels_CrateuTCA},
-			{fCrateVME,getLabels_CrateVME},
-			{fSlotuTCA,getLabels_SlotuTCA},
-			{fSlotVME,getLabels_SlotVME},
-			{fSpigot,getLabels_Spigot},
-			{fFiberuTCA,getLabels_FiberuTCA},
-			{fFiberVME,getLabels_FiberVME},
-			{fFiberCh,getLabels_FiberCh},
-			{fFEDuTCASlot,getLabels_FEDuTCASlot},
-			{fFEDVMESpigot,getLabels_FEDVMESpigot},
-			{fFiberuTCAFiberCh,getLabels_FiberuTCAFiberCh},
-			{fFiberVMEFiberCh,getLabels_FiberVMEFiberCh},
-			{fSLB,getLabels_SLB},
-			{fSLBCh,getLabels_SLBCh},
-			{fSLBSLBCh,getLabels_SLBSLBCh},
-			{fFiberuTCATP,getLabels_FiberuTCATP},
-			{fFiberChuTCATP,getLabels_FiberChuTCATP},
-			{fFiberuTCATPFiberChuTCATP,getLabels_FiberuTCATPFiberChuTCATP},
-		};
-		const std::map<ElectronicsQuantityType, std::string> name_eid = {
-			{fFED,"FED"},
-			{fFEDuTCA,"FEDuTCA"},
-			{fFEDVME,"FEDVME"},
-			{fCrate,"Crate"},
-			{fCrateuTCA,"CrateuTCA"},
-			{fCrateVME,"CrateVME"},
-			{fSlotuTCA,"SlotuTCA"},
-			{fSlotVME,"SlotVME"},
-			{fSpigot,"Spigot"},
-			{fFiberuTCA,"FiberuTCA"},
-			{fFiberVME,"FiberVME"},
-			{fFiberCh,"FiberCh"},
-			{fFEDuTCASlot,"FEDuTCASlot"},
-			{fFEDVMESpigot,"FEDVMESpigot"},
-			{fFiberuTCAFiberCh,"FiberuTCAFiberCh"},
-			{fFiberVMEFiberCh,"FiberVMEFiberCh"},
-			{fSLB,"SLB"},
-			{fSLBCh,"SLBCh"},
-			{fSLBSLBCh,"SLB-SLBCh"},
-			{fFiberuTCATP,"TPFiber"},
-			{fFiberChuTCATP,"TPFiberCh"},
-			{fFiberuTCATPFiberChuTCATP,"TPF-TPFCh"},
-		};
-		const std::map<ElectronicsQuantityType, double> min_eid = {
-			{fFED,-0.5},
-			{fFEDuTCA,-0.5},
-			{fFEDVME,-0.5},
-			{fCrate,-0.5},
-			{fCrateuTCA,-0.5},
-			{fCrateVME,-0.5},
-			{fSlotuTCA,0.},
-			{fSlotVME,0.},
-			{fSpigot,0.},
-			{fFiberuTCA,0.},
-			{fFiberVME,0.},
-			{fFiberCh,0.},
-			{fFEDuTCASlot,0.},
-			{fFEDVMESpigot,0.},
-			{fFiberuTCAFiberCh,0.},
-			{fFiberVMEFiberCh,0.},
-			{fSLB,0.},
-			{fSLBCh,0.},
-			{fSLBSLBCh,0.},
-			{fFiberuTCATP,0.},
-			{fFiberChuTCATP,0.},
-			{fFiberuTCATPFiberChuTCATP,0.},
-		};
-		const std::map<ElectronicsQuantityType, double> max_eid = {
-			{fFED,constants::fedList.size() - 0.5},
-			{fFEDuTCA,constants::fedListuTCA.size() - 0.5},
-			{fFEDVME,constants::fedListVME.size() - 0.5},
-			{fCrate,constants::crateList.size() - 0.5},
-			{fCrateuTCA,constants::crateListuTCA.size() - 0.5},
-			{fCrateVME,constants::crateListVME.size() - 0.5},
-			{fSlotuTCA,constants::SLOT_uTCA_NUM},
-			{fSlotVME,constants::SLOT_VME_NUM},
-			{fSpigot,constants::SPIGOT_NUM},
-			{fFiberuTCA,constants::FIBER_uTCA_NUM},
-			{fFiberVME,constants::FIBER_VME_NUM},
-			{fFiberCh,constants::FIBERCH_NUM},
-			{fFEDuTCASlot,constants::FED_uTCA_NUM*constants::SLOT_uTCA_NUM},
-			{fFEDVMESpigot,constants::FED_VME_NUM*constants::SPIGOT_NUM},
-			{fFiberuTCAFiberCh,constants::FIBER_uTCA_NUM*constants::FIBERCH_NUM},
-			{fFiberVMEFiberCh,constants::FIBER_VME_NUM*constants::FIBERCH_NUM},
-			{fSLB,constants::SLB_NUM},
-			{fSLBCh,constants::SLBCH_NUM},
-			{fSLBSLBCh,constants::SLB_NUM*constants::SLBCH_NUM},
-			{fFiberuTCATP,constants::TPFIBER_NUM},
-			{fFiberChuTCATP,constants::TPFIBERCH_NUM},
-			{fFiberuTCATPFiberChuTCATP,constants::TPFIBER_NUM*constants::TPFIBERCH_NUM},
-		};
-		const std::map<ElectronicsQuantityType, double> nbins_eid = {
-			{fFED,constants::fedList.size()},
-			{fFEDuTCA,constants::fedListuTCA.size()},
-			{fFEDVME,constants::fedListVME.size()},
-			{fCrate,constants::crateList.size()},
-			{fCrateuTCA,constants::crateListuTCA.size()},
-			{fCrateVME,constants::crateListVME.size()},
-			{fSlotuTCA,constants::SLOT_uTCA_NUM},
-			{fSlotVME,constants::SLOT_VME_NUM},
-			{fSpigot,constants::SPIGOT_NUM},
-			{fFiberuTCA,constants::FIBER_uTCA_NUM},
-			{fFiberVME,constants::FIBER_VME_NUM},
-			{fFiberCh,constants::FIBERCH_NUM},
-			{fFEDuTCASlot,constants::FED_uTCA_NUM*constants::SLOT_uTCA_NUM},
-			{fFEDVMESpigot,constants::FED_VME_NUM*constants::SPIGOT_NUM},
-			{fFiberuTCAFiberCh,constants::FIBER_uTCA_NUM*constants::FIBERCH_NUM},
-			{fFiberVMEFiberCh,constants::FIBER_VME_NUM*constants::FIBERCH_NUM},
-			{fSLB,constants::SLB_NUM},
-			{fSLBCh,constants::SLBCH_NUM},
-			{fSLBSLBCh,constants::SLB_NUM*constants::SLBCH_NUM},
-			{fFiberuTCATP,constants::TPFIBER_NUM},
-			{fFiberChuTCATP,constants::TPFIBERCH_NUM},
-			{fFiberuTCATPFiberChuTCATP,constants::TPFIBER_NUM*constants::TPFIBERCH_NUM},
-		};
+    typedef int (*getValueType_eid)(HcalElectronicsId const &);
+    typedef uint32_t (*getBinType_eid)(HcalElectronicsId const &);
+    typedef HcalElectronicsId (*getEid_eid)(int);
+    typedef std::vector<std::string> (*getLabels_eid)();
+    const std::map<ElectronicsQuantityType, getValueType_eid> getValue_functions_eid = {
+        {fFED, getValue_FED},
+        {fFEDuTCA, getValue_FEDuTCA},
+        {fFEDVME, getValue_FEDVME},
+        {fCrate, getValue_Crate},
+        {fCrateuTCA, getValue_CrateuTCA},
+        {fCrateVME, getValue_CrateVME},
+        {fSlotuTCA, getValue_SlotuTCA},
+        {fSlotVME, getValue_SlotVME},
+        {fSpigot, getValue_Spigot},
+        {fFiberuTCA, getValue_FiberuTCA},
+        {fFiberVME, getValue_FiberVME},
+        {fFiberCh, getValue_FiberCh},
+        {fFEDuTCASlot, getValue_FEDuTCASlot},
+        {fFEDVMESpigot, getValue_FEDVMESpigot},
+        {fFiberuTCAFiberCh, getValue_FiberuTCAFiberCh},
+        {fFiberVMEFiberCh, getValue_FiberVMEFiberCh},
+        {fSLB, getValue_SLB},
+        {fSLBCh, getValue_SLBCh},
+        {fSLBSLBCh, getValue_SLBSLBCh},
+        {fFiberuTCATP, getValue_FiberuTCATP},
+        {fFiberChuTCATP, getValue_FiberChuTCATP},
+        {fFiberuTCATPFiberChuTCATP, getValue_FiberuTCATPFiberChuTCATP},
+    };
+    const std::map<ElectronicsQuantityType, getBinType_eid> getBin_functions_eid = {
+        {fFED, getBin_FED},
+        {fFEDuTCA, getBin_FEDuTCA},
+        {fFEDVME, getBin_FEDVME},
+        {fCrate, getBin_Crate},
+        {fCrateuTCA, getBin_CrateuTCA},
+        {fCrateVME, getBin_CrateVME},
+        {fSlotuTCA, getBin_SlotuTCA},
+        {fSlotVME, getBin_SlotVME},
+        {fSpigot, getBin_Spigot},
+        {fFiberuTCA, getBin_FiberuTCA},
+        {fFiberVME, getBin_FiberVME},
+        {fFiberCh, getBin_FiberCh},
+        {fFEDuTCASlot, getBin_FEDuTCASlot},
+        {fFEDVMESpigot, getBin_FEDVMESpigot},
+        {fFiberuTCAFiberCh, getBin_FiberuTCAFiberCh},
+        {fFiberVMEFiberCh, getBin_FiberVMEFiberCh},
+        {fSLB, getBin_SLB},
+        {fSLBCh, getBin_SLBCh},
+        {fSLBSLBCh, getBin_SLBSLBCh},
+        {fFiberuTCATP, getBin_FiberuTCATP},
+        {fFiberChuTCATP, getBin_FiberChuTCATP},
+        {fFiberuTCATPFiberChuTCATP, getBin_FiberuTCATPFiberChuTCATP},
+    };
+    const std::map<ElectronicsQuantityType, getEid_eid> getEid_functions_eid = {
+        {fFED, getEid_FED},
+        {fFEDuTCA, getEid_FEDuTCA},
+        {fFEDVME, getEid_FEDVME},
+        {fCrate, getEid_Crate},
+        {fCrateuTCA, getEid_CrateuTCA},
+        {fCrateVME, getEid_CrateVME},
+        {fSlotuTCA, getEid_SlotuTCA},
+        {fSlotVME, getEid_SlotVME},
+        {fSpigot, getEid_Spigot},
+        {fFiberuTCA, getEid_FiberuTCA},
+        {fFiberVME, getEid_FiberVME},
+        {fFiberCh, getEid_FiberCh},
+        {fFEDuTCASlot, getEid_FEDuTCASlot},
+        {fFEDVMESpigot, getEid_FEDVMESpigot},
+        {fFiberuTCAFiberCh, getEid_FiberuTCAFiberCh},
+        {fFiberVMEFiberCh, getEid_FiberVMEFiberCh},
+        {fSLB, getEid_SLB},
+        {fSLBCh, getEid_SLBCh},
+        {fSLBSLBCh, getEid_SLBSLBCh},
+        {fFiberuTCATP, getEid_FiberuTCATP},
+        {fFiberChuTCATP, getEid_FiberChuTCATP},
+        {fFiberuTCATPFiberChuTCATP, getEid_FiberuTCATPFiberChuTCATP},
+    };
+    const std::map<ElectronicsQuantityType, getLabels_eid> getLabels_functions_eid = {
+        {fFED, getLabels_FED},
+        {fFEDuTCA, getLabels_FEDuTCA},
+        {fFEDVME, getLabels_FEDVME},
+        {fCrate, getLabels_Crate},
+        {fCrateuTCA, getLabels_CrateuTCA},
+        {fCrateVME, getLabels_CrateVME},
+        {fSlotuTCA, getLabels_SlotuTCA},
+        {fSlotVME, getLabels_SlotVME},
+        {fSpigot, getLabels_Spigot},
+        {fFiberuTCA, getLabels_FiberuTCA},
+        {fFiberVME, getLabels_FiberVME},
+        {fFiberCh, getLabels_FiberCh},
+        {fFEDuTCASlot, getLabels_FEDuTCASlot},
+        {fFEDVMESpigot, getLabels_FEDVMESpigot},
+        {fFiberuTCAFiberCh, getLabels_FiberuTCAFiberCh},
+        {fFiberVMEFiberCh, getLabels_FiberVMEFiberCh},
+        {fSLB, getLabels_SLB},
+        {fSLBCh, getLabels_SLBCh},
+        {fSLBSLBCh, getLabels_SLBSLBCh},
+        {fFiberuTCATP, getLabels_FiberuTCATP},
+        {fFiberChuTCATP, getLabels_FiberChuTCATP},
+        {fFiberuTCATPFiberChuTCATP, getLabels_FiberuTCATPFiberChuTCATP},
+    };
+    const std::map<ElectronicsQuantityType, std::string> name_eid = {
+        {fFED, "FED"},
+        {fFEDuTCA, "FEDuTCA"},
+        {fFEDVME, "FEDVME"},
+        {fCrate, "Crate"},
+        {fCrateuTCA, "CrateuTCA"},
+        {fCrateVME, "CrateVME"},
+        {fSlotuTCA, "SlotuTCA"},
+        {fSlotVME, "SlotVME"},
+        {fSpigot, "Spigot"},
+        {fFiberuTCA, "FiberuTCA"},
+        {fFiberVME, "FiberVME"},
+        {fFiberCh, "FiberCh"},
+        {fFEDuTCASlot, "FEDuTCASlot"},
+        {fFEDVMESpigot, "FEDVMESpigot"},
+        {fFiberuTCAFiberCh, "FiberuTCAFiberCh"},
+        {fFiberVMEFiberCh, "FiberVMEFiberCh"},
+        {fSLB, "SLB"},
+        {fSLBCh, "SLBCh"},
+        {fSLBSLBCh, "SLB-SLBCh"},
+        {fFiberuTCATP, "TPFiber"},
+        {fFiberChuTCATP, "TPFiberCh"},
+        {fFiberuTCATPFiberChuTCATP, "TPF-TPFCh"},
+    };
+    const std::map<ElectronicsQuantityType, double> min_eid = {
+        {fFED, -0.5},
+        {fFEDuTCA, -0.5},
+        {fFEDVME, -0.5},
+        {fCrate, -0.5},
+        {fCrateuTCA, -0.5},
+        {fCrateVME, -0.5},
+        {fSlotuTCA, 0.},
+        {fSlotVME, 0.},
+        {fSpigot, 0.},
+        {fFiberuTCA, 0.},
+        {fFiberVME, 0.},
+        {fFiberCh, 0.},
+        {fFEDuTCASlot, 0.},
+        {fFEDVMESpigot, 0.},
+        {fFiberuTCAFiberCh, 0.},
+        {fFiberVMEFiberCh, 0.},
+        {fSLB, 0.},
+        {fSLBCh, 0.},
+        {fSLBSLBCh, 0.},
+        {fFiberuTCATP, 0.},
+        {fFiberChuTCATP, 0.},
+        {fFiberuTCATPFiberChuTCATP, 0.},
+    };
+    const std::map<ElectronicsQuantityType, double> max_eid = {
+        {fFED, constants::fedList.size() - 0.5},
+        {fFEDuTCA, constants::fedListuTCA.size() - 0.5},
+        {fFEDVME, constants::fedListVME.size() - 0.5},
+        {fCrate, constants::crateList.size() - 0.5},
+        {fCrateuTCA, constants::crateListuTCA.size() - 0.5},
+        {fCrateVME, constants::crateListVME.size() - 0.5},
+        {fSlotuTCA, constants::SLOT_uTCA_NUM},
+        {fSlotVME, constants::SLOT_VME_NUM},
+        {fSpigot, constants::SPIGOT_NUM},
+        {fFiberuTCA, constants::FIBER_uTCA_NUM},
+        {fFiberVME, constants::FIBER_VME_NUM},
+        {fFiberCh, constants::FIBERCH_NUM},
+        {fFEDuTCASlot, constants::FED_uTCA_NUM *constants::SLOT_uTCA_NUM},
+        {fFEDVMESpigot, constants::FED_VME_NUM *constants::SPIGOT_NUM},
+        {fFiberuTCAFiberCh, constants::FIBER_uTCA_NUM *constants::FIBERCH_NUM},
+        {fFiberVMEFiberCh, constants::FIBER_VME_NUM *constants::FIBERCH_NUM},
+        {fSLB, constants::SLB_NUM},
+        {fSLBCh, constants::SLBCH_NUM},
+        {fSLBSLBCh, constants::SLB_NUM *constants::SLBCH_NUM},
+        {fFiberuTCATP, constants::TPFIBER_NUM},
+        {fFiberChuTCATP, constants::TPFIBERCH_NUM},
+        {fFiberuTCATPFiberChuTCATP, constants::TPFIBER_NUM *constants::TPFIBERCH_NUM},
+    };
+    const std::map<ElectronicsQuantityType, double> nbins_eid = {
+        {fFED, constants::fedList.size()},
+        {fFEDuTCA, constants::fedListuTCA.size()},
+        {fFEDVME, constants::fedListVME.size()},
+        {fCrate, constants::crateList.size()},
+        {fCrateuTCA, constants::crateListuTCA.size()},
+        {fCrateVME, constants::crateListVME.size()},
+        {fSlotuTCA, constants::SLOT_uTCA_NUM},
+        {fSlotVME, constants::SLOT_VME_NUM},
+        {fSpigot, constants::SPIGOT_NUM},
+        {fFiberuTCA, constants::FIBER_uTCA_NUM},
+        {fFiberVME, constants::FIBER_VME_NUM},
+        {fFiberCh, constants::FIBERCH_NUM},
+        {fFEDuTCASlot, constants::FED_uTCA_NUM *constants::SLOT_uTCA_NUM},
+        {fFEDVMESpigot, constants::FED_VME_NUM *constants::SPIGOT_NUM},
+        {fFiberuTCAFiberCh, constants::FIBER_uTCA_NUM *constants::FIBERCH_NUM},
+        {fFiberVMEFiberCh, constants::FIBER_VME_NUM *constants::FIBERCH_NUM},
+        {fSLB, constants::SLB_NUM},
+        {fSLBCh, constants::SLBCH_NUM},
+        {fSLBSLBCh, constants::SLB_NUM *constants::SLBCH_NUM},
+        {fFiberuTCATP, constants::TPFIBER_NUM},
+        {fFiberChuTCATP, constants::TPFIBERCH_NUM},
+        {fFiberuTCATPFiberChuTCATP, constants::TPFIBER_NUM *constants::TPFIBERCH_NUM},
+    };
 
-		class ElectronicsQuantity : public Quantity
-		{
-			public:
-				ElectronicsQuantity() {}
-				ElectronicsQuantity(ElectronicsQuantityType type, 
-					bool isLog=false) : 
-					Quantity(name_eid.at(type), isLog), _type(type)
-				{}
-				~ElectronicsQuantity() override {}
-				ElectronicsQuantity* makeCopy() override
-				{return new ElectronicsQuantity(_type, _isLog);}
+    class ElectronicsQuantity : public Quantity {
+    public:
+      ElectronicsQuantity() {}
+      ElectronicsQuantity(ElectronicsQuantityType type, bool isLog = false)
+          : Quantity(name_eid.at(type), isLog), _type(type) {}
+      ~ElectronicsQuantity() override {}
+      ElectronicsQuantity *makeCopy() override { return new ElectronicsQuantity(_type, _isLog); }
 
-				int getValue(HcalElectronicsId const& eid) override
-				{return getValue_functions_eid.at(_type)(eid);}
-				uint32_t getBin(HcalElectronicsId const& eid) override
-				{return getBin_functions_eid.at(_type)(eid);}
+      int getValue(HcalElectronicsId const &eid) override { return getValue_functions_eid.at(_type)(eid); }
+      uint32_t getBin(HcalElectronicsId const &eid) override { return getBin_functions_eid.at(_type)(eid); }
 
-				QuantityType type() override {return fElectronicsQuantity;}
-				int nbins() override {return nbins_eid.at(_type);}
-				double min() override {return min_eid.at(_type);}
-				double max() override {return max_eid.at(_type);}
-				bool isCoordinate() override {return true;}
-				std::vector<std::string> getLabels() override
-				{return getLabels_functions_eid.at(_type)();}
+      QuantityType type() override { return fElectronicsQuantity; }
+      int nbins() override { return nbins_eid.at(_type); }
+      double min() override { return min_eid.at(_type); }
+      double max() override { return max_eid.at(_type); }
+      bool isCoordinate() override { return true; }
+      std::vector<std::string> getLabels() override { return getLabels_functions_eid.at(_type)(); }
 
-			protected:
-				ElectronicsQuantityType _type;
-		};
+    protected:
+      ElectronicsQuantityType _type;
+    };
 
-		//	sorted list of FEDs you want to have on the axis
-		class FEDQuantity : public ElectronicsQuantity
-		{
-			public:
-				FEDQuantity() {}
-				FEDQuantity(std::vector<int> const& vFEDs) :
-					ElectronicsQuantity(fFED, false)
-				{this->setup(vFEDs);}
-				~FEDQuantity() override {}
+    //	sorted list of FEDs you want to have on the axis
+    class FEDQuantity : public ElectronicsQuantity {
+    public:
+      FEDQuantity() {}
+      FEDQuantity(std::vector<int> const &vFEDs) : ElectronicsQuantity(fFED, false) { this->setup(vFEDs); }
+      ~FEDQuantity() override {}
 
-				virtual void setup(std::vector<int> const& vFEDs);
-				int getValue(HcalElectronicsId const&) override;
-				uint32_t getBin(HcalElectronicsId const&) override;
+      virtual void setup(std::vector<int> const &vFEDs);
+      int getValue(HcalElectronicsId const &) override;
+      uint32_t getBin(HcalElectronicsId const &) override;
 
-				int nbins() override {return _feds.size();}
-				double min() override {return 0;}
-				double max() override {return _feds.size();}
-				std::vector<std::string> getLabels() override;
+      int nbins() override { return _feds.size(); }
+      double min() override { return 0; }
+      double max() override { return _feds.size(); }
+      std::vector<std::string> getLabels() override;
 
-			protected:
-				typedef boost::unordered_map<int, uint32_t> FEDMap;
-				FEDMap _feds;
+    protected:
+      typedef boost::unordered_map<int, uint32_t> FEDMap;
+      FEDMap _feds;
 
-			public:
-				FEDQuantity* makeCopy() override
-				{
-					std::vector<int> vfeds;
-					for(auto const& p : _feds)
-					{
-						vfeds.push_back(p.first);
-					}
+    public:
+      FEDQuantity *makeCopy() override {
+        std::vector<int> vfeds;
+        for (auto const &p : _feds) {
+          vfeds.push_back(p.first);
+        }
 
-					//	MUST SORT BEFORE EXITING!
-					std::sort(vfeds.begin(), vfeds.end());
-					return new FEDQuantity(vfeds);
-				}
-		};
+        //	MUST SORT BEFORE EXITING!
+        std::sort(vfeds.begin(), vfeds.end());
+        return new FEDQuantity(vfeds);
+      }
+    };
 
-		// Crate quantity, initialized from emap (because it is not easy to turn a VME crate in an EID)
-		class CrateQuantity : public ElectronicsQuantity {
-			typedef std::map<int, uint32_t> CrateHashMap;
-		public:
-			CrateQuantity() {}
-			CrateQuantity(HcalElectronicsMap const * emap) : ElectronicsQuantity(fCrate, false) {
-				this->setup(emap);
-			}
-			CrateQuantity(std::vector<int> crates, CrateHashMap crateHashes) : ElectronicsQuantity(fCrate, false) {
-				this->setup(crates, crateHashes);
-			}
-			~CrateQuantity() override {}
+    // Crate quantity, initialized from emap (because it is not easy to turn a VME
+    // crate in an EID)
+    class CrateQuantity : public ElectronicsQuantity {
+      typedef std::map<int, uint32_t> CrateHashMap;
 
-			virtual void setup(HcalElectronicsMap const * emap);
-			virtual void setup(std::vector<int> crates, CrateHashMap crateHashes);
-			int getValue(HcalElectronicsId const&) override;
-			uint32_t getBin(HcalElectronicsId const&) override;
+    public:
+      CrateQuantity() {}
+      CrateQuantity(HcalElectronicsMap const *emap) : ElectronicsQuantity(fCrate, false) { this->setup(emap); }
+      CrateQuantity(std::vector<int> crates, CrateHashMap crateHashes) : ElectronicsQuantity(fCrate, false) {
+        this->setup(crates, crateHashes);
+      }
+      ~CrateQuantity() override {}
 
-			int nbins() override {
-				return _crates.size();
-			}
-			double min() override {return 0;}
-			double max() override {return _crates.size();}
-			std::vector<std::string> getLabels() override;
+      virtual void setup(HcalElectronicsMap const *emap);
+      virtual void setup(std::vector<int> crates, CrateHashMap crateHashes);
+      int getValue(HcalElectronicsId const &) override;
+      uint32_t getBin(HcalElectronicsId const &) override;
 
-		protected:
-			std::vector<int> _crates;
-			CrateHashMap _crateHashes;
+      int nbins() override { return _crates.size(); }
+      double min() override { return 0; }
+      double max() override { return _crates.size(); }
+      std::vector<std::string> getLabels() override;
 
-			public:
-				CrateQuantity* makeCopy() override
-				{
-					// Make copies of the crate info
-					std::vector<int> tmpCrates;
-					std::map<int, uint32_t> tmpCrateHashes;
-					for (auto& it_crate : _crates) {
-						tmpCrates.push_back(it_crate);
-						tmpCrateHashes[it_crate] = _crateHashes[it_crate];
-					}
-					return new CrateQuantity(tmpCrates, tmpCrateHashes);
-				}
+    protected:
+      std::vector<int> _crates;
+      CrateHashMap _crateHashes;
 
-		};
-	}
-}
+    public:
+      CrateQuantity *makeCopy() override {
+        // Make copies of the crate info
+        std::vector<int> tmpCrates;
+        std::map<int, uint32_t> tmpCrateHashes;
+        for (auto &it_crate : _crates) {
+          tmpCrates.push_back(it_crate);
+          tmpCrateHashes[it_crate] = _crateHashes[it_crate];
+        }
+        return new CrateQuantity(tmpCrates, tmpCrateHashes);
+      }
+    };
+  }  // namespace quantity
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/Flag.h b/DQM/HcalCommon/interface/Flag.h
index 889339d1a655f..d0f322f23c177 100644
--- a/DQM/HcalCommon/interface/Flag.h
+++ b/DQM/HcalCommon/interface/Flag.h
@@ -3,82 +3,65 @@
 
 #include "DQM/HcalCommon/interface/HcalCommonHeaders.h"
 
-namespace hcaldqm
-{
-	namespace flag
-	{
-		//	
-		//	State Definition. In the increasing order of worsiness.
-		//	States(as flags) can be added
-		//	s1 + s2 = max(s1,s2) - that allows to set the worse of the 2
-		//
-		enum State
-		{
-			fNONE=0,			// No State - can't have... not used....
-			fNCDAQ=1,			// not @cDAQ
-			fNA = 2,			// Not Applicable
-			fGOOD = 3,			// GOOD
-			fPROBLEMATIC = 4,	// problem
-			fBAD = 5,			//	bad
-			fRESERVED = 6,		// reserved
-			nState = 7
-		};
+namespace hcaldqm {
+  namespace flag {
+    //
+    //	State Definition. In the increasing order of worsiness.
+    //	States(as flags) can be added
+    //	s1 + s2 = max(s1,s2) - that allows to set the worse of the 2
+    //
+    enum State {
+      fNONE = 0,         // No State - can't have... not used....
+      fNCDAQ = 1,        // not @cDAQ
+      fNA = 2,           // Not Applicable
+      fGOOD = 3,         // GOOD
+      fPROBLEMATIC = 4,  // problem
+      fBAD = 5,          //	bad
+      fRESERVED = 6,     // reserved
+      nState = 7
+    };
 
-		struct Flag
-		{
-			Flag() :
-				_name("SOMEFLAG"), _state(fNA)
-			{}
-			Flag(std::string const& name, State s=fNA):
-				_name(name), _state(s)
-			{}
-			Flag(Flag const& f):
-				_name(f._name), _state(f._state)
-			{}
+    struct Flag {
+      Flag() : _name("SOMEFLAG"), _state(fNA) {}
+      Flag(std::string const &name, State s = fNA) : _name(name), _state(s) {}
+      Flag(Flag const &f) : _name(f._name), _state(f._state) {}
 
-			//
-			//	add 2 flags
-			//
-			Flag operator+(Flag const& f)
-			{
-				return Flag(_name!=f._name?"SOMEFLAG":_name,
-					(State)(std::max(_state, f._state)));
-			}
+      //
+      //	add 2 flags
+      //
+      Flag operator+(Flag const &f) {
+        return Flag(_name != f._name ? "SOMEFLAG" : _name, (State)(std::max(_state, f._state)));
+      }
 
-			//	
-			//	add 2 flags and save
-			//
-			Flag& operator+=(Flag const& f)
-			{
-				_state = (State)(std::max(_state, f._state));
-				return *this;
-			}
+      //
+      //	add 2 flags and save
+      //
+      Flag &operator+=(Flag const &f) {
+        _state = (State)(std::max(_state, f._state));
+        return *this;
+      }
 
-			//	
-			//	compare 2 flags
-			//	
-			bool operator==(Flag const& f)
-			{
-				return (_state==f._state && _name==f._name);
-			}
+      //
+      //	compare 2 flags
+      //
+      bool operator==(Flag const &f) { return (_state == f._state && _name == f._name); }
 
-			//	
-			//	Assignment
-			//
-			Flag& operator=(Flag const& f)
-			{
-				_name = f._name;
-				_state = f._state;
-				return *this;
-			}
+      //
+      //	Assignment
+      //
+      Flag &operator=(Flag const &f) {
+        _name = f._name;
+        _state = f._state;
+        return *this;
+      }
 
-			//	reset the state to NA
-			void reset() {_state = fNA;}
+      //	reset the state to NA
+      void reset() { _state = fNA; }
 
-			std::string _name;
-			State _state;
-		};
-	}
-}
+      std::string _name;
+      State _state;
+    };
+  }  // namespace flag
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/HashFilter.h b/DQM/HcalCommon/interface/HashFilter.h
index 352f44435e536..99e80d32e325d 100644
--- a/DQM/HcalCommon/interface/HashFilter.h
+++ b/DQM/HcalCommon/interface/HashFilter.h
@@ -11,55 +11,44 @@
 
 #include "DQM/HcalCommon/interface/HashMapper.h"
 
-#include <vector>
 #include <boost/unordered_set.hpp>
+#include <vector>
 
-namespace hcaldqm
-{
-	namespace filter
-	{
-		enum FilterType
-		{
-			fFilter = 0,
-			fPreserver = 1,
-			nFilterType = 2
-		};
-
-		class HashFilter : public mapper::HashMapper
-		{
-			public:
-				HashFilter() : _ftype(fFilter)
-				{}
-				//	empty hash
-				HashFilter(FilterType ftype, hashfunctions::HashType htype);
-				//	initialize with a vector of hashes
-				HashFilter(FilterType, hashfunctions::HashType, 
-					std::vector<uint32_t> const&);
-				//	copy constructor
-				HashFilter(HashFilter const& hf);
-				~HashFilter() override {}
-				virtual void initialize(FilterType ftype, hashfunctions::HashType htype,
-					std::vector<uint32_t> const&);
-				using mapper::HashMapper::initialize;
-
-				//	true if should filter out and false if not
-				//	true => should skip this hash
-				//	false => should keep this hash
-				virtual bool filter(HcalDetId const&) const;
-				virtual bool filter(HcalElectronicsId const&) const;
-				virtual bool filter(HcalTrigTowerDetId const&) const;
-
-				virtual void print();
-
-			protected:	
-				FilterType						_ftype;
-				typedef boost::unordered_set<uint32_t> FilterMap;
-				FilterMap						_ids;
-
-				virtual bool preserve(uint32_t) const;
-				virtual bool skip(uint32_t) const;
-		};
-	}
-}
+namespace hcaldqm {
+  namespace filter {
+    enum FilterType { fFilter = 0, fPreserver = 1, nFilterType = 2 };
+
+    class HashFilter : public mapper::HashMapper {
+    public:
+      HashFilter() : _ftype(fFilter) {}
+      //	empty hash
+      HashFilter(FilterType ftype, hashfunctions::HashType htype);
+      //	initialize with a vector of hashes
+      HashFilter(FilterType, hashfunctions::HashType, std::vector<uint32_t> const &);
+      //	copy constructor
+      HashFilter(HashFilter const &hf);
+      ~HashFilter() override {}
+      virtual void initialize(FilterType ftype, hashfunctions::HashType htype, std::vector<uint32_t> const &);
+      using mapper::HashMapper::initialize;
+
+      //	true if should filter out and false if not
+      //	true => should skip this hash
+      //	false => should keep this hash
+      virtual bool filter(HcalDetId const &) const;
+      virtual bool filter(HcalElectronicsId const &) const;
+      virtual bool filter(HcalTrigTowerDetId const &) const;
+
+      virtual void print();
+
+    protected:
+      FilterType _ftype;
+      typedef boost::unordered_set<uint32_t> FilterMap;
+      FilterMap _ids;
+
+      virtual bool preserve(uint32_t) const;
+      virtual bool skip(uint32_t) const;
+    };
+  }  // namespace filter
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/HashFunctions.h b/DQM/HcalCommon/interface/HashFunctions.h
index bffd43c70decc..72fb3f9c21c5f 100644
--- a/DQM/HcalCommon/interface/HashFunctions.h
+++ b/DQM/HcalCommon/interface/HashFunctions.h
@@ -9,208 +9,217 @@
  *		Hash accoring to various Detector Elements
  */
 
-#include "DQM/HcalCommon/interface/HcalCommonHeaders.h"
 #include "DQM/HcalCommon/interface/Constants.h"
+#include "DQM/HcalCommon/interface/HcalCommonHeaders.h"
 
-namespace hcaldqm
-{
-	namespace hashfunctions
-	{
-		/**
-		 *	by HcalDetId
-		 */
-		uint32_t hash_Subdet(HcalDetId const&);
-		uint32_t hash_Subdetiphi(HcalDetId const&);
-		uint32_t hash_Subdetieta(HcalDetId const&);
-		uint32_t hash_Subdetdepth(HcalDetId const&);
-		uint32_t hash_SubdetPM(HcalDetId const&);
-		uint32_t hash_SubdetPMiphi(HcalDetId const&);
-		uint32_t hash_iphi(HcalDetId const&);
-		uint32_t hash_ieta(HcalDetId const&);
-		uint32_t hash_depth(HcalDetId const&);
-		uint32_t hash_HFPMiphi(HcalDetId const&);
-		uint32_t hash_HBHEPartition(HcalDetId const&);
-		uint32_t hash_DChannel(HcalDetId const&);
+namespace hcaldqm {
+  namespace hashfunctions {
+    /**
+ *	by HcalDetId
+ */
+    uint32_t hash_Subdet(HcalDetId const &);
+    uint32_t hash_Subdetiphi(HcalDetId const &);
+    uint32_t hash_Subdetieta(HcalDetId const &);
+    uint32_t hash_Subdetdepth(HcalDetId const &);
+    uint32_t hash_SubdetPM(HcalDetId const &);
+    uint32_t hash_SubdetPMiphi(HcalDetId const &);
+    uint32_t hash_iphi(HcalDetId const &);
+    uint32_t hash_ieta(HcalDetId const &);
+    uint32_t hash_depth(HcalDetId const &);
+    uint32_t hash_HFPMiphi(HcalDetId const &);
+    uint32_t hash_HBHEPartition(HcalDetId const &);
+    uint32_t hash_DChannel(HcalDetId const &);
 
-		/**
-		 *	by ElectronicsId
-		 */
-		uint32_t hash_FED(HcalElectronicsId const&);
-		uint32_t hash_FEDSpigot(HcalElectronicsId const&);
-		uint32_t hash_FEDSlot(HcalElectronicsId const&);
-		uint32_t hash_Crate(HcalElectronicsId const&);
-		uint32_t hash_CrateSpigot(HcalElectronicsId const&);
-		uint32_t hash_CrateSlot(HcalElectronicsId const&);
-		uint32_t hash_Fiber(HcalElectronicsId const&);
-		uint32_t hash_FiberFiberCh(HcalElectronicsId const&);
-		uint32_t hash_FiberCh(HcalElectronicsId const&);
-		uint32_t hash_Electronics(HcalElectronicsId const&);
-		uint32_t hash_EChannel(HcalElectronicsId const&);
+    /**
+ *	by ElectronicsId
+ */
+    uint32_t hash_FED(HcalElectronicsId const &);
+    uint32_t hash_FEDSpigot(HcalElectronicsId const &);
+    uint32_t hash_FEDSlot(HcalElectronicsId const &);
+    uint32_t hash_Crate(HcalElectronicsId const &);
+    uint32_t hash_CrateSpigot(HcalElectronicsId const &);
+    uint32_t hash_CrateSlot(HcalElectronicsId const &);
+    uint32_t hash_Fiber(HcalElectronicsId const &);
+    uint32_t hash_FiberFiberCh(HcalElectronicsId const &);
+    uint32_t hash_FiberCh(HcalElectronicsId const &);
+    uint32_t hash_Electronics(HcalElectronicsId const &);
+    uint32_t hash_EChannel(HcalElectronicsId const &);
 
-		/**
-		 *	by TrigTowerDetId
-		 */
-		uint32_t hash_TTSubdet(HcalTrigTowerDetId const&);
-		uint32_t hash_TTSubdetPM(HcalTrigTowerDetId const&);
-		uint32_t hash_TTSubdetPMiphi(HcalTrigTowerDetId const&);
-		uint32_t hash_TTSubdetieta(HcalTrigTowerDetId const&);
-		uint32_t hash_TTdepth(HcalTrigTowerDetId const&);
-		uint32_t hash_TChannel(HcalTrigTowerDetId const&);
+    /**
+ *	by TrigTowerDetId
+ */
+    uint32_t hash_TTSubdet(HcalTrigTowerDetId const &);
+    uint32_t hash_TTSubdetPM(HcalTrigTowerDetId const &);
+    uint32_t hash_TTSubdetPMiphi(HcalTrigTowerDetId const &);
+    uint32_t hash_TTSubdetieta(HcalTrigTowerDetId const &);
+    uint32_t hash_TTdepth(HcalTrigTowerDetId const &);
+    uint32_t hash_TChannel(HcalTrigTowerDetId const &);
 
-		std::string name_Subdet(HcalDetId const&);
-		std::string name_Subdetiphi(HcalDetId const&);
-		std::string name_Subdetieta(HcalDetId const&);
-		std::string name_Subdetdepth(HcalDetId const&);
-		std::string name_SubdetPM(HcalDetId const&);
-		std::string name_SubdetPMiphi(HcalDetId const&);
-		std::string name_iphi(HcalDetId const&);
-		std::string name_ieta(HcalDetId const&);
-		std::string name_depth(HcalDetId const&);
-		std::string name_HFPMiphi(HcalDetId const&);
-		std::string name_HBHEPartition(HcalDetId const&);
-		std::string name_DChannel(HcalDetId const&);
+    std::string name_Subdet(HcalDetId const &);
+    std::string name_Subdetiphi(HcalDetId const &);
+    std::string name_Subdetieta(HcalDetId const &);
+    std::string name_Subdetdepth(HcalDetId const &);
+    std::string name_SubdetPM(HcalDetId const &);
+    std::string name_SubdetPMiphi(HcalDetId const &);
+    std::string name_iphi(HcalDetId const &);
+    std::string name_ieta(HcalDetId const &);
+    std::string name_depth(HcalDetId const &);
+    std::string name_HFPMiphi(HcalDetId const &);
+    std::string name_HBHEPartition(HcalDetId const &);
+    std::string name_DChannel(HcalDetId const &);
 
-		uint32_t hash_Subdet(std::string const&);
-		uint32_t hash_Subdetiphi(std::string const&);
-		uint32_t hash_Subdetieta(std::string const&);
-		uint32_t hash_Subdetdepth(std::string const&);
-		uint32_t hash_SubdetPM(std::string const&);
-		uint32_t hash_SubdetPMiphi(std::string const&);
-		uint32_t hash_iphi(std::string const&);
-		uint32_t hash_ieta(std::string const&);
-		uint32_t hash_depth(std::string const&);
-		uint32_t hash_HFPMiphi(std::string const&);
-		uint32_t hash_HBHEPartition(std::string const&);
-		uint32_t hash_DChannel(std::string const&);
+    uint32_t hash_Subdet(std::string const &);
+    uint32_t hash_Subdetiphi(std::string const &);
+    uint32_t hash_Subdetieta(std::string const &);
+    uint32_t hash_Subdetdepth(std::string const &);
+    uint32_t hash_SubdetPM(std::string const &);
+    uint32_t hash_SubdetPMiphi(std::string const &);
+    uint32_t hash_iphi(std::string const &);
+    uint32_t hash_ieta(std::string const &);
+    uint32_t hash_depth(std::string const &);
+    uint32_t hash_HFPMiphi(std::string const &);
+    uint32_t hash_HBHEPartition(std::string const &);
+    uint32_t hash_DChannel(std::string const &);
 
-		std::string name_FED(HcalElectronicsId const&);
-		std::string name_FEDSpigot(HcalElectronicsId const&);
-		std::string name_FEDSlot(HcalElectronicsId const&);
-		std::string name_Crate(HcalElectronicsId const&);
-		std::string name_CrateSpigot(HcalElectronicsId const&);
-		std::string name_CrateSlot(HcalElectronicsId const&);
-		std::string name_Fiber(HcalElectronicsId const&);
-		std::string name_FiberFiberCh(HcalElectronicsId const&);
-		std::string name_FiberCh(HcalElectronicsId const&);
-		std::string name_Electronics(HcalElectronicsId const&);
-		std::string name_EChannel(HcalElectronicsId const&);
+    std::string name_FED(HcalElectronicsId const &);
+    std::string name_FEDSpigot(HcalElectronicsId const &);
+    std::string name_FEDSlot(HcalElectronicsId const &);
+    std::string name_Crate(HcalElectronicsId const &);
+    std::string name_CrateSpigot(HcalElectronicsId const &);
+    std::string name_CrateSlot(HcalElectronicsId const &);
+    std::string name_Fiber(HcalElectronicsId const &);
+    std::string name_FiberFiberCh(HcalElectronicsId const &);
+    std::string name_FiberCh(HcalElectronicsId const &);
+    std::string name_Electronics(HcalElectronicsId const &);
+    std::string name_EChannel(HcalElectronicsId const &);
 
-		uint32_t hash_FED(std::string const&);
-		uint32_t hash_FEDSpigot(std::string const&);
-		uint32_t hash_FEDSlot(std::string const&);
-		uint32_t hash_Crate(std::string const&);
-		uint32_t hash_CrateSpigot(std::string const&);
-		uint32_t hash_CrateSlot(std::string  const&);
-		uint32_t hash_Fiber(std::string const&);
-		uint32_t hash_FiberFiberCh(std::string const&);
-		uint32_t hash_FiberCh(std::string const&);
-		uint32_t hash_Electronics(std::string const&);
-		uint32_t hash_EChannel(std::string const&);
+    uint32_t hash_FED(std::string const &);
+    uint32_t hash_FEDSpigot(std::string const &);
+    uint32_t hash_FEDSlot(std::string const &);
+    uint32_t hash_Crate(std::string const &);
+    uint32_t hash_CrateSpigot(std::string const &);
+    uint32_t hash_CrateSlot(std::string const &);
+    uint32_t hash_Fiber(std::string const &);
+    uint32_t hash_FiberFiberCh(std::string const &);
+    uint32_t hash_FiberCh(std::string const &);
+    uint32_t hash_Electronics(std::string const &);
+    uint32_t hash_EChannel(std::string const &);
 
-		std::string name_TTSubdet(HcalTrigTowerDetId const&);
-		std::string name_TTSubdetPM(HcalTrigTowerDetId const&);
-		std::string name_TTSubdetPMiphi(HcalTrigTowerDetId const&);
-		std::string name_TTSubdetieta(HcalTrigTowerDetId const&);
-		std::string name_TTdepth(HcalTrigTowerDetId const&);
-		std::string name_TChannel(HcalTrigTowerDetId const&);
+    std::string name_TTSubdet(HcalTrigTowerDetId const &);
+    std::string name_TTSubdetPM(HcalTrigTowerDetId const &);
+    std::string name_TTSubdetPMiphi(HcalTrigTowerDetId const &);
+    std::string name_TTSubdetieta(HcalTrigTowerDetId const &);
+    std::string name_TTdepth(HcalTrigTowerDetId const &);
+    std::string name_TChannel(HcalTrigTowerDetId const &);
 
-		uint32_t hash_TTSubdet(std::string const&);
-		uint32_t hash_TTSubdetPM(std::string const&);
-		uint32_t hash_TTSubdetPMiphi(std::string const&);
-		uint32_t hash_TTSubdetieta(std::string const&);
-		uint32_t hash_TTdepth(std::string const&);
-		uint32_t hash_TChannel(std::string const&);
+    uint32_t hash_TTSubdet(std::string const &);
+    uint32_t hash_TTSubdetPM(std::string const &);
+    uint32_t hash_TTSubdetPMiphi(std::string const &);
+    uint32_t hash_TTSubdetieta(std::string const &);
+    uint32_t hash_TTdepth(std::string const &);
+    uint32_t hash_TChannel(std::string const &);
 
-		enum HashType
-		{
-			fSubdet = 0,
-			fSubdetiphi = 1,
-			fSubdetieta = 2,
-			fSubdetdepth = 3,
-			fSubdetPM = 4,
-			fSubdetPMiphi = 5,
-			fiphi = 6,
-			fieta = 7,
-			fdepth = 8,
-			fHFPMiphi = 9,
-			fHBHEPartition = 10,
-			fDChannel = 11,
-			nHashType_did = 12,
-			fFED = 13,
-			fFEDSpigot = 14,
-			fFEDSlot = 15,
-			fCrate = 16,
-			fCrateSpigot = 17,
-			fCrateSlot = 18,
-			fFiber = 19,
-			fFiberFiberCh = 20,
-			fFiberCh = 21,
-			fElectronics = 22,
-			fEChannel = 23, 
-			nHashType_eid = 24,
-			fTTSubdet = 25,
-			fTTSubdetPM = 26,
-			fTTSubdetPMiphi = 27,
-			fTTSubdetieta = 28,
-			fTTdepth = 29,
-			fTChannel = 30,
-			nHashType_tid = 31,
-			nHashType = 32
-		};
-		typedef uint32_t (*hash_function_did)(HcalDetId const&);
-		typedef uint32_t (*hash_function_eid)(HcalElectronicsId const&);
-		typedef uint32_t (*hash_function_tid)(HcalTrigTowerDetId const&);
-		typedef std::string (*name_function_did)(HcalDetId const&);
-		typedef std::string (*name_function_eid)(HcalElectronicsId const&);
-		typedef std::string (*name_function_tid)(HcalTrigTowerDetId const&);
-		hash_function_did const hash_did[nHashType_did] = {
-			hash_Subdet, hash_Subdetiphi, hash_Subdetieta, 
-			hash_Subdetdepth, hash_SubdetPM, hash_SubdetPMiphi,
-			hash_iphi, hash_ieta, hash_depth, hash_HFPMiphi, 
-			hash_HBHEPartition, hash_DChannel
-		};
-		hash_function_eid const hash_eid[nHashType_eid-nHashType_did-1] = {
-			hash_FED, hash_FEDSpigot, hash_FEDSlot, 
-			hash_Crate, hash_CrateSpigot, hash_CrateSlot,
-			hash_Fiber, hash_FiberFiberCh, hash_FiberCh,
-			hash_Electronics, hash_EChannel
-		};
-		hash_function_tid const hash_tid[nHashType_tid-nHashType_eid-1] = {
-			hash_TTSubdet, hash_TTSubdetPM, hash_TTSubdetPMiphi, 
-			hash_TTSubdetieta, hash_TTdepth, hash_TChannel
-		};
-		name_function_did const name_did[nHashType_did] = {
-			name_Subdet, name_Subdetiphi, name_Subdetieta, 
-			name_Subdetdepth, name_SubdetPM, name_SubdetPMiphi,
-			name_iphi, name_ieta, name_depth, name_HFPMiphi, 
-			name_HBHEPartition, name_DChannel
-		};
-		name_function_eid const name_eid[nHashType_eid-nHashType_did-1] = {
-			name_FED, name_FEDSpigot, name_FEDSlot,
-			name_Crate, name_CrateSpigot, name_CrateSlot,
-			name_Fiber, name_FiberFiberCh, name_FiberCh,
-			name_Electronics, name_EChannel
-		};
-		name_function_tid const name_tid[nHashType_tid-nHashType_eid-1] = {
-			name_TTSubdet, name_TTSubdetPM, name_TTSubdetPMiphi,
-			name_TTSubdetieta, name_TTdepth, name_TChannel
-		};
-		int const nhashes = nHashType_did + (nHashType_eid-nHashType_did-1) + 
-			(nHashType_tid-nHashType_eid-1);
-		std::string const hash_names[nhashes] = {
-			"Subdet", "Subdetiphi", "Subdetieta", "Subdetdepth",
-			"SubdetPM", "SubdetPMiphi", "iphi", "ieta", "depth",
-			"HFPMiphi", "HBHEPartition", "DChannel",
+    enum HashType {
+      fSubdet = 0,
+      fSubdetiphi = 1,
+      fSubdetieta = 2,
+      fSubdetdepth = 3,
+      fSubdetPM = 4,
+      fSubdetPMiphi = 5,
+      fiphi = 6,
+      fieta = 7,
+      fdepth = 8,
+      fHFPMiphi = 9,
+      fHBHEPartition = 10,
+      fDChannel = 11,
+      nHashType_did = 12,
+      fFED = 13,
+      fFEDSpigot = 14,
+      fFEDSlot = 15,
+      fCrate = 16,
+      fCrateSpigot = 17,
+      fCrateSlot = 18,
+      fFiber = 19,
+      fFiberFiberCh = 20,
+      fFiberCh = 21,
+      fElectronics = 22,
+      fEChannel = 23,
+      nHashType_eid = 24,
+      fTTSubdet = 25,
+      fTTSubdetPM = 26,
+      fTTSubdetPMiphi = 27,
+      fTTSubdetieta = 28,
+      fTTdepth = 29,
+      fTChannel = 30,
+      nHashType_tid = 31,
+      nHashType = 32
+    };
+    typedef uint32_t (*hash_function_did)(HcalDetId const &);
+    typedef uint32_t (*hash_function_eid)(HcalElectronicsId const &);
+    typedef uint32_t (*hash_function_tid)(HcalTrigTowerDetId const &);
+    typedef std::string (*name_function_did)(HcalDetId const &);
+    typedef std::string (*name_function_eid)(HcalElectronicsId const &);
+    typedef std::string (*name_function_tid)(HcalTrigTowerDetId const &);
+    hash_function_did const hash_did[nHashType_did] = {hash_Subdet,
+                                                       hash_Subdetiphi,
+                                                       hash_Subdetieta,
+                                                       hash_Subdetdepth,
+                                                       hash_SubdetPM,
+                                                       hash_SubdetPMiphi,
+                                                       hash_iphi,
+                                                       hash_ieta,
+                                                       hash_depth,
+                                                       hash_HFPMiphi,
+                                                       hash_HBHEPartition,
+                                                       hash_DChannel};
+    hash_function_eid const hash_eid[nHashType_eid - nHashType_did - 1] = {hash_FED,
+                                                                           hash_FEDSpigot,
+                                                                           hash_FEDSlot,
+                                                                           hash_Crate,
+                                                                           hash_CrateSpigot,
+                                                                           hash_CrateSlot,
+                                                                           hash_Fiber,
+                                                                           hash_FiberFiberCh,
+                                                                           hash_FiberCh,
+                                                                           hash_Electronics,
+                                                                           hash_EChannel};
+    hash_function_tid const hash_tid[nHashType_tid - nHashType_eid - 1] = {
+        hash_TTSubdet, hash_TTSubdetPM, hash_TTSubdetPMiphi, hash_TTSubdetieta, hash_TTdepth, hash_TChannel};
+    name_function_did const name_did[nHashType_did] = {name_Subdet,
+                                                       name_Subdetiphi,
+                                                       name_Subdetieta,
+                                                       name_Subdetdepth,
+                                                       name_SubdetPM,
+                                                       name_SubdetPMiphi,
+                                                       name_iphi,
+                                                       name_ieta,
+                                                       name_depth,
+                                                       name_HFPMiphi,
+                                                       name_HBHEPartition,
+                                                       name_DChannel};
+    name_function_eid const name_eid[nHashType_eid - nHashType_did - 1] = {name_FED,
+                                                                           name_FEDSpigot,
+                                                                           name_FEDSlot,
+                                                                           name_Crate,
+                                                                           name_CrateSpigot,
+                                                                           name_CrateSlot,
+                                                                           name_Fiber,
+                                                                           name_FiberFiberCh,
+                                                                           name_FiberCh,
+                                                                           name_Electronics,
+                                                                           name_EChannel};
+    name_function_tid const name_tid[nHashType_tid - nHashType_eid - 1] = {
+        name_TTSubdet, name_TTSubdetPM, name_TTSubdetPMiphi, name_TTSubdetieta, name_TTdepth, name_TChannel};
+    int const nhashes = nHashType_did + (nHashType_eid - nHashType_did - 1) + (nHashType_tid - nHashType_eid - 1);
+    std::string const hash_names[nhashes] = {
+        "Subdet",   "Subdetiphi",   "Subdetieta",     "Subdetdepth",  "SubdetPM",      "SubdetPMiphi",
+        "iphi",     "ieta",         "depth",          "HFPMiphi",     "HBHEPartition", "DChannel",
 
-			"FED", "FEDSpigot", "FEDSlot",
-			"Crate", "CrateSpigot", "CrateSlot",
-			"Fiber", "FiberFiberCh", "FiberCh",
-			"Electronics", "EChannel",
+        "FED",      "FEDSpigot",    "FEDSlot",        "Crate",        "CrateSpigot",   "CrateSlot",
+        "Fiber",    "FiberFiberCh", "FiberCh",        "Electronics",  "EChannel",
 
-			"TTSubdet", "TTSubdetPM", "TTSubdetPMiphi",
-			"TTSubdetieta", "TTdepth", "TChannel"
-		};
-	}
-}
+        "TTSubdet", "TTSubdetPM",   "TTSubdetPMiphi", "TTSubdetieta", "TTdepth",       "TChannel"};
+  }  // namespace hashfunctions
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/HashMapper.h b/DQM/HcalCommon/interface/HashMapper.h
index 16b0de47b92fa..ac5282682af17 100644
--- a/DQM/HcalCommon/interface/HashMapper.h
+++ b/DQM/HcalCommon/interface/HashMapper.h
@@ -9,80 +9,70 @@
  *
  */
 
-#include "DQM/HcalCommon/interface/Mapper.h"
 #include "DQM/HcalCommon/interface/HashFunctions.h"
+#include "DQM/HcalCommon/interface/Mapper.h"
 
-namespace hcaldqm
-{
-	namespace mapper
-	{
-		class HashMapper : public Mapper
-		{
-			public:
-				//	constructors/destructors
-				HashMapper() {}
-				HashMapper(hashfunctions::HashType htype) : Mapper(), _htype(htype) 
-				{}
-				~HashMapper() override {}
+namespace hcaldqm {
+  namespace mapper {
+    class HashMapper : public Mapper {
+    public:
+      //	constructors/destructors
+      HashMapper() {}
+      HashMapper(hashfunctions::HashType htype) : Mapper(), _htype(htype) {}
+      ~HashMapper() override {}
 
-				//	initialize
-				virtual void initialize(hashfunctions::HashType htype) {_htype = htype;}
+      //	initialize
+      virtual void initialize(hashfunctions::HashType htype) { _htype = htype; }
 
-				//	get hash
-				using Mapper::getHash;
-				uint32_t getHash(HcalDetId const& did) const override
-				{return hashfunctions::hash_did[_htype](did);}
-				uint32_t getHash(HcalElectronicsId const& eid) const override
-				{return hashfunctions::hash_eid[_htype-hashfunctions::nHashType_did-1](eid);}
-				uint32_t getHash(HcalTrigTowerDetId const& tid) const override
-				{return hashfunctions::hash_tid[_htype-hashfunctions::nHashType_eid-1](tid);}
+      //	get hash
+      using Mapper::getHash;
+      uint32_t getHash(HcalDetId const &did) const override { return hashfunctions::hash_did[_htype](did); }
+      uint32_t getHash(HcalElectronicsId const &eid) const override {
+        return hashfunctions::hash_eid[_htype - hashfunctions::nHashType_did - 1](eid);
+      }
+      uint32_t getHash(HcalTrigTowerDetId const &tid) const override {
+        return hashfunctions::hash_tid[_htype - hashfunctions::nHashType_eid - 1](tid);
+      }
 
-				//	get name of the hashed element
-				using Mapper::getName;
-				std::string getName(HcalDetId const &did) const override
-				{return hashfunctions::name_did[_htype](did);}
-				std::string getName(HcalElectronicsId const& eid) const override
-				{return hashfunctions::name_eid[_htype-hashfunctions::nHashType_did-1](eid);}
-				std::string getName(HcalTrigTowerDetId const& tid) const override
-				{return hashfunctions::name_tid[_htype-hashfunctions::nHashType_eid-1](tid);}
+      //	get name of the hashed element
+      using Mapper::getName;
+      std::string getName(HcalDetId const &did) const override { return hashfunctions::name_did[_htype](did); }
+      std::string getName(HcalElectronicsId const &eid) const override {
+        return hashfunctions::name_eid[_htype - hashfunctions::nHashType_did - 1](eid);
+      }
+      std::string getName(HcalTrigTowerDetId const &tid) const override {
+        return hashfunctions::name_tid[_htype - hashfunctions::nHashType_eid - 1](tid);
+      }
 
-				//	get the Hash Type Name
-				virtual std::string getHashTypeName() const
-				{return hashfunctions::hash_names[this->getLinearHashType(_htype)];}
-				virtual hashfunctions::HashType getHashType() const
-				{return _htype;}
+      //	get the Hash Type Name
+      virtual std::string getHashTypeName() const { return hashfunctions::hash_names[this->getLinearHashType(_htype)]; }
+      virtual hashfunctions::HashType getHashType() const { return _htype; }
 
-				//	determine the type of the hash
-				virtual bool isDHash()  const
-				{return _htype<hashfunctions::nHashType_did ? true : false;}
-				virtual bool isEHash() const
-				{
-					return (_htype>hashfunctions::nHashType_did && _htype<hashfunctions::nHashType_eid) ? 
-						true : false;
-				}
-				virtual bool isTHash() const
-				{
-					return (_htype>hashfunctions::nHashType_eid && _htype<hashfunctions::nHashType_tid) ? 
-						true : false;
-				}
+      //	determine the type of the hash
+      virtual bool isDHash() const { return _htype < hashfunctions::nHashType_did ? true : false; }
+      virtual bool isEHash() const {
+        return (_htype > hashfunctions::nHashType_did && _htype < hashfunctions::nHashType_eid) ? true : false;
+      }
+      virtual bool isTHash() const {
+        return (_htype > hashfunctions::nHashType_eid && _htype < hashfunctions::nHashType_tid) ? true : false;
+      }
 
-				//	get the Linear Hash Type
-				virtual int getLinearHashType(hashfunctions::HashType htype) const
-				{
-					int l = 0;
-					if (htype<hashfunctions::nHashType_did)
-						l = htype;
-					else if (htype<hashfunctions::nHashType_eid)
-						l = htype - 1;
-					else
-						l = htype - 2;
-					return l;
-				}
+      //	get the Linear Hash Type
+      virtual int getLinearHashType(hashfunctions::HashType htype) const {
+        int l = 0;
+        if (htype < hashfunctions::nHashType_did)
+          l = htype;
+        else if (htype < hashfunctions::nHashType_eid)
+          l = htype - 1;
+        else
+          l = htype - 2;
+        return l;
+      }
 
-			protected:
-				hashfunctions::HashType _htype;
-		};
-	}
-}
+    protected:
+      hashfunctions::HashType _htype;
+    };
+  }  // namespace mapper
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/HcalCommonHeaders.h b/DQM/HcalCommon/interface/HcalCommonHeaders.h
index 23dad609f13ff..e0f0a6997af55 100644
--- a/DQM/HcalCommon/interface/HcalCommonHeaders.h
+++ b/DQM/HcalCommon/interface/HcalCommonHeaders.h
@@ -1,49 +1,48 @@
 #ifndef HCALCOMMONHEADERS_H
 #define HCALCOMMONHEADERS_H
 
-#include "EventFilter/HcalRawToDigi/interface/HcalUnpacker.h"
-#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
-#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
-#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
 #include "CalibFormats/HcalObjects/interface/HcalCoderDb.h"
-#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
-#include "DataFormats/Scalers/interface/DcsStatus.h"
+#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
+#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
+#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
+#include "CondFormats/HcalObjects/interface/HcalChannelQuality.h"
+#include "CondFormats/HcalObjects/interface/HcalElectronicsMap.h"
+#include "CondFormats/RunInfo/interface/RunInfo.h"
+#include "CondFormats/RunInfo/interface/RunSummary.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
-#include "FWCore/Common/interface/TriggerNames.h"
-#include "FWCore/Framework/interface/LuminosityBlock.h"
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
-#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
+#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
+#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "DataFormats/HcalDetId/interface/HcalGenericDetId.h"
-#include "CondFormats/HcalObjects/interface/HcalElectronicsMap.h"
-#include "CondFormats/HcalObjects/interface/HcalChannelQuality.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
+#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
+#include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
+#include "DataFormats/Scalers/interface/DcsStatus.h"
+#include "EventFilter/HcalRawToDigi/interface/AMC13Header.h"
+#include "EventFilter/HcalRawToDigi/interface/HcalDCCHeader.h"
+#include "EventFilter/HcalRawToDigi/interface/HcalHTRData.h"
+#include "EventFilter/HcalRawToDigi/interface/HcalUHTRData.h"
+#include "EventFilter/HcalRawToDigi/interface/HcalUnpacker.h"
+#include "FWCore/Common/interface/TriggerNames.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "EventFilter/HcalRawToDigi/interface/HcalDCCHeader.h"
-#include "EventFilter/HcalRawToDigi/interface/HcalHTRData.h"
-#include "EventFilter/HcalRawToDigi/interface/HcalUHTRData.h"
-#include "EventFilter/HcalRawToDigi/interface/AMC13Header.h"
-#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
 #include "TBDataFormats/HcalTBObjects/interface/HcalTBTriggerData.h"
-#include "CondFormats/RunInfo/interface/RunInfo.h"
-#include "CondFormats/RunInfo/interface/RunSummary.h"
-#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
 
-#include "DQMServices/Core/interface/DQMEDHarvester.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMEDHarvester.h"
 
-
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
@@ -51,8 +50,8 @@
 #include "DQM/HcalCommon/interface/Constants.h"
 
 #include "boost/lexical_cast.hpp"
-#include <sstream>
 #include <algorithm>
+#include <sstream>
 #include <typeinfo>
 
 #endif
diff --git a/DQM/HcalCommon/interface/Logger.h b/DQM/HcalCommon/interface/Logger.h
index ae53bf4512dd2..53eb91731e493 100644
--- a/DQM/HcalCommon/interface/Logger.h
+++ b/DQM/HcalCommon/interface/Logger.h
@@ -3,58 +3,42 @@
 
 #include "DQM/HcalCommon/interface/HcalCommonHeaders.h"
 
-class Logger
-{
-	public:
-		Logger(std::string const& name, int debug=0) :
-			_name(name), _debug(debug)
-		{}
-		Logger() {}
-		virtual ~Logger() {}
-
-		inline void dqmthrow(std::string const& msg) const
-		{
-			throw cms::Exception("HCALDQM") << _name << "::" 
-				<< msg;
-		}
-		inline void warn(std::string const& msg) const
-		{
-			edm::LogWarning("HCALDQM") << _name << "::" << msg;
-		}
-		inline void info(std::string const& msg) const
-		{
-			if (_debug==0)
-				return;
-			edm::LogInfo("HCALDQM") << _name << "::" << msg;
-		}
-		template<typename STDTYPE>
-		inline void debug(STDTYPE const& msg) const
-		{
-			if (_debug==0)
-				return;
-
-			std::cout << "%MSG" << std::endl;
-			std::cout << "$MSG-d HCALDQM::" << _name << "::" << msg;
-			std::cout << std::endl;
-		}
-
-		inline void set(std::string const& name, int debug=0)
-		{
-			_name = name;
-			_debug = debug;
-
-			if (debug==0)
-				return;
-
-			this->debug("Setting up Logger for " + _name);
-		}
-
-	protected:
-		std::string _name;
-		int			_debug;
+class Logger {
+public:
+  Logger(std::string const &name, int debug = 0) : _name(name), _debug(debug) {}
+  Logger() {}
+  virtual ~Logger() {}
+
+  inline void dqmthrow(std::string const &msg) const { throw cms::Exception("HCALDQM") << _name << "::" << msg; }
+  inline void warn(std::string const &msg) const { edm::LogWarning("HCALDQM") << _name << "::" << msg; }
+  inline void info(std::string const &msg) const {
+    if (_debug == 0)
+      return;
+    edm::LogInfo("HCALDQM") << _name << "::" << msg;
+  }
+  template <typename STDTYPE>
+  inline void debug(STDTYPE const &msg) const {
+    if (_debug == 0)
+      return;
+
+    std::cout << "%MSG" << std::endl;
+    std::cout << "$MSG-d HCALDQM::" << _name << "::" << msg;
+    std::cout << std::endl;
+  }
+
+  inline void set(std::string const &name, int debug = 0) {
+    _name = name;
+    _debug = debug;
+
+    if (debug == 0)
+      return;
+
+    this->debug("Setting up Logger for " + _name);
+  }
+
+protected:
+  std::string _name;
+  int _debug;
 };
 
 #endif
-
-
-
diff --git a/DQM/HcalCommon/interface/Mapper.h b/DQM/HcalCommon/interface/Mapper.h
index 8a14b22a5c7c3..52a80b71c69cc 100644
--- a/DQM/HcalCommon/interface/Mapper.h
+++ b/DQM/HcalCommon/interface/Mapper.h
@@ -8,43 +8,32 @@
  *	Description:
  */
 
-#include "DQM/HcalCommon/interface/HcalCommonHeaders.h"
 #include "DQM/HcalCommon/interface/Constants.h"
+#include "DQM/HcalCommon/interface/HcalCommonHeaders.h"
 #include "DQM/HcalCommon/interface/Logger.h"
 
+#include <sstream>
 #include <string>
 #include <vector>
-#include <sstream>
-
-namespace hcaldqm
-{
-	namespace mapper
-	{
-		class Mapper
-		{
-			public:
-				Mapper()
-				{}
-				virtual ~Mapper() {}
-
-				virtual uint32_t getHash(HcalDetId const&) const{return 0;}
-				virtual uint32_t getHash(HcalElectronicsId const&) const {return 0;}
-				virtual uint32_t getHash(HcalTrigTowerDetId const&) const {return 0;}
-
-				virtual std::string getName(HcalDetId const&) const {return "";}
-				virtual std::string getName(HcalElectronicsId const&) const 
-				{return "";}
-				virtual std::string getName(HcalTrigTowerDetId const&) const
-				{return "";}
-
-			protected:
-		};
-	}
-}
-
-#endif
 
+namespace hcaldqm {
+  namespace mapper {
+    class Mapper {
+    public:
+      Mapper() {}
+      virtual ~Mapper() {}
 
+      virtual uint32_t getHash(HcalDetId const &) const { return 0; }
+      virtual uint32_t getHash(HcalElectronicsId const &) const { return 0; }
+      virtual uint32_t getHash(HcalTrigTowerDetId const &) const { return 0; }
 
+      virtual std::string getName(HcalDetId const &) const { return ""; }
+      virtual std::string getName(HcalElectronicsId const &) const { return ""; }
+      virtual std::string getName(HcalTrigTowerDetId const &) const { return ""; }
 
+    protected:
+    };
+  }  // namespace mapper
+}  // namespace hcaldqm
 
+#endif
diff --git a/DQM/HcalCommon/interface/Quantity.h b/DQM/HcalCommon/interface/Quantity.h
index 27032c3dc8d00..3644bba0940cc 100644
--- a/DQM/HcalCommon/interface/Quantity.h
+++ b/DQM/HcalCommon/interface/Quantity.h
@@ -6,91 +6,74 @@
  *	Author:		Viktor Khristenko
  */
 
-#include "DQM/HcalCommon/interface/HcalCommonHeaders.h"
 #include "DQM/HcalCommon/interface/Constants.h"
+#include "DQM/HcalCommon/interface/HcalCommonHeaders.h"
 #include "DQM/HcalCommon/interface/Utilities.h"
 
-namespace hcaldqm
-{
-	namespace quantity
-	{
-		enum QuantityType
-		{
-			fDetectorQuantity = 0,
-			fElectronicsQuantity = 1,
-			fTrigTowerQuantity = 2,
-			fValueQuantity = 3,
-			fFlagQuantity = 4,
-			fNone = 5,
-			nQuantityType = 6
-		};
+namespace hcaldqm {
+  namespace quantity {
+    enum QuantityType {
+      fDetectorQuantity = 0,
+      fElectronicsQuantity = 1,
+      fTrigTowerQuantity = 2,
+      fValueQuantity = 3,
+      fFlagQuantity = 4,
+      fNone = 5,
+      nQuantityType = 6
+    };
 
-		enum AxisType
-		{
-			fXAxis = 0,
-			fYAxis = 1,
-			fZAxis = 2,
-			nAxisType = 3
-		};
+    enum AxisType { fXAxis = 0, fYAxis = 1, fZAxis = 2, nAxisType = 3 };
 
-		class Quantity
-		{
-			public:
-				Quantity() : _name("Quantity"), _isLog(false), _showOverflow(false)
-				{}
-				Quantity(std::string const& name, bool isLog) : 
-					_name(name), _isLog(isLog), _showOverflow(false)
-				{}
-				virtual ~Quantity() {}
+    class Quantity {
+    public:
+      Quantity() : _name("Quantity"), _isLog(false), _showOverflow(false) {}
+      Quantity(std::string const &name, bool isLog) : _name(name), _isLog(isLog), _showOverflow(false) {}
+      virtual ~Quantity() {}
 
-				virtual QuantityType	type() {return fNone;}
-				virtual std::string		name() {return _name;}
-				virtual bool			isLog() {return _isLog;}
-				virtual	void			setAxisType(AxisType at) {_axistype=at;}
-				virtual Quantity* makeCopy() 
-				{return new Quantity(_name,_isLog);}
+      virtual QuantityType type() { return fNone; }
+      virtual std::string name() { return _name; }
+      virtual bool isLog() { return _isLog; }
+      virtual void setAxisType(AxisType at) { _axistype = at; }
+      virtual Quantity *makeCopy() { return new Quantity(_name, _isLog); }
 
-				virtual uint32_t getBin(HcalDetId const&) {return 1;}
-				virtual uint32_t getBin(HcalElectronicsId const&) {return 1;}
-				virtual uint32_t getBin(HcalTrigTowerDetId const&) {return 1;}
-				virtual uint32_t getBin(int) {return 1;}
-				virtual uint32_t getBin(double) {return 1;}
+      virtual uint32_t getBin(HcalDetId const &) { return 1; }
+      virtual uint32_t getBin(HcalElectronicsId const &) { return 1; }
+      virtual uint32_t getBin(HcalTrigTowerDetId const &) { return 1; }
+      virtual uint32_t getBin(int) { return 1; }
+      virtual uint32_t getBin(double) { return 1; }
 
-				virtual int getValue(HcalDetId const&) {return 0;}
-				virtual int getValue(HcalElectronicsId const&) {return 0;}
-				virtual int getValue(HcalTrigTowerDetId const&) {return 0;}
-				virtual int getValue(int x) {return x;}
-				virtual double getValue(double x) {return x;}
+      virtual int getValue(HcalDetId const &) { return 0; }
+      virtual int getValue(HcalElectronicsId const &) { return 0; }
+      virtual int getValue(HcalTrigTowerDetId const &) { return 0; }
+      virtual int getValue(int x) { return x; }
+      virtual double getValue(double x) { return x; }
 
-				virtual void setBits(TH1* o)
-				{setLog(o);}
-				virtual void setLog(TH1* o) 
-				{
-					if (_isLog)
-						o->SetBit(BIT(constants::BIT_OFFSET+_axistype));
-				}
+      virtual void setBits(TH1 *o) { setLog(o); }
+      virtual void setLog(TH1 *o) {
+        if (_isLog)
+          o->SetBit(BIT(constants::BIT_OFFSET + _axistype));
+      }
 
-				virtual int nbins() {return 1;}
-				virtual int wofnbins() {return nbins()+2;}
-				virtual double min() {return 0;}
-				virtual double max() {return 1;}
-				virtual bool isCoordinate() {return false;}
-				virtual std::vector<std::string> getLabels() 
-				{return std::vector<std::string>();}
+      virtual int nbins() { return 1; }
+      virtual int wofnbins() { return nbins() + 2; }
+      virtual double min() { return 0; }
+      virtual double max() { return 1; }
+      virtual bool isCoordinate() { return false; }
+      virtual std::vector<std::string> getLabels() { return std::vector<std::string>(); }
 
-				virtual void setMax(double) {}
-				virtual void setMin(double) {}
-				virtual void setNbins(int) {}
+      virtual void setMax(double) {}
+      virtual void setMin(double) {}
+      virtual void setNbins(int) {}
 
-				virtual void showOverflow(bool showOverflow) {_showOverflow = showOverflow;}
+      virtual void showOverflow(bool showOverflow) { _showOverflow = showOverflow; }
 
-			protected:
-				std::string		_name;
-				bool			_isLog;
-				AxisType		_axistype;
-				bool _showOverflow;
-		};
-	}
-}
+    protected:
+      std::string _name;
+      bool _isLog;
+      AxisType _axistype;
+      bool _showOverflow;
+    };
+  }  // namespace quantity
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/TrigTowerQuantity.h b/DQM/HcalCommon/interface/TrigTowerQuantity.h
index cbcf72f7fd4ed..db1f67d1d9ff9 100644
--- a/DQM/HcalCommon/interface/TrigTowerQuantity.h
+++ b/DQM/HcalCommon/interface/TrigTowerQuantity.h
@@ -8,108 +8,87 @@
 
 #include "DQM/HcalCommon/interface/Quantity.h"
 
-namespace hcaldqm
-{
-	namespace quantity
-	{
-		enum TrigTowerQuantityType
-		{
-			fTTiphi = 0,
-			fTTieta = 1,
-			fTTdepth = 2,
-			fTTSubdet = 3,
-			fTTSubdetPM = 4,
-			fTTieta2x3 = 5,
-			nTrigTowerQuantityType = 6
-		};
+namespace hcaldqm {
+  namespace quantity {
+    enum TrigTowerQuantityType {
+      fTTiphi = 0,
+      fTTieta = 1,
+      fTTdepth = 2,
+      fTTSubdet = 3,
+      fTTSubdetPM = 4,
+      fTTieta2x3 = 5,
+      nTrigTowerQuantityType = 6
+    };
 
-		int getValue_TTiphi(HcalTrigTowerDetId const&);
-		int getValue_TTieta(HcalTrigTowerDetId const&);
-		int getValue_TTdepth(HcalTrigTowerDetId const&);
-		int getValue_TTSubdet(HcalTrigTowerDetId const&);
-		int getValue_TTSubdetPM(HcalTrigTowerDetId const&);
-		int getValue_TTieta2x3(HcalTrigTowerDetId const&);
-		uint32_t getBin_TTiphi(HcalTrigTowerDetId const&);
-		uint32_t getBin_TTieta(HcalTrigTowerDetId const&);
-		uint32_t getBin_TTdepth(HcalTrigTowerDetId const&);
-		uint32_t getBin_TTSubdet(HcalTrigTowerDetId const&);
-		uint32_t getBin_TTSubdetPM(HcalTrigTowerDetId const&);
-		uint32_t getBin_TTieta2x3(HcalTrigTowerDetId const&);
-		HcalTrigTowerDetId getTid_TTiphi(int);
-		HcalTrigTowerDetId getTid_TTieta(int);
-		HcalTrigTowerDetId getTid_TTdepth(int);
-		HcalTrigTowerDetId getTid_TTSubdet(int);
-		HcalTrigTowerDetId getTid_TTSubdetPM(int);
-		HcalTrigTowerDetId getTid_TTieta2x3(int);
-		std::vector<std::string> getLabels_TTiphi();
-		std::vector<std::string> getLabels_TTieta();
-		std::vector<std::string> getLabels_TTdepth();
-		std::vector<std::string> getLabels_TTSubdet();
-		std::vector<std::string> getLabels_TTSubdetPM();
-		std::vector<std::string> getLabels_TTieta2x3();
+    int getValue_TTiphi(HcalTrigTowerDetId const &);
+    int getValue_TTieta(HcalTrigTowerDetId const &);
+    int getValue_TTdepth(HcalTrigTowerDetId const &);
+    int getValue_TTSubdet(HcalTrigTowerDetId const &);
+    int getValue_TTSubdetPM(HcalTrigTowerDetId const &);
+    int getValue_TTieta2x3(HcalTrigTowerDetId const &);
+    uint32_t getBin_TTiphi(HcalTrigTowerDetId const &);
+    uint32_t getBin_TTieta(HcalTrigTowerDetId const &);
+    uint32_t getBin_TTdepth(HcalTrigTowerDetId const &);
+    uint32_t getBin_TTSubdet(HcalTrigTowerDetId const &);
+    uint32_t getBin_TTSubdetPM(HcalTrigTowerDetId const &);
+    uint32_t getBin_TTieta2x3(HcalTrigTowerDetId const &);
+    HcalTrigTowerDetId getTid_TTiphi(int);
+    HcalTrigTowerDetId getTid_TTieta(int);
+    HcalTrigTowerDetId getTid_TTdepth(int);
+    HcalTrigTowerDetId getTid_TTSubdet(int);
+    HcalTrigTowerDetId getTid_TTSubdetPM(int);
+    HcalTrigTowerDetId getTid_TTieta2x3(int);
+    std::vector<std::string> getLabels_TTiphi();
+    std::vector<std::string> getLabels_TTieta();
+    std::vector<std::string> getLabels_TTdepth();
+    std::vector<std::string> getLabels_TTSubdet();
+    std::vector<std::string> getLabels_TTSubdetPM();
+    std::vector<std::string> getLabels_TTieta2x3();
 
-		typedef int (*getValueType_tid)(HcalTrigTowerDetId const&);
-		typedef uint32_t (*getBinType_tid)(HcalTrigTowerDetId const&);
-		typedef HcalTrigTowerDetId (*getTid_tid)(int);
-		typedef std::vector<std::string> (*getLabels_tid)();
-		getValueType_tid const getValue_functions_tid[nTrigTowerQuantityType]= 
-		{
-			getValue_TTiphi, getValue_TTieta, getValue_TTdepth,
-			getValue_TTSubdet, getValue_TTSubdetPM, getValue_TTieta2x3
-		};
-		getBinType_tid const getBin_functions_tid[nTrigTowerQuantityType] = {
-			getBin_TTiphi, getBin_TTieta, getBin_TTdepth,
-			getBin_TTSubdet, getBin_TTSubdetPM, getBin_TTieta2x3
-		};
-		getTid_tid const getTid_functions_tid[nTrigTowerQuantityType] = {
-			getTid_TTiphi, getTid_TTieta, getTid_TTdepth,
-			getTid_TTSubdet, getTid_TTSubdetPM, getTid_TTieta2x3
-		};
-		getLabels_tid const getLabels_functions_tid[nTrigTowerQuantityType] = {
-			getLabels_TTiphi, getLabels_TTieta, getLabels_TTdepth,
-			getLabels_TTSubdet, getLabels_TTSubdetPM, getLabels_TTieta2x3
-		};
-		std::string const name_tid[nTrigTowerQuantityType] = {
-			"TTiphi", "TTieta", "TTdepth", "TTSubdet", "TTSubdetPM", "TTieta"
-		};
-		double const min_tid[nTrigTowerQuantityType] = {
-			0.5, 0, -0.5, 0, 0, 0
-		};
-		double const max_tid[nTrigTowerQuantityType] = {
-			72.5, 82, 0.5, 2, 4, 8
-		};
-		int const nbins_tid[nTrigTowerQuantityType] = {
-			72, 82, 1, 2, 4, 8
-		};
+    typedef int (*getValueType_tid)(HcalTrigTowerDetId const &);
+    typedef uint32_t (*getBinType_tid)(HcalTrigTowerDetId const &);
+    typedef HcalTrigTowerDetId (*getTid_tid)(int);
+    typedef std::vector<std::string> (*getLabels_tid)();
+    getValueType_tid const getValue_functions_tid[nTrigTowerQuantityType] = {
+        getValue_TTiphi, getValue_TTieta, getValue_TTdepth, getValue_TTSubdet, getValue_TTSubdetPM, getValue_TTieta2x3};
+    getBinType_tid const getBin_functions_tid[nTrigTowerQuantityType] = {
+        getBin_TTiphi, getBin_TTieta, getBin_TTdepth, getBin_TTSubdet, getBin_TTSubdetPM, getBin_TTieta2x3};
+    getTid_tid const getTid_functions_tid[nTrigTowerQuantityType] = {
+        getTid_TTiphi, getTid_TTieta, getTid_TTdepth, getTid_TTSubdet, getTid_TTSubdetPM, getTid_TTieta2x3};
+    getLabels_tid const getLabels_functions_tid[nTrigTowerQuantityType] = {getLabels_TTiphi,
+                                                                           getLabels_TTieta,
+                                                                           getLabels_TTdepth,
+                                                                           getLabels_TTSubdet,
+                                                                           getLabels_TTSubdetPM,
+                                                                           getLabels_TTieta2x3};
+    std::string const name_tid[nTrigTowerQuantityType] = {
+        "TTiphi", "TTieta", "TTdepth", "TTSubdet", "TTSubdetPM", "TTieta"};
+    double const min_tid[nTrigTowerQuantityType] = {0.5, 0, -0.5, 0, 0, 0};
+    double const max_tid[nTrigTowerQuantityType] = {72.5, 82, 0.5, 2, 4, 8};
+    int const nbins_tid[nTrigTowerQuantityType] = {72, 82, 1, 2, 4, 8};
 
-		class TrigTowerQuantity : public Quantity
-		{
-			public:
-				TrigTowerQuantity() {}
-				TrigTowerQuantity(TrigTowerQuantityType type, bool isLog=false):
-					Quantity(name_tid[type], isLog), _type(type)
-				{}
-				~TrigTowerQuantity() override {}
-				TrigTowerQuantity* makeCopy() override
-				{return new TrigTowerQuantity(_type, _isLog);}
+    class TrigTowerQuantity : public Quantity {
+    public:
+      TrigTowerQuantity() {}
+      TrigTowerQuantity(TrigTowerQuantityType type, bool isLog = false)
+          : Quantity(name_tid[type], isLog), _type(type) {}
+      ~TrigTowerQuantity() override {}
+      TrigTowerQuantity *makeCopy() override { return new TrigTowerQuantity(_type, _isLog); }
 
-				int getValue(HcalTrigTowerDetId const& tid) override
-				{return getValue_functions_tid[_type](tid);}
-				uint32_t getBin(HcalTrigTowerDetId const& tid) override
-				{return getBin_functions_tid[_type](tid);}
+      int getValue(HcalTrigTowerDetId const &tid) override { return getValue_functions_tid[_type](tid); }
+      uint32_t getBin(HcalTrigTowerDetId const &tid) override { return getBin_functions_tid[_type](tid); }
 
-				QuantityType type() override {return fTrigTowerQuantity;}
-				int nbins() override {return nbins_tid[_type];}
-				double min() override {return min_tid[_type];}
-				double max() override {return max_tid[_type];}
-				bool isCoordinate() override {return true;}
-				std::vector<std::string> getLabels() override 
-				{return getLabels_functions_tid[_type]();}
+      QuantityType type() override { return fTrigTowerQuantity; }
+      int nbins() override { return nbins_tid[_type]; }
+      double min() override { return min_tid[_type]; }
+      double max() override { return max_tid[_type]; }
+      bool isCoordinate() override { return true; }
+      std::vector<std::string> getLabels() override { return getLabels_functions_tid[_type](); }
 
-			protected:
-				TrigTowerQuantityType _type;
-		};
-	}
-}
+    protected:
+      TrigTowerQuantityType _type;
+    };
+  }  // namespace quantity
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/Utilities.h b/DQM/HcalCommon/interface/Utilities.h
index 573b6982773d1..ee58f9adf50ce 100644
--- a/DQM/HcalCommon/interface/Utilities.h
+++ b/DQM/HcalCommon/interface/Utilities.h
@@ -9,193 +9,193 @@
  *		Utility functions
  */
 
-#include "DQM/HcalCommon/interface/HcalCommonHeaders.h"
 #include "DQM/HcalCommon/interface/Constants.h"
+#include "DQM/HcalCommon/interface/HcalCommonHeaders.h"
+
+namespace hcaldqm {
+  namespace utilities {
+    /*
+ * adc2fC lookup from conditions
+ * fC values are stored in CaloSamples tool
+ */
+    template <class Digi>
+    CaloSamples loadADC2fCDB(const edm::ESHandle<HcalDbService> &conditions, const HcalDetId did, const Digi &digi) {
+      CaloSamples calo_samples;
+      const HcalQIECoder *channelCoder = conditions->getHcalCoder(did);
+      const HcalQIEShape *shape = conditions->getHcalShape(channelCoder);
+      HcalCoderDb coder(*channelCoder, *shape);
+      coder.adc2fC(digi, calo_samples);
+      return calo_samples;
+    }
+
+    // Get pedestal-subtracted charge
+    template <class Digi>
+    double adc2fCDBMinusPedestal(const edm::ESHandle<HcalDbService> &conditions,
+                                 const CaloSamples &calo_samples,
+                                 const HcalDetId did,
+                                 const Digi &digi,
+                                 unsigned int n) {
+      HcalCalibrations calibrations = conditions->getHcalCalibrations(did);
+      int capid = digi[n].capid();
+      return calo_samples[n] - calibrations.pedestal(capid);
+    }
+
+    template <class Digi>
+    double aveTSDB(const edm::ESHandle<HcalDbService> &conditions,
+                   const CaloSamples &calo_samples,
+                   const HcalDetId did,
+                   const Digi &digi,
+                   unsigned int i_start,
+                   unsigned int i_end) {
+      double sumQ = 0;
+      double sumQT = 0;
+      for (unsigned int i = i_start; i <= i_end; ++i) {
+        double q = adc2fCDBMinusPedestal(conditions, calo_samples, did, digi, i);
+        sumQ += q;
+        sumQT += (i + 1) * q;
+      }
+      return (sumQ > 0 ? sumQT / sumQ - 1 : constants::GARBAGE_VALUE);
+    }
+
+    template <class Digi>
+    double sumQDB(const edm::ESHandle<HcalDbService> &conditions,
+                  const CaloSamples &calo_samples,
+                  const HcalDetId did,
+                  const Digi &digi,
+                  unsigned int i_start,
+                  unsigned int i_end) {
+      double sumQ = 0;
+      for (unsigned int i = i_start; i <= i_end; ++i) {
+        sumQ += adc2fCDBMinusPedestal(conditions, calo_samples, did, digi, i);
+      }
+      return sumQ;
+    }
+
+    /*
+ *	Some useful functions for QIE10/11 Data Frames
+ */
+    template <typename FRAME>
+    double aveTS_v10(FRAME const &frame, double ped = 0, int i = 0, int j = 3) {
+      double sumQ = 0;
+      double sumQT = 0;
+      for (int ii = i; ii <= j; ii++) {
+        double q = constants::adc2fC[frame[ii].adc()] - ped;
+        sumQ += q;
+        sumQT += (ii + 1) * q;
+      }
+
+      return sumQ > 0 ? sumQT / sumQ - 1 : constants::GARBAGE_VALUE;
+    }
+
+    template <typename FRAME>
+    double sumQ_v10(FRAME const &frame, double ped, int i = 0, int j = 3) {
+      double sumQ = 0;
+      for (int ii = i; ii <= j; ii++)
+        sumQ += constants::adc2fC[frame[ii].adc()] - ped;
+      return sumQ;
+    }
+
+    /*
+ *	Some useful functions on QIE8 digis
+ */
+    template <typename DIGI>
+    int maxTS(DIGI const &digi, double ped = 0) {
+      int maxTS = -1;
+      double maxQ = -100;
+      for (int i = 0; i < digi.size(); i++)
+        if ((digi.sample(i).nominal_fC() - ped) > maxQ) {
+          maxQ = digi.sample(i).nominal_fC() - ped;
+          maxTS = i;
+        }
+      return maxTS;
+    }
+
+    template <typename DIGI>
+    double aveTS(DIGI const &digi, double ped = 0, int i = 0, int j = 3) {
+      double sumQ = 0;
+      double sumQT = 0;
+      for (int ii = i; ii <= j; ii++) {
+        sumQ += digi.sample(ii).nominal_fC() - ped;
+        sumQT += (ii + 1) * (digi.sample(ii).nominal_fC() - ped);
+      }
+
+      return sumQ > 0 ? sumQT / sumQ - 1 : constants::GARBAGE_VALUE;
+    }
+
+    template <typename DIGI>
+    double sumQ(DIGI const &digi, double ped, int i = 0, int j = 3) {
+      double sum = 0;
+      for (int ii = i; ii <= j; ii++)
+        sum += (digi.sample(ii).nominal_fC() - ped);
+      return sum;
+    }
+
+    template <typename DIGI>
+    double aveQ(DIGI const &digi, double ped, int i = 0, int j = 3) {
+      return sumQ<DIGI>(digi, ped, i, j) / (j - i + 1);
+    }
+
+    template <typename DIGI>
+    double sumADC(DIGI const &digi, double ped, int i = 0, int j = 3) {
+      double sum = 0;
+      for (int ii = i; ii <= j; ii++)
+        sum += digi.sample(ii).adc() - ped;
+      return sum;
+    }
+
+    template <typename DIGI>
+    double aveADC(DIGI const &digi, double ped, int i = 0, int j = 3) {
+      return sumADC<DIGI>(digi, ped, i, j) / (j - i + 1);
+    }
+
+    /*
+ *	Log Functions
+ */
+    template <typename STDTYPE>
+    void dqmdebug(STDTYPE const &x, int debug = 0) {
+      if (debug == 0)
+        return;
+      std::cout << "%MSG" << std::endl;
+      std::cout << "%MSG-d HCALDQM::" << x;
+      std::cout << std::endl;
+    }
+
+    /*
+ *	Useful Detector/Electronics/TrigTower Functions.
+ *	For Fast Detector Validity Check
+ */
+    int getTPSubDet(HcalTrigTowerDetId const &);
+    int getTPSubDetPM(HcalTrigTowerDetId const &);
+
+    // Get a list of all crates
+    std::vector<int> getCrateList(HcalElectronicsMap const *emap);
+    std::map<int, uint32_t> getCrateHashMap(HcalElectronicsMap const *emap);
+
+    //	returns a list of FEDs sorted.
+    std::vector<int> getFEDList(HcalElectronicsMap const *);
+    std::vector<int> getFEDVMEList(HcalElectronicsMap const *);
+    std::vector<int> getFEDuTCAList(HcalElectronicsMap const *);
+
+    std::pair<uint16_t, uint16_t> fed2crate(int fed);
+    uint16_t crate2fed(int crate, int slot);
+    bool isFEDHBHE(HcalElectronicsId const &);
+    bool isFEDHF(HcalElectronicsId const &);
+    bool isFEDHO(HcalElectronicsId const &);
+
+    /**
+ *	This is wrap around in case hashing scheme changes in the future
+ */
+    uint32_t hash(HcalDetId const &);
+    uint32_t hash(HcalElectronicsId const &);
+    uint32_t hash(HcalTrigTowerDetId const &);
+
+    /*
+ *	Orbit Gap Related
+ */
+    std::string ogtype2string(constants::OrbitGapType type);
 
-namespace hcaldqm
-{
-	namespace utilities
-	{
-		/*
-		 * adc2fC lookup from conditions
-		 * fC values are stored in CaloSamples tool
-		 */
-		template<class Digi>
-		CaloSamples loadADC2fCDB(const edm::ESHandle<HcalDbService>& conditions, const HcalDetId did, const Digi& digi) {
-			CaloSamples calo_samples;
-			const HcalQIECoder* channelCoder = conditions->getHcalCoder(did);
-			const HcalQIEShape* shape = conditions->getHcalShape(channelCoder);
-			HcalCoderDb coder(*channelCoder, *shape);
-			coder.adc2fC(digi, calo_samples);
-			return calo_samples;
-		}
-
-		// Get pedestal-subtracted charge
-		template<class Digi> 
-		double adc2fCDBMinusPedestal(const edm::ESHandle<HcalDbService>& conditions, const CaloSamples& calo_samples, const HcalDetId did, const Digi& digi, unsigned int n) {
-			HcalCalibrations calibrations = conditions->getHcalCalibrations(did);
-			int capid = digi[n].capid();
-			return calo_samples[n] - calibrations.pedestal(capid);
-		}
-
-		template<class Digi>
-		double aveTSDB(const edm::ESHandle<HcalDbService>& conditions, const CaloSamples& calo_samples, const HcalDetId did, const Digi& digi, unsigned int i_start, unsigned int i_end) {
-			double sumQ = 0;
-			double sumQT = 0;
-			for (unsigned int i = i_start; i <= i_end; ++i) {
-				double q = adc2fCDBMinusPedestal(conditions, calo_samples, did, digi, i);
-				sumQ += q;
-				sumQT += (i+1)*q;
-			}
-			return (sumQ > 0 ? sumQT/sumQ-1 : constants::GARBAGE_VALUE);
-		}
-
-		template<class Digi>
-		double sumQDB(const edm::ESHandle<HcalDbService>& conditions, const CaloSamples& calo_samples, const HcalDetId did, const Digi& digi, unsigned int i_start, unsigned int i_end) {
-			double sumQ = 0;
-			for (unsigned int i = i_start; i <= i_end; ++i) {
-				sumQ += adc2fCDBMinusPedestal(conditions, calo_samples, did, digi, i);
-			}
-			return sumQ;
-		}
-
-		/*
-		 *	Some useful functions for QIE10/11 Data Frames
-		 */
-		template<typename FRAME>
-		double aveTS_v10(FRAME const& frame, double ped=0, int i=0,int j=3)
-		{
-			double sumQ = 0;
-			double sumQT = 0;
-			for (int ii=i; ii<=j; ii++)
-			{
-				double q = constants::adc2fC[frame[ii].adc()]-ped;
-				sumQ += q;
-				sumQT += (ii+1)*q;
-			}
-
-			return sumQ>0 ? sumQT/sumQ-1 : constants::GARBAGE_VALUE;
-		}
-
-		template<typename FRAME>
-		double sumQ_v10(FRAME const& frame, double ped, int i=0, int j=3)
-		{
-			double sumQ = 0;
-			for (int ii=i; ii<=j; ii++)
-				sumQ += constants::adc2fC[frame[ii].adc()]-ped;
-			return sumQ;
-		}
-
-		/*
-		 *	Some useful functions on QIE8 digis
-		 */
-		template<typename DIGI>
-		int maxTS(DIGI const& digi, double ped=0)
-		{
-			int maxTS = -1;
-			double maxQ = -100;
-			for (int i=0; i<digi.size(); i++)
-				if((digi.sample(i).nominal_fC()-ped)>maxQ)
-				{
-					maxQ = digi.sample(i).nominal_fC()-ped;
-					maxTS = i;
-				}
-			return maxTS;
-		}
-
-		template<typename DIGI>
-		double aveTS(DIGI const& digi, double ped=0, int i=0, int j=3)
-		{
-			double sumQ = 0;
-			double sumQT = 0;
-			for (int ii=i; ii<=j; ii++)
-			{
-				sumQ+=digi.sample(ii).nominal_fC()-ped;
-				sumQT +=(ii+1)*(digi.sample(ii).nominal_fC()-ped);
-			}
-			
-			return sumQ>0 ? sumQT/sumQ-1 : constants::GARBAGE_VALUE;
-		}
-
-		template<typename DIGI>
-		double sumQ(DIGI const& digi, double ped, int i=0, int j=3)
-		{
-			double sum=0;
-			for (int ii=i; ii<=j; ii++)
-				sum+=(digi.sample(ii).nominal_fC()-ped);
-			return sum;
-		}
-
-		template<typename DIGI>
-		double aveQ(DIGI const& digi, double ped, int i=0, int j=3)
-		{
-			return sumQ<DIGI>(digi, ped, i, j)/(j-i+1);
-		}
-
-		template<typename DIGI>
-		double sumADC(DIGI const& digi, double ped, int i=0, int j=3)
-		{
-			double sum = 0;
-			for (int ii=i; ii<=j; ii++)
-				sum+=digi.sample(ii).adc()-ped;
-			return sum;
-		}
-
-		template<typename DIGI>
-		double aveADC(DIGI const& digi, double ped, int i=0, int j=3)
-		{
-			return sumADC<DIGI>(digi, ped, i, j)/(j-i+1);
-		}
-
-		/*
-		 *	Log Functions
-		 */
-		template<typename STDTYPE>
-		void dqmdebug(STDTYPE const& x, int debug=0)
-		{
-			if (debug==0)
-				return;
-			std::cout << "%MSG" << std::endl;
-			std::cout << "%MSG-d HCALDQM::" << x;
-			std::cout << std::endl;
-		}
-
-		/*
-		 *	Useful Detector/Electronics/TrigTower Functions. 
-		 *	For Fast Detector Validity Check
-		 */
-		int getTPSubDet(HcalTrigTowerDetId const&);
-		int getTPSubDetPM(HcalTrigTowerDetId const&);
-
-		// Get a list of all crates
-		std::vector<int> getCrateList(HcalElectronicsMap const* emap);
-		std::map<int, uint32_t> getCrateHashMap(HcalElectronicsMap const* emap);
-
-		//	returns a list of FEDs sorted.
-		std::vector<int> getFEDList(HcalElectronicsMap const*);
-		std::vector<int> getFEDVMEList(HcalElectronicsMap const*);
-		std::vector<int> getFEDuTCAList(HcalElectronicsMap const*);
-
-        std::pair<uint16_t, uint16_t> fed2crate(int fed);
-		uint16_t crate2fed(int crate, int slot);
-		bool isFEDHBHE(HcalElectronicsId const&);
-		bool isFEDHF(HcalElectronicsId const&);
-		bool isFEDHO(HcalElectronicsId const&);
-
-		/**
-		 *	This is wrap around in case hashing scheme changes in the future
-		 */
-		uint32_t hash(HcalDetId const&);
-		uint32_t hash(HcalElectronicsId const&);
-		uint32_t hash(HcalTrigTowerDetId const&);
-
-		/*
-		 *	Orbit Gap Related
-		 */	
-		std::string ogtype2string(constants::OrbitGapType type);
-
-		int getRBX(uint32_t iphi);
-	}
-}
+    int getRBX(uint32_t iphi);
+  }  // namespace utilities
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/interface/ValueQuantity.h b/DQM/HcalCommon/interface/ValueQuantity.h
index 1dad1505533cc..f8fbdc2eca8bf 100644
--- a/DQM/HcalCommon/interface/ValueQuantity.h
+++ b/DQM/HcalCommon/interface/ValueQuantity.h
@@ -1,583 +1,528 @@
 #ifndef ValueQuantity_h
 #define ValueQuantity_h
 
-#include "DQM/HcalCommon/interface/Quantity.h"
 #include "DQM/HcalCommon/interface/Flag.h"
+#include "DQM/HcalCommon/interface/Quantity.h"
 #include "boost/unordered_map.hpp"
 
-namespace hcaldqm
-{
-	namespace quantity
-	{
-		enum ValueQuantityType
-		{
-			fN = 0,
-			fEvents = 1,
-			fEnergy = 2,
-			fTiming_ns = 3,
-			fADC_128 = 4,
-			fADC_5 = 5,
-			fADC_15 = 6,
-			ffC_10000 = 7,
-			ffC_1000 = 8,
-			ffC_3000 = 9,
-			fTiming_TS = 10,
-			fTiming_TS200 = 11,
-			fLS = 12,
-			fEt_256 = 13,
-			fEt_128 = 14,
-			fFG = 15,
-			fRatio = 16,
-			fDigiSize = 17,
-			fAroundZero = 18,
-			fRatio2 = 19,
-			fdEtRatio = 20,
-			fSumdEt = 21,
-			fTiming_100TS = 22,
-			fQIE10ADC_256 = 23,
-			fQIE10TDC_64 = 24,
-			fQIE10TDC_16 = 25,
-			fDiffAbs = 26,
-			fRatio_0to2 = 27,
-			fN_to8000 = 28,
-			fEnergyTotal = 29,
-			fN_m0to10000 = 30,
-			fEtCorr_256 = 31,
-			fADCCorr_128 = 32,
-			fBX = 33,
-			fEnergy_1TeV = 34,
-			fState = 35,
-			fQIE10fC_400000 = 36,
-			fDataSize = 37,
-			fQIE10fC_2000 = 38,
-			fQIE10fC_10000 = 39,
-			fQIE8fC_1000_50 = 40,
-			fTime_ns_250 = 41,
-			fADC_256 = 42,
-			ffC_generic_10000 = 43,
-			ffC_generic_400000 = 44,
-			fQIE10ADC_16 = 45,
-			fDualAnodeAsymmetry = 46,
-			fTimingRatio = 47,
-			fQIE10fC_100000Coarse = 48,
-			fBadTDC = 49,
-			fRBX = 50,
-			fTimingDiff_ns = 51,
-			ffC_1000000 = 52,
-			fTime_ns_250_coarse = 53,
-			fCapidMinusBXmod4 = 54,
-			fBX_36 = 55,
-			fADC_256_4 = 56, // ADC from 0-255, with 4 ADC granularity
-		};
-		const std::map<ValueQuantityType, std::string> name_value = {
-			{fN,"N"},
-			{fEvents,"Events"},
-			{fEnergy,"Energy"},
-			{fTiming_ns,"Timing"},
-			{fADC_5,"ADC (QIE8)"},
-			{fADC_15,"ADC (QIE8)"},
-			{fADC_128,"ADC (QIE8)"},
-			{fADC_256,"ADC"},
-			{fQIE10ADC_256,"ADC (QIE10/11)"},
-			{fQIE10ADC_16,"ADC (QIE10/11)"},
-			{ffC_1000,"fC (QIE8)"},
-			{ffC_3000,"fC (QIE8)"},
-			{ffC_10000,"fC (QIE8)"},
-			{fQIE8fC_1000_50,"fC"},
-			{fQIE10fC_2000,"fC"},
-			{fQIE10fC_10000,"fC"},
-			{fQIE10fC_400000,"fC"},
-			{ffC_generic_10000,"fC (QIE8/10/11)"},
-			{ffC_generic_400000,"fC (QIE8/10/11)"},			
-			{fTiming_TS,"Timing"},
-			{fTiming_TS200,"Timing"},
-			{fLS,"LS"},
-			{fEt_256,"Et"},
-			{fEt_128,"Et"},
-			{fFG,"FG"},
-			{fRatio,"Ratio"},
-			{fDigiSize,"DigiSize"},
-			{fAroundZero,"Q"},
-			{fRatio2,"Ratio"},
-			{fdEtRatio,"dEtRatio"},
-			{fSumdEt,"SumdEt"},
-			{fTiming_100TS,"Timing"},
-			{fQIE10TDC_64,"TDC"},
-			{fQIE10TDC_16,"TDC"},
-			{fDiffAbs,"Q"},
-			{fRatio_0to2,"Ratio"},
-			{fN_to8000,"N"},
-			{fEnergyTotal,"Energy"},
-			{fN_m0to10000,"N"},
-			{fEtCorr_256,"Et"},
-			{fADCCorr_128,"ADC"},
-			{fBX,"BX"},
-			{fEnergy_1TeV,"Energy"},
-			{fState,"State"},
-			{fDataSize,"FED Data Size (kB)"},
-			{fTime_ns_250,"Time (ns)"},
-			{fDualAnodeAsymmetry, "(q_{1}-q_{2})/(q_{1}+q_{2})"},
-			{fTimingRatio, "q_{SOI+1}/q_{SOI}"},
-			{fQIE10fC_100000Coarse,"fC"},
-			{fBadTDC, "TDC"},
-			{fRBX, "RBX"},
-			{fTimingDiff_ns, "#Delta timing [ns]"},
-			{ffC_1000000, "fC"},
-			{fTime_ns_250_coarse, "Time (ns)"},
-			{fCapidMinusBXmod4, "(CapId - BX) % 4"},
-			{fBX_36, "BX"},
-			{fADC_256_4, "ADC"},
-		};
-		const std::map<ValueQuantityType, double> min_value = {
-			{fN,-0.05},
-			{fEvents,0},
-			{fEnergy,0},
-			{fTiming_ns,-50},
-			{fADC_128,-0.5},
-			{fADC_5,-0.5},
-			{fADC_15,-0.5},
-			{ffC_10000,0},
-			{ffC_1000,0},
-			{ffC_3000,0},
-			{fTiming_TS,-0.5},
-			{fTiming_TS200,-0.5},
-			{fLS,0.5},
-			{fEt_256,0},
-			{fEt_128,0},
-			{fFG,0},
-			{fRatio,0},
-			{fDigiSize,-0.5},
-			{fAroundZero,-1},
-			{fRatio2,0.5},
-			{fdEtRatio,0},
-			{fSumdEt,0},
-			{fTiming_100TS,-0.5},
-			{fQIE10ADC_256,-0.5},
-			{fQIE10ADC_16,-0.5},
-			{fQIE10TDC_64,-0.5},
-			{fQIE10TDC_16,-0.5},
-			{fDiffAbs,0},
-			{fRatio_0to2,0},
-			{fN_to8000,0},
-			{fEnergyTotal,0},
-			{fN_m0to10000,-0.05},
-			{fEtCorr_256,-1},
-			{fADCCorr_128,-2},
-			{fBX,-0.5},
-			{fEnergy_1TeV,0},
-			{fState,flag::fNA},
-			{fQIE10fC_400000,0},
-			{fDataSize,0},
-			{fQIE10fC_2000,0},
-			{fQIE10fC_10000,0},
-			{fQIE8fC_1000_50,0},
-			{fTime_ns_250,-0.5},
-			{fADC_256,-0.5},
-			{ffC_generic_10000,0.},
-			{ffC_generic_400000,0.},	
-			{fDualAnodeAsymmetry,-1.},	
-			{fTimingRatio,0.},	
-			{fQIE10fC_100000Coarse,0},
-			{fBadTDC,49.5},
-			{fRBX, 0.5},
-			{fTimingDiff_ns, -125.},
-			{ffC_1000000,0.},
-			{fTime_ns_250_coarse, -0.5},
-			{fCapidMinusBXmod4, -0.5},	
-			{fBX_36, -0.5},
-			{fADC_256_4, -0.5},
-		};
-		const std::map<ValueQuantityType, double> max_value = {
-			{fN,1000},
-			{fEvents,1000},
-			{fEnergy,200},
-			{fTiming_ns,50},
-			{fADC_128,127.5},
-			{fADC_5,5},
-			{fADC_15,15},
-			{ffC_10000,10000},
-			{ffC_1000,1000},
-			{ffC_3000,3000},
-			{fTiming_TS,9.5},
-			{fTiming_TS200,9.5},
-			{fLS,4000.5},
-			{fEt_256,255.5},
-			{fEt_128,255.5},
-			{fFG,2},
-			{fRatio,1},
-			{fDigiSize,20.5},
-			{fAroundZero,1},
-			{fRatio2,1.5},
-			{fdEtRatio,1},
-			{fSumdEt,1000},
-			{fTiming_100TS,99.5},
-			{fQIE10ADC_256,255.5},
-			{fQIE10ADC_16,15.5},
-			{fQIE10TDC_64,63.5},
-			{fQIE10TDC_16,15.5},
-			{fDiffAbs,1},
-			{fRatio_0to2,2},
-			{fN_to8000,8000},
-			{fEnergyTotal,100000},
-			{fN_m0to10000,10000},
-			{fEtCorr_256,257},
-			{fADCCorr_128,128},
-			{fBX,3600.5},
-			{fEnergy_1TeV,1000},
-			{fState,flag::nState},
-			{fQIE10fC_400000,400000},
-			{fDataSize,100},
-			{fQIE10fC_2000,2000},
-			{fQIE10fC_10000,10000},
-			{fQIE8fC_1000_50,1000},
-			{fTime_ns_250,249.5},
-			{fADC_256,255.5},
-			{ffC_generic_10000,10000},
-			{ffC_generic_400000,400000},	
-			{fDualAnodeAsymmetry,1.},
-			{fTimingRatio,2.5},	
-			{fQIE10fC_100000Coarse,100000},
-			{fBadTDC,61.5},
-			{fRBX, 18.5},
-			{fTimingDiff_ns, 125.},
-			{ffC_1000000,1.e6},
-			{fTime_ns_250_coarse, 249.5},
-			{fCapidMinusBXmod4, 3.5},
-			{fBX_36, 3564.-0.5},
-			{fADC_256_4, 255},
-		};
-		const std::map<ValueQuantityType, int> nbins_value = {
-			{fN,200},
-			{fEvents,200},
-			{fEnergy,100},
-			{fTiming_ns,200},
-			{fADC_128,128},
-			{fADC_5,100},
-			{fADC_15,300},
-			{ffC_10000,1000},
-			{ffC_1000,200},
-			{ffC_3000,600},
-			{fTiming_TS,10},
-			{fTiming_TS200,200},
-			{fLS,4000},
-			{fEt_256,256},
-			{fEt_128,128},
-			{fFG,2},
-			{fRatio,100},
-			{fDigiSize,21},
-			{fAroundZero,100},
-			{fRatio2,100},
-			{fdEtRatio,100},
-			{fSumdEt,100},
-			{fTiming_100TS,100},
-			{fQIE10ADC_256,256},
-			{fQIE10TDC_64,64},
-			{fQIE10TDC_16,16},
-			{fDiffAbs,200},
-			{fRatio_0to2,100},
-			{fN_to8000,8000},
-			{fEnergyTotal,500},
-			{fN_m0to10000,100},
-			{fEtCorr_256,258},
-			{fADCCorr_128,130},
-			{fBX,3601},
-			{fEnergy_1TeV,200},
-			{fState,flag::nState},
-			{fQIE10fC_400000,1000},
-			{fDataSize,100},
-			{fQIE10fC_2000,100},
-			{fQIE10fC_10000,500},
-			{fQIE8fC_1000_50,50},
-			{fTime_ns_250,250},
-			{fADC_256,256},
-			{ffC_generic_10000,10000},
-			{ffC_generic_400000,10000},	
-			{fDualAnodeAsymmetry,40},
-			{fTimingRatio,50},
-			{fQIE10fC_100000Coarse,1000},
-			{fBadTDC,12},
-			{fRBX, 18},
-			{fTimingDiff_ns, 40},
-			{ffC_1000000,1000},
-			{fTime_ns_250_coarse, 100},
-			{fCapidMinusBXmod4, 4},
-			{fBX_36, 99},
-			{fADC_256_4, 64},
-		};
-		class ValueQuantity : public Quantity
-		{
-			public:
-				ValueQuantity() : _type() {}
-				ValueQuantity(ValueQuantityType type, bool isLog=false) :
-					Quantity(name_value.at(type), isLog), _type(type)
-				{}
-				~ValueQuantity() override {}
-
-				ValueQuantity* makeCopy() override
-				{return new ValueQuantity(_type, _isLog);}
-
-				//	get Value to be overriden
-				int getValue(int x) override
-				{
-					int ret_x = x;
-					if (_showOverflow) {
-						if (x < min()) {
-							ret_x = min();
-						} else if (x > max()) {
-							ret_x = max();
-						}
-					}
-					return ret_x;
-				}
-				double getValue(double x) override
-				{
-					double ret_x = x;
-					if (_showOverflow) {
-						if (x < min()) {
-							ret_x = min();
-						} else if (x > max()) {
-							ret_x = max();
-						}
-					}
-					return ret_x;
-				}
-
-				//	standard properties
-				QuantityType type() override {return fValueQuantity;}
-				int nbins() override {return nbins_value.at(_type);}
-				double min() override {return min_value.at(_type);}
-				double max() override {return max_value.at(_type);}
-
-				void setBits(TH1* o) override
-				{Quantity::setBits(o);setLS(o);}
-				virtual void setLS(TH1* o)
-				{
-					if (_type==fLS)
-					{
-						//	for LS axis - set the bit
-						//	set extendable axes.
-						o->SetBit(BIT(constants::BIT_OFFSET+constants::BIT_AXIS_LS));
-		//				o->SetCanExtend(TH1::kXaxis);
-					}
-				}
-
-			protected:
-				ValueQuantityType _type;
-		};
-
-		class FlagQuantity : public ValueQuantity
-		{
-			public:
-				FlagQuantity() {}
-				FlagQuantity(std::vector<flag::Flag> const& flags) :
-					_flags(flags) {}
-				~FlagQuantity() override {}
-				
-				FlagQuantity* makeCopy() override
-				{return new FlagQuantity(_flags);}
-
-				std::string name() override {return "Flag";}
-				int nbins() override {return _flags.size();}
-				double min() override {return 0;}
-				double max() override {return _flags.size();}
-				int getValue(int f) override {return f;}
-				uint32_t getBin(int f) override {return f+1;}
-				std::vector<std::string> getLabels() override
-				{
-					std::vector<std::string> vnames;
-					for (std::vector<flag::Flag>::const_iterator
-						it=_flags.begin(); it!=_flags.end(); ++it)
-						vnames.push_back(it->_name);
-
-					return vnames;
-				}
-			protected:
-
-				std::vector<flag::Flag> _flags;
-		};
-
-		class LumiSection : public ValueQuantity
-		{
-			public:
-				LumiSection() : ValueQuantity(fLS), _n(4000) {}
-				LumiSection(int n) : ValueQuantity(fLS), _n(n) {}
-				~LumiSection() override {}
-				
-				LumiSection* makeCopy() override
-				{return new LumiSection(_n);}
-
-				std::string name() override {return "LS";}
-				int nbins() override {return _n;}
-				double min() override {return 1;}
-				double max() override {return _n+1;}
-				int getValue(int l) override {
-					return l;
-				}
-				uint32_t getBin(int l) override 
-				{return getValue(l);}
-				void setMax(double x) override {_n=x;}
-
-			protected:
-				int _n;
-		};
-
-		/**
-		 * Coarse LumiSection axis. Specify binning (default=10 LS)
-		 */
-		class LumiSectionCoarse : public ValueQuantity
-		{
-			public:
-				LumiSectionCoarse() : ValueQuantity(fLS), _n(4000), _binning(10)
-				{}
-				LumiSectionCoarse(int n, int binning) : ValueQuantity(fLS), 
-					_n(n), _binning(binning)
-				{}
-				~LumiSectionCoarse() override {}
-				
-				LumiSectionCoarse* makeCopy() override
-				{return new LumiSectionCoarse(_n, _binning);}
-
-				std::string name() override {return "LS";}
-				int nbins() override {return (_n + _binning - 1) / _binning;}
-				double min() override {return 1;}
-				double max() override {return _n+1;}
-				int getValue(int l) override {return l;}
-				uint32_t getBin(int l) override 
-				{
-					return (l + _binning - 1) / _binning;
-				}
-				void setMax(double x) override {_n=x;}
-
-			protected:
-				int _n;
-				int _binning;
-		};
-
-		class RunNumber : public ValueQuantity
-		{
-			public:
-				RunNumber() {}
-				RunNumber(std::vector<int> runs) :
-					_runs(runs)
-				{}
-				~RunNumber() override {}
-
-				std::string name() override {return "Run";}
-				int nbins() override {return _runs.size();}
-				double min() override {return 0;}
-				double max() override {return _runs.size();}
-				std::vector<std::string> getLabels() override
-				{
-					char name[10];
-					std::vector<std::string> labels;
-					for (uint32_t i=0; i<_runs.size(); i++)
-					{
-						sprintf(name, "%d", _runs[i]);
-						labels.push_back(name);
-					}
-					return labels;
-				}
-				int getValue(int run) override
-				{
-					int ir = -1;
-					for (uint32_t i=0; i<_runs.size(); i++)
-						if (_runs[i]==run)
-						{
-							ir = (int)i;
-							break;
-						}
-
-					if (ir==-1)
-						throw cms::Exception("HCALDQM")
-							<< "run number doens't exist " << run; 
-
-					return ir;
-				}
-
-				uint32_t getBin(int run) override
-				{
-					return (this->getValue(run)+1);
-				}
-
-			protected:
-				std::vector<int> _runs;
-		};
-
-		class EventNumber : public ValueQuantity
-		{
-			public:
-				EventNumber() {}
-				EventNumber(int nevents) :
-					ValueQuantity(fN), _nevents(nevents)
-				{}
-				~EventNumber() override {}
-
-				std::string name() override {return "Event";}
-				int nbins() override {return _nevents;}
-				double min() override {return 0.5;}
-				double max() override {return _nevents+0.5;}
-
-			protected:
-				int _nevents;
-		};
-
-		class EventType : public ValueQuantity
-		{
-			public:
-				EventType() {}
-				EventType(std::vector<uint32_t> const& vtypes):
-					ValueQuantity(fN)
-				{this->setup(vtypes);}
-				~EventType() override {}
-
-				virtual void setup(std::vector<uint32_t> const& vtypes)
-				{
-					std::cout << "SIZE = " << vtypes.size() << std::endl;
-					for (uint32_t i=0; i<vtypes.size(); i++)
-						_types.insert(std::make_pair((uint32_t)vtypes[i], i));
-				}
-				int getValue(int v) override
-				{
-					return _types[(uint32_t)v];
-				}
-				uint32_t getBin(int v) override
-				{
-					return getValue(v)+1;
-				}
-
-				int nbins() override {return _types.size();}
-				double min() override {return 0;}
-				double max() override {return _types.size();}
-				std::string name() override {return "Event Type";}
-
-			protected:
-				typedef boost::unordered_map<uint32_t, int> TypeMap;
-				TypeMap _types;
-
-			public:
-				std::vector<std::string> getLabels() override
-				{
-					std::vector<std::string> labels(_types.size());
-					std::cout << "SIZE = " << _types.size() << std::endl;
-					for(auto const& v : _types)
-					{
-						labels[v.second] = utilities::ogtype2string((constants::OrbitGapType)v.first);
-					}
-					return labels;
-				}
-				EventType* makeCopy() override
-				{
-					std::vector<uint32_t> vtypes;
-					for(auto const& p : _types)
-					{
-						vtypes.push_back(p.first);
-					}
-
-					std::sort(vtypes.begin(), vtypes.end());
-					return new EventType(vtypes);
-				}
-		};
-	}
-}
+namespace hcaldqm {
+  namespace quantity {
+    enum ValueQuantityType {
+      fN = 0,
+      fEvents = 1,
+      fEnergy = 2,
+      fTiming_ns = 3,
+      fADC_128 = 4,
+      fADC_5 = 5,
+      fADC_15 = 6,
+      ffC_10000 = 7,
+      ffC_1000 = 8,
+      ffC_3000 = 9,
+      fTiming_TS = 10,
+      fTiming_TS200 = 11,
+      fLS = 12,
+      fEt_256 = 13,
+      fEt_128 = 14,
+      fFG = 15,
+      fRatio = 16,
+      fDigiSize = 17,
+      fAroundZero = 18,
+      fRatio2 = 19,
+      fdEtRatio = 20,
+      fSumdEt = 21,
+      fTiming_100TS = 22,
+      fQIE10ADC_256 = 23,
+      fQIE10TDC_64 = 24,
+      fQIE10TDC_16 = 25,
+      fDiffAbs = 26,
+      fRatio_0to2 = 27,
+      fN_to8000 = 28,
+      fEnergyTotal = 29,
+      fN_m0to10000 = 30,
+      fEtCorr_256 = 31,
+      fADCCorr_128 = 32,
+      fBX = 33,
+      fEnergy_1TeV = 34,
+      fState = 35,
+      fQIE10fC_400000 = 36,
+      fDataSize = 37,
+      fQIE10fC_2000 = 38,
+      fQIE10fC_10000 = 39,
+      fQIE8fC_1000_50 = 40,
+      fTime_ns_250 = 41,
+      fADC_256 = 42,
+      ffC_generic_10000 = 43,
+      ffC_generic_400000 = 44,
+      fQIE10ADC_16 = 45,
+      fDualAnodeAsymmetry = 46,
+      fTimingRatio = 47,
+      fQIE10fC_100000Coarse = 48,
+      fBadTDC = 49,
+      fRBX = 50,
+      fTimingDiff_ns = 51,
+      ffC_1000000 = 52,
+      fTime_ns_250_coarse = 53,
+      fCapidMinusBXmod4 = 54,
+      fBX_36 = 55,
+      fADC_256_4 = 56,  // ADC from 0-255, with 4 ADC granularity
+    };
+    const std::map<ValueQuantityType, std::string> name_value = {
+        {fN, "N"},
+        {fEvents, "Events"},
+        {fEnergy, "Energy"},
+        {fTiming_ns, "Timing"},
+        {fADC_5, "ADC (QIE8)"},
+        {fADC_15, "ADC (QIE8)"},
+        {fADC_128, "ADC (QIE8)"},
+        {fADC_256, "ADC"},
+        {fQIE10ADC_256, "ADC (QIE10/11)"},
+        {fQIE10ADC_16, "ADC (QIE10/11)"},
+        {ffC_1000, "fC (QIE8)"},
+        {ffC_3000, "fC (QIE8)"},
+        {ffC_10000, "fC (QIE8)"},
+        {fQIE8fC_1000_50, "fC"},
+        {fQIE10fC_2000, "fC"},
+        {fQIE10fC_10000, "fC"},
+        {fQIE10fC_400000, "fC"},
+        {ffC_generic_10000, "fC (QIE8/10/11)"},
+        {ffC_generic_400000, "fC (QIE8/10/11)"},
+        {fTiming_TS, "Timing"},
+        {fTiming_TS200, "Timing"},
+        {fLS, "LS"},
+        {fEt_256, "Et"},
+        {fEt_128, "Et"},
+        {fFG, "FG"},
+        {fRatio, "Ratio"},
+        {fDigiSize, "DigiSize"},
+        {fAroundZero, "Q"},
+        {fRatio2, "Ratio"},
+        {fdEtRatio, "dEtRatio"},
+        {fSumdEt, "SumdEt"},
+        {fTiming_100TS, "Timing"},
+        {fQIE10TDC_64, "TDC"},
+        {fQIE10TDC_16, "TDC"},
+        {fDiffAbs, "Q"},
+        {fRatio_0to2, "Ratio"},
+        {fN_to8000, "N"},
+        {fEnergyTotal, "Energy"},
+        {fN_m0to10000, "N"},
+        {fEtCorr_256, "Et"},
+        {fADCCorr_128, "ADC"},
+        {fBX, "BX"},
+        {fEnergy_1TeV, "Energy"},
+        {fState, "State"},
+        {fDataSize, "FED Data Size (kB)"},
+        {fTime_ns_250, "Time (ns)"},
+        {fDualAnodeAsymmetry, "(q_{1}-q_{2})/(q_{1}+q_{2})"},
+        {fTimingRatio, "q_{SOI+1}/q_{SOI}"},
+        {fQIE10fC_100000Coarse, "fC"},
+        {fBadTDC, "TDC"},
+        {fRBX, "RBX"},
+        {fTimingDiff_ns, "#Delta timing [ns]"},
+        {ffC_1000000, "fC"},
+        {fTime_ns_250_coarse, "Time (ns)"},
+        {fCapidMinusBXmod4, "(CapId - BX) % 4"},
+        {fBX_36, "BX"},
+        {fADC_256_4, "ADC"},
+    };
+    const std::map<ValueQuantityType, double> min_value = {
+        {fN, -0.05},
+        {fEvents, 0},
+        {fEnergy, 0},
+        {fTiming_ns, -50},
+        {fADC_128, -0.5},
+        {fADC_5, -0.5},
+        {fADC_15, -0.5},
+        {ffC_10000, 0},
+        {ffC_1000, 0},
+        {ffC_3000, 0},
+        {fTiming_TS, -0.5},
+        {fTiming_TS200, -0.5},
+        {fLS, 0.5},
+        {fEt_256, 0},
+        {fEt_128, 0},
+        {fFG, 0},
+        {fRatio, 0},
+        {fDigiSize, -0.5},
+        {fAroundZero, -1},
+        {fRatio2, 0.5},
+        {fdEtRatio, 0},
+        {fSumdEt, 0},
+        {fTiming_100TS, -0.5},
+        {fQIE10ADC_256, -0.5},
+        {fQIE10ADC_16, -0.5},
+        {fQIE10TDC_64, -0.5},
+        {fQIE10TDC_16, -0.5},
+        {fDiffAbs, 0},
+        {fRatio_0to2, 0},
+        {fN_to8000, 0},
+        {fEnergyTotal, 0},
+        {fN_m0to10000, -0.05},
+        {fEtCorr_256, -1},
+        {fADCCorr_128, -2},
+        {fBX, -0.5},
+        {fEnergy_1TeV, 0},
+        {fState, flag::fNA},
+        {fQIE10fC_400000, 0},
+        {fDataSize, 0},
+        {fQIE10fC_2000, 0},
+        {fQIE10fC_10000, 0},
+        {fQIE8fC_1000_50, 0},
+        {fTime_ns_250, -0.5},
+        {fADC_256, -0.5},
+        {ffC_generic_10000, 0.},
+        {ffC_generic_400000, 0.},
+        {fDualAnodeAsymmetry, -1.},
+        {fTimingRatio, 0.},
+        {fQIE10fC_100000Coarse, 0},
+        {fBadTDC, 49.5},
+        {fRBX, 0.5},
+        {fTimingDiff_ns, -125.},
+        {ffC_1000000, 0.},
+        {fTime_ns_250_coarse, -0.5},
+        {fCapidMinusBXmod4, -0.5},
+        {fBX_36, -0.5},
+        {fADC_256_4, -0.5},
+    };
+    const std::map<ValueQuantityType, double> max_value = {
+        {fN, 1000},
+        {fEvents, 1000},
+        {fEnergy, 200},
+        {fTiming_ns, 50},
+        {fADC_128, 127.5},
+        {fADC_5, 5},
+        {fADC_15, 15},
+        {ffC_10000, 10000},
+        {ffC_1000, 1000},
+        {ffC_3000, 3000},
+        {fTiming_TS, 9.5},
+        {fTiming_TS200, 9.5},
+        {fLS, 4000.5},
+        {fEt_256, 255.5},
+        {fEt_128, 255.5},
+        {fFG, 2},
+        {fRatio, 1},
+        {fDigiSize, 20.5},
+        {fAroundZero, 1},
+        {fRatio2, 1.5},
+        {fdEtRatio, 1},
+        {fSumdEt, 1000},
+        {fTiming_100TS, 99.5},
+        {fQIE10ADC_256, 255.5},
+        {fQIE10ADC_16, 15.5},
+        {fQIE10TDC_64, 63.5},
+        {fQIE10TDC_16, 15.5},
+        {fDiffAbs, 1},
+        {fRatio_0to2, 2},
+        {fN_to8000, 8000},
+        {fEnergyTotal, 100000},
+        {fN_m0to10000, 10000},
+        {fEtCorr_256, 257},
+        {fADCCorr_128, 128},
+        {fBX, 3600.5},
+        {fEnergy_1TeV, 1000},
+        {fState, flag::nState},
+        {fQIE10fC_400000, 400000},
+        {fDataSize, 100},
+        {fQIE10fC_2000, 2000},
+        {fQIE10fC_10000, 10000},
+        {fQIE8fC_1000_50, 1000},
+        {fTime_ns_250, 249.5},
+        {fADC_256, 255.5},
+        {ffC_generic_10000, 10000},
+        {ffC_generic_400000, 400000},
+        {fDualAnodeAsymmetry, 1.},
+        {fTimingRatio, 2.5},
+        {fQIE10fC_100000Coarse, 100000},
+        {fBadTDC, 61.5},
+        {fRBX, 18.5},
+        {fTimingDiff_ns, 125.},
+        {ffC_1000000, 1.e6},
+        {fTime_ns_250_coarse, 249.5},
+        {fCapidMinusBXmod4, 3.5},
+        {fBX_36, 3564. - 0.5},
+        {fADC_256_4, 255},
+    };
+    const std::map<ValueQuantityType, int> nbins_value = {
+        {fN, 200},
+        {fEvents, 200},
+        {fEnergy, 100},
+        {fTiming_ns, 200},
+        {fADC_128, 128},
+        {fADC_5, 100},
+        {fADC_15, 300},
+        {ffC_10000, 1000},
+        {ffC_1000, 200},
+        {ffC_3000, 600},
+        {fTiming_TS, 10},
+        {fTiming_TS200, 200},
+        {fLS, 4000},
+        {fEt_256, 256},
+        {fEt_128, 128},
+        {fFG, 2},
+        {fRatio, 100},
+        {fDigiSize, 21},
+        {fAroundZero, 100},
+        {fRatio2, 100},
+        {fdEtRatio, 100},
+        {fSumdEt, 100},
+        {fTiming_100TS, 100},
+        {fQIE10ADC_256, 256},
+        {fQIE10TDC_64, 64},
+        {fQIE10TDC_16, 16},
+        {fDiffAbs, 200},
+        {fRatio_0to2, 100},
+        {fN_to8000, 8000},
+        {fEnergyTotal, 500},
+        {fN_m0to10000, 100},
+        {fEtCorr_256, 258},
+        {fADCCorr_128, 130},
+        {fBX, 3601},
+        {fEnergy_1TeV, 200},
+        {fState, flag::nState},
+        {fQIE10fC_400000, 1000},
+        {fDataSize, 100},
+        {fQIE10fC_2000, 100},
+        {fQIE10fC_10000, 500},
+        {fQIE8fC_1000_50, 50},
+        {fTime_ns_250, 250},
+        {fADC_256, 256},
+        {ffC_generic_10000, 10000},
+        {ffC_generic_400000, 10000},
+        {fDualAnodeAsymmetry, 40},
+        {fTimingRatio, 50},
+        {fQIE10fC_100000Coarse, 1000},
+        {fBadTDC, 12},
+        {fRBX, 18},
+        {fTimingDiff_ns, 40},
+        {ffC_1000000, 1000},
+        {fTime_ns_250_coarse, 100},
+        {fCapidMinusBXmod4, 4},
+        {fBX_36, 99},
+        {fADC_256_4, 64},
+    };
+    class ValueQuantity : public Quantity {
+    public:
+      ValueQuantity() : _type() {}
+      ValueQuantity(ValueQuantityType type, bool isLog = false) : Quantity(name_value.at(type), isLog), _type(type) {}
+      ~ValueQuantity() override {}
+
+      ValueQuantity *makeCopy() override { return new ValueQuantity(_type, _isLog); }
+
+      //	get Value to be overriden
+      int getValue(int x) override {
+        int ret_x = x;
+        if (_showOverflow) {
+          if (x < min()) {
+            ret_x = min();
+          } else if (x > max()) {
+            ret_x = max();
+          }
+        }
+        return ret_x;
+      }
+      double getValue(double x) override {
+        double ret_x = x;
+        if (_showOverflow) {
+          if (x < min()) {
+            ret_x = min();
+          } else if (x > max()) {
+            ret_x = max();
+          }
+        }
+        return ret_x;
+      }
+
+      //	standard properties
+      QuantityType type() override { return fValueQuantity; }
+      int nbins() override { return nbins_value.at(_type); }
+      double min() override { return min_value.at(_type); }
+      double max() override { return max_value.at(_type); }
+
+      void setBits(TH1 *o) override {
+        Quantity::setBits(o);
+        setLS(o);
+      }
+      virtual void setLS(TH1 *o) {
+        if (_type == fLS) {
+          //	for LS axis - set the bit
+          //	set extendable axes.
+          o->SetBit(BIT(constants::BIT_OFFSET + constants::BIT_AXIS_LS));
+          //				o->SetCanExtend(TH1::kXaxis);
+        }
+      }
+
+    protected:
+      ValueQuantityType _type;
+    };
+
+    class FlagQuantity : public ValueQuantity {
+    public:
+      FlagQuantity() {}
+      FlagQuantity(std::vector<flag::Flag> const &flags) : _flags(flags) {}
+      ~FlagQuantity() override {}
+
+      FlagQuantity *makeCopy() override { return new FlagQuantity(_flags); }
+
+      std::string name() override { return "Flag"; }
+      int nbins() override { return _flags.size(); }
+      double min() override { return 0; }
+      double max() override { return _flags.size(); }
+      int getValue(int f) override { return f; }
+      uint32_t getBin(int f) override { return f + 1; }
+      std::vector<std::string> getLabels() override {
+        std::vector<std::string> vnames;
+        for (std::vector<flag::Flag>::const_iterator it = _flags.begin(); it != _flags.end(); ++it)
+          vnames.push_back(it->_name);
+
+        return vnames;
+      }
+
+    protected:
+      std::vector<flag::Flag> _flags;
+    };
+
+    class LumiSection : public ValueQuantity {
+    public:
+      LumiSection() : ValueQuantity(fLS), _n(4000) {}
+      LumiSection(int n) : ValueQuantity(fLS), _n(n) {}
+      ~LumiSection() override {}
+
+      LumiSection *makeCopy() override { return new LumiSection(_n); }
+
+      std::string name() override { return "LS"; }
+      int nbins() override { return _n; }
+      double min() override { return 1; }
+      double max() override { return _n + 1; }
+      int getValue(int l) override { return l; }
+      uint32_t getBin(int l) override { return getValue(l); }
+      void setMax(double x) override { _n = x; }
+
+    protected:
+      int _n;
+    };
+
+    /**
+ * Coarse LumiSection axis. Specify binning (default=10 LS)
+ */
+    class LumiSectionCoarse : public ValueQuantity {
+    public:
+      LumiSectionCoarse() : ValueQuantity(fLS), _n(4000), _binning(10) {}
+      LumiSectionCoarse(int n, int binning) : ValueQuantity(fLS), _n(n), _binning(binning) {}
+      ~LumiSectionCoarse() override {}
+
+      LumiSectionCoarse *makeCopy() override { return new LumiSectionCoarse(_n, _binning); }
+
+      std::string name() override { return "LS"; }
+      int nbins() override { return (_n + _binning - 1) / _binning; }
+      double min() override { return 1; }
+      double max() override { return _n + 1; }
+      int getValue(int l) override { return l; }
+      uint32_t getBin(int l) override { return (l + _binning - 1) / _binning; }
+      void setMax(double x) override { _n = x; }
+
+    protected:
+      int _n;
+      int _binning;
+    };
+
+    class RunNumber : public ValueQuantity {
+    public:
+      RunNumber() {}
+      RunNumber(std::vector<int> runs) : _runs(runs) {}
+      ~RunNumber() override {}
+
+      std::string name() override { return "Run"; }
+      int nbins() override { return _runs.size(); }
+      double min() override { return 0; }
+      double max() override { return _runs.size(); }
+      std::vector<std::string> getLabels() override {
+        char name[10];
+        std::vector<std::string> labels;
+        for (uint32_t i = 0; i < _runs.size(); i++) {
+          sprintf(name, "%d", _runs[i]);
+          labels.push_back(name);
+        }
+        return labels;
+      }
+      int getValue(int run) override {
+        int ir = -1;
+        for (uint32_t i = 0; i < _runs.size(); i++)
+          if (_runs[i] == run) {
+            ir = (int)i;
+            break;
+          }
+
+        if (ir == -1)
+          throw cms::Exception("HCALDQM") << "run number doens't exist " << run;
+
+        return ir;
+      }
+
+      uint32_t getBin(int run) override { return (this->getValue(run) + 1); }
+
+    protected:
+      std::vector<int> _runs;
+    };
+
+    class EventNumber : public ValueQuantity {
+    public:
+      EventNumber() {}
+      EventNumber(int nevents) : ValueQuantity(fN), _nevents(nevents) {}
+      ~EventNumber() override {}
+
+      std::string name() override { return "Event"; }
+      int nbins() override { return _nevents; }
+      double min() override { return 0.5; }
+      double max() override { return _nevents + 0.5; }
+
+    protected:
+      int _nevents;
+    };
+
+    class EventType : public ValueQuantity {
+    public:
+      EventType() {}
+      EventType(std::vector<uint32_t> const &vtypes) : ValueQuantity(fN) { this->setup(vtypes); }
+      ~EventType() override {}
+
+      virtual void setup(std::vector<uint32_t> const &vtypes) {
+        std::cout << "SIZE = " << vtypes.size() << std::endl;
+        for (uint32_t i = 0; i < vtypes.size(); i++)
+          _types.insert(std::make_pair((uint32_t)vtypes[i], i));
+      }
+      int getValue(int v) override { return _types[(uint32_t)v]; }
+      uint32_t getBin(int v) override { return getValue(v) + 1; }
+
+      int nbins() override { return _types.size(); }
+      double min() override { return 0; }
+      double max() override { return _types.size(); }
+      std::string name() override { return "Event Type"; }
+
+    protected:
+      typedef boost::unordered_map<uint32_t, int> TypeMap;
+      TypeMap _types;
+
+    public:
+      std::vector<std::string> getLabels() override {
+        std::vector<std::string> labels(_types.size());
+        std::cout << "SIZE = " << _types.size() << std::endl;
+        for (auto const &v : _types) {
+          labels[v.second] = utilities::ogtype2string((constants::OrbitGapType)v.first);
+        }
+        return labels;
+      }
+      EventType *makeCopy() override {
+        std::vector<uint32_t> vtypes;
+        for (auto const &p : _types) {
+          vtypes.push_back(p.first);
+        }
+
+        std::sort(vtypes.begin(), vtypes.end());
+        return new EventType(vtypes);
+      }
+    };
+  }  // namespace quantity
+}  // namespace hcaldqm
 
 #endif
diff --git a/DQM/HcalCommon/src/Container1D.cc b/DQM/HcalCommon/src/Container1D.cc
index f9011d4b2f417..bbcc7c6d52642 100644
--- a/DQM/HcalCommon/src/Container1D.cc
+++ b/DQM/HcalCommon/src/Container1D.cc
@@ -1,47 +1,41 @@
 #include "DQM/HcalCommon/interface/Container1D.h"
 
-namespace hcaldqm
-{
+namespace hcaldqm {
   using namespace mapper;
   using namespace constants;
   using namespace quantity;
 
-  Container1D::Container1D():
-    _qx(nullptr), _qy(nullptr)
-  {}
+  Container1D::Container1D() : _qx(nullptr), _qy(nullptr) {}
 
-  Container1D::Container1D(std::string const& folder,
-                           hashfunctions::HashType hashtype, Quantity *qx, Quantity *qy) :
-    Container(folder, qy->name()+"vs"+qx->name()), _hashmap(hashtype),
-    _qx(qx), _qy(qy)
-  {
+  Container1D::Container1D(std::string const &folder, hashfunctions::HashType hashtype, Quantity *qx, Quantity *qy)
+      : Container(folder, qy->name() + "vs" + qx->name()), _hashmap(hashtype), _qx(qx), _qy(qy) {
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
   }
 
-  Container1D::~Container1D()
-  {
-    if (_qx!=nullptr)
+  Container1D::~Container1D() {
+    if (_qx != nullptr)
       delete _qx;
-    if (_qy!=nullptr)
+    if (_qy != nullptr)
       delete _qy;
     _qx = nullptr;
     _qy = nullptr;
   }
 
   /* virtual */ /*void Container1D::release()
-     {
-     BOOST_FOREACH(MEMap::value_type &pair, _mes)
-     {
-     pair.second=NULL;
-     }
-     }*/
-
-  /* virtuial */ void Container1D::initialize(std::string const& folder,
-                                              hashfunctions::HashType hashtype, Quantity *qx, Quantity *qy/* = ... */,
-                                              int debug /* =0 */)
-  {
-    Container::initialize(folder, qy->name()+"vs"+qx->name(), debug);
+   {
+   BOOST_FOREACH(MEMap::value_type &pair, _mes)
+   {
+   pair.second=NULL;
+   }
+   }*/
+
+  /* virtuial */ void Container1D::initialize(std::string const &folder,
+                                              hashfunctions::HashType hashtype,
+                                              Quantity *qx,
+                                              Quantity *qy /* = ... */,
+                                              int debug /* =0 */) {
+    Container::initialize(folder, qy->name() + "vs" + qx->name(), debug);
     _hashmap.initialize(hashtype);
     _qx = qx;
     _qy = qy;
@@ -49,11 +43,12 @@ namespace hcaldqm
     _qy->setAxisType(quantity::fYAxis);
   }
 
-  /* virtuial */ void Container1D::initialize(std::string const& folder,
-                                              std::string const& qname,
-                                              hashfunctions::HashType hashtype, Quantity *qx, Quantity *qy/* = ... */,
-                                              int debug /* =0 */)
-  {
+  /* virtuial */ void Container1D::initialize(std::string const &folder,
+                                              std::string const &qname,
+                                              hashfunctions::HashType hashtype,
+                                              Quantity *qx,
+                                              Quantity *qy /* = ... */,
+                                              int debug /* =0 */) {
     Container::initialize(folder, qname, debug);
     _hashmap.initialize(hashtype);
     _qx = qx;
@@ -62,25 +57,20 @@ namespace hcaldqm
     _qy->setAxisType(quantity::fYAxis);
   }
 
-  /* virtual */ void Container1D::reset()
-  {
-    for(auto const& pair : _mes)
-      {
-        pair.second->Reset();
-      }
+  /* virtual */ void Container1D::reset() {
+    for (auto const &pair : _mes) {
+      pair.second->Reset();
+    }
   }
 
-  /* virtual */ void Container1D::print()
-  {
+  /* virtual */ void Container1D::print() {
     std::cout << "Container by " << _hashmap.getHashTypeName() << std::endl;
-    for(auto const& pair : _mes)
-      {
-        std::cout << std::hex << pair.first << std::dec << std::endl;
-      }
+    for (auto const &pair : _mes) {
+      std::cout << std::hex << pair.first << std::dec << std::endl;
+    }
   }
 
-  /* virtual */ void Container1D::fill(uint32_t hash)
-  {
+  /* virtual */ void Container1D::fill(uint32_t hash) {
     if (_hashmap.isDHash())
       this->fill(HcalDetId(hash));
     else if (_hashmap.isEHash())
@@ -89,8 +79,7 @@ namespace hcaldqm
       this->fill(HcalTrigTowerDetId(hash));
   }
 
-  /* virtual */ void Container1D::fill(uint32_t hash, int x)
-  {
+  /* virtual */ void Container1D::fill(uint32_t hash, int x) {
     if (_hashmap.isDHash())
       this->fill(HcalDetId(hash), x);
     else if (_hashmap.isEHash())
@@ -99,8 +88,7 @@ namespace hcaldqm
       this->fill(HcalTrigTowerDetId(hash), x);
   }
 
-  /* virtual */ void Container1D::fill(uint32_t hash, double x)
-  {
+  /* virtual */ void Container1D::fill(uint32_t hash, double x) {
     if (_hashmap.isDHash())
       this->fill(HcalDetId(hash), x);
     else if (_hashmap.isEHash())
@@ -109,8 +97,7 @@ namespace hcaldqm
       this->fill(HcalTrigTowerDetId(hash), x);
   }
 
-  /* virtual */ void Container1D::fill(uint32_t hash, int x, double y)
-  {
+  /* virtual */ void Container1D::fill(uint32_t hash, int x, double y) {
     if (_hashmap.isDHash())
       this->fill(HcalDetId(hash), x, y);
     else if (_hashmap.isEHash())
@@ -119,8 +106,7 @@ namespace hcaldqm
       this->fill(HcalTrigTowerDetId(hash), x, y);
   }
 
-  /* virtual */ void Container1D::fill(uint32_t hash, int x, int y)
-  {
+  /* virtual */ void Container1D::fill(uint32_t hash, int x, int y) {
     if (_hashmap.isDHash())
       this->fill(HcalDetId(hash), x, y);
     else if (_hashmap.isEHash())
@@ -129,8 +115,7 @@ namespace hcaldqm
       this->fill(HcalTrigTowerDetId(hash), x, y);
   }
 
-  /* virtual */ void Container1D::fill(uint32_t hash, double x, double y)
-  {
+  /* virtual */ void Container1D::fill(uint32_t hash, double x, double y) {
     if (_hashmap.isDHash())
       this->fill(HcalDetId(hash), x, y);
     else if (_hashmap.isEHash())
@@ -140,827 +125,616 @@ namespace hcaldqm
   }
 
   //    by HcalDetId
-  /* virtual */ void Container1D::fill(HcalDetId const& did)
-  {
-    _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did));
-  }
-  /* virtual */ void Container1D::fill(HcalDetId const& did, int x)
-  {
+  /* virtual */ void Container1D::fill(HcalDetId const &did) { _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did)); }
+  /* virtual */ void Container1D::fill(HcalDetId const &did, int x) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
       _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x));
     else
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x));
   }
-  /* virtual */ void Container1D::fill(HcalDetId const& did, double x)
-  {
+  /* virtual */ void Container1D::fill(HcalDetId const &did, double x) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
       _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x));
     else
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x));
   }
-  /* virtual */ void Container1D::fill(HcalDetId const& did, int x, double y)
-  {
+  /* virtual */ void Container1D::fill(HcalDetId const &did, int x, double y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
     else
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
   }
-  /* virtual */ void Container1D::fill(HcalDetId const& did, int x, int y)
-  {
+  /* virtual */ void Container1D::fill(HcalDetId const &did, int x, int y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
     else
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
   }
-  /* virtual */ void Container1D::fill(HcalDetId const& did, double x ,
-                                       double y)
-  {
+  /* virtual */ void Container1D::fill(HcalDetId const &did, double x, double y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
     else
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
   }
 
-  /* virtual */ double Container1D::getBinEntries(HcalDetId const& id)
-  {
+  /* virtual */ double Container1D::getBinEntries(HcalDetId const &id) {
     return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(id));
   }
 
-  /* virtual */ double Container1D::getBinEntries(HcalDetId const& id,
-                                                  int x)
-  {
+  /* virtual */ double Container1D::getBinEntries(HcalDetId const &id, int x) {
     return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x));
   }
 
-  /* virtual */ double Container1D::getBinEntries(HcalDetId const& id,
-                                                  double x)
-  {
+  /* virtual */ double Container1D::getBinEntries(HcalDetId const &id, double x) {
     return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x));
   }
 
-  /* virtual */ double Container1D::getBinContent(HcalDetId const&
-                                                  tid)
-  {
+  /* virtual */ double Container1D::getBinContent(HcalDetId const &tid) {
     return _mes[_hashmap.getHash(tid)]->getBinContent(_qx->getBin(tid));
   }
 
-  /* virtual */ double Container1D::getBinContent(HcalDetId const&
-                                                  tid, int x)
-  {
+  /* virtual */ double Container1D::getBinContent(HcalDetId const &tid, int x) {
     return _mes[_hashmap.getHash(tid)]->getBinContent(_qx->getBin(x));
   }
 
-  /* virtual */ double Container1D::getBinContent(HcalDetId const&
-                                                  tid, double x)
-  {
+  /* virtual */ double Container1D::getBinContent(HcalDetId const &tid, double x) {
     return _mes[_hashmap.getHash(tid)]->getBinContent(_qx->getBin(x));
   }
 
-  /* virtual */ double Container1D::getMean(HcalDetId const& tid, int axis)
-  {
+  /* virtual */ double Container1D::getMean(HcalDetId const &tid, int axis) {
     return _mes[_hashmap.getHash(tid)]->getMean(axis);
   }
 
-  /* virtual */ double Container1D::getRMS(HcalDetId const& id, int axis)
-  {
+  /* virtual */ double Container1D::getRMS(HcalDetId const &id, int axis) {
     return _mes[_hashmap.getHash(id)]->getRMS(axis);
   }
 
   //    setBinContent
-  /* virtual */ void Container1D::setBinContent(HcalDetId const& id,
-                                                int x)
-  {
+  /* virtual */ void Container1D::setBinContent(HcalDetId const &id, int x) {
     _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), x);
   }
-  /* virtual */ void Container1D::setBinContent(HcalDetId const& id,
-                                                double x)
-  {
+  /* virtual */ void Container1D::setBinContent(HcalDetId const &id, double x) {
     _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), x);
   }
-  /* virtual */ void Container1D::setBinContent(HcalDetId const& id,
-                                                int x, int y)
-  {
+  /* virtual */ void Container1D::setBinContent(HcalDetId const &id, int x, int y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), y);
     else
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), x);
   }
-  /* virtual */ void Container1D::setBinContent(HcalDetId const& id,
-                                                int x, double y)
-  {
+  /* virtual */ void Container1D::setBinContent(HcalDetId const &id, int x, double y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), y);
     else
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), x);
   }
-  /* virtual */ void Container1D::setBinContent(HcalDetId const& id,
-                                                double x, int y)
-  {
+  /* virtual */ void Container1D::setBinContent(HcalDetId const &id, double x, int y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), y);
     else
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), x);
   }
-  /* virtual */ void Container1D::setBinContent(HcalDetId const& id,
-                                                double x, double y)
-  {
+  /* virtual */ void Container1D::setBinContent(HcalDetId const &id, double x, double y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), y);
     else
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), x);
   }
 
   //    by HcalElectronicsId
-  /* virtual */ void Container1D::fill(HcalElectronicsId const& did)
-  {
+  /* virtual */ void Container1D::fill(HcalElectronicsId const &did) {
     _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did));
   }
-  /* virtual */ void Container1D::fill(HcalElectronicsId const& did, int x)
-  {
+  /* virtual */ void Container1D::fill(HcalElectronicsId const &did, int x) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
       _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x));
     else
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x));
   }
-  /* virtual */ void Container1D::fill(HcalElectronicsId const& did, double x)
-  {
+  /* virtual */ void Container1D::fill(HcalElectronicsId const &did, double x) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
       _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x));
     else
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x));
   }
-  /* virtual */ void Container1D::fill(HcalElectronicsId const& did,
-                                       int x, double y)
-  {
+  /* virtual */ void Container1D::fill(HcalElectronicsId const &did, int x, double y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
     else
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
   }
-  /* virtual */ void Container1D::fill(HcalElectronicsId const& did,
-                                       int x, int y)
-  {
+  /* virtual */ void Container1D::fill(HcalElectronicsId const &did, int x, int y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
     else
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
   }
-  /* virtual */ void Container1D::fill(HcalElectronicsId const& did,
-                                       double x , double y)
-  {
+  /* virtual */ void Container1D::fill(HcalElectronicsId const &did, double x, double y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
     else
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
   }
 
-  /* virtual */ double Container1D::getBinEntries(HcalElectronicsId const& id)
-  {
+  /* virtual */ double Container1D::getBinEntries(HcalElectronicsId const &id) {
     return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(id));
   }
 
-  /* virtual */ double Container1D::getBinEntries(HcalElectronicsId const& id,
-                                                  int x)
-  {
+  /* virtual */ double Container1D::getBinEntries(HcalElectronicsId const &id, int x) {
     return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x));
   }
 
-  /* virtual */ double Container1D::getBinEntries(HcalElectronicsId const& id,
-                                                  double x)
-  {
+  /* virtual */ double Container1D::getBinEntries(HcalElectronicsId const &id, double x) {
     return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x));
   }
 
-  /* virtual */ double Container1D::getBinContent(HcalElectronicsId const&
-                                                  tid)
-  {
+  /* virtual */ double Container1D::getBinContent(HcalElectronicsId const &tid) {
     return _mes[_hashmap.getHash(tid)]->getBinContent(_qx->getBin(tid));
   }
 
-  /* virtual */ double Container1D::getBinContent(HcalElectronicsId const&
-                                                  tid, int x)
-  {
+  /* virtual */ double Container1D::getBinContent(HcalElectronicsId const &tid, int x) {
     return _mes[_hashmap.getHash(tid)]->getBinContent(_qx->getBin(x));
   }
 
-  /* virtual */ double Container1D::getBinContent(HcalElectronicsId const&
-                                                  tid, double x)
-  {
+  /* virtual */ double Container1D::getBinContent(HcalElectronicsId const &tid, double x) {
     return _mes[_hashmap.getHash(tid)]->getBinContent(_qx->getBin(x));
   }
 
-  /* virtual */ double Container1D::getMean(HcalElectronicsId const& tid,
-                                            int axis)
-  {
+  /* virtual */ double Container1D::getMean(HcalElectronicsId const &tid, int axis) {
     return _mes[_hashmap.getHash(tid)]->getMean(axis);
   }
 
-  /* virtual */ double Container1D::getRMS(HcalElectronicsId const& id,
-                                           int axis)
-  {
+  /* virtual */ double Container1D::getRMS(HcalElectronicsId const &id, int axis) {
     return _mes[_hashmap.getHash(id)]->getRMS(axis);
   }
 
   //    setBinContent
-  /* virtual */ void Container1D::setBinContent(HcalElectronicsId const& id,
-                                                int x)
-  {
+  /* virtual */ void Container1D::setBinContent(HcalElectronicsId const &id, int x) {
     _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), x);
   }
-  /* virtual */ void Container1D::setBinContent(HcalElectronicsId const& id,
-                                                double x)
-  {
+  /* virtual */ void Container1D::setBinContent(HcalElectronicsId const &id, double x) {
     _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), x);
   }
-  /* virtual */ void Container1D::setBinContent(HcalElectronicsId const& id,
-                                                int x, int y)
-  {
+  /* virtual */ void Container1D::setBinContent(HcalElectronicsId const &id, int x, int y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), y);
     else
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), x);
   }
-  /* virtual */ void Container1D::setBinContent(HcalElectronicsId const& id,
-                                                int x, double y)
-  {
+  /* virtual */ void Container1D::setBinContent(HcalElectronicsId const &id, int x, double y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), y);
     else
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), x);
   }
-  /* virtual */ void Container1D::setBinContent(HcalElectronicsId const& id,
-                                                double x, int y)
-  {
+  /* virtual */ void Container1D::setBinContent(HcalElectronicsId const &id, double x, int y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), y);
     else
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), x);
   }
-  /* virtual */ void Container1D::setBinContent(HcalElectronicsId const& id,
-                                                double x, double y)
-  {
+  /* virtual */ void Container1D::setBinContent(HcalElectronicsId const &id, double x, double y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), y);
     else
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), x);
   }
 
   //    by HcaTrigTowerlDetId
-  /* virtual */ void Container1D::fill(HcalTrigTowerDetId const& did)
-  {
+  /* virtual */ void Container1D::fill(HcalTrigTowerDetId const &did) {
     _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did));
   }
-  /* virtual */ void Container1D::fill(HcalTrigTowerDetId const& did, int x)
-  {
+  /* virtual */ void Container1D::fill(HcalTrigTowerDetId const &did, int x) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
       _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x));
     else
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x));
   }
-  /* virtual */ void Container1D::fill(HcalTrigTowerDetId const& did,
-                                       double x)
-  {
+  /* virtual */ void Container1D::fill(HcalTrigTowerDetId const &did, double x) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
       _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x));
     else
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x));
   }
-  /* virtual */ void Container1D::fill(HcalTrigTowerDetId const& did,
-                                       int x, double y)
-  {
+  /* virtual */ void Container1D::fill(HcalTrigTowerDetId const &did, int x, double y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
     else
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
   }
-  /* virtual */ void Container1D::fill(HcalTrigTowerDetId const& did,
-                                       int x, int y)
-  {
+  /* virtual */ void Container1D::fill(HcalTrigTowerDetId const &did, int x, int y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
     else
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
   }
-  /* virtual */ void Container1D::fill(HcalTrigTowerDetId const& did,
-                                       double x, double y)
-  {
+  /* virtual */ void Container1D::fill(HcalTrigTowerDetId const &did, double x, double y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
     else
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
   }
 
-  /* virtual */ double Container1D::getBinEntries(HcalTrigTowerDetId const&
-                                                  id)
-  {
+  /* virtual */ double Container1D::getBinEntries(HcalTrigTowerDetId const &id) {
     return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(id));
   }
 
-  /* virtual */ double Container1D::getBinEntries(HcalTrigTowerDetId const&
-                                                  id, int x)
-  {
+  /* virtual */ double Container1D::getBinEntries(HcalTrigTowerDetId const &id, int x) {
     return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x));
   }
 
-  /* virtual */ double Container1D::getBinEntries(HcalTrigTowerDetId const&
-                                                  id, double x)
-  {
+  /* virtual */ double Container1D::getBinEntries(HcalTrigTowerDetId const &id, double x) {
     return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x));
   }
 
-  /* virtual */ double Container1D::getBinContent(HcalTrigTowerDetId const&
-                                                  tid)
-  {
+  /* virtual */ double Container1D::getBinContent(HcalTrigTowerDetId const &tid) {
     return _mes[_hashmap.getHash(tid)]->getBinContent(_qx->getBin(tid));
   }
 
-  /* virtual */ double Container1D::getBinContent(HcalTrigTowerDetId const&
-                                                  tid, int x)
-  {
+  /* virtual */ double Container1D::getBinContent(HcalTrigTowerDetId const &tid, int x) {
     return _mes[_hashmap.getHash(tid)]->getBinContent(_qx->getBin(x));
   }
 
-  /* virtual */ double Container1D::getBinContent(HcalTrigTowerDetId const&
-                                                  tid, double x)
-  {
+  /* virtual */ double Container1D::getBinContent(HcalTrigTowerDetId const &tid, double x) {
     return _mes[_hashmap.getHash(tid)]->getBinContent(_qx->getBin(x));
   }
 
-  /* virtual */ double Container1D::getMean(HcalTrigTowerDetId const& tid,
-                                            int axis)
-  {
+  /* virtual */ double Container1D::getMean(HcalTrigTowerDetId const &tid, int axis) {
     return _mes[_hashmap.getHash(tid)]->getMean(axis);
   }
 
-  /* virtual */ double Container1D::getRMS(HcalTrigTowerDetId const& id,
-                                           int axis)
-  {
+  /* virtual */ double Container1D::getRMS(HcalTrigTowerDetId const &id, int axis) {
     return _mes[_hashmap.getHash(id)]->getRMS(axis);
   }
 
   //    setBinContent
-  /* virtual */ void Container1D::setBinContent(HcalTrigTowerDetId const& id,
-                                                int x)
-  {
+  /* virtual */ void Container1D::setBinContent(HcalTrigTowerDetId const &id, int x) {
     _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), x);
   }
-  /* virtual */ void Container1D::setBinContent(HcalTrigTowerDetId const& id,
-                                                double x)
-  {
+  /* virtual */ void Container1D::setBinContent(HcalTrigTowerDetId const &id, double x) {
     _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), x);
   }
-  /* virtual */ void Container1D::setBinContent(HcalTrigTowerDetId const& id,
-                                                int x, int y)
-  {
+  /* virtual */ void Container1D::setBinContent(HcalTrigTowerDetId const &id, int x, int y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), y);
     else
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), x);
   }
-  /* virtual */ void Container1D::setBinContent(HcalTrigTowerDetId const& id,
-                                                int x, double y)
-  {
+  /* virtual */ void Container1D::setBinContent(HcalTrigTowerDetId const &id, int x, double y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), y);
     else
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), x);
   }
-  /* virtual */ void Container1D::setBinContent(HcalTrigTowerDetId const& id,
-                                                double x, int y)
-  {
+  /* virtual */ void Container1D::setBinContent(HcalTrigTowerDetId const &id, double x, int y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), y);
     else
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), x);
   }
-  /* virtual */ void Container1D::setBinContent(HcalTrigTowerDetId const& id,
-                                                double x, double y)
-  {
+  /* virtual */ void Container1D::setBinContent(HcalTrigTowerDetId const &id, double x, double y) {
     QuantityType qtype = _qx->type();
-    if (qtype==fValueQuantity || qtype==fFlagQuantity)
+    if (qtype == fValueQuantity || qtype == fFlagQuantity)
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), y);
     else
       _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), x);
   }
 
   //    load w/o a filter
-  /* virtual */ void Container1D::load(DQMStore::IGetter& ig,
-                                       HcalElectronicsMap const* emap, std::string const& subsystem,
-                                       std::string const& aux)
-  {
+  /* virtual */ void Container1D::load(DQMStore::IGetter &ig,
+                                       HcalElectronicsMap const *emap,
+                                       std::string const &subsystem,
+                                       std::string const &aux) {
     //  full path to where all the plots are living
     //  prepend/subsystem/taskname/QxvsQy_auxilary/HashType
     _logger.debug(_hashmap.getHashTypeName());
     std::string path =
-      subsystem+"/"+_folder+"/"+_qname+
-      (aux.empty()?aux:"_"+aux)+"/"+_hashmap.getHashTypeName();
-    _logger.debug("FULLPATH::"+path);
-
-    if (_hashmap.isDHash())
-      {
-        //      for Detector Hashes
-        std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
-        for (std::vector<HcalGenericDetId>::const_iterator it=
-               dids.begin(); it!=dids.end(); ++it)
-          {
-            //  skip trigger towers and calibration
-            if (!it->isHcalDetId())
-              continue;
-
-            HcalDetId did = HcalDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(did);
-            MEMap::iterator mit = _mes.find(hash);
-
-            //  skip this guy, it's already present
-            if (mit!=_mes.end())
-              continue;
-
-            _logger.debug(_hashmap.getName(did));
-            _mes.insert(
-                        std::make_pair(hash,
-                                       ig.get(path+"/"+_hashmap.getName(did))));
-          }
+        subsystem + "/" + _folder + "/" + _qname + (aux.empty() ? aux : "_" + aux) + "/" + _hashmap.getHashTypeName();
+    _logger.debug("FULLPATH::" + path);
+
+    if (_hashmap.isDHash()) {
+      //      for Detector Hashes
+      std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
+      for (std::vector<HcalGenericDetId>::const_iterator it = dids.begin(); it != dids.end(); ++it) {
+        //  skip trigger towers and calibration
+        if (!it->isHcalDetId())
+          continue;
+
+        HcalDetId did = HcalDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(did);
+        MEMap::iterator mit = _mes.find(hash);
+
+        //  skip this guy, it's already present
+        if (mit != _mes.end())
+          continue;
+
+        _logger.debug(_hashmap.getName(did));
+        _mes.insert(std::make_pair(hash, ig.get(path + "/" + _hashmap.getName(did))));
       }
+    }
 
-    else if (_hashmap.isEHash())
-      {
-        //      for Electronics Hashes
-        std::vector<HcalElectronicsId> eids =
-          emap->allElectronicsIdPrecision();
-        for (std::vector<HcalElectronicsId>::const_iterator it=
-               eids.begin(); it!=eids.end(); ++it)
-          {
-            HcalElectronicsId eid = HcalElectronicsId(it->rawId());
-            uint32_t hash = _hashmap.getHash(eid);
-            MEMap::iterator mit = _mes.find(hash);
-
-            //  skip this guy, it's already present
-            if (mit!=_mes.end())
-              continue;
-
-            _logger.debug(_hashmap.getName(eid));
-            _mes.insert(
-                        std::make_pair(hash,
-                                       ig.get(path+"/"+_hashmap.getName(eid))));
-          }
+    else if (_hashmap.isEHash()) {
+      //      for Electronics Hashes
+      std::vector<HcalElectronicsId> eids = emap->allElectronicsIdPrecision();
+      for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+        HcalElectronicsId eid = HcalElectronicsId(it->rawId());
+        uint32_t hash = _hashmap.getHash(eid);
+        MEMap::iterator mit = _mes.find(hash);
+
+        //  skip this guy, it's already present
+        if (mit != _mes.end())
+          continue;
+
+        _logger.debug(_hashmap.getName(eid));
+        _mes.insert(std::make_pair(hash, ig.get(path + "/" + _hashmap.getName(eid))));
       }
-    else if (_hashmap.isTHash())
-      {
-        //      for TrigTower Hashes
-        std::vector<HcalTrigTowerDetId> tids =
-          emap->allTriggerId();
-        for (std::vector<HcalTrigTowerDetId>::const_iterator it=
-               tids.begin(); it!=tids.end(); ++it)
-          {
-            HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(tid);
-            MEMap::iterator mit = _mes.find(hash);
-
-            //  skip if this guy already exists
-            if (mit!=_mes.end())
-              continue;
-
-            _logger.debug(_hashmap.getName(tid));
-            _mes.insert(
-                        std::make_pair(hash,
-                                       ig.get(path+"/"+_hashmap.getName(tid))));
-          }
+    } else if (_hashmap.isTHash()) {
+      //      for TrigTower Hashes
+      std::vector<HcalTrigTowerDetId> tids = emap->allTriggerId();
+      for (std::vector<HcalTrigTowerDetId>::const_iterator it = tids.begin(); it != tids.end(); ++it) {
+        HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(tid);
+        MEMap::iterator mit = _mes.find(hash);
+
+        //  skip if this guy already exists
+        if (mit != _mes.end())
+          continue;
+
+        _logger.debug(_hashmap.getName(tid));
+        _mes.insert(std::make_pair(hash, ig.get(path + "/" + _hashmap.getName(tid))));
       }
+    }
   }
 
   //    load w/ a filter
-  /* virtual */ void Container1D::load(DQMStore::IGetter& ig,
-                                       HcalElectronicsMap const* emap, filter::HashFilter const& filter,
-                                       std::string const& subsystem,
-                                       std::string const& aux)
-  {
+  /* virtual */ void Container1D::load(DQMStore::IGetter &ig,
+                                       HcalElectronicsMap const *emap,
+                                       filter::HashFilter const &filter,
+                                       std::string const &subsystem,
+                                       std::string const &aux) {
     //  full path to where all the plots are living
     //  prepend/subsystem/taskname/QxvsQy_auxilary/HashType
     _logger.debug(_hashmap.getHashTypeName());
     std::string path =
-      subsystem+"/"+_folder+"/"+_qname+
-      (aux.empty()?aux:"_"+aux)+"/"+_hashmap.getHashTypeName();
-    _logger.debug("FULLPATH::"+path);
-
-    if (_hashmap.isDHash())
-      {
-        //      for Detector Hashes
-        std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
-        for (std::vector<HcalGenericDetId>::const_iterator it=
-               dids.begin(); it!=dids.end(); ++it)
-          {
-            //  skip trigger towers and calibration
-            if (!it->isHcalDetId())
-              continue;
-
-            HcalDetId did = HcalDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(did);
-            MEMap::iterator mit = _mes.find(hash);
-
-            //  skip this guy, it's already present
-            if (mit!=_mes.end())
-              continue;
-            //  filter out what's not needed
-            if (filter.filter(did))
-              continue;
-
-            _logger.debug(_hashmap.getName(did));
-            _mes.insert(
-                        std::make_pair(hash,
-                                       ig.get(path+"/"+_hashmap.getName(did))));
-          }
+        subsystem + "/" + _folder + "/" + _qname + (aux.empty() ? aux : "_" + aux) + "/" + _hashmap.getHashTypeName();
+    _logger.debug("FULLPATH::" + path);
+
+    if (_hashmap.isDHash()) {
+      //      for Detector Hashes
+      std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
+      for (std::vector<HcalGenericDetId>::const_iterator it = dids.begin(); it != dids.end(); ++it) {
+        //  skip trigger towers and calibration
+        if (!it->isHcalDetId())
+          continue;
+
+        HcalDetId did = HcalDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(did);
+        MEMap::iterator mit = _mes.find(hash);
+
+        //  skip this guy, it's already present
+        if (mit != _mes.end())
+          continue;
+        //  filter out what's not needed
+        if (filter.filter(did))
+          continue;
+
+        _logger.debug(_hashmap.getName(did));
+        _mes.insert(std::make_pair(hash, ig.get(path + "/" + _hashmap.getName(did))));
       }
+    }
 
-    else if (_hashmap.isEHash())
-      {
-        //      for Electronics Hashes
-        std::vector<HcalElectronicsId> eids =
-          emap->allElectronicsIdPrecision();
-        for (std::vector<HcalElectronicsId>::const_iterator it=
-               eids.begin(); it!=eids.end(); ++it)
-          {
-            HcalElectronicsId eid = HcalElectronicsId(it->rawId());
-            uint32_t hash = _hashmap.getHash(eid);
-            MEMap::iterator mit = _mes.find(hash);
-
-            //  skip this guy, it's already present
-            if (mit!=_mes.end())
-              continue;
-            //  filter out
-            if (filter.filter(eid))
-              continue;
-
-            _logger.debug(_hashmap.getName(eid));
-            _mes.insert(
-                        std::make_pair(hash,
-                                       ig.get(path+"/"+_hashmap.getName(eid))));
-          }
+    else if (_hashmap.isEHash()) {
+      //      for Electronics Hashes
+      std::vector<HcalElectronicsId> eids = emap->allElectronicsIdPrecision();
+      for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+        HcalElectronicsId eid = HcalElectronicsId(it->rawId());
+        uint32_t hash = _hashmap.getHash(eid);
+        MEMap::iterator mit = _mes.find(hash);
+
+        //  skip this guy, it's already present
+        if (mit != _mes.end())
+          continue;
+        //  filter out
+        if (filter.filter(eid))
+          continue;
+
+        _logger.debug(_hashmap.getName(eid));
+        _mes.insert(std::make_pair(hash, ig.get(path + "/" + _hashmap.getName(eid))));
       }
-    else if (_hashmap.isTHash())
-      {
-        //      for TrigTower Hashes
-        std::vector<HcalTrigTowerDetId> tids =
-          emap->allTriggerId();
-        for (std::vector<HcalTrigTowerDetId>::const_iterator it=
-               tids.begin(); it!=tids.end(); ++it)
-          {
-            HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(tid);
-            MEMap::iterator mit = _mes.find(hash);
-
-            //  skip if this guy already exists
-            if (mit!=_mes.end())
-              continue;
-            //   filter out
-            if (filter.filter(tid))
-              continue;
-
-            _logger.debug(_hashmap.getName(tid));
-            _mes.insert(
-                        std::make_pair(hash,
-                                       ig.get(path+"/"+_hashmap.getName(tid))));
-          }
+    } else if (_hashmap.isTHash()) {
+      //      for TrigTower Hashes
+      std::vector<HcalTrigTowerDetId> tids = emap->allTriggerId();
+      for (std::vector<HcalTrigTowerDetId>::const_iterator it = tids.begin(); it != tids.end(); ++it) {
+        HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(tid);
+        MEMap::iterator mit = _mes.find(hash);
+
+        //  skip if this guy already exists
+        if (mit != _mes.end())
+          continue;
+        //   filter out
+        if (filter.filter(tid))
+          continue;
+
+        _logger.debug(_hashmap.getName(tid));
+        _mes.insert(std::make_pair(hash, ig.get(path + "/" + _hashmap.getName(tid))));
       }
+    }
   }
 
   //    Book
-  /* virtual */ void Container1D::book(DQMStore::IBooker& ib,
+  /* virtual */ void Container1D::book(DQMStore::IBooker &ib,
                                        HcalElectronicsMap const *emap,
-                                       std::string subsystem, std::string aux)
-  {
+                                       std::string subsystem,
+                                       std::string aux) {
     //  full path to where all the plots are living
     //  subsystem/taskname/QxvsQy_auxilary/HashType
-    ib.setCurrentFolder(subsystem+"/"+_folder+"/"+_qname+
-                        (aux.empty()?aux:"_"+aux)+"/"+_hashmap.getHashTypeName());
+    ib.setCurrentFolder(subsystem + "/" + _folder + "/" + _qname + (aux.empty() ? aux : "_" + aux) + "/" +
+                        _hashmap.getHashTypeName());
     _logger.debug(_hashmap.getHashTypeName());
-    if (_hashmap.isDHash())
-      {
-        //      for Detector Hashes
-        std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
-        for (std::vector<HcalGenericDetId>::const_iterator it=
-               dids.begin(); it!=dids.end(); ++it)
-          {
-            //  skip trigger towers and calibration
-            if (!it->isHcalDetId())
-              continue;
-
-            HcalDetId did = HcalDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(did);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-
-            _logger.debug(_hashmap.getName(did));
-            _mes.insert(
-                        std::make_pair(hash, ib.book1D(_hashmap.getName(did),
-                                                       _hashmap.getName(did), _qx->nbins(), _qx->min(),
-                                                       _qx->max())));
-
-            //  customize
-            customize(_mes[hash]);
-          }
+    if (_hashmap.isDHash()) {
+      //      for Detector Hashes
+      std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
+      for (std::vector<HcalGenericDetId>::const_iterator it = dids.begin(); it != dids.end(); ++it) {
+        //  skip trigger towers and calibration
+        if (!it->isHcalDetId())
+          continue;
+
+        HcalDetId did = HcalDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(did);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+
+        _logger.debug(_hashmap.getName(did));
+        _mes.insert(std::make_pair(
+            hash, ib.book1D(_hashmap.getName(did), _hashmap.getName(did), _qx->nbins(), _qx->min(), _qx->max())));
+
+        //  customize
+        customize(_mes[hash]);
       }
+    }
 
-    else if (_hashmap.isEHash())
-      {
-        //      for Electronics Hashes
-        std::vector<HcalElectronicsId> eids =
-          emap->allElectronicsIdPrecision();
-        for (std::vector<HcalElectronicsId>::const_iterator it=
-               eids.begin(); it!=eids.end(); ++it)
-          {
-
-            HcalElectronicsId eid = HcalElectronicsId(it->rawId());
-            uint32_t hash = _hashmap.getHash(eid);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-
-            _logger.debug(_hashmap.getName(eid));
-            _mes.insert(
-                        std::make_pair(hash,
-                                       ib.book1D(_hashmap.getName(eid),
-                                                 _hashmap.getName(eid),
-                                                 _qx->nbins(), _qx->min(), _qx->max())));
-
-            //  customize
-            customize(_mes[hash]);
-          }
+    else if (_hashmap.isEHash()) {
+      //      for Electronics Hashes
+      std::vector<HcalElectronicsId> eids = emap->allElectronicsIdPrecision();
+      for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+        HcalElectronicsId eid = HcalElectronicsId(it->rawId());
+        uint32_t hash = _hashmap.getHash(eid);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+
+        _logger.debug(_hashmap.getName(eid));
+        _mes.insert(std::make_pair(
+            hash, ib.book1D(_hashmap.getName(eid), _hashmap.getName(eid), _qx->nbins(), _qx->min(), _qx->max())));
+
+        //  customize
+        customize(_mes[hash]);
       }
-    else if (_hashmap.isTHash())
-      {
-        //      for TrigTower Hashes
-        std::vector<HcalTrigTowerDetId> tids =
-          emap->allTriggerId();
-        for (std::vector<HcalTrigTowerDetId>::const_iterator it=
-               tids.begin(); it!=tids.end(); ++it)
-          {
-            HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(tid);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-
-            _logger.debug(_hashmap.getName(tid));
-            _mes.insert(
-                        std::make_pair(hash,
-                                       ib.book1D(_hashmap.getName(tid),
-                                                 _hashmap.getName(tid),
-                                                 _qx->nbins(), _qx->min(), _qx->max())));
-            //  customize
-            customize(_mes[hash]);
-          }
+    } else if (_hashmap.isTHash()) {
+      //      for TrigTower Hashes
+      std::vector<HcalTrigTowerDetId> tids = emap->allTriggerId();
+      for (std::vector<HcalTrigTowerDetId>::const_iterator it = tids.begin(); it != tids.end(); ++it) {
+        HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(tid);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+
+        _logger.debug(_hashmap.getName(tid));
+        _mes.insert(std::make_pair(
+            hash, ib.book1D(_hashmap.getName(tid), _hashmap.getName(tid), _qx->nbins(), _qx->min(), _qx->max())));
+        //  customize
+        customize(_mes[hash]);
       }
+    }
   }
 
   //    Book
-  /* virtual */ void Container1D::book(DQMStore::IBooker& ib,
-                                       HcalElectronicsMap const *emap, filter::HashFilter const& filter,
-                                       std::string subsystem, std::string aux)
-  {
+  /* virtual */ void Container1D::book(DQMStore::IBooker &ib,
+                                       HcalElectronicsMap const *emap,
+                                       filter::HashFilter const &filter,
+                                       std::string subsystem,
+                                       std::string aux) {
     //  full path to where all the plots are living
     //  subsystem/taskname/QxvsQy_auxilary/HashType
-    ib.setCurrentFolder(subsystem+"/"+_folder+"/"+_qname+
-                        (aux.empty()?aux:"_"+aux)+"/"+_hashmap.getHashTypeName());
+    ib.setCurrentFolder(subsystem + "/" + _folder + "/" + _qname + (aux.empty() ? aux : "_" + aux) + "/" +
+                        _hashmap.getHashTypeName());
     _logger.debug(_hashmap.getHashTypeName());
 
-    if (_hashmap.isDHash())
-      {
-        //      for Detector Hashes
-        std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
-        for (std::vector<HcalGenericDetId>::const_iterator it=
-               dids.begin(); it!=dids.end(); ++it)
-          {
-            //  skip trigger towers and calibration
-            if (!it->isHcalDetId())
-              continue;
-
-            HcalDetId did = HcalDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(did);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-            if (filter.filter(did))
-              continue;
-
-            _logger.debug(_hashmap.getName(did));
-            _mes.insert(
-                        std::make_pair(hash, ib.book1D(_hashmap.getName(did),
-                                                       _hashmap.getName(did), _qx->nbins(), _qx->min(),
-                                                       _qx->max())));
-
-            //  customize
-            customize(_mes[hash]);
-          }
+    if (_hashmap.isDHash()) {
+      //      for Detector Hashes
+      std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
+      for (std::vector<HcalGenericDetId>::const_iterator it = dids.begin(); it != dids.end(); ++it) {
+        //  skip trigger towers and calibration
+        if (!it->isHcalDetId())
+          continue;
+
+        HcalDetId did = HcalDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(did);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+        if (filter.filter(did))
+          continue;
+
+        _logger.debug(_hashmap.getName(did));
+        _mes.insert(std::make_pair(
+            hash, ib.book1D(_hashmap.getName(did), _hashmap.getName(did), _qx->nbins(), _qx->min(), _qx->max())));
+
+        //  customize
+        customize(_mes[hash]);
       }
+    }
 
-    else if (_hashmap.isEHash())
-      {
-        //      for Electronics Hashes
-        std::vector<HcalElectronicsId> eids =
-          emap->allElectronicsIdPrecision();
-        for (std::vector<HcalElectronicsId>::const_iterator it=
-               eids.begin(); it!=eids.end(); ++it)
-          {
-            HcalElectronicsId eid = HcalElectronicsId(it->rawId());
-            uint32_t hash = _hashmap.getHash(eid);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-            if (filter.filter(eid))
-              continue;
-
-            _logger.debug(_hashmap.getName(eid));
-            _mes.insert(
-                        std::make_pair(hash,
-                                       ib.book1D(_hashmap.getName(eid),
-                                                 _hashmap.getName(eid),
-                                                 _qx->nbins(), _qx->min(), _qx->max())));
-
-            //  customize
-            customize(_mes[hash]);
-          }
+    else if (_hashmap.isEHash()) {
+      //      for Electronics Hashes
+      std::vector<HcalElectronicsId> eids = emap->allElectronicsIdPrecision();
+      for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+        HcalElectronicsId eid = HcalElectronicsId(it->rawId());
+        uint32_t hash = _hashmap.getHash(eid);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+        if (filter.filter(eid))
+          continue;
+
+        _logger.debug(_hashmap.getName(eid));
+        _mes.insert(std::make_pair(
+            hash, ib.book1D(_hashmap.getName(eid), _hashmap.getName(eid), _qx->nbins(), _qx->min(), _qx->max())));
+
+        //  customize
+        customize(_mes[hash]);
       }
-    else if (_hashmap.isTHash())
-      {
-        //      for TrigTower Hashes
-        std::vector<HcalTrigTowerDetId> tids =
-          emap->allTriggerId();
-        for (std::vector<HcalTrigTowerDetId>::const_iterator it=
-               tids.begin(); it!=tids.end(); ++it)
-          {
-            HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(tid);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-            if (filter.filter(tid))
-              continue;
-
-            _logger.debug(_hashmap.getName(tid));
-            _mes.insert(
-                        std::make_pair(hash,
-                                       ib.book1D(_hashmap.getName(tid),
-                                                 _hashmap.getName(tid),
-                                                 _qx->nbins(), _qx->min(), _qx->max())));
-            //  customize
-            customize(_mes[hash]);
-          }
+    } else if (_hashmap.isTHash()) {
+      //      for TrigTower Hashes
+      std::vector<HcalTrigTowerDetId> tids = emap->allTriggerId();
+      for (std::vector<HcalTrigTowerDetId>::const_iterator it = tids.begin(); it != tids.end(); ++it) {
+        HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(tid);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+        if (filter.filter(tid))
+          continue;
+
+        _logger.debug(_hashmap.getName(tid));
+        _mes.insert(std::make_pair(
+            hash, ib.book1D(_hashmap.getName(tid), _hashmap.getName(tid), _qx->nbins(), _qx->min(), _qx->max())));
+        //  customize
+        customize(_mes[hash]);
       }
+    }
   }
 
-  /* virtual */ void Container1D::customize(MonitorElement* me)
-  {
+  /* virtual */ void Container1D::customize(MonitorElement *me) {
     //  set labels
     me->setAxisTitle(_qx->name(), 1);
     me->setAxisTitle(_qy->name(), 2);
@@ -972,43 +746,34 @@ namespace hcaldqm
 
     //  set labels
     std::vector<std::string> xlabels = _qx->getLabels();
-    for (unsigned int i=0; i<xlabels.size(); i++) {
-      me->setBinLabel(i+1, xlabels[i], 1);
+    for (unsigned int i = 0; i < xlabels.size(); i++) {
+      me->setBinLabel(i + 1, xlabels[i], 1);
     }
   }
 
-  /* virtual */ void Container1D::extendAxisRange(int l)
-  {
-    if (l<_qx->nbins())
+  /* virtual */ void Container1D::extendAxisRange(int l) {
+    if (l < _qx->nbins())
       return;
 
     //  inflate all the mes
-    for(auto const& pair : _mes)
-      {
-        int x=_qx->nbins();
-        while (l>=x)
-          {
-            pair.second->getTH1()->LabelsInflate();
-            x*=2;
-            _qx->setMax(x);
-          }
+    for (auto const &pair : _mes) {
+      int x = _qx->nbins();
+      while (l >= x) {
+        pair.second->getTH1()->LabelsInflate();
+        x *= 2;
+        _qx->setMax(x);
       }
+    }
   }
 
-  /* virtual */ void Container1D::setLumiFlag()
-  {
-    for(auto const& pair : _mes)
-      {
-        pair.second->setLumiFlag();
-      }
+  /* virtual */ void Container1D::setLumiFlag() {
+    for (auto const &pair : _mes) {
+      pair.second->setLumiFlag();
+    }
   }
 
-  void Container1D::showOverflowX(bool showOverflow) {
-    _qx->showOverflow(showOverflow);
-  }
+  void Container1D::showOverflowX(bool showOverflow) { _qx->showOverflow(showOverflow); }
 
-  void Container1D::showOverflowY(bool showOverflow) {
-    _qy->showOverflow(showOverflow);
-  }
+  void Container1D::showOverflowY(bool showOverflow) { _qy->showOverflow(showOverflow); }
 
-}
+}  // namespace hcaldqm
diff --git a/DQM/HcalCommon/src/Container2D.cc b/DQM/HcalCommon/src/Container2D.cc
index b7f74e6700fee..a2f23bac08015 100644
--- a/DQM/HcalCommon/src/Container2D.cc
+++ b/DQM/HcalCommon/src/Container2D.cc
@@ -1,53 +1,47 @@
 #include "DQM/HcalCommon/interface/Container2D.h"
 #include "DQM/HcalCommon/interface/Utilities.h"
 
-namespace hcaldqm
-{
+namespace hcaldqm {
   using namespace constants;
   using namespace quantity;
   using namespace mapper;
 
-  Container2D::Container2D():
-    _qz(nullptr)
-  {}
+  Container2D::Container2D() : _qz(nullptr) {}
 
-  Container2D::Container2D(std::string const& folder,
-                           hashfunctions::HashType hashtype, Quantity *qx, Quantity *qy,
-                           Quantity *qz) :
-    Container1D(folder, hashtype, qx, qy), _qz(qz)
-  {
+  Container2D::Container2D(
+      std::string const &folder, hashfunctions::HashType hashtype, Quantity *qx, Quantity *qy, Quantity *qz)
+      : Container1D(folder, hashtype, qx, qy), _qz(qz) {
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
     _qz->setAxisType(quantity::fZAxis);
   }
 
-  Container2D::~Container2D()
-  {
-    if (_qz!=nullptr)
+  Container2D::~Container2D() {
+    if (_qz != nullptr)
       delete _qz;
     _qz = nullptr;
   }
 
-  /* virtual */ void Container2D::initialize(std::string const& folder,
+  /* virtual */ void Container2D::initialize(std::string const &folder,
                                              hashfunctions::HashType hashtype,
-                                             Quantity *qx, Quantity *qy, Quantity *qz,
-                                             int debug/*=0*/)
-  {
-    Container1D::initialize(folder,
-                            qz->name()+"vs"+qy->name()+"vs"+qx->name(),
-                            hashtype, qx, qy, debug);
+                                             Quantity *qx,
+                                             Quantity *qy,
+                                             Quantity *qz,
+                                             int debug /*=0*/) {
+    Container1D::initialize(folder, qz->name() + "vs" + qy->name() + "vs" + qx->name(), hashtype, qx, qy, debug);
     _qz = qz;
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
     _qz->setAxisType(quantity::fZAxis);
   }
 
-  /* virtual */ void Container2D::initialize(std::string const& folder,
-                                             std::string const& qname,
+  /* virtual */ void Container2D::initialize(std::string const &folder,
+                                             std::string const &qname,
                                              hashfunctions::HashType hashtype,
-                                             Quantity *qx, Quantity *qy, Quantity *qz,
-                                             int debug/*=0*/)
-  {
+                                             Quantity *qx,
+                                             Quantity *qy,
+                                             Quantity *qz,
+                                             int debug /*=0*/) {
     Container1D::initialize(folder, qname, hashtype, qx, qy, debug);
     _qz = qz;
     _qx->setAxisType(quantity::fXAxis);
@@ -55,1014 +49,686 @@ namespace hcaldqm
     _qz->setAxisType(quantity::fZAxis);
   }
 
-  /* virtual */ void Container2D::fill(HcalDetId const& did)
-  {
-    _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                      _qy->getValue(did));
+  /* virtual */ void Container2D::fill(HcalDetId const &did) {
+    _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(did));
   }
 
   //    HcalDetId based
-  /* virtual */ void Container2D::fill(HcalDetId const& did, int x)
-  {
+  /* virtual */ void Container2D::fill(HcalDetId const &did, int x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(did), x);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(did), x);
     else if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x));
     else if (_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did));
   }
 
-  /* virtual */ void Container2D::fill(HcalDetId const& did, double x)
-  {
+  /* virtual */ void Container2D::fill(HcalDetId const &did, double x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(did), x);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(did), x);
     else if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x));
     else if (_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did));
   }
 
-  /* virtual */ void Container2D::fill(HcalDetId const& did,
-                                       int x, double y)
-  {
+  /* virtual */ void Container2D::fill(HcalDetId const &did, int x, double y) {
     if (_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
     else if (!_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did), y);
     else if (!_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ void Container2D::fill(HcalDetId const& did,
-                                       int x, int y)
-  {
+  /* virtual */ void Container2D::fill(HcalDetId const &did, int x, int y) {
     if (_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
     else if (!_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did), y);
     else if (!_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ void Container2D::fill(HcalDetId const& did,
-                                       double x, double y)
-  {
+  /* virtual */ void Container2D::fill(HcalDetId const &did, double x, double y) {
     if (_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
     else if (!_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did), y);
     else if (!_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ double Container2D::getBinEntries(HcalDetId const&
-                                                  id)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                     _qx->getBin(id)+_qy->getBin(id)*_qx->wofnbins());
+  /* virtual */ double Container2D::getBinEntries(HcalDetId const &id) {
+    return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(id) + _qy->getBin(id) * _qx->wofnbins());
   }
 
-  /* virtual */ double Container2D::getBinEntries(HcalDetId const&
-                                                  id, int x)
-  {
+  /* virtual */ double Container2D::getBinEntries(HcalDetId const &id, int x) {
     if (_qx->isCoordinate())
-      return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                       _qx->getBin(id)+_qy->getBin(x)*_qx->wofnbins());
+      return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(id) + _qy->getBin(x) * _qx->wofnbins());
     else
-      return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                       _qx->getBin(x)+_qy->getBin(id)*_qx->wofnbins());
+      return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x) + _qy->getBin(id) * _qx->wofnbins());
   }
 
-  /* virtual */ double Container2D::getBinEntries(HcalDetId const&
-                                                  id, double x)
-  {
+  /* virtual */ double Container2D::getBinEntries(HcalDetId const &id, double x) {
     if (_qx->isCoordinate())
-      return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                       _qx->getBin(id)+ _qy->getBin(x)*_qx->wofnbins());
+      return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(id) + _qy->getBin(x) * _qx->wofnbins());
     else
-      return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                       _qx->getBin(x)+_qy->getBin(id)*_qx->wofnbins());
+      return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x) + _qy->getBin(id) * _qx->wofnbins());
   }
 
-  /* virtual */ double Container2D::getBinEntries(HcalDetId const&
-                                                  id, int x, int y)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                     _qx->getBin(x)+ _qy->getBin(y)*_qx->wofnbins());
+  /* virtual */ double Container2D::getBinEntries(HcalDetId const &id, int x, int y) {
+    return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x) + _qy->getBin(y) * _qx->wofnbins());
   }
 
-  /* virtual */ double Container2D::getBinEntries(HcalDetId const&
-                                                  id, int x, double y)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                     _qx->getBin(x)+_qy->getBin(y)*_qx->wofnbins());
+  /* virtual */ double Container2D::getBinEntries(HcalDetId const &id, int x, double y) {
+    return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x) + _qy->getBin(y) * _qx->wofnbins());
   }
 
-  /* virtual */ double Container2D::getBinEntries(HcalDetId const&
-                                                  id, double x, double y)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                     _qx->getBin(x)+ _qy->getBin(y)*_qx->wofnbins());
+  /* virtual */ double Container2D::getBinEntries(HcalDetId const &id, double x, double y) {
+    return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x) + _qy->getBin(y) * _qx->wofnbins());
   }
 
-  /* virtual */ double Container2D::getBinContent(HcalDetId const&
-                                                  id)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                     _qx->getBin(id), _qy->getBin(id));
+  /* virtual */ double Container2D::getBinContent(HcalDetId const &id) {
+    return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(id), _qy->getBin(id));
   }
 
-  /* virtual */ double Container2D::getBinContent(HcalDetId const&
-                                                  id, int x)
-  {
+  /* virtual */ double Container2D::getBinContent(HcalDetId const &id, int x) {
     if (_qx->isCoordinate())
-      return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                       _qx->getBin(id), _qy->getBin(x));
+      return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(id), _qy->getBin(x));
     else
-      return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                       _qx->getBin(x), _qy->getBin(id));
+      return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(x), _qy->getBin(id));
   }
 
-  /* virtual */ double Container2D::getBinContent(HcalDetId const&
-                                                  id, double x)
-  {
+  /* virtual */ double Container2D::getBinContent(HcalDetId const &id, double x) {
     if (_qx->isCoordinate())
-      return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                       _qx->getBin(id), _qy->getBin(x));
+      return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(id), _qy->getBin(x));
     else
-      return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                       _qx->getBin(x), _qy->getBin(id));
+      return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(x), _qy->getBin(id));
   }
 
-  /* virtual */ double Container2D::getBinContent(HcalDetId const&
-                                                  id, int x, int y)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                     _qx->getBin(x), _qy->getBin(y));
+  /* virtual */ double Container2D::getBinContent(HcalDetId const &id, int x, int y) {
+    return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(x), _qy->getBin(y));
   }
 
-  /* virtual */ double Container2D::getBinContent(HcalDetId const&
-                                                  id, int x, double y)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                     _qx->getBin(x), _qy->getBin(y));
+  /* virtual */ double Container2D::getBinContent(HcalDetId const &id, int x, double y) {
+    return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(x), _qy->getBin(y));
   }
 
-  /* virtual */ double Container2D::getBinContent(HcalDetId const&
-                                                  id, double x, double y)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                     _qx->getBin(x), _qy->getBin(y));
+  /* virtual */ double Container2D::getBinContent(HcalDetId const &id, double x, double y) {
+    return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(x), _qy->getBin(y));
   }
 
   //    setBinContent
-  /* virtual */ void Container2D::setBinContent(HcalDetId const& id, int x)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id),
-                                              _qy->getBin(id), x);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalDetId const& id, double x)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id),
-                                              _qy->getBin(id), x);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalDetId const& id,
-                                                int x, int y)
-  {
+  /* virtual */ void Container2D::setBinContent(HcalDetId const &id, int x) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), _qy->getBin(id), x);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalDetId const &id, double x) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), _qy->getBin(id), x);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalDetId const &id, int x, int y) {
     if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id),
-                                                _qy->getBin(x), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                                _qy->getBin(id), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
 
-  /* virtual */ void Container2D::setBinContent(HcalDetId const& id,
-                                                int x, double y)
-  {
+  /* virtual */ void Container2D::setBinContent(HcalDetId const &id, int x, double y) {
     if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id),
-                                                _qy->getBin(x), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                                _qy->getBin(id), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
-  /* virtual */ void Container2D::setBinContent(HcalDetId const& id,
-                                                double x, int y)
-  {
+  /* virtual */ void Container2D::setBinContent(HcalDetId const &id, double x, int y) {
     if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id),
-                                                _qy->getBin(x), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                                _qy->getBin(id), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
-  /* virtual */ void Container2D::setBinContent(HcalDetId const& id,
-                                                double x, double y)
-  {
+  /* virtual */ void Container2D::setBinContent(HcalDetId const &id, double x, double y) {
     if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id),
-                                                _qy->getBin(x), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                                _qy->getBin(id), y);
-  }
-
-  /* virtual */ void Container2D::setBinContent(HcalDetId const& id,
-                                                int x, int y, int z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalDetId const& id,
-                                                int x, double y, int z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalDetId const& id,
-                                                double x, int y, int z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalDetId const& id,
-                                                double x, double y, int z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalDetId const& id,
-                                                int x, int y, double z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalDetId const& id,
-                                                int x, double y, double z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalDetId const& id,
-                                                double x, int y, double z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalDetId const& id,
-                                                double x, double y, double z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
+  }
+
+  /* virtual */ void Container2D::setBinContent(HcalDetId const &id, int x, int y, int z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalDetId const &id, int x, double y, int z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalDetId const &id, double x, int y, int z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalDetId const &id, double x, double y, int z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalDetId const &id, int x, int y, double z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalDetId const &id, int x, double y, double z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalDetId const &id, double x, int y, double z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalDetId const &id, double x, double y, double z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
   }
 
   //    by ElectronicsId
-  /* virtual */ void Container2D::fill(HcalElectronicsId const& did)
-  {
-    _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                      _qy->getValue(did));
+  /* virtual */ void Container2D::fill(HcalElectronicsId const &did) {
+    _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(did));
   }
 
-  /* virtual */ void Container2D::fill(HcalElectronicsId const& did, int x)
-  {
+  /* virtual */ void Container2D::fill(HcalElectronicsId const &did, int x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(did), x);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(did), x);
     else if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x));
     else if (_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did));
   }
 
-  /* virtual */ void Container2D::fill(HcalElectronicsId const& did, double x)
-  {
+  /* virtual */ void Container2D::fill(HcalElectronicsId const &did, double x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(did), x);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(did), x);
     else if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x));
     else if (_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did));
   }
 
-  /* virtual */ void Container2D::fill(HcalElectronicsId const& did,
-                                       int x, double y)
-  {
+  /* virtual */ void Container2D::fill(HcalElectronicsId const &did, int x, double y) {
     if (_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
     else if (!_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did), y);
     else if (!_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ void Container2D::fill(HcalElectronicsId const& did,
-                                       int x, int y)
-  {
+  /* virtual */ void Container2D::fill(HcalElectronicsId const &did, int x, int y) {
     if (_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
     else if (!_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did), y);
     else if (!_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ void Container2D::fill(HcalElectronicsId const& did,
-                                       double x, double y)
-  {
+  /* virtual */ void Container2D::fill(HcalElectronicsId const &did, double x, double y) {
     if (_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
     else if (!_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did), y);
     else if (!_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ double Container2D::getBinEntries(HcalElectronicsId const&
-                                                  id)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                     _qx->getBin(id)+_qy->getBin(id)*_qx->wofnbins());
-
+  /* virtual */ double Container2D::getBinEntries(HcalElectronicsId const &id) {
+    return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(id) + _qy->getBin(id) * _qx->wofnbins());
   }
 
-  /* virtual */ double Container2D::getBinEntries(HcalElectronicsId const&
-                                                  id, int x)
-  {
+  /* virtual */ double Container2D::getBinEntries(HcalElectronicsId const &id, int x) {
     if (_qx->isCoordinate())
-      return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                       _qx->getBin(id)+_qy->getBin(x)*_qx->wofnbins());
+      return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(id) + _qy->getBin(x) * _qx->wofnbins());
     else
-      return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                       _qx->getBin(x)+_qy->getBin(id)*_qx->wofnbins());
+      return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x) + _qy->getBin(id) * _qx->wofnbins());
   }
 
-  /* virtual */ double Container2D::getBinEntries(HcalElectronicsId const&
-                                                  id, double x)
-  {
+  /* virtual */ double Container2D::getBinEntries(HcalElectronicsId const &id, double x) {
     if (_qx->isCoordinate())
-      return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                       _qx->getBin(id)+ _qy->getBin(x)*_qx->wofnbins());
+      return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(id) + _qy->getBin(x) * _qx->wofnbins());
     else
-      return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                       _qx->getBin(x)+_qy->getBin(id)*_qx->wofnbins());
+      return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x) + _qy->getBin(id) * _qx->wofnbins());
   }
 
-  /* virtual */ double Container2D::getBinEntries(HcalElectronicsId const&
-                                                  id, int x, int y)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                     _qx->getBin(x)+ _qy->getBin(y)*_qx->wofnbins());
+  /* virtual */ double Container2D::getBinEntries(HcalElectronicsId const &id, int x, int y) {
+    return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x) + _qy->getBin(y) * _qx->wofnbins());
   }
 
-  /* virtual */ double Container2D::getBinEntries(HcalElectronicsId const&
-                                                  id, int x, double y)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                     _qx->getBin(x)+_qy->getBin(y)*_qx->wofnbins());
+  /* virtual */ double Container2D::getBinEntries(HcalElectronicsId const &id, int x, double y) {
+    return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x) + _qy->getBin(y) * _qx->wofnbins());
   }
 
-  /* virtual */ double Container2D::getBinEntries(HcalElectronicsId const&
-                                                  id, double x, double y)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                     _qx->getBin(x)+ _qy->getBin(y)*_qx->wofnbins());
+  /* virtual */ double Container2D::getBinEntries(HcalElectronicsId const &id, double x, double y) {
+    return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x) + _qy->getBin(y) * _qx->wofnbins());
   }
 
-  /* virtual */ double Container2D::getBinContent(HcalElectronicsId const&
-                                                  id)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                     _qx->getBin(id), _qy->getBin(id));
+  /* virtual */ double Container2D::getBinContent(HcalElectronicsId const &id) {
+    return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(id), _qy->getBin(id));
   }
 
-  /* virtual */ double Container2D::getBinContent(HcalElectronicsId const&
-                                                  id, int x)
-  {
+  /* virtual */ double Container2D::getBinContent(HcalElectronicsId const &id, int x) {
     if (_qx->isCoordinate())
-      return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                       _qx->getBin(id), _qy->getBin(x));
+      return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(id), _qy->getBin(x));
     else
-      return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                       _qx->getBin(x), _qy->getBin(id));
+      return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(x), _qy->getBin(id));
   }
 
-  /* virtual */ double Container2D::getBinContent(HcalElectronicsId const&
-                                                  id, double x)
-  {
+  /* virtual */ double Container2D::getBinContent(HcalElectronicsId const &id, double x) {
     if (_qx->isCoordinate())
-      return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                       _qx->getBin(id), _qy->getBin(x));
+      return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(id), _qy->getBin(x));
     else
-      return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                       _qx->getBin(x), _qy->getBin(id));
+      return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(x), _qy->getBin(id));
   }
 
-  /* virtual */ double Container2D::getBinContent(HcalElectronicsId const&
-                                                  id, int x, int y)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                     _qx->getBin(x), _qy->getBin(y));
+  /* virtual */ double Container2D::getBinContent(HcalElectronicsId const &id, int x, int y) {
+    return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(x), _qy->getBin(y));
   }
 
-  /* virtual */ double Container2D::getBinContent(HcalElectronicsId const&
-                                                  id, int x, double y)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                     _qx->getBin(x), _qy->getBin(y));
+  /* virtual */ double Container2D::getBinContent(HcalElectronicsId const &id, int x, double y) {
+    return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(x), _qy->getBin(y));
   }
 
-  /* virtual */ double Container2D::getBinContent(HcalElectronicsId const&
-                                                  id, double x, double y)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                     _qx->getBin(x), _qy->getBin(y));
+  /* virtual */ double Container2D::getBinContent(HcalElectronicsId const &id, double x, double y) {
+    return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(x), _qy->getBin(y));
   }
 
   //    setBinContent
-  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const& id,
-                                                int x)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id),
-                                              _qy->getBin(id), x);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const& id, double x)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id),
-                                              _qy->getBin(id), x);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const& id,
-                                                int x, int y)
-  {
+  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const &id, int x) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), _qy->getBin(id), x);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const &id, double x) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), _qy->getBin(id), x);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const &id, int x, int y) {
     if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id),
-                                                _qy->getBin(x), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                                _qy->getBin(id), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
 
-  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const& id,
-                                                int x, double y)
-  {
+  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const &id, int x, double y) {
     if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id),
-                                                _qy->getBin(x), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                                _qy->getBin(id), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
-  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const& id,
-                                                double x, int y)
-  {
+  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const &id, double x, int y) {
     if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id),
-                                                _qy->getBin(x), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                                _qy->getBin(id), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
-  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const& id,
-                                                double x, double y)
-  {
+  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const &id, double x, double y) {
     if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id),
-                                                _qy->getBin(x), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                                _qy->getBin(id), y);
-  }
-
-  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const& id,
-                                                int x, int y, int z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const& id,
-                                                int x, double y, int z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const& id,
-                                                double x, int y, int z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const& id,
-                                                double x, double y, int z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const& id,
-                                                int x, int y, double z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const& id,
-                                                int x, double y, double z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const& id,
-                                                double x, int y, double z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const& id,
-                                                double x, double y, double z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
+  }
+
+  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const &id, int x, int y, int z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const &id, int x, double y, int z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const &id, double x, int y, int z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const &id, double x, double y, int z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const &id, int x, int y, double z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const &id, int x, double y, double z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const &id, double x, int y, double z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalElectronicsId const &id, double x, double y, double z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
   }
 
   //    by TrigTowerDetId
-  /* virtual */ void Container2D::fill(HcalTrigTowerDetId const& did)
-  {
-    _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                      _qy->getValue(did));
+  /* virtual */ void Container2D::fill(HcalTrigTowerDetId const &did) {
+    _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(did));
   }
 
   //    HcalDetId based
-  /* virtual */ void Container2D::fill(HcalTrigTowerDetId const& did, int x)
-  {
+  /* virtual */ void Container2D::fill(HcalTrigTowerDetId const &did, int x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(did), x);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(did), x);
     else if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x));
     else if (_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did));
   }
 
-  /* virtual */ void Container2D::fill(HcalTrigTowerDetId const& did,
-                                       double x)
-  {
+  /* virtual */ void Container2D::fill(HcalTrigTowerDetId const &did, double x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(did), x);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(did), x);
     else if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x));
     else if (_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did));
   }
 
-  /* virtual */ void Container2D::fill(HcalTrigTowerDetId const& did,
-                                       int x, double y)
-  {
+  /* virtual */ void Container2D::fill(HcalTrigTowerDetId const &did, int x, double y) {
     if (_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
     else if (!_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did), y);
     else if (!_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ void Container2D::fill(HcalTrigTowerDetId const& did,
-                                       int x, int y)
-  {
+  /* virtual */ void Container2D::fill(HcalTrigTowerDetId const &did, int x, int y) {
     if (_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
     else if (!_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did), y);
     else if (!_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ void Container2D::fill(HcalTrigTowerDetId const& did,
-                                       double x, double y)
-  {
+  /* virtual */ void Container2D::fill(HcalTrigTowerDetId const &did, double x, double y) {
     if (_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
     else if (!_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did), y);
     else if (!_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ double Container2D::getBinEntries(HcalTrigTowerDetId const&
-                                                  id)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                     _qx->getBin(id)+_qy->getBin(id)*_qx->wofnbins());
+  /* virtual */ double Container2D::getBinEntries(HcalTrigTowerDetId const &id) {
+    return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(id) + _qy->getBin(id) * _qx->wofnbins());
   }
 
-  /* virtual */ double Container2D::getBinEntries(HcalTrigTowerDetId const&
-                                                  id, int x)
-  {
+  /* virtual */ double Container2D::getBinEntries(HcalTrigTowerDetId const &id, int x) {
     if (_qx->isCoordinate())
-      return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                       _qx->getBin(id)+_qy->getBin(x)*_qx->wofnbins());
+      return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(id) + _qy->getBin(x) * _qx->wofnbins());
     else
-      return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                       _qx->getBin(x)+_qy->getBin(id)*_qx->wofnbins());
+      return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x) + _qy->getBin(id) * _qx->wofnbins());
   }
 
-  /* virtual */ double Container2D::getBinEntries(HcalTrigTowerDetId const&
-                                                  id, double x)
-  {
+  /* virtual */ double Container2D::getBinEntries(HcalTrigTowerDetId const &id, double x) {
     if (_qx->isCoordinate())
-      return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                       _qx->getBin(id)+ _qy->getBin(x)*_qx->wofnbins());
+      return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(id) + _qy->getBin(x) * _qx->wofnbins());
     else
-      return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                       _qx->getBin(x)+_qy->getBin(id)*_qx->wofnbins());
+      return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x) + _qy->getBin(id) * _qx->wofnbins());
   }
 
-  /* virtual */ double Container2D::getBinEntries(HcalTrigTowerDetId const&
-                                                  id, int x, int y)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                     _qx->getBin(x)+ _qy->getBin(y)*_qx->wofnbins());
+  /* virtual */ double Container2D::getBinEntries(HcalTrigTowerDetId const &id, int x, int y) {
+    return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x) + _qy->getBin(y) * _qx->wofnbins());
   }
 
-  /* virtual */ double Container2D::getBinEntries(HcalTrigTowerDetId const&
-                                                  id, int x, double y)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                     _qx->getBin(x)+_qy->getBin(y)*_qx->wofnbins());
+  /* virtual */ double Container2D::getBinEntries(HcalTrigTowerDetId const &id, int x, double y) {
+    return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x) + _qy->getBin(y) * _qx->wofnbins());
   }
 
-  /* virtual */ double Container2D::getBinEntries(HcalTrigTowerDetId const&
-                                                  id, double x, double y)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinEntries(
-                                                     _qx->getBin(x)+ _qy->getBin(y)*_qx->wofnbins());
+  /* virtual */ double Container2D::getBinEntries(HcalTrigTowerDetId const &id, double x, double y) {
+    return _mes[_hashmap.getHash(id)]->getBinEntries(_qx->getBin(x) + _qy->getBin(y) * _qx->wofnbins());
   }
 
-  /* virtual */ double Container2D::getBinContent(HcalTrigTowerDetId const&
-                                                  id)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                     _qx->getBin(id), _qy->getBin(id));
+  /* virtual */ double Container2D::getBinContent(HcalTrigTowerDetId const &id) {
+    return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(id), _qy->getBin(id));
   }
 
-  /* virtual */ double Container2D::getBinContent(HcalTrigTowerDetId const&
-                                                  id, int x)
-  {
+  /* virtual */ double Container2D::getBinContent(HcalTrigTowerDetId const &id, int x) {
     if (_qx->isCoordinate())
-      return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                       _qx->getBin(id), _qy->getBin(x));
+      return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(id), _qy->getBin(x));
     else
-      return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                       _qx->getBin(x), _qy->getBin(id));
+      return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(x), _qy->getBin(id));
   }
 
-  /* virtual */ double Container2D::getBinContent(HcalTrigTowerDetId const&
-                                                  id, double x)
-  {
+  /* virtual */ double Container2D::getBinContent(HcalTrigTowerDetId const &id, double x) {
     if (_qx->isCoordinate())
-      return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                       _qx->getBin(id), _qy->getBin(x));
+      return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(id), _qy->getBin(x));
     else
-      return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                       _qx->getBin(x), _qy->getBin(id));
+      return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(x), _qy->getBin(id));
   }
 
-  /* virtual */ double Container2D::getBinContent(HcalTrigTowerDetId const&
-                                                  id, int x, int y)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                     _qx->getBin(x), _qy->getBin(y));
+  /* virtual */ double Container2D::getBinContent(HcalTrigTowerDetId const &id, int x, int y) {
+    return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(x), _qy->getBin(y));
   }
 
-  /* virtual */ double Container2D::getBinContent(HcalTrigTowerDetId const&
-                                                  id, int x, double y)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                     _qx->getBin(x), _qy->getBin(y));
+  /* virtual */ double Container2D::getBinContent(HcalTrigTowerDetId const &id, int x, double y) {
+    return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(x), _qy->getBin(y));
   }
 
-  /* virtual */ double Container2D::getBinContent(HcalTrigTowerDetId const&
-                                                  id, double x, double y)
-  {
-    return _mes[_hashmap.getHash(id)]->getBinContent(
-                                                     _qx->getBin(x), _qy->getBin(y));
+  /* virtual */ double Container2D::getBinContent(HcalTrigTowerDetId const &id, double x, double y) {
+    return _mes[_hashmap.getHash(id)]->getBinContent(_qx->getBin(x), _qy->getBin(y));
   }
 
   //    setBinContent
-  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const& id, int x)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id),
-                                              _qy->getBin(id), x);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const& id, double x)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id),
-                                              _qy->getBin(id), x);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const& id,
-                                                int x, int y)
-  {
+  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const &id, int x) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), _qy->getBin(id), x);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const &id, double x) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), _qy->getBin(id), x);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const &id, int x, int y) {
     if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id),
-                                                _qy->getBin(x), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                                _qy->getBin(id), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
 
-  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const& id,
-                                                int x, double y)
-  {
+  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const &id, int x, double y) {
     if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id),
-                                                _qy->getBin(x), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                                _qy->getBin(id), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
-  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const& id,
-                                                double x, int y)
-  {
+  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const &id, double x, int y) {
     if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id),
-                                                _qy->getBin(x), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                                _qy->getBin(id), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
-  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const& id,
-                                                double x, double y)
-  {
+  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const &id, double x, double y) {
     if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id),
-                                                _qy->getBin(x), y);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
-      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                                _qy->getBin(id), y);
-  }
-
-  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const& id,
-                                                int x, int y, int z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const& id,
-                                                int x, double y, int z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const& id,
-                                                double x, int y, int z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const& id,
-                                                double x, double y, int z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const& id,
-                                                int x, int y, double z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const& id,
-                                                int x, double y, double z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const& id,
-                                                double x, int y, double z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
-  }
-  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const& id,
-                                                double x, double y, double z)
-  {
-    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x),
-                                              _qy->getBin(y), z);
+      _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
+  }
+
+  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const &id, int x, int y, int z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const &id, int x, double y, int z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const &id, double x, int y, int z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const &id, double x, double y, int z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const &id, int x, int y, double z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const &id, int x, double y, double z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const &id, double x, int y, double z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
+  }
+  /* virtual */ void Container2D::setBinContent(HcalTrigTowerDetId const &id, double x, double y, double z) {
+    _mes[_hashmap.getHash(id)]->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
   }
 
   //    booking
   /* virtual */ void Container2D::book(DQMStore::IBooker &ib,
                                        HcalElectronicsMap const *emap,
-                                       std::string subsystem, std::string aux)
-  {
-
+                                       std::string subsystem,
+                                       std::string aux) {
     //  full path as in Container1D.cc
     //
-    ib.setCurrentFolder(subsystem+"/"+_folder+"/"+_qname+
-                        (aux.empty()?aux:"_"+aux)+"/"+_hashmap.getHashTypeName());
-    if (_hashmap.isDHash())
-      {
-        //      for Detector Hashes
-        std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
-        for (std::vector<HcalGenericDetId>::const_iterator it=
-               dids.begin(); it!=dids.end(); ++it)
-          {
-            //  skip trigger towers and calib
-            if (!it->isHcalDetId())
-              continue;
-
-            HcalDetId did = HcalDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(did);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-
-            _logger.debug(_hashmap.getName(did));
-            _mes.insert(
-                        std::make_pair(hash, ib.book2D(_hashmap.getName(did),
-                                                       _hashmap.getName(did), _qx->nbins(), _qx->min(),
-                                                       _qx->max(), _qy->nbins(), _qy->min(), _qy->max())));
-            customize(_mes[hash]);
-          }
+    ib.setCurrentFolder(subsystem + "/" + _folder + "/" + _qname + (aux.empty() ? aux : "_" + aux) + "/" +
+                        _hashmap.getHashTypeName());
+    if (_hashmap.isDHash()) {
+      //      for Detector Hashes
+      std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
+      for (std::vector<HcalGenericDetId>::const_iterator it = dids.begin(); it != dids.end(); ++it) {
+        //  skip trigger towers and calib
+        if (!it->isHcalDetId())
+          continue;
+
+        HcalDetId did = HcalDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(did);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+
+        _logger.debug(_hashmap.getName(did));
+        _mes.insert(std::make_pair(hash,
+                                   ib.book2D(_hashmap.getName(did),
+                                             _hashmap.getName(did),
+                                             _qx->nbins(),
+                                             _qx->min(),
+                                             _qx->max(),
+                                             _qy->nbins(),
+                                             _qy->min(),
+                                             _qy->max())));
+        customize(_mes[hash]);
       }
-    else if (_hashmap.isEHash())
-      {
-        //      for Electronics hashes
-        std::vector<HcalElectronicsId> eids =
-          emap->allElectronicsIdPrecision();
-        for (std::vector<HcalElectronicsId>::const_iterator it=
-               eids.begin(); it!=eids.end(); ++it)
-          {
-            HcalElectronicsId eid = HcalElectronicsId(it->rawId());
-            uint32_t hash = _hashmap.getHash(eid);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-
-            _logger.debug(_hashmap.getName(eid));
-            _mes.insert(
-                        std::make_pair(hash, ib.book2D(_hashmap.getName(eid),
-                                                       _hashmap.getName(eid), _qx->nbins(), _qx->min(),
-                                                       _qx->max(), _qy->nbins(), _qy->min(), _qy->max())));
-            customize(_mes[hash]);
-          }
+    } else if (_hashmap.isEHash()) {
+      //      for Electronics hashes
+      std::vector<HcalElectronicsId> eids = emap->allElectronicsIdPrecision();
+      for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+        HcalElectronicsId eid = HcalElectronicsId(it->rawId());
+        uint32_t hash = _hashmap.getHash(eid);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+
+        _logger.debug(_hashmap.getName(eid));
+        _mes.insert(std::make_pair(hash,
+                                   ib.book2D(_hashmap.getName(eid),
+                                             _hashmap.getName(eid),
+                                             _qx->nbins(),
+                                             _qx->min(),
+                                             _qx->max(),
+                                             _qy->nbins(),
+                                             _qy->min(),
+                                             _qy->max())));
+        customize(_mes[hash]);
       }
-    else if (_hashmap.isTHash())
-      {
-        //      for TrigTower hashes
-        std::vector<HcalTrigTowerDetId> tids =
-          emap->allTriggerId();
-        for (std::vector<HcalTrigTowerDetId>::const_iterator it=
-               tids.begin(); it!=tids.end(); ++it)
-          {
-            HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
-            _logger.debug(_hashmap.getName(tid));
-            uint32_t hash = _hashmap.getHash(tid);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-
-            _logger.debug(_hashmap.getName(tid));
-            _mes.insert(
-                        std::make_pair(hash, ib.book2D(_hashmap.getName(tid),
-                                                       _hashmap.getName(tid), _qx->nbins(), _qx->min(),
-                                                       _qx->max(), _qy->nbins(), _qy->min(), _qy->max())));
-
-            customize(_mes[hash]);
-          }
+    } else if (_hashmap.isTHash()) {
+      //      for TrigTower hashes
+      std::vector<HcalTrigTowerDetId> tids = emap->allTriggerId();
+      for (std::vector<HcalTrigTowerDetId>::const_iterator it = tids.begin(); it != tids.end(); ++it) {
+        HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
+        _logger.debug(_hashmap.getName(tid));
+        uint32_t hash = _hashmap.getHash(tid);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+
+        _logger.debug(_hashmap.getName(tid));
+        _mes.insert(std::make_pair(hash,
+                                   ib.book2D(_hashmap.getName(tid),
+                                             _hashmap.getName(tid),
+                                             _qx->nbins(),
+                                             _qx->min(),
+                                             _qx->max(),
+                                             _qy->nbins(),
+                                             _qy->min(),
+                                             _qy->max())));
+
+        customize(_mes[hash]);
       }
+    }
   }
 
   /* virtual */ void Container2D::book(DQMStore::IBooker &ib,
-                                       HcalElectronicsMap const *emap, filter::HashFilter const& filter,
-                                       std::string subsystem, std::string aux)
-  {
-
+                                       HcalElectronicsMap const *emap,
+                                       filter::HashFilter const &filter,
+                                       std::string subsystem,
+                                       std::string aux) {
     //  full path as in Container1D.cc
     //
-    ib.setCurrentFolder(subsystem+"/"+_folder+"/"+_qname+
-                        (aux.empty()?aux:"_"+aux)+"/"+_hashmap.getHashTypeName());
-    if (_hashmap.isDHash())
-      {
-        //      for Detector Hashes
-        std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
-        for (std::vector<HcalGenericDetId>::const_iterator it=
-               dids.begin(); it!=dids.end(); ++it)
-          {
-            //  skip trigger towers and calib
-            if (!it->isHcalDetId())
-              continue;
-
-            HcalDetId did = HcalDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(did);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-            if (filter.filter(did))
-              continue;
-
-            _logger.debug(_hashmap.getName(did));
-            _mes.insert(
-                        std::make_pair(hash, ib.book2D(_hashmap.getName(did),
-                                                       _hashmap.getName(did), _qx->nbins(), _qx->min(),
-                                                       _qx->max(), _qy->nbins(), _qy->min(), _qy->max())));
-            customize(_mes[hash]);
-          }
+    ib.setCurrentFolder(subsystem + "/" + _folder + "/" + _qname + (aux.empty() ? aux : "_" + aux) + "/" +
+                        _hashmap.getHashTypeName());
+    if (_hashmap.isDHash()) {
+      //      for Detector Hashes
+      std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
+      for (std::vector<HcalGenericDetId>::const_iterator it = dids.begin(); it != dids.end(); ++it) {
+        //  skip trigger towers and calib
+        if (!it->isHcalDetId())
+          continue;
+
+        HcalDetId did = HcalDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(did);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+        if (filter.filter(did))
+          continue;
+
+        _logger.debug(_hashmap.getName(did));
+        _mes.insert(std::make_pair(hash,
+                                   ib.book2D(_hashmap.getName(did),
+                                             _hashmap.getName(did),
+                                             _qx->nbins(),
+                                             _qx->min(),
+                                             _qx->max(),
+                                             _qy->nbins(),
+                                             _qy->min(),
+                                             _qy->max())));
+        customize(_mes[hash]);
       }
-    else if (_hashmap.isEHash())
-      {
-        //      for Electronics hashes
-        std::vector<HcalElectronicsId> eids =
-          emap->allElectronicsIdPrecision();
-        for (std::vector<HcalElectronicsId>::const_iterator it=
-               eids.begin(); it!=eids.end(); ++it)
-          {
-            HcalElectronicsId eid = HcalElectronicsId(it->rawId());
-            uint32_t hash = _hashmap.getHash(eid);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-            if (filter.filter(eid))
-              continue;
-
-            _logger.debug(_hashmap.getName(eid));
-            _mes.insert(
-                        std::make_pair(hash, ib.book2D(_hashmap.getName(eid),
-                                                       _hashmap.getName(eid), _qx->nbins(), _qx->min(),
-                                                       _qx->max(), _qy->nbins(), _qy->min(), _qy->max())));
-            customize(_mes[hash]);
-          }
+    } else if (_hashmap.isEHash()) {
+      //      for Electronics hashes
+      std::vector<HcalElectronicsId> eids = emap->allElectronicsIdPrecision();
+      for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+        HcalElectronicsId eid = HcalElectronicsId(it->rawId());
+        uint32_t hash = _hashmap.getHash(eid);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+        if (filter.filter(eid))
+          continue;
+
+        _logger.debug(_hashmap.getName(eid));
+        _mes.insert(std::make_pair(hash,
+                                   ib.book2D(_hashmap.getName(eid),
+                                             _hashmap.getName(eid),
+                                             _qx->nbins(),
+                                             _qx->min(),
+                                             _qx->max(),
+                                             _qy->nbins(),
+                                             _qy->min(),
+                                             _qy->max())));
+        customize(_mes[hash]);
       }
-    else if (_hashmap.isTHash())
-      {
-        //      for TrigTower hashes
-        std::vector<HcalTrigTowerDetId> tids =
-          emap->allTriggerId();
-        for (std::vector<HcalTrigTowerDetId>::const_iterator it=
-               tids.begin(); it!=tids.end(); ++it)
-          {
-            HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
-            _logger.debug(_hashmap.getName(tid));
-            uint32_t hash = _hashmap.getHash(tid);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-            if (filter.filter(tid))
-              continue;
-
-            _logger.debug(_hashmap.getName(tid));
-            _mes.insert(
-                        std::make_pair(hash, ib.book2D(_hashmap.getName(tid),
-                                                       _hashmap.getName(tid), _qx->nbins(), _qx->min(),
-                                                       _qx->max(), _qy->nbins(), _qy->min(), _qy->max())));
-
-            customize(_mes[hash]);
-          }
+    } else if (_hashmap.isTHash()) {
+      //      for TrigTower hashes
+      std::vector<HcalTrigTowerDetId> tids = emap->allTriggerId();
+      for (std::vector<HcalTrigTowerDetId>::const_iterator it = tids.begin(); it != tids.end(); ++it) {
+        HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
+        _logger.debug(_hashmap.getName(tid));
+        uint32_t hash = _hashmap.getHash(tid);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+        if (filter.filter(tid))
+          continue;
+
+        _logger.debug(_hashmap.getName(tid));
+        _mes.insert(std::make_pair(hash,
+                                   ib.book2D(_hashmap.getName(tid),
+                                             _hashmap.getName(tid),
+                                             _qx->nbins(),
+                                             _qx->min(),
+                                             _qx->max(),
+                                             _qy->nbins(),
+                                             _qy->min(),
+                                             _qy->max())));
+
+        customize(_mes[hash]);
       }
+    }
   }
 
-  /* virtual */ void Container2D::customize(MonitorElement* me)
-  {
+  /* virtual */ void Container2D::customize(MonitorElement *me) {
     me->setAxisTitle(_qx->name(), 1);
     me->setAxisTitle(_qy->name(), 2);
     me->setAxisTitle(_qz->name(), 3);
@@ -1074,15 +740,13 @@ namespace hcaldqm
 
     std::vector<std::string> xlabels = _qx->getLabels();
     std::vector<std::string> ylabels = _qy->getLabels();
-    for (unsigned int i=0; i<xlabels.size(); i++) {
-      me->setBinLabel(i+1, xlabels[i], 1);
+    for (unsigned int i = 0; i < xlabels.size(); i++) {
+      me->setBinLabel(i + 1, xlabels[i], 1);
     }
-    for (unsigned int i=0; i<ylabels.size(); i++) {
-      me->setBinLabel(i+1, ylabels[i], 2);
+    for (unsigned int i = 0; i < ylabels.size(); i++) {
+      me->setBinLabel(i + 1, ylabels[i], 2);
     }
   }
 
-  void Container2D::showOverflowZ(bool showOverflow) {
-    _qz->showOverflow(showOverflow);
-  }
-}
+  void Container2D::showOverflowZ(bool showOverflow) { _qz->showOverflow(showOverflow); }
+}  // namespace hcaldqm
diff --git a/DQM/HcalCommon/src/ContainerProf1D.cc b/DQM/HcalCommon/src/ContainerProf1D.cc
index 6d9e1db182a5c..17fce4b1bfe0d 100644
--- a/DQM/HcalCommon/src/ContainerProf1D.cc
+++ b/DQM/HcalCommon/src/ContainerProf1D.cc
@@ -1,43 +1,37 @@
 #include "DQM/HcalCommon/interface/ContainerProf1D.h"
 
-
-namespace hcaldqm
-{
+namespace hcaldqm {
   using namespace mapper;
   using namespace quantity;
   using namespace constants;
 
-  ContainerProf1D::ContainerProf1D()
-  {
+  ContainerProf1D::ContainerProf1D() {
     _qx = nullptr;
     _qy = nullptr;
   }
 
-  ContainerProf1D::ContainerProf1D(std::string const& folder,
+  ContainerProf1D::ContainerProf1D(std::string const &folder,
                                    hashfunctions::HashType hashtype,
-                                   Quantity* qx, Quantity* qy) :
-    Container1D(folder, hashtype, qx, qy)
-  {
+                                   Quantity *qx,
+                                   Quantity *qy)
+      : Container1D(folder, hashtype, qx, qy) {
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
   }
 
-  /* virtual */ void ContainerProf1D::initialize(std::string const& folder,
-                                                 hashfunctions::HashType hashtype,
-                                                 Quantity *qx, Quantity *qy,
-                                                 int debug/*=0*/)
-  {
+  /* virtual */ void ContainerProf1D::initialize(
+      std::string const &folder, hashfunctions::HashType hashtype, Quantity *qx, Quantity *qy, int debug /*=0*/) {
     Container1D::initialize(folder, hashtype, qx, qy, debug);
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
   }
 
-  /* virtual */ void ContainerProf1D::initialize(std::string const& folder,
-                                                 std::string const& qname,
+  /* virtual */ void ContainerProf1D::initialize(std::string const &folder,
+                                                 std::string const &qname,
                                                  hashfunctions::HashType hashtype,
-                                                 Quantity *qx, Quantity *qy,
-                                                 int debug/*=0*/)
-  {
+                                                 Quantity *qx,
+                                                 Quantity *qy,
+                                                 int debug /*=0*/) {
     Container1D::initialize(folder, qname, hashtype, qx, qy, debug);
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
@@ -45,159 +39,158 @@ namespace hcaldqm
 
   /* virtual */ void ContainerProf1D::book(DQMStore::IBooker &ib,
                                            HcalElectronicsMap const *emap,
-                                           std::string subsystem, std::string aux)
-  {
+                                           std::string subsystem,
+                                           std::string aux) {
     //  check Container1D.cc for the format
     //
-    ib.setCurrentFolder(subsystem+"/"+_folder+"/"+_qname
-                        +(aux.empty()?aux:"_"+aux)+"/"+_hashmap.getHashTypeName());
-    if (_hashmap.isDHash())
-      {
-        std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
-        for (std::vector<HcalGenericDetId>::const_iterator it=
-               dids.begin(); it!=dids.end(); ++it)
-          {
-            //  skip trigger towers and calibration
-            if (!it->isHcalDetId())
-              continue;
-
-            HcalDetId did = HcalDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(did);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-
-            _logger.debug(_hashmap.getName(did));
-            _mes.insert(
-                        std::make_pair(hash, ib.bookProfile(_hashmap.getName(did),
-                                                            _hashmap.getName(did), _qx->nbins(), _qx->min(),
-                                                            _qx->max(), _qy->min(), _qy->max())));
-            customize(_mes[hash]);
-          }
+    ib.setCurrentFolder(subsystem + "/" + _folder + "/" + _qname + (aux.empty() ? aux : "_" + aux) + "/" +
+                        _hashmap.getHashTypeName());
+    if (_hashmap.isDHash()) {
+      std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
+      for (std::vector<HcalGenericDetId>::const_iterator it = dids.begin(); it != dids.end(); ++it) {
+        //  skip trigger towers and calibration
+        if (!it->isHcalDetId())
+          continue;
+
+        HcalDetId did = HcalDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(did);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+
+        _logger.debug(_hashmap.getName(did));
+        _mes.insert(std::make_pair(hash,
+                                   ib.bookProfile(_hashmap.getName(did),
+                                                  _hashmap.getName(did),
+                                                  _qx->nbins(),
+                                                  _qx->min(),
+                                                  _qx->max(),
+                                                  _qy->min(),
+                                                  _qy->max())));
+        customize(_mes[hash]);
       }
-    else if (_hashmap.isEHash())
-      {
-        std::vector<HcalElectronicsId> eids =
-          emap->allElectronicsIdPrecision();
-        for (std::vector<HcalElectronicsId>::const_iterator it=
-               eids.begin(); it!=eids.end(); ++it)
-          {
-            HcalElectronicsId eid = HcalElectronicsId(it->rawId());
-            uint32_t hash = _hashmap.getHash(eid);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-
-            _logger.debug(_hashmap.getName(eid));
-            _mes.insert(
-                        std::make_pair(hash, ib.bookProfile(_hashmap.getName(eid),
-                                                            _hashmap.getName(eid), _qx->nbins(), _qx->min(),
-                                                            _qx->max(), _qy->min(), _qy->max())));
-            customize(_mes[hash]);
-          }
+    } else if (_hashmap.isEHash()) {
+      std::vector<HcalElectronicsId> eids = emap->allElectronicsIdPrecision();
+      for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+        HcalElectronicsId eid = HcalElectronicsId(it->rawId());
+        uint32_t hash = _hashmap.getHash(eid);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+
+        _logger.debug(_hashmap.getName(eid));
+        _mes.insert(std::make_pair(hash,
+                                   ib.bookProfile(_hashmap.getName(eid),
+                                                  _hashmap.getName(eid),
+                                                  _qx->nbins(),
+                                                  _qx->min(),
+                                                  _qx->max(),
+                                                  _qy->min(),
+                                                  _qy->max())));
+        customize(_mes[hash]);
       }
-    else if (_hashmap.isTHash())
-      {
-        std::vector<HcalTrigTowerDetId> tids =
-          emap->allTriggerId();
-        for (std::vector<HcalTrigTowerDetId>::const_iterator it=
-               tids.begin(); it!=tids.end(); ++it)
-          {
-            HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(tid);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-
-            _logger.debug(_hashmap.getName(tid));
-            _mes.insert(
-                        std::make_pair(hash, ib.bookProfile(_hashmap.getName(tid),
-                                                            _hashmap.getName(tid), _qx->nbins(), _qx->min(),
-                                                            _qx->max(), _qy->min(), _qy->max())));
-            customize(_mes[hash]);
-          }
+    } else if (_hashmap.isTHash()) {
+      std::vector<HcalTrigTowerDetId> tids = emap->allTriggerId();
+      for (std::vector<HcalTrigTowerDetId>::const_iterator it = tids.begin(); it != tids.end(); ++it) {
+        HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(tid);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+
+        _logger.debug(_hashmap.getName(tid));
+        _mes.insert(std::make_pair(hash,
+                                   ib.bookProfile(_hashmap.getName(tid),
+                                                  _hashmap.getName(tid),
+                                                  _qx->nbins(),
+                                                  _qx->min(),
+                                                  _qx->max(),
+                                                  _qy->min(),
+                                                  _qy->max())));
+        customize(_mes[hash]);
       }
+    }
   }
 
   /* virtual */ void ContainerProf1D::book(DQMStore::IBooker &ib,
-                                           HcalElectronicsMap const *emap, filter::HashFilter const& filter,
-                                           std::string subsystem, std::string aux)
-  {
+                                           HcalElectronicsMap const *emap,
+                                           filter::HashFilter const &filter,
+                                           std::string subsystem,
+                                           std::string aux) {
     //  check Container1D.cc for the format
     //
-    ib.setCurrentFolder(subsystem+"/"+_folder+"/"+_qname
-                        +(aux.empty()?aux:"_"+aux)+"/"+_hashmap.getHashTypeName());
-    if (_hashmap.isDHash())
-      {
-        std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
-        for (std::vector<HcalGenericDetId>::const_iterator it=
-               dids.begin(); it!=dids.end(); ++it)
-          {
-            //  skip trigger towers and calibration
-            if (!it->isHcalDetId())
-              continue;
-
-            HcalDetId did = HcalDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(did);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-            if (filter.filter(did))
-              continue;
-
-            _logger.debug(_hashmap.getName(did));
-            _mes.insert(
-                        std::make_pair(hash, ib.bookProfile(_hashmap.getName(did),
-                                                            _hashmap.getName(did), _qx->nbins(), _qx->min(),
-                                                            _qx->max(), _qy->min(), _qy->max())));
-            customize(_mes[hash]);
-          }
+    ib.setCurrentFolder(subsystem + "/" + _folder + "/" + _qname + (aux.empty() ? aux : "_" + aux) + "/" +
+                        _hashmap.getHashTypeName());
+    if (_hashmap.isDHash()) {
+      std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
+      for (std::vector<HcalGenericDetId>::const_iterator it = dids.begin(); it != dids.end(); ++it) {
+        //  skip trigger towers and calibration
+        if (!it->isHcalDetId())
+          continue;
+
+        HcalDetId did = HcalDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(did);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+        if (filter.filter(did))
+          continue;
+
+        _logger.debug(_hashmap.getName(did));
+        _mes.insert(std::make_pair(hash,
+                                   ib.bookProfile(_hashmap.getName(did),
+                                                  _hashmap.getName(did),
+                                                  _qx->nbins(),
+                                                  _qx->min(),
+                                                  _qx->max(),
+                                                  _qy->min(),
+                                                  _qy->max())));
+        customize(_mes[hash]);
       }
-    else if (_hashmap.isEHash())
-      {
-        std::vector<HcalElectronicsId> eids =
-          emap->allElectronicsIdPrecision();
-        for (std::vector<HcalElectronicsId>::const_iterator it=
-               eids.begin(); it!=eids.end(); ++it)
-          {
-            HcalElectronicsId eid = HcalElectronicsId(it->rawId());
-            uint32_t hash = _hashmap.getHash(eid);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-            if (filter.filter(eid))
-              continue;
-
-            _logger.debug(_hashmap.getName(eid));
-            _mes.insert(
-                        std::make_pair(hash, ib.bookProfile(_hashmap.getName(eid),
-                                                            _hashmap.getName(eid), _qx->nbins(), _qx->min(),
-                                                            _qx->max(), _qy->min(), _qy->max())));
-            customize(_mes[hash]);
-          }
+    } else if (_hashmap.isEHash()) {
+      std::vector<HcalElectronicsId> eids = emap->allElectronicsIdPrecision();
+      for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+        HcalElectronicsId eid = HcalElectronicsId(it->rawId());
+        uint32_t hash = _hashmap.getHash(eid);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+        if (filter.filter(eid))
+          continue;
+
+        _logger.debug(_hashmap.getName(eid));
+        _mes.insert(std::make_pair(hash,
+                                   ib.bookProfile(_hashmap.getName(eid),
+                                                  _hashmap.getName(eid),
+                                                  _qx->nbins(),
+                                                  _qx->min(),
+                                                  _qx->max(),
+                                                  _qy->min(),
+                                                  _qy->max())));
+        customize(_mes[hash]);
       }
-    else if (_hashmap.isTHash())
-      {
-        std::vector<HcalTrigTowerDetId> tids =
-          emap->allTriggerId();
-        for (std::vector<HcalTrigTowerDetId>::const_iterator it=
-               tids.begin(); it!=tids.end(); ++it)
-          {
-            HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(tid);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-            if (filter.filter(tid))
-              continue;
-
-            _logger.debug(_hashmap.getName(tid));
-            _mes.insert(
-                        std::make_pair(hash, ib.bookProfile(_hashmap.getName(tid),
-                                                            _hashmap.getName(tid), _qx->nbins(), _qx->min(),
-                                                            _qx->max(), _qy->min(), _qy->max())));
-            customize(_mes[hash]);
-          }
+    } else if (_hashmap.isTHash()) {
+      std::vector<HcalTrigTowerDetId> tids = emap->allTriggerId();
+      for (std::vector<HcalTrigTowerDetId>::const_iterator it = tids.begin(); it != tids.end(); ++it) {
+        HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(tid);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+        if (filter.filter(tid))
+          continue;
+
+        _logger.debug(_hashmap.getName(tid));
+        _mes.insert(std::make_pair(hash,
+                                   ib.bookProfile(_hashmap.getName(tid),
+                                                  _hashmap.getName(tid),
+                                                  _qx->nbins(),
+                                                  _qx->min(),
+                                                  _qx->max(),
+                                                  _qy->min(),
+                                                  _qy->max())));
+        customize(_mes[hash]);
       }
+    }
   }
-}
+}  // namespace hcaldqm
diff --git a/DQM/HcalCommon/src/ContainerProf2D.cc b/DQM/HcalCommon/src/ContainerProf2D.cc
index e133def89d646..7213757806cf3 100644
--- a/DQM/HcalCommon/src/ContainerProf2D.cc
+++ b/DQM/HcalCommon/src/ContainerProf2D.cc
@@ -1,47 +1,44 @@
 #include "DQM/HcalCommon/interface/ContainerProf2D.h"
 
-namespace hcaldqm
-{
+namespace hcaldqm {
   using namespace mapper;
   using namespace quantity;
   using namespace constants;
 
-  ContainerProf2D::ContainerProf2D()
-  {
+  ContainerProf2D::ContainerProf2D() {
     _qx = nullptr;
     _qy = nullptr;
     _qz = nullptr;
   }
 
-  ContainerProf2D::ContainerProf2D(std::string const& folder,
-                                   hashfunctions::HashType hashtype, Quantity *qx, Quantity *qy,
-                                   Quantity *qz) :
-    Container2D(folder, hashtype, qx, qy, qz)
-  {
+  ContainerProf2D::ContainerProf2D(
+      std::string const &folder, hashfunctions::HashType hashtype, Quantity *qx, Quantity *qy, Quantity *qz)
+      : Container2D(folder, hashtype, qx, qy, qz) {
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
     _qz->setAxisType(quantity::fZAxis);
   }
 
-  /* virtual */ void ContainerProf2D::initialize(std::string const& folder,
-                                                 hashfunctions::HashType hashtype, Quantity *qx, Quantity *qy,
+  /* virtual */ void ContainerProf2D::initialize(std::string const &folder,
+                                                 hashfunctions::HashType hashtype,
+                                                 Quantity *qx,
+                                                 Quantity *qy,
                                                  Quantity *qz,
-                                                 int debug/*=0*/)
-  {
-    Container2D::initialize(folder, hashtype, qx, qy, qz,debug);
+                                                 int debug /*=0*/) {
+    Container2D::initialize(folder, hashtype, qx, qy, qz, debug);
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
     _qz->setAxisType(quantity::fZAxis);
   }
 
-  /* virtual */ void ContainerProf2D::initialize(std::string const& folder,
-                                                 std::string const& qname,
-                                                 hashfunctions::HashType hashtype, Quantity *qx, Quantity *qy,
+  /* virtual */ void ContainerProf2D::initialize(std::string const &folder,
+                                                 std::string const &qname,
+                                                 hashfunctions::HashType hashtype,
+                                                 Quantity *qx,
+                                                 Quantity *qy,
                                                  Quantity *qz,
-                                                 int debug/*=0*/)
-  {
-    Container2D::initialize(folder, qname, hashtype, qx, qy, qz,
-                            debug);
+                                                 int debug /*=0*/) {
+    Container2D::initialize(folder, qname, hashtype, qx, qy, qz, debug);
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
     _qz->setAxisType(quantity::fZAxis);
@@ -49,421 +46,344 @@ namespace hcaldqm
 
   /* virtual */ void ContainerProf2D::book(DQMStore::IBooker &ib,
                                            HcalElectronicsMap const *emap,
-                                           std::string subsystem, std::string aux)
-  {
+                                           std::string subsystem,
+                                           std::string aux) {
     //  full path as in Container1D.cc
     //
-    ib.setCurrentFolder(subsystem+"/"+_folder+"/"+_qname
-                        +(aux.empty()?aux:"_"+aux)+"/"+_hashmap.getHashTypeName());
-    if (_hashmap.isDHash())
-      {
-        //      for Detector Hashes
-        std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
-        for (std::vector<HcalGenericDetId>::const_iterator it=
-               dids.begin(); it!=dids.end(); ++it)
-          {
-            //  skip trigger towers and calibration
-            if (!it->isHcalDetId())
-              continue;
-
-            HcalDetId did = HcalDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(did);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-
-            _logger.debug(_hashmap.getName(did));
-            _mes.insert(
-                        std::make_pair(hash, ib.bookProfile2D(
-                                                              _hashmap.getName(did), _hashmap.getName(did),
-                                                              _qx->nbins(), _qx->min(), _qx->max(),
-                                                              _qy->nbins(), _qy->min(), _qy->max(),
-                                                              _qz->min(), _qz->max())));
-            customize(_mes[hash]);
-          }
+    ib.setCurrentFolder(subsystem + "/" + _folder + "/" + _qname + (aux.empty() ? aux : "_" + aux) + "/" +
+                        _hashmap.getHashTypeName());
+    if (_hashmap.isDHash()) {
+      //      for Detector Hashes
+      std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
+      for (std::vector<HcalGenericDetId>::const_iterator it = dids.begin(); it != dids.end(); ++it) {
+        //  skip trigger towers and calibration
+        if (!it->isHcalDetId())
+          continue;
+
+        HcalDetId did = HcalDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(did);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+
+        _logger.debug(_hashmap.getName(did));
+        _mes.insert(std::make_pair(hash,
+                                   ib.bookProfile2D(_hashmap.getName(did),
+                                                    _hashmap.getName(did),
+                                                    _qx->nbins(),
+                                                    _qx->min(),
+                                                    _qx->max(),
+                                                    _qy->nbins(),
+                                                    _qy->min(),
+                                                    _qy->max(),
+                                                    _qz->min(),
+                                                    _qz->max())));
+        customize(_mes[hash]);
       }
-    else if (_hashmap.isEHash())
-      {
-        //      for Electronics hashes
-        std::vector<HcalElectronicsId> eids =
-          emap->allElectronicsIdPrecision();
-        for (std::vector<HcalElectronicsId>::const_iterator it=
-               eids.begin(); it!=eids.end(); ++it)
-          {
-            HcalElectronicsId eid = HcalElectronicsId(it->rawId());
-            uint32_t hash = _hashmap.getHash(eid);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-
-            _logger.debug(_hashmap.getName(eid));
-            _mes.insert(
-                        std::make_pair(hash, ib.bookProfile2D(
-                                                              _hashmap.getName(eid), _hashmap.getName(eid),
-                                                              _qx->nbins(), _qx->min(), _qx->max(),
-                                                              _qy->nbins(), _qy->min(), _qy->max(),
-                                                              _qz->min(), _qz->max())));
-            customize(_mes[hash]);
-          }
+    } else if (_hashmap.isEHash()) {
+      //      for Electronics hashes
+      std::vector<HcalElectronicsId> eids = emap->allElectronicsIdPrecision();
+      for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+        HcalElectronicsId eid = HcalElectronicsId(it->rawId());
+        uint32_t hash = _hashmap.getHash(eid);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+
+        _logger.debug(_hashmap.getName(eid));
+        _mes.insert(std::make_pair(hash,
+                                   ib.bookProfile2D(_hashmap.getName(eid),
+                                                    _hashmap.getName(eid),
+                                                    _qx->nbins(),
+                                                    _qx->min(),
+                                                    _qx->max(),
+                                                    _qy->nbins(),
+                                                    _qy->min(),
+                                                    _qy->max(),
+                                                    _qz->min(),
+                                                    _qz->max())));
+        customize(_mes[hash]);
       }
-    else if (_hashmap.isTHash())
-      {
-        //      for TrigTower hashes
-        std::vector<HcalTrigTowerDetId> tids =
-          emap->allTriggerId();
-        for (std::vector<HcalTrigTowerDetId>::const_iterator it=
-               tids.begin(); it!=tids.end(); ++it)
-          {
-            HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(tid);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-
-            _logger.debug(_hashmap.getName(tid));
-            _mes.insert(
-                        std::make_pair(hash, ib.bookProfile2D(
-                                                              _hashmap.getName(tid), _hashmap.getName(tid),
-                                                              _qx->nbins(), _qx->min(), _qx->max(),
-                                                              _qy->nbins(), _qy->min(), _qy->max(),
-                                                              _qz->min(), _qz->max())));
-            customize(_mes[hash]);
-          }
+    } else if (_hashmap.isTHash()) {
+      //      for TrigTower hashes
+      std::vector<HcalTrigTowerDetId> tids = emap->allTriggerId();
+      for (std::vector<HcalTrigTowerDetId>::const_iterator it = tids.begin(); it != tids.end(); ++it) {
+        HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(tid);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+
+        _logger.debug(_hashmap.getName(tid));
+        _mes.insert(std::make_pair(hash,
+                                   ib.bookProfile2D(_hashmap.getName(tid),
+                                                    _hashmap.getName(tid),
+                                                    _qx->nbins(),
+                                                    _qx->min(),
+                                                    _qx->max(),
+                                                    _qy->nbins(),
+                                                    _qy->min(),
+                                                    _qy->max(),
+                                                    _qz->min(),
+                                                    _qz->max())));
+        customize(_mes[hash]);
       }
+    }
   }
 
   /* virtual */ void ContainerProf2D::book(DQMStore::IBooker &ib,
-                                           HcalElectronicsMap const *emap, filter::HashFilter const& filter,
-                                           std::string subsystem, std::string aux)
-  {
+                                           HcalElectronicsMap const *emap,
+                                           filter::HashFilter const &filter,
+                                           std::string subsystem,
+                                           std::string aux) {
     //  full path as in Container1D.cc
     //
-    ib.setCurrentFolder(subsystem+"/"+_folder+"/"+_qname
-                        +(aux.empty()?aux:"_"+aux)+"/"+_hashmap.getHashTypeName());
-    if (_hashmap.isDHash())
-      {
-        //      for Detector Hashes
-        std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
-        for (std::vector<HcalGenericDetId>::const_iterator it=
-               dids.begin(); it!=dids.end(); ++it)
-          {
-            //  skip trigger towers and calibration
-            if (!it->isHcalDetId())
-              continue;
-
-            HcalDetId did = HcalDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(did);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-            if (filter.filter(did))
-              continue;
-
-            _logger.debug(_hashmap.getName(did));
-            _mes.insert(
-                        std::make_pair(hash, ib.bookProfile2D(
-                                                              _hashmap.getName(did), _hashmap.getName(did),
-                                                              _qx->nbins(), _qx->min(), _qx->max(),
-                                                              _qy->nbins(), _qy->min(), _qy->max(),
-                                                              _qz->min(), _qz->max())));
-            customize(_mes[hash]);
-          }
+    ib.setCurrentFolder(subsystem + "/" + _folder + "/" + _qname + (aux.empty() ? aux : "_" + aux) + "/" +
+                        _hashmap.getHashTypeName());
+    if (_hashmap.isDHash()) {
+      //      for Detector Hashes
+      std::vector<HcalGenericDetId> dids = emap->allPrecisionId();
+      for (std::vector<HcalGenericDetId>::const_iterator it = dids.begin(); it != dids.end(); ++it) {
+        //  skip trigger towers and calibration
+        if (!it->isHcalDetId())
+          continue;
+
+        HcalDetId did = HcalDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(did);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+        if (filter.filter(did))
+          continue;
+
+        _logger.debug(_hashmap.getName(did));
+        _mes.insert(std::make_pair(hash,
+                                   ib.bookProfile2D(_hashmap.getName(did),
+                                                    _hashmap.getName(did),
+                                                    _qx->nbins(),
+                                                    _qx->min(),
+                                                    _qx->max(),
+                                                    _qy->nbins(),
+                                                    _qy->min(),
+                                                    _qy->max(),
+                                                    _qz->min(),
+                                                    _qz->max())));
+        customize(_mes[hash]);
       }
-    else if (_hashmap.isEHash())
-      {
-        //      for Electronics hashes
-        std::vector<HcalElectronicsId> eids =
-          emap->allElectronicsIdPrecision();
-        for (std::vector<HcalElectronicsId>::const_iterator it=
-               eids.begin(); it!=eids.end(); ++it)
-          {
-            HcalElectronicsId eid = HcalElectronicsId(it->rawId());
-            uint32_t hash = _hashmap.getHash(eid);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-            if (filter.filter(eid))
-              continue;
-
-            _logger.debug(_hashmap.getName(eid));
-            _mes.insert(
-                        std::make_pair(hash, ib.bookProfile2D(
-                                                              _hashmap.getName(eid), _hashmap.getName(eid),
-                                                              _qx->nbins(), _qx->min(), _qx->max(),
-                                                              _qy->nbins(), _qy->min(), _qy->max(),
-                                                              _qz->min(), _qz->max())));
-            customize(_mes[hash]);
-          }
+    } else if (_hashmap.isEHash()) {
+      //      for Electronics hashes
+      std::vector<HcalElectronicsId> eids = emap->allElectronicsIdPrecision();
+      for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+        HcalElectronicsId eid = HcalElectronicsId(it->rawId());
+        uint32_t hash = _hashmap.getHash(eid);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+        if (filter.filter(eid))
+          continue;
+
+        _logger.debug(_hashmap.getName(eid));
+        _mes.insert(std::make_pair(hash,
+                                   ib.bookProfile2D(_hashmap.getName(eid),
+                                                    _hashmap.getName(eid),
+                                                    _qx->nbins(),
+                                                    _qx->min(),
+                                                    _qx->max(),
+                                                    _qy->nbins(),
+                                                    _qy->min(),
+                                                    _qy->max(),
+                                                    _qz->min(),
+                                                    _qz->max())));
+        customize(_mes[hash]);
       }
-    else if (_hashmap.isTHash())
-      {
-        //      for TrigTower hashes
-        std::vector<HcalTrigTowerDetId> tids =
-          emap->allTriggerId();
-        for (std::vector<HcalTrigTowerDetId>::const_iterator it=
-               tids.begin(); it!=tids.end(); ++it)
-          {
-            HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
-            uint32_t hash = _hashmap.getHash(tid);
-            MEMap::iterator mit = _mes.find(hash);
-            if (mit!=_mes.end())
-              continue;
-            if (filter.filter(tid))
-              continue;
-
-            _logger.debug(_hashmap.getName(tid));
-            _mes.insert(
-                        std::make_pair(hash, ib.bookProfile2D(
-                                                              _hashmap.getName(tid), _hashmap.getName(tid),
-                                                              _qx->nbins(), _qx->min(), _qx->max(),
-                                                              _qy->nbins(), _qy->min(), _qy->max(),
-                                                              _qz->min(), _qz->max())));
-            customize(_mes[hash]);
-          }
+    } else if (_hashmap.isTHash()) {
+      //      for TrigTower hashes
+      std::vector<HcalTrigTowerDetId> tids = emap->allTriggerId();
+      for (std::vector<HcalTrigTowerDetId>::const_iterator it = tids.begin(); it != tids.end(); ++it) {
+        HcalTrigTowerDetId tid = HcalTrigTowerDetId(it->rawId());
+        uint32_t hash = _hashmap.getHash(tid);
+        MEMap::iterator mit = _mes.find(hash);
+        if (mit != _mes.end())
+          continue;
+        if (filter.filter(tid))
+          continue;
+
+        _logger.debug(_hashmap.getName(tid));
+        _mes.insert(std::make_pair(hash,
+                                   ib.bookProfile2D(_hashmap.getName(tid),
+                                                    _hashmap.getName(tid),
+                                                    _qx->nbins(),
+                                                    _qx->min(),
+                                                    _qx->max(),
+                                                    _qy->nbins(),
+                                                    _qy->min(),
+                                                    _qy->max(),
+                                                    _qz->min(),
+                                                    _qz->max())));
+        customize(_mes[hash]);
       }
+    }
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalDetId const& did)
-  {
-    _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                      _qy->getValue(did));
+  /* virtual */ void ContainerProf2D::fill(HcalDetId const &did) {
+    _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(did));
   }
 
   //    HcalDetId based
-  /* virtual */ void ContainerProf2D::fill(HcalDetId const& did, int x)
-  {
+  /* virtual */ void ContainerProf2D::fill(HcalDetId const &did, int x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(did), x);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(did), x);
     else if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x));
     else if (_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did));
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalDetId const& did, double x)
-  {
+  /* virtual */ void ContainerProf2D::fill(HcalDetId const &did, double x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(did), x);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(did), x);
     else if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x));
     else if (_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did));
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalDetId const& did,
-                                           int x, double y)
-  {
+  /* virtual */ void ContainerProf2D::fill(HcalDetId const &did, int x, double y) {
     if (_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
     else if (!_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did), y);
     else if (!_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalDetId const& did,
-                                           int x, int y)
-  {
+  /* virtual */ void ContainerProf2D::fill(HcalDetId const &did, int x, int y) {
     if (_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
     else if (!_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did), y);
     else if (!_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalDetId const& did,
-                                           double x, double y)
-  {
+  /* virtual */ void ContainerProf2D::fill(HcalDetId const &did, double x, double y) {
     if (_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
     else if (!_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did), y);
     else if (!_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalElectronicsId const& did)
-  {
-    _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                      _qy->getValue(did));
+  /* virtual */ void ContainerProf2D::fill(HcalElectronicsId const &did) {
+    _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(did));
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalElectronicsId const& did, int x)
-  {
+  /* virtual */ void ContainerProf2D::fill(HcalElectronicsId const &did, int x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(did), x);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(did), x);
     else if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x));
     else if (_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did));
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalElectronicsId const& did, double x)
-  {
+  /* virtual */ void ContainerProf2D::fill(HcalElectronicsId const &did, double x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(did), x);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(did), x);
     else if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x));
     else if (_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did));
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalElectronicsId const& did,
-                                           int x, double y)
-  {
+  /* virtual */ void ContainerProf2D::fill(HcalElectronicsId const &did, int x, double y) {
     if (_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
     else if (!_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did), y);
     else if (!_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalElectronicsId const& did,
-                                           int x, int y)
-  {
+  /* virtual */ void ContainerProf2D::fill(HcalElectronicsId const &did, int x, int y) {
     if (_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
     else if (!_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did), y);
     else if (!_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalElectronicsId const& did,
-                                           double x, double y)
-  {
+  /* virtual */ void ContainerProf2D::fill(HcalElectronicsId const &did, double x, double y) {
     if (_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
     else if (!_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did), y);
     else if (!_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalTrigTowerDetId const& did)
-  {
-    _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                      _qy->getValue(did));
+  /* virtual */ void ContainerProf2D::fill(HcalTrigTowerDetId const &did) {
+    _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(did));
   }
 
   //    HcalDetId based
-  /* virtual */ void ContainerProf2D::fill(HcalTrigTowerDetId const& did, int x)
-  {
+  /* virtual */ void ContainerProf2D::fill(HcalTrigTowerDetId const &did, int x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(did), x);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(did), x);
     else if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x));
     else if (_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did));
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalTrigTowerDetId const& did,
-                                           double x)
-  {
+  /* virtual */ void ContainerProf2D::fill(HcalTrigTowerDetId const &did, double x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(did), x);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(did), x);
     else if (_qx->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x));
     else if (_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did));
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalTrigTowerDetId const& did,
-                                           int x, double y)
-  {
+  /* virtual */ void ContainerProf2D::fill(HcalTrigTowerDetId const &did, int x, double y) {
     if (_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
     else if (!_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did), y);
     else if (!_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalTrigTowerDetId const& did,
-                                           int x, int y)
-  {
+  /* virtual */ void ContainerProf2D::fill(HcalTrigTowerDetId const &did, int x, int y) {
     if (_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
     else if (!_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did), y);
     else if (!_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalTrigTowerDetId const& did,
-                                           double x, double y)
-  {
+  /* virtual */ void ContainerProf2D::fill(HcalTrigTowerDetId const &did, double x, double y) {
     if (_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did),
-                                        _qy->getValue(x), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(did), _qy->getValue(x), y);
     else if (!_qx->isCoordinate() && _qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(did), y);
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(did), y);
     else if (!_qx->isCoordinate() && !_qy->isCoordinate())
-      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x),
-                                        _qy->getValue(y));
+      _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalDetId const& did,
-                                           double x, double y, double z)
-  {
+  /* virtual */ void ContainerProf2D::fill(HcalDetId const &did, double x, double y, double z) {
     _mes[_hashmap.getHash(did)]->Fill(_qx->getValue(x), _qy->getValue(y), _qz->getValue(z));
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalElectronicsId const& eid,
-                                           double x, double y, double z)
-  {
+  /* virtual */ void ContainerProf2D::fill(HcalElectronicsId const &eid, double x, double y, double z) {
     _mes[_hashmap.getHash(eid)]->Fill(_qx->getValue(x), _qy->getValue(y), _qz->getValue(z));
   }
 
-  /* virtual */ void ContainerProf2D::fill(HcalTrigTowerDetId const& tid,
-                                           double x, double y, double z)
-  {
+  /* virtual */ void ContainerProf2D::fill(HcalTrigTowerDetId const &tid, double x, double y, double z) {
     _mes[_hashmap.getHash(tid)]->Fill(_qx->getValue(x), _qy->getValue(y), _qz->getValue(z));
   }
 
-}
+}  // namespace hcaldqm
diff --git a/DQM/HcalCommon/src/ContainerSingle1D.cc b/DQM/HcalCommon/src/ContainerSingle1D.cc
index fc82a789a3101..dea4a7a7842d4 100644
--- a/DQM/HcalCommon/src/ContainerSingle1D.cc
+++ b/DQM/HcalCommon/src/ContainerSingle1D.cc
@@ -1,63 +1,52 @@
 #include "DQM/HcalCommon/interface/ContainerSingle1D.h"
 
-namespace hcaldqm
-{
+namespace hcaldqm {
   using namespace quantity;
   using namespace constants;
-  ContainerSingle1D::ContainerSingle1D()
-  {
+  ContainerSingle1D::ContainerSingle1D() {
     _qx = nullptr;
     _qy = nullptr;
   }
 
-  ContainerSingle1D::ContainerSingle1D(ContainerSingle1D const& c):
-    Container(c._folder, c._qname)
-  {
+  ContainerSingle1D::ContainerSingle1D(ContainerSingle1D const &c) : Container(c._folder, c._qname) {
     _qx = c._qx->makeCopy();
     _qy = c._qy->makeCopy();
   }
 
-  ContainerSingle1D::ContainerSingle1D(std::string const& folder,
-                                       Quantity *qx, Quantity *qy):
-    Container(folder, qy->name()+"vs"+qx->name()), _qx(qx), _qy(qy)
-  {
+  ContainerSingle1D::ContainerSingle1D(std::string const &folder, Quantity *qx, Quantity *qy)
+      : Container(folder, qy->name() + "vs" + qx->name()), _qx(qx), _qy(qy) {
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
   }
 
-  ContainerSingle1D::ContainerSingle1D(std::string const& folder,
-                                       std::string const& qname,
-                                       Quantity *qx, Quantity *qy):
-    Container(folder, qname), _qx(qx), _qy(qy)
-  {
+  ContainerSingle1D::ContainerSingle1D(std::string const &folder, std::string const &qname, Quantity *qx, Quantity *qy)
+      : Container(folder, qname), _qx(qx), _qy(qy) {
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
   }
 
-  ContainerSingle1D::~ContainerSingle1D()
-  {
-    if (_qx!=nullptr)
+  ContainerSingle1D::~ContainerSingle1D() {
+    if (_qx != nullptr)
       delete _qx;
-    if (_qy!=nullptr)
+    if (_qy != nullptr)
       delete _qy;
     _qx = nullptr;
     _qy = nullptr;
   }
 
-  /* virtual */ void ContainerSingle1D::initialize(std::string const& folder,
-                                                   Quantity *qx, Quantity *qy, int debug/*=0*/)
-  {
-    Container::initialize(folder, qy->name()+"vs"+qx->name(), debug);
+  /* virtual */ void ContainerSingle1D::initialize(std::string const &folder,
+                                                   Quantity *qx,
+                                                   Quantity *qy,
+                                                   int debug /*=0*/) {
+    Container::initialize(folder, qy->name() + "vs" + qx->name(), debug);
     _qx = qx;
     _qy = qy;
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
   }
 
-  /* virtual */ void ContainerSingle1D::initialize(std::string const& folder,
-                                                   std::string const& qname,
-                                                   Quantity *qx, Quantity *qy, int debug/*=0*/)
-  {
+  /* virtual */ void ContainerSingle1D::initialize(
+      std::string const &folder, std::string const &qname, Quantity *qx, Quantity *qy, int debug /*=0*/) {
     Container::initialize(folder, qname, debug);
     _qx = qx;
     _qy = qy;
@@ -65,18 +54,17 @@ namespace hcaldqm
     _qy->setAxisType(quantity::fYAxis);
   }
 
-  /* virtual */ void ContainerSingle1D::book(DQMStore::IBooker &ib,
-                                             std::string subsystem, std::string aux)
-  {
-    ib.setCurrentFolder(subsystem+"/"+_folder+"/"+_qname);
-    _me = ib.book1D(_qname+(aux.empty()?aux:"_"+aux),
-                    _qname+(aux.empty()?aux:" "+aux),
-                    _qx->nbins(), _qx->min(), _qx->max());
+  /* virtual */ void ContainerSingle1D::book(DQMStore::IBooker &ib, std::string subsystem, std::string aux) {
+    ib.setCurrentFolder(subsystem + "/" + _folder + "/" + _qname);
+    _me = ib.book1D(_qname + (aux.empty() ? aux : "_" + aux),
+                    _qname + (aux.empty() ? aux : " " + aux),
+                    _qx->nbins(),
+                    _qx->min(),
+                    _qx->max());
     customize();
   }
 
-  /* virtual */ void ContainerSingle1D::customize()
-  {
+  /* virtual */ void ContainerSingle1D::customize() {
     _me->setAxisTitle(_qx->name(), 1);
     _me->setAxisTitle(_qy->name(), 2);
 
@@ -85,222 +73,135 @@ namespace hcaldqm
     _qy->setBits(h);
 
     std::vector<std::string> xlabels = _qx->getLabels();
-    for (unsigned int i=0; i<xlabels.size(); i++)
-      _me->setBinLabel(i+1, xlabels[i], 1);
+    for (unsigned int i = 0; i < xlabels.size(); i++)
+      _me->setBinLabel(i + 1, xlabels[i], 1);
   }
 
-  /* virtual */ void ContainerSingle1D::fill(int x)
-  {
-    _me->Fill(_qx->getValue(x));
-  }
+  /* virtual */ void ContainerSingle1D::fill(int x) { _me->Fill(_qx->getValue(x)); }
 
-  /* virtual */ void ContainerSingle1D::fill(double x)
-  {
-    _me->Fill(_qx->getValue(x));
-  }
+  /* virtual */ void ContainerSingle1D::fill(double x) { _me->Fill(_qx->getValue(x)); }
 
-  /* virtual */ void ContainerSingle1D::fill(int x, int y)
-  {
-    _me->Fill(_qx->getValue(x), _qy->getValue(y));
-  }
+  /* virtual */ void ContainerSingle1D::fill(int x, int y) { _me->Fill(_qx->getValue(x), _qy->getValue(y)); }
 
-  /* virtual */ void ContainerSingle1D::fill(int x, double y)
-  {
-    _me->Fill(_qx->getValue(x), _qy->getValue(y));
-  }
+  /* virtual */ void ContainerSingle1D::fill(int x, double y) { _me->Fill(_qx->getValue(x), _qy->getValue(y)); }
 
-  /* virtual */ void ContainerSingle1D::fill(double x, int y)
-  {
-    _me->Fill(_qx->getValue(x), _qy->getValue(y));
-  }
+  /* virtual */ void ContainerSingle1D::fill(double x, int y) { _me->Fill(_qx->getValue(x), _qy->getValue(y)); }
 
-  /* virtual */ void ContainerSingle1D::fill(double x, double y)
-  {
-    _me->Fill(_qx->getValue(x), _qy->getValue(y));
-  }
+  /* virtual */ void ContainerSingle1D::fill(double x, double y) { _me->Fill(_qx->getValue(x), _qy->getValue(y)); }
 
-  /* virtual */ double ContainerSingle1D::getBinContent(int x)
-  {
-    return _me->getBinContent(_qx->getBin(x));
-  }
-  /* virtual */ double ContainerSingle1D::getBinContent(double x)
-  {
-    return _me->getBinContent(_qx->getBin(x));
-  }
-  /* virtual */ double ContainerSingle1D::getBinEntries(int x)
-  {
-    return _me->getBinEntries(_qx->getBin(x));
-  }
-  /* virtual */ double ContainerSingle1D::getBinEntries(double x)
-  {
-    return _me->getBinEntries(_qx->getBin(x));
-  }
-  /* virtual */ void ContainerSingle1D::setBinContent(int x, int y)
-  {
-    _me->setBinContent(_qx->getBin(x), y);
-  }
-  /* virtual */ void ContainerSingle1D::setBinContent(int x, double y)
-  {
-    _me->setBinContent(_qx->getBin(x), y);
-  }
-  /* virtual */ void ContainerSingle1D::setBinContent(double x, int y)
-  {
-    _me->setBinContent(_qx->getBin(x), y);
-  }
-  /* virtual */ void ContainerSingle1D::setBinContent(double x, double y)
-  {
-    _me->setBinContent(_qx->getBin(x), y);
-  }
+  /* virtual */ double ContainerSingle1D::getBinContent(int x) { return _me->getBinContent(_qx->getBin(x)); }
+  /* virtual */ double ContainerSingle1D::getBinContent(double x) { return _me->getBinContent(_qx->getBin(x)); }
+  /* virtual */ double ContainerSingle1D::getBinEntries(int x) { return _me->getBinEntries(_qx->getBin(x)); }
+  /* virtual */ double ContainerSingle1D::getBinEntries(double x) { return _me->getBinEntries(_qx->getBin(x)); }
+  /* virtual */ void ContainerSingle1D::setBinContent(int x, int y) { _me->setBinContent(_qx->getBin(x), y); }
+  /* virtual */ void ContainerSingle1D::setBinContent(int x, double y) { _me->setBinContent(_qx->getBin(x), y); }
+  /* virtual */ void ContainerSingle1D::setBinContent(double x, int y) { _me->setBinContent(_qx->getBin(x), y); }
+  /* virtual */ void ContainerSingle1D::setBinContent(double x, double y) { _me->setBinContent(_qx->getBin(x), y); }
 
-  /* virtual */ void ContainerSingle1D::fill(HcalDetId const& id)
-  {
-    _me->Fill(_qx->getValue(id));
-  }
+  /* virtual */ void ContainerSingle1D::fill(HcalDetId const &id) { _me->Fill(_qx->getValue(id)); }
 
-  /* virtual */ void ContainerSingle1D::fill(HcalDetId const& id, double x)
-  {
+  /* virtual */ void ContainerSingle1D::fill(HcalDetId const &id, double x) {
     if (_qx->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(x));
     else
       _me->Fill(_qx->getValue(x));
   }
 
-  /* virtual */ void ContainerSingle1D::fill(HcalDetId const& id, double x,
-                                             double y)
-  {
+  /* virtual */ void ContainerSingle1D::fill(HcalDetId const &id, double x, double y) {
     if (_qx->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(x), y);
     else
       _me->Fill(_qy->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ double ContainerSingle1D::getBinContent(HcalDetId const& id)
-  {
+  /* virtual */ double ContainerSingle1D::getBinContent(HcalDetId const &id) {
     return _me->getBinContent(_qx->getBin(id));
   }
-  /* virtual */ double ContainerSingle1D::getBinEntries(HcalDetId const& id)
-  {
+  /* virtual */ double ContainerSingle1D::getBinEntries(HcalDetId const &id) {
     return _me->getBinEntries(_qx->getBin(id));
   }
 
-  /* virtual */ void ContainerSingle1D::setBinContent(HcalDetId const& id,
-                                                      int x)
-  {
+  /* virtual */ void ContainerSingle1D::setBinContent(HcalDetId const &id, int x) {
     _me->setBinContent(_qx->getBin(id), x);
   }
-  /* virtual */ void ContainerSingle1D::setBinContent(HcalDetId const& id,
-                                                      double x)
-  {
+  /* virtual */ void ContainerSingle1D::setBinContent(HcalDetId const &id, double x) {
     _me->setBinContent(_qx->getBin(id), x);
   }
 
-  /* virtual */ void ContainerSingle1D::fill(HcalElectronicsId const& id)
-  {
-    _me->Fill(_qx->getValue(id));
-  }
+  /* virtual */ void ContainerSingle1D::fill(HcalElectronicsId const &id) { _me->Fill(_qx->getValue(id)); }
 
-  /* virtual */ void ContainerSingle1D::fill(HcalElectronicsId const& id,
-                                             double x)
-  {
+  /* virtual */ void ContainerSingle1D::fill(HcalElectronicsId const &id, double x) {
     if (_qx->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(x));
     else
       _me->Fill(_qx->getValue(x));
   }
 
-  /* virtual */ void ContainerSingle1D::fill(HcalElectronicsId const& id,
-                                             double x, double y)
-  {
+  /* virtual */ void ContainerSingle1D::fill(HcalElectronicsId const &id, double x, double y) {
     if (_qx->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(x), y);
     else
       _me->Fill(_qy->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ double ContainerSingle1D::getBinContent(HcalElectronicsId const& id)
-  {
+  /* virtual */ double ContainerSingle1D::getBinContent(HcalElectronicsId const &id) {
     return _me->getBinContent(_qx->getBin(id));
   }
-  /* virtual */ double ContainerSingle1D::getBinEntries(HcalElectronicsId const& id)
-  {
+  /* virtual */ double ContainerSingle1D::getBinEntries(HcalElectronicsId const &id) {
     return _me->getBinEntries(_qx->getBin(id));
   }
 
-  /* virtual */ void ContainerSingle1D::setBinContent(HcalElectronicsId const& id,
-                                                      int x)
-  {
+  /* virtual */ void ContainerSingle1D::setBinContent(HcalElectronicsId const &id, int x) {
     _me->setBinContent(_qx->getBin(id), x);
   }
-  /* virtual */ void ContainerSingle1D::setBinContent(HcalElectronicsId const& id,
-                                                      double x)
-  {
+  /* virtual */ void ContainerSingle1D::setBinContent(HcalElectronicsId const &id, double x) {
     _me->setBinContent(_qx->getBin(id), x);
   }
 
-  /* virtual */ void ContainerSingle1D::fill(HcalTrigTowerDetId const& id)
-  {
-    _me->Fill(_qx->getValue(id));
-  }
+  /* virtual */ void ContainerSingle1D::fill(HcalTrigTowerDetId const &id) { _me->Fill(_qx->getValue(id)); }
 
-  /* virtual */ void ContainerSingle1D::fill(HcalTrigTowerDetId const& id,
-                                             double x)
-  {
+  /* virtual */ void ContainerSingle1D::fill(HcalTrigTowerDetId const &id, double x) {
     if (_qx->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(x));
     else
       _me->Fill(_qx->getValue(x));
   }
 
-  /* virtual */ void ContainerSingle1D::fill(HcalTrigTowerDetId const& id,
-                                             double x,
-                                             double y)
-  {
+  /* virtual */ void ContainerSingle1D::fill(HcalTrigTowerDetId const &id, double x, double y) {
     if (_qx->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(x), y);
     else
       _me->Fill(_qy->getValue(x), _qy->getValue(y));
   }
 
-  /* virtual */ double ContainerSingle1D::getBinContent(HcalTrigTowerDetId const& id)
-  {
+  /* virtual */ double ContainerSingle1D::getBinContent(HcalTrigTowerDetId const &id) {
     return _me->getBinContent(_qx->getBin(id));
   }
-  /* virtual */ double ContainerSingle1D::getBinEntries(HcalTrigTowerDetId const& id)
-  {
+  /* virtual */ double ContainerSingle1D::getBinEntries(HcalTrigTowerDetId const &id) {
     return _me->getBinEntries(_qx->getBin(id));
   }
 
-  /* virtual */ void ContainerSingle1D::setBinContent(HcalTrigTowerDetId const& id,
-                                                      int x)
-  {
+  /* virtual */ void ContainerSingle1D::setBinContent(HcalTrigTowerDetId const &id, int x) {
     _me->setBinContent(_qx->getBin(id), x);
   }
-  /* virtual */ void ContainerSingle1D::setBinContent(HcalTrigTowerDetId const& id,
-                                                      double x)
-  {
+  /* virtual */ void ContainerSingle1D::setBinContent(HcalTrigTowerDetId const &id, double x) {
     _me->setBinContent(_qx->getBin(id), x);
   }
 
-  /* virtual */ void ContainerSingle1D::extendAxisRange(int l)
-  {
-    if (l<_qx->nbins())
+  /* virtual */ void ContainerSingle1D::extendAxisRange(int l) {
+    if (l < _qx->nbins())
       return;
 
-    int x=_qx->nbins();
-    while(l>=x)
-      {
-        _me->getTH1()->LabelsInflate();
-        x*=2;
-        _qx->setMax(x);
-      }
+    int x = _qx->nbins();
+    while (l >= x) {
+      _me->getTH1()->LabelsInflate();
+      x *= 2;
+      _qx->setMax(x);
+    }
   }
 
-  void ContainerSingle1D::showOverflowX(bool showOverflow) {
-    _qx->showOverflow(showOverflow);
-  }
+  void ContainerSingle1D::showOverflowX(bool showOverflow) { _qx->showOverflow(showOverflow); }
 
-  void ContainerSingle1D::showOverflowY(bool showOverflow) {
-    _qy->showOverflow(showOverflow);
-  }
+  void ContainerSingle1D::showOverflowY(bool showOverflow) { _qy->showOverflow(showOverflow); }
 
-}
+}  // namespace hcaldqm
diff --git a/DQM/HcalCommon/src/ContainerSingle2D.cc b/DQM/HcalCommon/src/ContainerSingle2D.cc
index 5ccc046f75482..43b40e99c712c 100644
--- a/DQM/HcalCommon/src/ContainerSingle2D.cc
+++ b/DQM/HcalCommon/src/ContainerSingle2D.cc
@@ -1,63 +1,51 @@
 #include "DQM/HcalCommon/interface/ContainerSingle2D.h"
 #include "DQM/HcalCommon/interface/Utilities.h"
 
-namespace hcaldqm
-{
+namespace hcaldqm {
   using namespace constants;
   using namespace quantity;
-  ContainerSingle2D::ContainerSingle2D()
-  {
+  ContainerSingle2D::ContainerSingle2D() {
     _qx = nullptr;
     _qy = nullptr;
     _qz = nullptr;
   }
 
-  ContainerSingle2D::ContainerSingle2D(std::string const& folder,
-                                       Quantity *qx, Quantity *qy, Quantity *qz):
-    Container(folder, qz->name()+"vs"+qy->name()+"vs"+qx->name()),
-    _qx(qx), _qy(qy), _qz(qz)
-  {
+  ContainerSingle2D::ContainerSingle2D(std::string const &folder, Quantity *qx, Quantity *qy, Quantity *qz)
+      : Container(folder, qz->name() + "vs" + qy->name() + "vs" + qx->name()), _qx(qx), _qy(qy), _qz(qz) {
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
     _qz->setAxisType(quantity::fZAxis);
   }
 
-  ContainerSingle2D::ContainerSingle2D(std::string const& folder,
-                                       std::string const& qname,
-                                       Quantity *qx, Quantity *qy, Quantity *qz, int debug/*=0*/):
-    Container(folder, qname), _qx(qx), _qy(qy), _qz(qz)
-  {
+  ContainerSingle2D::ContainerSingle2D(
+      std::string const &folder, std::string const &qname, Quantity *qx, Quantity *qy, Quantity *qz, int debug /*=0*/)
+      : Container(folder, qname), _qx(qx), _qy(qy), _qz(qz) {
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
     _qz->setAxisType(quantity::fZAxis);
   }
 
-  ContainerSingle2D::ContainerSingle2D(ContainerSingle2D const& c) :
-    Container(c._folder, c._qname)
-  {
+  ContainerSingle2D::ContainerSingle2D(ContainerSingle2D const &c) : Container(c._folder, c._qname) {
     _qx = c._qx->makeCopy();
     _qy = c._qy->makeCopy();
     _qz = c._qz->makeCopy();
   }
 
-  ContainerSingle2D::~ContainerSingle2D()
-  {
-    if (_qx!=nullptr)
+  ContainerSingle2D::~ContainerSingle2D() {
+    if (_qx != nullptr)
       delete _qx;
-    if (_qy!=nullptr)
+    if (_qy != nullptr)
       delete _qy;
-    if (_qz!=nullptr)
+    if (_qz != nullptr)
       delete _qz;
-    _qx=nullptr;
-    _qy=nullptr;
-    _qz=nullptr;
+    _qx = nullptr;
+    _qy = nullptr;
+    _qz = nullptr;
   }
 
-  /* virtual */ void ContainerSingle2D::initialize(std::string const& folder,
-                                                   Quantity *qx, Quantity *qy, Quantity *qz, int debug/*=0*/)
-  {
-    Container::initialize(folder, qz->name()+"vs"+qy->name()+"vs"+
-                          qx->name(), debug);
+  /* virtual */ void ContainerSingle2D::initialize(
+      std::string const &folder, Quantity *qx, Quantity *qy, Quantity *qz, int debug /*=0*/) {
+    Container::initialize(folder, qz->name() + "vs" + qy->name() + "vs" + qx->name(), debug);
     _qx = qx;
     _qy = qy;
     _qz = qz;
@@ -66,10 +54,8 @@ namespace hcaldqm
     _qz->setAxisType(quantity::fZAxis);
   }
 
-  /* virtual */ void ContainerSingle2D::initialize(std::string const& folder,
-                                                   std::string const& qname,
-                                                   Quantity *qx, Quantity *qy, Quantity *qz, int debug/*=0*/)
-  {
+  /* virtual */ void ContainerSingle2D::initialize(
+      std::string const &folder, std::string const &qname, Quantity *qx, Quantity *qy, Quantity *qz, int debug /*=0*/) {
     Container::initialize(folder, qname, debug);
     _qx = qx;
     _qy = qy;
@@ -79,26 +65,24 @@ namespace hcaldqm
     _qz->setAxisType(quantity::fZAxis);
   }
 
-  /* virtual */ void ContainerSingle2D::book(DQMStore::IBooker &ib,
-                                             std::string subsystem, std::string aux)
-  {
-    ib.setCurrentFolder(subsystem+"/"+_folder+"/"+_qname);
-    _me = ib.book2D(_qname+(aux.empty()?aux:"_"+aux),
-                    _qname+(aux.empty()?aux:" "+aux),
-                    _qx->nbins(), _qx->min(), _qx->max(),
-                    _qy->nbins(), _qy->min(), _qy->max());
+  /* virtual */ void ContainerSingle2D::book(DQMStore::IBooker &ib, std::string subsystem, std::string aux) {
+    ib.setCurrentFolder(subsystem + "/" + _folder + "/" + _qname);
+    _me = ib.book2D(_qname + (aux.empty() ? aux : "_" + aux),
+                    _qname + (aux.empty() ? aux : " " + aux),
+                    _qx->nbins(),
+                    _qx->min(),
+                    _qx->max(),
+                    _qy->nbins(),
+                    _qy->min(),
+                    _qy->max());
     customize();
   }
 
-  /* virtual */ void ContainerSingle2D::load(DQMStore::IGetter& ig,
-                                             std::string subsystem, std::string aux)
-  {
-    _me = ig.get(subsystem+"/"+_folder+"/"+_qname+"/"+
-                 _qname+(aux.empty()?aux:"_"+aux));
+  /* virtual */ void ContainerSingle2D::load(DQMStore::IGetter &ig, std::string subsystem, std::string aux) {
+    _me = ig.get(subsystem + "/" + _folder + "/" + _qname + "/" + _qname + (aux.empty() ? aux : "_" + aux));
   }
 
-  /* virtual */ void ContainerSingle2D::customize()
-  {
+  /* virtual */ void ContainerSingle2D::customize() {
     _me->setAxisTitle(_qx->name(), 1);
     _me->setAxisTitle(_qy->name(), 2);
     _me->setAxisTitle(_qz->name(), 3);
@@ -110,131 +94,89 @@ namespace hcaldqm
 
     std::vector<std::string> xlabels = _qx->getLabels();
     std::vector<std::string> ylabels = _qy->getLabels();
-    for (unsigned int i=0; i<xlabels.size(); i++) {
-      _me->setBinLabel(i+1, xlabels[i], 1);
+    for (unsigned int i = 0; i < xlabels.size(); i++) {
+      _me->setBinLabel(i + 1, xlabels[i], 1);
     }
-    for (unsigned int i=0; i<ylabels.size(); i++) {
-      _me->setBinLabel(i+1, ylabels[i], 2);
+    for (unsigned int i = 0; i < ylabels.size(); i++) {
+      _me->setBinLabel(i + 1, ylabels[i], 2);
     }
   }
 
-  /* virtual */ void ContainerSingle2D::fill(int x, int y)
-  {
-    _me->Fill(_qx->getValue(x), _qy->getValue(y));
-  }
+  /* virtual */ void ContainerSingle2D::fill(int x, int y) { _me->Fill(_qx->getValue(x), _qy->getValue(y)); }
 
-  /* virtual */ void ContainerSingle2D::fill(int x, double y)
-  {
-    _me->Fill(_qx->getValue(x), _qy->getValue(y));
-  }
+  /* virtual */ void ContainerSingle2D::fill(int x, double y) { _me->Fill(_qx->getValue(x), _qy->getValue(y)); }
 
-  /* virtual */ void ContainerSingle2D::fill(int x, double y, double z)
-  {
+  /* virtual */ void ContainerSingle2D::fill(int x, double y, double z) {
     _me->Fill(_qx->getValue(x), _qy->getValue(y), z);
   }
 
-  /* virtual */ void ContainerSingle2D::fill(double x, int y)
-  {
-    _me->Fill(_qx->getValue(x), _qy->getValue(y));
-  }
+  /* virtual */ void ContainerSingle2D::fill(double x, int y) { _me->Fill(_qx->getValue(x), _qy->getValue(y)); }
 
-  /* virtual */ void ContainerSingle2D::fill(double x, double y)
-  {
-    _me->Fill(_qx->getValue(x), _qy->getValue(y));
-  }
+  /* virtual */ void ContainerSingle2D::fill(double x, double y) { _me->Fill(_qx->getValue(x), _qy->getValue(y)); }
 
-  /* virtual */ void ContainerSingle2D::fill(double x, double y, double z)
-  {
+  /* virtual */ void ContainerSingle2D::fill(double x, double y, double z) {
     _me->Fill(_qx->getValue(x), _qy->getValue(y), z);
   }
 
-  /* virtual */ void ContainerSingle2D::fill(int x, int y, double z)
-  {
+  /* virtual */ void ContainerSingle2D::fill(int x, int y, double z) {
     _me->Fill(_qx->getValue(x), _qy->getValue(y), z);
   }
 
-  /* virtual */ void ContainerSingle2D::fill(int x, int y, int z)
-  {
-    _me->Fill(_qx->getValue(x), _qy->getValue(y), z);
-  }
+  /* virtual */ void ContainerSingle2D::fill(int x, int y, int z) { _me->Fill(_qx->getValue(x), _qy->getValue(y), z); }
 
-  /* virtual */ void ContainerSingle2D::fill(HcalDetId const& id)
-  {
-    _me->Fill(_qx->getValue(id), _qy->getValue(id));
-  }
+  /* virtual */ void ContainerSingle2D::fill(HcalDetId const &id) { _me->Fill(_qx->getValue(id), _qy->getValue(id)); }
 
-  /* virtual */ double ContainerSingle2D::getBinContent(int x, int y)
-  {
+  /* virtual */ double ContainerSingle2D::getBinContent(int x, int y) {
     return _me->getBinContent(_qx->getBin(x), _qy->getBin(y));
   }
-  /* virtual */ double ContainerSingle2D::getBinContent(int x, double y)
-  {
+  /* virtual */ double ContainerSingle2D::getBinContent(int x, double y) {
     return _me->getBinContent(_qx->getBin(x), _qy->getBin(y));
   }
-  /* virtual */ double ContainerSingle2D::getBinContent(double x, int y)
-  {
+  /* virtual */ double ContainerSingle2D::getBinContent(double x, int y) {
     return _me->getBinContent(_qx->getBin(x), _qy->getBin(y));
   }
-  /* virtual */ double ContainerSingle2D::getBinContent(double x, double y)
-  {
+  /* virtual */ double ContainerSingle2D::getBinContent(double x, double y) {
     return _me->getBinContent(_qx->getBin(x), _qy->getBin(y));
   }
-  /* virtual */ double ContainerSingle2D::getBinEntries(int x, int y)
-  {
-    return _me->getBinEntries(_qx->getBin(x)+_qx->wofnbins()*_qy->getBin(y));
+  /* virtual */ double ContainerSingle2D::getBinEntries(int x, int y) {
+    return _me->getBinEntries(_qx->getBin(x) + _qx->wofnbins() * _qy->getBin(y));
   }
-  /* virtual */ double ContainerSingle2D::getBinEntries(int x, double y)
-  {
-    return _me->getBinEntries(_qx->getBin(x)+_qx->wofnbins()*_qy->getBin(y));
+  /* virtual */ double ContainerSingle2D::getBinEntries(int x, double y) {
+    return _me->getBinEntries(_qx->getBin(x) + _qx->wofnbins() * _qy->getBin(y));
   }
-  /* virtual */ double ContainerSingle2D::getBinEntries(double x, int y)
-  {
-    return _me->getBinEntries(_qx->getBin(x)+_qx->wofnbins()*_qy->getBin(y));
+  /* virtual */ double ContainerSingle2D::getBinEntries(double x, int y) {
+    return _me->getBinEntries(_qx->getBin(x) + _qx->wofnbins() * _qy->getBin(y));
   }
-  /* virtual */ double ContainerSingle2D::getBinEntries(double x, double y)
-  {
-    return _me->getBinEntries(_qx->getBin(x)+_qx->wofnbins()*_qy->getBin(y));
+  /* virtual */ double ContainerSingle2D::getBinEntries(double x, double y) {
+    return _me->getBinEntries(_qx->getBin(x) + _qx->wofnbins() * _qy->getBin(y));
   }
 
-  /* virtual */ void ContainerSingle2D::setBinContent(int x, int y, int z)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(int x, int y, int z) {
     _me->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(int x, double y, int z)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(int x, double y, int z) {
     _me->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(double x, int y, int z)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(double x, int y, int z) {
     _me->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(double x,
-                                                      double y, int z)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(double x, double y, int z) {
     _me->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(int x, int y, double z)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(int x, int y, double z) {
     _me->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(int x, double y,
-                                                      double z)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(int x, double y, double z) {
     _me->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(double x, int y,
-                                                      double z)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(double x, int y, double z) {
     _me->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(double x,
-                                                      double y, double z)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(double x, double y, double z) {
     _me->setBinContent(_qx->getBin(x), _qy->getBin(y), z);
   }
 
-  /* virtual */ void ContainerSingle2D::fill(HcalDetId const& id, double x)
-  {
+  /* virtual */ void ContainerSingle2D::fill(HcalDetId const &id, double x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate())
@@ -243,8 +185,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id));
   }
 
-  /* virtual */ void ContainerSingle2D::fill(HcalDetId const& id, int x)
-  {
+  /* virtual */ void ContainerSingle2D::fill(HcalDetId const &id, int x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate())
@@ -253,9 +194,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id));
   }
 
-  /* virtual */ void ContainerSingle2D::fill(HcalDetId const& id, double x,
-                                             double y)
-  {
+  /* virtual */ void ContainerSingle2D::fill(HcalDetId const &id, double x, double y) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate() && !_qy->isCoordinate())
@@ -264,9 +203,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id), y);
   }
 
-  /* virtual */ void ContainerSingle2D::fill(HcalDetId const& id, int x,
-                                             int y)
-  {
+  /* virtual */ void ContainerSingle2D::fill(HcalDetId const &id, int x, int y) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate() && !_qy->isCoordinate())
@@ -275,9 +212,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id), y);
   }
 
-  /* virtual */ void ContainerSingle2D::fill(HcalDetId const& id, int x,
-                                             double y)
-  {
+  /* virtual */ void ContainerSingle2D::fill(HcalDetId const &id, int x, double y) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate() && !_qy->isCoordinate())
@@ -286,84 +221,62 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id), y);
   }
 
-  /* virtula */ double ContainerSingle2D::getBinContent(HcalDetId const& id)
-  {
+  /* virtula */ double ContainerSingle2D::getBinContent(HcalDetId const &id) {
     return _me->getBinContent(_qx->getBin(id), _qy->getBin(id));
   }
-  /* virtual */ double ContainerSingle2D::getBinContent(HcalDetId const& id,
-                                                        int x)
-  {
+  /* virtual */ double ContainerSingle2D::getBinContent(HcalDetId const &id, int x) {
     if (_qx->isCoordinate())
       return _me->getBinContent(_qx->getBin(id), _qy->getBin(x));
     else
       return _me->getBinContent(_qx->getBin(x), _qy->getBin(id));
   }
-  /* virtual */ double ContainerSingle2D::getBinContent(HcalDetId const& id,
-                                                        double x)
-  {
+  /* virtual */ double ContainerSingle2D::getBinContent(HcalDetId const &id, double x) {
     if (_qx->isCoordinate())
       return _me->getBinContent(_qx->getBin(id), _qy->getBin(x));
     else
       return _me->getBinContent(_qx->getBin(x), _qy->getBin(id));
   }
-  /* virtula */ double ContainerSingle2D::getBinEntries(HcalDetId const& id)
-  {
-    return _me->getBinEntries(_qx->getBin(id)+_qx->wofnbins()* _qy->getBin(id));
+  /* virtula */ double ContainerSingle2D::getBinEntries(HcalDetId const &id) {
+    return _me->getBinEntries(_qx->getBin(id) + _qx->wofnbins() * _qy->getBin(id));
   }
-  /* virtual */ double ContainerSingle2D::getBinEntries(HcalDetId const& id,
-                                                        int x)
-  {
+  /* virtual */ double ContainerSingle2D::getBinEntries(HcalDetId const &id, int x) {
     if (_qx->isCoordinate())
-      return _me->getBinEntries(_qx->getBin(id)+_qx->wofnbins()*_qy->getBin(x));
+      return _me->getBinEntries(_qx->getBin(id) + _qx->wofnbins() * _qy->getBin(x));
     else
-      return _me->getBinEntries(_qx->getBin(x)+_qx->wofnbins()*_qy->getBin(id));
+      return _me->getBinEntries(_qx->getBin(x) + _qx->wofnbins() * _qy->getBin(id));
   }
-  /* virtual */ double ContainerSingle2D::getBinEntries(HcalDetId const& id,
-                                                        double x)
-  {
+  /* virtual */ double ContainerSingle2D::getBinEntries(HcalDetId const &id, double x) {
     if (_qx->isCoordinate())
-      return _me->getBinEntries(_qx->getBin(id)+_qx->wofnbins()*_qy->getBin(x));
+      return _me->getBinEntries(_qx->getBin(id) + _qx->wofnbins() * _qy->getBin(x));
     else
-      return _me->getBinEntries(_qx->getBin(x)+_qx->wofnbins()*_qy->getBin(id));
+      return _me->getBinEntries(_qx->getBin(x) + _qx->wofnbins() * _qy->getBin(id));
   }
 
-  /* virtual */ void ContainerSingle2D::setBinContent(HcalDetId const& id,
-                                                      int x)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(HcalDetId const &id, int x) {
     _me->setBinContent(_qx->getBin(id), _qy->getBin(id), x);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(HcalDetId const& id,
-                                                      double x)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(HcalDetId const &id, double x) {
     _me->setBinContent(_qx->getBin(id), _qy->getBin(id), x);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(HcalDetId const& id,
-                                                      int x, int y)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(HcalDetId const &id, int x, int y) {
     if (_qx->isCoordinate())
       _me->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
       _me->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(HcalDetId const& id,
-                                                      int x, double y)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(HcalDetId const &id, int x, double y) {
     if (_qx->isCoordinate())
       _me->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
       _me->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(HcalDetId const& id,
-                                                      double x, int y)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(HcalDetId const &id, double x, int y) {
     if (_qx->isCoordinate())
       _me->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
       _me->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(HcalDetId const& id,
-                                                      double x, double y)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(HcalDetId const &id, double x, double y) {
     if (_qx->isCoordinate())
       _me->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
@@ -371,14 +284,11 @@ namespace hcaldqm
   }
 
   //    by ElectronicsId
-  /* virtual */ void ContainerSingle2D::fill(HcalElectronicsId const& id)
-  {
+  /* virtual */ void ContainerSingle2D::fill(HcalElectronicsId const &id) {
     _me->Fill(_qx->getValue(id), _qy->getValue(id));
   }
 
-  /* virtual */ void ContainerSingle2D::fill(HcalElectronicsId const& id,
-                                             double x)
-  {
+  /* virtual */ void ContainerSingle2D::fill(HcalElectronicsId const &id, double x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate())
@@ -387,9 +297,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id));
   }
 
-  /* virtual */ void ContainerSingle2D::fill(HcalElectronicsId const& id,
-                                             int x)
-  {
+  /* virtual */ void ContainerSingle2D::fill(HcalElectronicsId const &id, int x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate())
@@ -398,10 +306,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id));
   }
 
-  /* virtual */ void ContainerSingle2D::fill(HcalElectronicsId const& id,
-                                             double x,
-                                             double y)
-  {
+  /* virtual */ void ContainerSingle2D::fill(HcalElectronicsId const &id, double x, double y) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate() && !_qy->isCoordinate())
@@ -410,10 +315,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id), y);
   }
 
-  /* virtual */ void ContainerSingle2D::fill(HcalElectronicsId const& id,
-                                             int x,
-                                             int y)
-  {
+  /* virtual */ void ContainerSingle2D::fill(HcalElectronicsId const &id, int x, int y) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate() && !_qy->isCoordinate())
@@ -422,10 +324,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id), y);
   }
 
-  /* virtual */ void ContainerSingle2D::fill(HcalElectronicsId const& id,
-                                             int x,
-                                             double y)
-  {
+  /* virtual */ void ContainerSingle2D::fill(HcalElectronicsId const &id, int x, double y) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate() && !_qy->isCoordinate())
@@ -434,84 +333,62 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id), y);
   }
 
-  /* virtula */ double ContainerSingle2D::getBinContent(HcalElectronicsId const& id)
-  {
+  /* virtula */ double ContainerSingle2D::getBinContent(HcalElectronicsId const &id) {
     return _me->getBinContent(_qx->getBin(id), _qy->getBin(id));
   }
-  /* virtual */ double ContainerSingle2D::getBinContent(HcalElectronicsId const& id,
-                                                        int x)
-  {
+  /* virtual */ double ContainerSingle2D::getBinContent(HcalElectronicsId const &id, int x) {
     if (_qx->isCoordinate())
       return _me->getBinContent(_qx->getBin(id), _qy->getBin(x));
     else
       return _me->getBinContent(_qx->getBin(x), _qy->getBin(id));
   }
-  /* virtual */ double ContainerSingle2D::getBinContent(HcalElectronicsId const& id,
-                                                        double x)
-  {
+  /* virtual */ double ContainerSingle2D::getBinContent(HcalElectronicsId const &id, double x) {
     if (_qx->isCoordinate())
       return _me->getBinContent(_qx->getBin(id), _qy->getBin(x));
     else
       return _me->getBinContent(_qx->getBin(x), _qy->getBin(id));
   }
-  /* virtula */ double ContainerSingle2D::getBinEntries(HcalElectronicsId const& id)
-  {
-    return _me->getBinEntries(_qx->getBin(id)+_qx->wofnbins()*_qy->getBin(id));
+  /* virtula */ double ContainerSingle2D::getBinEntries(HcalElectronicsId const &id) {
+    return _me->getBinEntries(_qx->getBin(id) + _qx->wofnbins() * _qy->getBin(id));
   }
-  /* virtual */ double ContainerSingle2D::getBinEntries(HcalElectronicsId const& id,
-                                                        int x)
-  {
+  /* virtual */ double ContainerSingle2D::getBinEntries(HcalElectronicsId const &id, int x) {
     if (_qx->isCoordinate())
-      return _me->getBinEntries(_qx->getBin(id)+_qx->wofnbins()*_qy->getBin(x));
+      return _me->getBinEntries(_qx->getBin(id) + _qx->wofnbins() * _qy->getBin(x));
     else
-      return _me->getBinEntries(_qx->getBin(x)+_qx->wofnbins()*_qy->getBin(id));
+      return _me->getBinEntries(_qx->getBin(x) + _qx->wofnbins() * _qy->getBin(id));
   }
-  /* virtual */ double ContainerSingle2D::getBinEntries(HcalElectronicsId const& id,
-                                                        double x)
-  {
+  /* virtual */ double ContainerSingle2D::getBinEntries(HcalElectronicsId const &id, double x) {
     if (_qx->isCoordinate())
-      return _me->getBinEntries(_qx->getBin(id)+_qx->wofnbins()*_qy->getBin(x));
+      return _me->getBinEntries(_qx->getBin(id) + _qx->wofnbins() * _qy->getBin(x));
     else
-      return _me->getBinEntries(_qx->getBin(x)+_qx->wofnbins()*_qy->getBin(id));
+      return _me->getBinEntries(_qx->getBin(x) + _qx->wofnbins() * _qy->getBin(id));
   }
 
-  /* virtual */ void ContainerSingle2D::setBinContent(HcalElectronicsId const& id,
-                                                      int x)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(HcalElectronicsId const &id, int x) {
     _me->setBinContent(_qx->getBin(id), _qy->getBin(id), x);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(HcalElectronicsId const& id,
-                                                      double x)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(HcalElectronicsId const &id, double x) {
     _me->setBinContent(_qx->getBin(id), _qy->getBin(id), x);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(HcalElectronicsId const& id,
-                                                      int x, int y)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(HcalElectronicsId const &id, int x, int y) {
     if (_qx->isCoordinate())
       _me->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
       _me->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(HcalElectronicsId const& id,
-                                                      int x, double y)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(HcalElectronicsId const &id, int x, double y) {
     if (_qx->isCoordinate())
       _me->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
       _me->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(HcalElectronicsId const& id,
-                                                      double x, int y)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(HcalElectronicsId const &id, double x, int y) {
     if (_qx->isCoordinate())
       _me->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
       _me->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(HcalElectronicsId const& id,
-                                                      double x, double y)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(HcalElectronicsId const &id, double x, double y) {
     if (_qx->isCoordinate())
       _me->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
@@ -519,14 +396,11 @@ namespace hcaldqm
   }
 
   //    by TrigTowerDetId
-  /* virtual */ void ContainerSingle2D::fill(HcalTrigTowerDetId const& id)
-  {
+  /* virtual */ void ContainerSingle2D::fill(HcalTrigTowerDetId const &id) {
     _me->Fill(_qx->getValue(id), _qy->getValue(id));
   }
 
-  /* virtual */ void ContainerSingle2D::fill(HcalTrigTowerDetId const& id,
-                                             double x)
-  {
+  /* virtual */ void ContainerSingle2D::fill(HcalTrigTowerDetId const &id, double x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate())
@@ -535,9 +409,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id));
   }
 
-  /* virtual */ void ContainerSingle2D::fill(HcalTrigTowerDetId const& id,
-                                             int x)
-  {
+  /* virtual */ void ContainerSingle2D::fill(HcalTrigTowerDetId const &id, int x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate())
@@ -546,9 +418,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id));
   }
 
-  /* virtual */ void ContainerSingle2D::fill(HcalTrigTowerDetId const& id,
-                                             double x, double y)
-  {
+  /* virtual */ void ContainerSingle2D::fill(HcalTrigTowerDetId const &id, double x, double y) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate() && !_qy->isCoordinate())
@@ -557,9 +427,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id), y);
   }
 
-  /* virtual */ void ContainerSingle2D::fill(HcalTrigTowerDetId const& id,
-                                             int x, int y)
-  {
+  /* virtual */ void ContainerSingle2D::fill(HcalTrigTowerDetId const &id, int x, int y) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate() && !_qy->isCoordinate())
@@ -568,9 +436,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id), y);
   }
 
-  /* virtual */ void ContainerSingle2D::fill(HcalTrigTowerDetId const& id,
-                                             int x, double y)
-  {
+  /* virtual */ void ContainerSingle2D::fill(HcalTrigTowerDetId const &id, int x, double y) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate() && !_qy->isCoordinate())
@@ -579,123 +445,93 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id), y);
   }
 
-  /* virtual */ void ContainerSingle2D::fill(HcalDetId const& did,
-                                             HcalElectronicsId const& eid)
-  {
-    if (_qx->type()==fDetectorQuantity)
+  /* virtual */ void ContainerSingle2D::fill(HcalDetId const &did, HcalElectronicsId const &eid) {
+    if (_qx->type() == fDetectorQuantity)
       _me->Fill(_qx->getValue(did), _qy->getValue(eid));
     else
       _me->Fill(_qx->getValue(eid), _qy->getValue(did));
   }
 
-  /* virtual */ void ContainerSingle2D::fill(HcalDetId const& did,
-                                             HcalElectronicsId const& eid, double x)
-  {
-    if (_qx->type()==fDetectorQuantity)
+  /* virtual */ void ContainerSingle2D::fill(HcalDetId const &did, HcalElectronicsId const &eid, double x) {
+    if (_qx->type() == fDetectorQuantity)
       _me->Fill(_qx->getValue(did), _qy->getValue(eid), x);
     else
       _me->Fill(_qx->getValue(eid), _qy->getValue(did), x);
   }
 
-  /* virtula */ double ContainerSingle2D::getBinContent(HcalTrigTowerDetId const& id)
-  {
+  /* virtula */ double ContainerSingle2D::getBinContent(HcalTrigTowerDetId const &id) {
     return _me->getBinContent(_qx->getBin(id), _qy->getBin(id));
   }
-  /* virtual */ double ContainerSingle2D::getBinContent(HcalTrigTowerDetId const& id,
-                                                        int x)
-  {
+  /* virtual */ double ContainerSingle2D::getBinContent(HcalTrigTowerDetId const &id, int x) {
     if (_qx->isCoordinate())
       return _me->getBinContent(_qx->getBin(id), _qy->getBin(x));
     else
       return _me->getBinContent(_qx->getBin(x), _qy->getBin(id));
   }
-  /* virtual */ double ContainerSingle2D::getBinContent(HcalTrigTowerDetId const& id,
-                                                        double x)
-  {
+  /* virtual */ double ContainerSingle2D::getBinContent(HcalTrigTowerDetId const &id, double x) {
     if (_qx->isCoordinate())
       return _me->getBinContent(_qx->getBin(id), _qy->getBin(x));
     else
       return _me->getBinContent(_qx->getBin(x), _qy->getBin(id));
   }
-  /* virtula */ double ContainerSingle2D::getBinEntries(HcalTrigTowerDetId const& id)
-  {
-    return _me->getBinEntries(_qx->getBin(id)+_qx->wofnbins()*_qy->getBin(id));
+  /* virtula */ double ContainerSingle2D::getBinEntries(HcalTrigTowerDetId const &id) {
+    return _me->getBinEntries(_qx->getBin(id) + _qx->wofnbins() * _qy->getBin(id));
   }
-  /* virtual */ double ContainerSingle2D::getBinEntries(HcalTrigTowerDetId const& id,
-                                                        int x)
-  {
+  /* virtual */ double ContainerSingle2D::getBinEntries(HcalTrigTowerDetId const &id, int x) {
     if (_qx->isCoordinate())
-      return _me->getBinEntries(_qx->getBin(id)+_qx->wofnbins()*_qy->getBin(x));
+      return _me->getBinEntries(_qx->getBin(id) + _qx->wofnbins() * _qy->getBin(x));
     else
-      return _me->getBinEntries(_qx->getBin(x)+_qx->wofnbins()*_qy->getBin(id));
+      return _me->getBinEntries(_qx->getBin(x) + _qx->wofnbins() * _qy->getBin(id));
   }
-  /* virtual */ double ContainerSingle2D::getBinEntries(HcalTrigTowerDetId const& id,
-                                                        double x)
-  {
+  /* virtual */ double ContainerSingle2D::getBinEntries(HcalTrigTowerDetId const &id, double x) {
     if (_qx->isCoordinate())
-      return _me->getBinEntries(_qx->getBin(id)+_qx->wofnbins()*_qy->getBin(x));
+      return _me->getBinEntries(_qx->getBin(id) + _qx->wofnbins() * _qy->getBin(x));
     else
-      return _me->getBinEntries(_qx->getBin(x)+_qx->wofnbins()*_qy->getBin(id));
+      return _me->getBinEntries(_qx->getBin(x) + _qx->wofnbins() * _qy->getBin(id));
   }
 
-  /* virtual */ void ContainerSingle2D::setBinContent(HcalTrigTowerDetId const& id,
-                                                      int x)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(HcalTrigTowerDetId const &id, int x) {
     _me->setBinContent(_qx->getBin(id), _qy->getBin(id), x);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(HcalTrigTowerDetId const& id,
-                                                      double x)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(HcalTrigTowerDetId const &id, double x) {
     _me->setBinContent(_qx->getBin(id), _qy->getBin(id), x);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(HcalTrigTowerDetId const& id,
-                                                      int x, int y)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(HcalTrigTowerDetId const &id, int x, int y) {
     if (_qx->isCoordinate())
       _me->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
       _me->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(HcalTrigTowerDetId const& id,
-                                                      int x, double y)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(HcalTrigTowerDetId const &id, int x, double y) {
     if (_qx->isCoordinate())
       _me->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
       _me->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(HcalTrigTowerDetId const& id,
-                                                      double x, int y)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(HcalTrigTowerDetId const &id, double x, int y) {
     if (_qx->isCoordinate())
       _me->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
       _me->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
-  /* virtual */ void ContainerSingle2D::setBinContent(HcalTrigTowerDetId const& id,
-                                                      double x, double y)
-  {
+  /* virtual */ void ContainerSingle2D::setBinContent(HcalTrigTowerDetId const &id, double x, double y) {
     if (_qx->isCoordinate())
       _me->setBinContent(_qx->getBin(id), _qy->getBin(x), y);
     else
       _me->setBinContent(_qx->getBin(x), _qy->getBin(id), y);
   }
 
-  /* virtual */ void ContainerSingle2D::extendAxisRange(int l)
-  {
-    if (l<_qx->nbins())
+  /* virtual */ void ContainerSingle2D::extendAxisRange(int l) {
+    if (l < _qx->nbins())
       return;
 
-    int x=_qx->nbins();
-    while(l>=x)
-      {
-        _me->getTH1()->LabelsInflate();
-        x*=2;
-        _qx->setMax(x);
-      }
+    int x = _qx->nbins();
+    while (l >= x) {
+      _me->getTH1()->LabelsInflate();
+      x *= 2;
+      _qx->setMax(x);
+    }
   }
 
-  void ContainerSingle2D::showOverflowZ(bool showOverflow) {
-    _qz->showOverflow(showOverflow);
-  }
-}
+  void ContainerSingle2D::showOverflowZ(bool showOverflow) { _qz->showOverflow(showOverflow); }
+}  // namespace hcaldqm
diff --git a/DQM/HcalCommon/src/ContainerSingleProf1D.cc b/DQM/HcalCommon/src/ContainerSingleProf1D.cc
index cd585d8de8cd8..9855f920357ac 100644
--- a/DQM/HcalCommon/src/ContainerSingleProf1D.cc
+++ b/DQM/HcalCommon/src/ContainerSingleProf1D.cc
@@ -1,50 +1,44 @@
 #include "DQM/HcalCommon/interface/ContainerSingleProf1D.h"
 
-namespace hcaldqm
-{
+namespace hcaldqm {
   using namespace quantity;
   using namespace constants;
-  ContainerSingleProf1D::ContainerSingleProf1D()
-  {
+  ContainerSingleProf1D::ContainerSingleProf1D() {
     _qx = nullptr;
     _qy = nullptr;
   }
 
-  ContainerSingleProf1D::ContainerSingleProf1D(std::string const& folder,
-                                               Quantity *qx, Quantity *qy):
-    ContainerSingle1D(folder, qx, qy)
-  {
+  ContainerSingleProf1D::ContainerSingleProf1D(std::string const &folder, Quantity *qx, Quantity *qy)
+      : ContainerSingle1D(folder, qx, qy) {
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
   }
 
-  /* virtual */ void ContainerSingleProf1D::initialize(std::string const&
-                                                       folder, Quantity *qx, Quantity *qy,
-                                                       int debug/*=0*/)
-  {
+  /* virtual */ void ContainerSingleProf1D::initialize(std::string const &folder,
+                                                       Quantity *qx,
+                                                       Quantity *qy,
+                                                       int debug /*=0*/) {
     ContainerSingle1D::initialize(folder, qx, qy, debug);
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
   }
 
-  /* virtual */ void ContainerSingleProf1D::initialize(std::string const&
-                                                       folder, std::string const& qname,
-                                                       Quantity *qx, Quantity *qy,
-                                                       int debug/*=0*/)
-  {
+  /* virtual */ void ContainerSingleProf1D::initialize(
+      std::string const &folder, std::string const &qname, Quantity *qx, Quantity *qy, int debug /*=0*/) {
     ContainerSingle1D::initialize(folder, qname, qx, qy, debug);
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
   }
 
-  /* virtual */ void ContainerSingleProf1D::book(DQMStore::IBooker& ib,
-                                                 std::string subsystem, std::string aux)
-  {
-    ib.setCurrentFolder(subsystem+"/"+_folder+"/"+_qname);
-    _me = ib.bookProfile(_qname+(aux.empty()?aux:"_"+aux),
-                         _qname+(aux.empty()?aux:" "+aux),
-                         _qx->nbins(), _qx->min(), _qx->max(),
-                         _qy->min(), _qy->max());
+  /* virtual */ void ContainerSingleProf1D::book(DQMStore::IBooker &ib, std::string subsystem, std::string aux) {
+    ib.setCurrentFolder(subsystem + "/" + _folder + "/" + _qname);
+    _me = ib.bookProfile(_qname + (aux.empty() ? aux : "_" + aux),
+                         _qname + (aux.empty() ? aux : " " + aux),
+                         _qx->nbins(),
+                         _qx->min(),
+                         _qx->max(),
+                         _qy->min(),
+                         _qy->max());
     customize();
   }
-}
+}  // namespace hcaldqm
diff --git a/DQM/HcalCommon/src/ContainerSingleProf2D.cc b/DQM/HcalCommon/src/ContainerSingleProf2D.cc
index 585dc16d9d43c..a654ea23c19f8 100644
--- a/DQM/HcalCommon/src/ContainerSingleProf2D.cc
+++ b/DQM/HcalCommon/src/ContainerSingleProf2D.cc
@@ -1,105 +1,81 @@
 #include "DQM/HcalCommon/interface/ContainerSingleProf2D.h"
 
-namespace hcaldqm
-{
+namespace hcaldqm {
   using namespace quantity;
   using namespace constants;
-  ContainerSingleProf2D::ContainerSingleProf2D()
-  {
+  ContainerSingleProf2D::ContainerSingleProf2D() {
     _qx = nullptr;
     _qy = nullptr;
     _qz = nullptr;
   }
 
-  ContainerSingleProf2D::ContainerSingleProf2D(std::string const& folder,
-                                               Quantity *qx, Quantity *qy, Quantity *qz):
-    ContainerSingle2D(folder, qx, qy, qz)
-  {
+  ContainerSingleProf2D::ContainerSingleProf2D(std::string const &folder, Quantity *qx, Quantity *qy, Quantity *qz)
+      : ContainerSingle2D(folder, qx, qy, qz) {
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
     _qz->setAxisType(quantity::fZAxis);
   }
 
-  /* virtual */ void ContainerSingleProf2D::initialize(std::string const&
-                                                       folder, Quantity *qx, Quantity *qy, Quantity *qz,
-                                                       int debug/*=0*/)
-  {
+  /* virtual */ void ContainerSingleProf2D::initialize(
+      std::string const &folder, Quantity *qx, Quantity *qy, Quantity *qz, int debug /*=0*/) {
     ContainerSingle2D::initialize(folder, qx, qy, qz, debug);
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
     _qz->setAxisType(quantity::fZAxis);
   }
 
-  /* virtual */ void ContainerSingleProf2D::initialize(std::string const&
-                                                       folder, std::string const& qname,
-                                                       Quantity *qx, Quantity *qy, Quantity *qz,
-                                                       int debug/*=0*/)
-  {
+  /* virtual */ void ContainerSingleProf2D::initialize(
+      std::string const &folder, std::string const &qname, Quantity *qx, Quantity *qy, Quantity *qz, int debug /*=0*/) {
     ContainerSingle2D::initialize(folder, qname, qx, qy, qz, debug);
     _qx->setAxisType(quantity::fXAxis);
     _qy->setAxisType(quantity::fYAxis);
     _qz->setAxisType(quantity::fZAxis);
   }
 
-  /* virtual */ void ContainerSingleProf2D::book(DQMStore::IBooker& ib,
-                                                 std::string subsystem, std::string aux)
-  {
-    ib.setCurrentFolder(subsystem+"/"+_folder+"/"+_qname);
-    _me = ib.bookProfile2D(_qname+(aux.empty()?aux:"_"+aux),
-                           _qname+(aux.empty()?aux:" "+aux),
-                           _qx->nbins(), _qx->min(), _qx->max(),
-                           _qy->nbins(), _qy->min(), _qy->max(),
-                           _qz->min(), _qz->max());
+  /* virtual */ void ContainerSingleProf2D::book(DQMStore::IBooker &ib, std::string subsystem, std::string aux) {
+    ib.setCurrentFolder(subsystem + "/" + _folder + "/" + _qname);
+    _me = ib.bookProfile2D(_qname + (aux.empty() ? aux : "_" + aux),
+                           _qname + (aux.empty() ? aux : " " + aux),
+                           _qx->nbins(),
+                           _qx->min(),
+                           _qx->max(),
+                           _qy->nbins(),
+                           _qy->min(),
+                           _qy->max(),
+                           _qz->min(),
+                           _qz->max());
     customize();
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(int x, int y)
-  {
-    _me->Fill(_qx->getValue(x), _qy->getValue(y));
-  }
+  /* virtual */ void ContainerSingleProf2D::fill(int x, int y) { _me->Fill(_qx->getValue(x), _qy->getValue(y)); }
 
-  /* virtual */ void ContainerSingleProf2D::fill(int x, double y)
-  {
-    _me->Fill(_qx->getValue(x), _qy->getValue(y));
-  }
+  /* virtual */ void ContainerSingleProf2D::fill(int x, double y) { _me->Fill(_qx->getValue(x), _qy->getValue(y)); }
 
-  /* virtual */ void ContainerSingleProf2D::fill(int x, double y, double z)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(int x, double y, double z) {
     _me->Fill(_qx->getValue(x), _qy->getValue(y), _qz->getValue(z));
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(double x, int y)
-  {
-    _me->Fill(_qx->getValue(x), _qy->getValue(y));
-  }
+  /* virtual */ void ContainerSingleProf2D::fill(double x, int y) { _me->Fill(_qx->getValue(x), _qy->getValue(y)); }
 
-  /* virtual */ void ContainerSingleProf2D::fill(double x, double y)
-  {
-    _me->Fill(_qx->getValue(x), _qy->getValue(y));
-  }
+  /* virtual */ void ContainerSingleProf2D::fill(double x, double y) { _me->Fill(_qx->getValue(x), _qy->getValue(y)); }
 
-  /* virtual */ void ContainerSingleProf2D::fill(double x, double y, double z)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(double x, double y, double z) {
     _me->Fill(_qx->getValue(x), _qy->getValue(y), _qz->getValue(z));
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(int x, int y, double z)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(int x, int y, double z) {
     _me->Fill(_qx->getValue(x), _qy->getValue(y), _qz->getValue(z));
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(int x, int y, int z)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(int x, int y, int z) {
     _me->Fill(_qx->getValue(x), _qy->getValue(y), _qz->getValue(z));
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalDetId const& id)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(HcalDetId const &id) {
     _me->Fill(_qx->getValue(id), _qy->getValue(id));
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalDetId const& id, double x)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(HcalDetId const &id, double x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate())
@@ -108,8 +84,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id));
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalDetId const& id, int x)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(HcalDetId const &id, int x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate())
@@ -118,9 +93,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id));
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalDetId const& id, double x,
-                                                 double y)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(HcalDetId const &id, double x, double y) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate() && !_qy->isCoordinate())
@@ -129,9 +102,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id), y);
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalDetId const& id, int x,
-                                                 int y)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(HcalDetId const &id, int x, int y) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate() && !_qy->isCoordinate())
@@ -140,9 +111,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id), y);
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalDetId const& id, int x,
-                                                 double y)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(HcalDetId const &id, int x, double y) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate() && !_qy->isCoordinate())
@@ -151,14 +120,11 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id), y);
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalElectronicsId const& id)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(HcalElectronicsId const &id) {
     _me->Fill(_qx->getValue(id), _qy->getValue(id));
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalElectronicsId const& id,
-                                                 double x)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(HcalElectronicsId const &id, double x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate())
@@ -167,9 +133,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id));
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalElectronicsId const& id,
-                                                 int x)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(HcalElectronicsId const &id, int x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate())
@@ -178,10 +142,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id));
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalElectronicsId const& id,
-                                                 double x,
-                                                 double y)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(HcalElectronicsId const &id, double x, double y) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate() && !_qy->isCoordinate())
@@ -190,10 +151,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id), y);
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalElectronicsId const& id,
-                                                 int x,
-                                                 int y)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(HcalElectronicsId const &id, int x, int y) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate() && !_qy->isCoordinate())
@@ -202,10 +160,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id), y);
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalElectronicsId const& id,
-                                                 int x,
-                                                 double y)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(HcalElectronicsId const &id, int x, double y) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate() && !_qy->isCoordinate())
@@ -214,14 +169,11 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id), y);
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalTrigTowerDetId const& id)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(HcalTrigTowerDetId const &id) {
     _me->Fill(_qx->getValue(id), _qy->getValue(id));
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalTrigTowerDetId const& id,
-                                                 double x)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(HcalTrigTowerDetId const &id, double x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate())
@@ -230,9 +182,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id));
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalTrigTowerDetId const& id,
-                                                 int x)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(HcalTrigTowerDetId const &id, int x) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate())
@@ -241,9 +191,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id));
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalTrigTowerDetId const& id,
-                                                 double x, double y)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(HcalTrigTowerDetId const &id, double x, double y) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate() && !_qy->isCoordinate())
@@ -252,9 +200,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id), y);
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalTrigTowerDetId const& id,
-                                                 int x, int y)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(HcalTrigTowerDetId const &id, int x, int y) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate() && !_qy->isCoordinate())
@@ -263,9 +209,7 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id), y);
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalTrigTowerDetId const& id,
-                                                 int x, double y)
-  {
+  /* virtual */ void ContainerSingleProf2D::fill(HcalTrigTowerDetId const &id, int x, double y) {
     if (_qx->isCoordinate() && _qy->isCoordinate())
       _me->Fill(_qx->getValue(id), _qy->getValue(id), x);
     else if (_qx->isCoordinate() && !_qy->isCoordinate())
@@ -274,22 +218,18 @@ namespace hcaldqm
       _me->Fill(_qx->getValue(x), _qy->getValue(id), y);
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalDetId const& did,
-                                                 HcalElectronicsId const& eid)
-  {
-    if (_qx->type()==fDetectorQuantity)
+  /* virtual */ void ContainerSingleProf2D::fill(HcalDetId const &did, HcalElectronicsId const &eid) {
+    if (_qx->type() == fDetectorQuantity)
       _me->Fill(_qx->getValue(did), _qy->getValue(eid));
     else
       _me->Fill(_qx->getValue(eid), _qy->getValue(did));
   }
 
-  /* virtual */ void ContainerSingleProf2D::fill(HcalDetId const& did,
-                                                 HcalElectronicsId const& eid, double x)
-  {
-    if (_qx->type()==fDetectorQuantity)
+  /* virtual */ void ContainerSingleProf2D::fill(HcalDetId const &did, HcalElectronicsId const &eid, double x) {
+    if (_qx->type() == fDetectorQuantity)
       _me->Fill(_qx->getValue(did), _qy->getValue(eid), x);
     else
       _me->Fill(_qx->getValue(eid), _qy->getValue(did), x);
   }
 
-}
+}  // namespace hcaldqm
diff --git a/DQM/HcalCommon/src/DQClient.cc b/DQM/HcalCommon/src/DQClient.cc
index 999a3fe985b30..ceb56930f4610 100644
--- a/DQM/HcalCommon/src/DQClient.cc
+++ b/DQM/HcalCommon/src/DQClient.cc
@@ -1,136 +1,111 @@
 #include "DQM/HcalCommon/interface/DQClient.h"
 
-namespace hcaldqm
-{
-	using namespace constants;
-	DQClient::DQClient(std::string const& name, std::string const& taskname,
-		edm::ParameterSet const& ps) :
-		DQModule(ps),_taskname(taskname), _maxProcessedLS(0)
-	{
-		//	- SET THE TASK NAME YOU REFER TO
-		//	- SET THE CLIENT'S NAME AS WELL - RUN SUMMARY PLOTS
-		//	WILL BE GENERATED UNDER THAT FOLDER
-		_name = name;
-	}
+namespace hcaldqm {
+  using namespace constants;
+  DQClient::DQClient(std::string const &name, std::string const &taskname, edm::ParameterSet const &ps)
+      : DQModule(ps), _taskname(taskname), _maxProcessedLS(0) {
+    //	- SET THE TASK NAME YOU REFER TO
+    //	- SET THE CLIENT'S NAME AS WELL - RUN SUMMARY PLOTS
+    //	WILL BE GENERATED UNDER THAT FOLDER
+    _name = name;
+  }
 
-	void DQClient::beginRun(edm::Run const& r,
-		edm::EventSetup const& es)
-	{
-		//	TEMPORARY
-		_vhashFEDs.clear(); _vcdaqEids.clear();
-		_vhashCrates.clear();
+  void DQClient::beginRun(edm::Run const &r, edm::EventSetup const &es) {
+    //	TEMPORARY
+    _vhashFEDs.clear();
+    _vcdaqEids.clear();
+    _vhashCrates.clear();
 
-		//	get various FED lists
-		edm::ESHandle<HcalDbService> dbs;
-		es.get<HcalDbRecord>().get(dbs);
-		_emap = dbs->getHcalMapping();
+    //	get various FED lists
+    edm::ESHandle<HcalDbService> dbs;
+    es.get<HcalDbRecord>().get(dbs);
+    _emap = dbs->getHcalMapping();
 
-		if (_ptype != fOffline) { // hidefed2crate
-			_vFEDs = utilities::getFEDList(_emap);
-			for (std::vector<int>::const_iterator it=_vFEDs.begin();
-				it!=_vFEDs.end(); ++it)
-			{
-				//
-				//	FIXME
-				//	until there exists a map of FED2Crate and Crate2FED,
-				//	all the unknown Crates will be mapped to 0...
-				//
-				if (*it==0)
-				{
-					_vhashFEDs.push_back(HcalElectronicsId(
-						0, SLOT_uTCA_MIN, FIBER_uTCA_MIN1,
-						FIBERCH_MIN, false).rawId());
-					continue;
-				}
+    if (_ptype != fOffline) {  // hidefed2crate
+      _vFEDs = utilities::getFEDList(_emap);
+      for (std::vector<int>::const_iterator it = _vFEDs.begin(); it != _vFEDs.end(); ++it) {
+        //
+        //	FIXME
+        //	until there exists a map of FED2Crate and Crate2FED,
+        //	all the unknown Crates will be mapped to 0...
+        //
+        if (*it == 0) {
+          _vhashFEDs.push_back(HcalElectronicsId(0, SLOT_uTCA_MIN, FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId());
+          continue;
+        }
 
-				if (*it>FED_VME_MAX)
-	            {
-	                std::pair<uint16_t, uint16_t> cspair = utilities::fed2crate(*it);
-					_vhashFEDs.push_back(HcalElectronicsId(
-						cspair.first, cspair.second, FIBER_uTCA_MIN1,
-						FIBERCH_MIN, false).rawId());
-	            }
-				else
-					_vhashFEDs.push_back(HcalElectronicsId(FIBERCH_MIN,
-						FIBER_VME_MIN, SPIGOT_MIN, (*it)-FED_VME_MIN).rawId());
-			}
+        if (*it > FED_VME_MAX) {
+          std::pair<uint16_t, uint16_t> cspair = utilities::fed2crate(*it);
+          _vhashFEDs.push_back(
+              HcalElectronicsId(cspair.first, cspair.second, FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId());
+        } else
+          _vhashFEDs.push_back(HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, SPIGOT_MIN, (*it) - FED_VME_MIN).rawId());
+      }
 
-			//	get FEDs registered @cDAQ
-                        if (auto runInfoRec = es.tryToGet<RunInfoRcd>())
-			{
-				edm::ESHandle<RunInfo> ri;
-                                runInfoRec->get(ri);
-				std::vector<int> vfeds=ri->m_fed_in;
-				for (std::vector<int>::const_iterator it=vfeds.begin();
-					it!=vfeds.end(); ++it)
-				{
-					if (*it>=constants::FED_VME_MIN && *it<=FED_VME_MAX)
-						_vcdaqEids.push_back(HcalElectronicsId(
-							constants::FIBERCH_MIN,
-							constants::FIBER_VME_MIN, SPIGOT_MIN,
-							(*it)-FED_VME_MIN).rawId());
-					else if (*it>=constants::FED_uTCA_MIN &&
-						*it<=FEDNumbering::MAXHCALuTCAFEDID)
-	                {
-	                    std::pair<uint16_t, uint16_t> cspair = utilities::fed2crate(*it);
-						_vcdaqEids.push_back(HcalElectronicsId(
-							cspair.first, cspair.second,
-							FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId());
-	                }
-				}
-			}
-		} else {
-			_vCrates = utilities::getCrateList(_emap);
-			std::map<int, uint32_t> crateHashMap = utilities::getCrateHashMap(_emap);
-			for (auto& it_crate : _vCrates) {
-				_vhashCrates.push_back(crateHashMap[it_crate]);
-			}
-		}
+      //	get FEDs registered @cDAQ
+      if (auto runInfoRec = es.tryToGet<RunInfoRcd>()) {
+        edm::ESHandle<RunInfo> ri;
+        runInfoRec->get(ri);
+        std::vector<int> vfeds = ri->m_fed_in;
+        for (std::vector<int>::const_iterator it = vfeds.begin(); it != vfeds.end(); ++it) {
+          if (*it >= constants::FED_VME_MIN && *it <= FED_VME_MAX)
+            _vcdaqEids.push_back(
+                HcalElectronicsId(constants::FIBERCH_MIN, constants::FIBER_VME_MIN, SPIGOT_MIN, (*it) - FED_VME_MIN)
+                    .rawId());
+          else if (*it >= constants::FED_uTCA_MIN && *it <= FEDNumbering::MAXHCALuTCAFEDID) {
+            std::pair<uint16_t, uint16_t> cspair = utilities::fed2crate(*it);
+            _vcdaqEids.push_back(
+                HcalElectronicsId(cspair.first, cspair.second, FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId());
+          }
+        }
+      }
+    } else {
+      _vCrates = utilities::getCrateList(_emap);
+      std::map<int, uint32_t> crateHashMap = utilities::getCrateHashMap(_emap);
+      for (auto &it_crate : _vCrates) {
+        _vhashCrates.push_back(crateHashMap[it_crate]);
+      }
+    }
 
-		// Initialize channel quality masks, but do not load (changed for 10_4_X, moving to LS granularity)
-		_xQuality.initialize(hashfunctions::fDChannel);
-	}
-	
-	void DQClient::beginLuminosityBlock(DQMStore::IBooker&,
-		DQMStore::IGetter&, edm::LuminosityBlock const& lb,
-		edm::EventSetup const& es)
-	{
-		//	get the Channel Quality masks
-		_xQuality.reset();
-		edm::ESHandle<HcalChannelQuality> hcq;
-		es.get<HcalChannelQualityRcd>().get("withTopo", hcq);
-		const HcalChannelQuality *cq = hcq.product();
-		std::vector<DetId> detids = cq->getAllChannels();
-		for (std::vector<DetId>::const_iterator it=detids.begin();
-			it!=detids.end(); ++it)
-		{
-			if (HcalGenericDetId(*it).genericSubdet()==
-				HcalGenericDetId::HcalGenUnknown)
-				continue;
+    // Initialize channel quality masks, but do not load (changed for 10_4_X,
+    // moving to LS granularity)
+    _xQuality.initialize(hashfunctions::fDChannel);
+  }
 
-			if (HcalGenericDetId(*it).isHcalDetId())
-			{
-				HcalDetId did(*it);
-				uint32_t mask=(cq->getValues(did))->getValue();
-				if (mask!=0)
-					_xQuality.push(did, mask);
-			}
-		}
-	}
+  void DQClient::beginLuminosityBlock(DQMStore::IBooker &,
+                                      DQMStore::IGetter &,
+                                      edm::LuminosityBlock const &lb,
+                                      edm::EventSetup const &es) {
+    //	get the Channel Quality masks
+    _xQuality.reset();
+    edm::ESHandle<HcalChannelQuality> hcq;
+    es.get<HcalChannelQualityRcd>().get("withTopo", hcq);
+    const HcalChannelQuality *cq = hcq.product();
+    std::vector<DetId> detids = cq->getAllChannels();
+    for (std::vector<DetId>::const_iterator it = detids.begin(); it != detids.end(); ++it) {
+      if (HcalGenericDetId(*it).genericSubdet() == HcalGenericDetId::HcalGenUnknown)
+        continue;
 
-	void DQClient::endLuminosityBlock(DQMStore::IBooker&,
-		DQMStore::IGetter&, edm::LuminosityBlock const& lb,
-		edm::EventSetup const&)
-	{
-		_currentLS=lb.luminosityBlock();
-		_totalLS++;
-		if (_maxProcessedLS<_currentLS)
-			_maxProcessedLS=_currentLS;
-	}
+      if (HcalGenericDetId(*it).isHcalDetId()) {
+        HcalDetId did(*it);
+        uint32_t mask = (cq->getValues(did))->getValue();
+        if (mask != 0)
+          _xQuality.push(did, mask);
+      }
+    }
+  }
 
-	std::vector<flag::Flag> DQClient::endJob(DQMStore::IBooker&,
-		DQMStore::IGetter&)
-	{
-		return std::vector<flag::Flag>();
-	}
-}
+  void DQClient::endLuminosityBlock(DQMStore::IBooker &,
+                                    DQMStore::IGetter &,
+                                    edm::LuminosityBlock const &lb,
+                                    edm::EventSetup const &) {
+    _currentLS = lb.luminosityBlock();
+    _totalLS++;
+    if (_maxProcessedLS < _currentLS)
+      _maxProcessedLS = _currentLS;
+  }
+
+  std::vector<flag::Flag> DQClient::endJob(DQMStore::IBooker &, DQMStore::IGetter &) {
+    return std::vector<flag::Flag>();
+  }
+}  // namespace hcaldqm
diff --git a/DQM/HcalCommon/src/DQHarvester.cc b/DQM/HcalCommon/src/DQHarvester.cc
index 004d0b51bea50..6d1805a9de161 100644
--- a/DQM/HcalCommon/src/DQHarvester.cc
+++ b/DQM/HcalCommon/src/DQHarvester.cc
@@ -1,137 +1,109 @@
 #include "DQM/HcalCommon/interface/DQHarvester.h"
 #include "FWCore/Framework/interface/Run.h"
 
-namespace hcaldqm
-{
-	using namespace constants;
+namespace hcaldqm {
+  using namespace constants;
 
-	DQHarvester::DQHarvester(edm::ParameterSet const& ps) :
-		DQModule(ps)
-	{}
+  DQHarvester::DQHarvester(edm::ParameterSet const &ps) : DQModule(ps) {}
 
-	void DQHarvester::beginRun(edm::Run const& r,
-		edm::EventSetup const& es)
-	{
-		if (_ptype==fLocal)
-			if (r.runAuxiliary().run()==1)
-				return;
+  void DQHarvester::beginRun(edm::Run const &r, edm::EventSetup const &es) {
+    if (_ptype == fLocal)
+      if (r.runAuxiliary().run() == 1)
+        return;
 
-		//      TEMPORARY FIX
-		if (_ptype != fOffline) { // hidefed2crate
-			_vhashFEDs.clear();
-			_vcdaqEids.clear();
-		}
+    //      TEMPORARY FIX
+    if (_ptype != fOffline) {  // hidefed2crate
+      _vhashFEDs.clear();
+      _vcdaqEids.clear();
+    }
 
-		//	- get the Hcal Electronics Map
-		//	- collect all the FED numbers and FED's rawIds
-		edm::ESHandle<HcalDbService> dbs;
-		es.get<HcalDbRecord>().get(dbs);
-		_emap = dbs->getHcalMapping();
+    //	- get the Hcal Electronics Map
+    //	- collect all the FED numbers and FED's rawIds
+    edm::ESHandle<HcalDbService> dbs;
+    es.get<HcalDbRecord>().get(dbs);
+    _emap = dbs->getHcalMapping();
 
-		if (_ptype != fOffline) { // hidefed2crate
-			_vFEDs = utilities::getFEDList(_emap);
-			for (std::vector<int>::const_iterator it=_vFEDs.begin();
-				it!=_vFEDs.end(); ++it)
-			{
-				//
-				//	FIXME
-				//	until there exists a map of FED2Crate and Crate2FED,
-				//	all the unknown Crates will be mapped to 0...
-				//
-				if (*it==0)
-				{
-					_vhashFEDs.push_back(HcalElectronicsId(
-						0, SLOT_uTCA_MIN, FIBER_uTCA_MIN1,
-						FIBERCH_MIN, false).rawId());
-					continue;
-				}
-		
-				if (*it>FED_VME_MAX)
-	            {
-	                std::pair<uint16_t, uint16_t> cspair = utilities::fed2crate(*it);
-					_vhashFEDs.push_back(HcalElectronicsId(
-						cspair.first, cspair.second, FIBER_uTCA_MIN1,
-						FIBERCH_MIN, false).rawId());
-	            }
-				else
-					_vhashFEDs.push_back(HcalElectronicsId(FIBERCH_MIN,
-						FIBER_VME_MIN, SPIGOT_MIN, (*it)-FED_VME_MIN).rawId());
-			}
+    if (_ptype != fOffline) {  // hidefed2crate
+      _vFEDs = utilities::getFEDList(_emap);
+      for (std::vector<int>::const_iterator it = _vFEDs.begin(); it != _vFEDs.end(); ++it) {
+        //
+        //	FIXME
+        //	until there exists a map of FED2Crate and Crate2FED,
+        //	all the unknown Crates will be mapped to 0...
+        //
+        if (*it == 0) {
+          _vhashFEDs.push_back(HcalElectronicsId(0, SLOT_uTCA_MIN, FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId());
+          continue;
+        }
 
-			//	get the FEDs registered at cDAQ
-                        if (auto runInfoRec = es.tryToGet<RunInfoRcd>())
-			{
-				edm::ESHandle<RunInfo> ri;
-                                runInfoRec->get(ri);
-				std::vector<int> vfeds= ri->m_fed_in;
-				for (std::vector<int>::const_iterator it=vfeds.begin();
-					it!=vfeds.end(); ++it)
-				{
-					if (*it>=constants::FED_VME_MIN && *it<=FED_VME_MAX)
-						_vcdaqEids.push_back(HcalElectronicsId(
-							constants::FIBERCH_MIN,
-							constants::FIBER_VME_MIN, SPIGOT_MIN,
-							(*it)-FED_VME_MIN).rawId());
-					else if (*it>=constants::FED_uTCA_MIN && 
-						*it<=FEDNumbering::MAXHCALuTCAFEDID)
-	                {
-	                    std::pair<uint16_t, uint16_t> cspair = utilities::fed2crate(*it);
-						_vcdaqEids.push_back(HcalElectronicsId(
-							cspair.first, cspair.second,
-							FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId());
-	                }
-				}
-			}
-		} else {
-			_vCrates = utilities::getCrateList(_emap);
-			std::map<int, uint32_t> crateHashMap = utilities::getCrateHashMap(_emap);
-			for (auto& it_crate : _vCrates) {
-				_vhashCrates.push_back(crateHashMap[it_crate]);
-			}
-		}
+        if (*it > FED_VME_MAX) {
+          std::pair<uint16_t, uint16_t> cspair = utilities::fed2crate(*it);
+          _vhashFEDs.push_back(
+              HcalElectronicsId(cspair.first, cspair.second, FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId());
+        } else
+          _vhashFEDs.push_back(HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, SPIGOT_MIN, (*it) - FED_VME_MIN).rawId());
+      }
 
-		// Initialize channel quality masks, but do not load (changed for 10_4_X, moving to LS granularity)
-		_xQuality.initialize(hashfunctions::fDChannel);
-	}
+      //	get the FEDs registered at cDAQ
+      if (auto runInfoRec = es.tryToGet<RunInfoRcd>()) {
+        edm::ESHandle<RunInfo> ri;
+        runInfoRec->get(ri);
+        std::vector<int> vfeds = ri->m_fed_in;
+        for (std::vector<int>::const_iterator it = vfeds.begin(); it != vfeds.end(); ++it) {
+          if (*it >= constants::FED_VME_MIN && *it <= FED_VME_MAX)
+            _vcdaqEids.push_back(
+                HcalElectronicsId(constants::FIBERCH_MIN, constants::FIBER_VME_MIN, SPIGOT_MIN, (*it) - FED_VME_MIN)
+                    .rawId());
+          else if (*it >= constants::FED_uTCA_MIN && *it <= FEDNumbering::MAXHCALuTCAFEDID) {
+            std::pair<uint16_t, uint16_t> cspair = utilities::fed2crate(*it);
+            _vcdaqEids.push_back(
+                HcalElectronicsId(cspair.first, cspair.second, FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId());
+          }
+        }
+      }
+    } else {
+      _vCrates = utilities::getCrateList(_emap);
+      std::map<int, uint32_t> crateHashMap = utilities::getCrateHashMap(_emap);
+      for (auto &it_crate : _vCrates) {
+        _vhashCrates.push_back(crateHashMap[it_crate]);
+      }
+    }
 
-	void DQHarvester::dqmBeginLuminosityBlock(
-		DQMStore::IBooker& ib, DQMStore::IGetter& ig,
-		edm::LuminosityBlock const& lb, edm::EventSetup const& es)
-	{
-		//	get the Hcal Channels Quality for channels that are not 0
-		edm::ESHandle<HcalChannelQuality> hcq;
-		es.get<HcalChannelQualityRcd>().get("withTopo", hcq);
-		const HcalChannelQuality *cq = hcq.product();
-		std::vector<DetId> detids = cq->getAllChannels();
-		for (std::vector<DetId>::const_iterator it=detids.begin();
-			it!=detids.end(); ++it)
-		{
-			 if (HcalGenericDetId(*it).genericSubdet()==
-				HcalGenericDetId::HcalGenUnknown)
-				 continue;
+    // Initialize channel quality masks, but do not load (changed for 10_4_X,
+    // moving to LS granularity)
+    _xQuality.initialize(hashfunctions::fDChannel);
+  }
 
-			 if (HcalGenericDetId(*it).isHcalDetId())
-			 {
-				 HcalDetId did(*it);
-				  uint32_t mask = (cq->getValues(did))->getValue();
-				   if (mask!=0)
-					   _xQuality.push(did, mask);
-			 }
-		}
-	}
+  void DQHarvester::dqmBeginLuminosityBlock(DQMStore::IBooker &ib,
+                                            DQMStore::IGetter &ig,
+                                            edm::LuminosityBlock const &lb,
+                                            edm::EventSetup const &es) {
+    //	get the Hcal Channels Quality for channels that are not 0
+    edm::ESHandle<HcalChannelQuality> hcq;
+    es.get<HcalChannelQualityRcd>().get("withTopo", hcq);
+    const HcalChannelQuality *cq = hcq.product();
+    std::vector<DetId> detids = cq->getAllChannels();
+    for (std::vector<DetId>::const_iterator it = detids.begin(); it != detids.end(); ++it) {
+      if (HcalGenericDetId(*it).genericSubdet() == HcalGenericDetId::HcalGenUnknown)
+        continue;
 
-	void DQHarvester::dqmEndLuminosityBlock(
-		DQMStore::IBooker& ib, DQMStore::IGetter& ig,
-		edm::LuminosityBlock const& lb, edm::EventSetup const& es)
-	{
-		//	should be the same - just in case!
-		_currentLS = lb.luminosityBlock();
-		_totalLS++;
-		_dqmEndLuminosityBlock(ib, ig, lb, es);
-	}
-	void DQHarvester::dqmEndJob(DQMStore::IBooker& ib, 
-		DQMStore::IGetter& ig)
-	{
-		_dqmEndJob(ib, ig);
-	}
-}
+      if (HcalGenericDetId(*it).isHcalDetId()) {
+        HcalDetId did(*it);
+        uint32_t mask = (cq->getValues(did))->getValue();
+        if (mask != 0)
+          _xQuality.push(did, mask);
+      }
+    }
+  }
+
+  void DQHarvester::dqmEndLuminosityBlock(DQMStore::IBooker &ib,
+                                          DQMStore::IGetter &ig,
+                                          edm::LuminosityBlock const &lb,
+                                          edm::EventSetup const &es) {
+    //	should be the same - just in case!
+    _currentLS = lb.luminosityBlock();
+    _totalLS++;
+    _dqmEndLuminosityBlock(ib, ig, lb, es);
+  }
+  void DQHarvester::dqmEndJob(DQMStore::IBooker &ib, DQMStore::IGetter &ig) { _dqmEndJob(ib, ig); }
+}  // namespace hcaldqm
diff --git a/DQM/HcalCommon/src/DQModule.cc b/DQM/HcalCommon/src/DQModule.cc
index 4874c660b291b..d19e5011c1217 100644
--- a/DQM/HcalCommon/src/DQModule.cc
+++ b/DQM/HcalCommon/src/DQModule.cc
@@ -1,40 +1,29 @@
 
 #include "DQM/HcalCommon/interface/DQModule.h"
 
-namespace hcaldqm
-{
-	DQModule::DQModule(edm::ParameterSet const& ps):
-		_evsTotal(0), _evsPerLS(0)
-	{
-		_name = ps.getUntrackedParameter<std::string>("name", "Unknown_Module");
-		_debug = ps.getUntrackedParameter<int>("debug", 0);
-		_logger.set(_name, _debug);
-		_runkeyVal = ps.getUntrackedParameter<int>("runkeyVal", 0);
-		_runkeyName = ps.getUntrackedParameter<std::string>("runkeyName", 
-			"pp_run");
-		_subsystem = ps.getUntrackedParameter<std::string>("subsystem", "Hcal");
-
-		bool mtype = ps.getUntrackedParameter<bool>("mtype", true);
-		int ptype = ps.getUntrackedParameter<int>("ptype", 0);
-		_maxLS = ps.getUntrackedParameter<int>("maxLS", 4000);
-		if (mtype==true)
-			_mtype = fTask;
-		else
-			_mtype = fClient;
-		if (ptype==0)
-			_ptype = fOnline;
-		else if (ptype==1)
-			_ptype = fOffline;
-		else
-			_ptype = fLocal;
-
-		_logger.debug("Calling Constructor");
-	}
-}
-
-
-
-
-
-
-
+namespace hcaldqm {
+  DQModule::DQModule(edm::ParameterSet const &ps) : _evsTotal(0), _evsPerLS(0) {
+    _name = ps.getUntrackedParameter<std::string>("name", "Unknown_Module");
+    _debug = ps.getUntrackedParameter<int>("debug", 0);
+    _logger.set(_name, _debug);
+    _runkeyVal = ps.getUntrackedParameter<int>("runkeyVal", 0);
+    _runkeyName = ps.getUntrackedParameter<std::string>("runkeyName", "pp_run");
+    _subsystem = ps.getUntrackedParameter<std::string>("subsystem", "Hcal");
+
+    bool mtype = ps.getUntrackedParameter<bool>("mtype", true);
+    int ptype = ps.getUntrackedParameter<int>("ptype", 0);
+    _maxLS = ps.getUntrackedParameter<int>("maxLS", 4000);
+    if (mtype == true)
+      _mtype = fTask;
+    else
+      _mtype = fClient;
+    if (ptype == 0)
+      _ptype = fOnline;
+    else if (ptype == 1)
+      _ptype = fOffline;
+    else
+      _ptype = fLocal;
+
+    _logger.debug("Calling Constructor");
+  }
+}  // namespace hcaldqm
diff --git a/DQM/HcalCommon/src/DQTask.cc b/DQM/HcalCommon/src/DQTask.cc
index 3df0ee904e2d3..7ebd51dd04dc2 100644
--- a/DQM/HcalCommon/src/DQTask.cc
+++ b/DQM/HcalCommon/src/DQTask.cc
@@ -1,223 +1,181 @@
 #include "DQM/HcalCommon/interface/DQTask.h"
 
-namespace hcaldqm
-{	
-	using namespace constants;
-	DQTask::DQTask(edm::ParameterSet const& ps):
-		DQModule(ps),
-		_cEvsTotal(_name, "EventsTotal"),
-		_cEvsPerLS(_name, "EventsPerLS"),
-		_cRunKeyVal(_name, "RunKeyValue"),
-		_cRunKeyName(_name, "RunKeyName"),
-		_cProcessingTypeName(_name, "ProcessingType"),
-		_procLSs(0)
-	{
-		//	tags and Tokens
-		_tagRaw = ps.getUntrackedParameter<edm::InputTag>("tagRaw",
-			edm::InputTag("rawDataCollector"));
-		_tokRaw = consumes<FEDRawDataCollection>(_tagRaw);
-	}
-
-	/*
-	 *	By design, all the sources will ahve this function inherited and will
-	 *	never override. 
-	 */
-	void DQTask::analyze(edm::Event const& e,
-		edm::EventSetup const& es)
-	{
-		this->_resetMonitors(fEvent);
-		_logger.debug(_name+" processing");
-		if (!this->_isApplicable(e))
-			return;
-
-		_evsTotal++; _cEvsTotal.fill(_evsTotal);
-		_evsPerLS++; _cEvsPerLS.fill(_evsPerLS);
-		this->_process(e, es);
-	}
-
-	void DQTask::bookHistograms(DQMStore::IBooker &ib,
-		edm::Run const& r,
-		edm::EventSetup const& es)
-	{
-		//	initialize some containers to be used by all modules
-		_xQuality.initialize(hashfunctions::fDChannel);
-
-		//	get the run info FEDs - FEDs registered at cDAQ
-		//	and determine if there are any HCAL FEDs in.
-		//	push them as ElectronicsIds into the vector
-                if (auto runInfoRec = es.tryToGet<RunInfoRcd>())
-		{
-			edm::ESHandle<RunInfo> ri;
-                        runInfoRec->get(ri);
-			std::vector<int> vfeds= ri->m_fed_in;
-			for (std::vector<int>::const_iterator it=vfeds.begin();
-				it!=vfeds.end(); ++it)
-			{
-				if (*it>=constants::FED_VME_MIN && *it<=FED_VME_MAX)
-					_vcdaqEids.push_back(HcalElectronicsId(
-						constants::FIBERCH_MIN,
-						constants::FIBER_VME_MIN, SPIGOT_MIN,
-						(*it)-FED_VME_MIN).rawId());
-				else if	(*it>=constants::FED_uTCA_MIN && 
-					*it<=FEDNumbering::MAXHCALuTCAFEDID)
-                {
-                    std::pair<uint16_t, uint16_t> cspair = utilities::fed2crate(*it);
-					_vcdaqEids.push_back(HcalElectronicsId(
-					    cspair.first, cspair.second, 
-						FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId());
-                }
-			}
-		}
-
-		//	book some base guys
-		_cEvsTotal.book(ib, _subsystem);
-		_cEvsPerLS.book(ib, _subsystem);
-		_cRunKeyVal.book(ib, _subsystem);
-		_cRunKeyName.book(ib, _subsystem);
-		_cProcessingTypeName.book(ib, _subsystem);
-
-		//	fill what you can now
-		_cRunKeyVal.fill(_runkeyVal);
-		_cRunKeyName.fill(_runkeyName);
-		_cProcessingTypeName.fill(pTypeNames[_ptype]);
-
-		// Load conditions and emap
-		es.get<HcalDbRecord>().get(_dbService);
-		_emap = _dbService->getHcalMapping();
-	}
-
-	void DQTask::dqmBeginRun(edm::Run const& r,
-		edm::EventSetup const& es)
-	{
-		this->_resetMonitors(fEvent);
-		this->_resetMonitors(f1LS);
-		this->_resetMonitors(f10LS);
-		this->_resetMonitors(f50LS);
-		this->_resetMonitors(f100LS);
-	}
-
-	void DQTask::beginLuminosityBlock(
-		edm::LuminosityBlock const& lb,
-		edm::EventSetup const& es)
-	{
-		_currentLS = lb.luminosityBlock();
-		this->_resetMonitors(f1LS);
-		
-		if (_procLSs%10==0)
-			this->_resetMonitors(f10LS);
-		if (_procLSs%50==0)
-			this->_resetMonitors(f50LS);
-		if (_procLSs%100==0)
-			this->_resetMonitors(f100LS);
-	
-		//	get the Channel Quality Status for all the channels
-		_xQuality.reset();
-		edm::ESHandle<HcalChannelQuality> hcq;
-		es.get<HcalChannelQualityRcd>().get("withTopo", hcq);
-		const HcalChannelQuality *cq = hcq.product();
-		std::vector<DetId> detids = cq->getAllChannels();
-		for (std::vector<DetId>::const_iterator it=detids.begin();
-			it!=detids.end(); ++it)
-		{
-			//	if unknown skip
-			if (HcalGenericDetId(*it).genericSubdet()==
-				HcalGenericDetId::HcalGenUnknown)
-				continue;
-
-			if (HcalGenericDetId(*it).isHcalDetId())
-			{
-				HcalDetId did(*it);
-				uint32_t mask = (cq->getValues(did))->getValue();
-				if (mask!=0)
-				{
-					_xQuality.push(did, mask);
-				}
-			}
-		}
-	}
-
-	void DQTask::endLuminosityBlock(
-		edm::LuminosityBlock const& lb,
-		edm::EventSetup const& es)
-	{
-		_procLSs++;
-	}
-
-	void DQTask::_resetMonitors(UpdateFreq uf)
-	{
-		//	reset per event
-		switch (uf)
-		{
-			case fEvent:
-				break;
-			case f1LS:
-				_evsPerLS = 0;
-				break;
-			case f10LS:
-				break;
-			case f50LS:
-				break;
-			case f100LS:
-				break;
-			default:
-				break;
-		}
-	}
-
-	int DQTask::_getCalibType(edm::Event const&e)
-	{
-		int calibType = 0;
-
-		edm::Handle<FEDRawDataCollection> craw;
-		if (!e.getByToken(_tokRaw, craw))
-			_logger.dqmthrow(
-				"Collection FEDRawDataCollection isn't available " 
-				+ _tagRaw.label() + " " + _tagRaw.instance());
-
-		int badFEDs=0;
-		std::vector<int> types(8,0);
-		for (int i=FED_VME_MIN; i<=FED_VME_MAX; i++)
-		{
-			FEDRawData const& fd = craw->FEDData(i);
-			if (fd.size()<24)
-			{
-				badFEDs++;
-				continue;
-			}
-			int cval = (int)((HcalDCCHeader const*)(fd.data()))->getCalibType();
-			if (cval>7)
-				_logger.warn("Unexpected Calib Type in FED " + 
-					std::to_string(i));
-			types[cval]++;
-		}
-		for (int i=FED_uTCA_MIN; i<=FED_uTCA_MAX; i++)
-		{
-			FEDRawData const& fd = craw->FEDData(i);
-			if (fd.size()<24)
-			{
-				badFEDs++;
-				continue;
-			}
-			int cval = (int)((HcalDCCHeader const*)(fd.data()))->getCalibType();
-			if (cval>7)
-				_logger.warn("Unexpected Calib Type in FED " + 
-					std::to_string(i));
-			types[cval]++;
-		}
-
-		int max = 0;
-		for (unsigned int ic=0; ic<8; ic++)
-		{
-			if (types[ic]>max)
-			{
-				max = types[ic];
-				calibType = ic;
-			}
-		}
-		if (max!=(FED_VME_NUM+(FED_uTCA_MAX-FED_uTCA_MIN+1)-badFEDs))
-			_logger.warn("Conflicting Calibration Types found. Assigning " +
-				std::to_string(calibType));
-
-		return calibType;
-	}
-}
+namespace hcaldqm {
+  using namespace constants;
+  DQTask::DQTask(edm::ParameterSet const &ps)
+      : DQModule(ps),
+        _cEvsTotal(_name, "EventsTotal"),
+        _cEvsPerLS(_name, "EventsPerLS"),
+        _cRunKeyVal(_name, "RunKeyValue"),
+        _cRunKeyName(_name, "RunKeyName"),
+        _cProcessingTypeName(_name, "ProcessingType"),
+        _procLSs(0) {
+    //	tags and Tokens
+    _tagRaw = ps.getUntrackedParameter<edm::InputTag>("tagRaw", edm::InputTag("rawDataCollector"));
+    _tokRaw = consumes<FEDRawDataCollection>(_tagRaw);
+  }
+
+  /*
+ *	By design, all the sources will ahve this function inherited and will
+ *	never override.
+ */
+  void DQTask::analyze(edm::Event const &e, edm::EventSetup const &es) {
+    this->_resetMonitors(fEvent);
+    _logger.debug(_name + " processing");
+    if (!this->_isApplicable(e))
+      return;
+
+    _evsTotal++;
+    _cEvsTotal.fill(_evsTotal);
+    _evsPerLS++;
+    _cEvsPerLS.fill(_evsPerLS);
+    this->_process(e, es);
+  }
+
+  void DQTask::bookHistograms(DQMStore::IBooker &ib, edm::Run const &r, edm::EventSetup const &es) {
+    //	initialize some containers to be used by all modules
+    _xQuality.initialize(hashfunctions::fDChannel);
+
+    //	get the run info FEDs - FEDs registered at cDAQ
+    //	and determine if there are any HCAL FEDs in.
+    //	push them as ElectronicsIds into the vector
+    if (auto runInfoRec = es.tryToGet<RunInfoRcd>()) {
+      edm::ESHandle<RunInfo> ri;
+      runInfoRec->get(ri);
+      std::vector<int> vfeds = ri->m_fed_in;
+      for (std::vector<int>::const_iterator it = vfeds.begin(); it != vfeds.end(); ++it) {
+        if (*it >= constants::FED_VME_MIN && *it <= FED_VME_MAX)
+          _vcdaqEids.push_back(
+              HcalElectronicsId(constants::FIBERCH_MIN, constants::FIBER_VME_MIN, SPIGOT_MIN, (*it) - FED_VME_MIN)
+                  .rawId());
+        else if (*it >= constants::FED_uTCA_MIN && *it <= FEDNumbering::MAXHCALuTCAFEDID) {
+          std::pair<uint16_t, uint16_t> cspair = utilities::fed2crate(*it);
+          _vcdaqEids.push_back(
+              HcalElectronicsId(cspair.first, cspair.second, FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId());
+        }
+      }
+    }
+
+    //	book some base guys
+    _cEvsTotal.book(ib, _subsystem);
+    _cEvsPerLS.book(ib, _subsystem);
+    _cRunKeyVal.book(ib, _subsystem);
+    _cRunKeyName.book(ib, _subsystem);
+    _cProcessingTypeName.book(ib, _subsystem);
+
+    //	fill what you can now
+    _cRunKeyVal.fill(_runkeyVal);
+    _cRunKeyName.fill(_runkeyName);
+    _cProcessingTypeName.fill(pTypeNames[_ptype]);
+
+    // Load conditions and emap
+    es.get<HcalDbRecord>().get(_dbService);
+    _emap = _dbService->getHcalMapping();
+  }
+
+  void DQTask::dqmBeginRun(edm::Run const &r, edm::EventSetup const &es) {
+    this->_resetMonitors(fEvent);
+    this->_resetMonitors(f1LS);
+    this->_resetMonitors(f10LS);
+    this->_resetMonitors(f50LS);
+    this->_resetMonitors(f100LS);
+  }
+
+  void DQTask::beginLuminosityBlock(edm::LuminosityBlock const &lb, edm::EventSetup const &es) {
+    _currentLS = lb.luminosityBlock();
+    this->_resetMonitors(f1LS);
+
+    if (_procLSs % 10 == 0)
+      this->_resetMonitors(f10LS);
+    if (_procLSs % 50 == 0)
+      this->_resetMonitors(f50LS);
+    if (_procLSs % 100 == 0)
+      this->_resetMonitors(f100LS);
+
+    //	get the Channel Quality Status for all the channels
+    _xQuality.reset();
+    edm::ESHandle<HcalChannelQuality> hcq;
+    es.get<HcalChannelQualityRcd>().get("withTopo", hcq);
+    const HcalChannelQuality *cq = hcq.product();
+    std::vector<DetId> detids = cq->getAllChannels();
+    for (std::vector<DetId>::const_iterator it = detids.begin(); it != detids.end(); ++it) {
+      //	if unknown skip
+      if (HcalGenericDetId(*it).genericSubdet() == HcalGenericDetId::HcalGenUnknown)
+        continue;
+
+      if (HcalGenericDetId(*it).isHcalDetId()) {
+        HcalDetId did(*it);
+        uint32_t mask = (cq->getValues(did))->getValue();
+        if (mask != 0) {
+          _xQuality.push(did, mask);
+        }
+      }
+    }
+  }
+
+  void DQTask::endLuminosityBlock(edm::LuminosityBlock const &lb, edm::EventSetup const &es) { _procLSs++; }
+
+  void DQTask::_resetMonitors(UpdateFreq uf) {
+    //	reset per event
+    switch (uf) {
+      case fEvent:
+        break;
+      case f1LS:
+        _evsPerLS = 0;
+        break;
+      case f10LS:
+        break;
+      case f50LS:
+        break;
+      case f100LS:
+        break;
+      default:
+        break;
+    }
+  }
+
+  int DQTask::_getCalibType(edm::Event const &e) {
+    int calibType = 0;
+
+    edm::Handle<FEDRawDataCollection> craw;
+    if (!e.getByToken(_tokRaw, craw))
+      _logger.dqmthrow("Collection FEDRawDataCollection isn't available " + _tagRaw.label() + " " + _tagRaw.instance());
+
+    int badFEDs = 0;
+    std::vector<int> types(8, 0);
+    for (int i = FED_VME_MIN; i <= FED_VME_MAX; i++) {
+      FEDRawData const &fd = craw->FEDData(i);
+      if (fd.size() < 24) {
+        badFEDs++;
+        continue;
+      }
+      int cval = (int)((HcalDCCHeader const *)(fd.data()))->getCalibType();
+      if (cval > 7)
+        _logger.warn("Unexpected Calib Type in FED " + std::to_string(i));
+      types[cval]++;
+    }
+    for (int i = FED_uTCA_MIN; i <= FED_uTCA_MAX; i++) {
+      FEDRawData const &fd = craw->FEDData(i);
+      if (fd.size() < 24) {
+        badFEDs++;
+        continue;
+      }
+      int cval = (int)((HcalDCCHeader const *)(fd.data()))->getCalibType();
+      if (cval > 7)
+        _logger.warn("Unexpected Calib Type in FED " + std::to_string(i));
+      types[cval]++;
+    }
+
+    int max = 0;
+    for (unsigned int ic = 0; ic < 8; ic++) {
+      if (types[ic] > max) {
+        max = types[ic];
+        calibType = ic;
+      }
+    }
+    if (max != (FED_VME_NUM + (FED_uTCA_MAX - FED_uTCA_MIN + 1) - badFEDs))
+      _logger.warn("Conflicting Calibration Types found. Assigning " + std::to_string(calibType));
+
+    return calibType;
+  }
+}  // namespace hcaldqm
diff --git a/DQM/HcalCommon/src/DetectorQuantity.cc b/DQM/HcalCommon/src/DetectorQuantity.cc
index e205d43bb4eba..5e78fde5959ab 100644
--- a/DQM/HcalCommon/src/DetectorQuantity.cc
+++ b/DQM/HcalCommon/src/DetectorQuantity.cc
@@ -1,128 +1,75 @@
 
 #include "DQM/HcalCommon/interface/DetectorQuantity.h"
 
-namespace hcaldqm
-{
-	namespace quantity
-	{
-		int getValue_iphi(HcalDetId const& did)
-		{
-			return did.iphi();
-		}
-
-		int getValue_ieta(HcalDetId const& did)
-		{
-			int x = did.ieta();
-			if (x<0)
-				x = did.subdet()==HcalForward ? x+41 : x+42;
-			else
-				x = did.subdet()==HcalForward ? x+42 : x+41;
-			return x;
-		}
-
-		int getValue_depth(HcalDetId const& did)
-		{
-			return did.depth();
-		}
-
-		int getValue_Subdet(HcalDetId const& did)
-		{
-			return did.subdet()-1;
-		}
-
-		int getValue_SubdetPM(HcalDetId const& did)
-		{
-			return did.ieta()<0 ? 2*(did.subdet()-1) : 
-				2*(did.subdet()-1)+1;
-		}
-
-		uint32_t getBin_iphi(HcalDetId const& did)
-		{
-			return (uint32_t)(did.iphi());
-		}
-
-		uint32_t getBin_ieta(HcalDetId const& did)
-		{
-			return (uint32_t)(getValue_ieta(did)+1);
-		}
-
-		uint32_t getBin_depth(HcalDetId const& did)
-		{
-			return (uint32_t)(did.depth());
-		}
-
-		uint32_t getBin_Subdet(HcalDetId const& did)
-		{
-			return (uint32_t)(did.subdet());
-		}
-
-		uint32_t getBin_SubdetPM(HcalDetId const& did)
-		{
-			return ( uint32_t)(getValue_SubdetPM(did)+1);
-		}
-
-		HcalDetId getDid_iphi(int v)
-		{
-			return HcalDetId(HcalBarrel, v, 1, 1);
-		}
-
-		HcalDetId getDid_ieta(int v)
-		{
-			return HcalDetId(HcalBarrel,
-				v<=41?(v<=12?v-41:v-42):(v>=71?v-42:v-41), 1, 1);
-		}
-
-		HcalDetId getDid_depth(int v)
-		{
-			return HcalDetId(HcalBarrel, 1, 1, v);
-		}
-
-		HcalDetId getDid_Subdet(int v)
-		{
-			return HcalDetId((HcalSubdetector)(v+1), 1, 1, 1);
-		}
-
-		HcalDetId getDid_SubdetPM(int v)
-		{
-			return HcalDetId((HcalSubdetector)(v/2+1), v%2==0?1:-1, 1, 1);
-		}
-
-		std::vector<std::string> getLabels_iphi()
-		{
-			return std::vector<std::string>();
-		}
-
-		std::vector<std::string> getLabels_ieta()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<84; i++)
-			{
-				sprintf(name, "%d", getDid_ieta(i).ieta());
-				labels.push_back(std::string(name));
-			}
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_depth()
-		{
-			return std::vector<std::string>();
-		}
-
-		std::vector<std::string> getLabels_Subdet()
-		{
-			std::vector<std::string> labels;
-			for (int i=0; i<4; i++)
-				labels.push_back(constants::SUBDET_NAME[i]);
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_SubdetPM()
-		{
-			std::vector<std::string> labels;
-			for (int i=0; i<8; i++)
-				labels.push_back(constants::SUBDETPM_NAME[i]);
-			return labels;
-		}
-	}
-}
+namespace hcaldqm {
+  namespace quantity {
+    int getValue_iphi(HcalDetId const &did) { return did.iphi(); }
+
+    int getValue_ieta(HcalDetId const &did) {
+      int x = did.ieta();
+      if (x < 0)
+        x = did.subdet() == HcalForward ? x + 41 : x + 42;
+      else
+        x = did.subdet() == HcalForward ? x + 42 : x + 41;
+      return x;
+    }
+
+    int getValue_depth(HcalDetId const &did) { return did.depth(); }
+
+    int getValue_Subdet(HcalDetId const &did) { return did.subdet() - 1; }
+
+    int getValue_SubdetPM(HcalDetId const &did) {
+      return did.ieta() < 0 ? 2 * (did.subdet() - 1) : 2 * (did.subdet() - 1) + 1;
+    }
+
+    uint32_t getBin_iphi(HcalDetId const &did) { return (uint32_t)(did.iphi()); }
+
+    uint32_t getBin_ieta(HcalDetId const &did) { return (uint32_t)(getValue_ieta(did) + 1); }
+
+    uint32_t getBin_depth(HcalDetId const &did) { return (uint32_t)(did.depth()); }
+
+    uint32_t getBin_Subdet(HcalDetId const &did) { return (uint32_t)(did.subdet()); }
+
+    uint32_t getBin_SubdetPM(HcalDetId const &did) { return (uint32_t)(getValue_SubdetPM(did) + 1); }
+
+    HcalDetId getDid_iphi(int v) { return HcalDetId(HcalBarrel, v, 1, 1); }
+
+    HcalDetId getDid_ieta(int v) {
+      return HcalDetId(HcalBarrel, v <= 41 ? (v <= 12 ? v - 41 : v - 42) : (v >= 71 ? v - 42 : v - 41), 1, 1);
+    }
+
+    HcalDetId getDid_depth(int v) { return HcalDetId(HcalBarrel, 1, 1, v); }
+
+    HcalDetId getDid_Subdet(int v) { return HcalDetId((HcalSubdetector)(v + 1), 1, 1, 1); }
+
+    HcalDetId getDid_SubdetPM(int v) { return HcalDetId((HcalSubdetector)(v / 2 + 1), v % 2 == 0 ? 1 : -1, 1, 1); }
+
+    std::vector<std::string> getLabels_iphi() { return std::vector<std::string>(); }
+
+    std::vector<std::string> getLabels_ieta() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (int i = 0; i < 84; i++) {
+        sprintf(name, "%d", getDid_ieta(i).ieta());
+        labels.push_back(std::string(name));
+      }
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_depth() { return std::vector<std::string>(); }
+
+    std::vector<std::string> getLabels_Subdet() {
+      std::vector<std::string> labels;
+      for (int i = 0; i < 4; i++)
+        labels.push_back(constants::SUBDET_NAME[i]);
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_SubdetPM() {
+      std::vector<std::string> labels;
+      for (int i = 0; i < 8; i++)
+        labels.push_back(constants::SUBDETPM_NAME[i]);
+      return labels;
+    }
+  }  // namespace quantity
+}  // namespace hcaldqm
diff --git a/DQM/HcalCommon/src/ElectronicsMap.cc b/DQM/HcalCommon/src/ElectronicsMap.cc
index de8600fff52a2..2312d7e714636 100644
--- a/DQM/HcalCommon/src/ElectronicsMap.cc
+++ b/DQM/HcalCommon/src/ElectronicsMap.cc
@@ -1,223 +1,164 @@
 #include "DQM/HcalCommon/interface/ElectronicsMap.h"
 #include <iomanip>
 
-namespace hcaldqm
-{
-	namespace electronicsmap
-	{
-		void ElectronicsMap::initialize(HcalElectronicsMap const* emap,
-			ElectronicsMapType etype/*=fHcalElectronicsMap*/)
-		{
-			_etype=etype;
-			_emap = emap;
-			//	if we actually use a HashMap then 
-			if (_etype!=fHcalElectronicsMap)
-			{
-				if (_etype==fD2EHashMap)
-				{
-					std::vector<HcalElectronicsId> eids = 
-						emap->allElectronicsIdPrecision();
-					for (std::vector<HcalElectronicsId>::const_iterator it=
-						eids.begin(); it!=eids.end(); ++it)
-					{
-						HcalGenericDetId did = HcalGenericDetId(
-							_emap->lookup(*it));
-						EMapType::iterator dit = _ids.find(did.rawId());
-						if (dit!=_ids.end())
-							continue;
-//						if (!did.isHcalDetId())
-//							continue;
+namespace hcaldqm {
+  namespace electronicsmap {
+    void ElectronicsMap::initialize(HcalElectronicsMap const *emap, ElectronicsMapType etype /*=fHcalElectronicsMap*/) {
+      _etype = etype;
+      _emap = emap;
+      //	if we actually use a HashMap then
+      if (_etype != fHcalElectronicsMap) {
+        if (_etype == fD2EHashMap) {
+          std::vector<HcalElectronicsId> eids = emap->allElectronicsIdPrecision();
+          for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+            HcalGenericDetId did = HcalGenericDetId(_emap->lookup(*it));
+            EMapType::iterator dit = _ids.find(did.rawId());
+            if (dit != _ids.end())
+              continue;
+            //						if (!did.isHcalDetId())
+            //							continue;
 
-						_ids.insert(std::make_pair(did.rawId(), it->rawId()));
-					}
-				}
-				else if (_etype==fT2EHashMap)
-				{
-					//	HcalTrigTowerDetId -> HcalElectronicsId
-					std::vector<HcalTrigTowerDetId> tids = 
-						emap->allTriggerId();
-					for (std::vector<HcalTrigTowerDetId>::const_iterator it=
-						tids.begin(); it!=tids.end(); ++it)
-					{
-						HcalElectronicsId eid = _emap->lookupTrigger(*it);
-						uint32_t hash = it->rawId();
-						EMapType::iterator eit = _ids.find(hash);
-						if (eit!=_ids.end())
-							continue;
-						
-						_ids.insert(std::make_pair(hash, eid.rawId()));	
-					}
-				}
-				else if (_etype==fE2DHashMap)
-				{
-					//	HcalElectronicId -> HcalDetId hash map
-					std::vector<HcalElectronicsId> eids = 
-						emap->allElectronicsIdPrecision();
-					for (std::vector<HcalElectronicsId>::const_iterator
-						it=eids.begin(); it!=eids.end(); ++it)
-					{
-						HcalGenericDetId did = HcalGenericDetId(_emap->lookup(*it));
-						uint32_t hash = it->rawId();
-						EMapType::iterator eit = _ids.find(hash);
-						if (eit!=_ids.end())
-							continue;
-						
-						//	note, we have EChannel hashing here
-						_ids.insert(std::make_pair(hash, did.rawId()));
-					}
-				}
-				else if (_etype==fE2THashMap)
-				{
-					//	HcalElectronicId -> HcalDetId hash map
-					std::vector<HcalElectronicsId> eids = 
-						emap->allElectronicsIdTrigger();
-					for (std::vector<HcalElectronicsId>::const_iterator
-						it=eids.begin(); it!=eids.end(); ++it)
-					{
-						HcalTrigTowerDetId tid = 
-							HcalTrigTowerDetId(_emap->lookupTrigger(*it));
-						EMapType::iterator eit = _ids.find(it->rawId());
-						if (eit!=_ids.end())
-							continue;
-						
-						//	eid.rawId() -> tid.rawId()
-						_ids.insert(std::make_pair(it->rawId(), 
-							tid.rawId()));
-					}
-				}
-			}
-		}
+            _ids.insert(std::make_pair(did.rawId(), it->rawId()));
+          }
+        } else if (_etype == fT2EHashMap) {
+          //	HcalTrigTowerDetId -> HcalElectronicsId
+          std::vector<HcalTrigTowerDetId> tids = emap->allTriggerId();
+          for (std::vector<HcalTrigTowerDetId>::const_iterator it = tids.begin(); it != tids.end(); ++it) {
+            HcalElectronicsId eid = _emap->lookupTrigger(*it);
+            uint32_t hash = it->rawId();
+            EMapType::iterator eit = _ids.find(hash);
+            if (eit != _ids.end())
+              continue;
 
-		void ElectronicsMap::initialize(HcalElectronicsMap const* emap,
-			ElectronicsMapType etype, filter::HashFilter const& filter)
-		{
-			_etype=etype;
-			_emap = emap;
-			
-			//	note this initialization has iteration over electronics not 
-			//	detector. 
-			//	Filtering is done on Electronics id - possible to have 
-			//	several electronics ids to 1 detid - not vice versa
-			if (_etype!=fHcalElectronicsMap)
-			{
-				if (_etype==fD2EHashMap)
-				{
-					std::vector<HcalElectronicsId> eids = 
-						emap->allElectronicsIdPrecision();
-					for (std::vector<HcalElectronicsId>::const_iterator it=
-						eids.begin(); it!=eids.end(); ++it)
-					{
-						HcalGenericDetId did = HcalGenericDetId(
-							_emap->lookup(*it));
-						if (filter.filter(*it))
-							continue;
-						//	skip those that are not detid or calib ids
-//						if (!did.isHcalDetId())
-//							continue;
+            _ids.insert(std::make_pair(hash, eid.rawId()));
+          }
+        } else if (_etype == fE2DHashMap) {
+          //	HcalElectronicId -> HcalDetId hash map
+          std::vector<HcalElectronicsId> eids = emap->allElectronicsIdPrecision();
+          for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+            HcalGenericDetId did = HcalGenericDetId(_emap->lookup(*it));
+            uint32_t hash = it->rawId();
+            EMapType::iterator eit = _ids.find(hash);
+            if (eit != _ids.end())
+              continue;
 
-						_ids.insert(std::make_pair(did.rawId(), it->rawId()));
-					}
-				}
-				else if (_etype==fT2EHashMap)
-				{
-					std::vector<HcalElectronicsId> eids=
-						emap->allElectronicsIdTrigger();
-					for (std::vector<HcalElectronicsId>::const_iterator it=
-						eids.begin(); it!=eids.end(); ++it)
-					{
-						if (filter.filter(*it))
-							continue;
-						HcalTrigTowerDetId tid = emap->lookupTrigger(*it);
-						_ids.insert(std::make_pair(tid.rawId(), it->rawId()));
-					}
-				}
-				else if (_etype==fE2DHashMap)
-				{
-					std::vector<HcalElectronicsId> eids = 
-						emap->allElectronicsIdPrecision();
-					for (std::vector<HcalElectronicsId>::const_iterator it=
-						eids.begin(); it!=eids.end(); ++it)
-					{
-						HcalGenericDetId did = HcalGenericDetId(
-							_emap->lookup(*it));
-						uint32_t hash = hashfunctions::hash_EChannel(
-							*it);
-						if (filter.filter(*it))
-							continue;
-						//	skip those that are not detid or calib ids
-//						if (!did.isHcalDetId())
-//							continue;
+            //	note, we have EChannel hashing here
+            _ids.insert(std::make_pair(hash, did.rawId()));
+          }
+        } else if (_etype == fE2THashMap) {
+          //	HcalElectronicId -> HcalDetId hash map
+          std::vector<HcalElectronicsId> eids = emap->allElectronicsIdTrigger();
+          for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+            HcalTrigTowerDetId tid = HcalTrigTowerDetId(_emap->lookupTrigger(*it));
+            EMapType::iterator eit = _ids.find(it->rawId());
+            if (eit != _ids.end())
+              continue;
 
-						//	note: use EChannel hashing here!
-						_ids.insert(std::make_pair(hash,did.rawId()));
-					}
-				}
-				else if (_etype==fE2THashMap)
-				{
-					std::vector<HcalElectronicsId> eids=
-						emap->allElectronicsIdTrigger();
-					for (std::vector<HcalElectronicsId>::const_iterator it=
-						eids.begin(); it!=eids.end(); ++it)
-					{
-						if (filter.filter(*it))
-							continue;
-						HcalTrigTowerDetId tid = emap->lookupTrigger(*it);
-						_ids.insert(std::make_pair(it->rawId(), tid.rawId()));
-					}
-				}
-			}
-		}
+            //	eid.rawId() -> tid.rawId()
+            _ids.insert(std::make_pair(it->rawId(), tid.rawId()));
+          }
+        }
+      }
+    }
 
-		//	3 funcs below are only for 1->1 mappings
-		uint32_t ElectronicsMap::lookup(DetId const &id)
-		{
-			uint32_t hash = id.rawId();
-			if (_etype==fHcalElectronicsMap)
-				return _emap->lookup(id).rawId();
-			else 
-			{
-				EMapType::iterator it = _ids.find(hash);
-				return it==_ids.end() ? 0 : it->second;
-			}
-			return 0;
-		}
+    void ElectronicsMap::initialize(HcalElectronicsMap const *emap,
+                                    ElectronicsMapType etype,
+                                    filter::HashFilter const &filter) {
+      _etype = etype;
+      _emap = emap;
 
-		uint32_t ElectronicsMap::lookup(HcalDetId const &id)
-		{
-			// Turn the HcalDetId into a HcalGenericDetId to avoid newForm
-			uint32_t hash = (id.oldFormat() ? id.otherForm() : id.rawId());
-			HcalGenericDetId gdid(hash);
-			if (_etype==fHcalElectronicsMap)
-				return _emap->lookup(gdid).rawId();
-			else 
-			{
-				EMapType::iterator it = _ids.find(hash);
-				return it==_ids.end() ? 0 : it->second;
-			}
-			return 0;
-		}
+      //	note this initialization has iteration over electronics not
+      //	detector.
+      //	Filtering is done on Electronics id - possible to have
+      //	several electronics ids to 1 detid - not vice versa
+      if (_etype != fHcalElectronicsMap) {
+        if (_etype == fD2EHashMap) {
+          std::vector<HcalElectronicsId> eids = emap->allElectronicsIdPrecision();
+          for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+            HcalGenericDetId did = HcalGenericDetId(_emap->lookup(*it));
+            if (filter.filter(*it))
+              continue;
+            //	skip those that are not detid or calib ids
+            //						if (!did.isHcalDetId())
+            //							continue;
 
-		uint32_t ElectronicsMap::lookup(HcalElectronicsId const &id)
-		{
-			uint32_t hash = id.rawId();
-			if (_etype==fHcalElectronicsMap)
-				return _emap->lookup(id).rawId();
-			else 
-			{
-				EMapType::iterator it=_ids.find(hash);
-				return it==_ids.end() ? 0 : it->second;
-			}
-			return 0;
-		}
+            _ids.insert(std::make_pair(did.rawId(), it->rawId()));
+          }
+        } else if (_etype == fT2EHashMap) {
+          std::vector<HcalElectronicsId> eids = emap->allElectronicsIdTrigger();
+          for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+            if (filter.filter(*it))
+              continue;
+            HcalTrigTowerDetId tid = emap->lookupTrigger(*it);
+            _ids.insert(std::make_pair(tid.rawId(), it->rawId()));
+          }
+        } else if (_etype == fE2DHashMap) {
+          std::vector<HcalElectronicsId> eids = emap->allElectronicsIdPrecision();
+          for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+            HcalGenericDetId did = HcalGenericDetId(_emap->lookup(*it));
+            uint32_t hash = hashfunctions::hash_EChannel(*it);
+            if (filter.filter(*it))
+              continue;
+            //	skip those that are not detid or calib ids
+            //						if (!did.isHcalDetId())
+            //							continue;
 
-		void ElectronicsMap::print()
-		{
-			std::cout << "Electronics HashMap Type=" << _etype  << std::endl;
-			for(auto const& v : _ids)
-			{
-				std::cout << std::hex << v.first 
-					 << "  "<< v.second << std::dec << std::endl;
-			}
-		}
-	}
-}
+            //	note: use EChannel hashing here!
+            _ids.insert(std::make_pair(hash, did.rawId()));
+          }
+        } else if (_etype == fE2THashMap) {
+          std::vector<HcalElectronicsId> eids = emap->allElectronicsIdTrigger();
+          for (std::vector<HcalElectronicsId>::const_iterator it = eids.begin(); it != eids.end(); ++it) {
+            if (filter.filter(*it))
+              continue;
+            HcalTrigTowerDetId tid = emap->lookupTrigger(*it);
+            _ids.insert(std::make_pair(it->rawId(), tid.rawId()));
+          }
+        }
+      }
+    }
+
+    //	3 funcs below are only for 1->1 mappings
+    uint32_t ElectronicsMap::lookup(DetId const &id) {
+      uint32_t hash = id.rawId();
+      if (_etype == fHcalElectronicsMap)
+        return _emap->lookup(id).rawId();
+      else {
+        EMapType::iterator it = _ids.find(hash);
+        return it == _ids.end() ? 0 : it->second;
+      }
+      return 0;
+    }
+
+    uint32_t ElectronicsMap::lookup(HcalDetId const &id) {
+      // Turn the HcalDetId into a HcalGenericDetId to avoid newForm
+      uint32_t hash = (id.oldFormat() ? id.otherForm() : id.rawId());
+      HcalGenericDetId gdid(hash);
+      if (_etype == fHcalElectronicsMap)
+        return _emap->lookup(gdid).rawId();
+      else {
+        EMapType::iterator it = _ids.find(hash);
+        return it == _ids.end() ? 0 : it->second;
+      }
+      return 0;
+    }
+
+    uint32_t ElectronicsMap::lookup(HcalElectronicsId const &id) {
+      uint32_t hash = id.rawId();
+      if (_etype == fHcalElectronicsMap)
+        return _emap->lookup(id).rawId();
+      else {
+        EMapType::iterator it = _ids.find(hash);
+        return it == _ids.end() ? 0 : it->second;
+      }
+      return 0;
+    }
+
+    void ElectronicsMap::print() {
+      std::cout << "Electronics HashMap Type=" << _etype << std::endl;
+      for (auto const &v : _ids) {
+        std::cout << std::hex << v.first << "  " << v.second << std::dec << std::endl;
+      }
+    }
+  }  // namespace electronicsmap
+}  // namespace hcaldqm
diff --git a/DQM/HcalCommon/src/ElectronicsQuantity.cc b/DQM/HcalCommon/src/ElectronicsQuantity.cc
index 8b4aeb688c1b6..4fe55281a8f34 100644
--- a/DQM/HcalCommon/src/ElectronicsQuantity.cc
+++ b/DQM/HcalCommon/src/ElectronicsQuantity.cc
@@ -1,831 +1,611 @@
 #include "DQM/HcalCommon/interface/ElectronicsQuantity.h"
 
-namespace hcaldqm
-{
-	using namespace constants;
-	namespace quantity
-	{
-		int getValue_FED(HcalElectronicsId const& eid)
-		{			
-			unsigned int fed = utilities::crate2fed(eid.crateId(), eid.slot());
-			auto it_fed = std::find(std::begin(fedList), std::end(fedList), fed);
-			return ((it_fed == std::end(fedList)) ? -1 : std::distance(fedList.begin(), it_fed));
-		}
-
-		int getValue_FEDuTCA(HcalElectronicsId const& eid)
-		{
-			unsigned int fed = utilities::crate2fed(eid.crateId(), eid.slot());
-			auto it_fed = std::find(std::begin(fedListuTCA), std::end(fedListuTCA), fed);
-			return ((it_fed == std::end(fedListuTCA)) ? -1 : std::distance(fedListuTCA.begin(), it_fed));
-		}
-
-		int getValue_FEDVME(HcalElectronicsId const& eid)
-		{
-			unsigned int fed = utilities::crate2fed(eid.crateId(), eid.slot());
-			auto it_fed = std::find(std::begin(fedListVME), std::end(fedListVME), fed);
-			return ((it_fed == std::end(fedListVME)) ? -1 : std::distance(fedListVME.begin(), it_fed));
-
-		}
-
-		int getValue_Crate(HcalElectronicsId const& eid)
-		{
-			unsigned int crate = eid.crateId();
-			auto it_crate = std::find(std::begin(crateList), std::end(crateList), crate);
-			return ((it_crate == std::end(crateList)) ? -1 : std::distance(crateList.begin(), it_crate));
-		}
-
-		int getValue_CrateuTCA(HcalElectronicsId const& eid)
-		{
-			unsigned int crate = eid.crateId();
-			auto it_crate = std::find(std::begin(crateListuTCA), std::end(crateListuTCA), crate);
-			return ((it_crate == std::end(crateListuTCA)) ? -1 : std::distance(crateListuTCA.begin(), it_crate));
-		}
-
-		int getValue_CrateVME(HcalElectronicsId const& eid)
-		{
-			unsigned int crate = eid.crateId();
-			auto it_crate = std::find(std::begin(crateListVME), std::end(crateListVME), crate);
-			return ((it_crate == std::end(crateListVME)) ? -1 : std::distance(crateListVME.begin(), it_crate));			
-		}
-
-		int getValue_SlotuTCA(HcalElectronicsId const& eid)
-		{
-			return eid.slot()-SLOT_uTCA_MIN;
-		}
-
-		int getValue_SlotVME(HcalElectronicsId const& eid)
-		{
-			int slot = eid.slot();
-			if (slot<=SLOT_VME_MAX1)
-				slot-=SLOT_VME_MIN1;
-			else
-				slot = SLOT_VME_NUM1 + slot-SLOT_VME_MIN2;
-			return slot;
-		}
-
-		int getValue_Spigot(HcalElectronicsId const& eid)
-		{
-			return eid.spigot();
-		}
-
-		int getValue_FiberuTCA(HcalElectronicsId const& eid)
-		{
-			int fiber = eid.fiberIndex();
-			if (fiber<=FIBER_uTCA_MAX1)
-				fiber-=FIBER_uTCA_MIN1;
-			else
-				fiber = (FIBER_uTCA_MAX1-FIBER_uTCA_MIN1+1) + 
-					fiber-FIBER_uTCA_MIN2;
-			return fiber;
-		}
-
-		int getValue_FiberVME(HcalElectronicsId const& eid)
-		{
-			return eid.fiberIndex()-1;
-		}
-
-		int getValue_FiberCh(HcalElectronicsId const& eid)
-		{
-			return eid.fiberChanId();
-		}
-
-		int getValue_FEDuTCASlot(HcalElectronicsId const& eid)
-		{
-			int ifed = getValue_FEDuTCA(eid);
-			int islot = getValue_SlotuTCA(eid);
-			return ifed*SLOT_uTCA_NUM+islot;
-		}
-
-		int getValue_FEDVMESpigot(HcalElectronicsId const& eid)
-		{
-			int ifed = getValue_FEDVME(eid);
-			int ispigot = getValue_Spigot(eid);
-			return ifed*SPIGOT_NUM+ispigot;
-		}
-
-		int getValue_FiberuTCAFiberCh(HcalElectronicsId const &eid)
-		{
-			int ifiber = getValue_FiberuTCA(eid);
-			int ifch = getValue_FiberCh(eid);
-			return ifiber*FIBERCH_NUM+ifch;
-		}
-
-		int getValue_FiberVMEFiberCh(HcalElectronicsId const &eid)
-		{
-			int ifiber = getValue_FiberVME(eid);
-			int ifch = getValue_FiberCh(eid);
-			return ifiber*FIBERCH_NUM+ifch;
-		}
-
-		int getValue_SLB(HcalElectronicsId const &eid)
-		{
-			int slbsite = eid.slbSiteNumber();
-			return slbsite-SLB_MIN;
-		}
-
-		int getValue_SLBCh(HcalElectronicsId const& eid)
-		{
-			return eid.slbChannelIndex()-SLBCH_MIN;
-		}
-
-		int getValue_SLBSLBCh(HcalElectronicsId const &eid)
-		{
-			int islb = getValue_SLB(eid);
-			int islbch = getValue_SLBCh(eid);
-			return islb*SLBCH_NUM+islbch;
-		}
-
-		int getValue_FiberuTCATP(HcalElectronicsId const& eid)
-		{
-			return eid.fiberIndex()-TPFIBER_MIN;
-		}
-
-		int getValue_FiberChuTCATP(HcalElectronicsId const &eid)
-		{
-			return eid.fiberChanId()-TPFIBERCH_MIN;
-		}
-
-		int getValue_FiberuTCATPFiberChuTCATP(HcalElectronicsId const& eid)
-		{
-			int ifib = getValue_FiberuTCATP(eid);
-			int ifibch = getValue_FiberChuTCATP(eid);
-			return ifib*TPFIBERCH_NUM+ifibch;
-		}
-
-		uint32_t getBin_FED(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_FED(eid)+1);
-		}
-
-		uint32_t getBin_FEDuTCA(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_FEDuTCA(eid)+1);
-		}
-
-		uint32_t getBin_FEDVME(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_FEDVME(eid)+1);
-		}
-
-		uint32_t getBin_Crate(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_Crate(eid)+1);
-		}
-
-		uint32_t getBin_CrateuTCA(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_CrateuTCA(eid)+1);
-		}
-
-		uint32_t getBin_CrateVME(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_CrateVME(eid)+1);
-		}
-
-		uint32_t getBin_SlotuTCA(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_SlotuTCA(eid)+1);
-		}
-
-		uint32_t getBin_SlotVME(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_SlotVME(eid)+1);
-		}
-
-		uint32_t getBin_Spigot(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_Spigot(eid)+1);
-		}
-
-		uint32_t getBin_FiberuTCA(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_FiberuTCA(eid)+1);
-		}
-
-		uint32_t getBin_FiberVME(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_FiberVME(eid)+1);
-		}
-
-		uint32_t getBin_FiberCh(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_FiberCh(eid)+1);
-		}
-
-		uint32_t getBin_FEDuTCASlot(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_FEDuTCASlot(eid)+1);
-		}
-
-		uint32_t getBin_FEDVMESpigot(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_FEDVMESpigot(eid)+1);
-		}
-
-		uint32_t getBin_FiberuTCAFiberCh(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_FiberuTCAFiberCh(eid)+1);
-		}
-
-		uint32_t getBin_FiberVMEFiberCh(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_FiberVMEFiberCh(eid)+1);
-		}
-
-		uint32_t getBin_SLB(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_SLB(eid)+1);
-		}
-
-		uint32_t getBin_SLBCh(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_SLBCh(eid)+1);
-		}
-
-		uint32_t getBin_SLBSLBCh(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_SLBSLBCh(eid)+1);
-		}
-
-		uint32_t getBin_FiberuTCATP(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_FiberuTCATP(eid)+1);
-		}
-
-		uint32_t getBin_FiberChuTCATP(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_FiberChuTCATP(eid)+1);
-		}
-
-		uint32_t getBin_FiberuTCATPFiberChuTCATP(HcalElectronicsId const& eid)
-		{
-			return (uint32_t)(getValue_FiberuTCATPFiberChuTCATP(eid)+1);
-		}
-
-		HcalElectronicsId getEid_FED(int v)
-		{
-			return v<FED_VME_NUM ? HcalElectronicsId(FIBERCH_MIN,
-				FIBER_VME_MIN, SPIGOT_MIN, v) :
-				HcalElectronicsId(utilities::fed2crate(v-FED_VME_NUM+1100).first,
-				utilities::fed2crate(v-FED_VME_NUM+1100).second, FIBER_uTCA_MIN1,
-				FIBERCH_MIN, false);
-		}
-
-		HcalElectronicsId getEid_FEDVME(int v)
-		{
-			return HcalElectronicsId(FIBERCH_MIN,
-				FIBER_VME_MIN, SPIGOT_MIN, v);
-		}
-
-		HcalElectronicsId getEid_FEDuTCA(int v)
-		{
-			return HcalElectronicsId(utilities::fed2crate(v+1100).first,
-				utilities::fed2crate(v-FED_VME_NUM+1100).second, 
-                FIBER_uTCA_MIN1, FIBERCH_MIN, false);
-		}
-
-		HcalElectronicsId getEid_Crate(int v)
-		{
-			return v<CRATE_VME_NUM ?
-				HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, SPIGOT_MIN, v) :
-				HcalElectronicsId(v-CRATE_VME_NUM+CRATE_uTCA_MIN,
-					SLOT_uTCA_MIN, FIBER_uTCA_MIN1, FIBERCH_MIN, false);
-		}
-
-		HcalElectronicsId getEid_CrateVME(int v)
-		{
-			return HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN,
-				SPIGOT_MIN, v);
-		}
-
-		HcalElectronicsId getEid_CrateuTCA(int v)
-		{
-			return HcalElectronicsId(v+CRATE_uTCA_MIN,
-				SLOT_uTCA_MIN, FIBER_uTCA_MIN1, FIBERCH_MIN, false);
-		}
-
-		HcalElectronicsId getEid_SlotuTCA(int v)
-		{
-			return HcalElectronicsId(CRATE_uTCA_MIN,
-				v+SLOT_uTCA_MIN, FIBER_uTCA_MIN1, FIBERCH_MIN, false);
-		}
-
-		//	nothing for now...
-		HcalElectronicsId getEid_SlotVME(int v)
-		{
-			return 
-				HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, 
-					SPIGOT_MIN, CRATE_VME_MIN);
-		}
-
-		HcalElectronicsId getEid_Spigot(int v)
-		{
-			return HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN,
-				v, CRATE_VME_MIN);
-		}
-
-		HcalElectronicsId getEid_FiberuTCA(int v)
-		{
-			return HcalElectronicsId(CRATE_uTCA_MIN,
-				SLOT_uTCA_MIN, v<(FIBER_uTCA_MAX1-FIBER_uTCA_MIN1+1)?
-				v+FIBER_uTCA_MIN1 : v-(FIBER_uTCA_MAX1-FIBER_uTCA_MIN1+1)+
-				FIBER_uTCA_MIN2,
-				FIBERCH_MIN, false);
-		}
-		
-		HcalElectronicsId getEid_FiberVME(int v)
-		{
-			return HcalElectronicsId(FIBERCH_MIN, v+1,
-				SPIGOT_MIN, CRATE_VME_MIN);
-		}
-
-		HcalElectronicsId getEid_FiberCh(int v)
-		{
-			return HcalElectronicsId(CRATE_uTCA_MIN, SLOT_uTCA_MIN,
-				FIBER_uTCA_MIN1, v, false);
-		}
-
-		HcalElectronicsId getEid_FEDuTCASlot(int v)
-		{
-			HcalElectronicsId fedeid = getEid_FEDuTCA(v/SLOT_uTCA_NUM);
-			HcalElectronicsId sloteid = getEid_SlotuTCA(v%SLOT_uTCA_NUM);
-			return HcalElectronicsId(
-				fedeid.crateId(), sloteid.slot(), FIBER_uTCA_MIN1,
-				FIBERCH_MIN, false);
-		}
-
-		HcalElectronicsId getEid_FEDVMESpigot(int v)
-		{
-			HcalElectronicsId fedeid = getEid_FEDVME(v/SPIGOT_NUM);
-			HcalElectronicsId spid = getEid_Spigot(v%SPIGOT_NUM);
-			return HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN,
-				spid.spigot(), fedeid.dccid());
-		}
-
-		HcalElectronicsId getEid_FiberuTCAFiberCh(int v)
-		{
-			HcalElectronicsId fibereid = getEid_FiberuTCA(v/FIBERCH_NUM);
-			HcalElectronicsId fcheid = getEid_FiberCh(v%FIBERCH_NUM);
-			return HcalElectronicsId(CRATE_uTCA_MIN, SLOT_uTCA_MIN,
-				fibereid.fiberIndex(), fcheid.fiberChanId(), false);
-		}
-
-		HcalElectronicsId getEid_FiberVMEFiberCh(int v)
-		{
-			HcalElectronicsId fibereid = getEid_FiberVME(v/FIBERCH_NUM);
-			HcalElectronicsId fcheid = getEid_FiberCh(v%FIBERCH_NUM);
-			return HcalElectronicsId(fcheid.fiberChanId(),
-				fibereid.fiberIndex(), SPIGOT_MIN, CRATE_VME_MIN);
-		}
-
-		HcalElectronicsId getEid_SLB(int v)
-		{
-			return HcalElectronicsId(SLBCH_MIN, v+SLB_MIN,
-				SPIGOT_MIN, CRATE_VME_MIN, CRATE_VME_MIN, SLOT_VME_MIN1,
-				0);
-		}
-
-		HcalElectronicsId getEid_SLBCh(int v)
-		{
-			return HcalElectronicsId(v+SLBCH_MIN, SLB_MIN,
-				SPIGOT_MIN, CRATE_VME_MIN, CRATE_VME_MIN, SLOT_VME_MIN1,
-				0);
-		}
-		
-		HcalElectronicsId getEid_SLBSLBCh(int v)
-		{
-			HcalElectronicsId slbeid = getEid_SLB(v/SLBCH_NUM);
-			HcalElectronicsId slbcheid = getEid_SLBCh(v%SLBCH_NUM);
-			return HcalElectronicsId(slbcheid.slbChannelIndex(),
-				slbeid.slbSiteNumber(), SPIGOT_MIN, CRATE_VME_MIN,
-				CRATE_VME_MIN, SLOT_VME_MIN1, 0);
-		}
-
-		HcalElectronicsId getEid_FiberuTCATP(int v)
-		{
-			return HcalElectronicsId(CRATE_uTCA_MIN,
-				SLOT_uTCA_MIN, v+TPFIBER_MIN, TPFIBERCH_MIN, true);
-		}
-
-		HcalElectronicsId getEid_FiberChuTCATP(int v)
-		{
-			return HcalElectronicsId(CRATE_uTCA_MIN,
-				SLOT_uTCA_MIN, TPFIBER_MIN, v+TPFIBERCH_MIN, true);
-		}
-
-		HcalElectronicsId getEid_FiberuTCATPFiberChuTCATP(int v)
-		{
-			HcalElectronicsId fibeid = getEid_FiberuTCATP(v/TPFIBERCH_NUM);
-			HcalElectronicsId fibcheid = getEid_FiberChuTCATP(v%TPFIBERCH_NUM);
-			return HcalElectronicsId(CRATE_uTCA_MIN, SLOT_uTCA_MIN,
-				fibeid.fiberIndex(), fibcheid.fiberChanId(), true);
-		}
-
-		std::vector<std::string> getLabels_FED()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<FED_TOTAL_NUM; i++)
-			{
-				HcalElectronicsId eid = getEid_FED(i);
-				sprintf(name, "%d", 
-					eid.isVMEid()?eid.dccid()+700:utilities::crate2fed(eid.crateId(),eid.slot()));
-				labels.push_back(std::string(name));
-			}
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_FEDuTCA()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<FED_uTCA_NUM; i++)
-			{
-				HcalElectronicsId eid = getEid_FEDuTCA(i);
-				sprintf(name, "%d",
-					utilities::crate2fed(eid.crateId(),eid.slot()));
-				labels.push_back(std::string(name));
-			}
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_FEDVME()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<FED_VME_NUM; i++)
-			{
-				sprintf(name, "%d",
-					getEid_FEDVME(i).dccid()+700);
-				labels.push_back(std::string(name));
-			}
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_Crate()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (auto& it_crate : hcaldqm::constants::crateList) {
-				HcalElectronicsId eid = getEid_Crate(it_crate);
-				sprintf(name, "%d%c",
-					it_crate, eid.isVMEid()?'v':'u');
-				labels.push_back(std::string(name));
-			}
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_CrateVME()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (auto& it_crate : hcaldqm::constants::crateListVME) {
-				sprintf(name, "%dv", it_crate);
-				labels.push_back(std::string(name));
-			}
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_CrateuTCA()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (auto& it_crate : hcaldqm::constants::crateListuTCA) {
-				sprintf(name, "%du", it_crate);
-				labels.push_back(std::string(name));
-			}
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_SlotuTCA()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<SLOT_uTCA_NUM; i++)
-			{
-				HcalElectronicsId eid = getEid_SlotuTCA(i);
-				sprintf(name, "%d",
-					eid.slot());
-				labels.push_back(std::string(name));
-			}
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_SlotVME()
-		{
-			return std::vector<std::string>();
-		}
-
-		std::vector<std::string> getLabels_Spigot()
-		{
-			return std::vector<std::string>();
-/*			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<SPIGOT_NUM; i++)
-			{
-				HcalElectronicsId eid = getEid_Spigot(i);
-				sprintf(name, "%d",
-					eid.spigot());
-				labels.push_back(std::string(name));
-			}
-			return labels;
-	*/
-		}
-
-		std::vector<std::string> getLabels_FiberuTCA()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<FIBER_uTCA_NUM; i++)
-			{
-				HcalElectronicsId eid = getEid_FiberuTCA(i);
-				sprintf(name, "%d",
-					eid.fiberIndex());
-				labels.push_back(std::string(name));
-			}
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_FiberVME()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<FIBER_VME_NUM; i++)
-			{
-				HcalElectronicsId eid = getEid_FiberVME(i);
-				sprintf(name, "%d",
-					eid.fiberIndex());
-				labels.push_back(std::string(name));
-			}
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_FiberCh()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<FIBERCH_NUM; i++)
-			{
-				HcalElectronicsId eid = getEid_FiberCh(i);
-				sprintf(name, "%d",
-					eid.fiberChanId());
-				labels.push_back(std::string(name));
-			}
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_FEDuTCASlot()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<FED_uTCA_NUM; i++)
-				for (int j=0; j<SLOT_uTCA_NUM; j++)
-				{
-					if (j>0)
-					{
-						labels.push_back(std::string(""));
-						continue;
-					}
-					HcalElectronicsId eid = getEid_FEDuTCASlot(
-						i*SLOT_uTCA_NUM+j);
-					sprintf(name, "%d-%d", 
-						utilities::crate2fed(eid.crateId(),eid.slot()),
-						eid.slot());
-					labels.push_back(std::string(name));
-				}
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_FEDVMESpigot()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<FED_VME_NUM; i++)
-				for (int j=0; j<SPIGOT_NUM; j++)
-				{
-					if (j>0)
-					{
-						labels.push_back(std::string(""));
-						continue;
-					}
-
-					HcalElectronicsId eid = getEid_FEDVMESpigot(
-						i*SPIGOT_NUM+j);
-					sprintf(name, "%d-%d",
-						eid.dccid()+FED_VME_MIN, eid.spigot());
-					labels.push_back(std::string(name));
-				}
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_FiberuTCAFiberCh()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<FIBER_uTCA_NUM; i++)
-				for (int j=0; j<FIBERCH_NUM; j++)
-				{
-					if (j>0)
-					{
-						labels.push_back(std::string(""));
-						continue;
-					}
-
-					HcalElectronicsId eid = getEid_FiberuTCAFiberCh(
-						i*FIBERCH_NUM+j);
-					sprintf(name, "%d-%d", eid.fiberIndex(),
-						eid.fiberChanId());
-					labels.push_back(std::string(name));
-				}
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_FiberVMEFiberCh()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<FIBER_VME_NUM; i++)
-				for (int j=0; j<FIBERCH_NUM; j++)
-				{
-					if (j>0)
-					{
-						labels.push_back(std::string(""));
-						continue;
-					}
-					HcalElectronicsId eid = getEid_FiberVMEFiberCh(
-						i*FIBERCH_NUM+j);
-					sprintf(name, "%d-%d", eid.fiberIndex(),
-						eid.fiberChanId());
-					labels.push_back(std::string(name));
-				}
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_SLB()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<SLB_NUM; i++)
-			{
-				HcalElectronicsId eid = getEid_SLB(i);
-				sprintf(name, "%d", eid.slbSiteNumber());
-				labels.push_back(std::string(name));
-			}
-
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_SLBCh()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<SLBCH_NUM; i++)
-			{
-				HcalElectronicsId eid = getEid_SLBCh(i);
-				sprintf(name, "%d", eid.slbChannelIndex());
-				labels.push_back(std::string(name));
-			}
-
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_SLBSLBCh()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<SLB_NUM; i++)
-				for (int j=0; j<SLBCH_NUM; j++)
-				{
-					HcalElectronicsId eid=getEid_SLBSLBCh(i*SLBCH_NUM+j);
-					sprintf(name, "%d-%d", eid.slbSiteNumber(),
-						eid.slbChannelIndex());
-					labels.push_back(std::string(name));
-				}
-
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_FiberuTCATP()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<TPFIBER_NUM; i++)
-			{
-				HcalElectronicsId eid = getEid_FiberuTCATP(i);
-				sprintf(name, "%d", eid.fiberIndex());
-				labels.push_back(std::string(name));
-			}
-
-			return labels;
-		}
-		
-		std::vector<std::string> getLabels_FiberChuTCATP()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<TPFIBERCH_NUM; i++)
-			{
-				HcalElectronicsId eid = getEid_FiberChuTCATP(i);
-				sprintf(name, "%d", eid.fiberChanId());
-				labels.push_back(std::string(name));
-			}
-
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_FiberuTCATPFiberChuTCATP()
-		{
-			std::vector<std::string> labels;
-			char name[10];
-			for (int i=0; i<TPFIBER_NUM; i++)
-				for (int j=0; j<TPFIBERCH_NUM; j++)
-				{
-					HcalElectronicsId eid=getEid_FiberuTCATPFiberChuTCATP(
-						i*TPFIBERCH_NUM+j);
-					sprintf(name, "%d-%d", eid.fiberIndex(),
-						eid.fiberChanId());
-					labels.push_back(std::string(name));
-				}
-
-			return labels;
-		}
-
-		void FEDQuantity::setup(std::vector<int> const& vFEDs)
-		{
-			for (uint32_t i=0; i<vFEDs.size(); i++)
-				_feds.insert(std::make_pair(vFEDs[i], i));
-		}
-
-		int FEDQuantity::getValue(HcalElectronicsId const& eid)
-		{
-			int fed = eid.isVMEid()?eid.dccid()+FED_VME_MIN:
-			  utilities::crate2fed(eid.crateId(),eid.slot());
-			return _feds[fed];
-		}
-
-		uint32_t FEDQuantity::getBin(HcalElectronicsId const& eid)
-		{
-			return getValue(eid)+1;
-		}
-
-		std::vector<std::string> FEDQuantity::getLabels()
-		{
-			std::vector<std::string> labels(_feds.size());
-			char name[5];
-			for(auto const& v : _feds)
-			{
-				sprintf(name, "%d", v.first);
-				labels[v.second] = std::string(name);
-			}
-
-			return labels;
-		}
-
-
-		void CrateQuantity::setup(HcalElectronicsMap const * emap)
-		{
-			_crates      = utilities::getCrateList(emap);
-			_crateHashes = utilities::getCrateHashMap(emap);
-		}
-
-		void CrateQuantity::setup(std::vector<int> crates, std::map<int, uint32_t> crateHashes) {
-			for (auto& it_crate : crates) {
-				_crates.push_back(it_crate);
-				_crateHashes[it_crate] = crateHashes[it_crate];
-			}
-		}
-
-		int CrateQuantity::getValue(HcalElectronicsId const& eid)
-		{
-			return eid.crateId();
-		}
-
-		uint32_t CrateQuantity::getBin(HcalElectronicsId const& eid)
-		{
-			int crate = eid.crateId();
-			auto it = std::find(_crates.begin(), _crates.end(), crate);
-			if (it == _crates.end()) {
-				return 0;
-			} else {
-				return std::distance(_crates.begin(), it) + 1;
-			}
-		}
-
-		std::vector<std::string> CrateQuantity::getLabels()
-		{
-			std::vector<std::string> labels;
-			char name[5];
-			for (auto& it_crate : _crates) {
-				HcalElectronicsId eid(_crateHashes[it_crate]);
-				if (eid.isVMEid()) {
-					sprintf(name, "%dv", it_crate);
-				} else {
-					sprintf(name, "%du", it_crate);
-				}
-				labels.push_back(name);
-			}
-			return labels;
-		}
-
-	}
-}
+namespace hcaldqm {
+  using namespace constants;
+  namespace quantity {
+    int getValue_FED(HcalElectronicsId const &eid) {
+      unsigned int fed = utilities::crate2fed(eid.crateId(), eid.slot());
+      auto it_fed = std::find(std::begin(fedList), std::end(fedList), fed);
+      return ((it_fed == std::end(fedList)) ? -1 : std::distance(fedList.begin(), it_fed));
+    }
+
+    int getValue_FEDuTCA(HcalElectronicsId const &eid) {
+      unsigned int fed = utilities::crate2fed(eid.crateId(), eid.slot());
+      auto it_fed = std::find(std::begin(fedListuTCA), std::end(fedListuTCA), fed);
+      return ((it_fed == std::end(fedListuTCA)) ? -1 : std::distance(fedListuTCA.begin(), it_fed));
+    }
+
+    int getValue_FEDVME(HcalElectronicsId const &eid) {
+      unsigned int fed = utilities::crate2fed(eid.crateId(), eid.slot());
+      auto it_fed = std::find(std::begin(fedListVME), std::end(fedListVME), fed);
+      return ((it_fed == std::end(fedListVME)) ? -1 : std::distance(fedListVME.begin(), it_fed));
+    }
+
+    int getValue_Crate(HcalElectronicsId const &eid) {
+      unsigned int crate = eid.crateId();
+      auto it_crate = std::find(std::begin(crateList), std::end(crateList), crate);
+      return ((it_crate == std::end(crateList)) ? -1 : std::distance(crateList.begin(), it_crate));
+    }
+
+    int getValue_CrateuTCA(HcalElectronicsId const &eid) {
+      unsigned int crate = eid.crateId();
+      auto it_crate = std::find(std::begin(crateListuTCA), std::end(crateListuTCA), crate);
+      return ((it_crate == std::end(crateListuTCA)) ? -1 : std::distance(crateListuTCA.begin(), it_crate));
+    }
+
+    int getValue_CrateVME(HcalElectronicsId const &eid) {
+      unsigned int crate = eid.crateId();
+      auto it_crate = std::find(std::begin(crateListVME), std::end(crateListVME), crate);
+      return ((it_crate == std::end(crateListVME)) ? -1 : std::distance(crateListVME.begin(), it_crate));
+    }
+
+    int getValue_SlotuTCA(HcalElectronicsId const &eid) { return eid.slot() - SLOT_uTCA_MIN; }
+
+    int getValue_SlotVME(HcalElectronicsId const &eid) {
+      int slot = eid.slot();
+      if (slot <= SLOT_VME_MAX1)
+        slot -= SLOT_VME_MIN1;
+      else
+        slot = SLOT_VME_NUM1 + slot - SLOT_VME_MIN2;
+      return slot;
+    }
+
+    int getValue_Spigot(HcalElectronicsId const &eid) { return eid.spigot(); }
+
+    int getValue_FiberuTCA(HcalElectronicsId const &eid) {
+      int fiber = eid.fiberIndex();
+      if (fiber <= FIBER_uTCA_MAX1)
+        fiber -= FIBER_uTCA_MIN1;
+      else
+        fiber = (FIBER_uTCA_MAX1 - FIBER_uTCA_MIN1 + 1) + fiber - FIBER_uTCA_MIN2;
+      return fiber;
+    }
+
+    int getValue_FiberVME(HcalElectronicsId const &eid) { return eid.fiberIndex() - 1; }
+
+    int getValue_FiberCh(HcalElectronicsId const &eid) { return eid.fiberChanId(); }
+
+    int getValue_FEDuTCASlot(HcalElectronicsId const &eid) {
+      int ifed = getValue_FEDuTCA(eid);
+      int islot = getValue_SlotuTCA(eid);
+      return ifed * SLOT_uTCA_NUM + islot;
+    }
+
+    int getValue_FEDVMESpigot(HcalElectronicsId const &eid) {
+      int ifed = getValue_FEDVME(eid);
+      int ispigot = getValue_Spigot(eid);
+      return ifed * SPIGOT_NUM + ispigot;
+    }
+
+    int getValue_FiberuTCAFiberCh(HcalElectronicsId const &eid) {
+      int ifiber = getValue_FiberuTCA(eid);
+      int ifch = getValue_FiberCh(eid);
+      return ifiber * FIBERCH_NUM + ifch;
+    }
+
+    int getValue_FiberVMEFiberCh(HcalElectronicsId const &eid) {
+      int ifiber = getValue_FiberVME(eid);
+      int ifch = getValue_FiberCh(eid);
+      return ifiber * FIBERCH_NUM + ifch;
+    }
+
+    int getValue_SLB(HcalElectronicsId const &eid) {
+      int slbsite = eid.slbSiteNumber();
+      return slbsite - SLB_MIN;
+    }
+
+    int getValue_SLBCh(HcalElectronicsId const &eid) { return eid.slbChannelIndex() - SLBCH_MIN; }
+
+    int getValue_SLBSLBCh(HcalElectronicsId const &eid) {
+      int islb = getValue_SLB(eid);
+      int islbch = getValue_SLBCh(eid);
+      return islb * SLBCH_NUM + islbch;
+    }
+
+    int getValue_FiberuTCATP(HcalElectronicsId const &eid) { return eid.fiberIndex() - TPFIBER_MIN; }
+
+    int getValue_FiberChuTCATP(HcalElectronicsId const &eid) { return eid.fiberChanId() - TPFIBERCH_MIN; }
+
+    int getValue_FiberuTCATPFiberChuTCATP(HcalElectronicsId const &eid) {
+      int ifib = getValue_FiberuTCATP(eid);
+      int ifibch = getValue_FiberChuTCATP(eid);
+      return ifib * TPFIBERCH_NUM + ifibch;
+    }
+
+    uint32_t getBin_FED(HcalElectronicsId const &eid) { return (uint32_t)(getValue_FED(eid) + 1); }
+
+    uint32_t getBin_FEDuTCA(HcalElectronicsId const &eid) { return (uint32_t)(getValue_FEDuTCA(eid) + 1); }
+
+    uint32_t getBin_FEDVME(HcalElectronicsId const &eid) { return (uint32_t)(getValue_FEDVME(eid) + 1); }
+
+    uint32_t getBin_Crate(HcalElectronicsId const &eid) { return (uint32_t)(getValue_Crate(eid) + 1); }
+
+    uint32_t getBin_CrateuTCA(HcalElectronicsId const &eid) { return (uint32_t)(getValue_CrateuTCA(eid) + 1); }
+
+    uint32_t getBin_CrateVME(HcalElectronicsId const &eid) { return (uint32_t)(getValue_CrateVME(eid) + 1); }
+
+    uint32_t getBin_SlotuTCA(HcalElectronicsId const &eid) { return (uint32_t)(getValue_SlotuTCA(eid) + 1); }
+
+    uint32_t getBin_SlotVME(HcalElectronicsId const &eid) { return (uint32_t)(getValue_SlotVME(eid) + 1); }
+
+    uint32_t getBin_Spigot(HcalElectronicsId const &eid) { return (uint32_t)(getValue_Spigot(eid) + 1); }
+
+    uint32_t getBin_FiberuTCA(HcalElectronicsId const &eid) { return (uint32_t)(getValue_FiberuTCA(eid) + 1); }
+
+    uint32_t getBin_FiberVME(HcalElectronicsId const &eid) { return (uint32_t)(getValue_FiberVME(eid) + 1); }
+
+    uint32_t getBin_FiberCh(HcalElectronicsId const &eid) { return (uint32_t)(getValue_FiberCh(eid) + 1); }
+
+    uint32_t getBin_FEDuTCASlot(HcalElectronicsId const &eid) { return (uint32_t)(getValue_FEDuTCASlot(eid) + 1); }
+
+    uint32_t getBin_FEDVMESpigot(HcalElectronicsId const &eid) { return (uint32_t)(getValue_FEDVMESpigot(eid) + 1); }
+
+    uint32_t getBin_FiberuTCAFiberCh(HcalElectronicsId const &eid) {
+      return (uint32_t)(getValue_FiberuTCAFiberCh(eid) + 1);
+    }
+
+    uint32_t getBin_FiberVMEFiberCh(HcalElectronicsId const &eid) {
+      return (uint32_t)(getValue_FiberVMEFiberCh(eid) + 1);
+    }
+
+    uint32_t getBin_SLB(HcalElectronicsId const &eid) { return (uint32_t)(getValue_SLB(eid) + 1); }
+
+    uint32_t getBin_SLBCh(HcalElectronicsId const &eid) { return (uint32_t)(getValue_SLBCh(eid) + 1); }
+
+    uint32_t getBin_SLBSLBCh(HcalElectronicsId const &eid) { return (uint32_t)(getValue_SLBSLBCh(eid) + 1); }
+
+    uint32_t getBin_FiberuTCATP(HcalElectronicsId const &eid) { return (uint32_t)(getValue_FiberuTCATP(eid) + 1); }
+
+    uint32_t getBin_FiberChuTCATP(HcalElectronicsId const &eid) { return (uint32_t)(getValue_FiberChuTCATP(eid) + 1); }
+
+    uint32_t getBin_FiberuTCATPFiberChuTCATP(HcalElectronicsId const &eid) {
+      return (uint32_t)(getValue_FiberuTCATPFiberChuTCATP(eid) + 1);
+    }
+
+    HcalElectronicsId getEid_FED(int v) {
+      return v < FED_VME_NUM ? HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, SPIGOT_MIN, v)
+                             : HcalElectronicsId(utilities::fed2crate(v - FED_VME_NUM + 1100).first,
+                                                 utilities::fed2crate(v - FED_VME_NUM + 1100).second,
+                                                 FIBER_uTCA_MIN1,
+                                                 FIBERCH_MIN,
+                                                 false);
+    }
+
+    HcalElectronicsId getEid_FEDVME(int v) { return HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, SPIGOT_MIN, v); }
+
+    HcalElectronicsId getEid_FEDuTCA(int v) {
+      return HcalElectronicsId(utilities::fed2crate(v + 1100).first,
+                               utilities::fed2crate(v - FED_VME_NUM + 1100).second,
+                               FIBER_uTCA_MIN1,
+                               FIBERCH_MIN,
+                               false);
+    }
+
+    HcalElectronicsId getEid_Crate(int v) {
+      return v < CRATE_VME_NUM
+                 ? HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, SPIGOT_MIN, v)
+                 : HcalElectronicsId(
+                       v - CRATE_VME_NUM + CRATE_uTCA_MIN, SLOT_uTCA_MIN, FIBER_uTCA_MIN1, FIBERCH_MIN, false);
+    }
+
+    HcalElectronicsId getEid_CrateVME(int v) { return HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, SPIGOT_MIN, v); }
+
+    HcalElectronicsId getEid_CrateuTCA(int v) {
+      return HcalElectronicsId(v + CRATE_uTCA_MIN, SLOT_uTCA_MIN, FIBER_uTCA_MIN1, FIBERCH_MIN, false);
+    }
+
+    HcalElectronicsId getEid_SlotuTCA(int v) {
+      return HcalElectronicsId(CRATE_uTCA_MIN, v + SLOT_uTCA_MIN, FIBER_uTCA_MIN1, FIBERCH_MIN, false);
+    }
+
+    //	nothing for now...
+    HcalElectronicsId getEid_SlotVME(int v) {
+      return HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, SPIGOT_MIN, CRATE_VME_MIN);
+    }
+
+    HcalElectronicsId getEid_Spigot(int v) { return HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, v, CRATE_VME_MIN); }
+
+    HcalElectronicsId getEid_FiberuTCA(int v) {
+      return HcalElectronicsId(CRATE_uTCA_MIN,
+                               SLOT_uTCA_MIN,
+                               v < (FIBER_uTCA_MAX1 - FIBER_uTCA_MIN1 + 1)
+                                   ? v + FIBER_uTCA_MIN1
+                                   : v - (FIBER_uTCA_MAX1 - FIBER_uTCA_MIN1 + 1) + FIBER_uTCA_MIN2,
+                               FIBERCH_MIN,
+                               false);
+    }
+
+    HcalElectronicsId getEid_FiberVME(int v) {
+      return HcalElectronicsId(FIBERCH_MIN, v + 1, SPIGOT_MIN, CRATE_VME_MIN);
+    }
+
+    HcalElectronicsId getEid_FiberCh(int v) {
+      return HcalElectronicsId(CRATE_uTCA_MIN, SLOT_uTCA_MIN, FIBER_uTCA_MIN1, v, false);
+    }
+
+    HcalElectronicsId getEid_FEDuTCASlot(int v) {
+      HcalElectronicsId fedeid = getEid_FEDuTCA(v / SLOT_uTCA_NUM);
+      HcalElectronicsId sloteid = getEid_SlotuTCA(v % SLOT_uTCA_NUM);
+      return HcalElectronicsId(fedeid.crateId(), sloteid.slot(), FIBER_uTCA_MIN1, FIBERCH_MIN, false);
+    }
+
+    HcalElectronicsId getEid_FEDVMESpigot(int v) {
+      HcalElectronicsId fedeid = getEid_FEDVME(v / SPIGOT_NUM);
+      HcalElectronicsId spid = getEid_Spigot(v % SPIGOT_NUM);
+      return HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, spid.spigot(), fedeid.dccid());
+    }
+
+    HcalElectronicsId getEid_FiberuTCAFiberCh(int v) {
+      HcalElectronicsId fibereid = getEid_FiberuTCA(v / FIBERCH_NUM);
+      HcalElectronicsId fcheid = getEid_FiberCh(v % FIBERCH_NUM);
+      return HcalElectronicsId(CRATE_uTCA_MIN, SLOT_uTCA_MIN, fibereid.fiberIndex(), fcheid.fiberChanId(), false);
+    }
+
+    HcalElectronicsId getEid_FiberVMEFiberCh(int v) {
+      HcalElectronicsId fibereid = getEid_FiberVME(v / FIBERCH_NUM);
+      HcalElectronicsId fcheid = getEid_FiberCh(v % FIBERCH_NUM);
+      return HcalElectronicsId(fcheid.fiberChanId(), fibereid.fiberIndex(), SPIGOT_MIN, CRATE_VME_MIN);
+    }
+
+    HcalElectronicsId getEid_SLB(int v) {
+      return HcalElectronicsId(SLBCH_MIN, v + SLB_MIN, SPIGOT_MIN, CRATE_VME_MIN, CRATE_VME_MIN, SLOT_VME_MIN1, 0);
+    }
+
+    HcalElectronicsId getEid_SLBCh(int v) {
+      return HcalElectronicsId(v + SLBCH_MIN, SLB_MIN, SPIGOT_MIN, CRATE_VME_MIN, CRATE_VME_MIN, SLOT_VME_MIN1, 0);
+    }
+
+    HcalElectronicsId getEid_SLBSLBCh(int v) {
+      HcalElectronicsId slbeid = getEid_SLB(v / SLBCH_NUM);
+      HcalElectronicsId slbcheid = getEid_SLBCh(v % SLBCH_NUM);
+      return HcalElectronicsId(slbcheid.slbChannelIndex(),
+                               slbeid.slbSiteNumber(),
+                               SPIGOT_MIN,
+                               CRATE_VME_MIN,
+                               CRATE_VME_MIN,
+                               SLOT_VME_MIN1,
+                               0);
+    }
+
+    HcalElectronicsId getEid_FiberuTCATP(int v) {
+      return HcalElectronicsId(CRATE_uTCA_MIN, SLOT_uTCA_MIN, v + TPFIBER_MIN, TPFIBERCH_MIN, true);
+    }
+
+    HcalElectronicsId getEid_FiberChuTCATP(int v) {
+      return HcalElectronicsId(CRATE_uTCA_MIN, SLOT_uTCA_MIN, TPFIBER_MIN, v + TPFIBERCH_MIN, true);
+    }
+
+    HcalElectronicsId getEid_FiberuTCATPFiberChuTCATP(int v) {
+      HcalElectronicsId fibeid = getEid_FiberuTCATP(v / TPFIBERCH_NUM);
+      HcalElectronicsId fibcheid = getEid_FiberChuTCATP(v % TPFIBERCH_NUM);
+      return HcalElectronicsId(CRATE_uTCA_MIN, SLOT_uTCA_MIN, fibeid.fiberIndex(), fibcheid.fiberChanId(), true);
+    }
+
+    std::vector<std::string> getLabels_FED() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (int i = 0; i < FED_TOTAL_NUM; i++) {
+        HcalElectronicsId eid = getEid_FED(i);
+        sprintf(name, "%d", eid.isVMEid() ? eid.dccid() + 700 : utilities::crate2fed(eid.crateId(), eid.slot()));
+        labels.push_back(std::string(name));
+      }
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_FEDuTCA() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (int i = 0; i < FED_uTCA_NUM; i++) {
+        HcalElectronicsId eid = getEid_FEDuTCA(i);
+        sprintf(name, "%d", utilities::crate2fed(eid.crateId(), eid.slot()));
+        labels.push_back(std::string(name));
+      }
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_FEDVME() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (int i = 0; i < FED_VME_NUM; i++) {
+        sprintf(name, "%d", getEid_FEDVME(i).dccid() + 700);
+        labels.push_back(std::string(name));
+      }
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_Crate() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (auto &it_crate : hcaldqm::constants::crateList) {
+        HcalElectronicsId eid = getEid_Crate(it_crate);
+        sprintf(name, "%d%c", it_crate, eid.isVMEid() ? 'v' : 'u');
+        labels.push_back(std::string(name));
+      }
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_CrateVME() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (auto &it_crate : hcaldqm::constants::crateListVME) {
+        sprintf(name, "%dv", it_crate);
+        labels.push_back(std::string(name));
+      }
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_CrateuTCA() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (auto &it_crate : hcaldqm::constants::crateListuTCA) {
+        sprintf(name, "%du", it_crate);
+        labels.push_back(std::string(name));
+      }
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_SlotuTCA() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (int i = 0; i < SLOT_uTCA_NUM; i++) {
+        HcalElectronicsId eid = getEid_SlotuTCA(i);
+        sprintf(name, "%d", eid.slot());
+        labels.push_back(std::string(name));
+      }
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_SlotVME() { return std::vector<std::string>(); }
+
+    std::vector<std::string> getLabels_Spigot() {
+      return std::vector<std::string>();
+      /*			std::vector<std::string> labels;
+                          char name[10];
+                          for (int i=0; i<SPIGOT_NUM; i++)
+                          {
+                                  HcalElectronicsId eid = getEid_Spigot(i);
+                                  sprintf(name, "%d",
+                                          eid.spigot());
+                                  labels.push_back(std::string(name));
+                          }
+                          return labels;
+          */
+    }
+
+    std::vector<std::string> getLabels_FiberuTCA() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (int i = 0; i < FIBER_uTCA_NUM; i++) {
+        HcalElectronicsId eid = getEid_FiberuTCA(i);
+        sprintf(name, "%d", eid.fiberIndex());
+        labels.push_back(std::string(name));
+      }
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_FiberVME() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (int i = 0; i < FIBER_VME_NUM; i++) {
+        HcalElectronicsId eid = getEid_FiberVME(i);
+        sprintf(name, "%d", eid.fiberIndex());
+        labels.push_back(std::string(name));
+      }
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_FiberCh() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (int i = 0; i < FIBERCH_NUM; i++) {
+        HcalElectronicsId eid = getEid_FiberCh(i);
+        sprintf(name, "%d", eid.fiberChanId());
+        labels.push_back(std::string(name));
+      }
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_FEDuTCASlot() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (int i = 0; i < FED_uTCA_NUM; i++)
+        for (int j = 0; j < SLOT_uTCA_NUM; j++) {
+          if (j > 0) {
+            labels.push_back(std::string(""));
+            continue;
+          }
+          HcalElectronicsId eid = getEid_FEDuTCASlot(i * SLOT_uTCA_NUM + j);
+          sprintf(name, "%d-%d", utilities::crate2fed(eid.crateId(), eid.slot()), eid.slot());
+          labels.push_back(std::string(name));
+        }
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_FEDVMESpigot() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (int i = 0; i < FED_VME_NUM; i++)
+        for (int j = 0; j < SPIGOT_NUM; j++) {
+          if (j > 0) {
+            labels.push_back(std::string(""));
+            continue;
+          }
+
+          HcalElectronicsId eid = getEid_FEDVMESpigot(i * SPIGOT_NUM + j);
+          sprintf(name, "%d-%d", eid.dccid() + FED_VME_MIN, eid.spigot());
+          labels.push_back(std::string(name));
+        }
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_FiberuTCAFiberCh() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (int i = 0; i < FIBER_uTCA_NUM; i++)
+        for (int j = 0; j < FIBERCH_NUM; j++) {
+          if (j > 0) {
+            labels.push_back(std::string(""));
+            continue;
+          }
+
+          HcalElectronicsId eid = getEid_FiberuTCAFiberCh(i * FIBERCH_NUM + j);
+          sprintf(name, "%d-%d", eid.fiberIndex(), eid.fiberChanId());
+          labels.push_back(std::string(name));
+        }
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_FiberVMEFiberCh() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (int i = 0; i < FIBER_VME_NUM; i++)
+        for (int j = 0; j < FIBERCH_NUM; j++) {
+          if (j > 0) {
+            labels.push_back(std::string(""));
+            continue;
+          }
+          HcalElectronicsId eid = getEid_FiberVMEFiberCh(i * FIBERCH_NUM + j);
+          sprintf(name, "%d-%d", eid.fiberIndex(), eid.fiberChanId());
+          labels.push_back(std::string(name));
+        }
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_SLB() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (int i = 0; i < SLB_NUM; i++) {
+        HcalElectronicsId eid = getEid_SLB(i);
+        sprintf(name, "%d", eid.slbSiteNumber());
+        labels.push_back(std::string(name));
+      }
+
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_SLBCh() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (int i = 0; i < SLBCH_NUM; i++) {
+        HcalElectronicsId eid = getEid_SLBCh(i);
+        sprintf(name, "%d", eid.slbChannelIndex());
+        labels.push_back(std::string(name));
+      }
+
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_SLBSLBCh() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (int i = 0; i < SLB_NUM; i++)
+        for (int j = 0; j < SLBCH_NUM; j++) {
+          HcalElectronicsId eid = getEid_SLBSLBCh(i * SLBCH_NUM + j);
+          sprintf(name, "%d-%d", eid.slbSiteNumber(), eid.slbChannelIndex());
+          labels.push_back(std::string(name));
+        }
+
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_FiberuTCATP() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (int i = 0; i < TPFIBER_NUM; i++) {
+        HcalElectronicsId eid = getEid_FiberuTCATP(i);
+        sprintf(name, "%d", eid.fiberIndex());
+        labels.push_back(std::string(name));
+      }
+
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_FiberChuTCATP() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (int i = 0; i < TPFIBERCH_NUM; i++) {
+        HcalElectronicsId eid = getEid_FiberChuTCATP(i);
+        sprintf(name, "%d", eid.fiberChanId());
+        labels.push_back(std::string(name));
+      }
+
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_FiberuTCATPFiberChuTCATP() {
+      std::vector<std::string> labels;
+      char name[10];
+      for (int i = 0; i < TPFIBER_NUM; i++)
+        for (int j = 0; j < TPFIBERCH_NUM; j++) {
+          HcalElectronicsId eid = getEid_FiberuTCATPFiberChuTCATP(i * TPFIBERCH_NUM + j);
+          sprintf(name, "%d-%d", eid.fiberIndex(), eid.fiberChanId());
+          labels.push_back(std::string(name));
+        }
+
+      return labels;
+    }
+
+    void FEDQuantity::setup(std::vector<int> const &vFEDs) {
+      for (uint32_t i = 0; i < vFEDs.size(); i++)
+        _feds.insert(std::make_pair(vFEDs[i], i));
+    }
+
+    int FEDQuantity::getValue(HcalElectronicsId const &eid) {
+      int fed = eid.isVMEid() ? eid.dccid() + FED_VME_MIN : utilities::crate2fed(eid.crateId(), eid.slot());
+      return _feds[fed];
+    }
+
+    uint32_t FEDQuantity::getBin(HcalElectronicsId const &eid) { return getValue(eid) + 1; }
+
+    std::vector<std::string> FEDQuantity::getLabels() {
+      std::vector<std::string> labels(_feds.size());
+      char name[5];
+      for (auto const &v : _feds) {
+        sprintf(name, "%d", v.first);
+        labels[v.second] = std::string(name);
+      }
+
+      return labels;
+    }
+
+    void CrateQuantity::setup(HcalElectronicsMap const *emap) {
+      _crates = utilities::getCrateList(emap);
+      _crateHashes = utilities::getCrateHashMap(emap);
+    }
+
+    void CrateQuantity::setup(std::vector<int> crates, std::map<int, uint32_t> crateHashes) {
+      for (auto &it_crate : crates) {
+        _crates.push_back(it_crate);
+        _crateHashes[it_crate] = crateHashes[it_crate];
+      }
+    }
+
+    int CrateQuantity::getValue(HcalElectronicsId const &eid) { return eid.crateId(); }
+
+    uint32_t CrateQuantity::getBin(HcalElectronicsId const &eid) {
+      int crate = eid.crateId();
+      auto it = std::find(_crates.begin(), _crates.end(), crate);
+      if (it == _crates.end()) {
+        return 0;
+      } else {
+        return std::distance(_crates.begin(), it) + 1;
+      }
+    }
+
+    std::vector<std::string> CrateQuantity::getLabels() {
+      std::vector<std::string> labels;
+      char name[5];
+      for (auto &it_crate : _crates) {
+        HcalElectronicsId eid(_crateHashes[it_crate]);
+        if (eid.isVMEid()) {
+          sprintf(name, "%dv", it_crate);
+        } else {
+          sprintf(name, "%du", it_crate);
+        }
+        labels.push_back(name);
+      }
+      return labels;
+    }
+
+  }  // namespace quantity
+}  // namespace hcaldqm
diff --git a/DQM/HcalCommon/src/HashFilter.cc b/DQM/HcalCommon/src/HashFilter.cc
index f157bed9bc342..082db18148a6b 100644
--- a/DQM/HcalCommon/src/HashFilter.cc
+++ b/DQM/HcalCommon/src/HashFilter.cc
@@ -1,73 +1,42 @@
 #include "DQM/HcalCommon/interface/HashFilter.h"
 
-namespace hcaldqm
-{
-	using namespace mapper;
-	using namespace hashfunctions;
-	namespace filter
-	{
-		HashFilter::HashFilter(FilterType ftype, HashType htype) : 
-			HashMapper(htype), _ftype(ftype)
-		{}
-
-		HashFilter::HashFilter(FilterType ftype, HashType htype,
-			std::vector<uint32_t> const& v) :
-			HashMapper(htype), _ftype(ftype)
-		{
-			for (std::vector<uint32_t>::const_iterator it=v.begin();
-				it!=v.end(); ++it)
-				_ids.insert(*it);		
-		}
-
-		HashFilter::HashFilter(HashFilter const& hf) :
-			HashMapper(hf._htype), _ftype(hf._ftype)
-		{
-			_ids = hf._ids;
-		}
-
-		/* virtual */ void HashFilter::initialize(FilterType ftype,
-			HashType htype, std::vector<uint32_t> const& v)
-		{
-			HashMapper::initialize(htype);
-			_ftype = ftype;
-			for (std::vector<uint32_t>::const_iterator it=v.begin();
-				it!=v.end(); ++it)
-				_ids.insert(*it);		
-		}
-
-		/* virtual */ bool HashFilter::filter(HcalDetId const& did) const
-		{
-			return _ftype==fFilter?
-				skip(getHash(did)):preserve(getHash(did));
-		}
-
-		/* virtual */ bool HashFilter::filter(HcalElectronicsId const& eid) 
-			const
-		{
-			return _ftype==fFilter?
-				skip(getHash(eid)):preserve(getHash(eid));
-		}
-
-		/* virtual */ bool HashFilter::filter(HcalTrigTowerDetId const& tid)
-			const
-		{
-			return _ftype==fFilter?
-				skip(getHash(tid)):preserve(getHash(tid));
-		}
-
-		/* virtual */ bool HashFilter::skip(uint32_t id) const
-		{
-			return _ids.find(id)==_ids.end()?false:true;
-		}
-
-		/* virtual */ bool HashFilter::preserve(uint32_t id) const
-		{
-			return _ids.find(id)==_ids.end()?true:false;
-		}
-
-		/* virtual */ void HashFilter::print()
-		{
-
-		}
-	}
-}
+namespace hcaldqm {
+  using namespace mapper;
+  using namespace hashfunctions;
+  namespace filter {
+    HashFilter::HashFilter(FilterType ftype, HashType htype) : HashMapper(htype), _ftype(ftype) {}
+
+    HashFilter::HashFilter(FilterType ftype, HashType htype, std::vector<uint32_t> const &v)
+        : HashMapper(htype), _ftype(ftype) {
+      for (std::vector<uint32_t>::const_iterator it = v.begin(); it != v.end(); ++it)
+        _ids.insert(*it);
+    }
+
+    HashFilter::HashFilter(HashFilter const &hf) : HashMapper(hf._htype), _ftype(hf._ftype) { _ids = hf._ids; }
+
+    /* virtual */ void HashFilter::initialize(FilterType ftype, HashType htype, std::vector<uint32_t> const &v) {
+      HashMapper::initialize(htype);
+      _ftype = ftype;
+      for (std::vector<uint32_t>::const_iterator it = v.begin(); it != v.end(); ++it)
+        _ids.insert(*it);
+    }
+
+    /* virtual */ bool HashFilter::filter(HcalDetId const &did) const {
+      return _ftype == fFilter ? skip(getHash(did)) : preserve(getHash(did));
+    }
+
+    /* virtual */ bool HashFilter::filter(HcalElectronicsId const &eid) const {
+      return _ftype == fFilter ? skip(getHash(eid)) : preserve(getHash(eid));
+    }
+
+    /* virtual */ bool HashFilter::filter(HcalTrigTowerDetId const &tid) const {
+      return _ftype == fFilter ? skip(getHash(tid)) : preserve(getHash(tid));
+    }
+
+    /* virtual */ bool HashFilter::skip(uint32_t id) const { return _ids.find(id) == _ids.end() ? false : true; }
+
+    /* virtual */ bool HashFilter::preserve(uint32_t id) const { return _ids.find(id) == _ids.end() ? true : false; }
+
+    /* virtual */ void HashFilter::print() {}
+  }  // namespace filter
+}  // namespace hcaldqm
diff --git a/DQM/HcalCommon/src/HashFunctions.cc b/DQM/HcalCommon/src/HashFunctions.cc
index 5f76289a95504..25026978e84a7 100644
--- a/DQM/HcalCommon/src/HashFunctions.cc
+++ b/DQM/HcalCommon/src/HashFunctions.cc
@@ -1,744 +1,559 @@
 #include "DQM/HcalCommon/interface/HashFunctions.h"
 #include "DQM/HcalCommon/interface/Utilities.h"
 
-namespace hcaldqm
-{
-	using namespace constants;
-	namespace hashfunctions
-	{
-		/**
-		 *	HcalDetId
-		 */
-		uint32_t hash_Subdet(HcalDetId const& did)
-		{
-			return utilities::hash(HcalDetId(did.subdet(), 1, 1, 1));
-		}
-
-		uint32_t hash_Subdetiphi(HcalDetId const& did)
-		{
-			return utilities::hash(HcalDetId(did.subdet(), 1, did.iphi(), 1));
-		}
-
-		uint32_t hash_Subdetieta(HcalDetId const& did)
-		{
-			return utilities::hash(HcalDetId(did.subdet(), did.ieta(),
-				1, 1));
-		}
-
-		uint32_t hash_Subdetdepth(HcalDetId const& did)
-		{
-			return utilities::hash(HcalDetId(did.subdet(), 1,
-				1, did.depth()));
-		}
-
-		uint32_t hash_SubdetPM(HcalDetId const& did)
-		{
-			return utilities::hash(HcalDetId(did.subdet(),
-				did.ieta()>0 ? 1 : -1, 1, 1));
-		}
-
-		uint32_t hash_SubdetPMiphi(HcalDetId const& did)
-		{
-			return utilities::hash(HcalDetId(did.subdet(),
-				did.ieta()>0 ? 1 : -1, did.iphi(), 1));
-		}
-
-		uint32_t hash_iphi(HcalDetId const& did)
-		{
-			return utilities::hash(HcalDetId(HcalBarrel,
-				1, did.iphi(), 1));
-		}
-
-		uint32_t hash_ieta(HcalDetId const& did)
-		{
-			return utilities::hash(HcalDetId(HcalBarrel,
-				did.ieta(), 1, 1));
-		}
-
-		uint32_t hash_depth(HcalDetId const& did)
-		{
-			return utilities::hash(HcalDetId(HcalBarrel,
-				1, 1, did.depth()));
-		}
-
-		uint32_t hash_HFPMiphi(HcalDetId const& did)
-		{
-			return utilities::hash(HcalDetId(HcalForward,
-				did.ieta()>0 ? 1 : -1, did.iphi(), 1));
-		}
-
-		uint32_t hash_HBHEPartition(HcalDetId const &did)
-		{
-			int iphi = did.iphi();
-			uint32_t hash = 0;
-			if (iphi>=3 && iphi<=26)
-				hash = utilities::hash(HcalDetId(HcalBarrel,
-					1, 3, 1));
-			else if (iphi>=27 && iphi<=50)
-				hash = utilities::hash(HcalDetId(HcalBarrel,
-					1, 27, 1));
-			else
-				hash = utilities::hash(HcalDetId(HcalBarrel,
-					1, 1, 1));
-
-			return hash;
-		}
-
-		uint32_t hash_DChannel(HcalDetId const& did)
-		{
-			return utilities::hash(did);
-		}
-
-		std::string name_Subdet(HcalDetId const& did)
-		{
-			return constants::SUBDET_NAME[did.subdet()-1];
-		}
-
-		uint32_t hash_Subdet(std::string const& name)
-		{
-			for (int i=0; i<constants::SUBDET_NUM; i++)
-				if (constants::SUBDET_NAME[i]==name)
-					return(HcalDetId((HcalSubdetector)(i+1),
-						1,1,1).rawId());
-
-			return HcalDetId().rawId();
-		}
-
-		std::string name_SubdetPM(HcalDetId const& did)
-		{
-			char name[10];
-			sprintf(name, "%s%s",constants::SUBDET_NAME[did.subdet()-1].c_str(),
-				did.ieta()>0 ? "P" : "M");
-			return std::string(name);
-		}
-
-		uint32_t hash_SubdetPM(std::string const& name)
-		{
-			for (int i=0; i<constants::SUBDET_NUM*2; i++)
-				if (constants::SUBDETPM_NAME[i]==name)
-					return HcalDetId((HcalSubdetector)(i/2+1),
-						i%2==0?-1:1,1,1).rawId();
-		
-			return HcalDetId().rawId();
-		}
-
-		std::string name_Subdetiphi(HcalDetId const& did)
-		{
-			char name[10];
-			sprintf(name, "%siphi%d", 
-				constants::SUBDET_NAME[did.subdet()-1].c_str(),
-				did.iphi());
-			return std::string(name);
-		}
-
-		uint32_t hash_Subdetiphi(std::string const& name)
-		{
-			std::string sub = name.substr(0,2);
-			int iphi = std::stoi(name.substr(6,name.length()-6), nullptr);
-			for (int i=0; i<constants::SUBDET_NUM; i++)
-				if (constants::SUBDET_NAME[i]==sub)
-					return HcalDetId((HcalSubdetector)(i+1),
-						1, iphi,1).rawId();
-
-			//	default
-			return HcalDetId().rawId();
-		}
-
-		std::string name_Subdetieta(HcalDetId const& did)
-		{
-			char name[20];
-			sprintf(name, "%sieta%d", 
-				constants::SUBDET_NAME[did.subdet()-1].c_str(),
-				did.ieta());
-			return std::string(name);
-		}
-
-		uint32_t hash_Subdetieta(std::string const& name)
-		{
-			std::string sub = name.substr(0,2);
-			int ieta = std::stoi(name.substr(6,name.length()-6), nullptr);
-			for (int i=0; i<constants::SUBDET_NUM; i++)
-				if (constants::SUBDET_NAME[i]==sub)
-					return HcalDetId((HcalSubdetector)(i+1),
-						ieta, 1,1).rawId();
-
-			//	default
-			return HcalDetId().rawId();
-		}
-
-		std::string name_Subdetdepth(HcalDetId const& did)
-		{
-			char name[20];
-			sprintf(name, "%sdepth%d", 
-				constants::SUBDET_NAME[did.subdet()-1].c_str(),
-				did.depth());
-			return std::string(name);
-		}
-
-		uint32_t hash_Subdetdepth(std::string const& name)
-		{
-			std::string sub = name.substr(0,2);
-			int depth = std::stoi(name.substr(7, name.length()-7), nullptr);
-			for (int i=0; i<constants::SUBDET_NUM; i++)
-				if (constants::SUBDET_NAME[i]==sub)
-					return HcalDetId((HcalSubdetector)(i+1),
-						1,1,depth).rawId();
-
-			return HcalDetId().rawId();
-		}
-
-		std::string name_SubdetPMiphi(HcalDetId const& did)
-		{
-			char name[20];
-			sprintf(name, "%s%siphi%d", 
-				constants::SUBDET_NAME[did.subdet()-1].c_str(), 
-				did.ieta()>0 ? "P" : "M", did.iphi());
-			return std::string(name);
-		}
-
-		uint32_t hash_SubdetPMiphi(std::string const& name)
-		{
-			std::string sub = name.substr(0,3);
-			int iphi = std::stoi(name.substr(7, name.length()-7),nullptr);
-			for (int i=0; i<constants::SUBDET_NUM*2; i++)
-				if (constants::SUBDETPM_NAME[i]==sub)
-					return HcalDetId((HcalSubdetector)(i/2+1),
-						i%2==0?-1:1,iphi,1).rawId();
-
-			return HcalDetId().rawId();
-		}
-
-		std::string name_iphi(HcalDetId const& did)
-		{
-			char name[10];
-			sprintf(name, "iphi%d", did.iphi());
-			return std::string(name);
-		}
-
-		uint32_t hash_iphi(std::string const& name)
-		{
-			int iphi = std::stoi(name.substr(4,name.length()-4),nullptr);
-			return HcalDetId(HcalBarrel,1,iphi,1).rawId();
-		}
-
-		std::string name_ieta(HcalDetId const& did)
-		{
-			char name[10];
-			sprintf(name, "ieta%d", did.ieta());
-			return std::string(name);
-		}
-		
-		uint32_t hash_ieta(std::string const& name)
-		{
-			int ieta = std::stoi(name.substr(4,name.length()-4),nullptr);
-			return HcalDetId(HcalBarrel,ieta,1,1).rawId();
-		}
-
-		std::string name_depth(HcalDetId const& did)
-		{
-			char name[10];
-			sprintf(name, "depth%d", did.depth());
-			return std::string(name);
-
-		}
-		
-		uint32_t hash_depth(std::string const& name)
-		{
-			int depth = std::stoi(name.substr(5,name.length()-5),nullptr);
-			return HcalDetId(HcalBarrel,1,1,depth).rawId();
-		}
-
-		std::string name_HFPMiphi(HcalDetId const& did)
-		{
-			char name[12];
-			snprintf(name, sizeof(name), "HF%ciphi%d", did.ieta()>0 ? 'P' : 'M', did.iphi());
-			return std::string(name);
-		}
-
-		uint32_t hash_HFPMiphi(std::string const& name)
-		{
-			int iphi = std::stoi(name.substr(7,name.length()-7),nullptr);
-			int ieta = name[2]=='P'?1:-1;
-			return HcalDetId(HcalForward,ieta,iphi,1).rawId();
-		}
-
-		std::string name_HBHEPartition(HcalDetId const& did)
-		{
-			char c;
-			if (did.iphi()>=3 && did.iphi()<=26)
-				c = 'a';
-			else if (did.iphi()>=27 && did.iphi()<=50)
-				c = 'b';
-			else
-				c = 'c';
-			char name[10];
-			sprintf(name, "HBHE%c", c);
-			return std::string(name);
-		}
-
-		uint32_t hash_HBHEPartition(std::string const& name)
-		{
-			if (name[4]=='a')
-				return HcalDetId(HcalBarrel,1,5,1).rawId();
-			else if (name[4]=='b')
-				return HcalDetId(HcalBarrel,1,29,1).rawId();
-			else 
-				return HcalDetId(HcalBarrel,1,55,1).rawId();
-
-			return HcalDetId().rawId();
-		}
-
-		std::string name_DChannel(HcalDetId const& did)
-		{
-			char name[40];
-			sprintf(name, "%s-%d-%d-%d",
-				constants::SUBDET_NAME[did.subdet()-1].c_str(), 
-				did.ieta(), did.iphi(), did.depth());
-			return std::string(name);
-		}
-
-		//	TODO: Make it work here
-		//	Not neccessary right now!
-		uint32_t hash_DChannel(std::string const& name)
-		{
-			return HcalDetId(HcalBarrel,1,1,1).rawId();
-		}
-
-		/**
-		 *	by ElectronicsId
-		 */
-		uint32_t hash_FED(HcalElectronicsId const& eid)
-		{
-            if (eid.isVMEid())
-				return utilities::hash(HcalElectronicsId(
-					FIBERCH_MIN, FIBER_VME_MIN, SPIGOT_MIN, eid.dccid()));
-            else
-            {
-                //  tmp - we need to hash HF's FEDs with slot in mind
-                //bool isHF = eid.crateId()==22 || eid.crateId()==29 || eid.crateId()==32;
-                //  for HF, slot number is either
-            	int slotToUse = eid.slot()>6 ? SLOT_uTCA_MIN+6 :  SLOT_uTCA_MIN;
-                return utilities::hash(HcalElectronicsId(eid.crateId(),
-					slotToUse, FIBER_uTCA_MIN1, FIBERCH_MIN, false));
-            }
-		}
-
-		uint32_t hash_FEDSpigot(HcalElectronicsId const& eid)
-		{
-			//	note that hashing of uTCA is done by FED-Slot...
-			return eid.isVMEid() ?
-				utilities::hash(HcalElectronicsId(
-					FIBERCH_MIN, FIBER_VME_MIN, eid.spigot(), eid.dccid())) : 
-				utilities::hash(HcalElectronicsId(eid.crateId(),
-					eid.slot(), FIBER_uTCA_MIN1, FIBERCH_MIN, false));
-		}
-
-		uint32_t hash_FEDSlot(HcalElectronicsId const& eid)
-		{
-			//	note that hashing of VME is done with 
-			return eid.isVMEid() ? 
-				utilities::hash(HcalElectronicsId(FIBERCH_MIN,
-					FIBER_VME_MIN, eid.spigot(), eid.dccid())) :
-				utilities::hash(HcalElectronicsId(eid.crateId(),
-					eid.slot(), FIBER_uTCA_MIN1, FIBERCH_MIN, false));
-		}
-
-		uint32_t hash_Crate(HcalElectronicsId const& eid)
-		{
-			//	note hashing of VME is done with dccId
-			//	note 2: there are two dccids per crate, <even> and <even+1>. We don't care about this, so use the even one.
-			return eid.isVMEid() ? 
-				utilities::hash(HcalElectronicsId(FIBERCH_MIN,
-					FIBER_VME_MIN, SPIGOT_MIN, (eid.dccid() % 2 == 0 ? eid.dccid() : eid.dccid() - 1))) :
-				utilities::hash(HcalElectronicsId(eid.crateId(),
-					SLOT_uTCA_MIN, FIBER_uTCA_MIN1, FIBERCH_MIN, false));
-		}
-
-		uint32_t hash_CrateSpigot(HcalElectronicsId const& eid)
-		{
-			//	note hashing of VME is done with dccid and
-			//	uTCA with Slots
-			return eid.isVMEid() ?
-				utilities::hash(HcalElectronicsId(FIBERCH_MIN,
-					FIBER_VME_MIN, eid.spigot(), (eid.dccid() % 2 == 0 ? eid.dccid() : eid.dccid() - 1))) :
-				utilities::hash(HcalElectronicsId(eid.crateId(),
-					eid.slot(), FIBER_uTCA_MIN1, FIBERCH_MIN, false));
-		}
-
-		uint32_t hash_CrateSlot(HcalElectronicsId const& eid)
-		{
-			return eid.isVMEid() ? 
-				utilities::hash(HcalElectronicsId(FIBERCH_MIN,
-					FIBER_VME_MIN, eid.spigot(), (eid.dccid() % 2 == 0 ? eid.dccid() : eid.dccid() - 1))) :
-				utilities::hash(HcalElectronicsId(eid.crateId(),
-					eid.slot(), FIBER_uTCA_MIN1, FIBERCH_MIN, false));
-		}
-
-		uint32_t hash_Fiber(HcalElectronicsId const&)
-		{
-			return 0;
-		}
-
-		uint32_t hash_FiberFiberCh(HcalElectronicsId const&)
-		{
-			return 0;
-		}
-
-		uint32_t hash_FiberCh(HcalElectronicsId const& eid)
-		{
-			return 0;
-		}
-
-		uint32_t hash_Electronics(HcalElectronicsId const& eid)
-		{
-			return eid.isVMEid()?
-				utilities::hash(HcalElectronicsId(FIBERCH_MIN,
-					FIBER_VME_MIN, SPIGOT_MIN, CRATE_VME_MIN)):
-				utilities::hash(HcalElectronicsId(CRATE_uTCA_MIN,
-					SLOT_uTCA_MIN, FIBER_uTCA_MIN1, FIBERCH_MIN, false));
-/*			NOTE: as an update - should separate Trigger Eid and Det Eid
- *			return eid.isVMEid() ?
-				eid.isTriggerChainId()?
-					utilities::hash(HcalElectronicsId(SLBCH_MIN,
-						SLB_MIN, SPIGOT_MIN, CRATE_VME_MIN, 
-						CRATE_VME_MIN, SLOT_VME_MIN1, 0)):
-					utilities::hash(HcalElectronicsId(FIBERCH_MIN,
-						FIBER_VME_MIN, SPIGOT_MIN, CRATE_VME_MIN))
-				:
-				eid.isTriggerChainId()?
-				utilities::hash(HcalElectronicsId(CRATE_uTCA_MIN,
-					SLOT_uTCA_MIN, TPFIBER_MIN, TPFIBERCH_MIN, true)):
-				utilities::hash(HcalElectronicsId(CRATE_uTCA_MIN,
-					SLOT_uTCA_MIN, FIBER_uTCA_MIN1, FIBERCH_MIN, false));
-					*/
-		}
-
-		uint32_t hash_EChannel(HcalElectronicsId const& eid)
-		{
-			return eid.isVMEid() ?
-				utilities::hash(HcalElectronicsId(eid.fiberChanId(),
-					eid.fiberIndex(), eid.spigot(), eid.dccid())):
-				utilities::hash(HcalElectronicsId(eid.crateId(),
-					eid.slot(), eid.fiberIndex(), eid.fiberChanId(), false));
-		}
-
-		std::string name_FED(HcalElectronicsId const& eid)
-		{
-			char name[10];
-			sprintf(name, "FED%d", eid.isVMEid() ? eid.dccid()+700 :
-				utilities::crate2fed(eid.crateId(),eid.slot()));
-			return std::string(name);
-		}
-
-		uint32_t hash_FED(std::string const& name)
-		{
-			int fed = std::stoi(name.substr(3,name.length()-3),nullptr);
-			if (fed>=constants::FED_uTCA_MIN)
-            {
-                std::pair<uint16_t, uint16_t> cspair = utilities::fed2crate(fed);
-				return HcalElectronicsId(cspair.first,
-					cspair.second, FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId();
-            }
-			else
-				return HcalElectronicsId(FIBERCH_MIN,
-					FIBER_VME_MIN, SPIGOT_MIN, fed-FED_VME_MIN).rawId();
-			
-			return HcalElectronicsId().rawId();
-		}
-
-		std::string name_FEDSpigot(HcalElectronicsId const& eid)
-		{
-			char name[20];
-			sprintf(name, "FED%dS%d",
-				eid.isVMEid()?eid.dccid()+700:
-				utilities::crate2fed(eid.crateId(),eid.slot()),
-				eid.isVMEid()?eid.spigot():eid.slot());
-			return std::string(name);
-		}
-
-		uint32_t hash_FEDSpigot(std::string const& name)
-		{
-			int pos = name.find("S");
-			int fed = std::stoi(name.substr(3, pos-3), nullptr);
-			int s = std::stoi(name.substr(pos+1, name.length()-pos-1), nullptr);
-			if (fed>=FED_uTCA_MIN)
-            {
-                std::pair<uint16_t, uint16_t> cspair = utilities::fed2crate(fed);
-				return HcalElectronicsId(cspair.first,
-					cspair.second, FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId();
-            }
-			else
-				return HcalElectronicsId(FIBERCH_MIN,
-					FIBER_VME_MIN, s, fed-FED_VME_MIN).rawId();
-
-			return HcalElectronicsId().rawId();
-		}
-
-		std::string name_FEDSlot(HcalElectronicsId const& eid)
-		{
-			char name[20];
-			sprintf(name, "FED%dS%d",
-				eid.isVMEid()?eid.dccid()+700:
-				utilities::crate2fed(eid.crateId(),eid.slot()),
-				eid.isVMEid()?eid.spigot():eid.slot());
-			return std::string(name);
-		}
-		
-		uint32_t hash_FEDSlot(std::string const& name)
-		{
-			int pos = name.find("S");
-			int fed = std::stoi(name.substr(3, pos-3), nullptr);
-			int s = std::stoi(name.substr(pos+1, name.length()-pos-1), nullptr);
-			if (fed>=FED_uTCA_MIN)
-            {
-                std::pair<uint16_t, uint16_t> cspair = utilities::fed2crate(fed);
-				return HcalElectronicsId(cspair.first,
-				    cspair.second, FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId();
-            }
-			else
-				return HcalElectronicsId(FIBERCH_MIN,
-					FIBER_VME_MIN, s, fed-FED_VME_MIN).rawId();
-
-			return HcalElectronicsId().rawId();
-		}
-
-		std::string name_Crate(HcalElectronicsId const& eid)
-		{
-			char name[16];
-			sprintf(name, "Crate%d", eid.crateId());
-
-			// Note: previous, different hashes were returned for the two dccids in a VME crate. These now count as one crate.
-			//if (eid.isVMEid()) {
-			//	sprintf(name, "Crate%d_VME_DCC%d", eid.crateId(), eid.dccid());
-			//} else {
-			//	sprintf(name, "Crate%d", eid.crateId());
-			//}
-			return std::string(name);
-		}
-
-		//	TODO: implement - not used at this point
-		uint32_t hash_Crate(std::string const&)
-		{return HcalElectronicsId().rawId();}
-
-		std::string name_CrateSpigot(HcalElectronicsId const& eid)
-		{
-			char name[20];
-			sprintf(name, "Crate%dS%d",
-				eid.crateId(),
-				eid.isVMEid()?eid.spigot():eid.slot());
-			return std::string(name);
-		}
-
-		//	TODO: implement - not used at this point
-		uint32_t hash_CrateSpigot(std::string const&)
-		{return HcalElectronicsId().rawId();}
-
-		std::string name_CrateSlot(HcalElectronicsId const& eid)
-		{
-			char name[20];
-			sprintf(name, "Crate%dS%d",
-				eid.crateId(),
-				eid.isVMEid()?eid.spigot():eid.slot());
-			return std::string(name);
-		}
-
-		//	TODO: implement - not used at this point
-		uint32_t hash_CrateSlot(std::string const&)
-		{return HcalElectronicsId().rawId();}
-
-		std::string name_Fiber(HcalElectronicsId const&)
-		{
-			return "None";
-		}
-
-		//	TODO: implement - not used at this point
-		uint32_t hash_Fiber(std::string const&)
-		{return HcalElectronicsId().rawId();}
-
-		std::string name_FiberFiberCh(HcalElectronicsId const&)
-		{
-			return "None";
-		}
-
-		//	TODO: implement - not used at this point
-		uint32_t hash_FiberFiberCh(std::string const&)
-		{return HcalElectronicsId().rawId();}
-
-		std::string name_FiberCh(HcalElectronicsId const&)
-		{
-			return "None";
-		}
-
-		//	TODO: implement - not used at this point
-		uint32_t hash_FiberCh(std::string const&)
-		{return HcalElectronicsId().rawId();}
-
-		std::string name_Electronics(HcalElectronicsId const& eid)
-		{
-			return eid.isVMEid()?std::string("VME"):std::string("uTCA");
-		}
-
-		uint32_t hash_Electronics(std::string const& name)
-		{
-			if (name=="VME")
-				return HcalElectronicsId(FIBERCH_MIN,
-					FIBER_VME_MIN, SPIGOT_MIN, CRATE_VME_MIN).rawId();
-			else
-				return HcalElectronicsId(CRATE_uTCA_MIN,
-					SLOT_uTCA_MIN, FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId();
-
-			return HcalElectronicsId().rawId();
-		}
-
-		std::string name_EChannel(HcalElectronicsId const& eid)
-		{
-			char name[20];
-			if (eid.isVMEid())
-				sprintf(name, "%d-%d-%d-%d", eid.dccid(),
-					eid.spigot(), eid.fiberIndex(), eid.fiberChanId());
-			else
-				sprintf(name, "%d-%d-%d-%d", eid.crateId(),
-					eid.slot(), eid.fiberIndex(), eid.fiberChanId());
-			return std::string(name);
-		}
-
-		//	TODO: implement - not used at this point
-		uint32_t hash_EChannel(std::string const&)
-		{return HcalElectronicsId().rawId();}
-
-		/**
-		 *	by TrigTowerDetId
-		 */
-		uint32_t hash_TTSubdet(HcalTrigTowerDetId const& tid)
-		{
-			return utilities::hash(HcalTrigTowerDetId(
-				tid.ietaAbs()>=29?29:1, 1));
-		}
-
-		uint32_t hash_TTSubdetPM(HcalTrigTowerDetId const& tid)
-		{
-			return utilities::hash(HcalTrigTowerDetId(
-				tid.ietaAbs()<29? (tid.ieta()<0 ? -1 : 1) : 
-				(tid.ieta()<0?-29:29),
-				1));
-		}
-
-		uint32_t hash_TTSubdetPMiphi(HcalTrigTowerDetId const& tid)
-		{
-			return utilities::hash(HcalTrigTowerDetId(
-				tid.ietaAbs()<29? (tid.ieta()<0 ? 0 : 1) : (tid.ieta()<0?2:3),
-				tid.iphi()));
-		}
-
-		uint32_t hash_TTSubdetieta(HcalTrigTowerDetId const& tid)
-		{
-			return 0;
-		}
-
-		uint32_t hash_TTdepth(HcalTrigTowerDetId const& tid)
-		{
-			return utilities::hash(HcalTrigTowerDetId(
-				1, 1, tid.depth()));
-		}
-
-		uint32_t hash_TChannel(HcalTrigTowerDetId const& tid)
-		{
-			return utilities::hash(HcalTrigTowerDetId(
-				tid.ieta(), tid.iphi(), tid.depth()));
-		}
-
-		std::string name_TTSubdet(HcalTrigTowerDetId const& tid)
-		{
-			return constants::TPSUBDET_NAME[tid.ietaAbs()<29?0:1];
-		}
-
-		uint32_t hash_TTSubdet(std::string const& name)
-		{
-			if (name=="HBHE")
-				return HcalTrigTowerDetId(1,1).rawId();
-			else
-				return HcalTrigTowerDetId(29,1).rawId();
-			
-			return HcalTrigTowerDetId().rawId();
-		}
-
-		std::string name_TTSubdetPM(HcalTrigTowerDetId const& tid)
-		{
-			return constants::TPSUBDETPM_NAME[
-				tid.ietaAbs()<29?(tid.ieta()<0?0:1):(tid.ieta()<0?2:3)];
-		}
-
-		uint32_t hash_TTSubdetPM(std::string const& name)
-		{
-			if (name=="HBHEM")
-				return HcalTrigTowerDetId(-1,1).rawId();
-			else if (name=="HBHEP")
-				return HcalTrigTowerDetId(1,1).rawId();
-			else if (name=="HFM")
-				return HcalTrigTowerDetId(-29,1).rawId();
-			else
-				return HcalTrigTowerDetId(29,1).rawId();
-
-			return HcalTrigTowerDetId().rawId();
-		}
-
-		std::string name_TTSubdetPMiphi(HcalTrigTowerDetId const& tid)
-		{
-			char name[10];
-			sprintf(name, "%siphi%d", name_TTSubdetPM(tid).c_str(),
-				tid.iphi());
-			return std::string(name);
-		}
-
-		uint32_t hash_TTSubdetPMiphi(std::string const& name)
-		{
-			int pos = name.find("iphi");
-			std::string sub = name.substr(0, pos);
-			int iphi = std::stoi(name.substr(pos+4, name.length()-pos-4),
-				nullptr);
-			if (name=="HBHEM")
-				return HcalTrigTowerDetId(-1,iphi).rawId();
-			else if (name=="HBHEP")
-				return HcalTrigTowerDetId(1,iphi).rawId();
-			else if (name=="HFM")
-				return HcalTrigTowerDetId(-29,iphi).rawId();
-			else
-				return HcalTrigTowerDetId(29,iphi).rawId();
-
-			return HcalTrigTowerDetId().rawId();
-		}
-
-		std::string name_TTSubdetieta(HcalTrigTowerDetId const& tid)
-		{
-			return "None";
-		}
-
-		//	TODO: implement - not used right now
-		uint32_t hash_TTSubdetieta(std::string const&)
-		{return HcalTrigTowerDetId().rawId();}
-
-		std::string name_TTdepth(HcalTrigTowerDetId const& tid)
-		{
-			char name[10];
-			sprintf(name, "depth%d", tid.depth());
-			return std::string(name);
-		}
-
-		uint32_t hash_TTdepth(std::string const& name)
-		{
-			int depth = std::stoi(name.substr(5, name.length()-5), nullptr);
-			return HcalTrigTowerDetId(1,1,depth);
-		}
-
-		std::string name_TChannel(HcalTrigTowerDetId const& tid)
-		{
-			std::ostringstream stream;
-			stream << tid;
-			return std::string(stream.str());
-		}
-
-		//	TODO: implement - not used right now
-		uint32_t hash_TChannel(std::string const&)
-		{return HcalTrigTowerDetId().rawId();}
-	}
-}
+namespace hcaldqm {
+  using namespace constants;
+  namespace hashfunctions {
+    /**
+ *	HcalDetId
+ */
+    uint32_t hash_Subdet(HcalDetId const &did) { return utilities::hash(HcalDetId(did.subdet(), 1, 1, 1)); }
+
+    uint32_t hash_Subdetiphi(HcalDetId const &did) {
+      return utilities::hash(HcalDetId(did.subdet(), 1, did.iphi(), 1));
+    }
+
+    uint32_t hash_Subdetieta(HcalDetId const &did) {
+      return utilities::hash(HcalDetId(did.subdet(), did.ieta(), 1, 1));
+    }
+
+    uint32_t hash_Subdetdepth(HcalDetId const &did) {
+      return utilities::hash(HcalDetId(did.subdet(), 1, 1, did.depth()));
+    }
+
+    uint32_t hash_SubdetPM(HcalDetId const &did) {
+      return utilities::hash(HcalDetId(did.subdet(), did.ieta() > 0 ? 1 : -1, 1, 1));
+    }
+
+    uint32_t hash_SubdetPMiphi(HcalDetId const &did) {
+      return utilities::hash(HcalDetId(did.subdet(), did.ieta() > 0 ? 1 : -1, did.iphi(), 1));
+    }
+
+    uint32_t hash_iphi(HcalDetId const &did) { return utilities::hash(HcalDetId(HcalBarrel, 1, did.iphi(), 1)); }
+
+    uint32_t hash_ieta(HcalDetId const &did) { return utilities::hash(HcalDetId(HcalBarrel, did.ieta(), 1, 1)); }
+
+    uint32_t hash_depth(HcalDetId const &did) { return utilities::hash(HcalDetId(HcalBarrel, 1, 1, did.depth())); }
+
+    uint32_t hash_HFPMiphi(HcalDetId const &did) {
+      return utilities::hash(HcalDetId(HcalForward, did.ieta() > 0 ? 1 : -1, did.iphi(), 1));
+    }
+
+    uint32_t hash_HBHEPartition(HcalDetId const &did) {
+      int iphi = did.iphi();
+      uint32_t hash = 0;
+      if (iphi >= 3 && iphi <= 26)
+        hash = utilities::hash(HcalDetId(HcalBarrel, 1, 3, 1));
+      else if (iphi >= 27 && iphi <= 50)
+        hash = utilities::hash(HcalDetId(HcalBarrel, 1, 27, 1));
+      else
+        hash = utilities::hash(HcalDetId(HcalBarrel, 1, 1, 1));
+
+      return hash;
+    }
+
+    uint32_t hash_DChannel(HcalDetId const &did) { return utilities::hash(did); }
+
+    std::string name_Subdet(HcalDetId const &did) { return constants::SUBDET_NAME[did.subdet() - 1]; }
+
+    uint32_t hash_Subdet(std::string const &name) {
+      for (int i = 0; i < constants::SUBDET_NUM; i++)
+        if (constants::SUBDET_NAME[i] == name)
+          return (HcalDetId((HcalSubdetector)(i + 1), 1, 1, 1).rawId());
+
+      return HcalDetId().rawId();
+    }
+
+    std::string name_SubdetPM(HcalDetId const &did) {
+      char name[10];
+      sprintf(name, "%s%s", constants::SUBDET_NAME[did.subdet() - 1].c_str(), did.ieta() > 0 ? "P" : "M");
+      return std::string(name);
+    }
+
+    uint32_t hash_SubdetPM(std::string const &name) {
+      for (int i = 0; i < constants::SUBDET_NUM * 2; i++)
+        if (constants::SUBDETPM_NAME[i] == name)
+          return HcalDetId((HcalSubdetector)(i / 2 + 1), i % 2 == 0 ? -1 : 1, 1, 1).rawId();
+
+      return HcalDetId().rawId();
+    }
+
+    std::string name_Subdetiphi(HcalDetId const &did) {
+      char name[10];
+      sprintf(name, "%siphi%d", constants::SUBDET_NAME[did.subdet() - 1].c_str(), did.iphi());
+      return std::string(name);
+    }
+
+    uint32_t hash_Subdetiphi(std::string const &name) {
+      std::string sub = name.substr(0, 2);
+      int iphi = std::stoi(name.substr(6, name.length() - 6), nullptr);
+      for (int i = 0; i < constants::SUBDET_NUM; i++)
+        if (constants::SUBDET_NAME[i] == sub)
+          return HcalDetId((HcalSubdetector)(i + 1), 1, iphi, 1).rawId();
+
+      //	default
+      return HcalDetId().rawId();
+    }
+
+    std::string name_Subdetieta(HcalDetId const &did) {
+      char name[20];
+      sprintf(name, "%sieta%d", constants::SUBDET_NAME[did.subdet() - 1].c_str(), did.ieta());
+      return std::string(name);
+    }
+
+    uint32_t hash_Subdetieta(std::string const &name) {
+      std::string sub = name.substr(0, 2);
+      int ieta = std::stoi(name.substr(6, name.length() - 6), nullptr);
+      for (int i = 0; i < constants::SUBDET_NUM; i++)
+        if (constants::SUBDET_NAME[i] == sub)
+          return HcalDetId((HcalSubdetector)(i + 1), ieta, 1, 1).rawId();
+
+      //	default
+      return HcalDetId().rawId();
+    }
+
+    std::string name_Subdetdepth(HcalDetId const &did) {
+      char name[20];
+      sprintf(name, "%sdepth%d", constants::SUBDET_NAME[did.subdet() - 1].c_str(), did.depth());
+      return std::string(name);
+    }
+
+    uint32_t hash_Subdetdepth(std::string const &name) {
+      std::string sub = name.substr(0, 2);
+      int depth = std::stoi(name.substr(7, name.length() - 7), nullptr);
+      for (int i = 0; i < constants::SUBDET_NUM; i++)
+        if (constants::SUBDET_NAME[i] == sub)
+          return HcalDetId((HcalSubdetector)(i + 1), 1, 1, depth).rawId();
+
+      return HcalDetId().rawId();
+    }
+
+    std::string name_SubdetPMiphi(HcalDetId const &did) {
+      char name[20];
+      sprintf(
+          name, "%s%siphi%d", constants::SUBDET_NAME[did.subdet() - 1].c_str(), did.ieta() > 0 ? "P" : "M", did.iphi());
+      return std::string(name);
+    }
+
+    uint32_t hash_SubdetPMiphi(std::string const &name) {
+      std::string sub = name.substr(0, 3);
+      int iphi = std::stoi(name.substr(7, name.length() - 7), nullptr);
+      for (int i = 0; i < constants::SUBDET_NUM * 2; i++)
+        if (constants::SUBDETPM_NAME[i] == sub)
+          return HcalDetId((HcalSubdetector)(i / 2 + 1), i % 2 == 0 ? -1 : 1, iphi, 1).rawId();
+
+      return HcalDetId().rawId();
+    }
+
+    std::string name_iphi(HcalDetId const &did) {
+      char name[10];
+      sprintf(name, "iphi%d", did.iphi());
+      return std::string(name);
+    }
+
+    uint32_t hash_iphi(std::string const &name) {
+      int iphi = std::stoi(name.substr(4, name.length() - 4), nullptr);
+      return HcalDetId(HcalBarrel, 1, iphi, 1).rawId();
+    }
+
+    std::string name_ieta(HcalDetId const &did) {
+      char name[10];
+      sprintf(name, "ieta%d", did.ieta());
+      return std::string(name);
+    }
+
+    uint32_t hash_ieta(std::string const &name) {
+      int ieta = std::stoi(name.substr(4, name.length() - 4), nullptr);
+      return HcalDetId(HcalBarrel, ieta, 1, 1).rawId();
+    }
+
+    std::string name_depth(HcalDetId const &did) {
+      char name[10];
+      sprintf(name, "depth%d", did.depth());
+      return std::string(name);
+    }
+
+    uint32_t hash_depth(std::string const &name) {
+      int depth = std::stoi(name.substr(5, name.length() - 5), nullptr);
+      return HcalDetId(HcalBarrel, 1, 1, depth).rawId();
+    }
+
+    std::string name_HFPMiphi(HcalDetId const &did) {
+      char name[12];
+      snprintf(name, sizeof(name), "HF%ciphi%d", did.ieta() > 0 ? 'P' : 'M', did.iphi());
+      return std::string(name);
+    }
+
+    uint32_t hash_HFPMiphi(std::string const &name) {
+      int iphi = std::stoi(name.substr(7, name.length() - 7), nullptr);
+      int ieta = name[2] == 'P' ? 1 : -1;
+      return HcalDetId(HcalForward, ieta, iphi, 1).rawId();
+    }
+
+    std::string name_HBHEPartition(HcalDetId const &did) {
+      char c;
+      if (did.iphi() >= 3 && did.iphi() <= 26)
+        c = 'a';
+      else if (did.iphi() >= 27 && did.iphi() <= 50)
+        c = 'b';
+      else
+        c = 'c';
+      char name[10];
+      sprintf(name, "HBHE%c", c);
+      return std::string(name);
+    }
+
+    uint32_t hash_HBHEPartition(std::string const &name) {
+      if (name[4] == 'a')
+        return HcalDetId(HcalBarrel, 1, 5, 1).rawId();
+      else if (name[4] == 'b')
+        return HcalDetId(HcalBarrel, 1, 29, 1).rawId();
+      else
+        return HcalDetId(HcalBarrel, 1, 55, 1).rawId();
+
+      return HcalDetId().rawId();
+    }
+
+    std::string name_DChannel(HcalDetId const &did) {
+      char name[40];
+      sprintf(
+          name, "%s-%d-%d-%d", constants::SUBDET_NAME[did.subdet() - 1].c_str(), did.ieta(), did.iphi(), did.depth());
+      return std::string(name);
+    }
+
+    //	TODO: Make it work here
+    //	Not neccessary right now!
+    uint32_t hash_DChannel(std::string const &name) { return HcalDetId(HcalBarrel, 1, 1, 1).rawId(); }
+
+    /**
+ *	by ElectronicsId
+ */
+    uint32_t hash_FED(HcalElectronicsId const &eid) {
+      if (eid.isVMEid())
+        return utilities::hash(HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, SPIGOT_MIN, eid.dccid()));
+      else {
+        //  tmp - we need to hash HF's FEDs with slot in mind
+        // bool isHF = eid.crateId()==22 || eid.crateId()==29 || eid.crateId()==32;
+        //  for HF, slot number is either
+        int slotToUse = eid.slot() > 6 ? SLOT_uTCA_MIN + 6 : SLOT_uTCA_MIN;
+        return utilities::hash(HcalElectronicsId(eid.crateId(), slotToUse, FIBER_uTCA_MIN1, FIBERCH_MIN, false));
+      }
+    }
+
+    uint32_t hash_FEDSpigot(HcalElectronicsId const &eid) {
+      //	note that hashing of uTCA is done by FED-Slot...
+      return eid.isVMEid()
+                 ? utilities::hash(HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, eid.spigot(), eid.dccid()))
+                 : utilities::hash(HcalElectronicsId(eid.crateId(), eid.slot(), FIBER_uTCA_MIN1, FIBERCH_MIN, false));
+    }
+
+    uint32_t hash_FEDSlot(HcalElectronicsId const &eid) {
+      //	note that hashing of VME is done with
+      return eid.isVMEid()
+                 ? utilities::hash(HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, eid.spigot(), eid.dccid()))
+                 : utilities::hash(HcalElectronicsId(eid.crateId(), eid.slot(), FIBER_uTCA_MIN1, FIBERCH_MIN, false));
+    }
+
+    uint32_t hash_Crate(HcalElectronicsId const &eid) {
+      //	note hashing of VME is done with dccId
+      //	note 2: there are two dccids per crate, <even> and <even+1>. We don't
+      // care about this, so use the even one.
+      return eid.isVMEid()
+                 ? utilities::hash(HcalElectronicsId(
+                       FIBERCH_MIN, FIBER_VME_MIN, SPIGOT_MIN, (eid.dccid() % 2 == 0 ? eid.dccid() : eid.dccid() - 1)))
+                 : utilities::hash(
+                       HcalElectronicsId(eid.crateId(), SLOT_uTCA_MIN, FIBER_uTCA_MIN1, FIBERCH_MIN, false));
+    }
+
+    uint32_t hash_CrateSpigot(HcalElectronicsId const &eid) {
+      //	note hashing of VME is done with dccid and
+      //	uTCA with Slots
+      return eid.isVMEid()
+                 ? utilities::hash(HcalElectronicsId(
+                       FIBERCH_MIN, FIBER_VME_MIN, eid.spigot(), (eid.dccid() % 2 == 0 ? eid.dccid() : eid.dccid() - 1)))
+                 : utilities::hash(HcalElectronicsId(eid.crateId(), eid.slot(), FIBER_uTCA_MIN1, FIBERCH_MIN, false));
+    }
+
+    uint32_t hash_CrateSlot(HcalElectronicsId const &eid) {
+      return eid.isVMEid()
+                 ? utilities::hash(HcalElectronicsId(
+                       FIBERCH_MIN, FIBER_VME_MIN, eid.spigot(), (eid.dccid() % 2 == 0 ? eid.dccid() : eid.dccid() - 1)))
+                 : utilities::hash(HcalElectronicsId(eid.crateId(), eid.slot(), FIBER_uTCA_MIN1, FIBERCH_MIN, false));
+    }
+
+    uint32_t hash_Fiber(HcalElectronicsId const &) { return 0; }
+
+    uint32_t hash_FiberFiberCh(HcalElectronicsId const &) { return 0; }
+
+    uint32_t hash_FiberCh(HcalElectronicsId const &eid) { return 0; }
+
+    uint32_t hash_Electronics(HcalElectronicsId const &eid) {
+      return eid.isVMEid() ? utilities::hash(HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, SPIGOT_MIN, CRATE_VME_MIN))
+                           : utilities::hash(
+                                 HcalElectronicsId(CRATE_uTCA_MIN, SLOT_uTCA_MIN, FIBER_uTCA_MIN1, FIBERCH_MIN, false));
+      /*			NOTE: as an update - should separate Trigger Eid and Det
+   Eid *			return eid.isVMEid() ? eid.isTriggerChainId()?
+                                          utilities::hash(HcalElectronicsId(SLBCH_MIN,
+                                                  SLB_MIN, SPIGOT_MIN,
+   CRATE_VME_MIN, CRATE_VME_MIN, SLOT_VME_MIN1, 0)):
+                                          utilities::hash(HcalElectronicsId(FIBERCH_MIN,
+                                                  FIBER_VME_MIN, SPIGOT_MIN,
+   CRATE_VME_MIN))
+                                  :
+                                  eid.isTriggerChainId()?
+                                  utilities::hash(HcalElectronicsId(CRATE_uTCA_MIN,
+                                          SLOT_uTCA_MIN, TPFIBER_MIN,
+   TPFIBERCH_MIN, true)): utilities::hash(HcalElectronicsId(CRATE_uTCA_MIN,
+                                          SLOT_uTCA_MIN, FIBER_uTCA_MIN1,
+   FIBERCH_MIN, false));
+                                          */
+    }
+
+    uint32_t hash_EChannel(HcalElectronicsId const &eid) {
+      return eid.isVMEid()
+                 ? utilities::hash(HcalElectronicsId(eid.fiberChanId(), eid.fiberIndex(), eid.spigot(), eid.dccid()))
+                 : utilities::hash(
+                       HcalElectronicsId(eid.crateId(), eid.slot(), eid.fiberIndex(), eid.fiberChanId(), false));
+    }
+
+    std::string name_FED(HcalElectronicsId const &eid) {
+      char name[10];
+      sprintf(name, "FED%d", eid.isVMEid() ? eid.dccid() + 700 : utilities::crate2fed(eid.crateId(), eid.slot()));
+      return std::string(name);
+    }
+
+    uint32_t hash_FED(std::string const &name) {
+      int fed = std::stoi(name.substr(3, name.length() - 3), nullptr);
+      if (fed >= constants::FED_uTCA_MIN) {
+        std::pair<uint16_t, uint16_t> cspair = utilities::fed2crate(fed);
+        return HcalElectronicsId(cspair.first, cspair.second, FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId();
+      } else
+        return HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, SPIGOT_MIN, fed - FED_VME_MIN).rawId();
+
+      return HcalElectronicsId().rawId();
+    }
+
+    std::string name_FEDSpigot(HcalElectronicsId const &eid) {
+      char name[20];
+      sprintf(name,
+              "FED%dS%d",
+              eid.isVMEid() ? eid.dccid() + 700 : utilities::crate2fed(eid.crateId(), eid.slot()),
+              eid.isVMEid() ? eid.spigot() : eid.slot());
+      return std::string(name);
+    }
+
+    uint32_t hash_FEDSpigot(std::string const &name) {
+      int pos = name.find("S");
+      int fed = std::stoi(name.substr(3, pos - 3), nullptr);
+      int s = std::stoi(name.substr(pos + 1, name.length() - pos - 1), nullptr);
+      if (fed >= FED_uTCA_MIN) {
+        std::pair<uint16_t, uint16_t> cspair = utilities::fed2crate(fed);
+        return HcalElectronicsId(cspair.first, cspair.second, FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId();
+      } else
+        return HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, s, fed - FED_VME_MIN).rawId();
+
+      return HcalElectronicsId().rawId();
+    }
+
+    std::string name_FEDSlot(HcalElectronicsId const &eid) {
+      char name[20];
+      sprintf(name,
+              "FED%dS%d",
+              eid.isVMEid() ? eid.dccid() + 700 : utilities::crate2fed(eid.crateId(), eid.slot()),
+              eid.isVMEid() ? eid.spigot() : eid.slot());
+      return std::string(name);
+    }
+
+    uint32_t hash_FEDSlot(std::string const &name) {
+      int pos = name.find("S");
+      int fed = std::stoi(name.substr(3, pos - 3), nullptr);
+      int s = std::stoi(name.substr(pos + 1, name.length() - pos - 1), nullptr);
+      if (fed >= FED_uTCA_MIN) {
+        std::pair<uint16_t, uint16_t> cspair = utilities::fed2crate(fed);
+        return HcalElectronicsId(cspair.first, cspair.second, FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId();
+      } else
+        return HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, s, fed - FED_VME_MIN).rawId();
+
+      return HcalElectronicsId().rawId();
+    }
+
+    std::string name_Crate(HcalElectronicsId const &eid) {
+      char name[16];
+      sprintf(name, "Crate%d", eid.crateId());
+
+      // Note: previous, different hashes were returned for the two dccids in a VME
+      // crate. These now count as one crate.
+      // if (eid.isVMEid()) {
+      //	sprintf(name, "Crate%d_VME_DCC%d", eid.crateId(), eid.dccid());
+      //} else {
+      //	sprintf(name, "Crate%d", eid.crateId());
+      //}
+      return std::string(name);
+    }
+
+    //	TODO: implement - not used at this point
+    uint32_t hash_Crate(std::string const &) { return HcalElectronicsId().rawId(); }
+
+    std::string name_CrateSpigot(HcalElectronicsId const &eid) {
+      char name[20];
+      sprintf(name, "Crate%dS%d", eid.crateId(), eid.isVMEid() ? eid.spigot() : eid.slot());
+      return std::string(name);
+    }
+
+    //	TODO: implement - not used at this point
+    uint32_t hash_CrateSpigot(std::string const &) { return HcalElectronicsId().rawId(); }
+
+    std::string name_CrateSlot(HcalElectronicsId const &eid) {
+      char name[20];
+      sprintf(name, "Crate%dS%d", eid.crateId(), eid.isVMEid() ? eid.spigot() : eid.slot());
+      return std::string(name);
+    }
+
+    //	TODO: implement - not used at this point
+    uint32_t hash_CrateSlot(std::string const &) { return HcalElectronicsId().rawId(); }
+
+    std::string name_Fiber(HcalElectronicsId const &) { return "None"; }
+
+    //	TODO: implement - not used at this point
+    uint32_t hash_Fiber(std::string const &) { return HcalElectronicsId().rawId(); }
+
+    std::string name_FiberFiberCh(HcalElectronicsId const &) { return "None"; }
+
+    //	TODO: implement - not used at this point
+    uint32_t hash_FiberFiberCh(std::string const &) { return HcalElectronicsId().rawId(); }
+
+    std::string name_FiberCh(HcalElectronicsId const &) { return "None"; }
+
+    //	TODO: implement - not used at this point
+    uint32_t hash_FiberCh(std::string const &) { return HcalElectronicsId().rawId(); }
+
+    std::string name_Electronics(HcalElectronicsId const &eid) {
+      return eid.isVMEid() ? std::string("VME") : std::string("uTCA");
+    }
+
+    uint32_t hash_Electronics(std::string const &name) {
+      if (name == "VME")
+        return HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, SPIGOT_MIN, CRATE_VME_MIN).rawId();
+      else
+        return HcalElectronicsId(CRATE_uTCA_MIN, SLOT_uTCA_MIN, FIBER_uTCA_MIN1, FIBERCH_MIN, false).rawId();
+
+      return HcalElectronicsId().rawId();
+    }
+
+    std::string name_EChannel(HcalElectronicsId const &eid) {
+      char name[20];
+      if (eid.isVMEid())
+        sprintf(name, "%d-%d-%d-%d", eid.dccid(), eid.spigot(), eid.fiberIndex(), eid.fiberChanId());
+      else
+        sprintf(name, "%d-%d-%d-%d", eid.crateId(), eid.slot(), eid.fiberIndex(), eid.fiberChanId());
+      return std::string(name);
+    }
+
+    //	TODO: implement - not used at this point
+    uint32_t hash_EChannel(std::string const &) { return HcalElectronicsId().rawId(); }
+
+    /**
+ *	by TrigTowerDetId
+ */
+    uint32_t hash_TTSubdet(HcalTrigTowerDetId const &tid) {
+      return utilities::hash(HcalTrigTowerDetId(tid.ietaAbs() >= 29 ? 29 : 1, 1));
+    }
+
+    uint32_t hash_TTSubdetPM(HcalTrigTowerDetId const &tid) {
+      return utilities::hash(
+          HcalTrigTowerDetId(tid.ietaAbs() < 29 ? (tid.ieta() < 0 ? -1 : 1) : (tid.ieta() < 0 ? -29 : 29), 1));
+    }
+
+    uint32_t hash_TTSubdetPMiphi(HcalTrigTowerDetId const &tid) {
+      return utilities::hash(
+          HcalTrigTowerDetId(tid.ietaAbs() < 29 ? (tid.ieta() < 0 ? 0 : 1) : (tid.ieta() < 0 ? 2 : 3), tid.iphi()));
+    }
+
+    uint32_t hash_TTSubdetieta(HcalTrigTowerDetId const &tid) { return 0; }
+
+    uint32_t hash_TTdepth(HcalTrigTowerDetId const &tid) {
+      return utilities::hash(HcalTrigTowerDetId(1, 1, tid.depth()));
+    }
+
+    uint32_t hash_TChannel(HcalTrigTowerDetId const &tid) {
+      return utilities::hash(HcalTrigTowerDetId(tid.ieta(), tid.iphi(), tid.depth()));
+    }
+
+    std::string name_TTSubdet(HcalTrigTowerDetId const &tid) {
+      return constants::TPSUBDET_NAME[tid.ietaAbs() < 29 ? 0 : 1];
+    }
+
+    uint32_t hash_TTSubdet(std::string const &name) {
+      if (name == "HBHE")
+        return HcalTrigTowerDetId(1, 1).rawId();
+      else
+        return HcalTrigTowerDetId(29, 1).rawId();
+
+      return HcalTrigTowerDetId().rawId();
+    }
+
+    std::string name_TTSubdetPM(HcalTrigTowerDetId const &tid) {
+      return constants::TPSUBDETPM_NAME[tid.ietaAbs() < 29 ? (tid.ieta() < 0 ? 0 : 1) : (tid.ieta() < 0 ? 2 : 3)];
+    }
+
+    uint32_t hash_TTSubdetPM(std::string const &name) {
+      if (name == "HBHEM")
+        return HcalTrigTowerDetId(-1, 1).rawId();
+      else if (name == "HBHEP")
+        return HcalTrigTowerDetId(1, 1).rawId();
+      else if (name == "HFM")
+        return HcalTrigTowerDetId(-29, 1).rawId();
+      else
+        return HcalTrigTowerDetId(29, 1).rawId();
+
+      return HcalTrigTowerDetId().rawId();
+    }
+
+    std::string name_TTSubdetPMiphi(HcalTrigTowerDetId const &tid) {
+      char name[10];
+      sprintf(name, "%siphi%d", name_TTSubdetPM(tid).c_str(), tid.iphi());
+      return std::string(name);
+    }
+
+    uint32_t hash_TTSubdetPMiphi(std::string const &name) {
+      int pos = name.find("iphi");
+      std::string sub = name.substr(0, pos);
+      int iphi = std::stoi(name.substr(pos + 4, name.length() - pos - 4), nullptr);
+      if (name == "HBHEM")
+        return HcalTrigTowerDetId(-1, iphi).rawId();
+      else if (name == "HBHEP")
+        return HcalTrigTowerDetId(1, iphi).rawId();
+      else if (name == "HFM")
+        return HcalTrigTowerDetId(-29, iphi).rawId();
+      else
+        return HcalTrigTowerDetId(29, iphi).rawId();
+
+      return HcalTrigTowerDetId().rawId();
+    }
+
+    std::string name_TTSubdetieta(HcalTrigTowerDetId const &tid) { return "None"; }
+
+    //	TODO: implement - not used right now
+    uint32_t hash_TTSubdetieta(std::string const &) { return HcalTrigTowerDetId().rawId(); }
+
+    std::string name_TTdepth(HcalTrigTowerDetId const &tid) {
+      char name[10];
+      sprintf(name, "depth%d", tid.depth());
+      return std::string(name);
+    }
+
+    uint32_t hash_TTdepth(std::string const &name) {
+      int depth = std::stoi(name.substr(5, name.length() - 5), nullptr);
+      return HcalTrigTowerDetId(1, 1, depth);
+    }
+
+    std::string name_TChannel(HcalTrigTowerDetId const &tid) {
+      std::ostringstream stream;
+      stream << tid;
+      return std::string(stream.str());
+    }
+
+    //	TODO: implement - not used right now
+    uint32_t hash_TChannel(std::string const &) { return HcalTrigTowerDetId().rawId(); }
+  }  // namespace hashfunctions
+}  // namespace hcaldqm
diff --git a/DQM/HcalCommon/src/TrigTowerQuantity.cc b/DQM/HcalCommon/src/TrigTowerQuantity.cc
index 7247c02ed6ebf..7a73e94cc72cc 100644
--- a/DQM/HcalCommon/src/TrigTowerQuantity.cc
+++ b/DQM/HcalCommon/src/TrigTowerQuantity.cc
@@ -1,155 +1,94 @@
 #include "DQM/HcalCommon/interface/TrigTowerQuantity.h"
 
-namespace hcaldqm
-{
-	namespace quantity
-	{
-		int getValue_TTiphi(HcalTrigTowerDetId const& tid)
-		{
-			return tid.iphi();
-		}
-
-		int getValue_TTieta(HcalTrigTowerDetId const& tid)
-		{
-			return tid.ieta()<0 ? tid.ieta()+41 : tid.ieta()+40;
-		}
-
-		int getValue_TTdepth(HcalTrigTowerDetId const& tid)
-		{
-			return tid.depth();
-		}
-
-		int getValue_TTSubdet(HcalTrigTowerDetId const& tid)
-		{
-			return tid.ietaAbs()<29 ? 0 : 1;
-		}
-
-		int getValue_TTSubdetPM(HcalTrigTowerDetId const& tid)
-		{
-			int x = tid.ietaAbs()<29 ? 0 : 2;
-			return tid.ieta()>0 ? x+1 : x;
-		}
-
-		int getValue_TTieta2x3(HcalTrigTowerDetId const& tid)
-		{
-			return tid.ieta()<0?tid.ieta()+32:tid.ieta()-29+4;
-		}
-
-		uint32_t getBin_TTiphi(HcalTrigTowerDetId const& tid)
-		{
-			return (uint32_t)(getValue_TTiphi(tid));
-		}
-
-		uint32_t getBin_TTieta(HcalTrigTowerDetId const& tid)
-		{
-			return (uint32_t)(getValue_TTieta(tid)+1);
-		}
-
-		uint32_t getBin_TTdepth(HcalTrigTowerDetId const& tid)
-		{
-			return (uint32_t)(getValue_TTdepth(tid)+1);
-		}
-
-		uint32_t getBin_TTSubdet(HcalTrigTowerDetId const& tid)
-		{
-			return (uint32_t)(getValue_TTSubdet(tid)+1);
-		}
-
-		uint32_t getBin_TTSubdetPM(HcalTrigTowerDetId const& tid)
-		{
-			return (uint32_t)(getValue_TTSubdetPM(tid)+1);
-		}
-
-		uint32_t getBin_TTieta2x3(HcalTrigTowerDetId const& tid)
-		{return (uint32_t)(getValue_TTieta2x3(tid)+1);}
-
-		HcalTrigTowerDetId getTid_TTiphi(int v)
-		{
-			return HcalTrigTowerDetId(1, v);
-		}
-
-		HcalTrigTowerDetId getTid_TTieta(int v)
-		{
-			return HcalTrigTowerDetId(v<41?v-41:v-40, 1);
-		}
-
-		HcalTrigTowerDetId getTid_TTdepth(int v)
-		{
-			return HcalTrigTowerDetId(1, 1, v);
-		}
-
-		HcalTrigTowerDetId getTid_TTSubdet(int v)
-		{
-			return HcalTrigTowerDetId(v==0?1:29, 1);
-		}
-
-		HcalTrigTowerDetId getTid_TTSubdetPM(int v)
-		{
-			return HcalTrigTowerDetId(v%2==0?-(v>=2?29:1):(v>=2?29:1), 1);
-		}
-
-		HcalTrigTowerDetId getTid_TTieta2x3(int v)
-		{
-			//	since numbering goes as
-			//	-32 -29 29 32
-			//	0   3   4   7
-			return HcalTrigTowerDetId(v<4?-(3-v+29):(v-4)+29, 1);
-		}
-
-		std::vector<std::string> getLabels_TTiphi()
-		{
-			return std::vector<std::string>();
-		}
-		std::vector<std::string> getLabels_TTieta()
-		{
-			char name[10];
-			std::vector<std::string> labels;
-			for (int i=0; i<82; i++)
-			{
-				sprintf(name, "%d", getTid_TTieta(i).ieta());
-				labels.push_back(name);
-			}
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_TTieta2x3()
-		{
-			char name[10];
-			std::vector<std::string> labels;
-			for (int i=0; i<8; i++)
-			{
-				sprintf(name, "%d", getTid_TTieta2x3(i).ieta());
-				labels.push_back(name);
-			}
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_TTdepth()
-		{
-			return std::vector<std::string>();
-		}
-
-		std::vector<std::string> getLabels_TTSubdet()
-		{
-			std::vector<std::string> labels;
-			for (int i=0; i<2; i++)
-				labels.push_back(constants::TPSUBDET_NAME[
-					getTid_TTSubdet(i).ietaAbs()<29?0:1]);
-			return labels;
-		}
-
-		std::vector<std::string> getLabels_TTSubdetPM()
-		{
-			std::vector<std::string> labels;
-			for (int i=0; i<4; i++)
-			{
-				HcalTrigTowerDetId tid = getTid_TTSubdetPM(i);
-				int x = tid.ietaAbs()<29?0:2;
-				labels.push_back(constants::TPSUBDETPM_NAME[
-					tid.ieta()>0?x+1:x]);
-				return labels;
-			}
-			return labels;
-		}
-	}
-}
+namespace hcaldqm {
+  namespace quantity {
+    int getValue_TTiphi(HcalTrigTowerDetId const &tid) { return tid.iphi(); }
+
+    int getValue_TTieta(HcalTrigTowerDetId const &tid) { return tid.ieta() < 0 ? tid.ieta() + 41 : tid.ieta() + 40; }
+
+    int getValue_TTdepth(HcalTrigTowerDetId const &tid) { return tid.depth(); }
+
+    int getValue_TTSubdet(HcalTrigTowerDetId const &tid) { return tid.ietaAbs() < 29 ? 0 : 1; }
+
+    int getValue_TTSubdetPM(HcalTrigTowerDetId const &tid) {
+      int x = tid.ietaAbs() < 29 ? 0 : 2;
+      return tid.ieta() > 0 ? x + 1 : x;
+    }
+
+    int getValue_TTieta2x3(HcalTrigTowerDetId const &tid) {
+      return tid.ieta() < 0 ? tid.ieta() + 32 : tid.ieta() - 29 + 4;
+    }
+
+    uint32_t getBin_TTiphi(HcalTrigTowerDetId const &tid) { return (uint32_t)(getValue_TTiphi(tid)); }
+
+    uint32_t getBin_TTieta(HcalTrigTowerDetId const &tid) { return (uint32_t)(getValue_TTieta(tid) + 1); }
+
+    uint32_t getBin_TTdepth(HcalTrigTowerDetId const &tid) { return (uint32_t)(getValue_TTdepth(tid) + 1); }
+
+    uint32_t getBin_TTSubdet(HcalTrigTowerDetId const &tid) { return (uint32_t)(getValue_TTSubdet(tid) + 1); }
+
+    uint32_t getBin_TTSubdetPM(HcalTrigTowerDetId const &tid) { return (uint32_t)(getValue_TTSubdetPM(tid) + 1); }
+
+    uint32_t getBin_TTieta2x3(HcalTrigTowerDetId const &tid) { return (uint32_t)(getValue_TTieta2x3(tid) + 1); }
+
+    HcalTrigTowerDetId getTid_TTiphi(int v) { return HcalTrigTowerDetId(1, v); }
+
+    HcalTrigTowerDetId getTid_TTieta(int v) { return HcalTrigTowerDetId(v < 41 ? v - 41 : v - 40, 1); }
+
+    HcalTrigTowerDetId getTid_TTdepth(int v) { return HcalTrigTowerDetId(1, 1, v); }
+
+    HcalTrigTowerDetId getTid_TTSubdet(int v) { return HcalTrigTowerDetId(v == 0 ? 1 : 29, 1); }
+
+    HcalTrigTowerDetId getTid_TTSubdetPM(int v) {
+      return HcalTrigTowerDetId(v % 2 == 0 ? -(v >= 2 ? 29 : 1) : (v >= 2 ? 29 : 1), 1);
+    }
+
+    HcalTrigTowerDetId getTid_TTieta2x3(int v) {
+      //	since numbering goes as
+      //	-32 -29 29 32
+      //	0   3   4   7
+      return HcalTrigTowerDetId(v < 4 ? -(3 - v + 29) : (v - 4) + 29, 1);
+    }
+
+    std::vector<std::string> getLabels_TTiphi() { return std::vector<std::string>(); }
+    std::vector<std::string> getLabels_TTieta() {
+      char name[10];
+      std::vector<std::string> labels;
+      for (int i = 0; i < 82; i++) {
+        sprintf(name, "%d", getTid_TTieta(i).ieta());
+        labels.push_back(name);
+      }
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_TTieta2x3() {
+      char name[10];
+      std::vector<std::string> labels;
+      for (int i = 0; i < 8; i++) {
+        sprintf(name, "%d", getTid_TTieta2x3(i).ieta());
+        labels.push_back(name);
+      }
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_TTdepth() { return std::vector<std::string>(); }
+
+    std::vector<std::string> getLabels_TTSubdet() {
+      std::vector<std::string> labels;
+      for (int i = 0; i < 2; i++)
+        labels.push_back(constants::TPSUBDET_NAME[getTid_TTSubdet(i).ietaAbs() < 29 ? 0 : 1]);
+      return labels;
+    }
+
+    std::vector<std::string> getLabels_TTSubdetPM() {
+      std::vector<std::string> labels;
+      for (int i = 0; i < 4; i++) {
+        HcalTrigTowerDetId tid = getTid_TTSubdetPM(i);
+        int x = tid.ietaAbs() < 29 ? 0 : 2;
+        labels.push_back(constants::TPSUBDETPM_NAME[tid.ieta() > 0 ? x + 1 : x]);
+        return labels;
+      }
+      return labels;
+    }
+  }  // namespace quantity
+}  // namespace hcaldqm
diff --git a/DQM/HcalCommon/src/Utilities.cc b/DQM/HcalCommon/src/Utilities.cc
index 5d30d6df31b29..486cb3e2ae823 100644
--- a/DQM/HcalCommon/src/Utilities.cc
+++ b/DQM/HcalCommon/src/Utilities.cc
@@ -1,258 +1,236 @@
 #include "DQM/HcalCommon/interface/Utilities.h"
 #include <utility>
 
-namespace hcaldqm
-{
-	using namespace constants;
-	namespace utilities
-	{
-		/*
-		 *	Useful Detector Functions. For Fast Detector Validity Check
-		 */
-        std::pair<uint16_t, uint16_t> fed2crate(int fed)
-		{
-
-            //  uTCA Crate is split in half
-            uint16_t slot = 0;
-            if (fed <= FED_VME_MAX) {
-            	slot = fed%2==0 ? SLOT_uTCA_MIN : SLOT_uTCA_MIN+6;
-            } else {
-            	slot = fed%2==0 ? SLOT_uTCA_MIN : SLOT_uTCA_MIN+6;
-            }
-            std::pair<uint16_t, uint16_t> crate_slot = std::make_pair<uint16_t, uint16_t>(0,0);
-            auto it_fed2crate = constants::fed2crate_map.find(fed);
-            if (it_fed2crate != constants::fed2crate_map.end()) {
-            	crate_slot = std::make_pair<uint16_t const, uint16_t const>((uint16_t const)it_fed2crate->second, (uint16_t const)slot);
-            }
-			return crate_slot;
-		}
-
-	  uint16_t crate2fed(int crate, int slot)
-		{
-			//	 for the details see Constants.h
-			int fed = 0;
-			auto it_crate2fed = constants::crate2fed_map.find(crate);
-			if (it_crate2fed != constants::crate2fed_map.end()) {
-				fed = it_crate2fed->second;
-				if (fed <= FED_VME_MAX && fed > 0) {
-					if (slot > 10 && (std::find(constants::crateListVME.begin(), constants::crateListVME.end(), crate) != constants::crateListVME.end())) {
-						++fed;
-					}
-				} else {
-					if (slot > 6 && (std::find(constants::crateListuTCA.begin(), constants::crateListuTCA.end(), crate) != constants::crateListuTCA.end())) {  //needed to handle dual fed readout
-				  		++fed;
-				  	}
-				}
-			}
-			return fed;
-		}
-
-		uint32_t hash(HcalDetId const& did)
-		{
-			return did.rawId();
-		}
-		uint32_t hash(HcalElectronicsId const& eid)
-		{
-			return eid.rawId();
-		}
-		uint32_t hash(HcalTrigTowerDetId const& tid)
-		{
-			return tid.rawId();
-		}
-
-		std::vector<int> getCrateList(HcalElectronicsMap const* emap) {
-			std::vector<int> vCrates;
-			std::vector<HcalElectronicsId> vids = emap->allElectronicsIdPrecision();
-			for (std::vector<HcalElectronicsId>::const_iterator it=vids.begin(); it!=vids.end(); ++it) {
-				HcalElectronicsId eid = HcalElectronicsId(it->rawId());
-				int crate = eid.crateId();
-				if (std::find(vCrates.begin(), vCrates.end(), crate) == vCrates.end()) {
-					vCrates.push_back(crate);
-				}
-			}
-			std::sort(vCrates.begin(), vCrates.end());
-			return vCrates;
-		}
-
-		std::map<int, uint32_t> getCrateHashMap(HcalElectronicsMap const* emap) {
-			std::map<int, uint32_t> crateHashMap;
-			std::vector<HcalElectronicsId> vids = emap->allElectronicsIdPrecision();
-			for (std::vector<HcalElectronicsId>::const_iterator it=vids.begin(); it!=vids.end(); ++it) {
-				HcalElectronicsId eid = HcalElectronicsId(it->rawId());
-				int this_crate = eid.crateId();
-				uint32_t this_hash = (eid.isVMEid() ?
-					utilities::hash(HcalElectronicsId(FIBERCH_MIN,
-						FIBER_VME_MIN, eid.spigot(), eid.dccid())) :
-					utilities::hash(HcalElectronicsId(eid.crateId(),
-						eid.slot(), FIBER_uTCA_MIN1, FIBERCH_MIN, false)));
-				if (crateHashMap.find(this_crate) == crateHashMap.end()) {
-					crateHashMap[this_crate] = this_hash;
-				}
-			}
-			return crateHashMap;
-		}
-
-		std::vector<int> getFEDList(HcalElectronicsMap const* emap)
-		{
-			std::vector<int> vfeds;
-			std::vector<HcalElectronicsId> vids = 
-				emap->allElectronicsIdPrecision();
-			for (std::vector<HcalElectronicsId>::const_iterator
-				it=vids.begin(); it!=vids.end(); ++it)
-			{
-				int fed = it->isVMEid()?it->dccid()+FED_VME_MIN:
-				  crate2fed(it->crateId(),it->slot());
-				uint32_t n=0;
-				for (std::vector<int>::const_iterator jt=vfeds.begin();
-					jt!=vfeds.end(); ++jt)
-					if (fed==*jt)
-						break;
-					else
-						n++;
-				if (n==vfeds.size())
-					vfeds.push_back(fed);
-			}
-
-			std::sort(vfeds.begin(), vfeds.end());
-			return vfeds;
-		}
-		std::vector<int> getFEDVMEList(HcalElectronicsMap const* emap)
-		{
-			std::vector<int> vfeds;
-			std::vector<HcalElectronicsId> vids = 
-				emap->allElectronicsIdPrecision();
-			for (std::vector<HcalElectronicsId>::const_iterator
-				it=vids.begin(); it!=vids.end(); ++it)
-			{
-				if (!it->isVMEid())
-					continue;
-				int fed = it->isVMEid()?it->dccid()+FED_VME_MIN:
-				  crate2fed(it->crateId(),it->slot());
-				uint32_t n=0;
-				for (std::vector<int>::const_iterator jt=vfeds.begin();
-					jt!=vfeds.end(); ++jt)
-					if (fed==*jt)
-						break;
-					else
-						n++;
-				if (n==vfeds.size())
-					vfeds.push_back(fed);
-			}
-
-			std::sort(vfeds.begin(), vfeds.end());
-			return vfeds;
-		}
-		std::vector<int> getFEDuTCAList(HcalElectronicsMap const* emap)
-		{
-			std::vector<int> vfeds;
-			std::vector<HcalElectronicsId> vids = 
-				emap->allElectronicsIdPrecision();
-			for (std::vector<HcalElectronicsId>::const_iterator
-				it=vids.begin(); it!=vids.end(); ++it)
-			{
-				if (it->isVMEid())
-					continue;
-				int fed = it->isVMEid()?it->dccid()+FED_VME_MIN:
-				  crate2fed(it->crateId(),it->slot());
-				uint32_t n=0;
-				for (std::vector<int>::const_iterator jt=vfeds.begin();
-					jt!=vfeds.end(); ++jt)
-					if (fed==*jt)
-						break;
-					else
-						n++;
-				if (n==vfeds.size())
-					vfeds.push_back(fed);
-			}
-
-			std::sort(vfeds.begin(), vfeds.end());
-			return vfeds;
-		}
-
-		bool isFEDHBHE(HcalElectronicsId const& eid)
-		{
-			if (eid.isVMEid()) {
-				return false;
-			} else {
-			  int fed = crate2fed(eid.crateId(),eid.slot());
-				if (fed>=1100 && fed<1118)
-					return true;
-				else
-					return false;
-			}
-
-			return false;
-		}
-
-		bool isFEDHF(HcalElectronicsId const& eid)
-		{
-			/*
-			if (eid.isVMEid())
-			{
-				int fed = eid.dccid()+FED_VME_MIN;
-				if (fed>=718 && fed<=723)
-					return true;
-				else
-					return false;
-			}*/
-//			else
-//			{
-			if (eid.isVMEid())
-				return false;
-			int fed = crate2fed(eid.crateId(),eid.slot());
-				if (fed>=1118 && fed<=1123)
-					return true;
-				else
-					return false;
-//			}
-
-			return false;
-		}
-
-		bool isFEDHO(HcalElectronicsId const& eid)
-		{
-			if (!eid.isVMEid())
-				return false;
-
-			int fed = eid.dccid()+FED_VME_MIN;
-			if (fed>=724 && fed<=731)
-				return true;
-			else
-				return false;
-
-			return false;
-		}
-
-		/*
-		 *	Orbit Gap Related
-		 */
-		std::string ogtype2string(OrbitGapType type)
-		{
-			switch (type)
-			{
-				case tNull : return "Null";
-				case tPedestal : return "Pedestal";
-				case tLED : return "LED";
-				case tHFRaddam : return "HFRaddam";
-				case tHBHEHPD : return "HBHEHPD";
-				case tHO : return "HO";
-				case tHF : return "HF";
-				case tZDC : return "ZDC";
-				case tHEPMega : return "HEPMegatile";
-				case tHEMMega : return "HEMMegatile";
-				case tHBPMega : return "HBPMegatile";
-				case tHBMMega : return "HBMMegatile";
-				case tCRF : return "CRF";
-				case tCalib : return "Calib";
-				case tSafe : return "Safe";
-				default : return "Unknown";
-			}
-		}
-
-		int getRBX(uint32_t iphi) {
-			return (((iphi + 2) % 72) + 4 - 1) / 4;
-		}
-
-	}
-}
-
+namespace hcaldqm {
+  using namespace constants;
+  namespace utilities {
+    /*
+ *	Useful Detector Functions. For Fast Detector Validity Check
+ */
+    std::pair<uint16_t, uint16_t> fed2crate(int fed) {
+      //  uTCA Crate is split in half
+      uint16_t slot = 0;
+      if (fed <= FED_VME_MAX) {
+        slot = fed % 2 == 0 ? SLOT_uTCA_MIN : SLOT_uTCA_MIN + 6;
+      } else {
+        slot = fed % 2 == 0 ? SLOT_uTCA_MIN : SLOT_uTCA_MIN + 6;
+      }
+      std::pair<uint16_t, uint16_t> crate_slot = std::make_pair<uint16_t, uint16_t>(0, 0);
+      auto it_fed2crate = constants::fed2crate_map.find(fed);
+      if (it_fed2crate != constants::fed2crate_map.end()) {
+        crate_slot =
+            std::make_pair<uint16_t const, uint16_t const>((uint16_t const)it_fed2crate->second, (uint16_t const)slot);
+      }
+      return crate_slot;
+    }
+
+    uint16_t crate2fed(int crate, int slot) {
+      //	 for the details see Constants.h
+      int fed = 0;
+      auto it_crate2fed = constants::crate2fed_map.find(crate);
+      if (it_crate2fed != constants::crate2fed_map.end()) {
+        fed = it_crate2fed->second;
+        if (fed <= FED_VME_MAX && fed > 0) {
+          if (slot > 10 && (std::find(constants::crateListVME.begin(), constants::crateListVME.end(), crate) !=
+                            constants::crateListVME.end())) {
+            ++fed;
+          }
+        } else {
+          if (slot > 6 && (std::find(constants::crateListuTCA.begin(), constants::crateListuTCA.end(), crate) !=
+                           constants::crateListuTCA.end())) {  // needed to handle dual fed readout
+            ++fed;
+          }
+        }
+      }
+      return fed;
+    }
+
+    uint32_t hash(HcalDetId const &did) { return did.rawId(); }
+    uint32_t hash(HcalElectronicsId const &eid) { return eid.rawId(); }
+    uint32_t hash(HcalTrigTowerDetId const &tid) { return tid.rawId(); }
+
+    std::vector<int> getCrateList(HcalElectronicsMap const *emap) {
+      std::vector<int> vCrates;
+      std::vector<HcalElectronicsId> vids = emap->allElectronicsIdPrecision();
+      for (std::vector<HcalElectronicsId>::const_iterator it = vids.begin(); it != vids.end(); ++it) {
+        HcalElectronicsId eid = HcalElectronicsId(it->rawId());
+        int crate = eid.crateId();
+        if (std::find(vCrates.begin(), vCrates.end(), crate) == vCrates.end()) {
+          vCrates.push_back(crate);
+        }
+      }
+      std::sort(vCrates.begin(), vCrates.end());
+      return vCrates;
+    }
+
+    std::map<int, uint32_t> getCrateHashMap(HcalElectronicsMap const *emap) {
+      std::map<int, uint32_t> crateHashMap;
+      std::vector<HcalElectronicsId> vids = emap->allElectronicsIdPrecision();
+      for (std::vector<HcalElectronicsId>::const_iterator it = vids.begin(); it != vids.end(); ++it) {
+        HcalElectronicsId eid = HcalElectronicsId(it->rawId());
+        int this_crate = eid.crateId();
+        uint32_t this_hash =
+            (eid.isVMEid()
+                 ? utilities::hash(HcalElectronicsId(FIBERCH_MIN, FIBER_VME_MIN, eid.spigot(), eid.dccid()))
+                 : utilities::hash(HcalElectronicsId(eid.crateId(), eid.slot(), FIBER_uTCA_MIN1, FIBERCH_MIN, false)));
+        if (crateHashMap.find(this_crate) == crateHashMap.end()) {
+          crateHashMap[this_crate] = this_hash;
+        }
+      }
+      return crateHashMap;
+    }
+
+    std::vector<int> getFEDList(HcalElectronicsMap const *emap) {
+      std::vector<int> vfeds;
+      std::vector<HcalElectronicsId> vids = emap->allElectronicsIdPrecision();
+      for (std::vector<HcalElectronicsId>::const_iterator it = vids.begin(); it != vids.end(); ++it) {
+        int fed = it->isVMEid() ? it->dccid() + FED_VME_MIN : crate2fed(it->crateId(), it->slot());
+        uint32_t n = 0;
+        for (std::vector<int>::const_iterator jt = vfeds.begin(); jt != vfeds.end(); ++jt)
+          if (fed == *jt)
+            break;
+          else
+            n++;
+        if (n == vfeds.size())
+          vfeds.push_back(fed);
+      }
+
+      std::sort(vfeds.begin(), vfeds.end());
+      return vfeds;
+    }
+    std::vector<int> getFEDVMEList(HcalElectronicsMap const *emap) {
+      std::vector<int> vfeds;
+      std::vector<HcalElectronicsId> vids = emap->allElectronicsIdPrecision();
+      for (std::vector<HcalElectronicsId>::const_iterator it = vids.begin(); it != vids.end(); ++it) {
+        if (!it->isVMEid())
+          continue;
+        int fed = it->isVMEid() ? it->dccid() + FED_VME_MIN : crate2fed(it->crateId(), it->slot());
+        uint32_t n = 0;
+        for (std::vector<int>::const_iterator jt = vfeds.begin(); jt != vfeds.end(); ++jt)
+          if (fed == *jt)
+            break;
+          else
+            n++;
+        if (n == vfeds.size())
+          vfeds.push_back(fed);
+      }
+
+      std::sort(vfeds.begin(), vfeds.end());
+      return vfeds;
+    }
+    std::vector<int> getFEDuTCAList(HcalElectronicsMap const *emap) {
+      std::vector<int> vfeds;
+      std::vector<HcalElectronicsId> vids = emap->allElectronicsIdPrecision();
+      for (std::vector<HcalElectronicsId>::const_iterator it = vids.begin(); it != vids.end(); ++it) {
+        if (it->isVMEid())
+          continue;
+        int fed = it->isVMEid() ? it->dccid() + FED_VME_MIN : crate2fed(it->crateId(), it->slot());
+        uint32_t n = 0;
+        for (std::vector<int>::const_iterator jt = vfeds.begin(); jt != vfeds.end(); ++jt)
+          if (fed == *jt)
+            break;
+          else
+            n++;
+        if (n == vfeds.size())
+          vfeds.push_back(fed);
+      }
+
+      std::sort(vfeds.begin(), vfeds.end());
+      return vfeds;
+    }
+
+    bool isFEDHBHE(HcalElectronicsId const &eid) {
+      if (eid.isVMEid()) {
+        return false;
+      } else {
+        int fed = crate2fed(eid.crateId(), eid.slot());
+        if (fed >= 1100 && fed < 1118)
+          return true;
+        else
+          return false;
+      }
+
+      return false;
+    }
+
+    bool isFEDHF(HcalElectronicsId const &eid) {
+      /*
+  if (eid.isVMEid())
+  {
+          int fed = eid.dccid()+FED_VME_MIN;
+          if (fed>=718 && fed<=723)
+                  return true;
+          else
+                  return false;
+  }*/
+      //			else
+      //			{
+      if (eid.isVMEid())
+        return false;
+      int fed = crate2fed(eid.crateId(), eid.slot());
+      if (fed >= 1118 && fed <= 1123)
+        return true;
+      else
+        return false;
+      //			}
+
+      return false;
+    }
+
+    bool isFEDHO(HcalElectronicsId const &eid) {
+      if (!eid.isVMEid())
+        return false;
+
+      int fed = eid.dccid() + FED_VME_MIN;
+      if (fed >= 724 && fed <= 731)
+        return true;
+      else
+        return false;
+
+      return false;
+    }
+
+    /*
+ *	Orbit Gap Related
+ */
+    std::string ogtype2string(OrbitGapType type) {
+      switch (type) {
+        case tNull:
+          return "Null";
+        case tPedestal:
+          return "Pedestal";
+        case tLED:
+          return "LED";
+        case tHFRaddam:
+          return "HFRaddam";
+        case tHBHEHPD:
+          return "HBHEHPD";
+        case tHO:
+          return "HO";
+        case tHF:
+          return "HF";
+        case tZDC:
+          return "ZDC";
+        case tHEPMega:
+          return "HEPMegatile";
+        case tHEMMega:
+          return "HEMMegatile";
+        case tHBPMega:
+          return "HBPMegatile";
+        case tHBMMega:
+          return "HBMMegatile";
+        case tCRF:
+          return "CRF";
+        case tCalib:
+          return "Calib";
+        case tSafe:
+          return "Safe";
+        default:
+          return "Unknown";
+      }
+    }
+
+    int getRBX(uint32_t iphi) { return (((iphi + 2) % 72) + 4 - 1) / 4; }
+
+  }  // namespace utilities
+}  // namespace hcaldqm
diff --git a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py
index 5bc3b2bf8af63..983e83555927a 100644
--- a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py
@@ -1,9 +1,10 @@
 from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-#process = cms.Process("BeamMonitor", eras.Run2_2018) FIXME
-process = cms.Process("BeamMonitor", eras.Run2_2018_pp_on_AA)
+#from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+#process = cms.Process("BeamMonitor", Run2_2018) FIXME
+from Configuration.Eras.Era_Run2_2018_pp_on_AA_cff import Run2_2018_pp_on_AA
+process = cms.Process("BeamMonitor", Run2_2018_pp_on_AA)
 
 #
 process.MessageLogger = cms.Service("MessageLogger",
diff --git a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py
old mode 100755
new mode 100644
index daa8496a0d6ca..df7f77e76b05e
--- a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py
@@ -1,9 +1,10 @@
 from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-#process = cms.Process("BeamMonitor", eras.Run2_2018) # FIMXE
-process = cms.Process("BeamMonitor", eras.Run2_2018_pp_on_AA)
+#from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+#process = cms.Process("BeamMonitor", Run2_2018) # FIMXE
+from Configuration.Eras.Era_Run2_2018_pp_on_AA_cff import Run2_2018_pp_on_AA
+process = cms.Process("BeamMonitor", Run2_2018_pp_on_AA)
 
 # Message logger
 #process.load("FWCore.MessageLogger.MessageLogger_cfi")
diff --git a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py
index 7b4115f74ad84..f97b1e1891136 100644
--- a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py
@@ -1,8 +1,8 @@
 from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("BeamPixel", eras.Run2_2018)
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+process = cms.Process("BeamPixel", Run2_2018)
 
 
 #----------------------------
diff --git a/DQM/Integration/python/clients/ctpps_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/ctpps_dqm_sourceclient-live_cfg.py
index 37f40b1ef3105..046f56d2d9e40 100644
--- a/DQM/Integration/python/clients/ctpps_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/ctpps_dqm_sourceclient-live_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('CTPPSDQM', eras.Run2_2018)
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+process = cms.Process('CTPPSDQM', Run2_2018)
 
 test = False
 
diff --git a/DQM/Integration/python/clients/hcal2_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcal2_dqm_sourceclient-live_cfg.py
index ce67f5ddc2ea3..15328975a5c52 100644
--- a/DQM/Integration/python/clients/hcal2_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/hcal2_dqm_sourceclient-live_cfg.py
@@ -19,8 +19,8 @@
 # Configuration/StandardSequences/python/Eras.py
 # PRocess accepts a (*list) of modifiers
 #
-from Configuration.StandardSequences.Eras import eras
-process      = cms.Process('HCALDQM', eras.Run2_2018)
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+process      = cms.Process('HCALDQM', Run2_2018)
 subsystem    = 'Hcal2'
 cmssw        = os.getenv("CMSSW_VERSION").split("_")
 debugstr     = "### HcalDQM::cfg::DEBUG: "
diff --git a/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py
index b8449ee5367f0..a47dc6cf3e06d 100644
--- a/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/hcal_dqm_sourceclient-live_cfg.py
@@ -11,8 +11,8 @@
 #	Standard CMSSW Imports/Definitions
 #-------------------------------------
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
-process      = cms.Process('HCALDQM', eras.Run2_2018)
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+process      = cms.Process('HCALDQM', Run2_2018)
 subsystem    = 'Hcal'
 cmssw        = os.getenv("CMSSW_VERSION").split("_")
 debugstr     = "### HcalDQM::cfg::DEBUG: "
diff --git a/DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py
index 61d1566948f7f..4775c4607f4f9 100644
--- a/DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/hcalcalib_dqm_sourceclient-live_cfg.py
@@ -10,7 +10,6 @@
 #-------------------------------------
 #	Standard CMSSW Imports/Definitions
 #-------------------------------------
-from Configuration.StandardSequences.Eras import eras
 import FWCore.ParameterSet.Config as cms
 process      = cms.Process('HCALDQM')
 subsystem    = 'HcalCalib'
diff --git a/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py
index a6362a54ffc17..fbc9f940dbbc4 100644
--- a/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process("L1TStage2DQM", eras.Run2_2018)
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+process = cms.Process("L1TStage2DQM", Run2_2018)
 
 #--------------------------------------------------
 # Event Source and Condition
diff --git a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py
index 614dbb3cfd59d..66f8bf88c1260 100644
--- a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process("L1TStage2EmulatorDQM", eras.Run2_2018)
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+process = cms.Process("L1TStage2EmulatorDQM", Run2_2018)
 
 #--------------------------------------------------
 # Event Source and Condition
diff --git a/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py
index ebaa305eb8aae..d678cf29bdaa3 100644
--- a/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py
@@ -1,9 +1,9 @@
 from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("PIXELDQMLIVE", eras.Run2_2018_pp_on_AA)
+from Configuration.Eras.Era_Run2_2018_pp_on_AA_cff import Run2_2018_pp_on_AA
+process = cms.Process("PIXELDQMLIVE", Run2_2018_pp_on_AA)
 
 live=True
 #set to false for lxplus offline testing
diff --git a/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py
index a9f8ef0e87d00..d4e0f3d4716d5 100644
--- a/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py
@@ -1,9 +1,9 @@
 from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("SiStrpDQMLive", eras.Run2_2018_pp_on_AA)
+from Configuration.Eras.Era_Run2_2018_pp_on_AA_cff import Run2_2018_pp_on_AA
+process = cms.Process("SiStrpDQMLive", Run2_2018_pp_on_AA)
 
 process.MessageLogger = cms.Service("MessageLogger",
     debugModules = cms.untracked.vstring('siStripDigis',
diff --git a/DQM/Physics/src/QcdLowPtDQM.h b/DQM/Physics/src/QcdLowPtDQM.h
index f6037a501445c..70f0d5210f0cf 100644
--- a/DQM/Physics/src/QcdLowPtDQM.h
+++ b/DQM/Physics/src/QcdLowPtDQM.h
@@ -240,7 +240,6 @@ class QcdLowPtDQM : public one::DQMEDAnalyzer<edm::LuminosityBlockCache<qlpd::Ca
   TH3F *AlphaTracklets23_;                  // alpha correction for tracklets 23
   HLTConfigProvider hltConfig_;
   const TrackerGeometry *tgeo_;                  // tracker geometry
-  DQMStore *theDbe_;                             // dqm store
   MonitorElement *repSumMap_;                    // report summary map
   MonitorElement *repSummary_;                   // report summary
   MonitorElement *h2TrigCorr_;                   // trigger correlation plot
diff --git a/DQM/PhysicsObjectsMonitoring/interface/PhysicsObjectsMonitor.h b/DQM/PhysicsObjectsMonitoring/interface/PhysicsObjectsMonitor.h
index 1950b4f23ba5b..333f8f4512e8d 100644
--- a/DQM/PhysicsObjectsMonitoring/interface/PhysicsObjectsMonitor.h
+++ b/DQM/PhysicsObjectsMonitoring/interface/PhysicsObjectsMonitor.h
@@ -11,35 +11,34 @@
  */
 
 // Base Class Headers
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 //#include "DataFormats/TrackReco/interface/Track.h"
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
 
 namespace edm {
-class ParameterSet;
-class Event;
-class EventSetup;
-}
+  class ParameterSet;
+  class Event;
+  class EventSetup;
+}  // namespace edm
 
 class TFile;
 class TH1F;
 class TH2F;
 
 class PhysicsObjectsMonitor : public DQMEDAnalyzer {
- public:
+public:
   /// Constructor
   PhysicsObjectsMonitor(const edm::ParameterSet &pset);
   /// Destructor
   ~PhysicsObjectsMonitor() override;
   // Operations
-  void bookHistograms(DQMStore::IBooker &, edm::Run const &,
-                      edm::EventSetup const &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
   void analyze(const edm::Event &event, const edm::EventSetup &eventSetup) override;
 
- private:
+private:
   std::string theSTAMuonLabel;
   std::string theSeedCollectionLabel;
 
diff --git a/DQM/PhysicsObjectsMonitoring/src/PhysicsObjectsMonitor.cc b/DQM/PhysicsObjectsMonitoring/src/PhysicsObjectsMonitor.cc
index 6171111338b27..ce28ad24991bf 100644
--- a/DQM/PhysicsObjectsMonitoring/src/PhysicsObjectsMonitor.cc
+++ b/DQM/PhysicsObjectsMonitoring/src/PhysicsObjectsMonitor.cc
@@ -9,52 +9,47 @@
 #include "DQM/PhysicsObjectsMonitoring/interface/PhysicsObjectsMonitor.h"
 
 // Collaborating Class Header
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 
-#include "TrackingTools/TransientTrack/interface/TransientTrack.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "RecoMuon/TrackingTools/interface/MuonPatternRecoDumper.h"
+#include "TrackingTools/TransientTrack/interface/TransientTrack.h"
 
 #include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
 
-#include <FWCore/MessageLogger/interface/MessageLogger.h>
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include <FWCore/MessageLogger/interface/MessageLogger.h>
 
 using namespace std;
 using namespace edm;
 
 /// Constructor
-PhysicsObjectsMonitor::PhysicsObjectsMonitor(const ParameterSet& pset) {
-  theSTAMuonLabel =
-      pset.getUntrackedParameter<string>("StandAloneTrackCollectionLabel");
-  theSeedCollectionLabel =
-      pset.getUntrackedParameter<string>("MuonSeedCollectionLabel");
+PhysicsObjectsMonitor::PhysicsObjectsMonitor(const ParameterSet &pset) {
+  theSTAMuonLabel = pset.getUntrackedParameter<string>("StandAloneTrackCollectionLabel");
+  theSeedCollectionLabel = pset.getUntrackedParameter<string>("MuonSeedCollectionLabel");
   theDataType = pset.getUntrackedParameter<string>("DataType");
 
   if (theDataType != "RealData" && theDataType != "SimData")
     edm::LogInfo("PhysicsObjectsMonitor") << "Error in Data Type!!" << endl;
 
   if (theDataType == "SimData") {
-    edm::LogInfo("PhysicsObjectsMonitor")
-        << "Sorry! Running this package on simulation is no longer supported! ";
+    edm::LogInfo("PhysicsObjectsMonitor") << "Sorry! Running this package on simulation is no longer supported! ";
   }
 
   // set Token(-s)
-  theSTAMuonToken_ = consumes<reco::TrackCollection>(
-      pset.getUntrackedParameter<string>("StandAloneTrackCollectionLabel"));
+  theSTAMuonToken_ =
+      consumes<reco::TrackCollection>(pset.getUntrackedParameter<string>("StandAloneTrackCollectionLabel"));
 }
 
 /// Destructor
 PhysicsObjectsMonitor::~PhysicsObjectsMonitor() {}
 
-void PhysicsObjectsMonitor::bookHistograms(DQMStore::IBooker& iBooker,
-                                           edm::Run const&,
-                                           edm::EventSetup const&) {
+void PhysicsObjectsMonitor::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, edm::EventSetup const &) {
   iBooker.setCurrentFolder("PhysicsObjects/MuonReconstruction");
 
   hPres = iBooker.book1D("pTRes", "pT Resolution", 100, -2, 2);
@@ -67,26 +62,19 @@ void PhysicsObjectsMonitor::bookHistograms(DQMStore::IBooker& iBooker,
   py = iBooker.book1D("py", "track py", 100, -50, 50);
   pz = iBooker.book1D("pz", "track pz", 100, -50, 50);
   Nmuon = iBooker.book1D("Nmuon", "Number of muon tracks", 11, -.5, 10.5);
-  Nrechits = iBooker.book1D("Nrechits", "Number of RecHits/Segments on track",
-                            21, -.5, 21.5);
-  NDThits = iBooker.book1D("NDThits", "Number of DT Hits/Segments on track", 31,
-                           -.5, 31.5);
-  NCSChits = iBooker.book1D("NCSChits", "Number of CSC Hits/Segments on track",
-                            31, -.5, 31.5);
-  NRPChits =
-      iBooker.book1D("NRPChits", "Number of RPC hits on track", 11, -.5, 11.5);
-
-  DTvsCSC = iBooker.book2D("DTvsCSC", "Number of DT vs CSC hits on track", 29,
-                           -.5, 28.5, 29, -.5, 28.5);
-  TH2F* root_ob = DTvsCSC->getTH2F();
+  Nrechits = iBooker.book1D("Nrechits", "Number of RecHits/Segments on track", 21, -.5, 21.5);
+  NDThits = iBooker.book1D("NDThits", "Number of DT Hits/Segments on track", 31, -.5, 31.5);
+  NCSChits = iBooker.book1D("NCSChits", "Number of CSC Hits/Segments on track", 31, -.5, 31.5);
+  NRPChits = iBooker.book1D("NRPChits", "Number of RPC hits on track", 11, -.5, 11.5);
+
+  DTvsCSC = iBooker.book2D("DTvsCSC", "Number of DT vs CSC hits on track", 29, -.5, 28.5, 29, -.5, 28.5);
+  TH2F *root_ob = DTvsCSC->getTH2F();
   root_ob->SetXTitle("Number of DT hits");
   root_ob->SetYTitle("Number of CSC hits");
 }
 
-void PhysicsObjectsMonitor::analyze(const Event& event,
-                                    const EventSetup& eventSetup) {
-  edm::LogInfo("PhysicsObjectsMonitor") << "Run: " << event.id().run()
-                                        << " Event: " << event.id().event();
+void PhysicsObjectsMonitor::analyze(const Event &event, const EventSetup &eventSetup) {
+  edm::LogInfo("PhysicsObjectsMonitor") << "Run: " << event.id().run() << " Event: " << event.id().event();
   MuonPatternRecoDumper debug;
 
   // Get the RecTrack collection from the event
@@ -101,11 +89,9 @@ void PhysicsObjectsMonitor::analyze(const Event& event,
 
   reco::TrackCollection::const_iterator staTrack;
 
-  edm::LogInfo("PhysicsObjectsMonitor")
-      << "Reconstructed tracks: " << staTracks->size() << endl;
+  edm::LogInfo("PhysicsObjectsMonitor") << "Reconstructed tracks: " << staTracks->size() << endl;
   Nmuon->Fill(staTracks->size());
-  for (staTrack = staTracks->begin(); staTrack != staTracks->end();
-       ++staTrack) {
+  for (staTrack = staTracks->begin(); staTrack != staTracks->end(); ++staTrack) {
     reco::TransientTrack track(*staTrack, &*theMGField);
 
     int nrechits = 0;
@@ -113,11 +99,9 @@ void PhysicsObjectsMonitor::analyze(const Event& event,
     int nCSChits = 0;
     int nRPChits = 0;
 
-    for (trackingRecHit_iterator it = track.recHitsBegin();
-         it != track.recHitsEnd(); it++) {
+    for (trackingRecHit_iterator it = track.recHitsBegin(); it != track.recHitsEnd(); it++) {
       if ((*it)->isValid()) {
-        edm::LogInfo("PhysicsObjectsMonitor")
-            << "Analyzer:  Aha this looks like a Rechit!" << std::endl;
+        edm::LogInfo("PhysicsObjectsMonitor") << "Analyzer:  Aha this looks like a Rechit!" << std::endl;
         if ((*it)->geographicalId().subdetId() == MuonSubdetId::DT) {
           nDThits++;
         } else if ((*it)->geographicalId().subdetId() == MuonSubdetId::CSC) {
@@ -125,8 +109,7 @@ void PhysicsObjectsMonitor::analyze(const Event& event,
         } else if ((*it)->geographicalId().subdetId() == MuonSubdetId::RPC) {
           nRPChits++;
         } else {
-          edm::LogInfo("PhysicsObjectsMonitor") << "This is an UNKNOWN hit !! "
-                                                << std::endl;
+          edm::LogInfo("PhysicsObjectsMonitor") << "This is an UNKNOWN hit !! " << std::endl;
         }
         nrechits++;
       }
@@ -142,8 +125,7 @@ void PhysicsObjectsMonitor::analyze(const Event& event,
 
     recPt = track.impactPointTSCP().momentum().perp();
     edm::LogInfo("PhysicsObjectsMonitor")
-        << " p: " << track.impactPointTSCP().momentum().mag()
-        << " pT: " << recPt << endl;
+        << " p: " << track.impactPointTSCP().momentum().mag() << " pT: " << recPt << endl;
     pt->Fill(recPt);
     ptot->Fill(track.impactPointTSCP().momentum().mag());
     charge->Fill(track.impactPointTSCP().charge());
diff --git a/DQM/PixelLumi/plugins/BrilClient.cc b/DQM/PixelLumi/plugins/BrilClient.cc
index 2ba16bb59b8d3..117227dbdf678 100644
--- a/DQM/PixelLumi/plugins/BrilClient.cc
+++ b/DQM/PixelLumi/plugins/BrilClient.cc
@@ -1,19 +1,17 @@
 #include "BrilClient.h"
 
+#include <boost/filesystem.hpp>
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
-#include <boost/filesystem.hpp>
 
 #include <iostream>
 #include <vector>
 
 #include "TH2F.h"
 
-BrilClient::BrilClient(const edm::ParameterSet& ps) {
-  pathToken_ = consumes<std::string, edm::InLumi>(
-      edm::InputTag("source", "sourceDataPath"));
-  jsonToken_ = consumes<std::string, edm::InLumi>(
-      edm::InputTag("source", "sourceJsonPath"));
+BrilClient::BrilClient(const edm::ParameterSet &ps) {
+  pathToken_ = consumes<std::string, edm::InLumi>(edm::InputTag("source", "sourceDataPath"));
+  jsonToken_ = consumes<std::string, edm::InLumi>(edm::InputTag("source", "sourceJsonPath"));
 }
 
 BrilClient::~BrilClient() {}
@@ -21,16 +19,17 @@ BrilClient::~BrilClient() {}
 using boost::property_tree::ptree;
 
 template <typename T>
-std::vector<T> as_vector(ptree const& pt, ptree::key_type const& key) {
+std::vector<T> as_vector(ptree const &pt, ptree::key_type const &key) {
   std::vector<T> r;
-  for (auto& item : pt.get_child(key)) r.push_back(item.second.get_value<T>());
+  for (auto &item : pt.get_child(key))
+    r.push_back(item.second.get_value<T>());
   return r;
 }
 
-void BrilClient::dqmEndLuminosityBlock(DQMStore::IBooker& ibooker_,
-                                       DQMStore::IGetter& igetter_,
-                                       edm::LuminosityBlock const& lb,
-                                       edm::EventSetup const&) {
+void BrilClient::dqmEndLuminosityBlock(DQMStore::IBooker &ibooker_,
+                                       DQMStore::IGetter &igetter_,
+                                       edm::LuminosityBlock const &lb,
+                                       edm::EventSetup const &) {
   edm::Handle<std::string> filePath_;
   lb.getByToken(pathToken_, filePath_);
 
@@ -41,8 +40,7 @@ void BrilClient::dqmEndLuminosityBlock(DQMStore::IBooker& ibooker_,
   ptree json;
   if (!boost::filesystem::exists(*filePath_)) {
     edm::LogWarning("BrilClient") << "BrilClient"
-                                  << " File missing: " << *filePath_
-                                  << std::endl;
+                                  << " File missing: " << *filePath_ << std::endl;
 
     return;
   } else {
@@ -53,7 +51,7 @@ void BrilClient::dqmEndLuminosityBlock(DQMStore::IBooker& ibooker_,
   }
 
   // Parse the json
-  for (auto& mainTree : json.get_child("OccupancyPlots")) {
+  for (auto &mainTree : json.get_child("OccupancyPlots")) {
     std::string title = mainTree.second.get<std::string>("titles");
     std::size_t pos = title.find(",");
     if (pos <= 0) {
@@ -68,16 +66,17 @@ void BrilClient::dqmEndLuminosityBlock(DQMStore::IBooker& ibooker_,
     auto xrange = as_vector<int>(mainTree.second, "xrange");  // min, max
     auto yrange = as_vector<int>(mainTree.second, "yrange");  // min, max
 
-    TH2F* th = new TH2F(name.c_str(), title.c_str(), nBins.at(0), xrange.at(0),
-                        xrange.at(1), nBins.at(1), yrange.at(0), yrange.at(1));
+    TH2F *th = new TH2F(
+        name.c_str(), title.c_str(), nBins.at(0), xrange.at(0), xrange.at(1), nBins.at(1), yrange.at(0), yrange.at(1));
 
-    for (auto& dataArray : mainTree.second.get_child("data")) {
+    for (auto &dataArray : mainTree.second.get_child("data")) {
       int elements[3] = {0, 0, 0};  // binX, binY, binCont;
       auto element = std::begin(elements);
 
-      for (auto& binContent : dataArray.second) {
+      for (auto &binContent : dataArray.second) {
         *element++ = stoi(binContent.second.get_value<std::string>());
-        if (element == std::end(elements)) break;
+        if (element == std::end(elements))
+          break;
       }
 
       th->SetBinContent(elements[0], elements[1], elements[2]);
@@ -87,7 +86,7 @@ void BrilClient::dqmEndLuminosityBlock(DQMStore::IBooker& ibooker_,
     ibooker_.setCurrentFolder("BRIL/OccupancyPlots");
     igetter_.setCurrentFolder("BRIL/OccupancyPlots");
 
-    MonitorElement* m = igetter_.get(name);
+    MonitorElement *m = igetter_.get(name);
     if (m == nullptr) {
       m = ibooker_.book2D(name, th);
     } else {
diff --git a/DQM/PixelLumi/plugins/BrilClient.h b/DQM/PixelLumi/plugins/BrilClient.h
index 6cb0480458b2e..a7fbe10937575 100644
--- a/DQM/PixelLumi/plugins/BrilClient.h
+++ b/DQM/PixelLumi/plugins/BrilClient.h
@@ -1,9 +1,9 @@
 #ifndef DQM_BRIL_BRILCLIENT_H
 #define DQM_BRIL_BRILCLIENT_H
 
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -16,18 +16,19 @@
 #include <map>
 
 class BrilClient : public DQMEDHarvester {
- public:
+public:
   BrilClient(const edm::ParameterSet &ps);
   ~BrilClient() override;
 
- protected:
+protected:
   void beginJob() override{};
-  void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &,
+  void dqmEndLuminosityBlock(DQMStore::IBooker &,
+                             DQMStore::IGetter &,
                              edm::LuminosityBlock const &,
                              edm::EventSetup const &) override;
   void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override{};
 
- private:
+private:
   edm::EDGetTokenT<std::string> pathToken_;
   edm::EDGetTokenT<std::string> jsonToken_;
 };
diff --git a/DQM/PixelLumi/plugins/PixelLumiDQM.cc b/DQM/PixelLumi/plugins/PixelLumiDQM.cc
index ad2fc0b1d9657..bc07439a0ec33 100644
--- a/DQM/PixelLumi/plugins/PixelLumiDQM.cc
+++ b/DQM/PixelLumi/plugins/PixelLumiDQM.cc
@@ -8,26 +8,26 @@
 
 #include "PixelLumiDQM.h"
 
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/GeometryVector/interface/Pi.h"
-#include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
-#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "DataFormats/GeometryVector/interface/LocalPoint.h"
+#include "DataFormats/GeometryVector/interface/Pi.h"
+#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h"
-#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
+#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/Run.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
@@ -35,129 +35,105 @@
 #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 
+#include <ctime>
 #include <fstream>
 #include <map>
 #include <string>
 #include <sys/time.h>
-#include <ctime>
 #include <vector>
 
 const unsigned int PixelLumiDQM::lastBunchCrossing;
 
 // Constructors and destructor.
-PixelLumiDQM::PixelLumiDQM(const edm::ParameterSet& iConfig):
-  fPixelClusterLabel(consumes<edmNew::DetSetVector<SiPixelCluster> >(iConfig.getUntrackedParameter<edm::InputTag>("pixelClusterLabel",
-                       edm::InputTag("siPixelClusters")))),
-  fIncludePixelClusterInfo(iConfig.getUntrackedParameter<bool>("includePixelClusterInfo", true)),
-  fIncludePixelQualCheckHistos(iConfig.getUntrackedParameter<bool>("includePixelQualCheckHistos", true)),
-  fResetIntervalInLumiSections(iConfig.getUntrackedParameter<int>("resetEveryNLumiSections", 1)),
-  fDeadModules(iConfig.getUntrackedParameter<std::vector<uint32_t> >("deadModules", std::vector<uint32_t>())),
-  fMinPixelsPerCluster(iConfig.getUntrackedParameter<int>("minNumPixelsPerCluster", 0)),
-  fMinClusterCharge(iConfig.getUntrackedParameter<double>("minChargePerCluster", 0)),
-  bunchTriggerMask(lastBunchCrossing+1,false),
-  filledAndUnmaskedBunches(0),
-  useInnerBarrelLayer(iConfig.getUntrackedParameter<bool>("useInnerBarrelLayer", false)),
-  fLogFileName_(iConfig.getUntrackedParameter<std::string>("logFileName","/tmp/pixel_lumi.txt"))
-{
-  edm::LogInfo("Configuration")
-    << "PixelLumiDQM looking for pixel clusters in '"
-    << iConfig.getUntrackedParameter<edm::InputTag>("pixelClusterLabel",
-                       edm::InputTag("siPixelClusters")) << "'";
-  edm::LogInfo("Configuration")
-    << "PixelLumiDQM storing pixel cluster info? "
-    << fIncludePixelClusterInfo;
-  edm::LogInfo("Configuration")
-    << "PixelLumiDQM storing pixel cluster quality check histograms? "
-    << fIncludePixelQualCheckHistos;
+PixelLumiDQM::PixelLumiDQM(const edm::ParameterSet &iConfig)
+    : fPixelClusterLabel(consumes<edmNew::DetSetVector<SiPixelCluster>>(
+          iConfig.getUntrackedParameter<edm::InputTag>("pixelClusterLabel", edm::InputTag("siPixelClusters")))),
+      fIncludePixelClusterInfo(iConfig.getUntrackedParameter<bool>("includePixelClusterInfo", true)),
+      fIncludePixelQualCheckHistos(iConfig.getUntrackedParameter<bool>("includePixelQualCheckHistos", true)),
+      fResetIntervalInLumiSections(iConfig.getUntrackedParameter<int>("resetEveryNLumiSections", 1)),
+      fDeadModules(iConfig.getUntrackedParameter<std::vector<uint32_t>>("deadModules", std::vector<uint32_t>())),
+      fMinPixelsPerCluster(iConfig.getUntrackedParameter<int>("minNumPixelsPerCluster", 0)),
+      fMinClusterCharge(iConfig.getUntrackedParameter<double>("minChargePerCluster", 0)),
+      bunchTriggerMask(lastBunchCrossing + 1, false),
+      filledAndUnmaskedBunches(0),
+      useInnerBarrelLayer(iConfig.getUntrackedParameter<bool>("useInnerBarrelLayer", false)),
+      fLogFileName_(iConfig.getUntrackedParameter<std::string>("logFileName", "/tmp/pixel_lumi.txt")) {
+  edm::LogInfo("Configuration") << "PixelLumiDQM looking for pixel clusters in '"
+                                << iConfig.getUntrackedParameter<edm::InputTag>("pixelClusterLabel",
+                                                                                edm::InputTag("siPixelClusters"))
+                                << "'";
+  edm::LogInfo("Configuration") << "PixelLumiDQM storing pixel cluster info? " << fIncludePixelClusterInfo;
+  edm::LogInfo("Configuration") << "PixelLumiDQM storing pixel cluster quality check histograms? "
+                                << fIncludePixelQualCheckHistos;
 
   if (fDeadModules.empty()) {
-    edm::LogInfo("Configuration")
-      << "No pixel modules specified to be ignored";
+    edm::LogInfo("Configuration") << "No pixel modules specified to be ignored";
   } else {
-    edm::LogInfo("Configuration")
-      << fDeadModules.size() << " pixel modules specified to be ignored:";
-    for (std::vector<uint32_t>::const_iterator it = fDeadModules.begin();
-         it != fDeadModules.end(); ++it) {
-      edm::LogInfo("Configuration")
-        << "  " << *it;
+    edm::LogInfo("Configuration") << fDeadModules.size() << " pixel modules specified to be ignored:";
+    for (std::vector<uint32_t>::const_iterator it = fDeadModules.begin(); it != fDeadModules.end(); ++it) {
+      edm::LogInfo("Configuration") << "  " << *it;
     }
   }
-  edm::LogInfo("Configuration")
-    << "Ignoring pixel clusters with less than "
-    << fMinPixelsPerCluster << " pixels";
-  edm::LogInfo("Configuration")
-    << "Ignoring pixel clusters with charge less than "
-    << fMinClusterCharge;
+  edm::LogInfo("Configuration") << "Ignoring pixel clusters with less than " << fMinPixelsPerCluster << " pixels";
+  edm::LogInfo("Configuration") << "Ignoring pixel clusters with charge less than " << fMinClusterCharge;
 }
 
+PixelLumiDQM::~PixelLumiDQM() {}
 
-PixelLumiDQM::~PixelLumiDQM()
-{
-}
-
-
-void
-PixelLumiDQM::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+void PixelLumiDQM::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
   edm::ParameterSetDescription desc;
   desc.setUnknown();
   descriptions.addDefault(desc);
 }
 
-
-void
-PixelLumiDQM::analyze(const edm::Event& iEvent,
-          const edm::EventSetup& iSetup)
-{
+void PixelLumiDQM::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   // Collect all bookkeeping information.
   fRunNo = iEvent.id().run();
   fEvtNo = iEvent.id().event();
   fLSNo = iEvent.getLuminosityBlock().luminosityBlock();
   fBXNo = iEvent.bunchCrossing();
   fTimestamp = iEvent.time().unixTime();
-  fHistBunchCrossings->Fill(float(fBXNo)); 
-  fHistBunchCrossingsLastLumi->Fill(float(fBXNo)); 
+  fHistBunchCrossings->Fill(float(fBXNo));
+  fHistBunchCrossingsLastLumi->Fill(float(fBXNo));
   // This serves as event counter to compute luminosity from cluster counts.
   std::map<int, PixelClusterCount>::iterator it = fNumPixelClusters.find(fBXNo);
-  if(it==fNumPixelClusters.end()) fNumPixelClusters[fBXNo] = PixelClusterCount();
+  if (it == fNumPixelClusters.end())
+    fNumPixelClusters[fBXNo] = PixelClusterCount();
 
   if (fIncludePixelClusterInfo) {
     // Find tracker geometry.
     edm::ESHandle<TrackerGeometry> trackerGeo;
     iSetup.get<TrackerDigiGeometryRecord>().get(trackerGeo);
-    
+
     // Find pixel clusters.
-    edm::Handle<edmNew::DetSetVector<SiPixelCluster> > pixelClusters;
+    edm::Handle<edmNew::DetSetVector<SiPixelCluster>> pixelClusters;
     iEvent.getByToken(fPixelClusterLabel, pixelClusters);
-    
+
     // Loop over entire tracker geometry.
-    for (TrackerGeometry::DetContainer::const_iterator
-           i = trackerGeo->dets().begin();
-         i != trackerGeo->dets().end(); ++i) {
+    for (TrackerGeometry::DetContainer::const_iterator i = trackerGeo->dets().begin(); i != trackerGeo->dets().end();
+         ++i) {
       // See if this is a pixel unit(?).
-         
-      if ( GeomDetEnumerators::isTrackerPixel((*i)->subDetector())) {
+
+      if (GeomDetEnumerators::isTrackerPixel((*i)->subDetector())) {
         DetId detId = (*i)->geographicalId();
         // Find all clusters on this detector module.
-        edmNew::DetSetVector<SiPixelCluster>::const_iterator iSearch =
-          pixelClusters->find(detId);
+        edmNew::DetSetVector<SiPixelCluster>::const_iterator iSearch = pixelClusters->find(detId);
         if (iSearch != pixelClusters->end()) {
-    
           // Count the number of clusters with at least a minimum
           // number of pixels per cluster and at least a minimum charge.
           size_t numClusters = 0;
-          for (edmNew::DetSet<SiPixelCluster>::const_iterator
-                 itClus = iSearch->begin();
-               itClus != iSearch->end(); ++itClus) {
-            if ((itClus->size() >= fMinPixelsPerCluster) &&
-                (itClus->charge() >= fMinClusterCharge)) {
+          for (edmNew::DetSet<SiPixelCluster>::const_iterator itClus = iSearch->begin(); itClus != iSearch->end();
+               ++itClus) {
+            if ((itClus->size() >= fMinPixelsPerCluster) && (itClus->charge() >= fMinClusterCharge)) {
               ++numClusters;
             }
           }
           // DEBUG DEBUG DEBUG
           assert(numClusters <= iSearch->size());
           // DEBUG DEBUG DEBUG end
-    
-          // Add up the cluster count based on the position of this detector element.
+
+          // Add up the cluster count based on the position of this detector
+          // element.
           if (detId.subdetId() == PixelSubdetector::PixelBarrel) {
             PixelBarrelNameUpgrade detName = PixelBarrelNameUpgrade(detId);
             int layer = detName.layerName() - kOffsetLayers;
@@ -167,7 +143,7 @@ PixelLumiDQM::analyze(const edm::Event& iEvent,
             // DEBUG DEBUG DEBUG
             assert(detId.subdetId() == PixelSubdetector::PixelEndcap);
             // DEBUG DEBUG DEBUG end
-      
+
             PixelEndcapNameUpgrade detName = PixelEndcapNameUpgrade(detId);
             PixelEndcapNameUpgrade::HalfCylinder halfCylinder = detName.halfCylinder();
             int disk = detName.diskName() - kOffsetDisks;
@@ -195,88 +171,78 @@ PixelLumiDQM::analyze(const edm::Event& iEvent,
 
   // Fill some pixel cluster quality check histograms if requested.
   if (fIncludePixelQualCheckHistos) {
-    
     // Find tracker geometry.
     edm::ESHandle<TrackerGeometry> trackerGeo;
     iSetup.get<TrackerDigiGeometryRecord>().get(trackerGeo);
-    
+
     // Find pixel clusters.
-    edm::Handle<edmNew::DetSetVector<SiPixelCluster> > pixelClusters;
+    edm::Handle<edmNew::DetSetVector<SiPixelCluster>> pixelClusters;
     iEvent.getByToken(fPixelClusterLabel, pixelClusters);
-   
+
     bool filterDeadModules = (!fDeadModules.empty());
     std::vector<uint32_t>::const_iterator deadModulesBegin = fDeadModules.begin();
     std::vector<uint32_t>::const_iterator deadModulesEnd = fDeadModules.end();
-    
+
     // Loop over entire tracker geometry.
-    for (TrackerGeometry::DetContainer::const_iterator
-           i = trackerGeo->dets().begin();
-         i != trackerGeo->dets().end(); ++i) {
-      
+    for (TrackerGeometry::DetContainer::const_iterator i = trackerGeo->dets().begin(); i != trackerGeo->dets().end();
+         ++i) {
       // See if this is a pixel module.
-      if ( GeomDetEnumerators::isTrackerPixel((*i)->subDetector())) {
+      if (GeomDetEnumerators::isTrackerPixel((*i)->subDetector())) {
         DetId detId = (*i)->geographicalId();
-  
+
         // Skip this module if it's on the list of modules to be ignored.
-        if (filterDeadModules &&
-            find(deadModulesBegin, deadModulesEnd, detId()) != deadModulesEnd) {
+        if (filterDeadModules && find(deadModulesBegin, deadModulesEnd, detId()) != deadModulesEnd) {
           continue;
         }
-  
+
         // Find all clusters in this module.
-        edmNew::DetSetVector<SiPixelCluster>::const_iterator iSearch =
-          pixelClusters->find(detId);
-  
+        edmNew::DetSetVector<SiPixelCluster>::const_iterator iSearch = pixelClusters->find(detId);
+
         // Loop over all clusters in this module.
         if (iSearch != pixelClusters->end()) {
-          for (edmNew::DetSet<SiPixelCluster>::const_iterator clus = iSearch->begin();
-               clus != iSearch->end(); ++clus) {
-      
-            if ((clus->size() >= fMinPixelsPerCluster) &&
-                (clus->charge() >= fMinClusterCharge)) {
-        
-              PixelGeomDetUnit const* theGeomDet =
-                dynamic_cast<PixelGeomDetUnit const*>(trackerGeo->idToDet(detId));
-              PixelTopology const* topol = &(theGeomDet->specificTopology());
+          for (edmNew::DetSet<SiPixelCluster>::const_iterator clus = iSearch->begin(); clus != iSearch->end(); ++clus) {
+            if ((clus->size() >= fMinPixelsPerCluster) && (clus->charge() >= fMinClusterCharge)) {
+              PixelGeomDetUnit const *theGeomDet = dynamic_cast<PixelGeomDetUnit const *>(trackerGeo->idToDet(detId));
+              PixelTopology const *topol = &(theGeomDet->specificTopology());
               double x = clus->x();
               double y = clus->y();
               LocalPoint clustLP = topol->localPosition(MeasurementPoint(x, y));
               GlobalPoint clustGP = theGeomDet->surface().toGlobal(clustLP);
               double charge = clus->charge() / 1.e3;
               int size = clus->size();
-        
+
               if (detId.subdetId() == PixelSubdetector::PixelBarrel) {
                 PixelBarrelNameUpgrade detName = PixelBarrelNameUpgrade(detId);
-                unsigned int layer = detName.layerName()-kOffsetLayers;
-                if (layer<kNumLayers) {
+                unsigned int layer = detName.layerName() - kOffsetLayers;
+                if (layer < kNumLayers) {
                   std::string histName;
-                  histName="clusPosBarrel"+std::to_string(layer);
+                  histName = "clusPosBarrel" + std::to_string(layer);
                   fHistContainerThisRun[histName]->Fill(clustGP.z(), clustGP.phi());
-                  histName="clusChargeBarrel"+std::to_string(layer);
+                  histName = "clusChargeBarrel" + std::to_string(layer);
                   fHistContainerThisRun[histName]->Fill(iEvent.bunchCrossing(), charge);
-                  histName="clusSizeBarrel"+std::to_string(layer);
+                  histName = "clusSizeBarrel" + std::to_string(layer);
                   fHistContainerThisRun[histName]->Fill(iEvent.bunchCrossing(), size);
                 } else {
-                  edm::LogWarning("pixelLumi")<<"higher layer number, "<<layer<<", than layers";
+                  edm::LogWarning("pixelLumi") << "higher layer number, " << layer << ", than layers";
                 }
               } else {
-                
                 // DEBUG DEBUG DEBUG
                 assert(detId.subdetId() == PixelSubdetector::PixelEndcap);
                 // DEBUG DEBUG DEBUG end
-                
+
                 PixelEndcapNameUpgrade detName = PixelEndcapNameUpgrade(detId);
                 unsigned int disk = detName.diskName() - kOffsetDisks;
-                if (disk<kNumDisks) {
+                if (disk < kNumDisks) {
                   std::string histName;
-                  histName="clusPosEndCap"+std::to_string(disk);
+                  histName = "clusPosEndCap" + std::to_string(disk);
                   fHistContainerThisRun[histName]->Fill(clustGP.x(), clustGP.y());
-                  histName="clusChargeEndCap"+std::to_string(disk);
+                  histName = "clusChargeEndCap" + std::to_string(disk);
                   fHistContainerThisRun[histName]->Fill(iEvent.bunchCrossing(), charge);
-                  histName="clusSizeEndCap"+std::to_string(disk);
+                  histName = "clusSizeEndCap" + std::to_string(disk);
                   fHistContainerThisRun[histName]->Fill(iEvent.bunchCrossing(), size);
                 } else {
-                  edm::LogWarning("pixelLumi")<<"higher disk number, "<<disk<<", than disks,"<<kNumDisks<<std::endl;
+                  edm::LogWarning("pixelLumi")
+                      << "higher disk number, " << disk << ", than disks," << kNumDisks << std::endl;
                 }
               }
             }
@@ -285,56 +251,57 @@ PixelLumiDQM::analyze(const edm::Event& iEvent,
       }
     }
   }
-} 
+}
 
-void
-PixelLumiDQM::bookHistograms(DQMStore::IBooker & ibooker, 
-                                  edm::Run const & run,
-                                  edm::EventSetup const & /* iSetup */)
-{
+void PixelLumiDQM::bookHistograms(DQMStore::IBooker &ibooker,
+                                  edm::Run const &run,
+                                  edm::EventSetup const & /* iSetup */) {
   edm::LogInfo("Status") << "Starting processing of run #" << run.id().run();
 
-  // Top folder containing high-level information about pixel and HF lumi.  
+  // Top folder containing high-level information about pixel and HF lumi.
   std::string folder = "PixelLumi/";
   ibooker.setCurrentFolder(folder);
-  
-  fHistTotalRecordedLumiByLS = ibooker.book1D("totalPixelLumiByLS","Pixel Lumi in nb vs LS",8000,0.5,8000.5);
-  fHistRecordedByBxCumulative = ibooker.book1D("PXLumiByBXsum","Pixel Lumi in nb by BX Cumulative vs LS",lastBunchCrossing,
-               0.5,float(lastBunchCrossing)+0.5);
+
+  fHistTotalRecordedLumiByLS = ibooker.book1D("totalPixelLumiByLS", "Pixel Lumi in nb vs LS", 8000, 0.5, 8000.5);
+  fHistRecordedByBxCumulative = ibooker.book1D("PXLumiByBXsum",
+                                               "Pixel Lumi in nb by BX Cumulative vs LS",
+                                               lastBunchCrossing,
+                                               0.5,
+                                               float(lastBunchCrossing) + 0.5);
 
   std::string subfolder = folder + "lastLS/";
   ibooker.setCurrentFolder(subfolder);
-  fHistRecordedByBxLastLumi = ibooker.book1D("PXByBXLastLumi","Pixel By BX Last Lumi",lastBunchCrossing+1,
-             -0.5,float(lastBunchCrossing)+0.5);
+  fHistRecordedByBxLastLumi = ibooker.book1D(
+      "PXByBXLastLumi", "Pixel By BX Last Lumi", lastBunchCrossing + 1, -0.5, float(lastBunchCrossing) + 0.5);
 
-  subfolder = folder+"ClusterCountingDetails/";
+  subfolder = folder + "ClusterCountingDetails/";
   ibooker.setCurrentFolder(subfolder);
 
-  fHistnBClusVsLS[0] = ibooker.book1D("nBClusVsLS_0","Fraction of Clusters vs LS Barrel layer 0",8000,0.5,8000.5);
-  fHistnBClusVsLS[1] = ibooker.book1D("nBClusVsLS_1","Fraction of Clusters vs LS Barrel layer 1",8000,0.5,8000.5);
-  fHistnBClusVsLS[2] = ibooker.book1D("nBClusVsLS_2","Fraction of Clusters vs LS Barrel layer 2",8000,0.5,8000.5);
-  fHistnFPClusVsLS[0] = ibooker.book1D("nFPClusVsLS_0","Fraction of Clusters vs LS Barrel layer 0",8000,0.5,8000.5);
-  fHistnFPClusVsLS[1] = ibooker.book1D("nFPClusVsLS_1","Fraction of Clusters vs LS Barrel layer 1",8000,0.5,8000.5);
-  fHistnFMClusVsLS[0] = ibooker.book1D("nFMClusVsLS_0","Fraction of Clusters vs LS Barrel layer 0",8000,0.5,8000.5);
-  fHistnFMClusVsLS[1] = ibooker.book1D("nFMClusVsLS_1","Fraction of Clusters vs LS Barrel layer 1",8000,0.5,8000.5);
-  fHistBunchCrossings = ibooker.book1D("BunchCrossings","Cumulative Bunch Crossings",lastBunchCrossing,
-         0.5,float(lastBunchCrossing)+0.5);
-  fHistBunchCrossingsLastLumi = ibooker.book1D("BunchCrossingsLL","Bunch Crossings Last Lumi",lastBunchCrossing,
-           0.5,float(lastBunchCrossing)+0.5);
-  fHistClusterCountByBxLastLumi = ibooker.book1D("ClusterCountByBxLL","Cluster Count by BX Last Lumi",lastBunchCrossing,
-           0.5,float(lastBunchCrossing)+0.5);
-  fHistClusterCountByBxCumulative = ibooker.book1D("ClusterCountByBxSum","Cluster Count by BX Cumulative",lastBunchCrossing,
-           0.5,float(lastBunchCrossing)+0.5);
-  fHistClusByLS = ibooker.book1D("totalClusByLS","Number of Clusters all dets vs LS",8000,0.5,8000.5);
+  fHistnBClusVsLS[0] = ibooker.book1D("nBClusVsLS_0", "Fraction of Clusters vs LS Barrel layer 0", 8000, 0.5, 8000.5);
+  fHistnBClusVsLS[1] = ibooker.book1D("nBClusVsLS_1", "Fraction of Clusters vs LS Barrel layer 1", 8000, 0.5, 8000.5);
+  fHistnBClusVsLS[2] = ibooker.book1D("nBClusVsLS_2", "Fraction of Clusters vs LS Barrel layer 2", 8000, 0.5, 8000.5);
+  fHistnFPClusVsLS[0] = ibooker.book1D("nFPClusVsLS_0", "Fraction of Clusters vs LS Barrel layer 0", 8000, 0.5, 8000.5);
+  fHistnFPClusVsLS[1] = ibooker.book1D("nFPClusVsLS_1", "Fraction of Clusters vs LS Barrel layer 1", 8000, 0.5, 8000.5);
+  fHistnFMClusVsLS[0] = ibooker.book1D("nFMClusVsLS_0", "Fraction of Clusters vs LS Barrel layer 0", 8000, 0.5, 8000.5);
+  fHistnFMClusVsLS[1] = ibooker.book1D("nFMClusVsLS_1", "Fraction of Clusters vs LS Barrel layer 1", 8000, 0.5, 8000.5);
+  fHistBunchCrossings = ibooker.book1D(
+      "BunchCrossings", "Cumulative Bunch Crossings", lastBunchCrossing, 0.5, float(lastBunchCrossing) + 0.5);
+  fHistBunchCrossingsLastLumi = ibooker.book1D(
+      "BunchCrossingsLL", "Bunch Crossings Last Lumi", lastBunchCrossing, 0.5, float(lastBunchCrossing) + 0.5);
+  fHistClusterCountByBxLastLumi = ibooker.book1D(
+      "ClusterCountByBxLL", "Cluster Count by BX Last Lumi", lastBunchCrossing, 0.5, float(lastBunchCrossing) + 0.5);
+  fHistClusterCountByBxCumulative = ibooker.book1D(
+      "ClusterCountByBxSum", "Cluster Count by BX Cumulative", lastBunchCrossing, 0.5, float(lastBunchCrossing) + 0.5);
+  fHistClusByLS = ibooker.book1D("totalClusByLS", "Number of Clusters all dets vs LS", 8000, 0.5, 8000.5);
 
   // Add some pixel cluster quality check histograms (in a subfolder).
-  subfolder = folder+"qualityChecks/";
+  subfolder = folder + "qualityChecks/";
   ibooker.setCurrentFolder(subfolder);
-  
+
   if (fIncludePixelQualCheckHistos) {
     // Create histograms for this run if not already present in our list.
     edm::LogInfo("Status") << "Creating histograms for run #" << run.id().run();
-    
+
     // Pixel cluster positions in the barrel - (z, phi).
     for (size_t i = 0; i <= kNumLayers; ++i) {
       std::stringstream key;
@@ -343,12 +310,10 @@ PixelLumiDQM::bookHistograms(DQMStore::IBooker & ibooker,
       name << key.str() << "_" << run.run();
       std::stringstream title;
       title << "Pixel cluster position - barrel layer " << i;
-      fHistContainerThisRun[key.str()] = ibooker.book2D(name.str().c_str(),
-              title.str().c_str(),
-              100, -30., 30.,
-              64, -Geom::pi(), Geom::pi());
+      fHistContainerThisRun[key.str()] =
+          ibooker.book2D(name.str().c_str(), title.str().c_str(), 100, -30., 30., 64, -Geom::pi(), Geom::pi());
     }
-    
+
     // Pixel cluster positions in the endcaps (x, y).
     for (size_t i = 0; i <= kNumDisks; ++i) {
       std::stringstream key;
@@ -357,12 +322,10 @@ PixelLumiDQM::bookHistograms(DQMStore::IBooker & ibooker,
       name << key.str() << "_" << run.run();
       std::stringstream title;
       title << "Pixel cluster position - endcap disk " << i;
-      fHistContainerThisRun[key.str()] = ibooker.book2D(name.str().c_str(),
-              title.str().c_str(),
-              100, -20., 20.,
-              100, -20., 20.);
+      fHistContainerThisRun[key.str()] =
+          ibooker.book2D(name.str().c_str(), title.str().c_str(), 100, -20., 20., 100, -20., 20.);
     }
-    
+
     // Pixel cluster charge in the barrel, per bx.
     for (size_t i = 0; i <= kNumLayers; ++i) {
       std::stringstream key;
@@ -371,10 +334,8 @@ PixelLumiDQM::bookHistograms(DQMStore::IBooker & ibooker,
       name << key.str() << "_" << run.run();
       std::stringstream title;
       title << "Pixel cluster charge - barrel layer " << i;
-      fHistContainerThisRun[key.str()] = ibooker.book2D(name.str().c_str(),
-              title.str().c_str(),
-              3564, .5, 3564.5,
-              100, 0., 100.);
+      fHistContainerThisRun[key.str()] =
+          ibooker.book2D(name.str().c_str(), title.str().c_str(), 3564, .5, 3564.5, 100, 0., 100.);
     }
 
     // Pixel cluster charge in the endcaps, per bx.
@@ -385,12 +346,9 @@ PixelLumiDQM::bookHistograms(DQMStore::IBooker & ibooker,
       name << key.str() << "_" << run.run();
       std::stringstream title;
       title << "Pixel cluster charge - endcap disk " << i;
-      fHistContainerThisRun[key.str()] = ibooker.book2D(name.str().c_str(),
-                                  title.str().c_str(),
-                                  3564, .5, 3564.5,
-                                  100, 0., 100.);
+      fHistContainerThisRun[key.str()] =
+          ibooker.book2D(name.str().c_str(), title.str().c_str(), 3564, .5, 3564.5, 100, 0., 100.);
     }
-    
 
     // Pixel cluster size in the barrel, per bx.
     for (size_t i = 0; i <= kNumLayers; ++i) {
@@ -400,10 +358,8 @@ PixelLumiDQM::bookHistograms(DQMStore::IBooker & ibooker,
       name << key.str() << "_" << run.run();
       std::stringstream title;
       title << "Pixel cluster size - barrel layer " << i;
-      fHistContainerThisRun[key.str()] = ibooker.book2D(name.str().c_str(),
-                                  title.str().c_str(),
-                                  3564, .5, 3564.5,
-                                  100, 0., 100.);
+      fHistContainerThisRun[key.str()] =
+          ibooker.book2D(name.str().c_str(), title.str().c_str(), 3564, .5, 3564.5, 100, 0., 100.);
     }
 
     // Pixel cluster size in the endcaps, per bx.
@@ -414,131 +370,112 @@ PixelLumiDQM::bookHistograms(DQMStore::IBooker & ibooker,
       name << key.str() << "_" << run.run();
       std::stringstream title;
       title << "Pixel cluster size - endcap disk " << i;
-      fHistContainerThisRun[key.str()] = ibooker.book2D(name.str().c_str(),
-                                  title.str().c_str(),
-                                  3564, .5, 3564.5,
-                                  100, 0., 100.);
+      fHistContainerThisRun[key.str()] =
+          ibooker.book2D(name.str().c_str(), title.str().c_str(), 3564, .5, 3564.5, 100, 0., 100.);
     }
   }
 }
 
 // ------------ Method called when ending the processing of a run.  ------------
-void
-PixelLumiDQM::dqmBeginRun(edm::Run const&, edm::EventSetup const&)
-{
-}
+void PixelLumiDQM::dqmBeginRun(edm::Run const &, edm::EventSetup const &) {}
 
 // ------------ Method called when ending the processing of a run.  ------------
-void
-PixelLumiDQM::endRun(edm::Run const&, edm::EventSetup const&)
-{
-}
-
+void PixelLumiDQM::endRun(edm::Run const &, edm::EventSetup const &) {}
 
-// ------------ Method called when starting to process a luminosity block.  ------------
-void
-PixelLumiDQM::beginLuminosityBlock(edm::LuminosityBlock const&lumiBlock,
-           edm::EventSetup const&)
-{
+// ------------ Method called when starting to process a luminosity block.
+// ------------
+void PixelLumiDQM::beginLuminosityBlock(edm::LuminosityBlock const &lumiBlock, edm::EventSetup const &) {
   // Only reset and fill every fResetIntervalInLumiSections (default is 1 LS)
-  // Return unless the PREVIOUS LS was at the right modulo value 
+  // Return unless the PREVIOUS LS was at the right modulo value
   // (e.g. is resetinterval = 5 the rest will only be executed at LS=6
   // NB: reset is done here so the histograms by LS are sent before resetting.
   // NB: not being used for now since default is 1 LS. There is a bug here.
 
   unsigned int ls = lumiBlock.luminosityBlockAuxiliary().luminosityBlock();
 
-  if((ls-1)%fResetIntervalInLumiSections==0){
+  if ((ls - 1) % fResetIntervalInLumiSections == 0) {
     fHistBunchCrossingsLastLumi->Reset();
     fHistClusterCountByBxLastLumi->Reset();
     fHistRecordedByBxLastLumi->Reset();
   }
 }
 
-
-// ------------ Method called when ending the processing of a luminosity block.  ------------
-void
-PixelLumiDQM::endLuminosityBlock(edm::LuminosityBlock const& lumiBlock,
-         edm::EventSetup const&es)
-{
-  
+// ------------ Method called when ending the processing of a luminosity block.
+// ------------
+void PixelLumiDQM::endLuminosityBlock(edm::LuminosityBlock const &lumiBlock, edm::EventSetup const &es) {
   unsigned int ls = lumiBlock.luminosityBlockAuxiliary().luminosityBlock();
-  
+
   // Only fill every fResetIntervalInLumiSections (default is 1 LS)
-  if(ls%fResetIntervalInLumiSections!=0) return;
-  
-  printf("Lumi Block = %d\n",ls);
+  if (ls % fResetIntervalInLumiSections != 0)
+    return;
 
-  if((ls-1)%fResetIntervalInLumiSections==0){
+  printf("Lumi Block = %d\n", ls);
+
+  if ((ls - 1) % fResetIntervalInLumiSections == 0) {
   }
-  
-  unsigned int nBClus[3] = {0,0,0};
+
+  unsigned int nBClus[3] = {0, 0, 0};
   unsigned int nFPClus[2] = {0, 0};
   unsigned int nFMClus[2] = {0, 0};
-  
+
   double total_recorded = 0.;
   double total_recorded_unc_square = 0.;
-  
-  // Obtain bunch-by-bunch cluster counts and compute totals for lumi calculation.
+
+  // Obtain bunch-by-bunch cluster counts and compute totals for lumi
+  // calculation.
   double totalcounts = 0.0;
   double etotalcounts = 0.0;
   double totalevents = 0.0;
   double lumi_factor_per_bx = 0.0;
-  if(useInnerBarrelLayer) 
-    lumi_factor_per_bx = FREQ_ORBIT * SECONDS_PER_LS * fResetIntervalInLumiSections / XSEC_PIXEL_CLUSTER  ;
+  if (useInnerBarrelLayer)
+    lumi_factor_per_bx = FREQ_ORBIT * SECONDS_PER_LS * fResetIntervalInLumiSections / XSEC_PIXEL_CLUSTER;
   else
-    lumi_factor_per_bx = FREQ_ORBIT * SECONDS_PER_LS * fResetIntervalInLumiSections / rXSEC_PIXEL_CLUSTER  ;
-  
-  for(std::map<int, PixelClusterCount>::iterator it = fNumPixelClusters.begin();
-      it != fNumPixelClusters.end(); it++) {
-    
+    lumi_factor_per_bx = FREQ_ORBIT * SECONDS_PER_LS * fResetIntervalInLumiSections / rXSEC_PIXEL_CLUSTER;
+
+  for (std::map<int, PixelClusterCount>::iterator it = fNumPixelClusters.begin(); it != fNumPixelClusters.end(); it++) {
     // Sum all clusters for this BX.
-    unsigned int total = (*it).second.numB.at(1)+
-      (*it).second.numB.at(2)+(*it).second.numFP.at(0)+(*it).second.numFP.at(1)+
-      (*it).second.numFM.at(0)+(*it).second.numFM.at(1);
-    if(useInnerBarrelLayer) total+=(*it).second.numB.at(0);
+    unsigned int total = (*it).second.numB.at(1) + (*it).second.numB.at(2) + (*it).second.numFP.at(0) +
+                         (*it).second.numFP.at(1) + (*it).second.numFM.at(0) + (*it).second.numFM.at(1);
+    if (useInnerBarrelLayer)
+      total += (*it).second.numB.at(0);
     totalcounts += total;
-    double etotal = (*it).second.dnumB.at(1)+
-      (*it).second.dnumB.at(2)+(*it).second.dnumFP.at(0)+(*it).second.dnumFP.at(1)+
-      (*it).second.dnumFM.at(0)+(*it).second.dnumFM.at(1);
-    if(useInnerBarrelLayer) etotal = (*it).second.dnumB.at(0);
+    double etotal = (*it).second.dnumB.at(1) + (*it).second.dnumB.at(2) + (*it).second.dnumFP.at(0) +
+                    (*it).second.dnumFP.at(1) + (*it).second.dnumFM.at(0) + (*it).second.dnumFM.at(1);
+    if (useInnerBarrelLayer)
+      etotal = (*it).second.dnumB.at(0);
     etotalcounts += etotal;
     etotal = sqrt(etotal);
 
-    fHistClusterCountByBxLastLumi->setBinContent((*it).first,total);
-    fHistClusterCountByBxLastLumi->setBinError((*it).first,etotal);
-    fHistClusterCountByBxCumulative->setBinContent((*it).first,fHistClusterCountByBxCumulative->getBinContent((*it).first)+total);
-    
+    fHistClusterCountByBxLastLumi->setBinContent((*it).first, total);
+    fHistClusterCountByBxLastLumi->setBinError((*it).first, etotal);
+    fHistClusterCountByBxCumulative->setBinContent((*it).first,
+                                                   fHistClusterCountByBxCumulative->getBinContent((*it).first) + total);
+
     unsigned int events_per_bx = fHistBunchCrossingsLastLumi->getBinContent((*it).first);
     totalevents += events_per_bx;
-    double average_cluster_count = events_per_bx !=0 ? double(total)/events_per_bx : 0.;
-    double average_cluster_count_unc = events_per_bx!=0 ? etotal/events_per_bx : 0.;
-    double pixel_bx_lumi_per_ls =  lumi_factor_per_bx * average_cluster_count / CM2_TO_NANOBARN ;
+    double average_cluster_count = events_per_bx != 0 ? double(total) / events_per_bx : 0.;
+    double average_cluster_count_unc = events_per_bx != 0 ? etotal / events_per_bx : 0.;
+    double pixel_bx_lumi_per_ls = lumi_factor_per_bx * average_cluster_count / CM2_TO_NANOBARN;
     double pixel_bx_lumi_per_ls_unc = 0.0;
-    if(useInnerBarrelLayer) 
-      pixel_bx_lumi_per_ls_unc = sqrt(lumi_factor_per_bx*lumi_factor_per_bx *
-              (average_cluster_count_unc*average_cluster_count_unc +
-               (average_cluster_count*  XSEC_PIXEL_CLUSTER_UNC /
-          XSEC_PIXEL_CLUSTER )*
-               (average_cluster_count*  XSEC_PIXEL_CLUSTER / 
-          XSEC_PIXEL_CLUSTER ))
-              ) / CM2_TO_NANOBARN ;
+    if (useInnerBarrelLayer)
+      pixel_bx_lumi_per_ls_unc = sqrt(lumi_factor_per_bx * lumi_factor_per_bx *
+                                      (average_cluster_count_unc * average_cluster_count_unc +
+                                       (average_cluster_count * XSEC_PIXEL_CLUSTER_UNC / XSEC_PIXEL_CLUSTER) *
+                                           (average_cluster_count * XSEC_PIXEL_CLUSTER / XSEC_PIXEL_CLUSTER))) /
+                                 CM2_TO_NANOBARN;
     else
-      pixel_bx_lumi_per_ls_unc = sqrt(lumi_factor_per_bx*lumi_factor_per_bx *
-              (average_cluster_count_unc*average_cluster_count_unc +
-               (average_cluster_count*  rXSEC_PIXEL_CLUSTER_UNC /
-          rXSEC_PIXEL_CLUSTER )*
-               (average_cluster_count*  rXSEC_PIXEL_CLUSTER / 
-          rXSEC_PIXEL_CLUSTER ))
-              ) / CM2_TO_NANOBARN ;
-    
-    fHistRecordedByBxLastLumi->setBinContent((*it).first,pixel_bx_lumi_per_ls);
-    fHistRecordedByBxLastLumi->setBinError((*it).first,pixel_bx_lumi_per_ls_unc);
-    
-    fHistRecordedByBxCumulative->setBinContent((*it).first,
-                 fHistRecordedByBxCumulative->getBinContent((*it).first)+
-                 pixel_bx_lumi_per_ls);
-    
+      pixel_bx_lumi_per_ls_unc = sqrt(lumi_factor_per_bx * lumi_factor_per_bx *
+                                      (average_cluster_count_unc * average_cluster_count_unc +
+                                       (average_cluster_count * rXSEC_PIXEL_CLUSTER_UNC / rXSEC_PIXEL_CLUSTER) *
+                                           (average_cluster_count * rXSEC_PIXEL_CLUSTER / rXSEC_PIXEL_CLUSTER))) /
+                                 CM2_TO_NANOBARN;
+
+    fHistRecordedByBxLastLumi->setBinContent((*it).first, pixel_bx_lumi_per_ls);
+    fHistRecordedByBxLastLumi->setBinError((*it).first, pixel_bx_lumi_per_ls_unc);
+
+    fHistRecordedByBxCumulative->setBinContent(
+        (*it).first, fHistRecordedByBxCumulative->getBinContent((*it).first) + pixel_bx_lumi_per_ls);
+
     /*
       if(fHistRecordedByBxLastLumi->getBinContent((*it).first)!=0.)
       fHistRecordedByBxLastLumi->getBinContent((*it).first));
@@ -546,136 +483,138 @@ PixelLumiDQM::endLuminosityBlock(edm::LuminosityBlock const& lumiBlock,
       fHistRecordedByBxCumulative->getBinContent((*it).first));
     */
 
-    nBClus[0] +=(*it).second.numB.at(0);
-    nBClus[1] +=(*it).second.numB.at(1);
-    nBClus[2] +=(*it).second.numB.at(2);
-    nFPClus[0] +=(*it).second.numFP.at(0);
-    nFPClus[1] +=(*it).second.numFP.at(1);
-    nFMClus[0] +=(*it).second.numFM.at(0);
-    nFMClus[1] +=(*it).second.numFM.at(1);
-    
-    // Reset counters 
+    nBClus[0] += (*it).second.numB.at(0);
+    nBClus[1] += (*it).second.numB.at(1);
+    nBClus[2] += (*it).second.numB.at(2);
+    nFPClus[0] += (*it).second.numFP.at(0);
+    nFPClus[1] += (*it).second.numFP.at(1);
+    nFMClus[0] += (*it).second.numFM.at(0);
+    nFMClus[1] += (*it).second.numFM.at(1);
+
+    // Reset counters
     (*it).second.Reset();
 
-    // edm::LogWarning("pixelLumi") << "bx="<< (*it).first << " clusters=" << (*it).second.numB.at(0)); 
+    // edm::LogWarning("pixelLumi") << "bx="<< (*it).first << " clusters=" <<
+    // (*it).second.numB.at(0));
   }
 
-  if((filledAndUnmaskedBunches = calculateBunchMask(fHistClusterCountByBxCumulative,bunchTriggerMask))!=0){
-    for(unsigned int i = 0; i<= lastBunchCrossing; i++){
-      if(bunchTriggerMask[i]){ 
+  if ((filledAndUnmaskedBunches = calculateBunchMask(fHistClusterCountByBxCumulative, bunchTriggerMask)) != 0) {
+    for (unsigned int i = 0; i <= lastBunchCrossing; i++) {
+      if (bunchTriggerMask[i]) {
         double err = fHistRecordedByBxLastLumi->getBinError(i);
         total_recorded += fHistRecordedByBxLastLumi->getBinContent(i);
-        total_recorded_unc_square += err*err;
+        total_recorded_unc_square += err * err;
       }
     }
-    
-    // Replace the total obtained by summing over BXs with the average per BX from the total cluster count and rescale 
-    
-    if(totalevents > 10){
-      total_recorded = lumi_factor_per_bx * totalcounts / totalevents / CM2_TO_NANOBARN ;
-    }
-    else total_recorded = 0.0;
-    
-    edm::LogWarning("pixelLumi") << " Total recorded " << total_recorded ;
-    fHistTotalRecordedLumiByLS->setBinContent(ls,total_recorded);
-    fHistTotalRecordedLumiByLS->setBinError(ls,
-              sqrt(total_recorded_unc_square));
+
+    // Replace the total obtained by summing over BXs with the average per BX
+    // from the total cluster count and rescale
+
+    if (totalevents > 10) {
+      total_recorded = lumi_factor_per_bx * totalcounts / totalevents / CM2_TO_NANOBARN;
+    } else
+      total_recorded = 0.0;
+
+    edm::LogWarning("pixelLumi") << " Total recorded " << total_recorded;
+    fHistTotalRecordedLumiByLS->setBinContent(ls, total_recorded);
+    fHistTotalRecordedLumiByLS->setBinError(ls, sqrt(total_recorded_unc_square));
   }
   // fill cluster counts by detector regions for sanity checks
   unsigned int all_detectors_counts = 0;
-  for(unsigned int i = 0; i < 3; i++){
-    all_detectors_counts+=nBClus[i];
+  for (unsigned int i = 0; i < 3; i++) {
+    all_detectors_counts += nBClus[i];
   }
-  for(unsigned int i = 0; i < 2; i++){
-    all_detectors_counts+=nFPClus[i];
+  for (unsigned int i = 0; i < 2; i++) {
+    all_detectors_counts += nFPClus[i];
   }
-  for(unsigned int i = 0; i < 2; i++){
-    all_detectors_counts+=nFMClus[i];
+  for (unsigned int i = 0; i < 2; i++) {
+    all_detectors_counts += nFMClus[i];
   }
-  
+
   fHistClusByLS->setBinContent(ls, all_detectors_counts);
-  
-  for(unsigned int i = 0; i < 3; i++){
-    fHistnBClusVsLS[i]->setBinContent(ls, 
-              float(nBClus[i])/float(all_detectors_counts));
+
+  for (unsigned int i = 0; i < 3; i++) {
+    fHistnBClusVsLS[i]->setBinContent(ls, float(nBClus[i]) / float(all_detectors_counts));
   }
-  for(unsigned int i = 0; i < 2; i++){
-    fHistnFPClusVsLS[i]->setBinContent(ls, 
-               float(nFPClus[i])/float(all_detectors_counts));
+  for (unsigned int i = 0; i < 2; i++) {
+    fHistnFPClusVsLS[i]->setBinContent(ls, float(nFPClus[i]) / float(all_detectors_counts));
   }
-  for(unsigned int i = 0; i < 2; i++){
-    fHistnFMClusVsLS[i]->setBinContent(ls, 
-               float(nFMClus[i])/float(all_detectors_counts));
+  for (unsigned int i = 0; i < 2; i++) {
+    fHistnFMClusVsLS[i]->setBinContent(ls, float(nFMClus[i]) / float(all_detectors_counts));
   }
-  
-  logFile_.open(fLogFileName_.c_str(),std::ios_base::trunc);    
+
+  logFile_.open(fLogFileName_.c_str(), std::ios_base::trunc);
 
   timeval tv;
-  gettimeofday(&tv,nullptr);
+  gettimeofday(&tv, nullptr);
   tm *ts = gmtime(&tv.tv_sec);
   char datestring[256];
-  strftime(datestring, sizeof(datestring),"%Y.%m.%d %T GMT %s",ts);
-  logFile_ << "RunNumber "<< fRunNo << std::endl;
+  strftime(datestring, sizeof(datestring), "%Y.%m.%d %T GMT %s", ts);
+  logFile_ << "RunNumber " << fRunNo << std::endl;
   logFile_ << "EndTimeOfFit " << datestring << std::endl;
-  logFile_ << "LumiRange "<< ls << "-" << ls << std::endl;
-  logFile_ << "Fill "<< -99 << std::endl;
-  logFile_ << "ActiveBunchCrossings "<< filledAndUnmaskedBunches << std::endl;
-  logFile_ << "PixelLumi "<< fHistTotalRecordedLumiByLS->getBinContent(ls) * 0.98 << std::endl;
-  logFile_ << "HFLumi "<< -99 << std::endl;
+  logFile_ << "LumiRange " << ls << "-" << ls << std::endl;
+  logFile_ << "Fill " << -99 << std::endl;
+  logFile_ << "ActiveBunchCrossings " << filledAndUnmaskedBunches << std::endl;
+  logFile_ << "PixelLumi " << fHistTotalRecordedLumiByLS->getBinContent(ls) * 0.98 << std::endl;
+  logFile_ << "HFLumi " << -99 << std::endl;
   logFile_ << "Ratio " << -99 << std::endl;
   logFile_.close();
 }
 
-unsigned int PixelLumiDQM::calculateBunchMask(MonitorElement *e, std::vector<bool> &mask){
+unsigned int PixelLumiDQM::calculateBunchMask(MonitorElement *e, std::vector<bool> &mask) {
   unsigned int nbins = e->getNbinsX();
-  std::vector<float> ar(nbins,0.);
-  for(unsigned int i = 1; i<= nbins; i++){
+  std::vector<float> ar(nbins, 0.);
+  for (unsigned int i = 1; i <= nbins; i++) {
     ar[i] = e->getBinContent(i);
   }
-  return calculateBunchMask(ar,nbins,mask);
+  return calculateBunchMask(ar, nbins, mask);
 }
-unsigned int PixelLumiDQM::calculateBunchMask(std::vector<float> &e, unsigned int nbins, std::vector<bool> &mask){
-  // Take the cumulative cluster count histogram and find max and average of non-empty bins.
+unsigned int PixelLumiDQM::calculateBunchMask(std::vector<float> &e, unsigned int nbins, std::vector<bool> &mask) {
+  // Take the cumulative cluster count histogram and find max and average of
+  // non-empty bins.
   unsigned int active_count = 0;
   double maxc = 0.0;
-  double ave = 0.0; // Average of non-empty bins
+  double ave = 0.0;  // Average of non-empty bins
   unsigned int non_empty_bins = 0;
-  
-  for(unsigned int i = 1; i<= nbins; i++){
+
+  for (unsigned int i = 1; i <= nbins; i++) {
     double bin = e[i];
-    if(bin !=0.0){
-      if(maxc<bin) maxc = bin;
+    if (bin != 0.0) {
+      if (maxc < bin)
+        maxc = bin;
       ave += bin;
       non_empty_bins++;
-    }      
+    }
   }
-  
+
   ave /= non_empty_bins;
   edm::LogWarning("pixelLumi") << "Bunch mask finder - non empty bins " << non_empty_bins
-      << " average of non empty bins " << ave 
-      << " max content of one bin " << maxc;
+                               << " average of non empty bins " << ave << " max content of one bin " << maxc;
   double mean = 0.;
   double sigma = 0.;
-  if(non_empty_bins < 50){
+  if (non_empty_bins < 50) {
     mean = maxc;
-    sigma = (maxc)/20;
-  }    
-  else{
-    TH1F dist("dist","dist",500,0.,maxc+(maxc/500.)*20.);
-    for(unsigned int i = 1; i<= nbins; i++){
+    sigma = (maxc) / 20;
+  } else {
+    TH1F dist("dist", "dist", 500, 0., maxc + (maxc / 500.) * 20.);
+    for (unsigned int i = 1; i <= nbins; i++) {
       double bin = e[i];
       dist.Fill(bin);
-    }  
-    TF1 fit("plgaus","gaus");
-    dist.Fit(&fit,"","",fmax(0.,ave-(maxc-ave)/5.),maxc);
+    }
+    TF1 fit("plgaus", "gaus");
+    dist.Fit(&fit, "", "", fmax(0., ave - (maxc - ave) / 5.), maxc);
     mean = fit.GetParameter("Mean");
     sigma = fit.GetParameter("Sigma");
   }
   edm::LogWarning("pixelLumi") << "Bunch mask will use mean" << mean << " sigma " << sigma;
-  // Active BX defined as those which have nclus within fixed standard deviations of peak.
-  for(unsigned int i = 1; i<= nbins; i++){
+  // Active BX defined as those which have nclus within fixed standard
+  // deviations of peak.
+  for (unsigned int i = 1; i <= nbins; i++) {
     double bin = e[i];
-    if(bin>0. && std::abs(bin-mean)<5.*(sigma)){ mask[i]=true; active_count++;}
+    if (bin > 0. && std::abs(bin - mean) < 5. * (sigma)) {
+      mask[i] = true;
+      active_count++;
+    }
   }
   edm::LogWarning("pixelLumi") << "Bunch mask finds " << active_count << " active bunch crossings ";
   //   edm::LogWarning("pixelLumi") << "this is the full bx mask " ;
diff --git a/DQM/PixelLumi/plugins/PixelLumiDQM.h b/DQM/PixelLumi/plugins/PixelLumiDQM.h
old mode 100755
new mode 100644
index 3798d8b353177..ed931c3235d32
--- a/DQM/PixelLumi/plugins/PixelLumiDQM.h
+++ b/DQM/PixelLumi/plugins/PixelLumiDQM.h
@@ -3,20 +3,22 @@
 // Package:    PixelLumiDQM
 // Class:      PixelLumiDQM
 
-/**\class PixelLumiDQM PixelLumiDQM.h PixelLumi/PixelLumiDQM/plugins/PixelLumiDQM.h
+/**\class PixelLumiDQM PixelLumiDQM.h
+ PixelLumi/PixelLumiDQM/plugins/PixelLumiDQM.h
 
  Description: DQM Module producing Pixel Cluster Count Luminosity
 
  Implementation notes:
      1) Filling scheme is put in by 'hand' for now.
-        Can obtain it from the cluster count but need higher rate in trigger; 
-	Best would be to have filling scheme in the DB. 
+        Can obtain it from the cluster count but need higher rate in trigger;
+        Best would be to have filling scheme in the DB.
      2) Afterglow correction is put in by hand.
-     3) Currently barrel layer 0 is excluded, but a version using all pixel layers and disks is also in place.
-     4) A stable beam flag should be obtained from the DB to turn on actual checks. 
-        (Pixel Lumi does not make sense outside stable beams.)
-     5) Need a top module to correlate the info from the three trigger categories.
-        NB: at present the module only uses the ZeroBias trigger providing about 85 Hz.
+     3) Currently barrel layer 0 is excluded, but a version using all pixel
+ layers and disks is also in place. 4) A stable beam flag should be obtained
+ from the DB to turn on actual checks. (Pixel Lumi does not make sense outside
+ stable beams.) 5) Need a top module to correlate the info from the three
+ trigger categories. NB: at present the module only uses the ZeroBias trigger
+ providing about 85 Hz.
 */
 
 // Original author:   Amita Raval
@@ -24,47 +26,45 @@
 #ifndef __PixelLumi_PixelLumiDQM_PixelLumiDQM_h__
 #define __PixelLumi_PixelLumiDQM_PixelLumiDQM_h__
 
-#include <vector>
+#include <fstream>
 #include <map>
 #include <string>
-#include <fstream>
+#include <vector>
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 class ConfigurationDescriptions;
 
 class PixelLumiDQM : public one::DQMEDAnalyzer<edm::one::WatchLuminosityBlocks> {
 public:
-  explicit PixelLumiDQM(const edm::ParameterSet&);
+  explicit PixelLumiDQM(const edm::ParameterSet &);
   ~PixelLumiDQM() override;
   static constexpr double FREQ_ORBIT = 11245.5;
-  static constexpr double SECONDS_PER_LS = double(0x40000)/double(FREQ_ORBIT);
+  static constexpr double SECONDS_PER_LS = double(0x40000) / double(FREQ_ORBIT);
 
   // Using all pixel clusters:
-  static constexpr double XSEC_PIXEL_CLUSTER = 10.08e-24; //in cm^2
+  static constexpr double XSEC_PIXEL_CLUSTER = 10.08e-24;  // in cm^2
   static constexpr double XSEC_PIXEL_CLUSTER_UNC = 0.17e-24;
 
   // Excluding the inner barrel layer.
-  static constexpr double rXSEC_PIXEL_CLUSTER = 9.4e-24; //in cm^2
+  static constexpr double rXSEC_PIXEL_CLUSTER = 9.4e-24;  // in cm^2
   static constexpr double rXSEC_PIXEL_CLUSTER_UNC = 0.119e-24;
-  static constexpr double CM2_TO_NANOBARN = 1.0/1.e-33;
+  static constexpr double CM2_TO_NANOBARN = 1.0 / 1.e-33;
   static const unsigned int lastBunchCrossing = 3564;
 
-  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 
 private:
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const&) override;
-  void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override;
-  void endRun(edm::Run const&, edm::EventSetup const&) override;
-  void beginLuminosityBlock(edm::LuminosityBlock const&,
-                                    edm::EventSetup const&) override;
-  void endLuminosityBlock(edm::LuminosityBlock const&,
-                                  edm::EventSetup const&) override;
-
-  // This is a kludge method to infer the filled bunches from the cluster count;  
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
+  void endRun(edm::Run const &, edm::EventSetup const &) override;
+  void beginLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
+  void endLuminosityBlock(edm::LuminosityBlock const &, edm::EventSetup const &) override;
+
+  // This is a kludge method to infer the filled bunches from the cluster count;
   // notice that this cannot be used with random triggers.
   // The filling scheme should be acquired from the database once it's there.
 
@@ -79,26 +79,24 @@ class PixelLumiDQM : public one::DQMEDAnalyzer<edm::one::WatchLuminosityBlocks>
   static constexpr size_t kOffsetDisks = 4;
 
   class PixelClusterCount {
-    // B for barrel, F for forwared, M for minus, P for plus side, 
+    // B for barrel, F for forwared, M for minus, P for plus side,
     // O for outer and I for inner. Numbers used for layers.
   public:
-    PixelClusterCount() :
-      numB(kNumLayers, 0),
-      numFM(kNumDisks, 0),
-      numFP(kNumDisks, 0),
-      dnumB(kNumLayers, 0.0),
-      dnumFM(kNumDisks, 0.0),
-      dnumFP(kNumDisks, 0.0)
-
-    {
-    }
-    void Reset()
-    {
-      for(unsigned int i  = 0 ; i< numB.size(); i++){
-        numB[i]=0;
-        dnumB[i]=0.0;
+    PixelClusterCount()
+        : numB(kNumLayers, 0),
+          numFM(kNumDisks, 0),
+          numFP(kNumDisks, 0),
+          dnumB(kNumLayers, 0.0),
+          dnumFM(kNumDisks, 0.0),
+          dnumFP(kNumDisks, 0.0)
+
+    {}
+    void Reset() {
+      for (unsigned int i = 0; i < numB.size(); i++) {
+        numB[i] = 0;
+        dnumB[i] = 0.0;
       }
-      for(unsigned int i  = 0 ; i< numFM.size(); i++){
+      for (unsigned int i = 0; i < numFM.size(); i++) {
         numFM[i] = 0;
         numFP[i] = 0;
         dnumFM[i] = 0.0;
@@ -111,10 +109,11 @@ class PixelLumiDQM : public one::DQMEDAnalyzer<edm::one::WatchLuminosityBlocks>
     std::vector<double> dnumB;
     std::vector<double> dnumFM;
     std::vector<double> dnumFP;
+
   private:
   };
 
-  edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster> > fPixelClusterLabel;
+  edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster>> fPixelClusterLabel;
 
   UInt_t fRunNo;
   UInt_t fEvtNo;
@@ -134,23 +133,23 @@ class PixelLumiDQM : public one::DQMEDAnalyzer<edm::one::WatchLuminosityBlocks>
   bool fIncludeVertexInfo;
   bool fIncludePixelClusterInfo;
   bool fIncludePixelQualCheckHistos;
-  int  fResetIntervalInLumiSections;
+  int fResetIntervalInLumiSections;
 
-  std::map<std::string, MonitorElement*> fHistContainerThisRun;
+  std::map<std::string, MonitorElement *> fHistContainerThisRun;
 
   // This is a list of modules to be ignored, either because they were
   // dead or are dead in part of the data-taking period.
   std::vector<uint32_t> fDeadModules;
 
   // The minimum number of pixels that should live in a cluster in
-  // order for the cluster to be counted as a real cluster 
+  // order for the cluster to be counted as a real cluster
   // (as opposed to, e.g., a noise pixel).
   int fMinPixelsPerCluster;
 
   // The minimum pixel cluster charge for a cluster to be counted.
   double fMinClusterCharge;
 
-  // Use the module label to distinguish the three different streams. 
+  // Use the module label to distinguish the three different streams.
 
   MonitorElement *fIntActiveCrossingsFromDB;
   MonitorElement *fHistnBClusVsLS[3];
@@ -169,7 +168,7 @@ class PixelLumiDQM : public one::DQMEDAnalyzer<edm::one::WatchLuminosityBlocks>
   unsigned int filledAndUnmaskedBunches;
   bool useInnerBarrelLayer;
   unsigned int fFillNumber;
-  std::string  fLogFileName_;
+  std::string fLogFileName_;
 
   std::ofstream logFile_;
 };
diff --git a/DQM/RCTMonitor/interface/RCTMonitor.h b/DQM/RCTMonitor/interface/RCTMonitor.h
index 92e2ce7647eaf..431ab53dcf1aa 100644
--- a/DQM/RCTMonitor/interface/RCTMonitor.h
+++ b/DQM/RCTMonitor/interface/RCTMonitor.h
@@ -21,41 +21,41 @@
 
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 
-#include <iostream>
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include <iostream>
 
 #include "CalibFormats/CaloTPG/interface/CaloTPGTranscoder.h"
 
 #include "CalibFormats/CaloTPG/interface/CaloTPGRecord.h"
-#include "CondFormats/L1TObjects/interface/L1CaloGeometry.h"
 #include "CondFormats/DataRecord/interface/L1CaloGeometryRecord.h"
+#include "CondFormats/L1TObjects/interface/L1CaloGeometry.h"
 
-#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h"
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCT.h"
+#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h"
 
 #include <TH1F.h>
 #include <TH1I.h>
 
 //#include <SimDataFormats/Track/interface/SimTrackContainer.h>
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 // DQM files
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
 // GCT and RCT data formats
+#include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctCollections.h"
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctEtSums.h"
-#include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
 //#include <SimDataFormats/Track/interface/SimTrackContainer.h>
 
 // TPs
@@ -64,47 +64,46 @@
 
 // L1Extra
 #include "DataFormats/L1Trigger/interface/L1EmParticle.h"
-#include "DataFormats/L1Trigger/interface/L1JetParticle.h"
 #include "DataFormats/L1Trigger/interface/L1EtMissParticle.h"
+#include "DataFormats/L1Trigger/interface/L1JetParticle.h"
 
 struct rct_location {
   unsigned crate, card, region;
 };
 
 class RCTMonitor : public DQMEDAnalyzer {
- public:
-  explicit RCTMonitor(const edm::ParameterSet&);
+public:
+  explicit RCTMonitor(const edm::ParameterSet &);
   ~RCTMonitor() override;
-  void bookHistograms(DQMStore::IBooker&, edm::Run const&,
-                      edm::EventSetup const&) override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void FillRCT(const edm::Event&, const edm::EventSetup&);
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void FillRCT(const edm::Event &, const edm::EventSetup &);
 
- private:
+private:
   // RCT stuff
-  MonitorElement* m_rctRegionsEtEtaPhi;
-  MonitorElement* m_rctRegionsOccEtaPhi;
-  MonitorElement* m_rctTauVetoEtaPhi;
-  MonitorElement* m_rctRegionEt;
-
-  MonitorElement* m_rctIsoEmRankEtaPhi1;
-  MonitorElement* m_rctIsoEmRankEtaPhi10;
-  MonitorElement* m_rctIsoEmOccEtaPhi1;
-  MonitorElement* m_rctIsoEmOccEtaPhi10;
-  MonitorElement* m_rctNonIsoEmRankEtaPhi1;
-  MonitorElement* m_rctNonIsoEmRankEtaPhi10;
-  MonitorElement* m_rctRelaxedEmRankEtaPhi1;
-  MonitorElement* m_rctRelaxedEmRankEtaPhi10;
-  MonitorElement* m_rctNonIsoEmOccEtaPhi1;
-  MonitorElement* m_rctNonIsoEmOccEtaPhi10;
-  MonitorElement* m_rctRelaxedEmOccEtaPhi1;
-  MonitorElement* m_rctRelaxedEmOccEtaPhi10;
-  MonitorElement* m_rctIsoEmRank1;
-  MonitorElement* m_rctIsoEmRank10;
-  MonitorElement* m_rctRelaxedEmRank1;
-  MonitorElement* m_rctRelaxedEmRank10;
-  MonitorElement* m_rctNonIsoEmRank1;
-  MonitorElement* m_rctNonIsoEmRank10;
+  MonitorElement *m_rctRegionsEtEtaPhi;
+  MonitorElement *m_rctRegionsOccEtaPhi;
+  MonitorElement *m_rctTauVetoEtaPhi;
+  MonitorElement *m_rctRegionEt;
+
+  MonitorElement *m_rctIsoEmRankEtaPhi1;
+  MonitorElement *m_rctIsoEmRankEtaPhi10;
+  MonitorElement *m_rctIsoEmOccEtaPhi1;
+  MonitorElement *m_rctIsoEmOccEtaPhi10;
+  MonitorElement *m_rctNonIsoEmRankEtaPhi1;
+  MonitorElement *m_rctNonIsoEmRankEtaPhi10;
+  MonitorElement *m_rctRelaxedEmRankEtaPhi1;
+  MonitorElement *m_rctRelaxedEmRankEtaPhi10;
+  MonitorElement *m_rctNonIsoEmOccEtaPhi1;
+  MonitorElement *m_rctNonIsoEmOccEtaPhi10;
+  MonitorElement *m_rctRelaxedEmOccEtaPhi1;
+  MonitorElement *m_rctRelaxedEmOccEtaPhi10;
+  MonitorElement *m_rctIsoEmRank1;
+  MonitorElement *m_rctIsoEmRank10;
+  MonitorElement *m_rctRelaxedEmRank1;
+  MonitorElement *m_rctRelaxedEmRank10;
+  MonitorElement *m_rctNonIsoEmRank1;
+  MonitorElement *m_rctNonIsoEmRank10;
 
   // Bins etc.
   // GCT and RCT
@@ -153,4 +152,4 @@ class RCTMonitor : public DQMEDAnalyzer {
   edm::EDGetTokenT<L1CaloEmCollection> m_rctSourceToken_;
 };
 
-#endif // RCTMonitor_RCTMonitor_H
+#endif  // RCTMonitor_RCTMonitor_H
diff --git a/DQM/RCTMonitor/interface/somedefinitions.h b/DQM/RCTMonitor/interface/somedefinitions.h
index 49361abb98ff0..53a7b8d6abe56 100644
--- a/DQM/RCTMonitor/interface/somedefinitions.h
+++ b/DQM/RCTMonitor/interface/somedefinitions.h
@@ -3,25 +3,50 @@
 #include <cmath>
 
 // Define statics for bins etc.
-const unsigned int RCTMonitor::ETABINS = 22;    const float RCTMonitor::ETAMIN = -0.5;       const float RCTMonitor::ETAMAX = 21.5;
-const unsigned int RCTMonitor::METPHIBINS = 72; const float RCTMonitor::METPHIMIN = -0.5;    const float RCTMonitor::METPHIMAX = 71.5;
-const unsigned int RCTMonitor::PHIBINS = 18;    const float RCTMonitor::PHIMIN = -0.5;       const float RCTMonitor::PHIMAX = 17.5;
-const unsigned int RCTMonitor::TPPHIBINS = 72;  const float RCTMonitor::TPPHIMIN = 0.5;      const float RCTMonitor::TPPHIMAX = 72.5;
-const unsigned int RCTMonitor::TPETABINS = 65;  const float RCTMonitor::TPETAMIN = -32.5;    const float RCTMonitor::TPETAMAX = 32.5;
-const unsigned int RCTMonitor::L1EETABINS = 22; const float RCTMonitor::L1EETAMIN = -5;      const float RCTMonitor::L1EETAMAX = 5;
-const unsigned int RCTMonitor::L1EPHIBINS = 18; const float RCTMonitor::L1EPHIMIN = -M_PI;   const float RCTMonitor::L1EPHIMAX = M_PI;
+const unsigned int RCTMonitor::ETABINS = 22;
+const float RCTMonitor::ETAMIN = -0.5;
+const float RCTMonitor::ETAMAX = 21.5;
+const unsigned int RCTMonitor::METPHIBINS = 72;
+const float RCTMonitor::METPHIMIN = -0.5;
+const float RCTMonitor::METPHIMAX = 71.5;
+const unsigned int RCTMonitor::PHIBINS = 18;
+const float RCTMonitor::PHIMIN = -0.5;
+const float RCTMonitor::PHIMAX = 17.5;
+const unsigned int RCTMonitor::TPPHIBINS = 72;
+const float RCTMonitor::TPPHIMIN = 0.5;
+const float RCTMonitor::TPPHIMAX = 72.5;
+const unsigned int RCTMonitor::TPETABINS = 65;
+const float RCTMonitor::TPETAMIN = -32.5;
+const float RCTMonitor::TPETAMAX = 32.5;
+const unsigned int RCTMonitor::L1EETABINS = 22;
+const float RCTMonitor::L1EETAMIN = -5;
+const float RCTMonitor::L1EETAMAX = 5;
+const unsigned int RCTMonitor::L1EPHIBINS = 18;
+const float RCTMonitor::L1EPHIMIN = -M_PI;
+const float RCTMonitor::L1EPHIMAX = M_PI;
 
 // Ranks 6, 10 and 12 bits
-const unsigned int RCTMonitor::R6BINS  = 64;    const float RCTMonitor::R6MIN  = -0.5;       const float RCTMonitor::R6MAX  = 63.5;
-const unsigned int RCTMonitor::R10BINS = 1024;  const float RCTMonitor::R10MIN = -0.5;       const float RCTMonitor::R10MAX = 1023.5;
-const unsigned int RCTMonitor::R12BINS = 4096;  const float RCTMonitor::R12MIN = -0.5;       const float RCTMonitor::R12MAX = 4095.5;
+const unsigned int RCTMonitor::R6BINS = 64;
+const float RCTMonitor::R6MIN = -0.5;
+const float RCTMonitor::R6MAX = 63.5;
+const unsigned int RCTMonitor::R10BINS = 1024;
+const float RCTMonitor::R10MIN = -0.5;
+const float RCTMonitor::R10MAX = 1023.5;
+const unsigned int RCTMonitor::R12BINS = 4096;
+const float RCTMonitor::R12MIN = -0.5;
+const float RCTMonitor::R12MAX = 4095.5;
 
 // Normalize Trigger Towers according to physical extent.
-const float ScaleINNER = 1.000000;    const float ScaleOUT = 0.423358; const float ScaleIN = 0.794521;
+const float ScaleINNER = 1.000000;
+const float ScaleOUT = 0.423358;
+const float ScaleIN = 0.794521;
 
 // Something for the trigger primitives
-const unsigned int RCTMonitor::RTPBINS = 101;   const float RCTMonitor::RTPMIN = -0.5;       const float RCTMonitor::RTPMAX = 100.5;
+const unsigned int RCTMonitor::RTPBINS = 101;
+const float RCTMonitor::RTPMIN = -0.5;
+const float RCTMonitor::RTPMAX = 100.5;
 
 // Physical bins 1 Gev - 1 TeV in 1 GeV steps
-const unsigned int RCTMonitor::TEVBINS  = 1001; const float RCTMonitor::TEVMIN  = -0.5;      const float RCTMonitor::TEVMAX  = 1000.5;
-
+const unsigned int RCTMonitor::TEVBINS = 1001;
+const float RCTMonitor::TEVMIN = -0.5;
+const float RCTMonitor::TEVMAX = 1000.5;
diff --git a/DQM/RCTMonitor/src/RCTMonitor.cc b/DQM/RCTMonitor/src/RCTMonitor.cc
index b6128faa52154..0136937c856c5 100644
--- a/DQM/RCTMonitor/src/RCTMonitor.cc
+++ b/DQM/RCTMonitor/src/RCTMonitor.cc
@@ -3,85 +3,60 @@
 #include "DQMServices/Core/interface/DQMStore.h"
 #include <iostream>
 
-RCTMonitor::RCTMonitor(const edm::ParameterSet& iConfig) {
+RCTMonitor::RCTMonitor(const edm::ParameterSet &iConfig) {
   // set Token(-s)
-  m_rctSourceToken_ = consumes<L1CaloEmCollection>(
-      iConfig.getUntrackedParameter<edm::InputTag>("rctSource"));
+  m_rctSourceToken_ = consumes<L1CaloEmCollection>(iConfig.getUntrackedParameter<edm::InputTag>("rctSource"));
 }
 
 RCTMonitor::~RCTMonitor() {}
 
-void RCTMonitor::bookHistograms(DQMStore::IBooker& iBooker, edm::Run const&,
-                                  edm::EventSetup const&) {
+void RCTMonitor::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, edm::EventSetup const &) {
   // Book RCT histograms
   iBooker.setCurrentFolder("RCT");
 
   m_rctIsoEmRankEtaPhi1 =
-      iBooker.book2D("RctIsoEmRankEtaPhi", "ISO EM RANK", PHIBINS, PHIMIN,
-                     PHIMAX, ETABINS, ETAMIN, ETAMAX);
+      iBooker.book2D("RctIsoEmRankEtaPhi", "ISO EM RANK", PHIBINS, PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
   m_rctIsoEmOccEtaPhi1 =
-      iBooker.book2D("RctIsoEmOccEtaPhi", "ISO EM OCCUPANCY", PHIBINS, PHIMIN,
-                     PHIMAX, ETABINS, ETAMIN, ETAMAX);
-  m_rctIsoEmRank1 =
-      iBooker.book1D("RctIsoEmRank", "ISO EM RANK", R6BINS, R6MIN, R6MAX);
+      iBooker.book2D("RctIsoEmOccEtaPhi", "ISO EM OCCUPANCY", PHIBINS, PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
+  m_rctIsoEmRank1 = iBooker.book1D("RctIsoEmRank", "ISO EM RANK", R6BINS, R6MIN, R6MAX);
   m_rctIsoEmRankEtaPhi10 =
-      iBooker.book2D("RctIsoEmRankEtaPhi10", "ISO EM RANK", PHIBINS, PHIMIN,
-                     PHIMAX, ETABINS, ETAMIN, ETAMAX);
+      iBooker.book2D("RctIsoEmRankEtaPhi10", "ISO EM RANK", PHIBINS, PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
   m_rctIsoEmOccEtaPhi10 =
-      iBooker.book2D("RctIsoEmOccEtaPhi10", "ISO EM OCCUPANCY", PHIBINS, PHIMIN,
-                     PHIMAX, ETABINS, ETAMIN, ETAMAX);
-  m_rctIsoEmRank10 =
-      iBooker.book1D("RctIsoEmRank10", "ISO EM RANK", R6BINS, R6MIN, R6MAX);
+      iBooker.book2D("RctIsoEmOccEtaPhi10", "ISO EM OCCUPANCY", PHIBINS, PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
+  m_rctIsoEmRank10 = iBooker.book1D("RctIsoEmRank10", "ISO EM RANK", R6BINS, R6MIN, R6MAX);
 
   m_rctNonIsoEmRankEtaPhi1 =
-      iBooker.book2D("RctNonIsoEmRankEtaPhi", "NON-ISO EM RANK", PHIBINS,
-                     PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
+      iBooker.book2D("RctNonIsoEmRankEtaPhi", "NON-ISO EM RANK", PHIBINS, PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
   m_rctNonIsoEmOccEtaPhi1 =
-      iBooker.book2D("RctNonIsoEmOccEtaPhi", "NON-ISO EM OCCUPANCY", PHIBINS,
-                     PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
-  m_rctNonIsoEmRank1 = iBooker.book1D("RctNonIsoEmRank", "NON-ISO EM RANK",
-                                      R6BINS, R6MIN, R6MAX);
+      iBooker.book2D("RctNonIsoEmOccEtaPhi", "NON-ISO EM OCCUPANCY", PHIBINS, PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
+  m_rctNonIsoEmRank1 = iBooker.book1D("RctNonIsoEmRank", "NON-ISO EM RANK", R6BINS, R6MIN, R6MAX);
   m_rctNonIsoEmRankEtaPhi10 =
-      iBooker.book2D("RctNonIsoEmRankEtaPhi10", "NON-ISO EM RANK", PHIBINS,
-                     PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
-  m_rctNonIsoEmOccEtaPhi10 =
-      iBooker.book2D("RctNonIsoEmOccEtaPhi10", "NON-ISO EM OCCUPANCY", PHIBINS,
-                     PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
-  m_rctNonIsoEmRank10 = iBooker.book1D("RctNonIsoEmRank10", "NON-ISO EM RANK",
-                                       R6BINS, R6MIN, R6MAX);
+      iBooker.book2D("RctNonIsoEmRankEtaPhi10", "NON-ISO EM RANK", PHIBINS, PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
+  m_rctNonIsoEmOccEtaPhi10 = iBooker.book2D(
+      "RctNonIsoEmOccEtaPhi10", "NON-ISO EM OCCUPANCY", PHIBINS, PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
+  m_rctNonIsoEmRank10 = iBooker.book1D("RctNonIsoEmRank10", "NON-ISO EM RANK", R6BINS, R6MIN, R6MAX);
 
   m_rctRelaxedEmRankEtaPhi1 =
-      iBooker.book2D("RctRelaxedEmRankEtaPhi", "RELAXED EM RANK", PHIBINS,
-                     PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
+      iBooker.book2D("RctRelaxedEmRankEtaPhi", "RELAXED EM RANK", PHIBINS, PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
   m_rctRelaxedEmOccEtaPhi1 =
-      iBooker.book2D("RctRelaxedEmOccEtaPhi", "RELAXED EM OCCUPANCY", PHIBINS,
-                     PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
-  m_rctRelaxedEmRank1 = iBooker.book1D("RctRelaxedEmRank", "RELAXED EM RANK",
-                                       R6BINS, R6MIN, R6MAX);
+      iBooker.book2D("RctRelaxedEmOccEtaPhi", "RELAXED EM OCCUPANCY", PHIBINS, PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
+  m_rctRelaxedEmRank1 = iBooker.book1D("RctRelaxedEmRank", "RELAXED EM RANK", R6BINS, R6MIN, R6MAX);
   m_rctRelaxedEmRankEtaPhi10 =
-      iBooker.book2D("RctRelaxedEmRankEtaPhi", "RELAXED EM RANK", PHIBINS,
-                     PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
-  m_rctRelaxedEmOccEtaPhi10 =
-      iBooker.book2D("RctRelaxedEmOccEtaPhi10", "RELAXED EM OCCUPANCY", PHIBINS,
-                     PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
-  m_rctRelaxedEmRank10 = iBooker.book1D("RctRelaxedEmRank", "RELAXED EM RANK",
-                                        R6BINS, R6MIN, R6MAX);
+      iBooker.book2D("RctRelaxedEmRankEtaPhi", "RELAXED EM RANK", PHIBINS, PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
+  m_rctRelaxedEmOccEtaPhi10 = iBooker.book2D(
+      "RctRelaxedEmOccEtaPhi10", "RELAXED EM OCCUPANCY", PHIBINS, PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
+  m_rctRelaxedEmRank10 = iBooker.book1D("RctRelaxedEmRank", "RELAXED EM RANK", R6BINS, R6MIN, R6MAX);
 
   m_rctRegionsEtEtaPhi =
-      iBooker.book2D("RctRegionsEtEtaPhi", "REGION E_{T}", PHIBINS, PHIMIN,
-                     PHIMAX, ETABINS, ETAMIN, ETAMAX);
+      iBooker.book2D("RctRegionsEtEtaPhi", "REGION E_{T}", PHIBINS, PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
   m_rctRegionsOccEtaPhi =
-      iBooker.book2D("RctRegionsOccEtaPhi", "REGION OCCUPANCY", PHIBINS, PHIMIN,
-                     PHIMAX, ETABINS, ETAMIN, ETAMAX);
+      iBooker.book2D("RctRegionsOccEtaPhi", "REGION OCCUPANCY", PHIBINS, PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
   m_rctTauVetoEtaPhi =
-      iBooker.book2D("RctTauVetoEtaPhi", "TAU VETO OCCUPANCY", PHIBINS, PHIMIN,
-                     PHIMAX, ETABINS, ETAMIN, ETAMAX);
-  m_rctRegionEt =
-      iBooker.book1D("RctRegionEt", "REGION E_{T}", R10BINS, R10MIN, R10MAX);
+      iBooker.book2D("RctTauVetoEtaPhi", "TAU VETO OCCUPANCY", PHIBINS, PHIMIN, PHIMAX, ETABINS, ETAMIN, ETAMAX);
+  m_rctRegionEt = iBooker.book1D("RctRegionEt", "REGION E_{T}", R10BINS, R10MIN, R10MAX);
 }
 
-void RCTMonitor::analyze(const edm::Event& iEvent,
-                         const edm::EventSetup& iSetup) {
+void RCTMonitor::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   // Fill histograms
   FillRCT(iEvent, iSetup);
 }
@@ -100,62 +75,48 @@ float DynamicScale(int EtaStamp) {
   }
 }
 
-void RCTMonitor::FillRCT(const edm::Event& iEvent,
-                         const edm::EventSetup& iSetup) {
+void RCTMonitor::FillRCT(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   // Get the RCT digis
   edm::Handle<L1CaloEmCollection> em;
 
   iEvent.getByToken(m_rctSourceToken_, em);
 
   // Isolated and non-isolated EM with cut at >1 GeV
-  for (L1CaloEmCollection::const_iterator iem = em->begin(); iem != em->end();
-       iem++) {
+  for (L1CaloEmCollection::const_iterator iem = em->begin(); iem != em->end(); iem++) {
     if (iem->rank() > 1.) {   // applies the 1 GeV cut
       if (iem->isolated()) {  // looks for isolated EM candidates only
         m_rctIsoEmRank1->Fill(iem->rank());
         // std::cout << "Just to show what is there " << iem->rank() <<
         // std::endl ;
-        m_rctIsoEmRankEtaPhi1->Fill(iem->regionId().iphi(),
-                                    iem->regionId().ieta(), iem->rank());
-        m_rctIsoEmOccEtaPhi1->Fill(iem->regionId().iphi(),
-                                   iem->regionId().ieta(),
-                                   DynamicScale(iem->regionId().ieta()));
-        m_rctRelaxedEmRankEtaPhi1->Fill(iem->regionId().iphi(),
-                                        iem->regionId().ieta(), iem->rank());
-        m_rctRelaxedEmOccEtaPhi1->Fill(iem->regionId().iphi(),
-                                       iem->regionId().ieta(),
-                                       DynamicScale(iem->regionId().ieta()));
+        m_rctIsoEmRankEtaPhi1->Fill(iem->regionId().iphi(), iem->regionId().ieta(), iem->rank());
+        m_rctIsoEmOccEtaPhi1->Fill(
+            iem->regionId().iphi(), iem->regionId().ieta(), DynamicScale(iem->regionId().ieta()));
+        m_rctRelaxedEmRankEtaPhi1->Fill(iem->regionId().iphi(), iem->regionId().ieta(), iem->rank());
+        m_rctRelaxedEmOccEtaPhi1->Fill(
+            iem->regionId().iphi(), iem->regionId().ieta(), DynamicScale(iem->regionId().ieta()));
         m_rctRelaxedEmRank1->Fill(iem->rank());
       } else {  // instructions for Non-isolated EM candidates
         m_rctNonIsoEmRank1->Fill(iem->rank());
-        m_rctNonIsoEmRankEtaPhi1->Fill(iem->regionId().iphi(),
-                                       iem->regionId().ieta(), iem->rank());
-        m_rctNonIsoEmOccEtaPhi1->Fill(iem->regionId().iphi(),
-                                      iem->regionId().ieta(),
-                                      DynamicScale(iem->regionId().ieta()));
-        m_rctRelaxedEmRankEtaPhi1->Fill(iem->regionId().iphi(),
-                                        iem->regionId().ieta(), iem->rank());
-        m_rctRelaxedEmOccEtaPhi1->Fill(iem->regionId().iphi(),
-                                       iem->regionId().ieta(),
-                                       DynamicScale(iem->regionId().ieta()));
+        m_rctNonIsoEmRankEtaPhi1->Fill(iem->regionId().iphi(), iem->regionId().ieta(), iem->rank());
+        m_rctNonIsoEmOccEtaPhi1->Fill(
+            iem->regionId().iphi(), iem->regionId().ieta(), DynamicScale(iem->regionId().ieta()));
+        m_rctRelaxedEmRankEtaPhi1->Fill(iem->regionId().iphi(), iem->regionId().ieta(), iem->rank());
+        m_rctRelaxedEmOccEtaPhi1->Fill(
+            iem->regionId().iphi(), iem->regionId().ieta(), DynamicScale(iem->regionId().ieta()));
         m_rctRelaxedEmRank1->Fill(iem->rank());
       }
     }
     if (iem->rank() > 10.) {  // applies the 10 GeV cut
       if (iem->isolated()) {  // looks for isolated EM candidates only
-        m_rctIsoEmOccEtaPhi10->Fill(iem->regionId().iphi(),
-                                    iem->regionId().ieta(),
-                                    DynamicScale(iem->regionId().ieta()));
-        m_rctRelaxedEmOccEtaPhi10->Fill(iem->regionId().iphi(),
-                                        iem->regionId().ieta(),
-                                        DynamicScale(iem->regionId().ieta()));
+        m_rctIsoEmOccEtaPhi10->Fill(
+            iem->regionId().iphi(), iem->regionId().ieta(), DynamicScale(iem->regionId().ieta()));
+        m_rctRelaxedEmOccEtaPhi10->Fill(
+            iem->regionId().iphi(), iem->regionId().ieta(), DynamicScale(iem->regionId().ieta()));
       } else {  // instructions for Non-isolated EM candidates
-        m_rctNonIsoEmOccEtaPhi10->Fill(iem->regionId().iphi(),
-                                       iem->regionId().ieta(),
-                                       DynamicScale(iem->regionId().ieta()));
-        m_rctRelaxedEmOccEtaPhi10->Fill(iem->regionId().iphi(),
-                                        iem->regionId().ieta(),
-                                        DynamicScale(iem->regionId().ieta()));
+        m_rctNonIsoEmOccEtaPhi10->Fill(
+            iem->regionId().iphi(), iem->regionId().ieta(), DynamicScale(iem->regionId().ieta()));
+        m_rctRelaxedEmOccEtaPhi10->Fill(
+            iem->regionId().iphi(), iem->regionId().ieta(), DynamicScale(iem->regionId().ieta()));
       }
     }
   }
diff --git a/DQM/RPCMonitorDigi/test/rpcdqm_cfg.py b/DQM/RPCMonitorDigi/test/rpcdqm_cfg.py
index fdcf5f472570c..a47d103a7fd32 100644
--- a/DQM/RPCMonitorDigi/test/rpcdqm_cfg.py
+++ b/DQM/RPCMonitorDigi/test/rpcdqm_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('DQM',eras.Run2_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process('DQM',Run2_2017)
 
 process.load('Configuration.StandardSequences.Services_cff')
 process.load('FWCore.MessageService.MessageLogger_cfi')
diff --git a/DQM/SiOuterTracker/interface/OuterTrackerMonitorTTCluster.h b/DQM/SiOuterTracker/interface/OuterTrackerMonitorTTCluster.h
index fb0bf3a9d685d..8e098af167ecd 100644
--- a/DQM/SiOuterTracker/interface/OuterTrackerMonitorTTCluster.h
+++ b/DQM/SiOuterTracker/interface/OuterTrackerMonitorTTCluster.h
@@ -1,55 +1,53 @@
 #ifndef SiOuterTracker_OuterTrackerMonitorTTCluster_h
 #define SiOuterTracker_OuterTrackerMonitorTTCluster_h
 
-#include <vector>
-#include <memory>
-#include "FWCore/Utilities/interface/EDGetToken.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Common/interface/DetSetVectorNew.h"
 #include "DataFormats/L1TrackTrigger/interface/TTTypes.h"
-
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
+#include <memory>
+#include <vector>
 
 class DQMStore;
 
 class OuterTrackerMonitorTTCluster : public DQMEDAnalyzer {
-
 public:
-  explicit OuterTrackerMonitorTTCluster(const edm::ParameterSet&);
+  explicit OuterTrackerMonitorTTCluster(const edm::ParameterSet &);
   ~OuterTrackerMonitorTTCluster() override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
   // TTCluster stacks
-  MonitorElement* Cluster_IMem_Barrel = nullptr;
-  MonitorElement* Cluster_IMem_Endcap_Disc = nullptr;
-  MonitorElement* Cluster_IMem_Endcap_Ring = nullptr;
-  MonitorElement* Cluster_IMem_Endcap_Ring_Fw[5] = {nullptr, nullptr, nullptr, nullptr, nullptr};
-  MonitorElement* Cluster_IMem_Endcap_Ring_Bw[5] = {nullptr, nullptr, nullptr, nullptr, nullptr};
-  MonitorElement* Cluster_OMem_Barrel = nullptr;
-  MonitorElement* Cluster_OMem_Endcap_Disc = nullptr;
-  MonitorElement* Cluster_OMem_Endcap_Ring = nullptr;
-  MonitorElement* Cluster_OMem_Endcap_Ring_Fw[5] = {nullptr, nullptr, nullptr, nullptr, nullptr};
-  MonitorElement* Cluster_OMem_Endcap_Ring_Bw[5] = {nullptr, nullptr, nullptr, nullptr, nullptr};
-  MonitorElement* Cluster_W = nullptr;
-  MonitorElement* Cluster_Phi = nullptr;
-  MonitorElement* Cluster_R = nullptr;
-  MonitorElement* Cluster_Eta = nullptr;
-
-  MonitorElement* Cluster_Barrel_XY = nullptr;
-  MonitorElement* Cluster_Endcap_Fw_XY = nullptr;
-  MonitorElement* Cluster_Endcap_Bw_XY = nullptr;
-  MonitorElement* Cluster_RZ = nullptr;
-
- private:
+  MonitorElement *Cluster_IMem_Barrel = nullptr;
+  MonitorElement *Cluster_IMem_Endcap_Disc = nullptr;
+  MonitorElement *Cluster_IMem_Endcap_Ring = nullptr;
+  MonitorElement *Cluster_IMem_Endcap_Ring_Fw[5] = {nullptr, nullptr, nullptr, nullptr, nullptr};
+  MonitorElement *Cluster_IMem_Endcap_Ring_Bw[5] = {nullptr, nullptr, nullptr, nullptr, nullptr};
+  MonitorElement *Cluster_OMem_Barrel = nullptr;
+  MonitorElement *Cluster_OMem_Endcap_Disc = nullptr;
+  MonitorElement *Cluster_OMem_Endcap_Ring = nullptr;
+  MonitorElement *Cluster_OMem_Endcap_Ring_Fw[5] = {nullptr, nullptr, nullptr, nullptr, nullptr};
+  MonitorElement *Cluster_OMem_Endcap_Ring_Bw[5] = {nullptr, nullptr, nullptr, nullptr, nullptr};
+  MonitorElement *Cluster_W = nullptr;
+  MonitorElement *Cluster_Phi = nullptr;
+  MonitorElement *Cluster_R = nullptr;
+  MonitorElement *Cluster_Eta = nullptr;
+
+  MonitorElement *Cluster_Barrel_XY = nullptr;
+  MonitorElement *Cluster_Endcap_Fw_XY = nullptr;
+  MonitorElement *Cluster_Endcap_Bw_XY = nullptr;
+  MonitorElement *Cluster_RZ = nullptr;
+
+private:
   edm::ParameterSet conf_;
-  edm::EDGetTokenT<edmNew::DetSetVector< TTCluster< Ref_Phase2TrackerDigi_ > > >  tagTTClustersToken_;
+  edm::EDGetTokenT<edmNew::DetSetVector<TTCluster<Ref_Phase2TrackerDigi_>>> tagTTClustersToken_;
   std::string topFolderName_;
 };
 #endif
diff --git a/DQM/SiOuterTracker/interface/OuterTrackerMonitorTTStub.h b/DQM/SiOuterTracker/interface/OuterTrackerMonitorTTStub.h
index e8c23d8b1930d..ea596baaa497b 100644
--- a/DQM/SiOuterTracker/interface/OuterTrackerMonitorTTStub.h
+++ b/DQM/SiOuterTracker/interface/OuterTrackerMonitorTTStub.h
@@ -1,67 +1,67 @@
 #ifndef SiOuterTracker_OuterTrackerMonitorTTStub_h
 #define SiOuterTracker_OuterTrackerMonitorTTStub_h
 
-#include <vector>
-#include <memory>
-#include "FWCore/Utilities/interface/EDGetToken.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Common/interface/DetSetVectorNew.h"
 #include "DataFormats/L1TrackTrigger/interface/TTTypes.h"
-
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
+#include <memory>
+#include <vector>
 
 class DQMStore;
 
 class OuterTrackerMonitorTTStub : public DQMEDAnalyzer {
-
 public:
-  explicit OuterTrackerMonitorTTStub(const edm::ParameterSet&);
+  explicit OuterTrackerMonitorTTStub(const edm::ParameterSet &);
   ~OuterTrackerMonitorTTStub() override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
   // TTStub stacks
   // Global position of the stubs
-  MonitorElement* Stub_Barrel_XY = nullptr;  //TTStub barrel y vs x
-  MonitorElement* Stub_Endcap_Fw_XY = nullptr; //TTStub Forward Endcap y vs. x
-  MonitorElement* Stub_Endcap_Bw_XY = nullptr; //TTStub Backward Endcap y vs. x
-  MonitorElement* Stub_RZ = nullptr; // TTStub #rho vs. z
+  MonitorElement *Stub_Barrel_XY = nullptr;     // TTStub barrel y vs x
+  MonitorElement *Stub_Endcap_Fw_XY = nullptr;  // TTStub Forward Endcap y vs. x
+  MonitorElement *Stub_Endcap_Bw_XY = nullptr;  // TTStub Backward Endcap y vs. x
+  MonitorElement *Stub_RZ = nullptr;            // TTStub #rho vs. z
 
   // Number of stubs
-  MonitorElement* Stub_Barrel = nullptr; //TTStub per layer
-  MonitorElement* Stub_Endcap_Disc = nullptr; // TTStubs per disc
-  MonitorElement* Stub_Endcap_Disc_Fw = nullptr; //TTStub per disc
-  MonitorElement* Stub_Endcap_Disc_Bw = nullptr; //TTStub per disc
-  MonitorElement* Stub_Endcap_Ring = nullptr; // TTStubs per ring
-  MonitorElement* Stub_Endcap_Ring_Fw[5] = {nullptr, nullptr, nullptr, nullptr, nullptr}; // TTStubs per EC ring
-  MonitorElement* Stub_Endcap_Ring_Bw[5] = {nullptr, nullptr, nullptr, nullptr, nullptr}; //TTStub per EC ring
+  MonitorElement *Stub_Barrel = nullptr;                                                   // TTStub per layer
+  MonitorElement *Stub_Endcap_Disc = nullptr;                                              // TTStubs per disc
+  MonitorElement *Stub_Endcap_Disc_Fw = nullptr;                                           // TTStub per disc
+  MonitorElement *Stub_Endcap_Disc_Bw = nullptr;                                           // TTStub per disc
+  MonitorElement *Stub_Endcap_Ring = nullptr;                                              // TTStubs per ring
+  MonitorElement *Stub_Endcap_Ring_Fw[5] = {nullptr, nullptr, nullptr, nullptr, nullptr};  // TTStubs per EC ring
+  MonitorElement *Stub_Endcap_Ring_Bw[5] = {nullptr, nullptr, nullptr, nullptr, nullptr};  // TTStub per EC ring
 
   // Stub distribution
-  MonitorElement* Stub_Eta = nullptr; //TTstub eta distribution
-  MonitorElement* Stub_Phi = nullptr; //TTstub phi distribution
-  MonitorElement* Stub_R = nullptr; //TTstub r distribution
+  MonitorElement *Stub_Eta = nullptr;  // TTstub eta distribution
+  MonitorElement *Stub_Phi = nullptr;  // TTstub phi distribution
+  MonitorElement *Stub_R = nullptr;    // TTstub r distribution
 
   // STUB Displacement - offset
-  MonitorElement* Stub_Barrel_W = nullptr; //TTstub Pos-Corr Displacement (layer)
-  MonitorElement* Stub_Barrel_O = nullptr; // TTStub Offset (layer)
-  MonitorElement* Stub_Endcap_Disc_W = nullptr; // TTstub Pos-Corr Displacement (disc)
-  MonitorElement* Stub_Endcap_Disc_O = nullptr; // TTStub Offset (disc)
-  MonitorElement* Stub_Endcap_Ring_W = nullptr; // TTstub Pos-Corr Displacement (EC ring)
-  MonitorElement* Stub_Endcap_Ring_O = nullptr; // TTStub Offset (EC ring)
-  MonitorElement* Stub_Endcap_Ring_W_Fw[5] = {nullptr, nullptr, nullptr, nullptr, nullptr}; // TTstub Pos-Corr Displacement (EC ring)
-  MonitorElement* Stub_Endcap_Ring_O_Fw[5] = {nullptr, nullptr, nullptr, nullptr, nullptr}; // TTStub Offset (EC ring)
-  MonitorElement* Stub_Endcap_Ring_W_Bw[5] = {nullptr, nullptr, nullptr, nullptr, nullptr}; // TTstub Pos-Corr Displacement (EC ring)
-  MonitorElement* Stub_Endcap_Ring_O_Bw[5] = {nullptr, nullptr, nullptr, nullptr, nullptr}; // TTStub Offset (EC ring)
+  MonitorElement *Stub_Barrel_W = nullptr;       // TTstub Pos-Corr Displacement (layer)
+  MonitorElement *Stub_Barrel_O = nullptr;       // TTStub Offset (layer)
+  MonitorElement *Stub_Endcap_Disc_W = nullptr;  // TTstub Pos-Corr Displacement (disc)
+  MonitorElement *Stub_Endcap_Disc_O = nullptr;  // TTStub Offset (disc)
+  MonitorElement *Stub_Endcap_Ring_W = nullptr;  // TTstub Pos-Corr Displacement (EC ring)
+  MonitorElement *Stub_Endcap_Ring_O = nullptr;  // TTStub Offset (EC ring)
+  MonitorElement *Stub_Endcap_Ring_W_Fw[5] = {
+      nullptr, nullptr, nullptr, nullptr, nullptr};  // TTstub Pos-Corr Displacement (EC ring)
+  MonitorElement *Stub_Endcap_Ring_O_Fw[5] = {nullptr, nullptr, nullptr, nullptr, nullptr};  // TTStub Offset (EC ring)
+  MonitorElement *Stub_Endcap_Ring_W_Bw[5] = {
+      nullptr, nullptr, nullptr, nullptr, nullptr};  // TTstub Pos-Corr Displacement (EC ring)
+  MonitorElement *Stub_Endcap_Ring_O_Bw[5] = {nullptr, nullptr, nullptr, nullptr, nullptr};  // TTStub Offset (EC ring)
 
- private:
+private:
   edm::ParameterSet conf_;
-  edm::EDGetTokenT<edmNew::DetSetVector< TTStub< Ref_Phase2TrackerDigi_ > > >  tagTTStubsToken_;
+  edm::EDGetTokenT<edmNew::DetSetVector<TTStub<Ref_Phase2TrackerDigi_>>> tagTTStubsToken_;
   std::string topFolderName_;
 };
 #endif
diff --git a/DQM/SiOuterTracker/interface/OuterTrackerMonitorTTTrack.h b/DQM/SiOuterTracker/interface/OuterTrackerMonitorTTTrack.h
index 9c6b32fb1da56..292eb6363ec81 100644
--- a/DQM/SiOuterTracker/interface/OuterTrackerMonitorTTTrack.h
+++ b/DQM/SiOuterTracker/interface/OuterTrackerMonitorTTTrack.h
@@ -1,69 +1,68 @@
 #ifndef SiOuterTracker_OuterTrackerMonitorTTTrack_h
 #define SiOuterTracker_OuterTrackerMonitorTTTrack_h
 
-#include <vector>
-#include <memory>
-#include <string>
-#include "FWCore/Utilities/interface/EDGetToken.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Common/interface/DetSetVectorNew.h"
 #include "DataFormats/L1TrackTrigger/interface/TTTypes.h"
-
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
+#include <memory>
+#include <string>
+#include <vector>
 
 class DQMStore;
 
 class OuterTrackerMonitorTTTrack : public DQMEDAnalyzer {
-
 public:
-  explicit OuterTrackerMonitorTTTrack(const edm::ParameterSet&);
+  explicit OuterTrackerMonitorTTTrack(const edm::ParameterSet &);
   ~OuterTrackerMonitorTTTrack() override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
   // Distributions of all tracks
-  MonitorElement* Track_NStubs = nullptr; // Number of stubs per track
-  MonitorElement* Track_Eta_NStubs = nullptr; //Number of stubs per track vs eta
+  MonitorElement *Track_NStubs = nullptr;      // Number of stubs per track
+  MonitorElement *Track_Eta_NStubs = nullptr;  // Number of stubs per track vs
+                                               // eta
 
   /// Low-quality TTTracks (All tracks)
-  MonitorElement* Track_LQ_N = nullptr; // Number of tracks per event
-  MonitorElement* Track_LQ_Pt = nullptr; // pT distrubtion for tracks
-  MonitorElement* Track_LQ_Eta = nullptr; // eta distrubtion for tracks
-  MonitorElement* Track_LQ_Phi = nullptr; // phi distrubtion for tracks
-  MonitorElement* Track_LQ_D0 = nullptr; // d0 distrubtion for tracks
-  MonitorElement* Track_LQ_VtxZ = nullptr; // z0 distrubtion for tracks
-  MonitorElement* Track_LQ_Chi2 = nullptr;  // chi2 distrubtion for tracks
-  MonitorElement* Track_LQ_Chi2Red = nullptr; // chi2/dof distrubtion for tracks
-  MonitorElement* Track_LQ_Chi2Red_NStubs = nullptr; // chi2/dof vs number of stubs
-  MonitorElement* Track_LQ_Chi2Red_Eta = nullptr; // chi2/dof vs eta of track
-  MonitorElement* Track_LQ_Eta_BarrelStubs = nullptr; // eta vs number of stubs in barrel
-  MonitorElement* Track_LQ_Eta_ECStubs = nullptr; // eta vs number of stubs in end caps
-  MonitorElement* Track_LQ_Chi2_Probability = nullptr; // chi2 probability
+  MonitorElement *Track_LQ_N = nullptr;                 // Number of tracks per event
+  MonitorElement *Track_LQ_Pt = nullptr;                // pT distrubtion for tracks
+  MonitorElement *Track_LQ_Eta = nullptr;               // eta distrubtion for tracks
+  MonitorElement *Track_LQ_Phi = nullptr;               // phi distrubtion for tracks
+  MonitorElement *Track_LQ_D0 = nullptr;                // d0 distrubtion for tracks
+  MonitorElement *Track_LQ_VtxZ = nullptr;              // z0 distrubtion for tracks
+  MonitorElement *Track_LQ_Chi2 = nullptr;              // chi2 distrubtion for tracks
+  MonitorElement *Track_LQ_Chi2Red = nullptr;           // chi2/dof distrubtion for tracks
+  MonitorElement *Track_LQ_Chi2Red_NStubs = nullptr;    // chi2/dof vs number of stubs
+  MonitorElement *Track_LQ_Chi2Red_Eta = nullptr;       // chi2/dof vs eta of track
+  MonitorElement *Track_LQ_Eta_BarrelStubs = nullptr;   // eta vs number of stubs in barrel
+  MonitorElement *Track_LQ_Eta_ECStubs = nullptr;       // eta vs number of stubs in end caps
+  MonitorElement *Track_LQ_Chi2_Probability = nullptr;  // chi2 probability
 
   /// High-quality TTTracks (NStubs >=5, chi2/dof<10)
-  MonitorElement* Track_HQ_N = nullptr; // Number of tracks per event
-  MonitorElement* Track_HQ_Pt = nullptr;  // pT distrubtion for tracks
-  MonitorElement* Track_HQ_Eta = nullptr; // eta distrubtion for tracks
-  MonitorElement* Track_HQ_Phi = nullptr; // phi distrubtion for tracks
-  MonitorElement* Track_HQ_D0 = nullptr; // d0 distrubtion for tracks
-  MonitorElement* Track_HQ_VtxZ = nullptr; // z0 distrubtion for tracks
-  MonitorElement* Track_HQ_Chi2 = nullptr; // chi2 distrubtion for tracks
-  MonitorElement* Track_HQ_Chi2Red = nullptr; // chi2/dof distrubtion for tracks
-  MonitorElement* Track_HQ_Chi2Red_NStubs = nullptr; // chi2/dof vs number of stubs
-  MonitorElement* Track_HQ_Chi2Red_Eta = nullptr; // chi2/dof vs eta of track
-  MonitorElement* Track_HQ_Eta_BarrelStubs = nullptr; // eta vs number of stubs in barrel
-  MonitorElement* Track_HQ_Eta_ECStubs = nullptr; // eta vs number of stubs in end caps
-  MonitorElement* Track_HQ_Chi2_Probability = nullptr; // chi2 probability
+  MonitorElement *Track_HQ_N = nullptr;                 // Number of tracks per event
+  MonitorElement *Track_HQ_Pt = nullptr;                // pT distrubtion for tracks
+  MonitorElement *Track_HQ_Eta = nullptr;               // eta distrubtion for tracks
+  MonitorElement *Track_HQ_Phi = nullptr;               // phi distrubtion for tracks
+  MonitorElement *Track_HQ_D0 = nullptr;                // d0 distrubtion for tracks
+  MonitorElement *Track_HQ_VtxZ = nullptr;              // z0 distrubtion for tracks
+  MonitorElement *Track_HQ_Chi2 = nullptr;              // chi2 distrubtion for tracks
+  MonitorElement *Track_HQ_Chi2Red = nullptr;           // chi2/dof distrubtion for tracks
+  MonitorElement *Track_HQ_Chi2Red_NStubs = nullptr;    // chi2/dof vs number of stubs
+  MonitorElement *Track_HQ_Chi2Red_Eta = nullptr;       // chi2/dof vs eta of track
+  MonitorElement *Track_HQ_Eta_BarrelStubs = nullptr;   // eta vs number of stubs in barrel
+  MonitorElement *Track_HQ_Eta_ECStubs = nullptr;       // eta vs number of stubs in end caps
+  MonitorElement *Track_HQ_Chi2_Probability = nullptr;  // chi2 probability
 
- private:
+private:
   edm::ParameterSet conf_;
-  edm::EDGetTokenT<std::vector< TTTrack< Ref_Phase2TrackerDigi_ > > >  ttTrackToken_;
+  edm::EDGetTokenT<std::vector<TTTrack<Ref_Phase2TrackerDigi_>>> ttTrackToken_;
 
   unsigned int HQNStubs_;
   double HQChi2dof_;
diff --git a/DQM/SiOuterTracker/plugins/OuterTrackerMonitorTTCluster.cc b/DQM/SiOuterTracker/plugins/OuterTrackerMonitorTTCluster.cc
index f9095da0ca06c..92c842f6dd388 100644
--- a/DQM/SiOuterTracker/plugins/OuterTrackerMonitorTTCluster.cc
+++ b/DQM/SiOuterTracker/plugins/OuterTrackerMonitorTTCluster.cc
@@ -3,7 +3,8 @@
 // Package:    SiOuterTracker
 // Class:      SiOuterTracker
 //
-/**\class SiOuterTracker OuterTrackerMonitorTTCluster.cc DQM/SiOuterTracker/plugins/OuterTrackerMonitorTTCluster.cc
+/**\class SiOuterTracker OuterTrackerMonitorTTCluster.cc
+ DQM/SiOuterTracker/plugins/OuterTrackerMonitorTTCluster.cc
 
  Description: [one line class summary]
 
@@ -16,38 +17,35 @@
 //
 
 // system include files
+#include <fstream>
+#include <iostream>
 #include <memory>
-#include <vector>
 #include <numeric>
-#include <iostream>
-#include <fstream>
+#include <vector>
 
 // user include files
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DataFormats/L1TrackTrigger/interface/TTCluster.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 
 #include "DQM/SiOuterTracker/interface/OuterTrackerMonitorTTCluster.h"
 
-
 //
 // constructors and destructor
 //
-OuterTrackerMonitorTTCluster::OuterTrackerMonitorTTCluster(const edm::ParameterSet& iConfig)
-: conf_(iConfig)
-{
+OuterTrackerMonitorTTCluster::OuterTrackerMonitorTTCluster(const edm::ParameterSet &iConfig) : conf_(iConfig) {
   topFolderName_ = conf_.getParameter<std::string>("TopFolderName");
-  tagTTClustersToken_ = consumes<edmNew::DetSetVector< TTCluster< Ref_Phase2TrackerDigi_ > > > (conf_.getParameter<edm::InputTag>("TTClusters") );
+  tagTTClustersToken_ = consumes<edmNew::DetSetVector<TTCluster<Ref_Phase2TrackerDigi_>>>(
+      conf_.getParameter<edm::InputTag>("TTClusters"));
 }
 
-OuterTrackerMonitorTTCluster::~OuterTrackerMonitorTTCluster()
-{
+OuterTrackerMonitorTTCluster::~OuterTrackerMonitorTTCluster() {
   // do anything here that needs to be done at desctruction time
   // (e.g. close files, deallocate resources etc.)
 }
@@ -57,47 +55,44 @@ OuterTrackerMonitorTTCluster::~OuterTrackerMonitorTTCluster()
 //
 
 // ------------ method called for each event  ------------
-void OuterTrackerMonitorTTCluster::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void OuterTrackerMonitorTTCluster::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   /// Track Trigger Clusters
-  edm::Handle< edmNew::DetSetVector< TTCluster< Ref_Phase2TrackerDigi_ > > > Phase2TrackerDigiTTClusterHandle;
-  iEvent.getByToken( tagTTClustersToken_, Phase2TrackerDigiTTClusterHandle );
+  edm::Handle<edmNew::DetSetVector<TTCluster<Ref_Phase2TrackerDigi_>>> Phase2TrackerDigiTTClusterHandle;
+  iEvent.getByToken(tagTTClustersToken_, Phase2TrackerDigiTTClusterHandle);
 
   /// Geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
-  const TrackerTopology* tTopo;
-  iSetup.get< TrackerTopologyRcd >().get(tTopoHandle);
+  const TrackerTopology *tTopo;
+  iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
   tTopo = tTopoHandle.product();
 
-  edm::ESHandle< TrackerGeometry > tGeometryHandle;
-  const TrackerGeometry* theTrackerGeometry;
-  iSetup.get< TrackerDigiGeometryRecord >().get( tGeometryHandle );
+  edm::ESHandle<TrackerGeometry> tGeometryHandle;
+  const TrackerGeometry *theTrackerGeometry;
+  iSetup.get<TrackerDigiGeometryRecord>().get(tGeometryHandle);
   theTrackerGeometry = tGeometryHandle.product();
 
   /// Loop over the input Clusters
-  typename edmNew::DetSetVector< TTCluster< Ref_Phase2TrackerDigi_ > >::const_iterator inputIter;
-  typename edmNew::DetSet< TTCluster< Ref_Phase2TrackerDigi_ > >::const_iterator contentIter;
+  typename edmNew::DetSetVector<TTCluster<Ref_Phase2TrackerDigi_>>::const_iterator inputIter;
+  typename edmNew::DetSet<TTCluster<Ref_Phase2TrackerDigi_>>::const_iterator contentIter;
 
   // Adding protection
-  if ( !Phase2TrackerDigiTTClusterHandle.isValid() )  return;
-
-  for ( inputIter = Phase2TrackerDigiTTClusterHandle->begin();
-        inputIter != Phase2TrackerDigiTTClusterHandle->end();
-        ++inputIter )
-  {
-    for(contentIter = inputIter->begin(); contentIter != inputIter->end(); ++contentIter)
-    {
-      //Make reference cluster
-      edm::Ref< edmNew::DetSetVector< TTCluster< Ref_Phase2TrackerDigi_ > >, TTCluster< Ref_Phase2TrackerDigi_ > > tempCluRef = edmNew::makeRefTo( Phase2TrackerDigiTTClusterHandle, contentIter );
-
-      DetId detIdClu = theTrackerGeometry->idToDet( tempCluRef->getDetId() )->geographicalId();
+  if (!Phase2TrackerDigiTTClusterHandle.isValid())
+    return;
+
+  for (inputIter = Phase2TrackerDigiTTClusterHandle->begin(); inputIter != Phase2TrackerDigiTTClusterHandle->end();
+       ++inputIter) {
+    for (contentIter = inputIter->begin(); contentIter != inputIter->end(); ++contentIter) {
+      // Make reference cluster
+      edm::Ref<edmNew::DetSetVector<TTCluster<Ref_Phase2TrackerDigi_>>, TTCluster<Ref_Phase2TrackerDigi_>> tempCluRef =
+          edmNew::makeRefTo(Phase2TrackerDigiTTClusterHandle, contentIter);
+
+      DetId detIdClu = theTrackerGeometry->idToDet(tempCluRef->getDetId())->geographicalId();
       unsigned int memberClu = tempCluRef->getStackMember();
       unsigned int widClu = tempCluRef->findWidth();
 
       MeasurementPoint mp = tempCluRef->findAverageLocalCoordinates();
-      const GeomDet* theGeomDet = theTrackerGeometry->idToDet(detIdClu);
-      Global3DPoint posClu = theGeomDet->surface().toGlobal( theGeomDet->topology().localPosition(mp) );
-
+      const GeomDet *theGeomDet = theTrackerGeometry->idToDet(detIdClu);
+      Global3DPoint posClu = theGeomDet->surface().toGlobal(theGeomDet->topology().localPosition(mp));
 
       double r = posClu.perp();
       double z = posClu.z();
@@ -106,250 +101,264 @@ void OuterTrackerMonitorTTCluster::analyze(const edm::Event& iEvent, const edm::
       Cluster_Eta->Fill(posClu.eta());
       Cluster_Phi->Fill(posClu.phi());
       Cluster_R->Fill(r);
-      Cluster_RZ->Fill( z , r );
+      Cluster_RZ->Fill(z, r);
 
-      if ( detIdClu.subdetId() == static_cast<int>(StripSubdetector::TOB) )  // Phase 2 Outer Tracker Barrel
+      if (detIdClu.subdetId() == static_cast<int>(StripSubdetector::TOB))  // Phase 2 Outer Tracker Barrel
       {
+        if (memberClu == 0)
+          Cluster_IMem_Barrel->Fill(tTopo->layer(detIdClu));
+        else
+          Cluster_OMem_Barrel->Fill(tTopo->layer(detIdClu));
 
-        if ( memberClu == 0 ) Cluster_IMem_Barrel->Fill(tTopo->layer(detIdClu));
-        else Cluster_OMem_Barrel->Fill(tTopo->layer(detIdClu));
-
-        Cluster_Barrel_XY->Fill( posClu.x(), posClu.y() );
+        Cluster_Barrel_XY->Fill(posClu.x(), posClu.y());
 
-      }	// end if isBarrel
-      else if ( detIdClu.subdetId() == static_cast<int>(StripSubdetector::TID) )  // Phase 2 Outer Tracker Endcap
+      }                                                                         // end if isBarrel
+      else if (detIdClu.subdetId() == static_cast<int>(StripSubdetector::TID))  // Phase 2 Outer Tracker Endcap
       {
-
-        if ( memberClu == 0 )
-        {
-          Cluster_IMem_Endcap_Disc->Fill(tTopo->layer(detIdClu)); // returns wheel
+        if (memberClu == 0) {
+          Cluster_IMem_Endcap_Disc->Fill(tTopo->layer(detIdClu));  // returns wheel
           Cluster_IMem_Endcap_Ring->Fill(tTopo->tidRing(detIdClu));
-        }
-        else
-        {
-          Cluster_OMem_Endcap_Disc->Fill(tTopo->layer(detIdClu)); // returns wheel
+        } else {
+          Cluster_OMem_Endcap_Disc->Fill(tTopo->layer(detIdClu));  // returns wheel
           Cluster_OMem_Endcap_Ring->Fill(tTopo->tidRing(detIdClu));
         }
 
-        if ( posClu.z() > 0 )
-        {
-          Cluster_Endcap_Fw_XY->Fill( posClu.x(), posClu.y() );
-          if (memberClu == 0) Cluster_IMem_Endcap_Ring_Fw[tTopo->layer(detIdClu)-1]->Fill(tTopo->tidRing(detIdClu));
-          else Cluster_OMem_Endcap_Ring_Fw[tTopo->layer(detIdClu)-1]->Fill(tTopo->tidRing(detIdClu));
-        }
-        else
-        {
-          Cluster_Endcap_Bw_XY->Fill( posClu.x(), posClu.y() );
-          if (memberClu == 0) Cluster_IMem_Endcap_Ring_Bw[tTopo->layer(detIdClu)-1]->Fill(tTopo->tidRing(detIdClu));
-          else Cluster_OMem_Endcap_Ring_Bw[tTopo->layer(detIdClu)-1]->Fill(tTopo->tidRing(detIdClu));
+        if (posClu.z() > 0) {
+          Cluster_Endcap_Fw_XY->Fill(posClu.x(), posClu.y());
+          if (memberClu == 0)
+            Cluster_IMem_Endcap_Ring_Fw[tTopo->layer(detIdClu) - 1]->Fill(tTopo->tidRing(detIdClu));
+          else
+            Cluster_OMem_Endcap_Ring_Fw[tTopo->layer(detIdClu) - 1]->Fill(tTopo->tidRing(detIdClu));
+        } else {
+          Cluster_Endcap_Bw_XY->Fill(posClu.x(), posClu.y());
+          if (memberClu == 0)
+            Cluster_IMem_Endcap_Ring_Bw[tTopo->layer(detIdClu) - 1]->Fill(tTopo->tidRing(detIdClu));
+          else
+            Cluster_OMem_Endcap_Ring_Bw[tTopo->layer(detIdClu) - 1]->Fill(tTopo->tidRing(detIdClu));
         }
 
-      } // end if isEndcap
-    } // end loop contentIter
-  } // end loop inputIter
-} // end of method
+      }  // end if isEndcap
+    }    // end loop contentIter
+  }      // end loop inputIter
+}  // end of method
 
-// ------------ method called once each job just before starting event loop  ------------
-void OuterTrackerMonitorTTCluster::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const & run, edm::EventSetup const & es) {
+// ------------ method called once each job just before starting event loop
+// ------------
+void OuterTrackerMonitorTTCluster::bookHistograms(DQMStore::IBooker &iBooker,
+                                                  edm::Run const &run,
+                                                  edm::EventSetup const &es) {
   std::string HistoName;
   const int numDiscs = 5;
 
-  iBooker.setCurrentFolder(topFolderName_+"/Clusters/NClusters");
+  iBooker.setCurrentFolder(topFolderName_ + "/Clusters/NClusters");
 
   // NClusters
-  edm::ParameterSet psTTCluster_Barrel =  conf_.getParameter<edm::ParameterSet>("TH1TTCluster_Barrel");
+  edm::ParameterSet psTTCluster_Barrel = conf_.getParameter<edm::ParameterSet>("TH1TTCluster_Barrel");
   HistoName = "NClusters_IMem_Barrel";
-  Cluster_IMem_Barrel = iBooker.book1D(HistoName, HistoName,
-      psTTCluster_Barrel.getParameter<int32_t>("Nbinsx"),
-      psTTCluster_Barrel.getParameter<double>("xmin"),
-      psTTCluster_Barrel.getParameter<double>("xmax"));
+  Cluster_IMem_Barrel = iBooker.book1D(HistoName,
+                                       HistoName,
+                                       psTTCluster_Barrel.getParameter<int32_t>("Nbinsx"),
+                                       psTTCluster_Barrel.getParameter<double>("xmin"),
+                                       psTTCluster_Barrel.getParameter<double>("xmax"));
   Cluster_IMem_Barrel->setAxisTitle("Barrel Layer", 1);
   Cluster_IMem_Barrel->setAxisTitle("# L1 Clusters", 2);
 
   HistoName = "NClusters_OMem_Barrel";
-  Cluster_OMem_Barrel = iBooker.book1D(HistoName, HistoName,
-      psTTCluster_Barrel.getParameter<int32_t>("Nbinsx"),
-      psTTCluster_Barrel.getParameter<double>("xmin"),
-      psTTCluster_Barrel.getParameter<double>("xmax"));
+  Cluster_OMem_Barrel = iBooker.book1D(HistoName,
+                                       HistoName,
+                                       psTTCluster_Barrel.getParameter<int32_t>("Nbinsx"),
+                                       psTTCluster_Barrel.getParameter<double>("xmin"),
+                                       psTTCluster_Barrel.getParameter<double>("xmax"));
   Cluster_OMem_Barrel->setAxisTitle("Barrel Layer", 1);
   Cluster_OMem_Barrel->setAxisTitle("# L1 Clusters", 2);
 
-  edm::ParameterSet psTTCluster_ECDisc =  conf_.getParameter<edm::ParameterSet>("TH1TTCluster_ECDiscs");
+  edm::ParameterSet psTTCluster_ECDisc = conf_.getParameter<edm::ParameterSet>("TH1TTCluster_ECDiscs");
   HistoName = "NClusters_IMem_Endcap_Disc";
-  Cluster_IMem_Endcap_Disc = iBooker.book1D(HistoName, HistoName,
-      psTTCluster_ECDisc.getParameter<int32_t>("Nbinsx"),
-      psTTCluster_ECDisc.getParameter<double>("xmin"),
-      psTTCluster_ECDisc.getParameter<double>("xmax"));
+  Cluster_IMem_Endcap_Disc = iBooker.book1D(HistoName,
+                                            HistoName,
+                                            psTTCluster_ECDisc.getParameter<int32_t>("Nbinsx"),
+                                            psTTCluster_ECDisc.getParameter<double>("xmin"),
+                                            psTTCluster_ECDisc.getParameter<double>("xmax"));
   Cluster_IMem_Endcap_Disc->setAxisTitle("Endcap Disc", 1);
   Cluster_IMem_Endcap_Disc->setAxisTitle("# L1 Clusters", 2);
 
   HistoName = "NClusters_OMem_Endcap_Disc";
-  Cluster_OMem_Endcap_Disc = iBooker.book1D(HistoName, HistoName,
-      psTTCluster_ECDisc.getParameter<int32_t>("Nbinsx"),
-      psTTCluster_ECDisc.getParameter<double>("xmin"),
-      psTTCluster_ECDisc.getParameter<double>("xmax"));
+  Cluster_OMem_Endcap_Disc = iBooker.book1D(HistoName,
+                                            HistoName,
+                                            psTTCluster_ECDisc.getParameter<int32_t>("Nbinsx"),
+                                            psTTCluster_ECDisc.getParameter<double>("xmin"),
+                                            psTTCluster_ECDisc.getParameter<double>("xmax"));
   Cluster_OMem_Endcap_Disc->setAxisTitle("Endcap Disc", 1);
   Cluster_OMem_Endcap_Disc->setAxisTitle("# L1 Clusters", 2);
 
-  edm::ParameterSet psTTCluster_ECRing =  conf_.getParameter<edm::ParameterSet>("TH1TTCluster_ECRings");
+  edm::ParameterSet psTTCluster_ECRing = conf_.getParameter<edm::ParameterSet>("TH1TTCluster_ECRings");
   HistoName = "NClusters_IMem_Endcap_Ring";
-  Cluster_IMem_Endcap_Ring = iBooker.book1D(HistoName, HistoName,
-      psTTCluster_ECRing.getParameter<int32_t>("Nbinsx"),
-      psTTCluster_ECRing.getParameter<double>("xmin"),
-      psTTCluster_ECRing.getParameter<double>("xmax"));
+  Cluster_IMem_Endcap_Ring = iBooker.book1D(HistoName,
+                                            HistoName,
+                                            psTTCluster_ECRing.getParameter<int32_t>("Nbinsx"),
+                                            psTTCluster_ECRing.getParameter<double>("xmin"),
+                                            psTTCluster_ECRing.getParameter<double>("xmax"));
   Cluster_IMem_Endcap_Ring->setAxisTitle("Endcap Ring", 1);
   Cluster_IMem_Endcap_Ring->setAxisTitle("# L1 Clusters", 2);
 
   HistoName = "NClusters_OMem_Endcap_Ring";
-  Cluster_OMem_Endcap_Ring = iBooker.book1D(HistoName, HistoName,
-      psTTCluster_ECRing.getParameter<int32_t>("Nbinsx"),
-      psTTCluster_ECRing.getParameter<double>("xmin"),
-      psTTCluster_ECRing.getParameter<double>("xmax"));
+  Cluster_OMem_Endcap_Ring = iBooker.book1D(HistoName,
+                                            HistoName,
+                                            psTTCluster_ECRing.getParameter<int32_t>("Nbinsx"),
+                                            psTTCluster_ECRing.getParameter<double>("xmin"),
+                                            psTTCluster_ECRing.getParameter<double>("xmax"));
   Cluster_OMem_Endcap_Ring->setAxisTitle("Endcap Ring", 1);
   Cluster_OMem_Endcap_Ring->setAxisTitle("# L1 Clusters", 2);
 
-  for (int i = 0; i < numDiscs; i++)
-  {
-    HistoName = "NClusters_IMem_Disc+"+std::to_string(i+1);
-    Cluster_IMem_Endcap_Ring_Fw[i] = iBooker.book1D(HistoName, HistoName,
-        psTTCluster_ECRing.getParameter<int32_t>("Nbinsx"),
-        psTTCluster_ECRing.getParameter<double>("xmin"),
-        psTTCluster_ECRing.getParameter<double>("xmax"));
-    Cluster_IMem_Endcap_Ring_Fw[i]->setAxisTitle("Endcap Ring",1);
-    Cluster_IMem_Endcap_Ring_Fw[i]->setAxisTitle("# L1 Clusters ",2);
+  for (int i = 0; i < numDiscs; i++) {
+    HistoName = "NClusters_IMem_Disc+" + std::to_string(i + 1);
+    Cluster_IMem_Endcap_Ring_Fw[i] = iBooker.book1D(HistoName,
+                                                    HistoName,
+                                                    psTTCluster_ECRing.getParameter<int32_t>("Nbinsx"),
+                                                    psTTCluster_ECRing.getParameter<double>("xmin"),
+                                                    psTTCluster_ECRing.getParameter<double>("xmax"));
+    Cluster_IMem_Endcap_Ring_Fw[i]->setAxisTitle("Endcap Ring", 1);
+    Cluster_IMem_Endcap_Ring_Fw[i]->setAxisTitle("# L1 Clusters ", 2);
   }
 
-  for (int i = 0; i < numDiscs; i++)
-  {
-    HistoName = "NClusters_IMem_Disc-"+std::to_string(i+1);
-    Cluster_IMem_Endcap_Ring_Bw[i] = iBooker.book1D(HistoName, HistoName,
-        psTTCluster_ECRing.getParameter<int32_t>("Nbinsx"),
-        psTTCluster_ECRing.getParameter<double>("xmin"),
-        psTTCluster_ECRing.getParameter<double>("xmax"));
-    Cluster_IMem_Endcap_Ring_Bw[i]->setAxisTitle("Endcap Ring",1);
-    Cluster_IMem_Endcap_Ring_Bw[i]->setAxisTitle("# L1 Clusters ",2);
+  for (int i = 0; i < numDiscs; i++) {
+    HistoName = "NClusters_IMem_Disc-" + std::to_string(i + 1);
+    Cluster_IMem_Endcap_Ring_Bw[i] = iBooker.book1D(HistoName,
+                                                    HistoName,
+                                                    psTTCluster_ECRing.getParameter<int32_t>("Nbinsx"),
+                                                    psTTCluster_ECRing.getParameter<double>("xmin"),
+                                                    psTTCluster_ECRing.getParameter<double>("xmax"));
+    Cluster_IMem_Endcap_Ring_Bw[i]->setAxisTitle("Endcap Ring", 1);
+    Cluster_IMem_Endcap_Ring_Bw[i]->setAxisTitle("# L1 Clusters ", 2);
   }
 
-  for (int i = 0; i < numDiscs; i++)
-  {
-    HistoName = "NClusters_OMem_Disc+"+std::to_string(i+1);
-    Cluster_OMem_Endcap_Ring_Fw[i] = iBooker.book1D(HistoName, HistoName,
-        psTTCluster_ECRing.getParameter<int32_t>("Nbinsx"),
-        psTTCluster_ECRing.getParameter<double>("xmin"),
-        psTTCluster_ECRing.getParameter<double>("xmax"));
-    Cluster_OMem_Endcap_Ring_Fw[i]->setAxisTitle("Endcap Ring",1);
-    Cluster_OMem_Endcap_Ring_Fw[i]->setAxisTitle("# L1 Clusters ",2);
+  for (int i = 0; i < numDiscs; i++) {
+    HistoName = "NClusters_OMem_Disc+" + std::to_string(i + 1);
+    Cluster_OMem_Endcap_Ring_Fw[i] = iBooker.book1D(HistoName,
+                                                    HistoName,
+                                                    psTTCluster_ECRing.getParameter<int32_t>("Nbinsx"),
+                                                    psTTCluster_ECRing.getParameter<double>("xmin"),
+                                                    psTTCluster_ECRing.getParameter<double>("xmax"));
+    Cluster_OMem_Endcap_Ring_Fw[i]->setAxisTitle("Endcap Ring", 1);
+    Cluster_OMem_Endcap_Ring_Fw[i]->setAxisTitle("# L1 Clusters ", 2);
   }
 
-  for (int i = 0; i < numDiscs; i++)
-  {
-    HistoName = "NClusters_OMem_Disc-"+std::to_string(i+1);
-    Cluster_OMem_Endcap_Ring_Bw[i] = iBooker.book1D(HistoName, HistoName,
-        psTTCluster_ECRing.getParameter<int32_t>("Nbinsx"),
-        psTTCluster_ECRing.getParameter<double>("xmin"),
-        psTTCluster_ECRing.getParameter<double>("xmax"));
-    Cluster_OMem_Endcap_Ring_Bw[i]->setAxisTitle("Endcap Ring",1);
-    Cluster_OMem_Endcap_Ring_Bw[i]->setAxisTitle("# L1 Clusters ",2);
+  for (int i = 0; i < numDiscs; i++) {
+    HistoName = "NClusters_OMem_Disc-" + std::to_string(i + 1);
+    Cluster_OMem_Endcap_Ring_Bw[i] = iBooker.book1D(HistoName,
+                                                    HistoName,
+                                                    psTTCluster_ECRing.getParameter<int32_t>("Nbinsx"),
+                                                    psTTCluster_ECRing.getParameter<double>("xmin"),
+                                                    psTTCluster_ECRing.getParameter<double>("xmax"));
+    Cluster_OMem_Endcap_Ring_Bw[i]->setAxisTitle("Endcap Ring", 1);
+    Cluster_OMem_Endcap_Ring_Bw[i]->setAxisTitle("# L1 Clusters ", 2);
   }
 
+  iBooker.setCurrentFolder(topFolderName_ + "/Clusters");
 
-  iBooker.setCurrentFolder(topFolderName_+"/Clusters");
-
-  //Cluster Width
-  edm::ParameterSet psTTClusterWidth =  conf_.getParameter<edm::ParameterSet>("TH2TTCluster_Width");
+  // Cluster Width
+  edm::ParameterSet psTTClusterWidth = conf_.getParameter<edm::ParameterSet>("TH2TTCluster_Width");
   HistoName = "Cluster_W";
-  Cluster_W = iBooker.book2D(HistoName, HistoName,
-      psTTClusterWidth.getParameter<int32_t>("Nbinsx"),
-      psTTClusterWidth.getParameter<double>("xmin"),
-      psTTClusterWidth.getParameter<double>("xmax"),
-      psTTClusterWidth.getParameter<int32_t>("Nbinsy"),
-      psTTClusterWidth.getParameter<double>("ymin"),
-      psTTClusterWidth.getParameter<double>("ymax"));
+  Cluster_W = iBooker.book2D(HistoName,
+                             HistoName,
+                             psTTClusterWidth.getParameter<int32_t>("Nbinsx"),
+                             psTTClusterWidth.getParameter<double>("xmin"),
+                             psTTClusterWidth.getParameter<double>("xmax"),
+                             psTTClusterWidth.getParameter<int32_t>("Nbinsy"),
+                             psTTClusterWidth.getParameter<double>("ymin"),
+                             psTTClusterWidth.getParameter<double>("ymax"));
   Cluster_W->setAxisTitle("L1 Cluster Width", 1);
   Cluster_W->setAxisTitle("Stack Member", 2);
 
-  //Cluster eta distribution
+  // Cluster eta distribution
   edm::ParameterSet psTTClusterEta = conf_.getParameter<edm::ParameterSet>("TH1TTCluster_Eta");
   HistoName = "Cluster_Eta";
-  Cluster_Eta = iBooker.book1D(HistoName, HistoName,
-      psTTClusterEta.getParameter<int32_t>("Nbinsx"),
-      psTTClusterEta.getParameter<double>("xmin"),
-      psTTClusterEta.getParameter<double>("xmax"));
+  Cluster_Eta = iBooker.book1D(HistoName,
+                               HistoName,
+                               psTTClusterEta.getParameter<int32_t>("Nbinsx"),
+                               psTTClusterEta.getParameter<double>("xmin"),
+                               psTTClusterEta.getParameter<double>("xmax"));
   Cluster_Eta->setAxisTitle("#eta", 1);
   Cluster_Eta->setAxisTitle("# L1 Clusters ", 2);
 
-  //Cluster phi distribution
+  // Cluster phi distribution
   edm::ParameterSet psTTClusterPhi = conf_.getParameter<edm::ParameterSet>("TH1TTCluster_Phi");
   HistoName = "Cluster_Phi";
-  Cluster_Phi = iBooker.book1D(HistoName, HistoName,
-      psTTClusterPhi.getParameter<int32_t>("Nbinsx"),
-      psTTClusterPhi.getParameter<double>("xmin"),
-      psTTClusterPhi.getParameter<double>("xmax"));
+  Cluster_Phi = iBooker.book1D(HistoName,
+                               HistoName,
+                               psTTClusterPhi.getParameter<int32_t>("Nbinsx"),
+                               psTTClusterPhi.getParameter<double>("xmin"),
+                               psTTClusterPhi.getParameter<double>("xmax"));
   Cluster_Phi->setAxisTitle("#phi", 1);
   Cluster_Phi->setAxisTitle("# L1 Clusters", 2);
 
-  //Cluster R distribution
+  // Cluster R distribution
   edm::ParameterSet psTTClusterR = conf_.getParameter<edm::ParameterSet>("TH1TTCluster_R");
   HistoName = "Cluster_R";
-  Cluster_R = iBooker.book1D(HistoName, HistoName,
-      psTTClusterR.getParameter<int32_t>("Nbinsx"),
-      psTTClusterR.getParameter<double>("xmin"),
-      psTTClusterR.getParameter<double>("xmax"));
+  Cluster_R = iBooker.book1D(HistoName,
+                             HistoName,
+                             psTTClusterR.getParameter<int32_t>("Nbinsx"),
+                             psTTClusterR.getParameter<double>("xmin"),
+                             psTTClusterR.getParameter<double>("xmax"));
   Cluster_R->setAxisTitle("R [cm]", 1);
   Cluster_R->setAxisTitle("# L1 Clusters", 2);
 
-  iBooker.setCurrentFolder(topFolderName_+"/Clusters/Position");
+  iBooker.setCurrentFolder(topFolderName_ + "/Clusters/Position");
 
-  //Position plots
-  edm::ParameterSet psTTCluster_Barrel_XY =  conf_.getParameter<edm::ParameterSet>("TH2TTCluster_Position");
+  // Position plots
+  edm::ParameterSet psTTCluster_Barrel_XY = conf_.getParameter<edm::ParameterSet>("TH2TTCluster_Position");
   HistoName = "Cluster_Barrel_XY";
-  Cluster_Barrel_XY = iBooker.book2D(HistoName, HistoName,
-      psTTCluster_Barrel_XY.getParameter<int32_t>("Nbinsx"),
-      psTTCluster_Barrel_XY.getParameter<double>("xmin"),
-      psTTCluster_Barrel_XY.getParameter<double>("xmax"),
-      psTTCluster_Barrel_XY.getParameter<int32_t>("Nbinsy"),
-      psTTCluster_Barrel_XY.getParameter<double>("ymin"),
-      psTTCluster_Barrel_XY.getParameter<double>("ymax"));
+  Cluster_Barrel_XY = iBooker.book2D(HistoName,
+                                     HistoName,
+                                     psTTCluster_Barrel_XY.getParameter<int32_t>("Nbinsx"),
+                                     psTTCluster_Barrel_XY.getParameter<double>("xmin"),
+                                     psTTCluster_Barrel_XY.getParameter<double>("xmax"),
+                                     psTTCluster_Barrel_XY.getParameter<int32_t>("Nbinsy"),
+                                     psTTCluster_Barrel_XY.getParameter<double>("ymin"),
+                                     psTTCluster_Barrel_XY.getParameter<double>("ymax"));
   Cluster_Barrel_XY->setAxisTitle("L1 Cluster Barrel position x [cm]", 1);
   Cluster_Barrel_XY->setAxisTitle("L1 Cluster Barrel position y [cm]", 2);
 
-  edm::ParameterSet psTTCluster_Endcap_Fw_XY =  conf_.getParameter<edm::ParameterSet>("TH2TTCluster_Position");
+  edm::ParameterSet psTTCluster_Endcap_Fw_XY = conf_.getParameter<edm::ParameterSet>("TH2TTCluster_Position");
   HistoName = "Cluster_Endcap_Fw_XY";
-  Cluster_Endcap_Fw_XY = iBooker.book2D(HistoName, HistoName,
-      psTTCluster_Endcap_Fw_XY.getParameter<int32_t>("Nbinsx"),
-      psTTCluster_Endcap_Fw_XY.getParameter<double>("xmin"),
-      psTTCluster_Endcap_Fw_XY.getParameter<double>("xmax"),
-      psTTCluster_Endcap_Fw_XY.getParameter<int32_t>("Nbinsy"),
-      psTTCluster_Endcap_Fw_XY.getParameter<double>("ymin"),
-      psTTCluster_Endcap_Fw_XY.getParameter<double>("ymax"));
+  Cluster_Endcap_Fw_XY = iBooker.book2D(HistoName,
+                                        HistoName,
+                                        psTTCluster_Endcap_Fw_XY.getParameter<int32_t>("Nbinsx"),
+                                        psTTCluster_Endcap_Fw_XY.getParameter<double>("xmin"),
+                                        psTTCluster_Endcap_Fw_XY.getParameter<double>("xmax"),
+                                        psTTCluster_Endcap_Fw_XY.getParameter<int32_t>("Nbinsy"),
+                                        psTTCluster_Endcap_Fw_XY.getParameter<double>("ymin"),
+                                        psTTCluster_Endcap_Fw_XY.getParameter<double>("ymax"));
   Cluster_Endcap_Fw_XY->setAxisTitle("L1 Cluster Forward Endcap position x [cm]", 1);
   Cluster_Endcap_Fw_XY->setAxisTitle("L1 Cluster Forward Endcap position y [cm]", 2);
 
-  edm::ParameterSet psTTCluster_Endcap_Bw_XY =  conf_.getParameter<edm::ParameterSet>("TH2TTCluster_Position");
+  edm::ParameterSet psTTCluster_Endcap_Bw_XY = conf_.getParameter<edm::ParameterSet>("TH2TTCluster_Position");
   HistoName = "Cluster_Endcap_Bw_XY";
-  Cluster_Endcap_Bw_XY = iBooker.book2D(HistoName, HistoName,
-      psTTCluster_Endcap_Bw_XY.getParameter<int32_t>("Nbinsx"),
-      psTTCluster_Endcap_Bw_XY.getParameter<double>("xmin"),
-      psTTCluster_Endcap_Bw_XY.getParameter<double>("xmax"),
-      psTTCluster_Endcap_Bw_XY.getParameter<int32_t>("Nbinsy"),
-      psTTCluster_Endcap_Bw_XY.getParameter<double>("ymin"),
-      psTTCluster_Endcap_Bw_XY.getParameter<double>("ymax"));
+  Cluster_Endcap_Bw_XY = iBooker.book2D(HistoName,
+                                        HistoName,
+                                        psTTCluster_Endcap_Bw_XY.getParameter<int32_t>("Nbinsx"),
+                                        psTTCluster_Endcap_Bw_XY.getParameter<double>("xmin"),
+                                        psTTCluster_Endcap_Bw_XY.getParameter<double>("xmax"),
+                                        psTTCluster_Endcap_Bw_XY.getParameter<int32_t>("Nbinsy"),
+                                        psTTCluster_Endcap_Bw_XY.getParameter<double>("ymin"),
+                                        psTTCluster_Endcap_Bw_XY.getParameter<double>("ymax"));
   Cluster_Endcap_Bw_XY->setAxisTitle("L1 Cluster Backward Endcap position x [cm]", 1);
   Cluster_Endcap_Bw_XY->setAxisTitle("L1 Cluster Backward Endcap position y [cm]", 2);
 
-  //TTCluster #rho vs. z
-  edm::ParameterSet psTTCluster_RZ =  conf_.getParameter<edm::ParameterSet>("TH2TTCluster_RZ");
+  // TTCluster #rho vs. z
+  edm::ParameterSet psTTCluster_RZ = conf_.getParameter<edm::ParameterSet>("TH2TTCluster_RZ");
   HistoName = "Cluster_RZ";
-  Cluster_RZ = iBooker.book2D(HistoName, HistoName,
-      psTTCluster_RZ.getParameter<int32_t>("Nbinsx"),
-      psTTCluster_RZ.getParameter<double>("xmin"),
-      psTTCluster_RZ.getParameter<double>("xmax"),
-      psTTCluster_RZ.getParameter<int32_t>("Nbinsy"),
-      psTTCluster_RZ.getParameter<double>("ymin"),
-      psTTCluster_RZ.getParameter<double>("ymax"));
+  Cluster_RZ = iBooker.book2D(HistoName,
+                              HistoName,
+                              psTTCluster_RZ.getParameter<int32_t>("Nbinsx"),
+                              psTTCluster_RZ.getParameter<double>("xmin"),
+                              psTTCluster_RZ.getParameter<double>("xmax"),
+                              psTTCluster_RZ.getParameter<int32_t>("Nbinsy"),
+                              psTTCluster_RZ.getParameter<double>("ymin"),
+                              psTTCluster_RZ.getParameter<double>("ymax"));
   Cluster_RZ->setAxisTitle("L1 Cluster position z [cm]", 1);
   Cluster_RZ->setAxisTitle("L1 Cluster position #rho [cm]", 2);
 
-} //end of method
+}  // end of method
 
 DEFINE_FWK_MODULE(OuterTrackerMonitorTTCluster);
diff --git a/DQM/SiOuterTracker/plugins/OuterTrackerMonitorTTStub.cc b/DQM/SiOuterTracker/plugins/OuterTrackerMonitorTTStub.cc
index 4a4ef087bf53e..f9f4307038602 100644
--- a/DQM/SiOuterTracker/plugins/OuterTrackerMonitorTTStub.cc
+++ b/DQM/SiOuterTracker/plugins/OuterTrackerMonitorTTStub.cc
@@ -3,7 +3,8 @@
 // Package:    SiOuterTracker
 // Class:      SiOuterTracker
 //
-/**\class SiOuterTracker OuterTrackerMonitorTTStub.cc DQM/SiOuterTracker/plugins/OuterTrackerMonitorTTStub.cc
+/**\class SiOuterTracker OuterTrackerMonitorTTStub.cc
+ DQM/SiOuterTracker/plugins/OuterTrackerMonitorTTStub.cc
 
  Description: [one line class summary]
 
@@ -17,75 +18,73 @@
 //
 
 // system include files
+#include <fstream>
+#include <iostream>
 #include <memory>
-#include <vector>
 #include <numeric>
-#include <iostream>
-#include <fstream>
+#include <vector>
 
 // user include files
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQM/SiOuterTracker/interface/OuterTrackerMonitorTTStub.h"
 #include "DataFormats/L1TrackTrigger/interface/TTStub.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 
 // constructors and destructor
-OuterTrackerMonitorTTStub::OuterTrackerMonitorTTStub(const edm::ParameterSet& iConfig)
-:conf_(iConfig)
-{
-   //now do what ever initialization is needed
-   topFolderName_ = conf_.getParameter<std::string>("TopFolderName");
-   tagTTStubsToken_ = consumes<edmNew::DetSetVector< TTStub< Ref_Phase2TrackerDigi_ > > > (conf_.getParameter<edm::InputTag>("TTStubs") );
+OuterTrackerMonitorTTStub::OuterTrackerMonitorTTStub(const edm::ParameterSet &iConfig) : conf_(iConfig) {
+  // now do what ever initialization is needed
+  topFolderName_ = conf_.getParameter<std::string>("TopFolderName");
+  tagTTStubsToken_ =
+      consumes<edmNew::DetSetVector<TTStub<Ref_Phase2TrackerDigi_>>>(conf_.getParameter<edm::InputTag>("TTStubs"));
 }
 
-
-OuterTrackerMonitorTTStub::~OuterTrackerMonitorTTStub()
-{
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+OuterTrackerMonitorTTStub::~OuterTrackerMonitorTTStub() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
 // member functions
 
 // ------------ method called for each event  ------------
-void
-OuterTrackerMonitorTTStub::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void OuterTrackerMonitorTTStub::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   /// Track Trigger Stubs
-  edm::Handle< edmNew::DetSetVector< TTStub< Ref_Phase2TrackerDigi_ > > > Phase2TrackerDigiTTStubHandle;
-  iEvent.getByToken( tagTTStubsToken_, Phase2TrackerDigiTTStubHandle );
+  edm::Handle<edmNew::DetSetVector<TTStub<Ref_Phase2TrackerDigi_>>> Phase2TrackerDigiTTStubHandle;
+  iEvent.getByToken(tagTTStubsToken_, Phase2TrackerDigiTTStubHandle);
 
   /// Geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
-  const TrackerTopology* tTopo;
-  iSetup.get< TrackerTopologyRcd >().get(tTopoHandle);
+  const TrackerTopology *tTopo;
+  iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
   tTopo = tTopoHandle.product();
 
-  edm::ESHandle< TrackerGeometry > tGeometryHandle;
-  const TrackerGeometry* theTrackerGeometry;
-  iSetup.get< TrackerDigiGeometryRecord >().get( tGeometryHandle );
+  edm::ESHandle<TrackerGeometry> tGeometryHandle;
+  const TrackerGeometry *theTrackerGeometry;
+  iSetup.get<TrackerDigiGeometryRecord>().get(tGeometryHandle);
   theTrackerGeometry = tGeometryHandle.product();
 
   /// Loop over input Stubs
-  typename edmNew::DetSetVector< TTStub< Ref_Phase2TrackerDigi_ > >::const_iterator inputIter;
-  typename edmNew::DetSet< TTStub< Ref_Phase2TrackerDigi_ > >::const_iterator contentIter;
-   //Adding protection
-   if ( !Phase2TrackerDigiTTStubHandle.isValid() )  return;
-
-  for ( inputIter = Phase2TrackerDigiTTStubHandle->begin(); inputIter != Phase2TrackerDigiTTStubHandle->end(); ++inputIter ) {
-    for ( contentIter = inputIter->begin(); contentIter != inputIter->end(); ++contentIter ) {
+  typename edmNew::DetSetVector<TTStub<Ref_Phase2TrackerDigi_>>::const_iterator inputIter;
+  typename edmNew::DetSet<TTStub<Ref_Phase2TrackerDigi_>>::const_iterator contentIter;
+  // Adding protection
+  if (!Phase2TrackerDigiTTStubHandle.isValid())
+    return;
+
+  for (inputIter = Phase2TrackerDigiTTStubHandle->begin(); inputIter != Phase2TrackerDigiTTStubHandle->end();
+       ++inputIter) {
+    for (contentIter = inputIter->begin(); contentIter != inputIter->end(); ++contentIter) {
       /// Make reference stub
-      edm::Ref< edmNew::DetSetVector< TTStub< Ref_Phase2TrackerDigi_ > >, TTStub< Ref_Phase2TrackerDigi_ > > tempStubRef = edmNew::makeRefTo( Phase2TrackerDigiTTStubHandle, contentIter );
+      edm::Ref<edmNew::DetSetVector<TTStub<Ref_Phase2TrackerDigi_>>, TTStub<Ref_Phase2TrackerDigi_>> tempStubRef =
+          edmNew::makeRefTo(Phase2TrackerDigiTTStubHandle, contentIter);
 
       /// Get det ID (place of the stub)
       //  tempStubRef->getDetId() gives the stackDetId, not rawId
-      DetId detIdStub = theTrackerGeometry->idToDet( (tempStubRef->getClusterRef(0))->getDetId() )->geographicalId();
+      DetId detIdStub = theTrackerGeometry->idToDet((tempStubRef->getClusterRef(0))->getDetId())->geographicalId();
 
       /// Get trigger displacement/offset
       double displStub = tempStubRef->getTriggerDisplacement();
@@ -93,22 +92,21 @@ OuterTrackerMonitorTTStub::analyze(const edm::Event& iEvent, const edm::EventSet
 
       /// Define position stub by position inner cluster
       MeasurementPoint mp = (tempStubRef->getClusterRef(0))->findAverageLocalCoordinates();
-      const GeomDet* theGeomDet = theTrackerGeometry->idToDet(detIdStub);
-      Global3DPoint posStub = theGeomDet->surface().toGlobal( theGeomDet->topology().localPosition(mp) );
+      const GeomDet *theGeomDet = theTrackerGeometry->idToDet(detIdStub);
+      Global3DPoint posStub = theGeomDet->surface().toGlobal(theGeomDet->topology().localPosition(mp));
 
       Stub_Eta->Fill(posStub.eta());
       Stub_Phi->Fill(posStub.phi());
       Stub_R->Fill(posStub.perp());
-      Stub_RZ->Fill( posStub.z(), posStub.perp() );
+      Stub_RZ->Fill(posStub.z(), posStub.perp());
 
-      if ( detIdStub.subdetId() == static_cast<int>(StripSubdetector::TOB) ) { // Phase 2 Outer Tracker Barrel
+      if (detIdStub.subdetId() == static_cast<int>(StripSubdetector::TOB)) {  // Phase 2 Outer Tracker Barrel
         Stub_Barrel->Fill(tTopo->layer(detIdStub));
-        Stub_Barrel_XY->Fill( posStub.x(), posStub.y() );
+        Stub_Barrel_XY->Fill(posStub.x(), posStub.y());
         Stub_Barrel_W->Fill(tTopo->layer(detIdStub), displStub - offsetStub);
         Stub_Barrel_O->Fill(tTopo->layer(detIdStub), offsetStub);
-      }
-      else if ( detIdStub.subdetId() == static_cast<int>(StripSubdetector::TID) ) { // Phase 2 Outer Tracker Endcap
-        int disc = tTopo->layer(detIdStub); // returns wheel
+      } else if (detIdStub.subdetId() == static_cast<int>(StripSubdetector::TID)) {  // Phase 2 Outer Tracker Endcap
+        int disc = tTopo->layer(detIdStub);                                          // returns wheel
         int ring = tTopo->tidRing(detIdStub);
         Stub_Endcap_Disc->Fill(disc);
         Stub_Endcap_Ring->Fill(ring);
@@ -117,304 +115,329 @@ OuterTrackerMonitorTTStub::analyze(const edm::Event& iEvent, const edm::EventSet
         Stub_Endcap_Disc_O->Fill(disc, offsetStub);
         Stub_Endcap_Ring_O->Fill(ring, offsetStub);
 
-        if ( posStub.z() > 0 ) {
-          Stub_Endcap_Fw_XY->Fill( posStub.x(), posStub.y() );
+        if (posStub.z() > 0) {
+          Stub_Endcap_Fw_XY->Fill(posStub.x(), posStub.y());
           Stub_Endcap_Disc_Fw->Fill(disc);
-          Stub_Endcap_Ring_Fw[disc-1]->Fill(ring);
-          Stub_Endcap_Ring_W_Fw[disc-1]->Fill(ring, displStub - offsetStub);
-          Stub_Endcap_Ring_O_Fw[disc-1]->Fill(ring, offsetStub);
-        }
-        else {
-          Stub_Endcap_Bw_XY->Fill( posStub.x(), posStub.y() );
+          Stub_Endcap_Ring_Fw[disc - 1]->Fill(ring);
+          Stub_Endcap_Ring_W_Fw[disc - 1]->Fill(ring, displStub - offsetStub);
+          Stub_Endcap_Ring_O_Fw[disc - 1]->Fill(ring, offsetStub);
+        } else {
+          Stub_Endcap_Bw_XY->Fill(posStub.x(), posStub.y());
           Stub_Endcap_Disc_Bw->Fill(disc);
-          Stub_Endcap_Ring_Bw[disc-1]->Fill(ring);
-          Stub_Endcap_Ring_W_Bw[disc-1]->Fill(ring, displStub - offsetStub);
-          Stub_Endcap_Ring_O_Bw[disc-1]->Fill(ring, offsetStub);
+          Stub_Endcap_Ring_Bw[disc - 1]->Fill(ring);
+          Stub_Endcap_Ring_W_Bw[disc - 1]->Fill(ring, displStub - offsetStub);
+          Stub_Endcap_Ring_O_Bw[disc - 1]->Fill(ring, offsetStub);
         }
       }
     }
   }
-} // end of method
+}  // end of method
 
 // ------------ method called when starting to processes a run  ------------
-void OuterTrackerMonitorTTStub::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const & run, edm::EventSetup const & es) {
+void OuterTrackerMonitorTTStub::bookHistograms(DQMStore::IBooker &iBooker,
+                                               edm::Run const &run,
+                                               edm::EventSetup const &es) {
   std::string HistoName;
   const int numDiscs = 5;
-  iBooker.setCurrentFolder(topFolderName_+"/Stubs/Position");
+  iBooker.setCurrentFolder(topFolderName_ + "/Stubs/Position");
 
-  edm::ParameterSet psTTStub_Barrel_XY =  conf_.getParameter<edm::ParameterSet>("TH2TTStub_Position");
+  edm::ParameterSet psTTStub_Barrel_XY = conf_.getParameter<edm::ParameterSet>("TH2TTStub_Position");
   HistoName = "Stub_Barrel_XY";
-  Stub_Barrel_XY = iBooker.book2D(HistoName, HistoName,
-      psTTStub_Barrel_XY.getParameter<int32_t>("Nbinsx"),
-      psTTStub_Barrel_XY.getParameter<double>("xmin"),
-      psTTStub_Barrel_XY.getParameter<double>("xmax"),
-      psTTStub_Barrel_XY.getParameter<int32_t>("Nbinsy"),
-      psTTStub_Barrel_XY.getParameter<double>("ymin"),
-      psTTStub_Barrel_XY.getParameter<double>("ymax"));
+  Stub_Barrel_XY = iBooker.book2D(HistoName,
+                                  HistoName,
+                                  psTTStub_Barrel_XY.getParameter<int32_t>("Nbinsx"),
+                                  psTTStub_Barrel_XY.getParameter<double>("xmin"),
+                                  psTTStub_Barrel_XY.getParameter<double>("xmax"),
+                                  psTTStub_Barrel_XY.getParameter<int32_t>("Nbinsy"),
+                                  psTTStub_Barrel_XY.getParameter<double>("ymin"),
+                                  psTTStub_Barrel_XY.getParameter<double>("ymax"));
   Stub_Barrel_XY->setAxisTitle("L1 Stub Barrel position x [cm]", 1);
   Stub_Barrel_XY->setAxisTitle("L1 Stub Barrel position y [cm]", 2);
 
-  edm::ParameterSet psTTStub_Endcap_Fw_XY =  conf_.getParameter<edm::ParameterSet>("TH2TTStub_Position");
+  edm::ParameterSet psTTStub_Endcap_Fw_XY = conf_.getParameter<edm::ParameterSet>("TH2TTStub_Position");
   HistoName = "Stub_Endcap_Fw_XY";
-  Stub_Endcap_Fw_XY = iBooker.book2D(HistoName, HistoName,
-      psTTStub_Endcap_Fw_XY.getParameter<int32_t>("Nbinsx"),
-      psTTStub_Endcap_Fw_XY.getParameter<double>("xmin"),
-      psTTStub_Endcap_Fw_XY.getParameter<double>("xmax"),
-      psTTStub_Endcap_Fw_XY.getParameter<int32_t>("Nbinsy"),
-      psTTStub_Endcap_Fw_XY.getParameter<double>("ymin"),
-      psTTStub_Endcap_Fw_XY.getParameter<double>("ymax"));
+  Stub_Endcap_Fw_XY = iBooker.book2D(HistoName,
+                                     HistoName,
+                                     psTTStub_Endcap_Fw_XY.getParameter<int32_t>("Nbinsx"),
+                                     psTTStub_Endcap_Fw_XY.getParameter<double>("xmin"),
+                                     psTTStub_Endcap_Fw_XY.getParameter<double>("xmax"),
+                                     psTTStub_Endcap_Fw_XY.getParameter<int32_t>("Nbinsy"),
+                                     psTTStub_Endcap_Fw_XY.getParameter<double>("ymin"),
+                                     psTTStub_Endcap_Fw_XY.getParameter<double>("ymax"));
   Stub_Endcap_Fw_XY->setAxisTitle("L1 Stub Endcap position x [cm]", 1);
   Stub_Endcap_Fw_XY->setAxisTitle("L1 Stub Endcap position y [cm]", 2);
 
-  edm::ParameterSet psTTStub_Endcap_Bw_XY =  conf_.getParameter<edm::ParameterSet>("TH2TTStub_Position");
+  edm::ParameterSet psTTStub_Endcap_Bw_XY = conf_.getParameter<edm::ParameterSet>("TH2TTStub_Position");
   HistoName = "Stub_Endcap_Bw_XY";
-  Stub_Endcap_Bw_XY = iBooker.book2D(HistoName, HistoName,
-      psTTStub_Endcap_Bw_XY.getParameter<int32_t>("Nbinsx"),
-      psTTStub_Endcap_Bw_XY.getParameter<double>("xmin"),
-      psTTStub_Endcap_Bw_XY.getParameter<double>("xmax"),
-      psTTStub_Endcap_Bw_XY.getParameter<int32_t>("Nbinsy"),
-      psTTStub_Endcap_Bw_XY.getParameter<double>("ymin"),
-      psTTStub_Endcap_Bw_XY.getParameter<double>("ymax"));
+  Stub_Endcap_Bw_XY = iBooker.book2D(HistoName,
+                                     HistoName,
+                                     psTTStub_Endcap_Bw_XY.getParameter<int32_t>("Nbinsx"),
+                                     psTTStub_Endcap_Bw_XY.getParameter<double>("xmin"),
+                                     psTTStub_Endcap_Bw_XY.getParameter<double>("xmax"),
+                                     psTTStub_Endcap_Bw_XY.getParameter<int32_t>("Nbinsy"),
+                                     psTTStub_Endcap_Bw_XY.getParameter<double>("ymin"),
+                                     psTTStub_Endcap_Bw_XY.getParameter<double>("ymax"));
   Stub_Endcap_Bw_XY->setAxisTitle("L1 Stub Endcap position x [cm]", 1);
   Stub_Endcap_Bw_XY->setAxisTitle("L1 Stub Endcap position y [cm]", 2);
 
-  //TTStub #rho vs. z
-  edm::ParameterSet psTTStub_RZ =  conf_.getParameter<edm::ParameterSet>("TH2TTStub_RZ");
+  // TTStub #rho vs. z
+  edm::ParameterSet psTTStub_RZ = conf_.getParameter<edm::ParameterSet>("TH2TTStub_RZ");
   HistoName = "Stub_RZ";
-  Stub_RZ = iBooker.book2D(HistoName, HistoName,
-      psTTStub_RZ.getParameter<int32_t>("Nbinsx"),
-      psTTStub_RZ.getParameter<double>("xmin"),
-      psTTStub_RZ.getParameter<double>("xmax"),
-      psTTStub_RZ.getParameter<int32_t>("Nbinsy"),
-      psTTStub_RZ.getParameter<double>("ymin"),
-      psTTStub_RZ.getParameter<double>("ymax"));
+  Stub_RZ = iBooker.book2D(HistoName,
+                           HistoName,
+                           psTTStub_RZ.getParameter<int32_t>("Nbinsx"),
+                           psTTStub_RZ.getParameter<double>("xmin"),
+                           psTTStub_RZ.getParameter<double>("xmax"),
+                           psTTStub_RZ.getParameter<int32_t>("Nbinsy"),
+                           psTTStub_RZ.getParameter<double>("ymin"),
+                           psTTStub_RZ.getParameter<double>("ymax"));
   Stub_RZ->setAxisTitle("L1 Stub position z [cm]", 1);
   Stub_RZ->setAxisTitle("L1 Stub position #rho [cm]", 2);
 
-  iBooker.setCurrentFolder(topFolderName_+"/Stubs");
-  //TTStub eta
-  edm::ParameterSet psTTStub_Eta =  conf_.getParameter<edm::ParameterSet>("TH1TTStub_Eta");
+  iBooker.setCurrentFolder(topFolderName_ + "/Stubs");
+  // TTStub eta
+  edm::ParameterSet psTTStub_Eta = conf_.getParameter<edm::ParameterSet>("TH1TTStub_Eta");
   HistoName = "Stub_Eta";
-  Stub_Eta = iBooker.book1D(HistoName,HistoName,
-      psTTStub_Eta.getParameter<int32_t>("Nbinsx"),
-      psTTStub_Eta.getParameter<double>("xmin"),
-      psTTStub_Eta.getParameter<double>("xmax"));
-  Stub_Eta->setAxisTitle("#eta",1);
-  Stub_Eta->setAxisTitle("# L1 Stubs ",2);
-
-  //TTStub phi
-  edm::ParameterSet psTTStub_Phi =  conf_.getParameter<edm::ParameterSet>("TH1TTStub_Phi");
+  Stub_Eta = iBooker.book1D(HistoName,
+                            HistoName,
+                            psTTStub_Eta.getParameter<int32_t>("Nbinsx"),
+                            psTTStub_Eta.getParameter<double>("xmin"),
+                            psTTStub_Eta.getParameter<double>("xmax"));
+  Stub_Eta->setAxisTitle("#eta", 1);
+  Stub_Eta->setAxisTitle("# L1 Stubs ", 2);
+
+  // TTStub phi
+  edm::ParameterSet psTTStub_Phi = conf_.getParameter<edm::ParameterSet>("TH1TTStub_Phi");
   HistoName = "Stub_Phi";
-  Stub_Phi = iBooker.book1D(HistoName,HistoName,
-      psTTStub_Phi.getParameter<int32_t>("Nbinsx"),
-      psTTStub_Phi.getParameter<double>("xmin"),
-      psTTStub_Phi.getParameter<double>("xmax"));
-  Stub_Phi->setAxisTitle("#phi",1);
-  Stub_Phi->setAxisTitle("# L1 Stubs ",2);
-
-  //TTStub R
-  edm::ParameterSet psTTStub_R =  conf_.getParameter<edm::ParameterSet>("TH1TTStub_R");
+  Stub_Phi = iBooker.book1D(HistoName,
+                            HistoName,
+                            psTTStub_Phi.getParameter<int32_t>("Nbinsx"),
+                            psTTStub_Phi.getParameter<double>("xmin"),
+                            psTTStub_Phi.getParameter<double>("xmax"));
+  Stub_Phi->setAxisTitle("#phi", 1);
+  Stub_Phi->setAxisTitle("# L1 Stubs ", 2);
+
+  // TTStub R
+  edm::ParameterSet psTTStub_R = conf_.getParameter<edm::ParameterSet>("TH1TTStub_R");
   HistoName = "Stub_R";
-  Stub_R = iBooker.book1D(HistoName,HistoName,
-      psTTStub_R.getParameter<int32_t>("Nbinsx"),
-      psTTStub_R.getParameter<double>("xmin"),
-      psTTStub_R.getParameter<double>("xmax"));
-  Stub_R->setAxisTitle("R",1);
-  Stub_R->setAxisTitle("# L1 Stubs ",2);
-
-  iBooker.setCurrentFolder(topFolderName_+"/Stubs/NStubs");
-  //TTStub barrel stack
-  edm::ParameterSet psTTStub_Barrel =  conf_.getParameter<edm::ParameterSet>("TH1TTStub_Layers");
+  Stub_R = iBooker.book1D(HistoName,
+                          HistoName,
+                          psTTStub_R.getParameter<int32_t>("Nbinsx"),
+                          psTTStub_R.getParameter<double>("xmin"),
+                          psTTStub_R.getParameter<double>("xmax"));
+  Stub_R->setAxisTitle("R", 1);
+  Stub_R->setAxisTitle("# L1 Stubs ", 2);
+
+  iBooker.setCurrentFolder(topFolderName_ + "/Stubs/NStubs");
+  // TTStub barrel stack
+  edm::ParameterSet psTTStub_Barrel = conf_.getParameter<edm::ParameterSet>("TH1TTStub_Layers");
   HistoName = "NStubs_Barrel";
-  Stub_Barrel = iBooker.book1D(HistoName,HistoName,
-      psTTStub_Barrel.getParameter<int32_t>("Nbinsx"),
-      psTTStub_Barrel.getParameter<double>("xmin"),
-      psTTStub_Barrel.getParameter<double>("xmax"));
-  Stub_Barrel->setAxisTitle("Barrel Layer",1);
-  Stub_Barrel->setAxisTitle("# L1 Stubs ",2);
-
-  //TTStub Endcap stack
-  edm::ParameterSet psTTStub_ECDisc =  conf_.getParameter<edm::ParameterSet>("TH1TTStub_Discs");
+  Stub_Barrel = iBooker.book1D(HistoName,
+                               HistoName,
+                               psTTStub_Barrel.getParameter<int32_t>("Nbinsx"),
+                               psTTStub_Barrel.getParameter<double>("xmin"),
+                               psTTStub_Barrel.getParameter<double>("xmax"));
+  Stub_Barrel->setAxisTitle("Barrel Layer", 1);
+  Stub_Barrel->setAxisTitle("# L1 Stubs ", 2);
+
+  // TTStub Endcap stack
+  edm::ParameterSet psTTStub_ECDisc = conf_.getParameter<edm::ParameterSet>("TH1TTStub_Discs");
   HistoName = "NStubs_Endcap_Disc";
-  Stub_Endcap_Disc = iBooker.book1D(HistoName,HistoName,
-      psTTStub_ECDisc.getParameter<int32_t>("Nbinsx"),
-      psTTStub_ECDisc.getParameter<double>("xmin"),
-      psTTStub_ECDisc.getParameter<double>("xmax"));
-  Stub_Endcap_Disc->setAxisTitle("Endcap Disc",1);
-  Stub_Endcap_Disc->setAxisTitle("# L1 Stubs ",2);
-
-  //TTStub Endcap stack
+  Stub_Endcap_Disc = iBooker.book1D(HistoName,
+                                    HistoName,
+                                    psTTStub_ECDisc.getParameter<int32_t>("Nbinsx"),
+                                    psTTStub_ECDisc.getParameter<double>("xmin"),
+                                    psTTStub_ECDisc.getParameter<double>("xmax"));
+  Stub_Endcap_Disc->setAxisTitle("Endcap Disc", 1);
+  Stub_Endcap_Disc->setAxisTitle("# L1 Stubs ", 2);
+
+  // TTStub Endcap stack
   HistoName = "NStubs_Endcap_Disc_Fw";
-  Stub_Endcap_Disc_Fw = iBooker.book1D(HistoName,HistoName,
-      psTTStub_ECDisc.getParameter<int32_t>("Nbinsx"),
-      psTTStub_ECDisc.getParameter<double>("xmin"),
-      psTTStub_ECDisc.getParameter<double>("xmax"));
-  Stub_Endcap_Disc_Fw->setAxisTitle("Forward Endcap Disc",1);
-  Stub_Endcap_Disc_Fw->setAxisTitle("# L1 Stubs ",2);
-
-  //TTStub Endcap stack
+  Stub_Endcap_Disc_Fw = iBooker.book1D(HistoName,
+                                       HistoName,
+                                       psTTStub_ECDisc.getParameter<int32_t>("Nbinsx"),
+                                       psTTStub_ECDisc.getParameter<double>("xmin"),
+                                       psTTStub_ECDisc.getParameter<double>("xmax"));
+  Stub_Endcap_Disc_Fw->setAxisTitle("Forward Endcap Disc", 1);
+  Stub_Endcap_Disc_Fw->setAxisTitle("# L1 Stubs ", 2);
+
+  // TTStub Endcap stack
   HistoName = "NStubs_Endcap_Disc_Bw";
-  Stub_Endcap_Disc_Bw = iBooker.book1D(HistoName,HistoName,
-      psTTStub_ECDisc.getParameter<int32_t>("Nbinsx"),
-      psTTStub_ECDisc.getParameter<double>("xmin"),
-      psTTStub_ECDisc.getParameter<double>("xmax"));
-  Stub_Endcap_Disc_Bw->setAxisTitle("Backward Endcap Disc",1);
-  Stub_Endcap_Disc_Bw->setAxisTitle("# L1 Stubs ",2);
-
-  edm::ParameterSet psTTStub_ECRing =  conf_.getParameter<edm::ParameterSet>("TH1TTStub_Rings");
+  Stub_Endcap_Disc_Bw = iBooker.book1D(HistoName,
+                                       HistoName,
+                                       psTTStub_ECDisc.getParameter<int32_t>("Nbinsx"),
+                                       psTTStub_ECDisc.getParameter<double>("xmin"),
+                                       psTTStub_ECDisc.getParameter<double>("xmax"));
+  Stub_Endcap_Disc_Bw->setAxisTitle("Backward Endcap Disc", 1);
+  Stub_Endcap_Disc_Bw->setAxisTitle("# L1 Stubs ", 2);
+
+  edm::ParameterSet psTTStub_ECRing = conf_.getParameter<edm::ParameterSet>("TH1TTStub_Rings");
   HistoName = "NStubs_Endcap_Ring";
-  Stub_Endcap_Ring = iBooker.book1D(HistoName,HistoName,
-      psTTStub_ECRing.getParameter<int32_t>("Nbinsx"),
-      psTTStub_ECRing.getParameter<double>("xmin"),
-      psTTStub_ECRing.getParameter<double>("xmax"));
-  Stub_Endcap_Ring->setAxisTitle("Endcap Ring",1);
-  Stub_Endcap_Ring->setAxisTitle("# L1 Stubs ",2);
+  Stub_Endcap_Ring = iBooker.book1D(HistoName,
+                                    HistoName,
+                                    psTTStub_ECRing.getParameter<int32_t>("Nbinsx"),
+                                    psTTStub_ECRing.getParameter<double>("xmin"),
+                                    psTTStub_ECRing.getParameter<double>("xmax"));
+  Stub_Endcap_Ring->setAxisTitle("Endcap Ring", 1);
+  Stub_Endcap_Ring->setAxisTitle("# L1 Stubs ", 2);
 
   for (int i = 0; i < numDiscs; i++) {
-    HistoName = "NStubs_Disc+"+std::to_string(i+1);
-    //TTStub Endcap stack
-    Stub_Endcap_Ring_Fw[i] = iBooker.book1D(HistoName, HistoName,
-        psTTStub_ECRing.getParameter<int32_t>("Nbinsx"),
-        psTTStub_ECRing.getParameter<double>("xmin"),
-        psTTStub_ECRing.getParameter<double>("xmax"));
-    Stub_Endcap_Ring_Fw[i]->setAxisTitle("Endcap Ring",1);
-    Stub_Endcap_Ring_Fw[i]->setAxisTitle("# L1 Stubs ",2);
+    HistoName = "NStubs_Disc+" + std::to_string(i + 1);
+    // TTStub Endcap stack
+    Stub_Endcap_Ring_Fw[i] = iBooker.book1D(HistoName,
+                                            HistoName,
+                                            psTTStub_ECRing.getParameter<int32_t>("Nbinsx"),
+                                            psTTStub_ECRing.getParameter<double>("xmin"),
+                                            psTTStub_ECRing.getParameter<double>("xmax"));
+    Stub_Endcap_Ring_Fw[i]->setAxisTitle("Endcap Ring", 1);
+    Stub_Endcap_Ring_Fw[i]->setAxisTitle("# L1 Stubs ", 2);
   }
 
   for (int i = 0; i < numDiscs; i++) {
-    HistoName = "NStubs_Disc-"+std::to_string(i+1);
-    //TTStub Endcap stack
-    Stub_Endcap_Ring_Bw[i] = iBooker.book1D(HistoName, HistoName,
-        psTTStub_ECRing.getParameter<int32_t>("Nbinsx"),
-        psTTStub_ECRing.getParameter<double>("xmin"),
-        psTTStub_ECRing.getParameter<double>("xmax"));
-    Stub_Endcap_Ring_Bw[i]->setAxisTitle("Endcap Ring",1);
-    Stub_Endcap_Ring_Bw[i]->setAxisTitle("# L1 Stubs ",2);
+    HistoName = "NStubs_Disc-" + std::to_string(i + 1);
+    // TTStub Endcap stack
+    Stub_Endcap_Ring_Bw[i] = iBooker.book1D(HistoName,
+                                            HistoName,
+                                            psTTStub_ECRing.getParameter<int32_t>("Nbinsx"),
+                                            psTTStub_ECRing.getParameter<double>("xmin"),
+                                            psTTStub_ECRing.getParameter<double>("xmax"));
+    Stub_Endcap_Ring_Bw[i]->setAxisTitle("Endcap Ring", 1);
+    Stub_Endcap_Ring_Bw[i]->setAxisTitle("# L1 Stubs ", 2);
   }
 
-  //TTStub displ/offset
-  edm::ParameterSet psTTStub_Barrel_2D =  conf_.getParameter<edm::ParameterSet>("TH2TTStub_DisOf_Layer");
-  edm::ParameterSet psTTStub_ECDisc_2D =  conf_.getParameter<edm::ParameterSet>("TH2TTStub_DisOf_Disc");
-  edm::ParameterSet psTTStub_ECRing_2D =  conf_.getParameter<edm::ParameterSet>("TH2TTStub_DisOf_Ring");
+  // TTStub displ/offset
+  edm::ParameterSet psTTStub_Barrel_2D = conf_.getParameter<edm::ParameterSet>("TH2TTStub_DisOf_Layer");
+  edm::ParameterSet psTTStub_ECDisc_2D = conf_.getParameter<edm::ParameterSet>("TH2TTStub_DisOf_Disc");
+  edm::ParameterSet psTTStub_ECRing_2D = conf_.getParameter<edm::ParameterSet>("TH2TTStub_DisOf_Ring");
 
-  iBooker.setCurrentFolder(topFolderName_+"/Stubs/Width");
+  iBooker.setCurrentFolder(topFolderName_ + "/Stubs/Width");
   HistoName = "Stub_Width_Barrel";
-  Stub_Barrel_W = iBooker.book2D(HistoName, HistoName,
-      psTTStub_Barrel_2D.getParameter<int32_t>("Nbinsx"),
-      psTTStub_Barrel_2D.getParameter<double>("xmin"),
-      psTTStub_Barrel_2D.getParameter<double>("xmax"),
-      psTTStub_Barrel_2D.getParameter<int32_t>("Nbinsy"),
-      psTTStub_Barrel_2D.getParameter<double>("ymin"),
-      psTTStub_Barrel_2D.getParameter<double>("ymax"));
-  Stub_Barrel_W->setAxisTitle("Barrel Layer",1);
-  Stub_Barrel_W->setAxisTitle("Displacement - Offset",2);
+  Stub_Barrel_W = iBooker.book2D(HistoName,
+                                 HistoName,
+                                 psTTStub_Barrel_2D.getParameter<int32_t>("Nbinsx"),
+                                 psTTStub_Barrel_2D.getParameter<double>("xmin"),
+                                 psTTStub_Barrel_2D.getParameter<double>("xmax"),
+                                 psTTStub_Barrel_2D.getParameter<int32_t>("Nbinsy"),
+                                 psTTStub_Barrel_2D.getParameter<double>("ymin"),
+                                 psTTStub_Barrel_2D.getParameter<double>("ymax"));
+  Stub_Barrel_W->setAxisTitle("Barrel Layer", 1);
+  Stub_Barrel_W->setAxisTitle("Displacement - Offset", 2);
 
   HistoName = "Stub_Width_Endcap_Disc";
-  Stub_Endcap_Disc_W = iBooker.book2D(HistoName, HistoName,
-      psTTStub_ECDisc_2D.getParameter<int32_t>("Nbinsx"),
-      psTTStub_ECDisc_2D.getParameter<double>("xmin"),
-      psTTStub_ECDisc_2D.getParameter<double>("xmax"),
-      psTTStub_ECDisc_2D.getParameter<int32_t>("Nbinsy"),
-      psTTStub_ECDisc_2D.getParameter<double>("ymin"),
-      psTTStub_ECDisc_2D.getParameter<double>("ymax"));
-  Stub_Endcap_Disc_W->setAxisTitle("Endcap Disc",1);
-  Stub_Endcap_Disc_W->setAxisTitle("Displacement - Offset",2);
+  Stub_Endcap_Disc_W = iBooker.book2D(HistoName,
+                                      HistoName,
+                                      psTTStub_ECDisc_2D.getParameter<int32_t>("Nbinsx"),
+                                      psTTStub_ECDisc_2D.getParameter<double>("xmin"),
+                                      psTTStub_ECDisc_2D.getParameter<double>("xmax"),
+                                      psTTStub_ECDisc_2D.getParameter<int32_t>("Nbinsy"),
+                                      psTTStub_ECDisc_2D.getParameter<double>("ymin"),
+                                      psTTStub_ECDisc_2D.getParameter<double>("ymax"));
+  Stub_Endcap_Disc_W->setAxisTitle("Endcap Disc", 1);
+  Stub_Endcap_Disc_W->setAxisTitle("Displacement - Offset", 2);
 
   HistoName = "Stub_Width_Endcap_Ring";
-  Stub_Endcap_Ring_W = iBooker.book2D(HistoName, HistoName,
-      psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsx"),
-      psTTStub_ECRing_2D.getParameter<double>("xmin"),
-      psTTStub_ECRing_2D.getParameter<double>("xmax"),
-      psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsy"),
-      psTTStub_ECRing_2D.getParameter<double>("ymin"),
-      psTTStub_ECRing_2D.getParameter<double>("ymax"));
-  Stub_Endcap_Ring_W->setAxisTitle("Endcap Ring",1);
-  Stub_Endcap_Ring_W->setAxisTitle("Trigger Offset",2);
+  Stub_Endcap_Ring_W = iBooker.book2D(HistoName,
+                                      HistoName,
+                                      psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsx"),
+                                      psTTStub_ECRing_2D.getParameter<double>("xmin"),
+                                      psTTStub_ECRing_2D.getParameter<double>("xmax"),
+                                      psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsy"),
+                                      psTTStub_ECRing_2D.getParameter<double>("ymin"),
+                                      psTTStub_ECRing_2D.getParameter<double>("ymax"));
+  Stub_Endcap_Ring_W->setAxisTitle("Endcap Ring", 1);
+  Stub_Endcap_Ring_W->setAxisTitle("Trigger Offset", 2);
 
   for (int i = 0; i < numDiscs; i++) {
-    HistoName = "Stub_Width_Disc+"+std::to_string(i+1);
-    Stub_Endcap_Ring_W_Fw[i] = iBooker.book2D(HistoName, HistoName,
-        psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsx"),
-        psTTStub_ECRing_2D.getParameter<double>("xmin"),
-        psTTStub_ECRing_2D.getParameter<double>("xmax"),
-        psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsy"),
-        psTTStub_ECRing_2D.getParameter<double>("ymin"),
-        psTTStub_ECRing_2D.getParameter<double>("ymax"));
-    Stub_Endcap_Ring_W_Fw[i]->setAxisTitle("Endcap Ring",1);
-    Stub_Endcap_Ring_W_Fw[i]->setAxisTitle("Displacement - Offset",2);
+    HistoName = "Stub_Width_Disc+" + std::to_string(i + 1);
+    Stub_Endcap_Ring_W_Fw[i] = iBooker.book2D(HistoName,
+                                              HistoName,
+                                              psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsx"),
+                                              psTTStub_ECRing_2D.getParameter<double>("xmin"),
+                                              psTTStub_ECRing_2D.getParameter<double>("xmax"),
+                                              psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsy"),
+                                              psTTStub_ECRing_2D.getParameter<double>("ymin"),
+                                              psTTStub_ECRing_2D.getParameter<double>("ymax"));
+    Stub_Endcap_Ring_W_Fw[i]->setAxisTitle("Endcap Ring", 1);
+    Stub_Endcap_Ring_W_Fw[i]->setAxisTitle("Displacement - Offset", 2);
   }
 
   for (int i = 0; i < numDiscs; i++) {
-    HistoName = "Stub_Width_Disc-"+std::to_string(i+1);
-    Stub_Endcap_Ring_W_Bw[i] = iBooker.book2D(HistoName, HistoName,
-        psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsx"),
-        psTTStub_ECRing_2D.getParameter<double>("xmin"),
-        psTTStub_ECRing_2D.getParameter<double>("xmax"),
-        psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsy"),
-        psTTStub_ECRing_2D.getParameter<double>("ymin"),
-        psTTStub_ECRing_2D.getParameter<double>("ymax"));
-    Stub_Endcap_Ring_W_Bw[i]->setAxisTitle("Endcap Ring",1);
-    Stub_Endcap_Ring_W_Bw[i]->setAxisTitle("Displacement - Offset",2);
+    HistoName = "Stub_Width_Disc-" + std::to_string(i + 1);
+    Stub_Endcap_Ring_W_Bw[i] = iBooker.book2D(HistoName,
+                                              HistoName,
+                                              psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsx"),
+                                              psTTStub_ECRing_2D.getParameter<double>("xmin"),
+                                              psTTStub_ECRing_2D.getParameter<double>("xmax"),
+                                              psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsy"),
+                                              psTTStub_ECRing_2D.getParameter<double>("ymin"),
+                                              psTTStub_ECRing_2D.getParameter<double>("ymax"));
+    Stub_Endcap_Ring_W_Bw[i]->setAxisTitle("Endcap Ring", 1);
+    Stub_Endcap_Ring_W_Bw[i]->setAxisTitle("Displacement - Offset", 2);
   }
 
-  iBooker.setCurrentFolder(topFolderName_+"/Stubs/Offset");
+  iBooker.setCurrentFolder(topFolderName_ + "/Stubs/Offset");
   HistoName = "Stub_Offset_Barrel";
-  Stub_Barrel_O = iBooker.book2D(HistoName, HistoName,
-      psTTStub_Barrel_2D.getParameter<int32_t>("Nbinsx"),
-      psTTStub_Barrel_2D.getParameter<double>("xmin"),
-      psTTStub_Barrel_2D.getParameter<double>("xmax"),
-      psTTStub_Barrel_2D.getParameter<int32_t>("Nbinsy"),
-      psTTStub_Barrel_2D.getParameter<double>("ymin"),
-      psTTStub_Barrel_2D.getParameter<double>("ymax"));
-  Stub_Barrel_O->setAxisTitle("Barrel Layer",1);
-  Stub_Barrel_O->setAxisTitle("Trigger Offset",2);
+  Stub_Barrel_O = iBooker.book2D(HistoName,
+                                 HistoName,
+                                 psTTStub_Barrel_2D.getParameter<int32_t>("Nbinsx"),
+                                 psTTStub_Barrel_2D.getParameter<double>("xmin"),
+                                 psTTStub_Barrel_2D.getParameter<double>("xmax"),
+                                 psTTStub_Barrel_2D.getParameter<int32_t>("Nbinsy"),
+                                 psTTStub_Barrel_2D.getParameter<double>("ymin"),
+                                 psTTStub_Barrel_2D.getParameter<double>("ymax"));
+  Stub_Barrel_O->setAxisTitle("Barrel Layer", 1);
+  Stub_Barrel_O->setAxisTitle("Trigger Offset", 2);
 
   HistoName = "Stub_Offset_Endcap_Disc";
-  Stub_Endcap_Disc_O = iBooker.book2D(HistoName, HistoName,
-      psTTStub_ECDisc_2D.getParameter<int32_t>("Nbinsx"),
-      psTTStub_ECDisc_2D.getParameter<double>("xmin"),
-      psTTStub_ECDisc_2D.getParameter<double>("xmax"),
-      psTTStub_ECDisc_2D.getParameter<int32_t>("Nbinsy"),
-      psTTStub_ECDisc_2D.getParameter<double>("ymin"),
-      psTTStub_ECDisc_2D.getParameter<double>("ymax"));
-  Stub_Endcap_Disc_O->setAxisTitle("Endcap Disc",1);
-  Stub_Endcap_Disc_O->setAxisTitle("Trigger Offset",2);
+  Stub_Endcap_Disc_O = iBooker.book2D(HistoName,
+                                      HistoName,
+                                      psTTStub_ECDisc_2D.getParameter<int32_t>("Nbinsx"),
+                                      psTTStub_ECDisc_2D.getParameter<double>("xmin"),
+                                      psTTStub_ECDisc_2D.getParameter<double>("xmax"),
+                                      psTTStub_ECDisc_2D.getParameter<int32_t>("Nbinsy"),
+                                      psTTStub_ECDisc_2D.getParameter<double>("ymin"),
+                                      psTTStub_ECDisc_2D.getParameter<double>("ymax"));
+  Stub_Endcap_Disc_O->setAxisTitle("Endcap Disc", 1);
+  Stub_Endcap_Disc_O->setAxisTitle("Trigger Offset", 2);
 
   HistoName = "Stub_Offset_Endcap_Ring";
-  Stub_Endcap_Ring_O = iBooker.book2D(HistoName, HistoName,
-      psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsx"),
-      psTTStub_ECRing_2D.getParameter<double>("xmin"),
-      psTTStub_ECRing_2D.getParameter<double>("xmax"),
-      psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsy"),
-      psTTStub_ECRing_2D.getParameter<double>("ymin"),
-      psTTStub_ECRing_2D.getParameter<double>("ymax"));
-  Stub_Endcap_Ring_O->setAxisTitle("Endcap Ring",1);
-  Stub_Endcap_Ring_O->setAxisTitle("Trigger Offset",2);
+  Stub_Endcap_Ring_O = iBooker.book2D(HistoName,
+                                      HistoName,
+                                      psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsx"),
+                                      psTTStub_ECRing_2D.getParameter<double>("xmin"),
+                                      psTTStub_ECRing_2D.getParameter<double>("xmax"),
+                                      psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsy"),
+                                      psTTStub_ECRing_2D.getParameter<double>("ymin"),
+                                      psTTStub_ECRing_2D.getParameter<double>("ymax"));
+  Stub_Endcap_Ring_O->setAxisTitle("Endcap Ring", 1);
+  Stub_Endcap_Ring_O->setAxisTitle("Trigger Offset", 2);
 
   for (int i = 0; i < numDiscs; i++) {
-    HistoName = "Stub_Offset_Disc+"+std::to_string(i+1);
-    Stub_Endcap_Ring_O_Fw[i] = iBooker.book2D(HistoName, HistoName,
-        psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsx"),
-        psTTStub_ECRing_2D.getParameter<double>("xmin"),
-        psTTStub_ECRing_2D.getParameter<double>("xmax"),
-        psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsy"),
-        psTTStub_ECRing_2D.getParameter<double>("ymin"),
-        psTTStub_ECRing_2D.getParameter<double>("ymax"));
-    Stub_Endcap_Ring_O_Fw[i]->setAxisTitle("Endcap Ring",1);
-    Stub_Endcap_Ring_O_Fw[i]->setAxisTitle("Trigger Offset",2);
+    HistoName = "Stub_Offset_Disc+" + std::to_string(i + 1);
+    Stub_Endcap_Ring_O_Fw[i] = iBooker.book2D(HistoName,
+                                              HistoName,
+                                              psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsx"),
+                                              psTTStub_ECRing_2D.getParameter<double>("xmin"),
+                                              psTTStub_ECRing_2D.getParameter<double>("xmax"),
+                                              psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsy"),
+                                              psTTStub_ECRing_2D.getParameter<double>("ymin"),
+                                              psTTStub_ECRing_2D.getParameter<double>("ymax"));
+    Stub_Endcap_Ring_O_Fw[i]->setAxisTitle("Endcap Ring", 1);
+    Stub_Endcap_Ring_O_Fw[i]->setAxisTitle("Trigger Offset", 2);
   }
 
   for (int i = 0; i < numDiscs; i++) {
-    HistoName = "Stub_Offset_Disc-"+std::to_string(i+1);
-    Stub_Endcap_Ring_O_Bw[i] = iBooker.book2D(HistoName, HistoName,
-        psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsx"),
-        psTTStub_ECRing_2D.getParameter<double>("xmin"),
-        psTTStub_ECRing_2D.getParameter<double>("xmax"),
-        psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsy"),
-        psTTStub_ECRing_2D.getParameter<double>("ymin"),
-        psTTStub_ECRing_2D.getParameter<double>("ymax"));
-    Stub_Endcap_Ring_O_Bw[i]->setAxisTitle("Endcap Ring",1);
-    Stub_Endcap_Ring_O_Bw[i]->setAxisTitle("Trigger Offset",2);
+    HistoName = "Stub_Offset_Disc-" + std::to_string(i + 1);
+    Stub_Endcap_Ring_O_Bw[i] = iBooker.book2D(HistoName,
+                                              HistoName,
+                                              psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsx"),
+                                              psTTStub_ECRing_2D.getParameter<double>("xmin"),
+                                              psTTStub_ECRing_2D.getParameter<double>("xmax"),
+                                              psTTStub_ECRing_2D.getParameter<int32_t>("Nbinsy"),
+                                              psTTStub_ECRing_2D.getParameter<double>("ymin"),
+                                              psTTStub_ECRing_2D.getParameter<double>("ymax"));
+    Stub_Endcap_Ring_O_Bw[i]->setAxisTitle("Endcap Ring", 1);
+    Stub_Endcap_Ring_O_Bw[i]->setAxisTitle("Trigger Offset", 2);
   }
 }
 
diff --git a/DQM/SiOuterTracker/plugins/OuterTrackerMonitorTTTrack.cc b/DQM/SiOuterTracker/plugins/OuterTrackerMonitorTTTrack.cc
index 6270674196cc3..642bf02e015f8 100644
--- a/DQM/SiOuterTracker/plugins/OuterTrackerMonitorTTTrack.cc
+++ b/DQM/SiOuterTracker/plugins/OuterTrackerMonitorTTTrack.cc
@@ -5,15 +5,16 @@
 // Modified by: Emily MacDonald (emily.kaelyn.macdonald@cern.ch)
 
 // system include files
+#include <fstream>
+#include <iostream>
 #include <memory>
-#include <vector>
 #include <numeric>
-#include <iostream>
-#include <fstream>
 #include <string>
+#include <vector>
 
 // user include files
 #include "CommonTools/Statistics/interface/ChiSquaredProbability.h"
+#include "DQM/SiOuterTracker/interface/OuterTrackerMonitorTTTrack.h"
 #include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/Common/interface/DetSetVectorNew.h"
 #include "DataFormats/Common/interface/Ptr.h"
@@ -23,30 +24,27 @@
 #include "DataFormats/L1TrackTrigger/interface/TTTrack.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "DQM/SiOuterTracker/interface/OuterTrackerMonitorTTTrack.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
+#include "SimTracker/TrackTriggerAssociation/interface/TTClusterAssociationMap.h"
 #include "SimTracker/TrackTriggerAssociation/interface/TTStubAssociationMap.h"
 #include "SimTracker/TrackTriggerAssociation/interface/TTTrackAssociationMap.h"
-#include "SimTracker/TrackTriggerAssociation/interface/TTClusterAssociationMap.h"
 
 // constructors and destructor
-OuterTrackerMonitorTTTrack::OuterTrackerMonitorTTTrack(const edm::ParameterSet& iConfig)
-:conf_(iConfig)
-{
+OuterTrackerMonitorTTTrack::OuterTrackerMonitorTTTrack(const edm::ParameterSet &iConfig) : conf_(iConfig) {
   topFolderName_ = conf_.getParameter<std::string>("TopFolderName");
-  ttTrackToken_ = consumes< std::vector < TTTrack< Ref_Phase2TrackerDigi_ > > > (conf_.getParameter<edm::InputTag>("TTTracksTag"));
-  HQNStubs_        = conf_.getParameter<int>("HQNStubs");
-  HQChi2dof_       = conf_.getParameter<double>("HQChi2dof");
+  ttTrackToken_ =
+      consumes<std::vector<TTTrack<Ref_Phase2TrackerDigi_>>>(conf_.getParameter<edm::InputTag>("TTTracksTag"));
+  HQNStubs_ = conf_.getParameter<int>("HQNStubs");
+  HQChi2dof_ = conf_.getParameter<double>("HQChi2dof");
 }
 
-OuterTrackerMonitorTTTrack::~OuterTrackerMonitorTTTrack()
-{
+OuterTrackerMonitorTTTrack::~OuterTrackerMonitorTTTrack() {
   // do anything here that needs to be done at desctruction time
   // (e.g. close files, deallocate resources etc.)
 }
@@ -54,10 +52,9 @@ OuterTrackerMonitorTTTrack::~OuterTrackerMonitorTTTrack()
 // member functions
 
 // ------------ method called for each event  ------------
-void OuterTrackerMonitorTTTrack::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void OuterTrackerMonitorTTTrack::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   // L1 Primaries
-  edm::Handle< std::vector< TTTrack< Ref_Phase2TrackerDigi_ > > > TTTrackHandle;
+  edm::Handle<std::vector<TTTrack<Ref_Phase2TrackerDigi_>>> TTTrackHandle;
   iEvent.getByToken(ttTrackToken_, TTTrackHandle);
 
   /// Track Trigger Tracks
@@ -65,27 +62,29 @@ void OuterTrackerMonitorTTTrack::analyze(const edm::Event& iEvent, const edm::Ev
   unsigned int numLQTracks = 0;
 
   // Adding protection
-  if ( !TTTrackHandle.isValid() ) return;
+  if (!TTTrackHandle.isValid())
+    return;
 
   /// Loop over TTTracks
   unsigned int tkCnt = 0;
-  for(auto iterTTTrack: *TTTrackHandle){
-    edm::Ptr< TTTrack< Ref_Phase2TrackerDigi_ > > tempTrackPtr(TTTrackHandle, tkCnt++); /// Make the pointer
+  for (auto iterTTTrack : *TTTrackHandle) {
+    edm::Ptr<TTTrack<Ref_Phase2TrackerDigi_>> tempTrackPtr(TTTrackHandle, tkCnt++);  /// Make the pointer
 
     unsigned int nStubs = tempTrackPtr->getStubRefs().size();
     int nBarrelStubs = 0;
     int nECStubs = 0;
 
-
-    double track_d0 = sqrt(tempTrackPtr->getPOCA().x()*tempTrackPtr->getPOCA().x() + tempTrackPtr->getPOCA().y()*tempTrackPtr->getPOCA().y());
+    double track_d0 = sqrt(tempTrackPtr->getPOCA().x() * tempTrackPtr->getPOCA().x() +
+                           tempTrackPtr->getPOCA().y() * tempTrackPtr->getPOCA().y());
     double trackChi2 = tempTrackPtr->getChi2();
     double trackChi2R = tempTrackPtr->getChi2Red();
 
     Track_NStubs->Fill(nStubs);
     Track_Eta_NStubs->Fill(tempTrackPtr->getMomentum().eta(), nStubs);
 
-    std::vector< edm::Ref< edmNew::DetSetVector< TTStub< Ref_Phase2TrackerDigi_ > >, TTStub< Ref_Phase2TrackerDigi_ > > >  theStubs = iterTTTrack.getStubRefs() ;
-    for (auto istub: theStubs) {
+    std::vector<edm::Ref<edmNew::DetSetVector<TTStub<Ref_Phase2TrackerDigi_>>, TTStub<Ref_Phase2TrackerDigi_>>>
+        theStubs = iterTTTrack.getStubRefs();
+    for (auto istub : theStubs) {
       bool inTIB = false;
       bool inTOB = false;
       bool inTEC = false;
@@ -94,19 +93,26 @@ void OuterTrackerMonitorTTTrack::analyze(const edm::Event& iEvent, const edm::Ev
       // Verify if stubs are in EC or barrel
       DetId detId(istub->getDetId());
       if (detId.det() == DetId::Detector::Tracker) {
-
-        if      (detId.subdetId() == StripSubdetector::TIB) inTIB=true;
-        else if (detId.subdetId() == StripSubdetector::TOB) inTOB=true;
-        else if (detId.subdetId() == StripSubdetector::TEC) inTEC=true;
-        else if (detId.subdetId() == StripSubdetector::TID) inTID=true;
+        if (detId.subdetId() == StripSubdetector::TIB)
+          inTIB = true;
+        else if (detId.subdetId() == StripSubdetector::TOB)
+          inTOB = true;
+        else if (detId.subdetId() == StripSubdetector::TEC)
+          inTEC = true;
+        else if (detId.subdetId() == StripSubdetector::TID)
+          inTID = true;
       }
-      if (inTIB) nBarrelStubs++;
-      else if (inTOB) nBarrelStubs++;
-      else if (inTEC) nECStubs++;
-      else if (inTID) nECStubs++;
-    } //end loop over stubs
-
-    //HQ tracks: >=5 stubs and chi2/dof < 1
+      if (inTIB)
+        nBarrelStubs++;
+      else if (inTOB)
+        nBarrelStubs++;
+      else if (inTEC)
+        nECStubs++;
+      else if (inTID)
+        nECStubs++;
+    }  // end loop over stubs
+
+    // HQ tracks: >=5 stubs and chi2/dof < 1
     if (nStubs >= HQNStubs_ && trackChi2R <= HQChi2dof_) {
       numHQTracks++;
 
@@ -124,7 +130,7 @@ void OuterTrackerMonitorTTTrack::analyze(const edm::Event& iEvent, const edm::Ev
       Track_HQ_Chi2_Probability->Fill(ChiSquaredProbability(trackChi2, nStubs));
     }
 
-    //LQ: now defined as all tracks (including HQ tracks)
+    // LQ: now defined as all tracks (including HQ tracks)
     numLQTracks++;
 
     Track_LQ_Pt->Fill(tempTrackPtr->getMomentum().perp());
@@ -137,316 +143,347 @@ void OuterTrackerMonitorTTTrack::analyze(const edm::Event& iEvent, const edm::Ev
     Track_LQ_Chi2Red_NStubs->Fill(nStubs, trackChi2R);
     Track_LQ_Chi2Red_Eta->Fill(tempTrackPtr->getMomentum().eta(), trackChi2R);
     Track_LQ_Eta_BarrelStubs->Fill(tempTrackPtr->getMomentum().eta(), nBarrelStubs);
-    Track_LQ_Eta_ECStubs->Fill(tempTrackPtr->getMomentum().eta(),  nECStubs);
+    Track_LQ_Eta_ECStubs->Fill(tempTrackPtr->getMomentum().eta(), nECStubs);
     Track_LQ_Chi2_Probability->Fill(ChiSquaredProbability(trackChi2, nStubs));
 
-  } // End of loop over TTTracks
+  }  // End of loop over TTTracks
 
   Track_HQ_N->Fill(numHQTracks);
   Track_LQ_N->Fill(numLQTracks);
-} // end of method
-
-// ------------ method called once each job just before starting event loop  ------------
-//Creating all histograms for DQM file output
-void OuterTrackerMonitorTTTrack::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const & run, edm::EventSetup const & es) {
+}  // end of method
+
+// ------------ method called once each job just before starting event loop
+// ------------
+// Creating all histograms for DQM file output
+void OuterTrackerMonitorTTTrack::bookHistograms(DQMStore::IBooker &iBooker,
+                                                edm::Run const &run,
+                                                edm::EventSetup const &es) {
   std::string HistoName;
-  iBooker.setCurrentFolder(topFolderName_+"/Tracks/");
+  iBooker.setCurrentFolder(topFolderName_ + "/Tracks/");
 
-  //Number of stubs
-  edm::ParameterSet psTrack_NStubs =  conf_.getParameter<edm::ParameterSet>("TH1_NStubs");
+  // Number of stubs
+  edm::ParameterSet psTrack_NStubs = conf_.getParameter<edm::ParameterSet>("TH1_NStubs");
   HistoName = "Track_NStubs";
-  Track_NStubs = iBooker.book1D(HistoName, HistoName,
-      psTrack_NStubs.getParameter<int32_t>("Nbinsx"),
-      psTrack_NStubs.getParameter<double>("xmin"),
-      psTrack_NStubs.getParameter<double>("xmax"));
+  Track_NStubs = iBooker.book1D(HistoName,
+                                HistoName,
+                                psTrack_NStubs.getParameter<int32_t>("Nbinsx"),
+                                psTrack_NStubs.getParameter<double>("xmin"),
+                                psTrack_NStubs.getParameter<double>("xmax"));
   Track_NStubs->setAxisTitle("# L1 Stubs per L1 Track", 1);
   Track_NStubs->setAxisTitle("# L1 Tracks", 2);
 
-  edm::ParameterSet psTrack_Eta_NStubs =  conf_.getParameter<edm::ParameterSet>("TH2_Track_Eta_NStubs");
+  edm::ParameterSet psTrack_Eta_NStubs = conf_.getParameter<edm::ParameterSet>("TH2_Track_Eta_NStubs");
   HistoName = "Track_Eta_NStubs";
-  Track_Eta_NStubs = iBooker.book2D(HistoName, HistoName,
-      psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsx"),
-      psTrack_Eta_NStubs.getParameter<double>("xmin"),
-      psTrack_Eta_NStubs.getParameter<double>("xmax"),
-      psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsy"),
-      psTrack_Eta_NStubs.getParameter<double>("ymin"),
-      psTrack_Eta_NStubs.getParameter<double>("ymax"));
+  Track_Eta_NStubs = iBooker.book2D(HistoName,
+                                    HistoName,
+                                    psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsx"),
+                                    psTrack_Eta_NStubs.getParameter<double>("xmin"),
+                                    psTrack_Eta_NStubs.getParameter<double>("xmax"),
+                                    psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsy"),
+                                    psTrack_Eta_NStubs.getParameter<double>("ymin"),
+                                    psTrack_Eta_NStubs.getParameter<double>("ymax"));
   Track_Eta_NStubs->setAxisTitle("#eta", 1);
   Track_Eta_NStubs->setAxisTitle("# L1 Stubs", 2);
 
   /// Low-quality tracks (All tracks, including HQ tracks)
-  iBooker.setCurrentFolder(topFolderName_+"/Tracks/LQ");
+  iBooker.setCurrentFolder(topFolderName_ + "/Tracks/LQ");
   // Nb of L1Tracks
   HistoName = "Track_LQ_N";
-  edm::ParameterSet psTrack_N =  conf_.getParameter<edm::ParameterSet>("TH1_NTracks");
-  Track_LQ_N = iBooker.book1D(HistoName, HistoName,
-      psTrack_N.getParameter<int32_t>("Nbinsx"),
-      psTrack_N.getParameter<double>("xmin"),
-      psTrack_N.getParameter<double>("xmax"));
+  edm::ParameterSet psTrack_N = conf_.getParameter<edm::ParameterSet>("TH1_NTracks");
+  Track_LQ_N = iBooker.book1D(HistoName,
+                              HistoName,
+                              psTrack_N.getParameter<int32_t>("Nbinsx"),
+                              psTrack_N.getParameter<double>("xmin"),
+                              psTrack_N.getParameter<double>("xmax"));
   Track_LQ_N->setAxisTitle("# L1 Tracks", 1);
   Track_LQ_N->setAxisTitle("# Events", 2);
 
-  //Pt of the tracks
-  edm::ParameterSet psTrack_Pt =  conf_.getParameter<edm::ParameterSet>("TH1_Track_Pt");
+  // Pt of the tracks
+  edm::ParameterSet psTrack_Pt = conf_.getParameter<edm::ParameterSet>("TH1_Track_Pt");
   HistoName = "Track_LQ_Pt";
-  Track_LQ_Pt = iBooker.book1D(HistoName, HistoName,
-      psTrack_Pt.getParameter<int32_t>("Nbinsx"),
-      psTrack_Pt.getParameter<double>("xmin"),
-      psTrack_Pt.getParameter<double>("xmax"));
+  Track_LQ_Pt = iBooker.book1D(HistoName,
+                               HistoName,
+                               psTrack_Pt.getParameter<int32_t>("Nbinsx"),
+                               psTrack_Pt.getParameter<double>("xmin"),
+                               psTrack_Pt.getParameter<double>("xmax"));
   Track_LQ_Pt->setAxisTitle("p_{T} [GeV]", 1);
   Track_LQ_Pt->setAxisTitle("# L1 Tracks", 2);
 
-  //Phi
-  edm::ParameterSet psTrack_Phi =  conf_.getParameter<edm::ParameterSet>("TH1_Track_Phi");
+  // Phi
+  edm::ParameterSet psTrack_Phi = conf_.getParameter<edm::ParameterSet>("TH1_Track_Phi");
   HistoName = "Track_LQ_Phi";
-  Track_LQ_Phi = iBooker.book1D(HistoName, HistoName,
-      psTrack_Phi.getParameter<int32_t>("Nbinsx"),
-      psTrack_Phi.getParameter<double>("xmin"),
-      psTrack_Phi.getParameter<double>("xmax"));
+  Track_LQ_Phi = iBooker.book1D(HistoName,
+                                HistoName,
+                                psTrack_Phi.getParameter<int32_t>("Nbinsx"),
+                                psTrack_Phi.getParameter<double>("xmin"),
+                                psTrack_Phi.getParameter<double>("xmax"));
   Track_LQ_Phi->setAxisTitle("#phi", 1);
   Track_LQ_Phi->setAxisTitle("# L1 Tracks", 2);
 
-  //D0
-  edm::ParameterSet psTrack_D0 =  conf_.getParameter<edm::ParameterSet>("TH1_Track_D0");
+  // D0
+  edm::ParameterSet psTrack_D0 = conf_.getParameter<edm::ParameterSet>("TH1_Track_D0");
   HistoName = "Track_LQ_D0";
-  Track_LQ_D0 = iBooker.book1D(HistoName, HistoName,
-      psTrack_D0.getParameter<int32_t>("Nbinsx"),
-      psTrack_D0.getParameter<double>("xmin"),
-      psTrack_D0.getParameter<double>("xmax"));
+  Track_LQ_D0 = iBooker.book1D(HistoName,
+                               HistoName,
+                               psTrack_D0.getParameter<int32_t>("Nbinsx"),
+                               psTrack_D0.getParameter<double>("xmin"),
+                               psTrack_D0.getParameter<double>("xmax"));
   Track_LQ_D0->setAxisTitle("Track D0", 1);
   Track_LQ_D0->setAxisTitle("# L1 Tracks", 2);
 
-  //Eta
-  edm::ParameterSet psTrack_Eta =  conf_.getParameter<edm::ParameterSet>("TH1_Track_Eta");
+  // Eta
+  edm::ParameterSet psTrack_Eta = conf_.getParameter<edm::ParameterSet>("TH1_Track_Eta");
   HistoName = "Track_LQ_Eta";
-  Track_LQ_Eta = iBooker.book1D(HistoName, HistoName,
-      psTrack_Eta.getParameter<int32_t>("Nbinsx"),
-      psTrack_Eta.getParameter<double>("xmin"),
-      psTrack_Eta.getParameter<double>("xmax"));
+  Track_LQ_Eta = iBooker.book1D(HistoName,
+                                HistoName,
+                                psTrack_Eta.getParameter<int32_t>("Nbinsx"),
+                                psTrack_Eta.getParameter<double>("xmin"),
+                                psTrack_Eta.getParameter<double>("xmax"));
   Track_LQ_Eta->setAxisTitle("#eta", 1);
   Track_LQ_Eta->setAxisTitle("# L1 Tracks", 2);
 
-  //VtxZ
-  edm::ParameterSet psTrack_VtxZ =  conf_.getParameter<edm::ParameterSet>("TH1_Track_VtxZ");
+  // VtxZ
+  edm::ParameterSet psTrack_VtxZ = conf_.getParameter<edm::ParameterSet>("TH1_Track_VtxZ");
   HistoName = "Track_LQ_VtxZ";
-  Track_LQ_VtxZ = iBooker.book1D(HistoName, HistoName,
-      psTrack_VtxZ.getParameter<int32_t>("Nbinsx"),
-      psTrack_VtxZ.getParameter<double>("xmin"),
-      psTrack_VtxZ.getParameter<double>("xmax"));
+  Track_LQ_VtxZ = iBooker.book1D(HistoName,
+                                 HistoName,
+                                 psTrack_VtxZ.getParameter<int32_t>("Nbinsx"),
+                                 psTrack_VtxZ.getParameter<double>("xmin"),
+                                 psTrack_VtxZ.getParameter<double>("xmax"));
   Track_LQ_VtxZ->setAxisTitle("L1 Track vertex position z [cm]", 1);
   Track_LQ_VtxZ->setAxisTitle("# L1 Tracks", 2);
 
-  //chi2
-  edm::ParameterSet psTrack_Chi2 =  conf_.getParameter<edm::ParameterSet>("TH1_Track_Chi2");
+  // chi2
+  edm::ParameterSet psTrack_Chi2 = conf_.getParameter<edm::ParameterSet>("TH1_Track_Chi2");
   HistoName = "Track_LQ_Chi2";
-  Track_LQ_Chi2 = iBooker.book1D(HistoName, HistoName,
-      psTrack_Chi2.getParameter<int32_t>("Nbinsx"),
-      psTrack_Chi2.getParameter<double>("xmin"),
-      psTrack_Chi2.getParameter<double>("xmax"));
+  Track_LQ_Chi2 = iBooker.book1D(HistoName,
+                                 HistoName,
+                                 psTrack_Chi2.getParameter<int32_t>("Nbinsx"),
+                                 psTrack_Chi2.getParameter<double>("xmin"),
+                                 psTrack_Chi2.getParameter<double>("xmax"));
   Track_LQ_Chi2->setAxisTitle("L1 Track #chi^{2}", 1);
   Track_LQ_Chi2->setAxisTitle("# L1 Tracks", 2);
 
-  //chi2Red
-  edm::ParameterSet psTrack_Chi2Red =  conf_.getParameter<edm::ParameterSet>("TH1_Track_Chi2R");
+  // chi2Red
+  edm::ParameterSet psTrack_Chi2Red = conf_.getParameter<edm::ParameterSet>("TH1_Track_Chi2R");
   HistoName = "Track_LQ_Chi2Red";
-  Track_LQ_Chi2Red = iBooker.book1D(HistoName, HistoName,
-      psTrack_Chi2Red.getParameter<int32_t>("Nbinsx"),
-      psTrack_Chi2Red.getParameter<double>("xmin"),
-      psTrack_Chi2Red.getParameter<double>("xmax"));
+  Track_LQ_Chi2Red = iBooker.book1D(HistoName,
+                                    HistoName,
+                                    psTrack_Chi2Red.getParameter<int32_t>("Nbinsx"),
+                                    psTrack_Chi2Red.getParameter<double>("xmin"),
+                                    psTrack_Chi2Red.getParameter<double>("xmax"));
   Track_LQ_Chi2Red->setAxisTitle("L1 Track #chi^{2}/ndf", 1);
   Track_LQ_Chi2Red->setAxisTitle("# L1 Tracks", 2);
 
-  //Chi2 prob
-  edm::ParameterSet psTrack_Chi2_Probability =  conf_.getParameter<edm::ParameterSet>("TH1_Track_Chi2_Probability");
+  // Chi2 prob
+  edm::ParameterSet psTrack_Chi2_Probability = conf_.getParameter<edm::ParameterSet>("TH1_Track_Chi2_Probability");
   HistoName = "Track_LQ_Chi2_Probability";
-  Track_LQ_Chi2_Probability = iBooker.book1D(HistoName, HistoName,
-      psTrack_Chi2_Probability.getParameter<int32_t>("Nbinsx"),
-      psTrack_Chi2_Probability.getParameter<double>("xmin"),
-      psTrack_Chi2_Probability.getParameter<double>("xmax"));
+  Track_LQ_Chi2_Probability = iBooker.book1D(HistoName,
+                                             HistoName,
+                                             psTrack_Chi2_Probability.getParameter<int32_t>("Nbinsx"),
+                                             psTrack_Chi2_Probability.getParameter<double>("xmin"),
+                                             psTrack_Chi2_Probability.getParameter<double>("xmax"));
   Track_LQ_Chi2_Probability->setAxisTitle("#chi^{2} probability", 1);
   Track_LQ_Chi2_Probability->setAxisTitle("# L1 Tracks", 2);
 
-  //Reduced chi2 vs #stubs
-  edm::ParameterSet psTrack_Chi2Red_NStubs =  conf_.getParameter<edm::ParameterSet>("TH2_Track_Chi2R_NStubs");
+  // Reduced chi2 vs #stubs
+  edm::ParameterSet psTrack_Chi2Red_NStubs = conf_.getParameter<edm::ParameterSet>("TH2_Track_Chi2R_NStubs");
   HistoName = "Track_LQ_Chi2Red_NStubs";
-  Track_LQ_Chi2Red_NStubs = iBooker.book2D(HistoName, HistoName,
-      psTrack_Chi2Red_NStubs.getParameter<int32_t>("Nbinsx"),
-      psTrack_Chi2Red_NStubs.getParameter<double>("xmin"),
-      psTrack_Chi2Red_NStubs.getParameter<double>("xmax"),
-      psTrack_Chi2Red_NStubs.getParameter<int32_t>("Nbinsy"),
-      psTrack_Chi2Red_NStubs.getParameter<double>("ymin"),
-      psTrack_Chi2Red_NStubs.getParameter<double>("ymax"));
+  Track_LQ_Chi2Red_NStubs = iBooker.book2D(HistoName,
+                                           HistoName,
+                                           psTrack_Chi2Red_NStubs.getParameter<int32_t>("Nbinsx"),
+                                           psTrack_Chi2Red_NStubs.getParameter<double>("xmin"),
+                                           psTrack_Chi2Red_NStubs.getParameter<double>("xmax"),
+                                           psTrack_Chi2Red_NStubs.getParameter<int32_t>("Nbinsy"),
+                                           psTrack_Chi2Red_NStubs.getParameter<double>("ymin"),
+                                           psTrack_Chi2Red_NStubs.getParameter<double>("ymax"));
   Track_LQ_Chi2Red_NStubs->setAxisTitle("# L1 Stubs", 1);
   Track_LQ_Chi2Red_NStubs->setAxisTitle("L1 Track #chi^{2}/ndf", 2);
 
-  //chi2/dof vs eta
-  edm::ParameterSet psTrack_Chi2R_Eta =  conf_.getParameter<edm::ParameterSet>("TH2_Track_Chi2R_Eta");
+  // chi2/dof vs eta
+  edm::ParameterSet psTrack_Chi2R_Eta = conf_.getParameter<edm::ParameterSet>("TH2_Track_Chi2R_Eta");
   HistoName = "Track_LQ_Chi2Red_Eta";
-  Track_LQ_Chi2Red_Eta = iBooker.book2D(HistoName, HistoName,
-      psTrack_Chi2R_Eta.getParameter<int32_t>("Nbinsx"),
-      psTrack_Chi2R_Eta.getParameter<double>("xmin"),
-      psTrack_Chi2R_Eta.getParameter<double>("xmax"),
-      psTrack_Chi2R_Eta.getParameter<int32_t>("Nbinsy"),
-      psTrack_Chi2R_Eta.getParameter<double>("ymin"),
-      psTrack_Chi2R_Eta.getParameter<double>("ymax"));
+  Track_LQ_Chi2Red_Eta = iBooker.book2D(HistoName,
+                                        HistoName,
+                                        psTrack_Chi2R_Eta.getParameter<int32_t>("Nbinsx"),
+                                        psTrack_Chi2R_Eta.getParameter<double>("xmin"),
+                                        psTrack_Chi2R_Eta.getParameter<double>("xmax"),
+                                        psTrack_Chi2R_Eta.getParameter<int32_t>("Nbinsy"),
+                                        psTrack_Chi2R_Eta.getParameter<double>("ymin"),
+                                        psTrack_Chi2R_Eta.getParameter<double>("ymax"));
   Track_LQ_Chi2Red_Eta->setAxisTitle("#eta", 1);
   Track_LQ_Chi2Red_Eta->setAxisTitle("L1 Track #chi^{2}/ndf", 2);
 
-  //Eta vs #stubs in barrel
+  // Eta vs #stubs in barrel
   HistoName = "Track_LQ_Eta_BarrelStubs";
-  Track_LQ_Eta_BarrelStubs = iBooker.book2D(HistoName, HistoName,
-      psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsx"),
-      psTrack_Eta_NStubs.getParameter<double>("xmin"),
-      psTrack_Eta_NStubs.getParameter<double>("xmax"),
-      psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsy"),
-      psTrack_Eta_NStubs.getParameter<double>("ymin"),
-      psTrack_Eta_NStubs.getParameter<double>("ymax"));
+  Track_LQ_Eta_BarrelStubs = iBooker.book2D(HistoName,
+                                            HistoName,
+                                            psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsx"),
+                                            psTrack_Eta_NStubs.getParameter<double>("xmin"),
+                                            psTrack_Eta_NStubs.getParameter<double>("xmax"),
+                                            psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsy"),
+                                            psTrack_Eta_NStubs.getParameter<double>("ymin"),
+                                            psTrack_Eta_NStubs.getParameter<double>("ymax"));
   Track_LQ_Eta_BarrelStubs->setAxisTitle("#eta", 1);
   Track_LQ_Eta_BarrelStubs->setAxisTitle("# L1 Barrel Stubs", 2);
 
-  //Eta vs #stubs in EC
+  // Eta vs #stubs in EC
   HistoName = "Track_LQ_Eta_ECStubs";
-  Track_LQ_Eta_ECStubs = iBooker.book2D(HistoName, HistoName,
-      psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsx"),
-      psTrack_Eta_NStubs.getParameter<double>("xmin"),
-      psTrack_Eta_NStubs.getParameter<double>("xmax"),
-      psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsy"),
-      psTrack_Eta_NStubs.getParameter<double>("ymin"),
-      psTrack_Eta_NStubs.getParameter<double>("ymax"));
+  Track_LQ_Eta_ECStubs = iBooker.book2D(HistoName,
+                                        HistoName,
+                                        psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsx"),
+                                        psTrack_Eta_NStubs.getParameter<double>("xmin"),
+                                        psTrack_Eta_NStubs.getParameter<double>("xmax"),
+                                        psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsy"),
+                                        psTrack_Eta_NStubs.getParameter<double>("ymin"),
+                                        psTrack_Eta_NStubs.getParameter<double>("ymax"));
   Track_LQ_Eta_ECStubs->setAxisTitle("#eta", 1);
   Track_LQ_Eta_ECStubs->setAxisTitle("# L1 EC Stubs", 2);
 
   /// High-quality tracks (Now defined as >=5 stubs and chi2/dof < 10)
-  iBooker.setCurrentFolder(topFolderName_+"/Tracks/HQ");
+  iBooker.setCurrentFolder(topFolderName_ + "/Tracks/HQ");
   // Nb of L1Tracks
   HistoName = "Track_HQ_N";
-  Track_HQ_N = iBooker.book1D(HistoName, HistoName,
-      psTrack_N.getParameter<int32_t>("Nbinsx"),
-      psTrack_N.getParameter<double>("xmin"),
-      psTrack_N.getParameter<double>("xmax"));
+  Track_HQ_N = iBooker.book1D(HistoName,
+                              HistoName,
+                              psTrack_N.getParameter<int32_t>("Nbinsx"),
+                              psTrack_N.getParameter<double>("xmin"),
+                              psTrack_N.getParameter<double>("xmax"));
   Track_HQ_N->setAxisTitle("# L1 Tracks", 1);
   Track_HQ_N->setAxisTitle("# Events", 2);
 
-  //Pt of the tracks
+  // Pt of the tracks
   HistoName = "Track_HQ_Pt";
-  Track_HQ_Pt = iBooker.book1D(HistoName, HistoName,
-      psTrack_Pt.getParameter<int32_t>("Nbinsx"),
-      psTrack_Pt.getParameter<double>("xmin"),
-      psTrack_Pt.getParameter<double>("xmax"));
+  Track_HQ_Pt = iBooker.book1D(HistoName,
+                               HistoName,
+                               psTrack_Pt.getParameter<int32_t>("Nbinsx"),
+                               psTrack_Pt.getParameter<double>("xmin"),
+                               psTrack_Pt.getParameter<double>("xmax"));
   Track_HQ_Pt->setAxisTitle("p_{T} [GeV]", 1);
   Track_HQ_Pt->setAxisTitle("# L1 Tracks", 2);
 
-  //Phi
+  // Phi
   HistoName = "Track_HQ_Phi";
-  Track_HQ_Phi = iBooker.book1D(HistoName, HistoName,
-      psTrack_Phi.getParameter<int32_t>("Nbinsx"),
-      psTrack_Phi.getParameter<double>("xmin"),
-      psTrack_Phi.getParameter<double>("xmax"));
+  Track_HQ_Phi = iBooker.book1D(HistoName,
+                                HistoName,
+                                psTrack_Phi.getParameter<int32_t>("Nbinsx"),
+                                psTrack_Phi.getParameter<double>("xmin"),
+                                psTrack_Phi.getParameter<double>("xmax"));
   Track_HQ_Phi->setAxisTitle("#phi", 1);
   Track_HQ_Phi->setAxisTitle("# L1 Tracks", 2);
 
-  //D0
+  // D0
   HistoName = "Track_HQ_D0";
-  Track_HQ_D0 = iBooker.book1D(HistoName, HistoName,
-      psTrack_D0.getParameter<int32_t>("Nbinsx"),
-      psTrack_D0.getParameter<double>("xmin"),
-      psTrack_D0.getParameter<double>("xmax"));
+  Track_HQ_D0 = iBooker.book1D(HistoName,
+                               HistoName,
+                               psTrack_D0.getParameter<int32_t>("Nbinsx"),
+                               psTrack_D0.getParameter<double>("xmin"),
+                               psTrack_D0.getParameter<double>("xmax"));
   Track_HQ_D0->setAxisTitle("Track D0", 1);
   Track_HQ_D0->setAxisTitle("# L1 Tracks", 2);
 
-  //Eta
+  // Eta
   HistoName = "Track_HQ_Eta";
-  Track_HQ_Eta = iBooker.book1D(HistoName, HistoName,
-      psTrack_Eta.getParameter<int32_t>("Nbinsx"),
-      psTrack_Eta.getParameter<double>("xmin"),
-      psTrack_Eta.getParameter<double>("xmax"));
+  Track_HQ_Eta = iBooker.book1D(HistoName,
+                                HistoName,
+                                psTrack_Eta.getParameter<int32_t>("Nbinsx"),
+                                psTrack_Eta.getParameter<double>("xmin"),
+                                psTrack_Eta.getParameter<double>("xmax"));
   Track_HQ_Eta->setAxisTitle("#eta", 1);
   Track_HQ_Eta->setAxisTitle("# L1 Tracks", 2);
 
-  //VtxZ
+  // VtxZ
   HistoName = "Track_HQ_VtxZ";
-  Track_HQ_VtxZ = iBooker.book1D(HistoName, HistoName,
-      psTrack_VtxZ.getParameter<int32_t>("Nbinsx"),
-      psTrack_VtxZ.getParameter<double>("xmin"),
-      psTrack_VtxZ.getParameter<double>("xmax"));
+  Track_HQ_VtxZ = iBooker.book1D(HistoName,
+                                 HistoName,
+                                 psTrack_VtxZ.getParameter<int32_t>("Nbinsx"),
+                                 psTrack_VtxZ.getParameter<double>("xmin"),
+                                 psTrack_VtxZ.getParameter<double>("xmax"));
   Track_HQ_VtxZ->setAxisTitle("L1 Track vertex position z [cm]", 1);
   Track_HQ_VtxZ->setAxisTitle("# L1 Tracks", 2);
 
-  //chi2
+  // chi2
   HistoName = "Track_HQ_Chi2";
-  Track_HQ_Chi2 = iBooker.book1D(HistoName, HistoName,
-      psTrack_Chi2.getParameter<int32_t>("Nbinsx"),
-      psTrack_Chi2.getParameter<double>("xmin"),
-      psTrack_Chi2.getParameter<double>("xmax"));
+  Track_HQ_Chi2 = iBooker.book1D(HistoName,
+                                 HistoName,
+                                 psTrack_Chi2.getParameter<int32_t>("Nbinsx"),
+                                 psTrack_Chi2.getParameter<double>("xmin"),
+                                 psTrack_Chi2.getParameter<double>("xmax"));
   Track_HQ_Chi2->setAxisTitle("L1 Track #chi^{2}", 1);
   Track_HQ_Chi2->setAxisTitle("# L1 Tracks", 2);
 
-  //chi2Red
+  // chi2Red
   HistoName = "Track_HQ_Chi2Red";
-  Track_HQ_Chi2Red = iBooker.book1D(HistoName, HistoName,
-      psTrack_Chi2Red.getParameter<int32_t>("Nbinsx"),
-      psTrack_Chi2Red.getParameter<double>("xmin"),
-      psTrack_Chi2Red.getParameter<double>("xmax"));
+  Track_HQ_Chi2Red = iBooker.book1D(HistoName,
+                                    HistoName,
+                                    psTrack_Chi2Red.getParameter<int32_t>("Nbinsx"),
+                                    psTrack_Chi2Red.getParameter<double>("xmin"),
+                                    psTrack_Chi2Red.getParameter<double>("xmax"));
   Track_HQ_Chi2Red->setAxisTitle("L1 Track #chi^{2}/ndf", 1);
   Track_HQ_Chi2Red->setAxisTitle("# L1 Tracks", 2);
 
-  //Chi2 prob
+  // Chi2 prob
   HistoName = "Track_HQ_Chi2_Probability";
-  Track_HQ_Chi2_Probability = iBooker.book1D(HistoName, HistoName,
-      psTrack_Chi2_Probability.getParameter<int32_t>("Nbinsx"),
-      psTrack_Chi2_Probability.getParameter<double>("xmin"),
-      psTrack_Chi2_Probability.getParameter<double>("xmax"));
+  Track_HQ_Chi2_Probability = iBooker.book1D(HistoName,
+                                             HistoName,
+                                             psTrack_Chi2_Probability.getParameter<int32_t>("Nbinsx"),
+                                             psTrack_Chi2_Probability.getParameter<double>("xmin"),
+                                             psTrack_Chi2_Probability.getParameter<double>("xmax"));
   Track_HQ_Chi2_Probability->setAxisTitle("#chi^{2} probability", 1);
   Track_HQ_Chi2_Probability->setAxisTitle("# L1 Tracks", 2);
 
-  //Reduced chi2 vs #stubs
+  // Reduced chi2 vs #stubs
   HistoName = "Track_HQ_Chi2Red_NStubs";
-  Track_HQ_Chi2Red_NStubs = iBooker.book2D(HistoName, HistoName,
-      psTrack_Chi2Red_NStubs.getParameter<int32_t>("Nbinsx"),
-      psTrack_Chi2Red_NStubs.getParameter<double>("xmin"),
-      psTrack_Chi2Red_NStubs.getParameter<double>("xmax"),
-      psTrack_Chi2Red_NStubs.getParameter<int32_t>("Nbinsy"),
-      psTrack_Chi2Red_NStubs.getParameter<double>("ymin"),
-      psTrack_Chi2Red_NStubs.getParameter<double>("ymax"));
+  Track_HQ_Chi2Red_NStubs = iBooker.book2D(HistoName,
+                                           HistoName,
+                                           psTrack_Chi2Red_NStubs.getParameter<int32_t>("Nbinsx"),
+                                           psTrack_Chi2Red_NStubs.getParameter<double>("xmin"),
+                                           psTrack_Chi2Red_NStubs.getParameter<double>("xmax"),
+                                           psTrack_Chi2Red_NStubs.getParameter<int32_t>("Nbinsy"),
+                                           psTrack_Chi2Red_NStubs.getParameter<double>("ymin"),
+                                           psTrack_Chi2Red_NStubs.getParameter<double>("ymax"));
   Track_HQ_Chi2Red_NStubs->setAxisTitle("# L1 Stubs", 1);
   Track_HQ_Chi2Red_NStubs->setAxisTitle("L1 Track #chi^{2}/ndf", 2);
 
-  //chi2/dof vs eta
+  // chi2/dof vs eta
   HistoName = "Track_HQ_Chi2Red_Eta";
-  Track_HQ_Chi2Red_Eta = iBooker.book2D(HistoName, HistoName,
-      psTrack_Chi2R_Eta.getParameter<int32_t>("Nbinsx"),
-      psTrack_Chi2R_Eta.getParameter<double>("xmin"),
-      psTrack_Chi2R_Eta.getParameter<double>("xmax"),
-      psTrack_Chi2R_Eta.getParameter<int32_t>("Nbinsy"),
-      psTrack_Chi2R_Eta.getParameter<double>("ymin"),
-      psTrack_Chi2R_Eta.getParameter<double>("ymax"));
+  Track_HQ_Chi2Red_Eta = iBooker.book2D(HistoName,
+                                        HistoName,
+                                        psTrack_Chi2R_Eta.getParameter<int32_t>("Nbinsx"),
+                                        psTrack_Chi2R_Eta.getParameter<double>("xmin"),
+                                        psTrack_Chi2R_Eta.getParameter<double>("xmax"),
+                                        psTrack_Chi2R_Eta.getParameter<int32_t>("Nbinsy"),
+                                        psTrack_Chi2R_Eta.getParameter<double>("ymin"),
+                                        psTrack_Chi2R_Eta.getParameter<double>("ymax"));
   Track_HQ_Chi2Red_Eta->setAxisTitle("#eta", 1);
   Track_HQ_Chi2Red_Eta->setAxisTitle("L1 Track #chi^{2}/ndf", 2);
 
-  //eta vs #stubs in barrel
+  // eta vs #stubs in barrel
   HistoName = "Track_HQ_Eta_BarrelStubs";
-  Track_HQ_Eta_BarrelStubs = iBooker.book2D(HistoName, HistoName,
-      psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsx"),
-      psTrack_Eta_NStubs.getParameter<double>("xmin"),
-      psTrack_Eta_NStubs.getParameter<double>("xmax"),
-      psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsy"),
-      psTrack_Eta_NStubs.getParameter<double>("ymin"),
-      psTrack_Eta_NStubs.getParameter<double>("ymax"));
+  Track_HQ_Eta_BarrelStubs = iBooker.book2D(HistoName,
+                                            HistoName,
+                                            psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsx"),
+                                            psTrack_Eta_NStubs.getParameter<double>("xmin"),
+                                            psTrack_Eta_NStubs.getParameter<double>("xmax"),
+                                            psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsy"),
+                                            psTrack_Eta_NStubs.getParameter<double>("ymin"),
+                                            psTrack_Eta_NStubs.getParameter<double>("ymax"));
   Track_HQ_Eta_BarrelStubs->setAxisTitle("#eta", 1);
   Track_HQ_Eta_BarrelStubs->setAxisTitle("# L1 Barrel Stubs", 2);
 
-  //eta vs #stubs in EC
+  // eta vs #stubs in EC
   HistoName = "Track_HQ_Eta_ECStubs";
-  Track_HQ_Eta_ECStubs = iBooker.book2D(HistoName, HistoName,
-      psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsx"),
-      psTrack_Eta_NStubs.getParameter<double>("xmin"),
-      psTrack_Eta_NStubs.getParameter<double>("xmax"),
-      psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsy"),
-      psTrack_Eta_NStubs.getParameter<double>("ymin"),
-      psTrack_Eta_NStubs.getParameter<double>("ymax"));
+  Track_HQ_Eta_ECStubs = iBooker.book2D(HistoName,
+                                        HistoName,
+                                        psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsx"),
+                                        psTrack_Eta_NStubs.getParameter<double>("xmin"),
+                                        psTrack_Eta_NStubs.getParameter<double>("xmax"),
+                                        psTrack_Eta_NStubs.getParameter<int32_t>("Nbinsy"),
+                                        psTrack_Eta_NStubs.getParameter<double>("ymin"),
+                                        psTrack_Eta_NStubs.getParameter<double>("ymax"));
   Track_HQ_Eta_ECStubs->setAxisTitle("#eta", 1);
   Track_HQ_Eta_ECStubs->setAxisTitle("# L1 EC Stubs", 2);
 
-}//end of method
+}  // end of method
 
 DEFINE_FWK_MODULE(OuterTrackerMonitorTTTrack);
diff --git a/DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h b/DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h
index 3a3d01f3d5feb..80daf7d7f00a0 100644
--- a/DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h
+++ b/DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h
@@ -4,10 +4,13 @@
 //
 // Package:     SiPixelCommon
 // Class  :     SiPixelFolderOrganizer
-// 
-/**\class SiPixelFolderOrganizer SiPixelFolderOrganizer.h DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h
-   
-Description: <Organizes the folders for the monitoring elements of the Pixel detector. Its methods return strings with names of folders to be created and used.>
+//
+/**\class SiPixelFolderOrganizer SiPixelFolderOrganizer.h
+DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h
+
+Description: <Organizes the folders for the monitoring elements of the Pixel
+detector. Its methods return strings with names of folders to be created and
+used.>
 
 Usage:
 <usage>
@@ -21,30 +24,27 @@ Description: <Organizes the folders for the monitoring elements of the Pixel det
 #include <string>
 
 class SiPixelFolderOrganizer {
-  
- public:
-
-  /// Constructor - getStore should be called false from multi-thread DQM applications
+public:
+  /// Constructor - getStore should be called false from multi-thread DQM
+  /// applications
   SiPixelFolderOrganizer(bool getStore = true);
 
   /// Destructor
   virtual ~SiPixelFolderOrganizer();
-  
+
   /// Set folder name for a module or plaquette
-  //type is: BPIX  mod=0, lad=1, lay=2, phi=3, 
+  // type is: BPIX  mod=0, lad=1, lay=2, phi=3,
   //         FPIX  mod=0, blade=4, disc=5, ring=6
-  bool setModuleFolder(const uint32_t& rawdetid=0, int type=0, bool isUpgrade=false);
-  bool setModuleFolder(DQMStore::IBooker&, const uint32_t& rawdetid=0, int type=0, bool isUpgrade=false);
-  void getModuleFolder(const uint32_t& rawdetid, std::string& path, bool isUpgrade);
+  bool setModuleFolder(const uint32_t &rawdetid = 0, int type = 0, bool isUpgrade = false);
+  bool setModuleFolder(DQMStore::IBooker &, const uint32_t &rawdetid = 0, int type = 0, bool isUpgrade = false);
+  void getModuleFolder(const uint32_t &rawdetid, std::string &path, bool isUpgrade);
 
   /// Set folder name for a FED (used in the case of errors without detId)
   bool setFedFolder(const uint32_t FedId);
-  bool setFedFolder(DQMStore::IBooker&, const uint32_t FedId);
-
-  
- private:
+  bool setFedFolder(DQMStore::IBooker &, const uint32_t FedId);
 
+private:
   std::string topFolderName;
-  DQMStore* dbe_;
+  DQMStore *dbe_;
 };
 #endif
diff --git a/DQM/SiPixelCommon/interface/SiPixelHistogramId.h b/DQM/SiPixelCommon/interface/SiPixelHistogramId.h
index 1433ef29b16bd..b8cc2bee77ec8 100644
--- a/DQM/SiPixelCommon/interface/SiPixelHistogramId.h
+++ b/DQM/SiPixelCommon/interface/SiPixelHistogramId.h
@@ -4,8 +4,9 @@
 //
 // Package:     SiPixelCommon
 // Class  :     SiPixelHistogramId
-// 
-/**\class SiPixelHistogramId SiPixelHistogramId.h DQM/SiPixelCommon/interface/SiPixelHistogramId.h
+//
+/**\class SiPixelHistogramId SiPixelHistogramId.h
+ DQM/SiPixelCommon/interface/SiPixelHistogramId.h
 
  Description: Creates and returns DQM Histogram Id's
 
@@ -18,14 +19,11 @@
 //         Created:  Wed Feb 22 16:07:51 CET 2006
 //
 
-#include <string>
 #include <boost/cstdint.hpp>
+#include <string>
 
-class SiPixelHistogramId
-{
-
- public:
-
+class SiPixelHistogramId {
+public:
   /// Constructor
   SiPixelHistogramId();
   /// Constructor
@@ -33,17 +31,16 @@ class SiPixelHistogramId
   /// Destructor
   virtual ~SiPixelHistogramId();
   /// Set Histogram Id
-  std::string setHistoId( std::string variable,  uint32_t& rawId );
+  std::string setHistoId(std::string variable, uint32_t &rawId);
   /// Get data Collection
-  std::string getDataCollection( std::string histogramId );
+  std::string getDataCollection(std::string histogramId);
   /// Get Detector Raw Id
-  uint32_t getRawId( std::string histogramId );
+  uint32_t getRawId(std::string histogramId);
 
- private:
+private:
   std::string returnIdPart(std::string histoid, uint32_t whichpart);
   std::string dataCollection_;
   std::string separator_;
-
 };
 
 #endif
diff --git a/DQM/SiPixelCommon/src/SiPixelFolderOrganizer.cc b/DQM/SiPixelCommon/src/SiPixelFolderOrganizer.cc
index 6b27b252d0be1..1ca851b7d4d65 100644
--- a/DQM/SiPixelCommon/src/SiPixelFolderOrganizer.cc
+++ b/DQM/SiPixelCommon/src/SiPixelFolderOrganizer.cc
@@ -5,485 +5,546 @@
 #include "FWCore/Utilities/interface/Exception.h"
 /// Data Formats
 #include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h"
-#include <sstream>
+#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include <cstdio>
+#include <sstream>
 
 /// Constructor
-SiPixelFolderOrganizer::SiPixelFolderOrganizer(bool getStore) :
-  topFolderName("Pixel")
-{  
-  //Not allowed in multithread framework, but can still be called by other modules not from DQM.
-  if (getStore) dbe_ = edm::Service<DQMStore>().operator->();
+SiPixelFolderOrganizer::SiPixelFolderOrganizer(bool getStore) : topFolderName("Pixel") {
+  // Not allowed in multithread framework, but can still be called by other
+  // modules not from DQM.
+  if (getStore)
+    dbe_ = edm::Service<DQMStore>().operator->();
 }
 
 SiPixelFolderOrganizer::~SiPixelFolderOrganizer() {}
 
-//Overloaded function for calling outside of DQM framework
-bool SiPixelFolderOrganizer::setModuleFolder(const uint32_t& rawdetid, int type, bool isUpgrade) {
-
+// Overloaded function for calling outside of DQM framework
+bool SiPixelFolderOrganizer::setModuleFolder(const uint32_t &rawdetid, int type, bool isUpgrade) {
   bool flag = false;
 
-   if(rawdetid == 0) {
-     dbe_->setCurrentFolder(topFolderName);
-     flag = true;
-   }
-   ///
-   /// Pixel Barrel
-   ///
-   else if(DetId(rawdetid).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) {
-
-     if (!isUpgrade) {
-     //for endcap types there is nothing to do: 
-     if(type>3 && type!=7) return true;
-
-     std::string subDetectorFolder = "Barrel";
-     PixelBarrelName::Shell DBshell = PixelBarrelName(DetId(rawdetid)).shell();
-     int DBlayer  = PixelBarrelName(DetId(rawdetid)).layerName();
-     int DBladder = PixelBarrelName(DetId(rawdetid)).ladderName();
-     int DBmodule = PixelBarrelName(DetId(rawdetid)).moduleName();
-     
-     char slayer[80];  sprintf(slayer, "Layer_%i",   DBlayer);
-     char sladder[80]; sprintf(sladder,"Ladder_%02i",DBladder);
-     char smodule[80]; sprintf(smodule,"Module_%i",  DBmodule);
-     
-     std::ostringstream sfolder;
-     
-     sfolder << topFolderName << "/" << subDetectorFolder; 
-     if(type<4){
-     sfolder << "/Shell_" <<DBshell
-	     << "/" << slayer;
-     }
-     if(type<2){
-       sfolder << "/" << sladder;
-       if ( PixelBarrelName(DetId(rawdetid)).isHalfModule() ) sfolder <<"H"; 
-       else sfolder <<"F";
-     }
-     if(type==0) sfolder << "/" <<smodule;
-     //if(type==3) sfolder << "/all_" << smodule;
-     
-     //std::cout<<"set barrel folder: "<<rawdetid<<" : "<<sfolder.str().c_str()<<std::endl;
-     
-     dbe_->setCurrentFolder(sfolder.str());
-     flag = true;
-     } else if (isUpgrade) {
-       //for endcap types there is nothing to do: 
-       if(type>3 && type!=7) return true;
-       
-       std::string subDetectorFolder = "Barrel";
-       PixelBarrelNameUpgrade::Shell DBshell = PixelBarrelNameUpgrade(DetId(rawdetid)).shell();
-       int DBlayer  = PixelBarrelNameUpgrade(DetId(rawdetid)).layerName();
-       int DBladder = PixelBarrelNameUpgrade(DetId(rawdetid)).ladderName();
-       int DBmodule = PixelBarrelNameUpgrade(DetId(rawdetid)).moduleName();
-       
-       char slayer[80];  sprintf(slayer, "Layer_%i",   DBlayer);
-       char sladder[80]; sprintf(sladder,"Ladder_%02i",DBladder);
-       char smodule[80]; sprintf(smodule,"Module_%i",  DBmodule);
-       
-       std::ostringstream sfolder;
-       
-       sfolder << topFolderName << "/" << subDetectorFolder; 
-       if(type<4){
-       sfolder << "/Shell_" <<DBshell
-               << "/" << slayer;
-   } 
-       if(type<2){
-         sfolder << "/" << sladder;
-         if ( PixelBarrelNameUpgrade(DetId(rawdetid)).isHalfModule() ) sfolder <<"H"; 
-         else sfolder <<"F";
-       }
-       if(type==0) sfolder << "/" <<smodule;
-       //if(type==3) sfolder << "/all_" << smodule;
-       
-       //std::cout<<"set barrel folder: "<<rawdetid<<" : "<<sfolder.str().c_str()<<std::endl;
-       
-       dbe_->setCurrentFolder(sfolder.str());
-       flag = true;
-     }//endif(isUpgrade)
-   } 
-   
-   ///
-   /// Pixel Endcap
-   ///
-   else if(DetId(rawdetid).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) {
-
-     if (!isUpgrade) {
-     //for barrel types there is nothing to do: 
-     if(type>0 && type < 4) return true;
-
-     std::string subDetectorFolder = "Endcap";
-     PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(rawdetid)).halfCylinder();
-      int disk   = PixelEndcapName(DetId(rawdetid)).diskName();
-      int blade  = PixelEndcapName(DetId(rawdetid)).bladeName();
-      int panel  = PixelEndcapName(DetId(rawdetid)).pannelName();
+  if (rawdetid == 0) {
+    dbe_->setCurrentFolder(topFolderName);
+    flag = true;
+  }
+  ///
+  /// Pixel Barrel
+  ///
+  else if (DetId(rawdetid).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) {
+    if (!isUpgrade) {
+      // for endcap types there is nothing to do:
+      if (type > 3 && type != 7)
+        return true;
+
+      std::string subDetectorFolder = "Barrel";
+      PixelBarrelName::Shell DBshell = PixelBarrelName(DetId(rawdetid)).shell();
+      int DBlayer = PixelBarrelName(DetId(rawdetid)).layerName();
+      int DBladder = PixelBarrelName(DetId(rawdetid)).ladderName();
+      int DBmodule = PixelBarrelName(DetId(rawdetid)).moduleName();
+
+      char slayer[80];
+      sprintf(slayer, "Layer_%i", DBlayer);
+      char sladder[80];
+      sprintf(sladder, "Ladder_%02i", DBladder);
+      char smodule[80];
+      sprintf(smodule, "Module_%i", DBmodule);
+
+      std::ostringstream sfolder;
+
+      sfolder << topFolderName << "/" << subDetectorFolder;
+      if (type < 4) {
+        sfolder << "/Shell_" << DBshell << "/" << slayer;
+      }
+      if (type < 2) {
+        sfolder << "/" << sladder;
+        if (PixelBarrelName(DetId(rawdetid)).isHalfModule())
+          sfolder << "H";
+        else
+          sfolder << "F";
+      }
+      if (type == 0)
+        sfolder << "/" << smodule;
+      // if(type==3) sfolder << "/all_" << smodule;
+
+      // std::cout<<"set barrel folder: "<<rawdetid<<" :
+      // "<<sfolder.str().c_str()<<std::endl;
+
+      dbe_->setCurrentFolder(sfolder.str());
+      flag = true;
+    } else if (isUpgrade) {
+      // for endcap types there is nothing to do:
+      if (type > 3 && type != 7)
+        return true;
+
+      std::string subDetectorFolder = "Barrel";
+      PixelBarrelNameUpgrade::Shell DBshell = PixelBarrelNameUpgrade(DetId(rawdetid)).shell();
+      int DBlayer = PixelBarrelNameUpgrade(DetId(rawdetid)).layerName();
+      int DBladder = PixelBarrelNameUpgrade(DetId(rawdetid)).ladderName();
+      int DBmodule = PixelBarrelNameUpgrade(DetId(rawdetid)).moduleName();
+
+      char slayer[80];
+      sprintf(slayer, "Layer_%i", DBlayer);
+      char sladder[80];
+      sprintf(sladder, "Ladder_%02i", DBladder);
+      char smodule[80];
+      sprintf(smodule, "Module_%i", DBmodule);
+
+      std::ostringstream sfolder;
+
+      sfolder << topFolderName << "/" << subDetectorFolder;
+      if (type < 4) {
+        sfolder << "/Shell_" << DBshell << "/" << slayer;
+      }
+      if (type < 2) {
+        sfolder << "/" << sladder;
+        if (PixelBarrelNameUpgrade(DetId(rawdetid)).isHalfModule())
+          sfolder << "H";
+        else
+          sfolder << "F";
+      }
+      if (type == 0)
+        sfolder << "/" << smodule;
+      // if(type==3) sfolder << "/all_" << smodule;
+
+      // std::cout<<"set barrel folder: "<<rawdetid<<" :
+      // "<<sfolder.str().c_str()<<std::endl;
+
+      dbe_->setCurrentFolder(sfolder.str());
+      flag = true;
+    }  // endif(isUpgrade)
+  }
+
+  ///
+  /// Pixel Endcap
+  ///
+  else if (DetId(rawdetid).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) {
+    if (!isUpgrade) {
+      // for barrel types there is nothing to do:
+      if (type > 0 && type < 4)
+        return true;
+
+      std::string subDetectorFolder = "Endcap";
+      PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(rawdetid)).halfCylinder();
+      int disk = PixelEndcapName(DetId(rawdetid)).diskName();
+      int blade = PixelEndcapName(DetId(rawdetid)).bladeName();
+      int panel = PixelEndcapName(DetId(rawdetid)).pannelName();
       int module = PixelEndcapName(DetId(rawdetid)).plaquetteName();
 
-      char sdisk[80];  sprintf(sdisk,  "Disk_%i",disk);
-      char sblade[80]; sprintf(sblade, "Blade_%02i",blade);
-      char spanel[80]; sprintf(spanel, "Panel_%i",panel);
-      char smodule[80];sprintf(smodule,"Module_%i",module);
+      char sdisk[80];
+      sprintf(sdisk, "Disk_%i", disk);
+      char sblade[80];
+      sprintf(sblade, "Blade_%02i", blade);
+      char spanel[80];
+      sprintf(spanel, "Panel_%i", panel);
+      char smodule[80];
+      sprintf(smodule, "Module_%i", module);
 
       std::ostringstream sfolder;
 
-      sfolder <<topFolderName <<"/" << subDetectorFolder << 
-	"/HalfCylinder_" << side << "/" << sdisk; 
-      if(type==0 || type ==4){
-	sfolder << "/" << sblade; 
+      sfolder << topFolderName << "/" << subDetectorFolder << "/HalfCylinder_" << side << "/" << sdisk;
+      if (type == 0 || type == 4) {
+        sfolder << "/" << sblade;
       }
-      if(type==0){
-	sfolder << "/" << spanel << "/" << smodule;
+      if (type == 0) {
+        sfolder << "/" << spanel << "/" << smodule;
       }
-//       if(type==6){
-// 	sfolder << "/" << spanel << "_all_" << smodule;
-//       }
-     
-     //std::cout<<"set endcap folder: "<<rawdetid<<" : "<<sfolder.str().c_str()<<std::endl;
-     
+      //       if(type==6){
+      // 	sfolder << "/" << spanel << "_all_" << smodule;
+      //       }
+
+      // std::cout<<"set endcap folder: "<<rawdetid<<" :
+      // "<<sfolder.str().c_str()<<std::endl;
+
       dbe_->setCurrentFolder(sfolder.str());
       flag = true;
 
-     } else if (isUpgrade) {
-       //for barrel types there is nothing to do: 
-       if(type>0 && type < 4) return true;
-       
-       std::string subDetectorFolder = "Endcap";
-       PixelEndcapNameUpgrade::HalfCylinder side = PixelEndcapNameUpgrade(DetId(rawdetid)).halfCylinder();
-        int disk   = PixelEndcapNameUpgrade(DetId(rawdetid)).diskName();
-        int blade  = PixelEndcapNameUpgrade(DetId(rawdetid)).bladeName();
-        int panel  = PixelEndcapNameUpgrade(DetId(rawdetid)).pannelName();
-        int module = PixelEndcapNameUpgrade(DetId(rawdetid)).plaquetteName();
-        
-        
-        char sdisk[80];  sprintf(sdisk,  "Disk_%i",disk);
-        char sblade[80]; sprintf(sblade, "Blade_%02i",blade);
-        char spanel[80]; sprintf(spanel, "Panel_%i",panel);
-        char smodule[80];sprintf(smodule,"Module_%i",module);
-        
-        std::ostringstream sfolder;
-        
-        sfolder <<topFolderName <<"/" << subDetectorFolder << 
-          "/HalfCylinder_" << side << "/" << sdisk; 
-        if(type==0 || type ==4){
-          sfolder << "/" << sblade; 
-        }
-        if(type==0){
-          sfolder << "/" << spanel << "/" << smodule;
-        }
-//        if(type==6){
-//          sfolder << "/" << spanel << "_all_" << smodule;
-//        }
-       
-       //std::cout<<"set endcap folder: "<<rawdetid<<" : "<<sfolder.str().c_str()<<std::endl;
-       
-       dbe_->setCurrentFolder(sfolder.str());
-       flag = true;
-     }//endifendcap&&isUpgrade
-   } else throw cms::Exception("LogicError")
-     << "[SiPixelFolderOrganizer::setModuleFolder] Not a Pixel detector DetId ";
-   
-   return flag;
+    } else if (isUpgrade) {
+      // for barrel types there is nothing to do:
+      if (type > 0 && type < 4)
+        return true;
+
+      std::string subDetectorFolder = "Endcap";
+      PixelEndcapNameUpgrade::HalfCylinder side = PixelEndcapNameUpgrade(DetId(rawdetid)).halfCylinder();
+      int disk = PixelEndcapNameUpgrade(DetId(rawdetid)).diskName();
+      int blade = PixelEndcapNameUpgrade(DetId(rawdetid)).bladeName();
+      int panel = PixelEndcapNameUpgrade(DetId(rawdetid)).pannelName();
+      int module = PixelEndcapNameUpgrade(DetId(rawdetid)).plaquetteName();
+
+      char sdisk[80];
+      sprintf(sdisk, "Disk_%i", disk);
+      char sblade[80];
+      sprintf(sblade, "Blade_%02i", blade);
+      char spanel[80];
+      sprintf(spanel, "Panel_%i", panel);
+      char smodule[80];
+      sprintf(smodule, "Module_%i", module);
 
-}
+      std::ostringstream sfolder;
+
+      sfolder << topFolderName << "/" << subDetectorFolder << "/HalfCylinder_" << side << "/" << sdisk;
+      if (type == 0 || type == 4) {
+        sfolder << "/" << sblade;
+      }
+      if (type == 0) {
+        sfolder << "/" << spanel << "/" << smodule;
+      }
+      //        if(type==6){
+      //          sfolder << "/" << spanel << "_all_" << smodule;
+      //        }
+
+      // std::cout<<"set endcap folder: "<<rawdetid<<" :
+      // "<<sfolder.str().c_str()<<std::endl;
+
+      dbe_->setCurrentFolder(sfolder.str());
+      flag = true;
+    }  // endifendcap&&isUpgrade
+  } else
+    throw cms::Exception("LogicError") << "[SiPixelFolderOrganizer::setModuleFolder] Not a Pixel detector "
+                                          "DetId ";
 
-//Overloaded setModuleFolder for multithread safe operation
-bool SiPixelFolderOrganizer::setModuleFolder(DQMStore::IBooker& iBooker, const uint32_t& rawdetid, int type, bool isUpgrade) {
+  return flag;
+}
 
+// Overloaded setModuleFolder for multithread safe operation
+bool SiPixelFolderOrganizer::setModuleFolder(DQMStore::IBooker &iBooker,
+                                             const uint32_t &rawdetid,
+                                             int type,
+                                             bool isUpgrade) {
   bool flag = false;
 
-   if(rawdetid == 0) {
-     iBooker.setCurrentFolder(topFolderName);
-     flag = true;
-   }
-   ///
-   /// Pixel Barrel
-   ///
-   else if(DetId(rawdetid).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) {
-
-     if (!isUpgrade) {
-     //for endcap types there is nothing to do: 
-     if(type>3 && type!=7) return true;
-
-     std::string subDetectorFolder = "Barrel";
-     PixelBarrelName::Shell DBshell = PixelBarrelName(DetId(rawdetid)).shell();
-     int DBlayer  = PixelBarrelName(DetId(rawdetid)).layerName();
-     int DBladder = PixelBarrelName(DetId(rawdetid)).ladderName();
-     int DBmodule = PixelBarrelName(DetId(rawdetid)).moduleName();
-     
-     char slayer[80];  sprintf(slayer, "Layer_%i",   DBlayer);
-     char sladder[80]; sprintf(sladder,"Ladder_%02i",DBladder);
-     char smodule[80]; sprintf(smodule,"Module_%i",  DBmodule);
-     
-     std::ostringstream sfolder;
-     
-     sfolder << topFolderName << "/" << subDetectorFolder; 
-     if(type<4){
-     sfolder << "/Shell_" <<DBshell
-	     << "/" << slayer;
-     }
-     if(type<2){
-       sfolder << "/" << sladder;
-       if ( PixelBarrelName(DetId(rawdetid)).isHalfModule() ) sfolder <<"H"; 
-       else sfolder <<"F";
-     }
-     if(type==0) sfolder << "/" <<smodule;
-     //if(type==3) sfolder << "/all_" << smodule;
-     
-     //std::cout<<"set barrel folder: "<<rawdetid<<" : "<<sfolder.str().c_str()<<std::endl;
-     
-     iBooker.setCurrentFolder(sfolder.str());
-     flag = true;
-     } else if (isUpgrade) {
-       //for endcap types there is nothing to do: 
-       if(type>3 && type!=7) return true;
-       
-       std::string subDetectorFolder = "Barrel";
-       PixelBarrelNameUpgrade::Shell DBshell = PixelBarrelNameUpgrade(DetId(rawdetid)).shell();
-       int DBlayer  = PixelBarrelNameUpgrade(DetId(rawdetid)).layerName();
-       int DBladder = PixelBarrelNameUpgrade(DetId(rawdetid)).ladderName();
-       int DBmodule = PixelBarrelNameUpgrade(DetId(rawdetid)).moduleName();
-       
-       char slayer[80];  sprintf(slayer, "Layer_%i",   DBlayer);
-       char sladder[80]; sprintf(sladder,"Ladder_%02i",DBladder);
-       char smodule[80]; sprintf(smodule,"Module_%i",  DBmodule);
-       
-       std::ostringstream sfolder;
-       
-       sfolder << topFolderName << "/" << subDetectorFolder; 
-       if(type<4){
-       sfolder << "/Shell_" <<DBshell
-               << "/" << slayer;
-   } 
-       if(type<2){
-         sfolder << "/" << sladder;
-         if ( PixelBarrelNameUpgrade(DetId(rawdetid)).isHalfModule() ) sfolder <<"H"; 
-         else sfolder <<"F";
-       }
-       if(type==0) sfolder << "/" <<smodule;
-       //if(type==3) sfolder << "/all_" << smodule;
-       
-       //std::cout<<"set barrel folder: "<<rawdetid<<" : "<<sfolder.str().c_str()<<std::endl;
-       
-       iBooker.setCurrentFolder(sfolder.str());
-       flag = true;
-     }//endif(isUpgrade)
-   } 
-   
-   ///
-   /// Pixel Endcap
-   ///
-   else if(DetId(rawdetid).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) {
-
-     if (!isUpgrade) {
-     //for barrel types there is nothing to do: 
-     if(type>0 && type < 4) return true;
-
-     std::string subDetectorFolder = "Endcap";
-     PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(rawdetid)).halfCylinder();
-      int disk   = PixelEndcapName(DetId(rawdetid)).diskName();
-      int blade  = PixelEndcapName(DetId(rawdetid)).bladeName();
-      int panel  = PixelEndcapName(DetId(rawdetid)).pannelName();
+  if (rawdetid == 0) {
+    iBooker.setCurrentFolder(topFolderName);
+    flag = true;
+  }
+  ///
+  /// Pixel Barrel
+  ///
+  else if (DetId(rawdetid).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) {
+    if (!isUpgrade) {
+      // for endcap types there is nothing to do:
+      if (type > 3 && type != 7)
+        return true;
+
+      std::string subDetectorFolder = "Barrel";
+      PixelBarrelName::Shell DBshell = PixelBarrelName(DetId(rawdetid)).shell();
+      int DBlayer = PixelBarrelName(DetId(rawdetid)).layerName();
+      int DBladder = PixelBarrelName(DetId(rawdetid)).ladderName();
+      int DBmodule = PixelBarrelName(DetId(rawdetid)).moduleName();
+
+      char slayer[80];
+      sprintf(slayer, "Layer_%i", DBlayer);
+      char sladder[80];
+      sprintf(sladder, "Ladder_%02i", DBladder);
+      char smodule[80];
+      sprintf(smodule, "Module_%i", DBmodule);
+
+      std::ostringstream sfolder;
+
+      sfolder << topFolderName << "/" << subDetectorFolder;
+      if (type < 4) {
+        sfolder << "/Shell_" << DBshell << "/" << slayer;
+      }
+      if (type < 2) {
+        sfolder << "/" << sladder;
+        if (PixelBarrelName(DetId(rawdetid)).isHalfModule())
+          sfolder << "H";
+        else
+          sfolder << "F";
+      }
+      if (type == 0)
+        sfolder << "/" << smodule;
+      // if(type==3) sfolder << "/all_" << smodule;
+
+      // std::cout<<"set barrel folder: "<<rawdetid<<" :
+      // "<<sfolder.str().c_str()<<std::endl;
+
+      iBooker.setCurrentFolder(sfolder.str());
+      flag = true;
+    } else if (isUpgrade) {
+      // for endcap types there is nothing to do:
+      if (type > 3 && type != 7)
+        return true;
+
+      std::string subDetectorFolder = "Barrel";
+      PixelBarrelNameUpgrade::Shell DBshell = PixelBarrelNameUpgrade(DetId(rawdetid)).shell();
+      int DBlayer = PixelBarrelNameUpgrade(DetId(rawdetid)).layerName();
+      int DBladder = PixelBarrelNameUpgrade(DetId(rawdetid)).ladderName();
+      int DBmodule = PixelBarrelNameUpgrade(DetId(rawdetid)).moduleName();
+
+      char slayer[80];
+      sprintf(slayer, "Layer_%i", DBlayer);
+      char sladder[80];
+      sprintf(sladder, "Ladder_%02i", DBladder);
+      char smodule[80];
+      sprintf(smodule, "Module_%i", DBmodule);
+
+      std::ostringstream sfolder;
+
+      sfolder << topFolderName << "/" << subDetectorFolder;
+      if (type < 4) {
+        sfolder << "/Shell_" << DBshell << "/" << slayer;
+      }
+      if (type < 2) {
+        sfolder << "/" << sladder;
+        if (PixelBarrelNameUpgrade(DetId(rawdetid)).isHalfModule())
+          sfolder << "H";
+        else
+          sfolder << "F";
+      }
+      if (type == 0)
+        sfolder << "/" << smodule;
+      // if(type==3) sfolder << "/all_" << smodule;
+
+      // std::cout<<"set barrel folder: "<<rawdetid<<" :
+      // "<<sfolder.str().c_str()<<std::endl;
+
+      iBooker.setCurrentFolder(sfolder.str());
+      flag = true;
+    }  // endif(isUpgrade)
+  }
+
+  ///
+  /// Pixel Endcap
+  ///
+  else if (DetId(rawdetid).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) {
+    if (!isUpgrade) {
+      // for barrel types there is nothing to do:
+      if (type > 0 && type < 4)
+        return true;
+
+      std::string subDetectorFolder = "Endcap";
+      PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(rawdetid)).halfCylinder();
+      int disk = PixelEndcapName(DetId(rawdetid)).diskName();
+      int blade = PixelEndcapName(DetId(rawdetid)).bladeName();
+      int panel = PixelEndcapName(DetId(rawdetid)).pannelName();
       int module = PixelEndcapName(DetId(rawdetid)).plaquetteName();
 
-      char sdisk[80];  sprintf(sdisk,  "Disk_%i",disk);
-      char sblade[80]; sprintf(sblade, "Blade_%02i",blade);
-      char spanel[80]; sprintf(spanel, "Panel_%i",panel);
-      char smodule[80];sprintf(smodule,"Module_%i",module);
+      char sdisk[80];
+      sprintf(sdisk, "Disk_%i", disk);
+      char sblade[80];
+      sprintf(sblade, "Blade_%02i", blade);
+      char spanel[80];
+      sprintf(spanel, "Panel_%i", panel);
+      char smodule[80];
+      sprintf(smodule, "Module_%i", module);
 
       std::ostringstream sfolder;
 
-      sfolder <<topFolderName <<"/" << subDetectorFolder << 
-	"/HalfCylinder_" << side << "/" << sdisk; 
-      if(type==0 || type ==4){
-	sfolder << "/" << sblade; 
+      sfolder << topFolderName << "/" << subDetectorFolder << "/HalfCylinder_" << side << "/" << sdisk;
+      if (type == 0 || type == 4) {
+        sfolder << "/" << sblade;
       }
-      if(type==0){
-	sfolder << "/" << spanel << "/" << smodule;
+      if (type == 0) {
+        sfolder << "/" << spanel << "/" << smodule;
       }
-//       if(type==6){
-// 	sfolder << "/" << spanel << "_all_" << smodule;
-//       }
-     
-     //std::cout<<"set endcap folder: "<<rawdetid<<" : "<<sfolder.str().c_str()<<std::endl;
-     
+      //       if(type==6){
+      // 	sfolder << "/" << spanel << "_all_" << smodule;
+      //       }
+
+      // std::cout<<"set endcap folder: "<<rawdetid<<" :
+      // "<<sfolder.str().c_str()<<std::endl;
+
       iBooker.setCurrentFolder(sfolder.str());
       flag = true;
 
-     } else if (isUpgrade) {
-       //for barrel types there is nothing to do: 
-       if(type>0 && type < 4) return true;
-       
-       std::string subDetectorFolder = "Endcap";
-       PixelEndcapNameUpgrade::HalfCylinder side = PixelEndcapNameUpgrade(DetId(rawdetid)).halfCylinder();
-        int disk   = PixelEndcapNameUpgrade(DetId(rawdetid)).diskName();
-        int blade  = PixelEndcapNameUpgrade(DetId(rawdetid)).bladeName();
-        int panel  = PixelEndcapNameUpgrade(DetId(rawdetid)).pannelName();
-        int module = PixelEndcapNameUpgrade(DetId(rawdetid)).plaquetteName();
-        
-        
-        char sdisk[80];  sprintf(sdisk,  "Disk_%i",disk);
-        char sblade[80]; sprintf(sblade, "Blade_%02i",blade);
-        char spanel[80]; sprintf(spanel, "Panel_%i",panel);
-        char smodule[80];sprintf(smodule,"Module_%i",module);
-        
-        std::ostringstream sfolder;
-        
-        sfolder <<topFolderName <<"/" << subDetectorFolder << 
-          "/HalfCylinder_" << side << "/" << sdisk; 
-        if(type==0 || type ==4){
-          sfolder << "/" << sblade; 
-        }
-        if(type==0){
-          sfolder << "/" << spanel << "/" << smodule;
-        }
-//        if(type==6){
-//          sfolder << "/" << spanel << "_all_" << smodule;
-//        }
-       
-       //std::cout<<"set endcap folder: "<<rawdetid<<" : "<<sfolder.str().c_str()<<std::endl;
-       
-       iBooker.setCurrentFolder(sfolder.str());
-       flag = true;
-     }//endifendcap&&isUpgrade
-   } else throw cms::Exception("LogicError")
-     << "[SiPixelFolderOrganizer::setModuleFolder] Not a Pixel detector DetId ";
-   
-   return flag;
+    } else if (isUpgrade) {
+      // for barrel types there is nothing to do:
+      if (type > 0 && type < 4)
+        return true;
+
+      std::string subDetectorFolder = "Endcap";
+      PixelEndcapNameUpgrade::HalfCylinder side = PixelEndcapNameUpgrade(DetId(rawdetid)).halfCylinder();
+      int disk = PixelEndcapNameUpgrade(DetId(rawdetid)).diskName();
+      int blade = PixelEndcapNameUpgrade(DetId(rawdetid)).bladeName();
+      int panel = PixelEndcapNameUpgrade(DetId(rawdetid)).pannelName();
+      int module = PixelEndcapNameUpgrade(DetId(rawdetid)).plaquetteName();
+
+      char sdisk[80];
+      sprintf(sdisk, "Disk_%i", disk);
+      char sblade[80];
+      sprintf(sblade, "Blade_%02i", blade);
+      char spanel[80];
+      sprintf(spanel, "Panel_%i", panel);
+      char smodule[80];
+      sprintf(smodule, "Module_%i", module);
+
+      std::ostringstream sfolder;
+
+      sfolder << topFolderName << "/" << subDetectorFolder << "/HalfCylinder_" << side << "/" << sdisk;
+      if (type == 0 || type == 4) {
+        sfolder << "/" << sblade;
+      }
+      if (type == 0) {
+        sfolder << "/" << spanel << "/" << smodule;
+      }
+      //        if(type==6){
+      //          sfolder << "/" << spanel << "_all_" << smodule;
+      //        }
 
+      // std::cout<<"set endcap folder: "<<rawdetid<<" :
+      // "<<sfolder.str().c_str()<<std::endl;
+
+      iBooker.setCurrentFolder(sfolder.str());
+      flag = true;
+    }  // endifendcap&&isUpgrade
+  } else
+    throw cms::Exception("LogicError") << "[SiPixelFolderOrganizer::setModuleFolder] Not a Pixel detector "
+                                          "DetId ";
+
+  return flag;
 }
 
-//Overloaded setFedFolder for use outside of DQM framework
+// Overloaded setFedFolder for use outside of DQM framework
 bool SiPixelFolderOrganizer::setFedFolder(const uint32_t FedId) {
-
   std::string subDetectorFolder = "AdditionalPixelErrors";
-  char sFed[80];  sprintf(sFed,  "FED_%i",FedId);
+  char sFed[80];
+  sprintf(sFed, "FED_%i", FedId);
   std::ostringstream sfolder;
-  
+
   sfolder << topFolderName << "/" << subDetectorFolder << "/" << sFed;
   dbe_->setCurrentFolder(sfolder.str());
-  
-  return true;
 
+  return true;
 }
 
-//Overloaded setFedFolder to avoid accessing DQMStore directly.
-bool SiPixelFolderOrganizer::setFedFolder(DQMStore::IBooker& iBooker, const uint32_t FedId) {
-
+// Overloaded setFedFolder to avoid accessing DQMStore directly.
+bool SiPixelFolderOrganizer::setFedFolder(DQMStore::IBooker &iBooker, const uint32_t FedId) {
   std::string subDetectorFolder = "AdditionalPixelErrors";
-  char sFed[80];  sprintf(sFed,  "FED_%i",FedId);
+  char sFed[80];
+  sprintf(sFed, "FED_%i", FedId);
   std::ostringstream sfolder;
-  
+
   sfolder << topFolderName << "/" << subDetectorFolder << "/" << sFed;
   iBooker.setCurrentFolder(sfolder.str());
-  
-  return true;
 
+  return true;
 }
 
-void SiPixelFolderOrganizer::getModuleFolder(const uint32_t& rawdetid, 
-                                             std::string& path,
-                                             bool isUpgrade) {
-
+void SiPixelFolderOrganizer::getModuleFolder(const uint32_t &rawdetid, std::string &path, bool isUpgrade) {
   path = topFolderName;
-  if(rawdetid == 0) {
+  if (rawdetid == 0) {
     return;
-  }else if( (DetId(rawdetid).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) && (!isUpgrade) ) {
+  } else if ((DetId(rawdetid).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) && (!isUpgrade)) {
     std::string subDetectorFolder = "Barrel";
     PixelBarrelName::Shell DBshell = PixelBarrelName(DetId(rawdetid)).shell();
-    int DBlayer  = PixelBarrelName(DetId(rawdetid)).layerName();
+    int DBlayer = PixelBarrelName(DetId(rawdetid)).layerName();
     int DBladder = PixelBarrelName(DetId(rawdetid)).ladderName();
     int DBmodule = PixelBarrelName(DetId(rawdetid)).moduleName();
-    
-    //char sshell[80];  sprintf(sshell, "Shell_%i",   DBshell);
-    char slayer[80];  sprintf(slayer, "Layer_%i",   DBlayer);
-    char sladder[80]; sprintf(sladder,"Ladder_%02i",DBladder);
-    char smodule[80]; sprintf(smodule,"Module_%i",  DBmodule);
-    
+
+    // char sshell[80];  sprintf(sshell, "Shell_%i",   DBshell);
+    char slayer[80];
+    sprintf(slayer, "Layer_%i", DBlayer);
+    char sladder[80];
+    sprintf(sladder, "Ladder_%02i", DBladder);
+    char smodule[80];
+    sprintf(smodule, "Module_%i", DBmodule);
+
     std::ostringstream sfolder;
-    sfolder << topFolderName << "/" << subDetectorFolder << "/Shell_" <<DBshell << "/" << slayer << "/" << sladder;
-    if ( PixelBarrelName(DetId(rawdetid)).isHalfModule() ) sfolder <<"H"; 
-    else sfolder <<"F";
-    sfolder << "/" <<smodule;
+    sfolder << topFolderName << "/" << subDetectorFolder << "/Shell_" << DBshell << "/" << slayer << "/" << sladder;
+    if (PixelBarrelName(DetId(rawdetid)).isHalfModule())
+      sfolder << "H";
+    else
+      sfolder << "F";
+    sfolder << "/" << smodule;
     path = sfolder.str();
-   
-    //path = path + "/" + subDetectorFolder + "/" + sshell + "/" + slayer + "/" + sladder;
-    //if(PixelBarrelName(DetId(rawdetid)).isHalfModule() )
-    //  path = path + "H"; 
-    //else path = path + "F";
-    //path = path + "/" + smodule;
-
-  }else if( (DetId(rawdetid).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) && (isUpgrade) ) {
+
+    // path = path + "/" + subDetectorFolder + "/" + sshell + "/" + slayer + "/"
+    // + sladder; if(PixelBarrelName(DetId(rawdetid)).isHalfModule() )
+    //  path = path + "H";
+    // else path = path + "F";
+    // path = path + "/" + smodule;
+
+  } else if ((DetId(rawdetid).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) && (isUpgrade)) {
     std::string subDetectorFolder = "Barrel";
     PixelBarrelNameUpgrade::Shell DBshell = PixelBarrelNameUpgrade(DetId(rawdetid)).shell();
-    int DBlayer  = PixelBarrelNameUpgrade(DetId(rawdetid)).layerName();
+    int DBlayer = PixelBarrelNameUpgrade(DetId(rawdetid)).layerName();
     int DBladder = PixelBarrelNameUpgrade(DetId(rawdetid)).ladderName();
     int DBmodule = PixelBarrelNameUpgrade(DetId(rawdetid)).moduleName();
-    
-    //char sshell[80];  sprintf(sshell, "Shell_%i",   DBshell);
-    char slayer[80];  sprintf(slayer, "Layer_%i",   DBlayer);
-    char sladder[80]; sprintf(sladder,"Ladder_%02i",DBladder);
-    char smodule[80]; sprintf(smodule,"Module_%i",  DBmodule);
-    
+
+    // char sshell[80];  sprintf(sshell, "Shell_%i",   DBshell);
+    char slayer[80];
+    sprintf(slayer, "Layer_%i", DBlayer);
+    char sladder[80];
+    sprintf(sladder, "Ladder_%02i", DBladder);
+    char smodule[80];
+    sprintf(smodule, "Module_%i", DBmodule);
+
     std::ostringstream sfolder;
-    sfolder << topFolderName << "/" << subDetectorFolder << "/Shell_" <<DBshell << "/" << slayer << "/" << sladder;
-    if ( PixelBarrelNameUpgrade(DetId(rawdetid)).isHalfModule() ) sfolder <<"H"; 
-    else sfolder <<"F";
-    sfolder << "/" <<smodule;
+    sfolder << topFolderName << "/" << subDetectorFolder << "/Shell_" << DBshell << "/" << slayer << "/" << sladder;
+    if (PixelBarrelNameUpgrade(DetId(rawdetid)).isHalfModule())
+      sfolder << "H";
+    else
+      sfolder << "F";
+    sfolder << "/" << smodule;
     path = sfolder.str();
-   
-    //path = path + "/" + subDetectorFolder + "/" + sshell + "/" + slayer + "/" + sladder;
-    //if(PixelBarrelNameUpgrade(DetId(rawdetid)).isHalfModule() )
-    //  path = path + "H"; 
-    //else path = path + "F";
-    //path = path + "/" + smodule;
-
-  } else if( (DetId(rawdetid).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) && (!isUpgrade) ) {
+
+    // path = path + "/" + subDetectorFolder + "/" + sshell + "/" + slayer + "/"
+    // + sladder; if(PixelBarrelNameUpgrade(DetId(rawdetid)).isHalfModule() )
+    //  path = path + "H";
+    // else path = path + "F";
+    // path = path + "/" + smodule;
+
+  } else if ((DetId(rawdetid).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) && (!isUpgrade)) {
     std::string subDetectorFolder = "Endcap";
     PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(rawdetid)).halfCylinder();
-    int disk   = PixelEndcapName(DetId(rawdetid)).diskName();
-    int blade  = PixelEndcapName(DetId(rawdetid)).bladeName();
-    int panel  = PixelEndcapName(DetId(rawdetid)).pannelName();
+    int disk = PixelEndcapName(DetId(rawdetid)).diskName();
+    int blade = PixelEndcapName(DetId(rawdetid)).bladeName();
+    int panel = PixelEndcapName(DetId(rawdetid)).pannelName();
     int module = PixelEndcapName(DetId(rawdetid)).plaquetteName();
 
-    //char shc[80];  sprintf(shc,  "HalfCylinder_%i",side);
-    char sdisk[80];  sprintf(sdisk,  "Disk_%i",disk);
-    char sblade[80]; sprintf(sblade, "Blade_%02i",blade);
-    char spanel[80]; sprintf(spanel, "Panel_%i",panel);
-    char smodule[80];sprintf(smodule,"Module_%i",module);
+    // char shc[80];  sprintf(shc,  "HalfCylinder_%i",side);
+    char sdisk[80];
+    sprintf(sdisk, "Disk_%i", disk);
+    char sblade[80];
+    sprintf(sblade, "Blade_%02i", blade);
+    char spanel[80];
+    sprintf(spanel, "Panel_%i", panel);
+    char smodule[80];
+    sprintf(smodule, "Module_%i", module);
 
     std::ostringstream sfolder;
-    sfolder <<topFolderName <<"/" << subDetectorFolder << "/HalfCylinder_" << side << "/" << sdisk << "/" << sblade << "/" << spanel << "/" << smodule;
+    sfolder << topFolderName << "/" << subDetectorFolder << "/HalfCylinder_" << side << "/" << sdisk << "/" << sblade
+            << "/" << spanel << "/" << smodule;
     path = sfolder.str();
-    
-    //path = path + "/" + subDetectorFolder + "/" + shc + "/" + sdisk + "/" + sblade + "/" + spanel + "/" + smodule;
 
-  } else if( (DetId(rawdetid).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) && (isUpgrade) ) {
+    // path = path + "/" + subDetectorFolder + "/" + shc + "/" + sdisk + "/" +
+    // sblade + "/" + spanel + "/" + smodule;
+
+  } else if ((DetId(rawdetid).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) && (isUpgrade)) {
     std::string subDetectorFolder = "Endcap";
     PixelEndcapNameUpgrade::HalfCylinder side = PixelEndcapNameUpgrade(DetId(rawdetid)).halfCylinder();
-    int disk   = PixelEndcapNameUpgrade(DetId(rawdetid)).diskName();
-    int blade  = PixelEndcapNameUpgrade(DetId(rawdetid)).bladeName();
-    int panel  = PixelEndcapNameUpgrade(DetId(rawdetid)).pannelName();
+    int disk = PixelEndcapNameUpgrade(DetId(rawdetid)).diskName();
+    int blade = PixelEndcapNameUpgrade(DetId(rawdetid)).bladeName();
+    int panel = PixelEndcapNameUpgrade(DetId(rawdetid)).pannelName();
     int module = PixelEndcapNameUpgrade(DetId(rawdetid)).plaquetteName();
 
-    //char shc[80];  sprintf(shc,  "HalfCylinder_%i",side);
-    char sdisk[80];  sprintf(sdisk,  "Disk_%i",disk);
-    char sblade[80]; sprintf(sblade, "Blade_%02i",blade);
-    char spanel[80]; sprintf(spanel, "Panel_%i",panel);
-    char smodule[80];sprintf(smodule,"Module_%i",module);
+    // char shc[80];  sprintf(shc,  "HalfCylinder_%i",side);
+    char sdisk[80];
+    sprintf(sdisk, "Disk_%i", disk);
+    char sblade[80];
+    sprintf(sblade, "Blade_%02i", blade);
+    char spanel[80];
+    sprintf(spanel, "Panel_%i", panel);
+    char smodule[80];
+    sprintf(smodule, "Module_%i", module);
 
     std::ostringstream sfolder;
-    sfolder <<topFolderName <<"/" << subDetectorFolder << "/HalfCylinder_" << side << "/" << sdisk << "/" << sblade << "/" << spanel << "/" << smodule;
+    sfolder << topFolderName << "/" << subDetectorFolder << "/HalfCylinder_" << side << "/" << sdisk << "/" << sblade
+            << "/" << spanel << "/" << smodule;
     path = sfolder.str();
-    
-    //path = path + "/" + subDetectorFolder + "/" + shc + "/" + sdisk + "/" + sblade + "/" + spanel + "/" + smodule;
-
-  }else throw cms::Exception("LogicError")
-     << "[SiPixelFolderOrganizer::getModuleFolder] Not a Pixel detector DetId ";
-     
-  //std::cout<<"resulting final path name: "<<path<<std::endl;   
-     
+
+    // path = path + "/" + subDetectorFolder + "/" + shc + "/" + sdisk + "/" +
+    // sblade + "/" + spanel + "/" + smodule;
+
+  } else
+    throw cms::Exception("LogicError") << "[SiPixelFolderOrganizer::getModuleFolder] Not a Pixel detector "
+                                          "DetId ";
+
+  // std::cout<<"resulting final path name: "<<path<<std::endl;
+
   return;
 }
diff --git a/DQM/SiPixelCommon/src/SiPixelHistogramId.cc b/DQM/SiPixelCommon/src/SiPixelHistogramId.cc
index 27c1088d4a9a5..2880f25a65e83 100644
--- a/DQM/SiPixelCommon/src/SiPixelHistogramId.cc
+++ b/DQM/SiPixelCommon/src/SiPixelHistogramId.cc
@@ -2,7 +2,7 @@
 //
 // Package:     SiPixelCommon
 // Class  :     SiPixelHistogramId
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -10,71 +10,62 @@
 //         Created:  Wed Feb 22 16:07:58 CET 2006
 //
 
-#include<iostream>
-#include<sstream>
+#include <iostream>
+#include <sstream>
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DQM/SiPixelCommon/interface/SiPixelHistogramId.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace edm;
 
 /// Constructor
-SiPixelHistogramId::SiPixelHistogramId() : 
-  dataCollection_("defaultData"),
-  separator_("_")
-{
-}
+SiPixelHistogramId::SiPixelHistogramId() : dataCollection_("defaultData"), separator_("_") {}
 /// Constructor with collection
-SiPixelHistogramId::SiPixelHistogramId(std::string dataCollection) : 
-  dataCollection_(dataCollection),
-  separator_("_")
-{
-}
+SiPixelHistogramId::SiPixelHistogramId(std::string dataCollection) : dataCollection_(dataCollection), separator_("_") {}
 
 /// Destructor
-SiPixelHistogramId::~SiPixelHistogramId()
-{
-}
+SiPixelHistogramId::~SiPixelHistogramId() {}
 /// Create Histogram Id
-std::string SiPixelHistogramId::setHistoId( std::string variable, uint32_t& rawId )
-{
+std::string SiPixelHistogramId::setHistoId(std::string variable, uint32_t &rawId) {
   std::string histoId;
   std::ostringstream rawIdString;
-  rawIdString<<rawId;
-  histoId = variable + separator_ + dataCollection_ + separator_  + rawIdString.str();
+  rawIdString << rawId;
+  histoId = variable + separator_ + dataCollection_ + separator_ + rawIdString.str();
 
   return histoId;
 }
 /// get Data Collection
-std::string SiPixelHistogramId::getDataCollection( std::string histoid ) {
-  return returnIdPart(histoid,2);
-}
+std::string SiPixelHistogramId::getDataCollection(std::string histoid) { return returnIdPart(histoid, 2); }
 /// get Raw Id
-uint32_t SiPixelHistogramId::getRawId( std::string histoid ) {
+uint32_t SiPixelHistogramId::getRawId(std::string histoid) {
   uint32_t local_component_id;
-  std::istringstream input(returnIdPart(histoid,3)); input >> local_component_id; 
+  std::istringstream input(returnIdPart(histoid, 3));
+  input >> local_component_id;
   return local_component_id;
 }
 /// get Part
-std::string SiPixelHistogramId::returnIdPart(std::string histoid, uint32_t whichpart){
-
-  size_t length1=histoid.find(separator_,0);
-  if(length1==std::string::npos){ // no separator1 found
-    LogWarning("PixelDQM")<<"SiPixelHistogramId::returnIdPart - no regular histoid. Returning 0";
+std::string SiPixelHistogramId::returnIdPart(std::string histoid, uint32_t whichpart) {
+  size_t length1 = histoid.find(separator_, 0);
+  if (length1 == std::string::npos) {  // no separator1 found
+    LogWarning("PixelDQM") << "SiPixelHistogramId::returnIdPart - no regular histoid. Returning 0";
     return "0";
   }
-  std::string part1 = histoid.substr(0,length1); // part of 'histoid' up to 'separator1'
-  if(whichpart==1) return part1;
-  std::string remain1 = histoid.substr(length1+separator_.size()); // rest of 'histoid' starting at end of 'separator1'
-  size_t length2=remain1.find(separator_,0);
-  if(length2==std::string::npos){ // no separator2 found
-    LogWarning("PixelDQM")<<"SiPixelHistogramId::returnIdPart - no regular histoid. Returning 0";
+  std::string part1 = histoid.substr(0, length1);  // part of 'histoid' up to 'separator1'
+  if (whichpart == 1)
+    return part1;
+  std::string remain1 =
+      histoid.substr(length1 + separator_.size());  // rest of 'histoid' starting at end of 'separator1'
+  size_t length2 = remain1.find(separator_, 0);
+  if (length2 == std::string::npos) {  // no separator2 found
+    LogWarning("PixelDQM") << "SiPixelHistogramId::returnIdPart - no regular histoid. Returning 0";
     return "0";
   }
-  std::string part2 = remain1.substr(0,length2); // part of 'remain1' up to 'separator2'
-  if(whichpart==2) return part2;
-  std::string part3 = remain1.substr(length2+separator_.size()); // rest of remain1 starting at end of 'separator2'
-  if(whichpart==3) return part3;
-  LogWarning("PixelDQM")<<"SiPixelHistogramId::returnIdPart - no such whichpart="<<whichpart<<" returning 0";
+  std::string part2 = remain1.substr(0, length2);  // part of 'remain1' up to 'separator2'
+  if (whichpart == 2)
+    return part2;
+  std::string part3 = remain1.substr(length2 + separator_.size());  // rest of remain1 starting at end of 'separator2'
+  if (whichpart == 3)
+    return part3;
+  LogWarning("PixelDQM") << "SiPixelHistogramId::returnIdPart - no such whichpart=" << whichpart << " returning 0";
   return "0";
 }
diff --git a/DQM/SiPixelMonitorClient/interface/ANSIColors.h b/DQM/SiPixelMonitorClient/interface/ANSIColors.h
index b2a265819e05f..76cd29b14f2c5 100644
--- a/DQM/SiPixelMonitorClient/interface/ANSIColors.h
+++ b/DQM/SiPixelMonitorClient/interface/ANSIColors.h
@@ -1,21 +1,22 @@
 /*! \file ANSIColors.hh
  *  \brief Header file containing macros to highlight output lines in color.<BR>
- *  Check also <A HREF="http://www.bluesock.org/~willg/dev/ansi.html">http://www.bluesock.org/~willg/dev/ansi.html</A>
+ *  Check also <A
+ * HREF="http://www.bluesock.org/~willg/dev/ansi.html">http://www.bluesock.org/~willg/dev/ansi.html</A>
  *  \image html separator.gif
  *  \image latex separator.pdf
  */
- 
+
 #ifndef _ANSICOLORS
 #define _ANSICOLORS
 
-#define ACBlack  "\x1B[0;30m"
-#define ACBlue  "\x1B[0;34m"
-#define ACGreen  "\x1B[0;32m"
-#define ACCyan  "\x1B[0;36m"
-#define ACRed  "\x1B[0;31m"
+#define ACBlack "\x1B[0;30m"
+#define ACBlue "\x1B[0;34m"
+#define ACGreen "\x1B[0;32m"
+#define ACCyan "\x1B[0;36m"
+#define ACRed "\x1B[0;31m"
 #define ACPurple "\x1B[0;35m"
-#define ACBrown  "\x1B[0;33m"
-#define ACGray  "\x1B[0;37m"
+#define ACBrown "\x1B[0;33m"
+#define ACGray "\x1B[0;37m"
 #define ACDarkGray "\x1B[1;30m"
 #define ACLightBlue "\x1B[1;34m"
 #define ACLightGreen "\x1B[1;32m"
@@ -23,18 +24,18 @@
 #define ACLightRed "\x1B[1;31m"
 #define ACLightPurple "\x1B[1;35m"
 #define ACYellow "\x1B[1;33m"
-#define ACWhite  "\x1B[1;37m"
+#define ACWhite "\x1B[1;37m"
 
-#define ACPlain  "\x1B[0m"
-#define ACBold  "\x1B[1m"
+#define ACPlain "\x1B[0m"
+#define ACBold "\x1B[1m"
 #define ACUnderline "\x1B[4m"
-#define ACBlink  "\x1B[5m"
+#define ACBlink "\x1B[5m"
 #define ACReverse "\x1B[7m"
 
-#define ACClear  "\x1B[2J"
+#define ACClear "\x1B[2J"
 #define ACClearL "\x1B[2K"
 
-#define ACSave  "\x1B[s"
+#define ACSave "\x1B[s"
 #define ACRecall "\x1B[u"
 
 #endif
diff --git a/DQM/SiPixelMonitorClient/interface/SiPixelActionExecutor.h b/DQM/SiPixelMonitorClient/interface/SiPixelActionExecutor.h
index d5012d2482a9f..a2a903d135d42 100644
--- a/DQM/SiPixelMonitorClient/interface/SiPixelActionExecutor.h
+++ b/DQM/SiPixelMonitorClient/interface/SiPixelActionExecutor.h
@@ -1,185 +1,157 @@
 #ifndef _SiPixelActionExecutor_h_
 #define _SiPixelActionExecutor_h_
 
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMStore.h"
+#include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
+#include "CondFormats/SiPixelObjects/interface/DetectorIndex.h"
+#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
+#include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelConfigParser.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelConfigWriter.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
-#include "CondFormats/SiPixelObjects/interface/DetectorIndex.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h"
 #include <fstream>
 #include <map>
-#include <vector>
 #include <string>
+#include <vector>
 
 // For Tracker Map
-enum funcType {EachBinContent, Entries, Mean, Sum, WeightedSum};
+enum funcType { EachBinContent, Entries, Mean, Sum, WeightedSum };
 #define PI_12 0.261799
-#define PI    3.141592
-#define PI_2  1.570796
+#define PI 3.141592
+#define PI_2 1.570796
 
-#define NLev1		4		// Number of HalfCylinders in Endcap or number of Shells in Barrel, which is bigger
-#define NLev2		3		// Number of Disks in Endcap or number of Layers in Barrel, which is bigger
-#define NLev3		22		// Number of Blades in Endcap or number of Ladders in Barrel, which is bigger
-#define NLev4		7		// Number of Modules - different for Endcap and Barrel, which is bigger
+// Number of HalfCylinders in Endcap or number of Shells in Barrel, which is bigger
+#define NLev1 4
+// Number of Disks in Endcap or number of Layers in Barrel, which is bigger
+#define NLev2 3
+// Number of Blades in Endcap or number of Ladders in Barrel, which is bigger
+#define NLev3 22
+// Number of Modules - different for Endcap and Barrel, which is bigger
+#define NLev4 7
 
-#define NCyl		4
-#define NDisk		2
-#define NBlade		12
-#define NModuleE	7
+#define NCyl 4
+#define NDisk 2
+#define NBlade 12
+#define NModuleE 7
 
-#define NShell		4
-#define NLayer		3
-#define NModuleB	4
+#define NShell 4
+#define NLayer 3
+#define NModuleB 4
 
-#define NPoints		5
+#define NPoints 5
 
 // End for Tracker Map
 
 class SiPixelActionExecutor {
+public:
+  SiPixelActionExecutor(bool offlineXMLfile, bool Tier0Flag);
+  ~SiPixelActionExecutor();
 
- public:
-
-  SiPixelActionExecutor(            bool                           offlineXMLfile,
-                                    bool                           Tier0Flag);
- ~SiPixelActionExecutor();
-
- void createSummary(    	    DQMStore::IBooker            & iBooker,
-				    DQMStore::IGetter            & iGetter,
- 				    bool   			   isUpgrade);
- void bookDeviations(               DQMStore::IBooker            & iBooker,
- 				    bool			   isUpgrade);
- void bookEfficiency(    	    DQMStore::IBooker            & iBooker,
- 				    bool			   isUpgrade);
- void createEfficiency(    	    DQMStore::IBooker            & iBooker,
-				    DQMStore::IGetter 		 & iGetter,
- 				    bool			   isUpgrade);
- void fillEfficiency(    	    DQMStore::IBooker            & iBooker,
-				    DQMStore::IGetter  		 & iGetter,
-                                    bool                           isbarrel,
-				    bool			   isUpgrade);
- void fillEfficiencySummary(	    DQMStore::IBooker		 & iBooker,
-				    DQMStore::IGetter  		 & iGetter);
- void bookOccupancyPlots(    	    DQMStore::IBooker            & iBooker,
-				    DQMStore::IGetter            & iGetter,
-                                    bool                           hiRes,
-				    bool				isbarrel);
- void bookOccupancyPlots(    	    DQMStore::IBooker            & iBooker,
-				    DQMStore::IGetter            & iGetter,
-                                    bool                           hiRes);
- void createOccupancy(    	    DQMStore::IBooker            & iBooker,
-				    DQMStore::IGetter  		 & iGetter);
- void normaliseAvDigiOcc(	    DQMStore::IBooker		 & iBooker,
-				    DQMStore::IGetter		 & iGetter);
- void normaliseAvDigiOccVsLumi(	    DQMStore::IBooker		 & iBooker,
-				    DQMStore::IGetter		 & iGetter,
-                                    int                            lumisec);
- bool readConfiguration(	    int 			 & tkmap_freq, 
-                        	    int 			 & sum_barrel_freq, 
-				    int 			 & sum_endcap_freq, 
-				    int 			 & sum_grandbarrel_freq, 
-				    int 			 & sum_grandendcap_freq,
-				    int 			 & message_limit,
-                                    int                          & source_type,
-				    int                          & calib_type);
- bool readConfiguration(	    int 			 & tkmap_freq, 
-                        	    int 			 & summary_freq);
- void readConfiguration(	    );
- int getLadder(                     const std::string            & dname);
- int getBlade(                     const std::string             & dname);
+  void createSummary(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter, bool isUpgrade);
+  void bookDeviations(DQMStore::IBooker &iBooker, bool isUpgrade);
+  void bookEfficiency(DQMStore::IBooker &iBooker, bool isUpgrade);
+  void createEfficiency(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter, bool isUpgrade);
+  void fillEfficiency(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter, bool isbarrel, bool isUpgrade);
+  void fillEfficiencySummary(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter);
+  void bookOccupancyPlots(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter, bool hiRes, bool isbarrel);
+  void bookOccupancyPlots(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter, bool hiRes);
+  void createOccupancy(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter);
+  void normaliseAvDigiOcc(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter);
+  void normaliseAvDigiOccVsLumi(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter, int lumisec);
+  bool readConfiguration(int &tkmap_freq,
+                         int &sum_barrel_freq,
+                         int &sum_endcap_freq,
+                         int &sum_grandbarrel_freq,
+                         int &sum_grandendcap_freq,
+                         int &message_limit,
+                         int &source_type,
+                         int &calib_type);
+  bool readConfiguration(int &tkmap_freq, int &summary_freq);
+  void readConfiguration();
+  int getLadder(const std::string &dname);
+  int getBlade(const std::string &dname);
 
 private:
-  
-  
- MonitorElement* getSummaryME(      DQMStore::IBooker            & iBooker,
-				    DQMStore::IGetter            & iGetter,
-                                    std::string 	     	   me_name,
-				    bool			   isUpgrade);
- MonitorElement* getFEDSummaryME(   DQMStore::IBooker  		 & iBooker,
-				    DQMStore::IGetter            & iGetter,
-                                    std::string 	     	   me_name);
-  void GetBladeSubdirs(             DQMStore::IBooker            & iBooker, 
-				    DQMStore::IGetter            & iGetter,
-				    std::vector<std::string>& blade_subdirs); 
-  void fillSummary(           	    DQMStore::IBooker     	 & iBooker,
-				    DQMStore::IGetter            & iGetter,
-                                    std::string 	     	   dir_name,
-                                    std::vector<std::string> 	 & me_names,
-				    bool isbarrel,
-				    bool isUpgrade);
-  void fillDeviations(              DQMStore::IGetter            & iGetter);
-  void fillFEDErrorSummary(         DQMStore::IBooker  		 & iBooker,
-				    DQMStore::IGetter            & iGetter,
-                                    std::string 	     	   dir_name,
-                                    std::vector<std::string> 	 & me_names);
-  void fillGrandBarrelSummaryHistos(DQMStore::IBooker  		 & iBooker,
-				    DQMStore::IGetter            & iGetter,
-			            std::vector<std::string> 	 & me_names,
-				    bool 			   isUpgrade);
-  void fillGrandEndcapSummaryHistos(DQMStore::IBooker            & iBooker,
-				    DQMStore::IGetter            & iGetter,
-			            std::vector<std::string> 	 & me_names,
-				    bool			   isUpgrade);
-  void getGrandSummaryME(           DQMStore::IBooker            & iBooker,
-				    DQMStore::IGetter            & iGetter,
-                                    int                      	   nbin, 
-                                    std::string              	 & me_name, 
-				    std::vector<MonitorElement*> & mes);
- 
-  void fillOccupancy(    	    DQMStore::IBooker            & iBooker,
-				    DQMStore::IGetter  		 & iGetter,
-				    bool isbarrel);
-
-  SiPixelConfigParser* configParser_;
-  SiPixelConfigWriter* configWriter_;
+  MonitorElement *getSummaryME(DQMStore::IBooker &iBooker,
+                               DQMStore::IGetter &iGetter,
+                               std::string me_name,
+                               bool isUpgrade);
+  MonitorElement *getFEDSummaryME(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter, std::string me_name);
+  void GetBladeSubdirs(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter, std::vector<std::string> &blade_subdirs);
+  void fillSummary(DQMStore::IBooker &iBooker,
+                   DQMStore::IGetter &iGetter,
+                   std::string dir_name,
+                   std::vector<std::string> &me_names,
+                   bool isbarrel,
+                   bool isUpgrade);
+  void fillDeviations(DQMStore::IGetter &iGetter);
+  void fillFEDErrorSummary(DQMStore::IBooker &iBooker,
+                           DQMStore::IGetter &iGetter,
+                           std::string dir_name,
+                           std::vector<std::string> &me_names);
+  void fillGrandBarrelSummaryHistos(DQMStore::IBooker &iBooker,
+                                    DQMStore::IGetter &iGetter,
+                                    std::vector<std::string> &me_names,
+                                    bool isUpgrade);
+  void fillGrandEndcapSummaryHistos(DQMStore::IBooker &iBooker,
+                                    DQMStore::IGetter &iGetter,
+                                    std::vector<std::string> &me_names,
+                                    bool isUpgrade);
+  void getGrandSummaryME(DQMStore::IBooker &iBooker,
+                         DQMStore::IGetter &iGetter,
+                         int nbin,
+                         std::string &me_name,
+                         std::vector<MonitorElement *> &mes);
+
+  void fillOccupancy(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter, bool isbarrel);
+
+  SiPixelConfigParser *configParser_;
+  SiPixelConfigWriter *configWriter_;
   edm::ESHandle<SiPixelFedCablingMap> theCablingMap;
-  
+
   std::vector<std::string> summaryMENames;
   std::vector<std::string> tkMapMENames;
-  
+
   int message_limit_;
   int source_type_;
-  int calib_type_;  
+  int calib_type_;
   int ndet_;
   bool offlineXMLfile_;
   bool Tier0Flag_;
-  
-  MonitorElement * OccupancyMap;
-  MonitorElement * PixelOccupancyMap;
-  MonitorElement * HitEfficiency_L1;
-  MonitorElement * HitEfficiency_L2;
-  MonitorElement * HitEfficiency_L3;
-  MonitorElement * HitEfficiency_L4;
-  MonitorElement * HitEfficiency_Dp1;
-  MonitorElement * HitEfficiency_Dp2;
-  MonitorElement * HitEfficiency_Dp3;
-  MonitorElement * HitEfficiency_Dm1;
-  MonitorElement * HitEfficiency_Dm2;
-  MonitorElement * HitEfficiency_Dm3;
-  MonitorElement * HitEfficiencySummary;
-  MonitorElement * DEV_adc_Barrel;
-  MonitorElement * DEV_ndigis_Barrel;
-  MonitorElement * DEV_charge_Barrel;
-  MonitorElement * DEV_nclusters_Barrel;
-  MonitorElement * DEV_size_Barrel;
-  MonitorElement * DEV_adc_Endcap;
-  MonitorElement * DEV_ndigis_Endcap;
-  MonitorElement * DEV_charge_Endcap;
-  MonitorElement * DEV_nclusters_Endcap;
-  MonitorElement * DEV_size_Endcap;
-  
-  TH2F * temp_H;
-  TH2F * temp_1x2;
-  TH2F * temp_1x5;
-  TH2F * temp_2x3;
-  TH2F * temp_2x4;
-  TH2F * temp_2x5;
-  
+
+  MonitorElement *OccupancyMap;
+  MonitorElement *PixelOccupancyMap;
+  MonitorElement *HitEfficiency_L1;
+  MonitorElement *HitEfficiency_L2;
+  MonitorElement *HitEfficiency_L3;
+  MonitorElement *HitEfficiency_L4;
+  MonitorElement *HitEfficiency_Dp1;
+  MonitorElement *HitEfficiency_Dp2;
+  MonitorElement *HitEfficiency_Dp3;
+  MonitorElement *HitEfficiency_Dm1;
+  MonitorElement *HitEfficiency_Dm2;
+  MonitorElement *HitEfficiency_Dm3;
+  MonitorElement *HitEfficiencySummary;
+  MonitorElement *DEV_adc_Barrel;
+  MonitorElement *DEV_ndigis_Barrel;
+  MonitorElement *DEV_charge_Barrel;
+  MonitorElement *DEV_nclusters_Barrel;
+  MonitorElement *DEV_size_Barrel;
+  MonitorElement *DEV_adc_Endcap;
+  MonitorElement *DEV_ndigis_Endcap;
+  MonitorElement *DEV_charge_Endcap;
+  MonitorElement *DEV_nclusters_Endcap;
+  MonitorElement *DEV_size_Endcap;
+
+  TH2F *temp_H;
+  TH2F *temp_1x2;
+  TH2F *temp_1x5;
+  TH2F *temp_2x3;
+  TH2F *temp_2x4;
+  TH2F *temp_2x5;
 };
 #endif
diff --git a/DQM/SiPixelMonitorClient/interface/SiPixelCertification.h b/DQM/SiPixelMonitorClient/interface/SiPixelCertification.h
index 15d0059fc1e72..9b7b47dfb37b3 100644
--- a/DQM/SiPixelMonitorClient/interface/SiPixelCertification.h
+++ b/DQM/SiPixelMonitorClient/interface/SiPixelCertification.h
@@ -2,43 +2,43 @@
 #define DQM_SiPixelMonitorClient_SiPixelCertification_H
 
 // system include files
-#include <memory>
-#include <iostream>
 #include <fstream>
+#include <iostream>
+#include <memory>
 
 // FWCore
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/LuminosityBlock.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-
-class SiPixelCertification: public DQMEDHarvester{
+class SiPixelCertification : public DQMEDHarvester {
 public:
-  explicit SiPixelCertification(const edm::ParameterSet&);
+  explicit SiPixelCertification(const edm::ParameterSet &);
   ~SiPixelCertification() override;
-  
 
 private:
-  void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, const edm::LuminosityBlock& , const  edm::EventSetup&) override;
+  void dqmEndLuminosityBlock(DQMStore::IBooker &,
+                             DQMStore::IGetter &,
+                             const edm::LuminosityBlock &,
+                             const edm::EventSetup &) override;
   void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
 
   bool firstLumi;
-  
-  MonitorElement * CertificationPixel;
-  MonitorElement * CertificationBarrel;
-  MonitorElement * CertificationEndcap;
 
+  MonitorElement *CertificationPixel;
+  MonitorElement *CertificationBarrel;
+  MonitorElement *CertificationEndcap;
 };
 
 #endif
diff --git a/DQM/SiPixelMonitorClient/interface/SiPixelConfigParser.h b/DQM/SiPixelMonitorClient/interface/SiPixelConfigParser.h
index 11c90b20a49ec..5b1733711697c 100644
--- a/DQM/SiPixelMonitorClient/interface/SiPixelConfigParser.h
+++ b/DQM/SiPixelMonitorClient/interface/SiPixelConfigParser.h
@@ -4,46 +4,42 @@
 /** \class SiPixelConfigParser
  * *
  *  Class that handles the SiPixel Quality Tests
- * 
+ *
  *  \author Petra Merkel
-  */
+ */
 
 #include "DQMServices/ClientConfig/interface/DQMParserBase.h"
-#include <vector>
 #include <fstream>
-#include <string>
 #include <map>
-
+#include <string>
+#include <vector>
 
 class SiPixelConfigParser : public DQMParserBase {
-
- public:
-  
-
+public:
   // Constructor
   SiPixelConfigParser();
-  
+
   // Destructor
   ~SiPixelConfigParser() override;
 
   // get List of MEs for TrackerMap
-  bool getMENamesForTrackerMap(std::string& tkmap_name,std::vector<std::string>& me_names);
-  bool getFrequencyForTrackerMap(int& u_freq);
-  bool getMENamesForTree(std::string &structure_name, std::vector<std::string>& me_names);
-  bool getMENamesForBarrelSummary(std::string &structure_name, std::vector<std::string>& me_names);
-  bool getMENamesForEndcapSummary(std::string &structure_name, std::vector<std::string>& me_names);
-  bool getMENamesForFEDErrorSummary(std::string &structure_name, std::vector<std::string>& me_names);
-  bool getFrequencyForBarrelSummary(int& u_freq);
-  bool getFrequencyForEndcapSummary(int& u_freq);
-  bool getMENamesForGrandBarrelSummary(std::string &structure_name, std::vector<std::string>& me_names);
-  bool getMENamesForGrandEndcapSummary(std::string &structure_name, std::vector<std::string>& me_names);
-  bool getFrequencyForGrandBarrelSummary(int& u_freq);
-  bool getFrequencyForGrandEndcapSummary(int& u_freq);
-  bool getMessageLimitForQTests(int& u_freq);
-  bool getSourceType(int& u_freq);
-  bool getCalibType(int& u_freq);
- private:
-  
+  bool getMENamesForTrackerMap(std::string &tkmap_name, std::vector<std::string> &me_names);
+  bool getFrequencyForTrackerMap(int &u_freq);
+  bool getMENamesForTree(std::string &structure_name, std::vector<std::string> &me_names);
+  bool getMENamesForBarrelSummary(std::string &structure_name, std::vector<std::string> &me_names);
+  bool getMENamesForEndcapSummary(std::string &structure_name, std::vector<std::string> &me_names);
+  bool getMENamesForFEDErrorSummary(std::string &structure_name, std::vector<std::string> &me_names);
+  bool getFrequencyForBarrelSummary(int &u_freq);
+  bool getFrequencyForEndcapSummary(int &u_freq);
+  bool getMENamesForGrandBarrelSummary(std::string &structure_name, std::vector<std::string> &me_names);
+  bool getMENamesForGrandEndcapSummary(std::string &structure_name, std::vector<std::string> &me_names);
+  bool getFrequencyForGrandBarrelSummary(int &u_freq);
+  bool getFrequencyForGrandEndcapSummary(int &u_freq);
+  bool getMessageLimitForQTests(int &u_freq);
+  bool getSourceType(int &u_freq);
+  bool getCalibType(int &u_freq);
+
+private:
 };
 
 #endif
diff --git a/DQM/SiPixelMonitorClient/interface/SiPixelConfigWriter.h b/DQM/SiPixelMonitorClient/interface/SiPixelConfigWriter.h
index 6988a74447664..836c87fcf3f72 100644
--- a/DQM/SiPixelMonitorClient/interface/SiPixelConfigWriter.h
+++ b/DQM/SiPixelMonitorClient/interface/SiPixelConfigWriter.h
@@ -9,49 +9,40 @@
  *  \author Petra Merkel
  */
 #include "FWCore/Concurrency/interface/Xerces.h"
-#include <xercesc/framework/StdOutFormatTarget.hpp>
 #include <xercesc/framework/LocalFileFormatTarget.hpp>
+#include <xercesc/framework/StdOutFormatTarget.hpp>
 
-#include <xercesc/util/XMLString.hpp>
+#include <xercesc/dom/DOM.hpp>
 #include <xercesc/dom/DOMException.hpp>
 #include <xercesc/dom/DOMImplementation.hpp>
-#include <xercesc/dom/DOM.hpp>
-
-#include<iostream>
-#include<string>
-#include<vector>
-#include<map>
-
-
-
-
-class SiPixelConfigWriter{
+#include <xercesc/util/XMLString.hpp>
 
- public:
-	///Creator
-	SiPixelConfigWriter();
-	///Destructor
-	~SiPixelConfigWriter();
-	///Write XML file
-        bool init();
-        void write(std::string& fname);
-        void createLayout(std::string& name);
-        void createRow();
-        void createColumn(std::string& element, std::string& name);
-        
- protected:	 
-	 
-	 
-	 
- private:
-	 
-	xercesc::DOMElement* theTopElement;
-	xercesc::DOMElement* theLastLayout;
-	xercesc::DOMElement* theLastRow;
-	xercesc::DOMDocument* theDoc ;
-        xercesc::DOMLSSerializer* theDomWriter;
-	xercesc::DOMLSOutput* theOutput;
+#include <iostream>
+#include <map>
+#include <string>
+#include <vector>
+
+class SiPixelConfigWriter {
+public:
+  /// Creator
+  SiPixelConfigWriter();
+  /// Destructor
+  ~SiPixelConfigWriter();
+  /// Write XML file
+  bool init();
+  void write(std::string &fname);
+  void createLayout(std::string &name);
+  void createRow();
+  void createColumn(std::string &element, std::string &name);
+
+protected:
+private:
+  xercesc::DOMElement *theTopElement;
+  xercesc::DOMElement *theLastLayout;
+  xercesc::DOMElement *theLastRow;
+  xercesc::DOMDocument *theDoc;
+  xercesc::DOMLSSerializer *theDomWriter;
+  xercesc::DOMLSOutput *theOutput;
 };
 
-
 #endif
diff --git a/DQM/SiPixelMonitorClient/interface/SiPixelContinuousPalette.h b/DQM/SiPixelMonitorClient/interface/SiPixelContinuousPalette.h
index ef8bd72e48f9e..aef15f9f31fa6 100644
--- a/DQM/SiPixelMonitorClient/interface/SiPixelContinuousPalette.h
+++ b/DQM/SiPixelMonitorClient/interface/SiPixelContinuousPalette.h
@@ -1,50 +1,37 @@
 #ifndef _SIPIXELCONTINUOUSPALETTE_
 #define _SIPIXELCONTINUOUSPALETTE_
 
-/** \class SiPixelContinuousPalette 
+/** \class SiPixelContinuousPalette
  * *
  *  Class that handles the SiPixel color codes
- * 
+ *
  *  \author Dario Menasce
  *
- *  This namespace defines a color space to produce 
- *  a smooth color palette. The index of the r,g and b 
+ *  This namespace defines a color space to produce
+ *  a smooth color palette. The index of the r,g and b
  *  vectors is a normalized integer [0-99].
-  */
+ */
+
+namespace SiPixelContinuousPalette {
+  constexpr int r[] = {255, 134, 122, 110, 98,  86,  74,  63,  51,  39,  27,  15,  3,   0,   0,   0,   0,
+                       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+                       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+                       0,   0,   0,   0,   10,  22,  34,  46,  57,  69,  81,  93,  105, 117, 129, 141, 153,
+                       165, 176, 188, 200, 212, 224, 236, 248, 250, 255, 255, 255, 255, 255, 255, 255, 255,
+                       255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255};
 
-namespace SiPixelContinuousPalette 
-{
-  constexpr int r[] = {255 ,134 ,122 ,110 , 98 , 86 , 74 , 63 , 51 , 39 ,
-             	     27 , 15 ,  3 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,
-             	      0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,
-             	      0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,
-		      0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,
-             	      0 ,  0 ,  0 ,  0 ,  0 , 10 , 22 , 34 , 46 , 57 ,
-             	     69 , 81 , 93 ,105 ,117 ,129 ,141 ,153 ,165 ,176 ,
-             	    188 ,200 ,212 ,224 ,236 ,248 ,250 ,255 ,255 ,255 ,
-             	    255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,
-             	    255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 } ;
-	
-  constexpr int g[] = {  255 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,
-             	      0 ,  0 ,  0 ,  0 , 20 , 32 , 44 , 56 , 68 , 80 ,
-             	     91 ,103 ,115 ,127 ,139 ,151 ,163 ,175 ,187 ,199 ,
-		    210 ,222 ,234 ,246 ,255 ,255 ,255 ,255 ,255 ,255 ,
-             	    255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,
-             	    255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,
-		    255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,
-		    255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,238 ,226 ,
-		    214 ,202 ,190 ,178 ,166 ,154 ,142 ,131 ,119 ,107 , 
-		     95 , 83 , 71 , 59 , 47 , 35 , 23 , 12 ,  0 ,  0 } ;
-  constexpr int b[] = {255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,
-             	    255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,
-		    255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,255 ,
-		    255 ,255 ,255 ,255 ,253 ,251 ,239 ,227 ,216 ,204 ,
-		    192 ,180 ,168 ,156 ,144 ,132 ,120 ,108 , 97 , 85 ,
-		     73 , 61 , 49 , 37 , 25 , 13 ,  6 ,  0 ,  0 ,  0 ,
-		      0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,
-		      0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,
-		      0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,
-		      0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 ,  0 } ; 
-}
+  constexpr int g[] = {255, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   20,  32,  44,
+                       56,  68,  80,  91,  103, 115, 127, 139, 151, 163, 175, 187, 199, 210, 222, 234, 246,
+                       255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+                       255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+                       255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 238, 226, 214, 202, 190, 178, 166,
+                       154, 142, 131, 119, 107, 95,  83,  71,  59,  47,  35,  23,  12,  0,   0};
+  constexpr int b[] = {255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+                       255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
+                       253, 251, 239, 227, 216, 204, 192, 180, 168, 156, 144, 132, 120, 108, 97,  85,  73,
+                       61,  49,  37,  25,  13,  6,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+                       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,
+                       0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0};
+}  // namespace SiPixelContinuousPalette
 
 #endif
diff --git a/DQM/SiPixelMonitorClient/interface/SiPixelDaqInfo.h b/DQM/SiPixelMonitorClient/interface/SiPixelDaqInfo.h
index 2b6d745b6bb1c..fe7ae53975090 100644
--- a/DQM/SiPixelMonitorClient/interface/SiPixelDaqInfo.h
+++ b/DQM/SiPixelMonitorClient/interface/SiPixelDaqInfo.h
@@ -2,23 +2,23 @@
 #define DQM_SiPixelMonitorClient_SiPixelDaqInfo_H
 
 // system include files
-#include <memory>
-#include <iostream>
 #include <fstream>
+#include <iostream>
+#include <memory>
 
 // FWCore
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/LuminosityBlock.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/LuminosityBlock.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
@@ -26,22 +26,24 @@
 
 class SiPixelDaqInfo : public DQMEDHarvester {
 public:
-  explicit SiPixelDaqInfo(const edm::ParameterSet&);
+  explicit SiPixelDaqInfo(const edm::ParameterSet &);
   ~SiPixelDaqInfo() override;
-  
 
 private:
-  void dqmEndLuminosityBlock(DQMStore::IBooker&, DQMStore::IGetter&, const edm::LuminosityBlock& , const  edm::EventSetup&) override;
-  void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override ;
-  
-  MonitorElement*  Fraction_;
-  MonitorElement*  FractionBarrel_;
-  MonitorElement*  FractionEndcap_;
+  void dqmEndLuminosityBlock(DQMStore::IBooker &,
+                             DQMStore::IGetter &,
+                             const edm::LuminosityBlock &,
+                             const edm::EventSetup &) override;
+  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
+
+  MonitorElement *Fraction_;
+  MonitorElement *FractionBarrel_;
+  MonitorElement *FractionEndcap_;
+
+  std::pair<int, int> FEDRange_;
 
-  std::pair<int,int> FEDRange_;
+  int NumberOfFeds_;
 
-  int  NumberOfFeds_;
-  
   int NEvents_;
   int nFEDsBarrel_;
   int nFEDsEndcap_;
@@ -50,7 +52,7 @@ class SiPixelDaqInfo : public DQMEDHarvester {
 
   bool firstLumi;
 
-  //define Token(-s)
+  // define Token(-s)
   edm::EDGetTokenT<FEDRawDataCollection> daqSourceToken_;
 };
 
diff --git a/DQM/SiPixelMonitorClient/interface/SiPixelDataQuality.h b/DQM/SiPixelMonitorClient/interface/SiPixelDataQuality.h
index 5438cded8d89d..f5fde4bd0b381 100644
--- a/DQM/SiPixelMonitorClient/interface/SiPixelDataQuality.h
+++ b/DQM/SiPixelMonitorClient/interface/SiPixelDataQuality.h
@@ -1,156 +1,143 @@
 #ifndef _SiPixelDataQuality_h_
 #define _SiPixelDataQuality_h_
 
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQM/SiPixelMonitorClient/interface/SiPixelActionExecutor.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelConfigParser.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelConfigWriter.h"
-#include "DQM/SiPixelMonitorClient/interface/SiPixelActionExecutor.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelLayoutParser.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 
-
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
-#include "DataFormats/Common/interface/DetSetVector.h"
 #include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
 #include "CondFormats/SiPixelObjects/interface/DetectorIndex.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h"
+#include "DataFormats/Common/interface/DetSetVector.h"
+#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
 
 #include "TCanvas.h"
-#include "TPaveText.h"
 #include "TF1.h"
-#include "TH2F.h"
 #include "TGaxis.h"
+#include "TH2F.h"
+#include "TPaveText.h"
 
+#include <boost/cstdint.hpp>
 #include <fstream>
-#include <sstream>
 #include <map>
-#include <vector>
+#include <sstream>
 #include <string>
-#include <map>
-#include <boost/cstdint.hpp>
+#include <vector>
 
 class SiPixelEDAClient;
 class SiPixelDataQuality {
-
- public:
-
-  SiPixelDataQuality(  bool                                      offlineXMLfile);
- ~SiPixelDataQuality();
-
-  int getDetId(                 MonitorElement                          * mE) ;				
-
-  void bookGlobalQualityFlag    (DQMStore::IBooker                      & iBooker,
-				 bool                                     Tier0Flag,
-				 int                                      nFEDs);
-
-  void computeGlobalQualityFlag (DQMStore::IBooker                      & iBooker,
-				 DQMStore::IGetter                      & iGetter, 
-                                 bool                                     init,
-				 int                                      nFEDs,
-				 bool                                     Tier0Flag);
-  
-  void computeGlobalQualityFlagByLumi (DQMStore::IGetter                & iGetter,
-                                       bool                               init,
-				       int                                nFEDs,
-				       bool                               Tier0Flag,
-				       int                                nEvents_lastLS_,
-				       int                                nErrorsBarrel_lastLS_,
-				       int                                nErrorsEndcap_lastLS_);
-  
-  void fillGlobalQualityPlot    (DQMStore::IBooker                      & iBooker,
-				 DQMStore::IGetter                      & iGetter,
-                                 bool                                     init,
-				 edm::ESHandle<SiPixelFedCablingMap>      theCablingMap,
-				 int                                      nFEDs,
-				 bool                                     Tier0Flag,
-				 int                                      lumisec);
-  
- private:
-
-  bool  offlineXMLfile_;
-  
-  
-  TH2F * allmodsMap;
-  TH2F * errmodsMap;
-  TH2F * goodmodsMap;
-  TH1D * allmodsVec;
-  TH1D * errmodsVec;
-  TH1D * goodmodsVec;
+public:
+  SiPixelDataQuality(bool offlineXMLfile);
+  ~SiPixelDataQuality();
+
+  int getDetId(MonitorElement *mE);
+
+  void bookGlobalQualityFlag(DQMStore::IBooker &iBooker, bool Tier0Flag, int nFEDs);
+
+  void computeGlobalQualityFlag(
+      DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter, bool init, int nFEDs, bool Tier0Flag);
+
+  void computeGlobalQualityFlagByLumi(DQMStore::IGetter &iGetter,
+                                      bool init,
+                                      int nFEDs,
+                                      bool Tier0Flag,
+                                      int nEvents_lastLS_,
+                                      int nErrorsBarrel_lastLS_,
+                                      int nErrorsEndcap_lastLS_);
+
+  void fillGlobalQualityPlot(DQMStore::IBooker &iBooker,
+                             DQMStore::IGetter &iGetter,
+                             bool init,
+                             edm::ESHandle<SiPixelFedCablingMap> theCablingMap,
+                             int nFEDs,
+                             bool Tier0Flag,
+                             int lumisec);
+
+private:
+  bool offlineXMLfile_;
+
+  TH2F *allmodsMap;
+  TH2F *errmodsMap;
+  TH2F *goodmodsMap;
+  TH1D *allmodsVec;
+  TH1D *errmodsVec;
+  TH1D *goodmodsVec;
   int count;
   int errcount;
   bool gotDigis;
-  
+
   int objectCount_;
   bool DONE_;
-  
-  
-  std::ofstream myfile_;  
+
+  std::ofstream myfile_;
   int nevents_;
   bool endOfModules_;
   edm::ESHandle<SiPixelFedCablingMap> theCablingMap;
-  
+
   // Final combined Data Quality Flags:
-  MonitorElement * SummaryReportMap;
-  MonitorElement * SummaryPixel;
-  MonitorElement * SummaryBarrel;
-  MonitorElement * SummaryEndcap;
-  MonitorElement * ClusterModAll;
-  MonitorElement * ClusterMod1;
-  MonitorElement * ClusterMod2;
-  MonitorElement * ClusterMod3;
-  MonitorElement * ClusterMod4;
+  MonitorElement *SummaryReportMap;
+  MonitorElement *SummaryPixel;
+  MonitorElement *SummaryBarrel;
+  MonitorElement *SummaryEndcap;
+  MonitorElement *ClusterModAll;
+  MonitorElement *ClusterMod1;
+  MonitorElement *ClusterMod2;
+  MonitorElement *ClusterMod3;
+  MonitorElement *ClusterMod4;
 
   float qflag_;
   int allMods_, errorMods_, barrelMods_, endcapMods_;
- 
+
   // FEDErrors Cuts:
-  MonitorElement * FEDErrReportMap;
-  MonitorElement * NErrorsBarrel;
-  MonitorElement * NErrorsEndcap;
-  MonitorElement * NErrorsFEDs;
+  MonitorElement *FEDErrReportMap;
+  MonitorElement *NErrorsBarrel;
+  MonitorElement *NErrorsEndcap;
+  MonitorElement *NErrorsFEDs;
   int n_errors_barrel_, n_errors_endcap_, n_errors_pixel_;
   float barrel_error_flag_, endcap_error_flag_, pixel_error_flag_;
-  
+
   bool digiStatsBarrel, clusterStatsBarrel, trackStatsBarrel;
   int digiCounterBarrel, clusterCounterBarrel, trackCounterBarrel;
   bool digiStatsEndcap, clusterStatsEndcap, trackStatsEndcap;
   int digiCounterEndcap, clusterCounterEndcap, trackCounterEndcap;
 
   // Digis Cuts:
-  MonitorElement * NDigisBarrel;
-  MonitorElement * NDigisEndcap;
-  MonitorElement * DigiChargeBarrel;
-  MonitorElement * DigiChargeEndcap;
-  
+  MonitorElement *NDigisBarrel;
+  MonitorElement *NDigisEndcap;
+  MonitorElement *DigiChargeBarrel;
+  MonitorElement *DigiChargeEndcap;
+
   // Cluster Cuts:
-  MonitorElement * ClusterSizeBarrel;
-  MonitorElement * ClusterSizeEndcap;
-  MonitorElement * ClusterChargeBarrel;
-  MonitorElement * ClusterChargeEndcap;
-  MonitorElement * NClustersBarrel;
-  MonitorElement * NClustersEndcap;
-  
+  MonitorElement *ClusterSizeBarrel;
+  MonitorElement *ClusterSizeEndcap;
+  MonitorElement *ClusterChargeBarrel;
+  MonitorElement *ClusterChargeEndcap;
+  MonitorElement *NClustersBarrel;
+  MonitorElement *NClustersEndcap;
+
   // Track Cuts:
-  MonitorElement * NPixelTracks;
-    
+  MonitorElement *NPixelTracks;
+
   int count1;
   int count2;
   int count3;
   int count4;
   int count5;
   int count6;
-  
+
   int timeoutCounter_;
   int modCounter_;
   int lastLS_;
   float lasterrmods_[40];
   float lastallmods_[40];
-
 };
 #endif
diff --git a/DQM/SiPixelMonitorClient/interface/SiPixelDcsInfo.h b/DQM/SiPixelMonitorClient/interface/SiPixelDcsInfo.h
index 67bf34b9a0662..4644a95ac022b 100644
--- a/DQM/SiPixelMonitorClient/interface/SiPixelDcsInfo.h
+++ b/DQM/SiPixelMonitorClient/interface/SiPixelDcsInfo.h
@@ -2,43 +2,43 @@
 #define DQM_SiPixelMonitorClient_SiPixelDcsInfo_H
 
 // system include files
-#include <memory>
-#include <iostream>
 #include <fstream>
+#include <iostream>
+#include <memory>
 
 // FWCore
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/LuminosityBlock.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
-//DQM
+// DQM
+#include "DQMServices/Core/interface/DQMEDHarvester.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDHarvester.h"
-
 
 class SiPixelDcsInfo : public DQMEDHarvester {
 public:
-  explicit SiPixelDcsInfo(const edm::ParameterSet&);
+  explicit SiPixelDcsInfo(const edm::ParameterSet &);
   ~SiPixelDcsInfo() override;
-  
 
 private:
-  void dqmEndLuminosityBlock(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter, const edm::LuminosityBlock& , const  edm::EventSetup&) override;
+  void dqmEndLuminosityBlock(DQMStore::IBooker &iBooker,
+                             DQMStore::IGetter &iGetter,
+                             const edm::LuminosityBlock &,
+                             const edm::EventSetup &) override;
   void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
-  
-  MonitorElement*  Fraction_;
-  MonitorElement*  FractionBarrel_;
-  MonitorElement*  FractionEndcap_;
+
+  MonitorElement *Fraction_;
+  MonitorElement *FractionBarrel_;
+  MonitorElement *FractionEndcap_;
 
   bool firstRun;
- 
 };
 
 #endif
diff --git a/DQM/SiPixelMonitorClient/interface/SiPixelEDAClient.h b/DQM/SiPixelMonitorClient/interface/SiPixelEDAClient.h
index 519a62bd296b8..2b7c01e00a060 100644
--- a/DQM/SiPixelMonitorClient/interface/SiPixelEDAClient.h
+++ b/DQM/SiPixelMonitorClient/interface/SiPixelEDAClient.h
@@ -1,59 +1,56 @@
 #ifndef SiPixelEDAClient_H
 #define SiPixelEDAClient_H
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "FWCore/Framework/interface/Run.h"
-#include "DQMServices/Core/interface/DQMStore.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-//Stuff for cabling map to allow end run computations
+// Stuff for cabling map to allow end run computations
 #include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
 
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
 
 class SiPixelWebInterface;
 class SiPixelInformationExtractor;
 class SiPixelDataQuality;
 class SiPixelActionExecutor;
- 
-class SiPixelEDAClient: public DQMEDHarvester{
 
+class SiPixelEDAClient : public DQMEDHarvester {
 public:
-
-  SiPixelEDAClient(const edm::ParameterSet& ps);
+  SiPixelEDAClient(const edm::ParameterSet &ps);
   ~SiPixelEDAClient() override;
 
 protected:
-
-  void beginRun(edm::Run const& run, 
-                edm::EventSetup const& eSetup) override;
-  void dqmEndLuminosityBlock(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter, edm::LuminosityBlock const& lumiSeg, 
-                          edm::EventSetup const& c) override;
-  void dqmEndJob(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter) override;
+  void beginRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
+  void dqmEndLuminosityBlock(DQMStore::IBooker &iBooker,
+                             DQMStore::IGetter &iGetter,
+                             edm::LuminosityBlock const &lumiSeg,
+                             edm::EventSetup const &c) override;
+  void dqmEndJob(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter) override;
 
 private:
-
   unsigned long long m_cacheID_;
   int nLumiSecs_;
   int nEvents_;
   int nEvents_lastLS_;
   int nErrorsBarrel_lastLS_;
   int nErrorsEndcap_lastLS_;
-  
-  SiPixelWebInterface* sipixelWebInterface_;
-  SiPixelInformationExtractor* sipixelInformationExtractor_;
-  SiPixelDataQuality* sipixelDataQuality_;
-  SiPixelActionExecutor* sipixelActionExecutor_;
+
+  SiPixelWebInterface *sipixelWebInterface_;
+  SiPixelInformationExtractor *sipixelInformationExtractor_;
+  SiPixelDataQuality *sipixelDataQuality_;
+  SiPixelActionExecutor *sipixelActionExecutor_;
 
   int tkMapFrequency_;
   int summaryFrequency_;
@@ -72,12 +69,11 @@ class SiPixelEDAClient: public DQMEDHarvester{
   bool doHitEfficiency_;
   bool isUpgrade_;
   std::string inputSource_;
-  
+
   std::ostringstream html_out_;
-  
+
   edm::EDGetTokenT<FEDRawDataCollection> inputSourceToken_;
   edm::ESHandle<SiPixelFedCablingMap> theCablingMap;
 };
 
-
 #endif
diff --git a/DQM/SiPixelMonitorClient/interface/SiPixelInformationExtractor.h b/DQM/SiPixelMonitorClient/interface/SiPixelInformationExtractor.h
index 99cc0706f9139..52101cf349c12 100644
--- a/DQM/SiPixelMonitorClient/interface/SiPixelInformationExtractor.h
+++ b/DQM/SiPixelMonitorClient/interface/SiPixelInformationExtractor.h
@@ -3,134 +3,110 @@
 
 #include "DQMServices/Core/interface/MonitorElement.h"
 
+#include "DQM/SiPixelMonitorClient/interface/SiPixelActionExecutor.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelConfigParser.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelConfigWriter.h"
-#include "DQM/SiPixelMonitorClient/interface/SiPixelActionExecutor.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelLayoutParser.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
-#include "DataFormats/Common/interface/DetSetVector.h"
 #include "CondFormats/DataRecord/interface/SiPixelFedCablingMapRcd.h"
 #include "CondFormats/SiPixelObjects/interface/DetectorIndex.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFedCablingMap.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h"
+#include "DataFormats/Common/interface/DetSetVector.h"
+#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
 
 #include "TCanvas.h"
-#include "TPaveText.h"
 #include "TF1.h"
-#include "TH2F.h"
 #include "TGaxis.h"
+#include "TH2F.h"
+#include "TPaveText.h"
 
+#include <boost/cstdint.hpp>
 #include <fstream>
-#include <sstream>
 #include <map>
-#include <vector>
+#include <sstream>
 #include <string>
-#include <map>
-#include <boost/cstdint.hpp>
+#include <vector>
 
 class SiPixelEDAClient;
 class SiPixelWebInterface;
 class SiPixelInformationExtractor {
+public:
+  SiPixelInformationExtractor(bool offlineXMLfile);
+  ~SiPixelInformationExtractor();
+
+  void computeStatus(MonitorElement *mE, double &colorValue, std::pair<double, double> &norm);
+  void getNormalization(MonitorElement *mE, std::pair<double, double> &norm, std::string theMEType);
+  void getNormalization2D(MonitorElement *mE,
+                          std::pair<double, double> &normX,
+                          std::pair<double, double> &normY,
+                          std::string theMEType);
+  int getDetId(MonitorElement *mE);
+  std::string getMEType(MonitorElement *mE);
 
- public:
-
-  SiPixelInformationExtractor(  bool                                      offlineXMLfile);
- ~SiPixelInformationExtractor();
-
-  void computeStatus(           MonitorElement                          * mE,
-                                double                                  & colorValue,
-				std::pair<double,double>                & norm) ;
-  void getNormalization(        MonitorElement                          * mE,
-                                std::pair<double,double>                & norm,
-				std::string                               theMEType) ;
-  void getNormalization2D(      MonitorElement                          * mE,
-                                std::pair<double,double>                & normX,
-                                std::pair<double,double>                & normY,
-				std::string                               theMEType) ;
-  int getDetId(                 MonitorElement                          * mE) ;				
-  std::string getMEType(        MonitorElement                          * mE) ;
-    
   void readConfiguration();
-  bool readConfiguration(        std::map<std::string,std::vector< std::string> >   & layoutMap,
-				 std::map<std::string,std::map<std::string,std::string> >                & qtestsMap,
-				 std::map<std::string,std::vector<std::string> >    & meQTestsMap);
-
-  void bookNoisyPixels(          DQMStore::IBooker                      & iBooker,
-                                 float                                    noiseRate,
-				 bool                                     Tier0Flag);
-
-  void findNoisyPixels (         DQMStore::IBooker                      & iBooker,
-				 DQMStore::IGetter                      & iGetter,
-                                 bool                                     init,
-				 float                                    noiseRate,
-				 int                                      noiseRateDenominator,
-                                 edm::ESHandle<SiPixelFedCablingMap>      theCablingMap);
-  
- private:
-
-  void getItemList(             const std::multimap<std::string, std::string> & req_map,
-                                std::string                               item_name, 
-				std::vector<std::string>                & items);
-  bool hasItem(                 std::multimap<std::string, std::string> & req_map,
-	                        std::string                               item_name);
-  std::string getItemValue(     const std::multimap<std::string, std::string> & req_map,
-	                        std::string                               item_name);
-  std::string getItemValue(     std::multimap<std::string, std::string> & req_map,
-	                        std::string                               item_name);
-  void createDummiesFromLayout();  
-  void selectImage(            std::string                              & name, 
-                               int                                        status);
-  void selectImage(            std::string                              & name, 
-                               std::vector<QReport*>                    & reports);
-  void selectColor(            std::string                              & col, 
-                               int                                        status);
-  void selectColor(            std::string                              & col, 
-                               std::vector<QReport*>                    & reports);
-  
-  int                                    alarmCounter_;
-
-  SiPixelConfigParser   	       * configParser_  ;
-  SiPixelConfigWriter   	       * configWriter_  ;
-  SiPixelActionExecutor 	       * actionExecutor_;
-  SiPixelLayoutParser                  * layoutParser_  ;
-
-  std::map<std::string, 
-           std::vector< std::string> >  layoutMap;
-  std::map<std::string, 
-           std::map<std::string, 
-                    std::string> >      qtestsMap;
-  std::map<std::string, 
-           std::vector<std::string> >   meQTestsMap;
-
-  
-  bool  readReference_;
-  bool  readQTestMap_;
-  bool  readMeMap_;
-  bool  flagHotModule_;
-  bool  offlineXMLfile_;
-  
+  bool readConfiguration(std::map<std::string, std::vector<std::string>> &layoutMap,
+                         std::map<std::string, std::map<std::string, std::string>> &qtestsMap,
+                         std::map<std::string, std::vector<std::string>> &meQTestsMap);
+
+  void bookNoisyPixels(DQMStore::IBooker &iBooker, float noiseRate, bool Tier0Flag);
+
+  void findNoisyPixels(DQMStore::IBooker &iBooker,
+                       DQMStore::IGetter &iGetter,
+                       bool init,
+                       float noiseRate,
+                       int noiseRateDenominator,
+                       edm::ESHandle<SiPixelFedCablingMap> theCablingMap);
+
+private:
+  void getItemList(const std::multimap<std::string, std::string> &req_map,
+                   std::string item_name,
+                   std::vector<std::string> &items);
+  bool hasItem(std::multimap<std::string, std::string> &req_map, std::string item_name);
+  std::string getItemValue(const std::multimap<std::string, std::string> &req_map, std::string item_name);
+  std::string getItemValue(std::multimap<std::string, std::string> &req_map, std::string item_name);
+  void createDummiesFromLayout();
+  void selectImage(std::string &name, int status);
+  void selectImage(std::string &name, std::vector<QReport *> &reports);
+  void selectColor(std::string &col, int status);
+  void selectColor(std::string &col, std::vector<QReport *> &reports);
+
+  int alarmCounter_;
+
+  SiPixelConfigParser *configParser_;
+  SiPixelConfigWriter *configWriter_;
+  SiPixelActionExecutor *actionExecutor_;
+  SiPixelLayoutParser *layoutParser_;
+
+  std::map<std::string, std::vector<std::string>> layoutMap;
+  std::map<std::string, std::map<std::string, std::string>> qtestsMap;
+  std::map<std::string, std::vector<std::string>> meQTestsMap;
+
+  bool readReference_;
+  bool readQTestMap_;
+  bool readMeMap_;
+  bool flagHotModule_;
+  bool offlineXMLfile_;
+
   int count;
   int errcount;
   bool gotDigis;
-  
-  std::ofstream myfile_;  
+
+  std::ofstream myfile_;
   int nevents_;
-  std::map< uint32_t , std::vector< std::pair< std::pair<int,int> , float > > >  noisyDetIds_;
+  std::map<uint32_t, std::vector<std::pair<std::pair<int, int>, float>>> noisyDetIds_;
   bool endOfModules_;
 
-  MonitorElement * EventRateBarrelPixels;
-  MonitorElement * EventRateEndcapPixels;
-  
-  MonitorElement * EndcapNdigisFREQProjection;
-  MonitorElement * BarrelNdigisFREQProjection;
-  
-  
+  MonitorElement *EventRateBarrelPixels;
+  MonitorElement *EventRateEndcapPixels;
+
+  MonitorElement *EndcapNdigisFREQProjection;
+  MonitorElement *BarrelNdigisFREQProjection;
 };
 #endif
diff --git a/DQM/SiPixelMonitorClient/interface/SiPixelLayoutParser.h b/DQM/SiPixelMonitorClient/interface/SiPixelLayoutParser.h
index b8b7fd7c6a80d..5a0b2d9426cf0 100644
--- a/DQM/SiPixelMonitorClient/interface/SiPixelLayoutParser.h
+++ b/DQM/SiPixelMonitorClient/interface/SiPixelLayoutParser.h
@@ -4,33 +4,28 @@
 /** \class SiPixelLayoutParser
  * *
  *  Class that handles the SiPixel Quality Tests
- * 
+ *
  *  \author Suchandra Dutta
-  */
+ */
 
 #include "DQMServices/ClientConfig/interface/DQMParserBase.h"
-#include <vector>
 #include <fstream>
-#include <string>
 #include <map>
-
+#include <string>
+#include <vector>
 
 class SiPixelLayoutParser : public DQMParserBase {
-
- public:
-  
-
+public:
   // Constructor
   SiPixelLayoutParser();
-  
+
   // Destructor
   ~SiPixelLayoutParser() override;
 
   // Get list of Layouts for ME groups
-  bool getAllLayouts(std::map< std::string, std::vector<std::string> >& me_names);
+  bool getAllLayouts(std::map<std::string, std::vector<std::string>> &me_names);
 
- private:
-  
+private:
 };
 
 #endif
diff --git a/DQM/SiPixelMonitorClient/interface/SiPixelUtility.h b/DQM/SiPixelMonitorClient/interface/SiPixelUtility.h
index 61786e81a9d0d..64a4e12e85eda 100644
--- a/DQM/SiPixelMonitorClient/interface/SiPixelUtility.h
+++ b/DQM/SiPixelMonitorClient/interface/SiPixelUtility.h
@@ -4,43 +4,39 @@
 /** \class SiPixelUtility
  * *
  *  Class that handles the SiPixel Quality Tests
- * 
+ *
  *  \author Petra Merkel
-  */
+ */
 
-#include <vector>
-#include <fstream>
-#include <string>
-#include <map>
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "TH1.h"
 #include "TPaveText.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMStore.h"
+#include <fstream>
+#include <map>
+#include <string>
+#include <vector>
+
+class SiPixelUtility {
+public:
+  static int getMEList(std::string name, std::vector<std::string> &values);
+  static bool checkME(std::string element, std::string name, std::string &full_path);
+  static int getMEList(std::string name, std::string &dir_path, std::vector<std::string> &me_names);
 
-class SiPixelUtility
-{
- public:
- 
- static int getMEList(std::string name, std::vector<std::string>& values);
- static bool checkME(std::string element, std::string name, std::string& full_path);
- static int getMEList(std::string name, std::string& dir_path, std::vector<std::string>& me_names);
+  static void split(const std::string &str, std::vector<std::string> &tokens, const std::string &delimiters = " ");
+  static void getStatusColor(int status, int &rval, int &gval, int &bval);
+  static void getStatusColor(int status, int &icol, std::string &tag);
+  static void getStatusColor(double status, int &rval, int &gval, int &bval);
+  static int getStatus(MonitorElement *me);
 
- static void split(const std::string& str, std::vector<std::string>& tokens, 
-                   const std::string& delimiters=" ");
- static void getStatusColor(int    status, int& rval, int&gval, int& bval);
- static void getStatusColor(int    status, int& icol, std::string& tag);
- static void getStatusColor(double status, int& rval, int&gval, int& bval);
- static int  getStatus(MonitorElement* me);
- 
- static int computeHistoBin(std::string& module_path);
- static int computeErrorCode(DQMStore * bei, std::string& module_path);
- static int computeErrorCode(int status);
- static void fillPaveText(TPaveText* pave, const std::map<std::string,std::pair<int,double> >& messages); 
- static void createStatusLegendMessages(std::map<std::string,std::pair<int,double> >& messages);
- static std::map<std::string,std::string> sourceCodeMap();
- static void setDrawingOption(TH1* hist,float xlow=-1.,float xhigh=-1.);
- static std::vector<std::string> getQTestNameList(MonitorElement* me);
- 
+  static int computeHistoBin(std::string &module_path);
+  static int computeErrorCode(DQMStore *bei, std::string &module_path);
+  static int computeErrorCode(int status);
+  static void fillPaveText(TPaveText *pave, const std::map<std::string, std::pair<int, double>> &messages);
+  static void createStatusLegendMessages(std::map<std::string, std::pair<int, double>> &messages);
+  static std::map<std::string, std::string> sourceCodeMap();
+  static void setDrawingOption(TH1 *hist, float xlow = -1., float xhigh = -1.);
+  static std::vector<std::string> getQTestNameList(MonitorElement *me);
 };
 
 #endif
diff --git a/DQM/SiPixelMonitorClient/src/SealModules.cc b/DQM/SiPixelMonitorClient/src/SealModules.cc
index 95926c95e7b2c..14eb751f4cd40 100644
--- a/DQM/SiPixelMonitorClient/src/SealModules.cc
+++ b/DQM/SiPixelMonitorClient/src/SealModules.cc
@@ -1,10 +1,9 @@
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/ModuleFactory.h"
-#include "DQM/SiPixelMonitorClient/interface/SiPixelEDAClient.h"
+#include "DQM/SiPixelMonitorClient/interface/SiPixelCertification.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelDaqInfo.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelDcsInfo.h"
-#include "DQM/SiPixelMonitorClient/interface/SiPixelCertification.h"
-
+#include "DQM/SiPixelMonitorClient/interface/SiPixelEDAClient.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/ModuleFactory.h"
 
 DEFINE_FWK_MODULE(SiPixelEDAClient);
 DEFINE_FWK_MODULE(SiPixelDaqInfo);
diff --git a/DQM/SiPixelMonitorClient/src/SiPixelActionExecutor.cc b/DQM/SiPixelMonitorClient/src/SiPixelActionExecutor.cc
index 34747395f63d2..28e4165c34614 100644
--- a/DQM/SiPixelMonitorClient/src/SiPixelActionExecutor.cc
+++ b/DQM/SiPixelMonitorClient/src/SiPixelActionExecutor.cc
@@ -1,21 +1,21 @@
 //#define printing false
 //#define occupancyprinting false
 
+#include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h"
+#include "DQM/SiPixelMonitorClient/interface/ANSIColors.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelActionExecutor.h"
-#include "DQM/SiPixelMonitorClient/interface/SiPixelUtility.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelInformationExtractor.h"
-#include "DQM/SiPixelMonitorClient/interface/ANSIColors.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/ParameterSet/interface/FileInPath.h"
+#include "DQM/SiPixelMonitorClient/interface/SiPixelUtility.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/FileInPath.h"
 
 #include <cmath>
 
@@ -24,27 +24,27 @@ using namespace std;
 //=============================================================================================================
 //
 // -- Constructor
-// 
-SiPixelActionExecutor::SiPixelActionExecutor(bool offlineXMLfile, 
-                                             bool Tier0Flag) : 
-  offlineXMLfile_(offlineXMLfile), 
-  Tier0Flag_(Tier0Flag) {
-  edm::LogInfo("SiPixelActionExecutor") << 
-    " Creating SiPixelActionExecutor " << "\n" ;
+//
+SiPixelActionExecutor::SiPixelActionExecutor(bool offlineXMLfile, bool Tier0Flag)
+    : offlineXMLfile_(offlineXMLfile), Tier0Flag_(Tier0Flag) {
+  edm::LogInfo("SiPixelActionExecutor") << " Creating SiPixelActionExecutor "
+                                        << "\n";
   configParser_ = nullptr;
   configWriter_ = nullptr;
   ndet_ = 0;
-  //collationDone = false;
+  // collationDone = false;
 }
 //=============================================================================================================
 //
 // --  Destructor
-// 
+//
 SiPixelActionExecutor::~SiPixelActionExecutor() {
-  edm::LogInfo("SiPixelActionExecutor") << 
-    " Deleting SiPixelActionExecutor " << "\n" ;
-  if (configParser_) delete configParser_;
-  if (configWriter_) delete configWriter_;  
+  edm::LogInfo("SiPixelActionExecutor") << " Deleting SiPixelActionExecutor "
+                                        << "\n";
+  if (configParser_)
+    delete configParser_;
+  if (configWriter_)
+    delete configWriter_;
 }
 //=============================================================================================================
 //
@@ -52,8 +52,10 @@ SiPixelActionExecutor::~SiPixelActionExecutor() {
 //
 void SiPixelActionExecutor::readConfiguration() {
   string localPath;
-  if(offlineXMLfile_) localPath = string("DQM/SiPixelMonitorClient/test/sipixel_tier0_config.xml");
-  else localPath = string("DQM/SiPixelMonitorClient/test/sipixel_monitorelement_config.xml");
+  if (offlineXMLfile_)
+    localPath = string("DQM/SiPixelMonitorClient/test/sipixel_tier0_config.xml");
+  else
+    localPath = string("DQM/SiPixelMonitorClient/test/sipixel_monitorelement_config.xml");
   if (configParser_ == nullptr) {
     configParser_ = new SiPixelConfigParser();
     configParser_->getDocument(edm::FileInPath(localPath).fullPath());
@@ -63,128 +65,153 @@ void SiPixelActionExecutor::readConfiguration() {
 //
 // -- Read Configuration File
 //
-bool SiPixelActionExecutor::readConfiguration(int& tkmap_freq, 
-                                              int& sum_barrel_freq, 
-                                              int& sum_endcap_freq, 
-					      int& sum_grandbarrel_freq, 
-					      int& sum_grandendcap_freq, 
-					      int& message_limit_,
-					      int& source_type_,
-					      int& calib_type_) {
-  //printing cout<<"Entering SiPixelActionExecutor::readConfiguration..."<<endl;
+bool SiPixelActionExecutor::readConfiguration(int &tkmap_freq,
+                                              int &sum_barrel_freq,
+                                              int &sum_endcap_freq,
+                                              int &sum_grandbarrel_freq,
+                                              int &sum_grandendcap_freq,
+                                              int &message_limit_,
+                                              int &source_type_,
+                                              int &calib_type_) {
+  // printing cout<<"Entering
+  // SiPixelActionExecutor::readConfiguration..."<<endl;
   string localPath;
-  if(offlineXMLfile_) localPath = string("DQM/SiPixelMonitorClient/test/sipixel_tier0_config.xml");
-  else localPath = string("DQM/SiPixelMonitorClient/test/sipixel_monitorelement_config.xml");
+  if (offlineXMLfile_)
+    localPath = string("DQM/SiPixelMonitorClient/test/sipixel_tier0_config.xml");
+  else
+    localPath = string("DQM/SiPixelMonitorClient/test/sipixel_monitorelement_config.xml");
   if (configParser_ == nullptr) {
     configParser_ = new SiPixelConfigParser();
     configParser_->getDocument(edm::FileInPath(localPath).fullPath());
   }
-	
-  if (!configParser_->getFrequencyForTrackerMap(tkmap_freq)){
-    cout << "SiPixelActionExecutor::readConfiguration: Failed to read TrackerMap configuration parameters!! ";
+
+  if (!configParser_->getFrequencyForTrackerMap(tkmap_freq)) {
+    cout << "SiPixelActionExecutor::readConfiguration: Failed to read "
+            "TrackerMap configuration parameters!! ";
     return false;
   }
-  if (!configParser_->getFrequencyForBarrelSummary(sum_barrel_freq)){
-    edm::LogInfo("SiPixelActionExecutor") << "Failed to read Barrel Summary configuration parameters!! " << "\n" ;
+  if (!configParser_->getFrequencyForBarrelSummary(sum_barrel_freq)) {
+    edm::LogInfo("SiPixelActionExecutor") << "Failed to read Barrel Summary configuration parameters!! "
+                                          << "\n";
     return false;
   }
-  if (!configParser_->getFrequencyForEndcapSummary(sum_endcap_freq)){
-    edm::LogInfo("SiPixelActionExecutor")  << "Failed to read Endcap Summary configuration parameters!! " << "\n" ;
+  if (!configParser_->getFrequencyForEndcapSummary(sum_endcap_freq)) {
+    edm::LogInfo("SiPixelActionExecutor") << "Failed to read Endcap Summary configuration parameters!! "
+                                          << "\n";
     return false;
   }
-  if (!configParser_->getFrequencyForGrandBarrelSummary(sum_grandbarrel_freq)){
-    edm::LogInfo("SiPixelActionExecutor") << "Failed to read Grand Barrel Summary configuration parameters!! " << "\n" ;
+  if (!configParser_->getFrequencyForGrandBarrelSummary(sum_grandbarrel_freq)) {
+    edm::LogInfo("SiPixelActionExecutor") << "Failed to read Grand Barrel Summary configuration parameters!! "
+                                          << "\n";
     return false;
   }
-  if (!configParser_->getFrequencyForGrandEndcapSummary(sum_grandendcap_freq)){
-    edm::LogInfo("SiPixelActionExecutor")  << "Failed to read Grand Endcap Summary configuration parameters!! " << "\n" ;
+  if (!configParser_->getFrequencyForGrandEndcapSummary(sum_grandendcap_freq)) {
+    edm::LogInfo("SiPixelActionExecutor") << "Failed to read Grand Endcap Summary configuration parameters!! "
+                                          << "\n";
     return false;
   }
-  if (!configParser_->getMessageLimitForQTests(message_limit_)){
-    edm::LogInfo("SiPixelActionExecutor")  << "Failed to read QTest Message Limit" << "\n" ;
+  if (!configParser_->getMessageLimitForQTests(message_limit_)) {
+    edm::LogInfo("SiPixelActionExecutor") << "Failed to read QTest Message Limit"
+                                          << "\n";
     return false;
   }
-  if (!configParser_->getSourceType(source_type_)){
-    edm::LogInfo("SiPixelActionExecutor")  << "Failed to read Source Type" << "\n" ;
+  if (!configParser_->getSourceType(source_type_)) {
+    edm::LogInfo("SiPixelActionExecutor") << "Failed to read Source Type"
+                                          << "\n";
     return false;
   }
-  if (!configParser_->getCalibType(calib_type_)){
-    edm::LogInfo("SiPixelActionExecutor")  << "Failed to read Calib Type" << "\n" ;
+  if (!configParser_->getCalibType(calib_type_)) {
+    edm::LogInfo("SiPixelActionExecutor") << "Failed to read Calib Type"
+                                          << "\n";
     return false;
   }
-  //printing cout<<"...leaving SiPixelActionExecutor::readConfiguration..."<<endl;
+  // printing cout<<"...leaving
+  // SiPixelActionExecutor::readConfiguration..."<<endl;
   return true;
 }
 //=============================================================================================================
-bool SiPixelActionExecutor::readConfiguration(int& tkmap_freq, int& summary_freq) {
-  //printing cout<<"Entering SiPixelActionExecutor::readConfiguration..."<<endl;
+bool SiPixelActionExecutor::readConfiguration(int &tkmap_freq, int &summary_freq) {
+  // printing cout<<"Entering
+  // SiPixelActionExecutor::readConfiguration..."<<endl;
   string localPath;
-  if(offlineXMLfile_) localPath = string("DQM/SiPixelMonitorClient/test/sipixel_tier0_config.xml");
-  else localPath = string("DQM/SiPixelMonitorClient/test/sipixel_monitorelement_config.xml");
+  if (offlineXMLfile_)
+    localPath = string("DQM/SiPixelMonitorClient/test/sipixel_tier0_config.xml");
+  else
+    localPath = string("DQM/SiPixelMonitorClient/test/sipixel_monitorelement_config.xml");
   if (configParser_ == nullptr) {
     configParser_ = new SiPixelConfigParser();
     configParser_->getDocument(edm::FileInPath(localPath).fullPath());
   }
-	
-  if (!configParser_->getFrequencyForTrackerMap(tkmap_freq)){
-    cout << "SiPixelActionExecutor::readConfiguration: Failed to read TrackerMap configuration parameters!! ";
+
+  if (!configParser_->getFrequencyForTrackerMap(tkmap_freq)) {
+    cout << "SiPixelActionExecutor::readConfiguration: Failed to read "
+            "TrackerMap configuration parameters!! ";
     return false;
   }
-  if (!configParser_->getFrequencyForBarrelSummary(summary_freq)){
-    edm::LogInfo("SiPixelActionExecutor") << "Failed to read Summary configuration parameters!! " << "\n" ;
+  if (!configParser_->getFrequencyForBarrelSummary(summary_freq)) {
+    edm::LogInfo("SiPixelActionExecutor") << "Failed to read Summary configuration parameters!! "
+                                          << "\n";
     return false;
   }
-  //printing cout<<"...leaving SiPixelActionExecutor::readConfiguration..."<<endl;
+  // printing cout<<"...leaving
+  // SiPixelActionExecutor::readConfiguration..."<<endl;
   return true;
 }
 
 //=============================================================================================================
-void SiPixelActionExecutor::createSummary(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter, bool isUpgrade) {
-  //To be majorly overhauled and split into two, I guess.
+void SiPixelActionExecutor::createSummary(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter, bool isUpgrade) {
+  // To be majorly overhauled and split into two, I guess.
 
-  //cout<<"entering SiPixelActionExecutor::createSummary..."<<endl;
+  // cout<<"entering SiPixelActionExecutor::createSummary..."<<endl;
   string barrel_structure_name;
   vector<string> barrel_me_names;
   string localPath;
-  if(offlineXMLfile_) localPath = string("DQM/SiPixelMonitorClient/test/sipixel_tier0_config.xml");
-  else localPath = string("DQM/SiPixelMonitorClient/test/sipixel_monitorelement_config.xml");
-//  cout<<"*********************ATTENTION! LOCALPATH= "<<localPath<<endl;
+  if (offlineXMLfile_)
+    localPath = string("DQM/SiPixelMonitorClient/test/sipixel_tier0_config.xml");
+  else
+    localPath = string("DQM/SiPixelMonitorClient/test/sipixel_monitorelement_config.xml");
+  //  cout<<"*********************ATTENTION! LOCALPATH= "<<localPath<<endl;
   if (configParser_ == nullptr) {
     configParser_ = new SiPixelConfigParser();
     configParser_->getDocument(edm::FileInPath(localPath).fullPath());
   }
-  if (!configParser_->getMENamesForBarrelSummary(barrel_structure_name, barrel_me_names)){
-    cout << "SiPixelActionExecutor::createSummary: Failed to read Barrel Summary configuration parameters!! ";
+  if (!configParser_->getMENamesForBarrelSummary(barrel_structure_name, barrel_me_names)) {
+    cout << "SiPixelActionExecutor::createSummary: Failed to read Barrel "
+            "Summary configuration parameters!! ";
     return;
   }
-  configParser_->getSourceType(source_type_); 
+  configParser_->getSourceType(source_type_);
 
   iBooker.setCurrentFolder("Pixel/");
   iGetter.setCurrentFolder("Pixel/");
-  fillSummary(iBooker, iGetter, barrel_structure_name, barrel_me_names, true, isUpgrade); // Barrel
+  fillSummary(iBooker, iGetter, barrel_structure_name, barrel_me_names, true,
+              isUpgrade);  // Barrel
   iBooker.setCurrentFolder("Pixel/");
   iGetter.setCurrentFolder("Pixel/");
   string endcap_structure_name;
   vector<string> endcap_me_names;
-  if (!configParser_->getMENamesForEndcapSummary(endcap_structure_name, endcap_me_names)){
-    edm::LogInfo("SiPixelActionExecutor")  << "Failed to read Endcap Summary configuration parameters!! " << "\n" ;
+  if (!configParser_->getMENamesForEndcapSummary(endcap_structure_name, endcap_me_names)) {
+    edm::LogInfo("SiPixelActionExecutor") << "Failed to read Endcap Summary configuration parameters!! "
+                                          << "\n";
     return;
   }
 
-//  cout << "--- Processing endcap" << endl;
+  //  cout << "--- Processing endcap" << endl;
 
   iBooker.setCurrentFolder("Pixel/");
   iGetter.setCurrentFolder("Pixel/");
 
-  fillSummary(iBooker,iGetter, endcap_structure_name, endcap_me_names, false, isUpgrade); // Endcap
+  fillSummary(iBooker, iGetter, endcap_structure_name, endcap_me_names, false,
+              isUpgrade);  // Endcap
   iBooker.setCurrentFolder("Pixel/");
   iGetter.setCurrentFolder("Pixel/");
 
-  if(source_type_==0||source_type_==5 || source_type_ == 20){//do this only if RawData source is present
+  if (source_type_ == 0 || source_type_ == 5 || source_type_ == 20) {  // do this only if RawData source is present
     string federror_structure_name;
     vector<string> federror_me_names;
-    if (!configParser_->getMENamesForFEDErrorSummary(federror_structure_name, federror_me_names)){
-      cout << "SiPixelActionExecutor::createSummary: Failed to read FED Error Summary configuration parameters!! ";
+    if (!configParser_->getMENamesForFEDErrorSummary(federror_structure_name, federror_me_names)) {
+      cout << "SiPixelActionExecutor::createSummary: Failed to read FED Error "
+              "Summary configuration parameters!! ";
       return;
     }
     iBooker.setCurrentFolder("Pixel/");
@@ -194,45 +221,67 @@ void SiPixelActionExecutor::createSummary(DQMStore::IBooker & iBooker, DQMStore:
     iBooker.setCurrentFolder("Pixel/");
     iGetter.setCurrentFolder("Pixel/");
   }
-  if (configWriter_) delete configWriter_;
+  if (configWriter_)
+    delete configWriter_;
   configWriter_ = nullptr;
-//  cout<<"leaving SiPixelActionExecutor::createSummary..."<<endl;
+  //  cout<<"leaving SiPixelActionExecutor::createSummary..."<<endl;
 }
 
 //=============================================================================================================
-void SiPixelActionExecutor::bookDeviations(DQMStore::IBooker & iBooker, bool isUpgrade) {
+void SiPixelActionExecutor::bookDeviations(DQMStore::IBooker &iBooker, bool isUpgrade) {
   int nBPixModules;
-  if (isUpgrade) {nBPixModules=1184;} else {nBPixModules=768;} 
-  
+  if (isUpgrade) {
+    nBPixModules = 1184;
+  } else {
+    nBPixModules = 768;
+  }
+
   iBooker.cd();
   iBooker.setCurrentFolder("Pixel/Barrel");
-  DEV_adc_Barrel = iBooker.book1D("DEV_adc_Barrel","Deviation from reference;Module;<adc_ref>-<adc>",nBPixModules,0.,nBPixModules);
-  DEV_ndigis_Barrel = iBooker.book1D("DEV_ndigis_Barrel","Deviation from reference;Module;<ndigis_ref>-<ndigis>",nBPixModules,0.,nBPixModules);
-  DEV_charge_Barrel = iBooker.book1D("DEV_charge_Barrel","Deviation from reference;Module;<charge_ref>-<charge>",nBPixModules,0.,nBPixModules);
-  DEV_nclusters_Barrel = iBooker.book1D("DEV_nclusters_Barrel","Deviation from reference;Module;<nclusters_ref>-<nclusters>",nBPixModules,0.,nBPixModules);
-  DEV_size_Barrel = iBooker.book1D("DEV_size_Barrel","Deviation from reference;Module;<size_ref>-<size>",nBPixModules,0.,nBPixModules);
+  DEV_adc_Barrel = iBooker.book1D(
+      "DEV_adc_Barrel", "Deviation from reference;Module;<adc_ref>-<adc>", nBPixModules, 0., nBPixModules);
+  DEV_ndigis_Barrel = iBooker.book1D(
+      "DEV_ndigis_Barrel", "Deviation from reference;Module;<ndigis_ref>-<ndigis>", nBPixModules, 0., nBPixModules);
+  DEV_charge_Barrel = iBooker.book1D(
+      "DEV_charge_Barrel", "Deviation from reference;Module;<charge_ref>-<charge>", nBPixModules, 0., nBPixModules);
+  DEV_nclusters_Barrel = iBooker.book1D("DEV_nclusters_Barrel",
+                                        "Deviation from reference;Module;<nclusters_ref>-<nclusters>",
+                                        nBPixModules,
+                                        0.,
+                                        nBPixModules);
+  DEV_size_Barrel = iBooker.book1D(
+      "DEV_size_Barrel", "Deviation from reference;Module;<size_ref>-<size>", nBPixModules, 0., nBPixModules);
   iBooker.cd();
   iBooker.setCurrentFolder("Pixel/Endcap");
-  DEV_adc_Endcap = iBooker.book1D("DEV_adc_Endcap","Deviation from reference;Module;<adc_ref>-<adc>",672,0.,672.);
-  DEV_ndigis_Endcap = iBooker.book1D("DEV_ndigis_Endcap","Deviation from reference;Module;<ndigis_ref>-<ndigis>",672,0.,672.);
-  DEV_charge_Endcap = iBooker.book1D("DEV_charge_Endcap","Deviation from reference;Module;<charge_ref>-<charge>",672,0.,672.);
-  DEV_nclusters_Endcap = iBooker.book1D("DEV_nclusters_Endcap","Deviation from reference;Module;<nclusters_ref>-<nclusters>",672,0.,672.);
-  DEV_size_Endcap = iBooker.book1D("DEV_size_Endcap","Deviation from reference;Module;<size_ref>-<size>",672,0.,672.);  
+  DEV_adc_Endcap = iBooker.book1D("DEV_adc_Endcap", "Deviation from reference;Module;<adc_ref>-<adc>", 672, 0., 672.);
+  DEV_ndigis_Endcap =
+      iBooker.book1D("DEV_ndigis_Endcap", "Deviation from reference;Module;<ndigis_ref>-<ndigis>", 672, 0., 672.);
+  DEV_charge_Endcap =
+      iBooker.book1D("DEV_charge_Endcap", "Deviation from reference;Module;<charge_ref>-<charge>", 672, 0., 672.);
+  DEV_nclusters_Endcap = iBooker.book1D(
+      "DEV_nclusters_Endcap", "Deviation from reference;Module;<nclusters_ref>-<nclusters>", 672, 0., 672.);
+  DEV_size_Endcap =
+      iBooker.book1D("DEV_size_Endcap", "Deviation from reference;Module;<size_ref>-<size>", 672, 0., 672.);
   iBooker.cd();
 }
 
-
-void SiPixelActionExecutor::fillDeviations(DQMStore::IGetter& iGetter) {
+void SiPixelActionExecutor::fillDeviations(DQMStore::IGetter &iGetter) {
   int n = 768;
-  MonitorElement* me1; MonitorElement* me2; 
-  MonitorElement* me3; MonitorElement* me4; 
-  MonitorElement* me5; 
-  TH1* ref1; TH1* ref2; 
-  TH1* ref3; TH1* ref4; 
-  TH1* ref5; 
-  MonitorElement* dev1; MonitorElement* dev2; 
-  MonitorElement* dev3; MonitorElement* dev4; 
-  MonitorElement* dev5; 
+  MonitorElement *me1;
+  MonitorElement *me2;
+  MonitorElement *me3;
+  MonitorElement *me4;
+  MonitorElement *me5;
+  TH1 *ref1;
+  TH1 *ref2;
+  TH1 *ref3;
+  TH1 *ref4;
+  TH1 *ref5;
+  MonitorElement *dev1;
+  MonitorElement *dev2;
+  MonitorElement *dev3;
+  MonitorElement *dev4;
+  MonitorElement *dev5;
   me1 = iGetter.get("Pixel/Barrel/SUMDIG_adc_Barrel");
   ref1 = me1->getRefTH1();
   dev1 = iGetter.get("Pixel/Barrel/DEV_adc_Barrel");
@@ -248,50 +297,67 @@ void SiPixelActionExecutor::fillDeviations(DQMStore::IGetter& iGetter) {
   me5 = iGetter.get("Pixel/Barrel/SUMCLU_size_Barrel");
   ref5 = me5->getRefTH1();
   dev5 = iGetter.get("Pixel/Barrel/DEV_size_Barrel");
-  for(int i=1; i!=n+1; i++){
-    float ref_value; float new_value;
-    // Barrel adc: 
-    if(me1)if(ref1)if(dev1){
-      new_value = me1->getBinContent(i);
-      ref_value = ref1->GetBinContent(i); 
-      dev1->setBinContent(i,ref_value-new_value);
-    }
-    //Barrel ndigis:
-    if(me2)if(ref2)if(dev2){
-      new_value = me2->getBinContent(i);
-      ref_value = ref2->GetBinContent(i); 
-      dev2->setBinContent(i,ref_value-new_value);
-    }
+  for (int i = 1; i != n + 1; i++) {
+    float ref_value;
+    float new_value;
+    // Barrel adc:
+    if (me1)
+      if (ref1)
+        if (dev1) {
+          new_value = me1->getBinContent(i);
+          ref_value = ref1->GetBinContent(i);
+          dev1->setBinContent(i, ref_value - new_value);
+        }
+    // Barrel ndigis:
+    if (me2)
+      if (ref2)
+        if (dev2) {
+          new_value = me2->getBinContent(i);
+          ref_value = ref2->GetBinContent(i);
+          dev2->setBinContent(i, ref_value - new_value);
+        }
     // Barrel cluster charge:
-    if(me3)if(ref3)if(dev3){
-      new_value = me3->getBinContent(i);
-      ref_value = ref3->GetBinContent(i); 
-      dev3->setBinContent(i,ref_value-new_value);
-    }
+    if (me3)
+      if (ref3)
+        if (dev3) {
+          new_value = me3->getBinContent(i);
+          ref_value = ref3->GetBinContent(i);
+          dev3->setBinContent(i, ref_value - new_value);
+        }
     // Barrel nclusters:
-    if(me4)if(ref4)if(dev4){
-      new_value = me4->getBinContent(i);
-      ref_value = ref4->GetBinContent(i); 
-      dev4->setBinContent(i,ref_value-new_value);
-    }
+    if (me4)
+      if (ref4)
+        if (dev4) {
+          new_value = me4->getBinContent(i);
+          ref_value = ref4->GetBinContent(i);
+          dev4->setBinContent(i, ref_value - new_value);
+        }
     // Barrel cluster size:
-    if(me5)if(ref5)if(dev5){
-      new_value = me5->getBinContent(i);
-      ref_value = ref5->GetBinContent(i); 
-      dev5->setBinContent(i,ref_value-new_value);
-    }
+    if (me5)
+      if (ref5)
+        if (dev5) {
+          new_value = me5->getBinContent(i);
+          ref_value = ref5->GetBinContent(i);
+          dev5->setBinContent(i, ref_value - new_value);
+        }
   }
 
   int nn = 672;
-  MonitorElement* me11; MonitorElement* me12; 
-  MonitorElement* me13; MonitorElement* me14; 
-  MonitorElement* me15; 
-  TH1* ref11; TH1* ref12; 
-  TH1* ref13; TH1* ref14; 
-  TH1* ref15; 
-  MonitorElement* dev11; MonitorElement* dev12; 
-  MonitorElement* dev13; MonitorElement* dev14; 
-  MonitorElement* dev15; 
+  MonitorElement *me11;
+  MonitorElement *me12;
+  MonitorElement *me13;
+  MonitorElement *me14;
+  MonitorElement *me15;
+  TH1 *ref11;
+  TH1 *ref12;
+  TH1 *ref13;
+  TH1 *ref14;
+  TH1 *ref15;
+  MonitorElement *dev11;
+  MonitorElement *dev12;
+  MonitorElement *dev13;
+  MonitorElement *dev14;
+  MonitorElement *dev15;
   me11 = iGetter.get("Pixel/Endcap/SUMDIG_adc_Endcap");
   ref11 = me11->getRefTH1();
   dev11 = iGetter.get("Pixel/Endcap/DEV_adc_Endcap");
@@ -307,1875 +373,2497 @@ void SiPixelActionExecutor::fillDeviations(DQMStore::IGetter& iGetter) {
   me15 = iGetter.get("Pixel/Endcap/SUMCLU_size_Endcap");
   ref15 = me15->getRefTH1();
   dev15 = iGetter.get("Pixel/Endcap/DEV_size_Endcap");
-  for(int i=1; i!=nn+1; i++){
-    float ref_value; float new_value;
-    // Endcap adc: 
-    if(me11)if(ref11)if(dev11){
-      new_value = me11->getBinContent(i);
-      ref_value = ref11->GetBinContent(i); 
-      dev11->setBinContent(i,ref_value-new_value);
-    }
-    //Endcap ndigis:
-    if(me12)if(ref12)if(dev12){
-      new_value = me12->getBinContent(i);
-      ref_value = ref12->GetBinContent(i); 
-      dev12->setBinContent(i,ref_value-new_value);
-    }
+  for (int i = 1; i != nn + 1; i++) {
+    float ref_value;
+    float new_value;
+    // Endcap adc:
+    if (me11)
+      if (ref11)
+        if (dev11) {
+          new_value = me11->getBinContent(i);
+          ref_value = ref11->GetBinContent(i);
+          dev11->setBinContent(i, ref_value - new_value);
+        }
+    // Endcap ndigis:
+    if (me12)
+      if (ref12)
+        if (dev12) {
+          new_value = me12->getBinContent(i);
+          ref_value = ref12->GetBinContent(i);
+          dev12->setBinContent(i, ref_value - new_value);
+        }
     // Endcap cluster charge:
-    if(me13)if(ref13)if(dev13){
-      new_value = me13->getBinContent(i);
-      ref_value = ref13->GetBinContent(i); 
-      dev13->setBinContent(i,ref_value-new_value);
-    }
+    if (me13)
+      if (ref13)
+        if (dev13) {
+          new_value = me13->getBinContent(i);
+          ref_value = ref13->GetBinContent(i);
+          dev13->setBinContent(i, ref_value - new_value);
+        }
     // Endcap nclusters:
-    if(me14)if(ref14)if(dev14){
-      new_value = me14->getBinContent(i);
-      ref_value = ref14->GetBinContent(i); 
-      dev14->setBinContent(i,ref_value-new_value);
-    }
+    if (me14)
+      if (ref14)
+        if (dev14) {
+          new_value = me14->getBinContent(i);
+          ref_value = ref14->GetBinContent(i);
+          dev14->setBinContent(i, ref_value - new_value);
+        }
     // Endcap cluster size:
-    if(me15)if(ref15)if(dev15){
-      new_value = me15->getBinContent(i);
-      ref_value = ref15->GetBinContent(i); 
-      dev15->setBinContent(i,ref_value-new_value);
-    }
+    if (me15)
+      if (ref15)
+        if (dev15) {
+          new_value = me15->getBinContent(i);
+          ref_value = ref15->GetBinContent(i);
+          dev15->setBinContent(i, ref_value - new_value);
+        }
   }
 }
 
 //=============================================================================================================
 
-void SiPixelActionExecutor::GetBladeSubdirs(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter, vector<string>& blade_subdirs) {
-
-	blade_subdirs.clear();
-	vector<string> panels = iGetter.getSubdirs();
-	vector<string> modules;
-	for (vector<string>::const_iterator it = panels.begin(); it != panels.end(); it++) {
-		iGetter.cd(*it);
-		iBooker.cd(*it);
-		modules = iGetter.getSubdirs();
-		for (vector<string>::const_iterator m_it = modules.begin(); m_it != modules.end(); m_it++) {
-			blade_subdirs.push_back(*m_it);
-		}
-	}
+void SiPixelActionExecutor::GetBladeSubdirs(DQMStore::IBooker &iBooker,
+                                            DQMStore::IGetter &iGetter,
+                                            vector<string> &blade_subdirs) {
+  blade_subdirs.clear();
+  vector<string> panels = iGetter.getSubdirs();
+  vector<string> modules;
+  for (vector<string>::const_iterator it = panels.begin(); it != panels.end(); it++) {
+    iGetter.cd(*it);
+    iBooker.cd(*it);
+    modules = iGetter.getSubdirs();
+    for (vector<string>::const_iterator m_it = modules.begin(); m_it != modules.end(); m_it++) {
+      blade_subdirs.push_back(*m_it);
+    }
+  }
 }
 
-
 //=============================================================================================================
 
-void SiPixelActionExecutor::fillSummary(DQMStore::IBooker& iBooker, DQMStore::IGetter & iGetter, string dir_name, vector<string>& me_names, bool isbarrel, bool isUpgrade)
-{
-
-
-  //cout<<"entering SiPixelActionExecutor::fillSummary..."<<endl;
+void SiPixelActionExecutor::fillSummary(DQMStore::IBooker &iBooker,
+                                        DQMStore::IGetter &iGetter,
+                                        string dir_name,
+                                        vector<string> &me_names,
+                                        bool isbarrel,
+                                        bool isUpgrade) {
+  // cout<<"entering SiPixelActionExecutor::fillSummary..."<<endl;
   string currDir = iBooker.pwd();
   string prefix;
-  if(source_type_==0) prefix="SUMRAW";
-  else if (source_type_==1) prefix="SUMDIG";
-  else if (source_type_==2) prefix="SUMCLU";
-  else if (source_type_==3) prefix="SUMTRK";
-  else if (source_type_==4) prefix="SUMHIT";
-  else if (source_type_>=7 && source_type_<20) prefix="SUMCAL";
-  else if (source_type_==20) prefix="SUMOFF";
-  if (currDir.find(dir_name) != string::npos)  {
-    vector<MonitorElement*> sum_mes;
-    for (vector<string>::const_iterator iv = me_names.begin();
-	 iv != me_names.end(); iv++) {
-      if(source_type_==5||source_type_==6){
-	if((*iv)=="errorType"||(*iv)=="NErrors"||(*iv)=="fullType"||(*iv)=="chanNmbr"||
-	   (*iv)=="TBMType"||(*iv)=="EvtNbr"||(*iv)=="evtSize"||(*iv)=="linkId"||
-	   (*iv)=="ROCId"||(*iv)=="DCOLId"||(*iv)=="PXId"||(*iv)=="ROCNmbr"||
-	   (*iv)=="TBMMessage"||(*iv)=="Type36Hitmap") 
-	  prefix="SUMRAW";
-	else if((*iv)=="ndigis"||(*iv)=="adc")
-	  prefix="SUMDIG";
-	else if((*iv)=="nclusters"||(*iv)=="x"||(*iv)=="y"||(*iv)=="charge"||
-		(*iv)=="size"||(*iv)=="sizeX"||(*iv)=="sizeY"||(*iv)=="minrow"||
-		(*iv)=="maxrow"||(*iv)=="mincol"||(*iv)=="maxcol")
-	  prefix="SUMCLU";
-	if(currDir.find("Track")!=string::npos) prefix="SUMTRK";
-	else if((*iv)=="residualX"||(*iv)=="residualY")
-	  prefix="SUMTRK";
-	else if((*iv)=="ClustX"||(*iv)=="ClustY"||(*iv)=="nRecHits"||(*iv)=="ErrorX"||(*iv)=="ErrorY")
-	  prefix="SUMHIT";
-	else if((*iv)=="Gain1d"||(*iv)=="GainChi2NDF1d"||
-		(*iv)=="GainChi2Prob1d"||(*iv)=="Pedestal1d"||
-		(*iv)=="GainNPoints1d"||(*iv)=="GainHighPoint1d"||
-		(*iv)=="GainLowPoint1d"||(*iv)=="GainEndPoint1d"||
-		(*iv)=="GainFitResult2d"||(*iv)=="GainDynamicRange2d"||
-		(*iv)=="GainSaturate2d"||
-		(*iv)=="ScurveChi2ProbSummary"||(*iv)=="ScurveFitResultSummary"||
-		(*iv)=="ScurveSigmasSummary"||(*iv)=="ScurveThresholdSummary"||
-		(*iv)=="pixelAliveSummary"  || (*iv) == "SiPixelErrorsCalibDigis") 
-	  prefix="SUMCAL"; 
+  if (source_type_ == 0)
+    prefix = "SUMRAW";
+  else if (source_type_ == 1)
+    prefix = "SUMDIG";
+  else if (source_type_ == 2)
+    prefix = "SUMCLU";
+  else if (source_type_ == 3)
+    prefix = "SUMTRK";
+  else if (source_type_ == 4)
+    prefix = "SUMHIT";
+  else if (source_type_ >= 7 && source_type_ < 20)
+    prefix = "SUMCAL";
+  else if (source_type_ == 20)
+    prefix = "SUMOFF";
+  if (currDir.find(dir_name) != string::npos) {
+    vector<MonitorElement *> sum_mes;
+    for (vector<string>::const_iterator iv = me_names.begin(); iv != me_names.end(); iv++) {
+      if (source_type_ == 5 || source_type_ == 6) {
+        if ((*iv) == "errorType" || (*iv) == "NErrors" || (*iv) == "fullType" || (*iv) == "chanNmbr" ||
+            (*iv) == "TBMType" || (*iv) == "EvtNbr" || (*iv) == "evtSize" || (*iv) == "linkId" || (*iv) == "ROCId" ||
+            (*iv) == "DCOLId" || (*iv) == "PXId" || (*iv) == "ROCNmbr" || (*iv) == "TBMMessage" ||
+            (*iv) == "Type36Hitmap")
+          prefix = "SUMRAW";
+        else if ((*iv) == "ndigis" || (*iv) == "adc")
+          prefix = "SUMDIG";
+        else if ((*iv) == "nclusters" || (*iv) == "x" || (*iv) == "y" || (*iv) == "charge" || (*iv) == "size" ||
+                 (*iv) == "sizeX" || (*iv) == "sizeY" || (*iv) == "minrow" || (*iv) == "maxrow" || (*iv) == "mincol" ||
+                 (*iv) == "maxcol")
+          prefix = "SUMCLU";
+        if (currDir.find("Track") != string::npos)
+          prefix = "SUMTRK";
+        else if ((*iv) == "residualX" || (*iv) == "residualY")
+          prefix = "SUMTRK";
+        else if ((*iv) == "ClustX" || (*iv) == "ClustY" || (*iv) == "nRecHits" || (*iv) == "ErrorX" ||
+                 (*iv) == "ErrorY")
+          prefix = "SUMHIT";
+        else if ((*iv) == "Gain1d" || (*iv) == "GainChi2NDF1d" || (*iv) == "GainChi2Prob1d" || (*iv) == "Pedestal1d" ||
+                 (*iv) == "GainNPoints1d" || (*iv) == "GainHighPoint1d" || (*iv) == "GainLowPoint1d" ||
+                 (*iv) == "GainEndPoint1d" || (*iv) == "GainFitResult2d" || (*iv) == "GainDynamicRange2d" ||
+                 (*iv) == "GainSaturate2d" || (*iv) == "ScurveChi2ProbSummary" || (*iv) == "ScurveFitResultSummary" ||
+                 (*iv) == "ScurveSigmasSummary" || (*iv) == "ScurveThresholdSummary" || (*iv) == "pixelAliveSummary" ||
+                 (*iv) == "SiPixelErrorsCalibDigis")
+          prefix = "SUMCAL";
       }
-      MonitorElement* temp; string tag;
-      if((*iv).find("residual")!=string::npos){                           // track residuals
-	tag = prefix + "_" + (*iv) + "_mean_" 
-	  + currDir.substr(currDir.find(dir_name));
-	temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
-	sum_mes.push_back(temp);
-	tag = prefix + "_" + (*iv) + "_RMS_" 
-	  + currDir.substr(currDir.find(dir_name));
-	temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
-	sum_mes.push_back(temp);
-      }else if(prefix == "SUMCAL"){                  // calibrations
-	if((*iv)=="Gain1d" || (*iv)=="GainChi2NDF1d" || (*iv)=="GainChi2Prob1d" ||
-	   (*iv)=="GainNPoints1d" || (*iv)=="GainHighPoint1d" ||
-	   (*iv)=="GainLowPoint1d" || (*iv)=="GainEndPoint1d" || 
-	   (*iv)=="GainDynamicRange2d" || (*iv)=="GainSaturate2d" ||
-	   (*iv)=="Pedestal1d" ||
-	   (*iv)=="ScurveChi2ProbSummary" || (*iv)=="ScurveFitResultSummary" ||
-	   (*iv)=="ScurveSigmasSummary" || (*iv)=="ScurveThresholdSummary"){                    
-	  tag = prefix + "_" + (*iv) + "_mean_" 
-	    + currDir.substr(currDir.find(dir_name));
-	  temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
-	  sum_mes.push_back(temp);
-	  tag = prefix + "_" + (*iv) + "_RMS_" 
-	    + currDir.substr(currDir.find(dir_name));
-	  temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
-	  sum_mes.push_back(temp);
-	}else if((*iv) == "SiPixelErrorsCalibDigis"){
-	  tag = prefix + "_" + (*iv) + "_NCalibErrors_"
-	    + currDir.substr(currDir.find(dir_name));
-	  temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
-	  sum_mes.push_back(temp);
-	}else if((*iv)=="GainFitResult2d"){
-	  tag = prefix + "_" + (*iv) + "_NNegativeFits_"
-	    + currDir.substr(currDir.find(dir_name));
-	  temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
-	  sum_mes.push_back(temp);
-	}else if((*iv)=="pixelAliveSummary"){
-	  tag = prefix + "_" + (*iv) + "_FracOfPerfectPix_"
-	    + currDir.substr(currDir.find(dir_name));
-	  temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
-	  sum_mes.push_back(temp);
-	  tag = prefix + "_" + (*iv) + "_mean_"
-	    + currDir.substr(currDir.find(dir_name));
-	  temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
-	  sum_mes.push_back(temp);
-	}
-      }else{
-	tag = prefix + "_" + (*iv) + "_" + currDir.substr(currDir.find(dir_name));
-	temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
-	sum_mes.push_back(temp);
-	if((*iv)=="ndigis"){
-	  tag = prefix + "_" + (*iv) + "FREQ_" 
-	    + currDir.substr(currDir.find(dir_name));
-	  temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
-	  sum_mes.push_back(temp);
-	}
-	if(prefix=="SUMDIG" && (*iv)=="adc"){
-	  tag = "ALLMODS_" + (*iv) + "COMB_" + currDir.substr(currDir.find(dir_name));
-      temp = nullptr;
-      string fullpathname = iBooker.pwd() + "/" + tag;
-      temp = iGetter.get(fullpathname);
-      if (temp) {
-        temp->Reset();
-      }else{
-	    temp = iBooker.book1D(tag.c_str(), tag.c_str(),128, 0., 256.);
-      }
-	  sum_mes.push_back(temp);
-	}
-	if(prefix=="SUMCLU" && (*iv)=="charge"){
-	  tag = "ALLMODS_" + (*iv) + "COMB_" + currDir.substr(currDir.find(dir_name));
-      temp = nullptr;
-      string fullpathname = iBooker.pwd() + "/" + tag;
-      temp = iGetter.get(fullpathname);
-      if (temp) {
-        temp->Reset();
-      }else{
-        temp = iBooker.book1D(tag.c_str(), tag.c_str(),100, 0., 200.); // To look to get the size automatically	  
-      }
-	  sum_mes.push_back(temp);
-	}
+      MonitorElement *temp;
+      string tag;
+      if ((*iv).find("residual") != string::npos) {  // track residuals
+        tag = prefix + "_" + (*iv) + "_mean_" + currDir.substr(currDir.find(dir_name));
+        temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
+        sum_mes.push_back(temp);
+        tag = prefix + "_" + (*iv) + "_RMS_" + currDir.substr(currDir.find(dir_name));
+        temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
+        sum_mes.push_back(temp);
+      } else if (prefix == "SUMCAL") {  // calibrations
+        if ((*iv) == "Gain1d" || (*iv) == "GainChi2NDF1d" || (*iv) == "GainChi2Prob1d" || (*iv) == "GainNPoints1d" ||
+            (*iv) == "GainHighPoint1d" || (*iv) == "GainLowPoint1d" || (*iv) == "GainEndPoint1d" ||
+            (*iv) == "GainDynamicRange2d" || (*iv) == "GainSaturate2d" || (*iv) == "Pedestal1d" ||
+            (*iv) == "ScurveChi2ProbSummary" || (*iv) == "ScurveFitResultSummary" || (*iv) == "ScurveSigmasSummary" ||
+            (*iv) == "ScurveThresholdSummary") {
+          tag = prefix + "_" + (*iv) + "_mean_" + currDir.substr(currDir.find(dir_name));
+          temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
+          sum_mes.push_back(temp);
+          tag = prefix + "_" + (*iv) + "_RMS_" + currDir.substr(currDir.find(dir_name));
+          temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
+          sum_mes.push_back(temp);
+        } else if ((*iv) == "SiPixelErrorsCalibDigis") {
+          tag = prefix + "_" + (*iv) + "_NCalibErrors_" + currDir.substr(currDir.find(dir_name));
+          temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
+          sum_mes.push_back(temp);
+        } else if ((*iv) == "GainFitResult2d") {
+          tag = prefix + "_" + (*iv) + "_NNegativeFits_" + currDir.substr(currDir.find(dir_name));
+          temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
+          sum_mes.push_back(temp);
+        } else if ((*iv) == "pixelAliveSummary") {
+          tag = prefix + "_" + (*iv) + "_FracOfPerfectPix_" + currDir.substr(currDir.find(dir_name));
+          temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
+          sum_mes.push_back(temp);
+          tag = prefix + "_" + (*iv) + "_mean_" + currDir.substr(currDir.find(dir_name));
+          temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
+          sum_mes.push_back(temp);
+        }
+      } else {
+        tag = prefix + "_" + (*iv) + "_" + currDir.substr(currDir.find(dir_name));
+        temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
+        sum_mes.push_back(temp);
+        if ((*iv) == "ndigis") {
+          tag = prefix + "_" + (*iv) + "FREQ_" + currDir.substr(currDir.find(dir_name));
+          temp = getSummaryME(iBooker, iGetter, tag, isUpgrade);
+          sum_mes.push_back(temp);
+        }
+        if (prefix == "SUMDIG" && (*iv) == "adc") {
+          tag = "ALLMODS_" + (*iv) + "COMB_" + currDir.substr(currDir.find(dir_name));
+          temp = nullptr;
+          string fullpathname = iBooker.pwd() + "/" + tag;
+          temp = iGetter.get(fullpathname);
+          if (temp) {
+            temp->Reset();
+          } else {
+            temp = iBooker.book1D(tag.c_str(), tag.c_str(), 128, 0., 256.);
+          }
+          sum_mes.push_back(temp);
+        }
+        if (prefix == "SUMCLU" && (*iv) == "charge") {
+          tag = "ALLMODS_" + (*iv) + "COMB_" + currDir.substr(currDir.find(dir_name));
+          temp = nullptr;
+          string fullpathname = iBooker.pwd() + "/" + tag;
+          temp = iGetter.get(fullpathname);
+          if (temp) {
+            temp->Reset();
+          } else {
+            temp = iBooker.book1D(tag.c_str(), tag.c_str(), 100, 0.,
+                                  200.);  // To look to get the size automatically
+          }
+          sum_mes.push_back(temp);
+        }
       }
     }
     if (sum_mes.empty()) {
-      edm::LogInfo("SiPixelActionExecutor") << " Summary MEs can not be created" << "\n" ;
+      edm::LogInfo("SiPixelActionExecutor") << " Summary MEs can not be created"
+                                            << "\n";
       return;
     }
     vector<string> subdirs = iGetter.getSubdirs();
-    //Blade
-    if(dir_name.find("Blade_") == 0) GetBladeSubdirs(iBooker, iGetter, subdirs);
-	
+    // Blade
+    if (dir_name.find("Blade_") == 0)
+      GetBladeSubdirs(iBooker, iGetter, subdirs);
+
     int ndet = 0;
-    for (vector<string>::const_iterator it = subdirs.begin();
-	 it != subdirs.end(); it++) {
-      if (prefix!="SUMOFF" && (*it).find("Module_") == string::npos) continue;
-      if (prefix=="SUMOFF" && (*it).find(isbarrel?"Layer_":"Disk_") == string::npos) continue;
+    for (vector<string>::const_iterator it = subdirs.begin(); it != subdirs.end(); it++) {
+      if (prefix != "SUMOFF" && (*it).find("Module_") == string::npos)
+        continue;
+      if (prefix == "SUMOFF" && (*it).find(isbarrel ? "Layer_" : "Disk_") == string::npos)
+        continue;
       iBooker.cd(*it);
       iGetter.cd(*it);
       ndet++;
 
-      vector<string> contents = iGetter.getMEs(); 
-      
-      for (vector<MonitorElement*>::const_iterator isum = sum_mes.begin();
-	   isum != sum_mes.end(); isum++) {
-	for (vector<string>::const_iterator im = contents.begin();
-	     im != contents.end(); im++) {
-	  string sname = ((*isum)->getName());
-	  string tname = " ";
-	  tname = sname.substr(7,(sname.find("_",7)-6));
-	  if(sname.find("ALLMODS_adcCOMB_")!=string::npos) tname = "adc_";
-	  if(sname.find("ALLMODS_chargeCOMB_")!=string::npos) tname = "charge_";
-	  if(sname.find("_charge_")!=string::npos && sname.find("Track_")==string::npos) tname = "charge_";
-	  if(sname.find("_nclusters_")!=string::npos && sname.find("Track_")==string::npos) tname = "nclusters_";
-	  if(sname.find("_size_")!=string::npos && sname.find("Track_")==string::npos) tname = "size_";
-	  if(sname.find("_charge_OffTrack_")!=string::npos) tname = "charge_OffTrack_";
-	  if(sname.find("_nclusters_OffTrack_")!=string::npos) tname = "nclusters_OffTrack_";
-	  if(sname.find("_size_OffTrack_")!=string::npos) tname = "size_OffTrack_";
-	  if(sname.find("_sizeX_OffTrack_")!=string::npos) tname = "sizeX_OffTrack_";
-	  if(sname.find("_sizeY_OffTrack_")!=string::npos) tname = "sizeY_OffTrack_";
-	  if(sname.find("_charge_OnTrack_")!=string::npos) tname = "charge_OnTrack_";
-	  if(sname.find("_nclusters_OnTrack_")!=string::npos) tname = "nclusters_OnTrack_";
-	  if(sname.find("_size_OnTrack_")!=string::npos) tname = "size_OnTrack_";
-	  if(sname.find("_sizeX_OnTrack_")!=string::npos) tname = "sizeX_OnTrack_";
-	  if(sname.find("_sizeY_OnTrack_")!=string::npos) tname = "sizeY_OnTrack_";
-	  if(tname.find("FREQ")!=string::npos) tname = "ndigis_";
-	  if (((*im)).find(tname) == 0) {
-	    string fullpathname = iBooker.pwd() + "/" + (*im); 
-	    MonitorElement *  me = iGetter.get(fullpathname);
-	    
-	    if (me){ 
-	      if(sname.find("_charge")!=string::npos && sname.find("Track_")==string::npos && me->getName().find("Track_")!=string::npos) continue;
-	      if(sname.find("_nclusters_")!=string::npos && sname.find("Track_")==string::npos && me->getName().find("Track_")!=string::npos) continue;
-	      if(sname.find("_size")!=string::npos && sname.find("Track_")==string::npos && me->getName().find("Track_")!=string::npos) continue;
-	      // fill summary histos:
-	      if (sname.find("_RMS_")!=string::npos && 
-		  sname.find("GainDynamicRange2d")==string::npos && 
-		  sname.find("GainSaturate2d")==string::npos){
-		(*isum)->Fill(ndet, me->getRMS());
-	      }else if (sname.find("GainDynamicRange2d")!=string::npos ||
-			sname.find("GainSaturate2d")!=string::npos){
-		float SumOfEntries=0.; float SumOfSquaredEntries=0.; int SumOfPixels=0;
-		for(int cols=1; cols!=me->getNbinsX()+1; cols++) for(int rows=1; rows!=me->getNbinsY()+1; rows++){
-		  SumOfEntries+=me->getBinContent(cols,rows);
-		  SumOfSquaredEntries+=(me->getBinContent(cols,rows))*(me->getBinContent(cols,rows));
-		  SumOfPixels++;
-		  }
-
-		float MeanInZ = SumOfEntries / float(SumOfPixels);
-		float RMSInZ = sqrt(SumOfSquaredEntries/float(SumOfPixels));
-		if(sname.find("_mean_")!=string::npos) (*isum)->Fill(ndet, MeanInZ);
-		if(sname.find("_RMS_")!=string::npos) (*isum)->Fill(ndet, RMSInZ);
-	      }else if (sname.find("_FracOfPerfectPix_")!=string::npos){
-		float nlast = me->getBinContent(me->getNbinsX());
-		float nall = (me->getTH1F())->Integral(1,11);
-		(*isum)->Fill(ndet, nlast/nall);
-	      }else if (sname.find("_NCalibErrors_")!=string::npos ||
-			sname.find("FREQ_")!=string::npos){
-		float nall = me->getEntries();
-		(*isum)->Fill(ndet, nall);
-	      }else if (sname.find("GainFitResult2d")!=string::npos){
-		int NegFitPixels=0;
-		for(int cols=1; cols!=me->getNbinsX()+1; cols++) for(int rows=1; rows!=me->getNbinsY()+1; rows++){
-		  if(me->getBinContent(cols,rows)<0.) NegFitPixels++;
-		}
-		(*isum)->Fill(ndet, float(NegFitPixels));
-	      }else if (sname.find("ALLMODS_adcCOMB_")!=string::npos || 
-	                (sname.find("ALLMODS_chargeCOMB_")!=string::npos && me->getName().find("Track_")==string::npos)){
-		(*isum)->getTH1F()->Add(me->getTH1F());
-	      }else if (sname.find("_NErrors_")!=string::npos){
-	        string path1 = fullpathname;
-		path1 = path1.replace(path1.find("NErrors"),7,"errorType");
-		MonitorElement * me1 = iGetter.get(path1);
-		bool notReset=true;
-	        if(me1){
-	          for(int jj=1; jj<16; jj++){
-	            if(me1->getBinContent(jj)>0.){
-	              if(jj==6){ //errorType=30 (reset)
-	                string path2 = path1;
-			path2 = path2.replace(path2.find("errorType"),9,"TBMMessage");
-	                MonitorElement * me2 = iGetter.get(path2);
-	                if(me2) if(me2->getBinContent(6)>0. || me2->getBinContent(7)>0.) notReset=false;
-		      }
-		    }
-		  }
-		}
-		if(notReset) (*isum)->Fill(ndet, me1->getEntries());
-	      }else if ((sname.find("_charge_")!=string::npos && sname.find("Track_")==string::npos && 
-	                me->getName().find("Track_")==string::npos) ||
-			(sname.find("_charge_")!=string::npos && sname.find("_OnTrack_")!=string::npos && 
-	                me->getName().find("_OnTrack_")!=string::npos) ||
-			(sname.find("_charge_")!=string::npos && sname.find("_OffTrack_")!=string::npos && 
-	                me->getName().find("_OffTrack_")!=string::npos) ||
-			(sname.find("_nclusters_")!=string::npos && sname.find("Track_")==string::npos && 
-	                me->getName().find("Track_")==string::npos) ||
-			(sname.find("_nclusters_")!=string::npos && sname.find("_OnTrack_")!=string::npos && 
-	                me->getName().find("_OnTrack_")!=string::npos) ||
-			(sname.find("_nclusters_")!=string::npos && sname.find("_OffTrack_")!=string::npos && 
-	                me->getName().find("_OffTrack_")!=string::npos) ||
-			(sname.find("_size")!=string::npos && sname.find("Track_")==string::npos && 
-	                me->getName().find("Track_")==string::npos) ||
-			(sname.find("_size")!=string::npos && sname.find("_OnTrack_")!=string::npos && 
-	                me->getName().find("_OnTrack_")!=string::npos) ||
-			(sname.find("_size")!=string::npos && sname.find("_OffTrack_")!=string::npos && 
-	                me->getName().find("_OffTrack_")!=string::npos)){
-	        (*isum)->Fill(ndet, me->getMean());
-	      }else if(sname.find("_charge_")==string::npos && sname.find("_nclusters_")==string::npos && sname.find("_size")==string::npos){
-		(*isum)->Fill(ndet, me->getMean());
-	      }
-	      
-	      // set titles:
-	      if(prefix=="SUMOFF"){
-		(*isum)->setAxisTitle(isbarrel?"Ladders":"Blades",1);
-	      }else if(sname.find("ALLMODS_adcCOMB_")!=string::npos){
-		(*isum)->setAxisTitle("Digi charge [ADC]",1);
-	      }else if(sname.find("ALLMODS_chargeCOMB_")!=string::npos){
-		(*isum)->setAxisTitle("Cluster charge [kilo electrons]",1);
-	      }else{
-		(*isum)->setAxisTitle("Modules",1);
-	      }
-	      string title = " ";
-	      if (sname.find("_RMS_")!=string::npos){
-		title = "RMS of " + sname.substr(7,(sname.find("_",7)-7)) + " per module"; 
-	      }else if (sname.find("_FracOfPerfectPix_")!=string::npos){
-		title = "FracOfPerfectPix " + sname.substr(7,(sname.find("_",7)-7)) + " per module"; 
-	      }else if(sname.find("_NCalibErrors_")!=string::npos){
-		title = "Number of CalibErrors " + sname.substr(7,(sname.find("_",7)-7)) + " per module"; 
-	      }else if(sname.find("_NNegativeFits_")!=string::npos){
-		title = "Number of pixels with neg. fit result " + sname.substr(7,(sname.find("_",7)-7)) + " per module"; 
-	      }else if (sname.find("FREQ_")!=string::npos){
-		title = "NEvents with digis per module"; 
-	      }else if (sname.find("ALLMODS_adcCOMB_")!=string::npos){
-		title = "NDigis";
-	      }else if (sname.find("ALLMODS_chargeCOMB_")!=string::npos){
-		title = "NClusters";
-	      }else if (sname.find("_NErrors_")!=string::npos){
-	        if(prefix=="SUMOFF" && isbarrel) title = "Total number of errors per Ladder";
-		else if(prefix=="SUMOFF" && !isbarrel) title = "Total number of errors per Blade";
-		else title = "Total number of errors per Module";
-	      }else{
-		if(prefix=="SUMOFF") title = "Mean " + sname.substr(7,(sname.find("_",7)-7)) + (isbarrel?" per Ladder":" per Blade"); 
-		else title = "Mean " + sname.substr(7,(sname.find("_",7)-7)) + " per Module"; 
-	      }
-	      (*isum)->setAxisTitle(title,2);
-	    }
-	    break;
-	  }
-	}
+      vector<string> contents = iGetter.getMEs();
+
+      for (vector<MonitorElement *>::const_iterator isum = sum_mes.begin(); isum != sum_mes.end(); isum++) {
+        for (vector<string>::const_iterator im = contents.begin(); im != contents.end(); im++) {
+          string sname = ((*isum)->getName());
+          string tname = " ";
+          tname = sname.substr(7, (sname.find("_", 7) - 6));
+          if (sname.find("ALLMODS_adcCOMB_") != string::npos)
+            tname = "adc_";
+          if (sname.find("ALLMODS_chargeCOMB_") != string::npos)
+            tname = "charge_";
+          if (sname.find("_charge_") != string::npos && sname.find("Track_") == string::npos)
+            tname = "charge_";
+          if (sname.find("_nclusters_") != string::npos && sname.find("Track_") == string::npos)
+            tname = "nclusters_";
+          if (sname.find("_size_") != string::npos && sname.find("Track_") == string::npos)
+            tname = "size_";
+          if (sname.find("_charge_OffTrack_") != string::npos)
+            tname = "charge_OffTrack_";
+          if (sname.find("_nclusters_OffTrack_") != string::npos)
+            tname = "nclusters_OffTrack_";
+          if (sname.find("_size_OffTrack_") != string::npos)
+            tname = "size_OffTrack_";
+          if (sname.find("_sizeX_OffTrack_") != string::npos)
+            tname = "sizeX_OffTrack_";
+          if (sname.find("_sizeY_OffTrack_") != string::npos)
+            tname = "sizeY_OffTrack_";
+          if (sname.find("_charge_OnTrack_") != string::npos)
+            tname = "charge_OnTrack_";
+          if (sname.find("_nclusters_OnTrack_") != string::npos)
+            tname = "nclusters_OnTrack_";
+          if (sname.find("_size_OnTrack_") != string::npos)
+            tname = "size_OnTrack_";
+          if (sname.find("_sizeX_OnTrack_") != string::npos)
+            tname = "sizeX_OnTrack_";
+          if (sname.find("_sizeY_OnTrack_") != string::npos)
+            tname = "sizeY_OnTrack_";
+          if (tname.find("FREQ") != string::npos)
+            tname = "ndigis_";
+          if (((*im)).find(tname) == 0) {
+            string fullpathname = iBooker.pwd() + "/" + (*im);
+            MonitorElement *me = iGetter.get(fullpathname);
+
+            if (me) {
+              if (sname.find("_charge") != string::npos && sname.find("Track_") == string::npos &&
+                  me->getName().find("Track_") != string::npos)
+                continue;
+              if (sname.find("_nclusters_") != string::npos && sname.find("Track_") == string::npos &&
+                  me->getName().find("Track_") != string::npos)
+                continue;
+              if (sname.find("_size") != string::npos && sname.find("Track_") == string::npos &&
+                  me->getName().find("Track_") != string::npos)
+                continue;
+              // fill summary histos:
+              if (sname.find("_RMS_") != string::npos && sname.find("GainDynamicRange2d") == string::npos &&
+                  sname.find("GainSaturate2d") == string::npos) {
+                (*isum)->Fill(ndet, me->getRMS());
+              } else if (sname.find("GainDynamicRange2d") != string::npos ||
+                         sname.find("GainSaturate2d") != string::npos) {
+                float SumOfEntries = 0.;
+                float SumOfSquaredEntries = 0.;
+                int SumOfPixels = 0;
+                for (int cols = 1; cols != me->getNbinsX() + 1; cols++)
+                  for (int rows = 1; rows != me->getNbinsY() + 1; rows++) {
+                    SumOfEntries += me->getBinContent(cols, rows);
+                    SumOfSquaredEntries += (me->getBinContent(cols, rows)) * (me->getBinContent(cols, rows));
+                    SumOfPixels++;
+                  }
+
+                float MeanInZ = SumOfEntries / float(SumOfPixels);
+                float RMSInZ = sqrt(SumOfSquaredEntries / float(SumOfPixels));
+                if (sname.find("_mean_") != string::npos)
+                  (*isum)->Fill(ndet, MeanInZ);
+                if (sname.find("_RMS_") != string::npos)
+                  (*isum)->Fill(ndet, RMSInZ);
+              } else if (sname.find("_FracOfPerfectPix_") != string::npos) {
+                float nlast = me->getBinContent(me->getNbinsX());
+                float nall = (me->getTH1F())->Integral(1, 11);
+                (*isum)->Fill(ndet, nlast / nall);
+              } else if (sname.find("_NCalibErrors_") != string::npos || sname.find("FREQ_") != string::npos) {
+                float nall = me->getEntries();
+                (*isum)->Fill(ndet, nall);
+              } else if (sname.find("GainFitResult2d") != string::npos) {
+                int NegFitPixels = 0;
+                for (int cols = 1; cols != me->getNbinsX() + 1; cols++)
+                  for (int rows = 1; rows != me->getNbinsY() + 1; rows++) {
+                    if (me->getBinContent(cols, rows) < 0.)
+                      NegFitPixels++;
+                  }
+                (*isum)->Fill(ndet, float(NegFitPixels));
+              } else if (sname.find("ALLMODS_adcCOMB_") != string::npos ||
+                         (sname.find("ALLMODS_chargeCOMB_") != string::npos &&
+                          me->getName().find("Track_") == string::npos)) {
+                (*isum)->getTH1F()->Add(me->getTH1F());
+              } else if (sname.find("_NErrors_") != string::npos) {
+                string path1 = fullpathname;
+                path1 = path1.replace(path1.find("NErrors"), 7, "errorType");
+                MonitorElement *me1 = iGetter.get(path1);
+                bool notReset = true;
+                if (me1) {
+                  for (int jj = 1; jj < 16; jj++) {
+                    if (me1->getBinContent(jj) > 0.) {
+                      if (jj == 6) {  // errorType=30 (reset)
+                        string path2 = path1;
+                        path2 = path2.replace(path2.find("errorType"), 9, "TBMMessage");
+                        MonitorElement *me2 = iGetter.get(path2);
+                        if (me2)
+                          if (me2->getBinContent(6) > 0. || me2->getBinContent(7) > 0.)
+                            notReset = false;
+                      }
+                    }
+                  }
+                }
+                if (notReset)
+                  (*isum)->Fill(ndet, me1->getEntries());
+              } else if ((sname.find("_charge_") != string::npos && sname.find("Track_") == string::npos &&
+                          me->getName().find("Track_") == string::npos) ||
+                         (sname.find("_charge_") != string::npos && sname.find("_OnTrack_") != string::npos &&
+                          me->getName().find("_OnTrack_") != string::npos) ||
+                         (sname.find("_charge_") != string::npos && sname.find("_OffTrack_") != string::npos &&
+                          me->getName().find("_OffTrack_") != string::npos) ||
+                         (sname.find("_nclusters_") != string::npos && sname.find("Track_") == string::npos &&
+                          me->getName().find("Track_") == string::npos) ||
+                         (sname.find("_nclusters_") != string::npos && sname.find("_OnTrack_") != string::npos &&
+                          me->getName().find("_OnTrack_") != string::npos) ||
+                         (sname.find("_nclusters_") != string::npos && sname.find("_OffTrack_") != string::npos &&
+                          me->getName().find("_OffTrack_") != string::npos) ||
+                         (sname.find("_size") != string::npos && sname.find("Track_") == string::npos &&
+                          me->getName().find("Track_") == string::npos) ||
+                         (sname.find("_size") != string::npos && sname.find("_OnTrack_") != string::npos &&
+                          me->getName().find("_OnTrack_") != string::npos) ||
+                         (sname.find("_size") != string::npos && sname.find("_OffTrack_") != string::npos &&
+                          me->getName().find("_OffTrack_") != string::npos)) {
+                (*isum)->Fill(ndet, me->getMean());
+              } else if (sname.find("_charge_") == string::npos && sname.find("_nclusters_") == string::npos &&
+                         sname.find("_size") == string::npos) {
+                (*isum)->Fill(ndet, me->getMean());
+              }
+
+              // set titles:
+              if (prefix == "SUMOFF") {
+                (*isum)->setAxisTitle(isbarrel ? "Ladders" : "Blades", 1);
+              } else if (sname.find("ALLMODS_adcCOMB_") != string::npos) {
+                (*isum)->setAxisTitle("Digi charge [ADC]", 1);
+              } else if (sname.find("ALLMODS_chargeCOMB_") != string::npos) {
+                (*isum)->setAxisTitle("Cluster charge [kilo electrons]", 1);
+              } else {
+                (*isum)->setAxisTitle("Modules", 1);
+              }
+              string title = " ";
+              if (sname.find("_RMS_") != string::npos) {
+                title = "RMS of " + sname.substr(7, (sname.find("_", 7) - 7)) + " per module";
+              } else if (sname.find("_FracOfPerfectPix_") != string::npos) {
+                title = "FracOfPerfectPix " + sname.substr(7, (sname.find("_", 7) - 7)) + " per module";
+              } else if (sname.find("_NCalibErrors_") != string::npos) {
+                title = "Number of CalibErrors " + sname.substr(7, (sname.find("_", 7) - 7)) + " per module";
+              } else if (sname.find("_NNegativeFits_") != string::npos) {
+                title = "Number of pixels with neg. fit result " + sname.substr(7, (sname.find("_", 7) - 7)) +
+                        " per module";
+              } else if (sname.find("FREQ_") != string::npos) {
+                title = "NEvents with digis per module";
+              } else if (sname.find("ALLMODS_adcCOMB_") != string::npos) {
+                title = "NDigis";
+              } else if (sname.find("ALLMODS_chargeCOMB_") != string::npos) {
+                title = "NClusters";
+              } else if (sname.find("_NErrors_") != string::npos) {
+                if (prefix == "SUMOFF" && isbarrel)
+                  title = "Total number of errors per Ladder";
+                else if (prefix == "SUMOFF" && !isbarrel)
+                  title = "Total number of errors per Blade";
+                else
+                  title = "Total number of errors per Module";
+              } else {
+                if (prefix == "SUMOFF")
+                  title =
+                      "Mean " + sname.substr(7, (sname.find("_", 7) - 7)) + (isbarrel ? " per Ladder" : " per Blade");
+                else
+                  title = "Mean " + sname.substr(7, (sname.find("_", 7) - 7)) + " per Module";
+              }
+              (*isum)->setAxisTitle(title, 2);
+            }
+            break;
+          }
+        }
       }
       iBooker.goUp();
       iGetter.setCurrentFolder(iBooker.pwd());
-      if(dir_name.find("Blade") == 0) {
-	iBooker.goUp(); // Going up a second time if we are processing the Blade
-	iGetter.setCurrentFolder(iBooker.pwd());
+      if (dir_name.find("Blade") == 0) {
+        iBooker.goUp();  // Going up a second time if we are processing the Blade
+        iGetter.setCurrentFolder(iBooker.pwd());
       }
-    } // end for it (subdirs)
-  } else {  
+    }  // end for it (subdirs)
+  } else {
     vector<string> subdirs = iGetter.getSubdirs();
     // printing cout << "#\t" << iBooker.pwd() << endl;
-    if(isbarrel)
-      {
-			
-	for (vector<string>::const_iterator it = subdirs.begin();
-	     it != subdirs.end(); it++) {
-	  //				 cout << "##\t" << iBooker.pwd() << "\t" << (*it) << endl;
-	  if((iBooker.pwd()).find("Endcap")!=string::npos ||
-	     (iBooker.pwd()).find("AdditionalPixelErrors")!=string::npos) {
-	    iBooker.goUp();
-	    iGetter.setCurrentFolder(iBooker.pwd());
-	  }
-	  iBooker.cd(*it);
-	  iGetter.cd(*it);
-	  if((*it).find("Endcap")!=string::npos ||
-	     (*it).find("AdditionalPixelErrors")!=string::npos) continue;
-	  fillSummary(iBooker, iGetter, dir_name, me_names, true, isUpgrade); // Barrel
-	  iBooker.goUp();
-	  iGetter.setCurrentFolder(iBooker.pwd());
-	}
-	string grandbarrel_structure_name;
-	vector<string> grandbarrel_me_names;
-	if (!configParser_->getMENamesForGrandBarrelSummary(grandbarrel_structure_name, grandbarrel_me_names)){
-	  cout << "SiPixelActionExecutor::createSummary: Failed to read Grand Barrel Summary configuration parameters!! ";
-	  return;
-	}
-	fillGrandBarrelSummaryHistos(iBooker, iGetter, grandbarrel_me_names, isUpgrade);
-			
+    if (isbarrel) {
+      for (vector<string>::const_iterator it = subdirs.begin(); it != subdirs.end(); it++) {
+        //				 cout << "##\t" << iBooker.pwd() << "\t"
+        //<<
+        //(*it) << endl;
+        if ((iBooker.pwd()).find("Endcap") != string::npos ||
+            (iBooker.pwd()).find("AdditionalPixelErrors") != string::npos) {
+          iBooker.goUp();
+          iGetter.setCurrentFolder(iBooker.pwd());
+        }
+        iBooker.cd(*it);
+        iGetter.cd(*it);
+        if ((*it).find("Endcap") != string::npos || (*it).find("AdditionalPixelErrors") != string::npos)
+          continue;
+        fillSummary(iBooker, iGetter, dir_name, me_names, true,
+                    isUpgrade);  // Barrel
+        iBooker.goUp();
+        iGetter.setCurrentFolder(iBooker.pwd());
+      }
+      string grandbarrel_structure_name;
+      vector<string> grandbarrel_me_names;
+      if (!configParser_->getMENamesForGrandBarrelSummary(grandbarrel_structure_name, grandbarrel_me_names)) {
+        cout << "SiPixelActionExecutor::createSummary: Failed to read Grand "
+                "Barrel Summary configuration parameters!! ";
+        return;
       }
-    else // Endcap
-      {
-			
-	for (vector<string>::const_iterator it = subdirs.begin();
-	     it != subdirs.end(); it++) {
-	  if((iBooker.pwd()).find("Barrel")!=string::npos ||
-	     (iBooker.pwd()).find("AdditionalPixelErrors")!=string::npos){
-	    iBooker.goUp();
-	    iGetter.setCurrentFolder(iBooker.pwd());
-	  }
-	  iBooker.cd(*it);
-	  iGetter.cd(*it);
-	  if ((*it).find("Barrel")!=string::npos ||
-	      (*it).find("AdditionalPixelErrors")!=string::npos) continue;
-	  fillSummary(iBooker, iGetter, dir_name, me_names, false, isUpgrade); // Endcap
-	  iBooker.goUp();
-	  iGetter.setCurrentFolder(iBooker.pwd());
-	}
-	string grandendcap_structure_name;
-	vector<string> grandendcap_me_names;
-	if (!configParser_->getMENamesForGrandEndcapSummary(grandendcap_structure_name, grandendcap_me_names)){
-	  cout << "SiPixelActionExecutor::createSummary: Failed to read Grand Endcap Summary configuration parameters!! ";
-	  return;
-	}
-	fillGrandEndcapSummaryHistos(iBooker, iGetter, grandendcap_me_names, isUpgrade);
-			
-			
+      fillGrandBarrelSummaryHistos(iBooker, iGetter, grandbarrel_me_names, isUpgrade);
+
+    } else  // Endcap
+    {
+      for (vector<string>::const_iterator it = subdirs.begin(); it != subdirs.end(); it++) {
+        if ((iBooker.pwd()).find("Barrel") != string::npos ||
+            (iBooker.pwd()).find("AdditionalPixelErrors") != string::npos) {
+          iBooker.goUp();
+          iGetter.setCurrentFolder(iBooker.pwd());
+        }
+        iBooker.cd(*it);
+        iGetter.cd(*it);
+        if ((*it).find("Barrel") != string::npos || (*it).find("AdditionalPixelErrors") != string::npos)
+          continue;
+        fillSummary(iBooker, iGetter, dir_name, me_names, false,
+                    isUpgrade);  // Endcap
+        iBooker.goUp();
+        iGetter.setCurrentFolder(iBooker.pwd());
       }
+      string grandendcap_structure_name;
+      vector<string> grandendcap_me_names;
+      if (!configParser_->getMENamesForGrandEndcapSummary(grandendcap_structure_name, grandendcap_me_names)) {
+        cout << "SiPixelActionExecutor::createSummary: Failed to read Grand "
+                "Endcap Summary configuration parameters!! ";
+        return;
+      }
+      fillGrandEndcapSummaryHistos(iBooker, iGetter, grandendcap_me_names, isUpgrade);
+    }
   }
-//  cout<<"...leaving SiPixelActionExecutor::fillSummary!"<<endl;
-	
+  //  cout<<"...leaving SiPixelActionExecutor::fillSummary!"<<endl;
 }
 
 //=============================================================================================================
-void SiPixelActionExecutor::fillFEDErrorSummary(DQMStore::IBooker& iBooker,
-						DQMStore::IGetter& iGetter,
+void SiPixelActionExecutor::fillFEDErrorSummary(DQMStore::IBooker &iBooker,
+                                                DQMStore::IGetter &iGetter,
                                                 string dir_name,
-						vector<string>& me_names) {
-  //printing cout<<"entering SiPixelActionExecutor::fillFEDErrorSummary..."<<endl;
+                                                vector<string> &me_names) {
+  // printing cout<<"entering
+  // SiPixelActionExecutor::fillFEDErrorSummary..."<<endl;
   string currDir = iBooker.pwd();
   string prefix;
-  if(source_type_==0) prefix="SUMRAW";
-  else if(source_type_==20) prefix="SUMOFF";
-  
-  if (currDir.find(dir_name) != string::npos)  {
-    vector<MonitorElement*> sum_mes;
-    for (vector<string>::const_iterator iv = me_names.begin();
-	 iv != me_names.end(); iv++) {
+  if (source_type_ == 0)
+    prefix = "SUMRAW";
+  else if (source_type_ == 20)
+    prefix = "SUMOFF";
+
+  if (currDir.find(dir_name) != string::npos) {
+    vector<MonitorElement *> sum_mes;
+    for (vector<string>::const_iterator iv = me_names.begin(); iv != me_names.end(); iv++) {
       bool isBooked = false;
       vector<string> contents = iGetter.getMEs();
       for (vector<string>::const_iterator im = contents.begin(); im != contents.end(); im++)
-        if ((*im).find(*iv) != string::npos) isBooked = true;
-      if(source_type_==5||source_type_==6){
-	if((*iv)=="errorType"||(*iv)=="NErrors"||(*iv)=="fullType"||(*iv)=="chanNmbr"||
-	   (*iv)=="TBMType"||(*iv)=="EvtNbr"||(*iv)=="evtSize"||(*iv)=="linkId"||
-	   (*iv)=="ROCId"||(*iv)=="DCOLId"||(*iv)=="PXId"||(*iv)=="ROCNmbr"||
-	   (*iv)=="TBMMessage"||(*iv)=="Type36Hitmap"||
-	   (*iv)=="FedChLErr"||(*iv)=="FedChNErr"||(*iv)=="FedETypeNErr") 
-	  prefix="SUMRAW";
+        if ((*im).find(*iv) != string::npos)
+          isBooked = true;
+      if (source_type_ == 5 || source_type_ == 6) {
+        if ((*iv) == "errorType" || (*iv) == "NErrors" || (*iv) == "fullType" || (*iv) == "chanNmbr" ||
+            (*iv) == "TBMType" || (*iv) == "EvtNbr" || (*iv) == "evtSize" || (*iv) == "linkId" || (*iv) == "ROCId" ||
+            (*iv) == "DCOLId" || (*iv) == "PXId" || (*iv) == "ROCNmbr" || (*iv) == "TBMMessage" ||
+            (*iv) == "Type36Hitmap" || (*iv) == "FedChLErr" || (*iv) == "FedChNErr" || (*iv) == "FedETypeNErr")
+          prefix = "SUMRAW";
       }
-      if((*iv)=="errorType"||(*iv)=="NErrors"||(*iv)=="fullType"||(*iv)=="chanNmbr"||
-	 (*iv)=="TBMType"||(*iv)=="EvtNbr"||(*iv)=="evtSize"||(*iv)=="linkId"||
-	 (*iv)=="ROCId"||(*iv)=="DCOLId"||(*iv)=="PXId"||(*iv)=="ROCNmbr"||
-	 (*iv)=="TBMMessage"||(*iv)=="Type36Hitmap"){
+      if ((*iv) == "errorType" || (*iv) == "NErrors" || (*iv) == "fullType" || (*iv) == "chanNmbr" ||
+          (*iv) == "TBMType" || (*iv) == "EvtNbr" || (*iv) == "evtSize" || (*iv) == "linkId" || (*iv) == "ROCId" ||
+          (*iv) == "DCOLId" || (*iv) == "PXId" || (*iv) == "ROCNmbr" || (*iv) == "TBMMessage" ||
+          (*iv) == "Type36Hitmap") {
         string tag = prefix + "_" + (*iv) + "_FEDErrors";
-        MonitorElement* temp = getFEDSummaryME(iBooker, iGetter, tag);
+        MonitorElement *temp = getFEDSummaryME(iBooker, iGetter, tag);
         sum_mes.push_back(temp);
-      }else if((*iv)=="FedChLErr"||(*iv)=="FedChNErr"||(*iv)=="FedETypeNErr"){
+      } else if ((*iv) == "FedChLErr" || (*iv) == "FedChNErr" || (*iv) == "FedETypeNErr") {
         string tag = prefix + "_" + (*iv);
-	MonitorElement* temp;
-	if((*iv)=="FedChLErr") {if (!isBooked) temp = iBooker.book2D("FedChLErr","Type of last error",40,-0.5,39.5,37,0.,37.);
-	  else{ 
-	    string fullpathname = iBooker.pwd() + "/" + (*iv);
-	    temp = iGetter.get(fullpathname);
-	    temp->Reset();}}  //If I don't reset this one, then I instead start adding error codes..
-	if((*iv)=="FedChNErr") {if (!isBooked) temp = iBooker.book2D("FedChNErr","Total number of errors",40,-0.5,39.5,37,0.,37.);
-	  else{ 
-	    string fullpathname = iBooker.pwd() + "/" + (*iv);
-	    temp = iGetter.get(fullpathname);
-	    temp->Reset();}}  //If I don't reset this one, then I instead start adding error codes..
-	if((*iv)=="FedETypeNErr"){
-	  if(!isBooked){
-	    temp = iBooker.book2D("FedETypeNErr","Number of each error type",40,-0.5,39.5,21,0.,21.);
-	    temp->setBinLabel(1,"ROC of 25",2);
-	    temp->setBinLabel(2,"Gap word",2);
-	    temp->setBinLabel(3,"Dummy word",2);
-	    temp->setBinLabel(4,"FIFO full",2);
-	    temp->setBinLabel(5,"Timeout",2);
-	    temp->setBinLabel(6,"Stack full",2);
-	    temp->setBinLabel(7,"Pre-cal issued",2);
-	    temp->setBinLabel(8,"Trigger clear or sync",2);
-	    temp->setBinLabel(9,"No token bit",2);
-	    temp->setBinLabel(10,"Overflow",2);
-	    temp->setBinLabel(11,"FSM error",2);
-	    temp->setBinLabel(12,"Invalid #ROCs",2);
-	    temp->setBinLabel(13,"Event number",2);
-	    temp->setBinLabel(14,"Slink header",2);
-	    temp->setBinLabel(15,"Slink trailer",2);
-	    temp->setBinLabel(16,"Event size",2);
-	    temp->setBinLabel(17,"Invalid channel#",2);
-	    temp->setBinLabel(18,"ROC value",2);
-	    temp->setBinLabel(19,"Dcol or pixel value",2);
-	    temp->setBinLabel(20,"Readout order",2);
-	    temp->setBinLabel(21,"CRC error",2);
-	  }
-	  else{
-	    string fullpathname = iBooker.pwd() + "/" + (*iv);
-	    temp = iGetter.get(fullpathname);
-	    temp->Reset();}  //If I don't reset this one, then I instead start adding error codes..
-	}
-	sum_mes.push_back(temp);
+        MonitorElement *temp;
+        if ((*iv) == "FedChLErr") {
+          if (!isBooked)
+            temp = iBooker.book2D("FedChLErr", "Type of last error", 40, -0.5, 39.5, 37, 0., 37.);
+          else {
+            string fullpathname = iBooker.pwd() + "/" + (*iv);
+            temp = iGetter.get(fullpathname);
+            temp->Reset();
+          }
+        }  // If I don't reset this one, then I instead start adding error
+        // codes..
+        if ((*iv) == "FedChNErr") {
+          if (!isBooked)
+            temp = iBooker.book2D("FedChNErr", "Total number of errors", 40, -0.5, 39.5, 37, 0., 37.);
+          else {
+            string fullpathname = iBooker.pwd() + "/" + (*iv);
+            temp = iGetter.get(fullpathname);
+            temp->Reset();
+          }
+        }  // If I don't reset this one, then I instead start adding error
+        // codes..
+        if ((*iv) == "FedETypeNErr") {
+          if (!isBooked) {
+            temp = iBooker.book2D("FedETypeNErr", "Number of each error type", 40, -0.5, 39.5, 21, 0., 21.);
+            temp->setBinLabel(1, "ROC of 25", 2);
+            temp->setBinLabel(2, "Gap word", 2);
+            temp->setBinLabel(3, "Dummy word", 2);
+            temp->setBinLabel(4, "FIFO full", 2);
+            temp->setBinLabel(5, "Timeout", 2);
+            temp->setBinLabel(6, "Stack full", 2);
+            temp->setBinLabel(7, "Pre-cal issued", 2);
+            temp->setBinLabel(8, "Trigger clear or sync", 2);
+            temp->setBinLabel(9, "No token bit", 2);
+            temp->setBinLabel(10, "Overflow", 2);
+            temp->setBinLabel(11, "FSM error", 2);
+            temp->setBinLabel(12, "Invalid #ROCs", 2);
+            temp->setBinLabel(13, "Event number", 2);
+            temp->setBinLabel(14, "Slink header", 2);
+            temp->setBinLabel(15, "Slink trailer", 2);
+            temp->setBinLabel(16, "Event size", 2);
+            temp->setBinLabel(17, "Invalid channel#", 2);
+            temp->setBinLabel(18, "ROC value", 2);
+            temp->setBinLabel(19, "Dcol or pixel value", 2);
+            temp->setBinLabel(20, "Readout order", 2);
+            temp->setBinLabel(21, "CRC error", 2);
+          } else {
+            string fullpathname = iBooker.pwd() + "/" + (*iv);
+            temp = iGetter.get(fullpathname);
+            temp->Reset();
+          }  // If I don't reset this one, then I instead start adding error
+             // codes..
+        }
+        sum_mes.push_back(temp);
       }
     }
     if (sum_mes.empty()) {
-      edm::LogInfo("SiPixelActionExecutor") << " Summary MEs can not be created" << "\n" ;
+      edm::LogInfo("SiPixelActionExecutor") << " Summary MEs can not be created"
+                                            << "\n";
       return;
     }
     vector<string> subdirs = iGetter.getSubdirs();
     int ndet = 0;
-    for (vector<string>::const_iterator it = subdirs.begin();
-	 it != subdirs.end(); it++) {
-      if ( (*it).find("FED_") == string::npos) continue;
+    for (vector<string>::const_iterator it = subdirs.begin(); it != subdirs.end(); it++) {
+      if ((*it).find("FED_") == string::npos)
+        continue;
       iBooker.cd(*it);
       iGetter.cd(*it);
-      string fedid = (*it).substr((*it).find("_")+1);
+      string fedid = (*it).substr((*it).find("_") + 1);
       std::istringstream isst;
       isst.str(fedid);
-      isst>>ndet; ndet++;
-      vector<string> contents = iGetter.getMEs(); 
-			
-      for (vector<MonitorElement*>::const_iterator isum = sum_mes.begin();
-	   isum != sum_mes.end(); isum++) {
-	for (vector<string>::const_iterator im = contents.begin();
-	     im != contents.end(); im++) {
-	  if(((*im).find("FedChNErr")!=std::string::npos && (*isum)->getName().find("FedChNErr")!=std::string::npos) ||
-	     ((*im).find("FedChLErr")!=std::string::npos && (*isum)->getName().find("FedChLErr")!=std::string::npos) ||
-	     ((*im).find("FedETypeNErr")!=std::string::npos && (*isum)->getName().find("FedETypeNErr")!=std::string::npos)){
-	    string fullpathname = iBooker.pwd() + "/" + (*im); 
-	    MonitorElement *  me = iGetter.get(fullpathname);
-	    if(me){
-	      for(int i=0; i!=37; i++){
-                if((*im).find("FedETypeNErr")!=std::string::npos && i<21) (*isum)->Fill(ndet-1,i,me->getBinContent(i+1));
-                else (*isum)->Fill(ndet-1,i,me->getBinContent(i+1));
-	      }
-	    }
-	  }
-	  string sname = ((*isum)->getName());
-	  string tname = " ";
-	  tname = sname.substr(7,(sname.find("_",7)-6));
-	  if (((*im)).find(tname) == 0) {
-	    string fullpathname = iBooker.pwd() + "/" + (*im); 
-	    MonitorElement *  me = iGetter.get(fullpathname);
-						
-	    if (me){ 
-	      if(me->getMean()>0.){
-	        if (sname.find("_NErrors_")!=string::npos){
-	          string path1 = fullpathname;
-		  path1 = path1.replace(path1.find("NErrors"),7,"errorType");
-		  MonitorElement * me1 = iGetter.get(path1);
-		  bool notReset=true;
-	          if(me1){
-	            for(int jj=1; jj<16; jj++){
-	              if(me1->getBinContent(jj)>0.){
-	                if(jj==6){ //errorType=30 (reset)
-	                  string path2 = path1;
-			  path2 = path2.replace(path2.find("errorType"),9,"TBMMessage");
-	                  MonitorElement * me2 = iGetter.get(path2);
-	                  if(me2) if(me2->getBinContent(6)>0. || me2->getBinContent(7)>0.) notReset=false; 
-		        }
-		      }
-		    }
-		  }
-		  if(notReset) (*isum)->setBinContent(ndet, (*isum)->getBinContent(ndet) + me1->getEntries());
-	        }else (*isum)->setBinContent(ndet, (*isum)->getBinContent(ndet) + me->getEntries());
-	      }
-	      (*isum)->setAxisTitle("FED #",1);
-	      string title = " ";
-	      title = sname.substr(7,(sname.find("_",7)-7)) + " per FED"; 
-	      (*isum)->setAxisTitle(title,2);
-	    }
-	    break;
-	  }
-	}
+      isst >> ndet;
+      ndet++;
+      vector<string> contents = iGetter.getMEs();
+
+      for (vector<MonitorElement *>::const_iterator isum = sum_mes.begin(); isum != sum_mes.end(); isum++) {
+        for (vector<string>::const_iterator im = contents.begin(); im != contents.end(); im++) {
+          if (((*im).find("FedChNErr") != std::string::npos &&
+               (*isum)->getName().find("FedChNErr") != std::string::npos) ||
+              ((*im).find("FedChLErr") != std::string::npos &&
+               (*isum)->getName().find("FedChLErr") != std::string::npos) ||
+              ((*im).find("FedETypeNErr") != std::string::npos &&
+               (*isum)->getName().find("FedETypeNErr") != std::string::npos)) {
+            string fullpathname = iBooker.pwd() + "/" + (*im);
+            MonitorElement *me = iGetter.get(fullpathname);
+            if (me) {
+              for (int i = 0; i != 37; i++) {
+                if ((*im).find("FedETypeNErr") != std::string::npos && i < 21)
+                  (*isum)->Fill(ndet - 1, i, me->getBinContent(i + 1));
+                else
+                  (*isum)->Fill(ndet - 1, i, me->getBinContent(i + 1));
+              }
+            }
+          }
+          string sname = ((*isum)->getName());
+          string tname = " ";
+          tname = sname.substr(7, (sname.find("_", 7) - 6));
+          if (((*im)).find(tname) == 0) {
+            string fullpathname = iBooker.pwd() + "/" + (*im);
+            MonitorElement *me = iGetter.get(fullpathname);
+
+            if (me) {
+              if (me->getMean() > 0.) {
+                if (sname.find("_NErrors_") != string::npos) {
+                  string path1 = fullpathname;
+                  path1 = path1.replace(path1.find("NErrors"), 7, "errorType");
+                  MonitorElement *me1 = iGetter.get(path1);
+                  bool notReset = true;
+                  if (me1) {
+                    for (int jj = 1; jj < 16; jj++) {
+                      if (me1->getBinContent(jj) > 0.) {
+                        if (jj == 6) {  // errorType=30 (reset)
+                          string path2 = path1;
+                          path2 = path2.replace(path2.find("errorType"), 9, "TBMMessage");
+                          MonitorElement *me2 = iGetter.get(path2);
+                          if (me2)
+                            if (me2->getBinContent(6) > 0. || me2->getBinContent(7) > 0.)
+                              notReset = false;
+                        }
+                      }
+                    }
+                  }
+                  if (notReset)
+                    (*isum)->setBinContent(ndet, (*isum)->getBinContent(ndet) + me1->getEntries());
+                } else
+                  (*isum)->setBinContent(ndet, (*isum)->getBinContent(ndet) + me->getEntries());
+              }
+              (*isum)->setAxisTitle("FED #", 1);
+              string title = " ";
+              title = sname.substr(7, (sname.find("_", 7) - 7)) + " per FED";
+              (*isum)->setAxisTitle(title, 2);
+            }
+            break;
+          }
+        }
       }
       iBooker.goUp();
       iGetter.setCurrentFolder(iBooker.pwd());
     }
-  } else {  
+  } else {
     vector<string> subdirs = iGetter.getSubdirs();
-    for (vector<string>::const_iterator it = subdirs.begin();
-	 it != subdirs.end(); it++) {
-      if((*it).find("Endcap")!=string::npos ||
-	 (*it).find("Barrel")!=string::npos) continue;
+    for (vector<string>::const_iterator it = subdirs.begin(); it != subdirs.end(); it++) {
+      if ((*it).find("Endcap") != string::npos || (*it).find("Barrel") != string::npos)
+        continue;
       iBooker.cd(*it);
       iGetter.cd(*it);
-      fillFEDErrorSummary(iBooker,iGetter, dir_name, me_names);
+      fillFEDErrorSummary(iBooker, iGetter, dir_name, me_names);
       iBooker.goUp();
       iGetter.setCurrentFolder(iBooker.pwd());
     }
   }
-  //printing cout<<"...leaving SiPixelActionExecutor::fillFEDErrorSummary!"<<endl;
+  // printing cout<<"...leaving
+  // SiPixelActionExecutor::fillFEDErrorSummary!"<<endl;
 }
 
-
 //=============================================================================================================
-void SiPixelActionExecutor::fillGrandBarrelSummaryHistos(DQMStore::IBooker & iBooker,
-							 DQMStore::IGetter & iGetter,
-                                                         vector<string>& me_names,
+void SiPixelActionExecutor::fillGrandBarrelSummaryHistos(DQMStore::IBooker &iBooker,
+                                                         DQMStore::IGetter &iGetter,
+                                                         vector<string> &me_names,
                                                          bool isUpgrade) {
-//  cout<<"Entering SiPixelActionExecutor::fillGrandBarrelSummaryHistos...:"<<me_names.size()<<endl;
-  vector<MonitorElement*> gsum_mes;
+  //  cout<<"Entering
+  //  SiPixelActionExecutor::fillGrandBarrelSummaryHistos...:"<<me_names.size()<<endl;
+  vector<MonitorElement *> gsum_mes;
   string currDir = iBooker.pwd();
   string path_name = iBooker.pwd();
-  string dir_name =  path_name.substr(path_name.find_last_of("/")+1);
-  if ((dir_name.find("DQMData") == 0) ||
-      (dir_name.find("Pixel") == 0) ||
-      (dir_name.find("AdditionalPixelErrors") == 0) ||
-      (dir_name.find("Endcap") == 0) ||
-      (dir_name.find("HalfCylinder") == 0) ||
-      (dir_name.find("Disk") == 0) ||
-      (dir_name.find("Blade") == 0) ||
-      (dir_name.find("Panel") == 0) ) return;
+  string dir_name = path_name.substr(path_name.find_last_of("/") + 1);
+  if ((dir_name.find("DQMData") == 0) || (dir_name.find("Pixel") == 0) ||
+      (dir_name.find("AdditionalPixelErrors") == 0) || (dir_name.find("Endcap") == 0) ||
+      (dir_name.find("HalfCylinder") == 0) || (dir_name.find("Disk") == 0) || (dir_name.find("Blade") == 0) ||
+      (dir_name.find("Panel") == 0))
+    return;
   vector<string> subdirs = iGetter.getSubdirs();
   int nDirs = subdirs.size();
-  int iDir =0;
+  int iDir = 0;
   int nbin = 0;
-  int nbin_i = 0; 
-  int nbin_subdir = 0; 
-  int cnt=0;
+  int nbin_i = 0;
+  int nbin_subdir = 0;
+  int cnt = 0;
   bool first_subdir = true;
-  for (vector<string>::const_iterator it = subdirs.begin();
-       it != subdirs.end(); it++) {
+  for (vector<string>::const_iterator it = subdirs.begin(); it != subdirs.end(); it++) {
     cnt++;
     iBooker.cd(*it);
     iGetter.cd(*it);
     vector<string> contents = iGetter.getMEs();
-		
+
     iBooker.goUp();
     iGetter.setCurrentFolder(iBooker.pwd());
-		
+
     string prefix;
-    if(source_type_==0) prefix="SUMRAW";
-    else if (source_type_==1) prefix="SUMDIG";
-    else if (source_type_==2) prefix="SUMCLU";
-    else if (source_type_==3) prefix="SUMTRK";
-    else if (source_type_==4) prefix="SUMHIT";
-    else if (source_type_>=7 && source_type_<20) prefix="SUMCAL";
-    else if (source_type_==20) prefix="SUMOFF";
-    
-		
-    for (vector<string>::const_iterator im = contents.begin();
-	 im != contents.end(); im++) {
-      for (vector<string>::const_iterator iv = me_names.begin();
-	   iv != me_names.end(); iv++) {
-	string var = "_" + (*iv) + "_";
-	if ((*im).find(var) != string::npos) {
-	  if((var=="_charge_" || var=="_nclusters_" || var=="_size_" || var=="_sizeX_" || var=="_sizeY_") && 
-	     (*im).find("Track_")!=string::npos) continue;
-	  string full_path = (*it) + "/" +(*im);
-	  MonitorElement * me = iGetter.get(full_path);
-	  if (!me) continue; 
-	  if(source_type_==5||source_type_==6){
-	    if((*iv)=="errorType"||(*iv)=="NErrors"||(*iv)=="fullType"||(*iv)=="chanNmbr"||
-	       (*iv)=="TBMType"||(*iv)=="EvtNbr"||(*iv)=="evtSize"||(*iv)=="linkId"||
-	       (*iv)=="ROCId"||(*iv)=="DCOLId"||(*iv)=="PXId"||(*iv)=="ROCNmbr"||
-	       (*iv)=="TBMMessage"||(*iv)=="Type36Hitmap") 
-	      prefix="SUMRAW";
-	    else if((*iv)=="ndigis"||(*iv)=="adc" ||
-		    (*iv)=="ndigisFREQ" || (*iv)=="adcCOMB")
-	      prefix="SUMDIG";
-	    else if((*iv)=="nclusters"||(*iv)=="x"||(*iv)=="y"||(*iv)=="charge"||(*iv)=="chargeCOMB"||
-		    (*iv)=="size"||(*iv)=="sizeX"||(*iv)=="sizeY"||(*iv)=="minrow"||
-		    (*iv)=="maxrow"||(*iv)=="mincol"||(*iv)=="maxcol")
-	      prefix="SUMCLU";
-	    if(currDir.find("Track")!=string::npos) prefix="SUMTRK";
-	    else if((*iv)=="residualX_mean"||(*iv)=="residualY_mean"||
-		    (*iv)=="residualX_RMS"||(*iv)=="residualY_RMS")
-	      prefix="SUMTRK";
-	    else if((*iv)=="ClustX"||(*iv)=="ClustY"||(*iv)=="nRecHits"||(*iv)=="ErrorX"||(*iv)=="ErrorY")
-	      prefix="SUMHIT";
-	    else if((*iv)=="Gain1d_mean"||(*iv)=="GainChi2NDF1d_mean"||
-		    (*iv)=="GainChi2Prob1d_mean"||(*iv)=="Pedestal1d_mean"||
-		    (*iv)=="ScurveChi2ProbSummary_mean"||(*iv)=="ScurveFitResultSummary_mean"||
-		    (*iv)=="ScurveSigmasSummary_mean"||(*iv)=="ScurveThresholdSummary_mean"||
-		    (*iv)=="Gain1d_RMS"||(*iv)=="GainChi2NDF1d_RMS"||
-		    (*iv)=="GainChi2Prob1d_RMS"||(*iv)=="Pedestal1d_RMS"||
-		    (*iv)=="GainNPoints1d_mean" || (*iv)=="GainNPoints1d_RMS" ||
-		    (*iv)=="GainHighPoint1d_mean" || (*iv)=="GainHighPoint1d_RMS" ||
-		    (*iv)=="GainLowPoint1d_mean" || (*iv)=="GainLowPoint1d_RMS" ||
-		    (*iv)=="GainEndPoint1d_mean" || (*iv)=="GainEndPoint1d_RMS" ||
-		    (*iv)=="GainFitResult2d_mean" || (*iv)=="GainFitResult2d_RMS" ||
-		    (*iv)=="GainDynamicRange2d_mean" || (*iv)=="GainDynamicRange2d_RMS" ||
-		    (*iv)=="GainSaturate2d_mean" || (*iv)=="GainSaturate2d_RMS" ||
-		    (*iv)=="ScurveChi2ProbSummary_RMS"||(*iv)=="ScurveFitResultSummary_RMS"||
-		    (*iv)=="ScurveSigmasSummary_RMS"||(*iv)=="ScurveThresholdSummary_RMS"||
-		    (*iv)=="pixelAliveSummary_mean"||(*iv)=="pixelAliveSummary_FracOfPerfectPix" ||
-		    (*iv)=="SiPixelErrorsCalibDigis_NCalibErrors" )
-	      prefix="SUMCAL";
-	  } // end source_type if
-	  
-	  if (first_subdir && !isUpgrade){
-	    nbin = me->getTH1F()->GetNbinsX();        
-	    string me_name = prefix + "_" + (*iv) + "_" + dir_name;
-	    if((*iv)=="adcCOMB"||(*iv)=="chargeCOMB") me_name = "ALLMODS_" + (*iv) + "_" + dir_name;
-	    else if(prefix=="SUMOFF" && dir_name=="Barrel") nbin=192;
-	    else if((*iv)=="adcCOMB") nbin=256;
-	    else if(dir_name=="Barrel") nbin=768;
-	    else if(prefix=="SUMOFF" && dir_name.find("Shell")!=string::npos) nbin=48;
-	    else if(dir_name.find("Shell")!=string::npos) nbin=192;
-	    else nbin=nbin*nDirs;
-
-	    getGrandSummaryME(iBooker, iGetter, nbin, me_name, gsum_mes);
-	  } else if (first_subdir && isUpgrade){
-	    nbin = me->getTH1F()->GetNbinsX();        
-	    string me_name = prefix + "_" + (*iv) + "_" + dir_name;
-	    if((*iv)=="adcCOMB"||(*iv)=="chargeCOMB") me_name = "ALLMODS_" + (*iv) + "_" + dir_name;
-	    else if(prefix=="SUMOFF" && dir_name=="Barrel") nbin=296;
-	    else if((*iv)=="adcCOMB") nbin=256;
-	    else if(dir_name=="Barrel") nbin=1184;
-	    else if(prefix=="SUMOFF" && dir_name.find("Shell")!=string::npos) nbin=74;
-	    else if(dir_name.find("Shell")!=string::npos) nbin=296;
-	    else nbin=nbin*nDirs;
-
-	    getGrandSummaryME(iBooker, iGetter, nbin, me_name, gsum_mes);
-	  }
-
-	  for (vector<MonitorElement*>::const_iterator igm = gsum_mes.begin();
-	       igm != gsum_mes.end(); igm++) {
-	    if ((*igm)->getName().find(var) != string::npos) {
-	      if(prefix=="SUMOFF") (*igm)->setAxisTitle("Ladders",1);
-	      else if((*igm)->getName().find("adcCOMB_")!=string::npos) (*igm)->setAxisTitle("Digi charge [ADC]",1);
-	      else if((*igm)->getName().find("chargeCOMB_")!=string::npos) (*igm)->setAxisTitle("Cluster charge [kilo electrons]",1);
-	      else (*igm)->setAxisTitle("Modules",1);
-
-	      // Setting title
-
-		  string title="";
-	      if((*igm)->getName().find("NErrors_") != string::npos && prefix=="SUMOFF") title = "Total number of errors per Ladder";
-	      else if((*igm)->getName().find("NErrors_") != string::npos && prefix=="SUMRAW") title = "Total number of errors per Module";
-	      else if(prefix=="SUMOFF") title = "mean " + (*iv) + " per Ladder"; 
-	      else if((*igm)->getName().find("FREQ_") != string::npos && prefix!="SUMOFF") title = "NEvents with digis per Module"; 
-	      else if((*igm)->getName().find("FREQ_") != string::npos && prefix=="SUMOFF") title = "NEvents with digis per Ladder/Blade"; 
-	      else if((*igm)->getName().find("adcCOMB_") != string::npos) title = "NDigis";
-	      else if((*igm)->getName().find("chargeCOMB_") != string::npos) title = "NClusters";
-	      else title = "mean " + (*iv) + " per Module"; 
-	      (*igm)->setAxisTitle(title,2);
-		  
-		  // Setting binning
-	      if (!isUpgrade) {
-	      if((*igm)->getName().find("ALLMODS_adcCOMB_")!=string::npos){
-		nbin_subdir=128;
-	      }else if((*igm)->getName().find("ALLMODS_chargeCOMB_")!=string::npos){
-		nbin_subdir=100;
-	      }else if((*igm)->getName().find("Ladder") != string::npos){
-		nbin_i=0; nbin_subdir=4;
-	      }else if((*igm)->getName().find("Layer") != string::npos){
-		nbin_i=(cnt-1)*4; nbin_subdir=4;
-	      }else if((*igm)->getName().find("Shell") != string::npos){
-		if(prefix!="SUMOFF"){
-		  if(iDir==0){ nbin_i=0; nbin_subdir=40; }
-		  else if(iDir==1){ nbin_i=40; nbin_subdir=64; }
-		  else if(iDir==2){ nbin_i=104; nbin_subdir=88; }
-		}else{
-		  if(iDir==0){ nbin_i=0; nbin_subdir=10; }
-		  else if(iDir==1){ nbin_i=10; nbin_subdir=16; }
-		  else if(iDir==2){ nbin_i=26; nbin_subdir=22; }
-		}
-	      }else if((*igm)->getName().find("Barrel") != string::npos){
-		if(prefix!="SUMOFF"){
-		  if(iDir==0){ nbin_i=0; nbin_subdir=192; }
-		  else if(iDir==1){ nbin_i=192; nbin_subdir=192; }
-		  else if(iDir==2){ nbin_i=384; nbin_subdir=192; }
-		  else if(iDir==3){ nbin_i=576; nbin_subdir=192; }
-		}else{
-		  if(iDir==0){ nbin_i=0; nbin_subdir=48; }
-		  else if(iDir==1){ nbin_i=48; nbin_subdir=48; }
-		  else if(iDir==2){ nbin_i=96; nbin_subdir=48; }
-		  else if(iDir==3){ nbin_i=144; nbin_subdir=48; }
-		}
-	      }
-	      } else if (isUpgrade) {
-	        if((*igm)->getName().find("ALLMODS_adcCOMB_")!=string::npos){
-		  nbin_subdir=128;
-	        }else if((*igm)->getName().find("ALLMODS_chargeCOMB_")!=string::npos){
-		  nbin_subdir=100;
-	        }else if((*igm)->getName().find("Ladder") != string::npos){
-		  nbin_i=0; nbin_subdir=4;
-	        }else if((*igm)->getName().find("Layer") != string::npos){
-		  nbin_i=(cnt-1)*4; nbin_subdir=4;
-	        }else if((*igm)->getName().find("Shell") != string::npos){
-		  if(prefix!="SUMOFF"){
-		   if(iDir==0){ nbin_i=0; nbin_subdir=24; }//40(2*20)-->24(2*12)
-		    else if(iDir==1){ nbin_i=24; nbin_subdir=56; }//64(32*2)-->56(2*28)
-		    else if(iDir==2){ nbin_i=80; nbin_subdir=88; }//88(44*2)-->same88(44*2)
-		    else if(iDir==3){ nbin_i=168; nbin_subdir=128; }
-		  }else{
-		    if(iDir==0){ nbin_i=0; nbin_subdir=6; }//10-->6
-		    else if(iDir==1){ nbin_i=6; nbin_subdir=14; }//16-->14
-		    else if(iDir==2){ nbin_i=20; nbin_subdir=22; }//22-->same22
-		    else if(iDir==3){ nbin_i=42; nbin_subdir=32; }
-		  }
-	        }else if((*igm)->getName().find("Barrel") != string::npos){
-		  if(prefix!="SUMOFF"){
-		    if(iDir==0){ nbin_i=0; nbin_subdir=296; }//192=76 8/4-->296=1184/4
-		    else if(iDir==1){ nbin_i=296; nbin_subdir=296; }//296*2,*3,*4=1184
-		    else if(iDir==2){ nbin_i=592; nbin_subdir=296; }
-		    else if(iDir==3){ nbin_i=888; nbin_subdir=296; }
-		    else if(iDir==4){ nbin_i=1184; nbin_subdir=296; }
-		  }else{
-		    if(iDir==0){ nbin_i=0; nbin_subdir=74; }//48=192/4-->74=296/4
-		    else if(iDir==1){ nbin_i=74; nbin_subdir=74; }//74*2,...*4=296
-		    else if(iDir==2){ nbin_i=148; nbin_subdir=74; }
-		    else if(iDir==3){ nbin_i=222; nbin_subdir=74; }
-		    else if(iDir==4){ nbin_i=296; nbin_subdir=74; }
-		  }
-	        }
-	      }
-	      
-	      if((*igm)->getName().find("ndigisFREQ")==string::npos)
-		{ 
-		  if(((*igm)->getName().find("adcCOMB")!=string::npos && me->getName().find("adcCOMB")!=string::npos) 
-		     || ((*igm)->getName().find("chargeCOMB")!=string::npos && me->getName().find("chargeCOMB")!=string::npos))
-		    {
-		      (*igm)->getTH1F()->Add(me->getTH1F());
-		    }else if(((*igm)->getName().find("charge_")!=string::npos && (*igm)->getName().find("Track_")==string::npos && 
-			      me->getName().find("charge_")!=string::npos && me->getName().find("Track_")==string::npos) || 
-			     ((*igm)->getName().find("nclusters_")!=string::npos && (*igm)->getName().find("Track_")==string::npos && 
-			      me->getName().find("nclusters_")!=string::npos && me->getName().find("Track_")==string::npos) || 
-			     ((*igm)->getName().find("size_")!=string::npos && (*igm)->getName().find("Track_")==string::npos && 
-			      me->getName().find("size_")!=string::npos && me->getName().find("Track_")==string::npos) || 
-			     ((*igm)->getName().find("charge_OffTrack_")!=string::npos && me->getName().find("charge_OffTrack_")!=string::npos) || 
-			     ((*igm)->getName().find("nclusters_OffTrack_")!=string::npos && me->getName().find("nclusters_OffTrack_")!=string::npos) || 
-			     ((*igm)->getName().find("size_OffTrack_")!=string::npos && me->getName().find("size_OffTrack_")!=string::npos) || 
-			     ((*igm)->getName().find("charge_OnTrack_")!=string::npos && me->getName().find("charge_OnTrack_")!=string::npos) || 
-			     ((*igm)->getName().find("nclusters_OnTrack_")!=string::npos && me->getName().find("nclusters_OnTrack_")!=string::npos) || 
-			     ((*igm)->getName().find("size_OnTrack_")!=string::npos && me->getName().find("size_OnTrack_")!=string::npos) || 
-			     ((*igm)->getName().find("charge_")==string::npos && (*igm)->getName().find("nclusters_")==string::npos && 
-			      (*igm)->getName().find("size_")==string::npos)){
-		    for (int k = 1; k < nbin_subdir+1; k++) if(me->getBinContent(k) > 0) (*igm)->setBinContent(k+nbin_i, me->getBinContent(k));
-		  }
-		}
-	      else if(me->getName().find("ndigisFREQ")!=string::npos)
-		{
-		  for (int k = 1; k < nbin_subdir+1; k++) if(me->getBinContent(k) > 0) (*igm)->setBinContent(k+nbin_i, me->getBinContent(k));
-		}
-	    } // end var in igm (gsum_mes)
-	  } // end igm loop
-	} // end var in im (contents)
-      } // end of iv loop
-    } // end of im loop
+    if (source_type_ == 0)
+      prefix = "SUMRAW";
+    else if (source_type_ == 1)
+      prefix = "SUMDIG";
+    else if (source_type_ == 2)
+      prefix = "SUMCLU";
+    else if (source_type_ == 3)
+      prefix = "SUMTRK";
+    else if (source_type_ == 4)
+      prefix = "SUMHIT";
+    else if (source_type_ >= 7 && source_type_ < 20)
+      prefix = "SUMCAL";
+    else if (source_type_ == 20)
+      prefix = "SUMOFF";
+
+    for (vector<string>::const_iterator im = contents.begin(); im != contents.end(); im++) {
+      for (vector<string>::const_iterator iv = me_names.begin(); iv != me_names.end(); iv++) {
+        string var = "_" + (*iv) + "_";
+        if ((*im).find(var) != string::npos) {
+          if ((var == "_charge_" || var == "_nclusters_" || var == "_size_" || var == "_sizeX_" || var == "_sizeY_") &&
+              (*im).find("Track_") != string::npos)
+            continue;
+          string full_path = (*it) + "/" + (*im);
+          MonitorElement *me = iGetter.get(full_path);
+          if (!me)
+            continue;
+          if (source_type_ == 5 || source_type_ == 6) {
+            if ((*iv) == "errorType" || (*iv) == "NErrors" || (*iv) == "fullType" || (*iv) == "chanNmbr" ||
+                (*iv) == "TBMType" || (*iv) == "EvtNbr" || (*iv) == "evtSize" || (*iv) == "linkId" ||
+                (*iv) == "ROCId" || (*iv) == "DCOLId" || (*iv) == "PXId" || (*iv) == "ROCNmbr" ||
+                (*iv) == "TBMMessage" || (*iv) == "Type36Hitmap")
+              prefix = "SUMRAW";
+            else if ((*iv) == "ndigis" || (*iv) == "adc" || (*iv) == "ndigisFREQ" || (*iv) == "adcCOMB")
+              prefix = "SUMDIG";
+            else if ((*iv) == "nclusters" || (*iv) == "x" || (*iv) == "y" || (*iv) == "charge" ||
+                     (*iv) == "chargeCOMB" || (*iv) == "size" || (*iv) == "sizeX" || (*iv) == "sizeY" ||
+                     (*iv) == "minrow" || (*iv) == "maxrow" || (*iv) == "mincol" || (*iv) == "maxcol")
+              prefix = "SUMCLU";
+            if (currDir.find("Track") != string::npos)
+              prefix = "SUMTRK";
+            else if ((*iv) == "residualX_mean" || (*iv) == "residualY_mean" || (*iv) == "residualX_RMS" ||
+                     (*iv) == "residualY_RMS")
+              prefix = "SUMTRK";
+            else if ((*iv) == "ClustX" || (*iv) == "ClustY" || (*iv) == "nRecHits" || (*iv) == "ErrorX" ||
+                     (*iv) == "ErrorY")
+              prefix = "SUMHIT";
+            else if ((*iv) == "Gain1d_mean" || (*iv) == "GainChi2NDF1d_mean" || (*iv) == "GainChi2Prob1d_mean" ||
+                     (*iv) == "Pedestal1d_mean" || (*iv) == "ScurveChi2ProbSummary_mean" ||
+                     (*iv) == "ScurveFitResultSummary_mean" || (*iv) == "ScurveSigmasSummary_mean" ||
+                     (*iv) == "ScurveThresholdSummary_mean" || (*iv) == "Gain1d_RMS" || (*iv) == "GainChi2NDF1d_RMS" ||
+                     (*iv) == "GainChi2Prob1d_RMS" || (*iv) == "Pedestal1d_RMS" || (*iv) == "GainNPoints1d_mean" ||
+                     (*iv) == "GainNPoints1d_RMS" || (*iv) == "GainHighPoint1d_mean" ||
+                     (*iv) == "GainHighPoint1d_RMS" || (*iv) == "GainLowPoint1d_mean" ||
+                     (*iv) == "GainLowPoint1d_RMS" || (*iv) == "GainEndPoint1d_mean" || (*iv) == "GainEndPoint1d_RMS" ||
+                     (*iv) == "GainFitResult2d_mean" || (*iv) == "GainFitResult2d_RMS" ||
+                     (*iv) == "GainDynamicRange2d_mean" || (*iv) == "GainDynamicRange2d_RMS" ||
+                     (*iv) == "GainSaturate2d_mean" || (*iv) == "GainSaturate2d_RMS" ||
+                     (*iv) == "ScurveChi2ProbSummary_RMS" || (*iv) == "ScurveFitResultSummary_RMS" ||
+                     (*iv) == "ScurveSigmasSummary_RMS" || (*iv) == "ScurveThresholdSummary_RMS" ||
+                     (*iv) == "pixelAliveSummary_mean" || (*iv) == "pixelAliveSummary_FracOfPerfectPix" ||
+                     (*iv) == "SiPixelErrorsCalibDigis_NCalibErrors")
+              prefix = "SUMCAL";
+          }  // end source_type if
+
+          if (first_subdir && !isUpgrade) {
+            nbin = me->getTH1F()->GetNbinsX();
+            string me_name = prefix + "_" + (*iv) + "_" + dir_name;
+            if ((*iv) == "adcCOMB" || (*iv) == "chargeCOMB")
+              me_name = "ALLMODS_" + (*iv) + "_" + dir_name;
+            else if (prefix == "SUMOFF" && dir_name == "Barrel")
+              nbin = 192;
+            else if ((*iv) == "adcCOMB")
+              nbin = 256;
+            else if (dir_name == "Barrel")
+              nbin = 768;
+            else if (prefix == "SUMOFF" && dir_name.find("Shell") != string::npos)
+              nbin = 48;
+            else if (dir_name.find("Shell") != string::npos)
+              nbin = 192;
+            else
+              nbin = nbin * nDirs;
+
+            getGrandSummaryME(iBooker, iGetter, nbin, me_name, gsum_mes);
+          } else if (first_subdir && isUpgrade) {
+            nbin = me->getTH1F()->GetNbinsX();
+            string me_name = prefix + "_" + (*iv) + "_" + dir_name;
+            if ((*iv) == "adcCOMB" || (*iv) == "chargeCOMB")
+              me_name = "ALLMODS_" + (*iv) + "_" + dir_name;
+            else if (prefix == "SUMOFF" && dir_name == "Barrel")
+              nbin = 296;
+            else if ((*iv) == "adcCOMB")
+              nbin = 256;
+            else if (dir_name == "Barrel")
+              nbin = 1184;
+            else if (prefix == "SUMOFF" && dir_name.find("Shell") != string::npos)
+              nbin = 74;
+            else if (dir_name.find("Shell") != string::npos)
+              nbin = 296;
+            else
+              nbin = nbin * nDirs;
+
+            getGrandSummaryME(iBooker, iGetter, nbin, me_name, gsum_mes);
+          }
+
+          for (vector<MonitorElement *>::const_iterator igm = gsum_mes.begin(); igm != gsum_mes.end(); igm++) {
+            if ((*igm)->getName().find(var) != string::npos) {
+              if (prefix == "SUMOFF")
+                (*igm)->setAxisTitle("Ladders", 1);
+              else if ((*igm)->getName().find("adcCOMB_") != string::npos)
+                (*igm)->setAxisTitle("Digi charge [ADC]", 1);
+              else if ((*igm)->getName().find("chargeCOMB_") != string::npos)
+                (*igm)->setAxisTitle("Cluster charge [kilo electrons]", 1);
+              else
+                (*igm)->setAxisTitle("Modules", 1);
+
+              // Setting title
+
+              string title = "";
+              if ((*igm)->getName().find("NErrors_") != string::npos && prefix == "SUMOFF")
+                title = "Total number of errors per Ladder";
+              else if ((*igm)->getName().find("NErrors_") != string::npos && prefix == "SUMRAW")
+                title = "Total number of errors per Module";
+              else if (prefix == "SUMOFF")
+                title = "mean " + (*iv) + " per Ladder";
+              else if ((*igm)->getName().find("FREQ_") != string::npos && prefix != "SUMOFF")
+                title = "NEvents with digis per Module";
+              else if ((*igm)->getName().find("FREQ_") != string::npos && prefix == "SUMOFF")
+                title = "NEvents with digis per Ladder/Blade";
+              else if ((*igm)->getName().find("adcCOMB_") != string::npos)
+                title = "NDigis";
+              else if ((*igm)->getName().find("chargeCOMB_") != string::npos)
+                title = "NClusters";
+              else
+                title = "mean " + (*iv) + " per Module";
+              (*igm)->setAxisTitle(title, 2);
+
+              // Setting binning
+              if (!isUpgrade) {
+                if ((*igm)->getName().find("ALLMODS_adcCOMB_") != string::npos) {
+                  nbin_subdir = 128;
+                } else if ((*igm)->getName().find("ALLMODS_chargeCOMB_") != string::npos) {
+                  nbin_subdir = 100;
+                } else if ((*igm)->getName().find("Ladder") != string::npos) {
+                  nbin_i = 0;
+                  nbin_subdir = 4;
+                } else if ((*igm)->getName().find("Layer") != string::npos) {
+                  nbin_i = (cnt - 1) * 4;
+                  nbin_subdir = 4;
+                } else if ((*igm)->getName().find("Shell") != string::npos) {
+                  if (prefix != "SUMOFF") {
+                    if (iDir == 0) {
+                      nbin_i = 0;
+                      nbin_subdir = 40;
+                    } else if (iDir == 1) {
+                      nbin_i = 40;
+                      nbin_subdir = 64;
+                    } else if (iDir == 2) {
+                      nbin_i = 104;
+                      nbin_subdir = 88;
+                    }
+                  } else {
+                    if (iDir == 0) {
+                      nbin_i = 0;
+                      nbin_subdir = 10;
+                    } else if (iDir == 1) {
+                      nbin_i = 10;
+                      nbin_subdir = 16;
+                    } else if (iDir == 2) {
+                      nbin_i = 26;
+                      nbin_subdir = 22;
+                    }
+                  }
+                } else if ((*igm)->getName().find("Barrel") != string::npos) {
+                  if (prefix != "SUMOFF") {
+                    if (iDir == 0) {
+                      nbin_i = 0;
+                      nbin_subdir = 192;
+                    } else if (iDir == 1) {
+                      nbin_i = 192;
+                      nbin_subdir = 192;
+                    } else if (iDir == 2) {
+                      nbin_i = 384;
+                      nbin_subdir = 192;
+                    } else if (iDir == 3) {
+                      nbin_i = 576;
+                      nbin_subdir = 192;
+                    }
+                  } else {
+                    if (iDir == 0) {
+                      nbin_i = 0;
+                      nbin_subdir = 48;
+                    } else if (iDir == 1) {
+                      nbin_i = 48;
+                      nbin_subdir = 48;
+                    } else if (iDir == 2) {
+                      nbin_i = 96;
+                      nbin_subdir = 48;
+                    } else if (iDir == 3) {
+                      nbin_i = 144;
+                      nbin_subdir = 48;
+                    }
+                  }
+                }
+              } else if (isUpgrade) {
+                if ((*igm)->getName().find("ALLMODS_adcCOMB_") != string::npos) {
+                  nbin_subdir = 128;
+                } else if ((*igm)->getName().find("ALLMODS_chargeCOMB_") != string::npos) {
+                  nbin_subdir = 100;
+                } else if ((*igm)->getName().find("Ladder") != string::npos) {
+                  nbin_i = 0;
+                  nbin_subdir = 4;
+                } else if ((*igm)->getName().find("Layer") != string::npos) {
+                  nbin_i = (cnt - 1) * 4;
+                  nbin_subdir = 4;
+                } else if ((*igm)->getName().find("Shell") != string::npos) {
+                  if (prefix != "SUMOFF") {
+                    if (iDir == 0) {
+                      nbin_i = 0;
+                      nbin_subdir = 24;
+                    }  // 40(2*20)-->24(2*12)
+                    else if (iDir == 1) {
+                      nbin_i = 24;
+                      nbin_subdir = 56;
+                    }  // 64(32*2)-->56(2*28)
+                    else if (iDir == 2) {
+                      nbin_i = 80;
+                      nbin_subdir = 88;
+                    }  // 88(44*2)-->same88(44*2)
+                    else if (iDir == 3) {
+                      nbin_i = 168;
+                      nbin_subdir = 128;
+                    }
+                  } else {
+                    if (iDir == 0) {
+                      nbin_i = 0;
+                      nbin_subdir = 6;
+                    }  // 10-->6
+                    else if (iDir == 1) {
+                      nbin_i = 6;
+                      nbin_subdir = 14;
+                    }  // 16-->14
+                    else if (iDir == 2) {
+                      nbin_i = 20;
+                      nbin_subdir = 22;
+                    }  // 22-->same22
+                    else if (iDir == 3) {
+                      nbin_i = 42;
+                      nbin_subdir = 32;
+                    }
+                  }
+                } else if ((*igm)->getName().find("Barrel") != string::npos) {
+                  if (prefix != "SUMOFF") {
+                    if (iDir == 0) {
+                      nbin_i = 0;
+                      nbin_subdir = 296;
+                    }  // 192=76 8/4-->296=1184/4
+                    else if (iDir == 1) {
+                      nbin_i = 296;
+                      nbin_subdir = 296;
+                    }  // 296*2,*3,*4=1184
+                    else if (iDir == 2) {
+                      nbin_i = 592;
+                      nbin_subdir = 296;
+                    } else if (iDir == 3) {
+                      nbin_i = 888;
+                      nbin_subdir = 296;
+                    } else if (iDir == 4) {
+                      nbin_i = 1184;
+                      nbin_subdir = 296;
+                    }
+                  } else {
+                    if (iDir == 0) {
+                      nbin_i = 0;
+                      nbin_subdir = 74;
+                    }  // 48=192/4-->74=296/4
+                    else if (iDir == 1) {
+                      nbin_i = 74;
+                      nbin_subdir = 74;
+                    }  // 74*2,...*4=296
+                    else if (iDir == 2) {
+                      nbin_i = 148;
+                      nbin_subdir = 74;
+                    } else if (iDir == 3) {
+                      nbin_i = 222;
+                      nbin_subdir = 74;
+                    } else if (iDir == 4) {
+                      nbin_i = 296;
+                      nbin_subdir = 74;
+                    }
+                  }
+                }
+              }
+
+              if ((*igm)->getName().find("ndigisFREQ") == string::npos) {
+                if (((*igm)->getName().find("adcCOMB") != string::npos &&
+                     me->getName().find("adcCOMB") != string::npos) ||
+                    ((*igm)->getName().find("chargeCOMB") != string::npos &&
+                     me->getName().find("chargeCOMB") != string::npos)) {
+                  (*igm)->getTH1F()->Add(me->getTH1F());
+                } else if (((*igm)->getName().find("charge_") != string::npos &&
+                            (*igm)->getName().find("Track_") == string::npos &&
+                            me->getName().find("charge_") != string::npos &&
+                            me->getName().find("Track_") == string::npos) ||
+                           ((*igm)->getName().find("nclusters_") != string::npos &&
+                            (*igm)->getName().find("Track_") == string::npos &&
+                            me->getName().find("nclusters_") != string::npos &&
+                            me->getName().find("Track_") == string::npos) ||
+                           ((*igm)->getName().find("size_") != string::npos &&
+                            (*igm)->getName().find("Track_") == string::npos &&
+                            me->getName().find("size_") != string::npos &&
+                            me->getName().find("Track_") == string::npos) ||
+                           ((*igm)->getName().find("charge_OffTrack_") != string::npos &&
+                            me->getName().find("charge_OffTrack_") != string::npos) ||
+                           ((*igm)->getName().find("nclusters_OffTrack_") != string::npos &&
+                            me->getName().find("nclusters_OffTrack_") != string::npos) ||
+                           ((*igm)->getName().find("size_OffTrack_") != string::npos &&
+                            me->getName().find("size_OffTrack_") != string::npos) ||
+                           ((*igm)->getName().find("charge_OnTrack_") != string::npos &&
+                            me->getName().find("charge_OnTrack_") != string::npos) ||
+                           ((*igm)->getName().find("nclusters_OnTrack_") != string::npos &&
+                            me->getName().find("nclusters_OnTrack_") != string::npos) ||
+                           ((*igm)->getName().find("size_OnTrack_") != string::npos &&
+                            me->getName().find("size_OnTrack_") != string::npos) ||
+                           ((*igm)->getName().find("charge_") == string::npos &&
+                            (*igm)->getName().find("nclusters_") == string::npos &&
+                            (*igm)->getName().find("size_") == string::npos)) {
+                  for (int k = 1; k < nbin_subdir + 1; k++)
+                    if (me->getBinContent(k) > 0)
+                      (*igm)->setBinContent(k + nbin_i, me->getBinContent(k));
+                }
+              } else if (me->getName().find("ndigisFREQ") != string::npos) {
+                for (int k = 1; k < nbin_subdir + 1; k++)
+                  if (me->getBinContent(k) > 0)
+                    (*igm)->setBinContent(k + nbin_i, me->getBinContent(k));
+              }
+            }  // end var in igm (gsum_mes)
+          }    // end igm loop
+        }      // end var in im (contents)
+      }        // end of iv loop
+    }          // end of im loop
     iDir++;
-  first_subdir = false; // We are done processing the first directory, we don't add any new MEs in the future passes.	
-  } // end of it loop (subdirs)
-//  cout<<"...leaving SiPixelActionExecutor::fillGrandBarrelSummaryHistos!"<<endl;
+    first_subdir = false;  // We are done processing the first directory, we
+                           // don't add any new MEs in the future passes.
+  }                        // end of it loop (subdirs)
+  //  cout<<"...leaving
+  //  SiPixelActionExecutor::fillGrandBarrelSummaryHistos!"<<endl;
 }
 
 //=============================================================================================================
-void SiPixelActionExecutor::fillGrandEndcapSummaryHistos(DQMStore::IBooker& iBooker,
-							 DQMStore::IGetter& iGetter,
-                                                         vector<string>& me_names,
+void SiPixelActionExecutor::fillGrandEndcapSummaryHistos(DQMStore::IBooker &iBooker,
+                                                         DQMStore::IGetter &iGetter,
+                                                         vector<string> &me_names,
                                                          bool isUpgrade) {
-  //printing cout<<"Entering SiPixelActionExecutor::fillGrandEndcapSummaryHistos..."<<endl;
-  vector<MonitorElement*> gsum_mes;
+  // printing cout<<"Entering
+  // SiPixelActionExecutor::fillGrandEndcapSummaryHistos..."<<endl;
+  vector<MonitorElement *> gsum_mes;
   string currDir = iBooker.pwd();
   string path_name = iBooker.pwd();
-  string dir_name =  path_name.substr(path_name.find_last_of("/")+1);
-  if ((dir_name.find("DQMData") == 0) ||
-      (dir_name.find("Pixel") == 0) ||
-      (dir_name.find("AdditionalPixelErrors") == 0) ||
-      (dir_name.find("Barrel") == 0) ||
-      (dir_name.find("Shell") == 0) ||
-      (dir_name.find("Layer") == 0) ||
-      (dir_name.find("Ladder") == 0) ) return;
+  string dir_name = path_name.substr(path_name.find_last_of("/") + 1);
+  if ((dir_name.find("DQMData") == 0) || (dir_name.find("Pixel") == 0) ||
+      (dir_name.find("AdditionalPixelErrors") == 0) || (dir_name.find("Barrel") == 0) ||
+      (dir_name.find("Shell") == 0) || (dir_name.find("Layer") == 0) || (dir_name.find("Ladder") == 0))
+    return;
   vector<string> subdirs = iGetter.getSubdirs();
-  int iDir =0;
+  int iDir = 0;
   int nbin = 0;
-  int nbin_i = 0; 
-  int nbin_subdir = 0; 
-  int cnt=0;
-  bool first_subdir = true;  
-  for (vector<string>::const_iterator it = subdirs.begin();
-       it != subdirs.end(); it++) {
+  int nbin_i = 0;
+  int nbin_subdir = 0;
+  int cnt = 0;
+  bool first_subdir = true;
+  for (vector<string>::const_iterator it = subdirs.begin(); it != subdirs.end(); it++) {
     cnt++;
     iBooker.cd(*it);
     iGetter.cd(*it);
     vector<string> contents = iGetter.getMEs();
     iBooker.goUp();
     iGetter.setCurrentFolder(iBooker.pwd());
-		
+
     string prefix;
-    if(source_type_==0) prefix="SUMRAW";
-    else if (source_type_==1) prefix="SUMDIG";
-    else if (source_type_==2) prefix="SUMCLU";
-    else if (source_type_==3) prefix="SUMTRK";
-    else if (source_type_==4) prefix="SUMHIT";
-    else if (source_type_>=7 && source_type_<20) prefix="SUMCAL";
-    else if (source_type_==20) prefix="SUMOFF";
-		
-    for (vector<string>::const_iterator im = contents.begin();
-	 im != contents.end(); im++) {
-      for (vector<string>::const_iterator iv = me_names.begin();
-	   iv != me_names.end(); iv++) {
-	string var = "_" + (*iv) + "_";
-	if ((*im).find(var) != string::npos) {
-	  if((var=="_charge_" || var=="_nclusters_" || var=="_size_" || var=="_sizeX_" || var=="_sizeY_") && 
-	     (*im).find("Track_")!=string::npos) continue;
-	  string full_path = (*it) + "/" +(*im);
-	  MonitorElement * me = iGetter.get(full_path);
-	  if (!me) continue; 
-	  if(source_type_==5||source_type_==6){
-	    if((*iv)=="errorType"||(*iv)=="NErrors"||(*iv)=="fullType"||(*iv)=="chanNmbr"||
-	       (*iv)=="TBMType"||(*iv)=="EvtNbr"||(*iv)=="evtSize"||(*iv)=="linkId"||
-	       (*iv)=="ROCId"||(*iv)=="DCOLId"||(*iv)=="PXId"||(*iv)=="ROCNmbr"||
-	       (*iv)=="TBMMessage"||(*iv)=="Type36Hitmap") 
-	      prefix="SUMRAW";
-	    else if((*iv)=="ndigis"||(*iv)=="adc" ||
-		    (*iv)=="ndigisFREQ"||(*iv)=="adcCOMB")
-	      prefix="SUMDIG";
-	    else if((*iv)=="nclusters"||(*iv)=="x"||(*iv)=="y"||(*iv)=="charge"||(*iv)=="chargeCOMB"||
-		    (*iv)=="size"||(*iv)=="sizeX"||(*iv)=="sizeY"||(*iv)=="minrow"||
-		    (*iv)=="maxrow"||(*iv)=="mincol"||(*iv)=="maxcol")
-	      prefix="SUMCLU";
-	    if(currDir.find("Track")!=string::npos) prefix="SUMTRK";
-	    else if((*iv)=="residualX_mean"||(*iv)=="residualY_mean"||
-		    (*iv)=="residualX_RMS"||(*iv)=="residualY_RMS")
-	      prefix="SUMTRK";
-	    else if((*iv)=="ClustX"||(*iv)=="ClustY"||(*iv)=="nRecHits"||(*iv)=="ErrorX"||(*iv)=="ErrorY")
-	      prefix="SUMHIT";
-	    else if((*iv)=="Gain1d_mean"||(*iv)=="GainChi2NDF1d_mean"||
-		    (*iv)=="GainChi2Prob1d_mean"||(*iv)=="Pedestal1d_mean"||
-		    (*iv)=="ScurveChi2ProbSummary_mean"||(*iv)=="ScurveFitResultSummary_mean"||
-		    (*iv)=="ScurveSigmasSummary_mean"||(*iv)=="ScurveThresholdSummary_mean"||
-		    (*iv)=="Gain1d_RMS"||(*iv)=="GainChi2NDF1d_RMS"||
-		    (*iv)=="GainChi2Prob1d_RMS"||(*iv)=="Pedestal1d_RMS"||
-		    (*iv)=="GainNPoints1d_mean" || (*iv)=="GainNPoints1d_RMS" ||
-		    (*iv)=="GainHighPoint1d_mean" || (*iv)=="GainHighPoint1d_RMS" ||
-		    (*iv)=="GainLowPoint1d_mean" || (*iv)=="GainLowPoint1d_RMS" ||
-		    (*iv)=="GainEndPoint1d_mean" || (*iv)=="GainEndPoint1d_RMS" ||
-		    (*iv)=="GainFitResult2d_mean" || (*iv)=="GainFitResult2d_RMS" ||
-		    (*iv)=="GainDynamicRange2d_mean" || (*iv)=="GainDynamicRange2d_RMS" ||
-		    (*iv)=="GainSaturate2d_mean" || (*iv)=="GainSaturate2d_RMS" ||
-		    (*iv)=="ScurveChi2ProbSummary_RMS"||(*iv)=="ScurveFitResultSummary_RMS"||
-		    (*iv)=="ScurveSigmasSummary_RMS"||(*iv)=="ScurveThresholdSummary_RMS"||
-		    (*iv)=="pixelAliveSummary_mean"||(*iv)=="pixelAliveSummary_FracOfPerfectPix"|| 
-		    (*iv) == "SiPixelErrorsCalibDigis_NCalibErrors")
-	      prefix="SUMCAL"; 
-	  }
-
-	  if (first_subdir && !isUpgrade){
-	    nbin = me->getTH1F()->GetNbinsX();        
-	    string me_name = prefix + "_" + (*iv) + "_" + dir_name;
-	    if((*iv)=="adcCOMB"||(*iv)=="chargeCOMB") me_name = "ALLMODS_" + (*iv) + "_" + dir_name;
-	    else if(prefix=="SUMOFF" && dir_name=="Endcap") nbin=96;
-	    else if(dir_name=="Endcap") nbin=672;
-	    else if(prefix=="SUMOFF" && dir_name.find("HalfCylinder")!=string::npos) nbin=24;
-	    else if(dir_name.find("HalfCylinder")!=string::npos) nbin=168;
-	    else if(prefix=="SUMOFF" && dir_name.find("Disk")!=string::npos) nbin=12;
-	    else if(dir_name.find("Disk")!=string::npos) nbin=84;
-	    else if(dir_name.find("Blade")!=string::npos) nbin=7;
-	    getGrandSummaryME(iBooker, iGetter, nbin, me_name, gsum_mes);
-	  } else if(first_subdir && isUpgrade){
-            nbin = me->getTH1F()->GetNbinsX();        
-	    string me_name = prefix + "_" + (*iv) + "_" + dir_name;
-	    if((*iv)=="adcCOMB"||(*iv)=="chargeCOMB") me_name = "ALLMODS_" + (*iv) + "_" + dir_name;
-	    else if(prefix=="SUMOFF" && dir_name=="Endcap") nbin=336;
-	    else if(dir_name=="Endcap") nbin=672;
-	    else if(prefix=="SUMOFF" && dir_name.find("HalfCylinder")!=string::npos) nbin=84;
-	    else if(dir_name.find("HalfCylinder")!=string::npos) nbin=168;
-	    else if(prefix=="SUMOFF" && dir_name.find("Disk")!=string::npos) nbin=28;
-	    else if(dir_name.find("Disk")!=string::npos) nbin=56;
-	    else if(dir_name.find("Blade")!=string::npos) nbin=2;
+    if (source_type_ == 0)
+      prefix = "SUMRAW";
+    else if (source_type_ == 1)
+      prefix = "SUMDIG";
+    else if (source_type_ == 2)
+      prefix = "SUMCLU";
+    else if (source_type_ == 3)
+      prefix = "SUMTRK";
+    else if (source_type_ == 4)
+      prefix = "SUMHIT";
+    else if (source_type_ >= 7 && source_type_ < 20)
+      prefix = "SUMCAL";
+    else if (source_type_ == 20)
+      prefix = "SUMOFF";
+
+    for (vector<string>::const_iterator im = contents.begin(); im != contents.end(); im++) {
+      for (vector<string>::const_iterator iv = me_names.begin(); iv != me_names.end(); iv++) {
+        string var = "_" + (*iv) + "_";
+        if ((*im).find(var) != string::npos) {
+          if ((var == "_charge_" || var == "_nclusters_" || var == "_size_" || var == "_sizeX_" || var == "_sizeY_") &&
+              (*im).find("Track_") != string::npos)
+            continue;
+          string full_path = (*it) + "/" + (*im);
+          MonitorElement *me = iGetter.get(full_path);
+          if (!me)
+            continue;
+          if (source_type_ == 5 || source_type_ == 6) {
+            if ((*iv) == "errorType" || (*iv) == "NErrors" || (*iv) == "fullType" || (*iv) == "chanNmbr" ||
+                (*iv) == "TBMType" || (*iv) == "EvtNbr" || (*iv) == "evtSize" || (*iv) == "linkId" ||
+                (*iv) == "ROCId" || (*iv) == "DCOLId" || (*iv) == "PXId" || (*iv) == "ROCNmbr" ||
+                (*iv) == "TBMMessage" || (*iv) == "Type36Hitmap")
+              prefix = "SUMRAW";
+            else if ((*iv) == "ndigis" || (*iv) == "adc" || (*iv) == "ndigisFREQ" || (*iv) == "adcCOMB")
+              prefix = "SUMDIG";
+            else if ((*iv) == "nclusters" || (*iv) == "x" || (*iv) == "y" || (*iv) == "charge" ||
+                     (*iv) == "chargeCOMB" || (*iv) == "size" || (*iv) == "sizeX" || (*iv) == "sizeY" ||
+                     (*iv) == "minrow" || (*iv) == "maxrow" || (*iv) == "mincol" || (*iv) == "maxcol")
+              prefix = "SUMCLU";
+            if (currDir.find("Track") != string::npos)
+              prefix = "SUMTRK";
+            else if ((*iv) == "residualX_mean" || (*iv) == "residualY_mean" || (*iv) == "residualX_RMS" ||
+                     (*iv) == "residualY_RMS")
+              prefix = "SUMTRK";
+            else if ((*iv) == "ClustX" || (*iv) == "ClustY" || (*iv) == "nRecHits" || (*iv) == "ErrorX" ||
+                     (*iv) == "ErrorY")
+              prefix = "SUMHIT";
+            else if ((*iv) == "Gain1d_mean" || (*iv) == "GainChi2NDF1d_mean" || (*iv) == "GainChi2Prob1d_mean" ||
+                     (*iv) == "Pedestal1d_mean" || (*iv) == "ScurveChi2ProbSummary_mean" ||
+                     (*iv) == "ScurveFitResultSummary_mean" || (*iv) == "ScurveSigmasSummary_mean" ||
+                     (*iv) == "ScurveThresholdSummary_mean" || (*iv) == "Gain1d_RMS" || (*iv) == "GainChi2NDF1d_RMS" ||
+                     (*iv) == "GainChi2Prob1d_RMS" || (*iv) == "Pedestal1d_RMS" || (*iv) == "GainNPoints1d_mean" ||
+                     (*iv) == "GainNPoints1d_RMS" || (*iv) == "GainHighPoint1d_mean" ||
+                     (*iv) == "GainHighPoint1d_RMS" || (*iv) == "GainLowPoint1d_mean" ||
+                     (*iv) == "GainLowPoint1d_RMS" || (*iv) == "GainEndPoint1d_mean" || (*iv) == "GainEndPoint1d_RMS" ||
+                     (*iv) == "GainFitResult2d_mean" || (*iv) == "GainFitResult2d_RMS" ||
+                     (*iv) == "GainDynamicRange2d_mean" || (*iv) == "GainDynamicRange2d_RMS" ||
+                     (*iv) == "GainSaturate2d_mean" || (*iv) == "GainSaturate2d_RMS" ||
+                     (*iv) == "ScurveChi2ProbSummary_RMS" || (*iv) == "ScurveFitResultSummary_RMS" ||
+                     (*iv) == "ScurveSigmasSummary_RMS" || (*iv) == "ScurveThresholdSummary_RMS" ||
+                     (*iv) == "pixelAliveSummary_mean" || (*iv) == "pixelAliveSummary_FracOfPerfectPix" ||
+                     (*iv) == "SiPixelErrorsCalibDigis_NCalibErrors")
+              prefix = "SUMCAL";
+          }
+
+          if (first_subdir && !isUpgrade) {
+            nbin = me->getTH1F()->GetNbinsX();
+            string me_name = prefix + "_" + (*iv) + "_" + dir_name;
+            if ((*iv) == "adcCOMB" || (*iv) == "chargeCOMB")
+              me_name = "ALLMODS_" + (*iv) + "_" + dir_name;
+            else if (prefix == "SUMOFF" && dir_name == "Endcap")
+              nbin = 96;
+            else if (dir_name == "Endcap")
+              nbin = 672;
+            else if (prefix == "SUMOFF" && dir_name.find("HalfCylinder") != string::npos)
+              nbin = 24;
+            else if (dir_name.find("HalfCylinder") != string::npos)
+              nbin = 168;
+            else if (prefix == "SUMOFF" && dir_name.find("Disk") != string::npos)
+              nbin = 12;
+            else if (dir_name.find("Disk") != string::npos)
+              nbin = 84;
+            else if (dir_name.find("Blade") != string::npos)
+              nbin = 7;
+            getGrandSummaryME(iBooker, iGetter, nbin, me_name, gsum_mes);
+          } else if (first_subdir && isUpgrade) {
+            nbin = me->getTH1F()->GetNbinsX();
+            string me_name = prefix + "_" + (*iv) + "_" + dir_name;
+            if ((*iv) == "adcCOMB" || (*iv) == "chargeCOMB")
+              me_name = "ALLMODS_" + (*iv) + "_" + dir_name;
+            else if (prefix == "SUMOFF" && dir_name == "Endcap")
+              nbin = 336;
+            else if (dir_name == "Endcap")
+              nbin = 672;
+            else if (prefix == "SUMOFF" && dir_name.find("HalfCylinder") != string::npos)
+              nbin = 84;
+            else if (dir_name.find("HalfCylinder") != string::npos)
+              nbin = 168;
+            else if (prefix == "SUMOFF" && dir_name.find("Disk") != string::npos)
+              nbin = 28;
+            else if (dir_name.find("Disk") != string::npos)
+              nbin = 56;
+            else if (dir_name.find("Blade") != string::npos)
+              nbin = 2;
             getGrandSummaryME(iBooker, iGetter, nbin, me_name, gsum_mes);
           }
 
-	  for (vector<MonitorElement*>::const_iterator igm = gsum_mes.begin();
-	       igm != gsum_mes.end(); igm++) { 
-	    if ((*igm)->getName().find(var) != string::npos) {
-	      if(prefix=="SUMOFF") (*igm)->setAxisTitle("Blades",1);
-	      else if((*igm)->getName().find("adcCOMB_")!=string::npos) (*igm)->setAxisTitle("Digi charge [ADC]",1);
-	      else if((*igm)->getName().find("chargeCOMB_")!=string::npos) (*igm)->setAxisTitle("Cluster charge [kilo electrons]",1);
-	      else (*igm)->setAxisTitle("Modules",1);
-	      string title="";
-	      if((*igm)->getName().find("NErrors_") != string::npos && prefix=="SUMOFF") title = "Total number of errors per Blade";
-	      else if((*igm)->getName().find("NErrors_") != string::npos && prefix=="SUMRAW") title = "Total number of errors per Module";
-	      else if(prefix=="SUMOFF") title = "mean " + (*iv) + " per Blade"; 
-	      else if((*igm)->getName().find("FREQ_") != string::npos) title = "NEvents with digis per Module"; 
-	      else if((*igm)->getName().find("adcCOMB_")!=string::npos) title = "NDigis";
-	      else if((*igm)->getName().find("chargeCOMB_")!=string::npos) title = "NClusters";
-	      else title = "mean " + (*iv) + " per Module"; 
-	      (*igm)->setAxisTitle(title,2);
-	      nbin_i=0; 
-	      if (!isUpgrade) {
-	      if((*igm)->getName().find("ALLMODS_adcCOMB_")!=string::npos){
-		nbin_subdir=128;
-	      }else if((*igm)->getName().find("ALLMODS_chargeCOMB_")!=string::npos){
-		nbin_subdir=100;
-	      }else if((*igm)->getName().find("Panel_") != string::npos){
-		nbin_subdir=7;
-	      }else if((*igm)->getName().find("Blade") != string::npos){
-		if((*im).find("_1") != string::npos) nbin_subdir=4;
-		if((*im).find("_2") != string::npos) {nbin_i=4; nbin_subdir=3;}
-	      }else if((*igm)->getName().find("Disk") != string::npos){
-		nbin_i=((cnt-1)%12)*7; nbin_subdir=7;
-	      }else if((*igm)->getName().find("HalfCylinder") != string::npos){
-		if(prefix!="SUMOFF"){
-		  nbin_subdir=84;
-		  if((*im).find("_2") != string::npos) nbin_i=84;
-		}else{
-		  nbin_subdir=12;
-		  if((*im).find("_2") != string::npos) nbin_i=12;
-		}
-	      }else if((*igm)->getName().find("Endcap") != string::npos){
-		if(prefix!="SUMOFF"){
-		  nbin_subdir=168;
-		  if((*im).find("_mO") != string::npos) nbin_i=168;
-		  if((*im).find("_pI") != string::npos) nbin_i=336;
-		  if((*im).find("_pO") != string::npos) nbin_i=504;
-		}else{
-		  nbin_subdir=24;
-		  if((*im).find("_mO") != string::npos) nbin_i=24;
-		  if((*im).find("_pI") != string::npos) nbin_i=48;
-		  if((*im).find("_pO") != string::npos) nbin_i=72;
-		}
-	      }
+          for (vector<MonitorElement *>::const_iterator igm = gsum_mes.begin(); igm != gsum_mes.end(); igm++) {
+            if ((*igm)->getName().find(var) != string::npos) {
+              if (prefix == "SUMOFF")
+                (*igm)->setAxisTitle("Blades", 1);
+              else if ((*igm)->getName().find("adcCOMB_") != string::npos)
+                (*igm)->setAxisTitle("Digi charge [ADC]", 1);
+              else if ((*igm)->getName().find("chargeCOMB_") != string::npos)
+                (*igm)->setAxisTitle("Cluster charge [kilo electrons]", 1);
+              else
+                (*igm)->setAxisTitle("Modules", 1);
+              string title = "";
+              if ((*igm)->getName().find("NErrors_") != string::npos && prefix == "SUMOFF")
+                title = "Total number of errors per Blade";
+              else if ((*igm)->getName().find("NErrors_") != string::npos && prefix == "SUMRAW")
+                title = "Total number of errors per Module";
+              else if (prefix == "SUMOFF")
+                title = "mean " + (*iv) + " per Blade";
+              else if ((*igm)->getName().find("FREQ_") != string::npos)
+                title = "NEvents with digis per Module";
+              else if ((*igm)->getName().find("adcCOMB_") != string::npos)
+                title = "NDigis";
+              else if ((*igm)->getName().find("chargeCOMB_") != string::npos)
+                title = "NClusters";
+              else
+                title = "mean " + (*iv) + " per Module";
+              (*igm)->setAxisTitle(title, 2);
+              nbin_i = 0;
+              if (!isUpgrade) {
+                if ((*igm)->getName().find("ALLMODS_adcCOMB_") != string::npos) {
+                  nbin_subdir = 128;
+                } else if ((*igm)->getName().find("ALLMODS_chargeCOMB_") != string::npos) {
+                  nbin_subdir = 100;
+                } else if ((*igm)->getName().find("Panel_") != string::npos) {
+                  nbin_subdir = 7;
+                } else if ((*igm)->getName().find("Blade") != string::npos) {
+                  if ((*im).find("_1") != string::npos)
+                    nbin_subdir = 4;
+                  if ((*im).find("_2") != string::npos) {
+                    nbin_i = 4;
+                    nbin_subdir = 3;
+                  }
+                } else if ((*igm)->getName().find("Disk") != string::npos) {
+                  nbin_i = ((cnt - 1) % 12) * 7;
+                  nbin_subdir = 7;
+                } else if ((*igm)->getName().find("HalfCylinder") != string::npos) {
+                  if (prefix != "SUMOFF") {
+                    nbin_subdir = 84;
+                    if ((*im).find("_2") != string::npos)
+                      nbin_i = 84;
+                  } else {
+                    nbin_subdir = 12;
+                    if ((*im).find("_2") != string::npos)
+                      nbin_i = 12;
+                  }
+                } else if ((*igm)->getName().find("Endcap") != string::npos) {
+                  if (prefix != "SUMOFF") {
+                    nbin_subdir = 168;
+                    if ((*im).find("_mO") != string::npos)
+                      nbin_i = 168;
+                    if ((*im).find("_pI") != string::npos)
+                      nbin_i = 336;
+                    if ((*im).find("_pO") != string::npos)
+                      nbin_i = 504;
+                  } else {
+                    nbin_subdir = 24;
+                    if ((*im).find("_mO") != string::npos)
+                      nbin_i = 24;
+                    if ((*im).find("_pI") != string::npos)
+                      nbin_i = 48;
+                    if ((*im).find("_pO") != string::npos)
+                      nbin_i = 72;
+                  }
+                }
               } else if (isUpgrade) {
-                if((*igm)->getName().find("ALLMODS_adcCOMB_")!=string::npos){
-		  nbin_subdir=128;
-	        }else if((*igm)->getName().find("ALLMODS_chargeCOMB_")!=string::npos){
-		  nbin_subdir=100;
-	        }else if((*igm)->getName().find("Panel_") != string::npos){
-		  nbin_subdir=2;
-	        }else if((*igm)->getName().find("Blade") != string::npos){
-		  if((*im).find("_1") != string::npos) nbin_subdir=1;
-		  if((*im).find("_2") != string::npos) {nbin_i=1; nbin_subdir=1;}
-	        }else if((*igm)->getName().find("Disk") != string::npos){
-		  nbin_i=((cnt-1)%28)*2; nbin_subdir=2;
-	        }else if((*igm)->getName().find("HalfCylinder") != string::npos){
-		  if(prefix!="SUMOFF"){
-		    nbin_subdir=56;
-		    if((*im).find("_2") != string::npos) nbin_i=56;
-                    if((*im).find("_3") != string::npos) nbin_i=112;
-		  }else{
-		    nbin_subdir=28;
-		    if((*im).find("_2") != string::npos) nbin_i=28;
-                    if((*im).find("_3") != string::npos) nbin_i=56;
-		  }
-	        }else if((*igm)->getName().find("Endcap") != string::npos){
-		  if(prefix!="SUMOFF"){
-		    nbin_subdir=168;
-		    if((*im).find("_mO") != string::npos) nbin_i=168;
-		    if((*im).find("_pI") != string::npos) nbin_i=336;
-		    if((*im).find("_pO") != string::npos) nbin_i=504;
-		  }else{
-		    nbin_subdir=84;
-		    if((*im).find("_mO") != string::npos) nbin_i=84;
-		    if((*im).find("_pI") != string::npos) nbin_i=168;
-		    if((*im).find("_pO") != string::npos) nbin_i=252;
-		  }
-	        }
+                if ((*igm)->getName().find("ALLMODS_adcCOMB_") != string::npos) {
+                  nbin_subdir = 128;
+                } else if ((*igm)->getName().find("ALLMODS_chargeCOMB_") != string::npos) {
+                  nbin_subdir = 100;
+                } else if ((*igm)->getName().find("Panel_") != string::npos) {
+                  nbin_subdir = 2;
+                } else if ((*igm)->getName().find("Blade") != string::npos) {
+                  if ((*im).find("_1") != string::npos)
+                    nbin_subdir = 1;
+                  if ((*im).find("_2") != string::npos) {
+                    nbin_i = 1;
+                    nbin_subdir = 1;
+                  }
+                } else if ((*igm)->getName().find("Disk") != string::npos) {
+                  nbin_i = ((cnt - 1) % 28) * 2;
+                  nbin_subdir = 2;
+                } else if ((*igm)->getName().find("HalfCylinder") != string::npos) {
+                  if (prefix != "SUMOFF") {
+                    nbin_subdir = 56;
+                    if ((*im).find("_2") != string::npos)
+                      nbin_i = 56;
+                    if ((*im).find("_3") != string::npos)
+                      nbin_i = 112;
+                  } else {
+                    nbin_subdir = 28;
+                    if ((*im).find("_2") != string::npos)
+                      nbin_i = 28;
+                    if ((*im).find("_3") != string::npos)
+                      nbin_i = 56;
+                  }
+                } else if ((*igm)->getName().find("Endcap") != string::npos) {
+                  if (prefix != "SUMOFF") {
+                    nbin_subdir = 168;
+                    if ((*im).find("_mO") != string::npos)
+                      nbin_i = 168;
+                    if ((*im).find("_pI") != string::npos)
+                      nbin_i = 336;
+                    if ((*im).find("_pO") != string::npos)
+                      nbin_i = 504;
+                  } else {
+                    nbin_subdir = 84;
+                    if ((*im).find("_mO") != string::npos)
+                      nbin_i = 84;
+                    if ((*im).find("_pI") != string::npos)
+                      nbin_i = 168;
+                    if ((*im).find("_pO") != string::npos)
+                      nbin_i = 252;
+                  }
+                }
+              }
+
+              if ((*igm)->getName().find("ndigisFREQ") == string::npos) {
+                if (((*igm)->getName().find("adcCOMB") != string::npos &&
+                     me->getName().find("adcCOMB") != string::npos) ||
+                    ((*igm)->getName().find("chargeCOMB") != string::npos &&
+                     me->getName().find("chargeCOMB") != string::npos)) {
+                  (*igm)->getTH1F()->Add(me->getTH1F());
+                } else if (((*igm)->getName().find("charge_") != string::npos &&
+                            (*igm)->getName().find("Track_") == string::npos &&
+                            me->getName().find("charge_") != string::npos &&
+                            me->getName().find("Track_") == string::npos) ||
+                           ((*igm)->getName().find("nclusters_") != string::npos &&
+                            (*igm)->getName().find("Track_") == string::npos &&
+                            me->getName().find("nclusters_") != string::npos &&
+                            me->getName().find("Track_") == string::npos) ||
+                           ((*igm)->getName().find("size_") != string::npos &&
+                            (*igm)->getName().find("Track_") == string::npos &&
+                            me->getName().find("size_") != string::npos &&
+                            me->getName().find("Track_") == string::npos) ||
+                           ((*igm)->getName().find("charge_OffTrack_") != string::npos &&
+                            me->getName().find("charge_OffTrack_") != string::npos) ||
+                           ((*igm)->getName().find("nclusters_OffTrack_") != string::npos &&
+                            me->getName().find("nclusters_OffTrack_") != string::npos) ||
+                           ((*igm)->getName().find("size_OffTrack_") != string::npos &&
+                            me->getName().find("size_OffTrack_") != string::npos) ||
+                           ((*igm)->getName().find("charge_OnTrack_") != string::npos &&
+                            me->getName().find("charge_OnTrack_") != string::npos) ||
+                           ((*igm)->getName().find("nclusters_OnTrack_") != string::npos &&
+                            me->getName().find("nclusters_OnTrack_") != string::npos) ||
+                           ((*igm)->getName().find("size_OnTrack_") != string::npos &&
+                            me->getName().find("size_OnTrack_") != string::npos) ||
+                           ((*igm)->getName().find("charge_") == string::npos &&
+                            (*igm)->getName().find("nclusters_") == string::npos &&
+                            (*igm)->getName().find("size_") == string::npos)) {
+                  for (int k = 1; k < nbin_subdir + 1; k++)
+                    if (me->getBinContent(k) > 0)
+                      (*igm)->setBinContent(k + nbin_i, me->getBinContent(k));
+                }
+              } else if (me->getName().find("ndigisFREQ") != string::npos) {
+                for (int k = 1; k < nbin_subdir + 1; k++)
+                  if (me->getBinContent(k) > 0)
+                    (*igm)->setBinContent(k + nbin_i, me->getBinContent(k));
               }
-							
-	      if((*igm)->getName().find("ndigisFREQ")==string::npos){ 
-		if(((*igm)->getName().find("adcCOMB")!=string::npos && me->getName().find("adcCOMB")!=string::npos) || ((*igm)->getName().find("chargeCOMB")!=string::npos && me->getName().find("chargeCOMB")!=string::npos)){
-		  (*igm)->getTH1F()->Add(me->getTH1F());
-		}else if(((*igm)->getName().find("charge_")!=string::npos && (*igm)->getName().find("Track_")==string::npos && 
-			   me->getName().find("charge_")!=string::npos && me->getName().find("Track_")==string::npos) || 
-			  ((*igm)->getName().find("nclusters_")!=string::npos && (*igm)->getName().find("Track_")==string::npos && 
-			   me->getName().find("nclusters_")!=string::npos && me->getName().find("Track_")==string::npos) || 
-			  ((*igm)->getName().find("size_")!=string::npos && (*igm)->getName().find("Track_")==string::npos && 
-			   me->getName().find("size_")!=string::npos && me->getName().find("Track_")==string::npos) || 
-			  ((*igm)->getName().find("charge_OffTrack_")!=string::npos && me->getName().find("charge_OffTrack_")!=string::npos) || 
-			  ((*igm)->getName().find("nclusters_OffTrack_")!=string::npos && me->getName().find("nclusters_OffTrack_")!=string::npos) || 
-			  ((*igm)->getName().find("size_OffTrack_")!=string::npos && me->getName().find("size_OffTrack_")!=string::npos) || 
-			  ((*igm)->getName().find("charge_OnTrack_")!=string::npos && me->getName().find("charge_OnTrack_")!=string::npos) || 
-			  ((*igm)->getName().find("nclusters_OnTrack_")!=string::npos && me->getName().find("nclusters_OnTrack_")!=string::npos) || 
-			  ((*igm)->getName().find("size_OnTrack_")!=string::npos && me->getName().find("size_OnTrack_")!=string::npos) || 
-			  ((*igm)->getName().find("charge_")==string::npos && (*igm)->getName().find("nclusters_")==string::npos && 
-			   (*igm)->getName().find("size_")==string::npos)){
-		  for (int k = 1; k < nbin_subdir+1; k++) if(me->getBinContent(k) > 0) (*igm)->setBinContent(k+nbin_i, me->getBinContent(k));
-		}
-	      }else if(me->getName().find("ndigisFREQ")!=string::npos){
-		for (int k = 1; k < nbin_subdir+1; k++)  if(me->getBinContent(k) > 0) (*igm)->setBinContent(k+nbin_i, me->getBinContent(k));
-	      }
-	      //	       }// for
-							
-	    }
-	  }
-	}
+              //	       }// for
+            }
+          }
+        }
       }
     }
-		
+
     iDir++;
-  first_subdir = false; // We are done processing the first directory, we don't add any new MEs in the future passes.	
-  }  // end for it (subdirs)
+    first_subdir = false;  // We are done processing the first directory, we
+                           // don't add any new MEs in the future passes.
+  }                        // end for it (subdirs)
 }
 //=============================================================================================================
 //
 // -- Get Summary ME
 //
-void SiPixelActionExecutor::getGrandSummaryME(DQMStore::IBooker& iBooker,
-					      DQMStore::IGetter & iGetter,
-                                              int nbin, 
-					      string& me_name, 
-					      vector<MonitorElement*> & mes) {
-  //printing cout<<"Entering SiPixelActionExecutor::getGrandSummaryME for: "<<me_name<<endl;
-  if((iBooker.pwd()).find("Pixel")==string::npos) return; // If one doesn't find pixel
+void SiPixelActionExecutor::getGrandSummaryME(
+    DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter, int nbin, string &me_name, vector<MonitorElement *> &mes) {
+  // printing cout<<"Entering SiPixelActionExecutor::getGrandSummaryME for:
+  // "<<me_name<<endl;
+  if ((iBooker.pwd()).find("Pixel") == string::npos)
+    return;  // If one doesn't find pixel
   vector<string> contents = iGetter.getMEs();
-	
-  for (vector<string>::const_iterator it = contents.begin();
-       it != contents.end(); it++) {
-    //printing cout<<"in grand summary me: "<<me_name<<","<<(*it)<<endl;
+
+  for (vector<string>::const_iterator it = contents.begin(); it != contents.end(); it++) {
+    // printing cout<<"in grand summary me: "<<me_name<<","<<(*it)<<endl;
     if ((*it).find(me_name) == 0) {
       string fullpathname = iBooker.pwd() + "/" + me_name;
-      MonitorElement* me = iGetter.get(fullpathname);
-			
+      MonitorElement *me = iGetter.get(fullpathname);
+
       if (me) {
-	me->Reset();
-	mes.push_back(me);
-	return;
+        me->Reset();
+        mes.push_back(me);
+        return;
       }
     }
   }
 
-  MonitorElement* temp_me(nullptr);
-  if(me_name.find("ALLMODS_adcCOMB_")!=string::npos) temp_me = iBooker.book1D(me_name.c_str(),me_name.c_str(),128,0,256);
-  else if(me_name.find("ALLMODS_chargeCOMB_")!=string::npos) temp_me = iBooker.book1D(me_name.c_str(),me_name.c_str(),100,0,200);
-  else temp_me = iBooker.book1D(me_name.c_str(),me_name.c_str(),nbin,1.,nbin+1.);
-  if (temp_me) mes.push_back(temp_me);
-	
+  MonitorElement *temp_me(nullptr);
+  if (me_name.find("ALLMODS_adcCOMB_") != string::npos)
+    temp_me = iBooker.book1D(me_name.c_str(), me_name.c_str(), 128, 0, 256);
+  else if (me_name.find("ALLMODS_chargeCOMB_") != string::npos)
+    temp_me = iBooker.book1D(me_name.c_str(), me_name.c_str(), 100, 0, 200);
+  else
+    temp_me = iBooker.book1D(me_name.c_str(), me_name.c_str(), nbin, 1., nbin + 1.);
+  if (temp_me)
+    mes.push_back(temp_me);
+
   //  if(temp_me) cout<<"finally found grand ME: "<<me_name<<endl;
 }
 
-
 //=============================================================================================================
 //
 // -- Get Summary ME
 //
-MonitorElement* SiPixelActionExecutor::getSummaryME(DQMStore::IBooker & iBooker,
-						    DQMStore::IGetter & iGetter,
+MonitorElement *SiPixelActionExecutor::getSummaryME(DQMStore::IBooker &iBooker,
+                                                    DQMStore::IGetter &iGetter,
                                                     string me_name,
                                                     bool isUpgrade) {
-  //printing cout<<"Entering SiPixelActionExecutor::getSummaryME for: "<<me_name<<endl;
-  MonitorElement* me = nullptr;
-  if((iBooker.pwd()).find("Pixel")==string::npos) return me;
-  vector<string> contents = iGetter.getMEs();    
-	
-  for (vector<string>::const_iterator it = contents.begin();
-       it != contents.end(); it++) {
+  // printing cout<<"Entering SiPixelActionExecutor::getSummaryME for:
+  // "<<me_name<<endl;
+  MonitorElement *me = nullptr;
+  if ((iBooker.pwd()).find("Pixel") == string::npos)
+    return me;
+  vector<string> contents = iGetter.getMEs();
+
+  for (vector<string>::const_iterator it = contents.begin(); it != contents.end(); it++) {
     if ((*it).find(me_name) == 0) {
-      string fullpathname = iBooker.pwd() + "/" + (*it); 
+      string fullpathname = iBooker.pwd() + "/" + (*it);
       me = iGetter.get(fullpathname);
       if (me) {
-	me->Reset();
-	return me;
+        me->Reset();
+        return me;
       }
     }
   }
   contents.clear();
   if (!isUpgrade) {
-  if(me_name.find("SUMOFF")==string::npos){
-  	if(me_name.find("Blade_")!=string::npos)me = iBooker.book1D(me_name.c_str(), me_name.c_str(),7,1.,8.);
-	else me = iBooker.book1D(me_name.c_str(), me_name.c_str(),4,1.,5.);
-  }else if(me_name.find("Layer_1")!=string::npos){ me = iBooker.book1D(me_name.c_str(), me_name.c_str(),10,1.,11.);
-  }else if(me_name.find("Layer_2")!=string::npos){ me = iBooker.book1D(me_name.c_str(), me_name.c_str(),16,1.,17.);
-  }else if(me_name.find("Layer_3")!=string::npos){ me = iBooker.book1D(me_name.c_str(), me_name.c_str(),22,1.,23.);
-  }else if(me_name.find("Disk_")!=string::npos){ me = iBooker.book1D(me_name.c_str(), me_name.c_str(),12,1.,13.);
-  }
-  }//endifNOTUpgrade
+    if (me_name.find("SUMOFF") == string::npos) {
+      if (me_name.find("Blade_") != string::npos)
+        me = iBooker.book1D(me_name.c_str(), me_name.c_str(), 7, 1., 8.);
+      else
+        me = iBooker.book1D(me_name.c_str(), me_name.c_str(), 4, 1., 5.);
+    } else if (me_name.find("Layer_1") != string::npos) {
+      me = iBooker.book1D(me_name.c_str(), me_name.c_str(), 10, 1., 11.);
+    } else if (me_name.find("Layer_2") != string::npos) {
+      me = iBooker.book1D(me_name.c_str(), me_name.c_str(), 16, 1., 17.);
+    } else if (me_name.find("Layer_3") != string::npos) {
+      me = iBooker.book1D(me_name.c_str(), me_name.c_str(), 22, 1., 23.);
+    } else if (me_name.find("Disk_") != string::npos) {
+      me = iBooker.book1D(me_name.c_str(), me_name.c_str(), 12, 1., 13.);
+    }
+  }  // endifNOTUpgrade
   else if (isUpgrade) {
-    if(me_name.find("SUMOFF")==string::npos){
-      if(me_name.find("Blade_")!=string::npos)me = iBooker.book1D(me_name.c_str(), me_name.c_str(),2,1.,3.);
-      else me = iBooker.book1D(me_name.c_str(), me_name.c_str(),1,1.,2.);
-    }else if(me_name.find("Layer_1")!=string::npos){ me = iBooker.book1D(me_name.c_str(), me_name.c_str(),6,1.,7.);
-    }else if(me_name.find("Layer_2")!=string::npos){ me = iBooker.book1D(me_name.c_str(), me_name.c_str(),14,1.,15.);
-    }else if(me_name.find("Layer_3")!=string::npos){ me = iBooker.book1D(me_name.c_str(), me_name.c_str(),22,1.,23.);
-    }else if(me_name.find("Layer_4")!=string::npos){ me = iBooker.book1D(me_name.c_str(), me_name.c_str(),32,1.,33.);
-    }else if(me_name.find("Disk_")!=string::npos){ me = iBooker.book1D(me_name.c_str(), me_name.c_str(),28,1.,29.);
+    if (me_name.find("SUMOFF") == string::npos) {
+      if (me_name.find("Blade_") != string::npos)
+        me = iBooker.book1D(me_name.c_str(), me_name.c_str(), 2, 1., 3.);
+      else
+        me = iBooker.book1D(me_name.c_str(), me_name.c_str(), 1, 1., 2.);
+    } else if (me_name.find("Layer_1") != string::npos) {
+      me = iBooker.book1D(me_name.c_str(), me_name.c_str(), 6, 1., 7.);
+    } else if (me_name.find("Layer_2") != string::npos) {
+      me = iBooker.book1D(me_name.c_str(), me_name.c_str(), 14, 1., 15.);
+    } else if (me_name.find("Layer_3") != string::npos) {
+      me = iBooker.book1D(me_name.c_str(), me_name.c_str(), 22, 1., 23.);
+    } else if (me_name.find("Layer_4") != string::npos) {
+      me = iBooker.book1D(me_name.c_str(), me_name.c_str(), 32, 1., 33.);
+    } else if (me_name.find("Disk_") != string::npos) {
+      me = iBooker.book1D(me_name.c_str(), me_name.c_str(), 28, 1., 29.);
     }
-  }//endifUpgrade
-  	
+  }  // endifUpgrade
+
   return me;
 }
 
-
 //=============================================================================================================
-MonitorElement* SiPixelActionExecutor::getFEDSummaryME(DQMStore::IBooker & iBooker,
-						       DQMStore::IGetter & iGetter,
+MonitorElement *SiPixelActionExecutor::getFEDSummaryME(DQMStore::IBooker &iBooker,
+                                                       DQMStore::IGetter &iGetter,
                                                        string me_name) {
-  //printing cout<<"Entering SiPixelActionExecutor::getFEDSummaryME..."<<endl;
-  MonitorElement* me = nullptr;
-  if((iBooker.pwd()).find("Pixel")==string::npos) return me;
+  // printing cout<<"Entering SiPixelActionExecutor::getFEDSummaryME..."<<endl;
+  MonitorElement *me = nullptr;
+  if ((iBooker.pwd()).find("Pixel") == string::npos)
+    return me;
   vector<string> contents = iGetter.getMEs();
-	
-  for (vector<string>::const_iterator it = contents.begin();
-       it != contents.end(); it++) {
+
+  for (vector<string>::const_iterator it = contents.begin(); it != contents.end(); it++) {
     if ((*it).find(me_name) == 0) {
-      string fullpathname = iBooker.pwd() + "/" + (*it); 
-			
+      string fullpathname = iBooker.pwd() + "/" + (*it);
+
       me = iGetter.get(fullpathname);
-			
+
       if (me) {
-	me->Reset();
-	return me;
+        me->Reset();
+        return me;
       }
     }
   }
   contents.clear();
-  me = iBooker.book1D(me_name.c_str(), me_name.c_str(),40,-0.5,39.5);
+  me = iBooker.book1D(me_name.c_str(), me_name.c_str(), 40, -0.5, 39.5);
 
   return me;
 }
 
 //=============================================================================================================
-void SiPixelActionExecutor::bookOccupancyPlots(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter, bool hiRes, bool isbarrel) // Polymorphism
+void SiPixelActionExecutor::bookOccupancyPlots(DQMStore::IBooker &iBooker,
+                                               DQMStore::IGetter &iGetter,
+                                               bool hiRes,
+                                               bool isbarrel)  // Polymorphism
 {
-  if(Tier0Flag_) return;
+  if (Tier0Flag_)
+    return;
   vector<string> subdirs = iGetter.getSubdirs();
-  for (vector<string>::const_iterator it = subdirs.begin(); it != subdirs.end(); it++)
-    {
-      if(isbarrel && (*it).find("Barrel")==string::npos) continue;
-      if(!isbarrel && (*it).find("Endcap")==string::npos) continue;
-		
-      if((*it).find("Module_")!=string::npos) continue;
-      if((*it).find("Panel_")!=string::npos) continue;
-      if((*it).find("Ladder_")!=string::npos) continue;
-      if((*it).find("Blade_")!=string::npos) continue;
-      if((*it).find("Layer_")!=string::npos) continue;
-      if((*it).find("Disk_")!=string::npos) continue;
-      iBooker.cd(*it);
-      iGetter.cd(*it);
-      bookOccupancyPlots(iBooker, iGetter, hiRes, isbarrel);
-      if(!hiRes){
-	//occupancyprinting cout<<"booking low res barrel occ plot now!"<<endl;
-	OccupancyMap = iBooker.book2D((isbarrel?"barrelOccupancyMap":"endcapOccupancyMap"),"Barrel Digi Occupancy Map (4 pix per bin)",isbarrel?208:130,0.,isbarrel?416.:260.,80,0.,160.);
-      }else{
-	//occupancyprinting cout<<"booking high res barrel occ plot now!"<<endl;
-	OccupancyMap = iBooker.book2D((isbarrel?"barrelOccupancyMap":"endcapOccupancyMap"),"Barrel Digi Occupancy Map (1 pix per bin)",isbarrel?416:260,0.,isbarrel?416.:260.,160,0.,160.);
-      }
-      OccupancyMap->setAxisTitle("Columns",1);
-      OccupancyMap->setAxisTitle("Rows",2);
-		
-      iBooker.goUp();
-      iGetter.setCurrentFolder(iBooker.pwd());
-		
+  for (vector<string>::const_iterator it = subdirs.begin(); it != subdirs.end(); it++) {
+    if (isbarrel && (*it).find("Barrel") == string::npos)
+      continue;
+    if (!isbarrel && (*it).find("Endcap") == string::npos)
+      continue;
+
+    if ((*it).find("Module_") != string::npos)
+      continue;
+    if ((*it).find("Panel_") != string::npos)
+      continue;
+    if ((*it).find("Ladder_") != string::npos)
+      continue;
+    if ((*it).find("Blade_") != string::npos)
+      continue;
+    if ((*it).find("Layer_") != string::npos)
+      continue;
+    if ((*it).find("Disk_") != string::npos)
+      continue;
+    iBooker.cd(*it);
+    iGetter.cd(*it);
+    bookOccupancyPlots(iBooker, iGetter, hiRes, isbarrel);
+    if (!hiRes) {
+      // occupancyprinting cout<<"booking low res barrel occ plot now!"<<endl;
+      OccupancyMap = iBooker.book2D((isbarrel ? "barrelOccupancyMap" : "endcapOccupancyMap"),
+                                    "Barrel Digi Occupancy Map (4 pix per bin)",
+                                    isbarrel ? 208 : 130,
+                                    0.,
+                                    isbarrel ? 416. : 260.,
+                                    80,
+                                    0.,
+                                    160.);
+    } else {
+      // occupancyprinting cout<<"booking high res barrel occ plot now!"<<endl;
+      OccupancyMap = iBooker.book2D((isbarrel ? "barrelOccupancyMap" : "endcapOccupancyMap"),
+                                    "Barrel Digi Occupancy Map (1 pix per bin)",
+                                    isbarrel ? 416 : 260,
+                                    0.,
+                                    isbarrel ? 416. : 260.,
+                                    160,
+                                    0.,
+                                    160.);
     }
-	
-	
-	
+    OccupancyMap->setAxisTitle("Columns", 1);
+    OccupancyMap->setAxisTitle("Rows", 2);
+
+    iBooker.goUp();
+    iGetter.setCurrentFolder(iBooker.pwd());
+  }
 }
 //=============================================================================================================
-void SiPixelActionExecutor::bookOccupancyPlots(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter, bool hiRes) {
-	
-  if(Tier0Flag_) return;
+void SiPixelActionExecutor::bookOccupancyPlots(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter, bool hiRes) {
+  if (Tier0Flag_)
+    return;
   // Barrel
   iGetter.cd();
   iBooker.cd();
   iGetter.setCurrentFolder("Pixel");
   iBooker.setCurrentFolder("Pixel");
   this->bookOccupancyPlots(iBooker, iGetter, hiRes, true);
-	
+
   // Endcap
   iGetter.cd();
   iBooker.cd();
   iGetter.setCurrentFolder("Pixel");
   iBooker.setCurrentFolder("Pixel");
   this->bookOccupancyPlots(iBooker, iGetter, hiRes, false);
-
 }
 
-void SiPixelActionExecutor::createOccupancy(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter) {
-  //std::cout<<"entering SiPixelActionExecutor::createOccupancy..."<<std::endl;
-  if(Tier0Flag_) return;
+void SiPixelActionExecutor::createOccupancy(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter) {
+  // std::cout<<"entering SiPixelActionExecutor::createOccupancy..."<<std::endl;
+  if (Tier0Flag_)
+    return;
   iBooker.cd();
   iGetter.cd();
-  fillOccupancy(iBooker,iGetter, true);
+  fillOccupancy(iBooker, iGetter, true);
   iBooker.cd();
   iGetter.cd();
-  fillOccupancy(iBooker,iGetter, false);
+  fillOccupancy(iBooker, iGetter, false);
   iBooker.cd();
   iGetter.cd();
 
-  //std::cout<<"leaving SiPixelActionExecutor::createOccupancy..."<<std::endl;
+  // std::cout<<"leaving SiPixelActionExecutor::createOccupancy..."<<std::endl;
 }
 
 //=============================================================================================================
 
-void SiPixelActionExecutor::fillOccupancy(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter, bool isbarrel)
-{
-  //occupancyprinting cout<<"entering SiPixelActionExecutor::fillOccupancy..."<<std::endl;
-  if(Tier0Flag_) return;
+void SiPixelActionExecutor::fillOccupancy(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter, bool isbarrel) {
+  // occupancyprinting cout<<"entering
+  // SiPixelActionExecutor::fillOccupancy..."<<std::endl;
+  if (Tier0Flag_)
+    return;
   string currDir = iBooker.pwd();
-  string dname = currDir.substr(currDir.find_last_of("/")+1);
-	
-  if(dname.find("Layer_")!=string::npos || dname.find("Disk_")!=string::npos){ 
+  string dname = currDir.substr(currDir.find_last_of("/") + 1);
+
+  if (dname.find("Layer_") != string::npos || dname.find("Disk_") != string::npos) {
     vector<string> meVec = iGetter.getMEs();
     for (vector<string>::const_iterator it = meVec.begin(); it != meVec.end(); it++) {
       string full_path = currDir + "/" + (*it);
-      if(full_path.find("hitmap_siPixelDigis")!=string::npos){ // If we have the hitmap ME
-	MonitorElement * me = iGetter.get(full_path);
-	if (!me) continue;
-	string path = full_path;
-	while (path.find_last_of("/") != 5) // Stop before Pixel/
-	  {
-	    path = path.substr(0,path.find_last_of("/"));
-	    //							cout << "\t" << path << endl;
-	    OccupancyMap = iGetter.get(path + "/" + (isbarrel?"barrel":"endcap") + "OccupancyMap");
-					
-	    if(OccupancyMap){ 
-		for(int i=1; i!=me->getNbinsX()+1; i++) for(int j=1; j!=me->getNbinsY()+1; j++){
-		  float previous = OccupancyMap->getBinContent(i,j);
-		  OccupancyMap->setBinContent(i,j,previous + me->getBinContent(i,j));
-		}
-	      OccupancyMap->getTH2F()->SetEntries(OccupancyMap->getTH2F()->Integral());
-	    }       
-					
-	  }
+      if (full_path.find("hitmap_siPixelDigis") != string::npos) {  // If we have the hitmap ME
+        MonitorElement *me = iGetter.get(full_path);
+        if (!me)
+          continue;
+        string path = full_path;
+        while (path.find_last_of("/") != 5)  // Stop before Pixel/
+        {
+          path = path.substr(0, path.find_last_of("/"));
+          //							cout << "\t" <<
+          // path
+          //<< endl;
+          OccupancyMap = iGetter.get(path + "/" + (isbarrel ? "barrel" : "endcap") + "OccupancyMap");
+
+          if (OccupancyMap) {
+            for (int i = 1; i != me->getNbinsX() + 1; i++)
+              for (int j = 1; j != me->getNbinsY() + 1; j++) {
+                float previous = OccupancyMap->getBinContent(i, j);
+                OccupancyMap->setBinContent(i, j, previous + me->getBinContent(i, j));
+              }
+            OccupancyMap->getTH2F()->SetEntries(OccupancyMap->getTH2F()->Integral());
+          }
+        }
       }
-			
     }
-  } else {  
+  } else {
     vector<string> subdirs = iGetter.getSubdirs();
     for (vector<string>::const_iterator it = subdirs.begin(); it != subdirs.end(); it++) {
       iGetter.cd(*it);
       iBooker.cd(*it);
-      if(*it != "Pixel" && ((isbarrel && (*it).find("Barrel")==string::npos) || (!isbarrel && (*it).find("Endcap")==string::npos))) continue;
-      fillOccupancy(iBooker,iGetter, isbarrel);
+      if (*it != "Pixel" &&
+          ((isbarrel && (*it).find("Barrel") == string::npos) || (!isbarrel && (*it).find("Endcap") == string::npos)))
+        continue;
+      fillOccupancy(iBooker, iGetter, isbarrel);
       iBooker.goUp();
       iGetter.setCurrentFolder(iBooker.pwd());
     }
   }
-	
-  //occupancyprinting cout<<"leaving SiPixelActionExecutor::fillOccupancy..."<<std::endl;
-	
+
+  // occupancyprinting cout<<"leaving
+  // SiPixelActionExecutor::fillOccupancy..."<<std::endl;
 }
 
 //=============================================================================================================
 
-void SiPixelActionExecutor::normaliseAvDigiOcc(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter){
-  //occupancyprinting cout<<"entering SiPixelActionExecutor::normaliseAvDigiOcc..."<<std::endl;
-  
+void SiPixelActionExecutor::normaliseAvDigiOcc(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter) {
+  // occupancyprinting cout<<"entering
+  // SiPixelActionExecutor::normaliseAvDigiOcc..."<<std::endl;
+
   iGetter.cd();
 
-  MonitorElement * roccupancyPlot = iGetter.get("Pixel/averageDigiOccupancy");
-  
+  MonitorElement *roccupancyPlot = iGetter.get("Pixel/averageDigiOccupancy");
+
   float totalDigisBPIX = 0.;
   float totalDigisFPIX = 0.;
-  for (int i = 1; i !=41; i++){
-    if (i < 33) totalDigisBPIX += roccupancyPlot->getBinContent(i);
-    else totalDigisFPIX += roccupancyPlot->getBinContent(i);
-  } 
-  float averageBPIXOcc = totalDigisBPIX/32.;
-  float averageFPIXOcc = totalDigisFPIX/8.;
-  for (int i = 1; i !=41; i++){
-    if (i < 33) roccupancyPlot->setBinContent(i,roccupancyPlot->getBinContent(i)/averageBPIXOcc);
-    else roccupancyPlot->setBinContent(i,roccupancyPlot->getBinContent(i)/averageFPIXOcc);
+  for (int i = 1; i != 41; i++) {
+    if (i < 33)
+      totalDigisBPIX += roccupancyPlot->getBinContent(i);
+    else
+      totalDigisFPIX += roccupancyPlot->getBinContent(i);
   }
-  
+  float averageBPIXOcc = totalDigisBPIX / 32.;
+  float averageFPIXOcc = totalDigisFPIX / 8.;
+  for (int i = 1; i != 41; i++) {
+    if (i < 33)
+      roccupancyPlot->setBinContent(i, roccupancyPlot->getBinContent(i) / averageBPIXOcc);
+    else
+      roccupancyPlot->setBinContent(i, roccupancyPlot->getBinContent(i) / averageFPIXOcc);
+  }
+
   iGetter.setCurrentFolder(iBooker.pwd());
-  
 }
 
 //=============================================================================================================
 
-void SiPixelActionExecutor::normaliseAvDigiOccVsLumi(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter, int lumisec){
-
+void SiPixelActionExecutor::normaliseAvDigiOccVsLumi(DQMStore::IBooker &iBooker,
+                                                     DQMStore::IGetter &iGetter,
+                                                     int lumisec) {
   iGetter.cd();
 
-  MonitorElement* avgfedDigiOccvsLumi = iGetter.get("Pixel/avgfedDigiOccvsLumi");
+  MonitorElement *avgfedDigiOccvsLumi = iGetter.get("Pixel/avgfedDigiOccvsLumi");
 
-  float totalDigisBPIX = 0.; 
+  float totalDigisBPIX = 0.;
   float totalDigisFPIX = 0.;
-  for (int i = 1; i !=41; i++){
-    if (i < 33) totalDigisBPIX += avgfedDigiOccvsLumi->getBinContent(lumisec,i);
-    else        totalDigisFPIX += avgfedDigiOccvsLumi->getBinContent(lumisec,i);
-  }  
-  float averageBPIXOcc = totalDigisBPIX/32.;
-  float averageFPIXOcc = totalDigisFPIX/8.;
-  for (int i = 1; i !=41; i++){
-    if (i < 33) avgfedDigiOccvsLumi->setBinContent(lumisec,i,avgfedDigiOccvsLumi->getBinContent(lumisec,i)/averageBPIXOcc);
-    else        avgfedDigiOccvsLumi->setBinContent(lumisec,i,avgfedDigiOccvsLumi->getBinContent(lumisec,i)/averageFPIXOcc);
+  for (int i = 1; i != 41; i++) {
+    if (i < 33)
+      totalDigisBPIX += avgfedDigiOccvsLumi->getBinContent(lumisec, i);
+    else
+      totalDigisFPIX += avgfedDigiOccvsLumi->getBinContent(lumisec, i);
+  }
+  float averageBPIXOcc = totalDigisBPIX / 32.;
+  float averageFPIXOcc = totalDigisFPIX / 8.;
+  for (int i = 1; i != 41; i++) {
+    if (i < 33)
+      avgfedDigiOccvsLumi->setBinContent(lumisec, i, avgfedDigiOccvsLumi->getBinContent(lumisec, i) / averageBPIXOcc);
+    else
+      avgfedDigiOccvsLumi->setBinContent(lumisec, i, avgfedDigiOccvsLumi->getBinContent(lumisec, i) / averageFPIXOcc);
   }
 
   iGetter.setCurrentFolder(iBooker.pwd());
-
 }
 
 //=============================================================================================================
 
-void SiPixelActionExecutor::bookEfficiency(DQMStore::IBooker & iBooker, bool isUpgrade){
+void SiPixelActionExecutor::bookEfficiency(DQMStore::IBooker &iBooker, bool isUpgrade) {
   // Barrel
   iBooker.cd();
   iBooker.setCurrentFolder("Pixel/Barrel");
   if (!isUpgrade) {
-  if(Tier0Flag_){
-    HitEfficiency_L1 = iBooker.book2D("HitEfficiency_L1","Hit Efficiency in Barrel_Layer1;Module;Ladder",9,-4.5,4.5,21,-10.5,10.5);
-    HitEfficiency_L2 = iBooker.book2D("HitEfficiency_L2","Hit Efficiency in Barrel_Layer2;Module;Ladder",9,-4.5,4.5,33,-16.5,16.5);
-    HitEfficiency_L3 = iBooker.book2D("HitEfficiency_L3","Hit Efficiency in Barrel_Layer3;Module;Ladder",9,-4.5,4.5,45,-22.5,22.5);
-  }else{
-    HitEfficiency_L1 = iBooker.book2D("HitEfficiency_L1","Hit Efficiency in Barrel_Layer1;Module;Ladder",9,-4.5,4.5,21,-10.5,10.5);
-    HitEfficiency_L2 = iBooker.book2D("HitEfficiency_L2","Hit Efficiency in Barrel_Layer2;Module;Ladder",9,-4.5,4.5,33,-16.5,16.5);
-    HitEfficiency_L3 = iBooker.book2D("HitEfficiency_L3","Hit Efficiency in Barrel_Layer3;Module;Ladder",9,-4.5,4.5,45,-22.5,22.5); 
-  }
-  }//endifNOTUpgrade
+    if (Tier0Flag_) {
+      HitEfficiency_L1 = iBooker.book2D(
+          "HitEfficiency_L1", "Hit Efficiency in Barrel_Layer1;Module;Ladder", 9, -4.5, 4.5, 21, -10.5, 10.5);
+      HitEfficiency_L2 = iBooker.book2D(
+          "HitEfficiency_L2", "Hit Efficiency in Barrel_Layer2;Module;Ladder", 9, -4.5, 4.5, 33, -16.5, 16.5);
+      HitEfficiency_L3 = iBooker.book2D(
+          "HitEfficiency_L3", "Hit Efficiency in Barrel_Layer3;Module;Ladder", 9, -4.5, 4.5, 45, -22.5, 22.5);
+    } else {
+      HitEfficiency_L1 = iBooker.book2D(
+          "HitEfficiency_L1", "Hit Efficiency in Barrel_Layer1;Module;Ladder", 9, -4.5, 4.5, 21, -10.5, 10.5);
+      HitEfficiency_L2 = iBooker.book2D(
+          "HitEfficiency_L2", "Hit Efficiency in Barrel_Layer2;Module;Ladder", 9, -4.5, 4.5, 33, -16.5, 16.5);
+      HitEfficiency_L3 = iBooker.book2D(
+          "HitEfficiency_L3", "Hit Efficiency in Barrel_Layer3;Module;Ladder", 9, -4.5, 4.5, 45, -22.5, 22.5);
+    }
+  }  // endifNOTUpgrade
   else if (isUpgrade) {
-      if(Tier0Flag_){
-      HitEfficiency_L1 = iBooker.book2D("HitEfficiency_L1","Hit Efficiency in Barrel_Layer1;z-side;Ladder",2,-1.,1.,12,-6.,6.);
-      HitEfficiency_L2 = iBooker.book2D("HitEfficiency_L2","Hit Efficiency in Barrel_Layer2;z-side;Ladder",2,-1.,1.,28,-14.,14.);
-      HitEfficiency_L3 = iBooker.book2D("HitEfficiency_L3","Hit Efficiency in Barrel_Layer3;z-side;Ladder",2,-1.,1.,44,-22.,22.);
-      HitEfficiency_L4 = iBooker.book2D("HitEfficiency_L4","Hit Efficiency in Barrel_Layer4;z-side;Ladder",2,-1.,1.,64,-32.,32.);
-    }else{
-      HitEfficiency_L1 = iBooker.book2D("HitEfficiency_L1","Hit Efficiency in Barrel_Layer1;Module;Ladder",8,-4.,4.,12,-6.,6.);
-      HitEfficiency_L2 = iBooker.book2D("HitEfficiency_L2","Hit Efficiency in Barrel_Layer2;Module;Ladder",8,-4.,4.,28,-14.,14.);
-      HitEfficiency_L3 = iBooker.book2D("HitEfficiency_L3","Hit Efficiency in Barrel_Layer3;Module;Ladder",8,-4.,4.,44,-22.,22.);
-      HitEfficiency_L4 = iBooker.book2D("HitEfficiency_L4","Hit Efficiency in Barrel_Layer4;Module;Ladder",8,-4.,4.,64,-32.,32.);
+    if (Tier0Flag_) {
+      HitEfficiency_L1 =
+          iBooker.book2D("HitEfficiency_L1", "Hit Efficiency in Barrel_Layer1;z-side;Ladder", 2, -1., 1., 12, -6., 6.);
+      HitEfficiency_L2 = iBooker.book2D(
+          "HitEfficiency_L2", "Hit Efficiency in Barrel_Layer2;z-side;Ladder", 2, -1., 1., 28, -14., 14.);
+      HitEfficiency_L3 = iBooker.book2D(
+          "HitEfficiency_L3", "Hit Efficiency in Barrel_Layer3;z-side;Ladder", 2, -1., 1., 44, -22., 22.);
+      HitEfficiency_L4 = iBooker.book2D(
+          "HitEfficiency_L4", "Hit Efficiency in Barrel_Layer4;z-side;Ladder", 2, -1., 1., 64, -32., 32.);
+    } else {
+      HitEfficiency_L1 =
+          iBooker.book2D("HitEfficiency_L1", "Hit Efficiency in Barrel_Layer1;Module;Ladder", 8, -4., 4., 12, -6., 6.);
+      HitEfficiency_L2 = iBooker.book2D(
+          "HitEfficiency_L2", "Hit Efficiency in Barrel_Layer2;Module;Ladder", 8, -4., 4., 28, -14., 14.);
+      HitEfficiency_L3 = iBooker.book2D(
+          "HitEfficiency_L3", "Hit Efficiency in Barrel_Layer3;Module;Ladder", 8, -4., 4., 44, -22., 22.);
+      HitEfficiency_L4 = iBooker.book2D(
+          "HitEfficiency_L4", "Hit Efficiency in Barrel_Layer4;Module;Ladder", 8, -4., 4., 64, -32., 32.);
     }
-  }//endifUpgrade
+  }  // endifUpgrade
   // Endcap
   iBooker.cd();
   iBooker.setCurrentFolder("Pixel/Endcap");
   if (!isUpgrade) {
-    if(Tier0Flag_){
-      HitEfficiency_Dp1 = iBooker.book2D("HitEfficiency_Dp1","Hit Efficiency in Endcap_Disk_p1;Blade;Panel",26,-13.,13.,2,0.5,2.5);
-      HitEfficiency_Dp2 = iBooker.book2D("HitEfficiency_Dp2","Hit Efficiency in Endcap_Disk_p2;Blade;Panel",26,-13.,13.,2,0.5,2.5);
-      HitEfficiency_Dm1 = iBooker.book2D("HitEfficiency_Dm1","Hit Efficiency in Endcap_Disk_m1;Blade;Panel",26,-13.,13.,2,0.5,2.5);
-      HitEfficiency_Dm2 = iBooker.book2D("HitEfficiency_Dm2","Hit Efficiency in Endcap_Disk_m2;;Blade;Panel",26,-13.,13.,2,0.5,2.5);   
-    }else{
-      HitEfficiency_Dp1 = iBooker.book2D("HitEfficiency_Dp1","Hit Efficiency in Endcap_Disk_p1;Blades;Modules",24,-12.,12.,7,1.,8.);
-      HitEfficiency_Dp2 = iBooker.book2D("HitEfficiency_Dp2","Hit Efficiency in Endcap_Disk_p2;Blades;Modules",24,-12.,12.,7,1.,8.);
-      HitEfficiency_Dm1 = iBooker.book2D("HitEfficiency_Dm1","Hit Efficiency in Endcap_Disk_m1;Blades;Modules",24,-12.,12.,7,1.,8.);
-      HitEfficiency_Dm2 = iBooker.book2D("HitEfficiency_Dm2","Hit Efficiency in Endcap_Disk_m2;Blades;Modules",24,-12.,12.,7,1.,8.);
+    if (Tier0Flag_) {
+      HitEfficiency_Dp1 = iBooker.book2D(
+          "HitEfficiency_Dp1", "Hit Efficiency in Endcap_Disk_p1;Blade;Panel", 26, -13., 13., 2, 0.5, 2.5);
+      HitEfficiency_Dp2 = iBooker.book2D(
+          "HitEfficiency_Dp2", "Hit Efficiency in Endcap_Disk_p2;Blade;Panel", 26, -13., 13., 2, 0.5, 2.5);
+      HitEfficiency_Dm1 = iBooker.book2D(
+          "HitEfficiency_Dm1", "Hit Efficiency in Endcap_Disk_m1;Blade;Panel", 26, -13., 13., 2, 0.5, 2.5);
+      HitEfficiency_Dm2 = iBooker.book2D(
+          "HitEfficiency_Dm2", "Hit Efficiency in Endcap_Disk_m2;;Blade;Panel", 26, -13., 13., 2, 0.5, 2.5);
+    } else {
+      HitEfficiency_Dp1 = iBooker.book2D(
+          "HitEfficiency_Dp1", "Hit Efficiency in Endcap_Disk_p1;Blades;Modules", 24, -12., 12., 7, 1., 8.);
+      HitEfficiency_Dp2 = iBooker.book2D(
+          "HitEfficiency_Dp2", "Hit Efficiency in Endcap_Disk_p2;Blades;Modules", 24, -12., 12., 7, 1., 8.);
+      HitEfficiency_Dm1 = iBooker.book2D(
+          "HitEfficiency_Dm1", "Hit Efficiency in Endcap_Disk_m1;Blades;Modules", 24, -12., 12., 7, 1., 8.);
+      HitEfficiency_Dm2 = iBooker.book2D(
+          "HitEfficiency_Dm2", "Hit Efficiency in Endcap_Disk_m2;Blades;Modules", 24, -12., 12., 7, 1., 8.);
     }
   } else if (isUpgrade) {
-    if(Tier0Flag_){
-      HitEfficiency_Dp1 = iBooker.book2D("HitEfficiency_Dp1","Hit Efficiency in Endcap_Disk_p1;Blades;",28,-17.,11.,1,0.,1.);
-      HitEfficiency_Dp2 = iBooker.book2D("HitEfficiency_Dp2","Hit Efficiency in Endcap_Disk_p2;Blades;",28,-17.,11.,1,0.,1.);
-      HitEfficiency_Dp3 = iBooker.book2D("HitEfficiency_Dp3","Hit Efficiency in Endcap_Disk_p3;Blades;",28,-17.,11.,1,0.,1.);
-      HitEfficiency_Dm1 = iBooker.book2D("HitEfficiency_Dm1","Hit Efficiency in Endcap_Disk_m1;Blades;",28,-17.,11.,1,0.,1.);
-      HitEfficiency_Dm2 = iBooker.book2D("HitEfficiency_Dm2","Hit Efficiency in Endcap_Disk_m2;Blades;",28,-17.,11.,1,0.,1.);
-      HitEfficiency_Dm3 = iBooker.book2D("HitEfficiency_Dm3","Hit Efficiency in Endcap_Disk_m3;Blades;",28,-17.,11.,1,0.,1.);
-    }else{
-      HitEfficiency_Dp1 = iBooker.book2D("HitEfficiency_Dp1","Hit Efficiency in Endcap_Disk_p1;Blades;Modules",28,-17.,11.,2,1.,3.);
-      HitEfficiency_Dp2 = iBooker.book2D("HitEfficiency_Dp2","Hit Efficiency in Endcap_Disk_p2;Blades;Modules",28,-17.,11.,2,1.,3.);
-      HitEfficiency_Dp3 = iBooker.book2D("HitEfficiency_Dp3","Hit Efficiency in Endcap_Disk_p3;Blades;Modules",28,-17.,11.,2,1.,3.);
-      HitEfficiency_Dm1 = iBooker.book2D("HitEfficiency_Dm1","Hit Efficiency in Endcap_Disk_m1;Blades;Modules",28,-17.,11.,2,1.,3.);
-      HitEfficiency_Dm2 = iBooker.book2D("HitEfficiency_Dm2","Hit Efficiency in Endcap_Disk_m2;Blades;Modules",28,-17.,11.,2,1.,3.);
-      HitEfficiency_Dm3 = iBooker.book2D("HitEfficiency_Dm3","Hit Efficiency in Endcap_Disk_m3;Blades;Modules",28,-17.,11.,2,1.,3.);
+    if (Tier0Flag_) {
+      HitEfficiency_Dp1 =
+          iBooker.book2D("HitEfficiency_Dp1", "Hit Efficiency in Endcap_Disk_p1;Blades;", 28, -17., 11., 1, 0., 1.);
+      HitEfficiency_Dp2 =
+          iBooker.book2D("HitEfficiency_Dp2", "Hit Efficiency in Endcap_Disk_p2;Blades;", 28, -17., 11., 1, 0., 1.);
+      HitEfficiency_Dp3 =
+          iBooker.book2D("HitEfficiency_Dp3", "Hit Efficiency in Endcap_Disk_p3;Blades;", 28, -17., 11., 1, 0., 1.);
+      HitEfficiency_Dm1 =
+          iBooker.book2D("HitEfficiency_Dm1", "Hit Efficiency in Endcap_Disk_m1;Blades;", 28, -17., 11., 1, 0., 1.);
+      HitEfficiency_Dm2 =
+          iBooker.book2D("HitEfficiency_Dm2", "Hit Efficiency in Endcap_Disk_m2;Blades;", 28, -17., 11., 1, 0., 1.);
+      HitEfficiency_Dm3 =
+          iBooker.book2D("HitEfficiency_Dm3", "Hit Efficiency in Endcap_Disk_m3;Blades;", 28, -17., 11., 1, 0., 1.);
+    } else {
+      HitEfficiency_Dp1 = iBooker.book2D(
+          "HitEfficiency_Dp1", "Hit Efficiency in Endcap_Disk_p1;Blades;Modules", 28, -17., 11., 2, 1., 3.);
+      HitEfficiency_Dp2 = iBooker.book2D(
+          "HitEfficiency_Dp2", "Hit Efficiency in Endcap_Disk_p2;Blades;Modules", 28, -17., 11., 2, 1., 3.);
+      HitEfficiency_Dp3 = iBooker.book2D(
+          "HitEfficiency_Dp3", "Hit Efficiency in Endcap_Disk_p3;Blades;Modules", 28, -17., 11., 2, 1., 3.);
+      HitEfficiency_Dm1 = iBooker.book2D(
+          "HitEfficiency_Dm1", "Hit Efficiency in Endcap_Disk_m1;Blades;Modules", 28, -17., 11., 2, 1., 3.);
+      HitEfficiency_Dm2 = iBooker.book2D(
+          "HitEfficiency_Dm2", "Hit Efficiency in Endcap_Disk_m2;Blades;Modules", 28, -17., 11., 2, 1., 3.);
+      HitEfficiency_Dm3 = iBooker.book2D(
+          "HitEfficiency_Dm3", "Hit Efficiency in Endcap_Disk_m3;Blades;Modules", 28, -17., 11., 2, 1., 3.);
     }
-  }//endif(isUpgrade)
+  }  // endif(isUpgrade)
   iBooker.cd();
   iBooker.cd("Pixel/");
-  string bins[] = {"Layer1","Layer2","Layer3","Disk1+","Disk2+","Disk1-","Disk2-"};
-  HitEfficiencySummary = iBooker.book1D("HitEfficiencySummary","Hit efficiency per sub detector",7,0,7);
+  string bins[] = {"Layer1", "Layer2", "Layer3", "Disk1+", "Disk2+", "Disk1-", "Disk2-"};
+  HitEfficiencySummary = iBooker.book1D("HitEfficiencySummary", "Hit efficiency per sub detector", 7, 0, 7);
   HitEfficiencySummary->setAxisTitle("Sub Detector", 1);
-  HitEfficiencySummary->setAxisTitle("Efficiency (%)",2);
-  for (int i = 1; i < 8; i++){
-    HitEfficiencySummary->setBinLabel(i,bins[i-1]);
+  HitEfficiencySummary->setAxisTitle("Efficiency (%)", 2);
+  for (int i = 1; i < 8; i++) {
+    HitEfficiencySummary->setBinLabel(i, bins[i - 1]);
   }
 }
 
 //=============================================================================================================
 
-void SiPixelActionExecutor::createEfficiency(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter, bool isUpgrade){
-  //std::cout<<"entering SiPixelActionExecutor::createEfficiency..."<<std::endl;
+void SiPixelActionExecutor::createEfficiency(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter, bool isUpgrade) {
+  // std::cout<<"entering
+  // SiPixelActionExecutor::createEfficiency..."<<std::endl;
   iGetter.cd();
   iBooker.cd();
-  fillEfficiency(iBooker, iGetter, true, isUpgrade); // Barrel
+  fillEfficiency(iBooker, iGetter, true, isUpgrade);  // Barrel
   iGetter.cd();
   iBooker.cd();
-  fillEfficiency(iBooker, iGetter, false, isUpgrade); // Endcap
+  fillEfficiency(iBooker, iGetter, false, isUpgrade);  // Endcap
   iGetter.cd();
   iBooker.cd();
-  //std::cout<<"leaving SiPixelActionExecutor::createEfficiency..."<<std::endl;
+  // std::cout<<"leaving SiPixelActionExecutor::createEfficiency..."<<std::endl;
 }
 
 //=============================================================================================================
 
-int SiPixelActionExecutor::getLadder(const std::string & dname_){
-  int biny_= 0;
-  string lad=dname_.substr(dname_.find("Ladder_") + 7, 2);
-  if(dname_.find(lad)!=string::npos){ biny_ = atoi(lad.c_str());}
+int SiPixelActionExecutor::getLadder(const std::string &dname_) {
+  int biny_ = 0;
+  string lad = dname_.substr(dname_.find("Ladder_") + 7, 2);
+  if (dname_.find(lad) != string::npos) {
+    biny_ = atoi(lad.c_str());
+  }
   return biny_;
 }
 
 //=============================================================================================================
 
-int SiPixelActionExecutor::getBlade(const std::string & dname_){
-  int binx_= 0;
-  string blad=dname_.substr(dname_.find("Blade_") + 6, 2);
-  if(dname_.find(blad)!=string::npos){ binx_ = atoi(blad.c_str());}
+int SiPixelActionExecutor::getBlade(const std::string &dname_) {
+  int binx_ = 0;
+  string blad = dname_.substr(dname_.find("Blade_") + 6, 2);
+  if (dname_.find(blad) != string::npos) {
+    binx_ = atoi(blad.c_str());
+  }
   return binx_;
 }
 
 //=============================================================================================================
 
-void SiPixelActionExecutor::fillEfficiency(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter, bool isbarrel, bool isUpgrade){
-  //cout<<"entering SiPixelActionExecutor::fillEfficiency..."<<std::endl;
+void SiPixelActionExecutor::fillEfficiency(DQMStore::IBooker &iBooker,
+                                           DQMStore::IGetter &iGetter,
+                                           bool isbarrel,
+                                           bool isUpgrade) {
+  // cout<<"entering SiPixelActionExecutor::fillEfficiency..."<<std::endl;
   string currDir = iBooker.pwd();
-  string dname = currDir.substr(currDir.find_last_of("/")+1);
-  //cout<<"currDir= "<<currDir<< " , dname= "<<dname<<std::endl;
-  
-  if(Tier0Flag_){ // Offline	
-    if(isbarrel && dname.find("Ladder_")!=string::npos){ 
+  string dname = currDir.substr(currDir.find_last_of("/") + 1);
+  // cout<<"currDir= "<<currDir<< " , dname= "<<dname<<std::endl;
+
+  if (Tier0Flag_) {  // Offline
+    if (isbarrel && dname.find("Ladder_") != string::npos) {
       if (!isUpgrade) {
-      vector<string> meVec = iGetter.getMEs();
-      for (vector<string>::const_iterator it = meVec.begin(); it != meVec.end(); it++) {
-        string full_path = currDir + "/" + (*it);
+        vector<string> meVec = iGetter.getMEs();
+        for (vector<string>::const_iterator it = meVec.begin(); it != meVec.end(); it++) {
+          string full_path = currDir + "/" + (*it);
 
-	if(full_path.find("missingMod_")!=string::npos){ // If we have missing hits ME
-	  
-	  //Get the MEs that contain missing and valid hits
-	  MonitorElement * missing = iGetter.get(full_path);
-	  if (!missing) continue;
-	  string new_path = full_path.replace(full_path.find("missing"),7,"valid");
-	  MonitorElement * valid = iGetter.get(new_path);
-	  if (!valid) continue;
-	  int binx = 0; 
-	  int biny = 0;
-	  //get the ladder number
-	   biny = getLadder(dname);//Current
-	  if(currDir.find("Shell_mO")!=string::npos || currDir.find("Shell_pO")!=string::npos){ 
-	    biny=-biny;
-	  }
-	  const int nMod = 4; 
-	  for(int i=1; i<nMod+1;i++){
-	    float hitEfficiency = -1.0;
-	    float missingHits=0;
-	    float validHits=0;
-	    binx=i; //Module
-	    if(currDir.find("Shell_m")!=string::npos) binx=-binx;
-
-	    missingHits=missing->getBinContent(i);
-	    validHits=valid->getBinContent(i);
-	    if(validHits + missingHits > 0.) hitEfficiency = validHits / (validHits + missingHits);
-
-	    if(currDir.find("Layer_1")!=string::npos){
-	      HitEfficiency_L1 = iGetter.get("Pixel/Barrel/HitEfficiency_L1");
-	      if(HitEfficiency_L1) HitEfficiency_L1->setBinContent(HitEfficiency_L1->getTH2F()->FindBin(binx, biny),(float)hitEfficiency);
-	    }
-	    else if(currDir.find("Layer_2")!=string::npos){
-	      HitEfficiency_L2 = iGetter.get("Pixel/Barrel/HitEfficiency_L2");
-	      if(HitEfficiency_L2) HitEfficiency_L2->setBinContent(HitEfficiency_L2->getTH2F()->FindBin(binx, biny),(float)hitEfficiency);
-	    }
-	    else if(currDir.find("Layer_3")!=string::npos){
-	      HitEfficiency_L3 = iGetter.get("Pixel/Barrel/HitEfficiency_L3");		
-	      if(HitEfficiency_L3) HitEfficiency_L3->setBinContent(HitEfficiency_L3->getTH2F()->FindBin(binx, biny),(float)hitEfficiency);
-	    }     
-	    
-	  }
-	  
-	}
-      }
-      }//endifNOTUpgradeInBPix
+          if (full_path.find("missingMod_") != string::npos) {  // If we have missing hits ME
+
+            // Get the MEs that contain missing and valid hits
+            MonitorElement *missing = iGetter.get(full_path);
+            if (!missing)
+              continue;
+            string new_path = full_path.replace(full_path.find("missing"), 7, "valid");
+            MonitorElement *valid = iGetter.get(new_path);
+            if (!valid)
+              continue;
+            int binx = 0;
+            int biny = 0;
+            // get the ladder number
+            biny = getLadder(dname);  // Current
+            if (currDir.find("Shell_mO") != string::npos || currDir.find("Shell_pO") != string::npos) {
+              biny = -biny;
+            }
+            const int nMod = 4;
+            for (int i = 1; i < nMod + 1; i++) {
+              float hitEfficiency = -1.0;
+              float missingHits = 0;
+              float validHits = 0;
+              binx = i;  // Module
+              if (currDir.find("Shell_m") != string::npos)
+                binx = -binx;
+
+              missingHits = missing->getBinContent(i);
+              validHits = valid->getBinContent(i);
+              if (validHits + missingHits > 0.)
+                hitEfficiency = validHits / (validHits + missingHits);
+
+              if (currDir.find("Layer_1") != string::npos) {
+                HitEfficiency_L1 = iGetter.get("Pixel/Barrel/HitEfficiency_L1");
+                if (HitEfficiency_L1)
+                  HitEfficiency_L1->setBinContent(HitEfficiency_L1->getTH2F()->FindBin(binx, biny),
+                                                  (float)hitEfficiency);
+              } else if (currDir.find("Layer_2") != string::npos) {
+                HitEfficiency_L2 = iGetter.get("Pixel/Barrel/HitEfficiency_L2");
+                if (HitEfficiency_L2)
+                  HitEfficiency_L2->setBinContent(HitEfficiency_L2->getTH2F()->FindBin(binx, biny),
+                                                  (float)hitEfficiency);
+              } else if (currDir.find("Layer_3") != string::npos) {
+                HitEfficiency_L3 = iGetter.get("Pixel/Barrel/HitEfficiency_L3");
+                if (HitEfficiency_L3)
+                  HitEfficiency_L3->setBinContent(HitEfficiency_L3->getTH2F()->FindBin(binx, biny),
+                                                  (float)hitEfficiency);
+              }
+            }
+          }
+        }
+      }  // endifNOTUpgradeInBPix
       else if (isUpgrade) {
         vector<string> meVec = iGetter.getMEs();
         for (vector<string>::const_iterator it = meVec.begin(); it != meVec.end(); it++) {
           string full_path = currDir + "/" + (*it);
-          if(full_path.find("missing_")!=string::npos){ // If we have missing hits ME
-	    MonitorElement * me = iGetter.get(full_path);
-	    if (!me) continue;
-	    float missingHits = me->getEntries();
-	    string new_path = full_path.replace(full_path.find("missing"),7,"valid");
-	    me = iGetter.get(new_path);
-	    if (!me) continue;
-	    float validHits = me->getEntries();
-	    float hitEfficiency = -1.;
-	    if(validHits + missingHits > 0.) hitEfficiency = validHits / (validHits + missingHits);
-	    int binx = 0; int biny = 0;
-	    biny = getLadder(dname);
-	    if(currDir.find("Shell_mO")!=string::npos || currDir.find("Shell_pO")!=string::npos){
-	      biny=-biny;
-	    }
-	    if(currDir.find("Shell_m")!=string::npos){ binx = 1;}else{ binx = 2;} //x-axis: z-side
-	    if(currDir.find("Layer_1")!=string::npos){
-	      HitEfficiency_L1 = iGetter.get("Pixel/Barrel/HitEfficiency_L1");
-	      if(HitEfficiency_L1) HitEfficiency_L1->setBinContent(binx, biny,(float)hitEfficiency);
-	    }else if(currDir.find("Layer_2")!=string::npos){
-	      HitEfficiency_L2 = iGetter.get("Pixel/Barrel/HitEfficiency_L2");
-	      if(HitEfficiency_L2) HitEfficiency_L2->setBinContent(binx, biny,(float)hitEfficiency);
-	    }else if(currDir.find("Layer_3")!=string::npos){
-	      HitEfficiency_L3 = iGetter.get("Pixel/Barrel/HitEfficiency_L3");
-	      if(HitEfficiency_L3) HitEfficiency_L3->setBinContent(binx, biny,(float)hitEfficiency);
-	    }else if(currDir.find("Layer_4")!=string::npos){
-	      HitEfficiency_L4 = iGetter.get("Pixel/Barrel/HitEfficiency_L4");
-	      if(HitEfficiency_L4) HitEfficiency_L4->setBinContent(binx, biny,(float)hitEfficiency);
-	    }
+          if (full_path.find("missing_") != string::npos) {  // If we have missing hits ME
+            MonitorElement *me = iGetter.get(full_path);
+            if (!me)
+              continue;
+            float missingHits = me->getEntries();
+            string new_path = full_path.replace(full_path.find("missing"), 7, "valid");
+            me = iGetter.get(new_path);
+            if (!me)
+              continue;
+            float validHits = me->getEntries();
+            float hitEfficiency = -1.;
+            if (validHits + missingHits > 0.)
+              hitEfficiency = validHits / (validHits + missingHits);
+            int binx = 0;
+            int biny = 0;
+            biny = getLadder(dname);
+            if (currDir.find("Shell_mO") != string::npos || currDir.find("Shell_pO") != string::npos) {
+              biny = -biny;
+            }
+            if (currDir.find("Shell_m") != string::npos) {
+              binx = 1;
+            } else {
+              binx = 2;
+            }  // x-axis: z-side
+            if (currDir.find("Layer_1") != string::npos) {
+              HitEfficiency_L1 = iGetter.get("Pixel/Barrel/HitEfficiency_L1");
+              if (HitEfficiency_L1)
+                HitEfficiency_L1->setBinContent(binx, biny, (float)hitEfficiency);
+            } else if (currDir.find("Layer_2") != string::npos) {
+              HitEfficiency_L2 = iGetter.get("Pixel/Barrel/HitEfficiency_L2");
+              if (HitEfficiency_L2)
+                HitEfficiency_L2->setBinContent(binx, biny, (float)hitEfficiency);
+            } else if (currDir.find("Layer_3") != string::npos) {
+              HitEfficiency_L3 = iGetter.get("Pixel/Barrel/HitEfficiency_L3");
+              if (HitEfficiency_L3)
+                HitEfficiency_L3->setBinContent(binx, biny, (float)hitEfficiency);
+            } else if (currDir.find("Layer_4") != string::npos) {
+              HitEfficiency_L4 = iGetter.get("Pixel/Barrel/HitEfficiency_L4");
+              if (HitEfficiency_L4)
+                HitEfficiency_L4->setBinContent(binx, biny, (float)hitEfficiency);
+            }
           }
         }
-      }//endifUpgradeInBPix
-    }else if(!isbarrel && dname.find("Blade_")!=string::npos && !isUpgrade){ 
+      }  // endifUpgradeInBPix
+    } else if (!isbarrel && dname.find("Blade_") != string::npos && !isUpgrade) {
       vector<string> meVec = iGetter.getMEs();
       for (vector<string>::const_iterator it = meVec.begin(); it != meVec.end(); it++) {
         string full_path = currDir + "/" + (*it);
-        if(full_path.find("missing_")!=string::npos){ // If we have missing hits ME
-	  MonitorElement * missing = iGetter.get(full_path);
-	  if (!missing) continue;
-	  //float missingHits = missing->getEntries();
-	  string new_path = full_path.replace(full_path.find("missing"),7,"valid");
-	  MonitorElement * valid = iGetter.get(new_path);
-	  if (!valid) continue;
-	  //float validHits = valid->getEntries();
-	  int binx = 0; int biny = 0;
-	  binx = getBlade(dname);
-	  if(currDir.find("HalfCylinder_mI")!=string::npos || currDir.find("HalfCylinder_pI")!=string::npos){ binx = binx + 14;}
-	  else{  binx = 13 -binx;}
-	  const int nPanel=2;
-	  for (int i=1; i<nPanel+1; i++){
-	    float hitEfficiency = -1.;
-	    float missingHits=0;
-	    float validHits=0;
-	    biny=i;
-	    missingHits=missing->getBinContent(i);
-	    validHits=valid->getBinContent(i);
-	    if(validHits + missingHits > 0.) hitEfficiency = validHits / (validHits + missingHits);
-	    if(currDir.find("Disk_1")!=string::npos && currDir.find("HalfCylinder_m")!=string::npos){
-	      HitEfficiency_Dm1 = iGetter.get("Pixel/Endcap/HitEfficiency_Dm1");
-	      if(HitEfficiency_Dm1) HitEfficiency_Dm1->setBinContent(binx, biny, (float)hitEfficiency);
-	    }else if(currDir.find("Disk_2")!=string::npos && currDir.find("HalfCylinder_m")!=string::npos){
-	      HitEfficiency_Dm2 = iGetter.get("Pixel/Endcap/HitEfficiency_Dm2");
-	      if(HitEfficiency_Dm2) HitEfficiency_Dm2->setBinContent(binx, biny, (float)hitEfficiency);
-	    }else if(currDir.find("Disk_1")!=string::npos && currDir.find("HalfCylinder_p")!=string::npos){
-	      HitEfficiency_Dp1 = iGetter.get("Pixel/Endcap/HitEfficiency_Dp1");
-	      if(HitEfficiency_Dp1) HitEfficiency_Dp1->setBinContent(binx, biny, (float)hitEfficiency);
-	    }else if(currDir.find("Disk_2")!=string::npos && currDir.find("HalfCylinder_p")!=string::npos){
-	      HitEfficiency_Dp2 = iGetter.get("Pixel/Endcap/HitEfficiency_Dp2");
-	      if(HitEfficiency_Dp2) HitEfficiency_Dp2->setBinContent(binx, biny, (float)hitEfficiency);
-	    }
-	  }//EndOfFor
-	}
-      } 
-    }else if(!isbarrel && dname.find("Blade_")!=string::npos && isUpgrade){ 
+        if (full_path.find("missing_") != string::npos) {  // If we have missing hits ME
+          MonitorElement *missing = iGetter.get(full_path);
+          if (!missing)
+            continue;
+          // float missingHits = missing->getEntries();
+          string new_path = full_path.replace(full_path.find("missing"), 7, "valid");
+          MonitorElement *valid = iGetter.get(new_path);
+          if (!valid)
+            continue;
+          // float validHits = valid->getEntries();
+          int binx = 0;
+          int biny = 0;
+          binx = getBlade(dname);
+          if (currDir.find("HalfCylinder_mI") != string::npos || currDir.find("HalfCylinder_pI") != string::npos) {
+            binx = binx + 14;
+          } else {
+            binx = 13 - binx;
+          }
+          const int nPanel = 2;
+          for (int i = 1; i < nPanel + 1; i++) {
+            float hitEfficiency = -1.;
+            float missingHits = 0;
+            float validHits = 0;
+            biny = i;
+            missingHits = missing->getBinContent(i);
+            validHits = valid->getBinContent(i);
+            if (validHits + missingHits > 0.)
+              hitEfficiency = validHits / (validHits + missingHits);
+            if (currDir.find("Disk_1") != string::npos && currDir.find("HalfCylinder_m") != string::npos) {
+              HitEfficiency_Dm1 = iGetter.get("Pixel/Endcap/HitEfficiency_Dm1");
+              if (HitEfficiency_Dm1)
+                HitEfficiency_Dm1->setBinContent(binx, biny, (float)hitEfficiency);
+            } else if (currDir.find("Disk_2") != string::npos && currDir.find("HalfCylinder_m") != string::npos) {
+              HitEfficiency_Dm2 = iGetter.get("Pixel/Endcap/HitEfficiency_Dm2");
+              if (HitEfficiency_Dm2)
+                HitEfficiency_Dm2->setBinContent(binx, biny, (float)hitEfficiency);
+            } else if (currDir.find("Disk_1") != string::npos && currDir.find("HalfCylinder_p") != string::npos) {
+              HitEfficiency_Dp1 = iGetter.get("Pixel/Endcap/HitEfficiency_Dp1");
+              if (HitEfficiency_Dp1)
+                HitEfficiency_Dp1->setBinContent(binx, biny, (float)hitEfficiency);
+            } else if (currDir.find("Disk_2") != string::npos && currDir.find("HalfCylinder_p") != string::npos) {
+              HitEfficiency_Dp2 = iGetter.get("Pixel/Endcap/HitEfficiency_Dp2");
+              if (HitEfficiency_Dp2)
+                HitEfficiency_Dp2->setBinContent(binx, biny, (float)hitEfficiency);
+            }
+          }  // EndOfFor
+        }
+      }
+    } else if (!isbarrel && dname.find("Blade_") != string::npos && isUpgrade) {
       vector<string> meVec = iGetter.getMEs();
       for (vector<string>::const_iterator it = meVec.begin(); it != meVec.end(); it++) {
         string full_path = currDir + "/" + (*it);
-        if(full_path.find("missing_")!=string::npos){ // If we have missing hits ME
-	  MonitorElement * me = iGetter.get(full_path);
-	  if (!me) continue;
-	  float missingHits = me->getEntries();
-	  string new_path = full_path.replace(full_path.find("missing"),7,"valid");
-	  me = iGetter.get(new_path);
-	  if (!me) continue;
-	  float validHits = me->getEntries();
-	  float hitEfficiency = -1.;
-	  if(validHits + missingHits > 0.) hitEfficiency = validHits / (validHits + missingHits);
-	  int binx = 0; int biny = 1;
-	  binx = getBlade(dname);
-	  if(currDir.find("HalfCylinder_mI")!=string::npos || currDir.find("HalfCylinder_pI")!=string::npos){ binx = binx + 12;}
-	  else{ 
-	    if(binx==1) binx = 17;
-	    else if(binx==2) binx = 16;
-	    else if(binx==3) binx = 15;
-	    else if(binx==4) binx = 14;
-	    else if(binx==5) binx = 13;
-	    else if(binx==6) binx = 12;
-	    else if(binx==7) binx = 11;
-	    else if(binx==8) binx = 10;
-	    else if(binx==9) binx = 9;
-	    else if(binx==10) binx = 8;
-	    else if(binx==11) binx = 7;
-	    else if(binx==12) binx = 6;
-            else if(binx==13) binx = 5;
-	    else if(binx==14) binx = 4;
-	    else if(binx==15) binx = 3;
-	    else if(binx==16) binx = 2;
-	    else if(binx==17) binx = 1;
-	  }
-	  if(currDir.find("Disk_1")!=string::npos && currDir.find("HalfCylinder_m")!=string::npos){
-	    HitEfficiency_Dm1 = iGetter.get("Pixel/Endcap/HitEfficiency_Dm1");
-	    if(HitEfficiency_Dm1) HitEfficiency_Dm1->setBinContent(binx, biny, (float)hitEfficiency);
-	  }else if(currDir.find("Disk_2")!=string::npos && currDir.find("HalfCylinder_m")!=string::npos){
-	    HitEfficiency_Dm2 = iGetter.get("Pixel/Endcap/HitEfficiency_Dm2");
-	    if(HitEfficiency_Dm2) HitEfficiency_Dm2->setBinContent(binx, biny, (float)hitEfficiency);
-	  }else if(currDir.find("Disk_3")!=string::npos && currDir.find("HalfCylinder_m")!=string::npos){
-	    HitEfficiency_Dm3 = iGetter.get("Pixel/Endcap/HitEfficiency_Dm3");
-	    if(HitEfficiency_Dm3) HitEfficiency_Dm3->setBinContent(binx, biny, (float)hitEfficiency);
-	  }else if(currDir.find("Disk_1")!=string::npos && currDir.find("HalfCylinder_p")!=string::npos){
-	    HitEfficiency_Dp1 = iGetter.get("Pixel/Endcap/HitEfficiency_Dp1");
-	    if(HitEfficiency_Dp1) HitEfficiency_Dp1->setBinContent(binx, biny, (float)hitEfficiency);
-	  }else if(currDir.find("Disk_2")!=string::npos && currDir.find("HalfCylinder_p")!=string::npos){
-	    HitEfficiency_Dp2 = iGetter.get("Pixel/Endcap/HitEfficiency_Dp2");
-	    if(HitEfficiency_Dp2) HitEfficiency_Dp2->setBinContent(binx, biny, (float)hitEfficiency);
-          }else if(currDir.find("Disk_3")!=string::npos && currDir.find("HalfCylinder_p")!=string::npos){
-	    HitEfficiency_Dp3 = iGetter.get("Pixel/Endcap/HitEfficiency_Dp3");
-	    if(HitEfficiency_Dp3) HitEfficiency_Dp3->setBinContent(binx, biny, (float)hitEfficiency);
+        if (full_path.find("missing_") != string::npos) {  // If we have missing hits ME
+          MonitorElement *me = iGetter.get(full_path);
+          if (!me)
+            continue;
+          float missingHits = me->getEntries();
+          string new_path = full_path.replace(full_path.find("missing"), 7, "valid");
+          me = iGetter.get(new_path);
+          if (!me)
+            continue;
+          float validHits = me->getEntries();
+          float hitEfficiency = -1.;
+          if (validHits + missingHits > 0.)
+            hitEfficiency = validHits / (validHits + missingHits);
+          int binx = 0;
+          int biny = 1;
+          binx = getBlade(dname);
+          if (currDir.find("HalfCylinder_mI") != string::npos || currDir.find("HalfCylinder_pI") != string::npos) {
+            binx = binx + 12;
+          } else {
+            if (binx == 1)
+              binx = 17;
+            else if (binx == 2)
+              binx = 16;
+            else if (binx == 3)
+              binx = 15;
+            else if (binx == 4)
+              binx = 14;
+            else if (binx == 5)
+              binx = 13;
+            else if (binx == 6)
+              binx = 12;
+            else if (binx == 7)
+              binx = 11;
+            else if (binx == 8)
+              binx = 10;
+            else if (binx == 9)
+              binx = 9;
+            else if (binx == 10)
+              binx = 8;
+            else if (binx == 11)
+              binx = 7;
+            else if (binx == 12)
+              binx = 6;
+            else if (binx == 13)
+              binx = 5;
+            else if (binx == 14)
+              binx = 4;
+            else if (binx == 15)
+              binx = 3;
+            else if (binx == 16)
+              binx = 2;
+            else if (binx == 17)
+              binx = 1;
+          }
+          if (currDir.find("Disk_1") != string::npos && currDir.find("HalfCylinder_m") != string::npos) {
+            HitEfficiency_Dm1 = iGetter.get("Pixel/Endcap/HitEfficiency_Dm1");
+            if (HitEfficiency_Dm1)
+              HitEfficiency_Dm1->setBinContent(binx, biny, (float)hitEfficiency);
+          } else if (currDir.find("Disk_2") != string::npos && currDir.find("HalfCylinder_m") != string::npos) {
+            HitEfficiency_Dm2 = iGetter.get("Pixel/Endcap/HitEfficiency_Dm2");
+            if (HitEfficiency_Dm2)
+              HitEfficiency_Dm2->setBinContent(binx, biny, (float)hitEfficiency);
+          } else if (currDir.find("Disk_3") != string::npos && currDir.find("HalfCylinder_m") != string::npos) {
+            HitEfficiency_Dm3 = iGetter.get("Pixel/Endcap/HitEfficiency_Dm3");
+            if (HitEfficiency_Dm3)
+              HitEfficiency_Dm3->setBinContent(binx, biny, (float)hitEfficiency);
+          } else if (currDir.find("Disk_1") != string::npos && currDir.find("HalfCylinder_p") != string::npos) {
+            HitEfficiency_Dp1 = iGetter.get("Pixel/Endcap/HitEfficiency_Dp1");
+            if (HitEfficiency_Dp1)
+              HitEfficiency_Dp1->setBinContent(binx, biny, (float)hitEfficiency);
+          } else if (currDir.find("Disk_2") != string::npos && currDir.find("HalfCylinder_p") != string::npos) {
+            HitEfficiency_Dp2 = iGetter.get("Pixel/Endcap/HitEfficiency_Dp2");
+            if (HitEfficiency_Dp2)
+              HitEfficiency_Dp2->setBinContent(binx, biny, (float)hitEfficiency);
+          } else if (currDir.find("Disk_3") != string::npos && currDir.find("HalfCylinder_p") != string::npos) {
+            HitEfficiency_Dp3 = iGetter.get("Pixel/Endcap/HitEfficiency_Dp3");
+            if (HitEfficiency_Dp3)
+              HitEfficiency_Dp3->setBinContent(binx, biny, (float)hitEfficiency);
           }
-	  //std::cout<<"EFFI: "<<currDir<<" , x: "<<binx<<" , y: "<<biny<<std::endl;
-	}
-      } 
-    }else{  
+          // std::cout<<"EFFI: "<<currDir<<" , x: "<<binx<<" , y:
+          // "<<biny<<std::endl;
+        }
+      }
+    } else {
       vector<string> subdirs = iGetter.getSubdirs();
       for (vector<string>::const_iterator it = subdirs.begin(); it != subdirs.end(); it++) {
         iBooker.cd(*it);
-	iGetter.cd(*it);
-        if(*it != "Pixel" && ((isbarrel && (*it).find("Barrel")==string::npos) || (!isbarrel && (*it).find("Endcap")==string::npos))) continue;
+        iGetter.cd(*it);
+        if (*it != "Pixel" &&
+            ((isbarrel && (*it).find("Barrel") == string::npos) || (!isbarrel && (*it).find("Endcap") == string::npos)))
+          continue;
         fillEfficiency(iBooker, iGetter, isbarrel, isUpgrade);
         iBooker.goUp();
-	iGetter.setCurrentFolder(iBooker.pwd());
+        iGetter.setCurrentFolder(iBooker.pwd());
       }
     }
-  }else{ // Online
-    if(dname.find("Module_")!=string::npos){ 
+  } else {  // Online
+    if (dname.find("Module_") != string::npos) {
       vector<string> meVec = iGetter.getMEs();
       for (vector<string>::const_iterator it = meVec.begin(); it != meVec.end(); it++) {
         string full_path = currDir + "/" + (*it);
-        if(full_path.find("missing_")!=string::npos){ // If we have missing hits ME
-	  MonitorElement * me = iGetter.get(full_path);
-	  if (!me) continue;
-	  float missingHits = me->getEntries();
-	  string new_path = full_path.replace(full_path.find("missing"),7,"valid");
-	  me = iGetter.get(new_path);
-	  if (!me) continue;
-	  float validHits = me->getEntries();
-	  float hitEfficiency = -1.;
-	  if(validHits + missingHits > 0.) hitEfficiency = validHits / (validHits + missingHits);
-	  int binx = 0; int biny = 0;
-	  if(isbarrel){
-	    if(currDir.find("Shell_m")!=string::npos){
-	      if(currDir.find("Module_4")!=string::npos){ binx = 1;}else if(currDir.find("Module_3")!=string::npos){ binx = 2;}
-	      if(currDir.find("Module_2")!=string::npos){ binx = 3;}else if(currDir.find("Module_1")!=string::npos){ binx = 4;}
-	    }else if(currDir.find("Shell_p")!=string::npos){
-	      if(currDir.find("Module_1")!=string::npos){ binx = 5;}else if(currDir.find("Module_2")!=string::npos){ binx = 6;}
-	      if(currDir.find("Module_3")!=string::npos){ binx = 7;}else if(currDir.find("Module_4")!=string::npos){ binx = 8;}
-	    }
-	    if (!isUpgrade) {
-	    if(currDir.find("01")!=string::npos){ biny = 1;}else if(currDir.find("02")!=string::npos){ biny = 2;}
-	    else if(currDir.find("03")!=string::npos){ biny = 3;}else if(currDir.find("04")!=string::npos){ biny = 4;}
-	    else if(currDir.find("05")!=string::npos){ biny = 5;}else if(currDir.find("06")!=string::npos){ biny = 6;}
-	    else if(currDir.find("07")!=string::npos){ biny = 7;}else if(currDir.find("08")!=string::npos){ biny = 8;}
-	    else if(currDir.find("09")!=string::npos){ biny = 9;}else if(currDir.find("10")!=string::npos){ biny = 10;}
-	    else if(currDir.find("11")!=string::npos){ biny = 11;}else if(currDir.find("12")!=string::npos){ biny = 12;}
-	    else if(currDir.find("13")!=string::npos){ biny = 13;}else if(currDir.find("14")!=string::npos){ biny = 14;}
-	    else if(currDir.find("15")!=string::npos){ biny = 15;}else if(currDir.find("16")!=string::npos){ biny = 16;}
-	    else if(currDir.find("17")!=string::npos){ biny = 17;}else if(currDir.find("18")!=string::npos){ biny = 18;}
-	    else if(currDir.find("19")!=string::npos){ biny = 19;}else if(currDir.find("20")!=string::npos){ biny = 20;}
-	    else if(currDir.find("21")!=string::npos){ biny = 21;}else if(currDir.find("22")!=string::npos){ biny = 22;}
-	    if(currDir.find("Shell_mO")!=string::npos || currDir.find("Shell_pO")!=string::npos){
-	      if(currDir.find("Layer_1")!=string::npos){ biny = biny + 10;}
-	      else if(currDir.find("Layer_2")!=string::npos){ biny = biny + 16;}
-	      else if(currDir.find("Layer_3")!=string::npos){ biny = biny + 22;}
-	    }
-	    }
-	    else if (isUpgrade) {
-	      if(currDir.find("01")!=string::npos){ biny = 1;}else if(currDir.find("02")!=string::npos){ biny = 2;}
-	      else if(currDir.find("03")!=string::npos){ biny = 3;}else if(currDir.find("04")!=string::npos){ biny = 4;}
-	      else if(currDir.find("05")!=string::npos){ biny = 5;}else if(currDir.find("06")!=string::npos){ biny = 6;}
-	      else if(currDir.find("07")!=string::npos){ biny = 7;}else if(currDir.find("08")!=string::npos){ biny = 8;}
-	      else if(currDir.find("09")!=string::npos){ biny = 9;}else if(currDir.find("10")!=string::npos){ biny = 10;}
-	      else if(currDir.find("11")!=string::npos){ biny = 11;}else if(currDir.find("12")!=string::npos){ biny = 12;}
-	      else if(currDir.find("13")!=string::npos){ biny = 13;}else if(currDir.find("14")!=string::npos){ biny = 14;}
-	      else if(currDir.find("15")!=string::npos){ biny = 15;}else if(currDir.find("16")!=string::npos){ biny = 16;}
-	      else if(currDir.find("17")!=string::npos){ biny = 17;}else if(currDir.find("18")!=string::npos){ biny = 18;}
-	      else if(currDir.find("19")!=string::npos){ biny = 19;}else if(currDir.find("20")!=string::npos){ biny = 20;}
-	      else if(currDir.find("21")!=string::npos){ biny = 21;}else if(currDir.find("22")!=string::npos){ biny = 22;}
-	      else if(currDir.find("23")!=string::npos){ biny = 23;}else if(currDir.find("24")!=string::npos){ biny = 24;}
-	      else if(currDir.find("25")!=string::npos){ biny = 25;}else if(currDir.find("25")!=string::npos){ biny = 25;}
-	      else if(currDir.find("26")!=string::npos){ biny = 26;}else if(currDir.find("27")!=string::npos){ biny = 27;}
-	      else if(currDir.find("28")!=string::npos){ biny = 28;}else if(currDir.find("29")!=string::npos){ biny = 29;}
-	      else if(currDir.find("30")!=string::npos){ biny = 30;}else if(currDir.find("31")!=string::npos){ biny = 31;}
-	      else if(currDir.find("32")!=string::npos){ biny = 32;}
-	      if(currDir.find("Shell_mO")!=string::npos || currDir.find("Shell_pO")!=string::npos){
-	        if(currDir.find("Layer_1")!=string::npos){ biny = biny + 6;}
-	        else if(currDir.find("Layer_2")!=string::npos){ biny = biny + 14;}
-	        else if(currDir.find("Layer_3")!=string::npos){ biny = biny + 22;}
-	        else if(currDir.find("Layer_4")!=string::npos){ biny = biny + 32;}
-	      }
-	    }
-	  }else{ //endcap
-	    if (!isUpgrade) {
-	    if(currDir.find("01")!=string::npos){ binx = 1;}else if(currDir.find("02")!=string::npos){ binx = 2;}
-	    else if(currDir.find("03")!=string::npos){ binx = 3;}else if(currDir.find("04")!=string::npos){ binx = 4;}
-	    else if(currDir.find("05")!=string::npos){ binx = 5;}else if(currDir.find("06")!=string::npos){ binx = 6;}
-	    else if(currDir.find("07")!=string::npos){ binx = 7;}else if(currDir.find("08")!=string::npos){ binx = 8;}
-	    else if(currDir.find("09")!=string::npos){ binx = 9;}else if(currDir.find("10")!=string::npos){ binx = 10;}
-	    else if(currDir.find("11")!=string::npos){ binx = 11;}else if(currDir.find("12")!=string::npos){ binx = 12;}
-	    if(currDir.find("HalfCylinder_mO")!=string::npos || currDir.find("HalfCylinder_pO")!=string::npos){ binx = binx + 12;}
-	    if(currDir.find("Panel_1/Module_1")!=string::npos){ biny = 1;}else if(currDir.find("Panel_2/Module_1")!=string::npos){ biny = 2;}
-	    else if(currDir.find("Panel_1/Module_2")!=string::npos){ biny = 3;}else if(currDir.find("Panel_2/Module_2")!=string::npos){ biny = 4;}
-	    else if(currDir.find("Panel_1/Module_3")!=string::npos){ biny = 5;}else if(currDir.find("Panel_2/Module_3")!=string::npos){ biny = 6;}
-	    else if(currDir.find("Panel_1/Module_4")!=string::npos){ biny = 7;}
-	    } else if (isUpgrade) {
-	      if(currDir.find("01")!=string::npos){ binx = 1;}else if(currDir.find("02")!=string::npos){ binx = 2;}
-	      else if(currDir.find("03")!=string::npos){ binx = 3;}else if(currDir.find("04")!=string::npos){ binx = 4;}
-	      else if(currDir.find("05")!=string::npos){ binx = 5;}else if(currDir.find("06")!=string::npos){ binx = 6;}
-	      else if(currDir.find("07")!=string::npos){ binx = 7;}else if(currDir.find("08")!=string::npos){ binx = 8;}
-	      else if(currDir.find("09")!=string::npos){ binx = 9;}else if(currDir.find("10")!=string::npos){ binx = 10;}
-	      else if(currDir.find("11")!=string::npos){ binx = 11;}else if(currDir.find("12")!=string::npos){ binx = 12;}
-	      else if(currDir.find("13")!=string::npos){ binx = 13;}else if(currDir.find("14")!=string::npos){ binx = 14;}
-	      else if(currDir.find("15")!=string::npos){ binx = 15;}else if(currDir.find("16")!=string::npos){ binx = 16;}
-	      else if(currDir.find("17")!=string::npos){ binx = 17;}
-	      if(currDir.find("HalfCylinder_mO")!=string::npos || currDir.find("HalfCylinder_pO")!=string::npos){ binx = binx + 17;}
-	      if(currDir.find("Panel_1/Module_1")!=string::npos){ biny = 1;}else if(currDir.find("Panel_2/Module_1")!=string::npos){ biny = 2;}
-	    }//endif(isUpgrade)
-	  }
-	  
-	  if(currDir.find("Layer_1")!=string::npos){
-	    HitEfficiency_L1 = iGetter.get("Pixel/Barrel/HitEfficiency_L1");
-	    if(HitEfficiency_L1) HitEfficiency_L1->setBinContent(binx, biny,(float)hitEfficiency);
-	  }else if(currDir.find("Layer_2")!=string::npos){
-	    HitEfficiency_L2 = iGetter.get("Pixel/Barrel/HitEfficiency_L2");
-	    if(HitEfficiency_L2) HitEfficiency_L2->setBinContent(binx, biny,(float)hitEfficiency);
-	  }else if(currDir.find("Layer_3")!=string::npos){
-	    HitEfficiency_L3 = iGetter.get("Pixel/Barrel/HitEfficiency_L3");
-	    if(HitEfficiency_L3) HitEfficiency_L3->setBinContent(binx, biny,(float)hitEfficiency);
-	  }else if( isUpgrade && (currDir.find("Layer_4")!=string::npos) ){
-	    HitEfficiency_L4 = iGetter.get("Pixel/Barrel/HitEfficiency_L4");
-	    if(HitEfficiency_L4) HitEfficiency_L4->setBinContent(binx, biny,(float)hitEfficiency);
-	  }else if(currDir.find("Disk_1")!=string::npos && currDir.find("HalfCylinder_m")!=string::npos){
-	    HitEfficiency_Dm1 = iGetter.get("Pixel/Endcap/HitEfficiency_Dm1");
-	    if(HitEfficiency_Dm1) HitEfficiency_Dm1->setBinContent(binx, biny,(float)hitEfficiency);
-	  }else if(currDir.find("Disk_2")!=string::npos && currDir.find("HalfCylinder_m")!=string::npos){
-	    HitEfficiency_Dm2 = iGetter.get("Pixel/Endcap/HitEfficiency_Dm2");
-	    if(HitEfficiency_Dm2) HitEfficiency_Dm2->setBinContent(binx, biny,(float)hitEfficiency);
-	  }else if(currDir.find("Disk_3")!=string::npos && currDir.find("HalfCylinder_m")!=string::npos){
-	    HitEfficiency_Dm3 = iGetter.get("Pixel/Endcap/HitEfficiency_Dm3");
-	    if(HitEfficiency_Dm3) HitEfficiency_Dm3->setBinContent(binx, biny,(float)hitEfficiency);
-	  }else if(currDir.find("Disk_1")!=string::npos && currDir.find("HalfCylinder_p")!=string::npos){
-	    HitEfficiency_Dp1 = iGetter.get("Pixel/Endcap/HitEfficiency_Dp1");
-	    if(HitEfficiency_Dp1) HitEfficiency_Dp1->setBinContent(binx, biny,(float)hitEfficiency);
-	  }else if(currDir.find("Disk_2")!=string::npos && currDir.find("HalfCylinder_p")!=string::npos){
-	    HitEfficiency_Dp2 = iGetter.get("Pixel/Endcap/HitEfficiency_Dp2");
-	    if(HitEfficiency_Dp2) HitEfficiency_Dp2->setBinContent(binx, biny,(float)hitEfficiency);
-	  }else if(currDir.find("Disk_3")!=string::npos && currDir.find("HalfCylinder_p")!=string::npos){
-	    HitEfficiency_Dp3 = iGetter.get("Pixel/Endcap/HitEfficiency_Dp3");
-	    if(HitEfficiency_Dp3) HitEfficiency_Dp3->setBinContent(binx, biny,(float)hitEfficiency);
+        if (full_path.find("missing_") != string::npos) {  // If we have missing hits ME
+          MonitorElement *me = iGetter.get(full_path);
+          if (!me)
+            continue;
+          float missingHits = me->getEntries();
+          string new_path = full_path.replace(full_path.find("missing"), 7, "valid");
+          me = iGetter.get(new_path);
+          if (!me)
+            continue;
+          float validHits = me->getEntries();
+          float hitEfficiency = -1.;
+          if (validHits + missingHits > 0.)
+            hitEfficiency = validHits / (validHits + missingHits);
+          int binx = 0;
+          int biny = 0;
+          if (isbarrel) {
+            if (currDir.find("Shell_m") != string::npos) {
+              if (currDir.find("Module_4") != string::npos) {
+                binx = 1;
+              } else if (currDir.find("Module_3") != string::npos) {
+                binx = 2;
+              }
+              if (currDir.find("Module_2") != string::npos) {
+                binx = 3;
+              } else if (currDir.find("Module_1") != string::npos) {
+                binx = 4;
+              }
+            } else if (currDir.find("Shell_p") != string::npos) {
+              if (currDir.find("Module_1") != string::npos) {
+                binx = 5;
+              } else if (currDir.find("Module_2") != string::npos) {
+                binx = 6;
+              }
+              if (currDir.find("Module_3") != string::npos) {
+                binx = 7;
+              } else if (currDir.find("Module_4") != string::npos) {
+                binx = 8;
+              }
+            }
+            if (!isUpgrade) {
+              if (currDir.find("01") != string::npos) {
+                biny = 1;
+              } else if (currDir.find("02") != string::npos) {
+                biny = 2;
+              } else if (currDir.find("03") != string::npos) {
+                biny = 3;
+              } else if (currDir.find("04") != string::npos) {
+                biny = 4;
+              } else if (currDir.find("05") != string::npos) {
+                biny = 5;
+              } else if (currDir.find("06") != string::npos) {
+                biny = 6;
+              } else if (currDir.find("07") != string::npos) {
+                biny = 7;
+              } else if (currDir.find("08") != string::npos) {
+                biny = 8;
+              } else if (currDir.find("09") != string::npos) {
+                biny = 9;
+              } else if (currDir.find("10") != string::npos) {
+                biny = 10;
+              } else if (currDir.find("11") != string::npos) {
+                biny = 11;
+              } else if (currDir.find("12") != string::npos) {
+                biny = 12;
+              } else if (currDir.find("13") != string::npos) {
+                biny = 13;
+              } else if (currDir.find("14") != string::npos) {
+                biny = 14;
+              } else if (currDir.find("15") != string::npos) {
+                biny = 15;
+              } else if (currDir.find("16") != string::npos) {
+                biny = 16;
+              } else if (currDir.find("17") != string::npos) {
+                biny = 17;
+              } else if (currDir.find("18") != string::npos) {
+                biny = 18;
+              } else if (currDir.find("19") != string::npos) {
+                biny = 19;
+              } else if (currDir.find("20") != string::npos) {
+                biny = 20;
+              } else if (currDir.find("21") != string::npos) {
+                biny = 21;
+              } else if (currDir.find("22") != string::npos) {
+                biny = 22;
+              }
+              if (currDir.find("Shell_mO") != string::npos || currDir.find("Shell_pO") != string::npos) {
+                if (currDir.find("Layer_1") != string::npos) {
+                  biny = biny + 10;
+                } else if (currDir.find("Layer_2") != string::npos) {
+                  biny = biny + 16;
+                } else if (currDir.find("Layer_3") != string::npos) {
+                  biny = biny + 22;
+                }
+              }
+            } else if (isUpgrade) {
+              if (currDir.find("01") != string::npos) {
+                biny = 1;
+              } else if (currDir.find("02") != string::npos) {
+                biny = 2;
+              } else if (currDir.find("03") != string::npos) {
+                biny = 3;
+              } else if (currDir.find("04") != string::npos) {
+                biny = 4;
+              } else if (currDir.find("05") != string::npos) {
+                biny = 5;
+              } else if (currDir.find("06") != string::npos) {
+                biny = 6;
+              } else if (currDir.find("07") != string::npos) {
+                biny = 7;
+              } else if (currDir.find("08") != string::npos) {
+                biny = 8;
+              } else if (currDir.find("09") != string::npos) {
+                biny = 9;
+              } else if (currDir.find("10") != string::npos) {
+                biny = 10;
+              } else if (currDir.find("11") != string::npos) {
+                biny = 11;
+              } else if (currDir.find("12") != string::npos) {
+                biny = 12;
+              } else if (currDir.find("13") != string::npos) {
+                biny = 13;
+              } else if (currDir.find("14") != string::npos) {
+                biny = 14;
+              } else if (currDir.find("15") != string::npos) {
+                biny = 15;
+              } else if (currDir.find("16") != string::npos) {
+                biny = 16;
+              } else if (currDir.find("17") != string::npos) {
+                biny = 17;
+              } else if (currDir.find("18") != string::npos) {
+                biny = 18;
+              } else if (currDir.find("19") != string::npos) {
+                biny = 19;
+              } else if (currDir.find("20") != string::npos) {
+                biny = 20;
+              } else if (currDir.find("21") != string::npos) {
+                biny = 21;
+              } else if (currDir.find("22") != string::npos) {
+                biny = 22;
+              } else if (currDir.find("23") != string::npos) {
+                biny = 23;
+              } else if (currDir.find("24") != string::npos) {
+                biny = 24;
+              } else if (currDir.find("25") != string::npos) {
+                biny = 25;
+              } else if (currDir.find("25") != string::npos) {
+                biny = 25;
+              } else if (currDir.find("26") != string::npos) {
+                biny = 26;
+              } else if (currDir.find("27") != string::npos) {
+                biny = 27;
+              } else if (currDir.find("28") != string::npos) {
+                biny = 28;
+              } else if (currDir.find("29") != string::npos) {
+                biny = 29;
+              } else if (currDir.find("30") != string::npos) {
+                biny = 30;
+              } else if (currDir.find("31") != string::npos) {
+                biny = 31;
+              } else if (currDir.find("32") != string::npos) {
+                biny = 32;
+              }
+              if (currDir.find("Shell_mO") != string::npos || currDir.find("Shell_pO") != string::npos) {
+                if (currDir.find("Layer_1") != string::npos) {
+                  biny = biny + 6;
+                } else if (currDir.find("Layer_2") != string::npos) {
+                  biny = biny + 14;
+                } else if (currDir.find("Layer_3") != string::npos) {
+                  biny = biny + 22;
+                } else if (currDir.find("Layer_4") != string::npos) {
+                  biny = biny + 32;
+                }
+              }
+            }
+          } else {  // endcap
+            if (!isUpgrade) {
+              if (currDir.find("01") != string::npos) {
+                binx = 1;
+              } else if (currDir.find("02") != string::npos) {
+                binx = 2;
+              } else if (currDir.find("03") != string::npos) {
+                binx = 3;
+              } else if (currDir.find("04") != string::npos) {
+                binx = 4;
+              } else if (currDir.find("05") != string::npos) {
+                binx = 5;
+              } else if (currDir.find("06") != string::npos) {
+                binx = 6;
+              } else if (currDir.find("07") != string::npos) {
+                binx = 7;
+              } else if (currDir.find("08") != string::npos) {
+                binx = 8;
+              } else if (currDir.find("09") != string::npos) {
+                binx = 9;
+              } else if (currDir.find("10") != string::npos) {
+                binx = 10;
+              } else if (currDir.find("11") != string::npos) {
+                binx = 11;
+              } else if (currDir.find("12") != string::npos) {
+                binx = 12;
+              }
+              if (currDir.find("HalfCylinder_mO") != string::npos || currDir.find("HalfCylinder_pO") != string::npos) {
+                binx = binx + 12;
+              }
+              if (currDir.find("Panel_1/Module_1") != string::npos) {
+                biny = 1;
+              } else if (currDir.find("Panel_2/Module_1") != string::npos) {
+                biny = 2;
+              } else if (currDir.find("Panel_1/Module_2") != string::npos) {
+                biny = 3;
+              } else if (currDir.find("Panel_2/Module_2") != string::npos) {
+                biny = 4;
+              } else if (currDir.find("Panel_1/Module_3") != string::npos) {
+                biny = 5;
+              } else if (currDir.find("Panel_2/Module_3") != string::npos) {
+                biny = 6;
+              } else if (currDir.find("Panel_1/Module_4") != string::npos) {
+                biny = 7;
+              }
+            } else if (isUpgrade) {
+              if (currDir.find("01") != string::npos) {
+                binx = 1;
+              } else if (currDir.find("02") != string::npos) {
+                binx = 2;
+              } else if (currDir.find("03") != string::npos) {
+                binx = 3;
+              } else if (currDir.find("04") != string::npos) {
+                binx = 4;
+              } else if (currDir.find("05") != string::npos) {
+                binx = 5;
+              } else if (currDir.find("06") != string::npos) {
+                binx = 6;
+              } else if (currDir.find("07") != string::npos) {
+                binx = 7;
+              } else if (currDir.find("08") != string::npos) {
+                binx = 8;
+              } else if (currDir.find("09") != string::npos) {
+                binx = 9;
+              } else if (currDir.find("10") != string::npos) {
+                binx = 10;
+              } else if (currDir.find("11") != string::npos) {
+                binx = 11;
+              } else if (currDir.find("12") != string::npos) {
+                binx = 12;
+              } else if (currDir.find("13") != string::npos) {
+                binx = 13;
+              } else if (currDir.find("14") != string::npos) {
+                binx = 14;
+              } else if (currDir.find("15") != string::npos) {
+                binx = 15;
+              } else if (currDir.find("16") != string::npos) {
+                binx = 16;
+              } else if (currDir.find("17") != string::npos) {
+                binx = 17;
+              }
+              if (currDir.find("HalfCylinder_mO") != string::npos || currDir.find("HalfCylinder_pO") != string::npos) {
+                binx = binx + 17;
+              }
+              if (currDir.find("Panel_1/Module_1") != string::npos) {
+                biny = 1;
+              } else if (currDir.find("Panel_2/Module_1") != string::npos) {
+                biny = 2;
+              }
+            }  // endif(isUpgrade)
+          }
+
+          if (currDir.find("Layer_1") != string::npos) {
+            HitEfficiency_L1 = iGetter.get("Pixel/Barrel/HitEfficiency_L1");
+            if (HitEfficiency_L1)
+              HitEfficiency_L1->setBinContent(binx, biny, (float)hitEfficiency);
+          } else if (currDir.find("Layer_2") != string::npos) {
+            HitEfficiency_L2 = iGetter.get("Pixel/Barrel/HitEfficiency_L2");
+            if (HitEfficiency_L2)
+              HitEfficiency_L2->setBinContent(binx, biny, (float)hitEfficiency);
+          } else if (currDir.find("Layer_3") != string::npos) {
+            HitEfficiency_L3 = iGetter.get("Pixel/Barrel/HitEfficiency_L3");
+            if (HitEfficiency_L3)
+              HitEfficiency_L3->setBinContent(binx, biny, (float)hitEfficiency);
+          } else if (isUpgrade && (currDir.find("Layer_4") != string::npos)) {
+            HitEfficiency_L4 = iGetter.get("Pixel/Barrel/HitEfficiency_L4");
+            if (HitEfficiency_L4)
+              HitEfficiency_L4->setBinContent(binx, biny, (float)hitEfficiency);
+          } else if (currDir.find("Disk_1") != string::npos && currDir.find("HalfCylinder_m") != string::npos) {
+            HitEfficiency_Dm1 = iGetter.get("Pixel/Endcap/HitEfficiency_Dm1");
+            if (HitEfficiency_Dm1)
+              HitEfficiency_Dm1->setBinContent(binx, biny, (float)hitEfficiency);
+          } else if (currDir.find("Disk_2") != string::npos && currDir.find("HalfCylinder_m") != string::npos) {
+            HitEfficiency_Dm2 = iGetter.get("Pixel/Endcap/HitEfficiency_Dm2");
+            if (HitEfficiency_Dm2)
+              HitEfficiency_Dm2->setBinContent(binx, biny, (float)hitEfficiency);
+          } else if (currDir.find("Disk_3") != string::npos && currDir.find("HalfCylinder_m") != string::npos) {
+            HitEfficiency_Dm3 = iGetter.get("Pixel/Endcap/HitEfficiency_Dm3");
+            if (HitEfficiency_Dm3)
+              HitEfficiency_Dm3->setBinContent(binx, biny, (float)hitEfficiency);
+          } else if (currDir.find("Disk_1") != string::npos && currDir.find("HalfCylinder_p") != string::npos) {
+            HitEfficiency_Dp1 = iGetter.get("Pixel/Endcap/HitEfficiency_Dp1");
+            if (HitEfficiency_Dp1)
+              HitEfficiency_Dp1->setBinContent(binx, biny, (float)hitEfficiency);
+          } else if (currDir.find("Disk_2") != string::npos && currDir.find("HalfCylinder_p") != string::npos) {
+            HitEfficiency_Dp2 = iGetter.get("Pixel/Endcap/HitEfficiency_Dp2");
+            if (HitEfficiency_Dp2)
+              HitEfficiency_Dp2->setBinContent(binx, biny, (float)hitEfficiency);
+          } else if (currDir.find("Disk_3") != string::npos && currDir.find("HalfCylinder_p") != string::npos) {
+            HitEfficiency_Dp3 = iGetter.get("Pixel/Endcap/HitEfficiency_Dp3");
+            if (HitEfficiency_Dp3)
+              HitEfficiency_Dp3->setBinContent(binx, biny, (float)hitEfficiency);
           }
         }
       }
-    }else{  
-      //cout<<"finding subdirs now"<<std::endl;
+    } else {
+      // cout<<"finding subdirs now"<<std::endl;
       vector<string> subdirs = iGetter.getSubdirs();
       for (vector<string>::const_iterator it = subdirs.begin(); it != subdirs.end(); it++) {
         iBooker.cd(*it);
-	iGetter.cd(*it);
-        if(*it != "Pixel" && ((isbarrel && (*it).find("Barrel")==string::npos) || (!isbarrel && (*it).find("Endcap")==string::npos))) continue;
+        iGetter.cd(*it);
+        if (*it != "Pixel" &&
+            ((isbarrel && (*it).find("Barrel") == string::npos) || (!isbarrel && (*it).find("Endcap") == string::npos)))
+          continue;
         fillEfficiency(iBooker, iGetter, isbarrel, isUpgrade);
         iBooker.goUp();
-	iGetter.setCurrentFolder(iBooker.pwd());
+        iGetter.setCurrentFolder(iBooker.pwd());
       }
     }
-  } // end online/offline
-  //cout<<"leaving SiPixelActionExecutor::fillEfficiency..."<<std::endl;
+  }  // end online/offline
+  // cout<<"leaving SiPixelActionExecutor::fillEfficiency..."<<std::endl;
 }
 
 //=============================================================================================================
 
-void SiPixelActionExecutor::fillEfficiencySummary(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter){
-  //cout<<"entering SiPixelActionExecutor::fillEfficiencySummary..."<<std::endl;
-  //First we get the summary plot"
-  if (!Tier0Flag_) return;
+void SiPixelActionExecutor::fillEfficiencySummary(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter) {
+  // cout<<"entering
+  // SiPixelActionExecutor::fillEfficiencySummary..."<<std::endl; First we get
+  // the summary plot"
+  if (!Tier0Flag_)
+    return;
   HitEfficiencySummary = iGetter.get("Pixel/HitEfficiencySummary");
-  //Now we will loop over the hit efficiency plots and fill it"
-  string hitEfficiencyPostfix[] = {"L1","L2","L3","Dp1","Dp2","Dm1","Dm2"};
-  std::vector<std::vector<float> > ignoreXBins = {{-4,2}, {4,4,-1,-3,3,-4,-3,-2,-1,-4,-3,-2,-1,1,-4},    {1,-4,1},{},{},{},{}};
-  std::vector<std::vector<float> > ignoreYBins = {{-9,-3},{1,16,1,-13,-13,-5,-5,-5,-5,-6,-6,-6,-6,-8,-8},{3,14,6},{},{},{},{}};
-  
-  for (int i = 0; i < 7; i++){
+  // Now we will loop over the hit efficiency plots and fill it"
+  string hitEfficiencyPostfix[] = {"L1", "L2", "L3", "Dp1", "Dp2", "Dm1", "Dm2"};
+  std::vector<std::vector<float>> ignoreXBins = {
+      {-4, 2}, {4, 4, -1, -3, 3, -4, -3, -2, -1, -4, -3, -2, -1, 1, -4}, {1, -4, 1}, {}, {}, {}, {}};
+  std::vector<std::vector<float>> ignoreYBins = {
+      {-9, -3}, {1, 16, 1, -13, -13, -5, -5, -5, -5, -6, -6, -6, -6, -8, -8}, {3, 14, 6}, {}, {}, {}, {}};
+
+  for (int i = 0; i < 7; i++) {
     string subdetName = "Endcap/";
-    if (i < 3) subdetName = "Barrel/";
-    char meName [50];
-    sprintf(meName,"Pixel/%sHitEfficiency_%s",subdetName.c_str(),hitEfficiencyPostfix[i].c_str());
-    MonitorElement * tempHitEffMap = iGetter.get(meName);
+    if (i < 3)
+      subdetName = "Barrel/";
+    char meName[50];
+    sprintf(meName, "Pixel/%sHitEfficiency_%s", subdetName.c_str(), hitEfficiencyPostfix[i].c_str());
+    MonitorElement *tempHitEffMap = iGetter.get(meName);
     float totalEff = 0.;
     int totalBins = 0;
-    TH1 * hitEffMap = tempHitEffMap->getTH1();
-    for (int xBin = 1; xBin < tempHitEffMap->getNbinsX() + 1; xBin++){
-      if (fabs(hitEffMap->GetXaxis()->GetBinCenter(xBin)) < 1.) continue;
-      for (int yBin = 1; yBin < tempHitEffMap->getNbinsY() + 1; yBin++){
-	if (fabs(hitEffMap->GetYaxis()->GetBinCenter(yBin)) < 0.5) continue;
-	bool ignoreBin = false;
-	for (unsigned int j = 0; j < ignoreXBins[i].size(); j++){
-	  if (hitEffMap->GetXaxis()->GetBinCenter(xBin) == ignoreXBins[i][j] && hitEffMap->GetYaxis()->GetBinCenter(yBin) == ignoreYBins[i][j]){
-	    ignoreBin = true;
-	    break;
-	  }
-	}
-	if (ignoreBin) continue;
-	if (!(tempHitEffMap->getBinContent(xBin,yBin) < 0.)) totalEff += tempHitEffMap->getBinContent(xBin,yBin);
-	totalBins++;
+    TH1 *hitEffMap = tempHitEffMap->getTH1();
+    for (int xBin = 1; xBin < tempHitEffMap->getNbinsX() + 1; xBin++) {
+      if (fabs(hitEffMap->GetXaxis()->GetBinCenter(xBin)) < 1.)
+        continue;
+      for (int yBin = 1; yBin < tempHitEffMap->getNbinsY() + 1; yBin++) {
+        if (fabs(hitEffMap->GetYaxis()->GetBinCenter(yBin)) < 0.5)
+          continue;
+        bool ignoreBin = false;
+        for (unsigned int j = 0; j < ignoreXBins[i].size(); j++) {
+          if (hitEffMap->GetXaxis()->GetBinCenter(xBin) == ignoreXBins[i][j] &&
+              hitEffMap->GetYaxis()->GetBinCenter(yBin) == ignoreYBins[i][j]) {
+            ignoreBin = true;
+            break;
+          }
+        }
+        if (ignoreBin)
+          continue;
+        if (!(tempHitEffMap->getBinContent(xBin, yBin) < 0.))
+          totalEff += tempHitEffMap->getBinContent(xBin, yBin);
+        totalBins++;
       }
     }
     float overalEff = 0.;
     //    std::cout << i << " " << totalEff << " " << totalBins << std::endl;
-    if (totalBins > 0) overalEff = totalEff/float(totalBins);
-    HitEfficiencySummary->setBinContent(i+1,overalEff);
+    if (totalBins > 0)
+      overalEff = totalEff / float(totalBins);
+    HitEfficiencySummary->setBinContent(i + 1, overalEff);
   }
-  
 }
diff --git a/DQM/SiPixelMonitorClient/src/SiPixelCertification.cc b/DQM/SiPixelMonitorClient/src/SiPixelCertification.cc
index 69a3c45aa3562..429ba7b2dcd12 100644
--- a/DQM/SiPixelMonitorClient/src/SiPixelCertification.cc
+++ b/DQM/SiPixelMonitorClient/src/SiPixelCertification.cc
@@ -1,114 +1,124 @@
 #include "DQM/SiPixelMonitorClient/interface/SiPixelCertification.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
+#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
 #include "CondFormats/RunInfo/interface/RunInfo.h"
 #include "CondFormats/RunInfo/interface/RunSummary.h"
-#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
 
-#include <iostream>
-#include <iomanip>
+#include <cmath>
 #include <cstdio>
-#include <string>
+#include <iomanip>
+#include <iostream>
 #include <sstream>
-#include <cmath>
+#include <string>
 
 using namespace std;
 using namespace edm;
-SiPixelCertification::SiPixelCertification(const edm::ParameterSet& ps) {
-  edm::LogInfo( "SiPixelCertification") << "SiPixelCertification::Creating SiPixelCertification ";
+SiPixelCertification::SiPixelCertification(const edm::ParameterSet &ps) {
+  edm::LogInfo("SiPixelCertification") << "SiPixelCertification::Creating SiPixelCertification ";
   firstLumi = true;
 }
 
-SiPixelCertification::~SiPixelCertification(){
-  edm::LogInfo( "SiPixelCertification") << "SiPixelCertification::Deleting SiPixelCertification ";
+SiPixelCertification::~SiPixelCertification() {
+  edm::LogInfo("SiPixelCertification") << "SiPixelCertification::Deleting SiPixelCertification ";
 }
 
-void SiPixelCertification::dqmEndLuminosityBlock(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter, const edm::LuminosityBlock&  lumiBlock, const  edm::EventSetup& iSetup){
-//cout<<"Entering SiPixelCertification::endLuminosityBlock: "<<endl;
+void SiPixelCertification::dqmEndLuminosityBlock(DQMStore::IBooker &iBooker,
+                                                 DQMStore::IGetter &iGetter,
+                                                 const edm::LuminosityBlock &lumiBlock,
+                                                 const edm::EventSetup &iSetup) {
+  // cout<<"Entering SiPixelCertification::endLuminosityBlock: "<<endl;
 
-  //If first run, book some histograms
-  if (firstLumi){
+  // If first run, book some histograms
+  if (firstLumi) {
     iBooker.setCurrentFolder("Pixel/EventInfo");
-    CertificationPixel= iBooker.bookFloat("CertificationSummary");  
+    CertificationPixel = iBooker.bookFloat("CertificationSummary");
     iBooker.setCurrentFolder("Pixel/EventInfo/CertificationContents");
-    CertificationBarrel= iBooker.bookFloat("PixelBarrelFraction");  
-    CertificationEndcap= iBooker.bookFloat("PixelEndcapFraction");  
+    CertificationBarrel = iBooker.bookFloat("PixelBarrelFraction");
+    CertificationEndcap = iBooker.bookFloat("PixelEndcapFraction");
+
+    CertificationPixel->Fill(1.);
+    CertificationBarrel->Fill(1.);
+    CertificationEndcap->Fill(1.);
 
-    CertificationPixel->Fill(1.);  
-    CertificationBarrel->Fill(1.);  
-    CertificationEndcap->Fill(1.);  
-    
     firstLumi = false;
   }
 
-  edm::LogInfo( "SiPixelCertification") << "SiPixelCertification::endLuminosityBlock ";
-  // Compute and fill overall certification bits, for now use smallest single value:
+  edm::LogInfo("SiPixelCertification") << "SiPixelCertification::endLuminosityBlock ";
+  // Compute and fill overall certification bits, for now use smallest single
+  // value:
   float dcsFrac = (iGetter.getElement("Pixel/EventInfo/DCSSummary"))->getFloatValue();
   float daqFrac = (iGetter.getElement("Pixel/EventInfo/DAQSummary"))->getFloatValue();
   float dqmFrac = (iGetter.getElement("Pixel/EventInfo/reportSummary"))->getFloatValue();
-  float pixel_all = std::min(dcsFrac,daqFrac);
-  pixel_all = std::min(pixel_all,dqmFrac);
-//std::cout<<"Pixel numbers: "<<dcsFrac<<" , "<<daqFrac<<" , "<<dqmFrac<<" , "<<pixel_all<<std::endl;
+  float pixel_all = std::min(dcsFrac, daqFrac);
+  pixel_all = std::min(pixel_all, dqmFrac);
+  // std::cout<<"Pixel numbers: "<<dcsFrac<<" , "<<daqFrac<<" , "<<dqmFrac<<" ,
+  // "<<pixel_all<<std::endl;
   CertificationPixel = iGetter.getElement("Pixel/EventInfo/CertificationSummary");
-  if(CertificationPixel) CertificationPixel->Fill(pixel_all);
+  if (CertificationPixel)
+    CertificationPixel->Fill(pixel_all);
 
   dcsFrac = (iGetter.getElement("Pixel/EventInfo/DCSContents/PixelBarrelFraction"))->getFloatValue();
   daqFrac = (iGetter.getElement("Pixel/EventInfo/DAQContents/PixelBarrelFraction"))->getFloatValue();
   dqmFrac = (iGetter.getElement("Pixel/EventInfo/reportSummaryContents/PixelBarrelFraction"))->getFloatValue();
-  float pixel_barrel = std::min(dcsFrac,daqFrac);
-  pixel_barrel = std::min(pixel_barrel,dqmFrac);
-//std::cout<<"Barrel numbers: "<<dcsFrac<<" , "<<daqFrac<<" , "<<dqmFrac<<" , "<<pixel_barrel<<std::endl;
+  float pixel_barrel = std::min(dcsFrac, daqFrac);
+  pixel_barrel = std::min(pixel_barrel, dqmFrac);
+  // std::cout<<"Barrel numbers: "<<dcsFrac<<" , "<<daqFrac<<" , "<<dqmFrac<<" ,
+  // "<<pixel_barrel<<std::endl;
   CertificationBarrel = iGetter.getElement("Pixel/EventInfo/CertificationContents/PixelBarrelFraction");
-  if(CertificationBarrel) CertificationBarrel->Fill(pixel_barrel);
+  if (CertificationBarrel)
+    CertificationBarrel->Fill(pixel_barrel);
 
   dcsFrac = (iGetter.getElement("Pixel/EventInfo/DCSContents/PixelEndcapFraction"))->getFloatValue();
   daqFrac = (iGetter.getElement("Pixel/EventInfo/DAQContents/PixelEndcapFraction"))->getFloatValue();
   dqmFrac = (iGetter.getElement("Pixel/EventInfo/reportSummaryContents/PixelEndcapFraction"))->getFloatValue();
-  float pixel_endcap = std::min(dcsFrac,daqFrac);
-  pixel_endcap = std::min(pixel_endcap,dqmFrac);
-//std::cout<<"Endcap numbers: "<<dcsFrac<<" , "<<daqFrac<<" , "<<dqmFrac<<" , "<<pixel_endcap<<std::endl;
+  float pixel_endcap = std::min(dcsFrac, daqFrac);
+  pixel_endcap = std::min(pixel_endcap, dqmFrac);
+  // std::cout<<"Endcap numbers: "<<dcsFrac<<" , "<<daqFrac<<" , "<<dqmFrac<<" ,
+  // "<<pixel_endcap<<std::endl;
   CertificationEndcap = iGetter.getElement("Pixel/EventInfo/CertificationContents/PixelEndcapFraction");
-  if(CertificationEndcap) CertificationEndcap->Fill(pixel_endcap);
-
+  if (CertificationEndcap)
+    CertificationEndcap->Fill(pixel_endcap);
 }
 
-
-void SiPixelCertification::dqmEndJob(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter){
-//cout<<"Entering SiPixelCertification::endRun: "<<endl;
-  edm::LogInfo( "SiPixelCertification") << "SiPixelCertification::endRun ";
-  // Compute and fill overall certification bits, for now use smallest single value:
+void SiPixelCertification::dqmEndJob(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter) {
+  // cout<<"Entering SiPixelCertification::endRun: "<<endl;
+  edm::LogInfo("SiPixelCertification") << "SiPixelCertification::endRun ";
+  // Compute and fill overall certification bits, for now use smallest single
+  // value:
   float dcsFrac = (iGetter.getElement("Pixel/EventInfo/DCSSummary"))->getFloatValue();
   float daqFrac = (iGetter.getElement("Pixel/EventInfo/DAQSummary"))->getFloatValue();
   float dqmFrac = (iGetter.getElement("Pixel/EventInfo/reportSummary"))->getFloatValue();
-  float pixel_all = std::min(dcsFrac,daqFrac);
-  pixel_all = std::min(pixel_all,dqmFrac);
-//std::cout<<"Pixel numbers: "<<dcsFrac<<" , "<<daqFrac<<" , "<<dqmFrac<<" , "<<pixel_all<<std::endl;
-  if(CertificationPixel) CertificationPixel->Fill(pixel_all);
+  float pixel_all = std::min(dcsFrac, daqFrac);
+  pixel_all = std::min(pixel_all, dqmFrac);
+  // std::cout<<"Pixel numbers: "<<dcsFrac<<" , "<<daqFrac<<" , "<<dqmFrac<<" ,
+  // "<<pixel_all<<std::endl;
+  if (CertificationPixel)
+    CertificationPixel->Fill(pixel_all);
 
   dcsFrac = (iGetter.getElement("Pixel/EventInfo/DCSContents/PixelBarrelFraction"))->getFloatValue();
   daqFrac = (iGetter.getElement("Pixel/EventInfo/DAQContents/PixelBarrelFraction"))->getFloatValue();
   dqmFrac = (iGetter.getElement("Pixel/EventInfo/reportSummaryContents/PixelBarrelFraction"))->getFloatValue();
-  float pixel_barrel = std::min(dcsFrac,daqFrac);
-  pixel_barrel = std::min(pixel_barrel,dqmFrac);
-//std::cout<<"Barrel numbers: "<<dcsFrac<<" , "<<daqFrac<<" , "<<dqmFrac<<" , "<<pixel_barrel<<std::endl;
-  if(CertificationBarrel) CertificationBarrel->Fill(pixel_barrel);
+  float pixel_barrel = std::min(dcsFrac, daqFrac);
+  pixel_barrel = std::min(pixel_barrel, dqmFrac);
+  // std::cout<<"Barrel numbers: "<<dcsFrac<<" , "<<daqFrac<<" , "<<dqmFrac<<" ,
+  // "<<pixel_barrel<<std::endl;
+  if (CertificationBarrel)
+    CertificationBarrel->Fill(pixel_barrel);
 
   dcsFrac = (iGetter.getElement("Pixel/EventInfo/DCSContents/PixelEndcapFraction"))->getFloatValue();
   daqFrac = (iGetter.getElement("Pixel/EventInfo/DAQContents/PixelEndcapFraction"))->getFloatValue();
   dqmFrac = (iGetter.getElement("Pixel/EventInfo/reportSummaryContents/PixelEndcapFraction"))->getFloatValue();
-  float pixel_endcap = std::min(dcsFrac,daqFrac);
-  pixel_endcap = std::min(pixel_endcap,dqmFrac);
-//std::cout<<"Endcap numbers: "<<dcsFrac<<" , "<<daqFrac<<" , "<<dqmFrac<<" , "<<pixel_endcap<<std::endl;
-  if(CertificationEndcap) CertificationEndcap->Fill(pixel_endcap);
-
+  float pixel_endcap = std::min(dcsFrac, daqFrac);
+  pixel_endcap = std::min(pixel_endcap, dqmFrac);
+  // std::cout<<"Endcap numbers: "<<dcsFrac<<" , "<<daqFrac<<" , "<<dqmFrac<<" ,
+  // "<<pixel_endcap<<std::endl;
+  if (CertificationEndcap)
+    CertificationEndcap->Fill(pixel_endcap);
 }
-
-
-
-
diff --git a/DQM/SiPixelMonitorClient/src/SiPixelConfigParser.cc b/DQM/SiPixelMonitorClient/src/SiPixelConfigParser.cc
index 95e6679a3e2a0..1c00554fd14a8 100644
--- a/DQM/SiPixelMonitorClient/src/SiPixelConfigParser.cc
+++ b/DQM/SiPixelMonitorClient/src/SiPixelConfigParser.cc
@@ -1,5 +1,5 @@
-#include "DQM/SiPixelMonitorClient/interface/SiPixelConfigParser.h"
 #include "DQM/SiPixelMonitorClient/interface/ANSIColors.h"
+#include "DQM/SiPixelMonitorClient/interface/SiPixelConfigParser.h"
 #include "DQMServices/ClientConfig/interface/ParserFunctions.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <iostream>
@@ -9,23 +9,22 @@ using namespace std;
 
 //
 // -- Constructor
-// 
+//
 SiPixelConfigParser::SiPixelConfigParser() : DQMParserBase() {
-  edm::LogInfo("SiPixelConfigParser") << 
-    " Creating SiPixelConfigParser " << "\n" ;
+  edm::LogInfo("SiPixelConfigParser") << " Creating SiPixelConfigParser "
+                                      << "\n";
 }
 //
 // --  Destructor
-// 
+//
 SiPixelConfigParser::~SiPixelConfigParser() {
-  edm::LogInfo("SiPixelActionExecutor") << 
-    " Deleting SiPixelConfigParser " << "\n" ;
+  edm::LogInfo("SiPixelActionExecutor") << " Deleting SiPixelConfigParser "
+                                        << "\n";
 }
 //
 // -- Read ME list for the TrackerMap
 //
-bool SiPixelConfigParser::getMENamesForTrackerMap(string& tkmap_name, 
-						 vector<string>& me_names){
+bool SiPixelConfigParser::getMENamesForTrackerMap(string &tkmap_name, vector<string> &me_names) {
   if (!doc()) {
     cout << " SiPixelConfigParser::Configuration File is not set!!! " << endl;
     return false;
@@ -33,112 +32,85 @@ bool SiPixelConfigParser::getMENamesForTrackerMap(string& tkmap_name,
 
   me_names.clear();
   unsigned int tkMapNodes = doc()->getElementsByTagName(qtxml::_toDOMS("TkMap"))->getLength();
-  if (tkMapNodes != 1) 
-  {
-   cout << ACYellow << ACBold 
-        << "[SiPixelConfigParser::getMENamesForTrackerMap()]"
-	<< ACRed << ACBold
-	<< "No TkMap tag found in configuration file"
-	<< ACPlain << endl ;
-   return false;
+  if (tkMapNodes != 1) {
+    cout << ACYellow << ACBold << "[SiPixelConfigParser::getMENamesForTrackerMap()]" << ACRed << ACBold
+         << "No TkMap tag found in configuration file" << ACPlain << endl;
+    return false;
   }
   /// Get Node
-  DOMNode* tkMapNode = doc()->getElementsByTagName(qtxml::_toDOMS("TkMap"))->item(0);
- //Get QTEST name
-  if (! tkMapNode) 
-  {
-   cout << ACYellow << ACBold 
-        << "[SiPixelConfigParser::getMENamesForTrackerMap()]"
-	<< ACRed << ACBold
-	<< " No TkMap tag elements found in configuration file"
-	<< ACPlain << endl ;
-   return false;
+  DOMNode *tkMapNode = doc()->getElementsByTagName(qtxml::_toDOMS("TkMap"))->item(0);
+  // Get QTEST name
+  if (!tkMapNode) {
+    cout << ACYellow << ACBold << "[SiPixelConfigParser::getMENamesForTrackerMap()]" << ACRed << ACBold
+         << " No TkMap tag elements found in configuration file" << ACPlain << endl;
+    return false;
+  }
+  DOMElement *tkMapElement = static_cast<DOMElement *>(tkMapNode);
+  if (!tkMapElement) {
+    cout << ACYellow << ACBold << "[SiPixelConfigParser::getMENamesForTrackerMap()]" << ACRed << ACBold
+         << " No TkMap tag dom elements found in configuration file" << ACPlain << endl;
+    return false;
   }
-  DOMElement* tkMapElement = static_cast<DOMElement *>(tkMapNode);          
-  if (! tkMapElement) 
-  {
-   cout << ACYellow << ACBold 
-        << "[SiPixelConfigParser::getMENamesForTrackerMap()]"
-	<< ACRed << ACBold
-	<< " No TkMap tag dom elements found in configuration file"
-	<< ACPlain << endl ;
-   return false;		 
-  }		
   tkmap_name = qtxml::_toString(tkMapElement->getAttribute(qtxml::_toDOMS("name")));
-	
-  DOMNodeList * meList 
-		  = tkMapElement->getElementsByTagName(qtxml::_toDOMS("MonElement"));
-  if( meList->getLength() == 0 )
-  {
-    cout << ACYellow << ACBold 
-    	 << "[SiPixelConfigParser::getMENamesForTrackerMap()]"
-    	 << ACRed << ACBold
-    	 << " No MonElement found in configuration file"
-    	 << ACPlain << endl ;
+
+  DOMNodeList *meList = tkMapElement->getElementsByTagName(qtxml::_toDOMS("MonElement"));
+  if (meList->getLength() == 0) {
+    cout << ACYellow << ACBold << "[SiPixelConfigParser::getMENamesForTrackerMap()]" << ACRed << ACBold
+         << " No MonElement found in configuration file" << ACPlain << endl;
   }
   for (unsigned int k = 0; k < meList->getLength(); k++) {
-    DOMNode* meNode = meList->item(k);
-    if (!meNode) 
-    {
-     cout << ACYellow << ACBold 
-     	  << "[SiPixelConfigParser::getMENamesForTrackerMap()]"
-     	  << ACRed << ACBold
-     	  << " No MonElement item found in configuration file"
-     	  << ACPlain << endl ;
-     return false;
+    DOMNode *meNode = meList->item(k);
+    if (!meNode) {
+      cout << ACYellow << ACBold << "[SiPixelConfigParser::getMENamesForTrackerMap()]" << ACRed << ACBold
+           << " No MonElement item found in configuration file" << ACPlain << endl;
+      return false;
     }
-    DOMElement* meElement = static_cast<DOMElement *>(meNode);          
-    if (!meElement) 
-    { 
-     cout << ACYellow << ACBold 
-     	  << "[SiPixelConfigParser::getMENamesForTrackerMap()]"
-     	  << ACRed << ACBold
-     	  << " No MonElement sub-elements found in configuration file"
-     	  << ACPlain << endl ;
-     return false;
+    DOMElement *meElement = static_cast<DOMElement *>(meNode);
+    if (!meElement) {
+      cout << ACYellow << ACBold << "[SiPixelConfigParser::getMENamesForTrackerMap()]" << ACRed << ACBold
+           << " No MonElement sub-elements found in configuration file" << ACPlain << endl;
+      return false;
     }
-    string me_name = qtxml::_toString(meElement->getAttribute (qtxml::_toDOMS ("name"))); 
-    me_names.push_back(me_name);    
+    string me_name = qtxml::_toString(meElement->getAttribute(qtxml::_toDOMS("name")));
+    me_names.push_back(me_name);
   }
-  if (me_names.empty()) 
-  {
-    cout << ACYellow << ACBold 
-    	 << "[SiPixelConfigParser::getMENamesForTrackerMap()]"
-    	 << ACRed << ACBold
-    	 << " No MonElement sub-element names found in configuration file"
-    	 << ACPlain << endl ;
-   return false;
+  if (me_names.empty()) {
+    cout << ACYellow << ACBold << "[SiPixelConfigParser::getMENamesForTrackerMap()]" << ACRed << ACBold
+         << " No MonElement sub-element names found in configuration file" << ACPlain << endl;
+    return false;
   } else {
-   return true;
+    return true;
   }
 }
 //
 // -- Read Update Frequency for the TrackerMap
 //
-bool SiPixelConfigParser::getFrequencyForTrackerMap(int& u_freq){
+bool SiPixelConfigParser::getFrequencyForTrackerMap(int &u_freq) {
   if (!doc()) {
     cout << " SiPixelConfigParser::Configuration File is not set!!! " << endl;
     return false;
   }
 
   unsigned int tkMapNodes = doc()->getElementsByTagName(qtxml::_toDOMS("TkMap"))->getLength();
-  if (tkMapNodes != 1) return false;
+  if (tkMapNodes != 1)
+    return false;
   /// Get Node
-  DOMNode* tkMapNode = doc()->getElementsByTagName(qtxml::_toDOMS("TkMap"))->item(0);
- //Get Node name
-  if (! tkMapNode) return false;
-  DOMElement* tkMapElement = static_cast<DOMElement *>(tkMapNode);          
-  if (! tkMapElement) return false;		 
-		
+  DOMNode *tkMapNode = doc()->getElementsByTagName(qtxml::_toDOMS("TkMap"))->item(0);
+  // Get Node name
+  if (!tkMapNode)
+    return false;
+  DOMElement *tkMapElement = static_cast<DOMElement *>(tkMapNode);
+  if (!tkMapElement)
+    return false;
+
   u_freq = atoi(qtxml::_toString(tkMapElement->getAttribute(qtxml::_toDOMS("update_frequency"))).c_str());
   return true;
 }
 //
 // -- Get List of MEs for the module tree plots:
 //
-bool SiPixelConfigParser::getMENamesForTree(string& structure_name,
-						vector<string>& me_names) {
-  //cout<<"Entering SiPixelConfigParser::getMENamesForTree..."<<endl;
+bool SiPixelConfigParser::getMENamesForTree(string &structure_name, vector<string> &me_names) {
+  // cout<<"Entering SiPixelConfigParser::getMENamesForTree..."<<endl;
   if (!doc()) {
     cout << " SiPixelConfigParser::Configuration File is not set!!! " << endl;
     return false;
@@ -146,68 +118,78 @@ bool SiPixelConfigParser::getMENamesForTree(string& structure_name,
 
   me_names.clear();
   unsigned int structureNodes = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureLevel"))->getLength();
-  if (structureNodes == 0) return false;
+  if (structureNodes == 0)
+    return false;
   /// Get Node
-  DOMNode* structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureLevel"))->item(0);
- //Get QTEST name
-  if (! structureNode) return false;
-  DOMElement* structureElement = static_cast<DOMElement *>(structureNode);          
-  if (! structureElement) return false;		 
-		
-  structure_name = qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("name"))); 
-
-  DOMNodeList * meList = structureElement->getElementsByTagName(qtxml::_toDOMS("MonElement"));
+  DOMNode *structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureLevel"))->item(0);
+  // Get QTEST name
+  if (!structureNode)
+    return false;
+  DOMElement *structureElement = static_cast<DOMElement *>(structureNode);
+  if (!structureElement)
+    return false;
+
+  structure_name = qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("name")));
+
+  DOMNodeList *meList = structureElement->getElementsByTagName(qtxml::_toDOMS("MonElement"));
   for (unsigned int k = 0; k < meList->getLength(); k++) {
-    DOMNode* meNode = meList->item(k);
-    if (!meNode) return false;
-    DOMElement* meElement = static_cast<DOMElement *>(meNode);          
-    if (!meElement) return false;
-    string me_name = qtxml::_toString(meElement->getAttribute (qtxml::_toDOMS ("name"))); 
-    me_names.push_back(me_name);    
+    DOMNode *meNode = meList->item(k);
+    if (!meNode)
+      return false;
+    DOMElement *meElement = static_cast<DOMElement *>(meNode);
+    if (!meElement)
+      return false;
+    string me_name = qtxml::_toString(meElement->getAttribute(qtxml::_toDOMS("name")));
+    me_names.push_back(me_name);
   }
-  if (me_names.empty()) return false;
-  else return true;
-  //cout<<"...leaving SiPixelConfigParser::getMENamesForTree!"<<endl;
-  
+  if (me_names.empty())
+    return false;
+  else
+    return true;
+  // cout<<"...leaving SiPixelConfigParser::getMENamesForTree!"<<endl;
 }
 //
 // -- Get List of MEs for the summary plot and the
 //
-bool SiPixelConfigParser::getMENamesForBarrelSummary(string& structure_name,
-						vector<string>& me_names) {
-//  cout<<"Entering SiPixelConfigParser::getMENamesForBarrelSummary..."<<endl;
+bool SiPixelConfigParser::getMENamesForBarrelSummary(string &structure_name, vector<string> &me_names) {
+  //  cout<<"Entering SiPixelConfigParser::getMENamesForBarrelSummary..."<<endl;
   if (!doc()) {
     cout << " SiPixelConfigParser::Configuration File is not set!!! " << endl;
     return false;
   }
   me_names.clear();
   unsigned int structureNodes = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureBarrelLevel"))->getLength();
-  if (structureNodes == 0) return false;
+  if (structureNodes == 0)
+    return false;
   /// Get Node
-  DOMNode* structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureBarrelLevel"))->item(0);
- //Get QTEST name
-  if (! structureNode) return false;
-  DOMElement* structureElement = static_cast<DOMElement *>(structureNode);          
-  if (! structureElement) return false;		 
-  structure_name = qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("name"))); 
-
-  DOMNodeList * meList = structureElement->getElementsByTagName(qtxml::_toDOMS("MonElement"));
+  DOMNode *structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureBarrelLevel"))->item(0);
+  // Get QTEST name
+  if (!structureNode)
+    return false;
+  DOMElement *structureElement = static_cast<DOMElement *>(structureNode);
+  if (!structureElement)
+    return false;
+  structure_name = qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("name")));
+
+  DOMNodeList *meList = structureElement->getElementsByTagName(qtxml::_toDOMS("MonElement"));
   for (unsigned int k = 0; k < meList->getLength(); k++) {
-    DOMNode* meNode = meList->item(k);
-    if (!meNode) return false;
-    DOMElement* meElement = static_cast<DOMElement *>(meNode);          
-    if (!meElement) return false;
-    string me_name = qtxml::_toString(meElement->getAttribute (qtxml::_toDOMS ("name"))); 
-    me_names.push_back(me_name);    
+    DOMNode *meNode = meList->item(k);
+    if (!meNode)
+      return false;
+    DOMElement *meElement = static_cast<DOMElement *>(meNode);
+    if (!meElement)
+      return false;
+    string me_name = qtxml::_toString(meElement->getAttribute(qtxml::_toDOMS("name")));
+    me_names.push_back(me_name);
   }
-//  cout<<"...leaving SiPixelConfigParser::getMENamesForBarrelSummary!"<<endl;
-  if (me_names.empty()) return false;
-  else return true;
-  
+  //  cout<<"...leaving SiPixelConfigParser::getMENamesForBarrelSummary!"<<endl;
+  if (me_names.empty())
+    return false;
+  else
+    return true;
 }
-bool SiPixelConfigParser::getMENamesForEndcapSummary(string& structure_name,
-						vector<string>& me_names) {
-//  cout<<"Entering SiPixelConfigParser::getMENamesForEndcapSummary..."<<endl;
+bool SiPixelConfigParser::getMENamesForEndcapSummary(string &structure_name, vector<string> &me_names) {
+  //  cout<<"Entering SiPixelConfigParser::getMENamesForEndcapSummary..."<<endl;
   if (!doc()) {
     cout << " SiPixelConfigParser::Configuration File is not set!!! " << endl;
     return false;
@@ -215,35 +197,40 @@ bool SiPixelConfigParser::getMENamesForEndcapSummary(string& structure_name,
 
   me_names.clear();
   unsigned int structureNodes = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureEndcapLevel"))->getLength();
-  if (structureNodes == 0) return false;
+  if (structureNodes == 0)
+    return false;
   /// Get Node
-  DOMNode* structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureEndcapLevel"))->item(0);
- //Get QTEST name
-  if (! structureNode) return false;
-  DOMElement* structureElement = static_cast<DOMElement *>(structureNode);          
-  if (! structureElement) return false;		 
-		
-  structure_name = qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("name"))); 
-
-  DOMNodeList * meList = structureElement->getElementsByTagName(qtxml::_toDOMS("MonElement"));
+  DOMNode *structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureEndcapLevel"))->item(0);
+  // Get QTEST name
+  if (!structureNode)
+    return false;
+  DOMElement *structureElement = static_cast<DOMElement *>(structureNode);
+  if (!structureElement)
+    return false;
+
+  structure_name = qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("name")));
+
+  DOMNodeList *meList = structureElement->getElementsByTagName(qtxml::_toDOMS("MonElement"));
   for (unsigned int k = 0; k < meList->getLength(); k++) {
-    DOMNode* meNode = meList->item(k);
-    if (!meNode) return false;
-    DOMElement* meElement = static_cast<DOMElement *>(meNode);          
-    if (!meElement) return false;
-    string me_name = qtxml::_toString(meElement->getAttribute (qtxml::_toDOMS ("name"))); 
-    me_names.push_back(me_name);    
+    DOMNode *meNode = meList->item(k);
+    if (!meNode)
+      return false;
+    DOMElement *meElement = static_cast<DOMElement *>(meNode);
+    if (!meElement)
+      return false;
+    string me_name = qtxml::_toString(meElement->getAttribute(qtxml::_toDOMS("name")));
+    me_names.push_back(me_name);
   }
-  if (me_names.empty()) return false;
-  else return true;
-//  cout<<"...leaving SiPixelConfigParser::getMENamesForEndcapSummary!"<<endl;
-  
+  if (me_names.empty())
+    return false;
+  else
+    return true;
+  //  cout<<"...leaving SiPixelConfigParser::getMENamesForEndcapSummary!"<<endl;
 }
 
-
-bool SiPixelConfigParser::getMENamesForFEDErrorSummary(string& structure_name,
-						       vector<string>& me_names) {
-  //cout<<"Entering SiPixelConfigParser::getMENamesForFEDErrorSummary..."<<endl;
+bool SiPixelConfigParser::getMENamesForFEDErrorSummary(string &structure_name, vector<string> &me_names) {
+  // cout<<"Entering
+  // SiPixelConfigParser::getMENamesForFEDErrorSummary..."<<endl;
   if (!doc()) {
     cout << " SiPixelConfigParser::Configuration File is not set!!! " << endl;
     return false;
@@ -251,241 +238,275 @@ bool SiPixelConfigParser::getMENamesForFEDErrorSummary(string& structure_name,
 
   me_names.clear();
   unsigned int structureNodes = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureNonDetId"))->getLength();
-  if (structureNodes == 0) return false;
+  if (structureNodes == 0)
+    return false;
   /// Get Node
-  DOMNode* structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureNonDetId"))->item(0);
- //Get QTEST name
-  if (! structureNode) return false;
-  DOMElement* structureElement = static_cast<DOMElement *>(structureNode);          
-  if (! structureElement) return false;		 
-		
-  structure_name = qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("name"))); 
-
-  DOMNodeList * meList = structureElement->getElementsByTagName(qtxml::_toDOMS("MonElement"));
+  DOMNode *structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureNonDetId"))->item(0);
+  // Get QTEST name
+  if (!structureNode)
+    return false;
+  DOMElement *structureElement = static_cast<DOMElement *>(structureNode);
+  if (!structureElement)
+    return false;
+
+  structure_name = qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("name")));
+
+  DOMNodeList *meList = structureElement->getElementsByTagName(qtxml::_toDOMS("MonElement"));
   for (unsigned int k = 0; k < meList->getLength(); k++) {
-    DOMNode* meNode = meList->item(k);
-    if (!meNode) return false;
-    DOMElement* meElement = static_cast<DOMElement *>(meNode);          
-    if (!meElement) return false;
-    string me_name = qtxml::_toString(meElement->getAttribute (qtxml::_toDOMS ("name"))); 
-    me_names.push_back(me_name);    
+    DOMNode *meNode = meList->item(k);
+    if (!meNode)
+      return false;
+    DOMElement *meElement = static_cast<DOMElement *>(meNode);
+    if (!meElement)
+      return false;
+    string me_name = qtxml::_toString(meElement->getAttribute(qtxml::_toDOMS("name")));
+    me_names.push_back(me_name);
   }
-  if (me_names.empty()) return false;
-  else return true;
-  //cout<<"...leaving SiPixelConfigParser::getMENamesForFEDErrorSummary!"<<endl;
-  
+  if (me_names.empty())
+    return false;
+  else
+    return true;
+  // cout<<"...leaving
+  // SiPixelConfigParser::getMENamesForFEDErrorSummary!"<<endl;
 }
 ////
 // -- Get List of MEs for the summary plot and the
 //
-bool SiPixelConfigParser::getFrequencyForBarrelSummary(int& u_freq) {
+bool SiPixelConfigParser::getFrequencyForBarrelSummary(int &u_freq) {
   if (!doc()) {
     cout << " SiPixelConfigParser::Configuration File is not set!!! " << endl;
     return false;
   }
 
   unsigned int structureNodes = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureBarrelLevel"))->getLength();
-  if (structureNodes == 0) return false;
+  if (structureNodes == 0)
+    return false;
   /// Get Node
-  DOMNode* structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureBarrelLevel"))->item(0);
- //Get Node name
-  if (! structureNode) return false;
-  DOMElement* structureElement = static_cast<DOMElement *>(structureNode);          
-  if (! structureElement) return false;		 
-		
+  DOMNode *structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureBarrelLevel"))->item(0);
+  // Get Node name
+  if (!structureNode)
+    return false;
+  DOMElement *structureElement = static_cast<DOMElement *>(structureNode);
+  if (!structureElement)
+    return false;
+
   u_freq = atoi(qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("update_frequency"))).c_str());
   return true;
 }
 
-
-bool SiPixelConfigParser::getFrequencyForEndcapSummary(int& u_freq) {
+bool SiPixelConfigParser::getFrequencyForEndcapSummary(int &u_freq) {
   if (!doc()) {
     cout << " SiPixelConfigParser::Configuration File is not set!!! " << endl;
     return false;
   }
 
   unsigned int structureNodes = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureEndcapLevel"))->getLength();
-  if (structureNodes == 0) return false;
+  if (structureNodes == 0)
+    return false;
   /// Get Node
-  DOMNode* structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureEndcapLevel"))->item(0);
- //Get Node name
-  if (! structureNode) return false;
-  DOMElement* structureElement = static_cast<DOMElement *>(structureNode);          
-  if (! structureElement) return false;		 
-		
+  DOMNode *structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureEndcapLevel"))->item(0);
+  // Get Node name
+  if (!structureNode)
+    return false;
+  DOMElement *structureElement = static_cast<DOMElement *>(structureNode);
+  if (!structureElement)
+    return false;
+
   u_freq = atoi(qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("update_frequency"))).c_str());
   return true;
 }
 
-
-bool SiPixelConfigParser::getMENamesForGrandBarrelSummary(string& structure_name,
-						vector<string>& me_names) {
-  //cout<<"Entering SiPixelConfigParser::getMENamesForGrandBarrelSummary..."<<endl;
+bool SiPixelConfigParser::getMENamesForGrandBarrelSummary(string &structure_name, vector<string> &me_names) {
+  // cout<<"Entering
+  // SiPixelConfigParser::getMENamesForGrandBarrelSummary..."<<endl;
   if (!doc()) {
     cout << " SiPixelConfigParser::Configuration File is not set!!! " << endl;
     return false;
   }
 
   me_names.clear();
-  unsigned int structureNodes = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureGrandBarrelLevel"))->getLength();
-  if (structureNodes == 0) return false;
+  unsigned int structureNodes =
+      doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureGrandBarrelLevel"))->getLength();
+  if (structureNodes == 0)
+    return false;
   /// Get Node
-  DOMNode* structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureGrandBarrelLevel"))->item(0);
- //Get QTEST name
-  if (! structureNode) return false;
-  DOMElement* structureElement = static_cast<DOMElement *>(structureNode);          
-  if (! structureElement) return false;		 
-		
-  structure_name = qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("name"))); 
-
-  DOMNodeList * meList = structureElement->getElementsByTagName(qtxml::_toDOMS("MonElement"));
+  DOMNode *structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureGrandBarrelLevel"))->item(0);
+  // Get QTEST name
+  if (!structureNode)
+    return false;
+  DOMElement *structureElement = static_cast<DOMElement *>(structureNode);
+  if (!structureElement)
+    return false;
+
+  structure_name = qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("name")));
+
+  DOMNodeList *meList = structureElement->getElementsByTagName(qtxml::_toDOMS("MonElement"));
   for (unsigned int k = 0; k < meList->getLength(); k++) {
-    DOMNode* meNode = meList->item(k);
-    if (!meNode) return false;
-    DOMElement* meElement = static_cast<DOMElement *>(meNode);          
-    if (!meElement) return false;
-    string me_name = qtxml::_toString(meElement->getAttribute (qtxml::_toDOMS ("name"))); 
-    me_names.push_back(me_name);    
+    DOMNode *meNode = meList->item(k);
+    if (!meNode)
+      return false;
+    DOMElement *meElement = static_cast<DOMElement *>(meNode);
+    if (!meElement)
+      return false;
+    string me_name = qtxml::_toString(meElement->getAttribute(qtxml::_toDOMS("name")));
+    me_names.push_back(me_name);
   }
-  if (me_names.empty()) return false;
-  else return true;
-  //cout<<"...leaving SiPixelConfigParser::getMENamesForGrandBarrelSummary!"<<endl;
-  
+  if (me_names.empty())
+    return false;
+  else
+    return true;
+  // cout<<"...leaving
+  // SiPixelConfigParser::getMENamesForGrandBarrelSummary!"<<endl;
 }
 
-
-bool SiPixelConfigParser::getMENamesForGrandEndcapSummary(string& structure_name,
-						vector<string>& me_names) {
-  //cout<<"Entering SiPixelConfigParser::getMENamesForGrandEndcapSummary..."<<endl;
+bool SiPixelConfigParser::getMENamesForGrandEndcapSummary(string &structure_name, vector<string> &me_names) {
+  // cout<<"Entering
+  // SiPixelConfigParser::getMENamesForGrandEndcapSummary..."<<endl;
   if (!doc()) {
     cout << " SiPixelConfigParser::Configuration File is not set!!! " << endl;
     return false;
   }
 
   me_names.clear();
-  unsigned int structureNodes = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureGrandEndcapLevel"))->getLength();
-  if (structureNodes == 0) return false;
+  unsigned int structureNodes =
+      doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureGrandEndcapLevel"))->getLength();
+  if (structureNodes == 0)
+    return false;
   /// Get Node
-  DOMNode* structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureGrandEndcapLevel"))->item(0);
- //Get QTEST name
-  if (! structureNode) return false;
-  DOMElement* structureElement = static_cast<DOMElement *>(structureNode);          
-  if (! structureElement) return false;		 
-		
-  structure_name = qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("name"))); 
-
-  DOMNodeList * meList = structureElement->getElementsByTagName(qtxml::_toDOMS("MonElement"));
+  DOMNode *structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureGrandEndcapLevel"))->item(0);
+  // Get QTEST name
+  if (!structureNode)
+    return false;
+  DOMElement *structureElement = static_cast<DOMElement *>(structureNode);
+  if (!structureElement)
+    return false;
+
+  structure_name = qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("name")));
+
+  DOMNodeList *meList = structureElement->getElementsByTagName(qtxml::_toDOMS("MonElement"));
   for (unsigned int k = 0; k < meList->getLength(); k++) {
-    DOMNode* meNode = meList->item(k);
-    if (!meNode) return false;
-    DOMElement* meElement = static_cast<DOMElement *>(meNode);          
-    if (!meElement) return false;
-    string me_name = qtxml::_toString(meElement->getAttribute (qtxml::_toDOMS ("name"))); 
-    me_names.push_back(me_name);    
+    DOMNode *meNode = meList->item(k);
+    if (!meNode)
+      return false;
+    DOMElement *meElement = static_cast<DOMElement *>(meNode);
+    if (!meElement)
+      return false;
+    string me_name = qtxml::_toString(meElement->getAttribute(qtxml::_toDOMS("name")));
+    me_names.push_back(me_name);
   }
-  if (me_names.empty()) return false;
-  else return true;
-  //cout<<"...leaving SiPixelConfigParser::getMENamesForGrandEndcapSummary!"<<endl;
-  
+  if (me_names.empty())
+    return false;
+  else
+    return true;
+  // cout<<"...leaving
+  // SiPixelConfigParser::getMENamesForGrandEndcapSummary!"<<endl;
 }
 
-
-bool SiPixelConfigParser::getFrequencyForGrandBarrelSummary(int& u_freq) {
+bool SiPixelConfigParser::getFrequencyForGrandBarrelSummary(int &u_freq) {
   if (!doc()) {
     cout << " SiPixelConfigParser::Configuration File is not set!!! " << endl;
     return false;
   }
 
-  unsigned int structureNodes = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureGrandBarrelLevel"))->getLength();
-  if (structureNodes == 0) return false;
+  unsigned int structureNodes =
+      doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureGrandBarrelLevel"))->getLength();
+  if (structureNodes == 0)
+    return false;
   /// Get Node
-  DOMNode* structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureGrandBarrelLevel"))->item(0);
- //Get Node name
-  if (! structureNode) return false;
-  DOMElement* structureElement = static_cast<DOMElement *>(structureNode);          
-  if (! structureElement) return false;		 
-		
+  DOMNode *structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureGrandBarrelLevel"))->item(0);
+  // Get Node name
+  if (!structureNode)
+    return false;
+  DOMElement *structureElement = static_cast<DOMElement *>(structureNode);
+  if (!structureElement)
+    return false;
+
   u_freq = atoi(qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("update_frequency"))).c_str());
   return true;
 }
 
-
-bool SiPixelConfigParser::getFrequencyForGrandEndcapSummary(int& u_freq) {
+bool SiPixelConfigParser::getFrequencyForGrandEndcapSummary(int &u_freq) {
   if (!doc()) {
     cout << " SiPixelConfigParser::Configuration File is not set!!! " << endl;
     return false;
   }
 
-  unsigned int structureNodes = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureGrandEndcapLevel"))->getLength();
-  if (structureNodes == 0) return false;
+  unsigned int structureNodes =
+      doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureGrandEndcapLevel"))->getLength();
+  if (structureNodes == 0)
+    return false;
   /// Get Node
-  DOMNode* structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureGrandEndcapLevel"))->item(0);
- //Get Node name
-  if (! structureNode) return false;
-  DOMElement* structureElement = static_cast<DOMElement *>(structureNode);          
-  if (! structureElement) return false;		 
-		
+  DOMNode *structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SubStructureGrandEndcapLevel"))->item(0);
+  // Get Node name
+  if (!structureNode)
+    return false;
+  DOMElement *structureElement = static_cast<DOMElement *>(structureNode);
+  if (!structureElement)
+    return false;
+
   u_freq = atoi(qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("update_frequency"))).c_str());
   return true;
 }
 
-
-bool SiPixelConfigParser::getMessageLimitForQTests(int& u_freq) {
+bool SiPixelConfigParser::getMessageLimitForQTests(int &u_freq) {
   if (!doc()) {
     cout << " SiPixelConfigParser::Configuration File is not set!!! " << endl;
     return false;
   }
   unsigned int structureNodes = doc()->getElementsByTagName(qtxml::_toDOMS("QTestMessageLimit"))->getLength();
-  if (structureNodes == 0) return false;
+  if (structureNodes == 0)
+    return false;
   /// Get Node
-  DOMNode* structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("QTestMessageLimit"))->item(0);
- //Get Node name
-  if (! structureNode) return false;
-  DOMElement* structureElement = static_cast<DOMElement *>(structureNode);          
-  if (! structureElement) return false;
-		
+  DOMNode *structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("QTestMessageLimit"))->item(0);
+  // Get Node name
+  if (!structureNode)
+    return false;
+  DOMElement *structureElement = static_cast<DOMElement *>(structureNode);
+  if (!structureElement)
+    return false;
+
   u_freq = atoi(qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("value"))).c_str());
   return true;
 }
 
-
-
-bool SiPixelConfigParser::getSourceType(int& u_freq) {
+bool SiPixelConfigParser::getSourceType(int &u_freq) {
   if (!doc()) {
     cout << " SiPixelConfigParser::Configuration File is not set!!! " << endl;
     return false;
   }
   unsigned int structureNodes = doc()->getElementsByTagName(qtxml::_toDOMS("SourceType"))->getLength();
-  if (structureNodes == 0) return false;
+  if (structureNodes == 0)
+    return false;
   /// Get Node
-  DOMNode* structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SourceType"))->item(0);
- //Get Node name
-  if (! structureNode) return false;
-  DOMElement* structureElement = static_cast<DOMElement *>(structureNode);          
-  if (! structureElement) return false;
-		
+  DOMNode *structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("SourceType"))->item(0);
+  // Get Node name
+  if (!structureNode)
+    return false;
+  DOMElement *structureElement = static_cast<DOMElement *>(structureNode);
+  if (!structureElement)
+    return false;
+
   u_freq = atoi(qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("code"))).c_str());
   return true;
 }
 
-bool SiPixelConfigParser::getCalibType(int& u_freq) {
+bool SiPixelConfigParser::getCalibType(int &u_freq) {
   if (!doc()) {
     cout << " SiPixelConfigParser::Configuration File is not set!!! " << endl;
     return false;
   }
   unsigned int structureNodes = doc()->getElementsByTagName(qtxml::_toDOMS("CalibType"))->getLength();
-  if (structureNodes == 0) return false;
+  if (structureNodes == 0)
+    return false;
   /// Get Node
-  DOMNode* structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("CalibType"))->item(0);
- //Get Node name
-  if (! structureNode) return false;
-  DOMElement* structureElement = static_cast<DOMElement *>(structureNode);          
-  if (! structureElement) return false;
-		
+  DOMNode *structureNode = doc()->getElementsByTagName(qtxml::_toDOMS("CalibType"))->item(0);
+  // Get Node name
+  if (!structureNode)
+    return false;
+  DOMElement *structureElement = static_cast<DOMElement *>(structureNode);
+  if (!structureElement)
+    return false;
+
   u_freq = atoi(qtxml::_toString(structureElement->getAttribute(qtxml::_toDOMS("value"))).c_str());
   return true;
 }
-
-
-
-
diff --git a/DQM/SiPixelMonitorClient/src/SiPixelConfigWriter.cc b/DQM/SiPixelMonitorClient/src/SiPixelConfigWriter.cc
index e8a0dbd8ec95b..4a9adfea94228 100644
--- a/DQM/SiPixelMonitorClient/src/SiPixelConfigWriter.cc
+++ b/DQM/SiPixelMonitorClient/src/SiPixelConfigWriter.cc
@@ -1,6 +1,5 @@
 #include "DQM/SiPixelMonitorClient/interface/SiPixelConfigWriter.h"
 
-
 #include "DQMServices/ClientConfig/interface/ParserFunctions.h"
 #include <memory>
 
@@ -8,51 +7,51 @@ using namespace xercesc;
 using namespace std;
 //
 // -- Constructor
-// 
-SiPixelConfigWriter::SiPixelConfigWriter() {
-}
+//
+SiPixelConfigWriter::SiPixelConfigWriter() {}
 //
 // -- Destructor
 //
-SiPixelConfigWriter::~SiPixelConfigWriter() {
-
-}
+SiPixelConfigWriter::~SiPixelConfigWriter() {}
 //
 // -- Initialize XML
-// 
+//
 bool SiPixelConfigWriter::init() {
   try {
     cms::concurrency::xercesInitialize();
-  }
-  catch (const XMLException& toCatch) {
+  } catch (const XMLException &toCatch) {
     cout << "Problem to initialise XML !!! " << endl;
     return false;
   }
-  unique_ptr<DOMImplementation> domImpl( DOMImplementationRegistry::getDOMImplementation(qtxml::_toDOMS("Range")));
-  if( domImpl == nullptr ) return false;
+  unique_ptr<DOMImplementation> domImpl(DOMImplementationRegistry::getDOMImplementation(qtxml::_toDOMS("Range")));
+  if (domImpl == nullptr)
+    return false;
   theDomWriter = domImpl->createLSSerializer();
-  if( theDomWriter == nullptr ) return false;
-  if( theDomWriter->getDomConfig()->canSetParameter( XMLUni::fgDOMWRTFormatPrettyPrint, true ))
-    theDomWriter->getDomConfig()->setParameter( XMLUni::fgDOMWRTFormatPrettyPrint, true );
-  theDoc = domImpl->createDocument(nullptr,qtxml::_toDOMS("Layouts"), nullptr);
-  if( theDoc == nullptr ) return false;
+  if (theDomWriter == nullptr)
+    return false;
+  if (theDomWriter->getDomConfig()->canSetParameter(XMLUni::fgDOMWRTFormatPrettyPrint, true))
+    theDomWriter->getDomConfig()->setParameter(XMLUni::fgDOMWRTFormatPrettyPrint, true);
+  theDoc = domImpl->createDocument(nullptr, qtxml::_toDOMS("Layouts"), nullptr);
+  if (theDoc == nullptr)
+    return false;
   theTopElement = theDoc->getDocumentElement();
   theTopElement->appendChild(theDoc->createTextNode(qtxml::_toDOMS("\n")));
   theOutput = domImpl->createLSOutput();
-  if( theOutput == nullptr ) return false;
+  if (theOutput == nullptr)
+    return false;
   return true;
 }
 //
 // -- Add an Element
-// 
-void SiPixelConfigWriter::createLayout(string& name) {
+//
+void SiPixelConfigWriter::createLayout(string &name) {
   theLastLayout = theDoc->createElement(qtxml::_toDOMS("layout"));
   theLastLayout->setAttribute(qtxml::_toDOMS("name"), qtxml::_toDOMS(name));
   theTopElement->appendChild(theLastLayout);
 }
 //
 // -- Add an Element
-// 
+//
 void SiPixelConfigWriter::createRow() {
   theLastLayout->appendChild(theDoc->createTextNode(qtxml::_toDOMS("\n")));
 
@@ -63,22 +62,20 @@ void SiPixelConfigWriter::createRow() {
 //
 // -- Add an Element with Children
 //
-void SiPixelConfigWriter::createColumn(string& element, string& name) {
-
-   theLastRow->appendChild(theDoc->createTextNode(qtxml::_toDOMS("\n")));
-   DOMElement* e1 = theDoc->createElement(qtxml::_toDOMS("column"));
-   theLastRow->appendChild(e1);
+void SiPixelConfigWriter::createColumn(string &element, string &name) {
+  theLastRow->appendChild(theDoc->createTextNode(qtxml::_toDOMS("\n")));
+  DOMElement *e1 = theDoc->createElement(qtxml::_toDOMS("column"));
+  theLastRow->appendChild(e1);
 
- 
-   DOMElement* e2 = theDoc->createElement(qtxml::_toDOMS(element));
-   e2->setAttribute(qtxml::_toDOMS("name"),qtxml::_toDOMS(name));
-   e1->appendChild(e2);
- }
+  DOMElement *e2 = theDoc->createElement(qtxml::_toDOMS(element));
+  e2->setAttribute(qtxml::_toDOMS("name"), qtxml::_toDOMS(name));
+  e1->appendChild(e2);
+}
 //
 // -- Write to File
-// 
-void SiPixelConfigWriter::write(string& fname) {
-  XMLFormatTarget* formTarget = new LocalFileFormatTarget(fname.c_str());
+//
+void SiPixelConfigWriter::write(string &fname) {
+  XMLFormatTarget *formTarget = new LocalFileFormatTarget(fname.c_str());
   theOutput->setByteStream(formTarget);
   theDomWriter->write(theTopElement, theOutput);
   delete formTarget;
diff --git a/DQM/SiPixelMonitorClient/src/SiPixelDaqInfo.cc b/DQM/SiPixelMonitorClient/src/SiPixelDaqInfo.cc
index 3810d170e55ab..b19c14e8cf607 100644
--- a/DQM/SiPixelMonitorClient/src/SiPixelDaqInfo.cc
+++ b/DQM/SiPixelMonitorClient/src/SiPixelDaqInfo.cc
@@ -1,95 +1,105 @@
-#include "DQM/SiPixelMonitorClient/interface/SiPixelDaqInfo.h"
-#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
-#include "DataFormats/FEDRawData/interface/FEDRawData.h"
-#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
+#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
 #include "CondFormats/RunInfo/interface/RunInfo.h"
 #include "CondFormats/RunInfo/interface/RunSummary.h"
-#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
+#include "DQM/SiPixelMonitorClient/interface/SiPixelDaqInfo.h"
+#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
+#include "DataFormats/FEDRawData/interface/FEDRawData.h"
+#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 
 using namespace std;
 using namespace edm;
-SiPixelDaqInfo::SiPixelDaqInfo(const edm::ParameterSet& ps) {
- 
-  FEDRange_.first  = ps.getUntrackedParameter<unsigned int>("MinimumPixelFEDId", 0);
+SiPixelDaqInfo::SiPixelDaqInfo(const edm::ParameterSet &ps) {
+  FEDRange_.first = ps.getUntrackedParameter<unsigned int>("MinimumPixelFEDId", 0);
   FEDRange_.second = ps.getUntrackedParameter<unsigned int>("MaximumPixelFEDId", 39);
-  daqSource_       = ps.getUntrackedParameter<string>("daqSource",  "source");
+  daqSource_ = ps.getUntrackedParameter<string>("daqSource", "source");
+
+  NumberOfFeds_ = FEDRange_.second - FEDRange_.first + 1;
 
-  NumberOfFeds_ =FEDRange_.second -  FEDRange_.first +1;
-  
   NEvents_ = 0;
-  for(int i=0; i!=40; i++) FEDs_[i] = 0;
+  for (int i = 0; i != 40; i++)
+    FEDs_[i] = 0;
 
   firstLumi = true;
 
-  //set Token(-s)
+  // set Token(-s)
   daqSourceToken_ = consumes<FEDRawDataCollection>(ps.getUntrackedParameter<string>("daqSource", "source"));
 }
 
-SiPixelDaqInfo::~SiPixelDaqInfo(){}
-
-void SiPixelDaqInfo::dqmEndLuminosityBlock(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter, const edm::LuminosityBlock&  lumiBlock, const  edm::EventSetup& iSetup){
+SiPixelDaqInfo::~SiPixelDaqInfo() {}
 
-  //Book somethings first time around
-  if (firstLumi){
+void SiPixelDaqInfo::dqmEndLuminosityBlock(DQMStore::IBooker &iBooker,
+                                           DQMStore::IGetter &iGetter,
+                                           const edm::LuminosityBlock &lumiBlock,
+                                           const edm::EventSetup &iSetup) {
+  // Book somethings first time around
+  if (firstLumi) {
     iBooker.setCurrentFolder("Pixel/EventInfo");
-    Fraction_= iBooker.bookFloat("DAQSummary");  
+    Fraction_ = iBooker.bookFloat("DAQSummary");
     iBooker.setCurrentFolder("Pixel/EventInfo/DAQContents");
-    FractionBarrel_= iBooker.bookFloat("PixelBarrelFraction");  
-    FractionEndcap_= iBooker.bookFloat("PixelEndcapFraction");  
-    
+    FractionBarrel_ = iBooker.bookFloat("PixelBarrelFraction");
+    FractionEndcap_ = iBooker.bookFloat("PixelEndcapFraction");
+
     firstLumi = false;
   }
 
-  if(auto runInfoRec = iSetup.tryToGet<RunInfoRcd>()) {
-    //get fed summary information
+  if (auto runInfoRec = iSetup.tryToGet<RunInfoRcd>()) {
+    // get fed summary information
     ESHandle<RunInfo> sumFED;
     runInfoRec->get(sumFED);
-    vector<int> FedsInIds= sumFED->m_fed_in;   
+    vector<int> FedsInIds = sumFED->m_fed_in;
 
-    int FedCount=0;
-    int FedCountBarrel=0;
-    int FedCountEndcap=0;
+    int FedCount = 0;
+    int FedCountBarrel = 0;
+    int FedCountEndcap = 0;
 
-    //loop on all active feds
-    for(unsigned int fedItr=0;fedItr<FedsInIds.size(); ++fedItr) {
-      int fedID=FedsInIds[fedItr];
-      //make sure fed id is in allowed range  
-      if(fedID>=FEDRange_.first && fedID<=FEDRange_.second){
+    // loop on all active feds
+    for (unsigned int fedItr = 0; fedItr < FedsInIds.size(); ++fedItr) {
+      int fedID = FedsInIds[fedItr];
+      // make sure fed id is in allowed range
+      if (fedID >= FEDRange_.first && fedID <= FEDRange_.second) {
         ++FedCount;
-	if(fedID>=0 && fedID<=31) ++FedCountBarrel;
-	else if(fedID>=32 && fedID<=39) ++FedCountEndcap;
+        if (fedID >= 0 && fedID <= 31)
+          ++FedCountBarrel;
+        else if (fedID >= 32 && fedID <= 39)
+          ++FedCountEndcap;
       }
-    }   
-    //Fill active fed fraction ME
-    if(FedCountBarrel<=32){
-      MonitorElement * mefed = iGetter.get("Pixel/EventInfo/DAQContents/fedcounter");
-      FedCountBarrel = 0; FedCountEndcap = 0; FedCount = 0; NumberOfFeds_ = 40;
-      if(mefed){
-        for(int i=0; i!=40; i++){
-          if(i<=31 && mefed->getBinContent(i+1)>0) FedCountBarrel++;
-          if(i>=32 && mefed->getBinContent(i+1)>0) FedCountEndcap++;
-          if(mefed->getBinContent(i+1)>0) FedCount++;
+    }
+    // Fill active fed fraction ME
+    if (FedCountBarrel <= 32) {
+      MonitorElement *mefed = iGetter.get("Pixel/EventInfo/DAQContents/fedcounter");
+      FedCountBarrel = 0;
+      FedCountEndcap = 0;
+      FedCount = 0;
+      NumberOfFeds_ = 40;
+      if (mefed) {
+        for (int i = 0; i != 40; i++) {
+          if (i <= 31 && mefed->getBinContent(i + 1) > 0)
+            FedCountBarrel++;
+          if (i >= 32 && mefed->getBinContent(i + 1) > 0)
+            FedCountEndcap++;
+          if (mefed->getBinContent(i + 1) > 0)
+            FedCount++;
         }
       }
     }
-    if(NumberOfFeds_>0){
-      //all Pixel:
-      Fraction_->Fill( FedCount/NumberOfFeds_);
-      //Barrel:
-      FractionBarrel_->Fill( FedCountBarrel/32.);
-      //Endcap:
-      FractionEndcap_->Fill( FedCountEndcap/8.);
-    }else{
+    if (NumberOfFeds_ > 0) {
+      // all Pixel:
+      Fraction_->Fill(FedCount / NumberOfFeds_);
+      // Barrel:
+      FractionBarrel_->Fill(FedCountBarrel / 32.);
+      // Endcap:
+      FractionEndcap_->Fill(FedCountEndcap / 8.);
+    } else {
       Fraction_->Fill(-1);
       FractionBarrel_->Fill(-1);
       FractionEndcap_->Fill(-1);
-    } 
-  }else{      
-    Fraction_->Fill(-1);	       
+    }
+  } else {
+    Fraction_->Fill(-1);
     FractionBarrel_->Fill(-1);
     FractionEndcap_->Fill(-1);
-    return; 
+    return;
   }
 }
 
-void SiPixelDaqInfo::dqmEndJob(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter){}
+void SiPixelDaqInfo::dqmEndJob(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter) {}
diff --git a/DQM/SiPixelMonitorClient/src/SiPixelDataQuality.cc b/DQM/SiPixelMonitorClient/src/SiPixelDataQuality.cc
index 34851db80d3b8..494a896704800 100644
--- a/DQM/SiPixelMonitorClient/src/SiPixelDataQuality.cc
+++ b/DQM/SiPixelMonitorClient/src/SiPixelDataQuality.cc
@@ -1,20 +1,20 @@
 /*! \file SiPixelDataQuality.cc
  *  \brief This class represents ...
- *  
+ *
  *  (Documentation under development)
- *  
+ *
  */
+#include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h"
+#include "DQM/SiPixelMonitorClient/interface/ANSIColors.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelDataQuality.h"
-#include "DQM/SiPixelMonitorClient/interface/SiPixelUtility.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelEDAClient.h"
-#include "DQM/SiPixelMonitorClient/interface/ANSIColors.h"
-#include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h"
+#include "DQM/SiPixelMonitorClient/interface/SiPixelUtility.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-#include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/FileInPath.h"
 
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/GeometrySurface/interface/Surface.h"
@@ -25,831 +25,1025 @@
 #include "CondFormats/SiPixelObjects/interface/DetectorIndex.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h"
 
-#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
-#include "Geometry/CommonTopologies/interface/PixelTopology.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
 
+#include "Rtypes.h"
+#include "TAxis.h"
 #include "TClass.h"
-#include "TText.h"
-#include "TROOT.h"
-#include "TPad.h"
-#include "TStyle.h"
-#include "TSystem.h"
-#include "TString.h"
+#include "TH1F.h"
+#include "TH2F.h"
 #include "TImage.h"
-#include "TPaveText.h"
 #include "TImageDump.h"
-#include "TRandom.h"
-#include "TStopwatch.h"
-#include "TAxis.h"
+#include "TPad.h"
 #include "TPaveLabel.h"
-#include "Rtypes.h"
-#include "TH1F.h"
-#include "TH2F.h"
+#include "TPaveText.h"
 #include "TProfile.h"
+#include "TROOT.h"
+#include "TRandom.h"
+#include "TStopwatch.h"
+#include "TString.h"
+#include "TStyle.h"
+#include "TSystem.h"
+#include "TText.h"
 
-#include <iostream>
 #include <cmath>
+#include <iostream>
 #include <map>
 
+#include <cstdlib>  // for free() - Root can allocate with malloc() - sigh...
 #include <fstream>
-#include <cstdlib> // for free() - Root can allocate with malloc() - sigh...
- 
+
 using namespace std;
 using namespace edm;
 
 //------------------------------------------------------------------------------
 /*! \brief Constructor of the SiPixelInformationExtractor class.
- *  
+ *
  */
 SiPixelDataQuality::SiPixelDataQuality(bool offlineXMLfile) : offlineXMLfile_(offlineXMLfile) {
-  edm::LogInfo("SiPixelDataQuality") << 
-    " Creating SiPixelDataQuality " << "\n" ;
-  
-  allMods_=0;
-  errorMods_=0;
-  qflag_=1.;
-
-  allmodsMap=nullptr;
-  errmodsMap=nullptr;
-  goodmodsMap=nullptr;
-  allmodsVec=nullptr;
-  errmodsVec=nullptr;
-  goodmodsVec=nullptr;
-  for (int i = 0; i < 40; ++i)
-    {lastallmods_[i] = 0; lasterrmods_[i] = 0;}
-  timeoutCounter_=0;
-  lastLS_=-1;
+  edm::LogInfo("SiPixelDataQuality") << " Creating SiPixelDataQuality "
+                                     << "\n";
+
+  allMods_ = 0;
+  errorMods_ = 0;
+  qflag_ = 1.;
+
+  allmodsMap = nullptr;
+  errmodsMap = nullptr;
+  goodmodsMap = nullptr;
+  allmodsVec = nullptr;
+  errmodsVec = nullptr;
+  goodmodsVec = nullptr;
+  for (int i = 0; i < 40; ++i) {
+    lastallmods_[i] = 0;
+    lasterrmods_[i] = 0;
+  }
+  timeoutCounter_ = 0;
+  lastLS_ = -1;
 }
 
 //------------------------------------------------------------------------------
 /*! \brief Destructor of the SiPixelDataQuality class.
- *  
+ *
  */
 SiPixelDataQuality::~SiPixelDataQuality() {
-  edm::LogInfo("SiPixelDataQuality") << 
-    " Deleting SiPixelDataQuality " << "\n" ;
-  if(allmodsMap) delete allmodsMap;
-  if(errmodsMap) delete errmodsMap;
-  if(goodmodsMap) delete goodmodsMap;
-  if(allmodsVec) delete allmodsVec;
-  if(errmodsVec) delete errmodsVec;
-  if(goodmodsVec) delete goodmodsVec;
+  edm::LogInfo("SiPixelDataQuality") << " Deleting SiPixelDataQuality "
+                                     << "\n";
+  if (allmodsMap)
+    delete allmodsMap;
+  if (errmodsMap)
+    delete errmodsMap;
+  if (goodmodsMap)
+    delete goodmodsMap;
+  if (allmodsVec)
+    delete allmodsVec;
+  if (errmodsVec)
+    delete errmodsVec;
+  if (goodmodsVec)
+    delete goodmodsVec;
 }
 
-
 //------------------------------------------------------------------------------
 /*! \brief (Documentation under construction).
- *  
- *  Given a pointer to ME returns the associated detId 
+ *
+ *  Given a pointer to ME returns the associated detId
  */
-int SiPixelDataQuality::getDetId(MonitorElement * mE) 
-{
- const string& mEName = mE->getName() ;
-
- int detId = 0;
- 
- if( mEName.find("_3") != string::npos )
- {
-  string detIdString = mEName.substr((mEName.find_last_of("_"))+1,9);
-  std::istringstream isst;
-  isst.str(detIdString);
-  isst>>detId;
- }
-      
-  return detId ;
-  
+int SiPixelDataQuality::getDetId(MonitorElement *mE) {
+  const string &mEName = mE->getName();
+
+  int detId = 0;
+
+  if (mEName.find("_3") != string::npos) {
+    string detIdString = mEName.substr((mEName.find_last_of("_")) + 1, 9);
+    std::istringstream isst;
+    isst.str(detIdString);
+    isst >> detId;
+  }
+
+  return detId;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SiPixelDataQuality::bookGlobalQualityFlag(DQMStore::IBooker & iBooker, bool Tier0Flag, int nFEDs) {
-//std::cout<<"BOOK GLOBAL QUALITY FLAG MEs!"<<std::endl;
+void SiPixelDataQuality::bookGlobalQualityFlag(DQMStore::IBooker &iBooker, bool Tier0Flag, int nFEDs) {
+  // std::cout<<"BOOK GLOBAL QUALITY FLAG MEs!"<<std::endl;
   iBooker.cd();
 
   iBooker.setCurrentFolder("Pixel/Barrel");
-  if(!Tier0Flag){
-    ClusterModAll = iBooker.book1D("NClustertoChargeRatio_AllMod","Cluster Noise All Modules", 768, 0., 768.);
-    ClusterMod1   = iBooker.book1D("NClustertoChargeRatio_NormMod1",  "Normalized N_{Clusters} to Charge Ratio per Module1", 192, 0., 192.);
-    ClusterMod2   = iBooker.book1D("NClustertoChargeRatio_NormMod2",  "Normalized N_{Clusters} to Charge Ratio per Module2", 192, 0., 192.);
-    ClusterMod3   = iBooker.book1D("NClustertoChargeRatio_NormMod3",  "Normalized N_{Clusters} to Charge Ratio per Module3", 192, 0., 192.);
-    ClusterMod4   = iBooker.book1D("NClustertoChargeRatio_NormMod4",  "Normalized N_{Clusters} to Charge Ratio per Module4", 192, 0., 192.);
-  } 
+  if (!Tier0Flag) {
+    ClusterModAll = iBooker.book1D("NClustertoChargeRatio_AllMod", "Cluster Noise All Modules", 768, 0., 768.);
+    ClusterMod1 = iBooker.book1D(
+        "NClustertoChargeRatio_NormMod1", "Normalized N_{Clusters} to Charge Ratio per Module1", 192, 0., 192.);
+    ClusterMod2 = iBooker.book1D(
+        "NClustertoChargeRatio_NormMod2", "Normalized N_{Clusters} to Charge Ratio per Module2", 192, 0., 192.);
+    ClusterMod3 = iBooker.book1D(
+        "NClustertoChargeRatio_NormMod3", "Normalized N_{Clusters} to Charge Ratio per Module3", 192, 0., 192.);
+    ClusterMod4 = iBooker.book1D(
+        "NClustertoChargeRatio_NormMod4", "Normalized N_{Clusters} to Charge Ratio per Module4", 192, 0., 192.);
+  }
   iBooker.setCurrentFolder("Pixel/EventInfo");
-  if(!Tier0Flag){
-    SummaryReportMap = iBooker.book2D("reportSummaryMap","Pixel Summary Map",3000,0.,3000.,40,0.,40.);
-    SummaryReportMap->setAxisTitle("Lumi Section",1);
-    SummaryReportMap->setAxisTitle("Pixel FED #",2);
-    allmodsVec = new TH1D("allmodsVec","allmodsVec",40,0.,40.);
-    errmodsVec = new TH1D("errmodsVec","errmodsVec",40,0.,40.);
-    goodmodsVec = new TH1D("goodmodsVec","goodmodsVec",40,0.,40.);
-  }else{
-    SummaryReportMap = iBooker.book2D("reportSummaryMap","Pixel Summary Map",2,0.,2.,7,0.,7.);
-    SummaryReportMap->setBinLabel(1,"Barrel",1);
-    SummaryReportMap->setBinLabel(2,"Endcaps",1);
-    SummaryReportMap->setBinLabel(1,"Errors",2);
-    SummaryReportMap->setBinLabel(2,"NDigis",2);
-    SummaryReportMap->setBinLabel(3,"DigiCharge",2);
-    SummaryReportMap->setBinLabel(4,"ClusterSize",2);
-    SummaryReportMap->setBinLabel(5,"NClusters",2);
-    SummaryReportMap->setBinLabel(6,"ClusterCharge",2);
-    SummaryReportMap->setBinLabel(7,"HitEff",2);
-    allmodsMap = new TH2F("allmodsMap","allmodsMap",2,0.,2.,7,0.,7.);
-    errmodsMap = new TH2F("errmodsMap","errmodsMap",2,0.,2.,7,0.,7.);
-    goodmodsMap = new TH2F("goodmodsMap","goodmodsMap",2,0.,2.,7,0.,7.);
-  }  
-    SummaryPixel = iBooker.bookFloat("reportSummary");
+  if (!Tier0Flag) {
+    SummaryReportMap = iBooker.book2D("reportSummaryMap", "Pixel Summary Map", 3000, 0., 3000., 40, 0., 40.);
+    SummaryReportMap->setAxisTitle("Lumi Section", 1);
+    SummaryReportMap->setAxisTitle("Pixel FED #", 2);
+    allmodsVec = new TH1D("allmodsVec", "allmodsVec", 40, 0., 40.);
+    errmodsVec = new TH1D("errmodsVec", "errmodsVec", 40, 0., 40.);
+    goodmodsVec = new TH1D("goodmodsVec", "goodmodsVec", 40, 0., 40.);
+  } else {
+    SummaryReportMap = iBooker.book2D("reportSummaryMap", "Pixel Summary Map", 2, 0., 2., 7, 0., 7.);
+    SummaryReportMap->setBinLabel(1, "Barrel", 1);
+    SummaryReportMap->setBinLabel(2, "Endcaps", 1);
+    SummaryReportMap->setBinLabel(1, "Errors", 2);
+    SummaryReportMap->setBinLabel(2, "NDigis", 2);
+    SummaryReportMap->setBinLabel(3, "DigiCharge", 2);
+    SummaryReportMap->setBinLabel(4, "ClusterSize", 2);
+    SummaryReportMap->setBinLabel(5, "NClusters", 2);
+    SummaryReportMap->setBinLabel(6, "ClusterCharge", 2);
+    SummaryReportMap->setBinLabel(7, "HitEff", 2);
+    allmodsMap = new TH2F("allmodsMap", "allmodsMap", 2, 0., 2., 7, 0., 7.);
+    errmodsMap = new TH2F("errmodsMap", "errmodsMap", 2, 0., 2., 7, 0., 7.);
+    goodmodsMap = new TH2F("goodmodsMap", "goodmodsMap", 2, 0., 2., 7, 0., 7.);
+  }
+  SummaryPixel = iBooker.bookFloat("reportSummary");
   iBooker.setCurrentFolder("Pixel/EventInfo/reportSummaryContents");
-    SummaryBarrel = iBooker.bookFloat("PixelBarrelFraction");
-    SummaryEndcap = iBooker.bookFloat("PixelEndcapFraction");
+  SummaryBarrel = iBooker.bookFloat("PixelBarrelFraction");
+  SummaryEndcap = iBooker.bookFloat("PixelEndcapFraction");
   // book the data certification cuts:
   iBooker.setCurrentFolder("Pixel/AdditionalPixelErrors");
-    NErrorsFEDs = iBooker.bookFloat("FEDsNErrorsCut");
+  NErrorsFEDs = iBooker.bookFloat("FEDsNErrorsCut");
   iBooker.setCurrentFolder("Pixel/Barrel");
-    NErrorsBarrel = iBooker.bookFloat("BarrelNErrorsCut");
-    NDigisBarrel = iBooker.bookInt("BarrelNDigisCut");
-    DigiChargeBarrel = iBooker.bookInt("BarrelDigiChargeCut");
-    ClusterSizeBarrel = iBooker.bookInt("BarrelClusterSizeCut");
-    NClustersBarrel = iBooker.bookInt("BarrelNClustersCut");
-    ClusterChargeBarrel = iBooker.bookInt("BarrelClusterChargeCut");
+  NErrorsBarrel = iBooker.bookFloat("BarrelNErrorsCut");
+  NDigisBarrel = iBooker.bookInt("BarrelNDigisCut");
+  DigiChargeBarrel = iBooker.bookInt("BarrelDigiChargeCut");
+  ClusterSizeBarrel = iBooker.bookInt("BarrelClusterSizeCut");
+  NClustersBarrel = iBooker.bookInt("BarrelNClustersCut");
+  ClusterChargeBarrel = iBooker.bookInt("BarrelClusterChargeCut");
   iBooker.setCurrentFolder("Pixel/Endcap");
-    NErrorsEndcap = iBooker.bookFloat("EndcapNErrorsCut");
-    NDigisEndcap = iBooker.bookInt("EndcapNDigisCut");
-    DigiChargeEndcap = iBooker.bookInt("EndcapDigiChargeCut");
-    ClusterSizeEndcap = iBooker.bookInt("EndcapClusterSizeCut");
-    NClustersEndcap = iBooker.bookInt("EndcapNClustersCut");
-    ClusterChargeEndcap = iBooker.bookInt("EndcapClusterChargeCut");
-  if(Tier0Flag){
+  NErrorsEndcap = iBooker.bookFloat("EndcapNErrorsCut");
+  NDigisEndcap = iBooker.bookInt("EndcapNDigisCut");
+  DigiChargeEndcap = iBooker.bookInt("EndcapDigiChargeCut");
+  ClusterSizeEndcap = iBooker.bookInt("EndcapClusterSizeCut");
+  NClustersEndcap = iBooker.bookInt("EndcapNClustersCut");
+  ClusterChargeEndcap = iBooker.bookInt("EndcapClusterChargeCut");
+  if (Tier0Flag) {
     iBooker.setCurrentFolder("Pixel/Tracks");
-      NPixelTracks = iBooker.bookInt("PixelTracksCut");
+    NPixelTracks = iBooker.bookInt("PixelTracksCut");
   }
-    
-    // Init MonitoringElements:
-    if(nFEDs>0){
-      if(SummaryPixel) SummaryPixel->Fill(1.);
-      if(SummaryBarrel) SummaryBarrel->Fill(1.);
-      if(SummaryEndcap)	SummaryEndcap->Fill(1.);
-    }else{
-      if(SummaryPixel) SummaryPixel->Fill(-1.);
-      if(SummaryBarrel) SummaryBarrel->Fill(-1.);
-      if(SummaryEndcap)	SummaryEndcap->Fill(-1.);
-    }
-    if(NErrorsBarrel) NErrorsBarrel->Fill(1.);
-    if(NErrorsEndcap) NErrorsEndcap->Fill(1.);
-    if(NErrorsFEDs) NErrorsFEDs->Fill(1.);
-    if(NDigisBarrel) NDigisBarrel->Fill(1);
-    if(NDigisEndcap) NDigisEndcap->Fill(1);
-    if(DigiChargeBarrel) DigiChargeBarrel->Fill(1);
-    if(DigiChargeEndcap) DigiChargeEndcap->Fill(1);
-    if(ClusterSizeBarrel) ClusterSizeBarrel->Fill(1);
-    if(ClusterSizeEndcap) ClusterSizeEndcap->Fill(1);
-    if(ClusterChargeBarrel) ClusterChargeBarrel->Fill(1);
-    if(ClusterChargeEndcap) ClusterChargeEndcap->Fill(1);
-    if(NClustersBarrel) NClustersBarrel->Fill(1);
-    if(NClustersEndcap) NClustersEndcap->Fill(1);
-    if(Tier0Flag){
-      if(NPixelTracks) NPixelTracks->Fill(1);
-    }
-   
-    if(SummaryReportMap){
-      if(!Tier0Flag) for(int i=1; i!=3001; i++) for(int j=1; j!=41; j++) SummaryReportMap->setBinContent(i,j,-1.);
-      if(Tier0Flag) for(int i=1; i!=3; i++) for(int j=1; j!=8; j++) SummaryReportMap->setBinContent(i,j,-1.);
-    }
-    if(!Tier0Flag){
-      for(int j=1; j!=41; j++){
-        if(allmodsVec) allmodsVec->SetBinContent(j,0.);
-        if(errmodsVec) errmodsVec->SetBinContent(j,0.);
-        if(goodmodsVec) goodmodsVec->SetBinContent(j,0.);
-      }
+
+  // Init MonitoringElements:
+  if (nFEDs > 0) {
+    if (SummaryPixel)
+      SummaryPixel->Fill(1.);
+    if (SummaryBarrel)
+      SummaryBarrel->Fill(1.);
+    if (SummaryEndcap)
+      SummaryEndcap->Fill(1.);
+  } else {
+    if (SummaryPixel)
+      SummaryPixel->Fill(-1.);
+    if (SummaryBarrel)
+      SummaryBarrel->Fill(-1.);
+    if (SummaryEndcap)
+      SummaryEndcap->Fill(-1.);
+  }
+  if (NErrorsBarrel)
+    NErrorsBarrel->Fill(1.);
+  if (NErrorsEndcap)
+    NErrorsEndcap->Fill(1.);
+  if (NErrorsFEDs)
+    NErrorsFEDs->Fill(1.);
+  if (NDigisBarrel)
+    NDigisBarrel->Fill(1);
+  if (NDigisEndcap)
+    NDigisEndcap->Fill(1);
+  if (DigiChargeBarrel)
+    DigiChargeBarrel->Fill(1);
+  if (DigiChargeEndcap)
+    DigiChargeEndcap->Fill(1);
+  if (ClusterSizeBarrel)
+    ClusterSizeBarrel->Fill(1);
+  if (ClusterSizeEndcap)
+    ClusterSizeEndcap->Fill(1);
+  if (ClusterChargeBarrel)
+    ClusterChargeBarrel->Fill(1);
+  if (ClusterChargeEndcap)
+    ClusterChargeEndcap->Fill(1);
+  if (NClustersBarrel)
+    NClustersBarrel->Fill(1);
+  if (NClustersEndcap)
+    NClustersEndcap->Fill(1);
+  if (Tier0Flag) {
+    if (NPixelTracks)
+      NPixelTracks->Fill(1);
+  }
+
+  if (SummaryReportMap) {
+    if (!Tier0Flag)
+      for (int i = 1; i != 3001; i++)
+        for (int j = 1; j != 41; j++)
+          SummaryReportMap->setBinContent(i, j, -1.);
+    if (Tier0Flag)
+      for (int i = 1; i != 3; i++)
+        for (int j = 1; j != 8; j++)
+          SummaryReportMap->setBinContent(i, j, -1.);
+  }
+  if (!Tier0Flag) {
+    for (int j = 1; j != 41; j++) {
+      if (allmodsVec)
+        allmodsVec->SetBinContent(j, 0.);
+      if (errmodsVec)
+        errmodsVec->SetBinContent(j, 0.);
+      if (goodmodsVec)
+        goodmodsVec->SetBinContent(j, 0.);
     }
-    if(Tier0Flag){
-      for(int i=1; i!=3; i++) for(int j=1; j!=8; j++){
-        if(allmodsMap) allmodsMap->SetBinContent(i,j,0.);
-        if(errmodsMap) errmodsMap->SetBinContent(i,j,0.);
-        if(goodmodsMap) goodmodsMap->SetBinContent(i,j,0.);
+  }
+  if (Tier0Flag) {
+    for (int i = 1; i != 3; i++)
+      for (int j = 1; j != 8; j++) {
+        if (allmodsMap)
+          allmodsMap->SetBinContent(i, j, 0.);
+        if (errmodsMap)
+          errmodsMap->SetBinContent(i, j, 0.);
+        if (goodmodsMap)
+          goodmodsMap->SetBinContent(i, j, 0.);
       }
-    }
-    
-  iBooker.cd();  
+  }
+
+  iBooker.cd();
 }
 
 //**********************************************************************************************
 
-void SiPixelDataQuality::computeGlobalQualityFlag(DQMStore::IBooker & iBooker,
-						  DQMStore::IGetter & iGetter,
-						  bool init,
-						  int nFEDs,
-						  bool Tier0Flag){
-  if(init){
-    allMods_=0; errorMods_=0; qflag_=0.; 
-    barrelMods_=0; endcapMods_=0;
-    objectCount_=0;
+void SiPixelDataQuality::computeGlobalQualityFlag(
+    DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter, bool init, int nFEDs, bool Tier0Flag) {
+  if (init) {
+    allMods_ = 0;
+    errorMods_ = 0;
+    qflag_ = 0.;
+    barrelMods_ = 0;
+    endcapMods_ = 0;
+    objectCount_ = 0;
     DONE_ = false;
-    
-    //Error counters and flags:
-    n_errors_barrel_=0; barrel_error_flag_=0.;
-    n_errors_endcap_=0; endcap_error_flag_=0.;
-    n_errors_pixel_=0; pixel_error_flag_=0.;
+
+    // Error counters and flags:
+    n_errors_barrel_ = 0;
+    barrel_error_flag_ = 0.;
+    n_errors_endcap_ = 0;
+    endcap_error_flag_ = 0.;
+    n_errors_pixel_ = 0;
+    pixel_error_flag_ = 0.;
     digiStatsBarrel = false, clusterStatsBarrel = false, trackStatsBarrel = false;
     digiCounterBarrel = 0, clusterCounterBarrel = 0, trackCounterBarrel = 0;
     digiStatsEndcap = false, clusterStatsEndcap = false, trackStatsEndcap = false;
     digiCounterEndcap = 0, clusterCounterEndcap = 0, trackCounterEndcap = 0;
-    init=false;
+    init = false;
   }
-  if(nFEDs==0) return;  
-  
+  if (nFEDs == 0)
+    return;
+
   string currDir = iBooker.pwd();
-  string dname = currDir.substr(currDir.find_last_of("/")+1);
-  
-  if((!Tier0Flag && dname.find("Module_")!=string::npos) || 
-     (Tier0Flag && (dname.find("Ladder_")!=string::npos || dname.find("Blade_")!=string::npos))){
+  string dname = currDir.substr(currDir.find_last_of("/") + 1);
 
+  if ((!Tier0Flag && dname.find("Module_") != string::npos) ||
+      (Tier0Flag && (dname.find("Ladder_") != string::npos || dname.find("Blade_") != string::npos))) {
     objectCount_++;
 
-    if(currDir.find("Pixel")!=string::npos) allMods_++;
-    if(currDir.find("Barrel")!=string::npos) barrelMods_++;
-    if(currDir.find("Endcap")!=string::npos) endcapMods_++;
+    if (currDir.find("Pixel") != string::npos)
+      allMods_++;
+    if (currDir.find("Barrel") != string::npos)
+      barrelMods_++;
+    if (currDir.find("Endcap") != string::npos)
+      endcapMods_++;
     vector<string> meVec = iGetter.getMEs();
     for (vector<string>::const_iterator it = meVec.begin(); it != meVec.end(); it++) {
       string full_path = currDir + "/" + (*it);
-      if(full_path.find("ndigis_")!=string::npos){
-        MonitorElement * me = iGetter.get(full_path);
-        if(!me) continue;
-        if(me->getEntries()>25){
-	  if(full_path.find("Barrel")!=string::npos) digiCounterBarrel++;
-	  if(full_path.find("Endcap")!=string::npos) digiCounterEndcap++;
+      if (full_path.find("ndigis_") != string::npos) {
+        MonitorElement *me = iGetter.get(full_path);
+        if (!me)
+          continue;
+        if (me->getEntries() > 25) {
+          if (full_path.find("Barrel") != string::npos)
+            digiCounterBarrel++;
+          if (full_path.find("Endcap") != string::npos)
+            digiCounterEndcap++;
         }
-      }else if(Tier0Flag && full_path.find("nclusters_OnTrack_")!=string::npos){
-        MonitorElement * me = iGetter.get(full_path);
-        if(!me) continue;
-        if(me->getEntries()>25){
-	  if(full_path.find("Barrel")!=string::npos) clusterCounterBarrel++;
-	  if(full_path.find("Endcap")!=string::npos) clusterCounterEndcap++;
+      } else if (Tier0Flag && full_path.find("nclusters_OnTrack_") != string::npos) {
+        MonitorElement *me = iGetter.get(full_path);
+        if (!me)
+          continue;
+        if (me->getEntries() > 25) {
+          if (full_path.find("Barrel") != string::npos)
+            clusterCounterBarrel++;
+          if (full_path.find("Endcap") != string::npos)
+            clusterCounterEndcap++;
         }
-      }else if(!Tier0Flag && full_path.find("nclusters_")!=string::npos){
-        MonitorElement * me = iGetter.get(full_path);
-        if(!me) continue;
-        if(me->getEntries()>25){
-	  if(full_path.find("Barrel")!=string::npos) clusterCounterBarrel++;
-	  if(full_path.find("Endcap")!=string::npos) clusterCounterEndcap++;
+      } else if (!Tier0Flag && full_path.find("nclusters_") != string::npos) {
+        MonitorElement *me = iGetter.get(full_path);
+        if (!me)
+          continue;
+        if (me->getEntries() > 25) {
+          if (full_path.find("Barrel") != string::npos)
+            clusterCounterBarrel++;
+          if (full_path.find("Endcap") != string::npos)
+            clusterCounterEndcap++;
         }
       }
     }
   }
-  vector<string> subDirVec = iGetter.getSubdirs();  
-  for (vector<string>::const_iterator ic = subDirVec.begin();
-       ic != subDirVec.end(); ic++) {
+  vector<string> subDirVec = iGetter.getSubdirs();
+  for (vector<string>::const_iterator ic = subDirVec.begin(); ic != subDirVec.end(); ic++) {
     iGetter.cd(*ic);
     iBooker.cd(*ic);
-    init=false;
-    computeGlobalQualityFlag(iBooker,iGetter,init,nFEDs,Tier0Flag);
+    init = false;
+    computeGlobalQualityFlag(iBooker, iGetter, init, nFEDs, Tier0Flag);
     iBooker.goUp();
     iGetter.setCurrentFolder(iBooker.pwd());
   }
-  
+
   // Make sure I have finished looping over all Modules/Ladders/Blades:
-  if(!Tier0Flag){ // online case
-    if(objectCount_ == 1440) DONE_ = true;
-  }else{ // offline case
-    if(objectCount_ == 288) DONE_ = true;
-  } 
-  
-  if(DONE_ && currDir=="Pixel/EventInfo/reportSummaryContents"){ 
-
-  // Evaluate error flag now, only stored in AdditionalPixelErrors:
-  MonitorElement * me_err = iGetter.get("Pixel/AdditionalPixelErrors/FedETypeNErr");
-  MonitorElement * me_evt = iGetter.get("Pixel/EventInfo/processedEvents");
-  if(me_err && me_evt){
-    for(int i=1; i!=41; i++)for(int j=1; j!=22; j++)
-      if(me_err->getBinContent(i,j)>0){
-        n_errors_pixel_=n_errors_pixel_+int(me_err->getBinContent(i,j));
-        if(i<33) n_errors_barrel_=n_errors_barrel_+int(me_err->getBinContent(i,j));
-        if(i>32) n_errors_endcap_=n_errors_endcap_+int(me_err->getBinContent(i,j));
+  if (!Tier0Flag) {  // online case
+    if (objectCount_ == 1440)
+      DONE_ = true;
+  } else {  // offline case
+    if (objectCount_ == 288)
+      DONE_ = true;
+  }
+
+  if (DONE_ && currDir == "Pixel/EventInfo/reportSummaryContents") {
+    // Evaluate error flag now, only stored in AdditionalPixelErrors:
+    MonitorElement *me_err = iGetter.get("Pixel/AdditionalPixelErrors/FedETypeNErr");
+    MonitorElement *me_evt = iGetter.get("Pixel/EventInfo/processedEvents");
+    if (me_err && me_evt) {
+      for (int i = 1; i != 41; i++)
+        for (int j = 1; j != 22; j++)
+          if (me_err->getBinContent(i, j) > 0) {
+            n_errors_pixel_ = n_errors_pixel_ + int(me_err->getBinContent(i, j));
+            if (i < 33)
+              n_errors_barrel_ = n_errors_barrel_ + int(me_err->getBinContent(i, j));
+            if (i > 32)
+              n_errors_endcap_ = n_errors_endcap_ + int(me_err->getBinContent(i, j));
+          }
+      int NProcEvts = me_evt->getIntValue();
+      if (NProcEvts > 0) {
+        barrel_error_flag_ = (float(NProcEvts) - float(n_errors_barrel_)) / float(NProcEvts);
+        endcap_error_flag_ = (float(NProcEvts) - float(n_errors_endcap_)) / float(NProcEvts);
+        pixel_error_flag_ = (float(NProcEvts) - float(n_errors_barrel_) - float(n_errors_endcap_)) / float(NProcEvts);
       }
-    int NProcEvts = me_evt->getIntValue();
-    if(NProcEvts>0){
-      barrel_error_flag_ = (float(NProcEvts)-float(n_errors_barrel_))/float(NProcEvts);
-      endcap_error_flag_ = (float(NProcEvts)-float(n_errors_endcap_))/float(NProcEvts);
-      pixel_error_flag_ = (float(NProcEvts)-float(n_errors_barrel_)-float(n_errors_endcap_))/float(NProcEvts);
     }
-  }
-  NErrorsBarrel = iGetter.get("Pixel/Barrel/BarrelNErrorsCut");
-  if(NErrorsBarrel) NErrorsBarrel->Fill(barrel_error_flag_);
-  NErrorsEndcap = iGetter.get("Pixel/Endcap/EndcapNErrorsCut");
-  if(NErrorsEndcap)   NErrorsEndcap->Fill(endcap_error_flag_);
-  
-  string meName0;
-  MonitorElement * me;
-  
-  // Fill the Digi flags:
-  if(!Tier0Flag){
-    meName0 = "Pixel/Barrel/SUMDIG_ndigis_Barrel";
-    if(digiCounterBarrel/768 > 0.5) digiStatsBarrel = true;
-    if(digiCounterEndcap/672 > 0.5) digiStatsEndcap = true;
-  }else{
-    meName0 = "Pixel/Barrel/SUMOFF_ndigis_Barrel"; 
-    if(digiCounterBarrel/192 > 0.5) digiStatsBarrel = true;
-    if(digiCounterEndcap/96 > 0.5) digiStatsEndcap = true;
-  }
-  me = iGetter.get(meName0);
-  if(me){
-    NDigisBarrel = iGetter.get("Pixel/Barrel/BarrelNDigisCut");
-    if(NDigisBarrel && digiStatsBarrel){
-      if(me->hasError()) NDigisBarrel->Fill(0);
-      else NDigisBarrel->Fill(1); 
+    NErrorsBarrel = iGetter.get("Pixel/Barrel/BarrelNErrorsCut");
+    if (NErrorsBarrel)
+      NErrorsBarrel->Fill(barrel_error_flag_);
+    NErrorsEndcap = iGetter.get("Pixel/Endcap/EndcapNErrorsCut");
+    if (NErrorsEndcap)
+      NErrorsEndcap->Fill(endcap_error_flag_);
+
+    string meName0;
+    MonitorElement *me;
+
+    // Fill the Digi flags:
+    if (!Tier0Flag) {
+      meName0 = "Pixel/Barrel/SUMDIG_ndigis_Barrel";
+      if (digiCounterBarrel / 768 > 0.5)
+        digiStatsBarrel = true;
+      if (digiCounterEndcap / 672 > 0.5)
+        digiStatsEndcap = true;
+    } else {
+      meName0 = "Pixel/Barrel/SUMOFF_ndigis_Barrel";
+      if (digiCounterBarrel / 192 > 0.5)
+        digiStatsBarrel = true;
+      if (digiCounterEndcap / 96 > 0.5)
+        digiStatsEndcap = true;
     }
-  }
-  if(!Tier0Flag) meName0 = "Pixel/Endcap/SUMDIG_ndigis_Endcap";
-  else meName0 = "Pixel/Endcap/SUMOFF_ndigis_Endcap"; 
-  me = iGetter.get(meName0);
-  if(me){
-    NDigisEndcap = iGetter.get("Pixel/Endcap/EndcapNDigisCut");
-    if(NDigisEndcap && digiStatsEndcap){
-      if(me->hasError()) NDigisEndcap->Fill(0);
-      else NDigisEndcap->Fill(1);
+    me = iGetter.get(meName0);
+    if (me) {
+      NDigisBarrel = iGetter.get("Pixel/Barrel/BarrelNDigisCut");
+      if (NDigisBarrel && digiStatsBarrel) {
+        if (me->hasError())
+          NDigisBarrel->Fill(0);
+        else
+          NDigisBarrel->Fill(1);
+      }
     }
-  }
-  if(!Tier0Flag) meName0 = "Pixel/Barrel/SUMDIG_adc_Barrel";
-  else meName0 = "Pixel/Barrel/SUMOFF_adc_Barrel"; 
-  me = iGetter.get(meName0);
-  if(me){
-    DigiChargeBarrel = iGetter.get("Pixel/Barrel/BarrelDigiChargeCut");
-    if(DigiChargeBarrel && digiStatsBarrel){
-      if(me->hasError()) DigiChargeBarrel->Fill(0);
-      else DigiChargeBarrel->Fill(1);
+    if (!Tier0Flag)
+      meName0 = "Pixel/Endcap/SUMDIG_ndigis_Endcap";
+    else
+      meName0 = "Pixel/Endcap/SUMOFF_ndigis_Endcap";
+    me = iGetter.get(meName0);
+    if (me) {
+      NDigisEndcap = iGetter.get("Pixel/Endcap/EndcapNDigisCut");
+      if (NDigisEndcap && digiStatsEndcap) {
+        if (me->hasError())
+          NDigisEndcap->Fill(0);
+        else
+          NDigisEndcap->Fill(1);
+      }
     }
-  }
-  if(!Tier0Flag) meName0 = "Pixel/Endcap/SUMDIG_adc_Endcap";
-  else meName0 = "Pixel/Endcap/SUMOFF_adc_Endcap"; 
-  me = iGetter.get(meName0);
-  if(me){
-    DigiChargeEndcap = iGetter.get("Pixel/Endcap/EndcapDigiChargeCut");
-    if(DigiChargeEndcap && digiStatsEndcap){
-      if(me->hasError()) DigiChargeEndcap->Fill(0);
-      else DigiChargeEndcap->Fill(1);
+    if (!Tier0Flag)
+      meName0 = "Pixel/Barrel/SUMDIG_adc_Barrel";
+    else
+      meName0 = "Pixel/Barrel/SUMOFF_adc_Barrel";
+    me = iGetter.get(meName0);
+    if (me) {
+      DigiChargeBarrel = iGetter.get("Pixel/Barrel/BarrelDigiChargeCut");
+      if (DigiChargeBarrel && digiStatsBarrel) {
+        if (me->hasError())
+          DigiChargeBarrel->Fill(0);
+        else
+          DigiChargeBarrel->Fill(1);
+      }
     }
-  }
-     
-     
-    // Fill the Cluster flags:
-  if(!Tier0Flag){
-    meName0 = "Pixel/Barrel/SUMCLU_size_Barrel";
-    if(clusterCounterBarrel/768 > 0.5) clusterStatsBarrel = true;
-    if(clusterCounterEndcap/672 > 0.5) clusterStatsEndcap = true;
-  }else{
-    meName0 = "Pixel/Barrel/SUMOFF_size_OnTrack_Barrel"; 
-    if(clusterCounterBarrel/192 > 0.5) clusterStatsBarrel = true;
-    if(clusterCounterEndcap/96 > 0.5) clusterStatsEndcap = true;
-  }
-  me = iGetter.get(meName0);
-  if(me){
-    ClusterSizeBarrel = iGetter.get("Pixel/Barrel/BarrelClusterSizeCut");
-    if(ClusterSizeBarrel && clusterStatsBarrel){
-      if(me->hasError()) ClusterSizeBarrel->Fill(0);
-      else ClusterSizeBarrel->Fill(1);
+    if (!Tier0Flag)
+      meName0 = "Pixel/Endcap/SUMDIG_adc_Endcap";
+    else
+      meName0 = "Pixel/Endcap/SUMOFF_adc_Endcap";
+    me = iGetter.get(meName0);
+    if (me) {
+      DigiChargeEndcap = iGetter.get("Pixel/Endcap/EndcapDigiChargeCut");
+      if (DigiChargeEndcap && digiStatsEndcap) {
+        if (me->hasError())
+          DigiChargeEndcap->Fill(0);
+        else
+          DigiChargeEndcap->Fill(1);
+      }
     }
-  }
-  if(!Tier0Flag) meName0 = "Pixel/Endcap/SUMCLU_size_Endcap";
-  else meName0 = "Pixel/Endcap/SUMOFF_size_OnTrack_Endcap"; 
-  me = iGetter.get(meName0);
-  if(me){
-    ClusterSizeEndcap = iGetter.get("Pixel/Endcap/EndcapClusterSizeCut");
-    if(ClusterSizeEndcap && clusterStatsEndcap){
-      if(me->hasError()) ClusterSizeEndcap->Fill(0);
-      else ClusterSizeEndcap->Fill(1);
+
+    // Fill the Cluster flags:
+    if (!Tier0Flag) {
+      meName0 = "Pixel/Barrel/SUMCLU_size_Barrel";
+      if (clusterCounterBarrel / 768 > 0.5)
+        clusterStatsBarrel = true;
+      if (clusterCounterEndcap / 672 > 0.5)
+        clusterStatsEndcap = true;
+    } else {
+      meName0 = "Pixel/Barrel/SUMOFF_size_OnTrack_Barrel";
+      if (clusterCounterBarrel / 192 > 0.5)
+        clusterStatsBarrel = true;
+      if (clusterCounterEndcap / 96 > 0.5)
+        clusterStatsEndcap = true;
     }
-  }
-  if(!Tier0Flag) meName0 = "Pixel/Barrel/SUMCLU_charge_Barrel";
-  else meName0 = "Pixel/Barrel/SUMOFF_charge_OnTrack_Barrel"; 
-  me = iGetter.get(meName0);
-  if(me){
-    ClusterChargeBarrel = iGetter.get("Pixel/Barrel/BarrelClusterChargeCut");
-    if(ClusterChargeBarrel && clusterStatsBarrel){
-      if(me->hasError()) ClusterChargeBarrel->Fill(0);
-      else ClusterChargeBarrel->Fill(1);
+    me = iGetter.get(meName0);
+    if (me) {
+      ClusterSizeBarrel = iGetter.get("Pixel/Barrel/BarrelClusterSizeCut");
+      if (ClusterSizeBarrel && clusterStatsBarrel) {
+        if (me->hasError())
+          ClusterSizeBarrel->Fill(0);
+        else
+          ClusterSizeBarrel->Fill(1);
+      }
     }
-  }
-  if(!Tier0Flag) meName0 = "Pixel/Endcap/SUMCLU_charge_Endcap";
-  else meName0 = "Pixel/Endcap/SUMOFF_charge_OnTrack_Endcap"; 
-  me = iGetter.get(meName0);
-  if(me){
-    ClusterChargeEndcap = iGetter.get("Pixel/Endcap/EndcapClusterChargeCut");
-    if(ClusterChargeEndcap && clusterStatsEndcap){
-      if(me->hasError()) ClusterChargeEndcap->Fill(0);
-      else ClusterChargeEndcap->Fill(1);
+    if (!Tier0Flag)
+      meName0 = "Pixel/Endcap/SUMCLU_size_Endcap";
+    else
+      meName0 = "Pixel/Endcap/SUMOFF_size_OnTrack_Endcap";
+    me = iGetter.get(meName0);
+    if (me) {
+      ClusterSizeEndcap = iGetter.get("Pixel/Endcap/EndcapClusterSizeCut");
+      if (ClusterSizeEndcap && clusterStatsEndcap) {
+        if (me->hasError())
+          ClusterSizeEndcap->Fill(0);
+        else
+          ClusterSizeEndcap->Fill(1);
+      }
     }
-  }
-  if(!Tier0Flag) meName0 = "Pixel/Barrel/SUMCLU_nclusters_Barrel";
-  else meName0 = "Pixel/Barrel/SUMOFF_nclusters_OnTrack_Barrel"; 
-  me = iGetter.get(meName0);
-  if(me){
-    NClustersBarrel = iGetter.get("Pixel/Barrel/BarrelNClustersCut");
-    if(NClustersBarrel && clusterStatsBarrel){
-      if(me->hasError()) NClustersBarrel->Fill(0);
-      else NClustersBarrel->Fill(1);
+    if (!Tier0Flag)
+      meName0 = "Pixel/Barrel/SUMCLU_charge_Barrel";
+    else
+      meName0 = "Pixel/Barrel/SUMOFF_charge_OnTrack_Barrel";
+    me = iGetter.get(meName0);
+    if (me) {
+      ClusterChargeBarrel = iGetter.get("Pixel/Barrel/BarrelClusterChargeCut");
+      if (ClusterChargeBarrel && clusterStatsBarrel) {
+        if (me->hasError())
+          ClusterChargeBarrel->Fill(0);
+        else
+          ClusterChargeBarrel->Fill(1);
+      }
     }
-  }
-  if(!Tier0Flag) meName0 = "Pixel/Endcap/SUMCLU_nclusters_Endcap";
-  else meName0 = "Pixel/Endcap/SUMOFF_nclusters_OnTrack_Endcap"; 
-  me = iGetter.get(meName0);
-  if(me){
-    NClustersEndcap = iGetter.get("Pixel/Endcap/EndcapNClustersCut");
-    if(NClustersEndcap && clusterStatsEndcap){
-      if(me->hasError()) NClustersEndcap->Fill(0);
-      else NClustersEndcap->Fill(1);
+    if (!Tier0Flag)
+      meName0 = "Pixel/Endcap/SUMCLU_charge_Endcap";
+    else
+      meName0 = "Pixel/Endcap/SUMOFF_charge_OnTrack_Endcap";
+    me = iGetter.get(meName0);
+    if (me) {
+      ClusterChargeEndcap = iGetter.get("Pixel/Endcap/EndcapClusterChargeCut");
+      if (ClusterChargeEndcap && clusterStatsEndcap) {
+        if (me->hasError())
+          ClusterChargeEndcap->Fill(0);
+        else
+          ClusterChargeEndcap->Fill(1);
+      }
     }
-  }
-  // Pixel Track multiplicity / Pixel hit efficiency
-  meName0 = "Pixel/Tracks/ntracks_generalTracks";
-  me = iGetter.get(meName0);
-  if(me){
-    NPixelTracks = iGetter.get("Pixel/Tracks/PixelTracksCut");
-    if(NPixelTracks && me->getBinContent(1)>1000){
-      if((float)me->getBinContent(2)/(float)me->getBinContent(1)<0.01){
-        NPixelTracks->Fill(0);
-      }else{ 
-        NPixelTracks->Fill(1);
+    if (!Tier0Flag)
+      meName0 = "Pixel/Barrel/SUMCLU_nclusters_Barrel";
+    else
+      meName0 = "Pixel/Barrel/SUMOFF_nclusters_OnTrack_Barrel";
+    me = iGetter.get(meName0);
+    if (me) {
+      NClustersBarrel = iGetter.get("Pixel/Barrel/BarrelNClustersCut");
+      if (NClustersBarrel && clusterStatsBarrel) {
+        if (me->hasError())
+          NClustersBarrel->Fill(0);
+        else
+          NClustersBarrel->Fill(1);
       }
     }
-  }
-  
-  
-//********************************************************************************************************  
-  
-  // Final combination of all Data Quality results:
-  float pixelFlag = -1., barrelFlag = -1., endcapFlag = -1.;
-  float barrel_errors_temp[1]={-1.}; int barrel_cuts_temp[5]={5*-1}; 
-  float endcap_errors_temp[1]={-1.}; int endcap_cuts_temp[5]={5*-1}; 
-  int pixel_cuts_temp[1]={-1};
-  float combinedCuts = 1.; int numerator = 0, denominator = 0;
-
-  // Barrel results:
-  me = iGetter.get("Pixel/Barrel/BarrelNErrorsCut");
-  if(me) barrel_errors_temp[0] = me->getFloatValue();
-  me = iGetter.get("Pixel/Barrel/BarrelNDigisCut");
-  if(me) barrel_cuts_temp[0] = me->getIntValue();
-  me = iGetter.get("Pixel/Barrel/BarrelDigiChargeCut");
-  if(me) barrel_cuts_temp[1] = me->getIntValue();
-  me = iGetter.get("Pixel/Barrel/BarrelClusterSizeCut");
-  if(me) barrel_cuts_temp[2] = me->getIntValue();
-  me = iGetter.get("Pixel/Barrel/BarrelNClustersCut");
-  if(me) barrel_cuts_temp[3] = me->getIntValue();
-  me = iGetter.get("Pixel/Barrel/BarrelClusterChargeCut");
-  if(me) barrel_cuts_temp[4] = me->getIntValue();
-  for(int k=0; k!=5; k++){
-    if(barrel_cuts_temp[k]>=0){
-      numerator = numerator + barrel_cuts_temp[k];
-      denominator++;
+    if (!Tier0Flag)
+      meName0 = "Pixel/Endcap/SUMCLU_nclusters_Endcap";
+    else
+      meName0 = "Pixel/Endcap/SUMOFF_nclusters_OnTrack_Endcap";
+    me = iGetter.get(meName0);
+    if (me) {
+      NClustersEndcap = iGetter.get("Pixel/Endcap/EndcapNClustersCut");
+      if (NClustersEndcap && clusterStatsEndcap) {
+        if (me->hasError())
+          NClustersEndcap->Fill(0);
+        else
+          NClustersEndcap->Fill(1);
+      }
     }
-  } 
-  if(denominator!=0) combinedCuts = float(numerator)/float(denominator);  
-  barrelFlag = barrel_errors_temp[0] * combinedCuts;
-  
-    // Endcap results:
-  combinedCuts = 1.; numerator = 0; denominator = 0;
-  me = iGetter.get("Pixel/Endcap/EndcapNErrorsCut");
-  if(me) endcap_errors_temp[0] = me->getFloatValue();
-  me = iGetter.get("Pixel/Endcap/EndcapNDigisCut");
-  if(me) endcap_cuts_temp[0] = me->getIntValue();
-  me = iGetter.get("Pixel/Endcap/EndcapDigiChargeCut");
-  if(me) endcap_cuts_temp[1] = me->getIntValue();
-  me = iGetter.get("Pixel/Endcap/EndcapClusterSizeCut");
-  if(me) endcap_cuts_temp[2] = me->getIntValue();
-  me = iGetter.get("Pixel/Endcap/EndcapNClustersCut");
-  if(me) endcap_cuts_temp[3] = me->getIntValue();
-  me = iGetter.get("Pixel/Endcap/EndcapClusterChargeCut");
-  if(me) endcap_cuts_temp[4] = me->getIntValue();
-  for(int k=0; k!=5; k++){
-    if(endcap_cuts_temp[k]>=0){
-      numerator = numerator + endcap_cuts_temp[k];
-      denominator++;
+    // Pixel Track multiplicity / Pixel hit efficiency
+    meName0 = "Pixel/Tracks/ntracks_generalTracks";
+    me = iGetter.get(meName0);
+    if (me) {
+      NPixelTracks = iGetter.get("Pixel/Tracks/PixelTracksCut");
+      if (NPixelTracks && me->getBinContent(1) > 1000) {
+        if ((float)me->getBinContent(2) / (float)me->getBinContent(1) < 0.01) {
+          NPixelTracks->Fill(0);
+        } else {
+          NPixelTracks->Fill(1);
+        }
+      }
     }
-  } 
-  if(denominator!=0) combinedCuts = float(numerator)/float(denominator);  
-  endcapFlag = endcap_errors_temp[0] * combinedCuts;
-  
-  // Track results:
-  combinedCuts = 1.; numerator = 0; denominator = 0;
-  me = iGetter.get("Pixel/Tracks/PixelTracksCut");
-  if(me) pixel_cuts_temp[0] = me->getIntValue();
-
-  //Combination of all:
-  combinedCuts = 1.; numerator = 0; denominator = 0;
-  for(int k=0; k!=5; k++){
-    if(barrel_cuts_temp[k]>=0){
-      numerator = numerator + barrel_cuts_temp[k];
-      denominator++;
+
+    //********************************************************************************************************
+
+    // Final combination of all Data Quality results:
+    float pixelFlag = -1., barrelFlag = -1., endcapFlag = -1.;
+    float barrel_errors_temp[1] = {-1.};
+    int barrel_cuts_temp[5] = {5 * -1};
+    float endcap_errors_temp[1] = {-1.};
+    int endcap_cuts_temp[5] = {5 * -1};
+    int pixel_cuts_temp[1] = {-1};
+    float combinedCuts = 1.;
+    int numerator = 0, denominator = 0;
+
+    // Barrel results:
+    me = iGetter.get("Pixel/Barrel/BarrelNErrorsCut");
+    if (me)
+      barrel_errors_temp[0] = me->getFloatValue();
+    me = iGetter.get("Pixel/Barrel/BarrelNDigisCut");
+    if (me)
+      barrel_cuts_temp[0] = me->getIntValue();
+    me = iGetter.get("Pixel/Barrel/BarrelDigiChargeCut");
+    if (me)
+      barrel_cuts_temp[1] = me->getIntValue();
+    me = iGetter.get("Pixel/Barrel/BarrelClusterSizeCut");
+    if (me)
+      barrel_cuts_temp[2] = me->getIntValue();
+    me = iGetter.get("Pixel/Barrel/BarrelNClustersCut");
+    if (me)
+      barrel_cuts_temp[3] = me->getIntValue();
+    me = iGetter.get("Pixel/Barrel/BarrelClusterChargeCut");
+    if (me)
+      barrel_cuts_temp[4] = me->getIntValue();
+    for (int k = 0; k != 5; k++) {
+      if (barrel_cuts_temp[k] >= 0) {
+        numerator = numerator + barrel_cuts_temp[k];
+        denominator++;
+      }
     }
-    if(endcap_cuts_temp[k]>=0){
-      numerator = numerator + endcap_cuts_temp[k];
-      denominator++;
+    if (denominator != 0)
+      combinedCuts = float(numerator) / float(denominator);
+    barrelFlag = barrel_errors_temp[0] * combinedCuts;
+
+    // Endcap results:
+    combinedCuts = 1.;
+    numerator = 0;
+    denominator = 0;
+    me = iGetter.get("Pixel/Endcap/EndcapNErrorsCut");
+    if (me)
+      endcap_errors_temp[0] = me->getFloatValue();
+    me = iGetter.get("Pixel/Endcap/EndcapNDigisCut");
+    if (me)
+      endcap_cuts_temp[0] = me->getIntValue();
+    me = iGetter.get("Pixel/Endcap/EndcapDigiChargeCut");
+    if (me)
+      endcap_cuts_temp[1] = me->getIntValue();
+    me = iGetter.get("Pixel/Endcap/EndcapClusterSizeCut");
+    if (me)
+      endcap_cuts_temp[2] = me->getIntValue();
+    me = iGetter.get("Pixel/Endcap/EndcapNClustersCut");
+    if (me)
+      endcap_cuts_temp[3] = me->getIntValue();
+    me = iGetter.get("Pixel/Endcap/EndcapClusterChargeCut");
+    if (me)
+      endcap_cuts_temp[4] = me->getIntValue();
+    for (int k = 0; k != 5; k++) {
+      if (endcap_cuts_temp[k] >= 0) {
+        numerator = numerator + endcap_cuts_temp[k];
+        denominator++;
+      }
     }
-    if(k<1 && pixel_cuts_temp[k]>=0){
-      numerator = numerator + pixel_cuts_temp[k];
-      denominator++;
+    if (denominator != 0)
+      combinedCuts = float(numerator) / float(denominator);
+    endcapFlag = endcap_errors_temp[0] * combinedCuts;
+
+    // Track results:
+    combinedCuts = 1.;
+    numerator = 0;
+    denominator = 0;
+    me = iGetter.get("Pixel/Tracks/PixelTracksCut");
+    if (me)
+      pixel_cuts_temp[0] = me->getIntValue();
+
+    // Combination of all:
+    combinedCuts = 1.;
+    numerator = 0;
+    denominator = 0;
+    for (int k = 0; k != 5; k++) {
+      if (barrel_cuts_temp[k] >= 0) {
+        numerator = numerator + barrel_cuts_temp[k];
+        denominator++;
+      }
+      if (endcap_cuts_temp[k] >= 0) {
+        numerator = numerator + endcap_cuts_temp[k];
+        denominator++;
+      }
+      if (k < 1 && pixel_cuts_temp[k] >= 0) {
+        numerator = numerator + pixel_cuts_temp[k];
+        denominator++;
+      }
     }
-  } 
-  if(denominator!=0) combinedCuts = float(numerator)/float(denominator); 
-  pixelFlag = float(pixel_error_flag_) * float(combinedCuts);
-  
-  
-  SummaryPixel = iGetter.get("Pixel/EventInfo/reportSummary");
-  if(SummaryPixel) SummaryPixel->Fill(pixelFlag);
-  SummaryBarrel = iGetter.get("Pixel/EventInfo/reportSummaryContents/PixelBarrelFraction");
-  if(SummaryBarrel) SummaryBarrel->Fill(barrelFlag);
-  SummaryEndcap = iGetter.get("Pixel/EventInfo/reportSummaryContents/PixelEndcapFraction");
-  if(SummaryEndcap)   SummaryEndcap->Fill(endcapFlag);
+    if (denominator != 0)
+      combinedCuts = float(numerator) / float(denominator);
+    pixelFlag = float(pixel_error_flag_) * float(combinedCuts);
+
+    SummaryPixel = iGetter.get("Pixel/EventInfo/reportSummary");
+    if (SummaryPixel)
+      SummaryPixel->Fill(pixelFlag);
+    SummaryBarrel = iGetter.get("Pixel/EventInfo/reportSummaryContents/PixelBarrelFraction");
+    if (SummaryBarrel)
+      SummaryBarrel->Fill(barrelFlag);
+    SummaryEndcap = iGetter.get("Pixel/EventInfo/reportSummaryContents/PixelEndcapFraction");
+    if (SummaryEndcap)
+      SummaryEndcap->Fill(endcapFlag);
   }
 }
 
 //**********************************************************************************************
 
-void SiPixelDataQuality::computeGlobalQualityFlagByLumi(DQMStore::IGetter & iGetter, 
-                                                           bool init,
-							   int nFEDs,
-							   bool Tier0Flag,
-							   int nEvents_lastLS_,
-							   int nErrorsBarrel_lastLS_,
-							   int nErrorsEndcap_lastLS_){
-  if(nFEDs==0) return;  
-  
+void SiPixelDataQuality::computeGlobalQualityFlagByLumi(DQMStore::IGetter &iGetter,
+                                                        bool init,
+                                                        int nFEDs,
+                                                        bool Tier0Flag,
+                                                        int nEvents_lastLS_,
+                                                        int nErrorsBarrel_lastLS_,
+                                                        int nErrorsEndcap_lastLS_) {
+  if (nFEDs == 0)
+    return;
+
   // evaluate fatal FED errors for data quality:
   float BarrelRate_LS = 1.;
   float EndcapRate_LS = 1.;
   float PixelRate_LS = 1.;
-  MonitorElement * me = iGetter.get("Pixel/AdditionalPixelErrors/byLumiErrors");
-  if(me){
+  MonitorElement *me = iGetter.get("Pixel/AdditionalPixelErrors/byLumiErrors");
+  if (me) {
     double nBarrelErrors_LS = me->getBinContent(1) - nErrorsBarrel_lastLS_;
     double nEndcapErrors_LS = me->getBinContent(2) - nErrorsEndcap_lastLS_;
     double nEvents_LS = me->getBinContent(0) - nEvents_lastLS_;
-    if(nBarrelErrors_LS/nEvents_LS>0.5) BarrelRate_LS=0.;
-    if(nEndcapErrors_LS/nEvents_LS>0.5) EndcapRate_LS=0.;
-    if((nBarrelErrors_LS + nEndcapErrors_LS)/nEvents_LS>0.5) PixelRate_LS=0.;
+    if (nBarrelErrors_LS / nEvents_LS > 0.5)
+      BarrelRate_LS = 0.;
+    if (nEndcapErrors_LS / nEvents_LS > 0.5)
+      EndcapRate_LS = 0.;
+    if ((nBarrelErrors_LS + nEndcapErrors_LS) / nEvents_LS > 0.5)
+      PixelRate_LS = 0.;
   }
-  
+
   // evaluate mean cluster charge on tracks for data quality:
   float BarrelClusterCharge = 1.;
   float EndcapClusterCharge = 1.;
   float PixelClusterCharge = 1.;
-  MonitorElement * me1 = iGetter.get("Pixel/Clusters/OnTrack/charge_siPixelClusters_Barrel");
-  if(me1 && me1->getMean()<12.) BarrelClusterCharge = 0.;
-  MonitorElement * me2 = iGetter.get("Pixel/Clusters/OnTrack/charge_siPixelClusters_Endcap");
-  if(me2 && me2->getMean()<12.) EndcapClusterCharge = 0.;
-  MonitorElement * me3 = iGetter.get("Pixel/Clusters/OnTrack/charge_siPixelClusters");
-  if(me3 && me3->getMean()<12.) PixelClusterCharge = 0.;
-  
+  MonitorElement *me1 = iGetter.get("Pixel/Clusters/OnTrack/charge_siPixelClusters_Barrel");
+  if (me1 && me1->getMean() < 12.)
+    BarrelClusterCharge = 0.;
+  MonitorElement *me2 = iGetter.get("Pixel/Clusters/OnTrack/charge_siPixelClusters_Endcap");
+  if (me2 && me2->getMean() < 12.)
+    EndcapClusterCharge = 0.;
+  MonitorElement *me3 = iGetter.get("Pixel/Clusters/OnTrack/charge_siPixelClusters");
+  if (me3 && me3->getMean() < 12.)
+    PixelClusterCharge = 0.;
+
   // evaluate average FED occupancy for data quality:
   float BarrelOccupancy = 1.;
   float EndcapOccupancy = 1.;
   float PixelOccupancy = 1.;
-  MonitorElement * me4 = iGetter.get("Pixel/averageDigiOccupancy");
-  if(me4){
-    double minBarrelOcc = 999999.; 
-    double maxBarrelOcc = -1.; 
+  MonitorElement *me4 = iGetter.get("Pixel/averageDigiOccupancy");
+  if (me4) {
+    double minBarrelOcc = 999999.;
+    double maxBarrelOcc = -1.;
     double meanBarrelOcc = 0.;
     double minEndcapOcc = 999999.;
     double maxEndcapOcc = -1.;
     double meanEndcapOcc = 0.;
-    for(int i=1; i!=41; i++){
-      if(i<=32 && me4->getBinContent(i)<minBarrelOcc) minBarrelOcc=me4->getBinContent(i); 
-      if(i<=32 && me4->getBinContent(i)>maxBarrelOcc) maxBarrelOcc=me4->getBinContent(i);
-      if(i<=32) meanBarrelOcc+=me4->getBinContent(i);
-      if(i>32 && me4->getBinContent(i)<minEndcapOcc) minEndcapOcc=me4->getBinContent(i); 
-      if(i>32 && me4->getBinContent(i)>maxEndcapOcc) maxEndcapOcc=me4->getBinContent(i); 
-      if(i>32) meanEndcapOcc+=me4->getBinContent(i);
-    } 
-    meanBarrelOcc = meanBarrelOcc/32.;
-    meanEndcapOcc = meanEndcapOcc/8.;
-    if(minBarrelOcc<0.1*meanBarrelOcc || maxBarrelOcc>2.5*meanBarrelOcc) BarrelOccupancy=0.;
-    if(minEndcapOcc<0.2*meanEndcapOcc || maxEndcapOcc>1.8*meanEndcapOcc) EndcapOccupancy=0.;
-    PixelOccupancy=BarrelOccupancy*EndcapOccupancy;
+    for (int i = 1; i != 41; i++) {
+      if (i <= 32 && me4->getBinContent(i) < minBarrelOcc)
+        minBarrelOcc = me4->getBinContent(i);
+      if (i <= 32 && me4->getBinContent(i) > maxBarrelOcc)
+        maxBarrelOcc = me4->getBinContent(i);
+      if (i <= 32)
+        meanBarrelOcc += me4->getBinContent(i);
+      if (i > 32 && me4->getBinContent(i) < minEndcapOcc)
+        minEndcapOcc = me4->getBinContent(i);
+      if (i > 32 && me4->getBinContent(i) > maxEndcapOcc)
+        maxEndcapOcc = me4->getBinContent(i);
+      if (i > 32)
+        meanEndcapOcc += me4->getBinContent(i);
+    }
+    meanBarrelOcc = meanBarrelOcc / 32.;
+    meanEndcapOcc = meanEndcapOcc / 8.;
+    if (minBarrelOcc < 0.1 * meanBarrelOcc || maxBarrelOcc > 2.5 * meanBarrelOcc)
+      BarrelOccupancy = 0.;
+    if (minEndcapOcc < 0.2 * meanEndcapOcc || maxEndcapOcc > 1.8 * meanEndcapOcc)
+      EndcapOccupancy = 0.;
+    PixelOccupancy = BarrelOccupancy * EndcapOccupancy;
   }
-  
+
   float pixelFlag = PixelRate_LS * PixelClusterCharge * PixelOccupancy;
   float barrelFlag = BarrelRate_LS * BarrelClusterCharge * BarrelOccupancy;
   float endcapFlag = EndcapRate_LS * EndcapClusterCharge * EndcapOccupancy;
   SummaryPixel = iGetter.get("Pixel/EventInfo/reportSummary");
-  if(SummaryPixel) SummaryPixel->Fill(pixelFlag);
+  if (SummaryPixel)
+    SummaryPixel->Fill(pixelFlag);
   SummaryBarrel = iGetter.get("Pixel/EventInfo/reportSummaryContents/PixelBarrelFraction");
-  if(SummaryBarrel) SummaryBarrel->Fill(barrelFlag);
+  if (SummaryBarrel)
+    SummaryBarrel->Fill(barrelFlag);
   SummaryEndcap = iGetter.get("Pixel/EventInfo/reportSummaryContents/PixelEndcapFraction");
-  if(SummaryEndcap)   SummaryEndcap->Fill(endcapFlag);
-  
+  if (SummaryEndcap)
+    SummaryEndcap->Fill(endcapFlag);
 }
 
 //**********************************************************************************************
 
-void SiPixelDataQuality::fillGlobalQualityPlot(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter, bool init, edm::ESHandle<SiPixelFedCablingMap> theCablingMap, int nFEDs, bool Tier0Flag, int lumisec){
-//std::cout<<"Entering SiPixelDataQuality::fillGlobalQualityPlot: "<<nFEDs<<std::endl;
-  if(init){
-    count=0; errcount=0;
-    init=false;
-    count1=0;
-    count2=0;
-    count3=0;
-    count4=0;
-    count5=0;
-    count6=0;
-    modCounter_=0;
-  if(!Tier0Flag){
-    
-    //The plots that these Vecs are integrated throughout a run
-    //So at each lumi section I save their last values (lastmods)
-    //And then subtract them out later when filling the SummaryMap
-    for(int j=1; j!=41; j++){
-      if(allmodsVec) lastallmods_[j-1] = allmodsVec->GetBinContent(j);
-      if(errmodsVec) lasterrmods_[j-1] = errmodsVec->GetBinContent(j);
-      if(allmodsVec) allmodsVec->SetBinContent(j,0.);
-      if(errmodsVec) errmodsVec->SetBinContent(j,0.);
-      if(goodmodsVec) goodmodsVec->SetBinContent(j,0.);
+void SiPixelDataQuality::fillGlobalQualityPlot(DQMStore::IBooker &iBooker,
+                                               DQMStore::IGetter &iGetter,
+                                               bool init,
+                                               edm::ESHandle<SiPixelFedCablingMap> theCablingMap,
+                                               int nFEDs,
+                                               bool Tier0Flag,
+                                               int lumisec) {
+  // std::cout<<"Entering SiPixelDataQuality::fillGlobalQualityPlot:
+  // "<<nFEDs<<std::endl;
+  if (init) {
+    count = 0;
+    errcount = 0;
+    init = false;
+    count1 = 0;
+    count2 = 0;
+    count3 = 0;
+    count4 = 0;
+    count5 = 0;
+    count6 = 0;
+    modCounter_ = 0;
+    if (!Tier0Flag) {
+      // The plots that these Vecs are integrated throughout a run
+      // So at each lumi section I save their last values (lastmods)
+      // And then subtract them out later when filling the SummaryMap
+      for (int j = 1; j != 41; j++) {
+        if (allmodsVec)
+          lastallmods_[j - 1] = allmodsVec->GetBinContent(j);
+        if (errmodsVec)
+          lasterrmods_[j - 1] = errmodsVec->GetBinContent(j);
+        if (allmodsVec)
+          allmodsVec->SetBinContent(j, 0.);
+        if (errmodsVec)
+          errmodsVec->SetBinContent(j, 0.);
+        if (goodmodsVec)
+          goodmodsVec->SetBinContent(j, 0.);
+      }
     }
-  }
-  if(Tier0Flag){
-    for(int i=1; i!=3; i++) for(int j=1; j!=8; j++){
-      if(allmodsMap) allmodsMap->SetBinContent(i,j,0.);
-      if(errmodsMap) errmodsMap->SetBinContent(i,j,0.);
-      if(goodmodsMap) goodmodsMap->SetBinContent(i,j,0.);
+    if (Tier0Flag) {
+      for (int i = 1; i != 3; i++)
+        for (int j = 1; j != 8; j++) {
+          if (allmodsMap)
+            allmodsMap->SetBinContent(i, j, 0.);
+          if (errmodsMap)
+            errmodsMap->SetBinContent(i, j, 0.);
+          if (goodmodsMap)
+            goodmodsMap->SetBinContent(i, j, 0.);
+        }
     }
   }
-  }
-  
-//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^  
-// Fill Maps:
-  // Online:    
-  if(nFEDs==0) return;
-
-  if(!Tier0Flag){
-    //Not elegant, but not sure where else to put this sweet new plot!
-    MonitorElement * meTmp = iGetter.get("Pixel/Barrel/NClustertoChargeRatio_AllMod");
-    MonitorElement * meTop = iGetter.get("Pixel/Barrel/SUMCLU_nclusters_Barrel");
-    MonitorElement * meBot = iGetter.get("Pixel/Barrel/SUMCLU_charge_Barrel");
-    if(meTop && meBot && meTmp){
-      for (int bin = 1; bin < 769; ++bin){
-	float content = 0.0;
-	if (meBot->getBinContent(bin) > 0.0){
-	  content = meTop->getBinContent(bin)/meBot->getBinContent(bin); 
-	}
-	meTmp->setBinContent(bin,content);
+
+  //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  // Fill Maps:
+  // Online:
+  if (nFEDs == 0)
+    return;
+
+  if (!Tier0Flag) {
+    // Not elegant, but not sure where else to put this sweet new plot!
+    MonitorElement *meTmp = iGetter.get("Pixel/Barrel/NClustertoChargeRatio_AllMod");
+    MonitorElement *meTop = iGetter.get("Pixel/Barrel/SUMCLU_nclusters_Barrel");
+    MonitorElement *meBot = iGetter.get("Pixel/Barrel/SUMCLU_charge_Barrel");
+    if (meTop && meBot && meTmp) {
+      for (int bin = 1; bin < 769; ++bin) {
+        float content = 0.0;
+        if (meBot->getBinContent(bin) > 0.0) {
+          content = meTop->getBinContent(bin) / meBot->getBinContent(bin);
+        }
+        meTmp->setBinContent(bin, content);
       }
-      for (int j = 0; j < 4; ++j){
-	static const char buf[] = "Pixel/Barrel/NClustertoChargeRatio_NormMod%i";
-	char modplot[sizeof(buf)+2];
-	sprintf(modplot,buf,j+1);
-	MonitorElement * meFinal = iGetter.get(modplot);
-	if(!meFinal) continue;
-	for (int i = 1; i < 769; ++i){
-	  int k = 3 - j;
-	  if (int(i+k)%4 == 0)
-	    meFinal->setBinContent(int((i+k)/4), meTmp->getBinContent(i));
-	}
-	//Filling done. Now modification.
-	float SFLay[3], TotLay[3];
-	for (int ll = 0; ll < 3; ++ll) TotLay[ll] = 0.0;
-	for (int bin = 1; bin < (meFinal->getNbinsX()+1);++bin){
-          int layer     =   int((bin%48)/16);
-	  TotLay[layer] += meFinal->getBinContent(bin);
-	}
-	float laynorm = TotLay[1]/64.;
-	for (int ll = 0; ll < 3; ++ll){
-	  SFLay[ll] = 0.0; if (TotLay[ll] > 0.0 && TotLay[1] > 0.0) SFLay[ll] = TotLay[1]/TotLay[ll]*(1./laynorm);
-	}
-	//now loop through plot
-	for (int bin = 1; bin < (meFinal->getNbinsX()+1); ++bin){
-	  //access the layer number for bin: int((i%48)/16)
-	  int layer     =   int((bin%48)/16);
-	  float content =   meFinal->getBinContent(bin);
-	  //apply scale factor to bin content
-	  meFinal->setBinContent(bin,content*SFLay[layer]);
-	}
+      for (int j = 0; j < 4; ++j) {
+        static const char buf[] = "Pixel/Barrel/NClustertoChargeRatio_NormMod%i";
+        char modplot[sizeof(buf) + 2];
+        sprintf(modplot, buf, j + 1);
+        MonitorElement *meFinal = iGetter.get(modplot);
+        if (!meFinal)
+          continue;
+        for (int i = 1; i < 769; ++i) {
+          int k = 3 - j;
+          if (int(i + k) % 4 == 0)
+            meFinal->setBinContent(int((i + k) / 4), meTmp->getBinContent(i));
+        }
+        // Filling done. Now modification.
+        float SFLay[3], TotLay[3];
+        for (int ll = 0; ll < 3; ++ll)
+          TotLay[ll] = 0.0;
+        for (int bin = 1; bin < (meFinal->getNbinsX() + 1); ++bin) {
+          int layer = int((bin % 48) / 16);
+          TotLay[layer] += meFinal->getBinContent(bin);
+        }
+        float laynorm = TotLay[1] / 64.;
+        for (int ll = 0; ll < 3; ++ll) {
+          SFLay[ll] = 0.0;
+          if (TotLay[ll] > 0.0 && TotLay[1] > 0.0)
+            SFLay[ll] = TotLay[1] / TotLay[ll] * (1. / laynorm);
+        }
+        // now loop through plot
+        for (int bin = 1; bin < (meFinal->getNbinsX() + 1); ++bin) {
+          // access the layer number for bin: int((i%48)/16)
+          int layer = int((bin % 48) / 16);
+          float content = meFinal->getBinContent(bin);
+          // apply scale factor to bin content
+          meFinal->setBinContent(bin, content * SFLay[layer]);
+        }
       }
     }
-    
+
     string currDir = iBooker.pwd();
-    if(currDir.find("Reference")!=string::npos || currDir.find("Additional")!=string::npos) return;
-    string dname = currDir.substr(currDir.find_last_of("/")+1);
-    if(dname.find("Module_")!=string::npos && currDir.find("Reference")==string::npos){
+    if (currDir.find("Reference") != string::npos || currDir.find("Additional") != string::npos)
+      return;
+    string dname = currDir.substr(currDir.find_last_of("/") + 1);
+    if (dname.find("Module_") != string::npos && currDir.find("Reference") == string::npos) {
       vector<string> meVec = iGetter.getMEs();
-      int detId=-1; int fedId=-1;
-      for (vector<string>::const_iterator it = meVec.begin(); it != meVec.end(); it++){//loop over all modules and fill ndigis into allmodsMap
-        //checking for any digis or FED errors to decide if this module is in DAQ:  
+      int detId = -1;
+      int fedId = -1;
+      for (vector<string>::const_iterator it = meVec.begin(); it != meVec.end();
+           it++) {  // loop over all modules and fill ndigis into allmodsMap
+        // checking for any digis or FED errors to decide if this module is in
+        // DAQ:
         string full_path = currDir + "/" + (*it);
-        if(detId==-1 && full_path.find("SUMOFF")==string::npos &&
-           (full_path.find("ndigis")!=string::npos && full_path.find("SUMDIG")==string::npos) && 
-	   (getDetId(iGetter.get(full_path)) > 100)){
-          MonitorElement * me = iGetter.get(full_path);
-          if (!me) continue;
-	  if((full_path.find("ndigis")!=string::npos)){ 
-	    modCounter_++;
+        if (detId == -1 && full_path.find("SUMOFF") == string::npos &&
+            (full_path.find("ndigis") != string::npos && full_path.find("SUMDIG") == string::npos) &&
+            (getDetId(iGetter.get(full_path)) > 100)) {
+          MonitorElement *me = iGetter.get(full_path);
+          if (!me)
+            continue;
+          if ((full_path.find("ndigis") != string::npos)) {
+            modCounter_++;
             detId = getDetId(me);
-            for(int fedid=0; fedid!=40; ++fedid){
-              SiPixelFrameConverter converter(theCablingMap.product(),fedid);
-	      uint32_t newDetId = detId;
-              if(converter.hasDetUnit(newDetId)){
-                fedId=fedid;
-                break;   
+            for (int fedid = 0; fedid != 40; ++fedid) {
+              SiPixelFrameConverter converter(theCablingMap.product(), fedid);
+              uint32_t newDetId = detId;
+              if (converter.hasDetUnit(newDetId)) {
+                fedId = fedid;
+                break;
               }
             }
-	    double NDigis = 0;
-	    if(full_path.find("ndigis")!=string::npos) NDigis = me->getEntries(); 
-	    float weight = (allmodsVec->GetBinContent(fedId+1))+NDigis;
-	    allmodsVec->SetBinContent(fedId+1,weight);
-	  }
+            double NDigis = 0;
+            if (full_path.find("ndigis") != string::npos)
+              NDigis = me->getEntries();
+            float weight = (allmodsVec->GetBinContent(fedId + 1)) + NDigis;
+            allmodsVec->SetBinContent(fedId + 1, weight);
+          }
         }
-      }//end loop over MEs
-    }//end of module dir's
-    vector<string> subDirVec = iGetter.getSubdirs();  
-    for (vector<string>::const_iterator ic = subDirVec.begin();
-         ic != subDirVec.end(); ic++) {
+      }  // end loop over MEs
+    }    // end of module dir's
+    vector<string> subDirVec = iGetter.getSubdirs();
+    for (vector<string>::const_iterator ic = subDirVec.begin(); ic != subDirVec.end(); ic++) {
       iBooker.cd(*ic);
       iGetter.cd(*ic);
-      init=false;
-      fillGlobalQualityPlot(iBooker,iGetter,init,theCablingMap,nFEDs,Tier0Flag,lumisec);
+      init = false;
+      fillGlobalQualityPlot(iBooker, iGetter, init, theCablingMap, nFEDs, Tier0Flag, lumisec);
       iBooker.goUp();
       iGetter.setCurrentFolder(iBooker.pwd());
     }
-    if(modCounter_==1440){
+    if (modCounter_ == 1440) {
       iBooker.cd("Pixel/EventInfo/reportSummaryContents");
       iGetter.cd("Pixel/EventInfo/reportSummaryContents");
-      if(iBooker.pwd()=="Pixel/EventInfo/reportSummaryContents"){
-        for(int i=0; i!=40; i++){//loop over FEDs to fetch the errors
+      if (iBooker.pwd() == "Pixel/EventInfo/reportSummaryContents") {
+        for (int i = 0; i != 40; i++) {  // loop over FEDs to fetch the errors
           static const char buf[] = "Pixel/AdditionalPixelErrors/FED_%d/FedChNErr";
-          char fedplot[sizeof(buf)+4]; 
-	  int NErrors = 0;
-	  for(int j=0; j!=37; j++){//loop over FED channels within a FED
-            sprintf(fedplot,buf,i);
-	    MonitorElement * me = iGetter.get(fedplot);
-	    if(me) NErrors = NErrors + me->getBinContent(j+1);
-	  }
-	  //If I fill, then I end up majorly overcounting the numbers of errors...
-	  if(NErrors>0){ errmodsVec->SetBinContent(i+1,NErrors); } 
-	}
+          char fedplot[sizeof(buf) + 4];
+          int NErrors = 0;
+          for (int j = 0; j != 37; j++) {  // loop over FED channels within a FED
+            sprintf(fedplot, buf, i);
+            MonitorElement *me = iGetter.get(fedplot);
+            if (me)
+              NErrors = NErrors + me->getBinContent(j + 1);
+          }
+          // If I fill, then I end up majorly overcounting the numbers of
+          // errors...
+          if (NErrors > 0) {
+            errmodsVec->SetBinContent(i + 1, NErrors);
+          }
+        }
         SummaryReportMap = iGetter.get("Pixel/EventInfo/reportSummaryMap");
-        if(SummaryReportMap){ 
-          float contents=0.;
-          for(int i=1; i!=41; i++){
-	    //Dynamically subtracting previous (integrated) lumi section values
-	    //in order to only show current lumi section's numbers
-	    float mydigis = allmodsVec->GetBinContent(i) - lastallmods_[i-1];
-            float myerrs  = errmodsVec->GetBinContent(i) - lasterrmods_[i-1];
-	    if ((mydigis + myerrs) > 0.){
-	      contents = mydigis/(mydigis + myerrs);
-            }else{
-	      //Changed so that dynamic zooming will still
-	      //advance over these bins(in renderplugins)
+        if (SummaryReportMap) {
+          float contents = 0.;
+          for (int i = 1; i != 41; i++) {
+            // Dynamically subtracting previous (integrated) lumi section values
+            // in order to only show current lumi section's numbers
+            float mydigis = allmodsVec->GetBinContent(i) - lastallmods_[i - 1];
+            float myerrs = errmodsVec->GetBinContent(i) - lasterrmods_[i - 1];
+            if ((mydigis + myerrs) > 0.) {
+              contents = mydigis / (mydigis + myerrs);
+            } else {
+              // Changed so that dynamic zooming will still
+              // advance over these bins(in renderplugins)
               contents = -0.5;
             }
-            SummaryReportMap->setBinContent(lumisec+1,i,contents);
-          }//end for loop over summaryReportMap bins
-        }//end if reportSummaryMap ME exists
-      }//end if in summary directory
-    }//end if modCounter_  
-  }else{ // Offline
-    float barrel_errors_temp[1]={-1.}; int barrel_cuts_temp[6]={6*-1}; 
-    float endcap_errors_temp[1]={-1.}; int endcap_cuts_temp[6]={6*-1}; 
-    int pixel_cuts_temp[1]={-1};
+            SummaryReportMap->setBinContent(lumisec + 1, i, contents);
+          }  // end for loop over summaryReportMap bins
+        }    // end if reportSummaryMap ME exists
+      }      // end if in summary directory
+    }        // end if modCounter_
+  } else {   // Offline
+    float barrel_errors_temp[1] = {-1.};
+    int barrel_cuts_temp[6] = {6 * -1};
+    float endcap_errors_temp[1] = {-1.};
+    int endcap_cuts_temp[6] = {6 * -1};
+    int pixel_cuts_temp[1] = {-1};
     // Barrel results:
-    MonitorElement * me;
+    MonitorElement *me;
     me = iGetter.get("Pixel/Barrel/BarrelNErrorsCut");
-    if(me) barrel_errors_temp[0] = me->getFloatValue();
+    if (me)
+      barrel_errors_temp[0] = me->getFloatValue();
     me = iGetter.get("Pixel/Endcap/EndcapNErrorsCut");
-    if(me) endcap_errors_temp[0] = me->getFloatValue();
-    SummaryReportMap->setBinContent(1,1,barrel_errors_temp[0]);
-    SummaryReportMap->setBinContent(2,1,endcap_errors_temp[0]);
+    if (me)
+      endcap_errors_temp[0] = me->getFloatValue();
+    SummaryReportMap->setBinContent(1, 1, barrel_errors_temp[0]);
+    SummaryReportMap->setBinContent(2, 1, endcap_errors_temp[0]);
     me = iGetter.get("Pixel/Barrel/BarrelNDigisCut");
-    if(me) barrel_cuts_temp[0] = me->getIntValue();
+    if (me)
+      barrel_cuts_temp[0] = me->getIntValue();
     me = iGetter.get("Pixel/Barrel/BarrelDigiChargeCut");
-    if(me) barrel_cuts_temp[1] = me->getIntValue();
+    if (me)
+      barrel_cuts_temp[1] = me->getIntValue();
     me = iGetter.get("Pixel/Barrel/BarrelClusterSizeCut");
-    if(me) barrel_cuts_temp[2] = me->getIntValue();
+    if (me)
+      barrel_cuts_temp[2] = me->getIntValue();
     me = iGetter.get("Pixel/Barrel/BarrelNClustersCut");
-    if(me) barrel_cuts_temp[3] = me->getIntValue();
+    if (me)
+      barrel_cuts_temp[3] = me->getIntValue();
     me = iGetter.get("Pixel/Barrel/BarrelClusterChargeCut");
-    if(me) barrel_cuts_temp[4] = me->getIntValue();  
+    if (me)
+      barrel_cuts_temp[4] = me->getIntValue();
     me = iGetter.get("Pixel/Endcap/EndcapNDigisCut");
-    if(me) endcap_cuts_temp[0] = me->getIntValue();
+    if (me)
+      endcap_cuts_temp[0] = me->getIntValue();
     me = iGetter.get("Pixel/Endcap/EndcapDigiChargeCut");
-    if(me) endcap_cuts_temp[1] = me->getIntValue();
+    if (me)
+      endcap_cuts_temp[1] = me->getIntValue();
     me = iGetter.get("Pixel/Endcap/EndcapClusterSizeCut");
-    if(me) endcap_cuts_temp[2] = me->getIntValue();
+    if (me)
+      endcap_cuts_temp[2] = me->getIntValue();
     me = iGetter.get("Pixel/Endcap/EndcapNClustersCut");
-    if(me) endcap_cuts_temp[3] = me->getIntValue();
+    if (me)
+      endcap_cuts_temp[3] = me->getIntValue();
     me = iGetter.get("Pixel/Endcap/EndcapClusterChargeCut");
-    if(me) endcap_cuts_temp[4] = me->getIntValue();  
-    for(int j=2; j!=7; j++){
-      SummaryReportMap->setBinContent(1,j,barrel_cuts_temp[j-2]);
-      SummaryReportMap->setBinContent(2,j,endcap_cuts_temp[j-2]);
+    if (me)
+      endcap_cuts_temp[4] = me->getIntValue();
+    for (int j = 2; j != 7; j++) {
+      SummaryReportMap->setBinContent(1, j, barrel_cuts_temp[j - 2]);
+      SummaryReportMap->setBinContent(2, j, endcap_cuts_temp[j - 2]);
     }
     me = iGetter.get("Pixel/Tracks/PixelTracksCut");
-    if(me) pixel_cuts_temp[0] = me->getIntValue();  
-    SummaryReportMap->setBinContent(1,7,pixel_cuts_temp[0]);
-    SummaryReportMap->setBinContent(2,7,pixel_cuts_temp[0]);
-  }//end of offline map
-  if(allmodsMap) allmodsMap->Clear();
-  if(goodmodsMap) goodmodsMap->Clear();
-  if(errmodsMap) errmodsMap->Clear();
+    if (me)
+      pixel_cuts_temp[0] = me->getIntValue();
+    SummaryReportMap->setBinContent(1, 7, pixel_cuts_temp[0]);
+    SummaryReportMap->setBinContent(2, 7, pixel_cuts_temp[0]);
+  }  // end of offline map
+  if (allmodsMap)
+    allmodsMap->Clear();
+  if (goodmodsMap)
+    goodmodsMap->Clear();
+  if (errmodsMap)
+    errmodsMap->Clear();
 }
 
 //**********************************************************************************************
-
diff --git a/DQM/SiPixelMonitorClient/src/SiPixelDcsInfo.cc b/DQM/SiPixelMonitorClient/src/SiPixelDcsInfo.cc
index 0dc4d5c33a424..be2c5ddcd74f5 100644
--- a/DQM/SiPixelMonitorClient/src/SiPixelDcsInfo.cc
+++ b/DQM/SiPixelMonitorClient/src/SiPixelDcsInfo.cc
@@ -1,39 +1,38 @@
 #include "DQM/SiPixelMonitorClient/interface/SiPixelDcsInfo.h"
 //#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
+#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
 #include "CondFormats/RunInfo/interface/RunInfo.h"
 #include "CondFormats/RunInfo/interface/RunSummary.h"
-#include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
 
 using namespace std;
 using namespace edm;
-SiPixelDcsInfo::SiPixelDcsInfo(const edm::ParameterSet& ps) {
- 
-  firstRun = true;
-}
+SiPixelDcsInfo::SiPixelDcsInfo(const edm::ParameterSet &ps) { firstRun = true; }
 
-SiPixelDcsInfo::~SiPixelDcsInfo(){}
+SiPixelDcsInfo::~SiPixelDcsInfo() {}
 
-void SiPixelDcsInfo::dqmEndLuminosityBlock(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter, const edm::LuminosityBlock&  lumiBlock, const  edm::EventSetup& iSetup){
-  
-  if (firstRun){
+void SiPixelDcsInfo::dqmEndLuminosityBlock(DQMStore::IBooker &iBooker,
+                                           DQMStore::IGetter &iGetter,
+                                           const edm::LuminosityBlock &lumiBlock,
+                                           const edm::EventSetup &iSetup) {
+  if (firstRun) {
     iBooker.setCurrentFolder("Pixel/EventInfo");
-    Fraction_= iBooker.bookFloat("DCSSummary");  
+    Fraction_ = iBooker.bookFloat("DCSSummary");
     iBooker.setCurrentFolder("Pixel/EventInfo/DCSContents");
-    FractionBarrel_= iBooker.bookFloat("PixelBarrelFraction");  
-    FractionEndcap_= iBooker.bookFloat("PixelEndcapFraction");  
+    FractionBarrel_ = iBooker.bookFloat("PixelBarrelFraction");
+    FractionEndcap_ = iBooker.bookFloat("PixelEndcapFraction");
   }
 
-  if(iSetup.tryToGet<RunInfoRcd>()) {
-      //all Pixel:
-      Fraction_->Fill(1.);
-      //Barrel:
-      FractionBarrel_->Fill(1.);
-      //Endcap:
-      FractionEndcap_->Fill(1.);
-    return; 
+  if (iSetup.tryToGet<RunInfoRcd>()) {
+    // all Pixel:
+    Fraction_->Fill(1.);
+    // Barrel:
+    FractionBarrel_->Fill(1.);
+    // Endcap:
+    FractionEndcap_->Fill(1.);
+    return;
   }
 }
 
-void SiPixelDcsInfo::dqmEndJob(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter){
-  //Nothing actually happened in the old endJob/endRun, so this is left empty.
+void SiPixelDcsInfo::dqmEndJob(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter) {
+  // Nothing actually happened in the old endJob/endRun, so this is left empty.
 }
diff --git a/DQM/SiPixelMonitorClient/src/SiPixelEDAClient.cc b/DQM/SiPixelMonitorClient/src/SiPixelEDAClient.cc
index 2107d16cb6138..5801b3a6e5855 100644
--- a/DQM/SiPixelMonitorClient/src/SiPixelEDAClient.cc
+++ b/DQM/SiPixelMonitorClient/src/SiPixelEDAClient.cc
@@ -1,47 +1,47 @@
 #include "DQM/SiPixelMonitorClient/interface/SiPixelEDAClient.h"
 
 // Framework
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/LuminosityBlock.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DataFormats/DetId/interface/DetId.h"
+#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
+#include "DataFormats/FEDRawData/interface/FEDRawData.h"
+#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 #include "DataFormats/GeometrySurface/interface/Surface.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
-#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
-#include "DataFormats/FEDRawData/interface/FEDRawData.h"
-#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
 
 #include "CondFormats/SiPixelObjects/interface/DetectorIndex.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h"
 
-#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
-#include "Geometry/CommonTopologies/interface/PixelTopology.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
 #include "DQM/SiPixelMonitorClient/interface/SiPixelActionExecutor.h"
-#include "DQM/SiPixelMonitorClient/interface/SiPixelInformationExtractor.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelDataQuality.h"
+#include "DQM/SiPixelMonitorClient/interface/SiPixelInformationExtractor.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelUtility.h"
 
-#include <iostream>
-#include <iomanip>
+#include <cmath>
 #include <cstdio>
-#include <string>
+#include <iomanip>
+#include <iostream>
 #include <sstream>
-#include <cmath>
+#include <string>
 
 #define BUF_SIZE 256
 
@@ -50,220 +50,234 @@ using namespace std;
 //
 // -- Constructor
 //
-SiPixelEDAClient::SiPixelEDAClient(const edm::ParameterSet& ps) {
-// cout<<"Entering  SiPixelEDAClient::SiPixelEDAClient: "<<endl;
- 
-  edm::LogInfo("SiPixelEDAClient") <<  " Creating SiPixelEDAClient " << "\n" ;
-  
-  summaryFrequency_      = ps.getUntrackedParameter<int>("SummaryCreationFrequency",20);
-  tkMapFrequency_        = ps.getUntrackedParameter<int>("TkMapCreationFrequency",50); 
-  staticUpdateFrequency_ = ps.getUntrackedParameter<int>("StaticUpdateFrequency",10);
-  actionOnLumiSec_       = ps.getUntrackedParameter<bool>("ActionOnLumiSection",false); //client
-  actionOnRunEnd_        = ps.getUntrackedParameter<bool>("ActionOnRunEnd",true); //client
-  evtOffsetForInit_      = ps.getUntrackedParameter<int>("EventOffsetForInit",10); //client
-  offlineXMLfile_        = ps.getUntrackedParameter<bool>("UseOfflineXMLFile",false); //client
-  hiRes_                 = ps.getUntrackedParameter<bool>("HighResolutionOccupancy",false); //client
-  noiseRate_             = ps.getUntrackedParameter<double>("NoiseRateCutValue",0.001); //client
-  noiseRateDenominator_  = ps.getUntrackedParameter<int>("NEventsForNoiseCalculation",100000); //client
-  Tier0Flag_             = ps.getUntrackedParameter<bool>("Tier0Flag",false); //client
-  doHitEfficiency_       = ps.getUntrackedParameter<bool>("DoHitEfficiency",true); //client
-  inputSource_           = ps.getUntrackedParameter<string>("inputSource",  "source");
-  isUpgrade_             = ps.getUntrackedParameter<bool>("isUpgrade",false); //client
-  
-  if(!Tier0Flag_){
+SiPixelEDAClient::SiPixelEDAClient(const edm::ParameterSet &ps) {
+  // cout<<"Entering  SiPixelEDAClient::SiPixelEDAClient: "<<endl;
+
+  edm::LogInfo("SiPixelEDAClient") << " Creating SiPixelEDAClient "
+                                   << "\n";
+
+  summaryFrequency_ = ps.getUntrackedParameter<int>("SummaryCreationFrequency", 20);
+  tkMapFrequency_ = ps.getUntrackedParameter<int>("TkMapCreationFrequency", 50);
+  staticUpdateFrequency_ = ps.getUntrackedParameter<int>("StaticUpdateFrequency", 10);
+  actionOnLumiSec_ = ps.getUntrackedParameter<bool>("ActionOnLumiSection", false);  // client
+  actionOnRunEnd_ = ps.getUntrackedParameter<bool>("ActionOnRunEnd", true);         // client
+  evtOffsetForInit_ = ps.getUntrackedParameter<int>("EventOffsetForInit", 10);      // client
+  offlineXMLfile_ = ps.getUntrackedParameter<bool>("UseOfflineXMLFile", false);     // client
+  hiRes_ = ps.getUntrackedParameter<bool>("HighResolutionOccupancy",
+                                          false);                                               // client
+  noiseRate_ = ps.getUntrackedParameter<double>("NoiseRateCutValue", 0.001);                    // client
+  noiseRateDenominator_ = ps.getUntrackedParameter<int>("NEventsForNoiseCalculation", 100000);  // client
+  Tier0Flag_ = ps.getUntrackedParameter<bool>("Tier0Flag", false);                              // client
+  doHitEfficiency_ = ps.getUntrackedParameter<bool>("DoHitEfficiency", true);                   // client
+  inputSource_ = ps.getUntrackedParameter<string>("inputSource", "source");
+  isUpgrade_ = ps.getUntrackedParameter<bool>("isUpgrade", false);  // client
+
+  if (!Tier0Flag_) {
     string localPath = string("DQM/SiPixelMonitorClient/test/loader.html");
     std::ifstream fin(edm::FileInPath(localPath).fullPath().c_str(), ios::in);
     char buf[BUF_SIZE];
-  
+
     if (!fin) {
-      cerr << "Input File: loader.html"<< " could not be opened!" << endl;
+      cerr << "Input File: loader.html"
+           << " could not be opened!" << endl;
       return;
     }
 
-    while (fin.getline(buf, BUF_SIZE, '\n')) { // pops off the newline character 
-      html_out_ << buf ;
+    while (fin.getline(buf, BUF_SIZE, '\n')) {  // pops off the newline character
+      html_out_ << buf;
     }
     fin.close();
-
   }
 
   firstLumi = true;
- 
-  //instantiate the three work horses of the client:
+
+  // instantiate the three work horses of the client:
   sipixelInformationExtractor_ = new SiPixelInformationExtractor(offlineXMLfile_);
   sipixelActionExecutor_ = new SiPixelActionExecutor(offlineXMLfile_, Tier0Flag_);
   sipixelDataQuality_ = new SiPixelDataQuality(offlineXMLfile_);
 
-   inputSourceToken_ = consumes<FEDRawDataCollection>(ps.getUntrackedParameter<string>("inputSource", "source")); 
-   // cout<<"...leaving  SiPixelEDAClient::SiPixelEDAClient. "<<endl;
+  inputSourceToken_ = consumes<FEDRawDataCollection>(ps.getUntrackedParameter<string>("inputSource", "source"));
+  // cout<<"...leaving  SiPixelEDAClient::SiPixelEDAClient. "<<endl;
 }
 
 //
 // -- Destructor
 //
-SiPixelEDAClient::~SiPixelEDAClient(){
-//  cout<<"Entering SiPixelEDAClient::~SiPixelEDAClient: "<<endl;
-  
-  edm::LogInfo("SiPixelEDAClient") <<  " Deleting SiPixelEDAClient " << "\n" ;
+SiPixelEDAClient::~SiPixelEDAClient() {
+  //  cout<<"Entering SiPixelEDAClient::~SiPixelEDAClient: "<<endl;
+
+  edm::LogInfo("SiPixelEDAClient") << " Deleting SiPixelEDAClient "
+                                   << "\n";
 
   if (sipixelInformationExtractor_) {
-     delete sipixelInformationExtractor_;
-     sipixelInformationExtractor_ = nullptr;
+    delete sipixelInformationExtractor_;
+    sipixelInformationExtractor_ = nullptr;
   }
   if (sipixelActionExecutor_) {
-     delete sipixelActionExecutor_;
-     sipixelActionExecutor_ = nullptr;
+    delete sipixelActionExecutor_;
+    sipixelActionExecutor_ = nullptr;
   }
   if (sipixelDataQuality_) {
-     delete sipixelDataQuality_;
-     sipixelDataQuality_ = nullptr;
+    delete sipixelDataQuality_;
+    sipixelDataQuality_ = nullptr;
   }
 
-//  cout<<"...leaving SiPixelEDAClient::~SiPixelEDAClient. "<<endl;
+  //  cout<<"...leaving SiPixelEDAClient::~SiPixelEDAClient. "<<endl;
 }
 //
 // -- Begin Run
 //
-void SiPixelEDAClient::beginRun(Run const& run, edm::EventSetup const& eSetup) {
-  edm::LogInfo ("SiPixelEDAClient") <<"[SiPixelEDAClient]: Begining of Run";
-//  cout<<"Entering SiPixelEDAClient::beginRun: "<<endl;
+void SiPixelEDAClient::beginRun(Run const &run, edm::EventSetup const &eSetup) {
+  edm::LogInfo("SiPixelEDAClient") << "[SiPixelEDAClient]: Begining of Run";
+  //  cout<<"Entering SiPixelEDAClient::beginRun: "<<endl;
 
-  ///cout << "-----------NEW RUN---------------" << endl;
+  /// cout << "-----------NEW RUN---------------" << endl;
 
-  if(firstLumi){
-    
+  if (firstLumi) {
     summaryFrequency_ = -1;
     tkMapFrequency_ = -1;
     actionOnRunEnd_ = true;
     evtOffsetForInit_ = -1;
 
     nLumiSecs_ = 0;
-    nEvents_   = 0;
-    if(Tier0Flag_) nFEDs_ = 40;
-    else nFEDs_ = 0;
-    
+    nEvents_ = 0;
+    if (Tier0Flag_)
+      nFEDs_ = 40;
+    else
+      nFEDs_ = 0;
   }
 
-//  cout<<"...leaving SiPixelEDAClient::beginRun. "<<endl;
-
+  //  cout<<"...leaving SiPixelEDAClient::beginRun. "<<endl;
 }
 
-  
-
-
 //
 // -- End Luminosity Block
 //
-void SiPixelEDAClient::dqmEndLuminosityBlock(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter, edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& eSetup) {
-  //cout<<"Entering SiPixelEDAClient::endLuminosityBlock: "<<endl;
-
-  edm::LogInfo ("SiPixelEDAClient") <<"[SiPixelEDAClient]: Begin of LS transition";
-
-  //Moved from beginLumi
-  nEvents_lastLS_=0; nErrorsBarrel_lastLS_=0; nErrorsEndcap_lastLS_=0;
-  MonitorElement * me = iGetter.get("Pixel/AdditionalPixelErrors/byLumiErrors");
-  if(me){
+void SiPixelEDAClient::dqmEndLuminosityBlock(DQMStore::IBooker &iBooker,
+                                             DQMStore::IGetter &iGetter,
+                                             edm::LuminosityBlock const &lumiSeg,
+                                             edm::EventSetup const &eSetup) {
+  // cout<<"Entering SiPixelEDAClient::endLuminosityBlock: "<<endl;
+
+  edm::LogInfo("SiPixelEDAClient") << "[SiPixelEDAClient]: Begin of LS transition";
+
+  // Moved from beginLumi
+  nEvents_lastLS_ = 0;
+  nErrorsBarrel_lastLS_ = 0;
+  nErrorsEndcap_lastLS_ = 0;
+  MonitorElement *me = iGetter.get("Pixel/AdditionalPixelErrors/byLumiErrors");
+  if (me) {
     nEvents_lastLS_ = int(me->getBinContent(0));
     nErrorsBarrel_lastLS_ = int(me->getBinContent(1));
     nErrorsEndcap_lastLS_ = int(me->getBinContent(2));
     me->Reset();
   }
 
-  ///std::cout << "CREATING SUMMARY" << std::endl;
-  sipixelActionExecutor_->createSummary(iBooker,iGetter, isUpgrade_);
+  /// std::cout << "CREATING SUMMARY" << std::endl;
+  sipixelActionExecutor_->createSummary(iBooker, iGetter, isUpgrade_);
 
-  if (firstLumi){
+  if (firstLumi) {
     iBooker.setCurrentFolder("Pixel/");
     iGetter.setCurrentFolder("Pixel/");
     // Creating Summary Histos:
-    //std::cout << "CREATING SUMMARY" << std::endl;
-    //sipixelActionExecutor_->createSummary(iBooker,iGetter, isUpgrade_);
+    // std::cout << "CREATING SUMMARY" << std::endl;
+    // sipixelActionExecutor_->createSummary(iBooker,iGetter, isUpgrade_);
     // Booking Deviation Histos:
-    if(!Tier0Flag_) sipixelActionExecutor_->bookDeviations(iBooker, isUpgrade_);
+    if (!Tier0Flag_)
+      sipixelActionExecutor_->bookDeviations(iBooker, isUpgrade_);
     // Booking Efficiency Histos:
-    if(doHitEfficiency_) sipixelActionExecutor_->bookEfficiency(iBooker, isUpgrade_);
+    if (doHitEfficiency_)
+      sipixelActionExecutor_->bookEfficiency(iBooker, isUpgrade_);
     // Creating occupancy plots:
     sipixelActionExecutor_->bookOccupancyPlots(iBooker, iGetter, hiRes_);
-  // Booking noisy pixel ME's:
-    if(noiseRate_>0.) sipixelInformationExtractor_->bookNoisyPixels(iBooker, noiseRate_, Tier0Flag_);
+    // Booking noisy pixel ME's:
+    if (noiseRate_ > 0.)
+      sipixelInformationExtractor_->bookNoisyPixels(iBooker, noiseRate_, Tier0Flag_);
     // Booking summary report ME's:
     sipixelDataQuality_->bookGlobalQualityFlag(iBooker, Tier0Flag_, nFEDs_);
 
-    if(!Tier0Flag_){
-      MonitorElement * mefed = iGetter.get("Pixel/EventInfo/DAQContents/fedcounter");
-      if(mefed){ for (int i = 0; i < mefed->getNbinsX(); ++i) nFEDs_ += mefed->getBinContent(i+1);}
+    if (!Tier0Flag_) {
+      MonitorElement *mefed = iGetter.get("Pixel/EventInfo/DAQContents/fedcounter");
+      if (mefed) {
+        for (int i = 0; i < mefed->getNbinsX(); ++i)
+          nFEDs_ += mefed->getBinContent(i + 1);
+      }
     }
     eSetup.get<SiPixelFedCablingMapRcd>().get(theCablingMap);
 
     firstLumi = false;
   }
 
-  edm::LogInfo ("SiPixelEDAClient") <<"[SiPixelEDAClient]: End of LS transition, performing the DQM client operation";
+  edm::LogInfo("SiPixelEDAClient") << "[SiPixelEDAClient]: End of LS transition, performing the DQM client "
+                                      "operation";
   //
-  nLumiSecs_ = lumiSeg.id().luminosityBlock() ;
+  nLumiSecs_ = lumiSeg.id().luminosityBlock();
 
-  ///std::cout << "NEW LUMISECTION n " << nLumiSecs_ << std::endl;
-  //nLumiSecs_++;
-  
-  edm::LogInfo("SiPixelEDAClient") << "====================================================== " << endl << " ===> Iteration # " << nLumiSecs_ << " " << lumiSeg.luminosityBlock() << endl  << "====================================================== " << endl;
+  /// std::cout << "NEW LUMISECTION n " << nLumiSecs_ << std::endl;
+  // nLumiSecs_++;
 
-  if(Tier0Flag_) sipixelActionExecutor_->normaliseAvDigiOccVsLumi(iBooker,iGetter,nLumiSecs_);
+  edm::LogInfo("SiPixelEDAClient") << "====================================================== " << endl
+                                   << " ===> Iteration # " << nLumiSecs_ << " " << lumiSeg.luminosityBlock() << endl
+                                   << "====================================================== " << endl;
 
-  bool init=true;  
-  if(actionOnLumiSec_ && nLumiSecs_ % 1 == 0 ){
+  if (Tier0Flag_)
+    sipixelActionExecutor_->normaliseAvDigiOccVsLumi(iBooker, iGetter, nLumiSecs_);
 
-    if(doHitEfficiency_) sipixelActionExecutor_->createEfficiency(iBooker, iGetter, isUpgrade_);
-    sipixelActionExecutor_->createOccupancy(iBooker,iGetter);
+  bool init = true;
+  if (actionOnLumiSec_ && nLumiSecs_ % 1 == 0) {
+    if (doHitEfficiency_)
+      sipixelActionExecutor_->createEfficiency(iBooker, iGetter, isUpgrade_);
+    sipixelActionExecutor_->createOccupancy(iBooker, iGetter);
     iBooker.cd();
     iGetter.cd();
-    sipixelDataQuality_->computeGlobalQualityFlagByLumi(iGetter,init,nFEDs_,Tier0Flag_,nEvents_lastLS_,nErrorsBarrel_lastLS_,nErrorsEndcap_lastLS_);
-    init=true;
+    sipixelDataQuality_->computeGlobalQualityFlagByLumi(
+        iGetter, init, nFEDs_, Tier0Flag_, nEvents_lastLS_, nErrorsBarrel_lastLS_, nErrorsEndcap_lastLS_);
+    init = true;
     iBooker.cd();
     iGetter.cd();
-    sipixelDataQuality_->fillGlobalQualityPlot(iBooker,iGetter,init,theCablingMap,nFEDs_,Tier0Flag_,nLumiSecs_);
-    init=true;
-    if(noiseRate_>=0.) sipixelInformationExtractor_->findNoisyPixels(iBooker, iGetter, init, noiseRate_, noiseRateDenominator_, theCablingMap);
-  }   
-
-  
-         
-  //cout<<"...leaving SiPixelEDAClient::endLuminosityBlock. "<<endl;
+    sipixelDataQuality_->fillGlobalQualityPlot(iBooker, iGetter, init, theCablingMap, nFEDs_, Tier0Flag_, nLumiSecs_);
+    init = true;
+    if (noiseRate_ >= 0.)
+      sipixelInformationExtractor_->findNoisyPixels(
+          iBooker, iGetter, init, noiseRate_, noiseRateDenominator_, theCablingMap);
+  }
+
+  // cout<<"...leaving SiPixelEDAClient::endLuminosityBlock. "<<endl;
 }
 //
 // -- End Job
 //
-void SiPixelEDAClient::dqmEndJob(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter){
-//  cout<<"In SiPixelEDAClient::endJob "<<endl;
-  edm::LogInfo("SiPixelEDAClient") <<"[SiPixelEDAClient]: endjob called!";
-  ///cout << "[SiPixelEDAClient]: endjob called!" << endl;
- sipixelActionExecutor_->createSummary(iBooker, iGetter, isUpgrade_);
-
-  if(actionOnRunEnd_){
+void SiPixelEDAClient::dqmEndJob(DQMStore::IBooker &iBooker, DQMStore::IGetter &iGetter) {
+  //  cout<<"In SiPixelEDAClient::endJob "<<endl;
+  edm::LogInfo("SiPixelEDAClient") << "[SiPixelEDAClient]: endjob called!";
+  /// cout << "[SiPixelEDAClient]: endjob called!" << endl;
+  sipixelActionExecutor_->createSummary(iBooker, iGetter, isUpgrade_);
 
-    //sipixelActionExecutor_->createSummary(iBooker, iGetter, isUpgrade_);
+  if (actionOnRunEnd_) {
+    // sipixelActionExecutor_->createSummary(iBooker, iGetter, isUpgrade_);
 
-    if(doHitEfficiency_) {
-      sipixelActionExecutor_->createEfficiency(iBooker,iGetter, isUpgrade_);
+    if (doHitEfficiency_) {
+      sipixelActionExecutor_->createEfficiency(iBooker, iGetter, isUpgrade_);
       sipixelActionExecutor_->fillEfficiencySummary(iBooker, iGetter);
     }
 
-    sipixelActionExecutor_->createOccupancy(iBooker,iGetter);
+    sipixelActionExecutor_->createOccupancy(iBooker, iGetter);
 
-    if(Tier0Flag_) sipixelActionExecutor_->normaliseAvDigiOcc(iBooker,iGetter);
+    if (Tier0Flag_)
+      sipixelActionExecutor_->normaliseAvDigiOcc(iBooker, iGetter);
 
     iBooker.cd();
     iGetter.cd();
-    bool init=true;
-    sipixelDataQuality_->computeGlobalQualityFlag(iBooker,iGetter,init,nFEDs_,Tier0Flag_);
-    init=true;
+    bool init = true;
+    sipixelDataQuality_->computeGlobalQualityFlag(iBooker, iGetter, init, nFEDs_, Tier0Flag_);
+    init = true;
     iBooker.cd();
     iGetter.cd();
 
-    sipixelDataQuality_->fillGlobalQualityPlot(iBooker,iGetter,init,theCablingMap,nFEDs_,Tier0Flag_,nLumiSecs_);
-    init=true;
-    if(noiseRate_>=0.) sipixelInformationExtractor_->findNoisyPixels(iBooker,iGetter, init, noiseRate_, noiseRateDenominator_, theCablingMap);
+    sipixelDataQuality_->fillGlobalQualityPlot(iBooker, iGetter, init, theCablingMap, nFEDs_, Tier0Flag_, nLumiSecs_);
+    init = true;
+    if (noiseRate_ >= 0.)
+      sipixelInformationExtractor_->findNoisyPixels(
+          iBooker, iGetter, init, noiseRate_, noiseRateDenominator_, theCablingMap);
   }
-  
-
-
 }
diff --git a/DQM/SiPixelMonitorClient/src/SiPixelInformationExtractor.cc b/DQM/SiPixelMonitorClient/src/SiPixelInformationExtractor.cc
index 372e8ddfcf802..44680fd749bac 100644
--- a/DQM/SiPixelMonitorClient/src/SiPixelInformationExtractor.cc
+++ b/DQM/SiPixelMonitorClient/src/SiPixelInformationExtractor.cc
@@ -1,20 +1,20 @@
 /*! \file SiPixelInformationExtractor.cc
  *  \brief This class represents ...
- *  
+ *
  *  (Documentation under development)
- *  
+ *
  */
+#include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h"
+#include "DQM/SiPixelMonitorClient/interface/ANSIColors.h"
+#include "DQM/SiPixelMonitorClient/interface/SiPixelEDAClient.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelInformationExtractor.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelUtility.h"
-#include "DQM/SiPixelMonitorClient/interface/SiPixelEDAClient.h"
-#include "DQM/SiPixelMonitorClient/interface/ANSIColors.h"
-#include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-#include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/FileInPath.h"
 
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/GeometrySurface/interface/Surface.h"
@@ -27,96 +27,91 @@
 #include "CondFormats/SiPixelObjects/interface/DetectorIndex.h"
 #include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h"
 
-#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
-#include "Geometry/CommonTopologies/interface/PixelTopology.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
 
+#include "Rtypes.h"
+#include "TAxis.h"
 #include "TClass.h"
-#include "TText.h"
-#include "TROOT.h"
-#include "TPad.h"
-#include "TStyle.h"
-#include "TSystem.h"
-#include "TString.h"
+#include "TH1F.h"
+#include "TH2F.h"
 #include "TImage.h"
-#include "TPaveText.h"
 #include "TImageDump.h"
-#include "TRandom.h"
-#include "TStopwatch.h"
-#include "TAxis.h"
+#include "TPad.h"
 #include "TPaveLabel.h"
-#include "Rtypes.h"
-#include "TH1F.h"
-#include "TH2F.h"
+#include "TPaveText.h"
 #include "TProfile.h"
+#include "TROOT.h"
+#include "TRandom.h"
+#include "TStopwatch.h"
+#include "TString.h"
+#include "TStyle.h"
+#include "TSystem.h"
+#include "TText.h"
 
-#include <iostream>
 #include <cmath>
+#include <iostream>
 #include <map>
 
-#include <cstdlib> // for free() - Root can allocate with malloc() - sigh...
- 
+#include <cstdlib>  // for free() - Root can allocate with malloc() - sigh...
+
 using namespace std;
 using namespace edm;
 
 //------------------------------------------------------------------------------
 /*! \brief Constructor of the SiPixelInformationExtractor class.
- *  
+ *
  */
 SiPixelInformationExtractor::SiPixelInformationExtractor(bool offlineXMLfile) : offlineXMLfile_(offlineXMLfile) {
-  edm::LogInfo("SiPixelInformationExtractor") << 
-    " Creating SiPixelInformationExtractor " << "\n" ;
-  
+  edm::LogInfo("SiPixelInformationExtractor") << " Creating SiPixelInformationExtractor "
+                                              << "\n";
+
   readReference_ = false;
 }
 
 //------------------------------------------------------------------------------
 /*! \brief Destructor of the SiPixelInformationExtractor class.
- *  
+ *
  */
 SiPixelInformationExtractor::~SiPixelInformationExtractor() {
-  edm::LogInfo("SiPixelInformationExtractor") << 
-    " Deleting SiPixelInformationExtractor " << "\n" ;
-  
+  edm::LogInfo("SiPixelInformationExtractor") << " Deleting SiPixelInformationExtractor "
+                                              << "\n";
 }
 
 //------------------------------------------------------------------------------
 /*! \brief Read Configuration File
  *
  */
-void SiPixelInformationExtractor::readConfiguration() { }
-
+void SiPixelInformationExtractor::readConfiguration() {}
 
 //============================================================================================================
 // --  Return type of ME
 //
-std::string  SiPixelInformationExtractor::getMEType(MonitorElement * theMe)
-{
-  string qtype = theMe->getRootObject()->IsA()->GetName() ;
-  if(         qtype.find("TH1") != string::npos )
-  {
-    return "TH1" ;
-  } else if ( qtype.find("TH2") != string::npos  ) {
-    return "TH2" ;
-  } else if ( qtype.find("TH3") != string::npos ) {
-    return "TH3" ;
+std::string SiPixelInformationExtractor::getMEType(MonitorElement *theMe) {
+  string qtype = theMe->getRootObject()->IsA()->GetName();
+  if (qtype.find("TH1") != string::npos) {
+    return "TH1";
+  } else if (qtype.find("TH2") != string::npos) {
+    return "TH2";
+  } else if (qtype.find("TH3") != string::npos) {
+    return "TH3";
   }
-  return "TH1" ;
+  return "TH1";
 }
 
 //------------------------------------------------------------------------------
 /*! \brief (Documentation under construction).
  *
- *  This method 
+ *  This method
  */
-void SiPixelInformationExtractor::getItemList(const multimap<string, string>& req_map, 
+void SiPixelInformationExtractor::getItemList(const multimap<string, string> &req_map,
                                               string item_name,
-					      vector<string>& items) {
+                                              vector<string> &items) {
   items.clear();
-  for (multimap<string, string>::const_iterator it = req_map.begin();
-       it != req_map.end(); it++) {
+  for (multimap<string, string>::const_iterator it = req_map.begin(); it != req_map.end(); it++) {
     if (it->first == item_name) {
       items.push_back(it->second);
     }
@@ -126,32 +121,32 @@ void SiPixelInformationExtractor::getItemList(const multimap<string, string>& re
 //------------------------------------------------------------------------------
 /*! \brief (Documentation under construction).
  *
- *  This method 
+ *  This method
  */
-bool SiPixelInformationExtractor::hasItem(multimap<string,string>& req_map,
-					  string item_name){
-  multimap<string,string>::iterator pos = req_map.find(item_name);
-  if (pos != req_map.end()) return true;
-  return false;  
+bool SiPixelInformationExtractor::hasItem(multimap<string, string> &req_map, string item_name) {
+  multimap<string, string>::iterator pos = req_map.find(item_name);
+  if (pos != req_map.end())
+    return true;
+  return false;
 }
 
 //------------------------------------------------------------------------------
 /*! \brief (Documentation under construction).
  *
- *  This method 
+ *  This method
  */
-std::string SiPixelInformationExtractor::getItemValue(const std::multimap<std::string,std::string>& req_map,
-						 std::string item_name){
-  std::multimap<std::string,std::string>::const_iterator pos = req_map.find(item_name);
+std::string SiPixelInformationExtractor::getItemValue(const std::multimap<std::string, std::string> &req_map,
+                                                      std::string item_name) {
+  std::multimap<std::string, std::string>::const_iterator pos = req_map.find(item_name);
   std::string value = " ";
   if (pos != req_map.end()) {
     value = pos->second;
   }
   return value;
 }
-std::string SiPixelInformationExtractor::getItemValue(std::multimap<std::string,std::string>& req_map,
-						 std::string item_name){
-  std::multimap<std::string,std::string>::iterator pos = req_map.find(item_name);
+std::string SiPixelInformationExtractor::getItemValue(std::multimap<std::string, std::string> &req_map,
+                                                      std::string item_name) {
+  std::multimap<std::string, std::string>::iterator pos = req_map.find(item_name);
   std::string value = " ";
   if (pos != req_map.end()) {
     value = pos->second;
@@ -162,199 +157,203 @@ std::string SiPixelInformationExtractor::getItemValue(std::multimap<std::string,
 //
 // -- Get color  name from status
 //
-void SiPixelInformationExtractor::selectColor(string& col, int status){
-  if (status == dqm::qstatus::STATUS_OK)    col = "#00ff00";
-  else if (status == dqm::qstatus::WARNING) col = "#ffff00";
-  else if (status == dqm::qstatus::ERROR)   col = "#ff0000";
-  else if (status == dqm::qstatus::OTHER)   col = "#ffa500";
-  else  col = "#0000ff";
+void SiPixelInformationExtractor::selectColor(string &col, int status) {
+  if (status == dqm::qstatus::STATUS_OK)
+    col = "#00ff00";
+  else if (status == dqm::qstatus::WARNING)
+    col = "#ffff00";
+  else if (status == dqm::qstatus::ERROR)
+    col = "#ff0000";
+  else if (status == dqm::qstatus::OTHER)
+    col = "#ffa500";
+  else
+    col = "#0000ff";
 }
 //
 // -- Get Image name from ME
 //
-void SiPixelInformationExtractor::selectColor(string& col, vector<QReport*>& reports){
+void SiPixelInformationExtractor::selectColor(string &col, vector<QReport *> &reports) {
   int istat = 999;
   int status = 0;
-  for (vector<QReport*>::const_iterator it = reports.begin(); it != reports.end();
-       it++) {
+  for (vector<QReport *>::const_iterator it = reports.begin(); it != reports.end(); it++) {
     status = (*it)->getStatus();
-    if (status > istat) istat = status;
+    if (status > istat)
+      istat = status;
   }
   selectColor(col, status);
 }
 //
 // -- Get Image name from status
 //
-void SiPixelInformationExtractor::selectImage(string& name, int status){
-  if (status == dqm::qstatus::STATUS_OK) name="images/LI_green.gif";
-  else if (status == dqm::qstatus::WARNING) name="images/LI_yellow.gif";
-  else if (status == dqm::qstatus::ERROR) name="images/LI_red.gif";
-  else if (status == dqm::qstatus::OTHER) name="images/LI_orange.gif";
-  else  name="images/LI_blue.gif";
+void SiPixelInformationExtractor::selectImage(string &name, int status) {
+  if (status == dqm::qstatus::STATUS_OK)
+    name = "images/LI_green.gif";
+  else if (status == dqm::qstatus::WARNING)
+    name = "images/LI_yellow.gif";
+  else if (status == dqm::qstatus::ERROR)
+    name = "images/LI_red.gif";
+  else if (status == dqm::qstatus::OTHER)
+    name = "images/LI_orange.gif";
+  else
+    name = "images/LI_blue.gif";
 }
 //
 // -- Get Image name from ME
 //
-void SiPixelInformationExtractor::selectImage(string& name, vector<QReport*>& reports){
+void SiPixelInformationExtractor::selectImage(string &name, vector<QReport *> &reports) {
   int istat = 999;
   int status = 0;
-  for (vector<QReport*>::const_iterator it = reports.begin(); it != reports.end();
-       it++) {
+  for (vector<QReport *>::const_iterator it = reports.begin(); it != reports.end(); it++) {
     status = (*it)->getStatus();
-    if (status > istat) istat = status;
+    if (status > istat)
+      istat = status;
   }
   selectImage(name, status);
 }
 
 //------------------------------------------------------------------------------
 /*! \brief (Documentation under construction).
- *  
+ *
  */
-void SiPixelInformationExtractor::computeStatus(MonitorElement      * theME,
-                                                double              & colorValue,
-						pair<double,double> & norm) 
-{
-  double normalizationX = 1 ;
-  double normalizationY = 1 ;
-  double meanX          = 0 ;
-  double meanY          = 0 ;
-  
-  colorValue = 0 ;
-
-  pair<double,double> normX ;
-  pair<double,double> normY ;
-
-  string theMEType = getMEType(theME) ;
-
-  if( theMEType.find("TH1") != string::npos)
-  {
-   meanX = (double)theME->getMean();
-   getNormalization(theME, normX, "TH1") ;
-   normalizationX = fabs( normX.second - normX.first) ;
-   if( normalizationX == 0 ) {normalizationX=1.E-20;}
-   colorValue  = meanX / normalizationX ;
-   norm.first  = normX.first ;
-   norm.second = normX.second ;
+void SiPixelInformationExtractor::computeStatus(MonitorElement *theME, double &colorValue, pair<double, double> &norm) {
+  double normalizationX = 1;
+  double normalizationY = 1;
+  double meanX = 0;
+  double meanY = 0;
+
+  colorValue = 0;
+
+  pair<double, double> normX;
+  pair<double, double> normY;
+
+  string theMEType = getMEType(theME);
+
+  if (theMEType.find("TH1") != string::npos) {
+    meanX = (double)theME->getMean();
+    getNormalization(theME, normX, "TH1");
+    normalizationX = fabs(normX.second - normX.first);
+    if (normalizationX == 0) {
+      normalizationX = 1.E-20;
+    }
+    colorValue = meanX / normalizationX;
+    norm.first = normX.first;
+    norm.second = normX.second;
+  }
+
+  if (theMEType.find("TH2") != string::npos) {
+    meanX = (double)theME->getMean(1);
+    meanY = (double)theME->getMean(2);
+    getNormalization2D(theME, normX, normY, "TH2");
+    normalizationX = fabs(normX.second - normX.first);
+    normalizationY = fabs(normY.second - normY.first);
+    if (normalizationX == 0) {
+      normalizationX = 1.E-20;
+    }
+    if (normalizationY == 0) {
+      normalizationY = 1.E-20;
+    }
+    double cVX = meanX / normalizationX;
+    double cVY = meanY / normalizationY;
+    colorValue = sqrt(cVX * cVX + cVY * cVY);
+    if (normalizationX >= normalizationY) {
+      norm.first = normX.first;
+      norm.second = normX.second;
+    } else {
+      norm.first = normY.first;
+      norm.second = normY.second;
+    }
   }
-  
-  if( theMEType.find("TH2") != string::npos)
-  {
-   meanX = (double)theME->getMean(1);
-   meanY = (double)theME->getMean(2);
-   getNormalization2D(theME, normX, normY, "TH2") ;
-   normalizationX = fabs( normX.second - normX.first) ;
-   normalizationY = fabs( normY.second - normY.first) ;
-   if( normalizationX == 0 ) {normalizationX=1.E-20;}
-   if( normalizationY == 0 ) {normalizationY=1.E-20;}
-   double cVX = meanX / normalizationX ;
-   double cVY = meanY / normalizationY ;
-   colorValue = sqrt(cVX*cVX + cVY*cVY) ;
-   if( normalizationX >= normalizationY )
-   { 
-    norm.first  = normX.first;
-    norm.second = normX.second ;
-   } else { 
-    norm.first  = normY.first;
-    norm.second = normY.second ;
-   }
-  } 
- 
-  return ;
+
+  return;
 }
 
 //------------------------------------------------------------------------------
 /*! \brief (Documentation under construction).
- *  
+ *
  */
-void SiPixelInformationExtractor::getNormalization(MonitorElement     * theME, 
-                                                   pair<double,double>& norm,
-						   std::string          theMEType) 
-{
-  double normLow  = 0 ;
-  double normHigh = 0 ;
-
-  if( theMEType.find("TH1") != string::npos)
-  {
-   normHigh    = (double)theME->getNbinsX() ;
-   norm.first  = normLow  ;
-   norm.second = normHigh ;
+void SiPixelInformationExtractor::getNormalization(MonitorElement *theME,
+                                                   pair<double, double> &norm,
+                                                   std::string theMEType) {
+  double normLow = 0;
+  double normHigh = 0;
+
+  if (theMEType.find("TH1") != string::npos) {
+    normHigh = (double)theME->getNbinsX();
+    norm.first = normLow;
+    norm.second = normHigh;
   }
 }
 
 //------------------------------------------------------------------------------
 /*! \brief (Documentation under construction).
- *  
+ *
  */
-void SiPixelInformationExtractor::getNormalization2D(MonitorElement     * theME, 
-                                                     pair<double,double>& normX,
-                                                     pair<double,double>& normY,
-						     std::string          theMEType) 
-{
-  double normLow  = 0 ;
-  double normHigh = 0 ;
-
-  if( theMEType.find("TH2") != string::npos )
-  {
-   normHigh    = (double)theME->getNbinsX() ;
-   normX.first  = normLow  ;
-   normX.second = normHigh ;
-   normHigh    = (double)theME->getNbinsY() ;
-   normY.first  = normLow  ;
-   normY.second = normHigh ;
+void SiPixelInformationExtractor::getNormalization2D(MonitorElement *theME,
+                                                     pair<double, double> &normX,
+                                                     pair<double, double> &normY,
+                                                     std::string theMEType) {
+  double normLow = 0;
+  double normHigh = 0;
+
+  if (theMEType.find("TH2") != string::npos) {
+    normHigh = (double)theME->getNbinsX();
+    normX.first = normLow;
+    normX.second = normHigh;
+    normHigh = (double)theME->getNbinsY();
+    normY.first = normLow;
+    normY.second = normHigh;
   }
 }
 
 //------------------------------------------------------------------------------
 /*! \brief (Documentation under construction).
- *  
- *  Given a pointer to ME returns the associated detId 
+ *
+ *  Given a pointer to ME returns the associated detId
  */
-int SiPixelInformationExtractor::getDetId(MonitorElement * mE) 
-{
- const string& mEName = mE->getName();
-
- int detId = 0;
- 
- if( mEName.find("_3") != string::npos )
- {
-  string detIdString = mEName.substr((mEName.find_last_of("_"))+1,9);
-  std::istringstream isst;
-  isst.str(detIdString);
-  isst>>detId;
- }
-  return detId ;
-  
+int SiPixelInformationExtractor::getDetId(MonitorElement *mE) {
+  const string &mEName = mE->getName();
+
+  int detId = 0;
+
+  if (mEName.find("_3") != string::npos) {
+    string detIdString = mEName.substr((mEName.find_last_of("_")) + 1, 9);
+    std::istringstream isst;
+    isst.str(detIdString);
+    isst >> detId;
+  }
+  return detId;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SiPixelInformationExtractor::bookNoisyPixels(DQMStore::IBooker & iBooker, float noiseRate_,bool Tier0Flag) {
-//std::cout<<"BOOK NOISY PIXEL MEs!"<<std::endl;
+void SiPixelInformationExtractor::bookNoisyPixels(DQMStore::IBooker &iBooker, float noiseRate_, bool Tier0Flag) {
+  // std::cout<<"BOOK NOISY PIXEL MEs!"<<std::endl;
   iBooker.cd();
-  if(noiseRate_>=0.){
+  if (noiseRate_ >= 0.) {
     iBooker.setCurrentFolder("Pixel/Barrel");
-    EventRateBarrelPixels = iBooker.book1D("barrelEventRate","Digi event rate for all Barrel pixels",1000,0.,0.01);
-    EventRateBarrelPixels->setAxisTitle("Event Rate",1);
-    EventRateBarrelPixels->setAxisTitle("Number of Pixels",2);
-    iBooker.cd();  
+    EventRateBarrelPixels = iBooker.book1D("barrelEventRate", "Digi event rate for all Barrel pixels", 1000, 0., 0.01);
+    EventRateBarrelPixels->setAxisTitle("Event Rate", 1);
+    EventRateBarrelPixels->setAxisTitle("Number of Pixels", 2);
+    iBooker.cd();
     iBooker.setCurrentFolder("Pixel/Endcap");
-    EventRateEndcapPixels = iBooker.book1D("endcapEventRate","Digi event rate for all Endcap pixels",1000,0.,0.01);
-    EventRateEndcapPixels->setAxisTitle("Event Rate",1);
-    EventRateEndcapPixels->setAxisTitle("Number of Pixels",2);
+    EventRateEndcapPixels = iBooker.book1D("endcapEventRate", "Digi event rate for all Endcap pixels", 1000, 0., 0.01);
+    EventRateEndcapPixels->setAxisTitle("Event Rate", 1);
+    EventRateEndcapPixels->setAxisTitle("Number of Pixels", 2);
   }
 }
 
-          
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-void SiPixelInformationExtractor::findNoisyPixels(DQMStore::IBooker & iBooker, DQMStore::IGetter & iGetter, bool init, float noiseRate_, int noiseRateDenominator_, edm::ESHandle<SiPixelFedCablingMap> theCablingMap)
-{
-
-  
-  if(init){
-    endOfModules_=false;
-    nevents_=noiseRateDenominator_;
-    if(nevents_ == -1){
+void SiPixelInformationExtractor::findNoisyPixels(DQMStore::IBooker &iBooker,
+                                                  DQMStore::IGetter &iGetter,
+                                                  bool init,
+                                                  float noiseRate_,
+                                                  int noiseRateDenominator_,
+                                                  edm::ESHandle<SiPixelFedCablingMap> theCablingMap) {
+  if (init) {
+    endOfModules_ = false;
+    nevents_ = noiseRateDenominator_;
+    if (nevents_ == -1) {
       iBooker.cd();
       iGetter.cd();
       iBooker.setCurrentFolder("Pixel/EventInfo");
@@ -363,68 +362,74 @@ void SiPixelInformationExtractor::findNoisyPixels(DQMStore::IBooker & iBooker, D
     }
     iBooker.cd();
     iGetter.cd();
-    myfile_.open ("NoisyPixelList.txt", ios::app);
-    myfile_ << "Noise summary, ran over " << nevents_ << " events, threshold was set to " << noiseRate_ <<  std::endl;
+    myfile_.open("NoisyPixelList.txt", ios::app);
+    myfile_ << "Noise summary, ran over " << nevents_ << " events, threshold was set to " << noiseRate_ << std::endl;
   }
   string currDir = iBooker.pwd();
-  string dname = currDir.substr(currDir.find_last_of("/")+1);
+  string dname = currDir.substr(currDir.find_last_of("/") + 1);
 
-
-  if(dname.find("Module_")!=string::npos){
+  if (dname.find("Module_") != string::npos) {
     vector<string> meVec = iGetter.getMEs();
     for (vector<string>::const_iterator it = meVec.begin(); it != meVec.end(); it++) {
       string full_path = currDir + "/" + (*it);
-      if(full_path.find("hitmap_siPixelDigis")!=string::npos){
-        MonitorElement * me = iGetter.get(full_path);
-        if (!me) continue;
-	int detid=getDetId(me); int pixcol=-1; int pixrow=-1; 
-	std::vector<std::pair<std::pair<int, int>, float> > noisyPixelsInModule;
-	TH2F * hothisto = me->getTH2F();
-	if(hothisto){
-	  for(int i=1; i!=hothisto->GetNbinsX()+1; i++){
-	    for(int j=1; j!=hothisto->GetNbinsY()+1; j++){
-	      float value = (hothisto->GetBinContent(i,j))/float(nevents_);
-	      if(me->getPathname().find("Barrel")!=string::npos){
-        	EventRateBarrelPixels = iGetter.get("Pixel/Barrel/barrelEventRate");
-        	if(EventRateBarrelPixels) EventRateBarrelPixels->Fill(value);
-	      }else if(me->getPathname().find("Endcap")!=string::npos){
-        	EventRateEndcapPixels = iGetter.get("Pixel/Endcap/endcapEventRate");
-        	if(EventRateEndcapPixels) EventRateEndcapPixels->Fill(value);
-	      }
-	      if(value > noiseRate_){
-	        pixcol = i-1;
-	        pixrow = j-1;
- 
-	        std::pair<int, int> address(pixcol, pixrow);
-	        std::pair<std::pair<int, int>, float>  PixelStats(address, value);
-	        noisyPixelsInModule.push_back(PixelStats);
-	      }
+      if (full_path.find("hitmap_siPixelDigis") != string::npos) {
+        MonitorElement *me = iGetter.get(full_path);
+        if (!me)
+          continue;
+        int detid = getDetId(me);
+        int pixcol = -1;
+        int pixrow = -1;
+        std::vector<std::pair<std::pair<int, int>, float>> noisyPixelsInModule;
+        TH2F *hothisto = me->getTH2F();
+        if (hothisto) {
+          for (int i = 1; i != hothisto->GetNbinsX() + 1; i++) {
+            for (int j = 1; j != hothisto->GetNbinsY() + 1; j++) {
+              float value = (hothisto->GetBinContent(i, j)) / float(nevents_);
+              if (me->getPathname().find("Barrel") != string::npos) {
+                EventRateBarrelPixels = iGetter.get("Pixel/Barrel/barrelEventRate");
+                if (EventRateBarrelPixels)
+                  EventRateBarrelPixels->Fill(value);
+              } else if (me->getPathname().find("Endcap") != string::npos) {
+                EventRateEndcapPixels = iGetter.get("Pixel/Endcap/endcapEventRate");
+                if (EventRateEndcapPixels)
+                  EventRateEndcapPixels->Fill(value);
+              }
+              if (value > noiseRate_) {
+                pixcol = i - 1;
+                pixrow = j - 1;
+
+                std::pair<int, int> address(pixcol, pixrow);
+                std::pair<std::pair<int, int>, float> PixelStats(address, value);
+                noisyPixelsInModule.push_back(PixelStats);
+              }
             }
-	  }
-	}
-	noisyDetIds_[detid] = noisyPixelsInModule;
+          }
+        }
+        noisyDetIds_[detid] = noisyPixelsInModule;
       }
     }
   }
-  vector<string> subDirVec = iGetter.getSubdirs();  
-  for (vector<string>::const_iterator ic = subDirVec.begin();
-       ic != subDirVec.end(); ic++) {
-    if((*ic).find("AdditionalPixelErrors")!=string::npos) continue;
+  vector<string> subDirVec = iGetter.getSubdirs();
+  for (vector<string>::const_iterator ic = subDirVec.begin(); ic != subDirVec.end(); ic++) {
+    if ((*ic).find("AdditionalPixelErrors") != string::npos)
+      continue;
     iGetter.cd(*ic);
     iBooker.cd(*ic);
-    init=false;
-    findNoisyPixels(iBooker,iGetter,init,noiseRate_,noiseRateDenominator_,theCablingMap);
+    init = false;
+    findNoisyPixels(iBooker, iGetter, init, noiseRate_, noiseRateDenominator_, theCablingMap);
     iBooker.goUp();
     iGetter.setCurrentFolder(iBooker.pwd());
   }
 
-  if(iBooker.pwd().find("EventInfo")!=string::npos) endOfModules_ = true;
-  
-  if(!endOfModules_) return;
-  if(currDir == "Pixel/EventInfo/reportSummaryContents"){
-    std::vector<std::pair<sipixelobjects::DetectorIndex,double> > pixelvec;
-    std::map<uint32_t,int> myfedmap;
-    std::map<uint32_t,std::string> mynamemap;
+  if (iBooker.pwd().find("EventInfo") != string::npos)
+    endOfModules_ = true;
+
+  if (!endOfModules_)
+    return;
+  if (currDir == "Pixel/EventInfo/reportSummaryContents") {
+    std::vector<std::pair<sipixelobjects::DetectorIndex, double>> pixelvec;
+    std::map<uint32_t, int> myfedmap;
+    std::map<uint32_t, std::string> mynamemap;
     int realfedID = -1;
     int counter = 0;
     int n_noisyrocs_all = 0;
@@ -434,111 +439,128 @@ void SiPixelInformationExtractor::findNoisyPixels(DQMStore::IBooker & iBooker, D
     int n_verynoisyrocs_barrel = 0;
     int n_verynoisyrocs_endcap = 0;
 
-    for(int fid = 0; fid < 40; fid++){
-    for(std::map<uint32_t, std::vector< std::pair<std::pair<int, int>, float> > >::const_iterator it = noisyDetIds_.begin(); 
-        it != noisyDetIds_.end(); it++){
-      uint32_t detid = (*it).first;
-      std::vector< std::pair<std::pair<int, int>, float> > noisyPixels = (*it).second;
-      // now convert into online conventions:
-      for(int fedid=0; fedid<=40; ++fedid){
-	SiPixelFrameConverter converter(theCablingMap.product(),fedid);
-	uint32_t newDetId = detid;
-	if(converter.hasDetUnit(newDetId)){
-	  realfedID=fedid;
-	  break;   
-	}
-      }
-      if(fid == realfedID){
-      if(realfedID==-1) continue; 
-      DetId detId(detid);
-      uint32_t detSubId = detId.subdetId();
-      std::string outputname;
-      bool HalfModule = false;
-      if (detSubId == 2){   //FPIX
-	PixelEndcapName nameworker(detid);
-	outputname = nameworker.name();
-      } else if(detSubId == 1){   //BPIX
-	PixelBarrelName nameworker(detid);
-	outputname = nameworker.name();
-	HalfModule = nameworker.isHalfModule();
-
-      } else{
-	continue;
-      }	
-      std::map<int,int> myrocmap;
-      myfedmap[detid]=realfedID;
-      mynamemap[detid]=outputname;
-      
-      for(std::vector< std::pair< std::pair<int,int>, float> >::const_iterator pxl = noisyPixels.begin(); 
-          pxl != noisyPixels.end(); pxl++){
-        std::pair<int,int> offlineaddress = (*pxl).first;
-	float Noise_frac = (*pxl).second;
-	int offlineColumn = offlineaddress.first;
-        int offlineRow = offlineaddress.second;
-        counter++;
-
-        sipixelobjects::ElectronicIndex cabling; 
-        SiPixelFrameConverter formatter(theCablingMap.product(),realfedID);
-        sipixelobjects::DetectorIndex detector = {detid, offlineRow, offlineColumn};      
-	formatter.toCabling(cabling,detector);
-        // cabling should now contain cabling.roc and cabling.dcol  and cabling.pxid
-        // however, the coordinates now need to be converted from dcl,pxid to the row,col coordinates used in the calibration info 
-        sipixelobjects::LocalPixel::DcolPxid loc;
-        loc.dcol = cabling.dcol;
-        loc.pxid = cabling.pxid;
-	
-	        sipixelobjects::LocalPixel locpixel(loc);
-        assert(realfedID >= 0);
-        assert(cabling.link >= 0);
-        assert(cabling.roc >= 0);
-	sipixelobjects::CablingPathToDetUnit path = {static_cast<unsigned int>(realfedID), 
-                                                     static_cast<unsigned int>(cabling.link),
-                                                     static_cast<unsigned int>(cabling.roc)};  
-	const sipixelobjects::PixelROC *theRoc = theCablingMap->findItem(path);
-	// END of FIX
-	
-        int onlineColumn = locpixel.rocCol();
-        int onlineRow= locpixel.rocRow();
-	myrocmap[(theRoc->idInDetUnit())]++;
-
-	// ROC numbers in the barrel go from 8 to 15 instead of 0 to 7 in half modules.  This is a 
-	// fix to get the roc number, and add 8 to it if:
-	// it's a Barrel module AND on the minus side AND a Half module
-
-	int rocnumber = -1;
-
-	if((detSubId == 1) && (outputname.find("mO")!=string::npos || outputname.find("mI")!=string::npos) && (HalfModule)){
-	  rocnumber = theRoc->idInDetUnit() + 8;
-	}
-	else{
-	  rocnumber = theRoc->idInDetUnit();
-	}
-
-        myfile_ <<"NAME: "<<outputname<<" , DETID: "<<detid<<" , OFFLINE: col,row: "<<offlineColumn<<","<<offlineRow<<"  \t , ONLINE: roc,col,row: "<<rocnumber<<","<<onlineColumn<<","<<onlineRow<< "  \t , fed,dcol,pixid,link: "<<realfedID<<","<<loc.dcol<<","<<loc.pxid<<","<<cabling.link << ", Noise fraction: " << Noise_frac << std::endl;
-      }
-      for(std::map<int, int>::const_iterator nrc = myrocmap.begin(); nrc != myrocmap.end(); nrc++){
-	if((*nrc).second > 0){
-	  n_noisyrocs_all++;
-	  if(detSubId == 2){
-	    n_noisyrocs_endcap++;
-	  } else if(detSubId == 1){
-	    n_noisyrocs_barrel++;}
-	}
-	if((*nrc).second > 40){
-	  n_verynoisyrocs_all++;
-	  if(detSubId == 2){
-	    n_verynoisyrocs_endcap++;
-	  } else if(detSubId == 1){
-	    n_verynoisyrocs_barrel++;}
-	}
-      }
-      }
+    for (int fid = 0; fid < 40; fid++) {
+      for (std::map<uint32_t, std::vector<std::pair<std::pair<int, int>, float>>>::const_iterator it =
+               noisyDetIds_.begin();
+           it != noisyDetIds_.end();
+           it++) {
+        uint32_t detid = (*it).first;
+        std::vector<std::pair<std::pair<int, int>, float>> noisyPixels = (*it).second;
+        // now convert into online conventions:
+        for (int fedid = 0; fedid <= 40; ++fedid) {
+          SiPixelFrameConverter converter(theCablingMap.product(), fedid);
+          uint32_t newDetId = detid;
+          if (converter.hasDetUnit(newDetId)) {
+            realfedID = fedid;
+            break;
+          }
+        }
+        if (fid == realfedID) {
+          if (realfedID == -1)
+            continue;
+          DetId detId(detid);
+          uint32_t detSubId = detId.subdetId();
+          std::string outputname;
+          bool HalfModule = false;
+          if (detSubId == 2) {  // FPIX
+            PixelEndcapName nameworker(detid);
+            outputname = nameworker.name();
+          } else if (detSubId == 1) {  // BPIX
+            PixelBarrelName nameworker(detid);
+            outputname = nameworker.name();
+            HalfModule = nameworker.isHalfModule();
+
+          } else {
+            continue;
+          }
+          std::map<int, int> myrocmap;
+          myfedmap[detid] = realfedID;
+          mynamemap[detid] = outputname;
+
+          for (std::vector<std::pair<std::pair<int, int>, float>>::const_iterator pxl = noisyPixels.begin();
+               pxl != noisyPixels.end();
+               pxl++) {
+            std::pair<int, int> offlineaddress = (*pxl).first;
+            float Noise_frac = (*pxl).second;
+            int offlineColumn = offlineaddress.first;
+            int offlineRow = offlineaddress.second;
+            counter++;
+
+            sipixelobjects::ElectronicIndex cabling;
+            SiPixelFrameConverter formatter(theCablingMap.product(), realfedID);
+            sipixelobjects::DetectorIndex detector = {detid, offlineRow, offlineColumn};
+            formatter.toCabling(cabling, detector);
+            // cabling should now contain cabling.roc and cabling.dcol  and
+            // cabling.pxid however, the coordinates now need to be converted
+            // from dcl,pxid to the row,col coordinates used in the calibration
+            // info
+            sipixelobjects::LocalPixel::DcolPxid loc;
+            loc.dcol = cabling.dcol;
+            loc.pxid = cabling.pxid;
+
+            sipixelobjects::LocalPixel locpixel(loc);
+            assert(realfedID >= 0);
+            assert(cabling.link >= 0);
+            assert(cabling.roc >= 0);
+            sipixelobjects::CablingPathToDetUnit path = {static_cast<unsigned int>(realfedID),
+                                                         static_cast<unsigned int>(cabling.link),
+                                                         static_cast<unsigned int>(cabling.roc)};
+            const sipixelobjects::PixelROC *theRoc = theCablingMap->findItem(path);
+            // END of FIX
+
+            int onlineColumn = locpixel.rocCol();
+            int onlineRow = locpixel.rocRow();
+            myrocmap[(theRoc->idInDetUnit())]++;
+
+            // ROC numbers in the barrel go from 8 to 15 instead of 0 to 7 in
+            // half modules.  This is a fix to get the roc number, and add 8 to
+            // it if: it's a Barrel module AND on the minus side AND a Half
+            // module
+
+            int rocnumber = -1;
+
+            if ((detSubId == 1) && (outputname.find("mO") != string::npos || outputname.find("mI") != string::npos) &&
+                (HalfModule)) {
+              rocnumber = theRoc->idInDetUnit() + 8;
+            } else {
+              rocnumber = theRoc->idInDetUnit();
+            }
 
+            myfile_ << "NAME: " << outputname << " , DETID: " << detid << " , OFFLINE: col,row: " << offlineColumn
+                    << "," << offlineRow << "  \t , ONLINE: roc,col,row: " << rocnumber << "," << onlineColumn << ","
+                    << onlineRow << "  \t , fed,dcol,pixid,link: " << realfedID << "," << loc.dcol << "," << loc.pxid
+                    << "," << cabling.link << ", Noise fraction: " << Noise_frac << std::endl;
+          }
+          for (std::map<int, int>::const_iterator nrc = myrocmap.begin(); nrc != myrocmap.end(); nrc++) {
+            if ((*nrc).second > 0) {
+              n_noisyrocs_all++;
+              if (detSubId == 2) {
+                n_noisyrocs_endcap++;
+              } else if (detSubId == 1) {
+                n_noisyrocs_barrel++;
+              }
+            }
+            if ((*nrc).second > 40) {
+              n_verynoisyrocs_all++;
+              if (detSubId == 2) {
+                n_verynoisyrocs_endcap++;
+              } else if (detSubId == 1) {
+                n_verynoisyrocs_barrel++;
+              }
+            }
+          }
+        }
+      }
     }
-    }
-    myfile_ << "There are " << n_noisyrocs_all << " noisy ROCs (ROCs with at least 1 noisy pixel) in the entire detector. " << n_noisyrocs_endcap << " are in the FPIX and " << n_noisyrocs_barrel << " are in the BPIX. " << endl;
-    myfile_ << "There are " << n_verynoisyrocs_all << " highly noisy ROCs (ROCs with at least 10% of all pixels passing the noise threshold) in the entire detector. " << n_verynoisyrocs_endcap << " are in the FPIX and " << n_verynoisyrocs_barrel << " are in the BPIX. " << endl;
-
+    myfile_ << "There are " << n_noisyrocs_all
+            << " noisy ROCs (ROCs with at least 1 noisy pixel) in the entire "
+               "detector. "
+            << n_noisyrocs_endcap << " are in the FPIX and " << n_noisyrocs_barrel << " are in the BPIX. " << endl;
+    myfile_ << "There are " << n_verynoisyrocs_all
+            << " highly noisy ROCs (ROCs with at least 10% of all pixels "
+               "passing the noise threshold) in the entire detector. "
+            << n_verynoisyrocs_endcap << " are in the FPIX and " << n_verynoisyrocs_barrel << " are in the BPIX. "
+            << endl;
   }
   myfile_.close();
   return;
diff --git a/DQM/SiPixelMonitorClient/src/SiPixelLayoutParser.cc b/DQM/SiPixelMonitorClient/src/SiPixelLayoutParser.cc
index 061c71f4a97db..3337da1d66bc6 100644
--- a/DQM/SiPixelMonitorClient/src/SiPixelLayoutParser.cc
+++ b/DQM/SiPixelMonitorClient/src/SiPixelLayoutParser.cc
@@ -8,23 +8,23 @@ using namespace std;
 
 //
 // -- Constructor
-// 
+//
 SiPixelLayoutParser::SiPixelLayoutParser() : DQMParserBase() {
-  edm::LogInfo("SiPixelLayoutParser") << 
-    " Creating SiPixelLayoutParser " << "\n" ;
+  edm::LogInfo("SiPixelLayoutParser") << " Creating SiPixelLayoutParser "
+                                      << "\n";
   cout << " Creating SiPixelLayoutParser " << endl;
 }
 //
 // --  Destructor
-// 
+//
 SiPixelLayoutParser::~SiPixelLayoutParser() {
-  edm::LogInfo("SiPixelActionExecutor") << 
-    " Deleting SiPixelLayoutParser " << "\n" ;
+  edm::LogInfo("SiPixelActionExecutor") << " Deleting SiPixelLayoutParser "
+                                        << "\n";
 }
 //
 // -- Get list of Layouts for ME groups
 //
-bool SiPixelLayoutParser::getAllLayouts(map<string, vector< string > >& layouts){
+bool SiPixelLayoutParser::getAllLayouts(map<string, vector<string>> &layouts) {
   if (!doc()) {
     cout << " SiPixelLayoutParser::Configuration File is not set!!! " << endl;
     return false;
@@ -32,34 +32,39 @@ bool SiPixelLayoutParser::getAllLayouts(map<string, vector< string > >& layouts)
 
   layouts.clear();
 
-  DOMNodeList * layoutList 
-    = doc()->getElementsByTagName(qtxml::_toDOMS("layout"));
+  DOMNodeList *layoutList = doc()->getElementsByTagName(qtxml::_toDOMS("layout"));
 
   unsigned int nlayout = layoutList->getLength();
-  if (nlayout == 0) return false;
+  if (nlayout == 0)
+    return false;
 
   for (unsigned int k = 0; k < layoutList->getLength(); k++) {
-    DOMNode* layoutNode 
-      = layoutList->item(k);
-    if (!layoutNode) return false;
-    
-    DOMElement* layoutElement = static_cast<DOMElement *>(layoutNode);          
-    if (!layoutElement) return false;
-    string layoutName = qtxml::_toString(layoutElement->getAttribute (qtxml::_toDOMS ("name"))); 
+    DOMNode *layoutNode = layoutList->item(k);
+    if (!layoutNode)
+      return false;
 
-    DOMNodeList * meList 
-      = layoutElement->getElementsByTagName(qtxml::_toDOMS("monitorable"));
+    DOMElement *layoutElement = static_cast<DOMElement *>(layoutNode);
+    if (!layoutElement)
+      return false;
+    string layoutName = qtxml::_toString(layoutElement->getAttribute(qtxml::_toDOMS("name")));
+
+    DOMNodeList *meList = layoutElement->getElementsByTagName(qtxml::_toDOMS("monitorable"));
     vector<string> me_names;
     for (unsigned int l = 0; l < meList->getLength(); l++) {
-      DOMNode* meNode = meList->item(l);
-      if (!meNode) return false;
-      DOMElement* meElement = static_cast<DOMElement *>(meNode);          
-      if (!meElement) return false;
-      string meName = qtxml::_toString(meElement->getAttribute (qtxml::_toDOMS ("name"))); 
-      me_names.push_back(meName);    
+      DOMNode *meNode = meList->item(l);
+      if (!meNode)
+        return false;
+      DOMElement *meElement = static_cast<DOMElement *>(meNode);
+      if (!meElement)
+        return false;
+      string meName = qtxml::_toString(meElement->getAttribute(qtxml::_toDOMS("name")));
+      me_names.push_back(meName);
     }
-    if (!me_names.empty()) layouts[layoutName] = me_names;
+    if (!me_names.empty())
+      layouts[layoutName] = me_names;
   }
-  if ( !layouts.empty()) return true;
-  else return false; 
+  if (!layouts.empty())
+    return true;
+  else
+    return false;
 }
diff --git a/DQM/SiPixelMonitorClient/src/SiPixelUtility.cc b/DQM/SiPixelMonitorClient/src/SiPixelUtility.cc
index 69dcf2ac4a523..ffc654ff0069e 100644
--- a/DQM/SiPixelMonitorClient/src/SiPixelUtility.cc
+++ b/DQM/SiPixelMonitorClient/src/SiPixelUtility.cc
@@ -1,5 +1,5 @@
-#include "DQM/SiPixelMonitorClient/interface/SiPixelUtility.h"
 #include "DQM/SiPixelMonitorClient/interface/SiPixelContinuousPalette.h"
+#include "DQM/SiPixelMonitorClient/interface/SiPixelUtility.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include <cstdlib>
@@ -8,38 +8,38 @@ using namespace std;
 //
 // Get a list of MEs in a folder
 //
-int SiPixelUtility::getMEList(string name, vector<string>& values) {
+int SiPixelUtility::getMEList(string name, vector<string> &values) {
   values.clear();
-  string prefix_str = name.substr(0,(name.find(":")));
-  prefix_str += "/"; 
-  string temp_str = name.substr(name.find(":")+1);
+  string prefix_str = name.substr(0, (name.find(":")));
+  prefix_str += "/";
+  string temp_str = name.substr(name.find(":") + 1);
   split(temp_str, values, ",");
-  for (vector<string>::iterator it = values.begin();
-       it != values.end(); it++) (*it).insert(0,prefix_str);
+  for (vector<string>::iterator it = values.begin(); it != values.end(); it++)
+    (*it).insert(0, prefix_str);
   return values.size();
 }
 //
 // Get a list of MEs in a folder and the path name
 //
-int SiPixelUtility::getMEList(string name, string& dir_path, vector<string>& values) {
+int SiPixelUtility::getMEList(string name, string &dir_path, vector<string> &values) {
   values.clear();
-  dir_path = name.substr(0,(name.find(":")));
-  dir_path += "/"; 
-  string temp_str = name.substr(name.find(":")+1);
+  dir_path = name.substr(0, (name.find(":")));
+  dir_path += "/";
+  string temp_str = name.substr(name.find(":") + 1);
   split(temp_str, values, ",");
   return values.size();
 }
 
 // Check if the requested ME exists in a folder
-bool SiPixelUtility::checkME(string name, string me_name, string& full_path) {
-  if (name.find(name) == string::npos) return false;
-  string prefix_str = name.substr(0,(name.find(":")));
-  prefix_str += "/"; 
-  string temp_str = name.substr(name.find(":")+1);
+bool SiPixelUtility::checkME(string name, string me_name, string &full_path) {
+  if (name.find(name) == string::npos)
+    return false;
+  string prefix_str = name.substr(0, (name.find(":")));
+  prefix_str += "/";
+  string temp_str = name.substr(name.find(":") + 1);
   vector<string> values;
   split(temp_str, values, ",");
-  for (vector<string>::iterator it = values.begin();
-       it != values.end(); it++) {
+  for (vector<string>::iterator it = values.begin(); it != values.end(); it++) {
     if ((*it).find(me_name) != string::npos) {
       full_path = prefix_str + (*it);
       return true;
@@ -51,14 +51,14 @@ bool SiPixelUtility::checkME(string name, string me_name, string& full_path) {
 // -- Split a given string into a number of strings using given
 //    delimiters and fill a vector with splitted strings
 //
-void SiPixelUtility::split(const string& str, vector<string>& tokens, const string& delimiters) {
+void SiPixelUtility::split(const string &str, vector<string> &tokens, const string &delimiters) {
   // Skip delimiters at beginning.
   string::size_type lastPos = str.find_first_not_of(delimiters, 0);
 
   // Find first "non-delimiter".
   string::size_type pos = str.find_first_of(delimiters, lastPos);
 
-  while (string::npos != pos || string::npos != lastPos)  {
+  while (string::npos != pos || string::npos != lastPos) {
     // Found a token, add it to the vector.
     tokens.push_back(str.substr(lastPos, pos - lastPos));
 
@@ -72,53 +72,63 @@ void SiPixelUtility::split(const string& str, vector<string>& tokens, const stri
 //
 // -- Get Color code from Status
 //
-void SiPixelUtility::getStatusColor(int status, int& rval, int&gval, int& bval) {
-  if (status == dqm::qstatus::STATUS_OK) { 
-    rval = 0;   gval = 255;   bval = 0; 
-  } else if (status == dqm::qstatus::WARNING) { 
-    rval = 255; gval = 255; bval = 0;
-  } else if (status == dqm::qstatus::ERROR) { 
-    rval = 255; gval = 0;  bval = 0;
-  } else if (status == dqm::qstatus::OTHER) { 
-    rval = 255; gval = 150;  bval = 0;
+void SiPixelUtility::getStatusColor(int status, int &rval, int &gval, int &bval) {
+  if (status == dqm::qstatus::STATUS_OK) {
+    rval = 0;
+    gval = 255;
+    bval = 0;
+  } else if (status == dqm::qstatus::WARNING) {
+    rval = 255;
+    gval = 255;
+    bval = 0;
+  } else if (status == dqm::qstatus::ERROR) {
+    rval = 255;
+    gval = 0;
+    bval = 0;
+  } else if (status == dqm::qstatus::OTHER) {
+    rval = 255;
+    gval = 150;
+    bval = 0;
   } else {
-    rval = 0; gval = 0;  bval = 255;
-  }        
+    rval = 0;
+    gval = 0;
+    bval = 255;
+  }
 }
 //
 // -- Get Color code from Status
 //
-void SiPixelUtility::getStatusColor(int status, int& icol, string& tag) {
-  if (status == dqm::qstatus::STATUS_OK) { 
+void SiPixelUtility::getStatusColor(int status, int &icol, string &tag) {
+  if (status == dqm::qstatus::STATUS_OK) {
     tag = "Ok";
     icol = 3;
-  } else if (status == dqm::qstatus::WARNING) { 
+  } else if (status == dqm::qstatus::WARNING) {
     tag = "Warning";
-    icol = 5;     
-  } else if (status == dqm::qstatus::ERROR) { 
+    icol = 5;
+  } else if (status == dqm::qstatus::ERROR) {
     tag = "Error";
     icol = 2;
-  } else if (status == dqm::qstatus::OTHER) { 
+  } else if (status == dqm::qstatus::OTHER) {
     tag = "Other";
     icol = 1;
   } else {
     tag = " ";
     icol = 1;
-  }     
+  }
 }
 //
 // -- Get Color code from Status
 //
-void SiPixelUtility::getStatusColor(double status, int& rval, int&gval, int& bval) {
-  rval = SiPixelContinuousPalette::r[(int)(status * 100)] ;
-  gval = SiPixelContinuousPalette::g[(int)(status * 100)] ;
-  bval = SiPixelContinuousPalette::b[(int)(status * 100)] ; 
+void SiPixelUtility::getStatusColor(double status, int &rval, int &gval, int &bval) {
+  rval = SiPixelContinuousPalette::r[(int)(status * 100)];
+  gval = SiPixelContinuousPalette::g[(int)(status * 100)];
+  bval = SiPixelContinuousPalette::b[(int)(status * 100)];
 }
 //
 // -- Get Status of Monitor Element
 //
-int SiPixelUtility::getStatus(MonitorElement* me) {
-  int status = 0; 
+int SiPixelUtility::getStatus(MonitorElement *me) {
+  int status = 0;
   if (me->getQReports().empty()) {
     status = 0;
   } else if (me->hasError()) {
@@ -127,219 +137,228 @@ int SiPixelUtility::getStatus(MonitorElement* me) {
     status = dqm::qstatus::WARNING;
   } else if (me->hasOtherReport()) {
     status = dqm::qstatus::OTHER;
-  } else {  
+  } else {
     status = dqm::qstatus::STATUS_OK;
   }
   return status;
 }
 
-
-vector<string> SiPixelUtility::getQTestNameList(MonitorElement* me){
+vector<string> SiPixelUtility::getQTestNameList(MonitorElement *me) {
   vector<string> qtestNameList;
   return qtestNameList;
 }
 
-int SiPixelUtility::computeErrorCode(int status){
+int SiPixelUtility::computeErrorCode(int status) {
   int code = 0;
-  switch(status){
-  case dqm::qstatus::INSUF_STAT:
-    code = 1;
-    break;
-  case dqm::qstatus::WARNING:
-    code = 2;
-    break;
-  case dqm::qstatus::ERROR:
-    code = 3;
-    break;
-  } // end switch
+  switch (status) {
+    case dqm::qstatus::INSUF_STAT:
+      code = 1;
+      break;
+    case dqm::qstatus::WARNING:
+      code = 2;
+      break;
+    case dqm::qstatus::ERROR:
+      code = 3;
+      break;
+  }  // end switch
 
   return code;
-
 }
 
-int SiPixelUtility::computeErrorCode(DQMStore * bei,
-				     string                & module_path){
+int SiPixelUtility::computeErrorCode(DQMStore *bei, string &module_path) {
   int status = bei->getStatus(module_path);
-  
+
   int code = -1;
-  switch(status){
-  case dqm::qstatus::STATUS_OK:
-    code = 0;
-    break;
-  case dqm::qstatus::INSUF_STAT:
-    code = 1;
-    break;
-  case dqm::qstatus::WARNING:
-    code = 2;
-    break;
-  case dqm::qstatus::ERROR:
-    code = 3;
-    break;
-  } // end of switch
-  
-  return code;
+  switch (status) {
+    case dqm::qstatus::STATUS_OK:
+      code = 0;
+      break;
+    case dqm::qstatus::INSUF_STAT:
+      code = 1;
+      break;
+    case dqm::qstatus::WARNING:
+      code = 2;
+      break;
+    case dqm::qstatus::ERROR:
+      code = 3;
+      break;
+  }  // end of switch
 
+  return code;
 }
 
-
-
-int SiPixelUtility::computeHistoBin(string & module_path){ 
-
+int SiPixelUtility::computeHistoBin(string &module_path) {
   int module_bin = 0;
 
-  int module       = 0;
-  int shell        = 0;   
-  int layer	   = 0;  
-  int ladder	   = 0;  
-  int halfcylinder = 0;  
-  int disk	   = 0;  
-  int blade	   = 0;  
-  int panel        = 0;  
+  int module = 0;
+  int shell = 0;
+  int layer = 0;
+  int ladder = 0;
+  int halfcylinder = 0;
+  int disk = 0;
+  int blade = 0;
+  int panel = 0;
 
-  int nbinShell        = 192;
-  int nbinLayer	       = 0;  
-  int nbinLadder       = 4;
+  int nbinShell = 192;
+  int nbinLayer = 0;
+  int nbinLadder = 4;
 
-  int nbinHalfcylinder = 168;  
-  int nbinDisk	       = 84;  
-  int nbinBlade	       = 7;  
-  int nbinPanel        = 0;  
+  int nbinHalfcylinder = 168;
+  int nbinDisk = 84;
+  int nbinBlade = 7;
+  int nbinPanel = 0;
 
   vector<string> subDirVector;
-  SiPixelUtility::split(module_path,subDirVector,"/");
+  SiPixelUtility::split(module_path, subDirVector, "/");
+
+  for (vector<string>::const_iterator it = subDirVector.begin(); it != subDirVector.end(); it++) {
+    if ((*it).find("Collector") != string::npos ||
+        //(*it).find("Collated") != string::npos ||
+        (*it).find("FU") != string::npos || (*it).find("Pixel") != string::npos ||
+        (*it).find("Barrel") != string::npos || (*it).find("Endcap") != string::npos)
+      continue;
 
-  for (vector<string>::const_iterator it = subDirVector.begin();
-       it != subDirVector.end(); it++) {
-    if((*it).find("Collector") != string::npos ||
-       //(*it).find("Collated") != string::npos ||
-       (*it).find("FU") != string::npos ||
-       (*it).find("Pixel") != string::npos ||
-       (*it).find("Barrel") != string::npos ||
-       (*it).find("Endcap") != string::npos) continue;
-    
-    if((*it).find("Module") != string::npos){
-      module = atoi((*it).substr((*it).find("_")+1).c_str());
+    if ((*it).find("Module") != string::npos) {
+      module = atoi((*it).substr((*it).find("_") + 1).c_str());
     }
-    
-    if((*it).find("Shell") != string::npos){
-      if((*it).find("mI") != string::npos) shell = 1;
-      if((*it).find("mO") != string::npos) shell = 2;
-      if((*it).find("pI") != string::npos) shell = 3;
-      if((*it).find("pO") != string::npos) shell = 4;
+
+    if ((*it).find("Shell") != string::npos) {
+      if ((*it).find("mI") != string::npos)
+        shell = 1;
+      if ((*it).find("mO") != string::npos)
+        shell = 2;
+      if ((*it).find("pI") != string::npos)
+        shell = 3;
+      if ((*it).find("pO") != string::npos)
+        shell = 4;
     }
-    if((*it).find("Layer") != string::npos){
-      layer = atoi((*it).substr((*it).find("_")+1).c_str());
-      if(layer==1){
-	nbinLayer = 0;
+    if ((*it).find("Layer") != string::npos) {
+      layer = atoi((*it).substr((*it).find("_") + 1).c_str());
+      if (layer == 1) {
+        nbinLayer = 0;
       }
-      if(layer==2){
-	nbinLayer = 40;
+      if (layer == 2) {
+        nbinLayer = 40;
       }
-      if(layer==3){
-	nbinLayer = 40+64;
+      if (layer == 3) {
+        nbinLayer = 40 + 64;
       }
     }
-    if((*it).find("Ladder") != string::npos){
-      ladder = atoi((*it).substr((*it).find("_")+1,2).c_str()); 
+    if ((*it).find("Ladder") != string::npos) {
+      ladder = atoi((*it).substr((*it).find("_") + 1, 2).c_str());
     }
-    if((*it).find("HalfCylinder") != string::npos){
-      if((*it).find("mI") != string::npos) halfcylinder = 1;
-      if((*it).find("mO") != string::npos) halfcylinder = 2;
-      if((*it).find("pI") != string::npos) halfcylinder = 3;
-      if((*it).find("pO") != string::npos) halfcylinder = 4;
+    if ((*it).find("HalfCylinder") != string::npos) {
+      if ((*it).find("mI") != string::npos)
+        halfcylinder = 1;
+      if ((*it).find("mO") != string::npos)
+        halfcylinder = 2;
+      if ((*it).find("pI") != string::npos)
+        halfcylinder = 3;
+      if ((*it).find("pO") != string::npos)
+        halfcylinder = 4;
     }
-    if((*it).find("Disk") != string::npos){
-      disk = atoi((*it).substr((*it).find("_")+1).c_str());
+    if ((*it).find("Disk") != string::npos) {
+      disk = atoi((*it).substr((*it).find("_") + 1).c_str());
     }
-    if((*it).find("Blade") != string::npos){
-      blade = atoi((*it).substr((*it).find("_")+1,2).c_str()); 
+    if ((*it).find("Blade") != string::npos) {
+      blade = atoi((*it).substr((*it).find("_") + 1, 2).c_str());
     }
-    if((*it).find("Panel") != string::npos){
-      panel = atoi((*it).substr((*it).find("_")+1).c_str()); 
-      if(panel==1) nbinPanel = 0;
-      if(panel==2) nbinPanel = 4;
+    if ((*it).find("Panel") != string::npos) {
+      panel = atoi((*it).substr((*it).find("_") + 1).c_str());
+      if (panel == 1)
+        nbinPanel = 0;
+      if (panel == 2)
+        nbinPanel = 4;
     }
   }
-  if(module_path.find("Barrel") != string::npos){
-    module_bin =  module + 
-      (ladder-1)*nbinLadder +
-      nbinLayer +
-      (shell -1)*nbinShell;
+  if (module_path.find("Barrel") != string::npos) {
+    module_bin = module + (ladder - 1) * nbinLadder + nbinLayer + (shell - 1) * nbinShell;
   }
-  if(module_path.find("Endcap") != string::npos){
-    module_bin =  module +
-      (panel       -1)*nbinPanel +
-      (blade       -1)*nbinBlade +
-      (disk        -1)*nbinDisk +
-      (halfcylinder-1)*nbinHalfcylinder;
+  if (module_path.find("Endcap") != string::npos) {
+    module_bin = module + (panel - 1) * nbinPanel + (blade - 1) * nbinBlade + (disk - 1) * nbinDisk +
+                 (halfcylinder - 1) * nbinHalfcylinder;
   }
-  
+
   return module_bin;
 
   //  cout << "leaving SiPixelInformationExtractor::computeHistoBin" << endl;
 }
 
-
-void SiPixelUtility::fillPaveText(TPaveText                 * pave,
-				  const map<string,pair<int,double> >&  messages){
-
-  TText* sourceCodeOnCanvas;
-  for(map<string, pair<int,double> >::const_iterator it =  messages.begin();
-                                            it != messages.end();
-                                            it++){
+void SiPixelUtility::fillPaveText(TPaveText *pave, const map<string, pair<int, double>> &messages) {
+  TText *sourceCodeOnCanvas;
+  for (map<string, pair<int, double>>::const_iterator it = messages.begin(); it != messages.end(); it++) {
     string message = it->first;
-    int    color   = (it->second).first;
-    double size    = (it->second).second;
+    int color = (it->second).first;
+    double size = (it->second).second;
     sourceCodeOnCanvas = pave->AddText(message.c_str());
     sourceCodeOnCanvas->SetTextColor(color);
     sourceCodeOnCanvas->SetTextSize(size);
-    sourceCodeOnCanvas->SetTextFont(112);    
-
+    sourceCodeOnCanvas->SetTextFont(112);
   }
 }
 
-map<string,string> SiPixelUtility::sourceCodeMap(){
-
-  map<string,string> sourceCode;
-  for(int iSource=0; iSource<5;iSource++){
+map<string, string> SiPixelUtility::sourceCodeMap() {
+  map<string, string> sourceCode;
+  for (int iSource = 0; iSource < 5; iSource++) {
     string type;
-    string    code;
-    switch(iSource){
-    case 0: type = "RAW"; code = "1    ";
-      break;
-    case 1: type = "DIG"; code = "10   ";
-      break;
-    case 2: type = "CLU"; code = "100  ";
-      break;
-    case 3: type = "TRK"; code = "1000 ";
-      break;
-    case 4: type = "REC"; code = "10000";
-      break;
-    } // end of switch
-    sourceCode[type]=code;
+    string code;
+    switch (iSource) {
+      case 0:
+        type = "RAW";
+        code = "1    ";
+        break;
+      case 1:
+        type = "DIG";
+        code = "10   ";
+        break;
+      case 2:
+        type = "CLU";
+        code = "100  ";
+        break;
+      case 3:
+        type = "TRK";
+        code = "1000 ";
+        break;
+      case 4:
+        type = "REC";
+        code = "10000";
+        break;
+    }  // end of switch
+    sourceCode[type] = code;
   }
   return sourceCode;
-  
 }
 
-void SiPixelUtility::createStatusLegendMessages(map<string,pair<int,double> > & messages){
-  for(int iStatus=1; iStatus<5;iStatus++){
-    pair<int,double> color_size;
+void SiPixelUtility::createStatusLegendMessages(map<string, pair<int, double>> &messages) {
+  for (int iStatus = 1; iStatus < 5; iStatus++) {
+    pair<int, double> color_size;
     int color = 1;
-    double size  = 0.03;
+    double size = 0.03;
     string code;
     string type;
     color_size.second = size;
-    switch(iStatus){
-    case 1: code = "1"; type = "INSUF_STAT"; color = kBlue;
-      break;
-    case 2: code = "2"; type = "WARNING(S)"; color = kYellow;
-      break;
-    case 3: code = "3"; type = "ERROR(S)  "; color = kRed;
-      break;
-    case 4: code = "4"; type = "ERRORS    "; color = kMagenta;
-      break;
-    } // end of switch
+    switch (iStatus) {
+      case 1:
+        code = "1";
+        type = "INSUF_STAT";
+        color = kBlue;
+        break;
+      case 2:
+        code = "2";
+        type = "WARNING(S)";
+        color = kYellow;
+        break;
+      case 3:
+        code = "3";
+        type = "ERROR(S)  ";
+        color = kRed;
+        break;
+      case 4:
+        code = "4";
+        type = "ERRORS    ";
+        color = kMagenta;
+        break;
+    }  // end of switch
     string messageString = code + ": " + type;
     color_size.first = color;
     messages[messageString] = color_size;
@@ -350,13 +369,12 @@ void SiPixelUtility::createStatusLegendMessages(map<string,pair<int,double> > &
 //
 // -- Set Drawing Option
 //
-void SiPixelUtility::setDrawingOption(TH1   * hist, 
-				      float   xlow, 
-				      float   xhigh) {
-  if (!hist) return;
+void SiPixelUtility::setDrawingOption(TH1 *hist, float xlow, float xhigh) {
+  if (!hist)
+    return;
 
-  TAxis* xa = hist->GetXaxis();
-  TAxis* ya = hist->GetYaxis();
+  TAxis *xa = hist->GetXaxis();
+  TAxis *ya = hist->GetYaxis();
 
   xa->SetTitleOffset(0.7);
   xa->SetTitleSize(0.06);
@@ -366,8 +384,7 @@ void SiPixelUtility::setDrawingOption(TH1   * hist,
   ya->SetTitleOffset(0.7);
   ya->SetTitleSize(0.06);
 
-
-  if (xlow != -1 &&  xhigh != -1.0) {
+  if (xlow != -1 && xhigh != -1.0) {
     xa->SetRangeUser(xlow, xhigh);
   }
 }
diff --git a/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h b/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h
index fc390c6779373..b953a9e9143f6 100644
--- a/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h
+++ b/DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h
@@ -4,7 +4,7 @@
 //
 // Package:    SiPixelMonitorDigi
 // Class:      SiPixelClusterModule
-// 
+//
 /*
 
  Description: Cluster monitoring elements for a Pixel sensor
@@ -14,190 +14,190 @@
 */
 //
 // Original Author:  Vincenzo Chiochia & Andrew York
-//         Created:  
+//         Created:
 //
 //
 //  Updated by: Lukas Wehrli
-//  for pixel offline DQM 
+//  for pixel offline DQM
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
 #include "DataFormats/Common/interface/DetSetVectorNew.h"
+#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DQMServices/Core/interface/DQMStore.h"
 #include <boost/cstdint.hpp>
 
+#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
+#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
 #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h" 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h" 
-#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
-#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-
-class SiPixelClusterModule {        
-
- public:
 
+class SiPixelClusterModule {
+public:
   /// Default constructor
   SiPixelClusterModule();
   /// Constructor with raw DetId
-  SiPixelClusterModule(const uint32_t& id);
+  SiPixelClusterModule(const uint32_t &id);
   /// Constructor with raw DetId and sensor size
-  SiPixelClusterModule(const uint32_t& id, const int& ncols, const int& nrows);
+  SiPixelClusterModule(const uint32_t &id, const int &ncols, const int &nrows);
   /// Destructor
   ~SiPixelClusterModule();
 
-  typedef edmNew::DetSet<SiPixelCluster>::const_iterator    ClusterIterator;
+  typedef edmNew::DetSet<SiPixelCluster>::const_iterator ClusterIterator;
 
   /// Book histograms
-  void book(const edm::ParameterSet& iConfig, const edm::EventSetup& iSetup, DQMStore::IBooker & iBooker, int type=0, bool twoD=true, bool reducedSet=false, bool isUpgrade=false);
+  void book(const edm::ParameterSet &iConfig,
+            const edm::EventSetup &iSetup,
+            DQMStore::IBooker &iBooker,
+            int type = 0,
+            bool twoD = true,
+            bool reducedSet = false,
+            bool isUpgrade = false);
   /// Fill histograms
-  int fill(const edmNew::DetSetVector<SiPixelCluster> & input, 
-	    const TrackerGeometry* tracker,
-	    int *barrelClusterTotal,
-	    int *fpixPClusterTotal,
-	    int *fpixMClusterTotal,
-	    std::vector<MonitorElement*>& layers,
-	    std::vector<MonitorElement*>& diskspz,
-	    std::vector<MonitorElement*>& disksmz,
-            bool modon=true, 
-	    bool ladon=false, 
-	    bool layon=false, 
-	    bool phion=false, 
-	    bool bladeon=false, 
-	    bool diskon=false, 
-	    bool ringon=false, 
-	    bool twoD=true,
-	    bool reducedSet=false,
-	    bool smileyon=false,
-	    bool isUpgrade=false);
-  
- private:
-
+  int fill(const edmNew::DetSetVector<SiPixelCluster> &input,
+           const TrackerGeometry *tracker,
+           int *barrelClusterTotal,
+           int *fpixPClusterTotal,
+           int *fpixMClusterTotal,
+           std::vector<MonitorElement *> &layers,
+           std::vector<MonitorElement *> &diskspz,
+           std::vector<MonitorElement *> &disksmz,
+           bool modon = true,
+           bool ladon = false,
+           bool layon = false,
+           bool phion = false,
+           bool bladeon = false,
+           bool diskon = false,
+           bool ringon = false,
+           bool twoD = true,
+           bool reducedSet = false,
+           bool smileyon = false,
+           bool isUpgrade = false);
+
+private:
   const TrackerTopology *pTT;
   uint32_t id_;
   int ncols_;
   int nrows_;
-  MonitorElement* meNClusters_;
-  MonitorElement* meY_;
-  MonitorElement* meX_;
-  MonitorElement* meCharge_;
-  MonitorElement* meSize_;
-  MonitorElement* meSizeX_;
-  MonitorElement* meSizeY_;
-  MonitorElement* meMinRow_;
-  MonitorElement* meMaxRow_;
-  MonitorElement* meMinCol_;
-  MonitorElement* meMaxCol_;
-  MonitorElement* mePixClusters_;
-  MonitorElement* mePixClusters_px_;
-  MonitorElement* mePixClusters_py_;
+  MonitorElement *meNClusters_;
+  MonitorElement *meY_;
+  MonitorElement *meX_;
+  MonitorElement *meCharge_;
+  MonitorElement *meSize_;
+  MonitorElement *meSizeX_;
+  MonitorElement *meSizeY_;
+  MonitorElement *meMinRow_;
+  MonitorElement *meMaxRow_;
+  MonitorElement *meMinCol_;
+  MonitorElement *meMaxCol_;
+  MonitorElement *mePixClusters_;
+  MonitorElement *mePixClusters_px_;
+  MonitorElement *mePixClusters_py_;
   //  MonitorElement* meEdgeHitX_;
   //  MonitorElement* meEdgeHitY_;
-  MonitorElement* meClPosLayer1;
-  MonitorElement* meClPosLayer2;
-  MonitorElement* meClPosLayer3;
-  MonitorElement* meClPosLayer4;
-  MonitorElement* meClPosDisk1pz;
-  MonitorElement* meClPosDisk2pz;
-  MonitorElement* meClPosDisk3pz;
-  MonitorElement* meClPosDisk1mz;
-  MonitorElement* meClPosDisk2mz;
-  MonitorElement* meClPosDisk3mz;
-  
-  //barrel
-  MonitorElement* meNClustersLad_;
-  MonitorElement* meYLad_;
-  MonitorElement* meXLad_;
-  MonitorElement* meChargeLad_;
-  MonitorElement* meSizeLad_;
-  MonitorElement* meSizeXLad_;
-  MonitorElement* meSizeYLad_;
-  MonitorElement* meMinRowLad_;
-  MonitorElement* meMaxRowLad_;
-  MonitorElement* meMinColLad_;
-  MonitorElement* meMaxColLad_;
-  MonitorElement* mePixClustersLad_;
-  MonitorElement* mePixClustersLad_px_;
-  MonitorElement* mePixClustersLad_py_;
-
-  MonitorElement* meSizeYvsEtaBarrel_; 
-
-  MonitorElement* meNClustersLay_;
-  MonitorElement* meYLay_;
-  MonitorElement* meXLay_;
-  MonitorElement* meChargeLay_;
-  MonitorElement* meSizeLay_;
-  MonitorElement* meSizeXLay_;
-  MonitorElement* meSizeYLay_;
-  MonitorElement* meMinRowLay_;
-  MonitorElement* meMaxRowLay_;
-  MonitorElement* meMinColLay_;
-  MonitorElement* meMaxColLay_;
-  MonitorElement* mePixClustersLay_;
-  MonitorElement* mePixClustersLay_px_;
-  MonitorElement* mePixClustersLay_py_;
-
-  MonitorElement* meNClustersPhi_;
-  MonitorElement* meYPhi_;
-  MonitorElement* meXPhi_;
-  MonitorElement* meChargePhi_;
-  MonitorElement* meSizePhi_;
-  MonitorElement* meSizeXPhi_;
-  MonitorElement* meSizeYPhi_;
-  MonitorElement* meMinRowPhi_;
-  MonitorElement* meMaxRowPhi_;
-  MonitorElement* meMinColPhi_;
-  MonitorElement* meMaxColPhi_;
-  MonitorElement* mePixClustersPhi_;
-  MonitorElement* mePixClustersPhi_px_;
-  MonitorElement* mePixClustersPhi_py_;
-
-  //forward
-  MonitorElement* meNClustersBlade_;
-  MonitorElement* meYBlade_;
-  MonitorElement* meXBlade_;
-  MonitorElement* meChargeBlade_;
-  MonitorElement* meSizeBlade_;
-  MonitorElement* meSizeXBlade_;
-  MonitorElement* meSizeYBlade_;
-  MonitorElement* meMinRowBlade_;
-  MonitorElement* meMaxRowBlade_;
-  MonitorElement* meMinColBlade_;
-  MonitorElement* meMaxColBlade_;
-
-
-  MonitorElement* meNClustersDisk_;
-  MonitorElement* meYDisk_;
-  MonitorElement* meXDisk_;
-  MonitorElement* meChargeDisk_;
-  MonitorElement* meSizeDisk_;
-  MonitorElement* meSizeXDisk_;
-  MonitorElement* meSizeYDisk_;
-  MonitorElement* meMinRowDisk_;
-  MonitorElement* meMaxRowDisk_;
-  MonitorElement* meMinColDisk_;
-  MonitorElement* meMaxColDisk_;
-
-
-  MonitorElement* meNClustersRing_;
-  MonitorElement* meYRing_;
-  MonitorElement* meXRing_;
-  MonitorElement* meChargeRing_;
-  MonitorElement* meSizeRing_;
-  MonitorElement* meSizeXRing_;
-  MonitorElement* meSizeYRing_;
-  MonitorElement* meMinRowRing_;
-  MonitorElement* meMaxRowRing_;
-  MonitorElement* meMinColRing_;
-  MonitorElement* meMaxColRing_;
-  MonitorElement* mePixClustersRing_;
-  MonitorElement* mePixClustersRing_px_;
-  MonitorElement* mePixClustersRing_py_;
-
+  MonitorElement *meClPosLayer1;
+  MonitorElement *meClPosLayer2;
+  MonitorElement *meClPosLayer3;
+  MonitorElement *meClPosLayer4;
+  MonitorElement *meClPosDisk1pz;
+  MonitorElement *meClPosDisk2pz;
+  MonitorElement *meClPosDisk3pz;
+  MonitorElement *meClPosDisk1mz;
+  MonitorElement *meClPosDisk2mz;
+  MonitorElement *meClPosDisk3mz;
+
+  // barrel
+  MonitorElement *meNClustersLad_;
+  MonitorElement *meYLad_;
+  MonitorElement *meXLad_;
+  MonitorElement *meChargeLad_;
+  MonitorElement *meSizeLad_;
+  MonitorElement *meSizeXLad_;
+  MonitorElement *meSizeYLad_;
+  MonitorElement *meMinRowLad_;
+  MonitorElement *meMaxRowLad_;
+  MonitorElement *meMinColLad_;
+  MonitorElement *meMaxColLad_;
+  MonitorElement *mePixClustersLad_;
+  MonitorElement *mePixClustersLad_px_;
+  MonitorElement *mePixClustersLad_py_;
+
+  MonitorElement *meSizeYvsEtaBarrel_;
+
+  MonitorElement *meNClustersLay_;
+  MonitorElement *meYLay_;
+  MonitorElement *meXLay_;
+  MonitorElement *meChargeLay_;
+  MonitorElement *meSizeLay_;
+  MonitorElement *meSizeXLay_;
+  MonitorElement *meSizeYLay_;
+  MonitorElement *meMinRowLay_;
+  MonitorElement *meMaxRowLay_;
+  MonitorElement *meMinColLay_;
+  MonitorElement *meMaxColLay_;
+  MonitorElement *mePixClustersLay_;
+  MonitorElement *mePixClustersLay_px_;
+  MonitorElement *mePixClustersLay_py_;
+
+  MonitorElement *meNClustersPhi_;
+  MonitorElement *meYPhi_;
+  MonitorElement *meXPhi_;
+  MonitorElement *meChargePhi_;
+  MonitorElement *meSizePhi_;
+  MonitorElement *meSizeXPhi_;
+  MonitorElement *meSizeYPhi_;
+  MonitorElement *meMinRowPhi_;
+  MonitorElement *meMaxRowPhi_;
+  MonitorElement *meMinColPhi_;
+  MonitorElement *meMaxColPhi_;
+  MonitorElement *mePixClustersPhi_;
+  MonitorElement *mePixClustersPhi_px_;
+  MonitorElement *mePixClustersPhi_py_;
+
+  // forward
+  MonitorElement *meNClustersBlade_;
+  MonitorElement *meYBlade_;
+  MonitorElement *meXBlade_;
+  MonitorElement *meChargeBlade_;
+  MonitorElement *meSizeBlade_;
+  MonitorElement *meSizeXBlade_;
+  MonitorElement *meSizeYBlade_;
+  MonitorElement *meMinRowBlade_;
+  MonitorElement *meMaxRowBlade_;
+  MonitorElement *meMinColBlade_;
+  MonitorElement *meMaxColBlade_;
+
+  MonitorElement *meNClustersDisk_;
+  MonitorElement *meYDisk_;
+  MonitorElement *meXDisk_;
+  MonitorElement *meChargeDisk_;
+  MonitorElement *meSizeDisk_;
+  MonitorElement *meSizeXDisk_;
+  MonitorElement *meSizeYDisk_;
+  MonitorElement *meMinRowDisk_;
+  MonitorElement *meMaxRowDisk_;
+  MonitorElement *meMinColDisk_;
+  MonitorElement *meMaxColDisk_;
+
+  MonitorElement *meNClustersRing_;
+  MonitorElement *meYRing_;
+  MonitorElement *meXRing_;
+  MonitorElement *meChargeRing_;
+  MonitorElement *meSizeRing_;
+  MonitorElement *meSizeXRing_;
+  MonitorElement *meSizeYRing_;
+  MonitorElement *meMinRowRing_;
+  MonitorElement *meMaxRowRing_;
+  MonitorElement *meMinColRing_;
+  MonitorElement *meMaxColRing_;
+  MonitorElement *mePixClustersRing_;
+  MonitorElement *mePixClustersRing_px_;
+  MonitorElement *mePixClustersRing_py_;
 };
 #endif
diff --git a/DQM/SiPixelMonitorCluster/interface/SiPixelClusterSource.h b/DQM/SiPixelMonitorCluster/interface/SiPixelClusterSource.h
index f89d9cab35bc9..10d9e18f2a5b9 100644
--- a/DQM/SiPixelMonitorCluster/interface/SiPixelClusterSource.h
+++ b/DQM/SiPixelMonitorCluster/interface/SiPixelClusterSource.h
@@ -4,7 +4,7 @@
 //
 // Package:     SiPixelMonitorCluster
 // Class  :     SiPixelClusterSource
-// 
+//
 /*
 
  Description: <one line class summary>
@@ -17,109 +17,113 @@
 // Original Author:  Vincenzo Chiochia & Andrew York
 //
 // Updated by: Lukas Wehrli
-// for pixel offline DQM 
-//         Created:  
+// for pixel offline DQM
+//         Created:
 
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 
 #include "DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h"
 
 #include "DataFormats/Common/interface/DetSetVectorNew.h"
-#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
 #include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
+#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
 
-
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include <boost/cstdint.hpp>
 
+#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonDetUnit/interface/GeomDetType.h"
+#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
 #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
-#include "Geometry/CommonDetUnit/interface/GeomDetType.h" 
-#include "Geometry/CommonDetUnit/interface/GeomDet.h" 
-#include "Geometry/CommonDetUnit/interface/GluedGeomDet.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
 
- class SiPixelClusterSource : public DQMEDAnalyzer {
-    public:
-       explicit SiPixelClusterSource(const edm::ParameterSet& conf);
-       ~SiPixelClusterSource() override;
-
-       typedef edmNew::DetSet<SiPixelCluster>::const_iterator    ClusterIterator;
-       
-       void analyze(const edm::Event&, const edm::EventSetup&) override;
-       void dqmBeginRun(const edm::Run&, edm::EventSetup const&) override;
-       void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-
-       virtual void buildStructure(edm::EventSetup const&);
-       virtual void bookMEs(DQMStore::IBooker &, const edm::EventSetup& iSetup);
-
-       std::string topFolderName_;
-
-    private:
-       edm::ParameterSet conf_;
-       edm::InputTag src_;
-       edm::InputTag digisrc_;
-       bool saveFile;
-       bool isPIB;
-       bool slowDown;
-       int eventNo;
-       std::map<uint32_t,SiPixelClusterModule*> thePixelStructure;
-       bool modOn; 
-       bool twoDimOn;
-       bool reducedSet;
-       //barrel:
-       bool ladOn, layOn, phiOn;
-       //forward:
-       bool ringOn, bladeOn, diskOn; 
-       bool smileyOn; //cluster sizeY vs Cluster eta plot 
-       bool firstRun;
-       int lumSec;
-       int nLumiSecs;
-       int nBigEvents;
-       MonitorElement* bigFpixClusterEventRate;
-       int bigEventSize;
-       bool isUpgrade;
-
-       std::vector<MonitorElement*> meClPosLayer;
-       std::vector<MonitorElement*> meClPosDiskpz;
-       std::vector<MonitorElement*> meClPosDiskmz;
-  
-       MonitorElement* meClusBarrelProf;
-       MonitorElement* meClusFpixPProf;
-       MonitorElement* meClusFpixMProf;
-
-       std::vector<MonitorElement*> meZeroRocBPIX;
-       MonitorElement* meZeroRocFPIX;
-
-       int noOfLayers;
-       int noOfDisks;
-
-       void getrococcupancy(DetId detId,const edm::DetSetVector<PixelDigi> & diginp,const TrackerTopology* const tTopo,
-			    std::vector<MonitorElement*> const & meinput);
-       void getrococcupancye(DetId detId,const edmNew::DetSetVector<SiPixelCluster> & clustColl, const TrackerTopology* const pTT,
-			     edm::ESHandle<TrackerGeometry> pDD,MonitorElement* meinput);
-
-  //define Token(-s)
-  edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster> > srcToken_;
-  edm::EDGetTokenT<edm::DetSetVector<PixelDigi> >         digisrcToken_;
+class SiPixelClusterSource : public DQMEDAnalyzer {
+public:
+  explicit SiPixelClusterSource(const edm::ParameterSet &conf);
+  ~SiPixelClusterSource() override;
+
+  typedef edmNew::DetSet<SiPixelCluster>::const_iterator ClusterIterator;
+
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void dqmBeginRun(const edm::Run &, edm::EventSetup const &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+
+  virtual void buildStructure(edm::EventSetup const &);
+  virtual void bookMEs(DQMStore::IBooker &, const edm::EventSetup &iSetup);
+
+  std::string topFolderName_;
+
+private:
+  edm::ParameterSet conf_;
+  edm::InputTag src_;
+  edm::InputTag digisrc_;
+  bool saveFile;
+  bool isPIB;
+  bool slowDown;
+  int eventNo;
+  std::map<uint32_t, SiPixelClusterModule *> thePixelStructure;
+  bool modOn;
+  bool twoDimOn;
+  bool reducedSet;
+  // barrel:
+  bool ladOn, layOn, phiOn;
+  // forward:
+  bool ringOn, bladeOn, diskOn;
+  bool smileyOn;  // cluster sizeY vs Cluster eta plot
+  bool firstRun;
+  int lumSec;
+  int nLumiSecs;
+  int nBigEvents;
+  MonitorElement *bigFpixClusterEventRate;
+  int bigEventSize;
+  bool isUpgrade;
+
+  std::vector<MonitorElement *> meClPosLayer;
+  std::vector<MonitorElement *> meClPosDiskpz;
+  std::vector<MonitorElement *> meClPosDiskmz;
+
+  MonitorElement *meClusBarrelProf;
+  MonitorElement *meClusFpixPProf;
+  MonitorElement *meClusFpixMProf;
+
+  std::vector<MonitorElement *> meZeroRocBPIX;
+  MonitorElement *meZeroRocFPIX;
+
+  int noOfLayers;
+  int noOfDisks;
+
+  void getrococcupancy(DetId detId,
+                       const edm::DetSetVector<PixelDigi> &diginp,
+                       const TrackerTopology *const tTopo,
+                       std::vector<MonitorElement *> const &meinput);
+  void getrococcupancye(DetId detId,
+                        const edmNew::DetSetVector<SiPixelCluster> &clustColl,
+                        const TrackerTopology *const pTT,
+                        edm::ESHandle<TrackerGeometry> pDD,
+                        MonitorElement *meinput);
+
+  // define Token(-s)
+  edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster>> srcToken_;
+  edm::EDGetTokenT<edm::DetSetVector<PixelDigi>> digisrcToken_;
 };
 
 #endif
diff --git a/DQM/SiPixelMonitorCluster/src/SiPixelClusterModule.cc b/DQM/SiPixelMonitorCluster/src/SiPixelClusterModule.cc
index 5f9fa4bf11927..539e5d8eef17a 100644
--- a/DQM/SiPixelMonitorCluster/src/SiPixelClusterModule.cc
+++ b/DQM/SiPixelMonitorCluster/src/SiPixelClusterModule.cc
@@ -2,61 +2,52 @@
 //
 // Package:    SiPixelMonitorCluster
 // Class:      SiPixelClusterSource
-// 
-/**\class 
+//
+/**\class
 
  Description: Pixel DQM source for Clusters
 
  Implementation:
-     Note that the x- and y-directions referred to in the cluster description refer to local x- and y-values given by the clusterizer.  Local x corresponds to row value and local y corresponds to column value.
+     Note that the x- and y-directions referred to in the cluster description
+ refer to local x- and y-values given by the clusterizer.  Local x corresponds
+ to row value and local y corresponds to column value.
 */
 //
 // Original Author:  Vincenzo Chiochia & Andrew York
-//         Created:  
+//         Created:
 //
 //
 // Updated by: Lukas Wehrli
-// for pixel offline DQM 
+// for pixel offline DQM
+#include "DQM/SiPixelCommon/interface/SiPixelHistogramId.h"
 #include "DQM/SiPixelMonitorCluster/interface/SiPixelClusterModule.h"
 #include "DQMServices/Core/interface/DQMStore.h"
-#include "DQM/SiPixelCommon/interface/SiPixelHistogramId.h"
 /// Framework
 #include "FWCore/ServiceRegistry/interface/Service.h"
 // STL
-#include <vector>
+#include <cstdlib>
+#include <iostream>
 #include <memory>
 #include <string>
-#include <iostream>
-#include <cstdlib>
+#include <vector>
 
 // Data Formats
+#include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h"
-#include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 //
 // Constructors
 //
-SiPixelClusterModule::SiPixelClusterModule() : id_(0),
-					 ncols_(416),
-					 nrows_(160) { }
+SiPixelClusterModule::SiPixelClusterModule() : id_(0), ncols_(416), nrows_(160) {}
 ///
-SiPixelClusterModule::SiPixelClusterModule(const uint32_t& id) : 
-  id_(id),
-  ncols_(416),
-  nrows_(160)
-{ 
-}
+SiPixelClusterModule::SiPixelClusterModule(const uint32_t &id) : id_(id), ncols_(416), nrows_(160) {}
 ///
-SiPixelClusterModule::SiPixelClusterModule(const uint32_t& id, const int& ncols, const int& nrows) : 
-  id_(id),
-  ncols_(ncols),
-  nrows_(nrows)
-{ 
-}
+SiPixelClusterModule::SiPixelClusterModule(const uint32_t &id, const int &ncols, const int &nrows)
+    : id_(id), ncols_(ncols), nrows_(nrows) {}
 //
 // Destructor
 //
@@ -64,8 +55,13 @@ SiPixelClusterModule::~SiPixelClusterModule() {}
 //
 // Book histograms
 //
-void SiPixelClusterModule::book(const edm::ParameterSet& iConfig, const edm::EventSetup& iSetup, DQMStore::IBooker & iBooker, int type, bool twoD, bool reducedSet, bool isUpgrade) {
-  
+void SiPixelClusterModule::book(const edm::ParameterSet &iConfig,
+                                const edm::EventSetup &iSetup,
+                                DQMStore::IBooker &iBooker,
+                                int type,
+                                bool twoD,
+                                bool reducedSet,
+                                bool isUpgrade) {
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
   pTT = tTopoHandle.product();
@@ -73,611 +69,697 @@ void SiPixelClusterModule::book(const edm::ParameterSet& iConfig, const edm::Eve
   bool barrel = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel);
   bool endcap = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap);
   bool isHalfModule = false;
-  if(barrel){
-    isHalfModule = PixelBarrelName(DetId(id_),pTT,isUpgrade).isHalfModule();
+  if (barrel) {
+    isHalfModule = PixelBarrelName(DetId(id_), pTT, isUpgrade).isHalfModule();
   }
-  int nbinx = ncols_/2;
-  int nbiny = nrows_/2;
+  int nbinx = ncols_ / 2;
+  int nbiny = nrows_ / 2;
 
   std::string hid;
   // Get collection name and instantiate Histo Id builder
-  edm::InputTag src = iConfig.getParameter<edm::InputTag>( "src" );
-  if(type==0){
-    SiPixelHistogramId* theHistogramId = new SiPixelHistogramId( src.label() );
+  edm::InputTag src = iConfig.getParameter<edm::InputTag>("src");
+  if (type == 0) {
+    SiPixelHistogramId *theHistogramId = new SiPixelHistogramId(src.label());
     // Number of clusters
-    hid = theHistogramId->setHistoId("nclusters",id_);
-    meNClusters_ = iBooker.book1D(hid,"Number of Clusters",8,0.,8.);
-    meNClusters_->setAxisTitle("Number of Clusters",1);
+    hid = theHistogramId->setHistoId("nclusters", id_);
+    meNClusters_ = iBooker.book1D(hid, "Number of Clusters", 8, 0., 8.);
+    meNClusters_->setAxisTitle("Number of Clusters", 1);
     // Total cluster charge in MeV
-    hid = theHistogramId->setHistoId("charge",id_);
-    meCharge_ = iBooker.book1D(hid,"Cluster charge",100,0.,200.);
-    meCharge_->setAxisTitle("Charge [kilo electrons]",1);
+    hid = theHistogramId->setHistoId("charge", id_);
+    meCharge_ = iBooker.book1D(hid, "Cluster charge", 100, 0., 200.);
+    meCharge_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    hid = theHistogramId->setHistoId("size",id_);
-    meSize_ = iBooker.book1D(hid,"Total cluster size",30,0.,30.);
-    meSize_->setAxisTitle("Cluster size [number of pixels]",1);
-    if(!reducedSet){
+    hid = theHistogramId->setHistoId("size", id_);
+    meSize_ = iBooker.book1D(hid, "Total cluster size", 30, 0., 30.);
+    meSize_->setAxisTitle("Cluster size [number of pixels]", 1);
+    if (!reducedSet) {
       // Lowest cluster row
-      hid = theHistogramId->setHistoId("minrow",id_);
-      meMinRow_ = iBooker.book1D(hid,"Lowest cluster row",200,0.,200.);
-      meMinRow_->setAxisTitle("Lowest cluster row",1);
+      hid = theHistogramId->setHistoId("minrow", id_);
+      meMinRow_ = iBooker.book1D(hid, "Lowest cluster row", 200, 0., 200.);
+      meMinRow_->setAxisTitle("Lowest cluster row", 1);
       // Highest cluster row
-      hid = theHistogramId->setHistoId("maxrow",id_);
-      meMaxRow_ = iBooker.book1D(hid,"Highest cluster row",200,0.,200.);
-      meMaxRow_->setAxisTitle("Highest cluster row",1);
+      hid = theHistogramId->setHistoId("maxrow", id_);
+      meMaxRow_ = iBooker.book1D(hid, "Highest cluster row", 200, 0., 200.);
+      meMaxRow_->setAxisTitle("Highest cluster row", 1);
       // Lowest cluster column
-      hid = theHistogramId->setHistoId("mincol",id_);
-      meMinCol_ = iBooker.book1D(hid,"Lowest cluster column",500,0.,500.);
-      meMinCol_->setAxisTitle("Lowest cluster column",1);
+      hid = theHistogramId->setHistoId("mincol", id_);
+      meMinCol_ = iBooker.book1D(hid, "Lowest cluster column", 500, 0., 500.);
+      meMinCol_->setAxisTitle("Lowest cluster column", 1);
       // Highest cluster column
-      hid = theHistogramId->setHistoId("maxcol",id_);
-      meMaxCol_ = iBooker.book1D(hid,"Highest cluster column",500,0.,500.);
-      meMaxCol_->setAxisTitle("Highest cluster column",1);
+      hid = theHistogramId->setHistoId("maxcol", id_);
+      meMaxCol_ = iBooker.book1D(hid, "Highest cluster column", 500, 0., 500.);
+      meMaxCol_->setAxisTitle("Highest cluster column", 1);
       // Cluster barycenter X position
-      hid = theHistogramId->setHistoId("x",id_);
-      meX_ = iBooker.book1D(hid,"Cluster barycenter X (row #)",200,0.,200.);
-      meX_->setAxisTitle("Barycenter x-position [row #]",1);
+      hid = theHistogramId->setHistoId("x", id_);
+      meX_ = iBooker.book1D(hid, "Cluster barycenter X (row #)", 200, 0., 200.);
+      meX_->setAxisTitle("Barycenter x-position [row #]", 1);
       // Cluster barycenter Y position
-      hid = theHistogramId->setHistoId("y",id_);
-      meY_ = iBooker.book1D(hid,"Cluster barycenter Y (column #)",500,0.,500.);
-      meY_->setAxisTitle("Barycenter y-position [column #]",1);
+      hid = theHistogramId->setHistoId("y", id_);
+      meY_ = iBooker.book1D(hid, "Cluster barycenter Y (column #)", 500, 0., 500.);
+      meY_->setAxisTitle("Barycenter y-position [column #]", 1);
       // Cluster width on the x-axis
-      hid = theHistogramId->setHistoId("sizeX",id_);
-      meSizeX_ = iBooker.book1D(hid,"Cluster x-width (rows)",10,0.,10.);
-      meSizeX_->setAxisTitle("Cluster x-size [rows]",1);
+      hid = theHistogramId->setHistoId("sizeX", id_);
+      meSizeX_ = iBooker.book1D(hid, "Cluster x-width (rows)", 10, 0., 10.);
+      meSizeX_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      hid = theHistogramId->setHistoId("sizeY",id_);
-      meSizeY_ = iBooker.book1D(hid,"Cluster y-width (columns)",15,0.,15.);
-      meSizeY_->setAxisTitle("Cluster y-size [columns]",1);
-      int nbinx = ncols_/2;
-      int nbiny = nrows_/2;
-      hid = theHistogramId->setHistoId("hitmap",id_);
-      if(twoD){
+      hid = theHistogramId->setHistoId("sizeY", id_);
+      meSizeY_ = iBooker.book1D(hid, "Cluster y-width (columns)", 15, 0., 15.);
+      meSizeY_->setAxisTitle("Cluster y-size [columns]", 1);
+      int nbinx = ncols_ / 2;
+      int nbiny = nrows_ / 2;
+      hid = theHistogramId->setHistoId("hitmap", id_);
+      if (twoD) {
         // 2D hit map
-        mePixClusters_ = iBooker.book2D(hid,"Number of Clusters (1bin=four pixels)",nbinx,0.,float(ncols_),nbiny,0.,float(nrows_));
-        mePixClusters_->setAxisTitle("Columns",1);
-        mePixClusters_->setAxisTitle("Rows",2);
-      }else{
+        mePixClusters_ = iBooker.book2D(
+            hid, "Number of Clusters (1bin=four pixels)", nbinx, 0., float(ncols_), nbiny, 0., float(nrows_));
+        mePixClusters_->setAxisTitle("Columns", 1);
+        mePixClusters_->setAxisTitle("Rows", 2);
+      } else {
         // projections of hitmap
-        mePixClusters_px_ = iBooker.book1D(hid+"_px","Number of Clusters (1bin=two columns)",nbinx,0.,float(ncols_));
-        mePixClusters_py_ = iBooker.book1D(hid+"_py","Number of Clusters (1bin=two rows)",nbiny,0.,float(nrows_));
-        mePixClusters_px_->setAxisTitle("Columns",1);
-        mePixClusters_py_->setAxisTitle("Rows",1);
+        mePixClusters_px_ =
+            iBooker.book1D(hid + "_px", "Number of Clusters (1bin=two columns)", nbinx, 0., float(ncols_));
+        mePixClusters_py_ = iBooker.book1D(hid + "_py", "Number of Clusters (1bin=two rows)", nbiny, 0., float(nrows_));
+        mePixClusters_px_->setAxisTitle("Columns", 1);
+        mePixClusters_py_->setAxisTitle("Rows", 1);
       }
     }
     delete theHistogramId;
   }
 
   //**
-  if(barrel && type==7){
+  if (barrel && type == 7) {
     hid = src.label() + "_Barrel";
-    meSizeYvsEtaBarrel_= iBooker.book2D("sizeYvsEta_" + hid,"Cluster size along beamline vs. Cluster position #eta",60,-3.,3.,40,0.,40.);
-    meSizeYvsEtaBarrel_->setAxisTitle("Cluster #eta",1);
-    meSizeYvsEtaBarrel_->setAxisTitle("Cluster size along beamline [number of pixels]",2);
+    meSizeYvsEtaBarrel_ = iBooker.book2D(
+        "sizeYvsEta_" + hid, "Cluster size along beamline vs. Cluster position #eta", 60, -3., 3., 40, 0., 40.);
+    meSizeYvsEtaBarrel_->setAxisTitle("Cluster #eta", 1);
+    meSizeYvsEtaBarrel_->setAxisTitle("Cluster size along beamline [number of pixels]", 2);
   }
-  if(type==1 && barrel){
+  if (type == 1 && barrel) {
     uint32_t DBladder;
-    DBladder = PixelBarrelName(DetId(id_),pTT,isUpgrade).ladderName();
-    char sladder[80]; sprintf(sladder,"Ladder_%02i",DBladder);
+    DBladder = PixelBarrelName(DetId(id_), pTT, isUpgrade).ladderName();
+    char sladder[80];
+    sprintf(sladder, "Ladder_%02i", DBladder);
     hid = src.label() + "_" + sladder;
-    if(isHalfModule) hid += "H";
-    else hid += "F";
+    if (isHalfModule)
+      hid += "H";
+    else
+      hid += "F";
     // Number of clusters
-    meNClustersLad_ = iBooker.book1D("nclusters_" + hid,"Number of Clusters",8,0.,8.);
-    meNClustersLad_->setAxisTitle("Number of Clusters",1);
+    meNClustersLad_ = iBooker.book1D("nclusters_" + hid, "Number of Clusters", 8, 0., 8.);
+    meNClustersLad_->setAxisTitle("Number of Clusters", 1);
     // Total cluster charge in MeV
-    meChargeLad_ = iBooker.book1D("charge_" + hid,"Cluster charge",100,0.,200.);
-    meChargeLad_->setAxisTitle("Charge [kilo electrons]",1);
+    meChargeLad_ = iBooker.book1D("charge_" + hid, "Cluster charge", 100, 0., 200.);
+    meChargeLad_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    meSizeLad_ = iBooker.book1D("size_" + hid,"Total cluster size",30,0.,30.);
-    meSizeLad_->setAxisTitle("Cluster size [number of pixels]",1);
-    if(!reducedSet){
+    meSizeLad_ = iBooker.book1D("size_" + hid, "Total cluster size", 30, 0., 30.);
+    meSizeLad_->setAxisTitle("Cluster size [number of pixels]", 1);
+    if (!reducedSet) {
       // Lowest cluster row
-      meMinRowLad_ = iBooker.book1D("minrow_" + hid,"Lowest cluster row",200,0.,200.);
-      meMinRowLad_->setAxisTitle("Lowest cluster row",1);
+      meMinRowLad_ = iBooker.book1D("minrow_" + hid, "Lowest cluster row", 200, 0., 200.);
+      meMinRowLad_->setAxisTitle("Lowest cluster row", 1);
       // Highest cluster row
-      meMaxRowLad_ = iBooker.book1D("maxrow_" + hid,"Highest cluster row",200,0.,200.);
-      meMaxRowLad_->setAxisTitle("Highest cluster row",1);
+      meMaxRowLad_ = iBooker.book1D("maxrow_" + hid, "Highest cluster row", 200, 0., 200.);
+      meMaxRowLad_->setAxisTitle("Highest cluster row", 1);
       // Lowest cluster column
-      meMinColLad_ = iBooker.book1D("mincol_" + hid,"Lowest cluster column",500,0.,500.);
-      meMinColLad_->setAxisTitle("Lowest cluster column",1);
+      meMinColLad_ = iBooker.book1D("mincol_" + hid, "Lowest cluster column", 500, 0., 500.);
+      meMinColLad_->setAxisTitle("Lowest cluster column", 1);
       // Highest cluster column
-      meMaxColLad_ = iBooker.book1D("maxcol_" + hid,"Highest cluster column",500,0.,500.);
-      meMaxColLad_->setAxisTitle("Highest cluster column",1);
+      meMaxColLad_ = iBooker.book1D("maxcol_" + hid, "Highest cluster column", 500, 0., 500.);
+      meMaxColLad_->setAxisTitle("Highest cluster column", 1);
       // Cluster barycenter X position
-      meXLad_ = iBooker.book1D("x_" + hid,"Cluster barycenter X (row #)",200,0.,200.);
-      meXLad_->setAxisTitle("Barycenter x-position [row #]",1);
+      meXLad_ = iBooker.book1D("x_" + hid, "Cluster barycenter X (row #)", 200, 0., 200.);
+      meXLad_->setAxisTitle("Barycenter x-position [row #]", 1);
       // Cluster barycenter Y position
-      meYLad_ = iBooker.book1D("y_" + hid,"Cluster barycenter Y (column #)",500,0.,500.);
-      meYLad_->setAxisTitle("Barycenter y-position [column #]",1);
+      meYLad_ = iBooker.book1D("y_" + hid, "Cluster barycenter Y (column #)", 500, 0., 500.);
+      meYLad_->setAxisTitle("Barycenter y-position [column #]", 1);
       // Cluster width on the x-axis
-      meSizeXLad_ = iBooker.book1D("sizeX_" + hid,"Cluster x-width (rows)",10,0.,10.);
-      meSizeXLad_->setAxisTitle("Cluster x-size [rows]",1);
+      meSizeXLad_ = iBooker.book1D("sizeX_" + hid, "Cluster x-width (rows)", 10, 0., 10.);
+      meSizeXLad_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      meSizeYLad_ = iBooker.book1D("sizeY_" + hid,"Cluster y-width (columns)",15,0.,15.);
-      meSizeYLad_->setAxisTitle("Cluster y-size [columns]",1);
-      if(twoD){
+      meSizeYLad_ = iBooker.book1D("sizeY_" + hid, "Cluster y-width (columns)", 15, 0., 15.);
+      meSizeYLad_->setAxisTitle("Cluster y-size [columns]", 1);
+      if (twoD) {
         // 2D hit map
-        mePixClustersLad_ = iBooker.book2D("hitmap_" + hid,"Number of Clusters (1bin=four pixels)",nbinx,0.,float(ncols_),nbiny,0.,float(nrows_));
-        mePixClustersLad_->setAxisTitle("Columns",1);
-        mePixClustersLad_->setAxisTitle("Rows",2);
-      }else{
+        mePixClustersLad_ = iBooker.book2D("hitmap_" + hid,
+                                           "Number of Clusters (1bin=four pixels)",
+                                           nbinx,
+                                           0.,
+                                           float(ncols_),
+                                           nbiny,
+                                           0.,
+                                           float(nrows_));
+        mePixClustersLad_->setAxisTitle("Columns", 1);
+        mePixClustersLad_->setAxisTitle("Rows", 2);
+      } else {
         // projections of hitmap
-        mePixClustersLad_px_ = iBooker.book1D("hitmap_" + hid+"_px","Number of Clusters (1bin=two columns)",nbinx,0.,float(ncols_));
-        mePixClustersLad_py_ = iBooker.book1D("hitmap_" + hid+"_py","Number of Clusters (1bin=two rows)",nbiny,0.,float(nrows_));
-        mePixClustersLad_px_->setAxisTitle("Columns",1);
-        mePixClustersLad_py_->setAxisTitle("Rows",1);
+        mePixClustersLad_px_ =
+            iBooker.book1D("hitmap_" + hid + "_px", "Number of Clusters (1bin=two columns)", nbinx, 0., float(ncols_));
+        mePixClustersLad_py_ =
+            iBooker.book1D("hitmap_" + hid + "_py", "Number of Clusters (1bin=two rows)", nbiny, 0., float(nrows_));
+        mePixClustersLad_px_->setAxisTitle("Columns", 1);
+        mePixClustersLad_py_->setAxisTitle("Rows", 1);
       }
     }
   }
 
-  if(type==2 && barrel){
-    
+  if (type == 2 && barrel) {
     uint32_t DBlayer;
-    DBlayer = PixelBarrelName(DetId(id_),pTT,isUpgrade).layerName();
-    char slayer[80]; sprintf(slayer,"Layer_%i",DBlayer);
+    DBlayer = PixelBarrelName(DetId(id_), pTT, isUpgrade).layerName();
+    char slayer[80];
+    sprintf(slayer, "Layer_%i", DBlayer);
     hid = src.label() + "_" + slayer;
     // Number of clusters
-    meNClustersLay_ = iBooker.book1D("nclusters_" + hid,"Number of Clusters",8,0.,8.);
-    meNClustersLay_->setAxisTitle("Number of Clusters",1);
+    meNClustersLay_ = iBooker.book1D("nclusters_" + hid, "Number of Clusters", 8, 0., 8.);
+    meNClustersLay_->setAxisTitle("Number of Clusters", 1);
     // Total cluster charge in MeV
-    meChargeLay_ = iBooker.book1D("charge_" + hid,"Cluster charge",100,0.,200.);
-    meChargeLay_->setAxisTitle("Charge [kilo electrons]",1);
+    meChargeLay_ = iBooker.book1D("charge_" + hid, "Cluster charge", 100, 0., 200.);
+    meChargeLay_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    meSizeLay_ = iBooker.book1D("size_" + hid,"Total cluster size",30,0.,30.);
-    meSizeLay_->setAxisTitle("Cluster size [in pixels]",1);
-    if(!reducedSet){
+    meSizeLay_ = iBooker.book1D("size_" + hid, "Total cluster size", 30, 0., 30.);
+    meSizeLay_->setAxisTitle("Cluster size [in pixels]", 1);
+    if (!reducedSet) {
       // Lowest cluster row
-      meMinRowLay_ = iBooker.book1D("minrow_" + hid,"Lowest cluster row",200,0.,200.);
-      meMinRowLay_->setAxisTitle("Lowest cluster row",1);
+      meMinRowLay_ = iBooker.book1D("minrow_" + hid, "Lowest cluster row", 200, 0., 200.);
+      meMinRowLay_->setAxisTitle("Lowest cluster row", 1);
       // Highest cluster row
-      meMaxRowLay_ = iBooker.book1D("maxrow_" + hid,"Highest cluster row",200,0.,200.);
-      meMaxRowLay_->setAxisTitle("Highest cluster row",1);
+      meMaxRowLay_ = iBooker.book1D("maxrow_" + hid, "Highest cluster row", 200, 0., 200.);
+      meMaxRowLay_->setAxisTitle("Highest cluster row", 1);
       // Lowest cluster column
-      meMinColLay_ = iBooker.book1D("mincol_" + hid,"Lowest cluster column",500,0.,500.);
-      meMinColLay_->setAxisTitle("Lowest cluster column",1);
+      meMinColLay_ = iBooker.book1D("mincol_" + hid, "Lowest cluster column", 500, 0., 500.);
+      meMinColLay_->setAxisTitle("Lowest cluster column", 1);
       // Highest cluster column
-      meMaxColLay_ = iBooker.book1D("maxcol_" + hid,"Highest cluster column",500,0.,500.);
-      meMaxColLay_->setAxisTitle("Highest cluster column",1);
+      meMaxColLay_ = iBooker.book1D("maxcol_" + hid, "Highest cluster column", 500, 0., 500.);
+      meMaxColLay_->setAxisTitle("Highest cluster column", 1);
       // Cluster barycenter X position
-      meXLay_ = iBooker.book1D("x_" + hid,"Cluster barycenter X (row #)",200,0.,200.);
-      meXLay_->setAxisTitle("Barycenter x-position [row #]",1);
+      meXLay_ = iBooker.book1D("x_" + hid, "Cluster barycenter X (row #)", 200, 0., 200.);
+      meXLay_->setAxisTitle("Barycenter x-position [row #]", 1);
       // Cluster barycenter Y position
-      meYLay_ = iBooker.book1D("y_" + hid,"Cluster barycenter Y (column #)",500,0.,500.);
-      meYLay_->setAxisTitle("Barycenter y-position [column #]",1);
+      meYLay_ = iBooker.book1D("y_" + hid, "Cluster barycenter Y (column #)", 500, 0., 500.);
+      meYLay_->setAxisTitle("Barycenter y-position [column #]", 1);
       // Cluster width on the x-axis
-      meSizeXLay_ = iBooker.book1D("sizeX_" + hid,"Cluster x-width (rows)",10,0.,10.);
-      meSizeXLay_->setAxisTitle("Cluster x-size [rows]",1);
+      meSizeXLay_ = iBooker.book1D("sizeX_" + hid, "Cluster x-width (rows)", 10, 0., 10.);
+      meSizeXLay_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      meSizeYLay_ = iBooker.book1D("sizeY_" + hid,"Cluster y-width (columns)",15,0.,15.);
-      meSizeYLay_->setAxisTitle("Cluster y-size [columns]",1);
-      if(twoD){
+      meSizeYLay_ = iBooker.book1D("sizeY_" + hid, "Cluster y-width (columns)", 15, 0., 15.);
+      meSizeYLay_->setAxisTitle("Cluster y-size [columns]", 1);
+      if (twoD) {
         // 2D hit map
-        if(isHalfModule){
-	  mePixClustersLay_ = iBooker.book2D("hitmap_" + hid,"Number of Clusters (1bin=four pixels)",nbinx,0.,float(ncols_),2*nbiny,0.,float(2*nrows_));
-        }else{
-	  mePixClustersLay_ = iBooker.book2D("hitmap_" + hid,"Number of Clusters (1bin=four pixels)",nbinx,0.,float(ncols_),nbiny,0.,float(nrows_));
+        if (isHalfModule) {
+          mePixClustersLay_ = iBooker.book2D("hitmap_" + hid,
+                                             "Number of Clusters (1bin=four pixels)",
+                                             nbinx,
+                                             0.,
+                                             float(ncols_),
+                                             2 * nbiny,
+                                             0.,
+                                             float(2 * nrows_));
+        } else {
+          mePixClustersLay_ = iBooker.book2D("hitmap_" + hid,
+                                             "Number of Clusters (1bin=four pixels)",
+                                             nbinx,
+                                             0.,
+                                             float(ncols_),
+                                             nbiny,
+                                             0.,
+                                             float(nrows_));
         }
-        mePixClustersLay_->setAxisTitle("Columns",1);
-        mePixClustersLay_->setAxisTitle("Rows",2);
-      }else{
+        mePixClustersLay_->setAxisTitle("Columns", 1);
+        mePixClustersLay_->setAxisTitle("Rows", 2);
+      } else {
         // projections of hitmap
-        mePixClustersLay_px_ = iBooker.book1D("hitmap_" + hid+"_px","Number of Clusters (1bin=two columns)",nbinx,0.,float(ncols_));
-        if(isHalfModule){
-	  mePixClustersLay_py_ = iBooker.book1D("hitmap_" + hid+"_py","Number of Clusters (1bin=two rows)",2*nbiny,0.,float(2*nrows_));
-        }else{
-	  mePixClustersLay_py_ = iBooker.book1D("hitmap_" + hid+"_py","Number of Clusters (1bin=two rows)",nbiny,0.,float(nrows_));
+        mePixClustersLay_px_ =
+            iBooker.book1D("hitmap_" + hid + "_px", "Number of Clusters (1bin=two columns)", nbinx, 0., float(ncols_));
+        if (isHalfModule) {
+          mePixClustersLay_py_ = iBooker.book1D(
+              "hitmap_" + hid + "_py", "Number of Clusters (1bin=two rows)", 2 * nbiny, 0., float(2 * nrows_));
+        } else {
+          mePixClustersLay_py_ =
+              iBooker.book1D("hitmap_" + hid + "_py", "Number of Clusters (1bin=two rows)", nbiny, 0., float(nrows_));
         }
-        mePixClustersLay_px_->setAxisTitle("Columns",1);
-        mePixClustersLay_py_->setAxisTitle("Rows",1);
+        mePixClustersLay_px_->setAxisTitle("Columns", 1);
+        mePixClustersLay_py_->setAxisTitle("Rows", 1);
       }
     }
   }
-  if(type==3 && barrel){
+  if (type == 3 && barrel) {
     uint32_t DBmodule;
-    DBmodule = PixelBarrelName(DetId(id_),pTT,isUpgrade).moduleName();
-    char smodule[80]; sprintf(smodule,"Ring_%i",DBmodule);
+    DBmodule = PixelBarrelName(DetId(id_), pTT, isUpgrade).moduleName();
+    char smodule[80];
+    sprintf(smodule, "Ring_%i", DBmodule);
     hid = src.label() + "_" + smodule;
     // Number of clusters
-    meNClustersPhi_ = iBooker.book1D("nclusters_" + hid,"Number of Clusters",8,0.,8.);
-    meNClustersPhi_->setAxisTitle("Number of Clusters",1);
+    meNClustersPhi_ = iBooker.book1D("nclusters_" + hid, "Number of Clusters", 8, 0., 8.);
+    meNClustersPhi_->setAxisTitle("Number of Clusters", 1);
     // Total cluster charge in MeV
-    meChargePhi_ = iBooker.book1D("charge_" + hid,"Cluster charge",100,0.,200.);
-    meChargePhi_->setAxisTitle("Charge [kilo electrons]",1);
+    meChargePhi_ = iBooker.book1D("charge_" + hid, "Cluster charge", 100, 0., 200.);
+    meChargePhi_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    meSizePhi_ = iBooker.book1D("size_" + hid,"Total cluster size",30,0.,30.);
-    meSizePhi_->setAxisTitle("Cluster size [number of pixels]",1);
-    if(!reducedSet){
+    meSizePhi_ = iBooker.book1D("size_" + hid, "Total cluster size", 30, 0., 30.);
+    meSizePhi_->setAxisTitle("Cluster size [number of pixels]", 1);
+    if (!reducedSet) {
       // Lowest cluster row
-      meMinRowPhi_ = iBooker.book1D("minrow_" + hid,"Lowest cluster row",200,0.,200.);
-      meMinRowPhi_->setAxisTitle("Lowest cluster row",1);
+      meMinRowPhi_ = iBooker.book1D("minrow_" + hid, "Lowest cluster row", 200, 0., 200.);
+      meMinRowPhi_->setAxisTitle("Lowest cluster row", 1);
       // Highest cluster row
-      meMaxRowPhi_ = iBooker.book1D("maxrow_" + hid,"Highest cluster row",200,0.,200.);
-      meMaxRowPhi_->setAxisTitle("Highest cluster row",1);
+      meMaxRowPhi_ = iBooker.book1D("maxrow_" + hid, "Highest cluster row", 200, 0., 200.);
+      meMaxRowPhi_->setAxisTitle("Highest cluster row", 1);
       // Lowest cluster column
-      meMinColPhi_ = iBooker.book1D("mincol_" + hid,"Lowest cluster column",500,0.,500.);
-      meMinColPhi_->setAxisTitle("Lowest cluster column",1);
+      meMinColPhi_ = iBooker.book1D("mincol_" + hid, "Lowest cluster column", 500, 0., 500.);
+      meMinColPhi_->setAxisTitle("Lowest cluster column", 1);
       // Highest cluster column
-      meMaxColPhi_ = iBooker.book1D("maxcol_" + hid,"Highest cluster column",500,0.,500.);
-      meMaxColPhi_->setAxisTitle("Highest cluster column",1);
+      meMaxColPhi_ = iBooker.book1D("maxcol_" + hid, "Highest cluster column", 500, 0., 500.);
+      meMaxColPhi_->setAxisTitle("Highest cluster column", 1);
       // Cluster barycenter X position
-      meXPhi_ = iBooker.book1D("x_" + hid,"Cluster barycenter X (row #)",200,0.,200.);
-      meXPhi_->setAxisTitle("Barycenter x-position [row #]",1);
+      meXPhi_ = iBooker.book1D("x_" + hid, "Cluster barycenter X (row #)", 200, 0., 200.);
+      meXPhi_->setAxisTitle("Barycenter x-position [row #]", 1);
       // Cluster barycenter Y position
-      meYPhi_ = iBooker.book1D("y_" + hid,"Cluster barycenter Y (column #)",500,0.,500.);
-      meYPhi_->setAxisTitle("Barycenter y-position [column #]",1);
+      meYPhi_ = iBooker.book1D("y_" + hid, "Cluster barycenter Y (column #)", 500, 0., 500.);
+      meYPhi_->setAxisTitle("Barycenter y-position [column #]", 1);
       // Cluster width on the x-axis
-      meSizeXPhi_ = iBooker.book1D("sizeX_" + hid,"Cluster x-width (rows)",10,0.,10.);
-      meSizeXPhi_->setAxisTitle("Cluster x-size [rows]",1);
+      meSizeXPhi_ = iBooker.book1D("sizeX_" + hid, "Cluster x-width (rows)", 10, 0., 10.);
+      meSizeXPhi_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      meSizeYPhi_ = iBooker.book1D("sizeY_" + hid,"Cluster y-width (columns)",15,0.,15.);
-      meSizeYPhi_->setAxisTitle("Cluster y-size [columns]",1);
-      if(twoD){
+      meSizeYPhi_ = iBooker.book1D("sizeY_" + hid, "Cluster y-width (columns)", 15, 0., 15.);
+      meSizeYPhi_->setAxisTitle("Cluster y-size [columns]", 1);
+      if (twoD) {
         // 2D hit map
-        if(isHalfModule){
-	  mePixClustersPhi_ = iBooker.book2D("hitmap_" + hid,"Number of Clusters (1bin=four pixels)",nbinx,0.,float(ncols_),2*nbiny,0.,float(2*nrows_));
-        }else{
-	  mePixClustersPhi_ = iBooker.book2D("hitmap_" + hid,"Number of Clusters (1bin=four pixels)",nbinx,0.,float(ncols_),nbiny,0.,float(nrows_));
+        if (isHalfModule) {
+          mePixClustersPhi_ = iBooker.book2D("hitmap_" + hid,
+                                             "Number of Clusters (1bin=four pixels)",
+                                             nbinx,
+                                             0.,
+                                             float(ncols_),
+                                             2 * nbiny,
+                                             0.,
+                                             float(2 * nrows_));
+        } else {
+          mePixClustersPhi_ = iBooker.book2D("hitmap_" + hid,
+                                             "Number of Clusters (1bin=four pixels)",
+                                             nbinx,
+                                             0.,
+                                             float(ncols_),
+                                             nbiny,
+                                             0.,
+                                             float(nrows_));
         }
-        mePixClustersPhi_->setAxisTitle("Columns",1);
-        mePixClustersPhi_->setAxisTitle("Rows",2);
-      }else{
+        mePixClustersPhi_->setAxisTitle("Columns", 1);
+        mePixClustersPhi_->setAxisTitle("Rows", 2);
+      } else {
         // projections of hitmap
-        mePixClustersPhi_px_ = iBooker.book1D("hitmap_" + hid+"_px","Number of Clusters (1bin=two columns)",nbinx,0.,float(ncols_));
-        if(isHalfModule){
-	  mePixClustersPhi_py_ = iBooker.book1D("hitmap_" + hid+"_py","Number of Clusters (1bin=two rows)",2*nbiny,0.,float(2*nrows_));
-        }else{
-	  mePixClustersPhi_py_ = iBooker.book1D("hitmap_" + hid+"_py","Number of Clusters (1bin=two rows)",nbiny,0.,float(nrows_));
+        mePixClustersPhi_px_ =
+            iBooker.book1D("hitmap_" + hid + "_px", "Number of Clusters (1bin=two columns)", nbinx, 0., float(ncols_));
+        if (isHalfModule) {
+          mePixClustersPhi_py_ = iBooker.book1D(
+              "hitmap_" + hid + "_py", "Number of Clusters (1bin=two rows)", 2 * nbiny, 0., float(2 * nrows_));
+        } else {
+          mePixClustersPhi_py_ =
+              iBooker.book1D("hitmap_" + hid + "_py", "Number of Clusters (1bin=two rows)", nbiny, 0., float(nrows_));
         }
-        mePixClustersPhi_px_->setAxisTitle("Columns",1);
-        mePixClustersPhi_py_->setAxisTitle("Rows",1);
+        mePixClustersPhi_px_->setAxisTitle("Columns", 1);
+        mePixClustersPhi_py_->setAxisTitle("Rows", 1);
       }
     }
   }
 
-  if(type==4 && endcap){
+  if (type == 4 && endcap) {
     uint32_t blade;
-    blade = PixelEndcapName(DetId(id_),pTT,isUpgrade).bladeName();
-    
-    char sblade[80]; sprintf(sblade, "Blade_%02i",blade);
+    blade = PixelEndcapName(DetId(id_), pTT, isUpgrade).bladeName();
+
+    char sblade[80];
+    sprintf(sblade, "Blade_%02i", blade);
     hid = src.label() + "_" + sblade;
     // Number of clusters
-    meNClustersBlade_ = iBooker.book1D("nclusters_" + hid,"Number of Clusters",8,0.,8.);
-    meNClustersBlade_->setAxisTitle("Number of Clusters",1);
+    meNClustersBlade_ = iBooker.book1D("nclusters_" + hid, "Number of Clusters", 8, 0., 8.);
+    meNClustersBlade_->setAxisTitle("Number of Clusters", 1);
     // Total cluster charge in MeV
-    meChargeBlade_ = iBooker.book1D("charge_" + hid,"Cluster charge",100,0.,200.);
-    meChargeBlade_->setAxisTitle("Charge [kilo electrons]",1);
+    meChargeBlade_ = iBooker.book1D("charge_" + hid, "Cluster charge", 100, 0., 200.);
+    meChargeBlade_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    meSizeBlade_ = iBooker.book1D("size_" + hid,"Total cluster size",30,0.,30.);
-    meSizeBlade_->setAxisTitle("Cluster size [number of pixels]",1);
-    if(!reducedSet){
+    meSizeBlade_ = iBooker.book1D("size_" + hid, "Total cluster size", 30, 0., 30.);
+    meSizeBlade_->setAxisTitle("Cluster size [number of pixels]", 1);
+    if (!reducedSet) {
       // Lowest cluster row
-      meMinRowBlade_ = iBooker.book1D("minrow_" + hid,"Lowest cluster row",200,0.,200.);
-      meMinRowBlade_->setAxisTitle("Lowest cluster row",1);
+      meMinRowBlade_ = iBooker.book1D("minrow_" + hid, "Lowest cluster row", 200, 0., 200.);
+      meMinRowBlade_->setAxisTitle("Lowest cluster row", 1);
       // Highest cluster row
-      meMaxRowBlade_ = iBooker.book1D("maxrow_" + hid,"Highest cluster row",200,0.,200.);
-      meMaxRowBlade_->setAxisTitle("Highest cluster row",1);
+      meMaxRowBlade_ = iBooker.book1D("maxrow_" + hid, "Highest cluster row", 200, 0., 200.);
+      meMaxRowBlade_->setAxisTitle("Highest cluster row", 1);
       // Lowest cluster column
-      meMinColBlade_ = iBooker.book1D("mincol_" + hid,"Lowest cluster column",500,0.,500.);
-      meMinColBlade_->setAxisTitle("Lowest cluster column",1);
+      meMinColBlade_ = iBooker.book1D("mincol_" + hid, "Lowest cluster column", 500, 0., 500.);
+      meMinColBlade_->setAxisTitle("Lowest cluster column", 1);
       // Highest cluster column
-      meMaxColBlade_ = iBooker.book1D("maxcol_" + hid,"Highest cluster column",500,0.,500.);
-      meMaxColBlade_->setAxisTitle("Highest cluster column",1);
+      meMaxColBlade_ = iBooker.book1D("maxcol_" + hid, "Highest cluster column", 500, 0., 500.);
+      meMaxColBlade_->setAxisTitle("Highest cluster column", 1);
       // Cluster barycenter X position
-      meXBlade_ = iBooker.book1D("x_" + hid,"Cluster barycenter X (row #)",200,0.,200.);
-      meXBlade_->setAxisTitle("Barycenter x-position [row #]",1);
+      meXBlade_ = iBooker.book1D("x_" + hid, "Cluster barycenter X (row #)", 200, 0., 200.);
+      meXBlade_->setAxisTitle("Barycenter x-position [row #]", 1);
       // Cluster barycenter Y position
-      meYBlade_ = iBooker.book1D("y_" + hid,"Cluster barycenter Y (column #)",500,0.,500.);
-      meYBlade_->setAxisTitle("Barycenter y-position [column #]",1);
+      meYBlade_ = iBooker.book1D("y_" + hid, "Cluster barycenter Y (column #)", 500, 0., 500.);
+      meYBlade_->setAxisTitle("Barycenter y-position [column #]", 1);
       // Cluster width on the x-axis
-      meSizeXBlade_ = iBooker.book1D("sizeX_" + hid,"Cluster x-width (rows)",10,0.,10.);
-      meSizeXBlade_->setAxisTitle("Cluster x-size [rows]",1);
+      meSizeXBlade_ = iBooker.book1D("sizeX_" + hid, "Cluster x-width (rows)", 10, 0., 10.);
+      meSizeXBlade_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      meSizeYBlade_ = iBooker.book1D("sizeY_" + hid,"Cluster y-width (columns)",15,0.,15.);
-      meSizeYBlade_->setAxisTitle("Cluster y-size [columns]",1);
+      meSizeYBlade_ = iBooker.book1D("sizeY_" + hid, "Cluster y-width (columns)", 15, 0., 15.);
+      meSizeYBlade_->setAxisTitle("Cluster y-size [columns]", 1);
     }
   }
-  if(type==5 && endcap){
+  if (type == 5 && endcap) {
     uint32_t disk;
-    disk = PixelEndcapName(DetId(id_),pTT,isUpgrade).diskName();
-    
-    char sdisk[80]; sprintf(sdisk, "Disk_%i",disk);
+    disk = PixelEndcapName(DetId(id_), pTT, isUpgrade).diskName();
+
+    char sdisk[80];
+    sprintf(sdisk, "Disk_%i", disk);
     hid = src.label() + "_" + sdisk;
     // Number of clusters
-    meNClustersDisk_ = iBooker.book1D("nclusters_" + hid,"Number of Clusters",8,0.,8.);
-    meNClustersDisk_->setAxisTitle("Number of Clusters",1);
+    meNClustersDisk_ = iBooker.book1D("nclusters_" + hid, "Number of Clusters", 8, 0., 8.);
+    meNClustersDisk_->setAxisTitle("Number of Clusters", 1);
     // Total cluster charge in MeV
-    meChargeDisk_ = iBooker.book1D("charge_" + hid,"Cluster charge",100,0.,200.);
-    meChargeDisk_->setAxisTitle("Charge [kilo electrons]",1);
+    meChargeDisk_ = iBooker.book1D("charge_" + hid, "Cluster charge", 100, 0., 200.);
+    meChargeDisk_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    meSizeDisk_ = iBooker.book1D("size_" + hid,"Total cluster size",30,0.,30.);
-    meSizeDisk_->setAxisTitle("Cluster size [number of pixels]",1);
-    if(!reducedSet){
+    meSizeDisk_ = iBooker.book1D("size_" + hid, "Total cluster size", 30, 0., 30.);
+    meSizeDisk_->setAxisTitle("Cluster size [number of pixels]", 1);
+    if (!reducedSet) {
       // Lowest cluster row
-      meMinRowDisk_ = iBooker.book1D("minrow_" + hid,"Lowest cluster row",200,0.,200.);
-      meMinRowDisk_->setAxisTitle("Lowest cluster row",1);
+      meMinRowDisk_ = iBooker.book1D("minrow_" + hid, "Lowest cluster row", 200, 0., 200.);
+      meMinRowDisk_->setAxisTitle("Lowest cluster row", 1);
       // Highest cluster row
-      meMaxRowDisk_ = iBooker.book1D("maxrow_" + hid,"Highest cluster row",200,0.,200.);
-      meMaxRowDisk_->setAxisTitle("Highest cluster row",1);
+      meMaxRowDisk_ = iBooker.book1D("maxrow_" + hid, "Highest cluster row", 200, 0., 200.);
+      meMaxRowDisk_->setAxisTitle("Highest cluster row", 1);
       // Lowest cluster column
-      meMinColDisk_ = iBooker.book1D("mincol_" + hid,"Lowest cluster column",500,0.,500.);
-      meMinColDisk_->setAxisTitle("Lowest cluster column",1);
+      meMinColDisk_ = iBooker.book1D("mincol_" + hid, "Lowest cluster column", 500, 0., 500.);
+      meMinColDisk_->setAxisTitle("Lowest cluster column", 1);
       // Highest cluster column
-      meMaxColDisk_ = iBooker.book1D("maxcol_" + hid,"Highest cluster column",500,0.,500.);
-      meMaxColDisk_->setAxisTitle("Highest cluster column",1);
+      meMaxColDisk_ = iBooker.book1D("maxcol_" + hid, "Highest cluster column", 500, 0., 500.);
+      meMaxColDisk_->setAxisTitle("Highest cluster column", 1);
       // Cluster barycenter X position
-      meXDisk_ = iBooker.book1D("x_" + hid,"Cluster barycenter X (row #)",200,0.,200.);
-      meXDisk_->setAxisTitle("Barycenter x-position [row #]",1);
+      meXDisk_ = iBooker.book1D("x_" + hid, "Cluster barycenter X (row #)", 200, 0., 200.);
+      meXDisk_->setAxisTitle("Barycenter x-position [row #]", 1);
       // Cluster barycenter Y position
-      meYDisk_ = iBooker.book1D("y_" + hid,"Cluster barycenter Y (column #)",500,0.,500.);
-      meYDisk_->setAxisTitle("Barycenter y-position [column #]",1);
+      meYDisk_ = iBooker.book1D("y_" + hid, "Cluster barycenter Y (column #)", 500, 0., 500.);
+      meYDisk_->setAxisTitle("Barycenter y-position [column #]", 1);
       // Cluster width on the x-axis
-      meSizeXDisk_ = iBooker.book1D("sizeX_" + hid,"Cluster x-width (rows)",10,0.,10.);
-      meSizeXDisk_->setAxisTitle("Cluster x-size [rows]",1);
+      meSizeXDisk_ = iBooker.book1D("sizeX_" + hid, "Cluster x-width (rows)", 10, 0., 10.);
+      meSizeXDisk_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      meSizeYDisk_ = iBooker.book1D("sizeY_" + hid,"Cluster y-width (columns)",15,0.,15.);
-      meSizeYDisk_->setAxisTitle("Cluster y-size [columns]",1);
+      meSizeYDisk_ = iBooker.book1D("sizeY_" + hid, "Cluster y-width (columns)", 15, 0., 15.);
+      meSizeYDisk_->setAxisTitle("Cluster y-size [columns]", 1);
     }
   }
 
-  if(type==6 && endcap){
+  if (type == 6 && endcap) {
     uint32_t panel;
     uint32_t module;
-    panel= PixelEndcapName(DetId(id_),pTT,isUpgrade).pannelName();
-    module= PixelEndcapName(DetId(id_),pTT,isUpgrade).plaquetteName();
-    
-    char slab[80]; sprintf(slab, "Panel_%i_Ring_%i",panel, module);
+    panel = PixelEndcapName(DetId(id_), pTT, isUpgrade).pannelName();
+    module = PixelEndcapName(DetId(id_), pTT, isUpgrade).plaquetteName();
+
+    char slab[80];
+    sprintf(slab, "Panel_%i_Ring_%i", panel, module);
     hid = src.label() + "_" + slab;
     // Number of clusters
-    meNClustersRing_ = iBooker.book1D("nclusters_" + hid,"Number of Clusters",8,0.,8.);
-    meNClustersRing_->setAxisTitle("Number of Clusters",1);
+    meNClustersRing_ = iBooker.book1D("nclusters_" + hid, "Number of Clusters", 8, 0., 8.);
+    meNClustersRing_->setAxisTitle("Number of Clusters", 1);
     // Total cluster charge in MeV
-    meChargeRing_ = iBooker.book1D("charge_" + hid,"Cluster charge",100,0.,200.);
-    meChargeRing_->setAxisTitle("Charge [kilo electrons]",1);
+    meChargeRing_ = iBooker.book1D("charge_" + hid, "Cluster charge", 100, 0., 200.);
+    meChargeRing_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    meSizeRing_ = iBooker.book1D("size_" + hid,"Total cluster size",30,0.,30.);
-    meSizeRing_->setAxisTitle("Cluster size [number of pixels]",1);
-    if(!reducedSet){
+    meSizeRing_ = iBooker.book1D("size_" + hid, "Total cluster size", 30, 0., 30.);
+    meSizeRing_->setAxisTitle("Cluster size [number of pixels]", 1);
+    if (!reducedSet) {
       // Lowest cluster row
-      meMinRowRing_ = iBooker.book1D("minrow_" + hid,"Lowest cluster row",200,0.,200.);
-      meMinRowRing_->setAxisTitle("Lowest cluster row",1);
+      meMinRowRing_ = iBooker.book1D("minrow_" + hid, "Lowest cluster row", 200, 0., 200.);
+      meMinRowRing_->setAxisTitle("Lowest cluster row", 1);
       // Highest cluster row
-      meMaxRowRing_ = iBooker.book1D("maxrow_" + hid,"Highest cluster row",200,0.,200.);
-      meMaxRowRing_->setAxisTitle("Highest cluster row",1);
+      meMaxRowRing_ = iBooker.book1D("maxrow_" + hid, "Highest cluster row", 200, 0., 200.);
+      meMaxRowRing_->setAxisTitle("Highest cluster row", 1);
       // Lowest cluster column
-      meMinColRing_ = iBooker.book1D("mincol_" + hid,"Lowest cluster column",500,0.,500.);
-      meMinColRing_->setAxisTitle("Lowest cluster column",1);
+      meMinColRing_ = iBooker.book1D("mincol_" + hid, "Lowest cluster column", 500, 0., 500.);
+      meMinColRing_->setAxisTitle("Lowest cluster column", 1);
       // Highest cluster column
-      meMaxColRing_ = iBooker.book1D("maxcol_" + hid,"Highest cluster column",500,0.,500.);
-      meMaxColRing_->setAxisTitle("Highest cluster column",1);
+      meMaxColRing_ = iBooker.book1D("maxcol_" + hid, "Highest cluster column", 500, 0., 500.);
+      meMaxColRing_->setAxisTitle("Highest cluster column", 1);
       // Cluster barycenter X position
-      meXRing_ = iBooker.book1D("x_" + hid,"Cluster barycenter X (row #)",200,0.,200.);
-      meXRing_->setAxisTitle("Barycenter x-position [row #]",1);
+      meXRing_ = iBooker.book1D("x_" + hid, "Cluster barycenter X (row #)", 200, 0., 200.);
+      meXRing_->setAxisTitle("Barycenter x-position [row #]", 1);
       // Cluster barycenter Y position
-      meYRing_ = iBooker.book1D("y_" + hid,"Cluster barycenter Y (column #)",500,0.,500.);
-      meYRing_->setAxisTitle("Barycenter y-position [column #]",1);
+      meYRing_ = iBooker.book1D("y_" + hid, "Cluster barycenter Y (column #)", 500, 0., 500.);
+      meYRing_->setAxisTitle("Barycenter y-position [column #]", 1);
       // Cluster width on the x-axis
-      meSizeXRing_ = iBooker.book1D("sizeX_" + hid,"Cluster x-width (rows)",10,0.,10.);
-      meSizeXRing_->setAxisTitle("Cluster x-size [rows]",1);
+      meSizeXRing_ = iBooker.book1D("sizeX_" + hid, "Cluster x-width (rows)", 10, 0., 10.);
+      meSizeXRing_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      meSizeYRing_ = iBooker.book1D("sizeY_" + hid,"Cluster y-width (columns)",15,0.,15.);
-      meSizeYRing_->setAxisTitle("Cluster y-size [columns]",1);
-      if(twoD){
+      meSizeYRing_ = iBooker.book1D("sizeY_" + hid, "Cluster y-width (columns)", 15, 0., 15.);
+      meSizeYRing_->setAxisTitle("Cluster y-size [columns]", 1);
+      if (twoD) {
         // 2D hit map
-        mePixClustersRing_ = iBooker.book2D("hitmap_" + hid,"Number of Clusters (1bin=four pixels)",nbinx,0.,float(ncols_),nbiny,0.,float(nrows_));
-        mePixClustersRing_->setAxisTitle("Columns",1);
-        mePixClustersRing_->setAxisTitle("Rows",2);
-      }else{
+        mePixClustersRing_ = iBooker.book2D("hitmap_" + hid,
+                                            "Number of Clusters (1bin=four pixels)",
+                                            nbinx,
+                                            0.,
+                                            float(ncols_),
+                                            nbiny,
+                                            0.,
+                                            float(nrows_));
+        mePixClustersRing_->setAxisTitle("Columns", 1);
+        mePixClustersRing_->setAxisTitle("Rows", 2);
+      } else {
         // projections of hitmap
-        mePixClustersRing_px_ = iBooker.book1D("hitmap_" + hid+"_px","Number of Clusters (1bin=two columns)",nbinx,0.,float(ncols_));
-        mePixClustersRing_py_ = iBooker.book1D("hitmap_" + hid+"_py","Number of Clusters (1bin=two rows)",nbiny,0.,float(nrows_));
-        mePixClustersRing_px_->setAxisTitle("Columns",1);
-        mePixClustersRing_py_->setAxisTitle("Rows",1);
+        mePixClustersRing_px_ =
+            iBooker.book1D("hitmap_" + hid + "_px", "Number of Clusters (1bin=two columns)", nbinx, 0., float(ncols_));
+        mePixClustersRing_py_ =
+            iBooker.book1D("hitmap_" + hid + "_py", "Number of Clusters (1bin=two rows)", nbiny, 0., float(nrows_));
+        mePixClustersRing_px_->setAxisTitle("Columns", 1);
+        mePixClustersRing_py_->setAxisTitle("Rows", 1);
       }
     }
   }
-
 }
 //
 // Fill histograms
 //
-int SiPixelClusterModule::fill(const edmNew::DetSetVector<SiPixelCluster>& input, const TrackerGeometry* tracker, int *barrelClusterTotal, int *fpixPClusterTotal, int *fpixMClusterTotal, std::vector<MonitorElement*>& layers,std::vector<MonitorElement*>& diskspz,std::vector<MonitorElement*>& disksmz,bool modon, bool ladon, bool layon, bool phion, bool bladeon, bool diskon, bool ringon, bool twoD, bool reducedSet, bool smileyon, bool isUpgrade) {
-  
+int SiPixelClusterModule::fill(const edmNew::DetSetVector<SiPixelCluster> &input,
+                               const TrackerGeometry *tracker,
+                               int *barrelClusterTotal,
+                               int *fpixPClusterTotal,
+                               int *fpixMClusterTotal,
+                               std::vector<MonitorElement *> &layers,
+                               std::vector<MonitorElement *> &diskspz,
+                               std::vector<MonitorElement *> &disksmz,
+                               bool modon,
+                               bool ladon,
+                               bool layon,
+                               bool phion,
+                               bool bladeon,
+                               bool diskon,
+                               bool ringon,
+                               bool twoD,
+                               bool reducedSet,
+                               bool smileyon,
+                               bool isUpgrade) {
   bool barrel = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel);
   bool endcap = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap);
-  
-  edmNew::DetSetVector<SiPixelCluster>::const_iterator isearch = input.find(id_); // search  clusters of detid
+
+  edmNew::DetSetVector<SiPixelCluster>::const_iterator isearch = input.find(id_);  // search  clusters of detid
   unsigned int numberOfClusters = 0;
   unsigned int numberOfFpixClusters = 0;
 
-  
-  if( isearch != input.end() ) {  // Not an empty iterator
+  if (isearch != input.end()) {  // Not an empty iterator
 
-    
     // Look at clusters now
-    edmNew::DetSet<SiPixelCluster>::const_iterator  di;
-    for(di = isearch->begin(); di != isearch->end(); di++) {
+    edmNew::DetSet<SiPixelCluster>::const_iterator di;
+    for (di = isearch->begin(); di != isearch->end(); di++) {
       numberOfClusters++;
-      if(endcap) numberOfFpixClusters++;
-      if(barrel) (*barrelClusterTotal)++;
-      float charge = 0.001*(di->charge()); // total charge of cluster
-      float x = di->x();                   // barycenter x position
-      float y = di->y();                   // barycenter y position
-      int size = di->size();               // total size of cluster (in pixels)
-      int sizeX = di->sizeX();             // size of cluster in x-direction
-      int sizeY = di->sizeY();             // size of cluster in y-direction
-      int minPixelRow = di->minPixelRow(); // min x index
-      int maxPixelRow = di->maxPixelRow(); // max x index
-      int minPixelCol = di->minPixelCol(); // min y index
-      int maxPixelCol = di->maxPixelCol(); // max y index
+      if (endcap)
+        numberOfFpixClusters++;
+      if (barrel)
+        (*barrelClusterTotal)++;
+      float charge = 0.001 * (di->charge());  // total charge of cluster
+      float x = di->x();                      // barycenter x position
+      float y = di->y();                      // barycenter y position
+      int size = di->size();                  // total size of cluster (in pixels)
+      int sizeX = di->sizeX();                // size of cluster in x-direction
+      int sizeY = di->sizeY();                // size of cluster in y-direction
+      int minPixelRow = di->minPixelRow();    // min x index
+      int maxPixelRow = di->maxPixelRow();    // max x index
+      int minPixelCol = di->minPixelCol();    // min y index
+      int maxPixelCol = di->maxPixelCol();    // max y index
 
-      const PixelGeomDetUnit* theGeomDet = dynamic_cast<const PixelGeomDetUnit*> ( tracker->idToDet(DetId(id_)) );
+      const PixelGeomDetUnit *theGeomDet = dynamic_cast<const PixelGeomDetUnit *>(tracker->idToDet(DetId(id_)));
 
-      const PixelTopology * topol = &(theGeomDet->specificTopology());
-      LocalPoint clustlp = topol->localPosition( MeasurementPoint(x, y) );
-      GlobalPoint clustgp = theGeomDet->surface().toGlobal( clustlp );
-      if(modon) meCharge_->Fill((float)charge);
-      if(modon) meSize_->Fill((float)size);
+      const PixelTopology *topol = &(theGeomDet->specificTopology());
+      LocalPoint clustlp = topol->localPosition(MeasurementPoint(x, y));
+      GlobalPoint clustgp = theGeomDet->surface().toGlobal(clustlp);
+      if (modon)
+        meCharge_->Fill((float)charge);
+      if (modon)
+        meSize_->Fill((float)size);
 
-      if(barrel){
+      if (barrel) {
         uint32_t DBlayer = PixelBarrelName(DetId(id_), pTT, isUpgrade).layerName();
-        if (!(DBlayer > layers.size()) && (layers[DBlayer-1])) layers[DBlayer-1]->Fill(clustgp.z(),clustgp.phi());
-      }else if(endcap){
-	uint32_t DBdisk = PixelEndcapName(DetId(id_), pTT, isUpgrade).diskName();
-	if(clustgp.z()>0){
-	  (*fpixPClusterTotal)++;
-	  if (!(DBdisk > diskspz.size()) && (diskspz[DBdisk-1])) diskspz[DBdisk-1]->Fill(clustgp.x(),clustgp.y());
-	}else{
-	  (*fpixMClusterTotal)++;
-	  if (!(DBdisk > disksmz.size()) && (disksmz[DBdisk-1])) disksmz[DBdisk-1]->Fill(clustgp.x(),clustgp.y());
-	} 
+        if (!(DBlayer > layers.size()) && (layers[DBlayer - 1]))
+          layers[DBlayer - 1]->Fill(clustgp.z(), clustgp.phi());
+      } else if (endcap) {
+        uint32_t DBdisk = PixelEndcapName(DetId(id_), pTT, isUpgrade).diskName();
+        if (clustgp.z() > 0) {
+          (*fpixPClusterTotal)++;
+          if (!(DBdisk > diskspz.size()) && (diskspz[DBdisk - 1]))
+            diskspz[DBdisk - 1]->Fill(clustgp.x(), clustgp.y());
+        } else {
+          (*fpixMClusterTotal)++;
+          if (!(DBdisk > disksmz.size()) && (disksmz[DBdisk - 1]))
+            disksmz[DBdisk - 1]->Fill(clustgp.x(), clustgp.y());
+        }
+      }
+      if (!reducedSet) {
+        (meMinRow_)->Fill((int)minPixelRow);
+        (meMaxRow_)->Fill((int)maxPixelRow);
+        (meMinCol_)->Fill((int)minPixelCol);
+        (meMaxCol_)->Fill((int)maxPixelCol);
+        (meSizeX_)->Fill((int)sizeX);
+        (meSizeY_)->Fill((int)sizeY);
+        (meX_)->Fill((float)x);
+        (meY_)->Fill((float)y);
+        if (twoD)
+          (mePixClusters_)->Fill((float)y, (float)x);
+        else {
+          (mePixClusters_px_)->Fill((float)y);
+          (mePixClusters_py_)->Fill((float)x);
+        }
       }
-      if(!reducedSet)
-	{
-	  (meMinRow_)->Fill((int)minPixelRow);
-	  (meMaxRow_)->Fill((int)maxPixelRow);
-	  (meMinCol_)->Fill((int)minPixelCol);
-	  (meMaxCol_)->Fill((int)maxPixelCol);
-	  (meSizeX_)->Fill((int)sizeX);
-	  (meSizeY_)->Fill((int)sizeY);
- 	  (meX_)->Fill((float)x);
-	  (meY_)->Fill((float)y);
-	  if(twoD)(mePixClusters_)->Fill((float)y,(float)x);
-	  else{
-	  	  (mePixClusters_px_)->Fill((float)y);
-	        (mePixClusters_py_)->Fill((float)x);
-	  }
-	}
 
-      if(barrel && smileyon){
-        (meSizeYvsEtaBarrel_)->Fill(clustgp.eta(),sizeY);
-	//std::cout << "Cluster Global x y z theta eta " << clustgp.x() << " " << clustgp.y() << " " << clustgp.z() << " " << clustgp.theta() << " " << clustgp.eta() << std::endl;
-      }      
-      if(ladon && barrel){
-	(meChargeLad_)->Fill((float)charge);
-	(meSizeLad_)->Fill((int)size);
-	if(!reducedSet)
-	{
-	(meMinRowLad_)->Fill((int)minPixelRow);
-	(meMaxRowLad_)->Fill((int)maxPixelRow);
-	(meMinColLad_)->Fill((int)minPixelCol);
-	(meMaxColLad_)->Fill((int)maxPixelCol);
-	(meXLad_)->Fill((float)x);
-	(meYLad_)->Fill((float)y);
-	(meSizeXLad_)->Fill((int)sizeX);
-	(meSizeYLad_)->Fill((int)sizeY);
-	if(twoD) (mePixClustersLad_)->Fill((float)y,(float)x);
-	else{
-	  (mePixClustersLad_px_)->Fill((float)y);
-	  (mePixClustersLad_py_)->Fill((float)x);
-	}
-	}
+      if (barrel && smileyon) {
+        (meSizeYvsEtaBarrel_)->Fill(clustgp.eta(), sizeY);
+        // std::cout << "Cluster Global x y z theta eta " << clustgp.x() << " "
+        // << clustgp.y() << " " << clustgp.z() << " " << clustgp.theta() << " "
+        // << clustgp.eta() << std::endl;
       }
-      if(layon && barrel){
-	(meChargeLay_)->Fill((float)charge);
-	(meSizeLay_)->Fill((int)size);
-	if(!reducedSet)
-	{
-	(meMinRowLay_)->Fill((int)minPixelRow);
-	(meMaxRowLay_)->Fill((int)maxPixelRow);
-	(meMinColLay_)->Fill((int)minPixelCol);
-	(meMaxColLay_)->Fill((int)maxPixelCol);
-	(meXLay_)->Fill((float)x);
-	(meYLay_)->Fill((float)y);
-	(meSizeXLay_)->Fill((int)sizeX);
-	(meSizeYLay_)->Fill((int)sizeY);
-	if(twoD) (mePixClustersLay_)->Fill((float)y,(float)x);
-	else{
-	  (mePixClustersLay_px_)->Fill((float)y);
-	  (mePixClustersLay_py_)->Fill((float)x);
-	}
-	}
+      if (ladon && barrel) {
+        (meChargeLad_)->Fill((float)charge);
+        (meSizeLad_)->Fill((int)size);
+        if (!reducedSet) {
+          (meMinRowLad_)->Fill((int)minPixelRow);
+          (meMaxRowLad_)->Fill((int)maxPixelRow);
+          (meMinColLad_)->Fill((int)minPixelCol);
+          (meMaxColLad_)->Fill((int)maxPixelCol);
+          (meXLad_)->Fill((float)x);
+          (meYLad_)->Fill((float)y);
+          (meSizeXLad_)->Fill((int)sizeX);
+          (meSizeYLad_)->Fill((int)sizeY);
+          if (twoD)
+            (mePixClustersLad_)->Fill((float)y, (float)x);
+          else {
+            (mePixClustersLad_px_)->Fill((float)y);
+            (mePixClustersLad_py_)->Fill((float)x);
+          }
+        }
       }
-      if(phion && barrel){
-	(meChargePhi_)->Fill((float)charge);
-	(meSizePhi_)->Fill((int)size);
-	if(!reducedSet)
-	{
-	(meMinRowPhi_)->Fill((int)minPixelRow);
-	(meMaxRowPhi_)->Fill((int)maxPixelRow);
-	(meMinColPhi_)->Fill((int)minPixelCol);
-	(meMaxColPhi_)->Fill((int)maxPixelCol);
-	(meXPhi_)->Fill((float)x);
-	(meYPhi_)->Fill((float)y);
-	(meSizeXPhi_)->Fill((int)sizeX);
-	(meSizeYPhi_)->Fill((int)sizeY);
-	if(twoD) (mePixClustersPhi_)->Fill((float)y,(float)x);
-	else{
-	  (mePixClustersPhi_px_)->Fill((float)y);
-	  (mePixClustersPhi_py_)->Fill((float)x);
-	}
-	}
+      if (layon && barrel) {
+        (meChargeLay_)->Fill((float)charge);
+        (meSizeLay_)->Fill((int)size);
+        if (!reducedSet) {
+          (meMinRowLay_)->Fill((int)minPixelRow);
+          (meMaxRowLay_)->Fill((int)maxPixelRow);
+          (meMinColLay_)->Fill((int)minPixelCol);
+          (meMaxColLay_)->Fill((int)maxPixelCol);
+          (meXLay_)->Fill((float)x);
+          (meYLay_)->Fill((float)y);
+          (meSizeXLay_)->Fill((int)sizeX);
+          (meSizeYLay_)->Fill((int)sizeY);
+          if (twoD)
+            (mePixClustersLay_)->Fill((float)y, (float)x);
+          else {
+            (mePixClustersLay_px_)->Fill((float)y);
+            (mePixClustersLay_py_)->Fill((float)x);
+          }
+        }
       }
-      if(bladeon && endcap){
-	(meChargeBlade_)->Fill((float)charge);
-	(meSizeBlade_)->Fill((int)size);
-	if(!reducedSet)
-	{
-	(meMinRowBlade_)->Fill((int)minPixelRow);
-	(meMaxRowBlade_)->Fill((int)maxPixelRow);
-	(meMinColBlade_)->Fill((int)minPixelCol);
-	(meMaxColBlade_)->Fill((int)maxPixelCol);
-	(meXBlade_)->Fill((float)x);
-	(meYBlade_)->Fill((float)y);
-	(meSizeXBlade_)->Fill((int)sizeX);
-	(meSizeYBlade_)->Fill((int)sizeY);
-	}
+      if (phion && barrel) {
+        (meChargePhi_)->Fill((float)charge);
+        (meSizePhi_)->Fill((int)size);
+        if (!reducedSet) {
+          (meMinRowPhi_)->Fill((int)minPixelRow);
+          (meMaxRowPhi_)->Fill((int)maxPixelRow);
+          (meMinColPhi_)->Fill((int)minPixelCol);
+          (meMaxColPhi_)->Fill((int)maxPixelCol);
+          (meXPhi_)->Fill((float)x);
+          (meYPhi_)->Fill((float)y);
+          (meSizeXPhi_)->Fill((int)sizeX);
+          (meSizeYPhi_)->Fill((int)sizeY);
+          if (twoD)
+            (mePixClustersPhi_)->Fill((float)y, (float)x);
+          else {
+            (mePixClustersPhi_px_)->Fill((float)y);
+            (mePixClustersPhi_py_)->Fill((float)x);
+          }
+        }
       }
-      if(diskon && endcap){
-	(meChargeDisk_)->Fill((float)charge);
-	(meSizeDisk_)->Fill((int)size);
-	if(!reducedSet)
-	{
-	(meMinRowDisk_)->Fill((int)minPixelRow);
-	(meMaxRowDisk_)->Fill((int)maxPixelRow);
-	(meMinColDisk_)->Fill((int)minPixelCol);
-	(meMaxColDisk_)->Fill((int)maxPixelCol);
-	(meXDisk_)->Fill((float)x);
-	(meYDisk_)->Fill((float)y);
-	(meSizeXDisk_)->Fill((int)sizeX);
-	(meSizeYDisk_)->Fill((int)sizeY);
-	}
+      if (bladeon && endcap) {
+        (meChargeBlade_)->Fill((float)charge);
+        (meSizeBlade_)->Fill((int)size);
+        if (!reducedSet) {
+          (meMinRowBlade_)->Fill((int)minPixelRow);
+          (meMaxRowBlade_)->Fill((int)maxPixelRow);
+          (meMinColBlade_)->Fill((int)minPixelCol);
+          (meMaxColBlade_)->Fill((int)maxPixelCol);
+          (meXBlade_)->Fill((float)x);
+          (meYBlade_)->Fill((float)y);
+          (meSizeXBlade_)->Fill((int)sizeX);
+          (meSizeYBlade_)->Fill((int)sizeY);
+        }
       }
-      
-      if(ringon && endcap){
-	(meChargeRing_)->Fill((float)charge);
-	(meSizeRing_)->Fill((int)size);
-	if(!reducedSet)
-	{
-	(meMinRowRing_)->Fill((int)minPixelRow);
-	(meMaxRowRing_)->Fill((int)maxPixelRow);
-	(meMinColRing_)->Fill((int)minPixelCol);
-	(meMaxColRing_)->Fill((int)maxPixelCol);
-	(meXRing_)->Fill((float)x);
-	(meYRing_)->Fill((float)y);
-	(meSizeXRing_)->Fill((int)sizeX);
-	(meSizeYRing_)->Fill((int)sizeY);
-	if(twoD) (mePixClustersRing_)->Fill((float)y,(float)x);
-	else{
-	  (mePixClustersRing_px_)->Fill((float)y);
-	  (mePixClustersRing_py_)->Fill((float)x);
-	}
-	}
+      if (diskon && endcap) {
+        (meChargeDisk_)->Fill((float)charge);
+        (meSizeDisk_)->Fill((int)size);
+        if (!reducedSet) {
+          (meMinRowDisk_)->Fill((int)minPixelRow);
+          (meMaxRowDisk_)->Fill((int)maxPixelRow);
+          (meMinColDisk_)->Fill((int)minPixelCol);
+          (meMaxColDisk_)->Fill((int)maxPixelCol);
+          (meXDisk_)->Fill((float)x);
+          (meYDisk_)->Fill((float)y);
+          (meSizeXDisk_)->Fill((int)sizeX);
+          (meSizeYDisk_)->Fill((int)sizeY);
+        }
       }
-    }
-    if(modon) (meNClusters_)->Fill((float)numberOfClusters);
-    if(ladon && barrel) (meNClustersLad_)->Fill((float)numberOfClusters);
-    if(layon && barrel) (meNClustersLay_)->Fill((float)numberOfClusters);
-    if(phion && barrel) (meNClustersPhi_)->Fill((float)numberOfClusters);
-    if(bladeon && endcap) (meNClustersBlade_)->Fill((float)numberOfClusters);
-    if(diskon && endcap) (meNClustersDisk_)->Fill((float)numberOfClusters);
-    if(ringon && endcap) (meNClustersRing_)->Fill((float)numberOfClusters);   
-      
 
+      if (ringon && endcap) {
+        (meChargeRing_)->Fill((float)charge);
+        (meSizeRing_)->Fill((int)size);
+        if (!reducedSet) {
+          (meMinRowRing_)->Fill((int)minPixelRow);
+          (meMaxRowRing_)->Fill((int)maxPixelRow);
+          (meMinColRing_)->Fill((int)minPixelCol);
+          (meMaxColRing_)->Fill((int)maxPixelCol);
+          (meXRing_)->Fill((float)x);
+          (meYRing_)->Fill((float)y);
+          (meSizeXRing_)->Fill((int)sizeX);
+          (meSizeYRing_)->Fill((int)sizeY);
+          if (twoD)
+            (mePixClustersRing_)->Fill((float)y, (float)x);
+          else {
+            (mePixClustersRing_px_)->Fill((float)y);
+            (mePixClustersRing_py_)->Fill((float)x);
+          }
+        }
+      }
+    }
+    if (modon)
+      (meNClusters_)->Fill((float)numberOfClusters);
+    if (ladon && barrel)
+      (meNClustersLad_)->Fill((float)numberOfClusters);
+    if (layon && barrel)
+      (meNClustersLay_)->Fill((float)numberOfClusters);
+    if (phion && barrel)
+      (meNClustersPhi_)->Fill((float)numberOfClusters);
+    if (bladeon && endcap)
+      (meNClustersBlade_)->Fill((float)numberOfClusters);
+    if (diskon && endcap)
+      (meNClustersDisk_)->Fill((float)numberOfClusters);
+    if (ringon && endcap)
+      (meNClustersRing_)->Fill((float)numberOfClusters);
   }
-  
-  
-  //std::cout<<"number of detector units="<<numberOfDetUnits<<std::endl;
+
+  // std::cout<<"number of detector units="<<numberOfDetUnits<<std::endl;
   return numberOfFpixClusters;
-  
 }
diff --git a/DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc b/DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc
index 8b4f304564e00..a8d047d5ad644 100644
--- a/DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc
+++ b/DQM/SiPixelMonitorCluster/src/SiPixelClusterSource.cc
@@ -2,8 +2,8 @@
 //
 // Package:    SiPixelMonitorCluster
 // Class:      SiPixelClusterSource
-// 
-/**\class 
+//
+/**\class
 
  Description: Pixel DQM source for Clusters
 
@@ -12,520 +12,573 @@
 */
 //
 // Original Author:  Vincenzo Chiochia & Andrew York
-//         Created:  
+//         Created:
 //
 //
 // Updated by: Lukas Wehrli
-// for pixel offline DQM 
+// for pixel offline DQM
 #include "DQM/SiPixelMonitorCluster/interface/SiPixelClusterSource.h"
 // Framework
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 // DQM Framework
 #include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 // Geometry
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 // DataFormats
 #include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h"
+#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 //
-#include <string>
 #include <cstdlib>
+#include <string>
 
 using namespace std;
 using namespace edm;
 
-SiPixelClusterSource::SiPixelClusterSource(const edm::ParameterSet& iConfig) :
-  conf_(iConfig),
-  src_( conf_.getParameter<edm::InputTag>( "src" ) ),
-  digisrc_( conf_.getParameter<edm::InputTag>( "digisrc" ) ),
-  saveFile( conf_.getUntrackedParameter<bool>("saveFile",false) ),
-  isPIB( conf_.getUntrackedParameter<bool>("isPIB",false) ),
-  slowDown( conf_.getUntrackedParameter<bool>("slowDown",false) ),
-  modOn( conf_.getUntrackedParameter<bool>("modOn",true) ),
-  twoDimOn( conf_.getUntrackedParameter<bool>("twoDimOn",true) ),
-  reducedSet( conf_.getUntrackedParameter<bool>("reducedSet",false) ),
-  ladOn( conf_.getUntrackedParameter<bool>("ladOn",false) ), 
-  layOn( conf_.getUntrackedParameter<bool>("layOn",false) ), 
-  phiOn( conf_.getUntrackedParameter<bool>("phiOn",false) ), 
-  ringOn( conf_.getUntrackedParameter<bool>("ringOn",false) ), 
-  bladeOn( conf_.getUntrackedParameter<bool>("bladeOn",false) ), 
-  diskOn( conf_.getUntrackedParameter<bool>("diskOn",false) ),
-  smileyOn(conf_.getUntrackedParameter<bool>("smileyOn",false) ),
-  bigEventSize( conf_.getUntrackedParameter<int>("bigEventSize",100) ), 
-  isUpgrade( conf_.getUntrackedParameter<bool>("isUpgrade",false) ),
-  noOfLayers(0),
-  noOfDisks(0)
-{
-   LogInfo ("PixelDQM") << "SiPixelClusterSource::SiPixelClusterSource: Got DQM BackEnd interface"<<endl;
-
-   //set Token(-s)
-   srcToken_ = consumes<edmNew::DetSetVector<SiPixelCluster> >(conf_.getParameter<edm::InputTag>("src"));
-   digisrcToken_ = consumes<edm::DetSetVector<PixelDigi> >(conf_.getParameter<edm::InputTag>("digisrc"));
-   firstRun = true;
-   topFolderName_ = conf_.getParameter<std::string>("TopFolderName");
+SiPixelClusterSource::SiPixelClusterSource(const edm::ParameterSet &iConfig)
+    : conf_(iConfig),
+      src_(conf_.getParameter<edm::InputTag>("src")),
+      digisrc_(conf_.getParameter<edm::InputTag>("digisrc")),
+      saveFile(conf_.getUntrackedParameter<bool>("saveFile", false)),
+      isPIB(conf_.getUntrackedParameter<bool>("isPIB", false)),
+      slowDown(conf_.getUntrackedParameter<bool>("slowDown", false)),
+      modOn(conf_.getUntrackedParameter<bool>("modOn", true)),
+      twoDimOn(conf_.getUntrackedParameter<bool>("twoDimOn", true)),
+      reducedSet(conf_.getUntrackedParameter<bool>("reducedSet", false)),
+      ladOn(conf_.getUntrackedParameter<bool>("ladOn", false)),
+      layOn(conf_.getUntrackedParameter<bool>("layOn", false)),
+      phiOn(conf_.getUntrackedParameter<bool>("phiOn", false)),
+      ringOn(conf_.getUntrackedParameter<bool>("ringOn", false)),
+      bladeOn(conf_.getUntrackedParameter<bool>("bladeOn", false)),
+      diskOn(conf_.getUntrackedParameter<bool>("diskOn", false)),
+      smileyOn(conf_.getUntrackedParameter<bool>("smileyOn", false)),
+      bigEventSize(conf_.getUntrackedParameter<int>("bigEventSize", 100)),
+      isUpgrade(conf_.getUntrackedParameter<bool>("isUpgrade", false)),
+      noOfLayers(0),
+      noOfDisks(0) {
+  LogInfo("PixelDQM") << "SiPixelClusterSource::SiPixelClusterSource: Got DQM BackEnd interface" << endl;
+
+  // set Token(-s)
+  srcToken_ = consumes<edmNew::DetSetVector<SiPixelCluster>>(conf_.getParameter<edm::InputTag>("src"));
+  digisrcToken_ = consumes<edm::DetSetVector<PixelDigi>>(conf_.getParameter<edm::InputTag>("digisrc"));
+  firstRun = true;
+  topFolderName_ = conf_.getParameter<std::string>("TopFolderName");
 }
 
+SiPixelClusterSource::~SiPixelClusterSource() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
+  LogInfo("PixelDQM") << "SiPixelClusterSource::~SiPixelClusterSource: Destructor" << endl;
 
-SiPixelClusterSource::~SiPixelClusterSource()
-{
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-  LogInfo ("PixelDQM") << "SiPixelClusterSource::~SiPixelClusterSource: Destructor"<<endl;
-
-  std::map<uint32_t,SiPixelClusterModule*>::iterator struct_iter;
-  for (struct_iter = thePixelStructure.begin() ; struct_iter != thePixelStructure.end() ; struct_iter++){
+  std::map<uint32_t, SiPixelClusterModule *>::iterator struct_iter;
+  for (struct_iter = thePixelStructure.begin(); struct_iter != thePixelStructure.end(); struct_iter++) {
     delete struct_iter->second;
     struct_iter->second = nullptr;
   }
 }
 
+void SiPixelClusterSource::dqmBeginRun(const edm::Run &r, const edm::EventSetup &iSetup) {
+  LogInfo("PixelDQM") << " SiPixelClusterSource::beginJob - Initialisation ... " << std::endl;
+  LogInfo("PixelDQM") << "Mod/Lad/Lay/Phi " << modOn << "/" << ladOn << "/" << layOn << "/" << phiOn << std::endl;
+  LogInfo("PixelDQM") << "Blade/Disk/Ring" << bladeOn << "/" << diskOn << "/" << ringOn << std::endl;
+  LogInfo("PixelDQM") << "2DIM IS " << twoDimOn << "\n";
+  LogInfo("PixelDQM") << "Smiley (Cluster sizeY vs. Cluster eta) is " << smileyOn << "\n";
 
-
-void SiPixelClusterSource::dqmBeginRun(const edm::Run& r, const edm::EventSetup& iSetup){
-  LogInfo ("PixelDQM") << " SiPixelClusterSource::beginJob - Initialisation ... " << std::endl;
-  LogInfo ("PixelDQM") << "Mod/Lad/Lay/Phi " << modOn << "/" << ladOn << "/" 
-	    << layOn << "/" << phiOn << std::endl;
-  LogInfo ("PixelDQM") << "Blade/Disk/Ring" << bladeOn << "/" << diskOn << "/" 
-	    << ringOn << std::endl;
-  LogInfo ("PixelDQM") << "2DIM IS " << twoDimOn << "\n";
-  LogInfo ("PixelDQM") << "Smiley (Cluster sizeY vs. Cluster eta) is " << smileyOn << "\n";
-  
-  if(firstRun){
+  if (firstRun) {
     eventNo = 0;
     lumSec = 0;
     nLumiSecs = 0;
     nBigEvents = 0;
     // Build map
     buildStructure(iSetup);
- 
+
     firstRun = false;
   }
 }
 
-void SiPixelClusterSource::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const &, const edm::EventSetup& iSetup){
+void SiPixelClusterSource::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, const edm::EventSetup &iSetup) {
   bookMEs(iBooker, iSetup);
   // Book occupancy maps in global coordinates for all clusters:
-  iBooker.setCurrentFolder(topFolderName_+"/Clusters/OffTrack");
-  //bpix
+  iBooker.setCurrentFolder(topFolderName_ + "/Clusters/OffTrack");
+  // bpix
   std::stringstream ss1, ss2;
-  for (int i = 1; i <= noOfLayers; i++)
-  {
-    ss1.str(std::string()); ss1 << "position_siPixelClusters_Layer_" << i;
-    ss2.str(std::string()); ss2 << "Clusters Layer" << i << ";Global Z (cm);Global #phi";
-    meClPosLayer.push_back(iBooker.book2D(ss1.str(),ss2.str(),200,-30.,30.,128,-3.2,3.2));
+  for (int i = 1; i <= noOfLayers; i++) {
+    ss1.str(std::string());
+    ss1 << "position_siPixelClusters_Layer_" << i;
+    ss2.str(std::string());
+    ss2 << "Clusters Layer" << i << ";Global Z (cm);Global #phi";
+    meClPosLayer.push_back(iBooker.book2D(ss1.str(), ss2.str(), 200, -30., 30., 128, -3.2, 3.2));
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "position_siPixelClusters_pz_Disk_" << i;
-    ss2.str(std::string()); ss2 << "Clusters +Z Disk" << i << ";Global X (cm);Global Y (cm)";
-    meClPosDiskpz.push_back(iBooker.book2D(ss1.str(),ss2.str(),80,-20.,20.,80,-20.,20.));
-    ss1.str(std::string()); ss1 << "position_siPixelClusters_mz_Disk_" << i;
-    ss2.str(std::string()); ss2 << "Clusters -Z Disk" << i << ";Global X (cm);Global Y (cm)";
-    meClPosDiskmz.push_back(iBooker.book2D(ss1.str(),ss2.str(),80,-20.,20.,80,-20.,20.));
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "position_siPixelClusters_pz_Disk_" << i;
+    ss2.str(std::string());
+    ss2 << "Clusters +Z Disk" << i << ";Global X (cm);Global Y (cm)";
+    meClPosDiskpz.push_back(iBooker.book2D(ss1.str(), ss2.str(), 80, -20., 20., 80, -20., 20.));
+    ss1.str(std::string());
+    ss1 << "position_siPixelClusters_mz_Disk_" << i;
+    ss2.str(std::string());
+    ss2 << "Clusters -Z Disk" << i << ";Global X (cm);Global Y (cm)";
+    meClPosDiskmz.push_back(iBooker.book2D(ss1.str(), ss2.str(), 80, -20., 20., 80, -20., 20.));
   }
 
-  //Book trend cluster plots for barrel and endcap. Lumisections for offline and second for online - taken from strips
-  iBooker.setCurrentFolder(topFolderName_+"/Barrel");                                           
-  ss1.str(std::string()); ss1 << "totalNumberOfClustersProfile_siPixelClusters_Barrel";
-  ss2.str(std::string()); ss2 << "Total number of barrel clusters profile;Lumisection;";
-  meClusBarrelProf = iBooker.bookProfile(ss1.str(),ss2.str(),2400,0.,150,0,0,"");
+  // Book trend cluster plots for barrel and endcap. Lumisections for offline
+  // and second for online - taken from strips
+  iBooker.setCurrentFolder(topFolderName_ + "/Barrel");
+  ss1.str(std::string());
+  ss1 << "totalNumberOfClustersProfile_siPixelClusters_Barrel";
+  ss2.str(std::string());
+  ss2 << "Total number of barrel clusters profile;Lumisection;";
+  meClusBarrelProf = iBooker.bookProfile(ss1.str(), ss2.str(), 2400, 0., 150, 0, 0, "");
   meClusBarrelProf->getTH1()->SetCanExtend(TH1::kAllAxes);
 
-  iBooker.setCurrentFolder(topFolderName_+"/Endcap");                                     
+  iBooker.setCurrentFolder(topFolderName_ + "/Endcap");
 
-  ss1.str(std::string()); ss1 << "totalNumberOfClustersProfile_siPixelClusters_FPIX+";
-  ss2.str(std::string()); ss2 << "Total number of FPIX+ clusters profile;Lumisection;";
-  meClusFpixPProf = iBooker.bookProfile(ss1.str(),ss2.str(),2400,0.,150,0,0,"");
+  ss1.str(std::string());
+  ss1 << "totalNumberOfClustersProfile_siPixelClusters_FPIX+";
+  ss2.str(std::string());
+  ss2 << "Total number of FPIX+ clusters profile;Lumisection;";
+  meClusFpixPProf = iBooker.bookProfile(ss1.str(), ss2.str(), 2400, 0., 150, 0, 0, "");
   meClusFpixPProf->getTH1()->SetCanExtend(TH1::kAllAxes);
 
-  ss1.str(std::string()); ss1 << "totalNumberOfClustersProfile_siPixelClusters_FPIX-";
-  ss2.str(std::string()); ss2 << "Total number of FPIX- clusters profile;Lumisection;";
-  meClusFpixMProf = iBooker.bookProfile(ss1.str(),ss2.str(),2400,0.,150,0,0,"");
+  ss1.str(std::string());
+  ss1 << "totalNumberOfClustersProfile_siPixelClusters_FPIX-";
+  ss2.str(std::string());
+  ss2 << "Total number of FPIX- clusters profile;Lumisection;";
+  meClusFpixMProf = iBooker.bookProfile(ss1.str(), ss2.str(), 2400, 0., 150, 0, 0, "");
   meClusFpixMProf->getTH1()->SetCanExtend(TH1::kAllAxes);
 
-  iBooker.setCurrentFolder(topFolderName_+"/Barrel");
+  iBooker.setCurrentFolder(topFolderName_ + "/Barrel");
   for (int i = 1; i <= noOfLayers; i++) {
-    int ybins = -1; float ymin = 0.; float ymax = 0.;
-    if (i==1) { ybins = 42; ymin = -10.5; ymax = 10.5; }
-    if (i==2) { ybins = 66; ymin = -16.5; ymax = 16.5; }
-    if (i==3) { ybins = 90; ymin = -22.5; ymax = 22.5; }
-    if (i==4) { ybins = 130; ymin = -32.5; ymax = 32.5; }
-    ss1.str(std::string()); ss1 << "pix_bar Occ_roc_online_" + digisrc_. label() + "_layer_" << i;
-    ss2.str(std::string()); ss2 << "Pixel Barrel Occupancy, ROC level (Online): Layer " << i;
-    meZeroRocBPIX.push_back(iBooker.book2D(ss1.str(),ss2.str(),72,-4.5,4.5,ybins,ymin,ymax));
-    meZeroRocBPIX.at(i-1)->setAxisTitle("ROC / Module",1);
-    meZeroRocBPIX.at(i-1)->setAxisTitle("ROC / Ladder",2);
+    int ybins = -1;
+    float ymin = 0.;
+    float ymax = 0.;
+    if (i == 1) {
+      ybins = 42;
+      ymin = -10.5;
+      ymax = 10.5;
+    }
+    if (i == 2) {
+      ybins = 66;
+      ymin = -16.5;
+      ymax = 16.5;
+    }
+    if (i == 3) {
+      ybins = 90;
+      ymin = -22.5;
+      ymax = 22.5;
+    }
+    if (i == 4) {
+      ybins = 130;
+      ymin = -32.5;
+      ymax = 32.5;
+    }
+    ss1.str(std::string());
+    ss1 << "pix_bar Occ_roc_online_" + digisrc_.label() + "_layer_" << i;
+    ss2.str(std::string());
+    ss2 << "Pixel Barrel Occupancy, ROC level (Online): Layer " << i;
+    meZeroRocBPIX.push_back(iBooker.book2D(ss1.str(), ss2.str(), 72, -4.5, 4.5, ybins, ymin, ymax));
+    meZeroRocBPIX.at(i - 1)->setAxisTitle("ROC / Module", 1);
+    meZeroRocBPIX.at(i - 1)->setAxisTitle("ROC / Ladder", 2);
   }
 
-  iBooker.setCurrentFolder(topFolderName_+"/Endcap");
-  meZeroRocFPIX = iBooker.book2D("ROC_endcap_occupancy","Pixel Endcap Occupancy, ROC level (Online)",72, -4.5, 4.5,288,-12.5,12.5);
-  meZeroRocFPIX->setBinLabel(1, "Disk-2 Pnl2",1);
-  meZeroRocFPIX->setBinLabel(9, "Disk-2 Pnl1",1);
-  meZeroRocFPIX->setBinLabel(19, "Disk-1 Pnl2",1);
-  meZeroRocFPIX->setBinLabel(27, "Disk-1 Pnl1",1);
-  meZeroRocFPIX->setBinLabel(41, "Disk+1 Pnl1",1);
-  meZeroRocFPIX->setBinLabel(49, "Disk+1 Pnl2",1);
-  meZeroRocFPIX->setBinLabel(59, "Disk+2 Pnl1",1);
-  meZeroRocFPIX->setBinLabel(67, "Disk+2 Pnl2",1);
-  meZeroRocFPIX->setAxisTitle("Blades in Inner (>0) / Outer(<) Halves",2);
-  meZeroRocFPIX->setAxisTitle("ROC occupancy",3);
-
+  iBooker.setCurrentFolder(topFolderName_ + "/Endcap");
+  meZeroRocFPIX = iBooker.book2D(
+      "ROC_endcap_occupancy", "Pixel Endcap Occupancy, ROC level (Online)", 72, -4.5, 4.5, 288, -12.5, 12.5);
+  meZeroRocFPIX->setBinLabel(1, "Disk-2 Pnl2", 1);
+  meZeroRocFPIX->setBinLabel(9, "Disk-2 Pnl1", 1);
+  meZeroRocFPIX->setBinLabel(19, "Disk-1 Pnl2", 1);
+  meZeroRocFPIX->setBinLabel(27, "Disk-1 Pnl1", 1);
+  meZeroRocFPIX->setBinLabel(41, "Disk+1 Pnl1", 1);
+  meZeroRocFPIX->setBinLabel(49, "Disk+1 Pnl2", 1);
+  meZeroRocFPIX->setBinLabel(59, "Disk+2 Pnl1", 1);
+  meZeroRocFPIX->setBinLabel(67, "Disk+2 Pnl2", 1);
+  meZeroRocFPIX->setAxisTitle("Blades in Inner (>0) / Outer(<) Halves", 2);
+  meZeroRocFPIX->setAxisTitle("ROC occupancy", 3);
 }
 
 //------------------------------------------------------------------
 // Method called for every event
 //------------------------------------------------------------------
-void SiPixelClusterSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void SiPixelClusterSource::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   eventNo++;
-  
-  if(meClPosLayer.at(0) && meClPosLayer.at(0)->getEntries()>150000){
-    for (int i = 0; i < noOfLayers; i++)
-    {
+
+  if (meClPosLayer.at(0) && meClPosLayer.at(0)->getEntries() > 150000) {
+    for (int i = 0; i < noOfLayers; i++) {
       meClPosLayer.at(i)->Reset();
     }
-    for (int i = 0; i < noOfDisks; i++)
-    {
+    for (int i = 0; i < noOfDisks; i++) {
       meClPosDiskpz.at(i)->Reset();
       meClPosDiskmz.at(i)->Reset();
     }
   }
-  
+
   // get input data
-  edm::Handle< edmNew::DetSetVector<SiPixelCluster> >  input;
+  edm::Handle<edmNew::DetSetVector<SiPixelCluster>> input;
   iEvent.getByToken(srcToken_, input);
-  auto const & clustColl = *(input.product());
+  auto const &clustColl = *(input.product());
 
   edm::ESHandle<TrackerGeometry> pDD;
-  iSetup.get<TrackerDigiGeometryRecord> ().get (pDD);
-  const TrackerGeometry* tracker = &(* pDD);
+  iSetup.get<TrackerDigiGeometryRecord>().get(pDD);
+  const TrackerGeometry *tracker = &(*pDD);
 
-  edm::Handle< edm::DetSetVector<PixelDigi> >  digiinput;
-  iEvent.getByToken( digisrcToken_, digiinput );
+  edm::Handle<edm::DetSetVector<PixelDigi>> digiinput;
+  iEvent.getByToken(digisrcToken_, digiinput);
   const edm::DetSetVector<PixelDigi> diginp = *(digiinput.product());
 
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
   const TrackerTopology *pTT = tTopoHandle.product();
 
-
   int lumiSection = (int)iEvent.luminosityBlock();
   int nEventFpixClusters = 0;
 
   int nEventsBarrel = 0;
   int nEventsFPIXm = 0;
   int nEventsFPIXp = 0;
-  
-
-  std::map<uint32_t,SiPixelClusterModule*>::iterator struct_iter;
-  for (struct_iter = thePixelStructure.begin() ; struct_iter != thePixelStructure.end() ; struct_iter++) {
-    
-    int numberOfFpixClusters = (*struct_iter).second->fill(*input, tracker,
-							   &nEventsBarrel, &nEventsFPIXp, &nEventsFPIXm,
-							   meClPosLayer,
-							   meClPosDiskpz,
-							   meClPosDiskmz,
-							   modOn, ladOn, layOn, phiOn, 
-                                                           bladeOn, diskOn, ringOn, 
-							   twoDimOn, reducedSet, smileyOn, isUpgrade);
-    nEventFpixClusters = nEventFpixClusters + numberOfFpixClusters;    
-    
+
+  std::map<uint32_t, SiPixelClusterModule *>::iterator struct_iter;
+  for (struct_iter = thePixelStructure.begin(); struct_iter != thePixelStructure.end(); struct_iter++) {
+    int numberOfFpixClusters = (*struct_iter)
+                                   .second->fill(*input,
+                                                 tracker,
+                                                 &nEventsBarrel,
+                                                 &nEventsFPIXp,
+                                                 &nEventsFPIXm,
+                                                 meClPosLayer,
+                                                 meClPosDiskpz,
+                                                 meClPosDiskmz,
+                                                 modOn,
+                                                 ladOn,
+                                                 layOn,
+                                                 phiOn,
+                                                 bladeOn,
+                                                 diskOn,
+                                                 ringOn,
+                                                 twoDimOn,
+                                                 reducedSet,
+                                                 smileyOn,
+                                                 isUpgrade);
+    nEventFpixClusters = nEventFpixClusters + numberOfFpixClusters;
   }
 
-  if(nEventFpixClusters>bigEventSize){
-    if (bigFpixClusterEventRate){
-      bigFpixClusterEventRate->Fill(lumiSection,1./23.);
+  if (nEventFpixClusters > bigEventSize) {
+    if (bigFpixClusterEventRate) {
+      bigFpixClusterEventRate->Fill(lumiSection, 1. / 23.);
     }
   }
 
-  float trendVar = iEvent.orbitNumber()/262144.0; //lumisection : seconds - matches strip trend plot
+  float trendVar = iEvent.orbitNumber() / 262144.0;  // lumisection : seconds - matches strip trend plot
+
+  meClusBarrelProf->Fill(trendVar, nEventsBarrel);
+  meClusFpixPProf->Fill(trendVar, nEventsFPIXp);
+  meClusFpixMProf->Fill(trendVar, nEventsFPIXm);
 
-  meClusBarrelProf->Fill(trendVar,nEventsBarrel);
-  meClusFpixPProf->Fill(trendVar,nEventsFPIXp);
-  meClusFpixMProf->Fill(trendVar,nEventsFPIXm);
-  
-  //std::cout<<"nEventFpixClusters: "<<nEventFpixClusters<<" , nLumiSecs: "<<nLumiSecs<<" , nBigEvents: "<<nBigEvents<<std::endl;
-  
-  for(TrackerGeometry::DetContainer::const_iterator it = pDD->dets().begin(); it != pDD->dets().end(); it++){
-    
+  // std::cout<<"nEventFpixClusters: "<<nEventFpixClusters<<" , nLumiSecs:
+  // "<<nLumiSecs<<" , nBigEvents: "<<nBigEvents<<std::endl;
+
+  for (TrackerGeometry::DetContainer::const_iterator it = pDD->dets().begin(); it != pDD->dets().end(); it++) {
     DetId detId = (*it)->geographicalId();
-    
+
     // fill barrel
     if (detId.subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) {
-      getrococcupancy(detId,diginp,pTT,meZeroRocBPIX);
+      getrococcupancy(detId, diginp, pTT, meZeroRocBPIX);
     }
-    
+
     // fill endcap
     if (detId.subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) {
-      getrococcupancye(detId,clustColl,pTT,pDD,meZeroRocFPIX);
+      getrococcupancye(detId, clustColl, pTT, pDD, meZeroRocFPIX);
     }
-    
-  }   
+  }
 
   // slow down...
-  if(slowDown) usleep(10000);
-  
+  if (slowDown)
+    usleep(10000);
 }
 
 //------------------------------------------------------------------
 // Build data structure
 //------------------------------------------------------------------
-void SiPixelClusterSource::buildStructure(const edm::EventSetup& iSetup){
-
-  LogInfo ("PixelDQM") <<" SiPixelClusterSource::buildStructure" ;
+void SiPixelClusterSource::buildStructure(const edm::EventSetup &iSetup) {
+  LogInfo("PixelDQM") << " SiPixelClusterSource::buildStructure";
   edm::ESHandle<TrackerGeometry> pDD;
-  iSetup.get<TrackerDigiGeometryRecord>().get( pDD );
+  iSetup.get<TrackerDigiGeometryRecord>().get(pDD);
 
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
   const TrackerTopology *pTT = tTopoHandle.product();
 
-  LogVerbatim ("PixelDQM") << " *** Geometry node for TrackerGeom is  "<<&(*pDD)<<std::endl;
-  LogVerbatim ("PixelDQM") << " *** I have " << pDD->dets().size() <<" detectors"<<std::endl;
-  LogVerbatim ("PixelDQM") << " *** I have " << pDD->detTypes().size() <<" types"<<std::endl;
-  
-  for(TrackerGeometry::DetContainer::const_iterator it = pDD->dets().begin(); it != pDD->dets().end(); it++){
-    
-    if(dynamic_cast<PixelGeomDetUnit const *>((*it))!=nullptr){
+  LogVerbatim("PixelDQM") << " *** Geometry node for TrackerGeom is  " << &(*pDD) << std::endl;
+  LogVerbatim("PixelDQM") << " *** I have " << pDD->dets().size() << " detectors" << std::endl;
+  LogVerbatim("PixelDQM") << " *** I have " << pDD->detTypes().size() << " types" << std::endl;
 
+  for (TrackerGeometry::DetContainer::const_iterator it = pDD->dets().begin(); it != pDD->dets().end(); it++) {
+    if (dynamic_cast<PixelGeomDetUnit const *>((*it)) != nullptr) {
       DetId detId = (*it)->geographicalId();
-      const GeomDetUnit      * geoUnit = pDD->idToDetUnit( detId );
-      const PixelGeomDetUnit * pixDet  = dynamic_cast<const PixelGeomDetUnit*>(geoUnit);
+      const GeomDetUnit *geoUnit = pDD->idToDetUnit(detId);
+      const PixelGeomDetUnit *pixDet = dynamic_cast<const PixelGeomDetUnit *>(geoUnit);
       int nrows = (pixDet->specificTopology()).nrows();
       int ncols = (pixDet->specificTopology()).ncolumns();
 
-      
-      if((detId.subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) ||
-         (detId.subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap))){ 
+      if ((detId.subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) ||
+          (detId.subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap))) {
         uint32_t id = detId();
-        if(detId.subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) {
-          if(isPIB) continue;
-	  LogDebug ("PixelDQM") << " ---> Adding Barrel Module " <<  detId.rawId() << endl;
-          int layer = PixelBarrelName(DetId(id),pTT,isUpgrade).layerName();
-          if (layer > noOfLayers) noOfLayers = layer;
-      SiPixelClusterModule* theModule = new SiPixelClusterModule(id, ncols, nrows);
-	  thePixelStructure.insert(pair<uint32_t,SiPixelClusterModule*> (id,theModule));
-        }else if ( detId.subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap ) ) {
-	  LogDebug ("PixelDQM") << " ---> Adding Endcap Module " <<  detId.rawId() << endl;
-          PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(id),pTT,isUpgrade).halfCylinder();
-          int disk   = PixelEndcapName(DetId(id),pTT,isUpgrade).diskName();
-	  if (disk>noOfDisks) noOfDisks=disk;
-          int blade  = PixelEndcapName(DetId(id),pTT,isUpgrade).bladeName();
-          int panel  = PixelEndcapName(DetId(id),pTT,isUpgrade).pannelName();
-          int module = PixelEndcapName(DetId(id),pTT,isUpgrade).plaquetteName();
-          char sside[80];  sprintf(sside,  "HalfCylinder_%i",side);
-          char sdisk[80];  sprintf(sdisk,  "Disk_%i",disk);
-          char sblade[80]; sprintf(sblade, "Blade_%02i",blade);
-          char spanel[80]; sprintf(spanel, "Panel_%i",panel);
-          char smodule[80];sprintf(smodule,"Module_%i",module);
+        if (detId.subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) {
+          if (isPIB)
+            continue;
+          LogDebug("PixelDQM") << " ---> Adding Barrel Module " << detId.rawId() << endl;
+          int layer = PixelBarrelName(DetId(id), pTT, isUpgrade).layerName();
+          if (layer > noOfLayers)
+            noOfLayers = layer;
+          SiPixelClusterModule *theModule = new SiPixelClusterModule(id, ncols, nrows);
+          thePixelStructure.insert(pair<uint32_t, SiPixelClusterModule *>(id, theModule));
+        } else if (detId.subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) {
+          LogDebug("PixelDQM") << " ---> Adding Endcap Module " << detId.rawId() << endl;
+          PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(id), pTT, isUpgrade).halfCylinder();
+          int disk = PixelEndcapName(DetId(id), pTT, isUpgrade).diskName();
+          if (disk > noOfDisks)
+            noOfDisks = disk;
+          int blade = PixelEndcapName(DetId(id), pTT, isUpgrade).bladeName();
+          int panel = PixelEndcapName(DetId(id), pTT, isUpgrade).pannelName();
+          int module = PixelEndcapName(DetId(id), pTT, isUpgrade).plaquetteName();
+          char sside[80];
+          sprintf(sside, "HalfCylinder_%i", side);
+          char sdisk[80];
+          sprintf(sdisk, "Disk_%i", disk);
+          char sblade[80];
+          sprintf(sblade, "Blade_%02i", blade);
+          char spanel[80];
+          sprintf(spanel, "Panel_%i", panel);
+          char smodule[80];
+          sprintf(smodule, "Module_%i", module);
           std::string side_str = sside;
-	  std::string disk_str = sdisk;
-	  bool mask = side_str.find("HalfCylinder_1")!=string::npos||
-	              side_str.find("HalfCylinder_2")!=string::npos||
-		      side_str.find("HalfCylinder_4")!=string::npos||
-		      disk_str.find("Disk_2")!=string::npos;
-	  // clutch to take all of FPIX, but no BPIX:
-	  mask = false;
-	  if(isPIB && mask) continue;
-      SiPixelClusterModule* theModule = new SiPixelClusterModule(id, ncols, nrows);
-	  thePixelStructure.insert(pair<uint32_t,SiPixelClusterModule*> (id,theModule));
+          std::string disk_str = sdisk;
+          bool mask = side_str.find("HalfCylinder_1") != string::npos ||
+                      side_str.find("HalfCylinder_2") != string::npos ||
+                      side_str.find("HalfCylinder_4") != string::npos || disk_str.find("Disk_2") != string::npos;
+          // clutch to take all of FPIX, but no BPIX:
+          mask = false;
+          if (isPIB && mask)
+            continue;
+          SiPixelClusterModule *theModule = new SiPixelClusterModule(id, ncols, nrows);
+          thePixelStructure.insert(pair<uint32_t, SiPixelClusterModule *>(id, theModule));
         }
       }
     }
   }
-  LogInfo ("PixelDQM") << " *** Pixel Structure Size " << thePixelStructure.size() << endl;
+  LogInfo("PixelDQM") << " *** Pixel Structure Size " << thePixelStructure.size() << endl;
 }
 //------------------------------------------------------------------
 // Book MEs
 //------------------------------------------------------------------
-void SiPixelClusterSource::bookMEs(DQMStore::IBooker & iBooker, const edm::EventSetup& iSetup){
-  
+void SiPixelClusterSource::bookMEs(DQMStore::IBooker &iBooker, const edm::EventSetup &iSetup) {
   // Get DQM interface
   iBooker.setCurrentFolder(topFolderName_);
-  char title[256]; snprintf(title, 256, "Rate of events with >%i FPIX clusters;LumiSection;Rate of large FPIX events per LS [Hz]",bigEventSize);
-  bigFpixClusterEventRate = iBooker.book1D("bigFpixClusterEventRate",title,5000,0.,5000.);
+  char title[256];
+  snprintf(title,
+           256,
+           "Rate of events with >%i FPIX clusters;LumiSection;Rate of large "
+           "FPIX events per LS [Hz]",
+           bigEventSize);
+  bigFpixClusterEventRate = iBooker.book1D("bigFpixClusterEventRate", title, 5000, 0., 5000.);
 
+  std::map<uint32_t, SiPixelClusterModule *>::iterator struct_iter;
 
-  std::map<uint32_t,SiPixelClusterModule*>::iterator struct_iter;
-  
   SiPixelFolderOrganizer theSiPixelFolder(false);
-  
-  for(struct_iter = thePixelStructure.begin(); struct_iter != thePixelStructure.end(); struct_iter++){
-    
-    /// Create folder tree and book histograms 
-    if(modOn){
-      if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,0,isUpgrade)){
-        (*struct_iter).second->book( conf_,iSetup,iBooker,0,twoDimOn,reducedSet,isUpgrade);
+
+  for (struct_iter = thePixelStructure.begin(); struct_iter != thePixelStructure.end(); struct_iter++) {
+    /// Create folder tree and book histograms
+    if (modOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*struct_iter).first, 0, isUpgrade)) {
+        (*struct_iter).second->book(conf_, iSetup, iBooker, 0, twoDimOn, reducedSet, isUpgrade);
       } else {
-        
-        if(!isPIB) throw cms::Exception("LogicError")
-	  << "[SiPixelClusterSource::bookMEs] Creation of DQM folder failed";
+        if (!isPIB)
+          throw cms::Exception("LogicError") << "[SiPixelClusterSource::bookMEs] Creation of DQM folder "
+                                                "failed";
       }
     }
-    if(ladOn){
-      if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,1,isUpgrade)){
-	(*struct_iter).second->book( conf_,iSetup,iBooker,1,twoDimOn,reducedSet,isUpgrade);
-	} else {
-	LogDebug ("PixelDQM") << "PROBLEM WITH LADDER-FOLDER\n";
+    if (ladOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*struct_iter).first, 1, isUpgrade)) {
+        (*struct_iter).second->book(conf_, iSetup, iBooker, 1, twoDimOn, reducedSet, isUpgrade);
+      } else {
+        LogDebug("PixelDQM") << "PROBLEM WITH LADDER-FOLDER\n";
       }
     }
-    if(layOn){
-      if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,2,isUpgrade)){
-	(*struct_iter).second->book( conf_,iSetup,iBooker,2,twoDimOn,reducedSet,isUpgrade);
-	} else {
-	LogDebug ("PixelDQM") << "PROBLEM WITH LAYER-FOLDER\n";
+    if (layOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*struct_iter).first, 2, isUpgrade)) {
+        (*struct_iter).second->book(conf_, iSetup, iBooker, 2, twoDimOn, reducedSet, isUpgrade);
+      } else {
+        LogDebug("PixelDQM") << "PROBLEM WITH LAYER-FOLDER\n";
       }
     }
-    if(phiOn){
-      if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,3,isUpgrade)){
-	(*struct_iter).second->book( conf_,iSetup,iBooker,3,twoDimOn,reducedSet,isUpgrade);
-	} else {
-	LogDebug ("PixelDQM") << "PROBLEM WITH PHI-FOLDER\n";
+    if (phiOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*struct_iter).first, 3, isUpgrade)) {
+        (*struct_iter).second->book(conf_, iSetup, iBooker, 3, twoDimOn, reducedSet, isUpgrade);
+      } else {
+        LogDebug("PixelDQM") << "PROBLEM WITH PHI-FOLDER\n";
       }
     }
-    if(bladeOn){
-      if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,4,isUpgrade)){
-	(*struct_iter).second->book( conf_,iSetup,iBooker,4,twoDimOn,reducedSet,isUpgrade);
-	} else {
-	LogDebug ("PixelDQM") << "PROBLEM WITH BLADE-FOLDER\n";
+    if (bladeOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*struct_iter).first, 4, isUpgrade)) {
+        (*struct_iter).second->book(conf_, iSetup, iBooker, 4, twoDimOn, reducedSet, isUpgrade);
+      } else {
+        LogDebug("PixelDQM") << "PROBLEM WITH BLADE-FOLDER\n";
       }
     }
-    if(diskOn){
-      if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,5,isUpgrade)){
-	(*struct_iter).second->book( conf_,iSetup,iBooker,5,twoDimOn,reducedSet,isUpgrade);
-	} else {
-	LogDebug ("PixelDQM") << "PROBLEM WITH DISK-FOLDER\n";
+    if (diskOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*struct_iter).first, 5, isUpgrade)) {
+        (*struct_iter).second->book(conf_, iSetup, iBooker, 5, twoDimOn, reducedSet, isUpgrade);
+      } else {
+        LogDebug("PixelDQM") << "PROBLEM WITH DISK-FOLDER\n";
       }
     }
-    if(ringOn){
-      if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,6,isUpgrade)){
-	(*struct_iter).second->book( conf_,iSetup,iBooker,6,twoDimOn,reducedSet,isUpgrade);
-	} else {
-	LogDebug ("PixelDQM") << "PROBLEM WITH RING-FOLDER\n";
+    if (ringOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*struct_iter).first, 6, isUpgrade)) {
+        (*struct_iter).second->book(conf_, iSetup, iBooker, 6, twoDimOn, reducedSet, isUpgrade);
+      } else {
+        LogDebug("PixelDQM") << "PROBLEM WITH RING-FOLDER\n";
       }
     }
-    if(smileyOn){
-      if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,7,isUpgrade)){
-        (*struct_iter).second->book( conf_,iSetup,iBooker,7,twoDimOn,reducedSet,isUpgrade);
-        } else {
-        LogDebug ("PixelDQM") << "PROBLEM WITH BARREL-FOLDER\n";
+    if (smileyOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*struct_iter).first, 7, isUpgrade)) {
+        (*struct_iter).second->book(conf_, iSetup, iBooker, 7, twoDimOn, reducedSet, isUpgrade);
+      } else {
+        LogDebug("PixelDQM") << "PROBLEM WITH BARREL-FOLDER\n";
       }
     }
-
   }
-
 }
 
-void SiPixelClusterSource::getrococcupancy(DetId detId,const edm::DetSetVector<PixelDigi> & diginp,const TrackerTopology* const tTopo,
-					   std::vector<MonitorElement*> const & meinput) {
-  
+void SiPixelClusterSource::getrococcupancy(DetId detId,
+                                           const edm::DetSetVector<PixelDigi> &diginp,
+                                           const TrackerTopology *const tTopo,
+                                           std::vector<MonitorElement *> const &meinput) {
   edm::DetSetVector<PixelDigi>::const_iterator ipxsearch = diginp.find(detId);
-  if( ipxsearch != diginp.end() ) {
-    
+  if (ipxsearch != diginp.end()) {
     // Look at digis now
-    edm::DetSet<PixelDigi>::const_iterator  pxdi;
+    edm::DetSet<PixelDigi>::const_iterator pxdi;
     for (pxdi = ipxsearch->begin(); pxdi != ipxsearch->end(); pxdi++) {
-      
-      bool isHalfModule = PixelBarrelName(DetId(detId),tTopo,isUpgrade).isHalfModule();
-      int  DBlayer      = PixelBarrelName(DetId(detId),tTopo,isUpgrade).layerName();
-      int  DBmodule     = PixelBarrelName(DetId(detId),tTopo,isUpgrade).moduleName();
-      int  DBladder     = PixelBarrelName(DetId(detId),tTopo,isUpgrade).ladderName();
-      int  DBshell      = PixelBarrelName(DetId(detId),tTopo,isUpgrade).shell();
-      
+      bool isHalfModule = PixelBarrelName(DetId(detId), tTopo, isUpgrade).isHalfModule();
+      int DBlayer = PixelBarrelName(DetId(detId), tTopo, isUpgrade).layerName();
+      int DBmodule = PixelBarrelName(DetId(detId), tTopo, isUpgrade).moduleName();
+      int DBladder = PixelBarrelName(DetId(detId), tTopo, isUpgrade).ladderName();
+      int DBshell = PixelBarrelName(DetId(detId), tTopo, isUpgrade).shell();
+
       // add sign to the modules
-      if (DBshell==1 || DBshell==2) { DBmodule = -DBmodule; }
-      if (DBshell==1 || DBshell==3) { DBladder = -DBladder; }
-      
-    int col = pxdi->column();
-    int row = pxdi->row();
-    
-    float modsign = (float)DBmodule/(abs((float)DBmodule));
-    float ladsign = (float)DBladder/(abs((float)DBladder));
-    float rocx = ((float)col/(52.*8.))*modsign + ((float)DBmodule-(modsign)*0.5);
-    float rocy = ((float)row/(80.*2.))*ladsign + ((float)DBladder-(ladsign)*0.5);
-    
-    // do the flip where need
-    bool flip    = false;
-    if ( (DBladder%2==0) && (!isHalfModule) ) { flip = true; }
-    if ((flip) && (DBladder>0)) {
-      if      ( ( ((float)DBladder-(ladsign)*0.5)<=rocy) && (rocy<(float)DBladder))    { rocy = rocy + ladsign*0.5; }
-      else if ( ( ((float)DBladder)<=rocy) && (rocy<((float)DBladder+(ladsign)*0.5)) ) { rocy = rocy - ladsign*0.5; }
-    }
-    
-    // tweak border effect for negative modules/ladders
-    if (modsign<0) { rocx = rocx -0.0001; }
-    if (ladsign<0) { rocy = rocy -0.0001; } else { rocy = rocy +0.0001; }
-    if (abs(DBladder)==1) { rocy = rocy + ladsign*0.5; } //take care of the half module
-    meinput[DBlayer-1]->Fill(rocx,rocy);
-    } // end of looping over pxdi
+      if (DBshell == 1 || DBshell == 2) {
+        DBmodule = -DBmodule;
+      }
+      if (DBshell == 1 || DBshell == 3) {
+        DBladder = -DBladder;
+      }
+
+      int col = pxdi->column();
+      int row = pxdi->row();
+
+      float modsign = (float)DBmodule / (abs((float)DBmodule));
+      float ladsign = (float)DBladder / (abs((float)DBladder));
+      float rocx = ((float)col / (52. * 8.)) * modsign + ((float)DBmodule - (modsign)*0.5);
+      float rocy = ((float)row / (80. * 2.)) * ladsign + ((float)DBladder - (ladsign)*0.5);
+
+      // do the flip where need
+      bool flip = false;
+      if ((DBladder % 2 == 0) && (!isHalfModule)) {
+        flip = true;
+      }
+      if ((flip) && (DBladder > 0)) {
+        if ((((float)DBladder - (ladsign)*0.5) <= rocy) && (rocy < (float)DBladder)) {
+          rocy = rocy + ladsign * 0.5;
+        } else if ((((float)DBladder) <= rocy) && (rocy < ((float)DBladder + (ladsign)*0.5))) {
+          rocy = rocy - ladsign * 0.5;
+        }
+      }
+
+      // tweak border effect for negative modules/ladders
+      if (modsign < 0) {
+        rocx = rocx - 0.0001;
+      }
+      if (ladsign < 0) {
+        rocy = rocy - 0.0001;
+      } else {
+        rocy = rocy + 0.0001;
+      }
+      if (abs(DBladder) == 1) {
+        rocy = rocy + ladsign * 0.5;
+      }  // take care of the half module
+      meinput[DBlayer - 1]->Fill(rocx, rocy);
+    }  // end of looping over pxdi
   }
 }
 
-
-void SiPixelClusterSource::getrococcupancye(DetId detId, const edmNew::DetSetVector<SiPixelCluster> & clustColl, 
-					    const TrackerTopology* const pTT, edm::ESHandle<TrackerGeometry> pDD,MonitorElement* meinput) {
-  
+void SiPixelClusterSource::getrococcupancye(DetId detId,
+                                            const edmNew::DetSetVector<SiPixelCluster> &clustColl,
+                                            const TrackerTopology *const pTT,
+                                            edm::ESHandle<TrackerGeometry> pDD,
+                                            MonitorElement *meinput) {
   edmNew::DetSetVector<SiPixelCluster>::const_iterator ipxsearch = clustColl.find(detId);
-  if( ipxsearch != clustColl.end() ) {
-    
+  if (ipxsearch != clustColl.end()) {
     // Look at clusters now
-    edmNew::DetSet<SiPixelCluster>::const_iterator  pxclust;
+    edmNew::DetSet<SiPixelCluster>::const_iterator pxclust;
     for (pxclust = ipxsearch->begin(); pxclust != ipxsearch->end(); pxclust++) {
-      
-      const GeomDetUnit      * geoUnit = pDD->idToDetUnit( detId );
-      const PixelGeomDetUnit * pixDet  = dynamic_cast<const PixelGeomDetUnit*>(geoUnit);    
-      const PixelTopology * topol = &(pixDet->specificTopology());
-      LocalPoint clustlp = topol->localPosition( MeasurementPoint(pxclust->x(),pxclust->y()) );
-      GlobalPoint clustgp = geoUnit->surface().toGlobal( clustlp );    
-      
+      const GeomDetUnit *geoUnit = pDD->idToDetUnit(detId);
+      const PixelGeomDetUnit *pixDet = dynamic_cast<const PixelGeomDetUnit *>(geoUnit);
+      const PixelTopology *topol = &(pixDet->specificTopology());
+      LocalPoint clustlp = topol->localPosition(MeasurementPoint(pxclust->x(), pxclust->y()));
+      GlobalPoint clustgp = geoUnit->surface().toGlobal(clustlp);
+
       float xclust = pxclust->x();
       float yclust = pxclust->y();
-      float z      = clustgp.z();    
-      
-      int pxfside   = PixelEndcapName(detId,pTT,isUpgrade).halfCylinder();     
-      int pxfpanel  = PixelEndcapName(detId,pTT,isUpgrade).pannelName();
-      int pxfmodule = PixelEndcapName(detId,pTT,isUpgrade).plaquetteName();
-      int pxfdisk   = PixelEndcapName(detId,pTT,isUpgrade).diskName();
-      int pxfblade  = PixelEndcapName(detId,pTT,isUpgrade).bladeName();
-      
-      if ( (pxfside==1) || (pxfside==3) ) { pxfblade = -1.*pxfblade; }      
-      
-      if (z<0.) { pxfdisk  = -1.*pxfdisk; }
-      
-      int clu_sdpx = ((pxfdisk>0) ? 1 : -1) * (2 * (abs(pxfdisk) - 1) + pxfpanel);
-      int binselx = (pxfpanel==1&&(pxfmodule==1||pxfmodule==4)) ? (pxfmodule==1) : ((pxfpanel==1&& xclust<80.0)||(pxfpanel==2&&xclust>=80.0));
+      float z = clustgp.z();
+
+      int pxfside = PixelEndcapName(detId, pTT, isUpgrade).halfCylinder();
+      int pxfpanel = PixelEndcapName(detId, pTT, isUpgrade).pannelName();
+      int pxfmodule = PixelEndcapName(detId, pTT, isUpgrade).plaquetteName();
+      int pxfdisk = PixelEndcapName(detId, pTT, isUpgrade).diskName();
+      int pxfblade = PixelEndcapName(detId, pTT, isUpgrade).bladeName();
+
+      if ((pxfside == 1) || (pxfside == 3)) {
+        pxfblade = -1. * pxfblade;
+      }
+
+      if (z < 0.) {
+        pxfdisk = -1. * pxfdisk;
+      }
+
+      int clu_sdpx = ((pxfdisk > 0) ? 1 : -1) * (2 * (abs(pxfdisk) - 1) + pxfpanel);
+      int binselx = (pxfpanel == 1 && (pxfmodule == 1 || pxfmodule == 4))
+                        ? (pxfmodule == 1)
+                        : ((pxfpanel == 1 && xclust < 80.0) || (pxfpanel == 2 && xclust >= 80.0));
       int nperpan = 2 * pxfmodule + pxfpanel - 1 + binselx;
-      int clu_roc_binx = ((pxfdisk>0) ? nperpan : 9 - nperpan) + (clu_sdpx + 4) * 8 - 2 * ((abs(pxfdisk)==1) ? pxfdisk : 0);
- 
+      int clu_roc_binx =
+          ((pxfdisk > 0) ? nperpan : 9 - nperpan) + (clu_sdpx + 4) * 8 - 2 * ((abs(pxfdisk) == 1) ? pxfdisk : 0);
+
       int clu_roc_biny = -99.;
       int nrocly = pxfmodule + pxfpanel;
-      for (int i=0; i<nrocly; i++) {
-	int j = (pxfdisk<0) ? i : nrocly - 1 - i;
-	if (yclust>=(j*52.0)&& yclust<((j+1)*52.0))
-	  clu_roc_biny = 6 - nrocly + 2 * i + ((pxfblade>0) ? pxfblade-1 : pxfblade + 12)*12 + 1;
+      for (int i = 0; i < nrocly; i++) {
+        int j = (pxfdisk < 0) ? i : nrocly - 1 - i;
+        if (yclust >= (j * 52.0) && yclust < ((j + 1) * 52.0))
+          clu_roc_biny = 6 - nrocly + 2 * i + ((pxfblade > 0) ? pxfblade - 1 : pxfblade + 12) * 12 + 1;
       }
-      if (pxfblade>0) { clu_roc_biny = clu_roc_biny+144; }
-      
-      meinput->setBinContent(clu_roc_binx,clu_roc_biny, meinput->getBinContent(clu_roc_binx,clu_roc_biny)+1);
-      meinput->setBinContent(clu_roc_binx,clu_roc_biny+1, meinput->getBinContent(clu_roc_binx,clu_roc_biny+1)+1);
-      
+      if (pxfblade > 0) {
+        clu_roc_biny = clu_roc_biny + 144;
+      }
+
+      meinput->setBinContent(clu_roc_binx, clu_roc_biny, meinput->getBinContent(clu_roc_binx, clu_roc_biny) + 1);
+      meinput->setBinContent(
+          clu_roc_binx, clu_roc_biny + 1, meinput->getBinContent(clu_roc_binx, clu_roc_biny + 1) + 1);
     }
   }
-  
 }
 
-
-
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SiPixelClusterSource);
diff --git a/DQM/SiPixelMonitorDigi/interface/SiPixelDigiModule.h b/DQM/SiPixelMonitorDigi/interface/SiPixelDigiModule.h
index 70f10428ea468..40ca77fcf4ea1 100644
--- a/DQM/SiPixelMonitorDigi/interface/SiPixelDigiModule.h
+++ b/DQM/SiPixelMonitorDigi/interface/SiPixelDigiModule.h
@@ -61,10 +61,10 @@ class SiPixelDigiModule {
   void book(const edm::ParameterSet& iConfig, const edm::EventSetup& iSetup, DQMStore::IBooker & iBooker, int type=0, bool twoD=true, bool hiRes=false, bool reducedSet=false, bool additInfo=false, bool isUpgrade=false);
   /// Fill histograms
 //  int fill(const edm::DetSetVector<PixelDigi> & input, bool modon=true, 
-//						 bool ladon=false, bool layon=false, bool phion=false, 
-//						 bool bladeon=false, bool diskon=false, bool ringon=false, 
-//						 bool twoD=true, bool reducedSet=false, bool twoDimModOn = true, bool twoDimOnlyLayDisk = false,
-//						 int &nDigisA, int &nDigisB);
+//           bool ladon=false, bool layon=false, bool phion=false, 
+//           bool bladeon=false, bool diskon=false, bool ringon=false, 
+//           bool twoD=true, bool reducedSet=false, bool twoDimModOn = true, bool twoDimOnlyLayDisk = false,
+//           int &nDigisA, int &nDigisB);
   int fill(const edm::DetSetVector<PixelDigi>& input, const edm::EventSetup& iSetup,
       MonitorElement* combBarrel, MonitorElement* chanBarrel, std::vector<MonitorElement*>& chanBarrelL, MonitorElement* combEndcap,
 	   const bool modon, const bool ladon, const bool layon, const bool phion, 
diff --git a/DQM/SiPixelMonitorRawData/interface/SiPixelHLTSource.h b/DQM/SiPixelMonitorRawData/interface/SiPixelHLTSource.h
index 2de17a67a64d4..c49ac065b4fbb 100644
--- a/DQM/SiPixelMonitorRawData/interface/SiPixelHLTSource.h
+++ b/DQM/SiPixelMonitorRawData/interface/SiPixelHLTSource.h
@@ -4,16 +4,16 @@
 //
 // Package:     SiPixelMonitorRawData
 // Class  :     SiPixelHLTSource
-// 
+//
 /**
 
- Description: 
- Produces histograms for error information generated at the raw2digi stage for the 
- pixel tracker.
+ Description:
+ Produces histograms for error information generated at the raw2digi stage for
+ the pixel tracker.
 
  Implementation:
- Takes raw data and error data as input, and uses it to populate three histograms 
- indexed by FED id.
+ Takes raw data and error data as input, and uses it to populate three
+ histograms indexed by FED id.
 
 */
 //
@@ -24,52 +24,51 @@
 
 // user include files
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 
 #include "DataFormats/Common/interface/DetSetVector.h"
-#include "DataFormats/SiPixelRawData/interface/SiPixelRawDataError.h"
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
+#include "DataFormats/SiPixelRawData/interface/SiPixelRawDataError.h"
 
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 
 #include <boost/cstdint.hpp>
 
- class SiPixelHLTSource : public DQMEDAnalyzer {
-    public:
-       explicit SiPixelHLTSource(const edm::ParameterSet& conf);
-       ~SiPixelHLTSource() override;
-
-       void analyze(const edm::Event&, const edm::EventSetup&) override;
-       void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-       void dqmBeginRun(const edm::Run&, edm::EventSetup const&) override;
-       virtual void bookMEs(DQMStore::IBooker &);
+class SiPixelHLTSource : public DQMEDAnalyzer {
+public:
+  explicit SiPixelHLTSource(const edm::ParameterSet &conf);
+  ~SiPixelHLTSource() override;
 
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void dqmBeginRun(const edm::Run &, edm::EventSetup const &) override;
+  virtual void bookMEs(DQMStore::IBooker &);
 
-    private:
-       edm::ParameterSet conf_;
-       edm::EDGetTokenT<FEDRawDataCollection> rawin_;
-       edm::EDGetTokenT<edm::DetSetVector<SiPixelRawDataError> > errin_;
-       edm::ESHandle<TrackerGeometry> pDD;
-       bool saveFile;
-       bool slowDown;
-       std::string dirName_;
-       int eventNo;
-       MonitorElement* meRawWords_;
-       MonitorElement* meNCRCs_;
-       MonitorElement* meNErrors_;
-       bool firstRun;
- };
+private:
+  edm::ParameterSet conf_;
+  edm::EDGetTokenT<FEDRawDataCollection> rawin_;
+  edm::EDGetTokenT<edm::DetSetVector<SiPixelRawDataError>> errin_;
+  edm::ESHandle<TrackerGeometry> pDD;
+  bool saveFile;
+  bool slowDown;
+  std::string dirName_;
+  int eventNo;
+  MonitorElement *meRawWords_;
+  MonitorElement *meNCRCs_;
+  MonitorElement *meNErrors_;
+  bool firstRun;
+};
 
 #endif
diff --git a/DQM/SiPixelMonitorRawData/interface/SiPixelRawDataErrorModule.h b/DQM/SiPixelMonitorRawData/interface/SiPixelRawDataErrorModule.h
old mode 100755
new mode 100644
index 9a95eebc76136..7a8175a960015
--- a/DQM/SiPixelMonitorRawData/interface/SiPixelRawDataErrorModule.h
+++ b/DQM/SiPixelMonitorRawData/interface/SiPixelRawDataErrorModule.h
@@ -4,76 +4,81 @@
 //
 // Package:    SiPixelMonitorRawData
 // Class:      SiPixelRawDataErrorModule
-// 
-/**\class 
+//
+/**\class
 
- Description: 
+ Description:
  Error monitoring elements for a Pixel sensor.
 
  Implementation:
- Contains three functions to monitor error information.  "book" creates histograms in detector units and "fill" fills the monitoring elements with input error information.  
-     
+ Contains three functions to monitor error information.  "book" creates
+ histograms in detector units and "fill" fills the monitoring elements with
+ input error information.
+
 */
 //
 // Original Author:  Andrew York
-//         Created:  
+//         Created:
 //
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMStore.h"
-#include "DataFormats/SiPixelRawData/interface/SiPixelRawDataError.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Common/interface/DetSetVector.h"
+#include "DataFormats/SiPixelRawData/interface/SiPixelRawDataError.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include <boost/cstdint.hpp>
 
-class SiPixelRawDataErrorModule {        
-
- public:
-
+class SiPixelRawDataErrorModule {
+public:
   /// Default constructor
   SiPixelRawDataErrorModule();
   /// Constructor with raw DetId
-  SiPixelRawDataErrorModule(const uint32_t& id);
+  SiPixelRawDataErrorModule(const uint32_t &id);
   /// Constructor with raw DetId and sensor size
-  SiPixelRawDataErrorModule(const uint32_t& id, const int& ncols, const int& nrows);
+  SiPixelRawDataErrorModule(const uint32_t &id, const int &ncols, const int &nrows);
   /// Destructor
   ~SiPixelRawDataErrorModule();
 
-  typedef edm::DetSet<SiPixelRawDataError>::const_iterator    ErrorIterator;
+  typedef edm::DetSet<SiPixelRawDataError>::const_iterator ErrorIterator;
 
   /// Book histograms
-  void book(const edm::ParameterSet& iConfig, DQMStore::IBooker &, int type=0, bool isUpgrade=false);
+  void book(const edm::ParameterSet &iConfig, DQMStore::IBooker &, int type = 0, bool isUpgrade = false);
   /// Fill histograms
-  int fill(const edm::DetSetVector<SiPixelRawDataError> & input, std::map<std::string,MonitorElement**> * meMapFEDs, bool modon=true, bool ladon=false, bool bladeon=false);
+  int fill(const edm::DetSetVector<SiPixelRawDataError> &input,
+           std::map<std::string, MonitorElement **> *meMapFEDs,
+           bool modon = true,
+           bool ladon = false,
+           bool bladeon = false);
   /// Fill FED histograms
-  int fillFED(const edm::DetSetVector<SiPixelRawDataError> & input, std::map<std::string,MonitorElement**> *meMapFEDs);
-  
- private:
+  int fillFED(const edm::DetSetVector<SiPixelRawDataError> &input, std::map<std::string, MonitorElement **> *meMapFEDs);
 
+private:
   uint32_t id_;
   int ncols_;
   int nrows_;
   bool _debug_;
 
-  //barrel:
-  MonitorElement* meErrorTypeLad_;
-  MonitorElement* meNErrorsLad_;
-  MonitorElement* meFullTypeLad_;
-  MonitorElement* meTBMMessageLad_;
-  MonitorElement* meTBMTypeLad_;
-  MonitorElement* meEvtNbrLad_;
-  MonitorElement* meEvtSizeLad_;
-  
-  //forward:
-  MonitorElement* meErrorTypeBlade_;
-  MonitorElement* meNErrorsBlade_;
-  MonitorElement* meFullTypeBlade_;
-  MonitorElement* meTBMMessageBlade_;
-  MonitorElement* meTBMTypeBlade_;
-  MonitorElement* meEvtNbrBlade_;
-  MonitorElement* meEvtSizeBlade_;
+  // barrel:
+  MonitorElement *meErrorTypeLad_;
+  MonitorElement *meNErrorsLad_;
+  MonitorElement *meFullTypeLad_;
+  MonitorElement *meTBMMessageLad_;
+  MonitorElement *meTBMTypeLad_;
+  MonitorElement *meEvtNbrLad_;
+  MonitorElement *meEvtSizeLad_;
+
+  // forward:
+  MonitorElement *meErrorTypeBlade_;
+  MonitorElement *meNErrorsBlade_;
+  MonitorElement *meFullTypeBlade_;
+  MonitorElement *meTBMMessageBlade_;
+  MonitorElement *meTBMTypeBlade_;
+  MonitorElement *meEvtNbrBlade_;
+  MonitorElement *meEvtSizeBlade_;
 
-  static const int LINK_bits,  ROC_bits,  DCOL_bits,  PXID_bits,  ADC_bits, DataBit_bits, TRLRBGN_bits, EVTLGT_bits, TRLREND_bits;
-  static const int LINK_shift, ROC_shift, DCOL_shift, PXID_shift, ADC_shift, DB0_shift, DB1_shift, DB2_shift, DB3_shift, DB4_shift, DB5_shift, DB6_shift, DB7_shift, TRLRBGN_shift, EVTLGT_shift, TRLREND_shift;
+  static const int LINK_bits, ROC_bits, DCOL_bits, PXID_bits, ADC_bits, DataBit_bits, TRLRBGN_bits, EVTLGT_bits,
+      TRLREND_bits;
+  static const int LINK_shift, ROC_shift, DCOL_shift, PXID_shift, ADC_shift, DB0_shift, DB1_shift, DB2_shift, DB3_shift,
+      DB4_shift, DB5_shift, DB6_shift, DB7_shift, TRLRBGN_shift, EVTLGT_shift, TRLREND_shift;
   static const uint32_t LINK_mask, ROC_mask, DCOL_mask, PXID_mask, ADC_mask, DataBit_mask;
   static const unsigned long long TRLRBGN_mask, EVTLGT_mask, TRLREND_mask;
 };
diff --git a/DQM/SiPixelMonitorRawData/interface/SiPixelRawDataErrorSource.h b/DQM/SiPixelMonitorRawData/interface/SiPixelRawDataErrorSource.h
old mode 100755
new mode 100644
index cd843a17ed0b0..01188f1653d03
--- a/DQM/SiPixelMonitorRawData/interface/SiPixelRawDataErrorSource.h
+++ b/DQM/SiPixelMonitorRawData/interface/SiPixelRawDataErrorSource.h
@@ -4,20 +4,21 @@
 //
 // Package:     SiPixelMonitorRawData
 // Class  :     SiPixelRawDataErrorSource
-// 
+//
 /**
 
- Description: 
- Produces histograms for error information generated at the raw2digi stage for the 
- pixel tracker.
+ Description:
+ Produces histograms for error information generated at the raw2digi stage for
+ the pixel tracker.
 
- Usage: 
- Takes a DetSetVector<SiPixelRawDataError> as input, and uses it to populate  a folder 
- hierarchy (organized by detId) with histograms containing information about 
- the errors.  Uses SiPixelRawDataErrorModule class to book and fill individual folders.  
- Note that this source is different than other DQM sources in the creation of an 
- unphysical detId folder (detId=0xffffffff) to hold information about errors for which 
- there is no detId available (except the dummy detId given to it at raw2digi).
+ Usage:
+ Takes a DetSetVector<SiPixelRawDataError> as input, and uses it to populate  a
+ folder hierarchy (organized by detId) with histograms containing information
+ about the errors.  Uses SiPixelRawDataErrorModule class to book and fill
+ individual folders. Note that this source is different than other DQM sources
+ in the creation of an unphysical detId folder (detId=0xffffffff) to hold
+ information about errors for which there is no detId available (except the
+ dummy detId given to it at raw2digi).
 
 */
 //
@@ -27,78 +28,76 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 
 #include "DQM/SiPixelMonitorRawData/interface/SiPixelRawDataErrorModule.h"
 
 #include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/SiPixelRawData/interface/SiPixelRawDataError.h"
 
-
+#include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 #include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include <boost/cstdint.hpp>
 
 class SiPixelRawDataErrorSource : public one::DQMEDAnalyzer<one::DQMLuminosityBlockElements> {
-    public:
-       explicit SiPixelRawDataErrorSource(const edm::ParameterSet& conf);
-       ~SiPixelRawDataErrorSource() override;
-
-       typedef edm::DetSet<SiPixelRawDataError>::const_iterator    ErrorIterator;
-       
-       void analyze(const edm::Event&, const edm::EventSetup&) override;
-       void dqmBeginRun(const edm::Run&, edm::EventSetup const&) override;
-       void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-
-       virtual void buildStructure(edm::EventSetup const&);
-       virtual void bookMEs(DQMStore::IBooker &);
-
-    private:
-       edm::ParameterSet conf_;
-       edm::EDGetTokenT<edm::DetSetVector<SiPixelRawDataError> > src_;
-       edm::EDGetTokenT<FEDRawDataCollection> inputSourceToken_;
-       std::string topFolderName_;
-       bool saveFile;
-       bool isPIB;
-       bool slowDown;
-       bool reducedSet;
-       bool modOn;
-       bool ladOn;
-       bool bladeOn;
-       bool isUpgrade;
-       int eventNo;
-       std::map<uint32_t,SiPixelRawDataErrorModule*> thePixelStructure;
-       std::map<uint32_t,SiPixelRawDataErrorModule*> theFEDStructure;
-       bool firstRun;
-       MonitorElement* byLumiErrors; 
-       MonitorElement* errorRate;
-       MonitorElement* fedcounter;
-
-       MonitorElement* meErrorType_[40];
-       MonitorElement* meNErrors_[40];
-       MonitorElement* meFullType_[40];
-       MonitorElement* meTBMMessage_[40];
-       MonitorElement* meTBMType_[40];
-       MonitorElement* meEvtNbr_[40];
-       MonitorElement* meEvtSize_[40];
-
-       MonitorElement* meFedChNErr_[40];
-       MonitorElement* meFedChLErr_[40];
-       MonitorElement* meFedETypeNErr_[40];
-
-       std::map<std::string,MonitorElement**> meMapFEDs_;
-       
- };
+public:
+  explicit SiPixelRawDataErrorSource(const edm::ParameterSet &conf);
+  ~SiPixelRawDataErrorSource() override;
+
+  typedef edm::DetSet<SiPixelRawDataError>::const_iterator ErrorIterator;
+
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void dqmBeginRun(const edm::Run &, edm::EventSetup const &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+
+  virtual void buildStructure(edm::EventSetup const &);
+  virtual void bookMEs(DQMStore::IBooker &);
+
+private:
+  edm::ParameterSet conf_;
+  edm::EDGetTokenT<edm::DetSetVector<SiPixelRawDataError>> src_;
+  edm::EDGetTokenT<FEDRawDataCollection> inputSourceToken_;
+  std::string topFolderName_;
+  bool saveFile;
+  bool isPIB;
+  bool slowDown;
+  bool reducedSet;
+  bool modOn;
+  bool ladOn;
+  bool bladeOn;
+  bool isUpgrade;
+  int eventNo;
+  std::map<uint32_t, SiPixelRawDataErrorModule *> thePixelStructure;
+  std::map<uint32_t, SiPixelRawDataErrorModule *> theFEDStructure;
+  bool firstRun;
+  MonitorElement *byLumiErrors;
+  MonitorElement *errorRate;
+  MonitorElement *fedcounter;
+
+  MonitorElement *meErrorType_[40];
+  MonitorElement *meNErrors_[40];
+  MonitorElement *meFullType_[40];
+  MonitorElement *meTBMMessage_[40];
+  MonitorElement *meTBMType_[40];
+  MonitorElement *meEvtNbr_[40];
+  MonitorElement *meEvtSize_[40];
+
+  MonitorElement *meFedChNErr_[40];
+  MonitorElement *meFedChLErr_[40];
+  MonitorElement *meFedETypeNErr_[40];
+
+  std::map<std::string, MonitorElement **> meMapFEDs_;
+};
 
 #endif
diff --git a/DQM/SiPixelMonitorRawData/src/SiPixelHLTSource.cc b/DQM/SiPixelMonitorRawData/src/SiPixelHLTSource.cc
index 22d71e84c8c91..eb8117fddd307 100644
--- a/DQM/SiPixelMonitorRawData/src/SiPixelHLTSource.cc
+++ b/DQM/SiPixelMonitorRawData/src/SiPixelHLTSource.cc
@@ -2,82 +2,78 @@
 //
 // Package:    SiPixelMonitorRawData
 // Class:      SiPixelHLTSource
-// 
-/**\class 
+//
+/**\class
 
- Description: 
- Produces histograms for error information generated at the raw2digi stage for the 
- pixel tracker.
+ Description:
+ Produces histograms for error information generated at the raw2digi stage for
+ the pixel tracker.
 
  Implementation:
- Takes raw data and error data as input, and uses it to populate three histograms 
- indexed by FED id.
+ Takes raw data and error data as input, and uses it to populate three
+ histograms indexed by FED id.
 
 */
 //
 // Original Author:  Andrew York
 //
 // Framework
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 // DQM Framework
-#include "DQM/SiPixelMonitorRawData/interface/SiPixelHLTSource.h"
 #include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h"
 #include "DQM/SiPixelCommon/interface/SiPixelHistogramId.h"
+#include "DQM/SiPixelMonitorRawData/interface/SiPixelHLTSource.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 // Geometry
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonDetUnit/interface/GeomDetEnumerators.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 // DataFormats
 #include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "DataFormats/FEDRawData/interface/FEDNumbering.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h"
+#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 //
-#include <string>
 #include <cstdlib>
+#include <string>
 
 using namespace std;
 using namespace edm;
 
-SiPixelHLTSource::SiPixelHLTSource(const edm::ParameterSet& iConfig) :
-  conf_(iConfig),
-  rawin_( consumes<FEDRawDataCollection>( conf_.getParameter<edm::InputTag>( "RawInput" ) ) ),
-  errin_( consumes<edm::DetSetVector<SiPixelRawDataError> >( conf_.getParameter<edm::InputTag>( "ErrorInput" ) ) ),
-  saveFile( conf_.getUntrackedParameter<bool>("saveFile",false) ),
-  slowDown( conf_.getUntrackedParameter<bool>("slowDown",false) ),
-  dirName_( conf_.getUntrackedParameter<string>("DirName","Pixel/FEDIntegrity/") )
-{
+SiPixelHLTSource::SiPixelHLTSource(const edm::ParameterSet &iConfig)
+    : conf_(iConfig),
+      rawin_(consumes<FEDRawDataCollection>(conf_.getParameter<edm::InputTag>("RawInput"))),
+      errin_(consumes<edm::DetSetVector<SiPixelRawDataError>>(conf_.getParameter<edm::InputTag>("ErrorInput"))),
+      saveFile(conf_.getUntrackedParameter<bool>("saveFile", false)),
+      slowDown(conf_.getUntrackedParameter<bool>("slowDown", false)),
+      dirName_(conf_.getUntrackedParameter<string>("DirName", "Pixel/FEDIntegrity/")) {
   firstRun = true;
-  LogInfo ("PixelDQM") << "SiPixelHLTSource::SiPixelHLTSource: Got DQM BackEnd interface"<<endl;
+  LogInfo("PixelDQM") << "SiPixelHLTSource::SiPixelHLTSource: Got DQM BackEnd interface" << endl;
 }
 
-
-SiPixelHLTSource::~SiPixelHLTSource()
-{
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-  LogInfo ("PixelDQM") << "SiPixelHLTSource::~SiPixelHLTSource: Destructor"<<endl;
+SiPixelHLTSource::~SiPixelHLTSource() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
+  LogInfo("PixelDQM") << "SiPixelHLTSource::~SiPixelHLTSource: Destructor" << endl;
 }
 
-
-void SiPixelHLTSource::dqmBeginRun(const edm::Run& r, const edm::EventSetup& iSetup){
-  LogInfo ("PixelDQM") << " SiPixelHLTSource::beginJob - Initialisation ... " << std::endl;
-  iSetup.get<TrackerDigiGeometryRecord>().get( pDD );
-  if(firstRun){
+void SiPixelHLTSource::dqmBeginRun(const edm::Run &r, const edm::EventSetup &iSetup) {
+  LogInfo("PixelDQM") << " SiPixelHLTSource::beginJob - Initialisation ... " << std::endl;
+  iSetup.get<TrackerDigiGeometryRecord>().get(pDD);
+  if (firstRun) {
     eventNo = 0;
 
     firstRun = false;
   }
 }
 
-void SiPixelHLTSource::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const &, edm::EventSetup const &){
+void SiPixelHLTSource::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, edm::EventSetup const &) {
   // Book Monitoring Elements
   bookMEs(iBooker);
 }
@@ -85,99 +81,118 @@ void SiPixelHLTSource::bookHistograms(DQMStore::IBooker & iBooker, edm::Run cons
 //------------------------------------------------------------------
 // Method called for every event
 //------------------------------------------------------------------
-void SiPixelHLTSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void SiPixelHLTSource::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   eventNo++;
   // get raw input data
-  edm::Handle< FEDRawDataCollection >  rawinput;
-  iEvent.getByToken( rawin_, rawinput );
+  edm::Handle<FEDRawDataCollection> rawinput;
+  iEvent.getByToken(rawin_, rawinput);
   // get error input data
-  edm::Handle< edm::DetSetVector<SiPixelRawDataError> >  errorinput;
-  iEvent.getByToken( errin_, errorinput );
-  if (!errorinput.isValid()) return;
+  edm::Handle<edm::DetSetVector<SiPixelRawDataError>> errorinput;
+  iEvent.getByToken(errin_, errorinput);
+  if (!errorinput.isValid())
+    return;
 
   int fedId;
-  
-  for(fedId = 0; fedId <= 39; fedId++) {
-    //get event data for this fed
-    const FEDRawData& fedRawData = rawinput->FEDData( fedId );
-    if (fedRawData.size() != 0) (meRawWords_)->Fill(fedId);
-  } // end for
 
-  edm::DetSet<SiPixelRawDataError>::const_iterator  di;
+  for (fedId = 0; fedId <= 39; fedId++) {
+    // get event data for this fed
+    const FEDRawData &fedRawData = rawinput->FEDData(fedId);
+    if (fedRawData.size() != 0)
+      (meRawWords_)->Fill(fedId);
+  }  // end for
 
-  for(TrackerGeometry::DetContainer::const_iterator it = pDD->dets().begin(); it != pDD->dets().end(); it++){
-    if( GeomDetEnumerators::isTrackerPixel((*it)->subDetector())) {
+  edm::DetSet<SiPixelRawDataError>::const_iterator di;
+
+  for (TrackerGeometry::DetContainer::const_iterator it = pDD->dets().begin(); it != pDD->dets().end(); it++) {
+    if (GeomDetEnumerators::isTrackerPixel((*it)->subDetector())) {
       uint32_t detId = (*it)->geographicalId();
       edm::DetSetVector<SiPixelRawDataError>::const_iterator isearch = errorinput->find(detId);
-      if( isearch != errorinput->end() ) {
-    	for(di = isearch->data.begin(); di != isearch->data.end(); di++) {
-      	  fedId = di->getFedId();                  // FED the error came from
-          int errorType = di->getType();           // type of error
-	  switch(errorType) {
-	    case(35) : (meNErrors_)->Fill(fedId); break;
-	    case(36) : (meNErrors_)->Fill(fedId); break;
-	    case(37) : (meNErrors_)->Fill(fedId); break;
-	    case(38) : (meNErrors_)->Fill(fedId); break;
-	    default : break;
-	  }; // end switch
-	} // end for(di
-      } // end if( isearch
-    } // end if( ((*it)->subDetector()
-  } // for(TrackerGeometry
+      if (isearch != errorinput->end()) {
+        for (di = isearch->data.begin(); di != isearch->data.end(); di++) {
+          fedId = di->getFedId();         // FED the error came from
+          int errorType = di->getType();  // type of error
+          switch (errorType) {
+            case (35):
+              (meNErrors_)->Fill(fedId);
+              break;
+            case (36):
+              (meNErrors_)->Fill(fedId);
+              break;
+            case (37):
+              (meNErrors_)->Fill(fedId);
+              break;
+            case (38):
+              (meNErrors_)->Fill(fedId);
+              break;
+            default:
+              break;
+          };  // end switch
+        }     // end for(di
+      }       // end if( isearch
+    }         // end if( ((*it)->subDetector()
+  }           // for(TrackerGeometry
 
   edm::DetSetVector<SiPixelRawDataError>::const_iterator isearch = errorinput->find(0xffffffff);
 
-  if( isearch != errorinput->end() ) {  // Not at empty iterator
-    for(di = isearch->data.begin(); di != isearch->data.end(); di++) {
-      fedId = di->getFedId();                  // FED the error came from
-      int errorType = di->getType();           // type of error
-      switch(errorType) {
-        case(35) : (meNErrors_)->Fill(fedId); break;
-        case(36) : (meNErrors_)->Fill(fedId); break;
-        case(37) : (meNErrors_)->Fill(fedId); break;
-        case(38) : (meNErrors_)->Fill(fedId); break;
-        case(39) : (meNCRCs_)->Fill(fedId); break;
-        default : break;
-      }; // end switch
-    } // end for(di
-  } // end if( isearch
+  if (isearch != errorinput->end()) {  // Not at empty iterator
+    for (di = isearch->data.begin(); di != isearch->data.end(); di++) {
+      fedId = di->getFedId();         // FED the error came from
+      int errorType = di->getType();  // type of error
+      switch (errorType) {
+        case (35):
+          (meNErrors_)->Fill(fedId);
+          break;
+        case (36):
+          (meNErrors_)->Fill(fedId);
+          break;
+        case (37):
+          (meNErrors_)->Fill(fedId);
+          break;
+        case (38):
+          (meNErrors_)->Fill(fedId);
+          break;
+        case (39):
+          (meNCRCs_)->Fill(fedId);
+          break;
+        default:
+          break;
+      };  // end switch
+    }     // end for(di
+  }       // end if( isearch
   // slow down...
-  if(slowDown) usleep(100000);
-
+  if (slowDown)
+    usleep(100000);
 }
 
 //------------------------------------------------------------------
 // Book MEs
 //------------------------------------------------------------------
-void SiPixelHLTSource::bookMEs(DQMStore::IBooker & iBooker){
-
+void SiPixelHLTSource::bookMEs(DQMStore::IBooker &iBooker) {
   iBooker.cd();
   iBooker.setCurrentFolder(dirName_);
-  
+
   std::string rawhid;
   std::string errhid;
   // Get collection name and instantiate Histo Id builder
-  edm::InputTag rawin = conf_.getParameter<edm::InputTag>( "RawInput" );
-  SiPixelHistogramId* RawHistogramId = new SiPixelHistogramId( rawin.label() );
-  edm::InputTag errin = conf_.getParameter<edm::InputTag>( "ErrorInput" );
-  SiPixelHistogramId* ErrorHistogramId = new SiPixelHistogramId( errin.label() );
+  edm::InputTag rawin = conf_.getParameter<edm::InputTag>("RawInput");
+  SiPixelHistogramId *RawHistogramId = new SiPixelHistogramId(rawin.label());
+  edm::InputTag errin = conf_.getParameter<edm::InputTag>("ErrorInput");
+  SiPixelHistogramId *ErrorHistogramId = new SiPixelHistogramId(errin.label());
 
   // Is a FED sending raw data
-  meRawWords_ = iBooker.book1D("FEDEntries","Number of raw words",40,-0.5,39.5);
-  meRawWords_->setAxisTitle("Number of raw words",1);
+  meRawWords_ = iBooker.book1D("FEDEntries", "Number of raw words", 40, -0.5, 39.5);
+  meRawWords_->setAxisTitle("Number of raw words", 1);
 
   // Number of CRC errors
-  meNCRCs_ = iBooker.book1D("FEDFatal","Number of fatal errors",40,-0.5,39.5);
-  meNCRCs_->setAxisTitle("Number of fatal errors",1);
+  meNCRCs_ = iBooker.book1D("FEDFatal", "Number of fatal errors", 40, -0.5, 39.5);
+  meNCRCs_->setAxisTitle("Number of fatal errors", 1);
 
   // Number of translation error words
-  meNErrors_ = iBooker.book1D("FEDNonFatal","Number of non-fatal errors",40,-0.5,39.5);
-  meNErrors_->setAxisTitle("Number of non-fatal errors",1);
+  meNErrors_ = iBooker.book1D("FEDNonFatal", "Number of non-fatal errors", 40, -0.5, 39.5);
+  meNErrors_->setAxisTitle("Number of non-fatal errors", 1);
 
   delete RawHistogramId;
   delete ErrorHistogramId;
-
 }
 
 DEFINE_FWK_MODULE(SiPixelHLTSource);
diff --git a/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorModule.cc b/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorModule.cc
index 549b514f2beb0..e1cdb8af59390 100644
--- a/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorModule.cc
+++ b/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorModule.cc
@@ -1,37 +1,37 @@
+#include "DQM/SiPixelCommon/interface/SiPixelHistogramId.h"
 #include "DQM/SiPixelMonitorRawData/interface/SiPixelRawDataErrorModule.h"
 #include "DQMServices/Core/interface/DQMStore.h"
-#include "DQM/SiPixelCommon/interface/SiPixelHistogramId.h"
 // Framework
 #include "FWCore/ServiceRegistry/interface/Service.h"
 // STL
-#include <vector>
-#include <memory>
-#include <string>
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
+#include <memory>
 #include <sstream>
- 
+#include <string>
+#include <vector>
+
 // Data Formats
+#include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h"
-#include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
- 
+
 using namespace std;
- 
+
 const int SiPixelRawDataErrorModule::LINK_bits = 6;
-const int SiPixelRawDataErrorModule::ROC_bits  = 5;
+const int SiPixelRawDataErrorModule::ROC_bits = 5;
 const int SiPixelRawDataErrorModule::DCOL_bits = 5;
 const int SiPixelRawDataErrorModule::PXID_bits = 8;
-const int SiPixelRawDataErrorModule::ADC_bits  = 8;
+const int SiPixelRawDataErrorModule::ADC_bits = 8;
 const int SiPixelRawDataErrorModule::DataBit_bits = 1;
- 
-const int SiPixelRawDataErrorModule::ADC_shift  = 0;
+
+const int SiPixelRawDataErrorModule::ADC_shift = 0;
 const int SiPixelRawDataErrorModule::PXID_shift = ADC_shift + ADC_bits;
 const int SiPixelRawDataErrorModule::DCOL_shift = PXID_shift + PXID_bits;
-const int SiPixelRawDataErrorModule::ROC_shift  = DCOL_shift + DCOL_bits;
+const int SiPixelRawDataErrorModule::ROC_shift = DCOL_shift + DCOL_bits;
 const int SiPixelRawDataErrorModule::LINK_shift = ROC_shift + ROC_bits;
 const int SiPixelRawDataErrorModule::DB0_shift = 0;
 const int SiPixelRawDataErrorModule::DB1_shift = DB0_shift + DataBit_bits;
@@ -41,51 +41,38 @@ const int SiPixelRawDataErrorModule::DB4_shift = DB3_shift + DataBit_bits;
 const int SiPixelRawDataErrorModule::DB5_shift = DB4_shift + DataBit_bits;
 const int SiPixelRawDataErrorModule::DB6_shift = DB5_shift + DataBit_bits;
 const int SiPixelRawDataErrorModule::DB7_shift = DB6_shift + DataBit_bits;
- 
+
 const uint32_t SiPixelRawDataErrorModule::LINK_mask = ~(~uint32_t(0) << LINK_bits);
-const uint32_t SiPixelRawDataErrorModule::ROC_mask  = ~(~uint32_t(0) << ROC_bits);
+const uint32_t SiPixelRawDataErrorModule::ROC_mask = ~(~uint32_t(0) << ROC_bits);
 const uint32_t SiPixelRawDataErrorModule::DCOL_mask = ~(~uint32_t(0) << DCOL_bits);
 const uint32_t SiPixelRawDataErrorModule::PXID_mask = ~(~uint32_t(0) << PXID_bits);
-const uint32_t SiPixelRawDataErrorModule::ADC_mask  = ~(~uint32_t(0) << ADC_bits);
+const uint32_t SiPixelRawDataErrorModule::ADC_mask = ~(~uint32_t(0) << ADC_bits);
 const uint32_t SiPixelRawDataErrorModule::DataBit_mask = ~(~uint32_t(0) << DataBit_bits);
- 
+
 const int SiPixelRawDataErrorModule::TRLRBGN_bits = 32;
-const int SiPixelRawDataErrorModule::EVTLGT_bits  = 24;
+const int SiPixelRawDataErrorModule::EVTLGT_bits = 24;
 const int SiPixelRawDataErrorModule::TRLREND_bits = 8;
- 
+
 const int SiPixelRawDataErrorModule::TRLRBGN_shift = 0;
-const int SiPixelRawDataErrorModule::EVTLGT_shift  = TRLRBGN_shift + TRLRBGN_bits;
+const int SiPixelRawDataErrorModule::EVTLGT_shift = TRLRBGN_shift + TRLRBGN_bits;
 const int SiPixelRawDataErrorModule::TRLREND_shift = EVTLGT_shift + EVTLGT_bits;
- 
+
 const unsigned long long SiPixelRawDataErrorModule::TRLREND_mask = ~(~0ULL << TRLREND_bits);
-const unsigned long long SiPixelRawDataErrorModule::EVTLGT_mask  = ~(~0ULL << EVTLGT_bits);
+const unsigned long long SiPixelRawDataErrorModule::EVTLGT_mask = ~(~0ULL << EVTLGT_bits);
 const unsigned long long SiPixelRawDataErrorModule::TRLRBGN_mask = ~(~0ULL << TRLRBGN_bits);
 //
 // Constructors
 //
-SiPixelRawDataErrorModule::SiPixelRawDataErrorModule() : 
-  id_(0),
-  ncols_(416),
-  nrows_(160) 
-{ 
-  _debug_ = false;
-}
+SiPixelRawDataErrorModule::SiPixelRawDataErrorModule() : id_(0), ncols_(416), nrows_(160) { _debug_ = false; }
 //
-SiPixelRawDataErrorModule::SiPixelRawDataErrorModule(const uint32_t& id) : 
-  id_(id),
-  ncols_(416),
-  nrows_(160)
-{ 
+SiPixelRawDataErrorModule::SiPixelRawDataErrorModule(const uint32_t &id) : id_(id), ncols_(416), nrows_(160) {
   _debug_ = false;
 }
 //
-SiPixelRawDataErrorModule::SiPixelRawDataErrorModule(const uint32_t& id, const int& ncols, const int& nrows) : 
-  id_(id),
-  ncols_(ncols),
-  nrows_(nrows)
-{ 
+SiPixelRawDataErrorModule::SiPixelRawDataErrorModule(const uint32_t &id, const int &ncols, const int &nrows)
+    : id_(id), ncols_(ncols), nrows_(nrows) {
   _debug_ = false;
-} 
+}
 //
 // Destructor
 //
@@ -93,355 +80,531 @@ SiPixelRawDataErrorModule::~SiPixelRawDataErrorModule() {}
 //
 // Book histograms for errors with detId
 //
-void SiPixelRawDataErrorModule::book(const edm::ParameterSet& iConfig, DQMStore::IBooker & iBooker, int type, bool isUpgrade) {}
+void SiPixelRawDataErrorModule::book(const edm::ParameterSet &iConfig,
+                                     DQMStore::IBooker &iBooker,
+                                     int type,
+                                     bool isUpgrade) {}
 //
 // Fill histograms
 //
-int SiPixelRawDataErrorModule::fill(const edm::DetSetVector<SiPixelRawDataError>& input, std::map<std::string,MonitorElement**> *meMapFEDs, bool modon, bool ladon, bool bladeon) {
+int SiPixelRawDataErrorModule::fill(const edm::DetSetVector<SiPixelRawDataError> &input,
+                                    std::map<std::string, MonitorElement **> *meMapFEDs,
+                                    bool modon,
+                                    bool ladon,
+                                    bool bladeon) {
   bool barrel = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel);
   bool endcap = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap);
-   
+
   // Get DQM interface
-   
+
   unsigned int numberOfSeriousErrors = 0;
-   
-  edm::DetSetVector<SiPixelRawDataError>::const_iterator isearch = input.find(id_); // search  errors of detid
-   
-  if( isearch != input.end() ) {  // Not at empty iterator
+
+  edm::DetSetVector<SiPixelRawDataError>::const_iterator isearch = input.find(id_);  // search  errors of detid
+
+  if (isearch != input.end()) {  // Not at empty iterator
     // Look at errors now
-    edm::DetSet<SiPixelRawDataError>::const_iterator  di;
-    for(di = isearch->data.begin(); di != isearch->data.end(); di++) {
-      int FedId = di->getFedId();                  // FED the error came from
+    edm::DetSet<SiPixelRawDataError>::const_iterator di;
+    for (di = isearch->data.begin(); di != isearch->data.end(); di++) {
+      int FedId = di->getFedId();  // FED the error came from
       int chanNmbr = 0;
-      int errorType = di->getType();               // type of error
-      int TBMType=-1; int TBMMessage=-1; int evtSize=-1; int evtNbr=-1; int fullType=-1;
+      int errorType = di->getType();  // type of error
+      int TBMType = -1;
+      int TBMMessage = -1;
+      int evtSize = -1;
+      int evtNbr = -1;
+      int fullType = -1;
       bool notReset = true;
       const int LINK_bits = 6;
       const int LINK_shift = 26;
       const uint32_t LINK_mask = ~(~(uint32_t)(0) << LINK_bits);
- 
-      if(modon){
-	if(errorType == 32 || errorType == 33 || errorType == 34) {
- 	  long long errorWord = di->getWord64();     // for 64-bit error words
- 	  chanNmbr = (errorWord >> LINK_shift) & LINK_mask;
- 	  if(errorType == 34) evtSize = (errorWord >> EVTLGT_shift) & EVTLGT_mask;
-	} else {
- 	  uint32_t errorWord = di->getWord32();      // for 32-bit error words
- 	  chanNmbr = (errorWord >> LINK_shift) & LINK_mask; // default way to get channel number.  Only different for case 29 below.
- 	  switch(errorType) {  // fill in the appropriate monitorables based on the information stored in the error word
- 	  case(28) : {
- 	    int NFa = (errorWord >> DB0_shift) & DataBit_mask;
- 	    int NFb = (errorWord >> DB1_shift) & DataBit_mask;
- 	    int NFc = (errorWord >> DB2_shift) & DataBit_mask;
- 	    int NFd = (errorWord >> DB3_shift) & DataBit_mask;
- 	    int NFe = (errorWord >> DB4_shift) & DataBit_mask;
- 	    int NF2 = (errorWord >> DB6_shift) & DataBit_mask;
- 	    int L1A = (errorWord >> DB7_shift) & DataBit_mask;
- 	    if (NFa==1) {fullType = 1; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    if (NFb==1) {fullType = 2; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    if (NFc==1) {fullType = 3; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    if (NFd==1) {fullType = 4; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    if (NFe==1) {fullType = 5; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    if (NF2==1) {fullType = 6; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    if (L1A==1) {fullType = 7; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    chanNmbr = 0;  // signifies channel not known
- 	    break; }
- 	  case(29) : {
- 	    int CH1 = (errorWord >> DB0_shift) & DataBit_mask;
- 	    int CH2 = (errorWord >> DB1_shift) & DataBit_mask;
- 	    int CH3 = (errorWord >> DB2_shift) & DataBit_mask;
- 	    int CH4 = (errorWord >> DB3_shift) & DataBit_mask;
- 	    int CH5 = (errorWord >> DB4_shift) & DataBit_mask;
- 	    int BLOCK_bits      = 3;
- 	    int BLOCK_shift     = 8;
- 	    uint32_t BLOCK_mask = ~(~uint32_t(0) << BLOCK_bits);
- 	    int BLOCK = (errorWord >> BLOCK_shift) & BLOCK_mask;
- 	    int localCH = 1*CH1+2*CH2+3*CH3+4*CH4+5*CH5;
- 	    if (BLOCK%2==0) chanNmbr=(BLOCK/2)*9+localCH;
- 	    else chanNmbr = ((BLOCK-1)/2)*9+4+localCH;
- 	    if ((chanNmbr<1)||(chanNmbr>36)) chanNmbr=0;  // signifies unexpected result
- 	    break; }
- 	  case(30) : {
- 	    int T0 = (errorWord >> DB0_shift) & DataBit_mask;
- 	    int T1 = (errorWord >> DB1_shift) & DataBit_mask;
- 	    int T2 = (errorWord >> DB2_shift) & DataBit_mask;
- 	    int T3 = (errorWord >> DB3_shift) & DataBit_mask;
- 	    int T4 = (errorWord >> DB4_shift) & DataBit_mask;
- 	    int T5 = (errorWord >> DB5_shift) & DataBit_mask;
- 	    int T6 = (errorWord >> DB6_shift) & DataBit_mask;
- 	    int T7 = (errorWord >> DB7_shift) & DataBit_mask;
- 	    if (T0==1) TBMMessage=0;
- 	    if (T1==1) TBMMessage=1;
- 	    if (T2==1) TBMMessage=2;
- 	    if (T3==1) TBMMessage=3;
- 	    if (T4==1) TBMMessage=4;
- 	    if (T5==1) TBMMessage=5;
- 	    if (T6==1) TBMMessage=6;
- 	    if (T7==1) TBMMessage=7;
-	    if(TBMMessage==5 || TBMMessage==6) notReset=false;
- 	    int StateMach_bits      = 4;
- 	    int StateMach_shift     = 8;
- 	    uint32_t StateMach_mask = ~(~uint32_t(0) << StateMach_bits);
- 	    int StateMach = (errorWord >> StateMach_shift) & StateMach_mask;
- 	    switch(StateMach) {
- 	    case(0) : {
- 	      TBMType = 0;
- 	      break; }
- 	    case(1) : case(9) : {
-		TBMType = 1;
-		break; }
- 	    case(2) : case(4) : case(6) : {
-		TBMType = 2;
-		break; }
- 	    case(8) : {
- 	      TBMType = 3;
- 	      break; }
- 	    default : TBMType = 4;
- 	    };
- 	    break; }
- 	  case(31) : {
- 	    evtNbr = (errorWord >> ADC_shift) & ADC_mask;
- 	    break; }
- 	  case(36) : {
- 	    //ROCId = (errorWord >> ROC_shift) & ROC_mask;
- 	    break; }
- 	  case(37) : {
- 	    //DCOLId = (errorWord >> DCOL_shift) & DCOL_mask;
- 	    //PXId = (errorWord >> PXID_shift) & PXID_mask;
- 	    break; }
- 	  case(38) : {
- 	    //ROCNmbr = (errorWord >> ROC_shift) & ROC_mask;
- 	    break; }
- 	  default : break;
- 	  };
- 	}//end if not double precision  
-      }//end if modon
- 
-      if(ladon && barrel){
-	if(errorType == 32 || errorType == 33 || errorType == 34){
- 	  long long errorWord = di->getWord64();     // for 64-bit error words
- 	  if(errorType == 34) evtSize = (errorWord >> EVTLGT_shift) & EVTLGT_mask;
- 	  chanNmbr = (errorWord >> LINK_shift) & LINK_mask;
-	} else {
- 	  uint32_t errorWord = di->getWord32();      // for 32-bit error words
- 	  chanNmbr = (errorWord >> LINK_shift) & LINK_mask;
- 	  switch(errorType) {  // fill in the appropriate monitorables based on the information stored in the error word
- 	  case(28) : {
- 	    int NFa = (errorWord >> DB0_shift) & DataBit_mask;
- 	    int NFb = (errorWord >> DB1_shift) & DataBit_mask;
- 	    int NFc = (errorWord >> DB2_shift) & DataBit_mask;
- 	    int NFd = (errorWord >> DB3_shift) & DataBit_mask;
- 	    int NFe = (errorWord >> DB4_shift) & DataBit_mask;
- 	    int NF2 = (errorWord >> DB6_shift) & DataBit_mask;
- 	    int L1A = (errorWord >> DB7_shift) & DataBit_mask;
- 	    if (NFa==1) {fullType = 1; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    if (NFb==1) {fullType = 2; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    if (NFc==1) {fullType = 3; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    if (NFd==1) {fullType = 4; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    if (NFe==1) {fullType = 5; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    if (NF2==1) {fullType = 6; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    if (L1A==1) {fullType = 7; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    chanNmbr = 0;
- 	    break; }
- 	  case(29) : {
- 	    int CH1 = (errorWord >> DB0_shift) & DataBit_mask;
- 	    int CH2 = (errorWord >> DB1_shift) & DataBit_mask;
- 	    int CH3 = (errorWord >> DB2_shift) & DataBit_mask;
- 	    int CH4 = (errorWord >> DB3_shift) & DataBit_mask;
- 	    int CH5 = (errorWord >> DB4_shift) & DataBit_mask;
- 	    int BLOCK_bits      = 3;
- 	    int BLOCK_shift     = 8;
- 	    uint32_t BLOCK_mask = ~(~uint32_t(0) << BLOCK_bits);
- 	    int BLOCK = (errorWord >> BLOCK_shift) & BLOCK_mask;
- 	    int localCH = 1*CH1+2*CH2+3*CH3+4*CH4+5*CH5;
- 	    if (BLOCK%2==0) chanNmbr=(BLOCK/2)*9+localCH;
- 	    else chanNmbr = ((BLOCK-1)/2)*9+4+localCH;
- 	    if ((chanNmbr<1)||(chanNmbr>36)) chanNmbr=0;  // signifies unexpected result
- 	    break; }
- 	  case(30) : {
- 	    int T0 = (errorWord >> DB0_shift) & DataBit_mask;
- 	    int T1 = (errorWord >> DB1_shift) & DataBit_mask;
- 	    int T2 = (errorWord >> DB2_shift) & DataBit_mask;
- 	    int T3 = (errorWord >> DB3_shift) & DataBit_mask;
- 	    int T4 = (errorWord >> DB4_shift) & DataBit_mask;
- 	    int T5 = (errorWord >> DB5_shift) & DataBit_mask;
- 	    int T6 = (errorWord >> DB6_shift) & DataBit_mask;
- 	    int T7 = (errorWord >> DB7_shift) & DataBit_mask;
- 	    if (T0==1) TBMMessage=0;
- 	    if (T1==1) TBMMessage=1;
- 	    if (T2==1) TBMMessage=2;
- 	    if (T3==1) TBMMessage=3;
- 	    if (T4==1) TBMMessage=4;
- 	    if (T5==1) TBMMessage=5;
- 	    if (T6==1) TBMMessage=6;
- 	    if (T7==1) TBMMessage=7;
- 	    int StateMach_bits      = 4;
- 	    int StateMach_shift     = 8;
- 	    uint32_t StateMach_mask = ~(~uint32_t(0) << StateMach_bits);
- 	    int StateMach = (errorWord >> StateMach_shift) & StateMach_mask;
- 	    switch(StateMach) {
- 	    case(0) : {
- 	      TBMType = 0;
- 	      break; }
- 	    case(1) : case(9) : {
-		TBMType = 1;
-		break; }
- 	    case(2) : case(4) : case(6) : {
-		TBMType = 2;
-		break; }
- 	    case(8) : {
- 	      TBMType = 3;
- 	      break; }
- 	    default : TBMType = 4;
- 	    };
- 	    break; }
- 	  case(31) : {
- 	    evtNbr = (errorWord >> ADC_shift) & ADC_mask;
- 	    break; }
- 	  case(36) : {
- 	    //int ROCId = (errorWord >> ROC_shift) & ROC_mask;
- 	    break; }
- 	  case(37) : {
- 	    //int DCOLId = (errorWord >> DCOL_shift) & DCOL_mask;
- 	    //int PXId = (errorWord >> PXID_shift) & PXID_mask;
- 	    break; }
- 	  case(38) : {
- 	    //int ROCNmbr = (errorWord >> ROC_shift) & ROC_mask;
- 	    break; }
- 	  default : break;
- 	  };
- 	}
-      }//end if ladderon
- 
-      if(bladeon && endcap){
-	if(errorType == 32 || errorType == 33 || errorType == 34){
- 	  long long errorWord = di->getWord64();     // for 64-bit error words
- 	  if(errorType == 34) evtSize = (errorWord >> EVTLGT_shift) & EVTLGT_mask;
- 	  chanNmbr = (errorWord >> LINK_shift) & LINK_mask;
-	} else {
- 	  uint32_t errorWord = di->getWord32();      // for 32-bit error words
- 	  chanNmbr = (errorWord >> LINK_shift) & LINK_mask;
- 	  switch(errorType) {  // fill in the appropriate monitorables based on the information stored in the error word
- 	  case(28) : {
- 	    int NFa = (errorWord >> DB0_shift) & DataBit_mask;
- 	    int NFb = (errorWord >> DB1_shift) & DataBit_mask;
- 	    int NFc = (errorWord >> DB2_shift) & DataBit_mask;
- 	    int NFd = (errorWord >> DB3_shift) & DataBit_mask;
- 	    int NFe = (errorWord >> DB4_shift) & DataBit_mask;
- 	    int NF2 = (errorWord >> DB6_shift) & DataBit_mask;
- 	    int L1A = (errorWord >> DB7_shift) & DataBit_mask;
- 	    if (NFa==1) {fullType = 1; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    if (NFb==1) {fullType = 2; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    if (NFc==1) {fullType = 3; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    if (NFd==1) {fullType = 4; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    if (NFe==1) {fullType = 5; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    if (NF2==1) {fullType = 6; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    if (L1A==1) {fullType = 7; ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);}
- 	    chanNmbr = 0;
- 	    break; }
- 	  case(29) : {
- 	    int CH1 = (errorWord >> DB0_shift) & DataBit_mask;
- 	    int CH2 = (errorWord >> DB1_shift) & DataBit_mask;
- 	    int CH3 = (errorWord >> DB2_shift) & DataBit_mask;
- 	    int CH4 = (errorWord >> DB3_shift) & DataBit_mask;
- 	    int CH5 = (errorWord >> DB4_shift) & DataBit_mask;
- 	    int BLOCK_bits      = 3;
- 	    int BLOCK_shift     = 8;
- 	    uint32_t BLOCK_mask = ~(~uint32_t(0) << BLOCK_bits);
- 	    int BLOCK = (errorWord >> BLOCK_shift) & BLOCK_mask;
- 	    int localCH = 1*CH1+2*CH2+3*CH3+4*CH4+5*CH5;
- 	    if (BLOCK%2==0) chanNmbr=(BLOCK/2)*9+localCH;
- 	    else chanNmbr = ((BLOCK-1)/2)*9+4+localCH;
- 	    if ((chanNmbr<1)||(chanNmbr>36)) chanNmbr=0;  // signifies unexpected result
- 	    break; }
- 	  case(30) : {
- 	    int T0 = (errorWord >> DB0_shift) & DataBit_mask;
- 	    int T1 = (errorWord >> DB1_shift) & DataBit_mask;
- 	    int T2 = (errorWord >> DB2_shift) & DataBit_mask;
- 	    int T3 = (errorWord >> DB3_shift) & DataBit_mask;
- 	    int T4 = (errorWord >> DB4_shift) & DataBit_mask;
- 	    int T5 = (errorWord >> DB5_shift) & DataBit_mask;
- 	    int T6 = (errorWord >> DB6_shift) & DataBit_mask;
- 	    int T7 = (errorWord >> DB7_shift) & DataBit_mask;
- 	    if (T0==1) TBMMessage=0;
- 	    if (T1==1) TBMMessage=1;
- 	    if (T2==1) TBMMessage=2;
- 	    if (T3==1) TBMMessage=3;
- 	    if (T4==1) TBMMessage=4;
- 	    if (T5==1) TBMMessage=5;
- 	    if (T6==1) TBMMessage=6;
- 	    if (T7==1) TBMMessage=7;
- 	    int StateMach_bits      = 4;
- 	    int StateMach_shift     = 8;
- 	    uint32_t StateMach_mask = ~(~uint32_t(0) << StateMach_bits);
- 	    int StateMach = (errorWord >> StateMach_shift) & StateMach_mask;
- 	    switch(StateMach) {
- 	    case(0) : {
- 	      TBMType = 0;
- 	      break; }
- 	    case(1) : case(9) : {
-		TBMType = 1;
-		break; }
- 	    case(2) : case(4) : case(6) : {
-		TBMType = 2;
-		break; }
- 	    case(8) : {
- 	      TBMType = 3;
- 	      break; }
- 	    default : TBMType = 4;
- 	    };
- 	    break; }
- 	  case(31) : {
- 	    evtNbr = (errorWord >> ADC_shift) & ADC_mask;
- 	    break; }
- 	  case(36) : {
- 	    //int ROCId = (errorWord >> ROC_shift) & ROC_mask;
- 	    break; }
- 	  case(37) : {
- 	    //int DCOLId = (errorWord >> DCOL_shift) & DCOL_mask;
- 	    //int PXId = (errorWord >> PXID_shift) & PXID_mask;
- 	    break; }
- 	  case(38) : {
- 	    //int ROCNmbr = (errorWord >> ROC_shift) & ROC_mask;
- 	    break; }
- 	  default : break;
- 	  };
- 	}
-      }//end if bladeon
-       
-      // Example to mask a specific bad channel --> if(!(FedId==38&&chanNmbr==7)){
-      if(!(errorType==30) || notReset){
-	std::string hid;
-	static const char chNfmt[] = "Pixel/AdditionalPixelErrors/FED_%d/FedChNErr_%d";
-	char chNbuf[sizeof(chNfmt) + 2*32]; // 32 digits is enough for up to 2^105 + sign.
-	sprintf(chNbuf, chNfmt, FedId, chanNmbr);
-	hid = chNbuf;
-	if((*meMapFEDs)["meFedChNErr_"][FedId]) (*meMapFEDs)["meFedChNErr_"][FedId]->Fill(chanNmbr);
 
-	static const char chLfmt[] = "Pixel/AdditionalPixelErrors/FED_%d/FedChLErr_%d";
-	char chLbuf[sizeof(chLfmt) + 2*32]; // 32 digits is enough for up to 2^105 + sign.
-	sprintf(chLbuf, chLfmt, FedId, chanNmbr);
-	hid = chLbuf;
-	if((*meMapFEDs)["meFedChLErr_"][FedId]) (*meMapFEDs)["meFedChLErr_"][FedId]->setBinContent(chanNmbr+1,errorType);
+      if (modon) {
+        if (errorType == 32 || errorType == 33 || errorType == 34) {
+          long long errorWord = di->getWord64();  // for 64-bit error words
+          chanNmbr = (errorWord >> LINK_shift) & LINK_mask;
+          if (errorType == 34)
+            evtSize = (errorWord >> EVTLGT_shift) & EVTLGT_mask;
+        } else {
+          uint32_t errorWord = di->getWord32();              // for 32-bit error words
+          chanNmbr = (errorWord >> LINK_shift) & LINK_mask;  // default way to get channel number.  Only
+                                                             // different for case 29 below.
+          switch (errorType) {                               // fill in the appropriate monitorables based on
+                                                             // the information stored in the error word
+            case (28): {
+              int NFa = (errorWord >> DB0_shift) & DataBit_mask;
+              int NFb = (errorWord >> DB1_shift) & DataBit_mask;
+              int NFc = (errorWord >> DB2_shift) & DataBit_mask;
+              int NFd = (errorWord >> DB3_shift) & DataBit_mask;
+              int NFe = (errorWord >> DB4_shift) & DataBit_mask;
+              int NF2 = (errorWord >> DB6_shift) & DataBit_mask;
+              int L1A = (errorWord >> DB7_shift) & DataBit_mask;
+              if (NFa == 1) {
+                fullType = 1;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              if (NFb == 1) {
+                fullType = 2;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              if (NFc == 1) {
+                fullType = 3;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              if (NFd == 1) {
+                fullType = 4;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              if (NFe == 1) {
+                fullType = 5;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              if (NF2 == 1) {
+                fullType = 6;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              if (L1A == 1) {
+                fullType = 7;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              chanNmbr = 0;  // signifies channel not known
+              break;
+            }
+            case (29): {
+              int CH1 = (errorWord >> DB0_shift) & DataBit_mask;
+              int CH2 = (errorWord >> DB1_shift) & DataBit_mask;
+              int CH3 = (errorWord >> DB2_shift) & DataBit_mask;
+              int CH4 = (errorWord >> DB3_shift) & DataBit_mask;
+              int CH5 = (errorWord >> DB4_shift) & DataBit_mask;
+              int BLOCK_bits = 3;
+              int BLOCK_shift = 8;
+              uint32_t BLOCK_mask = ~(~uint32_t(0) << BLOCK_bits);
+              int BLOCK = (errorWord >> BLOCK_shift) & BLOCK_mask;
+              int localCH = 1 * CH1 + 2 * CH2 + 3 * CH3 + 4 * CH4 + 5 * CH5;
+              if (BLOCK % 2 == 0)
+                chanNmbr = (BLOCK / 2) * 9 + localCH;
+              else
+                chanNmbr = ((BLOCK - 1) / 2) * 9 + 4 + localCH;
+              if ((chanNmbr < 1) || (chanNmbr > 36))
+                chanNmbr = 0;  // signifies unexpected result
+              break;
+            }
+            case (30): {
+              int T0 = (errorWord >> DB0_shift) & DataBit_mask;
+              int T1 = (errorWord >> DB1_shift) & DataBit_mask;
+              int T2 = (errorWord >> DB2_shift) & DataBit_mask;
+              int T3 = (errorWord >> DB3_shift) & DataBit_mask;
+              int T4 = (errorWord >> DB4_shift) & DataBit_mask;
+              int T5 = (errorWord >> DB5_shift) & DataBit_mask;
+              int T6 = (errorWord >> DB6_shift) & DataBit_mask;
+              int T7 = (errorWord >> DB7_shift) & DataBit_mask;
+              if (T0 == 1)
+                TBMMessage = 0;
+              if (T1 == 1)
+                TBMMessage = 1;
+              if (T2 == 1)
+                TBMMessage = 2;
+              if (T3 == 1)
+                TBMMessage = 3;
+              if (T4 == 1)
+                TBMMessage = 4;
+              if (T5 == 1)
+                TBMMessage = 5;
+              if (T6 == 1)
+                TBMMessage = 6;
+              if (T7 == 1)
+                TBMMessage = 7;
+              if (TBMMessage == 5 || TBMMessage == 6)
+                notReset = false;
+              int StateMach_bits = 4;
+              int StateMach_shift = 8;
+              uint32_t StateMach_mask = ~(~uint32_t(0) << StateMach_bits);
+              int StateMach = (errorWord >> StateMach_shift) & StateMach_mask;
+              switch (StateMach) {
+                case (0): {
+                  TBMType = 0;
+                  break;
+                }
+                case (1):
+                case (9): {
+                  TBMType = 1;
+                  break;
+                }
+                case (2):
+                case (4):
+                case (6): {
+                  TBMType = 2;
+                  break;
+                }
+                case (8): {
+                  TBMType = 3;
+                  break;
+                }
+                default:
+                  TBMType = 4;
+              };
+              break;
+            }
+            case (31): {
+              evtNbr = (errorWord >> ADC_shift) & ADC_mask;
+              break;
+            }
+            case (36): {
+              // ROCId = (errorWord >> ROC_shift) & ROC_mask;
+              break;
+            }
+            case (37): {
+              // DCOLId = (errorWord >> DCOL_shift) & DCOL_mask;
+              // PXId = (errorWord >> PXID_shift) & PXID_mask;
+              break;
+            }
+            case (38): {
+              // ROCNmbr = (errorWord >> ROC_shift) & ROC_mask;
+              break;
+            }
+            default:
+              break;
+          };
+        }  // end if not double precision
+      }    // end if modon
+
+      if (ladon && barrel) {
+        if (errorType == 32 || errorType == 33 || errorType == 34) {
+          long long errorWord = di->getWord64();  // for 64-bit error words
+          if (errorType == 34)
+            evtSize = (errorWord >> EVTLGT_shift) & EVTLGT_mask;
+          chanNmbr = (errorWord >> LINK_shift) & LINK_mask;
+        } else {
+          uint32_t errorWord = di->getWord32();  // for 32-bit error words
+          chanNmbr = (errorWord >> LINK_shift) & LINK_mask;
+          switch (errorType) {  // fill in the appropriate monitorables based on
+                                // the information stored in the error word
+            case (28): {
+              int NFa = (errorWord >> DB0_shift) & DataBit_mask;
+              int NFb = (errorWord >> DB1_shift) & DataBit_mask;
+              int NFc = (errorWord >> DB2_shift) & DataBit_mask;
+              int NFd = (errorWord >> DB3_shift) & DataBit_mask;
+              int NFe = (errorWord >> DB4_shift) & DataBit_mask;
+              int NF2 = (errorWord >> DB6_shift) & DataBit_mask;
+              int L1A = (errorWord >> DB7_shift) & DataBit_mask;
+              if (NFa == 1) {
+                fullType = 1;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              if (NFb == 1) {
+                fullType = 2;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              if (NFc == 1) {
+                fullType = 3;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              if (NFd == 1) {
+                fullType = 4;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              if (NFe == 1) {
+                fullType = 5;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              if (NF2 == 1) {
+                fullType = 6;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              if (L1A == 1) {
+                fullType = 7;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              chanNmbr = 0;
+              break;
+            }
+            case (29): {
+              int CH1 = (errorWord >> DB0_shift) & DataBit_mask;
+              int CH2 = (errorWord >> DB1_shift) & DataBit_mask;
+              int CH3 = (errorWord >> DB2_shift) & DataBit_mask;
+              int CH4 = (errorWord >> DB3_shift) & DataBit_mask;
+              int CH5 = (errorWord >> DB4_shift) & DataBit_mask;
+              int BLOCK_bits = 3;
+              int BLOCK_shift = 8;
+              uint32_t BLOCK_mask = ~(~uint32_t(0) << BLOCK_bits);
+              int BLOCK = (errorWord >> BLOCK_shift) & BLOCK_mask;
+              int localCH = 1 * CH1 + 2 * CH2 + 3 * CH3 + 4 * CH4 + 5 * CH5;
+              if (BLOCK % 2 == 0)
+                chanNmbr = (BLOCK / 2) * 9 + localCH;
+              else
+                chanNmbr = ((BLOCK - 1) / 2) * 9 + 4 + localCH;
+              if ((chanNmbr < 1) || (chanNmbr > 36))
+                chanNmbr = 0;  // signifies unexpected result
+              break;
+            }
+            case (30): {
+              int T0 = (errorWord >> DB0_shift) & DataBit_mask;
+              int T1 = (errorWord >> DB1_shift) & DataBit_mask;
+              int T2 = (errorWord >> DB2_shift) & DataBit_mask;
+              int T3 = (errorWord >> DB3_shift) & DataBit_mask;
+              int T4 = (errorWord >> DB4_shift) & DataBit_mask;
+              int T5 = (errorWord >> DB5_shift) & DataBit_mask;
+              int T6 = (errorWord >> DB6_shift) & DataBit_mask;
+              int T7 = (errorWord >> DB7_shift) & DataBit_mask;
+              if (T0 == 1)
+                TBMMessage = 0;
+              if (T1 == 1)
+                TBMMessage = 1;
+              if (T2 == 1)
+                TBMMessage = 2;
+              if (T3 == 1)
+                TBMMessage = 3;
+              if (T4 == 1)
+                TBMMessage = 4;
+              if (T5 == 1)
+                TBMMessage = 5;
+              if (T6 == 1)
+                TBMMessage = 6;
+              if (T7 == 1)
+                TBMMessage = 7;
+              int StateMach_bits = 4;
+              int StateMach_shift = 8;
+              uint32_t StateMach_mask = ~(~uint32_t(0) << StateMach_bits);
+              int StateMach = (errorWord >> StateMach_shift) & StateMach_mask;
+              switch (StateMach) {
+                case (0): {
+                  TBMType = 0;
+                  break;
+                }
+                case (1):
+                case (9): {
+                  TBMType = 1;
+                  break;
+                }
+                case (2):
+                case (4):
+                case (6): {
+                  TBMType = 2;
+                  break;
+                }
+                case (8): {
+                  TBMType = 3;
+                  break;
+                }
+                default:
+                  TBMType = 4;
+              };
+              break;
+            }
+            case (31): {
+              evtNbr = (errorWord >> ADC_shift) & ADC_mask;
+              break;
+            }
+            case (36): {
+              // int ROCId = (errorWord >> ROC_shift) & ROC_mask;
+              break;
+            }
+            case (37): {
+              // int DCOLId = (errorWord >> DCOL_shift) & DCOL_mask;
+              // int PXId = (errorWord >> PXID_shift) & PXID_mask;
+              break;
+            }
+            case (38): {
+              // int ROCNmbr = (errorWord >> ROC_shift) & ROC_mask;
+              break;
+            }
+            default:
+              break;
+          };
+        }
+      }  // end if ladderon
+
+      if (bladeon && endcap) {
+        if (errorType == 32 || errorType == 33 || errorType == 34) {
+          long long errorWord = di->getWord64();  // for 64-bit error words
+          if (errorType == 34)
+            evtSize = (errorWord >> EVTLGT_shift) & EVTLGT_mask;
+          chanNmbr = (errorWord >> LINK_shift) & LINK_mask;
+        } else {
+          uint32_t errorWord = di->getWord32();  // for 32-bit error words
+          chanNmbr = (errorWord >> LINK_shift) & LINK_mask;
+          switch (errorType) {  // fill in the appropriate monitorables based on
+                                // the information stored in the error word
+            case (28): {
+              int NFa = (errorWord >> DB0_shift) & DataBit_mask;
+              int NFb = (errorWord >> DB1_shift) & DataBit_mask;
+              int NFc = (errorWord >> DB2_shift) & DataBit_mask;
+              int NFd = (errorWord >> DB3_shift) & DataBit_mask;
+              int NFe = (errorWord >> DB4_shift) & DataBit_mask;
+              int NF2 = (errorWord >> DB6_shift) & DataBit_mask;
+              int L1A = (errorWord >> DB7_shift) & DataBit_mask;
+              if (NFa == 1) {
+                fullType = 1;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              if (NFb == 1) {
+                fullType = 2;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              if (NFc == 1) {
+                fullType = 3;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              if (NFd == 1) {
+                fullType = 4;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              if (NFe == 1) {
+                fullType = 5;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              if (NF2 == 1) {
+                fullType = 6;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              if (L1A == 1) {
+                fullType = 7;
+                ((*meMapFEDs)["meFullType_"][FedId])->Fill((int)fullType);
+              }
+              chanNmbr = 0;
+              break;
+            }
+            case (29): {
+              int CH1 = (errorWord >> DB0_shift) & DataBit_mask;
+              int CH2 = (errorWord >> DB1_shift) & DataBit_mask;
+              int CH3 = (errorWord >> DB2_shift) & DataBit_mask;
+              int CH4 = (errorWord >> DB3_shift) & DataBit_mask;
+              int CH5 = (errorWord >> DB4_shift) & DataBit_mask;
+              int BLOCK_bits = 3;
+              int BLOCK_shift = 8;
+              uint32_t BLOCK_mask = ~(~uint32_t(0) << BLOCK_bits);
+              int BLOCK = (errorWord >> BLOCK_shift) & BLOCK_mask;
+              int localCH = 1 * CH1 + 2 * CH2 + 3 * CH3 + 4 * CH4 + 5 * CH5;
+              if (BLOCK % 2 == 0)
+                chanNmbr = (BLOCK / 2) * 9 + localCH;
+              else
+                chanNmbr = ((BLOCK - 1) / 2) * 9 + 4 + localCH;
+              if ((chanNmbr < 1) || (chanNmbr > 36))
+                chanNmbr = 0;  // signifies unexpected result
+              break;
+            }
+            case (30): {
+              int T0 = (errorWord >> DB0_shift) & DataBit_mask;
+              int T1 = (errorWord >> DB1_shift) & DataBit_mask;
+              int T2 = (errorWord >> DB2_shift) & DataBit_mask;
+              int T3 = (errorWord >> DB3_shift) & DataBit_mask;
+              int T4 = (errorWord >> DB4_shift) & DataBit_mask;
+              int T5 = (errorWord >> DB5_shift) & DataBit_mask;
+              int T6 = (errorWord >> DB6_shift) & DataBit_mask;
+              int T7 = (errorWord >> DB7_shift) & DataBit_mask;
+              if (T0 == 1)
+                TBMMessage = 0;
+              if (T1 == 1)
+                TBMMessage = 1;
+              if (T2 == 1)
+                TBMMessage = 2;
+              if (T3 == 1)
+                TBMMessage = 3;
+              if (T4 == 1)
+                TBMMessage = 4;
+              if (T5 == 1)
+                TBMMessage = 5;
+              if (T6 == 1)
+                TBMMessage = 6;
+              if (T7 == 1)
+                TBMMessage = 7;
+              int StateMach_bits = 4;
+              int StateMach_shift = 8;
+              uint32_t StateMach_mask = ~(~uint32_t(0) << StateMach_bits);
+              int StateMach = (errorWord >> StateMach_shift) & StateMach_mask;
+              switch (StateMach) {
+                case (0): {
+                  TBMType = 0;
+                  break;
+                }
+                case (1):
+                case (9): {
+                  TBMType = 1;
+                  break;
+                }
+                case (2):
+                case (4):
+                case (6): {
+                  TBMType = 2;
+                  break;
+                }
+                case (8): {
+                  TBMType = 3;
+                  break;
+                }
+                default:
+                  TBMType = 4;
+              };
+              break;
+            }
+            case (31): {
+              evtNbr = (errorWord >> ADC_shift) & ADC_mask;
+              break;
+            }
+            case (36): {
+              // int ROCId = (errorWord >> ROC_shift) & ROC_mask;
+              break;
+            }
+            case (37): {
+              // int DCOLId = (errorWord >> DCOL_shift) & DCOL_mask;
+              // int PXId = (errorWord >> PXID_shift) & PXID_mask;
+              break;
+            }
+            case (38): {
+              // int ROCNmbr = (errorWord >> ROC_shift) & ROC_mask;
+              break;
+            }
+            default:
+              break;
+          };
+        }
+      }  // end if bladeon
 
-	numberOfSeriousErrors++;
-	int messageType = 99;
-	if(errorType<30) messageType = errorType-25;
-	else if(errorType>30) messageType = errorType-19;
-	else if(errorType==30 && TBMMessage==0) messageType = errorType-25;
-	else if(errorType==30 && TBMMessage==1) messageType = errorType-24;
-	else if(errorType==30 && (TBMMessage==2 || TBMMessage==3 || TBMMessage==4)) messageType = errorType-23;
-	else if(errorType==30 && TBMMessage==7) messageType = errorType-22;
-	else if(errorType==30 && TBMType==1) messageType = errorType-21;
-	else if(errorType==30 && TBMType==2) messageType = errorType-20;
-	else if(errorType==30 && TBMType==3) messageType = errorType-19;
-	if(messageType<=20){
-	  static const char fmt[] = "Pixel/AdditionalPixelErrors/FED_%d/FedETypeNErr_%d";
-	  char buf[sizeof(fmt) + 2*32]; // 32 digits is enough for up to 2^105 + sign.
-	  sprintf(buf, fmt, FedId, messageType);
-	  hid = buf;
-	  if((*meMapFEDs)["meFedETypeNErr_"][FedId]) (*meMapFEDs)["meFedETypeNErr_"][FedId]->Fill(messageType);
-	}
+      // Example to mask a specific bad channel -->
+      // if(!(FedId==38&&chanNmbr==7)){
+      if (!(errorType == 30) || notReset) {
+        std::string hid;
+        static const char chNfmt[] = "Pixel/AdditionalPixelErrors/FED_%d/FedChNErr_%d";
+        char chNbuf[sizeof(chNfmt) + 2 * 32];  // 32 digits is enough for up to 2^105 + sign.
+        sprintf(chNbuf, chNfmt, FedId, chanNmbr);
+        hid = chNbuf;
+        if ((*meMapFEDs)["meFedChNErr_"][FedId])
+          (*meMapFEDs)["meFedChNErr_"][FedId]->Fill(chanNmbr);
+
+        static const char chLfmt[] = "Pixel/AdditionalPixelErrors/FED_%d/FedChLErr_%d";
+        char chLbuf[sizeof(chLfmt) + 2 * 32];  // 32 digits is enough for up to 2^105 + sign.
+        sprintf(chLbuf, chLfmt, FedId, chanNmbr);
+        hid = chLbuf;
+        if ((*meMapFEDs)["meFedChLErr_"][FedId])
+          (*meMapFEDs)["meFedChLErr_"][FedId]->setBinContent(chanNmbr + 1, errorType);
+
+        numberOfSeriousErrors++;
+        int messageType = 99;
+        if (errorType < 30)
+          messageType = errorType - 25;
+        else if (errorType > 30)
+          messageType = errorType - 19;
+        else if (errorType == 30 && TBMMessage == 0)
+          messageType = errorType - 25;
+        else if (errorType == 30 && TBMMessage == 1)
+          messageType = errorType - 24;
+        else if (errorType == 30 && (TBMMessage == 2 || TBMMessage == 3 || TBMMessage == 4))
+          messageType = errorType - 23;
+        else if (errorType == 30 && TBMMessage == 7)
+          messageType = errorType - 22;
+        else if (errorType == 30 && TBMType == 1)
+          messageType = errorType - 21;
+        else if (errorType == 30 && TBMType == 2)
+          messageType = errorType - 20;
+        else if (errorType == 30 && TBMType == 3)
+          messageType = errorType - 19;
+        if (messageType <= 20) {
+          static const char fmt[] = "Pixel/AdditionalPixelErrors/FED_%d/FedETypeNErr_%d";
+          char buf[sizeof(fmt) + 2 * 32];  // 32 digits is enough for up to 2^105 + sign.
+          sprintf(buf, fmt, FedId, messageType);
+          hid = buf;
+          if ((*meMapFEDs)["meFedETypeNErr_"][FedId])
+            (*meMapFEDs)["meFedETypeNErr_"][FedId]->Fill(messageType);
+        }
       }
 
       (*meMapFEDs)["meNErrors_"][FedId]->Fill((int)numberOfSeriousErrors);
@@ -449,174 +612,267 @@ int SiPixelRawDataErrorModule::fill(const edm::DetSetVector<SiPixelRawDataError>
       (*meMapFEDs)["meTBMType_"][FedId]->Fill((int)TBMType);
       (*meMapFEDs)["meErrorType_"][FedId]->Fill((int)errorType);
       (*meMapFEDs)["meFullType_"][FedId]->Fill((int)fullType);
-      (*meMapFEDs)["meEvtNbr_"][FedId]->setBinContent(1,(int)evtNbr);
-      (*meMapFEDs)["meEvtSize_"][FedId]->setBinContent(1,(int)evtSize);
+      (*meMapFEDs)["meEvtNbr_"][FedId]->setBinContent(1, (int)evtNbr);
+      (*meMapFEDs)["meEvtSize_"][FedId]->setBinContent(1, (int)evtSize);
     }
-  }//end if not an empty iterator
+  }  // end if not an empty iterator
   return numberOfSeriousErrors;
 }
- 
-int SiPixelRawDataErrorModule::fillFED(const edm::DetSetVector<SiPixelRawDataError>& input, std::map<std::string,MonitorElement**> *meMapFEDs) {
+
+int SiPixelRawDataErrorModule::fillFED(const edm::DetSetVector<SiPixelRawDataError> &input,
+                                       std::map<std::string, MonitorElement **> *meMapFEDs) {
   unsigned int numberOfSeriousErrors = 0;
-   
-  edm::DetSetVector<SiPixelRawDataError>::const_iterator isearch = input.find(0xffffffff); // search  errors of detid
-  if( isearch != input.end() ) {  // Not an empty iterator
-    // Look at FED errors now	
-    edm::DetSet<SiPixelRawDataError>::const_iterator  di;
-    for(di = isearch->data.begin(); di != isearch->data.end(); di++) {
-      int FedId = di->getFedId();                  // FED the error came from
+
+  edm::DetSetVector<SiPixelRawDataError>::const_iterator isearch = input.find(0xffffffff);  // search  errors of detid
+  if (isearch != input.end()) {                                                             // Not an empty iterator
+    // Look at FED errors now
+    edm::DetSet<SiPixelRawDataError>::const_iterator di;
+    for (di = isearch->data.begin(); di != isearch->data.end(); di++) {
+      int FedId = di->getFedId();  // FED the error came from
       int chanNmbr = -1;
-      int errorType = 0;               // type of error
-      if(FedId==static_cast<int>(id_)) {
- 	errorType = di->getType();               // type of error
- 	((*meMapFEDs)["meErrorType_"][id_])->Fill((int)errorType);
-	bool notReset=true;
-	int TBMType=-1; int TBMMessage=-1; int evtSize=-1; int fullType=-1;
-	const int LINK_bits = 6;
-	const int LINK_shift = 26;
-	const uint32_t LINK_mask = ~(~(uint32_t)(0) << LINK_bits);
- 	if((errorType == 32)||(errorType == 33)||(errorType == 34)) {
- 	  long long errorWord = di->getWord64();     // for 64-bit error words
- 	  chanNmbr = 0;
- 	  switch(errorType) {  // fill in the appropriate monitorables based on the information stored in the error word
- 	  case(32) : {
- 	    break; }
- 	  case(33) : {
- 	    break; }
- 	  case(34) : {
- 	    evtSize = (errorWord >> EVTLGT_shift) & EVTLGT_mask;
-	    ((*meMapFEDs)["meEvtSize_"][id_])->setBinContent(1,(int)evtSize);
- 	    break; }
- 	  default : break;
- 	  };
- 	} else {
- 	  uint32_t errorWord = di->getWord32();      // for 32-bit error words
- 	  switch(errorType) {  // fill in the appropriate monitorables based on the information stored in the error word
- 	  case(25) : case(39) : {
-	      chanNmbr = 0;
-	      break; }
- 	  case(28) : {
- 	    int NFa = (errorWord >> DB0_shift) & DataBit_mask;
- 	    int NFb = (errorWord >> DB1_shift) & DataBit_mask;
- 	    int NFc = (errorWord >> DB2_shift) & DataBit_mask;
- 	    int NFd = (errorWord >> DB3_shift) & DataBit_mask;
- 	    int NFe = (errorWord >> DB4_shift) & DataBit_mask;
- 	    int NF2 = (errorWord >> DB6_shift) & DataBit_mask;
- 	    int L1A = (errorWord >> DB7_shift) & DataBit_mask;
- 	    if (NFa==1) {fullType = 1; ((*meMapFEDs)["meFullType_"][id_])->Fill((int)fullType);}
- 	    if (NFb==1) {fullType = 2; ((*meMapFEDs)["meFullType_"][id_])->Fill((int)fullType);}
- 	    if (NFc==1) {fullType = 3; ((*meMapFEDs)["meFullType_"][id_])->Fill((int)fullType);}
- 	    if (NFd==1) {fullType = 4; ((*meMapFEDs)["meFullType_"][id_])->Fill((int)fullType);}
- 	    if (NFe==1) {fullType = 5; ((*meMapFEDs)["meFullType_"][id_])->Fill((int)fullType);}
- 	    if (NF2==1) {fullType = 6; ((*meMapFEDs)["meFullType_"][id_])->Fill((int)fullType);}
- 	    if (L1A==1) {fullType = 7; ((*meMapFEDs)["meFullType_"][id_])->Fill((int)fullType);}
- 	    chanNmbr = 0;
- 	    break; }
- 	  case(29) : {
- 	    int CH1 = (errorWord >> DB0_shift) & DataBit_mask;
- 	    int CH2 = (errorWord >> DB1_shift) & DataBit_mask;
- 	    int CH3 = (errorWord >> DB2_shift) & DataBit_mask;
- 	    int CH4 = (errorWord >> DB3_shift) & DataBit_mask;
- 	    int CH5 = (errorWord >> DB4_shift) & DataBit_mask;
- 	    int BLOCK_bits      = 3;
- 	    int BLOCK_shift     = 8;
- 	    uint32_t BLOCK_mask = ~(~uint32_t(0) << BLOCK_bits);
- 	    int BLOCK = (errorWord >> BLOCK_shift) & BLOCK_mask;
- 	    int localCH = 1*CH1+2*CH2+3*CH3+4*CH4+5*CH5;
- 	    if (BLOCK%2==0) chanNmbr=(BLOCK/2)*9+localCH;
- 	    else chanNmbr = ((BLOCK-1)/2)*9+4+localCH;
- 	    if ((chanNmbr<1)||(chanNmbr>36)) chanNmbr=0;  // signifies unexpected result
- 	    break; }
- 	  case(30) : {
- 	    int T0 = (errorWord >> DB0_shift) & DataBit_mask;
- 	    int T1 = (errorWord >> DB1_shift) & DataBit_mask;
- 	    int T2 = (errorWord >> DB2_shift) & DataBit_mask;
- 	    int T3 = (errorWord >> DB3_shift) & DataBit_mask;
- 	    int T4 = (errorWord >> DB4_shift) & DataBit_mask;
- 	    int T5 = (errorWord >> DB5_shift) & DataBit_mask;
- 	    int T6 = (errorWord >> DB6_shift) & DataBit_mask;
- 	    int T7 = (errorWord >> DB7_shift) & DataBit_mask;
- 	    if(!(FedId==38&&chanNmbr==7)){
- 	      if (T0==1) { TBMMessage=0; ((*meMapFEDs)["meTBMMessage_"][id_])->Fill((int)TBMMessage); }
- 	      if (T1==1) { TBMMessage=1; ((*meMapFEDs)["meTBMMessage_"][id_])->Fill((int)TBMMessage); }
- 	      if (T2==1) { TBMMessage=2; ((*meMapFEDs)["meTBMMessage_"][id_])->Fill((int)TBMMessage); }
- 	      if (T3==1) { TBMMessage=3; ((*meMapFEDs)["meTBMMessage_"][id_])->Fill((int)TBMMessage); }
- 	      if (T4==1) { TBMMessage=4; ((*meMapFEDs)["meTBMMessage_"][id_])->Fill((int)TBMMessage); }
- 	      if (T5==1) { TBMMessage=5; ((*meMapFEDs)["meTBMMessage_"][id_])->Fill((int)TBMMessage); }
- 	      if (T6==1) { TBMMessage=6; ((*meMapFEDs)["meTBMMessage_"][id_])->Fill((int)TBMMessage); }
- 	      if (T7==1) { TBMMessage=7; ((*meMapFEDs)["meTBMMessage_"][id_])->Fill((int)TBMMessage); }
- 	    }
-	    if(TBMMessage==5 || TBMMessage==6) notReset=false;
- 	    int StateMach_bits      = 4;
- 	    int StateMach_shift     = 8;
- 	    uint32_t StateMach_mask = ~(~uint32_t(0) << StateMach_bits);
- 	    int StateMach = (errorWord >> StateMach_shift) & StateMach_mask;
- 	    switch(StateMach) {
- 	    case(0) : {
- 	      TBMType = 0;
- 	      break; }
- 	    case(1) : case(9) : {
-		TBMType = 1;
-		break; }
- 	    case(2) : case(4) : case(6) : {
-		TBMType = 2;
-		break; }
- 	    case(8) : {
- 	      TBMType = 3;
- 	      break; }
- 	    default : TBMType = 4;
- 	    };
- 	    if(!(FedId==38&&chanNmbr==7)) ((*meMapFEDs)["meTBMType_"][id_])->Fill((int)TBMType);
- 	    chanNmbr = (errorWord >> LINK_shift) & LINK_mask;
- 	    break; }
- 	  case(31) : {
- 	    int evtNbr = (errorWord >> ADC_shift) & ADC_mask;
- 	    if(!(FedId==38&&chanNmbr==7))((*meMapFEDs)["meEvtNbr_"][id_])->setBinContent(1,(int)evtNbr);
- 	    chanNmbr = (errorWord >> LINK_shift) & LINK_mask;
- 	    break; }
- 	  case(35) : case(36) : case(37) : case(38) : {
-	      chanNmbr = (errorWord >> LINK_shift) & LINK_mask;
-	      break; }
- 	  default : break;
- 	  };
- 	}// end if errorType
+      int errorType = 0;  // type of error
+      if (FedId == static_cast<int>(id_)) {
+        errorType = di->getType();  // type of error
+        ((*meMapFEDs)["meErrorType_"][id_])->Fill((int)errorType);
+        bool notReset = true;
+        int TBMType = -1;
+        int TBMMessage = -1;
+        int evtSize = -1;
+        int fullType = -1;
+        const int LINK_bits = 6;
+        const int LINK_shift = 26;
+        const uint32_t LINK_mask = ~(~(uint32_t)(0) << LINK_bits);
+        if ((errorType == 32) || (errorType == 33) || (errorType == 34)) {
+          long long errorWord = di->getWord64();  // for 64-bit error words
+          chanNmbr = 0;
+          switch (errorType) {  // fill in the appropriate monitorables based on
+                                // the information stored in the error word
+            case (32): {
+              break;
+            }
+            case (33): {
+              break;
+            }
+            case (34): {
+              evtSize = (errorWord >> EVTLGT_shift) & EVTLGT_mask;
+              ((*meMapFEDs)["meEvtSize_"][id_])->setBinContent(1, (int)evtSize);
+              break;
+            }
+            default:
+              break;
+          };
+        } else {
+          uint32_t errorWord = di->getWord32();  // for 32-bit error words
+          switch (errorType) {                   // fill in the appropriate monitorables based on
+                                                 // the information stored in the error word
+            case (25):
+            case (39): {
+              chanNmbr = 0;
+              break;
+            }
+            case (28): {
+              int NFa = (errorWord >> DB0_shift) & DataBit_mask;
+              int NFb = (errorWord >> DB1_shift) & DataBit_mask;
+              int NFc = (errorWord >> DB2_shift) & DataBit_mask;
+              int NFd = (errorWord >> DB3_shift) & DataBit_mask;
+              int NFe = (errorWord >> DB4_shift) & DataBit_mask;
+              int NF2 = (errorWord >> DB6_shift) & DataBit_mask;
+              int L1A = (errorWord >> DB7_shift) & DataBit_mask;
+              if (NFa == 1) {
+                fullType = 1;
+                ((*meMapFEDs)["meFullType_"][id_])->Fill((int)fullType);
+              }
+              if (NFb == 1) {
+                fullType = 2;
+                ((*meMapFEDs)["meFullType_"][id_])->Fill((int)fullType);
+              }
+              if (NFc == 1) {
+                fullType = 3;
+                ((*meMapFEDs)["meFullType_"][id_])->Fill((int)fullType);
+              }
+              if (NFd == 1) {
+                fullType = 4;
+                ((*meMapFEDs)["meFullType_"][id_])->Fill((int)fullType);
+              }
+              if (NFe == 1) {
+                fullType = 5;
+                ((*meMapFEDs)["meFullType_"][id_])->Fill((int)fullType);
+              }
+              if (NF2 == 1) {
+                fullType = 6;
+                ((*meMapFEDs)["meFullType_"][id_])->Fill((int)fullType);
+              }
+              if (L1A == 1) {
+                fullType = 7;
+                ((*meMapFEDs)["meFullType_"][id_])->Fill((int)fullType);
+              }
+              chanNmbr = 0;
+              break;
+            }
+            case (29): {
+              int CH1 = (errorWord >> DB0_shift) & DataBit_mask;
+              int CH2 = (errorWord >> DB1_shift) & DataBit_mask;
+              int CH3 = (errorWord >> DB2_shift) & DataBit_mask;
+              int CH4 = (errorWord >> DB3_shift) & DataBit_mask;
+              int CH5 = (errorWord >> DB4_shift) & DataBit_mask;
+              int BLOCK_bits = 3;
+              int BLOCK_shift = 8;
+              uint32_t BLOCK_mask = ~(~uint32_t(0) << BLOCK_bits);
+              int BLOCK = (errorWord >> BLOCK_shift) & BLOCK_mask;
+              int localCH = 1 * CH1 + 2 * CH2 + 3 * CH3 + 4 * CH4 + 5 * CH5;
+              if (BLOCK % 2 == 0)
+                chanNmbr = (BLOCK / 2) * 9 + localCH;
+              else
+                chanNmbr = ((BLOCK - 1) / 2) * 9 + 4 + localCH;
+              if ((chanNmbr < 1) || (chanNmbr > 36))
+                chanNmbr = 0;  // signifies unexpected result
+              break;
+            }
+            case (30): {
+              int T0 = (errorWord >> DB0_shift) & DataBit_mask;
+              int T1 = (errorWord >> DB1_shift) & DataBit_mask;
+              int T2 = (errorWord >> DB2_shift) & DataBit_mask;
+              int T3 = (errorWord >> DB3_shift) & DataBit_mask;
+              int T4 = (errorWord >> DB4_shift) & DataBit_mask;
+              int T5 = (errorWord >> DB5_shift) & DataBit_mask;
+              int T6 = (errorWord >> DB6_shift) & DataBit_mask;
+              int T7 = (errorWord >> DB7_shift) & DataBit_mask;
+              if (!(FedId == 38 && chanNmbr == 7)) {
+                if (T0 == 1) {
+                  TBMMessage = 0;
+                  ((*meMapFEDs)["meTBMMessage_"][id_])->Fill((int)TBMMessage);
+                }
+                if (T1 == 1) {
+                  TBMMessage = 1;
+                  ((*meMapFEDs)["meTBMMessage_"][id_])->Fill((int)TBMMessage);
+                }
+                if (T2 == 1) {
+                  TBMMessage = 2;
+                  ((*meMapFEDs)["meTBMMessage_"][id_])->Fill((int)TBMMessage);
+                }
+                if (T3 == 1) {
+                  TBMMessage = 3;
+                  ((*meMapFEDs)["meTBMMessage_"][id_])->Fill((int)TBMMessage);
+                }
+                if (T4 == 1) {
+                  TBMMessage = 4;
+                  ((*meMapFEDs)["meTBMMessage_"][id_])->Fill((int)TBMMessage);
+                }
+                if (T5 == 1) {
+                  TBMMessage = 5;
+                  ((*meMapFEDs)["meTBMMessage_"][id_])->Fill((int)TBMMessage);
+                }
+                if (T6 == 1) {
+                  TBMMessage = 6;
+                  ((*meMapFEDs)["meTBMMessage_"][id_])->Fill((int)TBMMessage);
+                }
+                if (T7 == 1) {
+                  TBMMessage = 7;
+                  ((*meMapFEDs)["meTBMMessage_"][id_])->Fill((int)TBMMessage);
+                }
+              }
+              if (TBMMessage == 5 || TBMMessage == 6)
+                notReset = false;
+              int StateMach_bits = 4;
+              int StateMach_shift = 8;
+              uint32_t StateMach_mask = ~(~uint32_t(0) << StateMach_bits);
+              int StateMach = (errorWord >> StateMach_shift) & StateMach_mask;
+              switch (StateMach) {
+                case (0): {
+                  TBMType = 0;
+                  break;
+                }
+                case (1):
+                case (9): {
+                  TBMType = 1;
+                  break;
+                }
+                case (2):
+                case (4):
+                case (6): {
+                  TBMType = 2;
+                  break;
+                }
+                case (8): {
+                  TBMType = 3;
+                  break;
+                }
+                default:
+                  TBMType = 4;
+              };
+              if (!(FedId == 38 && chanNmbr == 7))
+                ((*meMapFEDs)["meTBMType_"][id_])->Fill((int)TBMType);
+              chanNmbr = (errorWord >> LINK_shift) & LINK_mask;
+              break;
+            }
+            case (31): {
+              int evtNbr = (errorWord >> ADC_shift) & ADC_mask;
+              if (!(FedId == 38 && chanNmbr == 7))
+                ((*meMapFEDs)["meEvtNbr_"][id_])->setBinContent(1, (int)evtNbr);
+              chanNmbr = (errorWord >> LINK_shift) & LINK_mask;
+              break;
+            }
+            case (35):
+            case (36):
+            case (37):
+            case (38): {
+              chanNmbr = (errorWord >> LINK_shift) & LINK_mask;
+              break;
+            }
+            default:
+              break;
+          };
+        }  // end if errorType
 
-	if(!(errorType==30) || notReset){
-	  std::string hid;
-	  static const char chNfmt[] = "Pixel/AdditionalPixelErrors/FED_%d/FedChNErr_%d";
-	  char chNbuf[sizeof(chNfmt) + 2*32]; // 32 digits is enough for up to 2^105 + sign.
-	  sprintf(chNbuf, chNfmt, FedId, chanNmbr);
-	  hid = chNbuf;
-	  if((*meMapFEDs)["meFedChNErr_"][id_]) (*meMapFEDs)["meFedChNErr_"][id_]->Fill(chanNmbr);
+        if (!(errorType == 30) || notReset) {
+          std::string hid;
+          static const char chNfmt[] = "Pixel/AdditionalPixelErrors/FED_%d/FedChNErr_%d";
+          char chNbuf[sizeof(chNfmt) + 2 * 32];  // 32 digits is enough for up to 2^105 + sign.
+          sprintf(chNbuf, chNfmt, FedId, chanNmbr);
+          hid = chNbuf;
+          if ((*meMapFEDs)["meFedChNErr_"][id_])
+            (*meMapFEDs)["meFedChNErr_"][id_]->Fill(chanNmbr);
 
-	  static const char chLfmt[] = "Pixel/AdditionalPixelErrors/FED_%d/FedChLErr_%d";
-	  char chLbuf[sizeof(chLfmt) + 2*32]; // 32 digits is enough for up to 2^105 + sign.
-	  sprintf(chLbuf, chLfmt, FedId, chanNmbr);
-	  hid = chLbuf;
-	  if((*meMapFEDs)["meFedChLErr_"][id_]) (*meMapFEDs)["meFedChLErr_"][id_]->setBinContent(chanNmbr+1,errorType);
+          static const char chLfmt[] = "Pixel/AdditionalPixelErrors/FED_%d/FedChLErr_%d";
+          char chLbuf[sizeof(chLfmt) + 2 * 32];  // 32 digits is enough for up to 2^105 + sign.
+          sprintf(chLbuf, chLfmt, FedId, chanNmbr);
+          hid = chLbuf;
+          if ((*meMapFEDs)["meFedChLErr_"][id_])
+            (*meMapFEDs)["meFedChLErr_"][id_]->setBinContent(chanNmbr + 1, errorType);
 
-	  numberOfSeriousErrors++;
-	  int messageType = 99;
-	  if(errorType<30) messageType = errorType-25;
-	  else if(errorType>30) messageType = errorType-19;
-	  else if(errorType==30 && TBMMessage==0) messageType = errorType-25;
-	  else if(errorType==30 && TBMMessage==1) messageType = errorType-24;
-	  else if(errorType==30 && (TBMMessage==2 || TBMMessage==3 || TBMMessage==4)) messageType = errorType-23;
-	  else if(errorType==30 && TBMMessage==7) messageType = errorType-22;
-	  else if(errorType==30 && TBMType==1) messageType = errorType-21;
-	  else if(errorType==30 && TBMType==2) messageType = errorType-20;
-	  else if(errorType==30 && TBMType==3) messageType = errorType-19;
-	  if(messageType<=20){
-	    static const char fmt[] = "Pixel/AdditionalPixelErrors/FED_%d/FedETypeNErr_%d";
-	    char buf[sizeof(fmt) + 2*32]; // 32 digits is enough for up to 2^105 + sign.
-	    sprintf(buf, fmt, FedId, messageType);
-	    hid = buf;
-	    if((*meMapFEDs)["meFedETypeNErr_"][id_]) (*meMapFEDs)["meFedETypeNErr_"][id_]->Fill(messageType);
-	  }
-	}//end if not 30 || notReset
-      }//end if
-    }//end for
-    if(numberOfSeriousErrors>0) ((*meMapFEDs)["meNErrors_"][id_])->Fill((float)numberOfSeriousErrors);
-  }// end if not an empty iterator
+          numberOfSeriousErrors++;
+          int messageType = 99;
+          if (errorType < 30)
+            messageType = errorType - 25;
+          else if (errorType > 30)
+            messageType = errorType - 19;
+          else if (errorType == 30 && TBMMessage == 0)
+            messageType = errorType - 25;
+          else if (errorType == 30 && TBMMessage == 1)
+            messageType = errorType - 24;
+          else if (errorType == 30 && (TBMMessage == 2 || TBMMessage == 3 || TBMMessage == 4))
+            messageType = errorType - 23;
+          else if (errorType == 30 && TBMMessage == 7)
+            messageType = errorType - 22;
+          else if (errorType == 30 && TBMType == 1)
+            messageType = errorType - 21;
+          else if (errorType == 30 && TBMType == 2)
+            messageType = errorType - 20;
+          else if (errorType == 30 && TBMType == 3)
+            messageType = errorType - 19;
+          if (messageType <= 20) {
+            static const char fmt[] = "Pixel/AdditionalPixelErrors/FED_%d/FedETypeNErr_%d";
+            char buf[sizeof(fmt) + 2 * 32];  // 32 digits is enough for up to 2^105 + sign.
+            sprintf(buf, fmt, FedId, messageType);
+            hid = buf;
+            if ((*meMapFEDs)["meFedETypeNErr_"][id_])
+              (*meMapFEDs)["meFedETypeNErr_"][id_]->Fill(messageType);
+          }
+        }  // end if not 30 || notReset
+      }    // end if
+    }      // end for
+    if (numberOfSeriousErrors > 0)
+      ((*meMapFEDs)["meNErrors_"][id_])->Fill((float)numberOfSeriousErrors);
+  }  // end if not an empty iterator
   return numberOfSeriousErrors;
 }
diff --git a/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorSource.cc b/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorSource.cc
old mode 100755
new mode 100644
index 5431f8ce75331..372fc85d7540b
--- a/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorSource.cc
+++ b/DQM/SiPixelMonitorRawData/src/SiPixelRawDataErrorSource.cc
@@ -2,20 +2,21 @@
 //
 // Package:    SiPixelMonitorRawData
 // Class:      SiPixelRawDataErrorSource
-// 
-/**\class 
+//
+/**\class
 
- Description: 
- Produces histograms for error information generated at the raw2digi stage for the 
- pixel tracker.
+ Description:
+ Produces histograms for error information generated at the raw2digi stage for
+ the pixel tracker.
 
  Implementation:
- Takes a DetSetVector<SiPixelRawDataError> as input, and uses it to populate  a folder 
- hierarchy (organized by detId) with histograms containing information about 
- the errors.  Uses SiPixelRawDataErrorModule class to book and fill individual folders.  
- Note that this source is different than other DQM sources in the creation of an 
- unphysical detId folder (detId=0xffffffff) to hold information about errors for which 
- there is no detId available (except the dummy detId given to it at raw2digi).
+ Takes a DetSetVector<SiPixelRawDataError> as input, and uses it to populate  a
+ folder hierarchy (organized by detId) with histograms containing information
+ about the errors.  Uses SiPixelRawDataErrorModule class to book and fill
+ individual folders. Note that this source is different than other DQM sources
+ in the creation of an unphysical detId folder (detId=0xffffffff) to hold
+ information about errors for which there is no detId available (except the
+ dummy detId given to it at raw2digi).
 
 */
 //
@@ -23,68 +24,66 @@
 //
 #include "DQM/SiPixelMonitorRawData/interface/SiPixelRawDataErrorSource.h"
 // Framework
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 // DQM Framework
 #include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h"
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQM/SiPixelCommon/interface/SiPixelHistogramId.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 
 // Geometry
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
+#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 // DataFormats
 #include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "DataFormats/FEDRawData/interface/FEDNumbering.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h"
+#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 //
-#include <string>
 #include <cstdlib>
+#include <string>
 
 using namespace std;
 using namespace edm;
 
-SiPixelRawDataErrorSource::SiPixelRawDataErrorSource(const edm::ParameterSet& iConfig) :
-  conf_(iConfig),
-  src_( consumes<DetSetVector<SiPixelRawDataError> >( conf_.getParameter<edm::InputTag>( "src" ) ) ),
-  saveFile( conf_.getUntrackedParameter<bool>("saveFile",false) ),
-  isPIB( conf_.getUntrackedParameter<bool>("isPIB",false) ),
-  slowDown( conf_.getUntrackedParameter<bool>("slowDown",false) ),
-  reducedSet( conf_.getUntrackedParameter<bool>("reducedSet",false) ),
-  modOn( conf_.getUntrackedParameter<bool>("modOn",true) ),
-  ladOn( conf_.getUntrackedParameter<bool>("ladOn",false) ), 
-  bladeOn( conf_.getUntrackedParameter<bool>("bladeOn",false) ),
-  isUpgrade( conf_.getUntrackedParameter<bool>("isUpgrade",false) )
-{
+SiPixelRawDataErrorSource::SiPixelRawDataErrorSource(const edm::ParameterSet &iConfig)
+    : conf_(iConfig),
+      src_(consumes<DetSetVector<SiPixelRawDataError>>(conf_.getParameter<edm::InputTag>("src"))),
+      saveFile(conf_.getUntrackedParameter<bool>("saveFile", false)),
+      isPIB(conf_.getUntrackedParameter<bool>("isPIB", false)),
+      slowDown(conf_.getUntrackedParameter<bool>("slowDown", false)),
+      reducedSet(conf_.getUntrackedParameter<bool>("reducedSet", false)),
+      modOn(conf_.getUntrackedParameter<bool>("modOn", true)),
+      ladOn(conf_.getUntrackedParameter<bool>("ladOn", false)),
+      bladeOn(conf_.getUntrackedParameter<bool>("bladeOn", false)),
+      isUpgrade(conf_.getUntrackedParameter<bool>("isUpgrade", false)) {
   firstRun = true;
-  LogInfo ("PixelDQM") << "SiPixelRawDataErrorSource::SiPixelRawDataErrorSource: Got DQM BackEnd interface"<<endl;
+  LogInfo("PixelDQM") << "SiPixelRawDataErrorSource::SiPixelRawDataErrorSource:"
+                         " Got DQM BackEnd interface"
+                      << endl;
   topFolderName_ = conf_.getParameter<std::string>("TopFolderName");
   inputSourceToken_ = consumes<FEDRawDataCollection>(conf_.getUntrackedParameter<string>("inputSource", "source"));
 }
 
-
-SiPixelRawDataErrorSource::~SiPixelRawDataErrorSource()
-{
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-  LogInfo ("PixelDQM") << "SiPixelRawDataErrorSource::~SiPixelRawDataErrorSource: Destructor"<<endl;
+SiPixelRawDataErrorSource::~SiPixelRawDataErrorSource() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
+  LogInfo("PixelDQM") << "SiPixelRawDataErrorSource::~SiPixelRawDataErrorSource: Destructor" << endl;
 }
 
-void SiPixelRawDataErrorSource::dqmBeginRun(const edm::Run& r, const edm::EventSetup& iSetup){
-
-  LogInfo ("PixelDQM") << " SiPixelRawDataErrorSource::beginRun - Initialisation ... " << std::endl;
-  LogInfo ("PixelDQM") << "Mod/Lad/Blade " << modOn << "/" << ladOn << "/" << bladeOn << std::endl;
+void SiPixelRawDataErrorSource::dqmBeginRun(const edm::Run &r, const edm::EventSetup &iSetup) {
+  LogInfo("PixelDQM") << " SiPixelRawDataErrorSource::beginRun - Initialisation ... " << std::endl;
+  LogInfo("PixelDQM") << "Mod/Lad/Blade " << modOn << "/" << ladOn << "/" << bladeOn << std::endl;
 
-  if(firstRun){
+  if (firstRun) {
     eventNo = 0;
-    
+
     firstRun = false;
   }
 
@@ -92,7 +91,9 @@ void SiPixelRawDataErrorSource::dqmBeginRun(const edm::Run& r, const edm::EventS
   buildStructure(iSetup);
 }
 
-void SiPixelRawDataErrorSource::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const &, edm::EventSetup const & iSetup){
+void SiPixelRawDataErrorSource::bookHistograms(DQMStore::IBooker &iBooker,
+                                               edm::Run const &,
+                                               edm::EventSetup const &iSetup) {
   // Book Monitoring Elements
   bookMEs(iBooker);
 }
@@ -100,277 +101,293 @@ void SiPixelRawDataErrorSource::bookHistograms(DQMStore::IBooker & iBooker, edm:
 //------------------------------------------------------------------
 // Method called for every event
 //------------------------------------------------------------------
-void SiPixelRawDataErrorSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void SiPixelRawDataErrorSource::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   eventNo++;
-  //check feds in readout
-  if(eventNo==1){
+  // check feds in readout
+  if (eventNo == 1) {
     // check if any Pixel FED is in readout:
     edm::Handle<FEDRawDataCollection> rawDataHandle;
     iEvent.getByToken(inputSourceToken_, rawDataHandle);
-    if(!rawDataHandle.isValid()){
+    if (!rawDataHandle.isValid()) {
       edm::LogInfo("SiPixelRawDataErrorSource") << "inputsource is empty";
-    }
-    else{
-      const FEDRawDataCollection& rawDataCollection = *rawDataHandle;
-      for(int i = 0; i != 40; i++){
-        if(rawDataCollection.FEDData(i).size() && rawDataCollection.FEDData(i).data()) fedcounter->setBinContent(i+1,1);
+    } else {
+      const FEDRawDataCollection &rawDataCollection = *rawDataHandle;
+      for (int i = 0; i != 40; i++) {
+        if (rawDataCollection.FEDData(i).size() && rawDataCollection.FEDData(i).data())
+          fedcounter->setBinContent(i + 1, 1);
       }
     }
   }
   // get input data
-  edm::Handle< DetSetVector<SiPixelRawDataError> >  input;
-  iEvent.getByToken( src_, input );
-  if (!input.isValid()) return; 
+  edm::Handle<DetSetVector<SiPixelRawDataError>> input;
+  iEvent.getByToken(src_, input);
+  if (!input.isValid())
+    return;
 
   int lumiSection = (int)iEvent.luminosityBlock();
-  
-  int nEventBPIXModuleErrors = 0; int nEventFPIXModuleErrors = 0; int nEventBPIXFEDErrors = 0; int nEventFPIXFEDErrors = 0;
+
+  int nEventBPIXModuleErrors = 0;
+  int nEventFPIXModuleErrors = 0;
+  int nEventBPIXFEDErrors = 0;
+  int nEventFPIXFEDErrors = 0;
   int nErrors = 0;
 
-  std::map<uint32_t,SiPixelRawDataErrorModule*>::iterator struct_iter;
-  std::map<uint32_t,SiPixelRawDataErrorModule*>::iterator struct_iter2;
-  for (struct_iter = thePixelStructure.begin() ; struct_iter != thePixelStructure.end() ; struct_iter++) {
-    
+  std::map<uint32_t, SiPixelRawDataErrorModule *>::iterator struct_iter;
+  std::map<uint32_t, SiPixelRawDataErrorModule *>::iterator struct_iter2;
+  for (struct_iter = thePixelStructure.begin(); struct_iter != thePixelStructure.end(); struct_iter++) {
     int numberOfModuleErrors = (*struct_iter).second->fill(*input, &meMapFEDs_, modOn, ladOn, bladeOn);
-    if(DetId( (*struct_iter).first ).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) nEventBPIXModuleErrors = nEventBPIXModuleErrors + numberOfModuleErrors;
-    if(DetId( (*struct_iter).first ).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) nEventFPIXModuleErrors = nEventFPIXModuleErrors + numberOfModuleErrors;
-    //cout<<"NErrors: "<<nEventBPIXModuleErrors<<" "<<nEventFPIXModuleErrors<<endl;
+    if (DetId((*struct_iter).first).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel))
+      nEventBPIXModuleErrors = nEventBPIXModuleErrors + numberOfModuleErrors;
+    if (DetId((*struct_iter).first).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap))
+      nEventFPIXModuleErrors = nEventFPIXModuleErrors + numberOfModuleErrors;
+    // cout<<"NErrors: "<<nEventBPIXModuleErrors<<"
+    // "<<nEventFPIXModuleErrors<<endl;
     nErrors = nErrors + numberOfModuleErrors;
-    //if(nErrors>0) cout<<"MODULES: nErrors: "<<nErrors<<endl;
+    // if(nErrors>0) cout<<"MODULES: nErrors: "<<nErrors<<endl;
   }
-  for (struct_iter2 = theFEDStructure.begin() ; struct_iter2 != theFEDStructure.end() ; struct_iter2++) {
-    
+  for (struct_iter2 = theFEDStructure.begin(); struct_iter2 != theFEDStructure.end(); struct_iter2++) {
     int numberOfFEDErrors = (*struct_iter2).second->fillFED(*input, &meMapFEDs_);
-    if((*struct_iter2).first <= 31) nEventBPIXFEDErrors = nEventBPIXFEDErrors + numberOfFEDErrors; // (*struct_iter2).first >= 0, since (*struct_iter2).first is unsigned
-    if((*struct_iter2).first >= 32 && (*struct_iter2).first <= 39) nEventFPIXFEDErrors = nEventFPIXFEDErrors + numberOfFEDErrors;    
-    //cout<<"NFEDErrors: "<<nEventBPIXFEDErrors<<" "<<nEventFPIXFEDErrors<<endl;
+    if ((*struct_iter2).first <= 31)
+      nEventBPIXFEDErrors = nEventBPIXFEDErrors + numberOfFEDErrors;  // (*struct_iter2).first >= 0, since
+                                                                      // (*struct_iter2).first is unsigned
+    if ((*struct_iter2).first >= 32 && (*struct_iter2).first <= 39)
+      nEventFPIXFEDErrors = nEventFPIXFEDErrors + numberOfFEDErrors;
+    // cout<<"NFEDErrors: "<<nEventBPIXFEDErrors<<"
+    // "<<nEventFPIXFEDErrors<<endl;
     nErrors = nErrors + numberOfFEDErrors;
-    //if(nErrors>0) cout<<"FEDS: nErrors: "<<nErrors<<endl;
+    // if(nErrors>0) cout<<"FEDS: nErrors: "<<nErrors<<endl;
   }
-  if(byLumiErrors){
-    byLumiErrors->setBinContent(0,eventNo);
-    //cout<<"NErrors: "<<nEventBPIXModuleErrors<<" "<<nEventFPIXModuleErrors<<" "<<nEventBPIXFEDErrors<<" "<<nEventFPIXFEDErrors<<endl;
-    if(nEventBPIXModuleErrors+nEventBPIXFEDErrors>0) byLumiErrors->Fill(0,1.);
-    if(nEventFPIXModuleErrors+nEventFPIXFEDErrors>0) byLumiErrors->Fill(1,1.);
-    //cout<<"histo: "<<byLumiErrors->getBinContent(0)<<" "<<byLumiErrors->getBinContent(1)<<" "<<byLumiErrors->getBinContent(2)<<endl;
-  }  
-  
+  if (byLumiErrors) {
+    byLumiErrors->setBinContent(0, eventNo);
+    // cout<<"NErrors: "<<nEventBPIXModuleErrors<<" "<<nEventFPIXModuleErrors<<"
+    // "<<nEventBPIXFEDErrors<<" "<<nEventFPIXFEDErrors<<endl;
+    if (nEventBPIXModuleErrors + nEventBPIXFEDErrors > 0)
+      byLumiErrors->Fill(0, 1.);
+    if (nEventFPIXModuleErrors + nEventFPIXFEDErrors > 0)
+      byLumiErrors->Fill(1, 1.);
+    // cout<<"histo: "<<byLumiErrors->getBinContent(0)<<"
+    // "<<byLumiErrors->getBinContent(1)<<"
+    // "<<byLumiErrors->getBinContent(2)<<endl;
+  }
+
   // Rate of errors per lumi section:
-  if(errorRate) errorRate->Fill(lumiSection, nErrors);
+  if (errorRate)
+    errorRate->Fill(lumiSection, nErrors);
 
   // slow down...
-  if(slowDown) usleep(100000);
-  
+  if (slowDown)
+    usleep(100000);
 }
 
 //------------------------------------------------------------------
 // Build data structure
 //------------------------------------------------------------------
-void SiPixelRawDataErrorSource::buildStructure(const edm::EventSetup& iSetup){
-
-  LogInfo ("PixelDQM") <<" SiPixelRawDataErrorSource::buildStructure" ;
-
+void SiPixelRawDataErrorSource::buildStructure(const edm::EventSetup &iSetup) {
+  LogInfo("PixelDQM") << " SiPixelRawDataErrorSource::buildStructure";
 
   edm::ESHandle<TrackerGeometry> pDD;
   edm::ESHandle<TrackerTopology> tTopoHandle;
 
-  iSetup.get<TrackerDigiGeometryRecord>().get( pDD );
+  iSetup.get<TrackerDigiGeometryRecord>().get(pDD);
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
 
   const TrackerTopology *pTT = tTopoHandle.product();
 
-
-  LogVerbatim ("PixelDQM") << " *** Geometry node for TrackerGeom is  "<<&(*pDD)<<std::endl;
-  LogVerbatim ("PixelDQM") << " *** I have " << pDD->detsPXB().size() <<" barrel pixel detectors"<<std::endl;
-  LogVerbatim ("PixelDQM") << " *** I have " << pDD->detsPXF().size() <<" endcap pixel detectors"<<std::endl;
-  //LogVerbatim ("PixelDQM") << " *** I have " << pDD->detTypes().size() <<" types"<<std::endl;
-
-  for(TrackerGeometry::DetContainer::const_iterator it = pDD->detsPXB().begin(); it != pDD->detsPXB().end(); it++){
-
-    const GeomDetUnit* geoUnit = dynamic_cast<const GeomDetUnit*>(*it);
-    //check if it is a detUnit
-    if ( geoUnit == nullptr )
-      LogError ("PixelDQM") << "Pixel GeomDet is not a GeomDetUnit!" << std::endl;
-    const PixelGeomDetUnit * pixDet  = dynamic_cast<const PixelGeomDetUnit*>(geoUnit);
+  LogVerbatim("PixelDQM") << " *** Geometry node for TrackerGeom is  " << &(*pDD) << std::endl;
+  LogVerbatim("PixelDQM") << " *** I have " << pDD->detsPXB().size() << " barrel pixel detectors" << std::endl;
+  LogVerbatim("PixelDQM") << " *** I have " << pDD->detsPXF().size() << " endcap pixel detectors" << std::endl;
+  // LogVerbatim ("PixelDQM") << " *** I have " << pDD->detTypes().size() <<"
+  // types"<<std::endl;
+
+  for (TrackerGeometry::DetContainer::const_iterator it = pDD->detsPXB().begin(); it != pDD->detsPXB().end(); it++) {
+    const GeomDetUnit *geoUnit = dynamic_cast<const GeomDetUnit *>(*it);
+    // check if it is a detUnit
+    if (geoUnit == nullptr)
+      LogError("PixelDQM") << "Pixel GeomDet is not a GeomDetUnit!" << std::endl;
+    const PixelGeomDetUnit *pixDet = dynamic_cast<const PixelGeomDetUnit *>(geoUnit);
     int nrows = (pixDet->specificTopology()).nrows();
     int ncols = (pixDet->specificTopology()).ncolumns();
 
-    if(isPIB) continue;
+    if (isPIB)
+      continue;
     DetId detId = (*it)->geographicalId();
-    LogDebug ("PixelDQM") << " ---> Adding Barrel Module " <<  detId.rawId() << endl;
+    LogDebug("PixelDQM") << " ---> Adding Barrel Module " << detId.rawId() << endl;
     uint32_t id = detId();
-    SiPixelRawDataErrorModule* theModule = new SiPixelRawDataErrorModule(id, ncols, nrows);
-    thePixelStructure.insert(pair<uint32_t,SiPixelRawDataErrorModule*> (id,theModule));
-
+    SiPixelRawDataErrorModule *theModule = new SiPixelRawDataErrorModule(id, ncols, nrows);
+    thePixelStructure.insert(pair<uint32_t, SiPixelRawDataErrorModule *>(id, theModule));
   }
 
-
-  for(TrackerGeometry::DetContainer::const_iterator it = pDD->detsPXF().begin(); it != pDD->detsPXF().end(); it++){
-
-    const GeomDetUnit* geoUnit = dynamic_cast<const GeomDetUnit*>(*it);
-    //check if it is a detUnit
-    if ( geoUnit == nullptr )
-      LogError ("PixelDQM") << "Pixel GeomDet is not a GeomDetUnit!" << std::endl;
-    const PixelGeomDetUnit * pixDet  = dynamic_cast<const PixelGeomDetUnit*>(geoUnit);
+  for (TrackerGeometry::DetContainer::const_iterator it = pDD->detsPXF().begin(); it != pDD->detsPXF().end(); it++) {
+    const GeomDetUnit *geoUnit = dynamic_cast<const GeomDetUnit *>(*it);
+    // check if it is a detUnit
+    if (geoUnit == nullptr)
+      LogError("PixelDQM") << "Pixel GeomDet is not a GeomDetUnit!" << std::endl;
+    const PixelGeomDetUnit *pixDet = dynamic_cast<const PixelGeomDetUnit *>(geoUnit);
     int nrows = (pixDet->specificTopology()).nrows();
     int ncols = (pixDet->specificTopology()).ncolumns();
 
     DetId detId = (*it)->geographicalId();
-    LogDebug ("PixelDQM") << " ---> Adding Endcap Module " <<  detId.rawId() << endl;
+    LogDebug("PixelDQM") << " ---> Adding Endcap Module " << detId.rawId() << endl;
     uint32_t id = detId();
-    SiPixelRawDataErrorModule* theModule = new SiPixelRawDataErrorModule(id, ncols, nrows);
-	
+    SiPixelRawDataErrorModule *theModule = new SiPixelRawDataErrorModule(id, ncols, nrows);
+
     PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(id), pTT, isUpgrade).halfCylinder();
-    int disk   = PixelEndcapName(DetId(id), pTT, isUpgrade).diskName();
-    int blade  = PixelEndcapName(DetId(id), pTT, isUpgrade).bladeName();
-    int panel  = PixelEndcapName(DetId(id), pTT, isUpgrade).pannelName();
+    int disk = PixelEndcapName(DetId(id), pTT, isUpgrade).diskName();
+    int blade = PixelEndcapName(DetId(id), pTT, isUpgrade).bladeName();
+    int panel = PixelEndcapName(DetId(id), pTT, isUpgrade).pannelName();
     int module = PixelEndcapName(DetId(id), pTT, isUpgrade).plaquetteName();
-    
-    char sside[80];  sprintf(sside,  "HalfCylinder_%i",side);
-    char sdisk[80];  sprintf(sdisk,  "Disk_%i",disk);
-    char sblade[80]; sprintf(sblade, "Blade_%02i",blade);
-    char spanel[80]; sprintf(spanel, "Panel_%i",panel);
-    char smodule[80];sprintf(smodule,"Module_%i",module);
+
+    char sside[80];
+    sprintf(sside, "HalfCylinder_%i", side);
+    char sdisk[80];
+    sprintf(sdisk, "Disk_%i", disk);
+    char sblade[80];
+    sprintf(sblade, "Blade_%02i", blade);
+    char spanel[80];
+    sprintf(spanel, "Panel_%i", panel);
+    char smodule[80];
+    sprintf(smodule, "Module_%i", module);
     std::string side_str = sside;
     std::string disk_str = sdisk;
-    bool mask = side_str.find("HalfCylinder_1")!=string::npos||
-                side_str.find("HalfCylinder_2")!=string::npos||
-    	    side_str.find("HalfCylinder_4")!=string::npos||
-    	    disk_str.find("Disk_2")!=string::npos;
+    bool mask = side_str.find("HalfCylinder_1") != string::npos || side_str.find("HalfCylinder_2") != string::npos ||
+                side_str.find("HalfCylinder_4") != string::npos || disk_str.find("Disk_2") != string::npos;
     // clutch to take all of FPIX, but no BPIX:
     mask = false;
-    if(isPIB && mask) continue;
-    	
-    thePixelStructure.insert(pair<uint32_t,SiPixelRawDataErrorModule*> (id,theModule));
+    if (isPIB && mask)
+      continue;
 
+    thePixelStructure.insert(pair<uint32_t, SiPixelRawDataErrorModule *>(id, theModule));
   }
 
-  LogDebug ("PixelDQM") << " ---> Adding Module for Additional Errors " << endl;
-  pair<int,int> fedIds (FEDNumbering::MINSiPixelFEDID, FEDNumbering::MAXSiPixelFEDID);
+  LogDebug("PixelDQM") << " ---> Adding Module for Additional Errors " << endl;
+  pair<int, int> fedIds(FEDNumbering::MINSiPixelFEDID, FEDNumbering::MAXSiPixelFEDID);
 
   fedIds.first = 0;
   fedIds.second = 39;
 
   for (int fedId = fedIds.first; fedId <= fedIds.second; fedId++) {
-
-    //std::cout<<"Adding FED module: "<<fedId<<std::endl;
-    uint32_t id = static_cast<uint32_t> (fedId);
-    SiPixelRawDataErrorModule* theModule = new SiPixelRawDataErrorModule(id);
-    theFEDStructure.insert(pair<uint32_t,SiPixelRawDataErrorModule*> (id,theModule));
-
+    // std::cout<<"Adding FED module: "<<fedId<<std::endl;
+    uint32_t id = static_cast<uint32_t>(fedId);
+    SiPixelRawDataErrorModule *theModule = new SiPixelRawDataErrorModule(id);
+    theFEDStructure.insert(pair<uint32_t, SiPixelRawDataErrorModule *>(id, theModule));
   }
-  
-  LogInfo ("PixelDQM") << " *** Pixel Structure Size " << thePixelStructure.size() << endl;
+
+  LogInfo("PixelDQM") << " *** Pixel Structure Size " << thePixelStructure.size() << endl;
 }
 //------------------------------------------------------------------
 // Book MEs
 //------------------------------------------------------------------
-void SiPixelRawDataErrorSource::bookMEs(DQMStore::IBooker & iBooker){
-  iBooker.setCurrentFolder(topFolderName_+"/EventInfo/DAQContents");
-  char title0[80]; sprintf(title0, "FED isPresent;FED ID;isPresent");
-  fedcounter = iBooker.book1D("fedcounter",title0,40,-0.5,39.5);
-  iBooker.setCurrentFolder(topFolderName_+"/AdditionalPixelErrors");
-  char title[80]; sprintf(title, "By-LumiSection Error counters");
-  byLumiErrors = iBooker.book1D("byLumiErrors",title,2,0.,2.);
+void SiPixelRawDataErrorSource::bookMEs(DQMStore::IBooker &iBooker) {
+  iBooker.setCurrentFolder(topFolderName_ + "/EventInfo/DAQContents");
+  char title0[80];
+  sprintf(title0, "FED isPresent;FED ID;isPresent");
+  fedcounter = iBooker.book1D("fedcounter", title0, 40, -0.5, 39.5);
+  iBooker.setCurrentFolder(topFolderName_ + "/AdditionalPixelErrors");
+  char title[80];
+  sprintf(title, "By-LumiSection Error counters");
+  byLumiErrors = iBooker.book1D("byLumiErrors", title, 2, 0., 2.);
   byLumiErrors->setLumiFlag();
-  char title1[80]; sprintf(title1, "Errors per LumiSection;LumiSection;NErrors");
-  errorRate = iBooker.book1D("errorRate",title1,5000,0.,5000.);
-  
-  std::map<uint32_t,SiPixelRawDataErrorModule*>::iterator struct_iter;
-  std::map<uint32_t,SiPixelRawDataErrorModule*>::iterator struct_iter2;
-  
+  char title1[80];
+  sprintf(title1, "Errors per LumiSection;LumiSection;NErrors");
+  errorRate = iBooker.book1D("errorRate", title1, 5000, 0., 5000.);
+
+  std::map<uint32_t, SiPixelRawDataErrorModule *>::iterator struct_iter;
+  std::map<uint32_t, SiPixelRawDataErrorModule *>::iterator struct_iter2;
+
   SiPixelFolderOrganizer theSiPixelFolder(false);
-  
-  for(struct_iter = thePixelStructure.begin(); struct_iter != thePixelStructure.end(); struct_iter++){
-    /// Create folder tree and book histograms 
-
-    if(modOn){
-      if(!theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,0,isUpgrade)) {
-        //std::cout<<"PIB! not booking histograms for non-PIB modules!"<<std::endl;
-        if(!isPIB) throw cms::Exception("LogicError")
-                       << "[SiPixelRawDataErrorSource::bookMEs] Creation of DQM folder failed";
+
+  for (struct_iter = thePixelStructure.begin(); struct_iter != thePixelStructure.end(); struct_iter++) {
+    /// Create folder tree and book histograms
+
+    if (modOn) {
+      if (!theSiPixelFolder.setModuleFolder(iBooker, (*struct_iter).first, 0, isUpgrade)) {
+        // std::cout<<"PIB! not booking histograms for non-PIB
+        // modules!"<<std::endl;
+        if (!isPIB)
+          throw cms::Exception("LogicError") << "[SiPixelRawDataErrorSource::bookMEs] Creation of DQM folder "
+                                                "failed";
       }
     }
-    
-    if(ladOn){
-      if(!theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,1,isUpgrade)) {
-        LogDebug ("PixelDQM") << "PROBLEM WITH LADDER-FOLDER\n";
+
+    if (ladOn) {
+      if (!theSiPixelFolder.setModuleFolder(iBooker, (*struct_iter).first, 1, isUpgrade)) {
+        LogDebug("PixelDQM") << "PROBLEM WITH LADDER-FOLDER\n";
       }
     }
-    
-    if(bladeOn){
-      if(!theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,4,isUpgrade)) {
-        LogDebug ("PixelDQM") << "PROBLEM WITH BLADE-FOLDER\n";
+
+    if (bladeOn) {
+      if (!theSiPixelFolder.setModuleFolder(iBooker, (*struct_iter).first, 4, isUpgrade)) {
+        LogDebug("PixelDQM") << "PROBLEM WITH BLADE-FOLDER\n";
       }
     }
-    
-  }//for loop
-
-  for(struct_iter2 = theFEDStructure.begin(); struct_iter2 != theFEDStructure.end(); struct_iter2++){
-    /// Create folder tree for errors without detId and book histograms 
-    if(!theSiPixelFolder.setFedFolder(iBooker,(*struct_iter2).first)) {
-      throw cms::Exception("LogicError")
-	<< "[SiPixelRawDataErrorSource::bookMEs] Creation of DQM folder failed";
-    }
 
+  }  // for loop
+
+  for (struct_iter2 = theFEDStructure.begin(); struct_iter2 != theFEDStructure.end(); struct_iter2++) {
+    /// Create folder tree for errors without detId and book histograms
+    if (!theSiPixelFolder.setFedFolder(iBooker, (*struct_iter2).first)) {
+      throw cms::Exception("LogicError") << "[SiPixelRawDataErrorSource::bookMEs] Creation of DQM folder "
+                                            "failed";
+    }
   }
 
-  //Booking FED histograms
+  // Booking FED histograms
   std::string hid;
   // Get collection name and instantiate Histo Id builder
-  edm::InputTag src = conf_.getParameter<edm::InputTag>( "src" );
-  SiPixelHistogramId* theHistogramId = new SiPixelHistogramId( src.label() );
+  edm::InputTag src = conf_.getParameter<edm::InputTag>("src");
+  SiPixelHistogramId *theHistogramId = new SiPixelHistogramId(src.label());
 
-  for (uint32_t id = 0; id < 40; id++){
-    char temp [50];
-    sprintf( temp, (topFolderName_+"/AdditionalPixelErrors/FED_%d").c_str(),id);
+  for (uint32_t id = 0; id < 40; id++) {
+    char temp[50];
+    sprintf(temp, (topFolderName_ + "/AdditionalPixelErrors/FED_%d").c_str(), id);
     iBooker.cd(temp);
     // Types of errors
-    hid = theHistogramId->setHistoId("errorType",id);
-    meErrorType_[id] = iBooker.book1D(hid,"Type of errors",15,24.5,39.5);
-    meErrorType_[id]->setAxisTitle("Type of errors",1);
+    hid = theHistogramId->setHistoId("errorType", id);
+    meErrorType_[id] = iBooker.book1D(hid, "Type of errors", 15, 24.5, 39.5);
+    meErrorType_[id]->setAxisTitle("Type of errors", 1);
     // Number of errors
-    hid = theHistogramId->setHistoId("NErrors",id);
-    meNErrors_[id] = iBooker.book1D(hid,"Number of errors",36,0.,36.);
-    meNErrors_[id]->setAxisTitle("Number of errors",1);
-    // Type of FIFO full (errorType = 28).  FIFO 1 is 1-5 (where fullType = channel of FIFO 1), 
-    // fullType = 6 signifies FIFO 2 nearly full, 7 signifies trigger FIFO nearly full, 8 
-    // indicates an unexpected result
-    hid = theHistogramId->setHistoId("fullType",id);
-    meFullType_[id] = iBooker.book1D(hid,"Type of FIFO full",7,0.5,7.5);
-    meFullType_[id]->setAxisTitle("FIFO type",1);
+    hid = theHistogramId->setHistoId("NErrors", id);
+    meNErrors_[id] = iBooker.book1D(hid, "Number of errors", 36, 0., 36.);
+    meNErrors_[id]->setAxisTitle("Number of errors", 1);
+    // Type of FIFO full (errorType = 28).  FIFO 1 is 1-5 (where fullType =
+    // channel of FIFO 1), fullType = 6 signifies FIFO 2 nearly full, 7
+    // signifies trigger FIFO nearly full, 8 indicates an unexpected result
+    hid = theHistogramId->setHistoId("fullType", id);
+    meFullType_[id] = iBooker.book1D(hid, "Type of FIFO full", 7, 0.5, 7.5);
+    meFullType_[id]->setAxisTitle("FIFO type", 1);
     // For error type 30, the type of problem encoded in the TBM trailer
-    // 0 = stack full, 1 = Pre-cal issued, 2 = clear trigger counter, 3 = sync trigger, 
-    // 4 = sync trigger error, 5 = reset ROC, 6 = reset TBM, 7 = no token bit pass
-    hid = theHistogramId->setHistoId("TBMMessage",id);
-    meTBMMessage_[id] = iBooker.book1D(hid,"TBM trailer message",8,-0.5,7.5);
-    meTBMMessage_[id]->setAxisTitle("TBM message",1);
-    // For error type 30, the type of problem encoded in the TBM error trailer 0 = none
-    // 1 = data stream too long, 2 = FSM errors, 3 = invalid # of ROCs, 4 = multiple
-    hid = theHistogramId->setHistoId("TBMType",id);
-    meTBMType_[id] = iBooker.book1D(hid,"Type of TBM trailer",5,-0.5,4.5);
-    meTBMType_[id]->setAxisTitle("TBM Type",1);
+    // 0 = stack full, 1 = Pre-cal issued, 2 = clear trigger counter, 3 = sync
+    // trigger, 4 = sync trigger error, 5 = reset ROC, 6 = reset TBM, 7 = no
+    // token bit pass
+    hid = theHistogramId->setHistoId("TBMMessage", id);
+    meTBMMessage_[id] = iBooker.book1D(hid, "TBM trailer message", 8, -0.5, 7.5);
+    meTBMMessage_[id]->setAxisTitle("TBM message", 1);
+    // For error type 30, the type of problem encoded in the TBM error trailer 0
+    // = none 1 = data stream too long, 2 = FSM errors, 3 = invalid # of ROCs, 4
+    // = multiple
+    hid = theHistogramId->setHistoId("TBMType", id);
+    meTBMType_[id] = iBooker.book1D(hid, "Type of TBM trailer", 5, -0.5, 4.5);
+    meTBMType_[id]->setAxisTitle("TBM Type", 1);
     // For error type 31, the event number of the TBM header with the error
-    hid = theHistogramId->setHistoId("EvtNbr",id);
-    meEvtNbr_[id] = iBooker.book1D(hid,"Event number",1,0,1);
+    hid = theHistogramId->setHistoId("EvtNbr", id);
+    meEvtNbr_[id] = iBooker.book1D(hid, "Event number", 1, 0, 1);
     // For errorType = 34, datastream size according to error word
-    hid = theHistogramId->setHistoId("evtSize",id);
-    meEvtSize_[id] = iBooker.book1D(hid,"Event size",1,0,1);
+    hid = theHistogramId->setHistoId("evtSize", id);
+    meEvtSize_[id] = iBooker.book1D(hid, "Event size", 1, 0, 1);
     //
-    hid = theHistogramId->setHistoId("FedChNErr",id);
-    meFedChNErr_[id] = iBooker.book1D(hid,"Number of errors per FED channel",37,0,37);
-    meFedChNErr_[id]->setAxisTitle("FED channel",1);
+    hid = theHistogramId->setHistoId("FedChNErr", id);
+    meFedChNErr_[id] = iBooker.book1D(hid, "Number of errors per FED channel", 37, 0, 37);
+    meFedChNErr_[id]->setAxisTitle("FED channel", 1);
     //
-    hid = theHistogramId->setHistoId("FedChLErr",id);
-    meFedChLErr_[id] = iBooker.book1D(hid,"Last error per FED channel",37,0,37);
-    meFedChLErr_[id]->setAxisTitle("FED channel",1);
+    hid = theHistogramId->setHistoId("FedChLErr", id);
+    meFedChLErr_[id] = iBooker.book1D(hid, "Last error per FED channel", 37, 0, 37);
+    meFedChLErr_[id]->setAxisTitle("FED channel", 1);
     //
     hid = theHistogramId->setHistoId("FedETypeNErr", id);
-    meFedETypeNErr_[id] = iBooker.book1D(hid,"Number of errors per type",21,0,21);
-    meFedETypeNErr_[id]->setAxisTitle("Error type",1);
+    meFedETypeNErr_[id] = iBooker.book1D(hid, "Number of errors per type", 21, 0, 21);
+    meFedETypeNErr_[id]->setAxisTitle("Error type", 1);
   }
-  //Add the booked histograms to the histogram map for booking
+  // Add the booked histograms to the histogram map for booking
   meMapFEDs_["meErrorType_"] = meErrorType_;
   meMapFEDs_["meNErrors_"] = meNErrors_;
   meMapFEDs_["meFullType_"] = meFullType_;
@@ -382,7 +399,7 @@ void SiPixelRawDataErrorSource::bookMEs(DQMStore::IBooker & iBooker){
   meMapFEDs_["meFedChLErr_"] = meFedChLErr_;
   meMapFEDs_["meFedETypeNErr_"] = meFedETypeNErr_;
 
-  //cout<<"...leaving SiPixelRawDataErrorSource::bookMEs now! "<<endl;
+  // cout<<"...leaving SiPixelRawDataErrorSource::bookMEs now! "<<endl;
 }
 
 DEFINE_FWK_MODULE(SiPixelRawDataErrorSource);
diff --git a/DQM/SiPixelMonitorRecHit/interface/SiPixelRecHitModule.h b/DQM/SiPixelMonitorRecHit/interface/SiPixelRecHitModule.h
index 7fcdc82e829f6..db2055c3fa85a 100644
--- a/DQM/SiPixelMonitorRecHit/interface/SiPixelRecHitModule.h
+++ b/DQM/SiPixelMonitorRecHit/interface/SiPixelRecHitModule.h
@@ -4,119 +4,136 @@
 //
 // Package:    SiPixelMonitorRecHits
 // Class:      SiPixelRecHitModule
-// 
-/**\class 
+//
+/**\class
 
  Description: RecHits monitoring elements for a single Pixel
 detector segment (detID)
 
  Implementation:
-//	This package was marginally adapted from 
+//	This package was marginally adapted from
 //	SiPixelDigiModule
      <Notes on implementation>
 */
 //
 // Original Author:  Vincenzo Chiochia
-//         Created:  
+//         Created:
 //
 //  Adapted by: Keith Rose
 //  for use in SiPixelMonitorRecHit package
 //  Updated by: Lukas Wehrli
-//  for pixel offline DQM 
+//  for pixel offline DQM
 
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMStore.h"
-#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Common/interface/DetSetVector.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include <boost/cstdint.hpp>
 
-class SiPixelRecHitModule {        
-
- public:
-
+class SiPixelRecHitModule {
+public:
   /// Default constructor
   SiPixelRecHitModule();
   /// Constructor with raw DetId
-  SiPixelRecHitModule(const uint32_t& id);
+  SiPixelRecHitModule(const uint32_t &id);
   /// Destructor
   ~SiPixelRecHitModule();
 
   // typedef edm::DetSet<PixelRecHit>::const_iterator  RecHitsIterator;
 
   /// Book histograms
-  void book(const edm::ParameterSet& iConfig, DQMStore::IBooker & iBooker, const edm::EventSetup& iSetup, int type=0, bool twoD=true,
-            bool reducedSet=false, bool isUpgrade=false);
+  void book(const edm::ParameterSet &iConfig,
+            DQMStore::IBooker &iBooker,
+            const edm::EventSetup &iSetup,
+            int type = 0,
+            bool twoD = true,
+            bool reducedSet = false,
+            bool isUpgrade = false);
   /// Fill histograms
-  void fill(const float& rechit_x, const float& rechit_y, const int& sizeX, 
-            const int& sizeY, const float& lerr_x, const float& lerr_y, 
-	    bool modon=true, bool ladon=false, bool layon=false, 
-	    bool phion=false, bool bladeon=false, bool diskon=false, 
-	    bool ringon=false, bool twoD=true, bool reducedSet=false);
-  void nfill(const int& nrec, bool modon=true, bool ladon=false, 
-             bool layon=false, bool phion=false, bool bladeon=false, 
-	     bool diskon=false, bool ringon=false);  
-
- private:
+  void fill(const float &rechit_x,
+            const float &rechit_y,
+            const int &sizeX,
+            const int &sizeY,
+            const float &lerr_x,
+            const float &lerr_y,
+            bool modon = true,
+            bool ladon = false,
+            bool layon = false,
+            bool phion = false,
+            bool bladeon = false,
+            bool diskon = false,
+            bool ringon = false,
+            bool twoD = true,
+            bool reducedSet = false);
+  void nfill(const int &nrec,
+             bool modon = true,
+             bool ladon = false,
+             bool layon = false,
+             bool phion = false,
+             bool bladeon = false,
+             bool diskon = false,
+             bool ringon = false);
 
+private:
   uint32_t id_;
-  MonitorElement* meXYPos_;
-  MonitorElement* meXYPos_px_;
-  MonitorElement* meXYPos_py_;
-  MonitorElement* meClustX_;
-  MonitorElement* meClustY_;  
-  MonitorElement* meErrorX_;
-  MonitorElement* meErrorY_;  
-  MonitorElement* menRecHits_;
-  //barrel
-  MonitorElement* meXYPosLad_;
-  MonitorElement* meXYPosLad_px_;
-  MonitorElement* meXYPosLad_py_;
-  MonitorElement* meClustXLad_;
-  MonitorElement* meClustYLad_;
-  MonitorElement* meErrorXLad_;
-  MonitorElement* meErrorYLad_; 
-  MonitorElement* menRecHitsLad_;
+  MonitorElement *meXYPos_;
+  MonitorElement *meXYPos_px_;
+  MonitorElement *meXYPos_py_;
+  MonitorElement *meClustX_;
+  MonitorElement *meClustY_;
+  MonitorElement *meErrorX_;
+  MonitorElement *meErrorY_;
+  MonitorElement *menRecHits_;
+  // barrel
+  MonitorElement *meXYPosLad_;
+  MonitorElement *meXYPosLad_px_;
+  MonitorElement *meXYPosLad_py_;
+  MonitorElement *meClustXLad_;
+  MonitorElement *meClustYLad_;
+  MonitorElement *meErrorXLad_;
+  MonitorElement *meErrorYLad_;
+  MonitorElement *menRecHitsLad_;
 
-  MonitorElement* meXYPosLay_;
-  MonitorElement* meXYPosLay_px_;
-  MonitorElement* meXYPosLay_py_;
-  MonitorElement* meClustXLay_;
-  MonitorElement* meClustYLay_;
-  MonitorElement* meErrorXLay_;
-  MonitorElement* meErrorYLay_; 
-  MonitorElement* menRecHitsLay_;
+  MonitorElement *meXYPosLay_;
+  MonitorElement *meXYPosLay_px_;
+  MonitorElement *meXYPosLay_py_;
+  MonitorElement *meClustXLay_;
+  MonitorElement *meClustYLay_;
+  MonitorElement *meErrorXLay_;
+  MonitorElement *meErrorYLay_;
+  MonitorElement *menRecHitsLay_;
 
-  MonitorElement* meXYPosPhi_;
-  MonitorElement* meXYPosPhi_px_;
-  MonitorElement* meXYPosPhi_py_;
-  MonitorElement* meClustXPhi_;
-  MonitorElement* meClustYPhi_;
-  MonitorElement* meErrorXPhi_;
-  MonitorElement* meErrorYPhi_; 
-  MonitorElement* menRecHitsPhi_;
+  MonitorElement *meXYPosPhi_;
+  MonitorElement *meXYPosPhi_px_;
+  MonitorElement *meXYPosPhi_py_;
+  MonitorElement *meClustXPhi_;
+  MonitorElement *meClustYPhi_;
+  MonitorElement *meErrorXPhi_;
+  MonitorElement *meErrorYPhi_;
+  MonitorElement *menRecHitsPhi_;
 
-  //forward
-  MonitorElement* meClustXBlade_;
-  MonitorElement* meClustYBlade_;  
-  MonitorElement* meErrorXBlade_;
-  MonitorElement* meErrorYBlade_; 
-  MonitorElement* menRecHitsBlade_;
+  // forward
+  MonitorElement *meClustXBlade_;
+  MonitorElement *meClustYBlade_;
+  MonitorElement *meErrorXBlade_;
+  MonitorElement *meErrorYBlade_;
+  MonitorElement *menRecHitsBlade_;
 
-  MonitorElement* meClustXDisk_;
-  MonitorElement* meClustYDisk_;  
-  MonitorElement* meErrorXDisk_;
-  MonitorElement* meErrorYDisk_; 
-  MonitorElement* menRecHitsDisk_;
+  MonitorElement *meClustXDisk_;
+  MonitorElement *meClustYDisk_;
+  MonitorElement *meErrorXDisk_;
+  MonitorElement *meErrorYDisk_;
+  MonitorElement *menRecHitsDisk_;
 
-  MonitorElement* meXYPosRing_;
-  MonitorElement* meXYPosRing_px_;
-  MonitorElement* meXYPosRing_py_;
-  MonitorElement* meClustXRing_;
-  MonitorElement* meClustYRing_;
-  MonitorElement* meErrorXRing_;
-  MonitorElement* meErrorYRing_; 
-  MonitorElement* menRecHitsRing_;
+  MonitorElement *meXYPosRing_;
+  MonitorElement *meXYPosRing_px_;
+  MonitorElement *meXYPosRing_py_;
+  MonitorElement *meClustXRing_;
+  MonitorElement *meClustYRing_;
+  MonitorElement *meErrorXRing_;
+  MonitorElement *meErrorYRing_;
+  MonitorElement *menRecHitsRing_;
 };
 #endif
diff --git a/DQM/SiPixelMonitorRecHit/interface/SiPixelRecHitSource.h b/DQM/SiPixelMonitorRecHit/interface/SiPixelRecHitSource.h
index 4c75c6d757183..fbcd3e153328e 100644
--- a/DQM/SiPixelMonitorRecHit/interface/SiPixelRecHitSource.h
+++ b/DQM/SiPixelMonitorRecHit/interface/SiPixelRecHitSource.h
@@ -4,7 +4,7 @@
 //
 // Package:     SiPixelMonitorRecHits
 // Class  :     SiPixelRecHitSource
-// 
+//
 /**
 
  Description: header file for Pixel Monitor Rec Hits
@@ -15,79 +15,76 @@
 */
 //
 // Original Author:  Vincenzo Chiochia
-//         Created:  
+//         Created:
 //
 // Updated by: Keith Rose
 // for use in SiPixelMonitorRecHits
 // Updated by: Lukas Wehrli
-// for pixel offline DQM 
-
+// for pixel offline DQM
 
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 
 #include "DQM/SiPixelMonitorRecHit/interface/SiPixelRecHitModule.h"
 
 #include "DataFormats/Common/interface/DetSetVector.h"
+#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
-#include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
-
 
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include <boost/cstdint.hpp>
 
 class SiPixelRecHitSource : public DQMEDAnalyzer {
-    public:
-       explicit SiPixelRecHitSource(const edm::ParameterSet& conf);
-       ~SiPixelRecHitSource() override;
-
-//       typedef edm::DetSet<PixelRecHit>::const_iterator    RecHitIterator;
-       
-       void analyze(const edm::Event&, const edm::EventSetup&) override;
-       void bookHistograms(DQMStore::IBooker &, edm::Run const &, const edm::EventSetup&) override;
-       void dqmBeginRun(const edm::Run&, edm::EventSetup const&) override;
-
-       virtual void buildStructure(edm::EventSetup const&);
-       virtual void bookMEs(DQMStore::IBooker &, const edm::EventSetup& iSetup);
-
-       std::string topFolderName_;
-
-    private:
-       edm::ParameterSet conf_;
-       edm::EDGetTokenT<SiPixelRecHitCollection> src_;
-
-       bool saveFile;
-       bool isPIB;
-       bool slowDown;
-       int eventNo;
-       std::map<uint32_t,SiPixelRecHitModule*> thePixelStructure;
-       std::map<uint32_t,int> rechit_count;
-       bool modOn; 
-       bool twoDimOn;
-       bool reducedSet;
-        //barrel:
-       bool ladOn, layOn, phiOn;
-       //forward:
-       bool ringOn, bladeOn, diskOn; 
-       
-       bool firstRun;
-       bool isUpgrade;
-
- };
+public:
+  explicit SiPixelRecHitSource(const edm::ParameterSet &conf);
+  ~SiPixelRecHitSource() override;
+
+  //       typedef edm::DetSet<PixelRecHit>::const_iterator    RecHitIterator;
+
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, const edm::EventSetup &) override;
+  void dqmBeginRun(const edm::Run &, edm::EventSetup const &) override;
+
+  virtual void buildStructure(edm::EventSetup const &);
+  virtual void bookMEs(DQMStore::IBooker &, const edm::EventSetup &iSetup);
+
+  std::string topFolderName_;
+
+private:
+  edm::ParameterSet conf_;
+  edm::EDGetTokenT<SiPixelRecHitCollection> src_;
+
+  bool saveFile;
+  bool isPIB;
+  bool slowDown;
+  int eventNo;
+  std::map<uint32_t, SiPixelRecHitModule *> thePixelStructure;
+  std::map<uint32_t, int> rechit_count;
+  bool modOn;
+  bool twoDimOn;
+  bool reducedSet;
+  // barrel:
+  bool ladOn, layOn, phiOn;
+  // forward:
+  bool ringOn, bladeOn, diskOn;
+
+  bool firstRun;
+  bool isUpgrade;
+};
 
 #endif
diff --git a/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitModule.cc b/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitModule.cc
index 7a08b91236eb3..63d8963fa0c42 100644
--- a/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitModule.cc
+++ b/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitModule.cc
@@ -1,44 +1,40 @@
+#include "DQM/SiPixelCommon/interface/SiPixelHistogramId.h"
 #include "DQM/SiPixelMonitorRecHit/interface/SiPixelRecHitModule.h"
 #include "DQMServices/Core/interface/DQMStore.h"
-#include "DQM/SiPixelCommon/interface/SiPixelHistogramId.h"
 /// Framework
 #include "FWCore/ServiceRegistry/interface/Service.h"
 // STL
-#include <vector>
+#include <cstdlib>
+#include <iostream>
 #include <memory>
 #include <string>
-#include <iostream>
-#include <cstdlib>
+#include <vector>
 
 // Data Formats
+#include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h"
-#include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
+#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 
-#include "FWCore/Framework/interface/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
-
+#include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
 // Constructors
 //
-SiPixelRecHitModule::SiPixelRecHitModule() : id_(0) { }
+SiPixelRecHitModule::SiPixelRecHitModule() : id_(0) {}
 ///
-SiPixelRecHitModule::SiPixelRecHitModule(const uint32_t& id) : 
-  id_(id)
-{ 
-}
+SiPixelRecHitModule::SiPixelRecHitModule(const uint32_t &id) : id_(id) {}
 
 //
 // Destructor
@@ -47,10 +43,13 @@ SiPixelRecHitModule::~SiPixelRecHitModule() {}
 //
 // Book histograms
 //
-void SiPixelRecHitModule::book(const edm::ParameterSet& iConfig, DQMStore::IBooker & iBooker, const edm::EventSetup& iSetup, int type, 
-                               bool twoD, bool reducedSet, bool isUpgrade) {
-
-
+void SiPixelRecHitModule::book(const edm::ParameterSet &iConfig,
+                               DQMStore::IBooker &iBooker,
+                               const edm::EventSetup &iSetup,
+                               int type,
+                               bool twoD,
+                               bool reducedSet,
+                               bool isUpgrade) {
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
   const TrackerTopology *pTT = tTopoHandle.product();
@@ -59,223 +58,214 @@ void SiPixelRecHitModule::book(const edm::ParameterSet& iConfig, DQMStore::IBook
   bool endcap = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap);
   bool isHalfModule = false;
 
-
-  if(barrel){
-    //if (!isUpgrade) {
-    isHalfModule = PixelBarrelName(DetId(id_), pTT, isUpgrade).isHalfModule(); 
+  if (barrel) {
+    // if (!isUpgrade) {
+    isHalfModule = PixelBarrelName(DetId(id_), pTT, isUpgrade).isHalfModule();
     //} else if (isUpgrade) {
-    //  isHalfModule = PixelBarrelNameUpgrade(DetId(id_)).isHalfModule(); 
+    //  isHalfModule = PixelBarrelNameUpgrade(DetId(id_)).isHalfModule();
     //}
   }
 
   std::string hid;
   // Get collection name and instantiate Histo Id builder
-  edm::InputTag src = iConfig.getParameter<edm::InputTag>( "src" );
+  edm::InputTag src = iConfig.getParameter<edm::InputTag>("src");
   // Get DQM interface
 
-
-  if(type==0){
-    SiPixelHistogramId* theHistogramId = new SiPixelHistogramId( src.label() );
-	if(!reducedSet)
-	{
-    if(twoD){
-      // XYPosition
-      hid = theHistogramId->setHistoId("xypos",id_);
-      meXYPos_ = iBooker.book2D(hid,"XY Position",100,-1.,1,100,-4,4);
-      meXYPos_->setAxisTitle("X Position",1);
-      meXYPos_->setAxisTitle("Y Position",2);
-    }
-    else{
-      // projections of XYPosition
-      hid = theHistogramId->setHistoId("xypos",id_);
-      meXYPos_px_ = iBooker.book1D(hid+"_px","X Position",100,-1.,1);
-      meXYPos_px_->setAxisTitle("X Position",1);
-      meXYPos_py_ = iBooker.book1D(hid+"_py","Y Position",100,-4,4);
-      meXYPos_py_->setAxisTitle("Y Position",1);
+  if (type == 0) {
+    SiPixelHistogramId *theHistogramId = new SiPixelHistogramId(src.label());
+    if (!reducedSet) {
+      if (twoD) {
+        // XYPosition
+        hid = theHistogramId->setHistoId("xypos", id_);
+        meXYPos_ = iBooker.book2D(hid, "XY Position", 100, -1., 1, 100, -4, 4);
+        meXYPos_->setAxisTitle("X Position", 1);
+        meXYPos_->setAxisTitle("Y Position", 2);
+      } else {
+        // projections of XYPosition
+        hid = theHistogramId->setHistoId("xypos", id_);
+        meXYPos_px_ = iBooker.book1D(hid + "_px", "X Position", 100, -1., 1);
+        meXYPos_px_->setAxisTitle("X Position", 1);
+        meXYPos_py_ = iBooker.book1D(hid + "_py", "Y Position", 100, -4, 4);
+        meXYPos_py_->setAxisTitle("Y Position", 1);
+      }
     }
-	}
-    hid = theHistogramId->setHistoId("ClustX",id_);
+    hid = theHistogramId->setHistoId("ClustX", id_);
     meClustX_ = iBooker.book1D(hid, "RecHit X size", 10, 0., 10.);
     meClustX_->setAxisTitle("RecHit size X dimension", 1);
-    hid = theHistogramId->setHistoId("ClustY",id_);
+    hid = theHistogramId->setHistoId("ClustY", id_);
     meClustY_ = iBooker.book1D(hid, "RecHit Y size", 15, 0., 15.);
-    meClustY_->setAxisTitle("RecHit size Y dimension", 1); 
+    meClustY_->setAxisTitle("RecHit size Y dimension", 1);
 
-    hid = theHistogramId->setHistoId("ErrorX",id_);
-    meErrorX_ = iBooker.book1D(hid, "RecHit error X", 100,0.,0.02);
+    hid = theHistogramId->setHistoId("ErrorX", id_);
+    meErrorX_ = iBooker.book1D(hid, "RecHit error X", 100, 0., 0.02);
     meErrorX_->setAxisTitle("RecHit error X", 1);
-    hid = theHistogramId->setHistoId("ErrorY",id_);
-    meErrorY_ = iBooker.book1D(hid, "RecHit error Y", 100,0.,0.02);
+    hid = theHistogramId->setHistoId("ErrorY", id_);
+    meErrorY_ = iBooker.book1D(hid, "RecHit error Y", 100, 0., 0.02);
     meErrorY_->setAxisTitle("RecHit error Y", 1);
 
-    //Removed to save offline memory
-    //hid = theHistogramId->setHistoId("nRecHits",id_);
-    //menRecHits_ = iBooker.book1D(hid, "# of rechits in this module", 8, 0, 8);
-    //menRecHits_->setAxisTitle("number of rechits",1);  
+    // Removed to save offline memory
+    // hid = theHistogramId->setHistoId("nRecHits",id_);
+    // menRecHits_ = iBooker.book1D(hid, "# of rechits in this module", 8, 0,
+    // 8); menRecHits_->setAxisTitle("number of rechits",1);
     delete theHistogramId;
   }
 
-  if(type==1 && barrel){
+  if (type == 1 && barrel) {
     uint32_t DBladder;
-    //if (!isUpgrade) { DBladder = PixelBarrelName(DetId(id_)).ladderName(); }
-    //else { DBladder = PixelBarrelNameUpgrade(DetId(id_)).ladderName(); }
+    // if (!isUpgrade) { DBladder = PixelBarrelName(DetId(id_)).ladderName(); }
+    // else { DBladder = PixelBarrelNameUpgrade(DetId(id_)).ladderName(); }
     DBladder = PixelBarrelName(DetId(id_), pTT, isUpgrade).ladderName();
-    char sladder[80]; sprintf(sladder,"Ladder_%02i",DBladder);
+    char sladder[80];
+    sprintf(sladder, "Ladder_%02i", DBladder);
     hid = src.label() + "_" + sladder;
-    if(isHalfModule) hid += "H";
-    else hid += "F";
-	if(!reducedSet)
-	{
-    if(twoD){
-      meXYPosLad_ = iBooker.book2D("xypos_" + hid,"XY Position",100,-1.,1,100,-4,4);
-      meXYPosLad_->setAxisTitle("X Position",1);
-      meXYPosLad_->setAxisTitle("Y Position",2);
+    if (isHalfModule)
+      hid += "H";
+    else
+      hid += "F";
+    if (!reducedSet) {
+      if (twoD) {
+        meXYPosLad_ = iBooker.book2D("xypos_" + hid, "XY Position", 100, -1., 1, 100, -4, 4);
+        meXYPosLad_->setAxisTitle("X Position", 1);
+        meXYPosLad_->setAxisTitle("Y Position", 2);
+      } else {
+        // projections of XYPosition
+        meXYPosLad_px_ = iBooker.book1D("xypos_" + hid + "_px", "X Position", 100, -1., 1);
+        meXYPosLad_px_->setAxisTitle("X Position", 1);
+        meXYPosLad_py_ = iBooker.book1D("xypos_" + hid + "_py", "Y Position", 100, -4, 4);
+        meXYPosLad_py_->setAxisTitle("Y Position", 1);
+      }
     }
-    else{
-      // projections of XYPosition
-      meXYPosLad_px_ = iBooker.book1D("xypos_"+hid+"_px","X Position",100,-1.,1);
-      meXYPosLad_px_->setAxisTitle("X Position",1);
-      meXYPosLad_py_ = iBooker.book1D("xypos_"+hid+"_py","Y Position",100,-4,4);
-      meXYPosLad_py_->setAxisTitle("Y Position",1);
-    }
-	}
-    meClustXLad_ = iBooker.book1D("ClustX_" +hid, "RecHit X size", 10, 0., 10.);
+    meClustXLad_ = iBooker.book1D("ClustX_" + hid, "RecHit X size", 10, 0., 10.);
     meClustXLad_->setAxisTitle("RecHit size X dimension", 1);
-    meClustYLad_ = iBooker.book1D("ClustY_" +hid,"RecHit Y size", 15, 0.,15.);
+    meClustYLad_ = iBooker.book1D("ClustY_" + hid, "RecHit Y size", 15, 0., 15.);
     meClustYLad_->setAxisTitle("RecHit size Y dimension", 1);
-    meErrorXLad_ = iBooker.book1D("ErrorX_"+hid, "RecHit error X", 100,0.,0.02);
+    meErrorXLad_ = iBooker.book1D("ErrorX_" + hid, "RecHit error X", 100, 0., 0.02);
     meErrorXLad_->setAxisTitle("RecHit error X", 1);
-    meErrorYLad_ = iBooker.book1D("ErrorY_"+hid, "RecHit error Y", 100,0.,0.02);
+    meErrorYLad_ = iBooker.book1D("ErrorY_" + hid, "RecHit error Y", 100, 0., 0.02);
     meErrorYLad_->setAxisTitle("RecHit error Y", 1);
-    menRecHitsLad_ = iBooker.book1D("nRecHits_"+hid, "# of rechits in this module", 8, 0, 8);
-    menRecHitsLad_->setAxisTitle("number of rechits",1);
-
+    menRecHitsLad_ = iBooker.book1D("nRecHits_" + hid, "# of rechits in this module", 8, 0, 8);
+    menRecHitsLad_->setAxisTitle("number of rechits", 1);
   }
 
-  if(type==2 && barrel){
-    
+  if (type == 2 && barrel) {
     uint32_t DBlayer;
-    //if (!isUpgrade) { DBlayer = PixelBarrelName(DetId(id_)).layerName(); }
-    //else { DBlayer = PixelBarrelNameUpgrade(DetId(id_)).layerName(); }
+    // if (!isUpgrade) { DBlayer = PixelBarrelName(DetId(id_)).layerName(); }
+    // else { DBlayer = PixelBarrelNameUpgrade(DetId(id_)).layerName(); }
     DBlayer = PixelBarrelName(DetId(id_), pTT, isUpgrade).layerName();
-    char slayer[80]; sprintf(slayer,"Layer_%i",DBlayer);
+    char slayer[80];
+    sprintf(slayer, "Layer_%i", DBlayer);
     hid = src.label() + "_" + slayer;
-    
-	if(!reducedSet)
-	{
-    if(twoD){
-      meXYPosLay_ = iBooker.book2D("xypos_" + hid,"XY Position",100,-1.,1,100,-4,4);
-      meXYPosLay_->setAxisTitle("X Position",1);
-      meXYPosLay_->setAxisTitle("Y Position",2);
-    }
-    else{
-      // projections of XYPosition
-      meXYPosLay_px_ = iBooker.book1D("xypos_"+hid+"_px","X Position",100,-1.,1);
-      meXYPosLay_px_->setAxisTitle("X Position",1);
-      meXYPosLay_py_ = iBooker.book1D("xypos_"+hid+"_py","Y Position",100,-4,4);
-      meXYPosLay_py_->setAxisTitle("Y Position",1);
+
+    if (!reducedSet) {
+      if (twoD) {
+        meXYPosLay_ = iBooker.book2D("xypos_" + hid, "XY Position", 100, -1., 1, 100, -4, 4);
+        meXYPosLay_->setAxisTitle("X Position", 1);
+        meXYPosLay_->setAxisTitle("Y Position", 2);
+      } else {
+        // projections of XYPosition
+        meXYPosLay_px_ = iBooker.book1D("xypos_" + hid + "_px", "X Position", 100, -1., 1);
+        meXYPosLay_px_->setAxisTitle("X Position", 1);
+        meXYPosLay_py_ = iBooker.book1D("xypos_" + hid + "_py", "Y Position", 100, -4, 4);
+        meXYPosLay_py_->setAxisTitle("Y Position", 1);
+      }
     }
-	}
 
-    meClustXLay_ = iBooker.book1D("ClustX_" +hid, "RecHit X size", 10, 0., 10.);
+    meClustXLay_ = iBooker.book1D("ClustX_" + hid, "RecHit X size", 10, 0., 10.);
     meClustXLay_->setAxisTitle("RecHit size X dimension", 1);
-    meClustYLay_ = iBooker.book1D("ClustY_" +hid,"RecHit Y size", 15, 0.,15.);
+    meClustYLay_ = iBooker.book1D("ClustY_" + hid, "RecHit Y size", 15, 0., 15.);
     meClustYLay_->setAxisTitle("RecHit size Y dimension", 1);
-    meErrorXLay_ = iBooker.book1D("ErrorX_"+hid, "RecHit error X", 100,0.,0.02);
+    meErrorXLay_ = iBooker.book1D("ErrorX_" + hid, "RecHit error X", 100, 0., 0.02);
     meErrorXLay_->setAxisTitle("RecHit error X", 1);
-    meErrorYLay_ = iBooker.book1D("ErrorY_"+hid, "RecHit error Y", 100,0.,0.02);
+    meErrorYLay_ = iBooker.book1D("ErrorY_" + hid, "RecHit error Y", 100, 0., 0.02);
     meErrorYLay_->setAxisTitle("RecHit error Y", 1);
-    menRecHitsLay_ = iBooker.book1D("nRecHits_"+hid, "# of rechits in this module", 8, 0, 8);
-    menRecHitsLay_->setAxisTitle("number of rechits",1);
-
+    menRecHitsLay_ = iBooker.book1D("nRecHits_" + hid, "# of rechits in this module", 8, 0, 8);
+    menRecHitsLay_->setAxisTitle("number of rechits", 1);
   }
 
-  if(type==3 && barrel){
+  if (type == 3 && barrel) {
     uint32_t DBmodule;
-    //if (!isUpgrade) { DBmodule = PixelBarrelName(DetId(id_)).moduleName(); }
-    //else { DBmodule = PixelBarrelNameUpgrade(DetId(id_)).moduleName(); }
+    // if (!isUpgrade) { DBmodule = PixelBarrelName(DetId(id_)).moduleName(); }
+    // else { DBmodule = PixelBarrelNameUpgrade(DetId(id_)).moduleName(); }
     DBmodule = PixelBarrelName(DetId(id_), pTT, isUpgrade).moduleName();
-    char smodule[80]; sprintf(smodule,"Ring_%i",DBmodule);
+    char smodule[80];
+    sprintf(smodule, "Ring_%i", DBmodule);
     hid = src.label() + "_" + smodule;
-    
-	if(!reducedSet)
-	{
-    if(twoD){
-      meXYPosPhi_ = iBooker.book2D("xypos_" + hid,"XY Position",100,-1.,1,100,-4,4);
-      meXYPosPhi_->setAxisTitle("X Position",1);
-      meXYPosPhi_->setAxisTitle("Y Position",2);
-    }
-    else{
-      // projections of XYPosition
-      meXYPosPhi_px_ = iBooker.book1D("xypos_"+hid+"_px","X Position",100,-1.,1);
-      meXYPosPhi_px_->setAxisTitle("X Position",1);
-      meXYPosPhi_py_ = iBooker.book1D("xypos_"+hid+"_py","Y Position",100,-4,4);
-      meXYPosPhi_py_->setAxisTitle("Y Position",1);
+
+    if (!reducedSet) {
+      if (twoD) {
+        meXYPosPhi_ = iBooker.book2D("xypos_" + hid, "XY Position", 100, -1., 1, 100, -4, 4);
+        meXYPosPhi_->setAxisTitle("X Position", 1);
+        meXYPosPhi_->setAxisTitle("Y Position", 2);
+      } else {
+        // projections of XYPosition
+        meXYPosPhi_px_ = iBooker.book1D("xypos_" + hid + "_px", "X Position", 100, -1., 1);
+        meXYPosPhi_px_->setAxisTitle("X Position", 1);
+        meXYPosPhi_py_ = iBooker.book1D("xypos_" + hid + "_py", "Y Position", 100, -4, 4);
+        meXYPosPhi_py_->setAxisTitle("Y Position", 1);
+      }
     }
-	}
-    meClustXPhi_ = iBooker.book1D("ClustX_" +hid, "RecHit X size", 10, 0., 10.);
+    meClustXPhi_ = iBooker.book1D("ClustX_" + hid, "RecHit X size", 10, 0., 10.);
     meClustXPhi_->setAxisTitle("RecHit size X dimension", 1);
-    meClustYPhi_ = iBooker.book1D("ClustY_" +hid,"RecHit Y size", 15, 0.,15.);
+    meClustYPhi_ = iBooker.book1D("ClustY_" + hid, "RecHit Y size", 15, 0., 15.);
     meClustYPhi_->setAxisTitle("RecHit size Y dimension", 1);
-    meErrorXPhi_ = iBooker.book1D("ErrorX_"+hid, "RecHit error X", 100,0.,0.02);
+    meErrorXPhi_ = iBooker.book1D("ErrorX_" + hid, "RecHit error X", 100, 0., 0.02);
     meErrorXPhi_->setAxisTitle("RecHit error X", 1);
-    meErrorYPhi_ = iBooker.book1D("ErrorY_"+hid, "RecHit error Y", 100,0.,0.02);
+    meErrorYPhi_ = iBooker.book1D("ErrorY_" + hid, "RecHit error Y", 100, 0., 0.02);
     meErrorYPhi_->setAxisTitle("RecHit error Y", 1);
-    menRecHitsPhi_ = iBooker.book1D("nRecHits_"+hid, "# of rechits in this module", 8, 0, 8);
-    menRecHitsPhi_->setAxisTitle("number of rechits",1);
-
+    menRecHitsPhi_ = iBooker.book1D("nRecHits_" + hid, "# of rechits in this module", 8, 0, 8);
+    menRecHitsPhi_->setAxisTitle("number of rechits", 1);
   }
 
-  if(type==4 && endcap){
+  if (type == 4 && endcap) {
     uint32_t blade;
-    //if (!isUpgrade) { blade= PixelEndcapName(DetId(id_)).bladeName(); }
-    //else { blade= PixelEndcapNameUpgrade(DetId(id_)).bladeName(); }
-    blade= PixelEndcapName(DetId(id_), pTT, isUpgrade).bladeName();
-    
-    char sblade[80]; sprintf(sblade, "Blade_%02i",blade);
+    // if (!isUpgrade) { blade= PixelEndcapName(DetId(id_)).bladeName(); }
+    // else { blade= PixelEndcapNameUpgrade(DetId(id_)).bladeName(); }
+    blade = PixelEndcapName(DetId(id_), pTT, isUpgrade).bladeName();
+
+    char sblade[80];
+    sprintf(sblade, "Blade_%02i", blade);
     hid = src.label() + "_" + sblade;
-//     meXYPosBlade_ = iBooker.book2D("xypos_" + hid,"XY Position",100,-1.,1,100,-4,4);
-//     meXYPosBlade_->setAxisTitle("X Position",1);
-//     meXYPosBlade_->setAxisTitle("Y Position",2);
+    //     meXYPosBlade_ = iBooker.book2D("xypos_" + hid,"XY
+    //     Position",100,-1.,1,100,-4,4); meXYPosBlade_->setAxisTitle("X
+    //     Position",1); meXYPosBlade_->setAxisTitle("Y Position",2);
 
-    meClustXBlade_ = iBooker.book1D("ClustX_" +hid, "RecHit X size", 10, 0., 10.);
+    meClustXBlade_ = iBooker.book1D("ClustX_" + hid, "RecHit X size", 10, 0., 10.);
     meClustXBlade_->setAxisTitle("RecHit size X dimension", 1);
-    meClustYBlade_ = iBooker.book1D("ClustY_" +hid,"RecHit Y size", 15, 0.,15.);
+    meClustYBlade_ = iBooker.book1D("ClustY_" + hid, "RecHit Y size", 15, 0., 15.);
     meClustYBlade_->setAxisTitle("RecHit size Y dimension", 1);
-    meErrorXBlade_ = iBooker.book1D("ErrorX_"+hid, "RecHit error X", 100,0.,0.02);
+    meErrorXBlade_ = iBooker.book1D("ErrorX_" + hid, "RecHit error X", 100, 0., 0.02);
     meErrorXBlade_->setAxisTitle("RecHit error X", 1);
-    meErrorYBlade_ = iBooker.book1D("ErrorY_"+hid, "RecHit error Y", 100,0.,0.02);
+    meErrorYBlade_ = iBooker.book1D("ErrorY_" + hid, "RecHit error Y", 100, 0., 0.02);
     meErrorYBlade_->setAxisTitle("RecHit error Y", 1);
-    menRecHitsBlade_ = iBooker.book1D("nRecHits_"+hid, "# of rechits in this module", 8, 0, 8);
-    menRecHitsBlade_->setAxisTitle("number of rechits",1);
-
+    menRecHitsBlade_ = iBooker.book1D("nRecHits_" + hid, "# of rechits in this module", 8, 0, 8);
+    menRecHitsBlade_->setAxisTitle("number of rechits", 1);
   }
-  if(type==5 && endcap){
+  if (type == 5 && endcap) {
     uint32_t disk;
-    //if (!isUpgrade) { disk = PixelEndcapName(DetId(id_)).diskName(); }
-    //else { disk = PixelEndcapNameUpgrade(DetId(id_)).diskName(); }
+    // if (!isUpgrade) { disk = PixelEndcapName(DetId(id_)).diskName(); }
+    // else { disk = PixelEndcapNameUpgrade(DetId(id_)).diskName(); }
     disk = PixelEndcapName(DetId(id_), pTT, isUpgrade).diskName();
-    
-    char sdisk[80]; sprintf(sdisk, "Disk_%i",disk);
+
+    char sdisk[80];
+    sprintf(sdisk, "Disk_%i", disk);
     hid = src.label() + "_" + sdisk;
-//     meXYPosDisk_ = iBooker.book2D("xypos_" + hid,"XY Position",100,-1.,1,100,-4,4);
-//     meXYPosDisk_->setAxisTitle("X Position",1);
-//     meXYPosDisk_->setAxisTitle("Y Position",2);
+    //     meXYPosDisk_ = iBooker.book2D("xypos_" + hid,"XY
+    //     Position",100,-1.,1,100,-4,4); meXYPosDisk_->setAxisTitle("X
+    //     Position",1); meXYPosDisk_->setAxisTitle("Y Position",2);
 
-    meClustXDisk_ = iBooker.book1D("ClustX_" +hid, "RecHit X size", 10, 0., 10.);
+    meClustXDisk_ = iBooker.book1D("ClustX_" + hid, "RecHit X size", 10, 0., 10.);
     meClustXDisk_->setAxisTitle("RecHit size X dimension", 1);
-    meClustYDisk_ = iBooker.book1D("ClustY_" +hid,"RecHit Y size", 15, 0.,15.);
+    meClustYDisk_ = iBooker.book1D("ClustY_" + hid, "RecHit Y size", 15, 0., 15.);
     meClustYDisk_->setAxisTitle("RecHit size Y dimension", 1);
-    meErrorXDisk_ = iBooker.book1D("ErrorX_"+hid, "RecHit error X", 100,0.,0.02);
+    meErrorXDisk_ = iBooker.book1D("ErrorX_" + hid, "RecHit error X", 100, 0., 0.02);
     meErrorXDisk_->setAxisTitle("RecHit error X", 1);
-    meErrorYDisk_ = iBooker.book1D("ErrorY_"+hid, "RecHit error Y", 100,0.,0.02);
+    meErrorYDisk_ = iBooker.book1D("ErrorY_" + hid, "RecHit error Y", 100, 0., 0.02);
     meErrorYDisk_->setAxisTitle("RecHit error Y", 1);
-    menRecHitsDisk_ = iBooker.book1D("nRecHits_"+hid, "# of rechits in this module", 8, 0, 8);
-    menRecHitsDisk_->setAxisTitle("number of rechits",1);
-
+    menRecHitsDisk_ = iBooker.book1D("nRecHits_" + hid, "# of rechits in this module", 8, 0, 8);
+    menRecHitsDisk_->setAxisTitle("number of rechits", 1);
   }
 
-  if(type==6 && endcap){
+  if (type == 6 && endcap) {
     uint32_t panel;
     uint32_t module;
     /*if (!isUpgrade) {
@@ -285,160 +275,172 @@ void SiPixelRecHitModule::book(const edm::ParameterSet& iConfig, DQMStore::IBook
       panel= PixelEndcapNameUpgrade(DetId(id_)).pannelName();
       module= PixelEndcapNameUpgrade(DetId(id_)).plaquetteName();
     }*/
-    panel= PixelEndcapName(DetId(id_), pTT, isUpgrade).pannelName();
-    module= PixelEndcapName(DetId(id_), pTT, isUpgrade).plaquetteName();
-    
-    char slab[80]; sprintf(slab, "Panel_%i_Ring_%i",panel, module);
+    panel = PixelEndcapName(DetId(id_), pTT, isUpgrade).pannelName();
+    module = PixelEndcapName(DetId(id_), pTT, isUpgrade).plaquetteName();
+
+    char slab[80];
+    sprintf(slab, "Panel_%i_Ring_%i", panel, module);
     hid = src.label() + "_" + slab;
-    
-	if(!reducedSet)
-	{
-    if(twoD){
-      meXYPosRing_ = iBooker.book2D("xypos_" + hid,"XY Position",100,-1.,1,100,-4,4);
-      meXYPosRing_->setAxisTitle("X Position",1);
-      meXYPosRing_->setAxisTitle("Y Position",2);
-    }
-    else{
-      // projections of XYPosition
-      meXYPosRing_px_ = iBooker.book1D("xypos_"+hid+"_px","X Position",100,-1.,1);
-      meXYPosRing_px_->setAxisTitle("X Position",1);
-      meXYPosRing_py_ = iBooker.book1D("xypos_"+hid+"_py","Y Position",100,-4,4);
-      meXYPosRing_py_->setAxisTitle("Y Position",1);
+
+    if (!reducedSet) {
+      if (twoD) {
+        meXYPosRing_ = iBooker.book2D("xypos_" + hid, "XY Position", 100, -1., 1, 100, -4, 4);
+        meXYPosRing_->setAxisTitle("X Position", 1);
+        meXYPosRing_->setAxisTitle("Y Position", 2);
+      } else {
+        // projections of XYPosition
+        meXYPosRing_px_ = iBooker.book1D("xypos_" + hid + "_px", "X Position", 100, -1., 1);
+        meXYPosRing_px_->setAxisTitle("X Position", 1);
+        meXYPosRing_py_ = iBooker.book1D("xypos_" + hid + "_py", "Y Position", 100, -4, 4);
+        meXYPosRing_py_->setAxisTitle("Y Position", 1);
+      }
     }
-	}
-    meClustXRing_ = iBooker.book1D("ClustX_" +hid, "RecHit X size", 10, 0., 10.);
+    meClustXRing_ = iBooker.book1D("ClustX_" + hid, "RecHit X size", 10, 0., 10.);
     meClustXRing_->setAxisTitle("RecHit size X dimension", 1);
-    meClustYRing_ = iBooker.book1D("ClustY_" +hid,"RecHit Y size", 15, 0.,15.);
+    meClustYRing_ = iBooker.book1D("ClustY_" + hid, "RecHit Y size", 15, 0., 15.);
     meClustYRing_->setAxisTitle("RecHit size Y dimension", 1);
-    meErrorXRing_ = iBooker.book1D("ErrorX_"+hid, "RecHit error X", 100,0.,0.02);
+    meErrorXRing_ = iBooker.book1D("ErrorX_" + hid, "RecHit error X", 100, 0., 0.02);
     meErrorXRing_->setAxisTitle("RecHit error X", 1);
-    meErrorYRing_ = iBooker.book1D("ErrorY_"+hid, "RecHit error Y", 100,0.,0.02);
+    meErrorYRing_ = iBooker.book1D("ErrorY_" + hid, "RecHit error Y", 100, 0., 0.02);
     meErrorYRing_->setAxisTitle("RecHit error Y", 1);
-    menRecHitsRing_ = iBooker.book1D("nRecHits_"+hid, "# of rechits in this module", 8, 0, 8);
-    menRecHitsRing_->setAxisTitle("number of rechits",1);
-
+    menRecHitsRing_ = iBooker.book1D("nRecHits_" + hid, "# of rechits in this module", 8, 0, 8);
+    menRecHitsRing_->setAxisTitle("number of rechits", 1);
   }
-
 }
 //
 // Fill histograms
 //
-void SiPixelRecHitModule::fill(const float& rechit_x, const float& rechit_y, 
-                               const int& sizeX, const int& sizeY, 
-			       const float& lerr_x, const float& lerr_y, 
-			       bool modon, bool ladon, bool layon, bool phion, 
-			       bool bladeon, bool diskon, bool ringon, 
-			       bool twoD, bool reducedSet) {
-
+void SiPixelRecHitModule::fill(const float &rechit_x,
+                               const float &rechit_y,
+                               const int &sizeX,
+                               const int &sizeY,
+                               const float &lerr_x,
+                               const float &lerr_y,
+                               bool modon,
+                               bool ladon,
+                               bool layon,
+                               bool phion,
+                               bool bladeon,
+                               bool diskon,
+                               bool ringon,
+                               bool twoD,
+                               bool reducedSet) {
   bool barrel = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel);
   bool endcap = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap);
 
-  //std::cout << rechit_x << " " << rechit_y << " " << sizeX << " " << sizeY << std::endl;
-  if(modon){
+  // std::cout << rechit_x << " " << rechit_y << " " << sizeX << " " << sizeY <<
+  // std::endl;
+  if (modon) {
     meClustX_->Fill(sizeX);
     meClustY_->Fill(sizeY);
     meErrorX_->Fill(lerr_x);
-    meErrorY_->Fill(lerr_y);  
-	if(!reducedSet)
-	{
-    if(twoD) meXYPos_->Fill(rechit_x, rechit_y);
-    else {
-      meXYPos_px_->Fill(rechit_x); 
-      meXYPos_py_->Fill(rechit_y);
+    meErrorY_->Fill(lerr_y);
+    if (!reducedSet) {
+      if (twoD)
+        meXYPos_->Fill(rechit_x, rechit_y);
+      else {
+        meXYPos_px_->Fill(rechit_x);
+        meXYPos_py_->Fill(rechit_y);
+      }
     }
-	}
   }
-  //std::cout<<"number of detector units="<<numberOfDetUnits<<std::endl;
+  // std::cout<<"number of detector units="<<numberOfDetUnits<<std::endl;
 
-  if(ladon && barrel){
+  if (ladon && barrel) {
     meClustXLad_->Fill(sizeX);
     meClustYLad_->Fill(sizeY);
     meErrorXLad_->Fill(lerr_x);
-    meErrorYLad_->Fill(lerr_y);  
-	if(!reducedSet)
-	{
-    if(twoD) meXYPosLad_->Fill(rechit_x, rechit_y);
-    else{
-      meXYPosLad_px_->Fill(rechit_x); 
-      meXYPosLad_py_->Fill(rechit_y);
+    meErrorYLad_->Fill(lerr_y);
+    if (!reducedSet) {
+      if (twoD)
+        meXYPosLad_->Fill(rechit_x, rechit_y);
+      else {
+        meXYPosLad_px_->Fill(rechit_x);
+        meXYPosLad_py_->Fill(rechit_y);
+      }
     }
-	}
   }
 
-  if(layon && barrel){
+  if (layon && barrel) {
     meClustXLay_->Fill(sizeX);
     meClustYLay_->Fill(sizeY);
     meErrorXLay_->Fill(lerr_x);
-    meErrorYLay_->Fill(lerr_y); 
-	if(!reducedSet)
-	{
-    if(twoD) meXYPosLay_->Fill(rechit_x, rechit_y);
-    else{
-      meXYPosLay_px_->Fill(rechit_x); 
-      meXYPosLay_py_->Fill(rechit_y);
+    meErrorYLay_->Fill(lerr_y);
+    if (!reducedSet) {
+      if (twoD)
+        meXYPosLay_->Fill(rechit_x, rechit_y);
+      else {
+        meXYPosLay_px_->Fill(rechit_x);
+        meXYPosLay_py_->Fill(rechit_y);
+      }
     }
-	}
   }
 
-  if(phion && barrel){
+  if (phion && barrel) {
     meClustXPhi_->Fill(sizeX);
     meClustYPhi_->Fill(sizeY);
     meErrorXPhi_->Fill(lerr_x);
-    meErrorYPhi_->Fill(lerr_y); 
-    if(!reducedSet)
-	{
-    if(twoD) meXYPosPhi_->Fill(rechit_x, rechit_y);
-    else{
-      meXYPosPhi_px_->Fill(rechit_x); 
-      meXYPosPhi_py_->Fill(rechit_y);
+    meErrorYPhi_->Fill(lerr_y);
+    if (!reducedSet) {
+      if (twoD)
+        meXYPosPhi_->Fill(rechit_x, rechit_y);
+      else {
+        meXYPosPhi_px_->Fill(rechit_x);
+        meXYPosPhi_py_->Fill(rechit_y);
+      }
     }
-	}	
   }
 
-  if(bladeon && endcap){
-    //meXYPosBlade_->Fill(rechit_x, rechit_y);
+  if (bladeon && endcap) {
+    // meXYPosBlade_->Fill(rechit_x, rechit_y);
     meClustXBlade_->Fill(sizeX);
     meClustYBlade_->Fill(sizeY);
     meErrorXBlade_->Fill(lerr_x);
-    meErrorYBlade_->Fill(lerr_y); 
+    meErrorYBlade_->Fill(lerr_y);
   }
 
-  if(diskon && endcap){
-    //meXYPosDisk_->Fill(rechit_x, rechit_y);
+  if (diskon && endcap) {
+    // meXYPosDisk_->Fill(rechit_x, rechit_y);
     meClustXDisk_->Fill(sizeX);
     meClustYDisk_->Fill(sizeY);
     meErrorXDisk_->Fill(lerr_x);
-    meErrorYDisk_->Fill(lerr_y); 
+    meErrorYDisk_->Fill(lerr_y);
   }
 
-  if(ringon && endcap){
+  if (ringon && endcap) {
     meClustXRing_->Fill(sizeX);
     meClustYRing_->Fill(sizeY);
     meErrorXRing_->Fill(lerr_x);
-    meErrorYRing_->Fill(lerr_y); 
-	if(!reducedSet)
-	{
-    if(twoD) meXYPosRing_->Fill(rechit_x, rechit_y);
-    else{
-      meXYPosRing_px_->Fill(rechit_x); 
-      meXYPosRing_py_->Fill(rechit_y);
+    meErrorYRing_->Fill(lerr_y);
+    if (!reducedSet) {
+      if (twoD)
+        meXYPosRing_->Fill(rechit_x, rechit_y);
+      else {
+        meXYPosRing_px_->Fill(rechit_x);
+        meXYPosRing_py_->Fill(rechit_y);
+      }
     }
-	}	
   }
 }
 
-void SiPixelRecHitModule::nfill(const int& nrec, bool modon, bool ladon, bool layon, bool phion, bool bladeon, bool diskon, bool ringon) {
-  
+void SiPixelRecHitModule::nfill(
+    const int &nrec, bool modon, bool ladon, bool layon, bool phion, bool bladeon, bool diskon, bool ringon) {
   bool barrel = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel);
   bool endcap = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap);
 
-  //if(modon) menRecHits_->Fill(nrec);
-  //barrel
-  if(ladon && barrel) menRecHitsLad_->Fill(nrec);
-  if(layon && barrel) menRecHitsLay_->Fill(nrec);
-  if(phion && barrel) menRecHitsPhi_->Fill(nrec);
-  //endcap
-  if(bladeon && endcap) menRecHitsBlade_->Fill(nrec);
-  if(diskon && endcap) menRecHitsDisk_->Fill(nrec);
-  if(ringon && endcap) menRecHitsRing_->Fill(nrec);
+  // if(modon) menRecHits_->Fill(nrec);
+  // barrel
+  if (ladon && barrel)
+    menRecHitsLad_->Fill(nrec);
+  if (layon && barrel)
+    menRecHitsLay_->Fill(nrec);
+  if (phion && barrel)
+    menRecHitsPhi_->Fill(nrec);
+  // endcap
+  if (bladeon && endcap)
+    menRecHitsBlade_->Fill(nrec);
+  if (diskon && endcap)
+    menRecHitsDisk_->Fill(nrec);
+  if (ringon && endcap)
+    menRecHitsRing_->Fill(nrec);
 }
diff --git a/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitSource.cc b/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitSource.cc
index ddc363deb004d..5105ac1eae25b 100644
--- a/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitSource.cc
+++ b/DQM/SiPixelMonitorRecHit/src/SiPixelRecHitSource.cc
@@ -2,98 +2,91 @@
 //
 // Package:    SiPixelMonitorRecHits
 // Class:      SiPixelRecHitSource
-// 
-/**\class 
+//
+/**\class
 
  Description: Pixel DQM source for RecHits
 
  Implementation:
      Originally based on the code for Digis, adapted
-	to read RecHits and create relevant histograms
+        to read RecHits and create relevant histograms
 */
 //
 // Original Author:  Vincenzo Chiochia
-//         Created:  
+//         Created:
 //
 //
 // Adapted by:  Keith Rose
 //  	For use in SiPixelMonitorClient for RecHits
 // Updated by: Lukas Wehrli
-// for pixel offline DQM 
+// for pixel offline DQM
 
 #include "DQM/SiPixelMonitorRecHit/interface/SiPixelRecHitSource.h"
 // Framework
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 // DQM Framework
 #include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 // Geometry
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
+#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 // DataFormats
 #include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h"
+#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 
 //
-#include <string>
 #include <cstdlib>
 #include <iostream>
+#include <string>
 using namespace std;
 using namespace edm;
 
-SiPixelRecHitSource::SiPixelRecHitSource(const edm::ParameterSet& iConfig) :
-  conf_(iConfig),
-  src_( consumes<SiPixelRecHitCollection>( conf_.getParameter<edm::InputTag>( "src" ))),
-  saveFile( conf_.getUntrackedParameter<bool>("saveFile",false) ),
-  isPIB( conf_.getUntrackedParameter<bool>("isPIB",false) ),
-  slowDown( conf_.getUntrackedParameter<bool>("slowDown",false) ),
-  modOn( conf_.getUntrackedParameter<bool>("modOn",true) ),
-  twoDimOn( conf_.getUntrackedParameter<bool>("twoDimOn",true) ),
-  reducedSet( conf_.getUntrackedParameter<bool>("reducedSet",false) ),
-  ladOn( conf_.getUntrackedParameter<bool>("ladOn",false) ), 
-  layOn( conf_.getUntrackedParameter<bool>("layOn",false) ), 
-  phiOn( conf_.getUntrackedParameter<bool>("phiOn",false) ), 
-  ringOn( conf_.getUntrackedParameter<bool>("ringOn",false) ), 
-  bladeOn( conf_.getUntrackedParameter<bool>("bladeOn",false) ), 
-  diskOn( conf_.getUntrackedParameter<bool>("diskOn",false) ), 
-  isUpgrade( conf_.getUntrackedParameter<bool>("isUpgrade",false) )
-{
+SiPixelRecHitSource::SiPixelRecHitSource(const edm::ParameterSet &iConfig)
+    : conf_(iConfig),
+      src_(consumes<SiPixelRecHitCollection>(conf_.getParameter<edm::InputTag>("src"))),
+      saveFile(conf_.getUntrackedParameter<bool>("saveFile", false)),
+      isPIB(conf_.getUntrackedParameter<bool>("isPIB", false)),
+      slowDown(conf_.getUntrackedParameter<bool>("slowDown", false)),
+      modOn(conf_.getUntrackedParameter<bool>("modOn", true)),
+      twoDimOn(conf_.getUntrackedParameter<bool>("twoDimOn", true)),
+      reducedSet(conf_.getUntrackedParameter<bool>("reducedSet", false)),
+      ladOn(conf_.getUntrackedParameter<bool>("ladOn", false)),
+      layOn(conf_.getUntrackedParameter<bool>("layOn", false)),
+      phiOn(conf_.getUntrackedParameter<bool>("phiOn", false)),
+      ringOn(conf_.getUntrackedParameter<bool>("ringOn", false)),
+      bladeOn(conf_.getUntrackedParameter<bool>("bladeOn", false)),
+      diskOn(conf_.getUntrackedParameter<bool>("diskOn", false)),
+      isUpgrade(conf_.getUntrackedParameter<bool>("isUpgrade", false)) {
   firstRun = true;
-  LogInfo ("PixelDQM") << "SiPixelRecHitSource::SiPixelRecHitSource: Got DQM BackEnd interface"<<endl;
+  LogInfo("PixelDQM") << "SiPixelRecHitSource::SiPixelRecHitSource: Got DQM BackEnd interface" << endl;
   topFolderName_ = conf_.getParameter<std::string>("TopFolderName");
 }
 
-
-SiPixelRecHitSource::~SiPixelRecHitSource()
-{
-   // do anything here that needs to be done at desctruction time
+SiPixelRecHitSource::~SiPixelRecHitSource() {
+  // do anything here that needs to be done at desctruction time
   // (e.g. close files, deallocate resources etc.)
-  LogInfo ("PixelDQM") << "SiPixelRecHitSource::~SiPixelRecHitSource: Destructor"<<endl;
-  std::map<uint32_t,SiPixelRecHitModule*>::iterator struct_iter;
-  for (struct_iter = thePixelStructure.begin() ; struct_iter != thePixelStructure.end() ; struct_iter++){
+  LogInfo("PixelDQM") << "SiPixelRecHitSource::~SiPixelRecHitSource: Destructor" << endl;
+  std::map<uint32_t, SiPixelRecHitModule *>::iterator struct_iter;
+  for (struct_iter = thePixelStructure.begin(); struct_iter != thePixelStructure.end(); struct_iter++) {
     delete struct_iter->second;
     struct_iter->second = nullptr;
   }
 }
 
+void SiPixelRecHitSource::dqmBeginRun(const edm::Run &r, const edm::EventSetup &iSetup) {
+  LogInfo("PixelDQM") << " SiPixelRecHitSource::beginJob - Initialisation ... " << std::endl;
+  LogInfo("PixelDQM") << "Mod/Lad/Lay/Phi " << modOn << "/" << ladOn << "/" << layOn << "/" << phiOn << std::endl;
+  LogInfo("PixelDQM") << "Blade/Disk/Ring" << bladeOn << "/" << diskOn << "/" << ringOn << std::endl;
+  LogInfo("PixelDQM") << "2DIM IS " << twoDimOn << "\n";
 
-void SiPixelRecHitSource::dqmBeginRun(const edm::Run& r, const edm::EventSetup& iSetup){
-
-  LogInfo ("PixelDQM") << " SiPixelRecHitSource::beginJob - Initialisation ... " << std::endl;
-  LogInfo ("PixelDQM") << "Mod/Lad/Lay/Phi " << modOn << "/" << ladOn << "/" 
-	    << layOn << "/" << phiOn << std::endl;
-  LogInfo ("PixelDQM") << "Blade/Disk/Ring" << bladeOn << "/" << diskOn << "/" 
-	    << ringOn << std::endl;
-  LogInfo ("PixelDQM") << "2DIM IS " << twoDimOn << "\n";
-  
-  if(firstRun){
+  if (firstRun) {
     eventNo = 0;
     // Build map
     buildStructure(iSetup);
@@ -102,208 +95,212 @@ void SiPixelRecHitSource::dqmBeginRun(const edm::Run& r, const edm::EventSetup&
   }
 }
 
-void SiPixelRecHitSource::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const &, const edm::EventSetup& iSetup){
+void SiPixelRecHitSource::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, const edm::EventSetup &iSetup) {
   bookMEs(iBooker, iSetup);
 }
 
 //------------------------------------------------------------------
 // Method called for every event
 //------------------------------------------------------------------
-void SiPixelRecHitSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void SiPixelRecHitSource::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   eventNo++;
-  //cout << eventNo << endl;
+  // cout << eventNo << endl;
   // get input data
-  edm::Handle<SiPixelRecHitCollection>  recHitColl;
-  iEvent.getByToken( src_, recHitColl );
+  edm::Handle<SiPixelRecHitCollection> recHitColl;
+  iEvent.getByToken(src_, recHitColl);
 
-  std::map<uint32_t,SiPixelRecHitModule*>::iterator struct_iter;
-  for (struct_iter = thePixelStructure.begin() ; struct_iter != thePixelStructure.end() ; struct_iter++) {
+  std::map<uint32_t, SiPixelRecHitModule *>::iterator struct_iter;
+  for (struct_iter = thePixelStructure.begin(); struct_iter != thePixelStructure.end(); struct_iter++) {
     uint32_t TheID = (*struct_iter).first;
 
     SiPixelRecHitCollection::const_iterator match = recHitColl->find(TheID);
-    
-      // if( pixelrechitRangeIteratorBegin == pixelrechitRangeIteratorEnd) {cout << "oops" << endl;}
-      float rechit_x = 0;
-      float rechit_y = 0;
-      int rechit_count = 0;
-
-      if (match != recHitColl->end()) {
-	SiPixelRecHitCollection::DetSet pixelrechitRange = *match;
-	SiPixelRecHitCollection::DetSet::const_iterator pixelrechitRangeIteratorBegin = pixelrechitRange.begin();
-	SiPixelRecHitCollection::DetSet::const_iterator pixelrechitRangeIteratorEnd = pixelrechitRange.end();
-	SiPixelRecHitCollection::DetSet::const_iterator pixeliter = pixelrechitRangeIteratorBegin;
-
-       for ( ; pixeliter != pixelrechitRangeIteratorEnd; pixeliter++) 
-	 {
-	  
-
-	  rechit_count++;
-	  //cout << TheID << endl;
-	  SiPixelRecHit::ClusterRef const& clust = pixeliter->cluster();
-	  int sizeX = (*clust).sizeX();
-	  //cout << sizeX << endl;
-	  int sizeY = (*clust).sizeY();
-	  //cout << sizeY << endl;
-	  LocalPoint lp = pixeliter->localPosition();
-	  rechit_x = lp.x();
-	  rechit_y = lp.y();
-	  
-	  LocalError lerr = pixeliter->localPositionError();
-	  float lerr_x = sqrt(lerr.xx());
-	  float lerr_y = sqrt(lerr.yy());
-	  //std::cout << "errors " << lerr_x << " " << lerr_y << std::endl;
-	  (*struct_iter).second->fill(rechit_x, rechit_y, sizeX, sizeY, lerr_x, lerr_y, 
-	                              modOn, ladOn, layOn, phiOn, bladeOn, diskOn, ringOn, 
-				      twoDimOn, reducedSet);
-	
-	}
+
+    // if( pixelrechitRangeIteratorBegin == pixelrechitRangeIteratorEnd) {cout
+    // << "oops" << endl;}
+    float rechit_x = 0;
+    float rechit_y = 0;
+    int rechit_count = 0;
+
+    if (match != recHitColl->end()) {
+      SiPixelRecHitCollection::DetSet pixelrechitRange = *match;
+      SiPixelRecHitCollection::DetSet::const_iterator pixelrechitRangeIteratorBegin = pixelrechitRange.begin();
+      SiPixelRecHitCollection::DetSet::const_iterator pixelrechitRangeIteratorEnd = pixelrechitRange.end();
+      SiPixelRecHitCollection::DetSet::const_iterator pixeliter = pixelrechitRangeIteratorBegin;
+
+      for (; pixeliter != pixelrechitRangeIteratorEnd; pixeliter++) {
+        rechit_count++;
+        // cout << TheID << endl;
+        SiPixelRecHit::ClusterRef const &clust = pixeliter->cluster();
+        int sizeX = (*clust).sizeX();
+        // cout << sizeX << endl;
+        int sizeY = (*clust).sizeY();
+        // cout << sizeY << endl;
+        LocalPoint lp = pixeliter->localPosition();
+        rechit_x = lp.x();
+        rechit_y = lp.y();
+
+        LocalError lerr = pixeliter->localPositionError();
+        float lerr_x = sqrt(lerr.xx());
+        float lerr_y = sqrt(lerr.yy());
+        // std::cout << "errors " << lerr_x << " " << lerr_y << std::endl;
+        (*struct_iter)
+            .second->fill(rechit_x,
+                          rechit_y,
+                          sizeX,
+                          sizeY,
+                          lerr_x,
+                          lerr_y,
+                          modOn,
+                          ladOn,
+                          layOn,
+                          phiOn,
+                          bladeOn,
+                          diskOn,
+                          ringOn,
+                          twoDimOn,
+                          reducedSet);
       }
-      if(rechit_count > 0) (*struct_iter).second->nfill(rechit_count, modOn, ladOn, layOn, phiOn, bladeOn, diskOn, ringOn);
-    
+    }
+    if (rechit_count > 0)
+      (*struct_iter).second->nfill(rechit_count, modOn, ladOn, layOn, phiOn, bladeOn, diskOn, ringOn);
   }
 
   // slow down...
-  if(slowDown) usleep(10000);
-  
+  if (slowDown)
+    usleep(10000);
 }
 
 //------------------------------------------------------------------
 // Build data structure
 //------------------------------------------------------------------
-void SiPixelRecHitSource::buildStructure(const edm::EventSetup& iSetup){
-
-  LogInfo ("PixelDQM") <<" SiPixelRecHitSource::buildStructure" ;
-
+void SiPixelRecHitSource::buildStructure(const edm::EventSetup &iSetup) {
+  LogInfo("PixelDQM") << " SiPixelRecHitSource::buildStructure";
 
   edm::ESHandle<TrackerGeometry> pDD;
   edm::ESHandle<TrackerTopology> tTopoHandle;
 
-  iSetup.get<TrackerDigiGeometryRecord>().get( pDD );
+  iSetup.get<TrackerDigiGeometryRecord>().get(pDD);
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
 
   const TrackerTopology *pTT = tTopoHandle.product();
 
-  LogVerbatim ("PixelDQM") << " *** Geometry node for TrackerGeom is  "<<&(*pDD)<<std::endl;
-  LogVerbatim ("PixelDQM") << " *** I have " << pDD->dets().size() <<" detectors"<<std::endl;
-  LogVerbatim ("PixelDQM") << " *** I have " << pDD->detTypes().size() <<" types"<<std::endl;
-  
-  for(TrackerGeometry::DetContainer::const_iterator it = pDD->dets().begin(); it != pDD->dets().end(); it++){
-    
-    if(dynamic_cast<PixelGeomDetUnit const *>((*it))!=nullptr){
+  LogVerbatim("PixelDQM") << " *** Geometry node for TrackerGeom is  " << &(*pDD) << std::endl;
+  LogVerbatim("PixelDQM") << " *** I have " << pDD->dets().size() << " detectors" << std::endl;
+  LogVerbatim("PixelDQM") << " *** I have " << pDD->detTypes().size() << " types" << std::endl;
 
+  for (TrackerGeometry::DetContainer::const_iterator it = pDD->dets().begin(); it != pDD->dets().end(); it++) {
+    if (dynamic_cast<PixelGeomDetUnit const *>((*it)) != nullptr) {
       DetId detId = (*it)->geographicalId();
-      
-      if((detId.subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) ||
-	 (detId.subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap))){ 
-
-	uint32_t id = detId();
-
-	if(detId.subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) {
-	  if(isPIB) continue;
-	  LogDebug ("PixelDQM") << " ---> Adding Barrel Module " <<  detId.rawId() << endl;
-	  SiPixelRecHitModule* theModule = new SiPixelRecHitModule(id);
-	  thePixelStructure.insert(pair<uint32_t,SiPixelRecHitModule*> (id,theModule));
-		
-	} else if( (detId.subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap)) ) {
-
-	  LogDebug ("PixelDQM") << " ---> Adding Endcap Module " <<  detId.rawId() << endl;
-
-	  PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(id), pTT, isUpgrade).halfCylinder();
-	  int disk   = PixelEndcapName(DetId(id), pTT, isUpgrade).diskName();
-	  int blade  = PixelEndcapName(DetId(id), pTT, isUpgrade).bladeName();
-	  int panel  = PixelEndcapName(DetId(id), pTT, isUpgrade).pannelName();
-	  int module = PixelEndcapName(DetId(id), pTT, isUpgrade).plaquetteName();
-
-	  char sside[80];  sprintf(sside,  "HalfCylinder_%i",side);
-	  char sdisk[80];  sprintf(sdisk,  "Disk_%i",disk);
-	  char sblade[80]; sprintf(sblade, "Blade_%02i",blade);
-	  char spanel[80]; sprintf(spanel, "Panel_%i",panel);
-	  char smodule[80];sprintf(smodule,"Module_%i",module);
-	  std::string side_str = sside;
-	  std::string disk_str = sdisk;
-	  bool mask = side_str.find("HalfCylinder_1")!=string::npos||
-	    side_str.find("HalfCylinder_2")!=string::npos||
-	    side_str.find("HalfCylinder_4")!=string::npos||
-	    disk_str.find("Disk_2")!=string::npos;
-	  if(isPIB && mask) continue;
-	
-	  SiPixelRecHitModule* theModule = new SiPixelRecHitModule(id);
-	  thePixelStructure.insert(pair<uint32_t,SiPixelRecHitModule*> (id,theModule));
-	}
 
+      if ((detId.subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) ||
+          (detId.subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap))) {
+        uint32_t id = detId();
+
+        if (detId.subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) {
+          if (isPIB)
+            continue;
+          LogDebug("PixelDQM") << " ---> Adding Barrel Module " << detId.rawId() << endl;
+          SiPixelRecHitModule *theModule = new SiPixelRecHitModule(id);
+          thePixelStructure.insert(pair<uint32_t, SiPixelRecHitModule *>(id, theModule));
+
+        } else if ((detId.subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap))) {
+          LogDebug("PixelDQM") << " ---> Adding Endcap Module " << detId.rawId() << endl;
+
+          PixelEndcapName::HalfCylinder side = PixelEndcapName(DetId(id), pTT, isUpgrade).halfCylinder();
+          int disk = PixelEndcapName(DetId(id), pTT, isUpgrade).diskName();
+          int blade = PixelEndcapName(DetId(id), pTT, isUpgrade).bladeName();
+          int panel = PixelEndcapName(DetId(id), pTT, isUpgrade).pannelName();
+          int module = PixelEndcapName(DetId(id), pTT, isUpgrade).plaquetteName();
+
+          char sside[80];
+          sprintf(sside, "HalfCylinder_%i", side);
+          char sdisk[80];
+          sprintf(sdisk, "Disk_%i", disk);
+          char sblade[80];
+          sprintf(sblade, "Blade_%02i", blade);
+          char spanel[80];
+          sprintf(spanel, "Panel_%i", panel);
+          char smodule[80];
+          sprintf(smodule, "Module_%i", module);
+          std::string side_str = sside;
+          std::string disk_str = sdisk;
+          bool mask = side_str.find("HalfCylinder_1") != string::npos ||
+                      side_str.find("HalfCylinder_2") != string::npos ||
+                      side_str.find("HalfCylinder_4") != string::npos || disk_str.find("Disk_2") != string::npos;
+          if (isPIB && mask)
+            continue;
+
+          SiPixelRecHitModule *theModule = new SiPixelRecHitModule(id);
+          thePixelStructure.insert(pair<uint32_t, SiPixelRecHitModule *>(id, theModule));
+        }
       }
     }
-  }//FOR_LOOP
+  }  // FOR_LOOP
 
-  LogInfo ("PixelDQM") << " *** Pixel Structure Size " << thePixelStructure.size() << endl;
+  LogInfo("PixelDQM") << " *** Pixel Structure Size " << thePixelStructure.size() << endl;
 }
 //------------------------------------------------------------------
 // Book MEs
 //------------------------------------------------------------------
-void SiPixelRecHitSource::bookMEs(DQMStore::IBooker & iBooker, const edm::EventSetup& iSetup){
-  
-  std::map<uint32_t,SiPixelRecHitModule*>::iterator struct_iter;
-    
+void SiPixelRecHitSource::bookMEs(DQMStore::IBooker &iBooker, const edm::EventSetup &iSetup) {
+  std::map<uint32_t, SiPixelRecHitModule *>::iterator struct_iter;
+
   SiPixelFolderOrganizer theSiPixelFolder(false);
-  
-  for(struct_iter = thePixelStructure.begin(); struct_iter != thePixelStructure.end(); struct_iter++){
-    
-    /// Create folder tree and book histograms 
-    if(modOn){
-      if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,0,isUpgrade)){
-	(*struct_iter).second->book( conf_,iBooker, iSetup, 0, twoDimOn, reducedSet, isUpgrade);
+
+  for (struct_iter = thePixelStructure.begin(); struct_iter != thePixelStructure.end(); struct_iter++) {
+    /// Create folder tree and book histograms
+    if (modOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*struct_iter).first, 0, isUpgrade)) {
+        (*struct_iter).second->book(conf_, iBooker, iSetup, 0, twoDimOn, reducedSet, isUpgrade);
       } else {
-	if(!isPIB) throw cms::Exception("LogicError")
-	  << "[SiPixelDigiSource::bookMEs] Creation of DQM folder failed";
+        if (!isPIB)
+          throw cms::Exception("LogicError") << "[SiPixelDigiSource::bookMEs] Creation of DQM folder failed";
       }
     }
-    if(ladOn){
-      if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,1,isUpgrade)){
-	(*struct_iter).second->book( conf_,iBooker, iSetup, 1, twoDimOn, reducedSet, isUpgrade);
-	} else {
-	LogDebug ("PixelDQM") << "PROBLEM WITH LADDER-FOLDER\n";
+    if (ladOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*struct_iter).first, 1, isUpgrade)) {
+        (*struct_iter).second->book(conf_, iBooker, iSetup, 1, twoDimOn, reducedSet, isUpgrade);
+      } else {
+        LogDebug("PixelDQM") << "PROBLEM WITH LADDER-FOLDER\n";
       }
     }
-    if(layOn){
-      if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,2,isUpgrade)){
-	(*struct_iter).second->book( conf_,iBooker, iSetup, 2, twoDimOn, reducedSet, isUpgrade);
-	} else {
-	LogDebug ("PixelDQM") << "PROBLEM WITH LAYER-FOLDER\n";
+    if (layOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*struct_iter).first, 2, isUpgrade)) {
+        (*struct_iter).second->book(conf_, iBooker, iSetup, 2, twoDimOn, reducedSet, isUpgrade);
+      } else {
+        LogDebug("PixelDQM") << "PROBLEM WITH LAYER-FOLDER\n";
       }
     }
-    if(phiOn){
-      if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,3,isUpgrade)){
-	(*struct_iter).second->book( conf_,iBooker, iSetup, 3, twoDimOn, reducedSet, isUpgrade);
-	} else {
-	LogDebug ("PixelDQM") << "PROBLEM WITH PHI-FOLDER\n";
+    if (phiOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*struct_iter).first, 3, isUpgrade)) {
+        (*struct_iter).second->book(conf_, iBooker, iSetup, 3, twoDimOn, reducedSet, isUpgrade);
+      } else {
+        LogDebug("PixelDQM") << "PROBLEM WITH PHI-FOLDER\n";
       }
     }
-    if(bladeOn){
-      if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,4,isUpgrade)){
-	(*struct_iter).second->book( conf_,iBooker, iSetup, 4, twoDimOn, reducedSet, isUpgrade);
-	} else {
-	LogDebug ("PixelDQM") << "PROBLEM WITH BLADE-FOLDER\n";
+    if (bladeOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*struct_iter).first, 4, isUpgrade)) {
+        (*struct_iter).second->book(conf_, iBooker, iSetup, 4, twoDimOn, reducedSet, isUpgrade);
+      } else {
+        LogDebug("PixelDQM") << "PROBLEM WITH BLADE-FOLDER\n";
       }
     }
-    if(diskOn){
-      if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,5,isUpgrade)){
-	(*struct_iter).second->book( conf_,iBooker, iSetup, 5, twoDimOn, reducedSet, isUpgrade);
-	} else {
-	LogDebug ("PixelDQM") << "PROBLEM WITH DISK-FOLDER\n";
+    if (diskOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*struct_iter).first, 5, isUpgrade)) {
+        (*struct_iter).second->book(conf_, iBooker, iSetup, 5, twoDimOn, reducedSet, isUpgrade);
+      } else {
+        LogDebug("PixelDQM") << "PROBLEM WITH DISK-FOLDER\n";
       }
     }
-    if(ringOn){
-      if(theSiPixelFolder.setModuleFolder(iBooker,(*struct_iter).first,6,isUpgrade)){
-	(*struct_iter).second->book( conf_,iBooker, iSetup, 6, twoDimOn, reducedSet, isUpgrade);
-	} else {
-	LogDebug ("PixelDQM") << "PROBLEM WITH RING-FOLDER\n";
+    if (ringOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*struct_iter).first, 6, isUpgrade)) {
+        (*struct_iter).second->book(conf_, iBooker, iSetup, 6, twoDimOn, reducedSet, isUpgrade);
+      } else {
+        LogDebug("PixelDQM") << "PROBLEM WITH RING-FOLDER\n";
       }
     }
-
   }
-
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SiPixelRecHitSource);
diff --git a/DQM/SiPixelMonitorTrack/interface/SiPixelHitEfficiencyModule.h b/DQM/SiPixelMonitorTrack/interface/SiPixelHitEfficiencyModule.h
index c2398562d05c1..56006876d6c42 100644
--- a/DQM/SiPixelMonitorTrack/interface/SiPixelHitEfficiencyModule.h
+++ b/DQM/SiPixelMonitorTrack/interface/SiPixelHitEfficiencyModule.h
@@ -1,179 +1,195 @@
 // Package:    SiPixelMonitorTrack
 // Class:      SiPixelHitEfficiencyModule
-// 
-// class SiPixelHitEfficiencyModule SiPixelHitEfficiencyModule.h 
+//
+// class SiPixelHitEfficiencyModule SiPixelHitEfficiencyModule.h
 //       DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencyModule.h
 //
 // Description: SiPixel hit efficiency data quality monitoring modules
-// Implementation: prototype -> improved -> never final - end of the 1st step 
+// Implementation: prototype -> improved -> never final - end of the 1st step
 //
 // Original Authors: Romain Rougny & Luca Mucibello
 //         Created: Mar Nov 10 13:29:00 CET 2009
 
-
 #ifndef SiPixelMonitorTrack_SiPixelHitEfficiencyModule_h
 #define SiPixelMonitorTrack_SiPixelHitEfficiencyModule_h
 
-
 #include <boost/cstdint.hpp>
 #include <utility>
 
 //#include "DataFormats/GeometryCommonDetAlgo/interface/MeasurementVector.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
 #include "DataFormats/TrajectoryState/interface/LocalTrajectoryParameters.h"
-#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 
-namespace edm { class EventSetup; }
-
-class SiPixelHitEfficiencyModule { 
-  public:
-    SiPixelHitEfficiencyModule();
-    SiPixelHitEfficiencyModule(const uint32_t);
-   ~SiPixelHitEfficiencyModule();
-
-   void book(const edm::ParameterSet&, edm::EventSetup const &, DQMStore::IBooker &, int type=0, bool isUpgrade=false);
-   void fill(const TrackerTopology * pTT, const LocalTrajectoryParameters& ltp, bool isHitValid, bool modon=true, bool ladon=true, bool layon=true, bool phion = true, bool bladeon=true, bool diskon=true, bool ringon=true);
-   void computeEfficiencies(bool modon=true, bool ladon=true, bool layon=true, bool phion = true, bool bladeon=true, bool diskon=true, bool ringon=true);
-   std::pair<double,double> eff(double nValid, double nMissing);
-   
-  private:
-    uint32_t id_; 
-    bool bBookTracks;
-    bool debug_;
-    bool updateEfficiencies;
-    
-    //EFFICIENCY
-    MonitorElement* meEfficiency_;
-    MonitorElement* meEfficiencyX_;
-    MonitorElement* meEfficiencyY_;
-    MonitorElement* meEfficiencyAlpha_;
-    MonitorElement* meEfficiencyBeta_;
-    
-    MonitorElement* meEfficiencyLad_;
-    MonitorElement* meEfficiencyXLad_;
-    MonitorElement* meEfficiencyYLad_;
-    MonitorElement* meEfficiencyAlphaLad_;
-    MonitorElement* meEfficiencyBetaLad_;
-    
-    MonitorElement* meEfficiencyLay_;
-    MonitorElement* meEfficiencyXLay_;
-    MonitorElement* meEfficiencyYLay_;
-    MonitorElement* meEfficiencyAlphaLay_;
-    MonitorElement* meEfficiencyBetaLay_;
-    
-    MonitorElement* meEfficiencyPhi_;
-    MonitorElement* meEfficiencyXPhi_;
-    MonitorElement* meEfficiencyYPhi_;
-    MonitorElement* meEfficiencyAlphaPhi_;
-    MonitorElement* meEfficiencyBetaPhi_;
-    
-    MonitorElement* meEfficiencyBlade_;
-    MonitorElement* meEfficiencyXBlade_;
-    MonitorElement* meEfficiencyYBlade_;
-    MonitorElement* meEfficiencyAlphaBlade_;
-    MonitorElement* meEfficiencyBetaBlade_;
-    
-    MonitorElement* meEfficiencyDisk_;
-    MonitorElement* meEfficiencyXDisk_;
-    MonitorElement* meEfficiencyYDisk_;
-    MonitorElement* meEfficiencyAlphaDisk_;
-    MonitorElement* meEfficiencyBetaDisk_;
-    
-    MonitorElement* meEfficiencyRing_;
-    MonitorElement* meEfficiencyXRing_;
-    MonitorElement* meEfficiencyYRing_;
-    MonitorElement* meEfficiencyAlphaRing_;
-    MonitorElement* meEfficiencyBetaRing_;
-    
-    //VALID HITS
-    MonitorElement* meValid_;
-    MonitorElement* meValidX_;
-    MonitorElement* meValidY_;
-    MonitorElement* meValidAlpha_;
-    MonitorElement* meValidBeta_;
-    
-    MonitorElement* meValidLad_;
-    MonitorElement* meValidXLad_;
-    MonitorElement* meValidYLad_;
-    MonitorElement* meValidModLad_;
-    MonitorElement* meValidAlphaLad_;
-    MonitorElement* meValidBetaLad_;
-    
-    MonitorElement* meValidLay_;
-    MonitorElement* meValidXLay_;
-    MonitorElement* meValidYLay_;
-    MonitorElement* meValidAlphaLay_;
-    MonitorElement* meValidBetaLay_;
-    
-    MonitorElement* meValidPhi_;
-    MonitorElement* meValidXPhi_;
-    MonitorElement* meValidYPhi_;
-    MonitorElement* meValidAlphaPhi_;
-    MonitorElement* meValidBetaPhi_;
-    
-    MonitorElement* meValidBlade_;
-    MonitorElement* meValidXBlade_;
-    MonitorElement* meValidYBlade_;
-    MonitorElement* meValidAlphaBlade_;
-    MonitorElement* meValidBetaBlade_;
-    
-    MonitorElement* meValidDisk_;
-    MonitorElement* meValidXDisk_;
-    MonitorElement* meValidYDisk_;
-    MonitorElement* meValidAlphaDisk_;
-    MonitorElement* meValidBetaDisk_;
-    
-    MonitorElement* meValidRing_;
-    MonitorElement* meValidXRing_;
-    MonitorElement* meValidYRing_;
-    MonitorElement* meValidAlphaRing_;
-    MonitorElement* meValidBetaRing_;
-    
-    //MISSING HITS
-    MonitorElement* meMissing_;
-    MonitorElement* meMissingX_;
-    MonitorElement* meMissingY_;
-    MonitorElement* meMissingAlpha_;
-    MonitorElement* meMissingBeta_;
-    
-    MonitorElement* meMissingLad_;
-    MonitorElement* meMissingXLad_;
-    MonitorElement* meMissingYLad_;
-    MonitorElement* meMissingModLad_;
-    MonitorElement* meMissingAlphaLad_;
-    MonitorElement* meMissingBetaLad_;
-    
-    MonitorElement* meMissingLay_;
-    MonitorElement* meMissingXLay_;
-    MonitorElement* meMissingYLay_;
-    MonitorElement* meMissingAlphaLay_;
-    MonitorElement* meMissingBetaLay_;
-    
-    MonitorElement* meMissingPhi_;
-    MonitorElement* meMissingXPhi_;
-    MonitorElement* meMissingYPhi_;
-    MonitorElement* meMissingAlphaPhi_;
-    MonitorElement* meMissingBetaPhi_;
-    
-    MonitorElement* meMissingBlade_;
-    MonitorElement* meMissingXBlade_;
-    MonitorElement* meMissingYBlade_;
-    MonitorElement* meMissingAlphaBlade_;
-    MonitorElement* meMissingBetaBlade_;
-    
-    MonitorElement* meMissingDisk_;
-    MonitorElement* meMissingXDisk_;
-    MonitorElement* meMissingYDisk_;
-    MonitorElement* meMissingAlphaDisk_;
-    MonitorElement* meMissingBetaDisk_;
-    
-    MonitorElement* meMissingRing_;
-    MonitorElement* meMissingXRing_;
-    MonitorElement* meMissingYRing_;
-    MonitorElement* meMissingAlphaRing_;
-    MonitorElement* meMissingBetaRing_;
+namespace edm {
+  class EventSetup;
+}
+
+class SiPixelHitEfficiencyModule {
+public:
+  SiPixelHitEfficiencyModule();
+  SiPixelHitEfficiencyModule(const uint32_t);
+  ~SiPixelHitEfficiencyModule();
+
+  void book(
+      const edm::ParameterSet &, edm::EventSetup const &, DQMStore::IBooker &, int type = 0, bool isUpgrade = false);
+  void fill(const TrackerTopology *pTT,
+            const LocalTrajectoryParameters &ltp,
+            bool isHitValid,
+            bool modon = true,
+            bool ladon = true,
+            bool layon = true,
+            bool phion = true,
+            bool bladeon = true,
+            bool diskon = true,
+            bool ringon = true);
+  void computeEfficiencies(bool modon = true,
+                           bool ladon = true,
+                           bool layon = true,
+                           bool phion = true,
+                           bool bladeon = true,
+                           bool diskon = true,
+                           bool ringon = true);
+  std::pair<double, double> eff(double nValid, double nMissing);
+
+private:
+  uint32_t id_;
+  bool bBookTracks;
+  bool debug_;
+  bool updateEfficiencies;
+
+  // EFFICIENCY
+  MonitorElement *meEfficiency_;
+  MonitorElement *meEfficiencyX_;
+  MonitorElement *meEfficiencyY_;
+  MonitorElement *meEfficiencyAlpha_;
+  MonitorElement *meEfficiencyBeta_;
+
+  MonitorElement *meEfficiencyLad_;
+  MonitorElement *meEfficiencyXLad_;
+  MonitorElement *meEfficiencyYLad_;
+  MonitorElement *meEfficiencyAlphaLad_;
+  MonitorElement *meEfficiencyBetaLad_;
+
+  MonitorElement *meEfficiencyLay_;
+  MonitorElement *meEfficiencyXLay_;
+  MonitorElement *meEfficiencyYLay_;
+  MonitorElement *meEfficiencyAlphaLay_;
+  MonitorElement *meEfficiencyBetaLay_;
+
+  MonitorElement *meEfficiencyPhi_;
+  MonitorElement *meEfficiencyXPhi_;
+  MonitorElement *meEfficiencyYPhi_;
+  MonitorElement *meEfficiencyAlphaPhi_;
+  MonitorElement *meEfficiencyBetaPhi_;
+
+  MonitorElement *meEfficiencyBlade_;
+  MonitorElement *meEfficiencyXBlade_;
+  MonitorElement *meEfficiencyYBlade_;
+  MonitorElement *meEfficiencyAlphaBlade_;
+  MonitorElement *meEfficiencyBetaBlade_;
+
+  MonitorElement *meEfficiencyDisk_;
+  MonitorElement *meEfficiencyXDisk_;
+  MonitorElement *meEfficiencyYDisk_;
+  MonitorElement *meEfficiencyAlphaDisk_;
+  MonitorElement *meEfficiencyBetaDisk_;
+
+  MonitorElement *meEfficiencyRing_;
+  MonitorElement *meEfficiencyXRing_;
+  MonitorElement *meEfficiencyYRing_;
+  MonitorElement *meEfficiencyAlphaRing_;
+  MonitorElement *meEfficiencyBetaRing_;
+
+  // VALID HITS
+  MonitorElement *meValid_;
+  MonitorElement *meValidX_;
+  MonitorElement *meValidY_;
+  MonitorElement *meValidAlpha_;
+  MonitorElement *meValidBeta_;
+
+  MonitorElement *meValidLad_;
+  MonitorElement *meValidXLad_;
+  MonitorElement *meValidYLad_;
+  MonitorElement *meValidModLad_;
+  MonitorElement *meValidAlphaLad_;
+  MonitorElement *meValidBetaLad_;
+
+  MonitorElement *meValidLay_;
+  MonitorElement *meValidXLay_;
+  MonitorElement *meValidYLay_;
+  MonitorElement *meValidAlphaLay_;
+  MonitorElement *meValidBetaLay_;
+
+  MonitorElement *meValidPhi_;
+  MonitorElement *meValidXPhi_;
+  MonitorElement *meValidYPhi_;
+  MonitorElement *meValidAlphaPhi_;
+  MonitorElement *meValidBetaPhi_;
+
+  MonitorElement *meValidBlade_;
+  MonitorElement *meValidXBlade_;
+  MonitorElement *meValidYBlade_;
+  MonitorElement *meValidAlphaBlade_;
+  MonitorElement *meValidBetaBlade_;
+
+  MonitorElement *meValidDisk_;
+  MonitorElement *meValidXDisk_;
+  MonitorElement *meValidYDisk_;
+  MonitorElement *meValidAlphaDisk_;
+  MonitorElement *meValidBetaDisk_;
+
+  MonitorElement *meValidRing_;
+  MonitorElement *meValidXRing_;
+  MonitorElement *meValidYRing_;
+  MonitorElement *meValidAlphaRing_;
+  MonitorElement *meValidBetaRing_;
+
+  // MISSING HITS
+  MonitorElement *meMissing_;
+  MonitorElement *meMissingX_;
+  MonitorElement *meMissingY_;
+  MonitorElement *meMissingAlpha_;
+  MonitorElement *meMissingBeta_;
+
+  MonitorElement *meMissingLad_;
+  MonitorElement *meMissingXLad_;
+  MonitorElement *meMissingYLad_;
+  MonitorElement *meMissingModLad_;
+  MonitorElement *meMissingAlphaLad_;
+  MonitorElement *meMissingBetaLad_;
+
+  MonitorElement *meMissingLay_;
+  MonitorElement *meMissingXLay_;
+  MonitorElement *meMissingYLay_;
+  MonitorElement *meMissingAlphaLay_;
+  MonitorElement *meMissingBetaLay_;
+
+  MonitorElement *meMissingPhi_;
+  MonitorElement *meMissingXPhi_;
+  MonitorElement *meMissingYPhi_;
+  MonitorElement *meMissingAlphaPhi_;
+  MonitorElement *meMissingBetaPhi_;
+
+  MonitorElement *meMissingBlade_;
+  MonitorElement *meMissingXBlade_;
+  MonitorElement *meMissingYBlade_;
+  MonitorElement *meMissingAlphaBlade_;
+  MonitorElement *meMissingBetaBlade_;
+
+  MonitorElement *meMissingDisk_;
+  MonitorElement *meMissingXDisk_;
+  MonitorElement *meMissingYDisk_;
+  MonitorElement *meMissingAlphaDisk_;
+  MonitorElement *meMissingBetaDisk_;
+
+  MonitorElement *meMissingRing_;
+  MonitorElement *meMissingXRing_;
+  MonitorElement *meMissingYRing_;
+  MonitorElement *meMissingAlphaRing_;
+  MonitorElement *meMissingBetaRing_;
 };
 
 #endif
diff --git a/DQM/SiPixelMonitorTrack/interface/SiPixelHitEfficiencySource.h b/DQM/SiPixelMonitorTrack/interface/SiPixelHitEfficiencySource.h
index cbfb58cda2a73..fa3c13a70d4bd 100644
--- a/DQM/SiPixelMonitorTrack/interface/SiPixelHitEfficiencySource.h
+++ b/DQM/SiPixelMonitorTrack/interface/SiPixelHitEfficiencySource.h
@@ -3,10 +3,10 @@
 
 // Package: SiPixelMonitorTrack
 // Class:   SiPixelHitEfficiencySource
-// 
-// class SiPixelHitEfficiencySource SiPixelHitEfficiencySource.h 
+//
+// class SiPixelHitEfficiencySource SiPixelHitEfficiencySource.h
 //       DQM/SiPixelMonitorTrack/interface/SiPixelHitEfficiencySource.h
-// 
+//
 // Description:    <one line class summary>
 // Implementation: <Notes on implementation>
 //
@@ -14,99 +14,97 @@
 // Original Authors: Romain Rougny & Luca Mucibello
 //         Created: Mar Nov 10 13:29:00 CET 2009
 
-
 #include <boost/cstdint.hpp>
 
+#include "DQM/SiPixelMonitorTrack/interface/SiPixelHitEfficiencyModule.h"
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQM/SiPixelMonitorTrack/interface/SiPixelHitEfficiencyModule.h"
 
-//Files added for monitoring track quantities
-#include "Alignment/TrackerAlignment/interface/TrackerAlignableId.h"
+// Files added for monitoring track quantities
 #include "Alignment/OfflineValidation/interface/TrackerValidationVariables.h"
-#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
-#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h"
-#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
+#include "Alignment/TrackerAlignment/interface/TrackerAlignableId.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h"
 #include "DataFormats/TrackReco/interface/Track.h"
+#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h"
+#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
-#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
+#include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
 #include "RecoTracker/MeasurementDet/interface/MeasurementTrackerEvent.h"
+#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
 
 class SiPixelHitEfficiencySource : public DQMEDAnalyzer {
-  public:
-    explicit SiPixelHitEfficiencySource(const edm::ParameterSet&);
-            ~SiPixelHitEfficiencySource() override;
-
-    void dqmBeginRun(const edm::Run& r, edm::EventSetup const& iSetup) override;
-    void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-    void analyze(const edm::Event&, const edm::EventSetup&) override;
-    virtual void fillClusterProbability(int , int, bool, double );
-
-  private: 
-    edm::ParameterSet pSet_; 
-    edm::InputTag src_; 
-    // edm::InputTag tracksrc_;
-    edm::EDGetTokenT<reco::VertexCollection> vertexCollectionToken_;
-    edm::EDGetTokenT<TrajTrackAssociationCollection> tracksrc_;
-    edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster> > clusterCollectionToken_;
-    
-    edm::EDGetTokenT<MeasurementTrackerEvent> measurementTrackerEventToken_;
-
-    bool applyEdgeCut_;
-    double nSigma_EdgeCut_;
-    
-    bool debug_; 
-    bool modOn; 
-    //barrel:
-    bool ladOn, layOn, phiOn;
-    //forward:
-    bool ringOn, bladeOn, diskOn; 
-
-    bool firstRun;
-    
-    std::map<uint32_t, SiPixelHitEfficiencyModule*> theSiPixelStructure;
-
-    std::string vtxsrc_;    
-    int nmissing,nvalid; 
-    
-    int nvtx_;
-    int vtxntrk_;
-    double vtxD0_;
-    double vtxX_;
-    double vtxY_;
-    double vtxZ_;
-    double vtxndof_;
-    double vtxchi2_;
-
-    bool isUpgrade;
-
-    //MEs for cluster probability
-    MonitorElement* meClusterProbabilityL1_Plus_;
-    MonitorElement* meClusterProbabilityL1_Minus_;
-
-    MonitorElement* meClusterProbabilityL2_Plus_;
-    MonitorElement* meClusterProbabilityL2_Minus_;
-
-    MonitorElement* meClusterProbabilityL3_Plus_;
-    MonitorElement* meClusterProbabilityL3_Minus_;
-
-    MonitorElement* meClusterProbabilityD1_Plus_;
-    MonitorElement* meClusterProbabilityD1_Minus_;
-
-    MonitorElement* meClusterProbabilityD2_Plus_;
-    MonitorElement* meClusterProbabilityD2_Minus_;
+public:
+  explicit SiPixelHitEfficiencySource(const edm::ParameterSet &);
+  ~SiPixelHitEfficiencySource() override;
+
+  void dqmBeginRun(const edm::Run &r, edm::EventSetup const &iSetup) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  virtual void fillClusterProbability(int, int, bool, double);
+
+private:
+  edm::ParameterSet pSet_;
+  edm::InputTag src_;
+  // edm::InputTag tracksrc_;
+  edm::EDGetTokenT<reco::VertexCollection> vertexCollectionToken_;
+  edm::EDGetTokenT<TrajTrackAssociationCollection> tracksrc_;
+  edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster>> clusterCollectionToken_;
+
+  edm::EDGetTokenT<MeasurementTrackerEvent> measurementTrackerEventToken_;
+
+  bool applyEdgeCut_;
+  double nSigma_EdgeCut_;
+
+  bool debug_;
+  bool modOn;
+  // barrel:
+  bool ladOn, layOn, phiOn;
+  // forward:
+  bool ringOn, bladeOn, diskOn;
+
+  bool firstRun;
+
+  std::map<uint32_t, SiPixelHitEfficiencyModule *> theSiPixelStructure;
+
+  std::string vtxsrc_;
+  int nmissing, nvalid;
+
+  int nvtx_;
+  int vtxntrk_;
+  double vtxD0_;
+  double vtxX_;
+  double vtxY_;
+  double vtxZ_;
+  double vtxndof_;
+  double vtxchi2_;
+
+  bool isUpgrade;
+
+  // MEs for cluster probability
+  MonitorElement *meClusterProbabilityL1_Plus_;
+  MonitorElement *meClusterProbabilityL1_Minus_;
+
+  MonitorElement *meClusterProbabilityL2_Plus_;
+  MonitorElement *meClusterProbabilityL2_Minus_;
+
+  MonitorElement *meClusterProbabilityL3_Plus_;
+  MonitorElement *meClusterProbabilityL3_Minus_;
+
+  MonitorElement *meClusterProbabilityD1_Plus_;
+  MonitorElement *meClusterProbabilityD1_Minus_;
 
+  MonitorElement *meClusterProbabilityD2_Plus_;
+  MonitorElement *meClusterProbabilityD2_Minus_;
 };
 
 #endif
diff --git a/DQM/SiPixelMonitorTrack/interface/SiPixelTrackResidualModule.h b/DQM/SiPixelMonitorTrack/interface/SiPixelTrackResidualModule.h
index 891d92f14c351..74fb848fb5fda 100644
--- a/DQM/SiPixelMonitorTrack/interface/SiPixelTrackResidualModule.h
+++ b/DQM/SiPixelMonitorTrack/interface/SiPixelTrackResidualModule.h
@@ -1,138 +1,169 @@
 // Package:    SiPixelMonitorTrack
 // Class:      SiPixelTrackResidualModule
-// 
-// class SiPixelTrackResidualModule SiPixelTrackResidualModule.h 
+//
+// class SiPixelTrackResidualModule SiPixelTrackResidualModule.h
 //       DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualModule.h
 //
 // Description: SiPixel hit-to-track residual data quality monitoring modules
-// Implementation: prototype -> improved -> never final - end of the 1st step 
+// Implementation: prototype -> improved -> never final - end of the 1st step
 //
 // Original Author: Shan-Huei Chuang
 //         Created: Fri Mar 23 18:41:42 CET 2007
 //         Updated by Lukas Wehrli (plots for clusters on/off track added)
 
-
 #ifndef SiPixelMonitorTrack_SiPixelTrackResidualModule_h
 #define SiPixelMonitorTrack_SiPixelTrackResidualModule_h
 
-
 #include <boost/cstdint.hpp>
 
-#include "DataFormats/GeometryCommonDetAlgo/interface/MeasurementVector.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+#include "DataFormats/GeometryCommonDetAlgo/interface/MeasurementVector.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
 
-namespace edm { class EventSetup; }
-
-class SiPixelTrackResidualModule { 
-  public:
-    SiPixelTrackResidualModule();
-    SiPixelTrackResidualModule(const uint32_t);
-   ~SiPixelTrackResidualModule();
-
-   void book(const edm::ParameterSet&, edm::EventSetup const&, DQMStore::IBooker &, bool reducedSet=true, int type=0, bool isUpgrade=false);
-   void fill(const Measurement2DVector&, bool reducedSet=true, bool modon=true, bool ladon=true, bool layon=true, bool phion = true, bool bladeon=true, bool diskon=true, bool ringon=true);
-   void fill(const SiPixelCluster &clust, bool onTrack, double corrCharge, bool reducedSet,  bool modon, bool ladon, bool layon, bool phion, bool bladeon, bool diskon, bool ringon); 
-   void nfill(int onTrack, int offTrack, bool reducedSet,  bool modon, bool ladon, bool layon, bool phion, bool bladeon, bool diskon, bool ringon);
-  
-  private:
-    uint32_t id_; 
-    bool bBookTracks;
-
-
-    MonitorElement* meResidualX_;
-    MonitorElement* meResidualY_;
-    MonitorElement* meNClusters_onTrack_;
-    MonitorElement* meCharge_onTrack_;
-    MonitorElement* meSize_onTrack_;
-    MonitorElement* meSizeX_onTrack_;
-    MonitorElement* meSizeY_onTrack_;
-    MonitorElement* meNClusters_offTrack_;
-    MonitorElement* meCharge_offTrack_;
-    MonitorElement* meSize_offTrack_;
-    MonitorElement* meSizeX_offTrack_;
-    MonitorElement* meSizeY_offTrack_;
-
-    //barrel
-    MonitorElement* meResidualXLad_;
-    MonitorElement* meResidualYLad_;
-    MonitorElement* meNClusters_onTrackLad_;
-    MonitorElement* meCharge_onTrackLad_;
-    MonitorElement* meSize_onTrackLad_;
-    MonitorElement* meSizeX_onTrackLad_;
-    MonitorElement* meSizeY_onTrackLad_;
-    MonitorElement* meNClusters_offTrackLad_;
-    MonitorElement* meCharge_offTrackLad_;
-    MonitorElement* meSize_offTrackLad_;
-    MonitorElement* meSizeX_offTrackLad_;
-    MonitorElement* meSizeY_offTrackLad_;
-
-    MonitorElement* meResidualXLay_;
-    MonitorElement* meResidualYLay_;
-    MonitorElement* meNClusters_onTrackLay_;
-    MonitorElement* meCharge_onTrackLay_;
-    MonitorElement* meSize_onTrackLay_;
-    MonitorElement* meSizeX_onTrackLay_;
-    MonitorElement* meSizeY_onTrackLay_;
-    MonitorElement* meNClusters_offTrackLay_;
-    MonitorElement* meCharge_offTrackLay_;
-    MonitorElement* meSize_offTrackLay_;
-    MonitorElement* meSizeX_offTrackLay_;
-    MonitorElement* meSizeY_offTrackLay_;
-
-    MonitorElement* meResidualXPhi_;
-    MonitorElement* meResidualYPhi_;
-    MonitorElement* meNClusters_onTrackPhi_;
-    MonitorElement* meCharge_onTrackPhi_;
-    MonitorElement* meSize_onTrackPhi_;
-    MonitorElement* meSizeX_onTrackPhi_;
-    MonitorElement* meSizeY_onTrackPhi_;
-    MonitorElement* meNClusters_offTrackPhi_;
-    MonitorElement* meCharge_offTrackPhi_;
-    MonitorElement* meSize_offTrackPhi_;
-    MonitorElement* meSizeX_offTrackPhi_;
-    MonitorElement* meSizeY_offTrackPhi_;
-
-    //forward
-    MonitorElement* meResidualXBlade_;
-    MonitorElement* meResidualYBlade_;
-    MonitorElement* meNClusters_onTrackBlade_;
-    MonitorElement* meCharge_onTrackBlade_;
-    MonitorElement* meSize_onTrackBlade_;
-    MonitorElement* meSizeX_onTrackBlade_;
-    MonitorElement* meSizeY_onTrackBlade_;
-    MonitorElement* meNClusters_offTrackBlade_;
-    MonitorElement* meCharge_offTrackBlade_;
-    MonitorElement* meSize_offTrackBlade_;
-    MonitorElement* meSizeX_offTrackBlade_;
-    MonitorElement* meSizeY_offTrackBlade_;
-
-    MonitorElement* meResidualXDisk_;
-    MonitorElement* meResidualYDisk_;
-    MonitorElement* meNClusters_onTrackDisk_;
-    MonitorElement* meCharge_onTrackDisk_;
-    MonitorElement* meSize_onTrackDisk_;
-    MonitorElement* meSizeX_onTrackDisk_;
-    MonitorElement* meSizeY_onTrackDisk_;
-    MonitorElement* meNClusters_offTrackDisk_;
-    MonitorElement* meCharge_offTrackDisk_;
-    MonitorElement* meSize_offTrackDisk_;
-    MonitorElement* meSizeX_offTrackDisk_;
-    MonitorElement* meSizeY_offTrackDisk_;
-
-    MonitorElement* meResidualXRing_;
-    MonitorElement* meResidualYRing_;
-    MonitorElement* meNClusters_onTrackRing_;
-    MonitorElement* meCharge_onTrackRing_;
-    MonitorElement* meSize_onTrackRing_;
-    MonitorElement* meSizeX_onTrackRing_;
-    MonitorElement* meSizeY_onTrackRing_;
-    MonitorElement* meNClusters_offTrackRing_;
-    MonitorElement* meCharge_offTrackRing_;
-    MonitorElement* meSize_offTrackRing_;
-    MonitorElement* meSizeX_offTrackRing_;
-    MonitorElement* meSizeY_offTrackRing_;
+namespace edm {
+  class EventSetup;
+}
+
+class SiPixelTrackResidualModule {
+public:
+  SiPixelTrackResidualModule();
+  SiPixelTrackResidualModule(const uint32_t);
+  ~SiPixelTrackResidualModule();
+
+  void book(const edm::ParameterSet &,
+            edm::EventSetup const &,
+            DQMStore::IBooker &,
+            bool reducedSet = true,
+            int type = 0,
+            bool isUpgrade = false);
+  void fill(const Measurement2DVector &,
+            bool reducedSet = true,
+            bool modon = true,
+            bool ladon = true,
+            bool layon = true,
+            bool phion = true,
+            bool bladeon = true,
+            bool diskon = true,
+            bool ringon = true);
+  void fill(const SiPixelCluster &clust,
+            bool onTrack,
+            double corrCharge,
+            bool reducedSet,
+            bool modon,
+            bool ladon,
+            bool layon,
+            bool phion,
+            bool bladeon,
+            bool diskon,
+            bool ringon);
+  void nfill(int onTrack,
+             int offTrack,
+             bool reducedSet,
+             bool modon,
+             bool ladon,
+             bool layon,
+             bool phion,
+             bool bladeon,
+             bool diskon,
+             bool ringon);
+
+private:
+  uint32_t id_;
+  bool bBookTracks;
+
+  MonitorElement *meResidualX_;
+  MonitorElement *meResidualY_;
+  MonitorElement *meNClusters_onTrack_;
+  MonitorElement *meCharge_onTrack_;
+  MonitorElement *meSize_onTrack_;
+  MonitorElement *meSizeX_onTrack_;
+  MonitorElement *meSizeY_onTrack_;
+  MonitorElement *meNClusters_offTrack_;
+  MonitorElement *meCharge_offTrack_;
+  MonitorElement *meSize_offTrack_;
+  MonitorElement *meSizeX_offTrack_;
+  MonitorElement *meSizeY_offTrack_;
+
+  // barrel
+  MonitorElement *meResidualXLad_;
+  MonitorElement *meResidualYLad_;
+  MonitorElement *meNClusters_onTrackLad_;
+  MonitorElement *meCharge_onTrackLad_;
+  MonitorElement *meSize_onTrackLad_;
+  MonitorElement *meSizeX_onTrackLad_;
+  MonitorElement *meSizeY_onTrackLad_;
+  MonitorElement *meNClusters_offTrackLad_;
+  MonitorElement *meCharge_offTrackLad_;
+  MonitorElement *meSize_offTrackLad_;
+  MonitorElement *meSizeX_offTrackLad_;
+  MonitorElement *meSizeY_offTrackLad_;
+
+  MonitorElement *meResidualXLay_;
+  MonitorElement *meResidualYLay_;
+  MonitorElement *meNClusters_onTrackLay_;
+  MonitorElement *meCharge_onTrackLay_;
+  MonitorElement *meSize_onTrackLay_;
+  MonitorElement *meSizeX_onTrackLay_;
+  MonitorElement *meSizeY_onTrackLay_;
+  MonitorElement *meNClusters_offTrackLay_;
+  MonitorElement *meCharge_offTrackLay_;
+  MonitorElement *meSize_offTrackLay_;
+  MonitorElement *meSizeX_offTrackLay_;
+  MonitorElement *meSizeY_offTrackLay_;
+
+  MonitorElement *meResidualXPhi_;
+  MonitorElement *meResidualYPhi_;
+  MonitorElement *meNClusters_onTrackPhi_;
+  MonitorElement *meCharge_onTrackPhi_;
+  MonitorElement *meSize_onTrackPhi_;
+  MonitorElement *meSizeX_onTrackPhi_;
+  MonitorElement *meSizeY_onTrackPhi_;
+  MonitorElement *meNClusters_offTrackPhi_;
+  MonitorElement *meCharge_offTrackPhi_;
+  MonitorElement *meSize_offTrackPhi_;
+  MonitorElement *meSizeX_offTrackPhi_;
+  MonitorElement *meSizeY_offTrackPhi_;
+
+  // forward
+  MonitorElement *meResidualXBlade_;
+  MonitorElement *meResidualYBlade_;
+  MonitorElement *meNClusters_onTrackBlade_;
+  MonitorElement *meCharge_onTrackBlade_;
+  MonitorElement *meSize_onTrackBlade_;
+  MonitorElement *meSizeX_onTrackBlade_;
+  MonitorElement *meSizeY_onTrackBlade_;
+  MonitorElement *meNClusters_offTrackBlade_;
+  MonitorElement *meCharge_offTrackBlade_;
+  MonitorElement *meSize_offTrackBlade_;
+  MonitorElement *meSizeX_offTrackBlade_;
+  MonitorElement *meSizeY_offTrackBlade_;
+
+  MonitorElement *meResidualXDisk_;
+  MonitorElement *meResidualYDisk_;
+  MonitorElement *meNClusters_onTrackDisk_;
+  MonitorElement *meCharge_onTrackDisk_;
+  MonitorElement *meSize_onTrackDisk_;
+  MonitorElement *meSizeX_onTrackDisk_;
+  MonitorElement *meSizeY_onTrackDisk_;
+  MonitorElement *meNClusters_offTrackDisk_;
+  MonitorElement *meCharge_offTrackDisk_;
+  MonitorElement *meSize_offTrackDisk_;
+  MonitorElement *meSizeX_offTrackDisk_;
+  MonitorElement *meSizeY_offTrackDisk_;
+
+  MonitorElement *meResidualXRing_;
+  MonitorElement *meResidualYRing_;
+  MonitorElement *meNClusters_onTrackRing_;
+  MonitorElement *meCharge_onTrackRing_;
+  MonitorElement *meSize_onTrackRing_;
+  MonitorElement *meSizeX_onTrackRing_;
+  MonitorElement *meSizeY_onTrackRing_;
+  MonitorElement *meNClusters_offTrackRing_;
+  MonitorElement *meCharge_offTrackRing_;
+  MonitorElement *meSize_offTrackRing_;
+  MonitorElement *meSizeX_offTrackRing_;
+  MonitorElement *meSizeY_offTrackRing_;
 };
 
 #endif
diff --git a/DQM/SiPixelMonitorTrack/interface/SiPixelTrackResidualSource.h b/DQM/SiPixelMonitorTrack/interface/SiPixelTrackResidualSource.h
index 2a2b4e594d259..1d6152fd1aa8c 100644
--- a/DQM/SiPixelMonitorTrack/interface/SiPixelTrackResidualSource.h
+++ b/DQM/SiPixelMonitorTrack/interface/SiPixelTrackResidualSource.h
@@ -3,10 +3,10 @@
 
 // Package: SiPixelMonitorTrack
 // Class:   SiPixelTrackResidualSource
-// 
-// class SiPixelTrackResidualSource SiPixelTrackResidualSource.h 
+//
+// class SiPixelTrackResidualSource SiPixelTrackResidualSource.h
 //       DQM/SiPixelMonitorTrack/interface/SiPixelTrackResidualSource.h
-// 
+//
 // Description:    <one line class summary>
 // Implementation: <Notes on implementation>
 //
@@ -14,24 +14,24 @@
 //         Created: Fri Mar 23 18:41:42 CET 2007
 //
 // Updated by: Lukas Wehrli
-// for pixel offline DQM 
+// for pixel offline DQM
 
 #include <boost/cstdint.hpp>
 
+#include "DQM/SiPixelMonitorTrack/interface/SiPixelTrackResidualModule.h"
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQM/SiPixelMonitorTrack/interface/SiPixelTrackResidualModule.h"
 
-//Files added for monitoring track quantities
-#include "Alignment/TrackerAlignment/interface/TrackerAlignableId.h"
+// Files added for monitoring track quantities
 #include "Alignment/OfflineValidation/interface/TrackerValidationVariables.h"
+#include "Alignment/TrackerAlignment/interface/TrackerAlignableId.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
 //#include "DataFormats/SiPixelDetId/interface/PixelBarrelNameWrapper.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
@@ -48,150 +48,168 @@
 #include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
 
 class SiPixelTrackResidualSource : public DQMEDAnalyzer {
-  public:
-    explicit SiPixelTrackResidualSource(const edm::ParameterSet&);
-            ~SiPixelTrackResidualSource() override;
-
-    void dqmBeginRun(const edm::Run& r, edm::EventSetup const& iSetup) override;
-    void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-    void analyze(const edm::Event&, const edm::EventSetup&) override;
-    void getrococcupancy(DetId detId,const edm::DetSetVector<PixelDigi> & diginp,const TrackerTopology* const tTopo,std::vector<MonitorElement*> meinput);
-    void triplets(double x1,double y1,double z1,double x2,double y2,double z2,double x3,double y3,double z3,
-                  double ptsig, double & dc,double & dz, double kap); 
-
-    std::string topFolderName_;
-
-  private: 
-    edm::ParameterSet pSet_; 
-    edm::InputTag src_; 
-    edm::InputTag clustersrc_; 
-    edm::InputTag tracksrc_; 
-    std::string ttrhbuilder_; 
-    edm::EDGetTokenT<reco::BeamSpot> beamSpotToken_;
-    edm::EDGetTokenT<reco::VertexCollection> offlinePrimaryVerticesToken_;
-    edm::EDGetTokenT<reco::TrackCollection> generalTracksToken_;
-    edm::EDGetTokenT<std::vector<Trajectory> > tracksrcToken_;
-    edm::EDGetTokenT<std::vector<reco::Track> > trackToken_;
-    edm::EDGetTokenT<TrajTrackAssociationCollection> trackAssociationToken_;
-    edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster> > clustersrcToken_;
-    std::string vtxsrc_;
-    edm::InputTag digisrc_;
-    edm::EDGetTokenT<edm::DetSetVector<PixelDigi> > digisrcToken_;
-
-    bool debug_; 
-    bool modOn; 
-    bool reducedSet;
-    //barrel:
-    bool ladOn, layOn, phiOn;
-    //forward:
-    bool ringOn, bladeOn, diskOn; 
-    bool isUpgrade;
-    double ptminres_;
-    bool firstRun;
-    int NTotal;
-    int NLowProb;
-    
-    std::map<uint32_t, SiPixelTrackResidualModule*> theSiPixelStructure; 
-
-    MonitorElement* meSubdetResidualX[3];
-    MonitorElement* meSubdetResidualY[3];
-
-    std::vector<MonitorElement*> meResidualXSummedLay;
-    std::vector<MonitorElement*> meResidualYSummedLay;
-  
-    MonitorElement* meNofTracks_;
-    MonitorElement* meNofTracksInPixVol_;
-    MonitorElement* meNofClustersOnTrack_;
-    std::vector<MonitorElement*> meNofClustersvsPhiOnTrack_layers;
-    std::vector<MonitorElement*> meNofClustersvsPhiOnTrack_diskps;
-    std::vector<MonitorElement*> meNofClustersvsPhiOnTrack_diskms;
-    MonitorElement* meNofClustersNotOnTrack_;
-    MonitorElement* meClChargeOnTrack_all; 
-    MonitorElement* meClChargeOnTrack_bpix; 
-    MonitorElement* meClChargeOnTrack_fpix; 
-    std::vector<MonitorElement*> meClChargeOnTrack_layers;
-    std::vector<MonitorElement*> meClChargeOnTrack_diskps;
-    std::vector<MonitorElement*> meClChargeOnTrack_diskms;
-    MonitorElement* meClChargeNotOnTrack_all; 
-    MonitorElement* meClChargeNotOnTrack_bpix; 
-    MonitorElement* meClChargeNotOnTrack_fpix; 
-    std::vector<MonitorElement*> meClChargeNotOnTrack_layers;
-    std::vector<MonitorElement*> meClChargeNotOnTrack_diskps;
-    std::vector<MonitorElement*> meClChargeNotOnTrack_diskms;
-    MonitorElement* meClSizeOnTrack_all; 
-    MonitorElement* meClSizeOnTrack_bpix; 
-    MonitorElement* meClSizeOnTrack_fpix; 
-    std::vector<MonitorElement*> meClSizeOnTrack_layers;
-    std::vector<MonitorElement*> meClSizeOnTrack_diskps;
-    std::vector<MonitorElement*> meClSizeOnTrack_diskms;
-    MonitorElement* meClSizeNotOnTrack_all; 
-    MonitorElement* meClSizeNotOnTrack_bpix; 
-    MonitorElement* meClSizeNotOnTrack_fpix; 
-    std::vector<MonitorElement*> meClSizeNotOnTrack_layers;
-    std::vector<MonitorElement*> meClSizeNotOnTrack_diskps;
-    std::vector<MonitorElement*> meClSizeNotOnTrack_diskms;
-    MonitorElement* meClSizeXOnTrack_all; 
-    MonitorElement* meClSizeXOnTrack_bpix; 
-    MonitorElement* meClSizeXOnTrack_fpix; 
-    std::vector<MonitorElement*> meClSizeXOnTrack_layers;
-    std::vector<MonitorElement*> meClSizeXOnTrack_diskps;
-    std::vector<MonitorElement*> meClSizeXOnTrack_diskms;
-    MonitorElement* meClSizeXNotOnTrack_all; 
-    MonitorElement* meClSizeXNotOnTrack_bpix; 
-    MonitorElement* meClSizeXNotOnTrack_fpix; 
-    std::vector<MonitorElement*> meClSizeXNotOnTrack_layers;
-    std::vector<MonitorElement*> meClSizeXNotOnTrack_diskps;
-    std::vector<MonitorElement*> meClSizeXNotOnTrack_diskms;
-    MonitorElement* meClSizeYOnTrack_all; 
-    MonitorElement* meClSizeYOnTrack_bpix; 
-    MonitorElement* meClSizeYOnTrack_fpix; 
-    std::vector<MonitorElement*> meClSizeYOnTrack_layers;
-    std::vector<MonitorElement*> meClSizeYOnTrack_diskps;
-    std::vector<MonitorElement*> meClSizeYOnTrack_diskms;
-    MonitorElement* meClSizeYNotOnTrack_all; 
-    MonitorElement* meClSizeYNotOnTrack_bpix; 
-    MonitorElement* meClSizeYNotOnTrack_fpix; 
-    std::vector<MonitorElement*> meClSizeYNotOnTrack_layers;
-    std::vector<MonitorElement*> meClSizeYNotOnTrack_diskps;
-    std::vector<MonitorElement*> meClSizeYNotOnTrack_diskms;
-
-    //new
-    MonitorElement* meNClustersOnTrack_all;
-    MonitorElement* meNClustersOnTrack_bpix;
-    MonitorElement* meNClustersOnTrack_fpix; 
-    std::vector<MonitorElement*> meNClustersOnTrack_layers;
-    std::vector<MonitorElement*> meNClustersOnTrack_diskps;
-    std::vector<MonitorElement*> meNClustersOnTrack_diskms;
-    MonitorElement* meNClustersNotOnTrack_all; 
-    MonitorElement* meNClustersNotOnTrack_bpix; 
-    MonitorElement* meNClustersNotOnTrack_fpix; 
-    std::vector<MonitorElement*> meNClustersNotOnTrack_layers;
-    std::vector<MonitorElement*> meNClustersNotOnTrack_diskps;
-    std::vector<MonitorElement*> meNClustersNotOnTrack_diskms;
-    //
-
-    std::vector<MonitorElement*> meClPosLayersOnTrack;
-    std::vector<MonitorElement*> meClPosLayersLadVsModOnTrack;
-    std::vector<MonitorElement*> meClPosLayersNotOnTrack;
-    std::vector<MonitorElement*> meClPosDiskspzOnTrack;
-    std::vector<MonitorElement*> meClPosDisksmzOnTrack;
-    std::vector<MonitorElement*> meClPosDiskspzNotOnTrack;
-    std::vector<MonitorElement*> meClPosDisksmzNotOnTrack;
-
-    std::vector<MonitorElement*> meZeroRocLadvsModOnTrackBarrel;
-    std::vector<MonitorElement*> meZeroRocLadvsModOffTrackBarrel;
-    
-    MonitorElement* meHitProbability;
-    MonitorElement* meRocBladevsDiskEndcapOnTrk;
-    MonitorElement* meRocBladevsDiskEndcapOffTrk;
-    
-    void getepixrococcupancyontrk(const TrackerTopology* const tTopo, TransientTrackingRecHit::ConstRecHitPointer hit, 
-				  float xclust, float yclust, float z, MonitorElement* meinput);
-    void getepixrococcupancyofftrk(DetId detId, const TrackerTopology* const tTopo, 
-				   float xclust, float yclust, float z, MonitorElement* meinput);
-    
-    int noOfLayers;
-    int noOfDisks;
+public:
+  explicit SiPixelTrackResidualSource(const edm::ParameterSet &);
+  ~SiPixelTrackResidualSource() override;
+
+  void dqmBeginRun(const edm::Run &r, edm::EventSetup const &iSetup) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void getrococcupancy(DetId detId,
+                       const edm::DetSetVector<PixelDigi> &diginp,
+                       const TrackerTopology *const tTopo,
+                       std::vector<MonitorElement *> meinput);
+  void triplets(double x1,
+                double y1,
+                double z1,
+                double x2,
+                double y2,
+                double z2,
+                double x3,
+                double y3,
+                double z3,
+                double ptsig,
+                double &dc,
+                double &dz,
+                double kap);
+
+  std::string topFolderName_;
+
+private:
+  edm::ParameterSet pSet_;
+  edm::InputTag src_;
+  edm::InputTag clustersrc_;
+  edm::InputTag tracksrc_;
+  std::string ttrhbuilder_;
+  edm::EDGetTokenT<reco::BeamSpot> beamSpotToken_;
+  edm::EDGetTokenT<reco::VertexCollection> offlinePrimaryVerticesToken_;
+  edm::EDGetTokenT<reco::TrackCollection> generalTracksToken_;
+  edm::EDGetTokenT<std::vector<Trajectory>> tracksrcToken_;
+  edm::EDGetTokenT<std::vector<reco::Track>> trackToken_;
+  edm::EDGetTokenT<TrajTrackAssociationCollection> trackAssociationToken_;
+  edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster>> clustersrcToken_;
+  std::string vtxsrc_;
+  edm::InputTag digisrc_;
+  edm::EDGetTokenT<edm::DetSetVector<PixelDigi>> digisrcToken_;
+
+  bool debug_;
+  bool modOn;
+  bool reducedSet;
+  // barrel:
+  bool ladOn, layOn, phiOn;
+  // forward:
+  bool ringOn, bladeOn, diskOn;
+  bool isUpgrade;
+  double ptminres_;
+  bool firstRun;
+  int NTotal;
+  int NLowProb;
+
+  std::map<uint32_t, SiPixelTrackResidualModule *> theSiPixelStructure;
+
+  MonitorElement *meSubdetResidualX[3];
+  MonitorElement *meSubdetResidualY[3];
+
+  std::vector<MonitorElement *> meResidualXSummedLay;
+  std::vector<MonitorElement *> meResidualYSummedLay;
+
+  MonitorElement *meNofTracks_;
+  MonitorElement *meNofTracksInPixVol_;
+  MonitorElement *meNofClustersOnTrack_;
+  std::vector<MonitorElement *> meNofClustersvsPhiOnTrack_layers;
+  std::vector<MonitorElement *> meNofClustersvsPhiOnTrack_diskps;
+  std::vector<MonitorElement *> meNofClustersvsPhiOnTrack_diskms;
+  MonitorElement *meNofClustersNotOnTrack_;
+  MonitorElement *meClChargeOnTrack_all;
+  MonitorElement *meClChargeOnTrack_bpix;
+  MonitorElement *meClChargeOnTrack_fpix;
+  std::vector<MonitorElement *> meClChargeOnTrack_layers;
+  std::vector<MonitorElement *> meClChargeOnTrack_diskps;
+  std::vector<MonitorElement *> meClChargeOnTrack_diskms;
+  MonitorElement *meClChargeNotOnTrack_all;
+  MonitorElement *meClChargeNotOnTrack_bpix;
+  MonitorElement *meClChargeNotOnTrack_fpix;
+  std::vector<MonitorElement *> meClChargeNotOnTrack_layers;
+  std::vector<MonitorElement *> meClChargeNotOnTrack_diskps;
+  std::vector<MonitorElement *> meClChargeNotOnTrack_diskms;
+  MonitorElement *meClSizeOnTrack_all;
+  MonitorElement *meClSizeOnTrack_bpix;
+  MonitorElement *meClSizeOnTrack_fpix;
+  std::vector<MonitorElement *> meClSizeOnTrack_layers;
+  std::vector<MonitorElement *> meClSizeOnTrack_diskps;
+  std::vector<MonitorElement *> meClSizeOnTrack_diskms;
+  MonitorElement *meClSizeNotOnTrack_all;
+  MonitorElement *meClSizeNotOnTrack_bpix;
+  MonitorElement *meClSizeNotOnTrack_fpix;
+  std::vector<MonitorElement *> meClSizeNotOnTrack_layers;
+  std::vector<MonitorElement *> meClSizeNotOnTrack_diskps;
+  std::vector<MonitorElement *> meClSizeNotOnTrack_diskms;
+  MonitorElement *meClSizeXOnTrack_all;
+  MonitorElement *meClSizeXOnTrack_bpix;
+  MonitorElement *meClSizeXOnTrack_fpix;
+  std::vector<MonitorElement *> meClSizeXOnTrack_layers;
+  std::vector<MonitorElement *> meClSizeXOnTrack_diskps;
+  std::vector<MonitorElement *> meClSizeXOnTrack_diskms;
+  MonitorElement *meClSizeXNotOnTrack_all;
+  MonitorElement *meClSizeXNotOnTrack_bpix;
+  MonitorElement *meClSizeXNotOnTrack_fpix;
+  std::vector<MonitorElement *> meClSizeXNotOnTrack_layers;
+  std::vector<MonitorElement *> meClSizeXNotOnTrack_diskps;
+  std::vector<MonitorElement *> meClSizeXNotOnTrack_diskms;
+  MonitorElement *meClSizeYOnTrack_all;
+  MonitorElement *meClSizeYOnTrack_bpix;
+  MonitorElement *meClSizeYOnTrack_fpix;
+  std::vector<MonitorElement *> meClSizeYOnTrack_layers;
+  std::vector<MonitorElement *> meClSizeYOnTrack_diskps;
+  std::vector<MonitorElement *> meClSizeYOnTrack_diskms;
+  MonitorElement *meClSizeYNotOnTrack_all;
+  MonitorElement *meClSizeYNotOnTrack_bpix;
+  MonitorElement *meClSizeYNotOnTrack_fpix;
+  std::vector<MonitorElement *> meClSizeYNotOnTrack_layers;
+  std::vector<MonitorElement *> meClSizeYNotOnTrack_diskps;
+  std::vector<MonitorElement *> meClSizeYNotOnTrack_diskms;
+
+  // new
+  MonitorElement *meNClustersOnTrack_all;
+  MonitorElement *meNClustersOnTrack_bpix;
+  MonitorElement *meNClustersOnTrack_fpix;
+  std::vector<MonitorElement *> meNClustersOnTrack_layers;
+  std::vector<MonitorElement *> meNClustersOnTrack_diskps;
+  std::vector<MonitorElement *> meNClustersOnTrack_diskms;
+  MonitorElement *meNClustersNotOnTrack_all;
+  MonitorElement *meNClustersNotOnTrack_bpix;
+  MonitorElement *meNClustersNotOnTrack_fpix;
+  std::vector<MonitorElement *> meNClustersNotOnTrack_layers;
+  std::vector<MonitorElement *> meNClustersNotOnTrack_diskps;
+  std::vector<MonitorElement *> meNClustersNotOnTrack_diskms;
+  //
+
+  std::vector<MonitorElement *> meClPosLayersOnTrack;
+  std::vector<MonitorElement *> meClPosLayersLadVsModOnTrack;
+  std::vector<MonitorElement *> meClPosLayersNotOnTrack;
+  std::vector<MonitorElement *> meClPosDiskspzOnTrack;
+  std::vector<MonitorElement *> meClPosDisksmzOnTrack;
+  std::vector<MonitorElement *> meClPosDiskspzNotOnTrack;
+  std::vector<MonitorElement *> meClPosDisksmzNotOnTrack;
+
+  std::vector<MonitorElement *> meZeroRocLadvsModOnTrackBarrel;
+  std::vector<MonitorElement *> meZeroRocLadvsModOffTrackBarrel;
+
+  MonitorElement *meHitProbability;
+  MonitorElement *meRocBladevsDiskEndcapOnTrk;
+  MonitorElement *meRocBladevsDiskEndcapOffTrk;
+
+  void getepixrococcupancyontrk(const TrackerTopology *const tTopo,
+                                TransientTrackingRecHit::ConstRecHitPointer hit,
+                                float xclust,
+                                float yclust,
+                                float z,
+                                MonitorElement *meinput);
+  void getepixrococcupancyofftrk(
+      DetId detId, const TrackerTopology *const tTopo, float xclust, float yclust, float z, MonitorElement *meinput);
+
+  int noOfLayers;
+  int noOfDisks;
 };
 
 #endif
diff --git a/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencyModule.cc b/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencyModule.cc
index 13512562efc26..49118cd9882ee 100644
--- a/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencyModule.cc
+++ b/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencyModule.cc
@@ -1,61 +1,51 @@
 // Package:    SiPixelMonitorTrack
 // Class:      SiPixelHitEfficiencyModule
-// 
-// class SiPixelHitEfficiencyModule SiPixelHitEfficiencyModule.cc 
+//
+// class SiPixelHitEfficiencyModule SiPixelHitEfficiencyModule.cc
 //       DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencyModule.cc
 //
 // Description: SiPixel hit efficiency data quality monitoring modules
-// Implementation: prototype -> improved -> never final - end of the 1st step 
+// Implementation: prototype -> improved -> never final - end of the 1st step
 //
 // Original Authors: Romain Rougny & Luca Mucibello
 //         Created: Mar Nov 10 13:29:00 CET nbinangle9
 
-
-
-#include <string>
 #include <iostream>
+#include <string>
 
+#include "DQM/SiPixelCommon/interface/SiPixelHistogramId.h"
+#include "DQM/SiPixelMonitorTrack/interface/SiPixelHitEfficiencyModule.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "DQM/SiPixelCommon/interface/SiPixelHistogramId.h"
-#include "DQM/SiPixelMonitorTrack/interface/SiPixelHitEfficiencyModule.h"
 
 // Data Formats
+#include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h"
-#include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
-#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
+using namespace std;
 
-using namespace std; 
-
-
-SiPixelHitEfficiencyModule::SiPixelHitEfficiencyModule() : id_(0) {
-  bBookTracks = true;
-}
-
-
-SiPixelHitEfficiencyModule::SiPixelHitEfficiencyModule(uint32_t id) : id_(id) { 
-  bBookTracks = true;
-}
-
+SiPixelHitEfficiencyModule::SiPixelHitEfficiencyModule() : id_(0) { bBookTracks = true; }
 
-SiPixelHitEfficiencyModule::~SiPixelHitEfficiencyModule() { 
- 
-}
+SiPixelHitEfficiencyModule::SiPixelHitEfficiencyModule(uint32_t id) : id_(id) { bBookTracks = true; }
 
+SiPixelHitEfficiencyModule::~SiPixelHitEfficiencyModule() {}
 
-void SiPixelHitEfficiencyModule::book(const edm::ParameterSet& iConfig, edm::EventSetup const & iSetup, DQMStore::IBooker & iBooker,int type, bool isUpgrade) {
-  
+void SiPixelHitEfficiencyModule::book(const edm::ParameterSet &iConfig,
+                                      edm::EventSetup const &iSetup,
+                                      DQMStore::IBooker &iBooker,
+                                      int type,
+                                      bool isUpgrade) {
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
   const TrackerTopology *pTT = tTopoHandle.product();
@@ -63,438 +53,458 @@ void SiPixelHitEfficiencyModule::book(const edm::ParameterSet& iConfig, edm::Eve
   bool barrel = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel);
   bool endcap = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap);
   bool isHalfModule = false;
-  if(barrel){
-    isHalfModule = PixelBarrelName(DetId(id_),pTT,isUpgrade).isHalfModule(); 
+  if (barrel) {
+    isHalfModule = PixelBarrelName(DetId(id_), pTT, isUpgrade).isHalfModule();
   }
 
   edm::InputTag src = iConfig.getParameter<edm::InputTag>("src");
-  debug_ = iConfig.getUntrackedParameter<bool>("debug",false);
-  updateEfficiencies = iConfig.getUntrackedParameter<bool>("updateEfficiencies",false);
+  debug_ = iConfig.getUntrackedParameter<bool>("debug", false);
+  updateEfficiencies = iConfig.getUntrackedParameter<bool>("updateEfficiencies", false);
   std::string hisID;
-  
+
   int nbinangle = 28;
   int nbinX = 45;
   int nbinY = 40;
 
-  if(type==0){
-    SiPixelHistogramId* theHistogramId = new SiPixelHistogramId(src.label());
-    
-    if(updateEfficiencies){
-      //EFFICIENCY
-      hisID = theHistogramId->setHistoId("efficiency",id_);
-      meEfficiency_ = iBooker.book1D(hisID,"Hit efficiency",1,0,1.);
-      meEfficiency_->setAxisTitle("Hit efficiency",1);
-    
-      hisID = theHistogramId->setHistoId("efficiencyX",id_);
-      meEfficiencyX_ = iBooker.book1D(hisID,"Hit efficiency in X",nbinX,-1.5,1.5);
-      meEfficiencyX_->setAxisTitle("Hit efficiency in X",1);
-    
-      hisID = theHistogramId->setHistoId("efficiencyY",id_);
-      meEfficiencyY_ = iBooker.book1D(hisID,"Hit efficiency in Y",nbinY,-4.,4.);
-      meEfficiencyY_->setAxisTitle("Hit efficiency in Y",1);
-    
-      hisID = theHistogramId->setHistoId("efficiencyAlpha",id_);
-      meEfficiencyAlpha_ = iBooker.book1D(hisID,"Hit efficiency in Alpha",nbinangle,-3.5,3.5);
-      meEfficiencyAlpha_->setAxisTitle("Hit efficiency in Alpha",1);
-    
-      hisID = theHistogramId->setHistoId("efficiencyBeta",id_);
-      meEfficiencyBeta_ = iBooker.book1D(hisID,"Hit efficiency in Beta",nbinangle,-3.5,3.5);
-      meEfficiencyBeta_->setAxisTitle("Hit efficiency in Beta",1);
-    }
-
-    //VALID
-    hisID = theHistogramId->setHistoId("valid",id_);
-    meValid_ = iBooker.book1D(hisID,"# Valid hits",1,0,1.);
-    meValid_->setAxisTitle("# Valid hits",1);
-    
-    //MISSING
-    hisID = theHistogramId->setHistoId("missing",id_);
-    meMissing_ = iBooker.book1D(hisID,"# Missing hits",1,0,1.);
-    meMissing_->setAxisTitle("# Missing hits",1);
-    
+  if (type == 0) {
+    SiPixelHistogramId *theHistogramId = new SiPixelHistogramId(src.label());
+
+    if (updateEfficiencies) {
+      // EFFICIENCY
+      hisID = theHistogramId->setHistoId("efficiency", id_);
+      meEfficiency_ = iBooker.book1D(hisID, "Hit efficiency", 1, 0, 1.);
+      meEfficiency_->setAxisTitle("Hit efficiency", 1);
+
+      hisID = theHistogramId->setHistoId("efficiencyX", id_);
+      meEfficiencyX_ = iBooker.book1D(hisID, "Hit efficiency in X", nbinX, -1.5, 1.5);
+      meEfficiencyX_->setAxisTitle("Hit efficiency in X", 1);
+
+      hisID = theHistogramId->setHistoId("efficiencyY", id_);
+      meEfficiencyY_ = iBooker.book1D(hisID, "Hit efficiency in Y", nbinY, -4., 4.);
+      meEfficiencyY_->setAxisTitle("Hit efficiency in Y", 1);
+
+      hisID = theHistogramId->setHistoId("efficiencyAlpha", id_);
+      meEfficiencyAlpha_ = iBooker.book1D(hisID, "Hit efficiency in Alpha", nbinangle, -3.5, 3.5);
+      meEfficiencyAlpha_->setAxisTitle("Hit efficiency in Alpha", 1);
+
+      hisID = theHistogramId->setHistoId("efficiencyBeta", id_);
+      meEfficiencyBeta_ = iBooker.book1D(hisID, "Hit efficiency in Beta", nbinangle, -3.5, 3.5);
+      meEfficiencyBeta_->setAxisTitle("Hit efficiency in Beta", 1);
+    }
+
+    // VALID
+    hisID = theHistogramId->setHistoId("valid", id_);
+    meValid_ = iBooker.book1D(hisID, "# Valid hits", 1, 0, 1.);
+    meValid_->setAxisTitle("# Valid hits", 1);
+
+    // MISSING
+    hisID = theHistogramId->setHistoId("missing", id_);
+    meMissing_ = iBooker.book1D(hisID, "# Missing hits", 1, 0, 1.);
+    meMissing_->setAxisTitle("# Missing hits", 1);
+
     delete theHistogramId;
   }
 
-  if(type==1 && barrel){
+  if (type == 1 && barrel) {
     uint32_t DBladder;
-    DBladder = PixelBarrelName(DetId(id_),pTT,isUpgrade).ladderName();
-    char sladder[80]; sprintf(sladder,"Ladder_%02i",DBladder);
+    DBladder = PixelBarrelName(DetId(id_), pTT, isUpgrade).ladderName();
+    char sladder[80];
+    sprintf(sladder, "Ladder_%02i", DBladder);
     hisID = src.label() + "_" + sladder;
-    if(isHalfModule) hisID += "H";
-    else hisID += "F";
-    
-    if(updateEfficiencies){
-      //EFFICIENCY
-      meEfficiencyLad_ = iBooker.book1D("efficiency_"+hisID,"Hit efficiency",1,0,1.);
-      meEfficiencyLad_->setAxisTitle("Hit efficiency",1);
-    
-      meEfficiencyXLad_ = iBooker.book1D("efficiencyX_"+hisID,"Hit efficiency in X",nbinX,-1.5,1.5);
-      meEfficiencyXLad_->setAxisTitle("Hit efficiency in X",1);
-    
-      meEfficiencyYLad_ = iBooker.book1D("efficiencyY_"+hisID,"Hit efficiency in Y",nbinY,-4.,4.);
-      meEfficiencyYLad_->setAxisTitle("Hit efficiency in Y",1);
-    
-      meEfficiencyAlphaLad_ = iBooker.book1D("efficiencyAlpha_"+hisID,"Hit efficiency in Alpha",nbinangle,-3.5,3.5);
-      meEfficiencyAlphaLad_->setAxisTitle("Hit efficiency in Alpha",1);
-    
-      meEfficiencyBetaLad_ = iBooker.book1D("efficiencyBeta_"+hisID,"Hit efficiency in Beta",nbinangle,-3.5,3.5);
-      meEfficiencyBetaLad_->setAxisTitle("Hit efficiency in Beta",1);
-    }
-    
-    //VALID
-    meValidLad_ = iBooker.book1D("valid_"+hisID,"# Valid hits",1,0,1.);
-    meValidLad_->setAxisTitle("# Valid hits",1);
-    
-    meValidXLad_ = iBooker.book1D("validX_"+hisID,"# Valid hits in X",nbinX,-1.5,1.5);
-    meValidXLad_->setAxisTitle("# Valid hits in X",1);
-    
-    meValidYLad_ = iBooker.book1D("validY_"+hisID,"# Valid hits in Y",nbinY,-4.,4.);
-    meValidYLad_->setAxisTitle("# Valid hits in Y",1);
-
-    meValidModLad_ = iBooker.book1D("validMod_"+hisID,"# Valid hits on Module",4,0.5,4.5);
-    meValidModLad_->setAxisTitle("# Valid hits on Module",1);    
-
-    meValidAlphaLad_ = iBooker.book1D("validAlpha_"+hisID,"# Valid hits in Alpha",nbinangle,-3.5,3.5);
-    meValidAlphaLad_->setAxisTitle("# Valid hits in Alpha",1);
-    
-    meValidBetaLad_ = iBooker.book1D("validBeta_"+hisID,"# Valid hits in Beta",nbinangle,-3.5,3.5);
-    meValidBetaLad_->setAxisTitle("# Valid hits in Beta",1);
-
-    //MISSING
-    meMissingLad_ = iBooker.book1D("missing_"+hisID,"# Missing hits",1,0,1.);
-    meMissingLad_->setAxisTitle("# Missing hits",1);
-    
-    meMissingXLad_ = iBooker.book1D("missingX_"+hisID,"# Missing hits in X",nbinX,-1.5,1.5);
-    meMissingXLad_->setAxisTitle("# Missing hits in X",1);
-    
-    meMissingYLad_ = iBooker.book1D("missingY_"+hisID,"# Missing hits in Y",nbinY,-4.,4.);
-    meMissingYLad_->setAxisTitle("# Missing hits in Y",1);
-    
-    meMissingModLad_ = iBooker.book1D("missingMod_"+hisID,"# Missing hits on Module",4,0.5,4.5);
-    meMissingModLad_->setAxisTitle("# Missing hits on Module",1);
-
-    meMissingAlphaLad_ = iBooker.book1D("missingAlpha_"+hisID,"# Missing hits in Alpha",nbinangle,-3.5,3.5);
-    meMissingAlphaLad_->setAxisTitle("# Missing hits in Alpha",1);
-    
-    meMissingBetaLad_ = iBooker.book1D("missingBeta_"+hisID,"# Missing hits in Beta",nbinangle,-3.5,3.5);
-    meMissingBetaLad_->setAxisTitle("# Missing hits in Beta",1);
+    if (isHalfModule)
+      hisID += "H";
+    else
+      hisID += "F";
+
+    if (updateEfficiencies) {
+      // EFFICIENCY
+      meEfficiencyLad_ = iBooker.book1D("efficiency_" + hisID, "Hit efficiency", 1, 0, 1.);
+      meEfficiencyLad_->setAxisTitle("Hit efficiency", 1);
+
+      meEfficiencyXLad_ = iBooker.book1D("efficiencyX_" + hisID, "Hit efficiency in X", nbinX, -1.5, 1.5);
+      meEfficiencyXLad_->setAxisTitle("Hit efficiency in X", 1);
+
+      meEfficiencyYLad_ = iBooker.book1D("efficiencyY_" + hisID, "Hit efficiency in Y", nbinY, -4., 4.);
+      meEfficiencyYLad_->setAxisTitle("Hit efficiency in Y", 1);
+
+      meEfficiencyAlphaLad_ =
+          iBooker.book1D("efficiencyAlpha_" + hisID, "Hit efficiency in Alpha", nbinangle, -3.5, 3.5);
+      meEfficiencyAlphaLad_->setAxisTitle("Hit efficiency in Alpha", 1);
+
+      meEfficiencyBetaLad_ = iBooker.book1D("efficiencyBeta_" + hisID, "Hit efficiency in Beta", nbinangle, -3.5, 3.5);
+      meEfficiencyBetaLad_->setAxisTitle("Hit efficiency in Beta", 1);
+    }
+
+    // VALID
+    meValidLad_ = iBooker.book1D("valid_" + hisID, "# Valid hits", 1, 0, 1.);
+    meValidLad_->setAxisTitle("# Valid hits", 1);
+
+    meValidXLad_ = iBooker.book1D("validX_" + hisID, "# Valid hits in X", nbinX, -1.5, 1.5);
+    meValidXLad_->setAxisTitle("# Valid hits in X", 1);
+
+    meValidYLad_ = iBooker.book1D("validY_" + hisID, "# Valid hits in Y", nbinY, -4., 4.);
+    meValidYLad_->setAxisTitle("# Valid hits in Y", 1);
+
+    meValidModLad_ = iBooker.book1D("validMod_" + hisID, "# Valid hits on Module", 4, 0.5, 4.5);
+    meValidModLad_->setAxisTitle("# Valid hits on Module", 1);
+
+    meValidAlphaLad_ = iBooker.book1D("validAlpha_" + hisID, "# Valid hits in Alpha", nbinangle, -3.5, 3.5);
+    meValidAlphaLad_->setAxisTitle("# Valid hits in Alpha", 1);
+
+    meValidBetaLad_ = iBooker.book1D("validBeta_" + hisID, "# Valid hits in Beta", nbinangle, -3.5, 3.5);
+    meValidBetaLad_->setAxisTitle("# Valid hits in Beta", 1);
+
+    // MISSING
+    meMissingLad_ = iBooker.book1D("missing_" + hisID, "# Missing hits", 1, 0, 1.);
+    meMissingLad_->setAxisTitle("# Missing hits", 1);
+
+    meMissingXLad_ = iBooker.book1D("missingX_" + hisID, "# Missing hits in X", nbinX, -1.5, 1.5);
+    meMissingXLad_->setAxisTitle("# Missing hits in X", 1);
+
+    meMissingYLad_ = iBooker.book1D("missingY_" + hisID, "# Missing hits in Y", nbinY, -4., 4.);
+    meMissingYLad_->setAxisTitle("# Missing hits in Y", 1);
+
+    meMissingModLad_ = iBooker.book1D("missingMod_" + hisID, "# Missing hits on Module", 4, 0.5, 4.5);
+    meMissingModLad_->setAxisTitle("# Missing hits on Module", 1);
+
+    meMissingAlphaLad_ = iBooker.book1D("missingAlpha_" + hisID, "# Missing hits in Alpha", nbinangle, -3.5, 3.5);
+    meMissingAlphaLad_->setAxisTitle("# Missing hits in Alpha", 1);
+
+    meMissingBetaLad_ = iBooker.book1D("missingBeta_" + hisID, "# Missing hits in Beta", nbinangle, -3.5, 3.5);
+    meMissingBetaLad_->setAxisTitle("# Missing hits in Beta", 1);
   }
-  
-  if(type==2 && barrel){
+
+  if (type == 2 && barrel) {
     uint32_t DBlayer;
-    DBlayer = PixelBarrelName(DetId(id_),pTT,isUpgrade).layerName();
-    char slayer[80]; sprintf(slayer,"Layer_%i",DBlayer);
+    DBlayer = PixelBarrelName(DetId(id_), pTT, isUpgrade).layerName();
+    char slayer[80];
+    sprintf(slayer, "Layer_%i", DBlayer);
     hisID = src.label() + "_" + slayer;
 
+    if (updateEfficiencies) {
+      // EFFICIENCY
+      meEfficiencyLay_ = iBooker.book1D("efficiency_" + hisID, "Hit efficiency", 1, 0, 1.);
+      meEfficiencyLay_->setAxisTitle("Hit efficiency", 1);
+
+      meEfficiencyXLay_ = iBooker.book1D("efficiencyX_" + hisID, "Hit efficiency in X", nbinX, -1.5, 1.5);
+      meEfficiencyXLay_->setAxisTitle("Hit efficiency in X", 1);
+
+      meEfficiencyYLay_ = iBooker.book1D("efficiencyY_" + hisID, "Hit efficiency in Y", nbinY, -4., 4.);
+      meEfficiencyYLay_->setAxisTitle("Hit efficiency in Y", 1);
+
+      meEfficiencyAlphaLay_ =
+          iBooker.book1D("efficiencyAlpha_" + hisID, "Hit efficiency in Alpha", nbinangle, -3.5, 3.5);
+      meEfficiencyAlphaLay_->setAxisTitle("Hit efficiency in Alpha", 1);
+
+      meEfficiencyBetaLay_ = iBooker.book1D("efficiencyBeta_" + hisID, "Hit efficiency in Beta", nbinangle, -3.5, 3.5);
+      meEfficiencyBetaLay_->setAxisTitle("Hit efficiency in Beta", 1);
+    }
+
+    // VALID
+    meValidLay_ = iBooker.book1D("valid_" + hisID, "# Valid hits", 1, 0, 1.);
+    meValidLay_->setAxisTitle("# Valid hits", 1);
+
+    meValidXLay_ = iBooker.book1D("validX_" + hisID, "# Valid hits in X", nbinX, -1.5, 1.5);
+    meValidXLay_->setAxisTitle("# Valid hits in X", 1);
+
+    meValidYLay_ = iBooker.book1D("validY_" + hisID, "# Valid hits in Y", nbinY, -4., 4.);
+    meValidYLay_->setAxisTitle("# Valid hits in Y", 1);
+
+    meValidAlphaLay_ = iBooker.book1D("validAlpha_" + hisID, "# Valid hits in Alpha", nbinangle, -3.5, 3.5);
+    meValidAlphaLay_->setAxisTitle("# Valid hits in Alpha", 1);
+
+    meValidBetaLay_ = iBooker.book1D("validBeta_" + hisID, "# Valid hits in Beta", nbinangle, -3.5, 3.5);
+    meValidBetaLay_->setAxisTitle("# Valid hits in Beta", 1);
 
-    if(updateEfficiencies){
-      //EFFICIENCY
-      meEfficiencyLay_ = iBooker.book1D("efficiency_"+hisID,"Hit efficiency",1,0,1.);
-      meEfficiencyLay_->setAxisTitle("Hit efficiency",1);
-    
-      meEfficiencyXLay_ = iBooker.book1D("efficiencyX_"+hisID,"Hit efficiency in X",nbinX,-1.5,1.5);
-      meEfficiencyXLay_->setAxisTitle("Hit efficiency in X",1);
-    
-      meEfficiencyYLay_ = iBooker.book1D("efficiencyY_"+hisID,"Hit efficiency in Y",nbinY,-4.,4.);
-      meEfficiencyYLay_->setAxisTitle("Hit efficiency in Y",1);
-    
-      meEfficiencyAlphaLay_ = iBooker.book1D("efficiencyAlpha_"+hisID,"Hit efficiency in Alpha",nbinangle,-3.5,3.5);
-      meEfficiencyAlphaLay_->setAxisTitle("Hit efficiency in Alpha",1);
-    
-      meEfficiencyBetaLay_ = iBooker.book1D("efficiencyBeta_"+hisID,"Hit efficiency in Beta",nbinangle,-3.5,3.5);
-      meEfficiencyBetaLay_->setAxisTitle("Hit efficiency in Beta",1);
-    }
-    
-    //VALID
-    meValidLay_ = iBooker.book1D("valid_"+hisID,"# Valid hits",1,0,1.);
-    meValidLay_->setAxisTitle("# Valid hits",1);
-    
-    meValidXLay_ = iBooker.book1D("validX_"+hisID,"# Valid hits in X",nbinX,-1.5,1.5);
-    meValidXLay_->setAxisTitle("# Valid hits in X",1);
-    
-    meValidYLay_ = iBooker.book1D("validY_"+hisID,"# Valid hits in Y",nbinY,-4.,4.);
-    meValidYLay_->setAxisTitle("# Valid hits in Y",1);
-    
-    meValidAlphaLay_ = iBooker.book1D("validAlpha_"+hisID,"# Valid hits in Alpha",nbinangle,-3.5,3.5);
-    meValidAlphaLay_->setAxisTitle("# Valid hits in Alpha",1);
-    
-    meValidBetaLay_ = iBooker.book1D("validBeta_"+hisID,"# Valid hits in Beta",nbinangle,-3.5,3.5);
-    meValidBetaLay_->setAxisTitle("# Valid hits in Beta",1);
-
-    //MISSING
-    meMissingLay_ = iBooker.book1D("missing_"+hisID,"# Missing hits",1,0,1.);
-    meMissingLay_->setAxisTitle("# Missing hits",1);
-    
-    meMissingXLay_ = iBooker.book1D("missingX_"+hisID,"# Missing hits in X",nbinX,-1.5,1.5);
-    meMissingXLay_->setAxisTitle("# Missing hits in X",1);
-    
-    meMissingYLay_ = iBooker.book1D("missingY_"+hisID,"# Missing hits in Y",nbinY,-4.,4.);
-    meMissingYLay_->setAxisTitle("# Missing hits in Y",1);
-    
-    meMissingAlphaLay_ = iBooker.book1D("missingAlpha_"+hisID,"# Missing hits in Alpha",nbinangle,-3.5,3.5);
-    meMissingAlphaLay_->setAxisTitle("# Missing hits in Alpha",1);
-    
-    meMissingBetaLay_ = iBooker.book1D("missingBeta_"+hisID,"# Missing hits in Beta",nbinangle,-3.5,3.5);
-    meMissingBetaLay_->setAxisTitle("# Missing hits in Beta",1);
+    // MISSING
+    meMissingLay_ = iBooker.book1D("missing_" + hisID, "# Missing hits", 1, 0, 1.);
+    meMissingLay_->setAxisTitle("# Missing hits", 1);
+
+    meMissingXLay_ = iBooker.book1D("missingX_" + hisID, "# Missing hits in X", nbinX, -1.5, 1.5);
+    meMissingXLay_->setAxisTitle("# Missing hits in X", 1);
+
+    meMissingYLay_ = iBooker.book1D("missingY_" + hisID, "# Missing hits in Y", nbinY, -4., 4.);
+    meMissingYLay_->setAxisTitle("# Missing hits in Y", 1);
+
+    meMissingAlphaLay_ = iBooker.book1D("missingAlpha_" + hisID, "# Missing hits in Alpha", nbinangle, -3.5, 3.5);
+    meMissingAlphaLay_->setAxisTitle("# Missing hits in Alpha", 1);
+
+    meMissingBetaLay_ = iBooker.book1D("missingBeta_" + hisID, "# Missing hits in Beta", nbinangle, -3.5, 3.5);
+    meMissingBetaLay_->setAxisTitle("# Missing hits in Beta", 1);
   }
-  
-  if(type==3 && barrel){
+
+  if (type == 3 && barrel) {
     uint32_t DBmodule;
-    DBmodule = PixelBarrelName(DetId(id_),pTT,isUpgrade).moduleName();
-    char smodule[80]; sprintf(smodule,"Ring_%i",DBmodule);
+    DBmodule = PixelBarrelName(DetId(id_), pTT, isUpgrade).moduleName();
+    char smodule[80];
+    sprintf(smodule, "Ring_%i", DBmodule);
     hisID = src.label() + "_" + smodule;
-    
-    if(updateEfficiencies){
-      //EFFICIENCY
-      meEfficiencyPhi_ = iBooker.book1D("efficiency_"+hisID,"Hit efficiency",1,0,1.);
-      meEfficiencyPhi_->setAxisTitle("Hit efficiency",1);
-    
-      meEfficiencyXPhi_ = iBooker.book1D("efficiencyX_"+hisID,"Hit efficiency in X",nbinX,-1.5,1.5);
-      meEfficiencyXPhi_->setAxisTitle("Hit efficiency in X",1);
-    
-      meEfficiencyYPhi_ = iBooker.book1D("efficiencyY_"+hisID,"Hit efficiency in Y",nbinY,-4.,4.);
-      meEfficiencyYPhi_->setAxisTitle("Hit efficiency in Y",1);
-    
-      meEfficiencyAlphaPhi_ = iBooker.book1D("efficiencyAlpha_"+hisID,"Hit efficiency in Alpha",nbinangle,-3.5,3.5);
-      meEfficiencyAlphaPhi_->setAxisTitle("Hit efficiency in Alpha",1);
-    
-      meEfficiencyBetaPhi_ = iBooker.book1D("efficiencyBeta_"+hisID,"Hit efficiency in Beta",nbinangle,-3.5,3.5);
-      meEfficiencyBetaPhi_->setAxisTitle("Hit efficiency in Beta",1);
-    }
-    
-    //VALID
-    meValidPhi_ = iBooker.book1D("valid_"+hisID,"# Valid hits",1,0,1.);
-    meValidPhi_->setAxisTitle("# Valid hits",1);
-    
-    meValidXPhi_ = iBooker.book1D("validX_"+hisID,"# Valid hits in X",nbinX,-1.5,1.5);
-    meValidXPhi_->setAxisTitle("# Valid hits in X",1);
-    
-    meValidYPhi_ = iBooker.book1D("validY_"+hisID,"# Valid hits in Y",nbinY,-4.,4.);
-    meValidYPhi_->setAxisTitle("# Valid hits in Y",1);
-    
-    meValidAlphaPhi_ = iBooker.book1D("validAlpha_"+hisID,"# Valid hits in Alpha",nbinangle,-3.5,3.5);
-    meValidAlphaPhi_->setAxisTitle("# Valid hits in Alpha",1);
-    
-    meValidBetaPhi_ = iBooker.book1D("validBeta_"+hisID,"# Valid hits in Beta",nbinangle,-3.5,3.5);
-    meValidBetaPhi_->setAxisTitle("# Valid hits in Beta",1);
-
-    //MISSING
-    meMissingPhi_ = iBooker.book1D("missing_"+hisID,"# Missing hits",1,0,1.);
-    meMissingPhi_->setAxisTitle("# Missing hits",1);
-    
-    meMissingXPhi_ = iBooker.book1D("missingX_"+hisID,"# Missing hits in X",nbinX,-1.5,1.5);
-    meMissingXPhi_->setAxisTitle("# Missing hits in X",1);
-    
-    meMissingYPhi_ = iBooker.book1D("missingY_"+hisID,"# Missing hits in Y",nbinY,-4.,4.);
-    meMissingYPhi_->setAxisTitle("# Missing hits in Y",1);
-    
-    meMissingAlphaPhi_ = iBooker.book1D("missingAlpha_"+hisID,"# Missing hits in Alpha",nbinangle,-3.5,3.5);
-    meMissingAlphaPhi_->setAxisTitle("# Missing hits in Alpha",1);
-    
-    meMissingBetaPhi_ = iBooker.book1D("missingBeta_"+hisID,"# Missing hits in Beta",nbinangle,-3.5,3.5);
-    meMissingBetaPhi_->setAxisTitle("# Missing hits in Beta",1); 
+
+    if (updateEfficiencies) {
+      // EFFICIENCY
+      meEfficiencyPhi_ = iBooker.book1D("efficiency_" + hisID, "Hit efficiency", 1, 0, 1.);
+      meEfficiencyPhi_->setAxisTitle("Hit efficiency", 1);
+
+      meEfficiencyXPhi_ = iBooker.book1D("efficiencyX_" + hisID, "Hit efficiency in X", nbinX, -1.5, 1.5);
+      meEfficiencyXPhi_->setAxisTitle("Hit efficiency in X", 1);
+
+      meEfficiencyYPhi_ = iBooker.book1D("efficiencyY_" + hisID, "Hit efficiency in Y", nbinY, -4., 4.);
+      meEfficiencyYPhi_->setAxisTitle("Hit efficiency in Y", 1);
+
+      meEfficiencyAlphaPhi_ =
+          iBooker.book1D("efficiencyAlpha_" + hisID, "Hit efficiency in Alpha", nbinangle, -3.5, 3.5);
+      meEfficiencyAlphaPhi_->setAxisTitle("Hit efficiency in Alpha", 1);
+
+      meEfficiencyBetaPhi_ = iBooker.book1D("efficiencyBeta_" + hisID, "Hit efficiency in Beta", nbinangle, -3.5, 3.5);
+      meEfficiencyBetaPhi_->setAxisTitle("Hit efficiency in Beta", 1);
+    }
+
+    // VALID
+    meValidPhi_ = iBooker.book1D("valid_" + hisID, "# Valid hits", 1, 0, 1.);
+    meValidPhi_->setAxisTitle("# Valid hits", 1);
+
+    meValidXPhi_ = iBooker.book1D("validX_" + hisID, "# Valid hits in X", nbinX, -1.5, 1.5);
+    meValidXPhi_->setAxisTitle("# Valid hits in X", 1);
+
+    meValidYPhi_ = iBooker.book1D("validY_" + hisID, "# Valid hits in Y", nbinY, -4., 4.);
+    meValidYPhi_->setAxisTitle("# Valid hits in Y", 1);
+
+    meValidAlphaPhi_ = iBooker.book1D("validAlpha_" + hisID, "# Valid hits in Alpha", nbinangle, -3.5, 3.5);
+    meValidAlphaPhi_->setAxisTitle("# Valid hits in Alpha", 1);
+
+    meValidBetaPhi_ = iBooker.book1D("validBeta_" + hisID, "# Valid hits in Beta", nbinangle, -3.5, 3.5);
+    meValidBetaPhi_->setAxisTitle("# Valid hits in Beta", 1);
+
+    // MISSING
+    meMissingPhi_ = iBooker.book1D("missing_" + hisID, "# Missing hits", 1, 0, 1.);
+    meMissingPhi_->setAxisTitle("# Missing hits", 1);
+
+    meMissingXPhi_ = iBooker.book1D("missingX_" + hisID, "# Missing hits in X", nbinX, -1.5, 1.5);
+    meMissingXPhi_->setAxisTitle("# Missing hits in X", 1);
+
+    meMissingYPhi_ = iBooker.book1D("missingY_" + hisID, "# Missing hits in Y", nbinY, -4., 4.);
+    meMissingYPhi_->setAxisTitle("# Missing hits in Y", 1);
+
+    meMissingAlphaPhi_ = iBooker.book1D("missingAlpha_" + hisID, "# Missing hits in Alpha", nbinangle, -3.5, 3.5);
+    meMissingAlphaPhi_->setAxisTitle("# Missing hits in Alpha", 1);
+
+    meMissingBetaPhi_ = iBooker.book1D("missingBeta_" + hisID, "# Missing hits in Beta", nbinangle, -3.5, 3.5);
+    meMissingBetaPhi_->setAxisTitle("# Missing hits in Beta", 1);
   }
-  
-  if(type==4 && endcap){
+
+  if (type == 4 && endcap) {
     uint32_t blade;
-    blade= PixelEndcapName(DetId(id_),pTT,isUpgrade).bladeName();
-    
-    char sblade[80]; sprintf(sblade, "Blade_%02i",blade);
+    blade = PixelEndcapName(DetId(id_), pTT, isUpgrade).bladeName();
+
+    char sblade[80];
+    sprintf(sblade, "Blade_%02i", blade);
     hisID = src.label() + "_" + sblade;
 
-    if(updateEfficiencies){
-      //EFFICIENCY
-      meEfficiencyBlade_ = iBooker.book1D("efficiency_"+hisID,"Hit efficiency",1,0,1.);
-      meEfficiencyBlade_->setAxisTitle("Hit efficiency",1);
-    
-      meEfficiencyXBlade_ = iBooker.book1D("efficiencyX_"+hisID,"Hit efficiency in X",nbinX,-1.5,1.5);
-      meEfficiencyXBlade_->setAxisTitle("Hit efficiency in X",1);
-    
-      meEfficiencyYBlade_ = iBooker.book1D("efficiencyY_"+hisID,"Hit efficiency in Y",nbinY,-4.,4.);
-      meEfficiencyYBlade_->setAxisTitle("Hit efficiency in Y",1);
-    
-      meEfficiencyAlphaBlade_ = iBooker.book1D("efficiencyAlpha_"+hisID,"Hit efficiency in Alpha",nbinangle,-3.5,3.5);
-      meEfficiencyAlphaBlade_->setAxisTitle("Hit efficiency in Alpha",1);
-    
-      meEfficiencyBetaBlade_ = iBooker.book1D("efficiencyBeta_"+hisID,"Hit efficiency in Beta",nbinangle,-3.5,3.5);
-      meEfficiencyBetaBlade_->setAxisTitle("Hit efficiency in Beta",1);
-    }
-    
-    //VALID
-    meValidBlade_ = iBooker.book1D("valid_"+hisID,"# Valid hits",2,0.5,2.5);
-    meValidBlade_->setAxisTitle("# Valid hits",1);
-    
-    meValidXBlade_ = iBooker.book1D("validX_"+hisID,"# Valid hits in X",nbinX,-1.5,1.5);
-    meValidXBlade_->setAxisTitle("# Valid hits in X",1);
-    
-    meValidYBlade_ = iBooker.book1D("validY_"+hisID,"# Valid hits in Y",nbinY,-4.,4.);
-    meValidYBlade_->setAxisTitle("# Valid hits in Y",1);
-
-    meValidAlphaBlade_ = iBooker.book1D("validAlpha_"+hisID,"# Valid hits in Alpha",nbinangle,-3.5,3.5);
-    meValidAlphaBlade_->setAxisTitle("# Valid hits in Alpha",1);
-    
-    meValidBetaBlade_ = iBooker.book1D("validBeta_"+hisID,"# Valid hits in Beta",nbinangle,-3.5,3.5);
-    meValidBetaBlade_->setAxisTitle("# Valid hits in Beta",1);
-
-    //MISSING
-    meMissingBlade_ = iBooker.book1D("missing_"+hisID,"# Missing hits",2,0.5,2.5);
-    meMissingBlade_->setAxisTitle("# Missing hits",1);
-    
-    meMissingXBlade_ = iBooker.book1D("missingX_"+hisID,"# Missing hits in X",nbinX,-1.5,1.5);
-    meMissingXBlade_->setAxisTitle("# Missing hits in X",1);
-    
-    meMissingYBlade_ = iBooker.book1D("missingY_"+hisID,"# Missing hits in Y",nbinY,-4.,4.);
-    meMissingYBlade_->setAxisTitle("# Missing hits in Y",1);
-    
-    meMissingAlphaBlade_ = iBooker.book1D("missingAlpha_"+hisID,"# Missing hits in Alpha",nbinangle,-3.5,3.5);
-    meMissingAlphaBlade_->setAxisTitle("# Missing hits in Alpha",1);
-    
-    meMissingBetaBlade_ = iBooker.book1D("missingBeta_"+hisID,"# Missing hits in Beta",nbinangle,-3.5,3.5);
-    meMissingBetaBlade_->setAxisTitle("# Missing hits in Beta",1); 
+    if (updateEfficiencies) {
+      // EFFICIENCY
+      meEfficiencyBlade_ = iBooker.book1D("efficiency_" + hisID, "Hit efficiency", 1, 0, 1.);
+      meEfficiencyBlade_->setAxisTitle("Hit efficiency", 1);
+
+      meEfficiencyXBlade_ = iBooker.book1D("efficiencyX_" + hisID, "Hit efficiency in X", nbinX, -1.5, 1.5);
+      meEfficiencyXBlade_->setAxisTitle("Hit efficiency in X", 1);
+
+      meEfficiencyYBlade_ = iBooker.book1D("efficiencyY_" + hisID, "Hit efficiency in Y", nbinY, -4., 4.);
+      meEfficiencyYBlade_->setAxisTitle("Hit efficiency in Y", 1);
+
+      meEfficiencyAlphaBlade_ =
+          iBooker.book1D("efficiencyAlpha_" + hisID, "Hit efficiency in Alpha", nbinangle, -3.5, 3.5);
+      meEfficiencyAlphaBlade_->setAxisTitle("Hit efficiency in Alpha", 1);
+
+      meEfficiencyBetaBlade_ =
+          iBooker.book1D("efficiencyBeta_" + hisID, "Hit efficiency in Beta", nbinangle, -3.5, 3.5);
+      meEfficiencyBetaBlade_->setAxisTitle("Hit efficiency in Beta", 1);
+    }
+
+    // VALID
+    meValidBlade_ = iBooker.book1D("valid_" + hisID, "# Valid hits", 2, 0.5, 2.5);
+    meValidBlade_->setAxisTitle("# Valid hits", 1);
+
+    meValidXBlade_ = iBooker.book1D("validX_" + hisID, "# Valid hits in X", nbinX, -1.5, 1.5);
+    meValidXBlade_->setAxisTitle("# Valid hits in X", 1);
+
+    meValidYBlade_ = iBooker.book1D("validY_" + hisID, "# Valid hits in Y", nbinY, -4., 4.);
+    meValidYBlade_->setAxisTitle("# Valid hits in Y", 1);
+
+    meValidAlphaBlade_ = iBooker.book1D("validAlpha_" + hisID, "# Valid hits in Alpha", nbinangle, -3.5, 3.5);
+    meValidAlphaBlade_->setAxisTitle("# Valid hits in Alpha", 1);
+
+    meValidBetaBlade_ = iBooker.book1D("validBeta_" + hisID, "# Valid hits in Beta", nbinangle, -3.5, 3.5);
+    meValidBetaBlade_->setAxisTitle("# Valid hits in Beta", 1);
+
+    // MISSING
+    meMissingBlade_ = iBooker.book1D("missing_" + hisID, "# Missing hits", 2, 0.5, 2.5);
+    meMissingBlade_->setAxisTitle("# Missing hits", 1);
+
+    meMissingXBlade_ = iBooker.book1D("missingX_" + hisID, "# Missing hits in X", nbinX, -1.5, 1.5);
+    meMissingXBlade_->setAxisTitle("# Missing hits in X", 1);
+
+    meMissingYBlade_ = iBooker.book1D("missingY_" + hisID, "# Missing hits in Y", nbinY, -4., 4.);
+    meMissingYBlade_->setAxisTitle("# Missing hits in Y", 1);
+
+    meMissingAlphaBlade_ = iBooker.book1D("missingAlpha_" + hisID, "# Missing hits in Alpha", nbinangle, -3.5, 3.5);
+    meMissingAlphaBlade_->setAxisTitle("# Missing hits in Alpha", 1);
+
+    meMissingBetaBlade_ = iBooker.book1D("missingBeta_" + hisID, "# Missing hits in Beta", nbinangle, -3.5, 3.5);
+    meMissingBetaBlade_->setAxisTitle("# Missing hits in Beta", 1);
   }
-  
-  if(type==5 && endcap){
+
+  if (type == 5 && endcap) {
     uint32_t disk;
-    disk = PixelEndcapName(DetId(id_),pTT,isUpgrade).diskName();
-    
-    char sdisk[80]; sprintf(sdisk, "Disk_%i",disk);
+    disk = PixelEndcapName(DetId(id_), pTT, isUpgrade).diskName();
+
+    char sdisk[80];
+    sprintf(sdisk, "Disk_%i", disk);
     hisID = src.label() + "_" + sdisk;
-    
-    if(updateEfficiencies){
-      //EFFICIENCY
-      meEfficiencyDisk_ = iBooker.book1D("efficiency_"+hisID,"Hit efficiency",1,0,1.);
-      meEfficiencyDisk_->setAxisTitle("Hit efficiency",1);
-    
-      meEfficiencyXDisk_ = iBooker.book1D("efficiencyX_"+hisID,"Hit efficiency in X",nbinX,-1.5,1.5);
-      meEfficiencyXDisk_->setAxisTitle("Hit efficiency in X",1);
-    
-      meEfficiencyYDisk_ = iBooker.book1D("efficiencyY_"+hisID,"Hit efficiency in Y",nbinY,-4.,4.);
-      meEfficiencyYDisk_->setAxisTitle("Hit efficiency in Y",1);
-    
-      meEfficiencyAlphaDisk_ = iBooker.book1D("efficiencyAlpha_"+hisID,"Hit efficiency in Alpha",nbinangle,-3.5,3.5);
-      meEfficiencyAlphaDisk_->setAxisTitle("Hit efficiency in Alpha",1);
-    
-      meEfficiencyBetaDisk_ = iBooker.book1D("efficiencyBeta_"+hisID,"Hit efficiency in Beta",nbinangle,-3.5,3.5);
-      meEfficiencyBetaDisk_->setAxisTitle("Hit efficiency in Beta",1);
-    }
-    
-    //VALID
-    meValidDisk_ = iBooker.book1D("valid_"+hisID,"# Valid hits",1,0,1.);
-    meValidDisk_->setAxisTitle("# Valid hits",1);
-    
-    meValidXDisk_ = iBooker.book1D("validX_"+hisID,"# Valid hits in X",nbinX,-1.5,1.5);
-    meValidXDisk_->setAxisTitle("# Valid hits in X",1);
-    
-    meValidYDisk_ = iBooker.book1D("validY_"+hisID,"# Valid hits in Y",nbinY,-4.,4.);
-    meValidYDisk_->setAxisTitle("# Valid hits in Y",1);
-    
-    meValidAlphaDisk_ = iBooker.book1D("validAlpha_"+hisID,"# Valid hits in Alpha",nbinangle,-3.5,3.5);
-    meValidAlphaDisk_->setAxisTitle("# Valid hits in Alpha",1);
-    
-    meValidBetaDisk_ = iBooker.book1D("validBeta_"+hisID,"# Valid hits in Beta",nbinangle,-3.5,3.5);
-    meValidBetaDisk_->setAxisTitle("# Valid hits in Beta",1);
-
-    //MISSING
-    meMissingDisk_ = iBooker.book1D("missing_"+hisID,"# Missing hits",1,0,1.);
-    meMissingDisk_->setAxisTitle("# Missing hits",1);
-    
-    meMissingXDisk_ = iBooker.book1D("missingX_"+hisID,"# Missing hits in X",nbinX,-1.5,1.5);
-    meMissingXDisk_->setAxisTitle("# Missing hits in X",1);
-    
-    meMissingYDisk_ = iBooker.book1D("missingY_"+hisID,"# Missing hits in Y",nbinY,-4.,4.);
-    meMissingYDisk_->setAxisTitle("# Missing hits in Y",1);
-    
-    meMissingAlphaDisk_ = iBooker.book1D("missingAlpha_"+hisID,"# Missing hits in Alpha",nbinangle,-3.5,3.5);
-    meMissingAlphaDisk_->setAxisTitle("# Missing hits in Alpha",1);
-    
-    meMissingBetaDisk_ = iBooker.book1D("missingBeta_"+hisID,"# Missing hits in Beta",nbinangle,-3.5,3.5);
-    meMissingBetaDisk_->setAxisTitle("# Missing hits in Beta",1);
+
+    if (updateEfficiencies) {
+      // EFFICIENCY
+      meEfficiencyDisk_ = iBooker.book1D("efficiency_" + hisID, "Hit efficiency", 1, 0, 1.);
+      meEfficiencyDisk_->setAxisTitle("Hit efficiency", 1);
+
+      meEfficiencyXDisk_ = iBooker.book1D("efficiencyX_" + hisID, "Hit efficiency in X", nbinX, -1.5, 1.5);
+      meEfficiencyXDisk_->setAxisTitle("Hit efficiency in X", 1);
+
+      meEfficiencyYDisk_ = iBooker.book1D("efficiencyY_" + hisID, "Hit efficiency in Y", nbinY, -4., 4.);
+      meEfficiencyYDisk_->setAxisTitle("Hit efficiency in Y", 1);
+
+      meEfficiencyAlphaDisk_ =
+          iBooker.book1D("efficiencyAlpha_" + hisID, "Hit efficiency in Alpha", nbinangle, -3.5, 3.5);
+      meEfficiencyAlphaDisk_->setAxisTitle("Hit efficiency in Alpha", 1);
+
+      meEfficiencyBetaDisk_ = iBooker.book1D("efficiencyBeta_" + hisID, "Hit efficiency in Beta", nbinangle, -3.5, 3.5);
+      meEfficiencyBetaDisk_->setAxisTitle("Hit efficiency in Beta", 1);
+    }
+
+    // VALID
+    meValidDisk_ = iBooker.book1D("valid_" + hisID, "# Valid hits", 1, 0, 1.);
+    meValidDisk_->setAxisTitle("# Valid hits", 1);
+
+    meValidXDisk_ = iBooker.book1D("validX_" + hisID, "# Valid hits in X", nbinX, -1.5, 1.5);
+    meValidXDisk_->setAxisTitle("# Valid hits in X", 1);
+
+    meValidYDisk_ = iBooker.book1D("validY_" + hisID, "# Valid hits in Y", nbinY, -4., 4.);
+    meValidYDisk_->setAxisTitle("# Valid hits in Y", 1);
+
+    meValidAlphaDisk_ = iBooker.book1D("validAlpha_" + hisID, "# Valid hits in Alpha", nbinangle, -3.5, 3.5);
+    meValidAlphaDisk_->setAxisTitle("# Valid hits in Alpha", 1);
+
+    meValidBetaDisk_ = iBooker.book1D("validBeta_" + hisID, "# Valid hits in Beta", nbinangle, -3.5, 3.5);
+    meValidBetaDisk_->setAxisTitle("# Valid hits in Beta", 1);
+
+    // MISSING
+    meMissingDisk_ = iBooker.book1D("missing_" + hisID, "# Missing hits", 1, 0, 1.);
+    meMissingDisk_->setAxisTitle("# Missing hits", 1);
+
+    meMissingXDisk_ = iBooker.book1D("missingX_" + hisID, "# Missing hits in X", nbinX, -1.5, 1.5);
+    meMissingXDisk_->setAxisTitle("# Missing hits in X", 1);
+
+    meMissingYDisk_ = iBooker.book1D("missingY_" + hisID, "# Missing hits in Y", nbinY, -4., 4.);
+    meMissingYDisk_->setAxisTitle("# Missing hits in Y", 1);
+
+    meMissingAlphaDisk_ = iBooker.book1D("missingAlpha_" + hisID, "# Missing hits in Alpha", nbinangle, -3.5, 3.5);
+    meMissingAlphaDisk_->setAxisTitle("# Missing hits in Alpha", 1);
+
+    meMissingBetaDisk_ = iBooker.book1D("missingBeta_" + hisID, "# Missing hits in Beta", nbinangle, -3.5, 3.5);
+    meMissingBetaDisk_->setAxisTitle("# Missing hits in Beta", 1);
   }
-    
-   
-  if(type==6 && endcap){
+
+  if (type == 6 && endcap) {
     uint32_t panel;
     uint32_t module;
-    panel= PixelEndcapName(DetId(id_),pTT,isUpgrade).pannelName();
-    module= PixelEndcapName(DetId(id_),pTT,isUpgrade).plaquetteName();
-    
-    char slab[80]; sprintf(slab, "Panel_%i_Ring_%i",panel, module);
+    panel = PixelEndcapName(DetId(id_), pTT, isUpgrade).pannelName();
+    module = PixelEndcapName(DetId(id_), pTT, isUpgrade).plaquetteName();
+
+    char slab[80];
+    sprintf(slab, "Panel_%i_Ring_%i", panel, module);
     hisID = src.label() + "_" + slab;
-    
-    if(updateEfficiencies){
-      //EFFICIENCY
-      meEfficiencyRing_ = iBooker.book1D("efficiency_"+hisID,"Hit efficiency",1,0,1.);
-      meEfficiencyRing_->setAxisTitle("Hit efficiency",1);
-    
-      meEfficiencyXRing_ = iBooker.book1D("efficiencyX_"+hisID,"Hit efficiency in X",nbinX,-1.5,1.5);
-      meEfficiencyXRing_->setAxisTitle("Hit efficiency in X",1);
-    
-      meEfficiencyYRing_ = iBooker.book1D("efficiencyY_"+hisID,"Hit efficiency in Y",nbinY,-4.,4.);
-      meEfficiencyYRing_->setAxisTitle("Hit efficiency in Y",1);
-    
-      meEfficiencyAlphaRing_ = iBooker.book1D("efficiencyAlpha_"+hisID,"Hit efficiency in Alpha",nbinangle,-3.5,3.5);
-      meEfficiencyAlphaRing_->setAxisTitle("Hit efficiency in Alpha",1);
-    
-      meEfficiencyBetaRing_ = iBooker.book1D("efficiencyBeta_"+hisID,"Hit efficiency in Beta",nbinangle,-3.5,3.5);
-      meEfficiencyBetaRing_->setAxisTitle("Hit efficiency in Beta",1);
-    }
-    
-    //VALID
-    meValidRing_ = iBooker.book1D("valid_"+hisID,"# Valid hits",1,0,1.);
-    meValidRing_->setAxisTitle("# Valid hits",1);
-    
-    meValidXRing_ = iBooker.book1D("validX_"+hisID,"# Valid hits in X",nbinX,-1.5,1.5);
-    meValidXRing_->setAxisTitle("# Valid hits in X",1);
-    
-    meValidYRing_ = iBooker.book1D("validY_"+hisID,"# Valid hits in Y",nbinY,-4.,4.);
-    meValidYRing_->setAxisTitle("# Valid hits in Y",1);
-    
-    meValidAlphaRing_ = iBooker.book1D("validAlpha_"+hisID,"# Valid hits in Alpha",nbinangle,-3.5,3.5);
-    meValidAlphaRing_->setAxisTitle("# Valid hits in Alpha",1);
-    
-    meValidBetaRing_ = iBooker.book1D("validBeta_"+hisID,"# Valid hits in Beta",nbinangle,-3.5,3.5);
-    meValidBetaRing_->setAxisTitle("# Valid hits in Beta",1);
-
-    //MISSING
-    meMissingRing_ = iBooker.book1D("missing_"+hisID,"# Missing hits",1,0,1.);
-    meMissingRing_->setAxisTitle("# Missing hits",1);
-    
-    meMissingXRing_ = iBooker.book1D("missingX_"+hisID,"# Missing hits in X",nbinX,-1.5,1.5);
-    meMissingXRing_->setAxisTitle("# Missing hits in X",1);
-    
-    meMissingYRing_ = iBooker.book1D("missingY_"+hisID,"# Missing hits in Y",nbinY,-4.,4.);
-    meMissingYRing_->setAxisTitle("# Missing hits in Y",1);
-    
-    meMissingAlphaRing_ = iBooker.book1D("missingAlpha_"+hisID,"# Missing hits in Alpha",nbinangle,-3.5,3.5);
-    meMissingAlphaRing_->setAxisTitle("# Missing hits in Alpha",1);
-    
-    meMissingBetaRing_ = iBooker.book1D("missingBeta_"+hisID,"# Missing hits in Beta",nbinangle,-3.5,3.5);
-    meMissingBetaRing_->setAxisTitle("# Missing hits in Beta",1);
+
+    if (updateEfficiencies) {
+      // EFFICIENCY
+      meEfficiencyRing_ = iBooker.book1D("efficiency_" + hisID, "Hit efficiency", 1, 0, 1.);
+      meEfficiencyRing_->setAxisTitle("Hit efficiency", 1);
+
+      meEfficiencyXRing_ = iBooker.book1D("efficiencyX_" + hisID, "Hit efficiency in X", nbinX, -1.5, 1.5);
+      meEfficiencyXRing_->setAxisTitle("Hit efficiency in X", 1);
+
+      meEfficiencyYRing_ = iBooker.book1D("efficiencyY_" + hisID, "Hit efficiency in Y", nbinY, -4., 4.);
+      meEfficiencyYRing_->setAxisTitle("Hit efficiency in Y", 1);
+
+      meEfficiencyAlphaRing_ =
+          iBooker.book1D("efficiencyAlpha_" + hisID, "Hit efficiency in Alpha", nbinangle, -3.5, 3.5);
+      meEfficiencyAlphaRing_->setAxisTitle("Hit efficiency in Alpha", 1);
+
+      meEfficiencyBetaRing_ = iBooker.book1D("efficiencyBeta_" + hisID, "Hit efficiency in Beta", nbinangle, -3.5, 3.5);
+      meEfficiencyBetaRing_->setAxisTitle("Hit efficiency in Beta", 1);
+    }
+
+    // VALID
+    meValidRing_ = iBooker.book1D("valid_" + hisID, "# Valid hits", 1, 0, 1.);
+    meValidRing_->setAxisTitle("# Valid hits", 1);
+
+    meValidXRing_ = iBooker.book1D("validX_" + hisID, "# Valid hits in X", nbinX, -1.5, 1.5);
+    meValidXRing_->setAxisTitle("# Valid hits in X", 1);
+
+    meValidYRing_ = iBooker.book1D("validY_" + hisID, "# Valid hits in Y", nbinY, -4., 4.);
+    meValidYRing_->setAxisTitle("# Valid hits in Y", 1);
+
+    meValidAlphaRing_ = iBooker.book1D("validAlpha_" + hisID, "# Valid hits in Alpha", nbinangle, -3.5, 3.5);
+    meValidAlphaRing_->setAxisTitle("# Valid hits in Alpha", 1);
+
+    meValidBetaRing_ = iBooker.book1D("validBeta_" + hisID, "# Valid hits in Beta", nbinangle, -3.5, 3.5);
+    meValidBetaRing_->setAxisTitle("# Valid hits in Beta", 1);
+
+    // MISSING
+    meMissingRing_ = iBooker.book1D("missing_" + hisID, "# Missing hits", 1, 0, 1.);
+    meMissingRing_->setAxisTitle("# Missing hits", 1);
+
+    meMissingXRing_ = iBooker.book1D("missingX_" + hisID, "# Missing hits in X", nbinX, -1.5, 1.5);
+    meMissingXRing_->setAxisTitle("# Missing hits in X", 1);
+
+    meMissingYRing_ = iBooker.book1D("missingY_" + hisID, "# Missing hits in Y", nbinY, -4., 4.);
+    meMissingYRing_->setAxisTitle("# Missing hits in Y", 1);
+
+    meMissingAlphaRing_ = iBooker.book1D("missingAlpha_" + hisID, "# Missing hits in Alpha", nbinangle, -3.5, 3.5);
+    meMissingAlphaRing_->setAxisTitle("# Missing hits in Alpha", 1);
+
+    meMissingBetaRing_ = iBooker.book1D("missingBeta_" + hisID, "# Missing hits in Beta", nbinangle, -3.5, 3.5);
+    meMissingBetaRing_->setAxisTitle("# Missing hits in Beta", 1);
   }
 }
 
-
-void SiPixelHitEfficiencyModule::fill(const TrackerTopology * pTT,const LocalTrajectoryParameters& ltp, bool isHitValid, bool modon, bool ladon, bool layon, bool phion, bool bladeon, bool diskon, bool ringon) {  
-  
+void SiPixelHitEfficiencyModule::fill(const TrackerTopology *pTT,
+                                      const LocalTrajectoryParameters &ltp,
+                                      bool isHitValid,
+                                      bool modon,
+                                      bool ladon,
+                                      bool layon,
+                                      bool phion,
+                                      bool bladeon,
+                                      bool diskon,
+                                      bool ringon) {
   bool barrel = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel);
   bool endcap = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap);
 
-  LocalVector localDir = ltp.momentum()/ltp.momentum().mag();
+  LocalVector localDir = ltp.momentum() / ltp.momentum().mag();
   float prediction_alpha = atan2(localDir.z(), localDir.x());
   float prediction_beta = atan2(localDir.z(), localDir.y());
   float prediction_x = ltp.position().x();
   float prediction_y = ltp.position().y();
- 
-  PixelBarrelName PBN= PixelBarrelName(DetId(id_), pTT);
-  int imod=PBN.moduleName();
-  PixelEndcapName PEN= PixelEndcapName(DetId(id_),pTT);
-  int ipan=PEN.pannelName(); 
-  
-  if(isHitValid){
-    if(modon){
+
+  PixelBarrelName PBN = PixelBarrelName(DetId(id_), pTT);
+  int imod = PBN.moduleName();
+  PixelEndcapName PEN = PixelEndcapName(DetId(id_), pTT);
+  int ipan = PEN.pannelName();
+
+  if (isHitValid) {
+    if (modon) {
       meValid_->Fill(0.5);
     }
-    if(barrel && ladon){
+    if (barrel && ladon) {
       meValidLad_->Fill(0.5);
       meValidXLad_->Fill(prediction_x);
       meValidYLad_->Fill(prediction_y);
@@ -502,47 +512,46 @@ void SiPixelHitEfficiencyModule::fill(const TrackerTopology * pTT,const LocalTra
       meValidAlphaLad_->Fill(prediction_alpha);
       meValidBetaLad_->Fill(prediction_beta);
     }
-    if(barrel && layon){
+    if (barrel && layon) {
       meValidLay_->Fill(0.5);
       meValidXLay_->Fill(prediction_x);
       meValidYLay_->Fill(prediction_y);
       meValidAlphaLay_->Fill(prediction_alpha);
       meValidBetaLay_->Fill(prediction_beta);
-    }   
-    if(barrel && phion){
+    }
+    if (barrel && phion) {
       meValidPhi_->Fill(0.5);
       meValidXPhi_->Fill(prediction_x);
       meValidYPhi_->Fill(prediction_y);
       meValidAlphaPhi_->Fill(prediction_alpha);
       meValidBetaPhi_->Fill(prediction_beta);
     }
-    if(endcap && bladeon){
+    if (endcap && bladeon) {
       meValidBlade_->Fill(ipan);
       meValidXBlade_->Fill(prediction_x);
       meValidYBlade_->Fill(prediction_y);
       meValidAlphaBlade_->Fill(prediction_alpha);
       meValidBetaBlade_->Fill(prediction_beta);
     }
-    if(endcap && diskon){
+    if (endcap && diskon) {
       meValidDisk_->Fill(0.5);
       meValidXDisk_->Fill(prediction_x);
       meValidYDisk_->Fill(prediction_y);
       meValidAlphaDisk_->Fill(prediction_alpha);
       meValidBetaDisk_->Fill(prediction_beta);
     }
-    if(endcap && ringon){
+    if (endcap && ringon) {
       meValidRing_->Fill(0.5);
       meValidXRing_->Fill(prediction_x);
       meValidYRing_->Fill(prediction_y);
       meValidAlphaRing_->Fill(prediction_alpha);
       meValidBetaRing_->Fill(prediction_beta);
     }
-  }
-  else {
-    if(modon){
+  } else {
+    if (modon) {
       meMissing_->Fill(0.5);
     }
-    if(barrel && ladon){
+    if (barrel && ladon) {
       meMissingLad_->Fill(0.5);
       meMissingXLad_->Fill(prediction_x);
       meMissingYLad_->Fill(prediction_y);
@@ -550,35 +559,35 @@ void SiPixelHitEfficiencyModule::fill(const TrackerTopology * pTT,const LocalTra
       meMissingAlphaLad_->Fill(prediction_alpha);
       meMissingBetaLad_->Fill(prediction_beta);
     }
-    if(barrel && layon){
+    if (barrel && layon) {
       meMissingLay_->Fill(0.5);
       meMissingXLay_->Fill(prediction_x);
       meMissingYLay_->Fill(prediction_y);
       meMissingAlphaLay_->Fill(prediction_alpha);
       meMissingBetaLay_->Fill(prediction_beta);
-    }   
-    if(barrel && phion){
+    }
+    if (barrel && phion) {
       meMissingPhi_->Fill(0.5);
       meMissingXPhi_->Fill(prediction_x);
       meMissingYPhi_->Fill(prediction_y);
       meMissingAlphaPhi_->Fill(prediction_alpha);
       meMissingBetaPhi_->Fill(prediction_beta);
     }
-    if(endcap && bladeon){
+    if (endcap && bladeon) {
       meMissingBlade_->Fill(ipan);
       meMissingXBlade_->Fill(prediction_x);
       meMissingYBlade_->Fill(prediction_y);
       meMissingAlphaBlade_->Fill(prediction_alpha);
       meMissingBetaBlade_->Fill(prediction_beta);
     }
-    if(endcap && diskon){
+    if (endcap && diskon) {
       meMissingDisk_->Fill(0.5);
       meMissingXDisk_->Fill(prediction_x);
       meMissingYDisk_->Fill(prediction_y);
       meMissingAlphaDisk_->Fill(prediction_alpha);
       meMissingBetaDisk_->Fill(prediction_beta);
     }
-    if(endcap && ringon){
+    if (endcap && ringon) {
       meMissingRing_->Fill(0.5);
       meMissingXRing_->Fill(prediction_x);
       meMissingYRing_->Fill(prediction_y);
@@ -586,153 +595,196 @@ void SiPixelHitEfficiencyModule::fill(const TrackerTopology * pTT,const LocalTra
       meMissingBetaRing_->Fill(prediction_beta);
     }
   }
-  
-  if(updateEfficiencies)
+
+  if (updateEfficiencies)
     computeEfficiencies(modon, ladon, layon, phion, bladeon, diskon, ringon);
 }
 
-void SiPixelHitEfficiencyModule::computeEfficiencies(bool modon, bool ladon, bool layon, bool phion, bool bladeon, bool diskon, bool ringon) {
-  
-  if(debug_)
-    std::cout<<"Now Filling histos for detid "<<id_<<std::endl;
-  
+void SiPixelHitEfficiencyModule::computeEfficiencies(
+    bool modon, bool ladon, bool layon, bool phion, bool bladeon, bool diskon, bool ringon) {
+  if (debug_)
+    std::cout << "Now Filling histos for detid " << id_ << std::endl;
+
   bool barrel = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel);
   bool endcap = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap);
-  
-  if(modon){
-    meEfficiency_->setBinContent(1,(eff(meValid_->getBinContent(1),meMissing_->getBinContent(1))).first);
-    meEfficiency_->setBinError(1,(eff(meValid_->getBinContent(1),meMissing_->getBinContent(1))).second);
+
+  if (modon) {
+    meEfficiency_->setBinContent(1, (eff(meValid_->getBinContent(1), meMissing_->getBinContent(1))).first);
+    meEfficiency_->setBinError(1, (eff(meValid_->getBinContent(1), meMissing_->getBinContent(1))).second);
   }
-  if(ladon && barrel){
-    meEfficiencyLad_->setBinContent(1,(eff(meValidLad_->getBinContent(1),meMissingLad_->getBinContent(1))).first);
-    meEfficiencyLad_->setBinError(1,(eff(meValidLad_->getBinContent(1),meMissingLad_->getBinContent(1))).second);
-    for(int i=1;i<=meValidXLad_->getNbinsX();++i){
-      meEfficiencyXLad_->setBinContent(i,(eff(meValidXLad_->getBinContent(i),meMissingXLad_->getBinContent(i))).first);
-      meEfficiencyXLad_->setBinError(i,(eff(meValidXLad_->getBinContent(i),meMissingXLad_->getBinContent(i))).second);
-    }
-    for(int i=1;i<=meValidYLad_->getNbinsX();++i){
-      meEfficiencyYLad_->setBinContent(i,(eff(meValidYLad_->getBinContent(i),meMissingYLad_->getBinContent(i))).first);
-      meEfficiencyYLad_->setBinError(i,(eff(meValidYLad_->getBinContent(i),meMissingYLad_->getBinContent(i))).second);
-    }
-    for(int i=1;i<=meValidAlphaLad_->getNbinsX();++i){
-      meEfficiencyAlphaLad_->setBinContent(i,(eff(meValidAlphaLad_->getBinContent(i),meMissingAlphaLad_->getBinContent(i))).first);
-      meEfficiencyAlphaLad_->setBinError(i,(eff(meValidAlphaLad_->getBinContent(i),meMissingAlphaLad_->getBinContent(i))).second);
-    }
-    for(int i=1;i<=meValidBetaLad_->getNbinsX();++i){
-      meEfficiencyBetaLad_->setBinContent(i,(eff(meValidBetaLad_->getBinContent(i),meMissingBetaLad_->getBinContent(i))).first);
-      meEfficiencyBetaLad_->setBinError(i,(eff(meValidBetaLad_->getBinContent(i),meMissingBetaLad_->getBinContent(i))).second);
+  if (ladon && barrel) {
+    meEfficiencyLad_->setBinContent(1, (eff(meValidLad_->getBinContent(1), meMissingLad_->getBinContent(1))).first);
+    meEfficiencyLad_->setBinError(1, (eff(meValidLad_->getBinContent(1), meMissingLad_->getBinContent(1))).second);
+    for (int i = 1; i <= meValidXLad_->getNbinsX(); ++i) {
+      meEfficiencyXLad_->setBinContent(i,
+                                       (eff(meValidXLad_->getBinContent(i), meMissingXLad_->getBinContent(i))).first);
+      meEfficiencyXLad_->setBinError(i, (eff(meValidXLad_->getBinContent(i), meMissingXLad_->getBinContent(i))).second);
+    }
+    for (int i = 1; i <= meValidYLad_->getNbinsX(); ++i) {
+      meEfficiencyYLad_->setBinContent(i,
+                                       (eff(meValidYLad_->getBinContent(i), meMissingYLad_->getBinContent(i))).first);
+      meEfficiencyYLad_->setBinError(i, (eff(meValidYLad_->getBinContent(i), meMissingYLad_->getBinContent(i))).second);
+    }
+    for (int i = 1; i <= meValidAlphaLad_->getNbinsX(); ++i) {
+      meEfficiencyAlphaLad_->setBinContent(
+          i, (eff(meValidAlphaLad_->getBinContent(i), meMissingAlphaLad_->getBinContent(i))).first);
+      meEfficiencyAlphaLad_->setBinError(
+          i, (eff(meValidAlphaLad_->getBinContent(i), meMissingAlphaLad_->getBinContent(i))).second);
+    }
+    for (int i = 1; i <= meValidBetaLad_->getNbinsX(); ++i) {
+      meEfficiencyBetaLad_->setBinContent(
+          i, (eff(meValidBetaLad_->getBinContent(i), meMissingBetaLad_->getBinContent(i))).first);
+      meEfficiencyBetaLad_->setBinError(
+          i, (eff(meValidBetaLad_->getBinContent(i), meMissingBetaLad_->getBinContent(i))).second);
     }
   }
-  
-  if(layon && barrel){
-    meEfficiencyLay_->setBinContent(1,(eff(meValidLay_->getBinContent(1),meMissingLay_->getBinContent(1))).first);
-    meEfficiencyLay_->setBinError(1,(eff(meValidLay_->getBinContent(1),meMissingLay_->getBinContent(1))).second);
-    for(int i=1;i<=meValidXLay_->getNbinsX();++i){
-      meEfficiencyXLay_->setBinContent(i,(eff(meValidXLay_->getBinContent(i),meMissingXLay_->getBinContent(i))).first);
-      meEfficiencyXLay_->setBinError(i,(eff(meValidXLay_->getBinContent(i),meMissingXLay_->getBinContent(i))).second);
-    }
-    for(int i=1;i<=meValidYLay_->getNbinsX();++i){
-      meEfficiencyYLay_->setBinContent(i,(eff(meValidYLay_->getBinContent(i),meMissingYLay_->getBinContent(i))).first);
-      meEfficiencyYLay_->setBinError(i,(eff(meValidYLay_->getBinContent(i),meMissingYLay_->getBinContent(i))).second);
-    }
-    for(int i=1;i<=meValidAlphaLay_->getNbinsX();++i){
-      meEfficiencyAlphaLay_->setBinContent(i,(eff(meValidAlphaLay_->getBinContent(i),meMissingAlphaLay_->getBinContent(i))).first);
-      meEfficiencyAlphaLay_->setBinError(i,(eff(meValidAlphaLay_->getBinContent(i),meMissingAlphaLay_->getBinContent(i))).second);
-    }
-    for(int i=1;i<=meValidBetaLay_->getNbinsX();++i){
-      meEfficiencyBetaLay_->setBinContent(i,(eff(meValidBetaLay_->getBinContent(i),meMissingBetaLay_->getBinContent(i))).first);
-      meEfficiencyBetaLay_->setBinError(i,(eff(meValidBetaLay_->getBinContent(i),meMissingBetaLay_->getBinContent(i))).second);
+
+  if (layon && barrel) {
+    meEfficiencyLay_->setBinContent(1, (eff(meValidLay_->getBinContent(1), meMissingLay_->getBinContent(1))).first);
+    meEfficiencyLay_->setBinError(1, (eff(meValidLay_->getBinContent(1), meMissingLay_->getBinContent(1))).second);
+    for (int i = 1; i <= meValidXLay_->getNbinsX(); ++i) {
+      meEfficiencyXLay_->setBinContent(i,
+                                       (eff(meValidXLay_->getBinContent(i), meMissingXLay_->getBinContent(i))).first);
+      meEfficiencyXLay_->setBinError(i, (eff(meValidXLay_->getBinContent(i), meMissingXLay_->getBinContent(i))).second);
+    }
+    for (int i = 1; i <= meValidYLay_->getNbinsX(); ++i) {
+      meEfficiencyYLay_->setBinContent(i,
+                                       (eff(meValidYLay_->getBinContent(i), meMissingYLay_->getBinContent(i))).first);
+      meEfficiencyYLay_->setBinError(i, (eff(meValidYLay_->getBinContent(i), meMissingYLay_->getBinContent(i))).second);
+    }
+    for (int i = 1; i <= meValidAlphaLay_->getNbinsX(); ++i) {
+      meEfficiencyAlphaLay_->setBinContent(
+          i, (eff(meValidAlphaLay_->getBinContent(i), meMissingAlphaLay_->getBinContent(i))).first);
+      meEfficiencyAlphaLay_->setBinError(
+          i, (eff(meValidAlphaLay_->getBinContent(i), meMissingAlphaLay_->getBinContent(i))).second);
+    }
+    for (int i = 1; i <= meValidBetaLay_->getNbinsX(); ++i) {
+      meEfficiencyBetaLay_->setBinContent(
+          i, (eff(meValidBetaLay_->getBinContent(i), meMissingBetaLay_->getBinContent(i))).first);
+      meEfficiencyBetaLay_->setBinError(
+          i, (eff(meValidBetaLay_->getBinContent(i), meMissingBetaLay_->getBinContent(i))).second);
     }
   }
-  
-  if(phion && barrel){
-    meEfficiencyPhi_->setBinContent(1,(eff(meValidPhi_->getBinContent(1),meMissingPhi_->getBinContent(1))).first);
-    meEfficiencyPhi_->setBinError(1,(eff(meValidPhi_->getBinContent(1),meMissingPhi_->getBinContent(1))).second);
-    for(int i=1;i<=meValidXPhi_->getNbinsX();++i){
-      meEfficiencyXPhi_->setBinContent(i,(eff(meValidXPhi_->getBinContent(i),meMissingXPhi_->getBinContent(i))).first);
-      meEfficiencyXPhi_->setBinError(i,(eff(meValidXPhi_->getBinContent(i),meMissingXPhi_->getBinContent(i))).second);
-    }
-    for(int i=1;i<=meValidYPhi_->getNbinsX();++i){
-      meEfficiencyYPhi_->setBinContent(i,(eff(meValidYPhi_->getBinContent(i),meMissingYPhi_->getBinContent(i))).first);
-      meEfficiencyYPhi_->setBinError(i,(eff(meValidYPhi_->getBinContent(i),meMissingYPhi_->getBinContent(i))).second);
-    }
-    for(int i=1;i<=meValidAlphaPhi_->getNbinsX();++i){
-      meEfficiencyAlphaPhi_->setBinContent(i,(eff(meValidAlphaPhi_->getBinContent(i),meMissingAlphaPhi_->getBinContent(i))).first);
-      meEfficiencyAlphaPhi_->setBinError(i,(eff(meValidAlphaPhi_->getBinContent(i),meMissingAlphaPhi_->getBinContent(i))).second);
-    }
-    for(int i=1;i<=meValidBetaPhi_->getNbinsX();++i){
-      meEfficiencyBetaPhi_->setBinContent(i,(eff(meValidBetaPhi_->getBinContent(i),meMissingBetaPhi_->getBinContent(i))).first);
-      meEfficiencyBetaPhi_->setBinError(i,(eff(meValidBetaPhi_->getBinContent(i),meMissingBetaPhi_->getBinContent(i))).second);
+
+  if (phion && barrel) {
+    meEfficiencyPhi_->setBinContent(1, (eff(meValidPhi_->getBinContent(1), meMissingPhi_->getBinContent(1))).first);
+    meEfficiencyPhi_->setBinError(1, (eff(meValidPhi_->getBinContent(1), meMissingPhi_->getBinContent(1))).second);
+    for (int i = 1; i <= meValidXPhi_->getNbinsX(); ++i) {
+      meEfficiencyXPhi_->setBinContent(i,
+                                       (eff(meValidXPhi_->getBinContent(i), meMissingXPhi_->getBinContent(i))).first);
+      meEfficiencyXPhi_->setBinError(i, (eff(meValidXPhi_->getBinContent(i), meMissingXPhi_->getBinContent(i))).second);
+    }
+    for (int i = 1; i <= meValidYPhi_->getNbinsX(); ++i) {
+      meEfficiencyYPhi_->setBinContent(i,
+                                       (eff(meValidYPhi_->getBinContent(i), meMissingYPhi_->getBinContent(i))).first);
+      meEfficiencyYPhi_->setBinError(i, (eff(meValidYPhi_->getBinContent(i), meMissingYPhi_->getBinContent(i))).second);
+    }
+    for (int i = 1; i <= meValidAlphaPhi_->getNbinsX(); ++i) {
+      meEfficiencyAlphaPhi_->setBinContent(
+          i, (eff(meValidAlphaPhi_->getBinContent(i), meMissingAlphaPhi_->getBinContent(i))).first);
+      meEfficiencyAlphaPhi_->setBinError(
+          i, (eff(meValidAlphaPhi_->getBinContent(i), meMissingAlphaPhi_->getBinContent(i))).second);
+    }
+    for (int i = 1; i <= meValidBetaPhi_->getNbinsX(); ++i) {
+      meEfficiencyBetaPhi_->setBinContent(
+          i, (eff(meValidBetaPhi_->getBinContent(i), meMissingBetaPhi_->getBinContent(i))).first);
+      meEfficiencyBetaPhi_->setBinError(
+          i, (eff(meValidBetaPhi_->getBinContent(i), meMissingBetaPhi_->getBinContent(i))).second);
     }
   }
-  if(bladeon && endcap){
-    meEfficiencyBlade_->setBinContent(1,(eff(meValidBlade_->getBinContent(1),meMissingBlade_->getBinContent(1))).first);
-    meEfficiencyBlade_->setBinError(1,(eff(meValidBlade_->getBinContent(1),meMissingBlade_->getBinContent(1))).second);
-    for(int i=1;i<=meValidXBlade_->getNbinsX();++i){
-      meEfficiencyXBlade_->setBinContent(i,(eff(meValidXBlade_->getBinContent(i),meMissingXBlade_->getBinContent(i))).first);
-      meEfficiencyXBlade_->setBinError(i,(eff(meValidXBlade_->getBinContent(i),meMissingXBlade_->getBinContent(i))).second);
-    }
-    for(int i=1;i<=meValidYBlade_->getNbinsX();++i){
-      meEfficiencyYBlade_->setBinContent(i,(eff(meValidYBlade_->getBinContent(i),meMissingYBlade_->getBinContent(i))).first);
-      meEfficiencyYBlade_->setBinError(i,(eff(meValidYBlade_->getBinContent(i),meMissingYBlade_->getBinContent(i))).second);
-    }
-    for(int i=1;i<=meValidAlphaBlade_->getNbinsX();++i){
-      meEfficiencyAlphaBlade_->setBinContent(i,(eff(meValidAlphaBlade_->getBinContent(i),meMissingAlphaBlade_->getBinContent(i))).first);
-      meEfficiencyAlphaBlade_->setBinError(i,(eff(meValidAlphaBlade_->getBinContent(i),meMissingAlphaBlade_->getBinContent(i))).second);
-    }
-    for(int i=1;i<=meValidBetaBlade_->getNbinsX();++i){
-      meEfficiencyBetaBlade_->setBinContent(i,(eff(meValidBetaBlade_->getBinContent(i),meMissingBetaBlade_->getBinContent(i))).first);
-      meEfficiencyBetaBlade_->setBinError(i,(eff(meValidBetaBlade_->getBinContent(i),meMissingBetaBlade_->getBinContent(i))).second);
+  if (bladeon && endcap) {
+    meEfficiencyBlade_->setBinContent(1,
+                                      (eff(meValidBlade_->getBinContent(1), meMissingBlade_->getBinContent(1))).first);
+    meEfficiencyBlade_->setBinError(1,
+                                    (eff(meValidBlade_->getBinContent(1), meMissingBlade_->getBinContent(1))).second);
+    for (int i = 1; i <= meValidXBlade_->getNbinsX(); ++i) {
+      meEfficiencyXBlade_->setBinContent(
+          i, (eff(meValidXBlade_->getBinContent(i), meMissingXBlade_->getBinContent(i))).first);
+      meEfficiencyXBlade_->setBinError(
+          i, (eff(meValidXBlade_->getBinContent(i), meMissingXBlade_->getBinContent(i))).second);
+    }
+    for (int i = 1; i <= meValidYBlade_->getNbinsX(); ++i) {
+      meEfficiencyYBlade_->setBinContent(
+          i, (eff(meValidYBlade_->getBinContent(i), meMissingYBlade_->getBinContent(i))).first);
+      meEfficiencyYBlade_->setBinError(
+          i, (eff(meValidYBlade_->getBinContent(i), meMissingYBlade_->getBinContent(i))).second);
+    }
+    for (int i = 1; i <= meValidAlphaBlade_->getNbinsX(); ++i) {
+      meEfficiencyAlphaBlade_->setBinContent(
+          i, (eff(meValidAlphaBlade_->getBinContent(i), meMissingAlphaBlade_->getBinContent(i))).first);
+      meEfficiencyAlphaBlade_->setBinError(
+          i, (eff(meValidAlphaBlade_->getBinContent(i), meMissingAlphaBlade_->getBinContent(i))).second);
+    }
+    for (int i = 1; i <= meValidBetaBlade_->getNbinsX(); ++i) {
+      meEfficiencyBetaBlade_->setBinContent(
+          i, (eff(meValidBetaBlade_->getBinContent(i), meMissingBetaBlade_->getBinContent(i))).first);
+      meEfficiencyBetaBlade_->setBinError(
+          i, (eff(meValidBetaBlade_->getBinContent(i), meMissingBetaBlade_->getBinContent(i))).second);
     }
   }
-  if(diskon && endcap){
-    meEfficiencyDisk_->setBinContent(1,(eff(meValidDisk_->getBinContent(1),meMissingDisk_->getBinContent(1))).first);
-    meEfficiencyDisk_->setBinError(1,(eff(meValidDisk_->getBinContent(1),meMissingDisk_->getBinContent(1))).second);
-    for(int i=1;i<=meValidXDisk_->getNbinsX();++i){
-      meEfficiencyXDisk_->setBinContent(i,(eff(meValidXDisk_->getBinContent(i),meMissingXDisk_->getBinContent(i))).first);
-      meEfficiencyXDisk_->setBinError(i,(eff(meValidXDisk_->getBinContent(i),meMissingXDisk_->getBinContent(i))).second);
-    }
-    for(int i=1;i<=meValidYDisk_->getNbinsX();++i){
-      meEfficiencyYDisk_->setBinContent(i,(eff(meValidYDisk_->getBinContent(i),meMissingYDisk_->getBinContent(i))).first);
-      meEfficiencyYDisk_->setBinError(i,(eff(meValidYDisk_->getBinContent(i),meMissingYDisk_->getBinContent(i))).second);
-    }
-    for(int i=1;i<=meValidAlphaDisk_->getNbinsX();++i){
-      meEfficiencyAlphaDisk_->setBinContent(i,(eff(meValidAlphaDisk_->getBinContent(i),meMissingAlphaDisk_->getBinContent(i))).first);
-      meEfficiencyAlphaDisk_->setBinError(i,(eff(meValidAlphaDisk_->getBinContent(i),meMissingAlphaDisk_->getBinContent(i))).second);
-    }
-    for(int i=1;i<=meValidBetaDisk_->getNbinsX();++i){
-      meEfficiencyBetaDisk_->setBinContent(i,(eff(meValidBetaDisk_->getBinContent(i),meMissingBetaDisk_->getBinContent(i))).first);
-      meEfficiencyBetaDisk_->setBinError(i,(eff(meValidBetaDisk_->getBinContent(i),meMissingBetaDisk_->getBinContent(i))).second);
+  if (diskon && endcap) {
+    meEfficiencyDisk_->setBinContent(1, (eff(meValidDisk_->getBinContent(1), meMissingDisk_->getBinContent(1))).first);
+    meEfficiencyDisk_->setBinError(1, (eff(meValidDisk_->getBinContent(1), meMissingDisk_->getBinContent(1))).second);
+    for (int i = 1; i <= meValidXDisk_->getNbinsX(); ++i) {
+      meEfficiencyXDisk_->setBinContent(
+          i, (eff(meValidXDisk_->getBinContent(i), meMissingXDisk_->getBinContent(i))).first);
+      meEfficiencyXDisk_->setBinError(i,
+                                      (eff(meValidXDisk_->getBinContent(i), meMissingXDisk_->getBinContent(i))).second);
+    }
+    for (int i = 1; i <= meValidYDisk_->getNbinsX(); ++i) {
+      meEfficiencyYDisk_->setBinContent(
+          i, (eff(meValidYDisk_->getBinContent(i), meMissingYDisk_->getBinContent(i))).first);
+      meEfficiencyYDisk_->setBinError(i,
+                                      (eff(meValidYDisk_->getBinContent(i), meMissingYDisk_->getBinContent(i))).second);
+    }
+    for (int i = 1; i <= meValidAlphaDisk_->getNbinsX(); ++i) {
+      meEfficiencyAlphaDisk_->setBinContent(
+          i, (eff(meValidAlphaDisk_->getBinContent(i), meMissingAlphaDisk_->getBinContent(i))).first);
+      meEfficiencyAlphaDisk_->setBinError(
+          i, (eff(meValidAlphaDisk_->getBinContent(i), meMissingAlphaDisk_->getBinContent(i))).second);
+    }
+    for (int i = 1; i <= meValidBetaDisk_->getNbinsX(); ++i) {
+      meEfficiencyBetaDisk_->setBinContent(
+          i, (eff(meValidBetaDisk_->getBinContent(i), meMissingBetaDisk_->getBinContent(i))).first);
+      meEfficiencyBetaDisk_->setBinError(
+          i, (eff(meValidBetaDisk_->getBinContent(i), meMissingBetaDisk_->getBinContent(i))).second);
     }
   }
-  if(ringon && endcap){
-    meEfficiencyRing_->setBinContent(1,(eff(meValidRing_->getBinContent(1),meMissingRing_->getBinContent(1))).first);
-    meEfficiencyRing_->setBinError(1,(eff(meValidRing_->getBinContent(1),meMissingRing_->getBinContent(1))).second);
-    for(int i=1;i<=meValidXRing_->getNbinsX();++i){
-      meEfficiencyXRing_->setBinContent(i,(eff(meValidXRing_->getBinContent(i),meMissingXRing_->getBinContent(i))).first);
-      meEfficiencyXRing_->setBinError(i,(eff(meValidXRing_->getBinContent(i),meMissingXRing_->getBinContent(i))).second);
-    }
-    for(int i=1;i<=meValidYRing_->getNbinsX();++i){
-      meEfficiencyYRing_->setBinContent(i,(eff(meValidYRing_->getBinContent(i),meMissingYRing_->getBinContent(i))).first);
-      meEfficiencyYRing_->setBinError(i,(eff(meValidYRing_->getBinContent(i),meMissingYRing_->getBinContent(i))).second);
-    }
-    for(int i=1;i<=meValidAlphaRing_->getNbinsX();++i){
-      meEfficiencyAlphaRing_->setBinContent(i,(eff(meValidAlphaRing_->getBinContent(i),meMissingAlphaRing_->getBinContent(i))).first);
-      meEfficiencyAlphaRing_->setBinError(i,(eff(meValidAlphaRing_->getBinContent(i),meMissingAlphaRing_->getBinContent(i))).second);
-    }
-    for(int i=1;i<=meValidBetaRing_->getNbinsX();++i){
-      meEfficiencyBetaRing_->setBinContent(i,(eff(meValidBetaRing_->getBinContent(i),meMissingBetaRing_->getBinContent(i))).first);
-      meEfficiencyBetaRing_->setBinError(i,(eff(meValidBetaRing_->getBinContent(i),meMissingBetaRing_->getBinContent(i))).second);
+  if (ringon && endcap) {
+    meEfficiencyRing_->setBinContent(1, (eff(meValidRing_->getBinContent(1), meMissingRing_->getBinContent(1))).first);
+    meEfficiencyRing_->setBinError(1, (eff(meValidRing_->getBinContent(1), meMissingRing_->getBinContent(1))).second);
+    for (int i = 1; i <= meValidXRing_->getNbinsX(); ++i) {
+      meEfficiencyXRing_->setBinContent(
+          i, (eff(meValidXRing_->getBinContent(i), meMissingXRing_->getBinContent(i))).first);
+      meEfficiencyXRing_->setBinError(i,
+                                      (eff(meValidXRing_->getBinContent(i), meMissingXRing_->getBinContent(i))).second);
+    }
+    for (int i = 1; i <= meValidYRing_->getNbinsX(); ++i) {
+      meEfficiencyYRing_->setBinContent(
+          i, (eff(meValidYRing_->getBinContent(i), meMissingYRing_->getBinContent(i))).first);
+      meEfficiencyYRing_->setBinError(i,
+                                      (eff(meValidYRing_->getBinContent(i), meMissingYRing_->getBinContent(i))).second);
+    }
+    for (int i = 1; i <= meValidAlphaRing_->getNbinsX(); ++i) {
+      meEfficiencyAlphaRing_->setBinContent(
+          i, (eff(meValidAlphaRing_->getBinContent(i), meMissingAlphaRing_->getBinContent(i))).first);
+      meEfficiencyAlphaRing_->setBinError(
+          i, (eff(meValidAlphaRing_->getBinContent(i), meMissingAlphaRing_->getBinContent(i))).second);
+    }
+    for (int i = 1; i <= meValidBetaRing_->getNbinsX(); ++i) {
+      meEfficiencyBetaRing_->setBinContent(
+          i, (eff(meValidBetaRing_->getBinContent(i), meMissingBetaRing_->getBinContent(i))).first);
+      meEfficiencyBetaRing_->setBinError(
+          i, (eff(meValidBetaRing_->getBinContent(i), meMissingBetaRing_->getBinContent(i))).second);
     }
   }
-
 }
 
-std::pair<double,double> SiPixelHitEfficiencyModule::eff(double nValid, double nMissing){
-  double efficiency = 0, error = 0 ;
-  if(nValid+nMissing!=0){
-    efficiency=nValid/(nValid+nMissing);
-    error=sqrt(efficiency*(1.-efficiency)/(nValid+nMissing));
+std::pair<double, double> SiPixelHitEfficiencyModule::eff(double nValid, double nMissing) {
+  double efficiency = 0, error = 0;
+  if (nValid + nMissing != 0) {
+    efficiency = nValid / (nValid + nMissing);
+    error = sqrt(efficiency * (1. - efficiency) / (nValid + nMissing));
   }
-  return make_pair(efficiency,error);
+  return make_pair(efficiency, error);
 }
diff --git a/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc b/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc
index 2c6a3738c7105..05762306579a7 100644
--- a/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc
+++ b/DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencySource.cc
@@ -1,37 +1,36 @@
 // Package:    SiPixelMonitorTrack
 // Class:      SiPixelHitEfficiencySource
-// 
-// class SiPixelHitEfficiencyModule SiPixelHitEfficiencyModule.cc 
+//
+// class SiPixelHitEfficiencyModule SiPixelHitEfficiencyModule.cc
 //       DQM/SiPixelMonitorTrack/src/SiPixelHitEfficiencyModule.cc
 //
 // Description: SiPixel hit efficiency data quality monitoring modules
-// Implementation: prototype -> improved -> never final - end of the 1st step 
+// Implementation: prototype -> improved -> never final - end of the 1st step
 //
 // Original Authors: Romain Rougny & Luca Mucibello
 //         Created: Mar Nov 10 13:29:00 CET 2009
 
-
+#include <cmath>
 #include <iostream>
 #include <map>
-#include <cmath>
 #include <string>
-#include <vector>
 #include <utility>
+#include <vector>
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h"
 
-#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "Geometry/Records/interface/TrackerTopologyRcd.h"
-#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h"
+#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
@@ -39,718 +38,797 @@
 
 #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
 
-#include "RecoTracker/TransientTrackingRecHit/interface/TkTransientTrackingRecHitBuilder.h"
 #include "RecoLocalTracker/ClusterParameterEstimator/interface/PixelClusterParameterEstimator.h"
+#include "RecoTracker/TransientTrackingRecHit/interface/TkTransientTrackingRecHitBuilder.h"
 //#include "RecoLocalTracker/SiPixelRecHits/plugins/PixelCPEGenericESProducer.h"
 
-#include "TrackingTools/TrackFitters/interface/TrajectoryFitter.h"
-#include "TrackingTools/Records/interface/TransientRecHitRecord.h"
+#include "TrackingTools/MeasurementDet/interface/LayerMeasurements.h"
+#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
+#include "TrackingTools/PatternTools/interface/Trajectory.h"
 #include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
+#include "TrackingTools/Records/interface/TransientRecHitRecord.h"
+#include "TrackingTools/TrackAssociator/interface/TrackDetectorAssociator.h"
+#include "TrackingTools/TrackFitters/interface/TrajectoryFitter.h"
 #include "TrackingTools/TrackFitters/interface/TrajectoryStateCombiner.h"
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
-#include "TrackingTools/PatternTools/interface/Trajectory.h"
-#include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
-#include "TrackingTools/TrackAssociator/interface/TrackDetectorAssociator.h"
-#include "TrackingTools/MeasurementDet/interface/LayerMeasurements.h"
 
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h"
 #include "DQM/SiPixelMonitorTrack/interface/SiPixelHitEfficiencySource.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 
-#include "TrackingTools/DetLayers/interface/BarrelDetLayer.h"
-#include "RecoTracker/Record/interface/CkfComponentsRecord.h"
 #include "RecoTracker/MeasurementDet/interface/MeasurementTracker.h"
-#include "TrackingTools/KalmanUpdators/interface/Chi2MeasurementEstimator.h"
 #include "RecoTracker/MeasurementDet/interface/MeasurementTrackerEvent.h"
+#include "RecoTracker/Record/interface/CkfComponentsRecord.h"
+#include "TrackingTools/DetLayers/interface/BarrelDetLayer.h"
+#include "TrackingTools/KalmanUpdators/interface/Chi2MeasurementEstimator.h"
 #include "TrackingTools/MeasurementDet/interface/LayerMeasurements.h"
 #include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
 
 using namespace std;
 using namespace edm;
 
-
-SiPixelHitEfficiencySource::SiPixelHitEfficiencySource(const edm::ParameterSet& pSet) :
-  pSet_(pSet),
-  modOn( pSet.getUntrackedParameter<bool>("modOn",true) ),
-  ladOn( pSet.getUntrackedParameter<bool>("ladOn",false) ), 
-  layOn( pSet.getUntrackedParameter<bool>("layOn",false) ), 
-  phiOn( pSet.getUntrackedParameter<bool>("phiOn",false) ), 
-  ringOn( pSet.getUntrackedParameter<bool>("ringOn",false) ), 
-  bladeOn( pSet.getUntrackedParameter<bool>("bladeOn",false) ), 
-  diskOn( pSet.getUntrackedParameter<bool>("diskOn",false) ), 
-  isUpgrade( pSet.getUntrackedParameter<bool>("isUpgrade",false) )
-  //updateEfficiencies( pSet.getUntrackedParameter<bool>("updateEfficiencies",false) )
-{ 
-   pSet_ = pSet; 
-   debug_ = pSet_.getUntrackedParameter<bool>("debug", false); 
-   applyEdgeCut_ = pSet_.getUntrackedParameter<bool>("applyEdgeCut");
-   nSigma_EdgeCut_ = pSet_.getUntrackedParameter<double>("nSigma_EdgeCut");
-   vtxsrc_= pSet_.getUntrackedParameter<std::string>("vtxsrc","offlinePrimaryVertices");
-   vertexCollectionToken_ = consumes<reco::VertexCollection>(vtxsrc_);
-   tracksrc_ = consumes<TrajTrackAssociationCollection>(pSet_.getParameter<edm::InputTag>("trajectoryInput"));
-   clusterCollectionToken_ = consumes<edmNew::DetSetVector<SiPixelCluster> >(std::string("siPixelClusters"));
-
-   measurementTrackerEventToken_ = consumes<MeasurementTrackerEvent>(std::string("MeasurementTrackerEvent"));
-
-   firstRun = true;
-   
-   LogInfo("PixelDQM") << "SiPixelHitEfficiencySource constructor" << endl;
-   LogInfo ("PixelDQM") << "Mod/Lad/Lay/Phi " << modOn << "/" << ladOn << "/" 
-			<< layOn << "/" << phiOn << std::endl;
-   LogInfo ("PixelDQM") << "Blade/Disk/Ring" << bladeOn << "/" << diskOn << "/" 
-			<< ringOn << std::endl;
+SiPixelHitEfficiencySource::SiPixelHitEfficiencySource(const edm::ParameterSet &pSet)
+    : pSet_(pSet),
+      modOn(pSet.getUntrackedParameter<bool>("modOn", true)),
+      ladOn(pSet.getUntrackedParameter<bool>("ladOn", false)),
+      layOn(pSet.getUntrackedParameter<bool>("layOn", false)),
+      phiOn(pSet.getUntrackedParameter<bool>("phiOn", false)),
+      ringOn(pSet.getUntrackedParameter<bool>("ringOn", false)),
+      bladeOn(pSet.getUntrackedParameter<bool>("bladeOn", false)),
+      diskOn(pSet.getUntrackedParameter<bool>("diskOn", false)),
+      isUpgrade(pSet.getUntrackedParameter<bool>("isUpgrade", false))
+// updateEfficiencies(
+// pSet.getUntrackedParameter<bool>("updateEfficiencies",false) )
+{
+  pSet_ = pSet;
+  debug_ = pSet_.getUntrackedParameter<bool>("debug", false);
+  applyEdgeCut_ = pSet_.getUntrackedParameter<bool>("applyEdgeCut");
+  nSigma_EdgeCut_ = pSet_.getUntrackedParameter<double>("nSigma_EdgeCut");
+  vtxsrc_ = pSet_.getUntrackedParameter<std::string>("vtxsrc", "offlinePrimaryVertices");
+  vertexCollectionToken_ = consumes<reco::VertexCollection>(vtxsrc_);
+  tracksrc_ = consumes<TrajTrackAssociationCollection>(pSet_.getParameter<edm::InputTag>("trajectoryInput"));
+  clusterCollectionToken_ = consumes<edmNew::DetSetVector<SiPixelCluster>>(std::string("siPixelClusters"));
+
+  measurementTrackerEventToken_ = consumes<MeasurementTrackerEvent>(std::string("MeasurementTrackerEvent"));
+
+  firstRun = true;
+
+  LogInfo("PixelDQM") << "SiPixelHitEfficiencySource constructor" << endl;
+  LogInfo("PixelDQM") << "Mod/Lad/Lay/Phi " << modOn << "/" << ladOn << "/" << layOn << "/" << phiOn << std::endl;
+  LogInfo("PixelDQM") << "Blade/Disk/Ring" << bladeOn << "/" << diskOn << "/" << ringOn << std::endl;
 }
 
-
 SiPixelHitEfficiencySource::~SiPixelHitEfficiencySource() {
   LogInfo("PixelDQM") << "SiPixelHitEfficiencySource destructor" << endl;
 
-  std::map<uint32_t,SiPixelHitEfficiencyModule*>::iterator struct_iter;
-  for (struct_iter = theSiPixelStructure.begin() ; struct_iter != theSiPixelStructure.end() ; struct_iter++){
+  std::map<uint32_t, SiPixelHitEfficiencyModule *>::iterator struct_iter;
+  for (struct_iter = theSiPixelStructure.begin(); struct_iter != theSiPixelStructure.end(); struct_iter++) {
     delete struct_iter->second;
     struct_iter->second = nullptr;
   }
 }
 
-void SiPixelHitEfficiencySource::fillClusterProbability(int layer, int disk, bool plus, double probability){
- 
-  //barrel
-  if (layer!=0){
-    if (layer==1){
-      if (plus)  meClusterProbabilityL1_Plus_->Fill(probability);
-      else  meClusterProbabilityL1_Minus_->Fill(probability);
+void SiPixelHitEfficiencySource::fillClusterProbability(int layer, int disk, bool plus, double probability) {
+  // barrel
+  if (layer != 0) {
+    if (layer == 1) {
+      if (plus)
+        meClusterProbabilityL1_Plus_->Fill(probability);
+      else
+        meClusterProbabilityL1_Minus_->Fill(probability);
     }
 
-    else if (layer==2){
-      if (plus)  meClusterProbabilityL2_Plus_->Fill(probability);
-      else  meClusterProbabilityL2_Minus_->Fill(probability);
+    else if (layer == 2) {
+      if (plus)
+        meClusterProbabilityL2_Plus_->Fill(probability);
+      else
+        meClusterProbabilityL2_Minus_->Fill(probability);
     }
 
-    else if (layer==3){
-      if (plus)  meClusterProbabilityL3_Plus_->Fill(probability);
-      else  meClusterProbabilityL3_Minus_->Fill(probability);
+    else if (layer == 3) {
+      if (plus)
+        meClusterProbabilityL3_Plus_->Fill(probability);
+      else
+        meClusterProbabilityL3_Minus_->Fill(probability);
     }
   }
-  //Endcap
-  if (disk!=0){
-    if (disk==1){
-      if (plus)  meClusterProbabilityD1_Plus_->Fill(probability);
-      else  meClusterProbabilityD1_Minus_->Fill(probability);
+  // Endcap
+  if (disk != 0) {
+    if (disk == 1) {
+      if (plus)
+        meClusterProbabilityD1_Plus_->Fill(probability);
+      else
+        meClusterProbabilityD1_Minus_->Fill(probability);
+    }
+    if (disk == 2) {
+      if (plus)
+        meClusterProbabilityD2_Plus_->Fill(probability);
+      else
+        meClusterProbabilityD2_Minus_->Fill(probability);
     }
-    if (disk==2){
-      if (plus)  meClusterProbabilityD2_Plus_->Fill(probability);
-      else  meClusterProbabilityD2_Minus_->Fill(probability);
-    }      
-  }    
+  }
 }
 
+void SiPixelHitEfficiencySource::dqmBeginRun(const edm::Run &r, edm::EventSetup const &iSetup) {
+  LogInfo("PixelDQM") << "SiPixelHitEfficiencySource beginRun()" << endl;
 
+  if (firstRun) {
+    // retrieve TrackerGeometry for pixel dets
 
+    nvalid = 0;
+    nmissing = 0;
 
-
-void SiPixelHitEfficiencySource::dqmBeginRun(const edm::Run& r, edm::EventSetup const& iSetup) {
-  LogInfo("PixelDQM") << "SiPixelHitEfficiencySource beginRun()" << endl;
-  
-  if(firstRun){
-    // retrieve TrackerGeometry for pixel dets
-  
-    nvalid=0;
-    nmissing=0;
-  
     firstRun = false;
   }
 
   edm::ESHandle<TrackerGeometry> TG;
   iSetup.get<TrackerDigiGeometryRecord>().get(TG);
-  if (debug_) LogVerbatim("PixelDQM") << "TrackerGeometry "<< &(*TG) <<" size is "<< TG->dets().size() << endl;
- 
-  // build theSiPixelStructure with the pixel barrel and endcap dets from TrackerGeometry
-  for (TrackerGeometry::DetContainer::const_iterator pxb = TG->detsPXB().begin();  
-       pxb!=TG->detsPXB().end(); pxb++) {
-    if (dynamic_cast<PixelGeomDetUnit const *>((*pxb))!=nullptr) {
-      SiPixelHitEfficiencyModule* module = new SiPixelHitEfficiencyModule((*pxb)->geographicalId().rawId());
-      theSiPixelStructure.insert(pair<uint32_t, SiPixelHitEfficiencyModule*>((*pxb)->geographicalId().rawId(), module));
+  if (debug_)
+    LogVerbatim("PixelDQM") << "TrackerGeometry " << &(*TG) << " size is " << TG->dets().size() << endl;
+
+  // build theSiPixelStructure with the pixel barrel and endcap dets from
+  // TrackerGeometry
+  for (TrackerGeometry::DetContainer::const_iterator pxb = TG->detsPXB().begin(); pxb != TG->detsPXB().end(); pxb++) {
+    if (dynamic_cast<PixelGeomDetUnit const *>((*pxb)) != nullptr) {
+      SiPixelHitEfficiencyModule *module = new SiPixelHitEfficiencyModule((*pxb)->geographicalId().rawId());
+      theSiPixelStructure.insert(
+          pair<uint32_t, SiPixelHitEfficiencyModule *>((*pxb)->geographicalId().rawId(), module));
     }
   }
-  for (TrackerGeometry::DetContainer::const_iterator pxf = TG->detsPXF().begin(); 
-       pxf!=TG->detsPXF().end(); pxf++) {
-    if (dynamic_cast<PixelGeomDetUnit const *>((*pxf))!=nullptr) {
-      SiPixelHitEfficiencyModule* module = new SiPixelHitEfficiencyModule((*pxf)->geographicalId().rawId());
-      theSiPixelStructure.insert(pair<uint32_t, SiPixelHitEfficiencyModule*>((*pxf)->geographicalId().rawId(), module));
+  for (TrackerGeometry::DetContainer::const_iterator pxf = TG->detsPXF().begin(); pxf != TG->detsPXF().end(); pxf++) {
+    if (dynamic_cast<PixelGeomDetUnit const *>((*pxf)) != nullptr) {
+      SiPixelHitEfficiencyModule *module = new SiPixelHitEfficiencyModule((*pxf)->geographicalId().rawId());
+      theSiPixelStructure.insert(
+          pair<uint32_t, SiPixelHitEfficiencyModule *>((*pxf)->geographicalId().rawId(), module));
     }
   }
   LogInfo("PixelDQM") << "SiPixelStructure size is " << theSiPixelStructure.size() << endl;
-  
 }
 
-void SiPixelHitEfficiencySource::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const & iRun, edm::EventSetup const & iSetup){
-
-  // book residual histograms in theSiPixelFolder - one (x,y) pair of histograms per det
+void SiPixelHitEfficiencySource::bookHistograms(DQMStore::IBooker &iBooker,
+                                                edm::Run const &iRun,
+                                                edm::EventSetup const &iSetup) {
+  // book residual histograms in theSiPixelFolder - one (x,y) pair of histograms
+  // per det
   SiPixelFolderOrganizer theSiPixelFolder(false);
-  for (std::map<uint32_t, SiPixelHitEfficiencyModule*>::iterator pxd = theSiPixelStructure.begin(); 
-       pxd!=theSiPixelStructure.end(); pxd++) {
-
-    if(modOn){
-      if (theSiPixelFolder.setModuleFolder(iBooker,(*pxd).first,0,isUpgrade)) (*pxd).second->book(pSet_,iSetup,iBooker,0,isUpgrade);
-      else throw cms::Exception("LogicError") << "SiPixelHitEfficiencySource Folder Creation Failed! "; 
+  for (std::map<uint32_t, SiPixelHitEfficiencyModule *>::iterator pxd = theSiPixelStructure.begin();
+       pxd != theSiPixelStructure.end();
+       pxd++) {
+    if (modOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*pxd).first, 0, isUpgrade))
+        (*pxd).second->book(pSet_, iSetup, iBooker, 0, isUpgrade);
+      else
+        throw cms::Exception("LogicError") << "SiPixelHitEfficiencySource Folder Creation Failed! ";
     }
-    if(ladOn){
-      if (theSiPixelFolder.setModuleFolder(iBooker,(*pxd).first,1,isUpgrade)) (*pxd).second->book(pSet_,iSetup,iBooker,1,isUpgrade);
-      else throw cms::Exception("LogicError") << "SiPixelHitEfficiencySource ladder Folder Creation Failed! "; 
+    if (ladOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*pxd).first, 1, isUpgrade))
+        (*pxd).second->book(pSet_, iSetup, iBooker, 1, isUpgrade);
+      else
+        throw cms::Exception("LogicError") << "SiPixelHitEfficiencySource ladder Folder Creation Failed! ";
     }
-    if(layOn){
-      if (theSiPixelFolder.setModuleFolder(iBooker,(*pxd).first,2,isUpgrade)) (*pxd).second->book(pSet_,iSetup,iBooker,2,isUpgrade);
-      else throw cms::Exception("LogicError") << "SiPixelHitEfficiencySource layer Folder Creation Failed! "; 
+    if (layOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*pxd).first, 2, isUpgrade))
+        (*pxd).second->book(pSet_, iSetup, iBooker, 2, isUpgrade);
+      else
+        throw cms::Exception("LogicError") << "SiPixelHitEfficiencySource layer Folder Creation Failed! ";
     }
-    if(phiOn){
-      if (theSiPixelFolder.setModuleFolder(iBooker,(*pxd).first,3,isUpgrade)) (*pxd).second->book(pSet_,iSetup,iBooker,3,isUpgrade);
-      else throw cms::Exception("LogicError") << "SiPixelHitEfficiencySource phi Folder Creation Failed! "; 
+    if (phiOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*pxd).first, 3, isUpgrade))
+        (*pxd).second->book(pSet_, iSetup, iBooker, 3, isUpgrade);
+      else
+        throw cms::Exception("LogicError") << "SiPixelHitEfficiencySource phi Folder Creation Failed! ";
     }
-    if(bladeOn){
-      if (theSiPixelFolder.setModuleFolder(iBooker,(*pxd).first,4,isUpgrade)) (*pxd).second->book(pSet_,iSetup,iBooker,4,isUpgrade);
-      else throw cms::Exception("LogicError") << "SiPixelHitEfficiencySource Blade Folder Creation Failed! "; 
+    if (bladeOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*pxd).first, 4, isUpgrade))
+        (*pxd).second->book(pSet_, iSetup, iBooker, 4, isUpgrade);
+      else
+        throw cms::Exception("LogicError") << "SiPixelHitEfficiencySource Blade Folder Creation Failed! ";
     }
-    if(diskOn){
-      if (theSiPixelFolder.setModuleFolder(iBooker,(*pxd).first,5,isUpgrade)) (*pxd).second->book(pSet_,iSetup,iBooker,5,isUpgrade);
-      else throw cms::Exception("LogicError") << "SiPixelHitEfficiencySource Disk Folder Creation Failed! "; 
+    if (diskOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*pxd).first, 5, isUpgrade))
+        (*pxd).second->book(pSet_, iSetup, iBooker, 5, isUpgrade);
+      else
+        throw cms::Exception("LogicError") << "SiPixelHitEfficiencySource Disk Folder Creation Failed! ";
     }
-    if(ringOn){
-      if (theSiPixelFolder.setModuleFolder(iBooker,(*pxd).first,6,isUpgrade)) (*pxd).second->book(pSet_,iSetup,iBooker,6,isUpgrade);
-      else throw cms::Exception("LogicError") << "SiPixelHitEfficiencySource Ring Folder Creation Failed! "; 
+    if (ringOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*pxd).first, 6, isUpgrade))
+        (*pxd).second->book(pSet_, iSetup, iBooker, 6, isUpgrade);
+      else
+        throw cms::Exception("LogicError") << "SiPixelHitEfficiencySource Ring Folder Creation Failed! ";
     }
   }
 
-  //book cluster probability histos for Barrel and Endcap
+  // book cluster probability histos for Barrel and Endcap
   iBooker.setCurrentFolder("Pixel/Barrel");
 
-  meClusterProbabilityL1_Plus_  = iBooker.book1D("ClusterProbabilityXY_Layer1_Plus","ClusterProbabilityXY_Layer1_Plus",500,-14,0.1);
-  meClusterProbabilityL1_Plus_->setAxisTitle("Log(ClusterProbability)",1);
+  meClusterProbabilityL1_Plus_ =
+      iBooker.book1D("ClusterProbabilityXY_Layer1_Plus", "ClusterProbabilityXY_Layer1_Plus", 500, -14, 0.1);
+  meClusterProbabilityL1_Plus_->setAxisTitle("Log(ClusterProbability)", 1);
 
-  meClusterProbabilityL1_Minus_ = iBooker.book1D("ClusterProbabilityXY_Layer1_Minus","ClusterProbabilityXY_Layer1_Minus",500,-14,0.1);
-  meClusterProbabilityL1_Minus_->setAxisTitle("Log(ClusterProbability)",1);
+  meClusterProbabilityL1_Minus_ =
+      iBooker.book1D("ClusterProbabilityXY_Layer1_Minus", "ClusterProbabilityXY_Layer1_Minus", 500, -14, 0.1);
+  meClusterProbabilityL1_Minus_->setAxisTitle("Log(ClusterProbability)", 1);
 
-  meClusterProbabilityL2_Plus_  = iBooker.book1D("ClusterProbabilityXY_Layer2_Plus","ClusterProbabilityXY_Layer2_Plus",500,-14,0.1);
-  meClusterProbabilityL2_Plus_ ->setAxisTitle("Log(ClusterProbability)",1);
+  meClusterProbabilityL2_Plus_ =
+      iBooker.book1D("ClusterProbabilityXY_Layer2_Plus", "ClusterProbabilityXY_Layer2_Plus", 500, -14, 0.1);
+  meClusterProbabilityL2_Plus_->setAxisTitle("Log(ClusterProbability)", 1);
 
-  meClusterProbabilityL2_Minus_ = iBooker.book1D("ClusterProbabilityXY_Layer2_Minus","ClusterProbabilityXY_Layer2_Minus",500,-14,0.1);
-  meClusterProbabilityL2_Minus_ ->setAxisTitle("Log(ClusterProbability)",1);
+  meClusterProbabilityL2_Minus_ =
+      iBooker.book1D("ClusterProbabilityXY_Layer2_Minus", "ClusterProbabilityXY_Layer2_Minus", 500, -14, 0.1);
+  meClusterProbabilityL2_Minus_->setAxisTitle("Log(ClusterProbability)", 1);
 
-  meClusterProbabilityL3_Plus_  = iBooker.book1D("ClusterProbabilityXY_Layer3_Plus","ClusterProbabilityXY_Layer3_Plus",500,-14,0.1);
-  meClusterProbabilityL3_Plus_->setAxisTitle("Log(ClusterProbability)",1);
- 
-  meClusterProbabilityL3_Minus_ = iBooker.book1D("ClusterProbabilityXY_Layer3_Minus","ClusterProbabilityXY_Layer3_Minus",500,-14,0.1);
-  meClusterProbabilityL3_Minus_->setAxisTitle("Log(ClusterProbability)",1);
+  meClusterProbabilityL3_Plus_ =
+      iBooker.book1D("ClusterProbabilityXY_Layer3_Plus", "ClusterProbabilityXY_Layer3_Plus", 500, -14, 0.1);
+  meClusterProbabilityL3_Plus_->setAxisTitle("Log(ClusterProbability)", 1);
 
-  iBooker.setCurrentFolder("Pixel/Endcap");
+  meClusterProbabilityL3_Minus_ =
+      iBooker.book1D("ClusterProbabilityXY_Layer3_Minus", "ClusterProbabilityXY_Layer3_Minus", 500, -14, 0.1);
+  meClusterProbabilityL3_Minus_->setAxisTitle("Log(ClusterProbability)", 1);
 
-  meClusterProbabilityD1_Plus_  = iBooker.book1D("ClusterProbabilityXY_Disk1_Plus","ClusterProbabilityXY_Disk1_Plus",500,-14,0.1);
-  meClusterProbabilityD1_Plus_ ->setAxisTitle("Log(ClusterProbability)",1);
+  iBooker.setCurrentFolder("Pixel/Endcap");
 
-  meClusterProbabilityD1_Minus_ = iBooker.book1D("ClusterProbabilityXY_Disk1_Minus","ClusterProbabilityXY_Disk1_Minus",500,-14,0.1);
-  meClusterProbabilityD1_Minus_->setAxisTitle("Log(ClusterProbability)",1);
+  meClusterProbabilityD1_Plus_ =
+      iBooker.book1D("ClusterProbabilityXY_Disk1_Plus", "ClusterProbabilityXY_Disk1_Plus", 500, -14, 0.1);
+  meClusterProbabilityD1_Plus_->setAxisTitle("Log(ClusterProbability)", 1);
 
-  meClusterProbabilityD2_Plus_  = iBooker.book1D("ClusterProbabilityXY_Disk2_Plus","ClusterProbabilityXY_Disk2_Plus",500,-14,0.1);
-  meClusterProbabilityD2_Plus_ ->setAxisTitle("Log(ClusterProbability)",1);
+  meClusterProbabilityD1_Minus_ =
+      iBooker.book1D("ClusterProbabilityXY_Disk1_Minus", "ClusterProbabilityXY_Disk1_Minus", 500, -14, 0.1);
+  meClusterProbabilityD1_Minus_->setAxisTitle("Log(ClusterProbability)", 1);
 
-  meClusterProbabilityD2_Minus_ = iBooker.book1D("ClusterProbabilityXY_Disk2_Minus","ClusterProbabilityXY_Disk2_Minus",500,-14,0.1);
-  meClusterProbabilityD2_Minus_->setAxisTitle("Log(ClusterProbability)",1);
+  meClusterProbabilityD2_Plus_ =
+      iBooker.book1D("ClusterProbabilityXY_Disk2_Plus", "ClusterProbabilityXY_Disk2_Plus", 500, -14, 0.1);
+  meClusterProbabilityD2_Plus_->setAxisTitle("Log(ClusterProbability)", 1);
 
+  meClusterProbabilityD2_Minus_ =
+      iBooker.book1D("ClusterProbabilityXY_Disk2_Minus", "ClusterProbabilityXY_Disk2_Minus", 500, -14, 0.1);
+  meClusterProbabilityD2_Minus_->setAxisTitle("Log(ClusterProbability)", 1);
 }
 
-void SiPixelHitEfficiencySource::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
-
+void SiPixelHitEfficiencySource::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
   const TrackerTopology *pTT = tTopoHandle.product();
 
   edm::Handle<reco::VertexCollection> vertexCollectionHandle;
-  iEvent.getByToken( vertexCollectionToken_, vertexCollectionHandle );
-  if(!vertexCollectionHandle.isValid()) return;
-  nvtx_=0;
-  vtxntrk_=-9999;
-  vtxD0_=-9999.; vtxX_=-9999.; vtxY_=-9999.; vtxZ_=-9999.; vtxndof_=-9999.; vtxchi2_=-9999.;
-  const reco::VertexCollection & vertices = *vertexCollectionHandle.product();
-  reco::VertexCollection::const_iterator bestVtx=vertices.end();
-  for(reco::VertexCollection::const_iterator it=vertices.begin(); it!=vertices.end(); ++it){
-    if(!it->isValid()) continue;
-    if(vtxntrk_==-9999 ||
-       vtxntrk_<int(it->tracksSize()) ||
-       (vtxntrk_==int(it->tracksSize()) && fabs(vtxZ_)>fabs(it->z()))){
-      vtxntrk_=it->tracksSize();
-      vtxD0_=it->position().rho();
-      vtxX_=it->x();
-      vtxY_=it->y();
-      vtxZ_=it->z();
-      vtxndof_=it->ndof();
-      vtxchi2_=it->chi2();
-      bestVtx=it;
+  iEvent.getByToken(vertexCollectionToken_, vertexCollectionHandle);
+  if (!vertexCollectionHandle.isValid())
+    return;
+  nvtx_ = 0;
+  vtxntrk_ = -9999;
+  vtxD0_ = -9999.;
+  vtxX_ = -9999.;
+  vtxY_ = -9999.;
+  vtxZ_ = -9999.;
+  vtxndof_ = -9999.;
+  vtxchi2_ = -9999.;
+  const reco::VertexCollection &vertices = *vertexCollectionHandle.product();
+  reco::VertexCollection::const_iterator bestVtx = vertices.end();
+  for (reco::VertexCollection::const_iterator it = vertices.begin(); it != vertices.end(); ++it) {
+    if (!it->isValid())
+      continue;
+    if (vtxntrk_ == -9999 || vtxntrk_ < int(it->tracksSize()) ||
+        (vtxntrk_ == int(it->tracksSize()) && fabs(vtxZ_) > fabs(it->z()))) {
+      vtxntrk_ = it->tracksSize();
+      vtxD0_ = it->position().rho();
+      vtxX_ = it->x();
+      vtxY_ = it->y();
+      vtxZ_ = it->z();
+      vtxndof_ = it->ndof();
+      vtxchi2_ = it->chi2();
+      bestVtx = it;
     }
-    if(fabs(it->z())<=20. && fabs(it->position().rho())<=2. && it->ndof()>4) nvtx_++;
+    if (fabs(it->z()) <= 20. && fabs(it->position().rho()) <= 2. && it->ndof() > 4)
+      nvtx_++;
   }
-  if(nvtx_<1) return;
-    
-  //get the map
+  if (nvtx_ < 1)
+    return;
+
+  // get the map
   edm::Handle<TrajTrackAssociationCollection> match;
-  iEvent.getByToken( tracksrc_, match );
+  iEvent.getByToken(tracksrc_, match);
 
-  if(debug_){
-     edm::EDConsumerBase::Labels labels;
-     labelsForToken(tracksrc_, labels);
-     std::cout << "Trajectories from " << labels.module << std::endl;
+  if (debug_) {
+    edm::EDConsumerBase::Labels labels;
+    labelsForToken(tracksrc_, labels);
+    std::cout << "Trajectories from " << labels.module << std::endl;
   }
 
-  if (!match.isValid()) return;  
+  if (!match.isValid())
+    return;
 
   const TrajTrackAssociationCollection ttac = *(match.product());
 
-  if(debug_){
-    std::cout << "+++ NEW EVENT +++"<< std::endl;
+  if (debug_) {
+    std::cout << "+++ NEW EVENT +++" << std::endl;
     std::cout << "Map entries \t : " << ttac.size() << std::endl;
   }
 
   std::set<SiPixelCluster> clusterSet;
   //  TrajectoryStateCombiner tsoscomb;
-  //define variables for extrapolation
+  // define variables for extrapolation
   int extrapolateFrom_ = 2;
   int extrapolateTo_ = 1;
-  float maxlxmatch_=0.2;
-  float maxlymatch_=0.2;
-  bool keepOriginalMissingHit_=true;
+  float maxlxmatch_ = 0.2;
+  float maxlymatch_ = 0.2;
+  bool keepOriginalMissingHit_ = true;
   ESHandle<MeasurementTracker> measurementTrackerHandle;
 
   iSetup.get<CkfComponentsRecord>().get(measurementTrackerHandle);
-  
+
   edm::ESHandle<Chi2MeasurementEstimatorBase> est;
-  iSetup.get<TrackingComponentsRecord>().get("Chi2",est);
+  iSetup.get<TrackingComponentsRecord>().get("Chi2", est);
   edm::Handle<MeasurementTrackerEvent> measurementTrackerEventHandle;
   iEvent.getByToken(measurementTrackerEventToken_, measurementTrackerEventHandle);
   edm::ESHandle<Propagator> prop;
-  iSetup.get<TrackingComponentsRecord>().get("PropagatorWithMaterial",prop);
-  Propagator* thePropagator = prop.product()->clone();
-  //determines direction of the propagator => inward
-  if (extrapolateFrom_>=extrapolateTo_) {
+  iSetup.get<TrackingComponentsRecord>().get("PropagatorWithMaterial", prop);
+  Propagator *thePropagator = prop.product()->clone();
+  // determines direction of the propagator => inward
+  if (extrapolateFrom_ >= extrapolateTo_) {
     thePropagator->setPropagationDirection(oppositeToMomentum);
   }
   TrajectoryStateCombiner trajStateComb;
   bool debug_ = false;
-  
-  //Loop over track collection
-  for(TrajTrackAssociationCollection::const_iterator it =  ttac.begin();it !=  ttac.end(); ++it){
-    //define vector to save extrapolated tracks
+
+  // Loop over track collection
+  for (TrajTrackAssociationCollection::const_iterator it = ttac.begin(); it != ttac.end(); ++it) {
+    // define vector to save extrapolated tracks
     std::vector<TrajectoryMeasurement> expTrajMeasurements;
 
-    const edm::Ref<std::vector<Trajectory> > traj_iterator = it->key;  
+    const edm::Ref<std::vector<Trajectory>> traj_iterator = it->key;
     // Trajectory Map, extract Trajectory for this track
     reco::TrackRef trackref = it->val;
-    //tracks++;
-    
+    // tracks++;
+
     bool isBpixtrack = false, isFpixtrack = false;
-    int nStripHits=0; int L1hits=0; int L2hits=0; int L3hits=0; int L4hits=0; int D1hits=0; int D2hits=0; int D3hits=0;
-    std::vector<TrajectoryMeasurement> tmeasColl =traj_iterator->measurements();
+    int nStripHits = 0;
+    int L1hits = 0;
+    int L2hits = 0;
+    int L3hits = 0;
+    int L4hits = 0;
+    int D1hits = 0;
+    int D2hits = 0;
+    int D3hits = 0;
+    std::vector<TrajectoryMeasurement> tmeasColl = traj_iterator->measurements();
     std::vector<TrajectoryMeasurement>::const_iterator tmeasIt;
-    //loop on measurements to find out what kind of hits there are
-    for(tmeasIt = tmeasColl.begin();tmeasIt!=tmeasColl.end();tmeasIt++){
-      //if(! tmeasIt->updatedState().isValid()) continue; NOT NECESSARY (I HOPE)
+    // loop on measurements to find out what kind of hits there are
+    for (tmeasIt = tmeasColl.begin(); tmeasIt != tmeasColl.end(); tmeasIt++) {
+      // if(! tmeasIt->updatedState().isValid()) continue; NOT NECESSARY (I
+      // HOPE)
       TransientTrackingRecHit::ConstRecHitPointer testhit = tmeasIt->recHit();
-      if(testhit->geographicalId().det() != DetId::Tracker) continue; 
-      uint testSubDetID = (testhit->geographicalId().subdetId()); 
-      const DetId & hit_detId = testhit->geographicalId();
+      if (testhit->geographicalId().det() != DetId::Tracker)
+        continue;
+      uint testSubDetID = (testhit->geographicalId().subdetId());
+      const DetId &hit_detId = testhit->geographicalId();
       int hit_layer = 0;
       int hit_ladder = 0;
       int hit_mod = 0;
       int hit_disk = 0;
-      
-      if(testSubDetID==PixelSubdetector::PixelBarrel){
+
+      if (testSubDetID == PixelSubdetector::PixelBarrel) {
         isBpixtrack = true;
-	hit_layer = PixelBarrelName(hit_detId,pTT,isUpgrade).layerName();
-	
-	hit_ladder = PXBDetId(hit_detId).ladder();
-	hit_mod = PXBDetId(hit_detId).module();
-
-	if(hit_layer==1) L1hits++;
-	if(hit_layer==2) L2hits++;
-	if(hit_layer==3) L3hits++;
-	if(hit_layer==4) L4hits++;
+        hit_layer = PixelBarrelName(hit_detId, pTT, isUpgrade).layerName();
+
+        hit_ladder = PXBDetId(hit_detId).ladder();
+        hit_mod = PXBDetId(hit_detId).module();
+
+        if (hit_layer == 1)
+          L1hits++;
+        if (hit_layer == 2)
+          L2hits++;
+        if (hit_layer == 3)
+          L3hits++;
+        if (hit_layer == 4)
+          L4hits++;
       }
-      if(testSubDetID==PixelSubdetector::PixelEndcap){
+      if (testSubDetID == PixelSubdetector::PixelEndcap) {
         isFpixtrack = true;
-        hit_disk = PixelEndcapName(hit_detId,pTT,isUpgrade).diskName();
-        
-	if(hit_disk==1) D1hits++;
-	if(hit_disk==2) D2hits++;
-        if(hit_disk==3) D3hits++;
+        hit_disk = PixelEndcapName(hit_detId, pTT, isUpgrade).diskName();
+
+        if (hit_disk == 1)
+          D1hits++;
+        if (hit_disk == 2)
+          D2hits++;
+        if (hit_disk == 3)
+          D3hits++;
       }
-      if(testSubDetID==StripSubdetector::TIB) nStripHits++;
-      if(testSubDetID==StripSubdetector::TOB) nStripHits++;
-      if(testSubDetID==StripSubdetector::TID) nStripHits++;
-      if(testSubDetID==StripSubdetector::TEC) nStripHits++;
-      //check if last valid hit is in Layer 2 or Disk 1
-
-      bool lastValidL2 = false;      
-      if ((testSubDetID == PixelSubdetector::PixelBarrel && hit_layer == extrapolateFrom_) 
-	  || (testSubDetID == PixelSubdetector::PixelEndcap && hit_disk == 1)) {
-	if (testhit->isValid()) {
-	  if (tmeasIt == tmeasColl.end()-1) {
-	    lastValidL2=true;
-	  } else {
-	    tmeasIt++;
-	    TransientTrackingRecHit::ConstRecHitPointer nextRecHit = tmeasIt->recHit();
-	    uint nextSubDetID = (nextRecHit->geographicalId().subdetId()); 
-	    int nextlayer = PixelBarrelName(nextRecHit->geographicalId()).layerName();
-	    if (nextSubDetID == PixelSubdetector::PixelBarrel && nextlayer==extrapolateTo_ ) {
-	      lastValidL2=true; //&& !nextRecHit->isValid()) lastValidL2=true;
-	    }
-	    tmeasIt--;
-	  }
-	}
-      }//end check last valid layer
+      if (testSubDetID == StripSubdetector::TIB)
+        nStripHits++;
+      if (testSubDetID == StripSubdetector::TOB)
+        nStripHits++;
+      if (testSubDetID == StripSubdetector::TID)
+        nStripHits++;
+      if (testSubDetID == StripSubdetector::TEC)
+        nStripHits++;
+      // check if last valid hit is in Layer 2 or Disk 1
+
+      bool lastValidL2 = false;
+      if ((testSubDetID == PixelSubdetector::PixelBarrel && hit_layer == extrapolateFrom_) ||
+          (testSubDetID == PixelSubdetector::PixelEndcap && hit_disk == 1)) {
+        if (testhit->isValid()) {
+          if (tmeasIt == tmeasColl.end() - 1) {
+            lastValidL2 = true;
+          } else {
+            tmeasIt++;
+            TransientTrackingRecHit::ConstRecHitPointer nextRecHit = tmeasIt->recHit();
+            uint nextSubDetID = (nextRecHit->geographicalId().subdetId());
+            int nextlayer = PixelBarrelName(nextRecHit->geographicalId()).layerName();
+            if (nextSubDetID == PixelSubdetector::PixelBarrel && nextlayer == extrapolateTo_) {
+              lastValidL2 = true;  //&& !nextRecHit->isValid()) lastValidL2=true;
+            }
+            tmeasIt--;
+          }
+        }
+      }  // end check last valid layer
       if (lastValidL2) {
-	std::vector< const BarrelDetLayer*> pxbLayers = measurementTrackerHandle->geometricSearchTracker()->pixelBarrelLayers();
-	const DetLayer* pxb1 = pxbLayers[extrapolateTo_-1];
-	const MeasurementEstimator* estimator = est.product();
-	const LayerMeasurements* theLayerMeasurements =    new LayerMeasurements(*measurementTrackerHandle, *measurementTrackerEventHandle);  
-	const TrajectoryStateOnSurface tsosPXB2 = tmeasIt->updatedState();
-	expTrajMeasurements = theLayerMeasurements->measurements(*pxb1, tsosPXB2, *thePropagator, *estimator);
-	delete theLayerMeasurements;
-	if ( !expTrajMeasurements.empty()) {
-	  for(uint p=0; p<expTrajMeasurements.size();p++){
-	    TrajectoryMeasurement pxb1TM(expTrajMeasurements[p]);
-	    const auto& pxb1Hit = pxb1TM.recHit();
-	    //remove hits with rawID == 0
-	    if(pxb1Hit->geographicalId().rawId()==0){
-	      expTrajMeasurements.erase(expTrajMeasurements.begin()+p);
-	      continue;
-	    }
-	  }
-	}
-	//
+        std::vector<const BarrelDetLayer *> pxbLayers =
+            measurementTrackerHandle->geometricSearchTracker()->pixelBarrelLayers();
+        const DetLayer *pxb1 = pxbLayers[extrapolateTo_ - 1];
+        const MeasurementEstimator *estimator = est.product();
+        const LayerMeasurements *theLayerMeasurements =
+            new LayerMeasurements(*measurementTrackerHandle, *measurementTrackerEventHandle);
+        const TrajectoryStateOnSurface tsosPXB2 = tmeasIt->updatedState();
+        expTrajMeasurements = theLayerMeasurements->measurements(*pxb1, tsosPXB2, *thePropagator, *estimator);
+        delete theLayerMeasurements;
+        if (!expTrajMeasurements.empty()) {
+          for (uint p = 0; p < expTrajMeasurements.size(); p++) {
+            TrajectoryMeasurement pxb1TM(expTrajMeasurements[p]);
+            const auto &pxb1Hit = pxb1TM.recHit();
+            // remove hits with rawID == 0
+            if (pxb1Hit->geographicalId().rawId() == 0) {
+              expTrajMeasurements.erase(expTrajMeasurements.begin() + p);
+              continue;
+            }
+          }
+        }
+        //
       }
-      //check if extrapolated hit to layer 1 one matches the original hit
-      TrajectoryStateOnSurface chkPredTrajState=trajStateComb(tmeasIt->forwardPredictedState(), tmeasIt->backwardPredictedState());
-      if (!chkPredTrajState.isValid()) continue;
-      float chkx=chkPredTrajState.globalPosition().x();
-      float chky=chkPredTrajState.globalPosition().y();
-      float chkz=chkPredTrajState.globalPosition().z();
-      LocalPoint chklp=chkPredTrajState.localPosition();
+      // check if extrapolated hit to layer 1 one matches the original hit
+      TrajectoryStateOnSurface chkPredTrajState =
+          trajStateComb(tmeasIt->forwardPredictedState(), tmeasIt->backwardPredictedState());
+      if (!chkPredTrajState.isValid())
+        continue;
+      float chkx = chkPredTrajState.globalPosition().x();
+      float chky = chkPredTrajState.globalPosition().y();
+      float chkz = chkPredTrajState.globalPosition().z();
+      LocalPoint chklp = chkPredTrajState.localPosition();
       if (testSubDetID == PixelSubdetector::PixelBarrel && hit_layer == extrapolateTo_) {
-	// Here we will drop the extrapolated hits if there is a hit and use that hit
-	vector<int > imatches;
-	size_t imatch=0;
-	float glmatch=9999.;
-	for (size_t iexp=0; iexp<expTrajMeasurements.size(); iexp++) {
-	  const DetId & exphit_detId = expTrajMeasurements[iexp].recHit()->geographicalId();
-	  int exphit_ladder = PXBDetId(exphit_detId).ladder();
-	  int exphit_mod = PXBDetId(exphit_detId).module();
-	  int dladder = abs( exphit_ladder - hit_ladder ); 
-	  if (dladder > 10) dladder = 20 - dladder;
-	  int dmodule = abs( exphit_mod - hit_mod);
-	  if (dladder != 0 || dmodule != 0) {
-	    continue;
-	  }
-
-	  TrajectoryStateOnSurface predTrajState=expTrajMeasurements[iexp].updatedState();
-	  float x=predTrajState.globalPosition().x();
-	  float y=predTrajState.globalPosition().y();
-	  float z=predTrajState.globalPosition().z();
-	  float dxyz=sqrt((chkx-x)*(chkx-x)+(chky-y)*(chky-y)+(chkz-z)*(chkz-z));
-
-	  if (dxyz<=glmatch) {
-	    glmatch=dxyz;
-	    imatch=iexp;
-	    imatches.push_back(int(imatch));
-	  }
-
-	} // found the propagated traj best matching the hit in data
-
-	float lxmatch = 9999.0;
-	float lymatch = 9999.0;
-	if(!expTrajMeasurements.empty()){
-	  if (glmatch<9999.) { // if there is any propagated trajectory for this hit
-	    const DetId & matchhit_detId = expTrajMeasurements[imatch].recHit()->geographicalId();
-      
-	    int matchhit_ladder = PXBDetId(matchhit_detId).ladder();
-	    int dladder = abs(matchhit_ladder-hit_ladder);
-	    if (dladder > 10) dladder = 20 - dladder;
-	    LocalPoint lp = expTrajMeasurements[imatch].updatedState().localPosition();
-	    lxmatch=fabs(lp.x() - chklp.x());
-	    lymatch=fabs(lp.y() - chklp.y());
-	  }
-	  if (lxmatch < maxlxmatch_ && lymatch < maxlymatch_) {
-      
-	    if (testhit->getType()!=TrackingRecHit::missing || keepOriginalMissingHit_) {
-	      expTrajMeasurements.erase(expTrajMeasurements.begin()+imatch);
-	    }
-	    
-	  }
-	  
-	} //expected trajectory measurment not empty
+        // Here we will drop the extrapolated hits if there is a hit and use
+        // that hit
+        vector<int> imatches;
+        size_t imatch = 0;
+        float glmatch = 9999.;
+        for (size_t iexp = 0; iexp < expTrajMeasurements.size(); iexp++) {
+          const DetId &exphit_detId = expTrajMeasurements[iexp].recHit()->geographicalId();
+          int exphit_ladder = PXBDetId(exphit_detId).ladder();
+          int exphit_mod = PXBDetId(exphit_detId).module();
+          int dladder = abs(exphit_ladder - hit_ladder);
+          if (dladder > 10)
+            dladder = 20 - dladder;
+          int dmodule = abs(exphit_mod - hit_mod);
+          if (dladder != 0 || dmodule != 0) {
+            continue;
+          }
+
+          TrajectoryStateOnSurface predTrajState = expTrajMeasurements[iexp].updatedState();
+          float x = predTrajState.globalPosition().x();
+          float y = predTrajState.globalPosition().y();
+          float z = predTrajState.globalPosition().z();
+          float dxyz = sqrt((chkx - x) * (chkx - x) + (chky - y) * (chky - y) + (chkz - z) * (chkz - z));
+
+          if (dxyz <= glmatch) {
+            glmatch = dxyz;
+            imatch = iexp;
+            imatches.push_back(int(imatch));
+          }
+
+        }  // found the propagated traj best matching the hit in data
+
+        float lxmatch = 9999.0;
+        float lymatch = 9999.0;
+        if (!expTrajMeasurements.empty()) {
+          if (glmatch < 9999.) {  // if there is any propagated trajectory for this hit
+            const DetId &matchhit_detId = expTrajMeasurements[imatch].recHit()->geographicalId();
+
+            int matchhit_ladder = PXBDetId(matchhit_detId).ladder();
+            int dladder = abs(matchhit_ladder - hit_ladder);
+            if (dladder > 10)
+              dladder = 20 - dladder;
+            LocalPoint lp = expTrajMeasurements[imatch].updatedState().localPosition();
+            lxmatch = fabs(lp.x() - chklp.x());
+            lymatch = fabs(lp.y() - chklp.y());
+          }
+          if (lxmatch < maxlxmatch_ && lymatch < maxlymatch_) {
+            if (testhit->getType() != TrackingRecHit::missing || keepOriginalMissingHit_) {
+              expTrajMeasurements.erase(expTrajMeasurements.begin() + imatch);
+            }
+          }
+
+        }  // expected trajectory measurment not empty
       }
-    }//loop on trajectory measurments tmeasColl
-    
-    //if an extrapolated hit was found but not matched to an exisitng L1 hit then push the hit back into the collection
-    //now keep the first one that is left
-    if(!expTrajMeasurements.empty()){
-      for (size_t f=0; f<expTrajMeasurements.size(); f++) {
-	TrajectoryMeasurement AddHit=expTrajMeasurements[f];
-	if (AddHit.recHit()->getType()==TrackingRecHit::missing){
-	  tmeasColl.push_back(AddHit);
-	  isBpixtrack = true;
-
-	}
-    
+    }  // loop on trajectory measurments tmeasColl
+
+    // if an extrapolated hit was found but not matched to an exisitng L1 hit
+    // then push the hit back into the collection now keep the first one that is
+    // left
+    if (!expTrajMeasurements.empty()) {
+      for (size_t f = 0; f < expTrajMeasurements.size(); f++) {
+        TrajectoryMeasurement AddHit = expTrajMeasurements[f];
+        if (AddHit.recHit()->getType() == TrackingRecHit::missing) {
+          tmeasColl.push_back(AddHit);
+          isBpixtrack = true;
+        }
       }
     }
 
-    if(isBpixtrack || isFpixtrack){
-      if(trackref->pt()<0.6 ||
-         nStripHits<8 ||
-	 fabs(trackref->dxy(bestVtx->position()))>0.05 ||
-	 fabs(trackref->dz(bestVtx->position()))>0.5) continue;
-    
-      if(debug_){
+    if (isBpixtrack || isFpixtrack) {
+      if (trackref->pt() < 0.6 || nStripHits < 8 || fabs(trackref->dxy(bestVtx->position())) > 0.05 ||
+          fabs(trackref->dz(bestVtx->position())) > 0.5)
+        continue;
+
+      if (debug_) {
         std::cout << "isBpixtrack : " << isBpixtrack << std::endl;
         std::cout << "isFpixtrack : " << isFpixtrack << std::endl;
       }
-      //std::cout<<"This tracks has so many hits: "<<tmeasColl.size()<<std::endl;
-      for(std::vector<TrajectoryMeasurement>::const_iterator tmeasIt = tmeasColl.begin(); tmeasIt!=tmeasColl.end(); tmeasIt++){   
-	//if(! tmeasIt->updatedState().isValid()) continue; 
-	TrajectoryStateOnSurface tsos = tmeasIt->updatedState();
-
-	TransientTrackingRecHit::ConstRecHitPointer hit = tmeasIt->recHit();
-	if(hit->geographicalId().det() != DetId::Tracker )
-	  continue; 
-	else {
-	  
-	  // 	  //residual
-      	  const DetId & hit_detId = hit->geographicalId();
-	  //uint IntRawDetID = (hit_detId.rawId());
-	  uint IntSubDetID = (hit_detId.subdetId());
-	  
- 	  if(IntSubDetID == 0 ){
-	    if(debug_) std::cout << "NO IntSubDetID\n";
-	    continue;
-	  }
-	  if(IntSubDetID!=PixelSubdetector::PixelBarrel && IntSubDetID!=PixelSubdetector::PixelEndcap)
-	    continue;
-	  
-	  int disk=0; int layer=0; int panel=0; int module=0; bool isHalfModule=false;
-
-	  const SiPixelRecHit* pixhit = dynamic_cast<const SiPixelRecHit*>(hit->hit());
-
-	  if(IntSubDetID==PixelSubdetector::PixelBarrel){ // it's a BPIX hit
-	    layer = PixelBarrelName(hit_detId,pTT,isUpgrade).layerName();
-	    isHalfModule = PixelBarrelName(hit_detId,pTT,isUpgrade).isHalfModule();
-
-	    if (hit->isValid()){ //fill the cluster probability in barrel
-	      bool plus=true;
-	      if ((PixelBarrelName(hit_detId,pTT,isUpgrade).shell()== PixelBarrelName::Shell::mO) || (PixelBarrelName(hit_detId,pTT,isUpgrade).shell()==PixelBarrelName::Shell::mI)) plus=false;	   
-	      double clusterProbability= pixhit->clusterProbability(0);	     
-	      if (clusterProbability!=0) fillClusterProbability(layer,0,plus,log10(clusterProbability));	      
-	    }
-
-	  }else if(IntSubDetID==PixelSubdetector::PixelEndcap){ // it's an FPIX hit
-	    disk = PixelEndcapName(hit_detId,pTT,isUpgrade).diskName();
-	    panel = PixelEndcapName(hit_detId,pTT,isUpgrade).pannelName();
-	    module = PixelEndcapName(hit_detId,pTT,isUpgrade).plaquetteName();
-
-	    if (hit->isValid()){
-	      bool plus=true;
-	      if ((PixelEndcapName(hit_detId,pTT,isUpgrade).halfCylinder()== PixelEndcapName::HalfCylinder::mO) || (PixelEndcapName(hit_detId,pTT,isUpgrade).halfCylinder()==PixelEndcapName::HalfCylinder::mI)) plus=false;
-	      double clusterProbability= pixhit->clusterProbability(0);
-	      if (clusterProbability!=0) fillClusterProbability(0,disk,plus,log10(clusterProbability));
-	    }
+      // std::cout<<"This tracks has so many hits:
+      // "<<tmeasColl.size()<<std::endl;
+      for (std::vector<TrajectoryMeasurement>::const_iterator tmeasIt = tmeasColl.begin(); tmeasIt != tmeasColl.end();
+           tmeasIt++) {
+        // if(! tmeasIt->updatedState().isValid()) continue;
+        TrajectoryStateOnSurface tsos = tmeasIt->updatedState();
+
+        TransientTrackingRecHit::ConstRecHitPointer hit = tmeasIt->recHit();
+        if (hit->geographicalId().det() != DetId::Tracker)
+          continue;
+        else {
+          // 	  //residual
+          const DetId &hit_detId = hit->geographicalId();
+          // uint IntRawDetID = (hit_detId.rawId());
+          uint IntSubDetID = (hit_detId.subdetId());
+
+          if (IntSubDetID == 0) {
+            if (debug_)
+              std::cout << "NO IntSubDetID\n";
+            continue;
           }
-          	  
-	  if(layer==1){
-	    if(fabs(trackref->dxy(bestVtx->position()))>0.01 ||
-	       fabs(trackref->dz(bestVtx->position()))>0.1) continue;
-	    if(!(L2hits>0&&L3hits>0) && !(L2hits>0&&D1hits>0) && !(D1hits>0&&D2hits>0)) continue;
-	  }else if(layer==2){
-	    if(fabs(trackref->dxy(bestVtx->position()))>0.02 ||
-	       fabs(trackref->dz(bestVtx->position()))>0.1) continue;
-	    if(!(L1hits>0&&L3hits>0) && !(L1hits>0&&D1hits>0)) continue;
-	  }else if(layer==3){
-	    if(fabs(trackref->dxy(bestVtx->position()))>0.02 ||
-	       fabs(trackref->dz(bestVtx->position()))>0.1) continue;
-	    if(!(L1hits>0&&L2hits>0)) continue;
-	  }else if(layer==4){
-	    if(fabs(trackref->dxy(bestVtx->position()))>0.02 ||
-	       fabs(trackref->dz(bestVtx->position()))>0.1) continue;
-	  }else if(disk==1){
-	    if(fabs(trackref->dxy(bestVtx->position()))>0.05 ||
-	       fabs(trackref->dz(bestVtx->position()))>0.5) continue;
-	    if(!(L1hits>0&&D2hits>0) && !(L2hits>0&&D2hits>0)) continue;
-	  }else if(disk==2){
-	    if(fabs(trackref->dxy(bestVtx->position()))>0.05 ||
-	       fabs(trackref->dz(bestVtx->position()))>0.5) continue;
-	    if(!(L1hits>0&&D1hits>0)) continue;
-	  }else if(disk==3){
-	    if(fabs(trackref->dxy(bestVtx->position()))>0.05 ||
-	       fabs(trackref->dz(bestVtx->position()))>0.5) continue;
-	  }
-	  
-	  //check whether hit is valid or missing using track algo flag
-          bool isHitValid   =hit->hit()->getType()==TrackingRecHit::valid;
-          bool isHitMissing =hit->hit()->getType()==TrackingRecHit::missing;
-	  
-	  if(debug_) std::cout << "the hit is persistent\n";
-	 
-	  std::map<uint32_t, SiPixelHitEfficiencyModule*>::iterator pxd = theSiPixelStructure.find((*hit).geographicalId().rawId());
-
-	  // calculate alpha and beta from cluster position
-	  LocalTrajectoryParameters ltp = tsos.localParameters();
-	  //LocalVector localDir = ltp.momentum()/ltp.momentum().mag();
-	      
-	  //*************** Edge cut ********************
-	  double lx=tsos.localPosition().x();
-	  double ly=tsos.localPosition().y();
-
-	  if(fabs(lx)>0.55 || fabs(ly)>3.0) continue;
-
-	  bool passedFiducial=true;
-
-	  // Module fiducials:
-	  if(IntSubDetID==PixelSubdetector::PixelBarrel && fabs(ly)>=3.1) passedFiducial=false;
-	  if(IntSubDetID==PixelSubdetector::PixelEndcap &&
-	     !((panel==1 &&
-		((module==1 && fabs(ly)<0.7) ||
-		 ((module==2 && fabs(ly)<1.1) &&
-		  !(disk==-1 && ly>0.8 && lx>0.2) &&
-		  !(disk==1 && ly<-0.7 && lx>0.2) &&
-		  !(disk==2 && ly<-0.8)) ||
-		 ((module==3 && fabs(ly)<1.5) &&
-		  !(disk==-2 && lx>0.1 && ly>1.0) &&
-		  !(disk==2 && lx>0.1 && ly<-1.0)) ||
-		 ((module==4 && fabs(ly)<1.9) &&
-		  !(disk==-2 && ly>1.5) &&
-		  !(disk==2 && ly<-1.5)))) ||
-	       (panel==2 &&
-		((module==1 && fabs(ly)<0.7) ||
-		 (module==2 && fabs(ly)<1.2 &&
-		  !(disk>0 && ly>1.1) &&
-		  !(disk<0 && ly<-1.1)) ||
-		 (module==3 && fabs(ly)<1.6 &&
-		  !(disk>0 && ly>1.5) &&
-		  !(disk<0 && ly<-1.5)))))) passedFiducial=false;
-	  if(IntSubDetID==PixelSubdetector::PixelEndcap &&
-	     ((panel==1 && (module==1 || (module>=3 && abs(disk)==1))) ||
-	      (panel==2 && ((module==1 && abs(disk)==2) ||
-			    (module==3 && abs(disk)==1))))) passedFiducial=false;
-	  // ROC fiducials:
-	  double ly_mod = fabs(ly);
-	  if(IntSubDetID==PixelSubdetector::PixelEndcap && (panel+module)%2==1) ly_mod=ly_mod+0.405;
-	  float d_rocedge = fabs(fmod(ly_mod,0.81)-0.405);
-	  if(d_rocedge<=0.0625) passedFiducial=false;
-	  if(!( (IntSubDetID==PixelSubdetector::PixelBarrel &&
-		 ((!isHalfModule && fabs(lx)<0.6) ||
-		  (isHalfModule && lx>-0.3 && lx<0.2))) ||
-		(IntSubDetID==PixelSubdetector::PixelEndcap &&
-		 ((panel==1 &&
-		   ((module==1 && fabs(lx)<0.2) ||
-		    (module==2 &&
-		     ((fabs(lx)<0.55 && abs(disk)==1) ||
-		      (lx>-0.5 && lx<0.2 && disk==-2) ||
-		      (lx>-0.5 && lx<0.0 && disk==2))) ||
-		    (module==3 && lx>-0.6 && lx<0.5) ||
-		    (module==4 && lx>-0.3 && lx<0.15))) ||
-		  (panel==2 &&
-		   ((module==1 && fabs(lx)<0.6) ||
-		    (module==2 &&
-		     ((fabs(lx)<0.55 && abs(disk)==1) ||
-		      (lx>-0.6 && lx<0.5 && abs(disk)==2))) ||
-		    (module==3 && fabs(lx)<0.5))))))) passedFiducial=false;
-	  if(((IntSubDetID==PixelSubdetector::PixelBarrel && !isHalfModule) || 
-	      (IntSubDetID==PixelSubdetector::PixelEndcap && !(panel==1 && (module==1 || module==4)))) &&
-	     fabs(lx)<0.06) passedFiducial=false;
-	       
-	       
-	  //*************** find closest clusters ********************
-	  float dx_cl[2]; float dy_cl[2]; dx_cl[0]=dx_cl[1]=dy_cl[0]=dy_cl[1]=-9999.;
-	  ESHandle<PixelClusterParameterEstimator> cpEstimator;
-	  iSetup.get<TkPixelCPERecord>().get("PixelCPEGeneric", cpEstimator);
-	  if(cpEstimator.isValid()){
-	    const PixelClusterParameterEstimator &cpe(*cpEstimator);
-	    edm::ESHandle<TrackerGeometry> tracker;
-	    iSetup.get<TrackerDigiGeometryRecord>().get(tracker);
-	    if(tracker.isValid()){
-	      const TrackerGeometry *tkgeom=&(*tracker);
-	      edm::Handle<edmNew::DetSetVector<SiPixelCluster> > clusterCollectionHandle;
-	      iEvent.getByToken( clusterCollectionToken_, clusterCollectionHandle );
-	      if(clusterCollectionHandle.isValid()){
-		const edmNew::DetSetVector<SiPixelCluster>& clusterCollection=*clusterCollectionHandle;
-		edmNew::DetSetVector<SiPixelCluster>::const_iterator itClusterSet=clusterCollection.begin();
-		float minD[2]; minD[0]=minD[1]=10000.;
-		for( ; itClusterSet!=clusterCollection.end(); itClusterSet++){
-		  DetId detId(itClusterSet->id());
-		  if(detId.rawId()!=hit->geographicalId().rawId()) continue;
-		  //unsigned int sdId=detId.subdetId();
-		  const PixelGeomDetUnit *pixdet=(const PixelGeomDetUnit*) tkgeom->idToDetUnit(detId);
-		  edmNew::DetSet<SiPixelCluster>::const_iterator itCluster=itClusterSet->begin();
-		  for( ; itCluster!=itClusterSet->end(); ++itCluster){
-		    LocalPoint lp(itCluster->x(), itCluster->y(), 0.);
-		    PixelClusterParameterEstimator::ReturnType params=cpe.getParameters(*itCluster,*pixdet);
-		    lp=std::get<0>(params);
-		    float D = sqrt((lp.x()-lx)*(lp.x()-lx)+(lp.y()-ly)*(lp.y()-ly));
-		    if(D<minD[0]){
-		      minD[1]=minD[0];
-		      dx_cl[1]=dx_cl[0];
-		      dy_cl[1]=dy_cl[0];
-		      minD[0]=D;
-		      dx_cl[0]=lp.x();
-		      dy_cl[0]=lp.y();
-		    }else if(D<minD[1]){
-		      minD[1]=D;
-		      dx_cl[1]=lp.x();
-		      dy_cl[1]=lp.y();
-		    }
-		  }  // loop on clusterSets 
-		} // loop on clusterCollection
-		for(size_t i=0; i<2; i++){
-		  if(minD[i]<9999.){
-		    dx_cl[i]=fabs(dx_cl[i]-lx);
-		    dy_cl[i]=fabs(dy_cl[i]-ly);
-		  }
-		}
-	      } // valid clusterCollectionHandle
-	    } // valid tracker
-	  } // valid cpEstimator
-	  // distance of hit from closest cluster!
-	  float d_cl[2]; d_cl[0]=d_cl[1]=-9999.;
-	  if(dx_cl[0]!=-9999. && dy_cl[0]!=-9999.) d_cl[0]=sqrt(dx_cl[0]*dx_cl[0]+dy_cl[0]*dy_cl[0]);
-	  if(dx_cl[1]!=-9999. && dy_cl[1]!=-9999.) d_cl[1]=sqrt(dx_cl[1]*dx_cl[1]+dy_cl[1]*dy_cl[1]);
-	  if(isHitMissing && (d_cl[0]<0.05 || d_cl[1]<0.05)){ isHitMissing=false; isHitValid=true; }	      
-	      
-	  if(debug_){
-	    std::cout << "Ready to add hit in histogram:\n";
-	    //std::cout << "detid: "<<hit_detId<<std::endl;
-	    std::cout << "isHitValid: "<<isHitValid<<std::endl;
-	    std::cout << "isHitMissing: "<<isHitMissing<<std::endl;
-	    //std::cout << "passedEdgeCut: "<<passedFiducial<<std::endl;		
-	  }    
-	  
-	  if (nStripHits<11) continue; //Efficiency plots are filled with hits on tracks that have at least 11 Strip hits 
-    
-	  if(pxd!=theSiPixelStructure.end() && isHitValid && passedFiducial)
-	    ++nvalid;
-	  if(pxd!=theSiPixelStructure.end() && isHitMissing && passedFiducial)
-	    ++nmissing;
-		
-	  if (pxd!=theSiPixelStructure.end() && passedFiducial && (isHitValid || isHitMissing))
-	    (*pxd).second->fill(pTT,ltp, isHitValid, modOn, ladOn, layOn, phiOn, bladeOn, diskOn, ringOn); 	
-
-	  //}//end if (persistent hit exists and is pixel hit)
-	  
-	}//end of else 
-	
-	
-      }//end for (all traj measurements of pixeltrack)
-    }//end if (is pixeltrack)
-    else
-      if(debug_) std::cout << "no pixeltrack:\n";
-    
-  }//end loop on map entries
-}
+          if (IntSubDetID != PixelSubdetector::PixelBarrel && IntSubDetID != PixelSubdetector::PixelEndcap)
+            continue;
+
+          int disk = 0;
+          int layer = 0;
+          int panel = 0;
+          int module = 0;
+          bool isHalfModule = false;
+
+          const SiPixelRecHit *pixhit = dynamic_cast<const SiPixelRecHit *>(hit->hit());
+
+          if (IntSubDetID == PixelSubdetector::PixelBarrel) {  // it's a BPIX hit
+            layer = PixelBarrelName(hit_detId, pTT, isUpgrade).layerName();
+            isHalfModule = PixelBarrelName(hit_detId, pTT, isUpgrade).isHalfModule();
+
+            if (hit->isValid()) {  // fill the cluster probability in barrel
+              bool plus = true;
+              if ((PixelBarrelName(hit_detId, pTT, isUpgrade).shell() == PixelBarrelName::Shell::mO) ||
+                  (PixelBarrelName(hit_detId, pTT, isUpgrade).shell() == PixelBarrelName::Shell::mI))
+                plus = false;
+              double clusterProbability = pixhit->clusterProbability(0);
+              if (clusterProbability != 0)
+                fillClusterProbability(layer, 0, plus, log10(clusterProbability));
+            }
+
+          } else if (IntSubDetID == PixelSubdetector::PixelEndcap) {  // it's an FPIX hit
+            disk = PixelEndcapName(hit_detId, pTT, isUpgrade).diskName();
+            panel = PixelEndcapName(hit_detId, pTT, isUpgrade).pannelName();
+            module = PixelEndcapName(hit_detId, pTT, isUpgrade).plaquetteName();
+
+            if (hit->isValid()) {
+              bool plus = true;
+              if ((PixelEndcapName(hit_detId, pTT, isUpgrade).halfCylinder() == PixelEndcapName::HalfCylinder::mO) ||
+                  (PixelEndcapName(hit_detId, pTT, isUpgrade).halfCylinder() == PixelEndcapName::HalfCylinder::mI))
+                plus = false;
+              double clusterProbability = pixhit->clusterProbability(0);
+              if (clusterProbability != 0)
+                fillClusterProbability(0, disk, plus, log10(clusterProbability));
+            }
+          }
+
+          if (layer == 1) {
+            if (fabs(trackref->dxy(bestVtx->position())) > 0.01 || fabs(trackref->dz(bestVtx->position())) > 0.1)
+              continue;
+            if (!(L2hits > 0 && L3hits > 0) && !(L2hits > 0 && D1hits > 0) && !(D1hits > 0 && D2hits > 0))
+              continue;
+          } else if (layer == 2) {
+            if (fabs(trackref->dxy(bestVtx->position())) > 0.02 || fabs(trackref->dz(bestVtx->position())) > 0.1)
+              continue;
+            if (!(L1hits > 0 && L3hits > 0) && !(L1hits > 0 && D1hits > 0))
+              continue;
+          } else if (layer == 3) {
+            if (fabs(trackref->dxy(bestVtx->position())) > 0.02 || fabs(trackref->dz(bestVtx->position())) > 0.1)
+              continue;
+            if (!(L1hits > 0 && L2hits > 0))
+              continue;
+          } else if (layer == 4) {
+            if (fabs(trackref->dxy(bestVtx->position())) > 0.02 || fabs(trackref->dz(bestVtx->position())) > 0.1)
+              continue;
+          } else if (disk == 1) {
+            if (fabs(trackref->dxy(bestVtx->position())) > 0.05 || fabs(trackref->dz(bestVtx->position())) > 0.5)
+              continue;
+            if (!(L1hits > 0 && D2hits > 0) && !(L2hits > 0 && D2hits > 0))
+              continue;
+          } else if (disk == 2) {
+            if (fabs(trackref->dxy(bestVtx->position())) > 0.05 || fabs(trackref->dz(bestVtx->position())) > 0.5)
+              continue;
+            if (!(L1hits > 0 && D1hits > 0))
+              continue;
+          } else if (disk == 3) {
+            if (fabs(trackref->dxy(bestVtx->position())) > 0.05 || fabs(trackref->dz(bestVtx->position())) > 0.5)
+              continue;
+          }
+
+          // check whether hit is valid or missing using track algo flag
+          bool isHitValid = hit->hit()->getType() == TrackingRecHit::valid;
+          bool isHitMissing = hit->hit()->getType() == TrackingRecHit::missing;
+
+          if (debug_)
+            std::cout << "the hit is persistent\n";
+
+          std::map<uint32_t, SiPixelHitEfficiencyModule *>::iterator pxd =
+              theSiPixelStructure.find((*hit).geographicalId().rawId());
+
+          // calculate alpha and beta from cluster position
+          LocalTrajectoryParameters ltp = tsos.localParameters();
+          // LocalVector localDir = ltp.momentum()/ltp.momentum().mag();
+
+          //*************** Edge cut ********************
+          double lx = tsos.localPosition().x();
+          double ly = tsos.localPosition().y();
+
+          if (fabs(lx) > 0.55 || fabs(ly) > 3.0)
+            continue;
+
+          bool passedFiducial = true;
+
+          // Module fiducials:
+          if (IntSubDetID == PixelSubdetector::PixelBarrel && fabs(ly) >= 3.1)
+            passedFiducial = false;
+          if (IntSubDetID == PixelSubdetector::PixelEndcap &&
+              !((panel == 1 &&
+                 ((module == 1 && fabs(ly) < 0.7) ||
+                  ((module == 2 && fabs(ly) < 1.1) && !(disk == -1 && ly > 0.8 && lx > 0.2) &&
+                   !(disk == 1 && ly < -0.7 && lx > 0.2) && !(disk == 2 && ly < -0.8)) ||
+                  ((module == 3 && fabs(ly) < 1.5) && !(disk == -2 && lx > 0.1 && ly > 1.0) &&
+                   !(disk == 2 && lx > 0.1 && ly < -1.0)) ||
+                  ((module == 4 && fabs(ly) < 1.9) && !(disk == -2 && ly > 1.5) && !(disk == 2 && ly < -1.5)))) ||
+                (panel == 2 &&
+                 ((module == 1 && fabs(ly) < 0.7) ||
+                  (module == 2 && fabs(ly) < 1.2 && !(disk > 0 && ly > 1.1) && !(disk < 0 && ly < -1.1)) ||
+                  (module == 3 && fabs(ly) < 1.6 && !(disk > 0 && ly > 1.5) && !(disk < 0 && ly < -1.5))))))
+            passedFiducial = false;
+          if (IntSubDetID == PixelSubdetector::PixelEndcap &&
+              ((panel == 1 && (module == 1 || (module >= 3 && abs(disk) == 1))) ||
+               (panel == 2 && ((module == 1 && abs(disk) == 2) || (module == 3 && abs(disk) == 1)))))
+            passedFiducial = false;
+          // ROC fiducials:
+          double ly_mod = fabs(ly);
+          if (IntSubDetID == PixelSubdetector::PixelEndcap && (panel + module) % 2 == 1)
+            ly_mod = ly_mod + 0.405;
+          float d_rocedge = fabs(fmod(ly_mod, 0.81) - 0.405);
+          if (d_rocedge <= 0.0625)
+            passedFiducial = false;
+          if (!((IntSubDetID == PixelSubdetector::PixelBarrel &&
+                 ((!isHalfModule && fabs(lx) < 0.6) || (isHalfModule && lx > -0.3 && lx < 0.2))) ||
+                (IntSubDetID == PixelSubdetector::PixelEndcap &&
+                 ((panel == 1 &&
+                   ((module == 1 && fabs(lx) < 0.2) ||
+                    (module == 2 && ((fabs(lx) < 0.55 && abs(disk) == 1) || (lx > -0.5 && lx < 0.2 && disk == -2) ||
+                                     (lx > -0.5 && lx < 0.0 && disk == 2))) ||
+                    (module == 3 && lx > -0.6 && lx < 0.5) || (module == 4 && lx > -0.3 && lx < 0.15))) ||
+                  (panel == 2 && ((module == 1 && fabs(lx) < 0.6) ||
+                                  (module == 2 && ((fabs(lx) < 0.55 && abs(disk) == 1) ||
+                                                   (lx > -0.6 && lx < 0.5 && abs(disk) == 2))) ||
+                                  (module == 3 && fabs(lx) < 0.5)))))))
+            passedFiducial = false;
+          if (((IntSubDetID == PixelSubdetector::PixelBarrel && !isHalfModule) ||
+               (IntSubDetID == PixelSubdetector::PixelEndcap && !(panel == 1 && (module == 1 || module == 4)))) &&
+              fabs(lx) < 0.06)
+            passedFiducial = false;
+
+          //*************** find closest clusters ********************
+          float dx_cl[2];
+          float dy_cl[2];
+          dx_cl[0] = dx_cl[1] = dy_cl[0] = dy_cl[1] = -9999.;
+          ESHandle<PixelClusterParameterEstimator> cpEstimator;
+          iSetup.get<TkPixelCPERecord>().get("PixelCPEGeneric", cpEstimator);
+          if (cpEstimator.isValid()) {
+            const PixelClusterParameterEstimator &cpe(*cpEstimator);
+            edm::ESHandle<TrackerGeometry> tracker;
+            iSetup.get<TrackerDigiGeometryRecord>().get(tracker);
+            if (tracker.isValid()) {
+              const TrackerGeometry *tkgeom = &(*tracker);
+              edm::Handle<edmNew::DetSetVector<SiPixelCluster>> clusterCollectionHandle;
+              iEvent.getByToken(clusterCollectionToken_, clusterCollectionHandle);
+              if (clusterCollectionHandle.isValid()) {
+                const edmNew::DetSetVector<SiPixelCluster> &clusterCollection = *clusterCollectionHandle;
+                edmNew::DetSetVector<SiPixelCluster>::const_iterator itClusterSet = clusterCollection.begin();
+                float minD[2];
+                minD[0] = minD[1] = 10000.;
+                for (; itClusterSet != clusterCollection.end(); itClusterSet++) {
+                  DetId detId(itClusterSet->id());
+                  if (detId.rawId() != hit->geographicalId().rawId())
+                    continue;
+                  // unsigned int sdId=detId.subdetId();
+                  const PixelGeomDetUnit *pixdet = (const PixelGeomDetUnit *)tkgeom->idToDetUnit(detId);
+                  edmNew::DetSet<SiPixelCluster>::const_iterator itCluster = itClusterSet->begin();
+                  for (; itCluster != itClusterSet->end(); ++itCluster) {
+                    LocalPoint lp(itCluster->x(), itCluster->y(), 0.);
+                    PixelClusterParameterEstimator::ReturnType params = cpe.getParameters(*itCluster, *pixdet);
+                    lp = std::get<0>(params);
+                    float D = sqrt((lp.x() - lx) * (lp.x() - lx) + (lp.y() - ly) * (lp.y() - ly));
+                    if (D < minD[0]) {
+                      minD[1] = minD[0];
+                      dx_cl[1] = dx_cl[0];
+                      dy_cl[1] = dy_cl[0];
+                      minD[0] = D;
+                      dx_cl[0] = lp.x();
+                      dy_cl[0] = lp.y();
+                    } else if (D < minD[1]) {
+                      minD[1] = D;
+                      dx_cl[1] = lp.x();
+                      dy_cl[1] = lp.y();
+                    }
+                  }  // loop on clusterSets
+                }    // loop on clusterCollection
+                for (size_t i = 0; i < 2; i++) {
+                  if (minD[i] < 9999.) {
+                    dx_cl[i] = fabs(dx_cl[i] - lx);
+                    dy_cl[i] = fabs(dy_cl[i] - ly);
+                  }
+                }
+              }  // valid clusterCollectionHandle
+            }    // valid tracker
+          }      // valid cpEstimator
+          // distance of hit from closest cluster!
+          float d_cl[2];
+          d_cl[0] = d_cl[1] = -9999.;
+          if (dx_cl[0] != -9999. && dy_cl[0] != -9999.)
+            d_cl[0] = sqrt(dx_cl[0] * dx_cl[0] + dy_cl[0] * dy_cl[0]);
+          if (dx_cl[1] != -9999. && dy_cl[1] != -9999.)
+            d_cl[1] = sqrt(dx_cl[1] * dx_cl[1] + dy_cl[1] * dy_cl[1]);
+          if (isHitMissing && (d_cl[0] < 0.05 || d_cl[1] < 0.05)) {
+            isHitMissing = false;
+            isHitValid = true;
+          }
+
+          if (debug_) {
+            std::cout << "Ready to add hit in histogram:\n";
+            // std::cout << "detid: "<<hit_detId<<std::endl;
+            std::cout << "isHitValid: " << isHitValid << std::endl;
+            std::cout << "isHitMissing: " << isHitMissing << std::endl;
+            // std::cout << "passedEdgeCut: "<<passedFiducial<<std::endl;
+          }
+
+          if (nStripHits < 11)
+            continue;  // Efficiency plots are filled with hits on tracks that
+                       // have at least 11 Strip hits
+
+          if (pxd != theSiPixelStructure.end() && isHitValid && passedFiducial)
+            ++nvalid;
+          if (pxd != theSiPixelStructure.end() && isHitMissing && passedFiducial)
+            ++nmissing;
 
+          if (pxd != theSiPixelStructure.end() && passedFiducial && (isHitValid || isHitMissing))
+            (*pxd).second->fill(pTT, ltp, isHitValid, modOn, ladOn, layOn, phiOn, bladeOn, diskOn, ringOn);
+
+          //}//end if (persistent hit exists and is pixel hit)
+
+        }  // end of else
+
+      }  // end for (all traj measurements of pixeltrack)
+    }    // end if (is pixeltrack)
+    else if (debug_)
+      std::cout << "no pixeltrack:\n";
+
+  }  // end loop on map entries
+}
 
-DEFINE_FWK_MODULE(SiPixelHitEfficiencySource); // define this as a plug-in 
+DEFINE_FWK_MODULE(SiPixelHitEfficiencySource);  // define this as a plug-in
diff --git a/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualModule.cc b/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualModule.cc
index 0ba5d2f70e142..4b3d8ed827014 100644
--- a/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualModule.cc
+++ b/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualModule.cc
@@ -1,59 +1,51 @@
 // Package:    SiPixelMonitorTrack
 // Class:      SiPixelTrackResidualModule
-// 
-// class SiPixelTrackResidualModule SiPixelTrackResidualModule.cc 
+//
+// class SiPixelTrackResidualModule SiPixelTrackResidualModule.cc
 //       DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualModule.cc
 //
 // Description: SiPixel hit-to-track residual data quality monitoring modules
-// Implementation: prototype -> improved -> never final - end of the 1st step 
+// Implementation: prototype -> improved -> never final - end of the 1st step
 //
 // Original Author: Shan-Huei Chuang
 //         Created: Fri Mar 23 18:41:42 CET 2007
 
-
-#include <string>
 #include <iostream>
+#include <string>
 
+#include "DQM/SiPixelCommon/interface/SiPixelHistogramId.h"
+#include "DQM/SiPixelMonitorTrack/interface/SiPixelTrackResidualModule.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "DQM/SiPixelCommon/interface/SiPixelHistogramId.h"
-#include "DQM/SiPixelMonitorTrack/interface/SiPixelTrackResidualModule.h"
-#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
 // Data Formats
+#include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h"
-#include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 
-
 using namespace std;
 using namespace edm;
 
+SiPixelTrackResidualModule::SiPixelTrackResidualModule() : id_(0) { bBookTracks = true; }
 
-SiPixelTrackResidualModule::SiPixelTrackResidualModule() : id_(0) {
-  bBookTracks = true;
-}
-
-
-SiPixelTrackResidualModule::SiPixelTrackResidualModule(uint32_t id) : id_(id) { 
-  bBookTracks = true;
-}
-
-
-SiPixelTrackResidualModule::~SiPixelTrackResidualModule() { 
- 
-}
-
+SiPixelTrackResidualModule::SiPixelTrackResidualModule(uint32_t id) : id_(id) { bBookTracks = true; }
 
-void SiPixelTrackResidualModule::book(const edm::ParameterSet& iConfig, edm::EventSetup const& iSetup, DQMStore::IBooker & iBooker, bool reducedSet, int type, bool isUpgrade) {
+SiPixelTrackResidualModule::~SiPixelTrackResidualModule() {}
 
+void SiPixelTrackResidualModule::book(const edm::ParameterSet &iConfig,
+                                      edm::EventSetup const &iSetup,
+                                      DQMStore::IBooker &iBooker,
+                                      bool reducedSet,
+                                      int type,
+                                      bool isUpgrade) {
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
   const TrackerTopology *pTT = tTopoHandle.product();
@@ -61,540 +53,623 @@ void SiPixelTrackResidualModule::book(const edm::ParameterSet& iConfig, edm::Eve
   bool barrel = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel);
   bool endcap = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap);
   bool isHalfModule = false;
-  if(barrel){
-    isHalfModule = PixelBarrelName(DetId(id_),pTT,isUpgrade).isHalfModule(); 
+  if (barrel) {
+    isHalfModule = PixelBarrelName(DetId(id_), pTT, isUpgrade).isHalfModule();
   }
-  
+
   edm::InputTag src = iConfig.getParameter<edm::InputTag>("src");
   std::string hisID;
 
-  if(type==0){
-    SiPixelHistogramId* theHistogramId = new SiPixelHistogramId(src.label());
-    hisID = theHistogramId->setHistoId("residualX",id_);
-    meResidualX_ = iBooker.book1D(hisID,"Hit-to-Track Residual in r-phi",100,-150,150);
-    meResidualX_->setAxisTitle("hit-to-track residual in r-phi (um)",1);
-    hisID = theHistogramId->setHistoId("residualY",id_);
-    meResidualY_ = iBooker.book1D(hisID,"Hit-to-Track Residual in Z",100,-300,300);
-    meResidualY_->setAxisTitle("hit-to-track residual in z (um)",1);
+  if (type == 0) {
+    SiPixelHistogramId *theHistogramId = new SiPixelHistogramId(src.label());
+    hisID = theHistogramId->setHistoId("residualX", id_);
+    meResidualX_ = iBooker.book1D(hisID, "Hit-to-Track Residual in r-phi", 100, -150, 150);
+    meResidualX_->setAxisTitle("hit-to-track residual in r-phi (um)", 1);
+    hisID = theHistogramId->setHistoId("residualY", id_);
+    meResidualY_ = iBooker.book1D(hisID, "Hit-to-Track Residual in Z", 100, -300, 300);
+    meResidualY_->setAxisTitle("hit-to-track residual in z (um)", 1);
     // Number of clusters
-    hisID = theHistogramId->setHistoId("nclusters_OnTrack",id_);
-    meNClusters_onTrack_ = iBooker.book1D(hisID,"Number of Clusters (on Track)",10,0.,10.);
-    meNClusters_onTrack_->setAxisTitle("Number of Clusters on Track",1);
+    hisID = theHistogramId->setHistoId("nclusters_OnTrack", id_);
+    meNClusters_onTrack_ = iBooker.book1D(hisID, "Number of Clusters (on Track)", 10, 0., 10.);
+    meNClusters_onTrack_->setAxisTitle("Number of Clusters on Track", 1);
     // Total cluster charge in ke
-    hisID = theHistogramId->setHistoId("charge_OnTrack",id_);
-    meCharge_onTrack_ = iBooker.book1D(hisID,"Normalized Cluster charge (on Track)",100,0.,200.);
-    meCharge_onTrack_->setAxisTitle("Charge [kilo electrons]",1);
+    hisID = theHistogramId->setHistoId("charge_OnTrack", id_);
+    meCharge_onTrack_ = iBooker.book1D(hisID, "Normalized Cluster charge (on Track)", 100, 0., 200.);
+    meCharge_onTrack_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    hisID = theHistogramId->setHistoId("size_OnTrack",id_);
-    meSize_onTrack_ = iBooker.book1D(hisID,"Total cluster size (on Track)",30,0.,30.);
-    meSize_onTrack_->setAxisTitle("Cluster size [number of pixels]",1);
+    hisID = theHistogramId->setHistoId("size_OnTrack", id_);
+    meSize_onTrack_ = iBooker.book1D(hisID, "Total cluster size (on Track)", 30, 0., 30.);
+    meSize_onTrack_->setAxisTitle("Cluster size [number of pixels]", 1);
     // Number of clusters
-    hisID = theHistogramId->setHistoId("nclusters_OffTrack",id_);
-    meNClusters_offTrack_ = iBooker.book1D(hisID,"Number of Clusters (off Track)",35,0.,35.);
-    meNClusters_offTrack_->setAxisTitle("Number of Clusters off Track",1);
+    hisID = theHistogramId->setHistoId("nclusters_OffTrack", id_);
+    meNClusters_offTrack_ = iBooker.book1D(hisID, "Number of Clusters (off Track)", 35, 0., 35.);
+    meNClusters_offTrack_->setAxisTitle("Number of Clusters off Track", 1);
     // Total cluster charge in ke
-    hisID = theHistogramId->setHistoId("charge_OffTrack",id_);
-    meCharge_offTrack_ = iBooker.book1D(hisID,"Cluster charge (off Track)",100,0.,200.);
-    meCharge_offTrack_->setAxisTitle("Charge [kilo electrons]",1);
+    hisID = theHistogramId->setHistoId("charge_OffTrack", id_);
+    meCharge_offTrack_ = iBooker.book1D(hisID, "Cluster charge (off Track)", 100, 0., 200.);
+    meCharge_offTrack_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    hisID = theHistogramId->setHistoId("size_OffTrack",id_);
-    meSize_offTrack_ = iBooker.book1D(hisID,"Total cluster size (off Track)",30,0.,30.);
-    meSize_offTrack_->setAxisTitle("Cluster size [number of pixels]",1);
-    if(!reducedSet){
+    hisID = theHistogramId->setHistoId("size_OffTrack", id_);
+    meSize_offTrack_ = iBooker.book1D(hisID, "Total cluster size (off Track)", 30, 0., 30.);
+    meSize_offTrack_->setAxisTitle("Cluster size [number of pixels]", 1);
+    if (!reducedSet) {
       // Cluster width on the x-axis
-      hisID = theHistogramId->setHistoId("sizeX_OnTrack",id_);
-      meSizeX_onTrack_ = iBooker.book1D(hisID,"Cluster x-width (rows) (on Track)",10,0.,10.);
-      meSizeX_onTrack_->setAxisTitle("Cluster x-size [rows]",1);
+      hisID = theHistogramId->setHistoId("sizeX_OnTrack", id_);
+      meSizeX_onTrack_ = iBooker.book1D(hisID, "Cluster x-width (rows) (on Track)", 10, 0., 10.);
+      meSizeX_onTrack_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      hisID = theHistogramId->setHistoId("sizeY_OnTrack",id_);
-      meSizeY_onTrack_ = iBooker.book1D(hisID,"Cluster y-width (columns) (on Track)",15,0.,15.);
-      meSizeY_onTrack_->setAxisTitle("Cluster y-size [columns]",1);
+      hisID = theHistogramId->setHistoId("sizeY_OnTrack", id_);
+      meSizeY_onTrack_ = iBooker.book1D(hisID, "Cluster y-width (columns) (on Track)", 15, 0., 15.);
+      meSizeY_onTrack_->setAxisTitle("Cluster y-size [columns]", 1);
       // Cluster width on the x-axis
-      hisID = theHistogramId->setHistoId("sizeX_OffTrack",id_);
-      meSizeX_offTrack_ = iBooker.book1D(hisID,"Cluster x-width (rows) (off Track)",10,0.,10.);
-      meSizeX_offTrack_->setAxisTitle("Cluster x-size [rows]",1);
+      hisID = theHistogramId->setHistoId("sizeX_OffTrack", id_);
+      meSizeX_offTrack_ = iBooker.book1D(hisID, "Cluster x-width (rows) (off Track)", 10, 0., 10.);
+      meSizeX_offTrack_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      hisID = theHistogramId->setHistoId("sizeY_OffTrack",id_);
-      meSizeY_offTrack_ = iBooker.book1D(hisID,"Cluster y-width (columns) (off Track)",15,0.,15.);
-      meSizeY_offTrack_->setAxisTitle("Cluster y-size [columns]",1);
+      hisID = theHistogramId->setHistoId("sizeY_OffTrack", id_);
+      meSizeY_offTrack_ = iBooker.book1D(hisID, "Cluster y-width (columns) (off Track)", 15, 0., 15.);
+      meSizeY_offTrack_->setAxisTitle("Cluster y-size [columns]", 1);
     }
     delete theHistogramId;
   }
 
-  if(type==1 && barrel){
+  if (type == 1 && barrel) {
     uint32_t DBladder;
-    DBladder = PixelBarrelName(DetId(id_),pTT,isUpgrade).ladderName();
-    char sladder[80]; sprintf(sladder,"Ladder_%02i",DBladder);
+    DBladder = PixelBarrelName(DetId(id_), pTT, isUpgrade).ladderName();
+    char sladder[80];
+    sprintf(sladder, "Ladder_%02i", DBladder);
     hisID = src.label() + "_" + sladder;
-    if(isHalfModule) hisID += "H";
-    else hisID += "F";
-    meResidualXLad_ = iBooker.book1D("residualX_"+hisID,"Hit-to-Track Residual in r-phi",100,-150,150);
-    meResidualXLad_->setAxisTitle("hit-to-track residual in r-phi (um)",1);
-    meResidualYLad_ = iBooker.book1D("residualY_"+hisID,"Hit-to-Track Residual in Z",100,-300,300);
-    meResidualYLad_->setAxisTitle("hit-to-track residual in z (um)",1);
+    if (isHalfModule)
+      hisID += "H";
+    else
+      hisID += "F";
+    meResidualXLad_ = iBooker.book1D("residualX_" + hisID, "Hit-to-Track Residual in r-phi", 100, -150, 150);
+    meResidualXLad_->setAxisTitle("hit-to-track residual in r-phi (um)", 1);
+    meResidualYLad_ = iBooker.book1D("residualY_" + hisID, "Hit-to-Track Residual in Z", 100, -300, 300);
+    meResidualYLad_->setAxisTitle("hit-to-track residual in z (um)", 1);
     // Number of clusters
-    meNClusters_onTrackLad_ = iBooker.book1D("nclusters_OnTrack_" + hisID,"Number of Clusters (on Track)",10,0.,10.);
-    meNClusters_onTrackLad_->setAxisTitle("Number of Clusters on Track",1);
+    meNClusters_onTrackLad_ =
+        iBooker.book1D("nclusters_OnTrack_" + hisID, "Number of Clusters (on Track)", 10, 0., 10.);
+    meNClusters_onTrackLad_->setAxisTitle("Number of Clusters on Track", 1);
     // Total cluster charge in MeV
-    meCharge_onTrackLad_ = iBooker.book1D("charge_OnTrack_" + hisID,"Normalized Cluster charge (on Track)",100,0.,200.);
-    meCharge_onTrackLad_->setAxisTitle("Charge [kilo electrons]",1);
+    meCharge_onTrackLad_ =
+        iBooker.book1D("charge_OnTrack_" + hisID, "Normalized Cluster charge (on Track)", 100, 0., 200.);
+    meCharge_onTrackLad_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    meSize_onTrackLad_ = iBooker.book1D("size_OnTrack_" + hisID,"Total cluster size (on Track)",30,0.,30.);
-    meSize_onTrackLad_->setAxisTitle("Cluster size [number of pixels]",1);
+    meSize_onTrackLad_ = iBooker.book1D("size_OnTrack_" + hisID, "Total cluster size (on Track)", 30, 0., 30.);
+    meSize_onTrackLad_->setAxisTitle("Cluster size [number of pixels]", 1);
     // Number of clusters
-    meNClusters_offTrackLad_ = iBooker.book1D("nclusters_OffTrack_" + hisID,"Number of Clusters (off Track)",35,0.,35.);
-    meNClusters_offTrackLad_->setAxisTitle("Number of Clusters off Track",1);
+    meNClusters_offTrackLad_ =
+        iBooker.book1D("nclusters_OffTrack_" + hisID, "Number of Clusters (off Track)", 35, 0., 35.);
+    meNClusters_offTrackLad_->setAxisTitle("Number of Clusters off Track", 1);
     // Total cluster charge in MeV
-    meCharge_offTrackLad_ = iBooker.book1D("charge_OffTrack_" + hisID,"Cluster charge (off Track)",100,0.,200.);
-    meCharge_offTrackLad_->setAxisTitle("Charge [kilo electrons]",1);
+    meCharge_offTrackLad_ = iBooker.book1D("charge_OffTrack_" + hisID, "Cluster charge (off Track)", 100, 0., 200.);
+    meCharge_offTrackLad_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    meSize_offTrackLad_ = iBooker.book1D("size_OffTrack_" + hisID,"Total cluster size (off Track)",30,0.,30.);
-    meSize_offTrackLad_->setAxisTitle("Cluster size [number of pixels]",1);
-    if(!reducedSet){
+    meSize_offTrackLad_ = iBooker.book1D("size_OffTrack_" + hisID, "Total cluster size (off Track)", 30, 0., 30.);
+    meSize_offTrackLad_->setAxisTitle("Cluster size [number of pixels]", 1);
+    if (!reducedSet) {
       // Cluster width on the x-axis
-      meSizeX_offTrackLad_ = iBooker.book1D("sizeX_OffTrack_" + hisID,"Cluster x-width (rows) (off Track)",10,0.,10.);
-      meSizeX_offTrackLad_->setAxisTitle("Cluster x-size [rows]",1);
+      meSizeX_offTrackLad_ =
+          iBooker.book1D("sizeX_OffTrack_" + hisID, "Cluster x-width (rows) (off Track)", 10, 0., 10.);
+      meSizeX_offTrackLad_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      meSizeY_offTrackLad_ = iBooker.book1D("sizeY_OffTrack_" + hisID,"Cluster y-width (columns) (off Track)",15,0.,15.);
-      meSizeY_offTrackLad_->setAxisTitle("Cluster y-size [columns]",1);
+      meSizeY_offTrackLad_ =
+          iBooker.book1D("sizeY_OffTrack_" + hisID, "Cluster y-width (columns) (off Track)", 15, 0., 15.);
+      meSizeY_offTrackLad_->setAxisTitle("Cluster y-size [columns]", 1);
       // Cluster width on the x-axis
-      meSizeX_onTrackLad_ = iBooker.book1D("sizeX_OnTrack_" + hisID,"Cluster x-width (rows) (on Track)",10,0.,10.);
-      meSizeX_onTrackLad_->setAxisTitle("Cluster x-size [rows]",1);
+      meSizeX_onTrackLad_ = iBooker.book1D("sizeX_OnTrack_" + hisID, "Cluster x-width (rows) (on Track)", 10, 0., 10.);
+      meSizeX_onTrackLad_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      meSizeY_onTrackLad_ = iBooker.book1D("sizeY_OnTrack_" + hisID,"Cluster y-width (columns) (on Track)",15,0.,15.);
-      meSizeY_onTrackLad_->setAxisTitle("Cluster y-size [columns]",1);
+      meSizeY_onTrackLad_ =
+          iBooker.book1D("sizeY_OnTrack_" + hisID, "Cluster y-width (columns) (on Track)", 15, 0., 15.);
+      meSizeY_onTrackLad_->setAxisTitle("Cluster y-size [columns]", 1);
     }
   }
 
-  if(type==2 && barrel){
+  if (type == 2 && barrel) {
     uint32_t DBlayer;
-    DBlayer = PixelBarrelName(DetId(id_),pTT,isUpgrade).layerName();
-    char slayer[80]; sprintf(slayer,"Layer_%i",DBlayer);
+    DBlayer = PixelBarrelName(DetId(id_), pTT, isUpgrade).layerName();
+    char slayer[80];
+    sprintf(slayer, "Layer_%i", DBlayer);
     hisID = src.label() + "_" + slayer;
-    meResidualXLay_ = iBooker.book1D("residualX_"+hisID,"Hit-to-Track Residual in r-phi",100,-150,150);
-    meResidualXLay_->setAxisTitle("hit-to-track residual in r-phi (um)",1);
-    meResidualYLay_ = iBooker.book1D("residualY_"+hisID,"Hit-to-Track Residual in Z",100,-300,300);
-    meResidualYLay_->setAxisTitle("hit-to-track residual in z (um)",1);
+    meResidualXLay_ = iBooker.book1D("residualX_" + hisID, "Hit-to-Track Residual in r-phi", 100, -150, 150);
+    meResidualXLay_->setAxisTitle("hit-to-track residual in r-phi (um)", 1);
+    meResidualYLay_ = iBooker.book1D("residualY_" + hisID, "Hit-to-Track Residual in Z", 100, -300, 300);
+    meResidualYLay_->setAxisTitle("hit-to-track residual in z (um)", 1);
     // Number of clusters
-    meNClusters_onTrackLay_ = iBooker.book1D("nclusters_OnTrack_" + hisID,"Number of Clusters (on Track)",10,0.,10.);
-    meNClusters_onTrackLay_->setAxisTitle("Number of Clusters on Track",1);
+    meNClusters_onTrackLay_ =
+        iBooker.book1D("nclusters_OnTrack_" + hisID, "Number of Clusters (on Track)", 10, 0., 10.);
+    meNClusters_onTrackLay_->setAxisTitle("Number of Clusters on Track", 1);
     // Total cluster charge in MeV
-    meCharge_onTrackLay_ = iBooker.book1D("charge_OnTrack_" + hisID,"Normalized Cluster charge (on Track)",100,0.,200.);
-    meCharge_onTrackLay_->setAxisTitle("Charge [kilo electrons]",1);
+    meCharge_onTrackLay_ =
+        iBooker.book1D("charge_OnTrack_" + hisID, "Normalized Cluster charge (on Track)", 100, 0., 200.);
+    meCharge_onTrackLay_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    meSize_onTrackLay_ = iBooker.book1D("size_OnTrack_" + hisID,"Total cluster size (on Track)",30,0.,30.);
-    meSize_onTrackLay_->setAxisTitle("Cluster size [number of pixels]",1);    
+    meSize_onTrackLay_ = iBooker.book1D("size_OnTrack_" + hisID, "Total cluster size (on Track)", 30, 0., 30.);
+    meSize_onTrackLay_->setAxisTitle("Cluster size [number of pixels]", 1);
     // Number of clusters
-    meNClusters_offTrackLay_ = iBooker.book1D("nclusters_OffTrack_" + hisID,"Number of Clusters (off Track)",35,0.,35.);
-    meNClusters_offTrackLay_->setAxisTitle("Number of Clusters off Track",1);
+    meNClusters_offTrackLay_ =
+        iBooker.book1D("nclusters_OffTrack_" + hisID, "Number of Clusters (off Track)", 35, 0., 35.);
+    meNClusters_offTrackLay_->setAxisTitle("Number of Clusters off Track", 1);
     // Total cluster charge in MeV
-    meCharge_offTrackLay_ = iBooker.book1D("charge_OffTrack_" + hisID,"Cluster charge (off Track)",100,0.,200.);
-    meCharge_offTrackLay_->setAxisTitle("Charge [kilo electrons]",1);
+    meCharge_offTrackLay_ = iBooker.book1D("charge_OffTrack_" + hisID, "Cluster charge (off Track)", 100, 0., 200.);
+    meCharge_offTrackLay_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    meSize_offTrackLay_ = iBooker.book1D("size_OffTrack_" + hisID,"Total cluster size (off Track)",30,0.,30.);
-    meSize_offTrackLay_->setAxisTitle("Cluster size [number of pixels]",1);
-    if(!reducedSet){
+    meSize_offTrackLay_ = iBooker.book1D("size_OffTrack_" + hisID, "Total cluster size (off Track)", 30, 0., 30.);
+    meSize_offTrackLay_->setAxisTitle("Cluster size [number of pixels]", 1);
+    if (!reducedSet) {
       // Cluster width on the x-axis
-      meSizeX_onTrackLay_ = iBooker.book1D("sizeX_OnTrack_" + hisID,"Cluster x-width (rows) (on Track)",10,0.,10.);
-      meSizeX_onTrackLay_->setAxisTitle("Cluster x-size [rows]",1);
+      meSizeX_onTrackLay_ = iBooker.book1D("sizeX_OnTrack_" + hisID, "Cluster x-width (rows) (on Track)", 10, 0., 10.);
+      meSizeX_onTrackLay_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      meSizeY_onTrackLay_ = iBooker.book1D("sizeY_OnTrack_" + hisID,"Cluster y-width (columns) (on Track)",15,0.,15.);
-      meSizeY_onTrackLay_->setAxisTitle("Cluster y-size [columns]",1);
+      meSizeY_onTrackLay_ =
+          iBooker.book1D("sizeY_OnTrack_" + hisID, "Cluster y-width (columns) (on Track)", 15, 0., 15.);
+      meSizeY_onTrackLay_->setAxisTitle("Cluster y-size [columns]", 1);
       // Cluster width on the x-axis
-      meSizeX_offTrackLay_ = iBooker.book1D("sizeX_OffTrack_" + hisID,"Cluster x-width (rows) (off Track)",10,0.,10.);
-      meSizeX_offTrackLay_->setAxisTitle("Cluster x-size [rows]",1);
+      meSizeX_offTrackLay_ =
+          iBooker.book1D("sizeX_OffTrack_" + hisID, "Cluster x-width (rows) (off Track)", 10, 0., 10.);
+      meSizeX_offTrackLay_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      meSizeY_offTrackLay_ = iBooker.book1D("sizeY_OffTrack_" + hisID,"Cluster y-width (columns) (off Track)",15,0.,15.);
-      meSizeY_offTrackLay_->setAxisTitle("Cluster y-size [columns]",1);
+      meSizeY_offTrackLay_ =
+          iBooker.book1D("sizeY_OffTrack_" + hisID, "Cluster y-width (columns) (off Track)", 15, 0., 15.);
+      meSizeY_offTrackLay_->setAxisTitle("Cluster y-size [columns]", 1);
     }
   }
 
-  if(type==3 && barrel){
+  if (type == 3 && barrel) {
     uint32_t DBmodule;
-    DBmodule = PixelBarrelName(DetId(id_),pTT,isUpgrade).moduleName();
-    char smodule[80]; sprintf(smodule,"Ring_%i",DBmodule);
+    DBmodule = PixelBarrelName(DetId(id_), pTT, isUpgrade).moduleName();
+    char smodule[80];
+    sprintf(smodule, "Ring_%i", DBmodule);
     hisID = src.label() + "_" + smodule;
-    meResidualXPhi_ = iBooker.book1D("residualX_"+hisID,"Hit-to-Track Residual in r-phi",100,-150,150);
-    meResidualXPhi_->setAxisTitle("hit-to-track residual in r-phi (um)",1);
-    meResidualYPhi_ = iBooker.book1D("residualY_"+hisID,"Hit-to-Track Residual in Z",100,-300,300);
-    meResidualYPhi_->setAxisTitle("hit-to-track residual in z (um)",1);
+    meResidualXPhi_ = iBooker.book1D("residualX_" + hisID, "Hit-to-Track Residual in r-phi", 100, -150, 150);
+    meResidualXPhi_->setAxisTitle("hit-to-track residual in r-phi (um)", 1);
+    meResidualYPhi_ = iBooker.book1D("residualY_" + hisID, "Hit-to-Track Residual in Z", 100, -300, 300);
+    meResidualYPhi_->setAxisTitle("hit-to-track residual in z (um)", 1);
     // Number of clusters
-    meNClusters_onTrackPhi_ = iBooker.book1D("nclusters_OnTrack_" + hisID,"Number of Clusters (on Track)",10,0.,10.);
-    meNClusters_onTrackPhi_->setAxisTitle("Number of Clusters on Track",1);
+    meNClusters_onTrackPhi_ =
+        iBooker.book1D("nclusters_OnTrack_" + hisID, "Number of Clusters (on Track)", 10, 0., 10.);
+    meNClusters_onTrackPhi_->setAxisTitle("Number of Clusters on Track", 1);
     // Total cluster charge in MeV
-    meCharge_onTrackPhi_ = iBooker.book1D("charge_OnTrack_" + hisID,"Normalized Cluster charge (on Track)",100,0.,200.);
-    meCharge_onTrackPhi_->setAxisTitle("Charge [kilo electrons]",1);
+    meCharge_onTrackPhi_ =
+        iBooker.book1D("charge_OnTrack_" + hisID, "Normalized Cluster charge (on Track)", 100, 0., 200.);
+    meCharge_onTrackPhi_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    meSize_onTrackPhi_ = iBooker.book1D("size_OnTrack_" + hisID,"Total cluster size (on Track)",30,0.,30.);
-    meSize_onTrackPhi_->setAxisTitle("Cluster size [number of pixels]",1);    
+    meSize_onTrackPhi_ = iBooker.book1D("size_OnTrack_" + hisID, "Total cluster size (on Track)", 30, 0., 30.);
+    meSize_onTrackPhi_->setAxisTitle("Cluster size [number of pixels]", 1);
     // Number of clusters
-    meNClusters_offTrackPhi_ = iBooker.book1D("nclusters_OffTrack_" + hisID,"Number of Clusters (off Track)",35,0.,35.);
-    meNClusters_offTrackPhi_->setAxisTitle("Number of Clusters off Track",1);
+    meNClusters_offTrackPhi_ =
+        iBooker.book1D("nclusters_OffTrack_" + hisID, "Number of Clusters (off Track)", 35, 0., 35.);
+    meNClusters_offTrackPhi_->setAxisTitle("Number of Clusters off Track", 1);
     // Total cluster charge in MeV
-    meCharge_offTrackPhi_ = iBooker.book1D("charge_OffTrack_" + hisID,"Cluster charge (off Track)",100,0.,200.);
-    meCharge_offTrackPhi_->setAxisTitle("Charge [kilo electrons]",1);
+    meCharge_offTrackPhi_ = iBooker.book1D("charge_OffTrack_" + hisID, "Cluster charge (off Track)", 100, 0., 200.);
+    meCharge_offTrackPhi_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    meSize_offTrackPhi_ = iBooker.book1D("size_OffTrack_" + hisID,"Total cluster size (off Track)",30,0.,30.);
-    meSize_offTrackPhi_->setAxisTitle("Cluster size [number of pixels]",1);
-    if(!reducedSet){
+    meSize_offTrackPhi_ = iBooker.book1D("size_OffTrack_" + hisID, "Total cluster size (off Track)", 30, 0., 30.);
+    meSize_offTrackPhi_->setAxisTitle("Cluster size [number of pixels]", 1);
+    if (!reducedSet) {
       // Cluster width on the x-axis
-      meSizeX_onTrackPhi_ = iBooker.book1D("sizeX_OnTrack_" + hisID,"Cluster x-width (rows) (on Track)",10,0.,10.);
-      meSizeX_onTrackPhi_->setAxisTitle("Cluster x-size [rows]",1);
+      meSizeX_onTrackPhi_ = iBooker.book1D("sizeX_OnTrack_" + hisID, "Cluster x-width (rows) (on Track)", 10, 0., 10.);
+      meSizeX_onTrackPhi_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      meSizeY_onTrackPhi_ = iBooker.book1D("sizeY_OnTrack_" + hisID,"Cluster y-width (columns) (on Track)",15,0.,15.);
-      meSizeY_onTrackPhi_->setAxisTitle("Cluster y-size [columns]",1);
+      meSizeY_onTrackPhi_ =
+          iBooker.book1D("sizeY_OnTrack_" + hisID, "Cluster y-width (columns) (on Track)", 15, 0., 15.);
+      meSizeY_onTrackPhi_->setAxisTitle("Cluster y-size [columns]", 1);
       // Cluster width on the x-axis
-      meSizeX_offTrackPhi_ = iBooker.book1D("sizeX_OffTrack_" + hisID,"Cluster x-width (rows) (off Track)",10,0.,10.);
-      meSizeX_offTrackPhi_->setAxisTitle("Cluster x-size [rows]",1);
+      meSizeX_offTrackPhi_ =
+          iBooker.book1D("sizeX_OffTrack_" + hisID, "Cluster x-width (rows) (off Track)", 10, 0., 10.);
+      meSizeX_offTrackPhi_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      meSizeY_offTrackPhi_ = iBooker.book1D("sizeY_OffTrack_" + hisID,"Cluster y-width (columns) (off Track)",15,0.,15.);
-      meSizeY_offTrackPhi_->setAxisTitle("Cluster y-size [columns]",1);
+      meSizeY_offTrackPhi_ =
+          iBooker.book1D("sizeY_OffTrack_" + hisID, "Cluster y-width (columns) (off Track)", 15, 0., 15.);
+      meSizeY_offTrackPhi_->setAxisTitle("Cluster y-size [columns]", 1);
     }
   }
 
-  if(type==4 && endcap){
+  if (type == 4 && endcap) {
     uint32_t blade;
-    blade= PixelEndcapName(DetId(id_),pTT,isUpgrade).bladeName();
-    char sblade[80]; sprintf(sblade, "Blade_%02i",blade);
+    blade = PixelEndcapName(DetId(id_), pTT, isUpgrade).bladeName();
+    char sblade[80];
+    sprintf(sblade, "Blade_%02i", blade);
     hisID = src.label() + "_" + sblade;
-    meResidualXBlade_ = iBooker.book1D("residualX_"+hisID,"Hit-to-Track Residual in r-phi",100,-150,150);
-    meResidualXBlade_->setAxisTitle("hit-to-track residual in r-phi (um)",1);
-    meResidualYBlade_ = iBooker.book1D("residualY_"+hisID,"Hit-to-Track Residual in Z",100,-300,300);
-    meResidualYBlade_->setAxisTitle("hit-to-track residual in z (um)",1);
+    meResidualXBlade_ = iBooker.book1D("residualX_" + hisID, "Hit-to-Track Residual in r-phi", 100, -150, 150);
+    meResidualXBlade_->setAxisTitle("hit-to-track residual in r-phi (um)", 1);
+    meResidualYBlade_ = iBooker.book1D("residualY_" + hisID, "Hit-to-Track Residual in Z", 100, -300, 300);
+    meResidualYBlade_->setAxisTitle("hit-to-track residual in z (um)", 1);
     // Number of clusters
-    meNClusters_onTrackBlade_ = iBooker.book1D("nclusters_OnTrack_" + hisID,"Number of Clusters (on Track)",10,0.,10.);
-    meNClusters_onTrackBlade_->setAxisTitle("Number of Clusters on Track",1);
+    meNClusters_onTrackBlade_ =
+        iBooker.book1D("nclusters_OnTrack_" + hisID, "Number of Clusters (on Track)", 10, 0., 10.);
+    meNClusters_onTrackBlade_->setAxisTitle("Number of Clusters on Track", 1);
     // Total cluster charge in MeV
-    meCharge_onTrackBlade_ = iBooker.book1D("charge_OnTrack_" + hisID,"Normalized Cluster charge (on Track)",100,0.,200.);
-    meCharge_onTrackBlade_->setAxisTitle("Charge [kilo electrons]",1);
+    meCharge_onTrackBlade_ =
+        iBooker.book1D("charge_OnTrack_" + hisID, "Normalized Cluster charge (on Track)", 100, 0., 200.);
+    meCharge_onTrackBlade_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    meSize_onTrackBlade_ = iBooker.book1D("size_OnTrack_" + hisID,"Total cluster size (on Track)",30,0.,30.);
-    meSize_onTrackBlade_->setAxisTitle("Cluster size [number of pixels]",1);    
+    meSize_onTrackBlade_ = iBooker.book1D("size_OnTrack_" + hisID, "Total cluster size (on Track)", 30, 0., 30.);
+    meSize_onTrackBlade_->setAxisTitle("Cluster size [number of pixels]", 1);
     // Number of clusters
-    meNClusters_offTrackBlade_ = iBooker.book1D("nclusters_OffTrack_" + hisID,"Number of Clusters (off Track)",35,0.,35.);
-    meNClusters_offTrackBlade_->setAxisTitle("Number of Clusters off Track",1);
+    meNClusters_offTrackBlade_ =
+        iBooker.book1D("nclusters_OffTrack_" + hisID, "Number of Clusters (off Track)", 35, 0., 35.);
+    meNClusters_offTrackBlade_->setAxisTitle("Number of Clusters off Track", 1);
     // Total cluster charge in MeV
-    meCharge_offTrackBlade_ = iBooker.book1D("charge_OffTrack_" + hisID,"Cluster charge (off Track)",100,0.,200.);
-    meCharge_offTrackBlade_->setAxisTitle("Charge [kilo electrons]",1);
+    meCharge_offTrackBlade_ = iBooker.book1D("charge_OffTrack_" + hisID, "Cluster charge (off Track)", 100, 0., 200.);
+    meCharge_offTrackBlade_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    meSize_offTrackBlade_ = iBooker.book1D("size_OffTrack_" + hisID,"Total cluster size (off Track)",30,0.,30.);
-    meSize_offTrackBlade_->setAxisTitle("Cluster size [number of pixels]",1);
-    if(!reducedSet){
+    meSize_offTrackBlade_ = iBooker.book1D("size_OffTrack_" + hisID, "Total cluster size (off Track)", 30, 0., 30.);
+    meSize_offTrackBlade_->setAxisTitle("Cluster size [number of pixels]", 1);
+    if (!reducedSet) {
       // Cluster width on the x-axis
-      meSizeX_onTrackBlade_ = iBooker.book1D("sizeX_OnTrack_" + hisID,"Cluster x-width (rows) (on Track)",10,0.,10.);
-      meSizeX_onTrackBlade_->setAxisTitle("Cluster x-size [rows]",1);
+      meSizeX_onTrackBlade_ =
+          iBooker.book1D("sizeX_OnTrack_" + hisID, "Cluster x-width (rows) (on Track)", 10, 0., 10.);
+      meSizeX_onTrackBlade_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      meSizeY_onTrackBlade_ = iBooker.book1D("sizeY_OnTrack_" + hisID,"Cluster y-width (columns) (on Track)",15,0.,15.);
-      meSizeY_onTrackBlade_->setAxisTitle("Cluster y-size [columns]",1);
+      meSizeY_onTrackBlade_ =
+          iBooker.book1D("sizeY_OnTrack_" + hisID, "Cluster y-width (columns) (on Track)", 15, 0., 15.);
+      meSizeY_onTrackBlade_->setAxisTitle("Cluster y-size [columns]", 1);
       // Cluster width on the x-axis
-      meSizeX_offTrackBlade_ = iBooker.book1D("sizeX_OffTrack_" + hisID,"Cluster x-width (rows) (off Track)",10,0.,10.);
-      meSizeX_offTrackBlade_->setAxisTitle("Cluster x-size [rows]",1);
+      meSizeX_offTrackBlade_ =
+          iBooker.book1D("sizeX_OffTrack_" + hisID, "Cluster x-width (rows) (off Track)", 10, 0., 10.);
+      meSizeX_offTrackBlade_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      meSizeY_offTrackBlade_ = iBooker.book1D("sizeY_OffTrack_" + hisID,"Cluster y-width (columns) (off Track)",15,0.,15.);
-      meSizeY_offTrackBlade_->setAxisTitle("Cluster y-size [columns]",1);
+      meSizeY_offTrackBlade_ =
+          iBooker.book1D("sizeY_OffTrack_" + hisID, "Cluster y-width (columns) (off Track)", 15, 0., 15.);
+      meSizeY_offTrackBlade_->setAxisTitle("Cluster y-size [columns]", 1);
     }
   }
 
-  if(type==5 && endcap){
+  if (type == 5 && endcap) {
     uint32_t disk;
-    disk = PixelEndcapName(DetId(id_),pTT,isUpgrade).diskName();
-    
-    char sdisk[80]; sprintf(sdisk, "Disk_%i",disk);
+    disk = PixelEndcapName(DetId(id_), pTT, isUpgrade).diskName();
+
+    char sdisk[80];
+    sprintf(sdisk, "Disk_%i", disk);
     hisID = src.label() + "_" + sdisk;
-    meResidualXDisk_ = iBooker.book1D("residualX_"+hisID,"Hit-to-Track Residual in r-phi",100,-150,150);
-    meResidualXDisk_->setAxisTitle("hit-to-track residual in r-phi (um)",1);
-    meResidualYDisk_ = iBooker.book1D("residualY_"+hisID,"Hit-to-Track Residual in Z",100,-300,300);
-    meResidualYDisk_->setAxisTitle("hit-to-track residual in z (um)",1);
+    meResidualXDisk_ = iBooker.book1D("residualX_" + hisID, "Hit-to-Track Residual in r-phi", 100, -150, 150);
+    meResidualXDisk_->setAxisTitle("hit-to-track residual in r-phi (um)", 1);
+    meResidualYDisk_ = iBooker.book1D("residualY_" + hisID, "Hit-to-Track Residual in Z", 100, -300, 300);
+    meResidualYDisk_->setAxisTitle("hit-to-track residual in z (um)", 1);
     // Number of clusters
-    meNClusters_onTrackDisk_ = iBooker.book1D("nclusters_OnTrack_" + hisID,"Number of Clusters (on Track)",10,0.,10.);
-    meNClusters_onTrackDisk_->setAxisTitle("Number of Clusters on Track",1);
+    meNClusters_onTrackDisk_ =
+        iBooker.book1D("nclusters_OnTrack_" + hisID, "Number of Clusters (on Track)", 10, 0., 10.);
+    meNClusters_onTrackDisk_->setAxisTitle("Number of Clusters on Track", 1);
     // Total cluster charge in MeV
-    meCharge_onTrackDisk_ = iBooker.book1D("charge_OnTrack_" + hisID,"Normalized Cluster charge (on Track)",100,0.,200.);
-    meCharge_onTrackDisk_->setAxisTitle("Charge [kilo electrons]",1);
+    meCharge_onTrackDisk_ =
+        iBooker.book1D("charge_OnTrack_" + hisID, "Normalized Cluster charge (on Track)", 100, 0., 200.);
+    meCharge_onTrackDisk_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    meSize_onTrackDisk_ = iBooker.book1D("size_OnTrack_" + hisID,"Total cluster size (on Track)",30,0.,30.);
-    meSize_onTrackDisk_->setAxisTitle("Cluster size [number of pixels]",1);    
+    meSize_onTrackDisk_ = iBooker.book1D("size_OnTrack_" + hisID, "Total cluster size (on Track)", 30, 0., 30.);
+    meSize_onTrackDisk_->setAxisTitle("Cluster size [number of pixels]", 1);
     // Number of clusters
-    meNClusters_offTrackDisk_ = iBooker.book1D("nclusters_OffTrack_" + hisID,"Number of Clusters (off Track)",35,0.,35.);
-    meNClusters_offTrackDisk_->setAxisTitle("Number of Clusters off Track",1);
+    meNClusters_offTrackDisk_ =
+        iBooker.book1D("nclusters_OffTrack_" + hisID, "Number of Clusters (off Track)", 35, 0., 35.);
+    meNClusters_offTrackDisk_->setAxisTitle("Number of Clusters off Track", 1);
     // Total cluster charge in MeV
-    meCharge_offTrackDisk_ = iBooker.book1D("charge_OffTrack_" + hisID,"Cluster charge (off Track)",100,0.,200.);
-    meCharge_offTrackDisk_->setAxisTitle("Charge [kilo electrons]",1);
+    meCharge_offTrackDisk_ = iBooker.book1D("charge_OffTrack_" + hisID, "Cluster charge (off Track)", 100, 0., 200.);
+    meCharge_offTrackDisk_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    meSize_offTrackDisk_ = iBooker.book1D("size_OffTrack_" + hisID,"Total cluster size (off Track)",30,0.,30.);
-    meSize_offTrackDisk_->setAxisTitle("Cluster size [number of pixels]",1);
-    if(!reducedSet){
+    meSize_offTrackDisk_ = iBooker.book1D("size_OffTrack_" + hisID, "Total cluster size (off Track)", 30, 0., 30.);
+    meSize_offTrackDisk_->setAxisTitle("Cluster size [number of pixels]", 1);
+    if (!reducedSet) {
       // Cluster width on the x-axis
-      meSizeX_onTrackDisk_ = iBooker.book1D("sizeX_OnTrack_" + hisID,"Cluster x-width (rows) (on Track)",10,0.,10.);
-      meSizeX_onTrackDisk_->setAxisTitle("Cluster x-size [rows]",1);
+      meSizeX_onTrackDisk_ = iBooker.book1D("sizeX_OnTrack_" + hisID, "Cluster x-width (rows) (on Track)", 10, 0., 10.);
+      meSizeX_onTrackDisk_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      meSizeY_onTrackDisk_ = iBooker.book1D("sizeY_OnTrack_" + hisID,"Cluster y-width (columns) (on Track)",15,0.,15.);
-      meSizeY_onTrackDisk_->setAxisTitle("Cluster y-size [columns]",1);
+      meSizeY_onTrackDisk_ =
+          iBooker.book1D("sizeY_OnTrack_" + hisID, "Cluster y-width (columns) (on Track)", 15, 0., 15.);
+      meSizeY_onTrackDisk_->setAxisTitle("Cluster y-size [columns]", 1);
       // Cluster width on the x-axis
-      meSizeX_offTrackDisk_ = iBooker.book1D("sizeX_OffTrack_" + hisID,"Cluster x-width (rows) (off Track)",10,0.,10.);
-      meSizeX_offTrackDisk_->setAxisTitle("Cluster x-size [rows]",1);
+      meSizeX_offTrackDisk_ =
+          iBooker.book1D("sizeX_OffTrack_" + hisID, "Cluster x-width (rows) (off Track)", 10, 0., 10.);
+      meSizeX_offTrackDisk_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      meSizeY_offTrackDisk_ = iBooker.book1D("sizeY_OffTrack_" + hisID,"Cluster y-width (columns) (off Track)",15,0.,15.);
-      meSizeY_offTrackDisk_->setAxisTitle("Cluster y-size [columns]",1);
+      meSizeY_offTrackDisk_ =
+          iBooker.book1D("sizeY_OffTrack_" + hisID, "Cluster y-width (columns) (off Track)", 15, 0., 15.);
+      meSizeY_offTrackDisk_->setAxisTitle("Cluster y-size [columns]", 1);
     }
   }
 
-  if(type==6 && endcap){
+  if (type == 6 && endcap) {
     uint32_t panel;
     uint32_t module;
-    panel= PixelEndcapName(DetId(id_),pTT,isUpgrade).pannelName();
-    module= PixelEndcapName(DetId(id_),pTT,isUpgrade).plaquetteName();
-    
-    char slab[80]; sprintf(slab, "Panel_%i_Ring_%i",panel, module);
+    panel = PixelEndcapName(DetId(id_), pTT, isUpgrade).pannelName();
+    module = PixelEndcapName(DetId(id_), pTT, isUpgrade).plaquetteName();
+
+    char slab[80];
+    sprintf(slab, "Panel_%i_Ring_%i", panel, module);
     hisID = src.label() + "_" + slab;
-    meResidualXRing_ = iBooker.book1D("residualX_"+hisID,"Hit-to-Track Residual in r-phi",100,-150,150);
-    meResidualXRing_->setAxisTitle("hit-to-track residual in r-phi (um)",1);
-    meResidualYRing_ = iBooker.book1D("residualY_"+hisID,"Hit-to-Track Residual in Z",100,-300,300);
-    meResidualYRing_->setAxisTitle("hit-to-track residual in z (um)",1);
+    meResidualXRing_ = iBooker.book1D("residualX_" + hisID, "Hit-to-Track Residual in r-phi", 100, -150, 150);
+    meResidualXRing_->setAxisTitle("hit-to-track residual in r-phi (um)", 1);
+    meResidualYRing_ = iBooker.book1D("residualY_" + hisID, "Hit-to-Track Residual in Z", 100, -300, 300);
+    meResidualYRing_->setAxisTitle("hit-to-track residual in z (um)", 1);
     // Number of clusters
-    meNClusters_onTrackRing_ = iBooker.book1D("nclusters_OnTrack_" + hisID,"Number of Clusters (on Track)",10,0.,10.);
-    meNClusters_onTrackRing_->setAxisTitle("Number of Clusters on Track",1);
+    meNClusters_onTrackRing_ =
+        iBooker.book1D("nclusters_OnTrack_" + hisID, "Number of Clusters (on Track)", 10, 0., 10.);
+    meNClusters_onTrackRing_->setAxisTitle("Number of Clusters on Track", 1);
     // Total cluster charge in MeV
-    meCharge_onTrackRing_ = iBooker.book1D("charge_OnTrack_" + hisID,"Normalized Cluster charge (on Track)",100,0.,200.);
-    meCharge_onTrackRing_->setAxisTitle("Charge [kilo electrons]",1);
+    meCharge_onTrackRing_ =
+        iBooker.book1D("charge_OnTrack_" + hisID, "Normalized Cluster charge (on Track)", 100, 0., 200.);
+    meCharge_onTrackRing_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    meSize_onTrackRing_ = iBooker.book1D("size_OnTrack_" + hisID,"Total cluster size (on Track)",30,0.,30.);
-    meSize_onTrackRing_->setAxisTitle("Cluster size [number of pixels]",1);    
+    meSize_onTrackRing_ = iBooker.book1D("size_OnTrack_" + hisID, "Total cluster size (on Track)", 30, 0., 30.);
+    meSize_onTrackRing_->setAxisTitle("Cluster size [number of pixels]", 1);
     // Number of clusters
-    meNClusters_offTrackRing_ = iBooker.book1D("nclusters_OffTrack_" + hisID,"Number of Clusters (off Track)",35,0.,35.);
-    meNClusters_offTrackRing_->setAxisTitle("Number of Clusters off Track",1);
+    meNClusters_offTrackRing_ =
+        iBooker.book1D("nclusters_OffTrack_" + hisID, "Number of Clusters (off Track)", 35, 0., 35.);
+    meNClusters_offTrackRing_->setAxisTitle("Number of Clusters off Track", 1);
     // Total cluster charge in MeV
-    meCharge_offTrackRing_ = iBooker.book1D("charge_OffTrack_" + hisID,"Cluster charge (off Track)",100,0.,200.);
-    meCharge_offTrackRing_->setAxisTitle("Charge [kilo electrons]",1);
+    meCharge_offTrackRing_ = iBooker.book1D("charge_OffTrack_" + hisID, "Cluster charge (off Track)", 100, 0., 200.);
+    meCharge_offTrackRing_->setAxisTitle("Charge [kilo electrons]", 1);
     // Total cluster size (in pixels)
-    meSize_offTrackRing_ = iBooker.book1D("size_OffTrack_" + hisID,"Total cluster size (off Track)",30,0.,30.);
-    meSize_offTrackRing_->setAxisTitle("Cluster size [number of pixels]",1);
-    if(!reducedSet){
+    meSize_offTrackRing_ = iBooker.book1D("size_OffTrack_" + hisID, "Total cluster size (off Track)", 30, 0., 30.);
+    meSize_offTrackRing_->setAxisTitle("Cluster size [number of pixels]", 1);
+    if (!reducedSet) {
       // Cluster width on the x-axis
-      meSizeX_onTrackRing_ = iBooker.book1D("sizeX_OnTrack_" + hisID,"Cluster x-width (rows) (on Track)",10,0.,10.);
-      meSizeX_onTrackRing_->setAxisTitle("Cluster x-size [rows]",1);
+      meSizeX_onTrackRing_ = iBooker.book1D("sizeX_OnTrack_" + hisID, "Cluster x-width (rows) (on Track)", 10, 0., 10.);
+      meSizeX_onTrackRing_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      meSizeY_onTrackRing_ = iBooker.book1D("sizeY_OnTrack_" + hisID,"Cluster y-width (columns) (on Track)",15,0.,15.);
-      meSizeY_onTrackRing_->setAxisTitle("Cluster y-size [columns]",1);
+      meSizeY_onTrackRing_ =
+          iBooker.book1D("sizeY_OnTrack_" + hisID, "Cluster y-width (columns) (on Track)", 15, 0., 15.);
+      meSizeY_onTrackRing_->setAxisTitle("Cluster y-size [columns]", 1);
       // Cluster width on the x-axis
-      meSizeX_offTrackRing_ = iBooker.book1D("sizeX_OffTrack_" + hisID,"Cluster x-width (rows) (off Track)",10,0.,10.);
-      meSizeX_offTrackRing_->setAxisTitle("Cluster x-size [rows]",1);
+      meSizeX_offTrackRing_ =
+          iBooker.book1D("sizeX_OffTrack_" + hisID, "Cluster x-width (rows) (off Track)", 10, 0., 10.);
+      meSizeX_offTrackRing_->setAxisTitle("Cluster x-size [rows]", 1);
       // Cluster width on the y-axis
-      meSizeY_offTrackRing_ = iBooker.book1D("sizeY_OffTrack_" + hisID,"Cluster y-width (columns) (off Track)",15,0.,15.);
-      meSizeY_offTrackRing_->setAxisTitle("Cluster y-size [columns]",1);
+      meSizeY_offTrackRing_ =
+          iBooker.book1D("sizeY_OffTrack_" + hisID, "Cluster y-width (columns) (off Track)", 15, 0., 15.);
+      meSizeY_offTrackRing_->setAxisTitle("Cluster y-size [columns]", 1);
     }
   }
 }
 
-
-void SiPixelTrackResidualModule::fill(const Measurement2DVector& residual, bool reducedSet, bool modon, bool ladon, bool layon, bool phion, bool bladeon, bool diskon, bool ringon) {
-
+void SiPixelTrackResidualModule::fill(const Measurement2DVector &residual,
+                                      bool reducedSet,
+                                      bool modon,
+                                      bool ladon,
+                                      bool layon,
+                                      bool phion,
+                                      bool bladeon,
+                                      bool diskon,
+                                      bool ringon) {
   bool barrel = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel);
   bool endcap = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap);
 
-  if(modon){
-    (meResidualX_)->Fill(residual.x()); 
-    (meResidualY_)->Fill(residual.y()); 
+  if (modon) {
+    (meResidualX_)->Fill(residual.x());
+    (meResidualY_)->Fill(residual.y());
   }
 
-  if(ladon && barrel){
-    (meResidualXLad_)->Fill(residual.x()); 
-    (meResidualYLad_)->Fill(residual.y()); 
+  if (ladon && barrel) {
+    (meResidualXLad_)->Fill(residual.x());
+    (meResidualYLad_)->Fill(residual.y());
   }
 
-  if(layon && barrel){
-    (meResidualXLay_)->Fill(residual.x()); 
-    (meResidualYLay_)->Fill(residual.y()); 
+  if (layon && barrel) {
+    (meResidualXLay_)->Fill(residual.x());
+    (meResidualYLay_)->Fill(residual.y());
   }
-  if(phion && barrel){
-    (meResidualXPhi_)->Fill(residual.x()); 
-    (meResidualYPhi_)->Fill(residual.y()); 
+  if (phion && barrel) {
+    (meResidualXPhi_)->Fill(residual.x());
+    (meResidualYPhi_)->Fill(residual.y());
   }
 
-  if(bladeon && endcap){
-    (meResidualXBlade_)->Fill(residual.x()); 
-    (meResidualYBlade_)->Fill(residual.y()); 
+  if (bladeon && endcap) {
+    (meResidualXBlade_)->Fill(residual.x());
+    (meResidualYBlade_)->Fill(residual.y());
   }
 
-  if(diskon && endcap){
-    (meResidualXDisk_)->Fill(residual.x()); 
-    (meResidualYDisk_)->Fill(residual.y()); 
+  if (diskon && endcap) {
+    (meResidualXDisk_)->Fill(residual.x());
+    (meResidualYDisk_)->Fill(residual.y());
   }
 
-  if(ringon && endcap){
-    (meResidualXRing_)->Fill(residual.x()); 
-    (meResidualYRing_)->Fill(residual.y()); 
+  if (ringon && endcap) {
+    (meResidualXRing_)->Fill(residual.x());
+    (meResidualYRing_)->Fill(residual.y());
   }
 }
 
-
-void SiPixelTrackResidualModule::fill(const SiPixelCluster &clust, bool onTrack, double corrCharge, bool reducedSet, bool modon, bool ladon, bool layon, bool phion, bool bladeon, bool diskon, bool ringon){
-
+void SiPixelTrackResidualModule::fill(const SiPixelCluster &clust,
+                                      bool onTrack,
+                                      double corrCharge,
+                                      bool reducedSet,
+                                      bool modon,
+                                      bool ladon,
+                                      bool layon,
+                                      bool phion,
+                                      bool bladeon,
+                                      bool diskon,
+                                      bool ringon) {
   bool barrel = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel);
   bool endcap = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap);
 
-  float charge = 0.001*(clust.charge()); // total charge of cluster
-  if(onTrack) charge = corrCharge;              // corrected cluster charge
-  int size = clust.size();               // total size of cluster (in pixels)
-  int sizeX = clust.sizeX();             // size of cluster in x-clustrection
-  int sizeY = clust.sizeY();             // size of cluster in y-direction
-  
-  if(onTrack){
-    if(modon){
+  float charge = 0.001 * (clust.charge());  // total charge of cluster
+  if (onTrack)
+    charge = corrCharge;      // corrected cluster charge
+  int size = clust.size();    // total size of cluster (in pixels)
+  int sizeX = clust.sizeX();  // size of cluster in x-clustrection
+  int sizeY = clust.sizeY();  // size of cluster in y-direction
+
+  if (onTrack) {
+    if (modon) {
       (meCharge_onTrack_)->Fill((float)charge);
       (meSize_onTrack_)->Fill((int)size);
-      if(!reducedSet){
+      if (!reducedSet) {
         (meSizeX_onTrack_)->Fill((int)sizeX);
         (meSizeY_onTrack_)->Fill((int)sizeY);
       }
     }
-    if(barrel && ladon){
+    if (barrel && ladon) {
       (meCharge_onTrackLad_)->Fill((float)charge);
       (meSize_onTrackLad_)->Fill((int)size);
-      if(!reducedSet){
+      if (!reducedSet) {
         (meSizeX_onTrackLad_)->Fill((int)sizeX);
         (meSizeY_onTrackLad_)->Fill((int)sizeY);
       }
     }
-    if(barrel && layon){
+    if (barrel && layon) {
       (meCharge_onTrackLay_)->Fill((float)charge);
       (meSize_onTrackLay_)->Fill((int)size);
-      if(!reducedSet){
+      if (!reducedSet) {
         (meSizeX_onTrackLay_)->Fill((int)sizeX);
         (meSizeY_onTrackLay_)->Fill((int)sizeY);
       }
-    }   
-    if(barrel && phion){
+    }
+    if (barrel && phion) {
       (meCharge_onTrackPhi_)->Fill((float)charge);
       (meSize_onTrackPhi_)->Fill((int)size);
-      if(!reducedSet){
+      if (!reducedSet) {
         (meSizeX_onTrackPhi_)->Fill((int)sizeX);
         (meSizeY_onTrackPhi_)->Fill((int)sizeY);
       }
     }
-    if(endcap && bladeon){
+    if (endcap && bladeon) {
       (meCharge_onTrackBlade_)->Fill((float)charge);
       (meSize_onTrackBlade_)->Fill((int)size);
-      if(!reducedSet){
+      if (!reducedSet) {
         (meSizeX_onTrackBlade_)->Fill((int)sizeX);
         (meSizeY_onTrackBlade_)->Fill((int)sizeY);
       }
     }
-    if(endcap && diskon){
+    if (endcap && diskon) {
       (meCharge_onTrackDisk_)->Fill((float)charge);
       (meSize_onTrackDisk_)->Fill((int)size);
-      if(!reducedSet){
+      if (!reducedSet) {
         (meSizeX_onTrackDisk_)->Fill((int)sizeX);
         (meSizeY_onTrackDisk_)->Fill((int)sizeY);
       }
     }
-    if(endcap && ringon){
+    if (endcap && ringon) {
       (meCharge_onTrackRing_)->Fill((float)charge);
       (meSize_onTrackRing_)->Fill((int)size);
-      if(!reducedSet){
+      if (!reducedSet) {
         (meSizeX_onTrackRing_)->Fill((int)sizeX);
         (meSizeY_onTrackRing_)->Fill((int)sizeY);
       }
     }
   }
 
-  if(!onTrack){
-    if(modon){
+  if (!onTrack) {
+    if (modon) {
       (meCharge_offTrack_)->Fill((float)charge);
       (meSize_offTrack_)->Fill((int)size);
-      if(!reducedSet){
+      if (!reducedSet) {
         (meSizeX_offTrack_)->Fill((int)sizeX);
         (meSizeY_offTrack_)->Fill((int)sizeY);
       }
     }
-    if(barrel && ladon){
+    if (barrel && ladon) {
       (meCharge_offTrackLad_)->Fill((float)charge);
       (meSize_offTrackLad_)->Fill((int)size);
-      if(!reducedSet){
+      if (!reducedSet) {
         (meSizeX_offTrackLad_)->Fill((int)sizeX);
         (meSizeY_offTrackLad_)->Fill((int)sizeY);
       }
     }
-    if(barrel && layon){
+    if (barrel && layon) {
       (meCharge_offTrackLay_)->Fill((float)charge);
       (meSize_offTrackLay_)->Fill((int)size);
-      if(!reducedSet){
+      if (!reducedSet) {
         (meSizeX_offTrackLay_)->Fill((int)sizeX);
         (meSizeY_offTrackLay_)->Fill((int)sizeY);
       }
-    }   
-    if(barrel && phion){
+    }
+    if (barrel && phion) {
       (meCharge_offTrackPhi_)->Fill((float)charge);
       (meSize_offTrackPhi_)->Fill((int)size);
-      if(!reducedSet){
+      if (!reducedSet) {
         (meSizeX_offTrackPhi_)->Fill((int)sizeX);
         (meSizeY_offTrackPhi_)->Fill((int)sizeY);
       }
     }
-    if(endcap && bladeon){
+    if (endcap && bladeon) {
       (meCharge_offTrackBlade_)->Fill((float)charge);
       (meSize_offTrackBlade_)->Fill((int)size);
-      if(!reducedSet){
+      if (!reducedSet) {
         (meSizeX_offTrackBlade_)->Fill((int)sizeX);
         (meSizeY_offTrackBlade_)->Fill((int)sizeY);
       }
     }
-    if(endcap && diskon){
+    if (endcap && diskon) {
       (meCharge_offTrackDisk_)->Fill((float)charge);
       (meSize_offTrackDisk_)->Fill((int)size);
-      if(!reducedSet){
+      if (!reducedSet) {
         (meSizeX_offTrackDisk_)->Fill((int)sizeX);
         (meSizeY_offTrackDisk_)->Fill((int)sizeY);
       }
     }
-    if(endcap && ringon){
+    if (endcap && ringon) {
       (meCharge_offTrackRing_)->Fill((float)charge);
       (meSize_offTrackRing_)->Fill((int)size);
-      if(!reducedSet){
+      if (!reducedSet) {
         (meSizeX_offTrackRing_)->Fill((int)sizeX);
         (meSizeY_offTrackRing_)->Fill((int)sizeY);
       }
     }
   }
-
-
-  
 }
 
-void SiPixelTrackResidualModule::nfill(int onTrack, int offTrack, bool reducedSet, bool modon, bool ladon, bool layon, bool phion, bool bladeon, bool diskon, bool ringon){
-
+void SiPixelTrackResidualModule::nfill(int onTrack,
+                                       int offTrack,
+                                       bool reducedSet,
+                                       bool modon,
+                                       bool ladon,
+                                       bool layon,
+                                       bool phion,
+                                       bool bladeon,
+                                       bool diskon,
+                                       bool ringon) {
   bool barrel = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel);
   bool endcap = DetId(id_).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap);
-  bool fillOn = false; if(onTrack>0) fillOn = true; 
-  bool fillOff = false; if(offTrack>0) fillOff = true; 
-
-  if(modon){
-    if(fillOn) meNClusters_onTrack_->Fill(onTrack); 
-    if(fillOff) meNClusters_offTrack_->Fill(offTrack); 
+  bool fillOn = false;
+  if (onTrack > 0)
+    fillOn = true;
+  bool fillOff = false;
+  if (offTrack > 0)
+    fillOff = true;
+
+  if (modon) {
+    if (fillOn)
+      meNClusters_onTrack_->Fill(onTrack);
+    if (fillOff)
+      meNClusters_offTrack_->Fill(offTrack);
   }
-  if(ladon && barrel){
-    if(fillOn) meNClusters_onTrackLad_->Fill(onTrack); 
-    if(fillOff) meNClusters_offTrackLad_->Fill(offTrack); 
+  if (ladon && barrel) {
+    if (fillOn)
+      meNClusters_onTrackLad_->Fill(onTrack);
+    if (fillOff)
+      meNClusters_offTrackLad_->Fill(offTrack);
   }
-  
-  if(layon && barrel){
-    if(fillOn) meNClusters_onTrackLay_->Fill(onTrack); 
-    if(fillOff) meNClusters_offTrackLay_->Fill(offTrack); 
+
+  if (layon && barrel) {
+    if (fillOn)
+      meNClusters_onTrackLay_->Fill(onTrack);
+    if (fillOff)
+      meNClusters_offTrackLay_->Fill(offTrack);
   }
-  if(phion && barrel){
-    if(fillOn) meNClusters_onTrackPhi_->Fill(onTrack); 
-    if(fillOff) meNClusters_offTrackPhi_->Fill(offTrack); 
+  if (phion && barrel) {
+    if (fillOn)
+      meNClusters_onTrackPhi_->Fill(onTrack);
+    if (fillOff)
+      meNClusters_offTrackPhi_->Fill(offTrack);
   }
-  if(bladeon && endcap){
-    if(fillOn) meNClusters_onTrackBlade_->Fill(onTrack); 
-    if(fillOff) meNClusters_offTrackBlade_->Fill(offTrack); 
+  if (bladeon && endcap) {
+    if (fillOn)
+      meNClusters_onTrackBlade_->Fill(onTrack);
+    if (fillOff)
+      meNClusters_offTrackBlade_->Fill(offTrack);
   }
-  if(diskon && endcap){
-    if(fillOn) meNClusters_onTrackDisk_->Fill(onTrack); 
-    if(fillOff) meNClusters_offTrackDisk_->Fill(offTrack); 
+  if (diskon && endcap) {
+    if (fillOn)
+      meNClusters_onTrackDisk_->Fill(onTrack);
+    if (fillOff)
+      meNClusters_offTrackDisk_->Fill(offTrack);
   }
-  if(ringon && endcap){
-    if(fillOn) meNClusters_onTrackRing_->Fill(onTrack); 
-    if(fillOff) meNClusters_offTrackRing_->Fill(offTrack); 
+  if (ringon && endcap) {
+    if (fillOn)
+      meNClusters_onTrackRing_->Fill(onTrack);
+    if (fillOff)
+      meNClusters_offTrackRing_->Fill(offTrack);
   }
 }
diff --git a/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc b/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc
index f234d10b518ce..2994f61dbc732 100644
--- a/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc
+++ b/DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc
@@ -1,762 +1,897 @@
 // Package:    SiPixelMonitorTrack
 // Class:      SiPixelTrackResidualSource
-// 
-// class SiPixelTrackResidualSource SiPixelTrackResidualSource.cc 
+//
+// class SiPixelTrackResidualSource SiPixelTrackResidualSource.cc
 //       DQM/SiPixelMonitorTrack/src/SiPixelTrackResidualSource.cc
 //
 // Description: SiPixel hit-to-track residual data quality monitoring modules
-// Implementation: prototype -> improved -> never final - end of the 1st step 
+// Implementation: prototype -> improved -> never final - end of the 1st step
 //
 // Original Author: Shan-Huei Chuang
 //         Created: Fri Mar 23 18:41:42 CET 2007
 //         Updated by Lukas Wehrli (plots for clusters on/off track added)
 
-
 #include <iostream>
 #include <map>
 #include <string>
-#include <vector>
 #include <utility>
+#include <vector>
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h"
 
+#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
-#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 //#include "DataFormats/SiPixelDetId/interface/PixelBarrelNameWrapper.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelName.h"
 #include "DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h"
 
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
 #include "Geometry/CommonTopologies/interface/PixelTopology.h"
+#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
 
 #include "RecoTracker/TransientTrackingRecHit/interface/TkTransientTrackingRecHitBuilder.h"
 
-#include "TrackingTools/TrackFitters/interface/TrajectoryFitter.h"
-#include "TrackingTools/Records/interface/TransientRecHitRecord.h"
 #include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
+#include "TrackingTools/Records/interface/TransientRecHitRecord.h"
+#include "TrackingTools/TrackFitters/interface/TrajectoryFitter.h"
 #include "TrackingTools/TrackFitters/interface/TrajectoryStateCombiner.h"
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
 
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h"
 #include "DQM/SiPixelMonitorTrack/interface/SiPixelTrackResidualSource.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 
-//Claudia new libraries
+// Claudia new libraries
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
 #include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
-#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
+#include "TrackingTools/Records/interface/TransientRecHitRecord.h"
 #include "TrackingTools/Records/interface/TransientTrackRecord.h"
 #include "TrackingTools/TransientTrack/interface/TransientTrack.h"
-#include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHitBuilder.h"
+#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
 #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h"
-#include "TrackingTools/Records/interface/TransientRecHitRecord.h"
+#include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHitBuilder.h"
 
 using namespace std;
 using namespace edm;
 
-
-SiPixelTrackResidualSource::SiPixelTrackResidualSource(const edm::ParameterSet& pSet) :
-  pSet_(pSet),
-  modOn( pSet.getUntrackedParameter<bool>("modOn",true) ),
-  reducedSet( pSet.getUntrackedParameter<bool>("reducedSet",true) ),
-  ladOn( pSet.getUntrackedParameter<bool>("ladOn",false) ), 
-  layOn( pSet.getUntrackedParameter<bool>("layOn",false) ), 
-  phiOn( pSet.getUntrackedParameter<bool>("phiOn",false) ), 
-  ringOn( pSet.getUntrackedParameter<bool>("ringOn",false) ), 
-  bladeOn( pSet.getUntrackedParameter<bool>("bladeOn",false) ), 
-  diskOn( pSet.getUntrackedParameter<bool>("diskOn",false) ),
-  isUpgrade( pSet.getUntrackedParameter<bool>("isUpgrade",false) ),
-  noOfLayers(0),
-  noOfDisks(0)
-{ 
-   pSet_ = pSet; 
-   debug_ = pSet_.getUntrackedParameter<bool>("debug", false); 
-   src_ = pSet_.getParameter<edm::InputTag>("src"); 
-   clustersrc_ = pSet_.getParameter<edm::InputTag>("clustersrc");
-   tracksrc_ = pSet_.getParameter<edm::InputTag>("trajectoryInput");
-   ttrhbuilder_ = pSet_.getParameter<std::string>("TTRHBuilder");
-   ptminres_= pSet.getUntrackedParameter<double>("PtMinRes",4.0) ;
-   beamSpotToken_ = consumes<reco::BeamSpot>(std::string("offlineBeamSpot"));
-   vtxsrc_=pSet_.getUntrackedParameter<std::string>("vtxsrc",  "offlinePrimaryVertices");
-   offlinePrimaryVerticesToken_ =  consumes<reco::VertexCollection>(vtxsrc_);// consumes<reco::VertexCollection>(std::string("hiSelectedVertex"));     //"offlinePrimaryVertices"));
-   generalTracksToken_ = consumes<reco::TrackCollection>(pSet_.getParameter<edm::InputTag>("tracksrc"));
-   tracksrcToken_ = consumes<std::vector<Trajectory> >(pSet_.getParameter<edm::InputTag>("trajectoryInput"));
-   trackToken_ = consumes<std::vector<reco::Track> >(pSet_.getParameter<edm::InputTag>("trajectoryInput"));
-   trackAssociationToken_ = consumes<TrajTrackAssociationCollection>(pSet_.getParameter<edm::InputTag>("trajectoryInput"));
-   clustersrcToken_ = consumes<edmNew::DetSetVector<SiPixelCluster> >(pSet_.getParameter<edm::InputTag>("clustersrc"));
-   digisrc_ = pSet_.getParameter<edm::InputTag>("digisrc");
-   digisrcToken_ = consumes<edm::DetSetVector<PixelDigi> >(pSet_.getParameter<edm::InputTag>("digisrc"));
+SiPixelTrackResidualSource::SiPixelTrackResidualSource(const edm::ParameterSet &pSet)
+    : pSet_(pSet),
+      modOn(pSet.getUntrackedParameter<bool>("modOn", true)),
+      reducedSet(pSet.getUntrackedParameter<bool>("reducedSet", true)),
+      ladOn(pSet.getUntrackedParameter<bool>("ladOn", false)),
+      layOn(pSet.getUntrackedParameter<bool>("layOn", false)),
+      phiOn(pSet.getUntrackedParameter<bool>("phiOn", false)),
+      ringOn(pSet.getUntrackedParameter<bool>("ringOn", false)),
+      bladeOn(pSet.getUntrackedParameter<bool>("bladeOn", false)),
+      diskOn(pSet.getUntrackedParameter<bool>("diskOn", false)),
+      isUpgrade(pSet.getUntrackedParameter<bool>("isUpgrade", false)),
+      noOfLayers(0),
+      noOfDisks(0) {
+  pSet_ = pSet;
+  debug_ = pSet_.getUntrackedParameter<bool>("debug", false);
+  src_ = pSet_.getParameter<edm::InputTag>("src");
+  clustersrc_ = pSet_.getParameter<edm::InputTag>("clustersrc");
+  tracksrc_ = pSet_.getParameter<edm::InputTag>("trajectoryInput");
+  ttrhbuilder_ = pSet_.getParameter<std::string>("TTRHBuilder");
+  ptminres_ = pSet.getUntrackedParameter<double>("PtMinRes", 4.0);
+  beamSpotToken_ = consumes<reco::BeamSpot>(std::string("offlineBeamSpot"));
+  vtxsrc_ = pSet_.getUntrackedParameter<std::string>("vtxsrc", "offlinePrimaryVertices");
+  offlinePrimaryVerticesToken_ =
+      consumes<reco::VertexCollection>(vtxsrc_);  // consumes<reco::VertexCollection>(std::string("hiSelectedVertex"));
+                                                  // //"offlinePrimaryVertices"));
+  generalTracksToken_ = consumes<reco::TrackCollection>(pSet_.getParameter<edm::InputTag>("tracksrc"));
+  tracksrcToken_ = consumes<std::vector<Trajectory>>(pSet_.getParameter<edm::InputTag>("trajectoryInput"));
+  trackToken_ = consumes<std::vector<reco::Track>>(pSet_.getParameter<edm::InputTag>("trajectoryInput"));
+  trackAssociationToken_ =
+      consumes<TrajTrackAssociationCollection>(pSet_.getParameter<edm::InputTag>("trajectoryInput"));
+  clustersrcToken_ = consumes<edmNew::DetSetVector<SiPixelCluster>>(pSet_.getParameter<edm::InputTag>("clustersrc"));
+  digisrc_ = pSet_.getParameter<edm::InputTag>("digisrc");
+  digisrcToken_ = consumes<edm::DetSetVector<PixelDigi>>(pSet_.getParameter<edm::InputTag>("digisrc"));
 
   LogInfo("PixelDQM") << "SiPixelTrackResidualSource constructor" << endl;
-  LogInfo ("PixelDQM") << "Mod/Lad/Lay/Phi " << modOn << "/" << ladOn << "/" 
-            << layOn << "/" << phiOn << std::endl;
-  LogInfo ("PixelDQM") << "Blade/Disk/Ring" << bladeOn << "/" << diskOn << "/" 
-            << ringOn << std::endl;
+  LogInfo("PixelDQM") << "Mod/Lad/Lay/Phi " << modOn << "/" << ladOn << "/" << layOn << "/" << phiOn << std::endl;
+  LogInfo("PixelDQM") << "Blade/Disk/Ring" << bladeOn << "/" << diskOn << "/" << ringOn << std::endl;
 
   topFolderName_ = pSet_.getParameter<std::string>("TopFolderName");
 
   firstRun = true;
-  NTotal=0;
-  NLowProb=0;
+  NTotal = 0;
+  NLowProb = 0;
 }
 
-
 SiPixelTrackResidualSource::~SiPixelTrackResidualSource() {
   LogInfo("PixelDQM") << "SiPixelTrackResidualSource destructor" << endl;
 
-  std::map<uint32_t,SiPixelTrackResidualModule*>::iterator struct_iter;
-  for (struct_iter = theSiPixelStructure.begin() ; struct_iter != theSiPixelStructure.end() ; struct_iter++){
+  std::map<uint32_t, SiPixelTrackResidualModule *>::iterator struct_iter;
+  for (struct_iter = theSiPixelStructure.begin(); struct_iter != theSiPixelStructure.end(); struct_iter++) {
     delete struct_iter->second;
     struct_iter->second = nullptr;
   }
 }
 
-
-void SiPixelTrackResidualSource::dqmBeginRun(const edm::Run& r, edm::EventSetup const& iSetup) {
+void SiPixelTrackResidualSource::dqmBeginRun(const edm::Run &r, edm::EventSetup const &iSetup) {
   LogInfo("PixelDQM") << "SiPixelTrackResidualSource beginRun()" << endl;
   // retrieve TrackerGeometry for pixel dets
   edm::ESHandle<TrackerGeometry> TG;
   iSetup.get<TrackerDigiGeometryRecord>().get(TG);
-  if (debug_) LogVerbatim("PixelDQM") << "TrackerGeometry "<< &(*TG) <<" size is "<< TG->dets().size() << endl;
+  if (debug_)
+    LogVerbatim("PixelDQM") << "TrackerGeometry " << &(*TG) << " size is " << TG->dets().size() << endl;
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
   const TrackerTopology *pTT = tTopoHandle.product();
 
-  // build theSiPixelStructure with the pixel barrel and endcap dets from TrackerGeometry
-  for (TrackerGeometry::DetContainer::const_iterator pxb = TG->detsPXB().begin();  
-       pxb!=TG->detsPXB().end(); pxb++) {
-    if (dynamic_cast<PixelGeomDetUnit const *>((*pxb))!=nullptr) {
-      SiPixelTrackResidualModule* module = new SiPixelTrackResidualModule((*pxb)->geographicalId().rawId());
-      theSiPixelStructure.insert(pair<uint32_t, SiPixelTrackResidualModule*>((*pxb)->geographicalId().rawId(), module));
-      //int DBlayer = PixelBarrelNameWrapper(pSet_, DetId((*pxb)->geographicalId())).layerName();
-      int DBlayer = PixelBarrelName(DetId((*pxb)->geographicalId()),pTT,isUpgrade).layerName();
-      if (noOfLayers < DBlayer) noOfLayers = DBlayer;
+  // build theSiPixelStructure with the pixel barrel and endcap dets from
+  // TrackerGeometry
+  for (TrackerGeometry::DetContainer::const_iterator pxb = TG->detsPXB().begin(); pxb != TG->detsPXB().end(); pxb++) {
+    if (dynamic_cast<PixelGeomDetUnit const *>((*pxb)) != nullptr) {
+      SiPixelTrackResidualModule *module = new SiPixelTrackResidualModule((*pxb)->geographicalId().rawId());
+      theSiPixelStructure.insert(
+          pair<uint32_t, SiPixelTrackResidualModule *>((*pxb)->geographicalId().rawId(), module));
+      // int DBlayer = PixelBarrelNameWrapper(pSet_,
+      // DetId((*pxb)->geographicalId())).layerName();
+      int DBlayer = PixelBarrelName(DetId((*pxb)->geographicalId()), pTT, isUpgrade).layerName();
+      if (noOfLayers < DBlayer)
+        noOfLayers = DBlayer;
     }
   }
-  for (TrackerGeometry::DetContainer::const_iterator pxf = TG->detsPXF().begin(); 
-       pxf!=TG->detsPXF().end(); pxf++) {
-    if (dynamic_cast<PixelGeomDetUnit const *>((*pxf))!=nullptr) {
-      SiPixelTrackResidualModule* module = new SiPixelTrackResidualModule((*pxf)->geographicalId().rawId());
-      theSiPixelStructure.insert(pair<uint32_t, SiPixelTrackResidualModule*>((*pxf)->geographicalId().rawId(), module));
+  for (TrackerGeometry::DetContainer::const_iterator pxf = TG->detsPXF().begin(); pxf != TG->detsPXF().end(); pxf++) {
+    if (dynamic_cast<PixelGeomDetUnit const *>((*pxf)) != nullptr) {
+      SiPixelTrackResidualModule *module = new SiPixelTrackResidualModule((*pxf)->geographicalId().rawId());
+      theSiPixelStructure.insert(
+          pair<uint32_t, SiPixelTrackResidualModule *>((*pxf)->geographicalId().rawId(), module));
       int DBdisk;
-      DBdisk = PixelEndcapName(DetId((*pxf)->geographicalId()),pTT,isUpgrade).diskName();
-      if (noOfDisks < DBdisk) noOfDisks = DBdisk;
+      DBdisk = PixelEndcapName(DetId((*pxf)->geographicalId()), pTT, isUpgrade).diskName();
+      if (noOfDisks < DBdisk)
+        noOfDisks = DBdisk;
     }
   }
   LogInfo("PixelDQM") << "SiPixelStructure size is " << theSiPixelStructure.size() << endl;
 }
 
-void SiPixelTrackResidualSource::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const &, edm::EventSetup const & iSetup){
- 
-  // book residual histograms in theSiPixelFolder - one (x,y) pair of histograms per det
+void SiPixelTrackResidualSource::bookHistograms(DQMStore::IBooker &iBooker,
+                                                edm::Run const &,
+                                                edm::EventSetup const &iSetup) {
+  // book residual histograms in theSiPixelFolder - one (x,y) pair of histograms
+  // per det
   SiPixelFolderOrganizer theSiPixelFolder(false);
   std::stringstream nameX, titleX, nameY, titleY;
 
-  if(ladOn){
-    iBooker.setCurrentFolder(topFolderName_+"/Barrel");
-    for (int i = 1; i <= noOfLayers; i++){
-      nameX.str(std::string()); nameX <<"siPixelTrackResidualsX_SummedLayer_" << i;
-      titleX.str(std::string()); titleX <<"Layer"<< i << "Hit-to-Track Residual in r-phi";
-      meResidualXSummedLay.push_back(iBooker.book1D(nameX.str(),titleX.str(),100,-150,150));
-      meResidualXSummedLay.at(i-1)->setAxisTitle("hit-to-track residual in r-phi (um)",1);
-      nameY.str(std::string()); nameY <<"siPixelTrackResidualsY_SummedLayer_" << i;
-      titleY.str(std::string()); titleY <<"Layer"<< i << "Hit-to-Track Residual in Z";
-      meResidualYSummedLay.push_back(iBooker.book1D(nameY.str(),titleY.str(),100,-300,300));
-      meResidualYSummedLay.at(i-1)->setAxisTitle("hit-to-track residual in z (um)",1);
+  if (ladOn) {
+    iBooker.setCurrentFolder(topFolderName_ + "/Barrel");
+    for (int i = 1; i <= noOfLayers; i++) {
+      nameX.str(std::string());
+      nameX << "siPixelTrackResidualsX_SummedLayer_" << i;
+      titleX.str(std::string());
+      titleX << "Layer" << i << "Hit-to-Track Residual in r-phi";
+      meResidualXSummedLay.push_back(iBooker.book1D(nameX.str(), titleX.str(), 100, -150, 150));
+      meResidualXSummedLay.at(i - 1)->setAxisTitle("hit-to-track residual in r-phi (um)", 1);
+      nameY.str(std::string());
+      nameY << "siPixelTrackResidualsY_SummedLayer_" << i;
+      titleY.str(std::string());
+      titleY << "Layer" << i << "Hit-to-Track Residual in Z";
+      meResidualYSummedLay.push_back(iBooker.book1D(nameY.str(), titleY.str(), 100, -300, 300));
+      meResidualYSummedLay.at(i - 1)->setAxisTitle("hit-to-track residual in z (um)", 1);
     }
   }
 
-  for (std::map<uint32_t, SiPixelTrackResidualModule*>::iterator pxd = theSiPixelStructure.begin(); 
-       pxd!=theSiPixelStructure.end(); pxd++){
-   
-    if(modOn){
-      if (theSiPixelFolder.setModuleFolder(iBooker,(*pxd).first,0,isUpgrade)) (*pxd).second->book(pSet_,iSetup,iBooker,reducedSet,0,isUpgrade);
-      else throw cms::Exception("LogicError") << "SiPixelTrackResidualSource Folder Creation Failed! "; 
+  for (std::map<uint32_t, SiPixelTrackResidualModule *>::iterator pxd = theSiPixelStructure.begin();
+       pxd != theSiPixelStructure.end();
+       pxd++) {
+    if (modOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*pxd).first, 0, isUpgrade))
+        (*pxd).second->book(pSet_, iSetup, iBooker, reducedSet, 0, isUpgrade);
+      else
+        throw cms::Exception("LogicError") << "SiPixelTrackResidualSource Folder Creation Failed! ";
     }
-    if(ladOn){
-      if (theSiPixelFolder.setModuleFolder(iBooker,(*pxd).first,1,isUpgrade)) {
-	
-	(*pxd).second->book(pSet_,iSetup,iBooker,reducedSet,1,isUpgrade);
-      }
-      else throw cms::Exception("LogicError") << "SiPixelTrackResidualSource ladder Folder Creation Failed! "; 
+    if (ladOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*pxd).first, 1, isUpgrade)) {
+        (*pxd).second->book(pSet_, iSetup, iBooker, reducedSet, 1, isUpgrade);
+      } else
+        throw cms::Exception("LogicError") << "SiPixelTrackResidualSource ladder Folder Creation Failed! ";
     }
-    if(layOn){
-      if (theSiPixelFolder.setModuleFolder(iBooker,(*pxd).first,2,isUpgrade)) (*pxd).second->book(pSet_,iSetup,iBooker,reducedSet,2,isUpgrade);
-      else throw cms::Exception("LogicError") << "SiPixelTrackResidualSource layer Folder Creation Failed! "; 
+    if (layOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*pxd).first, 2, isUpgrade))
+        (*pxd).second->book(pSet_, iSetup, iBooker, reducedSet, 2, isUpgrade);
+      else
+        throw cms::Exception("LogicError") << "SiPixelTrackResidualSource layer Folder Creation Failed! ";
     }
-    if(phiOn){
-      if (theSiPixelFolder.setModuleFolder(iBooker,(*pxd).first,3,isUpgrade)) (*pxd).second->book(pSet_,iSetup,iBooker,reducedSet,3,isUpgrade);
-      else throw cms::Exception("LogicError") << "SiPixelTrackResidualSource phi Folder Creation Failed! "; 
+    if (phiOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*pxd).first, 3, isUpgrade))
+        (*pxd).second->book(pSet_, iSetup, iBooker, reducedSet, 3, isUpgrade);
+      else
+        throw cms::Exception("LogicError") << "SiPixelTrackResidualSource phi Folder Creation Failed! ";
     }
-    if(bladeOn){
-      if (theSiPixelFolder.setModuleFolder(iBooker,(*pxd).first,4,isUpgrade)) (*pxd).second->book(pSet_,iSetup,iBooker,reducedSet,4,isUpgrade);
-      else throw cms::Exception("LogicError") << "SiPixelTrackResidualSource Blade Folder Creation Failed! "; 
+    if (bladeOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*pxd).first, 4, isUpgrade))
+        (*pxd).second->book(pSet_, iSetup, iBooker, reducedSet, 4, isUpgrade);
+      else
+        throw cms::Exception("LogicError") << "SiPixelTrackResidualSource Blade Folder Creation Failed! ";
     }
-    if(diskOn){
-      if (theSiPixelFolder.setModuleFolder(iBooker,(*pxd).first,5,isUpgrade)) (*pxd).second->book(pSet_,iSetup,iBooker,reducedSet,5,isUpgrade);
-      else throw cms::Exception("LogicError") << "SiPixelTrackResidualSource Disk Folder Creation Failed! "; 
+    if (diskOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*pxd).first, 5, isUpgrade))
+        (*pxd).second->book(pSet_, iSetup, iBooker, reducedSet, 5, isUpgrade);
+      else
+        throw cms::Exception("LogicError") << "SiPixelTrackResidualSource Disk Folder Creation Failed! ";
     }
-    if(ringOn){
-      if (theSiPixelFolder.setModuleFolder(iBooker,(*pxd).first,6,isUpgrade)) (*pxd).second->book(pSet_,iSetup,iBooker,reducedSet,6,isUpgrade);
-      else throw cms::Exception("LogicError") << "SiPixelTrackResidualSource Ring Folder Creation Failed! "; 
+    if (ringOn) {
+      if (theSiPixelFolder.setModuleFolder(iBooker, (*pxd).first, 6, isUpgrade))
+        (*pxd).second->book(pSet_, iSetup, iBooker, reducedSet, 6, isUpgrade);
+      else
+        throw cms::Exception("LogicError") << "SiPixelTrackResidualSource Ring Folder Creation Failed! ";
     }
   }
 
-//   edm::InputTag tracksrc = pSet_.getParameter<edm::InputTag>("trajectoryInput");
-//   edm::InputTag clustersrc = pSet_.getParameter<edm::InputTag>("clustersrc");
-
-  //number of tracks
-  iBooker.setCurrentFolder(topFolderName_+"/Tracks");
-  meNofTracks_ = iBooker.book1D("ntracks_" + tracksrc_.label(),"Number of Tracks",4,0,4);
-  meNofTracks_->setAxisTitle("Number of Tracks",1);
-  meNofTracks_->setBinLabel(1,"All");
-  meNofTracks_->setBinLabel(2,"Pixel");
-  meNofTracks_->setBinLabel(3,"BPix");
-  meNofTracks_->setBinLabel(4,"FPix");
-
-  //number of tracks in pixel fiducial volume
-  iBooker.setCurrentFolder(topFolderName_+"/Tracks");
-  meNofTracksInPixVol_ = iBooker.book1D("ntracksInPixVol_" + tracksrc_.label(),"Number of Tracks crossing Pixel fiducial Volume",2,0,2);
-  meNofTracksInPixVol_->setAxisTitle("Number of Tracks",1);
-  meNofTracksInPixVol_->setBinLabel(1,"With Hits");
-  meNofTracksInPixVol_->setBinLabel(2,"Without Hits");
-
-  //number of clusters (associated to track / not associated)
-  iBooker.setCurrentFolder(topFolderName_+"/Clusters/OnTrack");
-  meNofClustersOnTrack_ = iBooker.book1D("nclusters_" + clustersrc_.label() + "_tot","Number of Clusters (on track)",3,0,3);
-  meNofClustersOnTrack_->setAxisTitle("Number of Clusters on Track",1);
-  meNofClustersOnTrack_->setBinLabel(1,"All");
-  meNofClustersOnTrack_->setBinLabel(2,"BPix");
-  meNofClustersOnTrack_->setBinLabel(3,"FPix");
-  iBooker.setCurrentFolder(topFolderName_+"/Clusters/OffTrack");
-  meNofClustersNotOnTrack_ = iBooker.book1D("nclusters_" + clustersrc_.label() + "_tot","Number of Clusters (off track)",3,0,3);
-  meNofClustersNotOnTrack_->setAxisTitle("Number of Clusters off Track",1);
-  meNofClustersNotOnTrack_->setBinLabel(1,"All");
-  meNofClustersNotOnTrack_->setBinLabel(2,"BPix");
-  meNofClustersNotOnTrack_->setBinLabel(3,"FPix");
-
-  //cluster charge and size
-  //charge
-  //on track
-  iBooker.setCurrentFolder(topFolderName_+"/Clusters/OnTrack");
+  //   edm::InputTag tracksrc =
+  //   pSet_.getParameter<edm::InputTag>("trajectoryInput"); edm::InputTag
+  //   clustersrc = pSet_.getParameter<edm::InputTag>("clustersrc");
+
+  // number of tracks
+  iBooker.setCurrentFolder(topFolderName_ + "/Tracks");
+  meNofTracks_ = iBooker.book1D("ntracks_" + tracksrc_.label(), "Number of Tracks", 4, 0, 4);
+  meNofTracks_->setAxisTitle("Number of Tracks", 1);
+  meNofTracks_->setBinLabel(1, "All");
+  meNofTracks_->setBinLabel(2, "Pixel");
+  meNofTracks_->setBinLabel(3, "BPix");
+  meNofTracks_->setBinLabel(4, "FPix");
+
+  // number of tracks in pixel fiducial volume
+  iBooker.setCurrentFolder(topFolderName_ + "/Tracks");
+  meNofTracksInPixVol_ = iBooker.book1D(
+      "ntracksInPixVol_" + tracksrc_.label(), "Number of Tracks crossing Pixel fiducial Volume", 2, 0, 2);
+  meNofTracksInPixVol_->setAxisTitle("Number of Tracks", 1);
+  meNofTracksInPixVol_->setBinLabel(1, "With Hits");
+  meNofTracksInPixVol_->setBinLabel(2, "Without Hits");
+
+  // number of clusters (associated to track / not associated)
+  iBooker.setCurrentFolder(topFolderName_ + "/Clusters/OnTrack");
+  meNofClustersOnTrack_ =
+      iBooker.book1D("nclusters_" + clustersrc_.label() + "_tot", "Number of Clusters (on track)", 3, 0, 3);
+  meNofClustersOnTrack_->setAxisTitle("Number of Clusters on Track", 1);
+  meNofClustersOnTrack_->setBinLabel(1, "All");
+  meNofClustersOnTrack_->setBinLabel(2, "BPix");
+  meNofClustersOnTrack_->setBinLabel(3, "FPix");
+  iBooker.setCurrentFolder(topFolderName_ + "/Clusters/OffTrack");
+  meNofClustersNotOnTrack_ =
+      iBooker.book1D("nclusters_" + clustersrc_.label() + "_tot", "Number of Clusters (off track)", 3, 0, 3);
+  meNofClustersNotOnTrack_->setAxisTitle("Number of Clusters off Track", 1);
+  meNofClustersNotOnTrack_->setBinLabel(1, "All");
+  meNofClustersNotOnTrack_->setBinLabel(2, "BPix");
+  meNofClustersNotOnTrack_->setBinLabel(3, "FPix");
+
+  // cluster charge and size
+  // charge
+  // on track
+  iBooker.setCurrentFolder(topFolderName_ + "/Clusters/OnTrack");
   std::stringstream ss1, ss2;
-  meClChargeOnTrack_all = iBooker.book1D("charge_" + clustersrc_.label(),"Charge (on track)",500,0.,500.);
-  meClChargeOnTrack_all->setAxisTitle("Charge size (in ke)",1);
-  meClChargeOnTrack_bpix = iBooker.book1D("charge_" + clustersrc_.label() + "_Barrel","Charge (on track, barrel)",500,0.,500.);
-  meClChargeOnTrack_bpix->setAxisTitle("Charge size (in ke)",1);
-  meClChargeOnTrack_fpix = iBooker.book1D("charge_" + clustersrc_.label() + "_Endcap","Charge (on track, endcap)",500,0.,500.);
-  meClChargeOnTrack_fpix->setAxisTitle("Charge size (in ke)",1);
-  for (int i = 1; i <= noOfLayers; i++)
-  {
-    ss1.str(std::string()); ss1 << "charge_" + clustersrc_.label() + "_Layer_" << i;
-    ss2.str(std::string()); ss2 << "Charge (on track, layer" << i << ")";
-    meClChargeOnTrack_layers.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClChargeOnTrack_layers.at(i-1)->setAxisTitle("Charge size (in ke)",1);
+  meClChargeOnTrack_all = iBooker.book1D("charge_" + clustersrc_.label(), "Charge (on track)", 500, 0., 500.);
+  meClChargeOnTrack_all->setAxisTitle("Charge size (in ke)", 1);
+  meClChargeOnTrack_bpix =
+      iBooker.book1D("charge_" + clustersrc_.label() + "_Barrel", "Charge (on track, barrel)", 500, 0., 500.);
+  meClChargeOnTrack_bpix->setAxisTitle("Charge size (in ke)", 1);
+  meClChargeOnTrack_fpix =
+      iBooker.book1D("charge_" + clustersrc_.label() + "_Endcap", "Charge (on track, endcap)", 500, 0., 500.);
+  meClChargeOnTrack_fpix->setAxisTitle("Charge size (in ke)", 1);
+  for (int i = 1; i <= noOfLayers; i++) {
+    ss1.str(std::string());
+    ss1 << "charge_" + clustersrc_.label() + "_Layer_" << i;
+    ss2.str(std::string());
+    ss2 << "Charge (on track, layer" << i << ")";
+    meClChargeOnTrack_layers.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClChargeOnTrack_layers.at(i - 1)->setAxisTitle("Charge size (in ke)", 1);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "charge_" + clustersrc_.label() + "_Disk_p" << i;
-    ss2.str(std::string()); ss2 << "Charge (on track, diskp" << i << ")";
-    meClChargeOnTrack_diskps.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClChargeOnTrack_diskps.at(i-1)->setAxisTitle("Charge size (in ke)",1);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "charge_" + clustersrc_.label() + "_Disk_p" << i;
+    ss2.str(std::string());
+    ss2 << "Charge (on track, diskp" << i << ")";
+    meClChargeOnTrack_diskps.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClChargeOnTrack_diskps.at(i - 1)->setAxisTitle("Charge size (in ke)", 1);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "charge_" + clustersrc_.label() + "_Disk_m" << i;
-    ss2.str(std::string()); ss2 << "Charge (on track, diskm" << i << ")";
-    meClChargeOnTrack_diskms.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClChargeOnTrack_diskms.at(i-1)->setAxisTitle("Charge size (in ke)",1);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "charge_" + clustersrc_.label() + "_Disk_m" << i;
+    ss2.str(std::string());
+    ss2 << "Charge (on track, diskm" << i << ")";
+    meClChargeOnTrack_diskms.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClChargeOnTrack_diskms.at(i - 1)->setAxisTitle("Charge size (in ke)", 1);
   }
-  //off track
-  iBooker.setCurrentFolder(topFolderName_+"/Clusters/OffTrack");
-  meClChargeNotOnTrack_all = iBooker.book1D("charge_" + clustersrc_.label(),"Charge (off track)",500,0.,500.);
-  meClChargeNotOnTrack_all->setAxisTitle("Charge size (in ke)",1);
-  meClChargeNotOnTrack_bpix = iBooker.book1D("charge_" + clustersrc_.label() + "_Barrel","Charge (off track, barrel)",500,0.,500.);
-  meClChargeNotOnTrack_bpix->setAxisTitle("Charge size (in ke)",1);
-  meClChargeNotOnTrack_fpix = iBooker.book1D("charge_" + clustersrc_.label() + "_Endcap","Charge (off track, endcap)",500,0.,500.);
-  meClChargeNotOnTrack_fpix->setAxisTitle("Charge size (in ke)",1);
-  for (int i = 1; i <= noOfLayers; i++)
-  {
-    ss1.str(std::string()); ss1 << "charge_" + clustersrc_.label() + "_Layer_" << i;
-    ss2.str(std::string()); ss2 << "Charge (off track, layer" << i << ")";
-    meClChargeNotOnTrack_layers.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClChargeNotOnTrack_layers.at(i-1)->setAxisTitle("Charge size (in ke)",1);
+  // off track
+  iBooker.setCurrentFolder(topFolderName_ + "/Clusters/OffTrack");
+  meClChargeNotOnTrack_all = iBooker.book1D("charge_" + clustersrc_.label(), "Charge (off track)", 500, 0., 500.);
+  meClChargeNotOnTrack_all->setAxisTitle("Charge size (in ke)", 1);
+  meClChargeNotOnTrack_bpix =
+      iBooker.book1D("charge_" + clustersrc_.label() + "_Barrel", "Charge (off track, barrel)", 500, 0., 500.);
+  meClChargeNotOnTrack_bpix->setAxisTitle("Charge size (in ke)", 1);
+  meClChargeNotOnTrack_fpix =
+      iBooker.book1D("charge_" + clustersrc_.label() + "_Endcap", "Charge (off track, endcap)", 500, 0., 500.);
+  meClChargeNotOnTrack_fpix->setAxisTitle("Charge size (in ke)", 1);
+  for (int i = 1; i <= noOfLayers; i++) {
+    ss1.str(std::string());
+    ss1 << "charge_" + clustersrc_.label() + "_Layer_" << i;
+    ss2.str(std::string());
+    ss2 << "Charge (off track, layer" << i << ")";
+    meClChargeNotOnTrack_layers.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClChargeNotOnTrack_layers.at(i - 1)->setAxisTitle("Charge size (in ke)", 1);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "charge_" + clustersrc_.label() + "_Disk_p" << i;
-    ss2.str(std::string()); ss2 << "Charge (off track, diskp" << i << ")";
-    meClChargeNotOnTrack_diskps.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClChargeNotOnTrack_diskps.at(i-1)->setAxisTitle("Charge size (in ke)",1);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "charge_" + clustersrc_.label() + "_Disk_p" << i;
+    ss2.str(std::string());
+    ss2 << "Charge (off track, diskp" << i << ")";
+    meClChargeNotOnTrack_diskps.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClChargeNotOnTrack_diskps.at(i - 1)->setAxisTitle("Charge size (in ke)", 1);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "charge_" + clustersrc_.label() + "_Disk_m" << i;
-    ss2.str(std::string()); ss2 << "Charge (off track, diskm" << i << ")";
-    meClChargeNotOnTrack_diskms.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClChargeNotOnTrack_diskms.at(i-1)->setAxisTitle("Charge size (in ke)",1);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "charge_" + clustersrc_.label() + "_Disk_m" << i;
+    ss2.str(std::string());
+    ss2 << "Charge (off track, diskm" << i << ")";
+    meClChargeNotOnTrack_diskms.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClChargeNotOnTrack_diskms.at(i - 1)->setAxisTitle("Charge size (in ke)", 1);
   }
 
-  //size
-  //on track
-  iBooker.setCurrentFolder(topFolderName_+"/Clusters/OnTrack");
-  meClSizeOnTrack_all = iBooker.book1D("size_" + clustersrc_.label(),"Size (on track)",100,0.,100.);
-  meClSizeOnTrack_all->setAxisTitle("Cluster size (in pixels)",1);
-  meClSizeOnTrack_bpix = iBooker.book1D("size_" + clustersrc_.label() + "_Barrel","Size (on track, barrel)",100,0.,100.);
-  meClSizeOnTrack_bpix->setAxisTitle("Cluster size (in pixels)",1);
-  meClSizeOnTrack_fpix = iBooker.book1D("size_" + clustersrc_.label() + "_Endcap","Size (on track, endcap)",100,0.,100.);
-  meClSizeOnTrack_fpix->setAxisTitle("Cluster size (in pixels)",1);
-  for (int i = 1; i <= noOfLayers; i++)
-  {
-    ss1.str(std::string()); ss1 << "size_" + clustersrc_.label() + "_Layer_" << i;
-    ss2.str(std::string()); ss2 << "Size (on track, layer" << i << ")";
-    meClSizeOnTrack_layers.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClSizeOnTrack_layers.at(i-1)->setAxisTitle("Cluster size (in pixels)",1);
+  // size
+  // on track
+  iBooker.setCurrentFolder(topFolderName_ + "/Clusters/OnTrack");
+  meClSizeOnTrack_all = iBooker.book1D("size_" + clustersrc_.label(), "Size (on track)", 100, 0., 100.);
+  meClSizeOnTrack_all->setAxisTitle("Cluster size (in pixels)", 1);
+  meClSizeOnTrack_bpix =
+      iBooker.book1D("size_" + clustersrc_.label() + "_Barrel", "Size (on track, barrel)", 100, 0., 100.);
+  meClSizeOnTrack_bpix->setAxisTitle("Cluster size (in pixels)", 1);
+  meClSizeOnTrack_fpix =
+      iBooker.book1D("size_" + clustersrc_.label() + "_Endcap", "Size (on track, endcap)", 100, 0., 100.);
+  meClSizeOnTrack_fpix->setAxisTitle("Cluster size (in pixels)", 1);
+  for (int i = 1; i <= noOfLayers; i++) {
+    ss1.str(std::string());
+    ss1 << "size_" + clustersrc_.label() + "_Layer_" << i;
+    ss2.str(std::string());
+    ss2 << "Size (on track, layer" << i << ")";
+    meClSizeOnTrack_layers.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClSizeOnTrack_layers.at(i - 1)->setAxisTitle("Cluster size (in pixels)", 1);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "size_" + clustersrc_.label() + "_Disk_p" << i;
-    ss2.str(std::string()); ss2 << "Size (on track, diskp" << i << ")";
-    meClSizeOnTrack_diskps.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClSizeOnTrack_diskps.at(i-1)->setAxisTitle("Cluster size (in pixels)",1);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "size_" + clustersrc_.label() + "_Disk_p" << i;
+    ss2.str(std::string());
+    ss2 << "Size (on track, diskp" << i << ")";
+    meClSizeOnTrack_diskps.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClSizeOnTrack_diskps.at(i - 1)->setAxisTitle("Cluster size (in pixels)", 1);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "size_" + clustersrc_.label() + "_Disk_m1" << i;
-    ss2.str(std::string()); ss2 << "Size (on track, diskm" << i << ")";
-    meClSizeOnTrack_diskms.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClSizeOnTrack_diskms.at(i-1)->setAxisTitle("Cluster size (in pixels)",1);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "size_" + clustersrc_.label() + "_Disk_m1" << i;
+    ss2.str(std::string());
+    ss2 << "Size (on track, diskm" << i << ")";
+    meClSizeOnTrack_diskms.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClSizeOnTrack_diskms.at(i - 1)->setAxisTitle("Cluster size (in pixels)", 1);
   }
-  meClSizeXOnTrack_all = iBooker.book1D("sizeX_" + clustersrc_.label(),"SizeX (on track)",100,0.,100.);
-  meClSizeXOnTrack_all->setAxisTitle("Cluster sizeX (in pixels)",1);
-  meClSizeXOnTrack_bpix = iBooker.book1D("sizeX_" + clustersrc_.label() + "_Barrel","SizeX (on track, barrel)",100,0.,100.);
-  meClSizeXOnTrack_bpix->setAxisTitle("Cluster sizeX (in pixels)",1);
-  meClSizeXOnTrack_fpix = iBooker.book1D("sizeX_" + clustersrc_.label() + "_Endcap","SizeX (on track, endcap)",100,0.,100.);
-  meClSizeXOnTrack_fpix->setAxisTitle("Cluster sizeX (in pixels)",1);
-  for (int i = 1; i <= noOfLayers; i++)
-  {
-    ss1.str(std::string()); ss1 << "sizeX_" + clustersrc_.label() + "_Layer_" << i;
-    ss2.str(std::string()); ss2 << "SizeX (on track, layer" << i << ")";
-    meClSizeXOnTrack_layers.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClSizeXOnTrack_layers.at(i-1)->setAxisTitle("Cluster size (in pixels)",1);
+  meClSizeXOnTrack_all = iBooker.book1D("sizeX_" + clustersrc_.label(), "SizeX (on track)", 100, 0., 100.);
+  meClSizeXOnTrack_all->setAxisTitle("Cluster sizeX (in pixels)", 1);
+  meClSizeXOnTrack_bpix =
+      iBooker.book1D("sizeX_" + clustersrc_.label() + "_Barrel", "SizeX (on track, barrel)", 100, 0., 100.);
+  meClSizeXOnTrack_bpix->setAxisTitle("Cluster sizeX (in pixels)", 1);
+  meClSizeXOnTrack_fpix =
+      iBooker.book1D("sizeX_" + clustersrc_.label() + "_Endcap", "SizeX (on track, endcap)", 100, 0., 100.);
+  meClSizeXOnTrack_fpix->setAxisTitle("Cluster sizeX (in pixels)", 1);
+  for (int i = 1; i <= noOfLayers; i++) {
+    ss1.str(std::string());
+    ss1 << "sizeX_" + clustersrc_.label() + "_Layer_" << i;
+    ss2.str(std::string());
+    ss2 << "SizeX (on track, layer" << i << ")";
+    meClSizeXOnTrack_layers.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClSizeXOnTrack_layers.at(i - 1)->setAxisTitle("Cluster size (in pixels)", 1);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "sizeX_" + clustersrc_.label() + "_Disk_p" << i;
-    ss2.str(std::string()); ss2 << "SizeX (on track, diskp" << i << ")";
-    meClSizeXOnTrack_diskps.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClSizeXOnTrack_diskps.at(i-1)->setAxisTitle("Cluster size (in pixels)",1);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "sizeX_" + clustersrc_.label() + "_Disk_p" << i;
+    ss2.str(std::string());
+    ss2 << "SizeX (on track, diskp" << i << ")";
+    meClSizeXOnTrack_diskps.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClSizeXOnTrack_diskps.at(i - 1)->setAxisTitle("Cluster size (in pixels)", 1);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "sizeX_" + clustersrc_.label() + "_Disk_m" << i;
-    ss2.str(std::string()); ss2 << "SizeX (on track, diskm" << i << ")";
-    meClSizeXOnTrack_diskms.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClSizeXOnTrack_diskms.at(i-1)->setAxisTitle("Cluster size (in pixels)",1);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "sizeX_" + clustersrc_.label() + "_Disk_m" << i;
+    ss2.str(std::string());
+    ss2 << "SizeX (on track, diskm" << i << ")";
+    meClSizeXOnTrack_diskms.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClSizeXOnTrack_diskms.at(i - 1)->setAxisTitle("Cluster size (in pixels)", 1);
   }
-  meClSizeYOnTrack_all = iBooker.book1D("sizeY_" + clustersrc_.label(),"SizeY (on track)",100,0.,100.);
-  meClSizeYOnTrack_all->setAxisTitle("Cluster sizeY (in pixels)",1);
-  meClSizeYOnTrack_bpix = iBooker.book1D("sizeY_" + clustersrc_.label() + "_Barrel","SizeY (on track, barrel)",100,0.,100.);
-  meClSizeYOnTrack_bpix->setAxisTitle("Cluster sizeY (in pixels)",1);
-  meClSizeYOnTrack_fpix = iBooker.book1D("sizeY_" + clustersrc_.label() + "_Endcap","SizeY (on track, endcap)",100,0.,100.);
-  meClSizeYOnTrack_fpix->setAxisTitle("Cluster sizeY (in pixels)",1);
-  for (int i = 1; i <= noOfLayers; i++)
-  {
-    ss1.str(std::string()); ss1 << "sizeY_" + clustersrc_.label() + "_Layer_" << i;
-    ss2.str(std::string()); ss2 << "SizeY (on track, layer" << i << ")";
-    meClSizeYOnTrack_layers.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClSizeYOnTrack_layers.at(i-1)->setAxisTitle("Cluster size (in pixels)",1);
+  meClSizeYOnTrack_all = iBooker.book1D("sizeY_" + clustersrc_.label(), "SizeY (on track)", 100, 0., 100.);
+  meClSizeYOnTrack_all->setAxisTitle("Cluster sizeY (in pixels)", 1);
+  meClSizeYOnTrack_bpix =
+      iBooker.book1D("sizeY_" + clustersrc_.label() + "_Barrel", "SizeY (on track, barrel)", 100, 0., 100.);
+  meClSizeYOnTrack_bpix->setAxisTitle("Cluster sizeY (in pixels)", 1);
+  meClSizeYOnTrack_fpix =
+      iBooker.book1D("sizeY_" + clustersrc_.label() + "_Endcap", "SizeY (on track, endcap)", 100, 0., 100.);
+  meClSizeYOnTrack_fpix->setAxisTitle("Cluster sizeY (in pixels)", 1);
+  for (int i = 1; i <= noOfLayers; i++) {
+    ss1.str(std::string());
+    ss1 << "sizeY_" + clustersrc_.label() + "_Layer_" << i;
+    ss2.str(std::string());
+    ss2 << "SizeY (on track, layer" << i << ")";
+    meClSizeYOnTrack_layers.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClSizeYOnTrack_layers.at(i - 1)->setAxisTitle("Cluster size (in pixels)", 1);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "sizeY_" + clustersrc_.label() + "_Disk_p" << i;
-    ss2.str(std::string()); ss2 << "SizeY (on track, diskp" << i << ")";
-    meClSizeYOnTrack_diskps.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClSizeYOnTrack_diskps.at(i-1)->setAxisTitle("Cluster size (in pixels)",1);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "sizeY_" + clustersrc_.label() + "_Disk_p" << i;
+    ss2.str(std::string());
+    ss2 << "SizeY (on track, diskp" << i << ")";
+    meClSizeYOnTrack_diskps.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClSizeYOnTrack_diskps.at(i - 1)->setAxisTitle("Cluster size (in pixels)", 1);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "sizeY_" + clustersrc_.label() + "_Disk_m" << i;
-    ss2.str(std::string()); ss2 << "SizeY (on track, diskm" << i << ")";
-    meClSizeYOnTrack_diskms.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClSizeYOnTrack_diskms.at(i-1)->setAxisTitle("Cluster size (in pixels)",1);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "sizeY_" + clustersrc_.label() + "_Disk_m" << i;
+    ss2.str(std::string());
+    ss2 << "SizeY (on track, diskm" << i << ")";
+    meClSizeYOnTrack_diskms.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClSizeYOnTrack_diskms.at(i - 1)->setAxisTitle("Cluster size (in pixels)", 1);
   }
-  //off track
-  iBooker.setCurrentFolder(topFolderName_+"/Clusters/OffTrack");
-  meClSizeNotOnTrack_all = iBooker.book1D("size_" + clustersrc_.label(),"Size (off track)",100,0.,100.);
-  meClSizeNotOnTrack_all->setAxisTitle("Cluster size (in pixels)",1); 
-  meClSizeNotOnTrack_bpix = iBooker.book1D("size_" + clustersrc_.label() + "_Barrel","Size (off track, barrel)",100,0.,100.);
-  meClSizeNotOnTrack_bpix->setAxisTitle("Cluster size (in pixels)",1);
-  meClSizeNotOnTrack_fpix = iBooker.book1D("size_" + clustersrc_.label() + "_Endcap","Size (off track, endcap)",100,0.,100.);
-  meClSizeNotOnTrack_fpix->setAxisTitle("Cluster size (in pixels)",1);
-  for (int i = 1; i <= noOfLayers; i++)
-  {
-    ss1.str(std::string()); ss1 << "size_" + clustersrc_.label() + "_Layer_" << i;
-    ss2.str(std::string()); ss2 << "Size (off track, layer" << i << ")";
-    meClSizeNotOnTrack_layers.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClSizeNotOnTrack_layers.at(i-1)->setAxisTitle("Cluster size (in pixels)",1);
+  // off track
+  iBooker.setCurrentFolder(topFolderName_ + "/Clusters/OffTrack");
+  meClSizeNotOnTrack_all = iBooker.book1D("size_" + clustersrc_.label(), "Size (off track)", 100, 0., 100.);
+  meClSizeNotOnTrack_all->setAxisTitle("Cluster size (in pixels)", 1);
+  meClSizeNotOnTrack_bpix =
+      iBooker.book1D("size_" + clustersrc_.label() + "_Barrel", "Size (off track, barrel)", 100, 0., 100.);
+  meClSizeNotOnTrack_bpix->setAxisTitle("Cluster size (in pixels)", 1);
+  meClSizeNotOnTrack_fpix =
+      iBooker.book1D("size_" + clustersrc_.label() + "_Endcap", "Size (off track, endcap)", 100, 0., 100.);
+  meClSizeNotOnTrack_fpix->setAxisTitle("Cluster size (in pixels)", 1);
+  for (int i = 1; i <= noOfLayers; i++) {
+    ss1.str(std::string());
+    ss1 << "size_" + clustersrc_.label() + "_Layer_" << i;
+    ss2.str(std::string());
+    ss2 << "Size (off track, layer" << i << ")";
+    meClSizeNotOnTrack_layers.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClSizeNotOnTrack_layers.at(i - 1)->setAxisTitle("Cluster size (in pixels)", 1);
   }
 
   for (int i = 1; i <= noOfLayers; i++) {
-    int ybins = -1; float ymin = 0.; float ymax = 0.;
-    if (i==1) { ybins = 42; ymin = -10.5; ymax = 10.5; }
-    if (i==2) { ybins = 66; ymin = -16.5; ymax = 16.5; }
-    if (i==3) { ybins = 90; ymin = -22.5; ymax = 22.5; }
-    ss1.str(std::string()); ss1 << "pix_bar Occ_roc_offtrack" + digisrc_. label() + "_layer_" << i;
-    ss2.str(std::string()); ss2 << "Pixel Barrel Occupancy, ROC level (Off Track): Layer " << i;
-    meZeroRocLadvsModOffTrackBarrel.push_back(iBooker.book2D(ss1.str(),ss2.str(),72,-4.5,4.5,ybins,ymin,ymax));
-    meZeroRocLadvsModOffTrackBarrel.at(i-1)->setAxisTitle("ROC / Module",1);
-    meZeroRocLadvsModOffTrackBarrel.at(i-1)->setAxisTitle("ROC / Ladder",2);
+    int ybins = -1;
+    float ymin = 0.;
+    float ymax = 0.;
+    if (i == 1) {
+      ybins = 42;
+      ymin = -10.5;
+      ymax = 10.5;
+    }
+    if (i == 2) {
+      ybins = 66;
+      ymin = -16.5;
+      ymax = 16.5;
+    }
+    if (i == 3) {
+      ybins = 90;
+      ymin = -22.5;
+      ymax = 22.5;
+    }
+    ss1.str(std::string());
+    ss1 << "pix_bar Occ_roc_offtrack" + digisrc_.label() + "_layer_" << i;
+    ss2.str(std::string());
+    ss2 << "Pixel Barrel Occupancy, ROC level (Off Track): Layer " << i;
+    meZeroRocLadvsModOffTrackBarrel.push_back(iBooker.book2D(ss1.str(), ss2.str(), 72, -4.5, 4.5, ybins, ymin, ymax));
+    meZeroRocLadvsModOffTrackBarrel.at(i - 1)->setAxisTitle("ROC / Module", 1);
+    meZeroRocLadvsModOffTrackBarrel.at(i - 1)->setAxisTitle("ROC / Ladder", 2);
   }
 
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "size_" + clustersrc_.label() + "_Disk_p" << i;
-    ss2.str(std::string()); ss2 << "Size (off track, diskp" << i << ")";
-    meClSizeNotOnTrack_diskps.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClSizeNotOnTrack_diskps.at(i-1)->setAxisTitle("Cluster size (in pixels)",1);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "size_" + clustersrc_.label() + "_Disk_p" << i;
+    ss2.str(std::string());
+    ss2 << "Size (off track, diskp" << i << ")";
+    meClSizeNotOnTrack_diskps.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClSizeNotOnTrack_diskps.at(i - 1)->setAxisTitle("Cluster size (in pixels)", 1);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "size_" + clustersrc_.label() + "_Disk_m" << i;
-    ss2.str(std::string()); ss2 << "Size (off track, diskm" << i << ")";
-    meClSizeNotOnTrack_diskms.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClSizeNotOnTrack_diskms.at(i-1)->setAxisTitle("Cluster size (in pixels)",1);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "size_" + clustersrc_.label() + "_Disk_m" << i;
+    ss2.str(std::string());
+    ss2 << "Size (off track, diskm" << i << ")";
+    meClSizeNotOnTrack_diskms.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClSizeNotOnTrack_diskms.at(i - 1)->setAxisTitle("Cluster size (in pixels)", 1);
   }
-  meClSizeXNotOnTrack_all = iBooker.book1D("sizeX_" + clustersrc_.label(),"SizeX (off track)",100,0.,100.);
-  meClSizeXNotOnTrack_all->setAxisTitle("Cluster sizeX (in pixels)",1);
-  meClSizeXNotOnTrack_bpix = iBooker.book1D("sizeX_" + clustersrc_.label() + "_Barrel","SizeX (off track, barrel)",100,0.,100.);
-  meClSizeXNotOnTrack_bpix->setAxisTitle("Cluster sizeX (in pixels)",1);
-  meClSizeXNotOnTrack_fpix = iBooker.book1D("sizeX_" + clustersrc_.label() + "_Endcap","SizeX (off track, endcap)",100,0.,100.);
-  meClSizeXNotOnTrack_fpix->setAxisTitle("Cluster sizeX (in pixels)",1);
-  for (int i = 1; i <= noOfLayers; i++)
-  {
-    ss1.str(std::string()); ss1 << "sizeX_" + clustersrc_.label() + "_Layer_" << i;
-    ss2.str(std::string()); ss2 << "SizeX (off track, layer" << i << ")";
-    meClSizeXNotOnTrack_layers.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClSizeXNotOnTrack_layers.at(i-1)->setAxisTitle("Cluster size (in pixels)",1);
+  meClSizeXNotOnTrack_all = iBooker.book1D("sizeX_" + clustersrc_.label(), "SizeX (off track)", 100, 0., 100.);
+  meClSizeXNotOnTrack_all->setAxisTitle("Cluster sizeX (in pixels)", 1);
+  meClSizeXNotOnTrack_bpix =
+      iBooker.book1D("sizeX_" + clustersrc_.label() + "_Barrel", "SizeX (off track, barrel)", 100, 0., 100.);
+  meClSizeXNotOnTrack_bpix->setAxisTitle("Cluster sizeX (in pixels)", 1);
+  meClSizeXNotOnTrack_fpix =
+      iBooker.book1D("sizeX_" + clustersrc_.label() + "_Endcap", "SizeX (off track, endcap)", 100, 0., 100.);
+  meClSizeXNotOnTrack_fpix->setAxisTitle("Cluster sizeX (in pixels)", 1);
+  for (int i = 1; i <= noOfLayers; i++) {
+    ss1.str(std::string());
+    ss1 << "sizeX_" + clustersrc_.label() + "_Layer_" << i;
+    ss2.str(std::string());
+    ss2 << "SizeX (off track, layer" << i << ")";
+    meClSizeXNotOnTrack_layers.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClSizeXNotOnTrack_layers.at(i - 1)->setAxisTitle("Cluster size (in pixels)", 1);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "sizeX_" + clustersrc_.label() + "_Disk_p" << i;
-    ss2.str(std::string()); ss2 << "SizeX (off track, diskp" << i << ")";
-    meClSizeXNotOnTrack_diskps.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClSizeXNotOnTrack_diskps.at(i-1)->setAxisTitle("Cluster size (in pixels)",1);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "sizeX_" + clustersrc_.label() + "_Disk_p" << i;
+    ss2.str(std::string());
+    ss2 << "SizeX (off track, diskp" << i << ")";
+    meClSizeXNotOnTrack_diskps.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClSizeXNotOnTrack_diskps.at(i - 1)->setAxisTitle("Cluster size (in pixels)", 1);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "sizeX_" + clustersrc_.label() + "_Disk_m" << i;
-    ss2.str(std::string()); ss2 << "SizeX (off track, diskm" << i << ")";
-    meClSizeXNotOnTrack_diskms.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClSizeXNotOnTrack_diskms.at(i-1)->setAxisTitle("Cluster size (in pixels)",1);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "sizeX_" + clustersrc_.label() + "_Disk_m" << i;
+    ss2.str(std::string());
+    ss2 << "SizeX (off track, diskm" << i << ")";
+    meClSizeXNotOnTrack_diskms.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClSizeXNotOnTrack_diskms.at(i - 1)->setAxisTitle("Cluster size (in pixels)", 1);
   }
-  meClSizeYNotOnTrack_all = iBooker.book1D("sizeY_" + clustersrc_.label(),"SizeY (off track)",100,0.,100.);
-  meClSizeYNotOnTrack_all->setAxisTitle("Cluster sizeY (in pixels)",1);
-  meClSizeYNotOnTrack_bpix = iBooker.book1D("sizeY_" + clustersrc_.label() + "_Barrel","SizeY (off track, barrel)",100,0.,100.);
-  meClSizeYNotOnTrack_bpix->setAxisTitle("Cluster sizeY (in pixels)",1);
-  meClSizeYNotOnTrack_fpix = iBooker.book1D("sizeY_" + clustersrc_.label() + "_Endcap","SizeY (off track, endcap)",100,0.,100.);
-  meClSizeYNotOnTrack_fpix->setAxisTitle("Cluster sizeY (in pixels)",1);
-  for (int i = 1; i <= noOfLayers; i++)
-  {
-    ss1.str(std::string()); ss1 << "sizeY_" + clustersrc_.label() + "_Layer_" << i;
-    ss2.str(std::string()); ss2 << "SizeY (off track, layer" << i << ")";
-    meClSizeYNotOnTrack_layers.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClSizeYNotOnTrack_layers.at(i-1)->setAxisTitle("Cluster size (in pixels)",1);
+  meClSizeYNotOnTrack_all = iBooker.book1D("sizeY_" + clustersrc_.label(), "SizeY (off track)", 100, 0., 100.);
+  meClSizeYNotOnTrack_all->setAxisTitle("Cluster sizeY (in pixels)", 1);
+  meClSizeYNotOnTrack_bpix =
+      iBooker.book1D("sizeY_" + clustersrc_.label() + "_Barrel", "SizeY (off track, barrel)", 100, 0., 100.);
+  meClSizeYNotOnTrack_bpix->setAxisTitle("Cluster sizeY (in pixels)", 1);
+  meClSizeYNotOnTrack_fpix =
+      iBooker.book1D("sizeY_" + clustersrc_.label() + "_Endcap", "SizeY (off track, endcap)", 100, 0., 100.);
+  meClSizeYNotOnTrack_fpix->setAxisTitle("Cluster sizeY (in pixels)", 1);
+  for (int i = 1; i <= noOfLayers; i++) {
+    ss1.str(std::string());
+    ss1 << "sizeY_" + clustersrc_.label() + "_Layer_" << i;
+    ss2.str(std::string());
+    ss2 << "SizeY (off track, layer" << i << ")";
+    meClSizeYNotOnTrack_layers.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClSizeYNotOnTrack_layers.at(i - 1)->setAxisTitle("Cluster size (in pixels)", 1);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "sizeY_" + clustersrc_.label() + "_Disk_p" << i;
-    ss2.str(std::string()); ss2 << "SizeY (off track, diskp" << i << ")";
-    meClSizeYNotOnTrack_diskps.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClSizeYNotOnTrack_diskps.at(i-1)->setAxisTitle("Cluster size (in pixels)",1);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "sizeY_" + clustersrc_.label() + "_Disk_p" << i;
+    ss2.str(std::string());
+    ss2 << "SizeY (off track, diskp" << i << ")";
+    meClSizeYNotOnTrack_diskps.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClSizeYNotOnTrack_diskps.at(i - 1)->setAxisTitle("Cluster size (in pixels)", 1);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "sizeY_" + clustersrc_.label() + "_Disk_m" << i;
-    ss2.str(std::string()); ss2 << "SizeY (off track, diskm" << i << ")";
-    meClSizeYNotOnTrack_diskms.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meClSizeYNotOnTrack_diskms.at(i-1)->setAxisTitle("Cluster size (in pixels)",1);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "sizeY_" + clustersrc_.label() + "_Disk_m" << i;
+    ss2.str(std::string());
+    ss2 << "SizeY (off track, diskm" << i << ")";
+    meClSizeYNotOnTrack_diskms.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meClSizeYNotOnTrack_diskms.at(i - 1)->setAxisTitle("Cluster size (in pixels)", 1);
   }
- 
-  //cluster global position
-  //on track
-  iBooker.setCurrentFolder(topFolderName_+"/Clusters/OnTrack");
-  //bpix
-  for (int i = 1; i <= noOfLayers; i++)
-  {
-    ss1.str(std::string()); ss1 << "position_" + clustersrc_.label() + "_Layer_" << i;
-    ss2.str(std::string()); ss2 << "Clusters Layer" << i << " (on track)";
-    meClPosLayersOnTrack.push_back(iBooker.book2D(ss1.str(),ss2.str(),200,-30.,30.,128,-3.2,3.2));
-    meClPosLayersOnTrack.at(i-1)->setAxisTitle("Global Z (cm)",1);
-    meClPosLayersOnTrack.at(i-1)->setAxisTitle("Global #phi",2);
-
-    int ybins = -1; float ymin = 0.; float ymax = 0.;
-    if (i==1) { ybins = 23; ymin = -11.5; ymax = 11.5; }
-    if (i==2) { ybins = 33; ymin = -17.5; ymax = 17.5; }
-    if (i==3) { ybins = 45; ymin = -24.5; ymax = 24.5; }
-    ss1.str(std::string()); ss1 << "position_" + clustersrc_.label() + "_LadvsMod_Layer_" << i;
-    ss2.str(std::string()); ss2 << "Clusters Layer" << i << "_LadvsMod (on track)";
-    meClPosLayersLadVsModOnTrack.push_back(iBooker.book2D(ss1.str(),ss2.str(),11,-5.5,5.5,ybins,ymin,ymax));
-    meClPosLayersLadVsModOnTrack.at(i-1)->setAxisTitle("z-module",1);
-    meClPosLayersLadVsModOnTrack.at(i-1)->setAxisTitle("Ladder",2);
+
+  // cluster global position
+  // on track
+  iBooker.setCurrentFolder(topFolderName_ + "/Clusters/OnTrack");
+  // bpix
+  for (int i = 1; i <= noOfLayers; i++) {
+    ss1.str(std::string());
+    ss1 << "position_" + clustersrc_.label() + "_Layer_" << i;
+    ss2.str(std::string());
+    ss2 << "Clusters Layer" << i << " (on track)";
+    meClPosLayersOnTrack.push_back(iBooker.book2D(ss1.str(), ss2.str(), 200, -30., 30., 128, -3.2, 3.2));
+    meClPosLayersOnTrack.at(i - 1)->setAxisTitle("Global Z (cm)", 1);
+    meClPosLayersOnTrack.at(i - 1)->setAxisTitle("Global #phi", 2);
+
+    int ybins = -1;
+    float ymin = 0.;
+    float ymax = 0.;
+    if (i == 1) {
+      ybins = 23;
+      ymin = -11.5;
+      ymax = 11.5;
+    }
+    if (i == 2) {
+      ybins = 33;
+      ymin = -17.5;
+      ymax = 17.5;
+    }
+    if (i == 3) {
+      ybins = 45;
+      ymin = -24.5;
+      ymax = 24.5;
+    }
+    ss1.str(std::string());
+    ss1 << "position_" + clustersrc_.label() + "_LadvsMod_Layer_" << i;
+    ss2.str(std::string());
+    ss2 << "Clusters Layer" << i << "_LadvsMod (on track)";
+    meClPosLayersLadVsModOnTrack.push_back(iBooker.book2D(ss1.str(), ss2.str(), 11, -5.5, 5.5, ybins, ymin, ymax));
+    meClPosLayersLadVsModOnTrack.at(i - 1)->setAxisTitle("z-module", 1);
+    meClPosLayersLadVsModOnTrack.at(i - 1)->setAxisTitle("Ladder", 2);
   }
 
   for (int i = 1; i <= noOfLayers; i++) {
-    int ybins = -1; float ymin = 0.; float ymax = 0.;
-    if (i==1) { ybins = 42; ymin = -10.5; ymax = 10.5; }
-    if (i==2) { ybins = 66; ymin = -16.5; ymax = 16.5; }
-    if (i==3) { ybins = 90; ymin = -22.5; ymax = 22.5; }
-    ss1.str(std::string()); ss1 << "pix_bar Occ_roc_ontrack" + digisrc_. label() + "_layer_" << i;
-    ss2.str(std::string()); ss2 << "Pixel Barrel Occupancy, ROC level (On Track): Layer " << i;
-    meZeroRocLadvsModOnTrackBarrel.push_back(iBooker.book2D(ss1.str(),ss2.str(),72,-4.5,4.5,ybins,ymin,ymax));
-    meZeroRocLadvsModOnTrackBarrel.at(i-1)->setAxisTitle("ROC / Module",1);
-    meZeroRocLadvsModOnTrackBarrel.at(i-1)->setAxisTitle("ROC / Ladder",2);
+    int ybins = -1;
+    float ymin = 0.;
+    float ymax = 0.;
+    if (i == 1) {
+      ybins = 42;
+      ymin = -10.5;
+      ymax = 10.5;
+    }
+    if (i == 2) {
+      ybins = 66;
+      ymin = -16.5;
+      ymax = 16.5;
+    }
+    if (i == 3) {
+      ybins = 90;
+      ymin = -22.5;
+      ymax = 22.5;
+    }
+    ss1.str(std::string());
+    ss1 << "pix_bar Occ_roc_ontrack" + digisrc_.label() + "_layer_" << i;
+    ss2.str(std::string());
+    ss2 << "Pixel Barrel Occupancy, ROC level (On Track): Layer " << i;
+    meZeroRocLadvsModOnTrackBarrel.push_back(iBooker.book2D(ss1.str(), ss2.str(), 72, -4.5, 4.5, ybins, ymin, ymax));
+    meZeroRocLadvsModOnTrackBarrel.at(i - 1)->setAxisTitle("ROC / Module", 1);
+    meZeroRocLadvsModOnTrackBarrel.at(i - 1)->setAxisTitle("ROC / Ladder", 2);
   }
- 
- for (int i = 1; i <= noOfLayers; i++)
-  {
-    ss1.str(std::string()); ss1 << "nclustersvsPhi_" + clustersrc_.label() + "_Layer_" << i;
-    ss2.str(std::string()); ss2 << "nclusters (on track, layer" << i << ")";
-    meNofClustersvsPhiOnTrack_layers.push_back(iBooker.book1D(ss1.str(),ss2.str(),1400.,-3.5,3.5));
-    meNofClustersvsPhiOnTrack_layers.at(i-1)->setAxisTitle("Global #Phi",1);
-    meNofClustersvsPhiOnTrack_layers.at(i-1)->setAxisTitle("Number of Clusters/Layer on Track",2);
+
+  for (int i = 1; i <= noOfLayers; i++) {
+    ss1.str(std::string());
+    ss1 << "nclustersvsPhi_" + clustersrc_.label() + "_Layer_" << i;
+    ss2.str(std::string());
+    ss2 << "nclusters (on track, layer" << i << ")";
+    meNofClustersvsPhiOnTrack_layers.push_back(iBooker.book1D(ss1.str(), ss2.str(), 1400., -3.5, 3.5));
+    meNofClustersvsPhiOnTrack_layers.at(i - 1)->setAxisTitle("Global #Phi", 1);
+    meNofClustersvsPhiOnTrack_layers.at(i - 1)->setAxisTitle("Number of Clusters/Layer on Track", 2);
   }
 
-  //fpix
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "position_" + clustersrc_.label() + "_pz_Disk_" << i;
-    ss2.str(std::string()); ss2 << "Clusters +Z Disk" << i << " (on track)";
-    meClPosDiskspzOnTrack.push_back(iBooker.book2D(ss1.str(),ss2.str(),80,-20.,20.,80,-20.,20.));
-    meClPosDiskspzOnTrack.at(i-1)->setAxisTitle("Global X (cm)",1);
-    meClPosDiskspzOnTrack.at(i-1)->setAxisTitle("Global Y (cm)",2);
+  // fpix
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "position_" + clustersrc_.label() + "_pz_Disk_" << i;
+    ss2.str(std::string());
+    ss2 << "Clusters +Z Disk" << i << " (on track)";
+    meClPosDiskspzOnTrack.push_back(iBooker.book2D(ss1.str(), ss2.str(), 80, -20., 20., 80, -20., 20.));
+    meClPosDiskspzOnTrack.at(i - 1)->setAxisTitle("Global X (cm)", 1);
+    meClPosDiskspzOnTrack.at(i - 1)->setAxisTitle("Global Y (cm)", 2);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "position_" + clustersrc_.label() + "_mz_Disk_" << i;
-    ss2.str(std::string()); ss2 << "Clusters -Z Disk" << i << " (on track)";
-    meClPosDisksmzOnTrack.push_back(iBooker.book2D(ss1.str(),ss2.str(),80,-20.,20.,80,-20.,20.));
-    meClPosDisksmzOnTrack.at(i-1)->setAxisTitle("Global X (cm)",1);
-    meClPosDisksmzOnTrack.at(i-1)->setAxisTitle("Global Y (cm)",2);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "position_" + clustersrc_.label() + "_mz_Disk_" << i;
+    ss2.str(std::string());
+    ss2 << "Clusters -Z Disk" << i << " (on track)";
+    meClPosDisksmzOnTrack.push_back(iBooker.book2D(ss1.str(), ss2.str(), 80, -20., 20., 80, -20., 20.));
+    meClPosDisksmzOnTrack.at(i - 1)->setAxisTitle("Global X (cm)", 1);
+    meClPosDisksmzOnTrack.at(i - 1)->setAxisTitle("Global Y (cm)", 2);
   }
-  meNClustersOnTrack_all = iBooker.book1D("nclusters_" + clustersrc_.label(),"Number of Clusters (on Track)",50,0.,50.);
-  meNClustersOnTrack_all->setAxisTitle("Number of Clusters",1);
-  meNClustersOnTrack_bpix = iBooker.book1D("nclusters_" + clustersrc_.label() + "_Barrel","Number of Clusters (on track, barrel)",50,0.,50.);
-  meNClustersOnTrack_bpix->setAxisTitle("Number of Clusters",1);
-  meNClustersOnTrack_fpix = iBooker.book1D("nclusters_" + clustersrc_.label() + "_Endcap","Number of Clusters (on track, endcap)",50,0.,50.);
-  meNClustersOnTrack_fpix->setAxisTitle("Number of Clusters",1);
-  for (int i = 1; i <= noOfLayers; i++)
-  {
-    ss1.str(std::string()); ss1 << "nclusters_" + clustersrc_.label() + "_Layer_" << i;
-    ss2.str(std::string()); ss2 << "Number of Clusters (on track, layer" << i << ")";
-    meNClustersOnTrack_layers.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meNClustersOnTrack_layers.at(i-1)->setAxisTitle("Number of Clusters",1);
+  meNClustersOnTrack_all =
+      iBooker.book1D("nclusters_" + clustersrc_.label(), "Number of Clusters (on Track)", 50, 0., 50.);
+  meNClustersOnTrack_all->setAxisTitle("Number of Clusters", 1);
+  meNClustersOnTrack_bpix = iBooker.book1D(
+      "nclusters_" + clustersrc_.label() + "_Barrel", "Number of Clusters (on track, barrel)", 50, 0., 50.);
+  meNClustersOnTrack_bpix->setAxisTitle("Number of Clusters", 1);
+  meNClustersOnTrack_fpix = iBooker.book1D(
+      "nclusters_" + clustersrc_.label() + "_Endcap", "Number of Clusters (on track, endcap)", 50, 0., 50.);
+  meNClustersOnTrack_fpix->setAxisTitle("Number of Clusters", 1);
+  for (int i = 1; i <= noOfLayers; i++) {
+    ss1.str(std::string());
+    ss1 << "nclusters_" + clustersrc_.label() + "_Layer_" << i;
+    ss2.str(std::string());
+    ss2 << "Number of Clusters (on track, layer" << i << ")";
+    meNClustersOnTrack_layers.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meNClustersOnTrack_layers.at(i - 1)->setAxisTitle("Number of Clusters", 1);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "nclusters_" + clustersrc_.label() + "_Disk_p" << i;
-    ss2.str(std::string()); ss2 << "Number of Clusters (on track, diskp" << i << ")";
-    meNClustersOnTrack_diskps.push_back(iBooker.book1D(ss1.str(),ss2.str(),50,0.,50.));
-    meNClustersOnTrack_diskps.at(i-1)->setAxisTitle("Number of Clusters",1);
-   
-    ss1.str(std::string()); ss1 << "nclustersvsPhi_" + clustersrc_.label() + "_Disk_p" << i;
-    ss2.str(std::string()); ss2 << "nclusters (on track, diskp" << i << ")";
-    meNofClustersvsPhiOnTrack_diskps.push_back(iBooker.book1D(ss1.str(),ss2.str(),1400.,-3.5,3.5));
-    meNofClustersvsPhiOnTrack_diskps.at(i-1)->setAxisTitle("Global #Phi",1);
-    meNofClustersvsPhiOnTrack_diskps.at(i-1)->setAxisTitle("Number of Clusters/Disk on Track",2);
- 
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "nclusters_" + clustersrc_.label() + "_Disk_p" << i;
+    ss2.str(std::string());
+    ss2 << "Number of Clusters (on track, diskp" << i << ")";
+    meNClustersOnTrack_diskps.push_back(iBooker.book1D(ss1.str(), ss2.str(), 50, 0., 50.));
+    meNClustersOnTrack_diskps.at(i - 1)->setAxisTitle("Number of Clusters", 1);
+
+    ss1.str(std::string());
+    ss1 << "nclustersvsPhi_" + clustersrc_.label() + "_Disk_p" << i;
+    ss2.str(std::string());
+    ss2 << "nclusters (on track, diskp" << i << ")";
+    meNofClustersvsPhiOnTrack_diskps.push_back(iBooker.book1D(ss1.str(), ss2.str(), 1400., -3.5, 3.5));
+    meNofClustersvsPhiOnTrack_diskps.at(i - 1)->setAxisTitle("Global #Phi", 1);
+    meNofClustersvsPhiOnTrack_diskps.at(i - 1)->setAxisTitle("Number of Clusters/Disk on Track", 2);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "nclusters_" + clustersrc_.label() + "_Disk_m" << i;
-    ss2.str(std::string()); ss2 << "Number of Clusters (on track, diskm" << i << ")";
-    meNClustersOnTrack_diskms.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meNClustersOnTrack_diskms.at(i-1)->setAxisTitle("Number of Clusters",1);
-   
-    ss1.str(std::string()); ss1 << "nclustersvsPhi_" + clustersrc_.label() + "_Disk_m" << i;
-    ss2.str(std::string()); ss2 << "nclusters (on track, diskm" << i << ")";
-    meNofClustersvsPhiOnTrack_diskms.push_back(iBooker.book1D(ss1.str(),ss2.str(),1400.,-3.5,3.5));
-    meNofClustersvsPhiOnTrack_diskms.at(i-1)->setAxisTitle("Global #Phi",1);
-    meNofClustersvsPhiOnTrack_diskms.at(i-1)->setAxisTitle("Number of Clusters/Disk on Track",2);
-   
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "nclusters_" + clustersrc_.label() + "_Disk_m" << i;
+    ss2.str(std::string());
+    ss2 << "Number of Clusters (on track, diskm" << i << ")";
+    meNClustersOnTrack_diskms.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meNClustersOnTrack_diskms.at(i - 1)->setAxisTitle("Number of Clusters", 1);
+
+    ss1.str(std::string());
+    ss1 << "nclustersvsPhi_" + clustersrc_.label() + "_Disk_m" << i;
+    ss2.str(std::string());
+    ss2 << "nclusters (on track, diskm" << i << ")";
+    meNofClustersvsPhiOnTrack_diskms.push_back(iBooker.book1D(ss1.str(), ss2.str(), 1400., -3.5, 3.5));
+    meNofClustersvsPhiOnTrack_diskms.at(i - 1)->setAxisTitle("Global #Phi", 1);
+    meNofClustersvsPhiOnTrack_diskms.at(i - 1)->setAxisTitle("Number of Clusters/Disk on Track", 2);
   }
 
-  meRocBladevsDiskEndcapOnTrk = iBooker.book2D("ROC_endcap_occupancy_ontrk","Pixel Endcap Occupancy, ROC level (On Track)",72, -4.5, 4.5,288,-12.5,12.5);
-  meRocBladevsDiskEndcapOnTrk->setBinLabel(1, "Disk-2 Pnl2",1);
-  meRocBladevsDiskEndcapOnTrk->setBinLabel(9, "Disk-2 Pnl1",1);
-  meRocBladevsDiskEndcapOnTrk->setBinLabel(19, "Disk-1 Pnl2",1);
-  meRocBladevsDiskEndcapOnTrk->setBinLabel(27, "Disk-1 Pnl1",1);
-  meRocBladevsDiskEndcapOnTrk->setBinLabel(41, "Disk+1 Pnl1",1);
-  meRocBladevsDiskEndcapOnTrk->setBinLabel(49, "Disk+1 Pnl2",1);
-  meRocBladevsDiskEndcapOnTrk->setBinLabel(59, "Disk+2 Pnl1",1);
-  meRocBladevsDiskEndcapOnTrk->setBinLabel(67, "Disk+2 Pnl2",1);
-  meRocBladevsDiskEndcapOnTrk->setAxisTitle("Blades in Inner (>0) / Outer(<) Halves",2);
-  meRocBladevsDiskEndcapOnTrk->setAxisTitle("ROC occupancy",3);
-
-  //not on track
-  iBooker.setCurrentFolder(topFolderName_+"/Clusters/OffTrack");
-  //bpix
-  for (int i = 1; i <= noOfLayers; i++)
-  {
-    ss1.str(std::string()); ss1 << "position_" + clustersrc_.label() + "_Layer_" << i;
-    ss2.str(std::string()); ss2 << "Clusters Layer" << i << " (off track)";
-    meClPosLayersNotOnTrack.push_back(iBooker.book2D(ss1.str(),ss2.str(),200,-30.,30.,128,-3.2,3.2));
-    meClPosLayersNotOnTrack.at(i-1)->setAxisTitle("Global Z (cm)",1);
-    meClPosLayersNotOnTrack.at(i-1)->setAxisTitle("Global #phi",2);
+  meRocBladevsDiskEndcapOnTrk = iBooker.book2D(
+      "ROC_endcap_occupancy_ontrk", "Pixel Endcap Occupancy, ROC level (On Track)", 72, -4.5, 4.5, 288, -12.5, 12.5);
+  meRocBladevsDiskEndcapOnTrk->setBinLabel(1, "Disk-2 Pnl2", 1);
+  meRocBladevsDiskEndcapOnTrk->setBinLabel(9, "Disk-2 Pnl1", 1);
+  meRocBladevsDiskEndcapOnTrk->setBinLabel(19, "Disk-1 Pnl2", 1);
+  meRocBladevsDiskEndcapOnTrk->setBinLabel(27, "Disk-1 Pnl1", 1);
+  meRocBladevsDiskEndcapOnTrk->setBinLabel(41, "Disk+1 Pnl1", 1);
+  meRocBladevsDiskEndcapOnTrk->setBinLabel(49, "Disk+1 Pnl2", 1);
+  meRocBladevsDiskEndcapOnTrk->setBinLabel(59, "Disk+2 Pnl1", 1);
+  meRocBladevsDiskEndcapOnTrk->setBinLabel(67, "Disk+2 Pnl2", 1);
+  meRocBladevsDiskEndcapOnTrk->setAxisTitle("Blades in Inner (>0) / Outer(<) Halves", 2);
+  meRocBladevsDiskEndcapOnTrk->setAxisTitle("ROC occupancy", 3);
+
+  // not on track
+  iBooker.setCurrentFolder(topFolderName_ + "/Clusters/OffTrack");
+  // bpix
+  for (int i = 1; i <= noOfLayers; i++) {
+    ss1.str(std::string());
+    ss1 << "position_" + clustersrc_.label() + "_Layer_" << i;
+    ss2.str(std::string());
+    ss2 << "Clusters Layer" << i << " (off track)";
+    meClPosLayersNotOnTrack.push_back(iBooker.book2D(ss1.str(), ss2.str(), 200, -30., 30., 128, -3.2, 3.2));
+    meClPosLayersNotOnTrack.at(i - 1)->setAxisTitle("Global Z (cm)", 1);
+    meClPosLayersNotOnTrack.at(i - 1)->setAxisTitle("Global #phi", 2);
   }
-  //fpix
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "position_" + clustersrc_.label() + "_pz_Disk_" << i;
-    ss2.str(std::string()); ss2 << "Clusters +Z Disk" << i << " (off track)";
-    meClPosDiskspzNotOnTrack.push_back(iBooker.book2D(ss1.str(),ss2.str(),80,-20.,20.,80,-20.,20.));
-    meClPosDiskspzNotOnTrack.at(i-1)->setAxisTitle("Global X (cm)",1);
-    meClPosDiskspzNotOnTrack.at(i-1)->setAxisTitle("Global Y (cm)",2);
+  // fpix
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "position_" + clustersrc_.label() + "_pz_Disk_" << i;
+    ss2.str(std::string());
+    ss2 << "Clusters +Z Disk" << i << " (off track)";
+    meClPosDiskspzNotOnTrack.push_back(iBooker.book2D(ss1.str(), ss2.str(), 80, -20., 20., 80, -20., 20.));
+    meClPosDiskspzNotOnTrack.at(i - 1)->setAxisTitle("Global X (cm)", 1);
+    meClPosDiskspzNotOnTrack.at(i - 1)->setAxisTitle("Global Y (cm)", 2);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "position_" + clustersrc_.label() + "_mz_Disk_" << i;
-    ss2.str(std::string()); ss2 << "Clusters -Z Disk" << i << " (off track)";
-    meClPosDisksmzNotOnTrack.push_back(iBooker.book2D(ss1.str(),ss2.str(),80,-20.,20.,80,-20.,20.));
-    meClPosDisksmzNotOnTrack.at(i-1)->setAxisTitle("Global X (cm)",1);
-    meClPosDisksmzNotOnTrack.at(i-1)->setAxisTitle("Global Y (cm)",2);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "position_" + clustersrc_.label() + "_mz_Disk_" << i;
+    ss2.str(std::string());
+    ss2 << "Clusters -Z Disk" << i << " (off track)";
+    meClPosDisksmzNotOnTrack.push_back(iBooker.book2D(ss1.str(), ss2.str(), 80, -20., 20., 80, -20., 20.));
+    meClPosDisksmzNotOnTrack.at(i - 1)->setAxisTitle("Global X (cm)", 1);
+    meClPosDisksmzNotOnTrack.at(i - 1)->setAxisTitle("Global Y (cm)", 2);
   }
-  meNClustersNotOnTrack_all = iBooker.book1D("nclusters_" + clustersrc_.label(),"Number of Clusters (off Track)",50,0.,50.);
-  meNClustersNotOnTrack_all->setAxisTitle("Number of Clusters",1);
-  meNClustersNotOnTrack_bpix = iBooker.book1D("nclusters_" + clustersrc_.label() + "_Barrel","Number of Clusters (off track, barrel)",50,0.,50.);
-  meNClustersNotOnTrack_bpix->setAxisTitle("Number of Clusters",1);
-  meNClustersNotOnTrack_fpix = iBooker.book1D("nclusters_" + clustersrc_.label() + "_Endcap","Number of Clusters (off track, endcap)",50,0.,50.);
-  meNClustersNotOnTrack_fpix->setAxisTitle("Number of Clusters",1);
-  for (int i = 1; i <= noOfLayers; i++)
-  {
-    ss1.str(std::string()); ss1 << "nclusters_" + clustersrc_.label() + "_Layer_" << i;
-    ss2.str(std::string()); ss2 << "Number of Clusters (off track, layer" << i << ")";
-    meNClustersNotOnTrack_layers.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meNClustersNotOnTrack_layers.at(i-1)->setAxisTitle("Number of Clusters",1);
+  meNClustersNotOnTrack_all =
+      iBooker.book1D("nclusters_" + clustersrc_.label(), "Number of Clusters (off Track)", 50, 0., 50.);
+  meNClustersNotOnTrack_all->setAxisTitle("Number of Clusters", 1);
+  meNClustersNotOnTrack_bpix = iBooker.book1D(
+      "nclusters_" + clustersrc_.label() + "_Barrel", "Number of Clusters (off track, barrel)", 50, 0., 50.);
+  meNClustersNotOnTrack_bpix->setAxisTitle("Number of Clusters", 1);
+  meNClustersNotOnTrack_fpix = iBooker.book1D(
+      "nclusters_" + clustersrc_.label() + "_Endcap", "Number of Clusters (off track, endcap)", 50, 0., 50.);
+  meNClustersNotOnTrack_fpix->setAxisTitle("Number of Clusters", 1);
+  for (int i = 1; i <= noOfLayers; i++) {
+    ss1.str(std::string());
+    ss1 << "nclusters_" + clustersrc_.label() + "_Layer_" << i;
+    ss2.str(std::string());
+    ss2 << "Number of Clusters (off track, layer" << i << ")";
+    meNClustersNotOnTrack_layers.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meNClustersNotOnTrack_layers.at(i - 1)->setAxisTitle("Number of Clusters", 1);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "nclusters_" + clustersrc_.label() + "_Disk_p" << i;
-    ss2.str(std::string()); ss2 << "Number of Clusters (off track, diskp" << i << ")";
-    meNClustersNotOnTrack_diskps.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meNClustersNotOnTrack_diskps.at(i-1)->setAxisTitle("Number of Clusters",1);
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "nclusters_" + clustersrc_.label() + "_Disk_p" << i;
+    ss2.str(std::string());
+    ss2 << "Number of Clusters (off track, diskp" << i << ")";
+    meNClustersNotOnTrack_diskps.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meNClustersNotOnTrack_diskps.at(i - 1)->setAxisTitle("Number of Clusters", 1);
   }
-  for (int i = 1; i <= noOfDisks; i++)
-  {
-    ss1.str(std::string()); ss1 << "nclusters_" + clustersrc_.label() + "_Disk_m" << i;
-    ss2.str(std::string()); ss2 << "Number of Clusters (off track, diskm" << i << ")";
-    meNClustersNotOnTrack_diskms.push_back(iBooker.book1D(ss1.str(),ss2.str(),500,0.,500.));
-    meNClustersNotOnTrack_diskms.at(i-1)->setAxisTitle("Number of Clusters",1);
-  
+  for (int i = 1; i <= noOfDisks; i++) {
+    ss1.str(std::string());
+    ss1 << "nclusters_" + clustersrc_.label() + "_Disk_m" << i;
+    ss2.str(std::string());
+    ss2 << "Number of Clusters (off track, diskm" << i << ")";
+    meNClustersNotOnTrack_diskms.push_back(iBooker.book1D(ss1.str(), ss2.str(), 500, 0., 500.));
+    meNClustersNotOnTrack_diskms.at(i - 1)->setAxisTitle("Number of Clusters", 1);
   }
 
-  meRocBladevsDiskEndcapOffTrk = iBooker.book2D("ROC_endcap_occupancy_offtrk","Pixel Endcap Occupancy, ROC level (Off Track)",72, -4.5, 4.5,288,-12.5,12.5);
-  meRocBladevsDiskEndcapOffTrk->setBinLabel(1, "Disk-2 Pnl2",1);
-  meRocBladevsDiskEndcapOffTrk->setBinLabel(9, "Disk-2 Pnl1",1);
-  meRocBladevsDiskEndcapOffTrk->setBinLabel(19, "Disk-1 Pnl2",1);
-  meRocBladevsDiskEndcapOffTrk->setBinLabel(27, "Disk-1 Pnl1",1);
-  meRocBladevsDiskEndcapOffTrk->setBinLabel(41, "Disk+1 Pnl1",1);
-  meRocBladevsDiskEndcapOffTrk->setBinLabel(49, "Disk+1 Pnl2",1);
-  meRocBladevsDiskEndcapOffTrk->setBinLabel(59, "Disk+2 Pnl1",1);
-  meRocBladevsDiskEndcapOffTrk->setBinLabel(67, "Disk+2 Pnl2",1);
-  meRocBladevsDiskEndcapOffTrk->setAxisTitle("Blades in Inner (>0) / Outer(<) Halves",2);
-  meRocBladevsDiskEndcapOffTrk->setAxisTitle("ROC occupancy",3);
-
-  //HitProbability
-  //on track
-  iBooker.setCurrentFolder(topFolderName_+"/Clusters/OnTrack");
-  meHitProbability = iBooker.book1D("FractionLowProb","Fraction of hits with low probability;FractionLowProb;#HitsOnTrack",100,0.,1.);
+  meRocBladevsDiskEndcapOffTrk = iBooker.book2D(
+      "ROC_endcap_occupancy_offtrk", "Pixel Endcap Occupancy, ROC level (Off Track)", 72, -4.5, 4.5, 288, -12.5, 12.5);
+  meRocBladevsDiskEndcapOffTrk->setBinLabel(1, "Disk-2 Pnl2", 1);
+  meRocBladevsDiskEndcapOffTrk->setBinLabel(9, "Disk-2 Pnl1", 1);
+  meRocBladevsDiskEndcapOffTrk->setBinLabel(19, "Disk-1 Pnl2", 1);
+  meRocBladevsDiskEndcapOffTrk->setBinLabel(27, "Disk-1 Pnl1", 1);
+  meRocBladevsDiskEndcapOffTrk->setBinLabel(41, "Disk+1 Pnl1", 1);
+  meRocBladevsDiskEndcapOffTrk->setBinLabel(49, "Disk+1 Pnl2", 1);
+  meRocBladevsDiskEndcapOffTrk->setBinLabel(59, "Disk+2 Pnl1", 1);
+  meRocBladevsDiskEndcapOffTrk->setBinLabel(67, "Disk+2 Pnl2", 1);
+  meRocBladevsDiskEndcapOffTrk->setAxisTitle("Blades in Inner (>0) / Outer(<) Halves", 2);
+  meRocBladevsDiskEndcapOffTrk->setAxisTitle("ROC occupancy", 3);
+
+  // HitProbability
+  // on track
+  iBooker.setCurrentFolder(topFolderName_ + "/Clusters/OnTrack");
+  meHitProbability = iBooker.book1D(
+      "FractionLowProb", "Fraction of hits with low probability;FractionLowProb;#HitsOnTrack", 100, 0., 1.);
 
   if (debug_) {
-    // book summary residual histograms in a debugging folder - one (x,y) pair of histograms per subdetector 
-    iBooker.setCurrentFolder("debugging"); 
-    char hisID[80]; 
-    for (int s=0; s<3; s++) {
-      sprintf(hisID,"residual_x_subdet_%i",s); 
-      meSubdetResidualX[s] = iBooker.book1D(hisID,"Pixel Hit-to-Track Residual in X",500,-5.,5.);
-      
-      sprintf(hisID,"residual_y_subdet_%i",s);
-      meSubdetResidualY[s] = iBooker.book1D(hisID,"Pixel Hit-to-Track Residual in Y",500,-5.,5.);  
+    // book summary residual histograms in a debugging folder - one (x,y) pair
+    // of histograms per subdetector
+    iBooker.setCurrentFolder("debugging");
+    char hisID[80];
+    for (int s = 0; s < 3; s++) {
+      sprintf(hisID, "residual_x_subdet_%i", s);
+      meSubdetResidualX[s] = iBooker.book1D(hisID, "Pixel Hit-to-Track Residual in X", 500, -5., 5.);
+
+      sprintf(hisID, "residual_y_subdet_%i", s);
+      meSubdetResidualY[s] = iBooker.book1D(hisID, "Pixel Hit-to-Track Residual in Y", 500, -5., 5.);
     }
   }
-  
+
   firstRun = false;
 }
 
-
-void SiPixelTrackResidualSource::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
-
-  //Retrieve tracker topology from geometry
+void SiPixelTrackResidualSource::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* tTopo = tTopoHandle.product();
-  
-  // retrieve TrackerGeometry again and MagneticField for use in transforming 
-  // a TrackCandidate's P(ersistent)TrajectoryStateoOnDet (PTSoD) to a TrajectoryStateOnSurface (TSoS)
+  const TrackerTopology *tTopo = tTopoHandle.product();
+
+  // retrieve TrackerGeometry again and MagneticField for use in transforming
+  // a TrackCandidate's P(ersistent)TrajectoryStateoOnDet (PTSoD) to a
+  // TrajectoryStateOnSurface (TSoS)
   ESHandle<TrackerGeometry> TG;
   iSetup.get<TrackerDigiGeometryRecord>().get(TG);
-  const TrackerGeometry* theTrackerGeometry = TG.product();
-  
-  //analytic triplet method to calculate the track residuals in the pixe barrel detector    
-  
+  const TrackerGeometry *theTrackerGeometry = TG.product();
+
+  // analytic triplet method to calculate the track residuals in the pixe barrel
+  // detector
+
   //--------------------------------------------------------------------
   // beam spot:
   //
   edm::Handle<reco::BeamSpot> rbs;
-  //iEvent.getByLabel( "offlineBeamSpot", rbs );
-  iEvent.getByToken( beamSpotToken_, rbs );
-  math::XYZPoint bsP = math::XYZPoint(0,0,0);
-  if( !rbs.failedToGet() && rbs.isValid() )
-    {
-      bsP = math::XYZPoint( rbs->x0(), rbs->y0(), rbs->z0() );
-    }
-  
+  // iEvent.getByLabel( "offlineBeamSpot", rbs );
+  iEvent.getByToken(beamSpotToken_, rbs);
+  math::XYZPoint bsP = math::XYZPoint(0, 0, 0);
+  if (!rbs.failedToGet() && rbs.isValid()) {
+    bsP = math::XYZPoint(rbs->x0(), rbs->y0(), rbs->z0());
+  }
+
   //--------------------------------------------------------------------
   // primary vertices:
   //
   edm::Handle<reco::VertexCollection> vertices;
-  //iEvent.getByLabel("offlinePrimaryVertices", vertices );
-  iEvent.getByToken(  offlinePrimaryVerticesToken_, vertices );
-  
-  if( vertices.failedToGet() ) return;
-  if( !vertices.isValid() ) return;
-  
-  math::XYZPoint vtxN = math::XYZPoint(0,0,0);
-  math::XYZPoint vtxP = math::XYZPoint(0,0,0);
-  
+  // iEvent.getByLabel("offlinePrimaryVertices", vertices );
+  iEvent.getByToken(offlinePrimaryVerticesToken_, vertices);
+
+  if (vertices.failedToGet())
+    return;
+  if (!vertices.isValid())
+    return;
+
+  math::XYZPoint vtxN = math::XYZPoint(0, 0, 0);
+  math::XYZPoint vtxP = math::XYZPoint(0, 0, 0);
+
   double bestNdof = 0.0;
   double maxSumPt = 0.0;
   reco::Vertex bestPvx;
-  for(reco::VertexCollection::const_iterator iVertex = vertices->begin();
-      iVertex != vertices->end(); ++iVertex ) {
-    if( iVertex->ndof() > bestNdof ) {
+  for (reco::VertexCollection::const_iterator iVertex = vertices->begin(); iVertex != vertices->end(); ++iVertex) {
+    if (iVertex->ndof() > bestNdof) {
       bestNdof = iVertex->ndof();
-      vtxN = math::XYZPoint( iVertex->x(), iVertex->y(), iVertex->z() );
-    }//ndof
-    if( iVertex->p4().pt() > maxSumPt ) {
+      vtxN = math::XYZPoint(iVertex->x(), iVertex->y(), iVertex->z());
+    }  // ndof
+    if (iVertex->p4().pt() > maxSumPt) {
       maxSumPt = iVertex->p4().pt();
-      vtxP = math::XYZPoint( iVertex->x(), iVertex->y(), iVertex->z() );
+      vtxP = math::XYZPoint(iVertex->x(), iVertex->y(), iVertex->z());
       bestPvx = *iVertex;
-    }//sumpt
-    
-  }//vertex
-  
-  if( maxSumPt < 1.0 ) vtxP = vtxN;
-  
+    }  // sumpt
+
+  }  // vertex
+
+  if (maxSumPt < 1.0)
+    vtxP = vtxN;
+
   //---------------------------------------------
-  //get Tracks
+  // get Tracks
   //
-  edm:: Handle<reco::TrackCollection> TracksForRes;
-  //iEvent.getByLabel( "generalTracks", TracksForRes );
-  iEvent.getByToken(  generalTracksToken_, TracksForRes );
-  
+  edm::Handle<reco::TrackCollection> TracksForRes;
+  // iEvent.getByLabel( "generalTracks", TracksForRes );
+  iEvent.getByToken(generalTracksToken_, TracksForRes);
+
   if (debug_) {
     edm::EDConsumerBase::Labels labels;
     labelsForToken(generalTracksToken_, labels);
@@ -767,50 +902,53 @@ void SiPixelTrackResidualSource::analyze(const edm::Event& iEvent, const edm::Ev
   // transient track builder, needs B-field from data base (global tag in .py)
   //
   edm::ESHandle<TransientTrackBuilder> theB;
-  iSetup.get<TransientTrackRecord>().get( "TransientTrackBuilder", theB );
+  iSetup.get<TransientTrackRecord>().get("TransientTrackBuilder", theB);
 
-  //get the TransienTrackingRecHitBuilder needed for extracting the global position of the hits in the pixel
+  // get the TransienTrackingRecHitBuilder needed for extracting the global
+  // position of the hits in the pixel
   edm::ESHandle<TransientTrackingRecHitBuilder> theTrackerRecHitBuilder;
-  iSetup.get<TransientRecHitRecord>().get(ttrhbuilder_,theTrackerRecHitBuilder);
+  iSetup.get<TransientRecHitRecord>().get(ttrhbuilder_, theTrackerRecHitBuilder);
 
-  //check that tracks are valid
-  if( TracksForRes.failedToGet() ) return;
-  if( !TracksForRes.isValid() ) return;
+  // check that tracks are valid
+  if (TracksForRes.failedToGet())
+    return;
+  if (!TracksForRes.isValid())
+    return;
 
-  //get tracker geometry
+  // get tracker geometry
   edm::ESHandle<TrackerGeometry> pDD;
   iSetup.get<TrackerDigiGeometryRecord>().get(pDD);
-  
-  if( !pDD.isValid() ) {
+
+  if (!pDD.isValid()) {
     cout << "Unable to find TrackerDigiGeometry. Return\n";
     return;
   }
- 
+
   int kk = -1;
   //----------------------------------------------------------------------------
   // Residuals:
   //
-  for( reco::TrackCollection::const_iterator iTrack = TracksForRes->begin();
-       iTrack != TracksForRes->end(); ++iTrack ) {
-    //count
+  for (reco::TrackCollection::const_iterator iTrack = TracksForRes->begin(); iTrack != TracksForRes->end(); ++iTrack) {
+    // count
     kk++;
-    //Calculate minimal track pt before curling
+    // Calculate minimal track pt before curling
     // cpt = cqRB = 0.3*R[m]*B[T] = 1.14*R[m] for B=3.8T
     // D = 2R = 2*pt/1.14
     // calo: D = 1.3 m => pt = 0.74 GeV/c
     double pt = iTrack->pt();
-    if( pt < 0.75 ) continue;// curls up
-    if( abs( iTrack->dxy(vtxP) ) > 5*iTrack->dxyError() ) continue; // not prompt
-    
+    if (pt < 0.75)
+      continue;  // curls up
+    if (abs(iTrack->dxy(vtxP)) > 5 * iTrack->dxyError())
+      continue;  // not prompt
+
     double charge = iTrack->charge();
-       
+
     reco::TransientTrack tTrack = theB->build(*iTrack);
-    //get curvature of the track, needed for the residuals
+    // get curvature of the track, needed for the residuals
     double kap = tTrack.initialFreeState().transverseCurvature();
-    //needed for the TransienTrackingRecHitBuilder
+    // needed for the TransienTrackingRecHitBuilder
     TrajectoryStateOnSurface initialTSOS = tTrack.innermostMeasurementState();
-    if( iTrack->extra().isNonnull() &&iTrack->extra().isAvailable() ){
-      
+    if (iTrack->extra().isNonnull() && iTrack->extra().isAvailable()) {
       double x1 = 0;
       double y1 = 0;
       double z1 = 0;
@@ -823,782 +961,844 @@ void SiPixelTrackResidualSource::analyze(const edm::Event& iEvent, const edm::Ev
       int n1 = 0;
       int n2 = 0;
       int n3 = 0;
-      
-      //for saving the pixel barrel hits
+
+      // for saving the pixel barrel hits
       vector<TransientTrackingRecHit::RecHitPointer> GoodPixBarrelHits;
-      //looping through the RecHits of the track
-      for( trackingRecHit_iterator irecHit = iTrack->recHitsBegin();
-	   irecHit != iTrack->recHitsEnd(); ++irecHit){
-	
-	if( (*irecHit)->isValid() ){
-	  DetId detId = (*irecHit)->geographicalId();
-	  // enum Detector { Tracker=1, Muon=2, Ecal=3, Hcal=4, Calo=5 };
-	  if( detId.det() != 1 ){
-	    if(debug_){
-	      cout << "rec hit ID = " << detId.det() << " not in tracker!?!?\n";
-	    }
-	    continue;
-	  }
-	  uint32_t subDet = detId.subdetId();
-	  
-	  // enum SubDetector{ PixelBarrel=1, PixelEndcap=2 };
-	  // enum SubDetector{ TIB=3, TID=4, TOB=5, TEC=6 };
-	  
-	  TransientTrackingRecHit::RecHitPointer trecHit = theTrackerRecHitBuilder->build(  &*(*irecHit), initialTSOS);
-	  
-	  
-	  double gX = trecHit->globalPosition().x();
-	  double gY = trecHit->globalPosition().y();
-	  double gZ = trecHit->globalPosition().z();
-	      
-	      
-	      if( subDet == PixelSubdetector::PixelBarrel ) {
-
-		int ilay = tTopo->pxbLayer(detId);
-		
-		if( ilay == 1 ){
-		  n1++;
-		  x1 = gX;
-		  y1 = gY;
-		  z1 = gZ;
-		  
-		  GoodPixBarrelHits.push_back((trecHit));
-		}//PXB1
-		if( ilay == 2 ){
-		  
-		  n2++;
-		  x2 = gX;
-		  y2 = gY;
-		  z2 = gZ;
-		  
-		  GoodPixBarrelHits.push_back((trecHit));
-		  
-		}//PXB2
-		if( ilay == 3 ){
-		  
-		  n3++;
-		  x3 = gX;
-		  y3 = gY;
-		  z3 = gZ;
-		  GoodPixBarrelHits.push_back((trecHit));
-		}
-	      }//PXB
-	      
-	      
-	    }//valid
-	  }//loop rechits
-	  
-	  //CS extra plots    
-	  
-	 	  
-	  if( n1+n2+n3 == 3 && n1*n2*n3 > 0) {      
-	    for( unsigned int i = 0; i < GoodPixBarrelHits.size(); i++){
-	      
-	      if( GoodPixBarrelHits[i]->isValid() ){
-		DetId detId = GoodPixBarrelHits[i]->geographicalId().rawId();
-		int ilay = tTopo->pxbLayer(detId);
-		if(pt > ptminres_){   
-		  
-		  double dca2 = 0.0, dz2=0.0;
-		  double ptsig = pt;
-		  if(charge<0.) ptsig = -pt;
-		  //Filling the histograms in modules
-		  
-		  MeasurementPoint Test;
-		  MeasurementPoint Test2;
-		  Test=MeasurementPoint(0,0);
-		  Test2=MeasurementPoint(0,0);
-		  Measurement2DVector residual;
-		 
-		  if( ilay == 1 ){
-		    
-		    triplets(x2,y2,z2,x1,y1,z1,x3,y3,z3,ptsig,dca2,dz2, kap);	
-		    		
-		    Test=MeasurementPoint(dca2*1E4,dz2*1E4);
-		    residual=Test-Test2;
-		  }
-		  
-		  if( ilay == 2 ){
-		    
-		    triplets(x1,y1,z1,x2,y2,z2,x3,y3,z3,ptsig,dca2,dz2, kap);
-		    
-		    Test=MeasurementPoint(dca2*1E4,dz2*1E4);
-		    residual=Test-Test2;
-	      
-		  }
-		  
-		  if( ilay == 3 ){
-		    
-		    triplets(x1,y1,z1,x3,y3,z3,x2,y2,z2,ptsig,dca2,dz2, kap);
-		    
-		    Test=MeasurementPoint(dca2*1E4,dz2*1E4);
-		    residual=Test-Test2;
-	    }
-		  // fill the residual histograms 
-
-		  std::map<uint32_t, SiPixelTrackResidualModule*>::iterator pxd = theSiPixelStructure.find(detId);
-		  if (pxd!=theSiPixelStructure.end()) (*pxd).second->fill(residual, reducedSet, modOn, ladOn, layOn, phiOn, bladeOn, diskOn, ringOn);	
-
-		  if(ladOn&&pxd!=theSiPixelStructure.end()){  
-		    meResidualXSummedLay.at(PixelBarrelNameUpgrade((*pxd).first).layerName()-1)->Fill(residual.x());    
-		    meResidualYSummedLay.at(PixelBarrelNameUpgrade((*pxd).first).layerName()-1)->Fill(residual.y());    
-		  }
-	
-		}//three hits
-	      }//is valid
-	    }//rechits loop
-	  }//pt 4
-	}
-	
-	
- }//-----Tracks
+      // looping through the RecHits of the track
+      for (trackingRecHit_iterator irecHit = iTrack->recHitsBegin(); irecHit != iTrack->recHitsEnd(); ++irecHit) {
+        if ((*irecHit)->isValid()) {
+          DetId detId = (*irecHit)->geographicalId();
+          // enum Detector { Tracker=1, Muon=2, Ecal=3, Hcal=4, Calo=5 };
+          if (detId.det() != 1) {
+            if (debug_) {
+              cout << "rec hit ID = " << detId.det() << " not in tracker!?!?\n";
+            }
+            continue;
+          }
+          uint32_t subDet = detId.subdetId();
+
+          // enum SubDetector{ PixelBarrel=1, PixelEndcap=2 };
+          // enum SubDetector{ TIB=3, TID=4, TOB=5, TEC=6 };
+
+          TransientTrackingRecHit::RecHitPointer trecHit = theTrackerRecHitBuilder->build(&*(*irecHit), initialTSOS);
+
+          double gX = trecHit->globalPosition().x();
+          double gY = trecHit->globalPosition().y();
+          double gZ = trecHit->globalPosition().z();
+
+          if (subDet == PixelSubdetector::PixelBarrel) {
+            int ilay = tTopo->pxbLayer(detId);
+
+            if (ilay == 1) {
+              n1++;
+              x1 = gX;
+              y1 = gY;
+              z1 = gZ;
+
+              GoodPixBarrelHits.push_back((trecHit));
+            }  // PXB1
+            if (ilay == 2) {
+              n2++;
+              x2 = gX;
+              y2 = gY;
+              z2 = gZ;
+
+              GoodPixBarrelHits.push_back((trecHit));
+
+            }  // PXB2
+            if (ilay == 3) {
+              n3++;
+              x3 = gX;
+              y3 = gY;
+              z3 = gZ;
+              GoodPixBarrelHits.push_back((trecHit));
+            }
+          }  // PXB
+
+        }  // valid
+      }    // loop rechits
+
+      // CS extra plots
+
+      if (n1 + n2 + n3 == 3 && n1 * n2 * n3 > 0) {
+        for (unsigned int i = 0; i < GoodPixBarrelHits.size(); i++) {
+          if (GoodPixBarrelHits[i]->isValid()) {
+            DetId detId = GoodPixBarrelHits[i]->geographicalId().rawId();
+            int ilay = tTopo->pxbLayer(detId);
+            if (pt > ptminres_) {
+              double dca2 = 0.0, dz2 = 0.0;
+              double ptsig = pt;
+              if (charge < 0.)
+                ptsig = -pt;
+              // Filling the histograms in modules
+
+              MeasurementPoint Test;
+              MeasurementPoint Test2;
+              Test = MeasurementPoint(0, 0);
+              Test2 = MeasurementPoint(0, 0);
+              Measurement2DVector residual;
+
+              if (ilay == 1) {
+                triplets(x2, y2, z2, x1, y1, z1, x3, y3, z3, ptsig, dca2, dz2, kap);
+
+                Test = MeasurementPoint(dca2 * 1E4, dz2 * 1E4);
+                residual = Test - Test2;
+              }
+
+              if (ilay == 2) {
+                triplets(x1, y1, z1, x2, y2, z2, x3, y3, z3, ptsig, dca2, dz2, kap);
+
+                Test = MeasurementPoint(dca2 * 1E4, dz2 * 1E4);
+                residual = Test - Test2;
+              }
+
+              if (ilay == 3) {
+                triplets(x1, y1, z1, x3, y3, z3, x2, y2, z2, ptsig, dca2, dz2, kap);
+
+                Test = MeasurementPoint(dca2 * 1E4, dz2 * 1E4);
+                residual = Test - Test2;
+              }
+              // fill the residual histograms
+
+              std::map<uint32_t, SiPixelTrackResidualModule *>::iterator pxd = theSiPixelStructure.find(detId);
+              if (pxd != theSiPixelStructure.end())
+                (*pxd).second->fill(residual, reducedSet, modOn, ladOn, layOn, phiOn, bladeOn, diskOn, ringOn);
+
+              if (ladOn && pxd != theSiPixelStructure.end()) {
+                meResidualXSummedLay.at(PixelBarrelNameUpgrade((*pxd).first).layerName() - 1)->Fill(residual.x());
+                meResidualYSummedLay.at(PixelBarrelNameUpgrade((*pxd).first).layerName() - 1)->Fill(residual.y());
+              }
+
+            }  // three hits
+          }    // is valid
+        }      // rechits loop
+      }        // pt 4
+    }
+
+  }  //-----Tracks
   ////////////////////////////
-  //get tracks
-  edm::Handle<std::vector<reco::Track> > trackCollectionHandle;
-  //iEvent.getByLabel(tracksrc_,trackCollectionHandle);
-  iEvent.getByToken( trackToken_, trackCollectionHandle );
-  auto const & trackColl = *(trackCollectionHandle.product());
-  
+  // get tracks
+  edm::Handle<std::vector<reco::Track>> trackCollectionHandle;
+  // iEvent.getByLabel(tracksrc_,trackCollectionHandle);
+  iEvent.getByToken(trackToken_, trackCollectionHandle);
+  auto const &trackColl = *(trackCollectionHandle.product());
 
   // get clusters
-  edm::Handle< edmNew::DetSetVector<SiPixelCluster> >  clusterColl;
-  //iEvent.getByLabel( clustersrc_, clusterColl );
-  iEvent.getByToken( clustersrcToken_, clusterColl );
-  auto const & clustColl = *(clusterColl.product());
+  edm::Handle<edmNew::DetSetVector<SiPixelCluster>> clusterColl;
+  // iEvent.getByLabel( clustersrc_, clusterColl );
+  iEvent.getByToken(clustersrcToken_, clusterColl);
+  auto const &clustColl = *(clusterColl.product());
 
   // get digis
-  edm::Handle< edm::DetSetVector<PixelDigi> >  digiinput;
-  iEvent.getByToken( digisrcToken_, digiinput );
-  edm::DetSetVector<PixelDigi> const & diginp = *(digiinput.product());
-  
+  edm::Handle<edm::DetSetVector<PixelDigi>> digiinput;
+  iEvent.getByToken(digisrcToken_, digiinput);
+  edm::DetSetVector<PixelDigi> const &diginp = *(digiinput.product());
 
   std::set<SiPixelCluster> clusterSet;
   TrajectoryStateCombiner tsoscomb;
-  int tracks=0, pixeltracks=0, bpixtracks=0, fpixtracks=0; 
-  int trackclusters=0, barreltrackclusters=0, endcaptrackclusters=0;
-  int otherclusters=0, barrelotherclusters=0, endcapotherclusters=0;
-
-  //get trajectories
-  edm::Handle<std::vector<Trajectory> > trajCollectionHandle;
-  iEvent.getByToken ( tracksrcToken_, trajCollectionHandle );
-
-  if(debug_){
-   edm::EDConsumerBase::Labels labels;
-   labelsForToken(tracksrcToken_, labels);
-   std::cout << "Trajectories for Res from " << labels.module << std::endl;
-  }
+  int tracks = 0, pixeltracks = 0, bpixtracks = 0, fpixtracks = 0;
+  int trackclusters = 0, barreltrackclusters = 0, endcaptrackclusters = 0;
+  int otherclusters = 0, barrelotherclusters = 0, endcapotherclusters = 0;
 
-  if (trajCollectionHandle.isValid()) {
-
-  auto const & trajColl = *(trajCollectionHandle.product());
-  //get the map
-  edm::Handle<TrajTrackAssociationCollection> match;
-  iEvent.getByToken( trackAssociationToken_, match);
-  auto const &  ttac = *(match.product());
+  // get trajectories
+  edm::Handle<std::vector<Trajectory>> trajCollectionHandle;
+  iEvent.getByToken(tracksrcToken_, trajCollectionHandle);
 
- if(debug_){
-    std::cout << "Trajectories\t : " << trajColl.size() << std::endl;
-    std::cout << "recoTracks  \t : " << trackColl.size() << std::endl;
-    std::cout << "Map entries \t : " << ttac.size() << std::endl;
+  if (debug_) {
+    edm::EDConsumerBase::Labels labels;
+    labelsForToken(tracksrcToken_, labels);
+    std::cout << "Trajectories for Res from " << labels.module << std::endl;
   }
 
-
-  //Loop over map entries
-  for(TrajTrackAssociationCollection::const_iterator it =  ttac.begin();it !=  ttac.end(); ++it){
-    const edm::Ref<std::vector<Trajectory> > traj_iterator = it->key;  
-    // Trajectory Map, extract Trajectory for this track
-    reco::TrackRef trackref = it->val;
-    tracks++;
-
-    bool isBpixtrack = false, isFpixtrack = false, crossesPixVol=false;
-    
-    //find out whether track crosses pixel fiducial volume (for cosmic tracks)
-    
-    double d0 = (*trackref).d0(), dz = (*trackref).dz(); 
-    
-    if(abs(d0)<15 && abs(dz)<50) crossesPixVol = true;
-
-    const std::vector<TrajectoryMeasurement>& tmeasColl =traj_iterator->measurements();
-    std::vector<TrajectoryMeasurement>::const_iterator tmeasIt;
-    //loop on measurements to find out whether there are bpix and/or fpix hits
-    for(tmeasIt = tmeasColl.begin();tmeasIt!=tmeasColl.end();tmeasIt++){
-      if(! tmeasIt->updatedState().isValid()) continue; 
-      TransientTrackingRecHit::ConstRecHitPointer testhit = tmeasIt->recHit();
-      if(! testhit->isValid() || testhit->geographicalId().det() != DetId::Tracker) continue; 
-      uint testSubDetID = (testhit->geographicalId().subdetId()); 
-      if(testSubDetID==PixelSubdetector::PixelBarrel) isBpixtrack = true;
-      if(testSubDetID==PixelSubdetector::PixelEndcap) isFpixtrack = true;
-    }//end loop on measurements
-    if(isBpixtrack) {
-      bpixtracks++; 
-      if(debug_) std::cout << "bpixtrack\n";
-    }
-    if(isFpixtrack) {
-      fpixtracks++; 
-      if(debug_) std::cout << "fpixtrack\n";
+  if (trajCollectionHandle.isValid()) {
+    auto const &trajColl = *(trajCollectionHandle.product());
+    // get the map
+    edm::Handle<TrajTrackAssociationCollection> match;
+    iEvent.getByToken(trackAssociationToken_, match);
+    auto const &ttac = *(match.product());
+
+    if (debug_) {
+      std::cout << "Trajectories\t : " << trajColl.size() << std::endl;
+      std::cout << "recoTracks  \t : " << trackColl.size() << std::endl;
+      std::cout << "Map entries \t : " << ttac.size() << std::endl;
     }
-    if(isBpixtrack || isFpixtrack){
-      pixeltracks++;
-      
-      if(crossesPixVol) meNofTracksInPixVol_->Fill(0,1);
-
-      const std::vector<TrajectoryMeasurement>& tmeasColl = traj_iterator->measurements();
-      for(std::vector<TrajectoryMeasurement>::const_iterator tmeasIt = tmeasColl.begin(); tmeasIt!=tmeasColl.end(); tmeasIt++){   
-	if(! tmeasIt->updatedState().isValid()) continue; 
-	
-	TrajectoryStateOnSurface tsos = tsoscomb( tmeasIt->forwardPredictedState(), tmeasIt->backwardPredictedState() );
-        if (!tsos.isValid()) continue; // Happens rarely, due to singular matrix or similar
-
-	TransientTrackingRecHit::ConstRecHitPointer hit = tmeasIt->recHit();
-	if(! hit->isValid() || hit->geographicalId().det() != DetId::Tracker ) {
-	  continue; 
-	} else {
-	  
-// 	  //residual
-      	  const DetId & hit_detId = hit->geographicalId();
-	  //uint IntRawDetID = (hit_detId.rawId());
-	  uint IntSubDetID = (hit_detId.subdetId());
-	  
- 	  if(IntSubDetID == 0 ) continue; // don't look at SiStrip hits!	    
-	  
-	  // get the enclosed persistent hit
-	  const TrackingRecHit *persistentHit = hit->hit();
-	  // check if it's not null, and if it's a valid pixel hit
-	  if ((persistentHit != nullptr) && (typeid(*persistentHit) == typeid(SiPixelRecHit))) {
-	    // tell the C++ compiler that the hit is a pixel hit
-	    const SiPixelRecHit* pixhit = static_cast<const SiPixelRecHit*>( hit->hit() );
-	    //Hit probability:
-	    float hit_prob = -1.;
-	    if(pixhit->hasFilledProb()){
-	      hit_prob = pixhit->clusterProbability(0);
-	      //std::cout<<"HITPROB= "<<hit_prob<<std::endl;
-	      if(hit_prob<pow(10.,-15.)) NLowProb++;
-	      NTotal++;
-	      if(NTotal>0) meHitProbability->Fill(float(NLowProb/NTotal));
-	    }
-	    
-	    // get the edm::Ref to the cluster
- 	    edm::Ref<edmNew::DetSetVector<SiPixelCluster>, SiPixelCluster> const& clust = (*pixhit).cluster();
-	    
-	    //  check if the ref is not null
-	    if (clust.isNonnull()) {
-	      
-	      //define tracker and pixel geometry and topology
-	      const TrackerGeometry& theTracker(*theTrackerGeometry);
-	      const PixelGeomDetUnit* theGeomDet = static_cast<const PixelGeomDetUnit*> (theTracker.idToDet(hit_detId) );
-	      
-	      //test if PixelGeomDetUnit exists
-	      if(theGeomDet == nullptr) {
-		if(debug_) std::cout << "NO THEGEOMDET\n";
-		continue;
-	      }
-	      
-	      const PixelTopology * topol = &(theGeomDet->specificTopology());
-	      //fill histograms for clusters on tracks
-	      //correct SiPixelTrackResidualModule
-	      std::map<uint32_t, SiPixelTrackResidualModule*>::iterator pxd = theSiPixelStructure.find((*hit).geographicalId().rawId());
-
-	      //CHARGE CORRECTION (for track impact angle)
-	      // calculate alpha and beta from cluster position
-	      LocalTrajectoryParameters ltp = tsos.localParameters();
-	      LocalVector localDir = ltp.momentum()/ltp.momentum().mag();
-	     
-	      float clust_alpha = atan2(localDir.z(), localDir.x());
-	      float clust_beta = atan2(localDir.z(), localDir.y());
-	      double corrCharge = clust->charge() * sqrt( 1.0 / ( 1.0/pow( tan(clust_alpha), 2 ) + 
-								  1.0/pow( tan(clust_beta ), 2 ) + 
-								  1.0 )
-							  )/1000.;
-	      
-	      if (pxd!=theSiPixelStructure.end()) (*pxd).second->fill((*clust), true, corrCharge, reducedSet, modOn, ladOn, layOn, phiOn, bladeOn, diskOn, ringOn); 	
-
-
-	      trackclusters++;
-	      //CORR CHARGE
-	      meClChargeOnTrack_all->Fill(corrCharge);
-	      meClSizeOnTrack_all->Fill((*clust).size());
-	      meClSizeXOnTrack_all->Fill((*clust).sizeX());
-	      meClSizeYOnTrack_all->Fill((*clust).sizeY());
-	      clusterSet.insert(*clust);
-	      
-	      //find cluster global position (rphi, z)
-	      // get cluster center of gravity (of charge)
-	      float xcenter = clust->x();
-	      float ycenter = clust->y();
-	      // get the cluster position in local coordinates (cm) 
-	      LocalPoint clustlp = topol->localPosition( MeasurementPoint(xcenter, ycenter) );
-	      // get the cluster position in global coordinates (cm)
-	      GlobalPoint clustgp = theGeomDet->surface().toGlobal( clustlp );
-	      
-	      //find location of hit (barrel or endcap, same for cluster)
-	      bool barrel = DetId((*hit).geographicalId()).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel);
-	      bool endcap = DetId((*hit).geographicalId()).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap);
-	      if(barrel) {
-		barreltrackclusters++;
-
-		DetId detId = (*hit).geographicalId();
-		if(detId>=302055684 && detId<=352477708) { getrococcupancy(detId,diginp,tTopo,meZeroRocLadvsModOnTrackBarrel); }
-
-		//CORR CHARGE
-		meClChargeOnTrack_bpix->Fill(corrCharge);
-		meClSizeOnTrack_bpix->Fill((*clust).size());
-		meClSizeXOnTrack_bpix->Fill((*clust).sizeX());
-		meClSizeYOnTrack_bpix->Fill((*clust).sizeY());
-		int DBlayer;
-		DBlayer = PixelBarrelName(DetId((*hit).geographicalId()), tTopo, isUpgrade).layerName();
-		float phi = clustgp.phi(); 
-		float z = clustgp.z();
-
-                PixelBarrelName pbn(DetId((*hit).geographicalId()), tTopo, isUpgrade);
-                int ladder = pbn.ladderName();
-                int module = pbn.moduleName();
-
-		PixelBarrelName::Shell sh = pbn.shell(); //enum
-                int ladderSigned=ladder;
-                int moduleSigned=module;
-                // Shell { mO = 1, mI = 2 , pO =3 , pI =4 };
-                int shell = int(sh);
-                // change the module sign for z<0
-                if(shell==1 || shell==2) { moduleSigned = -module; }
-                // change ladeer sign for Outer )x<0)
-                if(shell==1 || shell==3) { ladderSigned = -ladder; }
-
-		for (int i = 0; i < noOfLayers; i++)
-		  {
-          if (DBlayer == i + 1) {
-             meClPosLayersOnTrack.at(i)->Fill(z,phi);
-	     meClPosLayersLadVsModOnTrack.at(i)->Fill(moduleSigned,ladderSigned);
-             meClChargeOnTrack_layers.at(i)->Fill(corrCharge);
-             meClSizeOnTrack_layers.at(i)->Fill((*clust).size());
-             meClSizeXOnTrack_layers.at(i)->Fill((*clust).sizeX());
-             meClSizeYOnTrack_layers.at(i)->Fill((*clust).sizeY());
-	     meNofClustersvsPhiOnTrack_layers.at(i)->Fill(phi);
-	     
-          }
-		  }
-	      }
-	      if(endcap) {
-		endcaptrackclusters++;
-		//CORR CHARGE
-		meClChargeOnTrack_fpix->Fill(corrCharge);
-		meClSizeOnTrack_fpix->Fill((*clust).size());
-		meClSizeXOnTrack_fpix->Fill((*clust).sizeX());
-		meClSizeYOnTrack_fpix->Fill((*clust).sizeY());
-		int DBdisk = 0;
-		DBdisk = PixelEndcapName(DetId((*hit).geographicalId()), tTopo, isUpgrade).diskName();
-		float x = clustgp.x(); 
-		float y = clustgp.y(); 
-		float z = clustgp.z();
-		float phi = clustgp.phi();
-
-		float xclust = clust->x();
-                float yclust = clust->y();
-
-		getepixrococcupancyontrk(tTopo,hit,xclust,yclust,z,meRocBladevsDiskEndcapOnTrk);
-
-		if(z>0){
-        for (int i = 0; i < noOfDisks; i++)
-        {
-            if (DBdisk == i + 1) {
-               meClPosDiskspzOnTrack.at(i)->Fill(x,y);
-               meClChargeOnTrack_diskps.at(i)->Fill(corrCharge);
-               meClSizeOnTrack_diskps.at(i)->Fill((*clust).size());
-               meClSizeXOnTrack_diskps.at(i)->Fill((*clust).sizeX());
-               meClSizeYOnTrack_diskps.at(i)->Fill((*clust).sizeY());
-	       meNofClustersvsPhiOnTrack_diskps.at(i)->Fill(phi);
-            }
-        }
-		}
-		else{
-        for (int i = 0; i < noOfDisks; i++)
-        {
-          if (DBdisk == i + 1) {
-             meClPosDisksmzOnTrack.at(i)->Fill(x,y);
-             meClChargeOnTrack_diskms.at(i)->Fill(corrCharge);
-             meClSizeOnTrack_diskms.at(i)->Fill((*clust).size());
-             meClSizeXOnTrack_diskms.at(i)->Fill((*clust).sizeX());
-             meClSizeYOnTrack_diskms.at(i)->Fill((*clust).sizeY());
-	     meNofClustersvsPhiOnTrack_diskms.at(i)->Fill(phi);
 
-          }
-        }
-		} 
-	      }
-	      
-	    }//end if (cluster exists)
-
-	  }//end if (persistent hit exists and is pixel hit)
-	  
-	}//end of else 
-	
-	
-      }//end for (all traj measurements of pixeltrack)
-    }//end if (is pixeltrack)
-    else {
-      if(debug_) std::cout << "no pixeltrack:\n";
-      if(crossesPixVol) meNofTracksInPixVol_->Fill(1,1);
-    }
-    
-  }//end loop on map entries
+    // Loop over map entries
+    for (TrajTrackAssociationCollection::const_iterator it = ttac.begin(); it != ttac.end(); ++it) {
+      const edm::Ref<std::vector<Trajectory>> traj_iterator = it->key;
+      // Trajectory Map, extract Trajectory for this track
+      reco::TrackRef trackref = it->val;
+      tracks++;
+
+      bool isBpixtrack = false, isFpixtrack = false, crossesPixVol = false;
+
+      // find out whether track crosses pixel fiducial volume (for cosmic
+      // tracks)
+
+      double d0 = (*trackref).d0(), dz = (*trackref).dz();
+
+      if (abs(d0) < 15 && abs(dz) < 50)
+        crossesPixVol = true;
+
+      const std::vector<TrajectoryMeasurement> &tmeasColl = traj_iterator->measurements();
+      std::vector<TrajectoryMeasurement>::const_iterator tmeasIt;
+      // loop on measurements to find out whether there are bpix and/or fpix
+      // hits
+      for (tmeasIt = tmeasColl.begin(); tmeasIt != tmeasColl.end(); tmeasIt++) {
+        if (!tmeasIt->updatedState().isValid())
+          continue;
+        TransientTrackingRecHit::ConstRecHitPointer testhit = tmeasIt->recHit();
+        if (!testhit->isValid() || testhit->geographicalId().det() != DetId::Tracker)
+          continue;
+        uint testSubDetID = (testhit->geographicalId().subdetId());
+        if (testSubDetID == PixelSubdetector::PixelBarrel)
+          isBpixtrack = true;
+        if (testSubDetID == PixelSubdetector::PixelEndcap)
+          isFpixtrack = true;
+      }  // end loop on measurements
+      if (isBpixtrack) {
+        bpixtracks++;
+        if (debug_)
+          std::cout << "bpixtrack\n";
+      }
+      if (isFpixtrack) {
+        fpixtracks++;
+        if (debug_)
+          std::cout << "fpixtrack\n";
+      }
+      if (isBpixtrack || isFpixtrack) {
+        pixeltracks++;
+
+        if (crossesPixVol)
+          meNofTracksInPixVol_->Fill(0, 1);
+
+        const std::vector<TrajectoryMeasurement> &tmeasColl = traj_iterator->measurements();
+        for (std::vector<TrajectoryMeasurement>::const_iterator tmeasIt = tmeasColl.begin(); tmeasIt != tmeasColl.end();
+             tmeasIt++) {
+          if (!tmeasIt->updatedState().isValid())
+            continue;
+
+          TrajectoryStateOnSurface tsos = tsoscomb(tmeasIt->forwardPredictedState(), tmeasIt->backwardPredictedState());
+          if (!tsos.isValid())
+            continue;  // Happens rarely, due to singular matrix or similar
+
+          TransientTrackingRecHit::ConstRecHitPointer hit = tmeasIt->recHit();
+          if (!hit->isValid() || hit->geographicalId().det() != DetId::Tracker) {
+            continue;
+          } else {
+            // 	  //residual
+            const DetId &hit_detId = hit->geographicalId();
+            // uint IntRawDetID = (hit_detId.rawId());
+            uint IntSubDetID = (hit_detId.subdetId());
+
+            if (IntSubDetID == 0)
+              continue;  // don't look at SiStrip hits!
+
+            // get the enclosed persistent hit
+            const TrackingRecHit *persistentHit = hit->hit();
+            // check if it's not null, and if it's a valid pixel hit
+            if ((persistentHit != nullptr) && (typeid(*persistentHit) == typeid(SiPixelRecHit))) {
+              // tell the C++ compiler that the hit is a pixel hit
+              const SiPixelRecHit *pixhit = static_cast<const SiPixelRecHit *>(hit->hit());
+              // Hit probability:
+              float hit_prob = -1.;
+              if (pixhit->hasFilledProb()) {
+                hit_prob = pixhit->clusterProbability(0);
+                // std::cout<<"HITPROB= "<<hit_prob<<std::endl;
+                if (hit_prob < pow(10., -15.))
+                  NLowProb++;
+                NTotal++;
+                if (NTotal > 0)
+                  meHitProbability->Fill(float(NLowProb / NTotal));
+              }
+
+              // get the edm::Ref to the cluster
+              edm::Ref<edmNew::DetSetVector<SiPixelCluster>, SiPixelCluster> const &clust = (*pixhit).cluster();
+
+              //  check if the ref is not null
+              if (clust.isNonnull()) {
+                // define tracker and pixel geometry and topology
+                const TrackerGeometry &theTracker(*theTrackerGeometry);
+                const PixelGeomDetUnit *theGeomDet =
+                    static_cast<const PixelGeomDetUnit *>(theTracker.idToDet(hit_detId));
+
+                // test if PixelGeomDetUnit exists
+                if (theGeomDet == nullptr) {
+                  if (debug_)
+                    std::cout << "NO THEGEOMDET\n";
+                  continue;
+                }
+
+                const PixelTopology *topol = &(theGeomDet->specificTopology());
+                // fill histograms for clusters on tracks
+                // correct SiPixelTrackResidualModule
+                std::map<uint32_t, SiPixelTrackResidualModule *>::iterator pxd =
+                    theSiPixelStructure.find((*hit).geographicalId().rawId());
+
+                // CHARGE CORRECTION (for track impact angle)
+                // calculate alpha and beta from cluster position
+                LocalTrajectoryParameters ltp = tsos.localParameters();
+                LocalVector localDir = ltp.momentum() / ltp.momentum().mag();
+
+                float clust_alpha = atan2(localDir.z(), localDir.x());
+                float clust_beta = atan2(localDir.z(), localDir.y());
+                double corrCharge = clust->charge() *
+                                    sqrt(1.0 / (1.0 / pow(tan(clust_alpha), 2) + 1.0 / pow(tan(clust_beta), 2) + 1.0)) /
+                                    1000.;
+
+                if (pxd != theSiPixelStructure.end())
+                  (*pxd).second->fill(
+                      (*clust), true, corrCharge, reducedSet, modOn, ladOn, layOn, phiOn, bladeOn, diskOn, ringOn);
+
+                trackclusters++;
+                // CORR CHARGE
+                meClChargeOnTrack_all->Fill(corrCharge);
+                meClSizeOnTrack_all->Fill((*clust).size());
+                meClSizeXOnTrack_all->Fill((*clust).sizeX());
+                meClSizeYOnTrack_all->Fill((*clust).sizeY());
+                clusterSet.insert(*clust);
+
+                // find cluster global position (rphi, z)
+                // get cluster center of gravity (of charge)
+                float xcenter = clust->x();
+                float ycenter = clust->y();
+                // get the cluster position in local coordinates (cm)
+                LocalPoint clustlp = topol->localPosition(MeasurementPoint(xcenter, ycenter));
+                // get the cluster position in global coordinates (cm)
+                GlobalPoint clustgp = theGeomDet->surface().toGlobal(clustlp);
+
+                // find location of hit (barrel or endcap, same for cluster)
+                bool barrel =
+                    DetId((*hit).geographicalId()).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel);
+                bool endcap =
+                    DetId((*hit).geographicalId()).subdetId() == static_cast<int>(PixelSubdetector::PixelEndcap);
+                if (barrel) {
+                  barreltrackclusters++;
+
+                  DetId detId = (*hit).geographicalId();
+                  if (detId >= 302055684 && detId <= 352477708) {
+                    getrococcupancy(detId, diginp, tTopo, meZeroRocLadvsModOnTrackBarrel);
+                  }
+
+                  // CORR CHARGE
+                  meClChargeOnTrack_bpix->Fill(corrCharge);
+                  meClSizeOnTrack_bpix->Fill((*clust).size());
+                  meClSizeXOnTrack_bpix->Fill((*clust).sizeX());
+                  meClSizeYOnTrack_bpix->Fill((*clust).sizeY());
+                  int DBlayer;
+                  DBlayer = PixelBarrelName(DetId((*hit).geographicalId()), tTopo, isUpgrade).layerName();
+                  float phi = clustgp.phi();
+                  float z = clustgp.z();
+
+                  PixelBarrelName pbn(DetId((*hit).geographicalId()), tTopo, isUpgrade);
+                  int ladder = pbn.ladderName();
+                  int module = pbn.moduleName();
+
+                  PixelBarrelName::Shell sh = pbn.shell();  // enum
+                  int ladderSigned = ladder;
+                  int moduleSigned = module;
+                  // Shell { mO = 1, mI = 2 , pO =3 , pI =4 };
+                  int shell = int(sh);
+                  // change the module sign for z<0
+                  if (shell == 1 || shell == 2) {
+                    moduleSigned = -module;
+                  }
+                  // change ladeer sign for Outer )x<0)
+                  if (shell == 1 || shell == 3) {
+                    ladderSigned = -ladder;
+                  }
+
+                  for (int i = 0; i < noOfLayers; i++) {
+                    if (DBlayer == i + 1) {
+                      meClPosLayersOnTrack.at(i)->Fill(z, phi);
+                      meClPosLayersLadVsModOnTrack.at(i)->Fill(moduleSigned, ladderSigned);
+                      meClChargeOnTrack_layers.at(i)->Fill(corrCharge);
+                      meClSizeOnTrack_layers.at(i)->Fill((*clust).size());
+                      meClSizeXOnTrack_layers.at(i)->Fill((*clust).sizeX());
+                      meClSizeYOnTrack_layers.at(i)->Fill((*clust).sizeY());
+                      meNofClustersvsPhiOnTrack_layers.at(i)->Fill(phi);
+                    }
+                  }
+                }
+                if (endcap) {
+                  endcaptrackclusters++;
+                  // CORR CHARGE
+                  meClChargeOnTrack_fpix->Fill(corrCharge);
+                  meClSizeOnTrack_fpix->Fill((*clust).size());
+                  meClSizeXOnTrack_fpix->Fill((*clust).sizeX());
+                  meClSizeYOnTrack_fpix->Fill((*clust).sizeY());
+                  int DBdisk = 0;
+                  DBdisk = PixelEndcapName(DetId((*hit).geographicalId()), tTopo, isUpgrade).diskName();
+                  float x = clustgp.x();
+                  float y = clustgp.y();
+                  float z = clustgp.z();
+                  float phi = clustgp.phi();
+
+                  float xclust = clust->x();
+                  float yclust = clust->y();
+
+                  getepixrococcupancyontrk(tTopo, hit, xclust, yclust, z, meRocBladevsDiskEndcapOnTrk);
+
+                  if (z > 0) {
+                    for (int i = 0; i < noOfDisks; i++) {
+                      if (DBdisk == i + 1) {
+                        meClPosDiskspzOnTrack.at(i)->Fill(x, y);
+                        meClChargeOnTrack_diskps.at(i)->Fill(corrCharge);
+                        meClSizeOnTrack_diskps.at(i)->Fill((*clust).size());
+                        meClSizeXOnTrack_diskps.at(i)->Fill((*clust).sizeX());
+                        meClSizeYOnTrack_diskps.at(i)->Fill((*clust).sizeY());
+                        meNofClustersvsPhiOnTrack_diskps.at(i)->Fill(phi);
+                      }
+                    }
+                  } else {
+                    for (int i = 0; i < noOfDisks; i++) {
+                      if (DBdisk == i + 1) {
+                        meClPosDisksmzOnTrack.at(i)->Fill(x, y);
+                        meClChargeOnTrack_diskms.at(i)->Fill(corrCharge);
+                        meClSizeOnTrack_diskms.at(i)->Fill((*clust).size());
+                        meClSizeXOnTrack_diskms.at(i)->Fill((*clust).sizeX());
+                        meClSizeYOnTrack_diskms.at(i)->Fill((*clust).sizeY());
+                        meNofClustersvsPhiOnTrack_diskms.at(i)->Fill(phi);
+                      }
+                    }
+                  }
+                }
+
+              }  // end if (cluster exists)
+
+            }  // end if (persistent hit exists and is pixel hit)
+
+          }  // end of else
+
+        }  // end for (all traj measurements of pixeltrack)
+      }    // end if (is pixeltrack)
+      else {
+        if (debug_)
+          std::cout << "no pixeltrack:\n";
+        if (crossesPixVol)
+          meNofTracksInPixVol_->Fill(1, 1);
+      }
+
+    }  // end loop on map entries
 
-  } // end valid trajectory:
+  }  // end valid trajectory:
 
-  //find clusters that are NOT on track
-  //edmNew::DetSet<SiPixelCluster>::const_iterator  di;
-  if(debug_) std::cout << "clusters not on track: (size " << clustColl.size() << ") ";
+  // find clusters that are NOT on track
+  // edmNew::DetSet<SiPixelCluster>::const_iterator  di;
+  if (debug_)
+    std::cout << "clusters not on track: (size " << clustColl.size() << ") ";
 
-  for(TrackerGeometry::DetContainer::const_iterator it = TG->dets().begin(); it != TG->dets().end(); it++){
-    //if(dynamic_cast<PixelGeomDetUnit const *>((*it))!=0){
+  for (TrackerGeometry::DetContainer::const_iterator it = TG->dets().begin(); it != TG->dets().end(); it++) {
+    // if(dynamic_cast<PixelGeomDetUnit const *>((*it))!=0){
     DetId detId = (*it)->geographicalId();
-    if(detId>=302055684 && detId<=352477708){ // make sure it's a Pixel module WITHOUT using dynamic_cast!  
-      int nofclOnTrack = 0, nofclOffTrack=0; 
-      float z=0.; 
+    if (detId >= 302055684 && detId <= 352477708) {  // make sure it's a Pixel module WITHOUT using
+                                                     // dynamic_cast!
+      int nofclOnTrack = 0, nofclOffTrack = 0;
+      float z = 0.;
       edmNew::DetSetVector<SiPixelCluster>::const_iterator isearch = clustColl.find(detId);
-      if( isearch != clustColl.end() ) {  // Not an empty iterator
-	edmNew::DetSet<SiPixelCluster>::const_iterator  di;
-	for(di=isearch->begin(); di!=isearch->end(); di++){
-	  unsigned int temp = clusterSet.size();
-	  clusterSet.insert(*di);
-	  //check if cluster is off track
-	  if(clusterSet.size()>temp) {
-	    otherclusters++;
-	    nofclOffTrack++; 
-	    //fill histograms for clusters off tracks
-	    //correct SiPixelTrackResidualModule
-	    bool barrel = DetId(detId).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel);
-	    if (barrel) { getrococcupancy(detId,diginp,tTopo,meZeroRocLadvsModOffTrackBarrel); }
-
-	    std::map<uint32_t, SiPixelTrackResidualModule*>::iterator pxd = theSiPixelStructure.find((*it)->geographicalId().rawId());
-
-	    if (pxd!=theSiPixelStructure.end()) (*pxd).second->fill((*di), false, -1., reducedSet, modOn, ladOn, layOn, phiOn, bladeOn, diskOn, ringOn); 
-	    
-
-
-	    meClSizeNotOnTrack_all->Fill((*di).size());
-	    meClSizeXNotOnTrack_all->Fill((*di).sizeX());
-	    meClSizeYNotOnTrack_all->Fill((*di).sizeY());
-	    meClChargeNotOnTrack_all->Fill((*di).charge()/1000);
-
-	    /////////////////////////////////////////////////
-	    //find cluster global position (rphi, z) get cluster
-	    //define tracker and pixel geometry and topology
-	    const TrackerGeometry& theTracker(*theTrackerGeometry);
-	    const PixelGeomDetUnit* theGeomDet = static_cast<const PixelGeomDetUnit*> (theTracker.idToDet(detId) );
-	    //test if PixelGeomDetUnit exists
-	    if(theGeomDet == nullptr) {
-	      if(debug_) std::cout << "NO THEGEOMDET\n";
-	      continue;
-	    }
-	    const PixelTopology * topol = &(theGeomDet->specificTopology());
-	   
-	    //center of gravity (of charge)
-	    float xcenter = di->x();
-	    float ycenter = di->y();
-	    // get the cluster position in local coordinates (cm) 
-	    LocalPoint clustlp = topol->localPosition( MeasurementPoint(xcenter, ycenter) );
-	    // get the cluster position in global coordinates (cm)
-	    GlobalPoint clustgp = theGeomDet->surface().toGlobal( clustlp );
-
-	    /////////////////////////////////////////////////
-
-	    //barrel
-	    if(DetId(detId).subdetId() == 1) {
-	      meClSizeNotOnTrack_bpix->Fill((*di).size());
-	      meClSizeXNotOnTrack_bpix->Fill((*di).sizeX());
-	      meClSizeYNotOnTrack_bpix->Fill((*di).sizeY());
-	      meClChargeNotOnTrack_bpix->Fill((*di).charge()/1000);
-	      barrelotherclusters++;
-	      int DBlayer = PixelBarrelName(DetId(detId), tTopo, isUpgrade).layerName();
-	      float phi = clustgp.phi(); 
-	      //float r = clustgp.perp();
-	      z = clustgp.z();
-         for (int i = 0; i < noOfLayers; i++)
-         {
-           if (DBlayer == i + 1) {
-              meClPosLayersNotOnTrack.at(i)->Fill(z,phi);
-              meClSizeNotOnTrack_layers.at(i)->Fill((*di).size());
-              meClSizeXNotOnTrack_layers.at(i)->Fill((*di).sizeX());
-              meClSizeYNotOnTrack_layers.at(i)->Fill((*di).sizeY());
-              meClChargeNotOnTrack_layers.at(i)->Fill((*di).charge()/1000);
-           }
-         }
-	    }
-	    //endcap
-	    if(DetId(detId).subdetId() == 2) {
-	      meClSizeNotOnTrack_fpix->Fill((*di).size());
-	      meClSizeXNotOnTrack_fpix->Fill((*di).sizeX());
-	      meClSizeYNotOnTrack_fpix->Fill((*di).sizeY());
-	      meClChargeNotOnTrack_fpix->Fill((*di).charge()/1000);
-	      endcapotherclusters++;
-	      int DBdisk = PixelEndcapName(DetId(detId), tTopo, isUpgrade).diskName();
-	      float x = clustgp.x(); 
-	      float y = clustgp.y(); 
-	      z = clustgp.z();
-
-	      getepixrococcupancyofftrk(DetId(detId),tTopo,xcenter,ycenter,z,meRocBladevsDiskEndcapOffTrk);
-
-	      if(z>0){
-           for (int i = 0; i < noOfDisks; i++)
-           {
-             if (DBdisk == i + 1) {
-                meClPosDiskspzNotOnTrack.at(i)->Fill(x,y);
-                meClSizeNotOnTrack_diskps.at(i)->Fill((*di).size());
-                meClSizeXNotOnTrack_diskps.at(i)->Fill((*di).sizeX());
-                meClSizeYNotOnTrack_diskps.at(i)->Fill((*di).sizeY());
-                meClChargeNotOnTrack_diskps.at(i)->Fill((*di).charge()/1000);
-             }
-           }
-	      }
-	      else{
-           for (int i = 0; i < noOfDisks; i++)
-           {
-             if (DBdisk == i + 1) {
-                meClPosDisksmzNotOnTrack.at(i)->Fill(x,y);
-                meClSizeNotOnTrack_diskms.at(i)->Fill((*di).size());
-                meClSizeXNotOnTrack_diskms.at(i)->Fill((*di).sizeX());
-                meClSizeYNotOnTrack_diskms.at(i)->Fill((*di).sizeY());
-                meClChargeNotOnTrack_diskms.at(i)->Fill((*di).charge()/1000);
-             }
-           }
-	      } 
-
-	    }
-	  }// end "if cluster off track"
-	  else {
-	    nofclOnTrack++; 
-	    if(z == 0){
-	      //find cluster global position (rphi, z) get cluster
-	      //define tracker and pixel geometry and topology
-	      const TrackerGeometry& theTracker(*theTrackerGeometry);
-	      const PixelGeomDetUnit* theGeomDet = static_cast<const PixelGeomDetUnit*> (theTracker.idToDet(detId) );
-	      //test if PixelGeomDetUnit exists
-	      if(theGeomDet == nullptr) {
-		if(debug_) std::cout << "NO THEGEOMDET\n";
-		continue;
-	      }
-	      const PixelTopology * topol = &(theGeomDet->specificTopology());
-	      //center of gravity (of charge)
-	      float xcenter = di->x();
-	      float ycenter = di->y();
-	      // get the cluster position in local coordinates (cm) 
-	      LocalPoint clustlp = topol->localPosition( MeasurementPoint(xcenter, ycenter) );
-	      // get the cluster position in global coordinates (cm)
-	      GlobalPoint clustgp = theGeomDet->surface().toGlobal( clustlp );  
-	      z = clustgp.z();
-	    }
-	  }
-	}
+      if (isearch != clustColl.end()) {  // Not an empty iterator
+        edmNew::DetSet<SiPixelCluster>::const_iterator di;
+        for (di = isearch->begin(); di != isearch->end(); di++) {
+          unsigned int temp = clusterSet.size();
+          clusterSet.insert(*di);
+          // check if cluster is off track
+          if (clusterSet.size() > temp) {
+            otherclusters++;
+            nofclOffTrack++;
+            // fill histograms for clusters off tracks
+            // correct SiPixelTrackResidualModule
+            bool barrel = DetId(detId).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel);
+            if (barrel) {
+              getrococcupancy(detId, diginp, tTopo, meZeroRocLadvsModOffTrackBarrel);
+            }
+
+            std::map<uint32_t, SiPixelTrackResidualModule *>::iterator pxd =
+                theSiPixelStructure.find((*it)->geographicalId().rawId());
+
+            if (pxd != theSiPixelStructure.end())
+              (*pxd).second->fill((*di), false, -1., reducedSet, modOn, ladOn, layOn, phiOn, bladeOn, diskOn, ringOn);
+
+            meClSizeNotOnTrack_all->Fill((*di).size());
+            meClSizeXNotOnTrack_all->Fill((*di).sizeX());
+            meClSizeYNotOnTrack_all->Fill((*di).sizeY());
+            meClChargeNotOnTrack_all->Fill((*di).charge() / 1000);
+
+            /////////////////////////////////////////////////
+            // find cluster global position (rphi, z) get cluster
+            // define tracker and pixel geometry and topology
+            const TrackerGeometry &theTracker(*theTrackerGeometry);
+            const PixelGeomDetUnit *theGeomDet = static_cast<const PixelGeomDetUnit *>(theTracker.idToDet(detId));
+            // test if PixelGeomDetUnit exists
+            if (theGeomDet == nullptr) {
+              if (debug_)
+                std::cout << "NO THEGEOMDET\n";
+              continue;
+            }
+            const PixelTopology *topol = &(theGeomDet->specificTopology());
+
+            // center of gravity (of charge)
+            float xcenter = di->x();
+            float ycenter = di->y();
+            // get the cluster position in local coordinates (cm)
+            LocalPoint clustlp = topol->localPosition(MeasurementPoint(xcenter, ycenter));
+            // get the cluster position in global coordinates (cm)
+            GlobalPoint clustgp = theGeomDet->surface().toGlobal(clustlp);
+
+            /////////////////////////////////////////////////
+
+            // barrel
+            if (DetId(detId).subdetId() == 1) {
+              meClSizeNotOnTrack_bpix->Fill((*di).size());
+              meClSizeXNotOnTrack_bpix->Fill((*di).sizeX());
+              meClSizeYNotOnTrack_bpix->Fill((*di).sizeY());
+              meClChargeNotOnTrack_bpix->Fill((*di).charge() / 1000);
+              barrelotherclusters++;
+              int DBlayer = PixelBarrelName(DetId(detId), tTopo, isUpgrade).layerName();
+              float phi = clustgp.phi();
+              // float r = clustgp.perp();
+              z = clustgp.z();
+              for (int i = 0; i < noOfLayers; i++) {
+                if (DBlayer == i + 1) {
+                  meClPosLayersNotOnTrack.at(i)->Fill(z, phi);
+                  meClSizeNotOnTrack_layers.at(i)->Fill((*di).size());
+                  meClSizeXNotOnTrack_layers.at(i)->Fill((*di).sizeX());
+                  meClSizeYNotOnTrack_layers.at(i)->Fill((*di).sizeY());
+                  meClChargeNotOnTrack_layers.at(i)->Fill((*di).charge() / 1000);
+                }
+              }
+            }
+            // endcap
+            if (DetId(detId).subdetId() == 2) {
+              meClSizeNotOnTrack_fpix->Fill((*di).size());
+              meClSizeXNotOnTrack_fpix->Fill((*di).sizeX());
+              meClSizeYNotOnTrack_fpix->Fill((*di).sizeY());
+              meClChargeNotOnTrack_fpix->Fill((*di).charge() / 1000);
+              endcapotherclusters++;
+              int DBdisk = PixelEndcapName(DetId(detId), tTopo, isUpgrade).diskName();
+              float x = clustgp.x();
+              float y = clustgp.y();
+              z = clustgp.z();
+
+              getepixrococcupancyofftrk(DetId(detId), tTopo, xcenter, ycenter, z, meRocBladevsDiskEndcapOffTrk);
+
+              if (z > 0) {
+                for (int i = 0; i < noOfDisks; i++) {
+                  if (DBdisk == i + 1) {
+                    meClPosDiskspzNotOnTrack.at(i)->Fill(x, y);
+                    meClSizeNotOnTrack_diskps.at(i)->Fill((*di).size());
+                    meClSizeXNotOnTrack_diskps.at(i)->Fill((*di).sizeX());
+                    meClSizeYNotOnTrack_diskps.at(i)->Fill((*di).sizeY());
+                    meClChargeNotOnTrack_diskps.at(i)->Fill((*di).charge() / 1000);
+                  }
+                }
+              } else {
+                for (int i = 0; i < noOfDisks; i++) {
+                  if (DBdisk == i + 1) {
+                    meClPosDisksmzNotOnTrack.at(i)->Fill(x, y);
+                    meClSizeNotOnTrack_diskms.at(i)->Fill((*di).size());
+                    meClSizeXNotOnTrack_diskms.at(i)->Fill((*di).sizeX());
+                    meClSizeYNotOnTrack_diskms.at(i)->Fill((*di).sizeY());
+                    meClChargeNotOnTrack_diskms.at(i)->Fill((*di).charge() / 1000);
+                  }
+                }
+              }
+            }
+          }  // end "if cluster off track"
+          else {
+            nofclOnTrack++;
+            if (z == 0) {
+              // find cluster global position (rphi, z) get cluster
+              // define tracker and pixel geometry and topology
+              const TrackerGeometry &theTracker(*theTrackerGeometry);
+              const PixelGeomDetUnit *theGeomDet = static_cast<const PixelGeomDetUnit *>(theTracker.idToDet(detId));
+              // test if PixelGeomDetUnit exists
+              if (theGeomDet == nullptr) {
+                if (debug_)
+                  std::cout << "NO THEGEOMDET\n";
+                continue;
+              }
+              const PixelTopology *topol = &(theGeomDet->specificTopology());
+              // center of gravity (of charge)
+              float xcenter = di->x();
+              float ycenter = di->y();
+              // get the cluster position in local coordinates (cm)
+              LocalPoint clustlp = topol->localPosition(MeasurementPoint(xcenter, ycenter));
+              // get the cluster position in global coordinates (cm)
+              GlobalPoint clustgp = theGeomDet->surface().toGlobal(clustlp);
+              z = clustgp.z();
+            }
+          }
+        }
       }
       //++ fill the number of clusters on a module
-      std::map<uint32_t, SiPixelTrackResidualModule*>::iterator pxd = theSiPixelStructure.find((*it)->geographicalId().rawId());
-      if (pxd!=theSiPixelStructure.end()) (*pxd).second->nfill(nofclOnTrack, nofclOffTrack, reducedSet, modOn, ladOn, layOn, phiOn, bladeOn, diskOn, ringOn); 
-      if(nofclOnTrack!=0) meNClustersOnTrack_all->Fill(nofclOnTrack); 
-      if(nofclOffTrack!=0) meNClustersNotOnTrack_all->Fill(nofclOffTrack); 
-      //barrel
-      if(DetId(detId).subdetId() == 1){
-	if(nofclOnTrack!=0) meNClustersOnTrack_bpix->Fill(nofclOnTrack); 
-	if(nofclOffTrack!=0) meNClustersNotOnTrack_bpix->Fill(nofclOffTrack); 
-	int DBlayer = PixelBarrelName(DetId(detId), tTopo, isUpgrade).layerName();
-        for (int i = 0; i < noOfLayers; i++)
-        {
+      std::map<uint32_t, SiPixelTrackResidualModule *>::iterator pxd =
+          theSiPixelStructure.find((*it)->geographicalId().rawId());
+      if (pxd != theSiPixelStructure.end())
+        (*pxd).second->nfill(
+            nofclOnTrack, nofclOffTrack, reducedSet, modOn, ladOn, layOn, phiOn, bladeOn, diskOn, ringOn);
+      if (nofclOnTrack != 0)
+        meNClustersOnTrack_all->Fill(nofclOnTrack);
+      if (nofclOffTrack != 0)
+        meNClustersNotOnTrack_all->Fill(nofclOffTrack);
+      // barrel
+      if (DetId(detId).subdetId() == 1) {
+        if (nofclOnTrack != 0)
+          meNClustersOnTrack_bpix->Fill(nofclOnTrack);
+        if (nofclOffTrack != 0)
+          meNClustersNotOnTrack_bpix->Fill(nofclOffTrack);
+        int DBlayer = PixelBarrelName(DetId(detId), tTopo, isUpgrade).layerName();
+        for (int i = 0; i < noOfLayers; i++) {
           if (DBlayer == i + 1) {
-             if(nofclOnTrack!=0) meNClustersOnTrack_layers.at(i)->Fill(nofclOnTrack);
-             if(nofclOffTrack!=0) meNClustersNotOnTrack_layers.at(i)->Fill(nofclOffTrack);
+            if (nofclOnTrack != 0)
+              meNClustersOnTrack_layers.at(i)->Fill(nofclOnTrack);
+            if (nofclOffTrack != 0)
+              meNClustersNotOnTrack_layers.at(i)->Fill(nofclOffTrack);
+          }
+        }
+      }  // end barrel
+      // endcap
+      if (DetId(detId).subdetId() == 2) {
+        int DBdisk = PixelEndcapName(DetId(detId)).diskName();
+        // z = clustgp.z();
+        if (nofclOnTrack != 0)
+          meNClustersOnTrack_fpix->Fill(nofclOnTrack);
+        if (nofclOffTrack != 0)
+          meNClustersNotOnTrack_fpix->Fill(nofclOffTrack);
+        if (z > 0) {
+          for (int i = 0; i < noOfDisks; i++) {
+            if (DBdisk == i + 1) {
+              if (nofclOnTrack != 0)
+                meNClustersOnTrack_diskps.at(i)->Fill(nofclOnTrack);
+              if (nofclOffTrack != 0)
+                meNClustersNotOnTrack_diskps.at(i)->Fill(nofclOffTrack);
+            }
+          }
+        }
+        if (z < 0) {
+          for (int i = 0; i < noOfDisks; i++) {
+            if (DBdisk == i + 1) {
+              if (nofclOnTrack != 0)
+                meNClustersOnTrack_diskms.at(i)->Fill(nofclOnTrack);
+              if (nofclOffTrack != 0)
+                meNClustersNotOnTrack_diskms.at(i)->Fill(nofclOffTrack);
+            }
           }
         }
-      }//end barrel
-      //endcap
-      if(DetId(detId).subdetId() == 2) {
-	int DBdisk = PixelEndcapName(DetId(detId )).diskName();
-	//z = clustgp.z();
-	if(nofclOnTrack!=0) meNClustersOnTrack_fpix->Fill(nofclOnTrack); 
-	if(nofclOffTrack!=0) meNClustersNotOnTrack_fpix->Fill(nofclOffTrack);
-	if(z>0){
-     for (int i = 0; i < noOfDisks; i++)
-     {
-       if (DBdisk == i + 1) {
-          if(nofclOnTrack!=0) meNClustersOnTrack_diskps.at(i)->Fill(nofclOnTrack);
-          if(nofclOffTrack!=0) meNClustersNotOnTrack_diskps.at(i)->Fill(nofclOffTrack);
-       }
-     }
-	}
-	if(z<0){
-     for (int i = 0; i < noOfDisks; i++)
-     {
-       if (DBdisk == i + 1) {
-         if(nofclOnTrack!=0) meNClustersOnTrack_diskms.at(i)->Fill(nofclOnTrack);
-         if(nofclOffTrack!=0) meNClustersNotOnTrack_diskms.at(i)->Fill(nofclOffTrack);
-       }
-     }
-	}
       }
 
-    }//end if it's a Pixel module
-  }//end for loop over tracker detector geometry modules
-
-  if(trackclusters>0) (meNofClustersOnTrack_)->Fill(0,trackclusters);
-  if(barreltrackclusters>0)(meNofClustersOnTrack_)->Fill(1,barreltrackclusters);
-  if(endcaptrackclusters>0)(meNofClustersOnTrack_)->Fill(2,endcaptrackclusters);
-  if(otherclusters>0)(meNofClustersNotOnTrack_)->Fill(0,otherclusters);
-  if(barrelotherclusters>0)(meNofClustersNotOnTrack_)->Fill(1,barrelotherclusters);
-  if(endcapotherclusters>0)(meNofClustersNotOnTrack_)->Fill(2,endcapotherclusters);
-  if(tracks>0)(meNofTracks_)->Fill(0,tracks);
-  if(pixeltracks>0)(meNofTracks_)->Fill(1,pixeltracks);
-  if(bpixtracks>0)(meNofTracks_)->Fill(2,bpixtracks);
-  if(fpixtracks>0)(meNofTracks_)->Fill(3,fpixtracks);
+    }  // end if it's a Pixel module
+  }    // end for loop over tracker detector geometry modules
+
+  if (trackclusters > 0)
+    (meNofClustersOnTrack_)->Fill(0, trackclusters);
+  if (barreltrackclusters > 0)
+    (meNofClustersOnTrack_)->Fill(1, barreltrackclusters);
+  if (endcaptrackclusters > 0)
+    (meNofClustersOnTrack_)->Fill(2, endcaptrackclusters);
+  if (otherclusters > 0)
+    (meNofClustersNotOnTrack_)->Fill(0, otherclusters);
+  if (barrelotherclusters > 0)
+    (meNofClustersNotOnTrack_)->Fill(1, barrelotherclusters);
+  if (endcapotherclusters > 0)
+    (meNofClustersNotOnTrack_)->Fill(2, endcapotherclusters);
+  if (tracks > 0)
+    (meNofTracks_)->Fill(0, tracks);
+  if (pixeltracks > 0)
+    (meNofTracks_)->Fill(1, pixeltracks);
+  if (bpixtracks > 0)
+    (meNofTracks_)->Fill(2, bpixtracks);
+  if (fpixtracks > 0)
+    (meNofTracks_)->Fill(3, fpixtracks);
 }
 
-void SiPixelTrackResidualSource::getrococcupancy(DetId detId,const edm::DetSetVector<PixelDigi> & diginp,const TrackerTopology* tTopo,std::vector<MonitorElement*> meinput) {
-
+void SiPixelTrackResidualSource::getrococcupancy(DetId detId,
+                                                 const edm::DetSetVector<PixelDigi> &diginp,
+                                                 const TrackerTopology *tTopo,
+                                                 std::vector<MonitorElement *> meinput) {
   edm::DetSetVector<PixelDigi>::const_iterator ipxsearch = diginp.find(detId);
-  if( ipxsearch != diginp.end() ) {
-
+  if (ipxsearch != diginp.end()) {
     // Look at digis now
-    edm::DetSet<PixelDigi>::const_iterator  pxdi;
+    edm::DetSet<PixelDigi>::const_iterator pxdi;
     for (pxdi = ipxsearch->begin(); pxdi != ipxsearch->end(); pxdi++) {
-
-      bool isHalfModule = PixelBarrelName(DetId(detId),tTopo,isUpgrade).isHalfModule();
-      int  DBlayer      = PixelBarrelName(DetId(detId),tTopo,isUpgrade).layerName();
-      int  DBmodule     = PixelBarrelName(DetId(detId),tTopo,isUpgrade).moduleName();
-      int  DBladder     = PixelBarrelName(DetId(detId),tTopo,isUpgrade).ladderName();
-      int  DBshell      = PixelBarrelName(DetId(detId),tTopo,isUpgrade).shell();
+      bool isHalfModule = PixelBarrelName(DetId(detId), tTopo, isUpgrade).isHalfModule();
+      int DBlayer = PixelBarrelName(DetId(detId), tTopo, isUpgrade).layerName();
+      int DBmodule = PixelBarrelName(DetId(detId), tTopo, isUpgrade).moduleName();
+      int DBladder = PixelBarrelName(DetId(detId), tTopo, isUpgrade).ladderName();
+      int DBshell = PixelBarrelName(DetId(detId), tTopo, isUpgrade).shell();
 
       // add sign to the modules
-      if (DBshell==1 || DBshell==2) { DBmodule = -DBmodule; }
-      if (DBshell==1 || DBshell==3) { DBladder = -DBladder; }
+      if (DBshell == 1 || DBshell == 2) {
+        DBmodule = -DBmodule;
+      }
+      if (DBshell == 1 || DBshell == 3) {
+        DBladder = -DBladder;
+      }
 
       int col = pxdi->column();
       int row = pxdi->row();
 
-      float modsign = (float)DBmodule/(abs((float)DBmodule));
-      float ladsign = (float)DBladder/(abs((float)DBladder));
-      float rocx = ((float)col/(52.*8.))*modsign + ((float)DBmodule-(modsign)*0.5);
-      float rocy = ((float)row/(80.*2.))*ladsign + ((float)DBladder-(ladsign)*0.5);
+      float modsign = (float)DBmodule / (abs((float)DBmodule));
+      float ladsign = (float)DBladder / (abs((float)DBladder));
+      float rocx = ((float)col / (52. * 8.)) * modsign + ((float)DBmodule - (modsign)*0.5);
+      float rocy = ((float)row / (80. * 2.)) * ladsign + ((float)DBladder - (ladsign)*0.5);
 
       // do the flip where need
-      bool flip    = false;
-      if ( (DBladder%2==0) && (!isHalfModule) ) { flip = true; }
-      if ((flip) && (DBladder>0)) {
-        if      ( ( ((float)DBladder-(ladsign)*0.5)<=rocy) && (rocy<(float)DBladder))    { rocy = rocy + ladsign*0.5; }
-        else if ( ( ((float)DBladder)<=rocy) && (rocy<((float)DBladder+(ladsign)*0.5)) ) { rocy = rocy - ladsign*0.5; }
+      bool flip = false;
+      if ((DBladder % 2 == 0) && (!isHalfModule)) {
+        flip = true;
+      }
+      if ((flip) && (DBladder > 0)) {
+        if ((((float)DBladder - (ladsign)*0.5) <= rocy) && (rocy < (float)DBladder)) {
+          rocy = rocy + ladsign * 0.5;
+        } else if ((((float)DBladder) <= rocy) && (rocy < ((float)DBladder + (ladsign)*0.5))) {
+          rocy = rocy - ladsign * 0.5;
+        }
       }
 
       // tweak border effect for negative modules/ladders
-      if (modsign<0) { rocx = rocx -0.0001; }
-      if (ladsign<0) { rocy = rocy -0.0001; } else { rocy = rocy +0.0001; }
-      if (abs(DBladder)==1) { rocy = rocy + ladsign*0.5; } //take care of the half module
-
-      if (DBlayer==1) { meinput.at(0)->Fill(rocx,rocy); }
-      if (DBlayer==2) { meinput.at(1)->Fill(rocx,rocy); }
-      if (DBlayer==3) { meinput.at(2)->Fill(rocx,rocy); }
-    } // end of looping over pxdi
+      if (modsign < 0) {
+        rocx = rocx - 0.0001;
+      }
+      if (ladsign < 0) {
+        rocy = rocy - 0.0001;
+      } else {
+        rocy = rocy + 0.0001;
+      }
+      if (abs(DBladder) == 1) {
+        rocy = rocy + ladsign * 0.5;
+      }  // take care of the half module
+
+      if (DBlayer == 1) {
+        meinput.at(0)->Fill(rocx, rocy);
+      }
+      if (DBlayer == 2) {
+        meinput.at(1)->Fill(rocx, rocy);
+      }
+      if (DBlayer == 3) {
+        meinput.at(2)->Fill(rocx, rocy);
+      }
+    }  // end of looping over pxdi
   }
 }
 
+void SiPixelTrackResidualSource::triplets(double x1,
+                                          double y1,
+                                          double z1,
+                                          double x2,
+                                          double y2,
+                                          double z2,
+                                          double x3,
+                                          double y3,
+                                          double z3,
+                                          double ptsig,
+                                          double &dca2,
+                                          double &dz2,
+                                          double kap) {
+  // Define some constants
+  using namespace std;
 
+  // Curvature kap from global Track
 
-void SiPixelTrackResidualSource::triplets(double x1,double y1,double z1,double x2,double y2,double z2,double x3,double y3,double z3,
-					  double ptsig, double & dca2,double & dz2, double kap) {
-  
-  //Define some constants
-  using namespace std;
+  // inverse of the curvature is the radius in the transverse plane
+  double rho = 1 / kap;
+  // Check that the hits are in the correct layers
+  double r1 = sqrt(x1 * x1 + y1 * y1);
+  double r3 = sqrt(x3 * x3 + y3 * y3);
 
-  //Curvature kap from global Track
-
- //inverse of the curvature is the radius in the transverse plane
-  double rho = 1/kap;
-  //Check that the hits are in the correct layers
-  double r1 = sqrt( x1*x1 + y1*y1 );
-  double r3 = sqrt( x3*x3 + y3*y3 );
-
-  if( r3-r1 < 2.0 ) cout << "warn r1 = " << r1 << ", r3 = " << r3 << endl;
-  
-  // Calculate the centre of the helix in xy-projection with radius rho from the track.
-  //start with a line (sekante) connecting the two points (x1,y1) and (x3,y3) vec_L = vec_x3-vec_x1
-  //with L being the length of that vector.
-  double L=sqrt((x3-x1)*(x3-x1)+(y3-y1)*(y3-y1));
-  //lam is the line from the middel point of vec_q towards the center of the circle X0,Y0
+  if (r3 - r1 < 2.0)
+    cout << "warn r1 = " << r1 << ", r3 = " << r3 << endl;
+
+  // Calculate the centre of the helix in xy-projection with radius rho from the
+  // track.
+  // start with a line (sekante) connecting the two points (x1,y1) and (x3,y3)
+  // vec_L = vec_x3-vec_x1 with L being the length of that vector.
+  double L = sqrt((x3 - x1) * (x3 - x1) + (y3 - y1) * (y3 - y1));
+  // lam is the line from the middel point of vec_q towards the center of the
+  // circle X0,Y0
   // we already have kap and rho = 1/kap
-  double lam = sqrt(rho*rho - L*L/4);
-  
+  double lam = sqrt(rho * rho - L * L / 4);
+
   // There are two solutions, the sign of kap gives the information
   // which of them is correct.
   //
-  if( kap > 0 ) lam = -lam;
+  if (kap > 0)
+    lam = -lam;
 
   //
-  // ( X0, Y0 ) is the centre of the circle that describes the helix in xy-projection.
+  // ( X0, Y0 ) is the centre of the circle that describes the helix in
+  // xy-projection.
   //
-  double x0 =  0.5*( x1 + x3 ) + lam/L * ( -y1 + y3 );
-  double y0 =  0.5*( y1 + y3 ) + lam/L * (  x1 - x3 );
+  double x0 = 0.5 * (x1 + x3) + lam / L * (-y1 + y3);
+  double y0 = 0.5 * (y1 + y3) + lam / L * (x1 - x3);
 
   // Calculate the dipangle in z direction (needed later for z residual) :
-  //Starting from the heliz equation whihc has to hold for both points z1,z3
-  double num = ( y3 - y0 ) * ( x1 - x0 ) - ( x3 - x0 ) * ( y1 - y0 );
-  double den = ( x1 - x0 ) * ( x3 - x0 ) + ( y1 - y0 ) * ( y3 - y0 );
-  double tandip = kap * ( z3 - z1 ) / atan( num / den );
+  // Starting from the heliz equation whihc has to hold for both points z1,z3
+  double num = (y3 - y0) * (x1 - x0) - (x3 - x0) * (y1 - y0);
+  double den = (x1 - x0) * (x3 - x0) + (y1 - y0) * (y3 - y0);
+  double tandip = kap * (z3 - z1) / atan(num / den);
 
- 
   // angle from first hit to dca point:
   //
-  double dphi = atan( ( ( x1 - x0 ) * y0 - ( y1 - y0 ) * x0 )
-                      / ( ( x1 - x0 ) * x0 + ( y1 - y0 ) * y0 ) );
-  //z position of the track based on the middle of the circle
-  //track equation for the z component
+  double dphi = atan(((x1 - x0) * y0 - (y1 - y0) * x0) / ((x1 - x0) * x0 + (y1 - y0) * y0));
+  // z position of the track based on the middle of the circle
+  // track equation for the z component
   double uz0 = z1 + tandip * dphi * rho;
 
   /////////////////////////
-  //RESIDUAL IN R-PHI
+  // RESIDUAL IN R-PHI
   ////////////////////////////////
-  //Calculate distance dca2 from point (x2,y2) to the circle which is given by
-  //the distance of the point to the middlepoint dcM = sqrt((x0-x2)^2+(y0-y2)) and rho
-  //dca = rho +- dcM
-  if(kap>0) dca2=rho-sqrt((x0-x2)*(x0-x2)+(y0-y2)*(y0-y2));
-  else dca2=rho+sqrt((-x0+x2)*(-x0+x2)+(-y0+y2)*(-y0+y2));
+  // Calculate distance dca2 from point (x2,y2) to the circle which is given by
+  // the distance of the point to the middlepoint dcM = sqrt((x0-x2)^2+(y0-y2))
+  // and rho dca = rho +- dcM
+  if (kap > 0)
+    dca2 = rho - sqrt((x0 - x2) * (x0 - x2) + (y0 - y2) * (y0 - y2));
+  else
+    dca2 = rho + sqrt((-x0 + x2) * (-x0 + x2) + (-y0 + y2) * (-y0 + y2));
 
   /////////////////////////
-  //RESIDUAL IN Z
+  // RESIDUAL IN Z
   /////////////////////////
-  double xx =0 ;
-  double yy =0 ;
-  //sign of kappa determines the calculation
-  //xx and yy are the new coordinates starting from x2, y2 that are on the track itself
-  //vec_X2+-dca2*vec(X0-X2)/|(X0-X2)|
-  if(kap<0){
-    xx =   x2+(dca2*((x0-x2))/sqrt((x0-x2)*(x0-x2)+(y0-y2)*(y0-y2)));
-    yy = y2+(dca2*((y0-y2))/sqrt((x0-x2)*(x0-x2)+(y0-y2)*(y0-y2)));
-  }
-  else if(kap>=0){
-    xx =   x2-(dca2*((x0-x2))/sqrt((x0-x2)*(x0-x2)+(y0-y2)*(y0-y2)));
-    yy = y2-(dca2*((y0-y2))/sqrt((x0-x2)*(x0-x2)+(y0-y2)*(y0-y2)));
+  double xx = 0;
+  double yy = 0;
+  // sign of kappa determines the calculation
+  // xx and yy are the new coordinates starting from x2, y2 that are on the
+  // track itself vec_X2+-dca2*vec(X0-X2)/|(X0-X2)|
+  if (kap < 0) {
+    xx = x2 + (dca2 * ((x0 - x2)) / sqrt((x0 - x2) * (x0 - x2) + (y0 - y2) * (y0 - y2)));
+    yy = y2 + (dca2 * ((y0 - y2)) / sqrt((x0 - x2) * (x0 - x2) + (y0 - y2) * (y0 - y2)));
+  } else if (kap >= 0) {
+    xx = x2 - (dca2 * ((x0 - x2)) / sqrt((x0 - x2) * (x0 - x2) + (y0 - y2) * (y0 - y2)));
+    yy = y2 - (dca2 * ((y0 - y2)) / sqrt((x0 - x2) * (x0 - x2) + (y0 - y2) * (y0 - y2)));
   }
 
-  //to get residual in z start with calculating the new uz2 position if one has moved to xx, yy
-  //on the track. First calculate the change in phi2 with respect to the center X0, Y0
-  double dphi2 = atan( ( ( xx - x0 ) * y0 - ( yy - y0 ) * x0 )
-		       / ( ( xx - x0 ) * x0 + ( yy - y0 ) * y0 ) );
-  //Solve track equation for this new z depending on the dip angle of the track (see above
-  //calculated based on X1, X3 and X0, use uz0 as reference point again.
-  double  uz2= uz0 - dphi2*tandip*rho;
-  
-  //subtract new z position from the old one
-  dz2=z2-uz2;
-  
-  //if we are interested in the arclength this is unsigned though
+  // to get residual in z start with calculating the new uz2 position if one has
+  // moved to xx, yy on the track. First calculate the change in phi2 with
+  // respect to the center X0, Y0
+  double dphi2 = atan(((xx - x0) * y0 - (yy - y0) * x0) / ((xx - x0) * x0 + (yy - y0) * y0));
+  // Solve track equation for this new z depending on the dip angle of the track
+  // (see above calculated based on X1, X3 and X0, use uz0 as reference point
+  // again.
+  double uz2 = uz0 - dphi2 * tandip * rho;
+
+  // subtract new z position from the old one
+  dz2 = z2 - uz2;
+
+  // if we are interested in the arclength this is unsigned though
   //  double cosphi2 = (x2*xx+y2*yy)/(sqrt(x2*x2+y2*y2)*sqrt(xx*xx+yy*yy));
-  //double arcdca2=sqrt(x2*x2+y2*y2)*acos(cosphi2);
-  
+  // double arcdca2=sqrt(x2*x2+y2*y2)*acos(cosphi2);
 }
 
-
-void SiPixelTrackResidualSource::getepixrococcupancyontrk(const TrackerTopology* tTopo, TransientTrackingRecHit::ConstRecHitPointer hit, 
-							  float xclust, float yclust, float z, MonitorElement* meinput) {
-  
-  int pxfpanel     = tTopo->pxfPanel((*hit).geographicalId());
-  int pxfmodule    = tTopo->pxfModule((*hit).geographicalId());
-  int pxfdisk      = tTopo->pxfDisk((*hit).geographicalId());
+void SiPixelTrackResidualSource::getepixrococcupancyontrk(const TrackerTopology *tTopo,
+                                                          TransientTrackingRecHit::ConstRecHitPointer hit,
+                                                          float xclust,
+                                                          float yclust,
+                                                          float z,
+                                                          MonitorElement *meinput) {
+  int pxfpanel = tTopo->pxfPanel((*hit).geographicalId());
+  int pxfmodule = tTopo->pxfModule((*hit).geographicalId());
+  int pxfdisk = tTopo->pxfDisk((*hit).geographicalId());
   int pxfblade_off = tTopo->pxfBlade((*hit).geographicalId());
-  
+
   // translate to online conventions
   // each EPIX disk is split in 2 half-disk - each one consists of 12 blades
   // in offline: blades num 0->24; here translate numbering to online convetion
@@ -1607,65 +1807,85 @@ void SiPixelTrackResidualSource::getepixrococcupancyontrk(const TrackerTopology*
   // front (rear) pannel: 3 (4) plaquettes
   // number of ROCs in each plaquette depends on the position on the panel
   // each ROC has 80x52 pixel cells
-  if (z<0.) { pxfdisk  = -1.*pxfdisk; }
+  if (z < 0.) {
+    pxfdisk = -1. * pxfdisk;
+  }
   int pxfblade = -99;
-  if (pxfblade_off<=6 && pxfblade_off>=1)        { pxfblade = 7-pxfblade_off;  }
-  else if (pxfblade_off<=18 && pxfblade_off>=7)  { pxfblade = 6-pxfblade_off;  }
-  else if (pxfblade_off<=24 && pxfblade_off>=19) { pxfblade = 31-pxfblade_off; }
- 
-  int clu_sdpx = ((pxfdisk>0) ? 1 : -1) * (2 * (abs(pxfdisk) - 1) + pxfpanel);
-  int binselx = (pxfpanel==1&&(pxfmodule==1||pxfmodule==4)) ? (pxfmodule==1) : ((pxfpanel==1&& xclust<80.0)||(pxfpanel==2&&xclust>=80.0));
+  if (pxfblade_off <= 6 && pxfblade_off >= 1) {
+    pxfblade = 7 - pxfblade_off;
+  } else if (pxfblade_off <= 18 && pxfblade_off >= 7) {
+    pxfblade = 6 - pxfblade_off;
+  } else if (pxfblade_off <= 24 && pxfblade_off >= 19) {
+    pxfblade = 31 - pxfblade_off;
+  }
+
+  int clu_sdpx = ((pxfdisk > 0) ? 1 : -1) * (2 * (abs(pxfdisk) - 1) + pxfpanel);
+  int binselx = (pxfpanel == 1 && (pxfmodule == 1 || pxfmodule == 4))
+                    ? (pxfmodule == 1)
+                    : ((pxfpanel == 1 && xclust < 80.0) || (pxfpanel == 2 && xclust >= 80.0));
   int nperpan = 2 * pxfmodule + pxfpanel - 1 + binselx;
-  int clu_roc_binx = ((pxfdisk>0) ? nperpan : 9 - nperpan) + (clu_sdpx + 4) * 8 - 2 * ((abs(pxfdisk)==1) ? pxfdisk : 0);
-  
+  int clu_roc_binx =
+      ((pxfdisk > 0) ? nperpan : 9 - nperpan) + (clu_sdpx + 4) * 8 - 2 * ((abs(pxfdisk) == 1) ? pxfdisk : 0);
+
   int clu_roc_biny = -99.;
   int nrocly = pxfmodule + pxfpanel;
-  for (int i=0; i<nrocly; i++) {
-    int j = (pxfdisk<0) ? i : nrocly - 1 - i;
-    if (yclust>=(j*52.0)&& yclust<((j+1)*52.0))
-      clu_roc_biny = 6 - nrocly + 2 * i + ((pxfblade>0) ? pxfblade-1 : pxfblade + 12)*12 + 1;
+  for (int i = 0; i < nrocly; i++) {
+    int j = (pxfdisk < 0) ? i : nrocly - 1 - i;
+    if (yclust >= (j * 52.0) && yclust < ((j + 1) * 52.0))
+      clu_roc_biny = 6 - nrocly + 2 * i + ((pxfblade > 0) ? pxfblade - 1 : pxfblade + 12) * 12 + 1;
+  }
+  if (pxfblade > 0) {
+    clu_roc_biny = clu_roc_biny + 144;
   }
-  if (pxfblade>0) { clu_roc_biny = clu_roc_biny+144; }
- 
-  meinput->setBinContent(clu_roc_binx,clu_roc_biny, meinput->getBinContent(clu_roc_binx,clu_roc_biny)+1);
-  meinput->setBinContent(clu_roc_binx,clu_roc_biny+1, meinput->getBinContent(clu_roc_binx,clu_roc_biny+1)+1);
+
+  meinput->setBinContent(clu_roc_binx, clu_roc_biny, meinput->getBinContent(clu_roc_binx, clu_roc_biny) + 1);
+  meinput->setBinContent(clu_roc_binx, clu_roc_biny + 1, meinput->getBinContent(clu_roc_binx, clu_roc_biny + 1) + 1);
 }
 
+void SiPixelTrackResidualSource::getepixrococcupancyofftrk(
+    DetId detId, const TrackerTopology *tTopo, float xclust, float yclust, float z, MonitorElement *meinput) {
+  PXFDetId pxfid = PXFDetId(detId);
 
-void SiPixelTrackResidualSource::getepixrococcupancyofftrk(DetId detId, const TrackerTopology* tTopo, 
-							   float xclust, float yclust, float z, MonitorElement* meinput) {
-  
-  PXFDetId pxfid=PXFDetId(detId);
-  
-  //int pxfside   = PixelEndcapName(detId,tTopo,isUpgrade).halfCylinder();
-  int pxfpanel  = pxfid.panel();
+  // int pxfside   = PixelEndcapName(detId,tTopo,isUpgrade).halfCylinder();
+  int pxfpanel = pxfid.panel();
   int pxfmodule = pxfid.module();
-  int pxfdisk   = pxfid.disk();
+  int pxfdisk = pxfid.disk();
   int pxfblade_off = pxfid.blade();
-  
-  if (z<0.) { pxfdisk  = -1.*pxfdisk; }
-  
+
+  if (z < 0.) {
+    pxfdisk = -1. * pxfdisk;
+  }
+
   int pxfblade = -99;
-  if (pxfblade_off<=6 && pxfblade_off>=1)        { pxfblade = 7-pxfblade_off;  }
-  else if (pxfblade_off<=18 && pxfblade_off>=7)  { pxfblade = 6-pxfblade_off;  }
-  else if (pxfblade_off<=24 && pxfblade_off>=19) { pxfblade = 31-pxfblade_off; }
-  
-  int clu_sdpx = ((pxfdisk>0) ? 1 : -1) * (2 * (abs(pxfdisk) - 1) + pxfpanel);
-  int binselx = (pxfpanel==1&&(pxfmodule==1||pxfmodule==4)) ? (pxfmodule==1) : ((pxfpanel==1&& xclust<80.0)||(pxfpanel==2&&xclust>=80.0));
+  if (pxfblade_off <= 6 && pxfblade_off >= 1) {
+    pxfblade = 7 - pxfblade_off;
+  } else if (pxfblade_off <= 18 && pxfblade_off >= 7) {
+    pxfblade = 6 - pxfblade_off;
+  } else if (pxfblade_off <= 24 && pxfblade_off >= 19) {
+    pxfblade = 31 - pxfblade_off;
+  }
+
+  int clu_sdpx = ((pxfdisk > 0) ? 1 : -1) * (2 * (abs(pxfdisk) - 1) + pxfpanel);
+  int binselx = (pxfpanel == 1 && (pxfmodule == 1 || pxfmodule == 4))
+                    ? (pxfmodule == 1)
+                    : ((pxfpanel == 1 && xclust < 80.0) || (pxfpanel == 2 && xclust >= 80.0));
   int nperpan = 2 * pxfmodule + pxfpanel - 1 + binselx;
-  int clu_roc_binx = ((pxfdisk>0) ? nperpan : 9 - nperpan) + (clu_sdpx + 4) * 8 - 2 * ((abs(pxfdisk)==1) ? pxfdisk : 0);
-  
+  int clu_roc_binx =
+      ((pxfdisk > 0) ? nperpan : 9 - nperpan) + (clu_sdpx + 4) * 8 - 2 * ((abs(pxfdisk) == 1) ? pxfdisk : 0);
+
   int clu_roc_biny = -99.;
   int nrocly = pxfmodule + pxfpanel;
-  for (int i=0; i<nrocly; i++) {
-    int j = (pxfdisk<0) ? i : nrocly - 1 - i;
-    if (yclust>=(j*52.0)&& yclust<((j+1)*52.0))
-      clu_roc_biny = 6 - nrocly + 2 * i + ((pxfblade>0) ? pxfblade-1 : pxfblade + 12)*12 + 1;
+  for (int i = 0; i < nrocly; i++) {
+    int j = (pxfdisk < 0) ? i : nrocly - 1 - i;
+    if (yclust >= (j * 52.0) && yclust < ((j + 1) * 52.0))
+      clu_roc_biny = 6 - nrocly + 2 * i + ((pxfblade > 0) ? pxfblade - 1 : pxfblade + 12) * 12 + 1;
   }
-  if (pxfblade>0) { clu_roc_biny = clu_roc_biny+144; }
-  
-  meinput->setBinContent(clu_roc_binx,clu_roc_biny, meinput->getBinContent(clu_roc_binx,clu_roc_biny)+1);
-  meinput->setBinContent(clu_roc_binx,clu_roc_biny+1, meinput->getBinContent(clu_roc_binx,clu_roc_biny+1)+1);
+  if (pxfblade > 0) {
+    clu_roc_biny = clu_roc_biny + 144;
+  }
+
+  meinput->setBinContent(clu_roc_binx, clu_roc_biny, meinput->getBinContent(clu_roc_binx, clu_roc_biny) + 1);
+  meinput->setBinContent(clu_roc_binx, clu_roc_biny + 1, meinput->getBinContent(clu_roc_binx, clu_roc_biny + 1) + 1);
 }
 
-DEFINE_FWK_MODULE(SiPixelTrackResidualSource); // define this as a plug-in 
+DEFINE_FWK_MODULE(SiPixelTrackResidualSource);  // define this as a plug-in
diff --git a/DQM/SiPixelPhase1Config/test/pixelphase1_dqm_sourceclient-live_cfg.py b/DQM/SiPixelPhase1Config/test/pixelphase1_dqm_sourceclient-live_cfg.py
index a7226dc7c9a8b..54f6fb6859059 100644
--- a/DQM/SiPixelPhase1Config/test/pixelphase1_dqm_sourceclient-live_cfg.py
+++ b/DQM/SiPixelPhase1Config/test/pixelphase1_dqm_sourceclient-live_cfg.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('PIXELDQMDEV',eras.Run2_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process('PIXELDQMDEV',Run2_2017)
 
 process.MessageLogger = cms.Service("MessageLogger",
     debugModules = cms.untracked.vstring( 
diff --git a/DQM/SiPixelPhase1Config/test/pixelphase1_for_timing_scan_dqm_sourceclient-live_cfg.py b/DQM/SiPixelPhase1Config/test/pixelphase1_for_timing_scan_dqm_sourceclient-live_cfg.py
index 5ce5a7965cf3f..a20ee053c7a6c 100644
--- a/DQM/SiPixelPhase1Config/test/pixelphase1_for_timing_scan_dqm_sourceclient-live_cfg.py
+++ b/DQM/SiPixelPhase1Config/test/pixelphase1_for_timing_scan_dqm_sourceclient-live_cfg.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('PIXELDQMDEV',eras.Run2_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process('PIXELDQMDEV',Run2_2017)
 
 process.MessageLogger = cms.Service("MessageLogger",
     debugModules = cms.untracked.vstring( 
diff --git a/DQM/SiStripCommissioningClients/interface/CommissioningHistograms.h b/DQM/SiStripCommissioningClients/interface/CommissioningHistograms.h
index a4095a7f6b7b8..1388773bbf3ff 100644
--- a/DQM/SiStripCommissioningClients/interface/CommissioningHistograms.h
+++ b/DQM/SiStripCommissioningClients/interface/CommissioningHistograms.h
@@ -80,10 +80,6 @@ class CommissioningHistograms {
   static void copyCustomInformation( DQMStore* const,
 				     const std::vector<std::string>& );
   
-  /** Retrieves list of histograms in form of strings. */
-  static void getContents( DQMStore* const,
-			   std::vector<std::string>& );
-  
   void extractHistograms( const std::vector<std::string>& );
 
   // DEPRECATE
diff --git a/DQM/SiStripCommissioningClients/src/CommissioningHistograms.cc b/DQM/SiStripCommissioningClients/src/CommissioningHistograms.cc
index 08c70b3fab155..6ee1d1d39cdd7 100644
--- a/DQM/SiStripCommissioningClients/src/CommissioningHistograms.cc
+++ b/DQM/SiStripCommissioningClients/src/CommissioningHistograms.cc
@@ -248,12 +248,6 @@ sistrip::RunType CommissioningHistograms::runType( DQMStore* const bei,
 
 }
 
-// -----------------------------------------------------------------------------
-// Temporary fix: builds a list of histogram directories
-void CommissioningHistograms::getContents( DQMStore* const bei,
-					   std::vector<std::string>& contents ) {  
-}
-
 // -----------------------------------------------------------------------------
 //
 void CommissioningHistograms::copyCustomInformation( DQMStore* const bei,
diff --git a/DQM/SiStripCommissioningDbClients/interface/SamplingHistosUsingDb.h b/DQM/SiStripCommissioningDbClients/interface/SamplingHistosUsingDb.h
deleted file mode 100644
index de4fb3ffc82f7..0000000000000
--- a/DQM/SiStripCommissioningDbClients/interface/SamplingHistosUsingDb.h
+++ /dev/null
@@ -1,33 +0,0 @@
-
-#ifndef DQM_SiStripCommissioningClients_SamplingHistosUsingDb_H
-#define DQM_SiStripCommissioningClients_SamplingHistosUsingDb_H
-
-#include "DQM/SiStripCommissioningClients/interface/SamplingHistograms.h"
-#include "DQM/SiStripCommissioningDbClients/interface/CommissioningHistosUsingDb.h"
-#include "OnlineDB/SiStripConfigDb/interface/SiStripConfigDb.h"
-#include <boost/cstdint.hpp>
-#include <string>
-#include <map>
-
-class SamplingHistosUsingDb : public CommissioningHistosUsingDb, public SamplingHistograms {
-  
- public:
-  
-  SamplingHistosUsingDb( const edm::ParameterSet & pset,
-                         DaqMonitorBEInterface*,
-                         SiStripConfigDb* const );
-
-  virtual ~SamplingHistosUsingDb();
-
-  virtual void uploadConfigurations();
-  
- private:
-  
-  void update( SiStripConfigDb::DeviceDescriptions& );
-  
-  void create( SiStripConfigDb::AnalysisDescriptionsV&, Analysis );
-  
-};
-
-#endif // DQM_SiStripCommissioningClients_SamplingHistosUsingDb_H
-
diff --git a/DQM/SiStripHistoricInfoClient/interface/HDQMInspectorConfigSiStrip.h b/DQM/SiStripHistoricInfoClient/interface/HDQMInspectorConfigSiStrip.h
index 5e347188986d0..50718eeb3438f 100644
--- a/DQM/SiStripHistoricInfoClient/interface/HDQMInspectorConfigSiStrip.h
+++ b/DQM/SiStripHistoricInfoClient/interface/HDQMInspectorConfigSiStrip.h
@@ -1,16 +1,14 @@
 #ifndef GUARD_HDQMInspectorConfigSiStrip_h
 #define GUARD_HDQMInspectorConfigSiStrip_h
 
-#include <string>
 #include <cstdint>
+#include <string>
 
 #include "DQMServices/Diagnostic/interface/HDQMInspectorConfigBase.h"
 
-
-class HDQMInspectorConfigSiStrip : public HDQMInspectorConfigBase
-{
-  public:
-    HDQMInspectorConfigSiStrip ();
-    ~HDQMInspectorConfigSiStrip () override;
+class HDQMInspectorConfigSiStrip : public HDQMInspectorConfigBase {
+public:
+  HDQMInspectorConfigSiStrip();
+  ~HDQMInspectorConfigSiStrip() override;
 };
 #endif
diff --git a/DQM/SiStripHistoricInfoClient/interface/HDQMInspectorConfigTracking.h b/DQM/SiStripHistoricInfoClient/interface/HDQMInspectorConfigTracking.h
index 41d572b51e14c..944330584a314 100644
--- a/DQM/SiStripHistoricInfoClient/interface/HDQMInspectorConfigTracking.h
+++ b/DQM/SiStripHistoricInfoClient/interface/HDQMInspectorConfigTracking.h
@@ -1,15 +1,14 @@
 #ifndef GUARD_HDQMInspectorConfigTracking_h
 #define GUARD_HDQMInspectorConfigTracking_h
 
-#include <string>
 #include <cstdint>
+#include <string>
 
 #include "DQMServices/Diagnostic/interface/HDQMInspectorConfigBase.h"
 
-class HDQMInspectorConfigTracking : public HDQMInspectorConfigBase
-{
-  public:
-    HDQMInspectorConfigTracking ();
-    ~HDQMInspectorConfigTracking () override;
+class HDQMInspectorConfigTracking : public HDQMInspectorConfigBase {
+public:
+  HDQMInspectorConfigTracking();
+  ~HDQMInspectorConfigTracking() override;
 };
 #endif
diff --git a/DQM/SiStripHistoricInfoClient/interface/classes.h b/DQM/SiStripHistoricInfoClient/interface/classes.h
deleted file mode 100644
index ca20fde645464..0000000000000
--- a/DQM/SiStripHistoricInfoClient/interface/classes.h
+++ /dev/null
@@ -1,12 +0,0 @@
-//---- Add the Class you need
-
-#include "DQM/SiStripHistoricInfoClient/interface/HDQMInspectorConfigSiStrip.h"
-#include "DQM/SiStripHistoricInfoClient/interface/HDQMInspectorConfigTracking.h"
-
-namespace DQM_SiStripHistoricInfoClient {
-  struct dictionary {
-    HDQMInspectorConfigSiStrip dummy1;
-    HDQMInspectorConfigTracking dummy2;
-  };
-}
-
diff --git a/DQM/SiStripHistoricInfoClient/interface/fitUtilities.h b/DQM/SiStripHistoricInfoClient/interface/fitUtilities.h
deleted file mode 100644
index aeb98a8e4bb80..0000000000000
--- a/DQM/SiStripHistoricInfoClient/interface/fitUtilities.h
+++ /dev/null
@@ -1,471 +0,0 @@
-#ifndef DQM_SiStripHistoricInfoClient_fitUtilities_H
-#define DQM_SiStripHistoricInfoClient_fitUtilities_H
-
-#include <vector>
-#include <cstring>
-#include <iostream>
-#include <sstream>
-#include <string>
-#include "TH1.h"
-#include "TF1.h"
-#include "TMath.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-
-
-/**
-   @ class fitUtilities
-   @ fit Landau distributions to historic monitoring elements
-   @ fits from Susy's analysis (DQM/SiStripHistoricInfoClient/test/TrendsWithFits) 
-*/
-
-
-
-double langaufun(double *x, double *par);
-int32_t langaupro(double *params, double &maxx, double &FWHM);
-double Gauss(double *x, double *par);
-
-class fitUtilities{
-
- public: 
-
-  fitUtilities();
-  ~fitUtilities();
- 
-  void   init();
-  double doLanGaussFit(MonitorElement* ME){return doLanGaussFit(ME->getTH1F());}
-  double doLanGaussFit(TH1F*);
-
-  double doGaussFit(MonitorElement* ME){return doGaussFit(ME->getTH1F());}
-  double doGaussFit(TH1F*);
-  
-  double getLanGaussPar(std::string s)   ;
-  double getLanGaussParErr(std::string s);
-  double getLanGaussConv(std::string s)  ;
-  
-  double getGaussPar(std::string s)   ;
-  double getGaussParErr(std::string s);
-
-  double getFitChi()  {return chi2GausS;}
-  int    getFitnDof() {return nDofGausS;}
- 
- private:
-  
-  double pLanGausS[4], epLanGausS[4];
-  double pGausS[3], epGausS[3];
-  double pLanConv[2];
-  double chi2GausS;
-  int32_t nDofGausS;
-  TF1 *langausFit; 
-  TF1 *gausFit;  
-};
-
-#endif // DQM_SiStripHistoricInfoClient_fitUtilities_H
-
-//-----------------------------------------------------------------------------------------------
-double langaufun(double *x, double *par){
-  //Fit parameters:
-  //par[0]=Width (scale) parameter of Landau density
-  //par[1]=Most Probable (MP, location) parameter of Landau density
-  //par[2]=Total area (integral -inf to inf, normalization constant)
-  //par[3]=Width (sigma) of convoluted Gaussian function
-  //
-  //In the Landau distribution (represented by the CERNLIB approximation), 
-  //the maximum is located at x=-0.22278298 with the location parameter=0.
-  //This shift is corrected within this function, so that the actual
-  //maximum is identical to the MP parameter.
-
-  // Numeric constants
-  double invsq2pi = 0.3989422804014;   // (2 pi)^(-1/2)
-  double mpshift  = -0.22278298;       // Landau maximum location
-
-  // Control constants
-  double np = 100.0;      // number of convolution steps
-  double sc =   5.0;      // convolution extends to +-sc Gaussian sigmas
-
-  // Variables
-  double xx;
-  double mpc;
-  double fland;
-  double sum = 0.0;
-  double xlow,xupp;
-  double step;
-  double i;
-
-
-  // MP shift correction
-  mpc = par[1] - mpshift * par[0]; 
-
-  // Range of convolution integral
-  xlow = x[0] - sc * par[3];
-  xupp = x[0] + sc * par[3];
-
-  step = (xupp-xlow) / np;
-
-  // Landau Distribution Production
-  for(i=1.0; i<=np/2; i++) {
-    xx = xlow + (i-.5) * step;
-    fland = TMath::Landau(xx,mpc,par[0]) / par[0];
-    sum += fland * TMath::Gaus(x[0],xx,par[3]);
-
-    xx = xupp - (i-.5) * step;
-    fland = TMath::Landau(xx,mpc,par[0]) / par[0];
-    sum += fland * TMath::Gaus(x[0],xx,par[3]);
-  }
-
-  return (par[2] * step * sum * invsq2pi / par[3]);
-}
-
-//-----------------------------------------------------------------------------------------------
-int32_t langaupro(double *params, double &maxx, double &FWHM) {
-   edm::LogInfo("fitUtility") << "inside langaupro " << std::endl;
-  // Seaches for the location (x value) at the maximum of the 
-  // Landau and its full width at half-maximum.
-  //
-  // The search is probably not very efficient, but it's a first try.
-
-  double p,x,fy,fxr,fxl;
-  double step;
-  double l,lold,dl;
-  int32_t i = 0;
-  const int32_t MAXCALLS = 10000;
-  const double dlStop = 1e-3; // relative change < .001
-
-  // Search for maximum
-  p = params[1] - 0.1 * params[0];
-  step = 0.05 * params[0];
-  lold = -2.0;
-  l    = -1.0;
-
-  dl = (l-lold)/lold;    // FIXME catch divide by zero
-  while ( (TMath::Abs(dl)>dlStop ) && (i < MAXCALLS) ) {
-    i++;
-
-    lold = l;
-    x = p + step;
-    l = langaufun(&x,params);
-    dl = (l-lold)/lold; // FIXME catch divide by zero
-        
-    if (l < lold)
-      step = -step/10;
- 
-    p += step;
-  }
-
-  if (i == MAXCALLS)
-    return (-1);
-
-  maxx = x;
-
-  fy = l/2;
-
-
-  // Search for right x location of fy
-  p = maxx + params[0];
-  step = params[0];
-  lold = -2.0;
-  l    = -1e300;
-  i    = 0;
-
-  dl = (l-lold)/lold;   // FIXME catch divide by zero
-  while ( ( TMath::Abs(dl)>dlStop ) && (i < MAXCALLS) ) {
-    i++;
-
-    lold = l;
-    x = p + step;
-    l = TMath::Abs(langaufun(&x,params) - fy);
-    dl = (l-lold)/lold; // FIXME catch divide by zero
- 
-    if (l > lold)
-      step = -step/10;
- 
-    p += step;
-  }
-
-  if (i == MAXCALLS)
-    return (-2);
-
-  fxr = x;
-
-
-  // Search for left x location of fy
-  p = maxx - 0.5 * params[0];
-  step = -params[0];
-  lold = -2.0;
-  l    = -1e300;
-  i    = 0;
-
-  dl = (l-lold)/lold;    // FIXME catch divide by zero
-  while ( ( TMath::Abs(dl)>dlStop ) && (i < MAXCALLS) ) {
-    i++;
-
-    lold = l;
-    x = p + step;
-    l = TMath::Abs(langaufun(&x,params) - fy);
-    dl = (l-lold)/lold; // FIXME catch divide by zero
- 
-    if (l > lold)
-      step = -step/10;
- 
-    p += step;
-  }
-
-  if (i == MAXCALLS)
-    return (-3);
-
-
-  fxl = x;
-
-  FWHM = fxr - fxl;
-  return (0);
-}
-
-
-//-----------------------------------------------------------------------------------------------
-double Gauss(double *x, double *par)
-{
-  // The noise function: a gaussian
-
-  double arg = 0;
-  if (par[2]) arg = (x[0] - par[1])/par[2];
-
-  double noise = par[0]*TMath::Exp(-0.5*arg*arg);
-  return noise;
-}
-
-
-
-//-----------------------------------------------------------------------------------------------
-fitUtilities::fitUtilities():langausFit(0),gausFit(0){
-  init();
-}
-
-//-----------------------------------------------------------------------------------------------
-void fitUtilities::init(){
-  pLanGausS[0]=0 ;   pLanGausS[1]=0;   pLanGausS[2]=0;   pLanGausS[3]=0;
-  epLanGausS[0]=0;  epLanGausS[1]=0;  epLanGausS[2]=0;  epLanGausS[3]=0;
-  pGausS[0]=0 ;   pGausS[1]=0;   pGausS[2]=0;
-  epGausS[0]=0;  epGausS[1]=0;  epGausS[2]=0;
-  pLanConv[0]=0;  pLanConv[1]=0;
-
-  //if ( langausFit!=0 ) delete langausFit;
-  //if ( gausFit!=0 ) delete gausFit;
-
-  chi2GausS = -9999.;
-  nDofGausS = -9999;
-}
-
-//-----------------------------------------------------------------------------------------------
-fitUtilities::~fitUtilities(){
-  if ( langausFit!=0 ) delete langausFit;
-  if ( gausFit!=0 ) delete gausFit;
-}
-
-  
- 
-//-----------------------------------------------------------------------------------------------
-double fitUtilities::doLanGaussFit(TH1F* htoFit){
-  init();
- 
-  if (htoFit->GetEntries()!=0) {
-     edm::LogInfo("fitUtility")<<"Fitting "<< htoFit->GetTitle() <<std::endl;
-    // Setting fit range and start values
-    double fr[2];
-    double sv[4], pllo[4], plhi[4];
-    fr[0]=0.5*htoFit->GetMean();
-    fr[1]=3.0*htoFit->GetMean();
-	      
-    // (EM) parameters setting good for signal only 
-    int32_t imax=htoFit->GetMaximumBin();
-    double xmax=htoFit->GetBinCenter(imax);
-    double ymax=htoFit->GetBinContent(imax);
-    int32_t i[2];
-    int32_t iArea[2];
-	      
-    i[0]=htoFit->GetXaxis()->FindBin(fr[0]);
-    i[1]=htoFit->GetXaxis()->FindBin(fr[1]);
-		  
-    iArea[0]=htoFit->GetXaxis()->FindBin(fr[0]);
-    iArea[1]=htoFit->GetXaxis()->FindBin(fr[1]);
-    double AreaFWHM=htoFit->Integral(iArea[0],iArea[1],"width");
-		  
-    sv[1]=xmax;
-    sv[2]=htoFit->Integral(i[0],i[1],"width");
-    sv[3]=AreaFWHM/(4*ymax);
-    sv[0]=sv[3];
-		  
-    plhi[0]=25.0; plhi[1]=200.0; plhi[2]=1000000.0; plhi[3]=50.0;
-    pllo[0]=1.5 ; pllo[1]=10.0 ; pllo[2]=1.0      ; pllo[3]= 1.0;
-		  
-    Char_t FunName[100];
-    sprintf(FunName,"FitfcnLG_%s",htoFit->GetName());  
-		  
-    langausFit = new TF1(FunName,langaufun,fr[0],fr[1],4);
-    langausFit->SetParameters(sv);
-    langausFit->SetParNames("Width","MP","Area","GSigma");
-		  
-    for (int32_t i=0; i<4; i++) {
-      langausFit->SetParLimits(i,pllo[i],plhi[i]);
-    }  
-		  
-    try{
-      htoFit->Fit(langausFit,"R0");  // "R" fit in a range,"0" quiet fit
-      
-      langausFit->SetRange(fr[0],fr[1]);
-      langausFit->GetParameters(pLanGausS);
-      std::memcpy((void*) epLanGausS, (void*) langausFit->GetParErrors(), 4*sizeof(double));
-      
-      chi2GausS =langausFit->GetChisquare();  // obtain chi^2
-      nDofGausS = langausFit->GetNDF();           // obtain ndf
-      
-      double sPeak, sFWHM;
-      langaupro(pLanGausS,sPeak,sFWHM);
-      pLanConv[0]=sPeak;
-      pLanConv[1]=sFWHM;
-      edm::LogInfo("fitUtility") << "langaupro:  max  " << sPeak << std::endl;
-      edm::LogInfo("fitUtility") << "langaupro:  FWHM " << sFWHM << std::endl;
-    }
-    catch(...){
-      edm::LogError("fitUtility") << "problem in fitting " << htoFit->GetTitle() << " \n\tDefault values of the parameters will be used";
-      pLanGausS[0]=-9999; pLanGausS[1]=-9999; pLanGausS[2]=-9999; pLanGausS[3]=-9999;
-      epLanGausS[0]=-9999; epLanGausS[1]=-9999; epLanGausS[2]=-9999; epLanGausS[3]=-9999;
-      pLanConv[0]=-9999;   pLanConv[1]=-9999;   
-      chi2GausS=-9999;  nDofGausS=-9999;    
-    }
-  }
-  else {  
-    pLanGausS[0]=-9999; pLanGausS[1]=-9999; pLanGausS[2]=-9999; pLanGausS[3]=-9999;
-    epLanGausS[0]=-9999; epLanGausS[1]=-9999; epLanGausS[2]=-9999; epLanGausS[3]=-9999;
-    pLanConv[0]=-9999;   pLanConv[1]=-9999;   
-    chi2GausS=-9999;  nDofGausS=-9999;    
-  }
-
-  return htoFit->GetEntries();
-
-}
-
-  
-//-----------------------------------------------------------------------------------------------
-double fitUtilities::doGaussFit(TH1F* htoFit){
-  init();
-  if (htoFit->GetEntries()!=0) {
-    
-    // Setting fit range and start values
-    double fr[2];
-    double sv[3], pllo[3], plhi[3];
-    fr[0]=htoFit->GetMean()-5*htoFit->GetRMS();
-    fr[1]=htoFit->GetMean()+5*htoFit->GetRMS();
-		  
-    int32_t imax=htoFit->GetMaximumBin();
-    double xmax=htoFit->GetBinCenter(imax);
-    double ymax=htoFit->GetBinContent(imax);
-    int32_t i[2];
-    int32_t iArea[2];
-		  
-    i[0]=htoFit->GetXaxis()->FindBin(fr[0]);
-    i[1]=htoFit->GetXaxis()->FindBin(fr[1]);
-		  
-    iArea[0]=htoFit->GetXaxis()->FindBin(fr[0]);
-    iArea[1]=htoFit->GetXaxis()->FindBin(fr[1]);
-    double AreaFWHM=htoFit->Integral(iArea[0],iArea[1],"width");
-		  
-    sv[2]=AreaFWHM/(4*ymax);
-    sv[1]=xmax;
-    sv[0]=htoFit->Integral(i[0],i[1],"width");
-		  
-    plhi[0]=1000000.0; plhi[1]=10.0; plhi[2]=10.;
-    pllo[0]=1.5 ; pllo[1]=0.1; pllo[2]=0.3;
-    Char_t FunName[100];
-    sprintf(FunName,"FitfcnLG_%s",htoFit->GetName());
-    gausFit = new TF1(FunName,Gauss,fr[0],fr[1],3);
-    gausFit->SetParameters(sv);
-    gausFit->SetParNames("Constant","GaussPeak","Sigma");
-		  
-    for (int32_t i=0; i<3; i++) {
-      gausFit->SetParLimits(i,pllo[i],plhi[i]);
-    }
- 
-    try{
-      htoFit->Fit(gausFit,"R0");
-      
-      gausFit->SetRange(fr[0],fr[1]);
-      gausFit->GetParameters(pGausS);
-      std::memcpy((void*) epGausS, (void*) gausFit->GetParErrors(), 3*sizeof(double));
-      
-      chi2GausS =langausFit->GetChisquare(); // obtain chi^2
-      nDofGausS = langausFit->GetNDF();// obtain ndf
-    }
-    catch(...){
-      edm::LogError("fitUtility") << "problem in fitting " << htoFit->GetTitle() << " \n\tDefault values of the parameters will be used";
-      pGausS[0]=-9999; pGausS[1]=-9999; pGausS[2]=-9999;
-      epGausS[0]=-9999; epGausS[1]=-9999; epGausS[2]=-9999;
-      chi2GausS=-9999;  nDofGausS=-9999;    
-    }
- 		 
-  }
-  else {
-    pGausS[0]=-9999; pGausS[1]=-9999; pGausS[2]=-9999;
-    epGausS[0]=-9999; epGausS[1]=-9999; epGausS[2]=-9999;
-    chi2GausS=-9999;  nDofGausS=-9999;    
-  }
-  
-  return htoFit->GetEntries();
-}
-
-//-----------------------------------------------------------------------------------------------
-double fitUtilities::getLanGaussPar(std::string s){
-  if(s=="landau_width")
-    return pLanGausS[0];
-  else if(s=="mpv")
-    return pLanGausS[1];
-  else if(s=="area")
-    return pLanGausS[2];
-  else if(s=="gauss_sigma")
-    return pLanGausS[3];
-  else
-    return -99999;
-}
-
-double fitUtilities::getLanGaussParErr(std::string s){
-  if(s=="landau_width")
-    return epLanGausS[0];
-  else if(s=="mpv")
-    return epLanGausS[1];
-  else if(s=="area")
-    return epLanGausS[2];
-  else if(s=="gauss_sigma")
-    return epLanGausS[3];
-  else
-    return -99999;
-}
-
-double fitUtilities::getLanGaussConv(std::string s) {
-  if(s=="mpv")
-    return pLanConv[0];
-  else if(s=="fwhm")
-    return pLanConv[1];
-  else
-    return -99999;
-}
-
-double fitUtilities::getGaussPar(std::string s) {
-  if(s=="area")
-    return pGausS[0];
-  else if(s=="mean")
-    return pGausS[1];
-  else if(s=="sigma")
-    return pGausS[2];
-  else
-    return -99999;
-}
-
-double fitUtilities::getGaussParErr(std::string s) {
-  if(s=="area")
-    return epGausS[0];
-  else if(s=="mean")
-    return epGausS[1];
-  else if(s=="sigma")
-    return epGausS[2];
-  else
-    return -99999;
-}
diff --git a/DQM/SiStripHistoricInfoClient/src/HDQMInspectorConfigSiStrip.cc b/DQM/SiStripHistoricInfoClient/src/HDQMInspectorConfigSiStrip.cc
index 67ae9592ec001..4850f63297c83 100644
--- a/DQM/SiStripHistoricInfoClient/src/HDQMInspectorConfigSiStrip.cc
+++ b/DQM/SiStripHistoricInfoClient/src/HDQMInspectorConfigSiStrip.cc
@@ -6,11 +6,6 @@
 #include <iostream>
 #include <sstream>
 
-HDQMInspectorConfigSiStrip::HDQMInspectorConfigSiStrip ()
-{
-}
+HDQMInspectorConfigSiStrip::HDQMInspectorConfigSiStrip() {}
 
-
-HDQMInspectorConfigSiStrip::~HDQMInspectorConfigSiStrip ()
-{
-}
+HDQMInspectorConfigSiStrip::~HDQMInspectorConfigSiStrip() {}
diff --git a/DQM/SiStripHistoricInfoClient/src/HDQMInspectorConfigTracking.cc b/DQM/SiStripHistoricInfoClient/src/HDQMInspectorConfigTracking.cc
index 2b9b57eaf856c..7f323b2e7136a 100644
--- a/DQM/SiStripHistoricInfoClient/src/HDQMInspectorConfigTracking.cc
+++ b/DQM/SiStripHistoricInfoClient/src/HDQMInspectorConfigTracking.cc
@@ -3,14 +3,8 @@
 #include "DQM/SiStripCommon/interface/SiStripFolderOrganizer.h"
 #include "DataFormats/SiStripDetId/interface/SiStripDetId.h"
 
-
 #include <sstream>
 
-HDQMInspectorConfigTracking::HDQMInspectorConfigTracking ()
-{
-}
-
+HDQMInspectorConfigTracking::HDQMInspectorConfigTracking() {}
 
-HDQMInspectorConfigTracking::~HDQMInspectorConfigTracking ()
-{
-}
+HDQMInspectorConfigTracking::~HDQMInspectorConfigTracking() {}
diff --git a/DQM/SiStripMonitorCluster/interface/MonitorLTC.h b/DQM/SiStripMonitorCluster/interface/MonitorLTC.h
index 78cc4a55a0939..cedb227dfec40 100644
--- a/DQM/SiStripMonitorCluster/interface/MonitorLTC.h
+++ b/DQM/SiStripMonitorCluster/interface/MonitorLTC.h
@@ -32,7 +32,6 @@ class MonitorLTC : public DQMEDAnalyzer {
                       edm::EventSetup const &) override;
 
  private:
-  DQMStore *dqmStore_;
   edm::ParameterSet conf_;
   // trigger decision from LTC digis
   MonitorElement *LTCTriggerDecision_all;
diff --git a/DQM/SiStripMonitorCluster/interface/SiStripMonitorFilter.h b/DQM/SiStripMonitorCluster/interface/SiStripMonitorFilter.h
index a119d30812b2d..5b4e891d268a0 100644
--- a/DQM/SiStripMonitorCluster/interface/SiStripMonitorFilter.h
+++ b/DQM/SiStripMonitorCluster/interface/SiStripMonitorFilter.h
@@ -32,7 +32,6 @@ class SiStripMonitorFilter : public DQMEDAnalyzer {
 
  private:
   edm::EDGetTokenT<int> filerDecisionToken_;
-  DQMStore *dqmStore_;
   edm::ParameterSet conf_;
   MonitorElement *FilterDecision;
   // all events
diff --git a/DQM/SiStripMonitorCluster/interface/SiStripMonitorHLT.h b/DQM/SiStripMonitorCluster/interface/SiStripMonitorHLT.h
index a905125aa3f59..91e2f85cb322a 100644
--- a/DQM/SiStripMonitorCluster/interface/SiStripMonitorHLT.h
+++ b/DQM/SiStripMonitorCluster/interface/SiStripMonitorHLT.h
@@ -36,7 +36,6 @@ class SiStripMonitorHLT : public DQMEDAnalyzer {
   edm::EDGetTokenT<std::map<uint, std::vector<SiStripCluster> > >
       clusterInSubComponentsToken_;
 
-  DQMStore *dqmStore_;
   edm::ParameterSet conf_;
   MonitorElement *HLTDecision;
   // all events
diff --git a/DQM/SiStripMonitorCluster/src/MonitorLTC.cc b/DQM/SiStripMonitorCluster/src/MonitorLTC.cc
index b27349a164162..4cac892e60a24 100644
--- a/DQM/SiStripMonitorCluster/src/MonitorLTC.cc
+++ b/DQM/SiStripMonitorCluster/src/MonitorLTC.cc
@@ -20,7 +20,6 @@ MonitorLTC::MonitorLTC(
                   //  ltcDigiCollectionTag_(iConfig.getParameter<edm::InputTag>("ltcDigiCollectionTag"))
 {
   HLTDirectory = "HLTResults";
-  dqmStore_ = edm::Service<DQMStore>().operator->();
   conf_ = iConfig;
 
   ltcDigiCollectionTagToken_ = consumes<LTCDigiCollection>(
diff --git a/DQM/SiStripMonitorCluster/src/SiStripMonitorFilter.cc b/DQM/SiStripMonitorCluster/src/SiStripMonitorFilter.cc
index b6b88fbbf09c9..8d1a73717bc15 100644
--- a/DQM/SiStripMonitorCluster/src/SiStripMonitorFilter.cc
+++ b/DQM/SiStripMonitorCluster/src/SiStripMonitorFilter.cc
@@ -18,7 +18,6 @@
 
 SiStripMonitorFilter::SiStripMonitorFilter(const edm::ParameterSet& iConfig) {
   FilterDirectory = "FilterResults";
-  dqmStore_ = edm::Service<DQMStore>().operator->();
   conf_ = iConfig;
 
   filerDecisionToken_ =
diff --git a/DQM/SiStripMonitorCluster/src/SiStripMonitorHLT.cc b/DQM/SiStripMonitorCluster/src/SiStripMonitorHLT.cc
index e144b9c901ffe..d519152659142 100644
--- a/DQM/SiStripMonitorCluster/src/SiStripMonitorHLT.cc
+++ b/DQM/SiStripMonitorCluster/src/SiStripMonitorHLT.cc
@@ -20,7 +20,6 @@
 
 SiStripMonitorHLT::SiStripMonitorHLT(const edm::ParameterSet& iConfig) {
   HLTDirectory = "HLTResults";
-  dqmStore_ = edm::Service<DQMStore>().operator->();
   conf_ = iConfig;
 
   filerDecisionToken_ =
diff --git a/DQM/SiStripMonitorHardware/interface/HistogramBase.hh b/DQM/SiStripMonitorHardware/interface/HistogramBase.hh
index 4981a3913b48e..c8b4e10c266d3 100644
--- a/DQM/SiStripMonitorHardware/interface/HistogramBase.hh
+++ b/DQM/SiStripMonitorHardware/interface/HistogramBase.hh
@@ -184,7 +184,6 @@ public:
         );
 protected:
 
-  DQMStore* dqm_;
 
 private:
 
diff --git a/DQM/SiStripMonitorPedestals/interface/SiStripMonitorPedestals.h b/DQM/SiStripMonitorPedestals/interface/SiStripMonitorPedestals.h
index 6e0c8bd1debcd..a86a71250c298 100644
--- a/DQM/SiStripMonitorPedestals/interface/SiStripMonitorPedestals.h
+++ b/DQM/SiStripMonitorPedestals/interface/SiStripMonitorPedestals.h
@@ -4,8 +4,8 @@
 //
 // Package:     SiStripMonitorPedestals
 // Class  :     SiStripMonitorPedestals
-// 
-/**\class SiStripMonitorPedestals SiStripMonitorPedestals.h 
+//
+/**\class SiStripMonitorPedestals SiStripMonitorPedestals.h
 
  Description: <one line class summary>
 
@@ -22,25 +22,24 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Utilities/interface/EDGetToken.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-
 // data formats
-#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 #include "DataFormats/Common/interface/DetSetVector.h"
+#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 #include "DataFormats/SiStripDigi/interface/SiStripDigi.h"
 #include "DataFormats/SiStripDigi/interface/SiStripRawDigi.h"
 
 // cabling
-#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
+#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
 
 #include <DQMServices/Core/interface/DQMEDAnalyzer.h>
 
@@ -54,70 +53,68 @@ class DQMStore;
 class SiStripDetCabling;
 
 class SiStripMonitorPedestals : public DQMEDAnalyzer {
- public:
-  explicit SiStripMonitorPedestals(const edm::ParameterSet&);
+public:
+  explicit SiStripMonitorPedestals(const edm::ParameterSet &);
   ~SiStripMonitorPedestals() override;
-  
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
+
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
   void endJob() override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-   
- private:
-  edm::EDGetTokenT<edm::DetSetVector<SiStripRawDigi> > digiToken_;
+
+private:
+  edm::EDGetTokenT<edm::DetSetVector<SiStripRawDigi>> digiToken_;
 
   void resetMEs(uint32_t idet);
-  void createMEs(DQMStore::IBooker &, edm::EventSetup const& eSetup);
-  void fillCondDBMEs(edm::EventSetup const& eSetup);
-
-  struct ModMEs{
-    MonitorElement* PedsPerStrip;
-    MonitorElement* PedsDistribution;
-    MonitorElement* PedsEvolution;
-    
-    MonitorElement* CMSubNoisePerStrip;
-    MonitorElement* RawNoisePerStrip;
-    MonitorElement* CMSubNoiseProfile;
-    MonitorElement* RawNoiseProfile;
-    MonitorElement* NoisyStrips;
-    MonitorElement* NoisyStripDistribution;
-    
-    MonitorElement* CMDistribution;
-    MonitorElement* CMSlopeDistribution;
-    
-    
-    //MonitorElements for CondDB data display
-    MonitorElement* PedsPerStripDB;
-    MonitorElement* CMSubNoisePerStripDB;
-    MonitorElement* BadStripsDB;
+  void createMEs(DQMStore::IBooker &, edm::EventSetup const &eSetup);
+  void fillCondDBMEs(edm::EventSetup const &eSetup);
+
+  struct ModMEs {
+    MonitorElement *PedsPerStrip;
+    MonitorElement *PedsDistribution;
+    MonitorElement *PedsEvolution;
+
+    MonitorElement *CMSubNoisePerStrip;
+    MonitorElement *RawNoisePerStrip;
+    MonitorElement *CMSubNoiseProfile;
+    MonitorElement *RawNoiseProfile;
+    MonitorElement *NoisyStrips;
+    MonitorElement *NoisyStripDistribution;
+
+    MonitorElement *CMDistribution;
+    MonitorElement *CMSlopeDistribution;
+
+    // MonitorElements for CondDB data display
+    MonitorElement *PedsPerStripDB;
+    MonitorElement *CMSubNoisePerStripDB;
+    MonitorElement *BadStripsDB;
   };
-  
-  DQMStore* dqmStore_;
+
+  DQMStore *dqmStore_;
   edm::ParameterSet conf_;
   std::map<uint32_t, ModMEs> PedMEs;
   edm::ESHandle<SiStripDetCabling> detcabling;
   edm::ParameterSet pedsPSet_;
   bool analyzed;
   bool firstEvent;
-  
-  //The following to be put inside the parametersets
+
+  // The following to be put inside the parametersets
   int16_t nEvUpdate_;
   int16_t signalCutPeds_;
   int16_t nEvTot_;
   int16_t nEvInit_;
   int nIteration_;
-  ApvAnalysisFactory* apvFactory_;
-  int  theEventInitNumber_; 
+  ApvAnalysisFactory *apvFactory_;
+  int theEventInitNumber_;
   int theEventIterNumber_;
   int NumCMstripsInGroup_;
-  std::string  runTypeFlag_;
+  std::string runTypeFlag_;
   std::string outPutFileName;
   unsigned long long m_cacheID_;
 
   static const std::string RunMode1;
   static const std::string RunMode2;
   static const std::string RunMode3;
-
 };
 
 #endif
diff --git a/DQM/SiStripMonitorPedestals/interface/SiStripMonitorQuality.h b/DQM/SiStripMonitorPedestals/interface/SiStripMonitorQuality.h
index f3fd9c174e38e..4fdddc13c818f 100644
--- a/DQM/SiStripMonitorPedestals/interface/SiStripMonitorQuality.h
+++ b/DQM/SiStripMonitorPedestals/interface/SiStripMonitorQuality.h
@@ -4,8 +4,8 @@
 //
 // Package:     SiStripMonitorQuality
 // Class  :     SiStripMonitorQuality
-// 
-/**\class SiStripMonitorQuality SiStripMonitorQuality.h 
+//
+/**\class SiStripMonitorQuality SiStripMonitorQuality.h
 
  Description: <one line class summary>
 
@@ -22,9 +22,9 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -45,31 +45,27 @@ class SiStripQuality;
 class TrackerTopology;
 
 class SiStripMonitorQuality : public DQMEDAnalyzer {
- public:
-  explicit SiStripMonitorQuality(const edm::ParameterSet&);
+public:
+  explicit SiStripMonitorQuality(const edm::ParameterSet &);
   ~SiStripMonitorQuality() override;
-  
+
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
   void endJob() override;
-  
-  
- private:
-  
-  MonitorElement* getQualityME(uint32_t idet, const TrackerTopology* tTopo);
-  
-  
-  DQMStore* dqmStore_;
+
+private:
+  MonitorElement *getQualityME(uint32_t idet, const TrackerTopology *tTopo);
+
+  DQMStore *dqmStore_;
   edm::ParameterSet conf_;
-  edm::ESHandle< SiStripDetCabling > detCabling_;
-  edm::ESHandle< SiStripQuality > stripQuality_;
+  edm::ESHandle<SiStripDetCabling> detCabling_;
+  edm::ESHandle<SiStripQuality> stripQuality_;
 
-  std::map<uint32_t, MonitorElement*> QualityMEs;
+  std::map<uint32_t, MonitorElement *> QualityMEs;
   std::string dataLabel_;
 
   unsigned long long m_cacheID_;
-
 };
 
 #endif
diff --git a/DQM/SiStripMonitorPedestals/interface/SiStripMonitorRawData.h b/DQM/SiStripMonitorPedestals/interface/SiStripMonitorRawData.h
index 3f08599a0bedf..bd8f9ceeaf74f 100644
--- a/DQM/SiStripMonitorPedestals/interface/SiStripMonitorRawData.h
+++ b/DQM/SiStripMonitorPedestals/interface/SiStripMonitorRawData.h
@@ -4,8 +4,8 @@
 //
 // Package:     SiStripMonitorRawData
 // Class  :     SiStripMonitorRawData
-// 
-/**\class SiStripMonitorRawData SiStripMonitorRawData.h 
+//
+/**\class SiStripMonitorRawData SiStripMonitorRawData.h
 
  Description: <one line class summary>
 
@@ -22,10 +22,10 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Utilities/interface/EDGetToken.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -47,28 +47,26 @@ class DQMStore;
 class SiStripDetCabling;
 
 class SiStripMonitorRawData : public DQMEDAnalyzer {
- public:
-  explicit SiStripMonitorRawData(const edm::ParameterSet&);
+public:
+  explicit SiStripMonitorRawData(const edm::ParameterSet &);
   ~SiStripMonitorRawData() override;
-  
+
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
   void endJob() override;
-  
-  
- private:
-  edm::EDGetTokenT<edm::DetSetVector<SiStripRawDigi> > digiToken_;
-
-  MonitorElement* BadFedNumber;
-  
-  DQMStore* dqmStore_;
+
+private:
+  edm::EDGetTokenT<edm::DetSetVector<SiStripRawDigi>> digiToken_;
+
+  MonitorElement *BadFedNumber;
+
+  DQMStore *dqmStore_;
   edm::ParameterSet conf_;
-  edm::ESHandle< SiStripDetCabling > detcabling;
+  edm::ESHandle<SiStripDetCabling> detcabling;
   std::vector<uint32_t> SelectedDetIds;
 
   unsigned long long m_cacheID_;
-
 };
 
 #endif
diff --git a/DQM/SiStripMonitorPedestals/src/SiStripMonitorPedestals.cc b/DQM/SiStripMonitorPedestals/src/SiStripMonitorPedestals.cc
index 76f834608bee9..e958148f866f1 100644
--- a/DQM/SiStripMonitorPedestals/src/SiStripMonitorPedestals.cc
+++ b/DQM/SiStripMonitorPedestals/src/SiStripMonitorPedestals.cc
@@ -2,8 +2,9 @@
 //
 // Package:    SiStripMonitorPedestals
 // Class:      SiStripMonitorPedestals
-// 
-/**\class SiStripMonitorDigi SiStripMonitorDigi.cc DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc
+//
+/**\class SiStripMonitorDigi SiStripMonitorDigi.cc
+ DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc
 
  Description: <one line class summary>
 
@@ -16,8 +17,8 @@
 //
 //
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
@@ -27,137 +28,139 @@
 
 #include "CalibTracker/SiStripAPVAnalysis/interface/ApvAnalysisFactory.h"
 
-#include <FWCore/Framework/interface/EventSetup.h>
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include <FWCore/Framework/interface/EventSetup.h>
 
-#include "DQM/SiStripMonitorPedestals/interface/SiStripMonitorPedestals.h"
-#include "CondFormats/DataRecord/interface/SiStripPedestalsRcd.h"
-#include "CondFormats/DataRecord/interface/SiStripNoisesRcd.h"
+#include "CalibFormats/SiStripObjects/interface/SiStripQuality.h"
 #include "CalibTracker/Records/interface/SiStripQualityRcd.h"
-#include "CondFormats/SiStripObjects/interface/SiStripPedestals.h"
+#include "CondFormats/DataRecord/interface/SiStripNoisesRcd.h"
+#include "CondFormats/DataRecord/interface/SiStripPedestalsRcd.h"
 #include "CondFormats/SiStripObjects/interface/SiStripNoises.h"
-#include "CalibFormats/SiStripObjects/interface/SiStripQuality.h"
+#include "CondFormats/SiStripObjects/interface/SiStripPedestals.h"
+#include "DQM/SiStripMonitorPedestals/interface/SiStripMonitorPedestals.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
 #include "TProfile.h"
 // std
-#include <cstdlib>
+#include <algorithm>
 #include <cmath>
+#include <cstdlib>
 #include <numeric>
-#include <algorithm>
 
 const std::string SiStripMonitorPedestals::RunMode1 = "ConDBPlotsOnly";
 const std::string SiStripMonitorPedestals::RunMode2 = "CalculatedPlotsOnly";
 const std::string SiStripMonitorPedestals::RunMode3 = "AllPlots";
 
-SiStripMonitorPedestals::SiStripMonitorPedestals(edm::ParameterSet const& iConfig):
-  dqmStore_(edm::Service<DQMStore>().operator->()),
-  conf_(iConfig),
-  pedsPSet_(iConfig.getParameter<edm::ParameterSet>("PedestalsPSet")),
-  analyzed(false),
-  firstEvent(true),
-  signalCutPeds_(4),
-  nEvTot_(0),
-  nIteration_(0),
-  apvFactory_(nullptr),
-  m_cacheID_(0)
-{
+SiStripMonitorPedestals::SiStripMonitorPedestals(edm::ParameterSet const &iConfig)
+    : dqmStore_(edm::Service<DQMStore>().operator->()),
+      conf_(iConfig),
+      pedsPSet_(iConfig.getParameter<edm::ParameterSet>("PedestalsPSet")),
+      analyzed(false),
+      firstEvent(true),
+      signalCutPeds_(4),
+      nEvTot_(0),
+      nIteration_(0),
+      apvFactory_(nullptr),
+      m_cacheID_(0) {
   // retrieve producer name of input StripDigiCollection
   std::string digiProducer = conf_.getParameter<std::string>("DigiProducer");
   std::string digiType = "VirginRaw";
-  digiToken_ = consumes<edm::DetSetVector<SiStripRawDigi> >(edm::InputTag(digiProducer,digiType) ); 
+  digiToken_ = consumes<edm::DetSetVector<SiStripRawDigi>>(edm::InputTag(digiProducer, digiType));
 
-  edm::LogInfo("SiStripMonitorPedestals") <<"SiStripMonitorPedestals  " 
-					  << " Constructing....... ";     
+  edm::LogInfo("SiStripMonitorPedestals") << "SiStripMonitorPedestals  "
+                                          << " Constructing....... ";
 
   theEventInitNumber_ = pedsPSet_.getParameter<int>("NumberOfEventsForInit");
   theEventIterNumber_ = pedsPSet_.getParameter<int>("NumberOfEventsForIteration");
   NumCMstripsInGroup_ = pedsPSet_.getParameter<int>("NumCMstripsInGroup");
-        runTypeFlag_  = conf_.getParameter<std::string>("RunTypeFlag");
+  runTypeFlag_ = conf_.getParameter<std::string>("RunTypeFlag");
 }
 //
 // -- Destructor
 //
-SiStripMonitorPedestals::~SiStripMonitorPedestals()
-{
-  edm::LogInfo("SiStripMonitorPedestals") <<"SiStripMonitorPedestals  " 
-					  << " Destructing...... ";     
-  if (apvFactory_) {delete apvFactory_;} 
+SiStripMonitorPedestals::~SiStripMonitorPedestals() {
+  edm::LogInfo("SiStripMonitorPedestals") << "SiStripMonitorPedestals  "
+                                          << " Destructing...... ";
+  if (apvFactory_) {
+    delete apvFactory_;
+  }
 }
 //
 // -- BeginRun
 //
 
-void SiStripMonitorPedestals::bookHistograms(DQMStore::IBooker & ibooker, const edm::Run & run, const edm::EventSetup & eSetup)
-{
-
+void SiStripMonitorPedestals::bookHistograms(DQMStore::IBooker &ibooker,
+                                             const edm::Run &run,
+                                             const edm::EventSetup &eSetup) {
   unsigned long long cacheID = eSetup.get<SiStripDetCablingRcd>().cacheIdentifier();
   if (m_cacheID_ != cacheID) {
     m_cacheID_ = cacheID;
-    eSetup.get<SiStripDetCablingRcd>().get( detcabling );
-    edm::LogInfo("SiStripMonitorPedestals") <<"SiStripMonitorPedestals::bookHistograms: "
-					    << " Creating MEs for new Cabling ";
-    createMEs( ibooker , eSetup);
+    eSetup.get<SiStripDetCablingRcd>().get(detcabling);
+    edm::LogInfo("SiStripMonitorPedestals") << "SiStripMonitorPedestals::bookHistograms: "
+                                            << " Creating MEs for new Cabling ";
+    createMEs(ibooker, eSetup);
   }
 
-  if (runTypeFlag_ == RunMode1 || runTypeFlag_ == RunMode3 ) fillCondDBMEs(eSetup);
+  if (runTypeFlag_ == RunMode1 || runTypeFlag_ == RunMode3)
+    fillCondDBMEs(eSetup);
 }
 
-
 //
 // -- Create Monitor Elements
 //
-void SiStripMonitorPedestals::createMEs(DQMStore::IBooker & ibooker , const edm::EventSetup& es) {
-
-  //Retrieve tracker topology from geometry
+void SiStripMonitorPedestals::createMEs(DQMStore::IBooker &ibooker, const edm::EventSetup &es) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   es.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
   std::vector<uint32_t> SelectedDetIds;
-  
-  //ApvAnalysisFactory
-  if (apvFactory_) {delete apvFactory_;} 
+
+  // ApvAnalysisFactory
+  if (apvFactory_) {
+    delete apvFactory_;
+  }
   apvFactory_ = new ApvAnalysisFactory(pedsPSet_);
-  
+
   detcabling->addActiveDetectorsRawIds(SelectedDetIds);
-  
+
   // use SistripHistoId for producing histogram id (and title)
   SiStripHistoId hidmanager;
   // create SiStripFolderOrganizer
   SiStripFolderOrganizer folder_organizer;
-  
-  edm::LogInfo("SiStripMonitorPedestals") <<"SiStripMonitorPedestals::createMEs: " 
-	  << "Number of Detector Present in cabling " << SelectedDetIds.size();
 
-  for (std::vector<uint32_t>::const_iterator idetid=SelectedDetIds.begin(), iEnd=SelectedDetIds.end();idetid!=iEnd;++idetid){
-    
+  edm::LogInfo("SiStripMonitorPedestals") << "SiStripMonitorPedestals::createMEs: "
+                                          << "Number of Detector Present in cabling " << SelectedDetIds.size();
+
+  for (std::vector<uint32_t>::const_iterator idetid = SelectedDetIds.begin(), iEnd = SelectedDetIds.end();
+       idetid != iEnd;
+       ++idetid) {
     uint32_t detid = *idetid;
 
     // Check consistency in DetId
-    if (detid == 0 || detid == 0xFFFFFFFF){
-      edm::LogError("SiStripMonitorPedestals") <<"SiStripMonitorPedestals::createMEs: " 
-        << "Wrong DetId !!!!!! " <<  detid << " Neglecting !!!!!! ";
+    if (detid == 0 || detid == 0xFFFFFFFF) {
+      edm::LogError("SiStripMonitorPedestals") << "SiStripMonitorPedestals::createMEs: "
+                                               << "Wrong DetId !!!!!! " << detid << " Neglecting !!!!!! ";
       continue;
     }
 
     unsigned int apv_pairs = detcabling->nApvPairs(detid);
-    
+
     // Check consistency in Apv numbers
     if (apv_pairs < 1 || apv_pairs > 3) {
-      edm::LogError("SiStripMonitorPedestals") <<"SiStripMonitorPedestals::createMEs: Wrong APV Pairs  => detId "
-                << detid  << " APV pairs " << apv_pairs <<  " Neglecting !!!!!! ";
+      edm::LogError("SiStripMonitorPedestals") << "SiStripMonitorPedestals::createMEs: Wrong APV Pairs  => detId "
+                                               << detid << " APV pairs " << apv_pairs << " Neglecting !!!!!! ";
       continue;
     }
     unsigned int napvs = apv_pairs * 2;
-    unsigned int nStrip  = napvs * 128;
+    unsigned int nStrip = napvs * 128;
 
-    bool newDetId =   apvFactory_->instantiateApvs(detid,napvs);  
-  
-    if( newDetId ) {
+    bool newDetId = apvFactory_->instantiateApvs(detid, napvs);
+
+    if (newDetId) {
       ModMEs local_modmes;
       local_modmes.PedsPerStrip = nullptr;
-      local_modmes.PedsDistribution = nullptr;      
+      local_modmes.PedsDistribution = nullptr;
       local_modmes.PedsEvolution = nullptr;
       local_modmes.CMSubNoisePerStrip = nullptr;
       local_modmes.RawNoisePerStrip = nullptr;
@@ -173,379 +176,391 @@ void SiStripMonitorPedestals::createMEs(DQMStore::IBooker & ibooker , const edm:
 
       std::string hid;
       // set appropriate folder using SiStripFolderOrganizer
-      folder_organizer.setDetectorFolder(detid, tTopo); // pass the detid to this method
-      
-      // if the deid already exists in the map, then reset MEs otherwise create them
+      folder_organizer.setDetectorFolder(detid, tTopo);  // pass the detid to this method
+
+      // if the deid already exists in the map, then reset MEs otherwise create
+      // them
       resetMEs(detid);
-      
-      if (runTypeFlag_ == RunMode1 || runTypeFlag_ == RunMode3 ) {
-	//Pedestals histos
-	hid = hidmanager.createHistoId("PedestalFromCondDB","det", detid);
-	local_modmes.PedsPerStripDB = ibooker.book1D(hid, hid, nStrip,0.5,nStrip+0.5); //to modify the size binning 
-	ibooker.tag(local_modmes.PedsPerStripDB, detid);
-	(local_modmes.PedsPerStripDB)->setAxisTitle("Pedestal from CondDB(ADC) vs Strip Number",1);
-	
-	hid = hidmanager.createHistoId("NoiseFromCondDB","det", detid);
-	local_modmes.CMSubNoisePerStripDB = ibooker.book1D(hid, hid, nStrip,0.5,nStrip+0.5);
-	ibooker.tag(local_modmes.CMSubNoisePerStripDB, detid);
-	(local_modmes.CMSubNoisePerStripDB)->setAxisTitle("CMSubNoise from CondDB(ADC) vs Strip Number",1);
-	
-	hid = hidmanager.createHistoId("BadStripFlagCondDB","det", detid);
-	local_modmes.BadStripsDB = ibooker.book2D(hid, hid, nStrip,0.5,nStrip+0.5,6,-0.5,5.5);
-	ibooker.tag(local_modmes.BadStripsDB, detid);
-	(local_modmes.BadStripsDB)->setAxisTitle("Strip Flag from CondDB(ADC) vs Strip Number",1);
+
+      if (runTypeFlag_ == RunMode1 || runTypeFlag_ == RunMode3) {
+        // Pedestals histos
+        hid = hidmanager.createHistoId("PedestalFromCondDB", "det", detid);
+        local_modmes.PedsPerStripDB =
+            ibooker.book1D(hid, hid, nStrip, 0.5, nStrip + 0.5);  // to modify the size binning
+        ibooker.tag(local_modmes.PedsPerStripDB, detid);
+        (local_modmes.PedsPerStripDB)->setAxisTitle("Pedestal from CondDB(ADC) vs Strip Number", 1);
+
+        hid = hidmanager.createHistoId("NoiseFromCondDB", "det", detid);
+        local_modmes.CMSubNoisePerStripDB = ibooker.book1D(hid, hid, nStrip, 0.5, nStrip + 0.5);
+        ibooker.tag(local_modmes.CMSubNoisePerStripDB, detid);
+        (local_modmes.CMSubNoisePerStripDB)->setAxisTitle("CMSubNoise from CondDB(ADC) vs Strip Number", 1);
+
+        hid = hidmanager.createHistoId("BadStripFlagCondDB", "det", detid);
+        local_modmes.BadStripsDB = ibooker.book2D(hid, hid, nStrip, 0.5, nStrip + 0.5, 6, -0.5, 5.5);
+        ibooker.tag(local_modmes.BadStripsDB, detid);
+        (local_modmes.BadStripsDB)->setAxisTitle("Strip Flag from CondDB(ADC) vs Strip Number", 1);
       }
-      if (runTypeFlag_ == RunMode2 || runTypeFlag_ == RunMode3 ) { 
-	//Pedestals histos
-	hid = hidmanager.createHistoId("PedsPerStrip","det", detid);
-	local_modmes.PedsPerStrip = ibooker.book1D(hid, hid, nStrip,0.5,nStrip+0.5); //to modify the size binning 
-	ibooker.tag(local_modmes.PedsPerStrip, detid);
-	(local_modmes.PedsPerStrip)->setAxisTitle("Pedestal (ADC)  vs Strip Number ",1);
-	
-	hid = hidmanager.createHistoId("PedsDistribution","det", detid);
-	local_modmes.PedsDistribution = ibooker.book2D(hid, hid, napvs,-0.5,napvs-0.5, 300, 200, 500); //to modify the size binning 
-	ibooker.tag(local_modmes.PedsDistribution, detid);
-	(local_modmes.PedsDistribution)->setAxisTitle("Apv Number",1);
-	(local_modmes.PedsDistribution)->setAxisTitle("Mean Pedestal Value (ADC)",2);
-	
-	hid = hidmanager.createHistoId("PedsEvolution","det", detid);
-	local_modmes.PedsEvolution = ibooker.book2D(hid, hid, napvs,-0.5,napvs-0.5, 50, 0., 50.); //to modify the size binning 
-	ibooker.tag(local_modmes.PedsEvolution, detid);
-	(local_modmes.PedsEvolution)->setAxisTitle("Apv Number",1);
-	(local_modmes.PedsEvolution)->setAxisTitle("Iteration Number",2);
-	
-	//Noise histos
-	hid = hidmanager.createHistoId("CMSubNoisePerStrip","det", detid);
-	local_modmes.CMSubNoisePerStrip = ibooker.book1D(hid, hid, nStrip,0.5,nStrip+0.5);
-	ibooker.tag(local_modmes.CMSubNoisePerStrip, detid);
-	(local_modmes.CMSubNoisePerStrip)->setAxisTitle("CMSubNoise (ADC) vs Strip Number",1);
-	
-	hid = hidmanager.createHistoId("RawNoisePerStrip","det", detid);
-	local_modmes.RawNoisePerStrip = ibooker.book1D(hid, hid, nStrip,0.5,nStrip+0.5);
-	ibooker.tag(local_modmes.RawNoisePerStrip, detid);
-	(local_modmes.RawNoisePerStrip)->setAxisTitle("RawNoise(ADC) vs Strip Number",1);
-	
-	hid = hidmanager.createHistoId("CMSubNoiseProfile","det", detid);
-	local_modmes.CMSubNoiseProfile = ibooker.bookProfile(hid, hid, nStrip,0.5,nStrip+0.5, 100, 0., 100.);
-	ibooker.tag(local_modmes.CMSubNoiseProfile, detid);
-	(local_modmes.CMSubNoiseProfile)->setAxisTitle("Mean of CMSubNoise (ADC) vs Strip Number",1);
-	
-	hid = hidmanager.createHistoId("RawNoiseProfile","det", detid);
-	local_modmes.RawNoiseProfile = ibooker.bookProfile(hid, hid, nStrip,0.5,nStrip+0.5, 100, 0., 100.);
-	ibooker.tag(local_modmes.RawNoiseProfile, detid);
-	(local_modmes.RawNoiseProfile)->setAxisTitle("Mean of RawNoise (ADC) vs Strip Number",1);
-	
-	hid = hidmanager.createHistoId("NoisyStrips","det", detid);
-	local_modmes.NoisyStrips = ibooker.book2D(hid, hid, nStrip,0.5,nStrip+0.5,6,-0.5,5.5);
-	ibooker.tag(local_modmes.NoisyStrips, detid);
-	(local_modmes.NoisyStrips)->setAxisTitle("Strip Number",1);
-	(local_modmes.NoisyStrips)->setAxisTitle("Flag Value",2);
-	
-	hid = hidmanager.createHistoId("NoisyStripDistribution","det", detid);
-	local_modmes.NoisyStripDistribution = ibooker.book1D(hid, hid, 11, -0.5,10.5);
-	ibooker.tag(local_modmes.NoisyStripDistribution, detid);
-	(local_modmes.NoisyStripDistribution)->setAxisTitle("Flag Value",1);
-	
-	//Common Mode histos
-	hid = hidmanager.createHistoId("CMDistribution","det", detid);
-	local_modmes.CMDistribution = ibooker.book2D(hid, hid, napvs,-0.5,napvs-0.5, 150, -15., 15.); 
-	ibooker.tag(local_modmes.CMDistribution, detid);
-	(local_modmes.CMDistribution)->setAxisTitle("Common Mode (ADC) vs APV Number",1);
-      
-	hid = hidmanager.createHistoId("CMSlopeDistribution","det", detid);
-	local_modmes.CMSlopeDistribution = ibooker.book2D(hid, hid, napvs,-0.5,napvs-0.5, 100, -0.05, 0.05); 
-	ibooker.tag(local_modmes.CMSlopeDistribution, detid);
-	(local_modmes.CMSlopeDistribution)->setAxisTitle("Common Mode Slope vs APV Number",1);
-	
+      if (runTypeFlag_ == RunMode2 || runTypeFlag_ == RunMode3) {
+        // Pedestals histos
+        hid = hidmanager.createHistoId("PedsPerStrip", "det", detid);
+        local_modmes.PedsPerStrip = ibooker.book1D(hid, hid, nStrip, 0.5, nStrip + 0.5);  // to modify the size binning
+        ibooker.tag(local_modmes.PedsPerStrip, detid);
+        (local_modmes.PedsPerStrip)->setAxisTitle("Pedestal (ADC)  vs Strip Number ", 1);
+
+        hid = hidmanager.createHistoId("PedsDistribution", "det", detid);
+        local_modmes.PedsDistribution = ibooker.book2D(hid,
+                                                       hid,
+                                                       napvs,
+                                                       -0.5,
+                                                       napvs - 0.5,
+                                                       300,
+                                                       200,
+                                                       500);  // to modify the size binning
+        ibooker.tag(local_modmes.PedsDistribution, detid);
+        (local_modmes.PedsDistribution)->setAxisTitle("Apv Number", 1);
+        (local_modmes.PedsDistribution)->setAxisTitle("Mean Pedestal Value (ADC)", 2);
+
+        hid = hidmanager.createHistoId("PedsEvolution", "det", detid);
+        local_modmes.PedsEvolution = ibooker.book2D(hid,
+                                                    hid,
+                                                    napvs,
+                                                    -0.5,
+                                                    napvs - 0.5,
+                                                    50,
+                                                    0.,
+                                                    50.);  // to modify the size binning
+        ibooker.tag(local_modmes.PedsEvolution, detid);
+        (local_modmes.PedsEvolution)->setAxisTitle("Apv Number", 1);
+        (local_modmes.PedsEvolution)->setAxisTitle("Iteration Number", 2);
+
+        // Noise histos
+        hid = hidmanager.createHistoId("CMSubNoisePerStrip", "det", detid);
+        local_modmes.CMSubNoisePerStrip = ibooker.book1D(hid, hid, nStrip, 0.5, nStrip + 0.5);
+        ibooker.tag(local_modmes.CMSubNoisePerStrip, detid);
+        (local_modmes.CMSubNoisePerStrip)->setAxisTitle("CMSubNoise (ADC) vs Strip Number", 1);
+
+        hid = hidmanager.createHistoId("RawNoisePerStrip", "det", detid);
+        local_modmes.RawNoisePerStrip = ibooker.book1D(hid, hid, nStrip, 0.5, nStrip + 0.5);
+        ibooker.tag(local_modmes.RawNoisePerStrip, detid);
+        (local_modmes.RawNoisePerStrip)->setAxisTitle("RawNoise(ADC) vs Strip Number", 1);
+
+        hid = hidmanager.createHistoId("CMSubNoiseProfile", "det", detid);
+        local_modmes.CMSubNoiseProfile = ibooker.bookProfile(hid, hid, nStrip, 0.5, nStrip + 0.5, 100, 0., 100.);
+        ibooker.tag(local_modmes.CMSubNoiseProfile, detid);
+        (local_modmes.CMSubNoiseProfile)->setAxisTitle("Mean of CMSubNoise (ADC) vs Strip Number", 1);
+
+        hid = hidmanager.createHistoId("RawNoiseProfile", "det", detid);
+        local_modmes.RawNoiseProfile = ibooker.bookProfile(hid, hid, nStrip, 0.5, nStrip + 0.5, 100, 0., 100.);
+        ibooker.tag(local_modmes.RawNoiseProfile, detid);
+        (local_modmes.RawNoiseProfile)->setAxisTitle("Mean of RawNoise (ADC) vs Strip Number", 1);
+
+        hid = hidmanager.createHistoId("NoisyStrips", "det", detid);
+        local_modmes.NoisyStrips = ibooker.book2D(hid, hid, nStrip, 0.5, nStrip + 0.5, 6, -0.5, 5.5);
+        ibooker.tag(local_modmes.NoisyStrips, detid);
+        (local_modmes.NoisyStrips)->setAxisTitle("Strip Number", 1);
+        (local_modmes.NoisyStrips)->setAxisTitle("Flag Value", 2);
+
+        hid = hidmanager.createHistoId("NoisyStripDistribution", "det", detid);
+        local_modmes.NoisyStripDistribution = ibooker.book1D(hid, hid, 11, -0.5, 10.5);
+        ibooker.tag(local_modmes.NoisyStripDistribution, detid);
+        (local_modmes.NoisyStripDistribution)->setAxisTitle("Flag Value", 1);
+
+        // Common Mode histos
+        hid = hidmanager.createHistoId("CMDistribution", "det", detid);
+        local_modmes.CMDistribution = ibooker.book2D(hid, hid, napvs, -0.5, napvs - 0.5, 150, -15., 15.);
+        ibooker.tag(local_modmes.CMDistribution, detid);
+        (local_modmes.CMDistribution)->setAxisTitle("Common Mode (ADC) vs APV Number", 1);
+
+        hid = hidmanager.createHistoId("CMSlopeDistribution", "det", detid);
+        local_modmes.CMSlopeDistribution = ibooker.book2D(hid, hid, napvs, -0.5, napvs - 0.5, 100, -0.05, 0.05);
+        ibooker.tag(local_modmes.CMSlopeDistribution, detid);
+        (local_modmes.CMSlopeDistribution)->setAxisTitle("Common Mode Slope vs APV Number", 1);
       }
       // data from CondDB
       // append to PedMEs
-      PedMEs.insert( std::make_pair(detid, local_modmes));
-    } //newDetId
-          
+      PedMEs.insert(std::make_pair(detid, local_modmes));
+    }  // newDetId
   }
-  edm::LogInfo("SiStripMonitorPedestals") <<"SiStripMonitorPedestals::createMEs: Number of DETS used "
-                   <<PedMEs.size();
+  edm::LogInfo("SiStripMonitorPedestals")
+      << "SiStripMonitorPedestals::createMEs: Number of DETS used " << PedMEs.size();
 }
 // ------------ method called to produce the data  ------------
-void SiStripMonitorPedestals::analyze(const edm::Event& iEvent, const edm::EventSetup& eSetup)
-{
-
-  edm::LogInfo("SiStripMonitorPedestals") <<
-               "SiStripMonitorPedestals::analyze: Run " << 
-               iEvent.id().run()  << " Event " << iEvent.id().event();
+void SiStripMonitorPedestals::analyze(const edm::Event &iEvent, const edm::EventSetup &eSetup) {
+  edm::LogInfo("SiStripMonitorPedestals")
+      << "SiStripMonitorPedestals::analyze: Run " << iEvent.id().run() << " Event " << iEvent.id().event();
 
-  eSetup.get<SiStripDetCablingRcd>().get( detcabling );
+  eSetup.get<SiStripDetCablingRcd>().get(detcabling);
 
-  if (runTypeFlag_ != RunMode2 &&  runTypeFlag_ != RunMode3 ) return;
+  if (runTypeFlag_ != RunMode2 && runTypeFlag_ != RunMode3)
+    return;
 
-  //Increment # of Events
+  // Increment # of Events
   nEvTot_++;
- 
+
   // get DigiCollection object from Event
-  edm::Handle< edm::DetSetVector<SiStripRawDigi> > digi_collection;
-  //you have a collection as there are all the digis for the event for every detector
+  edm::Handle<edm::DetSetVector<SiStripRawDigi>> digi_collection;
+  // you have a collection as there are all the digis for the event for every
+  // detector
   iEvent.getByToken(digiToken_, digi_collection);
 
-  //Increase the number of iterations ...
-  if((nEvTot_ - theEventInitNumber_)%theEventIterNumber_ == 1) nIteration_++;
-  
+  // Increase the number of iterations ...
+  if ((nEvTot_ - theEventInitNumber_) % theEventIterNumber_ == 1)
+    nIteration_++;
 
   // loop over all MEs
-  for (std::map<uint32_t, ModMEs >::const_iterator i = PedMEs.begin() ; i!=PedMEs.end() ; i++) {
-    uint32_t detid = i->first; ModMEs local_modmes = i->second;
-    // get iterators for digis belonging to one DetId, it is an iterator, i.e. one element of the vector      
-    std::vector< edm::DetSet<SiStripRawDigi> >::const_iterator digis = digi_collection->find( detid );
-    if (digis == digi_collection->end() ||
-        digis->data.empty() || 
-        digis->data.size() > 768) {
+  for (std::map<uint32_t, ModMEs>::const_iterator i = PedMEs.begin(); i != PedMEs.end(); i++) {
+    uint32_t detid = i->first;
+    ModMEs local_modmes = i->second;
+    // get iterators for digis belonging to one DetId, it is an iterator, i.e.
+    // one element of the vector
+    std::vector<edm::DetSet<SiStripRawDigi>>::const_iterator digis = digi_collection->find(detid);
+    if (digis == digi_collection->end() || digis->data.empty() || digis->data.size() > 768) {
       if (digis == digi_collection->end()) {
-        edm::LogError("SiStripMonitorPedestals") << " SiStripMonitorPedestals::analyze: Event " <<  nEvTot_ 
-               << " DetId " <<  detid << " at the end of Digi Collection!!!"; 
+        edm::LogError("SiStripMonitorPedestals") << " SiStripMonitorPedestals::analyze: Event " << nEvTot_ << " DetId "
+                                                 << detid << " at the end of Digi Collection!!!";
       } else {
-        edm::LogError("SiStripMonitorPedestals") << " [SiStripMonitorPedestals::analyze: Event " <<  nEvTot_ 
-               << " DetId " <<  detid << " # of Digis " << digis->data.size() ;
+        edm::LogError("SiStripMonitorPedestals") << " [SiStripMonitorPedestals::analyze: Event " << nEvTot_ << " DetId "
+                                                 << detid << " # of Digis " << digis->data.size();
       }
       std::vector<const FedChannelConnection *> fed_conns = detcabling->getConnections(detid);
       bool firstchannel(true);
-      for (unsigned int  k = 0; k < fed_conns.size() ; k++) {
-	if(fed_conns[k] && fed_conns[k]->isConnected()) {
-	  if (firstchannel) {
-	    edm::LogError("SiStripMonitorPedestals") <<" SiStripMonitorPedestals::analyze: Fed Id " <<
-	      fed_conns[k]->fedId() << " Channel " << fed_conns[k]->fedCh();
-	    firstchannel=false;
-	  }
-	  else  edm::LogError("SiStripMonitorPedestals")  <<"  SiStripMonitorPedestals::analyze: Channel " <<
-		  fed_conns[k]->fedCh();
-	}
+      for (unsigned int k = 0; k < fed_conns.size(); k++) {
+        if (fed_conns[k] && fed_conns[k]->isConnected()) {
+          if (firstchannel) {
+            edm::LogError("SiStripMonitorPedestals") << " SiStripMonitorPedestals::analyze: Fed Id "
+                                                     << fed_conns[k]->fedId() << " Channel " << fed_conns[k]->fedCh();
+            firstchannel = false;
+          } else
+            edm::LogError("SiStripMonitorPedestals")
+                << "  SiStripMonitorPedestals::analyze: Channel " << fed_conns[k]->fedCh();
+        }
       }
       std::cout << std::endl;
       continue;
     }
 
-    if ( digis->data.empty() ) { 
-      edm::LogError("MonitorDigi_tmp") << "[SiStripRawDigiToRaw::createFedBuffers] Zero digis found!"; 
-    } 
-    uint32_t id  = detid;
+    if (digis->data.empty()) {
+      edm::LogError("MonitorDigi_tmp") << "[SiStripRawDigiToRaw::createFedBuffers] Zero digis found!";
+    }
+    uint32_t id = detid;
     //    cout <<"Data size "<<digis->data.size()<<endl;
     apvFactory_->update(id, (*digis));
-      
-    if(nEvTot_ > theEventInitNumber_) {
-      if(local_modmes.CMDistribution != nullptr){ 
-	std::vector<float> tmp;
-	tmp.clear();
-	apvFactory_->getCommonMode(id, tmp);
-	//unpacking the info looking at the right topology
-	int numberCMBlocks = int(128. / NumCMstripsInGroup_);
-	int ibin=0;
-	for (std::vector<float>::const_iterator iped=tmp.begin(); iped!=tmp.end();iped++) {
-	  int iapv = int (ibin/numberCMBlocks);
-	  (local_modmes.CMDistribution)->Fill(iapv,static_cast<float>(*iped));
-	  ibin++;
-	    
-	}
+
+    if (nEvTot_ > theEventInitNumber_) {
+      if (local_modmes.CMDistribution != nullptr) {
+        std::vector<float> tmp;
+        tmp.clear();
+        apvFactory_->getCommonMode(id, tmp);
+        // unpacking the info looking at the right topology
+        int numberCMBlocks = int(128. / NumCMstripsInGroup_);
+        int ibin = 0;
+        for (std::vector<float>::const_iterator iped = tmp.begin(); iped != tmp.end(); iped++) {
+          int iapv = int(ibin / numberCMBlocks);
+          (local_modmes.CMDistribution)->Fill(iapv, static_cast<float>(*iped));
+          ibin++;
+        }
       }
-      if(local_modmes.CMSlopeDistribution != nullptr){ 
-	std::vector<float> tmp;
-	tmp.clear();
+      if (local_modmes.CMSlopeDistribution != nullptr) {
+        std::vector<float> tmp;
+        tmp.clear();
         int iapv = 0;
-	apvFactory_->getCommonModeSlope(id, tmp);
-	for (std::vector<float>::const_iterator it=tmp.begin(); it!=tmp.end();it++) {
-	  (local_modmes.CMSlopeDistribution)->Fill(iapv,static_cast<float>(*it));
-	  iapv++;
-	}
+        apvFactory_->getCommonModeSlope(id, tmp);
+        for (std::vector<float>::const_iterator it = tmp.begin(); it != tmp.end(); it++) {
+          (local_modmes.CMSlopeDistribution)->Fill(iapv, static_cast<float>(*it));
+          iapv++;
+        }
+      }
+    }
+
+    // asking for the status
+    if ((nEvTot_ - theEventInitNumber_ - theEventIterNumber_) % theEventIterNumber_ == 1) {
+      std::vector<float> tmp;
+      tmp.clear();
+      apvFactory_->getPedestal(id, tmp);
+      if (local_modmes.PedsPerStrip != nullptr) {
+        int numberOfApvs = int(tmp.size() / 128.);
+        for (int i = 0; i < numberOfApvs; i++) {
+          std::vector<float> myPedPerApv;
+          apvFactory_->getPedestal(id, i, myPedPerApv);
+          float avarage = 0;
+          avarage = std::accumulate(myPedPerApv.begin(), myPedPerApv.end(), avarage);
+          avarage = avarage / 128.;
+          (local_modmes.PedsEvolution)->setBinContent(i + 1, nIteration_, avarage);
+        }
+        int ibin = 0;
+
+        for (std::vector<float>::const_iterator iped = tmp.begin(); iped != tmp.end(); iped++) {
+          int napv = int(ibin / 128.);
+          ibin++;
+          float last_value = (local_modmes.PedsPerStrip)->getBinContent(ibin);
+          if (last_value != 0.) {
+            (local_modmes.PedsPerStrip)->setBinContent(ibin, (static_cast<float>(*iped) + last_value) / 2.);
+          } else {
+            (local_modmes.PedsPerStrip)->setBinContent(ibin, static_cast<float>(*iped));
+          }
+          (local_modmes.PedsDistribution)->Fill(napv, static_cast<float>(*iped));
+        }
+      }
+
+      if (local_modmes.CMSubNoisePerStrip != nullptr && local_modmes.CMSubNoiseProfile != nullptr) {
+        tmp.clear();
+        apvFactory_->getNoise(id, tmp);
+        int ibin = 0;
+        for (std::vector<float>::const_iterator iped = tmp.begin(); iped != tmp.end(); iped++) {
+          ibin++;
+          (local_modmes.CMSubNoiseProfile)->Fill(static_cast<double>(ibin * 1.), static_cast<float>(*iped));
+
+          float last_value = (local_modmes.CMSubNoisePerStrip)->getBinContent(ibin);
+          if (last_value != 0.) {
+            (local_modmes.CMSubNoisePerStrip)->setBinContent(ibin, (static_cast<float>(*iped) + last_value) / 2.);
+          } else {
+            (local_modmes.CMSubNoisePerStrip)->setBinContent(ibin, static_cast<float>(*iped));
+          }
+        }
+      }
+
+      if (local_modmes.RawNoisePerStrip != nullptr && local_modmes.RawNoiseProfile != nullptr) {
+        tmp.clear();
+        apvFactory_->getRawNoise(id, tmp);
+        int ibin = 0;
+        for (std::vector<float>::const_iterator iped = tmp.begin(); iped != tmp.end(); iped++) {
+          ibin++;
+          (local_modmes.RawNoiseProfile)->Fill(static_cast<double>(ibin * 1.), static_cast<float>(*iped));
+          float last_value = (local_modmes.RawNoisePerStrip)->getBinContent(ibin);
+          if (last_value != 0.) {
+            (local_modmes.RawNoisePerStrip)->setBinContent(ibin, (static_cast<float>(*iped) + last_value) / 2.);
+          } else {
+            (local_modmes.RawNoisePerStrip)->setBinContent(ibin, static_cast<float>(*iped));
+          }
+        }
+      }
+
+      if (local_modmes.NoisyStrips != nullptr) {
+        TkApvMask::MaskType temp;
+        apvFactory_->getMask(id, temp);
+        int ibin = 0;
+        for (TkApvMask::MaskType::const_iterator iped = temp.begin(); iped != temp.end(); iped++) {
+          ibin++;
+
+          if (nIteration_ < 2) {
+            if (*iped == 1)
+              (local_modmes.NoisyStrips)->Fill(ibin, 3.);
+            if (*iped == 2)
+              (local_modmes.NoisyStrips)->Fill(ibin, 4.);
+            if (*iped == 0)
+              (local_modmes.NoisyStrips)->Fill(ibin, 0.);
+          } else {
+            (local_modmes.NoisyStrips)->Fill(ibin, static_cast<float>(*iped));
+            (local_modmes.NoisyStripDistribution)->Fill(static_cast<float>(*iped));
+          }
+        }
       }
     }
-      
-    //asking for the status
-    if((nEvTot_ - theEventInitNumber_ - theEventIterNumber_)%theEventIterNumber_ == 1)
-      {
-	      
-	std::vector<float> tmp;
-	tmp.clear();
-	apvFactory_->getPedestal(id, tmp);
-	if(local_modmes.PedsPerStrip != nullptr){ 
-	  int numberOfApvs = int(tmp.size()/128.);
-	  for(int i=0; i<numberOfApvs;i++){
-	    std::vector<float> myPedPerApv;
-	    apvFactory_->getPedestal(id, i, myPedPerApv);
-	    float avarage = 0;
-	    avarage = std::accumulate(myPedPerApv.begin(), myPedPerApv.end(), avarage);
-	    avarage = avarage/128.;
-	    (local_modmes.PedsEvolution)->setBinContent(i+1,nIteration_,avarage);
-	      
-	  }
-	  int ibin=0;
-	  
-	  for (std::vector<float>::const_iterator iped=tmp.begin(); iped!=tmp.end();iped++) {
-	    int napv = int(ibin / 128.);
-	    ibin++;
-	    float last_value = (local_modmes.PedsPerStrip)->getBinContent(ibin);
-	    if(last_value != 0.){
-	      (local_modmes.PedsPerStrip)->setBinContent(ibin,(static_cast<float>(*iped) + last_value)/2.);
-	    }else{
-	      (local_modmes.PedsPerStrip)->setBinContent(ibin,static_cast<float>(*iped));
-	    }
-	    (local_modmes.PedsDistribution)->Fill(napv,static_cast<float>(*iped));
-	  }
-	}
-	  
-	if(local_modmes.CMSubNoisePerStrip != nullptr && local_modmes.CMSubNoiseProfile != nullptr){ 
-	  tmp.clear();
-	  apvFactory_->getNoise(id, tmp);
-	  int ibin=0;
-	  for (std::vector<float>::const_iterator iped=tmp.begin(); iped!=tmp.end();iped++) {
-	    ibin++;
-	    (local_modmes.CMSubNoiseProfile)->Fill(static_cast<double>(ibin*1.),static_cast<float>(*iped));
-
-	    float last_value = (local_modmes.CMSubNoisePerStrip)->getBinContent(ibin);
-	    if(last_value != 0.){
-	      (local_modmes.CMSubNoisePerStrip)->setBinContent(ibin,(static_cast<float>(*iped)+last_value)/2.);
-	    }else{
-	      (local_modmes.CMSubNoisePerStrip)->setBinContent(ibin,static_cast<float>(*iped));
-	    }
-	  }
-	}
-
-	  
-	if(local_modmes.RawNoisePerStrip != nullptr && local_modmes.RawNoiseProfile != nullptr){ 
-	  tmp.clear();
-	  apvFactory_->getRawNoise(id, tmp);
-	  int ibin=0;
-	  for (std::vector<float>::const_iterator iped=tmp.begin(); iped!=tmp.end();iped++) {
-	    ibin++;
-	    (local_modmes.RawNoiseProfile)->Fill(static_cast<double>(ibin*1.),static_cast<float>(*iped));
-	    float last_value = (local_modmes.RawNoisePerStrip)->getBinContent(ibin);
-	    if(last_value != 0.){
-	      (local_modmes.RawNoisePerStrip)->setBinContent(ibin,(static_cast<float>(*iped)+last_value)/2.);
-	    }else{
-	      (local_modmes.RawNoisePerStrip)->setBinContent(ibin,static_cast<float>(*iped));
-	    }
-	  }
-	}
-
-	if(local_modmes.NoisyStrips != nullptr){ 
-	  TkApvMask::MaskType temp;
-	  apvFactory_->getMask(id, temp);
-	  int ibin=0;
-	  for (TkApvMask::MaskType::const_iterator iped=temp.begin(); iped!=temp.end();iped++) {
-	    ibin++;
-	      
-	    if(nIteration_ <2){
-	      if(*iped == 1)
-		(local_modmes.NoisyStrips)->Fill(ibin,3.);
-	      if(*iped == 2)
-		(local_modmes.NoisyStrips)->Fill(ibin,4.);
-	      if(*iped == 0)
-		(local_modmes.NoisyStrips)->Fill(ibin,0.);
-	    }else{
-	      (local_modmes.NoisyStrips)->Fill(ibin,static_cast<float>(*iped));
-	      (local_modmes.NoisyStripDistribution)->Fill(static_cast<float>(*iped));
-	    }
-	  }
-	}
-
-
-      }    
   }
-  if (firstEvent) firstEvent=false;  
+  if (firstEvent)
+    firstEvent = false;
 }
 //
 // -- End Run
-//    
-void SiStripMonitorPedestals::endRun(edm::Run const& run, edm::EventSetup const& eSetup) {
+//
+void SiStripMonitorPedestals::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
   bool outputMEsInRootFile = conf_.getParameter<bool>("OutputMEsInRootFile");
-  if (outputMEsInRootFile) {    
+  if (outputMEsInRootFile) {
     std::string outPutFileName = conf_.getParameter<std::string>("OutPutFileName");
-//    dqmStore_->showDirStructure();
+    //    dqmStore_->showDirStructure();
     dqmStore_->save(outPutFileName);
   }
 }
 //
 // -- End Job
-//    
-void SiStripMonitorPedestals::endJob(void){
-  edm::LogInfo("SiStripMonitorPedestals") <<"SiStripMonitorPedestals::EndJob: " 
-					  << " Finishing!! ";        
+//
+void SiStripMonitorPedestals::endJob(void) {
+  edm::LogInfo("SiStripMonitorPedestals") << "SiStripMonitorPedestals::EndJob: "
+                                          << " Finishing!! ";
 }
 //
 // -- Reset Monitor Elements corresponding to a detetor
-//    
-void SiStripMonitorPedestals::resetMEs(uint32_t idet){
-  std::map<uint32_t, ModMEs >::iterator pos = PedMEs.find(idet);
+//
+void SiStripMonitorPedestals::resetMEs(uint32_t idet) {
+  std::map<uint32_t, ModMEs>::iterator pos = PedMEs.find(idet);
   if (pos != PedMEs.end()) {
     ModMEs mod_me = pos->second;
 
-    if (runTypeFlag_ == RunMode1 || runTypeFlag_ == RunMode3 ) { 
-      mod_me.PedsPerStripDB->Reset();     
-      mod_me.CMSubNoisePerStripDB->Reset();     
-      mod_me.BadStripsDB->Reset();     
+    if (runTypeFlag_ == RunMode1 || runTypeFlag_ == RunMode3) {
+      mod_me.PedsPerStripDB->Reset();
+      mod_me.CMSubNoisePerStripDB->Reset();
+      mod_me.BadStripsDB->Reset();
     }
-    if (runTypeFlag_ == RunMode2 || runTypeFlag_ == RunMode3 ) { 
-      mod_me.PedsPerStrip->Reset();      
-      mod_me.PedsDistribution->Reset();      
-      mod_me.PedsEvolution->Reset();      
-      mod_me.CMSubNoisePerStrip->Reset();      
-      mod_me.RawNoisePerStrip->Reset();      
-      mod_me.CMSubNoiseProfile->Reset();      
-      mod_me.RawNoiseProfile->Reset();      
-      mod_me.NoisyStrips->Reset();      
-      mod_me.CMDistribution->Reset();     
-      mod_me.CMSlopeDistribution->Reset(); 
+    if (runTypeFlag_ == RunMode2 || runTypeFlag_ == RunMode3) {
+      mod_me.PedsPerStrip->Reset();
+      mod_me.PedsDistribution->Reset();
+      mod_me.PedsEvolution->Reset();
+      mod_me.CMSubNoisePerStrip->Reset();
+      mod_me.RawNoisePerStrip->Reset();
+      mod_me.CMSubNoiseProfile->Reset();
+      mod_me.RawNoiseProfile->Reset();
+      mod_me.NoisyStrips->Reset();
+      mod_me.CMDistribution->Reset();
+      mod_me.CMSlopeDistribution->Reset();
     }
   }
 }
 //
 // -- Fill CondDB Monitoring Elements
 //
-void SiStripMonitorPedestals::fillCondDBMEs(edm::EventSetup const& eSetup) {
-  //get Pedestal and Noise  ES handle
+void SiStripMonitorPedestals::fillCondDBMEs(edm::EventSetup const &eSetup) {
+  // get Pedestal and Noise  ES handle
   edm::ESHandle<SiStripPedestals> pedestalHandle;
   edm::ESHandle<SiStripNoises> noiseHandle;
   edm::ESHandle<SiStripQuality> qualityHandle;
-  
+
   eSetup.get<SiStripPedestalsRcd>().get(pedestalHandle);
   eSetup.get<SiStripNoisesRcd>().get(noiseHandle);
   std::string quality_label = conf_.getParameter<std::string>("StripQualityLabel");
   eSetup.get<SiStripQualityRcd>().get(quality_label, qualityHandle);
 
-  for (std::map<uint32_t, ModMEs >::const_iterator i = PedMEs.begin() ; i!=PedMEs.end() ; i++) {
-    uint32_t detid = i->first; 
+  for (std::map<uint32_t, ModMEs>::const_iterator i = PedMEs.begin(); i != PedMEs.end(); i++) {
+    uint32_t detid = i->first;
     ModMEs local_modmes = i->second;
-    edm::LogInfo("SiStripMonitorPedestals") <<" SiStripMonitorPedestals::analyze: " <<
-      " Get Ped/Noise/Bad Strips from CondDb for DetId " << detid;
-    int nStrip  = detcabling->nApvPairs(detid) * 256;
+    edm::LogInfo("SiStripMonitorPedestals") << " SiStripMonitorPedestals::analyze: "
+                                            << " Get Ped/Noise/Bad Strips from CondDb for DetId " << detid;
+    int nStrip = detcabling->nApvPairs(detid) * 256;
     // Get range of pedestal and noise for the detid
     SiStripNoises::Range noiseRange = noiseHandle->getRange(detid);
     SiStripPedestals::Range pedRange = pedestalHandle->getRange(detid);
     SiStripQuality::Range qualityRange = qualityHandle->getRange(detid);
-    
-    for(int istrip=0;istrip<nStrip;++istrip){
-      try{
-	//Fill Pedestals
-	(local_modmes.PedsPerStripDB)->Fill(istrip+1,pedestalHandle->getPed(istrip,pedRange));
-      }
-      catch(cms::Exception& e){
-	edm::LogError("SiStripMonitorPedestals") << "[SiStripMonitorPedestals::analyze]  cms::Exception accessing SiStripPedestalsService_.getPedestal("<<detid<<","<<istrip<<") :  "  << " " << e.what() ;
-      }
-      try{
-	//Fill Noises
-	(local_modmes.CMSubNoisePerStripDB)->Fill(istrip+1,noiseHandle->getNoise(istrip,noiseRange));
-	
-      }
-      catch(cms::Exception& e){
-	edm::LogError("SiStripMonitorPedestals") << "[SiStripMonitorPedestals::analyze]  cms::Exception accessing SiStripNoiseService_.getNoise("<<detid<<","<<istrip<<") :  "  << " " << e.what() ;
+
+    for (int istrip = 0; istrip < nStrip; ++istrip) {
+      try {
+        // Fill Pedestals
+        (local_modmes.PedsPerStripDB)->Fill(istrip + 1, pedestalHandle->getPed(istrip, pedRange));
+      } catch (cms::Exception &e) {
+        edm::LogError("SiStripMonitorPedestals") << "[SiStripMonitorPedestals::analyze]  cms::Exception accessing "
+                                                    "SiStripPedestalsService_.getPedestal("
+                                                 << detid << "," << istrip << ") :  "
+                                                 << " " << e.what();
       }
-      try{
-	//Fill BadStripsNoise
-	(local_modmes.BadStripsDB)->Fill(istrip+1,qualityHandle->IsStripBad(qualityRange,istrip)?1.:0.);
-	
-	
+      try {
+        // Fill Noises
+        (local_modmes.CMSubNoisePerStripDB)->Fill(istrip + 1, noiseHandle->getNoise(istrip, noiseRange));
+
+      } catch (cms::Exception &e) {
+        edm::LogError("SiStripMonitorPedestals") << "[SiStripMonitorPedestals::analyze]  cms::Exception accessing "
+                                                    "SiStripNoiseService_.getNoise("
+                                                 << detid << "," << istrip << ") :  "
+                                                 << " " << e.what();
       }
-      catch(cms::Exception& e){
-	edm::LogError("SiStripMonitorPedestals") << "[SiStripMonitorPedestals::analyze]  cms::Exception accessing SiStripNoiseService_.getDisable("<<detid<<","<<istrip<<") :  "  << " " << e.what() ;
+      try {
+        // Fill BadStripsNoise
+        (local_modmes.BadStripsDB)->Fill(istrip + 1, qualityHandle->IsStripBad(qualityRange, istrip) ? 1. : 0.);
+
+      } catch (cms::Exception &e) {
+        edm::LogError("SiStripMonitorPedestals") << "[SiStripMonitorPedestals::analyze]  cms::Exception accessing "
+                                                    "SiStripNoiseService_.getDisable("
+                                                 << detid << "," << istrip << ") :  "
+                                                 << " " << e.what();
       }
-    }//close istrip loop
+    }  // close istrip loop
   }
 }
 DEFINE_FWK_MODULE(SiStripMonitorPedestals);
diff --git a/DQM/SiStripMonitorPedestals/src/SiStripMonitorQuality.cc b/DQM/SiStripMonitorPedestals/src/SiStripMonitorQuality.cc
index b1667ffcb0da9..93fc09d979f46 100644
--- a/DQM/SiStripMonitorPedestals/src/SiStripMonitorQuality.cc
+++ b/DQM/SiStripMonitorPedestals/src/SiStripMonitorQuality.cc
@@ -2,8 +2,9 @@
 //
 // Package:    SiStripMonitorQuality
 // Class:      SiStripMonitorQuality
-// 
-/**\class SiStripMonitorDigi SiStripMonitorDigi.cc DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc
+//
+/**\class SiStripMonitorDigi SiStripMonitorDigi.cc
+ DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc
 
  Description: <one line class summary>
 
@@ -21,198 +22,194 @@
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
-#include "CalibTracker/Records/interface/SiStripQualityRcd.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripQuality.h"
+#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
+#include "CalibTracker/Records/interface/SiStripQualityRcd.h"
 #include "DQM/SiStripCommon/interface/SiStripFolderOrganizer.h"
 #include "DQM/SiStripCommon/interface/SiStripHistoId.h"
 
-
-#include <FWCore/Framework/interface/EventSetup.h>
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include <FWCore/Framework/interface/EventSetup.h>
 
 #include "DQM/SiStripMonitorPedestals/interface/SiStripMonitorQuality.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
 // std
-#include <cstdlib>
+#include <algorithm>
 #include <cmath>
+#include <cstdlib>
 #include <numeric>
-#include <algorithm>
-
-SiStripMonitorQuality::SiStripMonitorQuality(edm::ParameterSet const& iConfig):
-  dqmStore_(edm::Service<DQMStore>().operator->()),
-  conf_(iConfig),
-  m_cacheID_(0)
 
+SiStripMonitorQuality::SiStripMonitorQuality(edm::ParameterSet const &iConfig)
+    : dqmStore_(edm::Service<DQMStore>().operator->()),
+      conf_(iConfig),
+      m_cacheID_(0)
 
 {
-  edm::LogInfo("SiStripMonitorQuality") <<"SiStripMonitorQuality  " 
-					  << " Constructing....... ";     
+  edm::LogInfo("SiStripMonitorQuality") << "SiStripMonitorQuality  "
+                                        << " Constructing....... ";
 }
 
-
-SiStripMonitorQuality::~SiStripMonitorQuality()
-{
-  edm::LogInfo("SiStripMonitorQuality") <<"SiStripMonitorQuality  " 
-					  << " Destructing....... ";     
+SiStripMonitorQuality::~SiStripMonitorQuality() {
+  edm::LogInfo("SiStripMonitorQuality") << "SiStripMonitorQuality  "
+                                        << " Destructing....... ";
 }
 //
-void SiStripMonitorQuality::bookHistograms(DQMStore::IBooker & ibooker , const edm::Run & run, const edm::EventSetup & eSetup){
-
-  unsigned long long cacheID = eSetup.get<SiStripQualityRcd>().cacheIdentifier();  
-  if (m_cacheID_ == cacheID) return;
-  
-  //Retrieve tracker topology from geometry
+void SiStripMonitorQuality::bookHistograms(DQMStore::IBooker &ibooker,
+                                           const edm::Run &run,
+                                           const edm::EventSetup &eSetup) {
+  unsigned long long cacheID = eSetup.get<SiStripQualityRcd>().cacheIdentifier();
+  if (m_cacheID_ == cacheID)
+    return;
+
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   eSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
-  m_cacheID_ = cacheID;       
+  m_cacheID_ = cacheID;
 
   std::string quality_label = conf_.getParameter<std::string>("StripQualityLabel");
-  eSetup.get<SiStripQualityRcd>().get(quality_label,stripQuality_);
-  eSetup.get<SiStripDetCablingRcd>().get( detCabling_ );
-  
-  edm::LogInfo("SiStripMonitorQuality") << "SiStripMonitorQuality::analyze: "<<
-    " Reading SiStripQuality "<< std::endl;
+  eSetup.get<SiStripQualityRcd>().get(quality_label, stripQuality_);
+  eSetup.get<SiStripDetCablingRcd>().get(detCabling_);
+
+  edm::LogInfo("SiStripMonitorQuality") << "SiStripMonitorQuality::analyze: "
+                                        << " Reading SiStripQuality " << std::endl;
 
   SiStripBadStrip::RegistryIterator rbegin = stripQuality_->getRegistryVectorBegin();
-  SiStripBadStrip::RegistryIterator rend   = stripQuality_->getRegistryVectorEnd();
+  SiStripBadStrip::RegistryIterator rend = stripQuality_->getRegistryVectorEnd();
   uint32_t detid;
-    
-  if (rbegin==rend) return;
 
-  for (SiStripBadStrip::RegistryIterator rp=rbegin; rp != rend; ++rp) {
+  if (rbegin == rend)
+    return;
 
+  for (SiStripBadStrip::RegistryIterator rp = rbegin; rp != rend; ++rp) {
     detid = rp->detid;
     // Check consistency in DetId
-    if (detid == 0 || detid == 0xFFFFFFFF){
-      edm::LogError("SiStripMonitorQuality") <<"SiStripMonitorQuality::bookHistograms : " 
-					     << "Wrong DetId !!!!!! " <<  detid << " Neglecting !!!!!! ";
+    if (detid == 0 || detid == 0xFFFFFFFF) {
+      edm::LogError("SiStripMonitorQuality") << "SiStripMonitorQuality::bookHistograms : "
+                                             << "Wrong DetId !!!!!! " << detid << " Neglecting !!!!!! ";
       continue;
     }
     // check if the detid is connected in cabling
     if (!detCabling_->IsConnected(detid)) {
-      edm::LogError("SiStripMonitorQuality") <<"SiStripMonitorQuality::bookHistograms : " 
-					     << " DetId " <<  detid << " not connected,  Neglecting !!!!!! ";
+      edm::LogError("SiStripMonitorQuality") << "SiStripMonitorQuality::bookHistograms : "
+                                             << " DetId " << detid << " not connected,  Neglecting !!!!!! ";
       continue;
     }
 
-    MonitorElement* det_me;
-    
-    int nStrip =  detCabling_->nApvPairs(detid) * 256;
-    
+    MonitorElement *det_me;
+
+    int nStrip = detCabling_->nApvPairs(detid) * 256;
+
     // use SistripHistoId for producing histogram id (and title)
     SiStripHistoId hidmanager;
     // create SiStripFolderOrganizer
     SiStripFolderOrganizer folder_organizer;
     // set appropriate folder using SiStripFolderOrganizer
-    folder_organizer.setDetectorFolder(detid, tTopo); // pass the detid to this method
-    
+    folder_organizer.setDetectorFolder(detid,
+                                       tTopo);  // pass the detid to this method
+
     std::string hid;
-    hid = hidmanager.createHistoId("StripQualityFromCondDB","det", detid);
-    
-    det_me = ibooker.book1D(hid, hid, nStrip,0.5,nStrip+0.5);
+    hid = hidmanager.createHistoId("StripQualityFromCondDB", "det", detid);
+
+    det_me = ibooker.book1D(hid, hid, nStrip, 0.5, nStrip + 0.5);
     ibooker.tag(det_me, detid);
-    det_me->setAxisTitle("Strip Number",1);
-    det_me->setAxisTitle("Quality Flag from CondDB ",2);
-    QualityMEs.insert( std::make_pair(detid, det_me));
+    det_me->setAxisTitle("Strip Number", 1);
+    det_me->setAxisTitle("Quality Flag from CondDB ", 2);
+    QualityMEs.insert(std::make_pair(detid, det_me));
   }
-  
 }
 
-
 // ------------ method called to produce the data  ------------
-void SiStripMonitorQuality::analyze(edm::Event const& iEvent, edm::EventSetup const& eSetup)
-{
-  unsigned long long cacheID = eSetup.get<SiStripQualityRcd>().cacheIdentifier();  
-  if (m_cacheID_ == cacheID) return;
-  
-  //Retrieve tracker topology from geometry
+void SiStripMonitorQuality::analyze(edm::Event const &iEvent, edm::EventSetup const &eSetup) {
+  unsigned long long cacheID = eSetup.get<SiStripQualityRcd>().cacheIdentifier();
+  if (m_cacheID_ == cacheID)
+    return;
+
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   eSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
-  m_cacheID_ = cacheID;       
+  m_cacheID_ = cacheID;
 
   std::string quality_label = conf_.getParameter<std::string>("StripQualityLabel");
-  eSetup.get<SiStripQualityRcd>().get(quality_label,stripQuality_);
-  eSetup.get<SiStripDetCablingRcd>().get( detCabling_ );
-  
-  edm::LogInfo("SiStripMonitorQuality") << "SiStripMonitorQuality::analyze: "<<
-    " Reading SiStripQuality "<< std::endl;
+  eSetup.get<SiStripQualityRcd>().get(quality_label, stripQuality_);
+  eSetup.get<SiStripDetCablingRcd>().get(detCabling_);
+
+  edm::LogInfo("SiStripMonitorQuality") << "SiStripMonitorQuality::analyze: "
+                                        << " Reading SiStripQuality " << std::endl;
 
   SiStripBadStrip::RegistryIterator rbegin = stripQuality_->getRegistryVectorBegin();
-  SiStripBadStrip::RegistryIterator rend   = stripQuality_->getRegistryVectorEnd();
+  SiStripBadStrip::RegistryIterator rend = stripQuality_->getRegistryVectorEnd();
   uint32_t detid;
-    
-  if (rbegin==rend) return;
 
-  for (SiStripBadStrip::RegistryIterator rp=rbegin; rp != rend; ++rp) {
-    
+  if (rbegin == rend)
+    return;
+
+  for (SiStripBadStrip::RegistryIterator rp = rbegin; rp != rend; ++rp) {
     detid = rp->detid;
     // Check consistency in DetId
-    if (detid == 0 || detid == 0xFFFFFFFF){
-      edm::LogError("SiStripMonitorQuality") <<"SiStripMonitorQuality::analyze : " 
-					       << "Wrong DetId !!!!!! " <<  detid << " Neglecting !!!!!! ";
+    if (detid == 0 || detid == 0xFFFFFFFF) {
+      edm::LogError("SiStripMonitorQuality") << "SiStripMonitorQuality::analyze : "
+                                             << "Wrong DetId !!!!!! " << detid << " Neglecting !!!!!! ";
       continue;
     }
     // check if the detid is connected in cabling
     if (!detCabling_->IsConnected(detid)) {
-      edm::LogError("SiStripMonitorQuality") <<"SiStripMonitorQuality::analyze : " 
-					   << " DetId " <<  detid << " not connected,  Neglecting !!!!!! ";
+      edm::LogError("SiStripMonitorQuality") << "SiStripMonitorQuality::analyze : "
+                                             << " DetId " << detid << " not connected,  Neglecting !!!!!! ";
       continue;
     }
-    MonitorElement* me = getQualityME(detid, tTopo);
-    SiStripBadStrip::Range range = SiStripBadStrip::Range( stripQuality_->getDataVectorBegin()+rp->ibegin , 
-							   stripQuality_->getDataVectorBegin()+rp->iend );
-    SiStripBadStrip::ContainerIterator it=range.first;
-    for(;it!=range.second;++it){
-      unsigned int value=(*it);
+    MonitorElement *me = getQualityME(detid, tTopo);
+    SiStripBadStrip::Range range = SiStripBadStrip::Range(stripQuality_->getDataVectorBegin() + rp->ibegin,
+                                                          stripQuality_->getDataVectorBegin() + rp->iend);
+    SiStripBadStrip::ContainerIterator it = range.first;
+    for (; it != range.second; ++it) {
+      unsigned int value = (*it);
       short str_start = stripQuality_->decode(value).firstStrip;
-      short str_end   = str_start + stripQuality_->decode(value).range;
-      for ( short isr = str_start; isr < str_end + 1; isr++) {        
-        if (isr <= (me->getNbinsX()-1)) me->Fill(isr+1, 1.0);
+      short str_end = str_start + stripQuality_->decode(value).range;
+      for (short isr = str_start; isr < str_end + 1; isr++) {
+        if (isr <= (me->getNbinsX() - 1))
+          me->Fill(isr + 1, 1.0);
       }
     }
   }
 }
 //
 // -- End Run
-//    
-void SiStripMonitorQuality::endRun(edm::Run const& run, edm::EventSetup const& eSetup) {
+//
+void SiStripMonitorQuality::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
   bool outputMEsInRootFile = conf_.getParameter<bool>("OutputMEsInRootFile");
   std::string outputFileName = conf_.getParameter<std::string>("OutputFileName");
-  if (outputMEsInRootFile) {    
-    //dqmStore_->showDirStructure();
+  if (outputMEsInRootFile) {
+    // dqmStore_->showDirStructure();
     dqmStore_->save(outputFileName);
   }
 }
 //
 // -- End Job
 //
-void SiStripMonitorQuality::endJob(void){
-  edm::LogInfo("SiStripMonitorQuality") <<"SiStripMonitorQuality::EndJob: " 
-					  << " Finishing!! ";        
+void SiStripMonitorQuality::endJob(void) {
+  edm::LogInfo("SiStripMonitorQuality") << "SiStripMonitorQuality::EndJob: "
+                                        << " Finishing!! ";
 }
 //
 // -- End Job
 //
-MonitorElement* SiStripMonitorQuality::getQualityME(uint32_t idet, const TrackerTopology* tTopo){
-
-  std::map<uint32_t, MonitorElement* >::iterator pos = QualityMEs.find(idet);
-  MonitorElement* det_me = nullptr;
+MonitorElement *SiStripMonitorQuality::getQualityME(uint32_t idet, const TrackerTopology *tTopo) {
+  std::map<uint32_t, MonitorElement *>::iterator pos = QualityMEs.find(idet);
+  MonitorElement *det_me = nullptr;
   if (pos != QualityMEs.end()) {
     det_me = pos->second;
     det_me->Reset();
   } else {
-    //this should never happen because of bookHistograms()
-    edm::LogError("SiStripMonitorQuality") <<"SiStripMonitorQuality::getQualityME : " 
-					   << "Wrong DetId !!!!!! " <<  idet << " No ME found!";
+    // this should never happen because of bookHistograms()
+    edm::LogError("SiStripMonitorQuality") << "SiStripMonitorQuality::getQualityME : "
+                                           << "Wrong DetId !!!!!! " << idet << " No ME found!";
   }
   return det_me;
 }
 DEFINE_FWK_MODULE(SiStripMonitorQuality);
-
diff --git a/DQM/SiStripMonitorPedestals/src/SiStripMonitorRawData.cc b/DQM/SiStripMonitorPedestals/src/SiStripMonitorRawData.cc
index 9e05df3d79686..bf380099c7dfa 100644
--- a/DQM/SiStripMonitorPedestals/src/SiStripMonitorRawData.cc
+++ b/DQM/SiStripMonitorPedestals/src/SiStripMonitorRawData.cc
@@ -2,8 +2,9 @@
 //
 // Package:    SiStripMonitorRawData
 // Class:      SiStripMonitorRawData
-// 
-/**\class SiStripMonitorDigi SiStripMonitorDigi.cc DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc
+//
+/**\class SiStripMonitorDigi SiStripMonitorDigi.cc
+ DQM/SiStripMonitorDigi/src/SiStripMonitorDigi.cc
 
  Description: <one line class summary>
 
@@ -16,103 +17,99 @@
 //
 //
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
+#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
 
 #include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/SiStripDigi/interface/SiStripRawDigi.h"
 
-#include <FWCore/Framework/interface/EventSetup.h>
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include <FWCore/Framework/interface/EventSetup.h>
 
 #include "DQM/SiStripMonitorPedestals/interface/SiStripMonitorRawData.h"
 
 // std
-#include <cstdlib>
+#include <algorithm>
 #include <cmath>
+#include <cstdlib>
 #include <numeric>
-#include <algorithm>
-
-SiStripMonitorRawData::SiStripMonitorRawData(edm::ParameterSet const& iConfig):
-  BadFedNumber(nullptr),
-  dqmStore_(edm::Service<DQMStore>().operator->()),
-  conf_(iConfig),
-  m_cacheID_(0)
 
+SiStripMonitorRawData::SiStripMonitorRawData(edm::ParameterSet const &iConfig)
+    : BadFedNumber(nullptr),
+      dqmStore_(edm::Service<DQMStore>().operator->()),
+      conf_(iConfig),
+      m_cacheID_(0)
 
 {
   // retrieve producer name of input StripDigiCollection
   std::string digiProducer = conf_.getParameter<std::string>("DigiProducer");
   std::string digiType = "VirginRaw";
-  digiToken_ = consumes<edm::DetSetVector<SiStripRawDigi> >(edm::InputTag(digiProducer,digiType) );
+  digiToken_ = consumes<edm::DetSetVector<SiStripRawDigi>>(edm::InputTag(digiProducer, digiType));
 
-  edm::LogInfo("SiStripMonitorRawData") <<"SiStripMonitorRawData  " 
-					  << " Constructing....... ";     
+  edm::LogInfo("SiStripMonitorRawData") << "SiStripMonitorRawData  "
+                                        << " Constructing....... ";
 }
 
-
-SiStripMonitorRawData::~SiStripMonitorRawData()
-{
-  edm::LogInfo("SiStripMonitorRawData") <<"SiStripMonitorRawData  " 
-					  << " Destructing....... ";     
+SiStripMonitorRawData::~SiStripMonitorRawData() {
+  edm::LogInfo("SiStripMonitorRawData") << "SiStripMonitorRawData  "
+                                        << " Destructing....... ";
 }
 //
 // -- BeginRun
 //
 
-void SiStripMonitorRawData::bookHistograms(DQMStore::IBooker & ibooker , const edm::Run & run, const edm::EventSetup & eSetup)
-{
+void SiStripMonitorRawData::bookHistograms(DQMStore::IBooker &ibooker,
+                                           const edm::Run &run,
+                                           const edm::EventSetup &eSetup) {
   unsigned long long cacheID = eSetup.get<SiStripDetCablingRcd>().cacheIdentifier();
 
-  if (BadFedNumber) BadFedNumber->Reset();
+  if (BadFedNumber)
+    BadFedNumber->Reset();
   if (m_cacheID_ != cacheID) {
     m_cacheID_ = cacheID;
-    eSetup.get<SiStripDetCablingRcd>().get( detcabling );
+    eSetup.get<SiStripDetCablingRcd>().get(detcabling);
     SelectedDetIds.clear();
     detcabling->addActiveDetectorsRawIds(SelectedDetIds);
 
-    edm::LogInfo("SiStripMonitorRawData") <<"SiStripMonitorRawData::bookHistograms: "
+    edm::LogInfo("SiStripMonitorRawData") << "SiStripMonitorRawData::bookHistograms: "
                                           << " Creating MEs for new Cabling ";
     ibooker.setCurrentFolder("Track/GlobalParameter");
     if (!BadFedNumber) {
-      BadFedNumber = ibooker.book1D("FaultyFedNumberAndChannel","Faulty Fed Id and Channel and Numbers", 60000, 0.5, 600.5);
-      BadFedNumber->setAxisTitle("Fed Id and Channel numbers",1);
+      BadFedNumber =
+          ibooker.book1D("FaultyFedNumberAndChannel", "Faulty Fed Id and Channel and Numbers", 60000, 0.5, 600.5);
+      BadFedNumber->setAxisTitle("Fed Id and Channel numbers", 1);
     }
   }
 }
 
 // ------------ method called to produce the data  ------------
-void SiStripMonitorRawData::analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup)
-{
-
-   edm::LogInfo("SiStripMonitorRawData") <<"SiStripMonitorRawData::analyze: Run "<< 
-                              iEvent.id().run()  << " Event " << iEvent.id().event();
+void SiStripMonitorRawData::analyze(edm::Event const &iEvent, edm::EventSetup const &iSetup) {
+  edm::LogInfo("SiStripMonitorRawData") << "SiStripMonitorRawData::analyze: Run " << iEvent.id().run() << " Event "
+                                        << iEvent.id().event();
 
-  
-  iSetup.get<SiStripDetCablingRcd>().get( detcabling );
+  iSetup.get<SiStripDetCablingRcd>().get(detcabling);
 
   // get DigiCollection object from Event
-  edm::Handle< edm::DetSetVector<SiStripRawDigi> > digi_collection;
+  edm::Handle<edm::DetSetVector<SiStripRawDigi>> digi_collection;
   iEvent.getByToken(digiToken_, digi_collection);
 
-  for (std::vector<uint32_t>::const_iterator idetid=SelectedDetIds.begin(), 
-                               iEnd=SelectedDetIds.end();idetid!=iEnd;++idetid){
-    std::vector< edm::DetSet<SiStripRawDigi> >::const_iterator digis = digi_collection->find( (*idetid) );
-    if (digis == digi_collection->end() ||
-        digis->data.empty() || 
-        digis->data.size() > 768 )  {
+  for (std::vector<uint32_t>::const_iterator idetid = SelectedDetIds.begin(), iEnd = SelectedDetIds.end();
+       idetid != iEnd;
+       ++idetid) {
+    std::vector<edm::DetSet<SiStripRawDigi>>::const_iterator digis = digi_collection->find((*idetid));
+    if (digis == digi_collection->end() || digis->data.empty() || digis->data.size() > 768) {
       std::vector<const FedChannelConnection *> fed_conns = detcabling->getConnections((*idetid));
-      for (unsigned int  k = 0; k < fed_conns.size() ; k++) {
-	if(fed_conns[k] && fed_conns[k]->isConnected()) {
-	  float fed_id = fed_conns[k]->fedId() + 0.01*fed_conns[k]->fedCh();
-	  BadFedNumber->Fill(fed_id);
-	}
+      for (unsigned int k = 0; k < fed_conns.size(); k++) {
+        if (fed_conns[k] && fed_conns[k]->isConnected()) {
+          float fed_id = fed_conns[k]->fedId() + 0.01 * fed_conns[k]->fedCh();
+          BadFedNumber->Fill(fed_id);
+        }
       }
       continue;
     }
@@ -120,21 +117,20 @@ void SiStripMonitorRawData::analyze(edm::Event const& iEvent, edm::EventSetup co
 }
 //
 // -- End Run
-//    
-void SiStripMonitorRawData::endRun(edm::Run const& run, edm::EventSetup const& eSetup) {
+//
+void SiStripMonitorRawData::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
   bool outputMEsInRootFile = conf_.getParameter<bool>("OutputMEsInRootFile");
   std::string outputFileName = conf_.getParameter<std::string>("OutputFileName");
-  if (outputMEsInRootFile) {    
-    //dqmStore_->showDirStructure();
+  if (outputMEsInRootFile) {
+    // dqmStore_->showDirStructure();
     dqmStore_->save(outputFileName);
   }
 }
 //
 // -- End Job
 //
-void SiStripMonitorRawData::endJob(void){
-  edm::LogInfo("SiStripMonitorRawData") <<"SiStripMonitorRawData::EndJob: " 
-					  << " Finishing!! ";        
+void SiStripMonitorRawData::endJob(void) {
+  edm::LogInfo("SiStripMonitorRawData") << "SiStripMonitorRawData::EndJob: "
+                                        << " Finishing!! ";
 }
 DEFINE_FWK_MODULE(SiStripMonitorRawData);
-
diff --git a/DQM/SiStripMonitorSummary/interface/SiStripApvGainsDQM.h b/DQM/SiStripMonitorSummary/interface/SiStripApvGainsDQM.h
index d134f4d49ec1e..46c87bc558e6e 100644
--- a/DQM/SiStripMonitorSummary/interface/SiStripApvGainsDQM.h
+++ b/DQM/SiStripMonitorSummary/interface/SiStripApvGainsDQM.h
@@ -1,45 +1,43 @@
 #ifndef SiStripMonitorSummary_SiStripApvGainsDQM_h
 #define SiStripMonitorSummary_SiStripApvGainsDQM_h
 
-
 #include "FWCore/Framework/interface/ESHandle.h"
 
 #include "DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h"
 
-#include "CondFormats/SiStripObjects/interface/SiStripApvGain.h"
 #include "CondFormats/DataRecord/interface/SiStripApvGainRcd.h"
+#include "CondFormats/SiStripObjects/interface/SiStripApvGain.h"
 
-
-class SiStripApvGainsDQM : public SiStripBaseCondObjDQM{
- 
-  public:
-  
-  SiStripApvGainsDQM(const edm::EventSetup & eSetup,
+class SiStripApvGainsDQM : public SiStripBaseCondObjDQM {
+public:
+  SiStripApvGainsDQM(const edm::EventSetup &eSetup,
                      edm::RunNumber_t iRun,
-                     edm::ParameterSet const& hPSet,
-                     edm::ParameterSet const& fPSet);
-  
+                     edm::ParameterSet const &hPSet,
+                     edm::ParameterSet const &fPSet);
+
   ~SiStripApvGainsDQM() override;
 
-  void getActiveDetIds(const edm::EventSetup & eSetup) override;
-
-  void fillModMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es) override;
-  void fillSummaryMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es) override;
-  
-  void fillMEsForDet(const ModMEs& selModME_,uint32_t selDetId_, const TrackerTopology* tTopo) override;
-  
-  void fillMEsForLayer( /*std::map<uint32_t, ModMEs> selModMEsMap_, */ uint32_t selDetId_, const TrackerTopology* tTopo) override;
-  
-  unsigned long long getCache(const edm::EventSetup & eSetup) override{ return eSetup.get<SiStripApvGainRcd>().cacheIdentifier();}
-  
-  void getConditionObject(const edm::EventSetup & eSetup) override{
+  void getActiveDetIds(const edm::EventSetup &eSetup) override;
+
+  void fillModMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) override;
+  void fillSummaryMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) override;
+
+  void fillMEsForDet(const ModMEs &selModME_, uint32_t selDetId_, const TrackerTopology *tTopo) override;
+
+  void fillMEsForLayer(
+      /*std::map<uint32_t, ModMEs> selModMEsMap_, */ uint32_t selDetId_, const TrackerTopology *tTopo) override;
+
+  unsigned long long getCache(const edm::EventSetup &eSetup) override {
+    return eSetup.get<SiStripApvGainRcd>().cacheIdentifier();
+  }
+
+  void getConditionObject(const edm::EventSetup &eSetup) override {
     eSetup.get<SiStripApvGainRcd>().get(gainHandle_);
     cacheID_memory = cacheID_current;
   }
-   
-  private:
-    edm::ESHandle<SiStripApvGain> gainHandle_;
 
- };
+private:
+  edm::ESHandle<SiStripApvGain> gainHandle_;
+};
 
 #endif
diff --git a/DQM/SiStripMonitorSummary/interface/SiStripBackPlaneCorrectionDQM.h b/DQM/SiStripMonitorSummary/interface/SiStripBackPlaneCorrectionDQM.h
index 1f92da1200ec1..332ba0a5d1e83 100644
--- a/DQM/SiStripMonitorSummary/interface/SiStripBackPlaneCorrectionDQM.h
+++ b/DQM/SiStripMonitorSummary/interface/SiStripBackPlaneCorrectionDQM.h
@@ -1,41 +1,40 @@
 #ifndef SiStripMonitorSummary_SiStripBackPlaneCorrectionDQM_h
 #define SiStripMonitorSummary_SiStripBackPlaneCorrectionDQM_h
 
-
 #include "DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h"
 
-#include "CondFormats/SiStripObjects/interface/SiStripBackPlaneCorrection.h"
 #include "CondFormats/DataRecord/interface/SiStripCondDataRecords.h"
+#include "CondFormats/SiStripObjects/interface/SiStripBackPlaneCorrection.h"
 
-
-class SiStripBackPlaneCorrectionDQM : public SiStripBaseCondObjDQM{
- 
-  public:
-  
-  SiStripBackPlaneCorrectionDQM(const edm::EventSetup & eSetup,
+class SiStripBackPlaneCorrectionDQM : public SiStripBaseCondObjDQM {
+public:
+  SiStripBackPlaneCorrectionDQM(const edm::EventSetup &eSetup,
                                 edm::RunNumber_t iRun,
-                                edm::ParameterSet const& hPSet,
-                                edm::ParameterSet const& fPSet);
-  
+                                edm::ParameterSet const &hPSet,
+                                edm::ParameterSet const &fPSet);
+
   ~SiStripBackPlaneCorrectionDQM() override;
-  
-  void getActiveDetIds(const edm::EventSetup & eSetup) override;
-  
-  void fillModMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es) override{};
-  void fillMEsForDet(const ModMEs& selModME_,uint32_t selDetId_, const TrackerTopology* tTopo) override{};
-  
-  void fillSummaryMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es) override;
-  void fillMEsForLayer( /*std::map<uint32_t, ModMEs> selModMEsMap_, */ uint32_t selDetId_, const TrackerTopology* tTopo) override;
-  
-  unsigned long long getCache(const edm::EventSetup & eSetup) override{ return eSetup.get<SiStripBackPlaneCorrectionRcd>().cacheIdentifier();}
-  
-  void getConditionObject(const edm::EventSetup & eSetup) override{
+
+  void getActiveDetIds(const edm::EventSetup &eSetup) override;
+
+  void fillModMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) override{};
+  void fillMEsForDet(const ModMEs &selModME_, uint32_t selDetId_, const TrackerTopology *tTopo) override{};
+
+  void fillSummaryMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) override;
+  void fillMEsForLayer(
+      /*std::map<uint32_t, ModMEs> selModMEsMap_, */ uint32_t selDetId_, const TrackerTopology *tTopo) override;
+
+  unsigned long long getCache(const edm::EventSetup &eSetup) override {
+    return eSetup.get<SiStripBackPlaneCorrectionRcd>().cacheIdentifier();
+  }
+
+  void getConditionObject(const edm::EventSetup &eSetup) override {
     eSetup.get<SiStripBackPlaneCorrectionRcd>().get(bpcorrectionHandle_);
     cacheID_memory = cacheID_current;
   }
 
-  private:
-    edm::ESHandle<SiStripBackPlaneCorrection> bpcorrectionHandle_;
+private:
+  edm::ESHandle<SiStripBackPlaneCorrection> bpcorrectionHandle_;
 };
 
 #endif
diff --git a/DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h b/DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h
index 35347599ad751..fda3d2b72dbfb 100644
--- a/DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h
+++ b/DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h
@@ -1,13 +1,11 @@
 #ifndef SiStripMonitorSummary_SiStripBaseCondObjDQM_h
 #define SiStripMonitorSummary_SiStripBaseCondObjDQM_h
 
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-
-
 
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
@@ -23,145 +21,141 @@
 
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
 
-#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
+#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
 
-#include "DQM/SiStripCommon/interface/TkHistoMap.h"  /// ADDITON OF TK_HISTO_MAP
 #include "CommonTools/TrackerMap/interface/TrackerMap.h"
+#include "DQM/SiStripCommon/interface/TkHistoMap.h"  /// ADDITON OF TK_HISTO_MAP
 
 #include "CommonTools/UtilAlgos/interface/DetIdSelector.h"
 
-#include <vector>
 #include <map>
-#include <string>
 #include <sstream>
+#include <string>
+#include <vector>
 
 class TrackerTopology;
 class SiStripBaseCondObjDQM {
-
- 
-
-  public:
-  
-		 
-
-  SiStripBaseCondObjDQM(const edm::EventSetup & eSetup,
+public:
+  SiStripBaseCondObjDQM(const edm::EventSetup &eSetup,
                         edm::RunNumber_t iRun,
-			edm::ParameterSet const& hPSet,
-			edm::ParameterSet const& fPSet );
-  
+                        edm::ParameterSet const &hPSet,
+                        edm::ParameterSet const &fPSet);
+
   virtual ~SiStripBaseCondObjDQM(){};
-  
-  virtual void getActiveDetIds(const edm::EventSetup & eSetup)=0;
-
-    void analysis(const edm::EventSetup & eSetup_);
-    void analysisOnDemand(const edm::EventSetup & eSetup_, uint32_t detIdOnDemand);
-    void analysisOnDemand(const edm::EventSetup & eSetup_, const std::vector<uint32_t>& detIdsOnDemand);
-    void analysisOnDemand(const edm::EventSetup & eSetup_,
-                        std::string requestedSubDetector, 
-                        uint32_t requestedSide, 
-			uint32_t requestedLayer);
-  
-
-    std::vector<uint32_t> getCabledModules();
-    void selectModules(std::vector<uint32_t> & detIds_, const TrackerTopology* tTopo);
-  
-    //    virtual void fillTopSummaryMEs()=0;
- 
-    virtual unsigned long long getCache(const edm::EventSetup & eSetup_)=0;
-    virtual void getConditionObject(const edm::EventSetup & eSetup_)=0;
-
-    virtual void end();
-      
-  protected:
-    
-    struct ModMEs{ 
-      ModMEs():ProfileDistr(nullptr),	    
-	       CumulDistr(nullptr),	    
-	       SummaryOfProfileDistr(nullptr),
-	       SummaryOfCumulDistr(nullptr),  
-	       SummaryDistr(nullptr){;}
-      MonitorElement* ProfileDistr;
-      MonitorElement* CumulDistr;
-      MonitorElement* SummaryOfProfileDistr;
-      MonitorElement* SummaryOfCumulDistr;
-      MonitorElement* SummaryDistr;         
-    }; 
-
-
-    void getModMEs(ModMEs& CondObj_ME, const uint32_t& detId_, const TrackerTopology* tTopo);
-    void getSummaryMEs(ModMEs& CondObj_ME, const uint32_t& detId_, const TrackerTopology* tTopo);
-    std::pair<std::string,uint32_t> getLayerNameAndId(const uint32_t& detId_, const TrackerTopology* tTopo);
-    std::pair<std::string,uint32_t> getStringNameAndId(const uint32_t& detId_, const TrackerTopology* tTopo);
-    std::vector<uint32_t> GetSameLayerDetId(const std::vector<uint32_t>& activeDetIds, uint32_t selDetId, const TrackerTopology* tTopo);
-
-
-    virtual void fillModMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es);
-    virtual void fillSummaryMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es);
-    virtual void fillMEsForDet(const ModMEs& selModME_,uint32_t selDetId_, const TrackerTopology* tTopo)=0;
-    virtual void fillMEsForLayer( /*std::map<uint32_t, ModMEs> selModMEsMap_, */ uint32_t selDetId_, const TrackerTopology* tTopo)=0;
-
-
-    void fillTkMap(const uint32_t& detid, const float& value);
-    
-    SiStripDetInfoFileReader* reader; 
-    
-    const edm::EventSetup& eSetup_;
-    edm::ParameterSet hPSet_;
-    edm::ParameterSet fPSet_;
-    
-    bool Mod_On_;
-    bool HistoMaps_On_;
-    bool SummaryOnLayerLevel_On_;
-    bool SummaryOnStringLevel_On_;
-    bool GrandSummary_On_;
-    double minValue, maxValue;
-    std::vector<int> tkMapScaler;
-
-    //bool ActiveDetIds_On_;
-
-    std::string CondObj_fillId_;
-    std::string CondObj_name_;
-
-    std::map<uint32_t, ModMEs> ModMEsMap_;
-    std::map<uint32_t, ModMEs> SummaryMEsMap_;
-    std::vector<uint32_t> activeDetIds;
-    std::vector<uint32_t> all_DetIds;
- 
-    unsigned long long cacheID_memory;
-    unsigned long long cacheID_current;
-
-    std::unique_ptr<TkHistoMap> Tk_HM_;
-    std::unique_ptr<TkHistoMap> Tk_HM_H;
-    std::unique_ptr<TkHistoMap> Tk_HM_L;
-    TrackerMap * tkMap;
-  
- private:
-  
-    void bookProfileMEs(SiStripBaseCondObjDQM::ModMEs& CondObj_ME, const uint32_t& detId_, const TrackerTopology* tTopo);
-    void bookCumulMEs(SiStripBaseCondObjDQM::ModMEs& CondObj_ME, const uint32_t& detId_, const TrackerTopology* tTopo);
-    void bookSummaryProfileMEs(SiStripBaseCondObjDQM::ModMEs& CondObj_ME, const uint32_t& detId_, const TrackerTopology* tTopo);
-    void bookSummaryCumulMEs(SiStripBaseCondObjDQM::ModMEs& CondObj_ME, const uint32_t& detId_, const TrackerTopology* tTopo);
-    void bookSummaryMEs(SiStripBaseCondObjDQM::ModMEs& CondObj_ME, const uint32_t& detId_, const TrackerTopology* tTopo);
-
-    void bookTkMap(const std::string& TkMapname);
-
-    void saveTkMap(const std::string& TkMapname, double minValue, double maxValue);
-
-    std::vector<uint32_t> ModulesToBeExcluded_;
-    std::vector<uint32_t> ModulesToBeIncluded_;
-    std::vector<std::string> SubDetectorsToBeExcluded_;
-
-    edm::ESHandle<SiStripDetCabling> detCablingHandle_;
-
-    std::string condDataMonitoringMode_;
-     
-    SiStripHistoId hidmanager;                        
-    SiStripFolderOrganizer folder_organizer;         
-    DQMStore* dqmStore_;
-    edm::RunNumber_t runNumber_;
 
+  virtual void getActiveDetIds(const edm::EventSetup &eSetup) = 0;
+
+  void analysis(const edm::EventSetup &eSetup_);
+  void analysisOnDemand(const edm::EventSetup &eSetup_, uint32_t detIdOnDemand);
+  void analysisOnDemand(const edm::EventSetup &eSetup_, const std::vector<uint32_t> &detIdsOnDemand);
+  void analysisOnDemand(const edm::EventSetup &eSetup_,
+                        std::string requestedSubDetector,
+                        uint32_t requestedSide,
+                        uint32_t requestedLayer);
+
+  std::vector<uint32_t> getCabledModules();
+  void selectModules(std::vector<uint32_t> &detIds_, const TrackerTopology *tTopo);
+
+  //    virtual void fillTopSummaryMEs()=0;
+
+  virtual unsigned long long getCache(const edm::EventSetup &eSetup_) = 0;
+  virtual void getConditionObject(const edm::EventSetup &eSetup_) = 0;
+
+  virtual void end();
+
+protected:
+  struct ModMEs {
+    ModMEs()
+        : ProfileDistr(nullptr),
+          CumulDistr(nullptr),
+          SummaryOfProfileDistr(nullptr),
+          SummaryOfCumulDistr(nullptr),
+          SummaryDistr(nullptr) {
+      ;
+    }
+    MonitorElement *ProfileDistr;
+    MonitorElement *CumulDistr;
+    MonitorElement *SummaryOfProfileDistr;
+    MonitorElement *SummaryOfCumulDistr;
+    MonitorElement *SummaryDistr;
+  };
+
+  void getModMEs(ModMEs &CondObj_ME, const uint32_t &detId_, const TrackerTopology *tTopo);
+  void getSummaryMEs(ModMEs &CondObj_ME, const uint32_t &detId_, const TrackerTopology *tTopo);
+  std::pair<std::string, uint32_t> getLayerNameAndId(const uint32_t &detId_, const TrackerTopology *tTopo);
+  std::pair<std::string, uint32_t> getStringNameAndId(const uint32_t &detId_, const TrackerTopology *tTopo);
+  std::vector<uint32_t> GetSameLayerDetId(const std::vector<uint32_t> &activeDetIds,
+                                          uint32_t selDetId,
+                                          const TrackerTopology *tTopo);
+
+  virtual void fillModMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es);
+  virtual void fillSummaryMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es);
+  virtual void fillMEsForDet(const ModMEs &selModME_, uint32_t selDetId_, const TrackerTopology *tTopo) = 0;
+  virtual void fillMEsForLayer(
+      /*std::map<uint32_t, ModMEs> selModMEsMap_, */ uint32_t selDetId_, const TrackerTopology *tTopo) = 0;
+
+  void fillTkMap(const uint32_t &detid, const float &value);
+
+  SiStripDetInfoFileReader *reader;
+
+  const edm::EventSetup &eSetup_;
+  edm::ParameterSet hPSet_;
+  edm::ParameterSet fPSet_;
+
+  bool Mod_On_;
+  bool HistoMaps_On_;
+  bool SummaryOnLayerLevel_On_;
+  bool SummaryOnStringLevel_On_;
+  bool GrandSummary_On_;
+  double minValue, maxValue;
+  std::vector<int> tkMapScaler;
+
+  // bool ActiveDetIds_On_;
+
+  std::string CondObj_fillId_;
+  std::string CondObj_name_;
+
+  std::map<uint32_t, ModMEs> ModMEsMap_;
+  std::map<uint32_t, ModMEs> SummaryMEsMap_;
+  std::vector<uint32_t> activeDetIds;
+  std::vector<uint32_t> all_DetIds;
+
+  unsigned long long cacheID_memory;
+  unsigned long long cacheID_current;
+
+  std::unique_ptr<TkHistoMap> Tk_HM_;
+  std::unique_ptr<TkHistoMap> Tk_HM_H;
+  std::unique_ptr<TkHistoMap> Tk_HM_L;
+  TrackerMap *tkMap;
+
+private:
+  void bookProfileMEs(SiStripBaseCondObjDQM::ModMEs &CondObj_ME, const uint32_t &detId_, const TrackerTopology *tTopo);
+  void bookCumulMEs(SiStripBaseCondObjDQM::ModMEs &CondObj_ME, const uint32_t &detId_, const TrackerTopology *tTopo);
+  void bookSummaryProfileMEs(SiStripBaseCondObjDQM::ModMEs &CondObj_ME,
+                             const uint32_t &detId_,
+                             const TrackerTopology *tTopo);
+  void bookSummaryCumulMEs(SiStripBaseCondObjDQM::ModMEs &CondObj_ME,
+                           const uint32_t &detId_,
+                           const TrackerTopology *tTopo);
+  void bookSummaryMEs(SiStripBaseCondObjDQM::ModMEs &CondObj_ME, const uint32_t &detId_, const TrackerTopology *tTopo);
+
+  void bookTkMap(const std::string &TkMapname);
+
+  void saveTkMap(const std::string &TkMapname, double minValue, double maxValue);
+
+  std::vector<uint32_t> ModulesToBeExcluded_;
+  std::vector<uint32_t> ModulesToBeIncluded_;
+  std::vector<std::string> SubDetectorsToBeExcluded_;
+
+  edm::ESHandle<SiStripDetCabling> detCablingHandle_;
+
+  std::string condDataMonitoringMode_;
+
+  SiStripHistoId hidmanager;
+  SiStripFolderOrganizer folder_organizer;
+  DQMStore *dqmStore_;
+  edm::RunNumber_t runNumber_;
 };
 
-
 #endif
diff --git a/DQM/SiStripMonitorSummary/interface/SiStripCablingDQM.h b/DQM/SiStripMonitorSummary/interface/SiStripCablingDQM.h
index 41dd0dd8d0307..47264994ddffe 100644
--- a/DQM/SiStripMonitorSummary/interface/SiStripCablingDQM.h
+++ b/DQM/SiStripMonitorSummary/interface/SiStripCablingDQM.h
@@ -1,48 +1,48 @@
 #ifndef SiStripMonitorSummary_SiStripCablingDQM_h
 #define SiStripMonitorSummary_SiStripCablingDQM_h
 
-
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
+#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
-#include "DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h"
-#include "CondFormats/SiStripObjects/interface/SiStripNoises.h"
 #include "CondFormats/DataRecord/interface/SiStripNoisesRcd.h"
-#include "CondFormats/SiStripObjects/interface/SiStripPedestals.h"
 #include "CondFormats/DataRecord/interface/SiStripPedestalsRcd.h"
-#include "CalibTracker/Records/interface/SiStripDetCablingRcd.h"
-#include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
-
-class SiStripCablingDQM: public SiStripBaseCondObjDQM{
-  
-  public:
+#include "CondFormats/SiStripObjects/interface/SiStripNoises.h"
+#include "CondFormats/SiStripObjects/interface/SiStripPedestals.h"
+#include "DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 
-  SiStripCablingDQM(const edm::EventSetup & eSetup,
+class SiStripCablingDQM : public SiStripBaseCondObjDQM {
+public:
+  SiStripCablingDQM(const edm::EventSetup &eSetup,
                     edm::RunNumber_t iRun,
-		    edm::ParameterSet const& hPSet,
-		    edm::ParameterSet const& fPSet);
-  
+                    edm::ParameterSet const &hPSet,
+                    edm::ParameterSet const &fPSet);
+
   ~SiStripCablingDQM() override;
 
-  void fillModMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es) override{;}
-  void fillSummaryMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es) override{;}
+  void fillModMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) override { ; }
+  void fillSummaryMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) override { ; }
+
+  void fillMEsForDet(const ModMEs &selModME_, uint32_t selDetId_, const TrackerTopology *tTopo) override { ; }
+  void fillMEsForLayer(
+      /*std::map<uint32_t, ModMEs> selModMEsMap_, */ uint32_t selDetId_, const TrackerTopology *tTopo) override {
+    ;
+  }
 
-  void fillMEsForDet(const ModMEs& selModME_,uint32_t selDetId_, const TrackerTopology* tTopo) override{;}
-  void fillMEsForLayer( /*std::map<uint32_t, ModMEs> selModMEsMap_, */ uint32_t selDetId_, const TrackerTopology* tTopo) override{;}
+  void getActiveDetIds(const edm::EventSetup &eSetup) override;
+  unsigned long long getCache(const edm::EventSetup &eSetup) override {
+    return eSetup.get<SiStripDetCablingRcd>().cacheIdentifier();
+  }
 
-  void getActiveDetIds(const edm::EventSetup & eSetup) override;
-  unsigned long long getCache(const edm::EventSetup & eSetup) override{ return eSetup.get<SiStripDetCablingRcd>().cacheIdentifier();}
-  
-  void getConditionObject(const edm::EventSetup & eSetup) override{
+  void getConditionObject(const edm::EventSetup &eSetup) override {
     eSetup.get<SiStripDetCablingRcd>().get(cablingHandle_);
     cacheID_memory = cacheID_current;
   }
 
- 
-  private:
-  
-  //  SiStripDetInfoFileReader* reader; 
+private:
+  //  SiStripDetInfoFileReader* reader;
   //  std::pair<std::string,uint32_t> getLayerNameAndId(const uint32_t&);
-  edm::ESHandle<SiStripDetCabling> cablingHandle_;  
+  edm::ESHandle<SiStripDetCabling> cablingHandle_;
 };
 
 #endif
diff --git a/DQM/SiStripMonitorSummary/interface/SiStripClassToMonitorCondData.h b/DQM/SiStripMonitorSummary/interface/SiStripClassToMonitorCondData.h
index 7a30777f63b8a..c3469d756697e 100644
--- a/DQM/SiStripMonitorSummary/interface/SiStripClassToMonitorCondData.h
+++ b/DQM/SiStripMonitorSummary/interface/SiStripClassToMonitorCondData.h
@@ -4,18 +4,17 @@
 //
 // Package:     SiStripMonitorSummary
 // Class  :     SiStripClassToMonitorCondData
-// 
+//
 // Original Author:  Evelyne Delmeire
 //
 
-
 // system include files
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -33,58 +32,55 @@ class SiStripPedestalsDQM;
 class SiStripNoisesDQM;
 class SiStripQualityDQM;
 class SiStripApvGainsDQM;
-class SiStripLorentzAngleDQM; 
-class SiStripBackPlaneCorrectionDQM; 
+class SiStripLorentzAngleDQM;
+class SiStripBackPlaneCorrectionDQM;
 class SiStripCablingDQM;
 class SiStripThresholdDQM;
 
-class SiStripClassToMonitorCondData{
- 
- public:
- 
-   explicit SiStripClassToMonitorCondData(edm::ParameterSet const& iConfig);
- 
-   ~SiStripClassToMonitorCondData();
-   
-   void beginJob() ;  
-   void beginRun(edm::RunNumber_t iRun, edm::EventSetup const& eSetup);
-   void analyseCondData(const edm::EventSetup&);
-   void endRun(edm::EventSetup const& eSetup);
-   void endJob() ;
-  
-   void getModMEsOnDemand(edm::EventSetup const& eSetup, uint32_t requestedDetId);
-   void getLayerMEsOnDemand(edm::EventSetup const& eSetup, std::string requestedSubDetector, uint32_t requestedSide, uint32_t requestedLayer);
-  
- private:  
-  
-   
-   edm::ParameterSet conf_;
-  
-   bool monitorPedestals_     ;
-   bool monitorNoises_        ;
-   bool monitorQuality_       ;
-   bool monitorApvGains_      ;
-   bool monitorLorentzAngle_  ;
-   bool monitorBackPlaneCorrection_  ;
-   bool monitorLowThreshold_  ;
-   bool monitorHighThreshold_ ;
-   bool monitorCabling_       ;
-
-   bool gainRenormalisation_;
-     
-   std::string outPutFileName;
-
-   SiStripPedestalsDQM*           pedestalsDQM_;
-   SiStripNoisesDQM*                 noisesDQM_; 
-   SiStripQualityDQM*               qualityDQM_; 
-   SiStripApvGainsDQM*             apvgainsDQM_; 
-   SiStripLorentzAngleDQM*     lorentzangleDQM_;    
-   SiStripBackPlaneCorrectionDQM*     bpcorrectionDQM_;    
-   SiStripCablingDQM*               cablingDQM_;
-   SiStripThresholdDQM*        lowthresholdDQM_;
-   SiStripThresholdDQM*       highthresholdDQM_;
-
-  
+class SiStripClassToMonitorCondData {
+public:
+  explicit SiStripClassToMonitorCondData(edm::ParameterSet const &iConfig);
+
+  ~SiStripClassToMonitorCondData();
+
+  void beginJob();
+  void beginRun(edm::RunNumber_t iRun, edm::EventSetup const &eSetup);
+  void analyseCondData(const edm::EventSetup &);
+  void endRun(edm::EventSetup const &eSetup);
+  void endJob();
+
+  void getModMEsOnDemand(edm::EventSetup const &eSetup, uint32_t requestedDetId);
+  void getLayerMEsOnDemand(edm::EventSetup const &eSetup,
+                           std::string requestedSubDetector,
+                           uint32_t requestedSide,
+                           uint32_t requestedLayer);
+
+private:
+  edm::ParameterSet conf_;
+
+  bool monitorPedestals_;
+  bool monitorNoises_;
+  bool monitorQuality_;
+  bool monitorApvGains_;
+  bool monitorLorentzAngle_;
+  bool monitorBackPlaneCorrection_;
+  bool monitorLowThreshold_;
+  bool monitorHighThreshold_;
+  bool monitorCabling_;
+
+  bool gainRenormalisation_;
+
+  std::string outPutFileName;
+
+  SiStripPedestalsDQM *pedestalsDQM_;
+  SiStripNoisesDQM *noisesDQM_;
+  SiStripQualityDQM *qualityDQM_;
+  SiStripApvGainsDQM *apvgainsDQM_;
+  SiStripLorentzAngleDQM *lorentzangleDQM_;
+  SiStripBackPlaneCorrectionDQM *bpcorrectionDQM_;
+  SiStripCablingDQM *cablingDQM_;
+  SiStripThresholdDQM *lowthresholdDQM_;
+  SiStripThresholdDQM *highthresholdDQM_;
 };
 
 #endif
diff --git a/DQM/SiStripMonitorSummary/interface/SiStripLorentzAngleDQM.h b/DQM/SiStripMonitorSummary/interface/SiStripLorentzAngleDQM.h
index 7fd379df92daa..7ac7fa9402aec 100644
--- a/DQM/SiStripMonitorSummary/interface/SiStripLorentzAngleDQM.h
+++ b/DQM/SiStripMonitorSummary/interface/SiStripLorentzAngleDQM.h
@@ -1,41 +1,40 @@
 #ifndef SiStripMonitorSummary_SiStripLorentzAngleDQM_h
 #define SiStripMonitorSummary_SiStripLorentzAngleDQM_h
 
-
 #include "DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h"
 
-#include "CondFormats/SiStripObjects/interface/SiStripLorentzAngle.h"
 #include "CondFormats/DataRecord/interface/SiStripLorentzAngleRcd.h"
+#include "CondFormats/SiStripObjects/interface/SiStripLorentzAngle.h"
 
-
-class SiStripLorentzAngleDQM : public SiStripBaseCondObjDQM{
- 
-  public:
-  
-  SiStripLorentzAngleDQM(const edm::EventSetup & eSetup,
+class SiStripLorentzAngleDQM : public SiStripBaseCondObjDQM {
+public:
+  SiStripLorentzAngleDQM(const edm::EventSetup &eSetup,
                          edm::RunNumber_t iRun,
-                         edm::ParameterSet const& hPSet,
-                         edm::ParameterSet const& fPSet);
-  
+                         edm::ParameterSet const &hPSet,
+                         edm::ParameterSet const &fPSet);
+
   ~SiStripLorentzAngleDQM() override;
-  
-  void getActiveDetIds(const edm::EventSetup & eSetup) override;
-  
-  void fillModMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es) override{};
-  void fillMEsForDet(const ModMEs& selModME_,uint32_t selDetId_, const TrackerTopology* tTopo) override{};
-  
-  void fillSummaryMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es) override;
-  void fillMEsForLayer( /*std::map<uint32_t, ModMEs> selModMEsMap_, */ uint32_t selDetId_, const TrackerTopology* tTopo) override;
-  
-  unsigned long long getCache(const edm::EventSetup & eSetup) override{ return eSetup.get<SiStripLorentzAngleRcd>().cacheIdentifier();}
-  
-  void getConditionObject(const edm::EventSetup & eSetup) override{
+
+  void getActiveDetIds(const edm::EventSetup &eSetup) override;
+
+  void fillModMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) override{};
+  void fillMEsForDet(const ModMEs &selModME_, uint32_t selDetId_, const TrackerTopology *tTopo) override{};
+
+  void fillSummaryMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) override;
+  void fillMEsForLayer(
+      /*std::map<uint32_t, ModMEs> selModMEsMap_, */ uint32_t selDetId_, const TrackerTopology *tTopo) override;
+
+  unsigned long long getCache(const edm::EventSetup &eSetup) override {
+    return eSetup.get<SiStripLorentzAngleRcd>().cacheIdentifier();
+  }
+
+  void getConditionObject(const edm::EventSetup &eSetup) override {
     eSetup.get<SiStripLorentzAngleRcd>().get(lorentzangleHandle_);
     cacheID_memory = cacheID_current;
   }
 
-  private:
-    edm::ESHandle<SiStripLorentzAngle> lorentzangleHandle_;
+private:
+  edm::ESHandle<SiStripLorentzAngle> lorentzangleHandle_;
 };
 
 #endif
diff --git a/DQM/SiStripMonitorSummary/interface/SiStripMonitorCondData.h b/DQM/SiStripMonitorSummary/interface/SiStripMonitorCondData.h
index b2e104cebd949..87fb67d5bf97a 100644
--- a/DQM/SiStripMonitorSummary/interface/SiStripMonitorCondData.h
+++ b/DQM/SiStripMonitorSummary/interface/SiStripMonitorCondData.h
@@ -5,18 +5,17 @@
 //
 // Package:     SiStripMonitorSummary
 // Class  :     SiStripMonitorCondData
-// 
+//
 // Original Author:  Evelyne Delmeire
 //
 
-
 // system include files
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -40,46 +39,41 @@ class SiStripBackPlaneCorrectionDQM;
 class SiStripCablingDQM;
 
 class SiStripMonitorCondData : public edm::EDAnalyzer {
- 
- public:
- 
-   explicit SiStripMonitorCondData(const edm::ParameterSet&);
- 
-   ~SiStripMonitorCondData() override;
-   
-   void beginJob() override ;  
-   void beginRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
-   void analyze(const edm::Event&, const edm::EventSetup&) override;
-   void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
-   void endJob() override ;
-  
-  
- private:  
-  
-   edm::ParameterSet conf_;
-  
-   bool monitorPedestals_   ;
-   bool monitorNoises_      ;
-   bool monitorLowThreshold_  ;
-   bool monitorHighThreshold_ ;
-   bool monitorQuality_     ;
-   bool monitorApvGains_    ;
-   bool monitorLorentzAngle_;
-   bool monitorBackPlaneCorrection_;
-   bool monitorCabling_;
-     
-   std::string outPutFileName;
-
-   std::unique_ptr<SiStripPedestalsDQM>                  pedestalsDQM_;
-   std::unique_ptr<SiStripNoisesDQM>                        noisesDQM_; 
-   std::unique_ptr<SiStripThresholdDQM>               lowthresholdDQM_; 
-   std::unique_ptr<SiStripThresholdDQM>              highthresholdDQM_; 
-   std::unique_ptr<SiStripQualityDQM>                      qualityDQM_; 
-   std::unique_ptr<SiStripApvGainsDQM>                    apvgainsDQM_;  
-   std::unique_ptr<SiStripLorentzAngleDQM>            lorentzangleDQM_; 
-   std::unique_ptr<SiStripBackPlaneCorrectionDQM>     bpcorrectionDQM_; 
-   std::unique_ptr<SiStripCablingDQM>                      cablingDQM_;  
-  
+public:
+  explicit SiStripMonitorCondData(const edm::ParameterSet &);
+
+  ~SiStripMonitorCondData() override;
+
+  void beginJob() override;
+  void beginRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
+  void endJob() override;
+
+private:
+  edm::ParameterSet conf_;
+
+  bool monitorPedestals_;
+  bool monitorNoises_;
+  bool monitorLowThreshold_;
+  bool monitorHighThreshold_;
+  bool monitorQuality_;
+  bool monitorApvGains_;
+  bool monitorLorentzAngle_;
+  bool monitorBackPlaneCorrection_;
+  bool monitorCabling_;
+
+  std::string outPutFileName;
+
+  std::unique_ptr<SiStripPedestalsDQM> pedestalsDQM_;
+  std::unique_ptr<SiStripNoisesDQM> noisesDQM_;
+  std::unique_ptr<SiStripThresholdDQM> lowthresholdDQM_;
+  std::unique_ptr<SiStripThresholdDQM> highthresholdDQM_;
+  std::unique_ptr<SiStripQualityDQM> qualityDQM_;
+  std::unique_ptr<SiStripApvGainsDQM> apvgainsDQM_;
+  std::unique_ptr<SiStripLorentzAngleDQM> lorentzangleDQM_;
+  std::unique_ptr<SiStripBackPlaneCorrectionDQM> bpcorrectionDQM_;
+  std::unique_ptr<SiStripCablingDQM> cablingDQM_;
 };
 
 #endif
diff --git a/DQM/SiStripMonitorSummary/interface/SiStripMonitorCondDataOnDemandExample.h b/DQM/SiStripMonitorSummary/interface/SiStripMonitorCondDataOnDemandExample.h
index bd6c2efc48189..e90cdfe72b587 100644
--- a/DQM/SiStripMonitorSummary/interface/SiStripMonitorCondDataOnDemandExample.h
+++ b/DQM/SiStripMonitorSummary/interface/SiStripMonitorCondDataOnDemandExample.h
@@ -4,18 +4,17 @@
 //
 // Package:     SiStripMonitorSummary
 // Class  :     SiStripMonitorCondDataOnDemandExample
-// 
+//
 // Original Author:  Evelyne Delmeire
 //
 
-
 // system include files
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -30,26 +29,21 @@
 class SiStripClassToMonitorCondData;
 
 class SiStripMonitorCondDataOnDemandExample : public edm::EDAnalyzer {
- 
- public:
- 
-   explicit SiStripMonitorCondDataOnDemandExample(const edm::ParameterSet&);
- 
-   ~SiStripMonitorCondDataOnDemandExample() override;
-   
-   void beginJob() override ;  
-   void beginRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
-   void analyze(const edm::Event&, const edm::EventSetup&) override;
-   void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
-   void endJob() override ;
-  
-   
-  
- private: 
-  int eventCounter_; 
-  edm::ParameterSet conf_;
-  SiStripClassToMonitorCondData*    condDataMonitoring_ ;
+public:
+  explicit SiStripMonitorCondDataOnDemandExample(const edm::ParameterSet &);
+
+  ~SiStripMonitorCondDataOnDemandExample() override;
 
+  void beginJob() override;
+  void beginRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
+  void endJob() override;
+
+private:
+  int eventCounter_;
+  edm::ParameterSet conf_;
+  SiStripClassToMonitorCondData *condDataMonitoring_;
 };
 
 #endif
diff --git a/DQM/SiStripMonitorSummary/interface/SiStripNoisesDQM.h b/DQM/SiStripMonitorSummary/interface/SiStripNoisesDQM.h
index 33c98e0345557..43ad1f727caf0 100644
--- a/DQM/SiStripMonitorSummary/interface/SiStripNoisesDQM.h
+++ b/DQM/SiStripMonitorSummary/interface/SiStripNoisesDQM.h
@@ -1,43 +1,42 @@
 #ifndef SiStripMonitorSummary_SiStripNoisesDQM_h
 #define SiStripMonitorSummary_SiStripNoisesDQM_h
 
-
 #include "DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h"
 
-#include "CondFormats/SiStripObjects/interface/SiStripNoises.h"
+#include "CondFormats/DataRecord/interface/SiStripApvGainRcd.h"
 #include "CondFormats/DataRecord/interface/SiStripNoisesRcd.h"
 #include "CondFormats/SiStripObjects/interface/SiStripApvGain.h"
-#include "CondFormats/DataRecord/interface/SiStripApvGainRcd.h"
+#include "CondFormats/SiStripObjects/interface/SiStripNoises.h"
 
-class SiStripNoisesDQM : public SiStripBaseCondObjDQM{
- 
-  public:
-  
-  SiStripNoisesDQM(const edm::EventSetup & eSetup,
+class SiStripNoisesDQM : public SiStripBaseCondObjDQM {
+public:
+  SiStripNoisesDQM(const edm::EventSetup &eSetup,
                    edm::RunNumber_t iRun,
-                   edm::ParameterSet const& hPSet,
-                   edm::ParameterSet const& fPSet);
-  
+                   edm::ParameterSet const &hPSet,
+                   edm::ParameterSet const &fPSet);
+
   ~SiStripNoisesDQM() override;
-  
-  void getActiveDetIds(const edm::EventSetup & eSetup) override;
 
-  void fillMEsForDet(const ModMEs& selModME_,uint32_t selDetId_, const TrackerTopology* tTopo) override;
-  void fillMEsForLayer( /*std::map<uint32_t, ModMEs> selModMEsMap_, */ uint32_t selDetId_, const TrackerTopology* tTopo) override;
+  void getActiveDetIds(const edm::EventSetup &eSetup) override;
+
+  void fillMEsForDet(const ModMEs &selModME_, uint32_t selDetId_, const TrackerTopology *tTopo) override;
+  void fillMEsForLayer(
+      /*std::map<uint32_t, ModMEs> selModMEsMap_, */ uint32_t selDetId_, const TrackerTopology *tTopo) override;
 
-  unsigned long long getCache(const edm::EventSetup & eSetup) override{ return eSetup.get<SiStripNoisesRcd>().cacheIdentifier();}
-  
-  void getConditionObject(const edm::EventSetup & eSetup) override{
+  unsigned long long getCache(const edm::EventSetup &eSetup) override {
+    return eSetup.get<SiStripNoisesRcd>().cacheIdentifier();
+  }
+
+  void getConditionObject(const edm::EventSetup &eSetup) override {
     eSetup.get<SiStripNoisesRcd>().get(noiseHandle_);
     cacheID_memory = cacheID_current;
   }
- 
-  private:
-    bool gainRenormalisation_;
-    bool simGainRenormalisation_;
-    edm::ESHandle<SiStripNoises> noiseHandle_; 
-    edm::ESHandle<SiStripApvGain> gainHandle_;
-    
+
+private:
+  bool gainRenormalisation_;
+  bool simGainRenormalisation_;
+  edm::ESHandle<SiStripNoises> noiseHandle_;
+  edm::ESHandle<SiStripApvGain> gainHandle_;
 };
 
 #endif
diff --git a/DQM/SiStripMonitorSummary/interface/SiStripPedestalsDQM.h b/DQM/SiStripMonitorSummary/interface/SiStripPedestalsDQM.h
index 9da3b0a572f9f..23083e655be36 100644
--- a/DQM/SiStripMonitorSummary/interface/SiStripPedestalsDQM.h
+++ b/DQM/SiStripMonitorSummary/interface/SiStripPedestalsDQM.h
@@ -1,42 +1,40 @@
 #ifndef SiStripMonitorSummary_SiStripPedestalsDQM_h
 #define SiStripMonitorSummary_SiStripPedestalsDQM_h
 
-
 #include "DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h"
 
-#include "CondFormats/SiStripObjects/interface/SiStripPedestals.h"
 #include "CondFormats/DataRecord/interface/SiStripPedestalsRcd.h"
+#include "CondFormats/SiStripObjects/interface/SiStripPedestals.h"
 
-
-class SiStripPedestalsDQM : public SiStripBaseCondObjDQM{
- 
-  public:
-  
-  SiStripPedestalsDQM(const edm::EventSetup & eSetup,
+class SiStripPedestalsDQM : public SiStripBaseCondObjDQM {
+public:
+  SiStripPedestalsDQM(const edm::EventSetup &eSetup,
                       edm::RunNumber_t iRun,
-                      edm::ParameterSet const& hPSet,
-                      edm::ParameterSet const& fPSet);
-  
+                      edm::ParameterSet const &hPSet,
+                      edm::ParameterSet const &fPSet);
+
   ~SiStripPedestalsDQM() override;
-  
-  void getActiveDetIds(const edm::EventSetup & eSetup) override;
-
-  void fillModMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es) override;
-  void fillSummaryMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es) override;
- 	       
-  void fillMEsForDet(const ModMEs& selModME_,uint32_t selDetId_, const TrackerTopology* tTopo) override;
-  void fillMEsForLayer( /*std::map<uint32_t, ModMEs> selModMEsMap_, */ uint32_t selDetId_, const TrackerTopology* tTopo) override;
-  
-  unsigned long long getCache(const edm::EventSetup & eSetup) override{ return eSetup.get<SiStripPedestalsRcd>().cacheIdentifier();}
-  
-  void getConditionObject(const edm::EventSetup & eSetup) override{
+
+  void getActiveDetIds(const edm::EventSetup &eSetup) override;
+
+  void fillModMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) override;
+  void fillSummaryMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) override;
+
+  void fillMEsForDet(const ModMEs &selModME_, uint32_t selDetId_, const TrackerTopology *tTopo) override;
+  void fillMEsForLayer(
+      /*std::map<uint32_t, ModMEs> selModMEsMap_, */ uint32_t selDetId_, const TrackerTopology *tTopo) override;
+
+  unsigned long long getCache(const edm::EventSetup &eSetup) override {
+    return eSetup.get<SiStripPedestalsRcd>().cacheIdentifier();
+  }
+
+  void getConditionObject(const edm::EventSetup &eSetup) override {
     eSetup.get<SiStripPedestalsRcd>().get(pedestalHandle_);
     cacheID_memory = cacheID_current;
   }
 
-  private:
-    edm::ESHandle<SiStripPedestals> pedestalHandle_;
-
+private:
+  edm::ESHandle<SiStripPedestals> pedestalHandle_;
 };
 
 #endif
diff --git a/DQM/SiStripMonitorSummary/interface/SiStripQualityDQM.h b/DQM/SiStripMonitorSummary/interface/SiStripQualityDQM.h
index 386df00ca3856..173618bbd618b 100644
--- a/DQM/SiStripMonitorSummary/interface/SiStripQualityDQM.h
+++ b/DQM/SiStripMonitorSummary/interface/SiStripQualityDQM.h
@@ -1,7 +1,6 @@
 #ifndef SiStripMonitorSummary_SiStripQualityDQM_h
 #define SiStripMonitorSummary_SiStripQualityDQM_h
 
-
 #include "DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h"
 
 /* #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h" */
@@ -16,52 +15,49 @@
 
 /* #include "CondFormats/SiStripObjects/interface/SiStripDetVOff.h" */
 
-
 /* #include "CalibTracker/Records/interface/SiStripDetCablingRcd.h" */
 /* #include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h" */
 
 #include "CalibFormats/SiStripObjects/interface/SiStripQuality.h"
 #include "CalibTracker/Records/interface/SiStripQualityRcd.h"
 
-
-
-class SiStripQualityDQM : public SiStripBaseCondObjDQM{
- 
-  public:
-  
-  SiStripQualityDQM(const edm::EventSetup & eSetup,
+class SiStripQualityDQM : public SiStripBaseCondObjDQM {
+public:
+  SiStripQualityDQM(const edm::EventSetup &eSetup,
                     edm::RunNumber_t iRun,
-                    edm::ParameterSet const& hPSet,
-                    edm::ParameterSet const& fPSet);
-  
+                    edm::ParameterSet const &hPSet,
+                    edm::ParameterSet const &fPSet);
+
   ~SiStripQualityDQM() override;
-  
-  void getActiveDetIds(const edm::EventSetup & eSetup) override;
-
-  void fillModMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es) override;
-  void fillMEsForDet(const ModMEs& selModME_,uint32_t selDetId_, const TrackerTopology* tTopo) override;
-  
-  void fillSummaryMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es) override;
-  void fillMEsForLayer( /*std::map<uint32_t, ModMEs> selModMEsMap_, */ uint32_t selDetId_, const TrackerTopology* tTopo) override;
-  void fillGrandSummaryMEs(const edm::EventSetup& eSetup);
- 	       
-  
-  unsigned long long getCache(const edm::EventSetup & eSetup) override{ return eSetup.get<SiStripQualityRcd>().cacheIdentifier();}
-  
-  void getConditionObject(const edm::EventSetup & eSetup) override{
-    eSetup.get<SiStripQualityRcd>().get(qualityLabel_,qualityHandle_);
+
+  void getActiveDetIds(const edm::EventSetup &eSetup) override;
+
+  void fillModMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) override;
+  void fillMEsForDet(const ModMEs &selModME_, uint32_t selDetId_, const TrackerTopology *tTopo) override;
+
+  void fillSummaryMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) override;
+  void fillMEsForLayer(
+      /*std::map<uint32_t, ModMEs> selModMEsMap_, */ uint32_t selDetId_, const TrackerTopology *tTopo) override;
+  void fillGrandSummaryMEs(const edm::EventSetup &eSetup);
+
+  unsigned long long getCache(const edm::EventSetup &eSetup) override {
+    return eSetup.get<SiStripQualityRcd>().cacheIdentifier();
+  }
+
+  void getConditionObject(const edm::EventSetup &eSetup) override {
+    eSetup.get<SiStripQualityRcd>().get(qualityLabel_, qualityHandle_);
     cacheID_memory = cacheID_current;
   }
 
-  private: 
-    std::string qualityLabel_ ;
-    edm::ESHandle<SiStripQuality> qualityHandle_;
-    int NTkBadComponent[4]; //k: 0=BadModule, 1=BadFiber, 2=BadApv, 3=BadStrips
-    int NBadComponent[4][19][4];  
-    std::stringstream ssV[4][19];
-    void SetBadComponents(int i, int component,SiStripQuality::BadComponent& BC);
+private:
+  std::string qualityLabel_;
+  edm::ESHandle<SiStripQuality> qualityHandle_;
+  int NTkBadComponent[4];  // k: 0=BadModule, 1=BadFiber, 2=BadApv, 3=BadStrips
+  int NBadComponent[4][19][4];
+  std::stringstream ssV[4][19];
+  void SetBadComponents(int i, int component, SiStripQuality::BadComponent &BC);
 
-    std::vector<uint32_t> alreadyFilledLayers;
+  std::vector<uint32_t> alreadyFilledLayers;
 };
 
 #endif
diff --git a/DQM/SiStripMonitorSummary/interface/SiStripThresholdDQM.h b/DQM/SiStripMonitorSummary/interface/SiStripThresholdDQM.h
index e331915602e96..5c4273d669f9b 100644
--- a/DQM/SiStripMonitorSummary/interface/SiStripThresholdDQM.h
+++ b/DQM/SiStripMonitorSummary/interface/SiStripThresholdDQM.h
@@ -1,42 +1,41 @@
 #ifndef SiStripMonitorSummary_SiStripThresholdDQM_h
 #define SiStripMonitorSummary_SiStripThresholdDQM_h
 
-
 #include "DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h"
 
-#include "CondFormats/SiStripObjects/interface/SiStripThreshold.h"
 #include "CondFormats/DataRecord/interface/SiStripThresholdRcd.h"
+#include "CondFormats/SiStripObjects/interface/SiStripThreshold.h"
 
-
-class SiStripThresholdDQM : public SiStripBaseCondObjDQM{
- 
-  public:
-  
-  SiStripThresholdDQM(const edm::EventSetup & eSetup,
+class SiStripThresholdDQM : public SiStripBaseCondObjDQM {
+public:
+  SiStripThresholdDQM(const edm::EventSetup &eSetup,
                       edm::RunNumber_t iRun,
-                      edm::ParameterSet const& hPSet,
-                      edm::ParameterSet const& fPSet);
-  
+                      edm::ParameterSet const &hPSet,
+                      edm::ParameterSet const &fPSet);
+
   ~SiStripThresholdDQM() override;
-  
-  void getActiveDetIds(const edm::EventSetup & eSetup) override;
-
-   void fillModMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es) override; 
-   void fillSummaryMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es) override; 
- 	       
-  void fillMEsForDet(const ModMEs& selModME_,uint32_t selDetId_, const TrackerTopology* tTopo) override;
-  void fillMEsForLayer( /*std::map<uint32_t, ModMEs> selModMEsMap_, */ uint32_t selDetId_, const TrackerTopology* tTopo) override;
-  
-  unsigned long long getCache(const edm::EventSetup & eSetup) override{ return eSetup.get<SiStripThresholdRcd>().cacheIdentifier();}
-  
-  void getConditionObject(const edm::EventSetup & eSetup) override{
+
+  void getActiveDetIds(const edm::EventSetup &eSetup) override;
+
+  void fillModMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) override;
+  void fillSummaryMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) override;
+
+  void fillMEsForDet(const ModMEs &selModME_, uint32_t selDetId_, const TrackerTopology *tTopo) override;
+  void fillMEsForLayer(
+      /*std::map<uint32_t, ModMEs> selModMEsMap_, */ uint32_t selDetId_, const TrackerTopology *tTopo) override;
+
+  unsigned long long getCache(const edm::EventSetup &eSetup) override {
+    return eSetup.get<SiStripThresholdRcd>().cacheIdentifier();
+  }
+
+  void getConditionObject(const edm::EventSetup &eSetup) override {
     eSetup.get<SiStripThresholdRcd>().get(thresholdHandle_);
     cacheID_memory = cacheID_current;
   }
 
-  private:
-    edm::ESHandle<SiStripThreshold> thresholdHandle_;
-    std::string WhichThreshold;
+private:
+  edm::ESHandle<SiStripThreshold> thresholdHandle_;
+  std::string WhichThreshold;
 };
 
 #endif
diff --git a/DQM/SiStripMonitorSummary/plugins/SealModules.cc b/DQM/SiStripMonitorSummary/plugins/SealModules.cc
index b361412d6cd33..615de4f696a77 100644
--- a/DQM/SiStripMonitorSummary/plugins/SealModules.cc
+++ b/DQM/SiStripMonitorSummary/plugins/SealModules.cc
@@ -1,7 +1,6 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/SourceFactory.h"
 
-
 #include "FWCore/ServiceRegistry/interface/ServiceMaker.h"
 
 #include "DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.h"
diff --git a/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.cc b/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.cc
index ec0bb566ad3e5..b7f34dba85e30 100644
--- a/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.cc
+++ b/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.cc
@@ -3,195 +3,183 @@
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
-
-
-SiStripCorrelateBadStripAndNoise::SiStripCorrelateBadStripAndNoise(const edm::ParameterSet& iConfig):
-  cacheID_quality(0xFFFFFFFF),cacheID_noise(0xFFFFFFFF)
-{
-  //now do what ever initialization is needed
-  if(!edm::Service<SiStripDetInfoFileReader>().isAvailable()){
-    edm::LogError("TkLayerMap") << 
-      "\n------------------------------------------"
-      "\nUnAvailable Service SiStripDetInfoFileReader: please insert in the configuration file an instance like"
-      "\n\tprocess.SiStripDetInfoFileReader = cms.Service(\"SiStripDetInfoFileReader\")"
-      "\n------------------------------------------";
+SiStripCorrelateBadStripAndNoise::SiStripCorrelateBadStripAndNoise(const edm::ParameterSet &iConfig)
+    : cacheID_quality(0xFFFFFFFF), cacheID_noise(0xFFFFFFFF) {
+  // now do what ever initialization is needed
+  if (!edm::Service<SiStripDetInfoFileReader>().isAvailable()) {
+    edm::LogError("TkLayerMap") << "\n------------------------------------------"
+                                   "\nUnAvailable Service SiStripDetInfoFileReader: please insert in "
+                                   "the configuration file an instance like"
+                                   "\n\tprocess.SiStripDetInfoFileReader = "
+                                   "cms.Service(\"SiStripDetInfoFileReader\")"
+                                   "\n------------------------------------------";
   }
- 
-  fr=edm::Service<SiStripDetInfoFileReader>().operator->();
-  file = new TFile("correlTest.root","RECREATE");
+
+  fr = edm::Service<SiStripDetInfoFileReader>().operator->();
+  file = new TFile("correlTest.root", "RECREATE");
   tkmap = new TrackerMap();
 }
 
-
-SiStripCorrelateBadStripAndNoise::~SiStripCorrelateBadStripAndNoise()
-{}
+SiStripCorrelateBadStripAndNoise::~SiStripCorrelateBadStripAndNoise() {}
 
 //
 
-void
-SiStripCorrelateBadStripAndNoise::beginRun(const edm::Run& run, const edm::EventSetup& es){
-
-  if(getNoiseCache(es)==cacheID_noise && getQualityCache(es)==cacheID_quality)
+void SiStripCorrelateBadStripAndNoise::beginRun(const edm::Run &run, const edm::EventSetup &es) {
+  if (getNoiseCache(es) == cacheID_noise && getQualityCache(es) == cacheID_quality)
     return;
-  cacheID_noise=getNoiseCache(es);
-  cacheID_quality=getQualityCache(es);
-  
-  edm::LogInfo("") << "[SiStripCorrelateBadStripAndNoise::beginRun] cacheID_quality " << cacheID_quality << " cacheID_noise " << cacheID_noise << std::endl; 
-  
+  cacheID_noise = getNoiseCache(es);
+  cacheID_quality = getQualityCache(es);
+
+  edm::LogInfo("") << "[SiStripCorrelateBadStripAndNoise::beginRun] cacheID_quality " << cacheID_quality
+                   << " cacheID_noise " << cacheID_noise << std::endl;
+
   es.get<SiStripQualityRcd>().get(qualityHandle_);
   es.get<SiStripNoisesRcd>().get(noiseHandle_);
 
   DoAnalysis(es);
 }
 
-void 
-SiStripCorrelateBadStripAndNoise::DoAnalysis(const edm::EventSetup& es){
-
-  //Retrieve tracker topology from geometry
+void SiStripCorrelateBadStripAndNoise::DoAnalysis(const edm::EventSetup &es) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   es.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
-  //Loop on quality bad stirps
-  //for each strip, look at the noise 
-  // evalaute the mean apv noise and the ratio among strip noise and meanApvNoise
-  // put the value in the histo in terms of ratio Vs percentage of badStrips per APV
+  // Loop on quality bad stirps
+  // for each strip, look at the noise
+  // evalaute the mean apv noise and the ratio among strip noise and
+  // meanApvNoise put the value in the histo in terms of ratio Vs percentage of
+  // badStrips per APV
 
-  //Fill an histo per subdet and layer (and plus && minus for TEC/TID)
+  // Fill an histo per subdet and layer (and plus && minus for TEC/TID)
   edm::LogInfo("") << "[Doanalysis]";
   iterateOnDets(tTopo);
-
 }
 
-void 
-SiStripCorrelateBadStripAndNoise::iterateOnDets(const TrackerTopology* tTopo){
-
+void SiStripCorrelateBadStripAndNoise::iterateOnDets(const TrackerTopology *tTopo) {
   SiStripQuality::RegistryIterator rbegin = qualityHandle_->getRegistryVectorBegin();
-  SiStripQuality::RegistryIterator rend   = qualityHandle_->getRegistryVectorEnd();
-
- 
-  for (SiStripBadStrip::RegistryIterator rp=rbegin; rp != rend; ++rp) {
-    const uint32_t detid=rp->detid;
-    
-    SiStripQuality::Range sqrange = SiStripQuality::Range( qualityHandle_->getDataVectorBegin()+rp->ibegin , qualityHandle_->getDataVectorBegin()+rp->iend );
-    iterateOnBadStrips(detid,tTopo,sqrange);
-  }  
+  SiStripQuality::RegistryIterator rend = qualityHandle_->getRegistryVectorEnd();
+
+  for (SiStripBadStrip::RegistryIterator rp = rbegin; rp != rend; ++rp) {
+    const uint32_t detid = rp->detid;
+
+    SiStripQuality::Range sqrange = SiStripQuality::Range(qualityHandle_->getDataVectorBegin() + rp->ibegin,
+                                                          qualityHandle_->getDataVectorBegin() + rp->iend);
+    iterateOnBadStrips(detid, tTopo, sqrange);
+  }
 }
 
-void 
-SiStripCorrelateBadStripAndNoise::iterateOnBadStrips(const uint32_t & detid, const TrackerTopology* tTopo, SiStripQuality::Range& sqrange){
+void SiStripCorrelateBadStripAndNoise::iterateOnBadStrips(const uint32_t &detid,
+                                                          const TrackerTopology *tTopo,
+                                                          SiStripQuality::Range &sqrange) {
+  float percentage = 0;
+  for (int it = 0; it < sqrange.second - sqrange.first; it++) {
+    unsigned int firstStrip = qualityHandle_->decode(*(sqrange.first + it)).firstStrip;
+    unsigned int range = qualityHandle_->decode(*(sqrange.first + it)).range;
 
-  float percentage=0;
-  for(int it=0;it<sqrange.second-sqrange.first;it++){
-    unsigned int firstStrip=qualityHandle_->decode( *(sqrange.first+it) ).firstStrip;
-    unsigned int range=qualityHandle_->decode( *(sqrange.first+it) ).range;
-    
-    correlateWithNoise(detid,tTopo,firstStrip,range);
+    correlateWithNoise(detid, tTopo, firstStrip, range);
 
-    edm::LogInfo("range")<< range;
-    percentage+=range;
+    edm::LogInfo("range") << range;
+    percentage += range;
   }
-  if(percentage!=0)
-    percentage/=128.*fr->getNumberOfApvsAndStripLength(detid).first;
-  if(percentage>1)
-    edm::LogError("SiStripQualityStatistics") <<  "PROBLEM detid " << detid << " value " << percentage<< std::endl;
-  
-  //------- Global Statistics on percentage of bad components along the IOVs ------//
-  if(percentage!=0)
-    edm::LogInfo("")<< "percentage " << detid << " " << percentage;
+  if (percentage != 0)
+    percentage /= 128. * fr->getNumberOfApvsAndStripLength(detid).first;
+  if (percentage > 1)
+    edm::LogError("SiStripQualityStatistics") << "PROBLEM detid " << detid << " value " << percentage << std::endl;
+
+  //------- Global Statistics on percentage of bad components along the IOVs
+  //------//
+  if (percentage != 0)
+    edm::LogInfo("") << "percentage " << detid << " " << percentage;
 }
 
-void 
-SiStripCorrelateBadStripAndNoise::correlateWithNoise(const uint32_t & detid, const TrackerTopology* tTopo, const uint32_t & firstStrip,  const uint32_t & range){
-
-  std::vector<TH2F *>histos;
+void SiStripCorrelateBadStripAndNoise::correlateWithNoise(const uint32_t &detid,
+                                                          const TrackerTopology *tTopo,
+                                                          const uint32_t &firstStrip,
+                                                          const uint32_t &range) {
+  std::vector<TH2F *> histos;
 
   SiStripNoises::Range noiseRange = noiseHandle_->getRange(detid);
   edm::LogInfo("Domenico") << "detid " << detid << " first " << firstStrip << " range " << range;
-  float meanAPVNoise=getMeanNoise(noiseRange,firstStrip/128,128);
+  float meanAPVNoise = getMeanNoise(noiseRange, firstStrip / 128, 128);
+
+  // float meanNoiseHotStrips=getMeanNoise(noiseRange,firstStrip,range);
+  for (size_t theStrip = firstStrip; theStrip < firstStrip + range; theStrip++) {
+    float meanNoiseHotStrips = getMeanNoise(noiseRange, theStrip, 1);
 
-  //float meanNoiseHotStrips=getMeanNoise(noiseRange,firstStrip,range);
-  for (size_t theStrip=firstStrip;theStrip<firstStrip+range;theStrip++){
-    float meanNoiseHotStrips=getMeanNoise(noiseRange,theStrip,1);
-  
-    //Get the histogram for this detid
+    // Get the histogram for this detid
     getHistos(detid, tTopo, histos);
-    float yvalue=range<21?1.*range:21;
-    
-    for(size_t i=0;i<histos.size();++i)
-      histos[i]->Fill(meanNoiseHotStrips/meanAPVNoise-1.,yvalue);
-    
-    if(meanNoiseHotStrips/meanAPVNoise-1.<-0.3)
-      tkmap->fillc(detid,0xFF0000);
+    float yvalue = range < 21 ? 1. * range : 21;
+
+    for (size_t i = 0; i < histos.size(); ++i)
+      histos[i]->Fill(meanNoiseHotStrips / meanAPVNoise - 1., yvalue);
+
+    if (meanNoiseHotStrips / meanAPVNoise - 1. < -0.3)
+      tkmap->fillc(detid, 0xFF0000);
     else
-      tkmap->fillc(detid,0x0000FF);
+      tkmap->fillc(detid, 0x0000FF);
   }
 }
 
-float  
-SiStripCorrelateBadStripAndNoise::getMeanNoise(const SiStripNoises::Range& noiseRange,const uint32_t& firstStrip, const uint32_t& range){
-  
-  float mean=0;
-  for (size_t istrip=firstStrip;istrip<firstStrip+range;istrip++){
-    mean+=noiseHandle_->getNoise(istrip,noiseRange);
+float SiStripCorrelateBadStripAndNoise::getMeanNoise(const SiStripNoises::Range &noiseRange,
+                                                     const uint32_t &firstStrip,
+                                                     const uint32_t &range) {
+  float mean = 0;
+  for (size_t istrip = firstStrip; istrip < firstStrip + range; istrip++) {
+    mean += noiseHandle_->getNoise(istrip, noiseRange);
   }
-  return mean/(1.*range);
+  return mean / (1. * range);
 }
 
-void
-SiStripCorrelateBadStripAndNoise::getHistos(const uint32_t& detid, const TrackerTopology* tTopo, std::vector<TH2F*>& histos){
-  
+void SiStripCorrelateBadStripAndNoise::getHistos(const uint32_t &detid,
+                                                 const TrackerTopology *tTopo,
+                                                 std::vector<TH2F *> &histos) {
   histos.clear();
-  
-  int subdet=-999; int component=-999;
+
+  int subdet = -999;
+  int component = -999;
   SiStripDetId a(detid);
-  if ( a.subdetId() == 3 ){
-    subdet=0;
-    component=tTopo->tibLayer(detid);
-  } else if ( a.subdetId() == 4 ) {
-    subdet=1;
-    component=tTopo->tidSide(detid)==2?tTopo->tidWheel(detid):tTopo->tidWheel(detid)+3;
-  } else if ( a.subdetId() == 5 ) {
-    subdet=2;
-    component=tTopo->tobLayer(detid);
-  } else if ( a.subdetId() == 6 ) {
-    subdet=3;
-    component=tTopo->tecSide(detid)==2?tTopo->tecWheel(detid):tTopo->tecWheel(detid)+9;
-  } 
-  
-  int index=100+subdet*100+component;
+  if (a.subdetId() == 3) {
+    subdet = 0;
+    component = tTopo->tibLayer(detid);
+  } else if (a.subdetId() == 4) {
+    subdet = 1;
+    component = tTopo->tidSide(detid) == 2 ? tTopo->tidWheel(detid) : tTopo->tidWheel(detid) + 3;
+  } else if (a.subdetId() == 5) {
+    subdet = 2;
+    component = tTopo->tobLayer(detid);
+  } else if (a.subdetId() == 6) {
+    subdet = 3;
+    component = tTopo->tecSide(detid) == 2 ? tTopo->tecWheel(detid) : tTopo->tecWheel(detid) + 9;
+  }
 
+  int index = 100 + subdet * 100 + component;
 
   histos.push_back(getHisto(subdet));
   histos.push_back(getHisto(index));
-  
 }
 
-TH2F*
-SiStripCorrelateBadStripAndNoise::getHisto(const long unsigned int& index){
-  if(vTH2.size()<index+1)
-    vTH2.resize(index+1,nullptr);
-  
-  if(vTH2[index]==nullptr){
+TH2F *SiStripCorrelateBadStripAndNoise::getHisto(const long unsigned int &index) {
+  if (vTH2.size() < index + 1)
+    vTH2.resize(index + 1, nullptr);
+
+  if (vTH2[index] == nullptr) {
     char name[128];
-    sprintf(name,"%lu",index);
-    edm::LogInfo("")<<"[getHisto] creating index " << index << std::endl;
-    vTH2[index]=new TH2F(name,name,50,-2.,2.,21,0.5,21.5);
+    sprintf(name, "%lu", index);
+    edm::LogInfo("") << "[getHisto] creating index " << index << std::endl;
+    vTH2[index] = new TH2F(name, name, 50, -2., 2., 21, 0.5, 21.5);
   }
-  
+
   return vTH2[index];
 }
 
-void 
-SiStripCorrelateBadStripAndNoise::endJob() {
-  for(size_t i=0;i<vTH2.size();i++)
-    if(vTH2[i]!=nullptr)
+void SiStripCorrelateBadStripAndNoise::endJob() {
+  for (size_t i = 0; i < vTH2.size(); i++)
+    if (vTH2[i] != nullptr)
       vTH2[i]->Write();
 
   file->Write();
   file->Close();
 
-  tkmap->save(true,0,0,"testTkMap.png");
-
+  tkmap->save(true, 0, 0, "testTkMap.png");
 }
-
diff --git a/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.h b/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.h
index c9fb8e0cd027c..a39076fb84c10 100644
--- a/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.h
+++ b/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.h
@@ -2,8 +2,9 @@
 //
 // Package:    SiStripCorrelateBadStripAndNoise
 // Class:      SiStripCorrelateBadStripAndNoise
-// 
-/**\class SiStripCorrelateBadStripAndNoise SiStripCorrelateBadStripAndNoise.cc DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.cc
+//
+/**\class SiStripCorrelateBadStripAndNoise SiStripCorrelateBadStripAndNoise.cc
+ DQM/SiStripMonitorSummary/plugins/SiStripCorrelateBadStripAndNoise.cc
 
  Description: <one line class summary>
 
@@ -16,17 +17,16 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
 // user include files
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripQuality.h"
 #include "CondFormats/SiStripObjects/interface/SiStripNoises.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -37,10 +37,9 @@
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
 #include "CommonTools/TrackerMap/interface/TrackerMap.h"
 
-#include "TH2F.h"
-#include "TH1F.h"
 #include "TFile.h"
-
+#include "TH1F.h"
+#include "TH2F.h"
 
 //
 // class decleration
@@ -48,43 +47,44 @@
 class TrackerTopology;
 class SiStripCorrelateBadStripAndNoise : public edm::EDAnalyzer {
 public:
-  explicit SiStripCorrelateBadStripAndNoise(const edm::ParameterSet&);
+  explicit SiStripCorrelateBadStripAndNoise(const edm::ParameterSet &);
   ~SiStripCorrelateBadStripAndNoise() override;
-  
-  
+
 private:
-  void beginRun(const edm::Run& run, const edm::EventSetup& es) override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override{};
+  void beginRun(const edm::Run &run, const edm::EventSetup &es) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override{};
   void endJob() override;
-  
-  void DoAnalysis(const edm::EventSetup&);
-  void getHistos(const uint32_t & detid, const TrackerTopology* tTopo, std::vector<TH2F*>& histos);
-  TH2F* getHisto(const long unsigned int& index);
-
-  unsigned long long getNoiseCache(const edm::EventSetup & eSetup){ return eSetup.get<SiStripNoisesRcd>().cacheIdentifier();}
-  unsigned long long getQualityCache(const edm::EventSetup & eSetup){ return eSetup.get<SiStripQualityRcd>().cacheIdentifier();}
 
+  void DoAnalysis(const edm::EventSetup &);
+  void getHistos(const uint32_t &detid, const TrackerTopology *tTopo, std::vector<TH2F *> &histos);
+  TH2F *getHisto(const long unsigned int &index);
 
-  void iterateOnDets(const TrackerTopology* tTopo);
-  void iterateOnBadStrips(const uint32_t & detid, const TrackerTopology* tTopo, SiStripQuality::Range& sqrange);
-  void correlateWithNoise(const uint32_t & detid, const TrackerTopology* tTopo, const uint32_t & firstStrip,  const uint32_t & range);
-  float  getMeanNoise(const SiStripNoises::Range& noiseRange,const uint32_t& first, const uint32_t& range); 
+  unsigned long long getNoiseCache(const edm::EventSetup &eSetup) {
+    return eSetup.get<SiStripNoisesRcd>().cacheIdentifier();
+  }
+  unsigned long long getQualityCache(const edm::EventSetup &eSetup) {
+    return eSetup.get<SiStripQualityRcd>().cacheIdentifier();
+  }
 
+  void iterateOnDets(const TrackerTopology *tTopo);
+  void iterateOnBadStrips(const uint32_t &detid, const TrackerTopology *tTopo, SiStripQuality::Range &sqrange);
+  void correlateWithNoise(const uint32_t &detid,
+                          const TrackerTopology *tTopo,
+                          const uint32_t &firstStrip,
+                          const uint32_t &range);
+  float getMeanNoise(const SiStripNoises::Range &noiseRange, const uint32_t &first, const uint32_t &range);
 
-     // ----------member data ---------------------------
+  // ----------member data ---------------------------
 
-  SiStripDetInfoFileReader * fr;
+  SiStripDetInfoFileReader *fr;
   edm::ESHandle<SiStripQuality> qualityHandle_;
   edm::ESHandle<SiStripNoises> noiseHandle_;
 
-  TFile* file;
-  std::vector<TH2F*> vTH2;
+  TFile *file;
+  std::vector<TH2F *> vTH2;
 
   TrackerMap *tkmap;
 
-  
   unsigned long long cacheID_quality;
   unsigned long long cacheID_noise;
 };
-
-
diff --git a/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateNoise.cc b/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateNoise.cc
index 53a949cc5f633..77be7189305b2 100644
--- a/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateNoise.cc
+++ b/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateNoise.cc
@@ -1,243 +1,229 @@
 #include "DQM/SiStripMonitorSummary/plugins/SiStripCorrelateNoise.h"
 
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "FWCore/Framework/interface/Run.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "TCanvas.h"
 
-
-SiStripCorrelateNoise::SiStripCorrelateNoise(const edm::ParameterSet& iConfig):
-  refNoise(nullptr),oldGain(nullptr),newGain(nullptr),cacheID_noise(0xFFFFFFFF),cacheID_gain(0xFFFFFFFF)
-{
-  //now do what ever initialization is needed
-  if(!edm::Service<SiStripDetInfoFileReader>().isAvailable()){
-    edm::LogError("TkLayerMap") << 
-      "\n------------------------------------------"
-      "\nUnAvailable Service SiStripDetInfoFileReader: please insert in the configuration file an instance like"
-      "\n\tprocess.SiStripDetInfoFileReader = cms.Service(\"SiStripDetInfoFileReader\")"
-      "\n------------------------------------------";
+SiStripCorrelateNoise::SiStripCorrelateNoise(const edm::ParameterSet &iConfig)
+    : refNoise(nullptr), oldGain(nullptr), newGain(nullptr), cacheID_noise(0xFFFFFFFF), cacheID_gain(0xFFFFFFFF) {
+  // now do what ever initialization is needed
+  if (!edm::Service<SiStripDetInfoFileReader>().isAvailable()) {
+    edm::LogError("TkLayerMap") << "\n------------------------------------------"
+                                   "\nUnAvailable Service SiStripDetInfoFileReader: please insert in "
+                                   "the configuration file an instance like"
+                                   "\n\tprocess.SiStripDetInfoFileReader = "
+                                   "cms.Service(\"SiStripDetInfoFileReader\")"
+                                   "\n------------------------------------------";
   }
- 
-  fr=edm::Service<SiStripDetInfoFileReader>().operator->();
-  file = new TFile("correlTest.root","RECREATE");
+
+  fr = edm::Service<SiStripDetInfoFileReader>().operator->();
+  file = new TFile("correlTest.root", "RECREATE");
 
   file->cd();
   tkmap = new TrackerMap();
 }
 
-
-SiStripCorrelateNoise::~SiStripCorrelateNoise()
-{}
+SiStripCorrelateNoise::~SiStripCorrelateNoise() {}
 
 //
 
-void
-SiStripCorrelateNoise::beginRun(const edm::Run& run, const edm::EventSetup& es){
-
-  if(getNoiseCache(es)==cacheID_noise )
+void SiStripCorrelateNoise::beginRun(const edm::Run &run, const edm::EventSetup &es) {
+  if (getNoiseCache(es) == cacheID_noise)
     return;
 
-  edm::LogInfo("") << "[SiStripCorrelateNoise::beginRun]  cacheID_noise " << cacheID_noise << std::endl; 
-  
+  edm::LogInfo("") << "[SiStripCorrelateNoise::beginRun]  cacheID_noise " << cacheID_noise << std::endl;
+
   es.get<SiStripNoisesRcd>().get(noiseHandle_);
-  SiStripNoises * aNoise= new SiStripNoises(*noiseHandle_.product());
-  
-  //Check if gain is the same from one noise iov to the other, otherwise cache the new gain (and the old one) to rescale
+  SiStripNoises *aNoise = new SiStripNoises(*noiseHandle_.product());
+
+  // Check if gain is the same from one noise iov to the other, otherwise cache
+  // the new gain (and the old one) to rescale
 
   checkGainCache(es);
 
-  if(cacheID_noise!=0xFFFFFFFF){
+  if (cacheID_noise != 0xFFFFFFFF) {
     char dir[128];
-    theRun=run.run();
-    sprintf(dir,"Run_%d",theRun);
+    theRun = run.run();
+    sprintf(dir, "Run_%d", theRun);
     file->cd("");
     file->mkdir(dir);
     file->cd(dir);
-    DoAnalysis(es,*noiseHandle_.product(),*refNoise);
-    DoPlots(); 
+    DoAnalysis(es, *noiseHandle_.product(), *refNoise);
+    DoPlots();
   }
 
-  cacheID_noise=getNoiseCache(es);  
-  if(refNoise!=nullptr)
+  cacheID_noise = getNoiseCache(es);
+  if (refNoise != nullptr)
     delete refNoise;
-  refNoise=aNoise;
+  refNoise = aNoise;
 }
 
-void 
-SiStripCorrelateNoise::checkGainCache(const edm::EventSetup& es){
-  equalGain=true;
-  if(getGainCache(es)!=cacheID_gain ){
+void SiStripCorrelateNoise::checkGainCache(const edm::EventSetup &es) {
+  equalGain = true;
+  if (getGainCache(es) != cacheID_gain) {
     es.get<SiStripApvGainRcd>().get(gainHandle_);
-    if(oldGain!=nullptr)
+    if (oldGain != nullptr)
       delete oldGain;
-    
+
     oldGain = newGain;
     newGain = new SiStripApvGain(*gainHandle_.product());
 
-    if(cacheID_gain!=0xFFFFFFFF)
-      equalGain=false;
-   cacheID_gain=getGainCache(es);
-   edm::LogInfo("") << "[SiStripCorrelateNoise::checkGainCache]  cacheID_gain " << cacheID_gain << std::endl; 
+    if (cacheID_gain != 0xFFFFFFFF)
+      equalGain = false;
+    cacheID_gain = getGainCache(es);
+    edm::LogInfo("") << "[SiStripCorrelateNoise::checkGainCache]  cacheID_gain " << cacheID_gain << std::endl;
   }
 }
 
-void 
-SiStripCorrelateNoise::DoPlots(){
-  TCanvas *C=new TCanvas();
-  C->Divide(2,2);
-  
+void SiStripCorrelateNoise::DoPlots() {
+  TCanvas *C = new TCanvas();
+  C->Divide(2, 2);
+
   char outName[128];
-  sprintf(outName,"Run_%d.png",theRun);
-  for(size_t i=0;i<vTH1.size();i++)
-    if(vTH1[i]!=nullptr){
-      if(i%100==0){
-	C->cd(i/100);
-	vTH1[i]->SetLineColor(i/100);
-	vTH1[i]->Draw();
-	C->cd(i/100)->SetLogy();
+  sprintf(outName, "Run_%d.png", theRun);
+  for (size_t i = 0; i < vTH1.size(); i++)
+    if (vTH1[i] != nullptr) {
+      if (i % 100 == 0) {
+        C->cd(i / 100);
+        vTH1[i]->SetLineColor(i / 100);
+        vTH1[i]->Draw();
+        C->cd(i / 100)->SetLogy();
       }
       vTH1[i]->Write();
     }
-  
+
   C->Print(outName);
   delete C;
-  
+
   vTH1.clear();
   file->cd("");
 
   char dir[128];
-  sprintf(dir,"Run_%d_TkMap.png",theRun);
-  tkmap->save(false,0,5,dir);
+  sprintf(dir, "Run_%d_TkMap.png", theRun);
+  tkmap->save(false, 0, 5, dir);
   delete tkmap;
   tkmap = new TrackerMap();
 }
 
-void 
-SiStripCorrelateNoise::DoAnalysis(const edm::EventSetup& es, const SiStripNoises& _Noise, SiStripNoises& refNoise){
+void SiStripCorrelateNoise::DoAnalysis(const edm::EventSetup &es,
+                                       const SiStripNoises &_Noise,
+                                       SiStripNoises &refNoise) {
   SiStripNoises Noise = _Noise;
-  typedef std::vector<SiStripNoises::ratioData> collection; 
-  collection divNoise=Noise/refNoise;
+  typedef std::vector<SiStripNoises::ratioData> collection;
+  collection divNoise = Noise / refNoise;
 
   edm::LogInfo("") << "[Doanalysis]";
 
-  //Retrieve tracker topology from geometry
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   es.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
-  std::vector<TH1F *>histos;
+  std::vector<TH1F *> histos;
 
-  collection::const_iterator iter=divNoise.begin();
-  collection::const_iterator iterE=divNoise.end();
+  collection::const_iterator iter = divNoise.begin();
+  collection::const_iterator iterE = divNoise.end();
 
   float value;
-  float gainRatio=1.;
-  //Divide result by d
-  for(;iter!=iterE;++iter){
+  float gainRatio = 1.;
+  // Divide result by d
+  for (; iter != iterE; ++iter) {
     getHistos(iter->detid, tTopo, histos);
-    
-    size_t strip=0, stripE= iter->values.size();
-    size_t apvNb=7;
-
-    for (;strip<stripE;++strip){       
-      if(!equalGain && strip/128!=apvNb){
-	apvNb=strip/128;
-	if(apvNb<6)
-	  gainRatio=getGainRatio(iter->detid,apvNb);
-	else
-	  edm::LogInfo("") << "[Doanalysis] detid " << iter->detid << " strip " << strip << " apvNb " << apvNb;
+
+    size_t strip = 0, stripE = iter->values.size();
+    size_t apvNb = 7;
+
+    for (; strip < stripE; ++strip) {
+      if (!equalGain && strip / 128 != apvNb) {
+        apvNb = strip / 128;
+        if (apvNb < 6)
+          gainRatio = getGainRatio(iter->detid, apvNb);
+        else
+          edm::LogInfo("") << "[Doanalysis] detid " << iter->detid << " strip " << strip << " apvNb " << apvNb;
       }
-      //edm::LogInfo("") << "[Doanalysis] detid " << iter->detid << " strip " << strip << " value " << iter->values[strip];
-      value=iter->values[strip]*gainRatio;
-      tkmap->fill(iter->detid,value);
-      for(size_t i=0;i<histos.size();++i)
-	histos[i]->Fill(value);
+      // edm::LogInfo("") << "[Doanalysis] detid " << iter->detid << " strip "
+      // << strip << " value " << iter->values[strip];
+      value = iter->values[strip] * gainRatio;
+      tkmap->fill(iter->detid, value);
+      for (size_t i = 0; i < histos.size(); ++i)
+        histos[i]->Fill(value);
     }
   }
 }
 
-float  
-SiStripCorrelateNoise::getGainRatio(const uint32_t& detid, const uint16_t& apv){
-
-  SiStripApvGain::Range oldRange=oldGain->getRange(detid); 
-  SiStripApvGain::Range newRange=newGain->getRange(detid); 
+float SiStripCorrelateNoise::getGainRatio(const uint32_t &detid, const uint16_t &apv) {
+  SiStripApvGain::Range oldRange = oldGain->getRange(detid);
+  SiStripApvGain::Range newRange = newGain->getRange(detid);
 
-  if(oldRange.first==oldRange.second ||
-     newRange.first==newRange.second)
+  if (oldRange.first == oldRange.second || newRange.first == newRange.second)
     return 1.;
 
-  return oldGain->getApvGain(apv,oldRange)/newGain->getApvGain(apv,newRange);
-
+  return oldGain->getApvGain(apv, oldRange) / newGain->getApvGain(apv, newRange);
 }
 
-float  
-SiStripCorrelateNoise::getMeanNoise(const SiStripNoises::Range& noiseRange,const uint32_t& firstStrip, const uint32_t& range){
-  
-  float mean=0;
-  for (size_t istrip=firstStrip;istrip<firstStrip+range;istrip++){
-    mean+=noiseHandle_->getNoise(istrip,noiseRange);
+float SiStripCorrelateNoise::getMeanNoise(const SiStripNoises::Range &noiseRange,
+                                          const uint32_t &firstStrip,
+                                          const uint32_t &range) {
+  float mean = 0;
+  for (size_t istrip = firstStrip; istrip < firstStrip + range; istrip++) {
+    mean += noiseHandle_->getNoise(istrip, noiseRange);
   }
-  return mean/(1.*range);
+  return mean / (1. * range);
 }
 
-void
-SiStripCorrelateNoise::getHistos(const uint32_t& detid, const TrackerTopology* tTopo, std::vector<TH1F*>& histos){
-  
+void SiStripCorrelateNoise::getHistos(const uint32_t &detid,
+                                      const TrackerTopology *tTopo,
+                                      std::vector<TH1F *> &histos) {
   histos.clear();
-  
-  int subdet=-999; int component=-999;
+
+  int subdet = -999;
+  int component = -999;
   SiStripDetId a(detid);
-  if ( a.subdetId() == 3 ){
-    subdet=0;
-    component=tTopo->tibLayer(detid);
-  } else if ( a.subdetId() == 4 ) {
-    subdet=1;
-    component=tTopo->tidSide(detid)==2?tTopo->tidWheel(detid):tTopo->tidWheel(detid)+3;
-  } else if ( a.subdetId() == 5 ) {
-    subdet=2;
-    component=tTopo->tobLayer(detid);
-  } else if ( a.subdetId() == 6 ) {
-    subdet=3;
-    component=tTopo->tecSide(detid)==2?tTopo->tecWheel(detid):tTopo->tecWheel(detid)+9;
-  } 
-  
-  int index=100+subdet*100+component;
-  
-
-  histos.push_back(getHisto(100+100*subdet));
+  if (a.subdetId() == 3) {
+    subdet = 0;
+    component = tTopo->tibLayer(detid);
+  } else if (a.subdetId() == 4) {
+    subdet = 1;
+    component = tTopo->tidSide(detid) == 2 ? tTopo->tidWheel(detid) : tTopo->tidWheel(detid) + 3;
+  } else if (a.subdetId() == 5) {
+    subdet = 2;
+    component = tTopo->tobLayer(detid);
+  } else if (a.subdetId() == 6) {
+    subdet = 3;
+    component = tTopo->tecSide(detid) == 2 ? tTopo->tecWheel(detid) : tTopo->tecWheel(detid) + 9;
+  }
+
+  int index = 100 + subdet * 100 + component;
+
+  histos.push_back(getHisto(100 + 100 * subdet));
   histos.push_back(getHisto(index));
-  
 }
 
-TH1F*
-SiStripCorrelateNoise::getHisto(const long unsigned int& index){
-  if(vTH1.size()<index+1)
-    vTH1.resize(index+1,nullptr);
-  
-  if(vTH1[index]==nullptr){
+TH1F *SiStripCorrelateNoise::getHisto(const long unsigned int &index) {
+  if (vTH1.size() < index + 1)
+    vTH1.resize(index + 1, nullptr);
+
+  if (vTH1[index] == nullptr) {
     char name[128];
     std::string SubD;
-    if(index<200)
-      SubD="TIB";
-    else if(index<300)
-      SubD="TID";
-    else if(index<400)
-      SubD="TOB";
-    else 
-      SubD="TEC";
-    sprintf(name,"%d_%lu__%s",theRun,index,SubD.c_str());
-    edm::LogInfo("")<<"[getHisto] creating index " << index << std::endl;
-    vTH1[index]=new TH1F(name,name,200,-0.5,10.5);
+    if (index < 200)
+      SubD = "TIB";
+    else if (index < 300)
+      SubD = "TID";
+    else if (index < 400)
+      SubD = "TOB";
+    else
+      SubD = "TEC";
+    sprintf(name, "%d_%lu__%s", theRun, index, SubD.c_str());
+    edm::LogInfo("") << "[getHisto] creating index " << index << std::endl;
+    vTH1[index] = new TH1F(name, name, 200, -0.5, 10.5);
   }
-  
+
   return vTH1[index];
 }
 
-void 
-SiStripCorrelateNoise::endJob() {
+void SiStripCorrelateNoise::endJob() {
   file->Write();
   file->Close();
-
-
 }
-
diff --git a/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateNoise.h b/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateNoise.h
index 20ac13f07d4d7..4dab5eab044aa 100644
--- a/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateNoise.h
+++ b/DQM/SiStripMonitorSummary/plugins/SiStripCorrelateNoise.h
@@ -2,8 +2,9 @@
 //
 // Package:    SiStripCorrelateNoise
 // Class:      SiStripCorrelateNoise
-// 
-/**\class SiStripCorrelateNoise SiStripCorrelateNoise.cc DQM/SiStripMonitorSummary/plugins/SiStripCorrelateNoise.cc
+//
+/**\class SiStripCorrelateNoise SiStripCorrelateNoise.cc
+ DQM/SiStripMonitorSummary/plugins/SiStripCorrelateNoise.cc
 
  Description: <one line class summary>
 
@@ -16,17 +17,16 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
 // user include files
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "CondFormats/SiStripObjects/interface/SiStripApvGain.h"
 #include "CondFormats/SiStripObjects/interface/SiStripNoises.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -37,10 +37,9 @@
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
 #include "CommonTools/TrackerMap/interface/TrackerMap.h"
 
-#include "TH2F.h"
-#include "TH1F.h"
 #include "TFile.h"
-
+#include "TH1F.h"
+#include "TH2F.h"
 
 //
 // class decleration
@@ -49,53 +48,52 @@
 class TrackerTopology;
 class SiStripCorrelateNoise : public edm::EDAnalyzer {
 public:
-  explicit SiStripCorrelateNoise(const edm::ParameterSet&);
+  explicit SiStripCorrelateNoise(const edm::ParameterSet &);
   ~SiStripCorrelateNoise() override;
-  
-  
+
 private:
-  void beginRun(const edm::Run& run, const edm::EventSetup& es) override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override{};
+  void beginRun(const edm::Run &run, const edm::EventSetup &es) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override{};
   void endJob() override;
-  
+
   void DoPlots();
-  void DoAnalysis(const edm::EventSetup&,const SiStripNoises&,SiStripNoises&);
-  void getHistos(const uint32_t & detid, const TrackerTopology* tTopo, std::vector<TH1F*>& histos);
-  TH1F* getHisto(const long unsigned int& index);
+  void DoAnalysis(const edm::EventSetup &, const SiStripNoises &, SiStripNoises &);
+  void getHistos(const uint32_t &detid, const TrackerTopology *tTopo, std::vector<TH1F *> &histos);
+  TH1F *getHisto(const long unsigned int &index);
 
-  unsigned long long getNoiseCache(const edm::EventSetup & eSetup){ return eSetup.get<SiStripNoisesRcd>().cacheIdentifier();}
-  unsigned long long getGainCache(const edm::EventSetup & eSetup){ return eSetup.get<SiStripApvGainRcd>().cacheIdentifier();}
-  void checkGainCache(const edm::EventSetup& es);
-  float  getMeanNoise(const SiStripNoises::Range& noiseRange,const uint32_t& first, const uint32_t& range); 
+  unsigned long long getNoiseCache(const edm::EventSetup &eSetup) {
+    return eSetup.get<SiStripNoisesRcd>().cacheIdentifier();
+  }
+  unsigned long long getGainCache(const edm::EventSetup &eSetup) {
+    return eSetup.get<SiStripApvGainRcd>().cacheIdentifier();
+  }
+  void checkGainCache(const edm::EventSetup &es);
+  float getMeanNoise(const SiStripNoises::Range &noiseRange, const uint32_t &first, const uint32_t &range);
 
-  float getGainRatio(const uint32_t& detid, const uint16_t& apv);
+  float getGainRatio(const uint32_t &detid, const uint16_t &apv);
 
-     // ----------member data ---------------------------
+  // ----------member data ---------------------------
 
-  struct Data{
+  struct Data {
     uint32_t detid;
     std::vector<float> values;
   };
 
-  SiStripDetInfoFileReader * fr;
+  SiStripDetInfoFileReader *fr;
   edm::ESHandle<SiStripApvGain> gainHandle_;
   edm::ESHandle<SiStripNoises> noiseHandle_;
 
   uint32_t theRun;
-  SiStripNoises* refNoise;
+  SiStripNoises *refNoise;
 
   SiStripApvGain *oldGain, *newGain;
   bool equalGain;
 
-
-  TFile* file;
-  std::vector<TH1F*> vTH1;
+  TFile *file;
+  std::vector<TH1F *> vTH1;
 
   TrackerMap *tkmap;
 
-  
   unsigned long long cacheID_noise;
   unsigned long long cacheID_gain;
 };
-
-
diff --git a/DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.cc b/DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.cc
index 33e31264686e3..9731845069991 100644
--- a/DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.cc
+++ b/DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.cc
@@ -3,137 +3,117 @@
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
-
-
-SiStripPlotGain::SiStripPlotGain(const edm::ParameterSet& iConfig):
-  cacheID(0xFFFFFFFF)
-{
-  //now do what ever initialization is needed
-  if(!edm::Service<SiStripDetInfoFileReader>().isAvailable()){
-    edm::LogError("TkLayerMap") << 
-      "\n------------------------------------------"
-      "\nUnAvailable Service SiStripDetInfoFileReader: please insert in the configuration file an instance like"
-      "\n\tprocess.SiStripDetInfoFileReader = cms.Service(\"SiStripDetInfoFileReader\")"
-      "\n------------------------------------------";
+SiStripPlotGain::SiStripPlotGain(const edm::ParameterSet &iConfig) : cacheID(0xFFFFFFFF) {
+  // now do what ever initialization is needed
+  if (!edm::Service<SiStripDetInfoFileReader>().isAvailable()) {
+    edm::LogError("TkLayerMap") << "\n------------------------------------------"
+                                   "\nUnAvailable Service SiStripDetInfoFileReader: please insert in "
+                                   "the configuration file an instance like"
+                                   "\n\tprocess.SiStripDetInfoFileReader = "
+                                   "cms.Service(\"SiStripDetInfoFileReader\")"
+                                   "\n------------------------------------------";
   }
- 
-  fr=edm::Service<SiStripDetInfoFileReader>().operator->();
-  file = new TFile("correlTest.root","RECREATE");
+
+  fr = edm::Service<SiStripDetInfoFileReader>().operator->();
+  file = new TFile("correlTest.root", "RECREATE");
   tkmap = new TrackerMap();
 }
 
-
-SiStripPlotGain::~SiStripPlotGain()
-{}
+SiStripPlotGain::~SiStripPlotGain() {}
 
 //
 
-void
-SiStripPlotGain::beginRun(const edm::Run& run, const edm::EventSetup& es){
-
-  if(getCache(es)==cacheID )
+void SiStripPlotGain::beginRun(const edm::Run &run, const edm::EventSetup &es) {
+  if (getCache(es) == cacheID)
     return;
-  cacheID=getCache(es);  
-  
-  edm::LogInfo("") << "[SiStripPlotGain::beginRun] cacheID " << cacheID << std::endl; 
-  
-  es.get<SiStripApvGainRcd>().get(Handle_);
-  DoAnalysis(es, *Handle_.product());
+  cacheID = getCache(es);
 
+  edm::LogInfo("") << "[SiStripPlotGain::beginRun] cacheID " << cacheID << std::endl;
 
+  es.get<SiStripApvGainRcd>().get(Handle_);
+  DoAnalysis(es, *Handle_.product());
 }
 
-void 
-SiStripPlotGain::DoAnalysis(const edm::EventSetup& es, const SiStripApvGain& gain){
-
+void SiStripPlotGain::DoAnalysis(const edm::EventSetup &es, const SiStripApvGain &gain) {
   edm::LogInfo("") << "[Doanalysis]";
 
-  //Retrieve tracker topology from geometry
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   es.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
-  std::vector<TH1F *>histos;
+  std::vector<TH1F *> histos;
 
-  SiStripApvGain::RegistryPointers p=gain.getRegistryPointers();
+  SiStripApvGain::RegistryPointers p = gain.getRegistryPointers();
   SiStripApvGain::RegistryConstIterator iter, iterE;
-  iter=p.detid_begin;
-  iterE=p.detid_end;
+  iter = p.detid_begin;
+  iterE = p.detid_end;
 
   float value;
 
-  //Divide result by d
-  for(;iter!=iterE;++iter){
-    getHistos(*iter,tTopo,histos);
-    SiStripApvGain::Range range=SiStripApvGain::Range(p.getFirstElement(iter),p.getLastElement(iter));
-
-    edm::LogInfo("") << "[Doanalysis] detid " << *iter << " range " << range.second-range.first;
-    size_t apv=0, apvE= (range.second-range.first);
-    for (;apv<apvE;apv+=2){       
-      value=gain.getApvGain(apv,range);
-      tkmap->fill(*iter,value);
-      for(size_t i=0;i<histos.size();++i)
-	histos[i]->Fill(value);
+  // Divide result by d
+  for (; iter != iterE; ++iter) {
+    getHistos(*iter, tTopo, histos);
+    SiStripApvGain::Range range = SiStripApvGain::Range(p.getFirstElement(iter), p.getLastElement(iter));
+
+    edm::LogInfo("") << "[Doanalysis] detid " << *iter << " range " << range.second - range.first;
+    size_t apv = 0, apvE = (range.second - range.first);
+    for (; apv < apvE; apv += 2) {
+      value = gain.getApvGain(apv, range);
+      tkmap->fill(*iter, value);
+      for (size_t i = 0; i < histos.size(); ++i)
+        histos[i]->Fill(value);
     }
-    
   }
 }
 
-
-void
-SiStripPlotGain::getHistos(const uint32_t& detid, const TrackerTopology* tTopo, std::vector<TH1F*>& histos){
-  
+void SiStripPlotGain::getHistos(const uint32_t &detid, const TrackerTopology *tTopo, std::vector<TH1F *> &histos) {
   histos.clear();
-  
-  int subdet=-999; int component=-999;
+
+  int subdet = -999;
+  int component = -999;
   SiStripDetId a(detid);
-  if ( a.subdetId() == 3 ){
-    subdet=0;
-    component=tTopo->tibLayer(detid);
-  } else if ( a.subdetId() == 4 ) {
-    subdet=1;
-    component=tTopo->tidSide(detid)==2?tTopo->tidWheel(detid):tTopo->tidWheel(detid)+3;
-  } else if ( a.subdetId() == 5 ) {
-    subdet=2;
-    component=tTopo->tobLayer(detid);
-  } else if ( a.subdetId() == 6 ) {
-    subdet=3;
-    component=tTopo->tecSide(detid)==2?tTopo->tecWheel(detid):tTopo->tecWheel(detid)+9;
-  } 
-  
-  int index=100+subdet*100+component;
-
-
-  histos.push_back(getHisto(subdet+1));
+  if (a.subdetId() == 3) {
+    subdet = 0;
+    component = tTopo->tibLayer(detid);
+  } else if (a.subdetId() == 4) {
+    subdet = 1;
+    component = tTopo->tidSide(detid) == 2 ? tTopo->tidWheel(detid) : tTopo->tidWheel(detid) + 3;
+  } else if (a.subdetId() == 5) {
+    subdet = 2;
+    component = tTopo->tobLayer(detid);
+  } else if (a.subdetId() == 6) {
+    subdet = 3;
+    component = tTopo->tecSide(detid) == 2 ? tTopo->tecWheel(detid) : tTopo->tecWheel(detid) + 9;
+  }
+
+  int index = 100 + subdet * 100 + component;
+
+  histos.push_back(getHisto(subdet + 1));
   histos.push_back(getHisto(index));
-  
 }
 
-TH1F*
-SiStripPlotGain::getHisto(const long unsigned int& index){
-  if(vTH1.size()<index+1)
-    vTH1.resize(index+1,nullptr);
-  
-  if(vTH1[index]==nullptr){
+TH1F *SiStripPlotGain::getHisto(const long unsigned int &index) {
+  if (vTH1.size() < index + 1)
+    vTH1.resize(index + 1, nullptr);
+
+  if (vTH1[index] == nullptr) {
     char name[128];
-    sprintf(name,"%lu",index);
-    edm::LogInfo("")<<"[getHisto] creating index " << index << std::endl;
-    vTH1[index]=new TH1F(name,name,150,0.,5.);
+    sprintf(name, "%lu", index);
+    edm::LogInfo("") << "[getHisto] creating index " << index << std::endl;
+    vTH1[index] = new TH1F(name, name, 150, 0., 5.);
   }
-  
+
   return vTH1[index];
 }
 
-void 
-SiStripPlotGain::endJob() {
-  for(size_t i=0;i<vTH1.size();i++)
-    if(vTH1[i]!=nullptr)
+void SiStripPlotGain::endJob() {
+  for (size_t i = 0; i < vTH1.size(); i++)
+    if (vTH1[i] != nullptr)
       vTH1[i]->Write();
 
   file->Write();
   file->Close();
 
-  tkmap->save(false,0,0,"testTkMap.png");
-
+  tkmap->save(false, 0, 0, "testTkMap.png");
 }
-
diff --git a/DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.h b/DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.h
index 75fdeec84b59e..d5eeccd376c8a 100644
--- a/DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.h
+++ b/DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.h
@@ -2,8 +2,9 @@
 //
 // Package:    SiStripPlotGain
 // Class:      SiStripPlotGain
-// 
-/**\class SiStripPlotGain SiStripPlotGain.cc DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.cc
+//
+/**\class SiStripPlotGain SiStripPlotGain.cc
+ DQM/SiStripMonitorSummary/plugins/SiStripPlotGain.cc
 
  Description: <one line class summary>
 
@@ -16,16 +17,15 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
 // user include files
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "CondFormats/SiStripObjects/interface/SiStripApvGain.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "CondFormats/SiStripObjects/interface/SiStripApvGain.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -36,10 +36,9 @@
 #include "CalibTracker/SiStripCommon/interface/SiStripDetInfoFileReader.h"
 #include "CommonTools/TrackerMap/interface/TrackerMap.h"
 
-#include "TH2F.h"
-#include "TH1F.h"
 #include "TFile.h"
-
+#include "TH1F.h"
+#include "TH2F.h"
 
 //
 // class decleration
@@ -48,37 +47,32 @@ class TrackerTopology;
 
 class SiStripPlotGain : public edm::EDAnalyzer {
 public:
-  explicit SiStripPlotGain(const edm::ParameterSet&);
+  explicit SiStripPlotGain(const edm::ParameterSet &);
   ~SiStripPlotGain() override;
-  
-  
+
 private:
-  void beginRun(const edm::Run& run, const edm::EventSetup& es) override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override{};
+  void beginRun(const edm::Run &run, const edm::EventSetup &es) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override{};
   void endJob() override;
-  
-  void DoAnalysis(const edm::EventSetup& es, const SiStripApvGain&);
-  void getHistos(const uint32_t & detid, const TrackerTopology* tTopo, std::vector<TH1F*>& histos);
-  TH1F* getHisto(const long unsigned int& index);
 
-  unsigned long long getCache(const edm::EventSetup & eSetup){ return eSetup.get<SiStripApvGainRcd>().cacheIdentifier();}
+  void DoAnalysis(const edm::EventSetup &es, const SiStripApvGain &);
+  void getHistos(const uint32_t &detid, const TrackerTopology *tTopo, std::vector<TH1F *> &histos);
+  TH1F *getHisto(const long unsigned int &index);
 
+  unsigned long long getCache(const edm::EventSetup &eSetup) {
+    return eSetup.get<SiStripApvGainRcd>().cacheIdentifier();
+  }
 
-     // ----------member data ---------------------------
+  // ----------member data ---------------------------
 
-
-  SiStripDetInfoFileReader * fr;
+  SiStripDetInfoFileReader *fr;
 
   edm::ESHandle<SiStripApvGain> Handle_;
 
-
-  TFile* file;
-  std::vector<TH1F*> vTH1;
+  TFile *file;
+  std::vector<TH1F *> vTH1;
 
   TrackerMap *tkmap;
 
-  
   unsigned long long cacheID;
 };
-
-
diff --git a/DQM/SiStripMonitorSummary/src/SiStripApvGainsDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripApvGainsDQM.cc
index 8e853e03b03b7..708dc1f5a7379 100644
--- a/DQM/SiStripMonitorSummary/src/SiStripApvGainsDQM.cc
+++ b/DQM/SiStripMonitorSummary/src/SiStripApvGainsDQM.cc
@@ -5,219 +5,195 @@
 #include "TCanvas.h"
 
 // -----
-SiStripApvGainsDQM::SiStripApvGainsDQM(const edm::EventSetup & eSetup,
+SiStripApvGainsDQM::SiStripApvGainsDQM(const edm::EventSetup &eSetup,
                                        edm::RunNumber_t iRun,
-                                       edm::ParameterSet const& hPSet,
-                                       edm::ParameterSet const& fPSet):SiStripBaseCondObjDQM(eSetup,iRun,hPSet, fPSet){
-
+                                       edm::ParameterSet const &hPSet,
+                                       edm::ParameterSet const &fPSet)
+    : SiStripBaseCondObjDQM(eSetup, iRun, hPSet, fPSet) {
   // Build the Histo_TkMap:
-  if ( HistoMaps_On_ ) {
+  if (HistoMaps_On_) {
     edm::ESHandle<TkDetMap> tkDetMapHandle;
     eSetup.get<TrackerTopologyRcd>().get(tkDetMapHandle);
-    Tk_HM_ = std::make_unique<TkHistoMap>(tkDetMapHandle.product(), "SiStrip/Histo_Map","MeanApvGain_TkMap",0.);
+    Tk_HM_ = std::make_unique<TkHistoMap>(tkDetMapHandle.product(), "SiStrip/Histo_Map", "MeanApvGain_TkMap", 0.);
   }
 }
 // -----
 
 // -----
-SiStripApvGainsDQM::~SiStripApvGainsDQM(){}
+SiStripApvGainsDQM::~SiStripApvGainsDQM() {}
 // -----
 
-
 // -----
-void SiStripApvGainsDQM::getActiveDetIds(const edm::EventSetup & eSetup){
-
+void SiStripApvGainsDQM::getActiveDetIds(const edm::EventSetup &eSetup) {
   getConditionObject(eSetup);
   gainHandle_->getDetIds(activeDetIds);
-
 }
 // -----
 
-
-
-
 // -----
-void SiStripApvGainsDQM::fillModMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es){
-
-  //Retrieve tracker topology from geometry
+void SiStripApvGainsDQM::fillModMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   es.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
   ModMEs CondObj_ME;
 
-  for(std::vector<uint32_t>::const_iterator detIter_ =selectedDetIds.begin();
-      detIter_!=selectedDetIds.end();++detIter_){
-    fillMEsForDet(CondObj_ME,*detIter_,tTopo);
-  }  
-}  
+  for (std::vector<uint32_t>::const_iterator detIter_ = selectedDetIds.begin(); detIter_ != selectedDetIds.end();
+       ++detIter_) {
+    fillMEsForDet(CondObj_ME, *detIter_, tTopo);
+  }
+}
 
-  
 // -----
-void SiStripApvGainsDQM::fillMEsForDet(const ModMEs& _selModME_, uint32_t selDetId_, const TrackerTopology* tTopo){
+void SiStripApvGainsDQM::fillMEsForDet(const ModMEs &_selModME_, uint32_t selDetId_, const TrackerTopology *tTopo) {
   ModMEs selModME_ = _selModME_;
   std::vector<uint32_t> DetIds;
   gainHandle_->getDetIds(DetIds);
 
   SiStripApvGain::Range gainRange = gainHandle_->getRange(selDetId_);
-  
-  int nApv =  reader->getNumberOfApvsAndStripLength(selDetId_).first;
-    
-  getModMEs(selModME_,selDetId_, tTopo);
- 
-  for( int iapv=0;iapv<nApv;++iapv){
-      if( CondObj_fillId_ =="onlyProfile" || CondObj_fillId_ =="ProfileAndCumul"){
-        selModME_.ProfileDistr->Fill(iapv+1,gainHandle_->getApvGain(iapv,gainRange));
-      }
-      if( CondObj_fillId_ =="onlyCumul" || CondObj_fillId_ =="ProfileAndCumul"){
-        selModME_.CumulDistr  ->Fill(gainHandle_->getApvGain(iapv,gainRange));
-      }
 
-    // Fill the TkMap
-    if(fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")){
-      fillTkMap(selDetId_, gainHandle_->getApvGain(iapv,gainRange));
+  int nApv = reader->getNumberOfApvsAndStripLength(selDetId_).first;
+
+  getModMEs(selModME_, selDetId_, tTopo);
+
+  for (int iapv = 0; iapv < nApv; ++iapv) {
+    if (CondObj_fillId_ == "onlyProfile" || CondObj_fillId_ == "ProfileAndCumul") {
+      selModME_.ProfileDistr->Fill(iapv + 1, gainHandle_->getApvGain(iapv, gainRange));
+    }
+    if (CondObj_fillId_ == "onlyCumul" || CondObj_fillId_ == "ProfileAndCumul") {
+      selModME_.CumulDistr->Fill(gainHandle_->getApvGain(iapv, gainRange));
     }
 
+    // Fill the TkMap
+    if (fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")) {
+      fillTkMap(selDetId_, gainHandle_->getApvGain(iapv, gainRange));
+    }
   }
 }
 
 // -----
-void SiStripApvGainsDQM::fillSummaryMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es){
-  
-  //Retrieve tracker topology from geometry
+void SiStripApvGainsDQM::fillSummaryMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   es.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
-  for(std::vector<uint32_t>::const_iterator detIter_ = selectedDetIds.begin();
-      detIter_!= selectedDetIds.end();detIter_++){
+  for (std::vector<uint32_t>::const_iterator detIter_ = selectedDetIds.begin(); detIter_ != selectedDetIds.end();
+       detIter_++) {
     fillMEsForLayer(/*SummaryMEsMap_,*/ *detIter_, tTopo);
   }
 
-  for (std::map<uint32_t, ModMEs>::iterator iter=SummaryMEsMap_.begin(); iter!=SummaryMEsMap_.end(); iter++){
-
+  for (std::map<uint32_t, ModMEs>::iterator iter = SummaryMEsMap_.begin(); iter != SummaryMEsMap_.end(); iter++) {
     ModMEs selME;
     selME = iter->second;
 
-    if(hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel") && fPSet_.getParameter<bool>("OutputSummaryProfileAtLayerLevelAsImage")){
-
+    if (hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel") &&
+        fPSet_.getParameter<bool>("OutputSummaryProfileAtLayerLevelAsImage")) {
       TCanvas c1("c1");
       selME.SummaryOfProfileDistr->getTProfile()->Draw();
-      std::string name (selME.SummaryOfProfileDistr->getTProfile()->GetTitle());
-      name+=".png";
+      std::string name(selME.SummaryOfProfileDistr->getTProfile()->GetTitle());
+      name += ".png";
       c1.Print(name.c_str());
     }
-    if(hPSet_.getParameter<bool>("FillSummaryAtLayerLevel") && fPSet_.getParameter<bool>("OutputSummaryAtLayerLevelAsImage")){
-
+    if (hPSet_.getParameter<bool>("FillSummaryAtLayerLevel") &&
+        fPSet_.getParameter<bool>("OutputSummaryAtLayerLevelAsImage")) {
       TCanvas c1("c1");
       selME.SummaryDistr->getTH1()->Draw();
-      std::string name (selME.SummaryDistr->getTH1()->GetTitle());
-      name+=".png";
+      std::string name(selME.SummaryDistr->getTH1()->GetTitle());
+      name += ".png";
       c1.Print(name.c_str());
     }
   }
-
-}  
+}
 
 // -----
-void SiStripApvGainsDQM::fillMEsForLayer( /*std::map<uint32_t, ModMEs> selMEsMap_, */uint32_t selDetId_, const TrackerTopology* tTopo){
-    
-  int subdetectorId_ = ((selDetId_>>25)&0x7);
-  
-  if( subdetectorId_<3 ||subdetectorId_>6 ){ 
-    edm::LogError("SiStripApvGainsDQM")
-      << "[SiStripApvGainsDQM::fillMEsForLayer] WRONG INPUT : no such subdetector type : "
-      << subdetectorId_ << " no folder set!" 
-      << std::endl;
+void SiStripApvGainsDQM::fillMEsForLayer(
+    /*std::map<uint32_t, ModMEs> selMEsMap_, */ uint32_t selDetId_, const TrackerTopology *tTopo) {
+  int subdetectorId_ = ((selDetId_ >> 25) & 0x7);
+
+  if (subdetectorId_ < 3 || subdetectorId_ > 6) {
+    edm::LogError("SiStripApvGainsDQM") << "[SiStripApvGainsDQM::fillMEsForLayer] WRONG INPUT : no such "
+                                           "subdetector type : "
+                                        << subdetectorId_ << " no folder set!" << std::endl;
     return;
   }
   // ----
-         
-  std::map<uint32_t, ModMEs>::iterator selMEsMapIter_  = SummaryMEsMap_.find(getLayerNameAndId(selDetId_,tTopo).second);
+
+  std::map<uint32_t, ModMEs>::iterator selMEsMapIter_ = SummaryMEsMap_.find(getLayerNameAndId(selDetId_, tTopo).second);
   ModMEs selME_;
-  if ( selMEsMapIter_ != SummaryMEsMap_.end())
-  selME_ =selMEsMapIter_->second;
-  getSummaryMEs(selME_,selDetId_,tTopo);
-  
+  if (selMEsMapIter_ != SummaryMEsMap_.end())
+    selME_ = selMEsMapIter_->second;
+  getSummaryMEs(selME_, selDetId_, tTopo);
+
   SiStripApvGain::Range gainRange = gainHandle_->getRange(selDetId_);
-  int nApv =  reader->getNumberOfApvsAndStripLength(selDetId_).first;
-  
-  float meanApvGain=0;
+  int nApv = reader->getNumberOfApvsAndStripLength(selDetId_).first;
 
-  SiStripHistoId hidmanager;
+  float meanApvGain = 0;
 
-  if(hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel")){
+  SiStripHistoId hidmanager;
 
-    // --> profile summary    
+  if (hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel")) {
+    // --> profile summary
     std::string hSummaryOfProfile_description;
-    hSummaryOfProfile_description  = hPSet_.getParameter<std::string>("SummaryOfProfile_description");
-  
-    std::string hSummaryOfProfile_name; 
-    hSummaryOfProfile_name = hidmanager.createHistoLayer(hSummaryOfProfile_description, 
-							 "layer", 
-							 getLayerNameAndId(selDetId_,tTopo).first, "") ;
-  
-    for( int iapv=0;iapv<nApv;++iapv){
-    
-	meanApvGain = meanApvGain +gainHandle_ ->getApvGain(iapv,gainRange);
-	selME_.SummaryOfProfileDistr->Fill(iapv+1,gainHandle_->getApvGain(iapv,gainRange));
+    hSummaryOfProfile_description = hPSet_.getParameter<std::string>("SummaryOfProfile_description");
 
-    // Fill the TkMap
-    if(fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")){
-      fillTkMap(selDetId_, gainHandle_->getApvGain(iapv,gainRange));
-    }
+    std::string hSummaryOfProfile_name;
+    hSummaryOfProfile_name = hidmanager.createHistoLayer(
+        hSummaryOfProfile_description, "layer", getLayerNameAndId(selDetId_, tTopo).first, "");
 
-    }// iapv
+    for (int iapv = 0; iapv < nApv; ++iapv) {
+      meanApvGain = meanApvGain + gainHandle_->getApvGain(iapv, gainRange);
+      selME_.SummaryOfProfileDistr->Fill(iapv + 1, gainHandle_->getApvGain(iapv, gainRange));
 
-    meanApvGain  = meanApvGain/nApv;
+      // Fill the TkMap
+      if (fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")) {
+        fillTkMap(selDetId_, gainHandle_->getApvGain(iapv, gainRange));
+      }
 
-    // Fill the TkHistoMap with meanApvgain:
-    if(HistoMaps_On_ ) Tk_HM_->setBinContent(selDetId_, meanApvGain);
+    }  // iapv
 
-  }//if Fill ...
+    meanApvGain = meanApvGain / nApv;
+
+    // Fill the TkHistoMap with meanApvgain:
+    if (HistoMaps_On_)
+      Tk_HM_->setBinContent(selDetId_, meanApvGain);
 
+  }  // if Fill ...
 
-  if(hPSet_.getParameter<bool>("FillSummaryAtLayerLevel")){
-  
-    // -->  summary    
+  if (hPSet_.getParameter<bool>("FillSummaryAtLayerLevel")) {
+    // -->  summary
     std::string hSummary_description;
-    hSummary_description  = hPSet_.getParameter<std::string>("Summary_description");
-  
-    std::string hSummary_name; 
-    hSummary_name = hidmanager.createHistoLayer(hSummary_description, 
-						"layer", 
-						getLayerNameAndId(selDetId_,tTopo).first, 
-						"") ;
+    hSummary_description = hPSet_.getParameter<std::string>("Summary_description");
 
+    std::string hSummary_name;
+    hSummary_name =
+        hidmanager.createHistoLayer(hSummary_description, "layer", getLayerNameAndId(selDetId_, tTopo).first, "");
 
     // get detIds belonging to same layer to fill X-axis with detId-number
-  
+
     std::vector<uint32_t> sameLayerDetIds_;
-  
+
     sameLayerDetIds_.clear();
 
-    sameLayerDetIds_=GetSameLayerDetId(activeDetIds,selDetId_,tTopo);
-  
-    unsigned int iBin=0;
-    for(unsigned int i=0;i<sameLayerDetIds_.size();i++){
-      if(sameLayerDetIds_[i]==selDetId_){iBin=i+1;}
+    sameLayerDetIds_ = GetSameLayerDetId(activeDetIds, selDetId_, tTopo);
+
+    unsigned int iBin = 0;
+    for (unsigned int i = 0; i < sameLayerDetIds_.size(); i++) {
+      if (sameLayerDetIds_[i] == selDetId_) {
+        iBin = i + 1;
+      }
     }
 
-    for( int iapv=0;iapv<nApv;++iapv){
-	meanApvGain = meanApvGain +gainHandle_ ->getApvGain(iapv,gainRange);
-	selME_.SummaryDistr->Fill(iBin,gainHandle_->getApvGain(iapv,gainRange));
-    }//iapv
-    meanApvGain  = meanApvGain/nApv;
+    for (int iapv = 0; iapv < nApv; ++iapv) {
+      meanApvGain = meanApvGain + gainHandle_->getApvGain(iapv, gainRange);
+      selME_.SummaryDistr->Fill(iBin, gainHandle_->getApvGain(iapv, gainRange));
+    }  // iapv
+    meanApvGain = meanApvGain / nApv;
 
     // Fill the TkHistoMap with meanApvgain:
     //    if(HistoMaps_On_ ) Tk_HM_->setBinContent(selDetId_, meanApvGain);
 
-  }//if Fill ...
-}  
+  }  // if Fill ...
+}
 // -----
-
-
-
-
-
-  
diff --git a/DQM/SiStripMonitorSummary/src/SiStripBackPlaneCorrectionDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripBackPlaneCorrectionDQM.cc
index afde45cb431d9..6e5c734fefe6a 100644
--- a/DQM/SiStripMonitorSummary/src/SiStripBackPlaneCorrectionDQM.cc
+++ b/DQM/SiStripMonitorSummary/src/SiStripBackPlaneCorrectionDQM.cc
@@ -1,285 +1,277 @@
 #include "DQM/SiStripMonitorSummary/interface/SiStripBackPlaneCorrectionDQM.h"
-#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "TCanvas.h"
 
 // -----
-SiStripBackPlaneCorrectionDQM::SiStripBackPlaneCorrectionDQM(const edm::EventSetup & eSetup,
+SiStripBackPlaneCorrectionDQM::SiStripBackPlaneCorrectionDQM(const edm::EventSetup &eSetup,
                                                              edm::RunNumber_t iRun,
-                                                             edm::ParameterSet const& hPSet,
-                                                             edm::ParameterSet const& fPSet):SiStripBaseCondObjDQM(eSetup, iRun, hPSet, fPSet){
-
+                                                             edm::ParameterSet const &hPSet,
+                                                             edm::ParameterSet const &fPSet)
+    : SiStripBaseCondObjDQM(eSetup, iRun, hPSet, fPSet) {
   // Build the Histo_TkMap:
-  if ( HistoMaps_On_ ) {
+  if (HistoMaps_On_) {
     edm::ESHandle<TkDetMap> tkDetMapHandle;
     eSetup.get<TrackerTopologyRcd>().get(tkDetMapHandle);
-    Tk_HM_ = std::make_unique<TkHistoMap>(tkDetMapHandle.product(), "SiStrip/Histo_Map","BP_TkMap",0.);
+    Tk_HM_ = std::make_unique<TkHistoMap>(tkDetMapHandle.product(), "SiStrip/Histo_Map", "BP_TkMap", 0.);
   }
 }
 // -----
 
-
-
 // -----
-SiStripBackPlaneCorrectionDQM::~SiStripBackPlaneCorrectionDQM(){}
+SiStripBackPlaneCorrectionDQM::~SiStripBackPlaneCorrectionDQM() {}
 // -----
 
-
 // -----
-void SiStripBackPlaneCorrectionDQM::getActiveDetIds(const edm::EventSetup & eSetup){
-  
+void SiStripBackPlaneCorrectionDQM::getActiveDetIds(const edm::EventSetup &eSetup) {
   getConditionObject(eSetup);
 
-  std::map<uint32_t,float>::const_iterator BPMapIter_;
-  std::map<uint32_t,float> BPMap_ = bpcorrectionHandle_->getBackPlaneCorrections();
-
-  for( BPMapIter_ = BPMap_.begin();
-       BPMapIter_!= BPMap_.end(); BPMapIter_++){
+  std::map<uint32_t, float>::const_iterator BPMapIter_;
+  std::map<uint32_t, float> BPMap_ = bpcorrectionHandle_->getBackPlaneCorrections();
 
+  for (BPMapIter_ = BPMap_.begin(); BPMapIter_ != BPMap_.end(); BPMapIter_++) {
     activeDetIds.push_back((*BPMapIter_).first);
   }
-
 }
 // -----
 
-
 // -----
-void SiStripBackPlaneCorrectionDQM::fillSummaryMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es){
-
-  //Retrieve tracker topology from geometry
+void SiStripBackPlaneCorrectionDQM::fillSummaryMEs(const std::vector<uint32_t> &selectedDetIds,
+                                                   const edm::EventSetup &es) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   es.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
   // -----
-  // BP on layer-level : fill at once all detIds belonging to same layer when encountering first detID in the layer 
+  // BP on layer-level : fill at once all detIds belonging to same layer when
+  // encountering first detID in the layer
 
-  bool fillNext = true; 
-  for(unsigned int i=0;i<selectedDetIds.size();i++){					    
-    int subDetId_ = ((selectedDetIds[i]>>25)&0x7);
-    if( subDetId_<3 ||subDetId_>6 ){ 
+  bool fillNext = true;
+  for (unsigned int i = 0; i < selectedDetIds.size(); i++) {
+    int subDetId_ = ((selectedDetIds[i] >> 25) & 0x7);
+    if (subDetId_ < 3 || subDetId_ > 6) {
       edm::LogError("SiStripBackPlaneCorrection")
-	<< "[SiStripBackPlaneCorrection::fillSummaryMEs] WRONG INPUT : no such subdetector type : "
-	<< subDetId_ << " and detId " << selectedDetIds[i] << " therefore no filling!" 
-	<< std::endl;
-    }    
-    else if (SummaryOnLayerLevel_On_) {    
-      if( fillNext) { fillMEsForLayer(/*SummaryMEsMap_,*/ selectedDetIds[i],tTopo);} 
-      if( getLayerNameAndId(selectedDetIds[i+1],tTopo)==getLayerNameAndId(selectedDetIds[i],tTopo)){ fillNext=false;}
-      else { fillNext=true;}
-    } 
-    else if (SummaryOnStringLevel_On_) {
-      if( fillNext) { fillMEsForLayer(/*SummaryMEsMap_,*/ selectedDetIds[i],tTopo);} 
-      if( getStringNameAndId(selectedDetIds[i+1],tTopo)==getStringNameAndId(selectedDetIds[i],tTopo)){ fillNext=false;}
-      else { fillNext=true;}
-    } 
+          << "[SiStripBackPlaneCorrection::fillSummaryMEs] WRONG INPUT : no "
+             "such subdetector type : "
+          << subDetId_ << " and detId " << selectedDetIds[i] << " therefore no filling!" << std::endl;
+    } else if (SummaryOnLayerLevel_On_) {
+      if (fillNext) {
+        fillMEsForLayer(/*SummaryMEsMap_,*/ selectedDetIds[i], tTopo);
+      }
+      if (getLayerNameAndId(selectedDetIds[i + 1], tTopo) == getLayerNameAndId(selectedDetIds[i], tTopo)) {
+        fillNext = false;
+      } else {
+        fillNext = true;
+      }
+    } else if (SummaryOnStringLevel_On_) {
+      if (fillNext) {
+        fillMEsForLayer(/*SummaryMEsMap_,*/ selectedDetIds[i], tTopo);
+      }
+      if (getStringNameAndId(selectedDetIds[i + 1], tTopo) == getStringNameAndId(selectedDetIds[i], tTopo)) {
+        fillNext = false;
+      } else {
+        fillNext = true;
+      }
+    }
   }
 
-  for (std::map<uint32_t, ModMEs>::iterator iter=SummaryMEsMap_.begin(); iter!=SummaryMEsMap_.end(); iter++){
-
+  for (std::map<uint32_t, ModMEs>::iterator iter = SummaryMEsMap_.begin(); iter != SummaryMEsMap_.end(); iter++) {
     ModMEs selME;
     selME = iter->second;
 
-    if(SummaryOnStringLevel_On_){
-
-      if (fPSet_.getParameter<bool>("OutputSummaryProfileAtLayerLevelAsImage")){
-
-	TCanvas c1("c1");
-	selME.SummaryOfProfileDistr->getTProfile()->Draw();
-	std::string name (selME.SummaryOfProfileDistr->getTProfile()->GetTitle());
-	name+=".png";
-	c1.Print(name.c_str());
+    if (SummaryOnStringLevel_On_) {
+      if (fPSet_.getParameter<bool>("OutputSummaryProfileAtLayerLevelAsImage")) {
+        TCanvas c1("c1");
+        selME.SummaryOfProfileDistr->getTProfile()->Draw();
+        std::string name(selME.SummaryOfProfileDistr->getTProfile()->GetTitle());
+        name += ".png";
+        c1.Print(name.c_str());
       }
 
-      if (fPSet_.getParameter<bool>("OutputCumulativeSummaryAtLayerLevelAsImage")){
-
-	TCanvas c2("c2");
-	selME.SummaryOfCumulDistr->getTH1()->Draw();
-	std::string name2 (selME.SummaryOfCumulDistr->getTH1()->GetTitle());
-	name2+=".png";
-	c2.Print(name2.c_str());
+      if (fPSet_.getParameter<bool>("OutputCumulativeSummaryAtLayerLevelAsImage")) {
+        TCanvas c2("c2");
+        selME.SummaryOfCumulDistr->getTH1()->Draw();
+        std::string name2(selME.SummaryOfCumulDistr->getTH1()->GetTitle());
+        name2 += ".png";
+        c2.Print(name2.c_str());
       }
 
-    }
-    else{
-      if(hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel") && fPSet_.getParameter<bool>("OutputSummaryProfileAtLayerLevelAsImage")){
-
-	TCanvas c1("c1");
-	selME.SummaryOfProfileDistr->getTProfile()->Draw();
-	std::string name (selME.SummaryOfProfileDistr->getTProfile()->GetTitle());
-	name+=".png";
-	c1.Print(name.c_str());
+    } else {
+      if (hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel") &&
+          fPSet_.getParameter<bool>("OutputSummaryProfileAtLayerLevelAsImage")) {
+        TCanvas c1("c1");
+        selME.SummaryOfProfileDistr->getTProfile()->Draw();
+        std::string name(selME.SummaryOfProfileDistr->getTProfile()->GetTitle());
+        name += ".png";
+        c1.Print(name.c_str());
       }
 
-      if(hPSet_.getParameter<bool>("FillCumulativeSummaryAtLayerLevel") && fPSet_.getParameter<bool>("OutputCumulativeSummaryAtLayerLevelAsImage")){
-
-	TCanvas c1("c1");
-	selME.SummaryOfCumulDistr->getTH1()->Draw();
-	std::string name (selME.SummaryOfCumulDistr->getTH1()->GetTitle());
-	name+=".png";
-	c1.Print(name.c_str());
+      if (hPSet_.getParameter<bool>("FillCumulativeSummaryAtLayerLevel") &&
+          fPSet_.getParameter<bool>("OutputCumulativeSummaryAtLayerLevelAsImage")) {
+        TCanvas c1("c1");
+        selME.SummaryOfCumulDistr->getTH1()->Draw();
+        std::string name(selME.SummaryOfCumulDistr->getTH1()->GetTitle());
+        name += ".png";
+        c1.Print(name.c_str());
       }
     }
-
   }
-
 }
 // -----
 
-
-
 // -----
-void SiStripBackPlaneCorrectionDQM::fillMEsForLayer( /*std::map<uint32_t, ModMEs> selMEsMap_,*/ uint32_t selDetId_, const TrackerTopology* tTopo){
-
+void SiStripBackPlaneCorrectionDQM::fillMEsForLayer(
+    /*std::map<uint32_t, ModMEs> selMEsMap_,*/ uint32_t selDetId_, const TrackerTopology *tTopo) {
   SiStripHistoId hidmanager;
 
-      
   std::string hSummaryOfProfile_description;
-  hSummaryOfProfile_description  = hPSet_.getParameter<std::string>("SummaryOfProfile_description");
+  hSummaryOfProfile_description = hPSet_.getParameter<std::string>("SummaryOfProfile_description");
+
+  std::string hSummary_name;
 
-  std::string hSummary_name; 
+  int subDetId_ = ((selDetId_ >> 25) & 0x7);
 
-  int subDetId_ = ((selDetId_>>25)&0x7);
-  
-  if( subDetId_<3 || subDetId_>6 ){ 
+  if (subDetId_ < 3 || subDetId_ > 6) {
     edm::LogError("SiStripBackPlaneCorrectionDQM")
-      << "[SiStripBackPlaneCorrectionDQM::fillMEsForLayer] WRONG INPUT : no such subdetector type : "
-      << subDetId_ << " no folder set!" 
-      << std::endl;
+        << "[SiStripBackPlaneCorrectionDQM::fillMEsForLayer] WRONG INPUT : no "
+           "such subdetector type : "
+        << subDetId_ << " no folder set!" << std::endl;
     return;
   }
 
-  uint32_t selSubDetId_ =  ((selDetId_>>25)&0x7);
-  
+  uint32_t selSubDetId_ = ((selDetId_ >> 25) & 0x7);
+
   std::vector<uint32_t> sameLayerDetIds_;
   sameLayerDetIds_.clear();
 
-  if (SummaryOnStringLevel_On_) {  //FILLING FOR STRING LEVEL
+  if (SummaryOnStringLevel_On_) {  // FILLING FOR STRING LEVEL
+
+    hSummary_name = hidmanager.createHistoLayer(
+        hSummaryOfProfile_description, "layer", getStringNameAndId(selDetId_, tTopo).first, "");
+    std::map<uint32_t, ModMEs>::iterator selMEsMapIter_ =
+        SummaryMEsMap_.find(getStringNameAndId(selDetId_, tTopo).second);
 
-    hSummary_name = hidmanager.createHistoLayer(hSummaryOfProfile_description, "layer", getStringNameAndId(selDetId_,tTopo).first, "") ;
-    std::map<uint32_t, ModMEs>::iterator selMEsMapIter_ = SummaryMEsMap_.find(getStringNameAndId(selDetId_,tTopo).second);
-    
     ModMEs selME_;
-    if ( selMEsMapIter_ != SummaryMEsMap_.end())
-      selME_ =selMEsMapIter_->second;
+    if (selMEsMapIter_ != SummaryMEsMap_.end())
+      selME_ = selMEsMapIter_->second;
+
+    getSummaryMEs(selME_, selDetId_, tTopo);
 
-    getSummaryMEs(selME_,selDetId_,tTopo);
-  
-    // -----   					   
+    // -----
     sameLayerDetIds_.clear();
-   
-    if(selSubDetId_==3){  //  TIB
-      if(tTopo->tibIsInternalString(selDetId_)){
-	SiStripSubStructure::getTIBDetectors(activeDetIds, sameLayerDetIds_, tTopo, tTopo->tibLayer(selDetId_),0,1,tTopo->tibString(selDetId_));
+
+    if (selSubDetId_ == 3) {  //  TIB
+      if (tTopo->tibIsInternalString(selDetId_)) {
+        SiStripSubStructure::getTIBDetectors(
+            activeDetIds, sameLayerDetIds_, tTopo, tTopo->tibLayer(selDetId_), 0, 1, tTopo->tibString(selDetId_));
       }
-      if(tTopo->tibIsExternalString(selDetId_)){
-	SiStripSubStructure::getTIBDetectors(activeDetIds, sameLayerDetIds_, tTopo, tTopo->tibLayer(selDetId_),0,2,tTopo->tibString(selDetId_));
-      } 
-    }
-    else if(selSubDetId_==4){  // TID
-      SiStripSubStructure::getTIDDetectors(activeDetIds, sameLayerDetIds_, tTopo, 0,0,0,0);
-    }
-    else if(selSubDetId_==5){  // TOB
-      SiStripSubStructure::getTOBDetectors(activeDetIds, sameLayerDetIds_, tTopo, tTopo->tobLayer(selDetId_),0,tTopo->tobRod(selDetId_));
-    }
-    else if(selSubDetId_==6){  // TEC
-      SiStripSubStructure::getTECDetectors(activeDetIds, sameLayerDetIds_, tTopo, 0,0,0,0,0,0);
+      if (tTopo->tibIsExternalString(selDetId_)) {
+        SiStripSubStructure::getTIBDetectors(
+            activeDetIds, sameLayerDetIds_, tTopo, tTopo->tibLayer(selDetId_), 0, 2, tTopo->tibString(selDetId_));
+      }
+    } else if (selSubDetId_ == 4) {  // TID
+      SiStripSubStructure::getTIDDetectors(activeDetIds, sameLayerDetIds_, tTopo, 0, 0, 0, 0);
+    } else if (selSubDetId_ == 5) {  // TOB
+      SiStripSubStructure::getTOBDetectors(
+          activeDetIds, sameLayerDetIds_, tTopo, tTopo->tobLayer(selDetId_), 0, tTopo->tobRod(selDetId_));
+    } else if (selSubDetId_ == 6) {  // TEC
+      SiStripSubStructure::getTECDetectors(activeDetIds, sameLayerDetIds_, tTopo, 0, 0, 0, 0, 0, 0);
     }
- 
+
     // -----
 
-    for(unsigned int i=0;i< sameLayerDetIds_.size(); i++){
-	selME_.SummaryOfProfileDistr->Fill(i+1,bpcorrectionHandle_->getBackPlaneCorrection(sameLayerDetIds_[i]));
+    for (unsigned int i = 0; i < sameLayerDetIds_.size(); i++) {
+      selME_.SummaryOfProfileDistr->Fill(i + 1, bpcorrectionHandle_->getBackPlaneCorrection(sameLayerDetIds_[i]));
 
-	// Fill the Histo_TkMap+TkMap with the BP:
-        if(HistoMaps_On_ ) Tk_HM_->fill(sameLayerDetIds_[i], bpcorrectionHandle_->getBackPlaneCorrection(sameLayerDetIds_[i]));
+      // Fill the Histo_TkMap+TkMap with the BP:
+      if (HistoMaps_On_)
+        Tk_HM_->fill(sameLayerDetIds_[i], bpcorrectionHandle_->getBackPlaneCorrection(sameLayerDetIds_[i]));
 
-	  std::cout<<sameLayerDetIds_[i]<<"\t"<<bpcorrectionHandle_->getBackPlaneCorrection(sameLayerDetIds_[i])<<std::endl;
+      std::cout << sameLayerDetIds_[i] << "\t" << bpcorrectionHandle_->getBackPlaneCorrection(sameLayerDetIds_[i])
+                << std::endl;
+
+      if (fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")) {
+        fillTkMap(sameLayerDetIds_[i], bpcorrectionHandle_->getBackPlaneCorrection(sameLayerDetIds_[i]));
+      }
+    }
 
-	if(fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")){
-	  fillTkMap(sameLayerDetIds_[i], bpcorrectionHandle_->getBackPlaneCorrection(sameLayerDetIds_[i]));
-	}
-	
-    } 
-    
     std::string hSummaryOfCumul_description;
-    hSummaryOfCumul_description  = hPSet_.getParameter<std::string>("SummaryOfCumul_description");
-    
-    std::string hSummaryOfCumul_name; 
-    
-    if( subDetId_<3 || subDetId_>6 ){ 
+    hSummaryOfCumul_description = hPSet_.getParameter<std::string>("SummaryOfCumul_description");
+
+    std::string hSummaryOfCumul_name;
+
+    if (subDetId_ < 3 || subDetId_ > 6) {
       edm::LogError("SiStripBackPlaneCorrectionDQM")
-	<< "[SiStripBackPlaneCorrectionDQM::fillMEsForLayer] WRONG INPUT : no such subdetector type : "
-	<< subDetId_ << " no folder set!" 
-	<< std::endl;
+          << "[SiStripBackPlaneCorrectionDQM::fillMEsForLayer] WRONG INPUT : "
+             "no such subdetector type : "
+          << subDetId_ << " no folder set!" << std::endl;
       return;
     }
-    
-    hSummaryOfCumul_name = hidmanager.createHistoLayer(hSummaryOfCumul_description, "layer", getStringNameAndId(selDetId_,tTopo).first, "") ;
-    
-    for(unsigned int i=0;i< sameLayerDetIds_.size(); i++){
-	selME_.SummaryOfCumulDistr->Fill(bpcorrectionHandle_->getBackPlaneCorrection(sameLayerDetIds_[i]));
-    } 
-  } //FILLING FOR STRING LEVEL
-  
-  
-  else { //FILLING FOR LAYER LEVEL
-
-    std::map<uint32_t, ModMEs>::iterator selMEsMapIter_ = SummaryMEsMap_.find(getLayerNameAndId(selDetId_,tTopo).second);
-    
+
+    hSummaryOfCumul_name = hidmanager.createHistoLayer(
+        hSummaryOfCumul_description, "layer", getStringNameAndId(selDetId_, tTopo).first, "");
+
+    for (unsigned int i = 0; i < sameLayerDetIds_.size(); i++) {
+      selME_.SummaryOfCumulDistr->Fill(bpcorrectionHandle_->getBackPlaneCorrection(sameLayerDetIds_[i]));
+    }
+  }  // FILLING FOR STRING LEVEL
+
+  else {  // FILLING FOR LAYER LEVEL
+
+    std::map<uint32_t, ModMEs>::iterator selMEsMapIter_ =
+        SummaryMEsMap_.find(getLayerNameAndId(selDetId_, tTopo).second);
+
     ModMEs selME_;
-    if ( selMEsMapIter_ != SummaryMEsMap_.end())
-      selME_ =selMEsMapIter_->second;
-    
-    getSummaryMEs(selME_,selDetId_,tTopo);
-    
-    if(hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel")){
-
-      hSummary_name = hidmanager.createHistoLayer(hSummaryOfProfile_description, "layer", getLayerNameAndId(selDetId_,tTopo).first, "") ;    
-    
-      // -----   					   
-      sameLayerDetIds_.clear();
+    if (selMEsMapIter_ != SummaryMEsMap_.end())
+      selME_ = selMEsMapIter_->second;
 
-      sameLayerDetIds_=GetSameLayerDetId(activeDetIds,selDetId_,tTopo);     
+    getSummaryMEs(selME_, selDetId_, tTopo);
 
-      for(unsigned int i=0;i< sameLayerDetIds_.size(); i++){
-	  selME_.SummaryOfProfileDistr->Fill(i+1,bpcorrectionHandle_->getBackPlaneCorrection(sameLayerDetIds_[i]));
+    if (hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel")) {
+      hSummary_name = hidmanager.createHistoLayer(
+          hSummaryOfProfile_description, "layer", getLayerNameAndId(selDetId_, tTopo).first, "");
 
-	  // Fill the Histo_TkMap with BP:
-	  if(HistoMaps_On_ ) Tk_HM_->fill(sameLayerDetIds_[i], bpcorrectionHandle_->getBackPlaneCorrection(sameLayerDetIds_[i]));
+      // -----
+      sameLayerDetIds_.clear();
 
-	if(fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")){
-	  fillTkMap(sameLayerDetIds_[i], bpcorrectionHandle_->getBackPlaneCorrection(sameLayerDetIds_[i]));
+      sameLayerDetIds_ = GetSameLayerDetId(activeDetIds, selDetId_, tTopo);
 
-	}
+      for (unsigned int i = 0; i < sameLayerDetIds_.size(); i++) {
+        selME_.SummaryOfProfileDistr->Fill(i + 1, bpcorrectionHandle_->getBackPlaneCorrection(sameLayerDetIds_[i]));
 
-      } 
-    }//if Fill ...
+        // Fill the Histo_TkMap with BP:
+        if (HistoMaps_On_)
+          Tk_HM_->fill(sameLayerDetIds_[i], bpcorrectionHandle_->getBackPlaneCorrection(sameLayerDetIds_[i]));
 
-    if(hPSet_.getParameter<bool>("FillCumulativeSummaryAtLayerLevel")){
+        if (fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")) {
+          fillTkMap(sameLayerDetIds_[i], bpcorrectionHandle_->getBackPlaneCorrection(sameLayerDetIds_[i]));
+        }
+      }
+    }  // if Fill ...
 
+    if (hPSet_.getParameter<bool>("FillCumulativeSummaryAtLayerLevel")) {
       std::string hSummaryOfCumul_description;
-      hSummaryOfCumul_description  = hPSet_.getParameter<std::string>("SummaryOfCumul_description");
-    
-      std::string hSummaryOfCumul_name; 
-    
-      if( subDetId_<3 || subDetId_>6 ){ 
-	edm::LogError("SiStripBackPlaneCorrectionDQM")
-	  << "[SiStripBackPlaneCorrectionDQM::fillMEsForLayer] WRONG INPUT : no such subdetector type : "
-	  << subDetId_ << " no folder set!" 
-	  << std::endl;
-	return;
+      hSummaryOfCumul_description = hPSet_.getParameter<std::string>("SummaryOfCumul_description");
+
+      std::string hSummaryOfCumul_name;
+
+      if (subDetId_ < 3 || subDetId_ > 6) {
+        edm::LogError("SiStripBackPlaneCorrectionDQM")
+            << "[SiStripBackPlaneCorrectionDQM::fillMEsForLayer] WRONG INPUT : "
+               "no such subdetector type : "
+            << subDetId_ << " no folder set!" << std::endl;
+        return;
       }
-    
-      hSummaryOfCumul_name = hidmanager.createHistoLayer(hSummaryOfCumul_description, "layer", getLayerNameAndId(selDetId_,tTopo).first, "") ;
-    
-      for(unsigned int i=0;i< sameLayerDetIds_.size(); i++){
-	  selME_.SummaryOfCumulDistr->Fill(bpcorrectionHandle_->getBackPlaneCorrection(sameLayerDetIds_[i]));
+
+      hSummaryOfCumul_name = hidmanager.createHistoLayer(
+          hSummaryOfCumul_description, "layer", getLayerNameAndId(selDetId_, tTopo).first, "");
+
+      for (unsigned int i = 0; i < sameLayerDetIds_.size(); i++) {
+        selME_.SummaryOfCumulDistr->Fill(bpcorrectionHandle_->getBackPlaneCorrection(sameLayerDetIds_[i]));
       }
-    }//if Fill ... 
-  } //FILLING FOR LAYER LEVEL
-  
-}  
+    }  // if Fill ...
+  }    // FILLING FOR LAYER LEVEL
+}
 // -----
- 
diff --git a/DQM/SiStripMonitorSummary/src/SiStripBaseCondObjDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripBaseCondObjDQM.cc
index 18d803f109857..b1b1e8851ed5f 100644
--- a/DQM/SiStripMonitorSummary/src/SiStripBaseCondObjDQM.cc
+++ b/DQM/SiStripMonitorSummary/src/SiStripBaseCondObjDQM.cc
@@ -1,1319 +1,1264 @@
 #include "DQM/SiStripMonitorSummary/interface/SiStripBaseCondObjDQM.h"
-#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h"
+#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 
 #include "TCanvas.h"
 
 // -----
 
-
-
-SiStripBaseCondObjDQM::SiStripBaseCondObjDQM(const edm::EventSetup & eSetup,
+SiStripBaseCondObjDQM::SiStripBaseCondObjDQM(const edm::EventSetup &eSetup,
                                              edm::RunNumber_t iRun,
-                                             edm::ParameterSet const& hPSet,
-                                             edm::ParameterSet const& fPSet ):
-  eSetup_(eSetup),
-  hPSet_(hPSet),
-  fPSet_(fPSet),
-  cacheID_memory(0),
-  dqmStore_(edm::Service<DQMStore>().operator->()),
-  runNumber_(iRun) {
-
-  reader = new SiStripDetInfoFileReader(edm::FileInPath(std::string("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat") ).fullPath());
-  
-  Mod_On_                  = fPSet_.getParameter<bool>("Mod_On");
-  HistoMaps_On_            = fPSet_.getParameter<bool>("HistoMaps_On");
-  SummaryOnLayerLevel_On_  = fPSet_.getParameter<bool>("SummaryOnLayerLevel_On");
+                                             edm::ParameterSet const &hPSet,
+                                             edm::ParameterSet const &fPSet)
+    : eSetup_(eSetup),
+      hPSet_(hPSet),
+      fPSet_(fPSet),
+      cacheID_memory(0),
+      dqmStore_(edm::Service<DQMStore>().operator->()),
+      runNumber_(iRun) {
+  reader = new SiStripDetInfoFileReader(
+      edm::FileInPath(std::string("CalibTracker/SiStripCommon/data/SiStripDetInfo.dat")).fullPath());
+
+  Mod_On_ = fPSet_.getParameter<bool>("Mod_On");
+  HistoMaps_On_ = fPSet_.getParameter<bool>("HistoMaps_On");
+  SummaryOnLayerLevel_On_ = fPSet_.getParameter<bool>("SummaryOnLayerLevel_On");
   SummaryOnStringLevel_On_ = fPSet_.getParameter<bool>("SummaryOnStringLevel_On");
 
-  GrandSummary_On_         = fPSet_.getParameter<bool>("GrandSummary_On");
+  GrandSummary_On_ = fPSet_.getParameter<bool>("GrandSummary_On");
 
-  CondObj_fillId_    = hPSet_.getParameter<std::string>("CondObj_fillId");
-  CondObj_name_      = hPSet_.getParameter<std::string>("CondObj_name");
- 
+  CondObj_fillId_ = hPSet_.getParameter<std::string>("CondObj_fillId");
+  CondObj_name_ = hPSet_.getParameter<std::string>("CondObj_name");
 
-  //Warning message from wrong input:
-  if(SummaryOnLayerLevel_On_ && SummaryOnStringLevel_On_){
-    edm::LogWarning("SiStripBaseCondObjDQM") 
-       << "[SiStripBaseCondObjDQM::SiStripBaseCondObjDQMs] PLEASE CHECK : String and layer level options can not be activated together"
-       << std::endl; 
+  // Warning message from wrong input:
+  if (SummaryOnLayerLevel_On_ && SummaryOnStringLevel_On_) {
+    edm::LogWarning("SiStripBaseCondObjDQM") << "[SiStripBaseCondObjDQM::SiStripBaseCondObjDQMs] PLEASE CHECK : "
+                                                "String and layer level options can not be activated together"
+                                             << std::endl;
   }
 
-  //The OR of the two conditions allow to switch on this feature for all the components (if the FillConditions_PSet has the TkMap_On =true) or for single MEs (if the PSet for a ME has the TkMap_On =true)
-  if(fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")) bookTkMap(hPSet_.getParameter<std::string>("TkMapName"));
-
-
-  minValue=hPSet_.getParameter<double>("minValue");
-  maxValue=hPSet_.getParameter<double>("maxValue");
+  // The OR of the two conditions allow to switch on this feature for all the
+  // components (if the FillConditions_PSet has the TkMap_On =true) or for
+  // single MEs (if the PSet for a ME has the TkMap_On =true)
+  if (fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On"))
+    bookTkMap(hPSet_.getParameter<std::string>("TkMapName"));
 
+  minValue = hPSet_.getParameter<double>("minValue");
+  maxValue = hPSet_.getParameter<double>("maxValue");
 }
 // -----
 
-
 //======================================
 // -----
-void SiStripBaseCondObjDQM::analysis(const edm::EventSetup & eSetup_){
+void SiStripBaseCondObjDQM::analysis(const edm::EventSetup &eSetup_) {
+  cacheID_current = getCache(eSetup_);
+
+  if (cacheID_memory == cacheID_current)
+    return;
 
-  cacheID_current=  getCache(eSetup_);
-  
-  if (cacheID_memory == cacheID_current) return;
-  
   getConditionObject(eSetup_);
 
-  //The OR of the two conditions allows to switch on this feature for all the components (if the FillConditions_PSet has the ActiveDetIds_On =true) or for single MEs (if the PSet for a ME has the ActiveDetIds_On =true)
-  if(fPSet_.getParameter<bool>("ActiveDetIds_On") || hPSet_.getParameter<bool>("ActiveDetIds_On"))
+  // The OR of the two conditions allows to switch on this feature for all the
+  // components (if the FillConditions_PSet has the ActiveDetIds_On =true) or
+  // for single MEs (if the PSet for a ME has the ActiveDetIds_On =true)
+  if (fPSet_.getParameter<bool>("ActiveDetIds_On") || hPSet_.getParameter<bool>("ActiveDetIds_On"))
     getActiveDetIds(eSetup_);
   else
-    activeDetIds=reader->getAllDetIds();
+    activeDetIds = reader->getAllDetIds();
 
   edm::ESHandle<TrackerTopology> tTopoHandle;
   eSetup_.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* tTopo = tTopoHandle.product();
+  const TrackerTopology *tTopo = tTopoHandle.product();
 
   selectModules(activeDetIds, tTopo);
 
-  if(Mod_On_ )                                            { fillModMEs    (activeDetIds, eSetup_); }
-  if(SummaryOnLayerLevel_On_ || SummaryOnStringLevel_On_ ){ fillSummaryMEs(activeDetIds, eSetup_); }
+  if (Mod_On_) {
+    fillModMEs(activeDetIds, eSetup_);
+  }
+  if (SummaryOnLayerLevel_On_ || SummaryOnStringLevel_On_) {
+    fillSummaryMEs(activeDetIds, eSetup_);
+  }
 
-  if(fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")) {
+  if (fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")) {
     std::string filename = hPSet_.getParameter<std::string>("TkMapName");
-    if (filename!=""){
+    if (!filename.empty()) {
       constexpr unsigned int kSLen = 128;
       char sRun[kSLen];
-      snprintf(sRun,kSLen, "_Run_%d",runNumber_);
-      filename.insert(filename.find("."),sRun);
-      
+      snprintf(sRun, kSLen, "_Run_%d", runNumber_);
+      filename.insert(filename.find("."), sRun);
+
       saveTkMap(filename, minValue, maxValue);
     }
   }
 }
 // -----
 
-
 //=====================================
 // -----
-void SiStripBaseCondObjDQM::analysisOnDemand(const edm::EventSetup & eSetup_, 
-                                            std::string requestedSubDetector, 
-                                            uint32_t requestedSide, 
-					    uint32_t requestedLayer){
-  
+void SiStripBaseCondObjDQM::analysisOnDemand(const edm::EventSetup &eSetup_,
+                                             std::string requestedSubDetector,
+                                             uint32_t requestedSide,
+                                             uint32_t requestedLayer) {
   getConditionObject(eSetup_);
   getActiveDetIds(eSetup_);
-   
+
   std::vector<uint32_t> requestedDetIds_;
   requestedDetIds_.clear();
 
   edm::ESHandle<TrackerTopology> tTopoHandle;
   eSetup_.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* tTopo = tTopoHandle.product();
-
-  if(requestedSubDetector=="TIB"){ 
-      SiStripSubStructure::getTIBDetectors( activeDetIds, requestedDetIds_, tTopo, requestedLayer,0,0,0);
+  const TrackerTopology *tTopo = tTopoHandle.product();
+
+  if (requestedSubDetector == "TIB") {
+    SiStripSubStructure::getTIBDetectors(activeDetIds, requestedDetIds_, tTopo, requestedLayer, 0, 0, 0);
+  } else if (requestedSubDetector == "TID") {
+    SiStripSubStructure::getTIDDetectors(activeDetIds, requestedDetIds_, tTopo, requestedSide, requestedLayer, 0, 0);
+  } else if (requestedSubDetector == "TOB") {
+    SiStripSubStructure::getTOBDetectors(activeDetIds, requestedDetIds_, tTopo, requestedLayer, 0, 0);
+  } else if (requestedSubDetector == "TEC") {
+    SiStripSubStructure::getTECDetectors(
+        activeDetIds, requestedDetIds_, tTopo, requestedSide, requestedLayer, 0, 0, 0, 0);
   }
-  else if(requestedSubDetector=="TID"){ 
-      SiStripSubStructure::getTIDDetectors( activeDetIds, requestedDetIds_, tTopo, requestedSide,requestedLayer,0,0);
-  }
-  else if(requestedSubDetector=="TOB"){  
-      SiStripSubStructure::getTOBDetectors( activeDetIds, requestedDetIds_, tTopo, requestedLayer,0,0);
-  }
-  else if(requestedSubDetector=="TEC"){  
-      SiStripSubStructure::getTECDetectors( activeDetIds, requestedDetIds_, tTopo, requestedSide,requestedLayer,0,0,0,0);
-  } 
 
-  analysisOnDemand(eSetup_,requestedDetIds_);
- 
+  analysisOnDemand(eSetup_, requestedDetIds_);
 }
 // -----
 
 //===========================================
 // -----
-void SiStripBaseCondObjDQM::analysisOnDemand(const edm::EventSetup & eSetup_, uint32_t  detIdOnDemand){
- 
-  unsigned long long cacheID_current=  getCache(eSetup_);
-  
-  if (cacheID_memory == cacheID_current) return;
-  
+void SiStripBaseCondObjDQM::analysisOnDemand(const edm::EventSetup &eSetup_, uint32_t detIdOnDemand) {
+  unsigned long long cacheID_current = getCache(eSetup_);
+
+  if (cacheID_memory == cacheID_current)
+    return;
+
   getConditionObject(eSetup_);
-  
+
   std::vector<uint32_t> vdetIdsOnDemand_;
-  vdetIdsOnDemand_.push_back(detIdOnDemand); // fillModMEs needs a vector 
+  vdetIdsOnDemand_.push_back(detIdOnDemand);  // fillModMEs needs a vector
 
-  fillModMEs(vdetIdsOnDemand_, eSetup_); 
-  
+  fillModMEs(vdetIdsOnDemand_, eSetup_);
 }
 // -----
 //===============================================
 // -----
-void SiStripBaseCondObjDQM::analysisOnDemand(const edm::EventSetup & eSetup_, const std::vector<uint32_t>&  detIdsOnDemand){
- 
-  unsigned long long cacheID_current=  getCache(eSetup_);
-  
-  if (cacheID_memory == cacheID_current) return;
-  
+void SiStripBaseCondObjDQM::analysisOnDemand(const edm::EventSetup &eSetup_,
+                                             const std::vector<uint32_t> &detIdsOnDemand) {
+  unsigned long long cacheID_current = getCache(eSetup_);
+
+  if (cacheID_memory == cacheID_current)
+    return;
+
   getConditionObject(eSetup_);
-  
 
-  fillSummaryMEs(detIdsOnDemand, eSetup_); 
-  
+  fillSummaryMEs(detIdsOnDemand, eSetup_);
 }
 // -----
 //====================================
 // -----
-std::vector<uint32_t> SiStripBaseCondObjDQM::getCabledModules() {     
- 
-  std::vector<uint32_t> cabledDetIds_;  
+std::vector<uint32_t> SiStripBaseCondObjDQM::getCabledModules() {
+  std::vector<uint32_t> cabledDetIds_;
   eSetup_.get<SiStripDetCablingRcd>().get(detCablingHandle_);
   detCablingHandle_->addActiveDetectorsRawIds(cabledDetIds_);
 
-  return cabledDetIds_;  
-
+  return cabledDetIds_;
 }
 // -----
 
-
 //=========================================================
 // -----
 
 //#FIXME : very long method. please factorize it
- 
-void SiStripBaseCondObjDQM::selectModules(std::vector<uint32_t> & detIds_, const TrackerTopology* tTopo){
-  
-  edm::LogInfo("SiStripBaseCondObjDQM") << "[SiStripBaseCondObjDQM::selectModules] input detIds_: " << detIds_.size() << std::endl;
-  
-  if( fPSet_.getParameter<bool>("restrictModules")){
 
+void SiStripBaseCondObjDQM::selectModules(std::vector<uint32_t> &detIds_, const TrackerTopology *tTopo) {
+  edm::LogInfo("SiStripBaseCondObjDQM") << "[SiStripBaseCondObjDQM::selectModules] input detIds_: " << detIds_.size()
+                                        << std::endl;
+
+  if (fPSet_.getParameter<bool>("restrictModules")) {
     std::vector<DetIdSelector> included_subdetsels;
-    std::vector<std::string> included_subdets = fPSet_.getParameter<std::vector<std::string> >("ModulesToBeIncluded_DetIdSelector");
-    for(std::vector<std::string>::const_iterator wsdps = included_subdets.begin();wsdps!=included_subdets.end();++wsdps) {
+    std::vector<std::string> included_subdets =
+        fPSet_.getParameter<std::vector<std::string>>("ModulesToBeIncluded_DetIdSelector");
+    for (std::vector<std::string>::const_iterator wsdps = included_subdets.begin(); wsdps != included_subdets.end();
+         ++wsdps) {
       included_subdetsels.push_back(DetIdSelector(*wsdps));
     }
-    
+
     std::vector<uint32_t> modulesToBeIncluded;
-    for(std::vector<uint32_t>::const_iterator detid=detIds_.begin();detid!=detIds_.end();++detid) {
-      for(std::vector<DetIdSelector>::const_iterator detidsel=included_subdetsels.begin();detidsel!=included_subdetsels.end();++detidsel) {
-	if(detidsel->isSelected(*detid)) {
-	  modulesToBeIncluded.push_back(*detid);
-	  break;
-	  //	  std::cout << "detId: " << *detid << " is selected" << std::endl;
-	}
+    for (std::vector<uint32_t>::const_iterator detid = detIds_.begin(); detid != detIds_.end(); ++detid) {
+      for (std::vector<DetIdSelector>::const_iterator detidsel = included_subdetsels.begin();
+           detidsel != included_subdetsels.end();
+           ++detidsel) {
+        if (detidsel->isSelected(*detid)) {
+          modulesToBeIncluded.push_back(*detid);
+          break;
+          //	  std::cout << "detId: " << *detid << " is selected" <<
+          // std::endl;
+        }
       }
     }
-    
+
     // -----
     // *** exclude modules ***
     std::vector<DetIdSelector> excluded_subdetsels;
-    std::vector<std::string> excluded_subdets = fPSet_.getParameter<std::vector<std::string> >("ModulesToBeExcluded_DetIdSelector");
-    for(std::vector<std::string>::const_iterator wsdps = excluded_subdets.begin();wsdps!=excluded_subdets.end();++wsdps) {
+    std::vector<std::string> excluded_subdets =
+        fPSet_.getParameter<std::vector<std::string>>("ModulesToBeExcluded_DetIdSelector");
+    for (std::vector<std::string>::const_iterator wsdps = excluded_subdets.begin(); wsdps != excluded_subdets.end();
+         ++wsdps) {
       excluded_subdetsels.push_back(DetIdSelector(*wsdps));
     }
-    
+
     std::vector<uint32_t> modulesToBeExcluded;
-    for(std::vector<uint32_t>::const_iterator detid=detIds_.begin();detid!=detIds_.end();++detid) {
-      for(std::vector<DetIdSelector>::const_iterator detidsel=excluded_subdetsels.begin();detidsel!=excluded_subdetsels.end();++detidsel) {
-	if(detidsel->isSelected(*detid)) {
-	  modulesToBeExcluded.push_back(*detid);
-	  break;
-	}
+    for (std::vector<uint32_t>::const_iterator detid = detIds_.begin(); detid != detIds_.end(); ++detid) {
+      for (std::vector<DetIdSelector>::const_iterator detidsel = excluded_subdetsels.begin();
+           detidsel != excluded_subdetsels.end();
+           ++detidsel) {
+        if (detidsel->isSelected(*detid)) {
+          modulesToBeExcluded.push_back(*detid);
+          break;
+        }
       }
     }
-    
-    ModulesToBeExcluded_     = fPSet_.getParameter< std::vector<unsigned int> >("ModulesToBeExcluded");
-    ModulesToBeIncluded_     = fPSet_.getParameter< std::vector<unsigned int> >("ModulesToBeIncluded");
-    SubDetectorsToBeExcluded_= fPSet_.getParameter< std::vector<std::string> >("SubDetectorsToBeExcluded");  
-    
+
+    ModulesToBeExcluded_ = fPSet_.getParameter<std::vector<unsigned int>>("ModulesToBeExcluded");
+    ModulesToBeIncluded_ = fPSet_.getParameter<std::vector<unsigned int>>("ModulesToBeIncluded");
+    SubDetectorsToBeExcluded_ = fPSet_.getParameter<std::vector<std::string>>("SubDetectorsToBeExcluded");
+
     // vectors to be sorted otherwise the intersection is non computed properly
-    
-    std::sort(ModulesToBeExcluded_.begin(),ModulesToBeExcluded_.end());
-    std::sort(ModulesToBeIncluded_.begin(),ModulesToBeIncluded_.end());
-    
-    if (modulesToBeExcluded.empty()  && modulesToBeIncluded.empty() &&
-	ModulesToBeExcluded_.empty() && ModulesToBeIncluded_.empty() )
-      edm::LogWarning("SiStripBaseCondObjDQM") 
-	<< "[SiStripBaseCondObjDQM::selectModules] PLEASE CHECK : no modules to be exclude/included in your cfg"
-	<< std::endl; 
-    
-    
-    modulesToBeIncluded.insert(modulesToBeIncluded.end(),ModulesToBeIncluded_.begin(),ModulesToBeIncluded_.end());
-    edm::LogInfo("SiStripBaseCondObjDQM") << "[SiStripBaseCondObjDQM::selectModules] modulesToBeIncluded: " << modulesToBeIncluded.size() << std::endl;
-    modulesToBeExcluded.insert(modulesToBeExcluded.end(),ModulesToBeExcluded_.begin(),ModulesToBeExcluded_.end());
-    edm::LogInfo("SiStripBaseCondObjDQM") << "[SiStripBaseCondObjDQM::selectModules] modulesToBeExcluded: " << modulesToBeExcluded.size() << std::endl;
-    
+
+    std::sort(ModulesToBeExcluded_.begin(), ModulesToBeExcluded_.end());
+    std::sort(ModulesToBeIncluded_.begin(), ModulesToBeIncluded_.end());
+
+    if (modulesToBeExcluded.empty() && modulesToBeIncluded.empty() && ModulesToBeExcluded_.empty() &&
+        ModulesToBeIncluded_.empty())
+      edm::LogWarning("SiStripBaseCondObjDQM") << "[SiStripBaseCondObjDQM::selectModules] PLEASE CHECK : no modules "
+                                                  "to be exclude/included in your cfg"
+                                               << std::endl;
+
+    modulesToBeIncluded.insert(modulesToBeIncluded.end(), ModulesToBeIncluded_.begin(), ModulesToBeIncluded_.end());
+    edm::LogInfo("SiStripBaseCondObjDQM")
+        << "[SiStripBaseCondObjDQM::selectModules] modulesToBeIncluded: " << modulesToBeIncluded.size() << std::endl;
+    modulesToBeExcluded.insert(modulesToBeExcluded.end(), ModulesToBeExcluded_.begin(), ModulesToBeExcluded_.end());
+    edm::LogInfo("SiStripBaseCondObjDQM")
+        << "[SiStripBaseCondObjDQM::selectModules] modulesToBeExcluded: " << modulesToBeExcluded.size() << std::endl;
+
     // apply modules selection
-    if( !modulesToBeIncluded.empty() ){
+    if (!modulesToBeIncluded.empty()) {
       std::vector<uint32_t> tmp;
-      // The intersection of two sets is formed only by the elements that are present in both sets
-      set_intersection( detIds_.begin(), detIds_.end(),  
-			modulesToBeIncluded.begin(), modulesToBeIncluded.end(),
-			inserter(tmp,tmp.begin()));
-      swap(detIds_,tmp);
+      // The intersection of two sets is formed only by the elements that are
+      // present in both sets
+      set_intersection(detIds_.begin(),
+                       detIds_.end(),
+                       modulesToBeIncluded.begin(),
+                       modulesToBeIncluded.end(),
+                       inserter(tmp, tmp.begin()));
+      swap(detIds_, tmp);
     }
-    
-    std::sort(detIds_.begin(),detIds_.end());
-    if(!modulesToBeExcluded.empty()) {
-      for( std::vector<uint32_t>::const_iterator mod = modulesToBeExcluded.begin(); 
-	   mod != modulesToBeExcluded.end(); mod++){
-	
-	std::vector<uint32_t>::iterator detid=std::lower_bound(detIds_.begin(),detIds_.end(),*mod);
-	if (detid!=detIds_.end())
-	  detIds_.erase(detid);
-	detid--;
+
+    std::sort(detIds_.begin(), detIds_.end());
+    if (!modulesToBeExcluded.empty()) {
+      for (std::vector<uint32_t>::const_iterator mod = modulesToBeExcluded.begin(); mod != modulesToBeExcluded.end();
+           mod++) {
+        std::vector<uint32_t>::iterator detid = std::lower_bound(detIds_.begin(), detIds_.end(), *mod);
+        if (detid != detIds_.end())
+          detIds_.erase(detid);
+        detid--;
       }
     }
-    
+
     // -----
     // *** restrict to a particular subdetector ***
-    
-    if( *(SubDetectorsToBeExcluded_.begin()) !="none" ){
-      
+
+    if (*(SubDetectorsToBeExcluded_.begin()) != "none") {
       std::vector<uint32_t> tmp;
-      
-      for( std::vector<std::string>::const_iterator modIter_  = SubDetectorsToBeExcluded_.begin(); 
-	   modIter_ != SubDetectorsToBeExcluded_.end(); modIter_++){
-	tmp.clear();
-	
-	if (*modIter_=="TIB")     { SiStripSubStructure::getTIBDetectors(detIds_, tmp, tTopo, 0,0,0,0);}
-	else if (*modIter_=="TOB") { SiStripSubStructure::getTOBDetectors(detIds_, tmp, tTopo, 0,0,0);}
-	else if (*modIter_=="TID") { SiStripSubStructure::getTIDDetectors(detIds_, tmp, tTopo, 0,0,0,0);}
-	else if (*modIter_=="TEC") { SiStripSubStructure::getTECDetectors(detIds_, tmp, tTopo, 0,0,0,0,0,0);}
-	else {
-	  edm::LogWarning("SiStripBaseCondObjDQM") 
-	    << "[SiStripBaseCondObjDQM::selectModules] PLEASE CHECK : no correct (name) subdetector to be excluded in your cfg"
-	    << std::endl; 
-	}
-	
-	std::vector<uint32_t>::iterator iterBegin_=std::lower_bound(detIds_.begin(),
-								    detIds_.end(),
-								    *min_element(tmp.begin(), tmp.end()));
-	
-	std::vector<uint32_t>::iterator iterEnd_=std::lower_bound(detIds_.begin(),
-								  detIds_.end(),
-								  *max_element(tmp.begin(), tmp.end()));
-	
-	for(std::vector<uint32_t>::iterator detIter_ = iterEnd_;
-	    detIter_!= iterBegin_-1;detIter_--){
-	  detIds_.erase(detIter_);
-	} 
-	
-      } // loop SubDetectorsToBeExcluded_
+
+      for (std::vector<std::string>::const_iterator modIter_ = SubDetectorsToBeExcluded_.begin();
+           modIter_ != SubDetectorsToBeExcluded_.end();
+           modIter_++) {
+        tmp.clear();
+
+        if (*modIter_ == "TIB") {
+          SiStripSubStructure::getTIBDetectors(detIds_, tmp, tTopo, 0, 0, 0, 0);
+        } else if (*modIter_ == "TOB") {
+          SiStripSubStructure::getTOBDetectors(detIds_, tmp, tTopo, 0, 0, 0);
+        } else if (*modIter_ == "TID") {
+          SiStripSubStructure::getTIDDetectors(detIds_, tmp, tTopo, 0, 0, 0, 0);
+        } else if (*modIter_ == "TEC") {
+          SiStripSubStructure::getTECDetectors(detIds_, tmp, tTopo, 0, 0, 0, 0, 0, 0);
+        } else {
+          edm::LogWarning("SiStripBaseCondObjDQM") << "[SiStripBaseCondObjDQM::selectModules] PLEASE CHECK : no "
+                                                      "correct (name) subdetector to be excluded in your cfg"
+                                                   << std::endl;
+        }
+
+        std::vector<uint32_t>::iterator iterBegin_ =
+            std::lower_bound(detIds_.begin(), detIds_.end(), *min_element(tmp.begin(), tmp.end()));
+
+        std::vector<uint32_t>::iterator iterEnd_ =
+            std::lower_bound(detIds_.begin(), detIds_.end(), *max_element(tmp.begin(), tmp.end()));
+
+        for (std::vector<uint32_t>::iterator detIter_ = iterEnd_; detIter_ != iterBegin_ - 1; detIter_--) {
+          detIds_.erase(detIter_);
+        }
+
+      }  // loop SubDetectorsToBeExcluded_
     }
-    
   }
-  edm::LogInfo("SiStripBaseCondObjDQM") << "[SiStripBaseCondObjDQM::selectModules] output detIds_: " << detIds_.size() << std::endl;
-  
+  edm::LogInfo("SiStripBaseCondObjDQM") << "[SiStripBaseCondObjDQM::selectModules] output detIds_: " << detIds_.size()
+                                        << std::endl;
+
   // -----
   // *** fill only one Module per layer ***
-  
-  if(fPSet_.getParameter<std::string>("ModulesToBeFilled") == "onlyOneModulePerLayer"){
-    
+
+  if (fPSet_.getParameter<std::string>("ModulesToBeFilled") == "onlyOneModulePerLayer") {
     std::vector<uint32_t> tmp;
     std::vector<uint32_t> layerDetIds;
-    
-    for(unsigned int i=1; i<5 ; i++){
+
+    for (unsigned int i = 1; i < 5; i++) {
       tmp.clear();
-      SiStripSubStructure::getTIBDetectors(detIds_, tmp, tTopo, i,0,0,0);
-      if(!tmp.empty()) { layerDetIds.push_back(*(tmp.begin()));}
+      SiStripSubStructure::getTIBDetectors(detIds_, tmp, tTopo, i, 0, 0, 0);
+      if (!tmp.empty()) {
+        layerDetIds.push_back(*(tmp.begin()));
+      }
     }
-    for(unsigned int i=1; i<7 ; i++){
+    for (unsigned int i = 1; i < 7; i++) {
       tmp.clear();
-      SiStripSubStructure::getTOBDetectors(detIds_, tmp, tTopo, i,0,0);
-      if(!tmp.empty()) { layerDetIds.push_back(*(tmp.begin()));}
+      SiStripSubStructure::getTOBDetectors(detIds_, tmp, tTopo, i, 0, 0);
+      if (!tmp.empty()) {
+        layerDetIds.push_back(*(tmp.begin()));
+      }
     }
-    for(unsigned int i=1; i<4 ; i++){
+    for (unsigned int i = 1; i < 4; i++) {
       tmp.clear();
-      SiStripSubStructure::getTIDDetectors(detIds_, tmp, tTopo, 1,i,0,0);
-      if(!tmp.empty()) { layerDetIds.push_back(*(tmp.begin()));}
-      SiStripSubStructure::getTIDDetectors(detIds_, tmp, tTopo, 2,i,0,0);
-      if(!tmp.empty()) { layerDetIds.push_back(*(tmp.begin()));}
-    }  
-    for(unsigned int i=1; i<10 ; i++){
+      SiStripSubStructure::getTIDDetectors(detIds_, tmp, tTopo, 1, i, 0, 0);
+      if (!tmp.empty()) {
+        layerDetIds.push_back(*(tmp.begin()));
+      }
+      SiStripSubStructure::getTIDDetectors(detIds_, tmp, tTopo, 2, i, 0, 0);
+      if (!tmp.empty()) {
+        layerDetIds.push_back(*(tmp.begin()));
+      }
+    }
+    for (unsigned int i = 1; i < 10; i++) {
       tmp.clear();
-      SiStripSubStructure::getTECDetectors(detIds_, tmp, tTopo, 1,i,0,0,0,0);
-      if(!tmp.empty()) { layerDetIds.push_back(*(tmp.begin()));}
-      SiStripSubStructure::getTECDetectors(detIds_, tmp, tTopo, 2,i,0,0,0,0);
-      if(!tmp.empty()) { layerDetIds.push_back(*(tmp.begin()));}
+      SiStripSubStructure::getTECDetectors(detIds_, tmp, tTopo, 1, i, 0, 0, 0, 0);
+      if (!tmp.empty()) {
+        layerDetIds.push_back(*(tmp.begin()));
+      }
+      SiStripSubStructure::getTECDetectors(detIds_, tmp, tTopo, 2, i, 0, 0, 0, 0);
+      if (!tmp.empty()) {
+        layerDetIds.push_back(*(tmp.begin()));
+      }
     }
-    
+
     detIds_.clear();
-    detIds_=layerDetIds;
-    
+    detIds_ = layerDetIds;
   }
   // -----
-  
-  
-} //selectModules
-// -----
 
+}  // selectModules
+// -----
 
 //=================================================
 // -----
-void SiStripBaseCondObjDQM::getModMEs(ModMEs& CondObj_ME, const uint32_t& detId_, const TrackerTopology* tTopo){
-  
-  std::map< uint32_t, ModMEs >::const_iterator ModMEsMap_iter = ModMEsMap_.find(detId_);
-
-  if (ModMEsMap_iter != ModMEsMap_.end()){ 
-  
-    CondObj_ME=ModMEsMap_iter->second;
-  
-    if( ( CondObj_fillId_ =="ProfileAndCumul" || CondObj_fillId_ =="onlyProfile") && CondObj_ME.ProfileDistr ) { 
-      CondObj_ME.ProfileDistr ->Reset();    
-    }
-       
-    if( (CondObj_fillId_ =="ProfileAndCumul" || CondObj_fillId_ =="onlyCumul" ) &&  CondObj_ME.CumulDistr ){
-      CondObj_ME.CumulDistr ->Reset();
-    }
-    else {
-      edm::LogWarning("SiStripBaseCondObjDQM") 
-	<< "[SiStripBaseCondObjDQM::getModMEs] PLEASE CHECK : CondObj_fillId option mispelled";
+void SiStripBaseCondObjDQM::getModMEs(ModMEs &CondObj_ME, const uint32_t &detId_, const TrackerTopology *tTopo) {
+  std::map<uint32_t, ModMEs>::const_iterator ModMEsMap_iter = ModMEsMap_.find(detId_);
+
+  if (ModMEsMap_iter != ModMEsMap_.end()) {
+    CondObj_ME = ModMEsMap_iter->second;
+
+    if ((CondObj_fillId_ == "ProfileAndCumul" || CondObj_fillId_ == "onlyProfile") && CondObj_ME.ProfileDistr) {
+      CondObj_ME.ProfileDistr->Reset();
     }
-    return; 
 
+    if ((CondObj_fillId_ == "ProfileAndCumul" || CondObj_fillId_ == "onlyCumul") && CondObj_ME.CumulDistr) {
+      CondObj_ME.CumulDistr->Reset();
+    } else {
+      edm::LogWarning("SiStripBaseCondObjDQM") << "[SiStripBaseCondObjDQM::getModMEs] PLEASE CHECK : CondObj_fillId "
+                                                  "option mispelled";
+    }
+    return;
   }
-  
+
   // --> profile defined for all CondData
-  if ( (CondObj_fillId_ =="ProfileAndCumul" || CondObj_fillId_ =="onlyProfile")) {
-    bookProfileMEs(CondObj_ME,detId_,tTopo);
-  }  
-  
+  if ((CondObj_fillId_ == "ProfileAndCumul" || CondObj_fillId_ == "onlyProfile")) {
+    bookProfileMEs(CondObj_ME, detId_, tTopo);
+  }
+
   // --> cumul currently only defined for noise and apvgain
-  if( (CondObj_fillId_ =="ProfileAndCumul" || CondObj_fillId_ =="onlyCumul" )
-      &&(CondObj_name_ == "noise" || CondObj_name_ == "apvgain")          ) bookCumulMEs(CondObj_ME,detId_,tTopo);
-  
- 
-  ModMEsMap_.insert( std::make_pair(detId_,CondObj_ME) );
-  
+  if ((CondObj_fillId_ == "ProfileAndCumul" || CondObj_fillId_ == "onlyCumul") &&
+      (CondObj_name_ == "noise" || CondObj_name_ == "apvgain"))
+    bookCumulMEs(CondObj_ME, detId_, tTopo);
+
+  ModMEsMap_.insert(std::make_pair(detId_, CondObj_ME));
 }
-// ---- 
+// ----
 
 //===============================================
 // -----
 //%FIXME: very long method, factorize
-void SiStripBaseCondObjDQM::getSummaryMEs(ModMEs& CondObj_ME, const uint32_t& detId_, const TrackerTopology* tTopo){
-
+void SiStripBaseCondObjDQM::getSummaryMEs(ModMEs &CondObj_ME, const uint32_t &detId_, const TrackerTopology *tTopo) {
   std::map<uint32_t, ModMEs>::const_iterator SummaryMEsMap_iter;
 
-  if(CondObj_name_ == "lorentzangle" && SummaryOnStringLevel_On_ ){
-    SummaryMEsMap_iter = SummaryMEsMap_.find(getStringNameAndId(detId_,tTopo).second);
+  if (CondObj_name_ == "lorentzangle" && SummaryOnStringLevel_On_) {
+    SummaryMEsMap_iter = SummaryMEsMap_.find(getStringNameAndId(detId_, tTopo).second);
+  } else if (CondObj_name_ == "bpcorrection" && SummaryOnStringLevel_On_) {
+    SummaryMEsMap_iter = SummaryMEsMap_.find(getStringNameAndId(detId_, tTopo).second);
+  } else {
+    SummaryMEsMap_iter = SummaryMEsMap_.find(getLayerNameAndId(detId_, tTopo).second);
   }
-  else if(CondObj_name_ == "bpcorrection" && SummaryOnStringLevel_On_ ){
-    SummaryMEsMap_iter = SummaryMEsMap_.find(getStringNameAndId(detId_,tTopo).second);
+
+  if (SummaryMEsMap_iter != SummaryMEsMap_.end()) {
+    return;
   }
-  else {
-    SummaryMEsMap_iter = SummaryMEsMap_.find(getLayerNameAndId(detId_,tTopo).second);
+
+  // FIXME t's not good that the base class has to know about which derived
+  // class shoudl exist.
+  // please modify this part. implement virtual functions, esplicited in the
+  // derived classes
+  // --> currently only profile summary defined for all condition objects except
+  // quality
+  if ((CondObj_fillId_ == "ProfileAndCumul" || CondObj_fillId_ == "onlyProfile") &&
+      (CondObj_name_ == "pedestal" || CondObj_name_ == "noise" || CondObj_name_ == "lowthreshold" ||
+       CondObj_name_ == "highthreshold" || CondObj_name_ == "apvgain" || CondObj_name_ == "bpcorrection" ||
+       CondObj_name_ == "lorentzangle")) {
+    if (hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel"))
+      if (!CondObj_ME.SummaryOfProfileDistr) {
+        bookSummaryProfileMEs(CondObj_ME, detId_, tTopo);
+      }
   }
-   
-  if (SummaryMEsMap_iter != SummaryMEsMap_.end()){ return;}
-
-  //FIXME t's not good that the base class has to know about which derived class shoudl exist.
-  // please modify this part. implement virtual functions, esplicited in the derived classes
-  // --> currently only profile summary defined for all condition objects except quality
-  if(  (CondObj_fillId_ =="ProfileAndCumul" || CondObj_fillId_ =="onlyProfile" ) &&
-     (
-      CondObj_name_ == "pedestal"     || 
-      CondObj_name_ == "noise"         || 
-      CondObj_name_ == "lowthreshold"  || 
-      CondObj_name_ == "highthreshold" || 
-      CondObj_name_ == "apvgain"       || 
-      CondObj_name_ == "bpcorrection"  || 
-      CondObj_name_ == "lorentzangle") ) {
-    if(hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel"))	
-      if (!CondObj_ME.SummaryOfProfileDistr) { bookSummaryProfileMEs(CondObj_ME,detId_,tTopo); }
-  }    
-    
+
   // --> currently only genuine cumul LA
-  if(   (CondObj_fillId_ =="ProfileAndCumul" || CondObj_fillId_ =="onlyCumul" ) &&
-	(
-	 CondObj_name_ == "lorentzangle" ||  
-	 CondObj_name_ == "bpcorrection" ||  
-	 CondObj_name_ == "noise")  ) {
-    if(hPSet_.getParameter<bool>("FillCumulativeSummaryAtLayerLevel"))
-      if (!CondObj_ME.SummaryOfCumulDistr) { bookSummaryCumulMEs(CondObj_ME,detId_,tTopo); } 
-  } 
-                          
-  // --> currently only summary as a function of detId for noise, pedestal and apvgain 
-  if(      CondObj_name_ == "noise"         ||
-	   CondObj_name_ == "lowthreshold"  || 
-	   CondObj_name_ == "highthreshold" || 
-	   CondObj_name_ == "apvgain"       || 
-	   CondObj_name_ == "pedestal"      || 
-	   CondObj_name_ == "quality"           ) {
-    if(hPSet_.getParameter<bool>("FillSummaryAtLayerLevel"))          
-      if (!CondObj_ME.SummaryDistr) { bookSummaryMEs(CondObj_ME,detId_,tTopo); } 
-    
-  } 
-                          
-  if(CondObj_name_ == "lorentzangle" && SummaryOnStringLevel_On_) {
-    //FIXME getStringNameandId takes time. not need to call it every timne. put the call at the beginning of the method and caache the string 
-    SummaryMEsMap_.insert( std::make_pair(getStringNameAndId(detId_,tTopo).second,CondObj_ME) );
-  }
-  else if(CondObj_name_ == "bpcorrection" && SummaryOnStringLevel_On_) {
-    //FIXME getStringNameandId takes time. not need to call it every timne. put the call at the beginning of the method and caache the string 
-    SummaryMEsMap_.insert( std::make_pair(getStringNameAndId(detId_,tTopo).second,CondObj_ME) );
+  if ((CondObj_fillId_ == "ProfileAndCumul" || CondObj_fillId_ == "onlyCumul") &&
+      (CondObj_name_ == "lorentzangle" || CondObj_name_ == "bpcorrection" || CondObj_name_ == "noise")) {
+    if (hPSet_.getParameter<bool>("FillCumulativeSummaryAtLayerLevel"))
+      if (!CondObj_ME.SummaryOfCumulDistr) {
+        bookSummaryCumulMEs(CondObj_ME, detId_, tTopo);
+      }
   }
-  else {
-    SummaryMEsMap_.insert( std::make_pair(getLayerNameAndId(detId_,tTopo).second,CondObj_ME) );
+
+  // --> currently only summary as a function of detId for noise, pedestal and
+  // apvgain
+  if (CondObj_name_ == "noise" || CondObj_name_ == "lowthreshold" || CondObj_name_ == "highthreshold" ||
+      CondObj_name_ == "apvgain" || CondObj_name_ == "pedestal" || CondObj_name_ == "quality") {
+    if (hPSet_.getParameter<bool>("FillSummaryAtLayerLevel"))
+      if (!CondObj_ME.SummaryDistr) {
+        bookSummaryMEs(CondObj_ME, detId_, tTopo);
+      }
   }
 
+  if (CondObj_name_ == "lorentzangle" && SummaryOnStringLevel_On_) {
+    // FIXME getStringNameandId takes time. not need to call it every timne. put
+    // the call at the beginning of the method and caache the string
+    SummaryMEsMap_.insert(std::make_pair(getStringNameAndId(detId_, tTopo).second, CondObj_ME));
+  } else if (CondObj_name_ == "bpcorrection" && SummaryOnStringLevel_On_) {
+    // FIXME getStringNameandId takes time. not need to call it every timne. put
+    // the call at the beginning of the method and caache the string
+    SummaryMEsMap_.insert(std::make_pair(getStringNameAndId(detId_, tTopo).second, CondObj_ME));
+  } else {
+    SummaryMEsMap_.insert(std::make_pair(getLayerNameAndId(detId_, tTopo).second, CondObj_ME));
+  }
 }
-// ---- 
+// ----
 
 //====================================================
 // -----
-void SiStripBaseCondObjDQM::bookProfileMEs(SiStripBaseCondObjDQM::ModMEs& CondObj_ME, const uint32_t& detId_, const TrackerTopology* tTopo){
-     
-  int   hProfile_NchX  = 0;
-  double hProfile_LowX  = 0;
+void SiStripBaseCondObjDQM::bookProfileMEs(SiStripBaseCondObjDQM::ModMEs &CondObj_ME,
+                                           const uint32_t &detId_,
+                                           const TrackerTopology *tTopo) {
+  int hProfile_NchX = 0;
+  double hProfile_LowX = 0;
   double hProfile_HighX = 0;
-  
+
   std::string hProfile_description;
-  hProfile_description   = hPSet_.getParameter<std::string>("Profile_description");
-      
+  hProfile_description = hPSet_.getParameter<std::string>("Profile_description");
+
   std::string hProfile_xTitle, hProfile_yTitle;
-  hProfile_xTitle          = hPSet_.getParameter<std::string>("Profile_xTitle");
-  hProfile_yTitle          = hPSet_.getParameter<std::string>("Profile_yTitle");
-            
-  if( CondObj_name_!= "apvgain" ){
-    
-    int nStrip      = reader->getNumberOfApvsAndStripLength(detId_).first*128;
-	
-    hProfile_NchX           = nStrip;
-    hProfile_LowX           = 0.5;
-    hProfile_HighX          = nStrip+0.5;
-  }
-  else {
-	
-    int nApv      = reader->getNumberOfApvsAndStripLength(detId_).first;
-	
-    hProfile_NchX           = nApv;
-    hProfile_LowX           = 0.5;
-    hProfile_HighX          = nApv+0.5;
+  hProfile_xTitle = hPSet_.getParameter<std::string>("Profile_xTitle");
+  hProfile_yTitle = hPSet_.getParameter<std::string>("Profile_yTitle");
+
+  if (CondObj_name_ != "apvgain") {
+    int nStrip = reader->getNumberOfApvsAndStripLength(detId_).first * 128;
+
+    hProfile_NchX = nStrip;
+    hProfile_LowX = 0.5;
+    hProfile_HighX = nStrip + 0.5;
+  } else {
+    int nApv = reader->getNumberOfApvsAndStripLength(detId_).first;
+
+    hProfile_NchX = nApv;
+    hProfile_LowX = 0.5;
+    hProfile_HighX = nApv + 0.5;
   }
-      
-  folder_organizer.setDetectorFolder(detId_,tTopo); 
-      
-  std::string hProfile_Name; 
+
+  folder_organizer.setDetectorFolder(detId_, tTopo);
+
+  std::string hProfile_Name;
   hProfile_Name = hidmanager.createHistoId(hProfile_description, "det", detId_);
-      
+
   std::string hProfile;
-  hProfile = hProfile_Name ;
-    
+  hProfile = hProfile_Name;
+
   CondObj_ME.ProfileDistr = dqmStore_->book1D(hProfile_Name, hProfile, hProfile_NchX, hProfile_LowX, hProfile_HighX);
-  CondObj_ME.ProfileDistr->setAxisTitle(hProfile_xTitle,1);
-  CondObj_ME.ProfileDistr->setAxisTitle(hProfile_yTitle,2);
+  CondObj_ME.ProfileDistr->setAxisTitle(hProfile_xTitle, 1);
+  CondObj_ME.ProfileDistr->setAxisTitle(hProfile_yTitle, 2);
   dqmStore_->tag(CondObj_ME.ProfileDistr, detId_);
-  
 }
 // -----
 
-
-//=============================================      
+//=============================================
 // -----
-void SiStripBaseCondObjDQM::bookCumulMEs(SiStripBaseCondObjDQM::ModMEs& CondObj_ME, const uint32_t& detId_, const TrackerTopology* tTopo){
+void SiStripBaseCondObjDQM::bookCumulMEs(SiStripBaseCondObjDQM::ModMEs &CondObj_ME,
+                                         const uint32_t &detId_,
+                                         const TrackerTopology *tTopo) {
+  int hCumul_NchX = 0;
+  double hCumul_LowX = 0;
+  double hCumul_HighX = 0;
 
-  int    hCumul_NchX    = 0;
-  double hCumul_LowX    = 0;
-  double hCumul_HighX   = 0;
-     
   std::string hCumul_description;
-  hCumul_description   = hPSet_.getParameter<std::string>("Cumul_description");
-      
+  hCumul_description = hPSet_.getParameter<std::string>("Cumul_description");
+
   std::string hCumul_xTitle, hCumul_yTitle;
-  hCumul_xTitle        = hPSet_.getParameter<std::string>("Cumul_xTitle");
-  hCumul_yTitle        = hPSet_.getParameter<std::string>("Cumul_yTitle");
-      
-  hCumul_NchX          = hPSet_.getParameter<int>("Cumul_NchX");
-  hCumul_LowX          = hPSet_.getParameter<double>("Cumul_LowX");
-  hCumul_HighX         = hPSet_.getParameter<double>("Cumul_HighX");
-      
-  folder_organizer.setDetectorFolder(detId_,tTopo); 
-      
-  std::string hCumul_name; 
-  hCumul_name   = hidmanager.createHistoId(hCumul_description  , "det", detId_); ;
-      
+  hCumul_xTitle = hPSet_.getParameter<std::string>("Cumul_xTitle");
+  hCumul_yTitle = hPSet_.getParameter<std::string>("Cumul_yTitle");
+
+  hCumul_NchX = hPSet_.getParameter<int>("Cumul_NchX");
+  hCumul_LowX = hPSet_.getParameter<double>("Cumul_LowX");
+  hCumul_HighX = hPSet_.getParameter<double>("Cumul_HighX");
+
+  folder_organizer.setDetectorFolder(detId_, tTopo);
+
+  std::string hCumul_name;
+  hCumul_name = hidmanager.createHistoId(hCumul_description, "det", detId_);
+  ;
+
   std::string hCumul_title;
-  hCumul_title   = hCumul_name ;
-      
-  CondObj_ME.CumulDistr = dqmStore_->book1D(hCumul_name, 
-                                            hCumul_title, 
-					    hCumul_NchX, 
-					    hCumul_LowX, 
-					    hCumul_HighX);
-  CondObj_ME.CumulDistr->setAxisTitle(hCumul_xTitle,1);
-  CondObj_ME.CumulDistr->setAxisTitle(hCumul_yTitle,2);
-  dqmStore_->tag(CondObj_ME.CumulDistr, detId_);
-      
-} 
-// ---- 
+  hCumul_title = hCumul_name;
 
+  CondObj_ME.CumulDistr = dqmStore_->book1D(hCumul_name, hCumul_title, hCumul_NchX, hCumul_LowX, hCumul_HighX);
+  CondObj_ME.CumulDistr->setAxisTitle(hCumul_xTitle, 1);
+  CondObj_ME.CumulDistr->setAxisTitle(hCumul_yTitle, 2);
+  dqmStore_->tag(CondObj_ME.CumulDistr, detId_);
+}
+// ----
 
 //===========================================
 // -----
 //#FIXME: same comments: factorize, and remove any reference to derived classes
-void SiStripBaseCondObjDQM::bookSummaryProfileMEs(SiStripBaseCondObjDQM::ModMEs& CondObj_ME, const uint32_t& detId_, const TrackerTopology* tTopo){
-  
+void SiStripBaseCondObjDQM::bookSummaryProfileMEs(SiStripBaseCondObjDQM::ModMEs &CondObj_ME,
+                                                  const uint32_t &detId_,
+                                                  const TrackerTopology *tTopo) {
   std::vector<uint32_t> sameLayerDetIds_;
 
-  int   hSummaryOfProfile_NchX    = 0;
-  double hSummaryOfProfile_LowX    = 0;
-  double hSummaryOfProfile_HighX   = 0;
-     
+  int hSummaryOfProfile_NchX = 0;
+  double hSummaryOfProfile_LowX = 0;
+  double hSummaryOfProfile_HighX = 0;
+
   std::string hSummaryOfProfile_description;
-  hSummaryOfProfile_description  = hPSet_.getParameter<std::string>("SummaryOfProfile_description");
-      
+  hSummaryOfProfile_description = hPSet_.getParameter<std::string>("SummaryOfProfile_description");
+
   std::string hSummaryOfProfile_xTitle, hSummaryOfProfile_yTitle;
-  hSummaryOfProfile_xTitle        = hPSet_.getParameter<std::string>("SummaryOfProfile_xTitle");
-  hSummaryOfProfile_yTitle        = hPSet_.getParameter<std::string>("SummaryOfProfile_yTitle");
-  
+  hSummaryOfProfile_xTitle = hPSet_.getParameter<std::string>("SummaryOfProfile_xTitle");
+  hSummaryOfProfile_yTitle = hPSet_.getParameter<std::string>("SummaryOfProfile_yTitle");
+
   int hSummaryOfProfile_NchY;
   double hSummaryOfProfile_LowY, hSummaryOfProfile_HighY;
-  hSummaryOfProfile_NchY          = hPSet_.getParameter<int>("SummaryOfProfile_NchY");
-  hSummaryOfProfile_LowY          = hPSet_.getParameter<double>("SummaryOfProfile_LowY");
-  hSummaryOfProfile_HighY         = hPSet_.getParameter<double>("SummaryOfProfile_HighY");
-  
-  int nStrip, nApv, layerId_;    
-  
-  if(CondObj_name_ == "lorentzangle" && SummaryOnStringLevel_On_) { layerId_= getStringNameAndId(detId_,tTopo).second;}
-  else if(CondObj_name_ == "bpcorrection" && SummaryOnStringLevel_On_) { layerId_= getStringNameAndId(detId_,tTopo).second;}
-  else                                                            { layerId_= getLayerNameAndId(detId_,tTopo).second;}
-
-
-  if( CondObj_name_ == "pedestal" || CondObj_name_ == "noise" || CondObj_name_ == "lowthreshold" || CondObj_name_ == "highthreshold" ){ // plot in strip number
-    
-    if( (layerId_ > 610 && layerId_ < 620) || // TID & TEC have 768 strips at maximum
-        (layerId_ > 620 && layerId_ < 630) ||
-        (layerId_ > 410 && layerId_ < 414) ||
-        (layerId_ > 420 && layerId_ < 424) ){ nStrip =768;} 
-    else { nStrip      = reader->getNumberOfApvsAndStripLength(detId_).first*128;}
-    
-    hSummaryOfProfile_NchX           = nStrip;
-    hSummaryOfProfile_LowX           = 0.5;
-    hSummaryOfProfile_HighX          = nStrip+0.5;
-  
-  }  
-  else if( ((CondObj_name_ == "lorentzangle" || CondObj_name_ == "bpcorrection" ) && SummaryOnLayerLevel_On_) || CondObj_name_ == "quality"){ // plot in detId-number
+  hSummaryOfProfile_NchY = hPSet_.getParameter<int>("SummaryOfProfile_NchY");
+  hSummaryOfProfile_LowY = hPSet_.getParameter<double>("SummaryOfProfile_LowY");
+  hSummaryOfProfile_HighY = hPSet_.getParameter<double>("SummaryOfProfile_HighY");
+
+  int nStrip, nApv, layerId_;
+
+  if (CondObj_name_ == "lorentzangle" && SummaryOnStringLevel_On_) {
+    layerId_ = getStringNameAndId(detId_, tTopo).second;
+  } else if (CondObj_name_ == "bpcorrection" && SummaryOnStringLevel_On_) {
+    layerId_ = getStringNameAndId(detId_, tTopo).second;
+  } else {
+    layerId_ = getLayerNameAndId(detId_, tTopo).second;
+  }
+
+  if (CondObj_name_ == "pedestal" || CondObj_name_ == "noise" || CondObj_name_ == "lowthreshold" ||
+      CondObj_name_ == "highthreshold") {  // plot in strip number
+
+    if ((layerId_ > 610 && layerId_ < 620) ||  // TID & TEC have 768 strips at maximum
+        (layerId_ > 620 && layerId_ < 630) || (layerId_ > 410 && layerId_ < 414) ||
+        (layerId_ > 420 && layerId_ < 424)) {
+      nStrip = 768;
+    } else {
+      nStrip = reader->getNumberOfApvsAndStripLength(detId_).first * 128;
+    }
+
+    hSummaryOfProfile_NchX = nStrip;
+    hSummaryOfProfile_LowX = 0.5;
+    hSummaryOfProfile_HighX = nStrip + 0.5;
+
+  } else if (((CondObj_name_ == "lorentzangle" || CondObj_name_ == "bpcorrection") && SummaryOnLayerLevel_On_) ||
+             CondObj_name_ == "quality") {  // plot in detId-number
 
     // -----
     // get detIds belonging to same layer to fill X-axis with detId-number
 
     sameLayerDetIds_.clear();
 
-    switch ( DetId(detId_).subdetId() ) {
+    switch (DetId(detId_).subdetId()) {
       case StripSubdetector::TIB:
-        SiStripSubStructure::getTIBDetectors(activeDetIds, sameLayerDetIds_, tTopo, tTopo->tibLayer(detId_),0,0,tTopo->tibString(detId_));
+        SiStripSubStructure::getTIBDetectors(
+            activeDetIds, sameLayerDetIds_, tTopo, tTopo->tibLayer(detId_), 0, 0, tTopo->tibString(detId_));
         break;
       case StripSubdetector::TID:
-        SiStripSubStructure::getTIDDetectors(activeDetIds, sameLayerDetIds_, tTopo, 0,0,0,0);
+        SiStripSubStructure::getTIDDetectors(activeDetIds, sameLayerDetIds_, tTopo, 0, 0, 0, 0);
         break;
       case StripSubdetector::TOB:
-        SiStripSubStructure::getTOBDetectors(activeDetIds, sameLayerDetIds_, tTopo, tTopo->tobLayer(detId_),0,0);
+        SiStripSubStructure::getTOBDetectors(activeDetIds, sameLayerDetIds_, tTopo, tTopo->tobLayer(detId_), 0, 0);
         break;
       case StripSubdetector::TEC:
-        SiStripSubStructure::getTECDetectors(activeDetIds, sameLayerDetIds_, tTopo, 0,0,0,0,0,0);
+        SiStripSubStructure::getTECDetectors(activeDetIds, sameLayerDetIds_, tTopo, 0, 0, 0, 0, 0, 0);
         break;
     }
 
-    hSummaryOfProfile_NchX           = sameLayerDetIds_.size(); 
-    hSummaryOfProfile_LowX           = 0.5;
-    hSummaryOfProfile_HighX          = sameLayerDetIds_.size()+0.5;
- 
-  } 
-  else if( (CondObj_name_ == "lorentzangle" || CondObj_name_ == "bpcorrection") && SummaryOnStringLevel_On_){ // plot in detId-number
+    hSummaryOfProfile_NchX = sameLayerDetIds_.size();
+    hSummaryOfProfile_LowX = 0.5;
+    hSummaryOfProfile_HighX = sameLayerDetIds_.size() + 0.5;
+
+  } else if ((CondObj_name_ == "lorentzangle" || CondObj_name_ == "bpcorrection") &&
+             SummaryOnStringLevel_On_) {  // plot in detId-number
 
     // -----
     // get detIds belonging to same string to fill X-axis with detId-number
 
-    sameLayerDetIds_.clear(); 
-    
-    switch ( DetId(detId_).subdetId() ) {
+    sameLayerDetIds_.clear();
+
+    switch (DetId(detId_).subdetId()) {
       case StripSubdetector::TIB:
-        if(tTopo->tibIsInternalString(detId_)){
-          SiStripSubStructure::getTIBDetectors(activeDetIds, sameLayerDetIds_, tTopo, tTopo->tibLayer(detId_),0,1,tTopo->tibString(detId_)); }
-        else if(tTopo->tibIsExternalString(detId_)){
-          SiStripSubStructure::getTIBDetectors(activeDetIds, sameLayerDetIds_, tTopo, tTopo->tibLayer(detId_),0,2,tTopo->tibString(detId_)); }
+        if (tTopo->tibIsInternalString(detId_)) {
+          SiStripSubStructure::getTIBDetectors(
+              activeDetIds, sameLayerDetIds_, tTopo, tTopo->tibLayer(detId_), 0, 1, tTopo->tibString(detId_));
+        } else if (tTopo->tibIsExternalString(detId_)) {
+          SiStripSubStructure::getTIBDetectors(
+              activeDetIds, sameLayerDetIds_, tTopo, tTopo->tibLayer(detId_), 0, 2, tTopo->tibString(detId_));
+        }
         break;
       case StripSubdetector::TID:
-        SiStripSubStructure::getTIDDetectors(activeDetIds, sameLayerDetIds_, tTopo, 0,0,0,0);
+        SiStripSubStructure::getTIDDetectors(activeDetIds, sameLayerDetIds_, tTopo, 0, 0, 0, 0);
         break;
       case StripSubdetector::TOB:
-        SiStripSubStructure::getTOBDetectors(activeDetIds, sameLayerDetIds_, tTopo, tTopo->tobLayer(detId_),0,tTopo->tobRod(detId_));
+        SiStripSubStructure::getTOBDetectors(
+            activeDetIds, sameLayerDetIds_, tTopo, tTopo->tobLayer(detId_), 0, tTopo->tobRod(detId_));
         break;
       case StripSubdetector::TEC:
-        SiStripSubStructure::getTECDetectors(activeDetIds, sameLayerDetIds_, tTopo, 0,0,0,0,0,0);
+        SiStripSubStructure::getTECDetectors(activeDetIds, sameLayerDetIds_, tTopo, 0, 0, 0, 0, 0, 0);
         break;
     }
 
-    hSummaryOfProfile_NchX           = sameLayerDetIds_.size(); 
-    hSummaryOfProfile_LowX           = 0.5;
-    hSummaryOfProfile_HighX          = sameLayerDetIds_.size()+0.5;
- 
-  } 
-  else if( CondObj_name_ == "apvgain"){
- 
-    if( (layerId_ > 610 && layerId_ < 620) || // TID & TEC have 6 apvs at maximum
-        (layerId_ > 620 && layerId_ < 630) ||
-        (layerId_ > 410 && layerId_ < 414) ||
-        (layerId_ > 420 && layerId_ < 424) ){ nApv =6;} 
-    else { nApv     = reader->getNumberOfApvsAndStripLength(detId_).first;}
-    
-    hSummaryOfProfile_NchX           = nApv;
-    hSummaryOfProfile_LowX           = 0.5;
-    hSummaryOfProfile_HighX          = nApv+0.5;
- 
-  }
-  else {
-    edm::LogWarning("SiStripBaseCondObjDQM") 
-       << "[SiStripBaseCondObjDQM::bookSummaryProfileMEs] PLEASE CHECK : x-axis label in your cfg"
-       << std::endl; 
+    hSummaryOfProfile_NchX = sameLayerDetIds_.size();
+    hSummaryOfProfile_LowX = 0.5;
+    hSummaryOfProfile_HighX = sameLayerDetIds_.size() + 0.5;
+
+  } else if (CondObj_name_ == "apvgain") {
+    if ((layerId_ > 610 && layerId_ < 620) ||  // TID & TEC have 6 apvs at maximum
+        (layerId_ > 620 && layerId_ < 630) || (layerId_ > 410 && layerId_ < 414) ||
+        (layerId_ > 420 && layerId_ < 424)) {
+      nApv = 6;
+    } else {
+      nApv = reader->getNumberOfApvsAndStripLength(detId_).first;
+    }
+
+    hSummaryOfProfile_NchX = nApv;
+    hSummaryOfProfile_LowX = 0.5;
+    hSummaryOfProfile_HighX = nApv + 0.5;
+
+  } else {
+    edm::LogWarning("SiStripBaseCondObjDQM") << "[SiStripBaseCondObjDQM::bookSummaryProfileMEs] PLEASE CHECK : "
+                                                "x-axis label in your cfg"
+                                             << std::endl;
   }
-  
-  uint32_t layer_=0;
-      
+
+  uint32_t layer_ = 0;
+
   layer_ = folder_organizer.GetSubDetAndLayer(detId_, tTopo).second;
-      
-  folder_organizer.setLayerFolder(detId_,tTopo,layer_); 
-      
-  std::string hSummaryOfProfile_name; 
-  
+
+  folder_organizer.setLayerFolder(detId_, tTopo, layer_);
+
+  std::string hSummaryOfProfile_name;
+
   // ---
-  int subdetectorId_ = ((detId_>>25)&0x7);
-  
- 
-  if( subdetectorId_<3 || subdetectorId_>6 ){ 
-    edm::LogError("SiStripBaseCondObjDQM")
-       << "[SiStripBaseCondObjDQM::bookSummaryProfileMEs] WRONG INPUT : no such subdetector type : "
-       << subdetectorId_ << " no folder set!" 
-       << std::endl;
+  int subdetectorId_ = ((detId_ >> 25) & 0x7);
+
+  if (subdetectorId_ < 3 || subdetectorId_ > 6) {
+    edm::LogError("SiStripBaseCondObjDQM") << "[SiStripBaseCondObjDQM::bookSummaryProfileMEs] WRONG INPUT : no "
+                                              "such subdetector type : "
+                                           << subdetectorId_ << " no folder set!" << std::endl;
     return;
   }
   // ---
-  
-  if((CondObj_name_ == "lorentzangle" || CondObj_name_ == "bpcorrection") && SummaryOnStringLevel_On_) { 
-    hSummaryOfProfile_name = hidmanager.createHistoLayer(hSummaryOfProfile_description, "layer" , getStringNameAndId(detId_,tTopo).first,"") ;
-  }
-  else {
-    hSummaryOfProfile_name = hidmanager.createHistoLayer(hSummaryOfProfile_description, "layer" , getLayerNameAndId(detId_,tTopo).first,"") ;
+
+  if ((CondObj_name_ == "lorentzangle" || CondObj_name_ == "bpcorrection") && SummaryOnStringLevel_On_) {
+    hSummaryOfProfile_name = hidmanager.createHistoLayer(
+        hSummaryOfProfile_description, "layer", getStringNameAndId(detId_, tTopo).first, "");
+  } else {
+    hSummaryOfProfile_name =
+        hidmanager.createHistoLayer(hSummaryOfProfile_description, "layer", getLayerNameAndId(detId_, tTopo).first, "");
   }
-      
+
   std::string hSummaryOfProfile_title;
-  hSummaryOfProfile_title   = hSummaryOfProfile_name ;
-           
-  CondObj_ME.SummaryOfProfileDistr = dqmStore_->bookProfile(hSummaryOfProfile_name, 
-                                                            hSummaryOfProfile_title, 
-						            hSummaryOfProfile_NchX, 
-						            hSummaryOfProfile_LowX, 
-						            hSummaryOfProfile_HighX, 
-						            hSummaryOfProfile_NchY, 
-						            0., 
-						            0.);
-  //						            hSummaryOfProfile_LowY, 
+  hSummaryOfProfile_title = hSummaryOfProfile_name;
+
+  CondObj_ME.SummaryOfProfileDistr = dqmStore_->bookProfile(hSummaryOfProfile_name,
+                                                            hSummaryOfProfile_title,
+                                                            hSummaryOfProfile_NchX,
+                                                            hSummaryOfProfile_LowX,
+                                                            hSummaryOfProfile_HighX,
+                                                            hSummaryOfProfile_NchY,
+                                                            0.,
+                                                            0.);
+  //						            hSummaryOfProfile_LowY,
   //						            hSummaryOfProfile_HighY);
-  CondObj_ME.SummaryOfProfileDistr->setAxisTitle(hSummaryOfProfile_xTitle,1);
-  CondObj_ME.SummaryOfProfileDistr->setAxisTitle(hSummaryOfProfile_yTitle,2);
-  CondObj_ME.SummaryOfProfileDistr->setAxisRange(hSummaryOfProfile_LowY, hSummaryOfProfile_HighY,2);
- 
+  CondObj_ME.SummaryOfProfileDistr->setAxisTitle(hSummaryOfProfile_xTitle, 1);
+  CondObj_ME.SummaryOfProfileDistr->setAxisTitle(hSummaryOfProfile_yTitle, 2);
+  CondObj_ME.SummaryOfProfileDistr->setAxisRange(hSummaryOfProfile_LowY, hSummaryOfProfile_HighY, 2);
+
   // -----
   // in order to get the right detId-number labelled in right bin of x-axis
-  
-  if( CondObj_name_ == "quality" ){
-    
-    unsigned int iBin=0;
-    
-    for(unsigned int i=0;i< sameLayerDetIds_.size(); i++){
-    
+
+  if (CondObj_name_ == "quality") {
+    unsigned int iBin = 0;
+
+    for (unsigned int i = 0; i < sameLayerDetIds_.size(); i++) {
       iBin++;
       char sameLayerDetIds_Name[1024];
-      sprintf(sameLayerDetIds_Name,"%u",sameLayerDetIds_[i]);
+      sprintf(sameLayerDetIds_Name, "%u", sameLayerDetIds_[i]);
       CondObj_ME.SummaryOfProfileDistr->setBinLabel(iBin, sameLayerDetIds_Name);
-    
     }
-  } 
-  if( CondObj_name_ == "lorentzangle" || CondObj_name_ == "bpcorrection"){
-
+  }
+  if (CondObj_name_ == "lorentzangle" || CondObj_name_ == "bpcorrection") {
     // Put the detIds for the -z side as following the geometrical order:
-      reverse(sameLayerDetIds_.begin(), sameLayerDetIds_.begin()+sameLayerDetIds_.size()/2);
-
-      unsigned int iBin=0;
-       for(unsigned int i=0;i< sameLayerDetIds_.size(); i++){ 
-	 iBin++;
-	 if (!SummaryOnStringLevel_On_){
-	   // remove the label for detIds:
-	     CondObj_ME.SummaryOfProfileDistr->setBinLabel(iBin, "");
-	 }  
-     
-	 if (SummaryOnStringLevel_On_){
-      // Label with module position instead of detIds:
-	   char sameLayerDetIds_Name[1024];
-	   if(subdetectorId_==3){//re-abelling for TIB
-	     if(tTopo->tibIsZPlusSide(sameLayerDetIds_[i])){
-	       sprintf(sameLayerDetIds_Name,"%i",tTopo->tibModule(sameLayerDetIds_[i]));}
-	     else if(tTopo->tibIsZMinusSide(sameLayerDetIds_[i])){
-	       sprintf(sameLayerDetIds_Name,"%i",-tTopo->tibModule(sameLayerDetIds_[i]));}
-	     CondObj_ME.SummaryOfProfileDistr->setBinLabel(iBin, sameLayerDetIds_Name);
-	   }
-	   else if(subdetectorId_==5){//re-abelling for TOB
-	     if(tTopo->tobIsZPlusSide(sameLayerDetIds_[i]))      { sprintf(sameLayerDetIds_Name,"%i",tTopo->tobModule(sameLayerDetIds_[i]));}
-	     else if(tTopo->tobIsZMinusSide(sameLayerDetIds_[i])) { sprintf(sameLayerDetIds_Name,"%i",-tTopo->tobModule(sameLayerDetIds_[i]));}
-	     CondObj_ME.SummaryOfProfileDistr->setBinLabel(iBin, sameLayerDetIds_Name);
-	   }
-	 }
-       } 
- 
-       
+    reverse(sameLayerDetIds_.begin(), sameLayerDetIds_.begin() + sameLayerDetIds_.size() / 2);
 
+    unsigned int iBin = 0;
+    for (unsigned int i = 0; i < sameLayerDetIds_.size(); i++) {
+      iBin++;
+      if (!SummaryOnStringLevel_On_) {
+        // remove the label for detIds:
+        CondObj_ME.SummaryOfProfileDistr->setBinLabel(iBin, "");
+      }
 
-  // -----
-      
-  dqmStore_->tag(CondObj_ME.SummaryOfProfileDistr, layer_);
-      
-  } // if "lorentzangle"
+      if (SummaryOnStringLevel_On_) {
+        // Label with module position instead of detIds:
+        char sameLayerDetIds_Name[1024];
+        if (subdetectorId_ == 3) {  // re-abelling for TIB
+          if (tTopo->tibIsZPlusSide(sameLayerDetIds_[i])) {
+            sprintf(sameLayerDetIds_Name, "%i", tTopo->tibModule(sameLayerDetIds_[i]));
+          } else if (tTopo->tibIsZMinusSide(sameLayerDetIds_[i])) {
+            sprintf(sameLayerDetIds_Name, "%i", -tTopo->tibModule(sameLayerDetIds_[i]));
+          }
+          CondObj_ME.SummaryOfProfileDistr->setBinLabel(iBin, sameLayerDetIds_Name);
+        } else if (subdetectorId_ == 5) {  // re-abelling for TOB
+          if (tTopo->tobIsZPlusSide(sameLayerDetIds_[i])) {
+            sprintf(sameLayerDetIds_Name, "%i", tTopo->tobModule(sameLayerDetIds_[i]));
+          } else if (tTopo->tobIsZMinusSide(sameLayerDetIds_[i])) {
+            sprintf(sameLayerDetIds_Name, "%i", -tTopo->tobModule(sameLayerDetIds_[i]));
+          }
+          CondObj_ME.SummaryOfProfileDistr->setBinLabel(iBin, sameLayerDetIds_Name);
+        }
+      }
+    }
 
-}
-// ---- 
+    // -----
 
+    dqmStore_->tag(CondObj_ME.SummaryOfProfileDistr, layer_);
+
+  }  // if "lorentzangle"
+}
+// ----
 
 //=============================================================
 // -----
-void SiStripBaseCondObjDQM::bookSummaryCumulMEs(SiStripBaseCondObjDQM::ModMEs& CondObj_ME, const uint32_t& detId_, const TrackerTopology* tTopo){
-    
-  int   hSummaryOfCumul_NchX    = 0;
-  double hSummaryOfCumul_LowX    = 0;
-  double hSummaryOfCumul_HighX   = 0;
-	
+void SiStripBaseCondObjDQM::bookSummaryCumulMEs(SiStripBaseCondObjDQM::ModMEs &CondObj_ME,
+                                                const uint32_t &detId_,
+                                                const TrackerTopology *tTopo) {
+  int hSummaryOfCumul_NchX = 0;
+  double hSummaryOfCumul_LowX = 0;
+  double hSummaryOfCumul_HighX = 0;
+
   std::string hSummaryOfCumul_description;
-  hSummaryOfCumul_description  = hPSet_.getParameter<std::string>("SummaryOfCumul_description");
-	
+  hSummaryOfCumul_description = hPSet_.getParameter<std::string>("SummaryOfCumul_description");
+
   std::string hSummaryOfCumul_xTitle, hSummaryOfCumul_yTitle;
-  hSummaryOfCumul_xTitle        = hPSet_.getParameter<std::string>("SummaryOfCumul_xTitle");
-  hSummaryOfCumul_yTitle        = hPSet_.getParameter<std::string>("SummaryOfCumul_yTitle");
-	
-  hSummaryOfCumul_NchX          = hPSet_.getParameter<int>("SummaryOfCumul_NchX");
-  hSummaryOfCumul_LowX          = hPSet_.getParameter<double>("SummaryOfCumul_LowX");
-  hSummaryOfCumul_HighX         = hPSet_.getParameter<double>("SummaryOfCumul_HighX");
-	
-  uint32_t layer_=0;
-	
+  hSummaryOfCumul_xTitle = hPSet_.getParameter<std::string>("SummaryOfCumul_xTitle");
+  hSummaryOfCumul_yTitle = hPSet_.getParameter<std::string>("SummaryOfCumul_yTitle");
+
+  hSummaryOfCumul_NchX = hPSet_.getParameter<int>("SummaryOfCumul_NchX");
+  hSummaryOfCumul_LowX = hPSet_.getParameter<double>("SummaryOfCumul_LowX");
+  hSummaryOfCumul_HighX = hPSet_.getParameter<double>("SummaryOfCumul_HighX");
+
+  uint32_t layer_ = 0;
+
   layer_ = folder_organizer.GetSubDetAndLayer(detId_, tTopo).second;
-	
-  folder_organizer.setLayerFolder(detId_,tTopo,layer_); 
-	
-  std::string hSummaryOfCumul_name; 
-  
+
+  folder_organizer.setLayerFolder(detId_, tTopo, layer_);
+
+  std::string hSummaryOfCumul_name;
+
   // ---
-  int subdetectorId_ = ((detId_>>25)&0x7);
-  
-  if( subdetectorId_<3 || subdetectorId_>6 ){ 
-    edm::LogError("SiStripBaseCondObjDQM")
-       << "[SiStripBaseCondObjDQM::bookSummaryCumulMEs] WRONG INPUT : no such subdetector type : "
-       << subdetectorId_ << " no folder set!" 
-       << std::endl;
+  int subdetectorId_ = ((detId_ >> 25) & 0x7);
+
+  if (subdetectorId_ < 3 || subdetectorId_ > 6) {
+    edm::LogError("SiStripBaseCondObjDQM") << "[SiStripBaseCondObjDQM::bookSummaryCumulMEs] WRONG INPUT : no such "
+                                              "subdetector type : "
+                                           << subdetectorId_ << " no folder set!" << std::endl;
     return;
   }
   // ---
-  
+
   // LA and BP Histos are plotted for each string:
-  if((CondObj_name_ == "lorentzangle" || CondObj_name_ == "bpcorrection") && SummaryOnStringLevel_On_) { 
-    hSummaryOfCumul_name = hidmanager.createHistoLayer(hSummaryOfCumul_description, "layer" , getStringNameAndId(detId_,tTopo).first, "") ;
-  }
-  else {  
-    hSummaryOfCumul_name = hidmanager.createHistoLayer(hSummaryOfCumul_description, "layer" , getLayerNameAndId(detId_,tTopo).first, "") ;
+  if ((CondObj_name_ == "lorentzangle" || CondObj_name_ == "bpcorrection") && SummaryOnStringLevel_On_) {
+    hSummaryOfCumul_name =
+        hidmanager.createHistoLayer(hSummaryOfCumul_description, "layer", getStringNameAndId(detId_, tTopo).first, "");
+  } else {
+    hSummaryOfCumul_name =
+        hidmanager.createHistoLayer(hSummaryOfCumul_description, "layer", getLayerNameAndId(detId_, tTopo).first, "");
   }
 
-	
   std::string hSummaryOfCumul_title;
-  hSummaryOfCumul_title   = hSummaryOfCumul_name ;
-	
-  CondObj_ME.SummaryOfCumulDistr = dqmStore_->book1D(hSummaryOfCumul_name, 
-                                                     hSummaryOfCumul_title, 
-						     hSummaryOfCumul_NchX, 
-						     hSummaryOfCumul_LowX, 
-						     hSummaryOfCumul_HighX);
-
-  CondObj_ME.SummaryOfCumulDistr->setAxisTitle(hSummaryOfCumul_xTitle,1);
-  CondObj_ME.SummaryOfCumulDistr->setAxisTitle(hSummaryOfCumul_yTitle,2);
-	
+  hSummaryOfCumul_title = hSummaryOfCumul_name;
+
+  CondObj_ME.SummaryOfCumulDistr = dqmStore_->book1D(
+      hSummaryOfCumul_name, hSummaryOfCumul_title, hSummaryOfCumul_NchX, hSummaryOfCumul_LowX, hSummaryOfCumul_HighX);
+
+  CondObj_ME.SummaryOfCumulDistr->setAxisTitle(hSummaryOfCumul_xTitle, 1);
+  CondObj_ME.SummaryOfCumulDistr->setAxisTitle(hSummaryOfCumul_yTitle, 2);
+
   dqmStore_->tag(CondObj_ME.SummaryOfCumulDistr, layer_);
-	
 }
 // -----
 
 //================================================
 // -----
-//FIXME same as before: factorize
-void SiStripBaseCondObjDQM::bookSummaryMEs(SiStripBaseCondObjDQM::ModMEs& CondObj_ME, const uint32_t& detId_, const TrackerTopology* tTopo){
-  
+// FIXME same as before: factorize
+void SiStripBaseCondObjDQM::bookSummaryMEs(SiStripBaseCondObjDQM::ModMEs &CondObj_ME,
+                                           const uint32_t &detId_,
+                                           const TrackerTopology *tTopo) {
   std::vector<uint32_t> sameLayerDetIds_;
 
-  int   hSummary_NchX    = 0;
-  double hSummary_LowX    = 0;
-  double hSummary_HighX   = 0;
-     
+  int hSummary_NchX = 0;
+  double hSummary_LowX = 0;
+  double hSummary_HighX = 0;
+
   std::string hSummary_description;
-  hSummary_description  = hPSet_.getParameter<std::string>("Summary_description");
-      
+  hSummary_description = hPSet_.getParameter<std::string>("Summary_description");
+
   std::string hSummary_xTitle, hSummary_yTitle;
-  hSummary_xTitle        = hPSet_.getParameter<std::string>("Summary_xTitle");
-  hSummary_yTitle        = hPSet_.getParameter<std::string>("Summary_yTitle");
-  
+  hSummary_xTitle = hPSet_.getParameter<std::string>("Summary_xTitle");
+  hSummary_yTitle = hPSet_.getParameter<std::string>("Summary_yTitle");
+
   int hSummary_NchY;
   double hSummary_LowY, hSummary_HighY;
-  hSummary_NchY          = hPSet_.getParameter<int>("Summary_NchY");
-  hSummary_LowY          = hPSet_.getParameter<double>("Summary_LowY");
-  hSummary_HighY         = hPSet_.getParameter<double>("Summary_HighY");
-       
+  hSummary_NchY = hPSet_.getParameter<int>("Summary_NchY");
+  hSummary_LowY = hPSet_.getParameter<double>("Summary_LowY");
+  hSummary_HighY = hPSet_.getParameter<double>("Summary_HighY");
 
   // -----
   // get detIds belonging to same layer to fill X-axis with detId-number
-  					   
-  
+
   sameLayerDetIds_.clear();
-   
-  sameLayerDetIds_=GetSameLayerDetId(activeDetIds,detId_,tTopo);
-
-  hSummary_NchX           = sameLayerDetIds_.size(); 
-  hSummary_LowX           = 0.5;
-  hSummary_HighX          = sameLayerDetIds_.size()+0.5;
-  
-  uint32_t layer_=0;
-      
+
+  sameLayerDetIds_ = GetSameLayerDetId(activeDetIds, detId_, tTopo);
+
+  hSummary_NchX = sameLayerDetIds_.size();
+  hSummary_LowX = 0.5;
+  hSummary_HighX = sameLayerDetIds_.size() + 0.5;
+
+  uint32_t layer_ = 0;
+
   layer_ = folder_organizer.GetSubDetAndLayer(detId_, tTopo).second;
-      
-  folder_organizer.setLayerFolder(detId_,tTopo,layer_); 
-      
-  std::string hSummary_name; 
-  
+
+  folder_organizer.setLayerFolder(detId_, tTopo, layer_);
+
+  std::string hSummary_name;
+
   // ---
-  int subdetectorId_ = ((detId_>>25)&0x7);
-  
- 
-  if( subdetectorId_<3 || subdetectorId_>6 ){ 
-    edm::LogError("SiStripBaseCondObjDQM")
-       << "[SiStripBaseCondObjDQM::bookSummaryMEs] WRONG INPUT : no such subdetector type : "
-       << subdetectorId_ << " no folder set!" 
-       << std::endl;
+  int subdetectorId_ = ((detId_ >> 25) & 0x7);
+
+  if (subdetectorId_ < 3 || subdetectorId_ > 6) {
+    edm::LogError("SiStripBaseCondObjDQM") << "[SiStripBaseCondObjDQM::bookSummaryMEs] WRONG INPUT : no such "
+                                              "subdetector type : "
+                                           << subdetectorId_ << " no folder set!" << std::endl;
     return;
   }
   // ---
-  
-  hSummary_name = hidmanager.createHistoLayer(hSummary_description, 
-                                                       "layer" , 
-						        getLayerNameAndId(detId_,tTopo).first,
-							"") ;
-      
+
+  hSummary_name =
+      hidmanager.createHistoLayer(hSummary_description, "layer", getLayerNameAndId(detId_, tTopo).first, "");
+
   std::string hSummary_title;
-  hSummary_title   = hSummary_name ;
-           
-  CondObj_ME.SummaryDistr = dqmStore_->bookProfile(hSummary_name, 
-                                                   hSummary_title, 
-						   hSummary_NchX, 
-						   hSummary_LowX, 
-						   hSummary_HighX, 
-						   hSummary_NchY, 
-						   0., 
-						   0.);
-  //						   hSummary_LowY, 
+  hSummary_title = hSummary_name;
+
+  CondObj_ME.SummaryDistr = dqmStore_->bookProfile(
+      hSummary_name, hSummary_title, hSummary_NchX, hSummary_LowX, hSummary_HighX, hSummary_NchY, 0., 0.);
+  //						   hSummary_LowY,
   //						   hSummary_HighY);
-  CondObj_ME.SummaryDistr->setAxisTitle(hSummary_xTitle,1);
-  CondObj_ME.SummaryDistr->setAxisTitle(hSummary_yTitle,2);
-  CondObj_ME.SummaryDistr->setAxisRange(hSummary_LowY, hSummary_HighY,2);
- 
+  CondObj_ME.SummaryDistr->setAxisTitle(hSummary_xTitle, 1);
+  CondObj_ME.SummaryDistr->setAxisTitle(hSummary_yTitle, 2);
+  CondObj_ME.SummaryDistr->setAxisRange(hSummary_LowY, hSummary_HighY, 2);
+
   // -----
   // in order to get the right detId-number labelled in right bin of x-axis
-  unsigned int iBin=0;
-    
-  for(unsigned int i=0;i< sameLayerDetIds_.size(); i++){
-    
+  unsigned int iBin = 0;
+
+  for (unsigned int i = 0; i < sameLayerDetIds_.size(); i++) {
     iBin++;
     char sameLayerDetIds_Name[1024];
-    sprintf(sameLayerDetIds_Name,"%u",sameLayerDetIds_[i]);
-    if(iBin%100==0)
+    sprintf(sameLayerDetIds_Name, "%u", sameLayerDetIds_[i]);
+    if (iBin % 100 == 0)
       CondObj_ME.SummaryDistr->setBinLabel(iBin, sameLayerDetIds_Name);
-    
   }
   // -----
-      
-  dqmStore_->tag(CondObj_ME.SummaryDistr, layer_);
-      
-} 
 
+  dqmStore_->tag(CondObj_ME.SummaryDistr, layer_);
+}
 
 //==========================================================
 // -----
-std::pair<std::string,uint32_t> SiStripBaseCondObjDQM::getLayerNameAndId(const uint32_t& detId_, const TrackerTopology* tTopo){
-
-  int subdetectorId_ = ((detId_>>25)&0x7);
-  int layerId_=0;
+std::pair<std::string, uint32_t> SiStripBaseCondObjDQM::getLayerNameAndId(const uint32_t &detId_,
+                                                                          const TrackerTopology *tTopo) {
+  int subdetectorId_ = ((detId_ >> 25) & 0x7);
+  int layerId_ = 0;
 
   std::stringstream layerName;
-  
-  if( subdetectorId_ == 3 ){ //TIB
 
-    for( unsigned int i = 1; i < 5; i++ ){
-      if( tTopo->tibLayer( detId_ ) ==i ){ 
-	layerName << "TIB__layer__" << i;
-	layerId_ = 300 + i;
+  if (subdetectorId_ == 3) {  // TIB
+
+    for (unsigned int i = 1; i < 5; i++) {
+      if (tTopo->tibLayer(detId_) == i) {
+        layerName << "TIB__layer__" << i;
+        layerId_ = 300 + i;
       }
     }
-    
+
   }
 
-  else if( subdetectorId_ == 4 ){ //TIDD
-    
-    if( tTopo->tidSide( detId_ ) == 1 ) { // TIDD side 1
-      
-      for( unsigned int i = 1; i < 4; i++ ){
-	if(tTopo->tidWheel(detId_)==i){ 
-	  layerName << "TID__side__1__wheel__" << i;
-	  layerId_ = 410 + i;
-	}
+  else if (subdetectorId_ == 4) {  // TIDD
+
+    if (tTopo->tidSide(detId_) == 1) {  // TIDD side 1
+
+      for (unsigned int i = 1; i < 4; i++) {
+        if (tTopo->tidWheel(detId_) == i) {
+          layerName << "TID__side__1__wheel__" << i;
+          layerId_ = 410 + i;
+        }
       }
-      
+
     }
 
-    else if( tTopo->tidSide( detId_ ) == 2 ) { // TIDD side 2
-      
-      for( unsigned int i = 1; i < 4; i++ ) {
-	if(tTopo->tidWheel(detId_)==i){ 
-	  layerName << "TID__side__2__wheel__" << i;
-	  layerId_ = 420 + i;
-	}
-      }
+    else if (tTopo->tidSide(detId_) == 2) {  // TIDD side 2
 
+      for (unsigned int i = 1; i < 4; i++) {
+        if (tTopo->tidWheel(detId_) == i) {
+          layerName << "TID__side__2__wheel__" << i;
+          layerId_ = 420 + i;
+        }
+      }
     }
 
   }
 
+  else if (subdetectorId_ == 5) {  // TOB
 
-  else if( subdetectorId_ == 5 ){ // TOB
-    
-    for( unsigned int i = 1; i < 7; i++ ) {
-      if( tTopo->tobLayer( detId_ ) == i ) { 
-	layerName << "TOB__layer__" << i;
-	layerId_ = 500 + i;
+    for (unsigned int i = 1; i < 7; i++) {
+      if (tTopo->tobLayer(detId_) == i) {
+        layerName << "TOB__layer__" << i;
+        layerId_ = 500 + i;
       }
     }
-    
+
   }
 
-  else if( subdetectorId_ == 6 ){ // TEC
-    
-    if( tTopo->tecSide( detId_ ) == 1) { // TEC side 1
-      
-      for( unsigned int i = 1; i < 10; i++ ) {
-	if( tTopo->tecWheel( detId_ ) == i ) { 
-	  layerName << "TEC__side__1__wheel__" << i;
-	  layerId_ = 610 + i;
-	}
+  else if (subdetectorId_ == 6) {  // TEC
+
+    if (tTopo->tecSide(detId_) == 1) {  // TEC side 1
+
+      for (unsigned int i = 1; i < 10; i++) {
+        if (tTopo->tecWheel(detId_) == i) {
+          layerName << "TEC__side__1__wheel__" << i;
+          layerId_ = 610 + i;
+        }
       }
 
     }
 
-    else if( tTopo->tecSide( detId_ ) == 2 ) { // TEC side 2
-      
-      for( unsigned int i = 1; i < 10; i++ ) {
-	if( tTopo->tecWheel( detId_ ) == i ) { 
-	  layerName << "TEC__side__2__wheel__" << i;
-	  layerId_ = 620 + i;
-	}
-      }
+    else if (tTopo->tecSide(detId_) == 2) {  // TEC side 2
 
-     }
+      for (unsigned int i = 1; i < 10; i++) {
+        if (tTopo->tecWheel(detId_) == i) {
+          layerName << "TEC__side__2__wheel__" << i;
+          layerId_ = 620 + i;
+        }
+      }
+    }
   }
-  
-  return std::make_pair( layerName.str(), layerId_ );
 
+  return std::make_pair(layerName.str(), layerId_);
 }
 
 //=================================================
 //---------------
 
+std::pair<std::string, uint32_t> SiStripBaseCondObjDQM::getStringNameAndId(const uint32_t &detId_,
+                                                                           const TrackerTopology *tTopo) {
+  int subdetectorId_ = ((detId_ >> 25) & 0x7);
+  int layerStringId_ = 0;
 
-std::pair<std::string,uint32_t> SiStripBaseCondObjDQM::getStringNameAndId(const uint32_t& detId_, const TrackerTopology* tTopo){
-
-  int subdetectorId_ = ((detId_>>25)&0x7);
-  int layerStringId_=0;
-  
   std::stringstream layerStringName;
-  
-  if( subdetectorId_==3 ){ //TIB
-    if(tTopo->tibLayer(detId_)==1 && tTopo->tibIsInternalString(detId_)){ //1st layer int
-      for( unsigned int i=1; i < 27 ;i++){
-	if(tTopo->tibString(detId_)==i){  
-	  layerStringName << "TIB_L1_Int_Str_" << i;
-	  layerStringId_ = 30110+i; 
-	}
-      }      
-    }
-    else  if(tTopo->tibLayer(detId_)==1 && tTopo->tibIsExternalString(detId_)){ //1st layer ext
-      for( unsigned int i=1; i < 31 ;i++){
-	if(tTopo->tibString(detId_)==i){  
-	  layerStringName << "TIB_L1_Ext_Str_" << i;
-	  layerStringId_ = 301200+i; 
-	}
-      }      
-    }
-    else if(tTopo->tibLayer(detId_)==2 && tTopo->tibIsInternalString(detId_)){ //2nd layer int
-      for( unsigned int i=1; i < 35 ;i++){
-	if(tTopo->tibString(detId_)==i){  
-	  layerStringName << "TIB_L2_Int_Str_" << i;
-	  layerStringId_ = 302100+i; 
-	}
-      }      
-    }
-    else if(tTopo->tibLayer(detId_)==2 && tTopo->tibIsExternalString(detId_)){ //2nd layer ext
-      for( unsigned int i=1; i < 39 ;i++){
-	if(tTopo->tibString(detId_)==i){  
-	  layerStringName << "TIB_L2_Ext_Str_" << i;
-	  layerStringId_ = 302200+i; 
-	}
-      }      
-    }
-    else if(tTopo->tibLayer(detId_)==3 && tTopo->tibIsInternalString(detId_)){ //3rd layer int
-      for( unsigned int i=1; i < 45 ;i++){
-	if(tTopo->tibString(detId_)==i){  
-	  layerStringName << "TIB_L3_Int_Str_" << i;
-	  layerStringId_ = 303100+i; 
-	}
-      }      
-    }
-    else if(tTopo->tibLayer(detId_)==3 && tTopo->tibIsExternalString(detId_)){ //3rd layer ext
-      for( unsigned int i=1; i < 47 ;i++){
-	if(tTopo->tibString(detId_)==i){  
-	  layerStringName << "TIB_L3_Ext_Str_" << i;
-	  layerStringId_ = 303200+i; 
-	}
-      }      
-    }
-    else if(tTopo->tibLayer(detId_)==4 && tTopo->tibIsInternalString(detId_)){ //4th layer int
-      for( unsigned int i=1; i < 53 ;i++){
-	if(tTopo->tibString(detId_)==i){  
-	  layerStringName << "TIB_L4_Int_Str_" << i;
-	  layerStringId_ = 304100+i; 
-	}
-      }      
-    }
-    else if(tTopo->tibLayer(detId_)==4 && tTopo->tibIsExternalString(detId_)){ //4th layer ext
-      for( unsigned int i=1; i < 57 ;i++){
-	if(tTopo->tibString(detId_)==i){  
-	  layerStringName << "TIB_L4_Ext_Str_" << i;
-	  layerStringId_ = 304200+i; 
-	}
-      }      
-    }
-  } //TIB
 
-
-  else if( subdetectorId_==5 ){ // TOB
-    if(tTopo->tobLayer(detId_)==1){ //1st layer
-      for( unsigned int i=1; i < 43 ;i++){
-	if(tTopo->tobRod(detId_)==i){  
-	  layerStringName << "TOB_L1_Rod_" << i;
-	  layerStringId_ = 50100+i;
-	}
-      }      
-    }
-    else if(tTopo->tobLayer(detId_)==2){ //2nd layer
-      for( unsigned int i=1; i < 49 ;i++){
-	if(tTopo->tobRod(detId_)==i){  
-	  layerStringName << "TOB_L2_Rod_" << i;
-	  layerStringId_ = 50200+i; 
-	}
-      }      
-    }
-    else if(tTopo->tobLayer(detId_)==3){ //3rd layer
-      for( unsigned int i=1; i < 55 ;i++){
-	if(tTopo->tobRod(detId_)==i){  
-	  layerStringName << "TOB_L3_Rod_" << i;
-	  layerStringId_ = 50300+i; 
-	}
-      }      
-    }
-    else if(tTopo->tobLayer(detId_)==4){ //4th layer
-      for( unsigned int i=1; i < 61 ;i++){
-	if(tTopo->tobRod(detId_)==i){  
-	  layerStringName << "TOB_L4_Rod_" << i;
-	  layerStringId_ = 50400+i; 
-	}
-      }      
-    }
-    else if(tTopo->tobLayer(detId_)==5){ //5th layer
-      for( unsigned int i=1; i < 67 ;i++){
-	if(tTopo->tobRod(detId_)==i){  
-	  layerStringName << "TOB_L5_Rod_" << i;
-	  layerStringId_ = 50500+i; 
-	}
-      }      
+  if (subdetectorId_ == 3) {                                                   // TIB
+    if (tTopo->tibLayer(detId_) == 1 && tTopo->tibIsInternalString(detId_)) {  // 1st layer int
+      for (unsigned int i = 1; i < 27; i++) {
+        if (tTopo->tibString(detId_) == i) {
+          layerStringName << "TIB_L1_Int_Str_" << i;
+          layerStringId_ = 30110 + i;
+        }
+      }
+    } else if (tTopo->tibLayer(detId_) == 1 && tTopo->tibIsExternalString(detId_)) {  // 1st layer ext
+      for (unsigned int i = 1; i < 31; i++) {
+        if (tTopo->tibString(detId_) == i) {
+          layerStringName << "TIB_L1_Ext_Str_" << i;
+          layerStringId_ = 301200 + i;
+        }
+      }
+    } else if (tTopo->tibLayer(detId_) == 2 && tTopo->tibIsInternalString(detId_)) {  // 2nd layer int
+      for (unsigned int i = 1; i < 35; i++) {
+        if (tTopo->tibString(detId_) == i) {
+          layerStringName << "TIB_L2_Int_Str_" << i;
+          layerStringId_ = 302100 + i;
+        }
+      }
+    } else if (tTopo->tibLayer(detId_) == 2 && tTopo->tibIsExternalString(detId_)) {  // 2nd layer ext
+      for (unsigned int i = 1; i < 39; i++) {
+        if (tTopo->tibString(detId_) == i) {
+          layerStringName << "TIB_L2_Ext_Str_" << i;
+          layerStringId_ = 302200 + i;
+        }
+      }
+    } else if (tTopo->tibLayer(detId_) == 3 && tTopo->tibIsInternalString(detId_)) {  // 3rd layer int
+      for (unsigned int i = 1; i < 45; i++) {
+        if (tTopo->tibString(detId_) == i) {
+          layerStringName << "TIB_L3_Int_Str_" << i;
+          layerStringId_ = 303100 + i;
+        }
+      }
+    } else if (tTopo->tibLayer(detId_) == 3 && tTopo->tibIsExternalString(detId_)) {  // 3rd layer ext
+      for (unsigned int i = 1; i < 47; i++) {
+        if (tTopo->tibString(detId_) == i) {
+          layerStringName << "TIB_L3_Ext_Str_" << i;
+          layerStringId_ = 303200 + i;
+        }
+      }
+    } else if (tTopo->tibLayer(detId_) == 4 && tTopo->tibIsInternalString(detId_)) {  // 4th layer int
+      for (unsigned int i = 1; i < 53; i++) {
+        if (tTopo->tibString(detId_) == i) {
+          layerStringName << "TIB_L4_Int_Str_" << i;
+          layerStringId_ = 304100 + i;
+        }
+      }
+    } else if (tTopo->tibLayer(detId_) == 4 && tTopo->tibIsExternalString(detId_)) {  // 4th layer ext
+      for (unsigned int i = 1; i < 57; i++) {
+        if (tTopo->tibString(detId_) == i) {
+          layerStringName << "TIB_L4_Ext_Str_" << i;
+          layerStringId_ = 304200 + i;
+        }
+      }
     }
-    else if(tTopo->tobLayer(detId_)==6){ //6st layer
-      for( unsigned int i=1; i < 75 ;i++){
-	if(tTopo->tobRod(detId_)==i){  
-	  layerStringName << "TOB_L6_Rod_" << i;
-	  layerStringId_ = 50600+i; 
-	}
-      }      
+  }  // TIB
+
+  else if (subdetectorId_ == 5) {        // TOB
+    if (tTopo->tobLayer(detId_) == 1) {  // 1st layer
+      for (unsigned int i = 1; i < 43; i++) {
+        if (tTopo->tobRod(detId_) == i) {
+          layerStringName << "TOB_L1_Rod_" << i;
+          layerStringId_ = 50100 + i;
+        }
+      }
+    } else if (tTopo->tobLayer(detId_) == 2) {  // 2nd layer
+      for (unsigned int i = 1; i < 49; i++) {
+        if (tTopo->tobRod(detId_) == i) {
+          layerStringName << "TOB_L2_Rod_" << i;
+          layerStringId_ = 50200 + i;
+        }
+      }
+    } else if (tTopo->tobLayer(detId_) == 3) {  // 3rd layer
+      for (unsigned int i = 1; i < 55; i++) {
+        if (tTopo->tobRod(detId_) == i) {
+          layerStringName << "TOB_L3_Rod_" << i;
+          layerStringId_ = 50300 + i;
+        }
+      }
+    } else if (tTopo->tobLayer(detId_) == 4) {  // 4th layer
+      for (unsigned int i = 1; i < 61; i++) {
+        if (tTopo->tobRod(detId_) == i) {
+          layerStringName << "TOB_L4_Rod_" << i;
+          layerStringId_ = 50400 + i;
+        }
+      }
+    } else if (tTopo->tobLayer(detId_) == 5) {  // 5th layer
+      for (unsigned int i = 1; i < 67; i++) {
+        if (tTopo->tobRod(detId_) == i) {
+          layerStringName << "TOB_L5_Rod_" << i;
+          layerStringId_ = 50500 + i;
+        }
+      }
+    } else if (tTopo->tobLayer(detId_) == 6) {  // 6st layer
+      for (unsigned int i = 1; i < 75; i++) {
+        if (tTopo->tobRod(detId_) == i) {
+          layerStringName << "TOB_L6_Rod_" << i;
+          layerStringId_ = 50600 + i;
+        }
+      }
     }
-  }//TOB
-
-  return std::make_pair( layerStringName.str(), layerStringId_ );
+  }  // TOB
 
+  return std::make_pair(layerStringName.str(), layerStringId_);
 }
 
-
-
-    
 //========================
-std::vector<uint32_t> SiStripBaseCondObjDQM::GetSameLayerDetId(const std::vector<uint32_t>& activeDetIds,uint32_t selDetId, const TrackerTopology* tTopo){
- 
+std::vector<uint32_t> SiStripBaseCondObjDQM::GetSameLayerDetId(const std::vector<uint32_t> &activeDetIds,
+                                                               uint32_t selDetId,
+                                                               const TrackerTopology *tTopo) {
   std::vector<uint32_t> sameLayerDetIds;
   sameLayerDetIds.clear();
 
-  switch ( DetId(selDetId).subdetId() ) {
+  switch (DetId(selDetId).subdetId()) {
     case StripSubdetector::TIB:
-      SiStripSubStructure::getTIBDetectors(activeDetIds, sameLayerDetIds, tTopo, tTopo->tibLayer(selDetId),0,0,0);
+      SiStripSubStructure::getTIBDetectors(activeDetIds, sameLayerDetIds, tTopo, tTopo->tibLayer(selDetId), 0, 0, 0);
       break;
     case StripSubdetector::TID:
-      SiStripSubStructure::getTIDDetectors(activeDetIds, sameLayerDetIds, tTopo, tTopo->tidSide(selDetId),tTopo->tidWheel(selDetId),0,0);
+      SiStripSubStructure::getTIDDetectors(
+          activeDetIds, sameLayerDetIds, tTopo, tTopo->tidSide(selDetId), tTopo->tidWheel(selDetId), 0, 0);
       break;
     case StripSubdetector::TOB:
-      SiStripSubStructure::getTOBDetectors(activeDetIds, sameLayerDetIds, tTopo, tTopo->tobLayer(selDetId),0,0);
+      SiStripSubStructure::getTOBDetectors(activeDetIds, sameLayerDetIds, tTopo, tTopo->tobLayer(selDetId), 0, 0);
       break;
     case StripSubdetector::TEC:
-      SiStripSubStructure::getTECDetectors(activeDetIds, sameLayerDetIds, tTopo, tTopo->tecSide(selDetId),tTopo->tecWheel(selDetId),0,0,0,0);
+      SiStripSubStructure::getTECDetectors(
+          activeDetIds, sameLayerDetIds, tTopo, tTopo->tecSide(selDetId), tTopo->tecWheel(selDetId), 0, 0, 0, 0);
       break;
   }
 
   return sameLayerDetIds;
 }
 
-
 //==========================
-void SiStripBaseCondObjDQM::bookTkMap(const std::string& TkMapname){
-  tkMap= new TrackerMap(TkMapname);
-}
+void SiStripBaseCondObjDQM::bookTkMap(const std::string &TkMapname) { tkMap = new TrackerMap(TkMapname); }
 
 //==========================
-void SiStripBaseCondObjDQM::fillTkMap(const uint32_t& detid, const float& value){
-  tkMap->fill(detid,value);
-}
+void SiStripBaseCondObjDQM::fillTkMap(const uint32_t &detid, const float &value) { tkMap->fill(detid, value); }
 
 //==========================
-void SiStripBaseCondObjDQM::saveTkMap(const std::string& TkMapname, double minValue, double maxValue){
-
-  if(!tkMapScaler.empty()){
-    //check that saturation is below x%  below minValue and above minValue, and in case re-arrange.
-    float th=hPSet_.getParameter<double>("saturatedFraction");
-
-    size_t imin=0,imax=0;
-    float entries=0 ;
-    for(size_t i=0;i<tkMapScaler.size();++i)
-      entries+=tkMapScaler[i];
-
-    float min=0 ;
-    for(size_t i=0;(i<tkMapScaler.size()) && (min<th);++i){
-      min+=tkMapScaler[i]/entries;
-      imin=i;
+void SiStripBaseCondObjDQM::saveTkMap(const std::string &TkMapname, double minValue, double maxValue) {
+  if (!tkMapScaler.empty()) {
+    // check that saturation is below x%  below minValue and above minValue, and
+    // in case re-arrange.
+    float th = hPSet_.getParameter<double>("saturatedFraction");
+
+    size_t imin = 0, imax = 0;
+    float entries = 0;
+    for (size_t i = 0; i < tkMapScaler.size(); ++i)
+      entries += tkMapScaler[i];
+
+    float min = 0;
+    for (size_t i = 0; (i < tkMapScaler.size()) && (min < th); ++i) {
+      min += tkMapScaler[i] / entries;
+      imin = i;
     }
 
-    float max=0;
+    float max = 0;
     // for(size_t i=tkMapScaler.size()-1;(i>=0) && (max<th);--i){ // Wrong
     // Since i is unsigned, i >= 0 is always true,
     // and the loop termination condition is never reached.
     // We offset the loop index by one to fix this.
-    for(size_t j=tkMapScaler.size();(j>0) && (max<th);--j){ 
+    for (size_t j = tkMapScaler.size(); (j > 0) && (max < th); --j) {
       size_t i = j - 1;
-      max+=tkMapScaler[i]/entries;
-      imax=i;
+      max += tkMapScaler[i] / entries;
+      imax = i;
     }
-    
-    //reset maxValue;
-    if(maxValue<imax){
+
+    // reset maxValue;
+    if (maxValue < imax) {
       edm::LogInfo("SiStripBaseCondObjDQM") << "Resetting TkMap maxValue from " << maxValue << " to " << imax;
-      maxValue=imax;
+      maxValue = imax;
     }
-    //reset minValue;
-    if(minValue>imin){
-        edm::LogInfo("SiStripBaseCondObjDQM") << "Resetting TkMap minValue from " << minValue << " to " << imin;
-      minValue=imin;
+    // reset minValue;
+    if (minValue > imin) {
+      edm::LogInfo("SiStripBaseCondObjDQM") << "Resetting TkMap minValue from " << minValue << " to " << imin;
+      minValue = imin;
     }
   }
-  
-  tkMap->save(false, minValue, maxValue, TkMapname,4500,2400);
-  tkMap->setPalette(1); tkMap->showPalette(true);
-  
-}
 
+  tkMap->save(false, minValue, maxValue, TkMapname, 4500, 2400);
+  tkMap->setPalette(1);
+  tkMap->showPalette(true);
+}
 
 //==========================
-void SiStripBaseCondObjDQM::end(){
-  edm::LogInfo("SiStripBaseCondObjDQM") << "SiStripBaseCondObjDQM::end" << std::endl; 
+void SiStripBaseCondObjDQM::end() {
+  edm::LogInfo("SiStripBaseCondObjDQM") << "SiStripBaseCondObjDQM::end" << std::endl;
 }
 
 //==========================
-void SiStripBaseCondObjDQM::fillModMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es){
-
-  //Retrieve tracker topology from geometry
+void SiStripBaseCondObjDQM::fillModMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   es.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
   ModMEs CondObj_ME;
- 
-  for(std::vector<uint32_t>::const_iterator detIter_=selectedDetIds.begin();
-      detIter_!=selectedDetIds.end();++detIter_){
-    fillMEsForDet(CondObj_ME,*detIter_,tTopo);
+
+  for (std::vector<uint32_t>::const_iterator detIter_ = selectedDetIds.begin(); detIter_ != selectedDetIds.end();
+       ++detIter_) {
+    fillMEsForDet(CondObj_ME, *detIter_, tTopo);
   }
 }
 
 //==========================
-void SiStripBaseCondObjDQM::fillSummaryMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es){
-
-  //Retrieve tracker topology from geometry
+void SiStripBaseCondObjDQM::fillSummaryMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   es.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
-  
-  for(std::vector<uint32_t>::const_iterator detIter_ = selectedDetIds.begin();
-      detIter_!= selectedDetIds.end();detIter_++){
-    fillMEsForLayer(/*SummaryMEsMap_,*/ *detIter_,tTopo);    
-  }
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
-  for (std::map<uint32_t, ModMEs>::iterator iter=SummaryMEsMap_.begin();
-       iter!=SummaryMEsMap_.end(); iter++){
+  for (std::vector<uint32_t>::const_iterator detIter_ = selectedDetIds.begin(); detIter_ != selectedDetIds.end();
+       detIter_++) {
+    fillMEsForLayer(/*SummaryMEsMap_,*/ *detIter_, tTopo);
+  }
 
+  for (std::map<uint32_t, ModMEs>::iterator iter = SummaryMEsMap_.begin(); iter != SummaryMEsMap_.end(); iter++) {
     ModMEs selME;
     selME = iter->second;
 
-    if(hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel") &&
-       fPSet_.getParameter<bool>("OutputSummaryProfileAtLayerLevelAsImage")){
-
-      if( CondObj_fillId_ =="onlyProfile" || CondObj_fillId_ =="ProfileAndCumul"){
-
-	TCanvas c1("c1");
-	selME.SummaryOfProfileDistr->getTProfile()->Draw();
-	std::string name (selME.SummaryOfProfileDistr->getTProfile()->GetTitle());
-	name+=".png";
-	c1.Print(name.c_str());
+    if (hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel") &&
+        fPSet_.getParameter<bool>("OutputSummaryProfileAtLayerLevelAsImage")) {
+      if (CondObj_fillId_ == "onlyProfile" || CondObj_fillId_ == "ProfileAndCumul") {
+        TCanvas c1("c1");
+        selME.SummaryOfProfileDistr->getTProfile()->Draw();
+        std::string name(selME.SummaryOfProfileDistr->getTProfile()->GetTitle());
+        name += ".png";
+        c1.Print(name.c_str());
       }
     }
-    if(hPSet_.getParameter<bool>("FillSummaryAtLayerLevel") &&
-       fPSet_.getParameter<bool>("OutputSummaryAtLayerLevelAsImage")){
-
+    if (hPSet_.getParameter<bool>("FillSummaryAtLayerLevel") &&
+        fPSet_.getParameter<bool>("OutputSummaryAtLayerLevelAsImage")) {
       TCanvas c1("c1");
       selME.SummaryDistr->getTH1()->Draw();
-      std::string name (selME.SummaryDistr->getTH1()->GetTitle());
-      name+=".png";
+      std::string name(selME.SummaryDistr->getTH1()->GetTitle());
+      name += ".png";
       c1.Print(name.c_str());
     }
-    if(hPSet_.getParameter<bool>("FillCumulativeSummaryAtLayerLevel") &&
-       fPSet_.getParameter<bool>("OutputCumulativeSummaryAtLayerLevelAsImage")){
-
-      if( CondObj_fillId_ =="onlyCumul" || CondObj_fillId_ =="ProfileAndCumul"){
-
-	TCanvas c1("c1");
-	selME.SummaryOfCumulDistr->getTH1()->Draw();
-	std::string name (selME.SummaryOfCumulDistr->getTH1()->GetTitle());
-	name+=".png";
-	c1.Print(name.c_str());
+    if (hPSet_.getParameter<bool>("FillCumulativeSummaryAtLayerLevel") &&
+        fPSet_.getParameter<bool>("OutputCumulativeSummaryAtLayerLevelAsImage")) {
+      if (CondObj_fillId_ == "onlyCumul" || CondObj_fillId_ == "ProfileAndCumul") {
+        TCanvas c1("c1");
+        selME.SummaryOfCumulDistr->getTH1()->Draw();
+        std::string name(selME.SummaryOfCumulDistr->getTH1()->GetTitle());
+        name += ".png";
+        c1.Print(name.c_str());
       }
     }
-
   }
 }
diff --git a/DQM/SiStripMonitorSummary/src/SiStripCablingDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripCablingDQM.cc
index e9bfc6f354385..57c73ef8518f6 100644
--- a/DQM/SiStripMonitorSummary/src/SiStripCablingDQM.cc
+++ b/DQM/SiStripMonitorSummary/src/SiStripCablingDQM.cc
@@ -5,174 +5,163 @@
 using namespace std;
 // -----
 
-SiStripCablingDQM::SiStripCablingDQM(const edm::EventSetup & eSetup,
+SiStripCablingDQM::SiStripCablingDQM(const edm::EventSetup &eSetup,
                                      edm::RunNumber_t iRun,
-				     edm::ParameterSet const& hPSet,
-				     edm::ParameterSet const& fPSet):SiStripBaseCondObjDQM(eSetup, iRun, hPSet, fPSet){
-
+                                     edm::ParameterSet const &hPSet,
+                                     edm::ParameterSet const &fPSet)
+    : SiStripBaseCondObjDQM(eSetup, iRun, hPSet, fPSet) {
   // Build the Histo_TkMap:
-  if ( HistoMaps_On_ ) {
+  if (HistoMaps_On_) {
     edm::ESHandle<TkDetMap> tkDetMapHandle;
     eSetup.get<TrackerTopologyRcd>().get(tkDetMapHandle);
-    Tk_HM_ = std::make_unique<TkHistoMap>(tkDetMapHandle.product(), "SiStrip/Histo_Map","Cabling_TkMap",0.);
+    Tk_HM_ = std::make_unique<TkHistoMap>(tkDetMapHandle.product(), "SiStrip/Histo_Map", "Cabling_TkMap", 0.);
   }
 }
 // -----
 
 // -----
-SiStripCablingDQM::~SiStripCablingDQM(){}
+SiStripCablingDQM::~SiStripCablingDQM() {}
 // -----
 
-
-
 // -----
-void SiStripCablingDQM::getActiveDetIds(const edm::EventSetup & eSetup){
-  
-  //Retrieve tracker topology from geometry
+void SiStripCablingDQM::getActiveDetIds(const edm::EventSetup &eSetup) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   eSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
   // Get active and total detIds
   getConditionObject(eSetup);
-  if(!cablingHandle_.isValid()) {
+  if (!cablingHandle_.isValid()) {
     edm::LogError("InvalidCablingHandle") << "Invalid Cabling Handle";
     return;
   }
   cablingHandle_->addActiveDetectorsRawIds(activeDetIds);
   cablingHandle_->addAllDetectorsRawIds(activeDetIds);
 
-
-  //Initialize arrays for counting:
+  // Initialize arrays for counting:
   int counterTIB[4];
-  for(int i=0;i<4;i++) counterTIB[i]=0;
+  for (int i = 0; i < 4; i++)
+    counterTIB[i] = 0;
   int counterTID[2][3];
-  for(int i=0;i<2;i++){
-    for(int j=0;j<3;j++)counterTID[i][j]=0;
+  for (int i = 0; i < 2; i++) {
+    for (int j = 0; j < 3; j++)
+      counterTID[i][j] = 0;
   }
   int counterTOB[6];
-  for(int i=0;i<6;i++)counterTOB[i]=0;
+  for (int i = 0; i < 6; i++)
+    counterTOB[i] = 0;
   int counterTEC[2][9];
-  for(int i=0;i<2;i++){
-    for(int j=0;j<9;j++)counterTEC[i][j]=0;
+  for (int i = 0; i < 2; i++) {
+    for (int j = 0; j < 9; j++)
+      counterTEC[i][j] = 0;
   }
 
+  std::vector<uint32_t>::const_iterator idet = activeDetIds.begin();
 
- 
-  std::vector<uint32_t>::const_iterator idet=activeDetIds.begin();
-
-  //fill arrays for counting and fill Histo_Map with value for connected : 
-  for(;idet!=activeDetIds.end();++idet){
+  // fill arrays for counting and fill Histo_Map with value for connected :
+  for (; idet != activeDetIds.end(); ++idet) {
     uint32_t detId = *idet;
     StripSubdetector subdet(detId);
 
-    if(HistoMaps_On_ ) {Tk_HM_->fill(detId, cablingHandle_->nApvPairs(detId)*2);}
-    if(fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")){
-
-    int32_t n_conn = 0;
-      for(uint32_t connDet_i=0; connDet_i<cablingHandle_->getConnections(detId).size(); connDet_i++){
-        if(cablingHandle_->getConnections(detId)[connDet_i]!=nullptr &&  cablingHandle_->getConnections(detId)[connDet_i]->isConnected()!=0) n_conn++;
+    if (HistoMaps_On_) {
+      Tk_HM_->fill(detId, cablingHandle_->nApvPairs(detId) * 2);
+    }
+    if (fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")) {
+      int32_t n_conn = 0;
+      for (uint32_t connDet_i = 0; connDet_i < cablingHandle_->getConnections(detId).size(); connDet_i++) {
+        if (cablingHandle_->getConnections(detId)[connDet_i] != nullptr &&
+            cablingHandle_->getConnections(detId)[connDet_i]->isConnected() != 0)
+          n_conn++;
       }
-      fillTkMap(detId,n_conn*2.); 
+      fillTkMap(detId, n_conn * 2.);
     }
-    switch (subdet.subdetId()) 
-      {
-      case StripSubdetector::TIB:
-	{
-          int i = tTopo->tibLayer(detId) - 1;
-	  counterTIB[i]++;
-	  break;       
-	}
-      case StripSubdetector::TID:
-	{
-          int j = tTopo->tidWheel(detId) - 1;
-          int side = tTopo->tidSide(detId);
-	  if (side == 2) {
-	    counterTID[0][j]++;
-	  } else if (side == 1) {
-	    counterTID[1][j]++;
-	  }
-	  break;       
-	}
-      case StripSubdetector::TOB:
-	{
-          int i = tTopo->tobLayer(detId) - 1;
-	  counterTOB[i]++;
-	  break;       
-	}
-      case StripSubdetector::TEC:
-	{
-          int j = tTopo->tecWheel(detId) - 1;
-          int side = tTopo->tecSide(detId);
-	  if (side == 2) {
-	    counterTEC[0][j]++;
-	  } else if (side == 1) {
-	    counterTEC[1][j]++;
-	  }
-	  break;       
-	}
+    switch (subdet.subdetId()) {
+      case StripSubdetector::TIB: {
+        int i = tTopo->tibLayer(detId) - 1;
+        counterTIB[i]++;
+        break;
       }
+      case StripSubdetector::TID: {
+        int j = tTopo->tidWheel(detId) - 1;
+        int side = tTopo->tidSide(detId);
+        if (side == 2) {
+          counterTID[0][j]++;
+        } else if (side == 1) {
+          counterTID[1][j]++;
+        }
+        break;
+      }
+      case StripSubdetector::TOB: {
+        int i = tTopo->tobLayer(detId) - 1;
+        counterTOB[i]++;
+        break;
+      }
+      case StripSubdetector::TEC: {
+        int j = tTopo->tecWheel(detId) - 1;
+        int side = tTopo->tecSide(detId);
+        if (side == 2) {
+          counterTEC[0][j]++;
+        } else if (side == 1) {
+          counterTEC[1][j]++;
+        }
+        break;
+      }
+    }
 
-  } // idet
-
-  //obtained from tracker.dat and hard-coded
-  int TIBDetIds[4]={672,864,540,648};
-  int TIDDetIds[2][3]={{136,136,136},{136,136,136}};
-  int TOBDetIds[6]={1008,1152,648,720,792,888};
-  int TECDetIds[2][9]={{408,408,408,360,360,360,312,312,272},{408,408,408,360,360,360,312,312,272}};
-
+  }  // idet
 
+  // obtained from tracker.dat and hard-coded
+  int TIBDetIds[4] = {672, 864, 540, 648};
+  int TIDDetIds[2][3] = {{136, 136, 136}, {136, 136, 136}};
+  int TOBDetIds[6] = {1008, 1152, 648, 720, 792, 888};
+  int TECDetIds[2][9] = {{408, 408, 408, 360, 360, 360, 312, 312, 272}, {408, 408, 408, 360, 360, 360, 312, 312, 272}};
 
-  DQMStore* dqmStore_=edm::Service<DQMStore>().operator->();
+  DQMStore *dqmStore_ = edm::Service<DQMStore>().operator->();
 
-  std::string FolderName=fPSet_.getParameter<std::string>("FolderName_For_QualityAndCabling_SummaryHistos");
+  std::string FolderName = fPSet_.getParameter<std::string>("FolderName_For_QualityAndCabling_SummaryHistos");
 
   dqmStore_->setCurrentFolder(FolderName);
 
   //  dqmStore_->cd("SiStrip/MechanicalView/");
   MonitorElement *ME;
-  ME = dqmStore_->book2D("SummaryOfCabling","SummaryOfCabling",6,0.5,6.5,9,0.5,9.5);
-  ME->setAxisTitle("Sub Det",1);
-  ME->setAxisTitle("Layer",2);
-
-
-  ME->getTH1()->GetXaxis()->SetBinLabel(1,"TIB");
-  ME->getTH1()->GetXaxis()->SetBinLabel(2,"TID F");
-  ME->getTH1()->GetXaxis()->SetBinLabel(3,"TID B");
-  ME->getTH1()->GetXaxis()->SetBinLabel(4,"TOB");
-  ME->getTH1()->GetXaxis()->SetBinLabel(5,"TEC F");
-  ME->getTH1()->GetXaxis()->SetBinLabel(6,"TEC B");
-
-  for(int i=0;i<4;i++){
-    ME->Fill(1,i+1,float(counterTIB[i])/TIBDetIds[i]);
+  ME = dqmStore_->book2D("SummaryOfCabling", "SummaryOfCabling", 6, 0.5, 6.5, 9, 0.5, 9.5);
+  ME->setAxisTitle("Sub Det", 1);
+  ME->setAxisTitle("Layer", 2);
+
+  ME->getTH1()->GetXaxis()->SetBinLabel(1, "TIB");
+  ME->getTH1()->GetXaxis()->SetBinLabel(2, "TID F");
+  ME->getTH1()->GetXaxis()->SetBinLabel(3, "TID B");
+  ME->getTH1()->GetXaxis()->SetBinLabel(4, "TOB");
+  ME->getTH1()->GetXaxis()->SetBinLabel(5, "TEC F");
+  ME->getTH1()->GetXaxis()->SetBinLabel(6, "TEC B");
+
+  for (int i = 0; i < 4; i++) {
+    ME->Fill(1, i + 1, float(counterTIB[i]) / TIBDetIds[i]);
   }
-  
-  for(int i=0;i<2;i++){
-    for(int j=0;j<3;j++){
-      ME->Fill(i+2,j+1,float(counterTID[i][j])/TIDDetIds[i][j]);
+
+  for (int i = 0; i < 2; i++) {
+    for (int j = 0; j < 3; j++) {
+      ME->Fill(i + 2, j + 1, float(counterTID[i][j]) / TIDDetIds[i][j]);
     }
   }
 
-  for(int i=0;i<6;i++){
-    ME->Fill(4,i+1,float(counterTOB[i])/TOBDetIds[i]);
+  for (int i = 0; i < 6; i++) {
+    ME->Fill(4, i + 1, float(counterTOB[i]) / TOBDetIds[i]);
   }
-  
-  for(int i=0;i<2;i++){
-    for(int j=0;j<9;j++){
-      ME->Fill(i+5,j+1,float(counterTEC[i][j])/TECDetIds[i][j]);
+
+  for (int i = 0; i < 2; i++) {
+    for (int j = 0; j < 9; j++) {
+      ME->Fill(i + 5, j + 1, float(counterTEC[i][j]) / TECDetIds[i][j]);
     }
   }
 
-  if (fPSet_.getParameter<bool>("OutputSummaryAtLayerLevelAsImage")){
-
+  if (fPSet_.getParameter<bool>("OutputSummaryAtLayerLevelAsImage")) {
     TCanvas c1("c1");
     ME->getTH1()->Draw("TEXT");
     ME->getTH1()->SetStats(kFALSE);
-    std::string name (ME->getTH1()->GetTitle());
-    name+=".png";
+    std::string name(ME->getTH1()->GetTitle());
+    name += ".png";
     c1.Print(name.c_str());
   }
-
 }
-
-
diff --git a/DQM/SiStripMonitorSummary/src/SiStripClassToMonitorCondData.cc b/DQM/SiStripMonitorSummary/src/SiStripClassToMonitorCondData.cc
index e880b2d5f6332..8ae3c86a0ee29 100644
--- a/DQM/SiStripMonitorSummary/src/SiStripClassToMonitorCondData.cc
+++ b/DQM/SiStripMonitorSummary/src/SiStripClassToMonitorCondData.cc
@@ -2,47 +2,45 @@
 //
 // Package:     SiStripMonitorSummary
 // Class  :     SiStripClassToMonitorCondData
-// 
+//
 // Original Author:  Evelyne Delmeire
 //
 
-
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DataFormats/Common/interface/Handle.h"
 
+#include "DQM/SiStripCommon/interface/ExtractTObject.h"
 #include "DQM/SiStripCommon/interface/SiStripFolderOrganizer.h"
 #include "DQM/SiStripCommon/interface/SiStripHistoId.h"
-#include "DQM/SiStripCommon/interface/ExtractTObject.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-
 #include "DQM/SiStripMonitorSummary/interface/SiStripClassToMonitorCondData.h"
 
-#include "DQM/SiStripMonitorSummary/interface/SiStripPedestalsDQM.h" 
-#include "DQM/SiStripMonitorSummary/interface/SiStripNoisesDQM.h" 
-#include "DQM/SiStripMonitorSummary/interface/SiStripQualityDQM.h" 
-#include "DQM/SiStripMonitorSummary/interface/SiStripApvGainsDQM.h" 
-#include "DQM/SiStripMonitorSummary/interface/SiStripLorentzAngleDQM.h" 
-#include "DQM/SiStripMonitorSummary/interface/SiStripBackPlaneCorrectionDQM.h" 
+#include "DQM/SiStripMonitorSummary/interface/SiStripApvGainsDQM.h"
+#include "DQM/SiStripMonitorSummary/interface/SiStripBackPlaneCorrectionDQM.h"
 #include "DQM/SiStripMonitorSummary/interface/SiStripCablingDQM.h"
+#include "DQM/SiStripMonitorSummary/interface/SiStripLorentzAngleDQM.h"
+#include "DQM/SiStripMonitorSummary/interface/SiStripNoisesDQM.h"
+#include "DQM/SiStripMonitorSummary/interface/SiStripPedestalsDQM.h"
+#include "DQM/SiStripMonitorSummary/interface/SiStripQualityDQM.h"
 #include "DQM/SiStripMonitorSummary/interface/SiStripThresholdDQM.h"
 
-#include "CondFormats/SiStripObjects/interface/SiStripPedestals.h"
-#include "CondFormats/SiStripObjects/interface/SiStripNoises.h"
 #include "CondFormats/SiStripObjects/interface/SiStripApvGain.h"
-#include "CondFormats/SiStripObjects/interface/SiStripLorentzAngle.h"
 #include "CondFormats/SiStripObjects/interface/SiStripBackPlaneCorrection.h"
+#include "CondFormats/SiStripObjects/interface/SiStripLorentzAngle.h"
+#include "CondFormats/SiStripObjects/interface/SiStripNoises.h"
+#include "CondFormats/SiStripObjects/interface/SiStripPedestals.h"
 
-#include "CondFormats/DataRecord/interface/SiStripPedestalsRcd.h"
 #include "CondFormats/DataRecord/interface/SiStripApvGainRcd.h"
 #include "CondFormats/DataRecord/interface/SiStripNoisesRcd.h"
+#include "CondFormats/DataRecord/interface/SiStripPedestalsRcd.h"
 
 #include "CalibFormats/SiStripObjects/interface/SiStripQuality.h"
 #include "CalibTracker/Records/interface/SiStripQualityRcd.h"
@@ -58,210 +56,257 @@
 //#include <numeric>
 #include <algorithm>
 
-
 //
 // ----- Constructor
 //
-SiStripClassToMonitorCondData::SiStripClassToMonitorCondData(edm::ParameterSet const& iConfig):conf_(iConfig){
-  
-  monitorPedestals_      = iConfig.getParameter<bool>("MonitorSiStripPedestal");
-  monitorNoises_         = iConfig.getParameter<bool>("MonitorSiStripNoise");
-  monitorQuality_        = iConfig.getParameter<bool>("MonitorSiStripQuality");
-  monitorApvGains_       = iConfig.getParameter<bool>("MonitorSiStripApvGain");
-  monitorLorentzAngle_   = iConfig.getParameter<bool>("MonitorSiStripLorentzAngle");
-  monitorBackPlaneCorrection_   = iConfig.getParameter<bool>("MonitorSiStripBackPlaneCorrection");
-  monitorLowThreshold_   = iConfig.getParameter<bool>("MonitorSiStripLowThreshold");
-  monitorHighThreshold_  = iConfig.getParameter<bool>("MonitorSiStripHighThreshold");
-  monitorCabling_        = iConfig.getParameter<bool>("MonitorSiStripCabling"); 
-   
+SiStripClassToMonitorCondData::SiStripClassToMonitorCondData(edm::ParameterSet const &iConfig) : conf_(iConfig) {
+  monitorPedestals_ = iConfig.getParameter<bool>("MonitorSiStripPedestal");
+  monitorNoises_ = iConfig.getParameter<bool>("MonitorSiStripNoise");
+  monitorQuality_ = iConfig.getParameter<bool>("MonitorSiStripQuality");
+  monitorApvGains_ = iConfig.getParameter<bool>("MonitorSiStripApvGain");
+  monitorLorentzAngle_ = iConfig.getParameter<bool>("MonitorSiStripLorentzAngle");
+  monitorBackPlaneCorrection_ = iConfig.getParameter<bool>("MonitorSiStripBackPlaneCorrection");
+  monitorLowThreshold_ = iConfig.getParameter<bool>("MonitorSiStripLowThreshold");
+  monitorHighThreshold_ = iConfig.getParameter<bool>("MonitorSiStripHighThreshold");
+  monitorCabling_ = iConfig.getParameter<bool>("MonitorSiStripCabling");
 }
 // -----
 
-
-
 //
 // ----- Destructor
-// 
-SiStripClassToMonitorCondData::~SiStripClassToMonitorCondData(){
-  
-  if(monitorPedestals_)    { delete pedestalsDQM_;}
-  if(monitorNoises_)       { delete noisesDQM_;   }
-  if(monitorQuality_)      { delete qualityDQM_;  }
-  if(monitorApvGains_)     { delete apvgainsDQM_; }
-  if(monitorLorentzAngle_) { delete lorentzangleDQM_; }
-  if(monitorBackPlaneCorrection_) { delete bpcorrectionDQM_; }
-  if(monitorLowThreshold_) { delete lowthresholdDQM_ ;}
-  if(monitorHighThreshold_){ delete highthresholdDQM_;}
-  if(monitorCabling_)      { delete cablingDQM_;}
-
+//
+SiStripClassToMonitorCondData::~SiStripClassToMonitorCondData() {
+  if (monitorPedestals_) {
+    delete pedestalsDQM_;
+  }
+  if (monitorNoises_) {
+    delete noisesDQM_;
+  }
+  if (monitorQuality_) {
+    delete qualityDQM_;
+  }
+  if (monitorApvGains_) {
+    delete apvgainsDQM_;
+  }
+  if (monitorLorentzAngle_) {
+    delete lorentzangleDQM_;
+  }
+  if (monitorBackPlaneCorrection_) {
+    delete bpcorrectionDQM_;
+  }
+  if (monitorLowThreshold_) {
+    delete lowthresholdDQM_;
+  }
+  if (monitorHighThreshold_) {
+    delete highthresholdDQM_;
+  }
+  if (monitorCabling_) {
+    delete cablingDQM_;
+  }
 }
 // -----
 
-
-
-
 //
 // ----- beginRun
-//    
-void SiStripClassToMonitorCondData::beginRun(edm::RunNumber_t iRun, edm::EventSetup const& eSetup) {
-  
-  if(monitorPedestals_){
+//
+void SiStripClassToMonitorCondData::beginRun(edm::RunNumber_t iRun, edm::EventSetup const &eSetup) {
+  if (monitorPedestals_) {
     pedestalsDQM_ = new SiStripPedestalsDQM(eSetup,
                                             iRun,
                                             conf_.getParameter<edm::ParameterSet>("SiStripPedestalsDQM_PSet"),
                                             conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
   }
-  
-  
-  if(monitorNoises_){
+
+  if (monitorNoises_) {
     noisesDQM_ = new SiStripNoisesDQM(eSetup,
                                       iRun,
                                       conf_.getParameter<edm::ParameterSet>("SiStripNoisesDQM_PSet"),
                                       conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
   }
- 
-  
-  if(monitorQuality_){
+
+  if (monitorQuality_) {
     qualityDQM_ = new SiStripQualityDQM(eSetup,
                                         iRun,
                                         conf_.getParameter<edm::ParameterSet>("SiStripQualityDQM_PSet"),
                                         conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
-  } 
-  
- 
-  if(monitorApvGains_){
+  }
+
+  if (monitorApvGains_) {
     apvgainsDQM_ = new SiStripApvGainsDQM(eSetup,
                                           iRun,
                                           conf_.getParameter<edm::ParameterSet>("SiStripApvGainsDQM_PSet"),
                                           conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
   }
-  
-  if(monitorLorentzAngle_){
+
+  if (monitorLorentzAngle_) {
     lorentzangleDQM_ = new SiStripLorentzAngleDQM(eSetup,
                                                   iRun,
                                                   conf_.getParameter<edm::ParameterSet>("SiStripLorentzAngleDQM_PSet"),
                                                   conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
   }
 
-  if(monitorBackPlaneCorrection_){
-    bpcorrectionDQM_ = new SiStripBackPlaneCorrectionDQM(eSetup,
-                                                         iRun,
-                                                  conf_.getParameter<edm::ParameterSet>("SiStripBackPlaneCorrectionDQM_PSet"),
-                                                  conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
+  if (monitorBackPlaneCorrection_) {
+    bpcorrectionDQM_ =
+        new SiStripBackPlaneCorrectionDQM(eSetup,
+                                          iRun,
+                                          conf_.getParameter<edm::ParameterSet>("SiStripBackPlaneCorrectionDQM_PSet"),
+                                          conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
   }
-  
-  if(monitorLowThreshold_){
+
+  if (monitorLowThreshold_) {
     lowthresholdDQM_ = new SiStripThresholdDQM(eSetup,
                                                iRun,
                                                conf_.getParameter<edm::ParameterSet>("SiStripLowThresholdDQM_PSet"),
                                                conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
   }
 
-  if(monitorHighThreshold_){
+  if (monitorHighThreshold_) {
     highthresholdDQM_ = new SiStripThresholdDQM(eSetup,
                                                 iRun,
                                                 conf_.getParameter<edm::ParameterSet>("SiStripHighThresholdDQM_PSet"),
                                                 conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
   }
 
-  if(monitorCabling_){
+  if (monitorCabling_) {
     cablingDQM_ = new SiStripCablingDQM(eSetup,
                                         iRun,
                                         conf_.getParameter<edm::ParameterSet>("SiStripCablingDQM_PSet"),
                                         conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
   }
-} // beginRun
+}  // beginRun
 // -----
 
-
-
 //
 // ----- beginJob
 //
-void SiStripClassToMonitorCondData::beginJob(void){} //beginJob
-
+void SiStripClassToMonitorCondData::beginJob(void) {}  // beginJob
 
 //
 // ----- getModuleMEsOnDemand
 //
-void SiStripClassToMonitorCondData::getModMEsOnDemand(edm::EventSetup const& eSetup, uint32_t requestedDetId){
-
-  if(monitorPedestals_)      { pedestalsDQM_     ->analysisOnDemand(eSetup,requestedDetId);}
-  if(monitorNoises_)         { noisesDQM_        ->analysisOnDemand(eSetup,requestedDetId);}    
-  if(monitorQuality_)        { qualityDQM_       ->analysisOnDemand(eSetup,requestedDetId);
-                              qualityDQM_       ->fillGrandSummaryMEs(eSetup)                  ;}//fillGrand. for SiStripquality
-  if(monitorApvGains_)       { apvgainsDQM_      ->analysisOnDemand(eSetup,requestedDetId);} 
-  if(monitorLorentzAngle_)   { lorentzangleDQM_  ->analysisOnDemand(eSetup,requestedDetId);} 
-  if(monitorBackPlaneCorrection_)   { bpcorrectionDQM_  ->analysisOnDemand(eSetup,requestedDetId);} 
-  if(monitorCabling_)        { cablingDQM_       ->analysisOnDemand(eSetup,requestedDetId);}   
-  if(monitorLowThreshold_)   { lowthresholdDQM_  ->analysisOnDemand(eSetup,requestedDetId);}
-  if(monitorHighThreshold_)  { highthresholdDQM_ ->analysisOnDemand(eSetup,requestedDetId);}
+void SiStripClassToMonitorCondData::getModMEsOnDemand(edm::EventSetup const &eSetup, uint32_t requestedDetId) {
+  if (monitorPedestals_) {
+    pedestalsDQM_->analysisOnDemand(eSetup, requestedDetId);
+  }
+  if (monitorNoises_) {
+    noisesDQM_->analysisOnDemand(eSetup, requestedDetId);
+  }
+  if (monitorQuality_) {
+    qualityDQM_->analysisOnDemand(eSetup, requestedDetId);
+    qualityDQM_->fillGrandSummaryMEs(eSetup);
+  }  // fillGrand. for SiStripquality
+  if (monitorApvGains_) {
+    apvgainsDQM_->analysisOnDemand(eSetup, requestedDetId);
+  }
+  if (monitorLorentzAngle_) {
+    lorentzangleDQM_->analysisOnDemand(eSetup, requestedDetId);
+  }
+  if (monitorBackPlaneCorrection_) {
+    bpcorrectionDQM_->analysisOnDemand(eSetup, requestedDetId);
+  }
+  if (monitorCabling_) {
+    cablingDQM_->analysisOnDemand(eSetup, requestedDetId);
+  }
+  if (monitorLowThreshold_) {
+    lowthresholdDQM_->analysisOnDemand(eSetup, requestedDetId);
+  }
+  if (monitorHighThreshold_) {
+    highthresholdDQM_->analysisOnDemand(eSetup, requestedDetId);
+  }
 }
 // -----
 
 //
 // ----- getlayerMEsOnDemand
 //
-void SiStripClassToMonitorCondData::getLayerMEsOnDemand(edm::EventSetup const& eSetup, std::string requestedSubDetector, 
-                                                        uint32_t requestedSide, 
-							uint32_t requestedLayer){
- 
-  if(monitorPedestals_)      { pedestalsDQM_     ->analysisOnDemand(eSetup,requestedSubDetector, requestedSide,requestedLayer);}
-  if(monitorNoises_)         { noisesDQM_        ->analysisOnDemand(eSetup,requestedSubDetector, requestedSide,requestedLayer);}    
-  if(monitorQuality_)        { qualityDQM_       ->analysisOnDemand(eSetup,requestedSubDetector, requestedSide,requestedLayer);
-  qualityDQM_       ->fillGrandSummaryMEs(eSetup);}
-  if(monitorApvGains_)       { apvgainsDQM_      ->analysisOnDemand(eSetup,requestedSubDetector, requestedSide,requestedLayer);} 
-  if(monitorLorentzAngle_)   { lorentzangleDQM_  ->analysisOnDemand(eSetup,requestedSubDetector, requestedSide,requestedLayer);} 
-  if(monitorBackPlaneCorrection_)   { bpcorrectionDQM_  ->analysisOnDemand(eSetup,requestedSubDetector, requestedSide,requestedLayer);} 
-  if(monitorCabling_)        { cablingDQM_       ->analysisOnDemand(eSetup,requestedSubDetector, requestedSide,requestedLayer);}
-  if(monitorLowThreshold_)   { lowthresholdDQM_  ->analysisOnDemand(eSetup,requestedSubDetector, requestedSide,requestedLayer);}
-  if(monitorHighThreshold_)  { highthresholdDQM_ ->analysisOnDemand(eSetup,requestedSubDetector, requestedSide,requestedLayer);}
-  
+void SiStripClassToMonitorCondData::getLayerMEsOnDemand(edm::EventSetup const &eSetup,
+                                                        std::string requestedSubDetector,
+                                                        uint32_t requestedSide,
+                                                        uint32_t requestedLayer) {
+  if (monitorPedestals_) {
+    pedestalsDQM_->analysisOnDemand(eSetup, requestedSubDetector, requestedSide, requestedLayer);
+  }
+  if (monitorNoises_) {
+    noisesDQM_->analysisOnDemand(eSetup, requestedSubDetector, requestedSide, requestedLayer);
+  }
+  if (monitorQuality_) {
+    qualityDQM_->analysisOnDemand(eSetup, requestedSubDetector, requestedSide, requestedLayer);
+    qualityDQM_->fillGrandSummaryMEs(eSetup);
+  }
+  if (monitorApvGains_) {
+    apvgainsDQM_->analysisOnDemand(eSetup, requestedSubDetector, requestedSide, requestedLayer);
+  }
+  if (monitorLorentzAngle_) {
+    lorentzangleDQM_->analysisOnDemand(eSetup, requestedSubDetector, requestedSide, requestedLayer);
+  }
+  if (monitorBackPlaneCorrection_) {
+    bpcorrectionDQM_->analysisOnDemand(eSetup, requestedSubDetector, requestedSide, requestedLayer);
+  }
+  if (monitorCabling_) {
+    cablingDQM_->analysisOnDemand(eSetup, requestedSubDetector, requestedSide, requestedLayer);
+  }
+  if (monitorLowThreshold_) {
+    lowthresholdDQM_->analysisOnDemand(eSetup, requestedSubDetector, requestedSide, requestedLayer);
+  }
+  if (monitorHighThreshold_) {
+    highthresholdDQM_->analysisOnDemand(eSetup, requestedSubDetector, requestedSide, requestedLayer);
+  }
 }
 
 //
 // ----- Analyze
 //
-void SiStripClassToMonitorCondData::analyseCondData(edm::EventSetup const& eSetup){
+void SiStripClassToMonitorCondData::analyseCondData(edm::EventSetup const &eSetup) {
+  if (monitorPedestals_) {
+    pedestalsDQM_->analysis(eSetup);
+  }
+  if (monitorNoises_) {
+    noisesDQM_->analysis(eSetup);
+  }
+  if (monitorQuality_) {
+    qualityDQM_->analysis(eSetup);
+    qualityDQM_->fillGrandSummaryMEs(eSetup);
+  }  // fillGrand. for SiStripquality
+  if (monitorApvGains_) {
+    apvgainsDQM_->analysis(eSetup);
+  }
+  if (monitorLorentzAngle_) {
+    lorentzangleDQM_->analysis(eSetup);
+  }
+  if (monitorBackPlaneCorrection_) {
+    bpcorrectionDQM_->analysis(eSetup);
+  }
+  if (monitorCabling_) {
+    cablingDQM_->analysis(eSetup);
+  }
+  if (monitorLowThreshold_) {
+    lowthresholdDQM_->analysis(eSetup);
+  }
+  if (monitorHighThreshold_) {
+    highthresholdDQM_->analysis(eSetup);
+  }
 
-  if(monitorPedestals_)      { pedestalsDQM_     ->analysis(eSetup);}
-  if(monitorNoises_)         { noisesDQM_        ->analysis(eSetup);}    
-  if(monitorQuality_)        { qualityDQM_       ->analysis(eSetup); qualityDQM_->fillGrandSummaryMEs(eSetup);}//fillGrand. for SiStripquality
-  if(monitorApvGains_)       { apvgainsDQM_      ->analysis(eSetup);} 
-  if(monitorLorentzAngle_)   { lorentzangleDQM_  ->analysis(eSetup);} 
-  if(monitorBackPlaneCorrection_)   { bpcorrectionDQM_  ->analysis(eSetup);} 
-  if(monitorCabling_)        { cablingDQM_       ->analysis(eSetup);}   
-  if(monitorLowThreshold_)   { lowthresholdDQM_  ->analysis(eSetup);} 
-  if(monitorHighThreshold_)  { highthresholdDQM_ ->analysis(eSetup);} 
-   
-} // analyze
+}  // analyze
 // -----
 
-
-
 //
 // ----- endRun
-//    
-void SiStripClassToMonitorCondData::endRun(edm::EventSetup const& eSetup) {
-  
-  bool outputMEsInRootFile     = conf_.getParameter<bool>("OutputMEsInRootFile");
-  std::string outputFileName  = conf_.getParameter<std::string>("OutputFileName");
+//
+void SiStripClassToMonitorCondData::endRun(edm::EventSetup const &eSetup) {
+  bool outputMEsInRootFile = conf_.getParameter<bool>("OutputMEsInRootFile");
+  std::string outputFileName = conf_.getParameter<std::string>("OutputFileName");
+
+  DQMStore *dqmStore_ = edm::Service<DQMStore>().operator->();
 
-  DQMStore* dqmStore_=edm::Service<DQMStore>().operator->();
-  
-  if (outputMEsInRootFile) { 
+  if (outputMEsInRootFile) {
     dqmStore_->showDirStructure();
     dqmStore_->save(outputFileName);
-  } 
- 
-} // endRun
-// -----
+  }
 
+}  // endRun
+// -----
 
 //
 // ----- endJob
 //
-void SiStripClassToMonitorCondData::endJob(void){} //endJob
-
-
-  
+void SiStripClassToMonitorCondData::endJob(void) {}  // endJob
diff --git a/DQM/SiStripMonitorSummary/src/SiStripLorentzAngleDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripLorentzAngleDQM.cc
index 21c41ee7fd4fd..ce41843adf1db 100644
--- a/DQM/SiStripMonitorSummary/src/SiStripLorentzAngleDQM.cc
+++ b/DQM/SiStripMonitorSummary/src/SiStripLorentzAngleDQM.cc
@@ -1,285 +1,276 @@
 #include "DQM/SiStripMonitorSummary/interface/SiStripLorentzAngleDQM.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "TCanvas.h"
 
 // -----
-SiStripLorentzAngleDQM::SiStripLorentzAngleDQM(const edm::EventSetup & eSetup,
+SiStripLorentzAngleDQM::SiStripLorentzAngleDQM(const edm::EventSetup &eSetup,
                                                edm::RunNumber_t iRun,
-					       edm::ParameterSet const& hPSet,
-					       edm::ParameterSet const& fPSet):SiStripBaseCondObjDQM(eSetup, iRun, hPSet, fPSet){
-
+                                               edm::ParameterSet const &hPSet,
+                                               edm::ParameterSet const &fPSet)
+    : SiStripBaseCondObjDQM(eSetup, iRun, hPSet, fPSet) {
   // Build the Histo_TkMap:
-  if ( HistoMaps_On_ ) {
+  if (HistoMaps_On_) {
     edm::ESHandle<TkDetMap> tkDetMapHandle;
     eSetup.get<TrackerTopologyRcd>().get(tkDetMapHandle);
-    Tk_HM_ = std::make_unique<TkHistoMap>(tkDetMapHandle.product(), "SiStrip/Histo_Map","LA_TkMap",0.);
+    Tk_HM_ = std::make_unique<TkHistoMap>(tkDetMapHandle.product(), "SiStrip/Histo_Map", "LA_TkMap", 0.);
   }
 }
 // -----
 
-
-
 // -----
-SiStripLorentzAngleDQM::~SiStripLorentzAngleDQM(){}
+SiStripLorentzAngleDQM::~SiStripLorentzAngleDQM() {}
 // -----
 
-
 // -----
-void SiStripLorentzAngleDQM::getActiveDetIds(const edm::EventSetup & eSetup){
-  
+void SiStripLorentzAngleDQM::getActiveDetIds(const edm::EventSetup &eSetup) {
   getConditionObject(eSetup);
 
-  std::map<uint32_t,float>::const_iterator LAMapIter_;
-  std::map<uint32_t,float> LAMap_ = lorentzangleHandle_->getLorentzAngles();
-
-  for( LAMapIter_ = LAMap_.begin();
-       LAMapIter_!= LAMap_.end(); LAMapIter_++){
+  std::map<uint32_t, float>::const_iterator LAMapIter_;
+  std::map<uint32_t, float> LAMap_ = lorentzangleHandle_->getLorentzAngles();
 
+  for (LAMapIter_ = LAMap_.begin(); LAMapIter_ != LAMap_.end(); LAMapIter_++) {
     activeDetIds.push_back((*LAMapIter_).first);
   }
-
 }
 // -----
 
-
 // -----
-void SiStripLorentzAngleDQM::fillSummaryMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es){
-
-  //Retrieve tracker topology from geometry
+void SiStripLorentzAngleDQM::fillSummaryMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   es.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
   // -----
-  // LA on layer-level : fill at once all detIds belonging to same layer when encountering first detID in the layer 
+  // LA on layer-level : fill at once all detIds belonging to same layer when
+  // encountering first detID in the layer
 
-  bool fillNext = true; 
-  for(unsigned int i=0;i<selectedDetIds.size();i++){					    
+  bool fillNext = true;
+  for (unsigned int i = 0; i < selectedDetIds.size(); i++) {
     int subDetId_ = DetId(selectedDetIds[i]).subdetId();
-    if( subDetId_<3 ||subDetId_>6 ){ 
+    if (subDetId_ < 3 || subDetId_ > 6) {
       edm::LogError("SiStripLorentzAngle")
-	<< "[SiStripLorentzAngle::fillSummaryMEs] WRONG INPUT : no such subdetector type : "
-	<< subDetId_ << " and detId " << selectedDetIds[i] << " therefore no filling!" 
-	<< std::endl;
-    }    
-    else if (SummaryOnLayerLevel_On_) {    
-      if( fillNext) { fillMEsForLayer(/*SummaryMEsMap_,*/ selectedDetIds[i],tTopo);} 
-      if( getLayerNameAndId(selectedDetIds[i+1],tTopo)==getLayerNameAndId(selectedDetIds[i],tTopo)){ fillNext=false;}
-      else { fillNext=true;}
-    } 
-    else if (SummaryOnStringLevel_On_) {
-      if( fillNext) { fillMEsForLayer(/*SummaryMEsMap_,*/ selectedDetIds[i],tTopo);} 
-      if( getStringNameAndId(selectedDetIds[i+1],tTopo)==getStringNameAndId(selectedDetIds[i],tTopo)){ fillNext=false;}
-      else { fillNext=true;}
-    } 
+          << "[SiStripLorentzAngle::fillSummaryMEs] WRONG INPUT : no such "
+             "subdetector type : "
+          << subDetId_ << " and detId " << selectedDetIds[i] << " therefore no filling!" << std::endl;
+    } else if (SummaryOnLayerLevel_On_) {
+      if (fillNext) {
+        fillMEsForLayer(/*SummaryMEsMap_,*/ selectedDetIds[i], tTopo);
+      }
+      if (getLayerNameAndId(selectedDetIds[i + 1], tTopo) == getLayerNameAndId(selectedDetIds[i], tTopo)) {
+        fillNext = false;
+      } else {
+        fillNext = true;
+      }
+    } else if (SummaryOnStringLevel_On_) {
+      if (fillNext) {
+        fillMEsForLayer(/*SummaryMEsMap_,*/ selectedDetIds[i], tTopo);
+      }
+      if (getStringNameAndId(selectedDetIds[i + 1], tTopo) == getStringNameAndId(selectedDetIds[i], tTopo)) {
+        fillNext = false;
+      } else {
+        fillNext = true;
+      }
+    }
   }
 
-  for (std::map<uint32_t, ModMEs>::iterator iter=SummaryMEsMap_.begin(); iter!=SummaryMEsMap_.end(); iter++){
-
+  for (std::map<uint32_t, ModMEs>::iterator iter = SummaryMEsMap_.begin(); iter != SummaryMEsMap_.end(); iter++) {
     ModMEs selME;
     selME = iter->second;
 
-    if(SummaryOnStringLevel_On_){
-
-      if (fPSet_.getParameter<bool>("OutputSummaryProfileAtLayerLevelAsImage")){
-
-	TCanvas c1("c1");
-	selME.SummaryOfProfileDistr->getTProfile()->Draw();
-	std::string name (selME.SummaryOfProfileDistr->getTProfile()->GetTitle());
-	name+=".png";
-	c1.Print(name.c_str());
+    if (SummaryOnStringLevel_On_) {
+      if (fPSet_.getParameter<bool>("OutputSummaryProfileAtLayerLevelAsImage")) {
+        TCanvas c1("c1");
+        selME.SummaryOfProfileDistr->getTProfile()->Draw();
+        std::string name(selME.SummaryOfProfileDistr->getTProfile()->GetTitle());
+        name += ".png";
+        c1.Print(name.c_str());
       }
 
-      if (fPSet_.getParameter<bool>("OutputCumulativeSummaryAtLayerLevelAsImage")){
-
-	TCanvas c2("c2");
-	selME.SummaryOfCumulDistr->getTH1()->Draw();
-	std::string name2 (selME.SummaryOfCumulDistr->getTH1()->GetTitle());
-	name2+=".png";
-	c2.Print(name2.c_str());
+      if (fPSet_.getParameter<bool>("OutputCumulativeSummaryAtLayerLevelAsImage")) {
+        TCanvas c2("c2");
+        selME.SummaryOfCumulDistr->getTH1()->Draw();
+        std::string name2(selME.SummaryOfCumulDistr->getTH1()->GetTitle());
+        name2 += ".png";
+        c2.Print(name2.c_str());
       }
 
-    }
-    else{
-      if(hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel") && fPSet_.getParameter<bool>("OutputSummaryProfileAtLayerLevelAsImage")){
-
-	TCanvas c1("c1");
-	selME.SummaryOfProfileDistr->getTProfile()->Draw();
-	std::string name (selME.SummaryOfProfileDistr->getTProfile()->GetTitle());
-	name+=".png";
-	c1.Print(name.c_str());
+    } else {
+      if (hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel") &&
+          fPSet_.getParameter<bool>("OutputSummaryProfileAtLayerLevelAsImage")) {
+        TCanvas c1("c1");
+        selME.SummaryOfProfileDistr->getTProfile()->Draw();
+        std::string name(selME.SummaryOfProfileDistr->getTProfile()->GetTitle());
+        name += ".png";
+        c1.Print(name.c_str());
       }
 
-      if(hPSet_.getParameter<bool>("FillCumulativeSummaryAtLayerLevel") && fPSet_.getParameter<bool>("OutputCumulativeSummaryAtLayerLevelAsImage")){
-
-	TCanvas c1("c1");
-	selME.SummaryOfCumulDistr->getTH1()->Draw();
-	std::string name (selME.SummaryOfCumulDistr->getTH1()->GetTitle());
-	name+=".png";
-	c1.Print(name.c_str());
+      if (hPSet_.getParameter<bool>("FillCumulativeSummaryAtLayerLevel") &&
+          fPSet_.getParameter<bool>("OutputCumulativeSummaryAtLayerLevelAsImage")) {
+        TCanvas c1("c1");
+        selME.SummaryOfCumulDistr->getTH1()->Draw();
+        std::string name(selME.SummaryOfCumulDistr->getTH1()->GetTitle());
+        name += ".png";
+        c1.Print(name.c_str());
       }
     }
-
   }
-
 }
 // -----
 
-
-
 // -----
-void SiStripLorentzAngleDQM::fillMEsForLayer( /*std::map<uint32_t, ModMEs> selMEsMap_,*/ uint32_t selDetId_, const TrackerTopology* tTopo){
-
+void SiStripLorentzAngleDQM::fillMEsForLayer(
+    /*std::map<uint32_t, ModMEs> selMEsMap_,*/ uint32_t selDetId_, const TrackerTopology *tTopo) {
   SiStripHistoId hidmanager;
 
-      
   std::string hSummaryOfProfile_description;
-  hSummaryOfProfile_description  = hPSet_.getParameter<std::string>("SummaryOfProfile_description");
+  hSummaryOfProfile_description = hPSet_.getParameter<std::string>("SummaryOfProfile_description");
 
-  std::string hSummary_name; 
+  std::string hSummary_name;
 
   int subDetId_ = DetId(selDetId_).subdetId();
-  
-  if( subDetId_<3 || subDetId_>6 ){ 
-    edm::LogError("SiStripLorentzAngleDQM")
-      << "[SiStripLorentzAngleDQM::fillMEsForLayer] WRONG INPUT : no such subdetector type : "
-      << subDetId_ << " no folder set!" 
-      << std::endl;
+
+  if (subDetId_ < 3 || subDetId_ > 6) {
+    edm::LogError("SiStripLorentzAngleDQM") << "[SiStripLorentzAngleDQM::fillMEsForLayer] WRONG INPUT : no such "
+                                               "subdetector type : "
+                                            << subDetId_ << " no folder set!" << std::endl;
     return;
   }
 
   std::vector<uint32_t> sameLayerDetIds_;
   sameLayerDetIds_.clear();
 
-  if (SummaryOnStringLevel_On_) {  //FILLING FOR STRING LEVEL
+  if (SummaryOnStringLevel_On_) {  // FILLING FOR STRING LEVEL
+
+    hSummary_name = hidmanager.createHistoLayer(
+        hSummaryOfProfile_description, "layer", getStringNameAndId(selDetId_, tTopo).first, "");
+    std::map<uint32_t, ModMEs>::iterator selMEsMapIter_ =
+        SummaryMEsMap_.find(getStringNameAndId(selDetId_, tTopo).second);
 
-    hSummary_name = hidmanager.createHistoLayer(hSummaryOfProfile_description, "layer", getStringNameAndId(selDetId_,tTopo).first, "") ;
-    std::map<uint32_t, ModMEs>::iterator selMEsMapIter_ = SummaryMEsMap_.find(getStringNameAndId(selDetId_,tTopo).second);
-    
     ModMEs selME_;
-    if ( selMEsMapIter_ != SummaryMEsMap_.end())
-      selME_ =selMEsMapIter_->second;
+    if (selMEsMapIter_ != SummaryMEsMap_.end())
+      selME_ = selMEsMapIter_->second;
+
+    getSummaryMEs(selME_, selDetId_, tTopo);
 
-    getSummaryMEs(selME_,selDetId_,tTopo);
-  
-    // -----   					   
+    // -----
     sameLayerDetIds_.clear();
 
-    switch ( DetId(selDetId_).subdetId() ) {
+    switch (DetId(selDetId_).subdetId()) {
       case StripSubdetector::TIB:
-        if(tTopo->tibIsInternalString(selDetId_)){
-          SiStripSubStructure::getTIBDetectors(activeDetIds, sameLayerDetIds_, tTopo, tTopo->tibLayer(selDetId_),0,1,tTopo->tibString(selDetId_));
+        if (tTopo->tibIsInternalString(selDetId_)) {
+          SiStripSubStructure::getTIBDetectors(
+              activeDetIds, sameLayerDetIds_, tTopo, tTopo->tibLayer(selDetId_), 0, 1, tTopo->tibString(selDetId_));
         }
-        if(tTopo->tibIsExternalString(selDetId_)){
-          SiStripSubStructure::getTIBDetectors(activeDetIds, sameLayerDetIds_, tTopo, tTopo->tibLayer(selDetId_),0,2,tTopo->tibString(selDetId_));
+        if (tTopo->tibIsExternalString(selDetId_)) {
+          SiStripSubStructure::getTIBDetectors(
+              activeDetIds, sameLayerDetIds_, tTopo, tTopo->tibLayer(selDetId_), 0, 2, tTopo->tibString(selDetId_));
         }
         break;
       case StripSubdetector::TID:
-        SiStripSubStructure::getTIDDetectors(activeDetIds, sameLayerDetIds_, tTopo, 0,0,0,0);
+        SiStripSubStructure::getTIDDetectors(activeDetIds, sameLayerDetIds_, tTopo, 0, 0, 0, 0);
         break;
       case StripSubdetector::TOB:
-        SiStripSubStructure::getTOBDetectors(activeDetIds, sameLayerDetIds_, tTopo, tTopo->tobLayer(selDetId_),0,tTopo->tobRod(selDetId_));
+        SiStripSubStructure::getTOBDetectors(
+            activeDetIds, sameLayerDetIds_, tTopo, tTopo->tobLayer(selDetId_), 0, tTopo->tobRod(selDetId_));
         break;
       case StripSubdetector::TEC:
-        SiStripSubStructure::getTECDetectors(activeDetIds, sameLayerDetIds_, tTopo, 0,0,0,0,0,0);
+        SiStripSubStructure::getTECDetectors(activeDetIds, sameLayerDetIds_, tTopo, 0, 0, 0, 0, 0, 0);
         break;
     }
 
     // -----
 
-    for(unsigned int i=0;i< sameLayerDetIds_.size(); i++){
-	selME_.SummaryOfProfileDistr->Fill(i+1,lorentzangleHandle_->getLorentzAngle(sameLayerDetIds_[i]));
+    for (unsigned int i = 0; i < sameLayerDetIds_.size(); i++) {
+      selME_.SummaryOfProfileDistr->Fill(i + 1, lorentzangleHandle_->getLorentzAngle(sameLayerDetIds_[i]));
 
-	// Fill the Histo_TkMap+TkMap with the LA:
-        if(HistoMaps_On_ ) Tk_HM_->fill(sameLayerDetIds_[i], lorentzangleHandle_->getLorentzAngle(sameLayerDetIds_[i]));
+      // Fill the Histo_TkMap+TkMap with the LA:
+      if (HistoMaps_On_)
+        Tk_HM_->fill(sameLayerDetIds_[i], lorentzangleHandle_->getLorentzAngle(sameLayerDetIds_[i]));
 
-	  std::cout<<sameLayerDetIds_[i]<<"\t"<<lorentzangleHandle_->getLorentzAngle(sameLayerDetIds_[i])<<std::endl;
+      std::cout << sameLayerDetIds_[i] << "\t" << lorentzangleHandle_->getLorentzAngle(sameLayerDetIds_[i])
+                << std::endl;
+
+      if (fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")) {
+        fillTkMap(sameLayerDetIds_[i], lorentzangleHandle_->getLorentzAngle(sameLayerDetIds_[i]));
+      }
+    }
 
-	if(fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")){
-	  fillTkMap(sameLayerDetIds_[i], lorentzangleHandle_->getLorentzAngle(sameLayerDetIds_[i]));
-	}
-	
-    } 
-    
     std::string hSummaryOfCumul_description;
-    hSummaryOfCumul_description  = hPSet_.getParameter<std::string>("SummaryOfCumul_description");
-    
-    std::string hSummaryOfCumul_name; 
-    
-    if( subDetId_<3 || subDetId_>6 ){ 
-      edm::LogError("SiStripLorentzAngleDQM")
-	<< "[SiStripLorentzAngleDQM::fillMEsForLayer] WRONG INPUT : no such subdetector type : "
-	<< subDetId_ << " no folder set!" 
-	<< std::endl;
+    hSummaryOfCumul_description = hPSet_.getParameter<std::string>("SummaryOfCumul_description");
+
+    std::string hSummaryOfCumul_name;
+
+    if (subDetId_ < 3 || subDetId_ > 6) {
+      edm::LogError("SiStripLorentzAngleDQM") << "[SiStripLorentzAngleDQM::fillMEsForLayer] WRONG INPUT : no such "
+                                                 "subdetector type : "
+                                              << subDetId_ << " no folder set!" << std::endl;
       return;
     }
-    
-    hSummaryOfCumul_name = hidmanager.createHistoLayer(hSummaryOfCumul_description, "layer", getStringNameAndId(selDetId_,tTopo).first, "") ;
-    
-    for(unsigned int i=0;i< sameLayerDetIds_.size(); i++){
-	selME_.SummaryOfCumulDistr->Fill(lorentzangleHandle_->getLorentzAngle(sameLayerDetIds_[i]));
-    } 
-  } //FILLING FOR STRING LEVEL
-  
-  
-  else { //FILLING FOR LAYER LEVEL
-
-    std::map<uint32_t, ModMEs>::iterator selMEsMapIter_ = SummaryMEsMap_.find(getLayerNameAndId(selDetId_,tTopo).second);
-    
+
+    hSummaryOfCumul_name = hidmanager.createHistoLayer(
+        hSummaryOfCumul_description, "layer", getStringNameAndId(selDetId_, tTopo).first, "");
+
+    for (unsigned int i = 0; i < sameLayerDetIds_.size(); i++) {
+      selME_.SummaryOfCumulDistr->Fill(lorentzangleHandle_->getLorentzAngle(sameLayerDetIds_[i]));
+    }
+  }  // FILLING FOR STRING LEVEL
+
+  else {  // FILLING FOR LAYER LEVEL
+
+    std::map<uint32_t, ModMEs>::iterator selMEsMapIter_ =
+        SummaryMEsMap_.find(getLayerNameAndId(selDetId_, tTopo).second);
+
     ModMEs selME_;
-    if ( selMEsMapIter_ != SummaryMEsMap_.end())
-      selME_ =selMEsMapIter_->second;
-    
-    getSummaryMEs(selME_,selDetId_,tTopo);
-    
-    if(hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel")){
-
-      hSummary_name = hidmanager.createHistoLayer(hSummaryOfProfile_description, "layer", getLayerNameAndId(selDetId_,tTopo).first, "") ;    
-    
-      // -----   					   
-      sameLayerDetIds_.clear();
+    if (selMEsMapIter_ != SummaryMEsMap_.end())
+      selME_ = selMEsMapIter_->second;
 
-      sameLayerDetIds_=GetSameLayerDetId(activeDetIds,selDetId_,tTopo);     
+    getSummaryMEs(selME_, selDetId_, tTopo);
 
-      for(unsigned int i=0;i< sameLayerDetIds_.size(); i++){
-	  selME_.SummaryOfProfileDistr->Fill(i+1,lorentzangleHandle_->getLorentzAngle(sameLayerDetIds_[i]));
+    if (hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel")) {
+      hSummary_name = hidmanager.createHistoLayer(
+          hSummaryOfProfile_description, "layer", getLayerNameAndId(selDetId_, tTopo).first, "");
 
-	  // Fill the Histo_TkMap with LA:
-	  if(HistoMaps_On_ ) Tk_HM_->fill(sameLayerDetIds_[i], lorentzangleHandle_->getLorentzAngle(sameLayerDetIds_[i]));
+      // -----
+      sameLayerDetIds_.clear();
 
-	if(fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")){
-	  fillTkMap(sameLayerDetIds_[i], lorentzangleHandle_->getLorentzAngle(sameLayerDetIds_[i]));
+      sameLayerDetIds_ = GetSameLayerDetId(activeDetIds, selDetId_, tTopo);
 
-	}
+      for (unsigned int i = 0; i < sameLayerDetIds_.size(); i++) {
+        selME_.SummaryOfProfileDistr->Fill(i + 1, lorentzangleHandle_->getLorentzAngle(sameLayerDetIds_[i]));
 
-      } 
-    }//if Fill ...
+        // Fill the Histo_TkMap with LA:
+        if (HistoMaps_On_)
+          Tk_HM_->fill(sameLayerDetIds_[i], lorentzangleHandle_->getLorentzAngle(sameLayerDetIds_[i]));
 
-    if(hPSet_.getParameter<bool>("FillCumulativeSummaryAtLayerLevel")){
+        if (fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")) {
+          fillTkMap(sameLayerDetIds_[i], lorentzangleHandle_->getLorentzAngle(sameLayerDetIds_[i]));
+        }
+      }
+    }  // if Fill ...
 
+    if (hPSet_.getParameter<bool>("FillCumulativeSummaryAtLayerLevel")) {
       std::string hSummaryOfCumul_description;
-      hSummaryOfCumul_description  = hPSet_.getParameter<std::string>("SummaryOfCumul_description");
-    
-      std::string hSummaryOfCumul_name; 
-    
-      if( subDetId_<3 || subDetId_>6 ){ 
-	edm::LogError("SiStripLorentzAngleDQM")
-	  << "[SiStripLorentzAngleDQM::fillMEsForLayer] WRONG INPUT : no such subdetector type : "
-	  << subDetId_ << " no folder set!" 
-	  << std::endl;
-	return;
+      hSummaryOfCumul_description = hPSet_.getParameter<std::string>("SummaryOfCumul_description");
+
+      std::string hSummaryOfCumul_name;
+
+      if (subDetId_ < 3 || subDetId_ > 6) {
+        edm::LogError("SiStripLorentzAngleDQM") << "[SiStripLorentzAngleDQM::fillMEsForLayer] WRONG INPUT : no "
+                                                   "such subdetector type : "
+                                                << subDetId_ << " no folder set!" << std::endl;
+        return;
       }
-    
-      hSummaryOfCumul_name = hidmanager.createHistoLayer(hSummaryOfCumul_description, "layer", getLayerNameAndId(selDetId_,tTopo).first, "") ;
-    
-      for(unsigned int i=0;i< sameLayerDetIds_.size(); i++){
-	  selME_.SummaryOfCumulDistr->Fill(lorentzangleHandle_->getLorentzAngle(sameLayerDetIds_[i]));
+
+      hSummaryOfCumul_name = hidmanager.createHistoLayer(
+          hSummaryOfCumul_description, "layer", getLayerNameAndId(selDetId_, tTopo).first, "");
+
+      for (unsigned int i = 0; i < sameLayerDetIds_.size(); i++) {
+        selME_.SummaryOfCumulDistr->Fill(lorentzangleHandle_->getLorentzAngle(sameLayerDetIds_[i]));
       }
-    }//if Fill ... 
-  } //FILLING FOR LAYER LEVEL
-  
-}  
+    }  // if Fill ...
+  }    // FILLING FOR LAYER LEVEL
+}
 // -----
- 
diff --git a/DQM/SiStripMonitorSummary/src/SiStripMonitorCondData.cc b/DQM/SiStripMonitorSummary/src/SiStripMonitorCondData.cc
index 460334fcd8eb0..7c11475cc6d5e 100644
--- a/DQM/SiStripMonitorSummary/src/SiStripMonitorCondData.cc
+++ b/DQM/SiStripMonitorSummary/src/SiStripMonitorCondData.cc
@@ -2,220 +2,236 @@
 //
 // Package:     SiStripMonitorSummary
 // Class  :     SiStripMonitorCondData
-// 
+//
 // Original Author:  Evelyne Delmeire
 //
 
-
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DataFormats/Common/interface/Handle.h"
 
+#include "DQM/SiStripCommon/interface/ExtractTObject.h"
 #include "DQM/SiStripCommon/interface/SiStripFolderOrganizer.h"
 #include "DQM/SiStripCommon/interface/SiStripHistoId.h"
-#include "DQM/SiStripCommon/interface/ExtractTObject.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-
 #include "DQM/SiStripMonitorSummary/interface/SiStripMonitorCondData.h"
 
-#include "DQM/SiStripMonitorSummary/interface/SiStripPedestalsDQM.h" 
-#include "DQM/SiStripMonitorSummary/interface/SiStripNoisesDQM.h" 
-#include "DQM/SiStripMonitorSummary/interface/SiStripThresholdDQM.h" 
-#include "DQM/SiStripMonitorSummary/interface/SiStripQualityDQM.h" 
-#include "DQM/SiStripMonitorSummary/interface/SiStripApvGainsDQM.h" 
-#include "DQM/SiStripMonitorSummary/interface/SiStripLorentzAngleDQM.h"
+#include "DQM/SiStripMonitorSummary/interface/SiStripApvGainsDQM.h"
 #include "DQM/SiStripMonitorSummary/interface/SiStripBackPlaneCorrectionDQM.h"
 #include "DQM/SiStripMonitorSummary/interface/SiStripCablingDQM.h"
+#include "DQM/SiStripMonitorSummary/interface/SiStripLorentzAngleDQM.h"
+#include "DQM/SiStripMonitorSummary/interface/SiStripNoisesDQM.h"
+#include "DQM/SiStripMonitorSummary/interface/SiStripPedestalsDQM.h"
+#include "DQM/SiStripMonitorSummary/interface/SiStripQualityDQM.h"
+#include "DQM/SiStripMonitorSummary/interface/SiStripThresholdDQM.h"
 
 #include "TH1F.h"
 #include "TH2F.h"
 #include "TProfile.h"
 
 // std
-#include <cstdlib>
-#include <string>
+#include <algorithm>
 #include <cmath>
+#include <cstdlib>
 #include <numeric>
-#include <algorithm>
-
+#include <string>
 
 //
 // ----- Constructor
 //
-SiStripMonitorCondData::SiStripMonitorCondData(edm::ParameterSet const& iConfig):conf_(iConfig){
-  
-  monitorPedestals_      = iConfig.getParameter<bool>("MonitorSiStripPedestal");
-  monitorNoises_         = iConfig.getParameter<bool>("MonitorSiStripNoise");
-  monitorLowThreshold_   = iConfig.getParameter<bool>("MonitorSiStripLowThreshold");
-  monitorHighThreshold_  = iConfig.getParameter<bool>("MonitorSiStripHighThreshold");
-  monitorQuality_        = iConfig.getParameter<bool>("MonitorSiStripQuality");
-  monitorApvGains_       = iConfig.getParameter<bool>("MonitorSiStripApvGain");
-  monitorLorentzAngle_   = iConfig.getParameter<bool>("MonitorSiStripLorentzAngle");
-  monitorBackPlaneCorrection_   = iConfig.getParameter<bool>("MonitorSiStripBackPlaneCorrection");
-  monitorCabling_        = iConfig.getParameter<bool>("MonitorSiStripCabling");
-  
+SiStripMonitorCondData::SiStripMonitorCondData(edm::ParameterSet const &iConfig) : conf_(iConfig) {
+  monitorPedestals_ = iConfig.getParameter<bool>("MonitorSiStripPedestal");
+  monitorNoises_ = iConfig.getParameter<bool>("MonitorSiStripNoise");
+  monitorLowThreshold_ = iConfig.getParameter<bool>("MonitorSiStripLowThreshold");
+  monitorHighThreshold_ = iConfig.getParameter<bool>("MonitorSiStripHighThreshold");
+  monitorQuality_ = iConfig.getParameter<bool>("MonitorSiStripQuality");
+  monitorApvGains_ = iConfig.getParameter<bool>("MonitorSiStripApvGain");
+  monitorLorentzAngle_ = iConfig.getParameter<bool>("MonitorSiStripLorentzAngle");
+  monitorBackPlaneCorrection_ = iConfig.getParameter<bool>("MonitorSiStripBackPlaneCorrection");
+  monitorCabling_ = iConfig.getParameter<bool>("MonitorSiStripCabling");
 }
 // -----
 
-
-
 //
 // ----- Destructor
-// 
-SiStripMonitorCondData::~SiStripMonitorCondData(){
-}
+//
+SiStripMonitorCondData::~SiStripMonitorCondData() {}
 // -----
 
-
-
 //
 // ----- beginRun
-//    
-void SiStripMonitorCondData::beginRun(edm::Run const& run, edm::EventSetup const& eSetup) {
-
-  if(monitorPedestals_){
-    pedestalsDQM_ = std::make_unique<SiStripPedestalsDQM>(eSetup,
-							  run.run(),
-							  conf_.getParameter<edm::ParameterSet>("SiStripPedestalsDQM_PSet"),
-							  conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
-  }
-  
-  
-  if(monitorNoises_){
+//
+void SiStripMonitorCondData::beginRun(edm::Run const &run, edm::EventSetup const &eSetup) {
+  if (monitorPedestals_) {
+    pedestalsDQM_ =
+        std::make_unique<SiStripPedestalsDQM>(eSetup,
+                                              run.run(),
+                                              conf_.getParameter<edm::ParameterSet>("SiStripPedestalsDQM_PSet"),
+                                              conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
+  }
+
+  if (monitorNoises_) {
     noisesDQM_ = std::make_unique<SiStripNoisesDQM>(eSetup,
-						    run.run(),
-						    conf_.getParameter<edm::ParameterSet>("SiStripNoisesDQM_PSet"),
-						    conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
+                                                    run.run(),
+                                                    conf_.getParameter<edm::ParameterSet>("SiStripNoisesDQM_PSet"),
+                                                    conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
   }
-  
-  
-  if(monitorLowThreshold_){
-    lowthresholdDQM_ = std::make_unique<SiStripThresholdDQM>(eSetup,
-							     run.run(),
-							     conf_.getParameter<edm::ParameterSet>("SiStripLowThresholdDQM_PSet"),
-							     conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
+
+  if (monitorLowThreshold_) {
+    lowthresholdDQM_ =
+        std::make_unique<SiStripThresholdDQM>(eSetup,
+                                              run.run(),
+                                              conf_.getParameter<edm::ParameterSet>("SiStripLowThresholdDQM_PSet"),
+                                              conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
   }
 
-  if(monitorHighThreshold_){
-    highthresholdDQM_ = std::make_unique<SiStripThresholdDQM>(eSetup,
-							      run.run(),
-							      conf_.getParameter<edm::ParameterSet>("SiStripHighThresholdDQM_PSet"),
-							      conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
+  if (monitorHighThreshold_) {
+    highthresholdDQM_ =
+        std::make_unique<SiStripThresholdDQM>(eSetup,
+                                              run.run(),
+                                              conf_.getParameter<edm::ParameterSet>("SiStripHighThresholdDQM_PSet"),
+                                              conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
   }
 
-  if(monitorQuality_){
+  if (monitorQuality_) {
     qualityDQM_ = std::make_unique<SiStripQualityDQM>(eSetup,
-						      run.run(),
-						      conf_.getParameter<edm::ParameterSet>("SiStripQualityDQM_PSet"),
-						      conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
-  } 
-  
- 
-  if(monitorApvGains_){
-    apvgainsDQM_ = std::make_unique<SiStripApvGainsDQM>(eSetup,
-							run.run(),
-							conf_.getParameter<edm::ParameterSet>("SiStripApvGainsDQM_PSet"),
-							conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
-  }
-  
-  
-  if(monitorLorentzAngle_){
-    lorentzangleDQM_ = std::make_unique<SiStripLorentzAngleDQM>(eSetup,
-								run.run(),
-								conf_.getParameter<edm::ParameterSet>("SiStripLorentzAngleDQM_PSet"),
-								conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
-  }
-
-  if(monitorBackPlaneCorrection_){
-    bpcorrectionDQM_ = std::make_unique<SiStripBackPlaneCorrectionDQM>(eSetup,
-								       run.run(),
-								       conf_.getParameter<edm::ParameterSet>("SiStripBackPlaneCorrectionDQM_PSet"),
-								       conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
-  }
-  if(monitorCabling_){
-    cablingDQM_ = std::make_unique<SiStripCablingDQM>(eSetup,
-						      run.run(),
-						      conf_.getParameter<edm::ParameterSet>("SiStripCablingDQM_PSet"),
-						      conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
+                                                      run.run(),
+                                                      conf_.getParameter<edm::ParameterSet>("SiStripQualityDQM_PSet"),
+                                                      conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
+  }
+
+  if (monitorApvGains_) {
+    apvgainsDQM_ =
+        std::make_unique<SiStripApvGainsDQM>(eSetup,
+                                             run.run(),
+                                             conf_.getParameter<edm::ParameterSet>("SiStripApvGainsDQM_PSet"),
+                                             conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
   }
-} // beginRun
-// -----
 
+  if (monitorLorentzAngle_) {
+    lorentzangleDQM_ =
+        std::make_unique<SiStripLorentzAngleDQM>(eSetup,
+                                                 run.run(),
+                                                 conf_.getParameter<edm::ParameterSet>("SiStripLorentzAngleDQM_PSet"),
+                                                 conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
+  }
 
+  if (monitorBackPlaneCorrection_) {
+    bpcorrectionDQM_ = std::make_unique<SiStripBackPlaneCorrectionDQM>(
+        eSetup,
+        run.run(),
+        conf_.getParameter<edm::ParameterSet>("SiStripBackPlaneCorrectionDQM_PSet"),
+        conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
+  }
+  if (monitorCabling_) {
+    cablingDQM_ = std::make_unique<SiStripCablingDQM>(eSetup,
+                                                      run.run(),
+                                                      conf_.getParameter<edm::ParameterSet>("SiStripCablingDQM_PSet"),
+                                                      conf_.getParameter<edm::ParameterSet>("FillConditions_PSet"));
+  }
+}  // beginRun
+// -----
 
 //
 // ----- beginJob
 //
-void SiStripMonitorCondData::beginJob(void){} //beginJob
+void SiStripMonitorCondData::beginJob(void) {}  // beginJob
 // -----
 
-
-
 //
 // ----- Analyze
 //
-void SiStripMonitorCondData::analyze(edm::Event const& iEvent, edm::EventSetup const& eSetup){
- 
-  if(monitorPedestals_)      { pedestalsDQM_     ->analysis(eSetup);}
-  if(monitorNoises_)         { noisesDQM_        ->analysis(eSetup);}    
-  if(monitorLowThreshold_)   { lowthresholdDQM_  ->analysis(eSetup);}    
-  if(monitorHighThreshold_)  { highthresholdDQM_ ->analysis(eSetup);}    
-  if(monitorApvGains_)       { apvgainsDQM_      ->analysis(eSetup);}    
-  if(monitorLorentzAngle_)   { lorentzangleDQM_  ->analysis(eSetup);}
-  if(monitorBackPlaneCorrection_)   { bpcorrectionDQM_  ->analysis(eSetup);}
-  if(monitorQuality_)        { qualityDQM_->analysis(eSetup);qualityDQM_->fillGrandSummaryMEs(eSetup);}//fillGrand. for SiStripquality
-  if(monitorCabling_)        { cablingDQM_       ->analysis(eSetup);}
-} // analyze
+void SiStripMonitorCondData::analyze(edm::Event const &iEvent, edm::EventSetup const &eSetup) {
+  if (monitorPedestals_) {
+    pedestalsDQM_->analysis(eSetup);
+  }
+  if (monitorNoises_) {
+    noisesDQM_->analysis(eSetup);
+  }
+  if (monitorLowThreshold_) {
+    lowthresholdDQM_->analysis(eSetup);
+  }
+  if (monitorHighThreshold_) {
+    highthresholdDQM_->analysis(eSetup);
+  }
+  if (monitorApvGains_) {
+    apvgainsDQM_->analysis(eSetup);
+  }
+  if (monitorLorentzAngle_) {
+    lorentzangleDQM_->analysis(eSetup);
+  }
+  if (monitorBackPlaneCorrection_) {
+    bpcorrectionDQM_->analysis(eSetup);
+  }
+  if (monitorQuality_) {
+    qualityDQM_->analysis(eSetup);
+    qualityDQM_->fillGrandSummaryMEs(eSetup);
+  }  // fillGrand. for SiStripquality
+  if (monitorCabling_) {
+    cablingDQM_->analysis(eSetup);
+  }
+}  // analyze
 // -----
 
-
-
 //
 // ----- endRun
-//    
-void SiStripMonitorCondData::endRun(edm::Run const& run, edm::EventSetup const& eSetup) {
-  if(monitorPedestals_)      { pedestalsDQM_     ->end();}
-  if(monitorNoises_)         { noisesDQM_        ->end();}    
-  if(monitorLowThreshold_)   { lowthresholdDQM_  ->end();}    
-  if(monitorHighThreshold_)  { highthresholdDQM_ ->end();}    
-  if(monitorApvGains_)       { apvgainsDQM_      ->end();}    
-  if(monitorLorentzAngle_)   { lorentzangleDQM_  ->end();}
-  if(monitorBackPlaneCorrection_)   { bpcorrectionDQM_  ->end();}
-  if(monitorQuality_)        { qualityDQM_       ->end();}
-  if(monitorCabling_)        { cablingDQM_       ->end();}
- 
-  bool outputMEsInRootFile     = conf_.getParameter<bool>("OutputMEsInRootFile");
-  std::string outputFileName  = conf_.getParameter<std::string>("OutputFileName");
-
-  DQMStore* dqmStore_=edm::Service<DQMStore>().operator->();
-  
-  if (outputMEsInRootFile) { 
+//
+void SiStripMonitorCondData::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
+  if (monitorPedestals_) {
+    pedestalsDQM_->end();
+  }
+  if (monitorNoises_) {
+    noisesDQM_->end();
+  }
+  if (monitorLowThreshold_) {
+    lowthresholdDQM_->end();
+  }
+  if (monitorHighThreshold_) {
+    highthresholdDQM_->end();
+  }
+  if (monitorApvGains_) {
+    apvgainsDQM_->end();
+  }
+  if (monitorLorentzAngle_) {
+    lorentzangleDQM_->end();
+  }
+  if (monitorBackPlaneCorrection_) {
+    bpcorrectionDQM_->end();
+  }
+  if (monitorQuality_) {
+    qualityDQM_->end();
+  }
+  if (monitorCabling_) {
+    cablingDQM_->end();
+  }
+
+  bool outputMEsInRootFile = conf_.getParameter<bool>("OutputMEsInRootFile");
+  std::string outputFileName = conf_.getParameter<std::string>("OutputFileName");
+
+  DQMStore *dqmStore_ = edm::Service<DQMStore>().operator->();
+
+  if (outputMEsInRootFile) {
     dqmStore_->showDirStructure();
     dqmStore_->save(outputFileName);
-  } 
+  }
 
-  
-} // endRun
+}  // endRun
 // -----
 
-
 //
 // ----- endJob
 //
-void SiStripMonitorCondData::endJob(void){} 
-//endJob
+void SiStripMonitorCondData::endJob(void) {}
+// endJob
 // -----
 
-
 #include "FWCore/Framework/interface/MakerMacros.h"
-  DEFINE_FWK_MODULE(SiStripMonitorCondData);
-
-  
+DEFINE_FWK_MODULE(SiStripMonitorCondData);
diff --git a/DQM/SiStripMonitorSummary/src/SiStripMonitorCondDataOnDemandExample.cc b/DQM/SiStripMonitorSummary/src/SiStripMonitorCondDataOnDemandExample.cc
index e3c3d6ce659f5..7c8f001784368 100644
--- a/DQM/SiStripMonitorSummary/src/SiStripMonitorCondDataOnDemandExample.cc
+++ b/DQM/SiStripMonitorSummary/src/SiStripMonitorCondDataOnDemandExample.cc
@@ -2,119 +2,98 @@
 //
 // Package:     SiStripMonitorSummary
 // Class  :     SiStripMonitorCondDataOnDemandExample
-// 
+//
 // Original Author:  Evelyne Delmeire
 //
 
-
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include "DQM/SiStripMonitorSummary/interface/SiStripMonitorCondDataOnDemandExample.h"
 #include "DQM/SiStripMonitorSummary/interface/SiStripClassToMonitorCondData.h"
+#include "DQM/SiStripMonitorSummary/interface/SiStripMonitorCondDataOnDemandExample.h"
 
 #include "TH1F.h"
 #include "TH2F.h"
 #include "TProfile.h"
 
 // std
-#include <cstdlib>
-#include <string>
+#include <algorithm>
 #include <cmath>
+#include <cstdlib>
 #include <numeric>
-#include <algorithm>
-
+#include <string>
 
 //
 // ----- Constructor
 //
-SiStripMonitorCondDataOnDemandExample::SiStripMonitorCondDataOnDemandExample(edm::ParameterSet const& iConfig):conf_(iConfig){}
+SiStripMonitorCondDataOnDemandExample::SiStripMonitorCondDataOnDemandExample(edm::ParameterSet const &iConfig)
+    : conf_(iConfig) {}
 // -----
 
-
-
 //
 // ----- Destructor
-// 
-SiStripMonitorCondDataOnDemandExample::~SiStripMonitorCondDataOnDemandExample(){}
+//
+SiStripMonitorCondDataOnDemandExample::~SiStripMonitorCondDataOnDemandExample() {}
 // -----
 
-
-
-
 //
 // ----- beginRun
-//    
-void SiStripMonitorCondDataOnDemandExample::beginRun(edm::Run const& run, edm::EventSetup const& eSetup) {  
-  eventCounter_=0;
+//
+void SiStripMonitorCondDataOnDemandExample::beginRun(edm::Run const &run, edm::EventSetup const &eSetup) {
+  eventCounter_ = 0;
   condDataMonitoring_ = new SiStripClassToMonitorCondData(conf_);
-  condDataMonitoring_->beginRun(run.run(),eSetup);
-  
-  
+  condDataMonitoring_->beginRun(run.run(), eSetup);
 
-} // beginRun
+}  // beginRun
 // -----
 
-
-
 //
 // ----- beginJob
 //
-void SiStripMonitorCondDataOnDemandExample::beginJob(void){} //beginJob
-
-
+void SiStripMonitorCondDataOnDemandExample::beginJob(void) {}  // beginJob
 
 //
 // ----- Analyze
 //
-void SiStripMonitorCondDataOnDemandExample::analyze(edm::Event const& iEvent, edm::EventSetup const& eSetup){
-  //eventCounter_++; 
+void SiStripMonitorCondDataOnDemandExample::analyze(edm::Event const &iEvent, edm::EventSetup const &eSetup) {
+  // eventCounter_++;
 
   // on demand type I : eventSetup and detId to be passed
   // output : ME's corresponding to that detId
-  
-  
-  //if(eventCounter_==1){ condDataMonitoring_ -> getModMEsOnDemand(eSetup,369125542);}
-  
-  // on demand type II : eventSetup, subdetector-type(TIB/TOB/TEC/TID), 
-  //                                 subdetector-side for TEC/TID (0 for TIB and TOB)
-  //                                 layer_number (0=all layers)
- 
-  //if(eventCounter_==2){ condDataMonitoring_ -> getLayerMEsOnDemand(eSetup,"TEC",0,1);}
-  //condDataMonitoring_ -> getModMEsOnDemand(eSetup,369125542);
-  condDataMonitoring_ -> getLayerMEsOnDemand(eSetup,"TEC",2,4);
-
-  
-  
-} // analyze
-// -----
 
+  // if(eventCounter_==1){ condDataMonitoring_ ->
+  // getModMEsOnDemand(eSetup,369125542);}
 
+  // on demand type II : eventSetup, subdetector-type(TIB/TOB/TEC/TID),
+  //                                 subdetector-side for TEC/TID (0 for TIB and
+  //                                 TOB) layer_number (0=all layers)
 
-//
-// ----- endRun
-//    
-void SiStripMonitorCondDataOnDemandExample::endRun(edm::Run const& run, edm::EventSetup const& eSetup) {
-
-  condDataMonitoring_->endRun(eSetup);       
+  // if(eventCounter_==2){ condDataMonitoring_ ->
+  // getLayerMEsOnDemand(eSetup,"TEC",0,1);} condDataMonitoring_ ->
+  // getModMEsOnDemand(eSetup,369125542);
+  condDataMonitoring_->getLayerMEsOnDemand(eSetup, "TEC", 2, 4);
 
-} // endRun
+}  // analyze
 // -----
 
+//
+// ----- endRun
+//
+void SiStripMonitorCondDataOnDemandExample::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
+  condDataMonitoring_->endRun(eSetup);
 
+}  // endRun
+// -----
 
 //
 // ----- endJob
 //
-void SiStripMonitorCondDataOnDemandExample::endJob(void){} //endJob
-
+void SiStripMonitorCondDataOnDemandExample::endJob(void) {}  // endJob
 
 #include "FWCore/Framework/interface/MakerMacros.h"
-  DEFINE_FWK_MODULE(SiStripMonitorCondDataOnDemandExample);
-
-  
+DEFINE_FWK_MODULE(SiStripMonitorCondDataOnDemandExample);
diff --git a/DQM/SiStripMonitorSummary/src/SiStripNoisesDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripNoisesDQM.cc
index 6fa11d59baf21..05d47c28a8c91 100644
--- a/DQM/SiStripMonitorSummary/src/SiStripNoisesDQM.cc
+++ b/DQM/SiStripMonitorSummary/src/SiStripNoisesDQM.cc
@@ -1,207 +1,198 @@
 #include "DQM/SiStripMonitorSummary/interface/SiStripNoisesDQM.h"
 
-
 #include "DQMServices/Core/interface/MonitorElement.h"
 
 #include "TCanvas.h"
 
 // -----
-SiStripNoisesDQM::SiStripNoisesDQM(const edm::EventSetup & eSetup,
+SiStripNoisesDQM::SiStripNoisesDQM(const edm::EventSetup &eSetup,
                                    edm::RunNumber_t iRun,
-                                   edm::ParameterSet const& hPSet,
-                                   edm::ParameterSet const& fPSet):SiStripBaseCondObjDQM(eSetup, iRun, hPSet, fPSet){  
+                                   edm::ParameterSet const &hPSet,
+                                   edm::ParameterSet const &fPSet)
+    : SiStripBaseCondObjDQM(eSetup, iRun, hPSet, fPSet) {
   gainRenormalisation_ = hPSet_.getParameter<bool>("GainRenormalisation");
   simGainRenormalisation_ = hPSet_.getParameter<bool>("SimGainRenormalisation");
-  if( gainRenormalisation_ && !simGainRenormalisation_){ eSetup.get<SiStripApvGainRcd>().get(gainHandle_);}
-  if( simGainRenormalisation_){ eSetup.get<SiStripApvGainSimRcd>().get(gainHandle_);}
-
+  if (gainRenormalisation_ && !simGainRenormalisation_) {
+    eSetup.get<SiStripApvGainRcd>().get(gainHandle_);
+  }
+  if (simGainRenormalisation_) {
+    eSetup.get<SiStripApvGainSimRcd>().get(gainHandle_);
+  }
 
   // Build the Histo_TkMap:
-  if ( HistoMaps_On_ ) {
+  if (HistoMaps_On_) {
     edm::ESHandle<TkDetMap> tkDetMapHandle;
     eSetup.get<TrackerTopologyRcd>().get(tkDetMapHandle);
-    Tk_HM_ = std::make_unique<TkHistoMap>(tkDetMapHandle.product(), "SiStrip/Histo_Map","MeanNoise_TkMap",0.);
+    Tk_HM_ = std::make_unique<TkHistoMap>(tkDetMapHandle.product(), "SiStrip/Histo_Map", "MeanNoise_TkMap", 0.);
   }
 }
 // -----
 
 // -----
-SiStripNoisesDQM::~SiStripNoisesDQM(){}
+SiStripNoisesDQM::~SiStripNoisesDQM() {}
 // -----
 
-
 // -----
-void SiStripNoisesDQM::getActiveDetIds(const edm::EventSetup & eSetup){
-  
+void SiStripNoisesDQM::getActiveDetIds(const edm::EventSetup &eSetup) {
   getConditionObject(eSetup);
   noiseHandle_->getDetIds(activeDetIds);
-
 }
 
 // -----
-void SiStripNoisesDQM::fillMEsForDet(const ModMEs& _selModME_, uint32_t selDetId_, const TrackerTopology* tTopo){
+void SiStripNoisesDQM::fillMEsForDet(const ModMEs &_selModME_, uint32_t selDetId_, const TrackerTopology *tTopo) {
   ModMEs selModME_ = _selModME_;
   std::vector<uint32_t> DetIds;
   noiseHandle_->getDetIds(DetIds);
 
   SiStripNoises::Range noiseRange = noiseHandle_->getRange(selDetId_);
-  
-  int nStrip =  reader->getNumberOfApvsAndStripLength(selDetId_).first*128;
 
-  getModMEs(selModME_,selDetId_, tTopo);
-  
+  int nStrip = reader->getNumberOfApvsAndStripLength(selDetId_).first * 128;
+
+  getModMEs(selModME_, selDetId_, tTopo);
+
   float gainFactor;
   float stripnoise;
 
   SiStripApvGain::Range gainRange;
-  if( gainRenormalisation_ ||  simGainRenormalisation_ ){
+  if (gainRenormalisation_ || simGainRenormalisation_) {
     gainRange = gainHandle_->getRange(selDetId_);
   }
 
-  for( int istrip=0;istrip<nStrip;++istrip){
-    if( gainRenormalisation_ ||  simGainRenormalisation_ )
-      gainFactor= gainHandle_ ->getStripGain(istrip,gainRange) ? gainHandle_ ->getStripGain(istrip,gainRange) : 1.;
+  for (int istrip = 0; istrip < nStrip; ++istrip) {
+    if (gainRenormalisation_ || simGainRenormalisation_)
+      gainFactor = gainHandle_->getStripGain(istrip, gainRange) ? gainHandle_->getStripGain(istrip, gainRange) : 1.;
     else
-      gainFactor=1;
+      gainFactor = 1;
 
-    stripnoise=noiseHandle_->getNoise(istrip,noiseRange)/gainFactor;
-    if( CondObj_fillId_ =="onlyProfile" || CondObj_fillId_ =="ProfileAndCumul"){
-      selModME_.ProfileDistr->Fill(istrip+1,stripnoise);
+    stripnoise = noiseHandle_->getNoise(istrip, noiseRange) / gainFactor;
+    if (CondObj_fillId_ == "onlyProfile" || CondObj_fillId_ == "ProfileAndCumul") {
+      selModME_.ProfileDistr->Fill(istrip + 1, stripnoise);
     }
-    if( CondObj_fillId_ =="onlyCumul" || CondObj_fillId_ =="ProfileAndCumul"){
+    if (CondObj_fillId_ == "onlyCumul" || CondObj_fillId_ == "ProfileAndCumul") {
       selModME_.CumulDistr->Fill(stripnoise);
-    } 
-  } //istrip
-
+    }
+  }  // istrip
 }
-  
 
 // -----
-//FIXME too long. factorize this method. 
-//FIXME the number of lines of code in the derived classes should be reduced ONLY at what cannot be done in the base class because of the specific implementation
-//FIXME of the derived class. Moreover, several loops on the same quantities should be avoided...
-
-void SiStripNoisesDQM::fillMEsForLayer( /*std::map<uint32_t, ModMEs> selMEsMap_,*/ uint32_t selDetId_, const TrackerTopology* tTopo){
-
+// FIXME too long. factorize this method.
+// FIXME the number of lines of code in the derived classes should be reduced
+// ONLY at what cannot be done in the base class because of the specific
+// implementation
+// FIXME of the derived class. Moreover, several loops on the same quantities
+// should be avoided...
+
+void SiStripNoisesDQM::fillMEsForLayer(
+    /*std::map<uint32_t, ModMEs> selMEsMap_,*/ uint32_t selDetId_, const TrackerTopology *tTopo) {
   // ----
-  int subdetectorId_ = ((selDetId_>>25)&0x7);
-  
-  if( subdetectorId_<3 ||subdetectorId_>6 ){ 
-    edm::LogError("SiStripNoisesDQM")
-      << "[SiStripNoisesDQM::fillMEsForLayer] WRONG INPUT : no such subdetector type : "
-      << subdetectorId_ << " no folder set!" 
-      << std::endl;
+  int subdetectorId_ = ((selDetId_ >> 25) & 0x7);
+
+  if (subdetectorId_ < 3 || subdetectorId_ > 6) {
+    edm::LogError("SiStripNoisesDQM") << "[SiStripNoisesDQM::fillMEsForLayer] WRONG INPUT : no such "
+                                         "subdetector type : "
+                                      << subdetectorId_ << " no folder set!" << std::endl;
     return;
   }
   // ----
-  
-  std::map<uint32_t, ModMEs>::iterator selMEsMapIter_  = SummaryMEsMap_.find(getLayerNameAndId(selDetId_,tTopo).second);
+
+  std::map<uint32_t, ModMEs>::iterator selMEsMapIter_ = SummaryMEsMap_.find(getLayerNameAndId(selDetId_, tTopo).second);
   ModMEs selME_;
-  if ( selMEsMapIter_ != SummaryMEsMap_.end())
-    selME_ =selMEsMapIter_->second;
-  getSummaryMEs(selME_,selDetId_,tTopo);
-  
+  if (selMEsMapIter_ != SummaryMEsMap_.end())
+    selME_ = selMEsMapIter_->second;
+  getSummaryMEs(selME_, selDetId_, tTopo);
+
   SiStripNoises::Range noiseRange = noiseHandle_->getRange(selDetId_);
-  int nStrip =  reader->getNumberOfApvsAndStripLength(selDetId_).first*128;
+  int nStrip = reader->getNumberOfApvsAndStripLength(selDetId_).first * 128;
 
-  float stripnoise=-1.;
-  float meanNoise=0;
-  int Nbadstrips=0;
+  float stripnoise = -1.;
+  float meanNoise = 0;
+  int Nbadstrips = 0;
 
   SiStripApvGain::Range gainRange;
-  if(gainRenormalisation_ ||  simGainRenormalisation_ ){
+  if (gainRenormalisation_ || simGainRenormalisation_) {
     gainRange = gainHandle_->getRange(selDetId_);
   }
-  float gainFactor=1;
-  
+  float gainFactor = 1;
+
   SiStripHistoId hidmanager;
 
-  if(hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel")){
-    // --> profile summary    
+  if (hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel")) {
+    // --> profile summary
     std::string hSummaryOfProfile_description;
-    hSummaryOfProfile_description  = hPSet_.getParameter<std::string>("SummaryOfProfile_description");
-    
-    std::string hSummaryOfProfile_name; 
-    hSummaryOfProfile_name = hidmanager.createHistoLayer(hSummaryOfProfile_description, 
-							 "layer", 
-							 getLayerNameAndId(selDetId_,tTopo).first, 
-							 "") ;
+    hSummaryOfProfile_description = hPSet_.getParameter<std::string>("SummaryOfProfile_description");
+
+    std::string hSummaryOfProfile_name;
+    hSummaryOfProfile_name = hidmanager.createHistoLayer(
+        hSummaryOfProfile_description, "layer", getLayerNameAndId(selDetId_, tTopo).first, "");
   }
-  if(hPSet_.getParameter<bool>("FillCumulativeSummaryAtLayerLevel")){
+  if (hPSet_.getParameter<bool>("FillCumulativeSummaryAtLayerLevel")) {
     std::string hSummaryOfCumul_description;
-    hSummaryOfCumul_description  = hPSet_.getParameter<std::string>("Cumul_description");
-    
-    std::string hSummaryOfCumul_name; 
-    hSummaryOfCumul_name = hidmanager.createHistoLayer(hSummaryOfCumul_description, "layer", getStringNameAndId(selDetId_,tTopo).first, "") ;    
-  }   
-  if(hPSet_.getParameter<bool>("FillSummaryAtLayerLevel")){
-    // --> cumul summary    
-    std::string hSummary_description;
-    hSummary_description  = hPSet_.getParameter<std::string>("Summary_description");
-    
-    std::string hSummary_name; 
-    hSummary_name = hidmanager.createHistoLayer(hSummary_description, 
-						"layer", 
-						getLayerNameAndId(selDetId_,tTopo).first, 
-						"") ;
-  }
+    hSummaryOfCumul_description = hPSet_.getParameter<std::string>("Cumul_description");
 
+    std::string hSummaryOfCumul_name;
+    hSummaryOfCumul_name = hidmanager.createHistoLayer(
+        hSummaryOfCumul_description, "layer", getStringNameAndId(selDetId_, tTopo).first, "");
+  }
+  if (hPSet_.getParameter<bool>("FillSummaryAtLayerLevel")) {
+    // --> cumul summary
+    std::string hSummary_description;
+    hSummary_description = hPSet_.getParameter<std::string>("Summary_description");
 
-  for( int istrip=0;istrip<nStrip;++istrip){
+    std::string hSummary_name;
+    hSummary_name =
+        hidmanager.createHistoLayer(hSummary_description, "layer", getLayerNameAndId(selDetId_, tTopo).first, "");
+  }
 
-    if(gainRenormalisation_  || simGainRenormalisation_ ){
-      gainFactor= gainHandle_ ->getStripGain(istrip,gainRange) ? gainHandle_ ->getStripGain(istrip,gainRange) : 1.;
-    } else{
-      gainFactor=1.;
+  for (int istrip = 0; istrip < nStrip; ++istrip) {
+    if (gainRenormalisation_ || simGainRenormalisation_) {
+      gainFactor = gainHandle_->getStripGain(istrip, gainRange) ? gainHandle_->getStripGain(istrip, gainRange) : 1.;
+    } else {
+      gainFactor = 1.;
     }
-    
-    stripnoise=noiseHandle_->getNoise(istrip,noiseRange)/gainFactor;
-    meanNoise+=stripnoise;
-    if(hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel")){
-      if( CondObj_fillId_ =="onlyProfile" || CondObj_fillId_ =="ProfileAndCumul"){	
-	selME_.SummaryOfProfileDistr->Fill(istrip+1,stripnoise);
+
+    stripnoise = noiseHandle_->getNoise(istrip, noiseRange) / gainFactor;
+    meanNoise += stripnoise;
+    if (hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel")) {
+      if (CondObj_fillId_ == "onlyProfile" || CondObj_fillId_ == "ProfileAndCumul") {
+        selME_.SummaryOfProfileDistr->Fill(istrip + 1, stripnoise);
       }
     }
 
-    if(hPSet_.getParameter<bool>("FillCumulativeSummaryAtLayerLevel")){
-      if( CondObj_fillId_ =="onlyCumul" || CondObj_fillId_ =="ProfileAndCumul"){
-	selME_.SummaryOfCumulDistr->Fill(stripnoise);
+    if (hPSet_.getParameter<bool>("FillCumulativeSummaryAtLayerLevel")) {
+      if (CondObj_fillId_ == "onlyCumul" || CondObj_fillId_ == "ProfileAndCumul") {
+        selME_.SummaryOfCumulDistr->Fill(stripnoise);
       }
     }
 
     // Fill the TkMap
-    if(fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")){
-      fillTkMap(selDetId_, stripnoise);   
+    if (fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")) {
+      fillTkMap(selDetId_, stripnoise);
     }
-  
-  } //istrip
 
+  }  // istrip
 
-  if(hPSet_.getParameter<bool>("FillSummaryAtLayerLevel")){
-    
-    meanNoise = meanNoise/(nStrip-Nbadstrips);
+  if (hPSet_.getParameter<bool>("FillSummaryAtLayerLevel")) {
+    meanNoise = meanNoise / (nStrip - Nbadstrips);
     // get detIds belonging to same layer to fill X-axis with detId-number
-    
+
     std::vector<uint32_t> sameLayerDetIds_;
-    sameLayerDetIds_=GetSameLayerDetId(activeDetIds,selDetId_,tTopo);
-    
-    std::vector<uint32_t>::const_iterator ibound=lower_bound(sameLayerDetIds_.begin(),sameLayerDetIds_.end(),selDetId_);
-    if(ibound!=sameLayerDetIds_.end() && *ibound==selDetId_)
-      selME_.SummaryDistr->Fill(ibound-sameLayerDetIds_.begin()+1,meanNoise);
-    
+    sameLayerDetIds_ = GetSameLayerDetId(activeDetIds, selDetId_, tTopo);
 
-    // Fill the Histo_TkMap with the mean Noise:
-    if(HistoMaps_On_ ){Tk_HM_->fill(selDetId_, meanNoise); }
+    std::vector<uint32_t>::const_iterator ibound =
+        lower_bound(sameLayerDetIds_.begin(), sameLayerDetIds_.end(), selDetId_);
+    if (ibound != sameLayerDetIds_.end() && *ibound == selDetId_)
+      selME_.SummaryDistr->Fill(ibound - sameLayerDetIds_.begin() + 1, meanNoise);
 
+    // Fill the Histo_TkMap with the mean Noise:
+    if (HistoMaps_On_) {
+      Tk_HM_->fill(selDetId_, meanNoise);
+    }
 
-    //Check the axis range for tkmap, and in case redefine;
+    // Check the axis range for tkmap, and in case redefine;
     int intNoise = int(meanNoise);
-    if(intNoise+1 > (int)tkMapScaler.size()){
-      tkMapScaler.resize(intNoise+1,0);
+    if (intNoise + 1 > (int)tkMapScaler.size()) {
+      tkMapScaler.resize(intNoise + 1, 0);
     }
     tkMapScaler[intNoise]++;
-      
-  } 
-
+  }
 }
-
diff --git a/DQM/SiStripMonitorSummary/src/SiStripPedestalsDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripPedestalsDQM.cc
index ac2d2f80dc319..2e9e23346abeb 100644
--- a/DQM/SiStripMonitorSummary/src/SiStripPedestalsDQM.cc
+++ b/DQM/SiStripMonitorSummary/src/SiStripPedestalsDQM.cc
@@ -4,230 +4,195 @@
 #include "TCanvas.h"
 
 // -----
-SiStripPedestalsDQM::SiStripPedestalsDQM(const edm::EventSetup & eSetup,
+SiStripPedestalsDQM::SiStripPedestalsDQM(const edm::EventSetup &eSetup,
                                          edm::RunNumber_t iRun,
-                                         edm::ParameterSet const& hPSet,
-                                         edm::ParameterSet const& fPSet):SiStripBaseCondObjDQM(eSetup, iRun, hPSet, fPSet){
-
+                                         edm::ParameterSet const &hPSet,
+                                         edm::ParameterSet const &fPSet)
+    : SiStripBaseCondObjDQM(eSetup, iRun, hPSet, fPSet) {
   // Build the Histo_TkMap:
-  if ( HistoMaps_On_ ) {
+  if (HistoMaps_On_) {
     edm::ESHandle<TkDetMap> tkDetMapHandle;
     eSetup.get<TrackerTopologyRcd>().get(tkDetMapHandle);
-    Tk_HM_ = std::make_unique<TkHistoMap>(tkDetMapHandle.product(), "SiStrip/Histo_Map","MeanPed_TkMap",0.);
+    Tk_HM_ = std::make_unique<TkHistoMap>(tkDetMapHandle.product(), "SiStrip/Histo_Map", "MeanPed_TkMap", 0.);
   }
 }
 // -----
 
-
-
 // -----
-SiStripPedestalsDQM::~SiStripPedestalsDQM(){}
+SiStripPedestalsDQM::~SiStripPedestalsDQM() {}
 // -----
 
-
 // -----
-void SiStripPedestalsDQM::getActiveDetIds(const edm::EventSetup & eSetup){
-  
+void SiStripPedestalsDQM::getActiveDetIds(const edm::EventSetup &eSetup) {
   getConditionObject(eSetup);
   pedestalHandle_->getDetIds(activeDetIds);
-
 }
 // -----
 
-
 // -----
-void SiStripPedestalsDQM::fillModMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es){
-   
-  //Retrieve tracker topology from geometry
+void SiStripPedestalsDQM::fillModMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   es.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
   ModMEs CondObj_ME;
-  
-  for(std::vector<uint32_t>::const_iterator detIter_ = selectedDetIds.begin();
-      detIter_!= selectedDetIds.end();detIter_++){
-      
-    fillMEsForDet(CondObj_ME,*detIter_,tTopo);
-      
+
+  for (std::vector<uint32_t>::const_iterator detIter_ = selectedDetIds.begin(); detIter_ != selectedDetIds.end();
+       detIter_++) {
+    fillMEsForDet(CondObj_ME, *detIter_, tTopo);
   }
-}    
+}
 // -----
 
-
-
-
 // -----
-void SiStripPedestalsDQM::fillMEsForDet(const ModMEs& _selModME_, uint32_t selDetId_, const TrackerTopology* tTopo){
+void SiStripPedestalsDQM::fillMEsForDet(const ModMEs &_selModME_, uint32_t selDetId_, const TrackerTopology *tTopo) {
   ModMEs selModME_ = _selModME_;
-  getModMEs(selModME_,selDetId_,tTopo);
-  
-  SiStripPedestals::Range pedRange = pedestalHandle_->getRange(selDetId_);
-  int nStrip =  reader->getNumberOfApvsAndStripLength(selDetId_).first*128;
-  
-  for( int istrip=0;istrip<nStrip;++istrip){
-      if( CondObj_fillId_ =="onlyProfile" || CondObj_fillId_ =="ProfileAndCumul"){
-        selModME_.ProfileDistr->Fill(istrip+1,pedestalHandle_->getPed(istrip,pedRange));
-      }
-  }// istrip
-  
-}    
-// -----
+  getModMEs(selModME_, selDetId_, tTopo);
 
+  SiStripPedestals::Range pedRange = pedestalHandle_->getRange(selDetId_);
+  int nStrip = reader->getNumberOfApvsAndStripLength(selDetId_).first * 128;
 
+  for (int istrip = 0; istrip < nStrip; ++istrip) {
+    if (CondObj_fillId_ == "onlyProfile" || CondObj_fillId_ == "ProfileAndCumul") {
+      selModME_.ProfileDistr->Fill(istrip + 1, pedestalHandle_->getPed(istrip, pedRange));
+    }
+  }  // istrip
+}
+// -----
 
 // -----
-void SiStripPedestalsDQM::fillSummaryMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es){
-   
-  //Retrieve tracker topology from geometry
+void SiStripPedestalsDQM::fillSummaryMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   es.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
-  for(std::vector<uint32_t>::const_iterator detIter_ = selectedDetIds.begin();
-      detIter_!= selectedDetIds.end();detIter_++){
-    fillMEsForLayer(/*SummaryMEsMap_,*/ *detIter_,tTopo);
+  for (std::vector<uint32_t>::const_iterator detIter_ = selectedDetIds.begin(); detIter_ != selectedDetIds.end();
+       detIter_++) {
+    fillMEsForLayer(/*SummaryMEsMap_,*/ *detIter_, tTopo);
   }
 
-  for (std::map<uint32_t, ModMEs>::iterator iter=SummaryMEsMap_.begin(); iter!=SummaryMEsMap_.end(); iter++){
-
+  for (std::map<uint32_t, ModMEs>::iterator iter = SummaryMEsMap_.begin(); iter != SummaryMEsMap_.end(); iter++) {
     ModMEs selME;
     selME = iter->second;
 
-    if(hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel") && fPSet_.getParameter<bool>("OutputSummaryProfileAtLayerLevelAsImage")){
-
-      if( CondObj_fillId_ =="onlyProfile" || CondObj_fillId_ =="ProfileAndCumul"){
-
-	TCanvas c1("c1");
-	selME.SummaryOfProfileDistr->getTProfile()->Draw();
-	std::string name (selME.SummaryOfProfileDistr->getTProfile()->GetTitle());
-	name+=".png";
-	c1.Print(name.c_str());
+    if (hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel") &&
+        fPSet_.getParameter<bool>("OutputSummaryProfileAtLayerLevelAsImage")) {
+      if (CondObj_fillId_ == "onlyProfile" || CondObj_fillId_ == "ProfileAndCumul") {
+        TCanvas c1("c1");
+        selME.SummaryOfProfileDistr->getTProfile()->Draw();
+        std::string name(selME.SummaryOfProfileDistr->getTProfile()->GetTitle());
+        name += ".png";
+        c1.Print(name.c_str());
       }
     }
-    if(hPSet_.getParameter<bool>("FillSummaryAtLayerLevel") && fPSet_.getParameter<bool>("OutputSummaryAtLayerLevelAsImage")){
-
+    if (hPSet_.getParameter<bool>("FillSummaryAtLayerLevel") &&
+        fPSet_.getParameter<bool>("OutputSummaryAtLayerLevelAsImage")) {
       TCanvas c1("c1");
       selME.SummaryDistr->getTH1()->Draw();
-      std::string name (selME.SummaryDistr->getTH1()->GetTitle());
-      name+=".png";
+      std::string name(selME.SummaryDistr->getTH1()->GetTitle());
+      name += ".png";
       c1.Print(name.c_str());
     }
-
   }
+}
 
-}           
-  
 // -----
 
-
-
 // -----
-void SiStripPedestalsDQM::fillMEsForLayer( /*std::map<uint32_t, ModMEs> selMEsMap_,*/ uint32_t selDetId_, const TrackerTopology* tTopo){
-
+void SiStripPedestalsDQM::fillMEsForLayer(
+    /*std::map<uint32_t, ModMEs> selMEsMap_,*/ uint32_t selDetId_, const TrackerTopology *tTopo) {
   // ----
-  int subdetectorId_ = ((selDetId_>>25)&0x7);
-    
-  if( subdetectorId_<3 || subdetectorId_>6 ){ 
-    edm::LogError("SiStripPedestalsDQM")
-      << "[SiStripPedestalsDQM::fillMEsForLayer] WRONG INPUT : no such subdetector type : "
-      << subdetectorId_ << " no folder set!" 
-      << std::endl;
+  int subdetectorId_ = ((selDetId_ >> 25) & 0x7);
+
+  if (subdetectorId_ < 3 || subdetectorId_ > 6) {
+    edm::LogError("SiStripPedestalsDQM") << "[SiStripPedestalsDQM::fillMEsForLayer] WRONG INPUT : no such "
+                                            "subdetector type : "
+                                         << subdetectorId_ << " no folder set!" << std::endl;
     return;
   }
   // ----
 
-//     // Cumulative distribution with average Ped value on a layer (not needed):  
-     
-  std::map<uint32_t, ModMEs>::iterator selMEsMapIter_ = SummaryMEsMap_.find(getLayerNameAndId(selDetId_,tTopo).second);
+  //     // Cumulative distribution with average Ped value on a layer (not
+  //     needed):
+
+  std::map<uint32_t, ModMEs>::iterator selMEsMapIter_ = SummaryMEsMap_.find(getLayerNameAndId(selDetId_, tTopo).second);
   ModMEs selME_;
-  if ( selMEsMapIter_ != SummaryMEsMap_.end())
-    selME_ =selMEsMapIter_->second;
-  getSummaryMEs(selME_,selDetId_,tTopo);
-    
+  if (selMEsMapIter_ != SummaryMEsMap_.end())
+    selME_ = selMEsMapIter_->second;
+  getSummaryMEs(selME_, selDetId_, tTopo);
+
   SiStripPedestals::Range pedRange = pedestalHandle_->getRange(selDetId_);
-  
-  int nStrip =  reader->getNumberOfApvsAndStripLength(selDetId_).first*128;
-  
+
+  int nStrip = reader->getNumberOfApvsAndStripLength(selDetId_).first * 128;
+
   SiStripHistoId hidmanager;
 
-   if(hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel")){
-  
-     // --> profile summary    
-  
-     std::string hSummaryOfProfile_description;
-     hSummaryOfProfile_description  = hPSet_.getParameter<std::string>("SummaryOfProfile_description");
-  
-     std::string hSummaryOfProfile_name; 
-  
-  
-    hSummaryOfProfile_name = hidmanager.createHistoLayer(hSummaryOfProfile_description, 
-							 "layer", 
-							 getLayerNameAndId(selDetId_,tTopo).first, 
-							 "") ;
- 
-    for( int istrip=0;istrip<nStrip;++istrip){
-    
-	if( CondObj_fillId_ =="onlyProfile" || CondObj_fillId_ =="ProfileAndCumul"){
-	  selME_.SummaryOfProfileDistr->Fill(istrip+1,pedestalHandle_->getPed(istrip,pedRange));
-	}
-
-      //fill the TkMap
-    if(fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")){
-      fillTkMap(selDetId_, pedestalHandle_->getPed(istrip,pedRange));
-    }
+  if (hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel")) {
+    // --> profile summary
+
+    std::string hSummaryOfProfile_description;
+    hSummaryOfProfile_description = hPSet_.getParameter<std::string>("SummaryOfProfile_description");
+
+    std::string hSummaryOfProfile_name;
+
+    hSummaryOfProfile_name = hidmanager.createHistoLayer(
+        hSummaryOfProfile_description, "layer", getLayerNameAndId(selDetId_, tTopo).first, "");
+
+    for (int istrip = 0; istrip < nStrip; ++istrip) {
+      if (CondObj_fillId_ == "onlyProfile" || CondObj_fillId_ == "ProfileAndCumul") {
+        selME_.SummaryOfProfileDistr->Fill(istrip + 1, pedestalHandle_->getPed(istrip, pedRange));
+      }
+
+      // fill the TkMap
+      if (fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")) {
+        fillTkMap(selDetId_, pedestalHandle_->getPed(istrip, pedRange));
+      }
 
-    }// istrip	
-   }//if Fill ...
+    }  // istrip
+  }    // if Fill ...
 
-  if(hPSet_.getParameter<bool>("FillSummaryAtLayerLevel")){
+  if (hPSet_.getParameter<bool>("FillSummaryAtLayerLevel")) {
+    // -->  summary
 
-    // -->  summary  
-  
     std::string hSummary_description;
-    hSummary_description  = hPSet_.getParameter<std::string>("Summary_description");
-  
-    std::string hSummary_name; 
-    hSummary_name = hidmanager.createHistoLayer(hSummary_description, 
-						"layer", 
-						getLayerNameAndId(selDetId_,tTopo).first, 
-						"") ;
-    float meanPedestal=0;
-  
-    for( int istrip=0;istrip<nStrip;++istrip){
-    
-	meanPedestal = meanPedestal + pedestalHandle_->getPed(istrip,pedRange);
-    
-    }//istrip
-  
-    meanPedestal = meanPedestal/nStrip;
+    hSummary_description = hPSet_.getParameter<std::string>("Summary_description");
+
+    std::string hSummary_name;
+    hSummary_name =
+        hidmanager.createHistoLayer(hSummary_description, "layer", getLayerNameAndId(selDetId_, tTopo).first, "");
+    float meanPedestal = 0;
+
+    for (int istrip = 0; istrip < nStrip; ++istrip) {
+      meanPedestal = meanPedestal + pedestalHandle_->getPed(istrip, pedRange);
+
+    }  // istrip
 
+    meanPedestal = meanPedestal / nStrip;
 
     // -----
     // get detIds belonging to same layer to fill X-axis with detId-number
-  
+
     std::vector<uint32_t> sameLayerDetIds_;
-  
+
     sameLayerDetIds_.clear();
 
-    sameLayerDetIds_=GetSameLayerDetId(activeDetIds,selDetId_,tTopo);
-  
-  
-    unsigned int iBin=0;
-    for(unsigned int i=0;i<sameLayerDetIds_.size();i++){
-      if(sameLayerDetIds_[i]==selDetId_){iBin=i+1;}
-    }   
-  
-    selME_.SummaryDistr->Fill(iBin,meanPedestal);
+    sameLayerDetIds_ = GetSameLayerDetId(activeDetIds, selDetId_, tTopo);
 
-    // Fill the Histo_TkMap with the mean Pedestal:
-    if(HistoMaps_On_ ) Tk_HM_->fill(selDetId_, meanPedestal);
+    unsigned int iBin = 0;
+    for (unsigned int i = 0; i < sameLayerDetIds_.size(); i++) {
+      if (sameLayerDetIds_[i] == selDetId_) {
+        iBin = i + 1;
+      }
+    }
 
+    selME_.SummaryDistr->Fill(iBin, meanPedestal);
 
-  }//if Fill ...
-  
-  
-  
-} 
-// -----
+    // Fill the Histo_TkMap with the mean Pedestal:
+    if (HistoMaps_On_)
+      Tk_HM_->fill(selDetId_, meanPedestal);
 
+  }  // if Fill ...
+}
+// -----
diff --git a/DQM/SiStripMonitorSummary/src/SiStripQualityDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripQualityDQM.cc
index db90a84bb4176..d61d85acd9db2 100644
--- a/DQM/SiStripMonitorSummary/src/SiStripQualityDQM.cc
+++ b/DQM/SiStripMonitorSummary/src/SiStripQualityDQM.cc
@@ -4,326 +4,302 @@
 #include "TCanvas.h"
 
 // -----
-SiStripQualityDQM::SiStripQualityDQM(const edm::EventSetup & eSetup,
+SiStripQualityDQM::SiStripQualityDQM(const edm::EventSetup &eSetup,
                                      edm::RunNumber_t iRun,
-                                     edm::ParameterSet const& hPSet,
-                                     edm::ParameterSet const& fPSet):SiStripBaseCondObjDQM(eSetup, iRun, hPSet, fPSet){
+                                     edm::ParameterSet const &hPSet,
+                                     edm::ParameterSet const &fPSet)
+    : SiStripBaseCondObjDQM(eSetup, iRun, hPSet, fPSet) {
   qualityLabel_ = fPSet.getParameter<std::string>("StripQualityLabel");
 
   // Build the Histo_TkMap:
-  if ( HistoMaps_On_ ) {
+  if (HistoMaps_On_) {
     edm::ESHandle<TkDetMap> tkDetMapHandle;
     eSetup.get<TrackerTopologyRcd>().get(tkDetMapHandle);
-    Tk_HM_ = std::make_unique<TkHistoMap>(tkDetMapHandle.product(), "SiStrip/Histo_Map","Quality_TkMap",0.);
+    Tk_HM_ = std::make_unique<TkHistoMap>(tkDetMapHandle.product(), "SiStrip/Histo_Map", "Quality_TkMap", 0.);
   }
 }
 // -----
 
-
-
 // -----
-SiStripQualityDQM::~SiStripQualityDQM(){}
+SiStripQualityDQM::~SiStripQualityDQM() {}
 // -----
 
-
 // -----
-void SiStripQualityDQM::getActiveDetIds(const edm::EventSetup & eSetup){
+void SiStripQualityDQM::getActiveDetIds(const edm::EventSetup &eSetup) {
   getConditionObject(eSetup);
   qualityHandle_->getDetIds(activeDetIds);
-
 }
 // -----
 
 //================================================
 // -----
-void SiStripQualityDQM::fillModMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es){
-
-  //Retrieve tracker topology from geometry
+void SiStripQualityDQM::fillModMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   es.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
-   
+  const TrackerTopology *const tTopo = tTopoHandle.product();
+
   ModMEs CondObj_ME;
-  
-  for(std::vector<uint32_t>::const_iterator detIter_ = selectedDetIds.begin();
-                                            detIter_!= selectedDetIds.end();detIter_++){
-    fillMEsForDet(CondObj_ME,*detIter_,tTopo);
-      
+
+  for (std::vector<uint32_t>::const_iterator detIter_ = selectedDetIds.begin(); detIter_ != selectedDetIds.end();
+       detIter_++) {
+    fillMEsForDet(CondObj_ME, *detIter_, tTopo);
   }
-}    
+}
 // -----
 
-
-
 //===================================================
 // -----
-void SiStripQualityDQM::fillMEsForDet(const ModMEs& _selModME_, uint32_t selDetId_, const TrackerTopology* tTopo){
-  ModMEs selModME_ = _selModME_;  
-  getModMEs(selModME_,selDetId_, tTopo);
-  
+void SiStripQualityDQM::fillMEsForDet(const ModMEs &_selModME_, uint32_t selDetId_, const TrackerTopology *tTopo) {
+  ModMEs selModME_ = _selModME_;
+  getModMEs(selModME_, selDetId_, tTopo);
+
   SiStripQuality::Range qualityRange = qualityHandle_->getRange(selDetId_);
-  int nStrip =  reader->getNumberOfApvsAndStripLength(selDetId_).first*128;
-  
-  for( int istrip=0;istrip<nStrip;++istrip){
-         selModME_.ProfileDistr->Fill(istrip+1,qualityHandle_->IsStripBad(qualityRange,istrip)?0.:1.);
-
-  }// istrip
-  
-}    
+  int nStrip = reader->getNumberOfApvsAndStripLength(selDetId_).first * 128;
+
+  for (int istrip = 0; istrip < nStrip; ++istrip) {
+    selModME_.ProfileDistr->Fill(istrip + 1, qualityHandle_->IsStripBad(qualityRange, istrip) ? 0. : 1.);
+
+  }  // istrip
+}
 // -----
 
 //====================================================
 // -----
-void SiStripQualityDQM::fillSummaryMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es){
-
-  //Retrieve tracker topology from geometry
+void SiStripQualityDQM::fillSummaryMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   es.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
-
-  for(std::vector<uint32_t>::const_iterator detIter_ = selectedDetIds.begin();
-                                            detIter_!= selectedDetIds.end();detIter_++){
-    fillMEsForLayer(/*SummaryMEsMap_,*/ *detIter_,tTopo);
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
+  for (std::vector<uint32_t>::const_iterator detIter_ = selectedDetIds.begin(); detIter_ != selectedDetIds.end();
+       detIter_++) {
+    fillMEsForLayer(/*SummaryMEsMap_,*/ *detIter_, tTopo);
   }
 
-  for (std::map<uint32_t, ModMEs>::iterator iter=SummaryMEsMap_.begin(); iter!=SummaryMEsMap_.end(); iter++){
-
+  for (std::map<uint32_t, ModMEs>::iterator iter = SummaryMEsMap_.begin(); iter != SummaryMEsMap_.end(); iter++) {
     ModMEs selME;
     selME = iter->second;
 
-    if(hPSet_.getParameter<bool>("FillSummaryAtLayerLevel") && fPSet_.getParameter<bool>("OutputSummaryAtLayerLevelAsImage")){
-
+    if (hPSet_.getParameter<bool>("FillSummaryAtLayerLevel") &&
+        fPSet_.getParameter<bool>("OutputSummaryAtLayerLevelAsImage")) {
       TCanvas c1("c1");
       selME.SummaryDistr->getTH1()->Draw();
-      std::string name (selME.SummaryDistr->getTH1()->GetTitle());
-      name+=".png";
+      std::string name(selME.SummaryDistr->getTH1()->GetTitle());
+      name += ".png";
       c1.Print(name.c_str());
     }
   }
-
 }
 // -----
 
-
 //=================================================
 // -----
-void SiStripQualityDQM::fillMEsForLayer(/* std::map<uint32_t, ModMEs> selMEsMap_,*/ uint32_t selDetId_, const TrackerTopology* tTopo){
-  
-  float numberOfBadStrips=0;
-  
+void SiStripQualityDQM::fillMEsForLayer(
+    /* std::map<uint32_t, ModMEs> selMEsMap_,*/ uint32_t selDetId_, const TrackerTopology *tTopo) {
+  float numberOfBadStrips = 0;
+
   SiStripHistoId hidmanager;
 
-  if(hPSet_.getParameter<bool>("FillSummaryAtLayerLevel")){
-      
+  if (hPSet_.getParameter<bool>("FillSummaryAtLayerLevel")) {
     std::string hSummary_description;
-    hSummary_description  = hPSet_.getParameter<std::string>("Summary_description");
-      
-    std::string hSummary_name; 
-  
+    hSummary_description = hPSet_.getParameter<std::string>("Summary_description");
+
+    std::string hSummary_name;
+
     // ----
-    int subDetId_ = ((selDetId_>>25)&0x7);
-  
-    if( subDetId_<3 || subDetId_>6 ){ 
-      edm::LogError("SiStripQualityDQM")
-	<< "[SiStripQualityDQM::fillMEsForLayer] WRONG INPUT : no such subdetector type : "
-	<< subDetId_ << " no folder set!" 
-	<< std::endl;
+    int subDetId_ = ((selDetId_ >> 25) & 0x7);
+
+    if (subDetId_ < 3 || subDetId_ > 6) {
+      edm::LogError("SiStripQualityDQM") << "[SiStripQualityDQM::fillMEsForLayer] WRONG INPUT : no such "
+                                            "subdetector type : "
+                                         << subDetId_ << " no folder set!" << std::endl;
       return;
     }
     // ----
 
-    hSummary_name = hidmanager.createHistoLayer(hSummary_description, 
-						"layer", 
-						getLayerNameAndId(selDetId_,tTopo).first, 
-						"") ;
-        
-    std::map<uint32_t, ModMEs>::iterator selMEsMapIter_ = SummaryMEsMap_.find(getLayerNameAndId(selDetId_,tTopo).second);
-    
+    hSummary_name =
+        hidmanager.createHistoLayer(hSummary_description, "layer", getLayerNameAndId(selDetId_, tTopo).first, "");
+
+    std::map<uint32_t, ModMEs>::iterator selMEsMapIter_ =
+        SummaryMEsMap_.find(getLayerNameAndId(selDetId_, tTopo).second);
+
     ModMEs selME_;
-    if ( selMEsMapIter_ != SummaryMEsMap_.end())
-      selME_ =selMEsMapIter_->second;
+    if (selMEsMapIter_ != SummaryMEsMap_.end())
+      selME_ = selMEsMapIter_->second;
+
+    getSummaryMEs(selME_, selDetId_, tTopo);
 
-    getSummaryMEs(selME_,selDetId_,tTopo);
-  
-  
     std::vector<uint32_t> sameLayerDetIds_;
     sameLayerDetIds_.clear();
-    sameLayerDetIds_=GetSameLayerDetId(activeDetIds,selDetId_,tTopo);
+    sameLayerDetIds_ = GetSameLayerDetId(activeDetIds, selDetId_, tTopo);
     // -----
-  //  unsigned int iBin=0;
+    //  unsigned int iBin=0;
 
     //%%%%%%%%%%%%%%%%%%%
     //%%% FIXME: patch to fix the bug causing double counting on each layer
     //%%%%%%%%%%%%%%%%%%%%%%%
-    if(std::binary_search(alreadyFilledLayers.begin(),alreadyFilledLayers.end(),sameLayerDetIds_[0]))
+    if (std::binary_search(alreadyFilledLayers.begin(), alreadyFilledLayers.end(), sameLayerDetIds_[0]))
       return;
     alreadyFilledLayers.push_back(sameLayerDetIds_[0]);
-    sort(alreadyFilledLayers.begin(),alreadyFilledLayers.end());
+    sort(alreadyFilledLayers.begin(), alreadyFilledLayers.end());
     //%%%%%%%%%%%%%%%%%%%%%%% END %%%%%%%%%%
 
-    for(unsigned int i=0;i< sameLayerDetIds_.size(); i++){
-    
+    for (unsigned int i = 0; i < sameLayerDetIds_.size(); i++) {
       SiStripQuality::Range qualityRange = qualityHandle_->getRange(sameLayerDetIds_[i]);
-      int nStrip =  reader->getNumberOfApvsAndStripLength(sameLayerDetIds_[i]).first*128;
-    
-      numberOfBadStrips=0;
-    
-      for( int istrip=0;istrip<nStrip;++istrip){
-	if(qualityHandle_->IsStripBad(qualityRange,istrip)) { numberOfBadStrips++;}
+      int nStrip = reader->getNumberOfApvsAndStripLength(sameLayerDetIds_[i]).first * 128;
+
+      numberOfBadStrips = 0;
+
+      for (int istrip = 0; istrip < nStrip; ++istrip) {
+        if (qualityHandle_->IsStripBad(qualityRange, istrip)) {
+          numberOfBadStrips++;
+        }
       }
-    
-	float fr=100*float(numberOfBadStrips)/nStrip;
-	selME_.SummaryDistr->Fill(i+1,fr);
-	if(fr>20){
-	  char c[9];
-	  sprintf(c,"%d",sameLayerDetIds_[i]);
-	  selME_.SummaryDistr->getTH1()->GetXaxis()->SetBinLabel(i+1,c);
-	}
-
-	// Fill the TkHistoMap with Quality output :
-	if(HistoMaps_On_ ) Tk_HM_->setBinContent(sameLayerDetIds_[i], fr);
-
-	// Fill the TkMap
-	if(fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")){
-	  fillTkMap(sameLayerDetIds_[i], fr);
-	}
-    } 
-  }//if Fill ...  
-}  
+
+      float fr = 100 * float(numberOfBadStrips) / nStrip;
+      selME_.SummaryDistr->Fill(i + 1, fr);
+      if (fr > 20) {
+        char c[9];
+        sprintf(c, "%d", sameLayerDetIds_[i]);
+        selME_.SummaryDistr->getTH1()->GetXaxis()->SetBinLabel(i + 1, c);
+      }
+
+      // Fill the TkHistoMap with Quality output :
+      if (HistoMaps_On_)
+        Tk_HM_->setBinContent(sameLayerDetIds_[i], fr);
+
+      // Fill the TkMap
+      if (fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")) {
+        fillTkMap(sameLayerDetIds_[i], fr);
+      }
+    }
+  }  // if Fill ...
+}
 // -----
- 
 
 //=============================
-void SiStripQualityDQM::fillGrandSummaryMEs(const edm::EventSetup& eSetup){
-
-  //Retrieve tracker topology from geometry
+void SiStripQualityDQM::fillGrandSummaryMEs(const edm::EventSetup &eSetup) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   eSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
-     
-  std::string hSummary_BadObjects_xTitle        = hPSet_.getParameter<std::string>("Summary_BadObjects_histo_xTitle");
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
-  std::string hSummary_BadModules_name          = hPSet_.getParameter<std::string>("Summary_BadModules_histo_name");
-  std::string hSummary_BadModules_yTitle        = hPSet_.getParameter<std::string>("Summary_BadModules_histo_yTitle");
+  std::string hSummary_BadObjects_xTitle = hPSet_.getParameter<std::string>("Summary_BadObjects_histo_xTitle");
 
-  std::string hSummary_BadFibers_name          = hPSet_.getParameter<std::string>("Summary_BadFibers_histo_name");
-  std::string hSummary_BadFibers_yTitle        = hPSet_.getParameter<std::string>("Summary_BadFibers_histo_yTitle");
+  std::string hSummary_BadModules_name = hPSet_.getParameter<std::string>("Summary_BadModules_histo_name");
+  std::string hSummary_BadModules_yTitle = hPSet_.getParameter<std::string>("Summary_BadModules_histo_yTitle");
 
-  std::string hSummary_BadApvs_name          = hPSet_.getParameter<std::string>("Summary_BadApvs_histo_name");
-  std::string hSummary_BadApvs_yTitle        = hPSet_.getParameter<std::string>("Summary_BadApvs_histo_yTitle");
+  std::string hSummary_BadFibers_name = hPSet_.getParameter<std::string>("Summary_BadFibers_histo_name");
+  std::string hSummary_BadFibers_yTitle = hPSet_.getParameter<std::string>("Summary_BadFibers_histo_yTitle");
 
-  std::string hSummary_BadStrips_name          = hPSet_.getParameter<std::string>("Summary_BadStrips_histo_name");
-  std::string hSummary_BadStrips_yTitle        = hPSet_.getParameter<std::string>("Summary_BadStrips_histo_yTitle");
+  std::string hSummary_BadApvs_name = hPSet_.getParameter<std::string>("Summary_BadApvs_histo_name");
+  std::string hSummary_BadApvs_yTitle = hPSet_.getParameter<std::string>("Summary_BadApvs_histo_yTitle");
 
-  int NchX           = 34; 
-  double LowX        = 0.5;
-  double HighX       = 34.5;
-                    
+  std::string hSummary_BadStrips_name = hPSet_.getParameter<std::string>("Summary_BadStrips_histo_name");
+  std::string hSummary_BadStrips_yTitle = hPSet_.getParameter<std::string>("Summary_BadStrips_histo_yTitle");
 
+  int NchX = 34;
+  double LowX = 0.5;
+  double HighX = 34.5;
 
-   
-  MonitorElement *ME[4];         
+  MonitorElement *ME[4];
 
-  DQMStore* dqmStore_=edm::Service<DQMStore>().operator->();
+  DQMStore *dqmStore_ = edm::Service<DQMStore>().operator->();
 
-  std::string FolderName=fPSet_.getParameter<std::string>("FolderName_For_QualityAndCabling_SummaryHistos");
+  std::string FolderName = fPSet_.getParameter<std::string>("FolderName_For_QualityAndCabling_SummaryHistos");
 
   dqmStore_->setCurrentFolder(FolderName);
 
-  ME[0] = dqmStore_->book1D(hSummary_BadModules_name,hSummary_BadModules_name,NchX,LowX,HighX);
-  ME[0]->setAxisTitle(hSummary_BadObjects_xTitle,1);
-  ME[0]->setAxisTitle(hSummary_BadModules_yTitle,2);
-
-  ME[1] = dqmStore_->book1D(hSummary_BadFibers_name,hSummary_BadFibers_name,NchX,LowX,HighX);
-  ME[1]->setAxisTitle(hSummary_BadObjects_xTitle,1);
-  ME[1]->setAxisTitle(hSummary_BadFibers_yTitle,2);
+  ME[0] = dqmStore_->book1D(hSummary_BadModules_name, hSummary_BadModules_name, NchX, LowX, HighX);
+  ME[0]->setAxisTitle(hSummary_BadObjects_xTitle, 1);
+  ME[0]->setAxisTitle(hSummary_BadModules_yTitle, 2);
 
-  ME[2] = dqmStore_->book1D(hSummary_BadApvs_name,hSummary_BadApvs_name,NchX,LowX,HighX);
-  ME[2]->setAxisTitle(hSummary_BadObjects_xTitle,1);
-  ME[2]->setAxisTitle(hSummary_BadApvs_yTitle,2);
+  ME[1] = dqmStore_->book1D(hSummary_BadFibers_name, hSummary_BadFibers_name, NchX, LowX, HighX);
+  ME[1]->setAxisTitle(hSummary_BadObjects_xTitle, 1);
+  ME[1]->setAxisTitle(hSummary_BadFibers_yTitle, 2);
 
-  ME[3] = dqmStore_->book1D(hSummary_BadStrips_name,hSummary_BadStrips_name,NchX,LowX,HighX);
-  ME[3]->setAxisTitle(hSummary_BadObjects_xTitle,1);
-  ME[3]->setAxisTitle(hSummary_BadStrips_yTitle,2);
+  ME[2] = dqmStore_->book1D(hSummary_BadApvs_name, hSummary_BadApvs_name, NchX, LowX, HighX);
+  ME[2]->setAxisTitle(hSummary_BadObjects_xTitle, 1);
+  ME[2]->setAxisTitle(hSummary_BadApvs_yTitle, 2);
 
+  ME[3] = dqmStore_->book1D(hSummary_BadStrips_name, hSummary_BadStrips_name, NchX, LowX, HighX);
+  ME[3]->setAxisTitle(hSummary_BadObjects_xTitle, 1);
+  ME[3]->setAxisTitle(hSummary_BadStrips_yTitle, 2);
 
   //==============================
 
-  for(int i=0;i<4;++i){
-    NTkBadComponent[i]=0;
-    for(int j=0;j<19;++j){
+  for (int i = 0; i < 4; ++i) {
+    NTkBadComponent[i] = 0;
+    for (int j = 0; j < 19; ++j) {
       ssV[i][j].str("");
-      for(int k=0;k<4;++k)
-	NBadComponent[i][j][k]=0;
+      for (int k = 0; k < 4; ++k)
+        NBadComponent[i][j][k] = 0;
     }
   }
 
   std::stringstream ss;
-  ss.str(""); 
-  std::vector<uint32_t> detids=reader->getAllDetIds();
-  std::vector<uint32_t>::const_iterator idet=detids.begin();
-  for(;idet!=detids.end();++idet){
+  ss.str("");
+  std::vector<uint32_t> detids = reader->getAllDetIds();
+  std::vector<uint32_t>::const_iterator idet = detids.begin();
+  for (; idet != detids.end(); ++idet) {
     ss << "detid " << (*idet) << " IsModuleUsable " << qualityHandle_->IsModuleUsable((*idet)) << "\n";
   }
   LogDebug("SiStripQualityDQM") << ss.str() << std::endl;
 
-
   std::vector<SiStripQuality::BadComponent> BC = qualityHandle_->getBadComponentList();
-  
-  for (size_t i=0;i<BC.size();++i){
-    
+
+  for (size_t i = 0; i < BC.size(); ++i) {
     //&&&&&&&&&&&&&
-    //Full Tk
+    // Full Tk
     //&&&&&&&&&&&&&
 
-    if (BC[i].BadModule) 
+    if (BC[i].BadModule)
       NTkBadComponent[0]++;
-    if (BC[i].BadFibers) 
-      NTkBadComponent[1]+= ( (BC[i].BadFibers>>2)&0x1 )+ ( (BC[i].BadFibers>>1)&0x1 ) + ( (BC[i].BadFibers)&0x1 );
+    if (BC[i].BadFibers)
+      NTkBadComponent[1] += ((BC[i].BadFibers >> 2) & 0x1) + ((BC[i].BadFibers >> 1) & 0x1) + ((BC[i].BadFibers) & 0x1);
     if (BC[i].BadApvs)
-      NTkBadComponent[2]+= ( (BC[i].BadApvs>>5)&0x1 )+ ( (BC[i].BadApvs>>4)&0x1 ) + ( (BC[i].BadApvs>>3)&0x1 ) + 
-	( (BC[i].BadApvs>>2)&0x1 )+ ( (BC[i].BadApvs>>1)&0x1 ) + ( (BC[i].BadApvs)&0x1 );
+      NTkBadComponent[2] += ((BC[i].BadApvs >> 5) & 0x1) + ((BC[i].BadApvs >> 4) & 0x1) + ((BC[i].BadApvs >> 3) & 0x1) +
+                            ((BC[i].BadApvs >> 2) & 0x1) + ((BC[i].BadApvs >> 1) & 0x1) + ((BC[i].BadApvs) & 0x1);
 
     //&&&&&&&&&&&&&&&&&
-    //Single SubSyste
+    // Single SubSyste
     //&&&&&&&&&&&&&&&&&
 
     int component;
     SiStripDetId a(BC[i].detid);
-    if ( a.subdetId() == SiStripDetId::TIB ){
+    if (a.subdetId() == SiStripDetId::TIB) {
       //&&&&&&&&&&&&&&&&&
-      //TIB
+      // TIB
       //&&&&&&&&&&&&&&&&&
-      
-      component=tTopo->tibLayer(BC[i].detid);
-      SetBadComponents(0, component, BC[i]);         
 
-    } else if ( a.subdetId() == SiStripDetId::TID ) {
+      component = tTopo->tibLayer(BC[i].detid);
+      SetBadComponents(0, component, BC[i]);
+
+    } else if (a.subdetId() == SiStripDetId::TID) {
       //&&&&&&&&&&&&&&&&&
-      //TID
+      // TID
       //&&&&&&&&&&&&&&&&&
 
-      component=tTopo->tidSide(BC[i].detid)==2?tTopo->tidWheel(BC[i].detid):tTopo->tidWheel(BC[i].detid)+3;
-      SetBadComponents(1, component, BC[i]);         
+      component = tTopo->tidSide(BC[i].detid) == 2 ? tTopo->tidWheel(BC[i].detid) : tTopo->tidWheel(BC[i].detid) + 3;
+      SetBadComponents(1, component, BC[i]);
 
-    } else if ( a.subdetId() == SiStripDetId::TOB ) {
+    } else if (a.subdetId() == SiStripDetId::TOB) {
       //&&&&&&&&&&&&&&&&&
-      //TOB
+      // TOB
       //&&&&&&&&&&&&&&&&&
 
-      component=tTopo->tobLayer(BC[i].detid);
-      SetBadComponents(2, component, BC[i]);         
+      component = tTopo->tobLayer(BC[i].detid);
+      SetBadComponents(2, component, BC[i]);
 
-    } else if ( a.subdetId() == SiStripDetId::TEC ) {
+    } else if (a.subdetId() == SiStripDetId::TEC) {
       //&&&&&&&&&&&&&&&&&
-      //TEC
+      // TEC
       //&&&&&&&&&&&&&&&&&
 
-      component=tTopo->tecSide(BC[i].detid)==2?tTopo->tecWheel(BC[i].detid):tTopo->tecWheel(BC[i].detid)+9;
-      SetBadComponents(3, component, BC[i]);         
-
-    }    
+      component = tTopo->tecSide(BC[i].detid) == 2 ? tTopo->tecWheel(BC[i].detid) : tTopo->tecWheel(BC[i].detid) + 9;
+      SetBadComponents(3, component, BC[i]);
+    }
   }
 
   //&&&&&&&&&&&&&&&&&&
@@ -331,193 +307,197 @@ void SiStripQualityDQM::fillGrandSummaryMEs(const edm::EventSetup& eSetup){
   //&&&&&&&&&&&&&&&&&&
 
   SiStripQuality::RegistryIterator rbegin = qualityHandle_->getRegistryVectorBegin();
-  SiStripQuality::RegistryIterator rend   = qualityHandle_->getRegistryVectorEnd();
-  
-  for (SiStripBadStrip::RegistryIterator rp=rbegin; rp != rend; ++rp) {
-    uint32_t detid=rp->detid;
+  SiStripQuality::RegistryIterator rend = qualityHandle_->getRegistryVectorEnd();
+
+  for (SiStripBadStrip::RegistryIterator rp = rbegin; rp != rend; ++rp) {
+    uint32_t detid = rp->detid;
 
-    int subdet=0;
-    int component=0;
+    int subdet = 0;
+    int component = 0;
     SiStripDetId a(detid);
-    if ( a.subdetId() == 3 ){
-      subdet=0;
-      component=tTopo->tibLayer(detid);
-    } else if ( a.subdetId() == 4 ) {
-      subdet=1;
-      component=tTopo->tidSide(detid)==2?tTopo->tidWheel(detid):tTopo->tidWheel(detid)+3;
-    } else if ( a.subdetId() == 5 ) {
-      subdet=2;
-      component=tTopo->tobLayer(detid);
-    } else if ( a.subdetId() == 6 ) {
-      subdet=3;
-      component=tTopo->tecSide(detid)==2?tTopo->tecWheel(detid):tTopo->tecWheel(detid)+9;
-    } 
-
-    SiStripQuality::Range sqrange = SiStripQuality::Range( qualityHandle_->getDataVectorBegin()+rp->ibegin , qualityHandle_->getDataVectorBegin()+rp->iend );
-        
-    for(int it=0;it<sqrange.second-sqrange.first;it++){
-      unsigned int range=qualityHandle_->decode( *(sqrange.first+it) ).range;
-      NTkBadComponent[3]+=range;
-      NBadComponent[subdet][0][3]+=range;
-      NBadComponent[subdet][component][3]+=range;
+    if (a.subdetId() == 3) {
+      subdet = 0;
+      component = tTopo->tibLayer(detid);
+    } else if (a.subdetId() == 4) {
+      subdet = 1;
+      component = tTopo->tidSide(detid) == 2 ? tTopo->tidWheel(detid) : tTopo->tidWheel(detid) + 3;
+    } else if (a.subdetId() == 5) {
+      subdet = 2;
+      component = tTopo->tobLayer(detid);
+    } else if (a.subdetId() == 6) {
+      subdet = 3;
+      component = tTopo->tecSide(detid) == 2 ? tTopo->tecWheel(detid) : tTopo->tecWheel(detid) + 9;
+    }
+
+    SiStripQuality::Range sqrange = SiStripQuality::Range(qualityHandle_->getDataVectorBegin() + rp->ibegin,
+                                                          qualityHandle_->getDataVectorBegin() + rp->iend);
+
+    for (int it = 0; it < sqrange.second - sqrange.first; it++) {
+      unsigned int range = qualityHandle_->decode(*(sqrange.first + it)).range;
+      NTkBadComponent[3] += range;
+      NBadComponent[subdet][0][3] += range;
+      NBadComponent[subdet][component][3] += range;
     }
   }
-  
- 
+
   //&&&&&&&&&&&&&&&&&&
   // printout
   //&&&&&&&&&&&&&&&&&&
 
   ss.str("");
   ss << "\n-----------------\nGlobal Info\n-----------------";
-  ss << "\nBadComponent \t   Modules \tFibers \tApvs\tStrips\n----------------------------------------------------------------";
-  ss << "\nTracker:\t\t"<<NTkBadComponent[0]<<"\t"<<NTkBadComponent[1]<<"\t"<<NTkBadComponent[2]<<"\t"<<NTkBadComponent[3];
-  ss<< "\n";
-  ss << "\nTIB:\t\t\t"<<NBadComponent[0][0][0]<<"\t"<<NBadComponent[0][0][1]<<"\t"<<NBadComponent[0][0][2]<<"\t"<<NBadComponent[0][0][3];
-  ss << "\nTID:\t\t\t"<<NBadComponent[1][0][0]<<"\t"<<NBadComponent[1][0][1]<<"\t"<<NBadComponent[1][0][2]<<"\t"<<NBadComponent[1][0][3];
-  ss << "\nTOB:\t\t\t"<<NBadComponent[2][0][0]<<"\t"<<NBadComponent[2][0][1]<<"\t"<<NBadComponent[2][0][2]<<"\t"<<NBadComponent[2][0][3];
-  ss << "\nTEC:\t\t\t"<<NBadComponent[3][0][0]<<"\t"<<NBadComponent[3][0][1]<<"\t"<<NBadComponent[3][0][2]<<"\t"<<NBadComponent[3][0][3];
+  ss << "\nBadComponent \t   Modules \tFibers "
+        "\tApvs\tStrips\n------------------------------------------------------"
+        "----------";
+  ss << "\nTracker:\t\t" << NTkBadComponent[0] << "\t" << NTkBadComponent[1] << "\t" << NTkBadComponent[2] << "\t"
+     << NTkBadComponent[3];
+  ss << "\n";
+  ss << "\nTIB:\t\t\t" << NBadComponent[0][0][0] << "\t" << NBadComponent[0][0][1] << "\t" << NBadComponent[0][0][2]
+     << "\t" << NBadComponent[0][0][3];
+  ss << "\nTID:\t\t\t" << NBadComponent[1][0][0] << "\t" << NBadComponent[1][0][1] << "\t" << NBadComponent[1][0][2]
+     << "\t" << NBadComponent[1][0][3];
+  ss << "\nTOB:\t\t\t" << NBadComponent[2][0][0] << "\t" << NBadComponent[2][0][1] << "\t" << NBadComponent[2][0][2]
+     << "\t" << NBadComponent[2][0][3];
+  ss << "\nTEC:\t\t\t" << NBadComponent[3][0][0] << "\t" << NBadComponent[3][0][1] << "\t" << NBadComponent[3][0][2]
+     << "\t" << NBadComponent[3][0][3];
   ss << "\n";
 
-  for (int i=1;i<5;++i){
-    ss << "\nTIB Layer " << i   << " :\t\t"<<NBadComponent[0][i][0]<<"\t"<<NBadComponent[0][i][1]<<"\t"<<NBadComponent[0][i][2]<<"\t"<<NBadComponent[0][i][3];
+  for (int i = 1; i < 5; ++i) {
+    ss << "\nTIB Layer " << i << " :\t\t" << NBadComponent[0][i][0] << "\t" << NBadComponent[0][i][1] << "\t"
+       << NBadComponent[0][i][2] << "\t" << NBadComponent[0][i][3];
     std::stringstream binlabel;
-      binlabel<<"TIB L "<<i;
+    binlabel << "TIB L " << i;
 
-    for(int j=0;j<4;j++){
-      ME[j]->Fill(i,NBadComponent[0][i][j]);
-      ME[j]->getTH1()->GetXaxis()->SetBinLabel(i,binlabel.str().c_str());
+    for (int j = 0; j < 4; j++) {
+      ME[j]->Fill(i, NBadComponent[0][i][j]);
+      ME[j]->getTH1()->GetXaxis()->SetBinLabel(i, binlabel.str().c_str());
     }
   }
   ss << "\n";
-  for (int i=1;i<4;++i){
-    ss << "\nTID+ Disk " << i   << " :\t\t"<<NBadComponent[1][i][0]<<"\t"<<NBadComponent[1][i][1]<<"\t"<<NBadComponent[1][i][2]<<"\t"<<NBadComponent[1][i][3];
+  for (int i = 1; i < 4; ++i) {
+    ss << "\nTID+ Disk " << i << " :\t\t" << NBadComponent[1][i][0] << "\t" << NBadComponent[1][i][1] << "\t"
+       << NBadComponent[1][i][2] << "\t" << NBadComponent[1][i][3];
     std::stringstream binlabel;
-      binlabel<<"TID+ D "<<i;
-    
-    for(int j=0;j<4;j++){
-      ME[j]->Fill(i+4,NBadComponent[1][i][j]);
-      ME[j]->getTH1()->GetXaxis()->SetBinLabel(i+4,binlabel.str().c_str());
+    binlabel << "TID+ D " << i;
+
+    for (int j = 0; j < 4; j++) {
+      ME[j]->Fill(i + 4, NBadComponent[1][i][j]);
+      ME[j]->getTH1()->GetXaxis()->SetBinLabel(i + 4, binlabel.str().c_str());
     }
   }
-  for (int i=4;i<7;++i){
-    ss << "\nTID- Disk " << i-3 << " :\t\t"<<NBadComponent[1][i][0]<<"\t"<<NBadComponent[1][i][1]<<"\t"<<NBadComponent[1][i][2]<<"\t"<<NBadComponent[1][i][3];
+  for (int i = 4; i < 7; ++i) {
+    ss << "\nTID- Disk " << i - 3 << " :\t\t" << NBadComponent[1][i][0] << "\t" << NBadComponent[1][i][1] << "\t"
+       << NBadComponent[1][i][2] << "\t" << NBadComponent[1][i][3];
     std::stringstream binlabel;
-      binlabel<<"TID- D "<<i-3;
+    binlabel << "TID- D " << i - 3;
 
-    for(int j=0;j<4;j++){
-      ME[j]->Fill(i+4,NBadComponent[1][i][j]);
-      ME[j]->getTH1()->GetXaxis()->SetBinLabel(i+4,binlabel.str().c_str());
+    for (int j = 0; j < 4; j++) {
+      ME[j]->Fill(i + 4, NBadComponent[1][i][j]);
+      ME[j]->getTH1()->GetXaxis()->SetBinLabel(i + 4, binlabel.str().c_str());
     }
   }
   ss << "\n";
-  for (int i=1;i<7;++i){
-    ss << "\nTOB Layer " << i   << " :\t\t"<<NBadComponent[2][i][0]<<"\t"<<NBadComponent[2][i][1]<<"\t"<<NBadComponent[2][i][2]<<"\t"<<NBadComponent[2][i][3];
+  for (int i = 1; i < 7; ++i) {
+    ss << "\nTOB Layer " << i << " :\t\t" << NBadComponent[2][i][0] << "\t" << NBadComponent[2][i][1] << "\t"
+       << NBadComponent[2][i][2] << "\t" << NBadComponent[2][i][3];
     std::stringstream binlabel;
-      binlabel<<"TOB L "<<i;
+    binlabel << "TOB L " << i;
 
-    for(int j=0;j<4;j++){
-      ME[j]->Fill(i+10,NBadComponent[2][i][j]);
-      ME[j]->getTH1()->GetXaxis()->SetBinLabel(i+10,binlabel.str().c_str());
-    }  
+    for (int j = 0; j < 4; j++) {
+      ME[j]->Fill(i + 10, NBadComponent[2][i][j]);
+      ME[j]->getTH1()->GetXaxis()->SetBinLabel(i + 10, binlabel.str().c_str());
+    }
   }
   ss << "\n";
-  for (int i=1;i<10;++i){
-    ss << "\nTEC+ Disk " << i   << " :\t\t"<<NBadComponent[3][i][0]<<"\t"<<NBadComponent[3][i][1]<<"\t"<<NBadComponent[3][i][2]<<"\t"<<NBadComponent[3][i][3];
+  for (int i = 1; i < 10; ++i) {
+    ss << "\nTEC+ Disk " << i << " :\t\t" << NBadComponent[3][i][0] << "\t" << NBadComponent[3][i][1] << "\t"
+       << NBadComponent[3][i][2] << "\t" << NBadComponent[3][i][3];
     std::stringstream binlabel;
-      binlabel<<"TEC+ D "<<i;
+    binlabel << "TEC+ D " << i;
 
-    for(int j=0;j<4;j++){
-      ME[j]->Fill(i+16,NBadComponent[3][i][j]);
-      ME[j]->getTH1()->GetXaxis()->SetBinLabel(i+16,binlabel.str().c_str());
+    for (int j = 0; j < 4; j++) {
+      ME[j]->Fill(i + 16, NBadComponent[3][i][j]);
+      ME[j]->getTH1()->GetXaxis()->SetBinLabel(i + 16, binlabel.str().c_str());
     }
   }
-  for (int i=10;i<19;++i){
-    ss << "\nTEC- Disk " << i-9 << " :\t\t"<<NBadComponent[3][i][0]<<"\t"<<NBadComponent[3][i][1]<<"\t"<<NBadComponent[3][i][2]<<"\t"<<NBadComponent[3][i][3];
+  for (int i = 10; i < 19; ++i) {
+    ss << "\nTEC- Disk " << i - 9 << " :\t\t" << NBadComponent[3][i][0] << "\t" << NBadComponent[3][i][1] << "\t"
+       << NBadComponent[3][i][2] << "\t" << NBadComponent[3][i][3];
     std::stringstream binlabel;
-      binlabel<<"TEC- D "<<i-9;
+    binlabel << "TEC- D " << i - 9;
 
-    for(int j=0;j<4;j++){
-      ME[j]->Fill(i+16,NBadComponent[3][i][j]);
-      ME[j]->getTH1()->GetXaxis()->SetBinLabel(i+16,binlabel.str().c_str());
+    for (int j = 0; j < 4; j++) {
+      ME[j]->Fill(i + 16, NBadComponent[3][i][j]);
+      ME[j]->getTH1()->GetXaxis()->SetBinLabel(i + 16, binlabel.str().c_str());
     }
   }
-  ss<< "\n";
+  ss << "\n";
 
-  ss << "\n----------------------------------------------------------------\n\t\t   Detid  \tModules Fibers Apvs\n----------------------------------------------------------------";
-  for (int i=1;i<5;++i)
+  ss << "\n----------------------------------------------------------------"
+        "\n\t\t   Detid  \tModules Fibers "
+        "Apvs\n---------------------------------------------------------------"
+        "-";
+  for (int i = 1; i < 5; ++i)
     ss << "\nTIB Layer " << i << " :" << ssV[0][i].str();
   ss << "\n";
-  for (int i=1;i<4;++i)
+  for (int i = 1; i < 4; ++i)
     ss << "\nTID+ Disk " << i << " :" << ssV[1][i].str();
-  for (int i=4;i<7;++i)
-    ss << "\nTID- Disk " << i-3 << " :" << ssV[1][i].str();
+  for (int i = 4; i < 7; ++i)
+    ss << "\nTID- Disk " << i - 3 << " :" << ssV[1][i].str();
   ss << "\n";
-  for (int i=1;i<7;++i)
+  for (int i = 1; i < 7; ++i)
     ss << "\nTOB Layer " << i << " :" << ssV[2][i].str();
   ss << "\n";
-  for (int i=1;i<10;++i)
+  for (int i = 1; i < 10; ++i)
     ss << "\nTEC+ Disk " << i << " :" << ssV[3][i].str();
-  for (int i=10;i<19;++i)
-    ss << "\nTEC- Disk " << i-9 << " :" << ssV[3][i].str();
-
+  for (int i = 10; i < 19; ++i)
+    ss << "\nTEC- Disk " << i - 9 << " :" << ssV[3][i].str();
 
   edm::LogInfo("SiStripQualityDQM") << ss.str() << std::endl;
 
-  for (int i=0; i<4; i++){
+  for (int i = 0; i < 4; i++) {
     TCanvas c1("c1");
     ME[i]->getTH1()->Draw();
-    std::string name (ME[i]->getTH1()->GetTitle());
-    name+=".png";
+    std::string name(ME[i]->getTH1()->GetTitle());
+    name += ".png";
     c1.Print(name.c_str());
   }
-
-
-} 
+}
 
 //=====================
-void SiStripQualityDQM::SetBadComponents(int i, int component,SiStripQuality::BadComponent& BC){
-
-  int napv=reader->getNumberOfApvsAndStripLength(BC.detid).first;
-
-  ssV[i][component] << "\n\t\t " 
-		    << BC.detid 
-		    << " \t " << BC.BadModule << " \t " 
-		    << ( (BC.BadFibers)&0x1 ) << " ";
-  if (napv==4)
-    ssV[i][component] << "x " <<( (BC.BadFibers>>1)&0x1 );
-  
-  if (napv==6)
-    ssV[i][component] << ( (BC.BadFibers>>1)&0x1 ) << " "
-		      << ( (BC.BadFibers>>2)&0x1 );
-  ssV[i][component] << " \t " 
-		    << ( (BC.BadApvs)&0x1 ) << " " 
-		    << ( (BC.BadApvs>>1)&0x1 ) << " ";
-  if (napv==4) 
-    ssV[i][component] << "x x " << ( (BC.BadApvs>>2)&0x1 ) << " " 
-		      << ( (BC.BadApvs>>3)&0x1 );
-  if (napv==6) 
-    ssV[i][component] << ( (BC.BadApvs>>2)&0x1 ) << " " 
-		      << ( (BC.BadApvs>>3)&0x1 ) << " " 
-		      << ( (BC.BadApvs>>4)&0x1 ) << " " 
-		      << ( (BC.BadApvs>>5)&0x1 ) << " "; 
-
-  if (BC.BadApvs){
-    NBadComponent[i][0][2]+= ( (BC.BadApvs>>5)&0x1 )+ ( (BC.BadApvs>>4)&0x1 ) + ( (BC.BadApvs>>3)&0x1 ) + 
-      ( (BC.BadApvs>>2)&0x1 )+ ( (BC.BadApvs>>1)&0x1 ) + ( (BC.BadApvs)&0x1 );
-    NBadComponent[i][component][2]+= ( (BC.BadApvs>>5)&0x1 )+ ( (BC.BadApvs>>4)&0x1 ) + ( (BC.BadApvs>>3)&0x1 ) + 
-      ( (BC.BadApvs>>2)&0x1 )+ ( (BC.BadApvs>>1)&0x1 ) + ( (BC.BadApvs)&0x1 );
+void SiStripQualityDQM::SetBadComponents(int i, int component, SiStripQuality::BadComponent &BC) {
+  int napv = reader->getNumberOfApvsAndStripLength(BC.detid).first;
+
+  ssV[i][component] << "\n\t\t " << BC.detid << " \t " << BC.BadModule << " \t " << ((BC.BadFibers) & 0x1) << " ";
+  if (napv == 4)
+    ssV[i][component] << "x " << ((BC.BadFibers >> 1) & 0x1);
+
+  if (napv == 6)
+    ssV[i][component] << ((BC.BadFibers >> 1) & 0x1) << " " << ((BC.BadFibers >> 2) & 0x1);
+  ssV[i][component] << " \t " << ((BC.BadApvs) & 0x1) << " " << ((BC.BadApvs >> 1) & 0x1) << " ";
+  if (napv == 4)
+    ssV[i][component] << "x x " << ((BC.BadApvs >> 2) & 0x1) << " " << ((BC.BadApvs >> 3) & 0x1);
+  if (napv == 6)
+    ssV[i][component] << ((BC.BadApvs >> 2) & 0x1) << " " << ((BC.BadApvs >> 3) & 0x1) << " "
+                      << ((BC.BadApvs >> 4) & 0x1) << " " << ((BC.BadApvs >> 5) & 0x1) << " ";
+
+  if (BC.BadApvs) {
+    NBadComponent[i][0][2] += ((BC.BadApvs >> 5) & 0x1) + ((BC.BadApvs >> 4) & 0x1) + ((BC.BadApvs >> 3) & 0x1) +
+                              ((BC.BadApvs >> 2) & 0x1) + ((BC.BadApvs >> 1) & 0x1) + ((BC.BadApvs) & 0x1);
+    NBadComponent[i][component][2] += ((BC.BadApvs >> 5) & 0x1) + ((BC.BadApvs >> 4) & 0x1) +
+                                      ((BC.BadApvs >> 3) & 0x1) + ((BC.BadApvs >> 2) & 0x1) +
+                                      ((BC.BadApvs >> 1) & 0x1) + ((BC.BadApvs) & 0x1);
     //    tkMap->fillc(BC.detid,0xff0000);
   }
-  if (BC.BadFibers){ 
-    NBadComponent[i][0][1]+= ( (BC.BadFibers>>2)&0x1 )+ ( (BC.BadFibers>>1)&0x1 ) + ( (BC.BadFibers)&0x1 );
-    NBadComponent[i][component][1]+= ( (BC.BadFibers>>2)&0x1 )+ ( (BC.BadFibers>>1)&0x1 ) + ( (BC.BadFibers)&0x1 );
+  if (BC.BadFibers) {
+    NBadComponent[i][0][1] += ((BC.BadFibers >> 2) & 0x1) + ((BC.BadFibers >> 1) & 0x1) + ((BC.BadFibers) & 0x1);
+    NBadComponent[i][component][1] +=
+        ((BC.BadFibers >> 2) & 0x1) + ((BC.BadFibers >> 1) & 0x1) + ((BC.BadFibers) & 0x1);
     //    tkMap->fillc(BC.detid,0x0000ff);
-  }   
-  if (BC.BadModule){
+  }
+  if (BC.BadModule) {
     NBadComponent[i][0][0]++;
     NBadComponent[i][component][0]++;
     //    tkMap->fillc(BC.detid,0x0);
   }
 }
-
diff --git a/DQM/SiStripMonitorSummary/src/SiStripThresholdDQM.cc b/DQM/SiStripMonitorSummary/src/SiStripThresholdDQM.cc
index 50f8a6052964f..3f08137e3cb24 100644
--- a/DQM/SiStripMonitorSummary/src/SiStripThresholdDQM.cc
+++ b/DQM/SiStripMonitorSummary/src/SiStripThresholdDQM.cc
@@ -5,34 +5,33 @@
 #include "TCanvas.h"
 
 // -----
-SiStripThresholdDQM::SiStripThresholdDQM(const edm::EventSetup & eSetup,
+SiStripThresholdDQM::SiStripThresholdDQM(const edm::EventSetup &eSetup,
                                          edm::RunNumber_t iRun,
-                                         edm::ParameterSet const& hPSet,
-                                         edm::ParameterSet const& fPSet):SiStripBaseCondObjDQM(eSetup, iRun, hPSet, fPSet){
-  WhichThreshold=hPSet.getParameter<std::string>("WhichThreshold");
+                                         edm::ParameterSet const &hPSet,
+                                         edm::ParameterSet const &fPSet)
+    : SiStripBaseCondObjDQM(eSetup, iRun, hPSet, fPSet) {
+  WhichThreshold = hPSet.getParameter<std::string>("WhichThreshold");
 
   // Build the Histo_TkMap:
-  if(HistoMaps_On_ ){
+  if (HistoMaps_On_) {
     edm::ESHandle<TkDetMap> tkDetMapHandle;
     eSetup.get<TrackerTopologyRcd>().get(tkDetMapHandle);
-    const TkDetMap* tkDetMap = tkDetMapHandle.product();
-    if(WhichThreshold=="Low") Tk_HM_L = std::make_unique<TkHistoMap>(tkDetMap, "SiStrip/Histo_Map","LowThresh_TkMap",0.);
-    if(WhichThreshold=="High") Tk_HM_H = std::make_unique<TkHistoMap>(tkDetMap, "SiStrip/Histo_Map","HighThresh_TkMap",0.);
+    const TkDetMap *tkDetMap = tkDetMapHandle.product();
+    if (WhichThreshold == "Low")
+      Tk_HM_L = std::make_unique<TkHistoMap>(tkDetMap, "SiStrip/Histo_Map", "LowThresh_TkMap", 0.);
+    if (WhichThreshold == "High")
+      Tk_HM_H = std::make_unique<TkHistoMap>(tkDetMap, "SiStrip/Histo_Map", "HighThresh_TkMap", 0.);
   }
 }
 
 // -----
 
-
-
 // -----
-SiStripThresholdDQM::~SiStripThresholdDQM(){}
+SiStripThresholdDQM::~SiStripThresholdDQM() {}
 // -----
 
-
 // -----
-void SiStripThresholdDQM::getActiveDetIds(const edm::EventSetup & eSetup){
-  
+void SiStripThresholdDQM::getActiveDetIds(const edm::EventSetup &eSetup) {
   getConditionObject(eSetup);
   thresholdHandle_->getDetIds(activeDetIds);
 }
@@ -40,198 +39,162 @@ void SiStripThresholdDQM::getActiveDetIds(const edm::EventSetup & eSetup){
 
 //=====================================================================================
 
-
 // -----
-void SiStripThresholdDQM::fillModMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es){
-   
-  //Retrieve tracker topology from geometry
+void SiStripThresholdDQM::fillModMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   es.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
   ModMEs CondObj_ME;
-  
-    
-  for(std::vector<uint32_t>::const_iterator detIter_ = selectedDetIds.begin();
-      detIter_!= selectedDetIds.end();detIter_++){
-      
-    fillMEsForDet(CondObj_ME,*detIter_,tTopo);
-      
+
+  for (std::vector<uint32_t>::const_iterator detIter_ = selectedDetIds.begin(); detIter_ != selectedDetIds.end();
+       detIter_++) {
+    fillMEsForDet(CondObj_ME, *detIter_, tTopo);
   }
-}    
+}
 // -----
 
-
-
 //======================================================================================
 // -----
 
-
-
-void SiStripThresholdDQM::fillMEsForDet(const ModMEs& _selModME_, uint32_t selDetId_, const TrackerTopology* tTopo){
+void SiStripThresholdDQM::fillMEsForDet(const ModMEs &_selModME_, uint32_t selDetId_, const TrackerTopology *tTopo) {
   ModMEs selModME_ = _selModME_;
   std::vector<uint32_t> DetIds;
   thresholdHandle_->getDetIds(DetIds);
-    
- 
-  SiStripThreshold::Range ThresholdRange = thresholdHandle_->getRange(selDetId_);
-  int nStrip =  reader->getNumberOfApvsAndStripLength(selDetId_).first*128;
-
 
-    getModMEs(selModME_,selDetId_,tTopo);
+  SiStripThreshold::Range ThresholdRange = thresholdHandle_->getRange(selDetId_);
+  int nStrip = reader->getNumberOfApvsAndStripLength(selDetId_).first * 128;
 
+  getModMEs(selModME_, selDetId_, tTopo);
 
-    
-  for( int istrip=0;istrip<nStrip;++istrip){
-      if( CondObj_fillId_ =="onlyProfile" || CondObj_fillId_ =="ProfileAndCumul"){
-	if(WhichThreshold=="Low")
-	  selModME_.ProfileDistr->Fill(istrip+1,thresholdHandle_->getData(istrip,ThresholdRange).getLth());
-	if(WhichThreshold=="High")
-	  selModME_.ProfileDistr->Fill(istrip+1,thresholdHandle_->getData(istrip,ThresholdRange).getHth());
-      }
-  }// istrip
-  
-    
-} 
+  for (int istrip = 0; istrip < nStrip; ++istrip) {
+    if (CondObj_fillId_ == "onlyProfile" || CondObj_fillId_ == "ProfileAndCumul") {
+      if (WhichThreshold == "Low")
+        selModME_.ProfileDistr->Fill(istrip + 1, thresholdHandle_->getData(istrip, ThresholdRange).getLth());
+      if (WhichThreshold == "High")
+        selModME_.ProfileDistr->Fill(istrip + 1, thresholdHandle_->getData(istrip, ThresholdRange).getHth());
+    }
+  }  // istrip
+}
 
-   
 // -----
 
-
-
 //=======================================================================================
 // -----
-void SiStripThresholdDQM::fillSummaryMEs(const std::vector<uint32_t> & selectedDetIds, const edm::EventSetup& es){
-   
-   //Retrieve tracker topology from geometry
-   edm::ESHandle<TrackerTopology> tTopoHandle;
-   es.get<TrackerTopologyRcd>().get(tTopoHandle);
-   const TrackerTopology* const tTopo = tTopoHandle.product();
-
-   for(std::vector<uint32_t>::const_iterator detIter_ = selectedDetIds.begin();
-       detIter_!= selectedDetIds.end();detIter_++){
-     fillMEsForLayer(/*SummaryMEsMap_,*/ *detIter_,tTopo);
-
-   }
-  
-}    
-// -----
+void SiStripThresholdDQM::fillSummaryMEs(const std::vector<uint32_t> &selectedDetIds, const edm::EventSetup &es) {
+  // Retrieve tracker topology from geometry
+  edm::ESHandle<TrackerTopology> tTopoHandle;
+  es.get<TrackerTopologyRcd>().get(tTopoHandle);
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
+  for (std::vector<uint32_t>::const_iterator detIter_ = selectedDetIds.begin(); detIter_ != selectedDetIds.end();
+       detIter_++) {
+    fillMEsForLayer(/*SummaryMEsMap_,*/ *detIter_, tTopo);
+  }
+}
+// -----
 
 //=======================================================================================
 // -----
-void SiStripThresholdDQM::fillMEsForLayer( /*std::map<uint32_t, ModMEs> selMEsMap_,*/ uint32_t selDetId_, const TrackerTopology* tTopo){
-
+void SiStripThresholdDQM::fillMEsForLayer(
+    /*std::map<uint32_t, ModMEs> selMEsMap_,*/ uint32_t selDetId_, const TrackerTopology *tTopo) {
   // ----
-  int subdetectorId_ = ((selDetId_>>25)&0x7);
-    
-  if( subdetectorId_<3 || subdetectorId_>6 ){ 
-    edm::LogError("SiStripThresholdDQM")
-      << "[SiStripThresholdDQM::fillMEsForLayer] WRONG INPUT : no such subdetector type : "
-      << subdetectorId_ << " no folder set!" 
-      << std::endl;
+  int subdetectorId_ = ((selDetId_ >> 25) & 0x7);
+
+  if (subdetectorId_ < 3 || subdetectorId_ > 6) {
+    edm::LogError("SiStripThresholdDQM") << "[SiStripThresholdDQM::fillMEsForLayer] WRONG INPUT : no such "
+                                            "subdetector type : "
+                                         << subdetectorId_ << " no folder set!" << std::endl;
     return;
   }
   // ----
-     
-   std::map<uint32_t, ModMEs>::iterator selMEsMapIter_ = SummaryMEsMap_.find(getLayerNameAndId(selDetId_,tTopo).second);
-   ModMEs selME_;
-   if ( selMEsMapIter_ != SummaryMEsMap_.end())
-     selME_ =selMEsMapIter_->second;
-
-   getSummaryMEs(selME_,selDetId_,tTopo);
-
-    
-   SiStripThreshold::Range ThresholdRange = thresholdHandle_->getRange(selDetId_);
-  
-   int nStrip =  reader->getNumberOfApvsAndStripLength(selDetId_).first*128;
-  
-     SiStripHistoId hidmanager;
-  
-  
-  if(hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel")){
-    // --> profile summary    
-  
+
+  std::map<uint32_t, ModMEs>::iterator selMEsMapIter_ = SummaryMEsMap_.find(getLayerNameAndId(selDetId_, tTopo).second);
+  ModMEs selME_;
+  if (selMEsMapIter_ != SummaryMEsMap_.end())
+    selME_ = selMEsMapIter_->second;
+
+  getSummaryMEs(selME_, selDetId_, tTopo);
+
+  SiStripThreshold::Range ThresholdRange = thresholdHandle_->getRange(selDetId_);
+
+  int nStrip = reader->getNumberOfApvsAndStripLength(selDetId_).first * 128;
+
+  SiStripHistoId hidmanager;
+
+  if (hPSet_.getParameter<bool>("FillSummaryProfileAtLayerLevel")) {
+    // --> profile summary
+
     std::string hSummaryOfProfile_description;
-    hSummaryOfProfile_description  = hPSet_.getParameter<std::string>("SummaryOfProfile_description");
-  
-    std::string hSummaryOfProfile_name; 
-  
-    hSummaryOfProfile_name = hidmanager.createHistoLayer(hSummaryOfProfile_description, "layer", getLayerNameAndId(selDetId_,tTopo).first, "") ;
-
-  
-    
-    for( int istrip=0;istrip<nStrip;++istrip){
-    
-	if( CondObj_fillId_ =="onlyProfile" || CondObj_fillId_ =="ProfileAndCumul"){
-	  if(WhichThreshold=="Low"){
-	    selME_.SummaryOfProfileDistr->Fill(istrip+1,thresholdHandle_->getData(istrip,ThresholdRange).getLth());
-	    if(fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")) fillTkMap(selDetId_, thresholdHandle_->getData(istrip,ThresholdRange).getLth());
-	  }
-	  if(WhichThreshold=="High"){
-	    selME_.SummaryOfProfileDistr->Fill(istrip+1,thresholdHandle_->getData(istrip,ThresholdRange).getHth());
-	    if(fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On")) fillTkMap(selDetId_, thresholdHandle_->getData(istrip,ThresholdRange).getHth());
-	  }
-	}
-    }// istrip	
-
-
-
-  }//if Fill
-
- 
-
-  if(hPSet_.getParameter<bool>("FillSummaryAtLayerLevel")){
-    
-    // --> summary  
-    
+    hSummaryOfProfile_description = hPSet_.getParameter<std::string>("SummaryOfProfile_description");
+
+    std::string hSummaryOfProfile_name;
+
+    hSummaryOfProfile_name = hidmanager.createHistoLayer(
+        hSummaryOfProfile_description, "layer", getLayerNameAndId(selDetId_, tTopo).first, "");
+
+    for (int istrip = 0; istrip < nStrip; ++istrip) {
+      if (CondObj_fillId_ == "onlyProfile" || CondObj_fillId_ == "ProfileAndCumul") {
+        if (WhichThreshold == "Low") {
+          selME_.SummaryOfProfileDistr->Fill(istrip + 1, thresholdHandle_->getData(istrip, ThresholdRange).getLth());
+          if (fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On"))
+            fillTkMap(selDetId_, thresholdHandle_->getData(istrip, ThresholdRange).getLth());
+        }
+        if (WhichThreshold == "High") {
+          selME_.SummaryOfProfileDistr->Fill(istrip + 1, thresholdHandle_->getData(istrip, ThresholdRange).getHth());
+          if (fPSet_.getParameter<bool>("TkMap_On") || hPSet_.getParameter<bool>("TkMap_On"))
+            fillTkMap(selDetId_, thresholdHandle_->getData(istrip, ThresholdRange).getHth());
+        }
+      }
+    }  // istrip
+
+  }  // if Fill
+
+  if (hPSet_.getParameter<bool>("FillSummaryAtLayerLevel")) {
+    // --> summary
+
     std::string hSummary_description;
-    hSummary_description  = hPSet_.getParameter<std::string>("Summary_description");
-  
-    std::string hSummary_name; 
-    hSummary_name = hidmanager.createHistoLayer(hSummary_description, 
-						"layer", 
-						getLayerNameAndId(selDetId_,tTopo).first, 
-						"") ;
-
-
-    float meanLowThreshold=0;
-    float meanHighThreshold=0;
-  
-    for( int istrip=0;istrip<nStrip;++istrip){
-    
-	meanLowThreshold = meanLowThreshold + thresholdHandle_->getData(istrip,ThresholdRange).getLth();
-	meanHighThreshold = meanHighThreshold + thresholdHandle_->getData(istrip,ThresholdRange).getHth();
-    }//istrip
-  
-  
-    meanLowThreshold = meanLowThreshold/nStrip;
-    meanHighThreshold = meanHighThreshold/nStrip;
-  
-  
+    hSummary_description = hPSet_.getParameter<std::string>("Summary_description");
+
+    std::string hSummary_name;
+    hSummary_name =
+        hidmanager.createHistoLayer(hSummary_description, "layer", getLayerNameAndId(selDetId_, tTopo).first, "");
+
+    float meanLowThreshold = 0;
+    float meanHighThreshold = 0;
+
+    for (int istrip = 0; istrip < nStrip; ++istrip) {
+      meanLowThreshold = meanLowThreshold + thresholdHandle_->getData(istrip, ThresholdRange).getLth();
+      meanHighThreshold = meanHighThreshold + thresholdHandle_->getData(istrip, ThresholdRange).getHth();
+    }  // istrip
+
+    meanLowThreshold = meanLowThreshold / nStrip;
+    meanHighThreshold = meanHighThreshold / nStrip;
+
     // -----
     // get detIds belonging to same layer to fill X-axis with detId-number
-  
-    std::vector<uint32_t> sameLayerDetIds_=GetSameLayerDetId(activeDetIds,selDetId_,tTopo);
-  
-    unsigned int iBin=0;
-    for(unsigned int i=0;i<sameLayerDetIds_.size();i++){
-      if(sameLayerDetIds_[i]==selDetId_){iBin=i+1;}
-    }   
-  
-    if(WhichThreshold=="Low"){
-      selME_.SummaryDistr->Fill(iBin,meanLowThreshold);
-      if(HistoMaps_On_ ) Tk_HM_L->fill(selDetId_, meanLowThreshold);
-    }
-    if(WhichThreshold=="High"){
-      selME_.SummaryDistr->Fill(iBin,meanHighThreshold);
-      if(HistoMaps_On_ )Tk_HM_H->fill(selDetId_, meanHighThreshold);
+
+    std::vector<uint32_t> sameLayerDetIds_ = GetSameLayerDetId(activeDetIds, selDetId_, tTopo);
+
+    unsigned int iBin = 0;
+    for (unsigned int i = 0; i < sameLayerDetIds_.size(); i++) {
+      if (sameLayerDetIds_[i] == selDetId_) {
+        iBin = i + 1;
+      }
     }
-  
-  }//if Fill ...
-  
 
+    if (WhichThreshold == "Low") {
+      selME_.SummaryDistr->Fill(iBin, meanLowThreshold);
+      if (HistoMaps_On_)
+        Tk_HM_L->fill(selDetId_, meanLowThreshold);
+    }
+    if (WhichThreshold == "High") {
+      selME_.SummaryDistr->Fill(iBin, meanHighThreshold);
+      if (HistoMaps_On_)
+        Tk_HM_H->fill(selDetId_, meanHighThreshold);
+    }
 
-}  
+  }  // if Fill ...
+}
 // -----
-
diff --git a/DQM/SiStripMonitorTrack/interface/SiStripMonitorTrack.h b/DQM/SiStripMonitorTrack/interface/SiStripMonitorTrack.h
index 405a5241fec39..9b3c5e115f61f 100755
--- a/DQM/SiStripMonitorTrack/interface/SiStripMonitorTrack.h
+++ b/DQM/SiStripMonitorTrack/interface/SiStripMonitorTrack.h
@@ -33,7 +33,7 @@
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
 
-#include "AnalysisDataFormats/SiStripClusterInfo/interface/SiStripClusterInfo.h"
+#include "RecoLocalTracker/SiStripClusterizer/interface/SiStripClusterInfo.h"
 #include "TrackingTools/PatternTools/interface/Trajectory.h"
 #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripDetCabling.h"
diff --git a/DQM/TrackerCommon/interface/TriggerHelper.h b/DQM/TrackerCommon/interface/TriggerHelper.h
index 0114cd4cadb2c..0a561a5bacdf2 100644
--- a/DQM/TrackerCommon/interface/TriggerHelper.h
+++ b/DQM/TrackerCommon/interface/TriggerHelper.h
@@ -1,7 +1,6 @@
 #ifndef TriggerHelper_H
 #define TriggerHelper_H
 
-
 // -*- C++ -*-
 //
 // Package:    DQM/TrackerCommon
@@ -9,124 +8,123 @@
 //
 //
 /**
-  \class    TriggerHelper TriggerHelper.h "DQM/TrackerCommon/interface/TriggerHelper.h"
-  \brief    Provides a code based selection for trigger and DCS information in order to have no failing filters in the CMSSW path.
+  \class    TriggerHelper TriggerHelper.h
+  "DQM/TrackerCommon/interface/TriggerHelper.h" \brief    Provides a code based
+  selection for trigger and DCS information in order to have no failing filters
+  in the CMSSW path.
 
    [...]
 
   \author   Volker Adler
 */
 
-
-
-#include "FWCore/Framework/interface/Run.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESWatcher.h"
 #include "CondFormats/DataRecord/interface/AlCaRecoTriggerBitsRcd.h"
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/Scalers/interface/DcsStatus.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
-#include "L1Trigger/GlobalTriggerAnalyzer/interface/L1GtUtils.h"
+#include "DataFormats/Scalers/interface/DcsStatus.h"
+#include "FWCore/Framework/interface/ESWatcher.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Run.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
+#include "L1Trigger/GlobalTriggerAnalyzer/interface/L1GtUtils.h"
 
 #include <memory>
 
 namespace edm {
-    class ConsumesCollector;
-    class ParameterSet;
-}
+  class ConsumesCollector;
+  class ParameterSet;
+}  // namespace edm
 
 class TriggerHelper {
-
-    // Utility classes
-    edm::ESWatcher< AlCaRecoTriggerBitsRcd > * watchDB_;
-    std::unique_ptr<L1GtUtils>                 l1Gt_;
-    HLTConfigProvider                          hltConfig_;
-    bool                                       hltConfigInit_;
-    // Configuration parameters
-    bool andOr_;
-    bool               andOrDcs_;
-    edm::InputTag      dcsInputTag_;
-    std::vector< int > dcsPartitions_;
-    bool               errorReplyDcs_;
-    bool                       andOrGt_;
-    edm::InputTag              gtInputTag_;
-    std::string                gtDBKey_;
-    std::vector< std::string > gtLogicalExpressions_;
-    bool                       errorReplyGt_;
-    bool                       andOrL1_;
-    std::string                l1DBKey_;
-    std::vector< std::string > l1LogicalExpressions_;
-    bool                       errorReplyL1_;
-    bool                       andOrHlt_;
-    edm::InputTag              hltInputTag_;
-    std::string                hltDBKey_;
-    std::vector< std::string > hltLogicalExpressions_;
-    bool                       errorReplyHlt_;
-    // Switches
-    bool on_;
-    bool onDcs_;
-    bool onGt_;
-    bool onL1_;
-    bool onHlt_;
-    // Member constants
-    const std::string configError_;
-
-  public:
-
-    // Constructors must be called from the ED module's c'tor
-    template <typename T>
-    TriggerHelper( const edm::ParameterSet & config, edm::ConsumesCollector && iC, T& module );
-
-    template <typename T>
-    TriggerHelper( const edm::ParameterSet & config, edm::ConsumesCollector & iC, T& module );
-
-    ~TriggerHelper();
-
-    // Public methods
-    bool on()  { return     on_  ; }
-    bool off() { return ( ! on_ ); }
-    void initRun( const edm::Run & run, const edm::EventSetup & setup );    // To be called from beginRun() methods
-    bool accept( const edm::Event & event, const edm::EventSetup & setup ); // To be called from analyze/filter() methods
-
-  private:
-
-    // Private methods
-
-    TriggerHelper( const edm::ParameterSet & config );
-
-    // DCS
-    bool acceptDcs( const edm::Event & event );
-    bool acceptDcsPartition( const edm::Handle< DcsStatusCollection > & dcsStatus, int dcsPartition ) const;
-
-    // GT status bits
-    bool acceptGt( const edm::Event & event );
-    bool acceptGtLogicalExpression( const edm::Handle< L1GlobalTriggerReadoutRecord > & gtReadoutRecord, std::string gtLogicalExpression );
-
-    // L1
-    bool acceptL1( const edm::Event & event, const edm::EventSetup & setup );
-    bool acceptL1LogicalExpression( const edm::Event & event, std::string l1LogicalExpression );
-
-    // HLT
-    bool acceptHlt( const edm::Event & event );
-    bool acceptHltLogicalExpression( const edm::Handle< edm::TriggerResults > & hltTriggerResults, std::string hltLogicalExpression ) const;
-
-    // Algos
-    std::vector< std::string > expressionsFromDB( const std::string & key, const edm::EventSetup & setup );
-    bool negate( std::string & word ) const;
-
+  // Utility classes
+  edm::ESWatcher<AlCaRecoTriggerBitsRcd> *watchDB_;
+  std::unique_ptr<L1GtUtils> l1Gt_;
+  HLTConfigProvider hltConfig_;
+  bool hltConfigInit_;
+  // Configuration parameters
+  bool andOr_;
+  bool andOrDcs_;
+  edm::InputTag dcsInputTag_;
+  std::vector<int> dcsPartitions_;
+  bool errorReplyDcs_;
+  bool andOrGt_;
+  edm::InputTag gtInputTag_;
+  std::string gtDBKey_;
+  std::vector<std::string> gtLogicalExpressions_;
+  bool errorReplyGt_;
+  bool andOrL1_;
+  std::string l1DBKey_;
+  std::vector<std::string> l1LogicalExpressions_;
+  bool errorReplyL1_;
+  bool andOrHlt_;
+  edm::InputTag hltInputTag_;
+  std::string hltDBKey_;
+  std::vector<std::string> hltLogicalExpressions_;
+  bool errorReplyHlt_;
+  // Switches
+  bool on_;
+  bool onDcs_;
+  bool onGt_;
+  bool onL1_;
+  bool onHlt_;
+  // Member constants
+  const std::string configError_;
+
+public:
+  // Constructors must be called from the ED module's c'tor
+  template <typename T>
+  TriggerHelper(const edm::ParameterSet &config, edm::ConsumesCollector &&iC, T &module);
+
+  template <typename T>
+  TriggerHelper(const edm::ParameterSet &config, edm::ConsumesCollector &iC, T &module);
+
+  ~TriggerHelper();
+
+  // Public methods
+  bool on() { return on_; }
+  bool off() { return (!on_); }
+  void initRun(const edm::Run &run,
+               const edm::EventSetup &setup);  // To be called from beginRun() methods
+  bool accept(const edm::Event &event,
+              const edm::EventSetup &setup);  // To be called from analyze/filter() methods
+
+private:
+  // Private methods
+
+  TriggerHelper(const edm::ParameterSet &config);
+
+  // DCS
+  bool acceptDcs(const edm::Event &event);
+  bool acceptDcsPartition(const edm::Handle<DcsStatusCollection> &dcsStatus, int dcsPartition) const;
+
+  // GT status bits
+  bool acceptGt(const edm::Event &event);
+  bool acceptGtLogicalExpression(const edm::Handle<L1GlobalTriggerReadoutRecord> &gtReadoutRecord,
+                                 std::string gtLogicalExpression);
+
+  // L1
+  bool acceptL1(const edm::Event &event, const edm::EventSetup &setup);
+  bool acceptL1LogicalExpression(const edm::Event &event, std::string l1LogicalExpression);
+
+  // HLT
+  bool acceptHlt(const edm::Event &event);
+  bool acceptHltLogicalExpression(const edm::Handle<edm::TriggerResults> &hltTriggerResults,
+                                  std::string hltLogicalExpression) const;
+
+  // Algos
+  std::vector<std::string> expressionsFromDB(const std::string &key, const edm::EventSetup &setup);
+  bool negate(std::string &word) const;
 };
 
 template <typename T>
-TriggerHelper::TriggerHelper( const edm::ParameterSet & config, edm::ConsumesCollector && iC, T& module ) :
-  TriggerHelper(config, iC, module) {
-}
+TriggerHelper::TriggerHelper(const edm::ParameterSet &config, edm::ConsumesCollector &&iC, T &module)
+    : TriggerHelper(config, iC, module) {}
 
 template <typename T>
-TriggerHelper::TriggerHelper( const edm::ParameterSet & config, edm::ConsumesCollector & iC, T& module ) :
-  TriggerHelper(config) {
-    l1Gt_.reset(new L1GtUtils(config, iC, false, module));
+TriggerHelper::TriggerHelper(const edm::ParameterSet &config, edm::ConsumesCollector &iC, T &module)
+    : TriggerHelper(config) {
+  l1Gt_.reset(new L1GtUtils(config, iC, false, module));
 }
 
 #endif
diff --git a/DQM/TrackerCommon/plugins/DetectorStateFilter.cc b/DQM/TrackerCommon/plugins/DetectorStateFilter.cc
index fdd8d4a619b7b..9577d37054cf5 100644
--- a/DQM/TrackerCommon/plugins/DetectorStateFilter.cc
+++ b/DQM/TrackerCommon/plugins/DetectorStateFilter.cc
@@ -1,81 +1,74 @@
-#include "DQM/TrackerCommon/plugins/DetectorStateFilter.h" 
+#include "DQM/TrackerCommon/plugins/DetectorStateFilter.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/Common/interface/Handle.h"
 
-#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
-#include "DataFormats/FEDRawData/interface/FEDRawData.h"
 #include "DataFormats/FEDRawData/interface/FEDNumbering.h"
+#include "DataFormats/FEDRawData/interface/FEDRawData.h"
+#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 
 #include <iostream>
- 
+
 //
 // -- Constructor
 //
-DetectorStateFilter::DetectorStateFilter( const edm::ParameterSet & pset ) 
-  : verbose_      ( pset.getUntrackedParameter<bool>       ( "DebugOn",      false )    )
-  , detectorType_ ( pset.getUntrackedParameter<std::string>( "DetectorType", "sistrip") )
-  , dcsStatusLabel_ ( consumes<DcsStatusCollection>( pset.getUntrackedParameter<edm::InputTag>( "DcsStatusLabel", edm::InputTag("scalersRawToDigi")) ) )
-{
-  nEvents_         = 0;
+DetectorStateFilter::DetectorStateFilter(const edm::ParameterSet &pset)
+    : verbose_(pset.getUntrackedParameter<bool>("DebugOn", false)),
+      detectorType_(pset.getUntrackedParameter<std::string>("DetectorType", "sistrip")),
+      dcsStatusLabel_(consumes<DcsStatusCollection>(
+          pset.getUntrackedParameter<edm::InputTag>("DcsStatusLabel", edm::InputTag("scalersRawToDigi")))) {
+  nEvents_ = 0;
   nSelectedEvents_ = 0;
-  detectorOn_      = false;
+  detectorOn_ = false;
 }
 //
 // -- Destructor
 //
-DetectorStateFilter::~DetectorStateFilter() {
-}
- 
-bool DetectorStateFilter::filter( edm::Event & evt, edm::EventSetup const& es) {
-  
+DetectorStateFilter::~DetectorStateFilter() {}
+
+bool DetectorStateFilter::filter(edm::Event &evt, edm::EventSetup const &es) {
   nEvents_++;
   // Check Detector state Only for Real Data and return true for MC
   if (evt.isRealData()) {
     edm::Handle<DcsStatusCollection> dcsStatus;
     evt.getByToken(dcsStatusLabel_, dcsStatus);
     if (dcsStatus.isValid()) {
-      if (detectorType_ == "pixel" && !dcsStatus->empty() ) {
-	  if ((*dcsStatus)[0].ready(DcsStatus::BPIX) && 
-	      (*dcsStatus)[0].ready(DcsStatus::FPIX)) {
-	detectorOn_ = true;
-	nSelectedEvents_++;
-      } else detectorOn_ = false;
-      if ( verbose_ ) std::cout << " Total Events " << nEvents_ 
-				<< " Selected Events " << nSelectedEvents_ 
-				<< " DCS States : " << " BPix " << (*dcsStatus)[0].ready(DcsStatus::BPIX) 
-				<< " FPix " << (*dcsStatus)[0].ready(DcsStatus::FPIX)
-				<< " Detector State " << detectorOn_<<  std::endl;           
-      } else if (detectorType_ == "sistrip" && !dcsStatus->empty()) {  
-	if ((*dcsStatus)[0].ready(DcsStatus::TIBTID) &&
-	    (*dcsStatus)[0].ready(DcsStatus::TOB) &&   
-	    (*dcsStatus)[0].ready(DcsStatus::TECp) &&  
-	    (*dcsStatus)[0].ready(DcsStatus::TECm)) {
-	  detectorOn_ = true;             
-	  nSelectedEvents_++;
-	} else detectorOn_ = false;
-	if ( verbose_ ) std::cout << " Total Events " << nEvents_ 
-				  << " Selected Events " << nSelectedEvents_ 
-				  << " DCS States : " << " TEC- " << (*dcsStatus)[0].ready(DcsStatus::TECm) 
-				  << " TEC+ " << (*dcsStatus)[0].ready(DcsStatus::TECp)
-				  << " TIB/TID " << (*dcsStatus)[0].ready(DcsStatus::TIBTID) 
-				  << " TOB " << (*dcsStatus)[0].ready(DcsStatus::TOB)   
-				  << " Detector States " << detectorOn_<<  std::endl;      
+      if (detectorType_ == "pixel" && !dcsStatus->empty()) {
+        if ((*dcsStatus)[0].ready(DcsStatus::BPIX) && (*dcsStatus)[0].ready(DcsStatus::FPIX)) {
+          detectorOn_ = true;
+          nSelectedEvents_++;
+        } else
+          detectorOn_ = false;
+        if (verbose_)
+          std::cout << " Total Events " << nEvents_ << " Selected Events " << nSelectedEvents_ << " DCS States : "
+                    << " BPix " << (*dcsStatus)[0].ready(DcsStatus::BPIX) << " FPix "
+                    << (*dcsStatus)[0].ready(DcsStatus::FPIX) << " Detector State " << detectorOn_ << std::endl;
+      } else if (detectorType_ == "sistrip" && !dcsStatus->empty()) {
+        if ((*dcsStatus)[0].ready(DcsStatus::TIBTID) && (*dcsStatus)[0].ready(DcsStatus::TOB) &&
+            (*dcsStatus)[0].ready(DcsStatus::TECp) && (*dcsStatus)[0].ready(DcsStatus::TECm)) {
+          detectorOn_ = true;
+          nSelectedEvents_++;
+        } else
+          detectorOn_ = false;
+        if (verbose_)
+          std::cout << " Total Events " << nEvents_ << " Selected Events " << nSelectedEvents_ << " DCS States : "
+                    << " TEC- " << (*dcsStatus)[0].ready(DcsStatus::TECm) << " TEC+ "
+                    << (*dcsStatus)[0].ready(DcsStatus::TECp) << " TIB/TID " << (*dcsStatus)[0].ready(DcsStatus::TIBTID)
+                    << " TOB " << (*dcsStatus)[0].ready(DcsStatus::TOB) << " Detector States " << detectorOn_
+                    << std::endl;
       }
     } else {
-      edm::LogError("DetectorStatusFilter")<<"ERROR: DcsStatusCollection not found !";
+      edm::LogError("DetectorStatusFilter") << "ERROR: DcsStatusCollection not found !";
     }
   } else {
     detectorOn_ = true;
     nSelectedEvents_++;
-    if ( verbose_ ) std::cout << "Total MC Events " << nEvents_
-                              << " Selected Events " << nSelectedEvents_
-                              << " Detector States " << detectorOn_<<  std::endl;
+    if (verbose_)
+      std::cout << "Total MC Events " << nEvents_ << " Selected Events " << nSelectedEvents_ << " Detector States "
+                << detectorOn_ << std::endl;
   }
   return detectorOn_;
 }
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 DEFINE_FWK_MODULE(DetectorStateFilter);
-
- 
diff --git a/DQM/TrackerCommon/plugins/DetectorStateFilter.h b/DQM/TrackerCommon/plugins/DetectorStateFilter.h
index d491184ff0974..2a7827cea245b 100644
--- a/DQM/TrackerCommon/plugins/DetectorStateFilter.h
+++ b/DQM/TrackerCommon/plugins/DetectorStateFilter.h
@@ -1,17 +1,17 @@
 #ifndef DetectorStateFilter_H
 #define DetectorStateFilter_H
 
+#include "DataFormats/Scalers/interface/DcsStatus.h"
 #include "FWCore/Framework/interface/stream/EDFilter.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/Scalers/interface/DcsStatus.h"
 
- 
 class DetectorStateFilter : public edm::stream::EDFilter<> {
- public:
- DetectorStateFilter( const edm::ParameterSet & );
- ~DetectorStateFilter() override;
-  private:
-  bool filter( edm::Event &, edm::EventSetup const& ) override;
+public:
+  DetectorStateFilter(const edm::ParameterSet &);
+  ~DetectorStateFilter() override;
+
+private:
+  bool filter(edm::Event &, edm::EventSetup const &) override;
 
   const bool verbose_;
   uint64_t nEvents_, nSelectedEvents_;
diff --git a/DQM/TrackerCommon/plugins/SimpleEventFilter.cc b/DQM/TrackerCommon/plugins/SimpleEventFilter.cc
index 4755ddce54532..fd3464a59342d 100644
--- a/DQM/TrackerCommon/plugins/SimpleEventFilter.cc
+++ b/DQM/TrackerCommon/plugins/SimpleEventFilter.cc
@@ -1,29 +1,28 @@
-#include "DQM/TrackerCommon/plugins/SimpleEventFilter.h" 
+#include "DQM/TrackerCommon/plugins/SimpleEventFilter.h"
 #include <iostream>
- 
+
 //
 // -- Constructor
 //
-SimpleEventFilter::SimpleEventFilter( const edm::ParameterSet & pset ) {
-   nInterval_ = pset.getUntrackedParameter<int>( "EventsToSkip", 10 );
-   verbose_   = pset.getUntrackedParameter<bool>( "DebugOn", false );
-   nEvent_    = 0;
+SimpleEventFilter::SimpleEventFilter(const edm::ParameterSet &pset) {
+  nInterval_ = pset.getUntrackedParameter<int>("EventsToSkip", 10);
+  verbose_ = pset.getUntrackedParameter<bool>("DebugOn", false);
+  nEvent_ = 0;
 }
 //
 // -- Destructor
 //
-SimpleEventFilter::~SimpleEventFilter() {
-}
- 
-bool SimpleEventFilter::filter( edm::Event &, edm::EventSetup const& ) {
+SimpleEventFilter::~SimpleEventFilter() {}
+
+bool SimpleEventFilter::filter(edm::Event &, edm::EventSetup const &) {
   nEvent_++;
   bool ret = true;
-  if (nEvent_ % nInterval_ != 0) ret = false; 
-  if ( verbose_ && !ret) std::cout << ">>> filtering event" << nEvent_ << std::endl; 
+  if (nEvent_ % nInterval_ != 0)
+    ret = false;
+  if (verbose_ && !ret)
+    std::cout << ">>> filtering event" << nEvent_ << std::endl;
   return ret;
 }
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 DEFINE_FWK_MODULE(SimpleEventFilter);
-
- 
diff --git a/DQM/TrackerCommon/plugins/SimpleEventFilter.h b/DQM/TrackerCommon/plugins/SimpleEventFilter.h
index f9e8b72155af4..3b1d1e127725f 100644
--- a/DQM/TrackerCommon/plugins/SimpleEventFilter.h
+++ b/DQM/TrackerCommon/plugins/SimpleEventFilter.h
@@ -3,13 +3,14 @@
 
 #include "FWCore/Framework/interface/EDFilter.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
- 
+
 class SimpleEventFilter : public edm::EDFilter {
- public:
- SimpleEventFilter( const edm::ParameterSet & );
- ~SimpleEventFilter() override;
-  private:
-  bool filter( edm::Event &, edm::EventSetup const& ) override;
+public:
+  SimpleEventFilter(const edm::ParameterSet &);
+  ~SimpleEventFilter() override;
+
+private:
+  bool filter(edm::Event &, edm::EventSetup const &) override;
   int nEvent_;
   int nInterval_;
   bool verbose_;
diff --git a/DQM/TrackerCommon/src/TriggerHelper.cc b/DQM/TrackerCommon/src/TriggerHelper.cc
index 7fb1dfaa30a1d..a9c39adc4207b 100644
--- a/DQM/TrackerCommon/src/TriggerHelper.cc
+++ b/DQM/TrackerCommon/src/TriggerHelper.cc
@@ -1,464 +1,463 @@
 //
 //
 
-
 #include "DQM/TrackerCommon/interface/TriggerHelper.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "CondFormats/HLTObjects/interface/AlCaRecoTriggerBits.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GtLogicParser.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include <string>
 #include <vector>
 
-
-
 /// To be called from the ED module's c'tor
-TriggerHelper::TriggerHelper( const edm::ParameterSet & config )
-  : watchDB_( nullptr )
-  , gtDBKey_( "" )
-  , l1DBKey_( "" )
-  , hltDBKey_( "" )
-  , on_( true )
-  , onDcs_( true )
-  , onGt_( true )
-  , onL1_( true )
-  , onHlt_( true )
-  , configError_( "CONFIG_ERROR" )
-{
-
+TriggerHelper::TriggerHelper(const edm::ParameterSet &config)
+    : watchDB_(nullptr),
+      gtDBKey_(""),
+      l1DBKey_(""),
+      hltDBKey_(""),
+      on_(true),
+      onDcs_(true),
+      onGt_(true),
+      onL1_(true),
+      onHlt_(true),
+      configError_("CONFIG_ERROR") {
   // General switch(es)
-  if ( config.exists( "andOr" ) ) {
-    andOr_ = config.getParameter< bool >( "andOr" );
+  if (config.exists("andOr")) {
+    andOr_ = config.getParameter<bool>("andOr");
   } else {
-    on_    = false;
+    on_ = false;
     onDcs_ = false;
-    onGt_  = false;
-    onL1_  = false;
+    onGt_ = false;
+    onL1_ = false;
     onHlt_ = false;
   }
 
-  if ( on_ ) {
-    if ( config.exists( "andOrDcs" ) ) {
-      andOrDcs_      = config.getParameter< bool >( "andOrDcs" );
-      dcsInputTag_   = config.getParameter< edm::InputTag >( "dcsInputTag" );
-      dcsPartitions_ = config.getParameter< std::vector< int > >( "dcsPartitions" );
-      errorReplyDcs_ = config.getParameter< bool >( "errorReplyDcs" );
+  if (on_) {
+    if (config.exists("andOrDcs")) {
+      andOrDcs_ = config.getParameter<bool>("andOrDcs");
+      dcsInputTag_ = config.getParameter<edm::InputTag>("dcsInputTag");
+      dcsPartitions_ = config.getParameter<std::vector<int>>("dcsPartitions");
+      errorReplyDcs_ = config.getParameter<bool>("errorReplyDcs");
     } else {
       onDcs_ = false;
     }
-    if ( config.exists( "andOrGt" ) ) {
-      andOrGt_              = config.getParameter< bool >( "andOrGt" );
-      gtInputTag_           = config.getParameter< edm::InputTag >( "gtInputTag" );
-      gtLogicalExpressions_ = config.getParameter< std::vector< std::string > >( "gtStatusBits" );
-      errorReplyGt_         = config.getParameter< bool >( "errorReplyGt" );
-      if ( config.exists( "gtDBKey" ) ) gtDBKey_ = config.getParameter< std::string >( "gtDBKey" );
+    if (config.exists("andOrGt")) {
+      andOrGt_ = config.getParameter<bool>("andOrGt");
+      gtInputTag_ = config.getParameter<edm::InputTag>("gtInputTag");
+      gtLogicalExpressions_ = config.getParameter<std::vector<std::string>>("gtStatusBits");
+      errorReplyGt_ = config.getParameter<bool>("errorReplyGt");
+      if (config.exists("gtDBKey"))
+        gtDBKey_ = config.getParameter<std::string>("gtDBKey");
     } else {
       onGt_ = false;
     }
-    if ( config.exists( "andOrL1" ) ) {
-      andOrL1_              = config.getParameter< bool >( "andOrL1" );
-      l1LogicalExpressions_ = config.getParameter< std::vector< std::string > >( "l1Algorithms" );
-      errorReplyL1_         = config.getParameter< bool >( "errorReplyL1" );
-      if ( config.exists( "l1DBKey" ) ) l1DBKey_ = config.getParameter< std::string >( "l1DBKey" );
+    if (config.exists("andOrL1")) {
+      andOrL1_ = config.getParameter<bool>("andOrL1");
+      l1LogicalExpressions_ = config.getParameter<std::vector<std::string>>("l1Algorithms");
+      errorReplyL1_ = config.getParameter<bool>("errorReplyL1");
+      if (config.exists("l1DBKey"))
+        l1DBKey_ = config.getParameter<std::string>("l1DBKey");
     } else {
       onL1_ = false;
     }
-    if ( config.exists( "andOrHlt" ) ) {
-      andOrHlt_              = config.getParameter< bool >( "andOrHlt" );
-      hltInputTag_           = config.getParameter< edm::InputTag >( "hltInputTag" );
-      hltLogicalExpressions_ = config.getParameter< std::vector< std::string > >( "hltPaths" );
-      errorReplyHlt_         = config.getParameter< bool >( "errorReplyHlt" );
-      if ( config.exists( "hltDBKey" ) ) hltDBKey_ = config.getParameter< std::string >( "hltDBKey" );
+    if (config.exists("andOrHlt")) {
+      andOrHlt_ = config.getParameter<bool>("andOrHlt");
+      hltInputTag_ = config.getParameter<edm::InputTag>("hltInputTag");
+      hltLogicalExpressions_ = config.getParameter<std::vector<std::string>>("hltPaths");
+      errorReplyHlt_ = config.getParameter<bool>("errorReplyHlt");
+      if (config.exists("hltDBKey"))
+        hltDBKey_ = config.getParameter<std::string>("hltDBKey");
     } else {
       onHlt_ = false;
     }
-    if ( ! onDcs_ && ! onGt_ && ! onL1_ && ! onHlt_ ) on_      = false;
-    else                                              watchDB_ = new edm::ESWatcher< AlCaRecoTriggerBitsRcd> ;
+    if (!onDcs_ && !onGt_ && !onL1_ && !onHlt_)
+      on_ = false;
+    else
+      watchDB_ = new edm::ESWatcher<AlCaRecoTriggerBitsRcd>;
   }
-
 }
 
-
 /// To be called from d'tors by 'delete'
-TriggerHelper::~TriggerHelper()
-{
-
-  if ( on_ ) delete watchDB_;
-
+TriggerHelper::~TriggerHelper() {
+  if (on_)
+    delete watchDB_;
 }
 
-
 /// To be called from beginedm::Run() methods
-void TriggerHelper::initRun( const edm::Run & run, const edm::EventSetup & setup )
-{
-
-  // FIXME Can this stay safely in the run loop, or does it need to go to the event loop?
-  // Means: Are the event setups identical?
-  if ( watchDB_->check( setup ) ) {
-    if ( onGt_ && !gtDBKey_.empty() ) {
-      const std::vector< std::string > exprs( expressionsFromDB( gtDBKey_, setup ) );
-      if ( exprs.empty() || exprs.at( 0 ) != configError_ ) gtLogicalExpressions_ = exprs;
+void TriggerHelper::initRun(const edm::Run &run, const edm::EventSetup &setup) {
+  // FIXME Can this stay safely in the run loop, or does it need to go to the
+  // event loop? Means: Are the event setups identical?
+  if (watchDB_->check(setup)) {
+    if (onGt_ && !gtDBKey_.empty()) {
+      const std::vector<std::string> exprs(expressionsFromDB(gtDBKey_, setup));
+      if (exprs.empty() || exprs.at(0) != configError_)
+        gtLogicalExpressions_ = exprs;
     }
-    if ( onL1_ && !l1DBKey_.empty() ) {
-      const std::vector< std::string > exprs( expressionsFromDB( l1DBKey_, setup ) );
-      if ( exprs.empty() || exprs.at( 0 ) != configError_ ) l1LogicalExpressions_ = exprs;
+    if (onL1_ && !l1DBKey_.empty()) {
+      const std::vector<std::string> exprs(expressionsFromDB(l1DBKey_, setup));
+      if (exprs.empty() || exprs.at(0) != configError_)
+        l1LogicalExpressions_ = exprs;
     }
-    if ( onHlt_ && !hltDBKey_.empty() ) {
-      const std::vector< std::string > exprs( expressionsFromDB( hltDBKey_, setup ) );
-      if ( exprs.empty() || exprs.at( 0 ) != configError_ ) hltLogicalExpressions_ = exprs;
+    if (onHlt_ && !hltDBKey_.empty()) {
+      const std::vector<std::string> exprs(expressionsFromDB(hltDBKey_, setup));
+      if (exprs.empty() || exprs.at(0) != configError_)
+        hltLogicalExpressions_ = exprs;
     }
   }
 
   hltConfigInit_ = false;
-  if ( onHlt_ ) {
-    if ( hltInputTag_.process().empty() ) {
-      edm::LogError( "TriggerHelper" ) << "HLT TriggerResults InputTag \"" << hltInputTag_.encode() << "\" specifies no process";
+  if (onHlt_) {
+    if (hltInputTag_.process().empty()) {
+      edm::LogError("TriggerHelper") << "HLT TriggerResults InputTag \"" << hltInputTag_.encode()
+                                     << "\" specifies no process";
     } else {
-      bool hltChanged( false );
-      if ( ! hltConfig_.init( run, setup, hltInputTag_.process(), hltChanged ) ) {
-        edm::LogError( "TriggerHelper" ) << "HLT config initialization error with process name \"" << hltInputTag_.process() << "\"";
-      } else if ( hltConfig_.size() <= 0 ) {
-        edm::LogError( "TriggerHelper" ) << "HLT config size error";
-      } else hltConfigInit_ = true;
+      bool hltChanged(false);
+      if (!hltConfig_.init(run, setup, hltInputTag_.process(), hltChanged)) {
+        edm::LogError("TriggerHelper") << "HLT config initialization error with process name \""
+                                       << hltInputTag_.process() << "\"";
+      } else if (hltConfig_.size() <= 0) {
+        edm::LogError("TriggerHelper") << "HLT config size error";
+      } else
+        hltConfigInit_ = true;
     }
   }
-
 }
 
-
 /// To be called from analyze/filter() methods
-bool TriggerHelper::accept( const edm::Event & event, const edm::EventSetup & setup )
-{
-
-  if ( ! on_ ) return true;
+bool TriggerHelper::accept(const edm::Event &event, const edm::EventSetup &setup) {
+  if (!on_)
+    return true;
 
   // Determine decision
-  if ( andOr_ ) return ( acceptDcs( event ) || acceptGt( event ) || acceptL1( event, setup ) || acceptHlt( event ) );
-  return ( acceptDcs( event ) && acceptGt( event ) && acceptL1( event, setup ) && acceptHlt( event ) );
-
+  if (andOr_)
+    return (acceptDcs(event) || acceptGt(event) || acceptL1(event, setup) || acceptHlt(event));
+  return (acceptDcs(event) && acceptGt(event) && acceptL1(event, setup) && acceptHlt(event));
 }
 
-
-bool TriggerHelper::acceptDcs( const edm::Event & event )
-{
-
+bool TriggerHelper::acceptDcs(const edm::Event &event) {
   // An empty DCS partitions list acts as switch.
-  if ( ! onDcs_ || dcsPartitions_.empty() ) return ( ! andOr_ ); // logically neutral, depending on base logical connective
+  if (!onDcs_ || dcsPartitions_.empty())
+    return (!andOr_);  // logically neutral, depending on base logical connective
 
   // Accessing the DcsStatusCollection
-  edm::Handle< DcsStatusCollection > dcsStatus;
-  event.getByLabel( dcsInputTag_, dcsStatus );
-  if ( ! dcsStatus.isValid() ) {
-    edm::LogError( "TriggerHelper" ) << "DcsStatusCollection product with InputTag \"" << dcsInputTag_.encode() << "\" not in event ==> decision: " << errorReplyDcs_;
+  edm::Handle<DcsStatusCollection> dcsStatus;
+  event.getByLabel(dcsInputTag_, dcsStatus);
+  if (!dcsStatus.isValid()) {
+    edm::LogError("TriggerHelper") << "DcsStatusCollection product with InputTag \"" << dcsInputTag_.encode()
+                                   << "\" not in event ==> decision: " << errorReplyDcs_;
     return errorReplyDcs_;
   }
 
   // Determine decision of DCS partition combination and return
-  if ( andOrDcs_ ) { // OR combination
-    for ( std::vector< int >::const_iterator partitionNumber = dcsPartitions_.begin(); partitionNumber != dcsPartitions_.end(); ++partitionNumber ) {
-      if ( acceptDcsPartition( dcsStatus, *partitionNumber ) ) return true;
+  if (andOrDcs_) {  // OR combination
+    for (std::vector<int>::const_iterator partitionNumber = dcsPartitions_.begin();
+         partitionNumber != dcsPartitions_.end();
+         ++partitionNumber) {
+      if (acceptDcsPartition(dcsStatus, *partitionNumber))
+        return true;
     }
     return false;
   }
-  for ( std::vector< int >::const_iterator partitionNumber = dcsPartitions_.begin(); partitionNumber != dcsPartitions_.end(); ++partitionNumber ) {
-    if ( ! acceptDcsPartition( dcsStatus, *partitionNumber ) ) return false;
+  for (std::vector<int>::const_iterator partitionNumber = dcsPartitions_.begin();
+       partitionNumber != dcsPartitions_.end();
+       ++partitionNumber) {
+    if (!acceptDcsPartition(dcsStatus, *partitionNumber))
+      return false;
   }
   return true;
-
 }
 
-
-bool TriggerHelper::acceptDcsPartition( const edm::Handle< DcsStatusCollection > & dcsStatus, int dcsPartition ) const
-{
-
+bool TriggerHelper::acceptDcsPartition(const edm::Handle<DcsStatusCollection> &dcsStatus, int dcsPartition) const {
   // Error checks
-  switch( dcsPartition ) {
-    case DcsStatus::EBp   :
-    case DcsStatus::EBm   :
-    case DcsStatus::EEp   :
-    case DcsStatus::EEm   :
-    case DcsStatus::HBHEa :
-    case DcsStatus::HBHEb :
-    case DcsStatus::HBHEc :
-    case DcsStatus::HF    :
-    case DcsStatus::HO    :
-    case DcsStatus::RPC   :
-    case DcsStatus::DT0   :
-    case DcsStatus::DTp   :
-    case DcsStatus::DTm   :
-    case DcsStatus::CSCp  :
-    case DcsStatus::CSCm  :
+  switch (dcsPartition) {
+    case DcsStatus::EBp:
+    case DcsStatus::EBm:
+    case DcsStatus::EEp:
+    case DcsStatus::EEm:
+    case DcsStatus::HBHEa:
+    case DcsStatus::HBHEb:
+    case DcsStatus::HBHEc:
+    case DcsStatus::HF:
+    case DcsStatus::HO:
+    case DcsStatus::RPC:
+    case DcsStatus::DT0:
+    case DcsStatus::DTp:
+    case DcsStatus::DTm:
+    case DcsStatus::CSCp:
+    case DcsStatus::CSCm:
     case DcsStatus::CASTOR:
     case DcsStatus::TIBTID:
-    case DcsStatus::TOB   :
-    case DcsStatus::TECp  :
-    case DcsStatus::TECm  :
-    case DcsStatus::BPIX  :
-    case DcsStatus::FPIX  :
-    case DcsStatus::ESp   :
-    case DcsStatus::ESm   :
+    case DcsStatus::TOB:
+    case DcsStatus::TECp:
+    case DcsStatus::TECm:
+    case DcsStatus::BPIX:
+    case DcsStatus::FPIX:
+    case DcsStatus::ESp:
+    case DcsStatus::ESm:
       break;
     default:
-      edm::LogError( "TriggerHelper" ) << "DCS partition number \"" << dcsPartition << "\" does not exist ==> decision: " << errorReplyDcs_;
+      edm::LogError("TriggerHelper") << "DCS partition number \"" << dcsPartition
+                                     << "\" does not exist ==> decision: " << errorReplyDcs_;
       return errorReplyDcs_;
   }
 
   // Determine decision
-  return dcsStatus->at( 0 ).ready( dcsPartition );
-
+  return dcsStatus->at(0).ready(dcsPartition);
 }
 
-
-/// Does this event fulfill the configured GT status logical expression combination?
-bool TriggerHelper::acceptGt( const edm::Event & event )
-{
-
+/// Does this event fulfill the configured GT status logical expression
+/// combination?
+bool TriggerHelper::acceptGt(const edm::Event &event) {
   // An empty GT status bits logical expressions list acts as switch.
-  if ( ! onGt_ || gtLogicalExpressions_.empty() ) return ( ! andOr_ ); // logically neutral, depending on base logical connective
+  if (!onGt_ || gtLogicalExpressions_.empty())
+    return (!andOr_);  // logically neutral, depending on base logical connective
 
   // Accessing the L1GlobalTriggerReadoutRecord
-  edm::Handle< L1GlobalTriggerReadoutRecord > gtReadoutRecord;
-  event.getByLabel( gtInputTag_, gtReadoutRecord );
-  if ( ! gtReadoutRecord.isValid() ) {
-    edm::LogError( "TriggerHelper" ) << "L1GlobalTriggerReadoutRecord product with InputTag \"" << gtInputTag_.encode() << "\" not in event ==> decision: " << errorReplyGt_;
+  edm::Handle<L1GlobalTriggerReadoutRecord> gtReadoutRecord;
+  event.getByLabel(gtInputTag_, gtReadoutRecord);
+  if (!gtReadoutRecord.isValid()) {
+    edm::LogError("TriggerHelper") << "L1GlobalTriggerReadoutRecord product with InputTag \"" << gtInputTag_.encode()
+                                   << "\" not in event ==> decision: " << errorReplyGt_;
     return errorReplyGt_;
   }
 
-  // Determine decision of GT status bits logical expression combination and return
-  if ( andOrGt_ ) { // OR combination
-    for ( std::vector< std::string >::const_iterator gtLogicalExpression = gtLogicalExpressions_.begin(); gtLogicalExpression != gtLogicalExpressions_.end(); ++gtLogicalExpression ) {
-      if ( acceptGtLogicalExpression( gtReadoutRecord, *gtLogicalExpression ) ) return true;
+  // Determine decision of GT status bits logical expression combination and
+  // return
+  if (andOrGt_) {  // OR combination
+    for (std::vector<std::string>::const_iterator gtLogicalExpression = gtLogicalExpressions_.begin();
+         gtLogicalExpression != gtLogicalExpressions_.end();
+         ++gtLogicalExpression) {
+      if (acceptGtLogicalExpression(gtReadoutRecord, *gtLogicalExpression))
+        return true;
     }
     return false;
   }
-  for ( std::vector< std::string >::const_iterator gtLogicalExpression = gtLogicalExpressions_.begin(); gtLogicalExpression != gtLogicalExpressions_.end(); ++gtLogicalExpression ) {
-    if ( ! acceptGtLogicalExpression( gtReadoutRecord, *gtLogicalExpression ) ) return false;
+  for (std::vector<std::string>::const_iterator gtLogicalExpression = gtLogicalExpressions_.begin();
+       gtLogicalExpression != gtLogicalExpressions_.end();
+       ++gtLogicalExpression) {
+    if (!acceptGtLogicalExpression(gtReadoutRecord, *gtLogicalExpression))
+      return false;
   }
   return true;
-
 }
 
-
 /// Does this event fulfill this particular GT status bits' logical expression?
-bool TriggerHelper::acceptGtLogicalExpression( const edm::Handle< L1GlobalTriggerReadoutRecord > & gtReadoutRecord, std::string gtLogicalExpression )
-{
-
+bool TriggerHelper::acceptGtLogicalExpression(const edm::Handle<L1GlobalTriggerReadoutRecord> &gtReadoutRecord,
+                                              std::string gtLogicalExpression) {
   // Check empty std::strings
-  if ( gtLogicalExpression.empty() ) {
-    edm::LogError( "TriggerHelper" ) << "Empty logical expression ==> decision: " << errorReplyGt_;
+  if (gtLogicalExpression.empty()) {
+    edm::LogError("TriggerHelper") << "Empty logical expression ==> decision: " << errorReplyGt_;
     return errorReplyGt_;
   }
 
   // Negated paths
-  bool negExpr( negate( gtLogicalExpression ) );
-  if ( negExpr && gtLogicalExpression.empty() ) {
-    edm::LogError( "TriggerHelper" ) << "Empty (negated) logical expression ==> decision: " << errorReplyGt_;
+  bool negExpr(negate(gtLogicalExpression));
+  if (negExpr && gtLogicalExpression.empty()) {
+    edm::LogError("TriggerHelper") << "Empty (negated) logical expression ==> decision: " << errorReplyGt_;
     return errorReplyGt_;
   }
 
   // Parse logical expression and determine GT status bit decision
-  L1GtLogicParser gtAlgoLogicParser( gtLogicalExpression );
+  L1GtLogicParser gtAlgoLogicParser(gtLogicalExpression);
   // Loop over status bits
-  for ( size_t iStatusBit = 0; iStatusBit < gtAlgoLogicParser.operandTokenVector().size(); ++iStatusBit ) {
-    const std::string gtStatusBit( gtAlgoLogicParser.operandTokenVector().at( iStatusBit ).tokenName );
+  for (size_t iStatusBit = 0; iStatusBit < gtAlgoLogicParser.operandTokenVector().size(); ++iStatusBit) {
+    const std::string gtStatusBit(gtAlgoLogicParser.operandTokenVector().at(iStatusBit).tokenName);
     // Manipulate status bit decision as stored in the parser
     bool decision;
     // Hard-coded status bits!!!
-    if ( gtStatusBit == "PhysDecl" || gtStatusBit == "PhysicsDeclared" ) {
-      decision = ( gtReadoutRecord->gtFdlWord().physicsDeclared() == 1 );
+    if (gtStatusBit == "PhysDecl" || gtStatusBit == "PhysicsDeclared") {
+      decision = (gtReadoutRecord->gtFdlWord().physicsDeclared() == 1);
     } else {
-      edm::LogError( "TriggerHelper" ) << "GT status bit \"" << gtStatusBit << "\" is not defined ==> decision: " << errorReplyGt_;
+      edm::LogError("TriggerHelper") << "GT status bit \"" << gtStatusBit
+                                     << "\" is not defined ==> decision: " << errorReplyGt_;
       decision = errorReplyDcs_;
     }
-    gtAlgoLogicParser.operandTokenVector().at( iStatusBit ).tokenResult = decision;
+    gtAlgoLogicParser.operandTokenVector().at(iStatusBit).tokenResult = decision;
   }
 
   // Determine decision
-  const bool gtDecision( gtAlgoLogicParser.expressionResult() );
-  return negExpr ? ( ! gtDecision ) : gtDecision;
-
+  const bool gtDecision(gtAlgoLogicParser.expressionResult());
+  return negExpr ? (!gtDecision) : gtDecision;
 }
 
-
 /// Was this event accepted by the configured L1 logical expression combination?
-bool TriggerHelper::acceptL1( const edm::Event & event, const edm::EventSetup & setup )
-{
-
+bool TriggerHelper::acceptL1(const edm::Event &event, const edm::EventSetup &setup) {
   // An empty L1 logical expressions list acts as switch.
-  if ( ! onL1_ || l1LogicalExpressions_.empty() ) return ( ! andOr_ ); // logically neutral, depending on base logical connective
+  if (!onL1_ || l1LogicalExpressions_.empty())
+    return (!andOr_);  // logically neutral, depending on base logical connective
 
   // Getting the L1 event setup
-  l1Gt_->retrieveL1EventSetup( setup ); // FIXME This can possibly go to initRun()
+  l1Gt_->retrieveL1EventSetup(setup);  // FIXME This can possibly go to initRun()
 
   // Determine decision of L1 logical expression combination and return
-  if ( andOrL1_ ) { // OR combination
-    for ( std::vector< std::string >::const_iterator l1LogicalExpression = l1LogicalExpressions_.begin(); l1LogicalExpression != l1LogicalExpressions_.end(); ++l1LogicalExpression ) {
-      if ( acceptL1LogicalExpression( event, *l1LogicalExpression ) ) return true;
+  if (andOrL1_) {  // OR combination
+    for (std::vector<std::string>::const_iterator l1LogicalExpression = l1LogicalExpressions_.begin();
+         l1LogicalExpression != l1LogicalExpressions_.end();
+         ++l1LogicalExpression) {
+      if (acceptL1LogicalExpression(event, *l1LogicalExpression))
+        return true;
     }
     return false;
   }
-  for ( std::vector< std::string >::const_iterator l1LogicalExpression = l1LogicalExpressions_.begin(); l1LogicalExpression != l1LogicalExpressions_.end(); ++l1LogicalExpression ) {
-    if ( ! acceptL1LogicalExpression( event, *l1LogicalExpression ) ) return false;
+  for (std::vector<std::string>::const_iterator l1LogicalExpression = l1LogicalExpressions_.begin();
+       l1LogicalExpression != l1LogicalExpressions_.end();
+       ++l1LogicalExpression) {
+    if (!acceptL1LogicalExpression(event, *l1LogicalExpression))
+      return false;
   }
   return true;
-
 }
 
-
-/// Was this event accepted by this particular L1 algorithms' logical expression?
-bool TriggerHelper::acceptL1LogicalExpression( const edm::Event & event, std::string l1LogicalExpression )
-{
-
+/// Was this event accepted by this particular L1 algorithms' logical
+/// expression?
+bool TriggerHelper::acceptL1LogicalExpression(const edm::Event &event, std::string l1LogicalExpression) {
   // Check empty std::strings
-  if ( l1LogicalExpression.empty() ) {
-    edm::LogError( "TriggerHelper" ) << "Empty logical expression ==> decision: " << errorReplyL1_;
+  if (l1LogicalExpression.empty()) {
+    edm::LogError("TriggerHelper") << "Empty logical expression ==> decision: " << errorReplyL1_;
     return errorReplyL1_;
   }
 
   // Negated logical expression
-  bool negExpr( negate( l1LogicalExpression ) );
-  if ( negExpr && l1LogicalExpression.empty() ) {
-    edm::LogError( "TriggerHelper" ) << "Empty (negated) logical expression ==> decision: " << errorReplyL1_;
+  bool negExpr(negate(l1LogicalExpression));
+  if (negExpr && l1LogicalExpression.empty()) {
+    edm::LogError("TriggerHelper") << "Empty (negated) logical expression ==> decision: " << errorReplyL1_;
     return errorReplyL1_;
   }
 
   // Parse logical expression and determine L1 decision
-  L1GtLogicParser l1AlgoLogicParser( l1LogicalExpression );
+  L1GtLogicParser l1AlgoLogicParser(l1LogicalExpression);
   // Loop over algorithms
-  for ( size_t iAlgorithm = 0; iAlgorithm < l1AlgoLogicParser.operandTokenVector().size(); ++iAlgorithm ) {
-    const std::string l1AlgoName( l1AlgoLogicParser.operandTokenVector().at( iAlgorithm ).tokenName );
-    int error( -1 );
-    const bool decision( l1Gt_->decision( event, l1AlgoName, error ) );
+  for (size_t iAlgorithm = 0; iAlgorithm < l1AlgoLogicParser.operandTokenVector().size(); ++iAlgorithm) {
+    const std::string l1AlgoName(l1AlgoLogicParser.operandTokenVector().at(iAlgorithm).tokenName);
+    int error(-1);
+    const bool decision(l1Gt_->decision(event, l1AlgoName, error));
     // Error checks
-    if ( error != 0 ) {
-      if ( error == 1 ) edm::LogError( "TriggerHelper" ) << "L1 algorithm \"" << l1AlgoName << "\" does not exist in the L1 menu ==> decision: "                                          << errorReplyL1_;
-      else              edm::LogError( "TriggerHelper" )  << "L1 algorithm \"" << l1AlgoName << "\" received error code " << error << " from L1GtUtils::decisionBeforeMask ==> decision: " << errorReplyL1_;
-      l1AlgoLogicParser.operandTokenVector().at( iAlgorithm ).tokenResult = errorReplyL1_;
+    if (error != 0) {
+      if (error == 1)
+        edm::LogError("TriggerHelper") << "L1 algorithm \"" << l1AlgoName
+                                       << "\" does not exist in the L1 menu ==> decision: " << errorReplyL1_;
+      else
+        edm::LogError("TriggerHelper") << "L1 algorithm \"" << l1AlgoName << "\" received error code " << error
+                                       << " from L1GtUtils::decisionBeforeMask ==> decision: " << errorReplyL1_;
+      l1AlgoLogicParser.operandTokenVector().at(iAlgorithm).tokenResult = errorReplyL1_;
       continue;
     }
     // Manipulate algo decision as stored in the parser
-    l1AlgoLogicParser.operandTokenVector().at( iAlgorithm ).tokenResult = decision;
+    l1AlgoLogicParser.operandTokenVector().at(iAlgorithm).tokenResult = decision;
   }
 
   // Return decision
-  const bool l1Decision( l1AlgoLogicParser.expressionResult() );
-  return negExpr ? ( ! l1Decision ) : l1Decision;
-
+  const bool l1Decision(l1AlgoLogicParser.expressionResult());
+  return negExpr ? (!l1Decision) : l1Decision;
 }
 
-
-/// Was this event accepted by the configured HLT logical expression combination?
-bool TriggerHelper::acceptHlt( const edm::Event & event )
-{
-
+/// Was this event accepted by the configured HLT logical expression
+/// combination?
+bool TriggerHelper::acceptHlt(const edm::Event &event) {
   // An empty HLT logical expressions list acts as switch.
-  if ( ! onHlt_ || hltLogicalExpressions_.empty() ) return ( ! andOr_ ); // logically neutral, depending on base logical connective
+  if (!onHlt_ || hltLogicalExpressions_.empty())
+    return (!andOr_);  // logically neutral, depending on base logical connective
 
   // Checking the HLT configuration,
-  if ( ! hltConfigInit_ ) {
-    edm::LogError( "TriggerHelper" ) << "HLT config error ==> decision: " << errorReplyHlt_;
+  if (!hltConfigInit_) {
+    edm::LogError("TriggerHelper") << "HLT config error ==> decision: " << errorReplyHlt_;
     return errorReplyHlt_;
   }
 
   // Accessing the TriggerResults
-  edm::Handle< edm::TriggerResults > hltTriggerResults;
-  event.getByLabel( hltInputTag_, hltTriggerResults );
-  if ( ! hltTriggerResults.isValid() ) {
-    edm::LogError( "TriggerHelper" ) << "TriggerResults product with InputTag \"" << hltInputTag_.encode() << "\" not in event ==> decision: " << errorReplyHlt_;
+  edm::Handle<edm::TriggerResults> hltTriggerResults;
+  event.getByLabel(hltInputTag_, hltTriggerResults);
+  if (!hltTriggerResults.isValid()) {
+    edm::LogError("TriggerHelper") << "TriggerResults product with InputTag \"" << hltInputTag_.encode()
+                                   << "\" not in event ==> decision: " << errorReplyHlt_;
     return errorReplyHlt_;
   }
 
   // Determine decision of HLT logical expression combination and return
-  if ( andOrHlt_ ) { // OR combination
-    for ( std::vector< std::string >::const_iterator hltLogicalExpression = hltLogicalExpressions_.begin(); hltLogicalExpression != hltLogicalExpressions_.end(); ++hltLogicalExpression ) {
-      if ( acceptHltLogicalExpression( hltTriggerResults, *hltLogicalExpression ) ) return true;
+  if (andOrHlt_) {  // OR combination
+    for (std::vector<std::string>::const_iterator hltLogicalExpression = hltLogicalExpressions_.begin();
+         hltLogicalExpression != hltLogicalExpressions_.end();
+         ++hltLogicalExpression) {
+      if (acceptHltLogicalExpression(hltTriggerResults, *hltLogicalExpression))
+        return true;
     }
     return false;
   }
-  for ( std::vector< std::string >::const_iterator hltLogicalExpression = hltLogicalExpressions_.begin(); hltLogicalExpression != hltLogicalExpressions_.end(); ++hltLogicalExpression ) {
-    if ( ! acceptHltLogicalExpression( hltTriggerResults, *hltLogicalExpression ) ) return false;
+  for (std::vector<std::string>::const_iterator hltLogicalExpression = hltLogicalExpressions_.begin();
+       hltLogicalExpression != hltLogicalExpressions_.end();
+       ++hltLogicalExpression) {
+    if (!acceptHltLogicalExpression(hltTriggerResults, *hltLogicalExpression))
+      return false;
   }
   return true;
-
 }
 
-
 /// Was this event accepted by this particular HLT paths' logical expression?
-bool TriggerHelper::acceptHltLogicalExpression( const edm::Handle< edm::TriggerResults > & hltTriggerResults, std::string hltLogicalExpression ) const
-{
-
+bool TriggerHelper::acceptHltLogicalExpression(const edm::Handle<edm::TriggerResults> &hltTriggerResults,
+                                               std::string hltLogicalExpression) const {
   // Check empty std::strings
-  if ( hltLogicalExpression.empty() ) {
-    edm::LogError( "TriggerHelper" ) << "Empty logical expression ==> decision: " << errorReplyHlt_;
+  if (hltLogicalExpression.empty()) {
+    edm::LogError("TriggerHelper") << "Empty logical expression ==> decision: " << errorReplyHlt_;
     return errorReplyHlt_;
   }
 
   // Negated paths
-  bool negExpr( negate( hltLogicalExpression ) );
-  if ( negExpr && hltLogicalExpression.empty() ) {
-    edm::LogError( "TriggerHelper" ) << "Empty (negated) logical expression ==> decision: " << errorReplyHlt_;
+  bool negExpr(negate(hltLogicalExpression));
+  if (negExpr && hltLogicalExpression.empty()) {
+    edm::LogError("TriggerHelper") << "Empty (negated) logical expression ==> decision: " << errorReplyHlt_;
     return errorReplyHlt_;
   }
 
   // Parse logical expression and determine HLT decision
-  L1GtLogicParser hltAlgoLogicParser( hltLogicalExpression );
+  L1GtLogicParser hltAlgoLogicParser(hltLogicalExpression);
   // Loop over paths
-  for ( size_t iPath = 0; iPath < hltAlgoLogicParser.operandTokenVector().size(); ++iPath ) {
-    const std::string hltPathName( hltAlgoLogicParser.operandTokenVector().at( iPath ).tokenName );
-    const unsigned indexPath( hltConfig_.triggerIndex( hltPathName ) );
+  for (size_t iPath = 0; iPath < hltAlgoLogicParser.operandTokenVector().size(); ++iPath) {
+    const std::string hltPathName(hltAlgoLogicParser.operandTokenVector().at(iPath).tokenName);
+    const unsigned indexPath(hltConfig_.triggerIndex(hltPathName));
     // Further error checks
-    if ( indexPath == hltConfig_.size() ) {
-      edm::LogError( "TriggerHelper" ) << "HLT path \"" << hltPathName << "\" is not found in process " << hltInputTag_.process() << " ==> decision: " << errorReplyHlt_;
-      hltAlgoLogicParser.operandTokenVector().at( iPath ).tokenResult = errorReplyHlt_;
+    if (indexPath == hltConfig_.size()) {
+      edm::LogError("TriggerHelper") << "HLT path \"" << hltPathName << "\" is not found in process "
+                                     << hltInputTag_.process() << " ==> decision: " << errorReplyHlt_;
+      hltAlgoLogicParser.operandTokenVector().at(iPath).tokenResult = errorReplyHlt_;
       continue;
     }
-    if ( hltTriggerResults->error( indexPath ) ) {
-      edm::LogError( "TriggerHelper" ) << "HLT path \"" << hltPathName << "\" in error ==> decision: " << errorReplyHlt_;
-      hltAlgoLogicParser.operandTokenVector().at( iPath ).tokenResult = errorReplyHlt_;
+    if (hltTriggerResults->error(indexPath)) {
+      edm::LogError("TriggerHelper") << "HLT path \"" << hltPathName << "\" in error ==> decision: " << errorReplyHlt_;
+      hltAlgoLogicParser.operandTokenVector().at(iPath).tokenResult = errorReplyHlt_;
       continue;
     }
     // Manipulate algo decision as stored in the parser
-    const bool decision( hltTriggerResults->accept( indexPath ) );
-    hltAlgoLogicParser.operandTokenVector().at( iPath ).tokenResult = decision;
+    const bool decision(hltTriggerResults->accept(indexPath));
+    hltAlgoLogicParser.operandTokenVector().at(iPath).tokenResult = decision;
   }
 
   // Determine decision
-  const bool hltDecision( hltAlgoLogicParser.expressionResult() );
-  return negExpr ? ( ! hltDecision ) : hltDecision;
-
+  const bool hltDecision(hltAlgoLogicParser.expressionResult());
+  return negExpr ? (!hltDecision) : hltDecision;
 }
 
-
-
 /// Reads and returns logical expressions from DB
-std::vector< std::string > TriggerHelper::expressionsFromDB( const std::string & key, const edm::EventSetup & setup )
-{
-
-  edm::ESHandle< AlCaRecoTriggerBits > logicalExpressions;
-  setup.get< AlCaRecoTriggerBitsRcd >().get( logicalExpressions );
-  const std::map< std::string, std::string > & expressionMap = logicalExpressions->m_alcarecoToTrig;
-  std::map< std::string, std::string >::const_iterator listIter = expressionMap.find( key );
-  if ( listIter == expressionMap.end() ) {
-    edm::LogError( "TriggerHelper" ) << "No logical expressions found under key " << key << " in 'AlCaRecoTriggerBitsRcd'";
-    return std::vector< std::string >( 1, configError_ );
+std::vector<std::string> TriggerHelper::expressionsFromDB(const std::string &key, const edm::EventSetup &setup) {
+  edm::ESHandle<AlCaRecoTriggerBits> logicalExpressions;
+  setup.get<AlCaRecoTriggerBitsRcd>().get(logicalExpressions);
+  const std::map<std::string, std::string> &expressionMap = logicalExpressions->m_alcarecoToTrig;
+  std::map<std::string, std::string>::const_iterator listIter = expressionMap.find(key);
+  if (listIter == expressionMap.end()) {
+    edm::LogError("TriggerHelper") << "No logical expressions found under key " << key
+                                   << " in 'AlCaRecoTriggerBitsRcd'";
+    return std::vector<std::string>(1, configError_);
   }
-  return logicalExpressions->decompose( listIter->second );
-
+  return logicalExpressions->decompose(listIter->second);
 }
 
-
-
 /// Checks for negated words
-bool TriggerHelper::negate( std::string & word ) const
-{
-
-  bool negate( false );
-  if ( word.at( 0 ) == '~' ) {
+bool TriggerHelper::negate(std::string &word) const {
+  bool negate(false);
+  if (word.at(0) == '~') {
     negate = true;
-    word.erase( 0, 1 );
+    word.erase(0, 1);
   }
   return negate;
-
 }
diff --git a/DQM/TrackerMonitorTrack/interface/MonitorTrackResiduals.h b/DQM/TrackerMonitorTrack/interface/MonitorTrackResiduals.h
index dde0ed86987a8..52fddaa8d3b04 100644
--- a/DQM/TrackerMonitorTrack/interface/MonitorTrackResiduals.h
+++ b/DQM/TrackerMonitorTrack/interface/MonitorTrackResiduals.h
@@ -5,54 +5,58 @@
 //
 // Package:    TrackerMonitorTrack
 // Class:      MonitorTrackResiduals
-// 
-/**\class MonitorTrackResiduals MonitorTrackResiduals.h DQM/TrackerMonitorTrack/interface/MonitorTrackResiduals.cc
-Monitoring source for track residuals on each detector module
+//
+/**\class MonitorTrackResiduals MonitorTrackResiduals.h
+DQM/TrackerMonitorTrack/interface/MonitorTrackResiduals.cc Monitoring source for
+track residuals on each detector module
 */
 // Original Author:  Israel Goitom
 //         Created:  Fri May 26 14:12:01 CEST 2006
 // Author:  Marcel Schneider
-//         Extended to Pixel Residuals. 
-#include <memory>
-#include <fstream>
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+//         Extended to Pixel Residuals.
+#include "Alignment/OfflineValidation/interface/TrackerValidationVariables.h"
+#include "DQM/SiStripCommon/interface/TkHistoMap.h"
+#include "DataFormats/VertexReco/interface/VertexFwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/Run.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include <DQMServices/Core/interface/DQMEDAnalyzer.h>
-#include "Alignment/OfflineValidation/interface/TrackerValidationVariables.h"
-#include "DataFormats/VertexReco/interface/VertexFwd.h"
-#include "DQM/SiStripCommon/interface/TkHistoMap.h"
+#include <fstream>
+#include <memory>
 
 class MonitorElement;
 class DQMStore;
 class GenericTriggerEventFlag;
-namespace edm { class Event; }
+namespace edm {
+  class Event;
+}
 
-enum TrackerType {
-  TRACKERTYPE_STRIP, TRACKERTYPE_PIXEL
-};
+enum TrackerType { TRACKERTYPE_STRIP, TRACKERTYPE_PIXEL };
 
-template<TrackerType pixel_or_strip>
+template <TrackerType pixel_or_strip>
 class MonitorTrackResidualsBase : public DQMEDAnalyzer {
- public:
+public:
   // constructors and EDAnalyzer Methods
-  explicit MonitorTrackResidualsBase(const edm::ParameterSet&);
+  explicit MonitorTrackResidualsBase(const edm::ParameterSet &);
   ~MonitorTrackResidualsBase() override;
-  void dqmBeginRun(const edm::Run& , const edm::EventSetup& ) override ;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void dqmBeginRun(const edm::Run &, const edm::EventSetup &) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
- private:
 
-  // Own methods 
-  void createMEs( DQMStore::IBooker & , const edm::EventSetup&);
-  std::pair<std::string, int32_t> findSubdetAndLayer(uint32_t ModuleID, const TrackerTopology* tTopo);
-  
+private:
+  // Own methods
+  void createMEs(DQMStore::IBooker &, const edm::EventSetup &);
+  std::pair<std::string, int32_t> findSubdetAndLayer(uint32_t ModuleID, const TrackerTopology *tTopo);
+
   struct HistoPair {
-    HistoPair() {base = nullptr; normed = nullptr;};
-    MonitorElement* base;
-    MonitorElement* normed;
+    HistoPair() {
+      base = nullptr;
+      normed = nullptr;
+    };
+    MonitorElement *base;
+    MonitorElement *normed;
   };
   struct HistoXY {
     HistoPair x;
@@ -63,7 +67,7 @@ class MonitorTrackResidualsBase : public DQMEDAnalyzer {
   HistoSet m_SubdetLayerResiduals;
   HistoSet m_ModuleResiduals;
   std::unique_ptr<TkHistoMap> tkhisto_ResidualsMean;
-  
+
   edm::ParameterSet conf_;
   edm::ParameterSet Parameters;
   edm::EDGetTokenT<reco::VertexCollection> offlinePrimaryVerticesToken_;
@@ -71,7 +75,7 @@ class MonitorTrackResidualsBase : public DQMEDAnalyzer {
   unsigned long long m_cacheID_;
   bool ModOn;
 
-  GenericTriggerEventFlag* genTriggerEventFlag_;
+  GenericTriggerEventFlag *genTriggerEventFlag_;
   TrackerValidationVariables avalidator_;
 };
 
diff --git a/DQM/TrackerMonitorTrack/src/MonitorTrackResiduals.cc b/DQM/TrackerMonitorTrack/src/MonitorTrackResiduals.cc
index 69540b254bc64..f0d940dcc7b8e 100644
--- a/DQM/TrackerMonitorTrack/src/MonitorTrackResiduals.cc
+++ b/DQM/TrackerMonitorTrack/src/MonitorTrackResiduals.cc
@@ -1,120 +1,123 @@
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DQM/SiStripCommon/interface/SiStripFolderOrganizer.h"
+#include "CommonTools/TriggerUtils/interface/GenericTriggerEventFlag.h"
 #include "DQM/SiPixelCommon/interface/SiPixelFolderOrganizer.h"
+#include "DQM/SiStripCommon/interface/SiStripFolderOrganizer.h"
 #include "DQM/SiStripCommon/interface/SiStripHistoId.h"
 #include "DQM/TrackerMonitorTrack/interface/MonitorTrackResiduals.h"
-#include "Geometry/Records/interface/TrackerTopologyRcd.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/TrackReco/interface/Track.h"
+#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "CommonTools/TriggerUtils/interface/GenericTriggerEventFlag.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 
-template<TrackerType pixel_or_strip>
-MonitorTrackResidualsBase<pixel_or_strip>::MonitorTrackResidualsBase(const edm::ParameterSet& iConfig)
-   : conf_(iConfig), m_cacheID_(0)
-   , genTriggerEventFlag_(new GenericTriggerEventFlag(iConfig.getParameter<edm::ParameterSet>("genericTriggerEventPSet"), consumesCollector(), *this))
-   , avalidator_(iConfig, consumesCollector()) {
+template <TrackerType pixel_or_strip>
+MonitorTrackResidualsBase<pixel_or_strip>::MonitorTrackResidualsBase(const edm::ParameterSet &iConfig)
+    : conf_(iConfig),
+      m_cacheID_(0),
+      genTriggerEventFlag_(new GenericTriggerEventFlag(
+          iConfig.getParameter<edm::ParameterSet>("genericTriggerEventPSet"), consumesCollector(), *this)),
+      avalidator_(iConfig, consumesCollector()) {
   ModOn = conf_.getParameter<bool>("Mod_On");
   offlinePrimaryVerticesToken_ = consumes<reco::VertexCollection>(std::string("offlinePrimaryVertices"));
 }
 
-template<TrackerType pixel_or_strip>
+template <TrackerType pixel_or_strip>
 MonitorTrackResidualsBase<pixel_or_strip>::~MonitorTrackResidualsBase() {
-  if (genTriggerEventFlag_) delete genTriggerEventFlag_;
+  if (genTriggerEventFlag_)
+    delete genTriggerEventFlag_;
 }
 
-template<TrackerType pixel_or_strip>
-void MonitorTrackResidualsBase<pixel_or_strip>::bookHistograms(DQMStore::IBooker & ibooker , const edm::Run & run, const edm::EventSetup & iSetup)
-{
+template <TrackerType pixel_or_strip>
+void MonitorTrackResidualsBase<pixel_or_strip>::bookHistograms(DQMStore::IBooker &ibooker,
+                                                               const edm::Run &run,
+                                                               const edm::EventSetup &iSetup) {
   unsigned long long cacheID = iSetup.get<TrackerDigiGeometryRecord>().cacheIdentifier();
   if (m_cacheID_ != cacheID) {
     m_cacheID_ = cacheID;
-    this->createMEs( ibooker , iSetup);
+    this->createMEs(ibooker, iSetup);
   }
   std::string topFolderName_ = "SiStrip";
   SiStripFolderOrganizer folder_organizer;
   folder_organizer.setSiStripFolderName(topFolderName_);
   edm::ESHandle<TkDetMap> tkDetMapHandle;
   iSetup.get<TrackerTopologyRcd>().get(tkDetMapHandle);
-  tkhisto_ResidualsMean = std::make_unique<TkHistoMap>(tkDetMapHandle.product(), ibooker , topFolderName_ ,"TkHMap_ResidualsMean", 0.0,true);
+  tkhisto_ResidualsMean = std::make_unique<TkHistoMap>(
+      tkDetMapHandle.product(), ibooker, topFolderName_, "TkHMap_ResidualsMean", 0.0, true);
 }
 
-template<TrackerType pixel_or_strip>
-void MonitorTrackResidualsBase<pixel_or_strip>::dqmBeginRun(edm::Run const& run, edm::EventSetup const& iSetup) {
-
+template <TrackerType pixel_or_strip>
+void MonitorTrackResidualsBase<pixel_or_strip>::dqmBeginRun(edm::Run const &run, edm::EventSetup const &iSetup) {
   // Initialize the GenericTriggerEventFlag
-  if ( genTriggerEventFlag_->on() ) genTriggerEventFlag_->initRun( run, iSetup );
+  if (genTriggerEventFlag_->on())
+    genTriggerEventFlag_->initRun(run, iSetup);
 }
 
-template<TrackerType pixel_or_strip>
-std::pair<std::string, int32_t> MonitorTrackResidualsBase<pixel_or_strip>::findSubdetAndLayer(uint32_t ModuleID, const TrackerTopology* tTopo) {
-      std::string subdet = "";
-      int32_t layer = 0;
-      auto id = DetId(ModuleID);
-      switch (id.subdetId()) {
-        // Pixel Barrel, Endcap
-	case 1:
-	  subdet = "BPIX";
-          layer = tTopo->pxbLayer(id);
-	  break;
-        case 2:
-	  subdet = "FPIX";
-          layer = tTopo->pxfDisk(id) * ( tTopo->pxfSide(ModuleID)==1 ? -1 : +1);
-	  break;
-	// Strip TIB, TID, TOB, TEC
-	case 3:
-	  subdet = "TIB";
-          layer = tTopo->tibLayer(id);
-	  break;
-	case 4:
-	  subdet = "TID";
-          layer = tTopo->tidWheel(id) * ( tTopo->tidSide(ModuleID)==1 ? -1 : +1);
-	  break;
-	case 5:
-	  subdet = "TOB";
-          layer = tTopo->tobLayer(id);
-	  break;
-	case 6:
-	  subdet = "TEC";
-          layer = tTopo->tecWheel(id) * ( tTopo->tecSide(ModuleID)==1 ? -1 : +1);
-	  break;
-	default:
-	  // TODO: Fail loudly.
-	  subdet = "UNKNOWN";
-	  layer = 0;
-      }
-      return std::make_pair(subdet, layer);
+template <TrackerType pixel_or_strip>
+std::pair<std::string, int32_t> MonitorTrackResidualsBase<pixel_or_strip>::findSubdetAndLayer(
+    uint32_t ModuleID, const TrackerTopology *tTopo) {
+  std::string subdet = "";
+  int32_t layer = 0;
+  auto id = DetId(ModuleID);
+  switch (id.subdetId()) {
+    // Pixel Barrel, Endcap
+    case 1:
+      subdet = "BPIX";
+      layer = tTopo->pxbLayer(id);
+      break;
+    case 2:
+      subdet = "FPIX";
+      layer = tTopo->pxfDisk(id) * (tTopo->pxfSide(ModuleID) == 1 ? -1 : +1);
+      break;
+    // Strip TIB, TID, TOB, TEC
+    case 3:
+      subdet = "TIB";
+      layer = tTopo->tibLayer(id);
+      break;
+    case 4:
+      subdet = "TID";
+      layer = tTopo->tidWheel(id) * (tTopo->tidSide(ModuleID) == 1 ? -1 : +1);
+      break;
+    case 5:
+      subdet = "TOB";
+      layer = tTopo->tobLayer(id);
+      break;
+    case 6:
+      subdet = "TEC";
+      layer = tTopo->tecWheel(id) * (tTopo->tecSide(ModuleID) == 1 ? -1 : +1);
+      break;
+    default:
+      // TODO: Fail loudly.
+      subdet = "UNKNOWN";
+      layer = 0;
+  }
+  return std::make_pair(subdet, layer);
 }
 
-
-template<TrackerType pixel_or_strip>
-void MonitorTrackResidualsBase<pixel_or_strip>::createMEs( DQMStore::IBooker & ibooker , const edm::EventSetup& iSetup){
-
-  //Retrieve tracker topology and geometry
+template <TrackerType pixel_or_strip>
+void MonitorTrackResidualsBase<pixel_or_strip>::createMEs(DQMStore::IBooker &ibooker, const edm::EventSetup &iSetup) {
+  // Retrieve tracker topology and geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
   edm::ESHandle<TrackerGeometry> TG;
   iSetup.get<TrackerDigiGeometryRecord>().get(TG);
- 
+
   Parameters = conf_.getParameter<edm::ParameterSet>("TH1ResModules");
-  int32_t i_residuals_Nbins =  Parameters.getParameter<int32_t>("Nbinx");
+  int32_t i_residuals_Nbins = Parameters.getParameter<int32_t>("Nbinx");
   double d_residual_xmin = Parameters.getParameter<double>("xmin");
   double d_residual_xmax = Parameters.getParameter<double>("xmax");
   Parameters = conf_.getParameter<edm::ParameterSet>("TH1NormResModules");
-  int32_t i_normres_Nbins =  Parameters.getParameter<int32_t>("Nbinx");
+  int32_t i_normres_Nbins = Parameters.getParameter<int32_t>("Nbinx");
   double d_normres_xmin = Parameters.getParameter<double>("xmin");
   double d_normres_xmax = Parameters.getParameter<double>("xmax");
 
-
   // use SistripHistoId for producing histogram id (and title)
   SiStripHistoId hidmanager;
 
@@ -123,160 +126,173 @@ void MonitorTrackResidualsBase<pixel_or_strip>::createMEs( DQMStore::IBooker & i
 
   // Collect list of modules from Tracker Geometry
   // book histo per each detector module
-  auto ids = TG->detIds(); // or detUnitIds?
-  for (DetId id : ids) 
-    {
-      auto ModuleID = id.rawId();
-      auto isPixel = id.subdetId() == 1 || id.subdetId() == 2;
-      if (isPixel != (pixel_or_strip == TRACKERTYPE_PIXEL)) continue; 
-
-      // Book module histogramms?
-      if (ModOn) {
-	switch (id.subdetId()) {
-	  case 1:   pixel_organizer.setModuleFolder(ibooker, ModuleID, 0); break;
-	  case 2:   pixel_organizer.setModuleFolder(ibooker, ModuleID, 0); break;
-	  default:  strip_organizer.setDetectorFolder(ModuleID,tTopo);
-	}
-	{
-	  // this sounds strip specific but also works for pixel
-	  std::string hid = hidmanager.createHistoId("HitResidualsX","det",ModuleID);
-	  std::string normhid = hidmanager.createHistoId("NormalizedHitResidualsX","det",ModuleID);
-	  auto& histos = m_ModuleResiduals[std::make_pair("", ModuleID)];
-	  histos.x.base = ibooker.book1D(hid, hid, i_residuals_Nbins,d_residual_xmin,d_residual_xmax);
-	  histos.x.base->setAxisTitle("(x_{pred} - x_{rec})' [cm]");
-	  histos.x.normed = ibooker.book1D(normhid, normhid, i_normres_Nbins,d_normres_xmin,d_normres_xmax);
-	  histos.x.normed->setAxisTitle("(x_{pred} - x_{rec})'/#sigma");
-	}{ 
-	  std::string hid = hidmanager.createHistoId("HitResidualsY","det",ModuleID);
-	  std::string normhid = hidmanager.createHistoId("NormalizedHitResidualsY","det",ModuleID);
-	  auto& histos = m_ModuleResiduals[std::make_pair("", ModuleID)];
-	  histos.y.base = ibooker.book1D(hid, hid, i_residuals_Nbins,d_residual_xmin,d_residual_xmax);
-	  histos.y.base->setAxisTitle("(y_{pred} - y_{rec})' [cm]");
-	  histos.y.normed = ibooker.book1D(normhid, normhid, i_normres_Nbins,d_normres_xmin,d_normres_xmax);
-	  histos.y.normed->setAxisTitle("(y_{pred} - y_{rec})'/#sigma");
-	}
+  auto ids = TG->detIds();  // or detUnitIds?
+  for (DetId id : ids) {
+    auto ModuleID = id.rawId();
+    auto isPixel = id.subdetId() == 1 || id.subdetId() == 2;
+    if (isPixel != (pixel_or_strip == TRACKERTYPE_PIXEL))
+      continue;
+
+    // Book module histogramms?
+    if (ModOn) {
+      switch (id.subdetId()) {
+        case 1:
+          pixel_organizer.setModuleFolder(ibooker, ModuleID, 0);
+          break;
+        case 2:
+          pixel_organizer.setModuleFolder(ibooker, ModuleID, 0);
+          break;
+        default:
+          strip_organizer.setDetectorFolder(ModuleID, tTopo);
       }
+      {
+        // this sounds strip specific but also works for pixel
+        std::string hid = hidmanager.createHistoId("HitResidualsX", "det", ModuleID);
+        std::string normhid = hidmanager.createHistoId("NormalizedHitResidualsX", "det", ModuleID);
+        auto &histos = m_ModuleResiduals[std::make_pair("", ModuleID)];
+        histos.x.base = ibooker.book1D(hid, hid, i_residuals_Nbins, d_residual_xmin, d_residual_xmax);
+        histos.x.base->setAxisTitle("(x_{pred} - x_{rec})' [cm]");
+        histos.x.normed = ibooker.book1D(normhid, normhid, i_normres_Nbins, d_normres_xmin, d_normres_xmax);
+        histos.x.normed->setAxisTitle("(x_{pred} - x_{rec})'/#sigma");
+      }
+      {
+        std::string hid = hidmanager.createHistoId("HitResidualsY", "det", ModuleID);
+        std::string normhid = hidmanager.createHistoId("NormalizedHitResidualsY", "det", ModuleID);
+        auto &histos = m_ModuleResiduals[std::make_pair("", ModuleID)];
+        histos.y.base = ibooker.book1D(hid, hid, i_residuals_Nbins, d_residual_xmin, d_residual_xmax);
+        histos.y.base->setAxisTitle("(y_{pred} - y_{rec})' [cm]");
+        histos.y.normed = ibooker.book1D(normhid, normhid, i_normres_Nbins, d_normres_xmin, d_normres_xmax);
+        histos.y.normed->setAxisTitle("(y_{pred} - y_{rec})'/#sigma");
+      }
+    }
 
-      auto subdetandlayer = findSubdetAndLayer(ModuleID, tTopo);
-      if(m_SubdetLayerResiduals.find(subdetandlayer) == m_SubdetLayerResiduals.end()) {
-	// add new histograms
-	auto& histos = m_SubdetLayerResiduals[subdetandlayer];
-	switch (id.subdetId()) {
-	  // Pixel Barrel, Endcap
-	  // We can't use the folder organizer here (SiPixelActionExecutor.cc#1638 does the same)
-	  case 1:   ibooker.setCurrentFolder("Pixel/Barrel"); break;
-	  case 2:   ibooker.setCurrentFolder("Pixel/Endcap"); break;
-	  // All strip
-	  default:  strip_organizer.setLayerFolder(ModuleID,tTopo,subdetandlayer.second);
-	}
-      
-	auto isBarrel = subdetandlayer.first.find("B") != std::string::npos;
-	
-	auto xy = std::vector<std::pair<HistoPair&, const char*> >
-      		{ std::make_pair(std::ref(histos.x), "X"),
-	          std::make_pair(std::ref(histos.y), "Y") };
-	for (auto& histopair : xy) {
-	  // book histogramms on layer level, check for barrel/pixel only for correct labeling
-
-	  // Skip the Y plots for strips.
-	  if (!isPixel && histopair.second[0] == 'Y') continue;
-
-	  std::string histoname = isPixel ? ( // Pixel name
-	        Form("HitResiduals%s_%s%d",
-	        histopair.second,
-	        isBarrel ? "L" : (subdetandlayer.second > 0 ? "Dp" : "Dm"),
-	        std::abs(subdetandlayer.second)))
-	     : (Form("HitResiduals_%s__%s__%d", // Strip TODO: We use a legacy name. 
-	        subdetandlayer.first.c_str(),
-	        isBarrel ? "Layer" : "wheel",
-	        std::abs(subdetandlayer.second)));
-
-	  std::string histotitle = Form("HitResiduals %s on %s%s full %s %d",
-		histopair.second,
-		subdetandlayer.first.c_str(),
-		isBarrel ? "" : (subdetandlayer.second > 0 ? "+" : "-"),
-		isBarrel ? "Layer" : (isPixel ? "Disk" : "Wheel"),
-		std::abs(subdetandlayer.second));
-	
-
-	  std::string normhistoname = Form("Normalized%s", histoname.c_str());
-	  std::string normhistotitle = Form("Normalized%s", histotitle.c_str());
-
-	  //std::cout << "##### Booking: " << ibooker.pwd() << " title " << histoname << std::endl;
-	  
-	  histopair.first.base =
-	    ibooker.book1D(histoname.c_str(),histotitle.c_str(),
-			 i_residuals_Nbins,d_residual_xmin,d_residual_xmax);
-	  histopair.first.base->setAxisTitle("(x_{pred} - x_{rec})' [cm]");
+    auto subdetandlayer = findSubdetAndLayer(ModuleID, tTopo);
+    if (m_SubdetLayerResiduals.find(subdetandlayer) == m_SubdetLayerResiduals.end()) {
+      // add new histograms
+      auto &histos = m_SubdetLayerResiduals[subdetandlayer];
+      switch (id.subdetId()) {
+        // Pixel Barrel, Endcap
+        // We can't use the folder organizer here (SiPixelActionExecutor.cc#1638
+        // does the same)
+        case 1:
+          ibooker.setCurrentFolder("Pixel/Barrel");
+          break;
+        case 2:
+          ibooker.setCurrentFolder("Pixel/Endcap");
+          break;
+        // All strip
+        default:
+          strip_organizer.setLayerFolder(ModuleID, tTopo, subdetandlayer.second);
+      }
 
-	  histopair.first.normed =
-	    ibooker.book1D(normhistoname.c_str(),normhistotitle.c_str(),
-			   i_normres_Nbins,d_normres_xmin,d_normres_xmax);
-	  histopair.first.normed->setAxisTitle("(x_{pred} - x_{rec})'/#sigma");
-	}
-      }      
-    } // end loop over activeDets
+      auto isBarrel = subdetandlayer.first.find("B") != std::string::npos;
+
+      auto xy = std::vector<std::pair<HistoPair &, const char *>>{std::make_pair(std::ref(histos.x), "X"),
+                                                                  std::make_pair(std::ref(histos.y), "Y")};
+      for (auto &histopair : xy) {
+        // book histogramms on layer level, check for barrel/pixel only for
+        // correct labeling
+
+        // Skip the Y plots for strips.
+        if (!isPixel && histopair.second[0] == 'Y')
+          continue;
+
+        std::string histoname = isPixel ? (  // Pixel name
+                                              Form("HitResiduals%s_%s%d",
+                                                   histopair.second,
+                                                   isBarrel ? "L" : (subdetandlayer.second > 0 ? "Dp" : "Dm"),
+                                                   std::abs(subdetandlayer.second)))
+                                        : (Form("HitResiduals_%s__%s__%d",  // Strip TODO: We use a
+                                                                            // legacy name.
+                                                subdetandlayer.first.c_str(),
+                                                isBarrel ? "Layer" : "wheel",
+                                                std::abs(subdetandlayer.second)));
+
+        std::string histotitle = Form("HitResiduals %s on %s%s full %s %d",
+                                      histopair.second,
+                                      subdetandlayer.first.c_str(),
+                                      isBarrel ? "" : (subdetandlayer.second > 0 ? "+" : "-"),
+                                      isBarrel ? "Layer" : (isPixel ? "Disk" : "Wheel"),
+                                      std::abs(subdetandlayer.second));
+
+        std::string normhistoname = Form("Normalized%s", histoname.c_str());
+        std::string normhistotitle = Form("Normalized%s", histotitle.c_str());
+
+        // std::cout << "##### Booking: " << ibooker.pwd() << " title " <<
+        // histoname << std::endl;
+
+        histopair.first.base =
+            ibooker.book1D(histoname.c_str(), histotitle.c_str(), i_residuals_Nbins, d_residual_xmin, d_residual_xmax);
+        histopair.first.base->setAxisTitle("(x_{pred} - x_{rec})' [cm]");
+
+        histopair.first.normed = ibooker.book1D(
+            normhistoname.c_str(), normhistotitle.c_str(), i_normres_Nbins, d_normres_xmin, d_normres_xmax);
+        histopair.first.normed->setAxisTitle("(x_{pred} - x_{rec})'/#sigma");
+      }
+    }
+  }  // end loop over activeDets
 }
 
-template<TrackerType pixel_or_strip>
-void MonitorTrackResidualsBase<pixel_or_strip>::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
-
+template <TrackerType pixel_or_strip>
+void MonitorTrackResidualsBase<pixel_or_strip>::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   auto vtracks = std::vector<TrackerValidationVariables::AVTrackStruct>();
   // Filter out events if Trigger Filtering is requested
-  if (genTriggerEventFlag_->on()&& ! genTriggerEventFlag_->accept( iEvent, iSetup) ) return;
+  if (genTriggerEventFlag_->on() && !genTriggerEventFlag_->accept(iEvent, iSetup))
+    return;
 
   edm::Handle<reco::VertexCollection> vertices;
   iEvent.getByToken(offlinePrimaryVerticesToken_, vertices);
-  if (!vertices.isValid() || vertices->empty()) return;
-  const auto primaryVertex = vertices->at(0); 
+  if (!vertices.isValid() || vertices->empty())
+    return;
+  const auto primaryVertex = vertices->at(0);
 
-  //Retrieve tracker topology from geometry
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
-
-  avalidator_.fillTrackQuantities(iEvent, iSetup, 
-                  // tell the validator to only look at good tracks
-                  [&](const reco::Track& track) -> bool { 
-                    return track.pt() > 0.75
-                        && abs( track.dxy(primaryVertex.position()) ) < 5*track.dxyError();
-                  }, vtracks);
-
-  for (auto& track : vtracks) {
-    for (auto& it : track.hits) {
+  const TrackerTopology *const tTopo = tTopoHandle.product();
+
+  avalidator_.fillTrackQuantities(iEvent,
+                                  iSetup,
+                                  // tell the validator to only look at good tracks
+                                  [&](const reco::Track &track) -> bool {
+                                    return track.pt() > 0.75 &&
+                                           abs(track.dxy(primaryVertex.position())) < 5 * track.dxyError();
+                                  },
+                                  vtracks);
+
+  for (auto &track : vtracks) {
+    for (auto &it : track.hits) {
       uint RawId = it.rawDetId;
 
       auto id = DetId(RawId);
       auto isPixel = id.subdetId() == 1 || id.subdetId() == 2;
-      if (isPixel != (pixel_or_strip == TRACKERTYPE_PIXEL)) continue; 
-      
+      if (isPixel != (pixel_or_strip == TRACKERTYPE_PIXEL))
+        continue;
 
       if (ModOn) {
-	auto& mod_histos = m_ModuleResiduals[std::make_pair("",RawId)];
-	mod_histos.x.base->Fill(it.resXprime);
-	mod_histos.x.normed->Fill(it.resXprime/it.resXprimeErr);
-	mod_histos.y.base->Fill(it.resYprime);
-	mod_histos.y.normed->Fill(it.resYprime/it.resYprimeErr);
+        auto &mod_histos = m_ModuleResiduals[std::make_pair("", RawId)];
+        mod_histos.x.base->Fill(it.resXprime);
+        mod_histos.x.normed->Fill(it.resXprime / it.resXprimeErr);
+        mod_histos.y.base->Fill(it.resYprime);
+        mod_histos.y.normed->Fill(it.resYprime / it.resYprimeErr);
       }
 
       auto subdetandlayer = findSubdetAndLayer(RawId, tTopo);
       auto histos = m_SubdetLayerResiduals[subdetandlayer];
       // fill if its error is not zero
-      if(it.resXprimeErr != 0 && histos.x.base) {
-	histos.x.base->Fill(it.resXprime);
-	histos.x.normed->Fill(it.resXprime/it.resXprimeErr);
-	if(!isPixel) tkhisto_ResidualsMean->fill(RawId,it.resXprime);
+      if (it.resXprimeErr != 0 && histos.x.base) {
+        histos.x.base->Fill(it.resXprime);
+        histos.x.normed->Fill(it.resXprime / it.resXprimeErr);
+        if (!isPixel)
+          tkhisto_ResidualsMean->fill(RawId, it.resXprime);
       }
-      if(it.resYprimeErr != 0 && histos.y.base) {
-	histos.y.base->Fill(it.resYprime);
-	histos.y.normed->Fill(it.resYprime/it.resYprimeErr);
+      if (it.resYprimeErr != 0 && histos.y.base) {
+        histos.y.base->Fill(it.resYprime);
+        histos.y.normed->Fill(it.resYprime / it.resYprimeErr);
       }
     }
   }
 }
 
-
-
 DEFINE_FWK_MODULE(MonitorTrackResiduals);
 DEFINE_FWK_MODULE(SiPixelMonitorTrackResiduals);
- 
diff --git a/DQM/TrigXMonitorClient/interface/HLTScalersClient.h b/DQM/TrigXMonitorClient/interface/HLTScalersClient.h
index 9fb6a6e04bfb4..46fc150fb8369 100644
--- a/DQM/TrigXMonitorClient/interface/HLTScalersClient.h
+++ b/DQM/TrigXMonitorClient/interface/HLTScalersClient.h
@@ -1,7 +1,7 @@
 // -*-c++-*-
-// 
+//
 // Client class for HLT Scalers module.
-// 
+//
 
 // Revision 1.13  2010/03/17 20:56:18  wittich
 // Check for good updates based on mergeCount values
@@ -37,13 +37,13 @@
 
 #ifndef HLTSCALERSCLIENT_H
 #define HLTSCALERSCLIENT_H
+#include <deque>
 #include <fstream>
+#include <utility>
 #include <vector>
-#include <deque>
-#include <utility> 
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 
@@ -54,146 +54,122 @@
 #define MAX_PATHS 200
 #define MAX_LUMI_SEG_HLT 2400
 
-class HLTScalersClient: public edm::EDAnalyzer
-{
+class HLTScalersClient : public edm::EDAnalyzer {
 private:
   std::ofstream textfile_;
 
 public:
-//   typedef std::pair<int,double> CountLS_t;
-//   //typedef std::deque<CountLS_t> CountLSFifo_t;
-//   typedef std::map<int,double> CountLSFifo_t;
+  //   typedef std::pair<int,double> CountLS_t;
+  //   //typedef std::deque<CountLS_t> CountLSFifo_t;
+  //   typedef std::map<int,double> CountLSFifo_t;
 
   // helper data structures - slightly modified stl objects
-  class CountLS_t: public std::pair<int,double>
-  {
+  class CountLS_t : public std::pair<int, double> {
   public:
-    CountLS_t(int ls, double cnt):
-      std::pair<int,double>(ls,cnt)
-    {};
-    bool operator==(int ls) const
-    {
-      return ls == this->first;
-    }
-    bool operator<(CountLS_t & rhs ) 
-    {
-      return  this->first< rhs.first;
-    };
-
+    CountLS_t(int ls, double cnt) : std::pair<int, double>(ls, cnt){};
+    bool operator==(int ls) const { return ls == this->first; }
+    bool operator<(CountLS_t &rhs) { return this->first < rhs.first; };
   };
 
-  class CountLSFifo_t: public std::deque<CountLS_t> 
-  {
+  class CountLSFifo_t : public std::deque<CountLS_t> {
   private:
     unsigned int targetSize_;
     bool accumulate_;
+
   public:
     // default constructor
-    CountLSFifo_t(unsigned int sz = 3) :
-      std::deque<CountLS_t>(),
-      targetSize_(sz)
-    {}
+    CountLSFifo_t(unsigned int sz = 3) : std::deque<CountLS_t>(), targetSize_(sz) {}
     unsigned int targetSize() const { return targetSize_; };
-    double getCount(int ls)
-    {
-      CountLSFifo_t::iterator p = std::find(this->begin(), this->end(),
-					    ls);
-      if ( p != end() ) 
-	return p->second;
+    double getCount(int ls) {
+      CountLSFifo_t::iterator p = std::find(this->begin(), this->end(), ls);
+      if (p != end())
+        return p->second;
       else
-	return -1;
+        return -1;
     }
 
-
-    void update( const CountLS_t & T)
-    {
+    void update(const CountLS_t &T) {
       // do we already have data for this LS?
-      CountLSFifo_t::iterator p = std::find(this->begin(), this->end(),
-					    T.first);
-      if ( p != this->end() ) { // we already have data for this LS
-	p->second = T.second; 
-      }
-      else { // new data
-	this->push_back(T);
+      CountLSFifo_t::iterator p = std::find(this->begin(), this->end(), T.first);
+      if (p != this->end()) {  // we already have data for this LS
+        p->second = T.second;
+      } else {  // new data
+        this->push_back(T);
       }
       trim_();
     }
+
   private:
-    void trim_()
-    {
-      if ( this->size() > targetSize_ ) {
-	std::sort(begin(), end());
-	while ( size() > targetSize_ ) {
-	  pop_front();
-	}
+    void trim_() {
+      if (this->size() > targetSize_) {
+        std::sort(begin(), end());
+        while (size() > targetSize_) {
+          pop_front();
+        }
       }
     }
   };
 
-  
 public:
   /// Constructors
-  HLTScalersClient(const edm::ParameterSet& ps);
-  
+  HLTScalersClient(const edm::ParameterSet &ps);
+
   /// Destructor
   ~HLTScalersClient() override {
-    if ( debug_ ) {
+    if (debug_) {
       textfile_.close();
     }
   };
-  
+
   /// BeginJob
   void beginJob(void) override;
 
-  
   /// BeginRun
-  void beginRun(const edm::Run& run, const edm::EventSetup& c) override;
+  void beginRun(const edm::Run &run, const edm::EventSetup &c) override;
 
   /// EndRun
-  void endRun(const edm::Run& run, const edm::EventSetup& c) override;
+  void endRun(const edm::Run &run, const edm::EventSetup &c) override;
 
-  
   /// End LumiBlock
   /// DQM Client Diagnostic should be performed here
-  void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, 
-                          const edm::EventSetup& c) override;
+  void endLuminosityBlock(const edm::LuminosityBlock &lumiSeg, const edm::EventSetup &c) override;
 
   // unused
-  void analyze(const edm::Event& e, const edm::EventSetup& c) override ;
-
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
 private:
-  DQMStore * dbe_;
+  DQMStore *dbe_;
 
-  int nev_; // Number of events processed
-  int nLumi_; // number of lumi blocks
+  int nev_;    // Number of events processed
+  int nLumi_;  // number of lumi blocks
   int currentRun_;
 
   MonitorElement *currentRate_;
   int currentLumiBlockNumber_;
-  std::vector<MonitorElement*> rateHistories_; 
-  std::vector<MonitorElement*> countHistories_; 
+  std::vector<MonitorElement *> rateHistories_;
+  std::vector<MonitorElement *> countHistories_;
 
-  std::vector<MonitorElement*> hltCurrentRate_;
-  MonitorElement *hltRate_; // global rate - any accept
-  MonitorElement *hltCount_; // globalCounts
+  std::vector<MonitorElement *> hltCurrentRate_;
+  MonitorElement *hltRate_;   // global rate - any accept
+  MonitorElement *hltCount_;  // globalCounts
   //  MonitorElement *hltCountN_; // globalCounts normalized
   MonitorElement *updates_;
   MonitorElement *mergeCount_;
 
   // Normalized
-  MonitorElement *hltNormRate_; // global rate - any accept
+  MonitorElement *hltNormRate_;  // global rate - any accept
   MonitorElement *currentNormRate_;
-  std::vector<MonitorElement*> rateNormHistories_; 
-  std::vector<MonitorElement*> hltCurrentNormRate_;
-  
+  std::vector<MonitorElement *> rateNormHistories_;
+  std::vector<MonitorElement *> hltCurrentNormRate_;
+
   bool first_, missingPathNames_;
   std::string folderName_;
   unsigned int kRateIntegWindow_;
   std::string processName_;
-  //HLTConfigProvider hltConfig_;
+  // HLTConfigProvider hltConfig_;
   std::deque<int> ignores_;
-  std::pair<double,double> getSlope_(const CountLSFifo_t& points);
+  std::pair<double, double> getSlope_(const CountLSFifo_t &points);
+
 private:
   bool debug_;
   int maxFU_;
@@ -202,9 +178,6 @@ class HLTScalersClient: public edm::EDAnalyzer
 
   std::vector<CountLSFifo_t> recentNormedPathCountsPerLS_;
   CountLSFifo_t recentNormedOverallCountsPerLS_;
-
-
 };
 
-
-#endif // HLTSCALERSCLIENT_H
+#endif  // HLTSCALERSCLIENT_H
diff --git a/DQM/TrigXMonitorClient/interface/L1ScalersClient.h b/DQM/TrigXMonitorClient/interface/L1ScalersClient.h
index 44380a8433222..bfcd00efe93ab 100644
--- a/DQM/TrigXMonitorClient/interface/L1ScalersClient.h
+++ b/DQM/TrigXMonitorClient/interface/L1ScalersClient.h
@@ -1,82 +1,77 @@
 // -*-c++-*-
-// 
+//
 // Client class for L1 Scalers module.
-// 
+//
 
 #ifndef L1ScalersCLIENT_H
 #define L1ScalersCLIENT_H
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-// HARD CODE THE NUMBER OF HISTOGRAMS TO 200, LENGTH OF MONITOR to 2000 
+// HARD CODE THE NUMBER OF HISTOGRAMS TO 200, LENGTH OF MONITOR to 2000
 // segments
 #define MAX_ALGOS 140
 #define MAX_TT 80
 #define MAX_LUMI_SEG 2000
 
-class L1ScalersClient: public edm::EDAnalyzer
-{
+class L1ScalersClient : public edm::EDAnalyzer {
 public:
   /// Constructors
-  L1ScalersClient(const edm::ParameterSet& ps);
-  
+  L1ScalersClient(const edm::ParameterSet &ps);
+
   /// Destructor
-  ~L1ScalersClient() override {
-  };
-  
+  ~L1ScalersClient() override{};
+
   /// BeginJob
   void beginJob(void) override;
 
-//   /// Endjob
-//   void endJob(void);
-  
+  //   /// Endjob
+  //   void endJob(void);
+
   /// BeginRun
-  void beginRun(const edm::Run& run, const edm::EventSetup& c) override;
+  void beginRun(const edm::Run &run, const edm::EventSetup &c) override;
 
   /// EndRun
-  void endRun(const edm::Run& run, const edm::EventSetup& c) override;
+  void endRun(const edm::Run &run, const edm::EventSetup &c) override;
 
-  
   /// End LumiBlock
   /// DQM Client Diagnostic should be performed here
-  void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, 
-                          const edm::EventSetup& c) override;
+  void endLuminosityBlock(const edm::LuminosityBlock &lumiSeg, const edm::EventSetup &c) override;
 
   // unused
-  void analyze(const edm::Event& e, const edm::EventSetup& c) override ;
-
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
 private:
-  DQMStore * dbe_;
+  DQMStore *dbe_;
 
-  int nev_; // Number of events processed
-  int nLumi_; // number of lumi blocks
+  int nev_;    // Number of events processed
+  int nLumi_;  // number of lumi blocks
   int currentRun_;
-  
+
   float totAlgoPrevCount;
   float totTtPrevCount;
 
   unsigned long int l1AlgoScalerCounters_[MAX_ALGOS];
   MonitorElement *l1AlgoCurrentRate_;
-  MonitorElement *l1AlgoRateHistories_[MAX_ALGOS]; // HARD CODE FOR NOW
+  MonitorElement *l1AlgoRateHistories_[MAX_ALGOS];  // HARD CODE FOR NOW
   MonitorElement *l1AlgoCurrentRatePerAlgo_[MAX_ALGOS];
   MonitorElement *totalAlgoRate_;
-  
+
   unsigned long int l1TechTrigScalerCounters_[MAX_TT];
   MonitorElement *l1TechTrigCurrentRate_;
-  MonitorElement *l1TechTrigRateHistories_[MAX_TT]; // HARD CODE FOR NOW
+  MonitorElement *l1TechTrigRateHistories_[MAX_TT];  // HARD CODE FOR NOW
   MonitorElement *l1TechTrigCurrentRatePerAlgo_[MAX_TT];
   MonitorElement *totalTtRate_;
 
   // this is a selected list of guys
   MonitorElement *selected_;
-  MonitorElement *bxSelected_ ;
+  MonitorElement *bxSelected_;
   std::vector<int> algoSelected_;
   std::vector<int> techSelected_;
   std::string folderName_;
@@ -87,5 +82,4 @@ class L1ScalersClient: public edm::EDAnalyzer
   bool first_tt;
 };
 
-
-#endif // L1ScalersCLIENT_H
+#endif  // L1ScalersCLIENT_H
diff --git a/DQM/TrigXMonitorClient/src/HLTScalersClient.cc b/DQM/TrigXMonitorClient/src/HLTScalersClient.cc
index 83b5044337a63..e0c2ebdf93164 100644
--- a/DQM/TrigXMonitorClient/src/HLTScalersClient.cc
+++ b/DQM/TrigXMonitorClient/src/HLTScalersClient.cc
@@ -1,4 +1,4 @@
-// 
+//
 // Revision 1.19  2010/07/20 02:58:27  wmtan
 // Add missing #include files
 //
@@ -40,19 +40,17 @@
 
 #include "DQM/TrigXMonitorClient/interface/HLTScalersClient.h"
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "FWCore/Framework/interface/Run.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/isFinite.h"
 
-
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-
 using edm::LogInfo;
 using edm::LogWarning;
 
@@ -60,31 +58,26 @@ using edm::LogWarning;
 #define SECS_PER_LUMI_SECTION 23.31
 const int kPerHisto = 20;
 
-
-
-
 /// Constructors
-HLTScalersClient::HLTScalersClient(const edm::ParameterSet& ps):
-  dbe_(nullptr),
-  nLumi_(0),
-  currentRate_(nullptr),
-  currentLumiBlockNumber_(0),
-  first_(true), missingPathNames_(true),
-  folderName_(ps.getUntrackedParameter<std::string>("dqmFolder", 
-						    "HLT/HLScalers_EvF")),
-  kRateIntegWindow_(ps.getUntrackedParameter<unsigned int>("rateIntegWindow", 
-							   3)),
-  processName_(ps.getParameter<std::string>("processName")),
-  ignores_(),
-  debug_(ps.getUntrackedParameter<bool>("debugDump", false)),
-  maxFU_(ps.getUntrackedParameter<unsigned int>("maxFU", false)),
-  recentOverallCountsPerLS_(kRateIntegWindow_),
-  recentNormedOverallCountsPerLS_(2)
-{
-  LogDebug("HLTScalersClient") << "constructor" ;
-  if ( debug_ ) {
+HLTScalersClient::HLTScalersClient(const edm::ParameterSet &ps)
+    : dbe_(nullptr),
+      nLumi_(0),
+      currentRate_(nullptr),
+      currentLumiBlockNumber_(0),
+      first_(true),
+      missingPathNames_(true),
+      folderName_(ps.getUntrackedParameter<std::string>("dqmFolder", "HLT/HLScalers_EvF")),
+      kRateIntegWindow_(ps.getUntrackedParameter<unsigned int>("rateIntegWindow", 3)),
+      processName_(ps.getParameter<std::string>("processName")),
+      ignores_(),
+      debug_(ps.getUntrackedParameter<bool>("debugDump", false)),
+      maxFU_(ps.getUntrackedParameter<unsigned int>("maxFU", false)),
+      recentOverallCountsPerLS_(kRateIntegWindow_),
+      recentNormedOverallCountsPerLS_(2) {
+  LogDebug("HLTScalersClient") << "constructor";
+  if (debug_) {
     textfile_.open("debug.txt");
-    if ( ! textfile_ ) {
+    if (!textfile_) {
       std::cout << "constructor: can't open text file" << std::endl;
     }
   }
@@ -93,36 +86,27 @@ HLTScalersClient::HLTScalersClient(const edm::ParameterSet& ps):
   dbe_->setVerbose(1);
   dbe_->setCurrentFolder(folderName_);
 
-
   std::string rawdir(folderName_ + "/raw");
   dbe_->setCurrentFolder(rawdir);
-  hltRate_ = dbe_->book1D("hltRate", "Overall HLT Accept rate vs LS", 
-			  MAX_LUMI_SEG_HLT, -0.5, MAX_LUMI_SEG_HLT-0.5);
+  hltRate_ = dbe_->book1D("hltRate", "Overall HLT Accept rate vs LS", MAX_LUMI_SEG_HLT, -0.5, MAX_LUMI_SEG_HLT - 0.5);
   dbe_->setCurrentFolder(folderName_);
-  hltNormRate_ = dbe_->book1D("hltRateNorm", 
-			      "Overall HLT Accept rate vs LS, scaled", 
-			      MAX_LUMI_SEG_HLT, -0.5, MAX_LUMI_SEG_HLT-0.5);
-  hltCount_= dbe_->book1D("hltCount", "Overall HLT Counts vs LS", 
-			  MAX_LUMI_SEG_HLT, -0.5, MAX_LUMI_SEG_HLT-0.5);
-//   hltCountN_= dbe_->book1D("hltCountN", "Overall HLT Counts per LS vs LS", 
-// 			  MAX_LUMI_SEG_HLT, -0.5, MAX_LUMI_SEG_HLT-0.5);
-  mergeCount_= dbe_->book1D("mergeCount", "Number of merge counts vs LS", 
-			    MAX_LUMI_SEG_HLT, -0.5, MAX_LUMI_SEG_HLT-0.5);
-
-
+  hltNormRate_ = dbe_->book1D(
+      "hltRateNorm", "Overall HLT Accept rate vs LS, scaled", MAX_LUMI_SEG_HLT, -0.5, MAX_LUMI_SEG_HLT - 0.5);
+  hltCount_ = dbe_->book1D("hltCount", "Overall HLT Counts vs LS", MAX_LUMI_SEG_HLT, -0.5, MAX_LUMI_SEG_HLT - 0.5);
+  //   hltCountN_= dbe_->book1D("hltCountN", "Overall HLT Counts per LS vs LS",
+  // 			  MAX_LUMI_SEG_HLT, -0.5, MAX_LUMI_SEG_HLT-0.5);
+  mergeCount_ =
+      dbe_->book1D("mergeCount", "Number of merge counts vs LS", MAX_LUMI_SEG_HLT, -0.5, MAX_LUMI_SEG_HLT - 0.5);
 
   updates_ = dbe_->book1D("updates", "Status of Updates", 2, 0, 2);
   updates_->setBinLabel(1, "Good Updates");
   updates_->setBinLabel(2, "Incomplete Updates");
 
-
-} // end constructor
-
+}  // end constructor
 
 /// BeginJob
-void HLTScalersClient::beginJob(void)
-{
-  LogDebug("HLTScalersClient") << "beingJob" ;
+void HLTScalersClient::beginJob(void) {
+  LogDebug("HLTScalersClient") << "beingJob";
   if (dbe_) {
     dbe_->setCurrentFolder(folderName_);
   }
@@ -130,521 +114,471 @@ void HLTScalersClient::beginJob(void)
   missingPathNames_ = true;
 }
 
-
 /// beginRun
-void HLTScalersClient::beginRun(const edm::Run& run, const edm::EventSetup& c)
-{
+void HLTScalersClient::beginRun(const edm::Run &run, const edm::EventSetup &c) {
   missingPathNames_ = true;
   first_ = true;
   LogDebug("HLTScalersClient") << "beginRun, run " << run.id();
 
-} // beginRun
+}  // beginRun
 
 /// EndRun
-void HLTScalersClient::endRun(const edm::Run& run, const edm::EventSetup& c)
-{
+void HLTScalersClient::endRun(const edm::Run &run, const edm::EventSetup &c) {
   missingPathNames_ = true;
   first_ = true;
 }
 
-
 /// End LumiBlock
 /// DQM Client Diagnostic should be performed here
-void HLTScalersClient::endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, 
-			const edm::EventSetup& c)
-{
+void HLTScalersClient::endLuminosityBlock(const edm::LuminosityBlock &lumiSeg, const edm::EventSetup &c) {
   nLumi_ = lumiSeg.id().luminosityBlock();
   // PWDEBUG
-  if ( first_ && debug_)
+  if (first_ && debug_)
     dbe_->showDirStructure();
   // PWDEBUG END
 
   // get raw data
   std::string scalHisto = folderName_ + "/raw/hltScalers";
   MonitorElement *scalers = dbe_->get(scalHisto);
-  if ( scalers == nullptr ) {
+  if (scalers == nullptr) {
     LogDebug("HLTScalersClient") << "cannot get hlt scalers histogram, "
-				 << "bailing out.";
-    if ( debug_ )
-      std::cout << "No scalers ? Looking for " 
-		<< scalHisto
-		<< std::endl;
+                                 << "bailing out.";
+    if (debug_)
+      std::cout << "No scalers ? Looking for " << scalHisto << std::endl;
     return;
   }
 
-
   int npaths = scalers->getNbinsX();
-  if ( npaths > MAX_PATHS ) npaths = MAX_PATHS; // HARD CODE FOR NOW
+  if (npaths > MAX_PATHS)
+    npaths = MAX_PATHS;  // HARD CODE FOR NOW
   LogDebug("HLTScalersClient") << "I see " << npaths << " paths. ";
 
   // set the bin labels on the first go-through
   // I need to do this here because we don't have the paths yet
   // on begin-run. I should do this in a less ugly way (see FV?)
-  if ( first_) {
+  if (first_) {
     std::string rawdir(folderName_ + "/raw");
 
-    LogDebug("HLTScalersClient") << "Setting up paths on first endLumiBlock "
-				 << npaths;
+    LogDebug("HLTScalersClient") << "Setting up paths on first endLumiBlock " << npaths;
     dbe_->setCurrentFolder(rawdir);
-    currentRate_ = dbe_->book1D("cur_rate", 
-				"current lumi section rate per path",
-				npaths, -0.5, npaths-0.5);
-    currentNormRate_ = dbe_->book1D("cur_rate_norm", 
-				    "current norm. lumi section rate per path",
-				    npaths, -0.5, npaths-0.5);
+    currentRate_ = dbe_->book1D("cur_rate", "current lumi section rate per path", npaths, -0.5, npaths - 0.5);
+    currentNormRate_ =
+        dbe_->book1D("cur_rate_norm", "current norm. lumi section rate per path", npaths, -0.5, npaths - 0.5);
     recentPathCountsPerLS_.reserve(npaths);
     recentNormedPathCountsPerLS_.reserve(npaths);
-    char rates_subfolder[256]; snprintf(rates_subfolder, 256, "%s/RateHistory",
-					folderName_.c_str());
-    char counts_subfolder[256]; snprintf(counts_subfolder, 256, 
-					 "%s/CountHistory", 
-					 folderName_.c_str());
-
-    hltCurrentRate_.    reserve(npaths);
-    rateHistories_.     reserve(npaths);
-    countHistories_.    reserve(npaths);
+    char rates_subfolder[256];
+    snprintf(rates_subfolder, 256, "%s/RateHistory", folderName_.c_str());
+    char counts_subfolder[256];
+    snprintf(counts_subfolder, 256, "%s/CountHistory", folderName_.c_str());
+
+    hltCurrentRate_.reserve(npaths);
+    rateHistories_.reserve(npaths);
+    countHistories_.reserve(npaths);
     hltCurrentNormRate_.reserve(npaths);
-    rateNormHistories_. reserve(npaths);
+    rateNormHistories_.reserve(npaths);
 
-    dbe_->setCurrentFolder(folderName_); // these belong in top-level
-    for (int i = 0; i < npaths; ++i ) {
-      dbe_->setCurrentFolder(std::string(rates_subfolder)+"/raw");
+    dbe_->setCurrentFolder(folderName_);  // these belong in top-level
+    for (int i = 0; i < npaths; ++i) {
+      dbe_->setCurrentFolder(std::string(rates_subfolder) + "/raw");
 
-      char name[256]; snprintf(name, 256, "raw_rate_p%03d", i);
+      char name[256];
+      snprintf(name, 256, "raw_rate_p%03d", i);
       //     LogDebug("HLTScalersClient") << "name " << i << " is " << name ;
-      rateHistories_.push_back(dbe_->book1D(name, name, MAX_LUMI_SEG_HLT, 
-					    -0.5, MAX_LUMI_SEG_HLT-0.5));
+      rateHistories_.push_back(dbe_->book1D(name, name, MAX_LUMI_SEG_HLT, -0.5, MAX_LUMI_SEG_HLT - 0.5));
       snprintf(name, 256, "norm_rate_p%03d", i);
       dbe_->setCurrentFolder(rates_subfolder);
-      rateNormHistories_.push_back(dbe_->book1D(name, name, MAX_LUMI_SEG_HLT, 
-						-0.5, MAX_LUMI_SEG_HLT-0.5));
+      rateNormHistories_.push_back(dbe_->book1D(name, name, MAX_LUMI_SEG_HLT, -0.5, MAX_LUMI_SEG_HLT - 0.5));
       dbe_->setCurrentFolder(counts_subfolder);
       snprintf(name, 256, "counts_p%03d", i);
-      countHistories_.push_back(dbe_->book1D(name, name, MAX_LUMI_SEG_HLT, 
-					     -0.5, MAX_LUMI_SEG_HLT-0.5));
+      countHistories_.push_back(dbe_->book1D(name, name, MAX_LUMI_SEG_HLT, -0.5, MAX_LUMI_SEG_HLT - 0.5));
       // prefill the data structures
       recentPathCountsPerLS_.push_back(CountLSFifo_t(kRateIntegWindow_));
       recentNormedPathCountsPerLS_.push_back(CountLSFifo_t(2));
     }
     dbe_->setCurrentFolder(folderName_);
 
-
     // split hlt scalers up into groups of 20
     const int maxlen = 40;
-    char metitle[maxlen]; //histo name
-    char mename[maxlen]; //ME name
-    int numHistos = int(npaths/kPerHisto); // this hasta be w/o remainders
-    
-    int remainder = npaths%kPerHisto; 
-    if ( remainder ) numHistos += 1;
-
-    for( int k = 0; k < numHistos; k++ ) {
-      int npath_low = kPerHisto*k;
-      int npath_high = kPerHisto*(k+1)-1;
+    char metitle[maxlen];                     // histo name
+    char mename[maxlen];                      // ME name
+    int numHistos = int(npaths / kPerHisto);  // this hasta be w/o remainders
+
+    int remainder = npaths % kPerHisto;
+    if (remainder)
+      numHistos += 1;
+
+    for (int k = 0; k < numHistos; k++) {
+      int npath_low = kPerHisto * k;
+      int npath_high = kPerHisto * (k + 1) - 1;
       snprintf(mename, maxlen, "hltScalers_%0d", k);
-      snprintf(metitle, maxlen, "HLT scalers - Paths %d to %d", npath_low, 
-	       npath_high);
+      snprintf(metitle, maxlen, "HLT scalers - Paths %d to %d", npath_low, npath_high);
       dbe_->setCurrentFolder(rawdir);
-      hltCurrentRate_.push_back(dbe_->book1D(mename, metitle, kPerHisto, 
-					     -0.5 + npath_low, npath_high+0.5));
-      dbe_->setCurrentFolder(folderName_); // these belong in top-level
+      hltCurrentRate_.push_back(dbe_->book1D(mename, metitle, kPerHisto, -0.5 + npath_low, npath_high + 0.5));
+      dbe_->setCurrentFolder(folderName_);  // these belong in top-level
       snprintf(mename, maxlen, "hltScalersNorm_%0d", k);
-      snprintf(metitle, maxlen, 
-	       "HLT Rate (scaled) - Paths %d to %d", npath_low, npath_high);
-      hltCurrentNormRate_.push_back(dbe_->book1D(mename, metitle, kPerHisto, 
-						 -0.5 + npath_low, 
-						 npath_high+0.5));
+      snprintf(metitle, maxlen, "HLT Rate (scaled) - Paths %d to %d", npath_low, npath_high);
+      hltCurrentNormRate_.push_back(dbe_->book1D(mename, metitle, kPerHisto, -0.5 + npath_low, npath_high + 0.5));
     }
 
     first_ = false;
-
-
-
   }
 
-  if ( missingPathNames_) {
+  if (missingPathNames_) {
     // first try the scalers histogram and see if the bin names are set
-    for ( int i = 0; i < npaths; ++i ) {
+    for (int i = 0; i < npaths; ++i) {
       // needs to be i+1 since root bins start at 1
-      const char* name = scalers->getTH1()->GetXaxis()->GetBinLabel(i+1);
-      if ( name && (strlen(name) > 0)) {
-	if ( debug_ ) {
-	  std::cout << "path " << i << " name is " << name << std::endl;
-	}
-	int whichHisto = i/kPerHisto;
-	int whichBin = i%kPerHisto + 1;
-	char pname[256];
-	hltCurrentRate_[whichHisto]->setBinLabel(whichBin, name);
-	hltCurrentNormRate_[whichHisto]->setBinLabel(whichBin, name);
-	snprintf(pname, 256, "Rate - path %s (Path # %03d)", name, i);
-	rateHistories_[i] ->setTitle(pname);
-	rateNormHistories_[i]->setTitle(pname);
-	snprintf(pname, 256, "Counts - path %s (Path # %03d)", name, i);
-	countHistories_[i]->setTitle(pname);
-
-	currentRate_->setBinLabel(i+1, name);
-	currentNormRate_->setBinLabel(i+1, name);
-
-	missingPathNames_ = false;
+      const char *name = scalers->getTH1()->GetXaxis()->GetBinLabel(i + 1);
+      if (name && (strlen(name) > 0)) {
+        if (debug_) {
+          std::cout << "path " << i << " name is " << name << std::endl;
+        }
+        int whichHisto = i / kPerHisto;
+        int whichBin = i % kPerHisto + 1;
+        char pname[256];
+        hltCurrentRate_[whichHisto]->setBinLabel(whichBin, name);
+        hltCurrentNormRate_[whichHisto]->setBinLabel(whichBin, name);
+        snprintf(pname, 256, "Rate - path %s (Path # %03d)", name, i);
+        rateHistories_[i]->setTitle(pname);
+        rateNormHistories_[i]->setTitle(pname);
+        snprintf(pname, 256, "Counts - path %s (Path # %03d)", name, i);
+        countHistories_[i]->setTitle(pname);
+
+        currentRate_->setBinLabel(i + 1, name);
+        currentNormRate_->setBinLabel(i + 1, name);
+
+        missingPathNames_ = false;
       }
     }
-
   }
   // MEGA-HACK
-  if ( missingPathNames_) {
+  if (missingPathNames_) {
     // if that didn't work we load 'em from a text file. damn straight.
     int ipath = 1;
     std::ifstream names("names.dat");
-    if ( ! names ) {
-      if ( debug_ )  {
-	std::ostringstream msg;
-	msg << "open of " << "names.dat";
-	perror(msg.str().c_str());
+    if (!names) {
+      if (debug_) {
+        std::ostringstream msg;
+        msg << "open of "
+            << "names.dat";
+        perror(msg.str().c_str());
       }
-    } 
-    else { // open succeeded
+    } else {  // open succeeded
       missingPathNames_ = false;
       std::string line;
-      while ( ! names.eof() ) {
-	getline(names, line);
-	std::istringstream fnames(line);
-	std::string label; int bin;
-	if ( fnames.str().find("#") == 0 )  // skip comment lines
-	  continue;
-	if ( fnames >> bin >> label  ) {
-          if ( debug_ ) {
-	    std::cout << bin << "--" << label << "(" << ipath << ")"
-	  	      << std::endl;
+      while (!names.eof()) {
+        getline(names, line);
+        std::istringstream fnames(line);
+        std::string label;
+        int bin;
+        if (fnames.str().find("#") == 0)  // skip comment lines
+          continue;
+        if (fnames >> bin >> label) {
+          if (debug_) {
+            std::cout << bin << "--" << label << "(" << ipath << ")" << std::endl;
           }
-	  currentRate_->setBinLabel(ipath, label);
-	  currentNormRate_->setBinLabel(ipath, label);
-	  countHistories_[ipath-1]->setTitle(label);
-	  rateHistories_[ipath-1]->setTitle(label);
-	  rateNormHistories_[ipath-1]->setTitle(label);
-	  int whichHisto = (ipath-1)/kPerHisto;
-	  int whichBin = (ipath-1)%kPerHisto +1;
-	  hltCurrentRate_[whichHisto]->setBinLabel(whichBin, label);
-	  hltCurrentNormRate_[whichHisto]->setBinLabel(whichBin, label);
-	  ++ipath;
-	  if ( ipath > npaths )
-	    break;
-	} //
-      } // loop lines
-    } // open ok
+          currentRate_->setBinLabel(ipath, label);
+          currentNormRate_->setBinLabel(ipath, label);
+          countHistories_[ipath - 1]->setTitle(label);
+          rateHistories_[ipath - 1]->setTitle(label);
+          rateNormHistories_[ipath - 1]->setTitle(label);
+          int whichHisto = (ipath - 1) / kPerHisto;
+          int whichBin = (ipath - 1) % kPerHisto + 1;
+          hltCurrentRate_[whichHisto]->setBinLabel(whichBin, label);
+          hltCurrentNormRate_[whichHisto]->setBinLabel(whichBin, label);
+          ++ipath;
+          if (ipath > npaths)
+            break;
+        }  //
+      }    // loop lines
+    }      // open ok
   }
 
-
   // END SETUP
 
   std::string nLumiHisto(folderName_ + "/nLumiBlock");
   MonitorElement *nLumi = dbe_->get(nLumiHisto);
-  if ( nLumi == nullptr ) {
+  if (nLumi == nullptr) {
     nLumiHisto = folderName_ + "/raw/nLumiBlock";
     nLumi = dbe_->get(nLumiHisto);
   }
-  int testval = (nLumi!=nullptr?nLumi->getIntValue():-1);
-  LogDebug("HLTScalersClient") << "Lumi Block from DQM: "
-			<< testval
-			<< ", local is " << nLumi_;
-  int nL = (nLumi!=nullptr?nLumi->getIntValue():nLumi_);
-  if ( nL > MAX_LUMI_SEG_HLT ) {
-    LogDebug("HLTScalersClient") << "Too many Lumi segments, "
-				 << nL << " is greater than MAX_LUMI_SEG_HLT,"
-				 << " wrapping to " 
-				 << (nL%MAX_LUMI_SEG_HLT);
-    //nL = MAX_LUMI_SEG_HLT;
-    nL = nL%MAX_LUMI_SEG_HLT;
+  int testval = (nLumi != nullptr ? nLumi->getIntValue() : -1);
+  LogDebug("HLTScalersClient") << "Lumi Block from DQM: " << testval << ", local is " << nLumi_;
+  int nL = (nLumi != nullptr ? nLumi->getIntValue() : nLumi_);
+  if (nL > MAX_LUMI_SEG_HLT) {
+    LogDebug("HLTScalersClient") << "Too many Lumi segments, " << nL << " is greater than MAX_LUMI_SEG_HLT,"
+                                 << " wrapping to " << (nL % MAX_LUMI_SEG_HLT);
+    // nL = MAX_LUMI_SEG_HLT;
+    nL = nL % MAX_LUMI_SEG_HLT;
   }
 
   // merging counts
   double num_fu = -1.0;
   std::string mergeName(folderName_ + "/raw/hltMerge");
   MonitorElement *merge = dbe_->get(mergeName);
-  if ( merge != nullptr ) {
+  if (merge != nullptr) {
     num_fu = merge->getBinContent(1);
-    if ( debug_ ) {
-      std::cout << "Number of received entries: " << num_fu
-		<< std::endl;
+    if (debug_) {
+      std::cout << "Number of received entries: " << num_fu << std::endl;
     }
-    mergeCount_->Fill(nL,num_fu);
+    mergeCount_->Fill(nL, num_fu);
   }
-  // end 
-
+  // end
 
   // evaluate the data
   // loop over current counts
 
   // this gets filled for all times. Mainly for debugging.
-  for ( int i = 1; i <= npaths; ++i ) { // bins start at 1
+  for (int i = 1; i <= npaths; ++i) {  // bins start at 1
     double current_count = scalers->getBinContent(i);
     // nb that this will now _overwrite_ some settings
-    countHistories_[i-1]->setBinContent(nL, current_count); // good or bad
+    countHistories_[i - 1]->setBinContent(nL, current_count);  // good or bad
   }
 
   std::string overallScalerName(folderName_ + "/raw/hltOverallScaler");
   MonitorElement *hltScaler = dbe_->get(overallScalerName);
-  if ( hltScaler != nullptr ) {
+  if (hltScaler != nullptr) {
     double current_count = hltScaler->getBinContent(1);
-    hltCount_->setBinContent(nL,current_count);
-    recentOverallCountsPerLS_.update(CountLS_t(nL,current_count));
-    std::pair<double,double> sl =  getSlope_(recentOverallCountsPerLS_);
-    double slope = sl.first; double slope_err = sl.second;
-    if ( slope > 0 ) {
-      hltRate_->setBinContent(nL,slope);
-      if ( ! edm::isNotFinite(slope_err ) && (slope_err >= 0 )  )
-	hltRate_->setBinError(nL,slope_err);
+    hltCount_->setBinContent(nL, current_count);
+    recentOverallCountsPerLS_.update(CountLS_t(nL, current_count));
+    std::pair<double, double> sl = getSlope_(recentOverallCountsPerLS_);
+    double slope = sl.first;
+    double slope_err = sl.second;
+    if (slope > 0) {
+      hltRate_->setBinContent(nL, slope);
+      if (!edm::isNotFinite(slope_err) && (slope_err >= 0))
+        hltRate_->setBinError(nL, slope_err);
     }
-  } // found  histo
-
+  }  // found  histo
 
-
-  if ( num_fu >= 0.95*maxFU_ ) {
-    if ( num_fu > maxFU_ ) {
+  if (num_fu >= 0.95 * maxFU_) {
+    if (num_fu > maxFU_) {
       maxFU_ = num_fu;
-      if ( debug_ ) 
-	std::cout << "maxFU is now " << maxFU_ << std::endl;
+      if (debug_)
+        std::cout << "maxFU is now " << maxFU_ << std::endl;
     }
     // good data
-    for ( int i = 1; i <= npaths; ++i ) { // bins start at 1
+    for (int i = 1; i <= npaths; ++i) {  // bins start at 1
       double current_count = scalers->getBinContent(i);
       // DEBUG
-      if ( ! recentPathCountsPerLS_[i-1].empty() && debug_ ) 
-	  std::cout << i << "\t-> good one: new => cnt, ls = " 
-		    << current_count << ", " << nL
-		    << ", old = "
-		    << recentPathCountsPerLS_[i-1].back().second << "\t"
-		    << recentPathCountsPerLS_[i-1].back().first 
-		    << std::endl;
+      if (!recentPathCountsPerLS_[i - 1].empty() && debug_)
+        std::cout << i << "\t-> good one: new => cnt, ls = " << current_count << ", " << nL
+                  << ", old = " << recentPathCountsPerLS_[i - 1].back().second << "\t"
+                  << recentPathCountsPerLS_[i - 1].back().first << std::endl;
       // END DEBUG
-      recentPathCountsPerLS_[i-1].update(CountLS_t(nL,current_count));
+      recentPathCountsPerLS_[i - 1].update(CountLS_t(nL, current_count));
 
-      // NB: we do not fill a new entry in the rate histo if we can't 
+      // NB: we do not fill a new entry in the rate histo if we can't
       // calculate it
-      std::pair<double,double> sl =  getSlope_(recentPathCountsPerLS_[i-1]);
-      double slope = sl.first; double slope_err = sl.second;
-      //rateHistories_[i-1]->Fill(nL,slope);
-      if ( slope > 0 ) {
-	rateHistories_[i-1]->setBinContent(nL,slope);
-	// set the current rate(s)
-	hltCurrentRate_[(i-1)/kPerHisto]->setBinContent(i%kPerHisto, slope);
-	currentRate_->setBinContent(i, slope);
-	if ( ! edm::isNotFinite(slope_err ) && (slope_err >= 0 ) ) {
-	  currentRate_->setBinError(i, slope_err);
-	  hltCurrentRate_[(i-1)/kPerHisto]->setBinError(i%kPerHisto, slope_err);
-	  rateHistories_[i-1]->setBinError(nL,slope_err);
-	}
+      std::pair<double, double> sl = getSlope_(recentPathCountsPerLS_[i - 1]);
+      double slope = sl.first;
+      double slope_err = sl.second;
+      // rateHistories_[i-1]->Fill(nL,slope);
+      if (slope > 0) {
+        rateHistories_[i - 1]->setBinContent(nL, slope);
+        // set the current rate(s)
+        hltCurrentRate_[(i - 1) / kPerHisto]->setBinContent(i % kPerHisto, slope);
+        currentRate_->setBinContent(i, slope);
+        if (!edm::isNotFinite(slope_err) && (slope_err >= 0)) {
+          currentRate_->setBinError(i, slope_err);
+          hltCurrentRate_[(i - 1) / kPerHisto]->setBinError(i % kPerHisto, slope_err);
+          rateHistories_[i - 1]->setBinError(nL, slope_err);
+        }
       }
       //// HACK - normalized path rates
       //// END HACK
-      
-    } // loop over paths
+
+    }  // loop over paths
 
     // ---------------------------- overall rate, absolute counts
     std::string overallScalerName(folderName_ + "/raw/hltOverallScaler");
     MonitorElement *hltScaler = dbe_->get(overallScalerName);
-    if ( hltScaler != nullptr ) {
+    if (hltScaler != nullptr) {
       double current_count = hltScaler->getBinContent(1);
-      hltCount_->setBinContent(nL,current_count);
-      recentOverallCountsPerLS_.update(CountLS_t(nL,current_count));
-      std::pair<double,double> sl =  getSlope_(recentOverallCountsPerLS_);
-      double slope = sl.first; double slope_err = sl.second;
-      if ( slope >= 0 ) {
-	hltRate_->setBinContent(nL,slope);
-	if ( ! edm::isNotFinite(slope_err ) && (slope_err >= 0 )  )
-	  hltRate_->setBinError(nL,slope_err);
+      hltCount_->setBinContent(nL, current_count);
+      recentOverallCountsPerLS_.update(CountLS_t(nL, current_count));
+      std::pair<double, double> sl = getSlope_(recentOverallCountsPerLS_);
+      double slope = sl.first;
+      double slope_err = sl.second;
+      if (slope >= 0) {
+        hltRate_->setBinContent(nL, slope);
+        if (!edm::isNotFinite(slope_err) && (slope_err >= 0))
+          hltRate_->setBinError(nL, slope_err);
       }
-    } // found  histo
-    updates_->Fill(0); // good
-  } // check on number of FU's - good data
+    }                   // found  histo
+    updates_->Fill(0);  // good
+  }                     // check on number of FU's - good data
   else {
-    updates_->Fill(1); // missing updates
+    updates_->Fill(1);  // missing updates
   }
-  
+
   // PW DEBUG
-  if ( debug_ ) {
-    textfile_ << nL << "\t"
-	      << npaths << "\t";
-    for ( int i = 0; i < npaths ; ++i ) {
+  if (debug_) {
+    textfile_ << nL << "\t" << npaths << "\t";
+    for (int i = 0; i < npaths; ++i) {
       textfile_ << scalers->getBinContent(i) << " ";
     }
     textfile_ << std::endl;
   }
   // end DEBUG
 
-
 #ifdef LATER
   // ------ overall rate normalized - all data
   overallScalerName = std::string(folderName_ + "/raw/hltOverallScalerN");
   hltScaler = dbe_->get(overallScalerName);
-  if ( hltScaler != 0 ) {
+  if (hltScaler != 0) {
     double cnt = hltScaler->getBinContent(1);
-//     hltCountN_->setBinContent(nL,cnt);
-    if ( debug_ ) {
-      std::cout << "Overall Norm: new => cnt, ls = " 
-		<< cnt << ", " << nL
-		<< ", num_fu = " << num_fu 
-		<< std::endl;
+    //     hltCountN_->setBinContent(nL,cnt);
+    if (debug_) {
+      std::cout << "Overall Norm: new => cnt, ls = " << cnt << ", " << nL << ", num_fu = " << num_fu << std::endl;
     }
-    recentNormedOverallCountsPerLS_.update(CountLS_t(nL, cnt/num_fu));
-    cnt = recentNormedOverallCountsPerLS_.getCount(nL); // for dupes/partials
+    recentNormedOverallCountsPerLS_.update(CountLS_t(nL, cnt / num_fu));
+    cnt = recentNormedOverallCountsPerLS_.getCount(nL);  // for dupes/partials
     double slope = cnt / num_fu / SECS_PER_LUMI_SECTION;
-    if ( debug_ )  {
+    if (debug_) {
       std::cout << "Normalized slope = " << slope << std::endl;
     }
-    if ( slope > 0 ) 
-      hltNormRate_->setBinContent(nL,slope);
+    if (slope > 0)
+      hltNormRate_->setBinContent(nL, slope);
   }
-  // 
+  //
   std::string scalHistoNorm = folderName_ + "/raw/hltScalersN";
   MonitorElement *scalersN = dbe_->get(scalHistoNorm);
-  if ( scalersN ) {
-    for (int i = 0; i < npaths ; ++i ) {
+  if (scalersN) {
+    for (int i = 0; i < npaths; ++i) {
       double cnt = scalersN->getBinContent(i);
       double slope = cnt / num_fu / SECS_PER_LUMI_SECTION;
-      if ( slope > 0 ) {
-	rateNormHistories_[i-1]->setBinContent(nL,slope);
-	// set the current rate(s)
-	hltCurrentNormRate_[(i-1)/kPerHisto]->setBinContent(i%kPerHisto, slope);
-	currentNormRate_->setBinContent(i, slope);
+      if (slope > 0) {
+        rateNormHistories_[i - 1]->setBinContent(nL, slope);
+        // set the current rate(s)
+        hltCurrentNormRate_[(i - 1) / kPerHisto]->setBinContent(i % kPerHisto, slope);
+        currentNormRate_->setBinContent(i, slope);
       }
     }
   }
-#else // NOT LATER
+#else  // NOT LATER
   // ------ overall rate normalized - all data
   overallScalerName = std::string(folderName_ + "/raw/hltOverallScaler");
   hltScaler = dbe_->get(overallScalerName);
-  if ( hltScaler != nullptr ) {
+  if (hltScaler != nullptr) {
     double cnt = hltScaler->getBinContent(1);
-//     hltCountN_->setBinContent(nL,cnt);
-    float sf = num_fu/maxFU_;
-    if ( debug_ ) {
-      std::cout << "Overall Norm: new => cnt, ls = " 
-		<< cnt << ", " << nL
-		<< ", num_fu = " << num_fu << ", sf = " << sf
-		<< std::endl;
+    //     hltCountN_->setBinContent(nL,cnt);
+    float sf = num_fu / maxFU_;
+    if (debug_) {
+      std::cout << "Overall Norm: new => cnt, ls = " << cnt << ", " << nL << ", num_fu = " << num_fu << ", sf = " << sf
+                << std::endl;
     }
-    recentNormedOverallCountsPerLS_.update(CountLS_t(nL, cnt/sf));
-    cnt = recentNormedOverallCountsPerLS_.getCount(nL); // for dupes/partials
-    std::pair<double,double> sl =  getSlope_(recentNormedOverallCountsPerLS_);
-    double slope = sl.first; double slope_err = sl.second;
-    if ( debug_ )  {
+    recentNormedOverallCountsPerLS_.update(CountLS_t(nL, cnt / sf));
+    cnt = recentNormedOverallCountsPerLS_.getCount(nL);  // for dupes/partials
+    std::pair<double, double> sl = getSlope_(recentNormedOverallCountsPerLS_);
+    double slope = sl.first;
+    double slope_err = sl.second;
+    if (debug_) {
       std::cout << "Normalized slope = " << slope << std::endl;
     }
-    if ( slope > 0 ) {
-      hltNormRate_->setBinContent(nL,slope);
-      if ( cnt > 0 ) slope_err = slope*sqrt( 2./num_fu + 2./cnt);
-      if ( ! edm::isNotFinite(slope_err ) && (slope_err >= 0 )  )
-	hltNormRate_->setBinError(nL,slope_err);
+    if (slope > 0) {
+      hltNormRate_->setBinContent(nL, slope);
+      if (cnt > 0)
+        slope_err = slope * sqrt(2. / num_fu + 2. / cnt);
+      if (!edm::isNotFinite(slope_err) && (slope_err >= 0))
+        hltNormRate_->setBinError(nL, slope_err);
     }
   }
-  // 
+  //
   std::string scalHistoNorm = folderName_ + "/raw/hltScalers";
   MonitorElement *scalersN = dbe_->get(scalHistoNorm);
-  if ( scalersN ) {
-    double sf = num_fu /maxFU_;
-    for (int i = 1; i <= npaths ; ++i ) {
+  if (scalersN) {
+    double sf = num_fu / maxFU_;
+    for (int i = 1; i <= npaths; ++i) {
       double cnt = scalersN->getBinContent(i);
-      recentNormedPathCountsPerLS_[i-1].update(CountLS_t(nL,cnt/sf));
-      std::pair<double,double> sl =  getSlope_(recentNormedPathCountsPerLS_[i-1]);
-      double slope = sl.first; double slope_err = sl.second;
-      if ( slope >= 0 ) {
-	rateNormHistories_[i-1]->setBinContent(nL,slope);
-	// set the current rate(s)
-	hltCurrentNormRate_[(i-1)/kPerHisto]->setBinContent(i%kPerHisto, slope);
-	currentNormRate_->setBinContent(i, slope);
-	if ( slope_err <= 0 && cnt > 0) {
-	  // ignores error on prev point, so scale by sqrt(2)
-	  slope_err = slope*sqrt( 2./num_fu + 2./cnt);
-          if ( debug_ ) {
+      recentNormedPathCountsPerLS_[i - 1].update(CountLS_t(nL, cnt / sf));
+      std::pair<double, double> sl = getSlope_(recentNormedPathCountsPerLS_[i - 1]);
+      double slope = sl.first;
+      double slope_err = sl.second;
+      if (slope >= 0) {
+        rateNormHistories_[i - 1]->setBinContent(nL, slope);
+        // set the current rate(s)
+        hltCurrentNormRate_[(i - 1) / kPerHisto]->setBinContent(i % kPerHisto, slope);
+        currentNormRate_->setBinContent(i, slope);
+        if (slope_err <= 0 && cnt > 0) {
+          // ignores error on prev point, so scale by sqrt(2)
+          slope_err = slope * sqrt(2. / num_fu + 2. / cnt);
+          if (debug_) {
             std::cout << "Slope err " << i << " = " << slope_err << std::endl;
           }
-	}
-	if ( ! edm::isNotFinite(slope_err ) && (slope_err >= 0 )  ) {
-	  rateNormHistories_[i-1]->setBinError(nL,slope_err);
-	  // set the current rate(s)
-	  hltCurrentNormRate_[(i-1)/kPerHisto]->setBinError(i%kPerHisto, slope_err);
-	  currentNormRate_->setBinError(i, slope_err);
-	  
-	}
-
+        }
+        if (!edm::isNotFinite(slope_err) && (slope_err >= 0)) {
+          rateNormHistories_[i - 1]->setBinError(nL, slope_err);
+          // set the current rate(s)
+          hltCurrentNormRate_[(i - 1) / kPerHisto]->setBinError(i % kPerHisto, slope_err);
+          currentNormRate_->setBinError(i, slope_err);
+        }
       }
     }
   }
 
-#endif // LATER
+#endif  // LATER
   //
-
-    
-
 }
 
 // unused
-void HLTScalersClient::analyze(const edm::Event& e, const edm::EventSetup& c ) 
-{
+void HLTScalersClient::analyze(const edm::Event &e, const edm::EventSetup &c) {
   // nothing to do here
 }
 
 // this is probably overkill. Do a least-squares fit to get slope
 // note that the data is in units of counts, ls number
 // but we return a value in Hz...
-std::pair<double,double>
-HLTScalersClient::getSlope_(const HLTScalersClient::CountLSFifo_t& points)
-{
+std::pair<double, double> HLTScalersClient::getSlope_(const HLTScalersClient::CountLSFifo_t &points) {
   double slope, sigma_m;
-  if ( points.size() < points.targetSize() ) {
-    return std::pair<double,double>(-1,-1);
+  if (points.size() < points.targetSize()) {
+    return std::pair<double, double>(-1, -1);
   }
   // just do a delta if we just want two bins
-  else if ( points.size() == 2 ) {
-    // just do diff and be done with it 
+  else if (points.size() == 2) {
+    // just do diff and be done with it
     double delta_ls = points.front().first - points.back().first;
     double delta_cnt = points.front().second - points.back().second;
-    slope = delta_cnt / delta_ls ;
+    slope = delta_cnt / delta_ls;
     sigma_m = -1;
-  }
-  else { // do a fit
+  } else {  // do a fit
     double xy = 0;
     double x = 0;
     double xsq = 0;
     double y = 0;
     double n = double(points.size());
-    for ( auto i(points.begin());
-	  i != points.end(); ++i ) {
-       if ( debug_ ) 
-	 std::cout << "x = " << i->first << ", y = " << i->second 
-		   << std::endl;
+    for (auto i(points.begin()); i != points.end(); ++i) {
+      if (debug_)
+        std::cout << "x = " << i->first << ", y = " << i->second << std::endl;
       xy += i->first * i->second;
       x += i->first;
-      xsq += i->first*i->first;
+      xsq += i->first * i->first;
       y += i->second;
     }
-    slope = (n*xy - x*y)/(n*xsq - x*x);
+    slope = (n * xy - x * y) / (n * xsq - x * x);
 
     // now get the uncertainty on the slope. Need intercept for this.
-    double intercept = (xsq*y - xy*x)/(n*xsq-x*x);
+    double intercept = (xsq * y - xy * x) / (n * xsq - x * x);
     double sigma_ysq = 0;
-    for ( auto i (points.begin());
-	  i != points.end(); ++i ) {
-      sigma_ysq += pow(( i->second - slope * i->first  - intercept),2.);
+    for (auto i(points.begin()); i != points.end(); ++i) {
+      sigma_ysq += pow((i->second - slope * i->first - intercept), 2.);
     }
-//     if ( debug_ ) 
-//       std::cout << "chi^2 = " << sigma_ysq << std::endl;
-    sigma_ysq *= 1./(n-2.);
+    //     if ( debug_ )
+    //       std::cout << "chi^2 = " << sigma_ysq << std::endl;
+    sigma_ysq *= 1. / (n - 2.);
 
-    sigma_m = sqrt( n*sigma_ysq/(n*xsq - x*x));
+    sigma_m = sqrt(n * sigma_ysq / (n * xsq - x * x));
   }
 
   //  std::cout << "Slope is " << slope << std::endl;
   slope /= SECS_PER_LUMI_SECTION;
-  if ( sigma_m >0 ) 
+  if (sigma_m > 0)
     sigma_m /= SECS_PER_LUMI_SECTION;
-//   if ( debug_ ) {
-//     std::cout << "Slope = " << slope << " +- " << sigma_m 
-// 	      << std::endl;
-//   std::cout << "intercept is " << intercept
-//  	    << std::endl;
-//  }
-
-
-  return std::pair<double,double>(slope, sigma_m);
+  //   if ( debug_ ) {
+  //     std::cout << "Slope = " << slope << " +- " << sigma_m
+  // 	      << std::endl;
+  //   std::cout << "intercept is " << intercept
+  //  	    << std::endl;
+  //  }
+
+  return std::pair<double, double>(slope, sigma_m);
 }
diff --git a/DQM/TrigXMonitorClient/src/L1ScalersClient.cc b/DQM/TrigXMonitorClient/src/L1ScalersClient.cc
index bbe06ce7c7aaa..6ad91c6871386 100644
--- a/DQM/TrigXMonitorClient/src/L1ScalersClient.cc
+++ b/DQM/TrigXMonitorClient/src/L1ScalersClient.cc
@@ -3,71 +3,66 @@
 
 #include "DQM/TrigXMonitorClient/interface/L1ScalersClient.h"
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/LuminosityBlock.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-
 using edm::LogInfo;
 using edm::LogWarning;
 
 #define SECS_PER_LUMI_SECTION 23.31040958083832;
 const int kPerHisto = 20;
-const int kNumAlgoHistos = MAX_ALGOS/kPerHisto; // this hasta be w/o remainders
-const int kNumTTHistos = MAX_TT/kPerHisto; // this hasta be w/o remainders
-
+const int kNumAlgoHistos = MAX_ALGOS / kPerHisto;  // this hasta be w/o remainders
+const int kNumTTHistos = MAX_TT / kPerHisto;       // this hasta be w/o remainders
 
 /// Constructors
-L1ScalersClient::L1ScalersClient(const edm::ParameterSet& ps):
-  dbe_(nullptr),
-  nLumi_(0),
-  l1AlgoCurrentRate_(nullptr),
-  l1TechTrigCurrentRate_(nullptr),
-  selected_(nullptr),
-  bxSelected_(nullptr),
-  algoSelected_(ps.getUntrackedParameter<std::vector<int> >("algoMonitorBits", std::vector<int>())),
-  techSelected_(ps.getUntrackedParameter<std::vector<int> >("techMonitorBits", std::vector<int>())),
-  folderName_(ps.getUntrackedParameter<std::string>("dqmFolder", "L1T/L1Scalers_EvF")),
-  currentLumiBlockNumber_(0),
-  first_algo(true),
-  first_tt(true)
-{
-  LogDebug("Status") << "constructor" ;
+L1ScalersClient::L1ScalersClient(const edm::ParameterSet &ps)
+    : dbe_(nullptr),
+      nLumi_(0),
+      l1AlgoCurrentRate_(nullptr),
+      l1TechTrigCurrentRate_(nullptr),
+      selected_(nullptr),
+      bxSelected_(nullptr),
+      algoSelected_(ps.getUntrackedParameter<std::vector<int>>("algoMonitorBits", std::vector<int>())),
+      techSelected_(ps.getUntrackedParameter<std::vector<int>>("techMonitorBits", std::vector<int>())),
+      folderName_(ps.getUntrackedParameter<std::string>("dqmFolder", "L1T/L1Scalers_EvF")),
+      currentLumiBlockNumber_(0),
+      first_algo(true),
+      first_tt(true) {
+  LogDebug("Status") << "constructor";
   // get back-end interface
   dbe_ = edm::Service<DQMStore>().operator->();
-  assert(dbe_ != nullptr); // blammo!
+  assert(dbe_ != nullptr);  // blammo!
   dbe_->setCurrentFolder(folderName_);
 
-  l1AlgoCurrentRate_ = dbe_->book1D("algo_cur_rate", 
-			      "current lumi section rate per Algo Bits",
-			      MAX_ALGOS, -0.5, MAX_ALGOS-0.5);
+  l1AlgoCurrentRate_ =
+      dbe_->book1D("algo_cur_rate", "current lumi section rate per Algo Bits", MAX_ALGOS, -0.5, MAX_ALGOS - 0.5);
 
-  l1TechTrigCurrentRate_ = dbe_->book1D("tt_cur_rate", 
-			      "current lumi section rate per Tech. Trig.s",
-			      MAX_TT, -0.5, MAX_TT-0.5);
+  l1TechTrigCurrentRate_ =
+      dbe_->book1D("tt_cur_rate", "current lumi section rate per Tech. Trig.s", MAX_TT, -0.5, MAX_TT - 0.5);
   // ----------------------
   numSelected_ = algoSelected_.size() + techSelected_.size();
-  selected_ = dbe_->book1D("l1BitsSel", "Selected L1 Algorithm"
-			   " and tech Bits", numSelected_,
-			   -0.5, numSelected_-0.5);
-  bxSelected_ = dbe_->book2D("l1BitsBxSel", 
-			     "Selected L1 Algorithm Bits vs Bx", 
-			     3600, -0.5, 3599.5,
-			     numSelected_, -0.5, numSelected_-0.5);
+  selected_ = dbe_->book1D("l1BitsSel",
+                           "Selected L1 Algorithm"
+                           " and tech Bits",
+                           numSelected_,
+                           -0.5,
+                           numSelected_ - 0.5);
+  bxSelected_ = dbe_->book2D(
+      "l1BitsBxSel", "Selected L1 Algorithm Bits vs Bx", 3600, -0.5, 3599.5, numSelected_, -0.5, numSelected_ - 0.5);
   int j = 1;
-  for ( unsigned int i = 0; i < algoSelected_.size(); ++i ) {
+  for (unsigned int i = 0; i < algoSelected_.size(); ++i) {
     char title[256];
     snprintf(title, 256, "Algo %d", algoSelected_[i]);
     selected_->setBinLabel(j, title);
     bxSelected_->setBinLabel(j, title, 2);
     ++j;
   }
-  for ( unsigned int i = 0; i < techSelected_.size(); ++i ) {
+  for (unsigned int i = 0; i < techSelected_.size(); ++i) {
     char title[256];
     snprintf(title, 256, "Tech %d", techSelected_[i]);
     selected_->setBinLabel(j, title);
@@ -75,56 +70,51 @@ L1ScalersClient::L1ScalersClient(const edm::ParameterSet& ps):
     ++j;
   }
 
+  // book individual bit rates vs lumi for algo bits.
+  totalAlgoRate_ = dbe_->book1D("totAlgoRate", "Total Algo Rate", MAX_LUMI_SEG, -0.5, MAX_LUMI_SEG - 0.5);
+  totalTtRate_ = dbe_->book1D("totTtRate", "Total Tech Rate", MAX_LUMI_SEG, -0.5, MAX_LUMI_SEG - 0.5);
 
-// book individual bit rates vs lumi for algo bits.
-  totalAlgoRate_ = dbe_->book1D("totAlgoRate", "Total Algo Rate" , MAX_LUMI_SEG, 
-				     -0.5, MAX_LUMI_SEG-0.5);
-  totalTtRate_ = dbe_->book1D("totTtRate", "Total Tech Rate" , MAX_LUMI_SEG, 
-				     -0.5, MAX_LUMI_SEG-0.5);
-
-  totAlgoPrevCount=0UL;
-  totTtPrevCount=0UL;
+  totAlgoPrevCount = 0UL;
+  totTtPrevCount = 0UL;
 
   std::string algodir = "/AlgoRates";
   dbe_->setCurrentFolder(folderName_ + algodir);
 
-  for (int i = 0; i < MAX_ALGOS; ++i ) {
+  for (int i = 0; i < MAX_ALGOS; ++i) {
     l1AlgoScalerCounters_[i] = 0UL;
-    l1AlgoRateHistories_[i] = nullptr; // not really needed but ...
-    char name[256]; snprintf(name, 256, "rate_algobit%03d", i);
-    LogDebug("Parameter") << "name " << i << " is " << name ;
-    l1AlgoRateHistories_[i] = dbe_->book1D(name, name, MAX_LUMI_SEG, 
-				     -0.5, MAX_LUMI_SEG-0.5);
+    l1AlgoRateHistories_[i] = nullptr;  // not really needed but ...
+    char name[256];
+    snprintf(name, 256, "rate_algobit%03d", i);
+    LogDebug("Parameter") << "name " << i << " is " << name;
+    l1AlgoRateHistories_[i] = dbe_->book1D(name, name, MAX_LUMI_SEG, -0.5, MAX_LUMI_SEG - 0.5);
   }
 
-// book individual bit rates vs lumi for technical trigger bits.
+  // book individual bit rates vs lumi for technical trigger bits.
 
   std::string techdir = "/TechRates";
   dbe_->setCurrentFolder(folderName_ + techdir);
 
-  for (int i = 0; i < MAX_TT; ++i ) {
+  for (int i = 0; i < MAX_TT; ++i) {
     l1TechTrigScalerCounters_[i] = 0UL;
-    l1TechTrigRateHistories_[i] = nullptr; // not really needed but ...
-    char name[256]; snprintf(name, 256, "rate_ttbit%03d", i);
-    LogDebug("Parameter") << "name " << i << " is " << name ;
-    l1TechTrigRateHistories_[i] = dbe_->book1D(name, name, MAX_LUMI_SEG, 
-				     -0.5, MAX_LUMI_SEG-0.5);
+    l1TechTrigRateHistories_[i] = nullptr;  // not really needed but ...
+    char name[256];
+    snprintf(name, 256, "rate_ttbit%03d", i);
+    LogDebug("Parameter") << "name " << i << " is " << name;
+    l1TechTrigRateHistories_[i] = dbe_->book1D(name, name, MAX_LUMI_SEG, -0.5, MAX_LUMI_SEG - 0.5);
   }
 
   // split l1 scalers up into groups of 20, assuming total of 140 bits
   std::string algodir2 = "/AlgoBits";
   dbe_->setCurrentFolder(folderName_ + algodir2);
 
-  char metitle1[40]; //histo name
-  char mename1[40]; //ME name
-  for( int k = 0; k < kNumAlgoHistos; k++ ) {
-    int npath_low = kPerHisto*k;
-    int npath_high = kPerHisto*(k+1)-1;
+  char metitle1[40];  // histo name
+  char mename1[40];   // ME name
+  for (int k = 0; k < kNumAlgoHistos; k++) {
+    int npath_low = kPerHisto * k;
+    int npath_high = kPerHisto * (k + 1) - 1;
     snprintf(mename1, 40, "L1AlgoBits_%0d", k);
-    snprintf(metitle1, 40, "L1 rates - Algo Bits %d to %d", npath_low, 
-	     npath_high);
-    l1AlgoCurrentRatePerAlgo_[k]= dbe_->book1D(mename1, metitle1, kPerHisto, 
-				     -0.5 + npath_low, npath_high+0.5);
+    snprintf(metitle1, 40, "L1 rates - Algo Bits %d to %d", npath_low, npath_high);
+    l1AlgoCurrentRatePerAlgo_[k] = dbe_->book1D(mename1, metitle1, kPerHisto, -0.5 + npath_low, npath_high + 0.5);
   }
 
   // split l1 scalers up into groups of 20, assuming total of 80 technical bits
@@ -132,84 +122,73 @@ L1ScalersClient::L1ScalersClient(const edm::ParameterSet& ps):
   std::string techdir2 = "/TechBits";
   dbe_->setCurrentFolder(folderName_ + techdir2);
 
-  char metitle2[40]; //histo name
-  char mename2[40]; //ME name
-  for( int k = 0; k < kNumTTHistos; k++ ) {
-    int npath_low = kPerHisto*k;
-    int npath_high = kPerHisto*(k+1)-1;
+  char metitle2[40];  // histo name
+  char mename2[40];   // ME name
+  for (int k = 0; k < kNumTTHistos; k++) {
+    int npath_low = kPerHisto * k;
+    int npath_high = kPerHisto * (k + 1) - 1;
     snprintf(mename2, 40, "L1TechBits_%0d", k);
-    snprintf(metitle2, 40, "L1 rates - Tech. Trig. Bits %d to %d", npath_low, 
-	     npath_high);
-    l1TechTrigCurrentRatePerAlgo_[k]= dbe_->book1D(mename2, metitle2, kPerHisto, 
-				     -0.5 + npath_low, npath_high+0.5);
+    snprintf(metitle2, 40, "L1 rates - Tech. Trig. Bits %d to %d", npath_low, npath_high);
+    l1TechTrigCurrentRatePerAlgo_[k] = dbe_->book1D(mename2, metitle2, kPerHisto, -0.5 + npath_low, npath_high + 0.5);
   }
 
   std::ostringstream params;
   params << "Algo: ";
-  for ( unsigned int i = 0; i < algoSelected_.size(); ++i ) {
+  for (unsigned int i = 0; i < algoSelected_.size(); ++i) {
     params << algoSelected_[i] << " ";
   }
   params << ", Tech: ";
-  for ( unsigned int i = 0; i < techSelected_.size(); ++i ) {
+  for (unsigned int i = 0; i < techSelected_.size(); ++i) {
     params << techSelected_[i] << " ";
   }
   LogDebug("Parameter") << "L1 bits to monitor are " << params.str();
 }
 
-
 /// BeginJob
-void L1ScalersClient::beginJob(void)
-{
-  LogDebug("Status") << "beingJob" ;
+void L1ScalersClient::beginJob(void) {
+  LogDebug("Status") << "beingJob";
   if (dbe_) {
     dbe_->setCurrentFolder(folderName_);
   }
 }
 
-
 /// BeginRun
-void L1ScalersClient::beginRun(const edm::Run& run, const edm::EventSetup& c)
-{
-}
+void L1ScalersClient::beginRun(const edm::Run &run, const edm::EventSetup &c) {}
 
 /// EndRun
-void L1ScalersClient::endRun(const edm::Run& run, const edm::EventSetup& c)
-{
-}
-
+void L1ScalersClient::endRun(const edm::Run &run, const edm::EventSetup &c) {}
 
 /// End LumiBlock
 /// DQM Client Diagnostic should be performed here
-void L1ScalersClient::endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, 
-			const edm::EventSetup& c)
-{
+void L1ScalersClient::endLuminosityBlock(const edm::LuminosityBlock &lumiSeg, const edm::EventSetup &c) {
   nLumi_ = lumiSeg.id().luminosityBlock();
 
   // get EvF data
 
-  MonitorElement *algoScalers = dbe_->get(folderName_+std::string("/l1AlgoBits"));
-  MonitorElement *ttScalers = dbe_->get(folderName_+std::string("/l1TechBits"));
-  
-  if ( algoScalers == nullptr || ttScalers ==nullptr) {
+  MonitorElement *algoScalers = dbe_->get(folderName_ + std::string("/l1AlgoBits"));
+  MonitorElement *ttScalers = dbe_->get(folderName_ + std::string("/l1TechBits"));
+
+  if (algoScalers == nullptr || ttScalers == nullptr) {
     LogInfo("Status") << "cannot get l1 scalers histogram, bailing out.";
     return;
   }
 
-
   int nalgobits = algoScalers->getNbinsX();
   int nttbits = ttScalers->getNbinsX();
 
-  if ( nalgobits > MAX_ALGOS ) nalgobits = MAX_ALGOS; // HARD CODE FOR NOW
-  if ( nttbits > MAX_TT ) nttbits = MAX_TT; // HARD CODE FOR NOW
+  if (nalgobits > MAX_ALGOS)
+    nalgobits = MAX_ALGOS;  // HARD CODE FOR NOW
+  if (nttbits > MAX_TT)
+    nttbits = MAX_TT;  // HARD CODE FOR NOW
 
   LogDebug("Status") << "I see " << nalgobits << " algo paths. ";
   LogDebug("Status") << "I see " << nttbits << " tt paths. ";
 
   // set the bin labels on the first go-through
-  if ( first_algo) {
-    for ( int i = 0; i < nalgobits; ++i ) {
-      int whichHisto = i/kPerHisto;
-      int whichBin = i%kPerHisto + 1;
+  if (first_algo) {
+    for (int i = 0; i < nalgobits; ++i) {
+      int whichHisto = i / kPerHisto;
+      int whichBin = i % kPerHisto + 1;
       char pname[256];
       snprintf(pname, 256, "AlgoBit%03d", i);
       l1AlgoCurrentRatePerAlgo_[whichHisto]->setBinLabel(whichBin, pname);
@@ -220,10 +199,10 @@ void L1ScalersClient::endLuminosityBlock(const edm::LuminosityBlock& lumiSeg,
   }
 
   // set the bin labels on the first go-through
-  if ( first_tt) {
-    for ( int i = 0; i < nttbits; ++i ) {
-      int whichHisto = i/kPerHisto;
-      int whichBin = i%kPerHisto + 1;
+  if (first_tt) {
+    for (int i = 0; i < nttbits; ++i) {
+      int whichHisto = i / kPerHisto;
+      int whichBin = i % kPerHisto + 1;
       char pname[256];
       snprintf(pname, 256, "TechBit%03d", i);
       l1TechTrigCurrentRatePerAlgo_[whichHisto]->setBinLabel(whichBin, pname);
@@ -233,112 +212,98 @@ void L1ScalersClient::endLuminosityBlock(const edm::LuminosityBlock& lumiSeg,
     first_tt = false;
   }
 
-  MonitorElement *nLumi = dbe_->get(folderName_+std::string("nLumiBlock"));
-  
-  int testval = (nLumi!=nullptr?nLumi->getIntValue():-1);
-  LogDebug("Parameter") << "Lumi Block from DQM: "
-			<< testval
-			<< ", local is " << nLumi_;
-
-  int nL = (nLumi!=nullptr?nLumi->getIntValue():nLumi_);
-  if ( nL > MAX_LUMI_SEG ) {
-    LogDebug("Status") << "Too many Lumi segments, "
-		       << nL << " is greater than MAX_LUMI_SEG,"
-		       << " wrapping to " 
-		       << (nL%MAX_LUMI_SEG);
-    nL = nL%MAX_LUMI_SEG;
+  MonitorElement *nLumi = dbe_->get(folderName_ + std::string("nLumiBlock"));
+
+  int testval = (nLumi != nullptr ? nLumi->getIntValue() : -1);
+  LogDebug("Parameter") << "Lumi Block from DQM: " << testval << ", local is " << nLumi_;
+
+  int nL = (nLumi != nullptr ? nLumi->getIntValue() : nLumi_);
+  if (nL > MAX_LUMI_SEG) {
+    LogDebug("Status") << "Too many Lumi segments, " << nL << " is greater than MAX_LUMI_SEG,"
+                       << " wrapping to " << (nL % MAX_LUMI_SEG);
+    nL = nL % MAX_LUMI_SEG;
   }
-  float delta_t = (nL - currentLumiBlockNumber_)*SECS_PER_LUMI_SECTION;
-  if ( delta_t < 0 ) {
+  float delta_t = (nL - currentLumiBlockNumber_) * SECS_PER_LUMI_SECTION;
+  if (delta_t < 0) {
     LogDebug("Status") << " time is negative ... " << delta_t;
     delta_t = -delta_t;
-  }
-  else if ( nL == currentLumiBlockNumber_ ) { // divide-by-zero
+  } else if (nL == currentLumiBlockNumber_) {  // divide-by-zero
     LogInfo("Status") << "divide by zero: same lumi section 2x " << nL;
     return;
   }
-  // selected ---------------------  fill in the rates for th 
-  int currSlot = 1; // for selected bits histogram
-  MonitorElement *algoBx = dbe_->get(folderName_+
-				     std::string("/l1AlgoBits_Vs_Bx"));
+  // selected ---------------------  fill in the rates for th
+  int currSlot = 1;  // for selected bits histogram
+  MonitorElement *algoBx = dbe_->get(folderName_ + std::string("/l1AlgoBits_Vs_Bx"));
   // selected ---------------------  end
-  for ( int i = 1; i <= nalgobits; ++i ) { // bins start at 1
+  for (int i = 1; i <= nalgobits; ++i) {  // bins start at 1
     float current_count = algoScalers->getBinContent(i);
     // selected -------------------- start
-    int bit = i -1; //
-    if ( std::find(algoSelected_.begin(), algoSelected_.end(),bit)
-	 != algoSelected_.end() ) {
+    int bit = i - 1;  //
+    if (std::find(algoSelected_.begin(), algoSelected_.end(), bit) != algoSelected_.end()) {
       selected_->setBinContent(currSlot, current_count);
-      if ( algoBx ) {
-	for ( int j = 1; j <= 3600; ++j ) {
-	  bxSelected_->setBinContent(j, currSlot, 
-				     algoBx->getBinContent(j, i));
-	}
+      if (algoBx) {
+        for (int j = 1; j <= 3600; ++j) {
+          bxSelected_->setBinContent(j, currSlot, algoBx->getBinContent(j, i));
+        }
       }
       ++currSlot;
     }
     // selected -------------------- end
-    float rate = (current_count-l1AlgoScalerCounters_[i-1])/delta_t;
-    if ( rate > 1E-3 ) {
+    float rate = (current_count - l1AlgoScalerCounters_[i - 1]) / delta_t;
+    if (rate > 1E-3) {
       LogDebug("Parameter") << "rate path " << i << " is " << rate;
     }
     l1AlgoCurrentRate_->setBinContent(i, rate);
-    l1AlgoCurrentRatePerAlgo_[i/kPerHisto]->setBinContent(i%kPerHisto, rate);
-    //currentRate_->setBinError(i, error);
-    l1AlgoScalerCounters_[i-1] = (unsigned long)(current_count);
-    l1AlgoRateHistories_[i-1]->setBinContent(nL, rate);
+    l1AlgoCurrentRatePerAlgo_[i / kPerHisto]->setBinContent(i % kPerHisto, rate);
+    // currentRate_->setBinError(i, error);
+    l1AlgoScalerCounters_[i - 1] = (unsigned long)(current_count);
+    l1AlgoRateHistories_[i - 1]->setBinContent(nL, rate);
   }
   // selected ----------------- start
-  MonitorElement *techBx = dbe_->get(folderName_+std::string("/l1TechBits_Vs_Bx"));
+  MonitorElement *techBx = dbe_->get(folderName_ + std::string("/l1TechBits_Vs_Bx"));
   // selected ----------------- end
 
-  for ( int i = 1; i <= nttbits; ++i ) { // bins start at 1
+  for (int i = 1; i <= nttbits; ++i) {  // bins start at 1
     float current_count = ttScalers->getBinContent(i);
     // selected -------------------- start
-    int bit = i -1; //
-    if ( std::find(techSelected_.begin(), techSelected_.end(),bit)
-	 != techSelected_.end() ) {
+    int bit = i - 1;  //
+    if (std::find(techSelected_.begin(), techSelected_.end(), bit) != techSelected_.end()) {
       selected_->setBinContent(currSlot, current_count);
-      if ( techBx ) {
-	for ( int j = 1; j <= 3600; ++j ) {
-	  bxSelected_->setBinContent(j, currSlot, 
-				     techBx->getBinContent(j, i));
-	}
+      if (techBx) {
+        for (int j = 1; j <= 3600; ++j) {
+          bxSelected_->setBinContent(j, currSlot, techBx->getBinContent(j, i));
+        }
       }
       ++currSlot;
     }
     // selected -------------------- end
-    float rate = (current_count-l1TechTrigScalerCounters_[i-1])/delta_t;
-    if ( rate > 1E-3 ) {
+    float rate = (current_count - l1TechTrigScalerCounters_[i - 1]) / delta_t;
+    if (rate > 1E-3) {
       LogDebug("Parameter") << "rate path " << i << " is " << rate;
     }
     l1TechTrigCurrentRate_->setBinContent(i, rate);
-    l1TechTrigCurrentRatePerAlgo_[i/kPerHisto]->setBinContent(i%kPerHisto, rate);
-    //currentRate_->setBinError(i, error);
-    l1TechTrigScalerCounters_[i-1] = (unsigned long)(current_count);
-    l1TechTrigRateHistories_[i-1]->setBinContent(nL, rate);
+    l1TechTrigCurrentRatePerAlgo_[i / kPerHisto]->setBinContent(i % kPerHisto, rate);
+    // currentRate_->setBinError(i, error);
+    l1TechTrigScalerCounters_[i - 1] = (unsigned long)(current_count);
+    l1TechTrigRateHistories_[i - 1]->setBinContent(nL, rate);
   }
-  
+
   //  compute total rate
-  MonitorElement *l1AlgoCounter = dbe_->get(folderName_+std::string("/l1AlgoCounter"));
-  MonitorElement *l1TtCounter = dbe_->get(folderName_+std::string("/l1TtCounter"));
-  if ( l1AlgoCounter != nullptr && l1TtCounter != nullptr ) {
+  MonitorElement *l1AlgoCounter = dbe_->get(folderName_ + std::string("/l1AlgoCounter"));
+  MonitorElement *l1TtCounter = dbe_->get(folderName_ + std::string("/l1TtCounter"));
+  if (l1AlgoCounter != nullptr && l1TtCounter != nullptr) {
     float totAlgoCount = l1AlgoCounter->getIntValue();
     float totTtCount = l1TtCounter->getIntValue();
-    float totAlgRate = (totAlgoCount - totAlgoPrevCount)/delta_t;
-    float totTtRate = (totTtCount - totTtPrevCount)/delta_t;
+    float totAlgRate = (totAlgoCount - totAlgoPrevCount) / delta_t;
+    float totTtRate = (totTtCount - totTtPrevCount) / delta_t;
     totalAlgoRate_->setBinContent(nL, totAlgRate);
     totAlgoPrevCount = totAlgoCount;
     totalTtRate_->setBinContent(nL, totTtRate);
     totTtPrevCount = totTtCount;
   }
 
-  
   currentLumiBlockNumber_ = nL;
-
 }
 
 // unused
-void L1ScalersClient::analyze(const edm::Event& e, const edm::EventSetup& c) 
-{
-}
+void L1ScalersClient::analyze(const edm::Event &e, const edm::EventSetup &c) {}
diff --git a/DQM/TrigXMonitorClient/src/SealModule.cc b/DQM/TrigXMonitorClient/src/SealModule.cc
index 4f71517a48a67..1f26108551e99 100644
--- a/DQM/TrigXMonitorClient/src/SealModule.cc
+++ b/DQM/TrigXMonitorClient/src/SealModule.cc
@@ -2,9 +2,7 @@
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "DQM/TrigXMonitorClient/interface/HLTScalersClient.h" 
+#include "DQM/TrigXMonitorClient/interface/HLTScalersClient.h"
 DEFINE_FWK_MODULE(HLTScalersClient);
-#include "DQM/TrigXMonitorClient/interface/L1ScalersClient.h" 
+#include "DQM/TrigXMonitorClient/interface/L1ScalersClient.h"
 DEFINE_FWK_MODULE(L1ScalersClient);
-
-
diff --git a/DQMOffline/Alignment/interface/LaserAlignmentT0ProducerDQM.h b/DQMOffline/Alignment/interface/LaserAlignmentT0ProducerDQM.h
index f811927e72dd1..6ad94eb602f50 100644
--- a/DQMOffline/Alignment/interface/LaserAlignmentT0ProducerDQM.h
+++ b/DQMOffline/Alignment/interface/LaserAlignmentT0ProducerDQM.h
@@ -6,7 +6,7 @@
 //
 // Package:    Alignment/LaserAlignment
 // Class:      LaserAlignmentT0ProducerDQM
-// 
+//
 
 //
 // DQM module for the
@@ -14,20 +14,20 @@
 // (LaserAlignmentT0Producer from Alignment/LaserAlignment)
 //
 
-#include <string>
-#include <vector>
 #include <iostream>
 #include <sstream>
+#include <string>
+#include <vector>
 
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 
 #include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/SiStripDigi/interface/SiStripDigi.h"
@@ -37,20 +37,17 @@
 #include "Alignment/LaserAlignment/interface/LASGlobalLoop.h"
 
 class LaserAlignmentT0ProducerDQM : public DQMEDAnalyzer {
-
- public:
-
-  explicit LaserAlignmentT0ProducerDQM( const edm::ParameterSet& );
+public:
+  explicit LaserAlignmentT0ProducerDQM(const edm::ParameterSet &);
   ~LaserAlignmentT0ProducerDQM() override;
 
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze( const edm::Event&, const edm::EventSetup&) override;
-
- private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
-  void FillFromRawDigis( const edm::DetSetVector<SiStripRawDigi>& );
-  void FillFromProcessedDigis( const edm::DetSetVector<SiStripDigi>& );
-  void FillDetectorId( void );
+private:
+  void FillFromRawDigis(const edm::DetSetVector<SiStripRawDigi> &);
+  void FillFromProcessedDigis(const edm::DetSetVector<SiStripDigi> &);
+  void FillDetectorId(void);
 
   edm::ParameterSet theConfiguration;
   std::vector<edm::ParameterSet> theDigiProducerList;
@@ -61,12 +58,12 @@ class LaserAlignmentT0ProducerDQM : public DQMEDAnalyzer {
   unsigned int theLowerAdcThreshold;
   unsigned int theUpperAdcThreshold;
 
-  //2D
-  MonitorElement* nSignalsAT;
-  MonitorElement* nSignalsTECPlusR4;
-  MonitorElement* nSignalsTECPlusR6;
-  MonitorElement* nSignalsTECMinusR4;
-  MonitorElement* nSignalsTECMinusR6;
+  // 2D
+  MonitorElement *nSignalsAT;
+  MonitorElement *nSignalsTECPlusR4;
+  MonitorElement *nSignalsTECPlusR6;
+  MonitorElement *nSignalsTECMinusR4;
+  MonitorElement *nSignalsTECMinusR6;
 };
 
 #endif
diff --git a/DQMOffline/Alignment/interface/MuonAlignment.h b/DQMOffline/Alignment/interface/MuonAlignment.h
index 740e240e6c1ce..044f2a970eeb2 100644
--- a/DQMOffline/Alignment/interface/MuonAlignment.h
+++ b/DQMOffline/Alignment/interface/MuonAlignment.h
@@ -1,7 +1,6 @@
 #ifndef MuonAlignment_H
 #define MuonAlignment_H
 
-
 /** \class MuonAlignment
  *
  *  DQM muon alignment analysis monitoring
@@ -9,157 +8,159 @@
  *  \author J. Fernandez - Univ. Oviedo <Javier.Fernandez@cern.ch>
  */
 
-
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include <FWCore/Utilities/interface/InputTag.h>
 
-#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
-#include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/MuonDetId/interface/DTChamberId.h"
 #include "DataFormats/MuonDetId/interface/CSCDetId.h"
+#include "DataFormats/MuonDetId/interface/DTChamberId.h"
+#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
+#include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 
-#include "TrackingTools/TransientTrack/interface/TransientTrack.h"
-#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
-#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
-#include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
+#include "DataFormats/TrackReco/interface/Track.h"
+#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
+#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
+#include "TrackingTools/TransientTrack/interface/TransientTrack.h"
 
-#include "DataFormats/TrackingRecHit/interface/RecSegment.h"
-#include "DataFormats/DTRecHit/interface/DTRecSegment4D.h"
-#include "DataFormats/DTRecHit/interface/DTRecSegment4DCollection.h"
 #include "DataFormats/CSCRecHit/interface/CSCSegment.h"
 #include "DataFormats/CSCRecHit/interface/CSCSegmentCollection.h"
+#include "DataFormats/DTRecHit/interface/DTRecSegment4D.h"
+#include "DataFormats/DTRecHit/interface/DTRecSegment4DCollection.h"
+#include "DataFormats/GeometryVector/interface/GlobalVector.h"
+#include "DataFormats/TrackingRecHit/interface/RecSegment.h"
 #include "TrackPropagation/SteppingHelixPropagator/interface/SteppingHelixPropagator.h"
-#include "DataFormats/GeometryVector/interface/GlobalVector.h" 
 #include "TrackingTools/GeomPropagators/interface/Propagator.h"
 
+#include "DataFormats/GeometrySurface/interface/Cone.h"
 #include "DataFormats/GeometrySurface/interface/Cylinder.h"
 #include "DataFormats/GeometrySurface/interface/Plane.h"
-#include "DataFormats/GeometrySurface/interface/Cone.h" 
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
 namespace edm {
-    class ParameterSet;
-    class EventSetup;
-    class InputTag;
-}
+  class ParameterSet;
+  class EventSetup;
+  class InputTag;
+}  // namespace edm
 
 class TH1F;
 
-typedef std::vector< std::vector<int> > intDVector;
+typedef std::vector<std::vector<int>> intDVector;
 typedef std::vector<TrackingRecHit *> RecHitVector;
 
 class MuonAlignment : public edm::EDAnalyzer {
 public:
+  /// Constructor
+  MuonAlignment(const edm::ParameterSet &);
+
+  /// Destructor
+  ~MuonAlignment() override;
 
-    /// Constructor
-    MuonAlignment(const edm::ParameterSet&);
-  
-    /// Destructor
-    ~MuonAlignment() override;
-  
-    /// Inizialize parameters for histo binning
-    void beginJob() override;
+  /// Inizialize parameters for histo binning
+  void beginJob() override;
 
-    /// Get the analysis
-    void analyze(const edm::Event&, const edm::EventSetup&) override;
+  /// Get the analysis
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
-    /// Save the histos
-    void endJob(void) override;
+  /// Save the histos
+  void endJob(void) override;
 
 private:
-    // ----------member data ---------------------------
-  
-    DQMStore* dbe;
-
-    MonitorElement *hLocalPositionDT;
-    MonitorElement *hLocalPositionRmsDT;
-    MonitorElement *hLocalAngleDT;
-    MonitorElement *hLocalAngleRmsDT;
-
-    MonitorElement *hLocalXMeanDT;
-    MonitorElement *hLocalXRmsDT;
-    MonitorElement *hLocalYMeanDT;
-    MonitorElement *hLocalYRmsDT;
-    MonitorElement *hLocalPhiMeanDT;
-    MonitorElement *hLocalPhiRmsDT;
-    MonitorElement *hLocalThetaMeanDT;
-    MonitorElement *hLocalThetaRmsDT;
-
-    MonitorElement *hLocalPositionCSC;
-    MonitorElement *hLocalPositionRmsCSC;
-    MonitorElement *hLocalAngleCSC;
-    MonitorElement *hLocalAngleRmsCSC;
-
-    MonitorElement *hLocalXMeanCSC;
-    MonitorElement *hLocalXRmsCSC;
-    MonitorElement *hLocalYMeanCSC;
-    MonitorElement *hLocalYRmsCSC;
-    MonitorElement *hLocalPhiMeanCSC;
-    MonitorElement *hLocalPhiRmsCSC;
-    MonitorElement *hLocalThetaMeanCSC;
-    MonitorElement *hLocalThetaRmsCSC;
-
-    edm::ParameterSet parameters;
-
-    // Switch for verbosity
-    std::string metname;
-
-    RecHitVector doMatching(const reco::Track &, edm::Handle<DTRecSegment4DCollection> &, edm::Handle<CSCSegmentCollection> &, intDVector *, intDVector *, edm::ESHandle<GlobalTrackingGeometry> &); 
-
-    // Muon Track Label
-    edm::EDGetTokenT<reco::TrackCollection> theMuonCollectionLabel;
-
-    edm::EDGetTokenT<DTRecSegment4DCollection> theRecHits4DTagDT;
-
-    edm::EDGetTokenT<CSCSegmentCollection> theRecHits4DTagCSC;
-
-    std::string trackRefitterType;
- 
-    // residual histos residual range
-    double resLocalXRangeStation1,resLocalXRangeStation2,resLocalXRangeStation3,resLocalXRangeStation4;
-    double resLocalYRangeStation1,resLocalYRangeStation2,resLocalYRangeStation3,resLocalYRangeStation4;
-    double resPhiRange,resThetaRange;
-    
-    // mean and rms histos ranges
-    double meanPositionRange,rmsPositionRange,meanAngleRange,rmsAngleRange;
-    
-    // quality cuts for tracks and number of bins for residual histos
-    unsigned int nbins,min1DTrackRecHitSize,min4DTrackSegmentSize;
-    
-    // flags to decide on subdetector and summary histograms
-    bool doDT, doCSC, doSummary;
-
-	//variables used
-//    Propagator * thePropagator;
-
-
-    // Vector of chambers Residuals
-    std::vector<MonitorElement *> unitsLocalX;
-    std::vector<MonitorElement *> unitsLocalPhi;
-    std::vector<MonitorElement *> unitsLocalTheta;
-    std::vector<MonitorElement *> unitsLocalY;
- 
-    // Counters
-    int numberOfTracks;
-    int numberOfHits;
-    
-    // Top folder in root file
-    std::string MEFolderName;
-    std::stringstream topFolder;
+  // ----------member data ---------------------------
+
+  DQMStore *dbe;
+
+  MonitorElement *hLocalPositionDT;
+  MonitorElement *hLocalPositionRmsDT;
+  MonitorElement *hLocalAngleDT;
+  MonitorElement *hLocalAngleRmsDT;
+
+  MonitorElement *hLocalXMeanDT;
+  MonitorElement *hLocalXRmsDT;
+  MonitorElement *hLocalYMeanDT;
+  MonitorElement *hLocalYRmsDT;
+  MonitorElement *hLocalPhiMeanDT;
+  MonitorElement *hLocalPhiRmsDT;
+  MonitorElement *hLocalThetaMeanDT;
+  MonitorElement *hLocalThetaRmsDT;
+
+  MonitorElement *hLocalPositionCSC;
+  MonitorElement *hLocalPositionRmsCSC;
+  MonitorElement *hLocalAngleCSC;
+  MonitorElement *hLocalAngleRmsCSC;
+
+  MonitorElement *hLocalXMeanCSC;
+  MonitorElement *hLocalXRmsCSC;
+  MonitorElement *hLocalYMeanCSC;
+  MonitorElement *hLocalYRmsCSC;
+  MonitorElement *hLocalPhiMeanCSC;
+  MonitorElement *hLocalPhiRmsCSC;
+  MonitorElement *hLocalThetaMeanCSC;
+  MonitorElement *hLocalThetaRmsCSC;
+
+  edm::ParameterSet parameters;
+
+  // Switch for verbosity
+  std::string metname;
+
+  RecHitVector doMatching(const reco::Track &,
+                          edm::Handle<DTRecSegment4DCollection> &,
+                          edm::Handle<CSCSegmentCollection> &,
+                          intDVector *,
+                          intDVector *,
+                          edm::ESHandle<GlobalTrackingGeometry> &);
+
+  // Muon Track Label
+  edm::EDGetTokenT<reco::TrackCollection> theMuonCollectionLabel;
+
+  edm::EDGetTokenT<DTRecSegment4DCollection> theRecHits4DTagDT;
+
+  edm::EDGetTokenT<CSCSegmentCollection> theRecHits4DTagCSC;
+
+  std::string trackRefitterType;
+
+  // residual histos residual range
+  double resLocalXRangeStation1, resLocalXRangeStation2, resLocalXRangeStation3, resLocalXRangeStation4;
+  double resLocalYRangeStation1, resLocalYRangeStation2, resLocalYRangeStation3, resLocalYRangeStation4;
+  double resPhiRange, resThetaRange;
+
+  // mean and rms histos ranges
+  double meanPositionRange, rmsPositionRange, meanAngleRange, rmsAngleRange;
+
+  // quality cuts for tracks and number of bins for residual histos
+  unsigned int nbins, min1DTrackRecHitSize, min4DTrackSegmentSize;
+
+  // flags to decide on subdetector and summary histograms
+  bool doDT, doCSC, doSummary;
+
+  // variables used
+  //    Propagator * thePropagator;
+
+  // Vector of chambers Residuals
+  std::vector<MonitorElement *> unitsLocalX;
+  std::vector<MonitorElement *> unitsLocalPhi;
+  std::vector<MonitorElement *> unitsLocalTheta;
+  std::vector<MonitorElement *> unitsLocalY;
+
+  // Counters
+  int numberOfTracks;
+  int numberOfHits;
+
+  // Top folder in root file
+  std::string MEFolderName;
+  std::stringstream topFolder;
 };
-#endif  
+#endif
diff --git a/DQMOffline/Alignment/interface/MuonAlignmentSummary.h b/DQMOffline/Alignment/interface/MuonAlignmentSummary.h
index 2a994b3786c80..1cdb881eedfef 100644
--- a/DQMOffline/Alignment/interface/MuonAlignmentSummary.h
+++ b/DQMOffline/Alignment/interface/MuonAlignmentSummary.h
@@ -1,7 +1,6 @@
 #ifndef MuonAlignmentSummary_H
 #define MuonAlignmentSummary_H
 
-
 /** \class MuonAlignmentSummary
  *
  *  DQM client for muon alignment summary
@@ -11,84 +10,83 @@
 
 #include <cmath>
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
+#include "DQMServices/Core/interface/DQMEDHarvester.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDHarvester.h"
 
 namespace edm {
-    class ParameterSet;
-    class EventSetup;
-    class InputTag;
-}
+  class ParameterSet;
+  class EventSetup;
+  class InputTag;
+}  // namespace edm
 
 class TH1F;
 
 class MuonAlignmentSummary : public DQMEDHarvester {
 public:
+  /// Constructor
+  MuonAlignmentSummary(const edm::ParameterSet &);
 
-    /// Constructor
-    MuonAlignmentSummary(const edm::ParameterSet&);
+  /// Destructor
+  ~MuonAlignmentSummary() override;
 
-    /// Destructor
-    ~MuonAlignmentSummary() override;
-
-    //Book histograms
-    void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; //performed in the endJob
+  // Book histograms
+  void dqmEndJob(DQMStore::IBooker &,
+                 DQMStore::IGetter &) override;  // performed in the endJob
 
 private:
-    // ----------member data ---------------------------
-
-    MonitorElement *hLocalPositionDT;
-    MonitorElement *hLocalPositionRmsDT;
-    MonitorElement *hLocalAngleDT;
-    MonitorElement *hLocalAngleRmsDT;
-
-    MonitorElement *hLocalXMeanDT;
-    MonitorElement *hLocalXRmsDT;
-    MonitorElement *hLocalYMeanDT;
-    MonitorElement *hLocalYRmsDT;
-    MonitorElement *hLocalPhiMeanDT;
-    MonitorElement *hLocalPhiRmsDT;
-    MonitorElement *hLocalThetaMeanDT;
-    MonitorElement *hLocalThetaRmsDT;
-
-    MonitorElement *hLocalPositionCSC;
-    MonitorElement *hLocalPositionRmsCSC;
-    MonitorElement *hLocalAngleCSC;
-    MonitorElement *hLocalAngleRmsCSC;
-
-    MonitorElement *hLocalXMeanCSC;
-    MonitorElement *hLocalXRmsCSC;
-    MonitorElement *hLocalYMeanCSC;
-    MonitorElement *hLocalYRmsCSC;
-    MonitorElement *hLocalPhiMeanCSC;
-    MonitorElement *hLocalPhiRmsCSC;
-    MonitorElement *hLocalThetaMeanCSC;
-    MonitorElement *hLocalThetaRmsCSC;
-
-    edm::ParameterSet parameters;
-
-    // Switch for verbosity
-    std::string metname;
-
-    // mean and rms histos ranges
-    double meanPositionRange,rmsPositionRange,meanAngleRange,rmsAngleRange;
-
-    // flags to decide on subdetector and summary histograms
-    bool doDT, doCSC;
-
-    // Top folder in root file
-    std::string MEFolderName;
-    std::stringstream topFolder;
-
+  // ----------member data ---------------------------
+
+  MonitorElement *hLocalPositionDT;
+  MonitorElement *hLocalPositionRmsDT;
+  MonitorElement *hLocalAngleDT;
+  MonitorElement *hLocalAngleRmsDT;
+
+  MonitorElement *hLocalXMeanDT;
+  MonitorElement *hLocalXRmsDT;
+  MonitorElement *hLocalYMeanDT;
+  MonitorElement *hLocalYRmsDT;
+  MonitorElement *hLocalPhiMeanDT;
+  MonitorElement *hLocalPhiRmsDT;
+  MonitorElement *hLocalThetaMeanDT;
+  MonitorElement *hLocalThetaRmsDT;
+
+  MonitorElement *hLocalPositionCSC;
+  MonitorElement *hLocalPositionRmsCSC;
+  MonitorElement *hLocalAngleCSC;
+  MonitorElement *hLocalAngleRmsCSC;
+
+  MonitorElement *hLocalXMeanCSC;
+  MonitorElement *hLocalXRmsCSC;
+  MonitorElement *hLocalYMeanCSC;
+  MonitorElement *hLocalYRmsCSC;
+  MonitorElement *hLocalPhiMeanCSC;
+  MonitorElement *hLocalPhiRmsCSC;
+  MonitorElement *hLocalThetaMeanCSC;
+  MonitorElement *hLocalThetaRmsCSC;
+
+  edm::ParameterSet parameters;
+
+  // Switch for verbosity
+  std::string metname;
+
+  // mean and rms histos ranges
+  double meanPositionRange, rmsPositionRange, meanAngleRange, rmsAngleRange;
+
+  // flags to decide on subdetector and summary histograms
+  bool doDT, doCSC;
+
+  // Top folder in root file
+  std::string MEFolderName;
+  std::stringstream topFolder;
 };
 #endif
diff --git a/DQMOffline/Alignment/interface/TkAlCaRecoMonitor.h b/DQMOffline/Alignment/interface/TkAlCaRecoMonitor.h
index fc2276d170230..d37cd4a35b2a5 100644
--- a/DQMOffline/Alignment/interface/TkAlCaRecoMonitor.h
+++ b/DQMOffline/Alignment/interface/TkAlCaRecoMonitor.h
@@ -4,63 +4,64 @@
 //
 // Package:    TkAlCaRecoMonitor
 // Class:      TkAlCaRecoMonitor
-// 
-/**\class TkAlCaRecoMonitor TkAlCaRecoMonitor.cc DQM/TrackerMonitorTrack/src/TkAlCaRecoMonitor.cc
-Monitoring special quantities related to Tracker Alignment AlCaReco Production.
+//
+/**\class TkAlCaRecoMonitor TkAlCaRecoMonitor.cc
+DQM/TrackerMonitorTrack/src/TkAlCaRecoMonitor.cc Monitoring special quantities
+related to Tracker Alignment AlCaReco Production.
 */
 
-#include <memory>
-#include <fstream>
-#include <map>
-#include <algorithm>
-#include <vector>
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include <algorithm>
+#include <fstream>
+#include <map>
+#include <memory>
+#include <vector>
 
-//DataFormats
-#include <DataFormats/JetReco/interface/CaloJet.h>
+// DataFormats
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
+#include <DataFormats/JetReco/interface/CaloJet.h>
 
 class TrackerGeometry;
 class DQMStore;
 
 class TkAlCaRecoMonitor : public DQMEDAnalyzer {
- public:
-  explicit TkAlCaRecoMonitor(const edm::ParameterSet&);
+public:
+  explicit TkAlCaRecoMonitor(const edm::ParameterSet &);
   ~TkAlCaRecoMonitor() override;
 
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  
- private:
-  void fillHitmaps(const reco::Track &track, const TrackerGeometry& geometry);
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+
+private:
+  void fillHitmaps(const reco::Track &track, const TrackerGeometry &geometry);
   void fillRawIdMap(const TrackerGeometry &geometry);
 
   // ----------member data ---------------------------
   edm::ParameterSet conf_;
 
   double maxJetPt_;
-  
-  //1D
-  MonitorElement* invariantMass_;
-  MonitorElement* sumCharge_;
-  MonitorElement* TrackQuality_;
-  MonitorElement* jetPt_;
-  MonitorElement* minJetDeltaR_;
-  MonitorElement* minTrackDeltaR_;
-  MonitorElement* AlCaRecoTrackEfficiency_;
-  MonitorElement* Hits_perDetId_;
-  MonitorElement* TrackPtPositive_;
-  MonitorElement* TrackPtNegative_;
-  MonitorElement* TrackCurvature_;
-  //2D
-  MonitorElement* Hits_ZvsR_;
-  MonitorElement* Hits_XvsY_;
+
+  // 1D
+  MonitorElement *invariantMass_;
+  MonitorElement *sumCharge_;
+  MonitorElement *TrackQuality_;
+  MonitorElement *jetPt_;
+  MonitorElement *minJetDeltaR_;
+  MonitorElement *minTrackDeltaR_;
+  MonitorElement *AlCaRecoTrackEfficiency_;
+  MonitorElement *Hits_perDetId_;
+  MonitorElement *TrackPtPositive_;
+  MonitorElement *TrackPtNegative_;
+  MonitorElement *TrackCurvature_;
+  // 2D
+  MonitorElement *Hits_ZvsR_;
+  MonitorElement *Hits_XvsY_;
 
   bool fillInvariantMass_;
   bool fillRawIdMap_;
@@ -71,6 +72,6 @@ class TkAlCaRecoMonitor : public DQMEDAnalyzer {
   edm::EDGetTokenT<reco::TrackCollection> referenceTrackProducer_;
   edm::EDGetTokenT<reco::CaloJetCollection> jetCollection_;
   double daughterMass_;
-  std::map<int,int> binByRawId_;
+  std::map<int, int> binByRawId_;
 };
 #endif
diff --git a/DQMOffline/Alignment/src/LaserAlignmentT0ProducerDQM.cc b/DQMOffline/Alignment/src/LaserAlignmentT0ProducerDQM.cc
index 792432f9ee42b..89f10c6bfe1e8 100644
--- a/DQMOffline/Alignment/src/LaserAlignmentT0ProducerDQM.cc
+++ b/DQMOffline/Alignment/src/LaserAlignmentT0ProducerDQM.cc
@@ -1,42 +1,30 @@
 
 #include "DQMOffline/Alignment/interface/LaserAlignmentT0ProducerDQM.h"
 
-
-
-
-
 ///
 ///
 ///
-LaserAlignmentT0ProducerDQM::LaserAlignmentT0ProducerDQM( const edm::ParameterSet& aConfiguration ) {
-  
+LaserAlignmentT0ProducerDQM::LaserAlignmentT0ProducerDQM(const edm::ParameterSet &aConfiguration) {
   theConfiguration = aConfiguration;
   FillDetectorId();
-
 }
 
-
-
-
-
 ///
 ///
 ///
-LaserAlignmentT0ProducerDQM::~LaserAlignmentT0ProducerDQM() {
-}
-
+LaserAlignmentT0ProducerDQM::~LaserAlignmentT0ProducerDQM() {}
 
 void LaserAlignmentT0ProducerDQM::bookHistograms(DQMStore::IBooker &iBooker,
-  edm::Run const &, edm::EventSetup const &) {
-
+                                                 edm::Run const &,
+                                                 edm::EventSetup const &) {
   // upper and lower treshold for a profile considered showing a signal
-  theLowerAdcThreshold = theConfiguration.getParameter<unsigned int>( "LowerAdcThreshold" );
-  theUpperAdcThreshold = theConfiguration.getParameter<unsigned int>( "UpperAdcThreshold" );
+  theLowerAdcThreshold = theConfiguration.getParameter<unsigned int>("LowerAdcThreshold");
+  theUpperAdcThreshold = theConfiguration.getParameter<unsigned int>("UpperAdcThreshold");
 
   // the list of input digi products from the cfg
-  theDigiProducerList = theConfiguration.getParameter<std::vector<edm::ParameterSet> >( "DigiProducerList" );
+  theDigiProducerList = theConfiguration.getParameter<std::vector<edm::ParameterSet>>("DigiProducerList");
 
-  std::string folderName = theConfiguration.getParameter<std::string>( "FolderName" ); 
+  std::string folderName = theConfiguration.getParameter<std::string>("FolderName");
   iBooker.setCurrentFolder(folderName);
 
   std::string nameAndTitle;
@@ -49,980 +37,956 @@ void LaserAlignmentT0ProducerDQM::bookHistograms(DQMStore::IBooker &iBooker,
   // x: 16 modules (5*TEC-, 6*TIB, 6*TOB, 5*TEC+), all from -z to z
   // y: 8 beams
   nameAndTitle = "NumberOfSignals_AlignmentTubes";
-  nSignalsAT   = iBooker.book2D( nameAndTitle, nameAndTitle, 22, 0, 22, nBeams, 0, nBeams );
+  nSignalsAT = iBooker.book2D(nameAndTitle, nameAndTitle, 22, 0, 22, nBeams, 0, nBeams);
   //  nSignalsAT->setAxisTitle( "z-pos", 1 );
   //  nSignalsAT->setAxisTitle( "beam", 2 );
 
   // create bin labels for the AT histograms (subdets mixed here)
-  for( unsigned int i = 1; i <= 5; ++i ) {
-    labelBuilder.clear(); labelBuilder.str( "" );
-    labelBuilder << "TEC- D" << 5-i; // TEC-
-    nSignalsAT->setBinLabel( i, labelBuilder.str(), 1 );
-    labelBuilder.clear(); labelBuilder.str( "" );
-    labelBuilder << "TEC+ D" << i-1; // TEC+
-    nSignalsAT->setBinLabel( 17+i, labelBuilder.str(), 1 );
+  for (unsigned int i = 1; i <= 5; ++i) {
+    labelBuilder.clear();
+    labelBuilder.str("");
+    labelBuilder << "TEC- D" << 5 - i;  // TEC-
+    nSignalsAT->setBinLabel(i, labelBuilder.str(), 1);
+    labelBuilder.clear();
+    labelBuilder.str("");
+    labelBuilder << "TEC+ D" << i - 1;  // TEC+
+    nSignalsAT->setBinLabel(17 + i, labelBuilder.str(), 1);
   }
-  for( unsigned int i = 0; i < 6; ++i ) {
-    labelBuilder.clear(); labelBuilder.str( "" );
-    labelBuilder << "TIB" << i; // TIB
-    nSignalsAT->setBinLabel( 6+i, labelBuilder.str(), 1 );
-    labelBuilder.clear(); labelBuilder.str( "" );
-    labelBuilder << "TOB" << i; // TOB
-    nSignalsAT->setBinLabel( 12+i, labelBuilder.str(), 1 );
+  for (unsigned int i = 0; i < 6; ++i) {
+    labelBuilder.clear();
+    labelBuilder.str("");
+    labelBuilder << "TIB" << i;  // TIB
+    nSignalsAT->setBinLabel(6 + i, labelBuilder.str(), 1);
+    labelBuilder.clear();
+    labelBuilder.str("");
+    labelBuilder << "TOB" << i;  // TOB
+    nSignalsAT->setBinLabel(12 + i, labelBuilder.str(), 1);
   }
 
-
   // for the tec internal modules:
   // x: disk1...disk9 (from inner to outer, so z changes direction!)
   // y: 8 beams
-  nameAndTitle       = "NumberOfSignals_TEC+R4";
-  nSignalsTECPlusR4  = iBooker.book2D( nameAndTitle, nameAndTitle, nDisks, 0, nDisks, nBeams, 0, nBeams );
+  nameAndTitle = "NumberOfSignals_TEC+R4";
+  nSignalsTECPlusR4 = iBooker.book2D(nameAndTitle, nameAndTitle, nDisks, 0, nDisks, nBeams, 0, nBeams);
   //  nSignalsTECPlusR4->setAxisTitle( "disk", 1 );
   //  nSignalsTECPlusR4->setAxisTitle( "beam", 2 );
 
-  nameAndTitle       = "NumberOfSignals_TEC+R6";
-  nSignalsTECPlusR6  = iBooker.book2D( nameAndTitle, nameAndTitle, nDisks, 0, nDisks, nBeams, 0, nBeams );
+  nameAndTitle = "NumberOfSignals_TEC+R6";
+  nSignalsTECPlusR6 = iBooker.book2D(nameAndTitle, nameAndTitle, nDisks, 0, nDisks, nBeams, 0, nBeams);
   //  nSignalsTECPlusR6->setAxisTitle( "disk", 1 );
   //  nSignalsTECPlusR6->setAxisTitle( "beam", 2 );
 
-  nameAndTitle       = "NumberOfSignals_TEC-R4";
-  nSignalsTECMinusR4 = iBooker.book2D( nameAndTitle, nameAndTitle, nDisks, 0, nDisks, nBeams, 0, nBeams );
+  nameAndTitle = "NumberOfSignals_TEC-R4";
+  nSignalsTECMinusR4 = iBooker.book2D(nameAndTitle, nameAndTitle, nDisks, 0, nDisks, nBeams, 0, nBeams);
   //  nSignalsTECMinusR4->setAxisTitle( "disk", 1 );
   //  nSignalsTECMinusR4->setAxisTitle( "beam", 2 );
 
-  nameAndTitle       = "NumberOfSignals_TEC-R6";
-  nSignalsTECMinusR6 = iBooker.book2D( nameAndTitle, nameAndTitle, nDisks, 0, nDisks, nBeams, 0, nBeams );
+  nameAndTitle = "NumberOfSignals_TEC-R6";
+  nSignalsTECMinusR6 = iBooker.book2D(nameAndTitle, nameAndTitle, nDisks, 0, nDisks, nBeams, 0, nBeams);
   //  nSignalsTECMinusR6->setAxisTitle( "disk", 1 );
   //  nSignalsTECMinusR6->setAxisTitle( "beam", 2 );
 
-
-
   // disk labels common for all TEC internal histograms
-  for( unsigned int disk = 0; disk < 9; ++disk ) {
-    labelBuilder.clear(); labelBuilder.str( "" );
+  for (unsigned int disk = 0; disk < 9; ++disk) {
+    labelBuilder.clear();
+    labelBuilder.str("");
     labelBuilder << "DISK" << disk;
-    nSignalsTECPlusR4->setBinLabel( disk+1, labelBuilder.str(), 1 );
-    nSignalsTECPlusR6->setBinLabel( disk+1, labelBuilder.str(), 1 );
-    nSignalsTECMinusR4->setBinLabel( disk+1, labelBuilder.str(), 1 );
-    nSignalsTECMinusR6->setBinLabel( disk+1, labelBuilder.str(), 1 );
+    nSignalsTECPlusR4->setBinLabel(disk + 1, labelBuilder.str(), 1);
+    nSignalsTECPlusR6->setBinLabel(disk + 1, labelBuilder.str(), 1);
+    nSignalsTECMinusR4->setBinLabel(disk + 1, labelBuilder.str(), 1);
+    nSignalsTECMinusR6->setBinLabel(disk + 1, labelBuilder.str(), 1);
   }
 
-
   // beam labels common for all histograms
-  for( unsigned int beam = 0; beam < 8; ++beam ) {
-    labelBuilder.clear(); labelBuilder.str( "" );
+  for (unsigned int beam = 0; beam < 8; ++beam) {
+    labelBuilder.clear();
+    labelBuilder.str("");
     labelBuilder << "BEAM" << beam;
-    nSignalsAT->setBinLabel( beam+1, labelBuilder.str(), 2 );
-    nSignalsTECPlusR4->setBinLabel( beam+1, labelBuilder.str(), 2 );
-    nSignalsTECPlusR6->setBinLabel( beam+1, labelBuilder.str(), 2 );
-    nSignalsTECMinusR4->setBinLabel( beam+1, labelBuilder.str(), 2 );
-    nSignalsTECMinusR6->setBinLabel( beam+1, labelBuilder.str(), 2 );
+    nSignalsAT->setBinLabel(beam + 1, labelBuilder.str(), 2);
+    nSignalsTECPlusR4->setBinLabel(beam + 1, labelBuilder.str(), 2);
+    nSignalsTECPlusR6->setBinLabel(beam + 1, labelBuilder.str(), 2);
+    nSignalsTECMinusR4->setBinLabel(beam + 1, labelBuilder.str(), 2);
+    nSignalsTECMinusR6->setBinLabel(beam + 1, labelBuilder.str(), 2);
   }
-
 }
 
-
-
-
-
 ///
 ///
 ///
-void LaserAlignmentT0ProducerDQM::analyze( const edm::Event& aEvent, const edm::EventSetup& aSetup ) {
-
-
+void LaserAlignmentT0ProducerDQM::analyze(const edm::Event &aEvent, const edm::EventSetup &aSetup) {
   // loop all input products
-  for ( std::vector<edm::ParameterSet>::iterator aDigiProducer = theDigiProducerList.begin(); aDigiProducer != theDigiProducerList.end(); ++aDigiProducer ) {
-    const std::string digiProducer = aDigiProducer->getParameter<std::string>( "DigiProducer" );
-    const std::string digiLabel = aDigiProducer->getParameter<std::string>( "DigiLabel" );
-    const std::string digiType = aDigiProducer->getParameter<std::string>( "DigiType" );
+  for (std::vector<edm::ParameterSet>::iterator aDigiProducer = theDigiProducerList.begin();
+       aDigiProducer != theDigiProducerList.end();
+       ++aDigiProducer) {
+    const std::string digiProducer = aDigiProducer->getParameter<std::string>("DigiProducer");
+    const std::string digiLabel = aDigiProducer->getParameter<std::string>("DigiLabel");
+    const std::string digiType = aDigiProducer->getParameter<std::string>("DigiType");
 
     // now a distinction of cases: raw or processed digis?
 
     // first we go for raw digis => SiStripRawDigi
-    if( digiType == "Raw" ) {
-
+    if (digiType == "Raw") {
       // retrieve the SiStripRawDigis collection
-      edm::Handle< edm::DetSetVector<SiStripRawDigi> > rawDigis;
-      aEvent.getByLabel( digiProducer, digiLabel, rawDigis );
-      
+      edm::Handle<edm::DetSetVector<SiStripRawDigi>> rawDigis;
+      aEvent.getByLabel(digiProducer, digiLabel, rawDigis);
+
       // eval & fill histos from raw digis
-      FillFromRawDigis( *rawDigis );
+      FillFromRawDigis(*rawDigis);
 
     }
 
-    
     // next we assume "ZeroSuppressed" (non-raw) => SiStripDigi
-    else if( digiType == "Processed" ) {
-      
-      edm::Handle< edm::DetSetVector<SiStripDigi> > processedDigis;
-      aEvent.getByLabel( digiProducer, digiLabel, processedDigis );
-      
+    else if (digiType == "Processed") {
+      edm::Handle<edm::DetSetVector<SiStripDigi>> processedDigis;
+      aEvent.getByLabel(digiProducer, digiLabel, processedDigis);
+
       // eval & fill histos from processed digis
-      FillFromProcessedDigis( *processedDigis );
+      FillFromProcessedDigis(*processedDigis);
 
     }
 
-
-
     // otherwise we have a problem
     else {
-      throw cms::Exception( "LaserAlignmentT0ProducerDQM" ) << " ERROR ** Unknown DigiType: " << digiType << " specified in config." << std::endl;
+      throw cms::Exception("LaserAlignmentT0ProducerDQM")
+          << " ERROR ** Unknown DigiType: " << digiType << " specified in config." << std::endl;
     }
-    
-
-  } // loop all input products
-
-
 
+  }  // loop all input products
 }
 
 ///
 ///
 ///
-void LaserAlignmentT0ProducerDQM::FillFromRawDigis( const edm::DetSetVector<SiStripRawDigi>& aDetSetVector ) {
-
+void LaserAlignmentT0ProducerDQM::FillFromRawDigis(const edm::DetSetVector<SiStripRawDigi> &aDetSetVector) {
   LASGlobalLoop moduleLoop;
   int det, ring, beam, disk, pos;
 
-
-
-
   // tec internal modules
-  det = 0; ring = 0; beam = 0; disk = 0;
+  det = 0;
+  ring = 0;
+  beam = 0;
+  disk = 0;
   do {
-
     bool isAboveThreshold = false;
     bool isExceedThreshold = false;
 
     // retrieve the raw id of that module
-    const int detRawId = detectorId.GetTECEntry( det, ring, beam, disk );
+    const int detRawId = detectorId.GetTECEntry(det, ring, beam, disk);
 
     // search the digis for this raw id
-    edm::DetSetVector<SiStripRawDigi>::const_iterator detSetIter = aDetSetVector.find( detRawId );
+    edm::DetSetVector<SiStripRawDigi>::const_iterator detSetIter = aDetSetVector.find(detRawId);
 
     // raw DetSets may not be missing
-    if( detSetIter == aDetSetVector.end() ) {
-      throw cms::Exception( "[LaserAlignmentT0ProducerDQM::FillFromRawDigis]" ) << " ** ERROR: No raw DetSet found for det: " << detRawId << "." << std::endl;
+    if (detSetIter == aDetSetVector.end()) {
+      throw cms::Exception("[LaserAlignmentT0ProducerDQM::FillFromRawDigis]")
+          << " ** ERROR: No raw DetSet found for det: " << detRawId << "." << std::endl;
     }
 
     // access single modules' digis
     edm::DetSet<SiStripRawDigi>::const_iterator digiRangeIterator = detSetIter->data.begin();
 
-    for( ; digiRangeIterator != detSetIter->data.end(); ++digiRangeIterator ) {
-      const SiStripRawDigi& digi = *digiRangeIterator;
+    for (; digiRangeIterator != detSetIter->data.end(); ++digiRangeIterator) {
+      const SiStripRawDigi &digi = *digiRangeIterator;
 
-      // loop all digis and 
+      // loop all digis and
       // look for at least one strip above the threshold (-> assume a signal)
       // look if no strip is above threshold (-> assume overdrive)
-      if( digi.adc() > theLowerAdcThreshold  ) isAboveThreshold = true;
-      if( digi.adc() > theUpperAdcThreshold  ) isExceedThreshold = true;
-
+      if (digi.adc() > theLowerAdcThreshold)
+        isAboveThreshold = true;
+      if (digi.adc() > theUpperAdcThreshold)
+        isExceedThreshold = true;
     }
 
     // if we have signal, fill the histos
-    if( isAboveThreshold && !isExceedThreshold ) {
-      
+    if (isAboveThreshold && !isExceedThreshold) {
       // determine the appropriate histogram & bin from the position variables
-      if( det == 0 ) { // TEC+
-	if( ring == 0 ) nSignalsTECPlusR4->Fill( disk, beam ); // R4
-	else nSignalsTECPlusR6->Fill( disk, beam ); // R6
-      }
-      else { // TEC-
-	if( ring == 0 ) nSignalsTECMinusR4->Fill( disk, beam ); // R4
-	else nSignalsTECMinusR6->Fill( disk, beam ); // R6
+      if (det == 0) {  // TEC+
+        if (ring == 0)
+          nSignalsTECPlusR4->Fill(disk, beam);  // R4
+        else
+          nSignalsTECPlusR6->Fill(disk, beam);  // R6
+      } else {                                  // TEC-
+        if (ring == 0)
+          nSignalsTECMinusR4->Fill(disk, beam);  // R4
+        else
+          nSignalsTECMinusR6->Fill(disk, beam);  // R6
       }
-    
     }
 
-
-  } while( moduleLoop.TECLoop( det, ring, beam, disk ) );
-
-
-
+  } while (moduleLoop.TECLoop(det, ring, beam, disk));
 
   // endcap modules (AT beams)
-  det = 0; beam = 0; disk = 0;
+  det = 0;
+  beam = 0;
+  disk = 0;
   do {
-
     bool isAboveThreshold = false;
     bool isExceedThreshold = false;
 
     // retrieve the raw id of that module
-    const int detRawId = detectorId.GetTEC2TECEntry( det, beam, disk );
+    const int detRawId = detectorId.GetTEC2TECEntry(det, beam, disk);
 
     // search the digis for this raw id
-    edm::DetSetVector<SiStripRawDigi>::const_iterator detSetIter = aDetSetVector.find( detRawId );
+    edm::DetSetVector<SiStripRawDigi>::const_iterator detSetIter = aDetSetVector.find(detRawId);
 
     // raw DetSets may not be missing
-    if( detSetIter == aDetSetVector.end() ) {
-      throw cms::Exception( "[LaserAlignmentT0ProducerDQM::FillFromRawDigis]" ) << " ** ERROR: No raw DetSet found for det: " << detRawId << "." << std::endl;
+    if (detSetIter == aDetSetVector.end()) {
+      throw cms::Exception("[LaserAlignmentT0ProducerDQM::FillFromRawDigis]")
+          << " ** ERROR: No raw DetSet found for det: " << detRawId << "." << std::endl;
     }
 
     // access single modules' digis
     edm::DetSet<SiStripRawDigi>::const_iterator digiRangeIterator = detSetIter->data.begin();
 
-    for( ; digiRangeIterator != detSetIter->data.end(); ++digiRangeIterator ) {
-      const SiStripRawDigi& digi = *digiRangeIterator;
+    for (; digiRangeIterator != detSetIter->data.end(); ++digiRangeIterator) {
+      const SiStripRawDigi &digi = *digiRangeIterator;
 
-      // loop all digis and 
+      // loop all digis and
       // look for at least one strip above the threshold (-> assume a signal)
       // look if no strip is above threshold (-> assume overdrive)
-      if( digi.adc() > theLowerAdcThreshold  ) isAboveThreshold = true;
-      if( digi.adc() > theUpperAdcThreshold  ) isExceedThreshold = true;
-
+      if (digi.adc() > theLowerAdcThreshold)
+        isAboveThreshold = true;
+      if (digi.adc() > theUpperAdcThreshold)
+        isExceedThreshold = true;
     }
 
     // if we have signal, fill the histos
-    if( isAboveThreshold && !isExceedThreshold ) {
-
+    if (isAboveThreshold && !isExceedThreshold) {
       // there is only one histogram for all AT hits
       // but the bin scheme is a little complicated:
       // the TEC(AT) go in the first 5(-) and last 5(+) of 22 bins along x
 
-      if( det == 1 ) nSignalsAT->Fill( 4 - disk, beam ); // TEC-
-      else nSignalsAT->Fill( 17 + disk, beam ); // TEC+
-    
+      if (det == 1)
+        nSignalsAT->Fill(4 - disk, beam);  // TEC-
+      else
+        nSignalsAT->Fill(17 + disk, beam);  // TEC+
     }
 
-
-  } while( moduleLoop.TEC2TECLoop( det, beam, disk ) );
-
-
+  } while (moduleLoop.TEC2TECLoop(det, beam, disk));
 
   // barrel modules (AT beams)
-  det = 2; beam = 0; pos = 0;
+  det = 2;
+  beam = 0;
+  pos = 0;
   do {
-
     bool isAboveThreshold = false;
     bool isExceedThreshold = false;
 
     // retrieve the raw id of that module
-    const int detRawId = detectorId.GetTIBTOBEntry( det, beam, pos );
+    const int detRawId = detectorId.GetTIBTOBEntry(det, beam, pos);
 
     // search the digis for this raw id
-    edm::DetSetVector<SiStripRawDigi>::const_iterator detSetIter = aDetSetVector.find( detRawId );
+    edm::DetSetVector<SiStripRawDigi>::const_iterator detSetIter = aDetSetVector.find(detRawId);
 
     // raw DetSets may not be missing
-    if( detSetIter == aDetSetVector.end() ) {
-      throw cms::Exception( "[LaserAlignmentT0ProducerDQM::FillFromRawDigis]" ) << " ** ERROR: No raw DetSet found for det: " << detRawId << "." << std::endl;
+    if (detSetIter == aDetSetVector.end()) {
+      throw cms::Exception("[LaserAlignmentT0ProducerDQM::FillFromRawDigis]")
+          << " ** ERROR: No raw DetSet found for det: " << detRawId << "." << std::endl;
     }
 
     // access single modules' digis
     edm::DetSet<SiStripRawDigi>::const_iterator digiRangeIterator = detSetIter->data.begin();
 
-    for( ; digiRangeIterator != detSetIter->data.end(); ++digiRangeIterator ) {
-      const SiStripRawDigi& digi = *digiRangeIterator;
+    for (; digiRangeIterator != detSetIter->data.end(); ++digiRangeIterator) {
+      const SiStripRawDigi &digi = *digiRangeIterator;
 
-      // loop all digis and 
+      // loop all digis and
       // look for at least one strip above the threshold (-> assume a signal)
       // look if no strip is above threshold (-> assume overdrive)
-      if( digi.adc() > theLowerAdcThreshold  ) isAboveThreshold = true;
-      if( digi.adc() > theUpperAdcThreshold  ) isExceedThreshold = true;
-
+      if (digi.adc() > theLowerAdcThreshold)
+        isAboveThreshold = true;
+      if (digi.adc() > theUpperAdcThreshold)
+        isExceedThreshold = true;
     }
 
     // if we have signal, fill the histos
-    if( isAboveThreshold && !isExceedThreshold ) {
-
+    if (isAboveThreshold && !isExceedThreshold) {
       // there is only one histogram for all AT hits
       // but the bin scheme is a little complicated:
       // the TIB go into bins 6-11, TOB in 12-17
 
-      if( det == 2 ) nSignalsAT->Fill( 5 + (5 - pos), beam ); // TIB
-      else nSignalsAT->Fill( 11 + (5 - pos), beam ); // TOB
-    
+      if (det == 2)
+        nSignalsAT->Fill(5 + (5 - pos), beam);  // TIB
+      else
+        nSignalsAT->Fill(11 + (5 - pos), beam);  // TOB
     }
 
-
-  } while( moduleLoop.TIBTOBLoop( det, beam, pos ) );
-
-
-
+  } while (moduleLoop.TIBTOBLoop(det, beam, pos));
 }
 
-
-
-
-
 ///
 ///
 ///
-void LaserAlignmentT0ProducerDQM::FillFromProcessedDigis( const edm::DetSetVector<SiStripDigi>& aDetSetVector ) {
-
+void LaserAlignmentT0ProducerDQM::FillFromProcessedDigis(const edm::DetSetVector<SiStripDigi> &aDetSetVector) {
   LASGlobalLoop moduleLoop;
   int det, ring, beam, disk, pos;
 
   // tec internal modules
-  det = 0; ring = 0; beam = 0; disk = 0;
+  det = 0;
+  ring = 0;
+  beam = 0;
+  disk = 0;
   do {
-
     bool isAboveThreshold = false;
     bool isExceedThreshold = false;
 
     // retrieve the raw id of that module
-    const int detRawId = detectorId.GetTECEntry( det, ring, beam, disk );
+    const int detRawId = detectorId.GetTECEntry(det, ring, beam, disk);
 
     // search the digis for this raw id
-    edm::DetSetVector<SiStripDigi>::const_iterator detSetIter = aDetSetVector.find( detRawId );
+    edm::DetSetVector<SiStripDigi>::const_iterator detSetIter = aDetSetVector.find(detRawId);
 
     // processed DetSets may be missing (=empty), just skip
-    if( detSetIter == aDetSetVector.end() ) continue;
+    if (detSetIter == aDetSetVector.end())
+      continue;
 
     // access single modules' digis
     edm::DetSet<SiStripDigi>::const_iterator digiRangeIterator = detSetIter->data.begin();
 
-    for( ; digiRangeIterator != detSetIter->data.end(); ++digiRangeIterator ) {
-      const SiStripDigi& digi = *digiRangeIterator;
+    for (; digiRangeIterator != detSetIter->data.end(); ++digiRangeIterator) {
+      const SiStripDigi &digi = *digiRangeIterator;
 
-      // loop all digis and 
+      // loop all digis and
       // look for at least one strip above the threshold (-> assume a signal)
       // look if no strip is above threshold (->assume overdrive)
-      if( digi.adc() > theLowerAdcThreshold  ) isAboveThreshold = true;
-      if( digi.adc() > theUpperAdcThreshold  ) isExceedThreshold = true;
-
+      if (digi.adc() > theLowerAdcThreshold)
+        isAboveThreshold = true;
+      if (digi.adc() > theUpperAdcThreshold)
+        isExceedThreshold = true;
     }
 
     // if we have signal, fill the histos
-    if( isAboveThreshold && !isExceedThreshold ) {
-      
+    if (isAboveThreshold && !isExceedThreshold) {
       // determine the appropriate histogram & bin from the position variables
-      if( det == 0 ) { // TEC+
-	if( ring == 0 ) nSignalsTECPlusR4->Fill( disk, beam ); // R4
-	else nSignalsTECPlusR6->Fill( disk, beam ); // R6
+      if (det == 0) {  // TEC+
+        if (ring == 0)
+          nSignalsTECPlusR4->Fill(disk, beam);  // R4
+        else
+          nSignalsTECPlusR6->Fill(disk, beam);  // R6
+      } else {                                  // TEC-
+        if (ring == 0)
+          nSignalsTECMinusR4->Fill(disk, beam);  // R4
+        else
+          nSignalsTECMinusR6->Fill(disk, beam);  // R6
       }
-      else { // TEC-
-	if( ring == 0 ) nSignalsTECMinusR4->Fill( disk, beam ); // R4
-	else nSignalsTECMinusR6->Fill( disk, beam ); // R6
-      }
-    
     }
 
-
-  } while( moduleLoop.TECLoop( det, ring, beam, disk ) );
-
-
+  } while (moduleLoop.TECLoop(det, ring, beam, disk));
 
   // endcap modules (AT beams)
-  det = 0; beam = 0; disk = 0;
+  det = 0;
+  beam = 0;
+  disk = 0;
   do {
-
     bool isAboveThreshold = false;
     bool isExceedThreshold = false;
 
     // retrieve the raw id of that module
-    const int detRawId = detectorId.GetTEC2TECEntry( det, beam, disk );
+    const int detRawId = detectorId.GetTEC2TECEntry(det, beam, disk);
 
     // search the digis for this raw id
-    edm::DetSetVector<SiStripDigi>::const_iterator detSetIter = aDetSetVector.find( detRawId );
+    edm::DetSetVector<SiStripDigi>::const_iterator detSetIter = aDetSetVector.find(detRawId);
 
     // processed DetSets may be missing (=empty), just skip
-    if( detSetIter == aDetSetVector.end() ) continue;
+    if (detSetIter == aDetSetVector.end())
+      continue;
 
     // access single modules' digis
     edm::DetSet<SiStripDigi>::const_iterator digiRangeIterator = detSetIter->data.begin();
 
-    for( ; digiRangeIterator != detSetIter->data.end(); ++digiRangeIterator ) {
-      const SiStripDigi& digi = *digiRangeIterator;
+    for (; digiRangeIterator != detSetIter->data.end(); ++digiRangeIterator) {
+      const SiStripDigi &digi = *digiRangeIterator;
 
-      // loop all digis and 
+      // loop all digis and
       // look for at least one strip above the threshold (-> assume a signal)
       // look if no strip is above threshold (-> assume overdrive)
-      if( digi.adc() > theLowerAdcThreshold  ) isAboveThreshold = true;
-      if( digi.adc() > theUpperAdcThreshold  ) isExceedThreshold = true;
-
+      if (digi.adc() > theLowerAdcThreshold)
+        isAboveThreshold = true;
+      if (digi.adc() > theUpperAdcThreshold)
+        isExceedThreshold = true;
     }
 
     // if we have signal, fill the histos
-    if( isAboveThreshold && !isExceedThreshold ) {
-
+    if (isAboveThreshold && !isExceedThreshold) {
       // there is only one histogram for all AT hits
       // but the bin scheme is a little complicated:
       // the TEC(AT) go in the first 5(-) and last 5(+) of 22 bins along x
 
-      if( det == 1 ) nSignalsAT->Fill( 4 - disk, beam ); // TEC-
-      else nSignalsAT->Fill( 17 + disk, beam ); // TEC+
-    
+      if (det == 1)
+        nSignalsAT->Fill(4 - disk, beam);  // TEC-
+      else
+        nSignalsAT->Fill(17 + disk, beam);  // TEC+
     }
 
-
-  } while( moduleLoop.TEC2TECLoop( det, beam, disk ) );
-
-
+  } while (moduleLoop.TEC2TECLoop(det, beam, disk));
 
   // barrel modules (AT beams)
-  det = 2; beam = 0; pos = 0;
+  det = 2;
+  beam = 0;
+  pos = 0;
   do {
-
     bool isAboveThreshold = false;
     bool isExceedThreshold = false;
 
     // retrieve the raw id of that module
-    const int detRawId = detectorId.GetTIBTOBEntry( det, beam, pos );
+    const int detRawId = detectorId.GetTIBTOBEntry(det, beam, pos);
 
     // search the digis for this raw id
-    edm::DetSetVector<SiStripDigi>::const_iterator detSetIter = aDetSetVector.find( detRawId );
+    edm::DetSetVector<SiStripDigi>::const_iterator detSetIter = aDetSetVector.find(detRawId);
 
     // processed DetSets may be missing (=empty), just skip
-    if( detSetIter == aDetSetVector.end() ) continue;
+    if (detSetIter == aDetSetVector.end())
+      continue;
 
     // access single modules' digis
     edm::DetSet<SiStripDigi>::const_iterator digiRangeIterator = detSetIter->data.begin();
 
-    for( ; digiRangeIterator != detSetIter->data.end(); ++digiRangeIterator ) {
-      const SiStripDigi& digi = *digiRangeIterator;
+    for (; digiRangeIterator != detSetIter->data.end(); ++digiRangeIterator) {
+      const SiStripDigi &digi = *digiRangeIterator;
 
-      // loop all digis and 
+      // loop all digis and
       // look for at least one strip above the threshold (-> assume a signal)
       // look if no strip is above threshold (-> assume overdrive)
-      if( digi.adc() > theLowerAdcThreshold  ) isAboveThreshold = true;
-      if( digi.adc() > theUpperAdcThreshold  ) isExceedThreshold = true;
-
+      if (digi.adc() > theLowerAdcThreshold)
+        isAboveThreshold = true;
+      if (digi.adc() > theUpperAdcThreshold)
+        isExceedThreshold = true;
     }
 
     // if we have signal, fill the histos
-    if( isAboveThreshold && !isExceedThreshold ) {
-
+    if (isAboveThreshold && !isExceedThreshold) {
       // there is only one histogram for all AT hits
       // but the bin scheme is a little complicated:
       // the TIB go into bins 6-11, TOB in 12-17
 
-      if( det == 2 ) nSignalsAT->Fill( 5 + (5 - pos), beam ); // TIB
-      else nSignalsAT->Fill( 11 + (5 - pos), beam ); // TOB
-    
+      if (det == 2)
+        nSignalsAT->Fill(5 + (5 - pos), beam);  // TIB
+      else
+        nSignalsAT->Fill(11 + (5 - pos), beam);  // TOB
     }
 
-
-  } while( moduleLoop.TIBTOBLoop( det, beam, pos ) );
-
-
+  } while (moduleLoop.TIBTOBLoop(det, beam, pos));
 }
 
-
-
-
-
 ///
 /// all the detector ids for the LAS modules hard-coded
-/// 
+///
 /// ugly code duplication but the deadline approaches..
-/// LATER must make this code somehow common to both LaserAlignment and LaserAlignmentT0ProducerDQM
+/// LATER must make this code somehow common to both LaserAlignment and
+/// LaserAlignmentT0ProducerDQM
 ///
-void LaserAlignmentT0ProducerDQM::FillDetectorId( void ) {
-  
+void LaserAlignmentT0ProducerDQM::FillDetectorId(void) {
   // these are the detids of the TEC modules hit
   // by the AT as well as the TEC beams
-  tecDoubleHitDetId.push_back( 470307208 );
-  tecDoubleHitDetId.push_back( 470323592 );
-  tecDoubleHitDetId.push_back( 470339976 );
-  tecDoubleHitDetId.push_back( 470356360 );
-  tecDoubleHitDetId.push_back( 470372744 );
-  tecDoubleHitDetId.push_back( 470307976 );
-  tecDoubleHitDetId.push_back( 470324360 );
-  tecDoubleHitDetId.push_back( 470340744 );
-  tecDoubleHitDetId.push_back( 470357128 );
-  tecDoubleHitDetId.push_back( 470373512 );
-  tecDoubleHitDetId.push_back( 470308488 );
-  tecDoubleHitDetId.push_back( 470324872 );
-  tecDoubleHitDetId.push_back( 470341256 );
-  tecDoubleHitDetId.push_back( 470357640 );
-  tecDoubleHitDetId.push_back( 470374024 );
-  tecDoubleHitDetId.push_back( 470045064 );
-  tecDoubleHitDetId.push_back( 470061448 );
-  tecDoubleHitDetId.push_back( 470077832 );
-  tecDoubleHitDetId.push_back( 470094216 );
-  tecDoubleHitDetId.push_back( 470110600 );
-  tecDoubleHitDetId.push_back( 470045832 );
-  tecDoubleHitDetId.push_back( 470062216 );
-  tecDoubleHitDetId.push_back( 470078600 );
-  tecDoubleHitDetId.push_back( 470094984 );
-  tecDoubleHitDetId.push_back( 470111368 );
-  tecDoubleHitDetId.push_back( 470046344 );
-  tecDoubleHitDetId.push_back( 470062728 );
-  tecDoubleHitDetId.push_back( 470079112 );
-  tecDoubleHitDetId.push_back( 470095496 );
-  tecDoubleHitDetId.push_back( 470111880 );
+  tecDoubleHitDetId.push_back(470307208);
+  tecDoubleHitDetId.push_back(470323592);
+  tecDoubleHitDetId.push_back(470339976);
+  tecDoubleHitDetId.push_back(470356360);
+  tecDoubleHitDetId.push_back(470372744);
+  tecDoubleHitDetId.push_back(470307976);
+  tecDoubleHitDetId.push_back(470324360);
+  tecDoubleHitDetId.push_back(470340744);
+  tecDoubleHitDetId.push_back(470357128);
+  tecDoubleHitDetId.push_back(470373512);
+  tecDoubleHitDetId.push_back(470308488);
+  tecDoubleHitDetId.push_back(470324872);
+  tecDoubleHitDetId.push_back(470341256);
+  tecDoubleHitDetId.push_back(470357640);
+  tecDoubleHitDetId.push_back(470374024);
+  tecDoubleHitDetId.push_back(470045064);
+  tecDoubleHitDetId.push_back(470061448);
+  tecDoubleHitDetId.push_back(470077832);
+  tecDoubleHitDetId.push_back(470094216);
+  tecDoubleHitDetId.push_back(470110600);
+  tecDoubleHitDetId.push_back(470045832);
+  tecDoubleHitDetId.push_back(470062216);
+  tecDoubleHitDetId.push_back(470078600);
+  tecDoubleHitDetId.push_back(470094984);
+  tecDoubleHitDetId.push_back(470111368);
+  tecDoubleHitDetId.push_back(470046344);
+  tecDoubleHitDetId.push_back(470062728);
+  tecDoubleHitDetId.push_back(470079112);
+  tecDoubleHitDetId.push_back(470095496);
+  tecDoubleHitDetId.push_back(470111880);
 
   // now all the modules (above included)
 
   // TEC+
-  detectorId.SetTECEntry( 0, 0, 0, 0, 470307208 );
-  detectorId.SetTECEntry( 0, 0, 0, 1, 470323592 );
-  detectorId.SetTECEntry( 0, 0, 0, 2, 470339976 );
-  detectorId.SetTECEntry( 0, 0, 0, 3, 470356360 );
-  detectorId.SetTECEntry( 0, 0, 0, 4, 470372744 );
-  detectorId.SetTECEntry( 0, 0, 0, 5, 470389128 );
-  detectorId.SetTECEntry( 0, 0, 0, 6, 470405512 );
-  detectorId.SetTECEntry( 0, 0, 0, 7, 470421896 );
-  detectorId.SetTECEntry( 0, 0, 0, 8, 470438280 );
-  detectorId.SetTECEntry( 0, 0, 1, 0, 470307464 );
-  detectorId.SetTECEntry( 0, 0, 1, 1, 470323848 );
-  detectorId.SetTECEntry( 0, 0, 1, 2, 470340232 );
-  detectorId.SetTECEntry( 0, 0, 1, 3, 470356616 );
-  detectorId.SetTECEntry( 0, 0, 1, 4, 470373000 );
-  detectorId.SetTECEntry( 0, 0, 1, 5, 470389384 );
-  detectorId.SetTECEntry( 0, 0, 1, 6, 470405768 );
-  detectorId.SetTECEntry( 0, 0, 1, 7, 470422152 );
-  detectorId.SetTECEntry( 0, 0, 1, 8, 470438536 );
-  detectorId.SetTECEntry( 0, 0, 2, 0, 470307720 );
-  detectorId.SetTECEntry( 0, 0, 2, 1, 470324104 );
-  detectorId.SetTECEntry( 0, 0, 2, 2, 470340488 );
-  detectorId.SetTECEntry( 0, 0, 2, 3, 470356872 );
-  detectorId.SetTECEntry( 0, 0, 2, 4, 470373256 );
-  detectorId.SetTECEntry( 0, 0, 2, 5, 470389640 );
-  detectorId.SetTECEntry( 0, 0, 2, 6, 470406024 );
-  detectorId.SetTECEntry( 0, 0, 2, 7, 470422408 );
-  detectorId.SetTECEntry( 0, 0, 2, 8, 470438792 );
-  detectorId.SetTECEntry( 0, 0, 3, 0, 470307976 );
-  detectorId.SetTECEntry( 0, 0, 3, 1, 470324360 );
-  detectorId.SetTECEntry( 0, 0, 3, 2, 470340744 );
-  detectorId.SetTECEntry( 0, 0, 3, 3, 470357128 );
-  detectorId.SetTECEntry( 0, 0, 3, 4, 470373512 );
-  detectorId.SetTECEntry( 0, 0, 3, 5, 470389896 );
-  detectorId.SetTECEntry( 0, 0, 3, 6, 470406280 );
-  detectorId.SetTECEntry( 0, 0, 3, 7, 470422664 );
-  detectorId.SetTECEntry( 0, 0, 3, 8, 470439048 );
-  detectorId.SetTECEntry( 0, 0, 4, 0, 470308232 );
-  detectorId.SetTECEntry( 0, 0, 4, 1, 470324616 );
-  detectorId.SetTECEntry( 0, 0, 4, 2, 470341000 );
-  detectorId.SetTECEntry( 0, 0, 4, 3, 470357384 );
-  detectorId.SetTECEntry( 0, 0, 4, 4, 470373768 );
-  detectorId.SetTECEntry( 0, 0, 4, 5, 470390152 );
-  detectorId.SetTECEntry( 0, 0, 4, 6, 470406536 );
-  detectorId.SetTECEntry( 0, 0, 4, 7, 470422920 );
-  detectorId.SetTECEntry( 0, 0, 4, 8, 470439304 );
-  detectorId.SetTECEntry( 0, 0, 5, 0, 470308488 );
-  detectorId.SetTECEntry( 0, 0, 5, 1, 470324872 );
-  detectorId.SetTECEntry( 0, 0, 5, 2, 470341256 );
-  detectorId.SetTECEntry( 0, 0, 5, 3, 470357640 );
-  detectorId.SetTECEntry( 0, 0, 5, 4, 470374024 );
-  detectorId.SetTECEntry( 0, 0, 5, 5, 470390408 );
-  detectorId.SetTECEntry( 0, 0, 5, 6, 470406792 );
-  detectorId.SetTECEntry( 0, 0, 5, 7, 470423176 );
-  detectorId.SetTECEntry( 0, 0, 5, 8, 470439560 );
-  detectorId.SetTECEntry( 0, 0, 6, 0, 470308744 );
-  detectorId.SetTECEntry( 0, 0, 6, 1, 470325128 );
-  detectorId.SetTECEntry( 0, 0, 6, 2, 470341512 );
-  detectorId.SetTECEntry( 0, 0, 6, 3, 470357896 );
-  detectorId.SetTECEntry( 0, 0, 6, 4, 470374280 );
-  detectorId.SetTECEntry( 0, 0, 6, 5, 470390664 );
-  detectorId.SetTECEntry( 0, 0, 6, 6, 470407048 );
-  detectorId.SetTECEntry( 0, 0, 6, 7, 470423432 );
-  detectorId.SetTECEntry( 0, 0, 6, 8, 470439816 );
-  detectorId.SetTECEntry( 0, 0, 7, 0, 470309000 );
-  detectorId.SetTECEntry( 0, 0, 7, 1, 470325384 );
-  detectorId.SetTECEntry( 0, 0, 7, 2, 470341768 );
-  detectorId.SetTECEntry( 0, 0, 7, 3, 470358152 );
-  detectorId.SetTECEntry( 0, 0, 7, 4, 470374536 );
-  detectorId.SetTECEntry( 0, 0, 7, 5, 470390920 );
-  detectorId.SetTECEntry( 0, 0, 7, 6, 470407304 );
-  detectorId.SetTECEntry( 0, 0, 7, 7, 470423688 );
-  detectorId.SetTECEntry( 0, 0, 7, 8, 470440072 );
-  detectorId.SetTECEntry( 0, 1, 0, 0, 470307272 );
-  detectorId.SetTECEntry( 0, 1, 0, 1, 470323656 );
-  detectorId.SetTECEntry( 0, 1, 0, 2, 470340040 );
-  detectorId.SetTECEntry( 0, 1, 0, 3, 470356424 );
-  detectorId.SetTECEntry( 0, 1, 0, 4, 470372808 );
-  detectorId.SetTECEntry( 0, 1, 0, 5, 470389192 );
-  detectorId.SetTECEntry( 0, 1, 0, 6, 470405576 );
-  detectorId.SetTECEntry( 0, 1, 0, 7, 470421960 );
-  detectorId.SetTECEntry( 0, 1, 0, 8, 470438344 );
-  detectorId.SetTECEntry( 0, 1, 1, 0, 470307528 );
-  detectorId.SetTECEntry( 0, 1, 1, 1, 470323912 );
-  detectorId.SetTECEntry( 0, 1, 1, 2, 470340296 );
-  detectorId.SetTECEntry( 0, 1, 1, 3, 470356680 );
-  detectorId.SetTECEntry( 0, 1, 1, 4, 470373064 );
-  detectorId.SetTECEntry( 0, 1, 1, 5, 470389448 );
-  detectorId.SetTECEntry( 0, 1, 1, 6, 470405832 );
-  detectorId.SetTECEntry( 0, 1, 1, 7, 470422216 );
-  detectorId.SetTECEntry( 0, 1, 1, 8, 470438600 );
-  detectorId.SetTECEntry( 0, 1, 2, 0, 470307784 );
-  detectorId.SetTECEntry( 0, 1, 2, 1, 470324168 );
-  detectorId.SetTECEntry( 0, 1, 2, 2, 470340552 );
-  detectorId.SetTECEntry( 0, 1, 2, 3, 470356936 );
-  detectorId.SetTECEntry( 0, 1, 2, 4, 470373320 );
-  detectorId.SetTECEntry( 0, 1, 2, 5, 470389704 );
-  detectorId.SetTECEntry( 0, 1, 2, 6, 470406088 );
-  detectorId.SetTECEntry( 0, 1, 2, 7, 470422472 );
-  detectorId.SetTECEntry( 0, 1, 2, 8, 470438856 );
-  detectorId.SetTECEntry( 0, 1, 3, 0, 470308040 );
-  detectorId.SetTECEntry( 0, 1, 3, 1, 470324424 );
-  detectorId.SetTECEntry( 0, 1, 3, 2, 470340808 );
-  detectorId.SetTECEntry( 0, 1, 3, 3, 470357192 );
-  detectorId.SetTECEntry( 0, 1, 3, 4, 470373576 );
-  detectorId.SetTECEntry( 0, 1, 3, 5, 470389960 );
-  detectorId.SetTECEntry( 0, 1, 3, 6, 470406344 );
-  detectorId.SetTECEntry( 0, 1, 3, 7, 470422728 );
-  detectorId.SetTECEntry( 0, 1, 3, 8, 470439112 );
-  detectorId.SetTECEntry( 0, 1, 4, 0, 470308296 );
-  detectorId.SetTECEntry( 0, 1, 4, 1, 470324680 );
-  detectorId.SetTECEntry( 0, 1, 4, 2, 470341064 );
-  detectorId.SetTECEntry( 0, 1, 4, 3, 470357448 );
-  detectorId.SetTECEntry( 0, 1, 4, 4, 470373832 );
-  detectorId.SetTECEntry( 0, 1, 4, 5, 470390216 );
-  detectorId.SetTECEntry( 0, 1, 4, 6, 470406600 );
-  detectorId.SetTECEntry( 0, 1, 4, 7, 470422984 );
-  detectorId.SetTECEntry( 0, 1, 4, 8, 470439368 );
-  detectorId.SetTECEntry( 0, 1, 5, 0, 470308552 );
-  detectorId.SetTECEntry( 0, 1, 5, 1, 470324936 );
-  detectorId.SetTECEntry( 0, 1, 5, 2, 470341320 );
-  detectorId.SetTECEntry( 0, 1, 5, 3, 470357704 );
-  detectorId.SetTECEntry( 0, 1, 5, 4, 470374088 );
-  detectorId.SetTECEntry( 0, 1, 5, 5, 470390472 );
-  detectorId.SetTECEntry( 0, 1, 5, 6, 470406856 );
-  detectorId.SetTECEntry( 0, 1, 5, 7, 470423240 );
-  detectorId.SetTECEntry( 0, 1, 5, 8, 470439624 );
-  detectorId.SetTECEntry( 0, 1, 6, 0, 470308808 );
-  detectorId.SetTECEntry( 0, 1, 6, 1, 470325192 );
-  detectorId.SetTECEntry( 0, 1, 6, 2, 470341576 );
-  detectorId.SetTECEntry( 0, 1, 6, 3, 470357960 );
-  detectorId.SetTECEntry( 0, 1, 6, 4, 470374344 );
-  detectorId.SetTECEntry( 0, 1, 6, 5, 470390728 );
-  detectorId.SetTECEntry( 0, 1, 6, 6, 470407112 );
-  detectorId.SetTECEntry( 0, 1, 6, 7, 470423496 );
-  detectorId.SetTECEntry( 0, 1, 6, 8, 470439880 );
-  detectorId.SetTECEntry( 0, 1, 7, 0, 470309064 );
-  detectorId.SetTECEntry( 0, 1, 7, 1, 470325448 );
-  detectorId.SetTECEntry( 0, 1, 7, 2, 470341832 );
-  detectorId.SetTECEntry( 0, 1, 7, 3, 470358216 );
-  detectorId.SetTECEntry( 0, 1, 7, 4, 470374600 );
-  detectorId.SetTECEntry( 0, 1, 7, 5, 470390984 );
-  detectorId.SetTECEntry( 0, 1, 7, 6, 470407368 );
-  detectorId.SetTECEntry( 0, 1, 7, 7, 470423752 );
-  detectorId.SetTECEntry( 0, 1, 7, 8, 470440136 );
+  detectorId.SetTECEntry(0, 0, 0, 0, 470307208);
+  detectorId.SetTECEntry(0, 0, 0, 1, 470323592);
+  detectorId.SetTECEntry(0, 0, 0, 2, 470339976);
+  detectorId.SetTECEntry(0, 0, 0, 3, 470356360);
+  detectorId.SetTECEntry(0, 0, 0, 4, 470372744);
+  detectorId.SetTECEntry(0, 0, 0, 5, 470389128);
+  detectorId.SetTECEntry(0, 0, 0, 6, 470405512);
+  detectorId.SetTECEntry(0, 0, 0, 7, 470421896);
+  detectorId.SetTECEntry(0, 0, 0, 8, 470438280);
+  detectorId.SetTECEntry(0, 0, 1, 0, 470307464);
+  detectorId.SetTECEntry(0, 0, 1, 1, 470323848);
+  detectorId.SetTECEntry(0, 0, 1, 2, 470340232);
+  detectorId.SetTECEntry(0, 0, 1, 3, 470356616);
+  detectorId.SetTECEntry(0, 0, 1, 4, 470373000);
+  detectorId.SetTECEntry(0, 0, 1, 5, 470389384);
+  detectorId.SetTECEntry(0, 0, 1, 6, 470405768);
+  detectorId.SetTECEntry(0, 0, 1, 7, 470422152);
+  detectorId.SetTECEntry(0, 0, 1, 8, 470438536);
+  detectorId.SetTECEntry(0, 0, 2, 0, 470307720);
+  detectorId.SetTECEntry(0, 0, 2, 1, 470324104);
+  detectorId.SetTECEntry(0, 0, 2, 2, 470340488);
+  detectorId.SetTECEntry(0, 0, 2, 3, 470356872);
+  detectorId.SetTECEntry(0, 0, 2, 4, 470373256);
+  detectorId.SetTECEntry(0, 0, 2, 5, 470389640);
+  detectorId.SetTECEntry(0, 0, 2, 6, 470406024);
+  detectorId.SetTECEntry(0, 0, 2, 7, 470422408);
+  detectorId.SetTECEntry(0, 0, 2, 8, 470438792);
+  detectorId.SetTECEntry(0, 0, 3, 0, 470307976);
+  detectorId.SetTECEntry(0, 0, 3, 1, 470324360);
+  detectorId.SetTECEntry(0, 0, 3, 2, 470340744);
+  detectorId.SetTECEntry(0, 0, 3, 3, 470357128);
+  detectorId.SetTECEntry(0, 0, 3, 4, 470373512);
+  detectorId.SetTECEntry(0, 0, 3, 5, 470389896);
+  detectorId.SetTECEntry(0, 0, 3, 6, 470406280);
+  detectorId.SetTECEntry(0, 0, 3, 7, 470422664);
+  detectorId.SetTECEntry(0, 0, 3, 8, 470439048);
+  detectorId.SetTECEntry(0, 0, 4, 0, 470308232);
+  detectorId.SetTECEntry(0, 0, 4, 1, 470324616);
+  detectorId.SetTECEntry(0, 0, 4, 2, 470341000);
+  detectorId.SetTECEntry(0, 0, 4, 3, 470357384);
+  detectorId.SetTECEntry(0, 0, 4, 4, 470373768);
+  detectorId.SetTECEntry(0, 0, 4, 5, 470390152);
+  detectorId.SetTECEntry(0, 0, 4, 6, 470406536);
+  detectorId.SetTECEntry(0, 0, 4, 7, 470422920);
+  detectorId.SetTECEntry(0, 0, 4, 8, 470439304);
+  detectorId.SetTECEntry(0, 0, 5, 0, 470308488);
+  detectorId.SetTECEntry(0, 0, 5, 1, 470324872);
+  detectorId.SetTECEntry(0, 0, 5, 2, 470341256);
+  detectorId.SetTECEntry(0, 0, 5, 3, 470357640);
+  detectorId.SetTECEntry(0, 0, 5, 4, 470374024);
+  detectorId.SetTECEntry(0, 0, 5, 5, 470390408);
+  detectorId.SetTECEntry(0, 0, 5, 6, 470406792);
+  detectorId.SetTECEntry(0, 0, 5, 7, 470423176);
+  detectorId.SetTECEntry(0, 0, 5, 8, 470439560);
+  detectorId.SetTECEntry(0, 0, 6, 0, 470308744);
+  detectorId.SetTECEntry(0, 0, 6, 1, 470325128);
+  detectorId.SetTECEntry(0, 0, 6, 2, 470341512);
+  detectorId.SetTECEntry(0, 0, 6, 3, 470357896);
+  detectorId.SetTECEntry(0, 0, 6, 4, 470374280);
+  detectorId.SetTECEntry(0, 0, 6, 5, 470390664);
+  detectorId.SetTECEntry(0, 0, 6, 6, 470407048);
+  detectorId.SetTECEntry(0, 0, 6, 7, 470423432);
+  detectorId.SetTECEntry(0, 0, 6, 8, 470439816);
+  detectorId.SetTECEntry(0, 0, 7, 0, 470309000);
+  detectorId.SetTECEntry(0, 0, 7, 1, 470325384);
+  detectorId.SetTECEntry(0, 0, 7, 2, 470341768);
+  detectorId.SetTECEntry(0, 0, 7, 3, 470358152);
+  detectorId.SetTECEntry(0, 0, 7, 4, 470374536);
+  detectorId.SetTECEntry(0, 0, 7, 5, 470390920);
+  detectorId.SetTECEntry(0, 0, 7, 6, 470407304);
+  detectorId.SetTECEntry(0, 0, 7, 7, 470423688);
+  detectorId.SetTECEntry(0, 0, 7, 8, 470440072);
+  detectorId.SetTECEntry(0, 1, 0, 0, 470307272);
+  detectorId.SetTECEntry(0, 1, 0, 1, 470323656);
+  detectorId.SetTECEntry(0, 1, 0, 2, 470340040);
+  detectorId.SetTECEntry(0, 1, 0, 3, 470356424);
+  detectorId.SetTECEntry(0, 1, 0, 4, 470372808);
+  detectorId.SetTECEntry(0, 1, 0, 5, 470389192);
+  detectorId.SetTECEntry(0, 1, 0, 6, 470405576);
+  detectorId.SetTECEntry(0, 1, 0, 7, 470421960);
+  detectorId.SetTECEntry(0, 1, 0, 8, 470438344);
+  detectorId.SetTECEntry(0, 1, 1, 0, 470307528);
+  detectorId.SetTECEntry(0, 1, 1, 1, 470323912);
+  detectorId.SetTECEntry(0, 1, 1, 2, 470340296);
+  detectorId.SetTECEntry(0, 1, 1, 3, 470356680);
+  detectorId.SetTECEntry(0, 1, 1, 4, 470373064);
+  detectorId.SetTECEntry(0, 1, 1, 5, 470389448);
+  detectorId.SetTECEntry(0, 1, 1, 6, 470405832);
+  detectorId.SetTECEntry(0, 1, 1, 7, 470422216);
+  detectorId.SetTECEntry(0, 1, 1, 8, 470438600);
+  detectorId.SetTECEntry(0, 1, 2, 0, 470307784);
+  detectorId.SetTECEntry(0, 1, 2, 1, 470324168);
+  detectorId.SetTECEntry(0, 1, 2, 2, 470340552);
+  detectorId.SetTECEntry(0, 1, 2, 3, 470356936);
+  detectorId.SetTECEntry(0, 1, 2, 4, 470373320);
+  detectorId.SetTECEntry(0, 1, 2, 5, 470389704);
+  detectorId.SetTECEntry(0, 1, 2, 6, 470406088);
+  detectorId.SetTECEntry(0, 1, 2, 7, 470422472);
+  detectorId.SetTECEntry(0, 1, 2, 8, 470438856);
+  detectorId.SetTECEntry(0, 1, 3, 0, 470308040);
+  detectorId.SetTECEntry(0, 1, 3, 1, 470324424);
+  detectorId.SetTECEntry(0, 1, 3, 2, 470340808);
+  detectorId.SetTECEntry(0, 1, 3, 3, 470357192);
+  detectorId.SetTECEntry(0, 1, 3, 4, 470373576);
+  detectorId.SetTECEntry(0, 1, 3, 5, 470389960);
+  detectorId.SetTECEntry(0, 1, 3, 6, 470406344);
+  detectorId.SetTECEntry(0, 1, 3, 7, 470422728);
+  detectorId.SetTECEntry(0, 1, 3, 8, 470439112);
+  detectorId.SetTECEntry(0, 1, 4, 0, 470308296);
+  detectorId.SetTECEntry(0, 1, 4, 1, 470324680);
+  detectorId.SetTECEntry(0, 1, 4, 2, 470341064);
+  detectorId.SetTECEntry(0, 1, 4, 3, 470357448);
+  detectorId.SetTECEntry(0, 1, 4, 4, 470373832);
+  detectorId.SetTECEntry(0, 1, 4, 5, 470390216);
+  detectorId.SetTECEntry(0, 1, 4, 6, 470406600);
+  detectorId.SetTECEntry(0, 1, 4, 7, 470422984);
+  detectorId.SetTECEntry(0, 1, 4, 8, 470439368);
+  detectorId.SetTECEntry(0, 1, 5, 0, 470308552);
+  detectorId.SetTECEntry(0, 1, 5, 1, 470324936);
+  detectorId.SetTECEntry(0, 1, 5, 2, 470341320);
+  detectorId.SetTECEntry(0, 1, 5, 3, 470357704);
+  detectorId.SetTECEntry(0, 1, 5, 4, 470374088);
+  detectorId.SetTECEntry(0, 1, 5, 5, 470390472);
+  detectorId.SetTECEntry(0, 1, 5, 6, 470406856);
+  detectorId.SetTECEntry(0, 1, 5, 7, 470423240);
+  detectorId.SetTECEntry(0, 1, 5, 8, 470439624);
+  detectorId.SetTECEntry(0, 1, 6, 0, 470308808);
+  detectorId.SetTECEntry(0, 1, 6, 1, 470325192);
+  detectorId.SetTECEntry(0, 1, 6, 2, 470341576);
+  detectorId.SetTECEntry(0, 1, 6, 3, 470357960);
+  detectorId.SetTECEntry(0, 1, 6, 4, 470374344);
+  detectorId.SetTECEntry(0, 1, 6, 5, 470390728);
+  detectorId.SetTECEntry(0, 1, 6, 6, 470407112);
+  detectorId.SetTECEntry(0, 1, 6, 7, 470423496);
+  detectorId.SetTECEntry(0, 1, 6, 8, 470439880);
+  detectorId.SetTECEntry(0, 1, 7, 0, 470309064);
+  detectorId.SetTECEntry(0, 1, 7, 1, 470325448);
+  detectorId.SetTECEntry(0, 1, 7, 2, 470341832);
+  detectorId.SetTECEntry(0, 1, 7, 3, 470358216);
+  detectorId.SetTECEntry(0, 1, 7, 4, 470374600);
+  detectorId.SetTECEntry(0, 1, 7, 5, 470390984);
+  detectorId.SetTECEntry(0, 1, 7, 6, 470407368);
+  detectorId.SetTECEntry(0, 1, 7, 7, 470423752);
+  detectorId.SetTECEntry(0, 1, 7, 8, 470440136);
 
   // TEC-
-  detectorId.SetTECEntry( 1, 0, 0, 0, 470045064 );
-  detectorId.SetTECEntry( 1, 0, 0, 1, 470061448 );
-  detectorId.SetTECEntry( 1, 0, 0, 2, 470077832 );
-  detectorId.SetTECEntry( 1, 0, 0, 3, 470094216 );
-  detectorId.SetTECEntry( 1, 0, 0, 4, 470110600 );
-  detectorId.SetTECEntry( 1, 0, 0, 5, 470126984 );
-  detectorId.SetTECEntry( 1, 0, 0, 6, 470143368 );
-  detectorId.SetTECEntry( 1, 0, 0, 7, 470159752 );
-  detectorId.SetTECEntry( 1, 0, 0, 8, 470176136 );
-  detectorId.SetTECEntry( 1, 0, 1, 0, 470045320 );
-  detectorId.SetTECEntry( 1, 0, 1, 1, 470061704 );
-  detectorId.SetTECEntry( 1, 0, 1, 2, 470078088 );
-  detectorId.SetTECEntry( 1, 0, 1, 3, 470094472 );
-  detectorId.SetTECEntry( 1, 0, 1, 4, 470110856 );
-  detectorId.SetTECEntry( 1, 0, 1, 5, 470127240 );
-  detectorId.SetTECEntry( 1, 0, 1, 6, 470143624 );
-  detectorId.SetTECEntry( 1, 0, 1, 7, 470160008 );
-  detectorId.SetTECEntry( 1, 0, 1, 8, 470176392 );
-  detectorId.SetTECEntry( 1, 0, 2, 0, 470045576 );
-  detectorId.SetTECEntry( 1, 0, 2, 1, 470061960 );
-  detectorId.SetTECEntry( 1, 0, 2, 2, 470078344 );
-  detectorId.SetTECEntry( 1, 0, 2, 3, 470094728 );
-  detectorId.SetTECEntry( 1, 0, 2, 4, 470111112 );
-  detectorId.SetTECEntry( 1, 0, 2, 5, 470127496 );
-  detectorId.SetTECEntry( 1, 0, 2, 6, 470143880 );
-  detectorId.SetTECEntry( 1, 0, 2, 7, 470160264 );
-  detectorId.SetTECEntry( 1, 0, 2, 8, 470176648 );
-  detectorId.SetTECEntry( 1, 0, 3, 0, 470045832 );
-  detectorId.SetTECEntry( 1, 0, 3, 1, 470062216 );
-  detectorId.SetTECEntry( 1, 0, 3, 2, 470078600 );
-  detectorId.SetTECEntry( 1, 0, 3, 3, 470094984 );
-  detectorId.SetTECEntry( 1, 0, 3, 4, 470111368 );
-  detectorId.SetTECEntry( 1, 0, 3, 5, 470127752 );
-  detectorId.SetTECEntry( 1, 0, 3, 6, 470144136 );
-  detectorId.SetTECEntry( 1, 0, 3, 7, 470160520 );
-  detectorId.SetTECEntry( 1, 0, 3, 8, 470176904 );
-  detectorId.SetTECEntry( 1, 0, 4, 0, 470046088 );
-  detectorId.SetTECEntry( 1, 0, 4, 1, 470062472 );
-  detectorId.SetTECEntry( 1, 0, 4, 2, 470078856 );
-  detectorId.SetTECEntry( 1, 0, 4, 3, 470095240 );
-  detectorId.SetTECEntry( 1, 0, 4, 4, 470111624 );
-  detectorId.SetTECEntry( 1, 0, 4, 5, 470128008 );
-  detectorId.SetTECEntry( 1, 0, 4, 6, 470144392 );
-  detectorId.SetTECEntry( 1, 0, 4, 7, 470160776 );
-  detectorId.SetTECEntry( 1, 0, 4, 8, 470177160 );
-  detectorId.SetTECEntry( 1, 0, 5, 0, 470046344 );
-  detectorId.SetTECEntry( 1, 0, 5, 1, 470062728 );
-  detectorId.SetTECEntry( 1, 0, 5, 2, 470079112 );
-  detectorId.SetTECEntry( 1, 0, 5, 3, 470095496 );
-  detectorId.SetTECEntry( 1, 0, 5, 4, 470111880 );
-  detectorId.SetTECEntry( 1, 0, 5, 5, 470128264 );
-  detectorId.SetTECEntry( 1, 0, 5, 6, 470144648 );
-  detectorId.SetTECEntry( 1, 0, 5, 7, 470161032 );
-  detectorId.SetTECEntry( 1, 0, 5, 8, 470177416 );
-  detectorId.SetTECEntry( 1, 0, 6, 0, 470046600 );
-  detectorId.SetTECEntry( 1, 0, 6, 1, 470062984 );
-  detectorId.SetTECEntry( 1, 0, 6, 2, 470079368 );
-  detectorId.SetTECEntry( 1, 0, 6, 3, 470095752 );
-  detectorId.SetTECEntry( 1, 0, 6, 4, 470112136 );
-  detectorId.SetTECEntry( 1, 0, 6, 5, 470128520 );
-  detectorId.SetTECEntry( 1, 0, 6, 6, 470144904 );
-  detectorId.SetTECEntry( 1, 0, 6, 7, 470161288 );
-  detectorId.SetTECEntry( 1, 0, 6, 8, 470177672 );
-  detectorId.SetTECEntry( 1, 0, 7, 0, 470046856 );
-  detectorId.SetTECEntry( 1, 0, 7, 1, 470063240 );
-  detectorId.SetTECEntry( 1, 0, 7, 2, 470079624 );
-  detectorId.SetTECEntry( 1, 0, 7, 3, 470096008 );
-  detectorId.SetTECEntry( 1, 0, 7, 4, 470112392 );
-  detectorId.SetTECEntry( 1, 0, 7, 5, 470128776 );
-  detectorId.SetTECEntry( 1, 0, 7, 6, 470145160 );
-  detectorId.SetTECEntry( 1, 0, 7, 7, 470161544 );
-  detectorId.SetTECEntry( 1, 0, 7, 8, 470177928 );
-  detectorId.SetTECEntry( 1, 1, 0, 0, 470045128 );
-  detectorId.SetTECEntry( 1, 1, 0, 1, 470061512 );
-  detectorId.SetTECEntry( 1, 1, 0, 2, 470077896 );
-  detectorId.SetTECEntry( 1, 1, 0, 3, 470094280 );
-  detectorId.SetTECEntry( 1, 1, 0, 4, 470110664 );
-  detectorId.SetTECEntry( 1, 1, 0, 5, 470127048 );
-  detectorId.SetTECEntry( 1, 1, 0, 6, 470143432 );
-  detectorId.SetTECEntry( 1, 1, 0, 7, 470159816 );
-  detectorId.SetTECEntry( 1, 1, 0, 8, 470176200 );
-  detectorId.SetTECEntry( 1, 1, 1, 0, 470045384 );
-  detectorId.SetTECEntry( 1, 1, 1, 1, 470061768 );
-  detectorId.SetTECEntry( 1, 1, 1, 2, 470078152 );
-  detectorId.SetTECEntry( 1, 1, 1, 3, 470094536 );
-  detectorId.SetTECEntry( 1, 1, 1, 4, 470110920 );
-  detectorId.SetTECEntry( 1, 1, 1, 5, 470127304 );
-  detectorId.SetTECEntry( 1, 1, 1, 6, 470143688 );
-  detectorId.SetTECEntry( 1, 1, 1, 7, 470160072 );
-  detectorId.SetTECEntry( 1, 1, 1, 8, 470176456 );
-  detectorId.SetTECEntry( 1, 1, 2, 0, 470045640 );
-  detectorId.SetTECEntry( 1, 1, 2, 1, 470062024 );
-  detectorId.SetTECEntry( 1, 1, 2, 2, 470078408 );
-  detectorId.SetTECEntry( 1, 1, 2, 3, 470094792 );
-  detectorId.SetTECEntry( 1, 1, 2, 4, 470111176 );
-  detectorId.SetTECEntry( 1, 1, 2, 5, 470127560 );
-  detectorId.SetTECEntry( 1, 1, 2, 6, 470143944 );
-  detectorId.SetTECEntry( 1, 1, 2, 7, 470160328 );
-  detectorId.SetTECEntry( 1, 1, 2, 8, 470176712 );
-  detectorId.SetTECEntry( 1, 1, 3, 0, 470045896 );
-  detectorId.SetTECEntry( 1, 1, 3, 1, 470062280 );
-  detectorId.SetTECEntry( 1, 1, 3, 2, 470078664 );
-  detectorId.SetTECEntry( 1, 1, 3, 3, 470095048 );
-  detectorId.SetTECEntry( 1, 1, 3, 4, 470111432 );
-  detectorId.SetTECEntry( 1, 1, 3, 5, 470127816 );
-  detectorId.SetTECEntry( 1, 1, 3, 6, 470144200 );
-  detectorId.SetTECEntry( 1, 1, 3, 7, 470160584 );
-  detectorId.SetTECEntry( 1, 1, 3, 8, 470176968 );
-  detectorId.SetTECEntry( 1, 1, 4, 0, 470046152 );
-  detectorId.SetTECEntry( 1, 1, 4, 1, 470062536 );
-  detectorId.SetTECEntry( 1, 1, 4, 2, 470078920 );
-  detectorId.SetTECEntry( 1, 1, 4, 3, 470095304 );
-  detectorId.SetTECEntry( 1, 1, 4, 4, 470111688 );
-  detectorId.SetTECEntry( 1, 1, 4, 5, 470128072 );
-  detectorId.SetTECEntry( 1, 1, 4, 6, 470144456 );
-  detectorId.SetTECEntry( 1, 1, 4, 7, 470160840 );
-  detectorId.SetTECEntry( 1, 1, 4, 8, 470177224 );
-  detectorId.SetTECEntry( 1, 1, 5, 0, 470046408 );
-  detectorId.SetTECEntry( 1, 1, 5, 1, 470062792 );
-  detectorId.SetTECEntry( 1, 1, 5, 2, 470079176 );
-  detectorId.SetTECEntry( 1, 1, 5, 3, 470095560 );
-  detectorId.SetTECEntry( 1, 1, 5, 4, 470111944 );
-  detectorId.SetTECEntry( 1, 1, 5, 5, 470128328 );
-  detectorId.SetTECEntry( 1, 1, 5, 6, 470144712 );
-  detectorId.SetTECEntry( 1, 1, 5, 7, 470161096 );
-  detectorId.SetTECEntry( 1, 1, 5, 8, 470177480 );
-  detectorId.SetTECEntry( 1, 1, 6, 0, 470046664 );
-  detectorId.SetTECEntry( 1, 1, 6, 1, 470063048 );
-  detectorId.SetTECEntry( 1, 1, 6, 2, 470079432 );
-  detectorId.SetTECEntry( 1, 1, 6, 3, 470095816 );
-  detectorId.SetTECEntry( 1, 1, 6, 4, 470112200 );
-  detectorId.SetTECEntry( 1, 1, 6, 5, 470128584 );
-  detectorId.SetTECEntry( 1, 1, 6, 6, 470144968 );
-  detectorId.SetTECEntry( 1, 1, 6, 7, 470161352 );
-  detectorId.SetTECEntry( 1, 1, 6, 8, 470177736 );
-  detectorId.SetTECEntry( 1, 1, 7, 0, 470046920 );
-  detectorId.SetTECEntry( 1, 1, 7, 1, 470063304 );
-  detectorId.SetTECEntry( 1, 1, 7, 2, 470079688 );
-  detectorId.SetTECEntry( 1, 1, 7, 3, 470096072 );
-  detectorId.SetTECEntry( 1, 1, 7, 4, 470112456 );
-  detectorId.SetTECEntry( 1, 1, 7, 5, 470128840 );
-  detectorId.SetTECEntry( 1, 1, 7, 6, 470145224 );
-  detectorId.SetTECEntry( 1, 1, 7, 7, 470161608 );
-  detectorId.SetTECEntry( 1, 1, 7, 8, 470177992 );
+  detectorId.SetTECEntry(1, 0, 0, 0, 470045064);
+  detectorId.SetTECEntry(1, 0, 0, 1, 470061448);
+  detectorId.SetTECEntry(1, 0, 0, 2, 470077832);
+  detectorId.SetTECEntry(1, 0, 0, 3, 470094216);
+  detectorId.SetTECEntry(1, 0, 0, 4, 470110600);
+  detectorId.SetTECEntry(1, 0, 0, 5, 470126984);
+  detectorId.SetTECEntry(1, 0, 0, 6, 470143368);
+  detectorId.SetTECEntry(1, 0, 0, 7, 470159752);
+  detectorId.SetTECEntry(1, 0, 0, 8, 470176136);
+  detectorId.SetTECEntry(1, 0, 1, 0, 470045320);
+  detectorId.SetTECEntry(1, 0, 1, 1, 470061704);
+  detectorId.SetTECEntry(1, 0, 1, 2, 470078088);
+  detectorId.SetTECEntry(1, 0, 1, 3, 470094472);
+  detectorId.SetTECEntry(1, 0, 1, 4, 470110856);
+  detectorId.SetTECEntry(1, 0, 1, 5, 470127240);
+  detectorId.SetTECEntry(1, 0, 1, 6, 470143624);
+  detectorId.SetTECEntry(1, 0, 1, 7, 470160008);
+  detectorId.SetTECEntry(1, 0, 1, 8, 470176392);
+  detectorId.SetTECEntry(1, 0, 2, 0, 470045576);
+  detectorId.SetTECEntry(1, 0, 2, 1, 470061960);
+  detectorId.SetTECEntry(1, 0, 2, 2, 470078344);
+  detectorId.SetTECEntry(1, 0, 2, 3, 470094728);
+  detectorId.SetTECEntry(1, 0, 2, 4, 470111112);
+  detectorId.SetTECEntry(1, 0, 2, 5, 470127496);
+  detectorId.SetTECEntry(1, 0, 2, 6, 470143880);
+  detectorId.SetTECEntry(1, 0, 2, 7, 470160264);
+  detectorId.SetTECEntry(1, 0, 2, 8, 470176648);
+  detectorId.SetTECEntry(1, 0, 3, 0, 470045832);
+  detectorId.SetTECEntry(1, 0, 3, 1, 470062216);
+  detectorId.SetTECEntry(1, 0, 3, 2, 470078600);
+  detectorId.SetTECEntry(1, 0, 3, 3, 470094984);
+  detectorId.SetTECEntry(1, 0, 3, 4, 470111368);
+  detectorId.SetTECEntry(1, 0, 3, 5, 470127752);
+  detectorId.SetTECEntry(1, 0, 3, 6, 470144136);
+  detectorId.SetTECEntry(1, 0, 3, 7, 470160520);
+  detectorId.SetTECEntry(1, 0, 3, 8, 470176904);
+  detectorId.SetTECEntry(1, 0, 4, 0, 470046088);
+  detectorId.SetTECEntry(1, 0, 4, 1, 470062472);
+  detectorId.SetTECEntry(1, 0, 4, 2, 470078856);
+  detectorId.SetTECEntry(1, 0, 4, 3, 470095240);
+  detectorId.SetTECEntry(1, 0, 4, 4, 470111624);
+  detectorId.SetTECEntry(1, 0, 4, 5, 470128008);
+  detectorId.SetTECEntry(1, 0, 4, 6, 470144392);
+  detectorId.SetTECEntry(1, 0, 4, 7, 470160776);
+  detectorId.SetTECEntry(1, 0, 4, 8, 470177160);
+  detectorId.SetTECEntry(1, 0, 5, 0, 470046344);
+  detectorId.SetTECEntry(1, 0, 5, 1, 470062728);
+  detectorId.SetTECEntry(1, 0, 5, 2, 470079112);
+  detectorId.SetTECEntry(1, 0, 5, 3, 470095496);
+  detectorId.SetTECEntry(1, 0, 5, 4, 470111880);
+  detectorId.SetTECEntry(1, 0, 5, 5, 470128264);
+  detectorId.SetTECEntry(1, 0, 5, 6, 470144648);
+  detectorId.SetTECEntry(1, 0, 5, 7, 470161032);
+  detectorId.SetTECEntry(1, 0, 5, 8, 470177416);
+  detectorId.SetTECEntry(1, 0, 6, 0, 470046600);
+  detectorId.SetTECEntry(1, 0, 6, 1, 470062984);
+  detectorId.SetTECEntry(1, 0, 6, 2, 470079368);
+  detectorId.SetTECEntry(1, 0, 6, 3, 470095752);
+  detectorId.SetTECEntry(1, 0, 6, 4, 470112136);
+  detectorId.SetTECEntry(1, 0, 6, 5, 470128520);
+  detectorId.SetTECEntry(1, 0, 6, 6, 470144904);
+  detectorId.SetTECEntry(1, 0, 6, 7, 470161288);
+  detectorId.SetTECEntry(1, 0, 6, 8, 470177672);
+  detectorId.SetTECEntry(1, 0, 7, 0, 470046856);
+  detectorId.SetTECEntry(1, 0, 7, 1, 470063240);
+  detectorId.SetTECEntry(1, 0, 7, 2, 470079624);
+  detectorId.SetTECEntry(1, 0, 7, 3, 470096008);
+  detectorId.SetTECEntry(1, 0, 7, 4, 470112392);
+  detectorId.SetTECEntry(1, 0, 7, 5, 470128776);
+  detectorId.SetTECEntry(1, 0, 7, 6, 470145160);
+  detectorId.SetTECEntry(1, 0, 7, 7, 470161544);
+  detectorId.SetTECEntry(1, 0, 7, 8, 470177928);
+  detectorId.SetTECEntry(1, 1, 0, 0, 470045128);
+  detectorId.SetTECEntry(1, 1, 0, 1, 470061512);
+  detectorId.SetTECEntry(1, 1, 0, 2, 470077896);
+  detectorId.SetTECEntry(1, 1, 0, 3, 470094280);
+  detectorId.SetTECEntry(1, 1, 0, 4, 470110664);
+  detectorId.SetTECEntry(1, 1, 0, 5, 470127048);
+  detectorId.SetTECEntry(1, 1, 0, 6, 470143432);
+  detectorId.SetTECEntry(1, 1, 0, 7, 470159816);
+  detectorId.SetTECEntry(1, 1, 0, 8, 470176200);
+  detectorId.SetTECEntry(1, 1, 1, 0, 470045384);
+  detectorId.SetTECEntry(1, 1, 1, 1, 470061768);
+  detectorId.SetTECEntry(1, 1, 1, 2, 470078152);
+  detectorId.SetTECEntry(1, 1, 1, 3, 470094536);
+  detectorId.SetTECEntry(1, 1, 1, 4, 470110920);
+  detectorId.SetTECEntry(1, 1, 1, 5, 470127304);
+  detectorId.SetTECEntry(1, 1, 1, 6, 470143688);
+  detectorId.SetTECEntry(1, 1, 1, 7, 470160072);
+  detectorId.SetTECEntry(1, 1, 1, 8, 470176456);
+  detectorId.SetTECEntry(1, 1, 2, 0, 470045640);
+  detectorId.SetTECEntry(1, 1, 2, 1, 470062024);
+  detectorId.SetTECEntry(1, 1, 2, 2, 470078408);
+  detectorId.SetTECEntry(1, 1, 2, 3, 470094792);
+  detectorId.SetTECEntry(1, 1, 2, 4, 470111176);
+  detectorId.SetTECEntry(1, 1, 2, 5, 470127560);
+  detectorId.SetTECEntry(1, 1, 2, 6, 470143944);
+  detectorId.SetTECEntry(1, 1, 2, 7, 470160328);
+  detectorId.SetTECEntry(1, 1, 2, 8, 470176712);
+  detectorId.SetTECEntry(1, 1, 3, 0, 470045896);
+  detectorId.SetTECEntry(1, 1, 3, 1, 470062280);
+  detectorId.SetTECEntry(1, 1, 3, 2, 470078664);
+  detectorId.SetTECEntry(1, 1, 3, 3, 470095048);
+  detectorId.SetTECEntry(1, 1, 3, 4, 470111432);
+  detectorId.SetTECEntry(1, 1, 3, 5, 470127816);
+  detectorId.SetTECEntry(1, 1, 3, 6, 470144200);
+  detectorId.SetTECEntry(1, 1, 3, 7, 470160584);
+  detectorId.SetTECEntry(1, 1, 3, 8, 470176968);
+  detectorId.SetTECEntry(1, 1, 4, 0, 470046152);
+  detectorId.SetTECEntry(1, 1, 4, 1, 470062536);
+  detectorId.SetTECEntry(1, 1, 4, 2, 470078920);
+  detectorId.SetTECEntry(1, 1, 4, 3, 470095304);
+  detectorId.SetTECEntry(1, 1, 4, 4, 470111688);
+  detectorId.SetTECEntry(1, 1, 4, 5, 470128072);
+  detectorId.SetTECEntry(1, 1, 4, 6, 470144456);
+  detectorId.SetTECEntry(1, 1, 4, 7, 470160840);
+  detectorId.SetTECEntry(1, 1, 4, 8, 470177224);
+  detectorId.SetTECEntry(1, 1, 5, 0, 470046408);
+  detectorId.SetTECEntry(1, 1, 5, 1, 470062792);
+  detectorId.SetTECEntry(1, 1, 5, 2, 470079176);
+  detectorId.SetTECEntry(1, 1, 5, 3, 470095560);
+  detectorId.SetTECEntry(1, 1, 5, 4, 470111944);
+  detectorId.SetTECEntry(1, 1, 5, 5, 470128328);
+  detectorId.SetTECEntry(1, 1, 5, 6, 470144712);
+  detectorId.SetTECEntry(1, 1, 5, 7, 470161096);
+  detectorId.SetTECEntry(1, 1, 5, 8, 470177480);
+  detectorId.SetTECEntry(1, 1, 6, 0, 470046664);
+  detectorId.SetTECEntry(1, 1, 6, 1, 470063048);
+  detectorId.SetTECEntry(1, 1, 6, 2, 470079432);
+  detectorId.SetTECEntry(1, 1, 6, 3, 470095816);
+  detectorId.SetTECEntry(1, 1, 6, 4, 470112200);
+  detectorId.SetTECEntry(1, 1, 6, 5, 470128584);
+  detectorId.SetTECEntry(1, 1, 6, 6, 470144968);
+  detectorId.SetTECEntry(1, 1, 6, 7, 470161352);
+  detectorId.SetTECEntry(1, 1, 6, 8, 470177736);
+  detectorId.SetTECEntry(1, 1, 7, 0, 470046920);
+  detectorId.SetTECEntry(1, 1, 7, 1, 470063304);
+  detectorId.SetTECEntry(1, 1, 7, 2, 470079688);
+  detectorId.SetTECEntry(1, 1, 7, 3, 470096072);
+  detectorId.SetTECEntry(1, 1, 7, 4, 470112456);
+  detectorId.SetTECEntry(1, 1, 7, 5, 470128840);
+  detectorId.SetTECEntry(1, 1, 7, 6, 470145224);
+  detectorId.SetTECEntry(1, 1, 7, 7, 470161608);
+  detectorId.SetTECEntry(1, 1, 7, 8, 470177992);
 
   // TIB
-  detectorId.SetTIBTOBEntry( 2, 0, 0, 369174604 );
-  detectorId.SetTIBTOBEntry( 2, 0, 1, 369174600 );
-  detectorId.SetTIBTOBEntry( 2, 0, 2, 369174596 );
-  detectorId.SetTIBTOBEntry( 2, 0, 3, 369170500 );
-  detectorId.SetTIBTOBEntry( 2, 0, 4, 369170504 );
-  detectorId.SetTIBTOBEntry( 2, 0, 5, 369170508 );
-  detectorId.SetTIBTOBEntry( 2, 1, 0, 369174732 );
-  detectorId.SetTIBTOBEntry( 2, 1, 1, 369174728 );
-  detectorId.SetTIBTOBEntry( 2, 1, 2, 369174724 );
-  detectorId.SetTIBTOBEntry( 2, 1, 3, 369170628 );
-  detectorId.SetTIBTOBEntry( 2, 1, 4, 369170632 );
-  detectorId.SetTIBTOBEntry( 2, 1, 5, 369170636 );
-  detectorId.SetTIBTOBEntry( 2, 2, 0, 369174812 );
-  detectorId.SetTIBTOBEntry( 2, 2, 1, 369174808 );
-  detectorId.SetTIBTOBEntry( 2, 2, 2, 369174804 );
-  detectorId.SetTIBTOBEntry( 2, 2, 3, 369170708 );
-  detectorId.SetTIBTOBEntry( 2, 2, 4, 369170712 );
-  detectorId.SetTIBTOBEntry( 2, 2, 5, 369170716 );
-  detectorId.SetTIBTOBEntry( 2, 3, 0, 369174940 );
-  detectorId.SetTIBTOBEntry( 2, 3, 1, 369174936 );
-  detectorId.SetTIBTOBEntry( 2, 3, 2, 369174932 );
-  detectorId.SetTIBTOBEntry( 2, 3, 3, 369170836 );
-  detectorId.SetTIBTOBEntry( 2, 3, 4, 369170840 );
-  detectorId.SetTIBTOBEntry( 2, 3, 5, 369170844 );
-  detectorId.SetTIBTOBEntry( 2, 4, 0, 369175068 );
-  detectorId.SetTIBTOBEntry( 2, 4, 1, 369175064 );
-  detectorId.SetTIBTOBEntry( 2, 4, 2, 369175060 );
-  detectorId.SetTIBTOBEntry( 2, 4, 3, 369170964 );
-  detectorId.SetTIBTOBEntry( 2, 4, 4, 369170968 );
-  detectorId.SetTIBTOBEntry( 2, 4, 5, 369170972 );
-  detectorId.SetTIBTOBEntry( 2, 5, 0, 369175164 );
-  detectorId.SetTIBTOBEntry( 2, 5, 1, 369175160 );
-  detectorId.SetTIBTOBEntry( 2, 5, 2, 369175156 );
-  detectorId.SetTIBTOBEntry( 2, 5, 3, 369171060 );
-  detectorId.SetTIBTOBEntry( 2, 5, 4, 369171064 );
-  detectorId.SetTIBTOBEntry( 2, 5, 5, 369171068 );
-  detectorId.SetTIBTOBEntry( 2, 6, 0, 369175292 );
-  detectorId.SetTIBTOBEntry( 2, 6, 1, 369175288 );
-  detectorId.SetTIBTOBEntry( 2, 6, 2, 369175284 );
-  detectorId.SetTIBTOBEntry( 2, 6, 3, 369171188 );
-  detectorId.SetTIBTOBEntry( 2, 6, 4, 369171192 );
-  detectorId.SetTIBTOBEntry( 2, 6, 5, 369171196 );
-  detectorId.SetTIBTOBEntry( 2, 7, 0, 369175372 );
-  detectorId.SetTIBTOBEntry( 2, 7, 1, 369175368 );
-  detectorId.SetTIBTOBEntry( 2, 7, 2, 369175364 );
-  detectorId.SetTIBTOBEntry( 2, 7, 3, 369171268 );
-  detectorId.SetTIBTOBEntry( 2, 7, 4, 369171272 );
-  detectorId.SetTIBTOBEntry( 2, 7, 5, 369171276 );
+  detectorId.SetTIBTOBEntry(2, 0, 0, 369174604);
+  detectorId.SetTIBTOBEntry(2, 0, 1, 369174600);
+  detectorId.SetTIBTOBEntry(2, 0, 2, 369174596);
+  detectorId.SetTIBTOBEntry(2, 0, 3, 369170500);
+  detectorId.SetTIBTOBEntry(2, 0, 4, 369170504);
+  detectorId.SetTIBTOBEntry(2, 0, 5, 369170508);
+  detectorId.SetTIBTOBEntry(2, 1, 0, 369174732);
+  detectorId.SetTIBTOBEntry(2, 1, 1, 369174728);
+  detectorId.SetTIBTOBEntry(2, 1, 2, 369174724);
+  detectorId.SetTIBTOBEntry(2, 1, 3, 369170628);
+  detectorId.SetTIBTOBEntry(2, 1, 4, 369170632);
+  detectorId.SetTIBTOBEntry(2, 1, 5, 369170636);
+  detectorId.SetTIBTOBEntry(2, 2, 0, 369174812);
+  detectorId.SetTIBTOBEntry(2, 2, 1, 369174808);
+  detectorId.SetTIBTOBEntry(2, 2, 2, 369174804);
+  detectorId.SetTIBTOBEntry(2, 2, 3, 369170708);
+  detectorId.SetTIBTOBEntry(2, 2, 4, 369170712);
+  detectorId.SetTIBTOBEntry(2, 2, 5, 369170716);
+  detectorId.SetTIBTOBEntry(2, 3, 0, 369174940);
+  detectorId.SetTIBTOBEntry(2, 3, 1, 369174936);
+  detectorId.SetTIBTOBEntry(2, 3, 2, 369174932);
+  detectorId.SetTIBTOBEntry(2, 3, 3, 369170836);
+  detectorId.SetTIBTOBEntry(2, 3, 4, 369170840);
+  detectorId.SetTIBTOBEntry(2, 3, 5, 369170844);
+  detectorId.SetTIBTOBEntry(2, 4, 0, 369175068);
+  detectorId.SetTIBTOBEntry(2, 4, 1, 369175064);
+  detectorId.SetTIBTOBEntry(2, 4, 2, 369175060);
+  detectorId.SetTIBTOBEntry(2, 4, 3, 369170964);
+  detectorId.SetTIBTOBEntry(2, 4, 4, 369170968);
+  detectorId.SetTIBTOBEntry(2, 4, 5, 369170972);
+  detectorId.SetTIBTOBEntry(2, 5, 0, 369175164);
+  detectorId.SetTIBTOBEntry(2, 5, 1, 369175160);
+  detectorId.SetTIBTOBEntry(2, 5, 2, 369175156);
+  detectorId.SetTIBTOBEntry(2, 5, 3, 369171060);
+  detectorId.SetTIBTOBEntry(2, 5, 4, 369171064);
+  detectorId.SetTIBTOBEntry(2, 5, 5, 369171068);
+  detectorId.SetTIBTOBEntry(2, 6, 0, 369175292);
+  detectorId.SetTIBTOBEntry(2, 6, 1, 369175288);
+  detectorId.SetTIBTOBEntry(2, 6, 2, 369175284);
+  detectorId.SetTIBTOBEntry(2, 6, 3, 369171188);
+  detectorId.SetTIBTOBEntry(2, 6, 4, 369171192);
+  detectorId.SetTIBTOBEntry(2, 6, 5, 369171196);
+  detectorId.SetTIBTOBEntry(2, 7, 0, 369175372);
+  detectorId.SetTIBTOBEntry(2, 7, 1, 369175368);
+  detectorId.SetTIBTOBEntry(2, 7, 2, 369175364);
+  detectorId.SetTIBTOBEntry(2, 7, 3, 369171268);
+  detectorId.SetTIBTOBEntry(2, 7, 4, 369171272);
+  detectorId.SetTIBTOBEntry(2, 7, 5, 369171276);
 
   // TOB
-  detectorId.SetTIBTOBEntry( 3, 0, 0, 436232314 );
-  detectorId.SetTIBTOBEntry( 3, 0, 1, 436232306 );
-  detectorId.SetTIBTOBEntry( 3, 0, 2, 436232298 );
-  detectorId.SetTIBTOBEntry( 3, 0, 3, 436228198 );
-  detectorId.SetTIBTOBEntry( 3, 0, 4, 436228206 );
-  detectorId.SetTIBTOBEntry( 3, 0, 5, 436228214 );
-  detectorId.SetTIBTOBEntry( 3, 1, 0, 436232506 );
-  detectorId.SetTIBTOBEntry( 3, 1, 1, 436232498 );
-  detectorId.SetTIBTOBEntry( 3, 1, 2, 436232490 );
-  detectorId.SetTIBTOBEntry( 3, 1, 3, 436228390 );
-  detectorId.SetTIBTOBEntry( 3, 1, 4, 436228398 );
-  detectorId.SetTIBTOBEntry( 3, 1, 5, 436228406 );
-  detectorId.SetTIBTOBEntry( 3, 2, 0, 436232634 );
-  detectorId.SetTIBTOBEntry( 3, 2, 1, 436232626 );
-  detectorId.SetTIBTOBEntry( 3, 2, 2, 436232618 );
-  detectorId.SetTIBTOBEntry( 3, 2, 3, 436228518 );
-  detectorId.SetTIBTOBEntry( 3, 2, 4, 436228526 );
-  detectorId.SetTIBTOBEntry( 3, 2, 5, 436228534 );
-  detectorId.SetTIBTOBEntry( 3, 3, 0, 436232826 );
-  detectorId.SetTIBTOBEntry( 3, 3, 1, 436232818 );
-  detectorId.SetTIBTOBEntry( 3, 3, 2, 436232810 );
-  detectorId.SetTIBTOBEntry( 3, 3, 3, 436228710 );
-  detectorId.SetTIBTOBEntry( 3, 3, 4, 436228718 );
-  detectorId.SetTIBTOBEntry( 3, 3, 5, 436228726 );
-  detectorId.SetTIBTOBEntry( 3, 4, 0, 436233018 );
-  detectorId.SetTIBTOBEntry( 3, 4, 1, 436233010 );
-  detectorId.SetTIBTOBEntry( 3, 4, 2, 436233002 );
-  detectorId.SetTIBTOBEntry( 3, 4, 3, 436228902 );
-  detectorId.SetTIBTOBEntry( 3, 4, 4, 436228910 );
-  detectorId.SetTIBTOBEntry( 3, 4, 5, 436228918 );
-  detectorId.SetTIBTOBEntry( 3, 5, 0, 436233146 );
-  detectorId.SetTIBTOBEntry( 3, 5, 1, 436233138 );
-  detectorId.SetTIBTOBEntry( 3, 5, 2, 436233130 );
-  detectorId.SetTIBTOBEntry( 3, 5, 3, 436229030 );
-  detectorId.SetTIBTOBEntry( 3, 5, 4, 436229038 );
-  detectorId.SetTIBTOBEntry( 3, 5, 5, 436229046 );
-  detectorId.SetTIBTOBEntry( 3, 6, 0, 436233338 );
-  detectorId.SetTIBTOBEntry( 3, 6, 1, 436233330 );
-  detectorId.SetTIBTOBEntry( 3, 6, 2, 436233322 );
-  detectorId.SetTIBTOBEntry( 3, 6, 3, 436229222 );
-  detectorId.SetTIBTOBEntry( 3, 6, 4, 436229230 );
-  detectorId.SetTIBTOBEntry( 3, 6, 5, 436229238 );
-  detectorId.SetTIBTOBEntry( 3, 7, 0, 436233466 );
-  detectorId.SetTIBTOBEntry( 3, 7, 1, 436233458 );
-  detectorId.SetTIBTOBEntry( 3, 7, 2, 436233450 );
-  detectorId.SetTIBTOBEntry( 3, 7, 3, 436229350 );
-  detectorId.SetTIBTOBEntry( 3, 7, 4, 436229358 );
-  detectorId.SetTIBTOBEntry( 3, 7, 5, 436229366 );
+  detectorId.SetTIBTOBEntry(3, 0, 0, 436232314);
+  detectorId.SetTIBTOBEntry(3, 0, 1, 436232306);
+  detectorId.SetTIBTOBEntry(3, 0, 2, 436232298);
+  detectorId.SetTIBTOBEntry(3, 0, 3, 436228198);
+  detectorId.SetTIBTOBEntry(3, 0, 4, 436228206);
+  detectorId.SetTIBTOBEntry(3, 0, 5, 436228214);
+  detectorId.SetTIBTOBEntry(3, 1, 0, 436232506);
+  detectorId.SetTIBTOBEntry(3, 1, 1, 436232498);
+  detectorId.SetTIBTOBEntry(3, 1, 2, 436232490);
+  detectorId.SetTIBTOBEntry(3, 1, 3, 436228390);
+  detectorId.SetTIBTOBEntry(3, 1, 4, 436228398);
+  detectorId.SetTIBTOBEntry(3, 1, 5, 436228406);
+  detectorId.SetTIBTOBEntry(3, 2, 0, 436232634);
+  detectorId.SetTIBTOBEntry(3, 2, 1, 436232626);
+  detectorId.SetTIBTOBEntry(3, 2, 2, 436232618);
+  detectorId.SetTIBTOBEntry(3, 2, 3, 436228518);
+  detectorId.SetTIBTOBEntry(3, 2, 4, 436228526);
+  detectorId.SetTIBTOBEntry(3, 2, 5, 436228534);
+  detectorId.SetTIBTOBEntry(3, 3, 0, 436232826);
+  detectorId.SetTIBTOBEntry(3, 3, 1, 436232818);
+  detectorId.SetTIBTOBEntry(3, 3, 2, 436232810);
+  detectorId.SetTIBTOBEntry(3, 3, 3, 436228710);
+  detectorId.SetTIBTOBEntry(3, 3, 4, 436228718);
+  detectorId.SetTIBTOBEntry(3, 3, 5, 436228726);
+  detectorId.SetTIBTOBEntry(3, 4, 0, 436233018);
+  detectorId.SetTIBTOBEntry(3, 4, 1, 436233010);
+  detectorId.SetTIBTOBEntry(3, 4, 2, 436233002);
+  detectorId.SetTIBTOBEntry(3, 4, 3, 436228902);
+  detectorId.SetTIBTOBEntry(3, 4, 4, 436228910);
+  detectorId.SetTIBTOBEntry(3, 4, 5, 436228918);
+  detectorId.SetTIBTOBEntry(3, 5, 0, 436233146);
+  detectorId.SetTIBTOBEntry(3, 5, 1, 436233138);
+  detectorId.SetTIBTOBEntry(3, 5, 2, 436233130);
+  detectorId.SetTIBTOBEntry(3, 5, 3, 436229030);
+  detectorId.SetTIBTOBEntry(3, 5, 4, 436229038);
+  detectorId.SetTIBTOBEntry(3, 5, 5, 436229046);
+  detectorId.SetTIBTOBEntry(3, 6, 0, 436233338);
+  detectorId.SetTIBTOBEntry(3, 6, 1, 436233330);
+  detectorId.SetTIBTOBEntry(3, 6, 2, 436233322);
+  detectorId.SetTIBTOBEntry(3, 6, 3, 436229222);
+  detectorId.SetTIBTOBEntry(3, 6, 4, 436229230);
+  detectorId.SetTIBTOBEntry(3, 6, 5, 436229238);
+  detectorId.SetTIBTOBEntry(3, 7, 0, 436233466);
+  detectorId.SetTIBTOBEntry(3, 7, 1, 436233458);
+  detectorId.SetTIBTOBEntry(3, 7, 2, 436233450);
+  detectorId.SetTIBTOBEntry(3, 7, 3, 436229350);
+  detectorId.SetTIBTOBEntry(3, 7, 4, 436229358);
+  detectorId.SetTIBTOBEntry(3, 7, 5, 436229366);
 
   // TEC+ AT
-  detectorId.SetTEC2TECEntry( 0, 0, 0, 470307208 );
-  detectorId.SetTEC2TECEntry( 0, 0, 1, 470323592 );
-  detectorId.SetTEC2TECEntry( 0, 0, 2, 470339976 );
-  detectorId.SetTEC2TECEntry( 0, 0, 3, 470356360 );
-  detectorId.SetTEC2TECEntry( 0, 0, 4, 470372744 );
-  detectorId.SetTEC2TECEntry( 0, 1, 0, 470307468 );
-  detectorId.SetTEC2TECEntry( 0, 1, 1, 470323852 );
-  detectorId.SetTEC2TECEntry( 0, 1, 2, 470340236 );
-  detectorId.SetTEC2TECEntry( 0, 1, 3, 470356620 );
-  detectorId.SetTEC2TECEntry( 0, 1, 4, 470373004 );
-  detectorId.SetTEC2TECEntry( 0, 2, 0, 470307716 );
-  detectorId.SetTEC2TECEntry( 0, 2, 1, 470324100 );
-  detectorId.SetTEC2TECEntry( 0, 2, 2, 470340484 );
-  detectorId.SetTEC2TECEntry( 0, 2, 3, 470356868 );
-  detectorId.SetTEC2TECEntry( 0, 2, 4, 470373252 );
-  detectorId.SetTEC2TECEntry( 0, 3, 0, 470307976 );
-  detectorId.SetTEC2TECEntry( 0, 3, 1, 470324360 );
-  detectorId.SetTEC2TECEntry( 0, 3, 2, 470340744 );
-  detectorId.SetTEC2TECEntry( 0, 3, 3, 470357128 );
-  detectorId.SetTEC2TECEntry( 0, 3, 4, 470373512 );
-  detectorId.SetTEC2TECEntry( 0, 4, 0, 470308236 );
-  detectorId.SetTEC2TECEntry( 0, 4, 1, 470324620 );
-  detectorId.SetTEC2TECEntry( 0, 4, 2, 470341004 );
-  detectorId.SetTEC2TECEntry( 0, 4, 3, 470357388 );
-  detectorId.SetTEC2TECEntry( 0, 4, 4, 470373772 );
-  detectorId.SetTEC2TECEntry( 0, 5, 0, 470308488 );
-  detectorId.SetTEC2TECEntry( 0, 5, 1, 470324872 );
-  detectorId.SetTEC2TECEntry( 0, 5, 2, 470341256 );
-  detectorId.SetTEC2TECEntry( 0, 5, 3, 470357640 );
-  detectorId.SetTEC2TECEntry( 0, 5, 4, 470374024 );
-  detectorId.SetTEC2TECEntry( 0, 6, 0, 470308748 );
-  detectorId.SetTEC2TECEntry( 0, 6, 1, 470325132 );
-  detectorId.SetTEC2TECEntry( 0, 6, 2, 470341516 );
-  detectorId.SetTEC2TECEntry( 0, 6, 3, 470357900 );
-  detectorId.SetTEC2TECEntry( 0, 6, 4, 470374284 );
-  detectorId.SetTEC2TECEntry( 0, 7, 0, 470308996 );
-  detectorId.SetTEC2TECEntry( 0, 7, 1, 470325380 );
-  detectorId.SetTEC2TECEntry( 0, 7, 2, 470341764 );
-  detectorId.SetTEC2TECEntry( 0, 7, 3, 470358148 );
-  detectorId.SetTEC2TECEntry( 0, 7, 4, 470374532 );
+  detectorId.SetTEC2TECEntry(0, 0, 0, 470307208);
+  detectorId.SetTEC2TECEntry(0, 0, 1, 470323592);
+  detectorId.SetTEC2TECEntry(0, 0, 2, 470339976);
+  detectorId.SetTEC2TECEntry(0, 0, 3, 470356360);
+  detectorId.SetTEC2TECEntry(0, 0, 4, 470372744);
+  detectorId.SetTEC2TECEntry(0, 1, 0, 470307468);
+  detectorId.SetTEC2TECEntry(0, 1, 1, 470323852);
+  detectorId.SetTEC2TECEntry(0, 1, 2, 470340236);
+  detectorId.SetTEC2TECEntry(0, 1, 3, 470356620);
+  detectorId.SetTEC2TECEntry(0, 1, 4, 470373004);
+  detectorId.SetTEC2TECEntry(0, 2, 0, 470307716);
+  detectorId.SetTEC2TECEntry(0, 2, 1, 470324100);
+  detectorId.SetTEC2TECEntry(0, 2, 2, 470340484);
+  detectorId.SetTEC2TECEntry(0, 2, 3, 470356868);
+  detectorId.SetTEC2TECEntry(0, 2, 4, 470373252);
+  detectorId.SetTEC2TECEntry(0, 3, 0, 470307976);
+  detectorId.SetTEC2TECEntry(0, 3, 1, 470324360);
+  detectorId.SetTEC2TECEntry(0, 3, 2, 470340744);
+  detectorId.SetTEC2TECEntry(0, 3, 3, 470357128);
+  detectorId.SetTEC2TECEntry(0, 3, 4, 470373512);
+  detectorId.SetTEC2TECEntry(0, 4, 0, 470308236);
+  detectorId.SetTEC2TECEntry(0, 4, 1, 470324620);
+  detectorId.SetTEC2TECEntry(0, 4, 2, 470341004);
+  detectorId.SetTEC2TECEntry(0, 4, 3, 470357388);
+  detectorId.SetTEC2TECEntry(0, 4, 4, 470373772);
+  detectorId.SetTEC2TECEntry(0, 5, 0, 470308488);
+  detectorId.SetTEC2TECEntry(0, 5, 1, 470324872);
+  detectorId.SetTEC2TECEntry(0, 5, 2, 470341256);
+  detectorId.SetTEC2TECEntry(0, 5, 3, 470357640);
+  detectorId.SetTEC2TECEntry(0, 5, 4, 470374024);
+  detectorId.SetTEC2TECEntry(0, 6, 0, 470308748);
+  detectorId.SetTEC2TECEntry(0, 6, 1, 470325132);
+  detectorId.SetTEC2TECEntry(0, 6, 2, 470341516);
+  detectorId.SetTEC2TECEntry(0, 6, 3, 470357900);
+  detectorId.SetTEC2TECEntry(0, 6, 4, 470374284);
+  detectorId.SetTEC2TECEntry(0, 7, 0, 470308996);
+  detectorId.SetTEC2TECEntry(0, 7, 1, 470325380);
+  detectorId.SetTEC2TECEntry(0, 7, 2, 470341764);
+  detectorId.SetTEC2TECEntry(0, 7, 3, 470358148);
+  detectorId.SetTEC2TECEntry(0, 7, 4, 470374532);
 
   // TEC- AT
-  detectorId.SetTEC2TECEntry( 1, 0, 0, 470045064 );
-  detectorId.SetTEC2TECEntry( 1, 0, 1, 470061448 );
-  detectorId.SetTEC2TECEntry( 1, 0, 2, 470077832 );
-  detectorId.SetTEC2TECEntry( 1, 0, 3, 470094216 );
-  detectorId.SetTEC2TECEntry( 1, 0, 4, 470110600 );
-  detectorId.SetTEC2TECEntry( 1, 1, 0, 470045316 );
-  detectorId.SetTEC2TECEntry( 1, 1, 1, 470061700 );
-  detectorId.SetTEC2TECEntry( 1, 1, 2, 470078084 );
-  detectorId.SetTEC2TECEntry( 1, 1, 3, 470094468 );
-  detectorId.SetTEC2TECEntry( 1, 1, 4, 470110852 );
-  detectorId.SetTEC2TECEntry( 1, 2, 0, 470045580 );
-  detectorId.SetTEC2TECEntry( 1, 2, 1, 470061964 );
-  detectorId.SetTEC2TECEntry( 1, 2, 2, 470078348 );
-  detectorId.SetTEC2TECEntry( 1, 2, 3, 470094732 );
-  detectorId.SetTEC2TECEntry( 1, 2, 4, 470111116 );
-  detectorId.SetTEC2TECEntry( 1, 3, 0, 470045832 );
-  detectorId.SetTEC2TECEntry( 1, 3, 1, 470062216 );
-  detectorId.SetTEC2TECEntry( 1, 3, 2, 470078600 );
-  detectorId.SetTEC2TECEntry( 1, 3, 3, 470094984 );
-  detectorId.SetTEC2TECEntry( 1, 3, 4, 470111368 );
-  detectorId.SetTEC2TECEntry( 1, 4, 0, 470046084 );
-  detectorId.SetTEC2TECEntry( 1, 4, 1, 470062468 );
-  detectorId.SetTEC2TECEntry( 1, 4, 2, 470078852 );
-  detectorId.SetTEC2TECEntry( 1, 4, 3, 470095236 );
-  detectorId.SetTEC2TECEntry( 1, 4, 4, 470111620 );
-  detectorId.SetTEC2TECEntry( 1, 5, 0, 470046344 );
-  detectorId.SetTEC2TECEntry( 1, 5, 1, 470062728 );
-  detectorId.SetTEC2TECEntry( 1, 5, 2, 470079112 );
-  detectorId.SetTEC2TECEntry( 1, 5, 3, 470095496 );
-  detectorId.SetTEC2TECEntry( 1, 5, 4, 470111880 );
-  detectorId.SetTEC2TECEntry( 1, 6, 0, 470046596 );
-  detectorId.SetTEC2TECEntry( 1, 6, 1, 470062980 );
-  detectorId.SetTEC2TECEntry( 1, 6, 2, 470079364 );
-  detectorId.SetTEC2TECEntry( 1, 6, 3, 470095748 );
-  detectorId.SetTEC2TECEntry( 1, 6, 4, 470112132 );
-  detectorId.SetTEC2TECEntry( 1, 7, 0, 470046860 );
-  detectorId.SetTEC2TECEntry( 1, 7, 1, 470063244 );
-  detectorId.SetTEC2TECEntry( 1, 7, 2, 470079628 );
-  detectorId.SetTEC2TECEntry( 1, 7, 3, 470096012 );
-  detectorId.SetTEC2TECEntry( 1, 7, 4, 470112396 );
-
+  detectorId.SetTEC2TECEntry(1, 0, 0, 470045064);
+  detectorId.SetTEC2TECEntry(1, 0, 1, 470061448);
+  detectorId.SetTEC2TECEntry(1, 0, 2, 470077832);
+  detectorId.SetTEC2TECEntry(1, 0, 3, 470094216);
+  detectorId.SetTEC2TECEntry(1, 0, 4, 470110600);
+  detectorId.SetTEC2TECEntry(1, 1, 0, 470045316);
+  detectorId.SetTEC2TECEntry(1, 1, 1, 470061700);
+  detectorId.SetTEC2TECEntry(1, 1, 2, 470078084);
+  detectorId.SetTEC2TECEntry(1, 1, 3, 470094468);
+  detectorId.SetTEC2TECEntry(1, 1, 4, 470110852);
+  detectorId.SetTEC2TECEntry(1, 2, 0, 470045580);
+  detectorId.SetTEC2TECEntry(1, 2, 1, 470061964);
+  detectorId.SetTEC2TECEntry(1, 2, 2, 470078348);
+  detectorId.SetTEC2TECEntry(1, 2, 3, 470094732);
+  detectorId.SetTEC2TECEntry(1, 2, 4, 470111116);
+  detectorId.SetTEC2TECEntry(1, 3, 0, 470045832);
+  detectorId.SetTEC2TECEntry(1, 3, 1, 470062216);
+  detectorId.SetTEC2TECEntry(1, 3, 2, 470078600);
+  detectorId.SetTEC2TECEntry(1, 3, 3, 470094984);
+  detectorId.SetTEC2TECEntry(1, 3, 4, 470111368);
+  detectorId.SetTEC2TECEntry(1, 4, 0, 470046084);
+  detectorId.SetTEC2TECEntry(1, 4, 1, 470062468);
+  detectorId.SetTEC2TECEntry(1, 4, 2, 470078852);
+  detectorId.SetTEC2TECEntry(1, 4, 3, 470095236);
+  detectorId.SetTEC2TECEntry(1, 4, 4, 470111620);
+  detectorId.SetTEC2TECEntry(1, 5, 0, 470046344);
+  detectorId.SetTEC2TECEntry(1, 5, 1, 470062728);
+  detectorId.SetTEC2TECEntry(1, 5, 2, 470079112);
+  detectorId.SetTEC2TECEntry(1, 5, 3, 470095496);
+  detectorId.SetTEC2TECEntry(1, 5, 4, 470111880);
+  detectorId.SetTEC2TECEntry(1, 6, 0, 470046596);
+  detectorId.SetTEC2TECEntry(1, 6, 1, 470062980);
+  detectorId.SetTEC2TECEntry(1, 6, 2, 470079364);
+  detectorId.SetTEC2TECEntry(1, 6, 3, 470095748);
+  detectorId.SetTEC2TECEntry(1, 6, 4, 470112132);
+  detectorId.SetTEC2TECEntry(1, 7, 0, 470046860);
+  detectorId.SetTEC2TECEntry(1, 7, 1, 470063244);
+  detectorId.SetTEC2TECEntry(1, 7, 2, 470079628);
+  detectorId.SetTEC2TECEntry(1, 7, 3, 470096012);
+  detectorId.SetTEC2TECEntry(1, 7, 4, 470112396);
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(LaserAlignmentT0ProducerDQM);
-
diff --git a/DQMOffline/Alignment/src/MuonAlignment.cc b/DQMOffline/Alignment/src/MuonAlignment.cc
index 676c852cb1f4e..07bd37ecabef7 100644
--- a/DQMOffline/Alignment/src/MuonAlignment.cc
+++ b/DQMOffline/Alignment/src/MuonAlignment.cc
@@ -7,829 +7,913 @@
 
 #include "DQMOffline/Alignment/interface/MuonAlignment.h"
 
+MuonAlignment::MuonAlignment(const edm::ParameterSet &pSet) {
+  metname = "MuonAlignment";
 
-MuonAlignment::MuonAlignment(const edm::ParameterSet& pSet) {
-
-    metname = "MuonAlignment";
-
-    LogTrace(metname)<<"[MuonAlignment] Constructor called!"<<std::endl;
-
-    parameters = pSet;
-
-    theMuonCollectionLabel = consumes<reco::TrackCollection>(parameters.getParameter<edm::InputTag>("MuonCollection"));
-  
-    theRecHits4DTagDT = consumes<DTRecSegment4DCollection>(parameters.getParameter<edm::InputTag>("RecHits4DDTCollectionTag"));
-    theRecHits4DTagCSC = consumes<CSCSegmentCollection>(parameters.getParameter<edm::InputTag>("RecHits4DCSCCollectionTag"));
-  
-    resLocalXRangeStation1 = parameters.getUntrackedParameter<double>("resLocalXRangeStation1");
-    resLocalXRangeStation2 = parameters.getUntrackedParameter<double>("resLocalXRangeStation2");
-    resLocalXRangeStation3 = parameters.getUntrackedParameter<double>("resLocalXRangeStation3");
-    resLocalXRangeStation4 = parameters.getUntrackedParameter<double>("resLocalXRangeStation4");
-    resLocalYRangeStation1 = parameters.getUntrackedParameter<double>("resLocalYRangeStation1");
-    resLocalYRangeStation2 = parameters.getUntrackedParameter<double>("resLocalYRangeStation2");
-    resLocalYRangeStation3 = parameters.getUntrackedParameter<double>("resLocalYRangeStation3");
-    resLocalYRangeStation4 = parameters.getUntrackedParameter<double>("resLocalYRangeStation4");
-    resPhiRange = parameters.getUntrackedParameter<double>("resPhiRange");
-    resThetaRange = parameters.getUntrackedParameter<double>("resThetaRange");
-
-    meanPositionRange = parameters.getUntrackedParameter<double>("meanPositionRange");
-    rmsPositionRange = parameters.getUntrackedParameter<double>("rmsPositionRange");
-    meanAngleRange = parameters.getUntrackedParameter<double>("meanAngleRange");
-    rmsAngleRange = parameters.getUntrackedParameter<double>("rmsAngleRange");
-
-    nbins = parameters.getUntrackedParameter<unsigned int>("nbins");
-    min1DTrackRecHitSize = parameters.getUntrackedParameter<unsigned int>("min1DTrackRecHitSize");
-    min4DTrackSegmentSize = parameters.getUntrackedParameter<unsigned int>("min4DTrackSegmentSize");
-
-    doDT = parameters.getUntrackedParameter<bool>("doDT");
-    doCSC = parameters.getUntrackedParameter<bool>("doCSC");
-    doSummary = parameters.getUntrackedParameter<bool>("doSummary");
-
-    numberOfTracks=0;
-    numberOfHits=0;
-  
-    MEFolderName = parameters.getParameter<std::string>("FolderName");  
-    topFolder << MEFolderName+"/Alignment/Muon";
-}
+  LogTrace(metname) << "[MuonAlignment] Constructor called!" << std::endl;
 
-MuonAlignment::~MuonAlignment() { 
-}
+  parameters = pSet;
 
+  theMuonCollectionLabel = consumes<reco::TrackCollection>(parameters.getParameter<edm::InputTag>("MuonCollection"));
 
-void MuonAlignment::beginJob() {
+  theRecHits4DTagDT =
+      consumes<DTRecSegment4DCollection>(parameters.getParameter<edm::InputTag>("RecHits4DDTCollectionTag"));
+  theRecHits4DTagCSC =
+      consumes<CSCSegmentCollection>(parameters.getParameter<edm::InputTag>("RecHits4DCSCCollectionTag"));
 
+  resLocalXRangeStation1 = parameters.getUntrackedParameter<double>("resLocalXRangeStation1");
+  resLocalXRangeStation2 = parameters.getUntrackedParameter<double>("resLocalXRangeStation2");
+  resLocalXRangeStation3 = parameters.getUntrackedParameter<double>("resLocalXRangeStation3");
+  resLocalXRangeStation4 = parameters.getUntrackedParameter<double>("resLocalXRangeStation4");
+  resLocalYRangeStation1 = parameters.getUntrackedParameter<double>("resLocalYRangeStation1");
+  resLocalYRangeStation2 = parameters.getUntrackedParameter<double>("resLocalYRangeStation2");
+  resLocalYRangeStation3 = parameters.getUntrackedParameter<double>("resLocalYRangeStation3");
+  resLocalYRangeStation4 = parameters.getUntrackedParameter<double>("resLocalYRangeStation4");
+  resPhiRange = parameters.getUntrackedParameter<double>("resPhiRange");
+  resThetaRange = parameters.getUntrackedParameter<double>("resThetaRange");
 
-    LogTrace(metname)<<"[MuonAlignment] Parameters initialization";
-  
-    if(!(doDT || doCSC) ) { 
-        edm::LogError("MuonAlignment") <<" Error!! At least one Muon subsystem (DT or CSC) must be monitorized!!" << std::endl;
-        edm::LogError("MuonAlignment") <<" Please enable doDT or doCSC to True in your python cfg file!!!" << std::endl;
-        exit(1);
-    }
-  
-    dbe = edm::Service<DQMStore>().operator->();
-
-    if (doSummary){
-        if (doDT){
-            dbe->setCurrentFolder(topFolder.str()+"/DT");
-            hLocalPositionDT=dbe->book2D("hLocalPositionDT","Local DT position (cm) absolute MEAN residuals;Sector;;cm", 14,1, 15,40,0,40);
-            hLocalAngleDT=dbe->book2D("hLocalAngleDT","Local DT angle (rad) absolute MEAN residuals;Sector;;rad", 14,1, 15,40,0,40); 
-            hLocalPositionRmsDT=dbe->book2D("hLocalPositionRmsDT","Local DT position (cm) RMS residuals;Sector;;cm", 14,1, 15,40,0,40);
-            hLocalAngleRmsDT=dbe->book2D("hLocalAngleRmsDT","Local DT angle (rad) RMS residuals;Sector;;rad", 14,1, 15,40,0,40); 
-
-            hLocalXMeanDT=dbe->book1D("hLocalXMeanDT","Distribution of absolute MEAN Local X (cm) residuals for DT;<X> (cm);number of chambers",100,0,meanPositionRange);
-            hLocalXRmsDT=dbe->book1D("hLocalXRmsDT","Distribution of RMS Local X (cm) residuals for DT;X RMS (cm);number of chambers", 100,0,rmsPositionRange);
-            hLocalYMeanDT=dbe->book1D("hLocalYMeanDT","Distribution of absolute MEAN Local Y (cm) residuals for DT;<Y> (cm);number of chambers", 100,0,meanPositionRange);
-            hLocalYRmsDT=dbe->book1D("hLocalYRmsDT","Distribution of RMS Local Y (cm) residuals for DT;Y RMS (cm);number of chambers", 100,0,rmsPositionRange);
-
-            hLocalPhiMeanDT=dbe->book1D("hLocalPhiMeanDT","Distribution of MEAN #phi (rad) residuals for DT;<#phi>(rad);number of chambers", 100,-meanAngleRange,meanAngleRange);
-            hLocalPhiRmsDT=dbe->book1D("hLocalPhiRmsDT","Distribution of RMS #phi (rad) residuals for DT;#phi RMS (rad);number of chambers", 100,0,rmsAngleRange);
-            hLocalThetaMeanDT=dbe->book1D("hLocalThetaMeanDT","Distribution of MEAN #theta (rad) residuals for DT;<#theta>(rad);number of chambers", 100,-meanAngleRange,meanAngleRange);
-            hLocalThetaRmsDT=dbe->book1D("hLocalThetaRmsDT","Distribution of RMS #theta (rad) residuals for DT;#theta RMS (rad);number of chambers",100,0,rmsAngleRange);
-        }
-	
-        if (doCSC){
-            dbe->setCurrentFolder(topFolder.str()+"/CSC");
-            hLocalPositionCSC=dbe->book2D("hLocalPositionCSC","Local CSC position (cm) absolute MEAN residuals;Sector;;cm",36,1,37,40,0,40);
-            hLocalAngleCSC=dbe->book2D("hLocalAngleCSC","Local CSC angle (rad) absolute MEAN residuals;Sector;;rad", 36,1,37,40,0,40); 
-            hLocalPositionRmsCSC=dbe->book2D("hLocalPositionRmsCSC","Local CSC position (cm) RMS residuals;Sector;;cm", 36,1,37,40,0,40);
-            hLocalAngleRmsCSC=dbe->book2D("hLocalAngleRmsCSC","Local CSC angle (rad) RMS residuals;Sector;;rad", 36,1,37,40,0,40); 
-	
-            hLocalXMeanCSC=dbe->book1D("hLocalXMeanCSC","Distribution of absolute MEAN Local X (cm) residuals for CSC;<X> (cm);number of chambers",100,0,meanPositionRange);
-            hLocalXRmsCSC=dbe->book1D("hLocalXRmsCSC","Distribution of RMS Local X (cm) residuals for CSC;X RMS (cm);number of chambers", 100,0,rmsPositionRange);
-            hLocalYMeanCSC=dbe->book1D("hLocalYMeanCSC","Distribution of absolute MEAN Local Y (cm) residuals for CSC;<Y> (cm);number of chambers", 100,0,meanPositionRange);
-            hLocalYRmsCSC=dbe->book1D("hLocalYRmsCSC","Distribution of RMS Local Y (cm) residuals for CSC;Y RMS (cm);number of chambers", 100,0,rmsPositionRange);
-
-            hLocalPhiMeanCSC=dbe->book1D("hLocalPhiMeanCSC","Distribution of absolute MEAN #phi (rad) residuals for CSC;<#phi>(rad);number of chambers", 100,0,meanAngleRange);
-            hLocalPhiRmsCSC=dbe->book1D("hLocalPhiRmsCSC","Distribution of RMS #phi (rad) residuals for CSC;#phi RMS (rad);number of chambers", 100,0,rmsAngleRange);
-            hLocalThetaMeanCSC=dbe->book1D("hLocalThetaMeanCSC","Distribution of absolute MEAN #theta (rad) residuals for CSC;<#theta>(rad);number of chambers", 100,0,meanAngleRange);
-            hLocalThetaRmsCSC=dbe->book1D("hLocalThetaRmsCSC","Distribution of RMS #theta (rad) residuals for CSC;#theta RMS (rad);number of chambers",100,0,rmsAngleRange);
-        }
-    }
+  meanPositionRange = parameters.getUntrackedParameter<double>("meanPositionRange");
+  rmsPositionRange = parameters.getUntrackedParameter<double>("rmsPositionRange");
+  meanAngleRange = parameters.getUntrackedParameter<double>("meanAngleRange");
+  rmsAngleRange = parameters.getUntrackedParameter<double>("rmsAngleRange");
 
+  nbins = parameters.getUntrackedParameter<unsigned int>("nbins");
+  min1DTrackRecHitSize = parameters.getUntrackedParameter<unsigned int>("min1DTrackRecHitSize");
+  min4DTrackSegmentSize = parameters.getUntrackedParameter<unsigned int>("min4DTrackSegmentSize");
 
-	// Chamber individual histograms
-	// I need to create all of them even if they are empty to allow proper root merging
-
-	// variables for histos ranges	
-	double rangeX=0,rangeY=0;
-	std::string nameOfHistoLocalX,nameOfHistoLocalY,nameOfHistoLocalPhi,nameOfHistoLocalTheta;
-
-	for (int station = -4; station<5; station++){
-
-        //This piece of code calculates the range of the residuals
-        switch(abs(station)) {
-            case 1:
-            {rangeX = resLocalXRangeStation1; rangeY = resLocalYRangeStation1;}
-            break;
-            case 2:
-            {rangeX = resLocalXRangeStation2; rangeY = resLocalYRangeStation2;}
-            break;
-            case 3:
-            {rangeX = resLocalXRangeStation3; rangeY = resLocalYRangeStation3;}
-            break;
-            case 4:
-            {rangeX = resLocalXRangeStation4; rangeY = resLocalYRangeStation4;}
-            break;
-            default:
-                break;
-        }
-        if (doDT){
-            if(station>0){
-					
-                for(int wheel=-2;wheel<3;wheel++){
-			
-                    for (int sector=1;sector<15;sector++){
-				
-                        if(!((sector==13 || sector ==14) && station!=4)){
-					
-			    std::stringstream Wheel; Wheel<<wheel;
-                            std::stringstream Station; Station<<station;
-                            std::stringstream Sector; Sector<<sector;
-										
-                            nameOfHistoLocalX="ResidualLocalX_W"+Wheel.str()+"MB"+Station.str()+"S"+Sector.str();
-                            nameOfHistoLocalPhi= "ResidualLocalPhi_W"+Wheel.str()+"MB"+Station.str()+"S"+Sector.str();
-                            nameOfHistoLocalTheta= "ResidualLocalTheta_W"+Wheel.str()+"MB"+Station.str()+"S"+Sector.str();
-                            nameOfHistoLocalY= "ResidualLocalY_W"+Wheel.str()+"MB"+Station.str()+"S"+Sector.str();
-                                                                               
-                            dbe->setCurrentFolder(topFolder.str()+
-                                                  "/DT/Wheel"+Wheel.str()+
-                                                  "/Station"+Station.str()+
-                                                  "/Sector"+Sector.str());
-
-                            //Create ME and push histos into their respective vectors
-
-                            MonitorElement *histoLocalX = dbe->book1D(nameOfHistoLocalX, nameOfHistoLocalX, nbins, -rangeX, rangeX);
-                            unitsLocalX.push_back(histoLocalX);
-                            MonitorElement *histoLocalPhi = dbe->book1D(nameOfHistoLocalPhi, nameOfHistoLocalPhi, nbins, -resPhiRange, resPhiRange);
-                            unitsLocalPhi.push_back(histoLocalPhi);
-                            MonitorElement *histoLocalTheta = dbe->book1D(nameOfHistoLocalTheta, nameOfHistoLocalTheta, nbins, -resThetaRange, resThetaRange);
-                            unitsLocalTheta.push_back(histoLocalTheta);
-                            MonitorElement *histoLocalY = dbe->book1D(nameOfHistoLocalY, nameOfHistoLocalY, nbins, -rangeY, rangeY);
-                            unitsLocalY.push_back(histoLocalY);
-				    	}
-                    }
-                }
-            } //station>0
-        }// doDT
-	
-        if (doCSC){
-            if(station!=0){
-
-                for(int ring=1;ring<5;ring++){
-
-                    for(int chamber=1;chamber<37;chamber++){
-				
-                        if( !( ((abs(station)==2 || abs(station)==3 || abs(station)==4) && ring==1 && chamber>18) || 
-                               ((abs(station)==2 || abs(station)==3 || abs(station)==4) && ring>2)) ){
-                            std::stringstream Ring; Ring<<ring;
-                            std::stringstream Station; Station<<station;
-                            std::stringstream Chamber; Chamber<<chamber;
-					                                       
-                            nameOfHistoLocalX="ResidualLocalX_ME"+Station.str()+"R"+Ring.str()+"C"+Chamber.str();
-                            nameOfHistoLocalPhi= "ResidualLocalPhi_ME"+Station.str()+"R"+Ring.str()+"C"+Chamber.str();
-                            nameOfHistoLocalTheta= "ResidualLocalTheta_ME"+Station.str()+"R"+Ring.str()+"C"+Chamber.str();
-                            nameOfHistoLocalY= "ResidualLocalY_ME"+Station.str()+"R"+Ring.str()+"C"+Chamber.str();
-                                                                               
-                            dbe->setCurrentFolder(topFolder.str()+
-                                                  "/CSC/Station"+Station.str()+
-                                                  "/Ring"+Ring.str()+
-                                                  "/Chamber"+Chamber.str());
-
-                            //Create ME and push histos into their respective vectors
-
-                            MonitorElement *histoLocalX = dbe->book1D(nameOfHistoLocalX, nameOfHistoLocalX, nbins, -rangeX, rangeX);
-                            unitsLocalX.push_back(histoLocalX);
-                            MonitorElement *histoLocalPhi = dbe->book1D(nameOfHistoLocalPhi, nameOfHistoLocalPhi, nbins, -resPhiRange, resPhiRange);
-                            unitsLocalPhi.push_back(histoLocalPhi);
-                            MonitorElement *histoLocalTheta = dbe->book1D(nameOfHistoLocalTheta, nameOfHistoLocalTheta, nbins, -resThetaRange, resThetaRange);
-                            unitsLocalTheta.push_back(histoLocalTheta);
-                            MonitorElement *histoLocalY = dbe->book1D(nameOfHistoLocalY, nameOfHistoLocalY, nbins, -rangeY, rangeY);
-                            unitsLocalY.push_back(histoLocalY);
-
-                        }
-                    }
-                }
-            } // station!=0
-        }// doCSC
+  doDT = parameters.getUntrackedParameter<bool>("doDT");
+  doCSC = parameters.getUntrackedParameter<bool>("doCSC");
+  doSummary = parameters.getUntrackedParameter<bool>("doSummary");
 
-	} // loop on stations
+  numberOfTracks = 0;
+  numberOfHits = 0;
+
+  MEFolderName = parameters.getParameter<std::string>("FolderName");
+  topFolder << MEFolderName + "/Alignment/Muon";
 }
 
+MuonAlignment::~MuonAlignment() {}
 
-void MuonAlignment::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
-
-    LogTrace(metname)<<"[MuonAlignment] Analysis of event # ";
-  
-    edm::ESHandle<MagneticField> theMGField;
-    iSetup.get<IdealMagneticFieldRecord>().get(theMGField);
-
-    edm::ESHandle<GlobalTrackingGeometry> theTrackingGeometry;
-    iSetup.get<GlobalTrackingGeometryRecord>().get(theTrackingGeometry);
-
-  	edm::ESHandle<Propagator> thePropagatorOpp;
-  	iSetup.get<TrackingComponentsRecord>().get( "SmartPropagatorOpposite", thePropagatorOpp );
-  
-  	edm::ESHandle<Propagator> thePropagatorAlo;
- 	iSetup.get<TrackingComponentsRecord>().get( "SmartPropagator", thePropagatorAlo );
-
-//	edm::ESHandle<Propagator> thePropagator;
-//  	iSetup.get<TrackingComponentsRecord>().get( "SmartPropagatorAnyOpposite", thePropagator );
-
-    // Get the RecoMuons collection from the event
-    edm::Handle<reco::TrackCollection> muons;
-    iEvent.getByToken(theMuonCollectionLabel, muons);
-
-    // Get the 4D DTSegments
-    edm::Handle<DTRecSegment4DCollection> all4DSegmentsDT;
-    iEvent.getByToken(theRecHits4DTagDT, all4DSegmentsDT);
-    DTRecSegment4DCollection::const_iterator segmentDT;
-
-    // Get the 4D CSCSegments
-    edm::Handle<CSCSegmentCollection> all4DSegmentsCSC;
-    iEvent.getByToken(theRecHits4DTagCSC, all4DSegmentsCSC);
-    CSCSegmentCollection::const_iterator segmentCSC;
-  
-    //Vectors used to perform the matching between Segments and hits from Track
-    intDVector indexCollectionDT;
-    intDVector indexCollectionCSC;
-
-	
-//        thePropagator = new SteppingHelixPropagator(&*theMGField, alongMomentum);
-
-    int countTracks   = 0;
-    reco::TrackCollection::const_iterator muon;
-    for (muon = muons->begin(); muon != muons->end(); ++muon){
-//   	if(muon->isGlobalMuon()){
-//   	if(muon->isStandAloneMuon()){
-
-        int countPoints   = 0;
-
-//      reco::TrackRef trackTR = muon->innerTrack();
-//      reco::TrackRef trackSA = muon->outerTrack();
-        //reco::TrackRef trackSA = muon;
-    
-        if(muon->recHitsSize()>(min1DTrackRecHitSize-1)) {
-
-//      reco::TransientTrack tTrackTR( *trackTR, &*theMGField, theTrackingGeometry );
-            reco::TransientTrack tTrackSA(*muon,&*theMGField,theTrackingGeometry); 
-
-            // Adapted code for muonCosmics
-   
-            Double_t  innerPerpSA  = tTrackSA.innermostMeasurementState().globalPosition().perp();
-            Double_t  outerPerpSA  = tTrackSA.outermostMeasurementState().globalPosition().perp();
-     
-            TrajectoryStateOnSurface innerTSOS=tTrackSA.outermostMeasurementState();
-//      PropagationDirection propagationDir=alongMomentum;
-            const Propagator * thePropagator;
-      
-            // Define which kind of reco track is used
-            if ( (outerPerpSA-innerPerpSA) > 0 ) {
-
-                trackRefitterType = "LHCLike";
-                innerTSOS = tTrackSA.innermostMeasurementState();
-                thePropagator = thePropagatorAlo.product();
-//	propagationDir = alongMomentum;
-	  
-            }else {//if ((outerPerpSA-innerPerpSA) < 0 ) {
-	
-                trackRefitterType = "CosmicLike";
-                innerTSOS = tTrackSA.outermostMeasurementState();
-                thePropagator = thePropagatorOpp.product(); 
-//	propagationDir = oppositeToMomentum;
-      
-            }	
-
-            RecHitVector  my4DTrack = this->doMatching(*muon, all4DSegmentsDT, all4DSegmentsCSC, &indexCollectionDT, &indexCollectionCSC, theTrackingGeometry);
-  
-    
-//cut in number of segments
-            if(my4DTrack.size()>(min4DTrackSegmentSize-1) ){
-
-
-// start propagation
-//    TrajectoryStateOnSurface innerTSOS = track.impactPointState();
-//                    TrajectoryStateOnSurface innerTSOS = track.innermostMeasurementState();
-
-                //If the state is valid
-                if(innerTSOS.isValid()) {
-
-                    //Loop over Associated segments
-                    for(RecHitVector::iterator rechit = my4DTrack.begin(); rechit != my4DTrack.end(); ++rechit) {
-	
-                        const GeomDet* geomDet = theTrackingGeometry->idToDet((*rechit)->geographicalId());
-//Otherwise the propagator could throw an exception
-                        const Plane* pDest = dynamic_cast<const Plane*>(&geomDet->surface());
-                        const Cylinder* cDest = dynamic_cast<const Cylinder*>(&geomDet->surface());
-
-                        if(pDest != nullptr || cDest != nullptr) {   
- 
-//			 	    Propagator *updatePropagator=thePropagator->clone();
-//				    updatePropagator->setPropagationDirection(propagationDir);
-                            TrajectoryStateOnSurface destiny = thePropagator->propagate(*(innerTSOS.freeState()), geomDet->surface());
-
-                            if(!destiny.isValid()|| !destiny.hasError()) continue;
-
-                            const long rawId= (*rechit)->geographicalId().rawId();
-                            int position = -1;
-
-                            DetId myDet(rawId);
-                            int det = myDet.subdetId();
-                            int wheel=0,station=0,sector=0;
-                            int endcap=0,ring=0,chamber=0;
-                            bool goAhead = (det==1 && doDT) || (det==2 && doCSC);
-
-                            double residualLocalX=0,residualLocalPhi=0,residualLocalY=0,residualLocalTheta=0;
-
-                            // Fill generic histograms
-                            //If it's a DT
-                            if(det == 1 && doDT) {
-                                DTChamberId myChamber(rawId);
-                                wheel=myChamber.wheel();
-                                station = myChamber.station();
-                                sector=myChamber.sector();
-	      
-                                residualLocalX = (*rechit)->localPosition().x() -destiny.localPosition().x();
-		
-
-                                residualLocalPhi = atan2(((RecSegment *)(*rechit))->localDirection().z(), 
-                                                         ((RecSegment*)(*rechit))->localDirection().x()) - atan2(destiny.localDirection().z(), destiny.localDirection().x());
-                                if(station!=4){
-		
-                                    residualLocalY = (*rechit)->localPosition().y() - destiny.localPosition().y();
-		
-
-                                    residualLocalTheta = atan2(((RecSegment *)(*rechit))->localDirection().z(), 
-                                                               ((RecSegment*)(*rechit))->localDirection().y()) - atan2(destiny.localDirection().z(), destiny.localDirection().y());
-
-                                }
-
-                            } 
-                            else if (det==2 && doCSC){
-                                CSCDetId myChamber(rawId);
-                                endcap= myChamber.endcap();
-                                station = myChamber.station();
-                                if(endcap==2) station = -station;
-                                ring = myChamber.ring();
-                                chamber=myChamber.chamber();
-
-                                residualLocalX = (*rechit)->localPosition().x() -destiny.localPosition().x();
-		
-                                residualLocalY = (*rechit)->localPosition().y() - destiny.localPosition().y();
-		
-                                residualLocalPhi = atan2(((RecSegment *)(*rechit))->localDirection().y(), 
-                                                         ((RecSegment*)(*rechit))->localDirection().x()) - atan2(destiny.localDirection().y(), destiny.localDirection().x());
-
-                                residualLocalTheta = atan2(((RecSegment *)(*rechit))->localDirection().y(), 
-                                                           ((RecSegment*)(*rechit))->localDirection().z()) - atan2(destiny.localDirection().y(), destiny.localDirection().z());
-
-                            }
-                            else{
-                                residualLocalX=0,residualLocalPhi=0,residualLocalY=0,residualLocalTheta=0;
-                            }
-			
-                            // Fill individual chamber histograms
-
-
-                            std::string nameOfHistoLocalX;
-
-	
-                            if(det==1 && doDT){ // DT
-                                std::stringstream Wheel; Wheel<<wheel;
-                                std::stringstream Station; Station<<station;
-                                std::stringstream Sector; Sector<<sector;
-					
-                                nameOfHistoLocalX="ResidualLocalX_W"+Wheel.str()+"MB"+Station.str()+"S"+Sector.str();
- 
-                            }
-                            else if(det==2 && doCSC){ //CSC
-                                std::stringstream Ring; Ring<<ring;
-                                std::stringstream Station; Station<<station;
-                                std::stringstream Chamber; Chamber<<chamber;
-					                                       
-                                nameOfHistoLocalX="ResidualLocalX_ME"+Station.str()+"R"+Ring.str()+"C"+Chamber.str();
-                            }		    
-	    
-                            if (goAhead){
-				    
-                                for(unsigned int i=0 ; i<unitsLocalX.size() ; i++)
-                                {
-
-                                    if( nameOfHistoLocalX==unitsLocalX[i]->getName()){
-                                        position=i; break;}
-                                }
-					    
-  					    
-	                            if(trackRefitterType == "CosmicLike") { //problem with angle convention in reverse extrapolation
-                                    residualLocalPhi += 3.1416;
-                                    residualLocalTheta +=3.1416;
-                                }
-				
-                                unitsLocalX.at(position)->Fill(residualLocalX);
-                                unitsLocalPhi.at(position)->Fill(residualLocalPhi);
-
-                                if(det==1 && station!=4) {unitsLocalY.at(position)->Fill(residualLocalY); 
-                                    unitsLocalTheta.at(position)->Fill(residualLocalTheta);}
- 
-                                else if(det==2) {unitsLocalY.at(position)->Fill(residualLocalY);
-                                    unitsLocalTheta.at(position)->Fill(residualLocalTheta);}
-                                
-	   
-                                countPoints++;
-                                // if at least one point from this track is used, count this track
-                                if (countPoints==1) countTracks++;
-                            }		
-	
-                            innerTSOS = destiny;
-
-                            //delete thePropagator;
-
-                        }else {
-		  	    edm::LogError("MuonAlignment") <<" Error!! Exception in propagator catched" << std::endl;
-                            continue;
-                        }
-
-                    } //loop over my4DTrack
-                } //TSOS was valid
-
-            } // cut in at least 4 segments
-
-        } //end cut in RecHitsSize>36
-        numberOfHits=numberOfHits+countPoints;
-//       } //Muon is GlobalMuon
-    } //loop over Muons
-    numberOfTracks=numberOfTracks+countTracks;
-
-//        delete thePropagator;
-
-//	else edm::LogError("MuonAlignment")<<"Error!! Specified MuonCollection "<< theMuonTrackCollectionLabel <<" is not present in event. ProductNotFound!!"<<std::endl;
-}
+void MuonAlignment::beginJob() {
+  LogTrace(metname) << "[MuonAlignment] Parameters initialization";
+
+  if (!(doDT || doCSC)) {
+    edm::LogError("MuonAlignment") << " Error!! At least one Muon subsystem "
+                                      "(DT or CSC) must be monitorized!!"
+                                   << std::endl;
+    edm::LogError("MuonAlignment") << " Please enable doDT or doCSC to True in your python cfg file!!!" << std::endl;
+    exit(1);
+  }
+
+  dbe = edm::Service<DQMStore>().operator->();
+
+  if (doSummary) {
+    if (doDT) {
+      dbe->setCurrentFolder(topFolder.str() + "/DT");
+      hLocalPositionDT = dbe->book2D(
+          "hLocalPositionDT", "Local DT position (cm) absolute MEAN residuals;Sector;;cm", 14, 1, 15, 40, 0, 40);
+      hLocalAngleDT = dbe->book2D(
+          "hLocalAngleDT", "Local DT angle (rad) absolute MEAN residuals;Sector;;rad", 14, 1, 15, 40, 0, 40);
+      hLocalPositionRmsDT =
+          dbe->book2D("hLocalPositionRmsDT", "Local DT position (cm) RMS residuals;Sector;;cm", 14, 1, 15, 40, 0, 40);
+      hLocalAngleRmsDT =
+          dbe->book2D("hLocalAngleRmsDT", "Local DT angle (rad) RMS residuals;Sector;;rad", 14, 1, 15, 40, 0, 40);
+
+      hLocalXMeanDT = dbe->book1D("hLocalXMeanDT",
+                                  "Distribution of absolute MEAN Local X (cm) residuals "
+                                  "for DT;<X> (cm);number of chambers",
+                                  100,
+                                  0,
+                                  meanPositionRange);
+      hLocalXRmsDT = dbe->book1D("hLocalXRmsDT",
+                                 "Distribution of RMS Local X (cm) residuals "
+                                 "for DT;X RMS (cm);number of chambers",
+                                 100,
+                                 0,
+                                 rmsPositionRange);
+      hLocalYMeanDT = dbe->book1D("hLocalYMeanDT",
+                                  "Distribution of absolute MEAN Local Y (cm) residuals "
+                                  "for DT;<Y> (cm);number of chambers",
+                                  100,
+                                  0,
+                                  meanPositionRange);
+      hLocalYRmsDT = dbe->book1D("hLocalYRmsDT",
+                                 "Distribution of RMS Local Y (cm) residuals "
+                                 "for DT;Y RMS (cm);number of chambers",
+                                 100,
+                                 0,
+                                 rmsPositionRange);
+
+      hLocalPhiMeanDT = dbe->book1D("hLocalPhiMeanDT",
+                                    "Distribution of MEAN #phi (rad) residuals "
+                                    "for DT;<#phi>(rad);number of chambers",
+                                    100,
+                                    -meanAngleRange,
+                                    meanAngleRange);
+      hLocalPhiRmsDT = dbe->book1D("hLocalPhiRmsDT",
+                                   "Distribution of RMS #phi (rad) residuals "
+                                   "for DT;#phi RMS (rad);number of chambers",
+                                   100,
+                                   0,
+                                   rmsAngleRange);
+      hLocalThetaMeanDT = dbe->book1D("hLocalThetaMeanDT",
+                                      "Distribution of MEAN #theta (rad) residuals for "
+                                      "DT;<#theta>(rad);number of chambers",
+                                      100,
+                                      -meanAngleRange,
+                                      meanAngleRange);
+      hLocalThetaRmsDT = dbe->book1D("hLocalThetaRmsDT",
+                                     "Distribution of RMS #theta (rad) residuals for "
+                                     "DT;#theta RMS (rad);number of chambers",
+                                     100,
+                                     0,
+                                     rmsAngleRange);
+    }
 
-RecHitVector MuonAlignment::doMatching(const reco::Track &staTrack, edm::Handle<DTRecSegment4DCollection> &all4DSegmentsDT, edm::Handle<CSCSegmentCollection> &all4DSegmentsCSC, intDVector *indexCollectionDT, intDVector *indexCollectionCSC, edm::ESHandle<GlobalTrackingGeometry> &theTrackingGeometry) {
-
-    DTRecSegment4DCollection::const_iterator segmentDT;
-    CSCSegmentCollection::const_iterator segmentCSC;
-  
-    std::vector<int> positionDT;
-    std::vector<int> positionCSC;
-    RecHitVector my4DTrack;
-  
-    //Loop over the hits of the track
-    for(unsigned int counter = 0; counter != staTrack.recHitsSize()-1; counter++) {
-    
-        TrackingRecHitRef myRef = staTrack.recHit(counter);
-        const TrackingRecHit *rechit = myRef.get();
-        const GeomDet* geomDet = theTrackingGeometry->idToDet(rechit->geographicalId());
-    
-        //It's a DT Hit
-        if(geomDet->subDetector() == GeomDetEnumerators::DT) {
-      
-            //Take the layer associated to this hit
-            DTLayerId myLayer(rechit->geographicalId().rawId());
-      
-            int NumberOfDTSegment = 0;
-            //Loop over segments
-            for(segmentDT = all4DSegmentsDT->begin(); segmentDT != all4DSegmentsDT->end(); ++segmentDT) {
-	
-                //By default the chamber associated to this Segment is new
-                bool isNewChamber = true;
-	
-                //Loop over segments already included in the vector of segments in the actual track
-                for(std::vector<int>::iterator positionIt = positionDT.begin(); positionIt != positionDT.end(); positionIt++) {
-	  
-                    //If this segment has been used before isNewChamber = false
-                    if(NumberOfDTSegment == *positionIt) isNewChamber = false;
-                }
-	
-                //Loop over vectors of segments associated to previous tracks
-                for(std::vector<std::vector<int> >::iterator collect = indexCollectionDT->begin(); collect != indexCollectionDT->end(); ++collect) {
-	  
-                    //Loop over segments associated to a track
-                    for(std::vector<int>::iterator positionIt = (*collect).begin(); positionIt != (*collect).end(); positionIt++) {
-	    
-                        //If this segment was used in a previos track then isNewChamber = false
-                        if(NumberOfDTSegment == *positionIt) isNewChamber = false;
-                    }
-                }
-	
-                //If the chamber is new
-                if(isNewChamber) {
-	  
-                    DTChamberId myChamber((*segmentDT).geographicalId().rawId());
-                    //If the layer of the hit belongs to the chamber of the 4D Segment
-                    if(myLayer.wheel() == myChamber.wheel() && myLayer.station() == myChamber.station() && myLayer.sector() == myChamber.sector()) {
-	    
-                        //push position of the segment and tracking rechit
-                        positionDT.push_back(NumberOfDTSegment);
-                        my4DTrack.push_back((TrackingRecHit *) &(*segmentDT));
-                    }
-                }
-                NumberOfDTSegment++;
+    if (doCSC) {
+      dbe->setCurrentFolder(topFolder.str() + "/CSC");
+      hLocalPositionCSC = dbe->book2D(
+          "hLocalPositionCSC", "Local CSC position (cm) absolute MEAN residuals;Sector;;cm", 36, 1, 37, 40, 0, 40);
+      hLocalAngleCSC = dbe->book2D(
+          "hLocalAngleCSC", "Local CSC angle (rad) absolute MEAN residuals;Sector;;rad", 36, 1, 37, 40, 0, 40);
+      hLocalPositionRmsCSC =
+          dbe->book2D("hLocalPositionRmsCSC", "Local CSC position (cm) RMS residuals;Sector;;cm", 36, 1, 37, 40, 0, 40);
+      hLocalAngleRmsCSC =
+          dbe->book2D("hLocalAngleRmsCSC", "Local CSC angle (rad) RMS residuals;Sector;;rad", 36, 1, 37, 40, 0, 40);
+
+      hLocalXMeanCSC = dbe->book1D("hLocalXMeanCSC",
+                                   "Distribution of absolute MEAN Local X (cm) residuals "
+                                   "for CSC;<X> (cm);number of chambers",
+                                   100,
+                                   0,
+                                   meanPositionRange);
+      hLocalXRmsCSC = dbe->book1D("hLocalXRmsCSC",
+                                  "Distribution of RMS Local X (cm) residuals "
+                                  "for CSC;X RMS (cm);number of chambers",
+                                  100,
+                                  0,
+                                  rmsPositionRange);
+      hLocalYMeanCSC = dbe->book1D("hLocalYMeanCSC",
+                                   "Distribution of absolute MEAN Local Y (cm) residuals "
+                                   "for CSC;<Y> (cm);number of chambers",
+                                   100,
+                                   0,
+                                   meanPositionRange);
+      hLocalYRmsCSC = dbe->book1D("hLocalYRmsCSC",
+                                  "Distribution of RMS Local Y (cm) residuals "
+                                  "for CSC;Y RMS (cm);number of chambers",
+                                  100,
+                                  0,
+                                  rmsPositionRange);
+
+      hLocalPhiMeanCSC = dbe->book1D("hLocalPhiMeanCSC",
+                                     "Distribution of absolute MEAN #phi (rad) residuals for "
+                                     "CSC;<#phi>(rad);number of chambers",
+                                     100,
+                                     0,
+                                     meanAngleRange);
+      hLocalPhiRmsCSC = dbe->book1D("hLocalPhiRmsCSC",
+                                    "Distribution of RMS #phi (rad) residuals "
+                                    "for CSC;#phi RMS (rad);number of chambers",
+                                    100,
+                                    0,
+                                    rmsAngleRange);
+      hLocalThetaMeanCSC = dbe->book1D("hLocalThetaMeanCSC",
+                                       "Distribution of absolute MEAN #theta (rad) residuals "
+                                       "for CSC;<#theta>(rad);number of chambers",
+                                       100,
+                                       0,
+                                       meanAngleRange);
+      hLocalThetaRmsCSC = dbe->book1D("hLocalThetaRmsCSC",
+                                      "Distribution of RMS #theta (rad) residuals for "
+                                      "CSC;#theta RMS (rad);number of chambers",
+                                      100,
+                                      0,
+                                      rmsAngleRange);
+    }
+  }
+
+  // Chamber individual histograms
+  // I need to create all of them even if they are empty to allow proper root
+  // merging
+
+  // variables for histos ranges
+  double rangeX = 0, rangeY = 0;
+  std::string nameOfHistoLocalX, nameOfHistoLocalY, nameOfHistoLocalPhi, nameOfHistoLocalTheta;
+
+  for (int station = -4; station < 5; station++) {
+    // This piece of code calculates the range of the residuals
+    switch (abs(station)) {
+      case 1: {
+        rangeX = resLocalXRangeStation1;
+        rangeY = resLocalYRangeStation1;
+      } break;
+      case 2: {
+        rangeX = resLocalXRangeStation2;
+        rangeY = resLocalYRangeStation2;
+      } break;
+      case 3: {
+        rangeX = resLocalXRangeStation3;
+        rangeY = resLocalYRangeStation3;
+      } break;
+      case 4: {
+        rangeX = resLocalXRangeStation4;
+        rangeY = resLocalYRangeStation4;
+      } break;
+      default:
+        break;
+    }
+    if (doDT) {
+      if (station > 0) {
+        for (int wheel = -2; wheel < 3; wheel++) {
+          for (int sector = 1; sector < 15; sector++) {
+            if (!((sector == 13 || sector == 14) && station != 4)) {
+              std::stringstream Wheel;
+              Wheel << wheel;
+              std::stringstream Station;
+              Station << station;
+              std::stringstream Sector;
+              Sector << sector;
+
+              nameOfHistoLocalX = "ResidualLocalX_W" + Wheel.str() + "MB" + Station.str() + "S" + Sector.str();
+              nameOfHistoLocalPhi = "ResidualLocalPhi_W" + Wheel.str() + "MB" + Station.str() + "S" + Sector.str();
+              nameOfHistoLocalTheta = "ResidualLocalTheta_W" + Wheel.str() + "MB" + Station.str() + "S" + Sector.str();
+              nameOfHistoLocalY = "ResidualLocalY_W" + Wheel.str() + "MB" + Station.str() + "S" + Sector.str();
+
+              dbe->setCurrentFolder(topFolder.str() + "/DT/Wheel" + Wheel.str() + "/Station" + Station.str() +
+                                    "/Sector" + Sector.str());
+
+              // Create ME and push histos into their respective vectors
+
+              MonitorElement *histoLocalX = dbe->book1D(nameOfHistoLocalX, nameOfHistoLocalX, nbins, -rangeX, rangeX);
+              unitsLocalX.push_back(histoLocalX);
+              MonitorElement *histoLocalPhi =
+                  dbe->book1D(nameOfHistoLocalPhi, nameOfHistoLocalPhi, nbins, -resPhiRange, resPhiRange);
+              unitsLocalPhi.push_back(histoLocalPhi);
+              MonitorElement *histoLocalTheta =
+                  dbe->book1D(nameOfHistoLocalTheta, nameOfHistoLocalTheta, nbins, -resThetaRange, resThetaRange);
+              unitsLocalTheta.push_back(histoLocalTheta);
+              MonitorElement *histoLocalY = dbe->book1D(nameOfHistoLocalY, nameOfHistoLocalY, nbins, -rangeY, rangeY);
+              unitsLocalY.push_back(histoLocalY);
             }
-            //In case is a CSC
-        } else if (geomDet->subDetector() == GeomDetEnumerators::CSC) {
-      
-            //Take the layer associated to this hit
-            CSCDetId myLayer(rechit->geographicalId().rawId());
-      
-            int NumberOfCSCSegment = 0;
-            //Loop over 4Dsegments
-            for(segmentCSC = all4DSegmentsCSC->begin(); segmentCSC != all4DSegmentsCSC->end(); segmentCSC++) {
-	
-                //By default the chamber associated to the segment is new
-                bool isNewChamber = true;
-	
-                //Loop over segments in the current track
-                for(std::vector<int>::iterator positionIt = positionCSC.begin(); positionIt != positionCSC.end(); positionIt++) {
-	  
-                    //If this segment has been used then newchamber = false
-                    if(NumberOfCSCSegment == *positionIt) isNewChamber = false;
-                }
-                //Loop over vectors of segments in previous tracks
-                for(std::vector<std::vector<int> >::iterator collect = indexCollectionCSC->begin(); collect != indexCollectionCSC->end(); ++collect) {
-	  
-                    //Loop over segments in a track
-                    for(std::vector<int>::iterator positionIt = (*collect).begin(); positionIt != (*collect).end(); positionIt++) {
-	    
-                        //If the segment was used in a previous track isNewChamber = false
-                        if(NumberOfCSCSegment == *positionIt) isNewChamber = false;
-                    }
-                }
-                //If the chamber is new
-                if(isNewChamber) {
-	  
-                    CSCDetId myChamber((*segmentCSC).geographicalId().rawId());
-                    //If the chambers are the same
-                    if(myLayer.chamberId() == myChamber.chamberId()) {
-                        //push
-                        positionCSC.push_back(NumberOfCSCSegment);
-                        my4DTrack.push_back((TrackingRecHit *) &(*segmentCSC));
-                    }
-                }
-                NumberOfCSCSegment++;
+          }
+        }
+      }  // station>0
+    }    // doDT
+
+    if (doCSC) {
+      if (station != 0) {
+        for (int ring = 1; ring < 5; ring++) {
+          for (int chamber = 1; chamber < 37; chamber++) {
+            if (!(((abs(station) == 2 || abs(station) == 3 || abs(station) == 4) && ring == 1 && chamber > 18) ||
+                  ((abs(station) == 2 || abs(station) == 3 || abs(station) == 4) && ring > 2))) {
+              std::stringstream Ring;
+              Ring << ring;
+              std::stringstream Station;
+              Station << station;
+              std::stringstream Chamber;
+              Chamber << chamber;
+
+              nameOfHistoLocalX = "ResidualLocalX_ME" + Station.str() + "R" + Ring.str() + "C" + Chamber.str();
+              nameOfHistoLocalPhi = "ResidualLocalPhi_ME" + Station.str() + "R" + Ring.str() + "C" + Chamber.str();
+              nameOfHistoLocalTheta = "ResidualLocalTheta_ME" + Station.str() + "R" + Ring.str() + "C" + Chamber.str();
+              nameOfHistoLocalY = "ResidualLocalY_ME" + Station.str() + "R" + Ring.str() + "C" + Chamber.str();
+
+              dbe->setCurrentFolder(topFolder.str() + "/CSC/Station" + Station.str() + "/Ring" + Ring.str() +
+                                    "/Chamber" + Chamber.str());
+
+              // Create ME and push histos into their respective vectors
+
+              MonitorElement *histoLocalX = dbe->book1D(nameOfHistoLocalX, nameOfHistoLocalX, nbins, -rangeX, rangeX);
+              unitsLocalX.push_back(histoLocalX);
+              MonitorElement *histoLocalPhi =
+                  dbe->book1D(nameOfHistoLocalPhi, nameOfHistoLocalPhi, nbins, -resPhiRange, resPhiRange);
+              unitsLocalPhi.push_back(histoLocalPhi);
+              MonitorElement *histoLocalTheta =
+                  dbe->book1D(nameOfHistoLocalTheta, nameOfHistoLocalTheta, nbins, -resThetaRange, resThetaRange);
+              unitsLocalTheta.push_back(histoLocalTheta);
+              MonitorElement *histoLocalY = dbe->book1D(nameOfHistoLocalY, nameOfHistoLocalY, nbins, -rangeY, rangeY);
+              unitsLocalY.push_back(histoLocalY);
             }
+          }
         }
-    }
-  
-    indexCollectionDT->push_back(positionDT);
-    indexCollectionCSC->push_back(positionCSC);
-  
-    if ( trackRefitterType == "CosmicLike") {
-
-        std::reverse(my4DTrack.begin(),my4DTrack.end());
-
-    }
-    return my4DTrack;
-
+      }  // station!=0
+    }    // doCSC
 
+  }  // loop on stations
 }
 
+void MuonAlignment::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  LogTrace(metname) << "[MuonAlignment] Analysis of event # ";
+
+  edm::ESHandle<MagneticField> theMGField;
+  iSetup.get<IdealMagneticFieldRecord>().get(theMGField);
 
+  edm::ESHandle<GlobalTrackingGeometry> theTrackingGeometry;
+  iSetup.get<GlobalTrackingGeometryRecord>().get(theTrackingGeometry);
 
-void MuonAlignment::endJob(void) {
-
-
-    LogTrace(metname)<<"[MuonAlignment] Saving the histos";
-    bool outputMEsInRootFile = parameters.getParameter<bool>("OutputMEsInRootFile");
-    std::string outputFileName = parameters.getParameter<std::string>("OutputFileName");
-
-    edm::LogInfo("MuonAlignment")  << "Number of Tracks considered for residuals: " << numberOfTracks << std::endl << std::endl;
-    edm::LogInfo("MuonAlignment")  << "Number of Hits considered for residuals: " << numberOfHits << std::endl << std::endl;
-
-    if (doSummary){
-        char binLabel[15];
-
-	// check if ME still there (and not killed by MEtoEDM for memory saving)
-	if( dbe )
-	  {
-	    // check existence of first histo in the list
-	    if (! dbe->get(topFolder.str()+"/DT/hLocalPositionDT")) return;
-	  }
-	else 
-	  return;
-	
-
-        for(unsigned int i=0 ; i<unitsLocalX.size() ; i++)
-        {
-
-            if(unitsLocalX[i]->getEntries()!=0){
+  edm::ESHandle<Propagator> thePropagatorOpp;
+  iSetup.get<TrackingComponentsRecord>().get("SmartPropagatorOpposite", thePropagatorOpp);
 
-                TString nameHistoLocalX=unitsLocalX[i]->getName();
+  edm::ESHandle<Propagator> thePropagatorAlo;
+  iSetup.get<TrackingComponentsRecord>().get("SmartPropagator", thePropagatorAlo);
+
+  //	edm::ESHandle<Propagator> thePropagator;
+  //  	iSetup.get<TrackingComponentsRecord>().get(
+  //  "SmartPropagatorAnyOpposite", thePropagator );
+
+  // Get the RecoMuons collection from the event
+  edm::Handle<reco::TrackCollection> muons;
+  iEvent.getByToken(theMuonCollectionLabel, muons);
+
+  // Get the 4D DTSegments
+  edm::Handle<DTRecSegment4DCollection> all4DSegmentsDT;
+  iEvent.getByToken(theRecHits4DTagDT, all4DSegmentsDT);
+  DTRecSegment4DCollection::const_iterator segmentDT;
+
+  // Get the 4D CSCSegments
+  edm::Handle<CSCSegmentCollection> all4DSegmentsCSC;
+  iEvent.getByToken(theRecHits4DTagCSC, all4DSegmentsCSC);
+  CSCSegmentCollection::const_iterator segmentCSC;
+
+  // Vectors used to perform the matching between Segments and hits from Track
+  intDVector indexCollectionDT;
+  intDVector indexCollectionCSC;
+
+  //        thePropagator = new SteppingHelixPropagator(&*theMGField,
+  //        alongMomentum);
+
+  int countTracks = 0;
+  reco::TrackCollection::const_iterator muon;
+  for (muon = muons->begin(); muon != muons->end(); ++muon) {
+    //   	if(muon->isGlobalMuon()){
+    //   	if(muon->isStandAloneMuon()){
+
+    int countPoints = 0;
+
+    //      reco::TrackRef trackTR = muon->innerTrack();
+    //      reco::TrackRef trackSA = muon->outerTrack();
+    // reco::TrackRef trackSA = muon;
+
+    if (muon->recHitsSize() > (min1DTrackRecHitSize - 1)) {
+      //      reco::TransientTrack tTrackTR( *trackTR, &*theMGField,
+      //      theTrackingGeometry );
+      reco::TransientTrack tTrackSA(*muon, &*theMGField, theTrackingGeometry);
+
+      // Adapted code for muonCosmics
+
+      Double_t innerPerpSA = tTrackSA.innermostMeasurementState().globalPosition().perp();
+      Double_t outerPerpSA = tTrackSA.outermostMeasurementState().globalPosition().perp();
+
+      TrajectoryStateOnSurface innerTSOS = tTrackSA.outermostMeasurementState();
+      //      PropagationDirection propagationDir=alongMomentum;
+      const Propagator *thePropagator;
+
+      // Define which kind of reco track is used
+      if ((outerPerpSA - innerPerpSA) > 0) {
+        trackRefitterType = "LHCLike";
+        innerTSOS = tTrackSA.innermostMeasurementState();
+        thePropagator = thePropagatorAlo.product();
+        //	propagationDir = alongMomentum;
+
+      } else {  // if ((outerPerpSA-innerPerpSA) < 0 ) {
+
+        trackRefitterType = "CosmicLike";
+        innerTSOS = tTrackSA.outermostMeasurementState();
+        thePropagator = thePropagatorOpp.product();
+        //	propagationDir = oppositeToMomentum;
+      }
+
+      RecHitVector my4DTrack = this->doMatching(
+          *muon, all4DSegmentsDT, all4DSegmentsCSC, &indexCollectionDT, &indexCollectionCSC, theTrackingGeometry);
+
+      // cut in number of segments
+      if (my4DTrack.size() > (min4DTrackSegmentSize - 1)) {
+        // start propagation
+        //    TrajectoryStateOnSurface innerTSOS = track.impactPointState();
+        //                    TrajectoryStateOnSurface innerTSOS =
+        //                    track.innermostMeasurementState();
+
+        // If the state is valid
+        if (innerTSOS.isValid()) {
+          // Loop over Associated segments
+          for (RecHitVector::iterator rechit = my4DTrack.begin(); rechit != my4DTrack.end(); ++rechit) {
+            const GeomDet *geomDet = theTrackingGeometry->idToDet((*rechit)->geographicalId());
+            // Otherwise the propagator could throw an exception
+            const Plane *pDest = dynamic_cast<const Plane *>(&geomDet->surface());
+            const Cylinder *cDest = dynamic_cast<const Cylinder *>(&geomDet->surface());
+
+            if (pDest != nullptr || cDest != nullptr) {
+              //			 	    Propagator
+              //*updatePropagator=thePropagator->clone();
+              //				    updatePropagator->setPropagationDirection(propagationDir);
+              TrajectoryStateOnSurface destiny = thePropagator->propagate(*(innerTSOS.freeState()), geomDet->surface());
+
+              if (!destiny.isValid() || !destiny.hasError())
+                continue;
+
+              const long rawId = (*rechit)->geographicalId().rawId();
+              int position = -1;
+
+              DetId myDet(rawId);
+              int det = myDet.subdetId();
+              int wheel = 0, station = 0, sector = 0;
+              int endcap = 0, ring = 0, chamber = 0;
+              bool goAhead = (det == 1 && doDT) || (det == 2 && doCSC);
+
+              double residualLocalX = 0, residualLocalPhi = 0, residualLocalY = 0, residualLocalTheta = 0;
+
+              // Fill generic histograms
+              // If it's a DT
+              if (det == 1 && doDT) {
+                DTChamberId myChamber(rawId);
+                wheel = myChamber.wheel();
+                station = myChamber.station();
+                sector = myChamber.sector();
+
+                residualLocalX = (*rechit)->localPosition().x() - destiny.localPosition().x();
+
+                residualLocalPhi = atan2(((RecSegment *)(*rechit))->localDirection().z(),
+                                         ((RecSegment *)(*rechit))->localDirection().x()) -
+                                   atan2(destiny.localDirection().z(), destiny.localDirection().x());
+                if (station != 4) {
+                  residualLocalY = (*rechit)->localPosition().y() - destiny.localPosition().y();
+
+                  residualLocalTheta = atan2(((RecSegment *)(*rechit))->localDirection().z(),
+                                             ((RecSegment *)(*rechit))->localDirection().y()) -
+                                       atan2(destiny.localDirection().z(), destiny.localDirection().y());
+                }
 
-                TString nameHistoLocalPhi=unitsLocalPhi[i]->getName();
+              } else if (det == 2 && doCSC) {
+                CSCDetId myChamber(rawId);
+                endcap = myChamber.endcap();
+                station = myChamber.station();
+                if (endcap == 2)
+                  station = -station;
+                ring = myChamber.ring();
+                chamber = myChamber.chamber();
+
+                residualLocalX = (*rechit)->localPosition().x() - destiny.localPosition().x();
+
+                residualLocalY = (*rechit)->localPosition().y() - destiny.localPosition().y();
+
+                residualLocalPhi = atan2(((RecSegment *)(*rechit))->localDirection().y(),
+                                         ((RecSegment *)(*rechit))->localDirection().x()) -
+                                   atan2(destiny.localDirection().y(), destiny.localDirection().x());
+
+                residualLocalTheta = atan2(((RecSegment *)(*rechit))->localDirection().y(),
+                                           ((RecSegment *)(*rechit))->localDirection().z()) -
+                                     atan2(destiny.localDirection().y(), destiny.localDirection().z());
+
+              } else {
+                residualLocalX = 0, residualLocalPhi = 0, residualLocalY = 0, residualLocalTheta = 0;
+              }
+
+              // Fill individual chamber histograms
+
+              std::string nameOfHistoLocalX;
+
+              if (det == 1 && doDT) {  // DT
+                std::stringstream Wheel;
+                Wheel << wheel;
+                std::stringstream Station;
+                Station << station;
+                std::stringstream Sector;
+                Sector << sector;
+
+                nameOfHistoLocalX = "ResidualLocalX_W" + Wheel.str() + "MB" + Station.str() + "S" + Sector.str();
+
+              } else if (det == 2 && doCSC) {  // CSC
+                std::stringstream Ring;
+                Ring << ring;
+                std::stringstream Station;
+                Station << station;
+                std::stringstream Chamber;
+                Chamber << chamber;
+
+                nameOfHistoLocalX = "ResidualLocalX_ME" + Station.str() + "R" + Ring.str() + "C" + Chamber.str();
+              }
+
+              if (goAhead) {
+                for (unsigned int i = 0; i < unitsLocalX.size(); i++) {
+                  if (nameOfHistoLocalX == unitsLocalX[i]->getName()) {
+                    position = i;
+                    break;
+                  }
+                }
 
-                TString nameHistoLocalTheta=unitsLocalTheta[i]->getName();
+                if (trackRefitterType == "CosmicLike") {  // problem with angle convention in reverse
+                                                          // extrapolation
+                  residualLocalPhi += 3.1416;
+                  residualLocalTheta += 3.1416;
+                }
 
-                TString nameHistoLocalY=unitsLocalY[i]->getName();
+                unitsLocalX.at(position)->Fill(residualLocalX);
+                unitsLocalPhi.at(position)->Fill(residualLocalPhi);
 
+                if (det == 1 && station != 4) {
+                  unitsLocalY.at(position)->Fill(residualLocalY);
+                  unitsLocalTheta.at(position)->Fill(residualLocalTheta);
+                }
 
-                if (nameHistoLocalX.Contains("MB") ) // HistoLocalX DT
-                {
-                    int wheel, station, sector;
+                else if (det == 2) {
+                  unitsLocalY.at(position)->Fill(residualLocalY);
+                  unitsLocalTheta.at(position)->Fill(residualLocalTheta);
+                }
 
-                    sscanf(nameHistoLocalX, "ResidualLocalX_W%dMB%1dS%d",&wheel,&station,&sector);
+                countPoints++;
+                // if at least one point from this track is used, count this
+                // track
+                if (countPoints == 1)
+                  countTracks++;
+              }
 
-                    Int_t nstation=station - 1;
-                    Int_t nwheel=wheel+2;
+              innerTSOS = destiny;
 
-                    Double_t Mean=unitsLocalX[i]->getMean();
-                    Double_t Error=unitsLocalX[i]->getMeanError();
+              // delete thePropagator;
 
-                    Int_t ybin=1+nwheel*8+nstation*2;
-                    hLocalPositionDT->setBinContent(sector,ybin,fabs(Mean));
-                    snprintf(binLabel, sizeof(binLabel), "MB%d/%d_X",wheel, station );
-                    hLocalPositionDT->setBinLabel(ybin,binLabel,2);
-                    hLocalPositionRmsDT->setBinContent(sector,ybin,Error);
-                    hLocalPositionRmsDT->setBinLabel(ybin,binLabel,2);
-		
-                    hLocalXMeanDT->Fill(fabs(Mean));
-                    hLocalXRmsDT->Fill(Error);
-                }
+            } else {
+              edm::LogError("MuonAlignment") << " Error!! Exception in propagator catched" << std::endl;
+              continue;
+            }
 
-                if (nameHistoLocalX.Contains("ME")) // HistoLocalX CSC
-                {
-                    int station, ring, chamber;
+          }  // loop over my4DTrack
+        }    // TSOS was valid
 
-                    sscanf(nameHistoLocalX, "ResidualLocalX_ME%dR%1dC%d",&station,&ring,&chamber);
+      }  // cut in at least 4 segments
 
-                    Double_t Mean=unitsLocalX[i]->getMean();
-                    Double_t Error=unitsLocalX[i]->getMeanError();
+    }  // end cut in RecHitsSize>36
+    numberOfHits = numberOfHits + countPoints;
+    //       } //Muon is GlobalMuon
+  }  // loop over Muons
+  numberOfTracks = numberOfTracks + countTracks;
 
-                    Int_t ybin=abs(station)*2+ring;
-                    if(abs(station)==1) ybin=ring;
-                    if (station>0) ybin=ybin+10;
-                    else ybin = 11 -ybin;
-                    ybin=2*ybin-1;
-                    hLocalPositionCSC->setBinContent(chamber,ybin,fabs(Mean));
-                    snprintf(binLabel, sizeof(binLabel), "ME%d/%d_X", station,ring );
-                    hLocalPositionCSC->setBinLabel(ybin,binLabel,2);
-                    hLocalPositionRmsCSC->setBinContent(chamber,ybin,Error);
-                    hLocalPositionRmsCSC->setBinLabel(ybin,binLabel,2);
+  //        delete thePropagator;
 
-                    hLocalXMeanCSC->Fill(fabs(Mean));
-                    hLocalXRmsCSC->Fill(Error);
-                }
+  //	else edm::LogError("MuonAlignment")<<"Error!! Specified MuonCollection
+  //"<< theMuonTrackCollectionLabel <<" is not present in event.
+  // ProductNotFound!!"<<std::endl;
+}
 
-                if (nameHistoLocalTheta.Contains("MB")) // HistoLocalTheta DT
-                {	
+RecHitVector MuonAlignment::doMatching(const reco::Track &staTrack,
+                                       edm::Handle<DTRecSegment4DCollection> &all4DSegmentsDT,
+                                       edm::Handle<CSCSegmentCollection> &all4DSegmentsCSC,
+                                       intDVector *indexCollectionDT,
+                                       intDVector *indexCollectionCSC,
+                                       edm::ESHandle<GlobalTrackingGeometry> &theTrackingGeometry) {
+  DTRecSegment4DCollection::const_iterator segmentDT;
+  CSCSegmentCollection::const_iterator segmentCSC;
+
+  std::vector<int> positionDT;
+  std::vector<int> positionCSC;
+  RecHitVector my4DTrack;
+
+  // Loop over the hits of the track
+  for (unsigned int counter = 0; counter != staTrack.recHitsSize() - 1; counter++) {
+    TrackingRecHitRef myRef = staTrack.recHit(counter);
+    const TrackingRecHit *rechit = myRef.get();
+    const GeomDet *geomDet = theTrackingGeometry->idToDet(rechit->geographicalId());
+
+    // It's a DT Hit
+    if (geomDet->subDetector() == GeomDetEnumerators::DT) {
+      // Take the layer associated to this hit
+      DTLayerId myLayer(rechit->geographicalId().rawId());
+
+      int NumberOfDTSegment = 0;
+      // Loop over segments
+      for (segmentDT = all4DSegmentsDT->begin(); segmentDT != all4DSegmentsDT->end(); ++segmentDT) {
+        // By default the chamber associated to this Segment is new
+        bool isNewChamber = true;
+
+        // Loop over segments already included in the vector of segments in the
+        // actual track
+        for (std::vector<int>::iterator positionIt = positionDT.begin(); positionIt != positionDT.end(); positionIt++) {
+          // If this segment has been used before isNewChamber = false
+          if (NumberOfDTSegment == *positionIt)
+            isNewChamber = false;
+        }
 
-                    int wheel, station, sector;
+        // Loop over vectors of segments associated to previous tracks
+        for (std::vector<std::vector<int>>::iterator collect = indexCollectionDT->begin();
+             collect != indexCollectionDT->end();
+             ++collect) {
+          // Loop over segments associated to a track
+          for (std::vector<int>::iterator positionIt = (*collect).begin(); positionIt != (*collect).end();
+               positionIt++) {
+            // If this segment was used in a previos track then isNewChamber =
+            // false
+            if (NumberOfDTSegment == *positionIt)
+              isNewChamber = false;
+          }
+        }
 
-                    sscanf(nameHistoLocalTheta, "ResidualLocalTheta_W%dMB%1dS%d",&wheel,&station,&sector);
+        // If the chamber is new
+        if (isNewChamber) {
+          DTChamberId myChamber((*segmentDT).geographicalId().rawId());
+          // If the layer of the hit belongs to the chamber of the 4D Segment
+          if (myLayer.wheel() == myChamber.wheel() && myLayer.station() == myChamber.station() &&
+              myLayer.sector() == myChamber.sector()) {
+            // push position of the segment and tracking rechit
+            positionDT.push_back(NumberOfDTSegment);
+            my4DTrack.push_back((TrackingRecHit *)&(*segmentDT));
+          }
+        }
+        NumberOfDTSegment++;
+      }
+      // In case is a CSC
+    } else if (geomDet->subDetector() == GeomDetEnumerators::CSC) {
+      // Take the layer associated to this hit
+      CSCDetId myLayer(rechit->geographicalId().rawId());
+
+      int NumberOfCSCSegment = 0;
+      // Loop over 4Dsegments
+      for (segmentCSC = all4DSegmentsCSC->begin(); segmentCSC != all4DSegmentsCSC->end(); segmentCSC++) {
+        // By default the chamber associated to the segment is new
+        bool isNewChamber = true;
+
+        // Loop over segments in the current track
+        for (std::vector<int>::iterator positionIt = positionCSC.begin(); positionIt != positionCSC.end();
+             positionIt++) {
+          // If this segment has been used then newchamber = false
+          if (NumberOfCSCSegment == *positionIt)
+            isNewChamber = false;
+        }
+        // Loop over vectors of segments in previous tracks
+        for (std::vector<std::vector<int>>::iterator collect = indexCollectionCSC->begin();
+             collect != indexCollectionCSC->end();
+             ++collect) {
+          // Loop over segments in a track
+          for (std::vector<int>::iterator positionIt = (*collect).begin(); positionIt != (*collect).end();
+               positionIt++) {
+            // If the segment was used in a previous track isNewChamber = false
+            if (NumberOfCSCSegment == *positionIt)
+              isNewChamber = false;
+          }
+        }
+        // If the chamber is new
+        if (isNewChamber) {
+          CSCDetId myChamber((*segmentCSC).geographicalId().rawId());
+          // If the chambers are the same
+          if (myLayer.chamberId() == myChamber.chamberId()) {
+            // push
+            positionCSC.push_back(NumberOfCSCSegment);
+            my4DTrack.push_back((TrackingRecHit *)&(*segmentCSC));
+          }
+        }
+        NumberOfCSCSegment++;
+      }
+    }
+  }
 
-                    if(station != 4){
-                        Int_t nstation=station - 1;
-                        Int_t nwheel=wheel+2;
+  indexCollectionDT->push_back(positionDT);
+  indexCollectionCSC->push_back(positionCSC);
 
-                        Double_t Mean=unitsLocalTheta[i]->getMean();
-                        Double_t Error=unitsLocalTheta[i]->getMeanError();
+  if (trackRefitterType == "CosmicLike") {
+    std::reverse(my4DTrack.begin(), my4DTrack.end());
+  }
+  return my4DTrack;
+}
 
-                        Int_t ybin=2+nwheel*8+nstation*2;
-                        hLocalAngleDT->setBinContent(sector,ybin,fabs(Mean));
-                        snprintf(binLabel, sizeof(binLabel), "MB%d/%d_#theta",wheel,station );
-                        hLocalAngleDT->setBinLabel(ybin,binLabel,2);
-                        hLocalAngleRmsDT->setBinContent(sector,ybin,Error);
-                        hLocalAngleRmsDT->setBinLabel(ybin,binLabel,2);
-	
-                        hLocalThetaMeanDT->Fill(fabs(Mean));
-                        hLocalThetaRmsDT->Fill(Error);
-                    }
-                }
+void MuonAlignment::endJob(void) {
+  LogTrace(metname) << "[MuonAlignment] Saving the histos";
+  bool outputMEsInRootFile = parameters.getParameter<bool>("OutputMEsInRootFile");
+  std::string outputFileName = parameters.getParameter<std::string>("OutputFileName");
 
-                if (nameHistoLocalPhi.Contains("MB")) // HistoLocalPhi DT
-                {	
+  edm::LogInfo("MuonAlignment") << "Number of Tracks considered for residuals: " << numberOfTracks << std::endl
+                                << std::endl;
+  edm::LogInfo("MuonAlignment") << "Number of Hits considered for residuals: " << numberOfHits << std::endl
+                                << std::endl;
 
-                    int wheel, station, sector;
+  if (doSummary) {
+    char binLabel[15];
 
-                    sscanf(nameHistoLocalPhi, "ResidualLocalPhi_W%dMB%1dS%d",&wheel,&station,&sector);
+    // check if ME still there (and not killed by MEtoEDM for memory saving)
+    if (dbe) {
+      // check existence of first histo in the list
+      if (!dbe->get(topFolder.str() + "/DT/hLocalPositionDT"))
+        return;
+    } else
+      return;
 
-                    Int_t nstation=station - 1;
-                    Int_t nwheel=wheel+2;
+    for (unsigned int i = 0; i < unitsLocalX.size(); i++) {
+      if (unitsLocalX[i]->getEntries() != 0) {
+        TString nameHistoLocalX = unitsLocalX[i]->getName();
 
-                    Double_t Mean=unitsLocalPhi[i]->getMean();
-                    Double_t Error=unitsLocalPhi[i]->getMeanError();
+        TString nameHistoLocalPhi = unitsLocalPhi[i]->getName();
 
-                    Int_t ybin=1+nwheel*8+nstation*2;
-                    hLocalAngleDT->setBinContent(sector,ybin,fabs(Mean));
-                    snprintf(binLabel, sizeof(binLabel), "MB%d/%d_#phi", wheel,station );
-                    hLocalAngleDT->setBinLabel(ybin,binLabel,2);
-                    hLocalAngleRmsDT->setBinContent(sector,ybin,Error);
-                    hLocalAngleRmsDT->setBinLabel(ybin,binLabel,2);
+        TString nameHistoLocalTheta = unitsLocalTheta[i]->getName();
 
-                    hLocalPhiMeanDT->Fill(fabs(Mean));
-                    hLocalPhiRmsDT->Fill(Error);
-                }
+        TString nameHistoLocalY = unitsLocalY[i]->getName();
 
-                if (nameHistoLocalPhi.Contains("ME")) // HistoLocalPhi CSC
-                {
+        if (nameHistoLocalX.Contains("MB"))  // HistoLocalX DT
+        {
+          int wheel, station, sector;
 
-                    int station, ring, chamber;
+          sscanf(nameHistoLocalX, "ResidualLocalX_W%dMB%1dS%d", &wheel, &station, &sector);
 
-                    sscanf(nameHistoLocalPhi, "ResidualLocalPhi_ME%dR%1dC%d",&station,&ring,&chamber);
+          Int_t nstation = station - 1;
+          Int_t nwheel = wheel + 2;
 
-                    Double_t Mean=unitsLocalPhi[i]->getMean();
-                    Double_t Error=unitsLocalPhi[i]->getMeanError();
+          Double_t Mean = unitsLocalX[i]->getMean();
+          Double_t Error = unitsLocalX[i]->getMeanError();
 
-                    Int_t ybin=abs(station)*2+ring;
-                    if(abs(station)==1) ybin=ring;
-                    if (station>0) ybin=ybin+10;
-                    else ybin = 11 -ybin;
-                    ybin=2*ybin-1;
-                    hLocalAngleCSC->setBinContent(chamber,ybin,fabs(Mean));
-                    snprintf(binLabel, sizeof(binLabel), "ME%d/%d_#phi", station,ring );
-                    hLocalAngleCSC->setBinLabel(ybin,binLabel,2);
-                    hLocalAngleRmsCSC->setBinContent(chamber,ybin,Error);
-                    hLocalAngleRmsCSC->setBinLabel(ybin,binLabel,2);
+          Int_t ybin = 1 + nwheel * 8 + nstation * 2;
+          hLocalPositionDT->setBinContent(sector, ybin, fabs(Mean));
+          snprintf(binLabel, sizeof(binLabel), "MB%d/%d_X", wheel, station);
+          hLocalPositionDT->setBinLabel(ybin, binLabel, 2);
+          hLocalPositionRmsDT->setBinContent(sector, ybin, Error);
+          hLocalPositionRmsDT->setBinLabel(ybin, binLabel, 2);
 
-                    hLocalPhiMeanCSC->Fill(fabs(Mean));
-                    hLocalPhiRmsCSC->Fill(Error);
-                }
+          hLocalXMeanDT->Fill(fabs(Mean));
+          hLocalXRmsDT->Fill(Error);
+        }
 
-                if (nameHistoLocalTheta.Contains("ME")) // HistoLocalTheta CSC
-                {
+        if (nameHistoLocalX.Contains("ME"))  // HistoLocalX CSC
+        {
+          int station, ring, chamber;
+
+          sscanf(nameHistoLocalX, "ResidualLocalX_ME%dR%1dC%d", &station, &ring, &chamber);
+
+          Double_t Mean = unitsLocalX[i]->getMean();
+          Double_t Error = unitsLocalX[i]->getMeanError();
+
+          Int_t ybin = abs(station) * 2 + ring;
+          if (abs(station) == 1)
+            ybin = ring;
+          if (station > 0)
+            ybin = ybin + 10;
+          else
+            ybin = 11 - ybin;
+          ybin = 2 * ybin - 1;
+          hLocalPositionCSC->setBinContent(chamber, ybin, fabs(Mean));
+          snprintf(binLabel, sizeof(binLabel), "ME%d/%d_X", station, ring);
+          hLocalPositionCSC->setBinLabel(ybin, binLabel, 2);
+          hLocalPositionRmsCSC->setBinContent(chamber, ybin, Error);
+          hLocalPositionRmsCSC->setBinLabel(ybin, binLabel, 2);
+
+          hLocalXMeanCSC->Fill(fabs(Mean));
+          hLocalXRmsCSC->Fill(Error);
+        }
 
-                    int station, ring, chamber;
+        if (nameHistoLocalTheta.Contains("MB"))  // HistoLocalTheta DT
+        {
+          int wheel, station, sector;
 
-                    sscanf(nameHistoLocalTheta, "ResidualLocalTheta_ME%dR%1dC%d",&station,&ring,&chamber);
+          sscanf(nameHistoLocalTheta, "ResidualLocalTheta_W%dMB%1dS%d", &wheel, &station, &sector);
 
-                    Double_t Mean=unitsLocalTheta[i]->getMean();
-                    Double_t Error=unitsLocalTheta[i]->getMeanError();
+          if (station != 4) {
+            Int_t nstation = station - 1;
+            Int_t nwheel = wheel + 2;
 
-                    Int_t ybin=abs(station)*2+ring;
-                    if(abs(station)==1) ybin=ring;
-                    if (station>0) ybin=ybin+10;
-                    else ybin = 11 -ybin;
-                    ybin=2*ybin;
-                    hLocalAngleCSC->setBinContent(chamber,ybin,fabs(Mean));
-                    snprintf(binLabel, sizeof(binLabel), "ME%d/%d_#theta", station,ring );
-                    hLocalAngleCSC->setBinLabel(ybin,binLabel,2);
-                    hLocalAngleRmsCSC->setBinContent(chamber,ybin,Error);
-                    hLocalAngleRmsCSC->setBinLabel(ybin,binLabel,2);
+            Double_t Mean = unitsLocalTheta[i]->getMean();
+            Double_t Error = unitsLocalTheta[i]->getMeanError();
 
-                    hLocalThetaMeanCSC->Fill(fabs(Mean));
-                    hLocalThetaRmsCSC->Fill(Error);
+            Int_t ybin = 2 + nwheel * 8 + nstation * 2;
+            hLocalAngleDT->setBinContent(sector, ybin, fabs(Mean));
+            snprintf(binLabel, sizeof(binLabel), "MB%d/%d_#theta", wheel, station);
+            hLocalAngleDT->setBinLabel(ybin, binLabel, 2);
+            hLocalAngleRmsDT->setBinContent(sector, ybin, Error);
+            hLocalAngleRmsDT->setBinLabel(ybin, binLabel, 2);
 
-                }
+            hLocalThetaMeanDT->Fill(fabs(Mean));
+            hLocalThetaRmsDT->Fill(Error);
+          }
+        }
 
-                if (nameHistoLocalY.Contains("MB")) // HistoLocalY DT
-                {
+        if (nameHistoLocalPhi.Contains("MB"))  // HistoLocalPhi DT
+        {
+          int wheel, station, sector;
 
-                    int wheel, station, sector;
+          sscanf(nameHistoLocalPhi, "ResidualLocalPhi_W%dMB%1dS%d", &wheel, &station, &sector);
 
-                    sscanf(nameHistoLocalY, "ResidualLocalY_W%dMB%1dS%d",&wheel,&station,&sector);
+          Int_t nstation = station - 1;
+          Int_t nwheel = wheel + 2;
 
-                    if(station!=4){
-                        Int_t nstation=station - 1;
-                        Int_t nwheel=wheel+2;
+          Double_t Mean = unitsLocalPhi[i]->getMean();
+          Double_t Error = unitsLocalPhi[i]->getMeanError();
 
-                        Double_t Mean=unitsLocalY[i]->getMean();
-                        Double_t Error=unitsLocalY[i]->getMeanError();
+          Int_t ybin = 1 + nwheel * 8 + nstation * 2;
+          hLocalAngleDT->setBinContent(sector, ybin, fabs(Mean));
+          snprintf(binLabel, sizeof(binLabel), "MB%d/%d_#phi", wheel, station);
+          hLocalAngleDT->setBinLabel(ybin, binLabel, 2);
+          hLocalAngleRmsDT->setBinContent(sector, ybin, Error);
+          hLocalAngleRmsDT->setBinLabel(ybin, binLabel, 2);
 
-                        Int_t ybin=2+nwheel*8+nstation*2;
-                        hLocalPositionDT->setBinContent(sector,ybin,fabs(Mean));
-                        snprintf(binLabel, sizeof(binLabel), "MB%d/%d_Y", wheel,station );
-                        hLocalPositionDT->setBinLabel(ybin,binLabel,2);
-                        hLocalPositionRmsDT->setBinContent(sector,ybin,Error);
-                        hLocalPositionRmsDT->setBinLabel(ybin,binLabel,2);
+          hLocalPhiMeanDT->Fill(fabs(Mean));
+          hLocalPhiRmsDT->Fill(Error);
+        }
 
-                        hLocalYMeanDT->Fill(fabs(Mean));
-                        hLocalYRmsDT->Fill(Error);
-                    }
-                }
+        if (nameHistoLocalPhi.Contains("ME"))  // HistoLocalPhi CSC
+        {
+          int station, ring, chamber;
+
+          sscanf(nameHistoLocalPhi, "ResidualLocalPhi_ME%dR%1dC%d", &station, &ring, &chamber);
+
+          Double_t Mean = unitsLocalPhi[i]->getMean();
+          Double_t Error = unitsLocalPhi[i]->getMeanError();
+
+          Int_t ybin = abs(station) * 2 + ring;
+          if (abs(station) == 1)
+            ybin = ring;
+          if (station > 0)
+            ybin = ybin + 10;
+          else
+            ybin = 11 - ybin;
+          ybin = 2 * ybin - 1;
+          hLocalAngleCSC->setBinContent(chamber, ybin, fabs(Mean));
+          snprintf(binLabel, sizeof(binLabel), "ME%d/%d_#phi", station, ring);
+          hLocalAngleCSC->setBinLabel(ybin, binLabel, 2);
+          hLocalAngleRmsCSC->setBinContent(chamber, ybin, Error);
+          hLocalAngleRmsCSC->setBinLabel(ybin, binLabel, 2);
+
+          hLocalPhiMeanCSC->Fill(fabs(Mean));
+          hLocalPhiRmsCSC->Fill(Error);
+        }
 
-                if (nameHistoLocalY.Contains("ME")) // HistoLocalY CSC
-                {
+        if (nameHistoLocalTheta.Contains("ME"))  // HistoLocalTheta CSC
+        {
+          int station, ring, chamber;
+
+          sscanf(nameHistoLocalTheta, "ResidualLocalTheta_ME%dR%1dC%d", &station, &ring, &chamber);
+
+          Double_t Mean = unitsLocalTheta[i]->getMean();
+          Double_t Error = unitsLocalTheta[i]->getMeanError();
+
+          Int_t ybin = abs(station) * 2 + ring;
+          if (abs(station) == 1)
+            ybin = ring;
+          if (station > 0)
+            ybin = ybin + 10;
+          else
+            ybin = 11 - ybin;
+          ybin = 2 * ybin;
+          hLocalAngleCSC->setBinContent(chamber, ybin, fabs(Mean));
+          snprintf(binLabel, sizeof(binLabel), "ME%d/%d_#theta", station, ring);
+          hLocalAngleCSC->setBinLabel(ybin, binLabel, 2);
+          hLocalAngleRmsCSC->setBinContent(chamber, ybin, Error);
+          hLocalAngleRmsCSC->setBinLabel(ybin, binLabel, 2);
+
+          hLocalThetaMeanCSC->Fill(fabs(Mean));
+          hLocalThetaRmsCSC->Fill(Error);
+        }
 
-                    int station, ring, chamber;
+        if (nameHistoLocalY.Contains("MB"))  // HistoLocalY DT
+        {
+          int wheel, station, sector;
 
-                    sscanf(nameHistoLocalY, "ResidualLocalY_ME%dR%1dC%d",&station,&ring,&chamber);
+          sscanf(nameHistoLocalY, "ResidualLocalY_W%dMB%1dS%d", &wheel, &station, &sector);
 
-                    Double_t Mean=unitsLocalY[i]->getMean();
-                    Double_t Error=unitsLocalY[i]->getMeanError();
+          if (station != 4) {
+            Int_t nstation = station - 1;
+            Int_t nwheel = wheel + 2;
 
-                    Int_t ybin=abs(station)*2+ring;
-                    if(abs(station)==1) ybin=ring;
-                    if (station>0) ybin=ybin+10;
-                    else ybin = 11 -ybin;
-                    ybin=2*ybin;
-                    hLocalPositionCSC->setBinContent(chamber,ybin,fabs(Mean));
-                    snprintf(binLabel, sizeof(binLabel), "ME%d/%d_Y", station,ring );
-                    hLocalPositionCSC->setBinLabel(ybin,binLabel,2);
-                    hLocalPositionRmsCSC->setBinContent(chamber,ybin,Error);
-                    hLocalPositionRmsCSC->setBinLabel(ybin,binLabel,2);
+            Double_t Mean = unitsLocalY[i]->getMean();
+            Double_t Error = unitsLocalY[i]->getMeanError();
 
-                    hLocalYMeanCSC->Fill(fabs(Mean));
-                    hLocalYRmsCSC->Fill(Error);
-                }
-            } // check in # entries
-        } // loop on vector of histos
-    } //doSummary
-    
-    if(outputMEsInRootFile){
-//    dbe->showDirStructure();
-        dbe->save(outputFileName);
-    }
+            Int_t ybin = 2 + nwheel * 8 + nstation * 2;
+            hLocalPositionDT->setBinContent(sector, ybin, fabs(Mean));
+            snprintf(binLabel, sizeof(binLabel), "MB%d/%d_Y", wheel, station);
+            hLocalPositionDT->setBinLabel(ybin, binLabel, 2);
+            hLocalPositionRmsDT->setBinContent(sector, ybin, Error);
+            hLocalPositionRmsDT->setBinLabel(ybin, binLabel, 2);
 
+            hLocalYMeanDT->Fill(fabs(Mean));
+            hLocalYRmsDT->Fill(Error);
+          }
+        }
 
+        if (nameHistoLocalY.Contains("ME"))  // HistoLocalY CSC
+        {
+          int station, ring, chamber;
+
+          sscanf(nameHistoLocalY, "ResidualLocalY_ME%dR%1dC%d", &station, &ring, &chamber);
+
+          Double_t Mean = unitsLocalY[i]->getMean();
+          Double_t Error = unitsLocalY[i]->getMeanError();
+
+          Int_t ybin = abs(station) * 2 + ring;
+          if (abs(station) == 1)
+            ybin = ring;
+          if (station > 0)
+            ybin = ybin + 10;
+          else
+            ybin = 11 - ybin;
+          ybin = 2 * ybin;
+          hLocalPositionCSC->setBinContent(chamber, ybin, fabs(Mean));
+          snprintf(binLabel, sizeof(binLabel), "ME%d/%d_Y", station, ring);
+          hLocalPositionCSC->setBinLabel(ybin, binLabel, 2);
+          hLocalPositionRmsCSC->setBinContent(chamber, ybin, Error);
+          hLocalPositionRmsCSC->setBinLabel(ybin, binLabel, 2);
+
+          hLocalYMeanCSC->Fill(fabs(Mean));
+          hLocalYRmsCSC->Fill(Error);
+        }
+      }  // check in # entries
+    }    // loop on vector of histos
+  }      // doSummary
+
+  if (outputMEsInRootFile) {
+    //    dbe->showDirStructure();
+    dbe->save(outputFileName);
+  }
 }
-
diff --git a/DQMOffline/Alignment/src/MuonAlignmentSummary.cc b/DQMOffline/Alignment/src/MuonAlignmentSummary.cc
index 0bd1c65f5ed59..e10e57188b893 100644
--- a/DQMOffline/Alignment/src/MuonAlignmentSummary.cc
+++ b/DQMOffline/Alignment/src/MuonAlignmentSummary.cc
@@ -6,363 +6,423 @@
 
 #include "DQMOffline/Alignment/interface/MuonAlignmentSummary.h"
 
-
-
-
-MuonAlignmentSummary::MuonAlignmentSummary(const edm::ParameterSet& pSet) {
-
-    parameters = pSet;
-
-    meanPositionRange = parameters.getUntrackedParameter<double>("meanPositionRange");
-    rmsPositionRange = parameters.getUntrackedParameter<double>("rmsPositionRange");
-    meanAngleRange = parameters.getUntrackedParameter<double>("meanAngleRange");
-    rmsAngleRange = parameters.getUntrackedParameter<double>("rmsAngleRange");
-
-    doDT = parameters.getUntrackedParameter<bool>("doDT");
-    doCSC = parameters.getUntrackedParameter<bool>("doCSC");
-
-    MEFolderName = parameters.getParameter<std::string>("FolderName");
-    topFolder << MEFolderName+"Alignment/Muon";
-
-    if (!(doDT || doCSC) ) {
-        edm::LogError("MuonAlignmentSummary") <<" Error!! At least one Muon subsystem (DT or CSC) must be monitorized!!" << std::endl;
-        edm::LogError("MuonAlignmentSummary") <<" Please enable doDT or doCSC to True in your python cfg file!!!" << std::endl;
-        exit(1);
-    }
-
-}
-
-MuonAlignmentSummary::~MuonAlignmentSummary() {
+MuonAlignmentSummary::MuonAlignmentSummary(const edm::ParameterSet &pSet) {
+  parameters = pSet;
+
+  meanPositionRange = parameters.getUntrackedParameter<double>("meanPositionRange");
+  rmsPositionRange = parameters.getUntrackedParameter<double>("rmsPositionRange");
+  meanAngleRange = parameters.getUntrackedParameter<double>("meanAngleRange");
+  rmsAngleRange = parameters.getUntrackedParameter<double>("rmsAngleRange");
+
+  doDT = parameters.getUntrackedParameter<bool>("doDT");
+  doCSC = parameters.getUntrackedParameter<bool>("doCSC");
+
+  MEFolderName = parameters.getParameter<std::string>("FolderName");
+  topFolder << MEFolderName + "Alignment/Muon";
+
+  if (!(doDT || doCSC)) {
+    edm::LogError("MuonAlignmentSummary") << " Error!! At least one Muon subsystem (DT or CSC) must be "
+                                             "monitorized!!"
+                                          << std::endl;
+    edm::LogError("MuonAlignmentSummary")
+        << " Please enable doDT or doCSC to True in your python cfg file!!!" << std::endl;
+    exit(1);
+  }
 }
 
-
-void MuonAlignmentSummary::dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter) {
-
-    metname = "MuonAlignmentSummary";
-
-    LogTrace(metname)<<"[MuonAlignmentSummary] Parameters initialization";
-
-
+MuonAlignmentSummary::~MuonAlignmentSummary() {}
+
+void MuonAlignmentSummary::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
+  metname = "MuonAlignmentSummary";
+
+  LogTrace(metname) << "[MuonAlignmentSummary] Parameters initialization";
+
+  if (doDT) {
+    ibooker.setCurrentFolder(topFolder.str() + "/DT");
+    hLocalPositionDT = ibooker.book2D(
+        "hLocalPositionDT", "Local DT position (cm) absolute MEAN residuals;Sector;;cm", 14, 1, 15, 40, 0, 40);
+
+    hLocalAngleDT = ibooker.book2D(
+        "hLocalAngleDT", "Local DT angle (rad) absolute MEAN residuals;Sector;;rad", 14, 1, 15, 40, 0, 40);
+
+    hLocalPositionRmsDT =
+        ibooker.book2D("hLocalPositionRmsDT", "Local DT position (cm) RMS residuals;Sector;;cm", 14, 1, 15, 40, 0, 40);
+
+    hLocalAngleRmsDT =
+        ibooker.book2D("hLocalAngleRmsDT", "Local DT angle (rad) RMS residuals;Sector;;rad", 14, 1, 15, 40, 0, 40);
+
+    hLocalXMeanDT = ibooker.book1D("hLocalXMeanDT",
+                                   "Distribution of absolute MEAN Local X (cm) residuals "
+                                   "for DT;<X> (cm);number of chambers",
+                                   100,
+                                   0,
+                                   meanPositionRange);
+
+    hLocalXRmsDT = ibooker.book1D("hLocalXRmsDT",
+                                  "Distribution of RMS Local X (cm) residuals "
+                                  "for DT;X RMS (cm);number of chambers",
+                                  100,
+                                  0,
+                                  rmsPositionRange);
+
+    hLocalYMeanDT = ibooker.book1D("hLocalYMeanDT",
+                                   "Distribution of absolute MEAN Local Y (cm) residuals "
+                                   "for DT;<Y> (cm);number of chambers",
+                                   100,
+                                   0,
+                                   meanPositionRange);
+
+    hLocalYRmsDT = ibooker.book1D("hLocalYRmsDT",
+                                  "Distribution of RMS Local Y (cm) residuals "
+                                  "for DT;Y RMS (cm);number of chambers",
+                                  100,
+                                  0,
+                                  rmsPositionRange);
+
+    hLocalPhiMeanDT = ibooker.book1D("hLocalPhiMeanDT",
+                                     "Distribution of absolute MEAN #phi (rad) residuals for "
+                                     "DT;<#phi>(rad);number of chambers",
+                                     100,
+                                     0,
+                                     meanAngleRange);
+
+    hLocalPhiRmsDT = ibooker.book1D("hLocalPhiRmsDT",
+                                    "Distribution of RMS #phi (rad) residuals "
+                                    "for DT;#phi RMS (rad);number of chambers",
+                                    100,
+                                    0,
+                                    rmsAngleRange);
+
+    hLocalThetaMeanDT = ibooker.book1D("hLocalThetaMeanDT",
+                                       "Distribution of absolute MEAN #theta (rad) residuals "
+                                       "for DT;<#theta>(rad);number of chambers",
+                                       100,
+                                       0,
+                                       meanAngleRange);
+
+    hLocalThetaRmsDT = ibooker.book1D("hLocalThetaRmsDT",
+                                      "Distribution of RMS #theta (rad) residuals for "
+                                      "DT;#theta RMS (rad);number of chambers",
+                                      100,
+                                      0,
+                                      rmsAngleRange);
+
+    hLocalPositionDT->Reset();
+    hLocalAngleDT->Reset();
+    hLocalPositionRmsDT->Reset();
+    hLocalAngleRmsDT->Reset();
+    hLocalXMeanDT->Reset();
+    hLocalXRmsDT->Reset();
+    hLocalYMeanDT->Reset();
+    hLocalYRmsDT->Reset();
+    hLocalPhiMeanDT->Reset();
+    hLocalPhiRmsDT->Reset();
+    hLocalThetaMeanDT->Reset();
+    hLocalThetaRmsDT->Reset();
+  }
+
+  if (doCSC) {
+    ibooker.setCurrentFolder(topFolder.str() + "/CSC");
+    hLocalPositionCSC = ibooker.book2D(
+        "hLocalPositionCSC", "Local CSC position (cm) absolute MEAN residuals;Sector;;cm", 36, 1, 37, 40, 0, 40);
+
+    hLocalAngleCSC = ibooker.book2D(
+        "hLocalAngleCSC", "Local CSC angle (rad) absolute MEAN residuals;Sector;;rad", 36, 1, 37, 40, 0, 40);
+
+    hLocalPositionRmsCSC = ibooker.book2D(
+        "hLocalPositionRmsCSC", "Local CSC position (cm) RMS residuals;Sector;;cm", 36, 1, 37, 40, 0, 40);
+
+    hLocalAngleRmsCSC =
+        ibooker.book2D("hLocalAngleRmsCSC", "Local CSC angle (rad) RMS residuals;Sector;;rad", 36, 1, 37, 40, 0, 40);
+
+    hLocalXMeanCSC = ibooker.book1D("hLocalXMeanCSC",
+                                    "Distribution of absolute MEAN Local X (cm) residuals "
+                                    "for CSC;<X> (cm);number of chambers",
+                                    100,
+                                    0,
+                                    meanPositionRange);
+
+    hLocalXRmsCSC = ibooker.book1D("hLocalXRmsCSC",
+                                   "Distribution of RMS Local X (cm) residuals "
+                                   "for CSC;X RMS (cm);number of chambers",
+                                   100,
+                                   0,
+                                   rmsPositionRange);
+
+    hLocalYMeanCSC = ibooker.book1D("hLocalYMeanCSC",
+                                    "Distribution of absolute MEAN Local Y (cm) residuals "
+                                    "for CSC;<Y> (cm);number of chambers",
+                                    100,
+                                    0,
+                                    meanPositionRange);
+
+    hLocalYRmsCSC = ibooker.book1D("hLocalYRmsCSC",
+                                   "Distribution of RMS Local Y (cm) residuals "
+                                   "for CSC;Y RMS (cm);number of chambers",
+                                   100,
+                                   0,
+                                   rmsPositionRange);
+
+    hLocalPhiMeanCSC = ibooker.book1D("hLocalPhiMeanCSC",
+                                      "Distribution of absolute MEAN #phi (rad) residuals for "
+                                      "CSC;<#phi>(rad);number of chambers",
+                                      100,
+                                      0,
+                                      meanAngleRange);
+
+    hLocalPhiRmsCSC = ibooker.book1D("hLocalPhiRmsCSC",
+                                     "Distribution of RMS #phi (rad) residuals for CSC;#phi "
+                                     "RMS (rad);number of chambers",
+                                     100,
+                                     0,
+                                     rmsAngleRange);
+
+    hLocalThetaMeanCSC = ibooker.book1D("hLocalThetaMeanCSC",
+                                        "Distribution of absolute MEAN #theta (rad) residuals "
+                                        "for CSC;<#theta>(rad);number of chambers",
+                                        100,
+                                        0,
+                                        meanAngleRange);
+
+    hLocalThetaRmsCSC = ibooker.book1D("hLocalThetaRmsCSC",
+                                       "Distribution of RMS #theta (rad) residuals for "
+                                       "CSC;#theta RMS (rad);number of chambers",
+                                       100,
+                                       0,
+                                       rmsAngleRange);
+
+    hLocalPositionCSC->Reset();
+    hLocalAngleCSC->Reset();
+    hLocalPositionRmsCSC->Reset();
+    hLocalAngleRmsCSC->Reset();
+    hLocalXMeanCSC->Reset();
+    hLocalXRmsCSC->Reset();
+    hLocalYMeanCSC->Reset();
+    hLocalYRmsCSC->Reset();
+    hLocalPhiMeanCSC->Reset();
+    hLocalPhiRmsCSC->Reset();
+    hLocalThetaMeanCSC->Reset();
+    hLocalThetaRmsCSC->Reset();
+  }
+
+  LogTrace(metname) << "[MuonAlignmentSummary] Saving the histos";
+
+  char binLabel[40];
+
+  for (int station = -4; station < 5; station++) {
     if (doDT) {
-        ibooker.setCurrentFolder(topFolder.str() + "/DT");
-        hLocalPositionDT = ibooker.book2D("hLocalPositionDT",
-                "Local DT position (cm) absolute MEAN residuals;Sector;;cm", 14, 1, 15, 40, 0, 40);
-
-        hLocalAngleDT = ibooker.book2D("hLocalAngleDT",
-                "Local DT angle (rad) absolute MEAN residuals;Sector;;rad", 14, 1, 15, 40, 0, 40);
-
-        hLocalPositionRmsDT = ibooker.book2D("hLocalPositionRmsDT",
-                "Local DT position (cm) RMS residuals;Sector;;cm", 14, 1, 15, 40, 0, 40);
-
-        hLocalAngleRmsDT = ibooker.book2D("hLocalAngleRmsDT",
-                "Local DT angle (rad) RMS residuals;Sector;;rad", 14, 1, 15, 40, 0, 40);
-
-        hLocalXMeanDT = ibooker.book1D("hLocalXMeanDT",
-                "Distribution of absolute MEAN Local X (cm) residuals for DT;<X> (cm);number of chambers", 100, 0, meanPositionRange);
-
-        hLocalXRmsDT = ibooker.book1D("hLocalXRmsDT",
-                "Distribution of RMS Local X (cm) residuals for DT;X RMS (cm);number of chambers", 100, 0, rmsPositionRange);
-
-        hLocalYMeanDT = ibooker.book1D("hLocalYMeanDT",
-                "Distribution of absolute MEAN Local Y (cm) residuals for DT;<Y> (cm);number of chambers", 100, 0, meanPositionRange);
-
-        hLocalYRmsDT = ibooker.book1D("hLocalYRmsDT",
-                "Distribution of RMS Local Y (cm) residuals for DT;Y RMS (cm);number of chambers", 100, 0, rmsPositionRange);
-
-        hLocalPhiMeanDT = ibooker.book1D("hLocalPhiMeanDT",
-                "Distribution of absolute MEAN #phi (rad) residuals for DT;<#phi>(rad);number of chambers", 100, 0, meanAngleRange);
-
-        hLocalPhiRmsDT = ibooker.book1D("hLocalPhiRmsDT",
-                "Distribution of RMS #phi (rad) residuals for DT;#phi RMS (rad);number of chambers", 100, 0, rmsAngleRange);
-
-        hLocalThetaMeanDT = ibooker.book1D("hLocalThetaMeanDT",
-                "Distribution of absolute MEAN #theta (rad) residuals for DT;<#theta>(rad);number of chambers", 100, 0, meanAngleRange);
-
-        hLocalThetaRmsDT = ibooker.book1D("hLocalThetaRmsDT",
-                "Distribution of RMS #theta (rad) residuals for DT;#theta RMS (rad);number of chambers", 100, 0, rmsAngleRange);
-
-        hLocalPositionDT->Reset();
-        hLocalAngleDT->Reset();
-        hLocalPositionRmsDT->Reset();
-        hLocalAngleRmsDT->Reset();
-        hLocalXMeanDT->Reset();
-        hLocalXRmsDT->Reset();
-        hLocalYMeanDT->Reset();
-        hLocalYRmsDT->Reset();
-        hLocalPhiMeanDT->Reset();
-        hLocalPhiRmsDT->Reset();
-        hLocalThetaMeanDT->Reset();
-        hLocalThetaRmsDT->Reset();
-
-    }
+      if (station > 0) {
+        for (int wheel = -2; wheel < 3; wheel++) {
+          for (int sector = 1; sector < 15; sector++) {
+            if (!((sector == 13 || sector == 14) && station != 4)) {
+              std::stringstream Wheel;
+              Wheel << wheel;
+              std::stringstream Station;
+              Station << station;
+              std::stringstream Sector;
+              Sector << sector;
+
+              std::string nameOfHistoLocalX =
+                  "ResidualLocalX_W" + Wheel.str() + "MB" + Station.str() + "S" + Sector.str();
+              std::string nameOfHistoLocalPhi =
+                  "ResidualLocalPhi_W" + Wheel.str() + "MB" + Station.str() + "S" + Sector.str();
+              std::string nameOfHistoLocalTheta =
+                  "ResidualLocalTheta_W" + Wheel.str() + "MB" + Station.str() + "S" + Sector.str();
+              std::string nameOfHistoLocalY =
+                  "ResidualLocalY_W" + Wheel.str() + "MB" + Station.str() + "S" + Sector.str();
+
+              std::string path = topFolder.str() + "/DT/Wheel" + Wheel.str() + "/Station" + Station.str() + "/Sector" +
+                                 Sector.str() + "/";
+
+              std::string histo = path + nameOfHistoLocalX;
+
+              Int_t nstation = station - 1;
+              Int_t nwheel = wheel + 2;
+              MonitorElement *localX = igetter.get(histo);
+              if (localX) {
+                Double_t Mean = localX->getMean();
+                Double_t Error = localX->getMeanError();
+
+                Int_t ybin = 1 + nwheel * 8 + nstation * 2;
+                hLocalPositionDT->setBinContent(sector, ybin, fabs(Mean));
+                snprintf(binLabel, sizeof(binLabel), "MB%d/%d_X", wheel, station);
+                hLocalPositionDT->setBinLabel(ybin, binLabel, 2);
+                hLocalPositionRmsDT->setBinContent(sector, ybin, Error);
+                hLocalPositionRmsDT->setBinLabel(ybin, binLabel, 2);
+
+                if (localX->getEntries() != 0) {
+                  hLocalXMeanDT->Fill(fabs(Mean));
+                  hLocalXRmsDT->Fill(Error);
+                }
+              }
+
+              histo = path + nameOfHistoLocalPhi;
+              MonitorElement *localPhi = igetter.get(histo);
+              if (localPhi) {
+                Double_t Mean = localPhi->getMean();
+                Double_t Error = localPhi->getMeanError();
+
+                Int_t ybin = 1 + nwheel * 8 + nstation * 2;
+                hLocalAngleDT->setBinContent(sector, ybin, fabs(Mean));
+                snprintf(binLabel, sizeof(binLabel), "MB%d/%d_#phi", wheel, station);
+                hLocalAngleDT->setBinLabel(ybin, binLabel, 2);
+                hLocalAngleRmsDT->setBinContent(sector, ybin, Error);
+                hLocalAngleRmsDT->setBinLabel(ybin, binLabel, 2);
+
+                if (localPhi->getEntries() != 0) {
+                  hLocalPhiMeanDT->Fill(fabs(Mean));
+                  hLocalPhiRmsDT->Fill(Error);
+                }
+              }
+
+              if (station != 4) {
+                histo = path + nameOfHistoLocalY;
+                MonitorElement *localY = igetter.get(histo);
+                if (localY) {
+                  Double_t Mean = localY->getMean();
+                  Double_t Error = localY->getMeanError();
+
+                  Int_t ybin = 2 + nwheel * 8 + nstation * 2;
+                  hLocalPositionDT->setBinContent(sector, ybin, fabs(Mean));
+                  snprintf(binLabel, sizeof(binLabel), "MB%d/%d_Y", wheel, station);
+                  hLocalPositionDT->setBinLabel(ybin, binLabel, 2);
+                  hLocalPositionRmsDT->setBinContent(sector, ybin, Error);
+                  hLocalPositionRmsDT->setBinLabel(ybin, binLabel, 2);
+                  if (localY->getEntries() != 0) {
+                    hLocalYMeanDT->Fill(fabs(Mean));
+                    hLocalYRmsDT->Fill(Error);
+                  }
+                }
+                histo = path + nameOfHistoLocalTheta;
+                MonitorElement *localTheta = igetter.get(histo);
+                if (localTheta) {
+                  Double_t Mean = localTheta->getMean();
+                  Double_t Error = localTheta->getMeanError();
+
+                  Int_t ybin = 2 + nwheel * 8 + nstation * 2;
+                  hLocalAngleDT->setBinContent(sector, ybin, fabs(Mean));
+                  snprintf(binLabel, sizeof(binLabel), "MB%d/%d_#theta", wheel, station);
+                  hLocalAngleDT->setBinLabel(ybin, binLabel, 2);
+                  hLocalAngleRmsDT->setBinContent(sector, ybin, Error);
+                  hLocalAngleRmsDT->setBinLabel(ybin, binLabel, 2);
+                  if (localTheta->getEntries() != 0) {
+                    hLocalThetaMeanDT->Fill(fabs(Mean));
+                    hLocalThetaRmsDT->Fill(Error);
+                  }
+                }
+              }  // station != 4
+            }    // avoid non existing sectors
+          }      // sector
+        }        // wheel
+      }          // station>0
+    }            // doDT
 
     if (doCSC) {
-
-        ibooker.setCurrentFolder(topFolder.str()+"/CSC");
-        hLocalPositionCSC = ibooker.book2D("hLocalPositionCSC",
-                "Local CSC position (cm) absolute MEAN residuals;Sector;;cm", 36, 1, 37, 40, 0, 40);
-
-        hLocalAngleCSC = ibooker.book2D("hLocalAngleCSC",
-                "Local CSC angle (rad) absolute MEAN residuals;Sector;;rad", 36, 1, 37, 40, 0, 40);
-
-        hLocalPositionRmsCSC = ibooker.book2D("hLocalPositionRmsCSC",
-                "Local CSC position (cm) RMS residuals;Sector;;cm", 36, 1, 37, 40, 0, 40);
-
-        hLocalAngleRmsCSC = ibooker.book2D("hLocalAngleRmsCSC",
-                "Local CSC angle (rad) RMS residuals;Sector;;rad", 36, 1, 37, 40, 0, 40);
-
-        hLocalXMeanCSC = ibooker.book1D("hLocalXMeanCSC",
-                "Distribution of absolute MEAN Local X (cm) residuals for CSC;<X> (cm);number of chambers", 100, 0, meanPositionRange);
-
-        hLocalXRmsCSC = ibooker.book1D("hLocalXRmsCSC",
-                "Distribution of RMS Local X (cm) residuals for CSC;X RMS (cm);number of chambers", 100, 0, rmsPositionRange);
-
-        hLocalYMeanCSC = ibooker.book1D("hLocalYMeanCSC",
-                "Distribution of absolute MEAN Local Y (cm) residuals for CSC;<Y> (cm);number of chambers", 100, 0, meanPositionRange);
-
-        hLocalYRmsCSC = ibooker.book1D("hLocalYRmsCSC",
-                "Distribution of RMS Local Y (cm) residuals for CSC;Y RMS (cm);number of chambers", 100, 0, rmsPositionRange);
-
-        hLocalPhiMeanCSC = ibooker.book1D("hLocalPhiMeanCSC",
-                "Distribution of absolute MEAN #phi (rad) residuals for CSC;<#phi>(rad);number of chambers", 100, 0, meanAngleRange);
-
-        hLocalPhiRmsCSC = ibooker.book1D("hLocalPhiRmsCSC",
-                "Distribution of RMS #phi (rad) residuals for CSC;#phi RMS (rad);number of chambers", 100, 0, rmsAngleRange);
-
-        hLocalThetaMeanCSC = ibooker.book1D("hLocalThetaMeanCSC",
-                "Distribution of absolute MEAN #theta (rad) residuals for CSC;<#theta>(rad);number of chambers", 100, 0, meanAngleRange);
-
-        hLocalThetaRmsCSC = ibooker.book1D("hLocalThetaRmsCSC",
-                "Distribution of RMS #theta (rad) residuals for CSC;#theta RMS (rad);number of chambers", 100, 0, rmsAngleRange);
-
-        hLocalPositionCSC->Reset();
-        hLocalAngleCSC->Reset();
-        hLocalPositionRmsCSC->Reset();
-        hLocalAngleRmsCSC->Reset();
-        hLocalXMeanCSC->Reset();
-        hLocalXRmsCSC->Reset();
-        hLocalYMeanCSC->Reset();
-        hLocalYRmsCSC->Reset();
-        hLocalPhiMeanCSC->Reset();
-        hLocalPhiRmsCSC->Reset();
-        hLocalThetaMeanCSC->Reset();
-        hLocalThetaRmsCSC->Reset();
-
-    }
-
-    LogTrace(metname)<<"[MuonAlignmentSummary] Saving the histos";
-
-    char binLabel[40];
-
-    for (int station = -4; station < 5; station++) {
-        if (doDT) {
-            if (station > 0) {
-
-                for (int wheel = -2;wheel < 3; wheel++) {
-
-                    for (int sector = 1; sector < 15; sector++) {
-
-                        if (!((sector == 13 || sector == 14) && station != 4)) {
-
-                            std::stringstream Wheel; Wheel<<wheel;
-                            std::stringstream Station; Station<<station;
-                            std::stringstream Sector; Sector<<sector;
-
-                            std::string nameOfHistoLocalX="ResidualLocalX_W"+Wheel.str()+"MB"+Station.str()+"S"+Sector.str();
-                            std::string nameOfHistoLocalPhi= "ResidualLocalPhi_W"+Wheel.str()+"MB"+Station.str()+"S"+Sector.str();
-                            std::string nameOfHistoLocalTheta= "ResidualLocalTheta_W"+Wheel.str()+"MB"+Station.str()+"S"+Sector.str();
-                            std::string nameOfHistoLocalY= "ResidualLocalY_W"+Wheel.str()+"MB"+Station.str()+"S"+Sector.str();
-
-                            std::string path= topFolder.str()+
-                                "/DT/Wheel"+Wheel.str()+
-                                "/Station"+Station.str()+
-                                "/Sector"+Sector.str()+"/";
-
-                            std::string histo = path + nameOfHistoLocalX;
-
-                            Int_t nstation=station - 1;
-                            Int_t nwheel=wheel+2;
-                            MonitorElement * localX = igetter.get(histo);
-                            if (localX) {
-
-                                Double_t Mean = localX->getMean();
-                                Double_t Error = localX->getMeanError();
-
-                                Int_t ybin = 1 + nwheel * 8 + nstation * 2;
-                                hLocalPositionDT->setBinContent(sector, ybin, fabs(Mean));
-                                snprintf(binLabel, sizeof(binLabel), "MB%d/%d_X", wheel, station);
-                                hLocalPositionDT->setBinLabel(ybin, binLabel, 2);
-                                hLocalPositionRmsDT->setBinContent(sector, ybin, Error);
-                                hLocalPositionRmsDT->setBinLabel(ybin, binLabel, 2);
-
-                                if (localX->getEntries() != 0){
-                                    hLocalXMeanDT->Fill(fabs(Mean));
-                                    hLocalXRmsDT->Fill(Error);}
-                            }
-
-                            histo = path+nameOfHistoLocalPhi;
-                            MonitorElement * localPhi = igetter.get(histo);
-                            if (localPhi) {
-
-                                Double_t Mean = localPhi->getMean();
-                                Double_t Error = localPhi->getMeanError();
-
-                                Int_t ybin = 1 + nwheel * 8 + nstation * 2;
-                                hLocalAngleDT->setBinContent(sector, ybin, fabs(Mean));
-                                snprintf(binLabel, sizeof(binLabel), "MB%d/%d_#phi", wheel, station);
-                                hLocalAngleDT->setBinLabel(ybin ,binLabel, 2);
-                                hLocalAngleRmsDT->setBinContent(sector, ybin, Error);
-                                hLocalAngleRmsDT->setBinLabel(ybin, binLabel, 2);
-
-                                if (localPhi->getEntries() != 0) {
-                                    hLocalPhiMeanDT->Fill(fabs(Mean));
-                                    hLocalPhiRmsDT->Fill(Error);}
-                            }
-
-                            if (station != 4) {
-
-                                histo=path+nameOfHistoLocalY;
-                                MonitorElement * localY = igetter.get(histo);
-                                if (localY) {
-
-                                    Double_t Mean = localY->getMean();
-                                    Double_t Error = localY->getMeanError();
-
-                                    Int_t ybin = 2 + nwheel * 8 + nstation * 2;
-                                    hLocalPositionDT->setBinContent(sector,ybin,fabs(Mean));
-                                    snprintf(binLabel, sizeof(binLabel), "MB%d/%d_Y", wheel, station);
-                                    hLocalPositionDT->setBinLabel(ybin, binLabel, 2);
-                                    hLocalPositionRmsDT->setBinContent(sector, ybin, Error);
-                                    hLocalPositionRmsDT->setBinLabel(ybin, binLabel, 2);
-                                    if (localY->getEntries() != 0) {
-                                        hLocalYMeanDT->Fill(fabs(Mean));
-                                        hLocalYRmsDT->Fill(Error);}
-                                }
-                                histo = path+nameOfHistoLocalTheta;
-                                MonitorElement * localTheta = igetter.get(histo);
-                                if (localTheta) {
-                                    Double_t Mean = localTheta->getMean();
-                                    Double_t Error = localTheta->getMeanError();
-
-                                    Int_t ybin = 2 + nwheel * 8 + nstation * 2;
-                                    hLocalAngleDT->setBinContent(sector, ybin, fabs(Mean));
-                                    snprintf(binLabel, sizeof(binLabel), "MB%d/%d_#theta", wheel, station);
-                                    hLocalAngleDT->setBinLabel(ybin, binLabel, 2);
-                                    hLocalAngleRmsDT->setBinContent(sector, ybin, Error);
-                                    hLocalAngleRmsDT->setBinLabel(ybin, binLabel, 2);
-                                    if (localTheta->getEntries() != 0) {
-                                        hLocalThetaMeanDT->Fill(fabs(Mean));
-                                        hLocalThetaRmsDT->Fill(Error);}
-                                }
-                            }// station != 4
-                        } //avoid non existing sectors
-                    } //sector 
-                } //wheel
-            } //station>0
-        }// doDT
-
-        if (doCSC){
-            if (station != 0) {
-
-                for (int ring = 1; ring < 5; ring++) {
-
-                    for (int chamber = 1; chamber < 37; chamber++){
-
-                        if ( !( ((abs(station)==2 || abs(station)==3 || abs(station)==4) && ring==1 && chamber>18) || 
-                                ((abs(station)==2 || abs(station)==3 || abs(station)==4) && ring>2)) ) {
-                            std::stringstream Ring; Ring<<ring;
-                            std::stringstream Station; Station<<station;
-                            std::stringstream Chamber; Chamber<<chamber;
-
-                            std::string nameOfHistoLocalX="ResidualLocalX_ME"+Station.str()+"R"+Ring.str()+"C"+Chamber.str();
-                            std::string nameOfHistoLocalPhi= "ResidualLocalPhi_ME"+Station.str()+"R"+Ring.str()+"C"+Chamber.str();
-                            std::string nameOfHistoLocalTheta= "ResidualLocalTheta_ME"+Station.str()+"R"+Ring.str()+"C"+Chamber.str();
-                            std::string nameOfHistoLocalY= "ResidualLocalY_ME"+Station.str()+"R"+Ring.str()+"C"+Chamber.str();
-
-                            std::string path = topFolder.str()+
-                                "/CSC/Station"+Station.str()+
-                                "/Ring"+Ring.str()+
-                                "/Chamber"+Chamber.str()+"/";
-
-                            Int_t ybin = abs(station) * 2 + ring;
-                            if (abs(station) == 1) ybin = ring;
-                            if (station > 0) ybin = ybin + 10;
-                            else ybin = 11 - ybin;
-                            std::string histo = path + nameOfHistoLocalX;
-                            MonitorElement * localX = igetter.get(histo);
-                            if (localX) {
-
-                                Double_t Mean=localX->getMean();
-                                Double_t Error=localX->getMeanError();
-
-                                Int_t ybin2= 2 * ybin - 1;
-                                hLocalPositionCSC->setBinContent(chamber,ybin2,fabs(Mean));
-                                snprintf(binLabel, sizeof(binLabel), "ME%d/%d_X", station, ring);
-                                hLocalPositionCSC->setBinLabel(ybin2, binLabel, 2);
-                                hLocalPositionRmsCSC->setBinContent(chamber, ybin2, Error);
-                                hLocalPositionRmsCSC->setBinLabel(ybin2, binLabel, 2);
-                                if (localX->getEntries() != 0) {
-                                    hLocalXMeanCSC->Fill(fabs(Mean));
-                                    hLocalXRmsCSC->Fill(Error);}
-                            }
-                            histo = path +	nameOfHistoLocalPhi;
-
-                            MonitorElement * localPhi = igetter.get(histo);
-                            if (localPhi) {
-
-                                Double_t Mean=localPhi->getMean();
-                                Double_t Error=localPhi->getMeanError();
-
-                                Int_t ybin2 = 2 * ybin - 1;
-                                hLocalAngleCSC->setBinContent(chamber, ybin2, fabs(Mean));
-                                snprintf(binLabel, sizeof(binLabel), "ME%d/%d_#phi", station, ring);
-                                hLocalAngleCSC->setBinLabel(ybin2, binLabel, 2);
-                                hLocalAngleRmsCSC->setBinContent(chamber, ybin2, Error);
-                                hLocalAngleRmsCSC->setBinLabel(ybin2, binLabel, 2);
-                                if (localPhi->getEntries() != 0){
-                                    hLocalPhiMeanCSC->Fill(fabs(Mean));
-                                    hLocalPhiRmsCSC->Fill(Error);}
-                            }
-                            histo = path +	nameOfHistoLocalTheta;
-                            MonitorElement * localTheta = igetter.get(histo);
-                            if (localTheta) {
-
-                                Double_t Mean = localTheta->getMean();
-                                Double_t Error = localTheta->getMeanError();
-
-                                Int_t ybin2 = 2 * ybin;
-                                hLocalAngleCSC->setBinContent(chamber, ybin2, fabs(Mean));
-                                snprintf(binLabel, sizeof(binLabel), "ME%d/%d_#theta", station, ring);
-                                hLocalAngleCSC->setBinLabel(ybin2, binLabel, 2);
-                                hLocalAngleRmsCSC->setBinContent(chamber, ybin2, Error);
-                                hLocalAngleRmsCSC->setBinLabel(ybin2, binLabel, 2);
-                                if (localTheta->getEntries() != 0) {
-                                    hLocalThetaMeanCSC->Fill(fabs(Mean));
-                                    hLocalThetaRmsCSC->Fill(Error);}
-
-                            }
-                            histo = path +	nameOfHistoLocalY;
-
-                            MonitorElement * localY = igetter.get(histo);
-                            if (localY) {
-
-                                Double_t Mean=localY->getMean();
-                                Double_t Error=localY->getMeanError();
-
-                                Int_t ybin2 = 2 * ybin;
-                                hLocalPositionCSC->setBinContent(chamber, ybin2, fabs(Mean));
-                                snprintf(binLabel, sizeof(binLabel), "ME%d/%d_Y", station, ring);
-                                hLocalPositionCSC->setBinLabel(ybin2, binLabel, 2);
-                                hLocalPositionRmsCSC->setBinContent(chamber, ybin2, Error);
-                                hLocalPositionRmsCSC->setBinLabel(ybin2, binLabel, 2);
-                                if (localY->getEntries() != 0) {
-                                    hLocalYMeanCSC->Fill(fabs(Mean));
-                                    hLocalYRmsCSC->Fill(Error);}
-                            }
-                        } //avoid non existing rings
-                    } //chamber
-                } //ring
-            } // station!=0
-        }// doCSC
-    } // loop on stations
+      if (station != 0) {
+        for (int ring = 1; ring < 5; ring++) {
+          for (int chamber = 1; chamber < 37; chamber++) {
+            if (!(((abs(station) == 2 || abs(station) == 3 || abs(station) == 4) && ring == 1 && chamber > 18) ||
+                  ((abs(station) == 2 || abs(station) == 3 || abs(station) == 4) && ring > 2))) {
+              std::stringstream Ring;
+              Ring << ring;
+              std::stringstream Station;
+              Station << station;
+              std::stringstream Chamber;
+              Chamber << chamber;
+
+              std::string nameOfHistoLocalX =
+                  "ResidualLocalX_ME" + Station.str() + "R" + Ring.str() + "C" + Chamber.str();
+              std::string nameOfHistoLocalPhi =
+                  "ResidualLocalPhi_ME" + Station.str() + "R" + Ring.str() + "C" + Chamber.str();
+              std::string nameOfHistoLocalTheta =
+                  "ResidualLocalTheta_ME" + Station.str() + "R" + Ring.str() + "C" + Chamber.str();
+              std::string nameOfHistoLocalY =
+                  "ResidualLocalY_ME" + Station.str() + "R" + Ring.str() + "C" + Chamber.str();
+
+              std::string path = topFolder.str() + "/CSC/Station" + Station.str() + "/Ring" + Ring.str() + "/Chamber" +
+                                 Chamber.str() + "/";
+
+              Int_t ybin = abs(station) * 2 + ring;
+              if (abs(station) == 1)
+                ybin = ring;
+              if (station > 0)
+                ybin = ybin + 10;
+              else
+                ybin = 11 - ybin;
+              std::string histo = path + nameOfHistoLocalX;
+              MonitorElement *localX = igetter.get(histo);
+              if (localX) {
+                Double_t Mean = localX->getMean();
+                Double_t Error = localX->getMeanError();
+
+                Int_t ybin2 = 2 * ybin - 1;
+                hLocalPositionCSC->setBinContent(chamber, ybin2, fabs(Mean));
+                snprintf(binLabel, sizeof(binLabel), "ME%d/%d_X", station, ring);
+                hLocalPositionCSC->setBinLabel(ybin2, binLabel, 2);
+                hLocalPositionRmsCSC->setBinContent(chamber, ybin2, Error);
+                hLocalPositionRmsCSC->setBinLabel(ybin2, binLabel, 2);
+                if (localX->getEntries() != 0) {
+                  hLocalXMeanCSC->Fill(fabs(Mean));
+                  hLocalXRmsCSC->Fill(Error);
+                }
+              }
+              histo = path + nameOfHistoLocalPhi;
+
+              MonitorElement *localPhi = igetter.get(histo);
+              if (localPhi) {
+                Double_t Mean = localPhi->getMean();
+                Double_t Error = localPhi->getMeanError();
+
+                Int_t ybin2 = 2 * ybin - 1;
+                hLocalAngleCSC->setBinContent(chamber, ybin2, fabs(Mean));
+                snprintf(binLabel, sizeof(binLabel), "ME%d/%d_#phi", station, ring);
+                hLocalAngleCSC->setBinLabel(ybin2, binLabel, 2);
+                hLocalAngleRmsCSC->setBinContent(chamber, ybin2, Error);
+                hLocalAngleRmsCSC->setBinLabel(ybin2, binLabel, 2);
+                if (localPhi->getEntries() != 0) {
+                  hLocalPhiMeanCSC->Fill(fabs(Mean));
+                  hLocalPhiRmsCSC->Fill(Error);
+                }
+              }
+              histo = path + nameOfHistoLocalTheta;
+              MonitorElement *localTheta = igetter.get(histo);
+              if (localTheta) {
+                Double_t Mean = localTheta->getMean();
+                Double_t Error = localTheta->getMeanError();
+
+                Int_t ybin2 = 2 * ybin;
+                hLocalAngleCSC->setBinContent(chamber, ybin2, fabs(Mean));
+                snprintf(binLabel, sizeof(binLabel), "ME%d/%d_#theta", station, ring);
+                hLocalAngleCSC->setBinLabel(ybin2, binLabel, 2);
+                hLocalAngleRmsCSC->setBinContent(chamber, ybin2, Error);
+                hLocalAngleRmsCSC->setBinLabel(ybin2, binLabel, 2);
+                if (localTheta->getEntries() != 0) {
+                  hLocalThetaMeanCSC->Fill(fabs(Mean));
+                  hLocalThetaRmsCSC->Fill(Error);
+                }
+              }
+              histo = path + nameOfHistoLocalY;
+
+              MonitorElement *localY = igetter.get(histo);
+              if (localY) {
+                Double_t Mean = localY->getMean();
+                Double_t Error = localY->getMeanError();
+
+                Int_t ybin2 = 2 * ybin;
+                hLocalPositionCSC->setBinContent(chamber, ybin2, fabs(Mean));
+                snprintf(binLabel, sizeof(binLabel), "ME%d/%d_Y", station, ring);
+                hLocalPositionCSC->setBinLabel(ybin2, binLabel, 2);
+                hLocalPositionRmsCSC->setBinContent(chamber, ybin2, Error);
+                hLocalPositionRmsCSC->setBinLabel(ybin2, binLabel, 2);
+                if (localY->getEntries() != 0) {
+                  hLocalYMeanCSC->Fill(fabs(Mean));
+                  hLocalYRmsCSC->Fill(Error);
+                }
+              }
+            }  // avoid non existing rings
+          }    // chamber
+        }      // ring
+      }        // station!=0
+    }          // doCSC
+  }            // loop on stations
 }
diff --git a/DQMOffline/Alignment/src/SealModule.cc b/DQMOffline/Alignment/src/SealModule.cc
index 00bc0d80186ea..5e2674f3b6ebc 100644
--- a/DQMOffline/Alignment/src/SealModule.cc
+++ b/DQMOffline/Alignment/src/SealModule.cc
@@ -1,10 +1,9 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 
 // the clients
 #include "DQMOffline/Alignment/interface/MuonAlignment.h"
 #include "DQMOffline/Alignment/interface/MuonAlignmentSummary.h"
 
-
 DEFINE_FWK_MODULE(MuonAlignment);
 DEFINE_FWK_MODULE(MuonAlignmentSummary);
diff --git a/DQMOffline/Alignment/src/TkAlCaRecoMonitor.cc b/DQMOffline/Alignment/src/TkAlCaRecoMonitor.cc
index 690e9cad3e87e..10e5910519997 100644
--- a/DQMOffline/Alignment/src/TkAlCaRecoMonitor.cc
+++ b/DQMOffline/Alignment/src/TkAlCaRecoMonitor.cc
@@ -7,16 +7,16 @@
 
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
+#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
 
+#include "DQMOffline/Alignment/interface/TkAlCaRecoMonitor.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMOffline/Alignment/interface/TkAlCaRecoMonitor.h"
 
 #include <DataFormats/Math/interface/deltaR.h>
 
@@ -24,42 +24,42 @@
 //#include <sstream>
 #include "TLorentzVector.h"
 
-TkAlCaRecoMonitor::TkAlCaRecoMonitor(const edm::ParameterSet& iConfig) {
+TkAlCaRecoMonitor::TkAlCaRecoMonitor(const edm::ParameterSet &iConfig) {
   conf_ = iConfig;
   trackProducer_ = consumes<reco::TrackCollection>(conf_.getParameter<edm::InputTag>("TrackProducer"));
-  referenceTrackProducer_ = consumes<reco::TrackCollection>(conf_.getParameter<edm::InputTag>("ReferenceTrackProducer"));
+  referenceTrackProducer_ =
+      consumes<reco::TrackCollection>(conf_.getParameter<edm::InputTag>("ReferenceTrackProducer"));
   jetCollection_ = mayConsume<reco::CaloJetCollection>(conf_.getParameter<edm::InputTag>("CaloJetCollection"));
 }
 
-TkAlCaRecoMonitor::~TkAlCaRecoMonitor() { } 
+TkAlCaRecoMonitor::~TkAlCaRecoMonitor() {}
 
 void TkAlCaRecoMonitor::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, edm::EventSetup const &) {
+  std::string histname;  // for naming the histograms according to algorithm used
 
-  std::string histname;  //for naming the histograms according to algorithm used
-
-  std::string AlgoName     = conf_.getParameter<std::string>("AlgoName");
-  std::string MEFolderName = conf_.getParameter<std::string>("FolderName"); 
+  std::string AlgoName = conf_.getParameter<std::string>("AlgoName");
+  std::string MEFolderName = conf_.getParameter<std::string>("FolderName");
 
   daughterMass_ = conf_.getParameter<double>("daughterMass");
 
   maxJetPt_ = conf_.getParameter<double>("maxJetPt");
 
-  iBooker.setCurrentFolder(MEFolderName+"/TkAlignmentSpecific");
+  iBooker.setCurrentFolder(MEFolderName + "/TkAlignmentSpecific");
   fillInvariantMass_ = conf_.getParameter<bool>("fillInvariantMass");
   runsOnReco_ = conf_.getParameter<bool>("runsOnReco");
   useSignedR_ = conf_.getParameter<bool>("useSignedR");
   fillRawIdMap_ = conf_.getParameter<bool>("fillRawIdMap");
 
-  //    
+  //
   unsigned int MassBin = conf_.getParameter<unsigned int>("MassBin");
   double MassMin = conf_.getParameter<double>("MassMin");
   double MassMax = conf_.getParameter<double>("MassMax");
 
-  if(fillInvariantMass_){
+  if (fillInvariantMass_) {
     histname = "InvariantMass_";
-    invariantMass_ = iBooker.book1D(histname+AlgoName, histname+AlgoName, MassBin, MassMin, MassMax);
+    invariantMass_ = iBooker.book1D(histname + AlgoName, histname + AlgoName, MassBin, MassMin, MassMax);
     invariantMass_->setAxisTitle("invariant Mass / GeV");
-  }else{
+  } else {
     invariantMass_ = nullptr;
   }
 
@@ -68,7 +68,8 @@ void TkAlCaRecoMonitor::bookHistograms(DQMStore::IBooker &iBooker, edm::Run cons
   double TrackPtPositiveMax = conf_.getParameter<double>("TrackPtMax");
 
   histname = "TrackPtPositive_";
-  TrackPtPositive_ = iBooker.book1D(histname+AlgoName, histname+AlgoName, TrackPtPositiveBin, TrackPtPositiveMin, TrackPtPositiveMax);
+  TrackPtPositive_ = iBooker.book1D(
+      histname + AlgoName, histname + AlgoName, TrackPtPositiveBin, TrackPtPositiveMin, TrackPtPositiveMax);
   TrackPtPositive_->setAxisTitle("p_{T} of tracks charge > 0");
 
   unsigned int TrackPtNegativeBin = conf_.getParameter<unsigned int>("TrackPtBin");
@@ -76,62 +77,65 @@ void TkAlCaRecoMonitor::bookHistograms(DQMStore::IBooker &iBooker, edm::Run cons
   double TrackPtNegativeMax = conf_.getParameter<double>("TrackPtMax");
 
   histname = "TrackPtNegative_";
-  TrackPtNegative_ = iBooker.book1D(histname+AlgoName, histname+AlgoName, TrackPtNegativeBin, TrackPtNegativeMin, TrackPtNegativeMax);
+  TrackPtNegative_ = iBooker.book1D(
+      histname + AlgoName, histname + AlgoName, TrackPtNegativeBin, TrackPtNegativeMin, TrackPtNegativeMax);
   TrackPtNegative_->setAxisTitle("p_{T} of tracks charge < 0");
 
   histname = "TrackQuality_";
-  TrackQuality_ = iBooker.book1D(histname+AlgoName, histname+AlgoName, 
-				 reco::TrackBase::qualitySize, -0.5, reco::TrackBase::qualitySize-0.5);
+  TrackQuality_ = iBooker.book1D(
+      histname + AlgoName, histname + AlgoName, reco::TrackBase::qualitySize, -0.5, reco::TrackBase::qualitySize - 0.5);
   TrackQuality_->setAxisTitle("quality");
-  for ( int i = 0; i<reco::TrackBase::qualitySize; ++i){
-    TrackQuality_->getTH1()->GetXaxis()->SetBinLabel(i+1,
-  	            reco::TrackBase::qualityName( reco::TrackBase::TrackQuality(i) ).c_str());
-  } 
+  for (int i = 0; i < reco::TrackBase::qualitySize; ++i) {
+    TrackQuality_->getTH1()->GetXaxis()->SetBinLabel(
+        i + 1, reco::TrackBase::qualityName(reco::TrackBase::TrackQuality(i)).c_str());
+  }
 
   unsigned int SumChargeBin = conf_.getParameter<unsigned int>("SumChargeBin");
   double SumChargeMin = conf_.getParameter<double>("SumChargeMin");
   double SumChargeMax = conf_.getParameter<double>("SumChargeMax");
 
   histname = "SumCharge_";
-  sumCharge_ = iBooker.book1D(histname+AlgoName, histname+AlgoName, SumChargeBin, SumChargeMin, SumChargeMax);
+  sumCharge_ = iBooker.book1D(histname + AlgoName, histname + AlgoName, SumChargeBin, SumChargeMin, SumChargeMax);
   sumCharge_->setAxisTitle("#SigmaCharge");
 
   unsigned int TrackCurvatureBin = conf_.getParameter<unsigned int>("TrackCurvatureBin");
   double TrackCurvatureMin = conf_.getParameter<double>("TrackCurvatureMin");
   double TrackCurvatureMax = conf_.getParameter<double>("TrackCurvatureMax");
-  
+
   histname = "TrackCurvature_";
-  TrackCurvature_ = iBooker.book1D(histname+AlgoName, histname+AlgoName, TrackCurvatureBin, TrackCurvatureMin, TrackCurvatureMax);
+  TrackCurvature_ =
+      iBooker.book1D(histname + AlgoName, histname + AlgoName, TrackCurvatureBin, TrackCurvatureMin, TrackCurvatureMax);
   TrackCurvature_->setAxisTitle("#kappa track");
 
-  if( runsOnReco_ ){
-
-    unsigned int    JetPtBin = conf_.getParameter<unsigned int>("JetPtBin");
+  if (runsOnReco_) {
+    unsigned int JetPtBin = conf_.getParameter<unsigned int>("JetPtBin");
     double JetPtMin = conf_.getParameter<double>("JetPtMin");
     double JetPtMax = conf_.getParameter<double>("JetPtMax");
 
     histname = "JetPt_";
-    jetPt_ = iBooker.book1D(histname+AlgoName, histname+AlgoName, JetPtBin, JetPtMin, JetPtMax);
+    jetPt_ = iBooker.book1D(histname + AlgoName, histname + AlgoName, JetPtBin, JetPtMin, JetPtMax);
     jetPt_->setAxisTitle("jet p_{T} / GeV");
 
-    unsigned int    MinJetDeltaRBin = conf_.getParameter<unsigned int>("MinJetDeltaRBin");
+    unsigned int MinJetDeltaRBin = conf_.getParameter<unsigned int>("MinJetDeltaRBin");
     double MinJetDeltaRMin = conf_.getParameter<double>("MinJetDeltaRMin");
     double MinJetDeltaRMax = conf_.getParameter<double>("MinJetDeltaRMax");
 
     histname = "MinJetDeltaR_";
-    minJetDeltaR_ = iBooker.book1D(histname+AlgoName, histname+AlgoName, MinJetDeltaRBin, MinJetDeltaRMin, MinJetDeltaRMax);
+    minJetDeltaR_ =
+        iBooker.book1D(histname + AlgoName, histname + AlgoName, MinJetDeltaRBin, MinJetDeltaRMin, MinJetDeltaRMax);
     minJetDeltaR_->setAxisTitle("minimal Jet #DeltaR / rad");
-  }else{
+  } else {
     jetPt_ = nullptr;
     minJetDeltaR_ = nullptr;
   }
 
-  unsigned int    MinTrackDeltaRBin = conf_.getParameter<unsigned int>("MinTrackDeltaRBin");
+  unsigned int MinTrackDeltaRBin = conf_.getParameter<unsigned int>("MinTrackDeltaRBin");
   double MinTrackDeltaRMin = conf_.getParameter<double>("MinTrackDeltaRMin");
   double MinTrackDeltaRMax = conf_.getParameter<double>("MinTrackDeltaRMax");
 
   histname = "MinTrackDeltaR_";
-  minTrackDeltaR_ = iBooker.book1D(histname+AlgoName, histname+AlgoName, MinTrackDeltaRBin, MinTrackDeltaRMin, MinTrackDeltaRMax);
+  minTrackDeltaR_ =
+      iBooker.book1D(histname + AlgoName, histname + AlgoName, MinTrackDeltaRBin, MinTrackDeltaRMin, MinTrackDeltaRMax);
   minTrackDeltaR_->setAxisTitle("minimal Track #DeltaR / rad");
 
   unsigned int TrackEfficiencyBin = conf_.getParameter<unsigned int>("TrackEfficiencyBin");
@@ -139,187 +143,199 @@ void TkAlCaRecoMonitor::bookHistograms(DQMStore::IBooker &iBooker, edm::Run cons
   double TrackEfficiencyMax = conf_.getParameter<double>("TrackEfficiencyMax");
 
   histname = "AlCaRecoTrackEfficiency_";
-  AlCaRecoTrackEfficiency_ = iBooker.book1D(histname+AlgoName, histname+AlgoName, TrackEfficiencyBin, TrackEfficiencyMin, TrackEfficiencyMax);
+  AlCaRecoTrackEfficiency_ = iBooker.book1D(
+      histname + AlgoName, histname + AlgoName, TrackEfficiencyBin, TrackEfficiencyMin, TrackEfficiencyMax);
   Labels l_tp, l_rtp;
   labelsForToken(referenceTrackProducer_, l_rtp);
   labelsForToken(trackProducer_, l_tp);
-  AlCaRecoTrackEfficiency_->setAxisTitle("n("+std::string(l_tp.module)+") / n("+std::string(l_rtp.module)+")");
+  AlCaRecoTrackEfficiency_->setAxisTitle("n(" + std::string(l_tp.module) + ") / n(" + std::string(l_rtp.module) + ")");
 
-  int zBin =  conf_.getParameter<unsigned int>("HitMapsZBin"); //300
-  double zMax = conf_.getParameter<double>("HitMapZMax"); //300.0; //cm
-  
-  int rBin = conf_.getParameter<unsigned int>("HitMapsRBin");//120;
-  double rMax = conf_.getParameter<double>("HitMapRMax"); //120.0; //cm
+  int zBin = conf_.getParameter<unsigned int>("HitMapsZBin");  // 300
+  double zMax = conf_.getParameter<double>("HitMapZMax");      // 300.0; //cm
+
+  int rBin = conf_.getParameter<unsigned int>("HitMapsRBin");  // 120;
+  double rMax = conf_.getParameter<double>("HitMapRMax");      // 120.0; //cm
 
   histname = "Hits_ZvsR_";
   double rMin = 0.0;
-  if( useSignedR_ )
+  if (useSignedR_)
     rMin = -rMax;
 
-  Hits_ZvsR_ = iBooker.book2D(histname+AlgoName, histname+AlgoName, zBin, -zMax, zMax, rBin, rMin, rMax);
+  Hits_ZvsR_ = iBooker.book2D(histname + AlgoName, histname + AlgoName, zBin, -zMax, zMax, rBin, rMin, rMax);
 
   histname = "Hits_XvsY_";
-  Hits_XvsY_ = iBooker.book2D(histname+AlgoName, histname+AlgoName, rBin, -rMax, rMax, rBin, -rMax, rMax);
+  Hits_XvsY_ = iBooker.book2D(histname + AlgoName, histname + AlgoName, rBin, -rMax, rMax, rBin, -rMax, rMax);
 
-  if( fillRawIdMap_){
+  if (fillRawIdMap_) {
     histname = "Hits_perDetId_";
-    
-    //leads to differences in axsis between samples??
-    //int nModules = binByRawId_.size();
-    //Hits_perDetId_ = iBooker.book1D(histname+AlgoName, histname+AlgoName, nModules, static_cast<double>(nModules) -0.5, static_cast<double>(nModules) -0.5);
-    Hits_perDetId_ = iBooker.book1D(histname+AlgoName, histname+AlgoName, 16601,-0.5, 16600.5 );
+
+    // leads to differences in axsis between samples??
+    // int nModules = binByRawId_.size();
+    // Hits_perDetId_ = iBooker.book1D(histname+AlgoName, histname+AlgoName,
+    // nModules, static_cast<double>(nModules) -0.5,
+    // static_cast<double>(nModules) -0.5);
+    Hits_perDetId_ = iBooker.book1D(histname + AlgoName, histname + AlgoName, 16601, -0.5, 16600.5);
     Hits_perDetId_->setAxisTitle("rawId Bins");
 
-    //// impossible takes too much memory :(  
+    //// impossible takes too much memory :(
     //  std::stringstream binLabel;
-    //  for( std::map<int,int>::iterator it = binByRawId_.begin(); it != binByRawId_.end(); ++it ){
+    //  for( std::map<int,int>::iterator it = binByRawId_.begin(); it !=
+    //  binByRawId_.end(); ++it ){
     //    binLabel.str() = "";
     //    binLabel << (*it).first;
-    //    Hits_perDetId_->getTH1()->GetXaxis()->SetBinLabel( (*it).second +1, binLabel.str().c_str());
+    //    Hits_perDetId_->getTH1()->GetXaxis()->SetBinLabel( (*it).second +1,
+    //    binLabel.str().c_str());
     //  }
   }
 }
 //
 // -- Analyse
 //
-void TkAlCaRecoMonitor::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
-
+void TkAlCaRecoMonitor::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   edm::Handle<reco::TrackCollection> trackCollection;
   iEvent.getByToken(trackProducer_, trackCollection);
-  if (!trackCollection.isValid()){
-    edm::LogError("Alignment")<<"invalid trackcollection encountered!";
+  if (!trackCollection.isValid()) {
+    edm::LogError("Alignment") << "invalid trackcollection encountered!";
     return;
   }
 
   edm::Handle<reco::TrackCollection> referenceTrackCollection;
   iEvent.getByToken(referenceTrackProducer_, referenceTrackCollection);
-  if (!trackCollection.isValid()){
-    edm::LogError("Alignment")<<"invalid reference track-collection encountered!";
+  if (!trackCollection.isValid()) {
+    edm::LogError("Alignment") << "invalid reference track-collection encountered!";
     return;
   }
 
   edm::ESHandle<TrackerGeometry> geometry;
   iSetup.get<TrackerDigiGeometryRecord>().get(geometry);
-  if(! geometry.isValid()){
-    edm::LogError("Alignment")<<"invalid geometry found in event setup!";
+  if (!geometry.isValid()) {
+    edm::LogError("Alignment") << "invalid geometry found in event setup!";
   }
 
   edm::ESHandle<MagneticField> magneticField;
   iSetup.get<IdealMagneticFieldRecord>().get(magneticField);
-  if (!magneticField.isValid()){
-    edm::LogError("Alignment")<<"invalid magnetic field configuration encountered!";
+  if (!magneticField.isValid()) {
+    edm::LogError("Alignment") << "invalid magnetic field configuration encountered!";
     return;
   }
 
   edm::Handle<reco::CaloJetCollection> jets;
-  if(runsOnReco_){
+  if (runsOnReco_) {
     iEvent.getByToken(jetCollection_, jets);
-    if(! jets.isValid()){
-      edm::LogError("Alignment")<<"no jet collection found in event!";
+    if (!jets.isValid()) {
+      edm::LogError("Alignment") << "no jet collection found in event!";
     }
   }
   // fill only once - not yet in beginJob since no access to geometry
-  if (fillRawIdMap_ && binByRawId_.empty()) this->fillRawIdMap(*geometry);
+  if (fillRawIdMap_ && binByRawId_.empty())
+    this->fillRawIdMap(*geometry);
+
+  AlCaRecoTrackEfficiency_->Fill(static_cast<double>((*trackCollection).size()) / (*referenceTrackCollection).size());
 
-  AlCaRecoTrackEfficiency_->Fill( static_cast<double>((*trackCollection).size()) / (*referenceTrackCollection).size() );
-  
   double sumOfCharges = 0;
-  for( reco::TrackCollection::const_iterator track = (*trackCollection).begin(); track < (*trackCollection).end(); ++track ){
-    double dR = 0;  
-    if(runsOnReco_){
-      double minJetDeltaR = 10; // some number > 2pi
-      for(reco::CaloJetCollection::const_iterator itJet = jets->begin(); itJet != jets->end() ; ++itJet) {
-	jetPt_->Fill( (*itJet).pt() );
-	dR = deltaR((*track),(*itJet));
-	if((*itJet).pt() > maxJetPt_ && dR < minJetDeltaR)
-	  minJetDeltaR = dR; 
-	
-	//edm::LogInfo("Alignment") <<">  isolated: "<< isolated << " jetPt "<< (*itJet).pt() <<" deltaR: "<< deltaR(*(*it),(*itJet)) ;
+  for (reco::TrackCollection::const_iterator track = (*trackCollection).begin(); track < (*trackCollection).end();
+       ++track) {
+    double dR = 0;
+    if (runsOnReco_) {
+      double minJetDeltaR = 10;  // some number > 2pi
+      for (reco::CaloJetCollection::const_iterator itJet = jets->begin(); itJet != jets->end(); ++itJet) {
+        jetPt_->Fill((*itJet).pt());
+        dR = deltaR((*track), (*itJet));
+        if ((*itJet).pt() > maxJetPt_ && dR < minJetDeltaR)
+          minJetDeltaR = dR;
+
+        // edm::LogInfo("Alignment") <<">  isolated: "<< isolated << " jetPt "<<
+        // (*itJet).pt() <<" deltaR: "<< deltaR(*(*it),(*itJet)) ;
       }
-      minJetDeltaR_->Fill( minJetDeltaR );
+      minJetDeltaR_->Fill(minJetDeltaR);
     }
-    
-    double minTrackDeltaR = 10; // some number > 2pi
-    for( reco::TrackCollection::const_iterator track2 = (*trackCollection).begin(); track2 < (*trackCollection).end(); ++track2 ){
-      dR = deltaR((*track),(*track2));
-      if(dR < minTrackDeltaR && dR > 1e-6)
-	minTrackDeltaR = dR;
+
+    double minTrackDeltaR = 10;  // some number > 2pi
+    for (reco::TrackCollection::const_iterator track2 = (*trackCollection).begin(); track2 < (*trackCollection).end();
+         ++track2) {
+      dR = deltaR((*track), (*track2));
+      if (dR < minTrackDeltaR && dR > 1e-6)
+        minTrackDeltaR = dR;
     }
 
-    for ( int i = 0; i<reco::TrackBase::qualitySize; ++i){
-      if( (*track).quality( reco::TrackBase::TrackQuality(i) ) ){
-	TrackQuality_->Fill( i );
+    for (int i = 0; i < reco::TrackBase::qualitySize; ++i) {
+      if ((*track).quality(reco::TrackBase::TrackQuality(i))) {
+        TrackQuality_->Fill(i);
       }
     }
-    
+
     GlobalPoint gPoint((*track).vx(), (*track).vy(), (*track).vz());
     double B = magneticField->inTesla(gPoint).z();
-    double curv = -(*track).charge()*0.002998*B/(*track).pt();
-    TrackCurvature_->Fill( curv );
+    double curv = -(*track).charge() * 0.002998 * B / (*track).pt();
+    TrackCurvature_->Fill(curv);
 
-    if( (*track).charge() > 0 )
-      TrackPtPositive_->Fill( (*track).pt() );
-    if( (*track).charge() < 0 )
-      TrackPtNegative_->Fill( (*track).pt() );
+    if ((*track).charge() > 0)
+      TrackPtPositive_->Fill((*track).pt());
+    if ((*track).charge() < 0)
+      TrackPtNegative_->Fill((*track).pt());
 
-    minTrackDeltaR_->Fill( minTrackDeltaR );
-    fillHitmaps( *track, *geometry );
+    minTrackDeltaR_->Fill(minTrackDeltaR);
+    fillHitmaps(*track, *geometry);
     sumOfCharges += (*track).charge();
   }
 
-  sumCharge_->Fill( sumOfCharges );
-
-  if(fillInvariantMass_){
-    if((*trackCollection).size() == 2){
-      TLorentzVector track0((*trackCollection).at(0).px(),(*trackCollection).at(0).py(),(*trackCollection).at(0).pz(),
-			    sqrt(((*trackCollection).at(0).p()*(*trackCollection).at(0).p())+daughterMass_*daughterMass_));
-      TLorentzVector track1((*trackCollection).at(1).px(),(*trackCollection).at(1).py(),(*trackCollection).at(1).pz(),
-			    sqrt(((*trackCollection).at(1).p()*(*trackCollection).at(1).p())+daughterMass_*daughterMass_));
-      TLorentzVector mother = track0+track1;
-      
-      invariantMass_->Fill( mother.M() );
-    }else{
-      edm::LogInfo("Alignment")<<"wrong number of tracks trackcollection encountered: "<<(*trackCollection).size();
+  sumCharge_->Fill(sumOfCharges);
+
+  if (fillInvariantMass_) {
+    if ((*trackCollection).size() == 2) {
+      TLorentzVector track0(
+          (*trackCollection).at(0).px(),
+          (*trackCollection).at(0).py(),
+          (*trackCollection).at(0).pz(),
+          sqrt(((*trackCollection).at(0).p() * (*trackCollection).at(0).p()) + daughterMass_ * daughterMass_));
+      TLorentzVector track1(
+          (*trackCollection).at(1).px(),
+          (*trackCollection).at(1).py(),
+          (*trackCollection).at(1).pz(),
+          sqrt(((*trackCollection).at(1).p() * (*trackCollection).at(1).p()) + daughterMass_ * daughterMass_));
+      TLorentzVector mother = track0 + track1;
+
+      invariantMass_->Fill(mother.M());
+    } else {
+      edm::LogInfo("Alignment") << "wrong number of tracks trackcollection encountered: " << (*trackCollection).size();
     }
   }
 }
 
-void TkAlCaRecoMonitor::fillHitmaps(const reco::Track &track, const TrackerGeometry& geometry)
-{
-  for (trackingRecHit_iterator iHit = track.recHitsBegin(); iHit != track.recHitsEnd(); ++iHit) {    
-    if( (*iHit)->isValid() ){
+void TkAlCaRecoMonitor::fillHitmaps(const reco::Track &track, const TrackerGeometry &geometry) {
+  for (trackingRecHit_iterator iHit = track.recHitsBegin(); iHit != track.recHitsEnd(); ++iHit) {
+    if ((*iHit)->isValid()) {
       const TrackingRecHit *hit = (*iHit);
       const DetId geoId(hit->geographicalId());
-      const GeomDet* gd = geometry.idToDet(geoId);
-      // since 2_1_X local hit positions are transient. taking center of the hit module for now.
-      // The alternative would be the coarse estimation or a refit.
-      //const GlobalPoint globP( gd->toGlobal( hit->localPosition() ) );
-      const GlobalPoint globP( gd->toGlobal( Local3DPoint(0.,0.,0.) ) );
-      double r = sqrt( globP.x()*globP.x() + globP.y()*globP.y() );
-      if( useSignedR_ )
-	r*= globP.y() / fabs( globP.y() );
-
-      Hits_ZvsR_->Fill( globP.z(), r );
-      Hits_XvsY_->Fill( globP.x(), globP.y() );
-
-      if( fillRawIdMap_)
-	 Hits_perDetId_->Fill( binByRawId_[ geoId.rawId() ]);  
+      const GeomDet *gd = geometry.idToDet(geoId);
+      // since 2_1_X local hit positions are transient. taking center of the hit
+      // module for now. The alternative would be the coarse estimation or a
+      // refit.
+      // const GlobalPoint globP( gd->toGlobal( hit->localPosition() ) );
+      const GlobalPoint globP(gd->toGlobal(Local3DPoint(0., 0., 0.)));
+      double r = sqrt(globP.x() * globP.x() + globP.y() * globP.y());
+      if (useSignedR_)
+        r *= globP.y() / fabs(globP.y());
+
+      Hits_ZvsR_->Fill(globP.z(), r);
+      Hits_XvsY_->Fill(globP.x(), globP.y());
+
+      if (fillRawIdMap_)
+        Hits_perDetId_->Fill(binByRawId_[geoId.rawId()]);
     }
   }
 }
 
-void TkAlCaRecoMonitor::fillRawIdMap(const TrackerGeometry &geometry)
-{
+void TkAlCaRecoMonitor::fillRawIdMap(const TrackerGeometry &geometry) {
   std::vector<int> sortedRawIds;
-  for (std::vector<DetId>::const_iterator iDetId = geometry.detUnitIds().begin();
-       iDetId != geometry.detUnitIds().end(); ++iDetId) {
+  for (std::vector<DetId>::const_iterator iDetId = geometry.detUnitIds().begin(); iDetId != geometry.detUnitIds().end();
+       ++iDetId) {
     sortedRawIds.push_back((*iDetId).rawId());
   }
   std::sort(sortedRawIds.begin(), sortedRawIds.end());
-  
+
   int i = 0;
-  for (std::vector<int>::iterator iRawId = sortedRawIds.begin();
-       iRawId != sortedRawIds.end(); ++iRawId){
+  for (std::vector<int>::iterator iRawId = sortedRawIds.begin(); iRawId != sortedRawIds.end(); ++iRawId) {
     binByRawId_[*iRawId] = i;
     ++i;
   }
diff --git a/DQMOffline/CalibCalo/interface/DQMSourceEleCalib.h b/DQMOffline/CalibCalo/interface/DQMSourceEleCalib.h
old mode 100755
new mode 100644
index b90032ba87818..dfcbd3526802c
--- a/DQMOffline/CalibCalo/interface/DQMSourceEleCalib.h
+++ b/DQMOffline/CalibCalo/interface/DQMSourceEleCalib.h
@@ -7,92 +7,79 @@
  *
  *  \author Stefano Argiro'
  *          Andrea Gozzelino - Universita  e INFN Torino
- *   
+ *
  */
 
-
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-
-
 
 class DQMStore;
 class MonitorElement;
 
 class DQMSourceEleCalib : public DQMEDAnalyzer {
-
 public:
-
-  DQMSourceEleCalib( const edm::ParameterSet& );
+  DQMSourceEleCalib(const edm::ParameterSet &);
   ~DQMSourceEleCalib() override;
 
 protected:
-   
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
-  void analyze(const edm::Event& e, const edm::EventSetup& c) override ;
-
-
-
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
 private:
-  
-  //!find the MOX
-  DetId findMaxHit (const std::vector<std::pair<DetId, float> >&,
-		    const EcalRecHitCollection*, 
-		    const EcalRecHitCollection*  
-		  );
-  //!fills local occupancy graphs
-  void fillAroundBarrel (const EcalRecHitCollection *, int, int);
-  void fillAroundEndcap (const EcalRecHitCollection *, int, int);
-
-  int eventCounter_;      
-                        
-  //!Number of recHits per electron
-  MonitorElement * recHitsPerElectron_;
-  //!Number of electrons
-  MonitorElement * ElectronsNumber_;
-  //!ESCoP
-  MonitorElement * ESCoP_;
-  //!Occupancy
-  MonitorElement * OccupancyEB_;
-  MonitorElement * OccupancyEEP_;
-  MonitorElement * OccupancyEEM_;
-  MonitorElement * LocalOccupancyEB_;
-  MonitorElement * LocalOccupancyEE_;
-
-  //!recHits over associated recHits
-  MonitorElement * HitsVsAssociatedHits_;
+  //! find the MOX
+  DetId findMaxHit(const std::vector<std::pair<DetId, float>> &,
+                   const EcalRecHitCollection *,
+                   const EcalRecHitCollection *);
+  //! fills local occupancy graphs
+  void fillAroundBarrel(const EcalRecHitCollection *, int, int);
+  void fillAroundEndcap(const EcalRecHitCollection *, int, int);
+
+  int eventCounter_;
+
+  //! Number of recHits per electron
+  MonitorElement *recHitsPerElectron_;
+  //! Number of electrons
+  MonitorElement *ElectronsNumber_;
+  //! ESCoP
+  MonitorElement *ESCoP_;
+  //! Occupancy
+  MonitorElement *OccupancyEB_;
+  MonitorElement *OccupancyEEP_;
+  MonitorElement *OccupancyEEM_;
+  MonitorElement *LocalOccupancyEB_;
+  MonitorElement *LocalOccupancyEE_;
+
+  //! recHits over associated recHits
+  MonitorElement *HitsVsAssociatedHits_;
 
   /// object to monitor
   edm::EDGetTokenT<EcalRecHitCollection> productMonitoredEB_;
 
- /// object to monitor
+  /// object to monitor
   edm::EDGetTokenT<EcalRecHitCollection> productMonitoredEE_;
   //! electrons to monitor
   edm::EDGetTokenT<reco::GsfElectronCollection> productMonitoredElectrons_;
 
   /// Monitor every prescaleFactor_ events
   unsigned int prescaleFactor_;
-  
+
   /// DQM folder name
-  std::string folderName_; 
- 
-  /// Write to file 
+  std::string folderName_;
+
+  /// Write to file
   bool saveToFile_;
 
   /// Output file name if required
   std::string fileName_;
-
 };
 
 #endif
-
diff --git a/DQMOffline/CalibCalo/plugins/SealModule.cc b/DQMOffline/CalibCalo/plugins/SealModule.cc
index 0daa2d8ac0267..b471a894d2a7c 100644
--- a/DQMOffline/CalibCalo/plugins/SealModule.cc
+++ b/DQMOffline/CalibCalo/plugins/SealModule.cc
@@ -1,13 +1,13 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 // The PhiSym and Pi0 source module
-#include "DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h"
-#include "DQMOffline/CalibCalo/src/DQMSourcePi0.h"
 #include "DQMOffline/CalibCalo/interface/DQMSourceEleCalib.h"
-#include "DQMOffline/CalibCalo/src/DQMHcalIsoTrackAlCaReco.h"
-#include "DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.h"
 #include "DQMOffline/CalibCalo/src/DQMHOAlCaRecoStream.h"
+#include "DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.h"
+#include "DQMOffline/CalibCalo/src/DQMHcalIsoTrackAlCaReco.h"
 #include "DQMOffline/CalibCalo/src/DQMHcalIsolatedBunchAlCaReco.h"
+#include "DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h"
+#include "DQMOffline/CalibCalo/src/DQMSourcePi0.h"
 
 DEFINE_FWK_MODULE(DQMHcalPhiSymAlCaReco);
 DEFINE_FWK_MODULE(DQMSourcePi0);
diff --git a/DQMOffline/CalibCalo/src/DQMHOAlCaRecoStream.cc b/DQMOffline/CalibCalo/src/DQMHOAlCaRecoStream.cc
index 9268953eef288..d94c8d901df39 100644
--- a/DQMOffline/CalibCalo/src/DQMHOAlCaRecoStream.cc
+++ b/DQMOffline/CalibCalo/src/DQMHOAlCaRecoStream.cc
@@ -2,8 +2,9 @@
 //
 // Package:    DQMHOAlCaRecoStream
 // Class:      DQMHOAlCaRecoStream
-// 
-/**\class DQMHOAlCaRecoStream DQMHOAlCaRecoStream.cc DQMOffline/DQMHOAlCaRecoStream/src/DQMHOAlCaRecoStream.cc
+//
+/**\class DQMHOAlCaRecoStream DQMHOAlCaRecoStream.cc
+ DQMOffline/DQMHOAlCaRecoStream/src/DQMHOAlCaRecoStream.cc
 
  Description: <one line class summary>
 
@@ -16,7 +17,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -24,32 +24,26 @@
 
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
+#include "DQMOffline/CalibCalo/src/DQMHOAlCaRecoStream.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DQMOffline/CalibCalo/src/DQMHOAlCaRecoStream.h"
 
 #include <string>
 
-
-
-
-
 //
 // class decleration
 //
 using namespace std;
 using namespace edm;
 
-
-
 //
 // constants, enums and typedefs
 //
@@ -61,171 +55,171 @@ using namespace edm;
 //
 // constructors and destructor
 //
-DQMHOAlCaRecoStream::DQMHOAlCaRecoStream(const edm::ParameterSet& iConfig) :
-  hoCalibVariableCollectionTag(consumes<HOCalibVariableCollection>(iConfig.getParameter<edm::InputTag>("hoCalibVariableCollectionTag"))) {
+DQMHOAlCaRecoStream::DQMHOAlCaRecoStream(const edm::ParameterSet &iConfig)
+    : hoCalibVariableCollectionTag(
+          consumes<HOCalibVariableCollection>(iConfig.getParameter<edm::InputTag>("hoCalibVariableCollectionTag"))) {
+  // now do what ever initialization is needed
 
-  //now do what ever initialization is needed
-  
-  theRootFileName = iConfig.getUntrackedParameter<string>("RootFileName","tmp.root");
+  theRootFileName = iConfig.getUntrackedParameter<string>("RootFileName", "tmp.root");
   folderName_ = iConfig.getUntrackedParameter<string>("folderName");
-  m_sigmaValue = iConfig.getUntrackedParameter<double>("sigmaval",0.2);
-  m_lowRadPosInMuch = iConfig.getUntrackedParameter<double>("lowradposinmuch",400.0);  
-  m_highRadPosInMuch = iConfig.getUntrackedParameter<double>("highradposinmuch",480.0);  
-  m_lowEdge = iConfig.getUntrackedParameter<double>("lowedge",-2.0);  
-  m_highEdge = iConfig.getUntrackedParameter<double>("highedge",6.0);  
-  m_nbins = iConfig.getUntrackedParameter<int>("nbins",40);
-  saveToFile_ = iConfig.getUntrackedParameter<bool>("saveToFile",false);
+  m_sigmaValue = iConfig.getUntrackedParameter<double>("sigmaval", 0.2);
+  m_lowRadPosInMuch = iConfig.getUntrackedParameter<double>("lowradposinmuch", 400.0);
+  m_highRadPosInMuch = iConfig.getUntrackedParameter<double>("highradposinmuch", 480.0);
+  m_lowEdge = iConfig.getUntrackedParameter<double>("lowedge", -2.0);
+  m_highEdge = iConfig.getUntrackedParameter<double>("highedge", 6.0);
+  m_nbins = iConfig.getUntrackedParameter<int>("nbins", 40);
+  saveToFile_ = iConfig.getUntrackedParameter<bool>("saveToFile", false);
 }
 
-
-DQMHOAlCaRecoStream::~DQMHOAlCaRecoStream()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+DQMHOAlCaRecoStream::~DQMHOAlCaRecoStream() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-DQMHOAlCaRecoStream::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void DQMHOAlCaRecoStream::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace edm;
-  
+
   Nevents++;
-  
-  edm::Handle<HOCalibVariableCollection>HOCalib;
+
+  edm::Handle<HOCalibVariableCollection> HOCalib;
   bool isCosMu = true;
-  
-  iEvent.getByToken(hoCalibVariableCollectionTag, HOCalib); 
 
-  if(!HOCalib.isValid()){
+  iEvent.getByToken(hoCalibVariableCollectionTag, HOCalib);
+
+  if (!HOCalib.isValid()) {
     LogDebug("") << "DQMHOAlCaRecoStream:: Error! can't get HOCalib product!" << std::endl;
-    return ;
+    return;
   }
 
-  
-  if (isCosMu) { 
-    hMuonMultipl->Fill((*HOCalib).size(),1.);
-    if (!(*HOCalib).empty() ) {
-      for (HOCalibVariableCollection::const_iterator hoC=(*HOCalib).begin(); hoC!=(*HOCalib).end(); hoC++){
-// OK!!!!	
-	float okt = 2.;
-	double okx = std::pow((*hoC).trkvx,okt) + std::pow((*hoC).trkvy,okt);
-///////	
-	double dr=std::pow( okx, 0.5);
-	if (dr <m_lowRadPosInMuch || dr >m_highRadPosInMuch) continue; 
-	
-	if ((*hoC).isect <0) continue;
-	if (fabs((*hoC).trkth-acos(-1.)/2)<0.000001) continue;
-	int ieta = int((std::abs((*hoC).isect)%10000)/100.)-30;
-	
-	if (std::abs(ieta)>=16) continue;
-	
-	Nmuons++;
-	
-	
-	hMuonMom->Fill((*hoC).trkmm, 1.0);
-	hMuonEta->Fill(-log(tan((*hoC).trkth/2.0)), 1.0);
-	hMuonPhi->Fill((*hoC).trkph, 1.0);
-	hDirCosine->Fill((*hoC).hoang, 1.0);
-	hHOTime->Fill((*hoC).htime, 1.0);
-	
-	double energy = (*hoC).hosig[4];
-	double pedval = (*hoC).hocro;
-	int iring = 0;
-	if (ieta >=-15 && ieta <=-11) {iring = -2;}
-	else if (ieta >=-10 && ieta <=-5)  {iring = -1;}
-	else if (ieta >=  5 && ieta <= 10) {iring = 1;}
-	else if (ieta >= 11 && ieta <= 15) {iring = 2;}
-	
-	hSigRing[iring+2]->Fill(energy,1.0);
-	hPedRing[iring+2]->Fill(pedval,1.0);
-	
-	for (int k=0; k<9; k++) {
-	  hSignal3x3[k]->Fill((*hoC).hosig[k]);
-	}	
-      } //for (HOCalibVariableCollection::const_iterator hoC=(*HOCalib).begin()
-    } // if ((*HOCalib).size() >0 ) { 
-  } // if (isCosMu) { 
+  if (isCosMu) {
+    hMuonMultipl->Fill((*HOCalib).size(), 1.);
+    if (!(*HOCalib).empty()) {
+      for (HOCalibVariableCollection::const_iterator hoC = (*HOCalib).begin(); hoC != (*HOCalib).end(); hoC++) {
+        // OK!!!!
+        float okt = 2.;
+        double okx = std::pow((*hoC).trkvx, okt) + std::pow((*hoC).trkvy, okt);
+        ///////
+        double dr = std::pow(okx, 0.5);
+        if (dr < m_lowRadPosInMuch || dr > m_highRadPosInMuch)
+          continue;
+
+        if ((*hoC).isect < 0)
+          continue;
+        if (fabs((*hoC).trkth - acos(-1.) / 2) < 0.000001)
+          continue;
+        int ieta = int((std::abs((*hoC).isect) % 10000) / 100.) - 30;
+
+        if (std::abs(ieta) >= 16)
+          continue;
+
+        Nmuons++;
+
+        hMuonMom->Fill((*hoC).trkmm, 1.0);
+        hMuonEta->Fill(-log(tan((*hoC).trkth / 2.0)), 1.0);
+        hMuonPhi->Fill((*hoC).trkph, 1.0);
+        hDirCosine->Fill((*hoC).hoang, 1.0);
+        hHOTime->Fill((*hoC).htime, 1.0);
+
+        double energy = (*hoC).hosig[4];
+        double pedval = (*hoC).hocro;
+        int iring = 0;
+        if (ieta >= -15 && ieta <= -11) {
+          iring = -2;
+        } else if (ieta >= -10 && ieta <= -5) {
+          iring = -1;
+        } else if (ieta >= 5 && ieta <= 10) {
+          iring = 1;
+        } else if (ieta >= 11 && ieta <= 15) {
+          iring = 2;
+        }
+
+        hSigRing[iring + 2]->Fill(energy, 1.0);
+        hPedRing[iring + 2]->Fill(pedval, 1.0);
+
+        for (int k = 0; k < 9; k++) {
+          hSignal3x3[k]->Fill((*hoC).hosig[k]);
+        }
+      }  // for (HOCalibVariableCollection::const_iterator hoC=(*HOCalib).begin()
+    }    // if ((*HOCalib).size() >0 ) {
+  }      // if (isCosMu) {
 }
 
-
-// ------------ method called once each job just before starting event loop  ------------
-void 
-DQMHOAlCaRecoStream::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & irun, edm::EventSetup const & isetup)
-{
+// ------------ method called once each job just before starting event loop
+// ------------
+void DQMHOAlCaRecoStream::bookHistograms(DQMStore::IBooker &ibooker,
+                                         edm::Run const &irun,
+                                         edm::EventSetup const &isetup) {
   ibooker.setCurrentFolder(folderName_);
 
   char title[200];
   char name[200];
 
   hMuonMom = ibooker.book1D("hMuonMom", "Muon momentum (GeV)", 50, -100, 100);
-  hMuonMom ->setAxisTitle("Muon momentum (GeV)",1);
-  
+  hMuonMom->setAxisTitle("Muon momentum (GeV)", 1);
+
   hMuonEta = ibooker.book1D("hMuonEta", "Pseudo-rapidity of muon", 50, -1.5, 1.5);
-  hMuonEta ->setAxisTitle("Pseudo-rapidity of muon",1);
-  
+  hMuonEta->setAxisTitle("Pseudo-rapidity of muon", 1);
+
   hMuonPhi = ibooker.book1D("hMuonPhi", "Azimuthal angle of muon", 24, -acos(-1), acos(-1));
-  hMuonPhi ->setAxisTitle("Azimuthal angle of muon",1);
-    
-  hMuonMultipl = ibooker.book1D("hMuonMultipl", "Muon Multiplicity", 10, 0.5, 10.5); 
-  hMuonMultipl ->setAxisTitle("Muon Multiplicity",1);
+  hMuonPhi->setAxisTitle("Azimuthal angle of muon", 1);
+
+  hMuonMultipl = ibooker.book1D("hMuonMultipl", "Muon Multiplicity", 10, 0.5, 10.5);
+  hMuonMultipl->setAxisTitle("Muon Multiplicity", 1);
 
   hDirCosine = ibooker.book1D("hDirCosine", "Direction Cosine of muon at HO tower", 50, -1., 1.);
-  hDirCosine ->setAxisTitle("Direction Cosine of muon at HO tower",1);
+  hDirCosine->setAxisTitle("Direction Cosine of muon at HO tower", 1);
 
-  hHOTime = ibooker.book1D("hHOTime", "HO time distribution", 60, -20, 100.);  
-  hHOTime ->setAxisTitle("HO time distribution", 1);
+  hHOTime = ibooker.book1D("hHOTime", "HO time distribution", 60, -20, 100.);
+  hHOTime->setAxisTitle("HO time distribution", 1);
 
-  for (int i=0; i<5; i++) {
-    sprintf(name, "hSigRing_%i", i-2);
-    sprintf(title, "HO signal in Ring_%i", i-2);
+  for (int i = 0; i < 5; i++) {
+    sprintf(name, "hSigRing_%i", i - 2);
+    sprintf(title, "HO signal in Ring_%i", i - 2);
     hSigRing[i] = ibooker.book1D(name, title, m_nbins, m_lowEdge, m_highEdge);
-    hSigRing[i]->setAxisTitle(title,1);
+    hSigRing[i]->setAxisTitle(title, 1);
 
-    sprintf(name, "hPedRing_%i", i-2);
-    sprintf(title, "HO Pedestal in Ring_%i", i-2);
+    sprintf(name, "hPedRing_%i", i - 2);
+    sprintf(title, "HO Pedestal in Ring_%i", i - 2);
     hPedRing[i] = ibooker.book1D(name, title, m_nbins, m_lowEdge, m_highEdge);
-    hPedRing[i]->setAxisTitle(title,1);
+    hPedRing[i]->setAxisTitle(title, 1);
   }
 
-  //  hSigRingm1 = ibooker.book1D("hSigRingm1", "HO signal in Ring-1", m_nbins, m_lowEdge, m_highEdge);
-  //  hSigRingm1->setAxisTitle("HO signal in Ring-1",1);
+  //  hSigRingm1 = ibooker.book1D("hSigRingm1", "HO signal in Ring-1", m_nbins,
+  //  m_lowEdge, m_highEdge); hSigRingm1->setAxisTitle("HO signal in Ring-1",1);
+
+  //  hSigRing00 = ibooker.book1D("hSigRing00", "HO signal in Ring_0", m_nbins,
+  //  m_lowEdge, m_highEdge); hSigRing00->setAxisTitle("HO signal in Ring_0",1);
+
+  //  hSigRingp1 = ibooker.book1D("hSigRingp1", "HO signal in Ring-1", m_nbins,
+  //  m_lowEdge, m_highEdge); hSigRingp1->setAxisTitle("HO signal in Ring+1",1);
 
-  //  hSigRing00 = ibooker.book1D("hSigRing00", "HO signal in Ring_0", m_nbins, m_lowEdge, m_highEdge);
-  //  hSigRing00->setAxisTitle("HO signal in Ring_0",1);
+  //  hSigRingp2 = ibooker.book1D("hSigRingp2", "HO signal in Ring-2", m_nbins,
+  //  m_lowEdge, m_highEdge); hSigRingp2->setAxisTitle("HO signal in Ring+2",1);
 
-  //  hSigRingp1 = ibooker.book1D("hSigRingp1", "HO signal in Ring-1", m_nbins, m_lowEdge, m_highEdge);
-  //  hSigRingp1->setAxisTitle("HO signal in Ring+1",1);
+  //  hPedRingm2 = ibooker.book1D("hPedRingm2", "HO pedestal in Ring-2",
+  //  m_nbins, m_lowEdge, m_highEdge); hPedRingm1 = ibooker.book1D("hPedRingm1",
+  //  "HO pedestal in Ring-1", m_nbins, m_lowEdge, m_highEdge); hPedRing00 =
+  //  ibooker.book1D("hPedRing00", "HO pedestal in Ring_0", m_nbins, m_lowEdge,
+  //  m_highEdge); hPedRingp1 = ibooker.book1D("hPedRingp1", "HO pedestal in
+  //  Ring-1", m_nbins, m_lowEdge, m_highEdge); hPedRingp2 =
+  //  ibooker.book1D("hPedRingp2", "HO pedestal in Ring-2", m_nbins, m_lowEdge,
+  //  m_highEdge);
 
-  //  hSigRingp2 = ibooker.book1D("hSigRingp2", "HO signal in Ring-2", m_nbins, m_lowEdge, m_highEdge);
-  //  hSigRingp2->setAxisTitle("HO signal in Ring+2",1);
-  
-  //  hPedRingm2 = ibooker.book1D("hPedRingm2", "HO pedestal in Ring-2", m_nbins, m_lowEdge, m_highEdge);
-  //  hPedRingm1 = ibooker.book1D("hPedRingm1", "HO pedestal in Ring-1", m_nbins, m_lowEdge, m_highEdge);
-  //  hPedRing00 = ibooker.book1D("hPedRing00", "HO pedestal in Ring_0", m_nbins, m_lowEdge, m_highEdge);
-  //  hPedRingp1 = ibooker.book1D("hPedRingp1", "HO pedestal in Ring-1", m_nbins, m_lowEdge, m_highEdge);
-  //  hPedRingp2 = ibooker.book1D("hPedRingp2", "HO pedestal in Ring-2", m_nbins, m_lowEdge, m_highEdge);
+  for (int i = -1; i <= 1; i++) {
+    for (int j = -1; j <= 1; j++) {
+      int k = 3 * (i + 1) + j + 1;
 
-  for (int i=-1; i<=1; i++) {
-    for (int j=-1; j<=1; j++) {
-      int k = 3*(i+1)+j+1;
-      
       sprintf(title, "hSignal3x3_deta%i_dphi%i", i, j);
       hSignal3x3[k] = ibooker.book1D(title, title, m_nbins, m_lowEdge, m_highEdge);
-      hSignal3x3[k]->setAxisTitle(title,1);
+      hSignal3x3[k]->setAxisTitle(title, 1);
     }
   }
 
   Nevents = 0;
   Nmuons = 0;
-
 }
-
-
diff --git a/DQMOffline/CalibCalo/src/DQMHOAlCaRecoStream.h b/DQMOffline/CalibCalo/src/DQMHOAlCaRecoStream.h
index 1dee421398df8..03488959110f9 100644
--- a/DQMOffline/CalibCalo/src/DQMHOAlCaRecoStream.h
+++ b/DQMOffline/CalibCalo/src/DQMHOAlCaRecoStream.h
@@ -2,44 +2,41 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-#include "DataFormats/HcalCalibObjects/interface/HOCalibVariables.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+#include "DataFormats/HcalCalibObjects/interface/HOCalibVariables.h"
 
 class DQMHOAlCaRecoStream : public DQMEDAnalyzer {
-   public:
-      explicit DQMHOAlCaRecoStream(const edm::ParameterSet&);
-      ~DQMHOAlCaRecoStream() override;
-
-   private:
+public:
+  explicit DQMHOAlCaRecoStream(const edm::ParameterSet &);
+  ~DQMHOAlCaRecoStream() override;
 
-
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
+private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
+  MonitorElement *hMuonMultipl;
+  MonitorElement *hMuonMom;
+  MonitorElement *hMuonEta;
+  MonitorElement *hMuonPhi;
 
-  MonitorElement* hMuonMultipl;
-  MonitorElement* hMuonMom;
-  MonitorElement* hMuonEta;
-  MonitorElement* hMuonPhi;
+  MonitorElement *hDirCosine;
+  MonitorElement *hHOTime;
 
-  MonitorElement* hDirCosine;
-  MonitorElement* hHOTime;
-  
-  MonitorElement* hSigRing[5];
+  MonitorElement *hSigRing[5];
   //  MonitorElement* hSigRingm1;
   //  MonitorElement* hSigRing00;
   //  MonitorElement* hSigRingp1;
   //  MonitorElement* hSigRingp2;
 
-  MonitorElement* hPedRing[5];
+  MonitorElement *hPedRing[5];
   //  MonitorElement* hPedRingm1;
   //  MonitorElement* hPedRing00;
   //  MonitorElement* hPedRingp1;
   //  MonitorElement* hPedRingp2;
 
-  MonitorElement* hSignal3x3[9];
+  MonitorElement *hSignal3x3[9];
 
   int Nevents;
   int Nmuons;
@@ -51,13 +48,12 @@ class DQMHOAlCaRecoStream : public DQMEDAnalyzer {
   double m_lowRadPosInMuch;
   double m_highRadPosInMuch;
 
-  int    m_nbins;
+  int m_nbins;
   double m_lowEdge;
   double m_highEdge;
 
   bool saveToFile_;
   edm::EDGetTokenT<HOCalibVariableCollection> hoCalibVariableCollectionTag;
 
-      // ----------member data ---------------------------
-
+  // ----------member data ---------------------------
 };
diff --git a/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.cc b/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.cc
index 58fe9fdb923ce..77837f661ab2a 100644
--- a/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.cc
+++ b/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.cc
@@ -2,11 +2,11 @@
  * \file DQMHcalPhiSymAlCaReco.cc
  *
  * \author Olga Kodolova
- *        
  *
  *
- * Description: Monitoring of Phi Symmetry Calibration Stream  
-*/
+ *
+ * Description: Monitoring of Phi Symmetry Calibration Stream
+ */
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -20,11 +20,10 @@
 // work on collections
 
 #include "DataFormats/CaloTowers/interface/CaloTowerDetId.h"
-#include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "DataFormats/DetId/interface/DetId.h"
+#include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-
 // #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 // #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 // #include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
@@ -39,33 +38,28 @@ using namespace reco;
 // constructors
 // *****************************************
 
-DQMHcalDiJetsAlCaReco::DQMHcalDiJetsAlCaReco( const edm::ParameterSet& iConfig ) :
-eventCounter_(0)
-{
-//
-// Input from configurator file 
-//
-  folderName_ = iConfig.getUntrackedParameter<string>("FolderName","ALCAStreamHcalDiJets");
-
-
-  jets_= consumes<CaloJetCollection>(iConfig.getParameter<edm::InputTag>("jetsInput"));
-  ec_= consumes<EcalRecHitCollection>(iConfig.getParameter<edm::InputTag>("ecInput"));
-  hbhe_= consumes<HBHERecHitCollection>(iConfig.getParameter<edm::InputTag>("hbheInput"));
-  ho_= consumes<HORecHitCollection>(iConfig.getParameter<edm::InputTag>("hoInput"));
-  hf_= consumes<HFRecHitCollection>(iConfig.getParameter<edm::InputTag>("hfInput"));
-  
-  saveToFile_= iConfig.getUntrackedParameter<bool>("SaveToFile",false);
-  fileName_=  iConfig.getUntrackedParameter<string>("FileName","MonitorAlCaHcalDiJets.root");
-    
+DQMHcalDiJetsAlCaReco::DQMHcalDiJetsAlCaReco(const edm::ParameterSet &iConfig) : eventCounter_(0) {
+  //
+  // Input from configurator file
+  //
+  folderName_ = iConfig.getUntrackedParameter<string>("FolderName", "ALCAStreamHcalDiJets");
+
+  jets_ = consumes<CaloJetCollection>(iConfig.getParameter<edm::InputTag>("jetsInput"));
+  ec_ = consumes<EcalRecHitCollection>(iConfig.getParameter<edm::InputTag>("ecInput"));
+  hbhe_ = consumes<HBHERecHitCollection>(iConfig.getParameter<edm::InputTag>("hbheInput"));
+  ho_ = consumes<HORecHitCollection>(iConfig.getParameter<edm::InputTag>("hoInput"));
+  hf_ = consumes<HFRecHitCollection>(iConfig.getParameter<edm::InputTag>("hfInput"));
+
+  saveToFile_ = iConfig.getUntrackedParameter<bool>("SaveToFile", false);
+  fileName_ = iConfig.getUntrackedParameter<string>("FileName", "MonitorAlCaHcalDiJets.root");
 }
 
-DQMHcalDiJetsAlCaReco::~DQMHcalDiJetsAlCaReco()
-{}
+DQMHcalDiJetsAlCaReco::~DQMHcalDiJetsAlCaReco() {}
 
 //--------------------------------------------------------
-void DQMHcalDiJetsAlCaReco::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & /* iRun*/, edm::EventSetup const & /* iSetup */)
-{  
-
+void DQMHcalDiJetsAlCaReco::bookHistograms(DQMStore::IBooker &ibooker,
+                                           edm::Run const & /* iRun*/,
+                                           edm::EventSetup const & /* iSetup */) {
   // create and cd into new folder
   ibooker.setCurrentFolder(folderName_);
 
@@ -74,167 +68,140 @@ void DQMHcalDiJetsAlCaReco::bookHistograms(DQMStore::IBooker & ibooker, edm::Run
   hiDistrRecHitEnergyEBEE_->setAxisTitle("E, GeV", 1);
   hiDistrRecHitEnergyEBEE_->setAxisTitle("# rechits", 2);
 
-  hiDistrRecHitEnergyHBHE_ = ibooker.book1D("RecHitEnergyHBHE", "the number of hits inside jets", 100,0, 800);
+  hiDistrRecHitEnergyHBHE_ = ibooker.book1D("RecHitEnergyHBHE", "the number of hits inside jets", 100, 0, 800);
   hiDistrRecHitEnergyHBHE_->setAxisTitle("E, GeV", 1);
   hiDistrRecHitEnergyHBHE_->setAxisTitle("# rechits", 2);
 
-  hiDistrRecHitEnergyHF_ = ibooker.book1D("RecHitEnergyHF", "the number of hits inside jets", 150,0, 1500); 
+  hiDistrRecHitEnergyHF_ = ibooker.book1D("RecHitEnergyHF", "the number of hits inside jets", 150, 0, 1500);
   hiDistrRecHitEnergyHF_->setAxisTitle("E, GeV", 1);
   hiDistrRecHitEnergyHF_->setAxisTitle("# rechits", 2);
 
-  hiDistrRecHitEnergyHO_ = ibooker.book1D("RecHitEnergyHO", "the number of hits inside jets", 100,0, 100); 
+  hiDistrRecHitEnergyHO_ = ibooker.book1D("RecHitEnergyHO", "the number of hits inside jets", 100, 0, 100);
   hiDistrRecHitEnergyHO_->setAxisTitle("E, GeV", 1);
   hiDistrRecHitEnergyHO_->setAxisTitle("# rechits", 2);
 
-  hiDistrProbeJetEnergy_ = ibooker.book1D("ProbeJetEnergy", "the energy of probe jets", 250,0, 2500); 
+  hiDistrProbeJetEnergy_ = ibooker.book1D("ProbeJetEnergy", "the energy of probe jets", 250, 0, 2500);
   hiDistrProbeJetEnergy_->setAxisTitle("E, GeV", 1);
   hiDistrProbeJetEnergy_->setAxisTitle("# jets", 2);
 
-  hiDistrProbeJetEta_ = ibooker.book1D("ProbeJetEta", "the number of probe jets", 100, -5., 5.); 
+  hiDistrProbeJetEta_ = ibooker.book1D("ProbeJetEta", "the number of probe jets", 100, -5., 5.);
   hiDistrProbeJetEta_->setAxisTitle("#eta", 1);
   hiDistrProbeJetEta_->setAxisTitle("# jets", 2);
 
-  hiDistrProbeJetPhi_ = ibooker.book1D("ProbeJetPhi", "the number of probe jets", 50, -3.14, 3.14); 
+  hiDistrProbeJetPhi_ = ibooker.book1D("ProbeJetPhi", "the number of probe jets", 50, -3.14, 3.14);
   hiDistrProbeJetPhi_->setAxisTitle("#phi", 1);
   hiDistrProbeJetPhi_->setAxisTitle("# jets", 2);
 
-  hiDistrTagJetEnergy_ = ibooker.book1D("TagJetEnergy", "the energy of tsg jets", 250,0, 2500); 
+  hiDistrTagJetEnergy_ = ibooker.book1D("TagJetEnergy", "the energy of tsg jets", 250, 0, 2500);
   hiDistrTagJetEnergy_->setAxisTitle("E, GeV", 1);
   hiDistrTagJetEnergy_->setAxisTitle("# jets", 2);
 
-  hiDistrTagJetEta_ = ibooker.book1D("TagJetEta", "the number of  tag jets", 100, -5., 5.); 
+  hiDistrTagJetEta_ = ibooker.book1D("TagJetEta", "the number of  tag jets", 100, -5., 5.);
   hiDistrTagJetEta_->setAxisTitle("#eta", 1);
   hiDistrTagJetEta_->setAxisTitle("# jets", 2);
 
-  hiDistrTagJetPhi_ = ibooker.book1D("TagJetPhi", "the number of tag jets", 50, -3.14, 3.14); 
+  hiDistrTagJetPhi_ = ibooker.book1D("TagJetPhi", "the number of tag jets", 50, -3.14, 3.14);
   hiDistrTagJetPhi_->setAxisTitle("#phi", 1);
   hiDistrTagJetPhi_->setAxisTitle("# jets", 2);
 
-  hiDistrEtThirdJet_ = ibooker.book1D("EtThirdJet", "Et of the third jet", 90, 0, 90); 
-
-
-//==================================================================================
-
+  hiDistrEtThirdJet_ = ibooker.book1D("EtThirdJet", "Et of the third jet", 90, 0, 90);
 
+  //==================================================================================
 }
 
 //-------------------------------------------------------------
 
-void DQMHcalDiJetsAlCaReco::analyze(const Event& iEvent, 
-			       const EventSetup& iSetup ){  
- 
+void DQMHcalDiJetsAlCaReco::analyze(const Event &iEvent, const EventSetup &iSetup) {
+  eventCounter_++;
 
-   eventCounter_++;
+  CaloJet jet1, jet2, jet3;
+  Float_t etVetoJet;
 
-   CaloJet jet1, jet2, jet3;
-   Float_t etVetoJet; 
+  edm::Handle<CaloJetCollection> jets;
+  iEvent.getByToken(jets_, jets);
 
-   edm::Handle<CaloJetCollection> jets;
-   iEvent.getByToken(jets_,jets);
-   
-  if(!jets.isValid()){
+  if (!jets.isValid()) {
     LogDebug("") << "DQMHcalDiJetsAlCaReco: Error! can't getjet product!" << std::endl;
-    return ;
+    return;
   }
-   
-   
-   
-   if(jets->size()>1){
+
+  if (jets->size() > 1) {
     jet1 = (*jets)[0];
     jet2 = (*jets)[1];
-     if(fabs(jet1.eta())>fabs(jet2.eta())){
-       CaloJet jet = jet1;
-       jet1 = jet2;
-       jet2 = jet;
-     }
-     //     if(fabs(jet1.eta())>eta_1 || (fabs(jet2.eta())-jet_R) < eta_2){ return;}
-   } else {return;}
-
-   hiDistrTagJetEnergy_->Fill(jet1.energy());
-   hiDistrTagJetEta_->Fill(jet1.eta());
-   hiDistrTagJetPhi_->Fill(jet1.phi());
-
-   hiDistrProbeJetEnergy_->Fill(jet2.energy());
-   hiDistrProbeJetEta_->Fill(jet2.eta());
-   hiDistrProbeJetPhi_->Fill(jet2.phi());
-
-   if(jets->size()>2){
-     jet3 = (*jets)[2];
-     etVetoJet = jet3.et();
-     hiDistrEtThirdJet_->Fill(etVetoJet);
-   } else { etVetoJet = 0.; hiDistrEtThirdJet_->Fill(etVetoJet); }
-
-
-
-      Handle<EcalRecHitCollection> ec;
-      iEvent.getByToken(ec_,ec);
-      
-  if(!ec.isValid()){
-    LogDebug("") << "DQMHcalDiJetsAlCaReco: Error! can't get ec product!" << std::endl;
-    return ;
+    if (fabs(jet1.eta()) > fabs(jet2.eta())) {
+      CaloJet jet = jet1;
+      jet1 = jet2;
+      jet2 = jet;
+    }
+    //     if(fabs(jet1.eta())>eta_1 || (fabs(jet2.eta())-jet_R) < eta_2){
+    //     return;}
+  } else {
+    return;
   }
-      
-      
-      for(EcalRecHitCollection::const_iterator ecItr = (*ec).begin();
-                                                ecItr != (*ec).end(); ++ecItr)
-      {
-        hiDistrRecHitEnergyEBEE_->Fill(ecItr->energy()); 
-      }
 
+  hiDistrTagJetEnergy_->Fill(jet1.energy());
+  hiDistrTagJetEta_->Fill(jet1.eta());
+  hiDistrTagJetPhi_->Fill(jet1.phi());
+
+  hiDistrProbeJetEnergy_->Fill(jet2.energy());
+  hiDistrProbeJetEta_->Fill(jet2.eta());
+  hiDistrProbeJetPhi_->Fill(jet2.phi());
+
+  if (jets->size() > 2) {
+    jet3 = (*jets)[2];
+    etVetoJet = jet3.et();
+    hiDistrEtThirdJet_->Fill(etVetoJet);
+  } else {
+    etVetoJet = 0.;
+    hiDistrEtThirdJet_->Fill(etVetoJet);
+  }
 
+  Handle<EcalRecHitCollection> ec;
+  iEvent.getByToken(ec_, ec);
 
+  if (!ec.isValid()) {
+    LogDebug("") << "DQMHcalDiJetsAlCaReco: Error! can't get ec product!" << std::endl;
+    return;
+  }
 
-      Handle<HBHERecHitCollection> hbhe;
-      iEvent.getByToken(hbhe_, hbhe);
+  for (EcalRecHitCollection::const_iterator ecItr = (*ec).begin(); ecItr != (*ec).end(); ++ecItr) {
+    hiDistrRecHitEnergyEBEE_->Fill(ecItr->energy());
+  }
+
+  Handle<HBHERecHitCollection> hbhe;
+  iEvent.getByToken(hbhe_, hbhe);
 
-  if(!hbhe.isValid()){
+  if (!hbhe.isValid()) {
     LogDebug("") << "DQMHcalDiJetsAlCaReco: Error! can't get hbhe product!" << std::endl;
-    return ;
+    return;
   }
 
+  for (HBHERecHitCollection::const_iterator hbheItr = hbhe->begin(); hbheItr != hbhe->end(); hbheItr++) {
+    hiDistrRecHitEnergyHBHE_->Fill(hbheItr->energy());
+  }
 
-      for(HBHERecHitCollection::const_iterator hbheItr=hbhe->begin();
-                                                 hbheItr!=hbhe->end(); hbheItr++)
-      {
-	hiDistrRecHitEnergyHBHE_->Fill(hbheItr->energy()); 
-      }
-
-   
-      Handle<HORecHitCollection> ho;
-      iEvent.getByToken(ho_, ho);
+  Handle<HORecHitCollection> ho;
+  iEvent.getByToken(ho_, ho);
 
-  if(!ho.isValid()){
+  if (!ho.isValid()) {
     LogDebug("") << "DQMHcalDiJetsAlCaReco: Error! can't get ho product!" << std::endl;
-    return ;
+    return;
   }
 
+  for (HORecHitCollection::const_iterator hoItr = ho->begin(); hoItr != ho->end(); hoItr++) {
+    hiDistrRecHitEnergyHO_->Fill(hoItr->energy());
+  }
 
-      for(HORecHitCollection::const_iterator hoItr=ho->begin();
-                                               hoItr!=ho->end(); hoItr++)
-      {
-         hiDistrRecHitEnergyHO_->Fill(hoItr->energy());
-
-      }
-
-
-
-
-      Handle<HFRecHitCollection> hf;
-      iEvent.getByToken(hf_, hf);
+  Handle<HFRecHitCollection> hf;
+  iEvent.getByToken(hf_, hf);
 
-  if(!hf.isValid()){
+  if (!hf.isValid()) {
     LogDebug("") << "DQMHcalDiJetsAlCaReco: Error! can't get hf product!" << std::endl;
-    return ;
+    return;
   }
 
+  for (HFRecHitCollection::const_iterator hfItr = hf->begin(); hfItr != hf->end(); hfItr++) {
+    hiDistrRecHitEnergyHF_->Fill(hfItr->energy());
+  }
 
-      for(HFRecHitCollection::const_iterator hfItr=hf->begin();
-                                               hfItr!=hf->end(); hfItr++)
-      {
-	hiDistrRecHitEnergyHF_->Fill(hfItr->energy()); 
-      }
-	
-} //analyze
-
-
-
+}  // analyze
diff --git a/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.h b/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.h
index 12e9e11b40a63..1ccb01b54b35a 100644
--- a/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.h
+++ b/DQMOffline/CalibCalo/src/DQMHcalDiJetsAlCaReco.h
@@ -7,80 +7,69 @@
  *
  *  \author Stefano Argiro'
  *          Andrea Gozzelino - Universita  e INFN Torino
- *   
+ *
  */
 
-
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+#include "DataFormats/CaloTowers/interface/CaloTowerCollection.h"
+#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
+#include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
 #include "DataFormats/JetReco/interface/CaloJetCollection.h"
-#include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
-#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
-#include "DataFormats/CaloTowers/interface/CaloTowerCollection.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
 class MonitorElement;
 
 class DQMHcalDiJetsAlCaReco : public DQMEDAnalyzer {
-
 public:
-
-  DQMHcalDiJetsAlCaReco( const edm::ParameterSet& );
+  DQMHcalDiJetsAlCaReco(const edm::ParameterSet &);
   ~DQMHcalDiJetsAlCaReco() override;
 
 protected:
-   
-
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(const edm::Event& e, const edm::EventSetup& c) override ;
-
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
 private:
- 
+  int eventCounter_;
 
-  int eventCounter_;  
-      
-//                        
-// Monitor elements
-//
-  MonitorElement * hiDistrRecHitEnergyEBEE_;
-  MonitorElement * hiDistrRecHitEnergyHBHE_;
-  MonitorElement * hiDistrRecHitEnergyHF_;
-  MonitorElement * hiDistrRecHitEnergyHO_;
+  //
+  // Monitor elements
+  //
+  MonitorElement *hiDistrRecHitEnergyEBEE_;
+  MonitorElement *hiDistrRecHitEnergyHBHE_;
+  MonitorElement *hiDistrRecHitEnergyHF_;
+  MonitorElement *hiDistrRecHitEnergyHO_;
 
-  MonitorElement * hiDistrProbeJetEnergy_;
-  MonitorElement * hiDistrProbeJetEta_;
-  MonitorElement * hiDistrProbeJetPhi_;
+  MonitorElement *hiDistrProbeJetEnergy_;
+  MonitorElement *hiDistrProbeJetEta_;
+  MonitorElement *hiDistrProbeJetPhi_;
 
-  MonitorElement * hiDistrTagJetEnergy_;
-  MonitorElement * hiDistrTagJetEta_;
-  MonitorElement * hiDistrTagJetPhi_;
-  
-  MonitorElement * hiDistrEtThirdJet_;
+  MonitorElement *hiDistrTagJetEnergy_;
+  MonitorElement *hiDistrTagJetEta_;
+  MonitorElement *hiDistrTagJetPhi_;
 
+  MonitorElement *hiDistrEtThirdJet_;
 
   /// object to monitor
   edm::EDGetTokenT<reco::CaloJetCollection> jets_;
-  edm::EDGetTokenT<EcalRecHitCollection>    ec_;
-  edm::EDGetTokenT<HBHERecHitCollection>    hbhe_;
-  edm::EDGetTokenT<HORecHitCollection>      ho_;
-  edm::EDGetTokenT<HFRecHitCollection>      hf_;
-  
+  edm::EDGetTokenT<EcalRecHitCollection> ec_;
+  edm::EDGetTokenT<HBHERecHitCollection> hbhe_;
+  edm::EDGetTokenT<HORecHitCollection> ho_;
+  edm::EDGetTokenT<HFRecHitCollection> hf_;
+
   /// DQM folder name
-  std::string folderName_; 
- 
-  /// Write to file 
+  std::string folderName_;
+
+  /// Write to file
   bool saveToFile_;
 
   /// Output file name if required
   std::string fileName_;
 
   bool allowMissingInputs_;
-
 };
 
 #endif
-
diff --git a/DQMOffline/CalibCalo/src/DQMHcalIsoTrackAlCaReco.cc b/DQMOffline/CalibCalo/src/DQMHcalIsoTrackAlCaReco.cc
index ab702e9839623..2f574a39bdd37 100644
--- a/DQMOffline/CalibCalo/src/DQMHcalIsoTrackAlCaReco.cc
+++ b/DQMOffline/CalibCalo/src/DQMHcalIsoTrackAlCaReco.cc
@@ -2,8 +2,9 @@
 //
 // Package:    DQMOffline/CalibCalo
 // Class:      DQMHcalIsoTrackAlCaReco
-// 
-/**\class DQMHcalIsoTrackAlCaReco DQMHcalIsoTrackAlCaReco.cc DQMOffline/CalibCalo/src/DQMHcalIsoTrackAlCaReco.cc
+//
+/**\class DQMHcalIsoTrackAlCaReco DQMHcalIsoTrackAlCaReco.cc
+ DQMOffline/CalibCalo/src/DQMHcalIsoTrackAlCaReco.cc
 
  Description: <one line class summary>
 
@@ -25,235 +26,221 @@
 #include "DQMOffline/CalibCalo/src/DQMHcalIsoTrackAlCaReco.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-DQMHcalIsoTrackAlCaReco::DQMHcalIsoTrackAlCaReco(const edm::ParameterSet& iConfig) {
-  folderName_  = iConfig.getParameter<std::string>("FolderName");
-  l1FilterTag_ = iConfig.getParameter<std::vector<std::string> >("L1FilterLabel");
-  hltFilterTag_= iConfig.getParameter<std::vector<std::string> >("HltFilterLabels");
-  type_        = iConfig.getParameter<std::vector<int> >("TypeFilter");
-  labelTrigger_= iConfig.getParameter<edm::InputTag>("TriggerLabel");
-  labelTrack_  = iConfig.getParameter<edm::InputTag>("TracksLabel");
-  pThr_        = iConfig.getUntrackedParameter<double>("pThrL3",0);
+DQMHcalIsoTrackAlCaReco::DQMHcalIsoTrackAlCaReco(const edm::ParameterSet &iConfig) {
+  folderName_ = iConfig.getParameter<std::string>("FolderName");
+  l1FilterTag_ = iConfig.getParameter<std::vector<std::string>>("L1FilterLabel");
+  hltFilterTag_ = iConfig.getParameter<std::vector<std::string>>("HltFilterLabels");
+  type_ = iConfig.getParameter<std::vector<int>>("TypeFilter");
+  labelTrigger_ = iConfig.getParameter<edm::InputTag>("TriggerLabel");
+  labelTrack_ = iConfig.getParameter<edm::InputTag>("TracksLabel");
+  pThr_ = iConfig.getUntrackedParameter<double>("pThrL3", 0);
 
-  nTotal_     = nHLTaccepts_ = 0;
+  nTotal_ = nHLTaccepts_ = 0;
   tokTrigger_ = consumes<trigger::TriggerEvent>(labelTrigger_);
-  tokTrack_   = consumes<reco::HcalIsolatedTrackCandidateCollection>(labelTrack_);
-  LogDebug("HcalIsoTrack") << "Folder " << folderName_ 
-			   << " Input Tag for Trigger " << labelTrigger_ 
-			   << " track " << labelTrack_ << " threshold "
-			   << pThr_ << " with " << l1FilterTag_.size() 
-			   << " level 1 and " << hltFilterTag_.size() 
-			   << " hlt filter tags" << "\n";
-  for (unsigned int k=0; k<l1FilterTag_.size(); ++k) 
+  tokTrack_ = consumes<reco::HcalIsolatedTrackCandidateCollection>(labelTrack_);
+  LogDebug("HcalIsoTrack") << "Folder " << folderName_ << " Input Tag for Trigger " << labelTrigger_ << " track "
+                           << labelTrack_ << " threshold " << pThr_ << " with " << l1FilterTag_.size()
+                           << " level 1 and " << hltFilterTag_.size() << " hlt filter tags"
+                           << "\n";
+  for (unsigned int k = 0; k < l1FilterTag_.size(); ++k)
     LogDebug("HcalIsoTrack") << "L1FilterTag[" << k << "] " << l1FilterTag_[k] << "\n";
-  for (unsigned int k=0; k<hltFilterTag_.size(); ++k)
+  for (unsigned int k = 0; k < hltFilterTag_.size(); ++k)
     LogDebug("HcalIsoTrack") << "HLTFilterTag[" << k << "] " << hltFilterTag_[k] << "\n";
 }
 
 DQMHcalIsoTrackAlCaReco::~DQMHcalIsoTrackAlCaReco() {}
 
-void DQMHcalIsoTrackAlCaReco::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
-
+void DQMHcalIsoTrackAlCaReco::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   nTotal_++;
   bool accept(false);
   edm::Handle<trigger::TriggerEvent> trEv;
-  iEvent.getByToken(tokTrigger_,trEv);
-  
+  iEvent.getByToken(tokTrigger_, trEv);
+
   edm::Handle<reco::HcalIsolatedTrackCandidateCollection> recoIsoTracks;
-  iEvent.getByToken(tokTrack_,recoIsoTracks);
-  LogDebug("HcalIsoTrack") << "Gets Trigger information with " 
-			   << trEv.isValid() <<" and offline tracks with "
-			   << recoIsoTracks.isValid() << "\n";
+  iEvent.getByToken(tokTrack_, recoIsoTracks);
+  LogDebug("HcalIsoTrack") << "Gets Trigger information with " << trEv.isValid() << " and offline tracks with "
+                           << recoIsoTracks.isValid() << "\n";
 
   if (trEv.isValid()) {
-    const trigger::TriggerObjectCollection& TOCol(trEv->getObjects());
+    const trigger::TriggerObjectCollection &TOCol(trEv->getObjects());
     const trigger::size_type nFilt(trEv->sizeFilters());
-    //plots for L1 trigger
-    for (unsigned int k=0; k<l1FilterTag_.size(); ++k) {
+    // plots for L1 trigger
+    for (unsigned int k = 0; k < l1FilterTag_.size(); ++k) {
       trigger::Keys KEYSl1;
       double etaTrigl1(-10000), phiTrigl1(-10000), ptMaxl1(0);
-      for (trigger::size_type iFilt=0; iFilt!=nFilt; iFilt++) {
-	LogDebug("HcalIsoTrack") << trEv->filterTag(iFilt).label() << " find for " << l1FilterTag_[k] << " gives " << (trEv->filterTag(iFilt).label()).find(l1FilterTag_[k]) << "\n";
-	if ((trEv->filterTag(iFilt).label()).find(l1FilterTag_[k]) !=
-	    std::string::npos) {
-	  KEYSl1=trEv->filterKeys(iFilt);
-	  trigger::size_type nRegl1=KEYSl1.size();
-	  LogDebug("HcalIsoTrack") << "# of objects " << nRegl1 << "\n";
-	  for (trigger::size_type iReg=0; iReg<nRegl1; iReg++) {
-	    const trigger::TriggerObject& TObj(TOCol[KEYSl1[iReg]]);
-	    LogDebug("HcalIsoTrack") << "Object[" << iReg << "] with pt " << TObj.pt() << " " << TObj.eta() << " " << TObj.phi() << "\n";
-	    if (TObj.pt()>ptMaxl1) {
-	      etaTrigl1=TObj.eta();
-	      phiTrigl1=TObj.phi();
-	      ptMaxl1=TObj.pt();
-	    }
-	  }
-	}
+      for (trigger::size_type iFilt = 0; iFilt != nFilt; iFilt++) {
+        LogDebug("HcalIsoTrack") << trEv->filterTag(iFilt).label() << " find for " << l1FilterTag_[k] << " gives "
+                                 << (trEv->filterTag(iFilt).label()).find(l1FilterTag_[k]) << "\n";
+        if ((trEv->filterTag(iFilt).label()).find(l1FilterTag_[k]) != std::string::npos) {
+          KEYSl1 = trEv->filterKeys(iFilt);
+          trigger::size_type nRegl1 = KEYSl1.size();
+          LogDebug("HcalIsoTrack") << "# of objects " << nRegl1 << "\n";
+          for (trigger::size_type iReg = 0; iReg < nRegl1; iReg++) {
+            const trigger::TriggerObject &TObj(TOCol[KEYSl1[iReg]]);
+            LogDebug("HcalIsoTrack") << "Object[" << iReg << "] with pt " << TObj.pt() << " " << TObj.eta() << " "
+                                     << TObj.phi() << "\n";
+            if (TObj.pt() > ptMaxl1) {
+              etaTrigl1 = TObj.eta();
+              phiTrigl1 = TObj.phi();
+              ptMaxl1 = TObj.pt();
+            }
+          }
+        }
       }
-      LogDebug("HcalIsoTrack") << "For L1 trigger type " << k << " pt " 
-			       << ptMaxl1 << " eta " << etaTrigl1 
-			       << " phi " << phiTrigl1 << "\n";
+      LogDebug("HcalIsoTrack") << "For L1 trigger type " << k << " pt " << ptMaxl1 << " eta " << etaTrigl1 << " phi "
+                               << phiTrigl1 << "\n";
       if (ptMaxl1 > 0) {
-	hL1Pt_[k]->Fill(ptMaxl1);
-	hL1Eta_[k]->Fill(etaTrigl1);
-	hL1phi_[k]->Fill(phiTrigl1);
+        hL1Pt_[k]->Fill(ptMaxl1);
+        hL1Eta_[k]->Fill(etaTrigl1);
+        hL1phi_[k]->Fill(phiTrigl1);
       }
     }
-    //Now make plots for hlt objects
-    trigger::Keys KEYS;   
-    for (unsigned l=0; l<hltFilterTag_.size(); l++) {
-      for (trigger::size_type iFilt=0; iFilt!=nFilt; iFilt++) {
-	LogDebug("HcalIsoTrack") << trEv->filterTag(iFilt).label() << " find for " << hltFilterTag_[l] << " gives " << (trEv->filterTag(iFilt).label()).find(hltFilterTag_[l]) << "\n";
-	if ((trEv->filterTag(iFilt).label()).find(hltFilterTag_[l]) !=
-	    std::string::npos) {
-	  KEYS=trEv->filterKeys(iFilt);
-	  trigger::size_type nReg=KEYS.size();
-	  LogDebug("HcalIsoTrack") << "# of objects for HLT " << nReg << "\n";
-	  //checks with IsoTrack trigger results
-	  for (trigger::size_type iReg=0; iReg<nReg; iReg++) {
-	    const trigger::TriggerObject& TObj(TOCol[KEYS[iReg]]);
-	    LogDebug("HcalIsoTrack") << "HLT Filter Tag " << l 
-				     << " trigger " << iFilt << " object "
-				     << iReg << " p " << TObj.p() 
-				     << " pointer " << indexH_[l] << ":" 
-				     << hHltP_[indexH_[l]] << ":"
-				     << hHltEta_[indexH_[l]] << ":" 
-				     << hHltPhi_[indexH_[l]] << "\n";
-	    if (TObj.p()>pThr_) {
-	      hHltP_[indexH_[l]]  ->Fill(TObj.p());
-	      hHltEta_[indexH_[l]]->Fill(TObj.eta());
-	      hHltPhi_[indexH_[l]]->Fill(TObj.phi());
-	      if (ifL3_[l]) accept = true;
-	      if (recoIsoTracks.isValid() && ifL3_[l]) {
-		double minRecoL3dist(1000), pt(1000);
-		reco::HcalIsolatedTrackCandidateCollection::const_iterator mrtr;
-		for (mrtr=recoIsoTracks->begin(); mrtr!=recoIsoTracks->end(); 
-		     mrtr++)  {
-		  double R = deltaR(mrtr->eta(),mrtr->phi(),TObj.eta(),TObj.phi()); 
-		  if (R<minRecoL3dist) {
-		    minRecoL3dist = R;
-		    pt            = mrtr->pt();
-		  }
-		}
-		LogDebug("HcalIsoTrack") << "Minimum R " << minRecoL3dist 
-					 << " pt " << pt << ":" 
-					 << TObj.pt() << "\n";
-		hL3Dr_->Fill(minRecoL3dist);
-		if (minRecoL3dist<0.02) hL3Rat_->Fill(TObj.pt()/pt);
-	      }
-	    }
-	  }
+    // Now make plots for hlt objects
+    trigger::Keys KEYS;
+    for (unsigned l = 0; l < hltFilterTag_.size(); l++) {
+      for (trigger::size_type iFilt = 0; iFilt != nFilt; iFilt++) {
+        LogDebug("HcalIsoTrack") << trEv->filterTag(iFilt).label() << " find for " << hltFilterTag_[l] << " gives "
+                                 << (trEv->filterTag(iFilt).label()).find(hltFilterTag_[l]) << "\n";
+        if ((trEv->filterTag(iFilt).label()).find(hltFilterTag_[l]) != std::string::npos) {
+          KEYS = trEv->filterKeys(iFilt);
+          trigger::size_type nReg = KEYS.size();
+          LogDebug("HcalIsoTrack") << "# of objects for HLT " << nReg << "\n";
+          // checks with IsoTrack trigger results
+          for (trigger::size_type iReg = 0; iReg < nReg; iReg++) {
+            const trigger::TriggerObject &TObj(TOCol[KEYS[iReg]]);
+            LogDebug("HcalIsoTrack") << "HLT Filter Tag " << l << " trigger " << iFilt << " object " << iReg << " p "
+                                     << TObj.p() << " pointer " << indexH_[l] << ":" << hHltP_[indexH_[l]] << ":"
+                                     << hHltEta_[indexH_[l]] << ":" << hHltPhi_[indexH_[l]] << "\n";
+            if (TObj.p() > pThr_) {
+              hHltP_[indexH_[l]]->Fill(TObj.p());
+              hHltEta_[indexH_[l]]->Fill(TObj.eta());
+              hHltPhi_[indexH_[l]]->Fill(TObj.phi());
+              if (ifL3_[l])
+                accept = true;
+              if (recoIsoTracks.isValid() && ifL3_[l]) {
+                double minRecoL3dist(1000), pt(1000);
+                reco::HcalIsolatedTrackCandidateCollection::const_iterator mrtr;
+                for (mrtr = recoIsoTracks->begin(); mrtr != recoIsoTracks->end(); mrtr++) {
+                  double R = deltaR(mrtr->eta(), mrtr->phi(), TObj.eta(), TObj.phi());
+                  if (R < minRecoL3dist) {
+                    minRecoL3dist = R;
+                    pt = mrtr->pt();
+                  }
+                }
+                LogDebug("HcalIsoTrack") << "Minimum R " << minRecoL3dist << " pt " << pt << ":" << TObj.pt() << "\n";
+                hL3Dr_->Fill(minRecoL3dist);
+                if (minRecoL3dist < 0.02)
+                  hL3Rat_->Fill(TObj.pt() / pt);
+              }
+            }
+          }
         }
       }
     }
   }
 
-  //general distributions
+  // general distributions
   if (recoIsoTracks.isValid()) {
-    for (reco::HcalIsolatedTrackCandidateCollection::const_iterator itr=recoIsoTracks->begin(); itr!=recoIsoTracks->end(); itr++) {
+    for (reco::HcalIsolatedTrackCandidateCollection::const_iterator itr = recoIsoTracks->begin();
+         itr != recoIsoTracks->end();
+         itr++) {
       hMaxP_->Fill(itr->maxP());
       hEnEcal_->Fill(itr->energyEcal());
-      std::pair<int,int> etaphi = itr->towerIndex();
+      std::pair<int, int> etaphi = itr->towerIndex();
       hIeta_->Fill(etaphi.first);
       hIphi_->Fill(etaphi.second);
-      LogDebug("HcalIsoTrack") << "Reco track p " << itr->p() 
-			       << " eta|phi " << etaphi.first
-			       << "|" << etaphi.second << " maxP " 
-			       << itr->maxP() << " EcalE "
-			       << itr->energyEcal() << " pointers " 
-			       << hHltP_[3] << ":"
-			       << hHltEta_[3] << ":" << hHltPhi_[3] << "\n";
-      if (itr->p()>=pThr_) {
-	hHltP_[3]  ->Fill(itr->p());
-	hHltEta_[3]->Fill(itr->eta());
-	hHltPhi_[3]->Fill(itr->phi());
+      LogDebug("HcalIsoTrack") << "Reco track p " << itr->p() << " eta|phi " << etaphi.first << "|" << etaphi.second
+                               << " maxP " << itr->maxP() << " EcalE " << itr->energyEcal() << " pointers " << hHltP_[3]
+                               << ":" << hHltEta_[3] << ":" << hHltPhi_[3] << "\n";
+      if (itr->p() >= pThr_) {
+        hHltP_[3]->Fill(itr->p());
+        hHltEta_[3]->Fill(itr->eta());
+        hHltPhi_[3]->Fill(itr->phi());
       }
       double etaAbs = std::abs(itr->eta());
       hOffP_[0]->Fill(itr->p());
-      for (unsigned int l=1; l<etaRange_.size(); l++) {
-	if (etaAbs >= etaRange_[l-1] && etaAbs < etaRange_[l]) {
-	  LogDebug("HcalIsoTrack") << "Range " << l << " p " << itr->p() 
-				   <<  " pointer " << hOffP_[l];
-	  hOffP_[l]->Fill(itr->p());
-	  break;
-	}
+      for (unsigned int l = 1; l < etaRange_.size(); l++) {
+        if (etaAbs >= etaRange_[l - 1] && etaAbs < etaRange_[l]) {
+          LogDebug("HcalIsoTrack") << "Range " << l << " p " << itr->p() << " pointer " << hOffP_[l];
+          hOffP_[l]->Fill(itr->p());
+          break;
+        }
       }
     }
   }
 
-  if (accept) nHLTaccepts_++;
+  if (accept)
+    nHLTaccepts_++;
   LogDebug("HcalIsoTrack") << "Accept " << accept << "\n";
 }
 
-void DQMHcalIsoTrackAlCaReco::bookHistograms(DQMStore::IBooker &iBooker,
-					     edm::Run const &, 
-					     edm::EventSetup const & ) {
-
+void DQMHcalIsoTrackAlCaReco::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, edm::EventSetup const &) {
   iBooker.setCurrentFolder(folderName_);
   LogDebug("HcalIsoTrack") << "Set the folder to " << folderName_ << "\n";
   char name[100], title[200];
-  for (unsigned int k=0; k<l1FilterTag_.size(); ++k) {
-    sprintf (name, "hp%s", l1FilterTag_[k].c_str());
-    sprintf (title, "p_T of L1 object for %s", l1FilterTag_[k].c_str());
-    hL1Pt_.push_back(iBooker.book1D(name,title,1000,0,1000));
+  for (unsigned int k = 0; k < l1FilterTag_.size(); ++k) {
+    sprintf(name, "hp%s", l1FilterTag_[k].c_str());
+    sprintf(title, "p_T of L1 object for %s", l1FilterTag_[k].c_str());
+    hL1Pt_.push_back(iBooker.book1D(name, title, 1000, 0, 1000));
     hL1Pt_[k]->setAxisTitle("p_T (GeV)", 1);
-    sprintf (name, "heta%s", l1FilterTag_[k].c_str());
-    sprintf (title, "#eta of L1 object for %s", l1FilterTag_[k].c_str());
-    hL1Eta_.push_back(iBooker.book1D(name,title,100,-2.5,2.5));
-    hL1Eta_[k]->setAxisTitle("#eta",1);
-    sprintf (name, "hphi%s", l1FilterTag_[k].c_str());
-    sprintf (title, "#phi of L1 object for %s", l1FilterTag_[k].c_str());
-    hL1phi_.push_back(iBooker.book1D(name,title,100,-3.2,3.2));
-    hL1phi_[k]->setAxisTitle("#phi",1);
+    sprintf(name, "heta%s", l1FilterTag_[k].c_str());
+    sprintf(title, "#eta of L1 object for %s", l1FilterTag_[k].c_str());
+    hL1Eta_.push_back(iBooker.book1D(name, title, 100, -2.5, 2.5));
+    hL1Eta_[k]->setAxisTitle("#eta", 1);
+    sprintf(name, "hphi%s", l1FilterTag_[k].c_str());
+    sprintf(title, "#phi of L1 object for %s", l1FilterTag_[k].c_str());
+    hL1phi_.push_back(iBooker.book1D(name, title, 100, -3.2, 3.2));
+    hL1phi_[k]->setAxisTitle("#phi", 1);
   }
-  
-  std::string types[4] = {"L2","L2x","L3","Off"};
-  for (unsigned int l=0; l<4; l++) {
-    sprintf (name, "hp%s", types[l].c_str());
-    sprintf (title,"Momentum of %s object", types[l].c_str());
-    hHltP_.push_back(iBooker.book1D(name,title,200,0,1000));
+
+  std::string types[4] = {"L2", "L2x", "L3", "Off"};
+  for (unsigned int l = 0; l < 4; l++) {
+    sprintf(name, "hp%s", types[l].c_str());
+    sprintf(title, "Momentum of %s object", types[l].c_str());
+    hHltP_.push_back(iBooker.book1D(name, title, 200, 0, 1000));
     hHltP_[l]->setAxisTitle("p (GeV)", 1);
-    sprintf (name, "heta%s", types[l].c_str());
-    sprintf (title,"#eta of %s object", types[l].c_str());
-    hHltEta_.push_back(iBooker.book1D(name,title,16,-2,2));
-    hHltEta_[l]->setAxisTitle("#eta",1);
-    sprintf (name, "hphi%s", types[l].c_str());
-    sprintf (title,"#phi of %s object", types[l].c_str());
-    hHltPhi_.push_back(iBooker.book1D(name,title,16,-3.2,3.2));
-    hHltPhi_[l]->setAxisTitle("#phi",1);
+    sprintf(name, "heta%s", types[l].c_str());
+    sprintf(title, "#eta of %s object", types[l].c_str());
+    hHltEta_.push_back(iBooker.book1D(name, title, 16, -2, 2));
+    hHltEta_[l]->setAxisTitle("#eta", 1);
+    sprintf(name, "hphi%s", types[l].c_str());
+    sprintf(title, "#phi of %s object", types[l].c_str());
+    hHltPhi_.push_back(iBooker.book1D(name, title, 16, -3.2, 3.2));
+    hHltPhi_[l]->setAxisTitle("#phi", 1);
   }
-  sprintf (title,"Distance of offline track from L3 object");
-  hL3Dr_ = (iBooker.book1D("hDRL3",title,40,0,0.2));
-  hL3Dr_->setAxisTitle("R(#eta,#phi)",1);
-  sprintf (title,"Ratio of p L3/Offline");
-  hL3Rat_ = (iBooker.book1D("hRatL3",title,500,0,3));
-  indexH_.clear(); ifL3_.clear();
-  for (unsigned int l=0; l<hltFilterTag_.size(); l++) {
+  sprintf(title, "Distance of offline track from L3 object");
+  hL3Dr_ = (iBooker.book1D("hDRL3", title, 40, 0, 0.2));
+  hL3Dr_->setAxisTitle("R(#eta,#phi)", 1);
+  sprintf(title, "Ratio of p L3/Offline");
+  hL3Rat_ = (iBooker.book1D("hRatL3", title, 500, 0, 3));
+  indexH_.clear();
+  ifL3_.clear();
+  for (unsigned int l = 0; l < hltFilterTag_.size(); l++) {
     unsigned int indx = (type_[l] >= 0 && type_[l] < 3) ? type_[l] : 0;
     indexH_.push_back(indx);
-    ifL3_.push_back(indx==2);
-    LogDebug("HcalIsoTrack") << "Filter[" << l << "] " << hltFilterTag_[l]
-			     << " type " << type_[l] << " index " 
-			     << indexH_[l] << " L3? " << ifL3_[l] << "\n";
+    ifL3_.push_back(indx == 2);
+    LogDebug("HcalIsoTrack") << "Filter[" << l << "] " << hltFilterTag_[l] << " type " << type_[l] << " index "
+                             << indexH_[l] << " L3? " << ifL3_[l] << "\n";
   }
-  
+
   double etaV[6] = {0.0, 0.5, 1.0, 1.5, 2.0, 2.5};
-  for (unsigned int k=0; k<6; ++k) {
-    sprintf (name, "hOffP%d", k);
+  for (unsigned int k = 0; k < 6; ++k) {
+    sprintf(name, "hOffP%d", k);
     if (k == 0) {
-      sprintf (title, "p of AlCaReco object (All)");
+      sprintf(title, "p of AlCaReco object (All)");
     } else {
-      sprintf (title, "p of AlCaReco object (%3.1f < |#eta| < %3.1f)",etaV[k-1],etaV[k]);
+      sprintf(title, "p of AlCaReco object (%3.1f < |#eta| < %3.1f)", etaV[k - 1], etaV[k]);
     }
     etaRange_.push_back(etaV[k]);
-    hOffP_.push_back(iBooker.book1D(name,title,1000,0,1000));
-    hOffP_[k]->setAxisTitle("E (GeV)",1);
+    hOffP_.push_back(iBooker.book1D(name, title, 1000, 0, 1000));
+    hOffP_[k]->setAxisTitle("E (GeV)", 1);
   }
-  hMaxP_ = iBooker.book1D("hChgIsol","Energy for charge isolation",110,-10,100);
-  hMaxP_->setAxisTitle("p (GeV)",1);
-  hEnEcal_ = iBooker.book1D("hEnEcal","Energy in ECAL",100,0,20);
-  hEnEcal_->setAxisTitle("E (GeV)",1);
-  hIeta_   = iBooker.book1D("hIEta","i#eta for HCAL tower",90,-45,45);
-  hIeta_->setAxisTitle("i#eta",1);
-  hIphi_   = iBooker.book1D("hIPhi","i#phi for HCAL tower",72,0,72);
-  hIphi_->setAxisTitle("i#phi",1);
+  hMaxP_ = iBooker.book1D("hChgIsol", "Energy for charge isolation", 110, -10, 100);
+  hMaxP_->setAxisTitle("p (GeV)", 1);
+  hEnEcal_ = iBooker.book1D("hEnEcal", "Energy in ECAL", 100, 0, 20);
+  hEnEcal_->setAxisTitle("E (GeV)", 1);
+  hIeta_ = iBooker.book1D("hIEta", "i#eta for HCAL tower", 90, -45, 45);
+  hIeta_->setAxisTitle("i#eta", 1);
+  hIphi_ = iBooker.book1D("hIPhi", "i#phi for HCAL tower", 72, 0, 72);
+  hIphi_->setAxisTitle("i#phi", 1);
 }
diff --git a/DQMOffline/CalibCalo/src/DQMHcalIsoTrackAlCaReco.h b/DQMOffline/CalibCalo/src/DQMHcalIsoTrackAlCaReco.h
index f3d8003672a89..3c03e01632f7e 100644
--- a/DQMOffline/CalibCalo/src/DQMHcalIsoTrackAlCaReco.h
+++ b/DQMOffline/CalibCalo/src/DQMHcalIsoTrackAlCaReco.h
@@ -5,8 +5,9 @@
 //
 // Package:    DQMOffline/CalibCalo
 // Class:      DQMHcalIsoTrackAlCaReco
-// 
-/**\class DQMHcalIsoTrackAlCaReco DQMHcalIsoTrackAlCaReco.cc DQMOffline/CalibCalo/src/DQMHcalIsoTrackAlCaReco.cc
+//
+/**\class DQMHcalIsoTrackAlCaReco DQMHcalIsoTrackAlCaReco.cc
+ DQMOffline/CalibCalo/src/DQMHcalIsoTrackAlCaReco.cc
 
  Description: <one line class summary>
 
@@ -20,17 +21,16 @@
 //
 //
 
-
 // system include files
-#include <memory>
 #include <fstream>
+#include <memory>
 #include <vector>
 
 // user include files
 
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
@@ -42,36 +42,34 @@
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-
 class DQMHcalIsoTrackAlCaReco : public DQMEDAnalyzer {
-
 public:
-  explicit DQMHcalIsoTrackAlCaReco(const edm::ParameterSet&);
+  explicit DQMHcalIsoTrackAlCaReco(const edm::ParameterSet &);
   ~DQMHcalIsoTrackAlCaReco() override;
-  
+
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
 private:
-  std::string                             folderName_;
-  std::vector<std::string>                l1FilterTag_, hltFilterTag_;
-  std::vector<int>                        type_;
-  edm::InputTag                           labelTrigger_, labelTrack_;
+  std::string folderName_;
+  std::vector<std::string> l1FilterTag_, hltFilterTag_;
+  std::vector<int> type_;
+  edm::InputTag labelTrigger_, labelTrack_;
   edm::EDGetTokenT<trigger::TriggerEvent> tokTrigger_;
   edm::EDGetTokenT<reco::HcalIsolatedTrackCandidateCollection> tokTrack_;
 
-  double                                  pThr_;
-  
-  std::vector<MonitorElement*>            hL1Pt_, hL1Eta_,  hL1phi_;
-  std::vector<MonitorElement*>            hHltP_, hHltEta_, hHltPhi_;
-  MonitorElement                         *hL3Dr_, *hL3Rat_;
-  std::vector<MonitorElement*>            hOffP_;
-  MonitorElement                         *hMaxP_, *hEnEcal_, *hIeta_, *hIphi_;
+  double pThr_;
+
+  std::vector<MonitorElement *> hL1Pt_, hL1Eta_, hL1phi_;
+  std::vector<MonitorElement *> hHltP_, hHltEta_, hHltPhi_;
+  MonitorElement *hL3Dr_, *hL3Rat_;
+  std::vector<MonitorElement *> hOffP_;
+  MonitorElement *hMaxP_, *hEnEcal_, *hIeta_, *hIphi_;
 
-  int                                     nTotal_, nHLTaccepts_;
-  std::vector<double>                     etaRange_;
-  std::vector<unsigned int>               indexH_;
-  std::vector<bool>                       ifL3_;
+  int nTotal_, nHLTaccepts_;
+  std::vector<double> etaRange_;
+  std::vector<unsigned int> indexH_;
+  std::vector<bool> ifL3_;
 };
 
 #endif
diff --git a/DQMOffline/CalibCalo/src/DQMHcalIsoTrackPostProcessor.cc b/DQMOffline/CalibCalo/src/DQMHcalIsoTrackPostProcessor.cc
index 6812a087366f8..befc81dc4bb30 100644
--- a/DQMOffline/CalibCalo/src/DQMHcalIsoTrackPostProcessor.cc
+++ b/DQMOffline/CalibCalo/src/DQMHcalIsoTrackPostProcessor.cc
@@ -1,44 +1,40 @@
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMEDHarvester.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
-#include <iostream>
+#include <cmath>
 #include <cstring>
+#include <fstream>
 #include <iomanip>
-#include<fstream>
-#include <cmath>
+#include <iostream>
 
 #define DebugLog
 
 class DQMHcalIsoTrackPostProcessor : public DQMEDHarvester {
-
 public:
-  DQMHcalIsoTrackPostProcessor(const edm::ParameterSet& pset);
-  ~DQMHcalIsoTrackPostProcessor() override {};
+  DQMHcalIsoTrackPostProcessor(const edm::ParameterSet &pset);
+  ~DQMHcalIsoTrackPostProcessor() override{};
 
-//  void analyze(const edm::Event& event, const edm::EventSetup& eventSetup) override {};
-  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; //performed in the endJob
+  //  void analyze(const edm::Event& event, const edm::EventSetup& eventSetup)
+  //  override {};
+  void dqmEndJob(DQMStore::IBooker &,
+                 DQMStore::IGetter &) override;  // performed in the endJob
 
 private:
-
   std::string subDir_;
 };
 
-
-DQMHcalIsoTrackPostProcessor::DQMHcalIsoTrackPostProcessor(const edm::ParameterSet& pset) {
-  subDir_     = pset.getUntrackedParameter<std::string>("subDir");
+DQMHcalIsoTrackPostProcessor::DQMHcalIsoTrackPostProcessor(const edm::ParameterSet &pset) {
+  subDir_ = pset.getUntrackedParameter<std::string>("subDir");
 }
 
-
-void DQMHcalIsoTrackPostProcessor::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) {
-
+void DQMHcalIsoTrackPostProcessor::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
   if (igetter.dirExists(subDir_)) {
     igetter.cd(subDir_);
   } else {
@@ -46,56 +42,55 @@ void DQMHcalIsoTrackPostProcessor::dqmEndJob(DQMStore::IBooker & ibooker, DQMSto
     return;
   }
 
-  MonitorElement  *hSumEta[4], *hSumPhi[4], *hPurityEta[3], *hPurityPhi[3];
-  std::string      types[4] = {"L2","L2x","L3","Off"};
-  char             name[100], title[200];
-  for (int i=0; i<4; ++i) {
-    sprintf (name, "/heta%s", types[i].c_str()); 
+  MonitorElement *hSumEta[4], *hSumPhi[4], *hPurityEta[3], *hPurityPhi[3];
+  std::string types[4] = {"L2", "L2x", "L3", "Off"};
+  char name[100], title[200];
+  for (int i = 0; i < 4; ++i) {
+    sprintf(name, "/heta%s", types[i].c_str());
     std::string hname1 = ibooker.pwd() + std::string(name);
-    int    nbinEta = igetter.get(hname1)->getTH1F()->GetNbinsX();
+    int nbinEta = igetter.get(hname1)->getTH1F()->GetNbinsX();
     double xminEta = igetter.get(hname1)->getTH1F()->GetBinLowEdge(1);
-    double xmaxEta = igetter.get(hname1)->getTH1F()->GetBinLowEdge(nbinEta) +
-      igetter.get(hname1)->getTH1F()->GetBinWidth(nbinEta);
-    sprintf (name, "/hphi%s", types[i].c_str()); 
+    double xmaxEta =
+        igetter.get(hname1)->getTH1F()->GetBinLowEdge(nbinEta) + igetter.get(hname1)->getTH1F()->GetBinWidth(nbinEta);
+    sprintf(name, "/hphi%s", types[i].c_str());
     std::string hname2 = ibooker.pwd() + std::string(name);
-    int    nbinPhi = igetter.get(hname2)->getTH1F()->GetNbinsX();
+    int nbinPhi = igetter.get(hname2)->getTH1F()->GetNbinsX();
     double xminPhi = igetter.get(hname2)->getTH1F()->GetBinLowEdge(1);
-    double xmaxPhi = igetter.get(hname2)->getTH1F()->GetBinLowEdge(nbinEta) +
-      igetter.get(hname2)->getTH1F()->GetBinWidth(nbinEta);
-    sprintf (name, "hSum%sEta", types[i].c_str()); 
-    hSumEta[i] = ibooker.book1D(name,name,nbinEta,xminEta,xmaxEta);
-    sprintf (name, "hSum%sPhi", types[i].c_str()); 
-    hSumPhi[i] = ibooker.book1D(name,name,nbinPhi,xminPhi,xmaxPhi);
+    double xmaxPhi =
+        igetter.get(hname2)->getTH1F()->GetBinLowEdge(nbinEta) + igetter.get(hname2)->getTH1F()->GetBinWidth(nbinEta);
+    sprintf(name, "hSum%sEta", types[i].c_str());
+    hSumEta[i] = ibooker.book1D(name, name, nbinEta, xminEta, xmaxEta);
+    sprintf(name, "hSum%sPhi", types[i].c_str());
+    hSumPhi[i] = ibooker.book1D(name, name, nbinPhi, xminPhi, xmaxPhi);
     if (i < 3) {
-      sprintf (name, "hPurity%sEta", types[i].c_str()); 
-      sprintf (title,"Purity of %s sample vs #eta", types[i].c_str()); 
-      hPurityEta[i] = ibooker.book1D(name, title,nbinEta,xminEta,xmaxEta);
-      sprintf (name, "hPurity%sPhi", types[i].c_str()); 
-      sprintf (title,"Purity of %s sample vs #phi", types[i].c_str()); 
-      hPurityPhi[i] = ibooker.book1D(name, title,nbinPhi,xminPhi,xmaxPhi);
+      sprintf(name, "hPurity%sEta", types[i].c_str());
+      sprintf(title, "Purity of %s sample vs #eta", types[i].c_str());
+      hPurityEta[i] = ibooker.book1D(name, title, nbinEta, xminEta, xmaxEta);
+      sprintf(name, "hPurity%sPhi", types[i].c_str());
+      sprintf(title, "Purity of %s sample vs #phi", types[i].c_str());
+      hPurityPhi[i] = ibooker.book1D(name, title, nbinPhi, xminPhi, xmaxPhi);
     }
   }
 
-  for (int i=0; i<4; ++i) {
-    sprintf (name, "/heta%s", types[i].c_str()); 
+  for (int i = 0; i < 4; ++i) {
+    sprintf(name, "/heta%s", types[i].c_str());
     std::string hname1 = ibooker.pwd() + std::string(name);
 #ifdef DebugLog
     std::cout << "PostProcesor " << hname1 << " " << igetter.get(hname1) << std::endl;
 #endif
-    hSumEta[i]->getTH1F()->Add(igetter.get(hname1)->getTH1F(),1);
-    sprintf (name, "/hphi%s", types[i].c_str()); 
+    hSumEta[i]->getTH1F()->Add(igetter.get(hname1)->getTH1F(), 1);
+    sprintf(name, "/hphi%s", types[i].c_str());
     std::string hname2 = ibooker.pwd() + std::string(name);
 #ifdef DebugLog
     std::cout << "PostProcesor " << hname2 << " " << igetter.get(hname2) << std::endl;
 #endif
-    hSumPhi[i]->getTH1F()->Add(igetter.get(hname2)->getTH1F(),1);
+    hSumPhi[i]->getTH1F()->Add(igetter.get(hname2)->getTH1F(), 1);
   }
 
-  for (int i=0; i<3; ++i) {
-    hPurityEta[i]->getTH1F()->Divide(hSumEta[i+1]->getTH1F(),hSumEta[i]->getTH1F(),1,1);
-    hPurityPhi[i]->getTH1F()->Divide(hSumPhi[i+1]->getTH1F(),hSumPhi[i]->getTH1F(),1,1);
+  for (int i = 0; i < 3; ++i) {
+    hPurityEta[i]->getTH1F()->Divide(hSumEta[i + 1]->getTH1F(), hSumEta[i]->getTH1F(), 1, 1);
+    hPurityPhi[i]->getTH1F()->Divide(hSumPhi[i + 1]->getTH1F(), hSumPhi[i]->getTH1F(), 1, 1);
   }
-
 }
 
 DEFINE_FWK_MODULE(DQMHcalIsoTrackPostProcessor);
diff --git a/DQMOffline/CalibCalo/src/DQMHcalIsolatedBunchAlCaReco.cc b/DQMOffline/CalibCalo/src/DQMHcalIsolatedBunchAlCaReco.cc
index a8b434ba1bb2b..a5ee780a5affd 100644
--- a/DQMOffline/CalibCalo/src/DQMHcalIsolatedBunchAlCaReco.cc
+++ b/DQMOffline/CalibCalo/src/DQMHcalIsolatedBunchAlCaReco.cc
@@ -2,20 +2,20 @@
  * \file DQMHcalIsolatedBunchAlCaReco.cc
  *
  * \author Olga Kodolova
- * 
  *
  *
- * Description: Monitoring of Phi Symmetry Calibration Stream  
-*/
+ *
+ * Description: Monitoring of Phi Symmetry Calibration Stream
+ */
 
+#include "FWCore/Common/interface/TriggerNames.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/Common/interface/TriggerNames.h"
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 // DQM include files
 
@@ -23,77 +23,75 @@
 
 // work on collections
 
-#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
-#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
+#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
+#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
+#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 
-#include "DataFormats/FEDRawData/interface/FEDRawData.h"
-#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
 #include "DataFormats/FEDRawData/interface/FEDHeader.h"
-#include "EventFilter/HcalRawToDigi/interface/HcalHTRData.h"
+#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
+#include "DataFormats/FEDRawData/interface/FEDRawData.h"
 #include "EventFilter/HcalRawToDigi/interface/HcalDCCHeader.h"
+#include "EventFilter/HcalRawToDigi/interface/HcalHTRData.h"
 
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMOffline/CalibCalo/src/DQMHcalIsolatedBunchAlCaReco.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 
 // ******************************************
 // constructors
 // *****************************************
 
-DQMHcalIsolatedBunchAlCaReco::DQMHcalIsolatedBunchAlCaReco(const edm::ParameterSet& ps) {
+DQMHcalIsolatedBunchAlCaReco::DQMHcalIsolatedBunchAlCaReco(const edm::ParameterSet &ps) {
   //
-  // Input from configurator file 
+  // Input from configurator file
   //
-  folderName_   = ps.getUntrackedParameter<std::string>("FolderName","ALCAStreamHcalIsolatedBunch");
-  trigName_     = ps.getParameter<std::string>("TriggerName");
-  plotAll_      = ps.getUntrackedParameter<bool>("PlotAll",true);
-  
-  hbhereco_     = consumes<HBHERecHitCollection>(ps.getParameter<edm::InputTag>("hbheInput"));
-  horeco_       = consumes<HORecHitCollection>(ps.getParameter<edm::InputTag>("hoInput"));
-  hfreco_       = consumes<HFRecHitCollection>(ps.getParameter<edm::InputTag>("hfInput"));
-  trigResult_   = consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>("TriggerResult"));
-    
+  folderName_ = ps.getUntrackedParameter<std::string>("FolderName", "ALCAStreamHcalIsolatedBunch");
+  trigName_ = ps.getParameter<std::string>("TriggerName");
+  plotAll_ = ps.getUntrackedParameter<bool>("PlotAll", true);
+
+  hbhereco_ = consumes<HBHERecHitCollection>(ps.getParameter<edm::InputTag>("hbheInput"));
+  horeco_ = consumes<HORecHitCollection>(ps.getParameter<edm::InputTag>("hoInput"));
+  hfreco_ = consumes<HFRecHitCollection>(ps.getParameter<edm::InputTag>("hfInput"));
+  trigResult_ = consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>("TriggerResult"));
 }
 
-DQMHcalIsolatedBunchAlCaReco::~DQMHcalIsolatedBunchAlCaReco() { }
+DQMHcalIsolatedBunchAlCaReco::~DQMHcalIsolatedBunchAlCaReco() {}
 
 //--------------------------------------------------------
-void DQMHcalIsolatedBunchAlCaReco::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & irun, edm::EventSetup const & isetup) {
- 
+void DQMHcalIsolatedBunchAlCaReco::bookHistograms(DQMStore::IBooker &ibooker,
+                                                  edm::Run const &irun,
+                                                  edm::EventSetup const &isetup) {
   // create and cd into new folder
   ibooker.setCurrentFolder(folderName_);
-  h_Event_   = ibooker.book1D("hEvent","Selection summary",10,0,10);
-  h_hbhehit_ = ibooker.book1D("hHBHEHit","Size of HBHE Collection",200,0,2000);
-  h_hohit_   = ibooker.book1D("hHOHit",  "Size of HO Collection",  200,0,2000);
-  h_hfhit_   = ibooker.book1D("hHFHit",  "Size of HF Collection",  200,0,2000);
-
+  h_Event_ = ibooker.book1D("hEvent", "Selection summary", 10, 0, 10);
+  h_hbhehit_ = ibooker.book1D("hHBHEHit", "Size of HBHE Collection", 200, 0, 2000);
+  h_hohit_ = ibooker.book1D("hHOHit", "Size of HO Collection", 200, 0, 2000);
+  h_hfhit_ = ibooker.book1D("hHFHit", "Size of HF Collection", 200, 0, 2000);
 }
 
 //-------------------------------------------------------------
 
-void DQMHcalIsolatedBunchAlCaReco::analyze(const edm::Event& iEvent, 
-					   const edm::EventSetup& iSetup ){  
- 
+void DQMHcalIsolatedBunchAlCaReco::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   bool accept(false);
   /////////////////////////////TriggerResults
   edm::Handle<edm::TriggerResults> triggerResults;
   iEvent.getByToken(trigResult_, triggerResults);
   if (triggerResults.isValid()) {
-    const edm::TriggerNames & triggerNames = iEvent.triggerNames(*triggerResults);
-    const std::vector<std::string> & triggerNames_ = triggerNames.triggerNames();
-    for (unsigned int iHLT=0; iHLT<triggerResults->size(); iHLT++) {
-      int hlt    = triggerResults->accept(iHLT);
+    const edm::TriggerNames &triggerNames = iEvent.triggerNames(*triggerResults);
+    const std::vector<std::string> &triggerNames_ = triggerNames.triggerNames();
+    for (unsigned int iHLT = 0; iHLT < triggerResults->size(); iHLT++) {
+      int hlt = triggerResults->accept(iHLT);
       if (hlt > 0) {
-	if (triggerNames_[iHLT].find(trigName_)!=std::string::npos) {
-	  accept = true;
-	  break;
-	}
+        if (triggerNames_[iHLT].find(trigName_) != std::string::npos) {
+          accept = true;
+          break;
+        }
       }
     }
   }
   h_Event_->Fill(0.);
-  if (accept) h_Event_->Fill(1.);
+  if (accept)
+    h_Event_->Fill(1.);
 
   if (accept || plotAll_) {
     edm::Handle<HBHERecHitCollection> hbhe;
@@ -103,7 +101,7 @@ void DQMHcalIsolatedBunchAlCaReco::analyze(const edm::Event& iEvent,
     } else {
       h_hbhehit_->Fill(hbhe->size());
     }
-  
+
     edm::Handle<HFRecHitCollection> hf;
     iEvent.getByToken(hfreco_, hf);
     if (!hf.isValid()) {
@@ -111,7 +109,7 @@ void DQMHcalIsolatedBunchAlCaReco::analyze(const edm::Event& iEvent,
     } else {
       h_hfhit_->Fill(hf->size());
     }
-  
+
     edm::Handle<HORecHitCollection> ho;
     iEvent.getByToken(horeco_, ho);
     if (!ho.isValid()) {
@@ -120,5 +118,5 @@ void DQMHcalIsolatedBunchAlCaReco::analyze(const edm::Event& iEvent,
       h_hohit_->Fill(ho->size());
     }
   }
-	
-} //analyze
+
+}  // analyze
diff --git a/DQMOffline/CalibCalo/src/DQMHcalIsolatedBunchAlCaReco.h b/DQMOffline/CalibCalo/src/DQMHcalIsolatedBunchAlCaReco.h
index 480dce5e16f8f..9d20ef1a2142f 100644
--- a/DQMOffline/CalibCalo/src/DQMHcalIsolatedBunchAlCaReco.h
+++ b/DQMOffline/CalibCalo/src/DQMHcalIsolatedBunchAlCaReco.h
@@ -5,52 +5,48 @@
  * *
  *  DQM Source for Hcal iolated bunch stream
  *
- *   
+ *
  */
 
 #include <string>
 
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "DataFormats/HLTReco/interface/TriggerEvent.h"
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Common/interface/TriggerResults.h"
+#include "DataFormats/HLTReco/interface/TriggerEvent.h"
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
 class MonitorElement;
 
 class DQMHcalIsolatedBunchAlCaReco : public DQMEDAnalyzer {
-
 public:
-
-  DQMHcalIsolatedBunchAlCaReco( const edm::ParameterSet& );
+  DQMHcalIsolatedBunchAlCaReco(const edm::ParameterSet &);
   ~DQMHcalIsolatedBunchAlCaReco() override;
 
 protected:
-   
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(const edm::Event& e, const edm::EventSetup& c) override ;
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
 private:
-      
-  //                        
+  //
   // Monitor elements
   //
   MonitorElement *h_Event_, *h_hbhehit_, *h_hfhit_, *h_hohit_;
-  
+
   /// DQM folder name
-  std::string folderName_, trigName_; 
-  bool        plotAll_;
+  std::string folderName_, trigName_;
+  bool plotAll_;
 
   /// object to monitor
-  edm::EDGetTokenT<HBHERecHitCollection>    hbhereco_;
-  edm::EDGetTokenT<HORecHitCollection>      horeco_;
-  edm::EDGetTokenT<HFRecHitCollection>      hfreco_;
-  edm::EDGetTokenT<edm::TriggerResults>     trigResult_;
+  edm::EDGetTokenT<HBHERecHitCollection> hbhereco_;
+  edm::EDGetTokenT<HORecHitCollection> horeco_;
+  edm::EDGetTokenT<HFRecHitCollection> hfreco_;
+  edm::EDGetTokenT<edm::TriggerResults> trigResult_;
 };
 
 #endif
diff --git a/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.cc b/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.cc
index 0942fb0e5bb53..93b8bf96061d8 100644
--- a/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.cc
+++ b/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.cc
@@ -2,11 +2,11 @@
  * \file DQMHcalPhiSymAlCaReco.cc
  *
  * \author Olga Kodolova
- * 
  *
  *
- * Description: Monitoring of Phi Symmetry Calibration Stream  
-*/
+ *
+ * Description: Monitoring of Phi Symmetry Calibration Stream
+ */
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -21,19 +21,19 @@
 
 // work on collections
 
-#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
-#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
+#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
+#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
+#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 
-#include "DataFormats/FEDRawData/interface/FEDRawData.h"
-#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
 #include "DataFormats/FEDRawData/interface/FEDHeader.h"
-#include "EventFilter/HcalRawToDigi/interface/HcalHTRData.h"
+#include "DataFormats/FEDRawData/interface/FEDNumbering.h"
+#include "DataFormats/FEDRawData/interface/FEDRawData.h"
 #include "EventFilter/HcalRawToDigi/interface/HcalDCCHeader.h"
+#include "EventFilter/HcalRawToDigi/interface/HcalHTRData.h"
 
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 
 using namespace std;
 using namespace edm;
@@ -42,58 +42,55 @@ using namespace edm;
 // constructors
 // *****************************************
 
-DQMHcalPhiSymAlCaReco::DQMHcalPhiSymAlCaReco( const edm::ParameterSet& ps ) :
-eventCounter_(0)
-{
+DQMHcalPhiSymAlCaReco::DQMHcalPhiSymAlCaReco(const edm::ParameterSet &ps) : eventCounter_(0) {
   //
-  // Input from configurator file 
+  // Input from configurator file
   //
-  folderName_   = ps.getUntrackedParameter<string>("FolderName","ALCAStreamHcalPhiSym");
-  
-  hbherecoMB    = consumes<HBHERecHitCollection>(ps.getParameter<edm::InputTag>("hbheInputMB"));
-  horecoMB      = ps.getParameter<edm::InputTag>("hoInputMB");
-  hfrecoMB      = consumes<HFRecHitCollection>(ps.getParameter<edm::InputTag>("hfInputMB"));
-  
+  folderName_ = ps.getUntrackedParameter<string>("FolderName", "ALCAStreamHcalPhiSym");
+
+  hbherecoMB = consumes<HBHERecHitCollection>(ps.getParameter<edm::InputTag>("hbheInputMB"));
+  horecoMB = ps.getParameter<edm::InputTag>("hoInputMB");
+  hfrecoMB = consumes<HFRecHitCollection>(ps.getParameter<edm::InputTag>("hfInputMB"));
+
   hbherecoNoise = consumes<HBHERecHitCollection>(ps.getParameter<edm::InputTag>("hbheInputNoise"));
-  horecoNoise   = ps.getParameter<edm::InputTag>("hoInputNoise");
-  hfrecoNoise   = consumes<HFRecHitCollection>(ps.getParameter<edm::InputTag>("hfInputNoise"));
+  horecoNoise = ps.getParameter<edm::InputTag>("hoInputNoise");
+  hfrecoNoise = consumes<HFRecHitCollection>(ps.getParameter<edm::InputTag>("hfInputNoise"));
 
-  rawInLabel_   = consumes<FEDRawDataCollection>(ps.getParameter<edm::InputTag>("rawInputLabel"));
+  rawInLabel_ = consumes<FEDRawDataCollection>(ps.getParameter<edm::InputTag>("rawInputLabel"));
 
-  period_       = ps.getParameter<unsigned int>("period") ;
+  period_ = ps.getParameter<unsigned int>("period");
 
-  saveToFile_   = ps.getUntrackedParameter<bool>("SaveToFile",false);
-  fileName_     = ps.getUntrackedParameter<string>("FileName","MonitorAlCaHcalPhiSym.root");
+  saveToFile_ = ps.getUntrackedParameter<bool>("SaveToFile", false);
+  fileName_ = ps.getUntrackedParameter<string>("FileName", "MonitorAlCaHcalPhiSym.root");
 
   // histogram parameters
 
-  // Distribution of rechits in iPhi, iEta 
-  hiDistr_y_nbin_ = ps.getUntrackedParameter<int>("hiDistr_y_nbin",72);
-  hiDistr_y_min_  =  ps.getUntrackedParameter<double>("hiDistr_y_min",0.5);
-  hiDistr_y_max_  =  ps.getUntrackedParameter<double>("hiDistr_y_max",72.5);
-  hiDistr_x_nbin_ = ps.getUntrackedParameter<int>("hiDistr_x_nbin",41);
-  hiDistr_x_min_  =  ps.getUntrackedParameter<double>("hiDistr_x_min",0.5);
-  hiDistr_x_max_  =  ps.getUntrackedParameter<double>("hiDistr_x_max",41.5);
+  // Distribution of rechits in iPhi, iEta
+  hiDistr_y_nbin_ = ps.getUntrackedParameter<int>("hiDistr_y_nbin", 72);
+  hiDistr_y_min_ = ps.getUntrackedParameter<double>("hiDistr_y_min", 0.5);
+  hiDistr_y_max_ = ps.getUntrackedParameter<double>("hiDistr_y_max", 72.5);
+  hiDistr_x_nbin_ = ps.getUntrackedParameter<int>("hiDistr_x_nbin", 41);
+  hiDistr_x_min_ = ps.getUntrackedParameter<double>("hiDistr_x_min", 0.5);
+  hiDistr_x_max_ = ps.getUntrackedParameter<double>("hiDistr_x_max", 41.5);
   // Check for NZS
-  hiDistr_r_nbin_ = ps.getUntrackedParameter<int>("hiDistr_r_nbin",100);
-  ihbhe_size_     = ps.getUntrackedParameter<double>("ihbhe_size_",5184.);
-  ihf_size_       = ps.getUntrackedParameter<double>("ihf_size_",1728.);
-    
+  hiDistr_r_nbin_ = ps.getUntrackedParameter<int>("hiDistr_r_nbin", 100);
+  ihbhe_size_ = ps.getUntrackedParameter<double>("ihbhe_size_", 5184.);
+  ihf_size_ = ps.getUntrackedParameter<double>("ihf_size_", 1728.);
 }
 
-DQMHcalPhiSymAlCaReco::~DQMHcalPhiSymAlCaReco()
-{}
+DQMHcalPhiSymAlCaReco::~DQMHcalPhiSymAlCaReco() {}
 
 //--------------------------------------------------------
-void DQMHcalPhiSymAlCaReco::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & irun, edm::EventSetup const & isetup) {
- 
+void DQMHcalPhiSymAlCaReco::bookHistograms(DQMStore::IBooker &ibooker,
+                                           edm::Run const &irun,
+                                           edm::EventSetup const &isetup) {
   // create and cd into new folder
   ibooker.setCurrentFolder(folderName_);
 
   eventCounter_ = 0;
 
-  hFEDsize = ibooker.book1D("hFEDsize","HCAL FED size (kB)",200,-0.5,20.5);
-  hFEDsize->setAxisTitle("kB",1);
+  hFEDsize = ibooker.book1D("hFEDsize", "HCAL FED size (kB)", 200, -0.5, 20.5);
+  hFEDsize->setAxisTitle("kB", 1);
 
   hHcalIsZS = ibooker.book1D("hHcalIsZS", "Hcal Is ZS", 4, -1.5, 2.5);
   hHcalIsZS->setBinLabel(2, "NZS");
@@ -101,199 +98,168 @@ void DQMHcalPhiSymAlCaReco::bookHistograms(DQMStore::IBooker & ibooker, edm::Run
 
   char hname[50];
   sprintf(hname, "L1 Event Number %% %i", period_);
-  hL1Id = ibooker.book1D("hL1Id", hname,4200,-99.5,4099.5);
+  hL1Id = ibooker.book1D("hL1Id", hname, 4200, -99.5, 4099.5);
   hL1Id->setAxisTitle(hname);
-  
 
   // book some histograms 1D
   double xmin = 0.1;
   double xmax = 1.1;
-  hiDistrHBHEsize1D_ =
-    ibooker.book1D("DistrHBHEsize","Size of HBHE Collection",
-                  hiDistr_r_nbin_,
-                  xmin,
-                  xmax
-                );
-  hiDistrHFsize1D_ =
-    ibooker.book1D("DistrHFsize","Size of HF Collection",
-                  hiDistr_r_nbin_,
-                  xmin,
-                  xmax
-                );
-
+  hiDistrHBHEsize1D_ = ibooker.book1D("DistrHBHEsize", "Size of HBHE Collection", hiDistr_r_nbin_, xmin, xmax);
+  hiDistrHFsize1D_ = ibooker.book1D("DistrHFsize", "Size of HF Collection", hiDistr_r_nbin_, xmin, xmax);
 
   // First moment
-  hiDistrMBPl2D_ = 
-    ibooker.book2D("MBdepthPl1", "iphi- +ieta signal distribution at depth1",
-		 hiDistr_x_nbin_, 
-		 hiDistr_x_min_,
-		 hiDistr_x_max_,
-		 hiDistr_y_nbin_, 
-		 hiDistr_y_min_,
-		 hiDistr_y_max_
-		 );
+  hiDistrMBPl2D_ = ibooker.book2D("MBdepthPl1",
+                                  "iphi- +ieta signal distribution at depth1",
+                                  hiDistr_x_nbin_,
+                                  hiDistr_x_min_,
+                                  hiDistr_x_max_,
+                                  hiDistr_y_nbin_,
+                                  hiDistr_y_min_,
+                                  hiDistr_y_max_);
 
   hiDistrMBPl2D_->setAxisTitle("i#phi ", 2);
   hiDistrMBPl2D_->setAxisTitle("i#eta ", 1);
 
-
-  hiDistrNoisePl2D_ = 
-    ibooker.book2D("NoisedepthPl1", "iphi-ieta noise distribution at depth1",
-		 hiDistr_x_nbin_+1, 
-		 hiDistr_x_min_-1.,
-		 hiDistr_x_max_,
-		 hiDistr_y_nbin_+1, 
-		 hiDistr_y_min_-1.,
-		 hiDistr_y_max_
-		 );
+  hiDistrNoisePl2D_ = ibooker.book2D("NoisedepthPl1",
+                                     "iphi-ieta noise distribution at depth1",
+                                     hiDistr_x_nbin_ + 1,
+                                     hiDistr_x_min_ - 1.,
+                                     hiDistr_x_max_,
+                                     hiDistr_y_nbin_ + 1,
+                                     hiDistr_y_min_ - 1.,
+                                     hiDistr_y_max_);
 
   hiDistrNoisePl2D_->setAxisTitle("i#phi ", 2);
   hiDistrNoisePl2D_->setAxisTitle("i#eta ", 1);
-// Second moment
-  hiDistrMB2Pl2D_ =
-    ibooker.book2D("MB2depthPl1", "iphi- +ieta signal distribution at depth1",
-                 hiDistr_x_nbin_,
-                 hiDistr_x_min_,
-                 hiDistr_x_max_,
-                 hiDistr_y_nbin_,
-                 hiDistr_y_min_,
-                 hiDistr_y_max_
-                 );
+  // Second moment
+  hiDistrMB2Pl2D_ = ibooker.book2D("MB2depthPl1",
+                                   "iphi- +ieta signal distribution at depth1",
+                                   hiDistr_x_nbin_,
+                                   hiDistr_x_min_,
+                                   hiDistr_x_max_,
+                                   hiDistr_y_nbin_,
+                                   hiDistr_y_min_,
+                                   hiDistr_y_max_);
 
   hiDistrMB2Pl2D_->setAxisTitle("i#phi ", 2);
   hiDistrMB2Pl2D_->setAxisTitle("i#eta ", 1);
 
-
-  hiDistrNoise2Pl2D_ =
-    ibooker.book2D("Noise2depthPl1", "iphi-ieta noise distribution at depth1",
-                 hiDistr_x_nbin_,
-                 hiDistr_x_min_,
-                 hiDistr_x_max_,
-                 hiDistr_y_nbin_,
-                 hiDistr_y_min_,
-                 hiDistr_y_max_
-                 );
+  hiDistrNoise2Pl2D_ = ibooker.book2D("Noise2depthPl1",
+                                      "iphi-ieta noise distribution at depth1",
+                                      hiDistr_x_nbin_,
+                                      hiDistr_x_min_,
+                                      hiDistr_x_max_,
+                                      hiDistr_y_nbin_,
+                                      hiDistr_y_min_,
+                                      hiDistr_y_max_);
 
   hiDistrNoise2Pl2D_->setAxisTitle("i#phi ", 2);
   hiDistrNoise2Pl2D_->setAxisTitle("i#eta ", 1);
 
-// Variance
-  hiDistrVarMBPl2D_ =
-    ibooker.book2D("VarMBdepthPl1", "iphi- +ieta signal distribution at depth1",
-                 hiDistr_x_nbin_,
-                 hiDistr_x_min_,
-                 hiDistr_x_max_,
-                 hiDistr_y_nbin_,
-                 hiDistr_y_min_,
-                 hiDistr_y_max_
-                 );
+  // Variance
+  hiDistrVarMBPl2D_ = ibooker.book2D("VarMBdepthPl1",
+                                     "iphi- +ieta signal distribution at depth1",
+                                     hiDistr_x_nbin_,
+                                     hiDistr_x_min_,
+                                     hiDistr_x_max_,
+                                     hiDistr_y_nbin_,
+                                     hiDistr_y_min_,
+                                     hiDistr_y_max_);
 
   hiDistrVarMBPl2D_->setAxisTitle("i#phi ", 2);
   hiDistrVarMBPl2D_->setAxisTitle("i#eta ", 1);
 
-
-  hiDistrVarNoisePl2D_ =
-    ibooker.book2D("VarNoisedepthPl1", "iphi-ieta noise distribution at depth1",
-                 hiDistr_x_nbin_,
-                 hiDistr_x_min_,
-                 hiDistr_x_max_,
-                 hiDistr_y_nbin_,
-                 hiDistr_y_min_,
-                 hiDistr_y_max_
-                 );
+  hiDistrVarNoisePl2D_ = ibooker.book2D("VarNoisedepthPl1",
+                                        "iphi-ieta noise distribution at depth1",
+                                        hiDistr_x_nbin_,
+                                        hiDistr_x_min_,
+                                        hiDistr_x_max_,
+                                        hiDistr_y_nbin_,
+                                        hiDistr_y_min_,
+                                        hiDistr_y_max_);
 
   hiDistrVarNoisePl2D_->setAxisTitle("i#phi ", 2);
   hiDistrVarNoisePl2D_->setAxisTitle("i#eta ", 1);
 
-//==================================================================================
-// First moment
-  hiDistrMBMin2D_ = 
-    ibooker.book2D("MBdepthMin1", "iphi- +ieta signal distribution at depth1",
-		 hiDistr_x_nbin_, 
-		 hiDistr_x_min_,
-		 hiDistr_x_max_,
-		 hiDistr_y_nbin_, 
-		 hiDistr_y_min_,
-		 hiDistr_y_max_
-		 );
+  //==================================================================================
+  // First moment
+  hiDistrMBMin2D_ = ibooker.book2D("MBdepthMin1",
+                                   "iphi- +ieta signal distribution at depth1",
+                                   hiDistr_x_nbin_,
+                                   hiDistr_x_min_,
+                                   hiDistr_x_max_,
+                                   hiDistr_y_nbin_,
+                                   hiDistr_y_min_,
+                                   hiDistr_y_max_);
 
   hiDistrMBMin2D_->setAxisTitle("i#phi ", 2);
   hiDistrMBMin2D_->setAxisTitle("i#eta ", 1);
 
-
-  hiDistrNoiseMin2D_ = 
-    ibooker.book2D("NoisedepthMin1", "iphi-ieta noise distribution at depth1",
-		 hiDistr_x_nbin_, 
-		 hiDistr_x_min_,
-		 hiDistr_x_max_,
-		 hiDistr_y_nbin_, 
-		 hiDistr_y_min_,
-		 hiDistr_y_max_
-		 );
+  hiDistrNoiseMin2D_ = ibooker.book2D("NoisedepthMin1",
+                                      "iphi-ieta noise distribution at depth1",
+                                      hiDistr_x_nbin_,
+                                      hiDistr_x_min_,
+                                      hiDistr_x_max_,
+                                      hiDistr_y_nbin_,
+                                      hiDistr_y_min_,
+                                      hiDistr_y_max_);
 
   hiDistrNoiseMin2D_->setAxisTitle("i#phi ", 2);
   hiDistrNoiseMin2D_->setAxisTitle("i#eta ", 1);
-// Second moment
-  hiDistrMB2Min2D_ =
-    ibooker.book2D("MB2depthMin1", "iphi- +ieta signal distribution at depth1",
-                 hiDistr_x_nbin_,
-                 hiDistr_x_min_,
-                 hiDistr_x_max_,
-                 hiDistr_y_nbin_,
-                 hiDistr_y_min_,
-                 hiDistr_y_max_
-                 );
+  // Second moment
+  hiDistrMB2Min2D_ = ibooker.book2D("MB2depthMin1",
+                                    "iphi- +ieta signal distribution at depth1",
+                                    hiDistr_x_nbin_,
+                                    hiDistr_x_min_,
+                                    hiDistr_x_max_,
+                                    hiDistr_y_nbin_,
+                                    hiDistr_y_min_,
+                                    hiDistr_y_max_);
 
   hiDistrMB2Min2D_->setAxisTitle("i#phi ", 2);
   hiDistrMB2Min2D_->setAxisTitle("i#eta ", 1);
 
-
-  hiDistrNoise2Min2D_ =
-    ibooker.book2D("Noise2depthMin1", "iphi-ieta noise distribution at depth1",
-                 hiDistr_x_nbin_,
-                 hiDistr_x_min_,
-                 hiDistr_x_max_,
-                 hiDistr_y_nbin_,
-                 hiDistr_y_min_,
-                 hiDistr_y_max_
-                 );
+  hiDistrNoise2Min2D_ = ibooker.book2D("Noise2depthMin1",
+                                       "iphi-ieta noise distribution at depth1",
+                                       hiDistr_x_nbin_,
+                                       hiDistr_x_min_,
+                                       hiDistr_x_max_,
+                                       hiDistr_y_nbin_,
+                                       hiDistr_y_min_,
+                                       hiDistr_y_max_);
 
   hiDistrNoise2Min2D_->setAxisTitle("i#phi ", 2);
   hiDistrNoise2Min2D_->setAxisTitle("i#eta ", 1);
 
-// Variance
-  hiDistrVarMBMin2D_ =
-    ibooker.book2D("VarMBdepthMin1", "iphi- +ieta signal distribution at depth1",
-                 hiDistr_x_nbin_,
-                 hiDistr_x_min_,
-                 hiDistr_x_max_,
-                 hiDistr_y_nbin_,
-                 hiDistr_y_min_,
-                 hiDistr_y_max_
-                 );
+  // Variance
+  hiDistrVarMBMin2D_ = ibooker.book2D("VarMBdepthMin1",
+                                      "iphi- +ieta signal distribution at depth1",
+                                      hiDistr_x_nbin_,
+                                      hiDistr_x_min_,
+                                      hiDistr_x_max_,
+                                      hiDistr_y_nbin_,
+                                      hiDistr_y_min_,
+                                      hiDistr_y_max_);
 
   hiDistrVarMBMin2D_->setAxisTitle("i#phi ", 2);
   hiDistrVarMBMin2D_->setAxisTitle("i#eta ", 1);
 
-
-  hiDistrVarNoiseMin2D_ =
-    ibooker.book2D("VarNoisedepthMin1", "iphi-ieta noise distribution at depth1",
-                 hiDistr_x_nbin_,
-                 hiDistr_x_min_,
-                 hiDistr_x_max_,
-                 hiDistr_y_nbin_,
-                 hiDistr_y_min_,
-                 hiDistr_y_max_
-                 );
+  hiDistrVarNoiseMin2D_ = ibooker.book2D("VarNoisedepthMin1",
+                                         "iphi-ieta noise distribution at depth1",
+                                         hiDistr_x_nbin_,
+                                         hiDistr_x_min_,
+                                         hiDistr_x_max_,
+                                         hiDistr_y_nbin_,
+                                         hiDistr_y_min_,
+                                         hiDistr_y_max_);
 
   hiDistrVarNoiseMin2D_->setAxisTitle("i#phi ", 2);
   hiDistrVarNoiseMin2D_->setAxisTitle("i#eta ", 1);
-
-
 }
 
 //--------------------------------------------------------
-//void DQMHcalPhiSymAlCaReco::beginRun(const edm::Run& r, const EventSetup& context) {
+// void DQMHcalPhiSymAlCaReco::beginRun(const edm::Run& r, const EventSetup&
+// context) {
 ////   eventCounter_ = 0;
 //}
 
@@ -301,224 +267,207 @@ void DQMHcalPhiSymAlCaReco::bookHistograms(DQMStore::IBooker & ibooker, edm::Run
 
 //-------------------------------------------------------------
 
-void DQMHcalPhiSymAlCaReco::analyze(const Event& iEvent, 
-			       const EventSetup& iSetup ){  
- 
-
+void DQMHcalPhiSymAlCaReco::analyze(const Event &iEvent, const EventSetup &iSetup) {
   eventCounter_++;
- 
+
   edm::Handle<FEDRawDataCollection> rawIn;
-  iEvent.getByToken(rawInLabel_,rawIn);
+  iEvent.getByToken(rawInLabel_, rawIn);
 
-  if(!rawIn.isValid()){
-     LogDebug("") << "HcalCalibAlgos: Error! can't get hbhe product!" << std::endl;
-      return ;
+  if (!rawIn.isValid()) {
+    LogDebug("") << "HcalCalibAlgos: Error! can't get hbhe product!" << std::endl;
+    return;
   }
 
-  //get HCAL FEDs:
+  // get HCAL FEDs:
   std::vector<int> selFEDs;
-  for (int i=FEDNumbering::MINHCALFEDID; i<=FEDNumbering::MAXHCALFEDID; i++)
-    {
-      selFEDs.push_back(i);
-    }
+  for (int i = FEDNumbering::MINHCALFEDID; i <= FEDNumbering::MAXHCALFEDID; i++) {
+    selFEDs.push_back(i);
+  }
 
   //  std::cout<<" Size of FED "<<selFEDs.size()<<std::endl;
 
-  const FEDRawDataCollection *rdc=rawIn.product(); 
+  const FEDRawDataCollection *rdc = rawIn.product();
 
   bool hcalIsZS = false;
   int lvl1ID = 0;
   bool lvl1IDFound = false;
-  for (unsigned int k=0; k<selFEDs.size(); k++) {
-    const FEDRawData & fedData = rdc->FEDData(selFEDs[k]);
+  for (unsigned int k = 0; k < selFEDs.size(); k++) {
+    const FEDRawData &fedData = rdc->FEDData(selFEDs[k]);
     // std::cout<<fedData.size()*std::pow(1024.,-1)<<std::endl;
-    hFEDsize->Fill(fedData.size()*std::pow(1024.,-1),1);
-    
+    hFEDsize->Fill(fedData.size() * std::pow(1024., -1), 1);
+
     // get HCAL DCC Header for each FEDRawData
-    const HcalDCCHeader* dccHeader=(const HcalDCCHeader*)(fedData.data());
+    const HcalDCCHeader *dccHeader = (const HcalDCCHeader *)(fedData.data());
     if (dccHeader) {
       // walk through the HTR data...
       HcalHTRData htr;
 
-      int nspigot =0; 
-      for (int spigot=0; spigot<HcalDCCHeader::SPIGOT_COUNT; spigot++) {    
-       nspigot++;
+      int nspigot = 0;
+      for (int spigot = 0; spigot < HcalDCCHeader::SPIGOT_COUNT; spigot++) {
+        nspigot++;
 
-        if (!dccHeader->getSpigotPresent(spigot)) continue;
+        if (!dccHeader->getSpigotPresent(spigot))
+          continue;
 
         // Load the given decoder with the pointer and length from this spigot.
-        dccHeader->getSpigotData(spigot,htr, fedData.size()); 
+        dccHeader->getSpigotData(spigot, htr, fedData.size());
 
-        if(k != 20 && nspigot !=14 ) {      
-          if ( !htr.isUnsuppressed() ) { hcalIsZS = true; }
+        if (k != 20 && nspigot != 14) {
+          if (!htr.isUnsuppressed()) {
+            hcalIsZS = true;
+          }
         }
-      } 
+      }
     }
- 
+
     // try to get the lvl1ID from the HCAL fed
-    if (!lvl1IDFound && (fedData.size() > 0)) { 
+    if (!lvl1IDFound && (fedData.size() > 0)) {
       // get FED Header for FEDRawData
       FEDHeader fedHeader(fedData.data());
       lvl1ID = fedHeader.lvl1ID();
       lvl1IDFound = true;
     }
-  } // loop over HcalFEDs
-  
-  hHcalIsZS->Fill( hcalIsZS );
-  hL1Id->Fill( lvl1ID%period_ );
- 
+  }  // loop over HcalFEDs
+
+  hHcalIsZS->Fill(hcalIsZS);
+  hL1Id->Fill(lvl1ID % period_);
+
   edm::Handle<HBHERecHitCollection> hbheNS;
   iEvent.getByToken(hbherecoNoise, hbheNS);
-  
-  if(!hbheNS.isValid()){
+
+  if (!hbheNS.isValid()) {
     LogDebug("") << "HcalCalibAlgos: Error! can't get hbhe product!" << std::endl;
-    return ;
+    return;
   }
-  
+
   edm::Handle<HBHERecHitCollection> hbheMB;
   iEvent.getByToken(hbherecoMB, hbheMB);
-  
-  if(!hbheMB.isValid()){
+
+  if (!hbheMB.isValid()) {
     LogDebug("") << "HcalCalibAlgos: Error! can't get hbhe product!" << std::endl;
-    return ;
+    return;
   }
-  
+
   edm::Handle<HFRecHitCollection> hfNS;
   iEvent.getByToken(hfrecoNoise, hfNS);
-  
-  if(!hfNS.isValid()){
+
+  if (!hfNS.isValid()) {
     LogDebug("") << "HcalCalibAlgos: Error! can't get hbhe product!" << std::endl;
-    return ;
+    return;
   }
-  
+
   edm::Handle<HFRecHitCollection> hfMB;
   iEvent.getByToken(hfrecoMB, hfMB);
-  
-  if(!hfMB.isValid()){
+
+  if (!hfMB.isValid()) {
     LogDebug("") << "HcalCalibAlgos: Error! can't get hbhe product!" << std::endl;
-    return ;
+    return;
   }
-  
+
   const HBHERecHitCollection HithbheNS = *(hbheNS.product());
-  
-  hiDistrHBHEsize1D_->Fill(HithbheNS.size()/ihbhe_size_);
-  
-     
-  for(HBHERecHitCollection::const_iterator hbheItr=HithbheNS.begin(); hbheItr!=HithbheNS.end(); hbheItr++)
-        {
-        	 DetId id = (*hbheItr).detid(); 
-	         HcalDetId hid=HcalDetId(id);
-                 
-		 if(hid.depth() == 1) {
-                 if( hid.ieta() > 0 ) {
-		 hiDistrNoisePl2D_->Fill(hid.ieta(),hid.iphi(),hbheItr->energy());
-                 hiDistrNoise2Pl2D_->Fill(hid.ieta(),hid.iphi(),hbheItr->energy()*hbheItr->energy());
-                 } else {
-		 hiDistrNoiseMin2D_->Fill(fabs(hid.ieta()),hid.iphi(),hbheItr->energy());
-                 hiDistrNoise2Min2D_->Fill(fabs(hid.ieta()),hid.iphi(),hbheItr->energy()*hbheItr->energy());
-		 }
-		 }
-        }
 
-  const HBHERecHitCollection HithbheMB = *(hbheMB.product());
+  hiDistrHBHEsize1D_->Fill(HithbheNS.size() / ihbhe_size_);
 
-  for(HBHERecHitCollection::const_iterator hbheItr=HithbheMB.begin(); hbheItr!=HithbheMB.end(); hbheItr++)
-        {
-        	 DetId id = (*hbheItr).detid(); 
-	         HcalDetId hid=HcalDetId(id);
-                 
-		 if(hid.depth() == 1) {
-                 if( hid.ieta() > 0 ) {
-		 hiDistrMBPl2D_->Fill(hid.ieta(),hid.iphi(),hbheItr->energy());
-                 hiDistrMB2Pl2D_->Fill(hid.ieta(),hid.iphi(),hbheItr->energy()*hbheItr->energy());
-                 } else {
-		 hiDistrMBMin2D_->Fill(fabs(hid.ieta()),hid.iphi(),hbheItr->energy());
-                 hiDistrMB2Min2D_->Fill(fabs(hid.ieta()),hid.iphi(),hbheItr->energy()*hbheItr->energy());
-		 }
-		 }
+  for (HBHERecHitCollection::const_iterator hbheItr = HithbheNS.begin(); hbheItr != HithbheNS.end(); hbheItr++) {
+    DetId id = (*hbheItr).detid();
+    HcalDetId hid = HcalDetId(id);
 
-        }
+    if (hid.depth() == 1) {
+      if (hid.ieta() > 0) {
+        hiDistrNoisePl2D_->Fill(hid.ieta(), hid.iphi(), hbheItr->energy());
+        hiDistrNoise2Pl2D_->Fill(hid.ieta(), hid.iphi(), hbheItr->energy() * hbheItr->energy());
+      } else {
+        hiDistrNoiseMin2D_->Fill(fabs(hid.ieta()), hid.iphi(), hbheItr->energy());
+        hiDistrNoise2Min2D_->Fill(fabs(hid.ieta()), hid.iphi(), hbheItr->energy() * hbheItr->energy());
+      }
+    }
+  }
+
+  const HBHERecHitCollection HithbheMB = *(hbheMB.product());
+
+  for (HBHERecHitCollection::const_iterator hbheItr = HithbheMB.begin(); hbheItr != HithbheMB.end(); hbheItr++) {
+    DetId id = (*hbheItr).detid();
+    HcalDetId hid = HcalDetId(id);
+
+    if (hid.depth() == 1) {
+      if (hid.ieta() > 0) {
+        hiDistrMBPl2D_->Fill(hid.ieta(), hid.iphi(), hbheItr->energy());
+        hiDistrMB2Pl2D_->Fill(hid.ieta(), hid.iphi(), hbheItr->energy() * hbheItr->energy());
+      } else {
+        hiDistrMBMin2D_->Fill(fabs(hid.ieta()), hid.iphi(), hbheItr->energy());
+        hiDistrMB2Min2D_->Fill(fabs(hid.ieta()), hid.iphi(), hbheItr->energy() * hbheItr->energy());
+      }
+    }
+  }
 
   const HFRecHitCollection HithfNS = *(hfNS.product());
 
-  hiDistrHFsize1D_->Fill(HithfNS.size()/ihf_size_);
-  
-  for(HFRecHitCollection::const_iterator hbheItr=HithfNS.begin(); hbheItr!=HithfNS.end(); hbheItr++)
-        {
-	
-        	 DetId id = (*hbheItr).detid(); 
-	         HcalDetId hid=HcalDetId(id);
-                 
-		 if(hid.depth() == 1) {
-                 if( hid.ieta() > 0 ) {
-		 hiDistrNoisePl2D_->Fill(hid.ieta(),hid.iphi(),hbheItr->energy());
-                 hiDistrNoise2Pl2D_->Fill(hid.ieta(),hid.iphi(),hbheItr->energy()*hbheItr->energy());
-                 } else {
-		 hiDistrNoiseMin2D_->Fill(fabs(hid.ieta()),hid.iphi(),hbheItr->energy());
-                 hiDistrNoise2Min2D_->Fill(fabs(hid.ieta()),hid.iphi(),hbheItr->energy()*hbheItr->energy());
-		 }
-		 }
-	
-        }
+  hiDistrHFsize1D_->Fill(HithfNS.size() / ihf_size_);
 
-  const HFRecHitCollection HithfMB = *(hfMB.product());
- 
-  for(HFRecHitCollection::const_iterator hbheItr=HithfMB.begin(); hbheItr!=HithfMB.end(); hbheItr++)
-        {
-        	 DetId id = (*hbheItr).detid(); 
-	         HcalDetId hid=HcalDetId(id);
-                 
-		 if(hid.depth() == 1) {
-                 if( hid.ieta() > 0 ) {
-		 hiDistrMBPl2D_->Fill(hid.ieta(),hid.iphi(),hbheItr->energy());
-                 hiDistrMB2Pl2D_->Fill(hid.ieta(),hid.iphi(),hbheItr->energy()*hbheItr->energy());
-                 } else {
-		 hiDistrMBMin2D_->Fill(fabs(hid.ieta()),hid.iphi(),hbheItr->energy());
-                 hiDistrMB2Min2D_->Fill(fabs(hid.ieta()),hid.iphi(),hbheItr->energy()*hbheItr->energy());
-		 }
-		 }
-        }	
-	
-	
-} //analyze
+  for (HFRecHitCollection::const_iterator hbheItr = HithfNS.begin(); hbheItr != HithfNS.end(); hbheItr++) {
+    DetId id = (*hbheItr).detid();
+    HcalDetId hid = HcalDetId(id);
+
+    if (hid.depth() == 1) {
+      if (hid.ieta() > 0) {
+        hiDistrNoisePl2D_->Fill(hid.ieta(), hid.iphi(), hbheItr->energy());
+        hiDistrNoise2Pl2D_->Fill(hid.ieta(), hid.iphi(), hbheItr->energy() * hbheItr->energy());
+      } else {
+        hiDistrNoiseMin2D_->Fill(fabs(hid.ieta()), hid.iphi(), hbheItr->energy());
+        hiDistrNoise2Min2D_->Fill(fabs(hid.ieta()), hid.iphi(), hbheItr->energy() * hbheItr->energy());
+      }
+    }
+  }
 
+  const HFRecHitCollection HithfMB = *(hfMB.product());
 
+  for (HFRecHitCollection::const_iterator hbheItr = HithfMB.begin(); hbheItr != HithfMB.end(); hbheItr++) {
+    DetId id = (*hbheItr).detid();
+    HcalDetId hid = HcalDetId(id);
+
+    if (hid.depth() == 1) {
+      if (hid.ieta() > 0) {
+        hiDistrMBPl2D_->Fill(hid.ieta(), hid.iphi(), hbheItr->energy());
+        hiDistrMB2Pl2D_->Fill(hid.ieta(), hid.iphi(), hbheItr->energy() * hbheItr->energy());
+      } else {
+        hiDistrMBMin2D_->Fill(fabs(hid.ieta()), hid.iphi(), hbheItr->energy());
+        hiDistrMB2Min2D_->Fill(fabs(hid.ieta()), hid.iphi(), hbheItr->energy() * hbheItr->energy());
+      }
+    }
+  }
 
+}  // analyze
 
 //--------------------------------------------------------
 //--------------------------------------------------------
-void DQMHcalPhiSymAlCaReco::endRun(const Run& r, const EventSetup& context){
-// Keep Variances
-  if(eventCounter_ > 0) {
-  for(int k=0; k<=hiDistr_x_nbin_;k++)
-  {
-    for(int j=0; j<=hiDistr_y_nbin_;j++)
-    {
-// First moment
-       float cc1=hiDistrMBPl2D_->getBinContent(k,j);
-       cc1 = cc1 * 1./eventCounter_;
-       float cc2=hiDistrNoisePl2D_->getBinContent(k,j);
-       cc2 = cc2 * 1./eventCounter_;
-       float cc3=hiDistrMBMin2D_->getBinContent(k,j);
-       cc3 = cc3 * 1./eventCounter_;
-       float cc4=hiDistrNoiseMin2D_->getBinContent(k,j);
-       cc4 = cc4 * 1./eventCounter_;
-// Second moment
-       float cc11=hiDistrMB2Pl2D_->getBinContent(k,j);
-       cc11 = cc11 * 1./eventCounter_;
-       hiDistrVarMBPl2D_->setBinContent(k,j,cc11-cc1*cc1);
-       float cc22=hiDistrNoise2Pl2D_->getBinContent(k,j);
-       cc22 = cc22 * 1./eventCounter_;
-       hiDistrVarNoisePl2D_->setBinContent(k,j,cc22-cc2*cc2);
-       float cc33=hiDistrMB2Min2D_->getBinContent(k,j);
-       cc33 = cc33 * 1./eventCounter_;
-       hiDistrVarMBMin2D_->setBinContent(k,j,cc33-cc3*cc3);
-       float cc44=hiDistrNoise2Min2D_->getBinContent(k,j);
-       cc44 = cc44 * 1./eventCounter_;
-       hiDistrVarNoiseMin2D_->setBinContent(k,j,cc44-cc4*cc4);
-    }     
-  }
+void DQMHcalPhiSymAlCaReco::endRun(const Run &r, const EventSetup &context) {
+  // Keep Variances
+  if (eventCounter_ > 0) {
+    for (int k = 0; k <= hiDistr_x_nbin_; k++) {
+      for (int j = 0; j <= hiDistr_y_nbin_; j++) {
+        // First moment
+        float cc1 = hiDistrMBPl2D_->getBinContent(k, j);
+        cc1 = cc1 * 1. / eventCounter_;
+        float cc2 = hiDistrNoisePl2D_->getBinContent(k, j);
+        cc2 = cc2 * 1. / eventCounter_;
+        float cc3 = hiDistrMBMin2D_->getBinContent(k, j);
+        cc3 = cc3 * 1. / eventCounter_;
+        float cc4 = hiDistrNoiseMin2D_->getBinContent(k, j);
+        cc4 = cc4 * 1. / eventCounter_;
+        // Second moment
+        float cc11 = hiDistrMB2Pl2D_->getBinContent(k, j);
+        cc11 = cc11 * 1. / eventCounter_;
+        hiDistrVarMBPl2D_->setBinContent(k, j, cc11 - cc1 * cc1);
+        float cc22 = hiDistrNoise2Pl2D_->getBinContent(k, j);
+        cc22 = cc22 * 1. / eventCounter_;
+        hiDistrVarNoisePl2D_->setBinContent(k, j, cc22 - cc2 * cc2);
+        float cc33 = hiDistrMB2Min2D_->getBinContent(k, j);
+        cc33 = cc33 * 1. / eventCounter_;
+        hiDistrVarMBMin2D_->setBinContent(k, j, cc33 - cc3 * cc3);
+        float cc44 = hiDistrNoise2Min2D_->getBinContent(k, j);
+        cc44 = cc44 * 1. / eventCounter_;
+        hiDistrVarNoiseMin2D_->setBinContent(k, j, cc44 - cc4 * cc4);
+      }
+    }
   }
 }
-
-
diff --git a/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h b/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h
index 6455266612544..e22687b6e6415 100644
--- a/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h
+++ b/DQMOffline/CalibCalo/src/DQMHcalPhiSymAlCaReco.h
@@ -7,105 +7,93 @@
  *
  *  \author Stefano Argiro'
  *          Andrea Gozzelino - Universita  e INFN Torino
- *   
+ *
  */
 
-
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
-#include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
-#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+#include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
+#include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 
 class MonitorElement;
 
 class DQMHcalPhiSymAlCaReco : public DQMEDAnalyzer {
-
 public:
-
-  DQMHcalPhiSymAlCaReco( const edm::ParameterSet& );
+  DQMHcalPhiSymAlCaReco(const edm::ParameterSet &);
   ~DQMHcalPhiSymAlCaReco() override;
 
 protected:
-   
-//  void beginRun(const edm::Run& r, const edm::EventSetup& c);
+  //  void beginRun(const edm::Run& r, const edm::EventSetup& c);
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(const edm::Event& e, const edm::EventSetup& c) override ;
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
+  void endRun(const edm::Run &r, const edm::EventSetup &c) override;
 
+private:
+  int eventCounter_;
 
-  void endRun(const edm::Run& r, const edm::EventSetup& c) override;
+  //
+  // Monitor elements
+  //
+  MonitorElement *hiDistrMBPl2D_;
+  MonitorElement *hiDistrNoisePl2D_;
+  MonitorElement *hiDistrMBMin2D_;
+  MonitorElement *hiDistrNoiseMin2D_;
 
+  MonitorElement *hiDistrMB2Pl2D_;
+  MonitorElement *hiDistrNoise2Pl2D_;
+  MonitorElement *hiDistrMB2Min2D_;
+  MonitorElement *hiDistrNoise2Min2D_;
+
+  MonitorElement *hiDistrVarMBPl2D_;
+  MonitorElement *hiDistrVarNoisePl2D_;
+  MonitorElement *hiDistrVarMBMin2D_;
+  MonitorElement *hiDistrVarNoiseMin2D_;
+
+  MonitorElement *hiDistrHBHEsize1D_;
+  MonitorElement *hiDistrHFsize1D_;
+
+  MonitorElement *hFEDsize;
+  MonitorElement *hHcalIsZS;
+  MonitorElement *hL1Id;
 
-private:
- 
-
-  int eventCounter_;  
-      
-//                        
-// Monitor elements
-//
-  MonitorElement * hiDistrMBPl2D_;
-  MonitorElement * hiDistrNoisePl2D_;
-  MonitorElement * hiDistrMBMin2D_;
-  MonitorElement * hiDistrNoiseMin2D_;
-
-  MonitorElement * hiDistrMB2Pl2D_;
-  MonitorElement * hiDistrNoise2Pl2D_;
-  MonitorElement * hiDistrMB2Min2D_;
-  MonitorElement * hiDistrNoise2Min2D_;
-
-  MonitorElement * hiDistrVarMBPl2D_;
-  MonitorElement * hiDistrVarNoisePl2D_;
-  MonitorElement * hiDistrVarMBMin2D_;
-  MonitorElement * hiDistrVarNoiseMin2D_;
-
-  MonitorElement * hiDistrHBHEsize1D_;
-  MonitorElement * hiDistrHFsize1D_;
-
-  MonitorElement * hFEDsize;
-  MonitorElement * hHcalIsZS;
-  MonitorElement * hL1Id;
-  
   int hiDistr_y_nbin_;
   int hiDistr_x_nbin_;
-  double  hiDistr_y_min_;
-  double  hiDistr_y_max_;
-  double  hiDistr_x_min_;
-  double  hiDistr_x_max_;
+  double hiDistr_y_min_;
+  double hiDistr_y_max_;
+  double hiDistr_x_min_;
+  double hiDistr_x_max_;
 
   int hiDistr_r_nbin_;
   double ihbhe_size_;
   double ihf_size_;
 
-
   /// object to monitor
-  
-  edm::EDGetTokenT<HBHERecHitCollection>  hbherecoMB;
-  edm::InputTag  horecoMB;
-  edm::EDGetTokenT<HFRecHitCollection>  hfrecoMB;
-  
-  edm::EDGetTokenT<HBHERecHitCollection>  hbherecoNoise;
-  edm::InputTag  horecoNoise;
-  edm::EDGetTokenT<HFRecHitCollection>  hfrecoNoise;
+
+  edm::EDGetTokenT<HBHERecHitCollection> hbherecoMB;
+  edm::InputTag horecoMB;
+  edm::EDGetTokenT<HFRecHitCollection> hfrecoMB;
+
+  edm::EDGetTokenT<HBHERecHitCollection> hbherecoNoise;
+  edm::InputTag horecoNoise;
+  edm::EDGetTokenT<HFRecHitCollection> hfrecoNoise;
 
   edm::EDGetTokenT<FEDRawDataCollection> rawInLabel_;
-  
+
   /// DQM folder name
-  std::string folderName_; 
- 
-  /// Write to file 
+  std::string folderName_;
+
+  /// Write to file
   bool saveToFile_;
 
-  //period of ZS
+  // period of ZS
   unsigned int period_;
 
   /// Output file name if required
   std::string fileName_;
-
 };
 
 #endif
-
diff --git a/DQMOffline/CalibCalo/src/DQMSourceEleCalib.cc b/DQMOffline/CalibCalo/src/DQMSourceEleCalib.cc
index 74923d7e6020f..af1dcc55b28ec 100644
--- a/DQMOffline/CalibCalo/src/DQMSourceEleCalib.cc
+++ b/DQMOffline/CalibCalo/src/DQMSourceEleCalib.cc
@@ -3,12 +3,11 @@
  *
  * \author Andrea Gozzelino - Universita  e INFN Torino
  * \author Stefano Argiro
- *        
  *
  *
- * Description: Monitoring of Phi Symmetry Calibration Stream  
-*/
-
+ *
+ * Description: Monitoring of Phi Symmetry Calibration Stream
+ */
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -25,226 +24,172 @@
 
 #include "DataFormats/EcalRecHit/interface/EcalRecHit.h"
 
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMOffline/CalibCalo/interface/DQMSourceEleCalib.h"
-
+#include "DQMServices/Core/interface/DQMStore.h"
 
 using namespace std;
 using namespace edm;
 
-
 // ******************************************
 // constructors
 // *****************************************
 
-DQMSourceEleCalib::DQMSourceEleCalib( const edm::ParameterSet& ps ) :
-eventCounter_(0)
-{
-  folderName_ = ps.getUntrackedParameter<string>("FolderName","ALCAStreamEcalSingleEle");
-  productMonitoredEB_= consumes<EcalRecHitCollection>(ps.getParameter<edm::InputTag>("AlCaStreamEBTag"));
-  productMonitoredEE_= consumes<EcalRecHitCollection>(ps.getParameter<edm::InputTag>("AlCaStreamEETag"));
+DQMSourceEleCalib::DQMSourceEleCalib(const edm::ParameterSet &ps) : eventCounter_(0) {
+  folderName_ = ps.getUntrackedParameter<string>("FolderName", "ALCAStreamEcalSingleEle");
+  productMonitoredEB_ = consumes<EcalRecHitCollection>(ps.getParameter<edm::InputTag>("AlCaStreamEBTag"));
+  productMonitoredEE_ = consumes<EcalRecHitCollection>(ps.getParameter<edm::InputTag>("AlCaStreamEETag"));
 
-  saveToFile_=ps.getUntrackedParameter<bool>("SaveToFile",false);
-  fileName_=  ps.getUntrackedParameter<string>("FileName","MonitorAlCaEcalSingleEle.root");
+  saveToFile_ = ps.getUntrackedParameter<bool>("SaveToFile", false);
+  fileName_ = ps.getUntrackedParameter<string>("FileName", "MonitorAlCaEcalSingleEle.root");
   productMonitoredElectrons_ = consumes<reco::GsfElectronCollection>(ps.getParameter<InputTag>("electronCollection"));
-  prescaleFactor_ = ps.getUntrackedParameter<unsigned int>("prescaleFactor",1);
-
+  prescaleFactor_ = ps.getUntrackedParameter<unsigned int>("prescaleFactor", 1);
 }
 
-
-DQMSourceEleCalib::~DQMSourceEleCalib()
-{}
-
+DQMSourceEleCalib::~DQMSourceEleCalib() {}
 
 //--------------------------------------------------------
-void DQMSourceEleCalib::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & irun, edm::EventSetup const & isetup) {
-
+void DQMSourceEleCalib::bookHistograms(DQMStore::IBooker &ibooker,
+                                       edm::Run const &irun,
+                                       edm::EventSetup const &isetup) {
   // create and cd into new folder
   ibooker.setCurrentFolder(folderName_);
 
-  recHitsPerElectron_ = ibooker.book1D("recHitsPerElectron_","recHitPerElectron",
-  					200,0,200);
-  ElectronsNumber_ = ibooker.book1D("ElectronsNumber_","electrons in the event",
-  				   40,0,40);
-  ESCoP_ = ibooker.book1D ("ESCoP","ESCoP",50,0,5);
-
-  OccupancyEB_= ibooker.book2D("OccupancyEB_","OccupancyEB",360,1,361,171,-85,86);
-  OccupancyEEP_= ibooker.book2D("OccupancyEEP_","Occupancy EE Plus",100,1,101,100,1,101);
-  OccupancyEEM_= ibooker.book2D("OccupancyEEM_","Occupancy EE Minus",100,1,101,100,1,101);
-  HitsVsAssociatedHits_ = ibooker.book1D ("HitsVsAssociatedHits_","HitsVsAssociatedHits",100,0,5);
-  LocalOccupancyEB_ = ibooker.book2D ("LocalOccupancyEB_","Local occupancy Barrel",9,-4,5,9,-4,5); 
-  LocalOccupancyEE_ = ibooker.book2D ("LocalOccupancyEE_","Local occupancy Endcap",9,-4,5,9,-4,5); 
+  recHitsPerElectron_ = ibooker.book1D("recHitsPerElectron_", "recHitPerElectron", 200, 0, 200);
+  ElectronsNumber_ = ibooker.book1D("ElectronsNumber_", "electrons in the event", 40, 0, 40);
+  ESCoP_ = ibooker.book1D("ESCoP", "ESCoP", 50, 0, 5);
 
+  OccupancyEB_ = ibooker.book2D("OccupancyEB_", "OccupancyEB", 360, 1, 361, 171, -85, 86);
+  OccupancyEEP_ = ibooker.book2D("OccupancyEEP_", "Occupancy EE Plus", 100, 1, 101, 100, 1, 101);
+  OccupancyEEM_ = ibooker.book2D("OccupancyEEM_", "Occupancy EE Minus", 100, 1, 101, 100, 1, 101);
+  HitsVsAssociatedHits_ = ibooker.book1D("HitsVsAssociatedHits_", "HitsVsAssociatedHits", 100, 0, 5);
+  LocalOccupancyEB_ = ibooker.book2D("LocalOccupancyEB_", "Local occupancy Barrel", 9, -4, 5, 9, -4, 5);
+  LocalOccupancyEE_ = ibooker.book2D("LocalOccupancyEE_", "Local occupancy Endcap", 9, -4, 5, 9, -4, 5);
 }
 
 //--------------------------------------------------------
 
 //-------------------------------------------------------------
 
-void DQMSourceEleCalib::analyze(const Event& iEvent, 
-			       const EventSetup& iSetup ){
- 
-//  if (eventCounter_% prescaleFactor_ ) return; //FIXME
+void DQMSourceEleCalib::analyze(const Event &iEvent, const EventSetup &iSetup) {
+  //  if (eventCounter_% prescaleFactor_ ) return; //FIXME
   eventCounter_++;
-  int numberOfHits=0;
-  int numberOfElectrons=0;
+  int numberOfHits = 0;
+  int numberOfElectrons = 0;
   int numberOfAssociatedHits = 0;
-  //reads the recHits
+  // reads the recHits
   edm::Handle<EcalRecHitCollection> rhEB;
   edm::Handle<EcalRecHitCollection> rhEE;
- 
+
   iEvent.getByToken(productMonitoredEB_, rhEB);
   iEvent.getByToken(productMonitoredEE_, rhEE);
 
   EcalRecHitCollection::const_iterator itb;
 
-  //reads the electrons
-  edm::Handle<reco::GsfElectronCollection> pElectrons ;
-  iEvent.getByToken (productMonitoredElectrons_, pElectrons) ;
-  
-  if (pElectrons.isValid()){
-    ElectronsNumber_->Fill(pElectrons->size()+0.1);
+  // reads the electrons
+  edm::Handle<reco::GsfElectronCollection> pElectrons;
+  iEvent.getByToken(productMonitoredElectrons_, pElectrons);
+
+  if (pElectrons.isValid()) {
+    ElectronsNumber_->Fill(pElectrons->size() + 0.1);
     numberOfElectrons = pElectrons->size();
-    for (reco::GsfElectronCollection::const_iterator eleIt = pElectrons->begin();
-    	eleIt!= pElectrons->end(); ++eleIt){
-    ESCoP_->Fill(eleIt->eSuperClusterOverP());
-    numberOfAssociatedHits+= eleIt->superCluster()->size();
-    DetId Max = findMaxHit (eleIt->superCluster ()->hitsAndFractions (), 
-                             rhEB.product(),  rhEE.product()) ;
-    if (!Max.det()) continue;
-    if (Max.subdetId()==EcalBarrel) {
-	    EBDetId EBMax (Max);
-	    fillAroundBarrel (rhEB.product(),EBMax.ieta(),EBMax.iphi());
-    }
-    if (Max.subdetId()==EcalEndcap) {
-	    EEDetId EEMax (Max);
-	    fillAroundEndcap (rhEE.product(),EEMax.ix(),EEMax.iy());
+    for (reco::GsfElectronCollection::const_iterator eleIt = pElectrons->begin(); eleIt != pElectrons->end(); ++eleIt) {
+      ESCoP_->Fill(eleIt->eSuperClusterOverP());
+      numberOfAssociatedHits += eleIt->superCluster()->size();
+      DetId Max = findMaxHit(eleIt->superCluster()->hitsAndFractions(), rhEB.product(), rhEE.product());
+      if (!Max.det())
+        continue;
+      if (Max.subdetId() == EcalBarrel) {
+        EBDetId EBMax(Max);
+        fillAroundBarrel(rhEB.product(), EBMax.ieta(), EBMax.iphi());
+      }
+      if (Max.subdetId() == EcalEndcap) {
+        EEDetId EEMax(Max);
+        fillAroundEndcap(rhEE.product(), EEMax.ix(), EEMax.iy());
+      }
     }
-   }
-  }//is valid electron
+  }  // is valid electron
 
   // fill EB histos
-  if (rhEB.isValid())
-  {
-    numberOfHits+= rhEB->size();
-    for(itb=rhEB->begin(); itb!=rhEB->end(); ++itb){
+  if (rhEB.isValid()) {
+    numberOfHits += rhEB->size();
+    for (itb = rhEB->begin(); itb != rhEB->end(); ++itb) {
       EBDetId id(itb->id());
-      OccupancyEB_->Fill(id.iphi(),id.ieta());
-    } // Eb rechits
-   } //is Valid
-   if (rhEE.isValid())
-   {
-     numberOfHits+= rhEE->size();
-     for (itb = rhEE->begin(); itb!=rhEE->end(); ++itb){
-       EEDetId id (itb->id());
-       if (id.zside()>0){
-	       OccupancyEEP_->Fill(id.ix(),id.iy());
-       } //zside>0
-       else if (id.zside()<0){
-	       OccupancyEEM_->Fill(id.ix(),id.iy());
-       } //zside<0
-      
-    }//EE reChit
-   }//is Valid
-   if (numberOfElectrons) recHitsPerElectron_->Fill((double)numberOfHits/((double)numberOfElectrons));
-   if (numberOfHits) HitsVsAssociatedHits_->Fill((double)numberOfAssociatedHits/((double)numberOfHits));
-} //end of the analyzer
-
-
-
+      OccupancyEB_->Fill(id.iphi(), id.ieta());
+    }  // Eb rechits
+  }    // is Valid
+  if (rhEE.isValid()) {
+    numberOfHits += rhEE->size();
+    for (itb = rhEE->begin(); itb != rhEE->end(); ++itb) {
+      EEDetId id(itb->id());
+      if (id.zside() > 0) {
+        OccupancyEEP_->Fill(id.ix(), id.iy());
+      }  // zside>0
+      else if (id.zside() < 0) {
+        OccupancyEEM_->Fill(id.ix(), id.iy());
+      }  // zside<0
+
+    }  // EE reChit
+  }    // is Valid
+  if (numberOfElectrons)
+    recHitsPerElectron_->Fill((double)numberOfHits / ((double)numberOfElectrons));
+  if (numberOfHits)
+    HitsVsAssociatedHits_->Fill((double)numberOfAssociatedHits / ((double)numberOfHits));
+}  // end of the analyzer
 
 //--------------------------------------------------------
 
 //------------------------------------------------
 
-
-DetId
-DQMSourceEleCalib::findMaxHit (const std::vector<std::pair<DetId,float> > & v1,
-                               const EcalRecHitCollection* EBhits,
-                               const EcalRecHitCollection* EEhits) 
-{
-
-  double currEnergy = 0. ;
-  DetId maxHit ;
-  for (std::vector<std::pair<DetId,float> >::const_iterator idsIt = v1.begin () ; 
-       idsIt != v1.end () ; ++idsIt)
-    {
-            
-     if (idsIt->first.subdetId () == EcalBarrel) 
-       {              
-         EcalRecHitCollection::const_iterator itrechit ;
-         itrechit = EBhits->find ((*idsIt).first) ;
-         if (itrechit == EBhits->end () )
-           {
-             edm::LogInfo ("reading")
-             << "[findMaxHit] rechit not found! " ;
-             continue ;
-           }
-//FIXME: wnat to use the fraction i.e. .second??
-         if (itrechit->energy () > currEnergy)
-           {
-             currEnergy = itrechit->energy () ;
-             maxHit= (*idsIt).first ;
-           }
-       }
-     else 
-       {     
-         EcalRecHitCollection::const_iterator itrechit ;
-         itrechit = EEhits->find ((*idsIt).first) ;
-         if (itrechit == EEhits->end () )
-           {
-             edm::LogInfo ("reading")
-             << "[findMaxHit] rechit not found! " ;
-             continue ;
-           }
-              
-//FIXME: wnat to use the fraction i.e. .second??
-         if (itrechit->energy () > currEnergy)
-           {
-            currEnergy=itrechit->energy () ;
-            maxHit= (*idsIt).first ;
-           }
-       }
+DetId DQMSourceEleCalib::findMaxHit(const std::vector<std::pair<DetId, float>> &v1,
+                                    const EcalRecHitCollection *EBhits,
+                                    const EcalRecHitCollection *EEhits) {
+  double currEnergy = 0.;
+  DetId maxHit;
+  for (std::vector<std::pair<DetId, float>>::const_iterator idsIt = v1.begin(); idsIt != v1.end(); ++idsIt) {
+    if (idsIt->first.subdetId() == EcalBarrel) {
+      EcalRecHitCollection::const_iterator itrechit;
+      itrechit = EBhits->find((*idsIt).first);
+      if (itrechit == EBhits->end()) {
+        edm::LogInfo("reading") << "[findMaxHit] rechit not found! ";
+        continue;
+      }
+      // FIXME: wnat to use the fraction i.e. .second??
+      if (itrechit->energy() > currEnergy) {
+        currEnergy = itrechit->energy();
+        maxHit = (*idsIt).first;
+      }
+    } else {
+      EcalRecHitCollection::const_iterator itrechit;
+      itrechit = EEhits->find((*idsIt).first);
+      if (itrechit == EEhits->end()) {
+        edm::LogInfo("reading") << "[findMaxHit] rechit not found! ";
+        continue;
+      }
+
+      // FIXME: wnat to use the fraction i.e. .second??
+      if (itrechit->energy() > currEnergy) {
+        currEnergy = itrechit->energy();
+        maxHit = (*idsIt).first;
+      }
     }
-  return maxHit ;
+  }
+  return maxHit;
 }
 
-
-void
-DQMSourceEleCalib::fillAroundBarrel (const EcalRecHitCollection * recHits, int eta, int phi)
-{
-
-  for (EcalRecHitCollection::const_iterator elem = recHits->begin () ;
-       elem != recHits->end () ;
-       ++elem)
-    {
-      EBDetId elementId = elem->id () ; 
-      LocalOccupancyEB_->Fill (
-        elementId.ieta () - eta ,
-        elementId.iphi () - phi ,
-        elem->energy ()
-      ) ;
-    }   
-  return ;
+void DQMSourceEleCalib::fillAroundBarrel(const EcalRecHitCollection *recHits, int eta, int phi) {
+  for (EcalRecHitCollection::const_iterator elem = recHits->begin(); elem != recHits->end(); ++elem) {
+    EBDetId elementId = elem->id();
+    LocalOccupancyEB_->Fill(elementId.ieta() - eta, elementId.iphi() - phi, elem->energy());
+  }
+  return;
 }
 
-
 // ----------------------------------------------------------------
 
-
-void
-DQMSourceEleCalib::fillAroundEndcap (const EcalRecHitCollection * recHits, int ics, int ips)
-{
-  for (EcalRecHitCollection::const_iterator elem = recHits->begin () ;
-       elem != recHits->end () ;
-       ++elem)
-    {
-      EEDetId elementId = elem->id () ; 
-      LocalOccupancyEE_->Fill (
-        elementId.ix () - ics ,
-        elementId.iy () - ips ,
-        elem->energy ()
-      ) ;
-    }   
-  return ;
+void DQMSourceEleCalib::fillAroundEndcap(const EcalRecHitCollection *recHits, int ics, int ips) {
+  for (EcalRecHitCollection::const_iterator elem = recHits->begin(); elem != recHits->end(); ++elem) {
+    EEDetId elementId = elem->id();
+    LocalOccupancyEE_->Fill(elementId.ix() - ics, elementId.iy() - ips, elem->energy());
+  }
+  return;
 }
diff --git a/DQMOffline/CalibCalo/src/DQMSourcePi0.cc b/DQMOffline/CalibCalo/src/DQMSourcePi0.cc
old mode 100755
new mode 100644
index acff0d53477f7..d14c3aa1beac0
--- a/DQMOffline/CalibCalo/src/DQMSourcePi0.cc
+++ b/DQMOffline/CalibCalo/src/DQMSourcePi0.cc
@@ -8,25 +8,25 @@
 #include "DQMServices/Core/interface/MonitorElement.h"
 
 // work on collections
-#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
 #include "DataFormats/EcalDetId/interface/EEDetId.h"
+#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 
 #include "DataFormats/EcalRecHit/interface/EcalRecHit.h"
 
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMOffline/CalibCalo/src/DQMSourcePi0.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 
-#include "DataFormats/EgammaReco/interface/BasicCluster.h"
-#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
-#include "DataFormats/EcalDetId/interface/EBDetId.h"
 #include "DataFormats/DetId/interface/DetId.h"
+#include "DataFormats/EcalDetId/interface/EBDetId.h"
+#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
+#include "DataFormats/EgammaReco/interface/BasicCluster.h"
 #include "DataFormats/Math/interface/Point3D.h"
 
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "DataFormats/RecoCandidate/interface/RecoEcalCandidate.h"
@@ -36,134 +36,119 @@
 
 #define TWOPI 6.283185308
 
-
-
 using namespace std;
 using namespace edm;
 
-
 // ******************************************
 // constructors
 // *****************************************
 
-DQMSourcePi0::DQMSourcePi0( const edm::ParameterSet& ps ) :
-eventCounter_(0)
-{
-  folderName_ = ps.getUntrackedParameter<string>("FolderName","HLT/AlCaEcalPi0");
-  prescaleFactor_ = ps.getUntrackedParameter<int>("prescaleFactor",1);
-  productMonitoredEBpi0_= consumes<EcalRecHitCollection>(ps.getUntrackedParameter<edm::InputTag>("AlCaStreamEBpi0Tag"));
-  productMonitoredEBeta_= consumes<EcalRecHitCollection>(ps.getUntrackedParameter<edm::InputTag>("AlCaStreamEBetaTag"));
-  productMonitoredEEpi0_= consumes<EcalRecHitCollection>(ps.getUntrackedParameter<edm::InputTag>("AlCaStreamEEpi0Tag"));
-  productMonitoredEEeta_= consumes<EcalRecHitCollection>(ps.getUntrackedParameter<edm::InputTag>("AlCaStreamEEetaTag"));
-
-  isMonEBpi0_ = ps.getUntrackedParameter<bool>("isMonEBpi0",false);
-  isMonEBeta_ = ps.getUntrackedParameter<bool>("isMonEBeta",false);
-  isMonEEpi0_ = ps.getUntrackedParameter<bool>("isMonEEpi0",false);
-  isMonEEeta_ = ps.getUntrackedParameter<bool>("isMonEEeta",false);
-
-  saveToFile_=ps.getUntrackedParameter<bool>("SaveToFile",false);
-  fileName_=  ps.getUntrackedParameter<string>("FileName","MonitorAlCaEcalPi0.root");
-
-  clusSeedThr_ = ps.getParameter<double> ("clusSeedThr");
-  clusSeedThrEndCap_ = ps.getParameter<double> ("clusSeedThrEndCap");
-  clusEtaSize_ = ps.getParameter<int> ("clusEtaSize");
-  clusPhiSize_ = ps.getParameter<int> ("clusPhiSize");
-  if ( clusPhiSize_ % 2 == 0 ||  clusEtaSize_ % 2 == 0)
+DQMSourcePi0::DQMSourcePi0(const edm::ParameterSet &ps) : eventCounter_(0) {
+  folderName_ = ps.getUntrackedParameter<string>("FolderName", "HLT/AlCaEcalPi0");
+  prescaleFactor_ = ps.getUntrackedParameter<int>("prescaleFactor", 1);
+  productMonitoredEBpi0_ =
+      consumes<EcalRecHitCollection>(ps.getUntrackedParameter<edm::InputTag>("AlCaStreamEBpi0Tag"));
+  productMonitoredEBeta_ =
+      consumes<EcalRecHitCollection>(ps.getUntrackedParameter<edm::InputTag>("AlCaStreamEBetaTag"));
+  productMonitoredEEpi0_ =
+      consumes<EcalRecHitCollection>(ps.getUntrackedParameter<edm::InputTag>("AlCaStreamEEpi0Tag"));
+  productMonitoredEEeta_ =
+      consumes<EcalRecHitCollection>(ps.getUntrackedParameter<edm::InputTag>("AlCaStreamEEetaTag"));
+
+  isMonEBpi0_ = ps.getUntrackedParameter<bool>("isMonEBpi0", false);
+  isMonEBeta_ = ps.getUntrackedParameter<bool>("isMonEBeta", false);
+  isMonEEpi0_ = ps.getUntrackedParameter<bool>("isMonEEpi0", false);
+  isMonEEeta_ = ps.getUntrackedParameter<bool>("isMonEEeta", false);
+
+  saveToFile_ = ps.getUntrackedParameter<bool>("SaveToFile", false);
+  fileName_ = ps.getUntrackedParameter<string>("FileName", "MonitorAlCaEcalPi0.root");
+
+  clusSeedThr_ = ps.getParameter<double>("clusSeedThr");
+  clusSeedThrEndCap_ = ps.getParameter<double>("clusSeedThrEndCap");
+  clusEtaSize_ = ps.getParameter<int>("clusEtaSize");
+  clusPhiSize_ = ps.getParameter<int>("clusPhiSize");
+  if (clusPhiSize_ % 2 == 0 || clusEtaSize_ % 2 == 0)
     edm::LogError("AlCaPi0RecHitsProducerError") << "Size of eta/phi for simple clustering should be odd numbers";
 
-
   seleXtalMinEnergy_ = ps.getParameter<double>("seleXtalMinEnergy");
   seleXtalMinEnergyEndCap_ = ps.getParameter<double>("seleXtalMinEnergyEndCap");
 
-    ///for Pi0 barrel selection
-    selePtGamma_ = ps.getParameter<double> ("selePtGamma");  
-    selePtPi0_ = ps.getParameter<double> ("selePtPi0");  
-    seleMinvMaxPi0_ = ps.getParameter<double> ("seleMinvMaxPi0");  
-    seleMinvMinPi0_ = ps.getParameter<double> ("seleMinvMinPi0");  
-    seleS4S9Gamma_ = ps.getParameter<double> ("seleS4S9Gamma");  
-    selePi0Iso_ = ps.getParameter<double> ("selePi0Iso");  
-    ptMinForIsolation_ = ps.getParameter<double> ("ptMinForIsolation");
-    selePi0BeltDR_ = ps.getParameter<double> ("selePi0BeltDR");  
-    selePi0BeltDeta_ = ps.getParameter<double> ("selePi0BeltDeta");  
-
-  
-    ///for Pi0 endcap selection
-    selePtGammaEndCap_ = ps.getParameter<double> ("selePtGammaEndCap");  
-    selePtPi0EndCap_ = ps.getParameter<double> ("selePtPi0EndCap");   
-    seleS4S9GammaEndCap_ = ps.getParameter<double> ("seleS4S9GammaEndCap");  
-    seleMinvMaxPi0EndCap_ = ps.getParameter<double> ("seleMinvMaxPi0EndCap");  
-    seleMinvMinPi0EndCap_ = ps.getParameter<double> ("seleMinvMinPi0EndCap");  
-    ptMinForIsolationEndCap_ = ps.getParameter<double> ("ptMinForIsolationEndCap");
-    selePi0BeltDREndCap_ = ps.getParameter<double> ("selePi0BeltDREndCap");  
-    selePi0BeltDetaEndCap_ = ps.getParameter<double> ("selePi0BeltDetaEndCap");  
-    selePi0IsoEndCap_ = ps.getParameter<double> ("selePi0IsoEndCap");  
-
-
-    ///for Eta barrel selection
-    selePtGammaEta_ = ps.getParameter<double> ("selePtGammaEta");  
-    selePtEta_ = ps.getParameter<double> ("selePtEta");   
-    seleS4S9GammaEta_ = ps.getParameter<double> ("seleS4S9GammaEta");  
-    seleS9S25GammaEta_ = ps.getParameter<double> ("seleS9S25GammaEta");  
-    seleMinvMaxEta_ = ps.getParameter<double> ("seleMinvMaxEta");  
-    seleMinvMinEta_ = ps.getParameter<double> ("seleMinvMinEta");  
-    ptMinForIsolationEta_ = ps.getParameter<double> ("ptMinForIsolationEta");
-    seleEtaIso_ = ps.getParameter<double> ("seleEtaIso");  
-    seleEtaBeltDR_ = ps.getParameter<double> ("seleEtaBeltDR");  
-    seleEtaBeltDeta_ = ps.getParameter<double> ("seleEtaBeltDeta");  
-
-  
-    ///for Eta endcap selection
-    selePtGammaEtaEndCap_ = ps.getParameter<double> ("selePtGammaEtaEndCap");  
-    selePtEtaEndCap_ = ps.getParameter<double> ("selePtEtaEndCap");   
-    seleS4S9GammaEtaEndCap_ = ps.getParameter<double> ("seleS4S9GammaEtaEndCap");  
-    seleS9S25GammaEtaEndCap_ = ps.getParameter<double> ("seleS9S25GammaEtaEndCap");  
-    seleMinvMaxEtaEndCap_ = ps.getParameter<double> ("seleMinvMaxEtaEndCap");  
-    seleMinvMinEtaEndCap_ = ps.getParameter<double> ("seleMinvMinEtaEndCap");  
-    ptMinForIsolationEtaEndCap_ = ps.getParameter<double> ("ptMinForIsolationEtaEndCap");
-    seleEtaIsoEndCap_ = ps.getParameter<double> ("seleEtaIsoEndCap");  
-    seleEtaBeltDREndCap_ = ps.getParameter<double> ("seleEtaBeltDREndCap");  
-    seleEtaBeltDetaEndCap_ = ps.getParameter<double> ("seleEtaBeltDetaEndCap");  
-
-
-
-    // Parameters for the position calculation:
-    edm::ParameterSet posCalcParameters = 
-      ps.getParameter<edm::ParameterSet>("posCalcParameters");
-    posCalculator_ = PositionCalc(posCalcParameters);
-    
+  /// for Pi0 barrel selection
+  selePtGamma_ = ps.getParameter<double>("selePtGamma");
+  selePtPi0_ = ps.getParameter<double>("selePtPi0");
+  seleMinvMaxPi0_ = ps.getParameter<double>("seleMinvMaxPi0");
+  seleMinvMinPi0_ = ps.getParameter<double>("seleMinvMinPi0");
+  seleS4S9Gamma_ = ps.getParameter<double>("seleS4S9Gamma");
+  selePi0Iso_ = ps.getParameter<double>("selePi0Iso");
+  ptMinForIsolation_ = ps.getParameter<double>("ptMinForIsolation");
+  selePi0BeltDR_ = ps.getParameter<double>("selePi0BeltDR");
+  selePi0BeltDeta_ = ps.getParameter<double>("selePi0BeltDeta");
+
+  /// for Pi0 endcap selection
+  selePtGammaEndCap_ = ps.getParameter<double>("selePtGammaEndCap");
+  selePtPi0EndCap_ = ps.getParameter<double>("selePtPi0EndCap");
+  seleS4S9GammaEndCap_ = ps.getParameter<double>("seleS4S9GammaEndCap");
+  seleMinvMaxPi0EndCap_ = ps.getParameter<double>("seleMinvMaxPi0EndCap");
+  seleMinvMinPi0EndCap_ = ps.getParameter<double>("seleMinvMinPi0EndCap");
+  ptMinForIsolationEndCap_ = ps.getParameter<double>("ptMinForIsolationEndCap");
+  selePi0BeltDREndCap_ = ps.getParameter<double>("selePi0BeltDREndCap");
+  selePi0BeltDetaEndCap_ = ps.getParameter<double>("selePi0BeltDetaEndCap");
+  selePi0IsoEndCap_ = ps.getParameter<double>("selePi0IsoEndCap");
+
+  /// for Eta barrel selection
+  selePtGammaEta_ = ps.getParameter<double>("selePtGammaEta");
+  selePtEta_ = ps.getParameter<double>("selePtEta");
+  seleS4S9GammaEta_ = ps.getParameter<double>("seleS4S9GammaEta");
+  seleS9S25GammaEta_ = ps.getParameter<double>("seleS9S25GammaEta");
+  seleMinvMaxEta_ = ps.getParameter<double>("seleMinvMaxEta");
+  seleMinvMinEta_ = ps.getParameter<double>("seleMinvMinEta");
+  ptMinForIsolationEta_ = ps.getParameter<double>("ptMinForIsolationEta");
+  seleEtaIso_ = ps.getParameter<double>("seleEtaIso");
+  seleEtaBeltDR_ = ps.getParameter<double>("seleEtaBeltDR");
+  seleEtaBeltDeta_ = ps.getParameter<double>("seleEtaBeltDeta");
+
+  /// for Eta endcap selection
+  selePtGammaEtaEndCap_ = ps.getParameter<double>("selePtGammaEtaEndCap");
+  selePtEtaEndCap_ = ps.getParameter<double>("selePtEtaEndCap");
+  seleS4S9GammaEtaEndCap_ = ps.getParameter<double>("seleS4S9GammaEtaEndCap");
+  seleS9S25GammaEtaEndCap_ = ps.getParameter<double>("seleS9S25GammaEtaEndCap");
+  seleMinvMaxEtaEndCap_ = ps.getParameter<double>("seleMinvMaxEtaEndCap");
+  seleMinvMinEtaEndCap_ = ps.getParameter<double>("seleMinvMinEtaEndCap");
+  ptMinForIsolationEtaEndCap_ = ps.getParameter<double>("ptMinForIsolationEtaEndCap");
+  seleEtaIsoEndCap_ = ps.getParameter<double>("seleEtaIsoEndCap");
+  seleEtaBeltDREndCap_ = ps.getParameter<double>("seleEtaBeltDREndCap");
+  seleEtaBeltDetaEndCap_ = ps.getParameter<double>("seleEtaBeltDetaEndCap");
+
+  // Parameters for the position calculation:
+  edm::ParameterSet posCalcParameters = ps.getParameter<edm::ParameterSet>("posCalcParameters");
+  posCalculator_ = PositionCalc(posCalcParameters);
 }
 
-
-DQMSourcePi0::~DQMSourcePi0()
-{}
-
+DQMSourcePi0::~DQMSourcePi0() {}
 
 //--------------------------------------------------------
-void DQMSourcePi0::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & irun, edm::EventSetup const & isetup) {
-
-
+void DQMSourcePi0::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &irun, edm::EventSetup const &isetup) {
   // create and cd into new folder
   ibooker.setCurrentFolder(folderName_);
 
   // book some histograms 1D
 
-  hiPhiDistrEBpi0_ = ibooker.book1D("iphiDistributionEBpi0", "RechitEB pi0 iphi", 361, 1,361);
+  hiPhiDistrEBpi0_ = ibooker.book1D("iphiDistributionEBpi0", "RechitEB pi0 iphi", 361, 1, 361);
   hiPhiDistrEBpi0_->setAxisTitle("i#phi ", 1);
   hiPhiDistrEBpi0_->setAxisTitle("# rechits", 2);
 
-  hiXDistrEEpi0_ = ibooker.book1D("iXDistributionEEpi0", "RechitEE pi0 ix", 100, 0,100);
+  hiXDistrEEpi0_ = ibooker.book1D("iXDistributionEEpi0", "RechitEE pi0 ix", 100, 0, 100);
   hiXDistrEEpi0_->setAxisTitle("ix ", 1);
   hiXDistrEEpi0_->setAxisTitle("# rechits", 2);
 
-  hiPhiDistrEBeta_ = ibooker.book1D("iphiDistributionEBeta", "RechitEB eta iphi", 361, 1,361);
+  hiPhiDistrEBeta_ = ibooker.book1D("iphiDistributionEBeta", "RechitEB eta iphi", 361, 1, 361);
   hiPhiDistrEBeta_->setAxisTitle("i#phi ", 1);
   hiPhiDistrEBeta_->setAxisTitle("# rechits", 2);
 
-  hiXDistrEEeta_ = ibooker.book1D("iXDistributionEEeta", "RechitEE eta ix", 100, 0,100);
+  hiXDistrEEeta_ = ibooker.book1D("iXDistributionEEeta", "RechitEE eta ix", 100, 0, 100);
   hiXDistrEEeta_->setAxisTitle("ix ", 1);
   hiXDistrEEeta_->setAxisTitle("# rechits", 2);
 
-
   hiEtaDistrEBpi0_ = ibooker.book1D("iEtaDistributionEBpi0", "RechitEB pi0 ieta", 171, -85, 86);
   hiEtaDistrEBpi0_->setAxisTitle("i#eta", 1);
   hiEtaDistrEBpi0_->setAxisTitle("#rechits", 2);
@@ -180,807 +165,818 @@ void DQMSourcePi0::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const &
   hiYDistrEEeta_->setAxisTitle("iy", 1);
   hiYDistrEEeta_->setAxisTitle("#rechits", 2);
 
+  hRechitEnergyEBpi0_ = ibooker.book1D("rhEnergyEBpi0", "Pi0 rechits energy EB", 160, 0., 2.0);
+  hRechitEnergyEBpi0_->setAxisTitle("energy (GeV) ", 1);
+  hRechitEnergyEBpi0_->setAxisTitle("#rechits", 2);
+
+  hRechitEnergyEEpi0_ = ibooker.book1D("rhEnergyEEpi0", "Pi0 rechits energy EE", 160, 0., 3.0);
+  hRechitEnergyEEpi0_->setAxisTitle("energy (GeV) ", 1);
+  hRechitEnergyEEpi0_->setAxisTitle("#rechits", 2);
+
+  hRechitEnergyEBeta_ = ibooker.book1D("rhEnergyEBeta", "Eta rechits energy EB", 160, 0., 2.0);
+  hRechitEnergyEBeta_->setAxisTitle("energy (GeV) ", 1);
+  hRechitEnergyEBeta_->setAxisTitle("#rechits", 2);
+
+  hRechitEnergyEEeta_ = ibooker.book1D("rhEnergyEEeta", "Eta rechits energy EE", 160, 0., 3.0);
+  hRechitEnergyEEeta_->setAxisTitle("energy (GeV) ", 1);
+  hRechitEnergyEEeta_->setAxisTitle("#rechits", 2);
+
+  hEventEnergyEBpi0_ = ibooker.book1D("eventEnergyEBpi0", "Pi0 event energy EB", 100, 0., 20.0);
+  hEventEnergyEBpi0_->setAxisTitle("energy (GeV) ", 1);
+
+  hEventEnergyEEpi0_ = ibooker.book1D("eventEnergyEEpi0", "Pi0 event energy EE", 100, 0., 50.0);
+  hEventEnergyEEpi0_->setAxisTitle("energy (GeV) ", 1);
+
+  hEventEnergyEBeta_ = ibooker.book1D("eventEnergyEBeta", "Eta event energy EB", 100, 0., 20.0);
+  hEventEnergyEBeta_->setAxisTitle("energy (GeV) ", 1);
+
+  hEventEnergyEEeta_ = ibooker.book1D("eventEnergyEEeta", "Eta event energy EE", 100, 0., 50.0);
+  hEventEnergyEEeta_->setAxisTitle("energy (GeV) ", 1);
+
+  hNRecHitsEBpi0_ = ibooker.book1D("nRechitsEBpi0", "#rechits in pi0 collection EB", 100, 0., 250.);
+  hNRecHitsEBpi0_->setAxisTitle("rechits ", 1);
+
+  hNRecHitsEEpi0_ = ibooker.book1D("nRechitsEEpi0", "#rechits in pi0 collection EE", 100, 0., 250.);
+  hNRecHitsEEpi0_->setAxisTitle("rechits ", 1);
+
+  hNRecHitsEBeta_ = ibooker.book1D("nRechitsEBeta", "#rechits in eta collection EB", 100, 0., 250.);
+  hNRecHitsEBeta_->setAxisTitle("rechits ", 1);
+
+  hNRecHitsEEeta_ = ibooker.book1D("nRechitsEEeta", "#rechits in eta collection EE", 100, 0., 250.);
+  hNRecHitsEEeta_->setAxisTitle("rechits ", 1);
+
+  hMeanRecHitEnergyEBpi0_ = ibooker.book1D("meanEnergyEBpi0", "Mean rechit energy in pi0 collection EB", 50, 0., 2.);
+  hMeanRecHitEnergyEBpi0_->setAxisTitle("Mean Energy [GeV] ", 1);
+
+  hMeanRecHitEnergyEEpi0_ = ibooker.book1D("meanEnergyEEpi0", "Mean rechit energy in pi0 collection EE", 100, 0., 5.);
+  hMeanRecHitEnergyEEpi0_->setAxisTitle("Mean Energy [GeV] ", 1);
+
+  hMeanRecHitEnergyEBeta_ = ibooker.book1D("meanEnergyEBeta", "Mean rechit energy in eta collection EB", 50, 0., 2.);
+  hMeanRecHitEnergyEBeta_->setAxisTitle("Mean Energy [GeV] ", 1);
+
+  hMeanRecHitEnergyEEeta_ = ibooker.book1D("meanEnergyEEeta", "Mean rechit energy in eta collection EE", 100, 0., 5.);
+  hMeanRecHitEnergyEEeta_->setAxisTitle("Mean Energy [GeV] ", 1);
+
+  hMinvPi0EB_ = ibooker.book1D("Pi0InvmassEB", "Pi0 Invariant Mass in EB", 100, 0., 0.5);
+  hMinvPi0EB_->setAxisTitle("Inv Mass [GeV] ", 1);
+
+  hMinvPi0EE_ = ibooker.book1D("Pi0InvmassEE", "Pi0 Invariant Mass in EE", 100, 0., 0.5);
+  hMinvPi0EE_->setAxisTitle("Inv Mass [GeV] ", 1);
+
+  hMinvEtaEB_ = ibooker.book1D("EtaInvmassEB", "Eta Invariant Mass in EB", 100, 0., 0.85);
+  hMinvEtaEB_->setAxisTitle("Inv Mass [GeV] ", 1);
+
+  hMinvEtaEE_ = ibooker.book1D("EtaInvmassEE", "Eta Invariant Mass in EE", 100, 0., 0.85);
+  hMinvEtaEE_->setAxisTitle("Inv Mass [GeV] ", 1);
+
+  hPt1Pi0EB_ = ibooker.book1D("Pt1Pi0EB", "Pt 1st most energetic Pi0 photon in EB", 100, 0., 20.);
+  hPt1Pi0EB_->setAxisTitle("1st photon Pt [GeV] ", 1);
+
+  hPt1Pi0EE_ = ibooker.book1D("Pt1Pi0EE", "Pt 1st most energetic Pi0 photon in EE", 100, 0., 20.);
+  hPt1Pi0EE_->setAxisTitle("1st photon Pt [GeV] ", 1);
+
+  hPt1EtaEB_ = ibooker.book1D("Pt1EtaEB", "Pt 1st most energetic Eta photon in EB", 100, 0., 20.);
+  hPt1EtaEB_->setAxisTitle("1st photon Pt [GeV] ", 1);
+
+  hPt1EtaEE_ = ibooker.book1D("Pt1EtaEE", "Pt 1st most energetic Eta photon in EE", 100, 0., 20.);
+  hPt1EtaEE_->setAxisTitle("1st photon Pt [GeV] ", 1);
+
+  hPt2Pi0EB_ = ibooker.book1D("Pt2Pi0EB", "Pt 2nd most energetic Pi0 photon in EB", 100, 0., 20.);
+  hPt2Pi0EB_->setAxisTitle("2nd photon Pt [GeV] ", 1);
+
+  hPt2Pi0EE_ = ibooker.book1D("Pt2Pi0EE", "Pt 2nd most energetic Pi0 photon in EE", 100, 0., 20.);
+  hPt2Pi0EE_->setAxisTitle("2nd photon Pt [GeV] ", 1);
+
+  hPt2EtaEB_ = ibooker.book1D("Pt2EtaEB", "Pt 2nd most energetic Eta photon in EB", 100, 0., 20.);
+  hPt2EtaEB_->setAxisTitle("2nd photon Pt [GeV] ", 1);
 
-  hRechitEnergyEBpi0_ = ibooker.book1D("rhEnergyEBpi0","Pi0 rechits energy EB",160,0.,2.0);
-  hRechitEnergyEBpi0_->setAxisTitle("energy (GeV) ",1);
-  hRechitEnergyEBpi0_->setAxisTitle("#rechits",2);
-
-  hRechitEnergyEEpi0_ = ibooker.book1D("rhEnergyEEpi0","Pi0 rechits energy EE",160,0.,3.0);
-  hRechitEnergyEEpi0_->setAxisTitle("energy (GeV) ",1);
-  hRechitEnergyEEpi0_->setAxisTitle("#rechits",2);
-
-  hRechitEnergyEBeta_ = ibooker.book1D("rhEnergyEBeta","Eta rechits energy EB",160,0.,2.0);
-  hRechitEnergyEBeta_->setAxisTitle("energy (GeV) ",1);
-  hRechitEnergyEBeta_->setAxisTitle("#rechits",2);
-
-  hRechitEnergyEEeta_ = ibooker.book1D("rhEnergyEEeta","Eta rechits energy EE",160,0.,3.0);
-  hRechitEnergyEEeta_->setAxisTitle("energy (GeV) ",1);
-  hRechitEnergyEEeta_->setAxisTitle("#rechits",2);
-
-  hEventEnergyEBpi0_ = ibooker.book1D("eventEnergyEBpi0","Pi0 event energy EB",100,0.,20.0);
-  hEventEnergyEBpi0_->setAxisTitle("energy (GeV) ",1);
-
-  hEventEnergyEEpi0_ = ibooker.book1D("eventEnergyEEpi0","Pi0 event energy EE",100,0.,50.0);
-  hEventEnergyEEpi0_->setAxisTitle("energy (GeV) ",1);
-
-  hEventEnergyEBeta_ = ibooker.book1D("eventEnergyEBeta","Eta event energy EB",100,0.,20.0);
-  hEventEnergyEBeta_->setAxisTitle("energy (GeV) ",1);
-
-  hEventEnergyEEeta_ = ibooker.book1D("eventEnergyEEeta","Eta event energy EE",100,0.,50.0);
-  hEventEnergyEEeta_->setAxisTitle("energy (GeV) ",1);
-
-  hNRecHitsEBpi0_ = ibooker.book1D("nRechitsEBpi0","#rechits in pi0 collection EB",100,0.,250.);
-  hNRecHitsEBpi0_->setAxisTitle("rechits ",1);
-  
-  hNRecHitsEEpi0_ = ibooker.book1D("nRechitsEEpi0","#rechits in pi0 collection EE",100,0.,250.);
-  hNRecHitsEEpi0_->setAxisTitle("rechits ",1);
-  
-  hNRecHitsEBeta_ = ibooker.book1D("nRechitsEBeta","#rechits in eta collection EB",100,0.,250.);
-  hNRecHitsEBeta_->setAxisTitle("rechits ",1);
-  
-  hNRecHitsEEeta_ = ibooker.book1D("nRechitsEEeta","#rechits in eta collection EE",100,0.,250.);
-  hNRecHitsEEeta_->setAxisTitle("rechits ",1);
-  
-  hMeanRecHitEnergyEBpi0_ = ibooker.book1D("meanEnergyEBpi0","Mean rechit energy in pi0 collection EB",50,0.,2.);
-  hMeanRecHitEnergyEBpi0_->setAxisTitle("Mean Energy [GeV] ",1);
-  
-  hMeanRecHitEnergyEEpi0_ = ibooker.book1D("meanEnergyEEpi0","Mean rechit energy in pi0 collection EE",100,0.,5.);
-  hMeanRecHitEnergyEEpi0_->setAxisTitle("Mean Energy [GeV] ",1);
-  
-  hMeanRecHitEnergyEBeta_ = ibooker.book1D("meanEnergyEBeta","Mean rechit energy in eta collection EB",50,0.,2.);
-  hMeanRecHitEnergyEBeta_->setAxisTitle("Mean Energy [GeV] ",1);
-  
-  hMeanRecHitEnergyEEeta_ = ibooker.book1D("meanEnergyEEeta","Mean rechit energy in eta collection EE",100,0.,5.);
-  hMeanRecHitEnergyEEeta_->setAxisTitle("Mean Energy [GeV] ",1);
-  
-  hMinvPi0EB_ = ibooker.book1D("Pi0InvmassEB","Pi0 Invariant Mass in EB",100,0.,0.5);
-  hMinvPi0EB_->setAxisTitle("Inv Mass [GeV] ",1);
-
-  hMinvPi0EE_ = ibooker.book1D("Pi0InvmassEE","Pi0 Invariant Mass in EE",100,0.,0.5);
-  hMinvPi0EE_->setAxisTitle("Inv Mass [GeV] ",1);
-  
-  hMinvEtaEB_ = ibooker.book1D("EtaInvmassEB","Eta Invariant Mass in EB",100,0.,0.85);
-  hMinvEtaEB_->setAxisTitle("Inv Mass [GeV] ",1);
-
-  hMinvEtaEE_ = ibooker.book1D("EtaInvmassEE","Eta Invariant Mass in EE",100,0.,0.85);
-  hMinvEtaEE_->setAxisTitle("Inv Mass [GeV] ",1);
-
-  
-  hPt1Pi0EB_ = ibooker.book1D("Pt1Pi0EB","Pt 1st most energetic Pi0 photon in EB",100,0.,20.);
-  hPt1Pi0EB_->setAxisTitle("1st photon Pt [GeV] ",1);
-  
-  hPt1Pi0EE_ = ibooker.book1D("Pt1Pi0EE","Pt 1st most energetic Pi0 photon in EE",100,0.,20.);
-  hPt1Pi0EE_->setAxisTitle("1st photon Pt [GeV] ",1);
-
-  hPt1EtaEB_ = ibooker.book1D("Pt1EtaEB","Pt 1st most energetic Eta photon in EB",100,0.,20.);
-  hPt1EtaEB_->setAxisTitle("1st photon Pt [GeV] ",1);
-  
-  hPt1EtaEE_ = ibooker.book1D("Pt1EtaEE","Pt 1st most energetic Eta photon in EE",100,0.,20.);
-  hPt1EtaEE_->setAxisTitle("1st photon Pt [GeV] ",1);
-  
-  hPt2Pi0EB_ = ibooker.book1D("Pt2Pi0EB","Pt 2nd most energetic Pi0 photon in EB",100,0.,20.);
-  hPt2Pi0EB_->setAxisTitle("2nd photon Pt [GeV] ",1);
-
-  hPt2Pi0EE_ = ibooker.book1D("Pt2Pi0EE","Pt 2nd most energetic Pi0 photon in EE",100,0.,20.);
-  hPt2Pi0EE_->setAxisTitle("2nd photon Pt [GeV] ",1);
-
-  hPt2EtaEB_ = ibooker.book1D("Pt2EtaEB","Pt 2nd most energetic Eta photon in EB",100,0.,20.);
-  hPt2EtaEB_->setAxisTitle("2nd photon Pt [GeV] ",1);
-
-  hPt2EtaEE_ = ibooker.book1D("Pt2EtaEE","Pt 2nd most energetic Eta photon in EE",100,0.,20.);
-  hPt2EtaEE_->setAxisTitle("2nd photon Pt [GeV] ",1);
-
-  
-  hPtPi0EB_ = ibooker.book1D("PtPi0EB","Pi0 Pt in EB",100,0.,20.);
-  hPtPi0EB_->setAxisTitle("Pi0 Pt [GeV] ",1);
-
-  hPtPi0EE_ = ibooker.book1D("PtPi0EE","Pi0 Pt in EE",100,0.,20.);
-  hPtPi0EE_->setAxisTitle("Pi0 Pt [GeV] ",1);
-
-  hPtEtaEB_ = ibooker.book1D("PtEtaEB","Eta Pt in EB",100,0.,20.);
-  hPtEtaEB_->setAxisTitle("Eta Pt [GeV] ",1);
-
-  hPtEtaEE_ = ibooker.book1D("PtEtaEE","Eta Pt in EE",100,0.,20.);
-  hPtEtaEE_->setAxisTitle("Eta Pt [GeV] ",1);
-
-  hIsoPi0EB_ = ibooker.book1D("IsoPi0EB","Pi0 Iso in EB",50,0.,1.);
-  hIsoPi0EB_->setAxisTitle("Pi0 Iso",1);
-
-  hIsoPi0EE_ = ibooker.book1D("IsoPi0EE","Pi0 Iso in EE",50,0.,1.);
-  hIsoPi0EE_->setAxisTitle("Pi0 Iso",1);
-
-  hIsoEtaEB_ = ibooker.book1D("IsoEtaEB","Eta Iso in EB",50,0.,1.);
-  hIsoEtaEB_->setAxisTitle("Eta Iso",1);
-
-  hIsoEtaEE_ = ibooker.book1D("IsoEtaEE","Eta Iso in EE",50,0.,1.);
-  hIsoEtaEE_->setAxisTitle("Eta Iso",1);
-
-  hS4S91Pi0EB_ = ibooker.book1D("S4S91Pi0EB","S4S9 1st most energetic Pi0 photon in EB",50,0.,1.);
-  hS4S91Pi0EB_->setAxisTitle("S4S9 of the 1st Pi0 Photon ",1);
-
-  hS4S91Pi0EE_ = ibooker.book1D("S4S91Pi0EE","S4S9 1st most energetic Pi0 photon in EE",50,0.,1.);
-  hS4S91Pi0EE_->setAxisTitle("S4S9 of the 1st Pi0 Photon ",1);
-
-  hS4S91EtaEB_ = ibooker.book1D("S4S91EtaEB","S4S9 1st most energetic Eta photon in EB",50,0.,1.);
-  hS4S91EtaEB_->setAxisTitle("S4S9 of the 1st Eta Photon ",1);
-
-  hS4S91EtaEE_ = ibooker.book1D("S4S91EtaEE","S4S9 1st most energetic Eta photon in EE",50,0.,1.);
-  hS4S91EtaEE_->setAxisTitle("S4S9 of the 1st Eta Photon ",1);
-
-  hS4S92Pi0EB_ = ibooker.book1D("S4S92Pi0EB","S4S9 2nd most energetic Pi0 photon in EB",50,0.,1.);
-  hS4S92Pi0EB_->setAxisTitle("S4S9 of the 2nd Pi0 Photon",1);
-
-  hS4S92Pi0EE_ = ibooker.book1D("S4S92Pi0EE","S4S9 2nd most energetic Pi0 photon in EE",50,0.,1.);
-  hS4S92Pi0EE_->setAxisTitle("S4S9 of the 2nd Pi0 Photon",1);
-
-  hS4S92EtaEB_ = ibooker.book1D("S4S92EtaEB","S4S9 2nd most energetic Pi0 photon in EB",50,0.,1.);
-  hS4S92EtaEB_->setAxisTitle("S4S9 of the 2nd Eta Photon",1);
-
-  hS4S92EtaEE_ = ibooker.book1D("S4S92EtaEE","S4S9 2nd most energetic Pi0 photon in EE",50,0.,1.);
-  hS4S92EtaEE_->setAxisTitle("S4S9 of the 2nd Eta Photon",1);
+  hPt2EtaEE_ = ibooker.book1D("Pt2EtaEE", "Pt 2nd most energetic Eta photon in EE", 100, 0., 20.);
+  hPt2EtaEE_->setAxisTitle("2nd photon Pt [GeV] ", 1);
+
+  hPtPi0EB_ = ibooker.book1D("PtPi0EB", "Pi0 Pt in EB", 100, 0., 20.);
+  hPtPi0EB_->setAxisTitle("Pi0 Pt [GeV] ", 1);
+
+  hPtPi0EE_ = ibooker.book1D("PtPi0EE", "Pi0 Pt in EE", 100, 0., 20.);
+  hPtPi0EE_->setAxisTitle("Pi0 Pt [GeV] ", 1);
+
+  hPtEtaEB_ = ibooker.book1D("PtEtaEB", "Eta Pt in EB", 100, 0., 20.);
+  hPtEtaEB_->setAxisTitle("Eta Pt [GeV] ", 1);
+
+  hPtEtaEE_ = ibooker.book1D("PtEtaEE", "Eta Pt in EE", 100, 0., 20.);
+  hPtEtaEE_->setAxisTitle("Eta Pt [GeV] ", 1);
+
+  hIsoPi0EB_ = ibooker.book1D("IsoPi0EB", "Pi0 Iso in EB", 50, 0., 1.);
+  hIsoPi0EB_->setAxisTitle("Pi0 Iso", 1);
+
+  hIsoPi0EE_ = ibooker.book1D("IsoPi0EE", "Pi0 Iso in EE", 50, 0., 1.);
+  hIsoPi0EE_->setAxisTitle("Pi0 Iso", 1);
+
+  hIsoEtaEB_ = ibooker.book1D("IsoEtaEB", "Eta Iso in EB", 50, 0., 1.);
+  hIsoEtaEB_->setAxisTitle("Eta Iso", 1);
+
+  hIsoEtaEE_ = ibooker.book1D("IsoEtaEE", "Eta Iso in EE", 50, 0., 1.);
+  hIsoEtaEE_->setAxisTitle("Eta Iso", 1);
+
+  hS4S91Pi0EB_ = ibooker.book1D("S4S91Pi0EB", "S4S9 1st most energetic Pi0 photon in EB", 50, 0., 1.);
+  hS4S91Pi0EB_->setAxisTitle("S4S9 of the 1st Pi0 Photon ", 1);
+
+  hS4S91Pi0EE_ = ibooker.book1D("S4S91Pi0EE", "S4S9 1st most energetic Pi0 photon in EE", 50, 0., 1.);
+  hS4S91Pi0EE_->setAxisTitle("S4S9 of the 1st Pi0 Photon ", 1);
+
+  hS4S91EtaEB_ = ibooker.book1D("S4S91EtaEB", "S4S9 1st most energetic Eta photon in EB", 50, 0., 1.);
+  hS4S91EtaEB_->setAxisTitle("S4S9 of the 1st Eta Photon ", 1);
+
+  hS4S91EtaEE_ = ibooker.book1D("S4S91EtaEE", "S4S9 1st most energetic Eta photon in EE", 50, 0., 1.);
+  hS4S91EtaEE_->setAxisTitle("S4S9 of the 1st Eta Photon ", 1);
+
+  hS4S92Pi0EB_ = ibooker.book1D("S4S92Pi0EB", "S4S9 2nd most energetic Pi0 photon in EB", 50, 0., 1.);
+  hS4S92Pi0EB_->setAxisTitle("S4S9 of the 2nd Pi0 Photon", 1);
+
+  hS4S92Pi0EE_ = ibooker.book1D("S4S92Pi0EE", "S4S9 2nd most energetic Pi0 photon in EE", 50, 0., 1.);
+  hS4S92Pi0EE_->setAxisTitle("S4S9 of the 2nd Pi0 Photon", 1);
+
+  hS4S92EtaEB_ = ibooker.book1D("S4S92EtaEB", "S4S9 2nd most energetic Pi0 photon in EB", 50, 0., 1.);
+  hS4S92EtaEB_->setAxisTitle("S4S9 of the 2nd Eta Photon", 1);
+
+  hS4S92EtaEE_ = ibooker.book1D("S4S92EtaEE", "S4S9 2nd most energetic Pi0 photon in EE", 50, 0., 1.);
+  hS4S92EtaEE_->setAxisTitle("S4S9 of the 2nd Eta Photon", 1);
 }
 
 //-------------------------------------------------------------
-void DQMSourcePi0::analyze(const Event& iEvent, 
-			       const EventSetup& iSetup ){  
- 
-  if (eventCounter_% prescaleFactor_ ) return; 
+void DQMSourcePi0::analyze(const Event &iEvent, const EventSetup &iSetup) {
+  if (eventCounter_ % prescaleFactor_)
+    return;
   eventCounter_++;
 
   edm::ESHandle<CaloTopology> theCaloTopology;
   iSetup.get<CaloTopologyRecord>().get(theCaloTopology);
 
-
   std::vector<EcalRecHit> seeds;
   seeds.clear();
 
   vector<EBDetId> usedXtals;
   usedXtals.clear();
 
-  detIdEBRecHits.clear(); //// EBDetId
-  EBRecHits.clear();  /// EcalRecHit
-
+  detIdEBRecHits.clear();  //// EBDetId
+  EBRecHits.clear();       /// EcalRecHit
 
-
-
-
-    
   edm::Handle<EcalRecHitCollection> rhEBpi0;
   edm::Handle<EcalRecHitCollection> rhEBeta;
   edm::Handle<EcalRecHitCollection> rhEEpi0;
   edm::Handle<EcalRecHitCollection> rhEEeta;
- 
-  if(isMonEBpi0_) iEvent.getByToken(productMonitoredEBpi0_, rhEBpi0); 
-  if(isMonEBeta_) iEvent.getByToken(productMonitoredEBeta_, rhEBeta); 
-  if(isMonEEpi0_) iEvent.getByToken(productMonitoredEEpi0_, rhEEpi0);
-  if(isMonEEeta_) iEvent.getByToken(productMonitoredEEeta_, rhEEeta);
+
+  if (isMonEBpi0_)
+    iEvent.getByToken(productMonitoredEBpi0_, rhEBpi0);
+  if (isMonEBeta_)
+    iEvent.getByToken(productMonitoredEBeta_, rhEBeta);
+  if (isMonEEpi0_)
+    iEvent.getByToken(productMonitoredEEpi0_, rhEEpi0);
+  if (isMonEEeta_)
+    iEvent.getByToken(productMonitoredEEeta_, rhEEeta);
 
   // Initialize the Position Calc
 
   edm::ESHandle<CaloGeometry> geoHandle;
-  iSetup.get<CaloGeometryRecord>().get(geoHandle);     
-  const CaloSubdetectorGeometry* geometry_p   = geoHandle->getSubdetectorGeometry(DetId::Ecal,EcalBarrel);
-  const CaloSubdetectorGeometry* geometryEE_p = geoHandle->getSubdetectorGeometry(DetId::Ecal,EcalEndcap);
-  const CaloSubdetectorGeometry* geometryES_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalPreshower);
-
-  const CaloSubdetectorTopology* topology_p  = theCaloTopology->getSubdetectorTopology(DetId::Ecal,EcalBarrel);
-  const CaloSubdetectorTopology* topology_ee = theCaloTopology->getSubdetectorTopology(DetId::Ecal,EcalEndcap);
-  
-  EcalRecHitCollection::const_iterator itb;
-  
-  // fill EB pi0 histos 
-  if(isMonEBpi0_ ){
-    if (rhEBpi0.isValid() && (!rhEBpi0->empty())){
+  iSetup.get<CaloGeometryRecord>().get(geoHandle);
+  const CaloSubdetectorGeometry *geometry_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalBarrel);
+  const CaloSubdetectorGeometry *geometryEE_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalEndcap);
+  const CaloSubdetectorGeometry *geometryES_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalPreshower);
+
+  const CaloSubdetectorTopology *topology_p = theCaloTopology->getSubdetectorTopology(DetId::Ecal, EcalBarrel);
+  const CaloSubdetectorTopology *topology_ee = theCaloTopology->getSubdetectorTopology(DetId::Ecal, EcalEndcap);
 
+  EcalRecHitCollection::const_iterator itb;
 
+  // fill EB pi0 histos
+  if (isMonEBpi0_) {
+    if (rhEBpi0.isValid() && (!rhEBpi0->empty())) {
       const EcalRecHitCollection *hitCollection_p = rhEBpi0.product();
-      float etot =0;
-      for(itb=rhEBpi0->begin(); itb!=rhEBpi0->end(); ++itb){
-	
-	EBDetId id(itb->id());
-	double energy = itb->energy();
-	if( energy < seleXtalMinEnergy_) continue; 
+      float etot = 0;
+      for (itb = rhEBpi0->begin(); itb != rhEBpi0->end(); ++itb) {
+        EBDetId id(itb->id());
+        double energy = itb->energy();
+        if (energy < seleXtalMinEnergy_)
+          continue;
+
+        EBDetId det = itb->id();
 
-	EBDetId det = itb->id();
+        detIdEBRecHits.push_back(det);
+        EBRecHits.push_back(*itb);
 
+        if (energy > clusSeedThr_)
+          seeds.push_back(*itb);
 
-	detIdEBRecHits.push_back(det);
-	EBRecHits.push_back(*itb);
+        hiPhiDistrEBpi0_->Fill(id.iphi());
+        hiEtaDistrEBpi0_->Fill(id.ieta());
+        hRechitEnergyEBpi0_->Fill(itb->energy());
 
-	if (energy > clusSeedThr_) seeds.push_back(*itb);
+        etot += itb->energy();
+      }  // Eb rechits
 
-	hiPhiDistrEBpi0_->Fill(id.iphi());
-	hiEtaDistrEBpi0_->Fill(id.ieta());
-	hRechitEnergyEBpi0_->Fill(itb->energy());
-	
-	etot+= itb->energy();	 
-      } // Eb rechits
-      
       hNRecHitsEBpi0_->Fill(rhEBpi0->size());
-      hMeanRecHitEnergyEBpi0_->Fill(etot/rhEBpi0->size());
+      hMeanRecHitEnergyEBpi0_->Fill(etot / rhEBpi0->size());
       hEventEnergyEBpi0_->Fill(etot);
 
-      //      cout << " EB RH Pi0 collection: #, mean rh_e, event E "<<rhEBpi0->size()<<" "<<etot/rhEBpi0->size()<<" "<<etot<<endl;   
-
+      //      cout << " EB RH Pi0 collection: #, mean rh_e, event E
+      //      "<<rhEBpi0->size()<<" "<<etot/rhEBpi0->size()<<" "<<etot<<endl;
 
       // Pi0 maker
 
-      //cout<< " RH coll size: "<<rhEBpi0->size()<<endl;
-      //cout<< " Pi0 seeds: "<<seeds.size()<<endl;
+      // cout<< " RH coll size: "<<rhEBpi0->size()<<endl;
+      // cout<< " Pi0 seeds: "<<seeds.size()<<endl;
 
       int nClus;
       vector<float> eClus;
       vector<float> etClus;
-      vector<float> etaClus; 
+      vector<float> etaClus;
       vector<float> thetaClus;
       vector<float> phiClus;
       vector<EBDetId> max_hit;
 
-      vector< vector<EcalRecHit> > RecHitsCluster;
-      vector< vector<EcalRecHit> > RecHitsCluster5x5;
+      vector<vector<EcalRecHit>> RecHitsCluster;
+      vector<vector<EcalRecHit>> RecHitsCluster5x5;
       vector<float> s4s9Clus;
       vector<float> s9s25Clus;
 
-
-      nClus=0;
-
+      nClus = 0;
 
       // Make own simple clusters (3x3, 5x5 or clusPhiSize_ x clusEtaSize_)
       sort(seeds.begin(), seeds.end(), ecalRecHitGreater);
 
-      for (std::vector<EcalRecHit>::iterator itseed=seeds.begin(); itseed!=seeds.end(); itseed++) {
-	EBDetId seed_id = itseed->id();
-	std::vector<EBDetId>::const_iterator usedIds;
-
-	bool seedAlreadyUsed=false;
-	for(usedIds=usedXtals.begin(); usedIds!=usedXtals.end(); usedIds++){
-	  if(*usedIds==seed_id){
-	    seedAlreadyUsed=true;
-	    //cout<< " Seed with energy "<<itseed->energy()<<" was used !"<<endl;
-	    break; 
-	  }
-	}
-	if(seedAlreadyUsed)continue;
-	std::vector<DetId> clus_v = topology_p->getWindow(seed_id,clusEtaSize_,clusPhiSize_);       
-	std::vector<std::pair<DetId,float> > clus_used;
-	//Reject the seed if not able to build the cluster around it correctly
-	//if(clus_v.size() < clusEtaSize_*clusPhiSize_){cout<<" Not enough RecHits "<<endl; continue;}
-	vector<EcalRecHit> RecHitsInWindow;
-	vector<EcalRecHit> RecHitsInWindow5x5;
-
-	double simple_energy = 0; 
-
-	for (std::vector<DetId >::iterator det=clus_v.begin(); det!=clus_v.end(); det++) {
-	  EBDetId EBdet = *det;
-	  //      cout<<" det "<< EBdet<<" ieta "<<EBdet.ieta()<<" iphi "<<EBdet.iphi()<<endl;
-	  bool  HitAlreadyUsed=false;
-	  for(usedIds=usedXtals.begin(); usedIds!=usedXtals.end(); usedIds++){
-	    if(*usedIds==*det){
-	      HitAlreadyUsed=true;
-	      break;
-	    }
-	  }
-	  if(HitAlreadyUsed)continue;
-
-
-	  std::vector<EBDetId>::iterator itdet = find( detIdEBRecHits.begin(),detIdEBRecHits.end(),EBdet);
-	  if(itdet == detIdEBRecHits.end()) continue; 
-      
-	  int nn = int(itdet - detIdEBRecHits.begin());
-	  usedXtals.push_back(*det);
-	  RecHitsInWindow.push_back(EBRecHits[nn]);
-	  clus_used.push_back(std::make_pair(*det,1));
-	  simple_energy = simple_energy + EBRecHits[nn].energy();
-
-
-	}
-
-	if(simple_energy <= 0) continue;
-   
-	math::XYZPoint clus_pos = posCalculator_.Calculate_Location(clus_used,hitCollection_p,geometry_p,geometryES_p);
-	//cout<< "       Simple Clustering: Total energy for this simple cluster : "<<simple_energy<<endl; 
-	//cout<< "       Simple Clustering: eta phi : "<<clus_pos.eta()<<" "<<clus_pos.phi()<<endl; 
-	//cout<< "       Simple Clustering: x y z : "<<clus_pos.x()<<" "<<clus_pos.y()<<" "<<clus_pos.z()<<endl; 
-
-	float theta_s = 2. * atan(exp(-clus_pos.eta()));
-	//	float p0x_s = simple_energy * sin(theta_s) * cos(clus_pos.phi());
-	//float p0y_s = simple_energy * sin(theta_s) * sin(clus_pos.phi());
+      for (std::vector<EcalRecHit>::iterator itseed = seeds.begin(); itseed != seeds.end(); itseed++) {
+        EBDetId seed_id = itseed->id();
+        std::vector<EBDetId>::const_iterator usedIds;
+
+        bool seedAlreadyUsed = false;
+        for (usedIds = usedXtals.begin(); usedIds != usedXtals.end(); usedIds++) {
+          if (*usedIds == seed_id) {
+            seedAlreadyUsed = true;
+            // cout<< " Seed with energy "<<itseed->energy()<<" was used
+            // !"<<endl;
+            break;
+          }
+        }
+        if (seedAlreadyUsed)
+          continue;
+        std::vector<DetId> clus_v = topology_p->getWindow(seed_id, clusEtaSize_, clusPhiSize_);
+        std::vector<std::pair<DetId, float>> clus_used;
+        // Reject the seed if not able to build the cluster around it correctly
+        // if(clus_v.size() < clusEtaSize_*clusPhiSize_){cout<<" Not enough
+        // RecHits "<<endl; continue;}
+        vector<EcalRecHit> RecHitsInWindow;
+        vector<EcalRecHit> RecHitsInWindow5x5;
+
+        double simple_energy = 0;
+
+        for (std::vector<DetId>::iterator det = clus_v.begin(); det != clus_v.end(); det++) {
+          EBDetId EBdet = *det;
+          //      cout<<" det "<< EBdet<<" ieta "<<EBdet.ieta()<<" iphi
+          //      "<<EBdet.iphi()<<endl;
+          bool HitAlreadyUsed = false;
+          for (usedIds = usedXtals.begin(); usedIds != usedXtals.end(); usedIds++) {
+            if (*usedIds == *det) {
+              HitAlreadyUsed = true;
+              break;
+            }
+          }
+          if (HitAlreadyUsed)
+            continue;
+
+          std::vector<EBDetId>::iterator itdet = find(detIdEBRecHits.begin(), detIdEBRecHits.end(), EBdet);
+          if (itdet == detIdEBRecHits.end())
+            continue;
+
+          int nn = int(itdet - detIdEBRecHits.begin());
+          usedXtals.push_back(*det);
+          RecHitsInWindow.push_back(EBRecHits[nn]);
+          clus_used.push_back(std::make_pair(*det, 1));
+          simple_energy = simple_energy + EBRecHits[nn].energy();
+        }
+
+        if (simple_energy <= 0)
+          continue;
+
+        math::XYZPoint clus_pos =
+            posCalculator_.Calculate_Location(clus_used, hitCollection_p, geometry_p, geometryES_p);
+        // cout<< "       Simple Clustering: Total energy for this simple
+        // cluster : "<<simple_energy<<endl; cout<< "       Simple Clustering:
+        // eta phi : "<<clus_pos.eta()<<" "<<clus_pos.phi()<<endl; cout<< "
+        // Simple Clustering: x y z : "<<clus_pos.x()<<" "<<clus_pos.y()<<"
+        // "<<clus_pos.z()<<endl;
+
+        float theta_s = 2. * atan(exp(-clus_pos.eta()));
+        //	float p0x_s = simple_energy * sin(theta_s) *
+        // cos(clus_pos.phi()); float p0y_s = simple_energy * sin(theta_s) *
+        // sin(clus_pos.phi());
         //    float p0z_s = simple_energy * cos(theta_s);
-	//float et_s = sqrt( p0x_s*p0x_s + p0y_s*p0y_s);
-	
+        // float et_s = sqrt( p0x_s*p0x_s + p0y_s*p0y_s);
+
         float et_s = simple_energy * sin(theta_s);
-	//cout << "       Simple Clustering: E,Et,px,py,pz: "<<simple_energy<<" "<<et_s<<" "<<p0x_s<<" "<<p0y_s<<" "<<endl;
-
-	//Compute S4/S9 variable
-	//We are not sure to have 9 RecHits so need to check eta and phi:
-	///check s4s9
-	float s4s9_tmp[4];
-	for(int i=0;i<4;i++)s4s9_tmp[i]= 0;
-
-	int seed_ieta = seed_id.ieta();
-	int seed_iphi = seed_id.iphi();
-    
-	convxtalid( seed_iphi,seed_ieta);
-    
-        float e3x3 = 0; 
-	float e5x5 = 0; 
-
-	for(unsigned int j=0; j<RecHitsInWindow.size();j++){
-	  EBDetId det = (EBDetId)RecHitsInWindow[j].id(); 
-      
-	  int ieta = det.ieta();
-	  int iphi = det.iphi();
-      
-	  convxtalid(iphi,ieta);
-      
-	  float en = RecHitsInWindow[j].energy(); 
-      
-	  int dx = diff_neta_s(seed_ieta,ieta);
-	  int dy = diff_nphi_s(seed_iphi,iphi);
-      
-	  if(dx <= 0 && dy <=0) s4s9_tmp[0] += en; 
-	  if(dx >= 0 && dy <=0) s4s9_tmp[1] += en; 
-	  if(dx <= 0 && dy >=0) s4s9_tmp[2] += en; 
-	  if(dx >= 0 && dy >=0) s4s9_tmp[3] += en; 
-
-	  if(std::abs(dx)<=1 && std::abs(dy)<=1) e3x3 += en; 
-	  if(std::abs(dx)<=2 && std::abs(dy)<=2) e5x5 += en; 
-
-      
-	}
-    
-	if(e3x3 <= 0) continue;
-
-	float s4s9_max = *max_element( s4s9_tmp,s4s9_tmp+4)/e3x3; 
-
-
-    ///calculate e5x5
-    std::vector<DetId> clus_v5x5 = topology_p->getWindow(seed_id,5,5); 
-    for( std::vector<DetId>::const_iterator idItr = clus_v5x5.begin(); idItr != clus_v5x5.end(); idItr++){
-      EBDetId det = *idItr;
-      
-
-      std::vector<EBDetId>::iterator itdet0 = find(usedXtals.begin(),usedXtals.end(),det);
-
-      ///already clustered
-      if(itdet0 != usedXtals.end()) continue; 
-      
-      //inside collections
-      std::vector<EBDetId>::iterator itdet = find( detIdEBRecHits.begin(),detIdEBRecHits.end(),det);
-      if(itdet == detIdEBRecHits.end()) continue; 
-
-      int nn = int(itdet - detIdEBRecHits.begin());
-      
-      RecHitsInWindow5x5.push_back(EBRecHits[nn]);
-      e5x5 += EBRecHits[nn].energy();
-      
-    }
-
-
-
-	if(e5x5 <= 0) continue;
-
-	    eClus.push_back(simple_energy);
-	    etClus.push_back(et_s);
-	    etaClus.push_back(clus_pos.eta());
-	    thetaClus.push_back(theta_s);
-	    phiClus.push_back(clus_pos.phi());
-	    s4s9Clus.push_back(s4s9_max);
-	    s9s25Clus.push_back(e3x3/e5x5);
-	    RecHitsCluster.push_back(RecHitsInWindow);
-	    RecHitsCluster5x5.push_back(RecHitsInWindow5x5);
-	    
-	    //	    std::cout<<" EB pi0 cluster (n,nxt,e,et eta,phi,s4s9) "<<nClus<<" "<<int(RecHitsInWindow.size())<<" "<<eClus[nClus]<<" "<<" "<<etClus[nClus]<<" "<<etaClus[nClus]<<" "<<phiClus[nClus]<<" "<<s4s9Clus[nClus]<<std::endl;
-
-	    nClus++;
+        // cout << "       Simple Clustering: E,Et,px,py,pz: "<<simple_energy<<"
+        // "<<et_s<<" "<<p0x_s<<" "<<p0y_s<<" "<<endl;
 
+        // Compute S4/S9 variable
+        // We are not sure to have 9 RecHits so need to check eta and phi:
+        /// check s4s9
+        float s4s9_tmp[4];
+        for (int i = 0; i < 4; i++)
+          s4s9_tmp[i] = 0;
+
+        int seed_ieta = seed_id.ieta();
+        int seed_iphi = seed_id.iphi();
+
+        convxtalid(seed_iphi, seed_ieta);
+
+        float e3x3 = 0;
+        float e5x5 = 0;
+
+        for (unsigned int j = 0; j < RecHitsInWindow.size(); j++) {
+          EBDetId det = (EBDetId)RecHitsInWindow[j].id();
+
+          int ieta = det.ieta();
+          int iphi = det.iphi();
+
+          convxtalid(iphi, ieta);
+
+          float en = RecHitsInWindow[j].energy();
+
+          int dx = diff_neta_s(seed_ieta, ieta);
+          int dy = diff_nphi_s(seed_iphi, iphi);
+
+          if (dx <= 0 && dy <= 0)
+            s4s9_tmp[0] += en;
+          if (dx >= 0 && dy <= 0)
+            s4s9_tmp[1] += en;
+          if (dx <= 0 && dy >= 0)
+            s4s9_tmp[2] += en;
+          if (dx >= 0 && dy >= 0)
+            s4s9_tmp[3] += en;
+
+          if (std::abs(dx) <= 1 && std::abs(dy) <= 1)
+            e3x3 += en;
+          if (std::abs(dx) <= 2 && std::abs(dy) <= 2)
+            e5x5 += en;
+        }
+
+        if (e3x3 <= 0)
+          continue;
+
+        float s4s9_max = *max_element(s4s9_tmp, s4s9_tmp + 4) / e3x3;
+
+        /// calculate e5x5
+        std::vector<DetId> clus_v5x5 = topology_p->getWindow(seed_id, 5, 5);
+        for (std::vector<DetId>::const_iterator idItr = clus_v5x5.begin(); idItr != clus_v5x5.end(); idItr++) {
+          EBDetId det = *idItr;
+
+          std::vector<EBDetId>::iterator itdet0 = find(usedXtals.begin(), usedXtals.end(), det);
+
+          /// already clustered
+          if (itdet0 != usedXtals.end())
+            continue;
+
+          // inside collections
+          std::vector<EBDetId>::iterator itdet = find(detIdEBRecHits.begin(), detIdEBRecHits.end(), det);
+          if (itdet == detIdEBRecHits.end())
+            continue;
+
+          int nn = int(itdet - detIdEBRecHits.begin());
+
+          RecHitsInWindow5x5.push_back(EBRecHits[nn]);
+          e5x5 += EBRecHits[nn].energy();
+        }
+
+        if (e5x5 <= 0)
+          continue;
+
+        eClus.push_back(simple_energy);
+        etClus.push_back(et_s);
+        etaClus.push_back(clus_pos.eta());
+        thetaClus.push_back(theta_s);
+        phiClus.push_back(clus_pos.phi());
+        s4s9Clus.push_back(s4s9_max);
+        s9s25Clus.push_back(e3x3 / e5x5);
+        RecHitsCluster.push_back(RecHitsInWindow);
+        RecHitsCluster5x5.push_back(RecHitsInWindow5x5);
+
+        //	    std::cout<<" EB pi0 cluster (n,nxt,e,et eta,phi,s4s9)
+        //"<<nClus<<" "<<int(RecHitsInWindow.size())<<" "<<eClus[nClus]<<" "<<"
+        //"<<etClus[nClus]<<" "<<etaClus[nClus]<<" "<<phiClus[nClus]<<"
+        //"<<s4s9Clus[nClus]<<std::endl;
+
+        nClus++;
+      }
 
-  }
-    
       // cout<< " Pi0 clusters: "<<nClus<<endl;
 
       // Selection, based on Simple clustering
-      //pi0 candidates
-      int npi0_s=0;
-
+      // pi0 candidates
+      int npi0_s = 0;
 
       //      if (nClus <= 1) return;
-      for(Int_t i=0 ; i<nClus ; i++){
-	for(Int_t j=i+1 ; j<nClus ; j++){
-	  //      cout<<" i "<<i<<"  etClus[i] "<<etClus[i]<<" j "<<j<<"  etClus[j] "<<etClus[j]<<endl;
-	  if( etClus[i]>selePtGamma_ && etClus[j]>selePtGamma_ && s4s9Clus[i]>seleS4S9Gamma_ && s4s9Clus[j]>seleS4S9Gamma_){
-
-
-          float p0x = etClus[i] * cos(phiClus[i]);
-          float p1x = etClus[j] * cos(phiClus[j]);
-          float p0y = etClus[i] * sin(phiClus[i]);
-          float p1y = etClus[j] * sin(phiClus[j]);
-          float p0z = eClus[i] * cos(thetaClus[i]);
-          float p1z = eClus[j] * cos(thetaClus[j]);
-        
-        
-          float pt_pair = sqrt( (p0x+p1x)*(p0x+p1x) + (p0y+p1y)*(p0y+p1y));
-
-          if (pt_pair < selePtPi0_)continue;
-
-	  float m_inv = sqrt ( (eClus[i] + eClus[j])*(eClus[i] + eClus[j]) - (p0x+p1x)*(p0x+p1x) - (p0y+p1y)*(p0y+p1y) - (p0z+p1z)*(p0z+p1z) );  
-	    if ( (m_inv<seleMinvMaxPi0_) && (m_inv>seleMinvMinPi0_) ){
-
-	      //New Loop on cluster to measure isolation:
-	      vector<int> IsoClus;
-	      IsoClus.clear();
-	      float Iso = 0;
-	      TVector3 pairVect = TVector3((p0x+p1x), (p0y+p1y), (p0z+p1z));
-	      for(Int_t k=0 ; k<nClus ; k++){
-
-
-		if(etClus[k] < ptMinForIsolation_) continue;
-
-		if(k==i || k==j)continue;
-              TVector3 ClusVect = TVector3(etClus[k] *cos(phiClus[k]), etClus[k] * sin(phiClus[k]) , eClus[k] * cos(thetaClus[k]));
-
-		float dretacl = fabs(etaClus[k] - pairVect.Eta());
-		float drcl = ClusVect.DeltaR(pairVect);
-		//      cout<< "   Iso: k, E, drclpi0, detaclpi0, dphiclpi0 "<<k<<" "<<eClus[k]<<" "<<drclpi0<<" "<<dretaclpi0<<endl;
-		if((drcl<selePi0BeltDR_) && (dretacl<selePi0BeltDeta_) ){
-		  //              cout<< "   ... good iso cluster #: "<<k<<" etClus[k] "<<etClus[k] <<endl;
-		  Iso = Iso + etClus[k];
-		  IsoClus.push_back(k);
-		}
-	      }
-
-	      //      cout<<"  Iso/pt_pi0 "<<Iso/pt_pi0<<endl;
-	      if(Iso/pt_pair<selePi0Iso_){
-		//for(unsigned int Rec=0;Rec<RecHitsCluster[i].size();Rec++)pi0EBRecHitCollection->push_back(RecHitsCluster[i][Rec]);
-		//for(unsigned int Rec2=0;Rec2<RecHitsCluster[j].size();Rec2++)pi0EBRecHitCollection->push_back(RecHitsCluster[j][Rec2]);
-
-
-		hMinvPi0EB_->Fill(m_inv);
-		hPt1Pi0EB_->Fill(etClus[i]);
-		hPt2Pi0EB_->Fill(etClus[j]);
-		hPtPi0EB_->Fill(pt_pair);
-		hIsoPi0EB_->Fill(Iso/pt_pair);
-		hS4S91Pi0EB_->Fill(s4s9Clus[i]);
-		hS4S92Pi0EB_->Fill(s4s9Clus[j]);
-		
-		//		cout <<"  EB Simple Clustering: pi0 Candidate pt, eta, phi, Iso, m_inv, i, j :   "<<pt_pair<<" "<<pairVect.Eta()<<" "<<pairVect.Phi()<<" "<<Iso<<" "<<m_inv<<" "<<i<<" "<<j<<" "<<endl;  
-
-		npi0_s++;
-		
-	      }
-            
-
-
-          
-	    }
-	  }
-	} // End of the "j" loop over Simple Clusters
-      } // End of the "i" loop over Simple Clusters
+      for (Int_t i = 0; i < nClus; i++) {
+        for (Int_t j = i + 1; j < nClus; j++) {
+          //      cout<<" i "<<i<<"  etClus[i] "<<etClus[i]<<" j "<<j<<"
+          //      etClus[j] "<<etClus[j]<<endl;
+          if (etClus[i] > selePtGamma_ && etClus[j] > selePtGamma_ && s4s9Clus[i] > seleS4S9Gamma_ &&
+              s4s9Clus[j] > seleS4S9Gamma_) {
+            float p0x = etClus[i] * cos(phiClus[i]);
+            float p1x = etClus[j] * cos(phiClus[j]);
+            float p0y = etClus[i] * sin(phiClus[i]);
+            float p1y = etClus[j] * sin(phiClus[j]);
+            float p0z = eClus[i] * cos(thetaClus[i]);
+            float p1z = eClus[j] * cos(thetaClus[j]);
+
+            float pt_pair = sqrt((p0x + p1x) * (p0x + p1x) + (p0y + p1y) * (p0y + p1y));
+
+            if (pt_pair < selePtPi0_)
+              continue;
+
+            float m_inv = sqrt((eClus[i] + eClus[j]) * (eClus[i] + eClus[j]) - (p0x + p1x) * (p0x + p1x) -
+                               (p0y + p1y) * (p0y + p1y) - (p0z + p1z) * (p0z + p1z));
+            if ((m_inv < seleMinvMaxPi0_) && (m_inv > seleMinvMinPi0_)) {
+              // New Loop on cluster to measure isolation:
+              vector<int> IsoClus;
+              IsoClus.clear();
+              float Iso = 0;
+              TVector3 pairVect = TVector3((p0x + p1x), (p0y + p1y), (p0z + p1z));
+              for (Int_t k = 0; k < nClus; k++) {
+                if (etClus[k] < ptMinForIsolation_)
+                  continue;
+
+                if (k == i || k == j)
+                  continue;
+                TVector3 ClusVect =
+                    TVector3(etClus[k] * cos(phiClus[k]), etClus[k] * sin(phiClus[k]), eClus[k] * cos(thetaClus[k]));
+
+                float dretacl = fabs(etaClus[k] - pairVect.Eta());
+                float drcl = ClusVect.DeltaR(pairVect);
+                //      cout<< "   Iso: k, E, drclpi0, detaclpi0, dphiclpi0
+                //      "<<k<<" "<<eClus[k]<<" "<<drclpi0<<"
+                //      "<<dretaclpi0<<endl;
+                if ((drcl < selePi0BeltDR_) && (dretacl < selePi0BeltDeta_)) {
+                  //              cout<< "   ... good iso cluster #: "<<k<<"
+                  //              etClus[k] "<<etClus[k] <<endl;
+                  Iso = Iso + etClus[k];
+                  IsoClus.push_back(k);
+                }
+              }
+
+              //      cout<<"  Iso/pt_pi0 "<<Iso/pt_pi0<<endl;
+              if (Iso / pt_pair < selePi0Iso_) {
+                // for(unsigned int
+                // Rec=0;Rec<RecHitsCluster[i].size();Rec++)pi0EBRecHitCollection->push_back(RecHitsCluster[i][Rec]);
+                // for(unsigned int
+                // Rec2=0;Rec2<RecHitsCluster[j].size();Rec2++)pi0EBRecHitCollection->push_back(RecHitsCluster[j][Rec2]);
+
+                hMinvPi0EB_->Fill(m_inv);
+                hPt1Pi0EB_->Fill(etClus[i]);
+                hPt2Pi0EB_->Fill(etClus[j]);
+                hPtPi0EB_->Fill(pt_pair);
+                hIsoPi0EB_->Fill(Iso / pt_pair);
+                hS4S91Pi0EB_->Fill(s4s9Clus[i]);
+                hS4S92Pi0EB_->Fill(s4s9Clus[j]);
+
+                //		cout <<"  EB Simple Clustering: pi0 Candidate
+                // pt, eta, phi, Iso, m_inv, i, j :   "<<pt_pair<<"
+                //"<<pairVect.Eta()<<" "<<pairVect.Phi()<<" "<<Iso<<"
+                //"<<m_inv<<" "<<i<<" "<<j<<" "<<endl;
+
+                npi0_s++;
+              }
+            }
+          }
+        }  // End of the "j" loop over Simple Clusters
+      }    // End of the "i" loop over Simple Clusters
 
       //      cout<<"  (Simple Clustering) EB Pi0 candidates #: "<<npi0_s<<endl;
 
-    } // rhEBpi0.valid() ends
+    }  // rhEBpi0.valid() ends
 
-  } //  isMonEBpi0 ends
+  }  //  isMonEBpi0 ends
 
   //------------------ End of pi0 in EB --------------------------//
 
-  // fill EB eta histos 
-  if(isMonEBeta_ ){
-    if (rhEBeta.isValid() && (!rhEBeta->empty())){
-
-
+  // fill EB eta histos
+  if (isMonEBeta_) {
+    if (rhEBeta.isValid() && (!rhEBeta->empty())) {
       const EcalRecHitCollection *hitCollection_p = rhEBeta.product();
-      float etot =0;
-      for(itb=rhEBeta->begin(); itb!=rhEBeta->end(); ++itb){
-	
-	EBDetId id(itb->id());
-	double energy = itb->energy();
-	if( energy < seleXtalMinEnergy_) continue; 
+      float etot = 0;
+      for (itb = rhEBeta->begin(); itb != rhEBeta->end(); ++itb) {
+        EBDetId id(itb->id());
+        double energy = itb->energy();
+        if (energy < seleXtalMinEnergy_)
+          continue;
+
+        EBDetId det = itb->id();
 
-	EBDetId det = itb->id();
+        detIdEBRecHits.push_back(det);
+        EBRecHits.push_back(*itb);
 
+        if (energy > clusSeedThr_)
+          seeds.push_back(*itb);
 
-	detIdEBRecHits.push_back(det);
-	EBRecHits.push_back(*itb);
+        hiPhiDistrEBeta_->Fill(id.iphi());
+        hiEtaDistrEBeta_->Fill(id.ieta());
+        hRechitEnergyEBeta_->Fill(itb->energy());
 
-	if (energy > clusSeedThr_) seeds.push_back(*itb);
+        etot += itb->energy();
+      }  // Eb rechits
 
-	hiPhiDistrEBeta_->Fill(id.iphi());
-	hiEtaDistrEBeta_->Fill(id.ieta());
-	hRechitEnergyEBeta_->Fill(itb->energy());
-	
-	etot+= itb->energy();	 
-      } // Eb rechits
-      
       hNRecHitsEBeta_->Fill(rhEBeta->size());
-      hMeanRecHitEnergyEBeta_->Fill(etot/rhEBeta->size());
+      hMeanRecHitEnergyEBeta_->Fill(etot / rhEBeta->size());
       hEventEnergyEBeta_->Fill(etot);
 
-      //      cout << " EB RH Eta collection: #, mean rh_e, event E "<<rhEBeta->size()<<" "<<etot/rhEBeta->size()<<" "<<etot<<endl;   
-
+      //      cout << " EB RH Eta collection: #, mean rh_e, event E
+      //      "<<rhEBeta->size()<<" "<<etot/rhEBeta->size()<<" "<<etot<<endl;
 
       // Eta maker
 
-      //cout<< " RH coll size: "<<rhEBeta->size()<<endl;
-      //cout<< " Eta seeds: "<<seeds.size()<<endl;
+      // cout<< " RH coll size: "<<rhEBeta->size()<<endl;
+      // cout<< " Eta seeds: "<<seeds.size()<<endl;
 
       int nClus;
       vector<float> eClus;
       vector<float> etClus;
-      vector<float> etaClus; 
+      vector<float> etaClus;
       vector<float> thetaClus;
       vector<float> phiClus;
       vector<EBDetId> max_hit;
 
-      vector< vector<EcalRecHit> > RecHitsCluster;
-      vector< vector<EcalRecHit> > RecHitsCluster5x5;
+      vector<vector<EcalRecHit>> RecHitsCluster;
+      vector<vector<EcalRecHit>> RecHitsCluster5x5;
       vector<float> s4s9Clus;
       vector<float> s9s25Clus;
 
-
-      nClus=0;
+      nClus = 0;
 
       // Make own simple clusters (3x3, 5x5 or clusPhiSize_ x clusEtaSize_)
       sort(seeds.begin(), seeds.end(), ecalRecHitGreater);
 
-      for (std::vector<EcalRecHit>::iterator itseed=seeds.begin(); itseed!=seeds.end(); itseed++) {
-	EBDetId seed_id = itseed->id();
-	std::vector<EBDetId>::const_iterator usedIds;
-
-	bool seedAlreadyUsed=false;
-	for(usedIds=usedXtals.begin(); usedIds!=usedXtals.end(); usedIds++){
-	  if(*usedIds==seed_id){
-	    seedAlreadyUsed=true;
-	    //cout<< " Seed with energy "<<itseed->energy()<<" was used !"<<endl;
-	    break; 
-	  }
-	}
-	if(seedAlreadyUsed)continue;
-	std::vector<DetId> clus_v = topology_p->getWindow(seed_id,clusEtaSize_,clusPhiSize_);       
-	std::vector<std::pair<DetId,float> > clus_used;
-	//Reject the seed if not able to build the cluster around it correctly
-	//if(clus_v.size() < clusEtaSize_*clusPhiSize_){cout<<" Not enough RecHits "<<endl; continue;}
-	vector<EcalRecHit> RecHitsInWindow;
-	vector<EcalRecHit> RecHitsInWindow5x5;
-
-	double simple_energy = 0; 
-
-	for (std::vector<DetId>::iterator det=clus_v.begin(); det!=clus_v.end(); det++) {
-	  EBDetId EBdet = *det;
-	  //      cout<<" det "<< EBdet<<" ieta "<<EBdet.ieta()<<" iphi "<<EBdet.iphi()<<endl;
-	  bool  HitAlreadyUsed=false;
-	  for(usedIds=usedXtals.begin(); usedIds!=usedXtals.end(); usedIds++){
-	    if(*usedIds==*det){
-	      HitAlreadyUsed=true;
-	      break;
-	    }
-	  }
-	  if(HitAlreadyUsed)continue;
-
-
-	  std::vector<EBDetId>::iterator itdet = find( detIdEBRecHits.begin(),detIdEBRecHits.end(),EBdet);
-	  if(itdet == detIdEBRecHits.end()) continue; 
-      
-	  int nn = int(itdet - detIdEBRecHits.begin());
-	  usedXtals.push_back(*det);
-	  RecHitsInWindow.push_back(EBRecHits[nn]);
-	  clus_used.push_back(std::make_pair(*det,1));
-	  simple_energy = simple_energy + EBRecHits[nn].energy();
-
-
-	}
-
-	if(simple_energy <= 0) continue;
-   
-	math::XYZPoint clus_pos = posCalculator_.Calculate_Location(clus_used,hitCollection_p,geometry_p,geometryES_p);
-	//cout<< "       Simple Clustering: Total energy for this simple cluster : "<<simple_energy<<endl; 
-	//cout<< "       Simple Clustering: eta phi : "<<clus_pos.eta()<<" "<<clus_pos.phi()<<endl; 
-	//cout<< "       Simple Clustering: x y z : "<<clus_pos.x()<<" "<<clus_pos.y()<<" "<<clus_pos.z()<<endl; 
-
-	float theta_s = 2. * atan(exp(-clus_pos.eta()));
-	//	float p0x_s = simple_energy * sin(theta_s) * cos(clus_pos.phi());
-	//float p0y_s = simple_energy * sin(theta_s) * sin(clus_pos.phi());
+      for (std::vector<EcalRecHit>::iterator itseed = seeds.begin(); itseed != seeds.end(); itseed++) {
+        EBDetId seed_id = itseed->id();
+        std::vector<EBDetId>::const_iterator usedIds;
+
+        bool seedAlreadyUsed = false;
+        for (usedIds = usedXtals.begin(); usedIds != usedXtals.end(); usedIds++) {
+          if (*usedIds == seed_id) {
+            seedAlreadyUsed = true;
+            // cout<< " Seed with energy "<<itseed->energy()<<" was used
+            // !"<<endl;
+            break;
+          }
+        }
+        if (seedAlreadyUsed)
+          continue;
+        std::vector<DetId> clus_v = topology_p->getWindow(seed_id, clusEtaSize_, clusPhiSize_);
+        std::vector<std::pair<DetId, float>> clus_used;
+        // Reject the seed if not able to build the cluster around it correctly
+        // if(clus_v.size() < clusEtaSize_*clusPhiSize_){cout<<" Not enough
+        // RecHits "<<endl; continue;}
+        vector<EcalRecHit> RecHitsInWindow;
+        vector<EcalRecHit> RecHitsInWindow5x5;
+
+        double simple_energy = 0;
+
+        for (std::vector<DetId>::iterator det = clus_v.begin(); det != clus_v.end(); det++) {
+          EBDetId EBdet = *det;
+          //      cout<<" det "<< EBdet<<" ieta "<<EBdet.ieta()<<" iphi
+          //      "<<EBdet.iphi()<<endl;
+          bool HitAlreadyUsed = false;
+          for (usedIds = usedXtals.begin(); usedIds != usedXtals.end(); usedIds++) {
+            if (*usedIds == *det) {
+              HitAlreadyUsed = true;
+              break;
+            }
+          }
+          if (HitAlreadyUsed)
+            continue;
+
+          std::vector<EBDetId>::iterator itdet = find(detIdEBRecHits.begin(), detIdEBRecHits.end(), EBdet);
+          if (itdet == detIdEBRecHits.end())
+            continue;
+
+          int nn = int(itdet - detIdEBRecHits.begin());
+          usedXtals.push_back(*det);
+          RecHitsInWindow.push_back(EBRecHits[nn]);
+          clus_used.push_back(std::make_pair(*det, 1));
+          simple_energy = simple_energy + EBRecHits[nn].energy();
+        }
+
+        if (simple_energy <= 0)
+          continue;
+
+        math::XYZPoint clus_pos =
+            posCalculator_.Calculate_Location(clus_used, hitCollection_p, geometry_p, geometryES_p);
+        // cout<< "       Simple Clustering: Total energy for this simple
+        // cluster : "<<simple_energy<<endl; cout<< "       Simple Clustering:
+        // eta phi : "<<clus_pos.eta()<<" "<<clus_pos.phi()<<endl; cout<< "
+        // Simple Clustering: x y z : "<<clus_pos.x()<<" "<<clus_pos.y()<<"
+        // "<<clus_pos.z()<<endl;
+
+        float theta_s = 2. * atan(exp(-clus_pos.eta()));
+        //	float p0x_s = simple_energy * sin(theta_s) *
+        // cos(clus_pos.phi()); float p0y_s = simple_energy * sin(theta_s) *
+        // sin(clus_pos.phi());
         //    float p0z_s = simple_energy * cos(theta_s);
-	//float et_s = sqrt( p0x_s*p0x_s + p0y_s*p0y_s);
-	
+        // float et_s = sqrt( p0x_s*p0x_s + p0y_s*p0y_s);
+
         float et_s = simple_energy * sin(theta_s);
-	//cout << "       Simple Clustering: E,Et,px,py,pz: "<<simple_energy<<" "<<et_s<<" "<<p0x_s<<" "<<p0y_s<<" "<<endl;
-
-	//Compute S4/S9 variable
-	//We are not sure to have 9 RecHits so need to check eta and phi:
-	///check s4s9
-	float s4s9_tmp[4];
-	for(int i=0;i<4;i++)s4s9_tmp[i]= 0;
-
-	int seed_ieta = seed_id.ieta();
-	int seed_iphi = seed_id.iphi();
-    
-	convxtalid( seed_iphi,seed_ieta);
-    
-        float e3x3 = 0; 
-	float e5x5 = 0; 
-
-	for(unsigned int j=0; j<RecHitsInWindow.size();j++){
-	  EBDetId det = (EBDetId)RecHitsInWindow[j].id(); 
-      
-	  int ieta = det.ieta();
-	  int iphi = det.iphi();
-      
-	  convxtalid(iphi,ieta);
-      
-	  float en = RecHitsInWindow[j].energy(); 
-      
-	  int dx = diff_neta_s(seed_ieta,ieta);
-	  int dy = diff_nphi_s(seed_iphi,iphi);
-      
-	  if(dx <= 0 && dy <=0) s4s9_tmp[0] += en; 
-	  if(dx >= 0 && dy <=0) s4s9_tmp[1] += en; 
-	  if(dx <= 0 && dy >=0) s4s9_tmp[2] += en; 
-	  if(dx >= 0 && dy >=0) s4s9_tmp[3] += en; 
-
-	  if(std::abs(dx)<=1 && std::abs(dy)<=1) e3x3 += en; 
-	  if(std::abs(dx)<=2 && std::abs(dy)<=2) e5x5 += en; 
-
-      
-	}
-    
-	if(e3x3 <= 0) continue;
-
-	float s4s9_max = *max_element( s4s9_tmp,s4s9_tmp+4)/e3x3; 
-
-
-    ///calculate e5x5
-    std::vector<DetId> clus_v5x5 = topology_p->getWindow(seed_id,5,5); 
-    for( std::vector<DetId>::const_iterator idItr = clus_v5x5.begin(); idItr != clus_v5x5.end(); idItr++){
-      EBDetId det = *idItr;
-      
-
-      std::vector<EBDetId>::iterator itdet0 = find(usedXtals.begin(),usedXtals.end(),det);
-
-      ///already clustered
-      if(itdet0 != usedXtals.end()) continue; 
-      
-      //inside collections
-      std::vector<EBDetId>::iterator itdet = find( detIdEBRecHits.begin(),detIdEBRecHits.end(),det);
-      if(itdet == detIdEBRecHits.end()) continue; 
-
-      int nn = int(itdet - detIdEBRecHits.begin());
-      
-      RecHitsInWindow5x5.push_back(EBRecHits[nn]);
-      e5x5 += EBRecHits[nn].energy();
-      
-    }
-
-
-
-	if(e5x5 <= 0) continue;
-
-	    eClus.push_back(simple_energy);
-	    etClus.push_back(et_s);
-	    etaClus.push_back(clus_pos.eta());
-	    thetaClus.push_back(theta_s);
-	    phiClus.push_back(clus_pos.phi());
-	    s4s9Clus.push_back(s4s9_max);
-	    s9s25Clus.push_back(e3x3/e5x5);
-	    RecHitsCluster.push_back(RecHitsInWindow);
-	    RecHitsCluster5x5.push_back(RecHitsInWindow5x5);
-	    
-	    //	    std::cout<<" EB Eta cluster (n,nxt,e,et eta,phi,s4s9) "<<nClus<<" "<<int(RecHitsInWindow.size())<<" "<<eClus[nClus]<<" "<<" "<<etClus[nClus]<<" "<<etaClus[nClus]<<" "<<phiClus[nClus]<<" "<<s4s9Clus[nClus]<<std::endl;
-
-	    nClus++;
-	    
+        // cout << "       Simple Clustering: E,Et,px,py,pz: "<<simple_energy<<"
+        // "<<et_s<<" "<<p0x_s<<" "<<p0y_s<<" "<<endl;
 
-  }
-    
-      // cout<< " Eta clusters: "<<nClus<<endl;
+        // Compute S4/S9 variable
+        // We are not sure to have 9 RecHits so need to check eta and phi:
+        /// check s4s9
+        float s4s9_tmp[4];
+        for (int i = 0; i < 4; i++)
+          s4s9_tmp[i] = 0;
 
-      // Selection, based on Simple clustering
-      //eta candidates
-      int npi0_s=0;
+        int seed_ieta = seed_id.ieta();
+        int seed_iphi = seed_id.iphi();
 
+        convxtalid(seed_iphi, seed_ieta);
 
-      //      if (nClus <= 1) return;
-      for(Int_t i=0 ; i<nClus ; i++){
-	for(Int_t j=i+1 ; j<nClus ; j++){
-	  //      cout<<" i "<<i<<"  etClus[i] "<<etClus[i]<<" j "<<j<<"  etClus[j] "<<etClus[j]<<endl;
-	  if( etClus[i]>selePtGammaEta_ && etClus[j]>selePtGammaEta_ && s4s9Clus[i]>seleS4S9GammaEta_ && s4s9Clus[j]>seleS4S9GammaEta_){
-
-
-          float p0x = etClus[i] * cos(phiClus[i]);
-          float p1x = etClus[j] * cos(phiClus[j]);
-          float p0y = etClus[i] * sin(phiClus[i]);
-          float p1y = etClus[j] * sin(phiClus[j]);
-          float p0z = eClus[i] * cos(thetaClus[i]);
-          float p1z = eClus[j] * cos(thetaClus[j]);
-        
-        
-          float pt_pair = sqrt( (p0x+p1x)*(p0x+p1x) + (p0y+p1y)*(p0y+p1y));
-
-          if (pt_pair < selePtEta_)continue;
-
-	  float m_inv = sqrt ( (eClus[i] + eClus[j])*(eClus[i] + eClus[j]) - (p0x+p1x)*(p0x+p1x) - (p0y+p1y)*(p0y+p1y) - (p0z+p1z)*(p0z+p1z) );  
-	    if ( (m_inv<seleMinvMaxEta_) && (m_inv>seleMinvMinEta_) ){
-
-	      //New Loop on cluster to measure isolation:
-	      vector<int> IsoClus;
-	      IsoClus.clear();
-	      float Iso = 0;
-	      TVector3 pairVect = TVector3((p0x+p1x), (p0y+p1y), (p0z+p1z));
-	      for(Int_t k=0 ; k<nClus ; k++){
-
-
-		if(etClus[k] < ptMinForIsolationEta_) continue;
-
-		if(k==i || k==j)continue;
-              TVector3 ClusVect = TVector3(etClus[k] *cos(phiClus[k]), etClus[k] * sin(phiClus[k]) , eClus[k] * cos(thetaClus[k]));
-
-		float dretacl = fabs(etaClus[k] - pairVect.Eta());
-		float drcl = ClusVect.DeltaR(pairVect);
-		//      cout<< "   Iso: k, E, drclpi0, detaclpi0, dphiclpi0 "<<k<<" "<<eClus[k]<<" "<<drclpi0<<" "<<dretaclpi0<<endl;
-		if((drcl<seleEtaBeltDR_) && (dretacl<seleEtaBeltDeta_) ){
-		  //              cout<< "   ... good iso cluster #: "<<k<<" etClus[k] "<<etClus[k] <<endl;
-		  Iso = Iso + etClus[k];
-		  IsoClus.push_back(k);
-		}
-	      }
-
-	      //      cout<<"  Iso/pt_pi0 "<<Iso/pt_pi0<<endl;
-	      if(Iso/pt_pair<seleEtaIso_){
-		//for(unsigned int Rec=0;Rec<RecHitsCluster[i].size();Rec++)pi0EBRecHitCollection->push_back(RecHitsCluster[i][Rec]);
-		//for(unsigned int Rec2=0;Rec2<RecHitsCluster[j].size();Rec2++)pi0EBRecHitCollection->push_back(RecHitsCluster[j][Rec2]);
-
-
-		hMinvEtaEB_->Fill(m_inv);
-		hPt1EtaEB_->Fill(etClus[i]);
-		hPt2EtaEB_->Fill(etClus[j]);
-		hPtEtaEB_->Fill(pt_pair);
-		hIsoEtaEB_->Fill(Iso/pt_pair);
-		hS4S91EtaEB_->Fill(s4s9Clus[i]);
-		hS4S92EtaEB_->Fill(s4s9Clus[j]);
-		
-		//		cout <<"  EB Simple Clustering: Eta Candidate pt, eta, phi, Iso, m_inv, i, j :   "<<pt_pair<<" "<<pairVect.Eta()<<" "<<pairVect.Phi()<<" "<<Iso<<" "<<m_inv<<" "<<i<<" "<<j<<" "<<endl;  
-
-		npi0_s++;
-		
-	      }
-            
-
-
-          
-	    }
-	  }
-	} // End of the "j" loop over Simple Clusters
-      } // End of the "i" loop over Simple Clusters
+        float e3x3 = 0;
+        float e5x5 = 0;
 
-      //      cout<<"  (Simple Clustering) EB Eta candidates #: "<<npi0_s<<endl;
+        for (unsigned int j = 0; j < RecHitsInWindow.size(); j++) {
+          EBDetId det = (EBDetId)RecHitsInWindow[j].id();
 
-    } // rhEBeta.valid() ends
+          int ieta = det.ieta();
+          int iphi = det.iphi();
 
-  } //  isMonEBeta ends
+          convxtalid(iphi, ieta);
 
-  //------------------ End of Eta in EB --------------------------//
+          float en = RecHitsInWindow[j].energy();
+
+          int dx = diff_neta_s(seed_ieta, ieta);
+          int dy = diff_nphi_s(seed_iphi, iphi);
+
+          if (dx <= 0 && dy <= 0)
+            s4s9_tmp[0] += en;
+          if (dx >= 0 && dy <= 0)
+            s4s9_tmp[1] += en;
+          if (dx <= 0 && dy >= 0)
+            s4s9_tmp[2] += en;
+          if (dx >= 0 && dy >= 0)
+            s4s9_tmp[3] += en;
+
+          if (std::abs(dx) <= 1 && std::abs(dy) <= 1)
+            e3x3 += en;
+          if (std::abs(dx) <= 2 && std::abs(dy) <= 2)
+            e5x5 += en;
+        }
+
+        if (e3x3 <= 0)
+          continue;
+
+        float s4s9_max = *max_element(s4s9_tmp, s4s9_tmp + 4) / e3x3;
+
+        /// calculate e5x5
+        std::vector<DetId> clus_v5x5 = topology_p->getWindow(seed_id, 5, 5);
+        for (std::vector<DetId>::const_iterator idItr = clus_v5x5.begin(); idItr != clus_v5x5.end(); idItr++) {
+          EBDetId det = *idItr;
+
+          std::vector<EBDetId>::iterator itdet0 = find(usedXtals.begin(), usedXtals.end(), det);
+
+          /// already clustered
+          if (itdet0 != usedXtals.end())
+            continue;
+
+          // inside collections
+          std::vector<EBDetId>::iterator itdet = find(detIdEBRecHits.begin(), detIdEBRecHits.end(), det);
+          if (itdet == detIdEBRecHits.end())
+            continue;
+
+          int nn = int(itdet - detIdEBRecHits.begin());
+
+          RecHitsInWindow5x5.push_back(EBRecHits[nn]);
+          e5x5 += EBRecHits[nn].energy();
+        }
 
+        if (e5x5 <= 0)
+          continue;
 
+        eClus.push_back(simple_energy);
+        etClus.push_back(et_s);
+        etaClus.push_back(clus_pos.eta());
+        thetaClus.push_back(theta_s);
+        phiClus.push_back(clus_pos.phi());
+        s4s9Clus.push_back(s4s9_max);
+        s9s25Clus.push_back(e3x3 / e5x5);
+        RecHitsCluster.push_back(RecHitsInWindow);
+        RecHitsCluster5x5.push_back(RecHitsInWindow5x5);
 
-      //----------------- End of the EB --------------------------//
+        //	    std::cout<<" EB Eta cluster (n,nxt,e,et eta,phi,s4s9)
+        //"<<nClus<<" "<<int(RecHitsInWindow.size())<<" "<<eClus[nClus]<<" "<<"
+        //"<<etClus[nClus]<<" "<<etaClus[nClus]<<" "<<phiClus[nClus]<<"
+        //"<<s4s9Clus[nClus]<<std::endl;
 
+        nClus++;
+      }
+
+      // cout<< " Eta clusters: "<<nClus<<endl;
+
+      // Selection, based on Simple clustering
+      // eta candidates
+      int npi0_s = 0;
+
+      //      if (nClus <= 1) return;
+      for (Int_t i = 0; i < nClus; i++) {
+        for (Int_t j = i + 1; j < nClus; j++) {
+          //      cout<<" i "<<i<<"  etClus[i] "<<etClus[i]<<" j "<<j<<"
+          //      etClus[j] "<<etClus[j]<<endl;
+          if (etClus[i] > selePtGammaEta_ && etClus[j] > selePtGammaEta_ && s4s9Clus[i] > seleS4S9GammaEta_ &&
+              s4s9Clus[j] > seleS4S9GammaEta_) {
+            float p0x = etClus[i] * cos(phiClus[i]);
+            float p1x = etClus[j] * cos(phiClus[j]);
+            float p0y = etClus[i] * sin(phiClus[i]);
+            float p1y = etClus[j] * sin(phiClus[j]);
+            float p0z = eClus[i] * cos(thetaClus[i]);
+            float p1z = eClus[j] * cos(thetaClus[j]);
+
+            float pt_pair = sqrt((p0x + p1x) * (p0x + p1x) + (p0y + p1y) * (p0y + p1y));
+
+            if (pt_pair < selePtEta_)
+              continue;
+
+            float m_inv = sqrt((eClus[i] + eClus[j]) * (eClus[i] + eClus[j]) - (p0x + p1x) * (p0x + p1x) -
+                               (p0y + p1y) * (p0y + p1y) - (p0z + p1z) * (p0z + p1z));
+            if ((m_inv < seleMinvMaxEta_) && (m_inv > seleMinvMinEta_)) {
+              // New Loop on cluster to measure isolation:
+              vector<int> IsoClus;
+              IsoClus.clear();
+              float Iso = 0;
+              TVector3 pairVect = TVector3((p0x + p1x), (p0y + p1y), (p0z + p1z));
+              for (Int_t k = 0; k < nClus; k++) {
+                if (etClus[k] < ptMinForIsolationEta_)
+                  continue;
+
+                if (k == i || k == j)
+                  continue;
+                TVector3 ClusVect =
+                    TVector3(etClus[k] * cos(phiClus[k]), etClus[k] * sin(phiClus[k]), eClus[k] * cos(thetaClus[k]));
+
+                float dretacl = fabs(etaClus[k] - pairVect.Eta());
+                float drcl = ClusVect.DeltaR(pairVect);
+                //      cout<< "   Iso: k, E, drclpi0, detaclpi0, dphiclpi0
+                //      "<<k<<" "<<eClus[k]<<" "<<drclpi0<<"
+                //      "<<dretaclpi0<<endl;
+                if ((drcl < seleEtaBeltDR_) && (dretacl < seleEtaBeltDeta_)) {
+                  //              cout<< "   ... good iso cluster #: "<<k<<"
+                  //              etClus[k] "<<etClus[k] <<endl;
+                  Iso = Iso + etClus[k];
+                  IsoClus.push_back(k);
+                }
+              }
+
+              //      cout<<"  Iso/pt_pi0 "<<Iso/pt_pi0<<endl;
+              if (Iso / pt_pair < seleEtaIso_) {
+                // for(unsigned int
+                // Rec=0;Rec<RecHitsCluster[i].size();Rec++)pi0EBRecHitCollection->push_back(RecHitsCluster[i][Rec]);
+                // for(unsigned int
+                // Rec2=0;Rec2<RecHitsCluster[j].size();Rec2++)pi0EBRecHitCollection->push_back(RecHitsCluster[j][Rec2]);
+
+                hMinvEtaEB_->Fill(m_inv);
+                hPt1EtaEB_->Fill(etClus[i]);
+                hPt2EtaEB_->Fill(etClus[j]);
+                hPtEtaEB_->Fill(pt_pair);
+                hIsoEtaEB_->Fill(Iso / pt_pair);
+                hS4S91EtaEB_->Fill(s4s9Clus[i]);
+                hS4S92EtaEB_->Fill(s4s9Clus[j]);
+
+                //		cout <<"  EB Simple Clustering: Eta Candidate
+                // pt, eta, phi, Iso, m_inv, i, j :   "<<pt_pair<<"
+                //"<<pairVect.Eta()<<" "<<pairVect.Phi()<<" "<<Iso<<"
+                //"<<m_inv<<" "<<i<<" "<<j<<" "<<endl;
+
+                npi0_s++;
+              }
+            }
+          }
+        }  // End of the "j" loop over Simple Clusters
+      }    // End of the "i" loop over Simple Clusters
 
+      //      cout<<"  (Simple Clustering) EB Eta candidates #: "<<npi0_s<<endl;
 
+    }  // rhEBeta.valid() ends
 
-      //----------------- Start of the EE --------------------//
+  }  //  isMonEBeta ends
 
-      // fill pi0 EE histos
-      if(isMonEEpi0_){
-	if (rhEEpi0.isValid() && (!rhEEpi0->empty())){
+  //------------------ End of Eta in EB --------------------------//
 
-	  const EcalRecHitCollection *hitCollection_ee = rhEEpi0.product();
-	  float etot =0;
+  //----------------- End of the EB --------------------------//
 
+  //----------------- Start of the EE --------------------//
 
-      detIdEERecHits.clear(); //// EEDetId
-      EERecHits.clear();  /// EcalRecHit
+  // fill pi0 EE histos
+  if (isMonEEpi0_) {
+    if (rhEEpi0.isValid() && (!rhEEpi0->empty())) {
+      const EcalRecHitCollection *hitCollection_ee = rhEEpi0.product();
+      float etot = 0;
 
+      detIdEERecHits.clear();  //// EEDetId
+      EERecHits.clear();       /// EcalRecHit
 
       std::vector<EcalRecHit> seedsEndCap;
       seedsEndCap.clear();
@@ -988,253 +984,251 @@ void DQMSourcePi0::analyze(const Event& iEvent,
       vector<EEDetId> usedXtalsEndCap;
       usedXtalsEndCap.clear();
 
-
-	  ////make seeds. 
+      ////make seeds.
       EERecHitCollection::const_iterator ite;
-      for (ite=rhEEpi0->begin(); ite!=rhEEpi0->end(); ite++) {
-	double energy = ite->energy();
-	if( energy < seleXtalMinEnergyEndCap_) continue; 
-    
-	EEDetId det = ite->id();
-	EEDetId id(ite->id());
-
-    
-	detIdEERecHits.push_back(det);
-	EERecHits.push_back(*ite);
-    
-	hiXDistrEEpi0_->Fill(id.ix());
-	hiYDistrEEpi0_->Fill(id.iy());
-	hRechitEnergyEEpi0_->Fill(ite->energy());
-
-	if (energy > clusSeedThrEndCap_) seedsEndCap.push_back(*ite);
-	
-	etot+= ite->energy();	 
-      } // EE rechits
-      
+      for (ite = rhEEpi0->begin(); ite != rhEEpi0->end(); ite++) {
+        double energy = ite->energy();
+        if (energy < seleXtalMinEnergyEndCap_)
+          continue;
+
+        EEDetId det = ite->id();
+        EEDetId id(ite->id());
+
+        detIdEERecHits.push_back(det);
+        EERecHits.push_back(*ite);
+
+        hiXDistrEEpi0_->Fill(id.ix());
+        hiYDistrEEpi0_->Fill(id.iy());
+        hRechitEnergyEEpi0_->Fill(ite->energy());
+
+        if (energy > clusSeedThrEndCap_)
+          seedsEndCap.push_back(*ite);
+
+        etot += ite->energy();
+      }  // EE rechits
+
       hNRecHitsEEpi0_->Fill(rhEEpi0->size());
-      hMeanRecHitEnergyEEpi0_->Fill(etot/rhEEpi0->size());
+      hMeanRecHitEnergyEEpi0_->Fill(etot / rhEEpi0->size());
       hEventEnergyEEpi0_->Fill(etot);
 
-      //      cout << " EE RH Pi0 collection: #, mean rh_e, event E "<<rhEEpi0->size()<<" "<<etot/rhEEpi0->size()<<" "<<etot<<endl;   
-  
+      //      cout << " EE RH Pi0 collection: #, mean rh_e, event E
+      //      "<<rhEEpi0->size()<<" "<<etot/rhEEpi0->size()<<" "<<etot<<endl;
+
       int nClusEndCap;
       vector<float> eClusEndCap;
       vector<float> etClusEndCap;
       vector<float> etaClusEndCap;
       vector<float> thetaClusEndCap;
       vector<float> phiClusEndCap;
-      vector< vector<EcalRecHit> > RecHitsClusterEndCap;
-      vector< vector<EcalRecHit> > RecHitsCluster5x5EndCap;
+      vector<vector<EcalRecHit>> RecHitsClusterEndCap;
+      vector<vector<EcalRecHit>> RecHitsCluster5x5EndCap;
       vector<float> s4s9ClusEndCap;
       vector<float> s9s25ClusEndCap;
 
+      nClusEndCap = 0;
 
-      nClusEndCap=0;
-  
-  
       // Make own simple clusters (3x3, 5x5 or clusPhiSize_ x clusEtaSize_)
       sort(seedsEndCap.begin(), seedsEndCap.end(), ecalRecHitGreater);
-  
-      for (std::vector<EcalRecHit>::iterator itseed=seedsEndCap.begin(); itseed!=seedsEndCap.end(); itseed++) {
-	EEDetId seed_id = itseed->id();
-	std::vector<EEDetId>::const_iterator usedIds;
-    
-	bool seedAlreadyUsed=false;
-	for(usedIds=usedXtalsEndCap.begin(); usedIds!=usedXtalsEndCap.end(); usedIds++){
-	  if(*usedIds==seed_id){
-	    seedAlreadyUsed=true;
-	    break; 
-	  }
-	}
-
-	if(seedAlreadyUsed)continue;
-	std::vector<DetId> clus_v = topology_ee->getWindow(seed_id,clusEtaSize_,clusPhiSize_);      
-	std::vector<std::pair<DetId,float> > clus_used;
-    
-
-	vector<EcalRecHit> RecHitsInWindow;
-	vector<EcalRecHit> RecHitsInWindow5x5;
-    
-	float simple_energy = 0; 
-
-	for (std::vector<DetId>::iterator det=clus_v.begin(); det!=clus_v.end(); det++) {
-	  EEDetId EEdet = *det;
-      
-	  bool  HitAlreadyUsed=false;
-	  for(usedIds=usedXtalsEndCap.begin(); usedIds!=usedXtalsEndCap.end(); usedIds++){
-	    if(*usedIds==*det){
-	      HitAlreadyUsed=true;
-	      break;
-	    }
-	  }
-     
-	  if(HitAlreadyUsed)continue;
-      
-	  std::vector<EEDetId>::iterator itdet = find( detIdEERecHits.begin(),detIdEERecHits.end(),EEdet);
-	  if(itdet == detIdEERecHits.end()) continue; 
-      
-      
-	  int nn = int(itdet - detIdEERecHits.begin());
-	  usedXtalsEndCap.push_back(*det);
-	  RecHitsInWindow.push_back(EERecHits[nn]);
-	  clus_used.push_back(std::make_pair(*det,1));
-	  simple_energy = simple_energy + EERecHits[nn].energy();
-      
-      
-	}
-    
-	if( simple_energy <= 0) continue;
-        
-	math::XYZPoint clus_pos = posCalculator_.Calculate_Location(clus_used,hitCollection_ee,geometryEE_p,geometryES_p);
-    
-
-	float theta_s = 2. * atan(exp(-clus_pos.eta()));
-	float et_s = simple_energy * sin(theta_s);
-	//	float p0x_s = simple_energy * sin(theta_s) * cos(clus_pos.phi());
-	//float p0y_s = simple_energy * sin(theta_s) * sin(clus_pos.phi());
-	//float et_s = sqrt( p0x_s*p0x_s + p0y_s*p0y_s);
-    
-    
-	//Compute S4/S9 variable
-	//We are not sure to have 9 RecHits so need to check eta and phi:
-	float s4s9_tmp[4];
-	for(int i=0;i<4;i++) s4s9_tmp[i]= 0; 
-    
-	int ixSeed = seed_id.ix();
-	int iySeed = seed_id.iy();
-	float e3x3 = 0; 
-	float e5x5 = 0;
-
-	for(unsigned int j=0; j<RecHitsInWindow.size();j++){
-	  EEDetId det_this = (EEDetId)RecHitsInWindow[j].id(); 
-	  int dx = ixSeed - det_this.ix();
-	  int dy = iySeed - det_this.iy();
-      
-	  float en = RecHitsInWindow[j].energy(); 
-      
-	  if(dx <= 0 && dy <=0) s4s9_tmp[0] += en; 
-	  if(dx >= 0 && dy <=0) s4s9_tmp[1] += en; 
-	  if(dx <= 0 && dy >=0) s4s9_tmp[2] += en; 
-	  if(dx >= 0 && dy >=0) s4s9_tmp[3] += en; 
-
-	  if( std::abs(dx)<=1 && std::abs(dy)<=1) e3x3 += en; 
-	  if( std::abs(dx)<=2 && std::abs(dy)<=2) e5x5 += en; 
-
-	}
-
-      
-	if(e3x3 <= 0) continue;
-
-	eClusEndCap.push_back(simple_energy);
-	etClusEndCap.push_back(et_s);
-	etaClusEndCap.push_back(clus_pos.eta());
-	thetaClusEndCap.push_back(theta_s);
-	phiClusEndCap.push_back(clus_pos.phi());
-	s4s9ClusEndCap.push_back(*max_element( s4s9_tmp,s4s9_tmp+4)/e3x3);
-	s9s25ClusEndCap.push_back(e3x3/e5x5);
-	RecHitsClusterEndCap.push_back(RecHitsInWindow);
-	RecHitsCluster5x5EndCap.push_back(RecHitsInWindow5x5);
-	
-
-	//	std::cout<<" EE pi0 cluster (n,nxt,e,et eta,phi,s4s9) "<<nClusEndCap<<" "<<int(RecHitsInWindow.size())<<" "<<eClusEndCap[nClusEndCap]<<" "<<" "<<etClusEndCap[nClusEndCap]<<" "<<etaClusEndCap[nClusEndCap]<<" "<<phiClusEndCap[nClusEndCap]<<" "<<s4s9ClusEndCap[nClusEndCap]<<std::endl;
-
-
-	nClusEndCap++;
 
+      for (std::vector<EcalRecHit>::iterator itseed = seedsEndCap.begin(); itseed != seedsEndCap.end(); itseed++) {
+        EEDetId seed_id = itseed->id();
+        std::vector<EEDetId>::const_iterator usedIds;
 
-      }
+        bool seedAlreadyUsed = false;
+        for (usedIds = usedXtalsEndCap.begin(); usedIds != usedXtalsEndCap.end(); usedIds++) {
+          if (*usedIds == seed_id) {
+            seedAlreadyUsed = true;
+            break;
+          }
+        }
 
+        if (seedAlreadyUsed)
+          continue;
+        std::vector<DetId> clus_v = topology_ee->getWindow(seed_id, clusEtaSize_, clusPhiSize_);
+        std::vector<std::pair<DetId, float>> clus_used;
 
+        vector<EcalRecHit> RecHitsInWindow;
+        vector<EcalRecHit> RecHitsInWindow5x5;
 
-      // Selection, based on Simple clustering
-      //pi0 candidates
-      int npi0_se=0;
-
-
-      for(Int_t i=0 ; i<nClusEndCap ; i++){
-	for(Int_t j=i+1 ; j<nClusEndCap ; j++){
-      
-	  if( etClusEndCap[i]>selePtGammaEndCap_ && etClusEndCap[j]>selePtGammaEndCap_ && s4s9ClusEndCap[i]>seleS4S9GammaEndCap_ && s4s9ClusEndCap[j]>seleS4S9GammaEndCap_){
-
-          float p0x = etClusEndCap[i] * cos(phiClusEndCap[i]);
-          float p1x = etClusEndCap[j] * cos(phiClusEndCap[j]);
-          float p0y = etClusEndCap[i] * sin(phiClusEndCap[i]);
-          float p1y = etClusEndCap[j] * sin(phiClusEndCap[j]);
-          float p0z = eClusEndCap[i] * cos(thetaClusEndCap[i]);
-          float p1z = eClusEndCap[j] * cos(thetaClusEndCap[j]);
-
-        
-	    float pt_pair = sqrt( (p0x+p1x)*(p0x+p1x) + (p0y+p1y)*(p0y+p1y));
-	    if (pt_pair < selePtPi0EndCap_)continue;
-	    float m_inv = sqrt ( (eClusEndCap[i] + eClusEndCap[j])*(eClusEndCap[i] + eClusEndCap[j]) - (p0x+p1x)*(p0x+p1x) - (p0y+p1y)*(p0y+p1y) - (p0z+p1z)*(p0z+p1z) );  
- 
-
-	    if ( (m_inv<seleMinvMaxPi0EndCap_) && (m_inv>seleMinvMinPi0EndCap_) ){
-          
-
-	      //New Loop on cluster to measure isolation:
-	      vector<int> IsoClus;
-	      IsoClus.clear();
-	      float Iso = 0;
-	      TVector3 pairVect = TVector3((p0x+p1x), (p0y+p1y), (p0z+p1z));
-	      for(Int_t k=0 ; k<nClusEndCap ; k++){
-
-		if(etClusEndCap[k] < ptMinForIsolationEndCap_) continue; 
-            
-            
-		if(k==i || k==j)continue;
-            
-            
-              TVector3 clusVect = TVector3(etClusEndCap[k] * cos(phiClusEndCap[k]), etClusEndCap[k] * sin(phiClusEndCap[k]) , eClusEndCap[k] * cos(thetaClusEndCap[k]) ) ;
-              float dretacl = fabs(etaClusEndCap[k] - pairVect.Eta());
-              float drcl = clusVect.DeltaR(pairVect);
-              
-              if(drcl < selePi0BeltDREndCap_ && dretacl < selePi0BeltDetaEndCap_ ){
-                Iso = Iso + etClusEndCap[k];
-                IsoClus.push_back(k);
-              }
+        float simple_energy = 0;
+
+        for (std::vector<DetId>::iterator det = clus_v.begin(); det != clus_v.end(); det++) {
+          EEDetId EEdet = *det;
+
+          bool HitAlreadyUsed = false;
+          for (usedIds = usedXtalsEndCap.begin(); usedIds != usedXtalsEndCap.end(); usedIds++) {
+            if (*usedIds == *det) {
+              HitAlreadyUsed = true;
+              break;
             }
+          }
+
+          if (HitAlreadyUsed)
+            continue;
 
-          
-	      if(Iso/pt_pair<selePi0IsoEndCap_){
-		//cout <<"  EE Simple Clustering: pi0 Candidate pt, eta, phi, Iso, m_inv, i, j :   "<<pt_pair<<" "<<pairVect.Eta()<<" "<<pairVect.Phi()<<" "<<Iso<<" "<<m_inv<<" "<<i<<" "<<j<<" "<<endl;  
+          std::vector<EEDetId>::iterator itdet = find(detIdEERecHits.begin(), detIdEERecHits.end(), EEdet);
+          if (itdet == detIdEERecHits.end())
+            continue;
 
-		hMinvPi0EE_->Fill(m_inv);
-		hPt1Pi0EE_->Fill(etClusEndCap[i]);
-		hPt2Pi0EE_->Fill(etClusEndCap[j]);
-		hPtPi0EE_->Fill(pt_pair);
-		hIsoPi0EE_->Fill(Iso/pt_pair);
-		hS4S91Pi0EE_->Fill(s4s9ClusEndCap[i]);
-		hS4S92Pi0EE_->Fill(s4s9ClusEndCap[j]);
+          int nn = int(itdet - detIdEERecHits.begin());
+          usedXtalsEndCap.push_back(*det);
+          RecHitsInWindow.push_back(EERecHits[nn]);
+          clus_used.push_back(std::make_pair(*det, 1));
+          simple_energy = simple_energy + EERecHits[nn].energy();
+        }
 
-		npi0_se++;
-	      }
-          
-	    }
-	  }
-	} // End of the "j" loop over Simple Clusters
-      } // End of the "i" loop over Simple Clusters
+        if (simple_energy <= 0)
+          continue;
 
-      //      cout<<"  (Simple Clustering) EE Pi0 candidates #: "<<npi0_se<<endl;
+        math::XYZPoint clus_pos =
+            posCalculator_.Calculate_Location(clus_used, hitCollection_ee, geometryEE_p, geometryES_p);
+
+        float theta_s = 2. * atan(exp(-clus_pos.eta()));
+        float et_s = simple_energy * sin(theta_s);
+        //	float p0x_s = simple_energy * sin(theta_s) *
+        // cos(clus_pos.phi()); float p0y_s = simple_energy * sin(theta_s) *
+        // sin(clus_pos.phi()); float et_s = sqrt( p0x_s*p0x_s + p0y_s*p0y_s);
+
+        // Compute S4/S9 variable
+        // We are not sure to have 9 RecHits so need to check eta and phi:
+        float s4s9_tmp[4];
+        for (int i = 0; i < 4; i++)
+          s4s9_tmp[i] = 0;
+
+        int ixSeed = seed_id.ix();
+        int iySeed = seed_id.iy();
+        float e3x3 = 0;
+        float e5x5 = 0;
+
+        for (unsigned int j = 0; j < RecHitsInWindow.size(); j++) {
+          EEDetId det_this = (EEDetId)RecHitsInWindow[j].id();
+          int dx = ixSeed - det_this.ix();
+          int dy = iySeed - det_this.iy();
+
+          float en = RecHitsInWindow[j].energy();
+
+          if (dx <= 0 && dy <= 0)
+            s4s9_tmp[0] += en;
+          if (dx >= 0 && dy <= 0)
+            s4s9_tmp[1] += en;
+          if (dx <= 0 && dy >= 0)
+            s4s9_tmp[2] += en;
+          if (dx >= 0 && dy >= 0)
+            s4s9_tmp[3] += en;
+
+          if (std::abs(dx) <= 1 && std::abs(dy) <= 1)
+            e3x3 += en;
+          if (std::abs(dx) <= 2 && std::abs(dy) <= 2)
+            e5x5 += en;
+        }
+
+        if (e3x3 <= 0)
+          continue;
+
+        eClusEndCap.push_back(simple_energy);
+        etClusEndCap.push_back(et_s);
+        etaClusEndCap.push_back(clus_pos.eta());
+        thetaClusEndCap.push_back(theta_s);
+        phiClusEndCap.push_back(clus_pos.phi());
+        s4s9ClusEndCap.push_back(*max_element(s4s9_tmp, s4s9_tmp + 4) / e3x3);
+        s9s25ClusEndCap.push_back(e3x3 / e5x5);
+        RecHitsClusterEndCap.push_back(RecHitsInWindow);
+        RecHitsCluster5x5EndCap.push_back(RecHitsInWindow5x5);
+
+        //	std::cout<<" EE pi0 cluster (n,nxt,e,et eta,phi,s4s9)
+        //"<<nClusEndCap<<" "<<int(RecHitsInWindow.size())<<"
+        //"<<eClusEndCap[nClusEndCap]<<" "<<" "<<etClusEndCap[nClusEndCap]<<"
+        //"<<etaClusEndCap[nClusEndCap]<<" "<<phiClusEndCap[nClusEndCap]<<"
+        //"<<s4s9ClusEndCap[nClusEndCap]<<std::endl;
+
+        nClusEndCap++;
+      }
 
-	} //rhEEpi0
-      } //isMonEEpi0
+      // Selection, based on Simple clustering
+      // pi0 candidates
+      int npi0_se = 0;
+
+      for (Int_t i = 0; i < nClusEndCap; i++) {
+        for (Int_t j = i + 1; j < nClusEndCap; j++) {
+          if (etClusEndCap[i] > selePtGammaEndCap_ && etClusEndCap[j] > selePtGammaEndCap_ &&
+              s4s9ClusEndCap[i] > seleS4S9GammaEndCap_ && s4s9ClusEndCap[j] > seleS4S9GammaEndCap_) {
+            float p0x = etClusEndCap[i] * cos(phiClusEndCap[i]);
+            float p1x = etClusEndCap[j] * cos(phiClusEndCap[j]);
+            float p0y = etClusEndCap[i] * sin(phiClusEndCap[i]);
+            float p1y = etClusEndCap[j] * sin(phiClusEndCap[j]);
+            float p0z = eClusEndCap[i] * cos(thetaClusEndCap[i]);
+            float p1z = eClusEndCap[j] * cos(thetaClusEndCap[j]);
+
+            float pt_pair = sqrt((p0x + p1x) * (p0x + p1x) + (p0y + p1y) * (p0y + p1y));
+            if (pt_pair < selePtPi0EndCap_)
+              continue;
+            float m_inv = sqrt((eClusEndCap[i] + eClusEndCap[j]) * (eClusEndCap[i] + eClusEndCap[j]) -
+                               (p0x + p1x) * (p0x + p1x) - (p0y + p1y) * (p0y + p1y) - (p0z + p1z) * (p0z + p1z));
+
+            if ((m_inv < seleMinvMaxPi0EndCap_) && (m_inv > seleMinvMinPi0EndCap_)) {
+              // New Loop on cluster to measure isolation:
+              vector<int> IsoClus;
+              IsoClus.clear();
+              float Iso = 0;
+              TVector3 pairVect = TVector3((p0x + p1x), (p0y + p1y), (p0z + p1z));
+              for (Int_t k = 0; k < nClusEndCap; k++) {
+                if (etClusEndCap[k] < ptMinForIsolationEndCap_)
+                  continue;
+
+                if (k == i || k == j)
+                  continue;
+
+                TVector3 clusVect = TVector3(etClusEndCap[k] * cos(phiClusEndCap[k]),
+                                             etClusEndCap[k] * sin(phiClusEndCap[k]),
+                                             eClusEndCap[k] * cos(thetaClusEndCap[k]));
+                float dretacl = fabs(etaClusEndCap[k] - pairVect.Eta());
+                float drcl = clusVect.DeltaR(pairVect);
+
+                if (drcl < selePi0BeltDREndCap_ && dretacl < selePi0BeltDetaEndCap_) {
+                  Iso = Iso + etClusEndCap[k];
+                  IsoClus.push_back(k);
+                }
+              }
 
-      //================End of Pi0 endcap=======================//
+              if (Iso / pt_pair < selePi0IsoEndCap_) {
+                // cout <<"  EE Simple Clustering: pi0 Candidate pt, eta, phi,
+                // Iso, m_inv, i, j :   "<<pt_pair<<" "<<pairVect.Eta()<<"
+                // "<<pairVect.Phi()<<" "<<Iso<<" "<<m_inv<<" "<<i<<" "<<j<<"
+                // "<<endl;
+
+                hMinvPi0EE_->Fill(m_inv);
+                hPt1Pi0EE_->Fill(etClusEndCap[i]);
+                hPt2Pi0EE_->Fill(etClusEndCap[j]);
+                hPtPi0EE_->Fill(pt_pair);
+                hIsoPi0EE_->Fill(Iso / pt_pair);
+                hS4S91Pi0EE_->Fill(s4s9ClusEndCap[i]);
+                hS4S92Pi0EE_->Fill(s4s9ClusEndCap[j]);
+
+                npi0_se++;
+              }
+            }
+          }
+        }  // End of the "j" loop over Simple Clusters
+      }    // End of the "i" loop over Simple Clusters
 
+      //      cout<<"  (Simple Clustering) EE Pi0 candidates #:
+      //      "<<npi0_se<<endl;
 
-      //================ Eta in EE===============================//
+    }  // rhEEpi0
+  }    // isMonEEpi0
 
-      // fill pi0 EE histos
-      if(isMonEEeta_){
-	if (rhEEeta.isValid() && (!rhEEeta->empty())){
+  //================End of Pi0 endcap=======================//
 
-	  const EcalRecHitCollection *hitCollection_ee = rhEEeta.product();
-	  float etot =0;
+  //================ Eta in EE===============================//
 
-      detIdEERecHits.clear(); //// EEDetId
-      EERecHits.clear();  /// EcalRecHit
+  // fill pi0 EE histos
+  if (isMonEEeta_) {
+    if (rhEEeta.isValid() && (!rhEEeta->empty())) {
+      const EcalRecHitCollection *hitCollection_ee = rhEEeta.product();
+      float etot = 0;
 
+      detIdEERecHits.clear();  //// EEDetId
+      EERecHits.clear();       /// EcalRecHit
 
       std::vector<EcalRecHit> seedsEndCap;
       seedsEndCap.clear();
@@ -1242,273 +1236,272 @@ void DQMSourcePi0::analyze(const Event& iEvent,
       vector<EEDetId> usedXtalsEndCap;
       usedXtalsEndCap.clear();
 
-
-	  ////make seeds. 
+      ////make seeds.
       EERecHitCollection::const_iterator ite;
-      for (ite=rhEEeta->begin(); ite!=rhEEeta->end(); ite++) {
-	double energy = ite->energy();
-	if( energy < seleXtalMinEnergyEndCap_) continue; 
-    
-	EEDetId det = ite->id();
-	EEDetId id(ite->id());
-
-    
-	detIdEERecHits.push_back(det);
-	EERecHits.push_back(*ite);
-    
-	hiXDistrEEeta_->Fill(id.ix());
-	hiYDistrEEeta_->Fill(id.iy());
-	hRechitEnergyEEeta_->Fill(ite->energy());
-
-	if (energy > clusSeedThrEndCap_) seedsEndCap.push_back(*ite);
-	
-	etot+= ite->energy();	 
-      } // EE rechits
-      
+      for (ite = rhEEeta->begin(); ite != rhEEeta->end(); ite++) {
+        double energy = ite->energy();
+        if (energy < seleXtalMinEnergyEndCap_)
+          continue;
+
+        EEDetId det = ite->id();
+        EEDetId id(ite->id());
+
+        detIdEERecHits.push_back(det);
+        EERecHits.push_back(*ite);
+
+        hiXDistrEEeta_->Fill(id.ix());
+        hiYDistrEEeta_->Fill(id.iy());
+        hRechitEnergyEEeta_->Fill(ite->energy());
+
+        if (energy > clusSeedThrEndCap_)
+          seedsEndCap.push_back(*ite);
+
+        etot += ite->energy();
+      }  // EE rechits
+
       hNRecHitsEEeta_->Fill(rhEEeta->size());
-      hMeanRecHitEnergyEEeta_->Fill(etot/rhEEeta->size());
+      hMeanRecHitEnergyEEeta_->Fill(etot / rhEEeta->size());
       hEventEnergyEEeta_->Fill(etot);
 
-      //      cout << " EE RH Eta collection: #, mean rh_e, event E "<<rhEEeta->size()<<" "<<etot/rhEEeta->size()<<" "<<etot<<endl;   
-  
+      //      cout << " EE RH Eta collection: #, mean rh_e, event E
+      //      "<<rhEEeta->size()<<" "<<etot/rhEEeta->size()<<" "<<etot<<endl;
+
       int nClusEndCap;
       vector<float> eClusEndCap;
       vector<float> etClusEndCap;
       vector<float> etaClusEndCap;
       vector<float> thetaClusEndCap;
       vector<float> phiClusEndCap;
-      vector< vector<EcalRecHit> > RecHitsClusterEndCap;
-      vector< vector<EcalRecHit> > RecHitsCluster5x5EndCap;
+      vector<vector<EcalRecHit>> RecHitsClusterEndCap;
+      vector<vector<EcalRecHit>> RecHitsCluster5x5EndCap;
       vector<float> s4s9ClusEndCap;
       vector<float> s9s25ClusEndCap;
 
+      nClusEndCap = 0;
 
-      nClusEndCap=0;
-  
-  
       // Make own simple clusters (3x3, 5x5 or clusPhiSize_ x clusEtaSize_)
       sort(seedsEndCap.begin(), seedsEndCap.end(), ecalRecHitGreater);
-  
-      for (std::vector<EcalRecHit>::iterator itseed=seedsEndCap.begin(); itseed!=seedsEndCap.end(); itseed++) {
-	EEDetId seed_id = itseed->id();
-	std::vector<EEDetId>::const_iterator usedIds;
-    
-	bool seedAlreadyUsed=false;
-	for(usedIds=usedXtalsEndCap.begin(); usedIds!=usedXtalsEndCap.end(); usedIds++){
-	  if(*usedIds==seed_id){
-	    seedAlreadyUsed=true;
-	    break; 
-	  }
-	}
-
-	if(seedAlreadyUsed)continue;
-	std::vector<DetId> clus_v = topology_ee->getWindow(seed_id,clusEtaSize_,clusPhiSize_);      
-	std::vector<std::pair<DetId,float> > clus_used;
-    
-
-	vector<EcalRecHit> RecHitsInWindow;
-	vector<EcalRecHit> RecHitsInWindow5x5;
-    
-	float simple_energy = 0; 
-
-	for (std::vector<DetId>::iterator det=clus_v.begin(); det!=clus_v.end(); det++) {
-	  EEDetId EEdet = *det;
-      
-	  bool  HitAlreadyUsed=false;
-	  for(usedIds=usedXtalsEndCap.begin(); usedIds!=usedXtalsEndCap.end(); usedIds++){
-	    if(*usedIds==*det){
-	      HitAlreadyUsed=true;
-	      break;
-	    }
-	  }
-     
-	  if(HitAlreadyUsed)continue;
-      
-	  std::vector<EEDetId>::iterator itdet = find( detIdEERecHits.begin(),detIdEERecHits.end(),EEdet);
-	  if(itdet == detIdEERecHits.end()) continue; 
-      
-      
-	  int nn = int(itdet - detIdEERecHits.begin());
-	  usedXtalsEndCap.push_back(*det);
-	  RecHitsInWindow.push_back(EERecHits[nn]);
-	  clus_used.push_back(std::make_pair(*det,1));
-	  simple_energy = simple_energy + EERecHits[nn].energy();
-      
-      
-	}
-    
-	if( simple_energy <= 0) continue;
-        
-	math::XYZPoint clus_pos = posCalculator_.Calculate_Location(clus_used,hitCollection_ee,geometryEE_p,geometryES_p);
-    
-
-	float theta_s = 2. * atan(exp(-clus_pos.eta()));
-	float et_s = simple_energy * sin(theta_s);
-	//	float p0x_s = simple_energy * sin(theta_s) * cos(clus_pos.phi());
-	//float p0y_s = simple_energy * sin(theta_s) * sin(clus_pos.phi());
-	//float et_s = sqrt( p0x_s*p0x_s + p0y_s*p0y_s);
-    
-    
-	//Compute S4/S9 variable
-	//We are not sure to have 9 RecHits so need to check eta and phi:
-	float s4s9_tmp[4];
-	for(int i=0;i<4;i++) s4s9_tmp[i]= 0; 
-    
-	int ixSeed = seed_id.ix();
-	int iySeed = seed_id.iy();
-	float e3x3 = 0; 
-	float e5x5 = 0;
-
-	for(unsigned int j=0; j<RecHitsInWindow.size();j++){
-	  EEDetId det_this = (EEDetId)RecHitsInWindow[j].id(); 
-	  int dx = ixSeed - det_this.ix();
-	  int dy = iySeed - det_this.iy();
-      
-	  float en = RecHitsInWindow[j].energy(); 
-      
-	  if(dx <= 0 && dy <=0) s4s9_tmp[0] += en; 
-	  if(dx >= 0 && dy <=0) s4s9_tmp[1] += en; 
-	  if(dx <= 0 && dy >=0) s4s9_tmp[2] += en; 
-	  if(dx >= 0 && dy >=0) s4s9_tmp[3] += en; 
-
-	  if( std::abs(dx)<=1 && std::abs(dy)<=1) e3x3 += en; 
-	  if( std::abs(dx)<=2 && std::abs(dy)<=2) e5x5 += en; 
-
-	}
-
-      
-	if(e3x3 <= 0) continue;
-
-	eClusEndCap.push_back(simple_energy);
-	etClusEndCap.push_back(et_s);
-	etaClusEndCap.push_back(clus_pos.eta());
-	thetaClusEndCap.push_back(theta_s);
-	phiClusEndCap.push_back(clus_pos.phi());
-	s4s9ClusEndCap.push_back(*max_element( s4s9_tmp,s4s9_tmp+4)/e3x3);
-	s9s25ClusEndCap.push_back(e3x3/e5x5);
-	RecHitsClusterEndCap.push_back(RecHitsInWindow);
-	RecHitsCluster5x5EndCap.push_back(RecHitsInWindow5x5);
-	
-	//	std::cout<<" EE Eta cluster (n,nxt,e,et eta,phi,s4s9) "<<nClusEndCap<<" "<<int(RecHitsInWindow.size())<<" "<<eClusEndCap[nClusEndCap]<<" "<<" "<<etClusEndCap[nClusEndCap]<<" "<<etaClusEndCap[nClusEndCap]<<" "<<phiClusEndCap[nClusEndCap]<<" "<<s4s9ClusEndCap[nClusEndCap]<<std::endl;
-
-	nClusEndCap++;
 
-      }
+      for (std::vector<EcalRecHit>::iterator itseed = seedsEndCap.begin(); itseed != seedsEndCap.end(); itseed++) {
+        EEDetId seed_id = itseed->id();
+        std::vector<EEDetId>::const_iterator usedIds;
 
+        bool seedAlreadyUsed = false;
+        for (usedIds = usedXtalsEndCap.begin(); usedIds != usedXtalsEndCap.end(); usedIds++) {
+          if (*usedIds == seed_id) {
+            seedAlreadyUsed = true;
+            break;
+          }
+        }
 
+        if (seedAlreadyUsed)
+          continue;
+        std::vector<DetId> clus_v = topology_ee->getWindow(seed_id, clusEtaSize_, clusPhiSize_);
+        std::vector<std::pair<DetId, float>> clus_used;
 
-      // Selection, based on Simple clustering
-      //pi0 candidates
-      int npi0_se=0;
-
-
-      for(Int_t i=0 ; i<nClusEndCap ; i++){
-	for(Int_t j=i+1 ; j<nClusEndCap ; j++){
-      
-	  if( etClusEndCap[i]>selePtGammaEtaEndCap_ && etClusEndCap[j]>selePtGammaEtaEndCap_ && s4s9ClusEndCap[i]>seleS4S9GammaEtaEndCap_ && s4s9ClusEndCap[j]>seleS4S9GammaEtaEndCap_){
-
-          float p0x = etClusEndCap[i] * cos(phiClusEndCap[i]);
-          float p1x = etClusEndCap[j] * cos(phiClusEndCap[j]);
-          float p0y = etClusEndCap[i] * sin(phiClusEndCap[i]);
-          float p1y = etClusEndCap[j] * sin(phiClusEndCap[j]);
-          float p0z = eClusEndCap[i] * cos(thetaClusEndCap[i]);
-          float p1z = eClusEndCap[j] * cos(thetaClusEndCap[j]);
-
-        
-	    float pt_pair = sqrt( (p0x+p1x)*(p0x+p1x) + (p0y+p1y)*(p0y+p1y));
-	    if (pt_pair < selePtEtaEndCap_)continue;
-	    float m_inv = sqrt ( (eClusEndCap[i] + eClusEndCap[j])*(eClusEndCap[i] + eClusEndCap[j]) - (p0x+p1x)*(p0x+p1x) - (p0y+p1y)*(p0y+p1y) - (p0z+p1z)*(p0z+p1z) );  
- 
-
-	    if ( (m_inv<seleMinvMaxEtaEndCap_) && (m_inv>seleMinvMinEtaEndCap_) ){
-          
-
-	      //New Loop on cluster to measure isolation:
-	      vector<int> IsoClus;
-	      IsoClus.clear();
-	      float Iso = 0;
-	      TVector3 pairVect = TVector3((p0x+p1x), (p0y+p1y), (p0z+p1z));
-	      for(Int_t k=0 ; k<nClusEndCap ; k++){
-
-		if(etClusEndCap[k] < ptMinForIsolationEtaEndCap_) continue; 
-            
-            
-		if(k==i || k==j)continue;
-            
-            
-              TVector3 clusVect = TVector3(etClusEndCap[k] * cos(phiClusEndCap[k]), etClusEndCap[k] * sin(phiClusEndCap[k]) , eClusEndCap[k] * cos(thetaClusEndCap[k]) ) ;
-              float dretacl = fabs(etaClusEndCap[k] - pairVect.Eta());
-              float drcl = clusVect.DeltaR(pairVect);
-              
-              if(drcl < seleEtaBeltDREndCap_ && dretacl < seleEtaBeltDetaEndCap_ ){
-                Iso = Iso + etClusEndCap[k];
-                IsoClus.push_back(k);
-              }
+        vector<EcalRecHit> RecHitsInWindow;
+        vector<EcalRecHit> RecHitsInWindow5x5;
+
+        float simple_energy = 0;
+
+        for (std::vector<DetId>::iterator det = clus_v.begin(); det != clus_v.end(); det++) {
+          EEDetId EEdet = *det;
+
+          bool HitAlreadyUsed = false;
+          for (usedIds = usedXtalsEndCap.begin(); usedIds != usedXtalsEndCap.end(); usedIds++) {
+            if (*usedIds == *det) {
+              HitAlreadyUsed = true;
+              break;
             }
+          }
 
-          
-	      if(Iso/pt_pair<seleEtaIsoEndCap_){
-		//	cout <<"  EE Simple Clustering: Eta Candidate pt, eta, phi, Iso, m_inv, i, j :   "<<pt_pair<<" "<<pairVect.Eta()<<" "<<pairVect.Phi()<<" "<<Iso<<" "<<m_inv<<" "<<i<<" "<<j<<" "<<endl;  
+          if (HitAlreadyUsed)
+            continue;
 
-		hMinvEtaEE_->Fill(m_inv);
-		hPt1EtaEE_->Fill(etClusEndCap[i]);
-		hPt2EtaEE_->Fill(etClusEndCap[j]);
-		hPtEtaEE_->Fill(pt_pair);
-		hIsoEtaEE_->Fill(Iso/pt_pair);
-		hS4S91EtaEE_->Fill(s4s9ClusEndCap[i]);
-		hS4S92EtaEE_->Fill(s4s9ClusEndCap[j]);
+          std::vector<EEDetId>::iterator itdet = find(detIdEERecHits.begin(), detIdEERecHits.end(), EEdet);
+          if (itdet == detIdEERecHits.end())
+            continue;
 
-		npi0_se++;
-	      }
-          
-	    }
-	  }
-	} // End of the "j" loop over Simple Clusters
-      } // End of the "i" loop over Simple Clusters
+          int nn = int(itdet - detIdEERecHits.begin());
+          usedXtalsEndCap.push_back(*det);
+          RecHitsInWindow.push_back(EERecHits[nn]);
+          clus_used.push_back(std::make_pair(*det, 1));
+          simple_energy = simple_energy + EERecHits[nn].energy();
+        }
 
-      //      cout<<"  (Simple Clustering) EE Eta candidates #: "<<npi0_se<<endl;
+        if (simple_energy <= 0)
+          continue;
 
-	} //rhEEeta
-      } //isMonEEeta
+        math::XYZPoint clus_pos =
+            posCalculator_.Calculate_Location(clus_used, hitCollection_ee, geometryEE_p, geometryES_p);
 
-      //================End of Pi0 endcap=======================//
+        float theta_s = 2. * atan(exp(-clus_pos.eta()));
+        float et_s = simple_energy * sin(theta_s);
+        //	float p0x_s = simple_energy * sin(theta_s) *
+        // cos(clus_pos.phi()); float p0y_s = simple_energy * sin(theta_s) *
+        // sin(clus_pos.phi()); float et_s = sqrt( p0x_s*p0x_s + p0y_s*p0y_s);
+
+        // Compute S4/S9 variable
+        // We are not sure to have 9 RecHits so need to check eta and phi:
+        float s4s9_tmp[4];
+        for (int i = 0; i < 4; i++)
+          s4s9_tmp[i] = 0;
+
+        int ixSeed = seed_id.ix();
+        int iySeed = seed_id.iy();
+        float e3x3 = 0;
+        float e5x5 = 0;
+
+        for (unsigned int j = 0; j < RecHitsInWindow.size(); j++) {
+          EEDetId det_this = (EEDetId)RecHitsInWindow[j].id();
+          int dx = ixSeed - det_this.ix();
+          int dy = iySeed - det_this.iy();
+
+          float en = RecHitsInWindow[j].energy();
+
+          if (dx <= 0 && dy <= 0)
+            s4s9_tmp[0] += en;
+          if (dx >= 0 && dy <= 0)
+            s4s9_tmp[1] += en;
+          if (dx <= 0 && dy >= 0)
+            s4s9_tmp[2] += en;
+          if (dx >= 0 && dy >= 0)
+            s4s9_tmp[3] += en;
+
+          if (std::abs(dx) <= 1 && std::abs(dy) <= 1)
+            e3x3 += en;
+          if (std::abs(dx) <= 2 && std::abs(dy) <= 2)
+            e5x5 += en;
+        }
+
+        if (e3x3 <= 0)
+          continue;
+
+        eClusEndCap.push_back(simple_energy);
+        etClusEndCap.push_back(et_s);
+        etaClusEndCap.push_back(clus_pos.eta());
+        thetaClusEndCap.push_back(theta_s);
+        phiClusEndCap.push_back(clus_pos.phi());
+        s4s9ClusEndCap.push_back(*max_element(s4s9_tmp, s4s9_tmp + 4) / e3x3);
+        s9s25ClusEndCap.push_back(e3x3 / e5x5);
+        RecHitsClusterEndCap.push_back(RecHitsInWindow);
+        RecHitsCluster5x5EndCap.push_back(RecHitsInWindow5x5);
+
+        //	std::cout<<" EE Eta cluster (n,nxt,e,et eta,phi,s4s9)
+        //"<<nClusEndCap<<" "<<int(RecHitsInWindow.size())<<"
+        //"<<eClusEndCap[nClusEndCap]<<" "<<" "<<etClusEndCap[nClusEndCap]<<"
+        //"<<etaClusEndCap[nClusEndCap]<<" "<<phiClusEndCap[nClusEndCap]<<"
+        //"<<s4s9ClusEndCap[nClusEndCap]<<std::endl;
+
+        nClusEndCap++;
+      }
 
+      // Selection, based on Simple clustering
+      // pi0 candidates
+      int npi0_se = 0;
+
+      for (Int_t i = 0; i < nClusEndCap; i++) {
+        for (Int_t j = i + 1; j < nClusEndCap; j++) {
+          if (etClusEndCap[i] > selePtGammaEtaEndCap_ && etClusEndCap[j] > selePtGammaEtaEndCap_ &&
+              s4s9ClusEndCap[i] > seleS4S9GammaEtaEndCap_ && s4s9ClusEndCap[j] > seleS4S9GammaEtaEndCap_) {
+            float p0x = etClusEndCap[i] * cos(phiClusEndCap[i]);
+            float p1x = etClusEndCap[j] * cos(phiClusEndCap[j]);
+            float p0y = etClusEndCap[i] * sin(phiClusEndCap[i]);
+            float p1y = etClusEndCap[j] * sin(phiClusEndCap[j]);
+            float p0z = eClusEndCap[i] * cos(thetaClusEndCap[i]);
+            float p1z = eClusEndCap[j] * cos(thetaClusEndCap[j]);
+
+            float pt_pair = sqrt((p0x + p1x) * (p0x + p1x) + (p0y + p1y) * (p0y + p1y));
+            if (pt_pair < selePtEtaEndCap_)
+              continue;
+            float m_inv = sqrt((eClusEndCap[i] + eClusEndCap[j]) * (eClusEndCap[i] + eClusEndCap[j]) -
+                               (p0x + p1x) * (p0x + p1x) - (p0y + p1y) * (p0y + p1y) - (p0z + p1z) * (p0z + p1z));
+
+            if ((m_inv < seleMinvMaxEtaEndCap_) && (m_inv > seleMinvMinEtaEndCap_)) {
+              // New Loop on cluster to measure isolation:
+              vector<int> IsoClus;
+              IsoClus.clear();
+              float Iso = 0;
+              TVector3 pairVect = TVector3((p0x + p1x), (p0y + p1y), (p0z + p1z));
+              for (Int_t k = 0; k < nClusEndCap; k++) {
+                if (etClusEndCap[k] < ptMinForIsolationEtaEndCap_)
+                  continue;
+
+                if (k == i || k == j)
+                  continue;
+
+                TVector3 clusVect = TVector3(etClusEndCap[k] * cos(phiClusEndCap[k]),
+                                             etClusEndCap[k] * sin(phiClusEndCap[k]),
+                                             eClusEndCap[k] * cos(thetaClusEndCap[k]));
+                float dretacl = fabs(etaClusEndCap[k] - pairVect.Eta());
+                float drcl = clusVect.DeltaR(pairVect);
+
+                if (drcl < seleEtaBeltDREndCap_ && dretacl < seleEtaBeltDetaEndCap_) {
+                  Iso = Iso + etClusEndCap[k];
+                  IsoClus.push_back(k);
+                }
+              }
 
+              if (Iso / pt_pair < seleEtaIsoEndCap_) {
+                //	cout <<"  EE Simple Clustering: Eta Candidate pt, eta,
+                // phi, Iso, m_inv, i, j :   "<<pt_pair<<" "<<pairVect.Eta()<<"
+                //"<<pairVect.Phi()<<" "<<Iso<<" "<<m_inv<<" "<<i<<" "<<j<<"
+                //"<<endl;
+
+                hMinvEtaEE_->Fill(m_inv);
+                hPt1EtaEE_->Fill(etClusEndCap[i]);
+                hPt2EtaEE_->Fill(etClusEndCap[j]);
+                hPtEtaEE_->Fill(pt_pair);
+                hIsoEtaEE_->Fill(Iso / pt_pair);
+                hS4S91EtaEE_->Fill(s4s9ClusEndCap[i]);
+                hS4S92EtaEE_->Fill(s4s9ClusEndCap[j]);
+
+                npi0_se++;
+              }
+            }
+          }
+        }  // End of the "j" loop over Simple Clusters
+      }    // End of the "i" loop over Simple Clusters
 
+      //      cout<<"  (Simple Clustering) EE Eta candidates #:
+      //      "<<npi0_se<<endl;
 
-      ////==============End of endcap ===============///
+    }  // rhEEeta
+  }    // isMonEEeta
 
+  //================End of Pi0 endcap=======================//
 
-} 
+  ////==============End of endcap ===============///
+}
 
-void DQMSourcePi0::convxtalid(Int_t &nphi,Int_t &neta)
-{
+void DQMSourcePi0::convxtalid(Int_t &nphi, Int_t &neta) {
   // Barrel only
   // Output nphi 0...359; neta 0...84; nside=+1 (for eta>0), or 0 (for eta<0).
   // neta will be [-85,-1] , or [0,84], the minus sign indicates the z<0 side.
-  
-  if(neta > 0) neta -= 1;
-  if(nphi > 359) nphi=nphi-360;
-  
-} //end of convxtalid
 
-int DQMSourcePi0::diff_neta_s(Int_t neta1, Int_t neta2){
+  if (neta > 0)
+    neta -= 1;
+  if (nphi > 359)
+    nphi = nphi - 360;
+
+}  // end of convxtalid
+
+int DQMSourcePi0::diff_neta_s(Int_t neta1, Int_t neta2) {
   Int_t mdiff;
-  mdiff=(neta1-neta2);
+  mdiff = (neta1 - neta2);
   return mdiff;
 }
 
-// Calculate the distance in xtals taking into account the periodicity of the Barrel
-int DQMSourcePi0::diff_nphi_s(Int_t nphi1,Int_t nphi2) {
+// Calculate the distance in xtals taking into account the periodicity of the
+// Barrel
+int DQMSourcePi0::diff_nphi_s(Int_t nphi1, Int_t nphi2) {
   Int_t mdiff;
-  if(std::abs(nphi1-nphi2) < (360-std::abs(nphi1-nphi2))) {
-    mdiff=nphi1-nphi2;
-  }
-  else {
-    mdiff=360-std::abs(nphi1-nphi2);
-    if(nphi1>nphi2) mdiff=-mdiff;
+  if (std::abs(nphi1 - nphi2) < (360 - std::abs(nphi1 - nphi2))) {
+    mdiff = nphi1 - nphi2;
+  } else {
+    mdiff = 360 - std::abs(nphi1 - nphi2);
+    if (nphi1 > nphi2)
+      mdiff = -mdiff;
   }
   return mdiff;
 }
-
-
diff --git a/DQMOffline/CalibCalo/src/DQMSourcePi0.h b/DQMOffline/CalibCalo/src/DQMSourcePi0.h
old mode 100755
new mode 100644
index adeaa4d3b586a..573ebd09ddbba
--- a/DQMOffline/CalibCalo/src/DQMSourcePi0.h
+++ b/DQMOffline/CalibCalo/src/DQMSourcePi0.h
@@ -1,8 +1,8 @@
 #ifndef DQMSourcePi0_H
 #define DQMSourcePi0_H
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
@@ -10,137 +10,128 @@
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 
 // Geometry
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
-#include "Geometry/CaloTopology/interface/CaloTopology.h"
-#include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h"
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
-#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
-#include "Geometry/CaloTopology/interface/EcalEndcapTopology.h"
+#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
+#include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h"
+#include "Geometry/CaloTopology/interface/CaloTopology.h"
 #include "Geometry/CaloTopology/interface/EcalBarrelTopology.h"
+#include "Geometry/CaloTopology/interface/EcalEndcapTopology.h"
+#include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "RecoEcal/EgammaCoreTools/interface/PositionCalc.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
 // Less than operator for sorting EcalRecHits according to energy.
-bool ecalRecHitGreater(EcalRecHit x, EcalRecHit y) 
-{ 
-  return (x.energy() > y.energy()); 
-}
-
-
+bool ecalRecHitGreater(EcalRecHit x, EcalRecHit y) { return (x.energy() > y.energy()); }
 
 class DQMStore;
 class MonitorElement;
 
 class DQMSourcePi0 : public DQMEDAnalyzer {
-
 public:
-
-  DQMSourcePi0( const edm::ParameterSet& );
+  DQMSourcePi0(const edm::ParameterSet &);
   ~DQMSourcePi0() override;
 
 protected:
-   
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(const edm::Event& e, const edm::EventSetup& c) override ;
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
-  void convxtalid(int & , int &);
-  int diff_neta_s(int,int);
-  int diff_nphi_s(int,int);
+  void convxtalid(int &, int &);
+  int diff_neta_s(int, int);
+  int diff_nphi_s(int, int);
 
 private:
+  int eventCounter_;
+  PositionCalc posCalculator_;
 
-  int eventCounter_;      
-  PositionCalc posCalculator_ ;                        
-
-  /// Distribution of rechits in iPhi (pi0)   
-  MonitorElement * hiPhiDistrEBpi0_;
+  /// Distribution of rechits in iPhi (pi0)
+  MonitorElement *hiPhiDistrEBpi0_;
 
   /// Distribution of rechits in ix EE  (pi0)
-  MonitorElement * hiXDistrEEpi0_;
+  MonitorElement *hiXDistrEEpi0_;
 
-  /// Distribution of rechits in iPhi (eta)   
-  MonitorElement * hiPhiDistrEBeta_;
+  /// Distribution of rechits in iPhi (eta)
+  MonitorElement *hiPhiDistrEBeta_;
 
   /// Distribution of rechits in ix EE  (eta)
-  MonitorElement * hiXDistrEEeta_;
+  MonitorElement *hiXDistrEEeta_;
 
   /// Distribution of rechits in iEta (pi0)
-  MonitorElement * hiEtaDistrEBpi0_;
+  MonitorElement *hiEtaDistrEBpi0_;
 
   /// Distribution of rechits in iy EE (pi0)
-  MonitorElement * hiYDistrEEpi0_;
+  MonitorElement *hiYDistrEEpi0_;
 
   /// Distribution of rechits in iEta (eta)
-  MonitorElement * hiEtaDistrEBeta_;
+  MonitorElement *hiEtaDistrEBeta_;
 
   /// Distribution of rechits in iy EE (eta)
-  MonitorElement * hiYDistrEEeta_;
+  MonitorElement *hiYDistrEEeta_;
 
   /// Energy Distribution of rechits EB (pi0)
-  MonitorElement * hRechitEnergyEBpi0_;
+  MonitorElement *hRechitEnergyEBpi0_;
 
-  /// Energy Distribution of rechits EE (pi0) 
-  MonitorElement * hRechitEnergyEEpi0_;
+  /// Energy Distribution of rechits EE (pi0)
+  MonitorElement *hRechitEnergyEEpi0_;
 
-  /// Energy Distribution of rechits EB (eta)  
-  MonitorElement * hRechitEnergyEBeta_;
+  /// Energy Distribution of rechits EB (eta)
+  MonitorElement *hRechitEnergyEBeta_;
 
-  /// Energy Distribution of rechits EE (eta) 
-  MonitorElement * hRechitEnergyEEeta_;
+  /// Energy Distribution of rechits EE (eta)
+  MonitorElement *hRechitEnergyEEeta_;
 
   /// Distribution of total event energy EB (pi0)
-  MonitorElement * hEventEnergyEBpi0_;
+  MonitorElement *hEventEnergyEBpi0_;
 
   /// Distribution of total event energy EE (pi0)
-  MonitorElement * hEventEnergyEEpi0_;
-  
+  MonitorElement *hEventEnergyEEpi0_;
+
   /// Distribution of total event energy EB (eta)
-  MonitorElement * hEventEnergyEBeta_;
+  MonitorElement *hEventEnergyEBeta_;
 
   /// Distribution of total event energy EE (eta)
-  MonitorElement * hEventEnergyEEeta_;
-  
+  MonitorElement *hEventEnergyEEeta_;
+
   /// Distribution of number of RecHits EB (pi0)
-  MonitorElement * hNRecHitsEBpi0_;
+  MonitorElement *hNRecHitsEBpi0_;
 
   /// Distribution of number of RecHits EE (pi0)
-  MonitorElement * hNRecHitsEEpi0_;
+  MonitorElement *hNRecHitsEEpi0_;
 
   /// Distribution of number of RecHits EB (eta)
-  MonitorElement * hNRecHitsEBeta_;
+  MonitorElement *hNRecHitsEBeta_;
 
   /// Distribution of number of RecHits EE (eta)
-  MonitorElement * hNRecHitsEEeta_;
+  MonitorElement *hNRecHitsEEeta_;
 
   /// Distribution of Mean energy per rechit EB (pi0)
-  MonitorElement * hMeanRecHitEnergyEBpi0_;
+  MonitorElement *hMeanRecHitEnergyEBpi0_;
 
   /// Distribution of Mean energy per rechit EE (pi0)
-  MonitorElement * hMeanRecHitEnergyEEpi0_;
+  MonitorElement *hMeanRecHitEnergyEEpi0_;
 
   /// Distribution of Mean energy per rechit EB (eta)
-  MonitorElement * hMeanRecHitEnergyEBeta_;
+  MonitorElement *hMeanRecHitEnergyEBeta_;
 
   /// Distribution of Mean energy per rechit EE (eta)
-  MonitorElement * hMeanRecHitEnergyEEeta_;
+  MonitorElement *hMeanRecHitEnergyEEeta_;
 
   /// Pi0 invariant mass in EB
-  MonitorElement * hMinvPi0EB_;
+  MonitorElement *hMinvPi0EB_;
 
   /// Pi0 invariant mass in EE
-  MonitorElement * hMinvPi0EE_;
+  MonitorElement *hMinvPi0EE_;
 
   /// Eta invariant mass in EB
-  MonitorElement * hMinvEtaEB_;
+  MonitorElement *hMinvEtaEB_;
 
   /// Eta invariant mass in EE
-  MonitorElement * hMinvEtaEE_;
+  MonitorElement *hMinvEtaEE_;
 
-  /// Pt of the 1st most energetic Pi0 photon in EB 
+  /// Pt of the 1st most energetic Pi0 photon in EB
   MonitorElement *hPt1Pi0EB_;
 
   /// Pt of the 1st most energetic Pi0 photon in EE
@@ -152,7 +143,6 @@ class DQMSourcePi0 : public DQMEDAnalyzer {
   /// Pt of the 1st most energetic Eta photon in EE
   MonitorElement *hPt1EtaEE_;
 
-  
   /// Pt of the 2nd most energetic Pi0 photon in EB
   MonitorElement *hPt2Pi0EB_;
 
@@ -165,71 +155,67 @@ class DQMSourcePi0 : public DQMEDAnalyzer {
   /// Pt of the 2nd most energetic Eta photon in EE
   MonitorElement *hPt2EtaEE_;
 
-  
   /// Pi0 Pt in EB
-  MonitorElement * hPtPi0EB_;
+  MonitorElement *hPtPi0EB_;
 
   /// Pi0 Pt in EE
-  MonitorElement * hPtPi0EE_;
+  MonitorElement *hPtPi0EE_;
 
   /// Eta Pt in EB
-  MonitorElement * hPtEtaEB_;
+  MonitorElement *hPtEtaEB_;
 
   /// Eta Pt in EE
-  MonitorElement * hPtEtaEE_;
+  MonitorElement *hPtEtaEE_;
 
   /// Pi0 Iso EB
-  MonitorElement * hIsoPi0EB_;
+  MonitorElement *hIsoPi0EB_;
 
   /// Pi0 Iso EE
-  MonitorElement * hIsoPi0EE_;
+  MonitorElement *hIsoPi0EE_;
 
   /// Eta Iso EB
-  MonitorElement * hIsoEtaEB_;
+  MonitorElement *hIsoEtaEB_;
 
   /// Eta Iso EE
-  MonitorElement * hIsoEtaEE_;
+  MonitorElement *hIsoEtaEE_;
 
   /// S4S9 of the 1st most energetic pi0 photon
-  MonitorElement * hS4S91Pi0EB_;
+  MonitorElement *hS4S91Pi0EB_;
 
   /// S4S9 of the 1st most energetic pi0 photon EE
-  MonitorElement * hS4S91Pi0EE_;
+  MonitorElement *hS4S91Pi0EE_;
 
   /// S4S9 of the 1st most energetic eta photon
-  MonitorElement * hS4S91EtaEB_;
+  MonitorElement *hS4S91EtaEB_;
 
   /// S4S9 of the 1st most energetic eta photon EE
-  MonitorElement * hS4S91EtaEE_;
+  MonitorElement *hS4S91EtaEE_;
 
   /// S4S9 of the 2nd most energetic pi0 photon
-  MonitorElement * hS4S92Pi0EB_;
-  
+  MonitorElement *hS4S92Pi0EB_;
+
   /// S4S9 of the 2nd most energetic pi0 photon EE
-  MonitorElement * hS4S92Pi0EE_;
-  
-  /// S4S9 of the 2nd most energetic eta photon
-  MonitorElement * hS4S92EtaEB_;
-  
-  /// S4S9 of the 2nd most energetic eta photon EE
-  MonitorElement * hS4S92EtaEE_;
-  
+  MonitorElement *hS4S92Pi0EE_;
 
+  /// S4S9 of the 2nd most energetic eta photon
+  MonitorElement *hS4S92EtaEB_;
 
+  /// S4S9 of the 2nd most energetic eta photon EE
+  MonitorElement *hS4S92EtaEE_;
 
   /// object to monitor
   edm::EDGetTokenT<EcalRecHitCollection> productMonitoredEBpi0_;
   edm::EDGetTokenT<EcalRecHitCollection> productMonitoredEBeta_;
 
- /// object to monitor
+  /// object to monitor
   edm::EDGetTokenT<EcalRecHitCollection> productMonitoredEEpi0_;
   edm::EDGetTokenT<EcalRecHitCollection> productMonitoredEEeta_;
 
-      int gammaCandEtaSize_;
-      int gammaCandPhiSize_;
+  int gammaCandEtaSize_;
+  int gammaCandPhiSize_;
 
-      double seleXtalMinEnergy_;
-      double seleXtalMinEnergyEndCap_;
+  double seleXtalMinEnergy_;
+  double seleXtalMinEnergyEndCap_;
 
   double clusSeedThr_;
   int clusEtaSize_;
@@ -237,52 +223,51 @@ class DQMSourcePi0 : public DQMEDAnalyzer {
 
   double clusSeedThrEndCap_;
 
-      //// for pi0->gg barrel 
-      double selePtGamma_;
-      double selePtPi0_;
-      double seleMinvMaxPi0_;
-      double seleMinvMinPi0_;
-      double seleS4S9Gamma_;
-      double selePi0BeltDR_;
-      double selePi0BeltDeta_;
-      double selePi0Iso_;
-      double ptMinForIsolation_; 
-
-      ///for pi0->gg endcap
-      double selePtGammaEndCap_;
-      double selePtPi0EndCap_;
-      double seleMinvMaxPi0EndCap_;
-      double seleMinvMinPi0EndCap_;
-      double seleS4S9GammaEndCap_;
-      double selePi0IsoEndCap_;
-      double selePi0BeltDREndCap_;
-      double selePi0BeltDetaEndCap_;
-      double ptMinForIsolationEndCap_; 
-
-      ///for eta->gg barrel
-      double selePtGammaEta_;
-      double selePtEta_;
-      double seleS4S9GammaEta_; 
-      double seleS9S25GammaEta_; 
-      double seleMinvMaxEta_; 
-      double seleMinvMinEta_; 
-      double ptMinForIsolationEta_; 
-      double seleEtaIso_; 
-      double seleEtaBeltDR_; 
-      double seleEtaBeltDeta_; 
-
-      ///for eta->gg endcap
-      double selePtGammaEtaEndCap_;
-      double seleS4S9GammaEtaEndCap_;
-      double seleS9S25GammaEtaEndCap_;
-      double selePtEtaEndCap_;
-      double seleMinvMaxEtaEndCap_;
-      double seleMinvMinEtaEndCap_;
-      double ptMinForIsolationEtaEndCap_;
-      double seleEtaIsoEndCap_;
-      double seleEtaBeltDREndCap_;
-      double seleEtaBeltDetaEndCap_;
-
+  //// for pi0->gg barrel
+  double selePtGamma_;
+  double selePtPi0_;
+  double seleMinvMaxPi0_;
+  double seleMinvMinPi0_;
+  double seleS4S9Gamma_;
+  double selePi0BeltDR_;
+  double selePi0BeltDeta_;
+  double selePi0Iso_;
+  double ptMinForIsolation_;
+
+  /// for pi0->gg endcap
+  double selePtGammaEndCap_;
+  double selePtPi0EndCap_;
+  double seleMinvMaxPi0EndCap_;
+  double seleMinvMinPi0EndCap_;
+  double seleS4S9GammaEndCap_;
+  double selePi0IsoEndCap_;
+  double selePi0BeltDREndCap_;
+  double selePi0BeltDetaEndCap_;
+  double ptMinForIsolationEndCap_;
+
+  /// for eta->gg barrel
+  double selePtGammaEta_;
+  double selePtEta_;
+  double seleS4S9GammaEta_;
+  double seleS9S25GammaEta_;
+  double seleMinvMaxEta_;
+  double seleMinvMinEta_;
+  double ptMinForIsolationEta_;
+  double seleEtaIso_;
+  double seleEtaBeltDR_;
+  double seleEtaBeltDeta_;
+
+  /// for eta->gg endcap
+  double selePtGammaEtaEndCap_;
+  double seleS4S9GammaEtaEndCap_;
+  double seleS9S25GammaEtaEndCap_;
+  double selePtEtaEndCap_;
+  double seleMinvMaxEtaEndCap_;
+  double seleMinvMinEtaEndCap_;
+  double ptMinForIsolationEtaEndCap_;
+  double seleEtaIsoEndCap_;
+  double seleEtaBeltDREndCap_;
+  double seleEtaBeltDetaEndCap_;
 
   bool ParameterLogWeighted_;
   double ParameterX0_;
@@ -291,24 +276,19 @@ class DQMSourcePi0 : public DQMEDAnalyzer {
   double ParameterT0_endcPresh_;
   double ParameterW0_;
 
+  std::vector<EBDetId> detIdEBRecHits;
+  std::vector<EcalRecHit> EBRecHits;
 
-
-  std::vector<EBDetId> detIdEBRecHits; 
-  std::vector<EcalRecHit> EBRecHits; 
- 
-  
-  std::vector<EEDetId> detIdEERecHits; 
-  std::vector<EcalRecHit> EERecHits; 
-
-
+  std::vector<EEDetId> detIdEERecHits;
+  std::vector<EcalRecHit> EERecHits;
 
   /// Monitor every prescaleFactor_ events
   unsigned int prescaleFactor_;
-  
+
   /// DQM folder name
-  std::string folderName_; 
- 
-  /// Write to file 
+  std::string folderName_;
+
+  /// Write to file
   bool saveToFile_;
 
   /// which subdet will be monitored
diff --git a/DQMOffline/CalibMuon/interface/DTPreCalibrationTask.h b/DQMOffline/CalibMuon/interface/DTPreCalibrationTask.h
index e005ef4eed0b4..4981bf8eee143 100644
--- a/DQMOffline/CalibMuon/interface/DTPreCalibrationTask.h
+++ b/DQMOffline/CalibMuon/interface/DTPreCalibrationTask.h
@@ -8,37 +8,35 @@
  *  \author G. Mila - INFN Torino
  */
 
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include <FWCore/Framework/interface/ESHandle.h>
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h"
+#include <FWCore/Framework/interface/ESHandle.h>
 
-#include <DataFormats/DTDigi/interface/DTDigi.h>
 #include "DataFormats/DTDigi/interface/DTDigiCollection.h"
+#include <DataFormats/DTDigi/interface/DTDigi.h>
 
-#include <string>
 #include <map>
+#include <string>
 #include <vector>
 
 class DQMStore;
 class MonitorElement;
 
-class DTPreCalibrationTask: public DQMEDAnalyzer{
-
+class DTPreCalibrationTask : public DQMEDAnalyzer {
 public:
-
   /// Constructor
-  DTPreCalibrationTask(const edm::ParameterSet& ps);
-  
+  DTPreCalibrationTask(const edm::ParameterSet &ps);
+
   /// Destructor
   ~DTPreCalibrationTask() override;
 
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze( const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
   /// Book histos
   void bookTimeBoxes(DQMStore::IBooker &, int wheel, int sector);
@@ -46,15 +44,14 @@ class DTPreCalibrationTask: public DQMEDAnalyzer{
 
 private:
   edm::EDGetTokenT<DTDigiCollection> digiLabel;
-  int  minTriggerWidth;
-  int  maxTriggerWidth;
+  int minTriggerWidth;
+  int maxTriggerWidth;
   std::string folderName;
 
   // Time boxes map
-  std::map<std::pair<int,int>, MonitorElement* > TimeBoxes;
+  std::map<std::pair<int, int>, MonitorElement *> TimeBoxes;
 
   // Occupancy plot map
-  std::map<std::pair<int,int>, MonitorElement* > OccupancyHistos;
-
+  std::map<std::pair<int, int>, MonitorElement *> OccupancyHistos;
 };
 #endif
diff --git a/DQMOffline/CalibMuon/interface/DTnoiseDBValidation.h b/DQMOffline/CalibMuon/interface/DTnoiseDBValidation.h
index 214a2d0cce77e..51f4372a8c85b 100644
--- a/DQMOffline/CalibMuon/interface/DTnoiseDBValidation.h
+++ b/DQMOffline/CalibMuon/interface/DTnoiseDBValidation.h
@@ -7,19 +7,19 @@
  *  \author G. Mila - INFN Torino
  */
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h"
 
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
 
 class DTGeometry;
 class DTChamberId;
@@ -29,30 +29,28 @@ class TFile;
 class DTnoiseDBValidation : public edm::EDAnalyzer {
 public:
   /// Constructor
-  DTnoiseDBValidation(const edm::ParameterSet& pset);
+  DTnoiseDBValidation(const edm::ParameterSet &pset);
 
-    /// Destructor
+  /// Destructor
   ~DTnoiseDBValidation() override;
 
   /// Operations
-  void beginRun(const edm::Run& run, const edm::EventSetup& setup) override;
-  void endRun(edm::Run const&, edm::EventSetup const&) override;
+  void beginRun(const edm::Run &run, const edm::EventSetup &setup) override;
+  void endRun(edm::Run const &, edm::EventSetup const &) override;
   void endJob() override;
-  void analyze(const edm::Event& event, const edm::EventSetup& setup) override {}
- 
-protected:
+  void analyze(const edm::Event &event, const edm::EventSetup &setup) override {}
 
+protected:
 private:
-  void bookHisto(const DTChamberId&);
+  void bookHisto(const DTChamberId &);
 
-  DQMStore* dbe_;
+  DQMStore *dbe_;
   // The DB label
   std::string labelDBRef_;
   std::string labelDB_;
-  std::string diffTestName_,wheelTestName_,stationTestName_,
-              sectorTestName_,layerTestName_;
+  std::string diffTestName_, wheelTestName_, stationTestName_, sectorTestName_, layerTestName_;
 
-  bool outputMEsInRootFile_; 
+  bool outputMEsInRootFile_;
   std::string outputFileName_;
 
   // The DTGeometry
@@ -61,18 +59,16 @@ class DTnoiseDBValidation : public edm::EDAnalyzer {
   // The noise map
   const DTStatusFlag *noiseMap_;
   const DTStatusFlag *noiseRefMap_;
- 
-  //the total number of noisy cell
+
+  // the total number of noisy cell
   int noisyCellsRef_;
   int noisyCellsValid_;
   // the histos
-  MonitorElement * diffHisto_;
-  MonitorElement * wheelHisto_;
-  MonitorElement * stationHisto_;
-  MonitorElement * sectorHisto_;
-  MonitorElement * layerHisto_;
-  std::map<DTChamberId, MonitorElement*> noiseHistoMap_;
-
+  MonitorElement *diffHisto_;
+  MonitorElement *wheelHisto_;
+  MonitorElement *stationHisto_;
+  MonitorElement *sectorHisto_;
+  MonitorElement *layerHisto_;
+  std::map<DTChamberId, MonitorElement *> noiseHistoMap_;
 };
 #endif
-
diff --git a/DQMOffline/CalibMuon/interface/DTt0DBValidation.h b/DQMOffline/CalibMuon/interface/DTt0DBValidation.h
index 27c6447a5ce14..4c6110c2e2dc9 100644
--- a/DQMOffline/CalibMuon/interface/DTt0DBValidation.h
+++ b/DQMOffline/CalibMuon/interface/DTt0DBValidation.h
@@ -7,22 +7,22 @@
  *  \author G. Mila - INFN Torino
  */
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h"
 
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
 #include "DataFormats/MuonDetId/interface/DTWireId.h"
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
 
-#include <string>
 #include <fstream>
+#include <string>
 #include <vector>
 
 class DTT0;
@@ -31,23 +31,23 @@ class TFile;
 class DTt0DBValidation : public edm::EDAnalyzer {
 public:
   /// Constructor
-  DTt0DBValidation(const edm::ParameterSet& pset);
+  DTt0DBValidation(const edm::ParameterSet &pset);
 
   /// Destructor
   ~DTt0DBValidation() override;
 
   /// Operations
-  //Read the DTGeometry and the t0 DB
-  void beginRun(const edm::Run& run, const edm::EventSetup& setup) override;
-  void endRun(edm::Run const&, edm::EventSetup const&) override;
-  void endJob() override; 
-  void analyze(const edm::Event& event, const edm::EventSetup& setup) override {}
+  // Read the DTGeometry and the t0 DB
+  void beginRun(const edm::Run &run, const edm::EventSetup &setup) override;
+  void endRun(edm::Run const &, edm::EventSetup const &) override;
+  void endJob() override;
+  void analyze(const edm::Event &event, const edm::EventSetup &setup) override {}
 
 private:
   void bookHistos(DTLayerId lId, int firstWire, int lastWire);
   void bookHistos(int wheel);
 
-  DQMStore* dbe_;
+  DQMStore *dbe_;
   // Switch for verbosity
   std::string metname_;
   // The DB label
@@ -66,15 +66,15 @@ class DTt0DBValidation : public edm::EDAnalyzer {
   // The t0 map
   const DTT0 *tZeroMap_;
   const DTT0 *tZeroRefMap_;
- 
+
   // Map of the t0 and sigma per wire
-  std::map<DTWireId, std::vector<float> > t0RefMap_;
-  std::map<DTWireId, std::vector<float> > t0Map_;
+  std::map<DTWireId, std::vector<float>> t0RefMap_;
+  std::map<DTWireId, std::vector<float>> t0Map_;
 
   // Map of the t0 difference histos per layer
-  std::map<DTLayerId, MonitorElement* > t0DiffHistos_;
+  std::map<DTLayerId, MonitorElement *> t0DiffHistos_;
 
   // Summary histos
-  std::map<int, MonitorElement* > wheelSummary_;
+  std::map<int, MonitorElement *> wheelSummary_;
 };
 #endif
diff --git a/DQMOffline/CalibMuon/interface/DTtTrigDBValidation.h b/DQMOffline/CalibMuon/interface/DTtTrigDBValidation.h
index fe36e212f2e2b..437e6cc6a1dbc 100644
--- a/DQMOffline/CalibMuon/interface/DTtTrigDBValidation.h
+++ b/DQMOffline/CalibMuon/interface/DTtTrigDBValidation.h
@@ -1,40 +1,38 @@
 #ifndef DTtTrigDBValidation_H
 #define DTtTrigDBValidation_H
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "RecoMuon/TrackingTools/interface/MuonServiceProxy.h"
 
 #include "DataFormats/MuonDetId/interface/DTSuperLayerId.h"
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
 
-#include <string>
 #include <fstream>
+#include <string>
 #include <vector>
 
-//class DTTtrig;
+// class DTTtrig;
 class TFile;
 
 class DTtTrigDBValidation : public DQMEDAnalyzer {
-
 public:
   /// Constructor
-  DTtTrigDBValidation(const edm::ParameterSet& pset);
+  DTtTrigDBValidation(const edm::ParameterSet &pset);
 
   /// Destructor
   ~DTtTrigDBValidation() override;
 
   /// Operations
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze( const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
 private:
-
   // Switch for verbosity
   std::string metname_;
   // The DB label
@@ -48,12 +46,12 @@ class DTtTrigDBValidation : public DQMEDAnalyzer {
   edm::ESHandle<DTGeometry> dtGeom_;
 
   // Map of the tTrig and sigma by super-layer
-  std::map<DTSuperLayerId, std::pair<float,float> > tTrigRefMap_;
-  std::map<DTSuperLayerId, std::pair<float,float> > tTrigMap_;
+  std::map<DTSuperLayerId, std::pair<float, float>> tTrigRefMap_;
+  std::map<DTSuperLayerId, std::pair<float, float>> tTrigMap_;
 
   // Map of the tTrig difference histos by (wheel,sector)
-  std::map<std::pair<int,int>, MonitorElement* > tTrigDiffHistos_;
-  std::map<int, MonitorElement* > tTrigDiffWheel_;
+  std::map<std::pair<int, int>, MonitorElement *> tTrigDiffHistos_;
+  std::map<int, MonitorElement *> tTrigDiffWheel_;
 
   void bookHistos(DQMStore::IBooker &, int, int);
   void bookHistos(DQMStore::IBooker &, int wheel);
diff --git a/DQMOffline/CalibMuon/src/DTPreCalibrationTask.cc b/DQMOffline/CalibMuon/src/DTPreCalibrationTask.cc
index d2e8b1de3120b..28904badf4811 100644
--- a/DQMOffline/CalibMuon/src/DTPreCalibrationTask.cc
+++ b/DQMOffline/CalibMuon/src/DTPreCalibrationTask.cc
@@ -1,198 +1,207 @@
 #include "DQMOffline/CalibMuon/interface/DTPreCalibrationTask.h"
 
-
 // Framework
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include <FWCore/Framework/interface/EventSetup.h>
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include <FWCore/Framework/interface/EventSetup.h>
 
 // Geometry
-#include "Geometry/DTGeometry/interface/DTLayer.h"
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
+#include "Geometry/DTGeometry/interface/DTLayer.h"
 #include "Geometry/DTGeometry/interface/DTTopology.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 // Digis
-#include "CondFormats/DataRecord/interface/DTStatusFlagRcd.h"
-#include "CondFormats/DTObjects/interface/DTStatusFlag.h"
 #include "CondFormats/DTObjects/interface/DTReadOutMapping.h"
+#include "CondFormats/DTObjects/interface/DTStatusFlag.h"
+#include "CondFormats/DataRecord/interface/DTStatusFlagRcd.h"
 
-
-#include "TH2F.h"
 #include "TFile.h"
+#include "TH2F.h"
 
 using namespace edm;
 using namespace std;
 
-
-
-DTPreCalibrationTask::DTPreCalibrationTask(const edm::ParameterSet& ps){
-
-  LogTrace("DTPreCalibSummary") <<"[DTPrecalibrationTask]: Constructor"<<endl;
+DTPreCalibrationTask::DTPreCalibrationTask(const edm::ParameterSet &ps) {
+  LogTrace("DTPreCalibSummary") << "[DTPrecalibrationTask]: Constructor" << endl;
 
   // Label to retrieve DT digis from the event
-  digiLabel = consumes<DTDigiCollection>(ps.getUntrackedParameter<string>("digiLabel")); 
+  digiLabel = consumes<DTDigiCollection>(ps.getUntrackedParameter<string>("digiLabel"));
 
   // parameter for Time Boxes booking
-  minTriggerWidth = ps.getUntrackedParameter<int>("minTriggerWidth",2000); 
-  maxTriggerWidth = ps.getUntrackedParameter<int>("maxTriggerWidth",6000); 
+  minTriggerWidth = ps.getUntrackedParameter<int>("minTriggerWidth", 2000);
+  maxTriggerWidth = ps.getUntrackedParameter<int>("maxTriggerWidth", 6000);
 
   // get the histo folder name
   folderName = ps.getUntrackedParameter<string>("folderName");
-
 }
 
-
-DTPreCalibrationTask::~DTPreCalibrationTask(){}
-
-
-void DTPreCalibrationTask::bookHistograms(DQMStore::IBooker &iBooker,
-  edm::Run const &, edm::EventSetup const &) {
-
-  for(int wheel=-2; wheel<=2; wheel++){
-   for(int sector=1; sector<=14; sector++){
-     LogTrace("DTPreCalibSummary") <<"[DTPrecalibrationTask]: Book histos for wheel "<<wheel<<", sector "<<sector<<endl;
-     iBooker.setCurrentFolder(folderName+"/TimeBoxes");  
-     bookTimeBoxes(iBooker, wheel, sector);
-     iBooker.setCurrentFolder(folderName+"/OccupancyHistos");
-     if(sector<13) bookOccupancyPlot(iBooker, wheel, sector);
+DTPreCalibrationTask::~DTPreCalibrationTask() {}
+
+void DTPreCalibrationTask::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, edm::EventSetup const &) {
+  for (int wheel = -2; wheel <= 2; wheel++) {
+    for (int sector = 1; sector <= 14; sector++) {
+      LogTrace("DTPreCalibSummary") << "[DTPrecalibrationTask]: Book histos for wheel " << wheel << ", sector "
+                                    << sector << endl;
+      iBooker.setCurrentFolder(folderName + "/TimeBoxes");
+      bookTimeBoxes(iBooker, wheel, sector);
+      iBooker.setCurrentFolder(folderName + "/OccupancyHistos");
+      if (sector < 13)
+        bookOccupancyPlot(iBooker, wheel, sector);
     }
   }
-
 }
 
-
-void DTPreCalibrationTask::analyze(const edm::Event& event, const edm::EventSetup& setup) {
-  
+void DTPreCalibrationTask::analyze(const edm::Event &event, const edm::EventSetup &setup) {
   // Get the digis from the event
   edm::Handle<DTDigiCollection> dtdigis;
   event.getByToken(digiLabel, dtdigis);
 
   // LOOP OVER ALL THE DIGIS OF THE EVENT
   DTDigiCollection::DigiRangeIterator dtLayerId_It;
-  for (dtLayerId_It=dtdigis->begin(); dtLayerId_It!=dtdigis->end(); ++dtLayerId_It){
+  for (dtLayerId_It = dtdigis->begin(); dtLayerId_It != dtdigis->end(); ++dtLayerId_It) {
     for (DTDigiCollection::const_iterator digiIt = ((*dtLayerId_It).second).first;
-	 digiIt!=((*dtLayerId_It).second).second; ++digiIt){
-
-      //Fill the Time Boxes
+         digiIt != ((*dtLayerId_It).second).second;
+         ++digiIt) {
+      // Fill the Time Boxes
       int tdcTime = (*digiIt).countsTDC();
       TimeBoxes[make_pair((*dtLayerId_It).first.superlayerId().chamberId().wheel(),
-			  (*dtLayerId_It).first.superlayerId().chamberId().sector())]->Fill(tdcTime);
-
-      //Fill the occupancy plot
-      const  DTLayerId dtLId = (*dtLayerId_It).first;
-      int yBin = (dtLId.station()-1)*12+dtLId.layer()+4*(dtLId.superlayer()-1);
-      if(dtLId.station()==4 && dtLId.superlayer()==3)
-	yBin = (dtLId.station()-1)*12+dtLId.layer()+4*(dtLId.superlayer()-2);
-      if((*dtLayerId_It).first.superlayerId().chamberId().sector()<13)
-	OccupancyHistos[make_pair((*dtLayerId_It).first.superlayerId().chamberId().wheel(),
-				  (*dtLayerId_It).first.superlayerId().chamberId().sector())]->Fill((*digiIt).wire(),yBin);
-      else{
-	if(dtLId.superlayer()!=3) yBin = 44 + dtLId.layer();
-	else yBin = 48 + dtLId.layer();
-	if((*dtLayerId_It).first.superlayerId().chamberId().sector()==13)
-	  OccupancyHistos[make_pair((*dtLayerId_It).first.superlayerId().chamberId().wheel(),4)]->Fill((*digiIt).wire(),yBin);
-	if((*dtLayerId_It).first.superlayerId().chamberId().sector()==14)
-	  OccupancyHistos[make_pair((*dtLayerId_It).first.superlayerId().chamberId().wheel(),10)]->Fill((*digiIt).wire(),yBin);
+                          (*dtLayerId_It).first.superlayerId().chamberId().sector())]
+          ->Fill(tdcTime);
+
+      // Fill the occupancy plot
+      const DTLayerId dtLId = (*dtLayerId_It).first;
+      int yBin = (dtLId.station() - 1) * 12 + dtLId.layer() + 4 * (dtLId.superlayer() - 1);
+      if (dtLId.station() == 4 && dtLId.superlayer() == 3)
+        yBin = (dtLId.station() - 1) * 12 + dtLId.layer() + 4 * (dtLId.superlayer() - 2);
+      if ((*dtLayerId_It).first.superlayerId().chamberId().sector() < 13)
+        OccupancyHistos[make_pair((*dtLayerId_It).first.superlayerId().chamberId().wheel(),
+                                  (*dtLayerId_It).first.superlayerId().chamberId().sector())]
+            ->Fill((*digiIt).wire(), yBin);
+      else {
+        if (dtLId.superlayer() != 3)
+          yBin = 44 + dtLId.layer();
+        else
+          yBin = 48 + dtLId.layer();
+        if ((*dtLayerId_It).first.superlayerId().chamberId().sector() == 13)
+          OccupancyHistos[make_pair((*dtLayerId_It).first.superlayerId().chamberId().wheel(), 4)]->Fill(
+              (*digiIt).wire(), yBin);
+        if ((*dtLayerId_It).first.superlayerId().chamberId().sector() == 14)
+          OccupancyHistos[make_pair((*dtLayerId_It).first.superlayerId().chamberId().wheel(), 10)]->Fill(
+              (*digiIt).wire(), yBin);
       }
-	
     }
   }
-
 }
 
 void DTPreCalibrationTask::bookTimeBoxes(DQMStore::IBooker &iBooker, int wheel, int sector) {
-
-  stringstream wh; wh << wheel;
-  stringstream sec; sec << sector;
+  stringstream wh;
+  wh << wheel;
+  stringstream sec;
+  sec << sector;
 
   // book the time boxes
-  TimeBoxes[make_pair(wheel, sector)]= iBooker.book1D("TimeBox_W"+wh.str()+"_Sec"+sec.str(), "Time Box W"+wh.str()+"_Sec"+sec.str(),(maxTriggerWidth-minTriggerWidth)/50, minTriggerWidth, maxTriggerWidth);
+  TimeBoxes[make_pair(wheel, sector)] = iBooker.book1D("TimeBox_W" + wh.str() + "_Sec" + sec.str(),
+                                                       "Time Box W" + wh.str() + "_Sec" + sec.str(),
+                                                       (maxTriggerWidth - minTriggerWidth) / 50,
+                                                       minTriggerWidth,
+                                                       maxTriggerWidth);
   TimeBoxes[make_pair(wheel, sector)]->setAxisTitle("TDC counts");
-
 }
 
-
-
 void DTPreCalibrationTask::bookOccupancyPlot(DQMStore::IBooker &iBooker, int wheel, int sector) {
-
-  stringstream wh; wh << wheel;
-  stringstream sec; sec << sector;
+  stringstream wh;
+  wh << wheel;
+  stringstream sec;
+  sec << sector;
 
   // book the occpancy plot
-  if(sector==4 || sector==10)
-    OccupancyHistos[make_pair(wheel, sector)]= iBooker.book2D("Occupancy_W"+wh.str()+"_Sec"+sec.str(), "Occupancy W"+wh.str()+"_Sec"+sec.str(),100,1,100,52,1,53);
+  if (sector == 4 || sector == 10)
+    OccupancyHistos[make_pair(wheel, sector)] = iBooker.book2D("Occupancy_W" + wh.str() + "_Sec" + sec.str(),
+                                                               "Occupancy W" + wh.str() + "_Sec" + sec.str(),
+                                                               100,
+                                                               1,
+                                                               100,
+                                                               52,
+                                                               1,
+                                                               53);
   else
-    OccupancyHistos[make_pair(wheel, sector)]= iBooker.book2D("Occupancy_W"+wh.str()+"_Sec"+sec.str(), "Occupancy W"+wh.str()+"_Sec"+sec.str(),100,1,100,44,1,45);
+    OccupancyHistos[make_pair(wheel, sector)] = iBooker.book2D("Occupancy_W" + wh.str() + "_Sec" + sec.str(),
+                                                               "Occupancy W" + wh.str() + "_Sec" + sec.str(),
+                                                               100,
+                                                               1,
+                                                               100,
+                                                               44,
+                                                               1,
+                                                               45);
   OccupancyHistos[make_pair(wheel, sector)]->setAxisTitle("wire number", 1);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(1,"M1L1",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(2,"M1L2",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(3,"M1L3",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(4,"M1L4",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(5,"M1L5",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(6,"M1L6",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(7,"M1L7",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(8,"M1L8",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(9,"M1L9",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(10,"M1L10",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(11,"M1L11",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(12,"M1L12",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(13,"M2L1",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(14,"M2L2",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(15,"M2L3",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(16,"M2L4",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(17,"M2L5",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(18,"M2L6",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(19,"M2L7",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(20,"M2L8",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(21,"M2L9",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(22,"M2L10",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(23,"M2L11",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(24,"M2L12",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(25,"M3L1",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(26,"M3L2",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(27,"M3L3",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(28,"M3L4",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(29,"M3L5",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(30,"M3L6",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(31,"M3L7",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(32,"M3L8",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(33,"M3L9",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(34,"M3L10",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(35,"M3L11",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(36,"M3L12",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(37,"M4L1",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(38,"M4L2",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(39,"M4L3",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(40,"M4L4",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(41,"M4L5",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(42,"M4L6",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(43,"M4L7",2);
-  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(44,"M4L8",2);
-  if(sector==4){
-    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(45,"M4Sec13L1",2);
-    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(46,"M4Sec13L2",2);
-    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(47,"M4Sec13L3",2);
-    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(48,"M4Sec13L4",2);
-    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(49,"M4Sec13L5",2);
-    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(50,"M4Sec13L6",2);
-    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(51,"M4Sec13L7",2);
-    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(52,"M4Sec13L8",2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(1, "M1L1", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(2, "M1L2", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(3, "M1L3", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(4, "M1L4", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(5, "M1L5", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(6, "M1L6", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(7, "M1L7", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(8, "M1L8", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(9, "M1L9", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(10, "M1L10", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(11, "M1L11", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(12, "M1L12", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(13, "M2L1", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(14, "M2L2", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(15, "M2L3", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(16, "M2L4", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(17, "M2L5", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(18, "M2L6", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(19, "M2L7", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(20, "M2L8", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(21, "M2L9", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(22, "M2L10", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(23, "M2L11", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(24, "M2L12", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(25, "M3L1", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(26, "M3L2", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(27, "M3L3", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(28, "M3L4", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(29, "M3L5", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(30, "M3L6", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(31, "M3L7", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(32, "M3L8", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(33, "M3L9", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(34, "M3L10", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(35, "M3L11", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(36, "M3L12", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(37, "M4L1", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(38, "M4L2", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(39, "M4L3", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(40, "M4L4", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(41, "M4L5", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(42, "M4L6", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(43, "M4L7", 2);
+  OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(44, "M4L8", 2);
+  if (sector == 4) {
+    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(45, "M4Sec13L1", 2);
+    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(46, "M4Sec13L2", 2);
+    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(47, "M4Sec13L3", 2);
+    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(48, "M4Sec13L4", 2);
+    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(49, "M4Sec13L5", 2);
+    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(50, "M4Sec13L6", 2);
+    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(51, "M4Sec13L7", 2);
+    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(52, "M4Sec13L8", 2);
   }
-  if(sector==10){
-    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(45,"M4Sec14L1",2);
-    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(46,"M4Sec14L2",2);
-    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(47,"M4Sec14L3",2);
-    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(48,"M4Sec14L4",2);
-    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(49,"M4Sec14L5",2);
-    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(50,"M4Sec14L6",2);
-    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(51,"M4Sec14L7",2);
-    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(52,"M4Sec14L8",2);
+  if (sector == 10) {
+    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(45, "M4Sec14L1", 2);
+    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(46, "M4Sec14L2", 2);
+    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(47, "M4Sec14L3", 2);
+    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(48, "M4Sec14L4", 2);
+    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(49, "M4Sec14L5", 2);
+    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(50, "M4Sec14L6", 2);
+    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(51, "M4Sec14L7", 2);
+    OccupancyHistos[make_pair(wheel, sector)]->setBinLabel(52, "M4Sec14L8", 2);
   }
-
 }
diff --git a/DQMOffline/CalibMuon/src/DTnoiseDBValidation.cc b/DQMOffline/CalibMuon/src/DTnoiseDBValidation.cc
index e5843edda7358..dff9e1cec03b1 100644
--- a/DQMOffline/CalibMuon/src/DTnoiseDBValidation.cc
+++ b/DQMOffline/CalibMuon/src/DTnoiseDBValidation.cc
@@ -8,9 +8,9 @@
 #include "DQMOffline/CalibMuon/interface/DTnoiseDBValidation.h"
 
 // Framework
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
@@ -18,27 +18,26 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 // Geometry
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
-#include "Geometry/DTGeometry/interface/DTGeometry.h"
-#include "Geometry/DTGeometry/interface/DTTopology.h"
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
 #include "DataFormats/MuonDetId/interface/DTWireId.h"
+#include "Geometry/DTGeometry/interface/DTGeometry.h"
+#include "Geometry/DTGeometry/interface/DTTopology.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 // Noise record
 #include "CondFormats/DTObjects/interface/DTStatusFlag.h"
 #include "CondFormats/DataRecord/interface/DTStatusFlagRcd.h"
 
-#include <cstdio>
-#include <sstream>
-#include <cmath>
 #include "TFile.h"
 #include "TH1F.h"
+#include <cmath>
+#include <cstdio>
+#include <sstream>
 
 using namespace edm;
 using namespace std;
 
-DTnoiseDBValidation::DTnoiseDBValidation(const ParameterSet& pset) {
-
+DTnoiseDBValidation::DTnoiseDBValidation(const ParameterSet &pset) {
   LogVerbatim("NoiseDBValidation") << "[DTnoiseDBValidation] Constructor called!";
 
   // Get the DQM needed services
@@ -50,35 +49,39 @@ DTnoiseDBValidation::DTnoiseDBValidation(const ParameterSet& pset) {
   labelDB_ = pset.getParameter<string>("labelDB");
 
   diffTestName_ = "noiseDifferenceInRange";
-  if( pset.exists("diffTestName") ) diffTestName_ = pset.getParameter<string>("diffTestName");
- 
+  if (pset.exists("diffTestName"))
+    diffTestName_ = pset.getParameter<string>("diffTestName");
+
   wheelTestName_ = "noiseWheelOccInRange";
-  if( pset.exists("wheelTestName") ) wheelTestName_ = pset.getParameter<string>("wheelTestName");
+  if (pset.exists("wheelTestName"))
+    wheelTestName_ = pset.getParameter<string>("wheelTestName");
 
   stationTestName_ = "noiseStationOccInRange";
-  if( pset.exists("stationTestName") ) stationTestName_ = pset.getParameter<string>("stationTestName");
+  if (pset.exists("stationTestName"))
+    stationTestName_ = pset.getParameter<string>("stationTestName");
 
   sectorTestName_ = "noiseSectorOccInRange";
-  if( pset.exists("sectorTestName") ) sectorTestName_ = pset.getParameter<string>("sectorTestName");
+  if (pset.exists("sectorTestName"))
+    sectorTestName_ = pset.getParameter<string>("sectorTestName");
 
   layerTestName_ = "noiseLayerOccInRange";
-  if( pset.exists("layerTestName") ) layerTestName_ = pset.getParameter<string>("layerTestName");
-  
+  if (pset.exists("layerTestName"))
+    layerTestName_ = pset.getParameter<string>("layerTestName");
+
   outputMEsInRootFile_ = false;
-  if( pset.exists("OutputFileName") ){
-     outputMEsInRootFile_ = true;
-     outputFileName_ = pset.getParameter<std::string>("OutputFileName");
+  if (pset.exists("OutputFileName")) {
+    outputMEsInRootFile_ = true;
+    outputFileName_ = pset.getParameter<std::string>("OutputFileName");
   }
 }
 
+DTnoiseDBValidation::~DTnoiseDBValidation() {}
 
-DTnoiseDBValidation::~DTnoiseDBValidation(){}
-
-void DTnoiseDBValidation::beginRun(const edm::Run& run, const EventSetup& setup) {
+void DTnoiseDBValidation::beginRun(const edm::Run &run, const EventSetup &setup) {
   ESHandle<DTStatusFlag> noiseRef;
   setup.get<DTStatusFlagRcd>().get(labelDBRef_, noiseRef);
   noiseRefMap_ = &*noiseRef;
- 
+
   ESHandle<DTStatusFlag> noiseValid;
   setup.get<DTStatusFlagRcd>().get(labelDB_, noiseValid);
   noiseMap_ = &*noiseValid;
@@ -86,42 +89,43 @@ void DTnoiseDBValidation::beginRun(const edm::Run& run, const EventSetup& setup)
   // Get the geometry
   setup.get<MuonGeometryRecord>().get(dtGeom_);
 
-  LogVerbatim("NoiseDBValidation")<<"[DTnoiseDBValidation] Parameters initialization";
- 
+  LogVerbatim("NoiseDBValidation") << "[DTnoiseDBValidation] Parameters initialization";
+
   noisyCellsRef_ = 0;
   noisyCellsValid_ = 0;
 
   // Histo booking
-  diffHisto_ = dbe_->book1D("noisyCellDiff", "percentual (wrt the previous db) total number of noisy cells",1, 0.5, 1.5);
-  diffHisto_->setBinLabel(1,"Diff");
-  wheelHisto_ = dbe_->book1D("wheelOccupancy", "percentual noisy cells occupancy per wheel",5, -2.5, 2.5);
-  wheelHisto_->setBinLabel(1,"Wh-2");
-  wheelHisto_->setBinLabel(2,"Wh-1");
-  wheelHisto_->setBinLabel(3,"Wh0");
-  wheelHisto_->setBinLabel(4,"Wh1");
-  wheelHisto_->setBinLabel(5,"Wh2");
-  stationHisto_ = dbe_->book1D("stationOccupancy", "percentual noisy cells occupancy per station",4, 0.5, 4.5);
-  stationHisto_->setBinLabel(1,"St1");
-  stationHisto_->setBinLabel(2,"St2");
-  stationHisto_->setBinLabel(3,"St3");
-  stationHisto_->setBinLabel(4,"St4");
-  sectorHisto_ = dbe_->book1D("sectorOccupancy", "percentual noisy cells occupancy per sector",12, 0.5, 12.5);
-  sectorHisto_->setBinLabel(1,"Sect1");
-  sectorHisto_->setBinLabel(2,"Sect2");
-  sectorHisto_->setBinLabel(3,"Sect3");
-  sectorHisto_->setBinLabel(4,"Sect4");
-  sectorHisto_->setBinLabel(5,"Sect5");
-  sectorHisto_->setBinLabel(6,"Sect6");
-  sectorHisto_->setBinLabel(7,"Sect7");
-  sectorHisto_->setBinLabel(8,"Sect8");
-  sectorHisto_->setBinLabel(9,"Sect9");
-  sectorHisto_->setBinLabel(10,"Sect10");
-  sectorHisto_->setBinLabel(11,"Sect11");
-  sectorHisto_->setBinLabel(12,"Sect12");
-  layerHisto_ = dbe_->book1D("layerOccupancy", "percentual noisy cells occupancy per layer",3, 0.5, 3.5);
-  layerHisto_->setBinLabel(1,"First 10 bins");
-  layerHisto_->setBinLabel(2,"Middle bins");
-  layerHisto_->setBinLabel(3,"Last 10 bins");
+  diffHisto_ =
+      dbe_->book1D("noisyCellDiff", "percentual (wrt the previous db) total number of noisy cells", 1, 0.5, 1.5);
+  diffHisto_->setBinLabel(1, "Diff");
+  wheelHisto_ = dbe_->book1D("wheelOccupancy", "percentual noisy cells occupancy per wheel", 5, -2.5, 2.5);
+  wheelHisto_->setBinLabel(1, "Wh-2");
+  wheelHisto_->setBinLabel(2, "Wh-1");
+  wheelHisto_->setBinLabel(3, "Wh0");
+  wheelHisto_->setBinLabel(4, "Wh1");
+  wheelHisto_->setBinLabel(5, "Wh2");
+  stationHisto_ = dbe_->book1D("stationOccupancy", "percentual noisy cells occupancy per station", 4, 0.5, 4.5);
+  stationHisto_->setBinLabel(1, "St1");
+  stationHisto_->setBinLabel(2, "St2");
+  stationHisto_->setBinLabel(3, "St3");
+  stationHisto_->setBinLabel(4, "St4");
+  sectorHisto_ = dbe_->book1D("sectorOccupancy", "percentual noisy cells occupancy per sector", 12, 0.5, 12.5);
+  sectorHisto_->setBinLabel(1, "Sect1");
+  sectorHisto_->setBinLabel(2, "Sect2");
+  sectorHisto_->setBinLabel(3, "Sect3");
+  sectorHisto_->setBinLabel(4, "Sect4");
+  sectorHisto_->setBinLabel(5, "Sect5");
+  sectorHisto_->setBinLabel(6, "Sect6");
+  sectorHisto_->setBinLabel(7, "Sect7");
+  sectorHisto_->setBinLabel(8, "Sect8");
+  sectorHisto_->setBinLabel(9, "Sect9");
+  sectorHisto_->setBinLabel(10, "Sect10");
+  sectorHisto_->setBinLabel(11, "Sect11");
+  sectorHisto_->setBinLabel(12, "Sect12");
+  layerHisto_ = dbe_->book1D("layerOccupancy", "percentual noisy cells occupancy per layer", 3, 0.5, 3.5);
+  layerHisto_->setBinLabel(1, "First 10 bins");
+  layerHisto_->setBinLabel(2, "Middle bins");
+  layerHisto_->setBinLabel(3, "Last 10 bins");
 
   // map initialization
   map<int, int> whMap;
@@ -134,173 +138,172 @@ void DTnoiseDBValidation::beginRun(const edm::Run& run, const EventSetup& setup)
   layerMap.clear();
 
   // Loop over reference DB entries
-  for(DTStatusFlag::const_iterator noise = noiseRefMap_->begin();
-      noise != noiseRefMap_->end(); noise++) {
+  for (DTStatusFlag::const_iterator noise = noiseRefMap_->begin(); noise != noiseRefMap_->end(); noise++) {
     DTWireId wireId((*noise).first.wheelId,
-		    (*noise).first.stationId,
-		    (*noise).first.sectorId,
-		    (*noise).first.slId,
-		    (*noise).first.layerId,
-		    (*noise).first.cellId);
+                    (*noise).first.stationId,
+                    (*noise).first.sectorId,
+                    (*noise).first.slId,
+                    (*noise).first.layerId,
+                    (*noise).first.cellId);
     LogVerbatim("NoiseDBValidation") << "Ref. noisy wire: " << wireId;
     ++noisyCellsRef_;
   }
 
   // Loop over validation DB entries
-  for(DTStatusFlag::const_iterator noise = noiseMap_->begin();
-      noise != noiseMap_->end(); noise++) {
+  for (DTStatusFlag::const_iterator noise = noiseMap_->begin(); noise != noiseMap_->end(); noise++) {
     DTWireId wireId((*noise).first.wheelId,
-		    (*noise).first.stationId,
-		    (*noise).first.sectorId,
-		    (*noise).first.slId,
-		    (*noise).first.layerId,
-		    (*noise).first.cellId);
-    LogVerbatim("NoiseDBValidation") << "Valid. noisy wire: " <<  wireId;
+                    (*noise).first.stationId,
+                    (*noise).first.sectorId,
+                    (*noise).first.slId,
+                    (*noise).first.layerId,
+                    (*noise).first.cellId);
+    LogVerbatim("NoiseDBValidation") << "Valid. noisy wire: " << wireId;
     ++noisyCellsValid_;
 
     whMap[(*noise).first.wheelId]++;
     stMap[(*noise).first.stationId]++;
     sectMap[(*noise).first.sectorId]++;
-    
-    const DTTopology& dtTopo = dtGeom_->layer(wireId.layerId())->specificTopology();
+
+    const DTTopology &dtTopo = dtGeom_->layer(wireId.layerId())->specificTopology();
     const int lastWire = dtTopo.lastChannel();
-    if((*noise).first.cellId<=10)
+    if ((*noise).first.cellId <= 10)
       layerMap[1]++;
-    if((*noise).first.cellId>10 && (*noise).first.cellId<(lastWire-10))
+    if ((*noise).first.cellId > 10 && (*noise).first.cellId < (lastWire - 10))
       layerMap[2]++;
-    if((*noise).first.cellId>=(lastWire-10))
+    if ((*noise).first.cellId >= (lastWire - 10))
       layerMap[3]++;
 
     const DTChamberId chId = wireId.layerId().superlayerId().chamberId();
-    if( noiseHistoMap_.find(chId) == noiseHistoMap_.end() ) bookHisto(chId);
-    int binNumber = 4*(wireId.superLayer() - 1) + wireId.layer(); 
-    noiseHistoMap_[chId]->Fill(wireId.wire(),binNumber);
+    if (noiseHistoMap_.find(chId) == noiseHistoMap_.end())
+      bookHisto(chId);
+    int binNumber = 4 * (wireId.superLayer() - 1) + wireId.layer();
+    noiseHistoMap_[chId]->Fill(wireId.wire(), binNumber);
   }
 
-  //histo filling
-  double scale = 1/double(noisyCellsRef_);
-  diffHisto_->Fill(1,abs(noisyCellsRef_ - noisyCellsValid_)*scale);
+  // histo filling
+  double scale = 1 / double(noisyCellsRef_);
+  diffHisto_->Fill(1, abs(noisyCellsRef_ - noisyCellsValid_) * scale);
 
-  scale = 1/double(noisyCellsValid_);
-  for(map<int, int >::const_iterator wheel = whMap.begin();
-	wheel != whMap.end();
-	wheel++) {
-    wheelHisto_->Fill((*wheel).first, ((*wheel).second)*scale);
+  scale = 1 / double(noisyCellsValid_);
+  for (map<int, int>::const_iterator wheel = whMap.begin(); wheel != whMap.end(); wheel++) {
+    wheelHisto_->Fill((*wheel).first, ((*wheel).second) * scale);
   }
-  for(map<int, int >::const_iterator station = stMap.begin();
-	station != stMap.end();
-	station++) {
-    stationHisto_->Fill((*station).first, ((*station).second)*scale);
+  for (map<int, int>::const_iterator station = stMap.begin(); station != stMap.end(); station++) {
+    stationHisto_->Fill((*station).first, ((*station).second) * scale);
   }
-  for(map<int, int >::const_iterator sector = sectMap.begin();
-	sector != sectMap.end();
-	sector++) {
-    sectorHisto_->Fill((*sector).first, ((*sector).second)*scale);
+  for (map<int, int>::const_iterator sector = sectMap.begin(); sector != sectMap.end(); sector++) {
+    sectorHisto_->Fill((*sector).first, ((*sector).second) * scale);
   }
-  for(map<int, int >::const_iterator layer = layerMap.begin();
-	layer != layerMap.end();
-	layer++) {
-    layerHisto_->Fill((*layer).first, ((*layer).second)*scale);
+  for (map<int, int>::const_iterator layer = layerMap.begin(); layer != layerMap.end(); layer++) {
+    layerHisto_->Fill((*layer).first, ((*layer).second) * scale);
   }
-
 }
 
-void DTnoiseDBValidation::endRun(edm::Run const& run, edm::EventSetup const& setup) {
-
+void DTnoiseDBValidation::endRun(edm::Run const &run, edm::EventSetup const &setup) {
   // test on difference histo
-  //string testCriterionName;
-  //testCriterionName = parameters.getUntrackedParameter<string>("diffTestName","noiseDifferenceInRange");
-  const QReport * theDiffQReport = diffHisto_->getQReport(diffTestName_);
-  if(theDiffQReport) {
-      vector<dqm::me_util::Channel> badChannels = theDiffQReport->getBadChannels();
-      for (vector<dqm::me_util::Channel>::iterator channel = badChannels.begin(); 
-	   channel != badChannels.end(); channel++) {
-	LogWarning("NoiseDBValidation") << " Bad partial difference of noisy channels! Contents : " << (*channel).getContents();
-      }
+  // string testCriterionName;
+  // testCriterionName =
+  // parameters.getUntrackedParameter<string>("diffTestName","noiseDifferenceInRange");
+  const QReport *theDiffQReport = diffHisto_->getQReport(diffTestName_);
+  if (theDiffQReport) {
+    vector<dqm::me_util::Channel> badChannels = theDiffQReport->getBadChannels();
+    for (vector<dqm::me_util::Channel>::iterator channel = badChannels.begin(); channel != badChannels.end();
+         channel++) {
+      LogWarning("NoiseDBValidation") << " Bad partial difference of noisy channels! Contents : "
+                                      << (*channel).getContents();
+    }
   }
-  //testCriterionName = parameters.getUntrackedParameter<string>("wheelTestName","noiseWheelOccInRange");
-  const QReport * theDiffQReport2 = wheelHisto_->getQReport(wheelTestName_);
-  if(theDiffQReport2) {
-      vector<dqm::me_util::Channel> badChannels = theDiffQReport2->getBadChannels();
-      for (vector<dqm::me_util::Channel>::iterator channel = badChannels.begin(); 
-	   channel != badChannels.end(); channel++) {
-	int wheel = (*channel).getBin()-3;
-	LogWarning("NoiseDBValidation") << " Bad percentual occupancy for wheel : " << wheel << "  Contents : " << (*channel).getContents();
-      }
+  // testCriterionName =
+  // parameters.getUntrackedParameter<string>("wheelTestName","noiseWheelOccInRange");
+  const QReport *theDiffQReport2 = wheelHisto_->getQReport(wheelTestName_);
+  if (theDiffQReport2) {
+    vector<dqm::me_util::Channel> badChannels = theDiffQReport2->getBadChannels();
+    for (vector<dqm::me_util::Channel>::iterator channel = badChannels.begin(); channel != badChannels.end();
+         channel++) {
+      int wheel = (*channel).getBin() - 3;
+      LogWarning("NoiseDBValidation") << " Bad percentual occupancy for wheel : " << wheel
+                                      << "  Contents : " << (*channel).getContents();
+    }
   }
-  //testCriterionName = parameters.getUntrackedParameter<string>("stationTestName","noiseStationOccInRange");
-  const QReport * theDiffQReport3 = stationHisto_->getQReport(stationTestName_);
-  if(theDiffQReport3) {
-      vector<dqm::me_util::Channel> badChannels = theDiffQReport3->getBadChannels();
-      for (vector<dqm::me_util::Channel>::iterator channel = badChannels.begin(); 
-	   channel != badChannels.end(); channel++) {
-	LogWarning("NoiseDBValidation") << " Bad percentual occupancy for station : " << (*channel).getBin() << "  Contents : " << (*channel).getContents();
-      }
+  // testCriterionName =
+  // parameters.getUntrackedParameter<string>("stationTestName","noiseStationOccInRange");
+  const QReport *theDiffQReport3 = stationHisto_->getQReport(stationTestName_);
+  if (theDiffQReport3) {
+    vector<dqm::me_util::Channel> badChannels = theDiffQReport3->getBadChannels();
+    for (vector<dqm::me_util::Channel>::iterator channel = badChannels.begin(); channel != badChannels.end();
+         channel++) {
+      LogWarning("NoiseDBValidation") << " Bad percentual occupancy for station : " << (*channel).getBin()
+                                      << "  Contents : " << (*channel).getContents();
+    }
   }
-  //testCriterionName = parameters.getUntrackedParameter<string>("sectorTestName","noiseSectorOccInRange");
-  const QReport * theDiffQReport4 = sectorHisto_->getQReport(sectorTestName_);
-  if(theDiffQReport4) {
-      vector<dqm::me_util::Channel> badChannels = theDiffQReport4->getBadChannels();
-      for (vector<dqm::me_util::Channel>::iterator channel = badChannels.begin(); 
-	   channel != badChannels.end(); channel++) {
-	LogWarning("NoiseDBValidation") << " Bad percentual occupancy for sector : " << (*channel).getBin() << "  Contents : " << (*channel).getContents();
-      }
+  // testCriterionName =
+  // parameters.getUntrackedParameter<string>("sectorTestName","noiseSectorOccInRange");
+  const QReport *theDiffQReport4 = sectorHisto_->getQReport(sectorTestName_);
+  if (theDiffQReport4) {
+    vector<dqm::me_util::Channel> badChannels = theDiffQReport4->getBadChannels();
+    for (vector<dqm::me_util::Channel>::iterator channel = badChannels.begin(); channel != badChannels.end();
+         channel++) {
+      LogWarning("NoiseDBValidation") << " Bad percentual occupancy for sector : " << (*channel).getBin()
+                                      << "  Contents : " << (*channel).getContents();
+    }
   }
-  //testCriterionName = parameters.getUntrackedParameter<string>("layerTestName","noiseLayerOccInRange");
-  const QReport * theDiffQReport5 = layerHisto_->getQReport(layerTestName_);
-  if(theDiffQReport5) {
-      vector<dqm::me_util::Channel> badChannels = theDiffQReport5->getBadChannels();
-      for (vector<dqm::me_util::Channel>::iterator channel = badChannels.begin(); 
-	   channel != badChannels.end(); channel++) {
-	if((*channel).getBin()==1)
-	  LogWarning("NoiseDBValidation") << " Bad percentual occupancy for the first 10 wires! Contents : " << (*channel).getContents();
-	if((*channel).getBin()==2)
-	  LogWarning("NoiseDBValidation") << " Bad percentual occupancy for the middle wires! Contents : " << (*channel).getContents();
-	if((*channel).getBin()==3)
-	  LogWarning("NoiseDBValidation") << " Bad percentual occupancy for the last 10 wires! Contents : "<<(*channel).getContents();
-      }
+  // testCriterionName =
+  // parameters.getUntrackedParameter<string>("layerTestName","noiseLayerOccInRange");
+  const QReport *theDiffQReport5 = layerHisto_->getQReport(layerTestName_);
+  if (theDiffQReport5) {
+    vector<dqm::me_util::Channel> badChannels = theDiffQReport5->getBadChannels();
+    for (vector<dqm::me_util::Channel>::iterator channel = badChannels.begin(); channel != badChannels.end();
+         channel++) {
+      if ((*channel).getBin() == 1)
+        LogWarning("NoiseDBValidation") << " Bad percentual occupancy for the first 10 wires! Contents : "
+                                        << (*channel).getContents();
+      if ((*channel).getBin() == 2)
+        LogWarning("NoiseDBValidation") << " Bad percentual occupancy for the middle wires! Contents : "
+                                        << (*channel).getContents();
+      if ((*channel).getBin() == 3)
+        LogWarning("NoiseDBValidation") << " Bad percentual occupancy for the last 10 wires! Contents : "
+                                        << (*channel).getContents();
+    }
   }
-
 }
 
 void DTnoiseDBValidation::endJob() {
   // Write the histos in a ROOT file
-  if(outputMEsInRootFile_) dbe_->save(outputFileName_);
+  if (outputMEsInRootFile_)
+    dbe_->save(outputFileName_);
 }
 
-void DTnoiseDBValidation::bookHisto(const DTChamberId& chId) {
+void DTnoiseDBValidation::bookHisto(const DTChamberId &chId) {
   stringstream histoName;
-  histoName << "NoiseOccupancy" 
-            << "_W" << chId.wheel() 
-            <<"_St" << chId.station() 
-            << "_Sec" << chId.sector();
-
-  if( noiseHistoMap_.find(chId) == noiseHistoMap_.end() ){ // Redundant check
-     // Get the chamber from the geometry
-     int nWiresMax = 0;
-     const DTChamber* dtchamber = dtGeom_->chamber(chId);
-     const vector<const DTSuperLayer*>& superlayers = dtchamber->superLayers();
-
-     // Loop over layers and find the max # of wires
-     for(vector<const DTSuperLayer*>::const_iterator sl = superlayers.begin();
-                                                     sl != superlayers.end(); ++sl) { // loop over SLs
-        vector<const DTLayer*> layers = (*sl)->layers();
-        for(vector<const DTLayer*>::const_iterator lay = layers.begin();
-	                                           lay != layers.end(); ++lay) { // loop over layers
-           int nWires = (*lay)->specificTopology().channels();
-           if(nWires > nWiresMax) nWiresMax = nWires;
-        }
-     }
-
-     noiseHistoMap_[chId] = dbe_->book2D(histoName.str(),"Noise occupancy",nWiresMax,1,(nWiresMax + 1),12,1,13);
-     for(int i_sl = 1; i_sl <= 3; ++i_sl) {
-        for(int i_lay = 1; i_lay <= 4; ++i_lay) {
-           int binNumber = 4*(i_sl - 1) + i_lay;
-           stringstream label;
-           label << "SL" << i_sl << ": L" << i_lay;
-           noiseHistoMap_[chId]->setBinLabel(binNumber,label.str(),2);
-        }
-     }
+  histoName << "NoiseOccupancy"
+            << "_W" << chId.wheel() << "_St" << chId.station() << "_Sec" << chId.sector();
+
+  if (noiseHistoMap_.find(chId) == noiseHistoMap_.end()) {  // Redundant check
+    // Get the chamber from the geometry
+    int nWiresMax = 0;
+    const DTChamber *dtchamber = dtGeom_->chamber(chId);
+    const vector<const DTSuperLayer *> &superlayers = dtchamber->superLayers();
+
+    // Loop over layers and find the max # of wires
+    for (vector<const DTSuperLayer *>::const_iterator sl = superlayers.begin(); sl != superlayers.end();
+         ++sl) {  // loop over SLs
+      vector<const DTLayer *> layers = (*sl)->layers();
+      for (vector<const DTLayer *>::const_iterator lay = layers.begin(); lay != layers.end();
+           ++lay) {  // loop over layers
+        int nWires = (*lay)->specificTopology().channels();
+        if (nWires > nWiresMax)
+          nWiresMax = nWires;
+      }
+    }
+
+    noiseHistoMap_[chId] = dbe_->book2D(histoName.str(), "Noise occupancy", nWiresMax, 1, (nWiresMax + 1), 12, 1, 13);
+    for (int i_sl = 1; i_sl <= 3; ++i_sl) {
+      for (int i_lay = 1; i_lay <= 4; ++i_lay) {
+        int binNumber = 4 * (i_sl - 1) + i_lay;
+        stringstream label;
+        label << "SL" << i_sl << ": L" << i_lay;
+        noiseHistoMap_[chId]->setBinLabel(binNumber, label.str(), 2);
+      }
+    }
   }
-  
 }
diff --git a/DQMOffline/CalibMuon/src/DTt0DBValidation.cc b/DQMOffline/CalibMuon/src/DTt0DBValidation.cc
index bb875077b5b9c..95d4c391bba7d 100644
--- a/DQMOffline/CalibMuon/src/DTt0DBValidation.cc
+++ b/DQMOffline/CalibMuon/src/DTt0DBValidation.cc
@@ -8,9 +8,9 @@
 #include "DQMOffline/CalibMuon/interface/DTt0DBValidation.h"
 
 // Framework
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
@@ -18,10 +18,10 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 // Geometry
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
 #include "Geometry/DTGeometry/interface/DTLayer.h"
 #include "Geometry/DTGeometry/interface/DTTopology.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 // t0
 #include "CondFormats/DTObjects/interface/DTT0.h"
@@ -29,14 +29,13 @@
 
 #include "TFile.h"
 
-#include <sstream>
 #include <iomanip>
+#include <sstream>
 
 using namespace edm;
 using namespace std;
 
-DTt0DBValidation::DTt0DBValidation(const ParameterSet& pset) {
-
+DTt0DBValidation::DTt0DBValidation(const ParameterSet &pset) {
   metname_ = "InterChannelSynchDBValidation";
   LogVerbatim(metname_) << "[DTt0DBValidation] Constructor called!";
 
@@ -49,24 +48,22 @@ DTt0DBValidation::DTt0DBValidation(const ParameterSet& pset) {
   labelDB_ = pset.getParameter<string>("labelDB");
 
   t0TestName_ = "t0DifferenceInRange";
-  if( pset.exists("t0TestName") ) t0TestName_ = pset.getParameter<string>("t0TestName");
-  
+  if (pset.exists("t0TestName"))
+    t0TestName_ = pset.getParameter<string>("t0TestName");
+
   outputMEsInRootFile_ = false;
-  if( pset.exists("OutputFileName") ){
-     outputMEsInRootFile_ = true;
-     outputFileName_ = pset.getParameter<std::string>("OutputFileName");
+  if (pset.exists("OutputFileName")) {
+    outputMEsInRootFile_ = true;
+    outputFileName_ = pset.getParameter<std::string>("OutputFileName");
   }
 }
 
+DTt0DBValidation::~DTt0DBValidation() {}
 
-DTt0DBValidation::~DTt0DBValidation(){}
-
-
-void DTt0DBValidation::beginRun(const edm::Run& run, const EventSetup& setup) {
-
+void DTt0DBValidation::beginRun(const edm::Run &run, const EventSetup &setup) {
   metname_ = "InterChannelSynchDBValidation";
   LogVerbatim(metname_) << "[DTt0DBValidation] Parameters initialization";
- 
+
   ESHandle<DTT0> t0_Ref;
   setup.get<DTT0Rcd>().get(labelDBRef_, t0_Ref);
   tZeroRefMap_ = &*t0_Ref;
@@ -77,8 +74,8 @@ void DTt0DBValidation::beginRun(const edm::Run& run, const EventSetup& setup) {
   tZeroMap_ = &*t0;
   LogVerbatim(metname_) << "[DTt0DBValidation] T0 to validate version: " << t0->version();
 
-  //book&reset the summary histos
-  for(int wheel=-2; wheel<=2; wheel++){
+  // book&reset the summary histos
+  for (int wheel = -2; wheel <= 2; wheel++) {
     bookHistos(wheel);
     wheelSummary_[wheel]->Reset();
   }
@@ -87,201 +84,192 @@ void DTt0DBValidation::beginRun(const edm::Run& run, const EventSetup& setup) {
   setup.get<MuonGeometryRecord>().get(dtGeom_);
 
   // Loop over Ref DB entries
-  for(DTT0::const_iterator tzero = tZeroRefMap_->begin();
-                           tzero != tZeroRefMap_->end(); tzero++) {
+  for (DTT0::const_iterator tzero = tZeroRefMap_->begin(); tzero != tZeroRefMap_->end(); tzero++) {
     // t0s and rms are TDC counts
-// @@@ NEW DTT0 FORMAT
-//    DTWireId wireId((*tzero).first.wheelId,
-//		    (*tzero).first.stationId,
-//		    (*tzero).first.sectorId,
-//		    (*tzero).first.slId,
-//		    (*tzero).first.layerId,
-//		    (*tzero).first.cellId);
+    // @@@ NEW DTT0 FORMAT
+    //    DTWireId wireId((*tzero).first.wheelId,
+    //		    (*tzero).first.stationId,
+    //		    (*tzero).first.sectorId,
+    //		    (*tzero).first.slId,
+    //		    (*tzero).first.layerId,
+    //		    (*tzero).first.cellId);
     int channelId = tzero->channelId;
-    if ( channelId == 0 ) continue;
+    if (channelId == 0)
+      continue;
     DTWireId wireId(channelId);
-// @@@ NEW DTT0 END
+    // @@@ NEW DTT0 END
     float t0mean;
     float t0rms;
-    tZeroRefMap_->get( wireId, t0mean, t0rms, DTTimeUnits::counts );
-    LogTrace(metname_)<< "Ref Wire: " <<  wireId <<endl
-		     << " T0 mean (TDC counts): " << t0mean
-		     << " T0_rms (TDC counts): " << t0rms;
+    tZeroRefMap_->get(wireId, t0mean, t0rms, DTTimeUnits::counts);
+    LogTrace(metname_) << "Ref Wire: " << wireId << endl
+                       << " T0 mean (TDC counts): " << t0mean << " T0_rms (TDC counts): " << t0rms;
 
     t0RefMap_[wireId].push_back(t0mean);
     t0RefMap_[wireId].push_back(t0rms);
   }
 
   // Loop over Ref DB entries
-  for(DTT0::const_iterator tzero = tZeroMap_->begin();
-                           tzero != tZeroMap_->end(); tzero++) {
+  for (DTT0::const_iterator tzero = tZeroMap_->begin(); tzero != tZeroMap_->end(); tzero++) {
     // t0s and rms are TDC counts
-// @@@ NEW DTT0 FORMAT
-//    DTWireId wireId((*tzero).first.wheelId,
-//		    (*tzero).first.stationId,
-//		    (*tzero).first.sectorId,
-//		    (*tzero).first.slId,
-//		    (*tzero).first.layerId,
-//		    (*tzero).first.cellId);
+    // @@@ NEW DTT0 FORMAT
+    //    DTWireId wireId((*tzero).first.wheelId,
+    //		    (*tzero).first.stationId,
+    //		    (*tzero).first.sectorId,
+    //		    (*tzero).first.slId,
+    //		    (*tzero).first.layerId,
+    //		    (*tzero).first.cellId);
     int channelId = tzero->channelId;
-    if ( channelId == 0 ) continue;
+    if (channelId == 0)
+      continue;
     DTWireId wireId(channelId);
-// @@@ NEW DTT0 END
+    // @@@ NEW DTT0 END
     float t0mean;
     float t0rms;
-    tZeroMap_->get( wireId, t0mean, t0rms, DTTimeUnits::counts );
-    LogTrace(metname_)<< "Wire: " <<  wireId <<endl
-		     << " T0 mean (TDC counts): " << t0mean
-		     << " T0_rms (TDC counts): " << t0rms;
+    tZeroMap_->get(wireId, t0mean, t0rms, DTTimeUnits::counts);
+    LogTrace(metname_) << "Wire: " << wireId << endl
+                       << " T0 mean (TDC counts): " << t0mean << " T0_rms (TDC counts): " << t0rms;
 
     t0Map_[wireId].push_back(t0mean);
     t0Map_[wireId].push_back(t0rms);
   }
 
   double difference = 0;
-  for(map<DTWireId, vector<float> >::const_iterator theMap = t0RefMap_.begin();
-      theMap != t0RefMap_.end();
-      theMap++) {  
-    if(t0Map_.find((*theMap).first) != t0Map_.end()) {
-
+  for (map<DTWireId, vector<float>>::const_iterator theMap = t0RefMap_.begin(); theMap != t0RefMap_.end(); theMap++) {
+    if (t0Map_.find((*theMap).first) != t0Map_.end()) {
       // Compute the difference
-      difference = t0Map_[(*theMap).first][0]-(*theMap).second[0];
+      difference = t0Map_[(*theMap).first][0] - (*theMap).second[0];
 
-      //book histo
+      // book histo
       DTLayerId layerId = (*theMap).first.layerId();
-      if(t0DiffHistos_.find(layerId) == t0DiffHistos_.end()) {
-	const DTTopology& dtTopo = dtGeom_->layer(layerId)->specificTopology();
-	const int firstWire = dtTopo.firstChannel();
-	const int lastWire = dtTopo.lastChannel();
-	bookHistos(layerId, firstWire, lastWire);
+      if (t0DiffHistos_.find(layerId) == t0DiffHistos_.end()) {
+        const DTTopology &dtTopo = dtGeom_->layer(layerId)->specificTopology();
+        const int firstWire = dtTopo.firstChannel();
+        const int lastWire = dtTopo.lastChannel();
+        bookHistos(layerId, firstWire, lastWire);
       }
 
-      LogTrace(metname_)<< "Filling the histo for wire: "<<(*theMap).first
-	                <<"  difference: "<<difference;
-      t0DiffHistos_[layerId]->Fill((*theMap).first.wire(),difference);
-
+      LogTrace(metname_) << "Filling the histo for wire: " << (*theMap).first << "  difference: " << difference;
+      t0DiffHistos_[layerId]->Fill((*theMap).first.wire(), difference);
     }
-  } // Loop over the t0 map reference
-   
+  }  // Loop over the t0 map reference
 }
 
-void DTt0DBValidation::endRun(edm::Run const& run, edm::EventSetup const& setup) {
-
+void DTt0DBValidation::endRun(edm::Run const &run, edm::EventSetup const &setup) {
   // Check the histos
-  string testCriterionName = t0TestName_; 
-  for(map<DTLayerId, MonitorElement*>::const_iterator hDiff = t0DiffHistos_.begin();
-      hDiff != t0DiffHistos_.end();
-      hDiff++) {
-
-     const QReport * theDiffQReport = (*hDiff).second->getQReport(testCriterionName);
-     if(theDiffQReport) {
-        int xBin = ((*hDiff).first.station()-1)*12+(*hDiff).first.layer()+4*((*hDiff).first.superlayer()-1);
-        if( (*hDiff).first.station()==4 && (*hDiff).first.superlayer()==3 )
-           xBin = ((*hDiff).first.station()-1)*12+(*hDiff).first.layer()+4*((*hDiff).first.superlayer()-2);
-
-        int qReportStatus = theDiffQReport->getStatus()/100;
-        wheelSummary_[(*hDiff).first.wheel()]->setBinContent(xBin,(*hDiff).first.sector(),qReportStatus);
- 
-        LogVerbatim(metname_) << "-------- layer: " << (*hDiff).first << "  " << theDiffQReport->getMessage()
-                              << " ------- " << theDiffQReport->getStatus()
-                              << " ------- " << setprecision(3) << theDiffQReport->getQTresult();
-        vector<dqm::me_util::Channel> badChannels = theDiffQReport->getBadChannels();
-        for (vector<dqm::me_util::Channel>::iterator channel = badChannels.begin(); 
-	                                           channel != badChannels.end(); channel++) {
-           LogVerbatim(metname_) << "layer: " << (*hDiff).first << " Bad channel: " 
-                                             << (*channel).getBin() << "  Contents : "
-                                             << (*channel).getContents();
-
-           //wheelSummary_[(*hDiff).first.wheel()]->Fill(xBin,(*hDiff).first.sector());
-        }
-     }
-      
+  string testCriterionName = t0TestName_;
+  for (map<DTLayerId, MonitorElement *>::const_iterator hDiff = t0DiffHistos_.begin(); hDiff != t0DiffHistos_.end();
+       hDiff++) {
+    const QReport *theDiffQReport = (*hDiff).second->getQReport(testCriterionName);
+    if (theDiffQReport) {
+      int xBin = ((*hDiff).first.station() - 1) * 12 + (*hDiff).first.layer() + 4 * ((*hDiff).first.superlayer() - 1);
+      if ((*hDiff).first.station() == 4 && (*hDiff).first.superlayer() == 3)
+        xBin = ((*hDiff).first.station() - 1) * 12 + (*hDiff).first.layer() + 4 * ((*hDiff).first.superlayer() - 2);
+
+      int qReportStatus = theDiffQReport->getStatus() / 100;
+      wheelSummary_[(*hDiff).first.wheel()]->setBinContent(xBin, (*hDiff).first.sector(), qReportStatus);
+
+      LogVerbatim(metname_) << "-------- layer: " << (*hDiff).first << "  " << theDiffQReport->getMessage()
+                            << " ------- " << theDiffQReport->getStatus() << " ------- " << setprecision(3)
+                            << theDiffQReport->getQTresult();
+      vector<dqm::me_util::Channel> badChannels = theDiffQReport->getBadChannels();
+      for (vector<dqm::me_util::Channel>::iterator channel = badChannels.begin(); channel != badChannels.end();
+           channel++) {
+        LogVerbatim(metname_) << "layer: " << (*hDiff).first << " Bad channel: " << (*channel).getBin()
+                              << "  Contents : " << (*channel).getContents();
+
+        // wheelSummary_[(*hDiff).first.wheel()]->Fill(xBin,(*hDiff).first.sector());
+      }
+    }
   }
-
 }
 
 void DTt0DBValidation::endJob() {
   // Write the histos on a file
-  if(outputMEsInRootFile_) dbe_->save(outputFileName_); 
+  if (outputMEsInRootFile_)
+    dbe_->save(outputFileName_);
 }
 
-  // Book a set of histograms for a given Layer
+// Book a set of histograms for a given Layer
 void DTt0DBValidation::bookHistos(DTLayerId lId, int firstWire, int lastWire) {
-  
-  LogTrace(metname_)<< "   Booking histos for L: " << lId;
+  LogTrace(metname_) << "   Booking histos for L: " << lId;
 
   // Compose the chamber name
-  stringstream wheel; wheel << lId.superlayerId().chamberId().wheel();	
-  stringstream station; station << lId.superlayerId().chamberId().station();	
-  stringstream sector; sector << lId.superlayerId().chamberId().sector();	
-  stringstream superLayer; superLayer << lId.superlayerId().superlayer();	
-  stringstream layer; layer << lId.layer();
-
-  string lHistoName =
-    "_W" + wheel.str() +
-    "_St" + station.str() +
-    "_Sec" + sector.str() +
-    "_SL" + superLayer.str()+
-    "_L" + layer.str();
-  
-  dbe_->setCurrentFolder("DT/DtCalib/InterChannelSynchDBValidation/Wheel" + wheel.str() +
-			   "/Station" + station.str() +
-			   "/Sector" + sector.str() +
-			   "/SuperLayer" +superLayer.str());
+  stringstream wheel;
+  wheel << lId.superlayerId().chamberId().wheel();
+  stringstream station;
+  station << lId.superlayerId().chamberId().station();
+  stringstream sector;
+  sector << lId.superlayerId().chamberId().sector();
+  stringstream superLayer;
+  superLayer << lId.superlayerId().superlayer();
+  stringstream layer;
+  layer << lId.layer();
+
+  string lHistoName = "_W" + wheel.str() + "_St" + station.str() + "_Sec" + sector.str() + "_SL" + superLayer.str() +
+                      "_L" + layer.str();
+
+  dbe_->setCurrentFolder("DT/DtCalib/InterChannelSynchDBValidation/Wheel" + wheel.str() + "/Station" + station.str() +
+                         "/Sector" + sector.str() + "/SuperLayer" + superLayer.str());
   // Create the monitor elements
-  MonitorElement * hDifference;
-  hDifference = dbe_->book1D("T0Difference"+lHistoName, "difference between the two t0 values",lastWire-firstWire+1, firstWire-0.5, lastWire+0.5);
-  
+  MonitorElement *hDifference;
+  hDifference = dbe_->book1D("T0Difference" + lHistoName,
+                             "difference between the two t0 values",
+                             lastWire - firstWire + 1,
+                             firstWire - 0.5,
+                             lastWire + 0.5);
+
   t0DiffHistos_[lId] = hDifference;
 }
 
 // Book the summary histos
 void DTt0DBValidation::bookHistos(int wheel) {
   dbe_->setCurrentFolder("DT/DtCalib/InterChannelSynchDBValidation");
-  stringstream wh; wh << wheel;
-    wheelSummary_[wheel]= dbe_->book2D("SummaryWrongT0_W"+wh.str(), "W"+wh.str()+": summary of wrong t0 differences",44,1,45,14,1,15);
-    wheelSummary_[wheel]->setBinLabel(1,"M1L1",1);
-    wheelSummary_[wheel]->setBinLabel(2,"M1L2",1);
-    wheelSummary_[wheel]->setBinLabel(3,"M1L3",1);
-    wheelSummary_[wheel]->setBinLabel(4,"M1L4",1);
-    wheelSummary_[wheel]->setBinLabel(5,"M1L5",1);
-    wheelSummary_[wheel]->setBinLabel(6,"M1L6",1);
-    wheelSummary_[wheel]->setBinLabel(7,"M1L7",1);
-    wheelSummary_[wheel]->setBinLabel(8,"M1L8",1);
-    wheelSummary_[wheel]->setBinLabel(9,"M1L9",1);
-    wheelSummary_[wheel]->setBinLabel(10,"M1L10",1);
-    wheelSummary_[wheel]->setBinLabel(11,"M1L11",1);
-    wheelSummary_[wheel]->setBinLabel(12,"M1L12",1);
-    wheelSummary_[wheel]->setBinLabel(13,"M2L1",1);
-    wheelSummary_[wheel]->setBinLabel(14,"M2L2",1);
-    wheelSummary_[wheel]->setBinLabel(15,"M2L3",1);
-    wheelSummary_[wheel]->setBinLabel(16,"M2L4",1);
-    wheelSummary_[wheel]->setBinLabel(17,"M2L5",1);
-    wheelSummary_[wheel]->setBinLabel(18,"M2L6",1);
-    wheelSummary_[wheel]->setBinLabel(19,"M2L7",1);
-    wheelSummary_[wheel]->setBinLabel(20,"M2L8",1);
-    wheelSummary_[wheel]->setBinLabel(21,"M2L9",1);
-    wheelSummary_[wheel]->setBinLabel(22,"M2L10",1);
-    wheelSummary_[wheel]->setBinLabel(23,"M2L11",1);
-    wheelSummary_[wheel]->setBinLabel(24,"M2L12",1);
-    wheelSummary_[wheel]->setBinLabel(25,"M3L1",1);
-    wheelSummary_[wheel]->setBinLabel(26,"M3L2",1);
-    wheelSummary_[wheel]->setBinLabel(27,"M3L3",1);
-    wheelSummary_[wheel]->setBinLabel(28,"M3L4",1);
-    wheelSummary_[wheel]->setBinLabel(29,"M3L5",1);
-    wheelSummary_[wheel]->setBinLabel(30,"M3L6",1);
-    wheelSummary_[wheel]->setBinLabel(31,"M3L7",1);
-    wheelSummary_[wheel]->setBinLabel(32,"M3L8",1);
-    wheelSummary_[wheel]->setBinLabel(33,"M3L9",1);
-    wheelSummary_[wheel]->setBinLabel(34,"M3L10",1);
-    wheelSummary_[wheel]->setBinLabel(35,"M3L11",1);
-    wheelSummary_[wheel]->setBinLabel(36,"M3L12",1);
-    wheelSummary_[wheel]->setBinLabel(37,"M4L1",1);
-    wheelSummary_[wheel]->setBinLabel(38,"M4L2",1);
-    wheelSummary_[wheel]->setBinLabel(39,"M4L3",1);
-    wheelSummary_[wheel]->setBinLabel(40,"M4L4",1);
-    wheelSummary_[wheel]->setBinLabel(41,"M4L5",1);
-    wheelSummary_[wheel]->setBinLabel(42,"M4L6",1);
-    wheelSummary_[wheel]->setBinLabel(43,"M4L7",1);
-    wheelSummary_[wheel]->setBinLabel(44,"M4L8",1);
+  stringstream wh;
+  wh << wheel;
+  wheelSummary_[wheel] = dbe_->book2D(
+      "SummaryWrongT0_W" + wh.str(), "W" + wh.str() + ": summary of wrong t0 differences", 44, 1, 45, 14, 1, 15);
+  wheelSummary_[wheel]->setBinLabel(1, "M1L1", 1);
+  wheelSummary_[wheel]->setBinLabel(2, "M1L2", 1);
+  wheelSummary_[wheel]->setBinLabel(3, "M1L3", 1);
+  wheelSummary_[wheel]->setBinLabel(4, "M1L4", 1);
+  wheelSummary_[wheel]->setBinLabel(5, "M1L5", 1);
+  wheelSummary_[wheel]->setBinLabel(6, "M1L6", 1);
+  wheelSummary_[wheel]->setBinLabel(7, "M1L7", 1);
+  wheelSummary_[wheel]->setBinLabel(8, "M1L8", 1);
+  wheelSummary_[wheel]->setBinLabel(9, "M1L9", 1);
+  wheelSummary_[wheel]->setBinLabel(10, "M1L10", 1);
+  wheelSummary_[wheel]->setBinLabel(11, "M1L11", 1);
+  wheelSummary_[wheel]->setBinLabel(12, "M1L12", 1);
+  wheelSummary_[wheel]->setBinLabel(13, "M2L1", 1);
+  wheelSummary_[wheel]->setBinLabel(14, "M2L2", 1);
+  wheelSummary_[wheel]->setBinLabel(15, "M2L3", 1);
+  wheelSummary_[wheel]->setBinLabel(16, "M2L4", 1);
+  wheelSummary_[wheel]->setBinLabel(17, "M2L5", 1);
+  wheelSummary_[wheel]->setBinLabel(18, "M2L6", 1);
+  wheelSummary_[wheel]->setBinLabel(19, "M2L7", 1);
+  wheelSummary_[wheel]->setBinLabel(20, "M2L8", 1);
+  wheelSummary_[wheel]->setBinLabel(21, "M2L9", 1);
+  wheelSummary_[wheel]->setBinLabel(22, "M2L10", 1);
+  wheelSummary_[wheel]->setBinLabel(23, "M2L11", 1);
+  wheelSummary_[wheel]->setBinLabel(24, "M2L12", 1);
+  wheelSummary_[wheel]->setBinLabel(25, "M3L1", 1);
+  wheelSummary_[wheel]->setBinLabel(26, "M3L2", 1);
+  wheelSummary_[wheel]->setBinLabel(27, "M3L3", 1);
+  wheelSummary_[wheel]->setBinLabel(28, "M3L4", 1);
+  wheelSummary_[wheel]->setBinLabel(29, "M3L5", 1);
+  wheelSummary_[wheel]->setBinLabel(30, "M3L6", 1);
+  wheelSummary_[wheel]->setBinLabel(31, "M3L7", 1);
+  wheelSummary_[wheel]->setBinLabel(32, "M3L8", 1);
+  wheelSummary_[wheel]->setBinLabel(33, "M3L9", 1);
+  wheelSummary_[wheel]->setBinLabel(34, "M3L10", 1);
+  wheelSummary_[wheel]->setBinLabel(35, "M3L11", 1);
+  wheelSummary_[wheel]->setBinLabel(36, "M3L12", 1);
+  wheelSummary_[wheel]->setBinLabel(37, "M4L1", 1);
+  wheelSummary_[wheel]->setBinLabel(38, "M4L2", 1);
+  wheelSummary_[wheel]->setBinLabel(39, "M4L3", 1);
+  wheelSummary_[wheel]->setBinLabel(40, "M4L4", 1);
+  wheelSummary_[wheel]->setBinLabel(41, "M4L5", 1);
+  wheelSummary_[wheel]->setBinLabel(42, "M4L6", 1);
+  wheelSummary_[wheel]->setBinLabel(43, "M4L7", 1);
+  wheelSummary_[wheel]->setBinLabel(44, "M4L8", 1);
 }
diff --git a/DQMOffline/CalibMuon/src/DTtTrigDBValidation.cc b/DQMOffline/CalibMuon/src/DTtTrigDBValidation.cc
index 21ebe50aa0236..ba343f623bca3 100644
--- a/DQMOffline/CalibMuon/src/DTtTrigDBValidation.cc
+++ b/DQMOffline/CalibMuon/src/DTtTrigDBValidation.cc
@@ -1,9 +1,9 @@
 #include "DQMOffline/CalibMuon/interface/DTtTrigDBValidation.h"
 
 // Framework
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
@@ -11,9 +11,9 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 // Geometry
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
 #include "Geometry/DTGeometry/interface/DTTopology.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 // DataFormats
 #include "DataFormats/MuonDetId/interface/DTSuperLayerId.h"
@@ -22,45 +22,41 @@
 #include "CondFormats/DTObjects/interface/DTTtrig.h"
 #include "CondFormats/DataRecord/interface/DTTtrigRcd.h"
 
+#include "TFile.h"
+#include <cmath>
 #include <cstdio>
 #include <sstream>
-#include <cmath>
-#include "TFile.h"
 
 using namespace edm;
 using namespace std;
 
-DTtTrigDBValidation::DTtTrigDBValidation(const ParameterSet& pset):
-   metname_("TTrigDBValidation"),
-   labelDBRef_(pset.getParameter<string>("labelDBRef")),
-   labelDB_(pset.getParameter<string>("labelDB")),
-   lowerLimit_(pset.getUntrackedParameter<int>("lowerLimit",1)),
-   higherLimit_(pset.getUntrackedParameter<int>("higherLimit",3))
- {
-
+DTtTrigDBValidation::DTtTrigDBValidation(const ParameterSet &pset)
+    : metname_("TTrigDBValidation"),
+      labelDBRef_(pset.getParameter<string>("labelDBRef")),
+      labelDB_(pset.getParameter<string>("labelDB")),
+      lowerLimit_(pset.getUntrackedParameter<int>("lowerLimit", 1)),
+      higherLimit_(pset.getUntrackedParameter<int>("higherLimit", 3)) {
   LogVerbatim(metname_) << "[DTtTrigDBValidation] Constructor called!";
 }
 
-DTtTrigDBValidation::~DTtTrigDBValidation(){}
-
-void DTtTrigDBValidation::bookHistograms(DQMStore::IBooker &iBooker,
-  edm::Run const &, edm::EventSetup const &setup) {
+DTtTrigDBValidation::~DTtTrigDBValidation() {}
 
+void DTtTrigDBValidation::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, edm::EventSetup const &setup) {
   LogVerbatim(metname_) << "[DTtTrigDBValidation] Parameters initialization";
   iBooker.setCurrentFolder("DT/DtCalib/TTrigDBValidation");
- 
+
   ESHandle<DTTtrig> tTrig_Ref;
   setup.get<DTTtrigRcd>().get(labelDBRef_, tTrig_Ref);
-  const DTTtrig* DTTtrigRefMap = &*tTrig_Ref;
+  const DTTtrig *DTTtrigRefMap = &*tTrig_Ref;
   LogVerbatim(metname_) << "[DTtTrigDBValidation] reference Ttrig version: " << tTrig_Ref->version();
 
   ESHandle<DTTtrig> tTrig;
   setup.get<DTTtrigRcd>().get(labelDB_, tTrig);
-  const DTTtrig* DTTtrigMap = &*tTrig;
+  const DTTtrig *DTTtrigMap = &*tTrig;
   LogVerbatim(metname_) << "[DTtTrigDBValidation] Ttrig to validate version: " << tTrig->version();
 
-  //book&reset the summary histos
-  for(int wheel=-2; wheel<=2; wheel++){
+  // book&reset the summary histos
+  for (int wheel = -2; wheel <= 2; wheel++) {
     bookHistos(iBooker, wheel);
     tTrigDiffWheel_[wheel]->Reset();
   }
@@ -69,153 +65,143 @@ void DTtTrigDBValidation::bookHistograms(DQMStore::IBooker &iBooker,
   setup.get<MuonGeometryRecord>().get(dtGeom_);
 
   // Loop over Ref DB entries
-  for(DTTtrig::const_iterator it = DTTtrigRefMap->begin();
-      it != DTTtrigRefMap->end(); ++it) {
-    DTSuperLayerId slId((*it).first.wheelId,
-		        (*it).first.stationId,
-		        (*it).first.sectorId,
-		        (*it).first.slId);
+  for (DTTtrig::const_iterator it = DTTtrigRefMap->begin(); it != DTTtrigRefMap->end(); ++it) {
+    DTSuperLayerId slId((*it).first.wheelId, (*it).first.stationId, (*it).first.sectorId, (*it).first.slId);
     float tTrigMean;
     float tTrigRms;
     float kFactor;
     DTTtrigRefMap->get(slId, tTrigMean, tTrigRms, kFactor, DTTimeUnits::ns);
-    float tTrigCorr = tTrigMean + kFactor*tTrigRms;
-    LogTrace(metname_)<< "Ref Superlayer: " <<  slId << "\n"
-		     << " Ttrig mean (ns): " << tTrigMean
-		     << " Ttrig rms (ns): " << tTrigRms
-                     << " Ttrig k-Factor: " << kFactor
-                     << " Ttrig value (ns): " << tTrigCorr;
-                     
-    //tTrigRefMap[slId] = std::pair<float,float>(tTrigmean,tTrigrms);
-    tTrigRefMap_[slId] = pair<float,float>(tTrigCorr,tTrigRms);
+    float tTrigCorr = tTrigMean + kFactor * tTrigRms;
+    LogTrace(metname_) << "Ref Superlayer: " << slId << "\n"
+                       << " Ttrig mean (ns): " << tTrigMean << " Ttrig rms (ns): " << tTrigRms
+                       << " Ttrig k-Factor: " << kFactor << " Ttrig value (ns): " << tTrigCorr;
+
+    // tTrigRefMap[slId] = std::pair<float,float>(tTrigmean,tTrigrms);
+    tTrigRefMap_[slId] = pair<float, float>(tTrigCorr, tTrigRms);
   }
 
   // Loop over Ref DB entries
-  for(DTTtrig::const_iterator it = DTTtrigMap->begin();
-      it != DTTtrigMap->end(); ++it) {
-    DTSuperLayerId slId((*it).first.wheelId,
-		        (*it).first.stationId,
-		        (*it).first.sectorId,
-		        (*it).first.slId);
+  for (DTTtrig::const_iterator it = DTTtrigMap->begin(); it != DTTtrigMap->end(); ++it) {
+    DTSuperLayerId slId((*it).first.wheelId, (*it).first.stationId, (*it).first.sectorId, (*it).first.slId);
     float tTrigMean;
     float tTrigRms;
     float kFactor;
     DTTtrigMap->get(slId, tTrigMean, tTrigRms, kFactor, DTTimeUnits::ns);
-    float tTrigCorr = tTrigMean + kFactor*tTrigRms;
-    LogTrace(metname_)<< "Superlayer: " <<  slId << "\n"
-                     << " Ttrig mean (ns): " << tTrigMean
-                     << " Ttrig rms (ns): " << tTrigRms
-                     << " Ttrig k-Factor: " << kFactor
-                     << " Ttrig value (ns): " << tTrigCorr;
-
-    //tTrigMap[slId] = std::pair<float,float>(tTrigmean,tTrigrms);
-    tTrigMap_[slId] = pair<float,float>(tTrigCorr,tTrigRms);
+    float tTrigCorr = tTrigMean + kFactor * tTrigRms;
+    LogTrace(metname_) << "Superlayer: " << slId << "\n"
+                       << " Ttrig mean (ns): " << tTrigMean << " Ttrig rms (ns): " << tTrigRms
+                       << " Ttrig k-Factor: " << kFactor << " Ttrig value (ns): " << tTrigCorr;
+
+    // tTrigMap[slId] = std::pair<float,float>(tTrigmean,tTrigrms);
+    tTrigMap_[slId] = pair<float, float>(tTrigCorr, tTrigRms);
   }
 
-  for(map<DTSuperLayerId, pair<float,float> >::const_iterator it = tTrigRefMap_.begin();
-      it != tTrigRefMap_.end(); ++it) {  
-      if(tTrigMap_.find((*it).first) == tTrigMap_.end()) continue;
-
-      // compute the difference
-      float difference = tTrigMap_[(*it).first].first - (*it).second.first;
-
-      //book histo
-      int wheel = (*it).first.chamberId().wheel();
-      int sector = (*it).first.chamberId().sector();	
-      if(tTrigDiffHistos_.find(make_pair(wheel,sector)) == tTrigDiffHistos_.end()) bookHistos(iBooker, wheel, sector);
-			
-      LogTrace(metname_) << "Filling histos for super-layer: " << (*it).first << "  difference: " << difference;
- 
-      // Fill the test histos
-      int entry = -1;
-      int station = (*it).first.chamberId().station();	
-      if(station == 1) entry=0;
-      if(station == 2) entry=3;
-      if(station == 3) entry=6;
-      if(station == 4) entry=9;
-
-      int slBin = entry + (*it).first.superLayer();
-      if(slBin == 12) slBin=11;	
-
-      tTrigDiffHistos_[make_pair(wheel,sector)]->setBinContent(slBin, difference);
-      if(abs(difference) < lowerLimit_){
-	tTrigDiffWheel_[wheel]->setBinContent(slBin,sector,1);
-      }else if(abs(difference) < higherLimit_){
-	tTrigDiffWheel_[wheel]->setBinContent(slBin,sector,2);
-      }else{
-	tTrigDiffWheel_[wheel]->setBinContent(slBin,sector,3);
-      }
-	
-
-  } // Loop over the tTrig map reference
-  
+  for (map<DTSuperLayerId, pair<float, float>>::const_iterator it = tTrigRefMap_.begin(); it != tTrigRefMap_.end();
+       ++it) {
+    if (tTrigMap_.find((*it).first) == tTrigMap_.end())
+      continue;
+
+    // compute the difference
+    float difference = tTrigMap_[(*it).first].first - (*it).second.first;
+
+    // book histo
+    int wheel = (*it).first.chamberId().wheel();
+    int sector = (*it).first.chamberId().sector();
+    if (tTrigDiffHistos_.find(make_pair(wheel, sector)) == tTrigDiffHistos_.end())
+      bookHistos(iBooker, wheel, sector);
+
+    LogTrace(metname_) << "Filling histos for super-layer: " << (*it).first << "  difference: " << difference;
+
+    // Fill the test histos
+    int entry = -1;
+    int station = (*it).first.chamberId().station();
+    if (station == 1)
+      entry = 0;
+    if (station == 2)
+      entry = 3;
+    if (station == 3)
+      entry = 6;
+    if (station == 4)
+      entry = 9;
+
+    int slBin = entry + (*it).first.superLayer();
+    if (slBin == 12)
+      slBin = 11;
+
+    tTrigDiffHistos_[make_pair(wheel, sector)]->setBinContent(slBin, difference);
+    if (abs(difference) < lowerLimit_) {
+      tTrigDiffWheel_[wheel]->setBinContent(slBin, sector, 1);
+    } else if (abs(difference) < higherLimit_) {
+      tTrigDiffWheel_[wheel]->setBinContent(slBin, sector, 2);
+    } else {
+      tTrigDiffWheel_[wheel]->setBinContent(slBin, sector, 3);
+    }
+
+  }  // Loop over the tTrig map reference
 }
 
 void DTtTrigDBValidation::bookHistos(DQMStore::IBooker &iBooker, int wheel, int sector) {
-
   LogTrace(metname_) << "   Booking histos for Wheel, Sector: " << wheel << ", " << sector;
 
   // Compose the chamber name
-  stringstream str_wheel; str_wheel << wheel;
-  stringstream str_sector; str_sector << sector;
+  stringstream str_wheel;
+  str_wheel << wheel;
+  stringstream str_sector;
+  str_sector << sector;
 
   string lHistoName = "_W" + str_wheel.str() + "_Sec" + str_sector.str();
 
   iBooker.setCurrentFolder("DT/DtCalib/TTrigDBValidation/Wheel" + str_wheel.str());
 
   // Create the monitor elements
-  MonitorElement * hDifference;
-  hDifference = iBooker.book1D("TTrigDifference"+lHistoName, "difference between the two tTrig values",11,0,11);
+  MonitorElement *hDifference;
+  hDifference = iBooker.book1D("TTrigDifference" + lHistoName, "difference between the two tTrig values", 11, 0, 11);
 
-  pair<int,int> mypair(wheel,sector);
+  pair<int, int> mypair(wheel, sector);
   tTrigDiffHistos_[mypair] = hDifference;
 
-  (tTrigDiffHistos_[mypair])->setBinLabel(1,"MB1_SL1",1);
-  (tTrigDiffHistos_[mypair])->setBinLabel(2,"MB1_SL2",1);
-  (tTrigDiffHistos_[mypair])->setBinLabel(3,"MB1_SL3",1);
-  (tTrigDiffHistos_[mypair])->setBinLabel(4,"MB2_SL1",1);
-  (tTrigDiffHistos_[mypair])->setBinLabel(5,"MB2_SL2",1);
-  (tTrigDiffHistos_[mypair])->setBinLabel(6,"MB2_SL3",1);
-  (tTrigDiffHistos_[mypair])->setBinLabel(7,"MB3_SL1",1);
-  (tTrigDiffHistos_[mypair])->setBinLabel(8,"MB3_SL2",1);
-  (tTrigDiffHistos_[mypair])->setBinLabel(9,"MB3_SL3",1);
-  (tTrigDiffHistos_[mypair])->setBinLabel(10,"MB4_SL1",1);
-  (tTrigDiffHistos_[mypair])->setBinLabel(11,"MB4_SL3",1);
-
+  (tTrigDiffHistos_[mypair])->setBinLabel(1, "MB1_SL1", 1);
+  (tTrigDiffHistos_[mypair])->setBinLabel(2, "MB1_SL2", 1);
+  (tTrigDiffHistos_[mypair])->setBinLabel(3, "MB1_SL3", 1);
+  (tTrigDiffHistos_[mypair])->setBinLabel(4, "MB2_SL1", 1);
+  (tTrigDiffHistos_[mypair])->setBinLabel(5, "MB2_SL2", 1);
+  (tTrigDiffHistos_[mypair])->setBinLabel(6, "MB2_SL3", 1);
+  (tTrigDiffHistos_[mypair])->setBinLabel(7, "MB3_SL1", 1);
+  (tTrigDiffHistos_[mypair])->setBinLabel(8, "MB3_SL2", 1);
+  (tTrigDiffHistos_[mypair])->setBinLabel(9, "MB3_SL3", 1);
+  (tTrigDiffHistos_[mypair])->setBinLabel(10, "MB4_SL1", 1);
+  (tTrigDiffHistos_[mypair])->setBinLabel(11, "MB4_SL3", 1);
 }
 
 // Book the summary histos
 void DTtTrigDBValidation::bookHistos(DQMStore::IBooker &iBooker, int wheel) {
-
-  stringstream wh; wh << wheel;
+  stringstream wh;
+  wh << wheel;
 
   iBooker.setCurrentFolder("DT/DtCalib/TTrigDBValidation");
-  tTrigDiffWheel_[wheel] = iBooker.book2D("TTrigDifference_W"+wh.str(), "W"+wh.str()+": summary of tTrig differences",11,1,12,14,1,15);
-  tTrigDiffWheel_[wheel]->setBinLabel(1,"MB1_SL1",1);
-  tTrigDiffWheel_[wheel]->setBinLabel(2,"MB1_SL2",1);
-  tTrigDiffWheel_[wheel]->setBinLabel(3,"MB1_SL3",1);
-  tTrigDiffWheel_[wheel]->setBinLabel(4,"MB2_SL1",1);
-  tTrigDiffWheel_[wheel]->setBinLabel(5,"MB2_SL2",1);
-  tTrigDiffWheel_[wheel]->setBinLabel(6,"MB2_SL3",1);
-  tTrigDiffWheel_[wheel]->setBinLabel(7,"MB3_SL1",1);
-  tTrigDiffWheel_[wheel]->setBinLabel(8,"MB3_SL2",1);
-  tTrigDiffWheel_[wheel]->setBinLabel(9,"MB3_SL3",1);
-  tTrigDiffWheel_[wheel]->setBinLabel(10,"MB4_SL1",1);
-  tTrigDiffWheel_[wheel]->setBinLabel(11,"MB4_SL3",1);
-
+  tTrigDiffWheel_[wheel] = iBooker.book2D(
+      "TTrigDifference_W" + wh.str(), "W" + wh.str() + ": summary of tTrig differences", 11, 1, 12, 14, 1, 15);
+  tTrigDiffWheel_[wheel]->setBinLabel(1, "MB1_SL1", 1);
+  tTrigDiffWheel_[wheel]->setBinLabel(2, "MB1_SL2", 1);
+  tTrigDiffWheel_[wheel]->setBinLabel(3, "MB1_SL3", 1);
+  tTrigDiffWheel_[wheel]->setBinLabel(4, "MB2_SL1", 1);
+  tTrigDiffWheel_[wheel]->setBinLabel(5, "MB2_SL2", 1);
+  tTrigDiffWheel_[wheel]->setBinLabel(6, "MB2_SL3", 1);
+  tTrigDiffWheel_[wheel]->setBinLabel(7, "MB3_SL1", 1);
+  tTrigDiffWheel_[wheel]->setBinLabel(8, "MB3_SL2", 1);
+  tTrigDiffWheel_[wheel]->setBinLabel(9, "MB3_SL3", 1);
+  tTrigDiffWheel_[wheel]->setBinLabel(10, "MB4_SL1", 1);
+  tTrigDiffWheel_[wheel]->setBinLabel(11, "MB4_SL3", 1);
 }
 
+int DTtTrigDBValidation::stationFromBin(int bin) const { return (int)(bin / 3.1) + 1; }
 
-int DTtTrigDBValidation::stationFromBin(int bin) const {
-  return (int) (bin /3.1)+1;
-}
- 
 int DTtTrigDBValidation::slFromBin(int bin) const {
-  int ret = bin%3;
-  if(ret == 0 || bin == 11) ret = 3;
-  
+  int ret = bin % 3;
+  if (ret == 0 || bin == 11)
+    ret = 3;
+
   return ret;
 }
 
-
-void DTtTrigDBValidation::analyze( const edm::Event&, const edm::EventSetup&) {}
+void DTtTrigDBValidation::analyze(const edm::Event &, const edm::EventSetup &) {}
diff --git a/DQMOffline/CalibMuon/src/SealModule.cc b/DQMOffline/CalibMuon/src/SealModule.cc
index 49b23a062d86d..fafb0e5ca096d 100644
--- a/DQMOffline/CalibMuon/src/SealModule.cc
+++ b/DQMOffline/CalibMuon/src/SealModule.cc
@@ -1,11 +1,10 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 
+#include "DQMOffline/CalibMuon/interface/DTPreCalibrationTask.h"
+#include "DQMOffline/CalibMuon/interface/DTnoiseDBValidation.h"
 #include "DQMOffline/CalibMuon/interface/DTt0DBValidation.h"
 #include "DQMOffline/CalibMuon/interface/DTtTrigDBValidation.h"
-#include "DQMOffline/CalibMuon/interface/DTnoiseDBValidation.h"
-#include "DQMOffline/CalibMuon/interface/DTPreCalibrationTask.h"
-
 
 DEFINE_FWK_MODULE(DTt0DBValidation);
 DEFINE_FWK_MODULE(DTtTrigDBValidation);
diff --git a/DQMOffline/EGamma/plugins/PhotonOfflineClient.h b/DQMOffline/EGamma/plugins/PhotonOfflineClient.h
index 2970ebb1b7e9a..d9ae1634df771 100755
--- a/DQMOffline/EGamma/plugins/PhotonOfflineClient.h
+++ b/DQMOffline/EGamma/plugins/PhotonOfflineClient.h
@@ -125,7 +125,6 @@ class PhotonOfflineClient : public  DQMEDHarvester
   void dividePlots(MonitorElement* dividend, MonitorElement* numerator, MonitorElement* denominator);
   void dividePlots(MonitorElement* dividend, MonitorElement* numerator, double denominator); 
   
-  DQMStore *dbe_;
   int verbosity_;
 
   edm::ParameterSet parameters_;
diff --git a/DQMOffline/Ecal/interface/ESRecoSummary.h b/DQMOffline/Ecal/interface/ESRecoSummary.h
index db7f1fc4aaf24..bde2ef810bc9e 100644
--- a/DQMOffline/Ecal/interface/ESRecoSummary.h
+++ b/DQMOffline/Ecal/interface/ESRecoSummary.h
@@ -5,40 +5,38 @@
 #include <memory>
 
 // DQM includes
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 
-#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 #include "DataFormats/EgammaReco/interface/PreshowerClusterFwd.h"
+#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
 
 class ESRecoSummary : public DQMEDAnalyzer {
- public:
-  explicit ESRecoSummary(const edm::ParameterSet&);
+public:
+  explicit ESRecoSummary(const edm::ParameterSet &);
   ~ESRecoSummary() override {}
-  
- private:
-  void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+
+private:
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
   std::string prefixME_;
 
   // PRESHOWER ----------------------------------------------
-  MonitorElement* h_recHits_ES_energyMax;
-  MonitorElement* h_recHits_ES_time;
-      
-  MonitorElement* h_esClusters_energy_plane1;
-  MonitorElement* h_esClusters_energy_plane2;
-  MonitorElement* h_esClusters_energy_ratio;
-         
- protected:
-  
+  MonitorElement *h_recHits_ES_energyMax;
+  MonitorElement *h_recHits_ES_time;
+
+  MonitorElement *h_esClusters_energy_plane1;
+  MonitorElement *h_esClusters_energy_plane2;
+  MonitorElement *h_esClusters_energy_ratio;
 
+protected:
   // ----------member data ---------------------------
   edm::EDGetTokenT<reco::SuperClusterCollection> superClusterCollection_EE_;
   edm::EDGetTokenT<ESRecHitCollection> esRecHitCollection_;
-  edm::EDGetTokenT<reco::PreshowerClusterCollection> esClusterCollectionX_ ;
-  edm::EDGetTokenT<reco::PreshowerClusterCollection> esClusterCollectionY_ ;
+  edm::EDGetTokenT<reco::PreshowerClusterCollection> esClusterCollectionX_;
+  edm::EDGetTokenT<reco::PreshowerClusterCollection> esClusterCollectionY_;
 };
 
 #endif
diff --git a/DQMOffline/Ecal/interface/EcalPileUpDepMonitor.h b/DQMOffline/Ecal/interface/EcalPileUpDepMonitor.h
index 25246a969bc92..5bd4aea537535 100644
--- a/DQMOffline/Ecal/interface/EcalPileUpDepMonitor.h
+++ b/DQMOffline/Ecal/interface/EcalPileUpDepMonitor.h
@@ -8,100 +8,97 @@
  *
  */
 
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
 
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloTopology/interface/CaloTopology.h"
 
+#include "DataFormats/CaloRecHit/interface/CaloCluster.h"
 #include "DataFormats/Common/interface/View.h"
+#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
 #include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
-#include "DataFormats/CaloRecHit/interface/CaloCluster.h"
-#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
 
-class EcalPileUpDepMonitor: public DQMEDAnalyzer{
-
- public:
-
+class EcalPileUpDepMonitor : public DQMEDAnalyzer {
+public:
   /// Constructor
-  EcalPileUpDepMonitor(const edm::ParameterSet& ps);
+  EcalPileUpDepMonitor(const edm::ParameterSet &ps);
 
   /// Destructor
   ~EcalPileUpDepMonitor() override;
 
- protected:
-
+protected:
   /// Analyze
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
- private:
-	
-  //profiles
-  MonitorElement* bcEB_PV; //basic clusters Ecal-Barrel vs Number of Primary Vertices 
-  MonitorElement* bcEE_PV;
-  MonitorElement* scEB_PV;
-  MonitorElement* scEE_PV;
-	
-  MonitorElement* scEtEB_PV;//super cluster Et profiles vs Number of vertices 
-  MonitorElement* scEtEE_PV;
-	
-  MonitorElement* recHitEtEB_PV; // reconstructed hit Et profiles vs number of vertices
-  MonitorElement* recHitEtEE_PV;
-
-  MonitorElement* emIso_PV;
-	
+private:
+  // profiles
+  MonitorElement *bcEB_PV;  // basic clusters Ecal-Barrel vs Number of Primary Vertices
+  MonitorElement *bcEE_PV;
+  MonitorElement *scEB_PV;
+  MonitorElement *scEE_PV;
+
+  MonitorElement *scEtEB_PV;  // super cluster Et profiles vs Number of vertices
+  MonitorElement *scEtEE_PV;
+
+  MonitorElement *recHitEtEB_PV;  // reconstructed hit Et profiles vs number of vertices
+  MonitorElement *recHitEtEE_PV;
+
+  MonitorElement *emIso_PV;
+
   // histograms of reconstructed hit Et and supercluster Et
-  MonitorElement* emIso; 
-  MonitorElement* recHitEtEB;
-  MonitorElement* recHitEtEE;
-	
-  MonitorElement* scHitEtEB;
-  MonitorElement* scHitEtEE;
-
-  // SC energy TH1Fs already exist in ClusterTask	
-/*   MonitorElement* scHitE_EB; */
-/*   MonitorElement* scHitE_EE; */
-	
-  //Eta
+  MonitorElement *emIso;
+  MonitorElement *recHitEtEB;
+  MonitorElement *recHitEtEE;
+
+  MonitorElement *scHitEtEB;
+  MonitorElement *scHitEtEE;
+
+  // SC energy TH1Fs already exist in ClusterTask
+  /*   MonitorElement* scHitE_EB; */
+  /*   MonitorElement* scHitE_EE; */
+
+  // Eta
   // Exists in ClusterTask
-/*   MonitorElement* scEta_EB; */
-/*   MonitorElement* scEta_EE; */
-	
-  //Phi
+  /*   MonitorElement* scEta_EB; */
+  /*   MonitorElement* scEta_EE; */
+
+  // Phi
   // Exists in ClusterTask
-/*   MonitorElement* scPhi_EB; */
-/*   MonitorElement* scPhi_EE; */
-	
-  //sc sigma eta_eta and eta phi
-	
-  MonitorElement* scSigmaIetaIeta_EB;
-  MonitorElement* scSigmaIetaIeta_EE;
-
-  MonitorElement* scSigmaIetaIphi_EB;
-  MonitorElement* scSigmaIetaIphi_EE;
-
-  //R9 
-  MonitorElement* r9_EB; 
-  MonitorElement* r9_EE;
-	
+  /*   MonitorElement* scPhi_EB; */
+  /*   MonitorElement* scPhi_EE; */
+
+  // sc sigma eta_eta and eta phi
+
+  MonitorElement *scSigmaIetaIeta_EB;
+  MonitorElement *scSigmaIetaIeta_EE;
+
+  MonitorElement *scSigmaIetaIphi_EB;
+  MonitorElement *scSigmaIetaIphi_EE;
+
+  // R9
+  MonitorElement *r9_EB;
+  MonitorElement *r9_EE;
+
   edm::ESHandle<CaloGeometry> geomH;
   edm::ESHandle<CaloTopology> caloTop;
 
-  edm::EDGetTokenT<reco::VertexCollection> VertexCollection_; //vertex collection
-	
-  edm::EDGetTokenT<edm::View<reco::CaloCluster> > basicClusterCollection_EB_; // Ecal Barrel Basic Clusters 
-  edm::EDGetTokenT<edm::View<reco::CaloCluster> > basicClusterCollection_EE_; // Ecal Endcap Basic Clusters
-  edm::EDGetTokenT<edm::View<reco::CaloCluster> > basicClusterCollection_; // Ecal Barrel & Endcap Basic Clusters (for >= 70X, BC collection is merged)
+  edm::EDGetTokenT<reco::VertexCollection> VertexCollection_;  // vertex collection
+
+  edm::EDGetTokenT<edm::View<reco::CaloCluster>> basicClusterCollection_EB_;  // Ecal Barrel Basic Clusters
+  edm::EDGetTokenT<edm::View<reco::CaloCluster>> basicClusterCollection_EE_;  // Ecal Endcap Basic Clusters
+  edm::EDGetTokenT<edm::View<reco::CaloCluster>> basicClusterCollection_;  // Ecal Barrel & Endcap Basic Clusters (for >=
+                                                                           // 70X, BC collection is merged)
 
   edm::EDGetTokenT<reco::SuperClusterCollection> superClusterCollection_EB_;
   edm::EDGetTokenT<reco::SuperClusterCollection> superClusterCollection_EE_;
   edm::EDGetTokenT<reco::GsfElectronCollection> EleTag_;
-	
+
   edm::EDGetTokenT<EcalRecHitCollection> RecHitCollection_EB_;
   edm::EDGetTokenT<EcalRecHitCollection> RecHitCollection_EE_;
 };
diff --git a/DQMOffline/Ecal/plugins/ECALMultifitAnalyzer_HI.cc b/DQMOffline/Ecal/plugins/ECALMultifitAnalyzer_HI.cc
index 51777509f5fee..8828196c0299d 100644
--- a/DQMOffline/Ecal/plugins/ECALMultifitAnalyzer_HI.cc
+++ b/DQMOffline/Ecal/plugins/ECALMultifitAnalyzer_HI.cc
@@ -3,7 +3,8 @@
 // Package:    DQMOffline/ECALMultifitAnalyzer_HI
 // Class:      ECALMultifitAnalyzer_HI
 //
-/**\class ECALMultifitAnalyzer_HI ECALMultifitAnalyzer_HI.cc DQMOffline/ECALMultifitAnalyzer_HI/plugins/ECALMultifitAnalyzer_HI.cc
+/**\class ECALMultifitAnalyzer_HI ECALMultifitAnalyzer_HI.cc
+   DQMOffline/ECALMultifitAnalyzer_HI/plugins/ECALMultifitAnalyzer_HI.cc
    Description: [one line class summary]
    Implementation:
    [Notes on implementation]
@@ -16,15 +17,14 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <vector>
 
 // user include files
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -32,19 +32,19 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
-#include "DataFormats/JetReco/interface/CaloJetCollection.h"
 #include "DataFormats/EgammaCandidates/interface/Photon.h"
+#include "DataFormats/JetReco/interface/CaloJetCollection.h"
 
 #include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
-#include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloTopology/interface/CaloTopology.h"
+#include "Geometry/Records/interface/CaloGeometryRecord.h"
 
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DataFormats/Math/interface/deltaR.h"
 
@@ -54,16 +54,16 @@
 // class declaration
 //
 
-class ECALMultifitAnalyzer_HI : public DQMEDAnalyzer  {
+class ECALMultifitAnalyzer_HI : public DQMEDAnalyzer {
 public:
-  explicit ECALMultifitAnalyzer_HI(const edm::ParameterSet&);
+  explicit ECALMultifitAnalyzer_HI(const edm::ParameterSet &);
   ~ECALMultifitAnalyzer_HI() override {}
 
 private:
-  void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
-  edm::EDGetTokenT<std::vector<reco::Photon> > recoPhotonsCollection_;
+  edm::EDGetTokenT<std::vector<reco::Photon>> recoPhotonsCollection_;
   edm::EDGetTokenT<reco::CaloJetCollection> caloJetToken_;
   edm::EDGetTokenT<EcalRecHitCollection> RecHitCollection_EB_;
   edm::EDGetTokenT<EcalRecHitCollection> RecHitCollection_EE_;
@@ -73,67 +73,63 @@ class ECALMultifitAnalyzer_HI : public DQMEDAnalyzer  {
   double mRecoJetPtThreshold;
   double mDeltaRPhotonThreshold;
   double mDeltaRJetThreshold;
-  
-  MonitorElement * eb_chi2;
-  MonitorElement * eb_chi2_eta;
-  MonitorElement * eb_chi2_e5;
-  MonitorElement * eb_chi2_e5_eta;
-  MonitorElement * eb_errors;
-  MonitorElement * eb_errors_eta;
-  MonitorElement * eb_errors_e5;
-  MonitorElement * eb_errors_e5_eta;
-  MonitorElement * eb_chi2_photon15;
-  MonitorElement * eb_errors_photon15;
-  MonitorElement * eb_chi2_jet30;
-  MonitorElement * eb_errors_jet30;
-
-  MonitorElement * ee_chi2;
-  MonitorElement * ee_chi2_eta;
-  MonitorElement * ee_chi2_e5;
-  MonitorElement * ee_chi2_e5_eta;
-  MonitorElement * ee_errors;
-  MonitorElement * ee_errors_eta;
-  MonitorElement * ee_errors_e5;
-  MonitorElement * ee_errors_e5_eta;
-  MonitorElement * ee_chi2_photon15;
-  MonitorElement * ee_errors_photon15;
-  MonitorElement * ee_chi2_jet30;
-  MonitorElement * ee_errors_jet30;
+
+  MonitorElement *eb_chi2;
+  MonitorElement *eb_chi2_eta;
+  MonitorElement *eb_chi2_e5;
+  MonitorElement *eb_chi2_e5_eta;
+  MonitorElement *eb_errors;
+  MonitorElement *eb_errors_eta;
+  MonitorElement *eb_errors_e5;
+  MonitorElement *eb_errors_e5_eta;
+  MonitorElement *eb_chi2_photon15;
+  MonitorElement *eb_errors_photon15;
+  MonitorElement *eb_chi2_jet30;
+  MonitorElement *eb_errors_jet30;
+
+  MonitorElement *ee_chi2;
+  MonitorElement *ee_chi2_eta;
+  MonitorElement *ee_chi2_e5;
+  MonitorElement *ee_chi2_e5_eta;
+  MonitorElement *ee_errors;
+  MonitorElement *ee_errors_eta;
+  MonitorElement *ee_errors_e5;
+  MonitorElement *ee_errors_e5_eta;
+  MonitorElement *ee_chi2_photon15;
+  MonitorElement *ee_errors_photon15;
+  MonitorElement *ee_chi2_jet30;
+  MonitorElement *ee_errors_jet30;
 };
 
 //
 // constructors and destructor
 //
-ECALMultifitAnalyzer_HI::ECALMultifitAnalyzer_HI(const edm::ParameterSet& iConfig):
-
-  recoPhotonsCollection_(consumes<std::vector<reco::Photon> > (iConfig.getParameter<edm::InputTag>("recoPhotonSrc"))),
-  caloJetToken_(consumes<reco::CaloJetCollection>             (iConfig.getParameter<edm::InputTag> ("recoJetSrc"))),
-  RecHitCollection_EB_(consumes<EcalRecHitCollection>         (iConfig.getParameter<edm::InputTag>("RecHitCollection_EB"))),
-  RecHitCollection_EE_(consumes<EcalRecHitCollection>         (iConfig.getParameter<edm::InputTag>("RecHitCollection_EE"))),
-  mRechitEnergyThreshold                                      (iConfig.getParameter<double> ("rechitEnergyThreshold")),
-  mRecoPhotonPtThreshold                                      (iConfig.getParameter<double> ("recoPhotonPtThreshold")),
-  mRecoJetPtThreshold                                         (iConfig.getParameter<double> ("recoJetPtThreshold")),
-  mDeltaRPhotonThreshold                                      (iConfig.getParameter<double> ("deltaRPhotonThreshold")),
-  mDeltaRJetThreshold                                         (iConfig.getParameter<double> ("deltaRJetThreshold"))
-{
-  
-}
+ECALMultifitAnalyzer_HI::ECALMultifitAnalyzer_HI(const edm::ParameterSet &iConfig)
+    :
+
+      recoPhotonsCollection_(consumes<std::vector<reco::Photon>>(iConfig.getParameter<edm::InputTag>("recoPhotonSrc"))),
+      caloJetToken_(consumes<reco::CaloJetCollection>(iConfig.getParameter<edm::InputTag>("recoJetSrc"))),
+      RecHitCollection_EB_(consumes<EcalRecHitCollection>(iConfig.getParameter<edm::InputTag>("RecHitCollection_EB"))),
+      RecHitCollection_EE_(consumes<EcalRecHitCollection>(iConfig.getParameter<edm::InputTag>("RecHitCollection_EE"))),
+      mRechitEnergyThreshold(iConfig.getParameter<double>("rechitEnergyThreshold")),
+      mRecoPhotonPtThreshold(iConfig.getParameter<double>("recoPhotonPtThreshold")),
+      mRecoJetPtThreshold(iConfig.getParameter<double>("recoJetPtThreshold")),
+      mDeltaRPhotonThreshold(iConfig.getParameter<double>("deltaRPhotonThreshold")),
+      mDeltaRJetThreshold(iConfig.getParameter<double>("deltaRJetThreshold")) {}
 
 //
 // member functions
 //
 
 // ------------ method called for each event  ------------
-void ECALMultifitAnalyzer_HI::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-
+void ECALMultifitAnalyzer_HI::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace edm;
-  
+
   edm::ESHandle<CaloGeometry> geomH;
   iSetup.get<CaloGeometryRecord>().get(geomH);
-  const CaloGeometry* geom = geomH.product();
+  const CaloGeometry *geom = geomH.product();
 
-  Handle<std::vector<reco::Photon> > recoPhotonsHandle;
+  Handle<std::vector<reco::Photon>> recoPhotonsHandle;
   iEvent.getByToken(recoPhotonsCollection_, recoPhotonsHandle);
 
   Handle<reco::CaloJetCollection> recoJetHandle;
@@ -145,84 +141,81 @@ void ECALMultifitAnalyzer_HI::analyze(const edm::Event& iEvent, const edm::Event
   Handle<EcalRecHitCollection> eeHandle;
   iEvent.getByToken(RecHitCollection_EE_, eeHandle);
 
-  for(EcalRecHitCollection::const_iterator hit = ebHandle->begin(); hit != ebHandle->end(); ++hit) {
-    eb_chi2->Fill(hit->chi2() );
-    eb_errors->Fill(hit->energyError() );
+  for (EcalRecHitCollection::const_iterator hit = ebHandle->begin(); hit != ebHandle->end(); ++hit) {
+    eb_chi2->Fill(hit->chi2());
+    eb_errors->Fill(hit->energyError());
     double eta = geom->getGeometry(hit->detid())->getPosition().eta();
     double phi = geom->getGeometry(hit->detid())->getPosition().phi();
-    eb_chi2_eta->Fill(eta, hit->chi2() );
-    eb_errors_eta->Fill(eta, hit->energyError() );
-    if(hit->energy() > mRechitEnergyThreshold)
-    {
-      eb_chi2_e5->Fill(hit->chi2() );
-      eb_errors_e5->Fill(hit->energyError() );
-      eb_chi2_e5_eta->Fill(eta, hit->chi2() );
-      eb_errors_e5_eta->Fill(eta, hit->energyError() );
+    eb_chi2_eta->Fill(eta, hit->chi2());
+    eb_errors_eta->Fill(eta, hit->energyError());
+    if (hit->energy() > mRechitEnergyThreshold) {
+      eb_chi2_e5->Fill(hit->chi2());
+      eb_errors_e5->Fill(hit->energyError());
+      eb_chi2_e5_eta->Fill(eta, hit->chi2());
+      eb_errors_e5_eta->Fill(eta, hit->energyError());
     }
 
-    for (std::vector<reco::Photon>::const_iterator pho = recoPhotonsHandle->begin(); pho != recoPhotonsHandle->end(); ++pho) {
-      if(pho->et() < mRecoPhotonPtThreshold ) continue;
+    for (std::vector<reco::Photon>::const_iterator pho = recoPhotonsHandle->begin(); pho != recoPhotonsHandle->end();
+         ++pho) {
+      if (pho->et() < mRecoPhotonPtThreshold)
+        continue;
       double dr = reco::deltaR(eta, phi, pho->eta(), pho->phi());
-      if(dr < mDeltaRPhotonThreshold)
-      {
-	eb_chi2_photon15->Fill(hit->chi2() );
-	eb_errors_photon15->Fill(hit->energyError() );
+      if (dr < mDeltaRPhotonThreshold) {
+        eb_chi2_photon15->Fill(hit->chi2());
+        eb_errors_photon15->Fill(hit->energyError());
       }
     }
     for (std::vector<reco::CaloJet>::const_iterator jet = recoJetHandle->begin(); jet != recoJetHandle->end(); ++jet) {
-      if(jet->pt() < mRecoJetPtThreshold ) continue;
+      if (jet->pt() < mRecoJetPtThreshold)
+        continue;
       double dr = reco::deltaR(eta, phi, jet->eta(), jet->phi());
-      if(dr < mDeltaRJetThreshold)
-      {
-	eb_chi2_jet30->Fill(hit->chi2() );
-	eb_errors_jet30->Fill(hit->energyError() );
+      if (dr < mDeltaRJetThreshold) {
+        eb_chi2_jet30->Fill(hit->chi2());
+        eb_errors_jet30->Fill(hit->energyError());
       }
     }
   }
 
-  for(EcalRecHitCollection::const_iterator hit = eeHandle->begin(); hit != eeHandle->end(); ++hit) {
-    ee_chi2->Fill(hit->chi2() );
-    ee_errors->Fill(hit->energyError() );
+  for (EcalRecHitCollection::const_iterator hit = eeHandle->begin(); hit != eeHandle->end(); ++hit) {
+    ee_chi2->Fill(hit->chi2());
+    ee_errors->Fill(hit->energyError());
     double eta = geom->getGeometry(hit->detid())->getPosition().eta();
     double phi = geom->getGeometry(hit->detid())->getPosition().phi();
-    ee_chi2_eta->Fill(eta, hit->chi2() );
-    ee_errors_eta->Fill(eta, hit->energyError() );
-    if(hit->energy() > mRechitEnergyThreshold)
-    {
-      ee_chi2_e5->Fill(hit->chi2() );
-      ee_errors_e5->Fill(hit->energyError() );
-      ee_chi2_e5_eta->Fill(eta, hit->chi2() );
-      ee_errors_e5_eta->Fill(eta, hit->energyError() );
+    ee_chi2_eta->Fill(eta, hit->chi2());
+    ee_errors_eta->Fill(eta, hit->energyError());
+    if (hit->energy() > mRechitEnergyThreshold) {
+      ee_chi2_e5->Fill(hit->chi2());
+      ee_errors_e5->Fill(hit->energyError());
+      ee_chi2_e5_eta->Fill(eta, hit->chi2());
+      ee_errors_e5_eta->Fill(eta, hit->energyError());
     }
 
-    for (std::vector<reco::Photon>::const_iterator pho = recoPhotonsHandle->begin(); pho != recoPhotonsHandle->end(); ++pho) {
-      if(pho->et() < mRecoPhotonPtThreshold ) continue;
+    for (std::vector<reco::Photon>::const_iterator pho = recoPhotonsHandle->begin(); pho != recoPhotonsHandle->end();
+         ++pho) {
+      if (pho->et() < mRecoPhotonPtThreshold)
+        continue;
       double dr = reco::deltaR(eta, phi, pho->eta(), pho->phi());
-      if(dr < mDeltaRPhotonThreshold)
-      {
-	ee_chi2_photon15->Fill(hit->chi2() );
-	ee_errors_photon15->Fill(hit->energyError() );
+      if (dr < mDeltaRPhotonThreshold) {
+        ee_chi2_photon15->Fill(hit->chi2());
+        ee_errors_photon15->Fill(hit->energyError());
       }
     }
     for (std::vector<reco::CaloJet>::const_iterator jet = recoJetHandle->begin(); jet != recoJetHandle->end(); ++jet) {
-      if(jet->pt() < mRecoJetPtThreshold ) continue;
+      if (jet->pt() < mRecoJetPtThreshold)
+        continue;
       double dr = reco::deltaR(eta, phi, jet->eta(), jet->phi());
-      if(dr < mDeltaRJetThreshold)
-      {
-	ee_chi2_jet30->Fill(hit->chi2() );
-	ee_errors_jet30->Fill(hit->energyError() );
+      if (dr < mDeltaRJetThreshold) {
+        ee_chi2_jet30->Fill(hit->chi2());
+        ee_errors_jet30->Fill(hit->energyError());
       }
     }
   }
 }
 
-
-// ------------ method called once each job just before starting event loop  ------------
-void
-ECALMultifitAnalyzer_HI::bookHistograms(DQMStore::IBooker& iBooker, edm::Run const&, edm::EventSetup const&)
-{
-
-  iBooker.setCurrentFolder ("EcalCalibration/HIN_MultiFitAnalyzer");
+// ------------ method called once each job just before starting event loop
+// ------------
+void ECALMultifitAnalyzer_HI::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, edm::EventSetup const &) {
+  iBooker.setCurrentFolder("EcalCalibration/HIN_MultiFitAnalyzer");
 
   eb_chi2 = nullptr;
   eb_chi2_eta = nullptr;
@@ -254,40 +247,86 @@ ECALMultifitAnalyzer_HI::bookHistograms(DQMStore::IBooker& iBooker, edm::Run con
   const float maxChi2 = 70;
   const float maxError = 0.5;
 
-  TH2F * hProfile_Chi2 = new TH2F("hProfile_Chi2","",nBins, -5, 5, nBins, 0, maxChi2);
-  TH2F * hProfile_Err = new TH2F("hProfile_Err","",nBins, -5, 5, nBins, 0, maxError);
+  TH2F *hProfile_Chi2 = new TH2F("hProfile_Chi2", "", nBins, -5, 5, nBins, 0, maxChi2);
+  TH2F *hProfile_Err = new TH2F("hProfile_Err", "", nBins, -5, 5, nBins, 0, maxError);
 
-  eb_chi2 = iBooker.book1D("rechit_eb_chi2","Rechit eb_chi2;chi2 fit value;",nBins,0,maxChi2);
+  eb_chi2 = iBooker.book1D("rechit_eb_chi2", "Rechit eb_chi2;chi2 fit value;", nBins, 0, maxChi2);
   eb_chi2_eta = iBooker.book2D("rechit_eb_eta_Vs_mean_Chi2", hProfile_Chi2);
-  eb_chi2_e5 = iBooker.book1D(Form("rechit_eb_chi2_e%2.0f", mRechitEnergyThreshold),Form("Rechit eb_chi2, e>%2.0fGeV;chi2 fit value;", mRechitEnergyThreshold),nBins,0,maxChi2);
-  eb_chi2_e5_eta = iBooker.book2D(Form("rechit_eb_chi2_e%2.0f_eta", mRechitEnergyThreshold),hProfile_Chi2);
-  eb_errors = iBooker.book1D("rechit_eb_errors","Rechit eb_errors;error on the energy;",nBins,0,maxError);
-  eb_errors_eta = iBooker.book2D("rechit_eb_errors_eta",hProfile_Err);
-  eb_errors_e5 = iBooker.book1D(Form("rechit_eb_errors_e%2.0f", mRechitEnergyThreshold),"Rechit eb_errors, e>5GeV;error on the energy;",nBins,0,maxError);
-  eb_errors_e5_eta = iBooker.book2D(Form("rechit_eb_errors_e%2.0f_eta", mRechitEnergyThreshold),hProfile_Err);
-  eb_chi2_photon15 = iBooker.book1D(Form("rechit_eb_chi2_photon%2.0f", mRecoPhotonPtThreshold),"Rechit eb_chi2 near photons;chi2 fit value;",nBins,0,maxChi2);
-  eb_errors_photon15 = iBooker.book1D(Form("rechit_eb_errors_photon%2.0f", mRecoPhotonPtThreshold),"Rechit eb_errors near photons;error on the energy;",nBins,0,maxError);
-  eb_chi2_jet30 = iBooker.book1D(Form("rechit_eb_chi2_jet%2.0f", mRecoJetPtThreshold),"Rechit eb_chi2 near jets;chi2 fit value;",nBins,0,maxChi2);
-  eb_errors_jet30 = iBooker.book1D(Form("rechit_eb_errors_jet%2.0f", mRecoJetPtThreshold),"Rechit eb_errors near jets;error on the energy;",nBins,0,maxError);
-
-  ee_chi2 = iBooker.book1D("rechit_ee_chi2","Rechit ee_chi2;chi2 fit value;",nBins,0,maxChi2);
-  ee_chi2_eta = iBooker.book2D("rechit_ee_chi2_eta",hProfile_Chi2);
-  ee_chi2_e5 = iBooker.book1D(Form("rechit_ee_chi2_e%2.0f", mRechitEnergyThreshold),"Rechit ee_chi2, e>5GeV;chi2 fit value;",nBins,0,maxChi2);
-  ee_chi2_e5_eta = iBooker.book2D(Form("rechit_ee_chi2_e%2.0f_eta", mRechitEnergyThreshold),hProfile_Chi2);
-  ee_errors = iBooker.book1D("rechit_ee_errors","Rechit ee_errors;error on the energy;",nBins,0,maxError);
-  ee_errors_eta = iBooker.book2D("rechit_ee_errors_eta",hProfile_Err);
-  ee_errors_e5 = iBooker.book1D(Form("rechit_ee_errors_e%2.0f", mRechitEnergyThreshold),"Rechit ee_errors, e>5GeV;error on the energy;",nBins,0,maxError);
-  ee_errors_e5_eta = iBooker.book2D(Form("rechit_ee_errors_e%2.0f_eta", mRechitEnergyThreshold),hProfile_Err);
-  ee_chi2_photon15 = iBooker.book1D(Form("rechit_ee_chi2_photon%2.0f", mRecoPhotonPtThreshold),"Rechit ee_chi2 near photons;chi2 fit value;",nBins,0,maxChi2);
-  ee_errors_photon15 = iBooker.book1D(Form("rechit_ee_errors_photon%2.0f", mRecoPhotonPtThreshold),"Rechit ee_errors near photons;error on the energy;",nBins,0,maxError);
-  ee_chi2_jet30 = iBooker.book1D(Form("rechit_ee_chi2_jet%2.0f", mRecoJetPtThreshold),"Rechit ee_chi2 near jets;chi2 fit value;",nBins,0,maxChi2);
-  ee_errors_jet30 = iBooker.book1D(Form("rechit_ee_errors_jet%2.0f", mRecoJetPtThreshold),"Rechit ee_errors near jets;error on the energy;",nBins,0,maxError);
+  eb_chi2_e5 = iBooker.book1D(Form("rechit_eb_chi2_e%2.0f", mRechitEnergyThreshold),
+                              Form("Rechit eb_chi2, e>%2.0fGeV;chi2 fit value;", mRechitEnergyThreshold),
+                              nBins,
+                              0,
+                              maxChi2);
+  eb_chi2_e5_eta = iBooker.book2D(Form("rechit_eb_chi2_e%2.0f_eta", mRechitEnergyThreshold), hProfile_Chi2);
+  eb_errors = iBooker.book1D("rechit_eb_errors", "Rechit eb_errors;error on the energy;", nBins, 0, maxError);
+  eb_errors_eta = iBooker.book2D("rechit_eb_errors_eta", hProfile_Err);
+  eb_errors_e5 = iBooker.book1D(Form("rechit_eb_errors_e%2.0f", mRechitEnergyThreshold),
+                                "Rechit eb_errors, e>5GeV;error on the energy;",
+                                nBins,
+                                0,
+                                maxError);
+  eb_errors_e5_eta = iBooker.book2D(Form("rechit_eb_errors_e%2.0f_eta", mRechitEnergyThreshold), hProfile_Err);
+  eb_chi2_photon15 = iBooker.book1D(Form("rechit_eb_chi2_photon%2.0f", mRecoPhotonPtThreshold),
+                                    "Rechit eb_chi2 near photons;chi2 fit value;",
+                                    nBins,
+                                    0,
+                                    maxChi2);
+  eb_errors_photon15 = iBooker.book1D(Form("rechit_eb_errors_photon%2.0f", mRecoPhotonPtThreshold),
+                                      "Rechit eb_errors near photons;error on the energy;",
+                                      nBins,
+                                      0,
+                                      maxError);
+  eb_chi2_jet30 = iBooker.book1D(Form("rechit_eb_chi2_jet%2.0f", mRecoJetPtThreshold),
+                                 "Rechit eb_chi2 near jets;chi2 fit value;",
+                                 nBins,
+                                 0,
+                                 maxChi2);
+  eb_errors_jet30 = iBooker.book1D(Form("rechit_eb_errors_jet%2.0f", mRecoJetPtThreshold),
+                                   "Rechit eb_errors near jets;error on the energy;",
+                                   nBins,
+                                   0,
+                                   maxError);
+
+  ee_chi2 = iBooker.book1D("rechit_ee_chi2", "Rechit ee_chi2;chi2 fit value;", nBins, 0, maxChi2);
+  ee_chi2_eta = iBooker.book2D("rechit_ee_chi2_eta", hProfile_Chi2);
+  ee_chi2_e5 = iBooker.book1D(Form("rechit_ee_chi2_e%2.0f", mRechitEnergyThreshold),
+                              "Rechit ee_chi2, e>5GeV;chi2 fit value;",
+                              nBins,
+                              0,
+                              maxChi2);
+  ee_chi2_e5_eta = iBooker.book2D(Form("rechit_ee_chi2_e%2.0f_eta", mRechitEnergyThreshold), hProfile_Chi2);
+  ee_errors = iBooker.book1D("rechit_ee_errors", "Rechit ee_errors;error on the energy;", nBins, 0, maxError);
+  ee_errors_eta = iBooker.book2D("rechit_ee_errors_eta", hProfile_Err);
+  ee_errors_e5 = iBooker.book1D(Form("rechit_ee_errors_e%2.0f", mRechitEnergyThreshold),
+                                "Rechit ee_errors, e>5GeV;error on the energy;",
+                                nBins,
+                                0,
+                                maxError);
+  ee_errors_e5_eta = iBooker.book2D(Form("rechit_ee_errors_e%2.0f_eta", mRechitEnergyThreshold), hProfile_Err);
+  ee_chi2_photon15 = iBooker.book1D(Form("rechit_ee_chi2_photon%2.0f", mRecoPhotonPtThreshold),
+                                    "Rechit ee_chi2 near photons;chi2 fit value;",
+                                    nBins,
+                                    0,
+                                    maxChi2);
+  ee_errors_photon15 = iBooker.book1D(Form("rechit_ee_errors_photon%2.0f", mRecoPhotonPtThreshold),
+                                      "Rechit ee_errors near photons;error on the energy;",
+                                      nBins,
+                                      0,
+                                      maxError);
+  ee_chi2_jet30 = iBooker.book1D(Form("rechit_ee_chi2_jet%2.0f", mRecoJetPtThreshold),
+                                 "Rechit ee_chi2 near jets;chi2 fit value;",
+                                 nBins,
+                                 0,
+                                 maxChi2);
+  ee_errors_jet30 = iBooker.book1D(Form("rechit_ee_errors_jet%2.0f", mRecoJetPtThreshold),
+                                   "Rechit ee_errors near jets;error on the energy;",
+                                   nBins,
+                                   0,
+                                   maxError);
 
   delete hProfile_Chi2;
   delete hProfile_Err;
-
 }
 
-
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(ECALMultifitAnalyzer_HI);
diff --git a/DQMOffline/Ecal/plugins/ESRecoSummary.cc b/DQMOffline/Ecal/plugins/ESRecoSummary.cc
index 2fee1a3578fcf..acc93a66b3f35 100644
--- a/DQMOffline/Ecal/plugins/ESRecoSummary.cc
+++ b/DQMOffline/Ecal/plugins/ESRecoSummary.cc
@@ -3,11 +3,11 @@
 // Package:    ESRecoSummary
 // Class:      ESRecoSummary
 // Original Author:  Martina Malberti
-// 
+//
 // system include files
-#include <memory>
-#include <iostream>
 #include <cmath>
+#include <iostream>
+#include <memory>
 
 // user include files
 #include "DQMOffline/Ecal/interface/ESRecoSummary.h"
@@ -19,52 +19,51 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "Geometry/CaloTopology/interface/CaloTopology.h"
+#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
+#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
 #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h"
-#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
+#include "Geometry/CaloTopology/interface/CaloTopology.h"
 
 #include "DataFormats/EcalDetId/interface/ESDetId.h"
-#include "DataFormats/EgammaReco/interface/SuperCluster.h"
 #include "DataFormats/EgammaReco/interface/BasicCluster.h"
 #include "DataFormats/EgammaReco/interface/BasicClusterFwd.h"
 #include "DataFormats/EgammaReco/interface/PreshowerCluster.h"
+#include "DataFormats/EgammaReco/interface/SuperCluster.h"
 #include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h"
 #include "RecoEcal/EgammaCoreTools/interface/EcalTools.h"
-#include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgo.h"
 #include "RecoLocalCalo/EcalRecAlgos/interface/EcalCleaningAlgo.h"
+#include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgo.h"
 
 //
 // constructors and destructor
 //
-ESRecoSummary::ESRecoSummary(const edm::ParameterSet& ps)
-{
+ESRecoSummary::ESRecoSummary(const edm::ParameterSet &ps) {
   prefixME_ = ps.getUntrackedParameter<std::string>("prefixME", "");
 
-  //now do what ever initialization is needed
-  esRecHitCollection_        = consumes<ESRecHitCollection>(ps.getParameter<edm::InputTag>("recHitCollection_ES"));
-  esClusterCollectionX_      = consumes<reco::PreshowerClusterCollection>(ps.getParameter<edm::InputTag>("ClusterCollectionX_ES"));
-  esClusterCollectionY_      = consumes<reco::PreshowerClusterCollection>(ps.getParameter<edm::InputTag>("ClusterCollectionY_ES"));
+  // now do what ever initialization is needed
+  esRecHitCollection_ = consumes<ESRecHitCollection>(ps.getParameter<edm::InputTag>("recHitCollection_ES"));
+  esClusterCollectionX_ =
+      consumes<reco::PreshowerClusterCollection>(ps.getParameter<edm::InputTag>("ClusterCollectionX_ES"));
+  esClusterCollectionY_ =
+      consumes<reco::PreshowerClusterCollection>(ps.getParameter<edm::InputTag>("ClusterCollectionY_ES"));
 
-  superClusterCollection_EE_ = consumes<reco::SuperClusterCollection>(ps.getParameter<edm::InputTag>("superClusterCollection_EE"));
+  superClusterCollection_EE_ =
+      consumes<reco::SuperClusterCollection>(ps.getParameter<edm::InputTag>("superClusterCollection_EE"));
 }
 
-void
-ESRecoSummary::bookHistograms(DQMStore::IBooker& iBooker, edm::Run const&, edm::EventSetup const&)
-{
-    // Monitor Elements (ex THXD)
-  iBooker.setCurrentFolder(prefixME_ + "/ESRecoSummary"); // to organise the histos in folders
+void ESRecoSummary::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, edm::EventSetup const &) {
+  // Monitor Elements (ex THXD)
+  iBooker.setCurrentFolder(prefixME_ + "/ESRecoSummary");  // to organise the histos in folders
 
-     
   // Preshower ----------------------------------------------
-  h_recHits_ES_energyMax      = iBooker.book1D("recHits_ES_energyMax","recHits_ES_energyMax",200,0.,0.01);
-  h_recHits_ES_time           = iBooker.book1D("recHits_ES_time","recHits_ES_time",200,-100.,100.);
+  h_recHits_ES_energyMax = iBooker.book1D("recHits_ES_energyMax", "recHits_ES_energyMax", 200, 0., 0.01);
+  h_recHits_ES_time = iBooker.book1D("recHits_ES_time", "recHits_ES_time", 200, -100., 100.);
 
-  h_esClusters_energy_plane1 = iBooker.book1D("esClusters_energy_plane1","esClusters_energy_plane1",200,0.,0.01);
-  h_esClusters_energy_plane2 = iBooker.book1D("esClusters_energy_plane2","esClusters_energy_plane2",200,0.,0.01);
-  h_esClusters_energy_ratio  = iBooker.book1D("esClusters_energy_ratio","esClusters_energy_ratio",200,0.,20.);
+  h_esClusters_energy_plane1 = iBooker.book1D("esClusters_energy_plane1", "esClusters_energy_plane1", 200, 0., 0.01);
+  h_esClusters_energy_plane2 = iBooker.book1D("esClusters_energy_plane2", "esClusters_energy_plane2", 200, 0., 0.01);
+  h_esClusters_energy_ratio = iBooker.book1D("esClusters_energy_ratio", "esClusters_energy_ratio", 200, 0., 20.);
 }
 
 //
@@ -72,90 +71,90 @@ ESRecoSummary::bookHistograms(DQMStore::IBooker& iBooker, edm::Run const&, edm::
 //
 
 // ------------ method called to for each event  ------------
-void ESRecoSummary::analyze(const edm::Event& ev, const edm::EventSetup&)
-{
-  //Preshower RecHits
+void ESRecoSummary::analyze(const edm::Event &ev, const edm::EventSetup &) {
+  // Preshower RecHits
   edm::Handle<ESRecHitCollection> recHitsES;
-  ev.getByToken (esRecHitCollection_, recHitsES) ;
-  const ESRecHitCollection* thePreShowerRecHits = recHitsES.product () ;
+  ev.getByToken(esRecHitCollection_, recHitsES);
+  const ESRecHitCollection *thePreShowerRecHits = recHitsES.product();
 
-  if ( ! recHitsES.isValid() ) {
-    std::cerr << "ESRecoSummary::analyze --> recHitsES not found" << std::endl; 
+  if (!recHitsES.isValid()) {
+    std::cerr << "ESRecoSummary::analyze --> recHitsES not found" << std::endl;
   }
 
   float maxRecHitEnergyES = -999.;
 
-  for (ESRecHitCollection::const_iterator esItr = thePreShowerRecHits->begin(); esItr != thePreShowerRecHits->end(); ++esItr) 
-    {
-      
-      h_recHits_ES_time   -> Fill(esItr->time()); 
-      if (esItr -> energy() > maxRecHitEnergyES ) maxRecHitEnergyES = esItr -> energy() ;
+  for (ESRecHitCollection::const_iterator esItr = thePreShowerRecHits->begin(); esItr != thePreShowerRecHits->end();
+       ++esItr) {
+    h_recHits_ES_time->Fill(esItr->time());
+    if (esItr->energy() > maxRecHitEnergyES)
+      maxRecHitEnergyES = esItr->energy();
 
-    } // end loop over ES rec Hits
+  }  // end loop over ES rec Hits
 
-  h_recHits_ES_energyMax -> Fill(maxRecHitEnergyES ); 
+  h_recHits_ES_energyMax->Fill(maxRecHitEnergyES);
 
   // ES clusters in X plane
   edm::Handle<reco::PreshowerClusterCollection> esClustersX;
-  ev.getByToken( esClusterCollectionX_, esClustersX);
+  ev.getByToken(esClusterCollectionX_, esClustersX);
   const reco::PreshowerClusterCollection *ESclustersX = esClustersX.product();
 
   // ES clusters in Y plane
   edm::Handle<reco::PreshowerClusterCollection> esClustersY;
-  ev.getByToken( esClusterCollectionY_, esClustersY);
-  const reco::PreshowerClusterCollection *ESclustersY = esClustersY.product(); 
-  
+  ev.getByToken(esClusterCollectionY_, esClustersY);
+  const reco::PreshowerClusterCollection *ESclustersY = esClustersY.product();
 
   // ... endcap
   edm::Handle<reco::SuperClusterCollection> superClusters_EE_h;
-  ev.getByToken( superClusterCollection_EE_, superClusters_EE_h );
-  const reco::SuperClusterCollection* theEndcapSuperClusters = superClusters_EE_h.product () ;
-  if ( ! superClusters_EE_h.isValid() ) {
-    std::cerr << "EcalRecHitSummary::analyze --> superClusters_EE_h not found" << std::endl; 
+  ev.getByToken(superClusterCollection_EE_, superClusters_EE_h);
+  const reco::SuperClusterCollection *theEndcapSuperClusters = superClusters_EE_h.product();
+  if (!superClusters_EE_h.isValid()) {
+    std::cerr << "EcalRecHitSummary::analyze --> superClusters_EE_h not found" << std::endl;
   }
 
   // loop over all super clusters
-  for (reco::SuperClusterCollection::const_iterator itSC = theEndcapSuperClusters->begin(); 
-       itSC != theEndcapSuperClusters->end(); ++itSC ) {
-    
-    if ( fabs(itSC->eta()) < 1.65 || fabs(itSC->eta()) > 2.6 ) continue;
-    
+  for (reco::SuperClusterCollection::const_iterator itSC = theEndcapSuperClusters->begin();
+       itSC != theEndcapSuperClusters->end();
+       ++itSC) {
+    if (fabs(itSC->eta()) < 1.65 || fabs(itSC->eta()) > 2.6)
+      continue;
+
     float ESenergyPlane1 = 0.;
     float ESenergyPlane2 = 0.;
 
-
     // Loop over all ECAL Basic clusters in the supercluster
-    for (reco::CaloCluster_iterator ecalBasicCluster = itSC->clustersBegin(); ecalBasicCluster!= itSC->clustersEnd(); 
-	 ecalBasicCluster++) {
+    for (reco::CaloCluster_iterator ecalBasicCluster = itSC->clustersBegin(); ecalBasicCluster != itSC->clustersEnd();
+         ecalBasicCluster++) {
       const reco::CaloClusterPtr ecalBasicClusterPtr = *(ecalBasicCluster);
-      
-      for (reco::PreshowerClusterCollection::const_iterator iESClus = ESclustersX->begin(); iESClus != ESclustersX->end(); 
-	   ++iESClus) {
+
+      for (reco::PreshowerClusterCollection::const_iterator iESClus = ESclustersX->begin();
+           iESClus != ESclustersX->end();
+           ++iESClus) {
         const reco::CaloClusterPtr preshBasicCluster = iESClus->basicCluster();
         const reco::PreshowerCluster *esCluster = &*iESClus;
         if (preshBasicCluster == ecalBasicClusterPtr) {
-	  ESenergyPlane1 += esCluster->energy();
-	}
+          ESenergyPlane1 += esCluster->energy();
+        }
       }  // end of x loop
-      
-      for (reco::PreshowerClusterCollection::const_iterator iESClus = ESclustersY->begin(); iESClus != ESclustersY->end(); 
-	   ++iESClus) {
+
+      for (reco::PreshowerClusterCollection::const_iterator iESClus = ESclustersY->begin();
+           iESClus != ESclustersY->end();
+           ++iESClus) {
         const reco::CaloClusterPtr preshBasicCluster = iESClus->basicCluster();
         const reco::PreshowerCluster *esCluster = &*iESClus;
         if (preshBasicCluster == ecalBasicClusterPtr) {
-	  ESenergyPlane2 += esCluster->energy();
-	}
-      } // end of y loop
-    } // end loop over all basic clusters in the supercluster
+          ESenergyPlane2 += esCluster->energy();
+        }
+      }  // end of y loop
+    }    // end loop over all basic clusters in the supercluster
 
-    //cout<<"DQM : "<<ESenergyPlane1<<" "<<ESenergyPlane2<<endl;
+    // cout<<"DQM : "<<ESenergyPlane1<<" "<<ESenergyPlane2<<endl;
     h_esClusters_energy_plane1->Fill(ESenergyPlane1);
     h_esClusters_energy_plane2->Fill(ESenergyPlane2);
-    if (ESenergyPlane1 > 0 && ESenergyPlane2 > 0) h_esClusters_energy_ratio -> Fill(ESenergyPlane1/ESenergyPlane2);
-      
-  }// end loop over superclusters
+    if (ESenergyPlane1 > 0 && ESenergyPlane2 > 0)
+      h_esClusters_energy_ratio->Fill(ESenergyPlane1 / ESenergyPlane2);
 
+  }  // end loop over superclusters
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(ESRecoSummary);
diff --git a/DQMOffline/Ecal/plugins/EcalPileUpDepMonitor.cc b/DQMOffline/Ecal/plugins/EcalPileUpDepMonitor.cc
index 893c26ba93492..8795f9744972d 100644
--- a/DQMOffline/Ecal/plugins/EcalPileUpDepMonitor.cc
+++ b/DQMOffline/Ecal/plugins/EcalPileUpDepMonitor.cc
@@ -8,21 +8,21 @@
 #include "DQMOffline/Ecal/interface/EcalPileUpDepMonitor.h"
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/EgammaReco/interface/SuperCluster.h"
-#include "DataFormats/EgammaReco/interface/BasicCluster.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
-#include "DataFormats/VertexReco/interface/Vertex.h"
+#include "DataFormats/EgammaReco/interface/BasicCluster.h"
+#include "DataFormats/EgammaReco/interface/SuperCluster.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
+#include "DataFormats/VertexReco/interface/Vertex.h"
 
 #include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
-#include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
+#include "Geometry/Records/interface/CaloGeometryRecord.h"
 
 #include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h"
 
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
@@ -30,409 +30,398 @@
 
 // Framework
 
-EcalPileUpDepMonitor::EcalPileUpDepMonitor(const edm::ParameterSet& ps)
-{
+EcalPileUpDepMonitor::EcalPileUpDepMonitor(const edm::ParameterSet &ps) {
   VertexCollection_ = consumes<reco::VertexCollection>(ps.getParameter<edm::InputTag>("VertexCollection"));
 
-  if(ps.existsAs<edm::InputTag>("basicClusterCollection") && !ps.getParameter<edm::InputTag>("basicClusterCollection").label().empty())
-    basicClusterCollection_ = consumes<edm::View<reco::CaloCluster> >(ps.getParameter<edm::InputTag>("basicClusterCollection"));
-  else{
-    basicClusterCollection_EE_ = consumes<edm::View<reco::CaloCluster> >(ps.getParameter<edm::InputTag>("basicClusterCollection_EE"));
-    basicClusterCollection_EB_ = consumes<edm::View<reco::CaloCluster> >(ps.getParameter<edm::InputTag>("basicClusterCollection_EB"));
+  if (ps.existsAs<edm::InputTag>("basicClusterCollection") &&
+      !ps.getParameter<edm::InputTag>("basicClusterCollection").label().empty())
+    basicClusterCollection_ =
+        consumes<edm::View<reco::CaloCluster>>(ps.getParameter<edm::InputTag>("basicClusterCollection"));
+  else {
+    basicClusterCollection_EE_ =
+        consumes<edm::View<reco::CaloCluster>>(ps.getParameter<edm::InputTag>("basicClusterCollection_EE"));
+    basicClusterCollection_EB_ =
+        consumes<edm::View<reco::CaloCluster>>(ps.getParameter<edm::InputTag>("basicClusterCollection_EB"));
   }
-  superClusterCollection_EB_ = consumes<reco::SuperClusterCollection>(ps.getParameter<edm::InputTag>("superClusterCollection_EB"));
-  superClusterCollection_EE_ = consumes<reco::SuperClusterCollection>(ps.getParameter<edm::InputTag>("superClusterCollection_EE"));
-	
-  RecHitCollection_EB_       = consumes<EcalRecHitCollection>(ps.getParameter<edm::InputTag>("RecHitCollection_EB"));
-  RecHitCollection_EE_       = consumes<EcalRecHitCollection>(ps.getParameter<edm::InputTag>("RecHitCollection_EE"));
-  EleTag_ = consumes<reco::GsfElectronCollection>(ps.getParameter<edm::InputTag>("EleTag")); 
+  superClusterCollection_EB_ =
+      consumes<reco::SuperClusterCollection>(ps.getParameter<edm::InputTag>("superClusterCollection_EB"));
+  superClusterCollection_EE_ =
+      consumes<reco::SuperClusterCollection>(ps.getParameter<edm::InputTag>("superClusterCollection_EE"));
+
+  RecHitCollection_EB_ = consumes<EcalRecHitCollection>(ps.getParameter<edm::InputTag>("RecHitCollection_EB"));
+  RecHitCollection_EE_ = consumes<EcalRecHitCollection>(ps.getParameter<edm::InputTag>("RecHitCollection_EE"));
+  EleTag_ = consumes<reco::GsfElectronCollection>(ps.getParameter<edm::InputTag>("EleTag"));
 }
 
-EcalPileUpDepMonitor::~EcalPileUpDepMonitor()
-{
-}
+EcalPileUpDepMonitor::~EcalPileUpDepMonitor() {}
 
-void EcalPileUpDepMonitor::bookHistograms(DQMStore::IBooker & ibooker,
-					  edm::Run const&,
-					  edm::EventSetup const& eventSetup)
-{
+void EcalPileUpDepMonitor::bookHistograms(DQMStore::IBooker &ibooker,
+                                          edm::Run const &,
+                                          edm::EventSetup const &eventSetup) {
   eventSetup.get<CaloGeometryRecord>().get(geomH);
   eventSetup.get<CaloTopologyRecord>().get(caloTop);
 
   ibooker.cd();
   ibooker.setCurrentFolder("Ecal/EcalPileUpDepMonitor");
 
-  std::string prof_name="bcEB_PV"; 
-  std::string title="Basic clusters EB vs. PV";
-  bcEB_PV=ibooker.bookProfile(prof_name,title,50,0.,50.,50,0.,350.);
-  bcEB_PV->setAxisTitle("N_{pv}",1); 
-  bcEB_PV->setAxisTitle("Basic Clusters", 2); 
-
-  prof_name="bcEE_PV"; 
-  title="Basic Clusters EE vs. PV"; 
-  bcEE_PV=ibooker.bookProfile(prof_name,title,50,0.,50.,50,0.,350.);
-  bcEE_PV->setAxisTitle("N_{pv}",1); 
-  bcEE_PV->setAxisTitle("Basic Clusters", 2); 
-	
-  prof_name="scEB_PV"; 
-  title="Super Clusters EB vs. PV"; 
-  scEB_PV=ibooker.bookProfile(prof_name,title,50,0.,50.,50,0.,350.);
-  scEB_PV->setAxisTitle("N_{pv}",1);
-  scEB_PV->setAxisTitle("Super Clusters", 2); 
-	
-  prof_name="scEE_PV"; 
-  title="Super Clusters EE vs. PV"; 
-  scEE_PV=ibooker.bookProfile(prof_name,title,50,0.,50.,50,0.,350.);
-  scEE_PV->setAxisTitle("N_{pv}",1);
-  scEE_PV->setAxisTitle("Super Clusters", 2); 
-	
-  prof_name="scEtEB_PV"; 
-  title="Super Clusters Et EB vs. PV"; 
-  scEtEB_PV=ibooker.bookProfile(prof_name,title,50,0.,50.,50,0.,350.);
-  scEtEB_PV->setAxisTitle("N_{pv}",1);
-  scEtEB_PV->setAxisTitle("Super Cluster E_{T} [GeV]", 2); 
-	
-	
-  prof_name="scEtEE_PV"; 
-  title="Super Clusters Et EE vs. PV"; 
-  scEtEE_PV=ibooker.bookProfile(prof_name,title,50,0.,50.,50,0.,350.);
-  scEtEE_PV->setAxisTitle("N_{pv}",1);
-  scEtEE_PV->setAxisTitle("Super Cluster E_{T} [GeV]", 2); 
-	
-  prof_name="recHitEtEB_PV"; 
-  title="Reconstructed Hit Et EB vs. PV"; 
-  recHitEtEB_PV=ibooker.bookProfile(prof_name,title,50,0.,50.,50,0.,350.);
-  recHitEtEB_PV->setAxisTitle("N_{pv}",1);
-  recHitEtEB_PV->setAxisTitle("Reconstructed hit E_{T} [GeV]", 2); 
-
-  prof_name="recHitEtEE_PV"; 
-  title="Reconstructed Hit Et EE vs. PV"; 
-  recHitEtEE_PV=ibooker.bookProfile(prof_name,title,50,0.,50.,50,0.,350.);
-  recHitEtEE_PV->setAxisTitle("N_{pv}",1);
-  recHitEtEE_PV->setAxisTitle("Reconstructed hit E_{T} [GeV]", 2); 
-	
-  prof_name="emIso_PV"; 
-  title="EM Isolation vs. PV"; 
-  emIso_PV=ibooker.bookProfile(prof_name,title,50,0.,50.,50,0.,350);
-  emIso_PV->setAxisTitle("N_{pv}",1);
-  emIso_PV->setAxisTitle("EM_{Isolation} [GeV]", 2); 
-	
-  prof_name="emIso"; 
-  title="EM Isolation"; 
-  emIso=ibooker.book1D(prof_name,title,50,0,50);
-  emIso->setAxisTitle("EM_{Isolation} [GeV]",1); 
-  emIso->setAxisTitle("Events",2); 
-	
-  prof_name="scHitEtEB"; 
-  title="Super Cluster Hit Et EB"; 
-  scHitEtEB=ibooker.book1D(prof_name,title,50,0,100);
-  scHitEtEB->setAxisTitle("super cluster hit E_{T} [GeV]",1); 
-  scHitEtEB->setAxisTitle("Events",2); 
-	
-  prof_name="scHitEtEE"; 
-  title="Super Cluster Hit Et EE"; 
-  scHitEtEE=ibooker.book1D(prof_name,title,50,0,100);
-  scHitEtEE->setAxisTitle("super cluster hit E_{T} [GeV]",1); 
-  scHitEtEE->setAxisTitle("Events",2); 
-
-	
-//   prof_name="scHitE_EB"; 
-//   title="Super Cluster Hit E EB"; 
-//   scHitE_EB=ibooker.book1D(prof_name,title,50,0,100);
-//   scHitE_EB->setAxisTitle("super cluster hit E [GeV]",1);
-//   scHitE_EB->setAxisTitle("Events",2); 
-
-	
-//   prof_name="scHitE_EE"; 
-//   title="Super Cluster Hit E EE"; 
-//   scHitE_EE=ibooker.book1D(prof_name,title,50,0,100);
-//   scHitE_EE->setAxisTitle("super cluster hit E [GeV]",1);
-//   scHitE_EE->setAxisTitle("Events",2); 
-	
-  //SC eta
-//   prof_name="scEta_EB"; 
-//   title="Super Cluster #eta EB"; 
-//   scEta_EB=ibooker.book1D(prof_name,title,50,-6,6);
-//   scEta_EB->setAxisTitle("#eta",1); 
-//   scEta_EB->setAxisTitle("Events",2); 
-	
-//   prof_name="scEta_EE"; 
-//   title="Super Cluster #eta EE"; 
-//   scEta_EE=ibooker.book1D(prof_name,title,50,-6,6);
-//   scEta_EE->setAxisTitle("#eta",1); 
-//   scEta_EE->setAxisTitle("Events",2); 
-	
-  //SC phi
-//   prof_name="scPhi_EB"; 
-//   title="Super Cluster #phi EB"; 
-//   scPhi_EB=ibooker.book1D(prof_name,title,50,-3.14,3.14);
-//   scPhi_EB->setAxisTitle("super cluster #phi",1); 
-//   scPhi_EB->setAxisTitle("Events",2); 
-	
-//   prof_name="scPhi_EE"; 
-//   title="Super Cluster #phi EE"; 
-//   scPhi_EE=ibooker.book1D(prof_name,title,50,-3.14,3.14);
-//   scPhi_EE->setAxisTitle("super cluster #phi",1); 
-//   scPhi_EE->setAxisTitle("Events",2); 
-	
-  //sc sigma eta eta / eta phi
-	
-  prof_name="scSigmaIetaIeta_EB"; 
-  title="Super Cluster sigmaIetaIeta EB"; 
-  scSigmaIetaIeta_EB=ibooker.book1D(prof_name,title,50,0,0.03);
-  scSigmaIetaIeta_EB->setAxisTitle("#sigma_{i#etai#eta}",1); 
-  scSigmaIetaIeta_EB->setAxisTitle("Events",2); 
-	
-  prof_name="scSigmaIetaIeta_EE"; 
-  title="Super Cluster sigmaIetaIeta EE"; 
-  scSigmaIetaIeta_EE=ibooker.book1D(prof_name,title,50,0,0.1);
-  scSigmaIetaIeta_EE->setAxisTitle("#sigma_{i#etai#eta}",1); 
-  scSigmaIetaIeta_EE->setAxisTitle("Events",2); 
-	
-  //phi
-  prof_name="scSigmaIetaIphi_EB"; 
-  title="Super Cluster sigmaIetaIphi EB"; 
-  scSigmaIetaIphi_EB=ibooker.book1D(prof_name,title,50,-5.e-4,5.e-4);
-  scSigmaIetaIphi_EB->setAxisTitle("#sigma_{i#etai#phi}",1); 
-  scSigmaIetaIphi_EB->setAxisTitle("Events",2); 
-	
-  prof_name="scSigmaIetaIphi_EE"; 
-  title="Super Cluster sigmaIetaIphi EE"; 
-  scSigmaIetaIphi_EE=ibooker.book1D(prof_name,title,50,-2.5e-3,2.5e-3);
-  scSigmaIetaIphi_EE->setAxisTitle("#sigma_{i#etai#phi}",1); 
-  scSigmaIetaIphi_EE->setAxisTitle("Events",2); 
-	
-  //R9
-  prof_name="r9_EB"; 
-  title="r9 EB"; 
-  r9_EB=ibooker.book1D(prof_name,title,50,0,1.5);
-  r9_EB->setAxisTitle("R_{9}",1);
-  r9_EB->setAxisTitle("Events",2); 
-	
-  prof_name="r9_EE"; 
-  title="r9 EE"; 
-  r9_EE=ibooker.book1D(prof_name,title,50,0,1.5);
-  r9_EE->setAxisTitle("R_{9}",1);
-  r9_EE->setAxisTitle("Events",2); 
-
-  //Rec Hit
-	
-  prof_name="recHitEtEB"; 
-  title="RecHit Et EB"; 
-  recHitEtEB=ibooker.book1D(prof_name,title,50,0,400);
-  recHitEtEB->setAxisTitle("Reconstructed Hit E_{T} [GeV]",1);
-  recHitEtEB->setAxisTitle("Events",2); 
-	
-  prof_name="recHitEtEE"; 
-  title="RecHit Et EE"; 
-  recHitEtEE=ibooker.book1D(prof_name,title,50,0,400);
-  recHitEtEE->setAxisTitle("Reconstructed Hit E_{T} [GeV]",1);
-  recHitEtEE->setAxisTitle("Events",2); 
+  std::string prof_name = "bcEB_PV";
+  std::string title = "Basic clusters EB vs. PV";
+  bcEB_PV = ibooker.bookProfile(prof_name, title, 50, 0., 50., 50, 0., 350.);
+  bcEB_PV->setAxisTitle("N_{pv}", 1);
+  bcEB_PV->setAxisTitle("Basic Clusters", 2);
+
+  prof_name = "bcEE_PV";
+  title = "Basic Clusters EE vs. PV";
+  bcEE_PV = ibooker.bookProfile(prof_name, title, 50, 0., 50., 50, 0., 350.);
+  bcEE_PV->setAxisTitle("N_{pv}", 1);
+  bcEE_PV->setAxisTitle("Basic Clusters", 2);
+
+  prof_name = "scEB_PV";
+  title = "Super Clusters EB vs. PV";
+  scEB_PV = ibooker.bookProfile(prof_name, title, 50, 0., 50., 50, 0., 350.);
+  scEB_PV->setAxisTitle("N_{pv}", 1);
+  scEB_PV->setAxisTitle("Super Clusters", 2);
+
+  prof_name = "scEE_PV";
+  title = "Super Clusters EE vs. PV";
+  scEE_PV = ibooker.bookProfile(prof_name, title, 50, 0., 50., 50, 0., 350.);
+  scEE_PV->setAxisTitle("N_{pv}", 1);
+  scEE_PV->setAxisTitle("Super Clusters", 2);
+
+  prof_name = "scEtEB_PV";
+  title = "Super Clusters Et EB vs. PV";
+  scEtEB_PV = ibooker.bookProfile(prof_name, title, 50, 0., 50., 50, 0., 350.);
+  scEtEB_PV->setAxisTitle("N_{pv}", 1);
+  scEtEB_PV->setAxisTitle("Super Cluster E_{T} [GeV]", 2);
+
+  prof_name = "scEtEE_PV";
+  title = "Super Clusters Et EE vs. PV";
+  scEtEE_PV = ibooker.bookProfile(prof_name, title, 50, 0., 50., 50, 0., 350.);
+  scEtEE_PV->setAxisTitle("N_{pv}", 1);
+  scEtEE_PV->setAxisTitle("Super Cluster E_{T} [GeV]", 2);
+
+  prof_name = "recHitEtEB_PV";
+  title = "Reconstructed Hit Et EB vs. PV";
+  recHitEtEB_PV = ibooker.bookProfile(prof_name, title, 50, 0., 50., 50, 0., 350.);
+  recHitEtEB_PV->setAxisTitle("N_{pv}", 1);
+  recHitEtEB_PV->setAxisTitle("Reconstructed hit E_{T} [GeV]", 2);
+
+  prof_name = "recHitEtEE_PV";
+  title = "Reconstructed Hit Et EE vs. PV";
+  recHitEtEE_PV = ibooker.bookProfile(prof_name, title, 50, 0., 50., 50, 0., 350.);
+  recHitEtEE_PV->setAxisTitle("N_{pv}", 1);
+  recHitEtEE_PV->setAxisTitle("Reconstructed hit E_{T} [GeV]", 2);
+
+  prof_name = "emIso_PV";
+  title = "EM Isolation vs. PV";
+  emIso_PV = ibooker.bookProfile(prof_name, title, 50, 0., 50., 50, 0., 350);
+  emIso_PV->setAxisTitle("N_{pv}", 1);
+  emIso_PV->setAxisTitle("EM_{Isolation} [GeV]", 2);
+
+  prof_name = "emIso";
+  title = "EM Isolation";
+  emIso = ibooker.book1D(prof_name, title, 50, 0, 50);
+  emIso->setAxisTitle("EM_{Isolation} [GeV]", 1);
+  emIso->setAxisTitle("Events", 2);
+
+  prof_name = "scHitEtEB";
+  title = "Super Cluster Hit Et EB";
+  scHitEtEB = ibooker.book1D(prof_name, title, 50, 0, 100);
+  scHitEtEB->setAxisTitle("super cluster hit E_{T} [GeV]", 1);
+  scHitEtEB->setAxisTitle("Events", 2);
+
+  prof_name = "scHitEtEE";
+  title = "Super Cluster Hit Et EE";
+  scHitEtEE = ibooker.book1D(prof_name, title, 50, 0, 100);
+  scHitEtEE->setAxisTitle("super cluster hit E_{T} [GeV]", 1);
+  scHitEtEE->setAxisTitle("Events", 2);
+
+  //   prof_name="scHitE_EB";
+  //   title="Super Cluster Hit E EB";
+  //   scHitE_EB=ibooker.book1D(prof_name,title,50,0,100);
+  //   scHitE_EB->setAxisTitle("super cluster hit E [GeV]",1);
+  //   scHitE_EB->setAxisTitle("Events",2);
+
+  //   prof_name="scHitE_EE";
+  //   title="Super Cluster Hit E EE";
+  //   scHitE_EE=ibooker.book1D(prof_name,title,50,0,100);
+  //   scHitE_EE->setAxisTitle("super cluster hit E [GeV]",1);
+  //   scHitE_EE->setAxisTitle("Events",2);
+
+  // SC eta
+  //   prof_name="scEta_EB";
+  //   title="Super Cluster #eta EB";
+  //   scEta_EB=ibooker.book1D(prof_name,title,50,-6,6);
+  //   scEta_EB->setAxisTitle("#eta",1);
+  //   scEta_EB->setAxisTitle("Events",2);
+
+  //   prof_name="scEta_EE";
+  //   title="Super Cluster #eta EE";
+  //   scEta_EE=ibooker.book1D(prof_name,title,50,-6,6);
+  //   scEta_EE->setAxisTitle("#eta",1);
+  //   scEta_EE->setAxisTitle("Events",2);
+
+  // SC phi
+  //   prof_name="scPhi_EB";
+  //   title="Super Cluster #phi EB";
+  //   scPhi_EB=ibooker.book1D(prof_name,title,50,-3.14,3.14);
+  //   scPhi_EB->setAxisTitle("super cluster #phi",1);
+  //   scPhi_EB->setAxisTitle("Events",2);
+
+  //   prof_name="scPhi_EE";
+  //   title="Super Cluster #phi EE";
+  //   scPhi_EE=ibooker.book1D(prof_name,title,50,-3.14,3.14);
+  //   scPhi_EE->setAxisTitle("super cluster #phi",1);
+  //   scPhi_EE->setAxisTitle("Events",2);
+
+  // sc sigma eta eta / eta phi
+
+  prof_name = "scSigmaIetaIeta_EB";
+  title = "Super Cluster sigmaIetaIeta EB";
+  scSigmaIetaIeta_EB = ibooker.book1D(prof_name, title, 50, 0, 0.03);
+  scSigmaIetaIeta_EB->setAxisTitle("#sigma_{i#etai#eta}", 1);
+  scSigmaIetaIeta_EB->setAxisTitle("Events", 2);
+
+  prof_name = "scSigmaIetaIeta_EE";
+  title = "Super Cluster sigmaIetaIeta EE";
+  scSigmaIetaIeta_EE = ibooker.book1D(prof_name, title, 50, 0, 0.1);
+  scSigmaIetaIeta_EE->setAxisTitle("#sigma_{i#etai#eta}", 1);
+  scSigmaIetaIeta_EE->setAxisTitle("Events", 2);
+
+  // phi
+  prof_name = "scSigmaIetaIphi_EB";
+  title = "Super Cluster sigmaIetaIphi EB";
+  scSigmaIetaIphi_EB = ibooker.book1D(prof_name, title, 50, -5.e-4, 5.e-4);
+  scSigmaIetaIphi_EB->setAxisTitle("#sigma_{i#etai#phi}", 1);
+  scSigmaIetaIphi_EB->setAxisTitle("Events", 2);
+
+  prof_name = "scSigmaIetaIphi_EE";
+  title = "Super Cluster sigmaIetaIphi EE";
+  scSigmaIetaIphi_EE = ibooker.book1D(prof_name, title, 50, -2.5e-3, 2.5e-3);
+  scSigmaIetaIphi_EE->setAxisTitle("#sigma_{i#etai#phi}", 1);
+  scSigmaIetaIphi_EE->setAxisTitle("Events", 2);
+
+  // R9
+  prof_name = "r9_EB";
+  title = "r9 EB";
+  r9_EB = ibooker.book1D(prof_name, title, 50, 0, 1.5);
+  r9_EB->setAxisTitle("R_{9}", 1);
+  r9_EB->setAxisTitle("Events", 2);
+
+  prof_name = "r9_EE";
+  title = "r9 EE";
+  r9_EE = ibooker.book1D(prof_name, title, 50, 0, 1.5);
+  r9_EE->setAxisTitle("R_{9}", 1);
+  r9_EE->setAxisTitle("Events", 2);
+
+  // Rec Hit
+
+  prof_name = "recHitEtEB";
+  title = "RecHit Et EB";
+  recHitEtEB = ibooker.book1D(prof_name, title, 50, 0, 400);
+  recHitEtEB->setAxisTitle("Reconstructed Hit E_{T} [GeV]", 1);
+  recHitEtEB->setAxisTitle("Events", 2);
+
+  prof_name = "recHitEtEE";
+  title = "RecHit Et EE";
+  recHitEtEE = ibooker.book1D(prof_name, title, 50, 0, 400);
+  recHitEtEE->setAxisTitle("Reconstructed Hit E_{T} [GeV]", 1);
+  recHitEtEE->setAxisTitle("Events", 2);
 }
 
-void EcalPileUpDepMonitor::analyze(const edm::Event& e, const edm::EventSetup&)
-{
-
-  const CaloGeometry* geom = geomH.product();
-  //Vertex collection: 
+void EcalPileUpDepMonitor::analyze(const edm::Event &e, const edm::EventSetup &) {
+  const CaloGeometry *geom = geomH.product();
+  // Vertex collection:
   //-----------------------------------------
   edm::Handle<reco::VertexCollection> PVCollection_h;
-  e.getByToken(VertexCollection_,PVCollection_h);
-  if ( ! PVCollection_h.isValid() ) {
-    edm::LogWarning("VertexCollection") << "VertexCollection not found"; 
+  e.getByToken(VertexCollection_, PVCollection_h);
+  if (!PVCollection_h.isValid()) {
+    edm::LogWarning("VertexCollection") << "VertexCollection not found";
   }
   //-----------------gsfElectrons -------------------------
-  edm::Handle<reco::GsfElectronCollection> electronCollection_h; 
-  e.getByToken(EleTag_, electronCollection_h); 
-  if( !electronCollection_h.isValid()){
-    edm::LogWarning("EBRecoSummary") << "Electrons not found"; 
+  edm::Handle<reco::GsfElectronCollection> electronCollection_h;
+  e.getByToken(EleTag_, electronCollection_h);
+  if (!electronCollection_h.isValid()) {
+    edm::LogWarning("EBRecoSummary") << "Electrons not found";
   }
 
-  if(basicClusterCollection_.isUninitialized()){
+  if (basicClusterCollection_.isUninitialized()) {
     //----------------- Basic Cluster Collection Ecal Barrel  ---------
-    edm::Handle<edm::View<reco::CaloCluster> > basicClusters_EB_h;
-    e.getByToken( basicClusterCollection_EB_, basicClusters_EB_h );
-    if ( ! basicClusters_EB_h.isValid() ) {
-      edm::LogWarning("EBRecoSummary") << "basicClusters_EB_h not found"; 
+    edm::Handle<edm::View<reco::CaloCluster>> basicClusters_EB_h;
+    e.getByToken(basicClusterCollection_EB_, basicClusters_EB_h);
+    if (!basicClusters_EB_h.isValid()) {
+      edm::LogWarning("EBRecoSummary") << "basicClusters_EB_h not found";
     }
-	
-    bcEB_PV->Fill(PVCollection_h->size(), basicClusters_EB_h->size()); 
-	
+
+    bcEB_PV->Fill(PVCollection_h->size(), basicClusters_EB_h->size());
+
     //----------------- Basic Cluster Collection Ecal Endcal  ---------
 
-    edm::Handle<edm::View<reco::CaloCluster> > basicClusters_EE_h;
-    e.getByToken( basicClusterCollection_EE_, basicClusters_EE_h );
-    if ( ! basicClusters_EE_h.isValid() ) {
-      edm::LogWarning("EERecoSummary") << "basicClusters_EE_h not found"; 
+    edm::Handle<edm::View<reco::CaloCluster>> basicClusters_EE_h;
+    e.getByToken(basicClusterCollection_EE_, basicClusters_EE_h);
+    if (!basicClusters_EE_h.isValid()) {
+      edm::LogWarning("EERecoSummary") << "basicClusters_EE_h not found";
     }
 
-    bcEE_PV->Fill(PVCollection_h->size(), basicClusters_EE_h->size()); 
-  }
-  else{
+    bcEE_PV->Fill(PVCollection_h->size(), basicClusters_EE_h->size());
+  } else {
     //----------------- Basic Cluster Collection Ecal Barrel  ---------
-    edm::Handle<edm::View<reco::CaloCluster> > basicClusters_h;
-    e.getByToken( basicClusterCollection_, basicClusters_h );
-    if ( ! basicClusters_h.isValid() ) {
-      edm::LogWarning("EBRecoSummary") << "basicClusters_h not found"; 
+    edm::Handle<edm::View<reco::CaloCluster>> basicClusters_h;
+    e.getByToken(basicClusterCollection_, basicClusters_h);
+    if (!basicClusters_h.isValid()) {
+      edm::LogWarning("EBRecoSummary") << "basicClusters_h not found";
     }
 
     int nBarrel(0);
     int nEndcap(0);
-    for(edm::View<reco::CaloCluster>::const_iterator bcItr(basicClusters_h->begin()); bcItr != basicClusters_h->end(); ++bcItr){
-      if(bcItr->caloID().detector(reco::CaloID::DET_ECAL_BARREL)) ++nBarrel;
-      if(bcItr->caloID().detector(reco::CaloID::DET_ECAL_ENDCAP)) ++nEndcap;
+    for (edm::View<reco::CaloCluster>::const_iterator bcItr(basicClusters_h->begin()); bcItr != basicClusters_h->end();
+         ++bcItr) {
+      if (bcItr->caloID().detector(reco::CaloID::DET_ECAL_BARREL))
+        ++nBarrel;
+      if (bcItr->caloID().detector(reco::CaloID::DET_ECAL_ENDCAP))
+        ++nEndcap;
     }
-	
-    bcEB_PV->Fill(PVCollection_h->size(), nBarrel); 
-    bcEE_PV->Fill(PVCollection_h->size(), nEndcap); 
+
+    bcEB_PV->Fill(PVCollection_h->size(), nBarrel);
+    bcEE_PV->Fill(PVCollection_h->size(), nEndcap);
   }
 
-  //----------------- Reconstructed Hit Ecal barrel 
-	
+  //----------------- Reconstructed Hit Ecal barrel
+
   edm::Handle<EcalRecHitCollection> RecHitsEB;
-  e.getByToken( RecHitCollection_EB_,RecHitsEB );
-  if ( ! RecHitsEB.isValid() ) {
-    edm::LogWarning("EBRecoSummary") << "RecHitsEB not found"; 
+  e.getByToken(RecHitCollection_EB_, RecHitsEB);
+  if (!RecHitsEB.isValid()) {
+    edm::LogWarning("EBRecoSummary") << "RecHitsEB not found";
   }
-	
-  //----------------- Reconstructed Hit Ecal Endcap  
-	
+
+  //----------------- Reconstructed Hit Ecal Endcap
+
   edm::Handle<EcalRecHitCollection> RecHitsEE;
-  e.getByToken( RecHitCollection_EE_, RecHitsEE );
-  if ( ! RecHitsEE.isValid() ) {
-    edm::LogWarning("EBRecoSummary") << "RecHitsEB not found"; 
+  e.getByToken(RecHitCollection_EE_, RecHitsEE);
+  if (!RecHitsEE.isValid()) {
+    edm::LogWarning("EBRecoSummary") << "RecHitsEB not found";
   }
   //----------------- Super Cluster Collection Ecal Endcap  ---------
-	
+
   edm::Handle<reco::SuperClusterCollection> superClusters_EE_h;
-  e.getByToken( superClusterCollection_EE_, superClusters_EE_h );
-  if ( ! superClusters_EE_h.isValid() ) {
-    edm::LogWarning("EERecoSummary") << "superClusters_EE_h not found"; 
+  e.getByToken(superClusterCollection_EE_, superClusters_EE_h);
+  if (!superClusters_EE_h.isValid()) {
+    edm::LogWarning("EERecoSummary") << "superClusters_EE_h not found";
   }
-	
+
   //--------- Fill Isolation -----------------
-	
-  if(electronCollection_h.isValid()){
-    for (reco::GsfElectronCollection::const_iterator recoElectron = electronCollection_h->begin ();
-         recoElectron != electronCollection_h->end ();
+
+  if (electronCollection_h.isValid()) {
+    for (reco::GsfElectronCollection::const_iterator recoElectron = electronCollection_h->begin();
+         recoElectron != electronCollection_h->end();
          recoElectron++) {
-        double IsoEcal =recoElectron->dr03EcalRecHitSumEt();///recoElectron->et()
-        emIso_PV->Fill(PVCollection_h->size(),IsoEcal);
-        emIso->Fill(IsoEcal);
-      }		
+      double IsoEcal = recoElectron->dr03EcalRecHitSumEt();  /// recoElectron->et()
+      emIso_PV->Fill(PVCollection_h->size(), IsoEcal);
+      emIso->Fill(IsoEcal);
+    }
   }
 
-  //fill super clusters EE
-  scEE_PV->Fill(PVCollection_h->size(), superClusters_EE_h->size()); 
-	
-  for (reco::SuperClusterCollection::const_iterator itSC = superClusters_EE_h->begin(); 
+  // fill super clusters EE
+  scEE_PV->Fill(PVCollection_h->size(), superClusters_EE_h->size());
+
+  for (reco::SuperClusterCollection::const_iterator itSC = superClusters_EE_h->begin();
        itSC != superClusters_EE_h->end();
-       ++itSC ) {
-    double scEE_Et= itSC -> energy() * sin(2.*atan( exp(- itSC->position().eta() )));
+       ++itSC) {
+    double scEE_Et = itSC->energy() * sin(2. * atan(exp(-itSC->position().eta())));
     //    double scEE_E=itSC->energy();
-		
-    //fill super cluster endcap eta/phi
-//     scEta_EE->Fill(itSC->position().eta());
-//     scPhi_EE->Fill(itSC->position().phi());
-
-    //get sigma eta_eta etc
-		
-    CaloTopology const* p_topology = caloTop.product();//get calo topology
-    const EcalRecHitCollection* eeRecHits = RecHitsEE.product();
-		
-    reco::BasicCluster const& seedCluster(*itSC->seed());
+
+    // fill super cluster endcap eta/phi
+    //     scEta_EE->Fill(itSC->position().eta());
+    //     scPhi_EE->Fill(itSC->position().phi());
+
+    // get sigma eta_eta etc
+
+    CaloTopology const *p_topology = caloTop.product();  // get calo topology
+    const EcalRecHitCollection *eeRecHits = RecHitsEE.product();
+
+    reco::BasicCluster const &seedCluster(*itSC->seed());
     std::vector<float> cov = EcalClusterTools::localCovariances(seedCluster, eeRecHits, p_topology);
     float sigmaIetaIeta = std::sqrt(cov[0]);
     float sigmaIetaIphi = cov[1];
 
-		
     float e3x3 = EcalClusterTools::e3x3(seedCluster, eeRecHits, p_topology);
     float r9 = e3x3 / itSC->rawEnergy();
-		
-    r9_EE->Fill(r9); 
+
+    r9_EE->Fill(r9);
     scSigmaIetaIeta_EE->Fill(sigmaIetaIeta);
     scSigmaIetaIphi_EE->Fill(sigmaIetaIphi);
-		
-    //std::cout  << " sigmaIetaIeta: " << sigmaIetaIeta << std::endl; 
-    scEtEE_PV->Fill(PVCollection_h->size(),scEE_Et); 
-    scHitEtEE->Fill(scEE_Et); //super cluster Et historam 
+
+    // std::cout  << " sigmaIetaIeta: " << sigmaIetaIeta << std::endl;
+    scEtEE_PV->Fill(PVCollection_h->size(), scEE_Et);
+    scHitEtEE->Fill(scEE_Et);  // super cluster Et historam
     //    scHitE_EE->Fill(scEE_E); //super cluster energy histogram
-		
-  }//sc-EE loop
 
-	
+  }  // sc-EE loop
+
   //----------------- Super Cluster Collection Ecal Barrel  ---------
 
   edm::Handle<reco::SuperClusterCollection> superClusters_EB_h;
-  e.getByToken( superClusterCollection_EB_, superClusters_EB_h );
-  if ( ! superClusters_EB_h.isValid() ) {
-    edm::LogWarning("EBRecoSummary") << "superClusters_EB_h not found"; 
+  e.getByToken(superClusterCollection_EB_, superClusters_EB_h);
+  if (!superClusters_EB_h.isValid()) {
+    edm::LogWarning("EBRecoSummary") << "superClusters_EB_h not found";
   }
-  scEB_PV->Fill(PVCollection_h->size(), superClusters_EB_h->size()); 
+  scEB_PV->Fill(PVCollection_h->size(), superClusters_EB_h->size());
 
-  for (reco::SuperClusterCollection::const_iterator itSC = superClusters_EB_h->begin(); 
+  for (reco::SuperClusterCollection::const_iterator itSC = superClusters_EB_h->begin();
        itSC != superClusters_EB_h->end();
-       ++itSC ) {
-    double scEB_Et= itSC -> energy() * sin(2.*atan( exp(- itSC->position().eta() ))); // super cluster transverse energy
+       ++itSC) {
+    double scEB_Et = itSC->energy() * sin(2. * atan(exp(-itSC->position().eta())));  // super cluster transverse energy
     //    double scEB_E= itSC->energy(); // super cluster energy
-		
-    //fill super cluster Barrel eta/phi
-//     scEta_EB->Fill(itSC->position().eta()); //super cluster eta
-//     scPhi_EB->Fill(itSC->position().phi()); // super cluster phi
-		
-    //sigma ietaieta etc 
-		
-    CaloTopology const* p_topology = caloTop.product();//get calo topology
-    const EcalRecHitCollection* ebRecHits = RecHitsEB.product();
-
-    reco::BasicCluster const& seedCluster(*itSC->seed());
+
+    // fill super cluster Barrel eta/phi
+    //     scEta_EB->Fill(itSC->position().eta()); //super cluster eta
+    //     scPhi_EB->Fill(itSC->position().phi()); // super cluster phi
+
+    // sigma ietaieta etc
+
+    CaloTopology const *p_topology = caloTop.product();  // get calo topology
+    const EcalRecHitCollection *ebRecHits = RecHitsEB.product();
+
+    reco::BasicCluster const &seedCluster(*itSC->seed());
     std::vector<float> cov = EcalClusterTools::localCovariances(seedCluster, ebRecHits, p_topology);
     float sigmaIetaIeta = std::sqrt(cov[0]);
     float sigmaIetaIphi = cov[1];
 
-		
     float e3x3 = EcalClusterTools::e3x3(seedCluster, ebRecHits, p_topology);
     float r9 = e3x3 / itSC->rawEnergy();
-		
+
     r9_EB->Fill(r9);
     scSigmaIetaIeta_EB->Fill(sigmaIetaIeta);
     scSigmaIetaIphi_EB->Fill(sigmaIetaIphi);
-		
-    scEtEB_PV->Fill(PVCollection_h->size(),scEB_Et); 
-    scHitEtEB->Fill(scEB_Et); 
-    //    scHitE_EB->Fill(scEB_E); 
-  }//sc-EB loop
-	
+
+    scEtEB_PV->Fill(PVCollection_h->size(), scEB_Et);
+    scHitEtEB->Fill(scEB_Et);
+    //    scHitE_EB->Fill(scEB_E);
+  }  // sc-EB loop
 
   //-------------------Compute scalar sum of reconstructed hit Et
-  double RecHitEt_EB=0; 
-
-  for ( EcalRecHitCollection::const_iterator itr = RecHitsEB->begin () ;
-        itr != RecHitsEB->end () ;
-        ++itr) {	
-      //RecHitEt_EB +=itr->energy();
-		
-    GlobalPoint const& position  = geom->getGeometry(itr->detid())->getPosition();
-    RecHitEt_EB += itr -> energy() * sin(position.theta()) ;
-  }//EB Rec Hit
-	
-  recHitEtEB->Fill(RecHitEt_EB); 
-  recHitEtEB_PV->Fill(PVCollection_h->size(),RecHitEt_EB); 
-
-	
+  double RecHitEt_EB = 0;
+
+  for (EcalRecHitCollection::const_iterator itr = RecHitsEB->begin(); itr != RecHitsEB->end(); ++itr) {
+    // RecHitEt_EB +=itr->energy();
+
+    GlobalPoint const &position = geom->getGeometry(itr->detid())->getPosition();
+    RecHitEt_EB += itr->energy() * sin(position.theta());
+  }  // EB Rec Hit
+
+  recHitEtEB->Fill(RecHitEt_EB);
+  recHitEtEB_PV->Fill(PVCollection_h->size(), RecHitEt_EB);
+
   //-------------------Compute scalar sum of reconstructed hit Et
-  double RecHitEt_EE=0; 
-
-  for ( EcalRecHitCollection::const_iterator itr = RecHitsEE->begin () ;
-        itr != RecHitsEE->end () ;
-        ++itr) {
-    GlobalPoint const& position  = geom->getGeometry(itr->detid())->getPosition();
-    RecHitEt_EE += itr -> energy() * sin(position.theta()) ;
-  }//EB Rec Hit
-	
-  recHitEtEE->Fill(RecHitEt_EE); 
-  recHitEtEE_PV->Fill(PVCollection_h->size(),RecHitEt_EE); 
+  double RecHitEt_EE = 0;
+
+  for (EcalRecHitCollection::const_iterator itr = RecHitsEE->begin(); itr != RecHitsEE->end(); ++itr) {
+    GlobalPoint const &position = geom->getGeometry(itr->detid())->getPosition();
+    RecHitEt_EE += itr->energy() * sin(position.theta());
+  }  // EB Rec Hit
+
+  recHitEtEE->Fill(RecHitEt_EE);
+  recHitEtEE_PV->Fill(PVCollection_h->size(), RecHitEt_EE);
 }
 
 DEFINE_FWK_MODULE(EcalPileUpDepMonitor);
-
diff --git a/DQMOffline/Ecal/plugins/EcalZmassClient.cc b/DQMOffline/Ecal/plugins/EcalZmassClient.cc
index 6ac2a8b268a1d..ec4e839eddf09 100644
--- a/DQMOffline/Ecal/plugins/EcalZmassClient.cc
+++ b/DQMOffline/Ecal/plugins/EcalZmassClient.cc
@@ -2,8 +2,9 @@
 //
 // Package:    ZfitterAnalyzer
 // Class:      ZfitterAnalyzer
-// 
-/**\class ZfitterAnalyzer ZfitterAnalyzer.cc Zfitter/ZfitterAnalyzer/src/ZfitterAnalyzer.cc
+//
+/**\class ZfitterAnalyzer ZfitterAnalyzer.cc
+ Zfitter/ZfitterAnalyzer/src/ZfitterAnalyzer.cc
 
  Description: [one line class summary]
 
@@ -20,665 +21,570 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "DQM/Physics/src/EwkDQM.h"
+#include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/Exception.h"
+#include "TH1.h"
 #include "TMath.h"
-#include <string>
 #include <cmath>
-#include "TH1.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDHarvester.h"
 #include <iostream>
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Utilities/interface/Exception.h"
+#include <string>
 
-Double_t mybw(Double_t*, Double_t*);
-Double_t mygauss(Double_t*, Double_t*);
+Double_t mybw(Double_t *, Double_t *);
+Double_t mygauss(Double_t *, Double_t *);
 
-class EcalZmassClient: public DQMEDHarvester {
+class EcalZmassClient : public DQMEDHarvester {
 public:
-  explicit EcalZmassClient(const edm::ParameterSet&);
+  explicit EcalZmassClient(const edm::ParameterSet &);
   ~EcalZmassClient() override;
 
 private:
-  void dqmEndJob(DQMStore::IBooker&, DQMStore::IGetter&) override;
+  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
 
   // ----------member data ---------------------------
 
   std::string prefixME_;
 };
 
-EcalZmassClient::EcalZmassClient (const edm::ParameterSet& iConfig) :
-  prefixME_(iConfig.getUntrackedParameter < std::string > ("prefixME", ""))
-{
-}
-
-EcalZmassClient::~EcalZmassClient ()
-{
-}
-
-void
-EcalZmassClient::dqmEndJob(DQMStore::IBooker& _ibooker, DQMStore::IGetter& _igetter)
-{
-  MonitorElement* h_fitres1;
-  MonitorElement* h_fitres1bis;
-  MonitorElement* h_fitres1Chi2;
-  MonitorElement* h_fitres2;
-  MonitorElement* h_fitres2bis;
-  MonitorElement* h_fitres2Chi2;
-  MonitorElement* h_fitres3;
-  MonitorElement* h_fitres3bis;
-  MonitorElement* h_fitres3Chi2;
-
-  _ibooker.setCurrentFolder (prefixME_ + "/Zmass");
-  h_fitres1 =
-    _ibooker.book1D ("Gaussian mean WP80 EB-EB",
-		    "Gaussian mean WP80 EB-EB", 1, 0, 1);
-  h_fitres1bis =
-    _ibooker.book1D ("Gaussian sigma WP80 EB-EB",
-		    "Gaussian sigma WP80 EB-EB", 1, 0, 1);
-  h_fitres1Chi2 =
-    _ibooker.book1D ("Gaussian Chi2 result over NDF  WP80 EB-EB",
-		    "Gaussian Chi2 result over NDF  WP80 EB-EB", 1, 0, 1);
-
-  h_fitres3 =
-    _ibooker.book1D ("Gaussian mean WP80 EB-EE",
-		    "Gaussian mean result WP80 EB-EE", 1, 0, 1);
-  h_fitres3bis =
-    _ibooker.book1D ("Gaussian sigma WP80 EB-EE",
-		    "Gaussian sigma WP80 EB-EE", 1, 0, 1);
+EcalZmassClient::EcalZmassClient(const edm::ParameterSet &iConfig)
+    : prefixME_(iConfig.getUntrackedParameter<std::string>("prefixME", "")) {}
+
+EcalZmassClient::~EcalZmassClient() {}
+
+void EcalZmassClient::dqmEndJob(DQMStore::IBooker &_ibooker, DQMStore::IGetter &_igetter) {
+  MonitorElement *h_fitres1;
+  MonitorElement *h_fitres1bis;
+  MonitorElement *h_fitres1Chi2;
+  MonitorElement *h_fitres2;
+  MonitorElement *h_fitres2bis;
+  MonitorElement *h_fitres2Chi2;
+  MonitorElement *h_fitres3;
+  MonitorElement *h_fitres3bis;
+  MonitorElement *h_fitres3Chi2;
+
+  _ibooker.setCurrentFolder(prefixME_ + "/Zmass");
+  h_fitres1 = _ibooker.book1D("Gaussian mean WP80 EB-EB", "Gaussian mean WP80 EB-EB", 1, 0, 1);
+  h_fitres1bis = _ibooker.book1D("Gaussian sigma WP80 EB-EB", "Gaussian sigma WP80 EB-EB", 1, 0, 1);
+  h_fitres1Chi2 = _ibooker.book1D(
+      "Gaussian Chi2 result over NDF  WP80 EB-EB", "Gaussian Chi2 result over NDF  WP80 EB-EB", 1, 0, 1);
+
+  h_fitres3 = _ibooker.book1D("Gaussian mean WP80 EB-EE", "Gaussian mean result WP80 EB-EE", 1, 0, 1);
+  h_fitres3bis = _ibooker.book1D("Gaussian sigma WP80 EB-EE", "Gaussian sigma WP80 EB-EE", 1, 0, 1);
   h_fitres3Chi2 =
-    _ibooker.book1D ("Gaussian Chi2 result over NDF WP80 EB-EE",
-		    "Gaussian Chi2 result over NDF WP80 EB-EE", 1, 0, 1);
-
-  h_fitres2 =
-    _ibooker.book1D ("Gaussian mean WP80 EE-EE",
-		    "Gaussian mean WP80 EE-EE", 1, 0, 1);
-  h_fitres2bis =
-    _ibooker.book1D ("Gaussian sigma WP80 EE-EE",
-		    "Gaussian sigma WP80 EE-EE", 1, 0, 1);
-  h_fitres2Chi2 =
-    _ibooker.book1D ("Gaussian Chi2 result over NDF WP80 EE-EE",
-		    "Gaussian Chi2 result over NDF WP80 EE-EE", 1, 0, 1);
-
-  LogTrace ("EwkAnalyzer") << "Parameters initialization";
-
-  MonitorElement *me1 = _igetter.get (prefixME_ + "/Zmass/Z peak - WP80 EB-EB");
-  MonitorElement *me2 = _igetter.get (prefixME_ + "/Zmass/Z peak - WP80 EE-EE");
-  MonitorElement *me3 = _igetter.get (prefixME_ + "/Zmass/Z peak - WP80 EB-EE");
-
-  if (me1 != nullptr)
-    {
-      TH1F *B = me1->getTH1F ();
-      TH1F *R1 = h_fitres1->getTH1F ();
-      int division = B->GetNbinsX ();
-      float massMIN = B->GetBinLowEdge (1);
-      float massMAX = B->GetBinLowEdge (division + 1);
-      //float BIN_SIZE = B->GetBinWidth(1);
-
-      TF1 *func = new TF1 ("mygauss", mygauss, massMIN, massMAX, 3);
-      func->SetParameter (0, 1.0);
-      func->SetParName (0, "const");
-      func->SetParameter (1, 95.0);
-      func->SetParName (1, "mean");
-      func->SetParameter (2, 5.0);
-      func->SetParName (2, "sigma");
-
-      double stats[4];
-      R1->GetStats (stats);
-      float N = 0;
-      float mean = 0;
-      float sigma = 0;
-      N = B->GetEntries ();
-
-      try
-      {
-	if (N != 0)
-	  {
-
-	    B->Fit ("mygauss", "QR");
-	    mean = std::abs (func->GetParameter (1));
-	    sigma = std::abs (func->GetParError (1));
-	  }
-
-	if (N == 0 || mean < 50 || mean > 100 || sigma <= 0 || sigma > 20)
-	  {
-	    N = 1;
-	    mean = 0;
-	    sigma = 0;
-	  }
+      _ibooker.book1D("Gaussian Chi2 result over NDF WP80 EB-EE", "Gaussian Chi2 result over NDF WP80 EB-EE", 1, 0, 1);
 
-      }
-      catch (cms::Exception& e)
-      {
-        edm::LogError ("ZFitter") << "[Zfitter]: Exception when fitting..." << e.what();
-	N = 1;
-	mean = 40;
-	sigma = 0;
+  h_fitres2 = _ibooker.book1D("Gaussian mean WP80 EE-EE", "Gaussian mean WP80 EE-EE", 1, 0, 1);
+  h_fitres2bis = _ibooker.book1D("Gaussian sigma WP80 EE-EE", "Gaussian sigma WP80 EE-EE", 1, 0, 1);
+  h_fitres2Chi2 =
+      _ibooker.book1D("Gaussian Chi2 result over NDF WP80 EE-EE", "Gaussian Chi2 result over NDF WP80 EE-EE", 1, 0, 1);
+
+  LogTrace("EwkAnalyzer") << "Parameters initialization";
+
+  MonitorElement *me1 = _igetter.get(prefixME_ + "/Zmass/Z peak - WP80 EB-EB");
+  MonitorElement *me2 = _igetter.get(prefixME_ + "/Zmass/Z peak - WP80 EE-EE");
+  MonitorElement *me3 = _igetter.get(prefixME_ + "/Zmass/Z peak - WP80 EB-EE");
+
+  if (me1 != nullptr) {
+    TH1F *B = me1->getTH1F();
+    TH1F *R1 = h_fitres1->getTH1F();
+    int division = B->GetNbinsX();
+    float massMIN = B->GetBinLowEdge(1);
+    float massMAX = B->GetBinLowEdge(division + 1);
+    // float BIN_SIZE = B->GetBinWidth(1);
+
+    TF1 *func = new TF1("mygauss", mygauss, massMIN, massMAX, 3);
+    func->SetParameter(0, 1.0);
+    func->SetParName(0, "const");
+    func->SetParameter(1, 95.0);
+    func->SetParName(1, "mean");
+    func->SetParameter(2, 5.0);
+    func->SetParName(2, "sigma");
+
+    double stats[4];
+    R1->GetStats(stats);
+    float N = 0;
+    float mean = 0;
+    float sigma = 0;
+    N = B->GetEntries();
+
+    try {
+      if (N != 0) {
+        B->Fit("mygauss", "QR");
+        mean = std::abs(func->GetParameter(1));
+        sigma = std::abs(func->GetParError(1));
       }
 
-      stats[0] = N;
-      stats[1] = N;
-      stats[2] = mean * N;
-      stats[3] = sigma * sigma * N + mean * mean * N;
+      if (N == 0 || mean < 50 || mean > 100 || sigma <= 0 || sigma > 20) {
+        N = 1;
+        mean = 0;
+        sigma = 0;
+      }
 
-      R1->SetEntries (N);
-      R1->PutStats (stats);
+    } catch (cms::Exception &e) {
+      edm::LogError("ZFitter") << "[Zfitter]: Exception when fitting..." << e.what();
+      N = 1;
+      mean = 40;
+      sigma = 0;
     }
-/*******************************************************/
-  if (me1 != nullptr)
-    {
-      TH1F *Bbis = me1->getTH1F ();
-      TH1F *R1bis = h_fitres1bis->getTH1F ();
-      int division = Bbis->GetNbinsX ();
-      float massMIN = Bbis->GetBinLowEdge (1);
-      float massMAX = Bbis->GetBinLowEdge (division + 1);
-      //float BIN_SIZE = B->GetBinWidth(1);
-
-      TF1 *func = new TF1 ("mygauss", mygauss, massMIN, massMAX, 3);
-      func->SetParameter (0, 1.0);
-      func->SetParName (0, "const");
-      func->SetParameter (1, 95.0);
-      func->SetParName (1, "mean");
-      func->SetParameter (2, 5.0);
-      func->SetParName (2, "sigma");
-
-      double stats[4];
-      R1bis->GetStats (stats);
-      float N = 0;
-      float rms = 0;
-      float rmsErr = 0;
-      N = Bbis->GetEntries ();
-
-      try
-      {
-	if (N != 0)
-	  {
-
-	    Bbis->Fit ("mygauss", "QR");
-	    rms = std::abs (func->GetParameter (2));
-	    rmsErr = std::abs (func->GetParError (2));
-	  }
-
-	if (N == 0 || rms < 0 || rms > 50 || rmsErr <= 0 || rmsErr > 50)
-	  {
-	    N = 1;
-	    rms = 0;
-	    rmsErr = 0;
-	  }
 
-      }
-      catch (cms::Exception& e)
-      {
-        edm::LogError ("ZFitter") << "[Zfitter]: Exception when fitting..." << e.what();
-	N = 1;
-	rms = 40;
-	rmsErr = 0;
+    stats[0] = N;
+    stats[1] = N;
+    stats[2] = mean * N;
+    stats[3] = sigma * sigma * N + mean * mean * N;
+
+    R1->SetEntries(N);
+    R1->PutStats(stats);
+  }
+  /*******************************************************/
+  if (me1 != nullptr) {
+    TH1F *Bbis = me1->getTH1F();
+    TH1F *R1bis = h_fitres1bis->getTH1F();
+    int division = Bbis->GetNbinsX();
+    float massMIN = Bbis->GetBinLowEdge(1);
+    float massMAX = Bbis->GetBinLowEdge(division + 1);
+    // float BIN_SIZE = B->GetBinWidth(1);
+
+    TF1 *func = new TF1("mygauss", mygauss, massMIN, massMAX, 3);
+    func->SetParameter(0, 1.0);
+    func->SetParName(0, "const");
+    func->SetParameter(1, 95.0);
+    func->SetParName(1, "mean");
+    func->SetParameter(2, 5.0);
+    func->SetParName(2, "sigma");
+
+    double stats[4];
+    R1bis->GetStats(stats);
+    float N = 0;
+    float rms = 0;
+    float rmsErr = 0;
+    N = Bbis->GetEntries();
+
+    try {
+      if (N != 0) {
+        Bbis->Fit("mygauss", "QR");
+        rms = std::abs(func->GetParameter(2));
+        rmsErr = std::abs(func->GetParError(2));
       }
 
-      stats[0] = N;
-      stats[1] = N;
-      stats[2] = rms * N;
-      stats[3] = rmsErr * rmsErr * N + rms * rms * N;
+      if (N == 0 || rms < 0 || rms > 50 || rmsErr <= 0 || rmsErr > 50) {
+        N = 1;
+        rms = 0;
+        rmsErr = 0;
+      }
 
-      R1bis->SetEntries (N);
-      R1bis->PutStats (stats);
+    } catch (cms::Exception &e) {
+      edm::LogError("ZFitter") << "[Zfitter]: Exception when fitting..." << e.what();
+      N = 1;
+      rms = 40;
+      rmsErr = 0;
     }
-/****************************************/
-
-  if (me2 != nullptr)
-    {
-      TH1F *E = me2->getTH1F ();
-      TH1F *R2 = h_fitres2->getTH1F ();
-      int division = E->GetNbinsX ();
-      float massMIN = E->GetBinLowEdge (1);
-      float massMAX = E->GetBinLowEdge (division + 1);
-      //float BIN_SIZE = E->GetBinWidth(1);
-
-      TF1 *func = new TF1 ("mygauss", mygauss, massMIN, massMAX, 3);
-      func->SetParameter (0, 1.0);
-      func->SetParName (0, "const");
-      func->SetParameter (1, 95.0);
-      func->SetParName (1, "mean");
-      func->SetParameter (2, 5.0);
-      func->SetParName (2, "sigma");
-
-      double stats[4];
-      R2->GetStats (stats);
-      float N = 0;
-      float mean = 0;
-      float sigma = 0;
-      N = E->GetEntries ();
-
-      try
-      {
-	if (N != 0)
-	  {
-	    E->Fit ("mygauss", "QR");
-	    mean = std::abs (func->GetParameter (1));
-	    sigma = std::abs (func->GetParError (1));
-	  }
-
-	if (N == 0 || mean < 50 || mean > 100 || sigma <= 0 || sigma > 20)
-	  {
-	    N = 1;
-	    mean = 0;
-	    sigma = 0;
-
-	  }
 
-      }
-      catch (cms::Exception& e)
-      {
-        edm::LogError ("ZFitter") << "[Zfitter]: Exception when fitting..." << e.what();
-	N = 1;
-	mean = 40;
-	sigma = 0;
+    stats[0] = N;
+    stats[1] = N;
+    stats[2] = rms * N;
+    stats[3] = rmsErr * rmsErr * N + rms * rms * N;
+
+    R1bis->SetEntries(N);
+    R1bis->PutStats(stats);
+  }
+  /****************************************/
+
+  if (me2 != nullptr) {
+    TH1F *E = me2->getTH1F();
+    TH1F *R2 = h_fitres2->getTH1F();
+    int division = E->GetNbinsX();
+    float massMIN = E->GetBinLowEdge(1);
+    float massMAX = E->GetBinLowEdge(division + 1);
+    // float BIN_SIZE = E->GetBinWidth(1);
+
+    TF1 *func = new TF1("mygauss", mygauss, massMIN, massMAX, 3);
+    func->SetParameter(0, 1.0);
+    func->SetParName(0, "const");
+    func->SetParameter(1, 95.0);
+    func->SetParName(1, "mean");
+    func->SetParameter(2, 5.0);
+    func->SetParName(2, "sigma");
+
+    double stats[4];
+    R2->GetStats(stats);
+    float N = 0;
+    float mean = 0;
+    float sigma = 0;
+    N = E->GetEntries();
+
+    try {
+      if (N != 0) {
+        E->Fit("mygauss", "QR");
+        mean = std::abs(func->GetParameter(1));
+        sigma = std::abs(func->GetParError(1));
       }
 
-      stats[0] = N;
-      stats[1] = N;
-      stats[2] = mean * N;
-      stats[3] = sigma * sigma * N + mean * mean * N;
+      if (N == 0 || mean < 50 || mean > 100 || sigma <= 0 || sigma > 20) {
+        N = 1;
+        mean = 0;
+        sigma = 0;
+      }
 
-      R2->SetEntries (N);
-      R2->PutStats (stats);
+    } catch (cms::Exception &e) {
+      edm::LogError("ZFitter") << "[Zfitter]: Exception when fitting..." << e.what();
+      N = 1;
+      mean = 40;
+      sigma = 0;
     }
-/**************************************************************************/
-
-  if (me2 != nullptr)
-    {
-      TH1F *Ebis = me2->getTH1F ();
-      TH1F *R2bis = h_fitres2bis->getTH1F ();
-      int division = Ebis->GetNbinsX ();
-      float massMIN = Ebis->GetBinLowEdge (1);
-      float massMAX = Ebis->GetBinLowEdge (division + 1);
-      //float BIN_SIZE = B->GetBinWidth(1);
-
-      TF1 *func = new TF1 ("mygauss", mygauss, massMIN, massMAX, 3);
-      func->SetParameter (0, 1.0);
-      func->SetParName (0, "const");
-      func->SetParameter (1, 95.0);
-      func->SetParName (1, "mean");
-      func->SetParameter (2, 5.0);
-      func->SetParName (2, "sigma");
-
-      double stats[4];
-      R2bis->GetStats (stats);
-      float N = 0;
-      float rms = 0;
-      float rmsErr = 0;
-      N = Ebis->GetEntries ();
-
-      try
-      {
-	if (N != 0)
-	  {
-
-	    Ebis->Fit ("mygauss", "QR");
-	    rms = std::abs (func->GetParameter (2));
-	    rmsErr = std::abs (func->GetParError (2));
-	  }
-
-	if (N == 0 || rms < 0 || rms > 50 || rmsErr <= 0 || rmsErr > 50)
-	  {
-	    N = 1;
-	    rms = 0;
-	    rmsErr = 0;
-	  }
 
-      }
-      catch (cms::Exception& e)
-      {
-        edm::LogError ("ZFitter") << "[Zfitter]: Exception when fitting..." << e.what();
-	N = 1;
-	rms = 40;
-	rmsErr = 0;
+    stats[0] = N;
+    stats[1] = N;
+    stats[2] = mean * N;
+    stats[3] = sigma * sigma * N + mean * mean * N;
+
+    R2->SetEntries(N);
+    R2->PutStats(stats);
+  }
+  /**************************************************************************/
+
+  if (me2 != nullptr) {
+    TH1F *Ebis = me2->getTH1F();
+    TH1F *R2bis = h_fitres2bis->getTH1F();
+    int division = Ebis->GetNbinsX();
+    float massMIN = Ebis->GetBinLowEdge(1);
+    float massMAX = Ebis->GetBinLowEdge(division + 1);
+    // float BIN_SIZE = B->GetBinWidth(1);
+
+    TF1 *func = new TF1("mygauss", mygauss, massMIN, massMAX, 3);
+    func->SetParameter(0, 1.0);
+    func->SetParName(0, "const");
+    func->SetParameter(1, 95.0);
+    func->SetParName(1, "mean");
+    func->SetParameter(2, 5.0);
+    func->SetParName(2, "sigma");
+
+    double stats[4];
+    R2bis->GetStats(stats);
+    float N = 0;
+    float rms = 0;
+    float rmsErr = 0;
+    N = Ebis->GetEntries();
+
+    try {
+      if (N != 0) {
+        Ebis->Fit("mygauss", "QR");
+        rms = std::abs(func->GetParameter(2));
+        rmsErr = std::abs(func->GetParError(2));
       }
 
-      stats[0] = N;
-      stats[1] = N;
-      stats[2] = rms * N;
-      stats[3] = rmsErr * rmsErr * N + rms * rms * N;
+      if (N == 0 || rms < 0 || rms > 50 || rmsErr <= 0 || rmsErr > 50) {
+        N = 1;
+        rms = 0;
+        rmsErr = 0;
+      }
 
-      R2bis->SetEntries (N);
-      R2bis->PutStats (stats);
+    } catch (cms::Exception &e) {
+      edm::LogError("ZFitter") << "[Zfitter]: Exception when fitting..." << e.what();
+      N = 1;
+      rms = 40;
+      rmsErr = 0;
     }
-/*********************************************************************************************/
-
-  if (me3 != nullptr)
-    {
-      TH1F *R3 = h_fitres3->getTH1F ();
-      TH1F *M = me3->getTH1F ();
-      int division = M->GetNbinsX ();
-      float massMIN = M->GetBinLowEdge (1);
-      float massMAX = M->GetBinLowEdge (division + 1);
-      //float BIN_SIZE = M->GetBinWidth(1);
-
-      TF1 *func = new TF1 ("mygauss", mygauss, massMIN, massMAX, 3);
-      func->SetParameter (0, 1.0);
-      func->SetParName (0, "const");
-      func->SetParameter (1, 95.0);
-      func->SetParName (1, "mean");
-      func->SetParameter (2, 5.0);
-      func->SetParName (2, "sigma");
-
-      double stats[4];
-      R3->GetStats (stats);
-      float N = 0;
-      float mean = 0;
-      float sigma = 0;
-      N = M->GetEntries ();
-
-
-      try
-      {
-	if (N != 0)
-	  {
-
-	    M->Fit ("mygauss", "QR");
-	    mean = std::abs (func->GetParameter (1));
-	    sigma = std::abs (func->GetParError (1));
-	  }
-	if (N == 0 || mean < 50 || mean > 100 || sigma <= 0 || sigma > 20)
-	  {
-	    N = 1;
-	    mean = 0;
-	    sigma = 0;
-	  }
 
+    stats[0] = N;
+    stats[1] = N;
+    stats[2] = rms * N;
+    stats[3] = rmsErr * rmsErr * N + rms * rms * N;
+
+    R2bis->SetEntries(N);
+    R2bis->PutStats(stats);
+  }
+  /*********************************************************************************************/
+
+  if (me3 != nullptr) {
+    TH1F *R3 = h_fitres3->getTH1F();
+    TH1F *M = me3->getTH1F();
+    int division = M->GetNbinsX();
+    float massMIN = M->GetBinLowEdge(1);
+    float massMAX = M->GetBinLowEdge(division + 1);
+    // float BIN_SIZE = M->GetBinWidth(1);
+
+    TF1 *func = new TF1("mygauss", mygauss, massMIN, massMAX, 3);
+    func->SetParameter(0, 1.0);
+    func->SetParName(0, "const");
+    func->SetParameter(1, 95.0);
+    func->SetParName(1, "mean");
+    func->SetParameter(2, 5.0);
+    func->SetParName(2, "sigma");
+
+    double stats[4];
+    R3->GetStats(stats);
+    float N = 0;
+    float mean = 0;
+    float sigma = 0;
+    N = M->GetEntries();
+
+    try {
+      if (N != 0) {
+        M->Fit("mygauss", "QR");
+        mean = std::abs(func->GetParameter(1));
+        sigma = std::abs(func->GetParError(1));
       }
-      catch (cms::Exception& e)
-      {
-        edm::LogError ("ZFitter") << "[Zfitter]: Exception when fitting..." << e.what();
-	N = 1;
-	mean = 40;
-	sigma = 0;
+      if (N == 0 || mean < 50 || mean > 100 || sigma <= 0 || sigma > 20) {
+        N = 1;
+        mean = 0;
+        sigma = 0;
       }
 
-      stats[0] = N;
-      stats[1] = N;
-      stats[2] = mean * N;
-      stats[3] = sigma * sigma * N + mean * mean * N;
-
-      R3->SetEntries (N);
-      R3->PutStats (stats);
+    } catch (cms::Exception &e) {
+      edm::LogError("ZFitter") << "[Zfitter]: Exception when fitting..." << e.what();
+      N = 1;
+      mean = 40;
+      sigma = 0;
     }
-  /********************************************************************************/
 
-  if (me3 != nullptr)
-    {
-      TH1F *Mbis = me3->getTH1F ();
-      TH1F *R3bis = h_fitres3bis->getTH1F ();
-      int division = Mbis->GetNbinsX ();
-      float massMIN = Mbis->GetBinLowEdge (1);
-      float massMAX = Mbis->GetBinLowEdge (division + 1);
-      //float BIN_SIZE = B->GetBinWidth(1);
-
-      TF1 *func = new TF1 ("mygauss", mygauss, massMIN, massMAX, 3);
-      func->SetParameter (0, 1.0);
-      func->SetParName (0, "const");
-      func->SetParameter (1, 95.0);
-      func->SetParName (1, "mean");
-      func->SetParameter (2, 5.0);
-      func->SetParName (2, "sigma");
-
-      double stats[4];
-      R3bis->GetStats (stats);
-      float N = 0;
-      float rms = 0;
-      float rmsErr = 0;
-      N = Mbis->GetEntries ();
-
-      try
-      {
-	if (N != 0)
-	  {
-
-	    Mbis->Fit ("mygauss", "QR");
-	    rms = std::abs (func->GetParameter (2));
-	    rmsErr = std::abs (func->GetParError (2));
-	  }
-
-	if (N == 0 || rms < 0 || rms > 50 || rmsErr <= 0 || rmsErr > 50)
-	  {
-	    N = 1;
-	    rms = 0;
-	    rmsErr = 0;
-	  }
+    stats[0] = N;
+    stats[1] = N;
+    stats[2] = mean * N;
+    stats[3] = sigma * sigma * N + mean * mean * N;
 
-      }
-      catch (cms::Exception& e)
-      {
-        edm::LogError ("ZFitter") << "[Zfitter]: Exception when fitting..." << e.what();
-	N = 1;
-	rms = 40;
-	rmsErr = 0;
+    R3->SetEntries(N);
+    R3->PutStats(stats);
+  }
+  /********************************************************************************/
+
+  if (me3 != nullptr) {
+    TH1F *Mbis = me3->getTH1F();
+    TH1F *R3bis = h_fitres3bis->getTH1F();
+    int division = Mbis->GetNbinsX();
+    float massMIN = Mbis->GetBinLowEdge(1);
+    float massMAX = Mbis->GetBinLowEdge(division + 1);
+    // float BIN_SIZE = B->GetBinWidth(1);
+
+    TF1 *func = new TF1("mygauss", mygauss, massMIN, massMAX, 3);
+    func->SetParameter(0, 1.0);
+    func->SetParName(0, "const");
+    func->SetParameter(1, 95.0);
+    func->SetParName(1, "mean");
+    func->SetParameter(2, 5.0);
+    func->SetParName(2, "sigma");
+
+    double stats[4];
+    R3bis->GetStats(stats);
+    float N = 0;
+    float rms = 0;
+    float rmsErr = 0;
+    N = Mbis->GetEntries();
+
+    try {
+      if (N != 0) {
+        Mbis->Fit("mygauss", "QR");
+        rms = std::abs(func->GetParameter(2));
+        rmsErr = std::abs(func->GetParError(2));
       }
 
-      stats[0] = N;
-      stats[1] = N;
-      stats[2] = rms * N;
-      stats[3] = rmsErr * rmsErr * N + rms * rms * N;
+      if (N == 0 || rms < 0 || rms > 50 || rmsErr <= 0 || rmsErr > 50) {
+        N = 1;
+        rms = 0;
+        rmsErr = 0;
+      }
 
-      R3bis->SetEntries (N);
-      R3bis->PutStats (stats);
+    } catch (cms::Exception &e) {
+      edm::LogError("ZFitter") << "[Zfitter]: Exception when fitting..." << e.what();
+      N = 1;
+      rms = 40;
+      rmsErr = 0;
     }
 
-  /*Chi2 */
+    stats[0] = N;
+    stats[1] = N;
+    stats[2] = rms * N;
+    stats[3] = rmsErr * rmsErr * N + rms * rms * N;
 
-  if (me1 != nullptr)
-    {
-      TH1F *C1 = me1->getTH1F ();
-      TH1F *S1 = h_fitres1Chi2->getTH1F ();
-      int division = C1->GetNbinsX ();
-      float massMIN = C1->GetBinLowEdge (1);
-      float massMAX = C1->GetBinLowEdge (division + 1);
-      //float BIN_SIZE = B->GetBinWidth(1);
-
-      TF1 *func = new TF1 ("mygauss", mygauss, massMIN, massMAX, 3);
-      func->SetParameter (0, 1.0);
-      func->SetParName (0, "const");
-      func->SetParameter (1, 95.0);
-      func->SetParName (1, "mean");
-      func->SetParameter (2, 5.0);
-      func->SetParName (2, "sigma");
-
-      double stats[4];
-      S1->GetStats (stats);
-      float N = 0;
-      float Chi2 = 0;
-      float NDF = 0;
-      N = C1->GetEntries ();
-
-      try
-      {
-	if (N != 0)
-	  {
-
-	    C1->Fit ("mygauss", "QR");
-	    if ((func->GetNDF () != 0))
-	      {
-		Chi2 = std::abs (func->GetChisquare ()) / std::abs (func->GetNDF ());
-		NDF = 0.1;
-	      }
-	  }
-
-	if (N == 0 || Chi2 < 0 || NDF < 0)
-	  {
-	    N = 1;
-	    Chi2 = 0;
-	    NDF = 0;
-	  }
+    R3bis->SetEntries(N);
+    R3bis->PutStats(stats);
+  }
 
-      }
-      catch (cms::Exception& e)
-      {
-        edm::LogError ("ZFitter") << "[Zfitter]: Exception when fitting..." << e.what();
-	N = 1;
-	Chi2 = 40;
-	NDF = 0;
+  /*Chi2 */
+
+  if (me1 != nullptr) {
+    TH1F *C1 = me1->getTH1F();
+    TH1F *S1 = h_fitres1Chi2->getTH1F();
+    int division = C1->GetNbinsX();
+    float massMIN = C1->GetBinLowEdge(1);
+    float massMAX = C1->GetBinLowEdge(division + 1);
+    // float BIN_SIZE = B->GetBinWidth(1);
+
+    TF1 *func = new TF1("mygauss", mygauss, massMIN, massMAX, 3);
+    func->SetParameter(0, 1.0);
+    func->SetParName(0, "const");
+    func->SetParameter(1, 95.0);
+    func->SetParName(1, "mean");
+    func->SetParameter(2, 5.0);
+    func->SetParName(2, "sigma");
+
+    double stats[4];
+    S1->GetStats(stats);
+    float N = 0;
+    float Chi2 = 0;
+    float NDF = 0;
+    N = C1->GetEntries();
+
+    try {
+      if (N != 0) {
+        C1->Fit("mygauss", "QR");
+        if ((func->GetNDF() != 0)) {
+          Chi2 = std::abs(func->GetChisquare()) / std::abs(func->GetNDF());
+          NDF = 0.1;
+        }
       }
 
-      stats[0] = N;
-      stats[1] = N;
-      stats[2] = Chi2 * N;
-      stats[3] = NDF * NDF * N + Chi2 * Chi2 * N;
+      if (N == 0 || Chi2 < 0 || NDF < 0) {
+        N = 1;
+        Chi2 = 0;
+        NDF = 0;
+      }
 
-      S1->SetEntries (N);
-      S1->PutStats (stats);
+    } catch (cms::Exception &e) {
+      edm::LogError("ZFitter") << "[Zfitter]: Exception when fitting..." << e.what();
+      N = 1;
+      Chi2 = 40;
+      NDF = 0;
     }
-  /**********************************************/
 
-  if (me2 != nullptr)
-    {
-      TH1F *C2 = me2->getTH1F ();
-      TH1F *S2 = h_fitres2Chi2->getTH1F ();
-      int division = C2->GetNbinsX ();
-      float massMIN = C2->GetBinLowEdge (1);
-      float massMAX = C2->GetBinLowEdge (division + 1);
-      //float BIN_SIZE = B->GetBinWidth(1);
-
-      TF1 *func = new TF1 ("mygauss", mygauss, massMIN, massMAX, 3);
-      func->SetParameter (0, 1.0);
-      func->SetParName (0, "const");
-      func->SetParameter (1, 95.0);
-      func->SetParName (1, "mean");
-      func->SetParameter (2, 5.0);
-      func->SetParName (2, "sigma");
-
-      double stats[4];
-      S2->GetStats (stats);
-      float N = 0;
-      float Chi2 = 0;
-      float NDF = 0;
-      N = C2->GetEntries ();
-
-      try
-      {
-	if (N != 0)
-	  {
-	    C2->Fit ("mygauss", "QR");
-	    if (func->GetNDF () != 0)
-	      {
-		Chi2 = std::abs (func->GetChisquare ()) / std::abs (func->GetNDF ());
-		NDF = 0.1;
-	      }
-	  }
-
-	if (N == 0 || Chi2 < 0 || NDF < 0)
-	  {
-	    N = 1;
-	    Chi2 = 0;
-	    NDF = 0;
-	  }
+    stats[0] = N;
+    stats[1] = N;
+    stats[2] = Chi2 * N;
+    stats[3] = NDF * NDF * N + Chi2 * Chi2 * N;
 
-      }
-      catch (cms::Exception& e)
-      {
-        edm::LogError ("ZFitter") << "[Zfitter]: Exception when fitting..." << e.what();
-	N = 1;
-	Chi2 = 40;
-	NDF = 0;
+    S1->SetEntries(N);
+    S1->PutStats(stats);
+  }
+  /**********************************************/
+
+  if (me2 != nullptr) {
+    TH1F *C2 = me2->getTH1F();
+    TH1F *S2 = h_fitres2Chi2->getTH1F();
+    int division = C2->GetNbinsX();
+    float massMIN = C2->GetBinLowEdge(1);
+    float massMAX = C2->GetBinLowEdge(division + 1);
+    // float BIN_SIZE = B->GetBinWidth(1);
+
+    TF1 *func = new TF1("mygauss", mygauss, massMIN, massMAX, 3);
+    func->SetParameter(0, 1.0);
+    func->SetParName(0, "const");
+    func->SetParameter(1, 95.0);
+    func->SetParName(1, "mean");
+    func->SetParameter(2, 5.0);
+    func->SetParName(2, "sigma");
+
+    double stats[4];
+    S2->GetStats(stats);
+    float N = 0;
+    float Chi2 = 0;
+    float NDF = 0;
+    N = C2->GetEntries();
+
+    try {
+      if (N != 0) {
+        C2->Fit("mygauss", "QR");
+        if (func->GetNDF() != 0) {
+          Chi2 = std::abs(func->GetChisquare()) / std::abs(func->GetNDF());
+          NDF = 0.1;
+        }
       }
 
-      stats[0] = N;
-      stats[1] = N;
-      stats[2] = Chi2 * N;
-      stats[3] = NDF * NDF * N + Chi2 * Chi2 * N;
+      if (N == 0 || Chi2 < 0 || NDF < 0) {
+        N = 1;
+        Chi2 = 0;
+        NDF = 0;
+      }
 
-      S2->SetEntries (N);
-      S2->PutStats (stats);
+    } catch (cms::Exception &e) {
+      edm::LogError("ZFitter") << "[Zfitter]: Exception when fitting..." << e.what();
+      N = 1;
+      Chi2 = 40;
+      NDF = 0;
     }
-  /**************************************************************************/
-  if (me3 != nullptr)
-    {
-      TH1F *C3 = me3->getTH1F ();
-      TH1F *S3 = h_fitres3Chi2->getTH1F ();
-      int division = C3->GetNbinsX ();
-      float massMIN = C3->GetBinLowEdge (1);
-      float massMAX = C3->GetBinLowEdge (division + 1);
-      //float BIN_SIZE = B->GetBinWidth(1);
-
-      TF1 *func = new TF1 ("mygauss", mygauss, massMIN, massMAX, 3);
-      func->SetParameter (0, 1.0);
-      func->SetParName (0, "const");
-      func->SetParameter (1, 95.0);
-      func->SetParName (1, "mean");
-      func->SetParameter (2, 5.0);
-      func->SetParName (2, "sigma");
-
-      double stats[4];
-      S3->GetStats (stats);
-      float N = 0;
-      float Chi2 = 0;
-      float NDF = 0;
-      N = C3->GetEntries ();
-
-      try
-      {
-	if (N != 0)
-	  {
-	    C3->Fit ("mygauss", "QR");
-	    if ((func->GetNDF () != 0))
-	      {
-		Chi2 = std::abs (func->GetChisquare ()) / std::abs (func->GetNDF ());
-		NDF = 0.1;
-	      }
-	  }
-
-
-	if (N == 0 || Chi2 < 0 || NDF < 0)
-	  {
-	    N = 1;
-	    Chi2 = 0;
-	    NDF = 0;
-	  }
 
-      }
-      catch (cms::Exception& e)
-      {
-        edm::LogError ("ZFitter") << "[Zfitter]: Exception when fitting..." << e.what();
-	N = 1;
-	Chi2 = 40;
-	NDF = 0;
+    stats[0] = N;
+    stats[1] = N;
+    stats[2] = Chi2 * N;
+    stats[3] = NDF * NDF * N + Chi2 * Chi2 * N;
+
+    S2->SetEntries(N);
+    S2->PutStats(stats);
+  }
+  /**************************************************************************/
+  if (me3 != nullptr) {
+    TH1F *C3 = me3->getTH1F();
+    TH1F *S3 = h_fitres3Chi2->getTH1F();
+    int division = C3->GetNbinsX();
+    float massMIN = C3->GetBinLowEdge(1);
+    float massMAX = C3->GetBinLowEdge(division + 1);
+    // float BIN_SIZE = B->GetBinWidth(1);
+
+    TF1 *func = new TF1("mygauss", mygauss, massMIN, massMAX, 3);
+    func->SetParameter(0, 1.0);
+    func->SetParName(0, "const");
+    func->SetParameter(1, 95.0);
+    func->SetParName(1, "mean");
+    func->SetParameter(2, 5.0);
+    func->SetParName(2, "sigma");
+
+    double stats[4];
+    S3->GetStats(stats);
+    float N = 0;
+    float Chi2 = 0;
+    float NDF = 0;
+    N = C3->GetEntries();
+
+    try {
+      if (N != 0) {
+        C3->Fit("mygauss", "QR");
+        if ((func->GetNDF() != 0)) {
+          Chi2 = std::abs(func->GetChisquare()) / std::abs(func->GetNDF());
+          NDF = 0.1;
+        }
       }
 
-      stats[0] = N;
-      stats[1] = N;
-      stats[2] = Chi2 * N;
-      stats[3] = NDF * NDF * N + Chi2 * Chi2 * N;
+      if (N == 0 || Chi2 < 0 || NDF < 0) {
+        N = 1;
+        Chi2 = 0;
+        NDF = 0;
+      }
 
-      S3->SetEntries (N);
-      S3->PutStats (stats);
+    } catch (cms::Exception &e) {
+      edm::LogError("ZFitter") << "[Zfitter]: Exception when fitting..." << e.what();
+      N = 1;
+      Chi2 = 40;
+      NDF = 0;
     }
+
+    stats[0] = N;
+    stats[1] = N;
+    stats[2] = Chi2 * N;
+    stats[3] = NDF * NDF * N + Chi2 * Chi2 * N;
+
+    S3->SetEntries(N);
+    S3->PutStats(stats);
+  }
 }
 
-//Breit-Wigner function
-Double_t
-mybw (Double_t * x, Double_t * par)
-{
-  Double_t arg1 = 14.0 / 22.0;	// 2 over pi
-  Double_t arg2 = par[1] * par[1] * par[2] * par[2];	//Gamma=par[2]  M=par[1]
-  Double_t arg3 =
-    ((x[0] * x[0]) - (par[1] * par[1])) * ((x[0] * x[0]) - (par[1] * par[1]));
-  Double_t arg4 =
-    x[0] * x[0] * x[0] * x[0] * ((par[2] * par[2]) / (par[1] * par[1]));
+// Breit-Wigner function
+Double_t mybw(Double_t *x, Double_t *par) {
+  Double_t arg1 = 14.0 / 22.0;                        // 2 over pi
+  Double_t arg2 = par[1] * par[1] * par[2] * par[2];  // Gamma=par[2]  M=par[1]
+  Double_t arg3 = ((x[0] * x[0]) - (par[1] * par[1])) * ((x[0] * x[0]) - (par[1] * par[1]));
+  Double_t arg4 = x[0] * x[0] * x[0] * x[0] * ((par[2] * par[2]) / (par[1] * par[1]));
   return par[0] * arg1 * arg2 / (arg3 + arg4);
 }
 
-//Gaussian
-Double_t
-mygauss (Double_t * x, Double_t * par)
-{
+// Gaussian
+Double_t mygauss(Double_t *x, Double_t *par) {
   Double_t arg = 0;
   if (par[2] < 0)
-    par[2] = -par[2];		// par[2]: sigma
+    par[2] = -par[2];  // par[2]: sigma
   if (par[2] != 0)
-    arg = (x[0] - par[1]) / par[2];	// par[1]: mean
-  return par[0] * TMath::Exp (-0.5 * arg * arg) / (TMath::Sqrt (2 * TMath::Pi ()) * par[2]);	// par[0] is constant
-
+    arg = (x[0] - par[1]) / par[2];                                                        // par[1]: mean
+  return par[0] * TMath::Exp(-0.5 * arg * arg) / (TMath::Sqrt(2 * TMath::Pi()) * par[2]);  // par[0] is constant
 }
 
-DEFINE_FWK_MODULE (EcalZmassClient);
+DEFINE_FWK_MODULE(EcalZmassClient);
diff --git a/DQMOffline/Ecal/plugins/EcalZmassTask.cc b/DQMOffline/Ecal/plugins/EcalZmassTask.cc
index 7d99db508d769..cbeae20ddc0bf 100644
--- a/DQMOffline/Ecal/plugins/EcalZmassTask.cc
+++ b/DQMOffline/Ecal/plugins/EcalZmassTask.cc
@@ -2,7 +2,7 @@
 //
 // Package:    Zanalyzer
 // Class:      Zanalyzer
-// 
+//
 /**\class Zanalyzer Zanalyzer.cc Zmonitoring/Zanalyzer/src/Zanalyzer.cc
 
 Description: [one line class summary]
@@ -16,7 +16,6 @@ Description: [one line class summary]
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -27,30 +26,29 @@ Description: [one line class summary]
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
+#include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
-#include "TLorentzVector.h"
-#include "TMath.h"
-#include <string>
-#include <cmath>
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include <iostream>
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
+#include "TLorentzVector.h"
+#include "TMath.h"
+#include <cmath>
+#include <iostream>
+#include <string>
 
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-class EcalZmassTask: public DQMEDAnalyzer {
-
+class EcalZmassTask : public DQMEDAnalyzer {
 public:
-  explicit EcalZmassTask (const edm::ParameterSet &);
-  ~EcalZmassTask () override {}
+  explicit EcalZmassTask(const edm::ParameterSet &);
+  ~EcalZmassTask() override {}
 
 private:
-  void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
-  void analyze (const edm::Event &, const edm::EventSetup &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
   const edm::EDGetTokenT<reco::GsfElectronCollection> electronCollectionToken_;
   const edm::EDGetTokenT<reco::GsfTrackCollection> trackCollectionToken_;
@@ -70,29 +68,26 @@ class EcalZmassTask: public DQMEDAnalyzer {
   MonitorElement *h_95_ee_invMass_EB;
   MonitorElement *h_95_ee_invMass_EE;
   MonitorElement *h_95_ee_invMass_BB;
-
 };
 
-EcalZmassTask::EcalZmassTask (const edm::ParameterSet & parameters) :
-  electronCollectionToken_(consumes<reco::GsfElectronCollection>(parameters.getParameter < edm::InputTag > ("electronCollection"))),
-  trackCollectionToken_(consumes<reco::GsfTrackCollection>(parameters.getParameter<edm::InputTag>("trackCollection"))),
-  prefixME_(parameters.getUntrackedParameter < std::string > ("prefixME", ""))
-{
-}
+EcalZmassTask::EcalZmassTask(const edm::ParameterSet &parameters)
+    : electronCollectionToken_(
+          consumes<reco::GsfElectronCollection>(parameters.getParameter<edm::InputTag>("electronCollection"))),
+      trackCollectionToken_(
+          consumes<reco::GsfTrackCollection>(parameters.getParameter<edm::InputTag>("trackCollection"))),
+      prefixME_(parameters.getUntrackedParameter<std::string>("prefixME", "")) {}
 
 // ------------ method called for each event  ------------
-void
-EcalZmassTask::analyze (const edm::Event & iEvent,
-			const edm::EventSetup & iSetup)
-{
+void EcalZmassTask::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace edm;
-  Handle < reco::GsfElectronCollection > electronCollection;
-  iEvent.getByToken (electronCollectionToken_, electronCollection);
-  if (!electronCollection.isValid ()) return;
+  Handle<reco::GsfElectronCollection> electronCollection;
+  iEvent.getByToken(electronCollectionToken_, electronCollection);
+  if (!electronCollection.isValid())
+    return;
 
-  //get GSF Tracks
-  Handle < reco::GsfTrackCollection > gsftracks_h;
-  iEvent.getByToken (trackCollectionToken_, gsftracks_h);
+  // get GSF Tracks
+  Handle<reco::GsfTrackCollection> gsftracks_h;
+  iEvent.getByToken(trackCollectionToken_, gsftracks_h);
 
   bool isIsolatedBarrel;
   bool isIDBarrel;
@@ -101,165 +96,138 @@ EcalZmassTask::analyze (const edm::Event & iEvent,
   bool isIDEndcap;
   bool isConvertedEndcap;
 
-  int elIsAccepted=0;
-  int elIsAcceptedEB=0;
-  int elIsAcceptedEE=0;
+  int elIsAccepted = 0;
+  int elIsAcceptedEB = 0;
+  int elIsAcceptedEE = 0;
 
   std::vector<TLorentzVector> LV;
 
-  for (reco::GsfElectronCollection::const_iterator recoElectron =
-	 electronCollection->begin ();
-       recoElectron != electronCollection->end (); recoElectron++)
-    {
-
-      if (recoElectron->et () <= 25)
-	continue;
-
-      // Define Isolation variables
-      double IsoTrk = (recoElectron->dr03TkSumPt () / recoElectron->et ());
-      double IsoEcal =
-	(recoElectron->dr03EcalRecHitSumEt () / recoElectron->et ());
-      double IsoHcal =
-	(recoElectron->dr03HcalTowerSumEt () / recoElectron->et ());
-      double HE = (recoElectron->hcalOverEcal ());
-
-      //Define ID variables
-
-      float DeltaPhiTkClu = recoElectron->deltaPhiSuperClusterTrackAtVtx ();
-      float DeltaEtaTkClu = recoElectron->deltaEtaSuperClusterTrackAtVtx ();
-      float sigmaIeIe = recoElectron->sigmaIetaIeta ();
-
-      //Define Conversion Rejection Variables
-
-      float Dcot = recoElectron->convDcot ();
-      float Dist = recoElectron->convDist ();
-      int NumberOfExpectedInnerHits = recoElectron->gsfTrack()->hitPattern().numberOfLostHits(reco::HitPattern::MISSING_INNER_HITS);
-
-      //quality flags
-
-      isIsolatedBarrel = false;
-      isIDBarrel = false;
-      isConvertedBarrel = false;
-      isIsolatedEndcap = false;
-      isIDEndcap = false;
-      isConvertedEndcap = false;
-
-
-      /***** Barrel WP80 Cuts *****/
-
-      if (fabs (recoElectron->eta ()) <= 1.4442)
-	{
-
-	  /* Isolation */
-	  if (IsoTrk < 0.09 && IsoEcal < 0.07 && IsoHcal < 0.10)
-	    {
-	      isIsolatedBarrel = true;
-	    }
-
-	  /* Identification */
-	  if (fabs (DeltaEtaTkClu) < 0.004 && fabs (DeltaPhiTkClu) < 0.06
-	      && sigmaIeIe < 0.01 && HE < 0.04)
-	    {
-	      isIDBarrel = true;
-	    }
-
-	  /* Conversion Rejection */
-	  if ((fabs (Dist) >= 0.02 || fabs (Dcot) >= 0.02)
-	      && NumberOfExpectedInnerHits <= 1.0)
-	    {
-	      isConvertedBarrel = true;
-	    }
-	}
-
-      if (isIsolatedBarrel && isIDBarrel && isConvertedBarrel) {
-	elIsAccepted++;
-	elIsAcceptedEB++;
-	TLorentzVector b_e2(recoElectron->momentum ().x (),recoElectron->momentum ().y (),recoElectron->momentum ().z (), recoElectron->p ());
-	LV.push_back(b_e2);
+  for (reco::GsfElectronCollection::const_iterator recoElectron = electronCollection->begin();
+       recoElectron != electronCollection->end();
+       recoElectron++) {
+    if (recoElectron->et() <= 25)
+      continue;
+
+    // Define Isolation variables
+    double IsoTrk = (recoElectron->dr03TkSumPt() / recoElectron->et());
+    double IsoEcal = (recoElectron->dr03EcalRecHitSumEt() / recoElectron->et());
+    double IsoHcal = (recoElectron->dr03HcalTowerSumEt() / recoElectron->et());
+    double HE = (recoElectron->hcalOverEcal());
+
+    // Define ID variables
+
+    float DeltaPhiTkClu = recoElectron->deltaPhiSuperClusterTrackAtVtx();
+    float DeltaEtaTkClu = recoElectron->deltaEtaSuperClusterTrackAtVtx();
+    float sigmaIeIe = recoElectron->sigmaIetaIeta();
+
+    // Define Conversion Rejection Variables
+
+    float Dcot = recoElectron->convDcot();
+    float Dist = recoElectron->convDist();
+    int NumberOfExpectedInnerHits =
+        recoElectron->gsfTrack()->hitPattern().numberOfLostHits(reco::HitPattern::MISSING_INNER_HITS);
+
+    // quality flags
+
+    isIsolatedBarrel = false;
+    isIDBarrel = false;
+    isConvertedBarrel = false;
+    isIsolatedEndcap = false;
+    isIDEndcap = false;
+    isConvertedEndcap = false;
+
+    /***** Barrel WP80 Cuts *****/
+
+    if (fabs(recoElectron->eta()) <= 1.4442) {
+      /* Isolation */
+      if (IsoTrk < 0.09 && IsoEcal < 0.07 && IsoHcal < 0.10) {
+        isIsolatedBarrel = true;
       }
 
-      /***** Endcap WP80 Cuts *****/
-
-      if (fabs (recoElectron->eta ()) >= 1.5660
-	  && fabs (recoElectron->eta ()) <= 2.5000)
-	{
-
-	  /* Isolation */
-	  if (IsoTrk < 0.04 && IsoEcal < 0.05 && IsoHcal < 0.025)
-	    {
-	      isIsolatedEndcap = true;
-	    }
-
-	  /* Identification */
-	  if (fabs (DeltaEtaTkClu) < 0.007 && fabs (DeltaPhiTkClu) < 0.03
-	      && sigmaIeIe < 0.031 && HE < 0.15)
-	    {
-	      isIDEndcap = true;
-	    }
-
-	  /* Conversion Rejection */
-	  if ((fabs (Dcot) > 0.02 || fabs (Dist) > 0.02)
-	      && NumberOfExpectedInnerHits <= 1.0)
-	    {
-	      isConvertedEndcap = true;
-	    }
-	}
-      if (isIsolatedEndcap && isIDEndcap && isConvertedEndcap) {
-	elIsAccepted++;
-	elIsAcceptedEE++;
-	TLorentzVector e_e2(recoElectron->momentum ().x (),recoElectron->momentum ().y (),recoElectron->momentum ().z (), recoElectron->p ());
-	LV.push_back(e_e2);
+      /* Identification */
+      if (fabs(DeltaEtaTkClu) < 0.004 && fabs(DeltaPhiTkClu) < 0.06 && sigmaIeIe < 0.01 && HE < 0.04) {
+        isIDBarrel = true;
       }
 
+      /* Conversion Rejection */
+      if ((fabs(Dist) >= 0.02 || fabs(Dcot) >= 0.02) && NumberOfExpectedInnerHits <= 1.0) {
+        isConvertedBarrel = true;
+      }
     }
 
+    if (isIsolatedBarrel && isIDBarrel && isConvertedBarrel) {
+      elIsAccepted++;
+      elIsAcceptedEB++;
+      TLorentzVector b_e2(
+          recoElectron->momentum().x(), recoElectron->momentum().y(), recoElectron->momentum().z(), recoElectron->p());
+      LV.push_back(b_e2);
+    }
+
+    /***** Endcap WP80 Cuts *****/
+
+    if (fabs(recoElectron->eta()) >= 1.5660 && fabs(recoElectron->eta()) <= 2.5000) {
+      /* Isolation */
+      if (IsoTrk < 0.04 && IsoEcal < 0.05 && IsoHcal < 0.025) {
+        isIsolatedEndcap = true;
+      }
+
+      /* Identification */
+      if (fabs(DeltaEtaTkClu) < 0.007 && fabs(DeltaPhiTkClu) < 0.03 && sigmaIeIe < 0.031 && HE < 0.15) {
+        isIDEndcap = true;
+      }
+
+      /* Conversion Rejection */
+      if ((fabs(Dcot) > 0.02 || fabs(Dist) > 0.02) && NumberOfExpectedInnerHits <= 1.0) {
+        isConvertedEndcap = true;
+      }
+    }
+    if (isIsolatedEndcap && isIDEndcap && isConvertedEndcap) {
+      elIsAccepted++;
+      elIsAcceptedEE++;
+      TLorentzVector e_e2(
+          recoElectron->momentum().x(), recoElectron->momentum().y(), recoElectron->momentum().z(), recoElectron->p());
+      LV.push_back(e_e2);
+    }
+  }
+
   // Calculate the Z invariant masses
 
-  if (elIsAccepted>1){
-    double e_ee_invMass=0; 
-    if (LV.size()==2){
+  if (elIsAccepted > 1) {
+    double e_ee_invMass = 0;
+    if (LV.size() == 2) {
       TLorentzVector e_pair = LV[0] + LV[1];
-      e_ee_invMass = e_pair.M ();
-    }  
-		      
-    if (elIsAcceptedEB==2){
+      e_ee_invMass = e_pair.M();
+    }
+
+    if (elIsAcceptedEB == 2) {
       h_ee_invMass_BB->Fill(e_ee_invMass);
     }
-    if (elIsAcceptedEE==2){
+    if (elIsAcceptedEE == 2) {
       h_ee_invMass_EE->Fill(e_ee_invMass);
     }
-    if (elIsAcceptedEB==1 && elIsAcceptedEE==1){
+    if (elIsAcceptedEB == 1 && elIsAcceptedEE == 1) {
       h_ee_invMass_EB->Fill(e_ee_invMass);
     }
-		      
+
     LV.clear();
-				  
   }
 }
 
-void
-EcalZmassTask::bookHistograms(DQMStore::IBooker& iBooker, edm::Run const&, edm::EventSetup const&)
-{
+void EcalZmassTask::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, edm::EventSetup const &) {
   std::string logTraceName("EcalZmassTask");
 
   h_ee_invMass_EB = nullptr;
   h_ee_invMass_EE = nullptr;
   h_ee_invMass_BB = nullptr;
 
-  LogTrace (logTraceName) << "Parameters initialization";
+  LogTrace(logTraceName) << "Parameters initialization";
 
-  iBooker.setCurrentFolder (prefixME_ + "/Zmass");	// Use folder with name of PAG
+  iBooker.setCurrentFolder(prefixME_ + "/Zmass");  // Use folder with name of PAG
 
-  h_ee_invMass_EB =
-	iBooker.book1D ("Z peak - WP80 EB-EE",
-                    "Z peak - WP80 EB-EE;InvMass (GeV)", 60, 60.0, 120.0);
-  h_ee_invMass_EE =
-	iBooker.book1D ("Z peak - WP80 EE-EE",
-                    "Z peak - WP80 EE-EE;InvMass (Gev)", 60, 60.0, 120.0);
-  h_ee_invMass_BB =
-	iBooker.book1D ("Z peak - WP80 EB-EB",
-                    "Z peak - WP80 EB-EB;InvMass (Gev)", 60, 60.0, 120.0);
+  h_ee_invMass_EB = iBooker.book1D("Z peak - WP80 EB-EE", "Z peak - WP80 EB-EE;InvMass (GeV)", 60, 60.0, 120.0);
+  h_ee_invMass_EE = iBooker.book1D("Z peak - WP80 EE-EE", "Z peak - WP80 EE-EE;InvMass (Gev)", 60, 60.0, 120.0);
+  h_ee_invMass_BB = iBooker.book1D("Z peak - WP80 EB-EB", "Z peak - WP80 EB-EB;InvMass (Gev)", 60, 60.0, 120.0);
 }
 
-//define this as a plug-in
-DEFINE_FWK_MODULE (EcalZmassTask);
+// define this as a plug-in
+DEFINE_FWK_MODULE(EcalZmassTask);
diff --git a/DQMOffline/Hcal/interface/CaloTowersAnalyzer.h b/DQMOffline/Hcal/interface/CaloTowersAnalyzer.h
index bb9446c446291..91767e1db673f 100644
--- a/DQMOffline/Hcal/interface/CaloTowersAnalyzer.h
+++ b/DQMOffline/Hcal/interface/CaloTowersAnalyzer.h
@@ -1,61 +1,60 @@
 #ifndef _DQMOFFLINE_HCAL_CALOTOWERSANALYZER_H_
 #define _DQMOFFLINE_HCAL_CALOTOWERSANALYZER_H_
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 
-#include "DataFormats/HcalDetId/interface/HcalElectronicsId.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
+#include "DataFormats/HcalDetId/interface/HcalElectronicsId.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
+#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 #include "Geometry/CaloTopology/interface/HcalTopology.h"
 #include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h"
 
-#include "DataFormats/DetId/interface/DetId.h"
+#include "DataFormats/CaloTowers/interface/CaloTowerCollection.h"
 #include "DataFormats/CaloTowers/interface/CaloTowerDetId.h"
+#include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/Math/interface/Vector3D.h"
-#include "DataFormats/CaloTowers/interface/CaloTowerCollection.h"
 
-#include <vector>
-#include <utility>
-#include <ostream>
-#include <string>
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include <algorithm>
 #include <cmath>
-#include "DQMServices/Core/interface/MonitorElement.h"
-
+#include <ostream>
+#include <string>
+#include <utility>
+#include <vector>
 
 class CaloTowersAnalyzer : public DQMEDAnalyzer {
- public:
-   CaloTowersAnalyzer(edm::ParameterSet const& conf);
+public:
+  CaloTowersAnalyzer(edm::ParameterSet const &conf);
   ~CaloTowersAnalyzer() override;
-  
-  void analyze(edm::Event const& e, edm::EventSetup const& c) override;
+
+  void analyze(edm::Event const &e, edm::EventSetup const &c) override;
   void beginJob() override;
   void endJob() override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void dqmBeginRun(const edm::Run& run, const edm::EventSetup& c) override;
+  void dqmBeginRun(const edm::Run &run, const edm::EventSetup &c) override;
 
- private:
+private:
   double dR(double eta1, double phi1, double eta2, double phi2);
-   
+
   std::string outputFile_;
   std::string hcalselector_;
   std::string mc_;
-  bool        useAllHistos_;
+  bool useAllHistos_;
 
   typedef math::RhoEtaPhiVector Vector;
 
@@ -80,145 +79,144 @@ class CaloTowersAnalyzer : public DQMEDAnalyzer {
   float ieta_min_, ieta_max_;
 
   // ieta scan
-  MonitorElement*  emean_vs_ieta_E;
-  MonitorElement*  emean_vs_ieta_H;
-  MonitorElement*  emean_vs_ieta_EH;
+  MonitorElement *emean_vs_ieta_E;
+  MonitorElement *emean_vs_ieta_H;
+  MonitorElement *emean_vs_ieta_EH;
 
-  MonitorElement*  emean_vs_ieta_E1;
-  MonitorElement*  emean_vs_ieta_H1;
-  MonitorElement*  emean_vs_ieta_EH1;
+  MonitorElement *emean_vs_ieta_E1;
+  MonitorElement *emean_vs_ieta_H1;
+  MonitorElement *emean_vs_ieta_EH1;
 
-  MonitorElement* Ntowers_vs_ieta;
-  MonitorElement* occupancy_map;
-  MonitorElement* occupancy_vs_ieta;
+  MonitorElement *Ntowers_vs_ieta;
+  MonitorElement *occupancy_map;
+  MonitorElement *occupancy_vs_ieta;
 
   // Global maps
-  MonitorElement*  mapEnergy_E;
-  MonitorElement*  mapEnergy_H;
-  MonitorElement*  mapEnergy_EH;
-  MonitorElement*  mapEnergy_N;
+  MonitorElement *mapEnergy_E;
+  MonitorElement *mapEnergy_H;
+  MonitorElement *mapEnergy_EH;
+  MonitorElement *mapEnergy_N;
 
   // for number of bad, recovered and problematic Ecal and Hcal cells
-  MonitorElement* numBadCellsEcal_EB;
-  MonitorElement* numBadCellsEcal_EE;
-  MonitorElement* numRcvCellsEcal_EB;
-  MonitorElement* numRcvCellsEcal_EE;
-  MonitorElement* numPrbCellsEcal_EB;
-  MonitorElement* numPrbCellsEcal_EE;
-
-  MonitorElement* numBadCellsHcal_HB;
-  MonitorElement* numBadCellsHcal_HE;
-  MonitorElement* numBadCellsHcal_HF;
-  MonitorElement* numRcvCellsHcal_HB;
-  MonitorElement* numRcvCellsHcal_HE;
-  MonitorElement* numRcvCellsHcal_HF;
-  MonitorElement* numPrbCellsHcal_HB;
-  MonitorElement* numPrbCellsHcal_HE;
-  MonitorElement* numPrbCellsHcal_HF; 
+  MonitorElement *numBadCellsEcal_EB;
+  MonitorElement *numBadCellsEcal_EE;
+  MonitorElement *numRcvCellsEcal_EB;
+  MonitorElement *numRcvCellsEcal_EE;
+  MonitorElement *numPrbCellsEcal_EB;
+  MonitorElement *numPrbCellsEcal_EE;
+
+  MonitorElement *numBadCellsHcal_HB;
+  MonitorElement *numBadCellsHcal_HE;
+  MonitorElement *numBadCellsHcal_HF;
+  MonitorElement *numRcvCellsHcal_HB;
+  MonitorElement *numRcvCellsHcal_HE;
+  MonitorElement *numRcvCellsHcal_HF;
+  MonitorElement *numPrbCellsHcal_HB;
+  MonitorElement *numPrbCellsHcal_HE;
+  MonitorElement *numPrbCellsHcal_HF;
 
   // HB
-  MonitorElement* meEnergyHcalvsEcal_HB;
-  MonitorElement* meEnergyHO_HB; 
-  MonitorElement* meEnergyEcal_HB; 
-  MonitorElement* meEnergyHcal_HB; 
-  MonitorElement* meNumFiredTowers_HB;
-
-  MonitorElement* meEnergyEcalTower_HB;
-  MonitorElement* meEnergyHcalTower_HB;
-  MonitorElement* meTotEnergy_HB;
-
-  MonitorElement* meIphiHcalTower_HBP; 
-  MonitorElement* meIphiHcalTower_HBM; 
-
-  MonitorElement* mapEnergy_HB;
-  MonitorElement* mapEnergyEcal_HB;
-  MonitorElement* mapEnergyHcal_HB;
-  MonitorElement* MET_HB;
-  MonitorElement* SET_HB;
-  MonitorElement* phiMET_HB;
-
-  MonitorElement* emTiming_HB;
-  MonitorElement* hadTiming_HB;
-
-  MonitorElement* emEnergyTiming_Low_HB;
-  MonitorElement* emEnergyTiming_HB;
-  MonitorElement* emEnergyTiming_High_HB;
-  MonitorElement* emEnergyTiming_profile_Low_HB;
-  MonitorElement* emEnergyTiming_profile_HB;
-  MonitorElement* emEnergyTiming_profile_High_HB;
-
-  MonitorElement* hadEnergyTiming_Low_HB;
-  MonitorElement* hadEnergyTiming_HB;
-  MonitorElement* hadEnergyTiming_High_HB;
-  MonitorElement* hadEnergyTiming_profile_Low_HB;
-  MonitorElement* hadEnergyTiming_profile_HB;
-  MonitorElement* hadEnergyTiming_profile_High_HB;
+  MonitorElement *meEnergyHcalvsEcal_HB;
+  MonitorElement *meEnergyHO_HB;
+  MonitorElement *meEnergyEcal_HB;
+  MonitorElement *meEnergyHcal_HB;
+  MonitorElement *meNumFiredTowers_HB;
+
+  MonitorElement *meEnergyEcalTower_HB;
+  MonitorElement *meEnergyHcalTower_HB;
+  MonitorElement *meTotEnergy_HB;
+
+  MonitorElement *meIphiHcalTower_HBP;
+  MonitorElement *meIphiHcalTower_HBM;
+
+  MonitorElement *mapEnergy_HB;
+  MonitorElement *mapEnergyEcal_HB;
+  MonitorElement *mapEnergyHcal_HB;
+  MonitorElement *MET_HB;
+  MonitorElement *SET_HB;
+  MonitorElement *phiMET_HB;
+
+  MonitorElement *emTiming_HB;
+  MonitorElement *hadTiming_HB;
+
+  MonitorElement *emEnergyTiming_Low_HB;
+  MonitorElement *emEnergyTiming_HB;
+  MonitorElement *emEnergyTiming_High_HB;
+  MonitorElement *emEnergyTiming_profile_Low_HB;
+  MonitorElement *emEnergyTiming_profile_HB;
+  MonitorElement *emEnergyTiming_profile_High_HB;
+
+  MonitorElement *hadEnergyTiming_Low_HB;
+  MonitorElement *hadEnergyTiming_HB;
+  MonitorElement *hadEnergyTiming_High_HB;
+  MonitorElement *hadEnergyTiming_profile_Low_HB;
+  MonitorElement *hadEnergyTiming_profile_HB;
+  MonitorElement *hadEnergyTiming_profile_High_HB;
 
   // HE
-  MonitorElement* meEnergyHcalvsEcal_HE;
-  MonitorElement* meEnergyHO_HE; 
-  MonitorElement* meEnergyEcal_HE; 
-  MonitorElement* meEnergyHcal_HE; 
-  MonitorElement* meNumFiredTowers_HE;
-
-  MonitorElement* meEnergyEcalTower_HE;
-  MonitorElement* meEnergyHcalTower_HE;
-  MonitorElement* meTotEnergy_HE;
-
-  MonitorElement* meIphiHcalTower_HEP; 
-  MonitorElement* meIphiHcalTower_HEM; 
-
-  MonitorElement* mapEnergy_HE;
-  MonitorElement* mapEnergyEcal_HE;
-  MonitorElement* mapEnergyHcal_HE;
-  MonitorElement* MET_HE;
-  MonitorElement* SET_HE;
-  MonitorElement* phiMET_HE;
-
-  MonitorElement* emTiming_HE;
-  MonitorElement* hadTiming_HE;
-
-  MonitorElement* emEnergyTiming_Low_HE;
-  MonitorElement* emEnergyTiming_HE;
-  MonitorElement* emEnergyTiming_profile_Low_HE;
-  MonitorElement* emEnergyTiming_profile_HE;
-
-  MonitorElement* hadEnergyTiming_Low_HE;
-  MonitorElement* hadEnergyTiming_HE;
-  MonitorElement* hadEnergyTiming_profile_Low_HE;
-  MonitorElement* hadEnergyTiming_profile_HE;
+  MonitorElement *meEnergyHcalvsEcal_HE;
+  MonitorElement *meEnergyHO_HE;
+  MonitorElement *meEnergyEcal_HE;
+  MonitorElement *meEnergyHcal_HE;
+  MonitorElement *meNumFiredTowers_HE;
+
+  MonitorElement *meEnergyEcalTower_HE;
+  MonitorElement *meEnergyHcalTower_HE;
+  MonitorElement *meTotEnergy_HE;
+
+  MonitorElement *meIphiHcalTower_HEP;
+  MonitorElement *meIphiHcalTower_HEM;
+
+  MonitorElement *mapEnergy_HE;
+  MonitorElement *mapEnergyEcal_HE;
+  MonitorElement *mapEnergyHcal_HE;
+  MonitorElement *MET_HE;
+  MonitorElement *SET_HE;
+  MonitorElement *phiMET_HE;
+
+  MonitorElement *emTiming_HE;
+  MonitorElement *hadTiming_HE;
+
+  MonitorElement *emEnergyTiming_Low_HE;
+  MonitorElement *emEnergyTiming_HE;
+  MonitorElement *emEnergyTiming_profile_Low_HE;
+  MonitorElement *emEnergyTiming_profile_HE;
+
+  MonitorElement *hadEnergyTiming_Low_HE;
+  MonitorElement *hadEnergyTiming_HE;
+  MonitorElement *hadEnergyTiming_profile_Low_HE;
+  MonitorElement *hadEnergyTiming_profile_HE;
 
   // HF
-  MonitorElement* meEnergyHcalvsEcal_HF;
-  MonitorElement* meEnergyHO_HF; 
-  MonitorElement* meEnergyEcal_HF; 
-  MonitorElement* meEnergyHcal_HF; 
-  MonitorElement* meNumFiredTowers_HF;
-
-  MonitorElement* meEnergyEcalTower_HF;
-  MonitorElement* meEnergyHcalTower_HF;
-  MonitorElement* meTotEnergy_HF;
-
-  MonitorElement* meIphiCaloTower_HFP; 
-  MonitorElement* meIphiCaloTower_HFM; 
-
-  MonitorElement* mapEnergy_HF;
-  MonitorElement* mapEnergyEcal_HF;
-  MonitorElement* mapEnergyHcal_HF;
-  MonitorElement* MET_HF;
-  MonitorElement* SET_HF;
-  MonitorElement* phiMET_HF;
-
-  MonitorElement* emTiming_HF;
-  MonitorElement* hadTiming_HF;
-  MonitorElement* emEnergyTiming_HF;
-  MonitorElement* emEnergyTiming_profile_HF;
-
-  MonitorElement* hadEnergyTiming_Low_HF;
-  MonitorElement* hadEnergyTiming_HF;
-  MonitorElement* hadEnergyTiming_profile_Low_HF;
-  MonitorElement* hadEnergyTiming_profile_HF;
-
+  MonitorElement *meEnergyHcalvsEcal_HF;
+  MonitorElement *meEnergyHO_HF;
+  MonitorElement *meEnergyEcal_HF;
+  MonitorElement *meEnergyHcal_HF;
+  MonitorElement *meNumFiredTowers_HF;
+
+  MonitorElement *meEnergyEcalTower_HF;
+  MonitorElement *meEnergyHcalTower_HF;
+  MonitorElement *meTotEnergy_HF;
+
+  MonitorElement *meIphiCaloTower_HFP;
+  MonitorElement *meIphiCaloTower_HFM;
+
+  MonitorElement *mapEnergy_HF;
+  MonitorElement *mapEnergyEcal_HF;
+  MonitorElement *mapEnergyHcal_HF;
+  MonitorElement *MET_HF;
+  MonitorElement *SET_HF;
+  MonitorElement *phiMET_HF;
+
+  MonitorElement *emTiming_HF;
+  MonitorElement *hadTiming_HF;
+  MonitorElement *emEnergyTiming_HF;
+  MonitorElement *emEnergyTiming_profile_HF;
+
+  MonitorElement *hadEnergyTiming_Low_HF;
+  MonitorElement *hadEnergyTiming_HF;
+  MonitorElement *hadEnergyTiming_profile_Low_HF;
+  MonitorElement *hadEnergyTiming_profile_HF;
 };
 
 #endif
diff --git a/DQMOffline/Hcal/interface/CaloTowersDQMClient.h b/DQMOffline/Hcal/interface/CaloTowersDQMClient.h
index 761d9a2b048be..492a567d57440 100644
--- a/DQMOffline/Hcal/interface/CaloTowersDQMClient.h
+++ b/DQMOffline/Hcal/interface/CaloTowersDQMClient.h
@@ -3,43 +3,40 @@
 
 // -*- C++ -*-
 //
-// 
+//
 /*
- Description: This is a CaloTowers client meant to plot calotowers quantities 
+ Description: This is a CaloTowers client meant to plot calotowers quantities
 */
 
 //
-// Originally create by: Hongxuan Liu 
+// Originally create by: Hongxuan Liu
 //                        May 2010
 //
 
-#include <memory>
-#include <unistd.h>
-#include <FWCore/Framework/interface/EDAnalyzer.h>
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMEDHarvester.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include <FWCore/Framework/interface/EDAnalyzer.h>
+#include <memory>
+#include <unistd.h>
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <vector>
 
 class DQMStore;
 class MonitorElement;
 
 class CaloTowersDQMClient : public DQMEDHarvester {
- 
- private:
+private:
   std::string outputFile_;
   edm::ParameterSet conf_;
 
@@ -50,16 +47,16 @@ class CaloTowersDQMClient : public DQMEDHarvester {
   std::string dirNameJet_;
   std::string dirNameMET_;
 
- public:
-  explicit CaloTowersDQMClient(const edm::ParameterSet& );
+public:
+  explicit CaloTowersDQMClient(const edm::ParameterSet &);
   ~CaloTowersDQMClient() override;
-  
-  void beginJob(void) override;
-  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; //performed in the endJob
-  void beginRun(const edm::Run& run, const edm::EventSetup& c) override;
 
-  int CaloTowersEndjob(const std::vector<MonitorElement*> &hcalMEs);
+  void beginJob(void) override;
+  void dqmEndJob(DQMStore::IBooker &,
+                 DQMStore::IGetter &) override;  // performed in the endJob
+  void beginRun(const edm::Run &run, const edm::EventSetup &c) override;
 
+  int CaloTowersEndjob(const std::vector<MonitorElement *> &hcalMEs);
 };
- 
+
 #endif
diff --git a/DQMOffline/Hcal/interface/HcalNoiseRates.h b/DQMOffline/Hcal/interface/HcalNoiseRates.h
index e19cd809f963b..d15583a11a0c9 100644
--- a/DQMOffline/Hcal/interface/HcalNoiseRates.h
+++ b/DQMOffline/Hcal/interface/HcalNoiseRates.h
@@ -1,7 +1,6 @@
 #ifndef _DQMOFFLINE_HCAL_HCALNOISERATES_H_
 #define _DQMOFFLINE_HCAL_HCALNOISERATES_H_
 
-
 //
 // NoiseRates.h
 //
@@ -17,25 +16,24 @@
 #include <vector>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-
 
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DataFormats/METReco/interface/HcalNoiseRBX.h"
 
-//Hcal Hoise Summary
+// Hcal Hoise Summary
 #include "DataFormats/METReco/interface/HcalNoiseSummary.h"
 
 //
@@ -43,58 +41,55 @@
 //
 
 class HcalNoiseRates : public DQMEDAnalyzer {
- public:
-  explicit HcalNoiseRates(const edm::ParameterSet&);
+public:
+  explicit HcalNoiseRates(const edm::ParameterSet &);
   ~HcalNoiseRates() override;
-  
-  
- private:
+
+private:
   void beginJob() override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
   void endJob() override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
   std::string outputFile_;
 
   // parameters
-  edm::InputTag rbxCollName_;          // label for the rbx collection
+  edm::InputTag rbxCollName_;  // label for the rbx collection
   edm::EDGetTokenT<reco::HcalNoiseRBXCollection> tok_rbx_;
-  double minRBXEnergy_;                // RBX energy threshold
-  double minHitEnergy_;                // RecHit energy threshold
-  bool   useAllHistos_;
+  double minRBXEnergy_;  // RBX energy threshold
+  double minHitEnergy_;  // RecHit energy threshold
+  bool useAllHistos_;
 
-  //Hcal Noise Summary Parameters
+  // Hcal Noise Summary Parameters
   edm::EDGetTokenT<HcalNoiseSummary> noisetoken_;
 
-  MonitorElement* hLumiBlockCount_;
-  MonitorElement* hRBXEnergy_;
-  MonitorElement* hRBXEnergyType1_;
-  MonitorElement* hRBXEnergyType2_;
-  MonitorElement* hRBXEnergyType3_;
-  MonitorElement* hRBXNHits_;
+  MonitorElement *hLumiBlockCount_;
+  MonitorElement *hRBXEnergy_;
+  MonitorElement *hRBXEnergyType1_;
+  MonitorElement *hRBXEnergyType2_;
+  MonitorElement *hRBXEnergyType3_;
+  MonitorElement *hRBXNHits_;
 
   // count lumi segments
   std::map<int, int> lumiCountMap_;
 
-  //Hcal Noise Summary Plots
+  // Hcal Noise Summary Plots
 
-  MonitorElement* nNNumChannels_;
-  MonitorElement* nNSumE_;
-  MonitorElement* nNSumEt_;
+  MonitorElement *nNNumChannels_;
+  MonitorElement *nNSumE_;
+  MonitorElement *nNSumEt_;
 
-  MonitorElement* sNNumChannels_;
-  MonitorElement* sNSumE_;
-  MonitorElement* sNSumEt_;
+  MonitorElement *sNNumChannels_;
+  MonitorElement *sNSumE_;
+  MonitorElement *sNSumEt_;
 
-  MonitorElement* iNNumChannels_;
-  MonitorElement* iNSumE_;
-  MonitorElement* iNSumEt_;
-
-  MonitorElement* hNoise_maxZeros_;
-  MonitorElement* hNoise_maxHPDHits_;
-  MonitorElement* hNoise_maxHPDNoOtherHits_;
+  MonitorElement *iNNumChannels_;
+  MonitorElement *iNSumE_;
+  MonitorElement *iNSumEt_;
 
+  MonitorElement *hNoise_maxZeros_;
+  MonitorElement *hNoise_maxHPDHits_;
+  MonitorElement *hNoise_maxHPDNoOtherHits_;
 };
 
-
 #endif
diff --git a/DQMOffline/Hcal/interface/HcalNoiseRatesClient.h b/DQMOffline/Hcal/interface/HcalNoiseRatesClient.h
index e5e44aded44e4..85503b5b3e629 100644
--- a/DQMOffline/Hcal/interface/HcalNoiseRatesClient.h
+++ b/DQMOffline/Hcal/interface/HcalNoiseRatesClient.h
@@ -3,43 +3,40 @@
 
 // -*- C++ -*-
 //
-// 
+//
 /*
- Description: This is a NoiseRates client meant to plot noiserates quantities 
+ Description: This is a NoiseRates client meant to plot noiserates quantities
 */
 
 //
-// Originally create by: Hongxuan Liu 
+// Originally create by: Hongxuan Liu
 //                        May 2010
 //
 
-#include <memory>
-#include <unistd.h>
-#include <FWCore/Framework/interface/EDAnalyzer.h>
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMEDHarvester.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include <FWCore/Framework/interface/EDAnalyzer.h>
+#include <memory>
+#include <unistd.h>
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <vector>
 
 class DQMStore;
 class MonitorElement;
 
 class HcalNoiseRatesClient : public DQMEDHarvester {
- 
- private:
+private:
   std::string outputFile_;
 
   edm::ParameterSet conf_;
@@ -51,16 +48,16 @@ class HcalNoiseRatesClient : public DQMEDHarvester {
   std::string dirNameJet_;
   std::string dirNameMET_;
 
- public:
-  explicit HcalNoiseRatesClient(const edm::ParameterSet& );
+public:
+  explicit HcalNoiseRatesClient(const edm::ParameterSet &);
   ~HcalNoiseRatesClient() override;
-  
-  void beginJob(void) override;
-  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; //performed in the endJob
-  void beginRun(const edm::Run& run, const edm::EventSetup& c) override;
 
-  int NoiseRatesEndjob(const std::vector<MonitorElement*> &hcalMEs);
+  void beginJob(void) override;
+  void dqmEndJob(DQMStore::IBooker &,
+                 DQMStore::IGetter &) override;  // performed in the endJob
+  void beginRun(const edm::Run &run, const edm::EventSetup &c) override;
 
+  int NoiseRatesEndjob(const std::vector<MonitorElement *> &hcalMEs);
 };
- 
+
 #endif
diff --git a/DQMOffline/Hcal/interface/HcalRecHitsAnalyzer.h b/DQMOffline/Hcal/interface/HcalRecHitsAnalyzer.h
index 6bba5b7cde180..4527bb9a159c7 100644
--- a/DQMOffline/Hcal/interface/HcalRecHitsAnalyzer.h
+++ b/DQMOffline/Hcal/interface/HcalRecHitsAnalyzer.h
@@ -1,14 +1,14 @@
 #ifndef _DQMOFFLINE_HCAL_HCALRECHITSANALYZER_H_
 #define _DQMOFFLINE_HCAL_HCALRECHITSANALYZER_H_
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
@@ -17,35 +17,35 @@
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 #include "DataFormats/HcalRecHit/interface/HcalSourcePositionData.h"
 
+#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 #include <DataFormats/EcalDetId/interface/EBDetId.h>
 #include <DataFormats/EcalDetId/interface/EEDetId.h>
-#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 
-#include "DataFormats/HcalDetId/interface/HcalElectronicsId.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
+#include "DataFormats/HcalDetId/interface/HcalElectronicsId.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
+#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 #include "Geometry/CaloTopology/interface/HcalTopology.h"
 #include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h"
 
-#include <vector>
-#include <utility>
-#include <ostream>
-#include <string>
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include <algorithm>
 #include <cmath>
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include <ostream>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "DataFormats/DetId/interface/DetId.h"
 // channel status
-#include "CondFormats/EcalObjects/interface/EcalChannelStatus.h"
 #include "CondFormats/DataRecord/interface/EcalChannelStatusRcd.h"
+#include "CondFormats/EcalObjects/interface/EcalChannelStatus.h"
 
-#include "CondFormats/HcalObjects/interface/HcalChannelQuality.h"
 #include "CondFormats/DataRecord/interface/HcalChannelQualityRcd.h"
+#include "CondFormats/HcalObjects/interface/HcalChannelQuality.h"
 
 // severity level assignment for HCAL
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputer.h"
@@ -54,22 +54,22 @@
 // severity level assignment for ECAL
 #include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgo.h"
 
-
 class HcalRecHitsAnalyzer : public DQMEDAnalyzer {
- public:
-  HcalRecHitsAnalyzer(edm::ParameterSet const& conf);
+public:
+  HcalRecHitsAnalyzer(edm::ParameterSet const &conf);
 
-  void analyze(edm::Event const& ev, edm::EventSetup const& c) override;
+  void analyze(edm::Event const &ev, edm::EventSetup const &c) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  //virtual void beginRun(edm::Run const& run, edm::EventSetup const& c) override;
-  void dqmBeginRun(const edm::Run& run, const edm::EventSetup& c) override;
- private:
-  
-  virtual void fillRecHitsTmp(int subdet_, edm::Event const& ev);
+  // virtual void beginRun(edm::Run const& run, edm::EventSetup const& c)
+  // override;
+  void dqmBeginRun(const edm::Run &run, const edm::EventSetup &c) override;
+
+private:
+  virtual void fillRecHitsTmp(int subdet_, edm::Event const &ev);
   double dR(double eta1, double phi1, double eta2, double phi2);
   double phi12(double phi1, double en1, double phi2, double en2);
-  double dPhiWsign(double phi1,double phi2);  
-  
+  double dPhiWsign(double phi1, double phi2);
+
   std::string topFolderName_;
 
   std::string outputFile_;
@@ -79,13 +79,12 @@ class HcalRecHitsAnalyzer : public DQMEDAnalyzer {
   std::string sign_;
   bool hep17_;
   std::string mc_;
-  bool        famos_;
+  bool famos_;
 
   const HcalDDDRecConstants *hcons;
-  int                        maxDepthHB_, maxDepthHE_, maxDepthHO_, maxDepthHF_, maxDepthAll_;
-
+  int maxDepthHB_, maxDepthHE_, maxDepthHO_, maxDepthHF_, maxDepthAll_;
 
-  int nChannels_[5]; // 0:any, 1:HB, 2:HE
+  int nChannels_[5];  // 0:any, 1:HB, 2:HE
 
   int iphi_bins_;
   float iphi_min_, iphi_max_;
@@ -93,7 +92,7 @@ class HcalRecHitsAnalyzer : public DQMEDAnalyzer {
   int ieta_bins_;
   float ieta_min_, ieta_max_;
 
-  //RecHit Collection input tags
+  // RecHit Collection input tags
   edm::EDGetTokenT<HBHERecHitCollection> tok_hbhe_;
   edm::EDGetTokenT<HORecHitCollection> tok_ho_;
   edm::EDGetTokenT<HFRecHitCollection> tok_hf_;
@@ -108,195 +107,191 @@ class HcalRecHitsAnalyzer : public DQMEDAnalyzer {
   int iz;
   int imc;
 
-  //Hcal topology
-  const HcalTopology* theHcalTopology;
-  // for checking the status of ECAL and HCAL channels stored in the DB 
-  const HcalChannelQuality* theHcalChStatus;
+  // Hcal topology
+  const HcalTopology *theHcalTopology;
+  // for checking the status of ECAL and HCAL channels stored in the DB
+  const HcalChannelQuality *theHcalChStatus;
   // calculator of severety level for HCAL
-  const HcalSeverityLevelComputer* theHcalSevLvlComputer;
-  int hcalSevLvl(const CaloRecHit* hit);
+  const HcalSeverityLevelComputer *theHcalSevLvlComputer;
+  int hcalSevLvl(const CaloRecHit *hit);
 
   std::vector<int> hcalHBSevLvlVec, hcalHESevLvlVec, hcalHFSevLvlVec, hcalHOSevLvlVec;
 
-  MonitorElement* sevLvl_HB;
-  MonitorElement* sevLvl_HE;
-  MonitorElement* sevLvl_HF;
-  MonitorElement* sevLvl_HO; 
+  MonitorElement *sevLvl_HB;
+  MonitorElement *sevLvl_HE;
+  MonitorElement *sevLvl_HF;
+  MonitorElement *sevLvl_HO;
 
   // RecHits counters
-  std::vector<MonitorElement*> Nhb;
-  std::vector<MonitorElement*> Nhe;
-  std::vector<MonitorElement*> Nho;
-  std::vector<MonitorElement*> Nhf;
+  std::vector<MonitorElement *> Nhb;
+  std::vector<MonitorElement *> Nhe;
+  std::vector<MonitorElement *> Nho;
+  std::vector<MonitorElement *> Nhf;
 
-  // In ALL other cases : 2D ieta-iphi maps 
+  // In ALL other cases : 2D ieta-iphi maps
   // without and with cuts (a la "Scheme B") on energy
   // - only in the cone around particle for single-part samples (mc = "yes")
   // - for all calls in milti-particle samples (mc = "no")
 
-  MonitorElement* map_ecal;
-
-  std::vector<MonitorElement*> emap;
-  MonitorElement              *emap_HO;
-
-  std::vector<MonitorElement*> emean_vs_ieta_HB;
-  std::vector<MonitorElement*> emean_vs_ieta_HBM0;
-  std::vector<MonitorElement*> emean_vs_ieta_HBM3;
-  std::vector<MonitorElement*> emean_vs_ieta_HE;
-  std::vector<MonitorElement*> emean_vs_ieta_HEM0;
-  std::vector<MonitorElement*> emean_vs_ieta_HEM3;
-  std::vector<MonitorElement*> emean_vs_ieta_HEP17;
-  std::vector<MonitorElement*> emean_vs_ieta_HEP17M0;
-  std::vector<MonitorElement*> emean_vs_ieta_HEP17M3;
-  std::vector<MonitorElement*> emean_vs_ieta_HF;
-  MonitorElement              *emean_vs_ieta_HO;
-
-  std::vector<MonitorElement*> occupancy_map_HB;
-  std::vector<MonitorElement*> occupancy_map_HE;
-  std::vector<MonitorElement*> occupancy_map_HF;
-  MonitorElement              *occupancy_map_HO;
-
-  std::vector<MonitorElement*> occupancy_vs_ieta_HB;
-  std::vector<MonitorElement*> occupancy_vs_ieta_HE;
-  std::vector<MonitorElement*> occupancy_vs_ieta_HF;
-  MonitorElement              *occupancy_vs_ieta_HO;
-
-  std::vector<MonitorElement*> nrechits_vs_iphi_HBP, nrechits_vs_iphi_HBM;
-  std::vector<MonitorElement*> nrechits_vs_iphi_HEP, nrechits_vs_iphi_HEM;
-  std::vector<MonitorElement*> nrechits_vs_iphi_HFP, nrechits_vs_iphi_HFM;
-  MonitorElement              *nrechits_vs_iphi_HOP, *nrechits_vs_iphi_HOM;
+  MonitorElement *map_ecal;
+
+  std::vector<MonitorElement *> emap;
+  MonitorElement *emap_HO;
+
+  std::vector<MonitorElement *> emean_vs_ieta_HB;
+  std::vector<MonitorElement *> emean_vs_ieta_HBM0;
+  std::vector<MonitorElement *> emean_vs_ieta_HBM3;
+  std::vector<MonitorElement *> emean_vs_ieta_HE;
+  std::vector<MonitorElement *> emean_vs_ieta_HEM0;
+  std::vector<MonitorElement *> emean_vs_ieta_HEM3;
+  std::vector<MonitorElement *> emean_vs_ieta_HEP17;
+  std::vector<MonitorElement *> emean_vs_ieta_HEP17M0;
+  std::vector<MonitorElement *> emean_vs_ieta_HEP17M3;
+  std::vector<MonitorElement *> emean_vs_ieta_HF;
+  MonitorElement *emean_vs_ieta_HO;
+
+  std::vector<MonitorElement *> occupancy_map_HB;
+  std::vector<MonitorElement *> occupancy_map_HE;
+  std::vector<MonitorElement *> occupancy_map_HF;
+  MonitorElement *occupancy_map_HO;
+
+  std::vector<MonitorElement *> occupancy_vs_ieta_HB;
+  std::vector<MonitorElement *> occupancy_vs_ieta_HE;
+  std::vector<MonitorElement *> occupancy_vs_ieta_HF;
+  MonitorElement *occupancy_vs_ieta_HO;
+
+  std::vector<MonitorElement *> nrechits_vs_iphi_HBP, nrechits_vs_iphi_HBM;
+  std::vector<MonitorElement *> nrechits_vs_iphi_HEP, nrechits_vs_iphi_HEM;
+  std::vector<MonitorElement *> nrechits_vs_iphi_HFP, nrechits_vs_iphi_HFM;
+  MonitorElement *nrechits_vs_iphi_HOP, *nrechits_vs_iphi_HOM;
 
   // for single monoenergetic particles - cone collection profile vs ieta.
-  MonitorElement* meEnConeEtaProfile;
-  MonitorElement* meEnConeEtaProfile_E;
-  MonitorElement* meEnConeEtaProfile_EH;
+  MonitorElement *meEnConeEtaProfile;
+  MonitorElement *meEnConeEtaProfile_E;
+  MonitorElement *meEnConeEtaProfile_EH;
   // Single particles - deviation of cluster from MC truth
-  MonitorElement* meDeltaPhi;
-  MonitorElement* meDeltaEta;
+  MonitorElement *meDeltaPhi;
+  MonitorElement *meDeltaEta;
 
   // time?
-  MonitorElement* meTimeHB;
-  MonitorElement* meTimeHE;
-  MonitorElement* meTimeHO;
-  MonitorElement* meTimeHF;
+  MonitorElement *meTimeHB;
+  MonitorElement *meTimeHE;
+  MonitorElement *meTimeHO;
+  MonitorElement *meTimeHF;
 
   // energy of rechits
-  MonitorElement* meRecHitsEnergyHB;
-  MonitorElement* meRecHitsEnergyHBM0;
-  MonitorElement* meRecHitsEnergyHBM3;
-  MonitorElement* meRecHitsEnergyM2vM0HB;
-  MonitorElement* meRecHitsEnergyM3vM0HB;
-  MonitorElement* meRecHitsEnergyM3vM2HB;
-  MonitorElement* meRecHitsM2Chi2HB;
-
-  MonitorElement* meRecHitsEnergyHE;
-  MonitorElement* meRecHitsEnergyHEM0;
-  MonitorElement* meRecHitsEnergyHEM3;
-  std::vector<MonitorElement*> meRecHitsEnergyHEP17;
-  std::vector<MonitorElement*> meRecHitsEnergyHEP17M0;
-  std::vector<MonitorElement*> meRecHitsEnergyHEP17M3;
-  MonitorElement* meRecHitsEnergyM2vM0HE;
-  MonitorElement* meRecHitsEnergyM3vM0HE;
-  MonitorElement* meRecHitsEnergyM3vM2HE;
-  MonitorElement* meRecHitsM2Chi2HE;
-
-  MonitorElement* meRecHitsEnergyHO;
-
-  MonitorElement* meRecHitsEnergyHF;
-
-  MonitorElement* meTE_Low_HB;
-  MonitorElement* meTE_HB;
-  MonitorElement* meTE_High_HB;
-  MonitorElement* meTEprofileHB_Low;
-  MonitorElement* meTEprofileHB;
-  MonitorElement* meLog10Chi2profileHB;
-  MonitorElement* meTEprofileHB_High;
-
-  MonitorElement* meTE_Low_HE;
-  MonitorElement* meTE_HE;
-  MonitorElement* meTEprofileHE_Low;
-  MonitorElement* meTEprofileHE;
-  MonitorElement* meLog10Chi2profileHE;
-
-  MonitorElement* meTE_HO;
-  MonitorElement* meTE_High_HO;
-  MonitorElement* meTEprofileHO;
-  MonitorElement* meTEprofileHO_High;
-
-  MonitorElement* meTE_Low_HF;
-  MonitorElement* meTE_HF;
-  MonitorElement* meTEprofileHF_Low;
-  MonitorElement* meTEprofileHF;
-
-
-  MonitorElement* meSumRecHitsEnergyHB;
-  MonitorElement* meSumRecHitsEnergyHE;
-  MonitorElement* meSumRecHitsEnergyHO;
-  MonitorElement* meSumRecHitsEnergyHF;
-
-
-  MonitorElement* meSumRecHitsEnergyConeHB;
-  MonitorElement* meSumRecHitsEnergyConeHE;
-  MonitorElement* meSumRecHitsEnergyConeHO;
-  MonitorElement* meSumRecHitsEnergyConeHF;
-  MonitorElement* meSumRecHitsEnergyConeHFL;
-  MonitorElement* meSumRecHitsEnergyConeHFS;
-
-
-  MonitorElement* meEcalHcalEnergyHB;
-  MonitorElement* meEcalHcalEnergyHE;
-   
-  MonitorElement* meEcalHcalEnergyConeHB; 
-  MonitorElement* meEcalHcalEnergyConeHE; 
-  MonitorElement* meEcalHcalEnergyConeHO; 
-  MonitorElement* meEcalHcalEnergyConeHF; 
- 
+  MonitorElement *meRecHitsEnergyHB;
+  MonitorElement *meRecHitsEnergyHBM0;
+  MonitorElement *meRecHitsEnergyHBM3;
+  MonitorElement *meRecHitsEnergyM2vM0HB;
+  MonitorElement *meRecHitsEnergyM3vM0HB;
+  MonitorElement *meRecHitsEnergyM3vM2HB;
+  MonitorElement *meRecHitsM2Chi2HB;
+
+  MonitorElement *meRecHitsEnergyHE;
+  MonitorElement *meRecHitsEnergyHEM0;
+  MonitorElement *meRecHitsEnergyHEM3;
+  std::vector<MonitorElement *> meRecHitsEnergyHEP17;
+  std::vector<MonitorElement *> meRecHitsEnergyHEP17M0;
+  std::vector<MonitorElement *> meRecHitsEnergyHEP17M3;
+  MonitorElement *meRecHitsEnergyM2vM0HE;
+  MonitorElement *meRecHitsEnergyM3vM0HE;
+  MonitorElement *meRecHitsEnergyM3vM2HE;
+  MonitorElement *meRecHitsM2Chi2HE;
+
+  MonitorElement *meRecHitsEnergyHO;
+
+  MonitorElement *meRecHitsEnergyHF;
+
+  MonitorElement *meTE_Low_HB;
+  MonitorElement *meTE_HB;
+  MonitorElement *meTE_High_HB;
+  MonitorElement *meTEprofileHB_Low;
+  MonitorElement *meTEprofileHB;
+  MonitorElement *meLog10Chi2profileHB;
+  MonitorElement *meTEprofileHB_High;
+
+  MonitorElement *meTE_Low_HE;
+  MonitorElement *meTE_HE;
+  MonitorElement *meTEprofileHE_Low;
+  MonitorElement *meTEprofileHE;
+  MonitorElement *meLog10Chi2profileHE;
+
+  MonitorElement *meTE_HO;
+  MonitorElement *meTE_High_HO;
+  MonitorElement *meTEprofileHO;
+  MonitorElement *meTEprofileHO_High;
+
+  MonitorElement *meTE_Low_HF;
+  MonitorElement *meTE_HF;
+  MonitorElement *meTEprofileHF_Low;
+  MonitorElement *meTEprofileHF;
+
+  MonitorElement *meSumRecHitsEnergyHB;
+  MonitorElement *meSumRecHitsEnergyHE;
+  MonitorElement *meSumRecHitsEnergyHO;
+  MonitorElement *meSumRecHitsEnergyHF;
+
+  MonitorElement *meSumRecHitsEnergyConeHB;
+  MonitorElement *meSumRecHitsEnergyConeHE;
+  MonitorElement *meSumRecHitsEnergyConeHO;
+  MonitorElement *meSumRecHitsEnergyConeHF;
+  MonitorElement *meSumRecHitsEnergyConeHFL;
+  MonitorElement *meSumRecHitsEnergyConeHFS;
+
+  MonitorElement *meEcalHcalEnergyHB;
+  MonitorElement *meEcalHcalEnergyHE;
+
+  MonitorElement *meEcalHcalEnergyConeHB;
+  MonitorElement *meEcalHcalEnergyConeHE;
+  MonitorElement *meEcalHcalEnergyConeHO;
+  MonitorElement *meEcalHcalEnergyConeHF;
+
   // 2D plot of sum of RecHits in HCAL as function of ECAL's one
-  MonitorElement* meEnergyHcalVsEcalHB;
-  MonitorElement* meEnergyHcalVsEcalHE;
-  
-  // number of ECAL's rechits in cone 0.3 
-  MonitorElement* meNumEcalRecHitsConeHB;
-  MonitorElement* meNumEcalRecHitsConeHE;
-
-  edm::ESHandle<CaloGeometry> geometry ;
-
-  //Status word histos
-  MonitorElement* RecHit_StatusWord_HB;
-  MonitorElement* RecHit_StatusWord_HE;
-  MonitorElement* RecHit_StatusWord_HF;
-  MonitorElement* RecHit_StatusWord_HF67;
-  MonitorElement* RecHit_StatusWord_HO;
-
-  //Status word correlation
-  MonitorElement* RecHit_StatusWordCorr_HB;
-  MonitorElement* RecHit_StatusWordCorr_HE;
-
-  //Aux Status word histos
-  MonitorElement* RecHit_Aux_StatusWord_HB;
-  MonitorElement* RecHit_Aux_StatusWord_HE;
-  MonitorElement* RecHit_Aux_StatusWord_HF;
-  MonitorElement* RecHit_Aux_StatusWord_HO;
-
- // Filling vectors with essential RecHits data
-  std::vector<int>      csub;
-  std::vector<int>      cieta;
-  std::vector<int>      ciphi;
-  std::vector<int>      cdepth;
-  std::vector<double>   cen;
-  std::vector<double>   cenM0;
-  std::vector<double>   cenM3;
-  std::vector<double>   cchi2;
-  std::vector<double>   ceta;
-  std::vector<double>   cphi;
-  std::vector<double>   ctime;
-  std::vector<double>   cz;
+  MonitorElement *meEnergyHcalVsEcalHB;
+  MonitorElement *meEnergyHcalVsEcalHE;
+
+  // number of ECAL's rechits in cone 0.3
+  MonitorElement *meNumEcalRecHitsConeHB;
+  MonitorElement *meNumEcalRecHitsConeHE;
+
+  edm::ESHandle<CaloGeometry> geometry;
+
+  // Status word histos
+  MonitorElement *RecHit_StatusWord_HB;
+  MonitorElement *RecHit_StatusWord_HE;
+  MonitorElement *RecHit_StatusWord_HF;
+  MonitorElement *RecHit_StatusWord_HF67;
+  MonitorElement *RecHit_StatusWord_HO;
+
+  // Status word correlation
+  MonitorElement *RecHit_StatusWordCorr_HB;
+  MonitorElement *RecHit_StatusWordCorr_HE;
+
+  // Aux Status word histos
+  MonitorElement *RecHit_Aux_StatusWord_HB;
+  MonitorElement *RecHit_Aux_StatusWord_HE;
+  MonitorElement *RecHit_Aux_StatusWord_HF;
+  MonitorElement *RecHit_Aux_StatusWord_HO;
+
+  // Filling vectors with essential RecHits data
+  std::vector<int> csub;
+  std::vector<int> cieta;
+  std::vector<int> ciphi;
+  std::vector<int> cdepth;
+  std::vector<double> cen;
+  std::vector<double> cenM0;
+  std::vector<double> cenM3;
+  std::vector<double> cchi2;
+  std::vector<double> ceta;
+  std::vector<double> cphi;
+  std::vector<double> ctime;
+  std::vector<double> cz;
   std::vector<uint32_t> cstwd;
   std::vector<uint32_t> cauxstwd;
 
   // counter
   int nevtot;
-
 };
 
 #endif
diff --git a/DQMOffline/Hcal/interface/HcalRecHitsDQMClient.h b/DQMOffline/Hcal/interface/HcalRecHitsDQMClient.h
index f861a8fade251..5113f75ee1c50 100644
--- a/DQMOffline/Hcal/interface/HcalRecHitsDQMClient.h
+++ b/DQMOffline/Hcal/interface/HcalRecHitsDQMClient.h
@@ -3,52 +3,49 @@
 
 // -*- C++ -*-
 //
-// 
+//
 /*
- Description: This is a RecHits client meant to plot rechits quantities 
+ Description: This is a RecHits client meant to plot rechits quantities
 */
 
 //
-// Originally create by: Hongxuan Liu 
+// Originally create by: Hongxuan Liu
 //                        May 2010
 //
 
-#include <memory>
-#include <unistd.h>
-#include <FWCore/Framework/interface/EDAnalyzer.h>
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMEDHarvester.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include <FWCore/Framework/interface/EDAnalyzer.h>
+#include <memory>
+#include <unistd.h>
 
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "DataFormats/DetId/interface/DetId.h"
+#include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 #include "Geometry/CaloTopology/interface/HcalTopology.h"
-#include "Geometry/Records/interface/HcalRecNumberingRecord.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
+#include "Geometry/Records/interface/HcalRecNumberingRecord.h"
 
-
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <vector>
 
 class MonitorElement;
 
 class HcalRecHitsDQMClient : public DQMEDHarvester {
- 
- private:
+private:
   std::string outputFile_;
   edm::ParameterSet conf_;
 
@@ -61,21 +58,21 @@ class HcalRecHitsDQMClient : public DQMEDHarvester {
 
   const HcalDDDRecConstants *hcons;
   int maxDepthHB_, maxDepthHE_, maxDepthHO_, maxDepthHF_, maxDepthAll_;
- 
-  int nChannels_[5]; // 0:any, 1:HB, 2:HE, 3:HO, 4: HF
 
- public:
-  explicit HcalRecHitsDQMClient(const edm::ParameterSet& );
+  int nChannels_[5];  // 0:any, 1:HB, 2:HE, 3:HO, 4: HF
+
+public:
+  explicit HcalRecHitsDQMClient(const edm::ParameterSet &);
   ~HcalRecHitsDQMClient() override;
-  
+
   void beginJob(void) override;
-  void beginRun(edm::Run const&, edm::EventSetup const&) override;
-  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; //performed in the endJob
+  void beginRun(edm::Run const &, edm::EventSetup const &) override;
+  void dqmEndJob(DQMStore::IBooker &,
+                 DQMStore::IGetter &) override;  // performed in the endJob
 
-  int HcalRecHitsEndjob(const std::vector<MonitorElement*> &hcalMEs);
+  int HcalRecHitsEndjob(const std::vector<MonitorElement *> &hcalMEs);
 
   float phifactor(int ieta);
-
 };
- 
-#endif // _DQMOFFLINE_HCAL_HCALRECHITSDQMCLIENT_H_
+
+#endif  // _DQMOFFLINE_HCAL_HCALRECHITSDQMCLIENT_H_
diff --git a/DQMOffline/Hcal/src/CaloTowersAnalyzer.cc b/DQMOffline/Hcal/src/CaloTowersAnalyzer.cc
index 4b0c0f8e98ea6..745f356f9012c 100644
--- a/DQMOffline/Hcal/src/CaloTowersAnalyzer.cc
+++ b/DQMOffline/Hcal/src/CaloTowersAnalyzer.cc
@@ -1,13 +1,12 @@
 #include "DQMOffline/Hcal/interface/CaloTowersAnalyzer.h"
-#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
- 
-CaloTowersAnalyzer::CaloTowersAnalyzer(edm::ParameterSet const& conf){
+#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
 
+CaloTowersAnalyzer::CaloTowersAnalyzer(edm::ParameterSet const &conf) {
   tok_towers_ = consumes<CaloTowerCollection>(conf.getUntrackedParameter<edm::InputTag>("CaloTowerCollectionLabel"));
   // DQM ROOT output
-  
+
   outputFile_ = conf.getUntrackedParameter<std::string>("outputFile", "myfile.root");
 
   hcalselector_ = conf.getUntrackedParameter<std::string>("hcalselector", "all");
@@ -15,41 +14,42 @@ CaloTowersAnalyzer::CaloTowersAnalyzer(edm::ParameterSet const& conf){
   useAllHistos_ = conf.getUntrackedParameter<bool>("useAllHistos", false);
 }
 
-void CaloTowersAnalyzer::dqmBeginRun(const edm::Run& run, const edm::EventSetup& es){
-  
-    edm::ESHandle<HcalDDDRecConstants> pHRNDC;
-    es.get<HcalRecNumberingRecord>().get( pHRNDC );
-    hcons = &(*pHRNDC);
+void CaloTowersAnalyzer::dqmBeginRun(const edm::Run &run, const edm::EventSetup &es) {
+  edm::ESHandle<HcalDDDRecConstants> pHRNDC;
+  es.get<HcalRecNumberingRecord>().get(pHRNDC);
+  hcons = &(*pHRNDC);
 
-    //Get Phi segmentation from geometry, use the max phi number so that all iphi values are included.
+  // Get Phi segmentation from geometry, use the max phi number so that all iphi
+  // values are included.
 
-    int NphiMax = hcons->getNPhi(0);
+  int NphiMax = hcons->getNPhi(0);
 
-    NphiMax = (hcons->getNPhi(1) > NphiMax ? hcons->getNPhi(1) : NphiMax);
-    NphiMax = (hcons->getNPhi(2) > NphiMax ? hcons->getNPhi(2) : NphiMax);
-    NphiMax = (hcons->getNPhi(3) > NphiMax ? hcons->getNPhi(3) : NphiMax);
+  NphiMax = (hcons->getNPhi(1) > NphiMax ? hcons->getNPhi(1) : NphiMax);
+  NphiMax = (hcons->getNPhi(2) > NphiMax ? hcons->getNPhi(2) : NphiMax);
+  NphiMax = (hcons->getNPhi(3) > NphiMax ? hcons->getNPhi(3) : NphiMax);
 
-    //Center the iphi bins on the integers
-    iphi_min_ = 0.5;
-    iphi_max_ = NphiMax + 0.5;
-    iphi_bins_ = (int) (iphi_max_ - iphi_min_);
+  // Center the iphi bins on the integers
+  iphi_min_ = 0.5;
+  iphi_max_ = NphiMax + 0.5;
+  iphi_bins_ = (int)(iphi_max_ - iphi_min_);
 
-    //Retain classic behavior, all plots have same ieta range.
+  // Retain classic behavior, all plots have same ieta range.
 
-    int iEtaMax = (hcons->getEtaRange(0).second > hcons->getEtaRange(1).second ? hcons->getEtaRange(0).second : hcons->getEtaRange(1).second);
-    iEtaMax = (iEtaMax > hcons->getEtaRange(2).second ? iEtaMax : hcons->getEtaRange(2).second);
-    iEtaMax = (iEtaMax > hcons->getEtaRange(3).second ? iEtaMax : hcons->getEtaRange(3).second);
-
-    //Give an empty bin around the subdet ieta range to make it clear that all ieta rings have been included
-    ieta_min_ = -iEtaMax - 1.5;
-    ieta_max_ = iEtaMax + 1.5;
-    ieta_bins_ = (int) (ieta_max_ - ieta_min_);
+  int iEtaMax = (hcons->getEtaRange(0).second > hcons->getEtaRange(1).second ? hcons->getEtaRange(0).second
+                                                                             : hcons->getEtaRange(1).second);
+  iEtaMax = (iEtaMax > hcons->getEtaRange(2).second ? iEtaMax : hcons->getEtaRange(2).second);
+  iEtaMax = (iEtaMax > hcons->getEtaRange(3).second ? iEtaMax : hcons->getEtaRange(3).second);
 
+  // Give an empty bin around the subdet ieta range to make it clear that all
+  // ieta rings have been included
+  ieta_min_ = -iEtaMax - 1.5;
+  ieta_max_ = iEtaMax + 1.5;
+  ieta_bins_ = (int)(ieta_max_ - ieta_min_);
 }
 
-void CaloTowersAnalyzer::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & /* iRun*/, edm::EventSetup const & /* iSetup */)
-{  
-
+void CaloTowersAnalyzer::bookHistograms(DQMStore::IBooker &ibooker,
+                                        edm::Run const & /* iRun*/,
+                                        edm::EventSetup const & /* iSetup */) {
   etaMin[0] = 0.;
   etaMax[0] = 1.4;
   etaMin[1] = 1.4;
@@ -58,460 +58,461 @@ void CaloTowersAnalyzer::bookHistograms(DQMStore::IBooker & ibooker, edm::Run co
   etaMax[2] = 5.2;
 
   isub = 0;
-  if(hcalselector_ == "HB") isub = 1;
-  if(hcalselector_ == "HE") isub = 2;
-  if(hcalselector_ == "HF") isub = 3;
-
-  if ( !outputFile_.empty() ) {
+  if (hcalselector_ == "HB")
+    isub = 1;
+  if (hcalselector_ == "HE")
+    isub = 2;
+  if (hcalselector_ == "HF")
+    isub = 3;
+
+  if (!outputFile_.empty()) {
     edm::LogInfo("OutputInfo") << " Hcal RecHit Task histograms will be saved to '" << outputFile_.c_str() << "'";
   } else {
     edm::LogInfo("OutputInfo") << " Hcal RecHit Task histograms will NOT be saved";
   }
-  
+
   Char_t histo[100];
 
-  
-  ibooker.setCurrentFolder("CaloTowersD/CaloTowersTask") ;
-  
-  
+  ibooker.setCurrentFolder("CaloTowersD/CaloTowersTask");
 
-  //These two histos are not drawn by our macros, but they are used
-  //in the EndJob for norms and such so I am leaving them alone for now
+  // These two histos are not drawn by our macros, but they are used
+  // in the EndJob for norms and such so I am leaving them alone for now
   //-------------------------------------------------------------------------------------------
-  sprintf  (histo, "Ntowers_per_event_vs_ieta" );
+  sprintf(histo, "Ntowers_per_event_vs_ieta");
   Ntowers_vs_ieta = ibooker.book1D(histo, histo, ieta_bins_, ieta_min_, ieta_max_);
-  
-  sprintf  (histo, "CaloTowersTask_map_Nentries" );
+
+  sprintf(histo, "CaloTowersTask_map_Nentries");
   mapEnergy_N = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
   //-------------------------------------------------------------------------------------------
 
-  //These the single pion scan histos
+  // These the single pion scan histos
   //-------------------------------------------------------------------------------------------
-  //The first three are not used
-  if (useAllHistos_){
-    sprintf  (histo, "emean_vs_ieta_E" );
+  // The first three are not used
+  if (useAllHistos_) {
+    sprintf(histo, "emean_vs_ieta_E");
     emean_vs_ieta_E = ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, 2100, -100., 2000.);
-    sprintf  (histo, "emean_vs_ieta_H" );
+    sprintf(histo, "emean_vs_ieta_H");
     emean_vs_ieta_H = ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, 2100, -100., 2000.);
-    sprintf  (histo, "emean_vs_ieta_EH" );
+    sprintf(histo, "emean_vs_ieta_EH");
     emean_vs_ieta_EH = ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, 2100, -100., 2000.);
   }
-  //These are drawn
-  sprintf  (histo, "emean_vs_ieta_E1" );
+  // These are drawn
+  sprintf(histo, "emean_vs_ieta_E1");
   emean_vs_ieta_E1 = ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, 2100, -100., 2000.);
-  sprintf  (histo, "emean_vs_ieta_H1" );
+  sprintf(histo, "emean_vs_ieta_H1");
   emean_vs_ieta_H1 = ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, 2100, -100., 2000.);
-  sprintf  (histo, "emean_vs_ieta_EH1" );
+  sprintf(histo, "emean_vs_ieta_EH1");
   emean_vs_ieta_EH1 = ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, 2100, -100., 2000.);
   //-------------------------------------------------------------------------------------------
 
-  //Map energy histos are not drawn
-  if (useAllHistos_){
-    sprintf  (histo, "CaloTowersTask_map_energy_E" );
+  // Map energy histos are not drawn
+  if (useAllHistos_) {
+    sprintf(histo, "CaloTowersTask_map_energy_E");
     mapEnergy_E = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
-    sprintf  (histo, "CaloTowersTask_map_energy_H");
+    sprintf(histo, "CaloTowersTask_map_energy_H");
     mapEnergy_H = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
-    sprintf  (histo, "CaloTowersTask_map_energy_EH" );
+    sprintf(histo, "CaloTowersTask_map_energy_EH");
     mapEnergy_EH = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
   }
 
-  //All ECAL cell histos are used
+  // All ECAL cell histos are used
   // XXX: ECAL 0-25 [0-26, 26 bins]   HCAL 0-4 [0-5, 5 bins]
-  sprintf  (histo, "number_of_bad_cells_Ecal_EB");
+  sprintf(histo, "number_of_bad_cells_Ecal_EB");
   numBadCellsEcal_EB = ibooker.book1D(histo, histo, 26, 0, 26);
-  sprintf  (histo, "number_of_bad_cells_Ecal_EE");
+  sprintf(histo, "number_of_bad_cells_Ecal_EE");
   numBadCellsEcal_EE = ibooker.book1D(histo, histo, 26, 0, 26);
-  sprintf  (histo, "number_of_recovered_cells_Ecal_EB");
+  sprintf(histo, "number_of_recovered_cells_Ecal_EB");
   numRcvCellsEcal_EB = ibooker.book1D(histo, histo, 26, 0, 26);
-  sprintf  (histo, "number_of_recovered_cells_Ecal_EE");
+  sprintf(histo, "number_of_recovered_cells_Ecal_EE");
   numRcvCellsEcal_EE = ibooker.book1D(histo, histo, 26, 0, 26);
-  sprintf  (histo, "number_of_problematic_cells_Ecal_EB");
+  sprintf(histo, "number_of_problematic_cells_Ecal_EB");
   numPrbCellsEcal_EB = ibooker.book1D(histo, histo, 26, 0, 26);
-  sprintf  (histo, "number_of_problematic_cells_Ecal_EE");
-  numPrbCellsEcal_EE = ibooker.book1D(histo, histo, 26, 0, 26); 
+  sprintf(histo, "number_of_problematic_cells_Ecal_EE");
+  numPrbCellsEcal_EE = ibooker.book1D(histo, histo, 26, 0, 26);
 
-  //Occupancy vs. ieta is drawn, occupancy map is needed to draw it 
-  sprintf  (histo, "CaloTowersTask_map_occupancy" );
+  // Occupancy vs. ieta is drawn, occupancy map is needed to draw it
+  sprintf(histo, "CaloTowersTask_map_occupancy");
   occupancy_map = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
 
-  sprintf  (histo, "CaloTowersTask_occupancy_vs_ieta" );
+  sprintf(histo, "CaloTowersTask_occupancy_vs_ieta");
   occupancy_vs_ieta = ibooker.book1D(histo, histo, ieta_bins_, ieta_min_, ieta_max_);
-  
-  if( isub == 1 || isub == 0) {
-    //All cell histos are used
-    sprintf  (histo, "number_of_bad_cells_Hcal_HB");
+
+  if (isub == 1 || isub == 0) {
+    // All cell histos are used
+    sprintf(histo, "number_of_bad_cells_Hcal_HB");
     numBadCellsHcal_HB = ibooker.book1D(histo, histo, 5, 0, 5);
-    sprintf  (histo, "number_of_recovered_cells_Hcal_HB");
+    sprintf(histo, "number_of_recovered_cells_Hcal_HB");
     numRcvCellsHcal_HB = ibooker.book1D(histo, histo, 5, 0, 5);
-    sprintf  (histo, "number_of_problematic_cells_Hcal_HB");
-    numPrbCellsHcal_HB = ibooker.book1D(histo, histo, 5, 0, 5); 
-    
-    //These are the five oldest CaloTower histos used: NTowers, E in HCAL/ECAL, MET and SET
+    sprintf(histo, "number_of_problematic_cells_Hcal_HB");
+    numPrbCellsHcal_HB = ibooker.book1D(histo, histo, 5, 0, 5);
+
+    // These are the five oldest CaloTower histos used: NTowers, E in HCAL/ECAL,
+    // MET and SET
     //-------------------------------------------------------------------------------------------
-    sprintf (histo, "CaloTowersTask_energy_HCAL_HB" ) ;
-    meEnergyHcal_HB    = ibooker.book1D(histo, histo, 4100, -200, 8000);  
-    
-    sprintf (histo, "CaloTowersTask_energy_ECAL_HB" ) ;
-    meEnergyEcal_HB    = ibooker.book1D(histo, histo, 3100, -200, 6000); 
-    
-    sprintf (histo, "CaloTowersTask_number_of_fired_towers_HB" ) ;
-    meNumFiredTowers_HB = ibooker.book1D(histo, histo, 1000, 0, 2000); 
-
-    sprintf  (histo, "CaloTowersTask_MET_HB" ) ;
-    MET_HB = ibooker.book1D(histo, histo, 3000, 0. , 3000. ) ;
-    
-    sprintf  (histo, "CaloTowersTask_SET_HB" ) ;
-    SET_HB = ibooker.book1D(histo, histo, 8000, 0. , 8000. ) ;
+    sprintf(histo, "CaloTowersTask_energy_HCAL_HB");
+    meEnergyHcal_HB = ibooker.book1D(histo, histo, 4100, -200, 8000);
+
+    sprintf(histo, "CaloTowersTask_energy_ECAL_HB");
+    meEnergyEcal_HB = ibooker.book1D(histo, histo, 3100, -200, 6000);
+
+    sprintf(histo, "CaloTowersTask_number_of_fired_towers_HB");
+    meNumFiredTowers_HB = ibooker.book1D(histo, histo, 1000, 0, 2000);
+
+    sprintf(histo, "CaloTowersTask_MET_HB");
+    MET_HB = ibooker.book1D(histo, histo, 3000, 0., 3000.);
+
+    sprintf(histo, "CaloTowersTask_SET_HB");
+    SET_HB = ibooker.book1D(histo, histo, 8000, 0., 8000.);
     //-------------------------------------------------------------------------------------------
 
-    //Timing histos and profiles -- all six are necessary
+    // Timing histos and profiles -- all six are necessary
     //-------------------------------------------------------------------------------------------
-    sprintf  (histo, "CaloTowersTask_EM_Timing_HB" ) ;
-    emTiming_HB = ibooker.book1D(histo, histo, 110, -120., 100. ) ;
+    sprintf(histo, "CaloTowersTask_EM_Timing_HB");
+    emTiming_HB = ibooker.book1D(histo, histo, 110, -120., 100.);
 
-    sprintf  (histo, "CaloTowersTask_HAD_Timing_HB" ) ;
-    hadTiming_HB = ibooker.book1D(histo, histo, 70, -48., 92. ) ;
+    sprintf(histo, "CaloTowersTask_HAD_Timing_HB");
+    hadTiming_HB = ibooker.book1D(histo, histo, 70, -48., 92.);
 
-    //Energy-Timing histos are divided into low, medium and high to reduce memory usage
-    //EM
-    sprintf  (histo, "CaloTowersTask_EM_Energy_Timing_Low_HB" ) ;
-    emEnergyTiming_Low_HB = ibooker.book2D(histo, histo, 40, 0. , 40., 110, -120., 100.  ) ;
+    // Energy-Timing histos are divided into low, medium and high to reduce
+    // memory usage EM
+    sprintf(histo, "CaloTowersTask_EM_Energy_Timing_Low_HB");
+    emEnergyTiming_Low_HB = ibooker.book2D(histo, histo, 40, 0., 40., 110, -120., 100.);
 
-    sprintf  (histo, "CaloTowersTask_EM_Energy_Timing_HB" ) ;
-    emEnergyTiming_HB = ibooker.book2D(histo, histo, 200, 0. , 400., 110, -120., 100.  ) ;
+    sprintf(histo, "CaloTowersTask_EM_Energy_Timing_HB");
+    emEnergyTiming_HB = ibooker.book2D(histo, histo, 200, 0., 400., 110, -120., 100.);
 
-    sprintf  (histo, "CaloTowersTask_EM_Energy_Timing_High_HB" ) ;
-    emEnergyTiming_High_HB = ibooker.book2D(histo, histo, 200, 0. , 3000., 110, -120., 100.  ) ;
+    sprintf(histo, "CaloTowersTask_EM_Energy_Timing_High_HB");
+    emEnergyTiming_High_HB = ibooker.book2D(histo, histo, 200, 0., 3000., 110, -120., 100.);
 
-    sprintf  (histo, "CaloTowersTask_EM_Energy_Timing_profile_Low_HB" ) ;
-    emEnergyTiming_profile_Low_HB = ibooker.bookProfile(histo, histo, 40, 0. , 40., 110, -120., 100.  ) ;
+    sprintf(histo, "CaloTowersTask_EM_Energy_Timing_profile_Low_HB");
+    emEnergyTiming_profile_Low_HB = ibooker.bookProfile(histo, histo, 40, 0., 40., 110, -120., 100.);
 
-    sprintf  (histo, "CaloTowersTask_EM_Energy_Timing_profile_HB" ) ;
-    emEnergyTiming_profile_HB = ibooker.bookProfile(histo, histo, 200, 0. , 400., 110, -120., 100.  ) ;
+    sprintf(histo, "CaloTowersTask_EM_Energy_Timing_profile_HB");
+    emEnergyTiming_profile_HB = ibooker.bookProfile(histo, histo, 200, 0., 400., 110, -120., 100.);
 
-    sprintf  (histo, "CaloTowersTask_EM_Energy_Timing_profile_High_HB" ) ;
-    emEnergyTiming_profile_High_HB = ibooker.bookProfile(histo, histo, 200, 0. , 3000., 110, -120., 100.  ) ;
+    sprintf(histo, "CaloTowersTask_EM_Energy_Timing_profile_High_HB");
+    emEnergyTiming_profile_High_HB = ibooker.bookProfile(histo, histo, 200, 0., 3000., 110, -120., 100.);
 
-    //HAD
-    sprintf  (histo, "CaloTowersTask_HAD_Energy_Timing_Low_HB" ) ;
-    hadEnergyTiming_Low_HB = ibooker.book2D(histo, histo, 40, 0. , 40., 70, -48., 92. ) ;
+    // HAD
+    sprintf(histo, "CaloTowersTask_HAD_Energy_Timing_Low_HB");
+    hadEnergyTiming_Low_HB = ibooker.book2D(histo, histo, 40, 0., 40., 70, -48., 92.);
 
-    sprintf  (histo, "CaloTowersTask_HAD_Energy_Timing_HB" ) ;
-    hadEnergyTiming_HB = ibooker.book2D(histo, histo, 100, 0. , 200., 70, -48., 92. ) ;
+    sprintf(histo, "CaloTowersTask_HAD_Energy_Timing_HB");
+    hadEnergyTiming_HB = ibooker.book2D(histo, histo, 100, 0., 200., 70, -48., 92.);
 
-    sprintf  (histo, "CaloTowersTask_HAD_Energy_Timing_High_HB" ) ;
-    hadEnergyTiming_High_HB = ibooker.book2D(histo, histo, 300, 0. , 3000., 70, -48., 92. ) ;
+    sprintf(histo, "CaloTowersTask_HAD_Energy_Timing_High_HB");
+    hadEnergyTiming_High_HB = ibooker.book2D(histo, histo, 300, 0., 3000., 70, -48., 92.);
 
-    sprintf  (histo, "CaloTowersTask_HAD_Energy_Timing_profile_Low_HB" ) ;
-    hadEnergyTiming_profile_Low_HB = ibooker.bookProfile(histo, histo, 40, 0. , 40., 70, -48., 92. ) ;
+    sprintf(histo, "CaloTowersTask_HAD_Energy_Timing_profile_Low_HB");
+    hadEnergyTiming_profile_Low_HB = ibooker.bookProfile(histo, histo, 40, 0., 40., 70, -48., 92.);
 
-    sprintf  (histo, "CaloTowersTask_HAD_Energy_Timing_profile_HB" ) ;
-    hadEnergyTiming_profile_HB = ibooker.bookProfile(histo, histo, 100, 0. , 200., 70, -48., 92. ) ;
+    sprintf(histo, "CaloTowersTask_HAD_Energy_Timing_profile_HB");
+    hadEnergyTiming_profile_HB = ibooker.bookProfile(histo, histo, 100, 0., 200., 70, -48., 92.);
 
-    sprintf  (histo, "CaloTowersTask_HAD_Energy_Timing_profile_High_HB" ) ;
-    hadEnergyTiming_profile_High_HB = ibooker.bookProfile(histo, histo, 300, 0. , 3000., 70, -48., 92. ) ;
+    sprintf(histo, "CaloTowersTask_HAD_Energy_Timing_profile_High_HB");
+    hadEnergyTiming_profile_High_HB = ibooker.bookProfile(histo, histo, 300, 0., 3000., 70, -48., 92.);
     //-------------------------------------------------------------------------------------------
 
-    sprintf (histo, "CaloTowersTask_Iphi_HCAL_component_of_tower_HBP" ) ;
-    meIphiHcalTower_HBP = ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_); 
-    sprintf (histo, "CaloTowersTask_Iphi_HCAL_component_of_tower_HBM" ) ;
-    meIphiHcalTower_HBM = ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_); 
-        
+    sprintf(histo, "CaloTowersTask_Iphi_HCAL_component_of_tower_HBP");
+    meIphiHcalTower_HBP = ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_);
+    sprintf(histo, "CaloTowersTask_Iphi_HCAL_component_of_tower_HBM");
+    meIphiHcalTower_HBM = ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_);
+
     //-------------------------------------------------------------------------------------------
 
-    //Everything else is not drawn
-    if (useAllHistos_){
-      sprintf (histo, "CaloTowersTask_sum_of_energy_HCAL_vs_ECAL_HB") ;
-      meEnergyHcalvsEcal_HB    = ibooker.book2D(histo, histo, 500, 0., 500., 500, 0., 500.);
-      
-      sprintf (histo, "CaloTowersTask_energy_OUTER_HB" ) ;
-      meEnergyHO_HB    = ibooker.book1D(histo, histo, 1640, -200, 8000);   
-      
-      sprintf (histo, "CaloTowersTask_energy_of_ECAL_component_of_tower_HB" ) ;
-      meEnergyEcalTower_HB = ibooker.book1D(histo, histo, 440, -200, 2000); 
-      
-      sprintf (histo, "CaloTowersTask_energy_of_HCAL_component_of_tower_HB" ) ;
-      meEnergyHcalTower_HB = ibooker.book1D(histo, histo, 440 , -200 , 2000); 
-      
-      sprintf  (histo, "CaloTowersTask_energy_HcalPlusEcalPlusHO_HB" ) ;
-      meTotEnergy_HB = ibooker.book1D(histo, histo,400, 0., 2000.) ;
-      
-      sprintf  (histo, "CaloTowersTask_map_energy_HB" );
+    // Everything else is not drawn
+    if (useAllHistos_) {
+      sprintf(histo, "CaloTowersTask_sum_of_energy_HCAL_vs_ECAL_HB");
+      meEnergyHcalvsEcal_HB = ibooker.book2D(histo, histo, 500, 0., 500., 500, 0., 500.);
+
+      sprintf(histo, "CaloTowersTask_energy_OUTER_HB");
+      meEnergyHO_HB = ibooker.book1D(histo, histo, 1640, -200, 8000);
+
+      sprintf(histo, "CaloTowersTask_energy_of_ECAL_component_of_tower_HB");
+      meEnergyEcalTower_HB = ibooker.book1D(histo, histo, 440, -200, 2000);
+
+      sprintf(histo, "CaloTowersTask_energy_of_HCAL_component_of_tower_HB");
+      meEnergyHcalTower_HB = ibooker.book1D(histo, histo, 440, -200, 2000);
+
+      sprintf(histo, "CaloTowersTask_energy_HcalPlusEcalPlusHO_HB");
+      meTotEnergy_HB = ibooker.book1D(histo, histo, 400, 0., 2000.);
+
+      sprintf(histo, "CaloTowersTask_map_energy_HB");
       mapEnergy_HB = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
-      sprintf  (histo, "CaloTowersTask_map_energy_HCAL_HB");
-      mapEnergyHcal_HB = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
-      sprintf  (histo, "CaloTowersTask_map_energy_ECAL_HB" );
-      mapEnergyEcal_HB = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
-      
-      sprintf  (histo, "CaloTowersTask_phi_MET_HB" ) ;
-      phiMET_HB = ibooker.book1D(histo, histo, 72, -3.1415926535898, 3.1415926535898 ) ;
+      sprintf(histo, "CaloTowersTask_map_energy_HCAL_HB");
+      mapEnergyHcal_HB =
+          ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
+      sprintf(histo, "CaloTowersTask_map_energy_ECAL_HB");
+      mapEnergyEcal_HB =
+          ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
+
+      sprintf(histo, "CaloTowersTask_phi_MET_HB");
+      phiMET_HB = ibooker.book1D(histo, histo, 72, -3.1415926535898, 3.1415926535898);
     }
-  } 
-  
-  if( isub == 2 || isub == 0) {
-    //All cell histos are used
-    sprintf  (histo, "number_of_bad_cells_Hcal_HE");
+  }
+
+  if (isub == 2 || isub == 0) {
+    // All cell histos are used
+    sprintf(histo, "number_of_bad_cells_Hcal_HE");
     numBadCellsHcal_HE = ibooker.book1D(histo, histo, 5, 0, 5);
-    sprintf  (histo, "number_of_recovered_cells_Hcal_HE");
+    sprintf(histo, "number_of_recovered_cells_Hcal_HE");
     numRcvCellsHcal_HE = ibooker.book1D(histo, histo, 5, 0, 5);
-    sprintf  (histo, "number_of_problematic_cells_Hcal_HE");
-    numPrbCellsHcal_HE = ibooker.book1D(histo, histo, 5, 0, 5); 
+    sprintf(histo, "number_of_problematic_cells_Hcal_HE");
+    numPrbCellsHcal_HE = ibooker.book1D(histo, histo, 5, 0, 5);
 
-    //These are the five oldest CaloTower histos used: NTowers, E in HCAL/ECAL, MET and SET
+    // These are the five oldest CaloTower histos used: NTowers, E in HCAL/ECAL,
+    // MET and SET
     //-------------------------------------------------------------------------------------------
-    sprintf (histo, "CaloTowersTask_energy_HCAL_HE" ) ;
-    meEnergyHcal_HE    = ibooker.book1D(histo, histo, 1240, -200, 6000);
-    
-    sprintf (histo, "CaloTowersTask_energy_ECAL_HE" ) ;
-    meEnergyEcal_HE    = ibooker.book1D(histo, histo, 1240, -200, 6000);
-    
-    sprintf (histo, "CaloTowersTask_number_of_fired_towers_HE" ) ;
-    meNumFiredTowers_HE = ibooker.book1D(histo, histo, 1000, 0, 2000); 
-
-    sprintf  (histo, "CaloTowersTask_MET_HE" ) ;
-    MET_HE = ibooker.book1D(histo, histo, 1000, 0. , 1000. ) ;
-    
-    sprintf  (histo, "CaloTowersTask_SET_HE" ) ;
-    SET_HE = ibooker.book1D(histo, histo, 2000, 0. , 2000. ) ;
+    sprintf(histo, "CaloTowersTask_energy_HCAL_HE");
+    meEnergyHcal_HE = ibooker.book1D(histo, histo, 1240, -200, 6000);
+
+    sprintf(histo, "CaloTowersTask_energy_ECAL_HE");
+    meEnergyEcal_HE = ibooker.book1D(histo, histo, 1240, -200, 6000);
+
+    sprintf(histo, "CaloTowersTask_number_of_fired_towers_HE");
+    meNumFiredTowers_HE = ibooker.book1D(histo, histo, 1000, 0, 2000);
+
+    sprintf(histo, "CaloTowersTask_MET_HE");
+    MET_HE = ibooker.book1D(histo, histo, 1000, 0., 1000.);
+
+    sprintf(histo, "CaloTowersTask_SET_HE");
+    SET_HE = ibooker.book1D(histo, histo, 2000, 0., 2000.);
     //-------------------------------------------------------------------------------------------
 
-    //Timing histos and profiles -- all six are necessary
+    // Timing histos and profiles -- all six are necessary
     //-------------------------------------------------------------------------------------------
-    sprintf  (histo, "CaloTowersTask_EM_Timing_HE" ) ;
-    emTiming_HE = ibooker.book1D(histo, histo, 110, -120., 100. ) ;
+    sprintf(histo, "CaloTowersTask_EM_Timing_HE");
+    emTiming_HE = ibooker.book1D(histo, histo, 110, -120., 100.);
 
-    sprintf  (histo, "CaloTowersTask_HAD_Timing_HE" ) ;
-    hadTiming_HE = ibooker.book1D(histo, histo, 70, -48., 92. ) ;
+    sprintf(histo, "CaloTowersTask_HAD_Timing_HE");
+    hadTiming_HE = ibooker.book1D(histo, histo, 70, -48., 92.);
 
-    //Energy-Timing histos are divided into low and normal to reduce memory usage
-    //EM
-    sprintf  (histo, "CaloTowersTask_EM_Energy_Timing_Low_HE" ) ;
-    emEnergyTiming_Low_HE = ibooker.book2D(histo, histo, 160, 0. , 160., 110, -120., 100.  ) ;
+    // Energy-Timing histos are divided into low and normal to reduce memory
+    // usage EM
+    sprintf(histo, "CaloTowersTask_EM_Energy_Timing_Low_HE");
+    emEnergyTiming_Low_HE = ibooker.book2D(histo, histo, 160, 0., 160., 110, -120., 100.);
 
-    sprintf  (histo, "CaloTowersTask_EM_Energy_Timing_HE" ) ;
-    emEnergyTiming_HE = ibooker.book2D(histo, histo, 200, 0. , 800., 110, -120., 100.  ) ;
+    sprintf(histo, "CaloTowersTask_EM_Energy_Timing_HE");
+    emEnergyTiming_HE = ibooker.book2D(histo, histo, 200, 0., 800., 110, -120., 100.);
 
-    sprintf  (histo, "CaloTowersTask_EM_Energy_Timing_profile_Low_HE" ) ;
-    emEnergyTiming_profile_Low_HE = ibooker.bookProfile(histo, histo, 160, 0. , 160., 110, -120., 100.  ) ;
+    sprintf(histo, "CaloTowersTask_EM_Energy_Timing_profile_Low_HE");
+    emEnergyTiming_profile_Low_HE = ibooker.bookProfile(histo, histo, 160, 0., 160., 110, -120., 100.);
 
-    sprintf  (histo, "CaloTowersTask_EM_Energy_Timing_profile_HE" ) ;
-    emEnergyTiming_profile_HE = ibooker.bookProfile(histo, histo, 200, 0. , 800., 110, -120., 100.  ) ;
+    sprintf(histo, "CaloTowersTask_EM_Energy_Timing_profile_HE");
+    emEnergyTiming_profile_HE = ibooker.bookProfile(histo, histo, 200, 0., 800., 110, -120., 100.);
 
-    //HAD
-    sprintf  (histo, "CaloTowersTask_HAD_Energy_Timing_Low_HE" ) ;
-    hadEnergyTiming_Low_HE = ibooker.book2D(histo, histo, 160, 0. , 160., 70, -48., 92. ) ;
+    // HAD
+    sprintf(histo, "CaloTowersTask_HAD_Energy_Timing_Low_HE");
+    hadEnergyTiming_Low_HE = ibooker.book2D(histo, histo, 160, 0., 160., 70, -48., 92.);
 
-    sprintf  (histo, "CaloTowersTask_HAD_Energy_Timing_HE" ) ;
-    hadEnergyTiming_HE = ibooker.book2D(histo, histo, 200, 0. , 800., 70, -48., 92. ) ;
+    sprintf(histo, "CaloTowersTask_HAD_Energy_Timing_HE");
+    hadEnergyTiming_HE = ibooker.book2D(histo, histo, 200, 0., 800., 70, -48., 92.);
 
-    sprintf  (histo, "CaloTowersTask_HAD_Energy_Timing_profile_Low_HE" ) ;
-    hadEnergyTiming_profile_Low_HE = ibooker.bookProfile(histo, histo, 160, 0. , 160., 70, -48., 92. ) ;
+    sprintf(histo, "CaloTowersTask_HAD_Energy_Timing_profile_Low_HE");
+    hadEnergyTiming_profile_Low_HE = ibooker.bookProfile(histo, histo, 160, 0., 160., 70, -48., 92.);
 
-    sprintf  (histo, "CaloTowersTask_HAD_Energy_Timing_profile_HE" ) ;
-    hadEnergyTiming_profile_HE = ibooker.bookProfile(histo, histo, 200, 0. , 800., 70, -48., 92. ) ;
+    sprintf(histo, "CaloTowersTask_HAD_Energy_Timing_profile_HE");
+    hadEnergyTiming_profile_HE = ibooker.bookProfile(histo, histo, 200, 0., 800., 70, -48., 92.);
     //-------------------------------------------------------------------------------------------
 
-    sprintf (histo, "CaloTowersTask_Iphi_HCAL_component_of_tower_HEP" ) ;
-    meIphiHcalTower_HEP = ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_); 
-    sprintf (histo, "CaloTowersTask_Iphi_HCAL_component_of_tower_HEM" ) ;
-    meIphiHcalTower_HEM = ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_); 
+    sprintf(histo, "CaloTowersTask_Iphi_HCAL_component_of_tower_HEP");
+    meIphiHcalTower_HEP = ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_);
+    sprintf(histo, "CaloTowersTask_Iphi_HCAL_component_of_tower_HEM");
+    meIphiHcalTower_HEM = ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_);
 
     //-------------------------------------------------------------------------------------------
 
-    //Everything else is not drawn
-    if (useAllHistos_){
-      sprintf (histo, "CaloTowersTask_sum_of_energy_HCAL_vs_ECAL_HE") ;
-      meEnergyHcalvsEcal_HE    = ibooker.book2D(histo, histo, 500, 0., 500., 500, 0., 500.);
-      
-      sprintf (histo, "CaloTowersTask_energy_OUTER_HE" ) ;
-      meEnergyHO_HE    = ibooker.book1D(histo, histo, 440, -200, 2000);   
-      
-      sprintf (histo, "CaloTowersTask_energy_of_ECAL_component_of_tower_HE" ) ;
-      meEnergyEcalTower_HE = ibooker.book1D(histo, histo, 1100, -200, 2000); 
-      
-      sprintf (histo, "CaloTowersTask_energy_of_HCAL_component_of_tower_HE" ) ;
-      meEnergyHcalTower_HE = ibooker.book1D(histo, histo, 1100 , -200 , 2000); 
-      
-      sprintf  (histo, "CaloTowersTask_energy_HcalPlusEcalPlusHO_HE" ) ;
-      meTotEnergy_HE = ibooker.book1D(histo, histo,400, 0., 2000.) ;
-      
-      sprintf  (histo, "CaloTowersTask_map_energy_HE" );
+    // Everything else is not drawn
+    if (useAllHistos_) {
+      sprintf(histo, "CaloTowersTask_sum_of_energy_HCAL_vs_ECAL_HE");
+      meEnergyHcalvsEcal_HE = ibooker.book2D(histo, histo, 500, 0., 500., 500, 0., 500.);
+
+      sprintf(histo, "CaloTowersTask_energy_OUTER_HE");
+      meEnergyHO_HE = ibooker.book1D(histo, histo, 440, -200, 2000);
+
+      sprintf(histo, "CaloTowersTask_energy_of_ECAL_component_of_tower_HE");
+      meEnergyEcalTower_HE = ibooker.book1D(histo, histo, 1100, -200, 2000);
+
+      sprintf(histo, "CaloTowersTask_energy_of_HCAL_component_of_tower_HE");
+      meEnergyHcalTower_HE = ibooker.book1D(histo, histo, 1100, -200, 2000);
+
+      sprintf(histo, "CaloTowersTask_energy_HcalPlusEcalPlusHO_HE");
+      meTotEnergy_HE = ibooker.book1D(histo, histo, 400, 0., 2000.);
+
+      sprintf(histo, "CaloTowersTask_map_energy_HE");
       mapEnergy_HE = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
-      sprintf  (histo, "CaloTowersTask_map_energy_HCAL_HE");
-      mapEnergyHcal_HE = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
-      sprintf  (histo, "CaloTowersTask_map_energy_ECAL_HE" );
-      mapEnergyEcal_HE = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
-      
-      sprintf  (histo, "CaloTowersTask_phi_MET_HE" ) ;
-      phiMET_HE = ibooker.book1D(histo, histo, 72, -3.1415926535898, 3.1415926535898 ) ;
+      sprintf(histo, "CaloTowersTask_map_energy_HCAL_HE");
+      mapEnergyHcal_HE =
+          ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
+      sprintf(histo, "CaloTowersTask_map_energy_ECAL_HE");
+      mapEnergyEcal_HE =
+          ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
+
+      sprintf(histo, "CaloTowersTask_phi_MET_HE");
+      phiMET_HE = ibooker.book1D(histo, histo, 72, -3.1415926535898, 3.1415926535898);
     }
   }
 
-
-  if( isub == 3 || isub == 0) {
-    //All cell histos are used
-    sprintf  (histo, "number_of_bad_cells_Hcal_HF");
+  if (isub == 3 || isub == 0) {
+    // All cell histos are used
+    sprintf(histo, "number_of_bad_cells_Hcal_HF");
     numBadCellsHcal_HF = ibooker.book1D(histo, histo, 5, 0, 5);
-    sprintf  (histo, "number_of_recovered_cells_Hcal_HF");
+    sprintf(histo, "number_of_recovered_cells_Hcal_HF");
     numRcvCellsHcal_HF = ibooker.book1D(histo, histo, 5, 0, 5);
-    sprintf  (histo, "number_of_problematic_cells_Hcal_HF");
-    numPrbCellsHcal_HF = ibooker.book1D(histo, histo, 5, 0, 5); 
+    sprintf(histo, "number_of_problematic_cells_Hcal_HF");
+    numPrbCellsHcal_HF = ibooker.book1D(histo, histo, 5, 0, 5);
 
-    //These are the five oldest CaloTower histos used: NTowers, E in HCAL/ECAL, MET and SET
+    // These are the five oldest CaloTower histos used: NTowers, E in HCAL/ECAL,
+    // MET and SET
     //-------------------------------------------------------------------------------------------
-    sprintf (histo, "CaloTowersTask_energy_HCAL_HF" ) ;
-    meEnergyHcal_HF    = ibooker.book1D(histo, histo, 6040, -200, 30000);
-    
-    sprintf (histo, "CaloTowersTask_energy_ECAL_HF" ) ;
-    meEnergyEcal_HF    = ibooker.book1D(histo, histo, 2440, -200, 12000);
-
-    sprintf (histo, "CaloTowersTask_number_of_fired_towers_HF" ) ;
-    meNumFiredTowers_HF = ibooker.book1D(histo, histo, 1000, 0, 2000); 
-
-    sprintf  (histo, "CaloTowersTask_MET_HF" ) ;
-    MET_HF = ibooker.book1D(histo, histo, 500, 0. , 500. ) ;
-    
-    sprintf  (histo, "CaloTowersTask_SET_HF" ) ;
-    SET_HF = ibooker.book1D(histo, histo, 2000, 0. , 2000. ) ;
+    sprintf(histo, "CaloTowersTask_energy_HCAL_HF");
+    meEnergyHcal_HF = ibooker.book1D(histo, histo, 6040, -200, 30000);
+
+    sprintf(histo, "CaloTowersTask_energy_ECAL_HF");
+    meEnergyEcal_HF = ibooker.book1D(histo, histo, 2440, -200, 12000);
+
+    sprintf(histo, "CaloTowersTask_number_of_fired_towers_HF");
+    meNumFiredTowers_HF = ibooker.book1D(histo, histo, 1000, 0, 2000);
+
+    sprintf(histo, "CaloTowersTask_MET_HF");
+    MET_HF = ibooker.book1D(histo, histo, 500, 0., 500.);
+
+    sprintf(histo, "CaloTowersTask_SET_HF");
+    SET_HF = ibooker.book1D(histo, histo, 2000, 0., 2000.);
     //-------------------------------------------------------------------------------------------
 
-    //Timing histos and profiles -- all six are necessary
+    // Timing histos and profiles -- all six are necessary
     //-------------------------------------------------------------------------------------------
-    sprintf  (histo, "CaloTowersTask_EM_Timing_HF" ) ;
-    emTiming_HF = ibooker.book1D(histo, histo, 110, -120., 100. ) ;
+    sprintf(histo, "CaloTowersTask_EM_Timing_HF");
+    emTiming_HF = ibooker.book1D(histo, histo, 110, -120., 100.);
 
-    sprintf  (histo, "CaloTowersTask_HAD_Timing_HF" ) ;
-    hadTiming_HF = ibooker.book1D(histo, histo, 70, -48., 92. ) ;
+    sprintf(histo, "CaloTowersTask_HAD_Timing_HF");
+    hadTiming_HF = ibooker.book1D(histo, histo, 70, -48., 92.);
 
-    //EM
-    sprintf  (histo, "CaloTowersTask_EM_Energy_Timing_HF" ) ;
-    emEnergyTiming_HF = ibooker.book2D(histo, histo, 150, 0. , 300., 110, -120., 100.  ) ;
+    // EM
+    sprintf(histo, "CaloTowersTask_EM_Energy_Timing_HF");
+    emEnergyTiming_HF = ibooker.book2D(histo, histo, 150, 0., 300., 110, -120., 100.);
 
-    sprintf  (histo, "CaloTowersTask_EM_Energy_Timing_profile_HF" ) ;
-    emEnergyTiming_profile_HF = ibooker.bookProfile(histo, histo, 150, 0. , 300., 110, -120., 100.  ) ;
+    sprintf(histo, "CaloTowersTask_EM_Energy_Timing_profile_HF");
+    emEnergyTiming_profile_HF = ibooker.bookProfile(histo, histo, 150, 0., 300., 110, -120., 100.);
 
-    //HAD (requires two different sets of histograms to lower RAM usage)
-    sprintf  (histo, "CaloTowersTask_HAD_Energy_Timing_Low_HF" ) ;
-    hadEnergyTiming_Low_HF = ibooker.book2D(histo, histo, 40, 0. , 40., 70, -48., 92. ) ;
+    // HAD (requires two different sets of histograms to lower RAM usage)
+    sprintf(histo, "CaloTowersTask_HAD_Energy_Timing_Low_HF");
+    hadEnergyTiming_Low_HF = ibooker.book2D(histo, histo, 40, 0., 40., 70, -48., 92.);
 
-    sprintf  (histo, "CaloTowersTask_HAD_Energy_Timing_HF" ) ;
-    hadEnergyTiming_HF = ibooker.book2D(histo, histo, 200, 0. , 600., 70, -48., 92. ) ;
+    sprintf(histo, "CaloTowersTask_HAD_Energy_Timing_HF");
+    hadEnergyTiming_HF = ibooker.book2D(histo, histo, 200, 0., 600., 70, -48., 92.);
 
-    sprintf  (histo, "CaloTowersTask_HAD_Energy_Timing_profile_Low_HF" ) ;
-    hadEnergyTiming_profile_Low_HF = ibooker.bookProfile(histo, histo, 40, 0. , 40., 70, -48., 92. ) ;
+    sprintf(histo, "CaloTowersTask_HAD_Energy_Timing_profile_Low_HF");
+    hadEnergyTiming_profile_Low_HF = ibooker.bookProfile(histo, histo, 40, 0., 40., 70, -48., 92.);
 
-    sprintf  (histo, "CaloTowersTask_HAD_Energy_Timing_profile_HF" ) ;
-    hadEnergyTiming_profile_HF = ibooker.bookProfile(histo, histo, 200, 0. , 600., 70, -48., 92. ) ;
+    sprintf(histo, "CaloTowersTask_HAD_Energy_Timing_profile_HF");
+    hadEnergyTiming_profile_HF = ibooker.bookProfile(histo, histo, 200, 0., 600., 70, -48., 92.);
     //-------------------------------------------------------------------------------------------
 
-    sprintf (histo, "CaloTowersTask_Iphi_tower_HFP" ) ;
-    meIphiCaloTower_HFP = ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_); 
-    sprintf (histo, "CaloTowersTask_Iphi_tower_HFM" ) ;
-    meIphiCaloTower_HFM = ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_); 
+    sprintf(histo, "CaloTowersTask_Iphi_tower_HFP");
+    meIphiCaloTower_HFP = ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_);
+    sprintf(histo, "CaloTowersTask_Iphi_tower_HFM");
+    meIphiCaloTower_HFM = ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_);
 
     //-------------------------------------------------------------------------------------------
 
-    //Everything else is not drawn
-    if (useAllHistos_){
-      sprintf (histo, "CaloTowersTask_sum_of_energy_HCAL_vs_ECAL_HF") ;
-      meEnergyHcalvsEcal_HF    = ibooker.book2D(histo, histo, 500, 0., 500., 500, 0., 500.);
-      
-      sprintf (histo, "CaloTowersTask_energy_OUTER_HF" ) ;
-      meEnergyHO_HF    = ibooker.book1D(histo, histo, 440, -200, 2000);   
-      
-      sprintf (histo, "CaloTowersTask_energy_of_ECAL_component_of_tower_HF" ) ;
-      meEnergyEcalTower_HF = ibooker.book1D(histo, histo, 440, -200, 2000); 
-      
-      sprintf (histo, "CaloTowersTask_energy_of_HCAL_component_of_tower_HF" ) ;
-      meEnergyHcalTower_HF = ibooker.book1D(histo, histo, 440 , -200 , 2000); 
-      
-      sprintf  (histo, "CaloTowersTask_energy_HcalPlusEcalPlusHO_HF" ) ;
-      meTotEnergy_HF = ibooker.book1D(histo, histo, 400, 0., 2000.) ;
-      
-      sprintf  (histo, "CaloTowersTask_map_energy_HF" );
-      mapEnergy_HF = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
-      sprintf  (histo, "CaloTowersTask_map_energy_HCAL_HF");
-      mapEnergyHcal_HF = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
-      sprintf  (histo, "CaloTowersTask_map_energy_ECAL_HF" );
-      mapEnergyEcal_HF = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
-      
-      sprintf  (histo, "CaloTowersTask_phi_MET_HF" ) ;
-      phiMET_HF = ibooker.book1D(histo, histo, 72, -3.1415926535898, 3.1415926535898 ) ;
-    }
-  }
+    // Everything else is not drawn
+    if (useAllHistos_) {
+      sprintf(histo, "CaloTowersTask_sum_of_energy_HCAL_vs_ECAL_HF");
+      meEnergyHcalvsEcal_HF = ibooker.book2D(histo, histo, 500, 0., 500., 500, 0., 500.);
 
-}
+      sprintf(histo, "CaloTowersTask_energy_OUTER_HF");
+      meEnergyHO_HF = ibooker.book1D(histo, histo, 440, -200, 2000);
 
+      sprintf(histo, "CaloTowersTask_energy_of_ECAL_component_of_tower_HF");
+      meEnergyEcalTower_HF = ibooker.book1D(histo, histo, 440, -200, 2000);
 
-CaloTowersAnalyzer::~CaloTowersAnalyzer() {
-  
-}
+      sprintf(histo, "CaloTowersTask_energy_of_HCAL_component_of_tower_HF");
+      meEnergyHcalTower_HF = ibooker.book1D(histo, histo, 440, -200, 2000);
+
+      sprintf(histo, "CaloTowersTask_energy_HcalPlusEcalPlusHO_HF");
+      meTotEnergy_HF = ibooker.book1D(histo, histo, 400, 0., 2000.);
 
-void CaloTowersAnalyzer::endJob() {
+      sprintf(histo, "CaloTowersTask_map_energy_HF");
+      mapEnergy_HF = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
+      sprintf(histo, "CaloTowersTask_map_energy_HCAL_HF");
+      mapEnergyHcal_HF =
+          ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
+      sprintf(histo, "CaloTowersTask_map_energy_ECAL_HF");
+      mapEnergyEcal_HF =
+          ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
+
+      sprintf(histo, "CaloTowersTask_phi_MET_HF");
+      phiMET_HF = ibooker.book1D(histo, histo, 72, -3.1415926535898, 3.1415926535898);
+    }
+  }
 }
 
-void CaloTowersAnalyzer::beginJob(){ nevent = 0; }
+CaloTowersAnalyzer::~CaloTowersAnalyzer() {}
+
+void CaloTowersAnalyzer::endJob() {}
 
-void CaloTowersAnalyzer::analyze(edm::Event const& event, edm::EventSetup const& c) {
+void CaloTowersAnalyzer::beginJob() { nevent = 0; }
 
+void CaloTowersAnalyzer::analyze(edm::Event const &event, edm::EventSetup const &c) {
   nevent++;
 
   edm::Handle<CaloTowerCollection> towers;
-  event.getByToken(tok_towers_,towers);
+  event.getByToken(tok_towers_, towers);
   CaloTowerCollection::const_iterator cal;
 
   double met;
   double phimet;
 
-  // ieta scan 
-  //double partR  = 0.3;
-  //double Rmin   = 9999.;
-  //double Econe  = 0.;
-  //double Hcone  = 0.;
-  //double Ee1    = 0.;
-  //double Eh1    = 0.;
+  // ieta scan
+  // double partR  = 0.3;
+  // double Rmin   = 9999.;
+  // double Econe  = 0.;
+  // double Hcone  = 0.;
+  // double Ee1    = 0.;
+  // double Eh1    = 0.;
   double ieta_MC = 9999;
   double iphi_MC = 9999;
- 
-  // HB   
+
+  // HB
   double sumEnergyHcal_HB = 0.;
   double sumEnergyEcal_HB = 0.;
-  double sumEnergyHO_HB   = 0.;
+  double sumEnergyHO_HB = 0.;
   Int_t numFiredTowers_HB = 0;
-  double metx_HB   =  0.;
-  double mety_HB   =  0.;
-  double metz_HB   =  0.;
-  double sEt_HB    =  0.;
-  // HE   
+  double metx_HB = 0.;
+  double mety_HB = 0.;
+  double metz_HB = 0.;
+  double sEt_HB = 0.;
+  // HE
   double sumEnergyHcal_HE = 0.;
   double sumEnergyEcal_HE = 0.;
-  double sumEnergyHO_HE   = 0.;
+  double sumEnergyHO_HE = 0.;
   Int_t numFiredTowers_HE = 0;
-  double metx_HE   =  0.;
-  double mety_HE   =  0.;
-  double metz_HE   =  0.;
-  double sEt_HE    =  0.;
-  // HF   
+  double metx_HE = 0.;
+  double mety_HE = 0.;
+  double metz_HE = 0.;
+  double sEt_HE = 0.;
+  // HF
   double sumEnergyHcal_HF = 0.;
   double sumEnergyEcal_HF = 0.;
-  double sumEnergyHO_HF   = 0.;
+  double sumEnergyHO_HF = 0.;
   Int_t numFiredTowers_HF = 0;
-  double metx_HF   =  0.;
-  double mety_HF   =  0.;
-  double metz_HF   =  0.;
-  double sEt_HF    =  0.;
-
-  for ( cal = towers->begin(); cal != towers->end(); ++cal ) {
-    
-    double eE     = cal->emEnergy();
-    double eH     = cal->hadEnergy();
-    double eHO    = cal->outerEnergy();
-    double etaT   = cal->eta();
+  double metx_HF = 0.;
+  double mety_HF = 0.;
+  double metz_HF = 0.;
+  double sEt_HF = 0.;
+
+  for (cal = towers->begin(); cal != towers->end(); ++cal) {
+    double eE = cal->emEnergy();
+    double eH = cal->hadEnergy();
+    double eHO = cal->outerEnergy();
+    double etaT = cal->eta();
     //    double phiT   = cal->phi();
-    double en     = cal->energy();
-    double etT    = cal->et();
+    double en = cal->energy();
+    double etT = cal->et();
     double had_tm = cal->hcalTime();
-    double em_tm  = cal->ecalTime();
+    double em_tm = cal->ecalTime();
 
     int numBadEcalCells = cal->numBadEcalCells();
     int numRcvEcalCells = cal->numRecoveredEcalCells();
@@ -519,12 +520,12 @@ void CaloTowersAnalyzer::analyze(edm::Event const& event, edm::EventSetup const&
 
     int numBadHcalCells = cal->numBadHcalCells();
     int numRcvHcalCells = cal->numRecoveredHcalCells();
-    int numPrbHcalCells = cal->numProblematicHcalCells(); 
+    int numPrbHcalCells = cal->numProblematicHcalCells();
 
     math::RhoEtaPhiVector mom(cal->et(), cal->eta(), cal->phi());
-			      //  Vector mom  = cal->momentum(); 
-  
-    // cell properties    
+    //  Vector mom  = cal->momentum();
+
+    // cell properties
     CaloTowerDetId idT = cal->id();
     int ieta = idT.ieta();
     int iphi = idT.iphi();
@@ -533,75 +534,80 @@ void CaloTowersAnalyzer::analyze(edm::Event const& event, edm::EventSetup const&
     // hcal:  0 hcalBarrel  1 HcalEndcap  2 HcalForward
     std::vector<int> inEcals(2), inHcals(3);
     unsigned int constitSize = cal->constituentsSize();
-    for(unsigned int ic=0; ic<constitSize; ic++){
-       DetId detId = cal->constituent(ic);
-       if(detId.det() == DetId::Ecal){
-          if( detId.subdetId()==EcalBarrel ) inEcals[0] =1;
-          else if( detId.subdetId()==EcalEndcap ) inEcals[1] =1;
-       }
-       if(detId.det() == DetId::Hcal){
-          if( HcalDetId(detId).subdet()==HcalBarrel ) inHcals[0] =1;
-          else if( HcalDetId(detId).subdet()==HcalEndcap ) inHcals[1] =1;
-          else if( HcalDetId(detId).subdet()==HcalForward ) inHcals[2] =1;
-       }
+    for (unsigned int ic = 0; ic < constitSize; ic++) {
+      DetId detId = cal->constituent(ic);
+      if (detId.det() == DetId::Ecal) {
+        if (detId.subdetId() == EcalBarrel)
+          inEcals[0] = 1;
+        else if (detId.subdetId() == EcalEndcap)
+          inEcals[1] = 1;
+      }
+      if (detId.det() == DetId::Hcal) {
+        if (HcalDetId(detId).subdet() == HcalBarrel)
+          inHcals[0] = 1;
+        else if (HcalDetId(detId).subdet() == HcalEndcap)
+          inHcals[1] = 1;
+        else if (HcalDetId(detId).subdet() == HcalForward)
+          inHcals[2] = 1;
+      }
+    }
+    // All cell histos are used
+    if (inEcals[0]) {
+      numBadCellsEcal_EB->Fill(numBadEcalCells);
+      numRcvCellsEcal_EB->Fill(numRcvEcalCells);
+      numPrbCellsEcal_EB->Fill(numPrbEcalCells);
     }
-    //All cell histos are used
-    if( inEcals[0] ) {
-       numBadCellsEcal_EB->Fill(numBadEcalCells);
-       numRcvCellsEcal_EB->Fill(numRcvEcalCells);
-       numPrbCellsEcal_EB->Fill(numPrbEcalCells);
+    if (inEcals[1]) {
+      numBadCellsEcal_EE->Fill(numBadEcalCells);
+      numRcvCellsEcal_EE->Fill(numRcvEcalCells);
+      numPrbCellsEcal_EE->Fill(numPrbEcalCells);
     }
-    if( inEcals[1] ) {
-       numBadCellsEcal_EE->Fill(numBadEcalCells);
-       numRcvCellsEcal_EE->Fill(numRcvEcalCells);
-       numPrbCellsEcal_EE->Fill(numPrbEcalCells);
-    } 
-    
-    //Ntowers is used in EndJob, occupancy_map is used for occupancy vs ieta
-    Ntowers_vs_ieta -> Fill(double(ieta),1.);
-    occupancy_map -> Fill(double(ieta),double(iphi)); 
-
-    if((isub == 0 || isub == 1) 
-       && (fabs(etaT) <  etaMax[0] && fabs(etaT) >= etaMin[0] )) {
-      
-      //All cell histos are used
+
+    // Ntowers is used in EndJob, occupancy_map is used for occupancy vs ieta
+    Ntowers_vs_ieta->Fill(double(ieta), 1.);
+    occupancy_map->Fill(double(ieta), double(iphi));
+
+    if ((isub == 0 || isub == 1) && (fabs(etaT) < etaMax[0] && fabs(etaT) >= etaMin[0])) {
+      // All cell histos are used
       numBadCellsHcal_HB->Fill(numBadHcalCells);
       numRcvCellsHcal_HB->Fill(numRcvHcalCells);
       numPrbCellsHcal_HB->Fill(numPrbHcalCells);
-      
-      //Map energy histos are not used
-      if (useAllHistos_){
-	mapEnergy_HB     -> Fill(double(ieta), double(iphi), en); 
-	mapEnergyHcal_HB -> Fill(double(ieta), double(iphi), eH); 
-	mapEnergyEcal_HB -> Fill(double(ieta), double(iphi), eE); 
+
+      // Map energy histos are not used
+      if (useAllHistos_) {
+        mapEnergy_HB->Fill(double(ieta), double(iphi), en);
+        mapEnergyHcal_HB->Fill(double(ieta), double(iphi), eH);
+        mapEnergyEcal_HB->Fill(double(ieta), double(iphi), eE);
       }
       //      std::cout << " e_ecal = " << eE << std::endl;
-      
-      if (eH>0.){  // iphi of HCAL component of calotower
-      if (ieta>0) meIphiHcalTower_HBP -> Fill(double(iphi)); 
-      else        meIphiHcalTower_HBM -> Fill(double(iphi)); 
+
+      if (eH > 0.) {  // iphi of HCAL component of calotower
+        if (ieta > 0)
+          meIphiHcalTower_HBP->Fill(double(iphi));
+        else
+          meIphiHcalTower_HBM->Fill(double(iphi));
       }
 
       //  simple sums
       sumEnergyHcal_HB += eH;
       sumEnergyEcal_HB += eE;
-      sumEnergyHO_HB   += eHO;
-      
+      sumEnergyHO_HB += eHO;
+
       numFiredTowers_HB++;
 
-      //Not used
-      if (useAllHistos_){
-	meEnergyEcalTower_HB->Fill(eE);
-	meEnergyHcalTower_HB->Fill(eH);    
+      // Not used
+      if (useAllHistos_) {
+        meEnergyEcalTower_HB->Fill(eE);
+        meEnergyHcalTower_HB->Fill(eH);
       }
-      
+
       // MET, SET & phimet
       //  double  etT = cal->et();
-      metx_HB += mom.x();   
-      mety_HB += mom.y();  //etT * sin(phiT);          
-      sEt_HB  += etT;
+      metx_HB += mom.x();
+      mety_HB += mom.y();  // etT * sin(phiT);
+      sEt_HB += etT;
 
-      //Timing (all histos are used)
+      // Timing (all histos are used)
       emTiming_HB->Fill(em_tm);
       hadTiming_HB->Fill(had_tm);
 
@@ -612,54 +618,54 @@ void CaloTowersAnalyzer::analyze(edm::Event const& event, edm::EventSetup const&
       emEnergyTiming_profile_HB->Fill(eE, em_tm);
       emEnergyTiming_profile_High_HB->Fill(eE, em_tm);
 
-      hadEnergyTiming_Low_HB->Fill(eH, had_tm); 
-      hadEnergyTiming_HB->Fill(eH, had_tm); 
-      hadEnergyTiming_High_HB->Fill(eH, had_tm); 
-      hadEnergyTiming_profile_Low_HB->Fill(eH, had_tm);     
-      hadEnergyTiming_profile_HB->Fill(eH, had_tm);     
-      hadEnergyTiming_profile_High_HB->Fill(eH, had_tm);     
+      hadEnergyTiming_Low_HB->Fill(eH, had_tm);
+      hadEnergyTiming_HB->Fill(eH, had_tm);
+      hadEnergyTiming_High_HB->Fill(eH, had_tm);
+      hadEnergyTiming_profile_Low_HB->Fill(eH, had_tm);
+      hadEnergyTiming_profile_HB->Fill(eH, had_tm);
+      hadEnergyTiming_profile_High_HB->Fill(eH, had_tm);
     }
-   
-    if((isub == 0 || isub == 2) 
-       && (fabs(etaT) <  etaMax[1] && fabs(etaT) >= etaMin[1] )) {
-     
-      //All cell histos are used
+
+    if ((isub == 0 || isub == 2) && (fabs(etaT) < etaMax[1] && fabs(etaT) >= etaMin[1])) {
+      // All cell histos are used
       numBadCellsHcal_HE->Fill(numBadHcalCells);
       numRcvCellsHcal_HE->Fill(numRcvHcalCells);
       numPrbCellsHcal_HE->Fill(numPrbHcalCells);
-    
-      //Map energy histos are not used
-      if (useAllHistos_){
-	mapEnergy_HE     -> Fill(double(ieta), double(iphi), en); 
-	mapEnergyHcal_HE -> Fill(double(ieta), double(iphi), eH); 
-	mapEnergyEcal_HE -> Fill(double(ieta), double(iphi), eE); 
+
+      // Map energy histos are not used
+      if (useAllHistos_) {
+        mapEnergy_HE->Fill(double(ieta), double(iphi), en);
+        mapEnergyHcal_HE->Fill(double(ieta), double(iphi), eH);
+        mapEnergyEcal_HE->Fill(double(ieta), double(iphi), eE);
       }
       //      std::cout << " e_ecal = " << eE << std::endl;
-      
-      if (eH>0.){  // iphi of HCAL component of calotower
-      if (ieta>0) meIphiHcalTower_HEP -> Fill(double(iphi)); 
-      else        meIphiHcalTower_HEM -> Fill(double(iphi)); 
+
+      if (eH > 0.) {  // iphi of HCAL component of calotower
+        if (ieta > 0)
+          meIphiHcalTower_HEP->Fill(double(iphi));
+        else
+          meIphiHcalTower_HEM->Fill(double(iphi));
       }
 
       //  simple sums
       sumEnergyHcal_HE += eH;
       sumEnergyEcal_HE += eE;
-      sumEnergyHO_HE   += eHO;
-      
+      sumEnergyHO_HE += eHO;
+
       numFiredTowers_HE++;
-      
-      //Not used
-      if (useAllHistos_){
-	meEnergyEcalTower_HE->Fill(eE);
-	meEnergyHcalTower_HE->Fill(eH);    
+
+      // Not used
+      if (useAllHistos_) {
+        meEnergyEcalTower_HE->Fill(eE);
+        meEnergyHcalTower_HE->Fill(eH);
       }
       // MET, SET & phimet
       //  double  etT = cal->et();
-      metx_HE += mom.x();   
-      mety_HE += mom.y();  //etT * sin(phiT);          
-      sEt_HE  += etT;    
+      metx_HE += mom.x();
+      mety_HE += mom.y();  // etT * sin(phiT);
+      sEt_HE += etT;
 
-      //Timing (all histos are used)
+      // Timing (all histos are used)
       emTiming_HE->Fill(em_tm);
       hadTiming_HE->Fill(had_tm);
 
@@ -668,144 +674,140 @@ void CaloTowersAnalyzer::analyze(edm::Event const& event, edm::EventSetup const&
       emEnergyTiming_profile_Low_HE->Fill(eE, em_tm);
       emEnergyTiming_profile_HE->Fill(eE, em_tm);
 
-      hadEnergyTiming_Low_HE->Fill(eH, had_tm);     
-      hadEnergyTiming_HE->Fill(eH, had_tm);   
-      hadEnergyTiming_profile_Low_HE->Fill(eH, had_tm);     
-      hadEnergyTiming_profile_HE->Fill(eH, had_tm);     
+      hadEnergyTiming_Low_HE->Fill(eH, had_tm);
+      hadEnergyTiming_HE->Fill(eH, had_tm);
+      hadEnergyTiming_profile_Low_HE->Fill(eH, had_tm);
+      hadEnergyTiming_profile_HE->Fill(eH, had_tm);
     }
 
-    if((isub == 0 || isub == 3) 
-       && (fabs(etaT) <  etaMax[2] && fabs(etaT) >= etaMin[2] )) {
-      
-      //All cell histos are used
+    if ((isub == 0 || isub == 3) && (fabs(etaT) < etaMax[2] && fabs(etaT) >= etaMin[2])) {
+      // All cell histos are used
       numBadCellsHcal_HF->Fill(numBadHcalCells);
       numRcvCellsHcal_HF->Fill(numRcvHcalCells);
       numPrbCellsHcal_HF->Fill(numPrbHcalCells);
-     
-      //Map energy histos are not used
-      if (useAllHistos_){
-	mapEnergy_HF     -> Fill(double(ieta), double(iphi), en); 
-	mapEnergyHcal_HF -> Fill(double(ieta), double(iphi), eH); 
-	mapEnergyEcal_HF -> Fill(double(ieta), double(iphi), eE); 
+
+      // Map energy histos are not used
+      if (useAllHistos_) {
+        mapEnergy_HF->Fill(double(ieta), double(iphi), en);
+        mapEnergyHcal_HF->Fill(double(ieta), double(iphi), eH);
+        mapEnergyEcal_HF->Fill(double(ieta), double(iphi), eE);
       }
       //      std::cout << " e_ecal = " << eE << std::endl;
 
-      if (ieta>0) meIphiCaloTower_HFP -> Fill(double(iphi)); 
-      else        meIphiCaloTower_HFM -> Fill(double(iphi)); 
+      if (ieta > 0)
+        meIphiCaloTower_HFP->Fill(double(iphi));
+      else
+        meIphiCaloTower_HFM->Fill(double(iphi));
 
       //  simple sums
       sumEnergyHcal_HF += eH;
       sumEnergyEcal_HF += eE;
-      sumEnergyHO_HF   += eHO;
-      
+      sumEnergyHO_HF += eHO;
+
       numFiredTowers_HF++;
-     
-      //Not used
-      if (useAllHistos_){
-	meEnergyEcalTower_HF->Fill(eE);
-	meEnergyHcalTower_HF->Fill(eH);    
+
+      // Not used
+      if (useAllHistos_) {
+        meEnergyEcalTower_HF->Fill(eE);
+        meEnergyHcalTower_HF->Fill(eH);
       }
       // MET, SET & phimet
       //  double  etT = cal->et();
-      metx_HF += mom.x();   
-      mety_HF += mom.y();  //etT * sin(phiT);          
-      sEt_HF  += etT;    
+      metx_HF += mom.x();
+      mety_HF += mom.y();  // etT * sin(phiT);
+      sEt_HF += etT;
 
-      //Timing (all histos are used)
+      // Timing (all histos are used)
       emTiming_HF->Fill(em_tm);
       hadTiming_HF->Fill(had_tm);
       emEnergyTiming_HF->Fill(eE, em_tm);
       emEnergyTiming_profile_HF->Fill(eE, em_tm);
 
-      hadEnergyTiming_Low_HF->Fill(eH, had_tm);     
-      hadEnergyTiming_HF->Fill(eH, had_tm);     
-      hadEnergyTiming_profile_Low_HF->Fill(eH, had_tm);     
-      hadEnergyTiming_profile_HF->Fill(eH, had_tm);     
+      hadEnergyTiming_Low_HF->Fill(eH, had_tm);
+      hadEnergyTiming_HF->Fill(eH, had_tm);
+      hadEnergyTiming_profile_Low_HF->Fill(eH, had_tm);
+      hadEnergyTiming_profile_HF->Fill(eH, had_tm);
     }
 
+  }  // end of Towers cycle
 
+  // These are the six single pion histos; only the second set is used
 
-  } // end of Towers cycle 
-
-  //These are the six single pion histos; only the second set is used
-
-  mapEnergy_N  -> Fill(double(ieta_MC), double(iphi_MC), 1.); 
+  mapEnergy_N->Fill(double(ieta_MC), double(iphi_MC), 1.);
 
-  if(isub == 0 || isub == 1) {
-    met    = sqrt(metx_HB*metx_HB + mety_HB*mety_HB);
-    Vector metv(metx_HB,mety_HB,metz_HB);
+  if (isub == 0 || isub == 1) {
+    met = sqrt(metx_HB * metx_HB + mety_HB * mety_HB);
+    Vector metv(metx_HB, mety_HB, metz_HB);
     phimet = metv.phi();
 
-    //Five oldest drawn histos first; the rest are not used
-    meEnergyHcal_HB->      Fill(sumEnergyHcal_HB);
-    meEnergyEcal_HB->      Fill(sumEnergyEcal_HB);
-    meNumFiredTowers_HB->  Fill(numFiredTowers_HB);
-    MET_HB    -> Fill (met); 
-    SET_HB    -> Fill (sEt_HB); 
-    
-    if (useAllHistos_){
-      meEnergyHcalvsEcal_HB->Fill(sumEnergyEcal_HB, sumEnergyHcal_HB);
-      meEnergyHO_HB->        Fill(sumEnergyHO_HB);
-      meTotEnergy_HB->       Fill(sumEnergyHcal_HB+sumEnergyEcal_HB
-				  +sumEnergyHO_HB);    
-      phiMET_HB -> Fill (phimet);
-    } 
-  }    
+    // Five oldest drawn histos first; the rest are not used
+    meEnergyHcal_HB->Fill(sumEnergyHcal_HB);
+    meEnergyEcal_HB->Fill(sumEnergyEcal_HB);
+    meNumFiredTowers_HB->Fill(numFiredTowers_HB);
+    MET_HB->Fill(met);
+    SET_HB->Fill(sEt_HB);
 
+    if (useAllHistos_) {
+      meEnergyHcalvsEcal_HB->Fill(sumEnergyEcal_HB, sumEnergyHcal_HB);
+      meEnergyHO_HB->Fill(sumEnergyHO_HB);
+      meTotEnergy_HB->Fill(sumEnergyHcal_HB + sumEnergyEcal_HB + sumEnergyHO_HB);
+      phiMET_HB->Fill(phimet);
+    }
+  }
 
-  if(isub == 0 || isub == 2) {
-    met    = sqrt(metx_HE*metx_HE + mety_HE*mety_HE);
-    Vector metv(metx_HE,mety_HE,metz_HE);
+  if (isub == 0 || isub == 2) {
+    met = sqrt(metx_HE * metx_HE + mety_HE * mety_HE);
+    Vector metv(metx_HE, mety_HE, metz_HE);
     phimet = metv.phi();
 
-    //Five oldest drawn histos first; the rest are not used
-    meEnergyHcal_HE->      Fill(sumEnergyHcal_HE);
-    meEnergyEcal_HE->      Fill(sumEnergyEcal_HE);
-    meNumFiredTowers_HE->  Fill(numFiredTowers_HE);
-    MET_HE    -> Fill (met); 
-    SET_HE    -> Fill (sEt_HE); 
-    
-    if (useAllHistos_){
+    // Five oldest drawn histos first; the rest are not used
+    meEnergyHcal_HE->Fill(sumEnergyHcal_HE);
+    meEnergyEcal_HE->Fill(sumEnergyEcal_HE);
+    meNumFiredTowers_HE->Fill(numFiredTowers_HE);
+    MET_HE->Fill(met);
+    SET_HE->Fill(sEt_HE);
+
+    if (useAllHistos_) {
       meEnergyHcalvsEcal_HE->Fill(sumEnergyEcal_HE, sumEnergyHcal_HE);
-      meEnergyHO_HE->        Fill(sumEnergyHO_HE);
-      meTotEnergy_HE->       Fill(sumEnergyHcal_HE+sumEnergyEcal_HE
-				  +sumEnergyHO_HE);    
-      phiMET_HE -> Fill (phimet); 
+      meEnergyHO_HE->Fill(sumEnergyHO_HE);
+      meTotEnergy_HE->Fill(sumEnergyHcal_HE + sumEnergyEcal_HE + sumEnergyHO_HE);
+      phiMET_HE->Fill(phimet);
     }
   }
 
-  if(isub == 0 || isub == 3) {
-    met    = sqrt(metx_HF*metx_HF + mety_HF*mety_HF);
-    Vector metv(metx_HF,mety_HF,metz_HF);
+  if (isub == 0 || isub == 3) {
+    met = sqrt(metx_HF * metx_HF + mety_HF * mety_HF);
+    Vector metv(metx_HF, mety_HF, metz_HF);
     phimet = metv.phi();
-    
-    //Five oldest drawn histos first; the rest are not used
-    meEnergyHcal_HF->      Fill(sumEnergyHcal_HF);
-    meEnergyEcal_HF->      Fill(sumEnergyEcal_HF);
-    meNumFiredTowers_HF->  Fill(numFiredTowers_HF);
-    MET_HF    -> Fill (met); 
-    SET_HF    -> Fill (sEt_HF); 
-
-    if (useAllHistos_){
+
+    // Five oldest drawn histos first; the rest are not used
+    meEnergyHcal_HF->Fill(sumEnergyHcal_HF);
+    meEnergyEcal_HF->Fill(sumEnergyEcal_HF);
+    meNumFiredTowers_HF->Fill(numFiredTowers_HF);
+    MET_HF->Fill(met);
+    SET_HF->Fill(sEt_HF);
+
+    if (useAllHistos_) {
       meEnergyHcalvsEcal_HF->Fill(sumEnergyEcal_HF, sumEnergyHcal_HF);
-      meEnergyHO_HF->        Fill(sumEnergyHO_HF);
-      meTotEnergy_HF->       Fill(sumEnergyHcal_HF+sumEnergyEcal_HF
-				  +sumEnergyHO_HF);    
-      phiMET_HF -> Fill (phimet);
+      meEnergyHO_HF->Fill(sumEnergyHO_HF);
+      meTotEnergy_HF->Fill(sumEnergyHcal_HF + sumEnergyEcal_HF + sumEnergyHO_HF);
+      phiMET_HF->Fill(phimet);
     }
   }
-
 }
 
-double CaloTowersAnalyzer::dR(double eta1, double phi1, double eta2, double phi2) { 
+double CaloTowersAnalyzer::dR(double eta1, double phi1, double eta2, double phi2) {
   double PI = 3.1415926535898;
-  double deltaphi= phi1 - phi2;
-  if( phi2 > phi1 ) { deltaphi= phi2 - phi1;}
-  if(deltaphi > PI) { deltaphi = 2.*PI - deltaphi;}
+  double deltaphi = phi1 - phi2;
+  if (phi2 > phi1) {
+    deltaphi = phi2 - phi1;
+  }
+  if (deltaphi > PI) {
+    deltaphi = 2. * PI - deltaphi;
+  }
   double deltaeta = eta2 - eta1;
-  double tmp = sqrt(deltaeta* deltaeta + deltaphi*deltaphi);
+  double tmp = sqrt(deltaeta * deltaeta + deltaphi * deltaphi);
   return tmp;
 }
 
 DEFINE_FWK_MODULE(CaloTowersAnalyzer);
-
diff --git a/DQMOffline/Hcal/src/CaloTowersDQMClient.cc b/DQMOffline/Hcal/src/CaloTowersDQMClient.cc
index 1ba9a01b864d0..964cd2ae609d8 100644
--- a/DQMOffline/Hcal/src/CaloTowersDQMClient.cc
+++ b/DQMOffline/Hcal/src/CaloTowersDQMClient.cc
@@ -1,197 +1,180 @@
 #include "DQMOffline/Hcal/interface/CaloTowersDQMClient.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-CaloTowersDQMClient::CaloTowersDQMClient(const edm::ParameterSet& iConfig):conf_(iConfig)
-{
-
+CaloTowersDQMClient::CaloTowersDQMClient(const edm::ParameterSet &iConfig) : conf_(iConfig) {
   outputFile_ = iConfig.getUntrackedParameter<std::string>("outputFile", "myfile.root");
   debug_ = false;
   verbose_ = false;
-  dirName_=iConfig.getParameter<std::string>("DQMDirName");
-  
- }
-
-
-CaloTowersDQMClient::~CaloTowersDQMClient()
-{ 
-  
-}
-
-void CaloTowersDQMClient::beginJob()
-{
- 
-
+  dirName_ = iConfig.getParameter<std::string>("DQMDirName");
 }
 
+CaloTowersDQMClient::~CaloTowersDQMClient() {}
 
-void CaloTowersDQMClient::beginRun(const edm::Run& run, const edm::EventSetup& c)
-{
- 
-}
+void CaloTowersDQMClient::beginJob() {}
 
+void CaloTowersDQMClient::beginRun(const edm::Run &run, const edm::EventSetup &c) {}
 
 // called after entering the CaloTowersD/CaloTowersTask directory
 // hcalMEs are within that directory
-int CaloTowersDQMClient::CaloTowersEndjob(const std::vector<MonitorElement*> &hcalMEs){
-
-   int useAllHistos = 0;
-   MonitorElement* Ntowers_vs_ieta =nullptr;
-   MonitorElement* mapEnergy_N =nullptr, *mapEnergy_E =nullptr, *mapEnergy_H =nullptr, *mapEnergy_EH =nullptr;
-   MonitorElement* occupancy_map =nullptr, *occupancy_vs_ieta =nullptr;
-   for(unsigned int ih=0; ih<hcalMEs.size(); ih++){
-      if( strcmp(hcalMEs[ih]->getName().c_str(), "Ntowers_per_event_vs_ieta") ==0  ){
-         Ntowers_vs_ieta = hcalMEs[ih];
-      } 
-      if( strcmp(hcalMEs[ih]->getName().c_str(), "CaloTowersTask_map_Nentries") ==0  ){
-         mapEnergy_N = hcalMEs[ih];
-      }
-      if( strcmp(hcalMEs[ih]->getName().c_str(), "CaloTowersTask_map_energy_H") ==0  ){
-         useAllHistos++; mapEnergy_H = hcalMEs[ih];
-      }
-      if( strcmp(hcalMEs[ih]->getName().c_str(), "CaloTowersTask_map_energy_E") ==0  ){
-         useAllHistos++; mapEnergy_E = hcalMEs[ih];
-      }
-      if( strcmp(hcalMEs[ih]->getName().c_str(), "CaloTowersTask_map_energy_EH") ==0  ){
-         useAllHistos++; mapEnergy_EH = hcalMEs[ih];
-      }
-      if( strcmp(hcalMEs[ih]->getName().c_str(), "CaloTowersTask_map_occupancy") ==0  ){
-         occupancy_map = hcalMEs[ih];
-      }
-      if( strcmp(hcalMEs[ih]->getName().c_str(), "CaloTowersTask_occupancy_vs_ieta") ==0  ){
-         occupancy_vs_ieta = hcalMEs[ih];
-      }
-  
-   } 
-   if( useAllHistos !=0 && useAllHistos !=3 ) return 0;
-
-   double nevent = mapEnergy_N->getEntries();
-   if(verbose_) std::cout<<"nevent : "<<nevent<<std::endl;
-
-   // mean number of towers per ieta
-   int nx = Ntowers_vs_ieta->getNbinsX();
-   float cont;
-   float conte;
-   float fev = float(nevent);
-
-   for (int i = 1; i <= nx; i++) {
-      cont  = Ntowers_vs_ieta -> getBinContent(i) / fev ;
-      conte = pow(Ntowers_vs_ieta -> getBinContent(i),0.5) / fev ;
-      Ntowers_vs_ieta -> setBinContent(i,cont);
-      Ntowers_vs_ieta -> setBinError(i,conte);
-   }
-
-   // mean energies & occupancies evaluation
-
-   nx = mapEnergy_N->getNbinsX();
-   int ny = mapEnergy_N->getNbinsY();
-   float cnorm;
-   float cnorme;
-   float phi_factor;
-
-   for (int i = 1; i <= nx; i++) {
-      float sumphi = 0.;
-
-      for (int j = 1; j <= ny; j++) {
-
-         // Emean
-         cnorm   = mapEnergy_N -> getBinContent(i,j);
-         //Phi histos are not used in the macros
-         if(cnorm > 0.000001 && useAllHistos) {
-
-            cont  = mapEnergy_E -> getBinContent(i,j) / cnorm ;
-            conte = mapEnergy_E -> getBinError(i,j) / cnorm ;
-            mapEnergy_E -> setBinContent(i,j,cont);
-            mapEnergy_E -> setBinError(i,j,conte);
-
-            cont  = mapEnergy_H -> getBinContent(i,j) / cnorm ;
-            conte = mapEnergy_H -> getBinError(i,j) / cnorm ;
-            mapEnergy_H -> setBinContent(i,j,cont);
-            mapEnergy_H -> setBinError(i,j,conte);
-
-            cont  = mapEnergy_EH -> getBinContent(i,j) / cnorm ;
-            conte = mapEnergy_EH -> getBinError(i,j) / cnorm ;
-            mapEnergy_EH -> setBinContent(i,j,cont);
-            mapEnergy_EH -> setBinError(i,j,conte);
-         }
-
-         // Occupancy (needed for occupancy vs ieta)
-         cont   = occupancy_map -> getBinContent(i,j);
-         conte  = occupancy_map -> getBinError(i,j);
-         if(fev>0. && cnorm>1.e-30){
-            occupancy_map -> setBinContent(i,j,cont/fev);
-            occupancy_map -> setBinError(i,j,conte/fev);
-         }
-
-         sumphi += cont;
-
-      } // end of iphy cycle (j)
-
-      //Occupancy vs ieta histo is drawn
-      // phi-factor evaluation for occupancy_vs_ieta calculation
-      int ieta = i - 43; //should be the same as int ieta = int(occupancy_vs_ieta->getBinCenter(i));
-
-      if(ieta >= -20 && ieta <= 20 )
-         {phi_factor = 72.;}
-         else {
-            if(ieta >= 40 || ieta <= -40 ) {phi_factor = 18.;}
-         else
-            phi_factor = 36.;
+int CaloTowersDQMClient::CaloTowersEndjob(const std::vector<MonitorElement *> &hcalMEs) {
+  int useAllHistos = 0;
+  MonitorElement *Ntowers_vs_ieta = nullptr;
+  MonitorElement *mapEnergy_N = nullptr, *mapEnergy_E = nullptr, *mapEnergy_H = nullptr, *mapEnergy_EH = nullptr;
+  MonitorElement *occupancy_map = nullptr, *occupancy_vs_ieta = nullptr;
+  for (unsigned int ih = 0; ih < hcalMEs.size(); ih++) {
+    if (strcmp(hcalMEs[ih]->getName().c_str(), "Ntowers_per_event_vs_ieta") == 0) {
+      Ntowers_vs_ieta = hcalMEs[ih];
+    }
+    if (strcmp(hcalMEs[ih]->getName().c_str(), "CaloTowersTask_map_Nentries") == 0) {
+      mapEnergy_N = hcalMEs[ih];
+    }
+    if (strcmp(hcalMEs[ih]->getName().c_str(), "CaloTowersTask_map_energy_H") == 0) {
+      useAllHistos++;
+      mapEnergy_H = hcalMEs[ih];
+    }
+    if (strcmp(hcalMEs[ih]->getName().c_str(), "CaloTowersTask_map_energy_E") == 0) {
+      useAllHistos++;
+      mapEnergy_E = hcalMEs[ih];
+    }
+    if (strcmp(hcalMEs[ih]->getName().c_str(), "CaloTowersTask_map_energy_EH") == 0) {
+      useAllHistos++;
+      mapEnergy_EH = hcalMEs[ih];
+    }
+    if (strcmp(hcalMEs[ih]->getName().c_str(), "CaloTowersTask_map_occupancy") == 0) {
+      occupancy_map = hcalMEs[ih];
+    }
+    if (strcmp(hcalMEs[ih]->getName().c_str(), "CaloTowersTask_occupancy_vs_ieta") == 0) {
+      occupancy_vs_ieta = hcalMEs[ih];
+    }
+  }
+  if (useAllHistos != 0 && useAllHistos != 3)
+    return 0;
+
+  double nevent = mapEnergy_N->getEntries();
+  if (verbose_)
+    std::cout << "nevent : " << nevent << std::endl;
+
+  // mean number of towers per ieta
+  int nx = Ntowers_vs_ieta->getNbinsX();
+  float cont;
+  float conte;
+  float fev = float(nevent);
+
+  for (int i = 1; i <= nx; i++) {
+    cont = Ntowers_vs_ieta->getBinContent(i) / fev;
+    conte = pow(Ntowers_vs_ieta->getBinContent(i), 0.5) / fev;
+    Ntowers_vs_ieta->setBinContent(i, cont);
+    Ntowers_vs_ieta->setBinError(i, conte);
+  }
+
+  // mean energies & occupancies evaluation
+
+  nx = mapEnergy_N->getNbinsX();
+  int ny = mapEnergy_N->getNbinsY();
+  float cnorm;
+  float cnorme;
+  float phi_factor;
+
+  for (int i = 1; i <= nx; i++) {
+    float sumphi = 0.;
+
+    for (int j = 1; j <= ny; j++) {
+      // Emean
+      cnorm = mapEnergy_N->getBinContent(i, j);
+      // Phi histos are not used in the macros
+      if (cnorm > 0.000001 && useAllHistos) {
+        cont = mapEnergy_E->getBinContent(i, j) / cnorm;
+        conte = mapEnergy_E->getBinError(i, j) / cnorm;
+        mapEnergy_E->setBinContent(i, j, cont);
+        mapEnergy_E->setBinError(i, j, conte);
+
+        cont = mapEnergy_H->getBinContent(i, j) / cnorm;
+        conte = mapEnergy_H->getBinError(i, j) / cnorm;
+        mapEnergy_H->setBinContent(i, j, cont);
+        mapEnergy_H->setBinError(i, j, conte);
+
+        cont = mapEnergy_EH->getBinContent(i, j) / cnorm;
+        conte = mapEnergy_EH->getBinError(i, j) / cnorm;
+        mapEnergy_EH->setBinContent(i, j, cont);
+        mapEnergy_EH->setBinError(i, j, conte);
       }
 
-      cnorm  = sumphi / phi_factor;
-      cnorme = pow(sumphi,0.5) / phi_factor;
-      if(fev>0. && cnorm>1.e-30){
-         occupancy_vs_ieta->setBinContent(i, cnorm/fev);
-         occupancy_vs_ieta->setBinError(i, cnorme/fev);
+      // Occupancy (needed for occupancy vs ieta)
+      cont = occupancy_map->getBinContent(i, j);
+      conte = occupancy_map->getBinError(i, j);
+      if (fev > 0. && cnorm > 1.e-30) {
+        occupancy_map->setBinContent(i, j, cont / fev);
+        occupancy_map->setBinError(i, j, conte / fev);
       }
 
-   } // end of ieta cycle (i)
-   
-   return 1;
+      sumphi += cont;
+
+    }  // end of iphy cycle (j)
+
+    // Occupancy vs ieta histo is drawn
+    // phi-factor evaluation for occupancy_vs_ieta calculation
+    int ieta = i - 43;  // should be the same as int ieta =
+                        // int(occupancy_vs_ieta->getBinCenter(i));
 
+    if (ieta >= -20 && ieta <= 20) {
+      phi_factor = 72.;
+    } else {
+      if (ieta >= 40 || ieta <= -40) {
+        phi_factor = 18.;
+      } else
+        phi_factor = 36.;
+    }
+
+    cnorm = sumphi / phi_factor;
+    cnorme = pow(sumphi, 0.5) / phi_factor;
+    if (fev > 0. && cnorm > 1.e-30) {
+      occupancy_vs_ieta->setBinContent(i, cnorm / fev);
+      occupancy_vs_ieta->setBinError(i, cnorme / fev);
+    }
+
+  }  // end of ieta cycle (i)
+
+  return 1;
 }
 
-void CaloTowersDQMClient::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) 
-{
- 
+void CaloTowersDQMClient::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
   igetter.setCurrentFolder(dirName_);
-  if (verbose_) std::cout << "\nrunClient" << std::endl; 
+  if (verbose_)
+    std::cout << "\nrunClient" << std::endl;
 
-  std::vector<MonitorElement*> hcalMEs;
+  std::vector<MonitorElement *> hcalMEs;
 
-  // Since out folders are fixed to three, we can just go over these three folders
-  // i.e., CaloTowersD/CaloTowersTask, HcalRecHitsD/HcalRecHitTask, NoiseRatesV/NoiseRatesTask.
+  // Since out folders are fixed to three, we can just go over these three
+  // folders i.e., CaloTowersD/CaloTowersTask, HcalRecHitsD/HcalRecHitTask,
+  // NoiseRatesV/NoiseRatesTask.
   std::vector<std::string> fullPathHLTFolders = igetter.getSubdirs();
-  for(unsigned int i=0;i<fullPathHLTFolders.size();i++) {
-
-    if (verbose_) std::cout <<"\nfullPath: "<< fullPathHLTFolders[i] << std::endl;
+  for (unsigned int i = 0; i < fullPathHLTFolders.size(); i++) {
+    if (verbose_)
+      std::cout << "\nfullPath: " << fullPathHLTFolders[i] << std::endl;
     igetter.setCurrentFolder(fullPathHLTFolders[i]);
 
     std::vector<std::string> fullSubPathHLTFolders = igetter.getSubdirs();
-    for(unsigned int j=0;j<fullSubPathHLTFolders.size();j++) {
-
-      if (verbose_) std::cout <<"fullSub: "<<fullSubPathHLTFolders[j] << std::endl;
-
-      if( strcmp(fullSubPathHLTFolders[j].c_str(), "CaloTowersD/CaloTowersTask") ==0  ){
-         hcalMEs = igetter.getContents(fullSubPathHLTFolders[j]);
-         if (verbose_) std::cout <<"hltMES size : "<<hcalMEs.size()<<std::endl;
-         if( !CaloTowersEndjob(hcalMEs) ) std::cout<<"\nError in CaloTowersEndjob!"<<std::endl<<std::endl;
+    for (unsigned int j = 0; j < fullSubPathHLTFolders.size(); j++) {
+      if (verbose_)
+        std::cout << "fullSub: " << fullSubPathHLTFolders[j] << std::endl;
+
+      if (strcmp(fullSubPathHLTFolders[j].c_str(), "CaloTowersD/CaloTowersTask") == 0) {
+        hcalMEs = igetter.getContents(fullSubPathHLTFolders[j]);
+        if (verbose_)
+          std::cout << "hltMES size : " << hcalMEs.size() << std::endl;
+        if (!CaloTowersEndjob(hcalMEs))
+          std::cout << "\nError in CaloTowersEndjob!" << std::endl << std::endl;
       }
-
-    }    
-
+    }
   }
-
 }
 
-
-
 DEFINE_FWK_MODULE(CaloTowersDQMClient);
diff --git a/DQMOffline/Hcal/src/HcalCollapseAnalyzer.cc b/DQMOffline/Hcal/src/HcalCollapseAnalyzer.cc
index 061cf24e2b8c8..e662d8e85c932 100644
--- a/DQMOffline/Hcal/src/HcalCollapseAnalyzer.cc
+++ b/DQMOffline/Hcal/src/HcalCollapseAnalyzer.cc
@@ -1,8 +1,9 @@
 // -*- C++ -*-//
 // Package:    Hcal
 // Class:      HcalCollapseAnalyzer
-// 
-/**\class HcalCollapseAnalyzer HcalCollapseAnalyzer.cc DQMOffline/Hcal/src/HcalCollapseAnalyzer.cc
+//
+/**\class HcalCollapseAnalyzer HcalCollapseAnalyzer.cc
+ DQMOffline/Hcal/src/HcalCollapseAnalyzer.cc
 
  Description: Studies the collapsing of HcalRecHits
 
@@ -26,155 +27,143 @@
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Utilities/interface/InputTag.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
-#include "Geometry/Records/interface/HcalRecNumberingRecord.h"
 #include "Geometry/CaloTopology/interface/HcalTopology.h"
+#include "Geometry/Records/interface/HcalRecNumberingRecord.h"
 
 class HcalCollapseAnalyzer : public DQMEDAnalyzer {
-
 public:
-  explicit HcalCollapseAnalyzer(const edm::ParameterSet&);
-  ~HcalCollapseAnalyzer() override { }
+  explicit HcalCollapseAnalyzer(const edm::ParameterSet &);
+  ~HcalCollapseAnalyzer() override {}
 
-  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 
 private:
-  void analyze(edm::Event const&, edm::EventSetup const&) override;
+  void analyze(edm::Event const &, edm::EventSetup const &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
   // ----------member data ---------------------------
-  const std::string                      topFolderName_;
-  const int                              verbosity_;
-  const edm::InputTag                    recHitHBHE_, preRecHitHBHE_;
-  const bool                             doHE_, doHB_;
+  const std::string topFolderName_;
+  const int verbosity_;
+  const edm::InputTag recHitHBHE_, preRecHitHBHE_;
+  const bool doHE_, doHB_;
 
   edm::EDGetTokenT<HBHERecHitCollection> tok_hbhe_;
   edm::EDGetTokenT<HBHERecHitCollection> tok_prehbhe_;
 
-  MonitorElement                        *h_merge, *h_size, *h_depth;
-  MonitorElement                        *h_sfrac, *h_frac, *h_balance;
+  MonitorElement *h_merge, *h_size, *h_depth;
+  MonitorElement *h_sfrac, *h_frac, *h_balance;
 };
 
-HcalCollapseAnalyzer::HcalCollapseAnalyzer(const edm::ParameterSet& iConfig) : 
-  topFolderName_(iConfig.getParameter<std::string>("topFolderName")),
-  verbosity_(iConfig.getUntrackedParameter<int>("verbosity",0)),
-  recHitHBHE_(iConfig.getUntrackedParameter<edm::InputTag>("recHitHBHE",edm::InputTag("hbhereco"))),
-  preRecHitHBHE_(iConfig.getUntrackedParameter<edm::InputTag>("preRecHitHBHE",edm::InputTag("hbheprereco"))),
-  doHE_(iConfig.getUntrackedParameter<bool>("doHE", true)),
-  doHB_(iConfig.getUntrackedParameter<bool>("doHB", false)) {
-
+HcalCollapseAnalyzer::HcalCollapseAnalyzer(const edm::ParameterSet &iConfig)
+    : topFolderName_(iConfig.getParameter<std::string>("topFolderName")),
+      verbosity_(iConfig.getUntrackedParameter<int>("verbosity", 0)),
+      recHitHBHE_(iConfig.getUntrackedParameter<edm::InputTag>("recHitHBHE", edm::InputTag("hbhereco"))),
+      preRecHitHBHE_(iConfig.getUntrackedParameter<edm::InputTag>("preRecHitHBHE", edm::InputTag("hbheprereco"))),
+      doHE_(iConfig.getUntrackedParameter<bool>("doHE", true)),
+      doHB_(iConfig.getUntrackedParameter<bool>("doHB", false)) {
   // define tokens for access
-  tok_hbhe_    = consumes<HBHERecHitCollection>(recHitHBHE_);
+  tok_hbhe_ = consumes<HBHERecHitCollection>(recHitHBHE_);
   tok_prehbhe_ = consumes<HBHERecHitCollection>(preRecHitHBHE_);
-  
-  edm::LogVerbatim("Collapse") << "Verbosity " << verbosity_ << " with tags " 
-			       << recHitHBHE_  << " and " << preRecHitHBHE_
-			       << " and Do " << doHB_ << ":" << doHE_;
+
+  edm::LogVerbatim("Collapse") << "Verbosity " << verbosity_ << " with tags " << recHitHBHE_ << " and "
+                               << preRecHitHBHE_ << " and Do " << doHB_ << ":" << doHE_;
 }
 
-void HcalCollapseAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+void HcalCollapseAnalyzer::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
   edm::ParameterSetDescription desc;
-  desc.add<std::string>("topFolderName",           "HcalCollapse");
-  desc.addUntracked<int>("verbosity",              0);
-  desc.addUntracked<edm::InputTag>("recHitHBHE",   edm::InputTag("hbhereco"));
-  desc.addUntracked<edm::InputTag>("preRecHitHBHE",edm::InputTag("hbheprereco"));
-  desc.addUntracked<bool>("doHE",                  true);
-  desc.addUntracked<bool>("doHB",                  false);
-  descriptions.add("hcalCollapseAnalyzer",desc);
+  desc.add<std::string>("topFolderName", "HcalCollapse");
+  desc.addUntracked<int>("verbosity", 0);
+  desc.addUntracked<edm::InputTag>("recHitHBHE", edm::InputTag("hbhereco"));
+  desc.addUntracked<edm::InputTag>("preRecHitHBHE", edm::InputTag("hbheprereco"));
+  desc.addUntracked<bool>("doHE", true);
+  desc.addUntracked<bool>("doHB", false);
+  descriptions.add("hcalCollapseAnalyzer", desc);
 }
 
-void HcalCollapseAnalyzer::analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup) {
-  if (verbosity_ > 0) 
-    edm::LogVerbatim("Collapse") << "Run " << iEvent.id().run() << " Event "
-				 << iEvent.id().event() << " starts ==============";
-  
+void HcalCollapseAnalyzer::analyze(edm::Event const &iEvent, edm::EventSetup const &iSetup) {
+  if (verbosity_ > 0)
+    edm::LogVerbatim("Collapse") << "Run " << iEvent.id().run() << " Event " << iEvent.id().event()
+                                 << " starts ==============";
+
   edm::ESHandle<HcalTopology> htopo;
   iSetup.get<HcalRecNumberingRecord>().get(htopo);
-  const HcalTopology* theHBHETopology = htopo.product();
+  const HcalTopology *theHBHETopology = htopo.product();
 
   edm::Handle<HBHERecHitCollection> hbhereco;
-  iEvent.getByToken(tok_hbhe_,      hbhereco);
+  iEvent.getByToken(tok_hbhe_, hbhereco);
   edm::Handle<HBHERecHitCollection> hbheprereco;
-  iEvent.getByToken(tok_prehbhe_,   hbheprereco);
+  iEvent.getByToken(tok_prehbhe_, hbheprereco);
   if (verbosity_ > 0) {
-    edm::LogVerbatim("Collapse") << "Handle Reco "    << hbhereco << " Size " 
-				 << hbhereco->size();
-    edm::LogVerbatim("Collapse") << "Handle PreReco " << hbheprereco <<" Size "
-				 << hbheprereco->size();
+    edm::LogVerbatim("Collapse") << "Handle Reco " << hbhereco << " Size " << hbhereco->size();
+    edm::LogVerbatim("Collapse") << "Handle PreReco " << hbheprereco << " Size " << hbheprereco->size();
   }
   if (hbhereco.isValid() && hbheprereco.isValid()) {
-    const HBHERecHitCollection* recohbhe    = hbhereco.product();
-    const HBHERecHitCollection* prerecohbhe = hbheprereco.product();
-    if (verbosity_ > 0) 
+    const HBHERecHitCollection *recohbhe = hbhereco.product();
+    const HBHERecHitCollection *prerecohbhe = hbheprereco.product();
+    if (verbosity_ > 0)
       edm::LogVerbatim("Collapse") << "Size of hbhereco: " << recohbhe->size()
-				   << " and hbheprereco: " << prerecohbhe->size();
-    double sfrac = (prerecohbhe->size() == 0) ? 1 :
-      ((double)(recohbhe->size()))/((double)(prerecohbhe->size()));
+                                   << " and hbheprereco: " << prerecohbhe->size();
+    double sfrac = (prerecohbhe->empty()) ? 1 : ((double)(recohbhe->size())) / ((double)(prerecohbhe->size()));
     h_sfrac->Fill(sfrac);
     h_size->Fill(recohbhe->size());
-    for (const auto & hit : (*recohbhe)) {
+    for (const auto &hit : (*recohbhe)) {
       HcalDetId id = hit.id();
-      if (((id.subdet() == HcalEndcap) && doHE_) ||
-	  ((id.subdet() == HcalBarrel) && doHB_)) {
-	h_depth->Fill(id.depth());
-	std::vector<HcalDetId> ids;
-	theHBHETopology->unmergeDepthDetId(id, ids);
-	if (verbosity_ > 0) {
-	  edm::LogVerbatim("Collapse") << id << " is derived from " << ids.size() 
-				       << " components";
-	  for (unsigned int k=0; k<ids.size(); ++k) 
-	    edm::LogVerbatim("Collapse") << "[" << k << "] " << ids[k];
-	}
-	h_merge->Fill(ids.size());
-	double energy = hit.energy();
-	double etot(0);
-	unsigned int k(0);
-	for (const auto phit : (*prerecohbhe)) {
-	  if (std::find(ids.begin(),ids.end(),phit.id()) != ids.end()) {
-	    etot += phit.energy();
-	    double frac = (energy > 0) ? phit.energy()/energy : 1.0; 
-	    h_frac->Fill(frac);
-	    if (verbosity_ > 0) 
-	      edm::LogVerbatim("Collapse") << "Frac[" << k << "] " << frac 
-					   << " for " <<phit.id();
-	    ++k;
-	  }
-	}
-	double frac = (energy > 0) ? etot/energy : 1.0; 
+      if (((id.subdet() == HcalEndcap) && doHE_) || ((id.subdet() == HcalBarrel) && doHB_)) {
+        h_depth->Fill(id.depth());
+        std::vector<HcalDetId> ids;
+        theHBHETopology->unmergeDepthDetId(id, ids);
+        if (verbosity_ > 0) {
+          edm::LogVerbatim("Collapse") << id << " is derived from " << ids.size() << " components";
+          for (unsigned int k = 0; k < ids.size(); ++k)
+            edm::LogVerbatim("Collapse") << "[" << k << "] " << ids[k];
+        }
+        h_merge->Fill(ids.size());
+        double energy = hit.energy();
+        double etot(0);
+        unsigned int k(0);
+        for (const auto phit : (*prerecohbhe)) {
+          if (std::find(ids.begin(), ids.end(), phit.id()) != ids.end()) {
+            etot += phit.energy();
+            double frac = (energy > 0) ? phit.energy() / energy : 1.0;
+            h_frac->Fill(frac);
+            if (verbosity_ > 0)
+              edm::LogVerbatim("Collapse") << "Frac[" << k << "] " << frac << " for " << phit.id();
+            ++k;
+          }
+        }
+        double frac = (energy > 0) ? etot / energy : 1.0;
         h_balance->Fill(frac);
-	if (verbosity_ > 0) 
-	  edm::LogVerbatim("Collapse") << "Total energy " << energy << ":" << etot
-				       << ":" << frac;
+        if (verbosity_ > 0)
+          edm::LogVerbatim("Collapse") << "Total energy " << energy << ":" << etot << ":" << frac;
       }
     }
   }
 }
 
-void HcalCollapseAnalyzer::bookHistograms(DQMStore::IBooker& ibooker, 
-					  edm::Run const &, 
-					  edm::EventSetup const &) {
+void HcalCollapseAnalyzer::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &, edm::EventSetup const &) {
   // Book histograms
   ibooker.setCurrentFolder(topFolderName_);
-  h_merge  = ibooker.book1D("h_merge","Number of hits merged",10,0.0,10.0);
-  h_size   = ibooker.book1D("h_size","Size of the RecHit collection",100,500.0,1500.0);
-  h_depth  = ibooker.book1D("h_depth","Depth of the Id's used",10,0.0,10.0);
-  h_sfrac  = ibooker.book1D("h_sfrac","Ratio of sizes of preRecHit and RecHit collections",150,0.0,1.5);
-  h_frac   = ibooker.book1D("h_frac", "Fraction of energy before collapse",150,0.0,1.5);
-  h_balance= ibooker.book1D("h_balance", "Balance of energy between pre- and post-collapse",100,0.5,1.5);
+  h_merge = ibooker.book1D("h_merge", "Number of hits merged", 10, 0.0, 10.0);
+  h_size = ibooker.book1D("h_size", "Size of the RecHit collection", 100, 500.0, 1500.0);
+  h_depth = ibooker.book1D("h_depth", "Depth of the Id's used", 10, 0.0, 10.0);
+  h_sfrac = ibooker.book1D("h_sfrac", "Ratio of sizes of preRecHit and RecHit collections", 150, 0.0, 1.5);
+  h_frac = ibooker.book1D("h_frac", "Fraction of energy before collapse", 150, 0.0, 1.5);
+  h_balance = ibooker.book1D("h_balance", "Balance of energy between pre- and post-collapse", 100, 0.5, 1.5);
 }
 
 DEFINE_FWK_MODULE(HcalCollapseAnalyzer);
diff --git a/DQMOffline/Hcal/src/HcalNoiseRates.cc b/DQMOffline/Hcal/src/HcalNoiseRates.cc
index 0fb11c0b56675..021dab3356ae6 100644
--- a/DQMOffline/Hcal/src/HcalNoiseRates.cc
+++ b/DQMOffline/Hcal/src/HcalNoiseRates.cc
@@ -14,126 +14,116 @@
 // constructors and destructor
 //
 
-HcalNoiseRates::HcalNoiseRates(const edm::ParameterSet& iConfig)
-{
-   // DQM ROOT output
-  outputFile_ = iConfig.getUntrackedParameter<std::string>("outputFile","myfile.root");
-
+HcalNoiseRates::HcalNoiseRates(const edm::ParameterSet &iConfig) {
+  // DQM ROOT output
+  outputFile_ = iConfig.getUntrackedParameter<std::string>("outputFile", "myfile.root");
 
   // set parameters
-  rbxCollName_   = iConfig.getUntrackedParameter<edm::InputTag>("rbxCollName");
+  rbxCollName_ = iConfig.getUntrackedParameter<edm::InputTag>("rbxCollName");
   tok_rbx_ = consumes<reco::HcalNoiseRBXCollection>(rbxCollName_);
-  minRBXEnergy_  = iConfig.getUntrackedParameter<double>("minRBXEnergy");
-  minHitEnergy_  = iConfig.getUntrackedParameter<double>("minHitEnergy");
+  minRBXEnergy_ = iConfig.getUntrackedParameter<double>("minRBXEnergy");
+  minHitEnergy_ = iConfig.getUntrackedParameter<double>("minHitEnergy");
 
-  useAllHistos_  = iConfig.getUntrackedParameter<bool>("useAllHistos", false);
+  useAllHistos_ = iConfig.getUntrackedParameter<bool>("useAllHistos", false);
 
-  //Hcal Noise Summary
+  // Hcal Noise Summary
   noisetoken_ = consumes<HcalNoiseSummary>(iConfig.getParameter<edm::InputTag>("noiselabel"));
 }
 
-  void HcalNoiseRates::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & /* iRun*/, edm::EventSetup const & /* iSetup */)
+void HcalNoiseRates::bookHistograms(DQMStore::IBooker &ibooker,
+                                    edm::Run const & /* iRun*/,
+                                    edm::EventSetup const & /* iSetup */)
 
-{ 
- 
-  
+{
   ibooker.setCurrentFolder("HcalNoiseRatesD/HcalNoiseRatesTask");
-  
+
   Char_t histo[100];
 
   // book histograms
 
-  //Lumi block is not drawn; the rest are
-  if (useAllHistos_){
-    sprintf  (histo, "hLumiBlockCount" );
+  // Lumi block is not drawn; the rest are
+  if (useAllHistos_) {
+    sprintf(histo, "hLumiBlockCount");
     hLumiBlockCount_ = ibooker.book1D(histo, histo, 1, -0.5, 0.5);
   }
-  
-  sprintf  (histo, "hRBXEnergy" );
+
+  sprintf(histo, "hRBXEnergy");
   hRBXEnergy_ = ibooker.book1D(histo, histo, 300, 0, 3000);
 
-  sprintf  (histo, "hRBXEnergyType1" );
+  sprintf(histo, "hRBXEnergyType1");
   hRBXEnergyType1_ = ibooker.book1D(histo, histo, 300, 0, 3000);
 
-  sprintf  (histo, "hRBXEnergyType2" );
+  sprintf(histo, "hRBXEnergyType2");
   hRBXEnergyType2_ = ibooker.book1D(histo, histo, 300, 0, 3000);
 
-  sprintf  (histo, "hRBXEnergyType3" );
+  sprintf(histo, "hRBXEnergyType3");
   hRBXEnergyType3_ = ibooker.book1D(histo, histo, 300, 0, 3000);
 
-  sprintf  (histo, "hRBXNHits" );
-  hRBXNHits_ = ibooker.book1D(histo, histo, 73,-0.5,72.5);
+  sprintf(histo, "hRBXNHits");
+  hRBXNHits_ = ibooker.book1D(histo, histo, 73, -0.5, 72.5);
 
-  //HcalNoiseSummary
+  // HcalNoiseSummary
 
-  sprintf (histo, "nNNumChannels");
+  sprintf(histo, "nNNumChannels");
   nNNumChannels_ = ibooker.book1D(histo, histo, 100, 0, 100);
-  sprintf (histo, "nNSumE");
-  nNSumE_ = ibooker.book1D(histo, histo , 100, 0, 5000);
-  sprintf (histo, "nNSumEt");
-  nNSumEt_ = ibooker.book1D(histo, histo , 100, 0, 2000);
+  sprintf(histo, "nNSumE");
+  nNSumE_ = ibooker.book1D(histo, histo, 100, 0, 5000);
+  sprintf(histo, "nNSumEt");
+  nNSumEt_ = ibooker.book1D(histo, histo, 100, 0, 2000);
 
-  sprintf (histo, "sNNumChannels");
+  sprintf(histo, "sNNumChannels");
   sNNumChannels_ = ibooker.book1D(histo, histo, 100, 0, 100);
-  sprintf (histo, "sNSumE");
-  sNSumE_ = ibooker.book1D(histo, histo , 100, 0, 5000);
-  sprintf (histo, "sNSumEt");
-  sNSumEt_ = ibooker.book1D(histo, histo , 100, 0, 2000);
+  sprintf(histo, "sNSumE");
+  sNSumE_ = ibooker.book1D(histo, histo, 100, 0, 5000);
+  sprintf(histo, "sNSumEt");
+  sNSumEt_ = ibooker.book1D(histo, histo, 100, 0, 2000);
 
-  sprintf (histo, "iNNumChannels");
+  sprintf(histo, "iNNumChannels");
   iNNumChannels_ = ibooker.book1D(histo, histo, 100, 0, 100);
-  sprintf (histo, "iNSumE");
-  iNSumE_ = ibooker.book1D(histo, histo , 100, 0, 5000);
-  sprintf (histo, "iNSumEt");
-  iNSumEt_ = ibooker.book1D(histo, histo , 100, 0, 2000);
+  sprintf(histo, "iNSumE");
+  iNSumE_ = ibooker.book1D(histo, histo, 100, 0, 5000);
+  sprintf(histo, "iNSumEt");
+  iNSumEt_ = ibooker.book1D(histo, histo, 100, 0, 2000);
 
-  sprintf (histo, "hNoise_maxZeros");
+  sprintf(histo, "hNoise_maxZeros");
   hNoise_maxZeros_ = ibooker.book1D(histo, histo, 80, 0, 80);
-  sprintf (histo, "hNoise_maxHPDHits");
+  sprintf(histo, "hNoise_maxHPDHits");
   hNoise_maxHPDHits_ = ibooker.book1D(histo, histo, 20, 0, 20);
-  sprintf (histo, "hNoise_maxHPDNoOtherHits");
+  sprintf(histo, "hNoise_maxHPDNoOtherHits");
   hNoise_maxHPDNoOtherHits_ = ibooker.book1D(histo, histo, 20, 0, 20);
-
-}
-  
-  
-HcalNoiseRates::~HcalNoiseRates()
-{
 }
-  
-  
+
+HcalNoiseRates::~HcalNoiseRates() {}
+
 //
 // member functions
 //
-  
-// ------------ method called to for each event  ------------
-void
-HcalNoiseRates::analyze(const edm::Event& iEvent, const edm::EventSetup& evSetup)
-{
 
+// ------------ method called to for each event  ------------
+void HcalNoiseRates::analyze(const edm::Event &iEvent, const edm::EventSetup &evSetup) {
   // get the lumi section
   int lumiSection = iEvent.luminosityBlock();
   lumiCountMap_[lumiSection]++;
 
   // get the RBX Noise collection
   edm::Handle<reco::HcalNoiseRBXCollection> handle;
-  iEvent.getByToken(tok_rbx_,handle);
-  if(!handle.isValid()) {
+  iEvent.getByToken(tok_rbx_, handle);
+  if (!handle.isValid()) {
     throw edm::Exception(edm::errors::ProductNotFound)
-      << " could not find HcalNoiseRBXCollection named " << rbxCollName_ << ".\n";
+        << " could not find HcalNoiseRBXCollection named " << rbxCollName_ << ".\n";
     return;
   }
 
   // get the Noise summary object
   edm::Handle<HcalNoiseSummary> summary_h;
   iEvent.getByToken(noisetoken_, summary_h);
-  if(!summary_h.isValid()) {
+  if (!summary_h.isValid()) {
     throw edm::Exception(edm::errors::ProductNotFound) << " could not find HcalNoiseSummary.\n";
     return;
   }
   const HcalNoiseSummary summary = *summary_h;
 
-  //Fill the Noise Summary histograms
+  // Fill the Noise Summary histograms
   nNNumChannels_->Fill(summary.numNegativeNoiseChannels());
   nNSumE_->Fill(summary.NegativeNoiseSumE());
   nNSumEt_->Fill(summary.NegativeNoiseSumEt());
@@ -151,40 +141,40 @@ HcalNoiseRates::analyze(const edm::Event& iEvent, const edm::EventSetup& evSetup
   hNoise_maxHPDNoOtherHits_->Fill(summary.maxHPDNoOtherHits());
 
   // loop over the RBXs and fill the histograms
-  for(reco::HcalNoiseRBXCollection::const_iterator it=handle->begin(); it!=handle->end(); ++it) {
-    const reco::HcalNoiseRBX &rbx=(*it);
+  for (reco::HcalNoiseRBXCollection::const_iterator it = handle->begin(); it != handle->end(); ++it) {
+    const reco::HcalNoiseRBX &rbx = (*it);
 
     double energy = rbx.recHitEnergy(minHitEnergy_);
 
     int nhits = rbx.numRecHits(minHitEnergy_);
 
-    if(energy < minRBXEnergy_) continue;
+    if (energy < minRBXEnergy_)
+      continue;
 
     hRBXEnergy_->Fill(energy);
-    
-    if      (nhits <= 9)  hRBXEnergyType1_->Fill(energy);
-    else if (nhits <= 18) hRBXEnergyType2_->Fill(energy);
-    else               	  hRBXEnergyType3_->Fill(energy);
-    
-    hRBXNHits_->Fill(nhits);
-    
-  }   // done looping over RBXs
 
-}
+    if (nhits <= 9)
+      hRBXEnergyType1_->Fill(energy);
+    else if (nhits <= 18)
+      hRBXEnergyType2_->Fill(energy);
+    else
+      hRBXEnergyType3_->Fill(energy);
 
+    hRBXNHits_->Fill(nhits);
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-HcalNoiseRates::beginJob(){}
-
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-HcalNoiseRates::endJob() {
+  }  // done looping over RBXs
+}
 
-  if (useAllHistos_) hLumiBlockCount_->Fill(0.0, lumiCountMap_.size()); 
+// ------------ method called once each job just before starting event loop
+// ------------
+void HcalNoiseRates::beginJob() {}
 
+// ------------ method called once each job just after ending the event loop
+// ------------
+void HcalNoiseRates::endJob() {
+  if (useAllHistos_)
+    hLumiBlockCount_->Fill(0.0, lumiCountMap_.size());
 }
 
-
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(HcalNoiseRates);
diff --git a/DQMOffline/Hcal/src/HcalNoiseRatesClient.cc b/DQMOffline/Hcal/src/HcalNoiseRatesClient.cc
index 9e1c734d177b7..cb73680d6a41e 100644
--- a/DQMOffline/Hcal/src/HcalNoiseRatesClient.cc
+++ b/DQMOffline/Hcal/src/HcalNoiseRatesClient.cc
@@ -1,97 +1,81 @@
 #include "DQMOffline/Hcal/interface/HcalNoiseRatesClient.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-HcalNoiseRatesClient::HcalNoiseRatesClient(const edm::ParameterSet& iConfig):conf_(iConfig)
-{
-
-	outputFile_ = iConfig.getUntrackedParameter<std::string>("outputFile", "myfile.root");
-	debug_ = false;
-	verbose_ = false;
-	dirName_=iConfig.getParameter<std::string>("DQMDirName");
-
+HcalNoiseRatesClient::HcalNoiseRatesClient(const edm::ParameterSet &iConfig) : conf_(iConfig) {
+  outputFile_ = iConfig.getUntrackedParameter<std::string>("outputFile", "myfile.root");
+  debug_ = false;
+  verbose_ = false;
+  dirName_ = iConfig.getParameter<std::string>("DQMDirName");
 }
 
+HcalNoiseRatesClient::~HcalNoiseRatesClient() {}
 
-HcalNoiseRatesClient::~HcalNoiseRatesClient()
-{ 
+void HcalNoiseRatesClient::beginJob() {}
 
-}
+void HcalNoiseRatesClient::beginRun(const edm::Run &run, const edm::EventSetup &c) {}
 
-void HcalNoiseRatesClient::beginJob()
-{
+void HcalNoiseRatesClient::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
+  igetter.setCurrentFolder(dirName_);
 
+  if (verbose_)
+    std::cout << "\nrunClient" << std::endl;
 
-}
+  std::vector<MonitorElement *> hcalMEs;
 
+  // Since out folders are fixed to three, we can just go over these three
+  // folders i.e., CaloTowersD/CaloTowersTask, HcalRecHitsD/HcalRecHitTask,
+  // HcalNoiseRatesD/NoiseRatesTask.
+  std::vector<std::string> fullPathHLTFolders = igetter.getSubdirs();
+  for (unsigned int i = 0; i < fullPathHLTFolders.size(); i++) {
+    if (verbose_)
+      std::cout << "\nfullPath: " << fullPathHLTFolders[i] << std::endl;
+    igetter.setCurrentFolder(fullPathHLTFolders[i]);
 
-void HcalNoiseRatesClient::beginRun(const edm::Run& run, const edm::EventSetup& c)
-{
-
-}
-
-
-void HcalNoiseRatesClient::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter)
-{
-	igetter.setCurrentFolder(dirName_);
-
-	if (verbose_) std::cout << "\nrunClient" << std::endl; 
-
-	std::vector<MonitorElement*> hcalMEs;
-
-	// Since out folders are fixed to three, we can just go over these three folders
-	// i.e., CaloTowersD/CaloTowersTask, HcalRecHitsD/HcalRecHitTask, HcalNoiseRatesD/NoiseRatesTask.
-	std::vector<std::string> fullPathHLTFolders = igetter.getSubdirs();
-	for(unsigned int i=0;i<fullPathHLTFolders.size();i++) {
-
-		if (verbose_) std::cout <<"\nfullPath: "<< fullPathHLTFolders[i] << std::endl;
-		igetter.setCurrentFolder(fullPathHLTFolders[i]);
-
-		std::vector<std::string> fullSubPathHLTFolders = igetter.getSubdirs();
-		for(unsigned int j=0;j<fullSubPathHLTFolders.size();j++) {
-
-			if (verbose_) std::cout <<"fullSub: "<<fullSubPathHLTFolders[j] << std::endl;
-
-			if( strcmp(fullSubPathHLTFolders[j].c_str(), "HcalNoiseRatesD/NoiseRatesTask") ==0  ){
-				hcalMEs = igetter.getContents(fullSubPathHLTFolders[j]);
-				if (verbose_) std::cout <<"hltMES size : "<<hcalMEs.size()<<std::endl;
-				if( !NoiseRatesEndjob(hcalMEs) ) std::cout<<"\nError in NoiseRatesEndjob!"<<std::endl<<std::endl;
-			}
-
-		}    
-
-	}
+    std::vector<std::string> fullSubPathHLTFolders = igetter.getSubdirs();
+    for (unsigned int j = 0; j < fullSubPathHLTFolders.size(); j++) {
+      if (verbose_)
+        std::cout << "fullSub: " << fullSubPathHLTFolders[j] << std::endl;
 
+      if (strcmp(fullSubPathHLTFolders[j].c_str(), "HcalNoiseRatesD/NoiseRatesTask") == 0) {
+        hcalMEs = igetter.getContents(fullSubPathHLTFolders[j]);
+        if (verbose_)
+          std::cout << "hltMES size : " << hcalMEs.size() << std::endl;
+        if (!NoiseRatesEndjob(hcalMEs))
+          std::cout << "\nError in NoiseRatesEndjob!" << std::endl << std::endl;
+      }
+    }
+  }
 }
 
 // called after entering the HcalNoiseRatesD/NoiseRatesTask directory
 // hcalMEs are within that directory
-int HcalNoiseRatesClient::NoiseRatesEndjob(const std::vector<MonitorElement*> &hcalMEs){
-
-	int useAllHistos = 0;
-	MonitorElement* hLumiBlockCount =nullptr;
-	for(unsigned int ih=0; ih<hcalMEs.size(); ih++){
-		if( strcmp(hcalMEs[ih]->getName().c_str(), "hLumiBlockCount") ==0  ){
-			hLumiBlockCount = hcalMEs[ih];
-			useAllHistos =1;
-		} 
-	} 
-	if( useAllHistos !=0 && useAllHistos !=1 ) return 0;
-
-	// FIXME: dummy lumiCountMap.size since hLumiBlockCount is disabled
-	// in a general case.
-	int lumiCountMapsize = -1; // dummy
-	if (useAllHistos) hLumiBlockCount->Fill(0.0, lumiCountMapsize);
-
-	return 1;
-
+int HcalNoiseRatesClient::NoiseRatesEndjob(const std::vector<MonitorElement *> &hcalMEs) {
+  int useAllHistos = 0;
+  MonitorElement *hLumiBlockCount = nullptr;
+  for (unsigned int ih = 0; ih < hcalMEs.size(); ih++) {
+    if (strcmp(hcalMEs[ih]->getName().c_str(), "hLumiBlockCount") == 0) {
+      hLumiBlockCount = hcalMEs[ih];
+      useAllHistos = 1;
+    }
+  }
+  if (useAllHistos != 0 && useAllHistos != 1)
+    return 0;
+
+  // FIXME: dummy lumiCountMap.size since hLumiBlockCount is disabled
+  // in a general case.
+  int lumiCountMapsize = -1;  // dummy
+  if (useAllHistos)
+    hLumiBlockCount->Fill(0.0, lumiCountMapsize);
+
+  return 1;
 }
 
 DEFINE_FWK_MODULE(HcalNoiseRatesClient);
diff --git a/DQMOffline/Hcal/src/HcalRecHitsAnalyzer.cc b/DQMOffline/Hcal/src/HcalRecHitsAnalyzer.cc
index 92ac7fb84f24a..1eace6306f352 100644
--- a/DQMOffline/Hcal/src/HcalRecHitsAnalyzer.cc
+++ b/DQMOffline/Hcal/src/HcalRecHitsAnalyzer.cc
@@ -1,35 +1,33 @@
 #include "DQMOffline/Hcal/interface/HcalRecHitsAnalyzer.h"
+#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "Geometry/Records/interface/HcalRecNumberingRecord.h"
-#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
-
-HcalRecHitsAnalyzer::HcalRecHitsAnalyzer(edm::ParameterSet const& conf) 
-  : topFolderName_           ( conf.getParameter<std::string>("TopFolderName") )
-{
 
+HcalRecHitsAnalyzer::HcalRecHitsAnalyzer(edm::ParameterSet const &conf)
+    : topFolderName_(conf.getParameter<std::string>("TopFolderName")) {
   // DQM ROOT output
   outputFile_ = conf.getUntrackedParameter<std::string>("outputFile", "myfile.root");
-  
-  if ( !outputFile_.empty() ) {
+
+  if (!outputFile_.empty()) {
     edm::LogInfo("OutputInfo") << " Hcal RecHit Task histograms will be saved to '" << outputFile_.c_str() << "'";
   } else {
     edm::LogInfo("OutputInfo") << " Hcal RecHit Task histograms will NOT be saved";
   }
-  
+
   nevtot = 0;
- 
+
   hcalselector_ = conf.getUntrackedParameter<std::string>("hcalselector", "all");
   ecalselector_ = conf.getUntrackedParameter<std::string>("ecalselector", "yes");
-  eventype_     = conf.getUntrackedParameter<std::string>("eventype", "single");
-  sign_         = conf.getUntrackedParameter<std::string>("sign", "*");
-  //useAllHistos_ = conf.getUntrackedParameter<bool>("useAllHistos", false);
+  eventype_ = conf.getUntrackedParameter<std::string>("eventype", "single");
+  sign_ = conf.getUntrackedParameter<std::string>("sign", "*");
+  // useAllHistos_ = conf.getUntrackedParameter<bool>("useAllHistos", false);
 
-  //HEP17 configuration
-  hep17_        = conf.getUntrackedParameter<bool>("hep17");
+  // HEP17 configuration
+  hep17_ = conf.getUntrackedParameter<bool>("hep17");
 
-  //Collections
+  // Collections
   tok_hbhe_ = consumes<HBHERecHitCollection>(conf.getUntrackedParameter<edm::InputTag>("HBHERecHitCollectionLabel"));
-  tok_hf_  = consumes<HFRecHitCollection>(conf.getUntrackedParameter<edm::InputTag>("HFRecHitCollectionLabel"));
+  tok_hf_ = consumes<HFRecHitCollection>(conf.getUntrackedParameter<edm::InputTag>("HFRecHitCollectionLabel"));
   tok_ho_ = consumes<HORecHitCollection>(conf.getUntrackedParameter<edm::InputTag>("HORecHitCollectionLabel"));
   edm::InputTag EBRecHitCollectionLabel = conf.getParameter<edm::InputTag>("EBRecHitCollectionLabel");
   tok_EB_ = consumes<EBRecHitCollection>(EBRecHitCollectionLabel);
@@ -37,502 +35,529 @@ HcalRecHitsAnalyzer::HcalRecHitsAnalyzer(edm::ParameterSet const& conf)
   tok_EE_ = consumes<EERecHitCollection>(EERecHitCollectionLabel);
 
   subdet_ = 5;
-  if (hcalselector_ == "noise") subdet_ = 0;
-  if (hcalselector_ == "HB"   ) subdet_ = 1;
-  if (hcalselector_ == "HE"   ) subdet_ = 2;
-  if (hcalselector_ == "HO"   ) subdet_ = 3;
-  if (hcalselector_ == "HF"   ) subdet_ = 4;
-  if (hcalselector_ == "all"  ) subdet_ = 5;
-  if (hcalselector_ == "ZS"   ) subdet_ = 6;
+  if (hcalselector_ == "noise")
+    subdet_ = 0;
+  if (hcalselector_ == "HB")
+    subdet_ = 1;
+  if (hcalselector_ == "HE")
+    subdet_ = 2;
+  if (hcalselector_ == "HO")
+    subdet_ = 3;
+  if (hcalselector_ == "HF")
+    subdet_ = 4;
+  if (hcalselector_ == "all")
+    subdet_ = 5;
+  if (hcalselector_ == "ZS")
+    subdet_ = 6;
 
   etype_ = 1;
-  if (eventype_ == "multi") etype_ = 2;
+  if (eventype_ == "multi")
+    etype_ = 2;
 
   iz = 1;
-  if(sign_ == "-") iz = -1;
-  if(sign_ == "*") iz = 0;
+  if (sign_ == "-")
+    iz = -1;
+  if (sign_ == "*")
+    iz = 0;
 
   imc = 0;
+}
 
-  }
+void HcalRecHitsAnalyzer::dqmBeginRun(const edm::Run &run, const edm::EventSetup &es) {
+  edm::ESHandle<HcalDDDRecConstants> pHRNDC;
+  es.get<HcalRecNumberingRecord>().get(pHRNDC);
+  hcons = &(*pHRNDC);
+  maxDepthHB_ = hcons->getMaxDepth(0);
+  maxDepthHE_ = hcons->getMaxDepth(1);
+  maxDepthHF_ = hcons->getMaxDepth(2);
+  maxDepthHO_ = hcons->getMaxDepth(3);
 
-  void HcalRecHitsAnalyzer::dqmBeginRun(const edm::Run& run, const edm::EventSetup& es){
-  
-    edm::ESHandle<HcalDDDRecConstants> pHRNDC;
-    es.get<HcalRecNumberingRecord>().get( pHRNDC );
-    hcons = &(*pHRNDC);
-    maxDepthHB_ = hcons->getMaxDepth(0);
-    maxDepthHE_ = hcons->getMaxDepth(1);
-    maxDepthHF_ = hcons->getMaxDepth(2);
-    maxDepthHO_ = hcons->getMaxDepth(3);
+  edm::ESHandle<CaloGeometry> geometry;
 
-    edm::ESHandle<CaloGeometry> geometry;
+  es.get<CaloGeometryRecord>().get(geometry);
 
-    es.get<CaloGeometryRecord > ().get(geometry);
+  const CaloGeometry *geo = geometry.product();
+  const HcalGeometry *gHB = static_cast<const HcalGeometry *>(geo->getSubdetectorGeometry(DetId::Hcal, HcalBarrel));
+  const HcalGeometry *gHE = static_cast<const HcalGeometry *>(geo->getSubdetectorGeometry(DetId::Hcal, HcalEndcap));
+  const HcalGeometry *gHO = static_cast<const HcalGeometry *>(geo->getSubdetectorGeometry(DetId::Hcal, HcalOuter));
+  const HcalGeometry *gHF = static_cast<const HcalGeometry *>(geo->getSubdetectorGeometry(DetId::Hcal, HcalForward));
 
-    const CaloGeometry* geo = geometry.product();
-    const HcalGeometry* gHB = static_cast<const HcalGeometry*>(geo->getSubdetectorGeometry(DetId::Hcal,HcalBarrel));
-    const HcalGeometry* gHE = static_cast<const HcalGeometry*>(geo->getSubdetectorGeometry(DetId::Hcal,HcalEndcap));
-    const HcalGeometry* gHO = static_cast<const HcalGeometry*>(geo->getSubdetectorGeometry(DetId::Hcal,HcalOuter));
-    const HcalGeometry* gHF = static_cast<const HcalGeometry*>(geo->getSubdetectorGeometry(DetId::Hcal,HcalForward));
+  nChannels_[1] = gHB->getHxSize(1);
+  nChannels_[2] = gHE->getHxSize(2);
+  nChannels_[3] = gHO->getHxSize(3);
+  nChannels_[4] = gHF->getHxSize(4);
 
-    nChannels_[1] = gHB->getHxSize(1); 
-    nChannels_[2] = gHE->getHxSize(2); 
-    nChannels_[3] = gHO->getHxSize(3); 
-    nChannels_[4] = gHF->getHxSize(4); 
+  nChannels_[0] = nChannels_[1] + nChannels_[2] + nChannels_[3] + nChannels_[4];
 
-    nChannels_[0] = nChannels_[1] + nChannels_[2] + nChannels_[3] + nChannels_[4];
+  // std::cout << "Channels HB:" << nChannels_[1] << " HE:" << nChannels_[2] <<
+  // " HO:" << nChannels_[3] << " HF:" << nChannels_[4] << std::endl;
 
-    //std::cout << "Channels HB:" << nChannels_[1] << " HE:" << nChannels_[2] << " HO:" << nChannels_[3] << " HF:" << nChannels_[4] << std::endl;
+  // We hardcode the HF depths because in the dual readout configuration,
+  // rechits are not defined for depths 3&4
+  maxDepthHF_ = (maxDepthHF_ > 2 ? 2 : maxDepthHF_);  // We retain the dynamic possibility
+                                                      // that HF might have 0 or 1 depths
 
-    //We hardcode the HF depths because in the dual readout configuration, rechits are not defined for depths 3&4
-    maxDepthHF_ = (maxDepthHF_ > 2 ? 2 : maxDepthHF_); //We retain the dynamic possibility that HF might have 0 or 1 depths
+  maxDepthAll_ = (maxDepthHB_ + maxDepthHO_ > maxDepthHE_ ? maxDepthHB_ + maxDepthHO_ : maxDepthHE_);
+  maxDepthAll_ = (maxDepthAll_ > maxDepthHF_ ? maxDepthAll_ : maxDepthHF_);
 
-    maxDepthAll_ = ( maxDepthHB_ + maxDepthHO_ > maxDepthHE_ ? maxDepthHB_ + maxDepthHO_ : maxDepthHE_ );
-    maxDepthAll_ = ( maxDepthAll_ > maxDepthHF_ ? maxDepthAll_ : maxDepthHF_ );
+  // Get Phi segmentation from geometry, use the max phi number so that all iphi
+  // values are included.
 
-    //Get Phi segmentation from geometry, use the max phi number so that all iphi values are included.
+  int NphiMax = hcons->getNPhi(0);
 
-    int NphiMax = hcons->getNPhi(0);
+  NphiMax = (hcons->getNPhi(1) > NphiMax ? hcons->getNPhi(1) : NphiMax);
+  NphiMax = (hcons->getNPhi(2) > NphiMax ? hcons->getNPhi(2) : NphiMax);
+  NphiMax = (hcons->getNPhi(3) > NphiMax ? hcons->getNPhi(3) : NphiMax);
 
-    NphiMax = (hcons->getNPhi(1) > NphiMax ? hcons->getNPhi(1) : NphiMax);
-    NphiMax = (hcons->getNPhi(2) > NphiMax ? hcons->getNPhi(2) : NphiMax);
-    NphiMax = (hcons->getNPhi(3) > NphiMax ? hcons->getNPhi(3) : NphiMax);
+  // Center the iphi bins on the integers
+  iphi_min_ = 0.5;
+  iphi_max_ = NphiMax + 0.5;
+  iphi_bins_ = (int)(iphi_max_ - iphi_min_);
 
-    //Center the iphi bins on the integers
-    iphi_min_ = 0.5;
-    iphi_max_ = NphiMax + 0.5;
-    iphi_bins_ = (int) (iphi_max_ - iphi_min_);
+  // Retain classic behavior, all plots have same ieta range.
 
-    //Retain classic behavior, all plots have same ieta range.
+  int iEtaMax = (hcons->getEtaRange(0).second > hcons->getEtaRange(1).second ? hcons->getEtaRange(0).second
+                                                                             : hcons->getEtaRange(1).second);
+  iEtaMax = (iEtaMax > hcons->getEtaRange(2).second ? iEtaMax : hcons->getEtaRange(2).second);
+  iEtaMax = (iEtaMax > hcons->getEtaRange(3).second ? iEtaMax : hcons->getEtaRange(3).second);
 
-    int iEtaMax = (hcons->getEtaRange(0).second > hcons->getEtaRange(1).second ? hcons->getEtaRange(0).second : hcons->getEtaRange(1).second);
-    iEtaMax = (iEtaMax > hcons->getEtaRange(2).second ? iEtaMax : hcons->getEtaRange(2).second);
-    iEtaMax = (iEtaMax > hcons->getEtaRange(3).second ? iEtaMax : hcons->getEtaRange(3).second);
+  // Give an empty bin around the subdet ieta range to make it clear that all
+  // ieta rings have been included
+  ieta_min_ = -iEtaMax - 1.5;
+  ieta_max_ = iEtaMax + 1.5;
+  ieta_bins_ = (int)(ieta_max_ - ieta_min_);
+}
 
-    //Give an empty bin around the subdet ieta range to make it clear that all ieta rings have been included
-    ieta_min_ = -iEtaMax - 1.5;
-    ieta_max_ = iEtaMax + 1.5;
-    ieta_bins_ = (int) (ieta_max_ - ieta_min_);
+void HcalRecHitsAnalyzer::bookHistograms(DQMStore::IBooker &ibooker,
+                                         edm::Run const & /* iRun*/,
+                                         edm::EventSetup const & /* iSetup */)
 
+{
+  Char_t histo[200];
+
+  ibooker.setCurrentFolder(topFolderName_);
+
+  // General counters (drawn)
+
+  // Produce both a total per subdetector, and number of rechits per subdetector
+  // depth
+  // The bins are 1 unit wide, and the range is determined by the number of
+  // channels per subdetector
+
+  for (int depth = 0; depth <= maxDepthHB_; depth++) {
+    if (depth == 0) {
+      sprintf(histo, "N_HB");
+    } else {
+      sprintf(histo, "N_HB_depth%d", depth);
+    }
+    int NBins = (int)(nChannels_[1] * 1.1);
+    Nhb.push_back(ibooker.book1D(histo, histo, NBins, 0., (float)NBins));
+  }
+  for (int depth = 0; depth <= maxDepthHE_; depth++) {
+    if (depth == 0) {
+      sprintf(histo, "N_HE");
+    } else {
+      sprintf(histo, "N_HE_depth%d", depth);
+    }
+    int NBins = (int)(nChannels_[2] * 1.1);
+    Nhe.push_back(ibooker.book1D(histo, histo, NBins, 0., (float)NBins));
+  }
+  for (int depth = 0; depth <= maxDepthHO_; depth++) {
+    if (depth == 0) {
+      sprintf(histo, "N_HO");
+    } else {
+      sprintf(histo, "N_HO_depth%d", depth);
+    }
+    int NBins = (int)(nChannels_[3] * 1.1);
+    Nho.push_back(ibooker.book1D(histo, histo, NBins, 0., (float)NBins));
+  }
+  for (int depth = 0; depth <= maxDepthHF_; depth++) {
+    if (depth == 0) {
+      sprintf(histo, "N_HF");
+    } else {
+      sprintf(histo, "N_HF_depth%d", depth);
+    }
+    int NBins = (int)(nChannels_[4] * 1.1);
+    Nhf.push_back(ibooker.book1D(histo, histo, NBins, 0., (float)NBins));
   }
 
- void HcalRecHitsAnalyzer::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & /* iRun*/, edm::EventSetup const & /* iSetup */)
-
-{ 
-
-    Char_t histo[200];
-
-    ibooker.setCurrentFolder(topFolderName_);
-
-    // General counters (drawn)
-
-    //Produce both a total per subdetector, and number of rechits per subdetector depth
-    // The bins are 1 unit wide, and the range is determined by the number of channels per subdetector
-
-    for(int depth = 0; depth <= maxDepthHB_; depth++){
-      if(depth == 0){ sprintf  (histo, "N_HB" );}
-      else{           sprintf  (histo, "N_HB_depth%d",depth );}
-      int NBins = (int) (nChannels_[1] * 1.1);
-      Nhb.push_back( ibooker.book1D(histo, histo, NBins, 0., (float)NBins) );
-    } 
-    for(int depth = 0; depth <= maxDepthHE_; depth++){
-      if(depth == 0){ sprintf  (histo, "N_HE" );}
-      else{           sprintf  (histo, "N_HE_depth%d",depth );}
-      int NBins	= (int) (nChannels_[2] * 1.1);
-      Nhe.push_back( ibooker.book1D(histo, histo, NBins,0., (float)NBins) );
-    } 
-    for(int depth = 0; depth <= maxDepthHO_; depth++){
-      if(depth == 0){ sprintf  (histo, "N_HO" );}
-      else{           sprintf  (histo, "N_HO_depth%d",depth );}
-      int NBins	= (int) (nChannels_[3] * 1.1);
-      Nho.push_back( ibooker.book1D(histo, histo, NBins,0., (float)NBins) );
-    } 
-    for(int depth = 0; depth <= maxDepthHF_; depth++){
-      if(depth == 0){ sprintf  (histo, "N_HF" );}
-      else{           sprintf  (histo, "N_HF_depth%d",depth );}
-      int NBins	= (int) (nChannels_[4] * 1.1);
-      Nhf.push_back( ibooker.book1D(histo, histo, NBins,0., (float)NBins) );
-    } 
-
-    // ZS
-    if(subdet_ == 6) {
+  // ZS
+  if (subdet_ == 6) {
+  }
 
+  // ALL others, except ZS
+  else {
+    for (int depth = 1; depth <= maxDepthAll_; depth++) {
+      sprintf(histo, "emap_depth%d", depth);
+      emap.push_back(ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_));
     }
+    sprintf(histo, "emap_HO");
+    emap_HO = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
 
-    // ALL others, except ZS
-    else {  
-      for(int depth = 1; depth <= maxDepthAll_; depth++){
-        sprintf  (histo, "emap_depth%d",depth );
-        emap.push_back( ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_) );
-      }
-      sprintf(histo, "emap_HO");
-      emap_HO = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_); 
+    // The mean energy histos are drawn, but not the RMS or emean seq
 
-      //The mean energy histos are drawn, but not the RMS or emean seq
-      
-      for (int depth = 1; depth <= maxDepthHB_; depth++) {
-	sprintf  (histo, "emean_vs_ieta_HB%d",depth );
-	emean_vs_ieta_HB.push_back( ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " ") );
+    for (int depth = 1; depth <= maxDepthHB_; depth++) {
+      sprintf(histo, "emean_vs_ieta_HB%d", depth);
+      emean_vs_ieta_HB.push_back(ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " "));
 
-	sprintf  (histo, "emean_vs_ieta_M0_HB%d",depth );
-	emean_vs_ieta_HBM0.push_back( ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " ") );
+      sprintf(histo, "emean_vs_ieta_M0_HB%d", depth);
+      emean_vs_ieta_HBM0.push_back(
+          ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " "));
 
-	sprintf  (histo, "emean_vs_ieta_M3_HB%d",depth );
-	emean_vs_ieta_HBM3.push_back( ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " ") );
-      }
+      sprintf(histo, "emean_vs_ieta_M3_HB%d", depth);
+      emean_vs_ieta_HBM3.push_back(
+          ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " "));
+    }
+    for (int depth = 1; depth <= maxDepthHE_; depth++) {
+      sprintf(histo, "emean_vs_ieta_HE%d", depth);
+      emean_vs_ieta_HE.push_back(ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " "));
+
+      sprintf(histo, "emean_vs_ieta_M0_HE%d", depth);
+      emean_vs_ieta_HEM0.push_back(
+          ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " "));
+
+      sprintf(histo, "emean_vs_ieta_M3_HE%d", depth);
+      emean_vs_ieta_HEM3.push_back(
+          ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " "));
+    }
+
+    if (hep17_) {
       for (int depth = 1; depth <= maxDepthHE_; depth++) {
-	sprintf  (histo, "emean_vs_ieta_HE%d",depth );
-	emean_vs_ieta_HE.push_back( ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " ") );
+        sprintf(histo, "emean_vs_ieta_HEP17_depth%d", depth);
+        emean_vs_ieta_HEP17.push_back(
+            ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " "));
 
-	sprintf  (histo, "emean_vs_ieta_M0_HE%d",depth );
-	emean_vs_ieta_HEM0.push_back( ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " ") );
+        sprintf(histo, "emean_vs_ieta_M0_HEP17_depth%d", depth);
+        emean_vs_ieta_HEP17M0.push_back(
+            ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " "));
 
-	sprintf  (histo, "emean_vs_ieta_M3_HE%d",depth );
-	emean_vs_ieta_HEM3.push_back( ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " ") );
+        sprintf(histo, "emean_vs_ieta_M3_HEP17_depth%d", depth);
+        emean_vs_ieta_HEP17M3.push_back(
+            ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " "));
       }
+    }
 
-      if(hep17_){
-         for (int depth = 1; depth <= maxDepthHE_; depth++) {
-            sprintf  (histo, "emean_vs_ieta_HEP17_depth%d",depth );
-            emean_vs_ieta_HEP17.push_back( ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " ") );
+    for (int depth = 1; depth <= maxDepthHF_; depth++) {
+      sprintf(histo, "emean_vs_ieta_HF%d", depth);
+      emean_vs_ieta_HF.push_back(ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " "));
+    }
+    sprintf(histo, "emean_vs_ieta_HO");
+    emean_vs_ieta_HO = ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " ");
 
-   	    sprintf  (histo, "emean_vs_ieta_M0_HEP17_depth%d",depth );
-	    emean_vs_ieta_HEP17M0.push_back( ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " ") );
+    // The only occupancy histos drawn are occupancy vs. ieta
+    // but the maps are needed because this is where the latter are filled from
 
-	    sprintf  (histo, "emean_vs_ieta_M3_HEP17_depth%d",depth );
-	    emean_vs_ieta_HEP17M3.push_back( ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " ") );
-         }
-      }
+    for (int depth = 1; depth <= maxDepthHB_; depth++) {
+      sprintf(histo, "occupancy_map_HB%d", depth);
+      occupancy_map_HB.push_back(
+          ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_));
+    }
 
-      for (int depth = 1; depth <= maxDepthHF_; depth++) {
-	sprintf  (histo, "emean_vs_ieta_HF%d",depth );
-	emean_vs_ieta_HF.push_back( ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " ") );
-      }
-      sprintf  (histo, "emean_vs_ieta_HO" );
-      emean_vs_ieta_HO = ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -10., 2000., " " );
+    for (int depth = 1; depth <= maxDepthHE_; depth++) {
+      sprintf(histo, "occupancy_map_HE%d", depth);
+      occupancy_map_HE.push_back(
+          ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_));
+    }
 
-      //The only occupancy histos drawn are occupancy vs. ieta
-      //but the maps are needed because this is where the latter are filled from
+    sprintf(histo, "occupancy_map_HO");
+    occupancy_map_HO = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);
 
-      for (int depth = 1; depth <= maxDepthHB_; depth++) {
-         sprintf  (histo, "occupancy_map_HB%d",depth );
-         occupancy_map_HB.push_back( ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_) );
-      }
+    for (int depth = 1; depth <= maxDepthHF_; depth++) {
+      sprintf(histo, "occupancy_map_HF%d", depth);
+      occupancy_map_HF.push_back(
+          ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_));
+    }
 
-      for (int depth = 1; depth <= maxDepthHE_; depth++) {
-         sprintf  (histo, "occupancy_map_HE%d",depth );
-         occupancy_map_HE.push_back( ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_) );
-      }
+    // nrechits vs iphi
+    for (int depth = 1; depth <= maxDepthHB_; depth++) {
+      sprintf(histo, "occupancy_vs_ieta_HB%d", depth);
+      occupancy_vs_ieta_HB.push_back(ibooker.book1D(histo, histo, ieta_bins_, ieta_min_, ieta_max_));
+      sprintf(histo, "nrechits_vs_iphi_HBP_d%d", depth);
+      nrechits_vs_iphi_HBP.push_back(ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_));
+      sprintf(histo, "nrechits_vs_iphi_HBM_d%d", depth);
+      nrechits_vs_iphi_HBM.push_back(ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_));
+    }
 
-      sprintf  (histo, "occupancy_map_HO" );
-      occupancy_map_HO = ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_);      
+    for (int depth = 1; depth <= maxDepthHE_; depth++) {
+      sprintf(histo, "occupancy_vs_ieta_HE%d", depth);
+      occupancy_vs_ieta_HE.push_back(ibooker.book1D(histo, histo, ieta_bins_, ieta_min_, ieta_max_));
+      sprintf(histo, "nrechits_vs_iphi_HEP_d%d", depth);
+      nrechits_vs_iphi_HEP.push_back(ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_));
+      sprintf(histo, "nrechits_vs_iphi_HEM_d%d", depth);
+      nrechits_vs_iphi_HEM.push_back(ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_));
+    }
 
-      for (int depth = 1; depth <= maxDepthHF_; depth++) {
-         sprintf  (histo, "occupancy_map_HF%d",depth );
-         occupancy_map_HF.push_back( ibooker.book2D(histo, histo, ieta_bins_, ieta_min_, ieta_max_, iphi_bins_, iphi_min_, iphi_max_) );
-      }
-      
-      // nrechits vs iphi
-      for (int depth = 1; depth <= maxDepthHB_; depth++) {
-	
-	 sprintf  (histo, "occupancy_vs_ieta_HB%d",depth );
-	 occupancy_vs_ieta_HB.push_back( ibooker.book1D(histo, histo, ieta_bins_, ieta_min_, ieta_max_) );
-         sprintf  (histo, "nrechits_vs_iphi_HBP_d%d",depth );
-         nrechits_vs_iphi_HBP.push_back( ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_) );
-         sprintf  (histo, "nrechits_vs_iphi_HBM_d%d",depth );
-         nrechits_vs_iphi_HBM.push_back( ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_) );
-      }
+    sprintf(histo, "occupancy_vs_ieta_HO");
+    occupancy_vs_ieta_HO = ibooker.book1D(histo, histo, ieta_bins_, ieta_min_, ieta_max_);
+    sprintf(histo, "nrechits_vs_iphi_HOP");
+    nrechits_vs_iphi_HOP = ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_);
+    sprintf(histo, "nrechits_vs_iphi_HOM");
+    nrechits_vs_iphi_HOM = ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_);
+
+    for (int depth = 1; depth <= maxDepthHF_; depth++) {
+      sprintf(histo, "occupancy_vs_ieta_HF%d", depth);
+      occupancy_vs_ieta_HF.push_back(ibooker.book1D(histo, histo, ieta_bins_, ieta_min_, ieta_max_));
+      sprintf(histo, "nrechits_vs_iphi_HFP_d%d", depth);
+      nrechits_vs_iphi_HFP.push_back(ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_));
+      sprintf(histo, "nrechits_vs_iphi_HFM_d%d", depth);
+      nrechits_vs_iphi_HFM.push_back(ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_));
+    }
+
+    // All status word histos except HF67 are drawn
+    sprintf(histo, "HcalRecHitTask_RecHit_StatusWord_HB");
+    RecHit_StatusWord_HB = ibooker.book1DD(histo, histo, 32, -0.5, 31.5);
+
+    sprintf(histo, "HcalRecHitTask_RecHit_StatusWord_HE");
+    RecHit_StatusWord_HE = ibooker.book1DD(histo, histo, 32, -0.5, 31.5);
+
+    sprintf(histo, "HcalRecHitTask_RecHit_StatusWord_HF");
+    RecHit_StatusWord_HF = ibooker.book1DD(histo, histo, 32, -0.5, 31.5);
+
+    sprintf(histo, "HcalRecHitTask_RecHit_StatusWord_HO");
+    RecHit_StatusWord_HO = ibooker.book1DD(histo, histo, 32, -0.5, 31.5);
+
+    // Aux status word histos
+    sprintf(histo, "HcalRecHitTask_RecHit_Aux_StatusWord_HB");
+    RecHit_Aux_StatusWord_HB = ibooker.book1DD(histo, histo, 32, -0.5, 31.5);
+
+    sprintf(histo, "HcalRecHitTask_RecHit_Aux_StatusWord_HE");
+    RecHit_Aux_StatusWord_HE = ibooker.book1DD(histo, histo, 32, -0.5, 31.5);
+
+    sprintf(histo, "HcalRecHitTask_RecHit_Aux_StatusWord_HF");
+    RecHit_Aux_StatusWord_HF = ibooker.book1DD(histo, histo, 32, -0.5, 31.5);
+
+    sprintf(histo, "HcalRecHitTask_RecHit_Aux_StatusWord_HO");
+    RecHit_Aux_StatusWord_HO = ibooker.book1DD(histo, histo, 32, -0.5, 31.5);
+
+  }  // end-of (subdet_ =! 6)
+
+  // Status word correlations
+  sprintf(histo, "HcalRecHitTask_RecHit_StatusWordCorr_HB");
+  RecHit_StatusWordCorr_HB = ibooker.book2D(histo, histo, 2, -0.5, 1.5, 2, -0.5, 1.5);
+
+  sprintf(histo, "HcalRecHitTask_RecHit_StatusWordCorr_HE");
+  RecHit_StatusWordCorr_HE = ibooker.book2D(histo, histo, 2, -0.5, 1.5, 2, -0.5, 1.5);
+
+  //======================= Now various cases one by one ===================
+
+  // Histograms drawn for single pion scan
+  if (subdet_ != 0 && imc != 0) {  // just not for noise
+    sprintf(histo, "HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths");
+    meEnConeEtaProfile = ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -100., 2000., " ");
+
+    sprintf(histo, "HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths_E");
+    meEnConeEtaProfile_E = ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -100., 2000., " ");
+
+    sprintf(histo, "HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths_EH");
+    meEnConeEtaProfile_EH = ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -100., 2000., " ");
+  }
+
+  // ************** HB **********************************
+  if (subdet_ == 1 || subdet_ == 5) {
+    // Only severity level, energy of rechits and overall HB timing histos are
+    // drawn
+
+    sprintf(histo, "HcalRecHitTask_severityLevel_HB");
+    sevLvl_HB = ibooker.book1DD(histo, histo, 25, -0.5, 24.5);
+
+    sprintf(histo, "HcalRecHitTask_energy_of_rechits_HB");
+    meRecHitsEnergyHB = ibooker.book1DD(histo, histo, 2010, -10., 2000.);
+
+    sprintf(histo, "HcalRecHitTask_energy_of_rechits_M0_HB");
+    meRecHitsEnergyHBM0 = ibooker.book1DD(histo, histo, 2010, -10., 2000.);
+
+    sprintf(histo, "HcalRecHitTask_energy_of_rechits_M3_HB");
+    meRecHitsEnergyHBM3 = ibooker.book1DD(histo, histo, 2010, -10., 2000.);
+
+    sprintf(histo, "HcalRecHitTask_energy_of_rechits_M2vM0_HB");
+    meRecHitsEnergyM2vM0HB = ibooker.book2D(histo, histo, 42, -10., 200., 42, -10., 200.);
+
+    sprintf(histo, "HcalRecHitTask_energy_of_rechits_M3vM0_HB");
+    meRecHitsEnergyM3vM0HB = ibooker.book2D(histo, histo, 42, -10., 200., 42, -10., 200.);
+
+    sprintf(histo, "HcalRecHitTask_energy_of_rechits_M3vM2_HB");
+    meRecHitsEnergyM3vM2HB = ibooker.book2D(histo, histo, 42, -10., 200., 42, -10., 200.);
+
+    sprintf(histo, "HcalRecHitTask_M2Log10Chi2_of_rechits_HB");
+    meRecHitsM2Chi2HB = ibooker.book1D(histo, histo, 120, -2., 10.);
+
+    sprintf(histo, "HcalRecHitTask_timing_HB");
+    meTimeHB = ibooker.book1DD(histo, histo, 70, -48., 92.);
+
+    // High, medium and low histograms to reduce RAM usage
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_Low_HB");
+    meTE_Low_HB = ibooker.book2D(histo, histo, 50, -5., 45., 70, -48., 92.);
+
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_HB");
+    meTE_HB = ibooker.book2D(histo, histo, 150, -5., 295., 70, -48., 92.);
+
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_High_HB");
+    meTE_High_HB = ibooker.book2D(histo, histo, 150, -5., 2995., 70, -48., 92.);
+
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_profile_Low_HB");
+    meTEprofileHB_Low = ibooker.bookProfile(histo, histo, 50, -5., 45., -48., 92., " ");
+
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_profile_HB");
+    meTEprofileHB = ibooker.bookProfile(histo, histo, 150, -5., 295., -48., 92., " ");
 
+    sprintf(histo, "HcalRecHitTask_Log10Chi2_vs_energy_profile_HB");
+    meLog10Chi2profileHB = ibooker.bookProfile(histo, histo, 150, -5., 295., -2., 9.9, " ");
+
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_profile_High_HB");
+    meTEprofileHB_High = ibooker.bookProfile(histo, histo, 150, -5., 2995., -48., 92., " ");
+  }
+
+  // ********************** HE ************************************
+  if (subdet_ == 2 || subdet_ == 5) {
+    // Only severity level, energy of rechits and overall HB timing histos are
+    // drawn
+    sprintf(histo, "HcalRecHitTask_severityLevel_HE");
+    sevLvl_HE = ibooker.book1DD(histo, histo, 25, -0.5, 24.5);
+
+    sprintf(histo, "HcalRecHitTask_energy_of_rechits_HE");
+    meRecHitsEnergyHE = ibooker.book1DD(histo, histo, 2010, -10., 2000.);
+
+    sprintf(histo, "HcalRecHitTask_energy_of_rechits_M0_HE");
+    meRecHitsEnergyHEM0 = ibooker.book1DD(histo, histo, 2010, -10., 2000.);
+
+    sprintf(histo, "HcalRecHitTask_energy_of_rechits_M3_HE");
+    meRecHitsEnergyHEM3 = ibooker.book1DD(histo, histo, 2010, -10., 2000.);
+
+    if (hep17_) {
+      sprintf(histo, "HcalRecHitTask_energy_of_rechits_HEP17");
+      meRecHitsEnergyHEP17.push_back(ibooker.book1D(histo, histo, 2010, -10., 2000.));
+
+      sprintf(histo, "HcalRecHitTask_energy_of_rechits_M0_HEP17");
+      meRecHitsEnergyHEP17M0.push_back(ibooker.book1D(histo, histo, 2010, -10., 2000.));
+
+      sprintf(histo, "HcalRecHitTask_energy_of_rechits_M3_HEP17");
+      meRecHitsEnergyHEP17M3.push_back(ibooker.book1D(histo, histo, 2010, -10., 2000.));
       for (int depth = 1; depth <= maxDepthHE_; depth++) {
-         sprintf  (histo, "occupancy_vs_ieta_HE%d",depth );
-         occupancy_vs_ieta_HE.push_back( ibooker.book1D(histo, histo, ieta_bins_, ieta_min_, ieta_max_) );
-         sprintf  (histo, "nrechits_vs_iphi_HEP_d%d",depth );
-         nrechits_vs_iphi_HEP.push_back( ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_) );
-         sprintf  (histo, "nrechits_vs_iphi_HEM_d%d",depth );
-         nrechits_vs_iphi_HEM.push_back( ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_) );
-      }
+        sprintf(histo, "HcalRecHitTask_energy_of_rechits_HEP17_depth%d", depth);
+        meRecHitsEnergyHEP17.push_back(ibooker.book1D(histo, histo, 2010, -10., 2000.));
 
-      sprintf  (histo, "occupancy_vs_ieta_HO" );
-      occupancy_vs_ieta_HO = ibooker.book1D(histo, histo, ieta_bins_, ieta_min_, ieta_max_);
-      sprintf  (histo, "nrechits_vs_iphi_HOP" );
-      nrechits_vs_iphi_HOP = ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_);
-      sprintf  (histo, "nrechits_vs_iphi_HOM" );
-      nrechits_vs_iphi_HOM = ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_);
-
-      for (int depth = 1; depth <= maxDepthHF_; depth++) {
-         sprintf  (histo, "occupancy_vs_ieta_HF%d",depth );
-         occupancy_vs_ieta_HF.push_back( ibooker.book1D(histo, histo, ieta_bins_, ieta_min_, ieta_max_) );
-         sprintf  (histo, "nrechits_vs_iphi_HFP_d%d",depth );
-         nrechits_vs_iphi_HFP.push_back( ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_) );
-         sprintf  (histo, "nrechits_vs_iphi_HFM_d%d",depth );
-         nrechits_vs_iphi_HFM.push_back( ibooker.book1D(histo, histo, iphi_bins_, iphi_min_, iphi_max_) );
+        sprintf(histo, "HcalRecHitTask_energy_of_rechits_M0_HEP17_depth%d", depth);
+        meRecHitsEnergyHEP17M0.push_back(ibooker.book1D(histo, histo, 2010, -10., 2000.));
+
+        sprintf(histo, "HcalRecHitTask_energy_of_rechits_M3_HEP17_depth%d", depth);
+        meRecHitsEnergyHEP17M3.push_back(ibooker.book1D(histo, histo, 2010, -10., 2000.));
       }
+    }
 
-      //All status word histos except HF67 are drawn
-      sprintf (histo, "HcalRecHitTask_RecHit_StatusWord_HB" ) ;
-      RecHit_StatusWord_HB = ibooker.book1DD(histo, histo, 32 , -0.5, 31.5); 
-      
-      sprintf (histo, "HcalRecHitTask_RecHit_StatusWord_HE" ) ;
-      RecHit_StatusWord_HE = ibooker.book1DD(histo, histo, 32 , -0.5, 31.5); 
+    sprintf(histo, "HcalRecHitTask_energy_of_rechits_M2vM0_HE");
+    meRecHitsEnergyM2vM0HE = ibooker.book2D(histo, histo, 42, -10., 200., 42, -10., 200.);
 
-      sprintf (histo, "HcalRecHitTask_RecHit_StatusWord_HF" ) ;
-      RecHit_StatusWord_HF = ibooker.book1DD(histo, histo, 32 , -0.5, 31.5); 
+    sprintf(histo, "HcalRecHitTask_energy_of_rechits_M3vM0_HE");
+    meRecHitsEnergyM3vM0HE = ibooker.book2D(histo, histo, 42, -10., 200., 42, -10., 200.);
 
-      sprintf (histo, "HcalRecHitTask_RecHit_StatusWord_HO" ) ;
-      RecHit_StatusWord_HO = ibooker.book1DD(histo, histo, 32 , -0.5, 31.5); 
+    sprintf(histo, "HcalRecHitTask_energy_of_rechits_M3vM2_HE");
+    meRecHitsEnergyM3vM2HE = ibooker.book2D(histo, histo, 42, -10., 200., 42, -10., 200.);
 
-      //Aux status word histos
-      sprintf (histo, "HcalRecHitTask_RecHit_Aux_StatusWord_HB" ) ;
-      RecHit_Aux_StatusWord_HB = ibooker.book1DD(histo, histo, 32 , -0.5, 31.5); 
-      
-      sprintf (histo, "HcalRecHitTask_RecHit_Aux_StatusWord_HE" ) ;
-      RecHit_Aux_StatusWord_HE = ibooker.book1DD(histo, histo, 32 , -0.5, 31.5); 
+    sprintf(histo, "HcalRecHitTask_M2Log10Chi2_of_rechits_HE");
+    meRecHitsM2Chi2HE = ibooker.book1D(histo, histo, 120, -2., 10.);
 
-      sprintf (histo, "HcalRecHitTask_RecHit_Aux_StatusWord_HF" ) ;
-      RecHit_Aux_StatusWord_HF = ibooker.book1DD(histo, histo, 32 , -0.5, 31.5); 
+    sprintf(histo, "HcalRecHitTask_timing_HE");
+    meTimeHE = ibooker.book1DD(histo, histo, 70, -48., 92.);
 
-      sprintf (histo, "HcalRecHitTask_RecHit_Aux_StatusWord_HO" ) ;
-      RecHit_Aux_StatusWord_HO = ibooker.book1DD(histo, histo, 32 , -0.5, 31.5); 
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_Low_HE");
+    meTE_Low_HE = ibooker.book2D(histo, histo, 80, -5., 75., 70, -48., 92.);
 
-    }  // end-of (subdet_ =! 6)
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_HE");
+    meTE_HE = ibooker.book2D(histo, histo, 200, -5., 395., 70, -48., 92.);
 
-      //Status word correlations
-      sprintf (histo, "HcalRecHitTask_RecHit_StatusWordCorr_HB");
-      RecHit_StatusWordCorr_HB = ibooker.book2D(histo, histo, 2, -0.5, 1.5, 2, -0.5, 1.5);
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_profile_Low_HE");
+    meTEprofileHE_Low = ibooker.bookProfile(histo, histo, 80, -5., 75., -48., 92., " ");
 
-      sprintf (histo, "HcalRecHitTask_RecHit_StatusWordCorr_HE");
-      RecHit_StatusWordCorr_HE = ibooker.book2D(histo, histo, 2, -0.5, 1.5, 2, -0.5, 1.5);
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_profile_HE");
+    meTEprofileHE = ibooker.bookProfile(histo, histo, 200, -5., 395., -48., 92., " ");
 
+    sprintf(histo, "HcalRecHitTask_Log10Chi2_vs_energy_profile_HE");
+    meLog10Chi2profileHE = ibooker.bookProfile(histo, histo, 200, -5., 395., -2., 9.9, " ");
+  }
 
-    //======================= Now various cases one by one ===================
+  // ************** HO ****************************************
+  if (subdet_ == 3 || subdet_ == 5) {
+    // Only severity level, energy of rechits and overall HB timing histos are
+    // drawn
 
-    //Histograms drawn for single pion scan
-    if(subdet_ != 0 && imc != 0) { // just not for noise  
-      sprintf (histo, "HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths");
-      meEnConeEtaProfile = ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -100., 2000., " ");  
-      
-      sprintf (histo, "HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths_E");
-      meEnConeEtaProfile_E = ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -100., 2000., " ");  
-      
-      sprintf (histo, "HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths_EH");
-      meEnConeEtaProfile_EH = ibooker.bookProfile(histo, histo, ieta_bins_, ieta_min_, ieta_max_, -100., 2000., " ");  
-    }
+    sprintf(histo, "HcalRecHitTask_severityLevel_HO");
+    sevLvl_HO = ibooker.book1DD(histo, histo, 25, -0.5, 24.5);
 
-    // ************** HB **********************************
-    if (subdet_ == 1 || subdet_ == 5 ){
-
-      //Only severity level, energy of rechits and overall HB timing histos are drawn  
-
-      sprintf(histo, "HcalRecHitTask_severityLevel_HB");
-      sevLvl_HB = ibooker.book1DD(histo, histo, 25, -0.5, 24.5); 
-
-      sprintf (histo, "HcalRecHitTask_energy_of_rechits_HB" ) ;
-      meRecHitsEnergyHB = ibooker.book1DD(histo, histo, 2010 , -10. , 2000.); 
-      
-      sprintf (histo, "HcalRecHitTask_energy_of_rechits_M0_HB" ) ;
-      meRecHitsEnergyHBM0 = ibooker.book1DD(histo, histo, 2010 , -10. , 2000.); 
-      
-      sprintf (histo, "HcalRecHitTask_energy_of_rechits_M3_HB" ) ;
-      meRecHitsEnergyHBM3 = ibooker.book1DD(histo, histo, 2010 , -10. , 2000.); 
-
-      sprintf (histo, "HcalRecHitTask_energy_of_rechits_M2vM0_HB" ) ;
-      meRecHitsEnergyM2vM0HB = ibooker.book2D(histo, histo, 42 , -10. , 200., 42, -10., 200.); 
-      
-      sprintf (histo, "HcalRecHitTask_energy_of_rechits_M3vM0_HB" ) ;
-      meRecHitsEnergyM3vM0HB = ibooker.book2D(histo, histo, 42 , -10. , 200., 42, -10., 200.); 
-      
-      sprintf (histo, "HcalRecHitTask_energy_of_rechits_M3vM2_HB" ) ;
-      meRecHitsEnergyM3vM2HB = ibooker.book2D(histo, histo, 42 , -10. , 200., 42, -10., 200.); 
-      
-      sprintf (histo, "HcalRecHitTask_M2Log10Chi2_of_rechits_HB" ) ;
-      meRecHitsM2Chi2HB = ibooker.book1D(histo, histo, 120 , -2. , 10.); 
-      
-      sprintf (histo, "HcalRecHitTask_timing_HB" ) ;
-      meTimeHB = ibooker.book1DD(histo, histo, 70, -48., 92.); 
-
-      //High, medium and low histograms to reduce RAM usage
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_Low_HB" ) ;
-      meTE_Low_HB = ibooker.book2D(histo, histo, 50, -5., 45.,  70, -48., 92.);
-
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_HB" ) ;
-      meTE_HB = ibooker.book2D(histo, histo, 150, -5., 295.,  70, -48., 92.);
-
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_High_HB" ) ;
-      meTE_High_HB = ibooker.book2D(histo, histo, 150, -5., 2995.,  70, -48., 92.);
-      
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_profile_Low_HB" ) ;
-      meTEprofileHB_Low = ibooker.bookProfile(histo, histo, 50, -5., 45., -48., 92., " "); 
-
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_profile_HB" ) ;
-      meTEprofileHB = ibooker.bookProfile(histo, histo, 150, -5., 295., -48., 92., " "); 
-
-      sprintf (histo, "HcalRecHitTask_Log10Chi2_vs_energy_profile_HB" ) ;
-      meLog10Chi2profileHB = ibooker.bookProfile(histo, histo, 150, -5., 295., -2., 9.9, " "); 
-
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_profile_High_HB" ) ;
-      meTEprofileHB_High = ibooker.bookProfile(histo, histo, 150, -5., 2995., -48., 92., " "); 
+    sprintf(histo, "HcalRecHitTask_energy_of_rechits_HO");
+    meRecHitsEnergyHO = ibooker.book1DD(histo, histo, 2010, -10., 2000.);
 
-    }
-    
-    // ********************** HE ************************************
-    if ( subdet_ == 2 || subdet_ == 5 ){
-
-
-      //Only severity level, energy of rechits and overall HB timing histos are drawn  
-      sprintf(histo, "HcalRecHitTask_severityLevel_HE");
-      sevLvl_HE = ibooker.book1DD(histo, histo, 25, -0.5, 24.5); 
-      
-      sprintf (histo, "HcalRecHitTask_energy_of_rechits_HE" ) ;
-      meRecHitsEnergyHE = ibooker.book1DD(histo, histo, 2010, -10., 2000.);
-      
-      sprintf (histo, "HcalRecHitTask_energy_of_rechits_M0_HE" ) ;
-      meRecHitsEnergyHEM0 = ibooker.book1DD(histo, histo, 2010, -10., 2000.);
-      
-      sprintf (histo, "HcalRecHitTask_energy_of_rechits_M3_HE" ) ;
-      meRecHitsEnergyHEM3 = ibooker.book1DD(histo, histo, 2010, -10., 2000.);
-      
-      if(hep17_){
-         sprintf (histo, "HcalRecHitTask_energy_of_rechits_HEP17" ) ;
-         meRecHitsEnergyHEP17.push_back(ibooker.book1D(histo, histo, 2010 , -10. , 2000.)); 
-      
-         sprintf (histo, "HcalRecHitTask_energy_of_rechits_M0_HEP17" ) ;
-         meRecHitsEnergyHEP17M0.push_back(ibooker.book1D(histo, histo, 2010 , -10. , 2000.)); 
-      
-         sprintf (histo, "HcalRecHitTask_energy_of_rechits_M3_HEP17" ) ;
-         meRecHitsEnergyHEP17M3.push_back(ibooker.book1D(histo, histo, 2010 , -10. , 2000.)); 
-         for (int depth = 1; depth <= maxDepthHE_; depth++) {
-            sprintf (histo, "HcalRecHitTask_energy_of_rechits_HEP17_depth%d",depth ) ;
-            meRecHitsEnergyHEP17.push_back(ibooker.book1D(histo, histo, 2010 , -10. , 2000.)); 
-      
-            sprintf (histo, "HcalRecHitTask_energy_of_rechits_M0_HEP17_depth%d",depth ) ;
-            meRecHitsEnergyHEP17M0.push_back(ibooker.book1D(histo, histo, 2010 , -10. , 2000.)); 
-      
-            sprintf (histo, "HcalRecHitTask_energy_of_rechits_M3_HEP17_depth%d",depth ) ;
-            meRecHitsEnergyHEP17M3.push_back(ibooker.book1D(histo, histo, 2010 , -10. , 2000.)); 
-         }
-      }
+    sprintf(histo, "HcalRecHitTask_timing_HO");
+    meTimeHO = ibooker.book1DD(histo, histo, 70, -48., 92.);
 
-      sprintf (histo, "HcalRecHitTask_energy_of_rechits_M2vM0_HE" ) ;
-      meRecHitsEnergyM2vM0HE = ibooker.book2D(histo, histo, 42 , -10. , 200., 42, -10., 200.); 
-      
-      sprintf (histo, "HcalRecHitTask_energy_of_rechits_M3vM0_HE" ) ;
-      meRecHitsEnergyM3vM0HE = ibooker.book2D(histo, histo, 42 , -10. , 200., 42, -10., 200.); 
-      
-      sprintf (histo, "HcalRecHitTask_energy_of_rechits_M3vM2_HE" ) ;
-      meRecHitsEnergyM3vM2HE = ibooker.book2D(histo, histo, 42 , -10. , 200., 42, -10., 200.); 
-      
-      sprintf (histo, "HcalRecHitTask_M2Log10Chi2_of_rechits_HE" ) ;
-      meRecHitsM2Chi2HE = ibooker.book1D(histo, histo, 120 , -2. , 10.); 
-      
-      sprintf (histo, "HcalRecHitTask_timing_HE" ) ;
-      meTimeHE = ibooker.book1DD(histo, histo, 70, -48., 92.); 
-      
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_Low_HE" ) ;
-      meTE_Low_HE = ibooker.book2D(histo, histo, 80, -5., 75.,  70, -48., 92.);
-
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_HE" ) ;
-      meTE_HE = ibooker.book2D(histo, histo, 200, -5., 395.,  70, -48., 92.);
-      
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_profile_Low_HE" ) ;
-      meTEprofileHE_Low = ibooker.bookProfile(histo, histo, 80, -5., 75., -48., 92., " "); 
-
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_profile_HE" ) ;
-      meTEprofileHE = ibooker.bookProfile(histo, histo, 200, -5., 395., -48., 92., " "); 
-      
-      sprintf (histo, "HcalRecHitTask_Log10Chi2_vs_energy_profile_HE" ) ;
-      meLog10Chi2profileHE = ibooker.bookProfile(histo, histo, 200, -5., 395., -2., 9.9, " ");       
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_HO");
+    meTE_HO = ibooker.book2D(histo, histo, 60, -5., 55., 70, -48., 92.);
 
-    }
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_High_HO");
+    meTE_High_HO = ibooker.book2D(histo, histo, 100, -5., 995., 70, -48., 92.);
 
-    // ************** HO ****************************************
-    if ( subdet_ == 3 || subdet_ == 5  ){
-      
-      //Only severity level, energy of rechits and overall HB timing histos are drawn  
-
-      sprintf(histo, "HcalRecHitTask_severityLevel_HO");
-      sevLvl_HO = ibooker.book1DD(histo, histo, 25, -0.5, 24.5); 
-
-      sprintf (histo, "HcalRecHitTask_energy_of_rechits_HO" ) ;
-      meRecHitsEnergyHO = ibooker.book1DD(histo, histo, 2010 , -10. , 2000.);
-      
-      sprintf (histo, "HcalRecHitTask_timing_HO" ) ;
-      meTimeHO = ibooker.book1DD(histo, histo, 70, -48., 92.); 
-      
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_HO" ) ;
-      meTE_HO= ibooker.book2D(histo, histo, 60, -5., 55., 70, -48., 92.);
-
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_High_HO" ) ;
-      meTE_High_HO= ibooker.book2D(histo, histo, 100, -5., 995., 70, -48., 92.);
-      
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_profile_HO" ) ;
-      meTEprofileHO = ibooker.bookProfile(histo, histo, 60, -5., 55., -48., 92., " "); 
-
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_profile_High_HO" ) ;
-      meTEprofileHO_High = ibooker.bookProfile(histo, histo, 100, -5., 995., -48., 92., " "); 
-      
-    }   
-  
-    // ********************** HF ************************************
-    if ( subdet_ == 4 || subdet_ == 5 ){
-
-      //Only severity level, energy of rechits and overall HB timing histos are drawn  
-      
-      sprintf(histo, "HcalRecHitTask_severityLevel_HF");
-      sevLvl_HF = ibooker.book1DD(histo, histo, 25, -0.5, 24.5); 
-
-      sprintf (histo, "HcalRecHitTask_energy_of_rechits_HF" ) ;
-      meRecHitsEnergyHF = ibooker.book1DD(histo, histo, 2010 , -10. , 2000.); 
-
-      sprintf (histo, "HcalRecHitTask_timing_HF" ) ;
-      meTimeHF = ibooker.book1DD(histo, histo, 70, -48., 92.); 
-      
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_Low_HF" ) ;
-      meTE_Low_HF = ibooker.book2D(histo, histo, 100, -5., 195., 70, -48., 92.);
-
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_HF" ) ;
-      meTE_HF = ibooker.book2D(histo, histo, 200, -5., 995., 70, -48., 92.);
-      
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_profile_Low_HF" ) ;
-      meTEprofileHF_Low = ibooker.bookProfile(histo, histo, 100, -5., 195., -48., 92., " "); 
-
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_profile_HF" ) ;
-      meTEprofileHF = ibooker.bookProfile(histo, histo, 200, -5., 995., -48., 92., " "); 
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_profile_HO");
+    meTEprofileHO = ibooker.bookProfile(histo, histo, 60, -5., 55., -48., 92., " ");
 
-    }
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_profile_High_HO");
+    meTEprofileHO_High = ibooker.bookProfile(histo, histo, 100, -5., 995., -48., 92., " ");
+  }
 
-}
+  // ********************** HF ************************************
+  if (subdet_ == 4 || subdet_ == 5) {
+    // Only severity level, energy of rechits and overall HB timing histos are
+    // drawn
+
+    sprintf(histo, "HcalRecHitTask_severityLevel_HF");
+    sevLvl_HF = ibooker.book1DD(histo, histo, 25, -0.5, 24.5);
+
+    sprintf(histo, "HcalRecHitTask_energy_of_rechits_HF");
+    meRecHitsEnergyHF = ibooker.book1DD(histo, histo, 2010, -10., 2000.);
+
+    sprintf(histo, "HcalRecHitTask_timing_HF");
+    meTimeHF = ibooker.book1DD(histo, histo, 70, -48., 92.);
+
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_Low_HF");
+    meTE_Low_HF = ibooker.book2D(histo, histo, 100, -5., 195., 70, -48., 92.);
 
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_HF");
+    meTE_HF = ibooker.book2D(histo, histo, 200, -5., 995., 70, -48., 92.);
 
-void HcalRecHitsAnalyzer::analyze(edm::Event const& ev, edm::EventSetup const& c) {
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_profile_Low_HF");
+    meTEprofileHF_Low = ibooker.bookProfile(histo, histo, 100, -5., 195., -48., 92., " ");
 
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_profile_HF");
+    meTEprofileHF = ibooker.bookProfile(histo, histo, 200, -5., 995., -48., 92., " ");
+  }
+}
+
+void HcalRecHitsAnalyzer::analyze(edm::Event const &ev, edm::EventSetup const &c) {
   using namespace edm;
 
   // cuts for each subdet_ector mimiking  "Scheme B"
-  //  double cutHB = 0.9, cutHE = 1.4, cutHO = 1.1, cutHFL = 1.2, cutHFS = 1.8; 
+  //  double cutHB = 0.9, cutHE = 1.4, cutHO = 1.1, cutHFL = 1.2, cutHFS = 1.8;
 
   // energy in HCAL
-  double eHcal        = 0.;
+  double eHcal = 0.;
   // Total numbet of RecHits in HCAL, in the cone, above 1 GeV theshold
-  int nrechits       = 0;
+  int nrechits = 0;
   int nrechitsThresh = 0;
 
   // energy in ECAL
-  double eEcal       = 0.;
-  double eEcalB      = 0.;
-  double eEcalE      = 0.;
-  double eEcalCone   = 0.;
+  double eEcal = 0.;
+  double eEcalB = 0.;
+  double eEcalE = 0.;
+  double eEcalCone = 0.;
 
   // HCAL energy around MC eta-phi at all depths;
   double partR = 0.3;
 
   // Single particle samples: actual eta-phi position of cluster around
   // hottest cell
-  double etaHot  = 99999.; 
-  double phiHot  = 99999.; 
+  double etaHot = 99999.;
+  double phiHot = 99999.;
 
   //   previously was:  c.get<IdealGeometryRecord>().get (geometry);
-  c.get<CaloGeometryRecord>().get (geometry);
+  c.get<CaloGeometryRecord>().get(geometry);
 
   // HCAL Topology **************************************************
   edm::ESHandle<HcalTopology> topo;
@@ -541,243 +566,276 @@ void HcalRecHitsAnalyzer::analyze(edm::Event const& ev, edm::EventSetup const& c
 
   // HCAL channel status map ****************************************
   edm::ESHandle<HcalChannelQuality> hcalChStatus;
-  c.get<HcalChannelQualityRcd>().get( "withTopo", hcalChStatus );
+  c.get<HcalChannelQualityRcd>().get("withTopo", hcalChStatus);
   theHcalChStatus = hcalChStatus.product();
 
   // Assignment of severity levels **********************************
   edm::ESHandle<HcalSeverityLevelComputer> hcalSevLvlComputerHndl;
   c.get<HcalSeverityLevelComputerRcd>().get(hcalSevLvlComputerHndl);
-  theHcalSevLvlComputer = hcalSevLvlComputerHndl.product(); 
+  theHcalSevLvlComputer = hcalSevLvlComputerHndl.product();
 
   // Fill working vectors of HCAL RecHits quantities (all of these are drawn)
-  fillRecHitsTmp(subdet_, ev); 
+  fillRecHitsTmp(subdet_, ev);
 
-  // HB   
-  if( subdet_ ==5 || subdet_ == 1 ){ 
-     for(unsigned int iv=0; iv<hcalHBSevLvlVec.size(); iv++){
-        sevLvl_HB->Fill(hcalHBSevLvlVec[iv]);
-     }    
+  // HB
+  if (subdet_ == 5 || subdet_ == 1) {
+    for (unsigned int iv = 0; iv < hcalHBSevLvlVec.size(); iv++) {
+      sevLvl_HB->Fill(hcalHBSevLvlVec[iv]);
+    }
   }
-  // HE   
-  if( subdet_ ==5 || subdet_ == 2 ){
-     for(unsigned int iv=0; iv<hcalHESevLvlVec.size(); iv++){
-        sevLvl_HE->Fill(hcalHESevLvlVec[iv]);
-     }
+  // HE
+  if (subdet_ == 5 || subdet_ == 2) {
+    for (unsigned int iv = 0; iv < hcalHESevLvlVec.size(); iv++) {
+      sevLvl_HE->Fill(hcalHESevLvlVec[iv]);
+    }
   }
-  // HO 
-  if( subdet_ ==5 || subdet_ == 3 ){
-     for(unsigned int iv=0; iv<hcalHOSevLvlVec.size(); iv++){
-        sevLvl_HO->Fill(hcalHOSevLvlVec[iv]);
-     }
+  // HO
+  if (subdet_ == 5 || subdet_ == 3) {
+    for (unsigned int iv = 0; iv < hcalHOSevLvlVec.size(); iv++) {
+      sevLvl_HO->Fill(hcalHOSevLvlVec[iv]);
+    }
+  }
+  // HF
+  if (subdet_ == 5 || subdet_ == 4) {
+    for (unsigned int iv = 0; iv < hcalHFSevLvlVec.size(); iv++) {
+      sevLvl_HF->Fill(hcalHFSevLvlVec[iv]);
+    }
   }
-  // HF 
-  if( subdet_ ==5 || subdet_ == 4 ){
-     for(unsigned int iv=0; iv<hcalHFSevLvlVec.size(); iv++){
-        sevLvl_HF->Fill(hcalHFSevLvlVec[iv]);
-     }
-  } 
 
   //===========================================================================
-  // IN ALL other CASES : ieta-iphi maps 
+  // IN ALL other CASES : ieta-iphi maps
   //===========================================================================
 
-  // ECAL 
-  if(ecalselector_ == "yes" && (subdet_ == 1 || subdet_ == 2 || subdet_ == 5)) {
-
+  // ECAL
+  if (ecalselector_ == "yes" && (subdet_ == 1 || subdet_ == 2 || subdet_ == 5)) {
     Handle<EBRecHitCollection> rhitEB;
-    if ( ev.getByToken(tok_EB_, rhitEB) ) {
-      
-      for ( const auto & recHit : *(rhitEB.product()) ) {
-	
-	double en  = recHit.energy();
-	eEcal  += en;
-	eEcalB += en;
-      }      
+    if (ev.getByToken(tok_EB_, rhitEB)) {
+      for (const auto &recHit : *(rhitEB.product())) {
+        double en = recHit.energy();
+        eEcal += en;
+        eEcalB += en;
+      }
     }
-  
-    
+
     Handle<EERecHitCollection> rhitEE;
-    if ( ev.getByToken(tok_EE_, rhitEE) ) {
-    
-      for ( const auto & recHit : *(rhitEE.product()) ) {
-	
-	double en   = recHit.energy();
-	eEcal  += en;
-	eEcalE += en;
-	
+    if (ev.getByToken(tok_EE_, rhitEE)) {
+      for (const auto &recHit : *(rhitEE.product())) {
+        double en = recHit.energy();
+        eEcal += en;
+        eEcalE += en;
       }
     }
-  }     // end of ECAL selection 
+  }  // end of ECAL selection
 
   // Counting, including ZS items
   // Filling HCAL maps  ----------------------------------------------------
   //   double maxE = -99999.;
-  
+
   // element 0: any depth. element 1,2,..: depth 1,2
-  std::vector<int> nhb_v(maxDepthHB_+1,0);
-  std::vector<int> nhe_v(maxDepthHE_+1,0);
-  std::vector<int> nho_v(maxDepthHO_+1,0);
-  std::vector<int> nhf_v(maxDepthHF_+1,0);
+  std::vector<int> nhb_v(maxDepthHB_ + 1, 0);
+  std::vector<int> nhe_v(maxDepthHE_ + 1, 0);
+  std::vector<int> nho_v(maxDepthHO_ + 1, 0);
+  std::vector<int> nhf_v(maxDepthHF_ + 1, 0);
 
   for (unsigned int i = 0; i < cen.size(); i++) {
-    
-    int sub       = csub[i];
-    int depth     = cdepth[i];
-    int ieta      = cieta[i]; 
-    int iphi      = ciphi[i]; 
-    double en     = cen[i]; 
-    double enM0   = cenM0[i];
-    double enM3   = cenM3[i];
-    //     double eta    = ceta[i]; 
-    //     double phi    = cphi[i]; 
+    int sub = csub[i];
+    int depth = cdepth[i];
+    int ieta = cieta[i];
+    int iphi = ciphi[i];
+    double en = cen[i];
+    double enM0 = cenM0[i];
+    double enM3 = cenM3[i];
+    //     double eta    = ceta[i];
+    //     double phi    = cphi[i];
     uint32_t stwd = cstwd[i];
     uint32_t auxstwd = cauxstwd[i];
     //    double z   = cz[i];
 
-    //This will be true if hep17 == "yes" and the rechit is in the hep17 wedge
+    // This will be true if hep17 == "yes" and the rechit is in the hep17 wedge
     bool isHEP17 = (sub == 2) && (iphi >= 63) && (iphi <= 66) && (ieta > 0) && (hep17_);
 
-    //Make sure that an invalid depth won't cause an error. We should probably report the problem as well.
-    if( depth < 1 ) continue;
-    if( sub == 1 && depth > maxDepthHB_ ) continue;
-    if( sub == 2 && depth > maxDepthHE_ ) continue;
-    if( sub == 3 && depth > maxDepthHO_ ) continue;
-    if( sub == 4 && depth > maxDepthHF_ ) continue;
-
-    if( sub ==1 ){ nhb_v[depth]++; nhb_v[0]++;} // element 0: any depth, element 1,2,..: depth 1,2,...
-    if( sub ==2 ){ nhe_v[depth]++; nhe_v[0]++;} //
-    if( sub ==3 ){ nho_v[depth]++; nho_v[0]++;} //
-    if( sub ==4 ){ nhf_v[depth]++; nhf_v[0]++;} //
-
-    if( subdet_ == 6) {                                    // ZS specific
+    // Make sure that an invalid depth won't cause an error. We should probably
+    // report the problem as well.
+    if (depth < 1)
+      continue;
+    if (sub == 1 && depth > maxDepthHB_)
+      continue;
+    if (sub == 2 && depth > maxDepthHE_)
+      continue;
+    if (sub == 3 && depth > maxDepthHO_)
+      continue;
+    if (sub == 4 && depth > maxDepthHF_)
+      continue;
+
+    if (sub == 1) {
+      nhb_v[depth]++;
+      nhb_v[0]++;
+    }  // element 0: any depth, element 1,2,..: depth 1,2,...
+    if (sub == 2) {
+      nhe_v[depth]++;
+      nhe_v[0]++;
+    }  //
+    if (sub == 3) {
+      nho_v[depth]++;
+      nho_v[0]++;
+    }  //
+    if (sub == 4) {
+      nhf_v[depth]++;
+      nhf_v[0]++;
+    }  //
+
+    if (subdet_ == 6) {  // ZS specific
     }
 
-    if( subdet_ != 6) {  
+    if (subdet_ != 6) {
       int ieta2 = ieta;
       int depth2 = depth;
-      if(sub == 4){
-	if (ieta2 < 0) ieta2--;
-        else ieta2++;
+      if (sub == 4) {
+        if (ieta2 < 0)
+          ieta2--;
+        else
+          ieta2++;
       }
-      if(sub == 3) emap_HO->Fill(double(ieta2),double(iphi),en); //HO	
-      else emap[depth2-1]->Fill(double(ieta2),double(iphi),en); // HB+HE+HF
+      if (sub == 3)
+        emap_HO->Fill(double(ieta2), double(iphi), en);  // HO
+      else
+        emap[depth2 - 1]->Fill(double(ieta2), double(iphi), en);  // HB+HE+HF
 
       // to distinguish HE and HF
-      if( depth == 1 || depth == 2 ) {
-        int ieta1 =  ieta;
-	if(sub == 4) { 
-	  if (ieta1 < 0) ieta1--;
-          else  ieta1++;   
-	}
+      if (depth == 1 || depth == 2) {
+        int ieta1 = ieta;
+        if (sub == 4) {
+          if (ieta1 < 0)
+            ieta1--;
+          else
+            ieta1++;
+        }
       }
 
-      if ( sub == 1){
-	 emean_vs_ieta_HB[depth-1]->Fill(double(ieta), en);
-	 emean_vs_ieta_HBM0[depth-1]->Fill(double(ieta), enM0);
-	 emean_vs_ieta_HBM3[depth-1]->Fill(double(ieta), enM3);
-	 occupancy_map_HB[depth-1]->Fill(double(ieta),double(iphi));
-	 if (ieta>0) nrechits_vs_iphi_HBP[depth-1]->Fill(double(iphi));
-	 else        nrechits_vs_iphi_HBM[depth-1]->Fill(double(iphi));
+      if (sub == 1) {
+        emean_vs_ieta_HB[depth - 1]->Fill(double(ieta), en);
+        emean_vs_ieta_HBM0[depth - 1]->Fill(double(ieta), enM0);
+        emean_vs_ieta_HBM3[depth - 1]->Fill(double(ieta), enM3);
+        occupancy_map_HB[depth - 1]->Fill(double(ieta), double(iphi));
+        if (ieta > 0)
+          nrechits_vs_iphi_HBP[depth - 1]->Fill(double(iphi));
+        else
+          nrechits_vs_iphi_HBM[depth - 1]->Fill(double(iphi));
       }
-      if ( sub == 2){
-	 if(!isHEP17){
-	    emean_vs_ieta_HE[depth-1]->Fill(double(ieta), en);
-	    emean_vs_ieta_HEM0[depth-1]->Fill(double(ieta), enM0);
-	    emean_vs_ieta_HEM3[depth-1]->Fill(double(ieta), enM3);
-         }else{
-	    emean_vs_ieta_HEP17[depth-1]->Fill(double(ieta), en);
-	    emean_vs_ieta_HEP17M0[depth-1]->Fill(double(ieta), enM0);
-	    emean_vs_ieta_HEP17M3[depth-1]->Fill(double(ieta), enM3);
-         }
-	 occupancy_map_HE[depth-1]->Fill(double(ieta),double(iphi));
-	 if (ieta>0) nrechits_vs_iphi_HEP[depth-1]->Fill(double(iphi));
-	 else        nrechits_vs_iphi_HEM[depth-1]->Fill(double(iphi));
+      if (sub == 2) {
+        if (!isHEP17) {
+          emean_vs_ieta_HE[depth - 1]->Fill(double(ieta), en);
+          emean_vs_ieta_HEM0[depth - 1]->Fill(double(ieta), enM0);
+          emean_vs_ieta_HEM3[depth - 1]->Fill(double(ieta), enM3);
+        } else {
+          emean_vs_ieta_HEP17[depth - 1]->Fill(double(ieta), en);
+          emean_vs_ieta_HEP17M0[depth - 1]->Fill(double(ieta), enM0);
+          emean_vs_ieta_HEP17M3[depth - 1]->Fill(double(ieta), enM3);
+        }
+        occupancy_map_HE[depth - 1]->Fill(double(ieta), double(iphi));
+        if (ieta > 0)
+          nrechits_vs_iphi_HEP[depth - 1]->Fill(double(iphi));
+        else
+          nrechits_vs_iphi_HEM[depth - 1]->Fill(double(iphi));
       }
-      if ( sub == 3){
-	 emean_vs_ieta_HO->Fill(double(ieta), en);
-	 occupancy_map_HO->Fill(double(ieta),double(iphi));
-	 if (ieta>0) nrechits_vs_iphi_HOP->Fill(double(iphi));
-	 else        nrechits_vs_iphi_HOM->Fill(double(iphi));
+      if (sub == 3) {
+        emean_vs_ieta_HO->Fill(double(ieta), en);
+        occupancy_map_HO->Fill(double(ieta), double(iphi));
+        if (ieta > 0)
+          nrechits_vs_iphi_HOP->Fill(double(iphi));
+        else
+          nrechits_vs_iphi_HOM->Fill(double(iphi));
       }
-      if ( sub == 4){
-	 emean_vs_ieta_HF[depth-1]->Fill(double(ieta), en);
-	 occupancy_map_HF[depth-1]->Fill(double(ieta),double(iphi));
-	 if (ieta>0) nrechits_vs_iphi_HFP[depth-1]->Fill(double(iphi));
-	 else        nrechits_vs_iphi_HFM[depth-1]->Fill(double(iphi));
+      if (sub == 4) {
+        emean_vs_ieta_HF[depth - 1]->Fill(double(ieta), en);
+        occupancy_map_HF[depth - 1]->Fill(double(ieta), double(iphi));
+        if (ieta > 0)
+          nrechits_vs_iphi_HFP[depth - 1]->Fill(double(iphi));
+        else
+          nrechits_vs_iphi_HFM[depth - 1]->Fill(double(iphi));
       }
     }
 
-
-    
-    //32-bit status word  
+    // 32-bit status word
     uint32_t statadd;
     unsigned int isw67 = 0;
 
-    //Statusword correlation
+    // Statusword correlation
     unsigned int sw27 = 27;
     unsigned int sw13 = 13;
 
-    uint32_t statadd27 = 0x1<<sw27;
-    uint32_t statadd13 = 0x1<<sw13;
+    uint32_t statadd27 = 0x1 << sw27;
+    uint32_t statadd13 = 0x1 << sw13;
 
     float status27 = 0;
     float status13 = 0;
 
-    if(stwd & statadd27) status27 = 1;
-    if(stwd & statadd13) status13 = 1;
+    if (stwd & statadd27)
+      status27 = 1;
+    if (stwd & statadd13)
+      status13 = 1;
 
-    if        (sub == 1){
+    if (sub == 1) {
       RecHit_StatusWordCorr_HB->Fill(status13, status27);
-    } else if (sub == 2){
+    } else if (sub == 2) {
       RecHit_StatusWordCorr_HE->Fill(status13, status27);
     }
 
-
-    for (unsigned int isw = 0; isw < 32; isw++){
-      statadd = 0x1<<(isw);
-      if (stwd & statadd){
-	if      (sub == 1) RecHit_StatusWord_HB->Fill(isw);
-	else if (sub == 2) RecHit_StatusWord_HE->Fill(isw);
-	else if (sub == 3) RecHit_StatusWord_HO->Fill(isw);
-	else if (sub == 4){
-	  RecHit_StatusWord_HF->Fill(isw);
-	  if (isw == 6) isw67 += 1;
-	  if (isw == 7) isw67 += 2;
-	}
+    for (unsigned int isw = 0; isw < 32; isw++) {
+      statadd = 0x1 << (isw);
+      if (stwd & statadd) {
+        if (sub == 1)
+          RecHit_StatusWord_HB->Fill(isw);
+        else if (sub == 2)
+          RecHit_StatusWord_HE->Fill(isw);
+        else if (sub == 3)
+          RecHit_StatusWord_HO->Fill(isw);
+        else if (sub == 4) {
+          RecHit_StatusWord_HF->Fill(isw);
+          if (isw == 6)
+            isw67 += 1;
+          if (isw == 7)
+            isw67 += 2;
+        }
       }
     }
 
-    for (unsigned int isw =0; isw < 32; isw++){
-      statadd = 0x1<<(isw);
-      if( auxstwd & statadd ){
-        if      (sub == 1) RecHit_Aux_StatusWord_HB->Fill(isw);
-        else if (sub == 2) RecHit_Aux_StatusWord_HE->Fill(isw);
-        else if (sub == 3) RecHit_Aux_StatusWord_HO->Fill(isw);
-        else if (sub == 4) RecHit_Aux_StatusWord_HF->Fill(isw);
+    for (unsigned int isw = 0; isw < 32; isw++) {
+      statadd = 0x1 << (isw);
+      if (auxstwd & statadd) {
+        if (sub == 1)
+          RecHit_Aux_StatusWord_HB->Fill(isw);
+        else if (sub == 2)
+          RecHit_Aux_StatusWord_HE->Fill(isw);
+        else if (sub == 3)
+          RecHit_Aux_StatusWord_HO->Fill(isw);
+        else if (sub == 4)
+          RecHit_Aux_StatusWord_HF->Fill(isw);
       }
-
     }
+  }
 
-  } 
-
-    for(int depth = 0; depth <= maxDepthHB_; depth++) Nhb[depth]->Fill(double(nhb_v[depth]));
-    for(int depth = 0; depth <= maxDepthHE_; depth++) Nhe[depth]->Fill(double(nhe_v[depth]));
-    for(int depth = 0; depth <= maxDepthHO_; depth++) Nho[depth]->Fill(double(nho_v[depth]));
-    for(int depth = 0; depth <= maxDepthHF_; depth++) Nhf[depth]->Fill(double(nhf_v[depth]));
+  for (int depth = 0; depth <= maxDepthHB_; depth++)
+    Nhb[depth]->Fill(double(nhb_v[depth]));
+  for (int depth = 0; depth <= maxDepthHE_; depth++)
+    Nhe[depth]->Fill(double(nhe_v[depth]));
+  for (int depth = 0; depth <= maxDepthHO_; depth++)
+    Nho[depth]->Fill(double(nho_v[depth]));
+  for (int depth = 0; depth <= maxDepthHF_; depth++)
+    Nhf[depth]->Fill(double(nhf_v[depth]));
 
   //===========================================================================
-  // SUBSYSTEMS,  
+  // SUBSYSTEMS,
   //===========================================================================
-  
-  if ((subdet_ != 6) && (subdet_ != 0)) {
 
+  if ((subdet_ != 6) && (subdet_ != 0)) {
     double clusEta = 999.;
-    double clusPhi = 999.; 
-    double clusEn  = 0.;
-    
-    double HcalCone    = 0.;
+    double clusPhi = 999.;
+    double clusEn = 0.;
 
-    int ietaMax   =  9999;
+    double HcalCone = 0.;
+
+    int ietaMax = 9999;
     //     double enMax1 = -9999.;
     //     double enMax2 = -9999.;
     //     double enMax3 = -9999.;
@@ -788,128 +846,126 @@ void HcalRecHitsAnalyzer::analyze(edm::Event const& ev, edm::EventSetup const& c
     //   CYCLE over cells ====================================================
 
     for (unsigned int i = 0; i < cen.size(); i++) {
-      int sub    = csub[i];
-      double eta = ceta[i]; 
-      double phi = cphi[i]; 
-      double ieta = cieta[i]; 
-      double iphi = ciphi[i]; 
-      double en  = cen[i]; 
-      double enM0  = cenM0[i]; 
-      double enM3  = cenM3[i]; 
-      double chi2  = cchi2[i];
-      double chi2_log10=9.99; // initial value - stay with this value if chi2<0.
-      if (chi2>0.) chi2_log10=log10(chi2);
-      double t   = ctime[i];
+      int sub = csub[i];
+      double eta = ceta[i];
+      double phi = cphi[i];
+      double ieta = cieta[i];
+      double iphi = ciphi[i];
+      double en = cen[i];
+      double enM0 = cenM0[i];
+      double enM3 = cenM3[i];
+      double chi2 = cchi2[i];
+      double chi2_log10 = 9.99;  // initial value - stay with this value if chi2<0.
+      if (chi2 > 0.)
+        chi2_log10 = log10(chi2);
+      double t = ctime[i];
       double depth = cdepth[i];
 
       bool isHEP17 = (sub == 2) && (iphi >= 63) && (iphi <= 66) && (ieta > 0) && (hep17_);
 
-//       int   ieta = cieta[i];
+      //       int   ieta = cieta[i];
 
-      double rhot = dR(etaHot, phiHot, eta, phi); 
-      if(rhot < partR && en > 1.) { 
-	clusEta = (clusEta * clusEn + eta * en)/(clusEn + en);
-    	clusPhi = phi12(clusPhi, clusEn, phi, en); 
+      double rhot = dR(etaHot, phiHot, eta, phi);
+      if (rhot < partR && en > 1.) {
+        clusEta = (clusEta * clusEn + eta * en) / (clusEn + en);
+        clusPhi = phi12(clusPhi, clusEn, phi, en);
         clusEn += en;
       }
 
-      nrechits++;	    
+      nrechits++;
       eHcal += en;
 
-      if(en > 1. ) nrechitsThresh++;
-      
-      //The energy and overall timing histos are drawn while
-      //the ones split by depth are not
-      if(sub == 1 && (subdet_ == 1 || subdet_ == 5)) {  
-	meTimeHB->Fill(t);
-	meRecHitsEnergyHB->Fill(en);
-	meRecHitsEnergyHBM0->Fill(enM0);
-	meRecHitsEnergyHBM3->Fill(enM3);
+      if (en > 1.)
+        nrechitsThresh++;
+
+      // The energy and overall timing histos are drawn while
+      // the ones split by depth are not
+      if (sub == 1 && (subdet_ == 1 || subdet_ == 5)) {
+        meTimeHB->Fill(t);
+        meRecHitsEnergyHB->Fill(en);
+        meRecHitsEnergyHBM0->Fill(enM0);
+        meRecHitsEnergyHBM3->Fill(enM3);
 
-        meRecHitsEnergyM2vM0HB->Fill(enM0,en);
-        meRecHitsEnergyM3vM0HB->Fill(enM0,enM3);
-        meRecHitsEnergyM3vM2HB->Fill(en,enM3);
+        meRecHitsEnergyM2vM0HB->Fill(enM0, en);
+        meRecHitsEnergyM3vM0HB->Fill(enM0, enM3);
+        meRecHitsEnergyM3vM2HB->Fill(en, enM3);
 
         meRecHitsM2Chi2HB->Fill(chi2_log10);
-        meLog10Chi2profileHB->Fill(en,chi2_log10);
-	
-	meTE_Low_HB->Fill( en, t);
-	meTE_HB->Fill( en, t);
-	meTE_High_HB->Fill( en, t);
-	meTEprofileHB_Low->Fill(en, t);
-	meTEprofileHB->Fill(en, t);
-	meTEprofileHB_High->Fill(en, t);
-      }     
-      if(sub == 2 && (subdet_ == 2 || subdet_ == 5)) {  
-	meTimeHE->Fill(t);
-        if(!isHEP17){
-	   meRecHitsEnergyHE->Fill(en);
-	   meRecHitsEnergyHEM0->Fill(enM0);
-	   meRecHitsEnergyHEM3->Fill(enM3);
-        }else{
-	   meRecHitsEnergyHEP17[0]->Fill(en);
-	   meRecHitsEnergyHEP17M0[0]->Fill(enM0);
-	   meRecHitsEnergyHEP17M3[0]->Fill(enM3);
-	   meRecHitsEnergyHEP17[depth]->Fill(en);
-	   meRecHitsEnergyHEP17M0[depth]->Fill(enM0);
-	   meRecHitsEnergyHEP17M3[depth]->Fill(enM3);
+        meLog10Chi2profileHB->Fill(en, chi2_log10);
+
+        meTE_Low_HB->Fill(en, t);
+        meTE_HB->Fill(en, t);
+        meTE_High_HB->Fill(en, t);
+        meTEprofileHB_Low->Fill(en, t);
+        meTEprofileHB->Fill(en, t);
+        meTEprofileHB_High->Fill(en, t);
+      }
+      if (sub == 2 && (subdet_ == 2 || subdet_ == 5)) {
+        meTimeHE->Fill(t);
+        if (!isHEP17) {
+          meRecHitsEnergyHE->Fill(en);
+          meRecHitsEnergyHEM0->Fill(enM0);
+          meRecHitsEnergyHEM3->Fill(enM3);
+        } else {
+          meRecHitsEnergyHEP17[0]->Fill(en);
+          meRecHitsEnergyHEP17M0[0]->Fill(enM0);
+          meRecHitsEnergyHEP17M3[0]->Fill(enM3);
+          meRecHitsEnergyHEP17[depth]->Fill(en);
+          meRecHitsEnergyHEP17M0[depth]->Fill(enM0);
+          meRecHitsEnergyHEP17M3[depth]->Fill(enM3);
         }
 
-        meRecHitsEnergyM2vM0HE->Fill(enM0,en);
-        meRecHitsEnergyM3vM0HE->Fill(enM0,enM3);
-        meRecHitsEnergyM3vM2HE->Fill(en,enM3);
+        meRecHitsEnergyM2vM0HE->Fill(enM0, en);
+        meRecHitsEnergyM3vM0HE->Fill(enM0, enM3);
+        meRecHitsEnergyM3vM2HE->Fill(en, enM3);
 
         meRecHitsM2Chi2HE->Fill(chi2_log10);
-        meLog10Chi2profileHE->Fill(en,chi2_log10);	
+        meLog10Chi2profileHE->Fill(en, chi2_log10);
 
-	meTE_Low_HE->Fill( en, t);
-	meTE_HE->Fill( en, t);
-	meTEprofileHE_Low->Fill(en, t);
-	meTEprofileHE->Fill(en, t);
+        meTE_Low_HE->Fill(en, t);
+        meTE_HE->Fill(en, t);
+        meTEprofileHE_Low->Fill(en, t);
+        meTEprofileHE->Fill(en, t);
       }
-      if(sub == 4 && (subdet_ == 4 || subdet_ == 5)) {  
-	meTimeHF->Fill(t);
-	meRecHitsEnergyHF->Fill(en);	  
-
-	meTE_Low_HF->Fill(en, t);
-	meTE_HF->Fill(en, t);
-	meTEprofileHF_Low->Fill(en, t);
-	meTEprofileHF->Fill(en, t);
-
+      if (sub == 4 && (subdet_ == 4 || subdet_ == 5)) {
+        meTimeHF->Fill(t);
+        meRecHitsEnergyHF->Fill(en);
+
+        meTE_Low_HF->Fill(en, t);
+        meTE_HF->Fill(en, t);
+        meTEprofileHF_Low->Fill(en, t);
+        meTEprofileHF->Fill(en, t);
       }
-      if(sub == 3 && (subdet_ == 3 || subdet_ == 5)) {  
-	meTimeHO->Fill(t);
-	meRecHitsEnergyHO->Fill(en);
-
-	meTE_HO->Fill( en, t);
-	meTE_High_HO->Fill( en, t);
-	meTEprofileHO->Fill(en, t);
-	meTEprofileHO_High->Fill(en, t);
+      if (sub == 3 && (subdet_ == 3 || subdet_ == 5)) {
+        meTimeHO->Fill(t);
+        meRecHitsEnergyHO->Fill(en);
+
+        meTE_HO->Fill(en, t);
+        meTE_High_HO->Fill(en, t);
+        meTEprofileHO->Fill(en, t);
+        meTEprofileHO_High->Fill(en, t);
       }
     }
 
-    if(imc != 0) {
-      //Cone by depth are not drawn, the others are used for pion scan
-      meEnConeEtaProfile       ->Fill(double(ietaMax),  HcalCone);   // 
-      meEnConeEtaProfile_E     ->Fill(double(ietaMax), eEcalCone);   
-      meEnConeEtaProfile_EH    ->Fill(double(ietaMax),  HcalCone+eEcalCone); 
+    if (imc != 0) {
+      // Cone by depth are not drawn, the others are used for pion scan
+      meEnConeEtaProfile->Fill(double(ietaMax), HcalCone);  //
+      meEnConeEtaProfile_E->Fill(double(ietaMax), eEcalCone);
+      meEnConeEtaProfile_EH->Fill(double(ietaMax), HcalCone + eEcalCone);
     }
 
     // Single particle samples ONLY !  ======================================
-    // Fill up some histos for "integrated" subsustems. 
+    // Fill up some histos for "integrated" subsustems.
     // These are not drawn
   }
 
   nevtot++;
 }
 
-
 ///////////////////////////////////////////////////////////////////////////////
-void HcalRecHitsAnalyzer::fillRecHitsTmp(int subdet_, edm::Event const& ev){
-  
+void HcalRecHitsAnalyzer::fillRecHitsTmp(int subdet_, edm::Event const &ev) {
   using namespace edm;
-  
-  
+
   // initialize data vectors
   csub.clear();
   cen.clear();
@@ -928,218 +984,214 @@ void HcalRecHitsAnalyzer::fillRecHitsTmp(int subdet_, edm::Event const& ev){
   hcalHBSevLvlVec.clear();
   hcalHESevLvlVec.clear();
   hcalHFSevLvlVec.clear();
-  hcalHOSevLvlVec.clear(); 
+  hcalHOSevLvlVec.clear();
 
-  if( subdet_ == 1 || subdet_ == 2  || subdet_ == 5 || subdet_ == 6 || subdet_ == 0) {
-    
-    //HBHE
+  if (subdet_ == 1 || subdet_ == 2 || subdet_ == 5 || subdet_ == 6 || subdet_ == 0) {
+    // HBHE
     edm::Handle<HBHERecHitCollection> hbhecoll;
-    if ( ev.getByToken(tok_hbhe_, hbhecoll) ) {
-    
-      for (HBHERecHitCollection::const_iterator j=hbhecoll->begin(); j != hbhecoll->end(); j++) {
-	HcalDetId cell(j->id());
-	const HcalGeometry* cellGeometry = 
-	  dynamic_cast<const HcalGeometry*>(geometry->getSubdetectorGeometry(cell));
-	double eta  = cellGeometry->getPosition(cell).eta () ;
-	double phi  = cellGeometry->getPosition(cell).phi () ;
-	double zc   = cellGeometry->getPosition(cell).z ();
-	int sub     = cell.subdet();
-	int depth   = cell.depth();
-	int inteta  = cell.ieta();
-	int intphi  = cell.iphi();
-	double en   = j->energy();
-	double enM0 = j->eraw();
-	double enM3 = j->eaux();
-	double chi2 = j->chi2();
-	double t    = j->time();
-	int stwd    = j->flags();
-	int auxstwd = j->aux();
-	
-	int severityLevel = hcalSevLvl( (CaloRecHit*) &*j );
-	if( cell.subdet()==HcalBarrel ){
-	  hcalHBSevLvlVec.push_back(severityLevel);
-	}else if (cell.subdet()==HcalEndcap ){
-	  hcalHESevLvlVec.push_back(severityLevel);
-	} 
-	
-	if((iz > 0 && eta > 0.) || (iz < 0 && eta <0.) || iz == 0) { 
-	  
-	  csub.push_back(sub);
-	  cen.push_back(en);
-	  cenM0.push_back(enM0);
-	  cenM3.push_back(enM3);
-	  cchi2.push_back(chi2);
-	  ceta.push_back(eta);
-	  cphi.push_back(phi);
-	  ctime.push_back(t);
-	  cieta.push_back(inteta);
-	  ciphi.push_back(intphi);
-	  cdepth.push_back(depth);
-	  cz.push_back(zc);
-	  cstwd.push_back(stwd);
-	  cauxstwd.push_back(auxstwd);
-	}
+    if (ev.getByToken(tok_hbhe_, hbhecoll)) {
+      for (HBHERecHitCollection::const_iterator j = hbhecoll->begin(); j != hbhecoll->end(); j++) {
+        HcalDetId cell(j->id());
+        const HcalGeometry *cellGeometry = dynamic_cast<const HcalGeometry *>(geometry->getSubdetectorGeometry(cell));
+        double eta = cellGeometry->getPosition(cell).eta();
+        double phi = cellGeometry->getPosition(cell).phi();
+        double zc = cellGeometry->getPosition(cell).z();
+        int sub = cell.subdet();
+        int depth = cell.depth();
+        int inteta = cell.ieta();
+        int intphi = cell.iphi();
+        double en = j->energy();
+        double enM0 = j->eraw();
+        double enM3 = j->eaux();
+        double chi2 = j->chi2();
+        double t = j->time();
+        int stwd = j->flags();
+        int auxstwd = j->aux();
+
+        int severityLevel = hcalSevLvl((CaloRecHit *)&*j);
+        if (cell.subdet() == HcalBarrel) {
+          hcalHBSevLvlVec.push_back(severityLevel);
+        } else if (cell.subdet() == HcalEndcap) {
+          hcalHESevLvlVec.push_back(severityLevel);
+        }
+
+        if ((iz > 0 && eta > 0.) || (iz < 0 && eta < 0.) || iz == 0) {
+          csub.push_back(sub);
+          cen.push_back(en);
+          cenM0.push_back(enM0);
+          cenM3.push_back(enM3);
+          cchi2.push_back(chi2);
+          ceta.push_back(eta);
+          cphi.push_back(phi);
+          ctime.push_back(t);
+          cieta.push_back(inteta);
+          ciphi.push_back(intphi);
+          cdepth.push_back(depth);
+          cz.push_back(zc);
+          cstwd.push_back(stwd);
+          cauxstwd.push_back(auxstwd);
+        }
       }
-      
     }
   }
 
-  if( subdet_ == 4 || subdet_ == 5 || subdet_ == 6 || subdet_ == 0) {
-
-    //HF
+  if (subdet_ == 4 || subdet_ == 5 || subdet_ == 6 || subdet_ == 0) {
+    // HF
     edm::Handle<HFRecHitCollection> hfcoll;
-    if ( ev.getByToken(tok_hf_, hfcoll) ) {
-      
+    if (ev.getByToken(tok_hf_, hfcoll)) {
       for (HFRecHitCollection::const_iterator j = hfcoll->begin(); j != hfcoll->end(); j++) {
-	HcalDetId cell(j->id());
-	auto cellGeometry = (geometry->getSubdetectorGeometry(cell))->getGeometry (cell) ;
-	double eta   = cellGeometry->getPosition().eta () ;
-	double phi   = cellGeometry->getPosition().phi () ;
-	double zc    = cellGeometry->getPosition().z ();
-	int sub      = cell.subdet();
-	int depth    = cell.depth();
-	int inteta   = cell.ieta();
-	int intphi   = cell.iphi();
-	double en    = j->energy();
-	double enM0  = 0.;
-	double enM3  = 0.;
-	double chi2  = 0.;
-	double t     = j->time();
-	int stwd     = j->flags();
-	int auxstwd  = j->aux();
-	
-	int severityLevel = hcalSevLvl( (CaloRecHit*) &*j );
-	if( cell.subdet()==HcalForward ){
-	  hcalHFSevLvlVec.push_back(severityLevel);
-	} 
-	
-	if((iz > 0 && eta > 0.) || (iz < 0 && eta <0.) || iz == 0) { 
-	  
-	  csub.push_back(sub);
-	  cen.push_back(en);
-	  cenM0.push_back(enM0);
-	  cenM3.push_back(enM3);
-	  cchi2.push_back(chi2);
-	  ceta.push_back(eta);
-	  cphi.push_back(phi);
-	  ctime.push_back(t);
-	  cieta.push_back(inteta);
-	  ciphi.push_back(intphi);
-	  cdepth.push_back(depth);
-	  cz.push_back(zc);
-	  cstwd.push_back(stwd);
-	  cauxstwd.push_back(auxstwd);
-	}
+        HcalDetId cell(j->id());
+        auto cellGeometry = (geometry->getSubdetectorGeometry(cell))->getGeometry(cell);
+        double eta = cellGeometry->getPosition().eta();
+        double phi = cellGeometry->getPosition().phi();
+        double zc = cellGeometry->getPosition().z();
+        int sub = cell.subdet();
+        int depth = cell.depth();
+        int inteta = cell.ieta();
+        int intphi = cell.iphi();
+        double en = j->energy();
+        double enM0 = 0.;
+        double enM3 = 0.;
+        double chi2 = 0.;
+        double t = j->time();
+        int stwd = j->flags();
+        int auxstwd = j->aux();
+
+        int severityLevel = hcalSevLvl((CaloRecHit *)&*j);
+        if (cell.subdet() == HcalForward) {
+          hcalHFSevLvlVec.push_back(severityLevel);
+        }
+
+        if ((iz > 0 && eta > 0.) || (iz < 0 && eta < 0.) || iz == 0) {
+          csub.push_back(sub);
+          cen.push_back(en);
+          cenM0.push_back(enM0);
+          cenM3.push_back(enM3);
+          cchi2.push_back(chi2);
+          ceta.push_back(eta);
+          cphi.push_back(phi);
+          ctime.push_back(t);
+          cieta.push_back(inteta);
+          ciphi.push_back(intphi);
+          cdepth.push_back(depth);
+          cz.push_back(zc);
+          cstwd.push_back(stwd);
+          cauxstwd.push_back(auxstwd);
+        }
       }
     }
   }
 
-  //HO
-  if( subdet_ == 3 || subdet_ == 5 || subdet_ == 6 || subdet_ == 0) {
-  
+  // HO
+  if (subdet_ == 3 || subdet_ == 5 || subdet_ == 6 || subdet_ == 0) {
     edm::Handle<HORecHitCollection> hocoll;
-    if ( ev.getByToken(tok_ho_, hocoll) ) {
-      
+    if (ev.getByToken(tok_ho_, hocoll)) {
       for (HORecHitCollection::const_iterator j = hocoll->begin(); j != hocoll->end(); j++) {
-	HcalDetId cell(j->id());
-	auto cellGeometry = (geometry->getSubdetectorGeometry(cell))->getGeometry (cell) ;
-	double eta   = cellGeometry->getPosition().eta () ;
-	double phi   = cellGeometry->getPosition().phi () ;
-	double zc    = cellGeometry->getPosition().z ();
-	int sub      = cell.subdet();
-	int depth    = cell.depth();
-	int inteta   = cell.ieta();
-	int intphi   = cell.iphi();
-	double t     = j->time();
-	double en    = j->energy();
-	double enM0  = 0.;
-	double enM3  = 0.;
-	double chi2 = 0.;
-	int stwd     = j->flags();
-	int auxstwd  = j->aux();
-	
-	int severityLevel = hcalSevLvl( (CaloRecHit*) &*j );
-	if( cell.subdet()==HcalOuter ){
-	  hcalHOSevLvlVec.push_back(severityLevel);
-	} 
-	
-	if((iz > 0 && eta > 0.) || (iz < 0 && eta <0.) || iz == 0) { 
-	  csub.push_back(sub);
-	  cen.push_back(en);
-	  cenM0.push_back(enM0);
-	  cenM3.push_back(enM3);
-	  cchi2.push_back(chi2);
-	  ceta.push_back(eta);
-	  cphi.push_back(phi);
-	  ctime.push_back(t);
-	  cieta.push_back(inteta);
-	  ciphi.push_back(intphi);
-	  cdepth.push_back(depth);
-	  cz.push_back(zc);
-	  cstwd.push_back(stwd);
-	  cauxstwd.push_back(auxstwd);
-	}
+        HcalDetId cell(j->id());
+        auto cellGeometry = (geometry->getSubdetectorGeometry(cell))->getGeometry(cell);
+        double eta = cellGeometry->getPosition().eta();
+        double phi = cellGeometry->getPosition().phi();
+        double zc = cellGeometry->getPosition().z();
+        int sub = cell.subdet();
+        int depth = cell.depth();
+        int inteta = cell.ieta();
+        int intphi = cell.iphi();
+        double t = j->time();
+        double en = j->energy();
+        double enM0 = 0.;
+        double enM3 = 0.;
+        double chi2 = 0.;
+        int stwd = j->flags();
+        int auxstwd = j->aux();
+
+        int severityLevel = hcalSevLvl((CaloRecHit *)&*j);
+        if (cell.subdet() == HcalOuter) {
+          hcalHOSevLvlVec.push_back(severityLevel);
+        }
+
+        if ((iz > 0 && eta > 0.) || (iz < 0 && eta < 0.) || iz == 0) {
+          csub.push_back(sub);
+          cen.push_back(en);
+          cenM0.push_back(enM0);
+          cenM3.push_back(enM3);
+          cchi2.push_back(chi2);
+          ceta.push_back(eta);
+          cphi.push_back(phi);
+          ctime.push_back(t);
+          cieta.push_back(inteta);
+          ciphi.push_back(intphi);
+          cdepth.push_back(depth);
+          cz.push_back(zc);
+          cstwd.push_back(stwd);
+          cauxstwd.push_back(auxstwd);
+        }
       }
     }
   }
 }
 
-double HcalRecHitsAnalyzer::dR(double eta1, double phi1, double eta2, double phi2) { 
+double HcalRecHitsAnalyzer::dR(double eta1, double phi1, double eta2, double phi2) {
   double PI = 3.1415926535898;
-  double deltaphi= phi1 - phi2;
-  if( phi2 > phi1 ) { deltaphi= phi2 - phi1;}
-  if(deltaphi > PI) { deltaphi = 2.*PI - deltaphi;}
+  double deltaphi = phi1 - phi2;
+  if (phi2 > phi1) {
+    deltaphi = phi2 - phi1;
+  }
+  if (deltaphi > PI) {
+    deltaphi = 2. * PI - deltaphi;
+  }
   double deltaeta = eta2 - eta1;
-  double tmp = sqrt(deltaeta* deltaeta + deltaphi*deltaphi);
+  double tmp = sqrt(deltaeta * deltaeta + deltaphi * deltaphi);
   return tmp;
 }
 
 double HcalRecHitsAnalyzer::phi12(double phi1, double en1, double phi2, double en2) {
   // weighted mean value of phi1 and phi2
-  
+
   double tmp;
   double PI = 3.1415926535898;
-  double a1 = phi1; double a2  = phi2;
+  double a1 = phi1;
+  double a2 = phi2;
 
-  if( a1 > 0.5*PI  && a2 < 0.) a2 += 2*PI; 
-  if( a2 > 0.5*PI  && a1 < 0.) a1 += 2*PI; 
-  tmp = (a1 * en1 + a2 * en2)/(en1 + en2);
-  if(tmp > PI) tmp -= 2.*PI; 
- 
-  return tmp;
+  if (a1 > 0.5 * PI && a2 < 0.)
+    a2 += 2 * PI;
+  if (a2 > 0.5 * PI && a1 < 0.)
+    a1 += 2 * PI;
+  tmp = (a1 * en1 + a2 * en2) / (en1 + en2);
+  if (tmp > PI)
+    tmp -= 2. * PI;
 
+  return tmp;
 }
 
 double HcalRecHitsAnalyzer::dPhiWsign(double phi1, double phi2) {
   // clockwise      phi2 w.r.t phi1 means "+" phi distance
-  // anti-clockwise phi2 w.r.t phi1 means "-" phi distance 
+  // anti-clockwise phi2 w.r.t phi1 means "-" phi distance
 
   double PI = 3.1415926535898;
-  double a1 = phi1; double a2  = phi2;
-  double tmp =  a2 - a1;
-  if( a1*a2 < 0.) {
-    if(a1 > 0.5 * PI)  tmp += 2.*PI;
-    if(a2 > 0.5 * PI)  tmp -= 2.*PI;
+  double a1 = phi1;
+  double a2 = phi2;
+  double tmp = a2 - a1;
+  if (a1 * a2 < 0.) {
+    if (a1 > 0.5 * PI)
+      tmp += 2. * PI;
+    if (a2 > 0.5 * PI)
+      tmp -= 2. * PI;
   }
   return tmp;
-
 }
 
-int HcalRecHitsAnalyzer::hcalSevLvl(const CaloRecHit* hit){
-
-   HcalDetId id = hit->detid();
-   if (theHcalTopology->getMergePositionFlag() && id.subdet() == HcalEndcap) {
-     id = theHcalTopology->idFront(id);
-   }
-
-   const uint32_t recHitFlag = hit->flags();
-   const uint32_t dbStatusFlag = theHcalChStatus->getValues(id)->getValue();
+int HcalRecHitsAnalyzer::hcalSevLvl(const CaloRecHit *hit) {
+  HcalDetId id = hit->detid();
+  if (theHcalTopology->getMergePositionFlag() && id.subdet() == HcalEndcap) {
+    id = theHcalTopology->idFront(id);
+  }
 
-   int severityLevel = theHcalSevLvlComputer->getSeverityLevel(id, recHitFlag, dbStatusFlag);
+  const uint32_t recHitFlag = hit->flags();
+  const uint32_t dbStatusFlag = theHcalChStatus->getValues(id)->getValue();
 
-   return severityLevel;
+  int severityLevel = theHcalSevLvlComputer->getSeverityLevel(id, recHitFlag, dbStatusFlag);
 
-} 
+  return severityLevel;
+}
 
 DEFINE_FWK_MODULE(HcalRecHitsAnalyzer);
-
diff --git a/DQMOffline/Hcal/src/HcalRecHitsDQMClient.cc b/DQMOffline/Hcal/src/HcalRecHitsDQMClient.cc
index b47cd2dafb688..326a5e68a8a9b 100644
--- a/DQMOffline/Hcal/src/HcalRecHitsDQMClient.cc
+++ b/DQMOffline/Hcal/src/HcalRecHitsDQMClient.cc
@@ -1,391 +1,377 @@
 #include "DQMOffline/Hcal/interface/HcalRecHitsDQMClient.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-HcalRecHitsDQMClient::HcalRecHitsDQMClient(const edm::ParameterSet& iConfig):conf_(iConfig)
-{
-
+HcalRecHitsDQMClient::HcalRecHitsDQMClient(const edm::ParameterSet &iConfig) : conf_(iConfig) {
   outputFile_ = iConfig.getUntrackedParameter<std::string>("outputFile", "myfile.root");
   debug_ = false;
   verbose_ = false;
-  dirName_=iConfig.getParameter<std::string>("DQMDirName");
+  dirName_ = iConfig.getParameter<std::string>("DQMDirName");
 }
 
+HcalRecHitsDQMClient::~HcalRecHitsDQMClient() {}
 
-HcalRecHitsDQMClient::~HcalRecHitsDQMClient()
-{ 
-  
-}
-
-void HcalRecHitsDQMClient::beginJob()
-{
- 
+void HcalRecHitsDQMClient::beginJob() {}
 
-}
-
-
-void HcalRecHitsDQMClient::beginRun(const edm::Run& run, const edm::EventSetup& es){
-   
+void HcalRecHitsDQMClient::beginRun(const edm::Run &run, const edm::EventSetup &es) {
   edm::ESHandle<HcalDDDRecConstants> pHRNDC;
-  es.get<HcalRecNumberingRecord>().get( pHRNDC );
+  es.get<HcalRecNumberingRecord>().get(pHRNDC);
   hcons = &(*pHRNDC);
   maxDepthHB_ = hcons->getMaxDepth(0);
   maxDepthHE_ = hcons->getMaxDepth(1);
   maxDepthHF_ = hcons->getMaxDepth(2);
   maxDepthHO_ = hcons->getMaxDepth(3);
- 
+
   edm::ESHandle<CaloGeometry> geometry;
 
-  es.get<CaloGeometryRecord > ().get(geometry);
- 
-  const std::vector<DetId>& hbCells = geometry->getValidDetIds(DetId::Hcal, HcalBarrel);
-  const std::vector<DetId>& heCells = geometry->getValidDetIds(DetId::Hcal, HcalEndcap);
-  const std::vector<DetId>& hoCells = geometry->getValidDetIds(DetId::Hcal, HcalOuter);
-  const std::vector<DetId>& hfCells = geometry->getValidDetIds(DetId::Hcal, HcalForward);
- 
-  nChannels_[1] = hbCells.size(); 
-  nChannels_[2] = heCells.size(); 
-  nChannels_[3] = hoCells.size(); 
+  es.get<CaloGeometryRecord>().get(geometry);
+
+  const std::vector<DetId> &hbCells = geometry->getValidDetIds(DetId::Hcal, HcalBarrel);
+  const std::vector<DetId> &heCells = geometry->getValidDetIds(DetId::Hcal, HcalEndcap);
+  const std::vector<DetId> &hoCells = geometry->getValidDetIds(DetId::Hcal, HcalOuter);
+  const std::vector<DetId> &hfCells = geometry->getValidDetIds(DetId::Hcal, HcalForward);
+
+  nChannels_[1] = hbCells.size();
+  nChannels_[2] = heCells.size();
+  nChannels_[3] = hoCells.size();
   nChannels_[4] = hfCells.size();
   nChannels_[0] = nChannels_[1] + nChannels_[2] + nChannels_[3] + nChannels_[4];
-  //avoid divide by zero
-  for(unsigned i = 0; i < 5; ++i){
-    if(nChannels_[i]==0) nChannels_[i] = 1;
+  // avoid divide by zero
+  for (unsigned i = 0; i < 5; ++i) {
+    if (nChannels_[i] == 0)
+      nChannels_[i] = 1;
   }
- 
-  //std::cout << "Channels HB:" << nChannels_[1] << " HE:" << nChannels_[2] << " HO:" << nChannels_[3] << " HF:" << nChannels_[4] << std::endl;
- 
-  //We hardcode the HF depths because in the dual readout configuration, rechits are not defined for depths 3&4
-  maxDepthHF_ = (maxDepthHF_ > 2 ? 2 : maxDepthHF_); //We reatin the dynamic possibility that HF might have 0 or 1 depths
- 
-  maxDepthAll_ = ( maxDepthHB_ + maxDepthHO_ > maxDepthHE_ ? maxDepthHB_ + maxDepthHO_ : maxDepthHE_ );
-  maxDepthAll_ = ( maxDepthAll_ > maxDepthHF_ ? maxDepthAll_ : maxDepthHF_ );
- 
+
+  // std::cout << "Channels HB:" << nChannels_[1] << " HE:" << nChannels_[2] <<
+  // " HO:" << nChannels_[3] << " HF:" << nChannels_[4] << std::endl;
+
+  // We hardcode the HF depths because in the dual readout configuration,
+  // rechits are not defined for depths 3&4
+  maxDepthHF_ = (maxDepthHF_ > 2 ? 2 : maxDepthHF_);  // We reatin the dynamic possibility
+                                                      // that HF might have 0 or 1 depths
+
+  maxDepthAll_ = (maxDepthHB_ + maxDepthHO_ > maxDepthHE_ ? maxDepthHB_ + maxDepthHO_ : maxDepthHE_);
+  maxDepthAll_ = (maxDepthAll_ > maxDepthHF_ ? maxDepthAll_ : maxDepthHF_);
 }
 
-void HcalRecHitsDQMClient::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter)
-{
+void HcalRecHitsDQMClient::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
   igetter.setCurrentFolder(dirName_);
 
-  if (verbose_) std::cout << "\nrunClient" << std::endl; 
+  if (verbose_)
+    std::cout << "\nrunClient" << std::endl;
 
-  std::vector<MonitorElement*> hcalMEs;
+  std::vector<MonitorElement *> hcalMEs;
 
-  // Since out folders are fixed to three, we can just go over these three folders
-  // i.e., CaloTowersD/CaloTowersTask, HcalRecHitsD/HcalRecHitTask, NoiseRatesV/NoiseRatesTask.
+  // Since out folders are fixed to three, we can just go over these three
+  // folders i.e., CaloTowersD/CaloTowersTask, HcalRecHitsD/HcalRecHitTask,
+  // NoiseRatesV/NoiseRatesTask.
   std::vector<std::string> fullPathHLTFolders = igetter.getSubdirs();
-  for(unsigned int i=0;i<fullPathHLTFolders.size();i++) {
-
-    if (verbose_) std::cout <<"\nfullPath: "<< fullPathHLTFolders[i] << std::endl;
+  for (unsigned int i = 0; i < fullPathHLTFolders.size(); i++) {
+    if (verbose_)
+      std::cout << "\nfullPath: " << fullPathHLTFolders[i] << std::endl;
     igetter.setCurrentFolder(fullPathHLTFolders[i]);
 
     std::vector<std::string> fullSubPathHLTFolders = igetter.getSubdirs();
-    for(unsigned int j=0;j<fullSubPathHLTFolders.size();j++) {
-
-      if (verbose_) std::cout <<"fullSub: "<<fullSubPathHLTFolders[j] << std::endl;
-
-      if( strcmp(fullSubPathHLTFolders[j].c_str(), "HcalRecHitsD/HcalRecHitTask") ==0  ){
-         hcalMEs = igetter.getContents(fullSubPathHLTFolders[j]);
-         if (verbose_) std::cout <<"hltMES size : "<<hcalMEs.size()<<std::endl;
-         if( !HcalRecHitsEndjob(hcalMEs) ) std::cout<<"\nError in HcalRecHitsEndjob!"<<std::endl<<std::endl;
+    for (unsigned int j = 0; j < fullSubPathHLTFolders.size(); j++) {
+      if (verbose_)
+        std::cout << "fullSub: " << fullSubPathHLTFolders[j] << std::endl;
+
+      if (strcmp(fullSubPathHLTFolders[j].c_str(), "HcalRecHitsD/HcalRecHitTask") == 0) {
+        hcalMEs = igetter.getContents(fullSubPathHLTFolders[j]);
+        if (verbose_)
+          std::cout << "hltMES size : " << hcalMEs.size() << std::endl;
+        if (!HcalRecHitsEndjob(hcalMEs))
+          std::cout << "\nError in HcalRecHitsEndjob!" << std::endl << std::endl;
       }
-
-    }    
-
+    }
   }
-
 }
 
-
 // called after entering the HcalRecHitsD/HcalRecHitTask directory
 // hcalMEs are within that directory
-int HcalRecHitsDQMClient::HcalRecHitsEndjob(const std::vector<MonitorElement*> &hcalMEs){
-
-   MonitorElement* Nhf=nullptr;
-
-   //Search for emap histograms, and collect them into this vector
-   //All subdtectors are plotted together in these histograms. We only need to look for different depths
-   std::vector<MonitorElement*> emap_depths;
-
-   //This vector is filled occupancy_maps identified by both subdetector and depth
-   std::vector<MonitorElement*> occupancy_maps;
-   std::vector<std::string> occupancyID;
-
-   //This vector is filled with emean_vs_ieta histograms, they are divided by both subdetector and depth
-   std::vector<MonitorElement*> emean_vs_ieta;
-
-   //These are the only histograms filled in this module; however, the histograms are created empty in HcalRecHitsAnalyzer
-   //occupancy_vs_ieta, divided by both subdetector and depth
-   std::vector<MonitorElement*> occupancy_vs_ieta;
-   std::vector<std::string> occupancy_vs_ietaID;
-
-   //RecHit_StatusWord & RecHit_Aux_StatusWord
-   //Divided by subdectector
-   std::vector<MonitorElement*> RecHit_StatusWord;
-   std::vector<float>           RecHit_StatusWord_Channels;
-   std::vector<MonitorElement*> RecHit_Aux_StatusWord;
-   std::vector<float>           RecHit_Aux_StatusWord_Channels;
-
-   for(unsigned int ih=0; ih<hcalMEs.size(); ih++){
-
-      //N_HF is not special, it is just convient to get the total number of events
-      //The number of entries in N_HF is equal to the number of events
-      if( hcalMEs[ih]->getName() == "N_HF" ){ 
-         Nhf= hcalMEs[ih];
-         continue;
+int HcalRecHitsDQMClient::HcalRecHitsEndjob(const std::vector<MonitorElement *> &hcalMEs) {
+  MonitorElement *Nhf = nullptr;
+
+  // Search for emap histograms, and collect them into this vector
+  // All subdtectors are plotted together in these histograms. We only need to
+  // look for different depths
+  std::vector<MonitorElement *> emap_depths;
+
+  // This vector is filled occupancy_maps identified by both subdetector and
+  // depth
+  std::vector<MonitorElement *> occupancy_maps;
+  std::vector<std::string> occupancyID;
+
+  // This vector is filled with emean_vs_ieta histograms, they are divided by
+  // both subdetector and depth
+  std::vector<MonitorElement *> emean_vs_ieta;
+
+  // These are the only histograms filled in this module; however, the
+  // histograms are created empty in HcalRecHitsAnalyzer occupancy_vs_ieta,
+  // divided by both subdetector and depth
+  std::vector<MonitorElement *> occupancy_vs_ieta;
+  std::vector<std::string> occupancy_vs_ietaID;
+
+  // RecHit_StatusWord & RecHit_Aux_StatusWord
+  // Divided by subdectector
+  std::vector<MonitorElement *> RecHit_StatusWord;
+  std::vector<float> RecHit_StatusWord_Channels;
+  std::vector<MonitorElement *> RecHit_Aux_StatusWord;
+  std::vector<float> RecHit_Aux_StatusWord_Channels;
+
+  for (unsigned int ih = 0; ih < hcalMEs.size(); ih++) {
+    // N_HF is not special, it is just convient to get the total number of
+    // events The number of entries in N_HF is equal to the number of events
+    if (hcalMEs[ih]->getName() == "N_HF") {
+      Nhf = hcalMEs[ih];
+      continue;
+    }
+
+    // ***********************
+    // * We fill the various MonitorElement vectors by searching for a matching
+    // substring
+    // * The methods that are used are agnostic to the ordering of vectors
+    // ***********************
+
+    if (hcalMEs[ih]->getName().find("emap_depth") != std::string::npos) {
+      emap_depths.push_back(hcalMEs[ih]);
+      continue;
+    }
+
+    if (hcalMEs[ih]->getName().find("occupancy_map_H") != std::string::npos) {
+      occupancy_maps.push_back(hcalMEs[ih]);
+
+      // Use occupancyID to save the subdetector and depth information
+      // This will help preserve both indifference to vector ordering and
+      // specific details of the detector topology The position in occupancyID
+      // must correspond to the histogram position in occupancy_maps
+
+      // Save the string after "occupancy_map_"
+
+      std::string prefix = "occupancy_map_";
+
+      occupancyID.push_back(hcalMEs[ih]->getName().substr(prefix.size()));
+
+      continue;
+    }
+
+    if (hcalMEs[ih]->getName().find("emean_vs_ieta_H") != std::string::npos) {
+      emean_vs_ieta.push_back(hcalMEs[ih]);
+      continue;
+    }
+
+    if (hcalMEs[ih]->getName().find("occupancy_vs_ieta_H") != std::string::npos) {
+      occupancy_vs_ieta.push_back(hcalMEs[ih]);
+
+      // Use occupancy_vs_ietaID to save the subdetector and depth information
+      // This will help preserve both indifference to vector ordering and
+      // specific details of the detector topology The position in occupancyID
+      // must correspond to the histogram position in occupancy_vs_ieta
+
+      // Save the string after "occupancy_vs_ieta_"
+
+      std::string prefix = "occupancy_vs_ieta_";
+
+      occupancy_vs_ietaID.push_back(hcalMEs[ih]->getName().substr(prefix.size()));
+
+      continue;
+    }
+
+    if (hcalMEs[ih]->getName().find("HcalRecHitTask_RecHit_StatusWord_H") != std::string::npos) {
+      RecHit_StatusWord.push_back(hcalMEs[ih]);
+
+      if (hcalMEs[ih]->getName().find("HB") != std::string::npos) {
+        RecHit_StatusWord_Channels.push_back((float)nChannels_[1]);
+      } else if (hcalMEs[ih]->getName().find("HE") != std::string::npos) {
+        RecHit_StatusWord_Channels.push_back((float)nChannels_[2]);
+      } else if (hcalMEs[ih]->getName().find("H0") != std::string::npos) {
+        RecHit_StatusWord_Channels.push_back((float)nChannels_[3]);
+      } else if (hcalMEs[ih]->getName().find("HF") != std::string::npos) {
+        RecHit_StatusWord_Channels.push_back((float)nChannels_[4]);
+      } else {
+        RecHit_StatusWord_Channels.push_back(1.);
       }
 
-      // ***********************
-      // * We fill the various MonitorElement vectors by searching for a matching substring
-      // * The methods that are used are agnostic to the ordering of vectors
-      // ***********************     
-
-      if( hcalMEs[ih]->getName().find("emap_depth") != std::string::npos ){
-         emap_depths.push_back(hcalMEs[ih]);
-         continue;  
-      } 
-
-      if( hcalMEs[ih]->getName().find("occupancy_map_H") != std::string::npos ){
-         occupancy_maps.push_back(hcalMEs[ih]);
+      continue;
+    }
 
-         // Use occupancyID to save the subdetector and depth information
-         // This will help preserve both indifference to vector ordering and specific details of the detector topology
-         // The position in occupancyID must correspond to the histogram position in occupancy_maps
+    if (hcalMEs[ih]->getName().find("HcalRecHitTask_RecHit_Aux_StatusWord_H") != std::string::npos) {
+      RecHit_Aux_StatusWord.push_back(hcalMEs[ih]);
 
-         // Save the string after "occupancy_map_"
-         
-         std::string prefix = "occupancy_map_";
-
-         occupancyID.push_back( hcalMEs[ih]->getName().substr(prefix.size()) );
-
-         continue;
+      if (hcalMEs[ih]->getName().find("HB") != std::string::npos) {
+        RecHit_Aux_StatusWord_Channels.push_back((float)nChannels_[1]);
+      } else if (hcalMEs[ih]->getName().find("HE") != std::string::npos) {
+        RecHit_Aux_StatusWord_Channels.push_back((float)nChannels_[2]);
+      } else if (hcalMEs[ih]->getName().find("H0") != std::string::npos) {
+        RecHit_Aux_StatusWord_Channels.push_back((float)nChannels_[3]);
+      } else if (hcalMEs[ih]->getName().find("HF") != std::string::npos) {
+        RecHit_Aux_StatusWord_Channels.push_back((float)nChannels_[4]);
+      } else {
+        RecHit_Aux_StatusWord_Channels.push_back(1.);
       }
 
-      if( hcalMEs[ih]->getName().find("emean_vs_ieta_H") != std::string::npos ){
-         emean_vs_ieta.push_back(hcalMEs[ih]);
-         continue;
-      }
+      continue;
+    }
+  }
 
-      if( hcalMEs[ih]->getName().find("occupancy_vs_ieta_H") != std::string::npos ){
-         occupancy_vs_ieta.push_back(hcalMEs[ih]);
+  // mean energies and occupancies evaluation
 
-         // Use occupancy_vs_ietaID to save the subdetector and depth information
-         // This will help preserve both indifference to vector ordering and specific details of the detector topology
-         // The position in occupancyID must correspond to the histogram position in occupancy_vs_ieta
+  double nevtot = Nhf->getEntries();  // Use the number of entries in the Nhf histogram to
+                                      // give the total number of events
 
-         // Save the string after "occupancy_vs_ieta_"
-         
-         std::string prefix = "occupancy_vs_ieta_";
+  if (verbose_)
+    std::cout << "nevtot : " << nevtot << std::endl;
 
-         occupancy_vs_ietaID.push_back( hcalMEs[ih]->getName().substr(prefix.size()) );
+  // emap histograms are scaled by the number of events
+  float fev = float(nevtot);
+  double scaleBynevtot = 1 / fev;
 
-         continue;
-      }
+  // In this and the following histogram vectors, recognize that the for-loop
+  // index does not have to correspond to any particular depth
+  for (unsigned int depthIdx = 0; depthIdx < emap_depths.size(); depthIdx++) {
+    int nx = emap_depths[depthIdx]->getNbinsX();
+    int ny = emap_depths[depthIdx]->getNbinsY();
 
-      if( hcalMEs[ih]->getName().find("HcalRecHitTask_RecHit_StatusWord_H") != std::string::npos ){
-         RecHit_StatusWord.push_back(hcalMEs[ih]);
-
-         if(hcalMEs[ih]->getName().find("HB") != std::string::npos ){
-            RecHit_StatusWord_Channels.push_back((float)nChannels_[1]);
-         }else if(hcalMEs[ih]->getName().find("HE") != std::string::npos ){
-            RecHit_StatusWord_Channels.push_back((float)nChannels_[2]);
-         }else if(hcalMEs[ih]->getName().find("H0") != std::string::npos ){
-            RecHit_StatusWord_Channels.push_back((float)nChannels_[3]);
-         }else if(hcalMEs[ih]->getName().find("HF") != std::string::npos ){
-            RecHit_StatusWord_Channels.push_back((float)nChannels_[4]);
-         } else {
-            RecHit_StatusWord_Channels.push_back(1.);
-         }
-
-         continue;
-      }
+    float cnorm;
+    float enorm;
 
-      if( hcalMEs[ih]->getName().find("HcalRecHitTask_RecHit_Aux_StatusWord_H") != std::string::npos ){
-         RecHit_Aux_StatusWord.push_back(hcalMEs[ih]);
-
-         if(hcalMEs[ih]->getName().find("HB") != std::string::npos ){
-            RecHit_Aux_StatusWord_Channels.push_back((float)nChannels_[1]);
-         }else if(hcalMEs[ih]->getName().find("HE") != std::string::npos ){
-            RecHit_Aux_StatusWord_Channels.push_back((float)nChannels_[2]);
-         }else if(hcalMEs[ih]->getName().find("H0") != std::string::npos ){
-            RecHit_Aux_StatusWord_Channels.push_back((float)nChannels_[3]);
-         }else if(hcalMEs[ih]->getName().find("HF") != std::string::npos ){
-            RecHit_Aux_StatusWord_Channels.push_back((float)nChannels_[4]);
-         } else {
-            RecHit_Aux_StatusWord_Channels.push_back(1.);
-         }
-
-         continue;
+    for (int i = 1; i <= nx; i++) {
+      for (int j = 1; j <= ny; j++) {
+        cnorm = emap_depths[depthIdx]->getBinContent(i, j) * scaleBynevtot;
+        enorm = emap_depths[depthIdx]->getBinError(i, j) * scaleBynevtot;
+        emap_depths[depthIdx]->setBinContent(i, j, cnorm);
+        emap_depths[depthIdx]->setBinError(i, j, enorm);
       }
+    }
+  }
 
-   } 
-
-   // mean energies and occupancies evaluation
-
-   double nevtot = Nhf->getEntries(); // Use the number of entries in the Nhf histogram to give the total number of events
-
-   if(verbose_) std::cout<<"nevtot : "<<nevtot<<std::endl;
-
-   // emap histograms are scaled by the number of events
-   float  fev           = float (nevtot);
-   double scaleBynevtot = 1 / fev;
+  // occupancy_maps & matched occupancy_vs_ieta
 
-   // In this and the following histogram vectors, recognize that the for-loop index
-   // does not have to correspond to any particular depth
-   for(unsigned int depthIdx = 0; depthIdx < emap_depths.size(); depthIdx++){
+  bool omatched = false;
 
-      int nx = emap_depths[depthIdx]->getNbinsX();
-      int ny = emap_depths[depthIdx]->getNbinsY();
+  for (unsigned int occupancyIdx = 0; occupancyIdx < occupancy_maps.size(); occupancyIdx++) {
+    int nx = occupancy_maps[occupancyIdx]->getNbinsX();
+    int ny = occupancy_maps[occupancyIdx]->getNbinsY();
 
-      float cnorm;
-      float enorm;
+    float cnorm;
+    float enorm;
 
-      for (int i = 1; i <= nx; i++) {      
-         for (int j = 1; j <= ny; j++) {
-	    cnorm = emap_depths[depthIdx]->getBinContent(i,j) * scaleBynevtot;
-	    enorm = emap_depths[depthIdx]->getBinError(i,j) * scaleBynevtot;
-            emap_depths[depthIdx]->setBinContent(i,j,cnorm);
-            emap_depths[depthIdx]->setBinError(i,j,enorm);
+    unsigned int vsIetaIdx = occupancy_vs_ieta.size();
+    omatched = false;
 
-         }
+    for (vsIetaIdx = 0; vsIetaIdx < occupancy_vs_ieta.size(); vsIetaIdx++) {
+      if (occupancyID[occupancyIdx] == occupancy_vs_ietaID[vsIetaIdx]) {
+        omatched = true;
+        break;
       }
-   }
-
-   // occupancy_maps & matched occupancy_vs_ieta
-
-   bool omatched = false;
-
-   for(unsigned int occupancyIdx = 0; occupancyIdx < occupancy_maps.size(); occupancyIdx++){
-
-      int nx = occupancy_maps[occupancyIdx]->getNbinsX();
-      int ny = occupancy_maps[occupancyIdx]->getNbinsY();
-
-      float cnorm;
-      float enorm;
-
-      unsigned int vsIetaIdx = occupancy_vs_ieta.size();
-      omatched = false;
-
-      for(vsIetaIdx = 0; vsIetaIdx < occupancy_vs_ieta.size(); vsIetaIdx++){
-         if(occupancyID[occupancyIdx] == occupancy_vs_ietaID[vsIetaIdx]){
-            omatched = true;
-            break;
-         }
-      }// match occupancy_vs_ieta histogram
-
-      for (int i = 1; i <= nx; i++) {      
-         for (int j = 1; j <= ny; j++) {
-	    cnorm = occupancy_maps[occupancyIdx]->getBinContent(i,j) * scaleBynevtot;
-	    enorm = occupancy_maps[occupancyIdx]->getBinError(i,j) * scaleBynevtot;
-            occupancy_maps[occupancyIdx]->setBinContent(i,j,cnorm);
-            occupancy_maps[occupancyIdx]->setBinError(i,j,enorm);
-
-         }
+    }  // match occupancy_vs_ieta histogram
+
+    for (int i = 1; i <= nx; i++) {
+      for (int j = 1; j <= ny; j++) {
+        cnorm = occupancy_maps[occupancyIdx]->getBinContent(i, j) * scaleBynevtot;
+        enorm = occupancy_maps[occupancyIdx]->getBinError(i, j) * scaleBynevtot;
+        occupancy_maps[occupancyIdx]->setBinContent(i, j, cnorm);
+        occupancy_maps[occupancyIdx]->setBinError(i, j, enorm);
       }
+    }
 
-      //Fill occupancy_vs_ieta
-
-      if(omatched){
+    // Fill occupancy_vs_ieta
 
-         //We run over all of the ieta values
-         for (int ieta = -41; ieta <= 41; ieta++) {
-            float phi_factor = 1.;
-            float sumphi = 0.;
-	    float sumphie = 0.;
+    if (omatched) {
+      // We run over all of the ieta values
+      for (int ieta = -41; ieta <= 41; ieta++) {
+        float phi_factor = 1.;
+        float sumphi = 0.;
+        float sumphie = 0.;
 
-            if(ieta == 0) continue; //ieta=0 is not defined
+        if (ieta == 0)
+          continue;  // ieta=0 is not defined
 
-            phi_factor = phifactor(ieta);
+        phi_factor = phifactor(ieta);
 
-            //the rechits occupancy map defines iphi as 0..71
-            for (int iphi = 0; iphi <= 71; iphi++) {
-               int binIeta = occupancy_maps[occupancyIdx]->getTH2F()->GetXaxis()->FindBin(float(ieta));
-               int binIphi = occupancy_maps[occupancyIdx]->getTH2F()->GetYaxis()->FindBin(float(iphi));
+        // the rechits occupancy map defines iphi as 0..71
+        for (int iphi = 0; iphi <= 71; iphi++) {
+          int binIeta = occupancy_maps[occupancyIdx]->getTH2F()->GetXaxis()->FindBin(float(ieta));
+          int binIphi = occupancy_maps[occupancyIdx]->getTH2F()->GetYaxis()->FindBin(float(iphi));
 
-               float content = occupancy_maps[occupancyIdx]->getBinContent(binIeta,binIphi);
-	       float econtent = occupancy_maps[occupancyIdx]->getBinError(binIeta,binIphi);
+          float content = occupancy_maps[occupancyIdx]->getBinContent(binIeta, binIphi);
+          float econtent = occupancy_maps[occupancyIdx]->getBinError(binIeta, binIphi);
 
-               sumphi += content;
-	       sumphie += econtent*econtent;
-            }//for loop over phi
+          sumphi += content;
+          sumphie += econtent * econtent;
+        }  // for loop over phi
 
-	    int ietabin = occupancy_vs_ieta[vsIetaIdx]->getTH1F()->GetXaxis()->FindBin(float(ieta));
+        int ietabin = occupancy_vs_ieta[vsIetaIdx]->getTH1F()->GetXaxis()->FindBin(float(ieta));
 
-	    
+        // fill occupancies vs ieta
+        cnorm = sumphi / phi_factor;
+        enorm = sqrt(sumphie) / phi_factor;
+        occupancy_vs_ieta[vsIetaIdx]->setBinContent(ietabin, cnorm);
+        occupancy_vs_ieta[vsIetaIdx]->setBinError(ietabin, enorm);
 
-            // fill occupancies vs ieta
-            cnorm = sumphi / phi_factor;
-	    enorm = sqrt(sumphie) / phi_factor;
-            occupancy_vs_ieta[vsIetaIdx]->setBinContent(ietabin, cnorm);
-	    occupancy_vs_ieta[vsIetaIdx]->setBinError(ietabin,enorm);
-
-         }//Fill occupancy_vs_ieta
-      }//if omatched
-   }
-
-   // Status Word
-   // Normalized by number of events and by number of channels per subdetector as well
-
-   for(unsigned int StatusWordIdx = 0; StatusWordIdx < RecHit_StatusWord.size(); StatusWordIdx++){
-         
-      int nx = RecHit_StatusWord[StatusWordIdx]->getNbinsX();
-
-      float cnorm;
-      float enorm;
-
-      for (int i = 1; i <= nx; i++) {      
-         cnorm = RecHit_StatusWord[StatusWordIdx]->getBinContent(i) * scaleBynevtot / RecHit_StatusWord_Channels[StatusWordIdx];
-         enorm = RecHit_StatusWord[StatusWordIdx]->getBinError(i) * scaleBynevtot / RecHit_StatusWord_Channels[StatusWordIdx];
-         RecHit_StatusWord[StatusWordIdx]->setBinContent(i,cnorm);
-         RecHit_StatusWord[StatusWordIdx]->setBinError(i,enorm);
+      }  // Fill occupancy_vs_ieta
+    }    // if omatched
+  }
 
-      }
+  // Status Word
+  // Normalized by number of events and by number of channels per subdetector as
+  // well
 
-   }
+  for (unsigned int StatusWordIdx = 0; StatusWordIdx < RecHit_StatusWord.size(); StatusWordIdx++) {
+    int nx = RecHit_StatusWord[StatusWordIdx]->getNbinsX();
 
-   for(unsigned int AuxStatusWordIdx = 0; AuxStatusWordIdx < RecHit_Aux_StatusWord.size(); AuxStatusWordIdx++){
-         
-      int nx = RecHit_Aux_StatusWord[AuxStatusWordIdx]->getNbinsX();
+    float cnorm;
+    float enorm;
 
-      float cnorm;
-      float enorm;
+    for (int i = 1; i <= nx; i++) {
+      cnorm = RecHit_StatusWord[StatusWordIdx]->getBinContent(i) * scaleBynevtot /
+              RecHit_StatusWord_Channels[StatusWordIdx];
+      enorm =
+          RecHit_StatusWord[StatusWordIdx]->getBinError(i) * scaleBynevtot / RecHit_StatusWord_Channels[StatusWordIdx];
+      RecHit_StatusWord[StatusWordIdx]->setBinContent(i, cnorm);
+      RecHit_StatusWord[StatusWordIdx]->setBinError(i, enorm);
+    }
+  }
 
-      for (int i = 1; i <= nx; i++) {      
-         cnorm = RecHit_Aux_StatusWord[AuxStatusWordIdx]->getBinContent(i) * scaleBynevtot / RecHit_Aux_StatusWord_Channels[AuxStatusWordIdx];
-         enorm = RecHit_Aux_StatusWord[AuxStatusWordIdx]->getBinError(i) * scaleBynevtot / RecHit_Aux_StatusWord_Channels[AuxStatusWordIdx];
-         RecHit_Aux_StatusWord[AuxStatusWordIdx]->setBinContent(i,cnorm);
-         RecHit_Aux_StatusWord[AuxStatusWordIdx]->setBinError(i,enorm);
+  for (unsigned int AuxStatusWordIdx = 0; AuxStatusWordIdx < RecHit_Aux_StatusWord.size(); AuxStatusWordIdx++) {
+    int nx = RecHit_Aux_StatusWord[AuxStatusWordIdx]->getNbinsX();
 
-      }
+    float cnorm;
+    float enorm;
 
+    for (int i = 1; i <= nx; i++) {
+      cnorm = RecHit_Aux_StatusWord[AuxStatusWordIdx]->getBinContent(i) * scaleBynevtot /
+              RecHit_Aux_StatusWord_Channels[AuxStatusWordIdx];
+      enorm = RecHit_Aux_StatusWord[AuxStatusWordIdx]->getBinError(i) * scaleBynevtot /
+              RecHit_Aux_StatusWord_Channels[AuxStatusWordIdx];
+      RecHit_Aux_StatusWord[AuxStatusWordIdx]->setBinContent(i, cnorm);
+      RecHit_Aux_StatusWord[AuxStatusWordIdx]->setBinError(i, enorm);
+    }
+  }
 
-   }
-
-   return 1;
+  return 1;
 }
 
-float HcalRecHitsDQMClient::phifactor(int ieta){
-
-   float phi_factor_;
-
-   if(ieta >= -20 && ieta <= 20 ){
-      phi_factor_ = 72.;
-   } else {
-      if(ieta >= 40 || ieta <= -40 ){
-         phi_factor_ = 18.;
-      } else {
-         phi_factor_ = 36.;
-      }
-   }
-
-   return phi_factor_;
+float HcalRecHitsDQMClient::phifactor(int ieta) {
+  float phi_factor_;
+
+  if (ieta >= -20 && ieta <= 20) {
+    phi_factor_ = 72.;
+  } else {
+    if (ieta >= 40 || ieta <= -40) {
+      phi_factor_ = 18.;
+    } else {
+      phi_factor_ = 36.;
+    }
+  }
 
+  return phi_factor_;
 }
 
 DEFINE_FWK_MODULE(HcalRecHitsDQMClient);
diff --git a/DQMOffline/JetMET/src/DQMPFCandidateAnalyzer.cc b/DQMOffline/JetMET/src/DQMPFCandidateAnalyzer.cc
index 7e8287558e4fa..9133fd46b2f78 100644
--- a/DQMOffline/JetMET/src/DQMPFCandidateAnalyzer.cc
+++ b/DQMOffline/JetMET/src/DQMPFCandidateAnalyzer.cc
@@ -230,10 +230,11 @@ void DQMPFCandidateAnalyzer::bookHistograms(DQMStore::IBooker & ibooker,
 
     //actual HCAL segmentation in pseudorapidity -> reduce by a factor of two
     //const int nbins_eta_hcal_total=54;   
-    //double eta_limits_hcal_total[nbins_eta_hcal_total]={-2.650,-2.500,-2.322,-2.172,-2.043,-1.930,-1.830,-1.740,-1.653,-1.566,-1.479,-1.392,-1.305, 
-    //						      -1.218,-1.131,-1.044,-0.957,-0.870,-0.783,-0.696,-0.609,-0.522,-0.435,-0.348,-0.261,-0.174,-0.087,0.0,
-    //						      0.087, 0.174, 0.261, 0.348, 0.435, 0.522, 0.609, 0.783, 0.870, 0.957, 1.044, 1.131, 1.218
-    //						      1.305, 1.392, 1.479, 1.566, 1.653, 1.740, 1.830, 1.930, 2.043, 2.172, 2.322, 2.500, 2.650}
+    //double eta_limits_hcal_total[nbins_eta_hcal_total]=
+    //   {-2.650,-2.500,-2.322,-2.172,-2.043,-1.930,-1.830,-1.740,-1.653,-1.566,-1.479,-1.392,-1.305, 
+    //   -1.218,-1.131,-1.044,-0.957,-0.870,-0.783,-0.696,-0.609,-0.522,-0.435,-0.348,-0.261,-0.174,-0.087,0.0,
+    //   0.087, 0.174, 0.261, 0.348, 0.435, 0.522, 0.609, 0.783, 0.870, 0.957, 1.044, 1.131, 1.218
+    //	 1.305, 1.392, 1.479, 1.566, 1.653, 1.740, 1.830, 1.930, 2.043, 2.172, 2.322, 2.500, 2.650}
     //
     
     const int nbins_eta_hcal_total=28;   
diff --git a/DQMOffline/JetMET/src/METAnalyzer.cc b/DQMOffline/JetMET/src/METAnalyzer.cc
index c9d393cf8f81a..edde44986509c 100644
--- a/DQMOffline/JetMET/src/METAnalyzer.cc
+++ b/DQMOffline/JetMET/src/METAnalyzer.cc
@@ -319,6 +319,7 @@ void METAnalyzer::bookMonitorElement(std::string DirName,DQMStore::IBooker & ibo
     hMET_2      = ibooker.book1D("MET_2",      "MET Range 2",200,    0, 2000);
     hSumET      = ibooker.book1D("SumET",      "SumET",      400,    0, 4000);
     hMETSig     = ibooker.book1D("METSig",     "METSig",      51,    0,   51);
+    hMETSig->setLumiFlag();
     hMETPhi     = ibooker.book1D("METPhi",     "METPhi",      60, -M_PI,  M_PI);
     hMET_logx   = ibooker.book1D("MET_logx",   "MET_logx",    40,   -1,    9);
     hSumET_logx = ibooker.book1D("SumET_logx", "SumET_logx",  40,   -1,    9);
@@ -1771,7 +1772,7 @@ void METAnalyzer::fillMonitorElement(const edm::Event& iEvent, std::string DirNa
     myLuminosityBlock = iEvent.luminosityBlock();
     //
     
-    if (subFolderName!=""){
+    if (!subFolderName.empty()){
       DirName = DirName +"/"+subFolderName;
     }
     
diff --git a/DQMOffline/L1Trigger/test/runDQMOffline_step1_L1TStage2CaloLayer2_cfg.py b/DQMOffline/L1Trigger/test/runDQMOffline_step1_L1TStage2CaloLayer2_cfg.py
index f71adbd3d7f37..c9a81bd33610b 100644
--- a/DQMOffline/L1Trigger/test/runDQMOffline_step1_L1TStage2CaloLayer2_cfg.py
+++ b/DQMOffline/L1Trigger/test/runDQMOffline_step1_L1TStage2CaloLayer2_cfg.py
@@ -1,7 +1,6 @@
 import os
 import FWCore.ParameterSet.Config as cms
 from FWCore.ParameterSet.VarParsing import VarParsing
-from Configuration.StandardSequences.Eras import eras
 
 
 def get_root_files(path):
@@ -36,7 +35,8 @@ def get_root_files(path):
 }
 
 
-process = cms.Process('L1TStage2EmulatorDQM', eras.Run2_2016)
+from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
+process = cms.Process('L1TStage2EmulatorDQM', Run2_2016)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/DQMOffline/Lumi/python/ZCounting_cff.py b/DQMOffline/Lumi/python/ZCounting_cff.py
index 7d6b733789b59..a9465aacbb1d5 100644
--- a/DQMOffline/Lumi/python/ZCounting_cff.py
+++ b/DQMOffline/Lumi/python/ZCounting_cff.py
@@ -57,22 +57,23 @@
                                  )
 
 
-from Configuration.StandardSequences.Eras import eras
-
-eras.run2_HLTconditions_2016.toModify( zcounting, MuonTriggerNames = cms.vstring("HLT_IsoMu24_v*","HLT_IsoTkMu24_v*"),
+from Configuration.Eras.Modifier_run2_HLTconditions_2016_cff import run2_HLTconditions_2016
+run2_HLTconditions_2016.toModify( zcounting, MuonTriggerNames = cms.vstring("HLT_IsoMu24_v*","HLT_IsoTkMu24_v*"),
                                     MuonTriggerObjectNames = cms.vstring("hltL3crIsoL1sSingleMu22L1f0L2f10QL3f24QL3trkIsoFiltered0p07",
                                                                          "hltL3fL1sMu22L1f0Tkf24QL3trkIsoFiltered0p09"),
                                     PtCutL1  = cms.untracked.double(27.0),
                                     PtCutL2  = cms.untracked.double(27.0)
                        )
 
-eras.run2_HLTconditions_2017.toModify(zcounting, MuonTriggerNames = cms.vstring("HLT_IsoMu27_v*"),
+from Configuration.Eras.Modifier_run2_HLTconditions_2017_cff import run2_HLTconditions_2017
+run2_HLTconditions_2017.toModify(zcounting, MuonTriggerNames = cms.vstring("HLT_IsoMu27_v*"),
                                    MuonTriggerObjectNames = cms.vstring("hltL3crIsoL1sMu22Or25L1f0L2f10QL3f27QL3trkIsoFiltered0p07"),
                                    PtCutL1  = cms.untracked.double(30.0),
                                    PtCutL2  = cms.untracked.double(30.0)
                        )
 
-eras.run2_HLTconditions_2018.toModify(zcounting, MuonTriggerNames = cms.vstring("HLT_IsoMu24_v*"),
+from Configuration.Eras.Modifier_run2_HLTconditions_2018_cff import run2_HLTconditions_2018
+run2_HLTconditions_2018.toModify(zcounting, MuonTriggerNames = cms.vstring("HLT_IsoMu24_v*"),
                                    MuonTriggerObjectNames = cms.vstring("hltL3crIsoL1sSingleMu22L1f0L2f10QL3f24QL3trkIsoFiltered0p07"),
                                    PtCutL1  = cms.untracked.double(27.0),
                                    PtCutL2  = cms.untracked.double(27.0)
diff --git a/DQMOffline/Lumi/test/ZCounting_cfg.py b/DQMOffline/Lumi/test/ZCounting_cfg.py
index defff66b3a611..eab82745ca89f 100644
--- a/DQMOffline/Lumi/test/ZCounting_cfg.py
+++ b/DQMOffline/Lumi/test/ZCounting_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('RECODQM', eras.Run2_2018)
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+process = cms.Process('RECODQM', Run2_2018)
 
 # import of standard configurations
 process.load('Configuration/StandardSequences/Services_cff')
diff --git a/DQMOffline/Muon/interface/EfficiencyPlotter.h b/DQMOffline/Muon/interface/EfficiencyPlotter.h
index a7b5633dddaa5..540ddbd14ffbf 100644
--- a/DQMOffline/Muon/interface/EfficiencyPlotter.h
+++ b/DQMOffline/Muon/interface/EfficiencyPlotter.h
@@ -49,7 +49,6 @@ class EfficiencyPlotter: public DQMEDHarvester {
   // Switch for verbosity
   std::string metname;
 
-  DQMStore* theDbe;
   edm::ParameterSet parameters;
 
    //histo binning parameters
diff --git a/DQMOffline/Muon/interface/MuonKinVsEtaAnalyzer.h b/DQMOffline/Muon/interface/MuonKinVsEtaAnalyzer.h
index 3bdcc346599f3..91cbb9b9c9ed8 100644
--- a/DQMOffline/Muon/interface/MuonKinVsEtaAnalyzer.h
+++ b/DQMOffline/Muon/interface/MuonKinVsEtaAnalyzer.h
@@ -47,7 +47,6 @@ class MuonKinVsEtaAnalyzer : public DQMEDAnalyzer {
   
   // ----------member data ---------------------------
   MuonServiceProxy *theService;
-  DQMStore* theDbe;
   edm::ParameterSet parameters;
  
   // Switch for verbosity
diff --git a/DQMOffline/Muon/interface/MuonSeedsAnalyzer.h b/DQMOffline/Muon/interface/MuonSeedsAnalyzer.h
index 724e6433b7075..6a5b1f40b783d 100644
--- a/DQMOffline/Muon/interface/MuonSeedsAnalyzer.h
+++ b/DQMOffline/Muon/interface/MuonSeedsAnalyzer.h
@@ -43,7 +43,6 @@ class MuonSeedsAnalyzer : public  DQMEDAnalyzer {
   
   private:
   // ----------member data ---------------------------
-  DQMStore *theDbe;
   MuonServiceProxy *theService;
   edm::ParameterSet parameters;
 
diff --git a/DQMOffline/Muon/interface/MuonTestSummary.h b/DQMOffline/Muon/interface/MuonTestSummary.h
index f34d7c46a73d3..2ddec153f8062 100644
--- a/DQMOffline/Muon/interface/MuonTestSummary.h
+++ b/DQMOffline/Muon/interface/MuonTestSummary.h
@@ -58,7 +58,6 @@ class MuonTestSummary: public DQMEDHarvester{
 
 private:
 
-  DQMStore* dbe;
   // Switch for verbosity
   std::string metname;
 
diff --git a/DQMOffline/Muon/interface/TriggerMatchEfficiencyPlotter.h b/DQMOffline/Muon/interface/TriggerMatchEfficiencyPlotter.h
index 869cb99c394a9..038df4470d495 100644
--- a/DQMOffline/Muon/interface/TriggerMatchEfficiencyPlotter.h
+++ b/DQMOffline/Muon/interface/TriggerMatchEfficiencyPlotter.h
@@ -46,7 +46,6 @@ class TriggerMatchEfficiencyPlotter: public DQMEDHarvester {
 
 private:
   
-  DQMStore* theDbe;
   edm::ParameterSet parameters;
 
   std::string triggerhistName1_;
diff --git a/DQMOffline/Muon/interface/TriggerMatchMonitor.h b/DQMOffline/Muon/interface/TriggerMatchMonitor.h
index 009efbb5ee166..42df97d1647d1 100644
--- a/DQMOffline/Muon/interface/TriggerMatchMonitor.h
+++ b/DQMOffline/Muon/interface/TriggerMatchMonitor.h
@@ -52,7 +52,6 @@ class TriggerMatchMonitor : public DQMEDAnalyzer {
   
   // ----------member data ---------------------------
   MuonServiceProxy *theService;
-  DQMStore* theDbe;
   edm::ParameterSet parameters;
  
   // triggerNames to be passed from config
diff --git a/DQMOffline/Muon/src/MuonKinVsEtaAnalyzer.cc b/DQMOffline/Muon/src/MuonKinVsEtaAnalyzer.cc
index 6d5177049f4bf..03c0742e7c83a 100644
--- a/DQMOffline/Muon/src/MuonKinVsEtaAnalyzer.cc
+++ b/DQMOffline/Muon/src/MuonKinVsEtaAnalyzer.cc
@@ -24,7 +24,6 @@ MuonKinVsEtaAnalyzer::MuonKinVsEtaAnalyzer(const edm::ParameterSet& pSet) {
 
   // the services
   theService = new MuonServiceProxy(parameters.getParameter<ParameterSet>("ServiceParameters"));
-  theDbe = edm::Service<DQMStore>().operator->();
 
   theMuonCollectionLabel_ = consumes<edm::View<reco::Muon> >  (parameters.getParameter<edm::InputTag>("MuonCollection"));
   theVertexLabel_          = consumes<reco::VertexCollection>(parameters.getParameter<edm::InputTag>("VertexLabel"));
diff --git a/DQMOffline/Muon/src/TriggerMatchMonitor.cc b/DQMOffline/Muon/src/TriggerMatchMonitor.cc
index 4620752d083d3..7ec1ac990398e 100644
--- a/DQMOffline/Muon/src/TriggerMatchMonitor.cc
+++ b/DQMOffline/Muon/src/TriggerMatchMonitor.cc
@@ -25,7 +25,6 @@ TriggerMatchMonitor::TriggerMatchMonitor(const edm::ParameterSet& pSet) {
 
   // the services
   theService = new MuonServiceProxy(parameters.getParameter<ParameterSet>("ServiceParameters"));
-  theDbe = edm::Service<DQMStore>().operator->();
   
   beamSpotToken_ = consumes<reco::BeamSpot >(parameters.getUntrackedParameter<edm::InputTag>("offlineBeamSpot")),
   primaryVerticesToken_ = consumes<std::vector<reco::Vertex> >(parameters.getUntrackedParameter<edm::InputTag>("offlinePrimaryVertices")),
diff --git a/DQMOffline/PFTau/interface/Benchmark.h b/DQMOffline/PFTau/interface/Benchmark.h
index a9dd9635015bd..10a239829e433 100644
--- a/DQMOffline/PFTau/interface/Benchmark.h
+++ b/DQMOffline/PFTau/interface/Benchmark.h
@@ -15,103 +15,120 @@ class TProfile;
 class TH2F;
 class TDirectory;
 
-class DQMStore; 
-
-
-/// abstract base class 
-class Benchmark{
-
- public:
+class DQMStore;
 
+/// abstract base class
+class Benchmark {
+public:
   class PhaseSpace {
   public:
-    int n; 
+    int n;
     float m;
     float M;
     PhaseSpace() : n(1), m(0), M(1) {}
-    PhaseSpace( int n, float m, float M):n(n), m(m), M(M) {}
+    PhaseSpace(int n, float m, float M) : n(n), m(m), M(M) {}
   };
 
-  enum Mode {
-    DEFAULT,
-    DQMOFFLINE,
-    VALIDATION
-  };
+  enum Mode { DEFAULT, DQMOFFLINE, VALIDATION };
 
-  Benchmark(Mode mode = DEFAULT) : 
-    dir_(nullptr), mode_(mode), 
-    ptMin_(0), ptMax_(10e10), 
-    etaMin_(-10), etaMax_(10), 
-    phiMin_(-10), phiMax_(10) {}
+  Benchmark(Mode mode = DEFAULT)
+      : dir_(nullptr), mode_(mode), ptMin_(0), ptMax_(10e10), etaMin_(-10), etaMax_(10), phiMin_(-10), phiMax_(10) {}
 
   virtual ~Benchmark() noexcept(false);
 
-  void setParameters( Mode mode) { mode_ = mode;}
-  
-  void setRange( float ptMin, float ptMax, 
-		 float etaMin, float etaMax, 
-		 float phiMin, float phiMax ) {
-    ptMin_ = ptMin; ptMax_ = ptMax; etaMin_ = etaMin; etaMax_ = etaMax;
-    phiMin_ = phiMin; phiMax_ = phiMax;
+  void setParameters(Mode mode) { mode_ = mode; }
+
+  void setRange(float ptMin, float ptMax, float etaMin, float etaMax, float phiMin, float phiMax) {
+    ptMin_ = ptMin;
+    ptMax_ = ptMax;
+    etaMin_ = etaMin;
+    etaMax_ = etaMax;
+    phiMin_ = phiMin;
+    phiMax_ = phiMax;
   }
 
   bool isInRange(float pt, float eta, float phi) const {
-    return pt>ptMin_ && pt<ptMax_ && eta>etaMin_ && eta<etaMax_ && phi>phiMin_ && phi<phiMax_ ? true : false; 
+    return pt > ptMin_ && pt < ptMax_ && eta > etaMin_ && eta < etaMax_ && phi > phiMin_ && phi < phiMax_ ? true
+                                                                                                          : false;
   }
 
-  virtual void setDirectory(TDirectory* dir);
-  
-  /// write to the TFile, in plain ROOT mode. No need to call this function in DQM mode
+  virtual void setDirectory(TDirectory *dir);
+
+  /// write to the TFile, in plain ROOT mode. No need to call this function in
+  /// DQM mode
   void write();
-  
- protected:
-  
-  /// book a 1D histogram, either with DQM or plain root depending if DQM_ has been initialized in a child analyzer or not.
-  //TH1F* book1D(const char* histname, const char* title, 
+
+protected:
+  /// book a 1D histogram, either with DQM or plain root depending if DQM_ has
+  /// been initialized in a child analyzer or not.
+  // TH1F* book1D(const char* histname, const char* title,
   /// book a 1D histogram, either through IBooker or plain root
-  TH1F* book1D(DQMStore::IBooker& b, const char* histname, const char* title,
-	       int nbins, float xmin, float xmax);
-  
-  /// book a 2D histogram, either with DQM or plain root depending if DQM_ has been initialized in a child analyzer or not.
-  //TH2F* book2D(const char* histname, const char* title, 
-  /// book a 2D histogram, either through IBooker or plain root
-  TH2F* book2D(DQMStore::IBooker& b, const char* histname, const char* title,
-	       int nbinsx, float xmin, float xmax,
-	       int nbinsy, float ymin, float ymax ); 
+  TH1F *book1D(DQMStore::IBooker &b, const char *histname, const char *title, int nbins, float xmin, float xmax);
 
-  /// book a 2D histogram, either with DQM or plain root depending if DQM_ has been initialized in a child analyzer or not.
-  //TH2F* book2D(const char* histname, const char* title, 
+  /// book a 2D histogram, either with DQM or plain root depending if DQM_ has
+  /// been initialized in a child analyzer or not.
+  // TH2F* book2D(const char* histname, const char* title,
   /// book a 2D histogram, either through IBooker or plain root
-  TH2F* book2D(DQMStore::IBooker& b, const char* histname, const char* title,
-	       int nbinsx, float* xbins,
-	       int nbinsy, float ymin, float ymax ); 
-
-  /// book a TProfile histogram, either with DQM or plain root depending if DQM_ has been initialized in a child analyzer or not.
-  //TProfile* bookProfile(const char* histname, const char* title,
+  TH2F *book2D(DQMStore::IBooker &b,
+               const char *histname,
+               const char *title,
+               int nbinsx,
+               float xmin,
+               float xmax,
+               int nbinsy,
+               float ymin,
+               float ymax);
+
+  /// book a 2D histogram, either with DQM or plain root depending if DQM_ has
+  /// been initialized in a child analyzer or not.
+  // TH2F* book2D(const char* histname, const char* title,
+  /// book a 2D histogram, either through IBooker or plain root
+  TH2F *book2D(DQMStore::IBooker &b,
+               const char *histname,
+               const char *title,
+               int nbinsx,
+               float *xbins,
+               int nbinsy,
+               float ymin,
+               float ymax);
+
+  /// book a TProfile histogram, either with DQM or plain root depending if DQM_
+  /// has been initialized in a child analyzer or not.
+  // TProfile* bookProfile(const char* histname, const char* title,
   /// book a TProfile, either through IBooker or plain root
-  TProfile* bookProfile(DQMStore::IBooker& b, const char* histname, const char* title,
-			int nbinsx, float xmin, float xmax,
-			float ymin, float ymax, const char* option );
-
-  /// book a TProfile histogram, either with DQM or plain root depending if DQM_ has been initialized in a child analyzer or not.
-  //TProfile* bookProfile(const char* histname, const char* title,
+  TProfile *bookProfile(DQMStore::IBooker &b,
+                        const char *histname,
+                        const char *title,
+                        int nbinsx,
+                        float xmin,
+                        float xmax,
+                        float ymin,
+                        float ymax,
+                        const char *option);
+
+  /// book a TProfile histogram, either with DQM or plain root depending if DQM_
+  /// has been initialized in a child analyzer or not.
+  // TProfile* bookProfile(const char* histname, const char* title,
   /// book a TProfile, either through IBooker or plain root
-  TProfile* bookProfile(DQMStore::IBooker& b, const char* histname, const char* title,
-			int nbinsx, float* xbins,
-			float ymin, float ymax, const char* option );
- 
-  TDirectory* dir_;
-
-  Mode        mode_;
-
-  float       ptMin_;
-  float       ptMax_;
-  float       etaMin_;
-  float       etaMax_;
-  float       phiMin_;
-  float       phiMax_;
-
-
+  TProfile *bookProfile(DQMStore::IBooker &b,
+                        const char *histname,
+                        const char *title,
+                        int nbinsx,
+                        float *xbins,
+                        float ymin,
+                        float ymax,
+                        const char *option);
+
+  TDirectory *dir_;
+
+  Mode mode_;
+
+  float ptMin_;
+  float ptMax_;
+  float etaMin_;
+  float etaMax_;
+  float phiMin_;
+  float phiMax_;
 };
 
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/interface/CandidateBenchmark.h b/DQMOffline/PFTau/interface/CandidateBenchmark.h
index f31c479386b86..9c77e9152a44b 100644
--- a/DQMOffline/PFTau/interface/CandidateBenchmark.h
+++ b/DQMOffline/PFTau/interface/CandidateBenchmark.h
@@ -8,44 +8,37 @@
 
 /// To plot Candidate quantities
 class CandidateBenchmark : public Benchmark {
-
- public:
-
-
+public:
   CandidateBenchmark(Mode mode);
   ~CandidateBenchmark() override;
 
   /// book histograms
-  void setup(DQMStore::IBooker& b);
-  void setup(DQMStore::IBooker& b, const edm::ParameterSet& parameterSet);
+  void setup(DQMStore::IBooker &b);
+  void setup(DQMStore::IBooker &b, const edm::ParameterSet &parameterSet);
 
-  template< class C>
-  void fill( const C& candidates); 
-  
-  /// fill histograms with a given particle
-  void fillOne( const reco::Candidate& candidate); 
+  template <class C>
+  void fill(const C &candidates);
 
- protected:
-  
+  /// fill histograms with a given particle
+  void fillOne(const reco::Candidate &candidate);
 
-  TH1F* pt_; 
-  TH1F* eta_; 
-  TH1F* phi_; 
-  TH1F* charge_;
-  ///COLIN add this histo
-  TH1F* pdgId_; 
+protected:
+  TH1F *pt_;
+  TH1F *eta_;
+  TH1F *phi_;
+  TH1F *charge_;
+  /// COLIN add this histo
+  TH1F *pdgId_;
 
   bool histogramBooked_;
 };
 
-template< class C>
-void CandidateBenchmark::fill(const C& candCollection) {
-
+template <class C>
+void CandidateBenchmark::fill(const C &candCollection) {
   for (unsigned int i = 0; i < candCollection.size(); i++) {
-    const reco::Candidate& cand = candCollection[i];
+    const reco::Candidate &cand = candCollection[i];
     fillOne(cand);
   }
 }
 
-
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/interface/METBenchmark.h b/DQMOffline/PFTau/interface/METBenchmark.h
index 9e515d756a174..a5a16c4d8dcc2 100644
--- a/DQMOffline/PFTau/interface/METBenchmark.h
+++ b/DQMOffline/PFTau/interface/METBenchmark.h
@@ -9,43 +9,38 @@
 
 /// To plot MET quantities
 class METBenchmark : public Benchmark {
-
- public:
-
+public:
   METBenchmark(Mode mode) : Benchmark(mode) {}
   ~METBenchmark() override;
 
   /// book histograms
-  void setup(DQMStore::IBooker& b);
+  void setup(DQMStore::IBooker &b);
 
   /// fill a collection
-  template< class C>
-  void fill( const C& candidates); 
-  
-  /// fill histograms with a given particle
-  void fillOne( const reco::MET& candidate); 
-
- protected:
-  
-  TH1F*   pt_;
-  TH1F*   pt2_;
-  TH1F*   px_;
-  TH1F*   py_;
-  TH1F*   phi_;
-  TH1F*   sumEt_;
-  TH1F*   sumEt2_;  
-  TH1F*   etOverSumEt_;
-  TH2F*   mex_VS_sumEt_;
+  template <class C>
+  void fill(const C &candidates);
 
+  /// fill histograms with a given particle
+  void fillOne(const reco::MET &candidate);
+
+protected:
+  TH1F *pt_;
+  TH1F *pt2_;
+  TH1F *px_;
+  TH1F *py_;
+  TH1F *phi_;
+  TH1F *sumEt_;
+  TH1F *sumEt2_;
+  TH1F *etOverSumEt_;
+  TH2F *mex_VS_sumEt_;
 };
 
-template< class C>
-void METBenchmark::fill(const C& candCollection) {
-
+template <class C>
+void METBenchmark::fill(const C &candCollection) {
   for (unsigned int i = 0; i < candCollection.size(); ++i) {
-    const reco::MET& cand = candCollection[i];
+    const reco::MET &cand = candCollection[i];
     fillOne(cand);
   }
 }
 
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/interface/MatchCandidateBenchmark.h b/DQMOffline/PFTau/interface/MatchCandidateBenchmark.h
index b6068664a187e..11605045ff1cb 100644
--- a/DQMOffline/PFTau/interface/MatchCandidateBenchmark.h
+++ b/DQMOffline/PFTau/interface/MatchCandidateBenchmark.h
@@ -3,50 +3,43 @@
 
 #include "DQMOffline/PFTau/interface/Benchmark.h"
 
-#include "DataFormats/Candidate/interface/CandidateFwd.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
+#include "DataFormats/Candidate/interface/CandidateFwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include <vector>
 
 /// To plot Candidate quantities
 class MatchCandidateBenchmark : public Benchmark {
-
- public:
-
+public:
   MatchCandidateBenchmark(Mode mode);
 
   ~MatchCandidateBenchmark() override;
 
   /// book histograms
-  void setup(DQMStore::IBooker& b);
-  void setup(DQMStore::IBooker& b, const edm::ParameterSet& parameterSet);
-  
+  void setup(DQMStore::IBooker &b);
+  void setup(DQMStore::IBooker &b, const edm::ParameterSet &parameterSet);
+
   /// fill histograms with a given particle
-  void fillOne( const reco::Candidate& candidate,
-    const reco::Candidate& matchedCandidate ); 
-  
-  void fillOne( const reco::Candidate& candidate,
-		const reco::Candidate& matchedCandidate,
-		const edm::ParameterSet& parameterSet );
-  
- protected:
-  
-  TH2F* delta_et_Over_et_VS_et_;
-  TH2F* delta_et_VS_et_; 
-  TH2F* delta_eta_VS_et_; 
-  TH2F* delta_phi_VS_et_;
-
-  TH2F* BRdelta_et_Over_et_VS_et_; 
-  TH2F* ERdelta_et_Over_et_VS_et_;
-  std::vector<TH1F*> pTRes_ ;
-  std::vector<TH1F*> BRpTRes_ ;
-  std::vector<TH1F*> ERpTRes_ ;
-
-  bool  histogramBooked_;
+  void fillOne(const reco::Candidate &candidate, const reco::Candidate &matchedCandidate);
 
-};
+  void fillOne(const reco::Candidate &candidate,
+               const reco::Candidate &matchedCandidate,
+               const edm::ParameterSet &parameterSet);
+
+protected:
+  TH2F *delta_et_Over_et_VS_et_;
+  TH2F *delta_et_VS_et_;
+  TH2F *delta_eta_VS_et_;
+  TH2F *delta_phi_VS_et_;
 
- 
+  TH2F *BRdelta_et_Over_et_VS_et_;
+  TH2F *ERdelta_et_Over_et_VS_et_;
+  std::vector<TH1F *> pTRes_;
+  std::vector<TH1F *> BRpTRes_;
+  std::vector<TH1F *> ERpTRes_;
+
+  bool histogramBooked_;
+};
 
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/interface/MatchMETBenchmark.h b/DQMOffline/PFTau/interface/MatchMETBenchmark.h
index 1ec01673842e9..980173ee55ea4 100644
--- a/DQMOffline/PFTau/interface/MatchMETBenchmark.h
+++ b/DQMOffline/PFTau/interface/MatchMETBenchmark.h
@@ -5,43 +5,40 @@
 #include "DataFormats/Candidate/interface/CandidateFwd.h"
 #include "DataFormats/METReco/interface/METFwd.h"
 
-// integrate and check your benchmarks in PFRootEvent (take PFCandidateManager as an example)
+// integrate and check your benchmarks in PFRootEvent (take PFCandidateManager
+// as an example)
 
-// remove the old benchmarks from these 2 packages (Validation and PFRootEvent) (python files, C++ code, ...)
+// remove the old benchmarks from these 2 packages (Validation and PFRootEvent)
+// (python files, C++ code, ...)
 class MatchMETBenchmark : public Benchmark {
-
- public:
-
+public:
   MatchMETBenchmark(Mode mode) : Benchmark(mode) {}
   ~MatchMETBenchmark() override;
 
   /// book histograms
-  void setup(DQMStore::IBooker& b);
-  
-  /// fill histograms with a given particle
-  void fillOne( const reco::MET& candidate,
-		const reco::MET& matchedCandidate ); 
+  void setup(DQMStore::IBooker &b);
 
+  /// fill histograms with a given particle
+  void fillOne(const reco::MET &candidate, const reco::MET &matchedCandidate);
 
- protected:
-  // next 3: add to MatchCandidateBenchmark? 
+protected:
+  // next 3: add to MatchCandidateBenchmark?
 
-  TH2F*   delta_et_VS_et_;
-  TH2F*   delta_et_Over_et_VS_et_; 
+  TH2F *delta_et_VS_et_;
+  TH2F *delta_et_Over_et_VS_et_;
 
-  TH2F*   delta_phi_VS_et_; 
+  TH2F *delta_phi_VS_et_;
 
-  TH1F*   delta_ex_;
+  TH1F *delta_ex_;
 
-  // True and Rec: remove. remove the following histo? 
-  TH2F*   RecEt_VS_TrueEt_;
-  TH2F*   delta_set_VS_set_;
-  TH2F*   delta_set_Over_set_VS_set_;
-  TH2F*   delta_ex_VS_set_;
+  // True and Rec: remove. remove the following histo?
+  TH2F *RecEt_VS_TrueEt_;
+  TH2F *delta_set_VS_set_;
+  TH2F *delta_set_Over_set_VS_set_;
+  TH2F *delta_ex_VS_set_;
 
   // remove the following histo?
-  TH2F*   RecSet_Over_TrueSet_VS_TrueSet_;
-
+  TH2F *RecSet_Over_TrueSet_VS_TrueSet_;
 };
 
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/interface/Matchers.h b/DQMOffline/PFTau/interface/Matchers.h
index 4e85494de2edd..9afcd480bb564 100644
--- a/DQMOffline/PFTau/interface/Matchers.h
+++ b/DQMOffline/PFTau/interface/Matchers.h
@@ -8,110 +8,102 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
 
-#include <vector>
 #include <iostream>
-
+#include <vector>
 
 namespace PFB {
- 
-  template< typename C, typename M >
-    void match( const C& candCollection,
-		const M& matchedCandCollection, 
-		std::vector<int>& matchIndices,
-		bool  matchCharge = false, 
-		float dRMax=-1 )  {
-    
-    // compute distance to each candidate in the matchedCandCollection. 
-  
+
+  template <typename C, typename M>
+  void match(const C &candCollection,
+             const M &matchedCandCollection,
+             std::vector<int> &matchIndices,
+             bool matchCharge = false,
+             float dRMax = -1) {
+    // compute distance to each candidate in the matchedCandCollection.
+
     float dR2Max = 0;
-    if(dRMax>0) dR2Max = dRMax*dRMax;
-    
+    if (dRMax > 0)
+      dR2Max = dRMax * dRMax;
+
     matchIndices.clear();
-    matchIndices.resize( candCollection.size(), -1);
-    
-    for( unsigned i=0; i<candCollection.size(); ++i) {
+    matchIndices.resize(candCollection.size(), -1);
 
+    for (unsigned i = 0; i < candCollection.size(); ++i) {
       static const double bigNumber = 1e14;
       double dR2min = bigNumber;
       int jMin = -1;
-      for( unsigned jm=0; jm<matchedCandCollection.size(); ++jm) {
-	
-	if( matchCharge && 
-	    candCollection[i].charge() != matchedCandCollection[jm].charge() ) 
-	  continue;
-
-	double dR2 = reco::deltaR2( candCollection[i],
-				    matchedCandCollection[jm] );
-	if( dR2<dR2min ) {
-	  dR2min = dR2;
-	  jMin = jm;
-	}
+      for (unsigned jm = 0; jm < matchedCandCollection.size(); ++jm) {
+        if (matchCharge && candCollection[i].charge() != matchedCandCollection[jm].charge())
+          continue;
+
+        double dR2 = reco::deltaR2(candCollection[i], matchedCandCollection[jm]);
+        if (dR2 < dR2min) {
+          dR2min = dR2;
+          jMin = jm;
+        }
       }
-      
-      if( (dR2Max>0 && dR2min < dR2Max) || dRMax<=0 ) {
-	matchIndices[i] = jMin; 
-	/* 	std::cout<<"match "<<dR2min<<std::endl;  */
+
+      if ((dR2Max > 0 && dR2min < dR2Max) || dRMax <= 0) {
+        matchIndices[i] = jMin;
+        /* 	std::cout<<"match "<<dR2min<<std::endl;  */
       }
-      // store the closest match, no cut on deltaR. 
+      // store the closest match, no cut on deltaR.
     }
   }
 
   // needed by muon matching
-  //template< typename C, typename M, typename MM>
-  template< typename C, typename M >
-    void match( const C& candCollection,
-		const M& matchedCandCollection, 
-		std::vector<int>& matchIndices,
-		const edm::ParameterSet & parameterSet,
-		//const MM& muonMatchedCandCollection,
-		edm::View<reco::Muon> muonMatchedCandCollection,
-		bool  matchCharge = false, 
-		float dRMax=-1)  {
-    
-    // compute distance to each candidate in the matchedCandCollection. 
-    
+  // template< typename C, typename M, typename MM>
+  template <typename C, typename M>
+  void match(const C &candCollection,
+             const M &matchedCandCollection,
+             std::vector<int> &matchIndices,
+             const edm::ParameterSet &parameterSet,
+             // const MM& muonMatchedCandCollection,
+             edm::View<reco::Muon> muonMatchedCandCollection,
+             bool matchCharge = false,
+             float dRMax = -1) {
+    // compute distance to each candidate in the matchedCandCollection.
+
     float dR2Max = 0;
-    if(dRMax>0) dR2Max = dRMax*dRMax;
-    
+    if (dRMax > 0)
+      dR2Max = dRMax * dRMax;
+
     matchIndices.clear();
-    matchIndices.resize( candCollection.size(), -1);
-    
-    for( unsigned i=0; i<candCollection.size(); ++i) {
+    matchIndices.resize(candCollection.size(), -1);
 
+    for (unsigned i = 0; i < candCollection.size(); ++i) {
       static const double bigNumber = 1e14;
       double dR2min = bigNumber;
       int jMin = -1;
-      for( unsigned jm=0; jm<matchedCandCollection.size(); ++jm) {
-	
-	if ( parameterSet.getParameter<bool>("slimmedLikeSelection") ) {
-	  if ( !( muonMatchedCandCollection[jm].pt() > parameterSet.getParameter<double>("ptBase")  ||
-		  muonMatchedCandCollection[jm].isPFMuon()                                          ||
-		  ( muonMatchedCandCollection[jm].pt() > parameterSet.getParameter<double>("ptNotPF") &&
-		    (muonMatchedCandCollection[jm].isGlobalMuon() || muonMatchedCandCollection[jm].isStandAloneMuon() || muonMatchedCandCollection[jm].numberOfMatches() > 0  || muon::isGoodMuon(muonMatchedCandCollection[jm], muon::RPCMuLoose) ) ) 
-		  ) )
-	    continue ;
-	}
-
-	if( matchCharge  && 
-	    candCollection[i].charge() != matchedCandCollection[jm].charge() ) 
-	  continue ;
-
-	double dR2 = reco::deltaR2( candCollection[i],
-				    matchedCandCollection[jm] );
-	if( dR2<dR2min ) {
-	  dR2min = dR2;
-	  jMin = jm;
-	}
+      for (unsigned jm = 0; jm < matchedCandCollection.size(); ++jm) {
+        if (parameterSet.getParameter<bool>("slimmedLikeSelection")) {
+          if (!(muonMatchedCandCollection[jm].pt() > parameterSet.getParameter<double>("ptBase") ||
+                muonMatchedCandCollection[jm].isPFMuon() ||
+                (muonMatchedCandCollection[jm].pt() > parameterSet.getParameter<double>("ptNotPF") &&
+                 (muonMatchedCandCollection[jm].isGlobalMuon() || muonMatchedCandCollection[jm].isStandAloneMuon() ||
+                  muonMatchedCandCollection[jm].numberOfMatches() > 0 ||
+                  muon::isGoodMuon(muonMatchedCandCollection[jm], muon::RPCMuLoose)))))
+            continue;
+        }
+
+        if (matchCharge && candCollection[i].charge() != matchedCandCollection[jm].charge())
+          continue;
+
+        double dR2 = reco::deltaR2(candCollection[i], matchedCandCollection[jm]);
+        if (dR2 < dR2min) {
+          dR2min = dR2;
+          jMin = jm;
+        }
       }
-      
-      if( (dR2Max>0 && dR2min < dR2Max) || dRMax<=0 ) {
-	matchIndices[i] = jMin; 
-	/* 	std::cout<<"match "<<dR2min<<std::endl;  */
+
+      if ((dR2Max > 0 && dR2min < dR2Max) || dRMax <= 0) {
+        matchIndices[i] = jMin;
+        /* 	std::cout<<"match "<<dR2min<<std::endl;  */
       }
-      // store the closest match, no cut on deltaR. 
+      // store the closest match, no cut on deltaR.
     }
   }
-  
-}
 
-#endif 
+}  // namespace PFB
+
+#endif
diff --git a/DQMOffline/PFTau/interface/PFCandidateBenchmark.h b/DQMOffline/PFTau/interface/PFCandidateBenchmark.h
index 5090863dcde59..03fd646a4e485 100644
--- a/DQMOffline/PFTau/interface/PFCandidateBenchmark.h
+++ b/DQMOffline/PFTau/interface/PFCandidateBenchmark.h
@@ -7,30 +7,26 @@
 
 /// To plot specific PFCandidate quantities
 /// the name of the histograms corresponds to the name of the
-/// PFCandidate accessors. 
+/// PFCandidate accessors.
 class PFCandidateBenchmark : public Benchmark {
-
- public:
-
+public:
   PFCandidateBenchmark(Mode mode) : Benchmark(mode) {}
   ~PFCandidateBenchmark() override;
 
   /// book histograms
-  void setup(DQMStore::IBooker& b);
-  
-  void fill( const reco::PFCandidateCollection& pfCands);
+  void setup(DQMStore::IBooker &b);
 
-  /// fill histograms with a given particle
-  void fillOne(const reco::PFCandidate& pfCand);
-
- protected:
-  
-  TH1F*   particleId_; 
-  TH1F*   ecalEnergy_; 
-  TH1F*   hcalEnergy_; 
-  TH1F*   mva_e_pi_; 
-  TH1F*   elementsInBlocksSize_;
+  void fill(const reco::PFCandidateCollection &pfCands);
 
+  /// fill histograms with a given particle
+  void fillOne(const reco::PFCandidate &pfCand);
+
+protected:
+  TH1F *particleId_;
+  TH1F *ecalEnergy_;
+  TH1F *hcalEnergy_;
+  TH1F *mva_e_pi_;
+  TH1F *elementsInBlocksSize_;
 };
 
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/interface/PFCandidateManager.h b/DQMOffline/PFTau/interface/PFCandidateManager.h
index 11e3ebe35eb4e..64551d32f8fb1 100644
--- a/DQMOffline/PFTau/interface/PFCandidateManager.h
+++ b/DQMOffline/PFTau/interface/PFCandidateManager.h
@@ -3,97 +3,87 @@
 
 #include "DQMOffline/PFTau/interface/Benchmark.h"
 #include "DQMOffline/PFTau/interface/CandidateBenchmark.h"
-#include "DQMOffline/PFTau/interface/PFCandidateBenchmark.h"
 #include "DQMOffline/PFTau/interface/MatchCandidateBenchmark.h"
+#include "DQMOffline/PFTau/interface/PFCandidateBenchmark.h"
 
-#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
 #include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
+#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
 
 #include <vector>
 
 /// \brief A benchmark managing several benchmarks
-/// 
-/// The benchmarks are filled only for the PFCandidates matched to 
-/// a candidate in the matching collection within the limits in delta R. 
+///
+/// The benchmarks are filled only for the PFCandidates matched to
+/// a candidate in the matching collection within the limits in delta R.
 /// The parameters for this benchmark are:
 /// - the maximum delta R for matching
-/// - the minimum pT of the reconstructed PFCandidate. Low pT PFCandidates have to be removed,
-/// as they lead to a lot of hits in the histograms with delta p_T just a bit larger than p_T_gen
-/// - a bool, specifying if the charge of the candidates should be used in the matching.
-/// - the benchmark mode, driving the size of the histograms. 
+/// - the minimum pT of the reconstructed PFCandidate. Low pT PFCandidates have
+/// to be removed, as they lead to a lot of hits in the histograms with delta
+/// p_T just a bit larger than p_T_gen
+/// - a bool, specifying if the charge of the candidates should be used in the
+/// matching.
+/// - the benchmark mode, driving the size of the histograms.
 class PFCandidateManager : public Benchmark {
+public:
+  PFCandidateManager(float dRMax = 0.3, bool matchCharge = true, Benchmark::Mode mode = Benchmark::DEFAULT)
+      : Benchmark(mode),
+        candBench_(mode),
+        pfCandBench_(mode),
+        matchCandBench_(mode),
+        dRMax_(dRMax),
+        matchCharge_(matchCharge) {}
 
- public:
-  
-  PFCandidateManager( float dRMax = 0.3,
-		      bool matchCharge = true, 
-		      Benchmark::Mode mode=Benchmark::DEFAULT) 
-    : 
-    Benchmark(mode), 
-    candBench_(mode), pfCandBench_(mode), matchCandBench_(mode), 
-    dRMax_(dRMax), matchCharge_(matchCharge) {}
-  
   ~PFCandidateManager() override;
-  
+
   /// set the benchmark parameters
-  void setParameters( float dRMax = 0.3,
-		      bool matchCharge = true, 
-		      Benchmark::Mode mode=Benchmark::DEFAULT );
-  
+  void setParameters(float dRMax = 0.3, bool matchCharge = true, Benchmark::Mode mode = Benchmark::DEFAULT);
+
   /// set directory (to use in ROOT)
-  void setDirectory(TDirectory* dir) override;
+  void setDirectory(TDirectory *dir) override;
 
   /// book histograms
-  void setup(DQMStore::IBooker& b);
-  
+  void setup(DQMStore::IBooker &b);
+
   /// fill histograms with all particle
-  template< class C>
-  void fill(const reco::PFCandidateCollection& candCollection,
-	    const C& matchedCandCollection );
+  template <class C>
+  void fill(const reco::PFCandidateCollection &candCollection, const C &matchedCandCollection);
 
- protected:
-  CandidateBenchmark      candBench_;
-  PFCandidateBenchmark    pfCandBench_;
+protected:
+  CandidateBenchmark candBench_;
+  PFCandidateBenchmark pfCandBench_;
   MatchCandidateBenchmark matchCandBench_;
 
   float dRMax_;
-  bool  matchCharge_;
-
+  bool matchCharge_;
 };
 
-
 #include "DQMOffline/PFTau/interface/Matchers.h"
 
-template< class C>
-void PFCandidateManager::fill(const reco::PFCandidateCollection& candCollection,
-			      const C& matchCandCollection) {
-  
-
+template <class C>
+void PFCandidateManager::fill(const reco::PFCandidateCollection &candCollection, const C &matchCandCollection) {
   std::vector<int> matchIndices;
-  PFB::match( candCollection, matchCandCollection, matchIndices, 
-	      matchCharge_, dRMax_ );
+  PFB::match(candCollection, matchCandCollection, matchIndices, matchCharge_, dRMax_);
 
   for (unsigned int i = 0; i < candCollection.size(); i++) {
-    const reco::PFCandidate& cand = candCollection[i];
+    const reco::PFCandidate &cand = candCollection[i];
+
+    if (!isInRange(cand.pt(), cand.eta(), cand.phi()))
+      continue;
 
-    if( !isInRange(cand.pt(), cand.eta(), cand.phi() ) ) continue;
-    
     int iMatch = matchIndices[i];
 
-    assert(iMatch< static_cast<int>(matchCandCollection.size()));
- 
-    //COLIN how to handle efficiency plots?
+    assert(iMatch < static_cast<int>(matchCandCollection.size()));
+
+    // COLIN how to handle efficiency plots?
 
-    // filling the histograms in CandidateBenchmark only in case 
-    // of a matching. 
-    if( iMatch!=-1 ) {
+    // filling the histograms in CandidateBenchmark only in case
+    // of a matching.
+    if (iMatch != -1) {
       candBench_.fillOne(cand);
       pfCandBench_.fillOne(cand);
-      matchCandBench_.fillOne(cand, matchCandCollection[ iMatch ]);
+      matchCandBench_.fillOne(cand, matchCandCollection[iMatch]);
     }
   }
 }
 
- 
-
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/interface/PFCandidateMonitor.h b/DQMOffline/PFTau/interface/PFCandidateMonitor.h
index dd9823e51b63b..386c3eb585520 100644
--- a/DQMOffline/PFTau/interface/PFCandidateMonitor.h
+++ b/DQMOffline/PFTau/interface/PFCandidateMonitor.h
@@ -1,192 +1,241 @@
 #ifndef DQMOffline_PFTau_PFCandidateMonitor_h
 #define DQMOffline_PFTau_PFCandidateMonitor_h
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DQMOffline/PFTau/interface/Benchmark.h"
 #include "DQMOffline/PFTau/interface/CandidateBenchmark.h"
 #include "DQMOffline/PFTau/interface/MatchCandidateBenchmark.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "DataFormats/Candidate/interface/CandidateFwd.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
+#include "DataFormats/Candidate/interface/CandidateFwd.h"
 
 #include <vector>
 
 #include <TH1.h>  //needed by the deltaR->Fill() call
 
 class PFCandidateMonitor : public Benchmark {
+public:
+  PFCandidateMonitor(float dRMax = 0.3, bool matchCharge = true, Benchmark::Mode mode = Benchmark::DEFAULT);
 
- public:
+  ~PFCandidateMonitor() override;
 
-  PFCandidateMonitor( float dRMax = 0.3, bool matchCharge = true, 
-		      Benchmark::Mode mode=Benchmark::DEFAULT); 
+  /// set the parameters locally
+  void setParameters(float dRMax,
+                     bool matchCharge,
+                     Benchmark::Mode mode,
+                     float ptmin,
+                     float ptmax,
+                     float etamin,
+                     float etamax,
+                     float phimin,
+                     float phimax,
+                     bool refHistoFlag);
+
+  /// set the parameters accessing them from ParameterSet
+  void setParameters(const edm::ParameterSet &parameterSet);
 
-  ~PFCandidateMonitor() override;
-  
-  /// set the parameters locally                                   
-  void setParameters(float dRMax, bool matchCharge, Benchmark::Mode mode,
-		     float ptmin, float ptmax, float etamin, float etamax,
-		     float phimin, float phimax, bool refHistoFlag);
-
-  /// set the parameters accessing them from ParameterSet   
-  void setParameters( const edm::ParameterSet& parameterSet);
-  
   /// set directory (to use in ROOT)
-  void setDirectory(TDirectory* dir) override;
+  void setDirectory(TDirectory *dir) override;
 
   /// book histograms
-  void setup(DQMStore::IBooker& b);
-  void setup(DQMStore::IBooker& b, const edm::ParameterSet & parameterSet);
-  
+  void setup(DQMStore::IBooker &b);
+  void setup(DQMStore::IBooker &b, const edm::ParameterSet &parameterSet);
+
   /// fill histograms with all particle
-  template< class T, class C>  
-    /*void fill(const T& candidateCollection,
-      const C& matchedCandCollection, float& minVal, float& maxVal) ;*/
-    void fill(const T& candidateCollection,
-	      const C& matchedCandCollection, float& minVal, float& maxVal,
-	      const edm::ParameterSet & parameterSet) ;
-  template< class T, class C, class M>  
-    void fill(const T& candidateCollection,
-	      const C& matchedCandCollection, float& minVal, float& maxVal,
-	      const edm::ParameterSet & parameterSet, const M& muonMatchedCandCollection ) ;
-  
-  void fillOne(const reco::Candidate& cand);
-  
- protected:
-  CandidateBenchmark      candBench_;
+  template <class T, class C>
+  /*void fill(const T& candidateCollection,
+    const C& matchedCandCollection, float& minVal, float& maxVal) ;*/
+  void fill(const T &candidateCollection,
+            const C &matchedCandCollection,
+            float &minVal,
+            float &maxVal,
+            const edm::ParameterSet &parameterSet);
+  template <class T, class C, class M>
+  void fill(const T &candidateCollection,
+            const C &matchedCandCollection,
+            float &minVal,
+            float &maxVal,
+            const edm::ParameterSet &parameterSet,
+            const M &muonMatchedCandCollection);
+
+  void fillOne(const reco::Candidate &cand);
+
+protected:
+  CandidateBenchmark candBench_;
   MatchCandidateBenchmark matchCandBench_;
 
-  TH1F* pt_gen_;
-  TH1F* eta_gen_;
-  TH1F* phi_gen_;
+  TH1F *pt_gen_;
+  TH1F *eta_gen_;
+  TH1F *phi_gen_;
 
-  TH1F* pt_ref_;
-  TH1F* eta_ref_;
-  TH1F* phi_ref_;
+  TH1F *pt_ref_;
+  TH1F *eta_ref_;
+  TH1F *phi_ref_;
 
-  TH1F* deltaR_;
+  TH1F *deltaR_;
   float dRMax_;
-  bool  matchCharge_;
-  bool  createReferenceHistos_;
-  bool  histogramBooked_;
+  bool matchCharge_;
+  bool createReferenceHistos_;
+  bool histogramBooked_;
 
-  bool  matching_done_;
-  bool  createEfficiencyHistos_;
+  bool matching_done_;
+  bool createEfficiencyHistos_;
 };
 
 #include "DQMOffline/PFTau/interface/Matchers.h"
-template< class T, class C>
-  void PFCandidateMonitor::fill(const T& candCollection,
-				const C& matchedCandCollection, float& minVal, float& maxVal,
-				const edm::ParameterSet & parameterSet) {
-  
+template <class T, class C>
+void PFCandidateMonitor::fill(const T &candCollection,
+                              const C &matchedCandCollection,
+                              float &minVal,
+                              float &maxVal,
+                              const edm::ParameterSet &parameterSet) {
   matching_done_ = false;
-  if ( createEfficiencyHistos_ ) {
-    for( unsigned i=0; i<candCollection.size(); ++i) {
-      if( !isInRange(candCollection[i].pt(), candCollection[i].eta(), candCollection[i].phi() ) ) continue;
-      fillOne(candCollection[i]); // fill pt_gen, eta_gen and phi_gen histos for UNMATCHED generated candidate
-
-      for( unsigned j=0; j<matchedCandCollection.size(); ++j)  // for DeltaR spectrum
-	if (deltaR_) deltaR_->Fill( reco::deltaR( candCollection[i], matchedCandCollection[j] ) ) ;
+  if (createEfficiencyHistos_) {
+    for (unsigned i = 0; i < candCollection.size(); ++i) {
+      if (!isInRange(candCollection[i].pt(), candCollection[i].eta(), candCollection[i].phi()))
+        continue;
+      fillOne(candCollection[i]);  // fill pt_gen, eta_gen and phi_gen histos for
+                                   // UNMATCHED generated candidate
+
+      for (unsigned j = 0; j < matchedCandCollection.size(); ++j)  // for DeltaR spectrum
+        if (deltaR_)
+          deltaR_->Fill(reco::deltaR(candCollection[i], matchedCandCollection[j]));
     }
   }
 
   std::vector<int> matchIndices;
-  PFB::match( candCollection, matchedCandCollection, matchIndices, matchCharge_, dRMax_ );
-  //PFB::match( candCollection, matchedCandCollection, matchIndices, parameterSet, matchCharge_, dRMax_ );
-  // now matchIndices[i] stores the j-th closest matched jet 
+  PFB::match(candCollection, matchedCandCollection, matchIndices, matchCharge_, dRMax_);
+  // PFB::match( candCollection, matchedCandCollection, matchIndices,
+  // parameterSet, matchCharge_, dRMax_ );
+  // now matchIndices[i] stores the j-th closest matched jet
   matching_done_ = true;
 
   for (unsigned int i = 0; i < (candCollection).size(); i++) {
-     const reco::Candidate& cand = candCollection[i];
+    const reco::Candidate &cand = candCollection[i];
 
-    if( !isInRange(cand.pt(), cand.eta(), cand.phi() ) ) continue;
-    
-    int iMatch = matchIndices[i];
-    assert(iMatch< static_cast<int>(matchedCandCollection.size()));
+    if (!isInRange(cand.pt(), cand.eta(), cand.phi()))
+      continue;
 
-    if( iMatch!=-1 ) {
-      const reco::Candidate& matchedCand = matchedCandCollection[ iMatch ];
-      if(!isInRange(matchedCand.pt(),matchedCand.eta(),matchedCand.phi() ) ) continue;
-      //std::cout <<"PFJet pT " <<cand.pt() <<" eta " <<cand.eta() <<" phi " <<cand.phi() ;
-      //std::cout <<"\nmatched genJet pT " <<matchedCand.pt() <<" eta " <<matchedCand.eta() <<" phi " <<matchedCand.phi() <<"\n" <<std::endl ;
+    int iMatch = matchIndices[i];
+    assert(iMatch < static_cast<int>(matchedCandCollection.size()));
+
+    if (iMatch != -1) {
+      const reco::Candidate &matchedCand = matchedCandCollection[iMatch];
+      if (!isInRange(matchedCand.pt(), matchedCand.eta(), matchedCand.phi()))
+        continue;
+      // std::cout <<"PFJet pT " <<cand.pt() <<" eta " <<cand.eta() <<" phi "
+      // <<cand.phi() ; std::cout <<"\nmatched genJet pT " <<matchedCand.pt()
+      // <<" eta " <<matchedCand.eta() <<" phi " <<matchedCand.phi() <<"\n"
+      // <<std::endl ;
       float ptRes = (cand.pt() - matchedCand.pt()) / matchedCand.pt();
-      
-      if (ptRes > maxVal) maxVal = ptRes;
-      if (ptRes < minVal) minVal = ptRes;
- 
-      if ( !createEfficiencyHistos_ ) {
-	candBench_.fillOne(cand);   // fill pt, eta phi and charge histos for MATCHED candidate
-	//matchCandBench_.fillOne(cand, matchedCand);  // fill delta_x_VS_y histos for matched couple
-	matchCandBench_.fillOne(cand, matchedCand, parameterSet);  // fill delta_x_VS_y histos for matched couple
-	if (createReferenceHistos_) fillOne(matchedCand); // fill pt_ref, eta_ref and phi_ref histos for MATCHED reference candidate
-      }
-      else {
-	candBench_.fillOne(matchedCand);   // fill pt, eta phi and charge histos for MATCHED candidate
-	//matchCandBench_.fillOne(matchedCand, cand);  // fill delta_x_VS_y histos for matched couple
-	matchCandBench_.fillOne(cand, matchedCand, parameterSet);  // fill delta_x_VS_y histos for matched couple
-	if (createReferenceHistos_) fillOne(cand); // fill pt_ref, eta_ref and phi_ref histos for MATCHED reference candidate
-      }
 
+      if (ptRes > maxVal)
+        maxVal = ptRes;
+      if (ptRes < minVal)
+        minVal = ptRes;
+
+      if (!createEfficiencyHistos_) {
+        candBench_.fillOne(cand);  // fill pt, eta phi and charge histos for MATCHED candidate
+        // matchCandBench_.fillOne(cand, matchedCand);  // fill delta_x_VS_y
+        // histos for matched couple
+        matchCandBench_.fillOne(cand, matchedCand,
+                                parameterSet);  // fill delta_x_VS_y histos for matched couple
+        if (createReferenceHistos_)
+          fillOne(matchedCand);  // fill pt_ref, eta_ref and phi_ref histos for
+                                 // MATCHED reference candidate
+      } else {
+        candBench_.fillOne(matchedCand);  // fill pt, eta phi and charge histos
+                                          // for MATCHED candidate
+        // matchCandBench_.fillOne(matchedCand, cand);  // fill delta_x_VS_y
+        // histos for matched couple
+        matchCandBench_.fillOne(cand, matchedCand,
+                                parameterSet);  // fill delta_x_VS_y histos for matched couple
+        if (createReferenceHistos_)
+          fillOne(cand);  // fill pt_ref, eta_ref and phi_ref histos for MATCHED
+                          // reference candidate
+      }
     }
   }
 }
 
-template< class T, class C, class M>
-  /*void PFCandidateMonitor::fill(const T& candCollection,
-    const C& matchedCandCollection, float& minVal, float& maxVal) {*/
-  void PFCandidateMonitor::fill(const T& candCollection,
-				const C& matchedCandCollection, float& minVal, float& maxVal,
-				const edm::ParameterSet & parameterSet, const M& muonMatchedCandCollection) {
-
-  
+template <class T, class C, class M>
+/*void PFCandidateMonitor::fill(const T& candCollection,
+  const C& matchedCandCollection, float& minVal, float& maxVal) {*/
+void PFCandidateMonitor::fill(const T &candCollection,
+                              const C &matchedCandCollection,
+                              float &minVal,
+                              float &maxVal,
+                              const edm::ParameterSet &parameterSet,
+                              const M &muonMatchedCandCollection) {
   matching_done_ = false;
-  if ( createEfficiencyHistos_ ) {
-    for( unsigned i=0; i<candCollection.size(); ++i) {
-      if( !isInRange(candCollection[i].pt(), candCollection[i].eta(), candCollection[i].phi() ) ) continue;
-      fillOne(candCollection[i]); // fill pt_gen, eta_gen and phi_gen histos for UNMATCHED generated candidate
-
-      for( unsigned j=0; j<matchedCandCollection.size(); ++j)  // for DeltaR spectrum
-	if (deltaR_) deltaR_->Fill( reco::deltaR( candCollection[i], matchedCandCollection[j] ) ) ;
+  if (createEfficiencyHistos_) {
+    for (unsigned i = 0; i < candCollection.size(); ++i) {
+      if (!isInRange(candCollection[i].pt(), candCollection[i].eta(), candCollection[i].phi()))
+        continue;
+      fillOne(candCollection[i]);  // fill pt_gen, eta_gen and phi_gen histos for
+                                   // UNMATCHED generated candidate
+
+      for (unsigned j = 0; j < matchedCandCollection.size(); ++j)  // for DeltaR spectrum
+        if (deltaR_)
+          deltaR_->Fill(reco::deltaR(candCollection[i], matchedCandCollection[j]));
     }
   }
 
   std::vector<int> matchIndices;
-  //PFB::match( candCollection, matchedCandCollection, matchIndices, matchCharge_, dRMax_ );
-  //PFB::match( candCollection, matchedCandCollection, matchIndices, parameterSet, matchCharge_, dRMax_ );
-  PFB::match( candCollection, matchedCandCollection, matchIndices, parameterSet, muonMatchedCandCollection, matchCharge_, dRMax_ );
-  // now matchIndices[i] stores the j-th closest matched jet 
+  // PFB::match( candCollection, matchedCandCollection, matchIndices,
+  // matchCharge_, dRMax_ ); PFB::match( candCollection, matchedCandCollection,
+  // matchIndices, parameterSet, matchCharge_, dRMax_ );
+  PFB::match(candCollection,
+             matchedCandCollection,
+             matchIndices,
+             parameterSet,
+             muonMatchedCandCollection,
+             matchCharge_,
+             dRMax_);
+  // now matchIndices[i] stores the j-th closest matched jet
   matching_done_ = true;
 
   for (unsigned int i = 0; i < (candCollection).size(); i++) {
-     const reco::Candidate& cand = candCollection[i];
+    const reco::Candidate &cand = candCollection[i];
 
-    if( !isInRange(cand.pt(), cand.eta(), cand.phi() ) ) continue;
-    
-    int iMatch = matchIndices[i];
-    assert(iMatch< static_cast<int>(matchedCandCollection.size()));
+    if (!isInRange(cand.pt(), cand.eta(), cand.phi()))
+      continue;
 
-    if( iMatch!=-1 ) {
-      const reco::Candidate& matchedCand = matchedCandCollection[ iMatch ];
-      if(!isInRange(matchedCand.pt(),matchedCand.eta(),matchedCand.phi() ) ) continue;
-      //std::cout <<"PFJet pT " <<cand.pt() <<" eta " <<cand.eta() <<" phi " <<cand.phi() ;
-      //std::cout <<"\nmatched genJet pT " <<matchedCand.pt() <<" eta " <<matchedCand.eta() <<" phi " <<matchedCand.phi() <<"\n" <<std::endl ;
+    int iMatch = matchIndices[i];
+    assert(iMatch < static_cast<int>(matchedCandCollection.size()));
+
+    if (iMatch != -1) {
+      const reco::Candidate &matchedCand = matchedCandCollection[iMatch];
+      if (!isInRange(matchedCand.pt(), matchedCand.eta(), matchedCand.phi()))
+        continue;
+      // std::cout <<"PFJet pT " <<cand.pt() <<" eta " <<cand.eta() <<" phi "
+      // <<cand.phi() ; std::cout <<"\nmatched genJet pT " <<matchedCand.pt()
+      // <<" eta " <<matchedCand.eta() <<" phi " <<matchedCand.phi() <<"\n"
+      // <<std::endl ;
       float ptRes = (cand.pt() - matchedCand.pt()) / matchedCand.pt();
-      
-      if (ptRes > maxVal) maxVal = ptRes;
-      if (ptRes < minVal) minVal = ptRes;
- 
-      if ( !createEfficiencyHistos_ ) {
-	candBench_.fillOne(cand);   // fill pt, eta phi and charge histos for MATCHED candidate
-	matchCandBench_.fillOne(cand, matchedCand, parameterSet);  // fill delta_x_VS_y histos for matched couple
-	if (createReferenceHistos_) fillOne(matchedCand); // fill pt_ref, eta_ref and phi_ref histos for MATCHED reference candidate
-      }
-      else {
-	candBench_.fillOne(matchedCand);   // fill pt, eta phi and charge histos for MATCHED candidate
-	matchCandBench_.fillOne(cand, matchedCand, parameterSet);  // fill delta_x_VS_y histos for matched couple
-	if (createReferenceHistos_) fillOne(cand); // fill pt_ref, eta_ref and phi_ref histos for MATCHED reference candidate
-      }
 
+      if (ptRes > maxVal)
+        maxVal = ptRes;
+      if (ptRes < minVal)
+        minVal = ptRes;
+
+      if (!createEfficiencyHistos_) {
+        candBench_.fillOne(cand);  // fill pt, eta phi and charge histos for MATCHED candidate
+        matchCandBench_.fillOne(cand, matchedCand,
+                                parameterSet);  // fill delta_x_VS_y histos for matched couple
+        if (createReferenceHistos_)
+          fillOne(matchedCand);  // fill pt_ref, eta_ref and phi_ref histos for
+                                 // MATCHED reference candidate
+      } else {
+        candBench_.fillOne(matchedCand);  // fill pt, eta phi and charge histos
+                                          // for MATCHED candidate
+        matchCandBench_.fillOne(cand, matchedCand,
+                                parameterSet);  // fill delta_x_VS_y histos for matched couple
+        if (createReferenceHistos_)
+          fillOne(cand);  // fill pt_ref, eta_ref and phi_ref histos for MATCHED
+                          // reference candidate
+      }
     }
   }
 }
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/interface/PFJetMonitor.h b/DQMOffline/PFTau/interface/PFJetMonitor.h
index 448167ceba743..24cc159001c7c 100644
--- a/DQMOffline/PFTau/interface/PFJetMonitor.h
+++ b/DQMOffline/PFTau/interface/PFJetMonitor.h
@@ -1,10 +1,10 @@
 #ifndef DQMOffline_PFTau_PFJetMonitor_h
 #define DQMOffline_PFTau_PFJetMonitor_h
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DQMOffline/PFTau/interface/Benchmark.h"
 #include "DQMOffline/PFTau/interface/CandidateBenchmark.h"
 #include "DQMOffline/PFTau/interface/MatchCandidateBenchmark.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DataFormats/JetReco/interface/BasicJetCollection.h"
 
@@ -13,140 +13,166 @@
 #include <TH1.h>  //needed by the deltaR->Fill() call
 
 class PFJetMonitor : public Benchmark {
+public:
+  PFJetMonitor(float dRMax = 0.3, bool matchCharge = true, Benchmark::Mode mode = Benchmark::DEFAULT);
 
- public:
-
-  
-  PFJetMonitor( float dRMax = 0.3, bool matchCharge = true, 
-		Benchmark::Mode mode=Benchmark::DEFAULT); 
-  
   ~PFJetMonitor() override;
-  
+
   /// set the parameters locally
-  void setParameters(float dRMax, bool matchCharge, Benchmark::Mode mode,
-		     float ptmin, float ptmax, float etamin, float etamax, float phimin, float phimax,
-		     bool fracHistoFlag=true);
-  
-  void setParameters(float dRMax, bool onlyTwoJets, bool matchCharge, Benchmark::Mode mode,
-		     float ptmin, float ptmax, float etamin, float etamax, float phimin, float phimax,
-		     bool fracHistoFlag=true);
-  
+  void setParameters(float dRMax,
+                     bool matchCharge,
+                     Benchmark::Mode mode,
+                     float ptmin,
+                     float ptmax,
+                     float etamin,
+                     float etamax,
+                     float phimin,
+                     float phimax,
+                     bool fracHistoFlag = true);
+
+  void setParameters(float dRMax,
+                     bool onlyTwoJets,
+                     bool matchCharge,
+                     Benchmark::Mode mode,
+                     float ptmin,
+                     float ptmax,
+                     float etamin,
+                     float etamax,
+                     float phimin,
+                     float phimax,
+                     bool fracHistoFlag = true);
+
   /// set the parameters accessing them from ParameterSet
-  void setParameters( const edm::ParameterSet& parameterSet);
-  
+  void setParameters(const edm::ParameterSet &parameterSet);
+
   /// set directory (to use in ROOT)
-  void setDirectory(TDirectory* dir) override;
+  void setDirectory(TDirectory *dir) override;
 
   /// book histograms
-  void setup(DQMStore::IBooker& b);
-  void setup(DQMStore::IBooker& b, const edm::ParameterSet & parameterSet);
-  
+  void setup(DQMStore::IBooker &b);
+  void setup(DQMStore::IBooker &b, const edm::ParameterSet &parameterSet);
+
   /// fill histograms with all particle
-  template< class T, class C>
-    void fill(const T& jetCollection, const C& matchedJetCollection,
-	      float& minVal, float& maxVal);
-  
-  template< class T, class C>
-    void fill(const T& candidateCollection, const C& matchedCandCollection,
-	      float& minVal, float& maxVal, float& jetpT,
-	      const edm::ParameterSet & parameterSet);
-
-  void fillOne(const reco::Jet& jet,
-	       const reco::Jet& matchedJet);
-
- protected:
-  CandidateBenchmark      candBench_;
+  template <class T, class C>
+  void fill(const T &jetCollection, const C &matchedJetCollection, float &minVal, float &maxVal);
+
+  template <class T, class C>
+  void fill(const T &candidateCollection,
+            const C &matchedCandCollection,
+            float &minVal,
+            float &maxVal,
+            float &jetpT,
+            const edm::ParameterSet &parameterSet);
+
+  void fillOne(const reco::Jet &jet, const reco::Jet &matchedJet);
+
+protected:
+  CandidateBenchmark candBench_;
   MatchCandidateBenchmark matchCandBench_;
 
-  TH2F*  delta_frac_VS_frac_muon_;
-  TH2F*  delta_frac_VS_frac_photon_;
-  TH2F*  delta_frac_VS_frac_electron_;
-  TH2F*  delta_frac_VS_frac_charged_hadron_;
-  TH2F*  delta_frac_VS_frac_neutral_hadron_;
+  TH2F *delta_frac_VS_frac_muon_;
+  TH2F *delta_frac_VS_frac_photon_;
+  TH2F *delta_frac_VS_frac_electron_;
+  TH2F *delta_frac_VS_frac_charged_hadron_;
+  TH2F *delta_frac_VS_frac_neutral_hadron_;
 
-  TH1F* deltaR_;
+  TH1F *deltaR_;
   float dRMax_;
-  bool  onlyTwoJets_;
-  bool  matchCharge_;
-  bool  createPFractionHistos_;
-  bool  histogramBooked_;
-
+  bool onlyTwoJets_;
+  bool matchCharge_;
+  bool createPFractionHistos_;
+  bool histogramBooked_;
 };
 
 #include "DQMOffline/PFTau/interface/Matchers.h"
-template< class T, class C>
-  void PFJetMonitor::fill(const T& jetCollection,
-			const C& matchedJetCollection, float& minVal, float& maxVal) {
-  
-  
+template <class T, class C>
+void PFJetMonitor::fill(const T &jetCollection, const C &matchedJetCollection, float &minVal, float &maxVal) {
   std::vector<int> matchIndices;
-  PFB::match( jetCollection, matchedJetCollection, matchIndices, matchCharge_, dRMax_ );
-  
+  PFB::match(jetCollection, matchedJetCollection, matchIndices, matchCharge_, dRMax_);
+
   for (unsigned int i = 0; i < (jetCollection).size(); i++) {
-    const reco::Jet& jet = jetCollection[i];
-    
-    if( !isInRange(jet.pt(), jet.eta(), jet.phi() ) ) continue;
-    
+    const reco::Jet &jet = jetCollection[i];
+
+    if (!isInRange(jet.pt(), jet.eta(), jet.phi()))
+      continue;
+
     int iMatch = matchIndices[i];
-    assert(iMatch< static_cast<int>(matchedJetCollection.size()));
-    
-    if( iMatch != -1 ) {
-      const reco::Candidate& matchedJet = matchedJetCollection[ iMatch ];
-      if( !isInRange( matchedJet.pt(), matchedJet.eta(), matchedJet.phi() ) ) continue;
-      float ptRes = (jet.pt() - matchedJet.pt())/matchedJet.pt();
-      
-      if (ptRes > maxVal) maxVal = ptRes;
-      if (ptRes < minVal) minVal = ptRes;
-      
+    assert(iMatch < static_cast<int>(matchedJetCollection.size()));
+
+    if (iMatch != -1) {
+      const reco::Candidate &matchedJet = matchedJetCollection[iMatch];
+      if (!isInRange(matchedJet.pt(), matchedJet.eta(), matchedJet.phi()))
+        continue;
+      float ptRes = (jet.pt() - matchedJet.pt()) / matchedJet.pt();
+
+      if (ptRes > maxVal)
+        maxVal = ptRes;
+      if (ptRes < minVal)
+        minVal = ptRes;
+
       candBench_.fillOne(jet);
-      matchCandBench_.fillOne(jet, matchedJetCollection[ iMatch ]);
-      if (createPFractionHistos_ && histogramBooked_) fillOne(jet, matchedJetCollection[ iMatch ]);
+      matchCandBench_.fillOne(jet, matchedJetCollection[iMatch]);
+      if (createPFractionHistos_ && histogramBooked_)
+        fillOne(jet, matchedJetCollection[iMatch]);
     }
   }
 }
 
-
-template< class T, class C>
-  void PFJetMonitor::fill(const T& jetCollection,
-			  const C& matchedJetCollection, float& minVal, float& maxVal, float& jetpT,
-			  const edm::ParameterSet & parameterSet) {
-  
+template <class T, class C>
+void PFJetMonitor::fill(const T &jetCollection,
+                        const C &matchedJetCollection,
+                        float &minVal,
+                        float &maxVal,
+                        float &jetpT,
+                        const edm::ParameterSet &parameterSet) {
   std::vector<int> matchIndices;
-  PFB::match( jetCollection, matchedJetCollection, matchIndices, matchCharge_, dRMax_ );
-  // now matchIndices[i] stores the j-th closest matched jet 
+  PFB::match(jetCollection, matchedJetCollection, matchIndices, matchCharge_, dRMax_);
+  // now matchIndices[i] stores the j-th closest matched jet
 
-  for( unsigned i=0; i<jetCollection.size(); ++i) {
+  for (unsigned i = 0; i < jetCollection.size(); ++i) {
     // Count the number of jets with a larger energy = pT
     unsigned int highJets = 0;
-    for( unsigned j=0; j<jetCollection.size(); ++j) {
-      if (j != i && jetCollection[j].pt() > jetCollection[i].pt()) highJets++;
-    }    
-    if ( onlyTwoJets_ && highJets > 1 ) continue;
-
-    const reco::Jet& jet = jetCollection[i];
-    
-    if( !isInRange(jet.pt(), jet.eta(), jet.phi() ) ) continue;
-    
+    for (unsigned j = 0; j < jetCollection.size(); ++j) {
+      if (j != i && jetCollection[j].pt() > jetCollection[i].pt())
+        highJets++;
+    }
+    if (onlyTwoJets_ && highJets > 1)
+      continue;
+
+    const reco::Jet &jet = jetCollection[i];
+
+    if (!isInRange(jet.pt(), jet.eta(), jet.phi()))
+      continue;
+
     int iMatch = matchIndices[i];
-    assert( iMatch < static_cast<int>(matchedJetCollection.size()) );
-    
-    if( iMatch != -1 ) {
-      const reco::Candidate& matchedJet = matchedJetCollection[ iMatch ];
-      if ( !isInRange( matchedJet.pt(), matchedJet.eta(), matchedJet.phi() ) ) continue;
-      
+    assert(iMatch < static_cast<int>(matchedJetCollection.size()));
+
+    if (iMatch != -1) {
+      const reco::Candidate &matchedJet = matchedJetCollection[iMatch];
+      if (!isInRange(matchedJet.pt(), matchedJet.eta(), matchedJet.phi()))
+        continue;
+
       float ptRes = (jet.pt() - matchedJet.pt()) / matchedJet.pt();
-      
+
       jetpT = jet.pt();
-      if (ptRes > maxVal) maxVal = ptRes;
-      if (ptRes < minVal) minVal = ptRes;
-      
+      if (ptRes > maxVal)
+        maxVal = ptRes;
+      if (ptRes < minVal)
+        minVal = ptRes;
+
       candBench_.fillOne(jet);  // fill pt eta phi and charge histos for MATCHED candidate jet
-      matchCandBench_.fillOne(jet, matchedJetCollection[iMatch], parameterSet);  // fill delta_x_VS_y histos for matched couple
-      if (createPFractionHistos_ && histogramBooked_) fillOne(jet, matchedJetCollection[iMatch]);  // book and fill delta_frac_VS_frac histos for matched couple
+      matchCandBench_.fillOne(jet,
+                              matchedJetCollection[iMatch],
+                              parameterSet);  // fill delta_x_VS_y histos for matched couple
+      if (createPFractionHistos_ && histogramBooked_)
+        fillOne(jet,
+                matchedJetCollection[iMatch]);  // book and fill delta_frac_VS_frac
+                                                // histos for matched couple
     }
-        
-    for( unsigned j=0; j<matchedJetCollection.size(); ++j)  // for DeltaR spectrum
-      if (deltaR_) deltaR_->Fill( reco::deltaR( jetCollection[i], matchedJetCollection[j] ) ) ;
-  } // end loop on jetCollection
+
+    for (unsigned j = 0; j < matchedJetCollection.size(); ++j)  // for DeltaR spectrum
+      if (deltaR_)
+        deltaR_->Fill(reco::deltaR(jetCollection[i], matchedJetCollection[j]));
+  }  // end loop on jetCollection
 }
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/interface/PFMETMonitor.h b/DQMOffline/PFTau/interface/PFMETMonitor.h
index 12e23f8fa0417..16c06818dc2df 100644
--- a/DQMOffline/PFTau/interface/PFMETMonitor.h
+++ b/DQMOffline/PFTau/interface/PFMETMonitor.h
@@ -1,63 +1,67 @@
 #ifndef DQMOffline_PFTau_PFMETMonitor_h
 #define DQMOffline_PFTau_PFMETMonitor_h
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DQMOffline/PFTau/interface/Benchmark.h"
 #include "DQMOffline/PFTau/interface/CandidateBenchmark.h"
 #include "DQMOffline/PFTau/interface/MatchCandidateBenchmark.h"
 #include "DataFormats/METReco/interface/METCollection.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include <vector>
 class PFMETMonitor : public Benchmark {
+public:
+  PFMETMonitor(Benchmark::Mode mode = Benchmark::DEFAULT);
 
- public:
-
-  PFMETMonitor( Benchmark::Mode mode=Benchmark::DEFAULT); 
-  
   ~PFMETMonitor() override;
 
   /// set the parameters locally
-  void setParameters(Benchmark::Mode mode, float ptmin, float ptmax, float etamin,
-                    float etamax, float phimin, float phimax, bool metSpHistos);
-  
+  void setParameters(Benchmark::Mode mode,
+                     float ptmin,
+                     float ptmax,
+                     float etamin,
+                     float etamax,
+                     float phimin,
+                     float phimax,
+                     bool metSpHistos);
+
   /// set the parameters accessing them from ParameterSet
-  void setParameters( const edm::ParameterSet& parameterSet);
-  
+  void setParameters(const edm::ParameterSet &parameterSet);
+
   /// set directory (to use in ROOT)
-  void setDirectory(TDirectory* dir) override;
+  void setDirectory(TDirectory *dir) override;
 
   /// book histograms
-  void setup(DQMStore::IBooker& b);
-  void setup(DQMStore::IBooker& b, const edm::ParameterSet & parameterSet);
-
-  void fillOne(const reco::MET& met, const reco::MET& matchedMet,
-	       float& minVal, float& maxVal);
+  void setup(DQMStore::IBooker &b);
+  void setup(DQMStore::IBooker &b, const edm::ParameterSet &parameterSet);
 
-  void fillOne(const reco::MET& met, const reco::MET& matchedMet,
-	       float& minVal, float& maxVal,
-	       const edm::ParameterSet & parameterSet);
+  void fillOne(const reco::MET &met, const reco::MET &matchedMet, float &minVal, float &maxVal);
 
- protected:
-  TH1F* px_;
-  TH1F* sumEt_;
-  TH1F* delta_ex_;
-  TH2F* delta_ex_VS_set_;
-  TH2F* delta_set_VS_set_;
-  TH2F* delta_set_Over_set_VS_set_;
+  void fillOne(const reco::MET &met,
+               const reco::MET &matchedMet,
+               float &minVal,
+               float &maxVal,
+               const edm::ParameterSet &parameterSet);
 
-  TProfile* profile_delta_ex_VS_set_;
-  TProfile* profile_delta_set_VS_set_;
-  TProfile* profile_delta_set_Over_set_VS_set_;
+protected:
+  TH1F *px_;
+  TH1F *sumEt_;
+  TH1F *delta_ex_;
+  TH2F *delta_ex_VS_set_;
+  TH2F *delta_set_VS_set_;
+  TH2F *delta_set_Over_set_VS_set_;
 
-  TProfile* profileRMS_delta_ex_VS_set_;
-  TProfile* profileRMS_delta_set_VS_set_;
-  TProfile* profileRMS_delta_set_Over_set_VS_set_;
+  TProfile *profile_delta_ex_VS_set_;
+  TProfile *profile_delta_set_VS_set_;
+  TProfile *profile_delta_set_Over_set_VS_set_;
 
+  TProfile *profileRMS_delta_ex_VS_set_;
+  TProfile *profileRMS_delta_set_VS_set_;
+  TProfile *profileRMS_delta_set_Over_set_VS_set_;
 
-  CandidateBenchmark      candBench_;
+  CandidateBenchmark candBench_;
   MatchCandidateBenchmark matchCandBench_;
 
-  bool  createMETSpecificHistos_;
-  bool  histogramBooked_;
+  bool createMETSpecificHistos_;
+  bool histogramBooked_;
 };
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/plugins/BenchmarkAnalyzer.cc b/DQMOffline/PFTau/plugins/BenchmarkAnalyzer.cc
index e6e42e4bc998b..baf39b851db0b 100644
--- a/DQMOffline/PFTau/plugins/BenchmarkAnalyzer.cc
+++ b/DQMOffline/PFTau/plugins/BenchmarkAnalyzer.cc
@@ -7,32 +7,27 @@
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include <string>
 #include <iostream>
+#include <string>
 
 using namespace std;
 
-BenchmarkAnalyzer::BenchmarkAnalyzer(const edm::ParameterSet& parameterSet)
-{
-
-  inputLabel_      = parameterSet.getParameter<edm::InputTag>("InputCollection");
-  benchmarkLabel_  = parameterSet.getParameter<std::string>("BenchmarkLabel"); 
+BenchmarkAnalyzer::BenchmarkAnalyzer(const edm::ParameterSet &parameterSet) {
+  inputLabel_ = parameterSet.getParameter<edm::InputTag>("InputCollection");
+  benchmarkLabel_ = parameterSet.getParameter<std::string>("BenchmarkLabel");
 
-  std::string folder = benchmarkLabel_ ;
-
-  subsystemname_ = "ParticleFlow" ;
-  eventInfoFolder_ = subsystemname_ + "/" + folder ;
+  std::string folder = benchmarkLabel_;
 
+  subsystemname_ = "ParticleFlow";
+  eventInfoFolder_ = subsystemname_ + "/" + folder;
 }
 
-
 //
 // -- BookHistograms
 //
-void BenchmarkAnalyzer::bookHistograms(DQMStore::IBooker & ibooker,
-					    edm::Run const & /* iRun */,
-					    edm::EventSetup const & /* iSetup */ )
-{
-  ibooker.setCurrentFolder(eventInfoFolder_) ;
+void BenchmarkAnalyzer::bookHistograms(DQMStore::IBooker &ibooker,
+                                       edm::Run const & /* iRun */,
+                                       edm::EventSetup const & /* iSetup */) {
+  ibooker.setCurrentFolder(eventInfoFolder_);
   cout << "path set to " << eventInfoFolder_ << endl;
 }
diff --git a/DQMOffline/PFTau/plugins/BenchmarkAnalyzer.h b/DQMOffline/PFTau/plugins/BenchmarkAnalyzer.h
index 0c12f7333507b..2449932eb0828 100644
--- a/DQMOffline/PFTau/plugins/BenchmarkAnalyzer.h
+++ b/DQMOffline/PFTau/plugins/BenchmarkAnalyzer.h
@@ -1,8 +1,8 @@
 #ifndef __DQMOffline_PFTau_BenchmarkAnalyzer__
 #define __DQMOffline_PFTau_BenchmarkAnalyzer__
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Utilities/interface/InputTag.h"
 
@@ -11,33 +11,29 @@
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
 /// abtract base class for benchmark analyzers
-class BenchmarkAnalyzer: public DQMEDAnalyzer {
+class BenchmarkAnalyzer : public DQMEDAnalyzer {
 public:
-
   /// Constructors
   BenchmarkAnalyzer();
-  explicit BenchmarkAnalyzer(const edm::ParameterSet&);
+  explicit BenchmarkAnalyzer(const edm::ParameterSet &);
 
   /// Destructor
   ~BenchmarkAnalyzer() override {}
 
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
- protected:
-
+protected:
   /// name of the output root file
   std::string outputFile_;
-  
+
   /// input collection
   edm::InputTag inputLabel_;
 
   /// benchmark label
   std::string benchmarkLabel_;
 
-
   std::string eventInfoFolder_;
   std::string subsystemname_;
-
 };
 
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/plugins/CandidateBenchmarkAnalyzer.cc b/DQMOffline/PFTau/plugins/CandidateBenchmarkAnalyzer.cc
index fade8346d02e8..b1690c0404b45 100644
--- a/DQMOffline/PFTau/plugins/CandidateBenchmarkAnalyzer.cc
+++ b/DQMOffline/PFTau/plugins/CandidateBenchmarkAnalyzer.cc
@@ -1,12 +1,12 @@
 #include "DQMOffline/PFTau/plugins/CandidateBenchmarkAnalyzer.h"
 
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-#include "DataFormats/Candidate/interface/CandidateFwd.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
+#include "DataFormats/Candidate/interface/CandidateFwd.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 
@@ -14,39 +14,28 @@ using namespace reco;
 using namespace edm;
 using namespace std;
 
+CandidateBenchmarkAnalyzer::CandidateBenchmarkAnalyzer(const edm::ParameterSet &parameterSet)
+    : BenchmarkAnalyzer(parameterSet), CandidateBenchmark((Benchmark::Mode)parameterSet.getParameter<int>("mode")) {
+  setRange(parameterSet.getParameter<double>("ptMin"),
+           parameterSet.getParameter<double>("ptMax"),
+           parameterSet.getParameter<double>("etaMin"),
+           parameterSet.getParameter<double>("etaMax"),
+           parameterSet.getParameter<double>("phiMin"),
+           parameterSet.getParameter<double>("phiMax"));
 
-CandidateBenchmarkAnalyzer::CandidateBenchmarkAnalyzer(const edm::ParameterSet& parameterSet) : 
-  BenchmarkAnalyzer(parameterSet),
-  CandidateBenchmark( (Benchmark::Mode) parameterSet.getParameter<int>("mode") )
-{
-
-  setRange( parameterSet.getParameter<double>("ptMin"),
-	    parameterSet.getParameter<double>("ptMax"),
-	    parameterSet.getParameter<double>("etaMin"),
-	    parameterSet.getParameter<double>("etaMax"),
-	    parameterSet.getParameter<double>("phiMin"),
-	    parameterSet.getParameter<double>("phiMax") );
-
-  myColl_ = consumes< View<Candidate> >(inputLabel_);
-
+  myColl_ = consumes<View<Candidate>>(inputLabel_);
 }
 
-
-void CandidateBenchmarkAnalyzer::bookHistograms(DQMStore::IBooker & ibooker,
-					    edm::Run const & iRun,
-					    edm::EventSetup const & iSetup )
-{
+void CandidateBenchmarkAnalyzer::bookHistograms(DQMStore::IBooker &ibooker,
+                                                edm::Run const &iRun,
+                                                edm::EventSetup const &iSetup) {
   BenchmarkAnalyzer::bookHistograms(ibooker, iRun, iSetup);
   setup(ibooker);
 }
 
-void 
-CandidateBenchmarkAnalyzer::analyze(const edm::Event& iEvent, 
-				    const edm::EventSetup& iSetup) {
-  
-  Handle< View<Candidate> > collection; 
+void CandidateBenchmarkAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  Handle<View<Candidate>> collection;
   iEvent.getByToken(myColl_, collection);
 
-  fill( *collection );
+  fill(*collection);
 }
-
diff --git a/DQMOffline/PFTau/plugins/CandidateBenchmarkAnalyzer.h b/DQMOffline/PFTau/plugins/CandidateBenchmarkAnalyzer.h
index b0ee8960f83e1..45f5dc2b517fc 100644
--- a/DQMOffline/PFTau/plugins/CandidateBenchmarkAnalyzer.h
+++ b/DQMOffline/PFTau/plugins/CandidateBenchmarkAnalyzer.h
@@ -1,25 +1,22 @@
 #ifndef __DQMOffline_PFTau_CandidateBenchmarkAnalyzer__
 #define __DQMOffline_PFTau_CandidateBenchmarkAnalyzer__
 
-
-#include "DQMOffline/PFTau/plugins/BenchmarkAnalyzer.h"
 #include "DQMOffline/PFTau/interface/CandidateBenchmark.h"
+#include "DQMOffline/PFTau/plugins/BenchmarkAnalyzer.h"
 
 #include "FWCore/Utilities/interface/EDGetToken.h"
 
+class TH1F;
 
-class TH1F; 
+class CandidateBenchmarkAnalyzer : public BenchmarkAnalyzer, public CandidateBenchmark {
+public:
+  CandidateBenchmarkAnalyzer(const edm::ParameterSet &parameterSet);
 
-class CandidateBenchmarkAnalyzer: public BenchmarkAnalyzer, public CandidateBenchmark {
- public:
-  
-  CandidateBenchmarkAnalyzer(const edm::ParameterSet& parameterSet);
-  
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
-  edm::EDGetTokenT< edm::View<reco::Candidate> > myColl_;
+  edm::EDGetTokenT<edm::View<reco::Candidate>> myColl_;
 };
 
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/plugins/METBenchmarkAnalyzer.cc b/DQMOffline/PFTau/plugins/METBenchmarkAnalyzer.cc
index 717c5d2fd13de..73fcd2b8ba943 100644
--- a/DQMOffline/PFTau/plugins/METBenchmarkAnalyzer.cc
+++ b/DQMOffline/PFTau/plugins/METBenchmarkAnalyzer.cc
@@ -1,7 +1,7 @@
 #include "DQMOffline/PFTau/plugins/METBenchmarkAnalyzer.h"
 
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
@@ -14,38 +14,28 @@ using namespace reco;
 using namespace edm;
 using namespace std;
 
+METBenchmarkAnalyzer::METBenchmarkAnalyzer(const edm::ParameterSet &parameterSet)
+    : BenchmarkAnalyzer(parameterSet), METBenchmark((Benchmark::Mode)parameterSet.getParameter<int>("mode")) {
+  setRange(parameterSet.getParameter<double>("ptMin"),
+           parameterSet.getParameter<double>("ptMax"),
+           -0.1,
+           0.1,  // range in eta for MET.
+           parameterSet.getParameter<double>("phiMin"),
+           parameterSet.getParameter<double>("phiMax"));
 
-METBenchmarkAnalyzer::METBenchmarkAnalyzer(const edm::ParameterSet& parameterSet) : 
-  BenchmarkAnalyzer(parameterSet),
-  METBenchmark( (Benchmark::Mode) parameterSet.getParameter<int>("mode") )
-{
-
-  setRange( parameterSet.getParameter<double>("ptMin"),
-	    parameterSet.getParameter<double>("ptMax"),
-	    -0.1, 0.1, // range in eta for MET. 
-	    parameterSet.getParameter<double>("phiMin"),
-	    parameterSet.getParameter<double>("phiMax") );
-
-  myColl_ = consumes< View<MET> >(inputLabel_);
-
+  myColl_ = consumes<View<MET>>(inputLabel_);
 }
 
-
-void METBenchmarkAnalyzer::bookHistograms(DQMStore::IBooker & ibooker,
-					    edm::Run const & iRun,
-					    edm::EventSetup const & iSetup )
-{
+void METBenchmarkAnalyzer::bookHistograms(DQMStore::IBooker &ibooker,
+                                          edm::Run const &iRun,
+                                          edm::EventSetup const &iSetup) {
   BenchmarkAnalyzer::bookHistograms(ibooker, iRun, iSetup);
   setup(ibooker);
 }
 
-void 
-METBenchmarkAnalyzer::analyze(const edm::Event& iEvent, 
-			      const edm::EventSetup& iSetup) {
-  
-  Handle< View<MET> > collection; 
+void METBenchmarkAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  Handle<View<MET>> collection;
   iEvent.getByToken(myColl_, collection);
 
-  fill( *collection );
+  fill(*collection);
 }
-
diff --git a/DQMOffline/PFTau/plugins/METBenchmarkAnalyzer.h b/DQMOffline/PFTau/plugins/METBenchmarkAnalyzer.h
index 0b747cd20de30..2060d2c92e2b9 100644
--- a/DQMOffline/PFTau/plugins/METBenchmarkAnalyzer.h
+++ b/DQMOffline/PFTau/plugins/METBenchmarkAnalyzer.h
@@ -1,24 +1,22 @@
 #ifndef __DQMOffline_PFTau_METBenchmarkAnalyzer__
 #define __DQMOffline_PFTau_METBenchmarkAnalyzer__
 
-
-#include "DQMOffline/PFTau/plugins/BenchmarkAnalyzer.h"
 #include "DQMOffline/PFTau/interface/METBenchmark.h"
+#include "DQMOffline/PFTau/plugins/BenchmarkAnalyzer.h"
 
 #include "FWCore/Utilities/interface/EDGetToken.h"
 
-class TH1F; 
+class TH1F;
+
+class METBenchmarkAnalyzer : public BenchmarkAnalyzer, public METBenchmark {
+public:
+  METBenchmarkAnalyzer(const edm::ParameterSet &parameterSet);
 
-class METBenchmarkAnalyzer: public BenchmarkAnalyzer, public METBenchmark {
- public:
-  
-  METBenchmarkAnalyzer(const edm::ParameterSet& parameterSet);
-  
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
-  edm::EDGetTokenT< edm::View<reco::MET> > myColl_;
+  edm::EDGetTokenT<edm::View<reco::MET>> myColl_;
 };
 
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/plugins/MatchMETBenchmarkAnalyzer.cc b/DQMOffline/PFTau/plugins/MatchMETBenchmarkAnalyzer.cc
index 7f879f0651ba7..49d05ef980ea9 100644
--- a/DQMOffline/PFTau/plugins/MatchMETBenchmarkAnalyzer.cc
+++ b/DQMOffline/PFTau/plugins/MatchMETBenchmarkAnalyzer.cc
@@ -1,7 +1,7 @@
 #include "DQMOffline/PFTau/plugins/MatchMETBenchmarkAnalyzer.h"
 
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
@@ -12,35 +12,27 @@ using namespace reco;
 using namespace edm;
 using namespace std;
 
-MatchMETBenchmarkAnalyzer::MatchMETBenchmarkAnalyzer(const edm::ParameterSet& parameterSet) : 
-  BenchmarkAnalyzer(parameterSet),
-  MatchMETBenchmark( (Benchmark::Mode) parameterSet.getParameter<int>("mode") )
-{
+MatchMETBenchmarkAnalyzer::MatchMETBenchmarkAnalyzer(const edm::ParameterSet &parameterSet)
+    : BenchmarkAnalyzer(parameterSet), MatchMETBenchmark((Benchmark::Mode)parameterSet.getParameter<int>("mode")) {
   matchedInputLabel_ = parameterSet.getParameter<edm::InputTag>("MatchCollection");
 
-  myColl_ = consumes< View<MET> >(inputLabel_);
-  myMatchColl_ = consumes< View<MET> >(matchedInputLabel_);
-
+  myColl_ = consumes<View<MET>>(inputLabel_);
+  myMatchColl_ = consumes<View<MET>>(matchedInputLabel_);
 }
 
-
-void MatchMETBenchmarkAnalyzer::bookHistograms(DQMStore::IBooker & ibooker,
-					       edm::Run const & iRun,
-					       edm::EventSetup const & iSetup )
-{
+void MatchMETBenchmarkAnalyzer::bookHistograms(DQMStore::IBooker &ibooker,
+                                               edm::Run const &iRun,
+                                               edm::EventSetup const &iSetup) {
   BenchmarkAnalyzer::bookHistograms(ibooker, iRun, iSetup);
   setup(ibooker);
 }
 
-void MatchMETBenchmarkAnalyzer::analyze(const edm::Event& iEvent, 
-					const edm::EventSetup& iSetup) {
-   
-  Handle< View<MET> > collection; 
+void MatchMETBenchmarkAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  Handle<View<MET>> collection;
   iEvent.getByToken(myColl_, collection);
 
-  Handle< View<MET> > matchedCollection; 
+  Handle<View<MET>> matchedCollection;
   iEvent.getByToken(myMatchColl_, matchedCollection);
 
-  fillOne( (*collection)[0] , (*matchedCollection)[0]);
+  fillOne((*collection)[0], (*matchedCollection)[0]);
 }
-
diff --git a/DQMOffline/PFTau/plugins/MatchMETBenchmarkAnalyzer.h b/DQMOffline/PFTau/plugins/MatchMETBenchmarkAnalyzer.h
index 388836b81780d..4ca20be1297f0 100644
--- a/DQMOffline/PFTau/plugins/MatchMETBenchmarkAnalyzer.h
+++ b/DQMOffline/PFTau/plugins/MatchMETBenchmarkAnalyzer.h
@@ -1,25 +1,24 @@
 #ifndef __DQMOffline_PFTau_MatchMETBenchmarkAnalyzer__
 #define __DQMOffline_PFTau_MatchMETBenchmarkAnalyzer__
 
-#include "DQMOffline/PFTau/plugins/BenchmarkAnalyzer.h"
 #include "DQMOffline/PFTau/interface/MatchMETBenchmark.h"
+#include "DQMOffline/PFTau/plugins/BenchmarkAnalyzer.h"
 
 #include "FWCore/Utilities/interface/EDGetToken.h"
 
-class TH1F; 
+class TH1F;
 
-class MatchMETBenchmarkAnalyzer: public BenchmarkAnalyzer, public MatchMETBenchmark {
- public:
-  
-  MatchMETBenchmarkAnalyzer(const edm::ParameterSet& parameterSet);
+class MatchMETBenchmarkAnalyzer : public BenchmarkAnalyzer, public MatchMETBenchmark {
+public:
+  MatchMETBenchmarkAnalyzer(const edm::ParameterSet &parameterSet);
 
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
- protected:
-  edm::EDGetTokenT< edm::View<reco::MET> > myColl_;
-  edm::EDGetTokenT< edm::View<reco::MET> > myMatchColl_;
+protected:
+  edm::EDGetTokenT<edm::View<reco::MET>> myColl_;
+  edm::EDGetTokenT<edm::View<reco::MET>> myMatchColl_;
   edm::InputTag matchedInputLabel_;
 };
 
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/plugins/PFCandidateBenchmarkAnalyzer.cc b/DQMOffline/PFTau/plugins/PFCandidateBenchmarkAnalyzer.cc
index 91efda21775bb..23a565f20b437 100644
--- a/DQMOffline/PFTau/plugins/PFCandidateBenchmarkAnalyzer.cc
+++ b/DQMOffline/PFTau/plugins/PFCandidateBenchmarkAnalyzer.cc
@@ -1,12 +1,12 @@
 #include "DQMOffline/PFTau/plugins/PFCandidateBenchmarkAnalyzer.h"
 
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
 #include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
+#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
@@ -15,37 +15,28 @@ using namespace reco;
 using namespace edm;
 using namespace std;
 
+PFCandidateBenchmarkAnalyzer::PFCandidateBenchmarkAnalyzer(const edm::ParameterSet &parameterSet)
+    : BenchmarkAnalyzer(parameterSet), PFCandidateBenchmark((Benchmark::Mode)parameterSet.getParameter<int>("mode")) {
+  setRange(parameterSet.getParameter<double>("ptMin"),
+           parameterSet.getParameter<double>("ptMax"),
+           parameterSet.getParameter<double>("etaMin"),
+           parameterSet.getParameter<double>("etaMax"),
+           parameterSet.getParameter<double>("phiMin"),
+           parameterSet.getParameter<double>("phiMax"));
 
-PFCandidateBenchmarkAnalyzer::PFCandidateBenchmarkAnalyzer(const edm::ParameterSet& parameterSet) : 
-  BenchmarkAnalyzer(parameterSet),
-  PFCandidateBenchmark( (Benchmark::Mode) parameterSet.getParameter<int>("mode") )
-{
-  setRange( parameterSet.getParameter<double>("ptMin"),
-	    parameterSet.getParameter<double>("ptMax"),
-	    parameterSet.getParameter<double>("etaMin"),
-	    parameterSet.getParameter<double>("etaMax"),
-	    parameterSet.getParameter<double>("phiMin"),
-	    parameterSet.getParameter<double>("phiMax") );
-
-  myColl_ = consumes< PFCandidateCollection >(inputLabel_);
-
+  myColl_ = consumes<PFCandidateCollection>(inputLabel_);
 }
 
-
-void PFCandidateBenchmarkAnalyzer::bookHistograms(DQMStore::IBooker & ibooker,
-						  edm::Run const & iRun,
-						  edm::EventSetup const & iSetup )
-{
+void PFCandidateBenchmarkAnalyzer::bookHistograms(DQMStore::IBooker &ibooker,
+                                                  edm::Run const &iRun,
+                                                  edm::EventSetup const &iSetup) {
   BenchmarkAnalyzer::bookHistograms(ibooker, iRun, iSetup);
   setup(ibooker);
 }
 
-void PFCandidateBenchmarkAnalyzer::analyze(const edm::Event& iEvent, 
-					   const edm::EventSetup& iSetup) {
-    
-  Handle<PFCandidateCollection> collection; 
+void PFCandidateBenchmarkAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  Handle<PFCandidateCollection> collection;
   iEvent.getByToken(myColl_, collection);
 
-  fill( *collection );
+  fill(*collection);
 }
-
diff --git a/DQMOffline/PFTau/plugins/PFCandidateBenchmarkAnalyzer.h b/DQMOffline/PFTau/plugins/PFCandidateBenchmarkAnalyzer.h
index 24deeb469994a..0c27a16606ac4 100644
--- a/DQMOffline/PFTau/plugins/PFCandidateBenchmarkAnalyzer.h
+++ b/DQMOffline/PFTau/plugins/PFCandidateBenchmarkAnalyzer.h
@@ -1,24 +1,22 @@
 #ifndef __DQMOffline_PFTau_PFCandidateBenchmarkAnalyzer__
 #define __DQMOffline_PFTau_PFCandidateBenchmarkAnalyzer__
 
-
-#include "DQMOffline/PFTau/plugins/BenchmarkAnalyzer.h"
 #include "DQMOffline/PFTau/interface/PFCandidateBenchmark.h"
+#include "DQMOffline/PFTau/plugins/BenchmarkAnalyzer.h"
 
 #include "FWCore/Utilities/interface/EDGetToken.h"
 
-class TH1F; 
+class TH1F;
+
+class PFCandidateBenchmarkAnalyzer : public BenchmarkAnalyzer, public PFCandidateBenchmark {
+public:
+  PFCandidateBenchmarkAnalyzer(const edm::ParameterSet &parameterSet);
 
-class PFCandidateBenchmarkAnalyzer: public BenchmarkAnalyzer, public PFCandidateBenchmark {
- public:
-  
-  PFCandidateBenchmarkAnalyzer(const edm::ParameterSet& parameterSet);
-  
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
-  edm::EDGetTokenT< reco::PFCandidateCollection > myColl_;
+  edm::EDGetTokenT<reco::PFCandidateCollection> myColl_;
 };
 
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/plugins/PFCandidateDQMAnalyzer.cc b/DQMOffline/PFTau/plugins/PFCandidateDQMAnalyzer.cc
index 267a3863b9f69..f6349720f1426 100644
--- a/DQMOffline/PFTau/plugins/PFCandidateDQMAnalyzer.cc
+++ b/DQMOffline/PFTau/plugins/PFCandidateDQMAnalyzer.cc
@@ -2,86 +2,77 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-#include "DataFormats/Candidate/interface/CandidateFwd.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
+#include "DataFormats/Candidate/interface/CandidateFwd.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-
 //
 // -- Constructor
 //
-PFCandidateDQMAnalyzer::PFCandidateDQMAnalyzer(const edm::ParameterSet& parameterSet)  
-  
+PFCandidateDQMAnalyzer::PFCandidateDQMAnalyzer(const edm::ParameterSet &parameterSet)
+
 {
-  pSet_                   = parameterSet;
-  inputLabel_             = pSet_.getParameter<edm::InputTag>("InputCollection");
-  matchLabel_             = pSet_.getParameter<edm::InputTag>("MatchCollection");
-  benchmarkLabel_         = pSet_.getParameter<std::string>("BenchmarkLabel"); 
-  createEfficiencyHistos_ = pSet_.getParameter<bool>( "CreateEfficiencyHistos" );
+  pSet_ = parameterSet;
+  inputLabel_ = pSet_.getParameter<edm::InputTag>("InputCollection");
+  matchLabel_ = pSet_.getParameter<edm::InputTag>("MatchCollection");
+  benchmarkLabel_ = pSet_.getParameter<std::string>("BenchmarkLabel");
+  createEfficiencyHistos_ = pSet_.getParameter<bool>("CreateEfficiencyHistos");
 
-  pfCandidateMonitor_.setParameters(parameterSet);  
-  
-  myCand_ = consumes< edm::View<reco::Candidate> >(inputLabel_);
-  myMatchedCand_ = consumes< edm::View<reco::Candidate> >(matchLabel_);
+  pfCandidateMonitor_.setParameters(parameterSet);
 
+  myCand_ = consumes<edm::View<reco::Candidate>>(inputLabel_);
+  myMatchedCand_ = consumes<edm::View<reco::Candidate>>(matchLabel_);
 
-  std::string folder = benchmarkLabel_ ;
+  std::string folder = benchmarkLabel_;
 
-  subsystemname_ = "ParticleFlow" ;
-  eventInfoFolder_ = subsystemname_ + "/" + folder ;
+  subsystemname_ = "ParticleFlow";
+  eventInfoFolder_ = subsystemname_ + "/" + folder;
 
   nBadEvents_ = 0;
-
 }
 
-
 //
 // -- BookHistograms
 //
-void PFCandidateDQMAnalyzer::bookHistograms(DQMStore::IBooker & ibooker,
-					    edm::Run const & /* iRun */,
-					    edm::EventSetup const & /* iSetup */ )
-{
-  ibooker.setCurrentFolder(eventInfoFolder_) ;
+void PFCandidateDQMAnalyzer::bookHistograms(DQMStore::IBooker &ibooker,
+                                            edm::Run const & /* iRun */,
+                                            edm::EventSetup const & /* iSetup */) {
+  ibooker.setCurrentFolder(eventInfoFolder_);
+
+  edm::LogInfo("PFCandidateDQMAnalyzer") << " PFCandidateDQMAnalyzer::bookHistograms "
+                                         << "Histogram Folder path set to " << eventInfoFolder_;
 
-  edm::LogInfo("PFCandidateDQMAnalyzer") << " PFCandidateDQMAnalyzer::bookHistograms " << "Histogram Folder path set to " << eventInfoFolder_;
-  
   pfCandidateMonitor_.setup(ibooker, pSet_);
 }
 
-
 //
 // -- Analyze
 //
-void PFCandidateDQMAnalyzer::analyze(edm::Event const& iEvent, 
-				     edm::EventSetup const& iSetup) {
-  
-  edm::Handle< edm::View<reco::Candidate> > candCollection;
-  edm::Handle< edm::View<reco::Candidate> > matchedCandCollection;
-  if ( !createEfficiencyHistos_ ) {
-    iEvent.getByToken( myCand_, candCollection);   
-    iEvent.getByToken( myMatchedCand_, matchedCandCollection);
+void PFCandidateDQMAnalyzer::analyze(edm::Event const &iEvent, edm::EventSetup const &iSetup) {
+  edm::Handle<edm::View<reco::Candidate>> candCollection;
+  edm::Handle<edm::View<reco::Candidate>> matchedCandCollection;
+  if (!createEfficiencyHistos_) {
+    iEvent.getByToken(myCand_, candCollection);
+    iEvent.getByToken(myMatchedCand_, matchedCandCollection);
   } else {
-    iEvent.getByToken( myMatchedCand_, candCollection);
-    iEvent.getByToken( myCand_, matchedCandCollection);
+    iEvent.getByToken(myMatchedCand_, candCollection);
+    iEvent.getByToken(myCand_, matchedCandCollection);
   }
-  
+
   float maxRes = 0.0;
   float minRes = 99.99;
   if (candCollection.isValid() && matchedCandCollection.isValid()) {
-    pfCandidateMonitor_.fill( *candCollection, *matchedCandCollection, minRes, maxRes, pSet_);
-    
+    pfCandidateMonitor_.fill(*candCollection, *matchedCandCollection, minRes, maxRes, pSet_);
   }
 }
 
-
 #include "FWCore/Framework/interface/MakerMacros.h"
-DEFINE_FWK_MODULE (PFCandidateDQMAnalyzer) ;
+DEFINE_FWK_MODULE(PFCandidateDQMAnalyzer);
diff --git a/DQMOffline/PFTau/plugins/PFCandidateDQMAnalyzer.h b/DQMOffline/PFTau/plugins/PFCandidateDQMAnalyzer.h
index 2b7dbafc2b41f..ff0a59e393349 100644
--- a/DQMOffline/PFTau/plugins/PFCandidateDQMAnalyzer.h
+++ b/DQMOffline/PFTau/plugins/PFCandidateDQMAnalyzer.h
@@ -1,31 +1,30 @@
 #ifndef __DQMOffline_PFTau_PFCandidateDQMAnalyzer__
 #define __DQMOffline_PFTau_PFCandidateDQMAnalyzer__
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
 #include "DQMOffline/PFTau/interface/PFCandidateMonitor.h"
 
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
-class PFCandidateDQMAnalyzer: public DQMEDAnalyzer {
- public:
-  
-  PFCandidateDQMAnalyzer(const edm::ParameterSet& parameterSet);
-  
- private:
-  void analyze(edm::Event const&, edm::EventSetup const&) override;
+class PFCandidateDQMAnalyzer : public DQMEDAnalyzer {
+public:
+  PFCandidateDQMAnalyzer(const edm::ParameterSet &parameterSet);
+
+private:
+  void analyze(edm::Event const &, edm::EventSetup const &) override;
 
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
-  MonitorElement * eventId_;
+  MonitorElement *eventId_;
 
-  edm::EDGetTokenT< edm::View<reco::Candidate> > myCand_;
-  edm::EDGetTokenT< edm::View<reco::Candidate> > myMatchedCand_;
+  edm::EDGetTokenT<edm::View<reco::Candidate>> myCand_;
+  edm::EDGetTokenT<edm::View<reco::Candidate>> myMatchedCand_;
   edm::InputTag matchLabel_;
   edm::InputTag inputLabel_;
   std::string benchmarkLabel_;
@@ -40,4 +39,4 @@ class PFCandidateDQMAnalyzer: public DQMEDAnalyzer {
   int nBadEvents_;
 };
 
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/plugins/PFCandidateManagerAnalyzer.cc b/DQMOffline/PFTau/plugins/PFCandidateManagerAnalyzer.cc
index 0530baef8568a..89f2d6f9064c2 100644
--- a/DQMOffline/PFTau/plugins/PFCandidateManagerAnalyzer.cc
+++ b/DQMOffline/PFTau/plugins/PFCandidateManagerAnalyzer.cc
@@ -1,61 +1,50 @@
 #include "DQMOffline/PFTau/plugins/PFCandidateManagerAnalyzer.h"
 
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
 #include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
+#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-
 using namespace reco;
 using namespace edm;
 using namespace std;
 
-
-
-PFCandidateManagerAnalyzer::PFCandidateManagerAnalyzer(const edm::ParameterSet& parameterSet) : 
-  BenchmarkAnalyzer(parameterSet),
-  PFCandidateManager( parameterSet.getParameter<double>("dRMax"),
-		      parameterSet.getParameter<bool>("matchCharge"), 
-		      (Benchmark::Mode) parameterSet.getParameter<int>("mode") ),
-  matchLabel_( parameterSet.getParameter<InputTag>("MatchCollection") )
-{
-  setRange( parameterSet.getParameter<double>("ptMin"),
-	    parameterSet.getParameter<double>("ptMax"),
-	    parameterSet.getParameter<double>("etaMin"),
-	    parameterSet.getParameter<double>("etaMax"),
-	    parameterSet.getParameter<double>("phiMin"),
-	    parameterSet.getParameter<double>("phiMax") );
-
-  myColl_ = consumes< PFCandidateCollection >(inputLabel_);
-  myMatchColl_ = consumes< View<Candidate> >(matchLabel_);
-
+PFCandidateManagerAnalyzer::PFCandidateManagerAnalyzer(const edm::ParameterSet &parameterSet)
+    : BenchmarkAnalyzer(parameterSet),
+      PFCandidateManager(parameterSet.getParameter<double>("dRMax"),
+                         parameterSet.getParameter<bool>("matchCharge"),
+                         (Benchmark::Mode)parameterSet.getParameter<int>("mode")),
+      matchLabel_(parameterSet.getParameter<InputTag>("MatchCollection")) {
+  setRange(parameterSet.getParameter<double>("ptMin"),
+           parameterSet.getParameter<double>("ptMax"),
+           parameterSet.getParameter<double>("etaMin"),
+           parameterSet.getParameter<double>("etaMax"),
+           parameterSet.getParameter<double>("phiMin"),
+           parameterSet.getParameter<double>("phiMax"));
+
+  myColl_ = consumes<PFCandidateCollection>(inputLabel_);
+  myMatchColl_ = consumes<View<Candidate>>(matchLabel_);
 }
 
-
-void PFCandidateManagerAnalyzer::bookHistograms(DQMStore::IBooker & ibooker,
-					    edm::Run const & iRun,
-					    edm::EventSetup const & iSetup )
-{
+void PFCandidateManagerAnalyzer::bookHistograms(DQMStore::IBooker &ibooker,
+                                                edm::Run const &iRun,
+                                                edm::EventSetup const &iSetup) {
   BenchmarkAnalyzer::bookHistograms(ibooker, iRun, iSetup);
   setup(ibooker);
 }
 
-void 
-PFCandidateManagerAnalyzer::analyze(const edm::Event& iEvent, 
-				      const edm::EventSetup& iSetup) {
-    
-  Handle< PFCandidateCollection > collection; 
+void PFCandidateManagerAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  Handle<PFCandidateCollection> collection;
   iEvent.getByToken(myColl_, collection);
 
-  Handle< View<Candidate> >  matchCollection;
+  Handle<View<Candidate>> matchCollection;
   iEvent.getByToken(myMatchColl_, matchCollection);
 
-  fill( *collection, *matchCollection );
+  fill(*collection, *matchCollection);
 }
-
diff --git a/DQMOffline/PFTau/plugins/PFCandidateManagerAnalyzer.h b/DQMOffline/PFTau/plugins/PFCandidateManagerAnalyzer.h
index 955257ae1b28f..f20b7b6af2b00 100644
--- a/DQMOffline/PFTau/plugins/PFCandidateManagerAnalyzer.h
+++ b/DQMOffline/PFTau/plugins/PFCandidateManagerAnalyzer.h
@@ -1,27 +1,25 @@
 #ifndef __DQMOffline_PFTau_PFCandidateManagerAnalyzer__
 #define __DQMOffline_PFTau_PFCandidateManagerAnalyzer__
 
-
-#include "DQMOffline/PFTau/plugins/BenchmarkAnalyzer.h"
 #include "DQMOffline/PFTau/interface/PFCandidateManager.h"
+#include "DQMOffline/PFTau/plugins/BenchmarkAnalyzer.h"
 
 #include "FWCore/Utilities/interface/EDGetToken.h"
 
-class TH1F; 
+class TH1F;
+
+class PFCandidateManagerAnalyzer : public BenchmarkAnalyzer, public PFCandidateManager {
+public:
+  PFCandidateManagerAnalyzer(const edm::ParameterSet &parameterSet);
 
-class PFCandidateManagerAnalyzer: public BenchmarkAnalyzer, public PFCandidateManager {
- public:
-  
-  PFCandidateManagerAnalyzer(const edm::ParameterSet& parameterSet);
-  
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
- private:
-  edm::EDGetTokenT< reco::PFCandidateCollection > myColl_;
-  edm::EDGetTokenT< edm::View<reco::Candidate> > myMatchColl_;
+private:
+  edm::EDGetTokenT<reco::PFCandidateCollection> myColl_;
+  edm::EDGetTokenT<edm::View<reco::Candidate>> myMatchColl_;
   edm::InputTag matchLabel_;
 };
 
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/plugins/PFClient.cc b/DQMOffline/PFTau/plugins/PFClient.cc
index 41d7aced3fc65..ccf5399dbdc75 100644
--- a/DQMOffline/PFTau/plugins/PFClient.cc
+++ b/DQMOffline/PFTau/plugins/PFClient.cc
@@ -1,351 +1,365 @@
 #include "DQMOffline/PFTau/plugins/PFClient.h"
 
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-
 //
 // -- Constructor
 //
-PFClient::PFClient(const edm::ParameterSet& parameterSet)  
-{
-  folderNames_ = parameterSet.getParameter< std::vector<std::string> >( "FolderNames" );
-  histogramNames_  = parameterSet.getParameter< std::vector<std::string> >( "HistogramNames" );
-  efficiencyFlag_ =  parameterSet.getParameter< bool> ("CreateEfficiencyPlots" );
-  effHistogramNames_  = parameterSet.getParameter< std::vector<std::string> >( "HistogramNamesForEfficiencyPlots" );
-  projectionHistogramNames_  = parameterSet.getParameter< std::vector<std::string> >( "HistogramNamesForProjectionPlots" );
-  profileFlag_ =  parameterSet.getParameter< bool> ("CreateProfilePlots" );
-  profileHistogramNames_  = parameterSet.getParameter< std::vector<std::string> >( "HistogramNamesForProfilePlots" );
+PFClient::PFClient(const edm::ParameterSet &parameterSet) {
+  folderNames_ = parameterSet.getParameter<std::vector<std::string>>("FolderNames");
+  histogramNames_ = parameterSet.getParameter<std::vector<std::string>>("HistogramNames");
+  efficiencyFlag_ = parameterSet.getParameter<bool>("CreateEfficiencyPlots");
+  effHistogramNames_ = parameterSet.getParameter<std::vector<std::string>>("HistogramNamesForEfficiencyPlots");
+  projectionHistogramNames_ = parameterSet.getParameter<std::vector<std::string>>("HistogramNamesForProjectionPlots");
+  profileFlag_ = parameterSet.getParameter<bool>("CreateProfilePlots");
+  profileHistogramNames_ = parameterSet.getParameter<std::vector<std::string>>("HistogramNamesForProfilePlots");
 }
 
-
 //
 // -- EndJobBegin Run
-// 
-void PFClient::dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter)
-{
-  doSummaries(ibooker, igetter); 
+//
+void PFClient::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
+  doSummaries(ibooker, igetter);
   doProjection(ibooker, igetter);
-  if (efficiencyFlag_) doEfficiency(ibooker, igetter);
-  if (profileFlag_) doProfiles(ibooker, igetter);
+  if (efficiencyFlag_)
+    doEfficiency(ibooker, igetter);
+  if (profileFlag_)
+    doProfiles(ibooker, igetter);
 }
 
-
 //
 // -- Create Summaries
 //
-void PFClient::doSummaries(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter) {
+void PFClient::doSummaries(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
+  for (std::vector<std::string>::const_iterator ifolder = folderNames_.begin(); ifolder != folderNames_.end();
+       ifolder++) {
+    std::string path = "ParticleFlow/" + (*ifolder);
 
-  for (std::vector<std::string>::const_iterator ifolder = folderNames_.begin(); ifolder != folderNames_.end(); ifolder++) {
-    std::string path  = "ParticleFlow/"+(*ifolder);
-
-    for (std::vector<std::string>::const_iterator ihist = histogramNames_.begin(); ihist != histogramNames_.end(); ihist++) {
+    for (std::vector<std::string>::const_iterator ihist = histogramNames_.begin(); ihist != histogramNames_.end();
+         ihist++) {
       std::string hname = (*ihist);
       createResolutionPlots(ibooker, igetter, path, hname);
     }
   }
 }
 
-
 //
 // -- Create Projection
 //
-void PFClient::doProjection(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter) {
-
-  for (std::vector<std::string>::const_iterator ifolder = folderNames_.begin();
-                                    ifolder != folderNames_.end(); ifolder++) {
-    std::string path  = "ParticleFlow/"+(*ifolder);
+void PFClient::doProjection(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
+  for (std::vector<std::string>::const_iterator ifolder = folderNames_.begin(); ifolder != folderNames_.end();
+       ifolder++) {
+    std::string path = "ParticleFlow/" + (*ifolder);
 
     for (std::vector<std::string>::const_iterator ihist = projectionHistogramNames_.begin();
-       ihist != projectionHistogramNames_.end(); ihist++) {
+         ihist != projectionHistogramNames_.end();
+         ihist++) {
       std::string hname = (*ihist);
       createProjectionPlots(ibooker, igetter, path, hname);
     }
   }
 }
 
-
 //
 // -- Create Profile
 //
-void PFClient::doProfiles(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter) {
-
-  for (std::vector<std::string>::const_iterator ifolder = folderNames_.begin();
-                                    ifolder != folderNames_.end(); ifolder++) {
-    std::string path  = "ParticleFlow/"+(*ifolder);
+void PFClient::doProfiles(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
+  for (std::vector<std::string>::const_iterator ifolder = folderNames_.begin(); ifolder != folderNames_.end();
+       ifolder++) {
+    std::string path = "ParticleFlow/" + (*ifolder);
 
     for (std::vector<std::string>::const_iterator ihist = profileHistogramNames_.begin();
-       ihist != profileHistogramNames_.end(); ihist++) {
+         ihist != profileHistogramNames_.end();
+         ihist++) {
       std::string hname = (*ihist);
       createProfilePlots(ibooker, igetter, path, hname);
     }
   }
 }
 
-
 //
 // -- Create Efficiency
 //
-void PFClient::doEfficiency(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter) {
-  for (std::vector<std::string>::const_iterator ifolder = folderNames_.begin();
-                                    ifolder != folderNames_.end(); ifolder++) {
-    std::string path  = "ParticleFlow/"+(*ifolder);
+void PFClient::doEfficiency(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
+  for (std::vector<std::string>::const_iterator ifolder = folderNames_.begin(); ifolder != folderNames_.end();
+       ifolder++) {
+    std::string path = "ParticleFlow/" + (*ifolder);
 
-    for (std::vector<std::string>::const_iterator ihist = effHistogramNames_.begin();
-	 ihist != effHistogramNames_.end(); ihist++) {
+    for (std::vector<std::string>::const_iterator ihist = effHistogramNames_.begin(); ihist != effHistogramNames_.end();
+         ihist++) {
       std::string hname = (*ihist);
       createEfficiencyPlots(ibooker, igetter, path, hname);
     }
   }
 }
 
-
 //
 // -- Create Resolution Plots
 //
-void PFClient::createResolutionPlots(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter, std::string& folder, std::string& name) {     
-  MonitorElement* me = igetter.get(folder+"/"+name);
-
-  if (!me) return;
-
-  MonitorElement* me_average; 
-  MonitorElement* me_rms; 
-  MonitorElement* me_mean; 
-  MonitorElement* me_sigma; 
-
-  if ( (me->kind() == MonitorElement::DQM_KIND_TH2F) ||
-       (me->kind() == MonitorElement::DQM_KIND_TH2S) ||
-       (me->kind() == MonitorElement::DQM_KIND_TH2D) ) {
-    TH2* th = me->getTH2F();
+void PFClient::createResolutionPlots(DQMStore::IBooker &ibooker,
+                                     DQMStore::IGetter &igetter,
+                                     std::string &folder,
+                                     std::string &name) {
+  MonitorElement *me = igetter.get(folder + "/" + name);
+
+  if (!me)
+    return;
+
+  MonitorElement *me_average;
+  MonitorElement *me_rms;
+  MonitorElement *me_mean;
+  MonitorElement *me_sigma;
+
+  if ((me->kind() == MonitorElement::DQM_KIND_TH2F) || (me->kind() == MonitorElement::DQM_KIND_TH2S) ||
+      (me->kind() == MonitorElement::DQM_KIND_TH2D)) {
+    TH2 *th = me->getTH2F();
     size_t nbinx = me->getNbinsX();
     size_t nbiny = me->getNbinsY();
-    
+
     float ymin = th->GetYaxis()->GetXmin();
     float ymax = th->GetYaxis()->GetXmax();
     std::string xtit = th->GetXaxis()->GetTitle();
     std::string ytit = th->GetYaxis()->GetTitle();
-    float* xbins = new float[nbinx+1];
-    for (size_t ix = 1; ix < nbinx+1; ++ix) {
-       xbins[ix-1] = th->GetXaxis()->GetBinLowEdge(ix);
-       if (ix == nbinx) xbins[ix] = th->GetXaxis()->GetBinUpEdge(ix);
+    float *xbins = new float[nbinx + 1];
+    for (size_t ix = 1; ix < nbinx + 1; ++ix) {
+      xbins[ix - 1] = th->GetXaxis()->GetBinLowEdge(ix);
+      if (ix == nbinx)
+        xbins[ix] = th->GetXaxis()->GetBinUpEdge(ix);
     }
-    std::string tit_new = ";"+xtit+";"+ytit;
+    std::string tit_new = ";" + xtit + ";" + ytit;
     ibooker.setCurrentFolder(folder);
-    MonitorElement* me_slice = ibooker.book1D("PFlowSlice","PFlowSlice",nbiny,ymin,ymax); 
+    MonitorElement *me_slice = ibooker.book1D("PFlowSlice", "PFlowSlice", nbiny, ymin, ymax);
 
-    tit_new = ";"+xtit+";Average_"+ytit; 
-    me_average = ibooker.book1D("average_"+name,tit_new, nbinx, xbins); 
+    tit_new = ";" + xtit + ";Average_" + ytit;
+    me_average = ibooker.book1D("average_" + name, tit_new, nbinx, xbins);
     me_average->setEfficiencyFlag();
-    tit_new = ";"+xtit+";RMS_"+ytit; 
-    me_rms     = ibooker.book1D("rms_"+name,tit_new, nbinx, xbins); 
+    tit_new = ";" + xtit + ";RMS_" + ytit;
+    me_rms = ibooker.book1D("rms_" + name, tit_new, nbinx, xbins);
     me_rms->setEfficiencyFlag();
-    tit_new = ";"+xtit+";Mean_"+ytit; 
-    me_mean    = ibooker.book1D("mean_"+name,tit_new, nbinx, xbins); 
+    tit_new = ";" + xtit + ";Mean_" + ytit;
+    me_mean = ibooker.book1D("mean_" + name, tit_new, nbinx, xbins);
     me_mean->setEfficiencyFlag();
-    tit_new = ";"+xtit+";Sigma_"+ytit; 				 
-    me_sigma   = ibooker.book1D("sigma_"+name,tit_new, nbinx, xbins); 
+    tit_new = ";" + xtit + ";Sigma_" + ytit;
+    me_sigma = ibooker.book1D("sigma_" + name, tit_new, nbinx, xbins);
     me_sigma->setEfficiencyFlag();
 
-    double  average, rms, mean, sigma;
+    double average, rms, mean, sigma;
 
-    for (size_t ix = 1; ix < nbinx+1; ++ix) {
+    for (size_t ix = 1; ix < nbinx + 1; ++ix) {
       me_slice->Reset();
-      for (size_t iy = 1; iy < nbiny+1; ++iy) {
-	me_slice->setBinContent(iy,th->GetBinContent(ix,iy)); 
+      for (size_t iy = 1; iy < nbiny + 1; ++iy) {
+        me_slice->setBinContent(iy, th->GetBinContent(ix, iy));
       }
       getHistogramParameters(me_slice, average, rms, mean, sigma);
-      me_average->setBinContent(ix,average);
-      me_rms->setBinContent(ix,rms);
-      me_mean->setBinContent(ix,mean);
-      me_sigma->setBinContent(ix,sigma);
+      me_average->setBinContent(ix, average);
+      me_rms->setBinContent(ix, rms);
+      me_mean->setBinContent(ix, mean);
+      me_sigma->setBinContent(ix, sigma);
     }
-    if (me_slice) igetter.removeElement(me_slice->getName()); //?
-    delete [] xbins;
+    if (me_slice)
+      igetter.removeElement(me_slice->getName());  //?
+    delete[] xbins;
   }
 }
 
-
 //
 // -- Create Projection Plots
 //
-void PFClient::createProjectionPlots(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter, std::string& folder, std::string& name) {     
-  MonitorElement* me = igetter.get(folder+"/"+name);
-  if (!me) return;
-
-  MonitorElement* projection = nullptr;
-
-  if ( (me->kind() == MonitorElement::DQM_KIND_TH2F) ||
-       (me->kind() == MonitorElement::DQM_KIND_TH2S) ||
-       (me->kind() == MonitorElement::DQM_KIND_TH2D) ) {
-    TH2* th = me->getTH2F();
+void PFClient::createProjectionPlots(DQMStore::IBooker &ibooker,
+                                     DQMStore::IGetter &igetter,
+                                     std::string &folder,
+                                     std::string &name) {
+  MonitorElement *me = igetter.get(folder + "/" + name);
+  if (!me)
+    return;
+
+  MonitorElement *projection = nullptr;
+
+  if ((me->kind() == MonitorElement::DQM_KIND_TH2F) || (me->kind() == MonitorElement::DQM_KIND_TH2S) ||
+      (me->kind() == MonitorElement::DQM_KIND_TH2D)) {
+    TH2 *th = me->getTH2F();
     size_t nbinx = me->getNbinsX();
     size_t nbiny = me->getNbinsY();
-    
+
     float ymin = th->GetYaxis()->GetXmin();
     float ymax = th->GetYaxis()->GetXmax();
     std::string xtit = th->GetXaxis()->GetTitle();
     std::string ytit = th->GetYaxis()->GetTitle();
-    float* xbins = new float[nbinx+1];
-    for (size_t ix = 1; ix < nbinx+1; ++ix) {
-       xbins[ix-1] = th->GetXaxis()->GetBinLowEdge(ix);
-       if (ix == nbinx) xbins[ix] = th->GetXaxis()->GetBinUpEdge(ix);
-    }    
+    float *xbins = new float[nbinx + 1];
+    for (size_t ix = 1; ix < nbinx + 1; ++ix) {
+      xbins[ix - 1] = th->GetXaxis()->GetBinLowEdge(ix);
+      if (ix == nbinx)
+        xbins[ix] = th->GetXaxis()->GetBinUpEdge(ix);
+    }
 
     std::string tit_new;
     ibooker.setCurrentFolder(folder);
 
     if (folder == "ParticleFlow/PFElectronValidation/CompWithGenElectron") {
-      if (name == "delta_et_Over_et_VS_et_") projection = ibooker.book1D("delta_et_Over_et","E_{T} resolution;#DeltaE_{T}/E_{T}",nbiny,ymin,ymax) ;
-      if (name == "delta_et_VS_et_") projection = ibooker.book1D("delta_et_","#DeltaE_{T};#DeltaE_{T}",nbiny,ymin,ymax) ;
-      if (name == "delta_eta_VS_et_") projection = ibooker.book1D("delta_eta_","#Delta#eta;#Delta#eta",nbiny,ymin,ymax) ;
-      if (name == "delta_phi_VS_et_") projection = ibooker.book1D("delta_phi_","#Delta#phi;#Delta#phi",nbiny,ymin,ymax) ;
+      if (name == "delta_et_Over_et_VS_et_")
+        projection = ibooker.book1D("delta_et_Over_et", "E_{T} resolution;#DeltaE_{T}/E_{T}", nbiny, ymin, ymax);
+      if (name == "delta_et_VS_et_")
+        projection = ibooker.book1D("delta_et_", "#DeltaE_{T};#DeltaE_{T}", nbiny, ymin, ymax);
+      if (name == "delta_eta_VS_et_")
+        projection = ibooker.book1D("delta_eta_", "#Delta#eta;#Delta#eta", nbiny, ymin, ymax);
+      if (name == "delta_phi_VS_et_")
+        projection = ibooker.book1D("delta_phi_", "#Delta#phi;#Delta#phi", nbiny, ymin, ymax);
     }
 
     if (projection) {
-      for (size_t iy = 1; iy < nbiny+1; ++iy) {
-	projection->setBinContent(iy, th->ProjectionY("e")->GetBinContent(iy) ); }
-      projection->setEntries( me->getEntries() ) ;
+      for (size_t iy = 1; iy < nbiny + 1; ++iy) {
+        projection->setBinContent(iy, th->ProjectionY("e")->GetBinContent(iy));
+      }
+      projection->setEntries(me->getEntries());
     }
-    
-    delete [] xbins;
+
+    delete[] xbins;
   }
 }
 
-
 //
 // -- Create Profile Plots
 //
-void PFClient::createProfilePlots(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter, std::string& folder, std::string& name) {     
-  MonitorElement* me = igetter.get(folder+"/"+name);
-  if (!me) return;
-
-  if ( (me->kind() == MonitorElement::DQM_KIND_TH2F) ||
-       (me->kind() == MonitorElement::DQM_KIND_TH2S) ||
-       (me->kind() == MonitorElement::DQM_KIND_TH2D) ) {
-    TH2* th = me->getTH2F();
+void PFClient::createProfilePlots(DQMStore::IBooker &ibooker,
+                                  DQMStore::IGetter &igetter,
+                                  std::string &folder,
+                                  std::string &name) {
+  MonitorElement *me = igetter.get(folder + "/" + name);
+  if (!me)
+    return;
+
+  if ((me->kind() == MonitorElement::DQM_KIND_TH2F) || (me->kind() == MonitorElement::DQM_KIND_TH2S) ||
+      (me->kind() == MonitorElement::DQM_KIND_TH2D)) {
+    TH2 *th = me->getTH2F();
     size_t nbinx = me->getNbinsX();
-    
+
     float ymin = th->GetYaxis()->GetXmin();
     float ymax = th->GetYaxis()->GetXmax();
     std::string xtit = th->GetXaxis()->GetTitle();
     std::string ytit = th->GetYaxis()->GetTitle();
-    double* xbins = new double[nbinx+1];
-    for (size_t ix = 1; ix < nbinx+1; ++ix) {
-       xbins[ix-1] = th->GetXaxis()->GetBinLowEdge(ix);
-       if (ix == nbinx) xbins[ix] = th->GetXaxis()->GetBinUpEdge(ix);
-    }    
+    double *xbins = new double[nbinx + 1];
+    for (size_t ix = 1; ix < nbinx + 1; ++ix) {
+      xbins[ix - 1] = th->GetXaxis()->GetBinLowEdge(ix);
+      if (ix == nbinx)
+        xbins[ix] = th->GetXaxis()->GetBinUpEdge(ix);
+    }
 
     std::string tit_new;
     ibooker.setCurrentFolder(folder);
-    //TProfiles
-    MonitorElement* me_profile[2]; 
-    me_profile[0] = ibooker.bookProfile("profile_"+name, tit_new,
-					   nbinx, xbins, ymin, ymax, "" ); 
-    me_profile[1] = ibooker.bookProfile("profileRMS_"+name, tit_new,
-					   nbinx, xbins, ymin, ymax, "s" ); 
-    TProfile* profileX = th->ProfileX();
-    //size_t nbiny = me->getNbinsY();
-    //TProfile* profileX = th->ProfileX("",0,nbiny+1); add underflow and overflow
+    // TProfiles
+    MonitorElement *me_profile[2];
+    me_profile[0] = ibooker.bookProfile("profile_" + name, tit_new, nbinx, xbins, ymin, ymax, "");
+    me_profile[1] = ibooker.bookProfile("profileRMS_" + name, tit_new, nbinx, xbins, ymin, ymax, "s");
+    TProfile *profileX = th->ProfileX();
+    // size_t nbiny = me->getNbinsY();
+    // TProfile* profileX = th->ProfileX("",0,nbiny+1); add underflow and
+    // overflow
     static const Int_t NUM_STAT = 7;
-    Double_t stats[NUM_STAT] = {0}; th->GetStats(stats);
+    Double_t stats[NUM_STAT] = {0};
+    th->GetStats(stats);
 
-    for (Int_t i = 0; i<2; i++) {
+    for (Int_t i = 0; i < 2; i++) {
       if (me_profile[i]) {
-	for (size_t ix = 0; ix <= nbinx+1; ++ix) {
-	  me_profile[i]->setBinContent( ix, profileX->GetBinContent(ix)*profileX->GetBinEntries(ix) ) ;
-	  //me_profile[i]->Fill( profileX->GetBinCenter(ix), profileX->GetBinContent(ix)*profileX->GetBinEntries(ix) ) ;
-	  me_profile[i]->setBinEntries( ix, profileX->GetBinEntries(ix) );
-	  me_profile[i]->getTProfile()->GetSumw2()->fArray[ix] = profileX->GetSumw2()->fArray[ix];
-	  //me_profile[i]->getTProfile()->GetBinSumw2()->fArray[ix] = profileX->GetBinSumw2()->fArray[ix]; // segmentation violation
-	}
+        for (size_t ix = 0; ix <= nbinx + 1; ++ix) {
+          me_profile[i]->setBinContent(ix, profileX->GetBinContent(ix) * profileX->GetBinEntries(ix));
+          // me_profile[i]->Fill( profileX->GetBinCenter(ix),
+          // profileX->GetBinContent(ix)*profileX->GetBinEntries(ix) ) ;
+          me_profile[i]->setBinEntries(ix, profileX->GetBinEntries(ix));
+          me_profile[i]->getTProfile()->GetSumw2()->fArray[ix] = profileX->GetSumw2()->fArray[ix];
+          // me_profile[i]->getTProfile()->GetBinSumw2()->fArray[ix] =
+          // profileX->GetBinSumw2()->fArray[ix]; // segmentation violation
+        }
       }
       me_profile[i]->getTProfile()->PutStats(stats);
-      me_profile[i]->setEntries( profileX->GetEntries() ) ;
+      me_profile[i]->setEntries(profileX->GetEntries());
     }
 
-    delete [] xbins;
+    delete[] xbins;
   }
 }
 
-
 //
 // -- Get Histogram Parameters
 //
-void PFClient::getHistogramParameters(MonitorElement* me_slice, double& average, 
-					     double& rms,double& mean, double& sigma) {
+void PFClient::getHistogramParameters(
+    MonitorElement *me_slice, double &average, double &rms, double &mean, double &sigma) {
   average = 0.0;
-  rms     = 0.0;
-  mean    = 0.0;
-  sigma   = 0.0;
+  rms = 0.0;
+  mean = 0.0;
+  sigma = 0.0;
 
-  if (!me_slice) return;
-  if  (me_slice->kind() == MonitorElement::DQM_KIND_TH1F) {
+  if (!me_slice)
+    return;
+  if (me_slice->kind() == MonitorElement::DQM_KIND_TH1F) {
     average = me_slice->getMean();
-    rms     = me_slice->getRMS();  
-    TH1F* th_slice = me_slice->getTH1F();
+    rms = me_slice->getRMS();
+    TH1F *th_slice = me_slice->getTH1F();
     if (th_slice && th_slice->GetEntries() > 0) {
-      //need our own copy for thread safety
-      TF1 gaus("mygaus","gaus");
-      th_slice->Fit( &gaus,"Q0 SERIAL");
+      // need our own copy for thread safety
+      TF1 gaus("mygaus", "gaus");
+      th_slice->Fit(&gaus, "Q0 SERIAL");
       sigma = gaus.GetParameter(2);
-      mean  = gaus.GetParameter(1);
+      mean = gaus.GetParameter(1);
     }
   }
 }
 
-
 //
 // -- Create Efficiency Plots
 //
-void PFClient::createEfficiencyPlots(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter, std::string& folder, std::string& name) {     
-  MonitorElement* me1 = igetter.get(folder+"/"+name+"ref_");
-  MonitorElement* me2 = igetter.get(folder+"/"+name+"gen_");
-  if (!me1 || !me2) return;
-
-  TH1F* me1_forEff = (TH1F*)me1->getTH1F()->Rebin(2,"me1_forEff");
-  TH1F* me2_forEff = (TH1F*)me2->getTH1F()->Rebin(2,"me2_forEff");
-    
-  MonitorElement* me_eff;
-  if ( (me1->kind() == MonitorElement::DQM_KIND_TH1F) &&
-       (me1->kind() == MonitorElement::DQM_KIND_TH1F) ) {
-    //TH1* th1 = me1->getTH1F();
-    //size_t nbinx = me1->getNbinsX();
+void PFClient::createEfficiencyPlots(DQMStore::IBooker &ibooker,
+                                     DQMStore::IGetter &igetter,
+                                     std::string &folder,
+                                     std::string &name) {
+  MonitorElement *me1 = igetter.get(folder + "/" + name + "ref_");
+  MonitorElement *me2 = igetter.get(folder + "/" + name + "gen_");
+  if (!me1 || !me2)
+    return;
+
+  TH1F *me1_forEff = (TH1F *)me1->getTH1F()->Rebin(2, "me1_forEff");
+  TH1F *me2_forEff = (TH1F *)me2->getTH1F()->Rebin(2, "me2_forEff");
+
+  MonitorElement *me_eff;
+  if ((me1->kind() == MonitorElement::DQM_KIND_TH1F) && (me1->kind() == MonitorElement::DQM_KIND_TH1F)) {
+    // TH1* th1 = me1->getTH1F();
+    // size_t nbinx = me1->getNbinsX();
     size_t nbinx = me1_forEff->GetNbinsX();
 
-    //float xmin = th1->GetXaxis()->GetXmin();
-    //float xmax = th1->GetXaxis()->GetXmax();
+    // float xmin = th1->GetXaxis()->GetXmin();
+    // float xmax = th1->GetXaxis()->GetXmax();
     float xmin = me1_forEff->GetXaxis()->GetXmin();
     float xmax = me1_forEff->GetXaxis()->GetXmax();
     std::string xtit = me1->getAxisTitle(1);
     std::string tit_new;
-    tit_new = ";"+xtit+";"+xtit+" efficiency"; 
+    tit_new = ";" + xtit + ";" + xtit + " efficiency";
 
     ibooker.setCurrentFolder(folder);
-    me_eff = ibooker.book1D("efficiency_"+name,tit_new, nbinx, xmin, xmax); 
-		
-    me_eff->Reset(); me_eff->setEfficiencyFlag();
+    me_eff = ibooker.book1D("efficiency_" + name, tit_new, nbinx, xmin, xmax);
+
+    me_eff->Reset();
+    me_eff->setEfficiencyFlag();
     /*
     double  efficiency;
     for (size_t ix = 1; ix < nbinx+1; ++ix) {
       float val1 = me1->getBinContent(ix);
       float val2 = me2->getBinContent(ix);
       if (val2 > 0.0) efficiency = val1/val2;
-      else efficiency = 0;   
+      else efficiency = 0;
       me_eff->setBinContent(ix,efficiency);
     }
     */
     // Binomial errors "B" asked by Florian
     /*me1_forEff->Sumw2(); me2_forEff->Sumw2();*/ me_eff->getTH1F()->Sumw2();
-    me_eff->getTH1F()->Divide( me1_forEff, me2_forEff, 1, 1, "B");
+    me_eff->getTH1F()->Divide(me1_forEff, me2_forEff, 1, 1, "B");
   }
 }
 
 #include "FWCore/Framework/interface/MakerMacros.h"
-DEFINE_FWK_MODULE (PFClient) ;
+DEFINE_FWK_MODULE(PFClient);
diff --git a/DQMOffline/PFTau/plugins/PFClient.h b/DQMOffline/PFTau/plugins/PFClient.h
index 6f4408006513a..2873357dda7d9 100644
--- a/DQMOffline/PFTau/plugins/PFClient.h
+++ b/DQMOffline/PFTau/plugins/PFClient.h
@@ -1,8 +1,8 @@
 #ifndef __DQMOffline_PFTau_PFClient__
 #define __DQMOffline_PFTau_PFClient__
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Utilities/interface/InputTag.h"
 
@@ -10,25 +10,23 @@
 
 class DQMStore;
 class MonitorElement;
-class PFClient: public DQMEDHarvester {
- public:
-  
-  PFClient(const edm::ParameterSet& parameterSet);
-  
- private:
-  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; 
+class PFClient : public DQMEDHarvester {
+public:
+  PFClient(const edm::ParameterSet &parameterSet);
+
+private:
+  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
 
   void doSummaries(DQMStore::IBooker &, DQMStore::IGetter &);
   void doEfficiency(DQMStore::IBooker &, DQMStore::IGetter &);
   void doProjection(DQMStore::IBooker &, DQMStore::IGetter &);
   void doProfiles(DQMStore::IBooker &, DQMStore::IGetter &);
-  void createResolutionPlots(DQMStore::IBooker &, DQMStore::IGetter &, std::string& folder, std::string& name);
-  void getHistogramParameters(MonitorElement* me_slice,
-			      double& avarage, double& rms, double& mean, double& sigma);
-  void createEfficiencyPlots(DQMStore::IBooker &, DQMStore::IGetter &, std::string& folder, std::string& name);
+  void createResolutionPlots(DQMStore::IBooker &, DQMStore::IGetter &, std::string &folder, std::string &name);
+  void getHistogramParameters(MonitorElement *me_slice, double &avarage, double &rms, double &mean, double &sigma);
+  void createEfficiencyPlots(DQMStore::IBooker &, DQMStore::IGetter &, std::string &folder, std::string &name);
 
-  void createProjectionPlots(DQMStore::IBooker &, DQMStore::IGetter &, std::string& folder, std::string& name);
-  void createProfilePlots(DQMStore::IBooker &, DQMStore::IGetter &, std::string& folder, std::string& name);
+  void createProjectionPlots(DQMStore::IBooker &, DQMStore::IGetter &, std::string &folder, std::string &name);
+  void createProfilePlots(DQMStore::IBooker &, DQMStore::IGetter &, std::string &folder, std::string &name);
 
   std::vector<std::string> folderNames_;
   std::vector<std::string> histogramNames_;
@@ -37,7 +35,6 @@ class PFClient: public DQMEDHarvester {
   std::vector<std::string> profileHistogramNames_;
   bool efficiencyFlag_;
   bool profileFlag_;
-
 };
 
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/plugins/PFClient_JetRes.cc b/DQMOffline/PFTau/plugins/PFClient_JetRes.cc
index 3095a37b0077e..2b4055bafee59 100644
--- a/DQMOffline/PFTau/plugins/PFClient_JetRes.cc
+++ b/DQMOffline/PFTau/plugins/PFClient_JetRes.cc
@@ -1,232 +1,243 @@
 #include "DQMOffline/PFTau/plugins/PFClient_JetRes.h"
 
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include "TGraph.h"
 #include "TCanvas.h"
-
+#include "TGraph.h"
 
 //
 // -- Constructor
 //
-PFClient_JetRes::PFClient_JetRes(const edm::ParameterSet& parameterSet)  
-{
-  folderNames_ = parameterSet.getParameter< std::vector<std::string> >( "FolderNames" );
-  histogramNames_  = parameterSet.getParameter< std::vector<std::string> >( "HistogramNames" );
-  efficiencyFlag_ =  parameterSet.getParameter< bool> ("CreateEfficiencyPlots" );
-  effHistogramNames_  = parameterSet.getParameter< std::vector<std::string> >( "HistogramNamesForEfficiencyPlots" );
-  PtBins_ = parameterSet.getParameter< std::vector<int> >( "VariablePtBins" ) ;
+PFClient_JetRes::PFClient_JetRes(const edm::ParameterSet &parameterSet) {
+  folderNames_ = parameterSet.getParameter<std::vector<std::string>>("FolderNames");
+  histogramNames_ = parameterSet.getParameter<std::vector<std::string>>("HistogramNames");
+  efficiencyFlag_ = parameterSet.getParameter<bool>("CreateEfficiencyPlots");
+  effHistogramNames_ = parameterSet.getParameter<std::vector<std::string>>("HistogramNamesForEfficiencyPlots");
+  PtBins_ = parameterSet.getParameter<std::vector<int>>("VariablePtBins");
 }
 
-
 //
 // -- EndJobBegin Run
-// 
-void PFClient_JetRes::dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter)
-{
-  doSummaries(ibooker, igetter); 
-  if (efficiencyFlag_) doEfficiency(ibooker, igetter);
+//
+void PFClient_JetRes::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
+  doSummaries(ibooker, igetter);
+  if (efficiencyFlag_)
+    doEfficiency(ibooker, igetter);
 }
 
-
 //
 // -- Create Summaries
 //
-void PFClient_JetRes::doSummaries(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter) {
+void PFClient_JetRes::doSummaries(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
+  for (std::vector<std::string>::const_iterator ifolder = folderNames_.begin(); ifolder != folderNames_.end();
+       ifolder++) {
+    std::string path = "ParticleFlow/" + (*ifolder);
 
-  for (std::vector<std::string>::const_iterator ifolder = folderNames_.begin();
-                                    ifolder != folderNames_.end(); ifolder++) {
-    std::string path  = "ParticleFlow/"+(*ifolder);
-
-    for (std::vector<std::string>::const_iterator ihist = histogramNames_.begin();
-       ihist != histogramNames_.end(); ihist++) {
-      std::string hname = (*ihist); 
+    for (std::vector<std::string>::const_iterator ihist = histogramNames_.begin(); ihist != histogramNames_.end();
+         ihist++) {
+      std::string hname = (*ihist);
       createResolutionPlots(ibooker, igetter, path, hname);
     }
   }
 }
 
-
 //
 // -- Create Efficiency
 //
-void PFClient_JetRes::doEfficiency(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter) {
-  for (std::vector<std::string>::const_iterator ifolder = folderNames_.begin();
-                                    ifolder != folderNames_.end(); ifolder++) {
-    std::string path  = "ParticleFlow/"+(*ifolder);
+void PFClient_JetRes::doEfficiency(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
+  for (std::vector<std::string>::const_iterator ifolder = folderNames_.begin(); ifolder != folderNames_.end();
+       ifolder++) {
+    std::string path = "ParticleFlow/" + (*ifolder);
 
-    for (std::vector<std::string>::const_iterator ihist = effHistogramNames_.begin();
-	 ihist != effHistogramNames_.end(); ihist++) {
+    for (std::vector<std::string>::const_iterator ihist = effHistogramNames_.begin(); ihist != effHistogramNames_.end();
+         ihist++) {
       std::string hname = (*ihist);
       createEfficiencyPlots(ibooker, igetter, path, hname);
     }
   }
 }
 
-
 //
 // -- Create Resolution Plots
 //
-void PFClient_JetRes::createResolutionPlots(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter, std::string& folder, std::string& name) {     
-  MonitorElement* me = igetter.get(folder+"/"+name);
-  if (!me) return;
-
-  MonitorElement* pT[PtBins_.size() -1];
-  std::vector<double> pTEntries(PtBins_.size()-1, 0) ;
-
-  //std::vector<std::string> pTRange (PtBins_.size() -1) ;
-  //char* pTRange[PtBins_.size() -1] ;
-  std::vector<TString> pTRange(PtBins_.size() -1) ;
-  //float pTCenter[PtBins_.size() -1] ;
-
-  MonitorElement* me_average; 
-  MonitorElement* me_rms; 
-  MonitorElement* me_mean; 
-  MonitorElement* me_sigma;
-
-  if ( (me->kind() == MonitorElement::DQM_KIND_TH2F) ||
-       (me->kind() == MonitorElement::DQM_KIND_TH2S) ||
-       (me->kind() == MonitorElement::DQM_KIND_TH2D) ) {
-    TH2* th = me->getTH2F();
-    //size_t nbinx = me->getNbinsX();
-    size_t nbinx = PtBins_.size() -1;
+void PFClient_JetRes::createResolutionPlots(DQMStore::IBooker &ibooker,
+                                            DQMStore::IGetter &igetter,
+                                            std::string &folder,
+                                            std::string &name) {
+  MonitorElement *me = igetter.get(folder + "/" + name);
+  if (!me)
+    return;
+
+  MonitorElement *pT[PtBins_.size() - 1];
+  std::vector<double> pTEntries(PtBins_.size() - 1, 0);
+
+  // std::vector<std::string> pTRange (PtBins_.size() -1) ;
+  // char* pTRange[PtBins_.size() -1] ;
+  std::vector<TString> pTRange(PtBins_.size() - 1);
+  // float pTCenter[PtBins_.size() -1] ;
+
+  MonitorElement *me_average;
+  MonitorElement *me_rms;
+  MonitorElement *me_mean;
+  MonitorElement *me_sigma;
+
+  if ((me->kind() == MonitorElement::DQM_KIND_TH2F) || (me->kind() == MonitorElement::DQM_KIND_TH2S) ||
+      (me->kind() == MonitorElement::DQM_KIND_TH2D)) {
+    TH2 *th = me->getTH2F();
+    // size_t nbinx = me->getNbinsX();
+    size_t nbinx = PtBins_.size() - 1;
     size_t nbiny = me->getNbinsY();
-    
+
     float ymin = th->GetYaxis()->GetXmin();
     float ymax = th->GetYaxis()->GetXmax();
     std::string xtit = th->GetXaxis()->GetTitle();
-    //std::string ytit = th->GetYaxis()->GetTitle();
+    // std::string ytit = th->GetYaxis()->GetTitle();
     std::string ytit = "#Deltap_{T}/p_{T}";
 
-    float* xbins = new float[nbinx+1];
-    for (size_t ix = 1; ix < nbinx+1; ++ix) {
-      //xbins[ix-1] = th->GetBinLowEdge(ix);
-       xbins[ix-1] = PtBins_[ix-1];
-       //snprintf(pTRange[ix-1].data(), 15, "Pt%d_%d", PtBins_[ix-1], PtBins_[ix]);
-       pTRange[ix-1] = TString::Format("Pt%d_%d", PtBins_[ix-1], PtBins_[ix]) ;
-       if (name == "BRdelta_et_Over_et_VS_et_") pTRange[ix-1] = TString::Format("BRPt%d_%d", PtBins_[ix-1], PtBins_[ix]) ;
-       else if (name == "ERdelta_et_Over_et_VS_et_") pTRange[ix-1] = TString::Format("ERPt%d_%d", PtBins_[ix-1], PtBins_[ix]) ;
-
-       //pTCenter[ix-1] = (PtBins_[ix] - PtBins_[ix-1]) / 2. ;
-       if (ix == nbinx) {
-	 //xbins[ix] = th->GetXaxis()->GetBinUpEdge(ix);
-	 xbins[ix] = PtBins_[ix];
-       }
-    }    
+    float *xbins = new float[nbinx + 1];
+    for (size_t ix = 1; ix < nbinx + 1; ++ix) {
+      // xbins[ix-1] = th->GetBinLowEdge(ix);
+      xbins[ix - 1] = PtBins_[ix - 1];
+      // snprintf(pTRange[ix-1].data(), 15, "Pt%d_%d", PtBins_[ix-1],
+      // PtBins_[ix]);
+      pTRange[ix - 1] = TString::Format("Pt%d_%d", PtBins_[ix - 1], PtBins_[ix]);
+      if (name == "BRdelta_et_Over_et_VS_et_")
+        pTRange[ix - 1] = TString::Format("BRPt%d_%d", PtBins_[ix - 1], PtBins_[ix]);
+      else if (name == "ERdelta_et_Over_et_VS_et_")
+        pTRange[ix - 1] = TString::Format("ERPt%d_%d", PtBins_[ix - 1], PtBins_[ix]);
+
+      // pTCenter[ix-1] = (PtBins_[ix] - PtBins_[ix-1]) / 2. ;
+      if (ix == nbinx) {
+        // xbins[ix] = th->GetXaxis()->GetBinUpEdge(ix);
+        xbins[ix] = PtBins_[ix];
+      }
+    }
 
     std::string tit_new;
     ibooker.setCurrentFolder(folder);
-    //MonitorElement* me_slice = ibooker.book1D("PFlowSlice", "PFlowSlice", nbiny, ymin, ymax); 
-    
-    tit_new = "Average "+ytit+";"+xtit+";Average_"+ytit ; 
-    me_average = ibooker.book1D("average_"+name,tit_new, nbinx, xbins); 
+    // MonitorElement* me_slice = ibooker.book1D("PFlowSlice", "PFlowSlice",
+    // nbiny, ymin, ymax);
+
+    tit_new = "Average " + ytit + ";" + xtit + ";Average_" + ytit;
+    me_average = ibooker.book1D("average_" + name, tit_new, nbinx, xbins);
     me_average->setEfficiencyFlag();
-    tit_new = "RMS "+ytit+";"+xtit+";RMS_"+ytit ; 
-    me_rms     = ibooker.book1D("rms_"+name,tit_new, nbinx, xbins); 
+    tit_new = "RMS " + ytit + ";" + xtit + ";RMS_" + ytit;
+    me_rms = ibooker.book1D("rms_" + name, tit_new, nbinx, xbins);
     me_rms->setEfficiencyFlag();
-    tit_new = ";"+xtit+";Mean_"+ytit; 
-    me_mean    = ibooker.book1D("mean_"+name,tit_new, nbinx, xbins); 
+    tit_new = ";" + xtit + ";Mean_" + ytit;
+    me_mean = ibooker.book1D("mean_" + name, tit_new, nbinx, xbins);
     me_mean->setEfficiencyFlag();
-    tit_new = ";"+xtit+";Sigma_"+ytit; 				 
-    me_sigma   = ibooker.book1D("sigma_"+name,tit_new, nbinx, xbins); 
+    tit_new = ";" + xtit + ";Sigma_" + ytit;
+    me_sigma = ibooker.book1D("sigma_" + name, tit_new, nbinx, xbins);
     me_sigma->setEfficiencyFlag();
-    
-    double  average, rms, mean, sigma;
-    for (size_t ix = 1; ix < nbinx+1; ++ix) {
-      //me_slice->Reset();
-      if (name == "delta_et_Over_et_VS_et_") pT[ix-1] = ibooker.book1D(pTRange[ix-1], TString::Format("Total %s;%s;Events", ytit.data(), ytit.data() ), nbiny, ymin, ymax) ;
-      if (name == "BRdelta_et_Over_et_VS_et_") pT[ix-1] = ibooker.book1D(pTRange[ix-1], TString::Format("Barrel %s;%s;Events", ytit.data(), ytit.data()), nbiny, ymin, ymax) ;
-      else if (name == "ERdelta_et_Over_et_VS_et_") pT[ix-1] = ibooker.book1D(pTRange[ix-1], TString::Format("Endcap %s;%s;Events", ytit.data(), ytit.data() ), nbiny, ymin, ymax) ;
-
-      for (size_t iy = 0; iy <= nbiny+1; ++iy)  // add under and overflow
-	if (th->GetBinContent(ix,iy)) {
-	  //me_slice->setBinContent(iy,th->GetBinContent(ix,iy)); 
-	  pT[ix-1]->setBinContent(iy, th->GetBinContent(ix,iy));
-	  pT[ix-1]->setBinError(iy, th->GetBinError(ix,iy));
-	  pTEntries[ix-1] += th->GetBinContent(ix,iy); }
-      
-      pT[ix-1]->setEntries( pTEntries[ix-1] ) ;
-
-      //getHistogramParameters(me_slice, average, rms, mean, sigma);
-      getHistogramParameters(pT[ix-1], average, rms, mean, sigma);
-      me_average->setBinContent(ix,average);
-      me_rms->setBinContent(ix,rms);
-      me_mean->setBinContent(ix,mean);
-      me_sigma->setBinContent(ix,sigma);
+
+    double average, rms, mean, sigma;
+    for (size_t ix = 1; ix < nbinx + 1; ++ix) {
+      // me_slice->Reset();
+      if (name == "delta_et_Over_et_VS_et_")
+        pT[ix - 1] = ibooker.book1D(
+            pTRange[ix - 1], TString::Format("Total %s;%s;Events", ytit.data(), ytit.data()), nbiny, ymin, ymax);
+      if (name == "BRdelta_et_Over_et_VS_et_")
+        pT[ix - 1] = ibooker.book1D(
+            pTRange[ix - 1], TString::Format("Barrel %s;%s;Events", ytit.data(), ytit.data()), nbiny, ymin, ymax);
+      else if (name == "ERdelta_et_Over_et_VS_et_")
+        pT[ix - 1] = ibooker.book1D(
+            pTRange[ix - 1], TString::Format("Endcap %s;%s;Events", ytit.data(), ytit.data()), nbiny, ymin, ymax);
+
+      for (size_t iy = 0; iy <= nbiny + 1; ++iy)  // add under and overflow
+        if (th->GetBinContent(ix, iy)) {
+          // me_slice->setBinContent(iy,th->GetBinContent(ix,iy));
+          pT[ix - 1]->setBinContent(iy, th->GetBinContent(ix, iy));
+          pT[ix - 1]->setBinError(iy, th->GetBinError(ix, iy));
+          pTEntries[ix - 1] += th->GetBinContent(ix, iy);
+        }
+
+      pT[ix - 1]->setEntries(pTEntries[ix - 1]);
+
+      // getHistogramParameters(me_slice, average, rms, mean, sigma);
+      getHistogramParameters(pT[ix - 1], average, rms, mean, sigma);
+      me_average->setBinContent(ix, average);
+      me_rms->setBinContent(ix, rms);
+      me_mean->setBinContent(ix, mean);
+      me_sigma->setBinContent(ix, sigma);
     }
-    //if (me_slice) igetter.removeElement(me_slice->getName());
-    delete [] xbins;
+    // if (me_slice) igetter.removeElement(me_slice->getName());
+    delete[] xbins;
   }
 }
 
-
 //
 // -- Get Histogram Parameters
 //
-void PFClient_JetRes::getHistogramParameters(MonitorElement* me_slice, double& average, 
-					     double& rms,double& mean, double& sigma) {
+void PFClient_JetRes::getHistogramParameters(
+    MonitorElement *me_slice, double &average, double &rms, double &mean, double &sigma) {
   average = 0.0;
-  rms     = 0.0;
-  mean    = 0.0;
-  sigma   = 0.0;
+  rms = 0.0;
+  mean = 0.0;
+  sigma = 0.0;
 
-  if (!me_slice) return;
-  if  (me_slice->kind() == MonitorElement::DQM_KIND_TH1F) {
+  if (!me_slice)
+    return;
+  if (me_slice->kind() == MonitorElement::DQM_KIND_TH1F) {
     average = me_slice->getMean();
-    rms     = me_slice->getRMS();  
-    TH1F* th_slice = me_slice->getTH1F();
+    rms = me_slice->getRMS();
+    TH1F *th_slice = me_slice->getTH1F();
     if (th_slice && th_slice->GetEntries() > 0) {
-      //need our own copy for thread safety
-      TF1 gaus("mygaus","gaus");
-      th_slice->Fit( &gaus,"Q0 SERIAL");
+      // need our own copy for thread safety
+      TF1 gaus("mygaus", "gaus");
+      th_slice->Fit(&gaus, "Q0 SERIAL");
       sigma = gaus.GetParameter(2);
-      mean  = gaus.GetParameter(1);
+      mean = gaus.GetParameter(1);
     }
   }
 }
 
-
 //
 // -- Create Resolution Plots
 //
-void PFClient_JetRes::createEfficiencyPlots(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter, std::string& folder, std::string& name) {     
-  MonitorElement* me1 = igetter.get(folder+"/"+name);
-  MonitorElement* me2 = igetter.get(folder+"/"+name+"ref_");
-  if (!me1 || !me2) return;
-  MonitorElement* me_eff;
-  if ( (me1->kind() == MonitorElement::DQM_KIND_TH1F) &&
-       (me1->kind() == MonitorElement::DQM_KIND_TH1F) ) {
-    TH1* th1 = me1->getTH1F();
+void PFClient_JetRes::createEfficiencyPlots(DQMStore::IBooker &ibooker,
+                                            DQMStore::IGetter &igetter,
+                                            std::string &folder,
+                                            std::string &name) {
+  MonitorElement *me1 = igetter.get(folder + "/" + name);
+  MonitorElement *me2 = igetter.get(folder + "/" + name + "ref_");
+  if (!me1 || !me2)
+    return;
+  MonitorElement *me_eff;
+  if ((me1->kind() == MonitorElement::DQM_KIND_TH1F) && (me1->kind() == MonitorElement::DQM_KIND_TH1F)) {
+    TH1 *th1 = me1->getTH1F();
     size_t nbinx = me1->getNbinsX();
-    
+
     float xmin = th1->GetXaxis()->GetXmin();
     float xmax = th1->GetXaxis()->GetXmax();
     std::string xtit = me1->getAxisTitle(1);
     std::string tit_new;
-    tit_new = ";"+xtit+";Efficiency"; 
+    tit_new = ";" + xtit + ";Efficiency";
 
     ibooker.setCurrentFolder(folder);
-    me_eff = ibooker.book1D("efficiency_"+name,tit_new, nbinx, xmin, xmax); 
-				 
+    me_eff = ibooker.book1D("efficiency_" + name, tit_new, nbinx, xmin, xmax);
+
     double efficiency;
-    me_eff->Reset(); me_eff->setEfficiencyFlag();
-    for (size_t ix = 1; ix < nbinx+1; ++ix) {
+    me_eff->Reset();
+    me_eff->setEfficiencyFlag();
+    for (size_t ix = 1; ix < nbinx + 1; ++ix) {
       float val1 = me1->getBinContent(ix);
       float val2 = me2->getBinContent(ix);
-      if (val2 > 0.0) efficiency = val1/val2;
-      else efficiency = 0;   
-      me_eff->setBinContent(ix,efficiency);
+      if (val2 > 0.0)
+        efficiency = val1 / val2;
+      else
+        efficiency = 0;
+      me_eff->setBinContent(ix, efficiency);
     }
   }
 }
 
 #include "FWCore/Framework/interface/MakerMacros.h"
-DEFINE_FWK_MODULE (PFClient_JetRes) ;
+DEFINE_FWK_MODULE(PFClient_JetRes);
diff --git a/DQMOffline/PFTau/plugins/PFClient_JetRes.h b/DQMOffline/PFTau/plugins/PFClient_JetRes.h
index ae2d6c2afb585..e4b4765c919b4 100644
--- a/DQMOffline/PFTau/plugins/PFClient_JetRes.h
+++ b/DQMOffline/PFTau/plugins/PFClient_JetRes.h
@@ -1,8 +1,8 @@
 #ifndef __DQMOffline_PFTau_PFClient_JetRes__
 #define __DQMOffline_PFTau_PFClient_JetRes__
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Utilities/interface/InputTag.h"
 
@@ -10,20 +10,18 @@
 
 class DQMStore;
 class MonitorElement;
-class PFClient_JetRes: public DQMEDHarvester {
- public:
-  
-  PFClient_JetRes(const edm::ParameterSet& parameterSet);
-  
- private:
-  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;  
+class PFClient_JetRes : public DQMEDHarvester {
+public:
+  PFClient_JetRes(const edm::ParameterSet &parameterSet);
+
+private:
+  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
 
   void doSummaries(DQMStore::IBooker &, DQMStore::IGetter &);
   void doEfficiency(DQMStore::IBooker &, DQMStore::IGetter &);
-  void createResolutionPlots(DQMStore::IBooker &, DQMStore::IGetter &, std::string& folder, std::string& name);
-  void getHistogramParameters(MonitorElement* me_slice,
-			      double& avarage, double& rms, double& mean, double& sigma);
-  void createEfficiencyPlots(DQMStore::IBooker &, DQMStore::IGetter &, std::string& folder, std::string& name);
+  void createResolutionPlots(DQMStore::IBooker &, DQMStore::IGetter &, std::string &folder, std::string &name);
+  void getHistogramParameters(MonitorElement *me_slice, double &avarage, double &rms, double &mean, double &sigma);
+  void createEfficiencyPlots(DQMStore::IBooker &, DQMStore::IGetter &, std::string &folder, std::string &name);
 
   std::vector<std::string> folderNames_;
   std::vector<std::string> histogramNames_;
@@ -31,7 +29,6 @@ class PFClient_JetRes: public DQMEDHarvester {
   std::vector<int> PtBins_;
 
   bool efficiencyFlag_;
-
 };
 
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/plugins/PFDQMEventSelector.cc b/DQMOffline/PFTau/plugins/PFDQMEventSelector.cc
index d3f3ffdf95467..8148792dc0317 100644
--- a/DQMOffline/PFTau/plugins/PFDQMEventSelector.cc
+++ b/DQMOffline/PFTau/plugins/PFDQMEventSelector.cc
@@ -1,91 +1,84 @@
-#include "DQMOffline/PFTau/plugins/PFDQMEventSelector.h" 
+#include "DQMOffline/PFTau/plugins/PFDQMEventSelector.h"
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include <iostream>
- 
+
 //
 // -- Constructor
 //
-PFDQMEventSelector::PFDQMEventSelector( const edm::ParameterSet & pset ) {
-   verbose_       = pset.getParameter<bool>( "DebugOn" );
-   inputFileName_ = pset.getParameter<std::string>("InputFileName");
-   folderNames_   = pset.getParameter< std::vector<std::string> >("FolderNames");
+PFDQMEventSelector::PFDQMEventSelector(const edm::ParameterSet &pset) {
+  verbose_ = pset.getParameter<bool>("DebugOn");
+  inputFileName_ = pset.getParameter<std::string>("InputFileName");
+  folderNames_ = pset.getParameter<std::vector<std::string>>("FolderNames");
 
-   nEvents_         = 0;
-   nSelectedEvents_ = 0;
-   fileOpened_      = false;
+  nEvents_ = 0;
+  nSelectedEvents_ = 0;
+  fileOpened_ = false;
 }
 //
 // -- Destructor
 //
-PFDQMEventSelector::~PFDQMEventSelector() {
-}
- 
+PFDQMEventSelector::~PFDQMEventSelector() {}
+
 //
 // -- BeginJob
 //
 void PFDQMEventSelector::beginJob() {
-
   dqmStore_ = edm::Service<DQMStore>().operator->();
   fileOpened_ = openInputFile();
 }
 //
 // -- Event Filtering
 //
-bool PFDQMEventSelector::filter( edm::Event & iEvent, edm::EventSetup const& iSetup) {
-  
+bool PFDQMEventSelector::filter(edm::Event &iEvent, edm::EventSetup const &iSetup) {
   nEvents_++;
-  if (!fileOpened_) return false;
+  if (!fileOpened_)
+    return false;
 
-  edm::RunNumber_t runNb  = iEvent.id().run();
-  edm::EventNumber_t evtNb  = iEvent.id().event();
+  edm::RunNumber_t runNb = iEvent.id().run();
+  edm::EventNumber_t evtNb = iEvent.id().event();
   edm::LuminosityBlockNumber_t lumiNb = iEvent.id().luminosityBlock();
   std::ostringstream eventid_str;
-  eventid_str << runNb << "_"<< evtNb << "_" << lumiNb;
-  
-  for (std::vector<std::string>::const_iterator ifolder = folderNames_.begin();
-                                    ifolder != folderNames_.end(); ifolder++) {
-    std::string path  = "ParticleFlow/"+(*ifolder) + "/BadEvents";
-    MonitorElement* me = dqmStore_->get(path + "/" + eventid_str.str());
+  eventid_str << runNb << "_" << evtNb << "_" << lumiNb;
+
+  for (std::vector<std::string>::const_iterator ifolder = folderNames_.begin(); ifolder != folderNames_.end();
+       ifolder++) {
+    std::string path = "ParticleFlow/" + (*ifolder) + "/BadEvents";
+    MonitorElement *me = dqmStore_->get(path + "/" + eventid_str.str());
     if (me) {
       nSelectedEvents_++;
-      if ( verbose_ ) std::cout << " Total Events " << nEvents_ 
-				<< " Selected Events " << nSelectedEvents_ 
-				<< " Run # : " << runNb 
-				<< " Event # : " << evtNb
-				<< " Luminosity Block # : " << lumiNb
-                                <<  std::endl;           
+      if (verbose_)
+        std::cout << " Total Events " << nEvents_ << " Selected Events " << nSelectedEvents_ << " Run # : " << runNb
+                  << " Event # : " << evtNb << " Luminosity Block # : " << lumiNb << std::endl;
       return true;
     }
-  } 
+  }
   return false;
 }
 //
 // -- End Job
 //
 void PFDQMEventSelector::endJob() {
-  if ( verbose_ ) std::cout << " Total Events " << nEvents_ 
-			    << " Selected Events " << nSelectedEvents_ 
-                            << std::endl; 
+  if (verbose_)
+    std::cout << " Total Events " << nEvents_ << " Selected Events " << nSelectedEvents_ << std::endl;
 }
 //
 // -- Open Input File
 //
-bool PFDQMEventSelector::openInputFile() { 
-  if (inputFileName_.empty()) return false;
-  edm::LogInfo("SiStripOfflineDQM") <<  "SiStripOfflineDQM::openInputFile: Accessing root File" << inputFileName_;
-  dqmStore_->open(inputFileName_, false, "", "", DQMStore::StripRunDirs); 
+bool PFDQMEventSelector::openInputFile() {
+  if (inputFileName_.empty())
+    return false;
+  edm::LogInfo("SiStripOfflineDQM") << "SiStripOfflineDQM::openInputFile: Accessing root File" << inputFileName_;
+  dqmStore_->open(inputFileName_, false, "", "", DQMStore::StripRunDirs);
   return true;
 }
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 DEFINE_FWK_MODULE(PFDQMEventSelector);
-
- 
diff --git a/DQMOffline/PFTau/plugins/PFDQMEventSelector.h b/DQMOffline/PFTau/plugins/PFDQMEventSelector.h
index 60481a73b5549..bbef08315a799 100644
--- a/DQMOffline/PFTau/plugins/PFDQMEventSelector.h
+++ b/DQMOffline/PFTau/plugins/PFDQMEventSelector.h
@@ -3,17 +3,16 @@
 
 #include "FWCore/Framework/interface/EDFilter.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
- 
+
 class DQMStore;
 class PFDQMEventSelector : public edm::EDFilter {
-
 public:
-   PFDQMEventSelector( const edm::ParameterSet & );
- ~PFDQMEventSelector() override;
+  PFDQMEventSelector(const edm::ParameterSet &);
+  ~PFDQMEventSelector() override;
 
 private:
   void beginJob() override;
-  bool filter( edm::Event &, edm::EventSetup const& ) override;
+  bool filter(edm::Event &, edm::EventSetup const &) override;
   void endJob() override;
 
   bool openInputFile();
@@ -22,10 +21,10 @@ class PFDQMEventSelector : public edm::EDFilter {
   bool verbose_;
 
   std::vector<std::string> folderNames_;
-  std::string inputFileName_; 
-  bool fileOpened_; 
+  std::string inputFileName_;
+  bool fileOpened_;
 
-  DQMStore* dqmStore_;
+  DQMStore *dqmStore_;
 };
 
 #endif
diff --git a/DQMOffline/PFTau/plugins/PFJetDQMAnalyzer.cc b/DQMOffline/PFTau/plugins/PFJetDQMAnalyzer.cc
index d938d987054b0..e1c2c0298ca59 100644
--- a/DQMOffline/PFTau/plugins/PFJetDQMAnalyzer.cc
+++ b/DQMOffline/PFTau/plugins/PFJetDQMAnalyzer.cc
@@ -2,84 +2,83 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
-#include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
 #include "DataFormats/JetReco/interface/CaloJetCollection.h"
 #include "DataFormats/JetReco/interface/JetCollection.h"
 #include "DataFormats/JetReco/interface/PFJet.h"
+#include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
+#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-
 //
 // -- Constructor
 //
-PFJetDQMAnalyzer::PFJetDQMAnalyzer(const edm::ParameterSet& parameterSet)  
-  
+PFJetDQMAnalyzer::PFJetDQMAnalyzer(const edm::ParameterSet &parameterSet)
+
 {
-  pSet_                = parameterSet;
-  inputLabel_          = pSet_.getParameter<edm::InputTag>("InputCollection");
-  matchLabel_          = pSet_.getParameter<edm::InputTag>("MatchCollection");
-  benchmarkLabel_      = pSet_.getParameter<std::string>("BenchmarkLabel"); 
+  pSet_ = parameterSet;
+  inputLabel_ = pSet_.getParameter<edm::InputTag>("InputCollection");
+  matchLabel_ = pSet_.getParameter<edm::InputTag>("MatchCollection");
+  benchmarkLabel_ = pSet_.getParameter<std::string>("BenchmarkLabel");
 
-  pfJetMonitor_.setParameters(parameterSet);  // set parameters for booking histograms and validating jet 
-  
-  myJet_ = consumes< edm::View<reco::Jet> >(inputLabel_);
-  myMatchedJet_ = consumes< edm::View<reco::Jet> >(matchLabel_);
+  pfJetMonitor_.setParameters(parameterSet);  // set parameters for booking histograms and validating jet
 
+  myJet_ = consumes<edm::View<reco::Jet>>(inputLabel_);
+  myMatchedJet_ = consumes<edm::View<reco::Jet>>(matchLabel_);
 
-  std::string folder = benchmarkLabel_ ;
+  std::string folder = benchmarkLabel_;
 
-  subsystemname_ = "ParticleFlow" ;
-  eventInfoFolder_ = subsystemname_ + "/" + folder ;
+  subsystemname_ = "ParticleFlow";
+  eventInfoFolder_ = subsystemname_ + "/" + folder;
 
   nBadEvents_ = 0;
-
 }
 
-
 //
 // -- BookHistograms
 //
-void PFJetDQMAnalyzer::bookHistograms(DQMStore::IBooker & ibooker,
-					    edm::Run const & /* iRun */,
-					    edm::EventSetup const & /* iSetup */ )
-{
-  ibooker.setCurrentFolder(eventInfoFolder_) ;
+void PFJetDQMAnalyzer::bookHistograms(DQMStore::IBooker &ibooker,
+                                      edm::Run const & /* iRun */,
+                                      edm::EventSetup const & /* iSetup */) {
+  ibooker.setCurrentFolder(eventInfoFolder_);
 
-  edm::LogInfo("PFJetDQMAnalyzer") << " PFJetDQMAnalyzer::bookHistograms " << "Histogram Folder path set to " << eventInfoFolder_;
+  edm::LogInfo("PFJetDQMAnalyzer") << " PFJetDQMAnalyzer::bookHistograms "
+                                   << "Histogram Folder path set to " << eventInfoFolder_;
 
   pfJetMonitor_.setup(ibooker, pSet_);
 }
 
-
 //
 // -- Analyze
 //
-void PFJetDQMAnalyzer::analyze(edm::Event const& iEvent, edm::EventSetup const& iSetup) {
+void PFJetDQMAnalyzer::analyze(edm::Event const &iEvent, edm::EventSetup const &iSetup) {
+  edm::Handle<edm::View<reco::Jet>> jetCollection;
+  iEvent.getByToken(myJet_, jetCollection);
 
-  edm::Handle< edm::View<reco::Jet> > jetCollection;
-  iEvent.getByToken(myJet_, jetCollection);   
-  
-  edm::Handle< edm::View<reco::Jet> > matchedJetCollection; 
+  edm::Handle<edm::View<reco::Jet>> matchedJetCollection;
   iEvent.getByToken(myMatchedJet_, matchedJetCollection);
 
   float maxRes = 0.0;
   float minRes = 99.99;
   float jetpT = 0.0;
   if (jetCollection.isValid() && matchedJetCollection.isValid()) {
-    pfJetMonitor_.fill( *jetCollection, *matchedJetCollection, minRes, maxRes, jetpT, pSet_);  // match collections and fill pt eta phi and charge histos for candidate jet, fill delta_x_VS_y histos for matched couples, book and fill delta_frac_VS_frac histos for matched couples
-
+    pfJetMonitor_.fill(*jetCollection,
+                       *matchedJetCollection,
+                       minRes,
+                       maxRes,
+                       jetpT,
+                       pSet_);  // match collections and fill pt eta phi and charge histos for
+                                // candidate jet, fill delta_x_VS_y histos for matched couples,
+                                // book and fill delta_frac_VS_frac histos for matched couples
   }
 }
 
-
 #include "FWCore/Framework/interface/MakerMacros.h"
-DEFINE_FWK_MODULE (PFJetDQMAnalyzer) ;
+DEFINE_FWK_MODULE(PFJetDQMAnalyzer);
diff --git a/DQMOffline/PFTau/plugins/PFJetDQMAnalyzer.h b/DQMOffline/PFTau/plugins/PFJetDQMAnalyzer.h
index a1cb25e228cb4..2bf3e17444968 100644
--- a/DQMOffline/PFTau/plugins/PFJetDQMAnalyzer.h
+++ b/DQMOffline/PFTau/plugins/PFJetDQMAnalyzer.h
@@ -1,33 +1,32 @@
 #ifndef __DQMOffline_PFTau_PFJetDQMAnalyzer__
 #define __DQMOffline_PFTau_PFJetDQMAnalyzer__
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
 #include "DQMOffline/PFTau/interface/PFJetMonitor.h"
 
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
-class PFJetDQMAnalyzer: public DQMEDAnalyzer {
- public:
-  
-  PFJetDQMAnalyzer(const edm::ParameterSet& parameterSet);
-  
- private:
-  void analyze(edm::Event const&, edm::EventSetup const&) override;
+class PFJetDQMAnalyzer : public DQMEDAnalyzer {
+public:
+  PFJetDQMAnalyzer(const edm::ParameterSet &parameterSet);
+
+private:
+  void analyze(edm::Event const &, edm::EventSetup const &) override;
 
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
-  edm::EDGetTokenT< edm::View<reco::Jet> > myJet_;
-  edm::EDGetTokenT< edm::View<reco::Jet> > myMatchedJet_;
+  edm::EDGetTokenT<edm::View<reco::Jet>> myJet_;
+  edm::EDGetTokenT<edm::View<reco::Jet>> myMatchedJet_;
   edm::InputTag matchLabel_;
   edm::InputTag inputLabel_;
   std::string benchmarkLabel_;
-  
+
   PFJetMonitor pfJetMonitor_;
 
   edm::ParameterSet pSet_;
@@ -37,4 +36,4 @@ class PFJetDQMAnalyzer: public DQMEDAnalyzer {
   int nBadEvents_;
 };
 
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/plugins/PFMETDQMAnalyzer.cc b/DQMOffline/PFTau/plugins/PFMETDQMAnalyzer.cc
index 2822a218cde56..f0baeac1ac195 100644
--- a/DQMOffline/PFTau/plugins/PFMETDQMAnalyzer.cc
+++ b/DQMOffline/PFTau/plugins/PFMETDQMAnalyzer.cc
@@ -2,81 +2,73 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
-#include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
 #include "DataFormats/METReco/interface/MET.h"
+#include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
+#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-
 //
 // -- Constructor
 //
-PFMETDQMAnalyzer::PFMETDQMAnalyzer(const edm::ParameterSet& parameterSet)  
-  
-{
-  pSet_                = parameterSet;
-  inputLabel_          = pSet_.getParameter<edm::InputTag>("InputCollection");
-  matchLabel_          = pSet_.getParameter<edm::InputTag>("MatchCollection");
-  benchmarkLabel_      = pSet_.getParameter<std::string>("BenchmarkLabel"); 
+PFMETDQMAnalyzer::PFMETDQMAnalyzer(const edm::ParameterSet &parameterSet)
 
-  pfMETMonitor_.setParameters(parameterSet);  
+{
+  pSet_ = parameterSet;
+  inputLabel_ = pSet_.getParameter<edm::InputTag>("InputCollection");
+  matchLabel_ = pSet_.getParameter<edm::InputTag>("MatchCollection");
+  benchmarkLabel_ = pSet_.getParameter<std::string>("BenchmarkLabel");
 
-  myMET_ = consumes< edm::View<reco::MET> >(inputLabel_);
-  myMatchedMET_ = consumes< edm::View<reco::MET> >(matchLabel_);
+  pfMETMonitor_.setParameters(parameterSet);
 
+  myMET_ = consumes<edm::View<reco::MET>>(inputLabel_);
+  myMatchedMET_ = consumes<edm::View<reco::MET>>(matchLabel_);
 
-  std::string folder = benchmarkLabel_ ;
+  std::string folder = benchmarkLabel_;
 
-  subsystemname_ = "ParticleFlow" ;
-  eventInfoFolder_ = subsystemname_ + "/" + folder ;
+  subsystemname_ = "ParticleFlow";
+  eventInfoFolder_ = subsystemname_ + "/" + folder;
 
   nBadEvents_ = 0;
-
 }
 
-
 //
 // -- BookHistograms
 //
-void PFMETDQMAnalyzer::bookHistograms(DQMStore::IBooker & ibooker,
-					    edm::Run const & /* iRun */,
-					    edm::EventSetup const & /* iSetup */ )
-{
-  ibooker.setCurrentFolder(eventInfoFolder_) ;
+void PFMETDQMAnalyzer::bookHistograms(DQMStore::IBooker &ibooker,
+                                      edm::Run const & /* iRun */,
+                                      edm::EventSetup const & /* iSetup */) {
+  ibooker.setCurrentFolder(eventInfoFolder_);
 
-  edm::LogInfo("PFMETDQMAnalyzer") << " PFMETDQMAnalyzer::bookHistograms " << "Histogram Folder path set to " << eventInfoFolder_;
+  edm::LogInfo("PFMETDQMAnalyzer") << " PFMETDQMAnalyzer::bookHistograms "
+                                   << "Histogram Folder path set to " << eventInfoFolder_;
 
   pfMETMonitor_.setup(ibooker, pSet_);
 }
 
-
 //
 // -- Analyze
 //
-void PFMETDQMAnalyzer::analyze(edm::Event const& iEvent, 
-			       edm::EventSetup const& iSetup) {
-  edm::Handle< edm::View<reco::MET> > metCollection;
-  iEvent.getByToken(myMET_, metCollection);   
-  
-  edm::Handle< edm::View<reco::MET> > matchedMetCollection; 
+void PFMETDQMAnalyzer::analyze(edm::Event const &iEvent, edm::EventSetup const &iSetup) {
+  edm::Handle<edm::View<reco::MET>> metCollection;
+  iEvent.getByToken(myMET_, metCollection);
+
+  edm::Handle<edm::View<reco::MET>> matchedMetCollection;
   iEvent.getByToken(myMatchedMET_, matchedMetCollection);
 
   if (metCollection.isValid() && matchedMetCollection.isValid()) {
     float maxRes = 0.0;
     float minRes = 99.99;
-    pfMETMonitor_.fillOne( (*metCollection)[0], (*matchedMetCollection)[0], minRes, maxRes);    
-
+    pfMETMonitor_.fillOne((*metCollection)[0], (*matchedMetCollection)[0], minRes, maxRes);
   }
 }
 
-
 #include "FWCore/Framework/interface/MakerMacros.h"
-DEFINE_FWK_MODULE (PFMETDQMAnalyzer) ;
+DEFINE_FWK_MODULE(PFMETDQMAnalyzer);
diff --git a/DQMOffline/PFTau/plugins/PFMETDQMAnalyzer.h b/DQMOffline/PFTau/plugins/PFMETDQMAnalyzer.h
index c9747a54f6525..38b5200e15d08 100644
--- a/DQMOffline/PFTau/plugins/PFMETDQMAnalyzer.h
+++ b/DQMOffline/PFTau/plugins/PFMETDQMAnalyzer.h
@@ -1,33 +1,32 @@
 #ifndef __DQMOffline_PFTau_PFMETDQMAnalyzer__
 #define __DQMOffline_PFTau_PFMETDQMAnalyzer__
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
 #include "DQMOffline/PFTau/interface/PFMETMonitor.h"
 
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
-class PFMETDQMAnalyzer: public DQMEDAnalyzer {
- public:
-  
-  PFMETDQMAnalyzer(const edm::ParameterSet& parameterSet);
-  
- private:
-  void analyze(edm::Event const&, edm::EventSetup const&) override;
+class PFMETDQMAnalyzer : public DQMEDAnalyzer {
+public:
+  PFMETDQMAnalyzer(const edm::ParameterSet &parameterSet);
+
+private:
+  void analyze(edm::Event const &, edm::EventSetup const &) override;
 
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
-  edm::EDGetTokenT< edm::View<reco::MET> > myMET_;
-  edm::EDGetTokenT< edm::View<reco::MET> > myMatchedMET_;
+  edm::EDGetTokenT<edm::View<reco::MET>> myMET_;
+  edm::EDGetTokenT<edm::View<reco::MET>> myMatchedMET_;
   edm::InputTag matchLabel_;
   edm::InputTag inputLabel_;
   std::string benchmarkLabel_;
-  
+
   PFMETMonitor pfMETMonitor_;
 
   edm::ParameterSet pSet_;
@@ -37,4 +36,4 @@ class PFMETDQMAnalyzer: public DQMEDAnalyzer {
   int nBadEvents_;
 };
 
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/plugins/PFMuonDQMAnalyzer.cc b/DQMOffline/PFTau/plugins/PFMuonDQMAnalyzer.cc
index 79536748ef3d2..095f70e9d3bdd 100644
--- a/DQMOffline/PFTau/plugins/PFMuonDQMAnalyzer.cc
+++ b/DQMOffline/PFTau/plugins/PFMuonDQMAnalyzer.cc
@@ -2,13 +2,13 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-#include "DataFormats/Candidate/interface/CandidateFwd.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
+#include "DataFormats/Candidate/interface/CandidateFwd.h"
 #include "DataFormats/MuonReco/interface/Muon.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
@@ -17,70 +17,62 @@
 //
 // -- Constructor
 //
-PFMuonDQMAnalyzer::PFMuonDQMAnalyzer(const edm::ParameterSet& parameterSet)  
-  
+PFMuonDQMAnalyzer::PFMuonDQMAnalyzer(const edm::ParameterSet &parameterSet)
+
 {
-  pSet_                   = parameterSet;
-  inputLabel_             = pSet_.getParameter<edm::InputTag>("InputCollection");
-  matchLabel_             = pSet_.getParameter<edm::InputTag>("MatchCollection");
-  benchmarkLabel_         = pSet_.getParameter<std::string>("BenchmarkLabel"); 
-  createEfficiencyHistos_ = pSet_.getParameter<bool>( "CreateEfficiencyHistos" );
+  pSet_ = parameterSet;
+  inputLabel_ = pSet_.getParameter<edm::InputTag>("InputCollection");
+  matchLabel_ = pSet_.getParameter<edm::InputTag>("MatchCollection");
+  benchmarkLabel_ = pSet_.getParameter<std::string>("BenchmarkLabel");
+  createEfficiencyHistos_ = pSet_.getParameter<bool>("CreateEfficiencyHistos");
 
-  pfCandidateMonitor_.setParameters(parameterSet);  
-  
-  myCand_ = consumes< edm::View<reco::Muon> >(inputLabel_);
-  myMatchedCand_ = consumes< edm::View<reco::Muon> >(matchLabel_);
+  pfCandidateMonitor_.setParameters(parameterSet);
 
+  myCand_ = consumes<edm::View<reco::Muon>>(inputLabel_);
+  myMatchedCand_ = consumes<edm::View<reco::Muon>>(matchLabel_);
 
-  std::string folder = benchmarkLabel_ ;
-  
-  subsystemname_ = "ParticleFlow" ;
-  eventInfoFolder_ = subsystemname_ + "/" + folder ;
+  std::string folder = benchmarkLabel_;
 
-  nBadEvents_ = 0;
+  subsystemname_ = "ParticleFlow";
+  eventInfoFolder_ = subsystemname_ + "/" + folder;
 
+  nBadEvents_ = 0;
 }
 
-
 //
 // -- BookHistograms
 //
-void PFMuonDQMAnalyzer::bookHistograms(DQMStore::IBooker & ibooker,
-				       edm::Run const & /* iRun */,
-				       edm::EventSetup const & /* iSetup */ )
-{
-  ibooker.setCurrentFolder(eventInfoFolder_) ;
+void PFMuonDQMAnalyzer::bookHistograms(DQMStore::IBooker &ibooker,
+                                       edm::Run const & /* iRun */,
+                                       edm::EventSetup const & /* iSetup */) {
+  ibooker.setCurrentFolder(eventInfoFolder_);
+
+  edm::LogInfo("PFMuonDQMAnalyzer") << " PFMuonDQMAnalyzer::bookHistograms "
+                                    << "Histogram Folder path set to " << eventInfoFolder_;
 
-  edm::LogInfo("PFMuonDQMAnalyzer") << " PFMuonDQMAnalyzer::bookHistograms " << "Histogram Folder path set to " << eventInfoFolder_;
-  
   pfCandidateMonitor_.setup(ibooker, pSet_);
 }
 
-
 //
 // -- Analyze
 //
-void PFMuonDQMAnalyzer::analyze(edm::Event const& iEvent, 
-				      edm::EventSetup const& iSetup) {
-  
-  edm::Handle< edm::View<reco::Muon> > candCollection;
-  edm::Handle< edm::View<reco::Muon> > matchedCandCollection;
-  if ( !createEfficiencyHistos_ ) {
-    iEvent.getByToken( myCand_, candCollection);   
-    iEvent.getByToken( myMatchedCand_, matchedCandCollection);
+void PFMuonDQMAnalyzer::analyze(edm::Event const &iEvent, edm::EventSetup const &iSetup) {
+  edm::Handle<edm::View<reco::Muon>> candCollection;
+  edm::Handle<edm::View<reco::Muon>> matchedCandCollection;
+  if (!createEfficiencyHistos_) {
+    iEvent.getByToken(myCand_, candCollection);
+    iEvent.getByToken(myMatchedCand_, matchedCandCollection);
   } else {
-    iEvent.getByToken( myMatchedCand_, candCollection);
-    iEvent.getByToken( myCand_, matchedCandCollection);
+    iEvent.getByToken(myMatchedCand_, candCollection);
+    iEvent.getByToken(myCand_, matchedCandCollection);
   }
-  
+
   float maxRes = 0.0;
   float minRes = 99.99;
   if (candCollection.isValid() && matchedCandCollection.isValid()) {
-    pfCandidateMonitor_.fill( *candCollection, *matchedCandCollection, minRes, maxRes, pSet_, *matchedCandCollection) ;
-        
+    pfCandidateMonitor_.fill(*candCollection, *matchedCandCollection, minRes, maxRes, pSet_, *matchedCandCollection);
   }
 }
 
-
 #include "FWCore/Framework/interface/MakerMacros.h"
-DEFINE_FWK_MODULE (PFMuonDQMAnalyzer) ;
+DEFINE_FWK_MODULE(PFMuonDQMAnalyzer);
diff --git a/DQMOffline/PFTau/plugins/PFMuonDQMAnalyzer.h b/DQMOffline/PFTau/plugins/PFMuonDQMAnalyzer.h
index cffe7a3b48974..dd4b8e2aa9a1b 100644
--- a/DQMOffline/PFTau/plugins/PFMuonDQMAnalyzer.h
+++ b/DQMOffline/PFTau/plugins/PFMuonDQMAnalyzer.h
@@ -1,30 +1,28 @@
 #ifndef __DQMOffline_PFTau_PFMuonDQMAnalyzer__
 #define __DQMOffline_PFTau_PFMuonDQMAnalyzer__
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
 #include "DQMOffline/PFTau/interface/PFCandidateMonitor.h"
 
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
-class PFMuonDQMAnalyzer: public DQMEDAnalyzer {
- public:
-  
-  PFMuonDQMAnalyzer(const edm::ParameterSet& parameterSet);
-  
- private:
-  void analyze(edm::Event const&, edm::EventSetup const&) override;
+class PFMuonDQMAnalyzer : public DQMEDAnalyzer {
+public:
+  PFMuonDQMAnalyzer(const edm::ParameterSet &parameterSet);
 
-  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+private:
+  void analyze(edm::Event const &, edm::EventSetup const &) override;
 
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
-  edm::EDGetTokenT< edm::View<reco::Muon> > myCand_;
-  edm::EDGetTokenT< edm::View<reco::Muon> > myMatchedCand_;
+  edm::EDGetTokenT<edm::View<reco::Muon>> myCand_;
+  edm::EDGetTokenT<edm::View<reco::Muon>> myMatchedCand_;
   edm::InputTag matchLabel_;
   edm::InputTag inputLabel_;
   std::string benchmarkLabel_;
@@ -42,4 +40,4 @@ class PFMuonDQMAnalyzer: public DQMEDAnalyzer {
   int nBadEvents_;
 };
 
-#endif 
+#endif
diff --git a/DQMOffline/PFTau/plugins/SealModule.cc b/DQMOffline/PFTau/plugins/SealModule.cc
index c53bc320b5922..8730f448e7c2a 100644
--- a/DQMOffline/PFTau/plugins/SealModule.cc
+++ b/DQMOffline/PFTau/plugins/SealModule.cc
@@ -1,14 +1,14 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 
 #include "DQMOffline/PFTau/plugins/CandidateBenchmarkAnalyzer.h"
+#include "DQMOffline/PFTau/plugins/METBenchmarkAnalyzer.h"
+#include "DQMOffline/PFTau/plugins/MatchMETBenchmarkAnalyzer.h"
 #include "DQMOffline/PFTau/plugins/PFCandidateBenchmarkAnalyzer.h"
 #include "DQMOffline/PFTau/plugins/PFCandidateManagerAnalyzer.h"
-#include "DQMOffline/PFTau/plugins/MatchMETBenchmarkAnalyzer.h"
-#include "DQMOffline/PFTau/plugins/METBenchmarkAnalyzer.h"
 
-DEFINE_FWK_MODULE (PFCandidateBenchmarkAnalyzer) ;
-DEFINE_FWK_MODULE (CandidateBenchmarkAnalyzer) ;
-DEFINE_FWK_MODULE (PFCandidateManagerAnalyzer) ;
-DEFINE_FWK_MODULE (METBenchmarkAnalyzer) ;
-DEFINE_FWK_MODULE (MatchMETBenchmarkAnalyzer) ;
+DEFINE_FWK_MODULE(PFCandidateBenchmarkAnalyzer);
+DEFINE_FWK_MODULE(CandidateBenchmarkAnalyzer);
+DEFINE_FWK_MODULE(PFCandidateManagerAnalyzer);
+DEFINE_FWK_MODULE(METBenchmarkAnalyzer);
+DEFINE_FWK_MODULE(MatchMETBenchmarkAnalyzer);
diff --git a/DQMOffline/PFTau/src/Benchmark.cc b/DQMOffline/PFTau/src/Benchmark.cc
index e224d17f8cabe..4764ae819a7ae 100644
--- a/DQMOffline/PFTau/src/Benchmark.cc
+++ b/DQMOffline/PFTau/src/Benchmark.cc
@@ -2,80 +2,101 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 
 #include <TDirectory.h>
 
-
 using namespace std;
 
-Benchmark::~Benchmark() noexcept(false) {
-
-}
-
+Benchmark::~Benchmark() noexcept(false) {}
 
-void Benchmark::setDirectory(TDirectory* dir) {
-  dir_ = dir;
-} 
+void Benchmark::setDirectory(TDirectory *dir) { dir_ = dir; }
 
-
-TH1F* Benchmark::book1D(DQMStore::IBooker& b, const char* histname, const char* title, 
-			int nbins, float xmin, float xmax) {
-  edm::LogInfo("Benchmark") << " Benchmark::book1D " << "booking "<<histname;
-  return b.book1D(histname,title,nbins,xmin,xmax)->getTH1F();
+TH1F *Benchmark::book1D(
+    DQMStore::IBooker &b, const char *histname, const char *title, int nbins, float xmin, float xmax) {
+  edm::LogInfo("Benchmark") << " Benchmark::book1D "
+                            << "booking " << histname;
+  return b.book1D(histname, title, nbins, xmin, xmax)->getTH1F();
 }
 
-TH2F* Benchmark::book2D(DQMStore::IBooker& b, const char* histname, const char* title, 
-			int nbinsx, float xmin, float xmax,
-			int nbinsy, float ymin, float ymax ) {
-  edm::LogInfo("Benchmark") << " Benchmark::book2D "<<"booked "<<histname;
-  return b.book2D(histname,title,nbinsx,xmin, xmax, nbinsy, ymin, ymax)->getTH2F();
+TH2F *Benchmark::book2D(DQMStore::IBooker &b,
+                        const char *histname,
+                        const char *title,
+                        int nbinsx,
+                        float xmin,
+                        float xmax,
+                        int nbinsy,
+                        float ymin,
+                        float ymax) {
+  edm::LogInfo("Benchmark") << " Benchmark::book2D "
+                            << "booked " << histname;
+  return b.book2D(histname, title, nbinsx, xmin, xmax, nbinsy, ymin, ymax)->getTH2F();
 }
 
-TH2F* Benchmark::book2D(DQMStore::IBooker& b, const char* histname, const char* title, 
-			int nbinsx, float* xbins,
-			int nbinsy, float ymin, float ymax ) {
-  edm::LogInfo("Benchmark") << " Benchmark::book2D " << " booked "<<histname;
-  
-  // need to build the y bin array manually, due to a missing function in DQMStore
-  vector<float> ybins( nbinsy+1 );
+TH2F *Benchmark::book2D(DQMStore::IBooker &b,
+                        const char *histname,
+                        const char *title,
+                        int nbinsx,
+                        float *xbins,
+                        int nbinsy,
+                        float ymin,
+                        float ymax) {
+  edm::LogInfo("Benchmark") << " Benchmark::book2D "
+                            << " booked " << histname;
+
+  // need to build the y bin array manually, due to a missing function in
+  // DQMStore
+  vector<float> ybins(nbinsy + 1);
   double binsize = (ymax - ymin) / nbinsy;
-  for(int i=0; i<=nbinsy; ++i) {
-    ybins[i] = ymin + i*binsize;
-  } 
-  
-  return b.book2D(histname,title,nbinsx, xbins, nbinsy, &ybins[0])->getTH2F();
-}
+  for (int i = 0; i <= nbinsy; ++i) {
+    ybins[i] = ymin + i * binsize;
+  }
 
-TProfile* Benchmark::bookProfile(DQMStore::IBooker& b, const char* histname, const char* title,
-				 int nbinsx, float xmin, float xmax,
-				 float ymin, float ymax, const char* option ) {
-  edm::LogInfo("Benchmark") << " Benchmark::bookProfile "<<"booked "<<histname;
-  return b.bookProfile(histname, title, nbinsx, xmin, xmax, 0.0, 0.0, option )->getTProfile();
+  return b.book2D(histname, title, nbinsx, xbins, nbinsy, &ybins[0])->getTH2F();
 }
 
-TProfile* Benchmark::bookProfile(DQMStore::IBooker& b, const char* histname, const char* title,
-				 int nbinsx, float* xbins,
-				 float ymin, float ymax, const char* option ) {
+TProfile *Benchmark::bookProfile(DQMStore::IBooker &b,
+                                 const char *histname,
+                                 const char *title,
+                                 int nbinsx,
+                                 float xmin,
+                                 float xmax,
+                                 float ymin,
+                                 float ymax,
+                                 const char *option) {
+  edm::LogInfo("Benchmark") << " Benchmark::bookProfile "
+                            << "booked " << histname;
+  return b.bookProfile(histname, title, nbinsx, xmin, xmax, 0.0, 0.0, option)->getTProfile();
+}
 
-  // need to convert the float bin array into a double bin array, because the DQMStore TProfile functions take floats, while the  DQMStore TH2 functions take double. 
-  vector<double> xbinsd(nbinsx+1); 
-  for(int i=0; i<=nbinsx; ++i) {
+TProfile *Benchmark::bookProfile(DQMStore::IBooker &b,
+                                 const char *histname,
+                                 const char *title,
+                                 int nbinsx,
+                                 float *xbins,
+                                 float ymin,
+                                 float ymax,
+                                 const char *option) {
+  // need to convert the float bin array into a double bin array, because the
+  // DQMStore TProfile functions take floats, while the  DQMStore TH2 functions
+  // take double.
+  vector<double> xbinsd(nbinsx + 1);
+  for (int i = 0; i <= nbinsx; ++i) {
     xbinsd[i] = xbins[i];
   }
 
-  edm::LogInfo("Benchmark") << " Benchmark::bookProfile "<<"booked "<<histname;
+  edm::LogInfo("Benchmark") << " Benchmark::bookProfile "
+                            << "booked " << histname;
   return b.bookProfile(histname, title, nbinsx, &xbinsd[0], ymin, ymax, option)->getTProfile();
 }
 
-
 void Benchmark::write() {
-  //COLIN not sure about the root mode 
-  if( dir_ )
+  // COLIN not sure about the root mode
+  if (dir_)
     dir_->Write();
-  
-  //COLIN remove old bullshit:
+
+  // COLIN remove old bullshit:
   //   if ( ame.size() != 0 && file_)
   //     cout<<"saving histograms in "<<fileName<<endl;
   //     file_->Write(fileName.c_str());
diff --git a/DQMOffline/PFTau/src/CandidateBenchmark.cc b/DQMOffline/PFTau/src/CandidateBenchmark.cc
index bbb764736bba4..d43d3a3167ec7 100644
--- a/DQMOffline/PFTau/src/CandidateBenchmark.cc
+++ b/DQMOffline/PFTau/src/CandidateBenchmark.cc
@@ -2,94 +2,103 @@
 
 #include "DataFormats/Candidate/interface/Candidate.h"
 
-
-#include <TROOT.h>
 #include <TFile.h>
 #include <TH1.h>
 #include <TH2.h>
-
+#include <TROOT.h>
 
 using namespace std;
 
-
 CandidateBenchmark::CandidateBenchmark(Mode mode) : Benchmark(mode) {
-  pt_     = nullptr; 
-  eta_    = nullptr; 
-  phi_    = nullptr; 
+  pt_ = nullptr;
+  eta_ = nullptr;
+  phi_ = nullptr;
   charge_ = nullptr;
-  pdgId_  = nullptr;
+  pdgId_ = nullptr;
 
   histogramBooked_ = false;
- 
 }
 
 CandidateBenchmark::~CandidateBenchmark() {}
 
-
-void CandidateBenchmark::setup(DQMStore::IBooker& b) {
-
+void CandidateBenchmark::setup(DQMStore::IBooker &b) {
   if (!histogramBooked_) {
-    PhaseSpace ptPS(100,0,100);
+    PhaseSpace ptPS(100, 0, 100);
     PhaseSpace phiPS(360, -3.1416, 3.1416);
-    PhaseSpace etaPS(100, -5,5);
-    switch(mode_) {
-    case DQMOFFLINE:
-    default:
-      ptPS = PhaseSpace(50, 0, 100);
-      phiPS.n = 50;
-      etaPS.n = 20;
-      break;
+    PhaseSpace etaPS(100, -5, 5);
+    switch (mode_) {
+      case DQMOFFLINE:
+      default:
+        ptPS = PhaseSpace(50, 0, 100);
+        phiPS.n = 50;
+        etaPS.n = 20;
+        break;
     }
-    
-    pt_ = book1D(b, "pt_", "pt_;p_{T} (GeV)", ptPS.n, ptPS.m, ptPS.M); 
+
+    pt_ = book1D(b, "pt_", "pt_;p_{T} (GeV)", ptPS.n, ptPS.m, ptPS.M);
     eta_ = book1D(b, "eta_", "eta_;#eta", etaPS.n, etaPS.m, etaPS.M);
     phi_ = book1D(b, "phi_", "phi_;#phi", phiPS.n, phiPS.m, phiPS.M);
-    charge_ = book1D(b, "charge_", "charge_;charge", 3,-1.5,1.5);
+    charge_ = book1D(b, "charge_", "charge_;charge", 3, -1.5, 1.5);
 
     histogramBooked_ = true;
   }
 }
 
-void CandidateBenchmark::setup(DQMStore::IBooker& b, const edm::ParameterSet& parameterSet) {
-  if (!histogramBooked_)  {
-    edm::ParameterSet ptPS  = parameterSet.getParameter<edm::ParameterSet>("PtHistoParameter");
+void CandidateBenchmark::setup(DQMStore::IBooker &b, const edm::ParameterSet &parameterSet) {
+  if (!histogramBooked_) {
+    edm::ParameterSet ptPS = parameterSet.getParameter<edm::ParameterSet>("PtHistoParameter");
     edm::ParameterSet etaPS = parameterSet.getParameter<edm::ParameterSet>("EtaHistoParameter");
     edm::ParameterSet phiPS = parameterSet.getParameter<edm::ParameterSet>("PhiHistoParameter");
     edm::ParameterSet chPS = parameterSet.getParameter<edm::ParameterSet>("ChargeHistoParameter");
-    
+
     if (ptPS.getParameter<bool>("switchOn")) {
-      pt_ = book1D(b, "pt_", "p_{T};p_{T} (GeV)", ptPS.getParameter<int32_t>("nBin"), 
-		   ptPS.getParameter<double>("xMin"),
-		   ptPS.getParameter<double>("xMax"));
-    } 
+      pt_ = book1D(b,
+                   "pt_",
+                   "p_{T};p_{T} (GeV)",
+                   ptPS.getParameter<int32_t>("nBin"),
+                   ptPS.getParameter<double>("xMin"),
+                   ptPS.getParameter<double>("xMax"));
+    }
     if (etaPS.getParameter<bool>("switchOn")) {
-      eta_ = book1D(b, "eta_", "#eta;#eta", etaPS.getParameter<int32_t>("nBin"), 
-		    etaPS.getParameter<double>("xMin"),
-		    etaPS.getParameter<double>("xMax"));
+      eta_ = book1D(b,
+                    "eta_",
+                    "#eta;#eta",
+                    etaPS.getParameter<int32_t>("nBin"),
+                    etaPS.getParameter<double>("xMin"),
+                    etaPS.getParameter<double>("xMax"));
     }
     if (phiPS.getParameter<bool>("switchOn")) {
-      phi_ = book1D(b, "phi_", "#phi;#phi", phiPS.getParameter<int32_t>("nBin"), 
-		    phiPS.getParameter<double>("xMin"),
-		    phiPS.getParameter<double>("xMax"));
+      phi_ = book1D(b,
+                    "phi_",
+                    "#phi;#phi",
+                    phiPS.getParameter<int32_t>("nBin"),
+                    phiPS.getParameter<double>("xMin"),
+                    phiPS.getParameter<double>("xMax"));
     }
     if (chPS.getParameter<bool>("switchOn")) {
-      charge_ = book1D(b, "charge_","charge;charge",chPS.getParameter<int32_t>("nBin"),
-		       chPS.getParameter<double>("xMin"),
-		       chPS.getParameter<double>("xMax"));
-    }   
+      charge_ = book1D(b,
+                       "charge_",
+                       "charge;charge",
+                       chPS.getParameter<int32_t>("nBin"),
+                       chPS.getParameter<double>("xMin"),
+                       chPS.getParameter<double>("xMax"));
+    }
     histogramBooked_ = true;
   }
 }
 
-void CandidateBenchmark::fillOne(const reco::Candidate& cand) {
-
-  if( !isInRange(cand.pt(), cand.eta(), cand.phi() ) ) return;
+void CandidateBenchmark::fillOne(const reco::Candidate &cand) {
+  if (!isInRange(cand.pt(), cand.eta(), cand.phi()))
+    return;
 
   if (histogramBooked_) {
-    if (pt_) pt_->Fill( cand.pt() );
-    if (eta_) eta_->Fill( cand.eta() );
-    if (phi_) phi_->Fill( cand.phi() );
-    if (charge_) charge_->Fill( cand.charge() );
+    if (pt_)
+      pt_->Fill(cand.pt());
+    if (eta_)
+      eta_->Fill(cand.eta());
+    if (phi_)
+      phi_->Fill(cand.phi());
+    if (charge_)
+      charge_->Fill(cand.charge());
   }
 }
-
diff --git a/DQMOffline/PFTau/src/METBenchmark.cc b/DQMOffline/PFTau/src/METBenchmark.cc
index 6e7dfce8c05dc..8cac9497e106d 100644
--- a/DQMOffline/PFTau/src/METBenchmark.cc
+++ b/DQMOffline/PFTau/src/METBenchmark.cc
@@ -2,45 +2,38 @@
 
 #include "DataFormats/METReco/interface/MET.h"
 
-
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 
-
-#include <TROOT.h>
 #include <TFile.h>
 #include <TH1.h>
 #include <TH2.h>
-
+#include <TROOT.h>
 
 using namespace std;
 
-
-
 METBenchmark::~METBenchmark() {}
 
+void METBenchmark::setup(DQMStore::IBooker &b) {
+  // std::cout << "FL: METBenchmark.cc: start setup()" << std::endl;
 
-void METBenchmark::setup(DQMStore::IBooker& b) {
-
-  //std::cout << "FL: METBenchmark.cc: start setup()" << std::endl;
-
-  PhaseSpace ptPS(100,0,200);
-  PhaseSpace pt2PS(100,0,7000);
-  PhaseSpace pxPS(100,-100.,100);
+  PhaseSpace ptPS(100, 0, 200);
+  PhaseSpace pt2PS(100, 0, 7000);
+  PhaseSpace pxPS(100, -100., 100);
   PhaseSpace phiPS(50, -3.1416, 3.1416);
   PhaseSpace sumEtPS(100, 0, 3000);
   PhaseSpace sumEt2PS(100, 0, 7000);
   PhaseSpace sumEt3PS(50, 0, 200);
   PhaseSpace etOverSumEtPS(100, 0.0, 1.0);
 
-  switch(mode_) {
-  case DQMOFFLINE:
-    ptPS = PhaseSpace(200, 0, 200);
-    pxPS = PhaseSpace(200,-100.,100);
-    sumEtPS = PhaseSpace(200, 0, 200);
-    break;
-  default:
-    break;
+  switch (mode_) {
+    case DQMOFFLINE:
+      ptPS = PhaseSpace(200, 0, 200);
+      pxPS = PhaseSpace(200, -100., 100);
+      sumEtPS = PhaseSpace(200, 0, 200);
+      break;
+    default:
+      break;
   }
 
   pt_ = book1D(b, "pt_", "pt_;p_{T} [GeV]", ptPS.n, ptPS.m, ptPS.M);
@@ -48,31 +41,31 @@ void METBenchmark::setup(DQMStore::IBooker& b) {
   px_ = book1D(b, "px_", "px_;p_{X} [GeV]", pxPS.n, pxPS.m, pxPS.M);
   py_ = book1D(b, "py_", "py_;p_{Y} [GeV]", pxPS.n, pxPS.m, pxPS.M);
 
-  // might want to increase the number of bins, to match the size of the ECAL crystals
+  // might want to increase the number of bins, to match the size of the ECAL
+  // crystals
   phi_ = book1D(b, "phi_", "phi_;#phi", phiPS.n, phiPS.m, phiPS.M);
   sumEt_ = book1D(b, "sumEt_", "sumEt_;#SigmaE_{T} [GeV]", sumEtPS.n, sumEtPS.m, sumEtPS.M);
   sumEt2_ = book1D(b, "sumEt2_", "sumEt2_;#SigmaE_{T} [GeV]", sumEt2PS.n, sumEt2PS.m, sumEt2PS.M);
-  etOverSumEt_ = book1D(b, "etOverSumEt_", "etOverSumEt_;p_{T}/#SigmaE_{T}", etOverSumEtPS.n, etOverSumEtPS.m, etOverSumEtPS.M);
+  etOverSumEt_ =
+      book1D(b, "etOverSumEt_", "etOverSumEt_;p_{T}/#SigmaE_{T}", etOverSumEtPS.n, etOverSumEtPS.m, etOverSumEtPS.M);
 
-  mex_VS_sumEt_= book2D(b, "mex_VS_sumEt_", 
-			";#SigmaE_{T} [GeV];p_{X} [GeV]",
-			sumEt3PS.n, sumEt3PS.m, sumEt3PS.M,
-			pxPS.n, pxPS.m, pxPS.M );
+  mex_VS_sumEt_ = book2D(
+      b, "mex_VS_sumEt_", ";#SigmaE_{T} [GeV];p_{X} [GeV]", sumEt3PS.n, sumEt3PS.m, sumEt3PS.M, pxPS.n, pxPS.m, pxPS.M);
 }
 
-
-void METBenchmark::fillOne(const reco::MET& cand) {
-
-  if( !isInRange(cand.pt(), cand.eta(), cand.phi() ) ) return;
-
-  pt_->Fill( cand.pt() );
-  pt2_->Fill( cand.pt() );
-  px_->Fill( cand.px() );
-  py_->Fill( cand.py() );
-  phi_->Fill( cand.phi() );
-  sumEt_->Fill( cand.sumEt() );
-  sumEt2_->Fill( cand.sumEt() );
-  if (cand.sumEt()>3.0) etOverSumEt_->Fill( cand.pt()/cand.sumEt() );
-  mex_VS_sumEt_->Fill( cand.sumEt(), cand.px() );
-  mex_VS_sumEt_->Fill( cand.sumEt(), cand.py() );
+void METBenchmark::fillOne(const reco::MET &cand) {
+  if (!isInRange(cand.pt(), cand.eta(), cand.phi()))
+    return;
+
+  pt_->Fill(cand.pt());
+  pt2_->Fill(cand.pt());
+  px_->Fill(cand.px());
+  py_->Fill(cand.py());
+  phi_->Fill(cand.phi());
+  sumEt_->Fill(cand.sumEt());
+  sumEt2_->Fill(cand.sumEt());
+  if (cand.sumEt() > 3.0)
+    etOverSumEt_->Fill(cand.pt() / cand.sumEt());
+  mex_VS_sumEt_->Fill(cand.sumEt(), cand.px());
+  mex_VS_sumEt_->Fill(cand.sumEt(), cand.py());
 }
diff --git a/DQMOffline/PFTau/src/MatchCandidateBenchmark.cc b/DQMOffline/PFTau/src/MatchCandidateBenchmark.cc
index c44cf740b4cec..2420f453c4f32 100644
--- a/DQMOffline/PFTau/src/MatchCandidateBenchmark.cc
+++ b/DQMOffline/PFTau/src/MatchCandidateBenchmark.cc
@@ -1,362 +1,423 @@
 #include "DQMOffline/PFTau/interface/MatchCandidateBenchmark.h"
 
-
 #include "DataFormats/Candidate/interface/Candidate.h"
 
-
-#include <TROOT.h>
 #include <TFile.h>
 #include <TH1.h>
 #include <TH2.h>
 #include <TProfile.h>
-
+#include <TROOT.h>
 
 using namespace std;
 
+MatchCandidateBenchmark::MatchCandidateBenchmark(Mode mode) : Benchmark(mode) {
+  delta_et_Over_et_VS_et_ = nullptr;
+  delta_et_VS_et_ = nullptr;
+  delta_eta_VS_et_ = nullptr;
+  delta_phi_VS_et_ = nullptr;
 
-MatchCandidateBenchmark::MatchCandidateBenchmark(Mode mode)  : Benchmark(mode) {
-
-  delta_et_Over_et_VS_et_   = nullptr; 
-  delta_et_VS_et_           = nullptr; 
-  delta_eta_VS_et_          = nullptr; 
-  delta_phi_VS_et_          = nullptr;
-
-  BRdelta_et_Over_et_VS_et_ = nullptr; 
-  ERdelta_et_Over_et_VS_et_ = nullptr; 
+  BRdelta_et_Over_et_VS_et_ = nullptr;
+  ERdelta_et_Over_et_VS_et_ = nullptr;
   // pTRes are initialzied in the setup since ptBinsPS.size() is needed
 
   histogramBooked_ = false;
 }
 
-
 MatchCandidateBenchmark::~MatchCandidateBenchmark() {}
 
-
-void MatchCandidateBenchmark::setup(DQMStore::IBooker& b) {
+void MatchCandidateBenchmark::setup(DQMStore::IBooker &b) {
   if (!histogramBooked_) {
     PhaseSpace ptPS;
     PhaseSpace dptOvptPS;
     PhaseSpace dptPS;
     PhaseSpace detaPS;
     PhaseSpace dphiPS;
-    switch(mode_) {
-    case VALIDATION:
-      ptPS = PhaseSpace(100,0,1000);
-      dptOvptPS = PhaseSpace( 200, -1, 1);
-      dphiPS = PhaseSpace( 200, -1, 1);
-      detaPS = PhaseSpace( 200, -1, 1);
-      dptPS = PhaseSpace( 100, -100, 100);
-      break;
-    case DQMOFFLINE:
-    default:
-      ptPS = PhaseSpace(50,0,100);
-      dptOvptPS = PhaseSpace( 50, -1, 1);
-      dphiPS = PhaseSpace( 50, -1, 1);
-      detaPS = PhaseSpace( 50, -1, 1);
-      dptPS = PhaseSpace( 50, -50, 50);
-      break;
+    switch (mode_) {
+      case VALIDATION:
+        ptPS = PhaseSpace(100, 0, 1000);
+        dptOvptPS = PhaseSpace(200, -1, 1);
+        dphiPS = PhaseSpace(200, -1, 1);
+        detaPS = PhaseSpace(200, -1, 1);
+        dptPS = PhaseSpace(100, -100, 100);
+        break;
+      case DQMOFFLINE:
+      default:
+        ptPS = PhaseSpace(50, 0, 100);
+        dptOvptPS = PhaseSpace(50, -1, 1);
+        dphiPS = PhaseSpace(50, -1, 1);
+        detaPS = PhaseSpace(50, -1, 1);
+        dptPS = PhaseSpace(50, -50, 50);
+        break;
     }
     float ptBins[11] = {0, 1, 2, 5, 10, 20, 50, 100, 200, 400, 1000};
-    int size = sizeof(ptBins)/sizeof(*ptBins);
-
-    delta_et_Over_et_VS_et_ = book2D(b, "delta_et_Over_et_VS_et_", ";E_{T, true} (GeV);#DeltaE_{T}/E_{T}",
-				     size, ptBins, 
-				     dptOvptPS.n, dptOvptPS.m, dptOvptPS.M );
-    
-    BRdelta_et_Over_et_VS_et_ = book2D(b, "BRdelta_et_Over_et_VS_et_", ";E_{T, true} (GeV);#DeltaE_{T}/E_{T}",
-				     size, ptBins, 
-				     dptOvptPS.n, dptOvptPS.m, dptOvptPS.M );
-    ERdelta_et_Over_et_VS_et_ = book2D(b, "ERdelta_et_Over_et_VS_et_", ";E_{T, true} (GeV);#DeltaE_{T}/E_{T}",
-				     size, ptBins, 
-				     dptOvptPS.n, dptOvptPS.m, dptOvptPS.M );
-    
-    delta_et_VS_et_ = book2D(b, "delta_et_VS_et_", ";E_{T, true} (GeV);#DeltaE_{T}",
-			     size, ptBins,
-			     dptPS.n, dptPS.m, dptPS.M );
-    
-    delta_eta_VS_et_ = book2D(b, "delta_eta_VS_et_", ";#E_{T, true} (GeV);#Delta#eta",
-			      size, ptBins,
-			      detaPS.n, detaPS.m, detaPS.M );
-    
-    delta_phi_VS_et_ = book2D(b, "delta_phi_VS_et_", ";E_{T, true} (GeV);#Delta#phi",
-			      size, ptBins,
-			      dphiPS.n, dphiPS.m, dphiPS.M );
+    int size = sizeof(ptBins) / sizeof(*ptBins);
+
+    delta_et_Over_et_VS_et_ = book2D(b,
+                                     "delta_et_Over_et_VS_et_",
+                                     ";E_{T, true} (GeV);#DeltaE_{T}/E_{T}",
+                                     size,
+                                     ptBins,
+                                     dptOvptPS.n,
+                                     dptOvptPS.m,
+                                     dptOvptPS.M);
+
+    BRdelta_et_Over_et_VS_et_ = book2D(b,
+                                       "BRdelta_et_Over_et_VS_et_",
+                                       ";E_{T, true} (GeV);#DeltaE_{T}/E_{T}",
+                                       size,
+                                       ptBins,
+                                       dptOvptPS.n,
+                                       dptOvptPS.m,
+                                       dptOvptPS.M);
+    ERdelta_et_Over_et_VS_et_ = book2D(b,
+                                       "ERdelta_et_Over_et_VS_et_",
+                                       ";E_{T, true} (GeV);#DeltaE_{T}/E_{T}",
+                                       size,
+                                       ptBins,
+                                       dptOvptPS.n,
+                                       dptOvptPS.m,
+                                       dptOvptPS.M);
+
+    delta_et_VS_et_ =
+        book2D(b, "delta_et_VS_et_", ";E_{T, true} (GeV);#DeltaE_{T}", size, ptBins, dptPS.n, dptPS.m, dptPS.M);
+
+    delta_eta_VS_et_ =
+        book2D(b, "delta_eta_VS_et_", ";#E_{T, true} (GeV);#Delta#eta", size, ptBins, detaPS.n, detaPS.m, detaPS.M);
+
+    delta_phi_VS_et_ =
+        book2D(b, "delta_phi_VS_et_", ";E_{T, true} (GeV);#Delta#phi", size, ptBins, dphiPS.n, dphiPS.m, dphiPS.M);
     /*
     // TProfile
-    profile_delta_et_Over_et_VS_et_ = bookProfile("profile_delta_et_Over_et_VS_et_", ";E_{T, true} (GeV);#DeltaE_{T}/E_{T}",
-						  size, ptBins, 
-						  dptOvptPS.m, dptOvptPS.M, "" );
-        
-    profile_delta_et_VS_et_ = bookProfile("profile_delta_et_VS_et_", ";E_{T, true} (GeV);#DeltaE_{T}",
-					  size, ptBins,
-					  dptPS.m, dptPS.M, "" );
-
-    profile_delta_eta_VS_et_ = bookProfile("profile_delta_eta_VS_et_", ";#E_{T, true} (GeV);#Delta#eta",
-					   size, ptBins,
-					   detaPS.m, detaPS.M, "" );
-    
-    profile_delta_phi_VS_et_ = bookProfile("profile_delta_phi_VS_et_", ";E_{T, true} (GeV);#Delta#phi",
-					   size, ptBins,
-					   dphiPS.m, dphiPS.M, "" );
+    profile_delta_et_Over_et_VS_et_ =
+    bookProfile("profile_delta_et_Over_et_VS_et_", ";E_{T, true}
+    (GeV);#DeltaE_{T}/E_{T}", size, ptBins, dptOvptPS.m, dptOvptPS.M, "" );
+
+    profile_delta_et_VS_et_ = bookProfile("profile_delta_et_VS_et_", ";E_{T,
+    true} (GeV);#DeltaE_{T}", size, ptBins, dptPS.m, dptPS.M, "" );
+
+    profile_delta_eta_VS_et_ = bookProfile("profile_delta_eta_VS_et_", ";#E_{T,
+    true} (GeV);#Delta#eta", size, ptBins, detaPS.m, detaPS.M, "" );
+
+    profile_delta_phi_VS_et_ = bookProfile("profile_delta_phi_VS_et_", ";E_{T,
+    true} (GeV);#Delta#phi", size, ptBins, dphiPS.m, dphiPS.M, "" );
     // TProfile RMS
-    profileRMS_delta_et_Over_et_VS_et_ = bookProfile("profileRMS_delta_et_Over_et_VS_et_", ";E_{T, true} (GeV);#DeltaE_{T}/E_{T}",
-						  size, ptBins, 
-						  dptOvptPS.m, dptOvptPS.M, "s" );
-        
-    profileRMS_delta_et_VS_et_ = bookProfile("profileRMS_delta_et_VS_et_", ";E_{T, true} (GeV);#DeltaE_{T}",
-					  size, ptBins,
-					  dptPS.m, dptPS.M, "s" );
-
-    profileRMS_delta_eta_VS_et_ = bookProfile("profileRMS_delta_eta_VS_et_", ";#E_{T, true} (GeV);#Delta#eta",
-					   size, ptBins,
-					   detaPS.m, detaPS.M, "s" );
-    
-    profileRMS_delta_phi_VS_et_ = bookProfile("profileRMS_delta_phi_VS_et_", ";E_{T, true} (GeV);#Delta#phi",
-					   size, ptBins,
-					   dphiPS.m, dphiPS.M, "s" );
+    profileRMS_delta_et_Over_et_VS_et_ =
+    bookProfile("profileRMS_delta_et_Over_et_VS_et_", ";E_{T, true}
+    (GeV);#DeltaE_{T}/E_{T}", size, ptBins, dptOvptPS.m, dptOvptPS.M, "s" );
+
+    profileRMS_delta_et_VS_et_ = bookProfile("profileRMS_delta_et_VS_et_",
+    ";E_{T, true} (GeV);#DeltaE_{T}", size, ptBins, dptPS.m, dptPS.M, "s" );
+
+    profileRMS_delta_eta_VS_et_ = bookProfile("profileRMS_delta_eta_VS_et_",
+    ";#E_{T, true} (GeV);#Delta#eta", size, ptBins, detaPS.m, detaPS.M, "s" );
+
+    profileRMS_delta_phi_VS_et_ = bookProfile("profileRMS_delta_phi_VS_et_",
+    ";E_{T, true} (GeV);#Delta#phi", size, ptBins, dphiPS.m, dphiPS.M, "s" );
     */
-    pTRes_.resize(size); BRpTRes_.resize(size); ERpTRes_.resize(size);
+    pTRes_.resize(size);
+    BRpTRes_.resize(size);
+    ERpTRes_.resize(size);
     for (size_t i = 0; i < pTRes_.size(); i++) {
-      pTRes_[i] = nullptr; BRpTRes_[i] = nullptr; ERpTRes_[i] = nullptr; }
+      pTRes_[i] = nullptr;
+      BRpTRes_[i] = nullptr;
+      ERpTRes_[i] = nullptr;
+    }
 
     histogramBooked_ = true;
-  } 
+  }
 }
 
-
-void MatchCandidateBenchmark::setup(DQMStore::IBooker& b, const edm::ParameterSet& parameterSet) {
-
-  std::vector<double> ptBinsPS = parameterSet.getParameter< std::vector<double> >( "VariablePtBins" );
-  pTRes_.resize(ptBinsPS.size()-1); BRpTRes_.resize(ptBinsPS.size()-1); ERpTRes_.resize(ptBinsPS.size()-1);
-  if (!pTRes_.empty()) 
+void MatchCandidateBenchmark::setup(DQMStore::IBooker &b, const edm::ParameterSet &parameterSet) {
+  std::vector<double> ptBinsPS = parameterSet.getParameter<std::vector<double>>("VariablePtBins");
+  pTRes_.resize(ptBinsPS.size() - 1);
+  BRpTRes_.resize(ptBinsPS.size() - 1);
+  ERpTRes_.resize(ptBinsPS.size() - 1);
+  if (!pTRes_.empty())
     for (size_t i = 0; i < pTRes_.size(); i++) {
-      pTRes_[i] = nullptr; BRpTRes_[i] = nullptr; ERpTRes_[i] = nullptr; } 
-  
-  if (!histogramBooked_) { 
-    
+      pTRes_[i] = nullptr;
+      BRpTRes_[i] = nullptr;
+      ERpTRes_[i] = nullptr;
+    }
+
+  if (!histogramBooked_) {
     edm::ParameterSet ptPS = parameterSet.getParameter<edm::ParameterSet>("PtHistoParameter");
     edm::ParameterSet dptPS = parameterSet.getParameter<edm::ParameterSet>("DeltaPtHistoParameter");
     edm::ParameterSet dptOvptPS = parameterSet.getParameter<edm::ParameterSet>("DeltaPtOvPtHistoParameter");
     edm::ParameterSet detaPS = parameterSet.getParameter<edm::ParameterSet>("DeltaEtaHistoParameter");
     edm::ParameterSet dphiPS = parameterSet.getParameter<edm::ParameterSet>("DeltaPhiHistoParameter");
 
-    std::vector<float> ptBins; 
-    if (ptBinsPS.size() > 1) { 
+    std::vector<float> ptBins;
+    if (ptBinsPS.size() > 1) {
       ptBins.reserve(ptBinsPS.size());
-      for (size_t i = 0; i < ptBinsPS.size(); i++) 
-	ptBins.push_back(ptBinsPS[i]); 
-    } else { 
+      for (size_t i = 0; i < ptBinsPS.size(); i++)
+        ptBins.push_back(ptBinsPS[i]);
+    } else {
       Int_t nFixedBins = ptPS.getParameter<int32_t>("nBin");
-      ptBins.reserve(nFixedBins+1);
-      for (Int_t i = 0; i <= nFixedBins; i++) 
-	ptBins.push_back(ptPS.getParameter<double>("xMin") + i*((ptPS.getParameter<double>("xMax") - ptPS.getParameter<double>("xMin")) / nFixedBins)) ; 
+      ptBins.reserve(nFixedBins + 1);
+      for (Int_t i = 0; i <= nFixedBins; i++)
+        ptBins.push_back(ptPS.getParameter<double>("xMin") +
+                         i * ((ptPS.getParameter<double>("xMax") - ptPS.getParameter<double>("xMin")) / nFixedBins));
       ptBinsPS.resize(nFixedBins);
     }
- 
-   if (dptOvptPS.getParameter<bool>("switchOn")) {
-     delta_et_Over_et_VS_et_ = book2D(b, "delta_et_Over_et_VS_et_", ";E_{T, true} (GeV);#DeltaE_{T}/E_{T}",
-				       ptBinsPS.size()-1, &(ptBins.front()), 
-				       dptOvptPS.getParameter<int32_t>("nBin"), 
-				       dptOvptPS.getParameter<double>("xMin"), 
-				       dptOvptPS.getParameter<double>("xMax"));
-   }
-   if (dptOvptPS.getParameter<bool>("slicingOn")) {
-     for (size_t i = 0; i < pTRes_.size(); i++) {
-       pTRes_[i] = book1D( b, TString::Format("Pt%d_%d", (int)ptBins[i], (int)ptBins[i+1]), ";#Deltap_{T}/p_{T};Entries",
-			   dptOvptPS.getParameter<int32_t>("nBin"), 
-			   dptOvptPS.getParameter<double>("xMin"), 
-			   dptOvptPS.getParameter<double>("xMax")); 
-       BRpTRes_[i] = book1D( b, TString::Format("BRPt%d_%d", (int)ptBins[i], (int)ptBins[i+1]), ";#Deltap_{T}/p_{T};Entries",
-			     dptOvptPS.getParameter<int32_t>("nBin"), 
-			     dptOvptPS.getParameter<double>("xMin"), 
-			     dptOvptPS.getParameter<double>("xMax")); 
-       ERpTRes_[i] = book1D( b, TString::Format("ERPt%d_%d", (int)ptBins[i], (int)ptBins[i+1]), ";#Deltap_{T}/p_{T};Entries",
-			     dptOvptPS.getParameter<int32_t>("nBin"), 
-			     dptOvptPS.getParameter<double>("xMin"), 
-			     dptOvptPS.getParameter<double>("xMax")); 
-     }
-   }
-   if (dptOvptPS.getParameter<bool>("BROn")) {
-     BRdelta_et_Over_et_VS_et_ = book2D(b, "BRdelta_et_Over_et_VS_et_", ";E_{T, true} (GeV);#DeltaE_{T}/E_{T}",
-					ptBinsPS.size()-1, &(ptBins.front()), 
-					dptOvptPS.getParameter<int32_t>("nBin"), 
-					dptOvptPS.getParameter<double>("xMin"), 
-					dptOvptPS.getParameter<double>("xMax"));
-   }
+
+    if (dptOvptPS.getParameter<bool>("switchOn")) {
+      delta_et_Over_et_VS_et_ = book2D(b,
+                                       "delta_et_Over_et_VS_et_",
+                                       ";E_{T, true} (GeV);#DeltaE_{T}/E_{T}",
+                                       ptBinsPS.size() - 1,
+                                       &(ptBins.front()),
+                                       dptOvptPS.getParameter<int32_t>("nBin"),
+                                       dptOvptPS.getParameter<double>("xMin"),
+                                       dptOvptPS.getParameter<double>("xMax"));
+    }
+    if (dptOvptPS.getParameter<bool>("slicingOn")) {
+      for (size_t i = 0; i < pTRes_.size(); i++) {
+        pTRes_[i] = book1D(b,
+                           TString::Format("Pt%d_%d", (int)ptBins[i], (int)ptBins[i + 1]),
+                           ";#Deltap_{T}/p_{T};Entries",
+                           dptOvptPS.getParameter<int32_t>("nBin"),
+                           dptOvptPS.getParameter<double>("xMin"),
+                           dptOvptPS.getParameter<double>("xMax"));
+        BRpTRes_[i] = book1D(b,
+                             TString::Format("BRPt%d_%d", (int)ptBins[i], (int)ptBins[i + 1]),
+                             ";#Deltap_{T}/p_{T};Entries",
+                             dptOvptPS.getParameter<int32_t>("nBin"),
+                             dptOvptPS.getParameter<double>("xMin"),
+                             dptOvptPS.getParameter<double>("xMax"));
+        ERpTRes_[i] = book1D(b,
+                             TString::Format("ERPt%d_%d", (int)ptBins[i], (int)ptBins[i + 1]),
+                             ";#Deltap_{T}/p_{T};Entries",
+                             dptOvptPS.getParameter<int32_t>("nBin"),
+                             dptOvptPS.getParameter<double>("xMin"),
+                             dptOvptPS.getParameter<double>("xMax"));
+      }
+    }
+    if (dptOvptPS.getParameter<bool>("BROn")) {
+      BRdelta_et_Over_et_VS_et_ = book2D(b,
+                                         "BRdelta_et_Over_et_VS_et_",
+                                         ";E_{T, true} (GeV);#DeltaE_{T}/E_{T}",
+                                         ptBinsPS.size() - 1,
+                                         &(ptBins.front()),
+                                         dptOvptPS.getParameter<int32_t>("nBin"),
+                                         dptOvptPS.getParameter<double>("xMin"),
+                                         dptOvptPS.getParameter<double>("xMax"));
+    }
     if (dptOvptPS.getParameter<bool>("EROn")) {
-      ERdelta_et_Over_et_VS_et_ = book2D(b, "ERdelta_et_Over_et_VS_et_", ";E_{T, true} (GeV);#DeltaE_{T}/E_{T}",
-					 ptBinsPS.size()-1, &(ptBins.front()), 
-					 dptOvptPS.getParameter<int32_t>("nBin"), 
-					 dptOvptPS.getParameter<double>("xMin"), 
-					 dptOvptPS.getParameter<double>("xMax"));
+      ERdelta_et_Over_et_VS_et_ = book2D(b,
+                                         "ERdelta_et_Over_et_VS_et_",
+                                         ";E_{T, true} (GeV);#DeltaE_{T}/E_{T}",
+                                         ptBinsPS.size() - 1,
+                                         &(ptBins.front()),
+                                         dptOvptPS.getParameter<int32_t>("nBin"),
+                                         dptOvptPS.getParameter<double>("xMin"),
+                                         dptOvptPS.getParameter<double>("xMax"));
     }
-    
+
     if (dptPS.getParameter<bool>("switchOn")) {
-      delta_et_VS_et_ = book2D(b, "delta_et_VS_et_", ";E_{T, true} (GeV);#DeltaE_{T}",
-			       ptBinsPS.size()-1, &(ptBins.front()),
-			       dptPS.getParameter<int32_t>("nBin"), 
-			       dptPS.getParameter<double>("xMin"), 
-			       dptPS.getParameter<double>("xMax"));
+      delta_et_VS_et_ = book2D(b,
+                               "delta_et_VS_et_",
+                               ";E_{T, true} (GeV);#DeltaE_{T}",
+                               ptBinsPS.size() - 1,
+                               &(ptBins.front()),
+                               dptPS.getParameter<int32_t>("nBin"),
+                               dptPS.getParameter<double>("xMin"),
+                               dptPS.getParameter<double>("xMax"));
     }
-    
+
     if (detaPS.getParameter<bool>("switchOn")) {
-      delta_eta_VS_et_ = book2D(b, "delta_eta_VS_et_", ";E_{T, true} (GeV);#Delta#eta",
-				ptBinsPS.size()-1, &(ptBins.front()),
-				detaPS.getParameter<int32_t>("nBin"), 
-				detaPS.getParameter<double>("xMin"), 
-				detaPS.getParameter<double>("xMax"));
+      delta_eta_VS_et_ = book2D(b,
+                                "delta_eta_VS_et_",
+                                ";E_{T, true} (GeV);#Delta#eta",
+                                ptBinsPS.size() - 1,
+                                &(ptBins.front()),
+                                detaPS.getParameter<int32_t>("nBin"),
+                                detaPS.getParameter<double>("xMin"),
+                                detaPS.getParameter<double>("xMax"));
     }
-    
+
     if (dphiPS.getParameter<bool>("switchOn")) {
-      delta_phi_VS_et_ = book2D(b, "delta_phi_VS_et_", ";E_{T, true} (GeV);#Delta#phi",
-				ptBinsPS.size()-1, &(ptBins.front()),
-				dphiPS.getParameter<int32_t>("nBin"), 
-				dphiPS.getParameter<double>("xMin"),
-				dphiPS.getParameter<double>("xMax"));
+      delta_phi_VS_et_ = book2D(b,
+                                "delta_phi_VS_et_",
+                                ";E_{T, true} (GeV);#Delta#phi",
+                                ptBinsPS.size() - 1,
+                                &(ptBins.front()),
+                                dphiPS.getParameter<int32_t>("nBin"),
+                                dphiPS.getParameter<double>("xMin"),
+                                dphiPS.getParameter<double>("xMax"));
     }
     /*
     // TProfile
     if (dptOvptPS.getParameter<bool>("switchOn")) {
-      profile_delta_et_Over_et_VS_et_ = bookProfile("profile_delta_et_Over_et_VS_et_", ";E_{T, true} (GeV);#DeltaE_{T}/E_{T}",
-						    ptBinsPS.size()-1, &(ptBins.front()), 
-						    dptOvptPS.getParameter<double>("xMin"), 
-						    dptOvptPS.getParameter<double>("xMax"), "" );
-      profileRMS_delta_et_Over_et_VS_et_ = bookProfile("profileRMS_delta_et_Over_et_VS_et_", ";E_{T, true} (GeV);#DeltaE_{T}/E_{T}",
-						    ptBinsPS.size()-1, &(ptBins.front()), 
-						    dptOvptPS.getParameter<double>("xMin"), 
-						    dptOvptPS.getParameter<double>("xMax"), "s" );
+      profile_delta_et_Over_et_VS_et_ =
+    bookProfile("profile_delta_et_Over_et_VS_et_", ";E_{T, true}
+    (GeV);#DeltaE_{T}/E_{T}", ptBinsPS.size()-1, &(ptBins.front()),
+                                                    dptOvptPS.getParameter<double>("xMin"),
+                                                    dptOvptPS.getParameter<double>("xMax"),
+    "" ); profileRMS_delta_et_Over_et_VS_et_ =
+    bookProfile("profileRMS_delta_et_Over_et_VS_et_", ";E_{T, true}
+    (GeV);#DeltaE_{T}/E_{T}", ptBinsPS.size()-1, &(ptBins.front()),
+                                                    dptOvptPS.getParameter<double>("xMin"),
+                                                    dptOvptPS.getParameter<double>("xMax"),
+    "s" );
     }
-    
+
     if (dptPS.getParameter<bool>("switchOn")) {
-      profile_delta_et_VS_et_ = bookProfile("profile_delta_et_VS_et_", ";E_{T, true} (GeV);#DeltaE_{T}",
-					    ptBinsPS.size()-1, &(ptBins.front()),
-					    dptPS.getParameter<double>("xMin"), 
-					    dptPS.getParameter<double>("xMax"), "" );
-      profileRMS_delta_et_VS_et_ = bookProfile("profileRMS_delta_et_VS_et_", ";E_{T, true} (GeV);#DeltaE_{T}",
-					    ptBinsPS.size()-1, &(ptBins.front()),
-					    dptPS.getParameter<double>("xMin"), 
-					    dptPS.getParameter<double>("xMax"), "s" );
+      profile_delta_et_VS_et_ = bookProfile("profile_delta_et_VS_et_", ";E_{T,
+    true} (GeV);#DeltaE_{T}", ptBinsPS.size()-1, &(ptBins.front()),
+                                            dptPS.getParameter<double>("xMin"),
+                                            dptPS.getParameter<double>("xMax"),
+    "" ); profileRMS_delta_et_VS_et_ = bookProfile("profileRMS_delta_et_VS_et_",
+    ";E_{T, true} (GeV);#DeltaE_{T}", ptBinsPS.size()-1, &(ptBins.front()),
+                                            dptPS.getParameter<double>("xMin"),
+                                            dptPS.getParameter<double>("xMax"),
+    "s" );
     }
-    
+
     if (detaPS.getParameter<bool>("switchOn")) {
-      profile_delta_eta_VS_et_ = bookProfile("profile_delta_eta_VS_et_", ";E_{T, true} (GeV);#Delta#eta",
-					     ptBinsPS.size()-1, &(ptBins.front()),
-					     detaPS.getParameter<double>("xMin"), 
-					     detaPS.getParameter<double>("xMax"), "" );
-      profileRMS_delta_eta_VS_et_ = bookProfile("profileRMS_delta_eta_VS_et_", ";E_{T, true} (GeV);#Delta#eta",
-					     ptBinsPS.size()-1, &(ptBins.front()),
-					     detaPS.getParameter<double>("xMin"), 
-					     detaPS.getParameter<double>("xMax"), "s" );
+      profile_delta_eta_VS_et_ = bookProfile("profile_delta_eta_VS_et_", ";E_{T,
+    true} (GeV);#Delta#eta", ptBinsPS.size()-1, &(ptBins.front()),
+                                             detaPS.getParameter<double>("xMin"),
+                                             detaPS.getParameter<double>("xMax"),
+    "" ); profileRMS_delta_eta_VS_et_ =
+    bookProfile("profileRMS_delta_eta_VS_et_", ";E_{T, true} (GeV);#Delta#eta",
+                                             ptBinsPS.size()-1,
+    &(ptBins.front()), detaPS.getParameter<double>("xMin"),
+                                             detaPS.getParameter<double>("xMax"),
+    "s" );
     }
-    
+
     if (dphiPS.getParameter<bool>("switchOn")) {
-      profile_delta_phi_VS_et_ = bookProfile("profile_delta_phi_VS_et_", ";E_{T, true} (GeV);#Delta#phi",
-					     ptBinsPS.size()-1, &(ptBins.front()),
-					     dphiPS.getParameter<double>("xMin"),
-					     dphiPS.getParameter<double>("xMax"), "" );
-      profileRMS_delta_phi_VS_et_ = bookProfile("profileRMS_delta_phi_VS_et_", ";E_{T, true} (GeV);#Delta#phi",
-					     ptBinsPS.size()-1, &(ptBins.front()),
-					     dphiPS.getParameter<double>("xMin"),
-					     dphiPS.getParameter<double>("xMax"), "s" );
-					     }
+      profile_delta_phi_VS_et_ = bookProfile("profile_delta_phi_VS_et_", ";E_{T,
+    true} (GeV);#Delta#phi", ptBinsPS.size()-1, &(ptBins.front()),
+                                             dphiPS.getParameter<double>("xMin"),
+                                             dphiPS.getParameter<double>("xMax"),
+    "" ); profileRMS_delta_phi_VS_et_ =
+    bookProfile("profileRMS_delta_phi_VS_et_", ";E_{T, true} (GeV);#Delta#phi",
+                                             ptBinsPS.size()-1,
+    &(ptBins.front()), dphiPS.getParameter<double>("xMin"),
+                                             dphiPS.getParameter<double>("xMax"),
+    "s" );
+                                             }
     */
 
     histogramBooked_ = true;
   }
 }
 
-void MatchCandidateBenchmark::fillOne(const reco::Candidate& cand,
-				      const reco::Candidate& matchedCand) {
-
-  if( !isInRange(cand.pt(), cand.eta(), cand.phi() ) ) return;
+void MatchCandidateBenchmark::fillOne(const reco::Candidate &cand, const reco::Candidate &matchedCand) {
+  if (!isInRange(cand.pt(), cand.eta(), cand.phi()))
+    return;
 
   if (histogramBooked_) {
-    if (delta_et_Over_et_VS_et_) delta_et_Over_et_VS_et_->Fill( matchedCand.pt(), (cand.pt() - matchedCand.pt())/matchedCand.pt() );
-    if ( fabs(cand.eta())  <= 1.4 )
-      if (BRdelta_et_Over_et_VS_et_) BRdelta_et_Over_et_VS_et_->Fill( matchedCand.pt(), (cand.pt() - matchedCand.pt())/matchedCand.pt() );
-    if ( fabs(cand.eta()) >= 1.6 && fabs(cand.eta()) <= 2.4 )
-      if (ERdelta_et_Over_et_VS_et_) ERdelta_et_Over_et_VS_et_->Fill( matchedCand.pt(), (cand.pt() - matchedCand.pt())/matchedCand.pt() );
-    if (delta_et_VS_et_) delta_et_VS_et_->Fill( matchedCand.pt(), cand.pt() - matchedCand.pt() );
-    if (delta_eta_VS_et_) delta_eta_VS_et_->Fill( matchedCand.pt(), cand.eta() - matchedCand.eta() );
-    if (delta_phi_VS_et_) delta_phi_VS_et_->Fill( matchedCand.pt(), cand.phi() - matchedCand.phi() );
+    if (delta_et_Over_et_VS_et_)
+      delta_et_Over_et_VS_et_->Fill(matchedCand.pt(), (cand.pt() - matchedCand.pt()) / matchedCand.pt());
+    if (fabs(cand.eta()) <= 1.4)
+      if (BRdelta_et_Over_et_VS_et_)
+        BRdelta_et_Over_et_VS_et_->Fill(matchedCand.pt(), (cand.pt() - matchedCand.pt()) / matchedCand.pt());
+    if (fabs(cand.eta()) >= 1.6 && fabs(cand.eta()) <= 2.4)
+      if (ERdelta_et_Over_et_VS_et_)
+        ERdelta_et_Over_et_VS_et_->Fill(matchedCand.pt(), (cand.pt() - matchedCand.pt()) / matchedCand.pt());
+    if (delta_et_VS_et_)
+      delta_et_VS_et_->Fill(matchedCand.pt(), cand.pt() - matchedCand.pt());
+    if (delta_eta_VS_et_)
+      delta_eta_VS_et_->Fill(matchedCand.pt(), cand.eta() - matchedCand.eta());
+    if (delta_phi_VS_et_)
+      delta_phi_VS_et_->Fill(matchedCand.pt(), cand.phi() - matchedCand.phi());
     /*
     // TProfile
     if (profile_delta_et_Over_et_VS_et_) {
-      profile_delta_et_Over_et_VS_et_->Fill( matchedCand.pt(), (cand.pt() - matchedCand.pt())/matchedCand.pt() );
-      profileRMS_delta_et_Over_et_VS_et_->Fill( matchedCand.pt(), (cand.pt() - matchedCand.pt())/matchedCand.pt() ); }
-    if (profile_delta_et_VS_et_) {
-      profile_delta_et_VS_et_->Fill( matchedCand.pt(), cand.pt() - matchedCand.pt() );
-      profileRMS_delta_et_VS_et_->Fill( matchedCand.pt(), cand.pt() - matchedCand.pt() ); }
-    if (profile_delta_eta_VS_et_) {
-      profile_delta_eta_VS_et_->Fill( matchedCand.pt(), cand.eta() - matchedCand.eta() );
-      profileRMS_delta_eta_VS_et_->Fill( matchedCand.pt(), cand.eta() - matchedCand.eta() ); }
-    if (profile_delta_phi_VS_et_) {
-      profile_delta_phi_VS_et_->Fill( matchedCand.pt(), cand.phi() - matchedCand.phi() );
-      profileRMS_delta_phi_VS_et_->Fill( matchedCand.pt(), cand.phi() - matchedCand.phi() ); }
+      profile_delta_et_Over_et_VS_et_->Fill( matchedCand.pt(), (cand.pt() -
+    matchedCand.pt())/matchedCand.pt() );
+      profileRMS_delta_et_Over_et_VS_et_->Fill( matchedCand.pt(), (cand.pt() -
+    matchedCand.pt())/matchedCand.pt() ); } if (profile_delta_et_VS_et_) {
+      profile_delta_et_VS_et_->Fill( matchedCand.pt(), cand.pt() -
+    matchedCand.pt() ); profileRMS_delta_et_VS_et_->Fill( matchedCand.pt(),
+    cand.pt() - matchedCand.pt() ); } if (profile_delta_eta_VS_et_) {
+      profile_delta_eta_VS_et_->Fill( matchedCand.pt(), cand.eta() -
+    matchedCand.eta() ); profileRMS_delta_eta_VS_et_->Fill( matchedCand.pt(),
+    cand.eta() - matchedCand.eta() ); } if (profile_delta_phi_VS_et_) {
+      profile_delta_phi_VS_et_->Fill( matchedCand.pt(), cand.phi() -
+    matchedCand.phi() ); profileRMS_delta_phi_VS_et_->Fill( matchedCand.pt(),
+    cand.phi() - matchedCand.phi() ); }
     */
-  }  
+  }
 }
 
-void MatchCandidateBenchmark::fillOne(const reco::Candidate& cand,
-				      const reco::Candidate& matchedCand,
-				      const edm::ParameterSet& parameterSet) {
-  if( !isInRange(cand.pt(), cand.eta(), cand.phi() ) ) return;
-  
-  if (histogramBooked_) { 
+void MatchCandidateBenchmark::fillOne(const reco::Candidate &cand,
+                                      const reco::Candidate &matchedCand,
+                                      const edm::ParameterSet &parameterSet) {
+  if (!isInRange(cand.pt(), cand.eta(), cand.phi()))
+    return;
 
-    std::vector<double> ptBinsPS = parameterSet.getParameter< std::vector<double> >( "VariablePtBins" );
+  if (histogramBooked_) {
+    std::vector<double> ptBinsPS = parameterSet.getParameter<std::vector<double>>("VariablePtBins");
     edm::ParameterSet ptPS = parameterSet.getParameter<edm::ParameterSet>("PtHistoParameter");
     std::vector<float> ptBins;
-    if (ptBinsPS.size() > 1) { 
+    if (ptBinsPS.size() > 1) {
       ptBins.reserve(ptBinsPS.size());
       for (size_t i = 0; i < ptBinsPS.size(); i++) {
         ptBins.push_back(ptBinsPS[i]);
       }
-    } else { 
+    } else {
       Int_t nFixedBins = ptPS.getParameter<int32_t>("nBin");
       ptBins.reserve(nFixedBins + 1);
       for (Int_t i = 0; i <= nFixedBins; i++) {
-        ptBins.push_back( ptPS.getParameter<double>("xMin") + i*((ptPS.getParameter<double>("xMax") - ptPS.getParameter<double>("xMin")) / nFixedBins) );
+        ptBins.push_back(ptPS.getParameter<double>("xMin") +
+                         i * ((ptPS.getParameter<double>("xMax") - ptPS.getParameter<double>("xMin")) / nFixedBins));
       }
       ptBinsPS.resize(nFixedBins);
     }
 
     edm::ParameterSet dptOvptPS = parameterSet.getParameter<edm::ParameterSet>("DeltaPtOvPtHistoParameter");
-    if (matchedCand.pt() > ptBins.at(0)) { // underflow problem
-      if (delta_et_Over_et_VS_et_) delta_et_Over_et_VS_et_->Fill( matchedCand.pt(), (cand.pt() - matchedCand.pt()) / matchedCand.pt() );
-      if ( fabs(cand.eta()) >= dptOvptPS.getParameter<double>("BREtaMin")  &&  fabs(cand.eta()) <= dptOvptPS.getParameter<double>("BREtaMax"))
-	if (BRdelta_et_Over_et_VS_et_) BRdelta_et_Over_et_VS_et_->Fill( matchedCand.pt(), (cand.pt() - matchedCand.pt())/matchedCand.pt() );
-      if ( fabs(cand.eta()) >= dptOvptPS.getParameter<double>("EREtaMin")  &&  fabs(cand.eta()) <= dptOvptPS.getParameter<double>("EREtaMax"))
-	if (ERdelta_et_Over_et_VS_et_) ERdelta_et_Over_et_VS_et_->Fill( matchedCand.pt(), (cand.pt() - matchedCand.pt())/matchedCand.pt() );
-      if (delta_et_VS_et_) delta_et_VS_et_->Fill( matchedCand.pt(), cand.pt() - matchedCand.pt() );
-      if (delta_eta_VS_et_) delta_eta_VS_et_->Fill( matchedCand.pt(), cand.eta() - matchedCand.eta() );
-      if (delta_phi_VS_et_) delta_phi_VS_et_->Fill( matchedCand.pt(), cand.phi() - matchedCand.phi() );
+    if (matchedCand.pt() > ptBins.at(0)) {  // underflow problem
+      if (delta_et_Over_et_VS_et_)
+        delta_et_Over_et_VS_et_->Fill(matchedCand.pt(), (cand.pt() - matchedCand.pt()) / matchedCand.pt());
+      if (fabs(cand.eta()) >= dptOvptPS.getParameter<double>("BREtaMin") &&
+          fabs(cand.eta()) <= dptOvptPS.getParameter<double>("BREtaMax"))
+        if (BRdelta_et_Over_et_VS_et_)
+          BRdelta_et_Over_et_VS_et_->Fill(matchedCand.pt(), (cand.pt() - matchedCand.pt()) / matchedCand.pt());
+      if (fabs(cand.eta()) >= dptOvptPS.getParameter<double>("EREtaMin") &&
+          fabs(cand.eta()) <= dptOvptPS.getParameter<double>("EREtaMax"))
+        if (ERdelta_et_Over_et_VS_et_)
+          ERdelta_et_Over_et_VS_et_->Fill(matchedCand.pt(), (cand.pt() - matchedCand.pt()) / matchedCand.pt());
+      if (delta_et_VS_et_)
+        delta_et_VS_et_->Fill(matchedCand.pt(), cand.pt() - matchedCand.pt());
+      if (delta_eta_VS_et_)
+        delta_eta_VS_et_->Fill(matchedCand.pt(), cand.eta() - matchedCand.eta());
+      if (delta_phi_VS_et_)
+        delta_phi_VS_et_->Fill(matchedCand.pt(), cand.phi() - matchedCand.phi());
     }
     /*
     // TProfile
     if (profile_delta_et_Over_et_VS_et_) {
-      profile_delta_et_Over_et_VS_et_->Fill( matchedCand.pt(), (cand.pt() - matchedCand.pt())/matchedCand.pt() );
-      profileRMS_delta_et_Over_et_VS_et_->Fill( matchedCand.pt(), (cand.pt() - matchedCand.pt())/matchedCand.pt() ); }
-    if (profile_delta_et_VS_et_) {
-      profile_delta_et_VS_et_->Fill( matchedCand.pt(), cand.pt() - matchedCand.pt() );
-      profileRMS_delta_et_VS_et_->Fill( matchedCand.pt(), cand.pt() - matchedCand.pt() ); }
-    if (profile_delta_eta_VS_et_) {
-      profile_delta_eta_VS_et_->Fill( matchedCand.pt(), cand.eta() - matchedCand.eta() );
-      profileRMS_delta_eta_VS_et_->Fill( matchedCand.pt(), cand.eta() - matchedCand.eta() ); }
-    if (profile_delta_phi_VS_et_) {
-      profile_delta_phi_VS_et_->Fill( matchedCand.pt(), cand.phi() - matchedCand.phi() );
-      profileRMS_delta_phi_VS_et_->Fill( matchedCand.pt(), cand.phi() - matchedCand.phi() ); }
+      profile_delta_et_Over_et_VS_et_->Fill( matchedCand.pt(), (cand.pt() -
+    matchedCand.pt())/matchedCand.pt() );
+      profileRMS_delta_et_Over_et_VS_et_->Fill( matchedCand.pt(), (cand.pt() -
+    matchedCand.pt())/matchedCand.pt() ); } if (profile_delta_et_VS_et_) {
+      profile_delta_et_VS_et_->Fill( matchedCand.pt(), cand.pt() -
+    matchedCand.pt() ); profileRMS_delta_et_VS_et_->Fill( matchedCand.pt(),
+    cand.pt() - matchedCand.pt() ); } if (profile_delta_eta_VS_et_) {
+      profile_delta_eta_VS_et_->Fill( matchedCand.pt(), cand.eta() -
+    matchedCand.eta() ); profileRMS_delta_eta_VS_et_->Fill( matchedCand.pt(),
+    cand.eta() - matchedCand.eta() ); } if (profile_delta_phi_VS_et_) {
+      profile_delta_phi_VS_et_->Fill( matchedCand.pt(), cand.phi() -
+    matchedCand.phi() ); profileRMS_delta_phi_VS_et_->Fill( matchedCand.pt(),
+    cand.phi() - matchedCand.phi() ); }
     */
 
     for (size_t i = 0; i < pTRes_.size(); i++) {
-      if (matchedCand.pt() >= ptBins.at(i) && matchedCand.pt() < ptBins.at(i+1)) {
-	if (pTRes_[i]) pTRes_[i]->Fill( (cand.pt() - matchedCand.pt()) / matchedCand.pt() ) ;
-      	if ( fabs(cand.eta()) >= dptOvptPS.getParameter<double>("BREtaMin")  &&  fabs(cand.eta()) <= dptOvptPS.getParameter<double>("BREtaMax"))
-	  if (BRpTRes_[i]) BRpTRes_[i]->Fill( (cand.pt() - matchedCand.pt()) / matchedCand.pt() ) ; // Fill Barrel
-      	if ( fabs(cand.eta()) >= dptOvptPS.getParameter<double>("EREtaMin")  &&  fabs(cand.eta()) <= dptOvptPS.getParameter<double>("EREtaMax"))
-	  if (ERpTRes_[i]) ERpTRes_[i]->Fill( (cand.pt() - matchedCand.pt()) / matchedCand.pt() ) ; // Fill Endcap
+      if (matchedCand.pt() >= ptBins.at(i) && matchedCand.pt() < ptBins.at(i + 1)) {
+        if (pTRes_[i])
+          pTRes_[i]->Fill((cand.pt() - matchedCand.pt()) / matchedCand.pt());
+        if (fabs(cand.eta()) >= dptOvptPS.getParameter<double>("BREtaMin") &&
+            fabs(cand.eta()) <= dptOvptPS.getParameter<double>("BREtaMax"))
+          if (BRpTRes_[i])
+            BRpTRes_[i]->Fill((cand.pt() - matchedCand.pt()) / matchedCand.pt());  // Fill Barrel
+        if (fabs(cand.eta()) >= dptOvptPS.getParameter<double>("EREtaMin") &&
+            fabs(cand.eta()) <= dptOvptPS.getParameter<double>("EREtaMax"))
+          if (ERpTRes_[i])
+            ERpTRes_[i]->Fill((cand.pt() - matchedCand.pt()) / matchedCand.pt());  // Fill Endcap
       }
     }
   }
 }
-
diff --git a/DQMOffline/PFTau/src/MatchMETBenchmark.cc b/DQMOffline/PFTau/src/MatchMETBenchmark.cc
index 60780c7e69720..39351732220b6 100644
--- a/DQMOffline/PFTau/src/MatchMETBenchmark.cc
+++ b/DQMOffline/PFTau/src/MatchMETBenchmark.cc
@@ -1,24 +1,19 @@
 #include "DQMOffline/PFTau/interface/MatchMETBenchmark.h"
-#include "DataFormats/METReco/interface/MET.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
+#include "DataFormats/METReco/interface/MET.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-
-#include <TROOT.h>
 #include <TFile.h>
 #include <TH1.h>
 #include <TH2.h>
-
+#include <TROOT.h>
 
 using namespace std;
 
-
 MatchMETBenchmark::~MatchMETBenchmark() {}
 
-
-void MatchMETBenchmark::setup(DQMStore::IBooker& b) {
-
-  //std::cout << "FL: MatchMETBenchmark.cc: start setup()" << std::endl;
+void MatchMETBenchmark::setup(DQMStore::IBooker &b) {
+  // std::cout << "FL: MatchMETBenchmark.cc: start setup()" << std::endl;
   PhaseSpace ptPS;
   PhaseSpace dptOvptPS;
   PhaseSpace dptPS;
@@ -27,94 +22,107 @@ void MatchMETBenchmark::setup(DQMStore::IBooker& b) {
   PhaseSpace dsetPS;
   PhaseSpace setOvsetPS;
 
-  switch(mode_) {
-  case VALIDATION:
-    ptPS = PhaseSpace(100,0,1000);
-    dptOvptPS = PhaseSpace( 200, -1, 1);
-    dphiPS = PhaseSpace( 100, -3.2, 3.2);
-    dptPS = PhaseSpace( 200, -500, 500);
-    setPS = PhaseSpace( 300, 0.0, 3000);
-    dsetPS = PhaseSpace( 200, 0.-1000, 1000);
-    setOvsetPS = PhaseSpace( 500,0., 2.);
-    break;
-  case DQMOFFLINE:
-  default:
-    ptPS = PhaseSpace(50,0,200);
-    dptOvptPS = PhaseSpace( 50, -1, 1);
-    dphiPS = PhaseSpace( 50, -3.2, 3.2);
-    dptPS = PhaseSpace( 50, -500, 500);
-    setPS = PhaseSpace( 50, 0.0, 3000);
-    dsetPS = PhaseSpace( 50, -1000.0, 1000);
-    setOvsetPS = PhaseSpace( 100,0., 2.);
-    break;
+  switch (mode_) {
+    case VALIDATION:
+      ptPS = PhaseSpace(100, 0, 1000);
+      dptOvptPS = PhaseSpace(200, -1, 1);
+      dphiPS = PhaseSpace(100, -3.2, 3.2);
+      dptPS = PhaseSpace(200, -500, 500);
+      setPS = PhaseSpace(300, 0.0, 3000);
+      dsetPS = PhaseSpace(200, 0. - 1000, 1000);
+      setOvsetPS = PhaseSpace(500, 0., 2.);
+      break;
+    case DQMOFFLINE:
+    default:
+      ptPS = PhaseSpace(50, 0, 200);
+      dptOvptPS = PhaseSpace(50, -1, 1);
+      dphiPS = PhaseSpace(50, -3.2, 3.2);
+      dptPS = PhaseSpace(50, -500, 500);
+      setPS = PhaseSpace(50, 0.0, 3000);
+      dsetPS = PhaseSpace(50, -1000.0, 1000);
+      setOvsetPS = PhaseSpace(100, 0., 2.);
+      break;
   }
 
-  // variable bins to be done here, as they will save a lot of memory. 
-
-  //float ptBins[11] = {0, 1, 2, 5, 10, 20, 50, 100, 200, 400, 1000};
-
-  delta_et_Over_et_VS_et_ = book2D(b, "delta_et_Over_et_VS_et_", 
-				   ";ME_{T, true} (GeV);#DeltaME_{T}/ME_{T}",
-				   ptPS.n, ptPS.m, ptPS.M,
-				   dptOvptPS.n, dptOvptPS.m, dptOvptPS.M );
-
-  delta_et_VS_et_ = book2D(b, "delta_et_VS_et_", 
-			   ";ME_{T, true} (GeV);#DeltaME_{T}",
-			   ptPS.n, ptPS.m, ptPS.M,
-			   dptPS.n, dptPS.m, dptPS.M );
-
-  delta_phi_VS_et_ = book2D(b, "delta_phi_VS_et_", 
-			    ";ME_{T, true} (GeV);#Delta#phi",
-			    ptPS.n, ptPS.m, ptPS.M,
-			    dphiPS.n, dphiPS.m, dphiPS.M );
-
-  delta_ex_ = book1D(b, "delta_ex_", 
-			   "#DeltaME_{X}",
-			   dptPS.n, dptPS.m, dptPS.M );
-
-  RecEt_VS_TrueEt_ = book2D(b, "RecEt_VS_TrueEt_", 
-			   ";ME_{T, true} (GeV);ME_{T}",
-			   ptPS.n, ptPS.m, ptPS.M,
-			   ptPS.n, ptPS.m, ptPS.M );
-
-  delta_set_VS_set_ = book2D(b, "delta_set_VS_set_", 
-			   ";SE_{T, true} (GeV);#DeltaSE_{T}",
-			   setPS.n, setPS.m, setPS.M,
-			   dsetPS.n, dsetPS.m, dsetPS.M );
-
-  delta_set_Over_set_VS_set_ = book2D(b, "delta_set_Over_set_VS_set_", 
-			   ";SE_{T, true} (GeV);#DeltaSE_{T}/SE_{T}",
-			   setPS.n, setPS.m, setPS.M,
-			   dptOvptPS.n, dptOvptPS.m, dptOvptPS.M );
-
-  delta_ex_VS_set_ = book2D(b, "delta_ex_VS_set_", 
-			   ";SE_{T, true} (GeV);#DeltaE_{X}",
-			   setPS.n, setPS.m, setPS.M,
-			   ptPS.n, -ptPS.M, ptPS.M );
-
-  RecSet_Over_TrueSet_VS_TrueSet_ = book2D(b, "RecSet_Over_TrueSet_VS_TrueSet_", 
-			   ";SE_{T, true} (GeV);SE_{T}/SE_{T}",
-			   setPS.n, setPS.m, setPS.M,
-			   setOvsetPS.n, setOvsetPS.m, setOvsetPS.M );
+  // variable bins to be done here, as they will save a lot of memory.
+
+  // float ptBins[11] = {0, 1, 2, 5, 10, 20, 50, 100, 200, 400, 1000};
+
+  delta_et_Over_et_VS_et_ = book2D(b,
+                                   "delta_et_Over_et_VS_et_",
+                                   ";ME_{T, true} (GeV);#DeltaME_{T}/ME_{T}",
+                                   ptPS.n,
+                                   ptPS.m,
+                                   ptPS.M,
+                                   dptOvptPS.n,
+                                   dptOvptPS.m,
+                                   dptOvptPS.M);
+
+  delta_et_VS_et_ = book2D(
+      b, "delta_et_VS_et_", ";ME_{T, true} (GeV);#DeltaME_{T}", ptPS.n, ptPS.m, ptPS.M, dptPS.n, dptPS.m, dptPS.M);
+
+  delta_phi_VS_et_ = book2D(
+      b, "delta_phi_VS_et_", ";ME_{T, true} (GeV);#Delta#phi", ptPS.n, ptPS.m, ptPS.M, dphiPS.n, dphiPS.m, dphiPS.M);
+
+  delta_ex_ = book1D(b, "delta_ex_", "#DeltaME_{X}", dptPS.n, dptPS.m, dptPS.M);
+
+  RecEt_VS_TrueEt_ =
+      book2D(b, "RecEt_VS_TrueEt_", ";ME_{T, true} (GeV);ME_{T}", ptPS.n, ptPS.m, ptPS.M, ptPS.n, ptPS.m, ptPS.M);
+
+  delta_set_VS_set_ = book2D(b,
+                             "delta_set_VS_set_",
+                             ";SE_{T, true} (GeV);#DeltaSE_{T}",
+                             setPS.n,
+                             setPS.m,
+                             setPS.M,
+                             dsetPS.n,
+                             dsetPS.m,
+                             dsetPS.M);
+
+  delta_set_Over_set_VS_set_ = book2D(b,
+                                      "delta_set_Over_set_VS_set_",
+                                      ";SE_{T, true} (GeV);#DeltaSE_{T}/SE_{T}",
+                                      setPS.n,
+                                      setPS.m,
+                                      setPS.M,
+                                      dptOvptPS.n,
+                                      dptOvptPS.m,
+                                      dptOvptPS.M);
+
+  delta_ex_VS_set_ = book2D(
+      b, "delta_ex_VS_set_", ";SE_{T, true} (GeV);#DeltaE_{X}", setPS.n, setPS.m, setPS.M, ptPS.n, -ptPS.M, ptPS.M);
+
+  RecSet_Over_TrueSet_VS_TrueSet_ = book2D(b,
+                                           "RecSet_Over_TrueSet_VS_TrueSet_",
+                                           ";SE_{T, true} (GeV);SE_{T}/SE_{T}",
+                                           setPS.n,
+                                           setPS.m,
+                                           setPS.M,
+                                           setOvsetPS.n,
+                                           setOvsetPS.m,
+                                           setOvsetPS.M);
 }
 
-void MatchMETBenchmark::fillOne(const reco::MET& cand,
-				      const reco::MET& matchedCand) {
-  
-  if( !isInRange(cand.pt(), cand.eta(), cand.phi() ) ) return;
-  
-  if ( matchedCand.pt()>0.001 ) delta_et_Over_et_VS_et_->Fill( matchedCand.pt(), (cand.pt() - matchedCand.pt())/matchedCand.pt() );
-  else edm::LogWarning("MatchMETBenchmark") << " matchedCand.pt()<0.001";
-  delta_et_VS_et_->Fill( matchedCand.pt(), cand.pt() - matchedCand.pt() );
-  delta_phi_VS_et_->Fill( matchedCand.pt(), cand.phi() - matchedCand.phi() );
-  delta_ex_->Fill(cand.px()-matchedCand.px());
-  delta_ex_->Fill(cand.py()-matchedCand.py());
-  RecEt_VS_TrueEt_->Fill(matchedCand.pt(),cand.pt());
-  delta_set_VS_set_->Fill(matchedCand.sumEt(),cand.sumEt()-matchedCand.sumEt());
-  if ( matchedCand.sumEt()>0.001 ) delta_set_Over_set_VS_set_->Fill(matchedCand.sumEt(),(cand.sumEt()-matchedCand.sumEt())/matchedCand.sumEt());
-  else edm::LogWarning("MatchMETBenchmark") << " matchedCand.sumEt()<0.001";
-  delta_ex_VS_set_->Fill(matchedCand.sumEt(),cand.px()-matchedCand.px());
-  delta_ex_VS_set_->Fill(matchedCand.sumEt(),cand.py()-matchedCand.py());
-  if ( matchedCand.sumEt()>0.001 ) RecSet_Over_TrueSet_VS_TrueSet_->Fill(matchedCand.sumEt(),cand.sumEt()/matchedCand.sumEt());
-
+void MatchMETBenchmark::fillOne(const reco::MET &cand, const reco::MET &matchedCand) {
+  if (!isInRange(cand.pt(), cand.eta(), cand.phi()))
+    return;
+
+  if (matchedCand.pt() > 0.001)
+    delta_et_Over_et_VS_et_->Fill(matchedCand.pt(), (cand.pt() - matchedCand.pt()) / matchedCand.pt());
+  else
+    edm::LogWarning("MatchMETBenchmark") << " matchedCand.pt()<0.001";
+  delta_et_VS_et_->Fill(matchedCand.pt(), cand.pt() - matchedCand.pt());
+  delta_phi_VS_et_->Fill(matchedCand.pt(), cand.phi() - matchedCand.phi());
+  delta_ex_->Fill(cand.px() - matchedCand.px());
+  delta_ex_->Fill(cand.py() - matchedCand.py());
+  RecEt_VS_TrueEt_->Fill(matchedCand.pt(), cand.pt());
+  delta_set_VS_set_->Fill(matchedCand.sumEt(), cand.sumEt() - matchedCand.sumEt());
+  if (matchedCand.sumEt() > 0.001)
+    delta_set_Over_set_VS_set_->Fill(matchedCand.sumEt(), (cand.sumEt() - matchedCand.sumEt()) / matchedCand.sumEt());
+  else
+    edm::LogWarning("MatchMETBenchmark") << " matchedCand.sumEt()<0.001";
+  delta_ex_VS_set_->Fill(matchedCand.sumEt(), cand.px() - matchedCand.px());
+  delta_ex_VS_set_->Fill(matchedCand.sumEt(), cand.py() - matchedCand.py());
+  if (matchedCand.sumEt() > 0.001)
+    RecSet_Over_TrueSet_VS_TrueSet_->Fill(matchedCand.sumEt(), cand.sumEt() / matchedCand.sumEt());
 }
diff --git a/DQMOffline/PFTau/src/PFCandidateBenchmark.cc b/DQMOffline/PFTau/src/PFCandidateBenchmark.cc
index 87fa5dc14f555..689a3d1ad6501 100644
--- a/DQMOffline/PFTau/src/PFCandidateBenchmark.cc
+++ b/DQMOffline/PFTau/src/PFCandidateBenchmark.cc
@@ -1,66 +1,54 @@
 #include "DQMOffline/PFTau/interface/PFCandidateBenchmark.h"
 
-
 #include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
 
-
-#include <TROOT.h>
 #include <TFile.h>
 #include <TH1.h>
 #include <TH2.h>
-
+#include <TROOT.h>
 
 using namespace std;
 
-
-
 PFCandidateBenchmark::~PFCandidateBenchmark() {}
 
-
-void PFCandidateBenchmark::setup(DQMStore::IBooker& b) {
-
-  PhaseSpace ecalEnergyPS(100,0,100);
-  PhaseSpace hcalEnergyPS(100,0,100);
-  PhaseSpace mva_e_piPS(100,-1,1);
-  switch(mode_) {
-  case VALIDATION:
-    break;
-  case DQMOFFLINE:
-  default:
-    ecalEnergyPS.n = 50;
-    hcalEnergyPS.n = 50;
-    mva_e_piPS.n = 50;
-    break;
-    break;
+void PFCandidateBenchmark::setup(DQMStore::IBooker &b) {
+  PhaseSpace ecalEnergyPS(100, 0, 100);
+  PhaseSpace hcalEnergyPS(100, 0, 100);
+  PhaseSpace mva_e_piPS(100, -1, 1);
+  switch (mode_) {
+    case VALIDATION:
+      break;
+    case DQMOFFLINE:
+    default:
+      ecalEnergyPS.n = 50;
+      hcalEnergyPS.n = 50;
+      mva_e_piPS.n = 50;
+      break;
+      break;
   }
 
-  particleId_ = book1D(b, "particleId_", "particle ID", 7,1,8);
-  ecalEnergy_ = book1D(b, "ecalEnergy_", "ECAL energy, corrected;E_{ECAL} (GeV)",
-		       ecalEnergyPS.n, ecalEnergyPS.m, ecalEnergyPS.M);
-  hcalEnergy_ = book1D(b, "hcalEnergy_", "HCAL energy, corrected;E_{HCAL} (GeV)",
-		       ecalEnergyPS.n, ecalEnergyPS.m, ecalEnergyPS.M);
-  mva_e_pi_ = book1D(b, "mva_e_pi_", "e VS #pi MVA output;MVA", 
-		     mva_e_piPS.n, mva_e_piPS.m, mva_e_piPS.M);
+  particleId_ = book1D(b, "particleId_", "particle ID", 7, 1, 8);
+  ecalEnergy_ =
+      book1D(b, "ecalEnergy_", "ECAL energy, corrected;E_{ECAL} (GeV)", ecalEnergyPS.n, ecalEnergyPS.m, ecalEnergyPS.M);
+  hcalEnergy_ =
+      book1D(b, "hcalEnergy_", "HCAL energy, corrected;E_{HCAL} (GeV)", ecalEnergyPS.n, ecalEnergyPS.m, ecalEnergyPS.M);
+  mva_e_pi_ = book1D(b, "mva_e_pi_", "e VS #pi MVA output;MVA", mva_e_piPS.n, mva_e_piPS.m, mva_e_piPS.M);
   elementsInBlocksSize_ = book1D(b, "elementsInBlocksSize_", "number of elements used", 10, 0, 10);
-
 }
 
-
-void PFCandidateBenchmark::fill( const reco::PFCandidateCollection& pfCands) {
-
-  for(unsigned i=0; i<pfCands.size(); ++i) {
+void PFCandidateBenchmark::fill(const reco::PFCandidateCollection &pfCands) {
+  for (unsigned i = 0; i < pfCands.size(); ++i) {
     fillOne(pfCands[i]);
   }
 }
 
+void PFCandidateBenchmark::fillOne(const reco::PFCandidate &pfCand) {
+  if (!isInRange(pfCand.pt(), pfCand.eta(), pfCand.phi()))
+    return;
 
-void PFCandidateBenchmark::fillOne( const reco::PFCandidate& pfCand ) {
-
-  if( !isInRange(pfCand.pt(), pfCand.eta(), pfCand.phi() ) ) return;
-
-  particleId_->Fill( pfCand.particleId() );
-  ecalEnergy_->Fill( pfCand.ecalEnergy() );
-  hcalEnergy_->Fill( pfCand.hcalEnergy() );
-  mva_e_pi_->Fill( pfCand.mva_e_pi() );
-  elementsInBlocksSize_->Fill( pfCand.elementsInBlocks().size() );
+  particleId_->Fill(pfCand.particleId());
+  ecalEnergy_->Fill(pfCand.ecalEnergy());
+  hcalEnergy_->Fill(pfCand.hcalEnergy());
+  mva_e_pi_->Fill(pfCand.mva_e_pi());
+  elementsInBlocksSize_->Fill(pfCand.elementsInBlocks().size());
 }
diff --git a/DQMOffline/PFTau/src/PFCandidateManager.cc b/DQMOffline/PFTau/src/PFCandidateManager.cc
index 7b7fc4fa2881c..a1874fd6c0e96 100644
--- a/DQMOffline/PFTau/src/PFCandidateManager.cc
+++ b/DQMOffline/PFTau/src/PFCandidateManager.cc
@@ -1,48 +1,37 @@
 #include "DQMOffline/PFTau/interface/PFCandidateManager.h"
 
-
 #include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
 
-
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include <TROOT.h>
 #include <TFile.h>
 #include <TH1.h>
 #include <TH2.h>
-
+#include <TROOT.h>
 
 using namespace std;
 
-
-
 PFCandidateManager::~PFCandidateManager() {}
 
-
-void PFCandidateManager::setDirectory(TDirectory* dir) {
-  
+void PFCandidateManager::setDirectory(TDirectory *dir) {
   Benchmark::setDirectory(dir);
 
   candBench_.setDirectory(dir);
   pfCandBench_.setDirectory(dir);
   matchCandBench_.setDirectory(dir);
+}
 
-} 
-
-void PFCandidateManager::setParameters( float dRMax,
-					bool matchCharge, 
-					Benchmark::Mode mode) {
+void PFCandidateManager::setParameters(float dRMax, bool matchCharge, Benchmark::Mode mode) {
   dRMax_ = dRMax;
   matchCharge_ = matchCharge;
   mode_ = mode;
-  
+
   candBench_.setParameters(mode);
   pfCandBench_.setParameters(mode);
   matchCandBench_.setParameters(mode);
-  
 }
 
-void PFCandidateManager::setup(DQMStore::IBooker& b) {
+void PFCandidateManager::setup(DQMStore::IBooker &b) {
   candBench_.setup(b);
   pfCandBench_.setup(b);
   matchCandBench_.setup(b);
diff --git a/DQMOffline/PFTau/src/PFCandidateMonitor.cc b/DQMOffline/PFTau/src/PFCandidateMonitor.cc
index be83bf632b429..7d80467b446fc 100644
--- a/DQMOffline/PFTau/src/PFCandidateMonitor.cc
+++ b/DQMOffline/PFTau/src/PFCandidateMonitor.cc
@@ -1,160 +1,175 @@
+#include "DQMOffline/PFTau/interface/Matchers.h"
+#include "DQMOffline/PFTau/interface/PFCandidateMonitor.h"
 #include "DataFormats/JetReco/interface/Jet.h"
 #include "DataFormats/JetReco/interface/PFJet.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DQMOffline/PFTau/interface/Matchers.h"
-#include "DQMOffline/PFTau/interface/PFCandidateMonitor.h"
 
-#include <TROOT.h>
 #include <TFile.h>
 #include <TH1.h>
 #include <TH2.h>
-
+#include <TROOT.h>
 
 //
 // -- Constructor
 //
-PFCandidateMonitor::PFCandidateMonitor( float dRMax, bool matchCharge, Benchmark::Mode mode) : 
-  Benchmark(mode), 
-  candBench_(mode), 
-  matchCandBench_(mode), 
-  dRMax_(dRMax), 
-  matchCharge_(matchCharge) {
-  
-  setRange( 0.0, 10e10, -10.0, 10.0, -3.14, 3.14);
-  
-  pt_gen_   = nullptr;
-  eta_gen_  = nullptr;
-  phi_gen_  = nullptr;
-
-  pt_ref_   = nullptr;
-  eta_ref_  = nullptr;
-  phi_ref_  = nullptr;
-
-  deltaR_   = nullptr;
+PFCandidateMonitor::PFCandidateMonitor(float dRMax, bool matchCharge, Benchmark::Mode mode)
+    : Benchmark(mode), candBench_(mode), matchCandBench_(mode), dRMax_(dRMax), matchCharge_(matchCharge) {
+  setRange(0.0, 10e10, -10.0, 10.0, -3.14, 3.14);
+
+  pt_gen_ = nullptr;
+  eta_gen_ = nullptr;
+  phi_gen_ = nullptr;
+
+  pt_ref_ = nullptr;
+  eta_ref_ = nullptr;
+  phi_ref_ = nullptr;
+
+  deltaR_ = nullptr;
 
   createReferenceHistos_ = false;
   histogramBooked_ = false;
-}  
-
+}
 
 //
 // -- Destructor
 //
 PFCandidateMonitor::~PFCandidateMonitor() {}
 
-
 //
 // -- Set Parameters accessing them from ParameterSet
 //
-void PFCandidateMonitor::setParameters( const edm::ParameterSet & parameterSet) {
-
-  dRMax_                  = parameterSet.getParameter<double>( "deltaRMax" );
-  matchCharge_            = parameterSet.getParameter<bool>( "matchCharge" );
-  mode_                   = (Benchmark::Mode) parameterSet.getParameter<int>( "mode" );
-  createReferenceHistos_  = parameterSet.getParameter<bool>( "CreateReferenceHistos" );
-  createEfficiencyHistos_ = parameterSet.getParameter<bool>( "CreateEfficiencyHistos" );
-  
-  setRange( parameterSet.getParameter<double>("ptMin"),
-	    parameterSet.getParameter<double>("ptMax"),
-	    parameterSet.getParameter<double>("etaMin"),
-	    parameterSet.getParameter<double>("etaMax"),
-	    parameterSet.getParameter<double>("phiMin"),
-	    parameterSet.getParameter<double>("phiMax") );
+void PFCandidateMonitor::setParameters(const edm::ParameterSet &parameterSet) {
+  dRMax_ = parameterSet.getParameter<double>("deltaRMax");
+  matchCharge_ = parameterSet.getParameter<bool>("matchCharge");
+  mode_ = (Benchmark::Mode)parameterSet.getParameter<int>("mode");
+  createReferenceHistos_ = parameterSet.getParameter<bool>("CreateReferenceHistos");
+  createEfficiencyHistos_ = parameterSet.getParameter<bool>("CreateEfficiencyHistos");
+
+  setRange(parameterSet.getParameter<double>("ptMin"),
+           parameterSet.getParameter<double>("ptMax"),
+           parameterSet.getParameter<double>("etaMin"),
+           parameterSet.getParameter<double>("etaMax"),
+           parameterSet.getParameter<double>("phiMin"),
+           parameterSet.getParameter<double>("phiMax"));
 
   candBench_.setParameters(mode_);
   matchCandBench_.setParameters(mode_);
 }
 
-
-//
-// -- Set Parameters 
 //
-void PFCandidateMonitor::setParameters(float dRMax, bool matchCharge, Benchmark::Mode mode,
-				 float ptmin, float ptmax, float etamin, float etamax, 
-				 float phimin, float phimax, bool refHistoFlag) {
-  dRMax_                 = dRMax;
-  matchCharge_           = matchCharge;
-  mode_                  = mode;
+// -- Set Parameters
+//
+void PFCandidateMonitor::setParameters(float dRMax,
+                                       bool matchCharge,
+                                       Benchmark::Mode mode,
+                                       float ptmin,
+                                       float ptmax,
+                                       float etamin,
+                                       float etamax,
+                                       float phimin,
+                                       float phimax,
+                                       bool refHistoFlag) {
+  dRMax_ = dRMax;
+  matchCharge_ = matchCharge;
+  mode_ = mode;
   createReferenceHistos_ = refHistoFlag;
-  
-  setRange( ptmin, ptmax, etamin, etamax, phimin, phimax );
+
+  setRange(ptmin, ptmax, etamin, etamax, phimin, phimax);
 
   candBench_.setParameters(mode_);
   matchCandBench_.setParameters(mode_);
 }
 
-
 //
 // -- Create histograms accessing parameters from ParameterSet
 //
-void PFCandidateMonitor::setup(DQMStore::IBooker& b, const edm::ParameterSet & parameterSet) {
+void PFCandidateMonitor::setup(DQMStore::IBooker &b, const edm::ParameterSet &parameterSet) {
   candBench_.setup(b, parameterSet);
   matchCandBench_.setup(b, parameterSet);
 
   if (createReferenceHistos_ && !histogramBooked_) {
-    edm::ParameterSet ptPS  = parameterSet.getParameter<edm::ParameterSet>("PtHistoParameter");
+    edm::ParameterSet ptPS = parameterSet.getParameter<edm::ParameterSet>("PtHistoParameter");
     edm::ParameterSet etaPS = parameterSet.getParameter<edm::ParameterSet>("EtaHistoParameter");
     edm::ParameterSet phiPS = parameterSet.getParameter<edm::ParameterSet>("PhiHistoParameter");
 
     edm::ParameterSet dR = parameterSet.getParameter<edm::ParameterSet>("DeltaRHistoParameter");
 
     if (ptPS.getParameter<bool>("switchOn")) {
-      pt_ref_ = book1D(b, "pt_ref_", "p_{T}_ref;p_{T} (GeV)", ptPS.getParameter<int32_t>("nBin"), 
-		       ptPS.getParameter<double>("xMin"),
-		       ptPS.getParameter<double>("xMax"));
+      pt_ref_ = book1D(b,
+                       "pt_ref_",
+                       "p_{T}_ref;p_{T} (GeV)",
+                       ptPS.getParameter<int32_t>("nBin"),
+                       ptPS.getParameter<double>("xMin"),
+                       ptPS.getParameter<double>("xMax"));
       if (createEfficiencyHistos_) {
-	pt_gen_ = book1D(b, "pt_gen_", "p_{T}_gen;p_{T} (GeV)", ptPS.getParameter<int32_t>("nBin"), 
-			 ptPS.getParameter<double>("xMin"),
-			 ptPS.getParameter<double>("xMax") ) ;
+        pt_gen_ = book1D(b,
+                         "pt_gen_",
+                         "p_{T}_gen;p_{T} (GeV)",
+                         ptPS.getParameter<int32_t>("nBin"),
+                         ptPS.getParameter<double>("xMin"),
+                         ptPS.getParameter<double>("xMax"));
       }
-    } 
-    
+    }
+
     if (etaPS.getParameter<bool>("switchOn")) {
-      eta_ref_ = book1D(b, "eta_ref_", "#eta_ref;#eta", etaPS.getParameter<int32_t>("nBin"), 
-			etaPS.getParameter<double>("xMin"),
-			etaPS.getParameter<double>("xMax"));
+      eta_ref_ = book1D(b,
+                        "eta_ref_",
+                        "#eta_ref;#eta",
+                        etaPS.getParameter<int32_t>("nBin"),
+                        etaPS.getParameter<double>("xMin"),
+                        etaPS.getParameter<double>("xMax"));
       if (createEfficiencyHistos_) {
-	eta_gen_ = book1D(b, "eta_gen_", "#eta_gen;#eta", etaPS.getParameter<int32_t>("nBin"), 
-			  etaPS.getParameter<double>("xMin"),
-			  etaPS.getParameter<double>("xMax") ) ;
+        eta_gen_ = book1D(b,
+                          "eta_gen_",
+                          "#eta_gen;#eta",
+                          etaPS.getParameter<int32_t>("nBin"),
+                          etaPS.getParameter<double>("xMin"),
+                          etaPS.getParameter<double>("xMax"));
       }
     }
 
     if (phiPS.getParameter<bool>("switchOn")) {
-      phi_ref_ = book1D(b, "phi_ref_", "#phi_ref;#phi", phiPS.getParameter<int32_t>("nBin"), 
-			phiPS.getParameter<double>("xMin"),
-			phiPS.getParameter<double>("xMax"));
+      phi_ref_ = book1D(b,
+                        "phi_ref_",
+                        "#phi_ref;#phi",
+                        phiPS.getParameter<int32_t>("nBin"),
+                        phiPS.getParameter<double>("xMin"),
+                        phiPS.getParameter<double>("xMax"));
       if (createEfficiencyHistos_) {
-	phi_gen_ = book1D(b, "phi_gen_", "#phi_gen;#phi", phiPS.getParameter<int32_t>("nBin"), 
-			  phiPS.getParameter<double>("xMin"),
-			  phiPS.getParameter<double>("xMax") ) ;
+        phi_gen_ = book1D(b,
+                          "phi_gen_",
+                          "#phi_gen;#phi",
+                          phiPS.getParameter<int32_t>("nBin"),
+                          phiPS.getParameter<double>("xMin"),
+                          phiPS.getParameter<double>("xMax"));
       }
     }
 
-    if ( createEfficiencyHistos_ && dR.getParameter<bool>("switchOn") ) { 
-      deltaR_ = book1D(b, "deltaR_", "#DeltaR;#DeltaR",
-		       dR.getParameter<int32_t>("nBin"), 
-		       dR.getParameter<double>("xMin"),
-		       dR.getParameter<double>("xMax"));
+    if (createEfficiencyHistos_ && dR.getParameter<bool>("switchOn")) {
+      deltaR_ = book1D(b,
+                       "deltaR_",
+                       "#DeltaR;#DeltaR",
+                       dR.getParameter<int32_t>("nBin"),
+                       dR.getParameter<double>("xMin"),
+                       dR.getParameter<double>("xMax"));
     }
 
-    histogramBooked_ = true;   
+    histogramBooked_ = true;
   }
 }
 
-
 //
 // -- Create histograms using local parameters
 //
-void PFCandidateMonitor::setup(DQMStore::IBooker& b) {
+void PFCandidateMonitor::setup(DQMStore::IBooker &b) {
   candBench_.setup(b);
   matchCandBench_.setup(b);
 
   if (createReferenceHistos_ && !histogramBooked_) {
-    PhaseSpace ptPS(100,0,100);
+    PhaseSpace ptPS(100, 0, 100);
     PhaseSpace phiPS(360, -3.1416, 3.1416);
-    PhaseSpace etaPS(100, -5,5);
-    
+    PhaseSpace etaPS(100, -5, 5);
+
     pt_ref_ = book1D(b, "pt_ref_", "p_{T}_ref;p_{T} (GeV)", ptPS.n, ptPS.m, ptPS.M);
     if (createEfficiencyHistos_) {
       pt_gen_ = book1D(b, "pt_gen_", "p_{T}_gen;p_{T} (GeV)", ptPS.n, ptPS.m, ptPS.M);
@@ -174,33 +189,35 @@ void PFCandidateMonitor::setup(DQMStore::IBooker& b) {
   }
 }
 
-
 //
 // -- Set directory to book histograms using ROOT
 //
-void PFCandidateMonitor::setDirectory(TDirectory* dir) {
+void PFCandidateMonitor::setDirectory(TDirectory *dir) {
   Benchmark::setDirectory(dir);
 
   candBench_.setDirectory(dir);
   matchCandBench_.setDirectory(dir);
 }
 
-
 //
 // -- fill histograms for a single collection
 //
-void PFCandidateMonitor::fillOne(const reco::Candidate& cand) {
-
+void PFCandidateMonitor::fillOne(const reco::Candidate &cand) {
   if (matching_done_) {
     if (createReferenceHistos_ && histogramBooked_) {
-      if (pt_ref_) pt_ref_->Fill( cand.pt() );
-      if (eta_ref_) eta_ref_->Fill( cand.eta() );
-      if (phi_ref_) phi_ref_->Fill( cand.phi() );
+      if (pt_ref_)
+        pt_ref_->Fill(cand.pt());
+      if (eta_ref_)
+        eta_ref_->Fill(cand.eta());
+      if (phi_ref_)
+        phi_ref_->Fill(cand.phi());
     }
   } else if (createEfficiencyHistos_ && histogramBooked_) {
-    if (pt_gen_) pt_gen_->Fill( cand.pt() );
-    if (eta_gen_) eta_gen_->Fill( cand.eta() );
-    if (phi_gen_) phi_gen_->Fill( cand.phi() );
+    if (pt_gen_)
+      pt_gen_->Fill(cand.pt());
+    if (eta_gen_)
+      eta_gen_->Fill(cand.eta());
+    if (phi_gen_)
+      phi_gen_->Fill(cand.phi());
   }
-
 }
diff --git a/DQMOffline/PFTau/src/PFJetMonitor.cc b/DQMOffline/PFTau/src/PFJetMonitor.cc
index 242b4a7ba1500..b94bec358cda1 100644
--- a/DQMOffline/PFTau/src/PFJetMonitor.cc
+++ b/DQMOffline/PFTau/src/PFJetMonitor.cc
@@ -1,174 +1,211 @@
+#include "DQMOffline/PFTau/interface/Matchers.h"
+#include "DQMOffline/PFTau/interface/PFJetMonitor.h"
 #include "DataFormats/JetReco/interface/Jet.h"
 #include "DataFormats/JetReco/interface/PFJet.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DQMOffline/PFTau/interface/Matchers.h"
-#include "DQMOffline/PFTau/interface/PFJetMonitor.h"
 
-#include <TROOT.h>
 #include <TFile.h>
 #include <TH1.h>
 #include <TH2.h>
-
+#include <TROOT.h>
 
 //
 // -- Constructor
 //
-PFJetMonitor::PFJetMonitor( float dRMax, bool matchCharge, Benchmark::Mode mode) : 
-  Benchmark(mode), 
-  candBench_(mode), 
-  matchCandBench_(mode), 
-  dRMax_(dRMax), 
-  matchCharge_(matchCharge) {
-  
-  setRange( 0.0, 10e10, -10.0, 10.0, -3.14, 3.14);
-  
-  delta_frac_VS_frac_muon_           = nullptr;
-  delta_frac_VS_frac_photon_         = nullptr;
-  delta_frac_VS_frac_electron_       = nullptr;
+PFJetMonitor::PFJetMonitor(float dRMax, bool matchCharge, Benchmark::Mode mode)
+    : Benchmark(mode), candBench_(mode), matchCandBench_(mode), dRMax_(dRMax), matchCharge_(matchCharge) {
+  setRange(0.0, 10e10, -10.0, 10.0, -3.14, 3.14);
+
+  delta_frac_VS_frac_muon_ = nullptr;
+  delta_frac_VS_frac_photon_ = nullptr;
+  delta_frac_VS_frac_electron_ = nullptr;
   delta_frac_VS_frac_charged_hadron_ = nullptr;
   delta_frac_VS_frac_neutral_hadron_ = nullptr;
 
-  deltaR_   = nullptr;
+  deltaR_ = nullptr;
 
   createPFractionHistos_ = false;
   histogramBooked_ = false;
 }
 
-
 //
 // -- Destructor
 //
 PFJetMonitor::~PFJetMonitor() {}
 
-
 //
 // -- Set Parameters accessing them from ParameterSet
 //
-void PFJetMonitor::setParameters( const edm::ParameterSet & parameterSet) {
-
-  dRMax_                 = parameterSet.getParameter<double>( "deltaRMax" );
-  onlyTwoJets_           = parameterSet.getParameter<bool>( "onlyTwoJets" );
-  matchCharge_           = parameterSet.getParameter<bool>( "matchCharge" );
-  mode_                  = (Benchmark::Mode) parameterSet.getParameter<int>( "mode" );
-  createPFractionHistos_ = parameterSet.getParameter<bool>( "CreatePFractionHistos" );
-  
-  setRange( parameterSet.getParameter<double>("ptMin"),
-	    parameterSet.getParameter<double>("ptMax"),
-	    parameterSet.getParameter<double>("etaMin"),
-	    parameterSet.getParameter<double>("etaMax"),
-	    parameterSet.getParameter<double>("phiMin"),
-	    parameterSet.getParameter<double>("phiMax") );
+void PFJetMonitor::setParameters(const edm::ParameterSet &parameterSet) {
+  dRMax_ = parameterSet.getParameter<double>("deltaRMax");
+  onlyTwoJets_ = parameterSet.getParameter<bool>("onlyTwoJets");
+  matchCharge_ = parameterSet.getParameter<bool>("matchCharge");
+  mode_ = (Benchmark::Mode)parameterSet.getParameter<int>("mode");
+  createPFractionHistos_ = parameterSet.getParameter<bool>("CreatePFractionHistos");
+
+  setRange(parameterSet.getParameter<double>("ptMin"),
+           parameterSet.getParameter<double>("ptMax"),
+           parameterSet.getParameter<double>("etaMin"),
+           parameterSet.getParameter<double>("etaMax"),
+           parameterSet.getParameter<double>("phiMin"),
+           parameterSet.getParameter<double>("phiMax"));
 
   candBench_.setParameters(mode_);
   matchCandBench_.setParameters(mode_);
 }
 
-
-//
-// -- Set Parameters 
 //
-void PFJetMonitor::setParameters(float dRMax, bool matchCharge, Benchmark::Mode mode,
-				 float ptmin, float ptmax, float etamin, float etamax, 
-				 float phimin, float phimax, bool fracHistoFlag) {
-  dRMax_                 = dRMax;
-  matchCharge_           = matchCharge;
-  mode_                  = mode;
+// -- Set Parameters
+//
+void PFJetMonitor::setParameters(float dRMax,
+                                 bool matchCharge,
+                                 Benchmark::Mode mode,
+                                 float ptmin,
+                                 float ptmax,
+                                 float etamin,
+                                 float etamax,
+                                 float phimin,
+                                 float phimax,
+                                 bool fracHistoFlag) {
+  dRMax_ = dRMax;
+  matchCharge_ = matchCharge;
+  mode_ = mode;
   createPFractionHistos_ = fracHistoFlag;
-  
-  setRange( ptmin, ptmax, etamin, etamax, phimin, phimax );
-  
+
+  setRange(ptmin, ptmax, etamin, etamax, phimin, phimax);
+
   candBench_.setParameters(mode_);
-  matchCandBench_.setParameters(mode_); 
+  matchCandBench_.setParameters(mode_);
 }
 
-
-void PFJetMonitor::setParameters(float dRMax, bool onlyTwoJets, bool matchCharge, Benchmark::Mode mode,
-				 float ptmin, float ptmax, float etamin, float etamax, 
-				 float phimin, float phimax, bool fracHistoFlag) {
-  dRMax_                 = dRMax;
-  onlyTwoJets_           = onlyTwoJets;
-  matchCharge_           = matchCharge;
-  mode_                  = mode;
+void PFJetMonitor::setParameters(float dRMax,
+                                 bool onlyTwoJets,
+                                 bool matchCharge,
+                                 Benchmark::Mode mode,
+                                 float ptmin,
+                                 float ptmax,
+                                 float etamin,
+                                 float etamax,
+                                 float phimin,
+                                 float phimax,
+                                 bool fracHistoFlag) {
+  dRMax_ = dRMax;
+  onlyTwoJets_ = onlyTwoJets;
+  matchCharge_ = matchCharge;
+  mode_ = mode;
   createPFractionHistos_ = fracHistoFlag;
-  
-  setRange( ptmin, ptmax, etamin, etamax, phimin, phimax );
+
+  setRange(ptmin, ptmax, etamin, etamax, phimin, phimax);
 
   candBench_.setParameters(mode_);
   matchCandBench_.setParameters(mode_);
 }
 
-
 //
 // -- Create histograms accessing parameters from ParameterSet
 //
-void PFJetMonitor::setup(DQMStore::IBooker& b, const edm::ParameterSet & parameterSet) {
+void PFJetMonitor::setup(DQMStore::IBooker &b, const edm::ParameterSet &parameterSet) {
   candBench_.setup(b, parameterSet);
   matchCandBench_.setup(b, parameterSet);
 
   edm::ParameterSet dR = parameterSet.getParameter<edm::ParameterSet>("DeltaRHistoParameter");
-  if ( dR.getParameter<bool>("switchOn") ) {
-    deltaR_ = book1D(b, "deltaR_", "#DeltaR;#DeltaR",
-		     dR.getParameter<int32_t>("nBin"), 
-		     dR.getParameter<double>("xMin"),
-		     dR.getParameter<double>("xMax"));
+  if (dR.getParameter<bool>("switchOn")) {
+    deltaR_ = book1D(b,
+                     "deltaR_",
+                     "#DeltaR;#DeltaR",
+                     dR.getParameter<int32_t>("nBin"),
+                     dR.getParameter<double>("xMin"),
+                     dR.getParameter<double>("xMax"));
   }
   if (createPFractionHistos_ && !histogramBooked_) {
-    delta_frac_VS_frac_muon_ = book2D(b, "delta_frac_VS_frac_muon_", "#DeltaFraction_Vs_Fraction(muon)", 100, 0.0, 1.0, 100, -1.0, 1.0);
-    delta_frac_VS_frac_photon_ = book2D(b, "delta_frac_VS_frac_photon_", "#DeltaFraction_Vs_Fraction(photon)", 100, 0.0, 1.0, 100, -1.0, 1.0);
-    delta_frac_VS_frac_electron_ = book2D(b, "delta_frac_VS_frac_electron_", "#DeltaFraction_Vs_Fraction(electron)", 100, 0.0, 1.0, 100, -1.0, 1.0);
-    delta_frac_VS_frac_charged_hadron_ = book2D(b, "delta_frac_VS_frac_charged_hadron_", "#DeltaFraction_Vs_Fraction(charged hadron)", 100, 0.0, 1.0, 100, -1.0, 1.0);
-    delta_frac_VS_frac_neutral_hadron_ = book2D(b, "delta_frac_VS_frac_neutral_hadron_", "#DeltaFraction_Vs_Fraction(neutral hadron)", 100, 0.0, 1.0, 100, -1.0, 1.0);
+    delta_frac_VS_frac_muon_ =
+        book2D(b, "delta_frac_VS_frac_muon_", "#DeltaFraction_Vs_Fraction(muon)", 100, 0.0, 1.0, 100, -1.0, 1.0);
+    delta_frac_VS_frac_photon_ =
+        book2D(b, "delta_frac_VS_frac_photon_", "#DeltaFraction_Vs_Fraction(photon)", 100, 0.0, 1.0, 100, -1.0, 1.0);
+    delta_frac_VS_frac_electron_ = book2D(
+        b, "delta_frac_VS_frac_electron_", "#DeltaFraction_Vs_Fraction(electron)", 100, 0.0, 1.0, 100, -1.0, 1.0);
+    delta_frac_VS_frac_charged_hadron_ = book2D(b,
+                                                "delta_frac_VS_frac_charged_hadron_",
+                                                "#DeltaFraction_Vs_Fraction(charged hadron)",
+                                                100,
+                                                0.0,
+                                                1.0,
+                                                100,
+                                                -1.0,
+                                                1.0);
+    delta_frac_VS_frac_neutral_hadron_ = book2D(b,
+                                                "delta_frac_VS_frac_neutral_hadron_",
+                                                "#DeltaFraction_Vs_Fraction(neutral hadron)",
+                                                100,
+                                                0.0,
+                                                1.0,
+                                                100,
+                                                -1.0,
+                                                1.0);
 
     histogramBooked_ = true;
   }
 }
 
-
 //
 // -- Create histograms using local parameters
 //
-void PFJetMonitor::setup(DQMStore::IBooker& b) {
+void PFJetMonitor::setup(DQMStore::IBooker &b) {
   candBench_.setup(b);
   matchCandBench_.setup(b);
 
   if (createPFractionHistos_ && !histogramBooked_) {
-    delta_frac_VS_frac_muon_ = book2D(b, "delta_frac_VS_frac_muon_", "#DeltaFraction_Vs_Fraction(muon)", 100, 0.0, 1.0, 100, -1.0, 1.0);
-    delta_frac_VS_frac_photon_ = book2D(b, "delta_frac_VS_frac_photon_", "#DeltaFraction_Vs_Fraction(photon)", 100, 0.0, 1.0, 100, -1.0, 1.0);
-    delta_frac_VS_frac_electron_ = book2D(b, "delta_frac_VS_frac_electron_", "#DeltaFraction_Vs_Fraction(electron)", 100, 0.0, 1.0, 100, -1.0, 1.0);
-    delta_frac_VS_frac_charged_hadron_ = book2D(b, "delta_frac_VS_frac_charged_hadron_", "#DeltaFraction_Vs_Fraction(charged hadron)", 100, 0.0, 1.0, 100, -1.0, 1.0);
-    delta_frac_VS_frac_neutral_hadron_ = book2D(b, "delta_frac_VS_frac_neutral_hadron_", "#DeltaFraction_Vs_Fraction(neutral hadron)", 100, 0.0, 1.0, 100, -1.0, 1.0);
+    delta_frac_VS_frac_muon_ =
+        book2D(b, "delta_frac_VS_frac_muon_", "#DeltaFraction_Vs_Fraction(muon)", 100, 0.0, 1.0, 100, -1.0, 1.0);
+    delta_frac_VS_frac_photon_ =
+        book2D(b, "delta_frac_VS_frac_photon_", "#DeltaFraction_Vs_Fraction(photon)", 100, 0.0, 1.0, 100, -1.0, 1.0);
+    delta_frac_VS_frac_electron_ = book2D(
+        b, "delta_frac_VS_frac_electron_", "#DeltaFraction_Vs_Fraction(electron)", 100, 0.0, 1.0, 100, -1.0, 1.0);
+    delta_frac_VS_frac_charged_hadron_ = book2D(b,
+                                                "delta_frac_VS_frac_charged_hadron_",
+                                                "#DeltaFraction_Vs_Fraction(charged hadron)",
+                                                100,
+                                                0.0,
+                                                1.0,
+                                                100,
+                                                -1.0,
+                                                1.0);
+    delta_frac_VS_frac_neutral_hadron_ = book2D(b,
+                                                "delta_frac_VS_frac_neutral_hadron_",
+                                                "#DeltaFraction_Vs_Fraction(neutral hadron)",
+                                                100,
+                                                0.0,
+                                                1.0,
+                                                100,
+                                                -1.0,
+                                                1.0);
 
     histogramBooked_ = true;
   }
-
 }
 
-
 //
 // -- Set directory to book histograms using ROOT
 //
 
-void PFJetMonitor::setDirectory(TDirectory* dir) {
+void PFJetMonitor::setDirectory(TDirectory *dir) {
   Benchmark::setDirectory(dir);
 
   candBench_.setDirectory(dir);
   matchCandBench_.setDirectory(dir);
 }
 
-
 //
 // -- fill histograms for a given Jet pair
 //
-void PFJetMonitor::fillOne(const reco::Jet& jet,
-			const reco::Jet& matchedJet) {
-
-  const reco::PFJet* pfJet = dynamic_cast<const reco::PFJet*>(&jet);
-  const reco::PFJet* pfMatchedJet = dynamic_cast<const reco::PFJet*>(&matchedJet);
+void PFJetMonitor::fillOne(const reco::Jet &jet, const reco::Jet &matchedJet) {
+  const reco::PFJet *pfJet = dynamic_cast<const reco::PFJet *>(&jet);
+  const reco::PFJet *pfMatchedJet = dynamic_cast<const reco::PFJet *>(&matchedJet);
   if (pfJet && pfMatchedJet && createPFractionHistos_) {
-    float del_frac_muon    = -99.9;
-    float del_frac_elec    = -99.9; 
-    float del_frac_phot    = -99.9;
-    float del_frac_ch_had  = -99.9;
+    float del_frac_muon = -99.9;
+    float del_frac_elec = -99.9;
+    float del_frac_phot = -99.9;
+    float del_frac_ch_had = -99.9;
     float del_frac_neu_had = -99.9;
 
     int mult_muon = pfMatchedJet->muonMultiplicity();
@@ -176,12 +213,17 @@ void PFJetMonitor::fillOne(const reco::Jet& jet,
     int mult_phot = pfMatchedJet->photonMultiplicity();
     int mult_ch_had = pfMatchedJet->chargedHadronMultiplicity();
     int mult_neu_had = pfMatchedJet->neutralHadronMultiplicity();
- 
-    if (mult_muon > 0)     del_frac_muon = (pfJet->muonMultiplicity() - mult_muon)*1.0/mult_muon; 
-    if (mult_elec > 0)     del_frac_elec = (pfJet->electronMultiplicity() - mult_elec)*1.0/mult_elec; 
-    if (mult_phot > 0)     del_frac_phot = (pfJet->photonMultiplicity() - mult_phot)*1.0/mult_phot; 
-    if (mult_ch_had > 0)   del_frac_ch_had = (pfJet->chargedHadronMultiplicity() - mult_ch_had)*1.0/mult_ch_had; 
-    if (mult_neu_had > 0)  del_frac_neu_had = (pfJet->neutralHadronMultiplicity() - mult_neu_had)*1.0/mult_neu_had; 
+
+    if (mult_muon > 0)
+      del_frac_muon = (pfJet->muonMultiplicity() - mult_muon) * 1.0 / mult_muon;
+    if (mult_elec > 0)
+      del_frac_elec = (pfJet->electronMultiplicity() - mult_elec) * 1.0 / mult_elec;
+    if (mult_phot > 0)
+      del_frac_phot = (pfJet->photonMultiplicity() - mult_phot) * 1.0 / mult_phot;
+    if (mult_ch_had > 0)
+      del_frac_ch_had = (pfJet->chargedHadronMultiplicity() - mult_ch_had) * 1.0 / mult_ch_had;
+    if (mult_neu_had > 0)
+      del_frac_neu_had = (pfJet->neutralHadronMultiplicity() - mult_neu_had) * 1.0 / mult_neu_had;
 
     delta_frac_VS_frac_muon_->Fill(mult_muon, del_frac_muon);
     delta_frac_VS_frac_electron_->Fill(mult_elec, del_frac_elec);
@@ -190,4 +232,3 @@ void PFJetMonitor::fillOne(const reco::Jet& jet,
     delta_frac_VS_frac_neutral_hadron_->Fill(mult_neu_had, del_frac_neu_had);
   }
 }
-
diff --git a/DQMOffline/PFTau/src/PFMETMonitor.cc b/DQMOffline/PFTau/src/PFMETMonitor.cc
index 317c749da2e1d..f06ce95e66c4f 100644
--- a/DQMOffline/PFTau/src/PFMETMonitor.cc
+++ b/DQMOffline/PFTau/src/PFMETMonitor.cc
@@ -1,32 +1,27 @@
+#include "DQMOffline/PFTau/interface/Matchers.h"
 #include "DataFormats/METReco/interface/MET.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DQMOffline/PFTau/interface/Matchers.h"
 
 #include "DQMOffline/PFTau/interface/PFMETMonitor.h"
 
-#include <TROOT.h>
 #include <TFile.h>
 #include <TH1.h>
 #include <TH2.h>
+#include <TROOT.h>
 
 #include <TProfile.h>
 
-
 //
 // -- Constructor
 //
-PFMETMonitor::PFMETMonitor( Benchmark::Mode mode) : 
-   Benchmark(mode), 
-   candBench_(mode), 
-   matchCandBench_(mode) {
-
-  setRange( 0.0, 10e10, -10.0, 10.0, -3.14, 3.14);
-
-  px_                        = nullptr;
-  sumEt_                     = nullptr;
-  delta_ex_                  = nullptr;
-  delta_ex_VS_set_           = nullptr;
-  delta_set_VS_set_          = nullptr;
+PFMETMonitor::PFMETMonitor(Benchmark::Mode mode) : Benchmark(mode), candBench_(mode), matchCandBench_(mode) {
+  setRange(0.0, 10e10, -10.0, 10.0, -3.14, 3.14);
+
+  px_ = nullptr;
+  sumEt_ = nullptr;
+  delta_ex_ = nullptr;
+  delta_ex_VS_set_ = nullptr;
+  delta_set_VS_set_ = nullptr;
   delta_set_Over_set_VS_set_ = nullptr;
 
   profile_delta_ex_VS_set_ = nullptr;
@@ -35,269 +30,343 @@ PFMETMonitor::PFMETMonitor( Benchmark::Mode mode) :
   profileRMS_delta_ex_VS_set_ = nullptr;
   profileRMS_delta_set_VS_set_ = nullptr;
   profileRMS_delta_set_Over_set_VS_set_ = nullptr;
-  
+
   createMETSpecificHistos_ = false;
   histogramBooked_ = false;
-} 
-
+}
 
 //
 // -- Destructor
 //
 PFMETMonitor::~PFMETMonitor() {}
 
-
 //
 // -- Set Parameters accessing them from ParameterSet
 //
-void PFMETMonitor::setParameters( const edm::ParameterSet & parameterSet) {
-  
-  mode_           = (Benchmark::Mode) parameterSet.getParameter<int>( "mode" );
-  createMETSpecificHistos_ = parameterSet.getParameter<bool>( "CreateMETSpecificHistos" );
-  setRange( parameterSet.getParameter<double>("ptMin"),
-	    parameterSet.getParameter<double>("ptMax"),
-	    parameterSet.getParameter<double>("etaMin"),
-	    parameterSet.getParameter<double>("etaMax"),
-	    parameterSet.getParameter<double>("phiMin"),
-	    parameterSet.getParameter<double>("phiMax") );
-
+void PFMETMonitor::setParameters(const edm::ParameterSet &parameterSet) {
+  mode_ = (Benchmark::Mode)parameterSet.getParameter<int>("mode");
+  createMETSpecificHistos_ = parameterSet.getParameter<bool>("CreateMETSpecificHistos");
+  setRange(parameterSet.getParameter<double>("ptMin"),
+           parameterSet.getParameter<double>("ptMax"),
+           parameterSet.getParameter<double>("etaMin"),
+           parameterSet.getParameter<double>("etaMax"),
+           parameterSet.getParameter<double>("phiMin"),
+           parameterSet.getParameter<double>("phiMax"));
 
   candBench_.setParameters(mode_);
   matchCandBench_.setParameters(mode_);
 }
 
-
 //
-// -- Set Parameters 
+// -- Set Parameters
 //
-void PFMETMonitor::setParameters(Benchmark::Mode mode, float ptmin, float ptmax, 
-                       float etamin, float etamax, float phimin, 
-				 float phimax, bool metSpHistos) {
-  mode_           = mode;
+void PFMETMonitor::setParameters(Benchmark::Mode mode,
+                                 float ptmin,
+                                 float ptmax,
+                                 float etamin,
+                                 float etamax,
+                                 float phimin,
+                                 float phimax,
+                                 bool metSpHistos) {
+  mode_ = mode;
   createMETSpecificHistos_ = metSpHistos;
 
-  setRange( ptmin, ptmax, etamin, etamax, phimin, phimax);
+  setRange(ptmin, ptmax, etamin, etamax, phimin, phimax);
 
   candBench_.setParameters(mode_);
-  matchCandBench_.setParameters(mode_);  
+  matchCandBench_.setParameters(mode_);
 }
 
-
 //
 // -- Create histograms accessing parameters from ParameterSet
 //
-void PFMETMonitor::setup(DQMStore::IBooker& b, const edm::ParameterSet & parameterSet) {
+void PFMETMonitor::setup(DQMStore::IBooker &b, const edm::ParameterSet &parameterSet) {
   candBench_.setup(b, parameterSet);
   matchCandBench_.setup(b, parameterSet);
 
   if (createMETSpecificHistos_ && !histogramBooked_) {
-
-    edm::ParameterSet pxPS      = parameterSet.getParameter<edm::ParameterSet>("DeltaPxHistoParameter");
-    edm::ParameterSet dpxPS      = parameterSet.getParameter<edm::ParameterSet>("DeltaPxHistoParameter");
-    edm::ParameterSet dptPS      = parameterSet.getParameter<edm::ParameterSet>("DeltaPtHistoParameter");
-    edm::ParameterSet setPS      = parameterSet.getParameter<edm::ParameterSet>("SumEtHistoParameter");
-    edm::ParameterSet dsetPS     = parameterSet.getParameter<edm::ParameterSet>("DeltaSumEtHistoParameter");
+    edm::ParameterSet pxPS = parameterSet.getParameter<edm::ParameterSet>("DeltaPxHistoParameter");
+    edm::ParameterSet dpxPS = parameterSet.getParameter<edm::ParameterSet>("DeltaPxHistoParameter");
+    edm::ParameterSet dptPS = parameterSet.getParameter<edm::ParameterSet>("DeltaPtHistoParameter");
+    edm::ParameterSet setPS = parameterSet.getParameter<edm::ParameterSet>("SumEtHistoParameter");
+    edm::ParameterSet dsetPS = parameterSet.getParameter<edm::ParameterSet>("DeltaSumEtHistoParameter");
     edm::ParameterSet setOvsetPS = parameterSet.getParameter<edm::ParameterSet>("DeltaSumEtOvSumEtHistoParameter");
-    
+
     if (pxPS.getParameter<bool>("switchOn")) {
-      px_ = book1D(b, "px_", "px_;p_{X} (GeV)",
-                     pxPS.getParameter<int32_t>("nBin"),
-                     pxPS.getParameter<double>("xMin"),
-		     pxPS.getParameter<double>("xMax"));
+      px_ = book1D(b,
+                   "px_",
+                   "px_;p_{X} (GeV)",
+                   pxPS.getParameter<int32_t>("nBin"),
+                   pxPS.getParameter<double>("xMin"),
+                   pxPS.getParameter<double>("xMax"));
     }
     if (setPS.getParameter<bool>("switchOn")) {
-      sumEt_  = book1D(b, "sumEt_", "sumEt_;#sumE_{T}",
-                     setPS.getParameter<int32_t>("nBin"),
-                     setPS.getParameter<double>("xMin"),
-		     setPS.getParameter<double>("xMax"));
+      sumEt_ = book1D(b,
+                      "sumEt_",
+                      "sumEt_;#sumE_{T}",
+                      setPS.getParameter<int32_t>("nBin"),
+                      setPS.getParameter<double>("xMin"),
+                      setPS.getParameter<double>("xMax"));
     }
     if (dpxPS.getParameter<bool>("switchOn")) {
-      delta_ex_  = book1D(b, "delta_ex_", "#DeltaME_{X}",
-                     dpxPS.getParameter<int32_t>("nBin"),
-                     dpxPS.getParameter<double>("xMin"),
-		     dpxPS.getParameter<double>("xMax"));
+      delta_ex_ = book1D(b,
+                         "delta_ex_",
+                         "#DeltaME_{X}",
+                         dpxPS.getParameter<int32_t>("nBin"),
+                         dpxPS.getParameter<double>("xMin"),
+                         dpxPS.getParameter<double>("xMax"));
     }
 
     if (dpxPS.getParameter<bool>("switchOn")) {
-      delta_ex_VS_set_ = book2D(b, "delta_ex_VS_set_", ";SE_{T, true} (GeV);#DeltaE_{X}",
-				setPS.getParameter<int32_t>("nBin"), 
-				setPS.getParameter<double>("xMin"), 
-				setPS.getParameter<double>("xMax"),                             
-				dptPS.getParameter<int32_t>("nBin"),
-				dptPS.getParameter<double>("xMin"), 
-				dptPS.getParameter<double>("xMax"));
+      delta_ex_VS_set_ = book2D(b,
+                                "delta_ex_VS_set_",
+                                ";SE_{T, true} (GeV);#DeltaE_{X}",
+                                setPS.getParameter<int32_t>("nBin"),
+                                setPS.getParameter<double>("xMin"),
+                                setPS.getParameter<double>("xMax"),
+                                dptPS.getParameter<int32_t>("nBin"),
+                                dptPS.getParameter<double>("xMin"),
+                                dptPS.getParameter<double>("xMax"));
     }
     if (dsetPS.getParameter<bool>("switchOn")) {
-      delta_set_VS_set_ = book2D(b, "delta_set_VS_set_", ";SE_{T, true} (GeV);#DeltaSE_{T}",
-				 setPS.getParameter<int32_t>("nBin"), 
-				 setPS.getParameter<double>("xMin"), 
-				 setPS.getParameter<double>("xMax"),
-				 dsetPS.getParameter<int32_t>("nBin"), 
-				 dsetPS.getParameter<double>("xMin"), 
-				 dsetPS.getParameter<double>("xMax"));
+      delta_set_VS_set_ = book2D(b,
+                                 "delta_set_VS_set_",
+                                 ";SE_{T, true} (GeV);#DeltaSE_{T}",
+                                 setPS.getParameter<int32_t>("nBin"),
+                                 setPS.getParameter<double>("xMin"),
+                                 setPS.getParameter<double>("xMax"),
+                                 dsetPS.getParameter<int32_t>("nBin"),
+                                 dsetPS.getParameter<double>("xMin"),
+                                 dsetPS.getParameter<double>("xMax"));
     }
     if (setOvsetPS.getParameter<bool>("switchOn")) {
-      delta_set_Over_set_VS_set_ = book2D(b, "delta_set_Over_set_VS_set_", ";SE_{T, true} (GeV);#DeltaSE_{T}/SE_{T}",
-					  setPS.getParameter<int32_t>("nBin"), 
-					  setPS.getParameter<double>("xMin"), 
-					  setPS.getParameter<double>("xMax"),
-					  setOvsetPS.getParameter<int32_t>("nBin"), 
-					  setOvsetPS.getParameter<double>("xMin"), 
-					  setOvsetPS.getParameter<double>("xMax"));
+      delta_set_Over_set_VS_set_ = book2D(b,
+                                          "delta_set_Over_set_VS_set_",
+                                          ";SE_{T, true} (GeV);#DeltaSE_{T}/SE_{T}",
+                                          setPS.getParameter<int32_t>("nBin"),
+                                          setPS.getParameter<double>("xMin"),
+                                          setPS.getParameter<double>("xMax"),
+                                          setOvsetPS.getParameter<int32_t>("nBin"),
+                                          setOvsetPS.getParameter<double>("xMin"),
+                                          setOvsetPS.getParameter<double>("xMax"));
     }
 
     // TProfile
     if (dpxPS.getParameter<bool>("switchOn")) {
-      profile_delta_ex_VS_set_ = bookProfile(b, "profile_delta_ex_VS_set_", ";SE_{T, true} (GeV);#DeltaE_{X}",
-					     setPS.getParameter<int32_t>("nBin"), 
-					     setPS.getParameter<double>("xMin"), 
-					     setPS.getParameter<double>("xMax"),                             
-					     dptPS.getParameter<double>("xMin"), 
-					     dptPS.getParameter<double>("xMax"), "" );
-      profileRMS_delta_ex_VS_set_ = bookProfile(b, "profileRMS_delta_ex_VS_set_", ";SE_{T, true} (GeV);#DeltaE_{X}",
-					     setPS.getParameter<int32_t>("nBin"), 
-					     setPS.getParameter<double>("xMin"), 
-					     setPS.getParameter<double>("xMax"),                             
-					     dptPS.getParameter<double>("xMin"), 
-					     dptPS.getParameter<double>("xMax"), "s" );
+      profile_delta_ex_VS_set_ = bookProfile(b,
+                                             "profile_delta_ex_VS_set_",
+                                             ";SE_{T, true} (GeV);#DeltaE_{X}",
+                                             setPS.getParameter<int32_t>("nBin"),
+                                             setPS.getParameter<double>("xMin"),
+                                             setPS.getParameter<double>("xMax"),
+                                             dptPS.getParameter<double>("xMin"),
+                                             dptPS.getParameter<double>("xMax"),
+                                             "");
+      profileRMS_delta_ex_VS_set_ = bookProfile(b,
+                                                "profileRMS_delta_ex_VS_set_",
+                                                ";SE_{T, true} (GeV);#DeltaE_{X}",
+                                                setPS.getParameter<int32_t>("nBin"),
+                                                setPS.getParameter<double>("xMin"),
+                                                setPS.getParameter<double>("xMax"),
+                                                dptPS.getParameter<double>("xMin"),
+                                                dptPS.getParameter<double>("xMax"),
+                                                "s");
     }
     if (dsetPS.getParameter<bool>("switchOn")) {
-      profile_delta_set_VS_set_ = bookProfile(b, "profile_delta_set_VS_set_", ";SE_{T, true} (GeV);#DeltaSE_{T}",
-					      setPS.getParameter<int32_t>("nBin"), 
-					      setPS.getParameter<double>("xMin"), 
-					      setPS.getParameter<double>("xMax"),
-					      dsetPS.getParameter<double>("xMin"), 
-					      dsetPS.getParameter<double>("xMax"), "" );
-      profileRMS_delta_set_VS_set_ = bookProfile(b, "profileRMS_delta_set_VS_set_", ";SE_{T, true} (GeV);#DeltaSE_{T}",
-					      setPS.getParameter<int32_t>("nBin"), 
-					      setPS.getParameter<double>("xMin"), 
-					      setPS.getParameter<double>("xMax"),
-					      dsetPS.getParameter<double>("xMin"), 
-					      dsetPS.getParameter<double>("xMax"), "s" );
+      profile_delta_set_VS_set_ = bookProfile(b,
+                                              "profile_delta_set_VS_set_",
+                                              ";SE_{T, true} (GeV);#DeltaSE_{T}",
+                                              setPS.getParameter<int32_t>("nBin"),
+                                              setPS.getParameter<double>("xMin"),
+                                              setPS.getParameter<double>("xMax"),
+                                              dsetPS.getParameter<double>("xMin"),
+                                              dsetPS.getParameter<double>("xMax"),
+                                              "");
+      profileRMS_delta_set_VS_set_ = bookProfile(b,
+                                                 "profileRMS_delta_set_VS_set_",
+                                                 ";SE_{T, true} (GeV);#DeltaSE_{T}",
+                                                 setPS.getParameter<int32_t>("nBin"),
+                                                 setPS.getParameter<double>("xMin"),
+                                                 setPS.getParameter<double>("xMax"),
+                                                 dsetPS.getParameter<double>("xMin"),
+                                                 dsetPS.getParameter<double>("xMax"),
+                                                 "s");
     }
     if (setOvsetPS.getParameter<bool>("switchOn")) {
-      profile_delta_set_Over_set_VS_set_ = bookProfile(b, "profile_delta_set_Over_set_VS_set_", ";SE_{T, true} (GeV);#DeltaSE_{T}/SE_{T}",
-						       setPS.getParameter<int32_t>("nBin"), 
-						       setPS.getParameter<double>("xMin"), 
-						       setPS.getParameter<double>("xMax"),
-						       setOvsetPS.getParameter<double>("xMin"), 
-						       setOvsetPS.getParameter<double>("xMax"), "" );
-      profileRMS_delta_set_Over_set_VS_set_ = bookProfile(b, "profileRMS_delta_set_Over_set_VS_set_", ";SE_{T, true} (GeV);#DeltaSE_{T}/SE_{T}",
-						       setPS.getParameter<int32_t>("nBin"), 
-						       setPS.getParameter<double>("xMin"), 
-						       setPS.getParameter<double>("xMax"),
-						       setOvsetPS.getParameter<double>("xMin"), 
-						       setOvsetPS.getParameter<double>("xMax"), "s" );
+      profile_delta_set_Over_set_VS_set_ = bookProfile(b,
+                                                       "profile_delta_set_Over_set_VS_set_",
+                                                       ";SE_{T, true} (GeV);#DeltaSE_{T}/SE_{T}",
+                                                       setPS.getParameter<int32_t>("nBin"),
+                                                       setPS.getParameter<double>("xMin"),
+                                                       setPS.getParameter<double>("xMax"),
+                                                       setOvsetPS.getParameter<double>("xMin"),
+                                                       setOvsetPS.getParameter<double>("xMax"),
+                                                       "");
+      profileRMS_delta_set_Over_set_VS_set_ = bookProfile(b,
+                                                          "profileRMS_delta_set_Over_set_VS_set_",
+                                                          ";SE_{T, true} (GeV);#DeltaSE_{T}/SE_{T}",
+                                                          setPS.getParameter<int32_t>("nBin"),
+                                                          setPS.getParameter<double>("xMin"),
+                                                          setPS.getParameter<double>("xMax"),
+                                                          setOvsetPS.getParameter<double>("xMin"),
+                                                          setOvsetPS.getParameter<double>("xMax"),
+                                                          "s");
     }
     histogramBooked_ = true;
   }
 }
 
-
 //
 // -- Create histograms using local parameters
 //
-void PFMETMonitor::setup(DQMStore::IBooker& b) {
+void PFMETMonitor::setup(DQMStore::IBooker &b) {
   candBench_.setup(b);
   matchCandBench_.setup(b);
-  
-  if (createMETSpecificHistos_ && !histogramBooked_) {
 
-    PhaseSpace pxPS       = PhaseSpace( 50, 0, 200);
-    PhaseSpace dpxPS      = PhaseSpace( 50, -500, 500);    
-    PhaseSpace setPS      = PhaseSpace( 50, 0.0, 3000);
-    PhaseSpace dsetPS     = PhaseSpace( 50, -1000.0, 1000);
-    PhaseSpace setOvsetPS = PhaseSpace( 100,0., 2.);
+  if (createMETSpecificHistos_ && !histogramBooked_) {
+    PhaseSpace pxPS = PhaseSpace(50, 0, 200);
+    PhaseSpace dpxPS = PhaseSpace(50, -500, 500);
+    PhaseSpace setPS = PhaseSpace(50, 0.0, 3000);
+    PhaseSpace dsetPS = PhaseSpace(50, -1000.0, 1000);
+    PhaseSpace setOvsetPS = PhaseSpace(100, 0., 2.);
 
-    px_  = book1D(b, "px_", "px_;p_{X} (GeV)", pxPS.n, pxPS.m, pxPS.M);
+    px_ = book1D(b, "px_", "px_;p_{X} (GeV)", pxPS.n, pxPS.m, pxPS.M);
     sumEt_ = book1D(b, "sumEt_", "sumEt_;#sumE_{T}", setPS.n, setPS.m, setPS.M);
     delta_ex_ = book1D(b, "delta_ex_", "#DeltaME_{X}", dpxPS.n, dpxPS.m, dpxPS.M);
-    delta_ex_VS_set_ = book2D(b, "delta_ex_VS_set_", ";SE_{T, true} (GeV);#DeltaE_{X}",
-			      setPS.n, setPS.m, setPS.M, 
-			      dpxPS.n, dpxPS.m, dpxPS.M );
-    delta_set_VS_set_ = book2D(b, "delta_set_VS_set_", ";SE_{T, true} (GeV);#DeltaSE_{T}",
-			       setPS.n, setPS.m, setPS.M,
-			       dsetPS.n, dsetPS.m, dsetPS.M );
-    
-    delta_set_Over_set_VS_set_ = book2D(b, "delta_set_Over_set_VS_set_", ";SE_{T, true} (GeV);#DeltaSE_{T}/SE_{T}",
-					setPS.n, setPS.m, setPS.M,
-					setOvsetPS.n, setOvsetPS.m, setOvsetPS.M );
+    delta_ex_VS_set_ = book2D(
+        b, "delta_ex_VS_set_", ";SE_{T, true} (GeV);#DeltaE_{X}", setPS.n, setPS.m, setPS.M, dpxPS.n, dpxPS.m, dpxPS.M);
+    delta_set_VS_set_ = book2D(b,
+                               "delta_set_VS_set_",
+                               ";SE_{T, true} (GeV);#DeltaSE_{T}",
+                               setPS.n,
+                               setPS.m,
+                               setPS.M,
+                               dsetPS.n,
+                               dsetPS.m,
+                               dsetPS.M);
+
+    delta_set_Over_set_VS_set_ = book2D(b,
+                                        "delta_set_Over_set_VS_set_",
+                                        ";SE_{T, true} (GeV);#DeltaSE_{T}/SE_{T}",
+                                        setPS.n,
+                                        setPS.m,
+                                        setPS.M,
+                                        setOvsetPS.n,
+                                        setOvsetPS.m,
+                                        setOvsetPS.M);
 
     // TProfile
-    profile_delta_ex_VS_set_ = bookProfile(b, "profile_delta_ex_VS_set_", ";SE_{T, true} (GeV);#DeltaE_{X}",
-					   setPS.n, setPS.m, setPS.M,
-					   setOvsetPS.m, setOvsetPS.M, ""  );
-    
-    profile_delta_set_VS_set_ = bookProfile(b, "profile_delta_set_VS_set_", ";SE_{T, true} (GeV);#DeltaSE_{T}",
-					    setPS.n, setPS.m, setPS.M,
-					    setOvsetPS.m, setOvsetPS.M, ""  );
-    					    
-    profile_delta_set_Over_set_VS_set_ = bookProfile(b, "profile_delta_set_Over_set_VS_set_", ";SE_{T, true} (GeV);#DeltaSE_{T}/SE_{T}",
-						     setPS.n, setPS.m, setPS.M,
-						     setOvsetPS.m, setOvsetPS.M, ""  );
+    profile_delta_ex_VS_set_ = bookProfile(b,
+                                           "profile_delta_ex_VS_set_",
+                                           ";SE_{T, true} (GeV);#DeltaE_{X}",
+                                           setPS.n,
+                                           setPS.m,
+                                           setPS.M,
+                                           setOvsetPS.m,
+                                           setOvsetPS.M,
+                                           "");
+
+    profile_delta_set_VS_set_ = bookProfile(b,
+                                            "profile_delta_set_VS_set_",
+                                            ";SE_{T, true} (GeV);#DeltaSE_{T}",
+                                            setPS.n,
+                                            setPS.m,
+                                            setPS.M,
+                                            setOvsetPS.m,
+                                            setOvsetPS.M,
+                                            "");
+
+    profile_delta_set_Over_set_VS_set_ = bookProfile(b,
+                                                     "profile_delta_set_Over_set_VS_set_",
+                                                     ";SE_{T, true} (GeV);#DeltaSE_{T}/SE_{T}",
+                                                     setPS.n,
+                                                     setPS.m,
+                                                     setPS.M,
+                                                     setOvsetPS.m,
+                                                     setOvsetPS.M,
+                                                     "");
 
     // TProfile RMS
-    profileRMS_delta_ex_VS_set_ = bookProfile(b, "profileRMS_delta_ex_VS_set_", ";SE_{T, true} (GeV);#DeltaE_{X}",
-					   setPS.n, setPS.m, setPS.M,
-					   setOvsetPS.m, setOvsetPS.M, "s"  );
-    
-    profileRMS_delta_set_VS_set_ = bookProfile(b, "profileRMS_delta_set_VS_set_", ";SE_{T, true} (GeV);#DeltaSE_{T}",
-					    setPS.n, setPS.m, setPS.M,
-					    setOvsetPS.m, setOvsetPS.M, "s"  );
-    					    
-    
-    profileRMS_delta_set_Over_set_VS_set_ = bookProfile(b, "profileRMS_delta_set_Over_set_VS_set_", ";SE_{T, true} (GeV);#DeltaSE_{T}/SE_{T}",
-						     setPS.n, setPS.m, setPS.M,
-						     setOvsetPS.m, setOvsetPS.M, "s"  );
+    profileRMS_delta_ex_VS_set_ = bookProfile(b,
+                                              "profileRMS_delta_ex_VS_set_",
+                                              ";SE_{T, true} (GeV);#DeltaE_{X}",
+                                              setPS.n,
+                                              setPS.m,
+                                              setPS.M,
+                                              setOvsetPS.m,
+                                              setOvsetPS.M,
+                                              "s");
+
+    profileRMS_delta_set_VS_set_ = bookProfile(b,
+                                               "profileRMS_delta_set_VS_set_",
+                                               ";SE_{T, true} (GeV);#DeltaSE_{T}",
+                                               setPS.n,
+                                               setPS.m,
+                                               setPS.M,
+                                               setOvsetPS.m,
+                                               setOvsetPS.M,
+                                               "s");
+
+    profileRMS_delta_set_Over_set_VS_set_ = bookProfile(b,
+                                                        "profileRMS_delta_set_Over_set_VS_set_",
+                                                        ";SE_{T, true} (GeV);#DeltaSE_{T}/SE_{T}",
+                                                        setPS.n,
+                                                        setPS.m,
+                                                        setPS.M,
+                                                        setOvsetPS.m,
+                                                        setOvsetPS.M,
+                                                        "s");
     histogramBooked_ = true;
   }
 }
 
-
-void PFMETMonitor::setDirectory(TDirectory* dir) {
+void PFMETMonitor::setDirectory(TDirectory *dir) {
   Benchmark::setDirectory(dir);
 
   candBench_.setDirectory(dir);
   matchCandBench_.setDirectory(dir);
 }
 
-
-void PFMETMonitor::fillOne(const reco::MET& met,
-			   const reco::MET& matchedMet, float& minVal, float& maxVal) {
-
-  candBench_.fillOne(met);  //std::cout <<"\nfillone MET candBench" <<std::endl;
-  matchCandBench_.fillOne(met, matchedMet); //std::cout <<"\nfillone MET MatchCandBench done" <<std::endl;
+void PFMETMonitor::fillOne(const reco::MET &met, const reco::MET &matchedMet, float &minVal, float &maxVal) {
+  candBench_.fillOne(met);                   // std::cout <<"\nfillone MET candBench" <<std::endl;
+  matchCandBench_.fillOne(met, matchedMet);  // std::cout <<"\nfillone MET
+                                             // MatchCandBench done" <<std::endl;
 
   if (createMETSpecificHistos_ && histogramBooked_) {
-    if( !isInRange(met.pt(), met.eta(), met.phi() ) ) return;
+    if (!isInRange(met.pt(), met.eta(), met.phi()))
+      return;
 
-    if (px_) px_->Fill(met.px());
+    if (px_)
+      px_->Fill(met.px());
     if (delta_ex_) {
-      delta_ex_->Fill( met.px() - matchedMet.px() );
-      delta_ex_->Fill( met.py() - matchedMet.py() );
+      delta_ex_->Fill(met.px() - matchedMet.px());
+      delta_ex_->Fill(met.py() - matchedMet.py());
     }
-    if (sumEt_) sumEt_->Fill( met.sumEt() );
+    if (sumEt_)
+      sumEt_->Fill(met.sumEt());
 
     if (delta_ex_VS_set_) {
-      delta_ex_VS_set_->Fill( matchedMet.sumEt(), met.px() - matchedMet.px() );
-      delta_ex_VS_set_->Fill( matchedMet.sumEt(), met.py() - matchedMet.py() );
-      profile_delta_ex_VS_set_->Fill( matchedMet.sumEt(), met.px() - matchedMet.px() );
-      profile_delta_ex_VS_set_->Fill( matchedMet.sumEt(), met.py() - matchedMet.py() );
-      profileRMS_delta_ex_VS_set_->Fill( matchedMet.sumEt(), met.px() - matchedMet.px() );
-      profileRMS_delta_ex_VS_set_->Fill( matchedMet.sumEt(), met.py() - matchedMet.py() );
+      delta_ex_VS_set_->Fill(matchedMet.sumEt(), met.px() - matchedMet.px());
+      delta_ex_VS_set_->Fill(matchedMet.sumEt(), met.py() - matchedMet.py());
+      profile_delta_ex_VS_set_->Fill(matchedMet.sumEt(), met.px() - matchedMet.px());
+      profile_delta_ex_VS_set_->Fill(matchedMet.sumEt(), met.py() - matchedMet.py());
+      profileRMS_delta_ex_VS_set_->Fill(matchedMet.sumEt(), met.px() - matchedMet.px());
+      profileRMS_delta_ex_VS_set_->Fill(matchedMet.sumEt(), met.py() - matchedMet.py());
     }
     if (delta_set_VS_set_) {
-      delta_set_VS_set_->Fill( matchedMet.sumEt(), met.sumEt() - matchedMet.sumEt() );
-      profile_delta_set_VS_set_->Fill( matchedMet.sumEt(), met.sumEt() - matchedMet.sumEt() );
-      profileRMS_delta_set_VS_set_->Fill( matchedMet.sumEt(), met.sumEt() - matchedMet.sumEt() );
+      delta_set_VS_set_->Fill(matchedMet.sumEt(), met.sumEt() - matchedMet.sumEt());
+      profile_delta_set_VS_set_->Fill(matchedMet.sumEt(), met.sumEt() - matchedMet.sumEt());
+      profileRMS_delta_set_VS_set_->Fill(matchedMet.sumEt(), met.sumEt() - matchedMet.sumEt());
     }
-    if (delta_set_Over_set_VS_set_ &&  matchedMet.sumEt()>0.001 ) {
+    if (delta_set_Over_set_VS_set_ && matchedMet.sumEt() > 0.001) {
       float setRes = (met.sumEt() - matchedMet.sumEt()) / matchedMet.sumEt();
-      if (setRes > maxVal) maxVal = setRes;
-      if (setRes < minVal) minVal = setRes;    
-      delta_set_Over_set_VS_set_->Fill( matchedMet.sumEt(), setRes );
-      profile_delta_set_Over_set_VS_set_->Fill( matchedMet.sumEt(), setRes );
-      profileRMS_delta_set_Over_set_VS_set_->Fill( matchedMet.sumEt(), setRes );
+      if (setRes > maxVal)
+        maxVal = setRes;
+      if (setRes < minVal)
+        minVal = setRes;
+      delta_set_Over_set_VS_set_->Fill(matchedMet.sumEt(), setRes);
+      profile_delta_set_Over_set_VS_set_->Fill(matchedMet.sumEt(), setRes);
+      profileRMS_delta_set_Over_set_VS_set_->Fill(matchedMet.sumEt(), setRes);
     }
-  } 
+  }
 }
diff --git a/DQMOffline/Trigger/interface/HLTTauRefProducer.h b/DQMOffline/Trigger/interface/HLTTauRefProducer.h
index fad8ca448902b..4dbd2ee7eb248 100644
--- a/DQMOffline/Trigger/interface/HLTTauRefProducer.h
+++ b/DQMOffline/Trigger/interface/HLTTauRefProducer.h
@@ -27,8 +27,6 @@
 #include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
 #include "DataFormats/EgammaCandidates/interface/Electron.h"
 #include "DataFormats/EgammaCandidates/interface/ElectronFwd.h"
-#include "AnalysisDataFormats/Egamma/interface/ElectronIDAssociation.h"
-#include "AnalysisDataFormats/Egamma/interface/ElectronID.h"
 #include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 // MUON includes
@@ -68,7 +66,6 @@ class HLTTauRefProducer : public edm::global::EDProducer<> {
 
   edm::EDGetTokenT<reco::GsfElectronCollection> Electrons_;
   bool doElectrons_;
-  edm::EDGetTokenT<reco::ElectronIDAssociationCollection> e_idAssocProd_;
   edm::EDGetTokenT<reco::TrackCollection> e_ctfTrackCollection_;
   edm::InputTag e_ctfTrackCollectionSrc_;
   double ptMinElectron_;
diff --git a/DQMOffline/Trigger/plugins/HLTTauRefProducer.cc b/DQMOffline/Trigger/plugins/HLTTauRefProducer.cc
index 58beac28ceba5..80b819cb0af33 100644
--- a/DQMOffline/Trigger/plugins/HLTTauRefProducer.cc
+++ b/DQMOffline/Trigger/plugins/HLTTauRefProducer.cc
@@ -10,8 +10,6 @@
 #include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
 #include "DataFormats/EgammaCandidates/interface/Electron.h"
 #include "DataFormats/EgammaCandidates/interface/ElectronFwd.h"
-#include "AnalysisDataFormats/Egamma/interface/ElectronIDAssociation.h"
-#include "AnalysisDataFormats/Egamma/interface/ElectronID.h"
 #include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 // MUON includes
@@ -51,10 +49,6 @@ HLTTauRefProducer::HLTTauRefProducer(const edm::ParameterSet& iConfig)
     auto const& electrons = iConfig.getUntrackedParameter<edm::ParameterSet>("Electrons");
     Electrons_ = consumes<reco::GsfElectronCollection>(electrons.getUntrackedParameter<InputTag>("ElectronCollection"));
     doElectrons_ = electrons.getUntrackedParameter<bool>("doElectrons",false);
-    e_doID_ = electrons.getUntrackedParameter<bool>("doID",false);
-    if(e_doID_) {
-      e_idAssocProd_ = consumes<reco::ElectronIDAssociationCollection>(electrons.getUntrackedParameter<InputTag>("IdCollection"));
-    }
     e_ctfTrackCollectionSrc_ = electrons.getUntrackedParameter<InputTag>("TrackCollection");
     e_ctfTrackCollection_ = consumes<reco::TrackCollection>(e_ctfTrackCollectionSrc_);
     ptMinElectron_= electrons.getUntrackedParameter<double>("ptMin",15.);
@@ -179,15 +173,6 @@ HLTTauRefProducer::doElectrons(edm::Event& iEvent) const
 {
   auto product_Electrons = make_unique<LorentzVectorCollection>();
 
-  edm::Handle<reco::ElectronIDAssociationCollection> pEleID;
-  bool doID {e_doID_};
-  if (doID) {//UGLY HACK UNTIL GET ELETRON ID WORKING IN 210
-    if (!iEvent.getByToken(e_idAssocProd_, pEleID)) {
-      edm::LogInfo("") << "Error! Can't get electronIDAssocProducer by label. ";
-      doID = false;
-    }
-  }
-
   edm::Handle<reco::TrackCollection> pCtfTracks;
   if (!iEvent.getByToken(e_ctfTrackCollection_, pCtfTracks)) {
     edm::LogInfo("") << "Error! Can't get " << e_ctfTrackCollectionSrc_.label() << " by label. ";
@@ -199,18 +184,8 @@ HLTTauRefProducer::doElectrons(edm::Event& iEvent) const
   if (iEvent.getByToken(Electrons_,electrons)) {
     for (size_t i=0 ; i<electrons->size(); ++i) {
       edm::Ref<reco::GsfElectronCollection> electronRef (electrons,i);
-      bool idDec {false};
-      if (doID) {
-        reco::ElectronIDAssociationCollection::const_iterator tagIDAssocItr;
-        tagIDAssocItr = pEleID->find(electronRef);
-        const reco::ElectronIDRef& id_tag = tagIDAssocItr->val;
-        idDec=id_tag->cutBasedDecision();
-      }
-      else {
-        idDec=true;
-      }
       auto const& electron = (*electrons)[i];
-      if (electron.pt()>ptMinElectron_&&fabs(electron.eta())<etaMax_&&idDec) {
+      if (electron.pt()>ptMinElectron_&&fabs(electron.eta())<etaMax_) {
         if (e_doTrackIso_) {
           double sum_of_pt_ele {};
           for (auto const& tr : *pCtfTracks) {
diff --git a/DQMOffline/Trigger/python/FSQHLTOfflineSource_cfi.py b/DQMOffline/Trigger/python/FSQHLTOfflineSource_cfi.py
index e2189d1b24d78..264b9169236b1 100644
--- a/DQMOffline/Trigger/python/FSQHLTOfflineSource_cfi.py
+++ b/DQMOffline/Trigger/python/FSQHLTOfflineSource_cfi.py
@@ -317,7 +317,7 @@ def getPTAveVPSet(thresholds = [30, 60, 80, 100, 160, 220, 300], flavour="HFJEC"
             )
             ret.append(recoPF) 
             '''
-            recoThr = t/2
+            recoThr = t//2
             recoPFtopology  =  cms.PSet(
                 triggerSelection = cms.string(partialPathName+"*"),
                 handlerType = cms.string("RecoPFJetWithJEC"),
@@ -363,7 +363,7 @@ def getPTAveVPSet(thresholds = [30, 60, 80, 100, 160, 220, 300], flavour="HFJEC"
 
             # RecoCandidateCounter
             ''' example on how to count objects
-            recoThr = t/2
+            recoThr = t//2
             recoPFJetCnt  =  cms.PSet(
                 triggerSelection = cms.string(partialPathName+"*"),
                 handlerType = cms.string("RecoCandidateCounter"),
diff --git a/DQMServices/Components/plugins/DQMEventInfo.h b/DQMServices/Components/plugins/DQMEventInfo.h
index aa7642250041e..6a1e25bf4ca4a 100644
--- a/DQMServices/Components/plugins/DQMEventInfo.h
+++ b/DQMServices/Components/plugins/DQMEventInfo.h
@@ -49,7 +49,6 @@ class DQMEventInfo: public DQMEDAnalyzer {
 
 //  double getUTCtime(timeval* a, timeval* b = NULL);
 
-  DQMStore *dbe_;
 
   std::string eventInfoFolder_;
   std::string subsystemname_;
diff --git a/DQMServices/Components/test/testSchemaEvolution.cpp b/DQMServices/Components/test/testSchemaEvolution.cpp
index 53dbd8ff75cc0..220776b3a63f6 100644
--- a/DQMServices/Components/test/testSchemaEvolution.cpp
+++ b/DQMServices/Components/test/testSchemaEvolution.cpp
@@ -44,33 +44,33 @@ CPPUNIT_TEST_SUITE_REGISTRATION( TestSchemaEvolution );
 void TestSchemaEvolution::fillBaseline() {
   unique_classes_current_.insert(std::make_pair("vector<double>", 6));
   unique_classes_current_.insert(std::make_pair("TF1", 10));
-  unique_classes_current_.insert(std::make_pair("TH3S", 3));
+  unique_classes_current_.insert(std::make_pair("TH3S", 4));
   unique_classes_current_.insert(std::make_pair("TAtt3D", 1));
-  unique_classes_current_.insert(std::make_pair("TH3", 5));
-  unique_classes_current_.insert(std::make_pair("TH3F", 3));
-  unique_classes_current_.insert(std::make_pair("TH2D", 3));
-  unique_classes_current_.insert(std::make_pair("TH2S", 3));
+  unique_classes_current_.insert(std::make_pair("TH3", 6));
+  unique_classes_current_.insert(std::make_pair("TH3F", 4));
+  unique_classes_current_.insert(std::make_pair("TH2D", 4));
+  unique_classes_current_.insert(std::make_pair("TH2S", 4));
   unique_classes_current_.insert(std::make_pair("TArrayI", 1));
-  unique_classes_current_.insert(std::make_pair("TH2I", 3));
-  unique_classes_current_.insert(std::make_pair("TH2F", 3));
-  unique_classes_current_.insert(std::make_pair("TH1I", 2));
+  unique_classes_current_.insert(std::make_pair("TH2I", 4));
+  unique_classes_current_.insert(std::make_pair("TH2F", 4));
+  unique_classes_current_.insert(std::make_pair("TH1I", 3));
   unique_classes_current_.insert(std::make_pair("TString", 2));
   unique_classes_current_.insert(std::make_pair("TAttLine", 2));
   unique_classes_current_.insert(std::make_pair("TObject", 1));
-  unique_classes_current_.insert(std::make_pair("TH3D", 3));
-  unique_classes_current_.insert(std::make_pair("TH1S", 2));
-  unique_classes_current_.insert(std::make_pair("TH3I", 3));
+  unique_classes_current_.insert(std::make_pair("TH3D", 4));
+  unique_classes_current_.insert(std::make_pair("TH1S", 3));
+  unique_classes_current_.insert(std::make_pair("TH3I", 4));
   unique_classes_current_.insert(std::make_pair("TAttFill", 2));
   unique_classes_current_.insert(std::make_pair("TNamed", 1));
-  unique_classes_current_.insert(std::make_pair("TH1F", 2));
-  unique_classes_current_.insert(std::make_pair("TH2", 4));
+  unique_classes_current_.insert(std::make_pair("TH1F", 3));
+  unique_classes_current_.insert(std::make_pair("TH2", 5));
   unique_classes_current_.insert(std::make_pair("TH1", 8));
-  unique_classes_current_.insert(std::make_pair("TProfile", 6));
+  unique_classes_current_.insert(std::make_pair("TProfile", 7));
   unique_classes_current_.insert(std::make_pair("TAttMarker", 2));
   unique_classes_current_.insert(std::make_pair("TArray", 1));
   unique_classes_current_.insert(std::make_pair("TAxis", 10));
-  unique_classes_current_.insert(std::make_pair("TProfile2D", 7));
-  unique_classes_current_.insert(std::make_pair("TH1D", 2));
+  unique_classes_current_.insert(std::make_pair("TProfile2D", 8));
+  unique_classes_current_.insert(std::make_pair("TH1D", 3));
   unique_classes_current_.insert(std::make_pair("TArrayS", 1));
   unique_classes_current_.insert(std::make_pair("TAttAxis", 4));
   unique_classes_current_.insert(std::make_pair("TArrayD", 1));
diff --git a/DQMServices/Diagnostic/interface/HDQMInspectorConfigBase.h b/DQMServices/Diagnostic/interface/HDQMInspectorConfigBase.h
index 8275070512643..71bb09da18ba8 100644
--- a/DQMServices/Diagnostic/interface/HDQMInspectorConfigBase.h
+++ b/DQMServices/Diagnostic/interface/HDQMInspectorConfigBase.h
@@ -2,10 +2,10 @@
 #define GUARD_HDQMInspectorConfigBase_h
 
 #include <algorithm>
+#include <cstdint>
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
-#include <cstdint>
 
 /**
  * @author: M. De Mattia
@@ -28,35 +28,32 @@
  * to the HDQMInspector.
  */
 
-
-class HDQMInspectorConfigBase
-{
- public:
-   HDQMInspectorConfigBase () {};
-   virtual ~HDQMInspectorConfigBase () {};
-  /// fills a vector<pair<string, string> > associating values with the corresponding errors
-  virtual bool valueErrorMap(std::vector<std::pair<std::string, std::string> > & valueErrorVector) const {return false;}
-  /// fills the list of names of quantities for which a summation over the runs is required
-  virtual bool computeIntegralList(const std::vector<std::string> & computeIntegralVector)
-  {
+class HDQMInspectorConfigBase {
+public:
+  HDQMInspectorConfigBase(){};
+  virtual ~HDQMInspectorConfigBase(){};
+  /// fills a vector<pair<string, string> > associating values with the
+  /// corresponding errors
+  virtual bool valueErrorMap(std::vector<std::pair<std::string, std::string>> &valueErrorVector) const { return false; }
+  /// fills the list of names of quantities for which a summation over the runs
+  /// is required
+  virtual bool computeIntegralList(const std::vector<std::string> &computeIntegralVector) {
     fComputeIntegral = computeIntegralVector;
     return true;
   }
-  bool computeIntegral(const std::string & in) const
-  {
+  bool computeIntegral(const std::string &in) const {
     if (std::find(fComputeIntegral.begin(), fComputeIntegral.end(), in) != fComputeIntegral.end()) {
       return true;
     }
     return false;
   }
 
-  std::string getErrorForQuantity(const std::string & QuantityName) const
-  {
-    // Return the error name for a quantity name given.  This is designed to be used for the
-    // "user" input quantities
+  std::string getErrorForQuantity(const std::string &QuantityName) const {
+    // Return the error name for a quantity name given.  This is designed to be
+    // used for the "user" input quantities
 
     for (std::map<std::string, std::string>::const_iterator It = fErrorMap.begin(); It != fErrorMap.end(); ++It) {
-      if (QuantityName.find( It->first ) != std::string::npos) {
+      if (QuantityName.find(It->first) != std::string::npos) {
         return It->second;
       }
     }
@@ -64,20 +61,17 @@ class HDQMInspectorConfigBase
     return "";
   }
 
- private:
+private:
   std::map<std::string, std::string> fErrorMap;
   std::vector<std::string> fComputeIntegral;
 };
 
-
 /*
- * valueErrorMap: don't I need a way to access what is input here in the HDQMI code??
- *  map should be vlist=>error right?
+ * valueErrorMap: don't I need a way to access what is input here in the HDQMI
+ * code?? map should be vlist=>error right?
  *
  * computeIntegralList: need a way to access that as well.
  *
  */
 
-
-
 #endif
diff --git a/DQMServices/Diagnostic/interface/HDQMfitUtilities.h b/DQMServices/Diagnostic/interface/HDQMfitUtilities.h
index afdf80179b4f1..29d2a095ed812 100644
--- a/DQMServices/Diagnostic/interface/HDQMfitUtilities.h
+++ b/DQMServices/Diagnostic/interface/HDQMfitUtilities.h
@@ -1,67 +1,60 @@
 #ifndef DQMServices_HDQMfitUtilities_H
 #define DQMServices_HDQMfitUtilities_H
 
-#include <vector>
+#include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "TF1.h"
+#include "TH1.h"
+#include "TMath.h"
 #include <cstring>
 #include <iostream>
 #include <sstream>
 #include <string>
-#include "TH1.h"
-#include "TF1.h"
-#include "TMath.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-
+#include <vector>
 
 /**
    @ class HDQMfitUtilities
    @ fit Landau distributions to historic monitoring elements
-   @ fits from Susy's analysis (DQM/SiStripHistoricInfoClient/test/TrendsWithFits) 
+   @ fits from Susy's analysis
+   (DQM/SiStripHistoricInfoClient/test/TrendsWithFits)
 */
 
-
-namespace HDQMUtil{
+namespace HDQMUtil {
   double langaufun(double *x, double *par);
   int32_t langaupro(double *params, double &maxx, double &FWHM);
   double Gauss(double *x, double *par);
-}
-
-class HDQMfitUtilities{
-
- public: 
+}  // namespace HDQMUtil
 
+class HDQMfitUtilities {
+public:
   HDQMfitUtilities();
   ~HDQMfitUtilities();
- 
-  void   init();
-  double doLanGaussFit(MonitorElement* ME){return doLanGaussFit(ME->getTH1F());}
-  double doLanGaussFit(TH1F*);
 
-  double doGaussFit(MonitorElement* ME){return doGaussFit(ME->getTH1F());}
-  double doGaussFit(TH1F*);
-  
-  double getLanGaussPar(std::string s)   ;
+  void init();
+  double doLanGaussFit(MonitorElement *ME) { return doLanGaussFit(ME->getTH1F()); }
+  double doLanGaussFit(TH1F *);
+
+  double doGaussFit(MonitorElement *ME) { return doGaussFit(ME->getTH1F()); }
+  double doGaussFit(TH1F *);
+
+  double getLanGaussPar(std::string s);
   double getLanGaussParErr(std::string s);
-  double getLanGaussConv(std::string s)  ;
-  
-  double getGaussPar(std::string s)   ;
+  double getLanGaussConv(std::string s);
+
+  double getGaussPar(std::string s);
   double getGaussParErr(std::string s);
 
-  double getFitChi()  {return chi2GausS;}
-  int    getFitnDof() {return nDofGausS;}
- 
- private:
-  
+  double getFitChi() { return chi2GausS; }
+  int getFitnDof() { return nDofGausS; }
+
+private:
   double pLanGausS[4], epLanGausS[4];
   double pGausS[3], epGausS[3];
   double pLanConv[2];
   double chi2GausS;
   int32_t nDofGausS;
-  TF1 *langausFit; 
-  TF1 *gausFit;  
+  TF1 *langausFit;
+  TF1 *gausFit;
 };
 
-#endif // DQM_SiStripHistoricInfoClient_HDQMfitUtilities_H
-
-
-
+#endif  // DQM_SiStripHistoricInfoClient_HDQMfitUtilities_H
diff --git a/DQMServices/Diagnostic/interface/classes.h b/DQMServices/Diagnostic/interface/classes.h
deleted file mode 100644
index 6ce8743f1c3f5..0000000000000
--- a/DQMServices/Diagnostic/interface/classes.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//---- Add the Class you need
-
-#include "CondFormats/DQMObjects/interface/HDQMSummary.h"
-
-#include "CondCore/Utilities/interface/CondCachedIter.h"
-
-// #include "DQMServices/Diagnostic/test/HDQMInspector.h"
-
-// #include "DQMServices/Diagnostic/test/HDQMGraphAnalysis.h"
-
-
-namespace DQMServices_Diagnostic {
-  struct dictionary {
-    CondCachedIter<HDQMSummary> dummy13;
-
-//  HDQMInspector dummy1;
-//  HDQMGraphAnalysis dummy2;
-  };
-}
-
diff --git a/DQMServices/Diagnostic/src/HDQMfitUtilities.cc b/DQMServices/Diagnostic/src/HDQMfitUtilities.cc
index 9160c1cfd5f08..f41a509b25994 100644
--- a/DQMServices/Diagnostic/src/HDQMfitUtilities.cc
+++ b/DQMServices/Diagnostic/src/HDQMfitUtilities.cc
@@ -1,55 +1,54 @@
 #include "DQMServices/Diagnostic/interface/HDQMfitUtilities.h"
 
-namespace HDQMUtil{
+namespace HDQMUtil {
   //-----------------------------------------------------------------------------------------------
-  double langaufun(double *x, double *par){
-    //Fit parameters:
-    //par[0]=Width (scale) parameter of Landau density
-    //par[1]=Most Probable (MP, location) parameter of Landau density
-    //par[2]=Total area (integral -inf to inf, normalization constant)
-    //par[3]=Width (sigma) of convoluted Gaussian function
+  double langaufun(double *x, double *par) {
+    // Fit parameters:
+    // par[0]=Width (scale) parameter of Landau density
+    // par[1]=Most Probable (MP, location) parameter of Landau density
+    // par[2]=Total area (integral -inf to inf, normalization constant)
+    // par[3]=Width (sigma) of convoluted Gaussian function
     //
-    //In the Landau distribution (represented by the CERNLIB approximation), 
-    //the maximum is located at x=-0.22278298 with the location parameter=0.
-    //This shift is corrected within this function, so that the actual
-    //maximum is identical to the MP parameter.
+    // In the Landau distribution (represented by the CERNLIB approximation),
+    // the maximum is located at x=-0.22278298 with the location parameter=0.
+    // This shift is corrected within this function, so that the actual
+    // maximum is identical to the MP parameter.
 
     // Numeric constants
-    double invsq2pi = 0.3989422804014;   // (2 pi)^(-1/2)
-    double mpshift  = -0.22278298;       // Landau maximum location
+    double invsq2pi = 0.3989422804014;  // (2 pi)^(-1/2)
+    double mpshift = -0.22278298;       // Landau maximum location
 
     // Control constants
-    double np = 100.0;      // number of convolution steps
-    double sc =   5.0;      // convolution extends to +-sc Gaussian sigmas
+    double np = 100.0;  // number of convolution steps
+    double sc = 5.0;    // convolution extends to +-sc Gaussian sigmas
 
     // Variables
     double xx;
     double mpc;
     double fland;
     double sum = 0.0;
-    double xlow,xupp;
+    double xlow, xupp;
     double step;
     double i;
 
-
     // MP shift correction
-    mpc = par[1] - mpshift * par[0]; 
+    mpc = par[1] - mpshift * par[0];
 
     // Range of convolution integral
     xlow = x[0] - sc * par[3];
     xupp = x[0] + sc * par[3];
 
-    step = (xupp-xlow) / np;
+    step = (xupp - xlow) / np;
 
     // Landau Distribution Production
-    for(i=1.0; i<=np/2; i++) {
-      xx = xlow + (i-.5) * step;
-      fland = TMath::Landau(xx,mpc,par[0]) / par[0];
-      sum += fland * TMath::Gaus(x[0],xx,par[3]);
-
-      xx = xupp - (i-.5) * step;
-      fland = TMath::Landau(xx,mpc,par[0]) / par[0];
-      sum += fland * TMath::Gaus(x[0],xx,par[3]);
+    for (i = 1.0; i <= np / 2; i++) {
+      xx = xlow + (i - .5) * step;
+      fland = TMath::Landau(xx, mpc, par[0]) / par[0];
+      sum += fland * TMath::Gaus(x[0], xx, par[3]);
+
+      xx = xupp - (i - .5) * step;
+      fland = TMath::Landau(xx, mpc, par[0]) / par[0];
+      sum += fland * TMath::Gaus(x[0], xx, par[3]);
     }
 
     return (par[2] * step * sum * invsq2pi / par[3]);
@@ -58,36 +57,36 @@ namespace HDQMUtil{
   //-----------------------------------------------------------------------------------------------
   int32_t langaupro(double *params, double &maxx, double &FWHM) {
     edm::LogInfo("fitUtility") << "inside langaupro " << std::endl;
-    // Seaches for the location (x value) at the maximum of the 
+    // Seaches for the location (x value) at the maximum of the
     // Landau and its full width at half-maximum.
     //
     // The search is probably not very efficient, but it's a first try.
 
-    double p,x,fy,fxr,fxl;
+    double p, x, fy, fxr, fxl;
     double step;
-    double l,lold,dl;
+    double l, lold, dl;
     int32_t i = 0;
     const int32_t MAXCALLS = 10000;
-    const double dlStop = 1e-3; // relative change < .001
+    const double dlStop = 1e-3;  // relative change < .001
 
     // Search for maximum
     p = params[1] - 0.1 * params[0];
     step = 0.05 * params[0];
     lold = -2.0;
-    l    = -1.0;
+    l = -1.0;
 
-    dl = (l-lold)/lold;    // FIXME catch divide by zero
-    while ( (TMath::Abs(dl)>dlStop ) && (i < MAXCALLS) ) {
+    dl = (l - lold) / lold;  // FIXME catch divide by zero
+    while ((TMath::Abs(dl) > dlStop) && (i < MAXCALLS)) {
       i++;
 
       lold = l;
       x = p + step;
-      l = langaufun(&x,params);
-      dl = (l-lold)/lold; // FIXME catch divide by zero
-        
+      l = langaufun(&x, params);
+      dl = (l - lold) / lold;  // FIXME catch divide by zero
+
       if (l < lold)
-	step = -step/10;
- 
+        step = -step / 10;
+
       p += step;
     }
 
@@ -96,28 +95,27 @@ namespace HDQMUtil{
 
     maxx = x;
 
-    fy = l/2;
-
+    fy = l / 2;
 
     // Search for right x location of fy
     p = maxx + params[0];
     step = params[0];
     lold = -2.0;
-    l    = -1e300;
-    i    = 0;
+    l = -1e300;
+    i = 0;
 
-    dl = (l-lold)/lold;   // FIXME catch divide by zero
-    while ( ( TMath::Abs(dl)>dlStop ) && (i < MAXCALLS) ) {
+    dl = (l - lold) / lold;  // FIXME catch divide by zero
+    while ((TMath::Abs(dl) > dlStop) && (i < MAXCALLS)) {
       i++;
 
       lold = l;
       x = p + step;
-      l = TMath::Abs(langaufun(&x,params) - fy);
-      dl = (l-lold)/lold; // FIXME catch divide by zero
- 
+      l = TMath::Abs(langaufun(&x, params) - fy);
+      dl = (l - lold) / lold;  // FIXME catch divide by zero
+
       if (l > lold)
-	step = -step/10;
- 
+        step = -step / 10;
+
       p += step;
     }
 
@@ -126,287 +124,324 @@ namespace HDQMUtil{
 
     fxr = x;
 
-
     // Search for left x location of fy
     p = maxx - 0.5 * params[0];
     step = -params[0];
     lold = -2.0;
-    l    = -1e300;
-    i    = 0;
+    l = -1e300;
+    i = 0;
 
-    dl = (l-lold)/lold;    // FIXME catch divide by zero
-    while ( ( TMath::Abs(dl)>dlStop ) && (i < MAXCALLS) ) {
+    dl = (l - lold) / lold;  // FIXME catch divide by zero
+    while ((TMath::Abs(dl) > dlStop) && (i < MAXCALLS)) {
       i++;
 
       lold = l;
       x = p + step;
-      l = TMath::Abs(langaufun(&x,params) - fy);
-      dl = (l-lold)/lold; // FIXME catch divide by zero
- 
+      l = TMath::Abs(langaufun(&x, params) - fy);
+      dl = (l - lold) / lold;  // FIXME catch divide by zero
+
       if (l > lold)
-	step = -step/10;
- 
+        step = -step / 10;
+
       p += step;
     }
 
     if (i == MAXCALLS)
       return (-3);
 
-
     fxl = x;
 
     FWHM = fxr - fxl;
     return (0);
   }
 
-
   //-----------------------------------------------------------------------------------------------
-  double Gauss(double *x, double *par)
-  {
+  double Gauss(double *x, double *par) {
     // The noise function: a gaussian
 
     double arg = 0;
-    if (par[2]) arg = (x[0] - par[1])/par[2];
+    if (par[2])
+      arg = (x[0] - par[1]) / par[2];
 
-    double noise = par[0]*TMath::Exp(-0.5*arg*arg);
+    double noise = par[0] * TMath::Exp(-0.5 * arg * arg);
     return noise;
   }
 
-}
+}  // namespace HDQMUtil
 
 //-----------------------------------------------------------------------------------------------
-HDQMfitUtilities::HDQMfitUtilities():langausFit(nullptr),gausFit(nullptr){
-  init();
-}
+HDQMfitUtilities::HDQMfitUtilities() : langausFit(nullptr), gausFit(nullptr) { init(); }
 
 //-----------------------------------------------------------------------------------------------
-void HDQMfitUtilities::init(){
-  pLanGausS[0]=0 ;   pLanGausS[1]=0;   pLanGausS[2]=0;   pLanGausS[3]=0;
-  epLanGausS[0]=0;  epLanGausS[1]=0;  epLanGausS[2]=0;  epLanGausS[3]=0;
-  pGausS[0]=0 ;   pGausS[1]=0;   pGausS[2]=0;
-  epGausS[0]=0;  epGausS[1]=0;  epGausS[2]=0;
-  pLanConv[0]=0;  pLanConv[1]=0;
-
-  //if ( langausFit!=0 ) delete langausFit;
-  //if ( gausFit!=0 ) delete gausFit;
+void HDQMfitUtilities::init() {
+  pLanGausS[0] = 0;
+  pLanGausS[1] = 0;
+  pLanGausS[2] = 0;
+  pLanGausS[3] = 0;
+  epLanGausS[0] = 0;
+  epLanGausS[1] = 0;
+  epLanGausS[2] = 0;
+  epLanGausS[3] = 0;
+  pGausS[0] = 0;
+  pGausS[1] = 0;
+  pGausS[2] = 0;
+  epGausS[0] = 0;
+  epGausS[1] = 0;
+  epGausS[2] = 0;
+  pLanConv[0] = 0;
+  pLanConv[1] = 0;
+
+  // if ( langausFit!=0 ) delete langausFit;
+  // if ( gausFit!=0 ) delete gausFit;
 
   chi2GausS = -9999.;
   nDofGausS = -9999;
 }
 
 //-----------------------------------------------------------------------------------------------
-HDQMfitUtilities::~HDQMfitUtilities(){
-  if ( langausFit!=nullptr ) delete langausFit;
-  if ( gausFit!=nullptr ) delete gausFit;
+HDQMfitUtilities::~HDQMfitUtilities() {
+  if (langausFit != nullptr)
+    delete langausFit;
+  if (gausFit != nullptr)
+    delete gausFit;
 }
 
-  
- 
 //-----------------------------------------------------------------------------------------------
-double HDQMfitUtilities::doLanGaussFit(TH1F* htoFit){
+double HDQMfitUtilities::doLanGaussFit(TH1F *htoFit) {
   init();
- 
+
   // if (htoFit->GetEntries()!=0) {
   // Check for the entries excluding over/underflows
-  if (htoFit->Integral()!=0) {
-     edm::LogInfo("fitUtility")<<"Fitting "<< htoFit->GetTitle() <<std::endl;
+  if (htoFit->Integral() != 0) {
+    edm::LogInfo("fitUtility") << "Fitting " << htoFit->GetTitle() << std::endl;
     // Setting fit range and start values
     double fr[2];
     double sv[4], pllo[4], plhi[4];
-    fr[0]=0.5*htoFit->GetMean();
-    fr[1]=3.0*htoFit->GetMean();
-	      
-    // (EM) parameters setting good for signal only 
-    int32_t imax=htoFit->GetMaximumBin();
-    double xmax=htoFit->GetBinCenter(imax);
-    double ymax=htoFit->GetBinContent(imax);
+    fr[0] = 0.5 * htoFit->GetMean();
+    fr[1] = 3.0 * htoFit->GetMean();
+
+    // (EM) parameters setting good for signal only
+    int32_t imax = htoFit->GetMaximumBin();
+    double xmax = htoFit->GetBinCenter(imax);
+    double ymax = htoFit->GetBinContent(imax);
     int32_t i[2];
     int32_t iArea[2];
-	      
-    i[0]=htoFit->GetXaxis()->FindBin(fr[0]);
-    i[1]=htoFit->GetXaxis()->FindBin(fr[1]);
-		  
-    iArea[0]=htoFit->GetXaxis()->FindBin(fr[0]);
-    iArea[1]=htoFit->GetXaxis()->FindBin(fr[1]);
-    double AreaFWHM=htoFit->Integral(iArea[0],iArea[1],"width");
-		  
-    sv[1]=xmax;
-    sv[2]=htoFit->Integral(i[0],i[1],"width");
-    sv[3]=AreaFWHM/(4*ymax);
-    sv[0]=sv[3];
-		  
-    plhi[0]=25.0; plhi[1]=200.0; plhi[2]=1000000.0; plhi[3]=50.0;
-    pllo[0]=1.5 ; pllo[1]=10.0 ; pllo[2]=1.0      ; pllo[3]= 1.0;
-		  
+
+    i[0] = htoFit->GetXaxis()->FindBin(fr[0]);
+    i[1] = htoFit->GetXaxis()->FindBin(fr[1]);
+
+    iArea[0] = htoFit->GetXaxis()->FindBin(fr[0]);
+    iArea[1] = htoFit->GetXaxis()->FindBin(fr[1]);
+    double AreaFWHM = htoFit->Integral(iArea[0], iArea[1], "width");
+
+    sv[1] = xmax;
+    sv[2] = htoFit->Integral(i[0], i[1], "width");
+    sv[3] = AreaFWHM / (4 * ymax);
+    sv[0] = sv[3];
+
+    plhi[0] = 25.0;
+    plhi[1] = 200.0;
+    plhi[2] = 1000000.0;
+    plhi[3] = 50.0;
+    pllo[0] = 1.5;
+    pllo[1] = 10.0;
+    pllo[2] = 1.0;
+    pllo[3] = 1.0;
+
     Char_t FunName[100];
-    sprintf(FunName,"FitfcnLG_%s",htoFit->GetName());  
-		  
-    langausFit = new TF1(FunName,HDQMUtil::langaufun,fr[0],fr[1],4);
+    sprintf(FunName, "FitfcnLG_%s", htoFit->GetName());
+
+    langausFit = new TF1(FunName, HDQMUtil::langaufun, fr[0], fr[1], 4);
     langausFit->SetParameters(sv);
-    langausFit->SetParNames("Width","MP","Area","GSigma");
-		  
-    for (int32_t i=0; i<4; i++) {
-      langausFit->SetParLimits(i,pllo[i],plhi[i]);
-    }  
-		  
-    try{
-      htoFit->Fit(langausFit,"R0");  // "R" fit in a range,"0" quiet fit
-      
-      langausFit->SetRange(fr[0],fr[1]);
+    langausFit->SetParNames("Width", "MP", "Area", "GSigma");
+
+    for (int32_t i = 0; i < 4; i++) {
+      langausFit->SetParLimits(i, pllo[i], plhi[i]);
+    }
+
+    try {
+      htoFit->Fit(langausFit, "R0");  // "R" fit in a range,"0" quiet fit
+
+      langausFit->SetRange(fr[0], fr[1]);
       langausFit->GetParameters(pLanGausS);
-      std::memcpy((void*) epLanGausS, (void*) langausFit->GetParErrors(), 4*sizeof(double));
-      
-      chi2GausS =langausFit->GetChisquare();  // obtain chi^2
-      nDofGausS = langausFit->GetNDF();           // obtain ndf
-      
+      std::memcpy((void *)epLanGausS, (void *)langausFit->GetParErrors(), 4 * sizeof(double));
+
+      chi2GausS = langausFit->GetChisquare();  // obtain chi^2
+      nDofGausS = langausFit->GetNDF();        // obtain ndf
+
       double sPeak, sFWHM;
-      HDQMUtil::langaupro(pLanGausS,sPeak,sFWHM);
-      pLanConv[0]=sPeak;
-      pLanConv[1]=sFWHM;
+      HDQMUtil::langaupro(pLanGausS, sPeak, sFWHM);
+      pLanConv[0] = sPeak;
+      pLanConv[1] = sFWHM;
       edm::LogInfo("fitUtility") << "langaupro:  max  " << sPeak << std::endl;
       edm::LogInfo("fitUtility") << "langaupro:  FWHM " << sFWHM << std::endl;
+    } catch (cms::Exception &iException) {
+      edm::LogError("fitUtility") << "problem in fitting " << htoFit->GetTitle()
+                                  << " \n\tDefault values of the parameters will be used";
+      pLanGausS[0] = -9999;
+      pLanGausS[1] = -9999;
+      pLanGausS[2] = -9999;
+      pLanGausS[3] = -9999;
+      epLanGausS[0] = -9999;
+      epLanGausS[1] = -9999;
+      epLanGausS[2] = -9999;
+      epLanGausS[3] = -9999;
+      pLanConv[0] = -9999;
+      pLanConv[1] = -9999;
+      chi2GausS = -9999;
+      nDofGausS = -9999;
     }
-    catch(cms::Exception& iException){
-      edm::LogError("fitUtility") << "problem in fitting " << htoFit->GetTitle() << " \n\tDefault values of the parameters will be used";
-      pLanGausS[0]=-9999; pLanGausS[1]=-9999; pLanGausS[2]=-9999; pLanGausS[3]=-9999;
-      epLanGausS[0]=-9999; epLanGausS[1]=-9999; epLanGausS[2]=-9999; epLanGausS[3]=-9999;
-      pLanConv[0]=-9999;   pLanConv[1]=-9999;   
-      chi2GausS=-9999;  nDofGausS=-9999;    
-    }
-  }
-  else {  
-    pLanGausS[0]=-9999; pLanGausS[1]=-9999; pLanGausS[2]=-9999; pLanGausS[3]=-9999;
-    epLanGausS[0]=-9999; epLanGausS[1]=-9999; epLanGausS[2]=-9999; epLanGausS[3]=-9999;
-    pLanConv[0]=-9999;   pLanConv[1]=-9999;   
-    chi2GausS=-9999;  nDofGausS=-9999;    
+  } else {
+    pLanGausS[0] = -9999;
+    pLanGausS[1] = -9999;
+    pLanGausS[2] = -9999;
+    pLanGausS[3] = -9999;
+    epLanGausS[0] = -9999;
+    epLanGausS[1] = -9999;
+    epLanGausS[2] = -9999;
+    epLanGausS[3] = -9999;
+    pLanConv[0] = -9999;
+    pLanConv[1] = -9999;
+    chi2GausS = -9999;
+    nDofGausS = -9999;
   }
 
   return htoFit->GetEntries();
-
 }
 
-  
 //-----------------------------------------------------------------------------------------------
-double HDQMfitUtilities::doGaussFit(TH1F* htoFit){
+double HDQMfitUtilities::doGaussFit(TH1F *htoFit) {
   init();
   // if (htoFit->GetEntries()!=0) {
-  if (htoFit->Integral()!=0) {
-    
+  if (htoFit->Integral() != 0) {
     // Setting fit range and start values
     double fr[2];
     double sv[3], pllo[3], plhi[3];
-    fr[0]=htoFit->GetMean()-5*htoFit->GetRMS();
-    fr[1]=htoFit->GetMean()+5*htoFit->GetRMS();
-		  
-    int32_t imax=htoFit->GetMaximumBin();
-    double xmax=htoFit->GetBinCenter(imax);
-    double ymax=htoFit->GetBinContent(imax);
+    fr[0] = htoFit->GetMean() - 5 * htoFit->GetRMS();
+    fr[1] = htoFit->GetMean() + 5 * htoFit->GetRMS();
+
+    int32_t imax = htoFit->GetMaximumBin();
+    double xmax = htoFit->GetBinCenter(imax);
+    double ymax = htoFit->GetBinContent(imax);
     int32_t i[2];
     int32_t iArea[2];
-		  
-    i[0]=htoFit->GetXaxis()->FindBin(fr[0]);
-    i[1]=htoFit->GetXaxis()->FindBin(fr[1]);
-		  
-    iArea[0]=htoFit->GetXaxis()->FindBin(fr[0]);
-    iArea[1]=htoFit->GetXaxis()->FindBin(fr[1]);
-    double AreaFWHM=htoFit->Integral(iArea[0],iArea[1],"width");
-		  
-    sv[2]=AreaFWHM/(4*ymax);
-    sv[1]=xmax;
-    sv[0]=htoFit->Integral(i[0],i[1],"width");
-		  
-    plhi[0]=1000000.0; plhi[1]=10.0; plhi[2]=10.;
-    pllo[0]=1.5 ; pllo[1]=0.1; pllo[2]=0.3;
+
+    i[0] = htoFit->GetXaxis()->FindBin(fr[0]);
+    i[1] = htoFit->GetXaxis()->FindBin(fr[1]);
+
+    iArea[0] = htoFit->GetXaxis()->FindBin(fr[0]);
+    iArea[1] = htoFit->GetXaxis()->FindBin(fr[1]);
+    double AreaFWHM = htoFit->Integral(iArea[0], iArea[1], "width");
+
+    sv[2] = AreaFWHM / (4 * ymax);
+    sv[1] = xmax;
+    sv[0] = htoFit->Integral(i[0], i[1], "width");
+
+    plhi[0] = 1000000.0;
+    plhi[1] = 10.0;
+    plhi[2] = 10.;
+    pllo[0] = 1.5;
+    pllo[1] = 0.1;
+    pllo[2] = 0.3;
     Char_t FunName[100];
-    sprintf(FunName,"FitfcnLG_%s",htoFit->GetName());
-    gausFit = new TF1(FunName,HDQMUtil::Gauss,fr[0],fr[1],3);
+    sprintf(FunName, "FitfcnLG_%s", htoFit->GetName());
+    gausFit = new TF1(FunName, HDQMUtil::Gauss, fr[0], fr[1], 3);
     gausFit->SetParameters(sv);
-    gausFit->SetParNames("Constant","GaussPeak","Sigma");
-		  
-    for (int32_t i=0; i<3; i++) {
-      gausFit->SetParLimits(i,pllo[i],plhi[i]);
+    gausFit->SetParNames("Constant", "GaussPeak", "Sigma");
+
+    for (int32_t i = 0; i < 3; i++) {
+      gausFit->SetParLimits(i, pllo[i], plhi[i]);
     }
- 
-    try{
-      htoFit->Fit(gausFit,"R0");
-      
-      gausFit->SetRange(fr[0],fr[1]);
+
+    try {
+      htoFit->Fit(gausFit, "R0");
+
+      gausFit->SetRange(fr[0], fr[1]);
       gausFit->GetParameters(pGausS);
-      std::memcpy((void*) epGausS, (void*) gausFit->GetParErrors(), 3*sizeof(double));
-      
-      chi2GausS =langausFit->GetChisquare(); // obtain chi^2
-      nDofGausS = langausFit->GetNDF();// obtain ndf
-    }
-    catch(cms::Exception& iException){
-      edm::LogError("fitUtility") << "problem in fitting " << htoFit->GetTitle() << " \n\tDefault values of the parameters will be used";
-      pGausS[0]=-9999; pGausS[1]=-9999; pGausS[2]=-9999;
-      epGausS[0]=-9999; epGausS[1]=-9999; epGausS[2]=-9999;
-      chi2GausS=-9999;  nDofGausS=-9999;    
+      std::memcpy((void *)epGausS, (void *)gausFit->GetParErrors(), 3 * sizeof(double));
+
+      chi2GausS = langausFit->GetChisquare();  // obtain chi^2
+      nDofGausS = langausFit->GetNDF();        // obtain ndf
+    } catch (cms::Exception &iException) {
+      edm::LogError("fitUtility") << "problem in fitting " << htoFit->GetTitle()
+                                  << " \n\tDefault values of the parameters will be used";
+      pGausS[0] = -9999;
+      pGausS[1] = -9999;
+      pGausS[2] = -9999;
+      epGausS[0] = -9999;
+      epGausS[1] = -9999;
+      epGausS[2] = -9999;
+      chi2GausS = -9999;
+      nDofGausS = -9999;
     }
- 		 
-  }
-  else {
-    pGausS[0]=-9999; pGausS[1]=-9999; pGausS[2]=-9999;
-    epGausS[0]=-9999; epGausS[1]=-9999; epGausS[2]=-9999;
-    chi2GausS=-9999;  nDofGausS=-9999;    
+
+  } else {
+    pGausS[0] = -9999;
+    pGausS[1] = -9999;
+    pGausS[2] = -9999;
+    epGausS[0] = -9999;
+    epGausS[1] = -9999;
+    epGausS[2] = -9999;
+    chi2GausS = -9999;
+    nDofGausS = -9999;
   }
-  
+
   return htoFit->GetEntries();
 }
 
 //-----------------------------------------------------------------------------------------------
-double HDQMfitUtilities::getLanGaussPar(std::string s){
-  if(s=="landau_width")
+double HDQMfitUtilities::getLanGaussPar(std::string s) {
+  if (s == "landau_width")
     return pLanGausS[0];
-  else if(s=="mpv")
+  else if (s == "mpv")
     return pLanGausS[1];
-  else if(s=="area")
+  else if (s == "area")
     return pLanGausS[2];
-  else if(s=="gauss_sigma")
+  else if (s == "gauss_sigma")
     return pLanGausS[3];
   else
     return -99999;
 }
 
-double HDQMfitUtilities::getLanGaussParErr(std::string s){
-  if(s=="landau_width")
+double HDQMfitUtilities::getLanGaussParErr(std::string s) {
+  if (s == "landau_width")
     return epLanGausS[0];
-  else if(s=="mpv")
+  else if (s == "mpv")
     return epLanGausS[1];
-  else if(s=="area")
+  else if (s == "area")
     return epLanGausS[2];
-  else if(s=="gauss_sigma")
+  else if (s == "gauss_sigma")
     return epLanGausS[3];
   else
     return -99999;
 }
 
 double HDQMfitUtilities::getLanGaussConv(std::string s) {
-  if(s=="mpv")
+  if (s == "mpv")
     return pLanConv[0];
-  else if(s=="fwhm")
+  else if (s == "fwhm")
     return pLanConv[1];
   else
     return -99999;
 }
 
 double HDQMfitUtilities::getGaussPar(std::string s) {
-  if(s=="area")
+  if (s == "area")
     return pGausS[0];
-  else if(s=="mean")
+  else if (s == "mean")
     return pGausS[1];
-  else if(s=="sigma")
+  else if (s == "sigma")
     return pGausS[2];
   else
     return -99999;
 }
 
 double HDQMfitUtilities::getGaussParErr(std::string s) {
-  if(s=="area")
+  if (s == "area")
     return epGausS[0];
-  else if(s=="mean")
+  else if (s == "mean")
     return epGausS[1];
-  else if(s=="sigma")
+  else if (s == "sigma")
     return epGausS[2];
   else
     return -99999;
diff --git a/DQMServices/Examples/interface/ConverterTester.h b/DQMServices/Examples/interface/ConverterTester.h
index ee0a2f5a9d4b7..ccd674fd7ab38 100644
--- a/DQMServices/Examples/interface/ConverterTester.h
+++ b/DQMServices/Examples/interface/ConverterTester.h
@@ -2,7 +2,7 @@
 #define ConverterTester_h
 
 /** \class ConverterTester
- *  
+ *
  *  Class to fill dqm monitor elements from existing EDM file
  *
  *  \author M. Strang SUNY-Buffalo
@@ -10,43 +10,39 @@
 
 // framework & common header files
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/Run.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-//DQM services
+// DQM services
 #include "DQMServices/Core/interface/DQMStore.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include <iostream>
 #include <cstdlib>
-#include <string>
+#include <iostream>
 #include <memory>
+#include <string>
 #include <vector>
 
-#include "TString.h"
 #include "TRandom.h"
 #include "TRandom3.h"
+#include "TString.h"
 
-class ConverterTester : public edm::EDAnalyzer
-{
-  
- public:
-
-  explicit ConverterTester(const edm::ParameterSet&);
+class ConverterTester : public edm::EDAnalyzer {
+public:
+  explicit ConverterTester(const edm::ParameterSet &);
   ~ConverterTester() override;
   void beginJob() override;
-  void endJob() override;  
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void beginRun(const edm::Run&, const edm::EventSetup&) override;
-  void endRun(const edm::Run&, const edm::EventSetup&) override;
+  void endJob() override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void beginRun(const edm::Run &, const edm::EventSetup &) override;
+  void endRun(const edm::Run &, const edm::EventSetup &) override;
 
-  
 private:
   std::string fName;
   int verbosity;
@@ -69,7 +65,7 @@ class ConverterTester : public edm::EDAnalyzer
   double RandomVal2;
   double RandomVal3;
 
- // private statistics information
+  // private statistics information
   unsigned int count;
 };
 
diff --git a/DQMServices/Examples/interface/DQMClientExample.h b/DQMServices/Examples/interface/DQMClientExample.h
index 22faf660ca787..75a6d46252647 100644
--- a/DQMServices/Examples/interface/DQMClientExample.h
+++ b/DQMServices/Examples/interface/DQMClientExample.h
@@ -6,62 +6,55 @@
  *  DQM Test Client
  *
  *  \author  M. Zanetti CERN
- *   
+ *
  */
 
-
 /* Jan 17, 2009: the code has been modified significantly
- * to steer the client operations  
+ * to steer the client operations
  * Author: D.Volyanskyy
  */
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include <memory>
-#include <iostream>
 #include <fstream>
+#include <iostream>
+#include <map>
+#include <memory>
 #include <string>
 #include <vector>
-#include <map>
-
-
-class DQMClientExample: public edm::EDAnalyzer {
 
+class DQMClientExample : public edm::EDAnalyzer {
 public:
-
   ////---- constructor
-  DQMClientExample(const edm::ParameterSet& ps);
-  
+  DQMClientExample(const edm::ParameterSet &ps);
+
   ////---- destructor
   ~DQMClientExample() override;
 
 protected:
-
   ////---- beginJob
   void beginJob() override;
 
   ////---- beginRun
-  void beginRun(const edm::Run& r, const edm::EventSetup& c) override;
+  void beginRun(const edm::Run &r, const edm::EventSetup &c) override;
 
   ////---- analyze
-  void analyze(const edm::Event& e, const edm::EventSetup& c) override ;
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
   ////---- performClient
   void performClient();
 
   ////---- beginLuminosityBlock
-  void beginLuminosityBlock(const edm::LuminosityBlock& lumiSeg, 
-                            const edm::EventSetup& context) override ;
+  void beginLuminosityBlock(const edm::LuminosityBlock &lumiSeg, const edm::EventSetup &context) override;
 
-  ////--- endLuminosityBlock 
-  void endLuminosityBlock(const edm::LuminosityBlock& lumiSeg, 
-                         const edm::EventSetup& c) override;
+  ////--- endLuminosityBlock
+  void endLuminosityBlock(const edm::LuminosityBlock &lumiSeg, const edm::EventSetup &c) override;
 
   ////---- endRun
-  void endRun(const edm::Run& r, const edm::EventSetup& c) override;
+  void endRun(const edm::Run &r, const edm::EventSetup &c) override;
 
   ////---- endJob
   void endJob() override;
@@ -69,27 +62,24 @@ class DQMClientExample: public edm::EDAnalyzer {
 private:
   ////---- initialize
   void initialize();
-  
+
   edm::ParameterSet parameters_;
 
-  DQMStore* dbe_;  
+  DQMStore *dbe_;
   std::string monitorName_;
   std::string QTestName_;
-  int counterClientOperation ; //-- counter on Client Operations
-  int counterEvt_;     //-- event counter
-  int counterLS_;     //-- LS counter
-  int prescaleEvt_;    //-- prescale on number of events
-  int prescaleLS_;    //-- prescale on number of lumisections
+  int counterClientOperation;  //-- counter on Client Operations
+  int counterEvt_;             //-- event counter
+  int counterLS_;              //-- LS counter
+  int prescaleEvt_;            //-- prescale on number of events
+  int prescaleLS_;             //-- prescale on number of lumisections
   bool clientOnEachEvent;
   bool clientOnEndLumi;
   bool clientOnEndRun;
   bool clientOnEndJob;
 
   // -------- member data --------
-  MonitorElement * clientHisto;
-
+  MonitorElement *clientHisto;
 };
 
 #endif
-
-
diff --git a/DQMServices/Examples/interface/DQMExample_Step1.h b/DQMServices/Examples/interface/DQMExample_Step1.h
index 1d4412888d8be..fa3a4c22376d5 100644
--- a/DQMServices/Examples/interface/DQMExample_Step1.h
+++ b/DQMServices/Examples/interface/DQMExample_Step1.h
@@ -1,21 +1,21 @@
 #ifndef DQMExample_Step1_H
 #define DQMExample_Step1_H
 
-//Framework
+// Framework
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
-//event
+// event
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-//Candidate handling
+// Candidate handling
 #include "DataFormats/Candidate/interface/Candidate.h"
 #include "DataFormats/Candidate/interface/CandidateFwd.h"
 
@@ -40,39 +40,35 @@
 
 // Trigger
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "FWCore/Common/interface/TriggerNames.h"
 
- 
-class DQMExample_Step1: public DQMEDAnalyzer{
-
+class DQMExample_Step1 : public DQMEDAnalyzer {
 public:
-
-  DQMExample_Step1(const edm::ParameterSet& ps);
+  DQMExample_Step1(const edm::ParameterSet &ps);
   ~DQMExample_Step1() override;
-  
-protected:
 
+protected:
   void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;
-  void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
+  void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
 
 private:
-  //histos booking function
+  // histos booking function
   void bookHistos(DQMStore::IBooker &);
 
-  //other functions
-  bool MediumEle(const edm::Event & iEvent, const edm::EventSetup & iESetup, const reco::GsfElectron & electron);
-  double Distance(const reco::Candidate & c1, const reco::Candidate & c2 );
-  double DistancePhi(const reco::Candidate & c1, const reco::Candidate & c2 );
+  // other functions
+  bool MediumEle(const edm::Event &iEvent, const edm::EventSetup &iESetup, const reco::GsfElectron &electron);
+  double Distance(const reco::Candidate &c1, const reco::Candidate &c2);
+  double DistancePhi(const reco::Candidate &c1, const reco::Candidate &c2);
   double calcDeltaPhi(double phi1, double phi2);
 
-  //private variables
+  // private variables
   math::XYZPoint PVPoint_;
 
-  //variables from config file
+  // variables from config file
   edm::EDGetTokenT<reco::GsfElectronCollection> theElectronCollection_;
   edm::EDGetTokenT<reco::ConversionCollection> theConversionCollection_;
   edm::EDGetTokenT<reco::CaloJetCollection> theCaloJetCollection_;
@@ -93,33 +89,32 @@ class DQMExample_Step1: public DQMEDAnalyzer{
   int nBJets;
 
   // Histograms
-  MonitorElement* h_vertex_number;
-
-  MonitorElement* h_pfMet;
-
-  MonitorElement* h_eMultiplicity;
-  MonitorElement* h_ePt_leading;
-  MonitorElement* h_eEta_leading;
-  MonitorElement* h_ePhi_leading;
-  MonitorElement* h_ePt_leading_matched;
-  MonitorElement* h_eEta_leading_matched;
-  MonitorElement* h_ePhi_leading_matched;
-
-  MonitorElement* h_eMultiplicity_HLT;
-  MonitorElement* h_ePt_leading_HLT;
-  MonitorElement* h_eEta_leading_HLT;
-  MonitorElement* h_ePhi_leading_HLT;
-  MonitorElement* h_ePt_leading_HLT_matched;
-  MonitorElement* h_eEta_leading_HLT_matched;
-  MonitorElement* h_ePhi_leading_HLT_matched;
-
-  MonitorElement* h_jMultiplicity;
-  MonitorElement* h_jPt_leading;
-  MonitorElement* h_jEta_leading;
-  MonitorElement* h_jPhi_leading;
-  
-  MonitorElement* h_ePt_diff;
+  MonitorElement *h_vertex_number;
+
+  MonitorElement *h_pfMet;
+
+  MonitorElement *h_eMultiplicity;
+  MonitorElement *h_ePt_leading;
+  MonitorElement *h_eEta_leading;
+  MonitorElement *h_ePhi_leading;
+  MonitorElement *h_ePt_leading_matched;
+  MonitorElement *h_eEta_leading_matched;
+  MonitorElement *h_ePhi_leading_matched;
+
+  MonitorElement *h_eMultiplicity_HLT;
+  MonitorElement *h_ePt_leading_HLT;
+  MonitorElement *h_eEta_leading_HLT;
+  MonitorElement *h_ePhi_leading_HLT;
+  MonitorElement *h_ePt_leading_HLT_matched;
+  MonitorElement *h_eEta_leading_HLT_matched;
+  MonitorElement *h_ePhi_leading_HLT_matched;
+
+  MonitorElement *h_jMultiplicity;
+  MonitorElement *h_jPt_leading;
+  MonitorElement *h_jEta_leading;
+  MonitorElement *h_jPhi_leading;
+
+  MonitorElement *h_ePt_diff;
 };
 
-
 #endif
diff --git a/DQMServices/Examples/interface/DQMExample_Step2.h b/DQMServices/Examples/interface/DQMExample_Step2.h
index 2a3609bc3e277..d62cdf51ad856 100644
--- a/DQMServices/Examples/interface/DQMExample_Step2.h
+++ b/DQMServices/Examples/interface/DQMExample_Step2.h
@@ -1,41 +1,39 @@
 #ifndef DQMExample_Step2_H
 #define DQMExample_Step2_H
 
-//Framework
+// Framework
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
- 
-class DQMExample_Step2: public DQMEDHarvester{
 
+class DQMExample_Step2 : public DQMEDHarvester {
 public:
-
-  DQMExample_Step2(const edm::ParameterSet& ps);
+  DQMExample_Step2(const edm::ParameterSet &ps);
   ~DQMExample_Step2() override;
-  
-protected:
 
+protected:
   void beginJob() override;
-  void dqmEndLuminosityBlock(DQMStore::IBooker &, DQMStore::IGetter &, edm::LuminosityBlock const &, edm::EventSetup const&) override;  //performed in the endLumi
-  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;  //performed in the endJob
+  void dqmEndLuminosityBlock(DQMStore::IBooker &,
+                             DQMStore::IGetter &,
+                             edm::LuminosityBlock const &,
+                             edm::EventSetup const &) override;  // performed in the endLumi
+  void dqmEndJob(DQMStore::IBooker &,
+                 DQMStore::IGetter &) override;  // performed in the endJob
 
 private:
+  // private variables
 
-  //private variables
-
-  //variables from config file
+  // variables from config file
   std::string numMonitorName_;
   std::string denMonitorName_;
 
   // Histograms
-  MonitorElement* h_ptRatio;
-
+  MonitorElement *h_ptRatio;
 };
 
-
 #endif
diff --git a/DQMServices/Examples/interface/DQMSourceExample.h b/DQMServices/Examples/interface/DQMSourceExample.h
index 9c57ddc08fc61..8eafd6c9fa7a4 100644
--- a/DQMServices/Examples/interface/DQMSourceExample.h
+++ b/DQMServices/Examples/interface/DQMSourceExample.h
@@ -6,10 +6,10 @@
  *  DQM Test Client
  *
  *  \author  M. Zanetti CERN
- *   
+ *
  */
-#include <FWCore/Framework/interface/EDAnalyzer.h>
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <FWCore/Framework/interface/EDAnalyzer.h>
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
@@ -20,79 +20,74 @@
 
 class DQMSourceExample : public edm::EDAnalyzer {
 public:
-  DQMSourceExample( const edm::ParameterSet& );
+  DQMSourceExample(const edm::ParameterSet &);
   ~DQMSourceExample() override;
 
 protected:
-   
   // BeginJob
   void beginJob() override;
 
   // BeginRun
-  void beginRun(const edm::Run& r, const edm::EventSetup& c) override;
+  void beginRun(const edm::Run &r, const edm::EventSetup &c) override;
 
   // Fake Analyze
-  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
-
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
   // DQM Client Diagnostic
 
   // EndRun
-  void endRun(const edm::Run& r, const edm::EventSetup& c) override;
+  void endRun(const edm::Run &r, const edm::EventSetup &c) override;
 
   // Endjob
   void endJob() override;
 
 private:
-
   void initialize();
- 
+
   edm::ParameterSet parameters_;
 
-  DQMStore* dbe_;
+  DQMStore *dbe_;
   std::string monitorName_;
 
   int counterEvt_;
   int counterLS_;
 
-  int prescaleEvt_;    // every n events
-  int prescaleLS_;     // units of lumi sections
+  int prescaleEvt_;  // every n events
+  int prescaleLS_;   // units of lumi sections
 
   // ---------- member data ----------
 
-  int   NBINS;
+  int NBINS;
   float XMIN, XMAX;
 
   // monitor elements for testing of Quality Tests
-  MonitorElement * xTrue;
-  MonitorElement * xFalse;
-  MonitorElement * yTrue;
-  MonitorElement * yFalse;
+  MonitorElement *xTrue;
+  MonitorElement *xFalse;
+  MonitorElement *yTrue;
+  MonitorElement *yFalse;
 
-  MonitorElement * wExpTrue;
-  MonitorElement * wExpFalse;
-  MonitorElement * meanTrue;
-  MonitorElement * meanFalse;
+  MonitorElement *wExpTrue;
+  MonitorElement *wExpFalse;
+  MonitorElement *meanTrue;
+  MonitorElement *meanFalse;
 
-  MonitorElement * deadTrue;
-  MonitorElement * deadFalse;
-  MonitorElement * noisyTrue;
-  MonitorElement * noisyFalse;
+  MonitorElement *deadTrue;
+  MonitorElement *deadFalse;
+  MonitorElement *noisyTrue;
+  MonitorElement *noisyFalse;
 
   // several ME more
-  MonitorElement * i1;
-  MonitorElement * f1;
-  MonitorElement * s1;
-  MonitorElement * p1;
-  MonitorElement * p2;
-  MonitorElement * h1;
-  MonitorElement * h1hist;
-  MonitorElement * h2;
-  MonitorElement * h3;
-  MonitorElement * h4;
-  MonitorElement * summ;
-
+  MonitorElement *i1;
+  MonitorElement *f1;
+  MonitorElement *s1;
+  MonitorElement *p1;
+  MonitorElement *p2;
+  MonitorElement *h1;
+  MonitorElement *h1hist;
+  MonitorElement *h2;
+  MonitorElement *h3;
+  MonitorElement *h4;
+  MonitorElement *summ;
 };
 
 #endif
-
diff --git a/DQMServices/Examples/interface/HarvestingAnalyzer.h b/DQMServices/Examples/interface/HarvestingAnalyzer.h
index 485ea10ca26d2..ab8c4b3ebe370 100644
--- a/DQMServices/Examples/interface/HarvestingAnalyzer.h
+++ b/DQMServices/Examples/interface/HarvestingAnalyzer.h
@@ -2,7 +2,7 @@
 #define HarvestingAnalyzer_h
 
 /** \class HarvestingAnalyzer
- *  
+ *
  *  Class to perform operations on MEs after EDMtoMEConverter
  *
  *  \author M. Strang SUNY-Buffalo
@@ -10,46 +10,41 @@
 
 // framework & common header files
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/Run.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-//DQM services
+// DQM services
 #include "DQMServices/Core/interface/DQMStore.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include <iostream>
 #include <cstdlib>
-#include <string>
+#include <iostream>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "TString.h"
 
-class HarvestingAnalyzer : public edm::EDAnalyzer
-{
-  
- public:
-
-  explicit HarvestingAnalyzer(const edm::ParameterSet&);
+class HarvestingAnalyzer : public edm::EDAnalyzer {
+public:
+  explicit HarvestingAnalyzer(const edm::ParameterSet &);
   ~HarvestingAnalyzer() override;
   void beginJob() override;
-  void endJob() override;  
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void beginRun(const edm::Run&, const edm::EventSetup&) override;
-  void endRun(const edm::Run&, const edm::EventSetup&) override;
+  void endJob() override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void beginRun(const edm::Run &, const edm::EventSetup &) override;
+  void endRun(const edm::Run &, const edm::EventSetup &) override;
 
-  
 private:
   std::string fName;
   int verbosity;
   DQMStore *dbe;
-
 };
 
 #endif
diff --git a/DQMServices/Examples/interface/HarvestingDataCertification.h b/DQMServices/Examples/interface/HarvestingDataCertification.h
index d7c5cda4ae255..160d76aa98342 100644
--- a/DQMServices/Examples/interface/HarvestingDataCertification.h
+++ b/DQMServices/Examples/interface/HarvestingDataCertification.h
@@ -2,7 +2,7 @@
 #define HarvestingDataCertification_h
 
 /** \class HarvestingDataCertification
- *  
+ *
  *  Class to fill dqm monitor elements from existing EDM file
  *
  *  \author M. Strang SUNY-Buffalo
@@ -10,39 +10,35 @@
 
 // framework & common header files
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/Run.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-//DQM services
+// DQM services
 #include "DQMServices/Core/interface/DQMStore.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include <iostream>
 #include <cstdlib>
-#include <string>
+#include <iostream>
 #include <memory>
+#include <string>
 #include <vector>
 
-class HarvestingDataCertification : public edm::EDAnalyzer
-{
-  
- public:
-
-  explicit HarvestingDataCertification(const edm::ParameterSet&);
+class HarvestingDataCertification : public edm::EDAnalyzer {
+public:
+  explicit HarvestingDataCertification(const edm::ParameterSet &);
   ~HarvestingDataCertification() override;
   void beginJob() override;
-  void endJob() override;  
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void beginRun(const edm::Run&, const edm::EventSetup&) override;
-  void endRun(const edm::Run&, const edm::EventSetup&) override;
+  void endJob() override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void beginRun(const edm::Run &, const edm::EventSetup &) override;
+  void endRun(const edm::Run &, const edm::EventSetup &) override;
 
-  
 private:
   std::string fName;
   int verbosity;
diff --git a/DQMServices/Examples/plugins/SealModule.cc b/DQMServices/Examples/plugins/SealModule.cc
index 38b2098bab53c..49a4a44c527d8 100644
--- a/DQMServices/Examples/plugins/SealModule.cc
+++ b/DQMServices/Examples/plugins/SealModule.cc
@@ -1,7 +1,7 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 // The example source module
 #include "DQMServices/Examples/interface/DQMSourceExample.h"
-// The example client module for running the client in the same application as 
+// The example client module for running the client in the same application as
 // the source
 #include "DQMServices/Examples/interface/DQMClientExample.h"
 DEFINE_FWK_MODULE(DQMClientExample);
diff --git a/DQMServices/Examples/src/ConverterTester.cc b/DQMServices/Examples/src/ConverterTester.cc
index b491af9753715..f4821d81e4407 100644
--- a/DQMServices/Examples/src/ConverterTester.cc
+++ b/DQMServices/Examples/src/ConverterTester.cc
@@ -1,36 +1,31 @@
 #include "DQMServices/Examples/interface/ConverterTester.h"
 
-ConverterTester::ConverterTester(const edm::ParameterSet& iPSet)
-{
+ConverterTester::ConverterTester(const edm::ParameterSet &iPSet) {
   std::string MsgLoggerCat = "ConverterTester_ConverterTester";
 
   fName = iPSet.getUntrackedParameter<std::string>("Name");
   verbosity = iPSet.getUntrackedParameter<int>("Verbosity");
   frequency = iPSet.getUntrackedParameter<int>("Frequency");
- 
+
   if (verbosity >= 0) {
-    edm::LogInfo(MsgLoggerCat) 
-      << "\n===============================\n"
-      << "Initialized as EDAnalyzer with parameter values:\n"
-      << "    Name          = " << fName << "\n"
-      << "    Verbosity     = " << verbosity << "\n"
-      << "    Frequency     = " << frequency << "\n"
-      << "===============================\n";
+    edm::LogInfo(MsgLoggerCat) << "\n===============================\n"
+                               << "Initialized as EDAnalyzer with parameter values:\n"
+                               << "    Name          = " << fName << "\n"
+                               << "    Verbosity     = " << verbosity << "\n"
+                               << "    Frequency     = " << frequency << "\n"
+                               << "===============================\n";
   }
- 
+
   dbe = nullptr;
   dbe = edm::Service<DQMStore>().operator->();
- 
-  count = 0;
 
+  count = 0;
 }
 
 ConverterTester::~ConverterTester() {}
 
-void ConverterTester::beginJob()
-{
-
-  if(dbe){
+void ConverterTester::beginJob() {
+  if (dbe) {
     meTestString = nullptr;
     meTestInt = nullptr;
     meTestFloat = nullptr;
@@ -41,9 +36,9 @@ void ConverterTester::beginJob()
     meTestProfile1 = nullptr;
     meTestProfile2 = nullptr;
     Random = new TRandom3();
-    
+
     dbe->setCurrentFolder("ConverterTest/String");
-    meTestString = dbe->bookString("TestString","Test String" );
+    meTestString = dbe->bookString("TestString", "Test String");
 
     dbe->setCurrentFolder("ConverterTest/Int");
     meTestInt = dbe->bookInt("TestInt");
@@ -52,78 +47,61 @@ void ConverterTester::beginJob()
     meTestFloat = dbe->bookFloat("TestFloat");
 
     dbe->setCurrentFolder("ConverterTest/TH1F");
-    meTestTH1FN = 
-      dbe->book1D("Random1DN", "Random1D Numerator", 100, -10., 10.);
-    meTestTH1FD = 
-      dbe->book1D("Random1DD", "Random1D Denominator", 100, -10., 10.);
+    meTestTH1FN = dbe->book1D("Random1DN", "Random1D Numerator", 100, -10., 10.);
+    meTestTH1FD = dbe->book1D("Random1DD", "Random1D Denominator", 100, -10., 10.);
 
     dbe->setCurrentFolder("ConverterTest/TH2F");
-    meTestTH2F = dbe->book2D("Random2D", "Random2D", 100, -10, 10., 100, -10., 
-			     10.);
+    meTestTH2F = dbe->book2D("Random2D", "Random2D", 100, -10, 10., 100, -10., 10.);
 
     dbe->setCurrentFolder("ConverterTest/TH3F");
-    meTestTH3F = dbe->book3D("Random3D", "Random3D", 100, -10., 10., 100, 
-			     -10., 10., 100, -10., 10.);
+    meTestTH3F = dbe->book3D("Random3D", "Random3D", 100, -10., 10., 100, -10., 10., 100, -10., 10.);
 
     dbe->setCurrentFolder("ConverterTest/TProfile");
-    meTestProfile1 = dbe->bookProfile("Profile1", "Profile1", 100, -10., 10., 
-				      100, -10., 10.);
+    meTestProfile1 = dbe->bookProfile("Profile1", "Profile1", 100, -10., 10., 100, -10., 10.);
 
     dbe->setCurrentFolder("ConverterTest/TProfile2D");
-    meTestProfile2 = dbe->bookProfile2D("Profile2", "Profile2", 100, -10., 
-					10., 100, -10, 10., 100, -10., 10.);
-
-    dbe->tag(meTestTH1FN->getFullname(),1);
-    dbe->tag(meTestTH1FD->getFullname(),2);    
-    dbe->tag(meTestTH2F->getFullname(),3);
-    dbe->tag(meTestTH3F->getFullname(),4);
-    dbe->tag(meTestProfile1->getFullname(),5);
-    dbe->tag(meTestProfile2->getFullname(),6);
-    dbe->tag(meTestString->getFullname(),7);
-    dbe->tag(meTestInt->getFullname(),8);
-    dbe->tag(meTestFloat->getFullname(),9);
+    meTestProfile2 = dbe->bookProfile2D("Profile2", "Profile2", 100, -10., 10., 100, -10, 10., 100, -10., 10.);
+
+    dbe->tag(meTestTH1FN->getFullname(), 1);
+    dbe->tag(meTestTH1FD->getFullname(), 2);
+    dbe->tag(meTestTH2F->getFullname(), 3);
+    dbe->tag(meTestTH3F->getFullname(), 4);
+    dbe->tag(meTestProfile1->getFullname(), 5);
+    dbe->tag(meTestProfile2->getFullname(), 6);
+    dbe->tag(meTestString->getFullname(), 7);
+    dbe->tag(meTestInt->getFullname(), 8);
+    dbe->tag(meTestFloat->getFullname(), 9);
   }
 
   return;
 }
 
-void ConverterTester::endJob()
-{
+void ConverterTester::endJob() {
   std::string MsgLoggerCat = "ConverterTester_endJob";
   if (verbosity >= 0)
-    edm::LogInfo(MsgLoggerCat) 
-      << "Terminating having processed " << count << " events.";
+    edm::LogInfo(MsgLoggerCat) << "Terminating having processed " << count << " events.";
   return;
 }
 
-void ConverterTester::beginRun(const edm::Run& iRun, 
-				const edm::EventSetup& iSetup)
-{
-  return;
-}
+void ConverterTester::beginRun(const edm::Run &iRun, const edm::EventSetup &iSetup) { return; }
 
-void ConverterTester::endRun(const edm::Run& iRun, 
-			      const edm::EventSetup& iSetup)
-{
+void ConverterTester::endRun(const edm::Run &iRun, const edm::EventSetup &iSetup) {
   meTestInt->Fill(100);
   meTestFloat->Fill(3.141592);
 
   return;
 }
 
-void ConverterTester::analyze(const edm::Event& iEvent, 
-			       const edm::EventSetup& iSetup)
-{
-  
+void ConverterTester::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   ++count;
 
-  for(int i = 0; i < 1000; ++i) {
-    RandomVal1 = Random->Gaus(0.,1.);
-    RandomVal2 = Random->Gaus(0.,1.);
-    RandomVal3 = Random->Gaus(0.,1.);
-    
-    meTestTH1FN->Fill(0.5*RandomVal1);
-    meTestTH1FD->Fill(RandomVal1);    
+  for (int i = 0; i < 1000; ++i) {
+    RandomVal1 = Random->Gaus(0., 1.);
+    RandomVal2 = Random->Gaus(0., 1.);
+    RandomVal3 = Random->Gaus(0., 1.);
+
+    meTestTH1FN->Fill(0.5 * RandomVal1);
+    meTestTH1FD->Fill(RandomVal1);
     meTestTH2F->Fill(RandomVal1, RandomVal2);
     meTestTH3F->Fill(RandomVal1, RandomVal2, RandomVal3);
     meTestProfile1->Fill(RandomVal1, RandomVal2);
diff --git a/DQMServices/Examples/src/DQMClientExample.cc b/DQMServices/Examples/src/DQMClientExample.cc
index c67e1bc4c643a..ab6db027232ce 100644
--- a/DQMServices/Examples/src/DQMClientExample.cc
+++ b/DQMServices/Examples/src/DQMClientExample.cc
@@ -6,27 +6,25 @@
  *
  */
 
-
-/*  Description: Simple example showing how to access the histograms 
- *  already defined and filled by the DQM producer(source) 
+/*  Description: Simple example showing how to access the histograms
+ *  already defined and filled by the DQM producer(source)
  *  and how to access the quality test results.
  */
 
 /* Jan 17, 2009: the code has been modified significantly
- * to steer the client operations  
+ * to steer the client operations
  * Author: D.Volyanskyy
  */
 
-
 #include "DQMServices/Examples/interface/DQMClientExample.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include <TF1.h>
+#include <cmath>
 #include <cstdio>
 #include <sstream>
-#include <cmath>
 
 using namespace edm;
 using namespace std;
@@ -34,180 +32,188 @@ using namespace std;
 //==================================================================//
 //================= Constructor and Destructor =====================//
 //==================================================================//
-DQMClientExample::DQMClientExample(const edm::ParameterSet& ps)
-{
-  parameters_=ps;
+DQMClientExample::DQMClientExample(const edm::ParameterSet &ps) {
+  parameters_ = ps;
   initialize();
 }
 
-DQMClientExample::~DQMClientExample(){
-}
+DQMClientExample::~DQMClientExample() {}
 
 //==================================================================//
 //======================= Initialise ===============================//
 //==================================================================//
-void DQMClientExample::initialize(){ 
-
+void DQMClientExample::initialize() {
   ////---- initialise Event and LS counters
-  counterEvt_=0;   counterLS_  = 0; 
+  counterEvt_ = 0;
+  counterLS_ = 0;
   counterClientOperation = 0;
-  
+
   ////---- get DQM store interface
   dbe_ = Service<DQMStore>().operator->();
-  
+
   ////---- define base folder for the contents of this job
-  monitorName_ = parameters_.getUntrackedParameter<string>("monitorName","YourSubsystemName");
+  monitorName_ = parameters_.getUntrackedParameter<string>("monitorName", "YourSubsystemName");
   cout << "DQMClientExample: Monitor name = " << monitorName_ << endl;
-  if (monitorName_ != "" ) monitorName_ = monitorName_+"/" ;
+  if (!monitorName_.empty())
+    monitorName_ = monitorName_ + "/";
 
   ////--- get steerable parameters
-  prescaleLS_  = parameters_.getUntrackedParameter<int>("prescaleLS",  -1);
-  cout << "DQMClientExample: DQM lumi section prescale = " << prescaleLS_ << " lumi section(s)"<< endl;
+  prescaleLS_ = parameters_.getUntrackedParameter<int>("prescaleLS", -1);
+  cout << "DQMClientExample: DQM lumi section prescale = " << prescaleLS_ << " lumi section(s)" << endl;
   prescaleEvt_ = parameters_.getUntrackedParameter<int>("prescaleEvt", -1);
-  cout << "DQMClientExample: DQM event prescale = " << prescaleEvt_ << " events(s)"<< endl;
+  cout << "DQMClientExample: DQM event prescale = " << prescaleEvt_ << " events(s)" << endl;
 
   //-- QTestName that is going to bu run on clienHisto, as defined in XML file
-  QTestName_ = parameters_.getUntrackedParameter<string>("QTestName","exampleQTest");  
+  QTestName_ = parameters_.getUntrackedParameter<string>("QTestName", "exampleQTest");
   cout << "DQMClientExample: QTest name to be ran on clientHisto = " << QTestName_ << endl;
   //-- define where to run the Client
-  clientOnEachEvent  = parameters_.getUntrackedParameter<bool>("clientOnEachEvent",false);
-  if(clientOnEachEvent) cout << "DQMClientExample: run Client on each event" << endl;
-  clientOnEndLumi  = parameters_.getUntrackedParameter<bool>("clientOnEndLumi",true);
-  if(clientOnEndLumi) cout << "DQMClientExample: run Client at the end of each lumi section" << endl;
-  clientOnEndRun   = parameters_.getUntrackedParameter<bool>("clientOnEndRun",false);
-  if(clientOnEndRun) cout << "DQMClientExample: run Client at the end of each run" << endl;
-  clientOnEndJob   = parameters_.getUntrackedParameter<bool>("clientOnEndJob",false);
-  if(clientOnEndJob) cout << "DQMClientExample: run Client at the end of the job" << endl;
-
+  clientOnEachEvent = parameters_.getUntrackedParameter<bool>("clientOnEachEvent", false);
+  if (clientOnEachEvent)
+    cout << "DQMClientExample: run Client on each event" << endl;
+  clientOnEndLumi = parameters_.getUntrackedParameter<bool>("clientOnEndLumi", true);
+  if (clientOnEndLumi)
+    cout << "DQMClientExample: run Client at the end of each lumi section" << endl;
+  clientOnEndRun = parameters_.getUntrackedParameter<bool>("clientOnEndRun", false);
+  if (clientOnEndRun)
+    cout << "DQMClientExample: run Client at the end of each run" << endl;
+  clientOnEndJob = parameters_.getUntrackedParameter<bool>("clientOnEndJob", false);
+  if (clientOnEndJob)
+    cout << "DQMClientExample: run Client at the end of the job" << endl;
 }
 //==================================================================//
 //========================= beginJob ===============================//
 //==================================================================//
-void DQMClientExample::beginJob(){
-
-   ////---- get DQM store interface 
+void DQMClientExample::beginJob() {
+  ////---- get DQM store interface
   dbe_ = Service<DQMStore>().operator->();
 
   ////---- define the directory where the clientHisto will be located;
-  dbe_->setCurrentFolder(monitorName_+"DQMclient");
+  dbe_->setCurrentFolder(monitorName_ + "DQMclient");
   clientHisto = dbe_->book1D("clientHisto", "Guassian fit results.", 2, 0, 1);
 }
 
 //==================================================================//
 //========================= beginRun ===============================//
 //==================================================================//
-void DQMClientExample::beginRun(const Run& r, const EventSetup& context) {
-}
+void DQMClientExample::beginRun(const Run &r, const EventSetup &context) {}
 
 //==================================================================//
 //==================== beginLuminosityBlock ========================//
 //==================================================================//
-void DQMClientExample::beginLuminosityBlock(const LuminosityBlock& lumiSeg, const EventSetup& context) {
-   // optionally reset histograms here
-   // clientHisto->Reset();
+void DQMClientExample::beginLuminosityBlock(const LuminosityBlock &lumiSeg, const EventSetup &context) {
+  // optionally reset histograms here
+  // clientHisto->Reset();
 }
 
 //==================================================================//
 //==================== analyse (takes each event) ==================//
 //==================================================================//
-void DQMClientExample::analyze(const Event& e, const EventSetup& context){
+void DQMClientExample::analyze(const Event &e, const EventSetup &context) {
   counterEvt_++;
-  if(clientOnEachEvent){
-   if (prescaleEvt_>0 && counterEvt_ % prescaleEvt_ == 0) performClient();
+  if (clientOnEachEvent) {
+    if (prescaleEvt_ > 0 && counterEvt_ % prescaleEvt_ == 0)
+      performClient();
   }
 }
 
 //==================================================================//
 //========================= endLuminosityBlock =====================//
 //==================================================================//
-void DQMClientExample::endLuminosityBlock(const LuminosityBlock& lumiSeg, const EventSetup& context) {
- counterLS_ ++;
-  if(!clientOnEachEvent && clientOnEndLumi){
-  if( prescaleLS_ > 0  && counterLS_ % prescaleLS_ == 0) performClient();
- } 
+void DQMClientExample::endLuminosityBlock(const LuminosityBlock &lumiSeg, const EventSetup &context) {
+  counterLS_++;
+  if (!clientOnEachEvent && clientOnEndLumi) {
+    if (prescaleLS_ > 0 && counterLS_ % prescaleLS_ == 0)
+      performClient();
+  }
 }
 //==================================================================//
 //============================= endRun =============================//
 //==================================================================//
-void DQMClientExample::endRun(const Run& r, const EventSetup& context){
-  if(clientOnEndRun) performClient();
+void DQMClientExample::endRun(const Run &r, const EventSetup &context) {
+  if (clientOnEndRun)
+    performClient();
 }
 
 //==================================================================//
 //============================= endJob =============================//
 //==================================================================//
-void DQMClientExample::endJob(){
-   std::cout << "DQMSourceClient::endJob()" << std::endl;
-   if(clientOnEndJob) performClient();
+void DQMClientExample::endJob() {
+  std::cout << "DQMSourceClient::endJob()" << std::endl;
+  if (clientOnEndJob)
+    performClient();
 }
 
-
 //==================================================================//
 //======================= performClient ============================//
 //==================================================================//
-void DQMClientExample::performClient(){
-
-   std::cout << "***** run  Client operations as defined in: *****" << std::endl;
-   std::cout << "***** DQMClientExample::performClient    ********" << std::endl;
+void DQMClientExample::performClient() {
+  std::cout << "***** run  Client operations as defined in: *****" << std::endl;
+  std::cout << "***** DQMClientExample::performClient    ********" << std::endl;
 
   //----------------------------------------------------------------------------------------------
-  // example how to retrieve a ME created by the DQM producer (in Examples/src/DQMSourceExample.cc) 
+  // example how to retrieve a ME created by the DQM producer (in
+  // Examples/src/DQMSourceExample.cc)
   //---------------------------------------------------------------------------------------------
-   float mean =0;  float rms = 0;
-  
- ////---- take histo2 histogram created by the DQM Source: DQMSourceExample.cc
+  float mean = 0;
+  float rms = 0;
+
+  ////---- take histo2 histogram created by the DQM Source: DQMSourceExample.cc
   string histoName = monitorName_ + "DQMsource/C1/histo2";
-  MonitorElement * meHisto = dbe_->get(histoName);
-  ////---- check whether it is found 
-  if (meHisto) { 
+  MonitorElement *meHisto = dbe_->get(histoName);
+  ////---- check whether it is found
+  if (meHisto) {
     ////--- extract histo from the ME
     if (TH1F *rootHisto = meHisto->getTH1F()) {
-      if(counterClientOperation<1)
-      std::cout<<"=== DQMClientExample::performClient => the histo is found: entries="<< rootHisto->GetEntries() << "\n" 
-              <<" mean=" << rootHisto->GetMean() << " rms=" << rootHisto->GetRMS() << std::endl;
+      if (counterClientOperation < 1)
+        std::cout << "=== DQMClientExample::performClient => the histo is "
+                     "found: entries="
+                  << rootHisto->GetEntries() << "\n"
+                  << " mean=" << rootHisto->GetMean() << " rms=" << rootHisto->GetRMS() << std::endl;
 
       ////---- make the Gaussian fit to this histogram
-      TF1 *f1 = new TF1("f1","gaus",1,3);
+      TF1 *f1 = new TF1("f1", "gaus", 1, 3);
       rootHisto->Fit(f1);
       mean = f1->GetParameter(1);
       rms = f1->GetParameter(2);
     }
-  clientHisto->setBinContent(1,mean);
-  clientHisto->setBinContent(2,rms);
+    clientHisto->setBinContent(1, mean);
+    clientHisto->setBinContent(2, rms);
   }
 
-  else { //when it is not found !
-  clientHisto->setBinContent(1,-1);
-  clientHisto->setBinContent(2,-1);
- if(counterClientOperation<1)  edm::LogError ("DQMClientExample") <<"--- The following ME :"<< histoName <<" cannot be found\n" 
-            		       <<"--- on the DQM source side !\n";
+  else {  // when it is not found !
+    clientHisto->setBinContent(1, -1);
+    clientHisto->setBinContent(2, -1);
+    if (counterClientOperation < 1)
+      edm::LogError("DQMClientExample") << "--- The following ME :" << histoName << " cannot be found\n"
+                                        << "--- on the DQM source side !\n";
   }
- 
+
   //----------------------------------------------------------------------------------------------
   // example  how to access the Quality test result for clientHisto
   //---------------------------------------------------------------------------------------------
 
- // qtest to be ran on clientHisto is defined in Examples/test/QualityTests.xml
-  const QReport * theQReport = clientHisto->getQReport(QTestName_);
-  if(theQReport) {
-    if(counterClientOperation<1)
-    edm::LogWarning ("DQMClientExample") <<"*** Summary of Quality Test for clientHisto: \n"
-                                       //<<"---  value  ="<< theQReport->getQTresult()<<"\n"
-                                      <<"--- status ="<< theQReport->getStatus() << "\n"
-                                      <<"--- message ="<< theQReport->getMessage() << "\n";
-
-   vector<dqm::me_util::Channel> badChannels = theQReport->getBadChannels();
-    for (vector<dqm::me_util::Channel>::iterator channel = badChannels.begin(); 
-	 channel != badChannels.end(); channel++) {
-        if(counterClientOperation<1) 
-        edm::LogError ("DQMClientExample") <<" Bad channels: "<<(*channel).getBin()<<" "<<(*channel).getContents();
+  // qtest to be ran on clientHisto is defined in Examples/test/QualityTests.xml
+  const QReport *theQReport = clientHisto->getQReport(QTestName_);
+  if (theQReport) {
+    if (counterClientOperation < 1)
+      edm::LogWarning("DQMClientExample") << "*** Summary of Quality Test for clientHisto: \n"
+                                          //<<"---  value  ="<< theQReport->getQTresult()<<"\n"
+                                          << "--- status =" << theQReport->getStatus() << "\n"
+                                          << "--- message =" << theQReport->getMessage() << "\n";
+
+    vector<dqm::me_util::Channel> badChannels = theQReport->getBadChannels();
+    for (vector<dqm::me_util::Channel>::iterator channel = badChannels.begin(); channel != badChannels.end();
+         channel++) {
+      if (counterClientOperation < 1)
+        edm::LogError("DQMClientExample")
+            << " Bad channels: " << (*channel).getBin() << " " << (*channel).getContents();
     }
-  } 
-  else { 
-  if(counterClientOperation<1) edm::LogError ("DQMClientExample") <<"--- No QReport is found for clientHisto!\n"
-  << "--- Please check your XML and config files -> QTestName ( " << QTestName_ << " )must be the same!\n";
+  } else {
+    if (counterClientOperation < 1)
+      edm::LogError("DQMClientExample") << "--- No QReport is found for clientHisto!\n"
+                                        << "--- Please check your XML and config files -> QTestName ( " << QTestName_
+                                        << " )must be the same!\n";
   }
 
- counterClientOperation++;
+  counterClientOperation++;
 }
-
diff --git a/DQMServices/Examples/src/DQMExample_Step1.cc b/DQMServices/Examples/src/DQMExample_Step1.cc
index 2f1056880d322..411c554ca0937 100644
--- a/DQMServices/Examples/src/DQMExample_Step1.cc
+++ b/DQMServices/Examples/src/DQMExample_Step1.cc
@@ -1,361 +1,348 @@
 #include "DQMServices/Examples/interface/DQMExample_Step1.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-
 // Geometry
-#include "DataFormats/Math/interface/deltaR.h"
-#include "DataFormats/Math/interface/deltaPhi.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
+#include "DataFormats/Math/interface/deltaPhi.h"
+#include "DataFormats/Math/interface/deltaR.h"
 #include "TLorentzVector.h"
 
-
-#include <iostream>
-#include <iomanip>
+#include <cmath>
 #include <cstdio>
-#include <string>
+#include <iomanip>
+#include <iostream>
 #include <sstream>
-#include <cmath>
+#include <string>
 
 //
-// -------------------------------------- Constructor --------------------------------------------
+// -------------------------------------- Constructor
+// --------------------------------------------
 //
-DQMExample_Step1::DQMExample_Step1(const edm::ParameterSet& ps)
-{
-  edm::LogInfo("DQMExample_Step1") <<  "Constructor  DQMExample_Step1::DQMExample_Step1 " << std::endl;
-  
-  // Get parameters from configuration file
-  theElectronCollection_   = consumes<reco::GsfElectronCollection>(ps.getParameter<edm::InputTag>("electronCollection"));
-  theCaloJetCollection_    = consumes<reco::CaloJetCollection>(ps.getParameter<edm::InputTag>("caloJetCollection"));
-  thePfMETCollection_      = consumes<reco::PFMETCollection>(ps.getParameter<edm::InputTag>("pfMETCollection"));
-  theConversionCollection_ = consumes<reco::ConversionCollection>(ps.getParameter<edm::InputTag>("conversionsCollection"));
-  thePVCollection_         = consumes<reco::VertexCollection>(ps.getParameter<edm::InputTag>("PVCollection"));
-  theBSCollection_         = consumes<reco::BeamSpot>(ps.getParameter<edm::InputTag>("beamSpotCollection"));
-  triggerEvent_            = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("TriggerEvent"));
-  triggerResults_          = consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>("TriggerResults"));
-  triggerFilter_           = ps.getParameter<edm::InputTag>("TriggerFilter");
-  triggerPath_             = ps.getParameter<std::string>("TriggerPath");
+DQMExample_Step1::DQMExample_Step1(const edm::ParameterSet &ps) {
+  edm::LogInfo("DQMExample_Step1") << "Constructor  DQMExample_Step1::DQMExample_Step1 " << std::endl;
 
+  // Get parameters from configuration file
+  theElectronCollection_ = consumes<reco::GsfElectronCollection>(ps.getParameter<edm::InputTag>("electronCollection"));
+  theCaloJetCollection_ = consumes<reco::CaloJetCollection>(ps.getParameter<edm::InputTag>("caloJetCollection"));
+  thePfMETCollection_ = consumes<reco::PFMETCollection>(ps.getParameter<edm::InputTag>("pfMETCollection"));
+  theConversionCollection_ =
+      consumes<reco::ConversionCollection>(ps.getParameter<edm::InputTag>("conversionsCollection"));
+  thePVCollection_ = consumes<reco::VertexCollection>(ps.getParameter<edm::InputTag>("PVCollection"));
+  theBSCollection_ = consumes<reco::BeamSpot>(ps.getParameter<edm::InputTag>("beamSpotCollection"));
+  triggerEvent_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("TriggerEvent"));
+  triggerResults_ = consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>("TriggerResults"));
+  triggerFilter_ = ps.getParameter<edm::InputTag>("TriggerFilter");
+  triggerPath_ = ps.getParameter<std::string>("TriggerPath");
 
   // cuts:
   ptThrL1_ = ps.getUntrackedParameter<double>("PtThrL1");
   ptThrL2_ = ps.getUntrackedParameter<double>("PtThrL2");
   ptThrJet_ = ps.getUntrackedParameter<double>("PtThrJet");
   ptThrMet_ = ps.getUntrackedParameter<double>("PtThrMet");
- 
 }
 
 //
 // -- Destructor
 //
-DQMExample_Step1::~DQMExample_Step1()
-{
-  edm::LogInfo("DQMExample_Step1") <<  "Destructor DQMExample_Step1::~DQMExample_Step1 " << std::endl;
+DQMExample_Step1::~DQMExample_Step1() {
+  edm::LogInfo("DQMExample_Step1") << "Destructor DQMExample_Step1::~DQMExample_Step1 " << std::endl;
 }
 
 //
-// -------------------------------------- beginRun --------------------------------------------
+// -------------------------------------- beginRun
+// --------------------------------------------
 //
-void DQMExample_Step1::dqmBeginRun(edm::Run const &, edm::EventSetup const &)
-{
-  edm::LogInfo("DQMExample_Step1") <<  "DQMExample_Step1::beginRun" << std::endl;
+void DQMExample_Step1::dqmBeginRun(edm::Run const &, edm::EventSetup const &) {
+  edm::LogInfo("DQMExample_Step1") << "DQMExample_Step1::beginRun" << std::endl;
 }
 //
-// -------------------------------------- bookHistos --------------------------------------------
+// -------------------------------------- bookHistos
+// --------------------------------------------
 //
-void DQMExample_Step1::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run const &, edm::EventSetup const &)
-{
-  edm::LogInfo("DQMExample_Step1") <<  "DQMExample_Step1::bookHistograms" << std::endl;
-  
-  //book at beginRun
+void DQMExample_Step1::bookHistograms(DQMStore::IBooker &ibooker_, edm::Run const &, edm::EventSetup const &) {
+  edm::LogInfo("DQMExample_Step1") << "DQMExample_Step1::bookHistograms" << std::endl;
+
+  // book at beginRun
   bookHistos(ibooker_);
 }
 //
-// -------------------------------------- Analyze --------------------------------------------
+// -------------------------------------- Analyze
+// --------------------------------------------
 //
-void DQMExample_Step1::analyze(edm::Event const& e, edm::EventSetup const& eSetup)
-{
-  edm::LogInfo("DQMExample_Step1") <<  "DQMExample_Step1::analyze" << std::endl;
-
+void DQMExample_Step1::analyze(edm::Event const &e, edm::EventSetup const &eSetup) {
+  edm::LogInfo("DQMExample_Step1") << "DQMExample_Step1::analyze" << std::endl;
 
   //-------------------------------
   //--- Vertex Info
   //-------------------------------
   edm::Handle<reco::VertexCollection> vertexHandle;
   e.getByToken(thePVCollection_, vertexHandle);
-  if ( !vertexHandle.isValid() ) 
-    {
-      edm::LogError ("DQMClientExample") << "invalid collection: vertex" << "\n";
-      return;
-    }
-  
+  if (!vertexHandle.isValid()) {
+    edm::LogError("DQMClientExample") << "invalid collection: vertex"
+                                      << "\n";
+    return;
+  }
+
   int vertex_number = vertexHandle->size();
   reco::VertexCollection::const_iterator v = vertexHandle->begin();
 
   math::XYZPoint PVPoint(-999, -999, -999);
-  if(vertex_number != 0)
+  if (vertex_number != 0)
     PVPoint = math::XYZPoint(v->position().x(), v->position().y(), v->position().z());
-  
-  PVPoint_=PVPoint;
+
+  PVPoint_ = PVPoint;
 
   //-------------------------------
   //--- MET
   //-------------------------------
   edm::Handle<reco::PFMETCollection> pfMETCollection;
   e.getByToken(thePfMETCollection_, pfMETCollection);
-  if ( !pfMETCollection.isValid() )    
-    {
-      edm::LogError ("DQMClientExample") << "invalid collection: MET" << "\n";
-      return;
-    }
+  if (!pfMETCollection.isValid()) {
+    edm::LogError("DQMClientExample") << "invalid collection: MET"
+                                      << "\n";
+    return;
+  }
   //-------------------------------
   //--- Electrons
   //-------------------------------
   edm::Handle<reco::GsfElectronCollection> electronCollection;
   e.getByToken(theElectronCollection_, electronCollection);
-  if ( !electronCollection.isValid() )
-    {
-      edm::LogError ("DQMClientExample") << "invalid collection: electrons" << "\n";
-      return;
+  if (!electronCollection.isValid()) {
+    edm::LogError("DQMClientExample") << "invalid collection: electrons"
+                                      << "\n";
+    return;
+  }
+
+  float nEle = 0;
+  int posEle = 0, negEle = 0;
+  const reco::GsfElectron *ele1 = nullptr;
+  const reco::GsfElectron *ele2 = nullptr;
+  for (reco::GsfElectronCollection::const_iterator recoElectron = electronCollection->begin();
+       recoElectron != electronCollection->end();
+       ++recoElectron) {
+    // decreasing pT
+    if (MediumEle(e, eSetup, *recoElectron)) {
+      if (!ele1 && recoElectron->pt() > ptThrL1_)
+        ele1 = &(*recoElectron);
+
+      else if (!ele2 && recoElectron->pt() > ptThrL2_)
+        ele2 = &(*recoElectron);
     }
 
-  float nEle=0;
-  int posEle=0, negEle=0;
-  const reco::GsfElectron* ele1 = nullptr;
-  const reco::GsfElectron* ele2 = nullptr;
-  for (reco::GsfElectronCollection::const_iterator recoElectron=electronCollection->begin(); recoElectron!=electronCollection->end(); ++recoElectron)
-    {
-      //decreasing pT
-      if( MediumEle(e,eSetup,*recoElectron) )
-	{
-	  if(!ele1 && recoElectron->pt() > ptThrL1_)
-	    ele1 = &(*recoElectron);
-	  
-	  else if(!ele2 && recoElectron->pt() > ptThrL2_)
-	    ele2 = &(*recoElectron);
-
-	}
-      
-      if(recoElectron->charge()==1)
-	posEle++;
-      else if(recoElectron->charge()==-1)
-	negEle++;
-
-    } // end of loop over electrons
-  
-  nEle = posEle+negEle;
-  
+    if (recoElectron->charge() == 1)
+      posEle++;
+    else if (recoElectron->charge() == -1)
+      negEle++;
+
+  }  // end of loop over electrons
+
+  nEle = posEle + negEle;
+
   //-------------------------------
   //--- Jets
   //-------------------------------
   edm::Handle<reco::CaloJetCollection> caloJetCollection;
-  e.getByToken (theCaloJetCollection_,caloJetCollection);
-  if ( !caloJetCollection.isValid() ) 
-    {
-      edm::LogError ("DQMClientExample") << "invalid collection: jets" << "\n";
-      return;
-    }
+  e.getByToken(theCaloJetCollection_, caloJetCollection);
+  if (!caloJetCollection.isValid()) {
+    edm::LogError("DQMClientExample") << "invalid collection: jets"
+                                      << "\n";
+    return;
+  }
+
+  int nJet = 0;
+  const reco::CaloJet *jet1 = nullptr;
+  const reco::CaloJet *jet2 = nullptr;
+
+  for (reco::CaloJetCollection::const_iterator i_calojet = caloJetCollection->begin();
+       i_calojet != caloJetCollection->end();
+       ++i_calojet) {
+    // remove jet-ele matching
+    if (ele1)
+      if (Distance(*i_calojet, *ele1) < 0.3)
+        continue;
+
+    if (ele2)
+      if (Distance(*i_calojet, *ele2) < 0.3)
+        continue;
+
+    if (i_calojet->pt() < ptThrJet_)
+      continue;
+
+    nJet++;
+
+    if (!jet1)
+      jet1 = &(*i_calojet);
+
+    else if (!jet2)
+      jet2 = &(*i_calojet);
+  }
 
-  int   nJet = 0;
-  const reco::CaloJet* jet1 = nullptr;
-  const reco::CaloJet* jet2 = nullptr;
-  
-  for (reco::CaloJetCollection::const_iterator i_calojet = caloJetCollection->begin(); i_calojet != caloJetCollection->end(); ++i_calojet) 
-    {
-      //remove jet-ele matching
-      if(ele1)
-	if (Distance(*i_calojet,*ele1) < 0.3) continue;
-      
-      if(ele2)
-	if (Distance(*i_calojet,*ele2) < 0.3) continue;
-      
-      if (i_calojet->pt() < ptThrJet_) continue;
-
-      nJet++;
-      
-      if (!jet1) 
-	jet1 = &(*i_calojet);
-      
-      else if (!jet2)
-	jet2 = &(*i_calojet);
-    }
-  
   // ---------------------------
   // ---- Analyze Trigger Event
   // ---------------------------
 
-  //check what is in the menu
+  // check what is in the menu
   edm::Handle<edm::TriggerResults> hltresults;
-  e.getByToken(triggerResults_,hltresults);
-  
-  if(!hltresults.isValid())
-    {
-      edm::LogError ("DQMClientExample") << "invalid collection: TriggerResults" << "\n";
-      return;
-    }
-  
+  e.getByToken(triggerResults_, hltresults);
+
+  if (!hltresults.isValid()) {
+    edm::LogError("DQMClientExample") << "invalid collection: TriggerResults"
+                                      << "\n";
+    return;
+  }
+
   bool hasFired = false;
-  const edm::TriggerNames& trigNames = e.triggerNames(*hltresults);
+  const edm::TriggerNames &trigNames = e.triggerNames(*hltresults);
   unsigned int numTriggers = trigNames.size();
-  
-  for( unsigned int hltIndex=0; hltIndex<numTriggers; ++hltIndex )
-    {
-      if (trigNames.triggerName(hltIndex)==triggerPath_ &&  hltresults->wasrun(hltIndex) &&  hltresults->accept(hltIndex))
-	hasFired = true;
-    }
-  
 
+  for (unsigned int hltIndex = 0; hltIndex < numTriggers; ++hltIndex) {
+    if (trigNames.triggerName(hltIndex) == triggerPath_ && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex))
+      hasFired = true;
+  }
 
-  //access the trigger event
+  // access the trigger event
   edm::Handle<trigger::TriggerEvent> triggerEvent;
   e.getByToken(triggerEvent_, triggerEvent);
-  if( triggerEvent.failedToGet() )
-    {
-      edm::LogError ("DQMClientExample") << "invalid collection: TriggerEvent" << "\n";
-      return;
-    }
-
+  if (triggerEvent.failedToGet()) {
+    edm::LogError("DQMClientExample") << "invalid collection: TriggerEvent"
+                                      << "\n";
+    return;
+  }
 
-  reco::Particle* ele1_HLT = nullptr;
+  reco::Particle *ele1_HLT = nullptr;
   int nEle_HLT = 0;
 
-  size_t filterIndex = triggerEvent->filterIndex( triggerFilter_ );
+  size_t filterIndex = triggerEvent->filterIndex(triggerFilter_);
   trigger::TriggerObjectCollection triggerObjects = triggerEvent->getObjects();
-  if( !(filterIndex >= triggerEvent->sizeFilters()) )
-    {
-      const trigger::Keys& keys = triggerEvent->filterKeys( filterIndex );
-      std::vector<reco::Particle> triggeredEle;
-      
-      for( size_t j = 0; j < keys.size(); ++j ) 
-	{
-	  trigger::TriggerObject foundObject = triggerObjects[keys[j]];
-	  if( abs( foundObject.particle().pdgId() ) != 11 )  continue; //make sure that it is an electron
-	  
-	  triggeredEle.push_back( foundObject.particle() );
-	  ++nEle_HLT;
-	}
-      
-      if( !triggeredEle.empty() ) 
-	ele1_HLT = &(triggeredEle.at(0));
+  if (!(filterIndex >= triggerEvent->sizeFilters())) {
+    const trigger::Keys &keys = triggerEvent->filterKeys(filterIndex);
+    std::vector<reco::Particle> triggeredEle;
+
+    for (size_t j = 0; j < keys.size(); ++j) {
+      trigger::TriggerObject foundObject = triggerObjects[keys[j]];
+      if (abs(foundObject.particle().pdgId()) != 11)
+        continue;  // make sure that it is an electron
+
+      triggeredEle.push_back(foundObject.particle());
+      ++nEle_HLT;
     }
 
+    if (!triggeredEle.empty())
+      ele1_HLT = &(triggeredEle.at(0));
+  }
+
   //-------------------------------
   //--- Fill the histos
   //-------------------------------
 
-  //vertex
-  h_vertex_number -> Fill( vertex_number );
+  // vertex
+  h_vertex_number->Fill(vertex_number);
 
-  //met
-  h_pfMet -> Fill( pfMETCollection->begin()->et() );
+  // met
+  h_pfMet->Fill(pfMETCollection->begin()->et());
 
-  //multiplicities
-  h_eMultiplicity->Fill(nEle);       
+  // multiplicities
+  h_eMultiplicity->Fill(nEle);
   h_jMultiplicity->Fill(nJet);
   h_eMultiplicity_HLT->Fill(nEle_HLT);
 
-  //leading not matched
-  if(ele1)
-    {
-      h_ePt_leading->Fill(ele1->pt());
-      h_eEta_leading->Fill(ele1->eta());
-      h_ePhi_leading->Fill(ele1->phi());
-    }
-  if(ele1_HLT)
-    {
-      h_ePt_leading_HLT->Fill(ele1_HLT->pt());
-      h_eEta_leading_HLT->Fill(ele1_HLT->eta());
-      h_ePhi_leading_HLT->Fill(ele1_HLT->phi());
-    }
-  //leading Jet
-  if(jet1)
-    {
-      h_jPt_leading->Fill(jet1->pt());
-      h_jEta_leading->Fill(jet1->eta());
-      h_jPhi_leading->Fill(jet1->phi());
-    }
+  // leading not matched
+  if (ele1) {
+    h_ePt_leading->Fill(ele1->pt());
+    h_eEta_leading->Fill(ele1->eta());
+    h_ePhi_leading->Fill(ele1->phi());
+  }
+  if (ele1_HLT) {
+    h_ePt_leading_HLT->Fill(ele1_HLT->pt());
+    h_eEta_leading_HLT->Fill(ele1_HLT->eta());
+    h_ePhi_leading_HLT->Fill(ele1_HLT->phi());
+  }
+  // leading Jet
+  if (jet1) {
+    h_jPt_leading->Fill(jet1->pt());
+    h_jEta_leading->Fill(jet1->eta());
+    h_jPhi_leading->Fill(jet1->phi());
+  }
 
+  // fill only when the trigger candidate mathes with the reco one
+  if (ele1 && ele1_HLT && deltaR(*ele1_HLT, *ele1) < 0.3 && hasFired == true) {
+    h_ePt_leading_matched->Fill(ele1->pt());
+    h_eEta_leading_matched->Fill(ele1->eta());
+    h_ePhi_leading_matched->Fill(ele1->phi());
 
-  //fill only when the trigger candidate mathes with the reco one
-  if( ele1 && ele1_HLT && deltaR(*ele1_HLT,*ele1) < 0.3 && hasFired==true )
-    {
-      h_ePt_leading_matched->Fill(ele1->pt());
-      h_eEta_leading_matched->Fill(ele1->eta());
-      h_ePhi_leading_matched->Fill(ele1->phi());
-      
-      h_ePt_leading_HLT_matched->Fill(ele1_HLT->pt());
-      h_eEta_leading_HLT_matched->Fill(ele1_HLT->eta());
-      h_ePhi_leading_HLT_matched->Fill(ele1_HLT->phi());
+    h_ePt_leading_HLT_matched->Fill(ele1_HLT->pt());
+    h_eEta_leading_HLT_matched->Fill(ele1_HLT->eta());
+    h_ePhi_leading_HLT_matched->Fill(ele1_HLT->phi());
 
-      h_ePt_diff->Fill(ele1->pt()-ele1_HLT->pt());
-    }
+    h_ePt_diff->Fill(ele1->pt() - ele1_HLT->pt());
+  }
 }
 
 //
-// -------------------------------------- endRun --------------------------------------------
+// -------------------------------------- endRun
+// --------------------------------------------
 //
-void DQMExample_Step1::endRun(edm::Run const& run, edm::EventSetup const& eSetup)
-{
-  edm::LogInfo("DQMExample_Step1") <<  "DQMExample_Step1::endRun" << std::endl;
+void DQMExample_Step1::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
+  edm::LogInfo("DQMExample_Step1") << "DQMExample_Step1::endRun" << std::endl;
 }
 
-
 //
-// -------------------------------------- book histograms --------------------------------------------
+// -------------------------------------- book histograms
+// --------------------------------------------
 //
-void DQMExample_Step1::bookHistos(DQMStore::IBooker & ibooker_)
-{
+void DQMExample_Step1::bookHistos(DQMStore::IBooker &ibooker_) {
   ibooker_.cd();
   ibooker_.setCurrentFolder("Physics/TopTest");
 
-  h_vertex_number = ibooker_.book1D("Vertex_number", "Number of event vertices in collection", 40,-0.5,   39.5 );
+  h_vertex_number = ibooker_.book1D("Vertex_number", "Number of event vertices in collection", 40, -0.5, 39.5);
 
-  h_pfMet        = ibooker_.book1D("pfMet",        "Pf Missing E_{T}; GeV"          , 20,  0.0 , 100);
+  h_pfMet = ibooker_.book1D("pfMet", "Pf Missing E_{T}; GeV", 20, 0.0, 100);
 
-  h_eMultiplicity = ibooker_.book1D("NElectrons","# of electrons per event",10,0.,10.);
-  h_ePt_leading_matched = ibooker_.book1D("ElePt_leading_matched","Pt of leading electron",50,0.,100.);
-  h_eEta_leading_matched = ibooker_.book1D("EleEta_leading_matched","Eta of leading electron",50,-5.,5.);
-  h_ePhi_leading_matched = ibooker_.book1D("ElePhi_leading_matched","Phi of leading electron",50,-3.5,3.5);
+  h_eMultiplicity = ibooker_.book1D("NElectrons", "# of electrons per event", 10, 0., 10.);
+  h_ePt_leading_matched = ibooker_.book1D("ElePt_leading_matched", "Pt of leading electron", 50, 0., 100.);
+  h_eEta_leading_matched = ibooker_.book1D("EleEta_leading_matched", "Eta of leading electron", 50, -5., 5.);
+  h_ePhi_leading_matched = ibooker_.book1D("ElePhi_leading_matched", "Phi of leading electron", 50, -3.5, 3.5);
 
-  h_ePt_leading = ibooker_.book1D("ElePt_leading","Pt of leading electron",50,0.,100.);
-  h_eEta_leading = ibooker_.book1D("EleEta_leading","Eta of leading electron",50,-5.,5.);
-  h_ePhi_leading = ibooker_.book1D("ElePhi_leading","Phi of leading electron",50,-3.5,3.5);
+  h_ePt_leading = ibooker_.book1D("ElePt_leading", "Pt of leading electron", 50, 0., 100.);
+  h_eEta_leading = ibooker_.book1D("EleEta_leading", "Eta of leading electron", 50, -5., 5.);
+  h_ePhi_leading = ibooker_.book1D("ElePhi_leading", "Phi of leading electron", 50, -3.5, 3.5);
 
-  h_jMultiplicity = ibooker_.book1D("NJets","# of electrons per event",10,0.,10.);
-  h_jPt_leading = ibooker_.book1D("JetPt_leading","Pt of leading Jet",150,0.,300.);
-  h_jEta_leading = ibooker_.book1D("JetEta_leading","Eta of leading Jet",50,-5.,5.);
-  h_jPhi_leading = ibooker_.book1D("JetPhi_leading","Phi of leading Jet",50,-3.5,3.5);
+  h_jMultiplicity = ibooker_.book1D("NJets", "# of electrons per event", 10, 0., 10.);
+  h_jPt_leading = ibooker_.book1D("JetPt_leading", "Pt of leading Jet", 150, 0., 300.);
+  h_jEta_leading = ibooker_.book1D("JetEta_leading", "Eta of leading Jet", 50, -5., 5.);
+  h_jPhi_leading = ibooker_.book1D("JetPhi_leading", "Phi of leading Jet", 50, -3.5, 3.5);
 
-  h_eMultiplicity_HLT = ibooker_.book1D("NElectrons_HLT","# of electrons per event @HLT",10,0.,10.);
-  h_ePt_leading_HLT = ibooker_.book1D("ElePt_leading_HLT","Pt of leading electron @HLT",50,0.,100.);
-  h_eEta_leading_HLT = ibooker_.book1D("EleEta_leading_HLT","Eta of leading electron @HLT",50,-5.,5.);
-  h_ePhi_leading_HLT = ibooker_.book1D("ElePhi_leading_HLT","Phi of leading electron @HLT",50,-3.5,3.5);
+  h_eMultiplicity_HLT = ibooker_.book1D("NElectrons_HLT", "# of electrons per event @HLT", 10, 0., 10.);
+  h_ePt_leading_HLT = ibooker_.book1D("ElePt_leading_HLT", "Pt of leading electron @HLT", 50, 0., 100.);
+  h_eEta_leading_HLT = ibooker_.book1D("EleEta_leading_HLT", "Eta of leading electron @HLT", 50, -5., 5.);
+  h_ePhi_leading_HLT = ibooker_.book1D("ElePhi_leading_HLT", "Phi of leading electron @HLT", 50, -3.5, 3.5);
 
-  h_ePt_leading_HLT_matched = ibooker_.book1D("ElePt_leading_HLT_matched","Pt of leading electron @HLT",50,0.,100.);
-  h_eEta_leading_HLT_matched = ibooker_.book1D("EleEta_leading_HLT_matched","Eta of leading electron @HLT",50,-5.,5.);
-  h_ePhi_leading_HLT_matched = ibooker_.book1D("ElePhi_leading_HLT_matched","Phi of leading electron @HLT",50,-3.5,3.5);
+  h_ePt_leading_HLT_matched = ibooker_.book1D("ElePt_leading_HLT_matched", "Pt of leading electron @HLT", 50, 0., 100.);
+  h_eEta_leading_HLT_matched =
+      ibooker_.book1D("EleEta_leading_HLT_matched", "Eta of leading electron @HLT", 50, -5., 5.);
+  h_ePhi_leading_HLT_matched =
+      ibooker_.book1D("ElePhi_leading_HLT_matched", "Phi of leading electron @HLT", 50, -3.5, 3.5);
 
-  h_ePt_diff = ibooker_.book1D("ElePt_diff_matched","pT(RECO) - pT(HLT) for mathed candidates",100,-10,10.);
-
-  ibooker_.cd();  
+  h_ePt_diff = ibooker_.book1D("ElePt_diff_matched", "pT(RECO) - pT(HLT) for mathed candidates", 100, -10, 10.);
 
+  ibooker_.cd();
 }
 
-
 //
-// -------------------------------------- functions --------------------------------------------
+// -------------------------------------- functions
+// --------------------------------------------
 //
-double DQMExample_Step1::Distance( const reco::Candidate & c1, const reco::Candidate & c2 ) {
-        return  deltaR(c1,c2);
-}
+double DQMExample_Step1::Distance(const reco::Candidate &c1, const reco::Candidate &c2) { return deltaR(c1, c2); }
 
-double DQMExample_Step1::DistancePhi( const reco::Candidate & c1, const reco::Candidate & c2 ) {
-        return  deltaPhi(c1.p4().phi(),c2.p4().phi());
+double DQMExample_Step1::DistancePhi(const reco::Candidate &c1, const reco::Candidate &c2) {
+  return deltaPhi(c1.p4().phi(), c2.p4().phi());
 }
 
 // This always returns only a positive deltaPhi
 double DQMExample_Step1::calcDeltaPhi(double phi1, double phi2) {
   double deltaPhi = phi1 - phi2;
-  if (deltaPhi < 0) deltaPhi = -deltaPhi;
+  if (deltaPhi < 0)
+    deltaPhi = -deltaPhi;
   if (deltaPhi > 3.1415926) {
     deltaPhi = 2 * 3.1415926 - deltaPhi;
   }
@@ -363,54 +350,53 @@ double DQMExample_Step1::calcDeltaPhi(double phi1, double phi2) {
 }
 
 //
-// -------------------------------------- electronID --------------------------------------------
+// -------------------------------------- electronID
+// --------------------------------------------
 //
-bool DQMExample_Step1::MediumEle (const edm::Event & iEvent, const edm::EventSetup & iESetup, const reco::GsfElectron & electron)
-{
-    
+bool DQMExample_Step1::MediumEle(const edm::Event &iEvent,
+                                 const edm::EventSetup &iESetup,
+                                 const reco::GsfElectron &electron) {
   //********* CONVERSION TOOLS
   edm::Handle<reco::ConversionCollection> conversions_h;
   iEvent.getByToken(theConversionCollection_, conversions_h);
-  
-  bool isMediumEle = false; 
-  
+
+  bool isMediumEle = false;
+
   float pt = electron.pt();
   float eta = electron.eta();
-    
-  int isEB            = electron.isEB();
+
+  int isEB = electron.isEB();
   float sigmaIetaIeta = electron.sigmaIetaIeta();
-  float DetaIn        = electron.deltaEtaSuperClusterTrackAtVtx();
-  float DphiIn        = electron.deltaPhiSuperClusterTrackAtVtx();
-  float HOverE        = electron.hadronicOverEm();
-  float ooemoop       = (1.0/electron.ecalEnergy() - electron.eSuperClusterOverP()/electron.ecalEnergy());
-  
-  int mishits             = electron.gsfTrack()->hitPattern().numberOfLostHits(reco::HitPattern::MISSING_INNER_HITS);
+  float DetaIn = electron.deltaEtaSuperClusterTrackAtVtx();
+  float DphiIn = electron.deltaPhiSuperClusterTrackAtVtx();
+  float HOverE = electron.hadronicOverEm();
+  float ooemoop = (1.0 / electron.ecalEnergy() - electron.eSuperClusterOverP() / electron.ecalEnergy());
+
+  int mishits = electron.gsfTrack()->hitPattern().numberOfLostHits(reco::HitPattern::MISSING_INNER_HITS);
   int nAmbiguousGsfTracks = electron.ambiguousGsfTracksSize();
-  
-  reco::GsfTrackRef eleTrack  = electron.gsfTrack() ;
-  float dxy           = eleTrack->dxy(PVPoint_);  
-  float dz            = eleTrack->dz (PVPoint_);
-  
+
+  reco::GsfTrackRef eleTrack = electron.gsfTrack();
+  float dxy = eleTrack->dxy(PVPoint_);
+  float dz = eleTrack->dz(PVPoint_);
+
   edm::Handle<reco::BeamSpot> BSHandle;
   iEvent.getByToken(theBSCollection_, BSHandle);
   const reco::BeamSpot BS = *BSHandle;
-  
+
   bool isConverted = ConversionTools::hasMatchedConversion(electron, *conversions_h, BS.position());
-  
+
   // default
-  if(  (pt > 12.) && (fabs(eta) < 2.5) &&
-       ( ( (isEB == 1) && (fabs(DetaIn)  < 0.004) ) || ( (isEB == 0) && (fabs(DetaIn)  < 0.007) ) ) &&
-       ( ( (isEB == 1) && (fabs(DphiIn)  < 0.060) ) || ( (isEB == 0) && (fabs(DphiIn)  < 0.030) ) ) &&
-       ( ( (isEB == 1) && (sigmaIetaIeta < 0.010) ) || ( (isEB == 0) && (sigmaIetaIeta < 0.030) ) ) &&
-       ( ( (isEB == 1) && (HOverE        < 0.120) ) || ( (isEB == 0) && (HOverE        < 0.100) ) ) &&
-       ( ( (isEB == 1) && (fabs(ooemoop) < 0.050) ) || ( (isEB == 0) && (fabs(ooemoop) < 0.050) ) ) &&
-       ( ( (isEB == 1) && (fabs(dxy)     < 0.020) ) || ( (isEB == 0) && (fabs(dxy)     < 0.020) ) ) &&
-       ( ( (isEB == 1) && (fabs(dz)      < 0.100) ) || ( (isEB == 0) && (fabs(dz)      < 0.100) ) ) &&
-       ( ( (isEB == 1) && (!isConverted) ) || ( (isEB == 0) && (!isConverted) ) ) &&
-       ( mishits == 0 ) &&
-       ( nAmbiguousGsfTracks == 0 )      
-       )
-    isMediumEle=true;
-  
+  if ((pt > 12.) && (fabs(eta) < 2.5) &&
+      (((isEB == 1) && (fabs(DetaIn) < 0.004)) || ((isEB == 0) && (fabs(DetaIn) < 0.007))) &&
+      (((isEB == 1) && (fabs(DphiIn) < 0.060)) || ((isEB == 0) && (fabs(DphiIn) < 0.030))) &&
+      (((isEB == 1) && (sigmaIetaIeta < 0.010)) || ((isEB == 0) && (sigmaIetaIeta < 0.030))) &&
+      (((isEB == 1) && (HOverE < 0.120)) || ((isEB == 0) && (HOverE < 0.100))) &&
+      (((isEB == 1) && (fabs(ooemoop) < 0.050)) || ((isEB == 0) && (fabs(ooemoop) < 0.050))) &&
+      (((isEB == 1) && (fabs(dxy) < 0.020)) || ((isEB == 0) && (fabs(dxy) < 0.020))) &&
+      (((isEB == 1) && (fabs(dz) < 0.100)) || ((isEB == 0) && (fabs(dz) < 0.100))) &&
+      (((isEB == 1) && (!isConverted)) || ((isEB == 0) && (!isConverted))) && (mishits == 0) &&
+      (nAmbiguousGsfTracks == 0))
+    isMediumEle = true;
+
   return isMediumEle;
 }
diff --git a/DQMServices/Examples/src/DQMExample_Step2.cc b/DQMServices/Examples/src/DQMExample_Step2.cc
index 57645bb79c2c7..3b4874258edcf 100644
--- a/DQMServices/Examples/src/DQMExample_Step2.cc
+++ b/DQMServices/Examples/src/DQMExample_Step2.cc
@@ -1,78 +1,73 @@
 #include "DQMServices/Examples/interface/DQMExample_Step2.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-
-#include <iostream>
-#include <iomanip>
+#include <cmath>
 #include <cstdio>
-#include <string>
+#include <iomanip>
+#include <iostream>
 #include <sstream>
-#include <cmath>
+#include <string>
 
 //
-// -------------------------------------- Constructor --------------------------------------------
+// -------------------------------------- Constructor
+// --------------------------------------------
 //
-DQMExample_Step2::DQMExample_Step2(const edm::ParameterSet& ps)
-{
-  edm::LogInfo("DQMExample_Step2") <<  "Constructor  DQMExample_Step2::DQMExample_Step2 " << std::endl;
+DQMExample_Step2::DQMExample_Step2(const edm::ParameterSet &ps) {
+  edm::LogInfo("DQMExample_Step2") << "Constructor  DQMExample_Step2::DQMExample_Step2 " << std::endl;
 
   // Get parameters from configuration file
-  numMonitorName_      =  ps.getParameter<std::string>("numMonitorName");
-  denMonitorName_      =  ps.getParameter<std::string>("denMonitorName");
-
+  numMonitorName_ = ps.getParameter<std::string>("numMonitorName");
+  denMonitorName_ = ps.getParameter<std::string>("denMonitorName");
 }
 
 //
 // -- Destructor
 //
-DQMExample_Step2::~DQMExample_Step2()
-{
-  edm::LogInfo("DQMExample_Step2") <<  "Destructor DQMExample_Step2::~DQMExample_Step2 " << std::endl;
+DQMExample_Step2::~DQMExample_Step2() {
+  edm::LogInfo("DQMExample_Step2") << "Destructor DQMExample_Step2::~DQMExample_Step2 " << std::endl;
 }
 
 //
-// -------------------------------------- beginJob --------------------------------------------
+// -------------------------------------- beginJob
+// --------------------------------------------
 //
-void DQMExample_Step2::beginJob()
-{
-  edm::LogInfo("DQMExample_Step2") <<  "DQMExample_Step2::beginJob " << std::endl;
-}
+void DQMExample_Step2::beginJob() { edm::LogInfo("DQMExample_Step2") << "DQMExample_Step2::beginJob " << std::endl; }
 //
-// -------------------------------------- get and book in the endJob --------------------------------------------
+// -------------------------------------- get and book in the endJob
+// --------------------------------------------
 //
-void DQMExample_Step2::dqmEndJob(DQMStore::IBooker& ibooker_, DQMStore::IGetter& igetter_)
-{
+void DQMExample_Step2::dqmEndJob(DQMStore::IBooker &ibooker_, DQMStore::IGetter &igetter_) {
   // create and cd into new folder
   ibooker_.setCurrentFolder("What_I_do_in_the_client/Ratio");
 
-  //get available histograms
-  MonitorElement* numerator = igetter_.get(numMonitorName_);
-  MonitorElement* denominator = igetter_.get(denMonitorName_);
-
-  if (!numerator || !denominator)
-    {
-      edm::LogError("DQMExample_Step2") <<  "MEs not found!" << std::endl;
-      return;
-    }
+  // get available histograms
+  MonitorElement *numerator = igetter_.get(numMonitorName_);
+  MonitorElement *denominator = igetter_.get(denMonitorName_);
 
+  if (!numerator || !denominator) {
+    edm::LogError("DQMExample_Step2") << "MEs not found!" << std::endl;
+    return;
+  }
 
-  //book new histogram
-  h_ptRatio = ibooker_.book1D("ptRatio","pt ratio pf matched objects",50,0.,100.);
+  // book new histogram
+  h_ptRatio = ibooker_.book1D("ptRatio", "pt ratio pf matched objects", 50, 0., 100.);
   h_ptRatio->setAxisTitle("pt [GeV]");
 
-  for (int iBin=1; iBin<numerator->getNbinsX(); ++iBin)
-    {
-      if(denominator->getBinContent(iBin) == 0)
-	h_ptRatio->setBinContent(iBin, 0.);
-      else
-	h_ptRatio->setBinContent(iBin, numerator->getBinContent(iBin) / denominator->getBinContent(iBin));
-    }
+  for (int iBin = 1; iBin < numerator->getNbinsX(); ++iBin) {
+    if (denominator->getBinContent(iBin) == 0)
+      h_ptRatio->setBinContent(iBin, 0.);
+    else
+      h_ptRatio->setBinContent(iBin, numerator->getBinContent(iBin) / denominator->getBinContent(iBin));
+  }
 }
 
 //
-// -------------------------------------- get in the endLumi if needed --------------------------------------------
+// -------------------------------------- get in the endLumi if needed
+// --------------------------------------------
 //
-void DQMExample_Step2::dqmEndLuminosityBlock(DQMStore::IBooker & ibooker_, DQMStore::IGetter & igetter_, edm::LuminosityBlock const & iLumi, edm::EventSetup const& iSetup) 
-{
-  edm::LogInfo("DQMExample_Step2") <<  "DQMExample_Step2::endLumi " << std::endl;
+void DQMExample_Step2::dqmEndLuminosityBlock(DQMStore::IBooker &ibooker_,
+                                             DQMStore::IGetter &igetter_,
+                                             edm::LuminosityBlock const &iLumi,
+                                             edm::EventSetup const &iSetup) {
+  edm::LogInfo("DQMExample_Step2") << "DQMExample_Step2::endLumi " << std::endl;
 }
diff --git a/DQMServices/Examples/src/DQMSourceExample.cc b/DQMServices/Examples/src/DQMSourceExample.cc
index 74bdd1870c0ff..d2c6cf9391e91 100644
--- a/DQMServices/Examples/src/DQMSourceExample.cc
+++ b/DQMServices/Examples/src/DQMSourceExample.cc
@@ -3,9 +3,9 @@
  * \author C.Leonidopoulos
  * Last Update:
  *
- * Description: Simple example showing how to create a DQM source creating and filling
- * monitoring elements
-*/
+ * Description: Simple example showing how to create a DQM source creating and
+ * filling monitoring elements
+ */
 
 #include "DQMServices/Examples/interface/DQMSourceExample.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
@@ -19,39 +19,39 @@ using namespace edm;
 //==================================================================//
 //================= Constructor and Destructor =====================//
 //==================================================================//
-DQMSourceExample::DQMSourceExample( const edm::ParameterSet& ps ){
+DQMSourceExample::DQMSourceExample(const edm::ParameterSet &ps) {
   parameters_ = ps;
   initialize();
 }
 
-DQMSourceExample::~DQMSourceExample(){
-}
+DQMSourceExample::~DQMSourceExample() {}
 
 //==================================================================//
 //======================= Initialise ===============================//
 //==================================================================//
 void DQMSourceExample::initialize() {
-
   ////---- initialise Event and LS counters
-  counterEvt_ = 0; counterLS_  = 0;
+  counterEvt_ = 0;
+  counterLS_ = 0;
 
   ////---- get DQM store interface
   dbe_ = Service<DQMStore>().operator->();
 
-  ////---- define base folder for the contents of this job 
-  monitorName_ = parameters_.getUntrackedParameter<string>("monitorName","YourSubsystemName");
+  ////---- define base folder for the contents of this job
+  monitorName_ = parameters_.getUntrackedParameter<string>("monitorName", "YourSubsystemName");
   cout << "DQMSourceExample: Monitor name = " << monitorName_ << endl;
-  if (!monitorName_.empty() ) monitorName_ = monitorName_+"/" ;
-  
+  if (!monitorName_.empty())
+    monitorName_ = monitorName_ + "/";
+
   ////--- get steerable parameters
-  prescaleLS_  = parameters_.getUntrackedParameter<int>("prescaleLS",  -1);
-  cout << "DQMSourceExample: DQM lumi section prescale = " << prescaleLS_ << " lumi section(s)"<< endl;
+  prescaleLS_ = parameters_.getUntrackedParameter<int>("prescaleLS", -1);
+  cout << "DQMSourceExample: DQM lumi section prescale = " << prescaleLS_ << " lumi section(s)" << endl;
   prescaleEvt_ = parameters_.getUntrackedParameter<int>("prescaleEvt", -1);
-  cout << "DQMSourceExample: DQM event prescale = " << prescaleEvt_ << " events(s)"<< endl;
+  cout << "DQMSourceExample: DQM event prescale = " << prescaleEvt_ << " events(s)" << endl;
 
-// read in files (use DQMStore.collateHistograms = True for summing
-//  dbe_->load("ref.root");
-//  dbe_->load("ref.root");
+  // read in files (use DQMStore.collateHistograms = True for summing
+  //  dbe_->load("ref.root");
+  //  dbe_->load("ref.root");
 }
 
 //==================================================================//
@@ -62,58 +62,60 @@ void DQMSourceExample::beginJob() {
   dbe_ = Service<DQMStore>().operator->();
 
   ////----  create summ and cd into new folder
-  dbe_->setCurrentFolder(monitorName_+"DQMsource/Summary");
-  summ = dbe_->book1D("summary", "Run Summary", 100, 0, 100); 
+  dbe_->setCurrentFolder(monitorName_ + "DQMsource/Summary");
+  summ = dbe_->book1D("summary", "Run Summary", 100, 0, 100);
 
   //-------------------------------------
-  // testing of Quality Tests 
+  // testing of Quality Tests
   //-------------------------------------
 
-   ////---- create and cd into new folder
-   dbe_->setCurrentFolder(monitorName_+"DQMsource/QTests");
+  ////---- create and cd into new folder
+  dbe_->setCurrentFolder(monitorName_ + "DQMsource/QTests");
 
-   ////---- define histogram binning
-   NBINS = 40 ; XMIN  =  0.; XMAX  = 40.;
+  ////---- define histogram binning
+  NBINS = 40;
+  XMIN = 0.;
+  XMAX = 40.;
 
   ////---- book histograms for testsing of quality tests
   ////     a quality test applied to each of these histograms
   ////     as defined in DQMServices/Examples/test/QualityTests.xml
-  xTrue     = dbe_->book1D("XTrue",       "X Range QTest",                  NBINS, XMIN, XMAX);
-  xFalse    = dbe_->book1D("XFalse",      "X Range QTest",                  NBINS, XMIN, XMAX);
-  yTrue     = dbe_->book1D("YTrue",       "Y Range QTest",                  NBINS, XMIN, XMAX);
-  yFalse    = dbe_->book1D("YFalse",      "Y Range QTest",                  NBINS, XMIN, XMAX);
-  wExpTrue  = dbe_->book2D("WExpTrue",    "Contents Within Expected QTest", NBINS, XMIN, XMAX, NBINS, XMIN, XMAX);
-  wExpFalse = dbe_->book2D("WExpFalse",   "Contents Within Expected QTest", NBINS, XMIN, XMAX, NBINS, XMIN, XMAX);
-  meanTrue  = dbe_->book1D("MeanTrue",    "Mean Within Expected QTest",     NBINS, XMIN, XMAX);
-  meanFalse = dbe_->book1D("MeanFalse",   "Mean Within Expected QTest",     NBINS, XMIN, XMAX);
-  deadTrue  = dbe_->book1D("DeadTrue",    "Dead Channel QTest",             NBINS, XMIN, XMAX);
-  deadFalse = dbe_->book1D("DeadFalse",   "Dead Channel QTest",             NBINS, XMIN, XMAX);
-  noisyTrue  = dbe_->book1D("NoisyTrue",  "Noisy Channel QTest",            NBINS, XMIN, XMAX);
-  noisyFalse = dbe_->book1D("NoisyFalse", "Noisy Channel QTest",            NBINS, XMIN, XMAX);
-
+  xTrue = dbe_->book1D("XTrue", "X Range QTest", NBINS, XMIN, XMAX);
+  xFalse = dbe_->book1D("XFalse", "X Range QTest", NBINS, XMIN, XMAX);
+  yTrue = dbe_->book1D("YTrue", "Y Range QTest", NBINS, XMIN, XMAX);
+  yFalse = dbe_->book1D("YFalse", "Y Range QTest", NBINS, XMIN, XMAX);
+  wExpTrue = dbe_->book2D("WExpTrue", "Contents Within Expected QTest", NBINS, XMIN, XMAX, NBINS, XMIN, XMAX);
+  wExpFalse = dbe_->book2D("WExpFalse", "Contents Within Expected QTest", NBINS, XMIN, XMAX, NBINS, XMIN, XMAX);
+  meanTrue = dbe_->book1D("MeanTrue", "Mean Within Expected QTest", NBINS, XMIN, XMAX);
+  meanFalse = dbe_->book1D("MeanFalse", "Mean Within Expected QTest", NBINS, XMIN, XMAX);
+  deadTrue = dbe_->book1D("DeadTrue", "Dead Channel QTest", NBINS, XMIN, XMAX);
+  deadFalse = dbe_->book1D("DeadFalse", "Dead Channel QTest", NBINS, XMIN, XMAX);
+  noisyTrue = dbe_->book1D("NoisyTrue", "Noisy Channel QTest", NBINS, XMIN, XMAX);
+  noisyFalse = dbe_->book1D("NoisyFalse", "Noisy Channel QTest", NBINS, XMIN, XMAX);
 
   //-------------------------------------
-  // book several ME more  
+  // book several ME more
   //-------------------------------------
 
   ////----  create and cd into new folder
-  dbe_->setCurrentFolder(monitorName_+"DQMsource/C1");
+  dbe_->setCurrentFolder(monitorName_ + "DQMsource/C1");
   const int NBINS2 = 10;
- 
-  i1        = dbe_->bookInt("int1");
-  f1        = dbe_->bookFloat("float1");
-  s1        = dbe_->bookString("s1", "My string");
-  h1        = dbe_->book1D("h1f", "Example TH1F 1D histogram.", NBINS2, XMIN, XMAX);
-  h2        = dbe_->book1S("h1s", "Example TH1S histogram.", NBINS, XMIN, XMAX);
-//  h3        = dbe_->book1DD("h1d", "Example TH1D histogram.", NBINS, XMIN, XMAX);
-//  h4        = dbe_->book2DD("h2d", "Example TH2D histogram.", NBINS, XMIN, XMAX,NBINS, XMIN, XMAX);
-  p1        = dbe_->bookProfile(  "prof1", "My profile 1D", NBINS,XMIN,XMAX,NBINS,XMIN,XMAX,"");
-  p2        = dbe_->bookProfile2D("prof2", "My profile 2D", NBINS,XMIN,XMAX,NBINS,XMIN,XMAX,NBINS,XMIN,XMAX,"");
-  h1hist    = dbe_->book1D("history 1D","Example 1 1D history plot", 30, 0.,30.);
- 
+
+  i1 = dbe_->bookInt("int1");
+  f1 = dbe_->bookFloat("float1");
+  s1 = dbe_->bookString("s1", "My string");
+  h1 = dbe_->book1D("h1f", "Example TH1F 1D histogram.", NBINS2, XMIN, XMAX);
+  h2 = dbe_->book1S("h1s", "Example TH1S histogram.", NBINS, XMIN, XMAX);
+  //  h3        = dbe_->book1DD("h1d", "Example TH1D histogram.", NBINS, XMIN,
+  //  XMAX); h4        = dbe_->book2DD("h2d", "Example TH2D histogram.", NBINS,
+  //  XMIN, XMAX,NBINS, XMIN, XMAX);
+  p1 = dbe_->bookProfile("prof1", "My profile 1D", NBINS, XMIN, XMAX, NBINS, XMIN, XMAX, "");
+  p2 = dbe_->bookProfile2D("prof2", "My profile 2D", NBINS, XMIN, XMAX, NBINS, XMIN, XMAX, NBINS, XMIN, XMAX, "");
+  h1hist = dbe_->book1D("history 1D", "Example 1 1D history plot", 30, 0., 30.);
+
   // set labels for h1
   char temp[1024];
-  for(int i = 1; i <= NBINS2; ++i) {
+  for (int i = 1; i <= NBINS2; ++i) {
     sprintf(temp, " bin no. %d", i);
     h1->setBinLabel(i, temp);
   }
@@ -123,7 +125,7 @@ void DQMSourceExample::beginJob() {
   dbe_->tag(h1, detector_id);
 
   // tag full directory
-  dbe_->tagContents(monitorName_+"DQMsource/C1", detector_id);
+  dbe_->tagContents(monitorName_ + "DQMsource/C1", detector_id);
 
   /*
   // contents of h5 & h6 will be reset at end of monitoring cycle
@@ -135,87 +137,83 @@ void DQMSourceExample::beginJob() {
     std::cout << "TAGS [" << i << "] = " << tags[i] << std::endl;
   */
 
-    dbe_->showDirStructure ();
+  dbe_->showDirStructure();
 }
 
 //==================================================================//
 //========================= beginRun ===============================//
 //==================================================================//
-void DQMSourceExample::beginRun(const edm::Run& r, const EventSetup& context) {
-}
+void DQMSourceExample::beginRun(const edm::Run &r, const EventSetup &context) {}
 
 //==================================================================//
 //==================== analyse (takes each event) ==================//
 //==================================================================//
-void DQMSourceExample::analyze(const Event& iEvent, const EventSetup& iSetup) {
+void DQMSourceExample::analyze(const Event &iEvent, const EventSetup &iSetup) {
   counterEvt_++;
-  if (prescaleEvt_<1)  return;
-  if (prescaleEvt_ > 0 && counterEvt_%prescaleEvt_!=0)  return;
+  if (prescaleEvt_ < 1)
+    return;
+  if (prescaleEvt_ > 0 && counterEvt_ % prescaleEvt_ != 0)
+    return;
   //  cout << " processing conterEvt_: " << counterEvt_ <<endl;
 
   // fill integer and float
-// number exceeding 32 bits
-  i1->Fill(400000000000000LL); // FIXME use double
+  // number exceeding 32 bits
+  i1->Fill(400000000000000LL);  // FIXME use double
   f1->Fill(-3.14);
- 
+
   //----------------------------------------
   // Filling the histograms with random data
   //----------------------------------------
 
-  srand( 0 );
+  srand(0);
   // fill summ histo
-  if(counterEvt_%1000 == 0) {
+  if (counterEvt_ % 1000 == 0) {
     cout << " # of events = " << counterEvt_ << endl;
-    summ->Fill(counterEvt_/1000., counterEvt_);
+    summ->Fill(counterEvt_ / 1000., counterEvt_);
   }
   // fill summ histo
-  if(counterEvt_%100 == 0) {
-    h1hist->ShiftFillLast(gRandom->Gaus(12,1.),1.,5);
+  if (counterEvt_ % 100 == 0) {
+    h1hist->ShiftFillLast(gRandom->Gaus(12, 1.), 1., 5);
   }
 
-  float z  = gRandom->Uniform(XMAX);
-  xTrue->Fill(  z, 1./log(z+1.) );
-  xFalse->Fill( z+(XMAX/2.),  z );
-  yTrue->Fill(  z, 1./log(z+1.) );
-  yFalse->Fill( z, z );
-  meanTrue->Fill(  gRandom->Gaus(10,  2), 1.);
-  meanFalse->Fill( gRandom->Gaus(12,  3), 1.);
-  wExpTrue->Fill(  gRandom->Gaus(12,  1), gRandom->Gaus(12, 1), 1.);
-  wExpFalse->Fill( gRandom->Gaus(20,  2), gRandom->Gaus(20, 2), 1.);
-  deadTrue->Fill(  gRandom->Gaus(20, 10), 2.);
-  deadFalse->Fill( gRandom->Gaus(20,  4), 1.);
-  h2->Fill(  gRandom->Gaus(20,  4), 1.);
-//  h3->Fill(  XMIN, 0xffff00000000LL);
-//  h4->Fill(  XMIN, XMIN, 0xffff00000000LL); 
-  
-  //h1hist->Print();
-  //h1hist->Print();
-
-  for ( int i = 0; i != 10; ++i ) {
+  float z = gRandom->Uniform(XMAX);
+  xTrue->Fill(z, 1. / log(z + 1.));
+  xFalse->Fill(z + (XMAX / 2.), z);
+  yTrue->Fill(z, 1. / log(z + 1.));
+  yFalse->Fill(z, z);
+  meanTrue->Fill(gRandom->Gaus(10, 2), 1.);
+  meanFalse->Fill(gRandom->Gaus(12, 3), 1.);
+  wExpTrue->Fill(gRandom->Gaus(12, 1), gRandom->Gaus(12, 1), 1.);
+  wExpFalse->Fill(gRandom->Gaus(20, 2), gRandom->Gaus(20, 2), 1.);
+  deadTrue->Fill(gRandom->Gaus(20, 10), 2.);
+  deadFalse->Fill(gRandom->Gaus(20, 4), 1.);
+  h2->Fill(gRandom->Gaus(20, 4), 1.);
+  //  h3->Fill(  XMIN, 0xffff00000000LL);
+  //  h4->Fill(  XMIN, XMIN, 0xffff00000000LL);
+
+  // h1hist->Print();
+  // h1hist->Print();
+
+  for (int i = 0; i != 10; ++i) {
     float w = gRandom->Uniform(XMAX);
-    noisyTrue->Fill(  w, 1.);
-    noisyFalse->Fill( z, 1.);
+    noisyTrue->Fill(w, 1.);
+    noisyFalse->Fill(z, 1.);
     float x = gRandom->Gaus(12, 1);
     float y = gRandom->Gaus(20, 2);
     p1->Fill(x, y);
-    p2->Fill(x, y, (x+y)/2.);
+    p2->Fill(x, y, (x + y) / 2.);
     h1->Fill(y, 1.);
   }
 
   // usleep(100);
-
 }
 
 //==================================================================//
 //============================= endRun =============================//
 //==================================================================//
-void DQMSourceExample::endRun(const Run& r, const EventSetup& context) {
-
-}
+void DQMSourceExample::endRun(const Run &r, const EventSetup &context) {}
 
 //==================================================================//
 //============================= endJob =============================//
 //==================================================================//
-void DQMSourceExample::endJob() {
-   std::cout << "DQMSourceExample::endJob()" << std::endl;
-}
+void DQMSourceExample::endJob() { std::cout << "DQMSourceExample::endJob()" << std::endl; }
diff --git a/DQMServices/Examples/src/HarvestingAnalyzer.cc b/DQMServices/Examples/src/HarvestingAnalyzer.cc
index 358dd75cc5773..98784b50587ce 100644
--- a/DQMServices/Examples/src/HarvestingAnalyzer.cc
+++ b/DQMServices/Examples/src/HarvestingAnalyzer.cc
@@ -1,46 +1,35 @@
 #include "DQMServices/Examples/interface/HarvestingAnalyzer.h"
 
-HarvestingAnalyzer::HarvestingAnalyzer(const edm::ParameterSet& iPSet)
-{
+HarvestingAnalyzer::HarvestingAnalyzer(const edm::ParameterSet &iPSet) {
   std::string MsgLoggerCat = "HarvestingAnalyzer_HarvestingAnalyzer";
 
   fName = iPSet.getUntrackedParameter<std::string>("Name");
   verbosity = iPSet.getUntrackedParameter<int>("Verbosity");
- 
+
   if (verbosity >= 0) {
-    edm::LogInfo(MsgLoggerCat) 
-      << "\n===============================\n"
-      << "Initialized as EDAnalyzer with parameter values:\n"
-      << "    Name          = " << fName << "\n"
-      << "    Verbosity     = " << verbosity << "\n"
-      << "===============================\n";
+    edm::LogInfo(MsgLoggerCat) << "\n===============================\n"
+                               << "Initialized as EDAnalyzer with parameter values:\n"
+                               << "    Name          = " << fName << "\n"
+                               << "    Verbosity     = " << verbosity << "\n"
+                               << "===============================\n";
   }
 }
 
 HarvestingAnalyzer::~HarvestingAnalyzer() {}
 
-void HarvestingAnalyzer::beginJob() 
-{
-  return;
-}
-
-void HarvestingAnalyzer::endJob()
-{
+void HarvestingAnalyzer::beginJob() { return; }
 
+void HarvestingAnalyzer::endJob() {
   dbe = nullptr;
   dbe = edm::Service<DQMStore>().operator->();
 
   if (dbe) {
-
     // monitoring element numerator and denominator histogram
-    MonitorElement *meN = 
-      dbe->get("ConverterTest/TH1F/Random1DN");
-    MonitorElement *meD = 
-      dbe->get("ConverterTest/TH1F/Random1DD"); 
+    MonitorElement *meN = dbe->get("ConverterTest/TH1F/Random1DN");
+    MonitorElement *meD = dbe->get("ConverterTest/TH1F/Random1DD");
 
     if (meN && meD) {
-
-      // get the numerator and denominator histogram    	
+      // get the numerator and denominator histogram
       TH1F *numerator = meN->getTH1F();
       numerator->Sumw2();
       TH1F *denominator = meD->getTH1F();
@@ -50,11 +39,11 @@ void HarvestingAnalyzer::endJob()
       dbe->setCurrentFolder("ConverterTest/TH1F");
 
       // booked the new histogram to contain the results
-      MonitorElement *me = 
-	dbe->book1D("Divide","Divide calculation",
-		    numerator->GetNbinsX(),
-		    numerator->GetXaxis()->GetXmin(),
-		    numerator->GetXaxis()->GetXmax());
+      MonitorElement *me = dbe->book1D("Divide",
+                                       "Divide calculation",
+                                       numerator->GetNbinsX(),
+                                       numerator->GetXaxis()->GetXmin(),
+                                       numerator->GetXaxis()->GetXmax());
 
       // Calculate the efficiency
       me->getTH1F()->Divide(numerator, denominator, 1., 1., "B");
@@ -69,20 +58,8 @@ void HarvestingAnalyzer::endJob()
   return;
 }
 
-void HarvestingAnalyzer::beginRun(const edm::Run& iRun, 
-				const edm::EventSetup& iSetup)
-{
-  return;
-}
+void HarvestingAnalyzer::beginRun(const edm::Run &iRun, const edm::EventSetup &iSetup) { return; }
 
-void HarvestingAnalyzer::endRun(const edm::Run& iRun, 
-			      const edm::EventSetup& iSetup)
-{
-  return;
-}
+void HarvestingAnalyzer::endRun(const edm::Run &iRun, const edm::EventSetup &iSetup) { return; }
 
-void HarvestingAnalyzer::analyze(const edm::Event& iEvent, 
-			       const edm::EventSetup& iSetup)
-{
-  return;
-}
+void HarvestingAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) { return; }
diff --git a/DQMServices/Examples/src/HarvestingDataCertification.cc b/DQMServices/Examples/src/HarvestingDataCertification.cc
index ffd8a7a89269d..09770565fa0a4 100644
--- a/DQMServices/Examples/src/HarvestingDataCertification.cc
+++ b/DQMServices/Examples/src/HarvestingDataCertification.cc
@@ -1,48 +1,28 @@
 #include "DQMServices/Examples/interface/HarvestingDataCertification.h"
 
-HarvestingDataCertification::HarvestingDataCertification(const edm::ParameterSet& iPSet)
-{
+HarvestingDataCertification::HarvestingDataCertification(const edm::ParameterSet &iPSet) {
   std::string MsgLoggerCat = "HarvestingDataCertification_HarvestingDataCertification";
 
   fName = iPSet.getUntrackedParameter<std::string>("Name");
   verbosity = iPSet.getUntrackedParameter<int>("Verbosity");
- 
+
   if (verbosity >= 0) {
-    edm::LogInfo(MsgLoggerCat) 
-      << "\n===============================\n"
-      << "Initialized as EDAnalyzer with parameter values:\n"
-      << "    Name          = " << fName << "\n"
-      << "    Verbosity     = " << verbosity << "\n"
-      << "===============================\n";
+    edm::LogInfo(MsgLoggerCat) << "\n===============================\n"
+                               << "Initialized as EDAnalyzer with parameter values:\n"
+                               << "    Name          = " << fName << "\n"
+                               << "    Verbosity     = " << verbosity << "\n"
+                               << "===============================\n";
   }
 }
 
 HarvestingDataCertification::~HarvestingDataCertification() {}
 
-void HarvestingDataCertification::beginJob()
-{
-  return;
-}
+void HarvestingDataCertification::beginJob() { return; }
 
-void HarvestingDataCertification::endJob()
-{
-  return;
-}
+void HarvestingDataCertification::endJob() { return; }
 
-void HarvestingDataCertification::beginRun(const edm::Run& iRun, 
-				const edm::EventSetup& iSetup)
-{
-  return;
-}
+void HarvestingDataCertification::beginRun(const edm::Run &iRun, const edm::EventSetup &iSetup) { return; }
 
-void HarvestingDataCertification::endRun(const edm::Run& iRun, 
-			      const edm::EventSetup& iSetup)
-{
-  return;
-}
+void HarvestingDataCertification::endRun(const edm::Run &iRun, const edm::EventSetup &iSetup) { return; }
 
-void HarvestingDataCertification::analyze(const edm::Event& iEvent, 
-			       const edm::EventSetup& iSetup)
-{
-  return;
-}
+void HarvestingDataCertification::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) { return; }
diff --git a/DQMServices/FileIO/plugins/DQMFileSaverPB.cc b/DQMServices/FileIO/plugins/DQMFileSaverPB.cc
index ee0bcbb822697..8d27f9f192f28 100644
--- a/DQMServices/FileIO/plugins/DQMFileSaverPB.cc
+++ b/DQMServices/FileIO/plugins/DQMFileSaverPB.cc
@@ -164,7 +164,7 @@ DQMFileSaverPB::fillJson(int run, int lumi, const std::string& dataFilePathName,
     pt.put("definition", "/fakeDefinition.jsn");
   } else {
     // The availability test of the EvFDaqDirector Service was done in the ctor.
-    bfs::path outJsonDefName(edm::Service<evf::EvFDaqDirector>()->baseRunDir()); //we assume this file is written bu the EvF Output module
+    bfs::path outJsonDefName{edm::Service<evf::EvFDaqDirector>()->baseRunDir()}; //we assume this file is written bu the EvF Output module
     outJsonDefName /= (std::string("output_") + oss_pid.str() + std::string(".jsd"));
     pt.put("definition", outJsonDefName.string());
   }
diff --git a/DQMServices/FileIO/scripts/blacklist.py b/DQMServices/FileIO/scripts/blacklist.py
new file mode 100644
index 0000000000000..273f91af9201d
--- /dev/null
+++ b/DQMServices/FileIO/scripts/blacklist.py
@@ -0,0 +1,380 @@
+
+def get_blacklist(RUN_NR):
+    return {
+        ('DQMData', 'Run %s' % RUN_NR, 'AlCaReco', 'Run summary', 'EventInfo', 'hostName'),
+        ('DQMData', 'Run %s' % RUN_NR, 'AlCaReco', 'Run summary', 'EventInfo', 'processID'),
+        ('DQMData', 'Run %s' % RUN_NR, 'AlCaReco', 'Run summary', 'EventInfo', 'processStartTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'AlCaReco', 'Run summary', 'EventInfo', 'workingDir'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'event allocated_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'event deallocated_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'event time_real'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'event time_real_VsPU'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'event time_real_VsScalLumi'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'event time_real_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'event time_thread'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'event time_thread_VsPU'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'event time_thread_VsScalLumi'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'event time_thread_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'explicit allocated_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'explicit deallocated_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'explicit time_real'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'explicit time_real_VsPU'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'explicit time_real_VsScalLumi'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'explicit time_real_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'explicit time_thread'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'explicit time_thread_VsPU'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'explicit time_thread_VsScalLumi'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'explicit time_thread_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'overhead allocated_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'overhead deallocated_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'overhead time_real'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'overhead time_real_VsPU'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'overhead time_real_VsScalLumi'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'overhead time_real_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'overhead time_thread'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'overhead time_thread_VsPU'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'overhead time_thread_VsScalLumi'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'overhead time_thread_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process DQM allocated_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process DQM deallocated_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process DQM time_real'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process DQM time_real_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process DQM time_thread'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process DQM time_thread_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process PAT allocated_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process PAT deallocated_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process PAT time_real'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process PAT time_real_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process PAT time_thread'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process PAT time_thread_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process RECO allocated_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process RECO deallocated_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process RECO time_real'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process RECO time_real_VsScalLumi'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process RECO time_real_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process RECO time_thread'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process RECO time_thread_VsScalLumi'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process RECO time_thread_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process reRECO time_real'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process reRECO time_real_VsPU'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process reRECO time_real_VsScalLumi'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process reRECO time_real_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process reRECO time_thread'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process reRECO time_thread_VsPU'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process reRECO time_thread_VsScalLumi'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'process reRECO time_thread_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'source allocated_VsPU'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'source allocated_VsScalLumi'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'source allocated_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'source deallocated_VsPU'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'source deallocated_VsScalLumi'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'source deallocated_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'source time_real'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'source time_real_VsPU'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'source time_real_VsScalLumi'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'source time_real_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'source time_thread'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'source time_thread_VsPU'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'source time_thread_VsScalLumi'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'source time_thread_byls'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'overhead allocated_VsPU'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'overhead allocated_VsScalLumi'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'overhead deallocated_VsPU'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DQM', 'Run summary', 'TimerService', 'overhead deallocated_VsScalLumi'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DT', 'Run summary', 'EventInfo', 'hostName'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DT', 'Run summary', 'EventInfo', 'processEventRate'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DT', 'Run summary', 'EventInfo', 'processID'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DT', 'Run summary', 'EventInfo', 'processLatency'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DT', 'Run summary', 'EventInfo', 'processStartTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DT', 'Run summary', 'EventInfo', 'processTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'DT', 'Run summary', 'EventInfo', 'workingDir'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Ecal', 'Run summary', 'EventInfo', 'hostName'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Ecal', 'Run summary', 'EventInfo', 'processEventRate'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Ecal', 'Run summary', 'EventInfo', 'processID'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Ecal', 'Run summary', 'EventInfo', 'processLatency'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Ecal', 'Run summary', 'EventInfo', 'processStartTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Ecal', 'Run summary', 'EventInfo', 'processTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Ecal', 'Run summary', 'EventInfo', 'workingDir'),
+        ('DQMData', 'Run %s' % RUN_NR, 'HLT', 'Run summary', 'EventInfo', 'hostName'),
+        ('DQMData', 'Run %s' % RUN_NR, 'HLT', 'Run summary', 'EventInfo', 'processEventRate'),
+        ('DQMData', 'Run %s' % RUN_NR, 'HLT', 'Run summary', 'EventInfo', 'processID'),
+        ('DQMData', 'Run %s' % RUN_NR, 'HLT', 'Run summary', 'EventInfo', 'processLatency'),
+        ('DQMData', 'Run %s' % RUN_NR, 'HLT', 'Run summary', 'EventInfo', 'processStartTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'HLT', 'Run summary', 'EventInfo', 'processTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'HLT', 'Run summary', 'EventInfo', 'workingDir'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1T', 'Run summary', 'EventInfo', 'hostName'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1T', 'Run summary', 'EventInfo', 'processEventRate'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1T', 'Run summary', 'EventInfo', 'processID'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1T', 'Run summary', 'EventInfo', 'processLatency'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1T', 'Run summary', 'EventInfo', 'processStartTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1T', 'Run summary', 'EventInfo', 'processTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1T', 'Run summary', 'EventInfo', 'workingDir'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1T', 'Run summary', 'L1TStage2uGMT', 'ugmtMuonPhi.muon_phiSpectrum'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1T', 'Run summary', 'L1TStage2uGMT', 'ugmtMuonPhiAtVtx.muon_phiSpectrum'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1T', 'Run summary', 'L1TStage2uGMT', 'ugmtMuonPhiEmtf.uGMT_EMTFMuonPhiSpectrum'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1T', 'Run summary', 'L1TriggerVsReco', 'EventInfo', 'hostName'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1T', 'Run summary', 'L1TriggerVsReco', 'EventInfo', 'processEventRate'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1T', 'Run summary', 'L1TriggerVsReco', 'EventInfo', 'processID'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1T', 'Run summary', 'L1TriggerVsReco', 'EventInfo', 'processLatency'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1T', 'Run summary', 'L1TriggerVsReco', 'EventInfo', 'processStartTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1T', 'Run summary', 'L1TriggerVsReco', 'EventInfo', 'processTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1T', 'Run summary', 'L1TriggerVsReco', 'EventInfo', 'workingDir'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1TEMU', 'Run summary', 'EventInfo', 'hostName'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1TEMU', 'Run summary', 'EventInfo', 'processEventRate'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1TEMU', 'Run summary', 'EventInfo', 'processID'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1TEMU', 'Run summary', 'EventInfo', 'processLatency'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1TEMU', 'Run summary', 'EventInfo', 'processStartTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1TEMU', 'Run summary', 'EventInfo', 'processTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'L1TEMU', 'Run summary', 'EventInfo', 'workingDir'),
+        ('DQMData', 'Run %s' % RUN_NR, 'MessageLogger', 'Run summary', 'Errors', 'total_errors'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'EventInfo', 'hostName'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'EventInfo', 'processEventRate'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'EventInfo', 'processID'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'EventInfo', 'processLatency'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'EventInfo', 'processStartTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'EventInfo', 'processTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'EventInfo', 'workingDir'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_chi2OverDf.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_p.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_phiVSeta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_phiVSeta_badlumi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_probchi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_pt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_q.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_chi2OverDf.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_p.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_phiVseta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_phiVseta_badlumi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_probchi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_pt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_q.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_chi2OverDf.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_p.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_phiVSeta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_phiVSeta_badlumi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_probchi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_pt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_q.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_qComparison.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'GlbRh_Div_RhAssoStaTk.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Pull_TkSta_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Pull_TkSta_oneOverp.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Pull_TkSta_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Pull_TkSta_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Pull_TkSta_qOverp.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Pull_TkSta_qOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Pull_TkSta_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'ResVsEta_GlbSta_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'ResVsEta_GlbSta_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'ResVsEta_TkGlb_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'ResVsEta_TkGlb_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'ResVsEta_TkSta_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'ResVsEta_TkSta_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'ResVsPhi_GlbSta_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'ResVsPhi_GlbSta_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'ResVsPhi_TkGlb_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'ResVsPhi_TkGlb_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'ResVsPhi_TkSta_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'ResVsPhi_TkSta_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'ResVsPt_GlbSta_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'ResVsPt_TkGlb_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'ResVsPt_TkSta_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'ResVsTheta_GlbSta_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'ResVsTheta_TkGlb_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'ResVsTheta_TkSta_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_GlbSta_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_GlbSta_oneOverp.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_GlbSta_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_GlbSta_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_GlbSta_qOverp.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_GlbSta_qOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_GlbSta_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkGlb_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkGlb_oneOverp.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkGlb_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkGlb_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkGlb_qOverp.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkGlb_qOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkGlb_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkSta_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkSta_oneOverp.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkSta_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkSta_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkSta_qOverp.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkSta_qOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkSta_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'Res_TuneP_pt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'StaEta_ifCombinedAlso.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'StaMuon_chi2OverDf.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'StaMuon_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'StaMuon_p.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'StaMuon_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'StaMuon_probchi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'StaMuon_pt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'StaMuon_q.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'StaMuon_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'StaPhi_ifCombinedAlso.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'StaRh_Frac_inGlb.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'StaRh_inGlb_Div_RhAssoSta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'TkMuon_chi2OverDf.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'TkMuon_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'TkMuon_p.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'TkMuon_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'TkMuon_probchi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'TkMuon_pt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'TkMuon_q.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'TkMuon_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'TkRh_Frac_inGlb.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'TkRh_inGlb_Div_RhAssoTk.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'invalidRh_Frac_inTk.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'muVStkSytemRotation_negMu.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons', 'Run summary', 'MuonRecoAnalyzer', 'muVStkSytemRotation_posMu.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_chi2OverDf.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_p.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_phiVSeta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_phiVSeta_badlumi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_probchi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_pt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_q.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Glb_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_chi2OverDf.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_p.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_phiVseta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_phiVseta_badlumi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_probchi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_pt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_q.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Sta_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_chi2OverDf.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_p.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_phiVSeta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_phiVSeta_badlumi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_probchi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_pt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_q.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_Tk_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbMuon_qComparison.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'GlbRh_Div_RhAssoStaTk.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Pull_TkSta_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Pull_TkSta_oneOverp.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Pull_TkSta_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Pull_TkSta_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Pull_TkSta_qOverp.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Pull_TkSta_qOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Pull_TkSta_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'ResVsEta_GlbSta_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'ResVsEta_GlbSta_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'ResVsEta_TkGlb_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'ResVsEta_TkGlb_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'ResVsEta_TkSta_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'ResVsEta_TkSta_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'ResVsPhi_GlbSta_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'ResVsPhi_GlbSta_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'ResVsPhi_TkGlb_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'ResVsPhi_TkGlb_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'ResVsPhi_TkSta_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'ResVsPhi_TkSta_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'ResVsPt_GlbSta_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'ResVsPt_TkGlb_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'ResVsPt_TkSta_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'ResVsTheta_GlbSta_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'ResVsTheta_TkGlb_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'ResVsTheta_TkSta_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_GlbSta_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_GlbSta_oneOverp.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_GlbSta_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_GlbSta_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_GlbSta_qOverp.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_GlbSta_qOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_GlbSta_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkGlb_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkGlb_oneOverp.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkGlb_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkGlb_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkGlb_qOverp.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkGlb_qOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkGlb_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkSta_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkSta_oneOverp.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkSta_oneOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkSta_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkSta_qOverp.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkSta_qOverpt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_TkSta_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'Res_TuneP_pt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'StaEta_ifCombinedAlso.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'StaMuon_chi2OverDf.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'StaMuon_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'StaMuon_p.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'StaMuon_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'StaMuon_probchi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'StaMuon_pt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'StaMuon_q.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'StaMuon_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'StaPhi_ifCombinedAlso.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'StaRh_Frac_inGlb.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'StaRh_inGlb_Div_RhAssoSta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'TkMuon_chi2OverDf.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'TkMuon_eta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'TkMuon_p.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'TkMuon_phi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'TkMuon_probchi.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'TkMuon_pt.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'TkMuon_q.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'TkMuon_theta.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'TkRh_Frac_inGlb.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'TkRh_inGlb_Div_RhAssoTk.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'invalidRh_Frac_inTk.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'muVStkSytemRotation_negMu.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Muons_miniAOD', 'Run summary', 'MuonRecoAnalyzer', 'muVStkSytemRotation_posMu.Mu_Comp2RefChi2'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Pixel', 'Run summary', 'EventInfo', 'hostName'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Pixel', 'Run summary', 'EventInfo', 'processEventRate'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Pixel', 'Run summary', 'EventInfo', 'processID'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Pixel', 'Run summary', 'EventInfo', 'processLatency'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Pixel', 'Run summary', 'EventInfo', 'processStartTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Pixel', 'Run summary', 'EventInfo', 'processTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Pixel', 'Run summary', 'EventInfo', 'workingDir'),
+        ('DQMData', 'Run %s' % RUN_NR, 'RPC', 'Run summary', 'EventInfo', 'hostName'),
+        ('DQMData', 'Run %s' % RUN_NR, 'RPC', 'Run summary', 'EventInfo', 'processEventRate'),
+        ('DQMData', 'Run %s' % RUN_NR, 'RPC', 'Run summary', 'EventInfo', 'processID'),
+        ('DQMData', 'Run %s' % RUN_NR, 'RPC', 'Run summary', 'EventInfo', 'processLatency'),
+        ('DQMData', 'Run %s' % RUN_NR, 'RPC', 'Run summary', 'EventInfo', 'processStartTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'RPC', 'Run summary', 'EventInfo', 'processTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'RPC', 'Run summary', 'EventInfo', 'workingDir'),
+        ('DQMData', 'Run %s' % RUN_NR, 'RecoTauV', 'Run summary', 'EventInfo', 'hostName'),
+        ('DQMData', 'Run %s' % RUN_NR, 'RecoTauV', 'Run summary', 'EventInfo', 'processEventRate'),
+        ('DQMData', 'Run %s' % RUN_NR, 'RecoTauV', 'Run summary', 'EventInfo', 'processID'),
+        ('DQMData', 'Run %s' % RUN_NR, 'RecoTauV', 'Run summary', 'EventInfo', 'processLatency'),
+        ('DQMData', 'Run %s' % RUN_NR, 'RecoTauV', 'Run summary', 'EventInfo', 'processStartTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'RecoTauV', 'Run summary', 'EventInfo', 'processTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'RecoTauV', 'Run summary', 'EventInfo', 'workingDir'),
+        ('DQMData', 'Run %s' % RUN_NR, 'SiStrip', 'Run summary', 'EventInfo', 'hostName'),
+        ('DQMData', 'Run %s' % RUN_NR, 'SiStrip', 'Run summary', 'EventInfo', 'processEventRate'),
+        ('DQMData', 'Run %s' % RUN_NR, 'SiStrip', 'Run summary', 'EventInfo', 'processID'),
+        ('DQMData', 'Run %s' % RUN_NR, 'SiStrip', 'Run summary', 'EventInfo', 'processLatency'),
+        ('DQMData', 'Run %s' % RUN_NR, 'SiStrip', 'Run summary', 'EventInfo', 'processStartTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'SiStrip', 'Run summary', 'EventInfo', 'processTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'SiStrip', 'Run summary', 'EventInfo', 'workingDir'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Tracking', 'Run summary', 'EventInfo', 'hostName'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Tracking', 'Run summary', 'EventInfo', 'processEventRate'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Tracking', 'Run summary', 'EventInfo', 'processID'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Tracking', 'Run summary', 'EventInfo', 'processLatency'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Tracking', 'Run summary', 'EventInfo', 'processStartTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Tracking', 'Run summary', 'EventInfo', 'processTimeStamp'),
+        ('DQMData', 'Run %s' % RUN_NR, 'Tracking', 'Run summary', 'EventInfo', 'workingDir'),
+    }
diff --git a/DQMServices/FileIO/scripts/compareDQMOutput.py b/DQMServices/FileIO/scripts/compareDQMOutput.py
new file mode 100755
index 0000000000000..8f9cf648003df
--- /dev/null
+++ b/DQMServices/FileIO/scripts/compareDQMOutput.py
@@ -0,0 +1,145 @@
+#!/bin/env python
+
+import os
+import sys
+import glob
+import argparse
+import subprocess
+from threading import Thread
+
+COMPARISON_RESULTS = []
+
+def collect_and_compare_files(base_dir, pr_dir, output_dir, num_procs, pr_number, test_number, release_format):
+    files = get_file_pairs(base_dir, pr_dir)
+
+    threads = []
+    for _ in range(num_procs):
+        thread = Thread(target=compare, args=(base_dir, pr_dir, output_dir, files, pr_number, test_number, release_format))
+        thread.start()
+        threads.append(thread)
+
+    [thread.join() for thread in threads]
+
+    COMPARISON_RESULTS.sort(key=lambda k: float(k['workflow']))
+
+def compare(base_dir, pr_dir, output_dir, files, pr_number, test_number, release_format):
+    while files:
+        try:
+            file_name = files.pop()
+            command = ['python', os.path.join(os.path.dirname(__file__), 'compareHistograms.py'), '-b', os.path.join(base_dir, file_name), \
+                '-p', os.path.join(pr_dir, file_name), '-o', output_dir, '-n', pr_number, '-t', test_number, '-r', release_format]
+            print('Running comparison:')
+            print(' '.join(command))
+            
+            output = subprocess.check_output(command)
+
+            output_elements = output.split('\n')[1:]
+            base_output_filename = output_elements[0]
+            pr_output_filename = output_elements[1]
+            run_nr = base_output_filename.split('_')[2].lstrip('R').lstrip('0')
+            output_numbers = output_elements[2].split(' ')
+            
+            workflow = os.path.basename(os.path.dirname(os.path.join(base_dir, file_name))).split('_')[0]
+            base_dataset = '/' + '/'.join(base_output_filename.rstrip('.root').split('__')[1:])
+            pr_dataset = '/' + '/'.join(pr_output_filename.rstrip('.root').split('__')[1:])
+            
+            COMPARISON_RESULTS.append({'workflow': workflow, 'base_dataset': base_dataset, 'pr_dataset': pr_dataset, 'run_nr': run_nr,\
+                'changed_elements': int(output_numbers[0]), 'removed_elements': int(output_numbers[1]), 'added_elements': int(output_numbers[2])})
+        except:
+            pass
+    
+def get_file_pairs(base_dir, pr_dir):
+    base_files = glob.glob(os.path.join(base_dir, '*.*_*/DQM_*.root'))
+    pr_files = glob.glob(os.path.join(pr_dir, '*.*_*/DQM_*.root'))
+
+    # Remove base directories and leave
+    # only parts of paths that are same
+    base_files = map(lambda x: os.path.relpath(x, base_dir), base_files)
+    pr_files = map(lambda x: os.path.relpath(x, pr_dir), pr_files)
+    
+    # Find intersection
+    return [value for value in base_files if value in pr_files]
+
+def upload_to_gui(output_dir, num_procs):
+    base_files = glob.glob(os.path.join(output_dir, 'base/*.root'))
+    pr_files = glob.glob(os.path.join(output_dir, 'pr/*.root'))
+
+    files = base_files + pr_files
+    
+    for _ in range(num_procs):
+        thread = Thread(target=upload, args=(files,))
+        thread.start()
+    
+def upload(files):
+    while files:
+        try:
+            file = files.pop()
+            command = ['python', os.path.join(os.path.dirname(__file__), 'visDQMUpload.py'), 'https://cmsweb.cern.ch/dqm/dev', file]
+            print('Uploading output:')
+            print(' '.join(command))
+            
+            subprocess.call(command)
+            print('')
+        except:
+            pass
+
+def generate_summary_html(output_dir, pr_number, summary_dir):
+    template_file = open(os.path.join(os.path.dirname(__file__), 'dqm-histo-comparison-summary-template.html'), 'r')
+    result = template_file.read()
+
+    result = result.replace('$PR_NUMBER$', pr_number)
+
+    table_items = ''
+    total_changes = 0
+    
+    for comp in COMPARISON_RESULTS:
+        total_changes += comp['removed_elements'] + comp['added_elements'] + comp['changed_elements']
+        baseline_count = comp['changed_elements'] + comp['removed_elements']
+        pr_count = comp['changed_elements'] + comp['added_elements']
+        overlay_count = baseline_count
+
+        # Make urls
+        base_url = 'https://cmsweb.cern.ch/dqm/dev/start?runnr=%s;dataset%%3D%s;sampletype%%3Doffline_relval;workspace%%3DEverything;' % (comp['run_nr'], comp['base_dataset'])
+        pr_url = 'https://cmsweb.cern.ch/dqm/dev/start?runnr=%s;dataset%%3D%s;sampletype%%3Doffline_relval;workspace%%3DEverything;' % (comp['run_nr'], comp['pr_dataset'])
+        overlay_url = 'https://cmsweb.cern.ch/dqm/dev/start?runnr=%s;dataset%%3D%s;referenceshow%%3Dall;referenceobj1%%3Dother::%s::;sampletype%%3Doffline_relval;workspace%%3DEverything;' \
+            % (comp['run_nr'], comp['pr_dataset'], comp['base_dataset'])
+
+        table_items += '        <tr>\n'
+        table_items += '            <td><a href="%s" target="_blank">%s baseline GUI</a><span> (%s)</span></td>\n' % (base_url, comp['workflow'], baseline_count)
+        table_items += '            <td><a href="%s" target="_blank">%s pr GUI</a><span> (%s)</span></td>\n' % (pr_url, comp['workflow'], pr_count)
+        table_items += '            <td><a href="%s" target="_blank">%s overlay GUI</a><span> (%s)</span></td>\n' % (overlay_url, comp['workflow'], overlay_count)
+        table_items += '            <td><span class="removed">-%s</span><span class="added">+%s</span><span class="changed">%s</span></td>\n' \
+            % (comp['removed_elements'], comp['added_elements'], comp['changed_elements'])
+        table_items += '        </tr>\n'
+
+    result = result.replace('$TOTAL_CHANGES$', str(total_changes))
+    result = result.replace('$NUMBER_OF_WORKFLOWS$', str(len(COMPARISON_RESULTS)))
+    result = result.replace('$PER_WORKFLOW_LIST$', table_items)
+    template_file.close()
+
+    # Write output
+    result_file_path = os.path.join(summary_dir, 'dqm-histo-comparison-summary.html')
+    if os.path.dirname(result_file_path):
+        if not os.path.exists(os.path.dirname(result_file_path)):
+            os.makedirs(os.path.dirname(result_file_path))
+    summary_file = open(result_file_path, 'w')
+    summary_file.write(result)
+    summary_file.close()
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description="This tool compares DQM monitor elements within DQM files found in base-dir with the ones found in in pr-dir. "
+        "All workflow directories are searched for correctly named DQM root files. "
+        "Comparison is done bin by bin and output is written to a root files containing only the changes.")
+    parser.add_argument('-b', '--base-dir', help='Baseline IB directory', default='basedata/')
+    parser.add_argument('-p', '--pr-dir', help='PR directory', default='prdata/')
+    parser.add_argument('-o', '--output-dir', help='Comparison root files output directory', default='dqmHistoComparisonOutput')
+    parser.add_argument('-j', '--nprocs', help='Number of processes', default=1, type=int)
+    parser.add_argument('-n', '--pr-number', help='PR number under test', required=True)
+    parser.add_argument('-t', '--test-number', help='Unique test number to distinguish different comparisons of the same PR.', default='1')
+    parser.add_argument('-r', '--release-format', help='Release format in this format: CMSSW_10_5_X_2019-02-17-0000', required=True)
+    parser.add_argument('-s', '--summary-dir', help='Directory where summary with all links will be saved', default='')
+    args = parser.parse_args()
+	
+    collect_and_compare_files(args.base_dir, args.pr_dir, args.output_dir, args.nprocs, args.pr_number, args.test_number, args.release_format)
+    upload_to_gui(args.output_dir, args.nprocs)
+    generate_summary_html(args.output_dir, args.pr_number, args.summary_dir)
diff --git a/DQMServices/FileIO/scripts/compareHistograms.py b/DQMServices/FileIO/scripts/compareHistograms.py
new file mode 100755
index 0000000000000..9ed2fea7ac3f2
--- /dev/null
+++ b/DQMServices/FileIO/scripts/compareHistograms.py
@@ -0,0 +1,266 @@
+#!/bin/env python
+
+from __future__ import print_function
+import ROOT
+ROOT.PyConfig.IgnoreCommandLineOptions = True
+import os
+import sys
+import argparse
+import root_numpy
+import numpy as np
+from blacklist import get_blacklist
+
+def create_dif(base_file_path, pr_file_path, pr_number, test_number, cmssw_version, output_dir_path):
+   base_file = ROOT.TFile(base_file_path, 'read')
+   ROOT.gROOT.GetListOfFiles().Remove(base_file)
+   
+   pr_file = ROOT.TFile(pr_file_path, 'read')
+   ROOT.gROOT.GetListOfFiles().Remove(pr_file)
+
+   if base_file.IsOpen():
+      print('Baseline file successfully opened', file=sys.stderr)
+   else:
+      print('Unable to open base file', file=sys.stderr)
+      return
+
+   if pr_file.IsOpen():
+      print('PR file successfully opened', file=sys.stderr)
+   else:
+      print('Unable to open PR file', file=sys.stderr)
+      return
+
+   run_nr = get_run_nr(pr_file_path)
+      
+   # Get list of paths (lists of directories)
+   base_flat_dict = flatten_file(base_file, run_nr)
+   pr_flat_dict = flatten_file(pr_file, run_nr)
+
+   # Paths that appear in both baseline and PR data. (Intersection)
+   shared_paths = list(set(pr_flat_dict).intersection(set(base_flat_dict)))
+
+   # Paths that appear only in PR data. (Except)
+   only_pr_paths = list(set(pr_flat_dict).difference(set(base_flat_dict)))
+
+   # Paths that appear only in baseline data. (Except)
+   only_base_paths = list(set(base_flat_dict).difference(set(pr_flat_dict)))
+
+   # Histograms pointed to by these paths will be written to baseline output
+   paths_to_save_in_base = []
+
+   # Histograms pointed to by these paths will be written to pr output
+   paths_to_save_in_pr = []
+
+   # Make comparison
+   compare(shared_paths, pr_flat_dict, base_flat_dict, paths_to_save_in_pr, paths_to_save_in_base)
+   
+   # Collect paths that have to be written to baseline output file
+   for path in only_base_paths:
+      item = base_flat_dict[path]
+
+      if item == None:
+         continue
+
+      paths_to_save_in_base.append(path)
+   
+   # Collect paths that have to be written to PR output file
+   for path in only_pr_paths:
+      item = pr_flat_dict[path]
+
+      if item == None:
+         continue
+
+      paths_to_save_in_pr.append(path)
+
+   base_output_filename = get_output_filename(pr_file_path, pr_number, test_number, cmssw_version, False)
+   pr_output_filename = get_output_filename(pr_file_path, pr_number, test_number, cmssw_version, True)
+
+   # Write baseline output
+   save_paths(base_flat_dict, paths_to_save_in_base, os.path.join(output_dir_path, 'base', base_output_filename))
+   
+   # Write PR output
+   save_paths(pr_flat_dict, paths_to_save_in_pr, os.path.join(output_dir_path, 'pr', pr_output_filename))
+
+   pr_file.Close()
+   base_file.Close()
+
+   # Info about changed, added and removed elements
+   nr_of_changed_elements = len(set(paths_to_save_in_base).intersection(set(paths_to_save_in_pr)))
+   nr_of_removed_elements = len(paths_to_save_in_base) - nr_of_changed_elements
+   nr_of_added_elements = len(paths_to_save_in_pr) - nr_of_changed_elements
+
+   print('Base output file. PR output file. Changed elements, removed elements, added elements:')
+   print(base_output_filename)
+   print(pr_output_filename)
+   print('%s %s %s' % (nr_of_changed_elements, nr_of_removed_elements, nr_of_added_elements))
+
+def compare(shared_paths, pr_flat_dict, base_flat_dict, paths_to_save_in_pr, paths_to_save_in_base):
+   # Collect paths that have to be written to both output files
+   for path in shared_paths:
+      pr_item = pr_flat_dict[path]
+      base_item = base_flat_dict[path]
+
+      if pr_item == None or base_item == None:
+         continue
+
+      are_different=False
+
+      if pr_item.InheritsFrom('TProfile2D') and base_item.InheritsFrom('TProfile2D'):
+         # Compare TProfile (content, entries and errors)
+         are_different = not compare_TProfile(pr_item, base_item)
+      
+      elif pr_item.InheritsFrom('TProfile') and base_item.InheritsFrom('TProfile'):
+         # Compare TProfile (content, entries and errors)
+         are_different = not compare_TProfile(pr_item, base_item)
+
+      elif pr_item.InheritsFrom('TH1') and base_item.InheritsFrom('TH1'):
+         # Compare bin by bin
+         pr_array = root_numpy.hist2array(hist=pr_item, include_overflow=True, copy=False)
+         base_array = root_numpy.hist2array(hist=base_item, include_overflow=True, copy=False)
+
+         if pr_array.shape != base_array.shape or not np.allclose(pr_array, base_array, equal_nan=True):
+            are_different = True
+      else:
+         # Compare non histograms
+         if pr_item != base_item:
+            are_different = True
+
+      if are_different:
+         paths_to_save_in_pr.append(path)
+         paths_to_save_in_base.append(path)
+
+# Returns False if different, True otherwise
+def compare_TProfile(pr_item, base_item):
+   if pr_item.GetSize() != base_item.GetSize():
+      return False
+   
+   for i in range(pr_item.GetSize()):
+      pr_bin_content = pr_item.GetBinContent(i)
+      base_bin_content = base_item.GetBinContent(i)
+
+      pr_bin_entries = pr_item.GetBinEntries(i)
+      base_bin_entries = base_item.GetBinEntries(i)
+
+      pr_bin_error = pr_item.GetBinError(i)
+      base_bin_error = base_item.GetBinError(i)
+
+      if not np.isclose(pr_bin_content, base_bin_content, equal_nan=True):
+         return False
+
+      if not np.isclose(pr_bin_entries, base_bin_entries, equal_nan=True):
+         return False
+
+      if not np.isclose(pr_bin_error, base_bin_error, equal_nan=True):
+         return False
+   
+   return True
+
+def flatten_file(file, run_nr):
+   result = {} 
+   for key in file.GetListOfKeys():
+      try:
+         traverse_till_end(key.ReadObj(), [], result, run_nr)
+      except:
+         pass
+   
+   return result
+
+def traverse_till_end(node, dirs_list, result, run_nr):
+   new_dir_list = dirs_list + [get_node_name(node)]
+   if hasattr(node, 'GetListOfKeys'): 
+      for key in node.GetListOfKeys():
+         traverse_till_end(key.ReadObj(), new_dir_list, result, run_nr)
+   else:
+      path = tuple(new_dir_list)
+      if path not in get_blacklist(run_nr):
+         result[path] = node
+
+def get_node_name(node):
+   if node.InheritsFrom('TObjString'):
+      # Strip out just the name from a tag (<name>value</name>)
+      return node.GetName().split('>')[0][1:]
+   else:
+      return node.GetName()
+
+def save_paths(flat_dict, paths, result_file_path):
+   if len(paths) == 0:
+      print('No differences were observed - output will not be written', file=sys.stderr)
+      return
+
+   # Make sure output dir exists
+   result_dir = os.path.dirname(result_file_path)
+   if not os.path.exists(result_dir):
+      os.makedirs(result_dir)
+   
+   result_file = ROOT.TFile(result_file_path, 'recreate')
+   ROOT.gROOT.GetListOfFiles().Remove(result_file)
+
+   if not result_file.IsOpen():
+      print('Unable to open %s output file' % result_file_path, file=sys.stderr)
+      return
+
+   for path in paths:
+      save_to_file(flat_dict, path, result_file)
+
+   result_file.Close()
+   print('Output written to %s file' % result_file_path, file=sys.stderr)
+
+# Saves file from flat_dict in the same dir of currently open file for writing
+def save_to_file(flat_dict, path, output_file):
+   histogram = flat_dict[path]
+
+   current = output_file
+
+   # Last item is filename. No need to create dir for it
+   for directory in path[:-1]:
+      current = create_dir(current, directory)
+      current.cd()
+
+   histogram.Write()
+
+# Create dir in root file if it doesn't exist
+def create_dir(parent_dir, name):
+   dir = parent_dir.Get(name)
+   if not dir:
+      dir = parent_dir.mkdir(name)
+   return dir
+
+def get_output_filename(input_file_path, pr_number, test_number, cmssw_version, isPr):
+   # Samples of correct output file format:
+   # DQM_V0001_R000320822__wf136_892_pr__CMSSW_10_4_0_pre3-PR25518-1234__DQMIO.root
+   # When run number is 1 we have to use RelVal naming pattern:
+   # DQM_V0002_R000000001__RelVal_wf136_892_pr__CMSSW_10_4_0_pre3-PR25518-1234__DQMIO.root
+
+   input_file_name = os.path.basename(input_file_path)
+
+   run = input_file_name.split('_')[2]
+   workflow = os.path.basename(os.path.dirname(input_file_path)).split('_')[0].replace('.', '_')
+   if not workflow:
+      workflow = 'Unknown'
+
+   relval_prefix = ''
+   if run == 'R000000001':
+      relval_prefix = 'RelVal_'
+
+   baseOrPr = 'base'
+   if isPr:
+      baseOrPr = 'pr'
+
+   return 'DQM_V0001_%s__%swf%s_%s__%s-PR%s-%s__DQMIO.root' % (run, relval_prefix, workflow, baseOrPr, cmssw_version, pr_number, test_number)
+
+def get_run_nr(file_path):
+   return os.path.basename(file_path).split('_')[2].lstrip('R').lstrip('0')
+
+if __name__ == '__main__':
+   parser = argparse.ArgumentParser(description="This tool compares DQM monitor elements found in base-file with the ones found in pr-file."
+      "Comparison is done bin by bin and output is written to a root file containing only the changes.")
+   parser.add_argument('-b', '--base-file', help='Baseline IB DQM root file', required=True)
+   parser.add_argument('-p', '--pr-file', help='PR DQM root file', required=True)
+   parser.add_argument('-n', '--pr-number', help='PR number under test', default='00001')
+   parser.add_argument('-t', '--test-number', help='Unique test number to distinguish different comparisons of the same PR.', default='1')
+   parser.add_argument('-r', '--release-format', help='Release format in this format: CMSSW_10_5_X_2019-02-17-0000', default=os.environ['CMSSW_VERSION'])
+   parser.add_argument('-o', '--output-dir', help='Comparison root files output directory', default='dqmHistoComparisonOutput')
+   args = parser.parse_args()
+
+   cmssw_version = '_'.join(args.release_format.split('_')[:4])
+   
+   create_dif(args.base_file, args.pr_file, args.pr_number, args.test_number, cmssw_version, args.output_dir)
diff --git a/DQMServices/FileIO/scripts/dqm-histo-comparison-summary-template.html b/DQMServices/FileIO/scripts/dqm-histo-comparison-summary-template.html
new file mode 100644
index 0000000000000..2144a29ef6dd6
--- /dev/null
+++ b/DQMServices/FileIO/scripts/dqm-histo-comparison-summary-template.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+	<meta charset="utf-8">
+	<title>DQM histogram comparison summary</title>
+	<style>
+		body {
+			font-family: arial, sans-serif;
+		}
+
+		h3, h2 {
+			padding-left: 6px;
+		}
+
+		table {
+			border-collapse: collapse;
+		}
+
+		td,
+		th {
+			text-align: left;
+			padding: 6px;
+		}
+
+		tr:nth-child(even) {
+			background-color: #f1f1f1;
+		}
+
+		.removed {
+			color: #CB2431;
+			font-weight: bold;
+		}
+
+		.added {
+			color: #37BE4E;
+			font-weight: bold;
+			margin-left: 8px;
+		}
+
+		.changed {
+			color: #F5A623;
+			font-weight: bold;
+			margin-left: 8px;
+		}
+	</style>
+</head>
+
+<body>
+	<h3>Total number of changes to DQM monitor elements made by PR $PR_NUMBER$:</h3>
+
+	<h2 class="removed">$TOTAL_CHANGES$</h2>
+
+	<h3>URLs for each individual workflow ($NUMBER_OF_WORKFLOWS$):</h3>
+
+	<table>
+		<tr>
+			<th>Baseline</th>
+			<th>Pull Request</th>
+			<th>Overlay (PR + base)</th>
+			<th>Removed, added and changed plots</th>
+		</tr>
+$PER_WORKFLOW_LIST$
+	</table>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/DQMServices/FileIO/scripts/visDQMUpload.py b/DQMServices/FileIO/scripts/visDQMUpload.py
new file mode 100755
index 0000000000000..1dff3a4c5f43c
--- /dev/null
+++ b/DQMServices/FileIO/scripts/visDQMUpload.py
@@ -0,0 +1,158 @@
+#!/usr/bin/env python
+
+import sys
+import os
+import re
+import string
+import httplib
+import mimetypes
+import urllib
+import urllib2
+import httplib
+import gzip
+import hashlib
+from commands import getstatusoutput
+from cStringIO import StringIO
+from stat import *
+try:
+  from Monitoring.DQM import visDQMUtils
+except:
+  import visDQMUtils
+
+HTTPS = httplib.HTTPS
+if sys.version_info[:3] >= (2, 4, 0):
+  HTTPS = httplib.HTTPSConnection
+
+ssl_key_file = None
+ssl_cert_file = None
+
+class HTTPSCertAuth(HTTPS):
+  def __init__(self, host, *args, **kwargs):
+    HTTPS.__init__(self, host, key_file = ssl_key_file, cert_file = ssl_cert_file, **kwargs)
+
+class HTTPSCertAuthenticate(urllib2.AbstractHTTPHandler):
+  def default_open(self, req):
+    return self.do_open(HTTPSCertAuth, req)
+
+def filetype(filename):
+  return mimetypes.guess_type(filename)[0] or 'application/octet-stream'
+
+def encode(args, files):
+  """
+    Encode form (name, value) and (name, filename, type) elements into
+    multi-part/form-data. We don't actually need to know what we are
+    uploading here, so just claim it's all text/plain.
+  """
+  boundary = '----------=_DQM_FILE_BOUNDARY_=-----------'
+  (body, crlf) = ('', '\r\n')
+  for (key, value) in args.items():
+    payload = str(value)
+    body += '--' + boundary + crlf
+    body += ('Content-Disposition: form-data; name="%s"' % key) + crlf
+    body += crlf + payload + crlf
+  for (key, filename) in files.items():
+    body += '--' + boundary + crlf
+    body += ('Content-Disposition: form-data; name="%s"; filename="%s"'
+             % (key, os.path.basename(filename))) + crlf
+    body += ('Content-Type: %s' % filetype(filename)) + crlf
+    body += ('Content-Length: %d' % os.stat(filename)[ST_SIZE]) + crlf
+    body += crlf + open(filename, "r").read() + crlf
+  body += '--' + boundary + '--' + crlf + crlf
+  return ('multipart/form-data; boundary=' + boundary, body)
+
+def marshall(args, files, request):
+  """
+    Marshalls the arguments to the CGI script as multi-part/form-data,
+    not the default application/x-www-form-url-encoded.  This improves
+    the transfer of the large inputs and eases command line invocation
+    of the CGI script.
+  """
+  (type, body) = encode(args, files)
+  request.add_header('Content-Type', type)
+  request.add_header('Content-Length', str(len(body)))
+  request.add_data(body)
+
+def upload(url, args, files):
+  ident = "visDQMUpload DQMGUI/%s python/%s" % \
+    (os.getenv('DQMGUI_VERSION', '?'), "%d.%d.%d" % sys.version_info[:3])
+  datareq = urllib2.Request(url + '/data/put')
+  datareq.add_header('Accept-encoding', 'gzip')
+  datareq.add_header('User-agent', ident)
+  marshall(args, files, datareq)
+  if 'https://' in url:
+    result = urllib2.build_opener(HTTPSCertAuthenticate()).open(datareq)
+  else:
+    result = urllib2.build_opener(urllib2.ProxyHandler({})).open(datareq)
+
+  data = result.read()
+  if result.headers.get ('Content-encoding', '') == 'gzip':
+    data = gzip.GzipFile (fileobj=StringIO(data)).read ()
+  return (result.headers, data)
+
+x509_path = os.getenv("X509_USER_PROXY", None)
+if x509_path and os.path.exists(x509_path):
+  ssl_key_file = ssl_cert_file = x509_path
+
+if not ssl_key_file:
+  x509_path = os.getenv("X509_USER_KEY", None)
+  if x509_path and os.path.exists(x509_path):
+    ssl_key_file = x509_path
+
+if not ssl_cert_file:
+  x509_path = os.getenv("X509_USER_CERT", None)
+  if x509_path and os.path.exists(x509_path):
+    ssl_cert_file = x509_path
+
+if not ssl_key_file and not ssl_cert_file:
+  (status, uid) = getstatusoutput("id -u")
+  if os.path.exists("/tmp/x509up_u%s" % uid):
+    ssl_key_file = ssl_cert_file = "/tmp/x509up_u%s" % uid
+
+if not ssl_key_file:
+  x509_path = os.getenv("HOME") + "/.globus/userkey.pem"
+  if os.path.exists(x509_path):
+    ssl_key_file = x509_path
+
+if not ssl_cert_file:
+  x509_path = os.getenv("HOME") + "/.globus/usercert.pem"
+  if os.path.exists(x509_path):
+    ssl_cert_file = x509_path
+
+if 'https://' in sys.argv[1] and (not ssl_key_file or not os.path.exists(ssl_key_file)):
+  print >>sys.stderr, "no certificate private key file found"
+  sys.exit(1)
+
+if 'https://' in sys.argv[1] and (not ssl_cert_file or not os.path.exists(ssl_cert_file)):
+  print >>sys.stderr, "no certificate public key file found"
+  sys.exit(1)
+
+try:
+  for file_path in sys.argv[2:]:
+    # Before even trying to make a call to the other side, we first do a check on
+    # the filename:
+    classification_ok, classification_result = visDQMUtils.classifyDQMFile(file_path)
+    if not classification_ok:
+      print "Check of filename before upload failed with following message:"
+      print classification_result
+      sys.exit(1)
+    # If file check was fine, we continue with the upload method:
+    else:
+      print "Using SSL private key", ssl_key_file
+      print "Using SSL public key", ssl_cert_file
+      (headers, data) = \
+        upload(sys.argv[1],
+               { 'size': os.stat(sys.argv[2])[ST_SIZE],
+                 'checksum': "md5:%s" % hashlib.md5(file(sys.argv[2]).read()).hexdigest() },
+               { 'file': file_path })
+      print 'Status code: ', headers.get("Dqm-Status-Code", "None")
+      print 'Message:     ', headers.get("Dqm-Status-Message", "None")
+      print 'Detail:      ', headers.get("Dqm-Status-Detail", "None")
+      print data
+  sys.exit(0)
+except urllib2.HTTPError, e:
+  print "ERROR", e
+  print 'Status code: ', e.hdrs.get("Dqm-Status-Code", "None")
+  print 'Message:     ', e.hdrs.get("Dqm-Status-Message", "None")
+  print 'Detail:      ', e.hdrs.get("Dqm-Status-Detail", "None")
+  sys.exit(1)
+
diff --git a/DQMServices/FileIO/scripts/visDQMUtils.py b/DQMServices/FileIO/scripts/visDQMUtils.py
new file mode 100644
index 0000000000000..4d4722b04f505
--- /dev/null
+++ b/DQMServices/FileIO/scripts/visDQMUtils.py
@@ -0,0 +1,107 @@
+import re
+
+# Various regular expressions used to check filename validity:
+
+# Regexp for valid dataset names.
+RXDATASET = re.compile(r"^(/[-A-Za-z0-9_]+){3}$")
+# Regexp for valid RelVal dataset names.
+RXRELVALMC = re.compile(r"^/RelVal[^/]+/(CMSSW(?:_[0-9]+)+(?:_pre[0-9]+)?)[-_].*$")
+RXRELVALRUNDEPMC = re.compile(r"^/RelVal[^/]+/(CMSSW(?:_[0-9]+)+(?:_pre[0-9]+)?)[-_].*rundepMC.*$")
+RXRELVALDATA = re.compile(r"^/[^/]+/(CMSSW(?:_[0-9]+)+(?:_pre[0-9]+)?)[-_].*$")
+RXRUNDEPMC = re.compile(r"^/(?!RelVal)[^/]+/.*rundepMC.*$")
+
+# Regexp for online DQM files.
+RXONLINE = re.compile(r"^(?:.*/)?DQM_V(\d+)(_[A-Za-z0-9]+)?_R(\d+)\.root$")
+
+# Regexp for offline DQM files.
+RXOFFLINE = re.compile(r"^(?:.*/)?DQM_V(\d+)_R(\d+)((?:__[-A-Za-z0-9_]+){3})\.root$")
+
+# --------------------------------------------------------------------
+# Pre-classify a file into main category based on file name structure.
+#   path: path (relative to the uploads dir, coming from the walk) of the root
+#         file
+# Returns a tuple of:
+#   a boolean: True or False depending on whether the classification went OK
+#   a string or dictionary:
+#       - In case the classification went wrong: A string with the reason
+#       - In case the classification was OK: A dictionary with classification
+#                                            information
+def classifyDQMFile(path):
+  print(path)
+  try:
+    m = re.match(RXONLINE, path)
+    if m:
+      version = int(m.group(1))
+      runnr = int(m.group(3))
+      subsys = m.group(2) and m.group(2)[1:]
+      if version != 1:
+        return False, "file version is not 1"
+      elif runnr <= 10000:
+        return False, "online file has run number <= 10000"
+      else:
+        # online_data
+        return True, { 'class': 'online_data', 'version': version,
+                       'subsystem': subsys, 'runnr': runnr,
+                       'dataset': "/Global/Online/ALL" }
+
+    m = re.match(RXOFFLINE, path)
+    if m:
+      version = int(m.group(1))
+      dataset = m.group(3).replace("__", "/")
+      if not re.match(RXDATASET, dataset):
+        return False, "Invalid dataset name"
+      relvalmc = re.match(RXRELVALMC, dataset)
+      relvaldata = re.match(RXRELVALDATA, dataset)
+      relvalrundepmc = re.match(RXRELVALRUNDEPMC, dataset)
+      rundepmc = re.match(RXRUNDEPMC, dataset)
+      runnr = int(m.group(2))
+      if version != 1:
+        return False, "file version is not 1"
+      if runnr < 1:
+         return False, "file matches offline naming, but run number is < 1"
+      elif rundepmc:
+        if runnr == 1:
+          return False,  "file matches Run Dependent MonteCarlo naming, but run number is 1"
+        else:
+          # simulated_rundep
+          return True, { 'class': 'simulated_rundep', 'version': version,
+                         'runnr': runnr, 'dataset': dataset }
+      elif relvalrundepmc:
+        if runnr == 1:
+          return False, "file matches Run Dependent MonteCarlo naming, but run number is 1"
+        else:
+          # relval_rundepmc
+          return True, { 'class': 'relval_rundepmc', 'version': version,
+                         'runnr': runnr, 'dataset': dataset,
+                         'release': relvalrundepmc.group(1)}
+      elif relvalmc:
+        if runnr != 1:
+          return False, "file matches relval mc naming, but run number != 1"
+        else:
+          # relval_mc
+          return True, { 'class': 'relval_mc', 'version': version,
+                         'runnr': runnr, 'dataset': dataset,
+                         'release': relvalmc.group(1) }
+      elif relvaldata:
+        if runnr == 1:
+          return False, "file matches relval data naming, but run number = 1"
+        else:
+          # relval_data
+          return True, { 'class': 'relval_data', 'version': version,
+                         'runnr': runnr, 'dataset': dataset,
+                         'release': relvaldata.group(1) }
+      elif dataset.find("CMSSW") >= 0:
+        return False, "non-relval dataset name contains 'CMSSW'"
+      elif runnr > 1:
+        # offline_data
+        return True, { 'class': 'offline_data', 'version': version,
+                       'runnr': runnr, 'dataset': dataset }
+      else:
+        # simulated
+        return True, { 'class': 'simulated', 'version': int(m.group(1)),
+                       'runnr': runnr, 'dataset': dataset }
+
+    return False, "file matches no known naming convention"
+  except:
+    return False, "error while classifying file name"
+
diff --git a/DQMServices/FwkIO/test/read_merged_file1_file3_file2_cfg.py b/DQMServices/FwkIO/test/read_merged_file1_file3_file2_cfg.py
index de26a0459e4ab..4d55cab41a97e 100644
--- a/DQMServices/FwkIO/test/read_merged_file1_file3_file2_cfg.py
+++ b/DQMServices/FwkIO/test/read_merged_file1_file3_file2_cfg.py
@@ -33,7 +33,7 @@
 for i in range(0,10):
     readLumiElements.append(cms.untracked.PSet(name=cms.untracked.string("Foo"+str(i)),
                                           #file3, which is run 2 has means shifted by 1
-                                          means = cms.untracked.vdouble([i+x/20 for x in range(0,30)]),
+                                          means = cms.untracked.vdouble([i+x//20 for x in range(0,30)]),
                                           entries=cms.untracked.vdouble([1 for x in range(0,30)])
                                           ))
 
diff --git a/DQMServices/FwkIO/test/read_merged_file1_file3_file4_cfg.py b/DQMServices/FwkIO/test/read_merged_file1_file3_file4_cfg.py
index ba4be979604fc..8e301f9384e63 100644
--- a/DQMServices/FwkIO/test/read_merged_file1_file3_file4_cfg.py
+++ b/DQMServices/FwkIO/test/read_merged_file1_file3_file4_cfg.py
@@ -53,7 +53,7 @@
 for i in range(0,10):
     readLumiElements.append(cms.untracked.PSet(name=cms.untracked.string("Foo"+str(i)),
                                           #file3, which is run 2 has means shifted by 1
-                                          means = cms.untracked.vdouble([(i+x/10-x/20-x/20) for x in range(0,30)]),
+                                          means = cms.untracked.vdouble([(i+x//10-x//20-x//20) for x in range(0,30)]),
                                           entries=cms.untracked.vdouble([1 for x in range(0,30)])
                                           ))
 
diff --git a/DQMServices/StreamerIO/plugins/DQMStreamerReader.cc b/DQMServices/StreamerIO/plugins/DQMStreamerReader.cc
index 29150a807fcfb..aca2fd008e3d0 100644
--- a/DQMServices/StreamerIO/plugins/DQMStreamerReader.cc
+++ b/DQMServices/StreamerIO/plugins/DQMStreamerReader.cc
@@ -46,7 +46,7 @@ DQMStreamerReader::~DQMStreamerReader() {
   // and closeFile_ throws away no ServiceRegistry found exception...
   //
   // Normally, this file should be closed before this destructor is called.
-  //closeFile_("destructor");
+  //closeFileImp_("destructor");
 }
 
 void DQMStreamerReader::reset_() {
@@ -93,7 +93,7 @@ void DQMStreamerReader::reset_() {
   fiterator_.logFileAction("DQMStreamerReader initialised.");
 }
 
-void DQMStreamerReader::openFile_(const DQMFileIterator::LumiEntry& entry) {
+void DQMStreamerReader::openFileImp_(const DQMFileIterator::LumiEntry& entry) {
   processedEventPerLs_ = 0;
   edm::ParameterSet pset;
 
@@ -131,7 +131,7 @@ void DQMStreamerReader::openFile_(const DQMFileIterator::LumiEntry& entry) {
   }
 }
 
-void DQMStreamerReader::closeFile_(const std::string& reason) {
+void DQMStreamerReader::closeFileImp_(const std::string& reason) {
   if (file_.open()) {
     file_.streamFile_->closeStreamerFile();
     file_.streamFile_ = nullptr;
@@ -140,21 +140,21 @@ void DQMStreamerReader::closeFile_(const std::string& reason) {
   }
 }
 
-bool DQMStreamerReader::openNextFile_() {
-  closeFile_("skipping to another file");
+bool DQMStreamerReader::openNextFileImp_() {
+  closeFileImp_("skipping to another file");
 
   DQMFileIterator::LumiEntry currentLumi = fiterator_.open();
   std::string p = currentLumi.get_data_path();
 
   if (boost::filesystem::exists(p)) {
     try {
-      openFile_(currentLumi);
+      openFileImp_(currentLumi);
       return true;
     } catch (const cms::Exception& e) {
       fiterator_.logFileAction(std::string("Can't deserialize registry data (in open file): ") + e.what(), p);
       fiterator_.logLumiState(currentLumi, "error: data file corrupted");
 
-      closeFile_("data file corrupted");
+      closeFileImp_("data file corrupted");
       return false;
     }
   } else {
@@ -209,13 +209,13 @@ bool DQMStreamerReader::prepareNextFile() {
     if (edm::shutdown_flag.load()) {
       fiterator_.logFileAction("Shutdown flag was set, shutting down.");
 
-      closeFile_("shutdown flag is set");
+      closeFileImp_("shutdown flag is set");
       return false;
     }
 
     // check for end of run file and force quit
     if (flagEndOfRunKills_ && (fiterator_.state() != State::OPEN)) {
-      closeFile_("forced end-of-run");
+      closeFileImp_("forced end-of-run");
       return false;
     }
 
@@ -230,14 +230,14 @@ bool DQMStreamerReader::prepareNextFile() {
     // close it
     if ((processedEventPerLs_ >= minEventsPerLs_) &&
         (!fiterator_.lumiReady()) && (fiterator_.state() == State::EOR)) {
-      closeFile_("graceful end-of-run");
+      closeFileImp_("graceful end-of-run");
       return false;
     }
 
     // skip to the next file if we have no files openned yet
     if (!file_.open()) {
       if (fiterator_.lumiReady()) {
-        openNextFile_();
+        openNextFileImp_();
         // we might need to open once more (if .dat is missing)
         continue;
       }
@@ -245,7 +245,7 @@ bool DQMStreamerReader::prepareNextFile() {
 
     // or if there is a next file and enough eventshas been processed.
     if (fiterator_.lumiReady() && (processedEventPerLs_ >= minEventsPerLs_)) {
-      openNextFile_();
+      openNextFileImp_();
       // we might need to open once more (if .dat is missing)
       continue;
     }
@@ -280,7 +280,7 @@ EventMsgView const* DQMStreamerReader::prepareNextEvent() {
       if (eview == nullptr) {
         // read unsuccessful
         // this means end of file, so close the file
-        closeFile_("eof");
+        closeFileImp_("eof");
       } else {
         if (!acceptEvent(eview)) {
           continue;
@@ -317,7 +317,7 @@ bool DQMStreamerReader::checkNextEvent() {
   } catch (const cms::Exception& e) {
     // try to recover from corrupted files/events
     fiterator_.logFileAction(std::string("Can't deserialize event or registry data: ") + e.what());
-    closeFile_("data file corrupted");
+    closeFileImp_("data file corrupted");
 
     // this is not optimal, but hopefully we won't catch this many times in a row
     return checkNextEvent();
@@ -401,7 +401,7 @@ void DQMStreamerReader::skip(int toSkip) {
   } catch (const cms::Exception& e) {
     // try to recover from corrupted files/events
     fiterator_.logFileAction(std::string("Can't deserialize event data: ") + e.what());
-    closeFile_("data file corrupted");
+    closeFileImp_("data file corrupted");
   }
 }
 
diff --git a/DQMServices/StreamerIO/plugins/DQMStreamerReader.h b/DQMServices/StreamerIO/plugins/DQMStreamerReader.h
index 378dddd11345a..2056d20f95e1b 100644
--- a/DQMServices/StreamerIO/plugins/DQMStreamerReader.h
+++ b/DQMServices/StreamerIO/plugins/DQMStreamerReader.h
@@ -41,10 +41,10 @@ class DQMStreamerReader : public edm::StreamerInputSource {
   // which will break things if called
   void reset_() override;
 
-  void openFile_(const DQMFileIterator::LumiEntry& entry);
-  void closeFile_(const std::string& reason);
+  void openFileImp_(const DQMFileIterator::LumiEntry& entry);
+  void closeFileImp_(const std::string& reason);
 
-  bool openNextFile_();
+  bool openNextFileImp_();
 
   InitMsgView const* getHeaderMsg();
   EventMsgView const* getEventMsg();
diff --git a/DataFormats/CSCDigi/interface/CSCALCTDigi.h b/DataFormats/CSCDigi/interface/CSCALCTDigi.h
index 887ef3480a89f..582666e841f52 100644
--- a/DataFormats/CSCDigi/interface/CSCALCTDigi.h
+++ b/DataFormats/CSCDigi/interface/CSCALCTDigi.h
@@ -13,13 +13,15 @@
 #include <iosfwd>
 
 class CSCALCTDigi {
-
- public:
-
+public:
   /// Constructors
-  CSCALCTDigi(const int valid, const int quality, const int accel,
-	      const int patternb, const int keywire, const int bx,
-	      const int trknmb = 0);
+  CSCALCTDigi(const int valid,
+              const int quality,
+              const int accel,
+              const int patternb,
+              const int keywire,
+              const int bx,
+              const int trknmb = 0);
   /// default
   CSCALCTDigi();
 
@@ -27,83 +29,82 @@ class CSCALCTDigi {
   void clear();
 
   /// check ALCT validity (1 - valid ALCT)
-  bool isValid() const {return valid_ ;}
+  bool isValid() const { return valid_; }
 
   /// set valid
-  void setValid(const int valid) {valid_ = valid;}
+  void setValid(const int valid) { valid_ = valid; }
 
   /// return quality of a pattern
-  int getQuality() const {return quality_ ;}
+  int getQuality() const { return quality_; }
 
   /// set quality
-  void setQuality(const int quality) {quality_ = quality;}
+  void setQuality(const int quality) { quality_ = quality; }
 
   /// return Accelerator bit
   /// 1-Accelerator pattern, 0-CollisionA or CollisionB pattern
-  int getAccelerator() const {return accel_ ;}
+  int getAccelerator() const { return accel_; }
 
   /// set accelerator bit
-  void setAccelerator(const int accelerator) {accel_ = accelerator;}
+  void setAccelerator(const int accelerator) { accel_ = accelerator; }
 
   /// return Collision Pattern B bit
   /// 1-CollisionB pattern (accel_ = 0),
   /// 0-CollisionA pattern (accel_ = 0)
-  int getCollisionB() const {return patternb_ ;}
+  int getCollisionB() const { return patternb_; }
 
   /// set Collision Pattern B bit
-  void setCollisionB(const int collision) {patternb_ = collision;}
+  void setCollisionB(const int collision) { patternb_ = collision; }
 
   /// return key wire group
-  int getKeyWG() const {return keywire_ ;}
+  int getKeyWG() const { return keywire_; }
 
   /// set key wire group
-  void setKeyWG(const int keyWG) {keywire_ = keyWG;}
+  void setKeyWG(const int keyWG) { keywire_ = keyWG; }
 
   /// return BX - five low bits of BXN counter tagged by the ALCT
-  int getBX() const {return bx_ ;}
+  int getBX() const { return bx_; }
 
   /// set BX
-  void setBX(const int BX) {bx_ = BX;}
+  void setBX(const int BX) { bx_ = BX; }
 
   /// return track number (1,2)
-  int getTrknmb() const {return trknmb_ ;}
+  int getTrknmb() const { return trknmb_; }
 
   /// Set track number (1,2) after sorting ALCTs.
-  void setTrknmb(const uint16_t number) {trknmb_ = number;}
+  void setTrknmb(const uint16_t number) { trknmb_ = number; }
 
   /// return 12-bit full BX.
-  int getFullBX() const {return fullbx_ ;}
+  int getFullBX() const { return fullbx_; }
 
   /// Set 12-bit full BX.
-  void setFullBX(const uint16_t fullbx) {fullbx_ = fullbx;}
+  void setFullBX(const uint16_t fullbx) { fullbx_ = fullbx; }
 
   /// True if the first ALCT has a larger quality, or if it has the same
   /// quality but a larger wire group.
-  bool operator >  (const CSCALCTDigi&) const;
+  bool operator>(const CSCALCTDigi&) const;
 
   /// True if all members (except the number) of both ALCTs are equal.
-  bool operator == (const CSCALCTDigi&) const;
+  bool operator==(const CSCALCTDigi&) const;
 
   /// True if the preceding one is false.
-  bool operator != (const CSCALCTDigi&) const;
+  bool operator!=(const CSCALCTDigi&) const;
 
   /// Print content of digi.
   void print() const;
 
   /// set wiregroup number
-  void setWireGroup(unsigned int wiregroup) {keywire_= wiregroup;}
-
- private:
-
-  uint16_t valid_      ;
-  uint16_t quality_    ;
-  uint16_t accel_      ;
-  uint16_t patternb_   ; // not used since 2007
-  uint16_t keywire_    ;
-  uint16_t bx_         ;
-  uint16_t trknmb_     ;
-  uint16_t fullbx_     ;
+  void setWireGroup(unsigned int wiregroup) { keywire_ = wiregroup; }
+
+private:
+  uint16_t valid_;
+  uint16_t quality_;
+  uint16_t accel_;
+  uint16_t patternb_;  // not used since 2007
+  uint16_t keywire_;
+  uint16_t bx_;
+  uint16_t trknmb_;
+  uint16_t fullbx_;
 };
 
-std::ostream & operator<<(std::ostream & o, const CSCALCTDigi& digi);
+std::ostream& operator<<(std::ostream& o, const CSCALCTDigi& digi);
 #endif
diff --git a/DataFormats/CSCDigi/interface/CSCALCTStatusDigi.h b/DataFormats/CSCDigi/interface/CSCALCTStatusDigi.h
index 2d98327ea3033..72bcc09400ef4 100644
--- a/DataFormats/CSCDigi/interface/CSCALCTStatusDigi.h
+++ b/DataFormats/CSCDigi/interface/CSCALCTStatusDigi.h
@@ -12,28 +12,23 @@
 #include <iosfwd>
 #include <cstdint>
 
-class CSCALCTStatusDigi{
-
+class CSCALCTStatusDigi {
 public:
-
-  /// Constructor for all variables 
-  CSCALCTStatusDigi (const uint16_t * header, const uint16_t * trailer );
+  /// Constructor for all variables
+  CSCALCTStatusDigi(const uint16_t* header, const uint16_t* trailer);
 
   /// Default constructor.
-  CSCALCTStatusDigi () {}
+  CSCALCTStatusDigi() {}
 
   /// Data Accessors
-  const uint16_t * header() const {return header_;}
-  const uint16_t * trailer() const {return trailer_;}
-
-
+  const uint16_t* header() const { return header_; }
+  const uint16_t* trailer() const { return trailer_; }
 
 private:
-
-  uint16_t header_[116]; ///maximum header size is 116 words
+  uint16_t header_[116];  ///maximum header size is 116 words
   uint16_t trailer_[4];
 };
 
-std::ostream & operator<<(std::ostream & o, const CSCALCTStatusDigi& digi);
+std::ostream& operator<<(std::ostream& o, const CSCALCTStatusDigi& digi);
 
 #endif
diff --git a/DataFormats/CSCDigi/interface/CSCCFEBStatusDigi.h b/DataFormats/CSCDigi/interface/CSCCFEBStatusDigi.h
index 39c7aa1f03d4d..ff641f9e41b44 100644
--- a/DataFormats/CSCDigi/interface/CSCCFEBStatusDigi.h
+++ b/DataFormats/CSCDigi/interface/CSCCFEBStatusDigi.h
@@ -14,75 +14,71 @@
 #include <iosfwd>
 #include <cstdint>
 
-class CSCCFEBStatusDigi{
-
+class CSCCFEBStatusDigi {
 public:
-
-            /// Construct from the CFEB number (1-5).
-  CSCCFEBStatusDigi (int cfebnmb) {cfebnmb_ = cfebnmb;}
-
+  /// Construct from the CFEB number (1-5).
+  CSCCFEBStatusDigi(int cfebnmb) { cfebnmb_ = cfebnmb; }
 
   /// Constructor for all variables
-  CSCCFEBStatusDigi (int cfebnmb, const std::vector<uint16_t>& crcWords, 
-		     const std::vector<uint16_t>& contrWords,  const std::vector<uint16_t>& bWords) {
+  CSCCFEBStatusDigi(int cfebnmb,
+                    const std::vector<uint16_t>& crcWords,
+                    const std::vector<uint16_t>& contrWords,
+                    const std::vector<uint16_t>& bWords) {
     cfebnmb_ = cfebnmb;
     crcWords_ = crcWords;
     contrWords_ = contrWords;
     bWords_ = bWords;
-}
+  }
 
+  /// Default construction.
+  CSCCFEBStatusDigi() {}
 
-            /// Default construction.
-  CSCCFEBStatusDigi () {}
+  /// Set CRC vector
+  void setCRC(const std::vector<uint16_t>& crc) { crcWords_ = crc; }
 
-            /// Set CRC vector 
-  void setCRC (const std::vector<uint16_t>& crc) {crcWords_ = crc;}
+  /// Set SCAC (SCA Controller) vector
+  void setSCAC(const std::vector<uint16_t>& scac) { contrWords_ = scac; }
 
-            /// Set SCAC (SCA Controller) vector
-  void setSCAC (const std::vector<uint16_t>& scac) {contrWords_ =  scac;}
+  /// Get the  CFEB number
+  int getCFEBNmb() const { return cfebnmb_; }
 
-            /// Get the  CFEB number
-  int getCFEBNmb() const {return cfebnmb_;}
-
-            /// Get SCA Full Condition 
+  /// Get SCA Full Condition
   std::vector<uint16_t> getSCAFullCond() const;
 
-            /// Get CRC per each time sample
-  std::vector<uint16_t> getCRC() const {return crcWords_;}
+  /// Get CRC per each time sample
+  std::vector<uint16_t> getCRC() const { return crcWords_; }
 
-            /// Shift and select
-  int ShiftSel(int nmb,int nshift,int nsel) const;
+  /// Shift and select
+  int ShiftSel(int nmb, int nshift, int nsel) const;
 
-            /// Get TS_FLAG bit from SCA Controller data  per each time slice
+  /// Get TS_FLAG bit from SCA Controller data  per each time slice
   std::vector<int> getTS_FLAG() const;
 
-            /// Get SCA_FULL bit from SCA Controller data  per each time slice
+  /// Get SCA_FULL bit from SCA Controller data  per each time slice
   std::vector<int> getSCA_FULL() const;
 
-            /// Get LCT_PHASE bit from SCA Controller data  per each time slice
+  /// Get LCT_PHASE bit from SCA Controller data  per each time slice
   std::vector<int> getLCT_PHASE() const;
 
-            /// Get L1A_PHASE bit from SCA Controller data  per each time slice
+  /// Get L1A_PHASE bit from SCA Controller data  per each time slice
   std::vector<int> getL1A_PHASE() const;
 
-            /// Get SCA_BLK 4 bit word from SCA Controller data  per each time slice
+  /// Get SCA_BLK 4 bit word from SCA Controller data  per each time slice
   std::vector<int> getSCA_BLK() const;
 
-            /// Get TRIG_TIME 8 bit word from SCA Controller data  per each time slice
+  /// Get TRIG_TIME 8 bit word from SCA Controller data  per each time slice
   std::vector<int> getTRIG_TIME() const;
 
-            /// Print content of digi
+  /// Print content of digi
   void print() const;
 
 private:
-  
   uint16_t cfebnmb_;
   std::vector<uint16_t> crcWords_;
   std::vector<uint16_t> contrWords_;
   std::vector<uint16_t> bWords_;
-
 };
 
-std::ostream & operator<<(std::ostream & o, const CSCCFEBStatusDigi& digi);
+std::ostream& operator<<(std::ostream& o, const CSCCFEBStatusDigi& digi);
 
 #endif
diff --git a/DataFormats/CSCDigi/interface/CSCCLCTDigi.h b/DataFormats/CSCDigi/interface/CSCCLCTDigi.h
index a6ee79f170b63..2a79304eaeefd 100644
--- a/DataFormats/CSCDigi/interface/CSCCLCTDigi.h
+++ b/DataFormats/CSCDigi/interface/CSCCLCTDigi.h
@@ -13,13 +13,18 @@
 #include <iosfwd>
 
 class CSCCLCTDigi {
-
- public:
-
+public:
   /// Constructors
-  CSCCLCTDigi(const int valid, const int quality, const int pattern,
-	      const int striptype, const int bend, const int strip,
-	      const int cfeb, const int bx, const int trknmb = 0, const int fullbx=0);
+  CSCCLCTDigi(const int valid,
+              const int quality,
+              const int pattern,
+              const int striptype,
+              const int bend,
+              const int strip,
+              const int cfeb,
+              const int bx,
+              const int trknmb = 0,
+              const int fullbx = 0);
   /// default
   CSCCLCTDigi();
 
@@ -27,55 +32,55 @@ class CSCCLCTDigi {
   void clear();
 
   /// check CLCT validity (1 - valid CLCT)
-  bool isValid()     const {return valid_ ;}
+  bool isValid() const { return valid_; }
 
   /// set valid
-  void setValid(const int valid) {valid_ = valid;}
+  void setValid(const int valid) { valid_ = valid; }
 
   /// return quality of a pattern (number of layers hit!)
-  int getQuality()   const {return quality_ ;}
+  int getQuality() const { return quality_; }
 
   /// set quality
-  void setQuality(const int quality) {quality_ = quality;}
+  void setQuality(const int quality) { quality_ = quality; }
 
   /// return pattern
-  int getPattern()   const {return pattern_ ;}
+  int getPattern() const { return pattern_; }
 
   /// set pattern
-  void setPattern(const int pattern) {pattern_ = pattern;}
+  void setPattern(const int pattern) { pattern_ = pattern; }
 
   /// return striptype
-  int getStripType() const {return striptype_ ;}
+  int getStripType() const { return striptype_; }
 
   /// set stripType
-  void setStripType(const int stripType) {striptype_ = stripType;}
+  void setStripType(const int stripType) { striptype_ = stripType; }
 
   /// return bend
-  int getBend()      const {return bend_ ;}
+  int getBend() const { return bend_; }
 
   /// set bend
-  void setBend(const int bend) {bend_ = bend;}
+  void setBend(const int bend) { bend_ = bend; }
 
   /// return halfstrip that goes from 0 to 31
-  int getStrip()     const {return strip_ ;}
+  int getStrip() const { return strip_; }
 
   /// set strip
-  void setStrip(const int strip) {strip_ = strip;}
+  void setStrip(const int strip) { strip_ = strip; }
 
   /// return Key CFEB ID
-  int getCFEB()      const {return cfeb_ ;}
+  int getCFEB() const { return cfeb_; }
 
   /// set Key CFEB ID
-  void setCFEB(const int cfeb) {cfeb_ = cfeb;}
+  void setCFEB(const int cfeb) { cfeb_ = cfeb; }
 
   /// return BX
-  int getBX()        const {return bx_ ;}
+  int getBX() const { return bx_; }
 
   /// set bx
-  void setBX(const int bx) {bx_ = bx;}
+  void setBX(const int bx) { bx_ = bx; }
 
   /// return track number (1,2)
-  int getTrknmb()    const {return trknmb_ ;}
+  int getTrknmb() const { return trknmb_; }
 
   /// Convert strip_ and cfeb_ to keyStrip. Each CFEB has up to 16 strips
   /// (32 halfstrips). There are 5 cfebs.  The "strip_" variable is one
@@ -86,50 +91,47 @@ class CSCCLCTDigi {
   /// the correlated LCT digi.  For distrip patterns, the convention is
   /// the same as for persistent strip numbers: low halfstrip of a distrip.
   /// SV, June 15th, 2006.
-  int getKeyStrip()  const {
+  int getKeyStrip() const {
     int keyStrip = cfeb_ * 32 + strip_;
     return keyStrip;
   }
 
   /// Set track number (1,2) after sorting CLCTs.
-  void setTrknmb(const uint16_t number) {trknmb_ = number;}
+  void setTrknmb(const uint16_t number) { trknmb_ = number; }
 
   /// return 12-bit full BX.
-  int getFullBX() const {return fullbx_ ;}
+  int getFullBX() const { return fullbx_; }
 
   /// Set 12-bit full BX.
-  void setFullBX(const uint16_t fullbx) {fullbx_ = fullbx;}
-
+  void setFullBX(const uint16_t fullbx) { fullbx_ = fullbx; }
 
   /// True if the left-hand side has a larger "quality".  Full definition
   /// of "quality" depends on quality word itself, pattern type, and strip
   /// number.
-  bool operator >  (const CSCCLCTDigi&) const;
+  bool operator>(const CSCCLCTDigi&) const;
 
   /// True if the two LCTs have exactly the same members (except the number).
-  bool operator == (const CSCCLCTDigi&) const;
+  bool operator==(const CSCCLCTDigi&) const;
 
   /// True if the preceding one is false.
-  bool operator != (const CSCCLCTDigi&) const;
+  bool operator!=(const CSCCLCTDigi&) const;
 
   /// Print content of digi.
   void print() const;
 
- private:
-
-  uint16_t valid_      ;
-  uint16_t quality_    ;
-  uint16_t pattern_    ;
-  uint16_t striptype_  ; // not used since mid-2008
-  uint16_t bend_       ;
-  uint16_t strip_      ;
-  uint16_t cfeb_       ;
-  uint16_t bx_         ;
-  uint16_t trknmb_     ;
-  uint16_t fullbx_     ;
-
+private:
+  uint16_t valid_;
+  uint16_t quality_;
+  uint16_t pattern_;
+  uint16_t striptype_;  // not used since mid-2008
+  uint16_t bend_;
+  uint16_t strip_;
+  uint16_t cfeb_;
+  uint16_t bx_;
+  uint16_t trknmb_;
+  uint16_t fullbx_;
 };
 
-std::ostream & operator<<(std::ostream & o, const CSCCLCTDigi& digi);
+std::ostream& operator<<(std::ostream& o, const CSCCLCTDigi& digi);
 
 #endif
diff --git a/DataFormats/CSCDigi/interface/CSCCLCTPreTriggerCollection.h b/DataFormats/CSCDigi/interface/CSCCLCTPreTriggerCollection.h
index 81697f0cfc99d..2aea27cfbfac0 100644
--- a/DataFormats/CSCDigi/interface/CSCCLCTPreTriggerCollection.h
+++ b/DataFormats/CSCDigi/interface/CSCCLCTPreTriggerCollection.h
@@ -14,4 +14,3 @@ typedef int CSCCLCTPreTrigger;
 typedef MuonDigiCollection<CSCDetId, CSCCLCTPreTrigger> CSCCLCTPreTriggerCollection;
 
 #endif
-
diff --git a/DataFormats/CSCDigi/interface/CSCCLCTPreTriggerDigi.h b/DataFormats/CSCDigi/interface/CSCCLCTPreTriggerDigi.h
index e9e8be5da4bf1..47ef156253891 100644
--- a/DataFormats/CSCDigi/interface/CSCCLCTPreTriggerDigi.h
+++ b/DataFormats/CSCDigi/interface/CSCCLCTPreTriggerDigi.h
@@ -13,13 +13,18 @@
 #include <iosfwd>
 
 class CSCCLCTPreTriggerDigi {
-
- public:
-
+public:
   /// Constructors
-  CSCCLCTPreTriggerDigi(const int valid, const int quality, const int pattern,
-	      const int striptype, const int bend, const int strip,
-	      const int cfeb, const int bx, const int trknmb = 0, const int fullbx=0);
+  CSCCLCTPreTriggerDigi(const int valid,
+                        const int quality,
+                        const int pattern,
+                        const int striptype,
+                        const int bend,
+                        const int strip,
+                        const int cfeb,
+                        const int bx,
+                        const int trknmb = 0,
+                        const int fullbx = 0);
   /// default
   CSCCLCTPreTriggerDigi();
 
@@ -27,31 +32,31 @@ class CSCCLCTPreTriggerDigi {
   void clear();
 
   /// check CLCT validity (1 - valid CLCT)
-  bool isValid()     const {return valid_ ;}
+  bool isValid() const { return valid_; }
 
   /// return quality of a pattern (number of layers hit!)
-  int getQuality()   const {return quality_ ;}
+  int getQuality() const { return quality_; }
 
   /// return pattern
-  int getPattern()   const {return pattern_ ;}
+  int getPattern() const { return pattern_; }
 
   /// return striptype
-  int getStripType() const {return striptype_ ;}
+  int getStripType() const { return striptype_; }
 
   /// return bend
-  int getBend()      const {return bend_ ;}
+  int getBend() const { return bend_; }
 
   /// return halfstrip that goes from 0 to 31
-  int getStrip()     const {return strip_ ;}
+  int getStrip() const { return strip_; }
 
   /// return Key CFEB ID
-  int getCFEB()      const {return cfeb_ ;}
+  int getCFEB() const { return cfeb_; }
 
   /// return BX
-  int getBX()        const {return bx_ ;}
+  int getBX() const { return bx_; }
 
   /// return track number (1,2)
-  int getTrknmb()    const {return trknmb_ ;}
+  int getTrknmb() const { return trknmb_; }
 
   /// Convert strip_ and cfeb_ to keyStrip. Each CFEB has up to 16 strips
   /// (32 halfstrips). There are 5 cfebs.  The "strip_" variable is one
@@ -62,50 +67,47 @@ class CSCCLCTPreTriggerDigi {
   /// the correlated LCT digi.  For distrip patterns, the convention is
   /// the same as for persistent strip numbers: low halfstrip of a distrip.
   /// SV, June 15th, 2006.
-  int getKeyStrip()  const {
+  int getKeyStrip() const {
     int keyStrip = cfeb_ * 32 + strip_;
     return keyStrip;
   }
 
   /// Set track number (1,2) after sorting CLCTs.
-  void setTrknmb(const uint16_t number) {trknmb_ = number;}
+  void setTrknmb(const uint16_t number) { trknmb_ = number; }
 
   /// return 12-bit full BX.
-  int getFullBX() const {return fullbx_ ;}
+  int getFullBX() const { return fullbx_; }
 
   /// Set 12-bit full BX.
-  void setFullBX(const uint16_t fullbx) {fullbx_ = fullbx;}
-
+  void setFullBX(const uint16_t fullbx) { fullbx_ = fullbx; }
 
   /// True if the left-hand side has a larger "quality".  Full definition
   /// of "quality" depends on quality word itself, pattern type, and strip
   /// number.
-  bool operator >  (const CSCCLCTPreTriggerDigi&) const;
+  bool operator>(const CSCCLCTPreTriggerDigi&) const;
 
   /// True if the two LCTs have exactly the same members (except the number).
-  bool operator == (const CSCCLCTPreTriggerDigi&) const;
+  bool operator==(const CSCCLCTPreTriggerDigi&) const;
 
   /// True if the preceding one is false.
-  bool operator != (const CSCCLCTPreTriggerDigi&) const;
+  bool operator!=(const CSCCLCTPreTriggerDigi&) const;
 
   /// Print content of digi.
   void print() const;
 
- private:
-
-  uint16_t valid_      ;
-  uint16_t quality_    ;
-  uint16_t pattern_    ;
-  uint16_t striptype_  ; // not used since mid-2008
-  uint16_t bend_       ;
-  uint16_t strip_      ;
-  uint16_t cfeb_       ;
-  uint16_t bx_         ;
-  uint16_t trknmb_     ;
-  uint16_t fullbx_     ;
-
+private:
+  uint16_t valid_;
+  uint16_t quality_;
+  uint16_t pattern_;
+  uint16_t striptype_;  // not used since mid-2008
+  uint16_t bend_;
+  uint16_t strip_;
+  uint16_t cfeb_;
+  uint16_t bx_;
+  uint16_t trknmb_;
+  uint16_t fullbx_;
 };
 
-std::ostream & operator<<(std::ostream & o, const CSCCLCTPreTriggerDigi& digi);
+std::ostream& operator<<(std::ostream& o, const CSCCLCTPreTriggerDigi& digi);
 
 #endif
diff --git a/DataFormats/CSCDigi/interface/CSCComparatorDigi.h b/DataFormats/CSCDigi/interface/CSCComparatorDigi.h
index 82fc96f79ef74..106404ebd2384 100644
--- a/DataFormats/CSCDigi/interface/CSCComparatorDigi.h
+++ b/DataFormats/CSCDigi/interface/CSCComparatorDigi.h
@@ -13,17 +13,14 @@
 #include <vector>
 #include <cstdint>
 
-class CSCComparatorDigi{
-
+class CSCComparatorDigi {
 public:
-
   /// Construct from the strip number and the ADC readings.
-  CSCComparatorDigi (int strip, int comparator, int timeBinWord);
+  CSCComparatorDigi(int strip, int comparator, int timeBinWord);
   ///comparator here can be either 0 or 1 for left or right halfstrip of given strip
 
   /// Default construction.
-  CSCComparatorDigi ();
-
+  CSCComparatorDigi();
 
   /// Digis are equal if they are on the same strip and have same Comparator data
   bool operator==(const CSCComparatorDigi& digi) const;
@@ -58,23 +55,18 @@ class CSCComparatorDigi{
   void setStrip(int strip);
 
   /// Set Comparator data
-  void setComparator (int comparator);
+  void setComparator(int comparator);
 
   /// Print content of digi
   void print() const;
 
-
 private:
-
   uint16_t strip_;
   uint16_t comparator_;
   uint16_t timeBinWord_;
-
 };
 
 /// Output operator
-std::ostream & operator<<(std::ostream & o, const CSCComparatorDigi& digi);
+std::ostream& operator<<(std::ostream& o, const CSCComparatorDigi& digi);
 
 #endif
-
-
diff --git a/DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h b/DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h
index 0df0c69197eb6..02c4bc97a1e46 100644
--- a/DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h
+++ b/DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h
@@ -14,4 +14,3 @@
 typedef MuonDigiCollection<CSCDetId, CSCComparatorDigi> CSCComparatorDigiCollection;
 
 #endif
-
diff --git a/DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigi.h b/DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigi.h
index 2d0ee89650cc2..0f7c1be268885 100644
--- a/DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigi.h
+++ b/DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigi.h
@@ -15,35 +15,40 @@
 #include "DataFormats/CSCDigi/interface/CSCCLCTDigi.h"
 #include "DataFormats/GEMDigi/interface/GEMPadDigi.h"
 
-class CSCCorrelatedLCTDigi 
-{
- public:
-  
+class CSCCorrelatedLCTDigi {
+public:
   /// Constructors
-  CSCCorrelatedLCTDigi(const int trknmb, const int valid, const int quality,
-		       const int keywire, const int strip, const int pattern,
-		       const int bend, const int bx, const int mpclink = 0,
-		       const uint16_t bx0=0, const uint16_t syncErr = 0,
-		       const uint16_t cscID=0);
-  CSCCorrelatedLCTDigi();                               /// default
+  CSCCorrelatedLCTDigi(const int trknmb,
+                       const int valid,
+                       const int quality,
+                       const int keywire,
+                       const int strip,
+                       const int pattern,
+                       const int bend,
+                       const int bx,
+                       const int mpclink = 0,
+                       const uint16_t bx0 = 0,
+                       const uint16_t syncErr = 0,
+                       const uint16_t cscID = 0);
+  CSCCorrelatedLCTDigi();  /// default
 
   /// clear this LCT
   void clear();
 
   /// return track number
-  int getTrknmb()  const { return trknmb; }
+  int getTrknmb() const { return trknmb; }
 
   /// return valid pattern bit
-  bool isValid()   const { return valid; }
+  bool isValid() const { return valid; }
 
   /// return the 4 bit Correlated LCT Quality
   int getQuality() const { return quality; }
 
   /// return the key wire group. counts from 0.
-  int getKeyWG()   const { return keywire; }
+  int getKeyWG() const { return keywire; }
 
   /// return the key halfstrip from 0,159
-  int getStrip()   const { return strip; }
+  int getStrip() const { return strip; }
 
   /// return the fractional strip. counts from 0.25
   float getFractionalStrip() const;
@@ -52,26 +57,26 @@ class CSCCorrelatedLCTDigi
   int getPattern() const { return pattern; }
 
   /// return bend
-  int getBend()    const { return bend; }
+  int getBend() const { return bend; }
 
   /// return BX
-  int getBX()      const { return bx; }
+  int getBX() const { return bx; }
 
   /// return CLCT pattern number (in use again Feb 2011)
   int getCLCTPattern() const { return (pattern & 0xF); }
 
   /// return strip type (obsolete since mid-2008)
-  int getStripType() const   { return ((pattern & 0x8) >> 3); }
+  int getStripType() const { return ((pattern & 0x8) >> 3); }
 
   /// return MPC link number, 0 means not sorted, 1-3 give MPC sorting rank
   int getMPCLink() const { return mpclink; }
 
-  uint16_t getCSCID()   const {return cscID;}
-  uint16_t getBX0()     const {return bx0;}
-  uint16_t getSyncErr() const {return syncErr;}
+  uint16_t getCSCID() const { return cscID; }
+  uint16_t getBX0() const { return bx0; }
+  uint16_t getSyncErr() const { return syncErr; }
 
   /// Set track number (1,2) after sorting LCTs.
-  void setTrknmb(const uint16_t number) {trknmb = number;}
+  void setTrknmb(const uint16_t number) { trknmb = number; }
 
   /// Set mpc link number after MPC sorting
   void setMPCLink(const uint16_t& link) { mpclink = link; }
@@ -80,62 +85,62 @@ class CSCCorrelatedLCTDigi
   void print() const;
 
   ///Comparison
-  bool operator == (const CSCCorrelatedLCTDigi &) const;
-  bool operator != (const CSCCorrelatedLCTDigi &rhs) const
-    { return !(this->operator==(rhs)); }
+  bool operator==(const CSCCorrelatedLCTDigi&) const;
+  bool operator!=(const CSCCorrelatedLCTDigi& rhs) const { return !(this->operator==(rhs)); }
 
   /// set wiregroup number
-  void setWireGroup(unsigned int wiregroup) {keywire= wiregroup;}
+  void setWireGroup(unsigned int wiregroup) { keywire = wiregroup; }
 
   /// set quality code
-  void setQuality(unsigned int q) {quality=q;}
+  void setQuality(unsigned int q) { quality = q; }
 
   /// set valid
-  void setValid(unsigned int v) {valid=v;}
+  void setValid(unsigned int v) { valid = v; }
 
   /// set strip
-  void setStrip(unsigned int s) {strip=s;}
+  void setStrip(unsigned int s) { strip = s; }
 
   /// set pattern
-  void setPattern(unsigned int p) {pattern=p;}
+  void setPattern(unsigned int p) { pattern = p; }
 
   /// set bend
-  void setBend(unsigned int b) {bend=b;}
+  void setBend(unsigned int b) { bend = b; }
 
   /// set bx
-  void setBX(unsigned int b) {bx=b;}
+  void setBX(unsigned int b) { bx = b; }
 
   /// set bx0
-  void setBX0(unsigned int b) {bx0=b;}
+  void setBX0(unsigned int b) { bx0 = b; }
 
   /// set syncErr
-  void setSyncErr(unsigned int s) {syncErr=s;}
+  void setSyncErr(unsigned int s) { syncErr = s; }
 
   /// set cscID
-  void setCSCID(unsigned int c) {cscID=c;}
+  void setCSCID(unsigned int c) { cscID = c; }
 
   /// SIMULATION ONLY ////
-  enum Type{CLCTALCT, // CLCT-centric
-            ALCTCLCT, // ALCT-centric
-            ALCTCLCTGEM, // ALCT-CLCT-1 GEM pad
-            ALCTCLCT2GEM, // ALCT-CLCT-2 GEM pads in coincidence
-            ALCT2GEM, // ALCT-2 GEM pads in coincidence
-            CLCT2GEM,  // CLCT-2 GEM pads in coincidence
-            CLCTONLY, // Missing ALCT
-            ALCTONLY // Missing CLCT
+  enum Type {
+    CLCTALCT,      // CLCT-centric
+    ALCTCLCT,      // ALCT-centric
+    ALCTCLCTGEM,   // ALCT-CLCT-1 GEM pad
+    ALCTCLCT2GEM,  // ALCT-CLCT-2 GEM pads in coincidence
+    ALCT2GEM,      // ALCT-2 GEM pads in coincidence
+    CLCT2GEM,      // CLCT-2 GEM pads in coincidence
+    CLCTONLY,      // Missing ALCT
+    ALCTONLY       // Missing CLCT
   };
-  
-  int getType() const {return type_;}
-  void setType(int type) {type_ = type;}
-  
-  void setALCT(const CSCALCTDigi& alct) {alct_ = alct;}
-  void setCLCT(const CSCCLCTDigi& clct) {clct_ = clct;}
-  void setGEM1(const GEMPadDigi& gem) {gem1_ = gem;}
-  void setGEM2(const GEMPadDigi& gem) {gem2_ = gem;}
-  const CSCALCTDigi&  getALCT() const {return alct_;}
-  const CSCCLCTDigi&  getCLCT() const {return clct_;}
-  const GEMPadDigi&  getGEM1() const {return gem1_;}
-  const GEMPadDigi&  getGEM2() const {return gem2_;}
+
+  int getType() const { return type_; }
+  void setType(int type) { type_ = type; }
+
+  void setALCT(const CSCALCTDigi& alct) { alct_ = alct; }
+  void setCLCT(const CSCCLCTDigi& clct) { clct_ = clct; }
+  void setGEM1(const GEMPadDigi& gem) { gem1_ = gem; }
+  void setGEM2(const GEMPadDigi& gem) { gem2_ = gem; }
+  const CSCALCTDigi& getALCT() const { return alct_; }
+  const CSCCLCTDigi& getCLCT() const { return clct_; }
+  const GEMPadDigi& getGEM1() const { return gem1_; }
+  const GEMPadDigi& getGEM2() const { return gem2_; }
 
 private:
   uint16_t trknmb;
@@ -147,7 +152,7 @@ class CSCCorrelatedLCTDigi
   uint16_t bend;
   uint16_t bx;
   uint16_t mpclink;
-  uint16_t bx0; 
+  uint16_t bx0;
   uint16_t syncErr;
   uint16_t cscID;
 
@@ -160,6 +165,6 @@ class CSCCorrelatedLCTDigi
   GEMPadDigi gem2_;
 };
 
-std::ostream & operator<<(std::ostream & o, const CSCCorrelatedLCTDigi& digi);
+std::ostream& operator<<(std::ostream& o, const CSCCorrelatedLCTDigi& digi);
 
 #endif
diff --git a/DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigiCollection.h b/DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigiCollection.h
index daac1ffac4213..78928d36ea8ac 100644
--- a/DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigiCollection.h
+++ b/DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigiCollection.h
@@ -12,6 +12,6 @@
 #include "DataFormats/CSCDigi/interface/CSCCorrelatedLCTDigi.h"
 #include "DataFormats/MuonData/interface/MuonDigiCollection.h"
 
-typedef MuonDigiCollection<CSCDetId,CSCCorrelatedLCTDigi> CSCCorrelatedLCTDigiCollection;
+typedef MuonDigiCollection<CSCDetId, CSCCorrelatedLCTDigi> CSCCorrelatedLCTDigiCollection;
 
 #endif
diff --git a/DataFormats/CSCDigi/interface/CSCDCCFormatStatusDigi.h b/DataFormats/CSCDigi/interface/CSCDCCFormatStatusDigi.h
index 356e011ecd769..7bb9773cb1235 100644
--- a/DataFormats/CSCDigi/interface/CSCDCCFormatStatusDigi.h
+++ b/DataFormats/CSCDigi/interface/CSCDCCFormatStatusDigi.h
@@ -1,7 +1,6 @@
 #ifndef CSCDCCFormatStatusDigi_CSCDCCFormatStatusDigi_h
 #define CSCDCCFormatStatusDigi_CSCDCCFormatStatusDigi_h
 
-
 /*
  * =====================================================================================
  *
@@ -21,14 +20,12 @@
  * =====================================================================================
  */
 
-
 #include "DataFormats/MuonDetId/interface/CSCDetId.h"
 #include <set>
 #include <map>
 #include <algorithm>
 #include <iosfwd>
 
-
 /** DCC identifier type */
 typedef int32_t DCCIdType;
 
@@ -44,34 +41,34 @@ typedef uint32_t ExaminerStatusType;
 
 /** Format Error individual named flags */
 enum FormatErrorFlag {
-  ANY_ERRORS                                          = 0,
-  DDU_TRAILER_MISSING                                 = 1,
-  DDU_HEADER_MISSING                                  = 2,
-  DDU_CRC_ERROR                                       = 3,
-  DDU_WORD_COUNT_ERROR                                = 4,
-  DMB_TRAILER_MISSING                                 = 5,
-  DMB_HEADER_MISSING                                  = 6,
-  ALCT_TRAILER_MISSING                                = 7,
-  ALCT_HEADER_MISSING                                 = 8,
-  ALCT_WORD_COUNT_ERROR                               = 9,
-  ALCT_CRC_ERROR                                      = 10,
-  ALCT_TRAILER_BIT_ERROR                              = 11,
-  TMB_TRAILER_MISSING                                 = 12,
-  TMB_HEADER_MISSING                                  = 13,
-  TMB_WORD_COUNT_ERROR                                = 14,
-  TMB_CRC_ERROR                                       = 15,
-  CFEB_WORD_COUNT_PER_SAMPLE_ERROR                    = 16,
-  CFEB_SAMPLE_COUNT_ERROR                             = 17,
-  CFEB_CRC_ERROR                                      = 18,
-  DDU_EVENT_SIZE_LIMIT_ERROR                          = 19,
-  C_WORDS                                             = 20,
-  ALCT_DAV_ERROR                                      = 21,
-  TMB_DAV_ERROR                                       = 22,
-  CFEB_DAV_ERROR                                      = 23,
-  DMB_ACTIVE_ERROR                                    = 24,
-  DCC_TRAILER_MISSING                                 = 25,
-  DCC_HEADER_MISSING                                  = 26,
-  DMB_DAV_VS_DMB_ACTIVE_MISMATCH_ERROR                = 27,
+  ANY_ERRORS = 0,
+  DDU_TRAILER_MISSING = 1,
+  DDU_HEADER_MISSING = 2,
+  DDU_CRC_ERROR = 3,
+  DDU_WORD_COUNT_ERROR = 4,
+  DMB_TRAILER_MISSING = 5,
+  DMB_HEADER_MISSING = 6,
+  ALCT_TRAILER_MISSING = 7,
+  ALCT_HEADER_MISSING = 8,
+  ALCT_WORD_COUNT_ERROR = 9,
+  ALCT_CRC_ERROR = 10,
+  ALCT_TRAILER_BIT_ERROR = 11,
+  TMB_TRAILER_MISSING = 12,
+  TMB_HEADER_MISSING = 13,
+  TMB_WORD_COUNT_ERROR = 14,
+  TMB_CRC_ERROR = 15,
+  CFEB_WORD_COUNT_PER_SAMPLE_ERROR = 16,
+  CFEB_SAMPLE_COUNT_ERROR = 17,
+  CFEB_CRC_ERROR = 18,
+  DDU_EVENT_SIZE_LIMIT_ERROR = 19,
+  C_WORDS = 20,
+  ALCT_DAV_ERROR = 21,
+  TMB_DAV_ERROR = 22,
+  CFEB_DAV_ERROR = 23,
+  DMB_ACTIVE_ERROR = 24,
+  DCC_TRAILER_MISSING = 25,
+  DCC_HEADER_MISSING = 26,
+  DMB_DAV_VS_DMB_ACTIVE_MISMATCH_ERROR = 27,
   EXTRA_WORDS_BETWEEN_DDU_HEADER_AND_FIRST_DMB_HEADER = 28
 };
 
@@ -82,42 +79,42 @@ enum CSCPayloadFlag {
   CFEB3_ACTIVE = 2,
   CFEB4_ACTIVE = 3,
   CFEB5_ACTIVE = 4,
-  ALCT_DAV     = 5,
-  TMB_DAV      = 6,
-  CFEB1_DAV    = 7,
-  CFEB2_DAV    = 8,
-  CFEB3_DAV    = 9,
-  CFEB4_DAV    = 10,
-  CFEB5_DAV    = 11
+  ALCT_DAV = 5,
+  TMB_DAV = 6,
+  CFEB1_DAV = 7,
+  CFEB2_DAV = 8,
+  CFEB3_DAV = 9,
+  CFEB4_DAV = 10,
+  CFEB5_DAV = 11
 };
 
 /** CSC Status individual named flags */
 enum CSCStatusFlag {
-  ALCT_FIFO_FULL           = 0,
-  TMB_FIFO_FULL            = 1,
-  CFEB1_FIFO_FULL          = 2,
-  CFEB2_FIFO_FULL          = 3,
-  CFEB3_FIFO_FULL          = 4,
-  CFEB4_FIFO_FULL          = 5,
-  CFEB5_FIFO_FULL          = 6,
-  ALCT_START_TIMEOUT       = 7,
-  TMB_START_TIMEOUT        = 8,
-  CFEB1_START_TIMEOUT      = 9,
-  CFEB2_START_TIMEOUT      = 10,
-  CFEB3_START_TIMEOUT      = 11,
-  CFEB4_START_TIMEOUT      = 12,
-  CFEB5_START_TIMEOUT      = 13,
-  ALCT_END_TIMEOUT         = 14,
-  TMB_END_TIMEOUT          = 15,
-  CFEB1_END_TIMEOUT        = 16,
-  CFEB2_END_TIMEOUT        = 17,
-  CFEB3_END_TIMEOUT        = 18,
-  CFEB4_END_TIMEOUT        = 19,
-  CFEB5_END_TIMEOUT        = 20,
+  ALCT_FIFO_FULL = 0,
+  TMB_FIFO_FULL = 1,
+  CFEB1_FIFO_FULL = 2,
+  CFEB2_FIFO_FULL = 3,
+  CFEB3_FIFO_FULL = 4,
+  CFEB4_FIFO_FULL = 5,
+  CFEB5_FIFO_FULL = 6,
+  ALCT_START_TIMEOUT = 7,
+  TMB_START_TIMEOUT = 8,
+  CFEB1_START_TIMEOUT = 9,
+  CFEB2_START_TIMEOUT = 10,
+  CFEB3_START_TIMEOUT = 11,
+  CFEB4_START_TIMEOUT = 12,
+  CFEB5_START_TIMEOUT = 13,
+  ALCT_END_TIMEOUT = 14,
+  TMB_END_TIMEOUT = 15,
+  CFEB1_END_TIMEOUT = 16,
+  CFEB2_END_TIMEOUT = 17,
+  CFEB3_END_TIMEOUT = 18,
+  CFEB4_END_TIMEOUT = 19,
+  CFEB5_END_TIMEOUT = 20,
   CFEB_ACTIVE_DAV_MISMATCH = 21,
-  B_WORDS_FOUND            = 22
+  B_WORDS_FOUND = 22
 };
-    
+
 /**
  * @brief  Map iterator template.
  * @param  it Iterator from 0 to ... (auto inc).
@@ -126,7 +123,7 @@ enum CSCStatusFlag {
  * @return true if key found, false - otherwise
  */
 template <class TKey, class TVal>
-bool nextInMap(uint32_t& it, TKey& key, const std::map<TKey, TVal>& m) { 
+bool nextInMap(uint32_t& it, TKey& key, const std::map<TKey, TVal>& m) {
   uint32_t c = 0;
   typename std::map<TKey, TVal>::const_iterator itr = m.begin();
   while (itr != m.end()) {
@@ -147,12 +144,11 @@ bool nextInMap(uint32_t& it, TKey& key, const std::map<TKey, TVal>& m) {
  * @return std::set ok Keys
  */
 template <class TKey, class TVal>
-std::set<TKey> getKeysList(const std::map<TKey, TVal>& m)
-{
+std::set<TKey> getKeysList(const std::map<TKey, TVal>& m) {
   std::set<TKey> keys;
   typename std::map<TKey, TVal>::const_iterator itr;
-  for (itr  = m.begin(); itr != m.end(); ++itr) {
-     keys.insert(itr->first);
+  for (itr = m.begin(); itr != m.end(); ++itr) {
+    keys.insert(itr->first);
   }
   return keys;
 }
@@ -162,14 +158,11 @@ std::set<TKey> getKeysList(const std::map<TKey, TVal>& m)
  * @brief CSC Format Status Object
  */
 class CSCDCCFormatStatusDigi {
-
- private:
-
+private:
   /**
    * Internal mask storage variables and containers.
    */
 
-    
   /** DCC Examiner mask used */
   ExaminerMaskType fDCC_MASK;
 
@@ -187,13 +180,13 @@ class CSCDCCFormatStatusDigi {
   std::map<CSCIdType, ExaminerStatusType> mCSC_PAYLOADS;
   std::map<CSCIdType, ExaminerStatusType> mCSC_STATUS;
 
- protected:
-
+protected:
   /// Make CSCIdType from Crate and DMB IDs
-  CSCIdType makeCSCId(const uint16_t crateId, const uint16_t dmbId) const
-    { return ( (CSCIdType(crateId&0xFF)<<4) | (dmbId&0xF) ); }
+  CSCIdType makeCSCId(const uint16_t crateId, const uint16_t dmbId) const {
+    return ((CSCIdType(crateId & 0xFF) << 4) | (dmbId & 0xF));
+  }
 
-  /// Init internal data stuctures    
+  /// Init internal data stuctures
   void init() {
     fDDU_SUMMARY_ERRORS = 0;
     fCSC_MASK = 0;
@@ -204,8 +197,7 @@ class CSCDCCFormatStatusDigi {
     mCSC_STATUS.clear();
   }
 
- public:
-
+public:
   /**
    * @brief  Constructor
    * @param  fDCC_MASK_ DCC Examiner mask used (for information purposes).
@@ -216,35 +208,33 @@ class CSCDCCFormatStatusDigi {
    * @param  mCSC_PAYLOADS_ List of payloads per CSC
    * @param  mCSC_STATUS_ List of statuses per CSC
    */
-  CSCDCCFormatStatusDigi(const DCCIdType DCCId_, 
-			 const ExaminerMaskType fDCC_MASK_,
-			 const ExaminerMaskType fCSC_MASK_,
-			 const ExaminerStatusType fDDU_SUMMARY_ERRORS_,
-			 const std::map<DDUIdType, ExaminerStatusType>& mDDU_ERRORS_,
-			 const std::map<CSCIdType, ExaminerStatusType>& mCSC_ERRORS_,
-			 const std::map<CSCIdType, ExaminerStatusType>& mCSC_PAYLOADS_,
-			 const std::map<CSCIdType, ExaminerStatusType>& mCSC_STATUS_): DCCId(DCCId_) 
-    {
-      init();
-      setDCCExaminerInfo(fDCC_MASK_, fCSC_MASK_, fDDU_SUMMARY_ERRORS_, mDDU_ERRORS_, mCSC_ERRORS_, mCSC_PAYLOADS_, mCSC_STATUS_);
-    }
-
-
-  CSCDCCFormatStatusDigi(const DCCIdType DCCId_): DCCId(DCCId_) {init();}
+  CSCDCCFormatStatusDigi(const DCCIdType DCCId_,
+                         const ExaminerMaskType fDCC_MASK_,
+                         const ExaminerMaskType fCSC_MASK_,
+                         const ExaminerStatusType fDDU_SUMMARY_ERRORS_,
+                         const std::map<DDUIdType, ExaminerStatusType>& mDDU_ERRORS_,
+                         const std::map<CSCIdType, ExaminerStatusType>& mCSC_ERRORS_,
+                         const std::map<CSCIdType, ExaminerStatusType>& mCSC_PAYLOADS_,
+                         const std::map<CSCIdType, ExaminerStatusType>& mCSC_STATUS_)
+      : DCCId(DCCId_) {
+    init();
+    setDCCExaminerInfo(
+        fDCC_MASK_, fCSC_MASK_, fDDU_SUMMARY_ERRORS_, mDDU_ERRORS_, mCSC_ERRORS_, mCSC_PAYLOADS_, mCSC_STATUS_);
+  }
 
+  CSCDCCFormatStatusDigi(const DCCIdType DCCId_) : DCCId(DCCId_) { init(); }
 
   /// Default constructor.
-  CSCDCCFormatStatusDigi (): DCCId(0) {init();}
-
+  CSCDCCFormatStatusDigi() : DCCId(0) { init(); }
 
-  /// Fill internal data structures using Examiner object 
+  /// Fill internal data structures using Examiner object
   void setDCCExaminerInfo(const ExaminerMaskType fDCC_MASK_,
-                         const ExaminerMaskType fCSC_MASK_,
-                         const ExaminerStatusType fDDU_SUMMARY_ERRORS_,
-                         const std::map<DDUIdType, ExaminerStatusType>& mDDU_ERRORS_,
-                         const std::map<CSCIdType, ExaminerStatusType>& mCSC_ERRORS_,
-                         const std::map<CSCIdType, ExaminerStatusType>& mCSC_PAYLOADS_, 
-                         const std::map<CSCIdType, ExaminerStatusType>& mCSC_STATUS_);
+                          const ExaminerMaskType fCSC_MASK_,
+                          const ExaminerStatusType fDDU_SUMMARY_ERRORS_,
+                          const std::map<DDUIdType, ExaminerStatusType>& mDDU_ERRORS_,
+                          const std::map<CSCIdType, ExaminerStatusType>& mCSC_ERRORS_,
+                          const std::map<CSCIdType, ExaminerStatusType>& mCSC_PAYLOADS_,
+                          const std::map<CSCIdType, ExaminerStatusType>& mCSC_STATUS_);
 
 #ifdef DEBUG
   /**
@@ -254,21 +244,33 @@ class CSCDCCFormatStatusDigi {
   void setDCCMask(ExaminerMaskType mask) { fDCC_MASK = mask; }
   void setCSCMask(ExaminerMaskType mask) { fCSC_MASK = mask; }
   void setDDUSummaryErrors(ExaminerStatusType status) { fDDU_SUMMARY_ERRORS = status; }
-  void setDDUErrors(DDUIdType DDUId, ExaminerStatusType status )  {
-    std::map<DDUIdType,ExaminerStatusType>::const_iterator item = mDDU_ERRORS.find(DDUId);
-    if( item != mDDU_ERRORS.end() ) mDDU_ERRORS[DDUId] = status; else mDDU_ERRORS.insert(std::make_pair(DDUId, status));
+  void setDDUErrors(DDUIdType DDUId, ExaminerStatusType status) {
+    std::map<DDUIdType, ExaminerStatusType>::const_iterator item = mDDU_ERRORS.find(DDUId);
+    if (item != mDDU_ERRORS.end())
+      mDDU_ERRORS[DDUId] = status;
+    else
+      mDDU_ERRORS.insert(std::make_pair(DDUId, status));
   }
-  void setCSCErrors(CSCIdType CSCId, ExaminerStatusType status )  {
-    std::map<CSCIdType,ExaminerStatusType>::const_iterator item = mCSC_ERRORS.find(CSCId);
-    if( item != mCSC_ERRORS.end() ) mCSC_ERRORS[CSCId] = status; else mCSC_ERRORS.insert(std::make_pair(CSCId, status));
+  void setCSCErrors(CSCIdType CSCId, ExaminerStatusType status) {
+    std::map<CSCIdType, ExaminerStatusType>::const_iterator item = mCSC_ERRORS.find(CSCId);
+    if (item != mCSC_ERRORS.end())
+      mCSC_ERRORS[CSCId] = status;
+    else
+      mCSC_ERRORS.insert(std::make_pair(CSCId, status));
   }
-  void setCSCPayload(CSCIdType CSCId, ExaminerStatusType status )  {
-    std::map<CSCIdType,ExaminerStatusType>::const_iterator item = mCSC_PAYLOADS.find(CSCId);
-    if( item != mCSC_PAYLOADS.end() ) mCSC_PAYLOADS[CSCId] = status; else mCSC_PAYLOADS.insert(std::make_pair(CSCId, status));
+  void setCSCPayload(CSCIdType CSCId, ExaminerStatusType status) {
+    std::map<CSCIdType, ExaminerStatusType>::const_iterator item = mCSC_PAYLOADS.find(CSCId);
+    if (item != mCSC_PAYLOADS.end())
+      mCSC_PAYLOADS[CSCId] = status;
+    else
+      mCSC_PAYLOADS.insert(std::make_pair(CSCId, status));
   }
-  void setCSCStatus(CSCIdType CSCId, ExaminerStatusType status )  {
-    std::map<CSCIdType,ExaminerStatusType>::const_iterator item = mCSC_STATUS.find(CSCId);
-    if( item != mCSC_STATUS.end() ) mCSC_STATUS[CSCId] = status; else mCSC_STATUS.insert(std::make_pair(CSCId, status));
+  void setCSCStatus(CSCIdType CSCId, ExaminerStatusType status) {
+    std::map<CSCIdType, ExaminerStatusType>::const_iterator item = mCSC_STATUS.find(CSCId);
+    if (item != mCSC_STATUS.end())
+      mCSC_STATUS[CSCId] = status;
+    else
+      mCSC_STATUS.insert(std::make_pair(CSCId, status));
   }
 
 #endif
@@ -278,17 +280,11 @@ class CSCDCCFormatStatusDigi {
    * Loop iterators for CSCs
    */
 
-  std::set<DDUIdType> getListOfDDUs() const {
-    return getKeysList(mDDU_ERRORS);
-  }
+  std::set<DDUIdType> getListOfDDUs() const { return getKeysList(mDDU_ERRORS); }
 
-  std::set<CSCIdType> getListOfCSCs() const {
-    return getKeysList(mCSC_PAYLOADS);
-  }
-    
-  std::set<CSCIdType> getListOfCSCsWithErrors() const {
-    return getKeysList(mCSC_ERRORS);
-  }
+  std::set<CSCIdType> getListOfCSCs() const { return getKeysList(mCSC_PAYLOADS); }
+
+  std::set<CSCIdType> getListOfCSCsWithErrors() const { return getKeysList(mCSC_ERRORS); }
 
   /**
    * @brief  CSC with error iteration procedure.  
@@ -302,10 +298,8 @@ class CSCDCCFormatStatusDigi {
    * @param  CSCId CSC id to return
    * @return true if CSC id found and returned, false - otherwise
    */
- 
-  bool nextCSCWithError(uint32_t& iterator, CSCIdType& CSCId) const {
-    return nextInMap(iterator, CSCId, mCSC_ERRORS);
-  }
+
+  bool nextCSCWithError(uint32_t& iterator, CSCIdType& CSCId) const { return nextInMap(iterator, CSCId, mCSC_ERRORS); }
 
   /**
    * @brief  CSC with status iteration procedure.  
@@ -314,9 +308,7 @@ class CSCDCCFormatStatusDigi {
    * @param  CSCId CSC id to return
    * @return true if CSC id found and returned, false - otherwise
    */
-  bool nextCSCWithStatus(uint32_t& iterator, CSCIdType& CSCId) const {
-    return nextInMap(iterator, CSCId, mCSC_STATUS);
-  }
+  bool nextCSCWithStatus(uint32_t& iterator, CSCIdType& CSCId) const { return nextInMap(iterator, CSCId, mCSC_STATUS); }
 
   /**
    * @brief  CSC with payload iteration procedure.  
@@ -334,7 +326,6 @@ class CSCDCCFormatStatusDigi {
    * Mostly to be used by examiner and old/current code.
    */
 
-    
   /**
    * Return DCC/DDU level Error Status
    */
@@ -342,37 +333,48 @@ class CSCDCCFormatStatusDigi {
   ExaminerStatusType getDDUSummaryErrors() const { return fDDU_SUMMARY_ERRORS; }
 
   ExaminerStatusType getDDUErrors(const DDUIdType DDUId) const {
-    std::map<DDUIdType,ExaminerStatusType>::const_iterator item = mDDU_ERRORS.find(DDUId);
-    if( item != mDDU_ERRORS.end() ) return item->second; else return 0;
+    std::map<DDUIdType, ExaminerStatusType>::const_iterator item = mDDU_ERRORS.find(DDUId);
+    if (item != mDDU_ERRORS.end())
+      return item->second;
+    else
+      return 0;
   }
 
-
   ExaminerStatusType getCSCErrors(const CSCIdType CSCId) const {
-    std::map<CSCIdType,ExaminerStatusType>::const_iterator item = mCSC_ERRORS.find(CSCId);
-    if( item != mCSC_ERRORS.end() ) return item->second; else return 0;
-  } 
-
-  ExaminerStatusType getCSCErrors(const uint16_t crateId, const uint16_t dmbId) const
-    { return getCSCErrors( makeCSCId(crateId, dmbId) ); }
+    std::map<CSCIdType, ExaminerStatusType>::const_iterator item = mCSC_ERRORS.find(CSCId);
+    if (item != mCSC_ERRORS.end())
+      return item->second;
+    else
+      return 0;
+  }
 
+  ExaminerStatusType getCSCErrors(const uint16_t crateId, const uint16_t dmbId) const {
+    return getCSCErrors(makeCSCId(crateId, dmbId));
+  }
 
   ExaminerStatusType getCSCPayload(const CSCIdType CSCId) const {
-    std::map<CSCIdType,ExaminerStatusType>::const_iterator item = mCSC_PAYLOADS.find(CSCId);
-    if( item != mCSC_PAYLOADS.end() ) return item->second; else return 0;
+    std::map<CSCIdType, ExaminerStatusType>::const_iterator item = mCSC_PAYLOADS.find(CSCId);
+    if (item != mCSC_PAYLOADS.end())
+      return item->second;
+    else
+      return 0;
   }
 
-  ExaminerStatusType getCSCPayload(const uint16_t crateId, const uint16_t dmbId) const
-    { return getCSCPayload( makeCSCId(crateId, dmbId) ); }
-
+  ExaminerStatusType getCSCPayload(const uint16_t crateId, const uint16_t dmbId) const {
+    return getCSCPayload(makeCSCId(crateId, dmbId));
+  }
 
   ExaminerStatusType getCSCStatus(const CSCIdType CSCId) const {
-    std::map<CSCIdType,ExaminerStatusType>::const_iterator item = mCSC_STATUS.find(CSCId);
-    if( item != mCSC_STATUS.end() ) return item->second; else return 0;
+    std::map<CSCIdType, ExaminerStatusType>::const_iterator item = mCSC_STATUS.find(CSCId);
+    if (item != mCSC_STATUS.end())
+      return item->second;
+    else
+      return 0;
   }
 
-  ExaminerStatusType getCSCStatus(const uint16_t crateId, const uint16_t dmbId) const
-    { return getCSCStatus( makeCSCId(crateId, dmbId) ); }
-
+  ExaminerStatusType getCSCStatus(const uint16_t crateId, const uint16_t dmbId) const {
+    return getCSCStatus(makeCSCId(crateId, dmbId));
+  }
 
   /* 
    * Return FED/DCC Id
@@ -388,40 +390,45 @@ class CSCDCCFormatStatusDigi {
    * Return CSC level Errors Mask 
    */
   ExaminerMaskType getCSCMask() const { return fCSC_MASK; }
-    
+
   /**
    * Flag Getters for individual named masks.
    */
 
-  bool getDDUSummaryFlag(const FormatErrorFlag flag) const 
-    { return ( (fDDU_SUMMARY_ERRORS & ExaminerStatusType(0x1<<flag) ) != 0); }
-  bool getDDUErrorFlag(const DDUIdType DDUId, const FormatErrorFlag flag) const
-    { return ( (getDDUErrors(DDUId) & ExaminerStatusType(0x1<<flag) ) != 0); }
+  bool getDDUSummaryFlag(const FormatErrorFlag flag) const {
+    return ((fDDU_SUMMARY_ERRORS & ExaminerStatusType(0x1 << flag)) != 0);
+  }
+  bool getDDUErrorFlag(const DDUIdType DDUId, const FormatErrorFlag flag) const {
+    return ((getDDUErrors(DDUId) & ExaminerStatusType(0x1 << flag)) != 0);
+  }
 
-  bool getCSCErrorFlag(const CSCIdType CSCId, const FormatErrorFlag flag) const
-    { return ( (getCSCErrors(CSCId) & ExaminerStatusType(0x1<<flag) ) != 0); }
+  bool getCSCErrorFlag(const CSCIdType CSCId, const FormatErrorFlag flag) const {
+    return ((getCSCErrors(CSCId) & ExaminerStatusType(0x1 << flag)) != 0);
+  }
 
-  bool getCSCErrorFlag(const uint16_t crateId, const uint16_t dmbId, const FormatErrorFlag flag) const
-    { return ( (getCSCErrors(crateId, dmbId) & ExaminerStatusType(0x1<<flag) ) != 0); }
+  bool getCSCErrorFlag(const uint16_t crateId, const uint16_t dmbId, const FormatErrorFlag flag) const {
+    return ((getCSCErrors(crateId, dmbId) & ExaminerStatusType(0x1 << flag)) != 0);
+  }
 
-  bool getCSCPayloadFlag(const CSCIdType CSCId, const CSCPayloadFlag flag) const
-    { return ( (getCSCPayload(CSCId) & ExaminerStatusType(0x1<<flag) ) != 0); }
+  bool getCSCPayloadFlag(const CSCIdType CSCId, const CSCPayloadFlag flag) const {
+    return ((getCSCPayload(CSCId) & ExaminerStatusType(0x1 << flag)) != 0);
+  }
 
-  bool getCSCPayloadFlag(const uint16_t crateId, const uint16_t dmbId, const CSCPayloadFlag flag) const
-    { return ( (getCSCPayload(crateId,dmbId) & ExaminerStatusType(0x1<<flag) ) != 0); }
+  bool getCSCPayloadFlag(const uint16_t crateId, const uint16_t dmbId, const CSCPayloadFlag flag) const {
+    return ((getCSCPayload(crateId, dmbId) & ExaminerStatusType(0x1 << flag)) != 0);
+  }
 
-  bool getCSCStatusFlag(const CSCIdType CSCId, const CSCStatusFlag flag) const
-    { return ( (getCSCStatus(CSCId) & ExaminerStatusType(0x1<<flag) ) != 0); }
+  bool getCSCStatusFlag(const CSCIdType CSCId, const CSCStatusFlag flag) const {
+    return ((getCSCStatus(CSCId) & ExaminerStatusType(0x1 << flag)) != 0);
+  }
 
-  bool getCSCStatusFlag(const uint16_t crateId, const uint16_t dmbId, const CSCStatusFlag flag) const
-    { return ( (getCSCStatus(crateId, dmbId) & ExaminerStatusType(0x1<<flag) ) != 0); }
+  bool getCSCStatusFlag(const uint16_t crateId, const uint16_t dmbId, const CSCStatusFlag flag) const {
+    return ((getCSCStatus(crateId, dmbId) & ExaminerStatusType(0x1 << flag)) != 0);
+  }
 
   void print() const;
- 
-
 };
 
-
-std::ostream & operator<<(std::ostream & o, const CSCDCCFormatStatusDigi& digi);
+std::ostream& operator<<(std::ostream& o, const CSCDCCFormatStatusDigi& digi);
 
 #endif
diff --git a/DataFormats/CSCDigi/interface/CSCDCCStatusDigi.h b/DataFormats/CSCDigi/interface/CSCDCCStatusDigi.h
index c01490b43354d..4b7b68e150b37 100644
--- a/DataFormats/CSCDigi/interface/CSCDCCStatusDigi.h
+++ b/DataFormats/CSCDigi/interface/CSCDCCStatusDigi.h
@@ -12,35 +12,31 @@
 #include <iosfwd>
 #include <cstdint>
 
-class CSCDCCStatusDigi{
-
+class CSCDCCStatusDigi {
 public:
+  /// Constructor for all variables
+  CSCDCCStatusDigi(const uint16_t* header, const uint16_t* trailer, const uint32_t& error, short unsigned tts);
+  CSCDCCStatusDigi(const uint32_t& error, short unsigned tts) { errorFlag_ = error; }  //tts_ = tts;}
 
-  /// Constructor for all variables 
-  CSCDCCStatusDigi (const uint16_t * header, const uint16_t * trailer, 
-		    const uint32_t & error, short unsigned tts);
-  CSCDCCStatusDigi (const uint32_t & error, short unsigned tts) {errorFlag_=error;} //tts_ = tts;}
-  
   /// Default constructor.
-  CSCDCCStatusDigi () {}
+  CSCDCCStatusDigi() {}
 
   ///data accessors
-  const uint16_t * header() const {return header_;} 
-  const uint16_t * trailer() const {return trailer_;}
-  const uint32_t errorFlag() const {return errorFlag_;}
+  const uint16_t* header() const { return header_; }
+  const uint16_t* trailer() const { return trailer_; }
+  const uint32_t errorFlag() const { return errorFlag_; }
   const uint16_t getDCCTTS() const;
 
   /// Print the content of CSCDCCStatusDigi
- void print() const;
+  void print() const;
 
 private:
-
   uint16_t header_[8];
   uint16_t trailer_[8];
   uint32_t errorFlag_;
-  short unsigned tts_; /// Variable to access TTS
+  short unsigned tts_;  /// Variable to access TTS
 };
 
-std::ostream & operator<<(std::ostream & o, const CSCDCCStatusDigi& digi);
+std::ostream& operator<<(std::ostream& o, const CSCDCCStatusDigi& digi);
 
 #endif
diff --git a/DataFormats/CSCDigi/interface/CSCDDUStatusDigi.h b/DataFormats/CSCDigi/interface/CSCDDUStatusDigi.h
index a97beb2bc4f64..881317aaf5807 100644
--- a/DataFormats/CSCDigi/interface/CSCDDUStatusDigi.h
+++ b/DataFormats/CSCDigi/interface/CSCDDUStatusDigi.h
@@ -12,31 +12,28 @@
 #include <iosfwd>
 #include <cstdint>
 
-class CSCDDUStatusDigi{
-
+class CSCDDUStatusDigi {
 public:
-
-  /// Constructor for all variables 
-  CSCDDUStatusDigi (const uint16_t * header, const uint16_t * trailer, uint16_t tts);
+  /// Constructor for all variables
+  CSCDDUStatusDigi(const uint16_t* header, const uint16_t* trailer, uint16_t tts);
 
   /// Default constructor.
-  CSCDDUStatusDigi () {}
+  CSCDDUStatusDigi() {}
 
   /// Data Accessors
-  const uint16_t * header() const { return header_;}
-  const uint16_t * trailer() const {return trailer_;}
-  const uint16_t getDDUTTS() const; 
-  
- /// Print the content of CSCDDUStatusDigi
- void print() const;
+  const uint16_t* header() const { return header_; }
+  const uint16_t* trailer() const { return trailer_; }
+  const uint16_t getDDUTTS() const;
 
-private:
+  /// Print the content of CSCDDUStatusDigi
+  void print() const;
 
+private:
   uint16_t header_[12];
   uint16_t trailer_[12];
   uint16_t tts_;
 };
 
-std::ostream & operator<<(std::ostream & o, const CSCDDUStatusDigi& digi);
+std::ostream& operator<<(std::ostream& o, const CSCDDUStatusDigi& digi);
 
 #endif
diff --git a/DataFormats/CSCDigi/interface/CSCDMBStatusDigi.h b/DataFormats/CSCDigi/interface/CSCDMBStatusDigi.h
index ad01d1c571452..1b74aed355a33 100644
--- a/DataFormats/CSCDigi/interface/CSCDMBStatusDigi.h
+++ b/DataFormats/CSCDigi/interface/CSCDMBStatusDigi.h
@@ -12,27 +12,23 @@
 #include <iosfwd>
 #include <cstdint>
 
-class CSCDMBStatusDigi{
-
+class CSCDMBStatusDigi {
 public:
-
-  /// Constructor for all variables 
-  CSCDMBStatusDigi (const uint16_t * header, const uint16_t * trailer );
+  /// Constructor for all variables
+  CSCDMBStatusDigi(const uint16_t* header, const uint16_t* trailer);
 
   /// Default constructor.
-  CSCDMBStatusDigi () {}
+  CSCDMBStatusDigi() {}
 
   /// Data Accessors
-  const uint16_t * header() const {return header_;}
-  const uint16_t * trailer() const {return trailer_;}
+  const uint16_t* header() const { return header_; }
+  const uint16_t* trailer() const { return trailer_; }
 
 private:
-
   uint16_t header_[8];
   uint16_t trailer_[8];
 };
 
-
-std::ostream & operator<<(std::ostream & o, const CSCDMBStatusDigi& digi);
+std::ostream& operator<<(std::ostream& o, const CSCDMBStatusDigi& digi);
 
 #endif
diff --git a/DataFormats/CSCDigi/interface/CSCRPCDigi.h b/DataFormats/CSCDigi/interface/CSCRPCDigi.h
index 69b8f6e0dd0df..4405dfee97945 100644
--- a/DataFormats/CSCDigi/interface/CSCRPCDigi.h
+++ b/DataFormats/CSCDigi/interface/CSCRPCDigi.h
@@ -12,35 +12,31 @@
 #include <cstdint>
 #include <iosfwd>
 
-class CSCRPCDigi{
-
+class CSCRPCDigi {
 public:
-
   /// Constructors
-  CSCRPCDigi (int rpc, int pad, int bxn , int tbin);  /// from the rpc#, pad#, bxn#, tbin#
-  CSCRPCDigi ();                             /// default
+  CSCRPCDigi(int rpc, int pad, int bxn, int tbin);  /// from the rpc#, pad#, bxn#, tbin#
+  CSCRPCDigi();                                     /// default
 
   /// get RPC
-  int getRpc() const {return rpc_;}
+  int getRpc() const { return rpc_; }
   /// return pad number
-  int getPad() const {return pad_;}
+  int getPad() const { return pad_; }
   /// return tbin number
-  int getTbin() const {return tbin_;}
+  int getTbin() const { return tbin_; }
   /// return BXN
-  int getBXN() const {return bxn_;}
-  
+  int getBXN() const { return bxn_; }
+
   /// Print content of digi
   void print() const;
 
 private:
-
   uint16_t rpc_;
   uint16_t pad_;
   uint16_t bxn_;
   uint16_t tbin_;
-
 };
 
-std::ostream & operator<<(std::ostream & o, const CSCRPCDigi& digi);
+std::ostream& operator<<(std::ostream& o, const CSCRPCDigi& digi);
 
 #endif
diff --git a/DataFormats/CSCDigi/interface/CSCStripDigi.h b/DataFormats/CSCDigi/interface/CSCStripDigi.h
index 0de3f8e8ffc84..ac1b617441cce 100644
--- a/DataFormats/CSCDigi/interface/CSCStripDigi.h
+++ b/DataFormats/CSCDigi/interface/CSCStripDigi.h
@@ -14,78 +14,64 @@
 #include <iosfwd>
 #include <cstdint>
 
-class CSCStripDigi{
-
+class CSCStripDigi {
 public:
-
-   // Construct from the strip number and all the other data members.
-  CSCStripDigi (const int & istrip, const std::vector<int> & vADCCounts, const std::vector<uint16_t> & vADCOverflow, const std::vector<uint16_t> & vOverlap, 
-                const std::vector<uint16_t> & vErrorstat ) :
-    strip(istrip),
-    ADCCounts(vADCCounts),
-    ADCOverflow(vADCOverflow),
-    OverlappedSample(vOverlap),
-    Errorstat(vErrorstat) {}
+  // Construct from the strip number and all the other data members.
+  CSCStripDigi(const int& istrip,
+               const std::vector<int>& vADCCounts,
+               const std::vector<uint16_t>& vADCOverflow,
+               const std::vector<uint16_t>& vOverlap,
+               const std::vector<uint16_t>& vErrorstat)
+      : strip(istrip),
+        ADCCounts(vADCCounts),
+        ADCOverflow(vADCOverflow),
+        OverlappedSample(vOverlap),
+        Errorstat(vErrorstat) {}
 
   // Construct from the strip number and the ADC readings.
-  CSCStripDigi (const int & istrip, const std::vector<int> & vADCCounts):
-    strip(istrip),
-    ADCCounts(vADCCounts),
-    ADCOverflow(8,0),
-    OverlappedSample(8,0),
-    Errorstat(8,0){}
-
-
-  CSCStripDigi ():
-    strip(0),
-    ADCCounts(8,0),
-    ADCOverflow(8,0),
-    OverlappedSample(8,0),
-    Errorstat(8,0){}
+  CSCStripDigi(const int& istrip, const std::vector<int>& vADCCounts)
+      : strip(istrip), ADCCounts(vADCCounts), ADCOverflow(8, 0), OverlappedSample(8, 0), Errorstat(8, 0) {}
 
+  CSCStripDigi() : strip(0), ADCCounts(8, 0), ADCOverflow(8, 0), OverlappedSample(8, 0), Errorstat(8, 0) {}
 
   // Digis are equal if they are on the same strip and have same ADC readings
   bool operator==(const CSCStripDigi& digi) const;
 
   // Get the strip number. counts from 1.
-  int getStrip() const { return strip;}
+  int getStrip() const { return strip; }
 
   /// Get ADC readings
-  std::vector<int> const & getADCCounts() const { return ADCCounts; }
-
+  std::vector<int> const& getADCCounts() const { return ADCCounts; }
 
   /// Get L1APhase from OverlappedSample (9th bit)
   std::vector<int> getL1APhase() const {
-     std::vector<int> L1APhaseResult(getOverlappedSample().size());
-     for (int i=0; i<(int)getOverlappedSample().size(); i++) 
-          L1APhaseResult[i] = (getOverlappedSample()[i]>>8) & 0x1;
-     return  L1APhaseResult;
+    std::vector<int> L1APhaseResult(getOverlappedSample().size());
+    for (int i = 0; i < (int)getOverlappedSample().size(); i++)
+      L1APhaseResult[i] = (getOverlappedSample()[i] >> 8) & 0x1;
+    return L1APhaseResult;
   }
-  
-  int getL1APhase(int i) const {
-     return (getOverlappedSample()[i]>>8) & 0x1;
-  }
-  
+
+  int getL1APhase(int i) const { return (getOverlappedSample()[i] >> 8) & 0x1; }
+
   /// Other getters
-  std::vector<uint16_t> const & getADCOverflow() const {return ADCOverflow;}
-  std::vector<uint16_t> const & getOverlappedSample() const {return OverlappedSample;}
-  std::vector<uint16_t> const & getErrorstat() const {return Errorstat;}
+  std::vector<uint16_t> const& getADCOverflow() const { return ADCOverflow; }
+  std::vector<uint16_t> const& getOverlappedSample() const { return OverlappedSample; }
+  std::vector<uint16_t> const& getErrorstat() const { return Errorstat; }
 
   // Set the strip number
   void setStrip(int istrip) { strip = istrip; }
 
   // Set with a vector of ADC readings
-  void setADCCounts (const std::vector<int>& ADCCounts);
+  void setADCCounts(const std::vector<int>& ADCCounts);
 
   // Print content of digi
   void print() const;
 
   ///methods for calibrations
-  float pedestal() const {return 0.5f*(ADCCounts[0]+ADCCounts[1]);}
-  float amplitude() const {return ADCCounts[4]-pedestal();}
+  float pedestal() const { return 0.5f * (ADCCounts[0] + ADCCounts[1]); }
+  float amplitude() const { return ADCCounts[4] - pedestal(); }
 
 private:
-
   uint16_t strip;
   std::vector<int> ADCCounts;
   std::vector<uint16_t> ADCOverflow;
@@ -93,7 +79,6 @@ class CSCStripDigi{
   std::vector<uint16_t> Errorstat;
 };
 
-std::ostream & operator<<(std::ostream & o, const CSCStripDigi& digi);
+std::ostream& operator<<(std::ostream& o, const CSCStripDigi& digi);
 
 #endif
-
diff --git a/DataFormats/CSCDigi/interface/CSCStripDigiCollection.h b/DataFormats/CSCDigi/interface/CSCStripDigiCollection.h
index 95ba91ad108b2..6a7e722fd213a 100644
--- a/DataFormats/CSCDigi/interface/CSCStripDigiCollection.h
+++ b/DataFormats/CSCDigi/interface/CSCStripDigiCollection.h
@@ -14,4 +14,3 @@
 typedef MuonDigiCollection<CSCDetId, CSCStripDigi> CSCStripDigiCollection;
 
 #endif
-
diff --git a/DataFormats/CSCDigi/interface/CSCTMBStatusDigi.h b/DataFormats/CSCDigi/interface/CSCTMBStatusDigi.h
index 3f597ae47cf94..132b8bc1559f3 100644
--- a/DataFormats/CSCDigi/interface/CSCTMBStatusDigi.h
+++ b/DataFormats/CSCDigi/interface/CSCTMBStatusDigi.h
@@ -12,27 +12,23 @@
 #include <iosfwd>
 #include <cstdint>
 
-class CSCTMBStatusDigi{
-
+class CSCTMBStatusDigi {
 public:
-
-  /// Constructor for all variables 
-  CSCTMBStatusDigi (const uint16_t * header, const uint16_t * trailer );
+  /// Constructor for all variables
+  CSCTMBStatusDigi(const uint16_t* header, const uint16_t* trailer);
 
   /// Default constructor.
-  CSCTMBStatusDigi () {}
+  CSCTMBStatusDigi() {}
 
   /// Data Accessors
-  const uint16_t * header() const {return header_;}
-  const uint16_t * trailer() const {return trailer_;}
+  const uint16_t* header() const { return header_; }
+  const uint16_t* trailer() const { return trailer_; }
 
 private:
-
   uint16_t header_[43];
   uint16_t trailer_[8];
 };
 
-
-std::ostream & operator<<(std::ostream & o, const CSCTMBStatusDigi& digi);
+std::ostream& operator<<(std::ostream& o, const CSCTMBStatusDigi& digi);
 
 #endif
diff --git a/DataFormats/CSCDigi/interface/CSCWireDigi.h b/DataFormats/CSCDigi/interface/CSCWireDigi.h
index 9218b2d85e464..b2ed06ccde077 100644
--- a/DataFormats/CSCDigi/interface/CSCWireDigi.h
+++ b/DataFormats/CSCDigi/interface/CSCWireDigi.h
@@ -11,28 +11,26 @@
 #include <iosfwd>
 #include <cstdint>
 
-class CSCWireDigi{
-
+class CSCWireDigi {
 public:
-
   /// Constructors
-  
-  CSCWireDigi (int wire, unsigned int tbinb);  /// wiregroup#, tbin bit word
-  CSCWireDigi ();                     /// default
+
+  CSCWireDigi(int wire, unsigned int tbinb);  /// wiregroup#, tbin bit word
+  CSCWireDigi();                              /// default
 
   /// return wiregroup number. counts from 1.
-  int getWireGroup() const {return wire_;}
+  int getWireGroup() const { return wire_; }
   /// return BX assigned for the wire group (16 upper bits from the wire group number)
-  int getWireGroupBX() const {return wireBX_;}
-  /// return BX-wiregroup number combined 
+  int getWireGroupBX() const { return wireBX_; }
+  /// return BX-wiregroup number combined
   /// (16 upper bits - BX + 16 lower bits - wire group number)
-  int getBXandWireGroup() const {return wireBXandWires_;}
+  int getBXandWireGroup() const { return wireBXandWires_; }
   /// return the word with time bins bits
-  unsigned int getTimeBinWord() const {return tbinb_;}
+  unsigned int getTimeBinWord() const { return tbinb_; }
   /// return tbin number, (obsolete, use getTimeBin() instead)
   int getBeamCrossingTag() const;
   /// return first tbin ON number
-  int getTimeBin()         const;
+  int getTimeBin() const;
   /// return vector of time bins ON
   std::vector<int> getTimeBinsOn() const;
 
@@ -40,19 +38,16 @@ class CSCWireDigi{
   void print() const;
 
   /// set wiregroup number
-  void setWireGroup(unsigned int wiregroup) {wire_= wiregroup;}
-
+  void setWireGroup(unsigned int wiregroup) { wire_ = wiregroup; }
 
 private:
-
   int wire_;
   uint32_t tbinb_;
   /// BX in the wire digis (16 upper bits from the wire group number)
   int wireBXandWires_;
   int wireBX_;
-
 };
 
-std::ostream & operator<<(std::ostream & o, const CSCWireDigi& digi);
+std::ostream& operator<<(std::ostream& o, const CSCWireDigi& digi);
 
 #endif
diff --git a/DataFormats/CSCDigi/src/CSCALCTDigi.cc b/DataFormats/CSCDigi/src/CSCALCTDigi.cc
index 8783afaffb0a8..8453042e7d909 100644
--- a/DataFormats/CSCDigi/src/CSCALCTDigi.cc
+++ b/DataFormats/CSCDigi/src/CSCALCTDigi.cc
@@ -14,96 +14,96 @@
 using namespace std;
 
 /// Constructors
-CSCALCTDigi::CSCALCTDigi(const int valid, const int quality, const int accel,
-			 const int patternb, const int keywire, const int bx,
-			 const int trknmb) {
-  valid_    = valid;
-  quality_  = quality;
-  accel_    = accel;
+CSCALCTDigi::CSCALCTDigi(const int valid,
+                         const int quality,
+                         const int accel,
+                         const int patternb,
+                         const int keywire,
+                         const int bx,
+                         const int trknmb) {
+  valid_ = valid;
+  quality_ = quality;
+  accel_ = accel;
   patternb_ = patternb;
-  keywire_  = keywire;
-  bx_       = bx;
-  trknmb_   = trknmb;
+  keywire_ = keywire;
+  bx_ = bx;
+  trknmb_ = trknmb;
 }
 
 /// Default
 CSCALCTDigi::CSCALCTDigi() {
-  clear(); // set contents to zero
+  clear();  // set contents to zero
 }
 
 /// Clears this ALCT.
 void CSCALCTDigi::clear() {
-  valid_    = 0;
-  quality_  = 0;
-  accel_    = 0;
+  valid_ = 0;
+  quality_ = 0;
+  accel_ = 0;
   patternb_ = 0;
-  keywire_  = 0;
-  bx_       = 0;
-  trknmb_   = 0;
-  fullbx_   = 0;
+  keywire_ = 0;
+  bx_ = 0;
+  trknmb_ = 0;
+  fullbx_ = 0;
 }
 
-bool CSCALCTDigi::operator > (const CSCALCTDigi& rhs) const {
+bool CSCALCTDigi::operator>(const CSCALCTDigi& rhs) const {
   bool returnValue = false;
 
   // Early ALCTs are always preferred to the ones found at later bx's.
-  if (getBX()  < rhs.getBX()) {returnValue = true;}
-  if (getBX() != rhs.getBX()) {return returnValue;}
+  if (getBX() < rhs.getBX()) {
+    returnValue = true;
+  }
+  if (getBX() != rhs.getBX()) {
+    return returnValue;
+  }
 
   // The > operator then checks the quality of ALCTs.
   // If two qualities are equal, the ALCT furthest from the beam axis
   // (lowest eta, highest wire group number) is selected.
   int quality1 = getQuality();
   int quality2 = rhs.getQuality();
-  if (quality1 > quality2) {returnValue = true;}
-  else if (quality1 == quality2 && getKeyWG() > rhs.getKeyWG())
-    {returnValue = true;}
+  if (quality1 > quality2) {
+    returnValue = true;
+  } else if (quality1 == quality2 && getKeyWG() > rhs.getKeyWG()) {
+    returnValue = true;
+  }
   return returnValue;
 }
 
-bool CSCALCTDigi::operator == (const CSCALCTDigi& rhs) const {
+bool CSCALCTDigi::operator==(const CSCALCTDigi& rhs) const {
   // Exact equality.
   bool returnValue = false;
-  if (isValid()        == rhs.isValid() && getQuality() == rhs.getQuality() &&
-      getAccelerator() == rhs.getAccelerator() &&
-      getCollisionB()  == rhs.getCollisionB()  &&
-      getKeyWG()       == rhs.getKeyWG()       && getBX() == rhs.getBX()) {
+  if (isValid() == rhs.isValid() && getQuality() == rhs.getQuality() && getAccelerator() == rhs.getAccelerator() &&
+      getCollisionB() == rhs.getCollisionB() && getKeyWG() == rhs.getKeyWG() && getBX() == rhs.getBX()) {
     returnValue = true;
   }
   return returnValue;
 }
 
-bool CSCALCTDigi::operator != (const CSCALCTDigi& rhs) const {
+bool CSCALCTDigi::operator!=(const CSCALCTDigi& rhs) const {
   // True if == is false.
   bool returnValue = true;
-  if ((*this) == rhs) returnValue = false;
+  if ((*this) == rhs)
+    returnValue = false;
   return returnValue;
 }
 
 /// Debug
 void CSCALCTDigi::print() const {
   if (isValid()) {
-    edm::LogVerbatim("CSCDigi") 
-              << "CSC ALCT #"         << setw(1) << getTrknmb()
-	      << ": Valid = "         << setw(1) << isValid()
-	      << " Quality = "        << setw(2) << getQuality()
-	      << " Accel. = "         << setw(1) << getAccelerator()
-	      << " PatternB = "       << setw(1) << getCollisionB()
-	      << " Key wire group = " << setw(3) << getKeyWG()
-	      << " BX = "             << setw(2) << getBX()
-	      << " Full BX= "         << std::setw(1) << getFullBX();
-  }
-  else {
+    edm::LogVerbatim("CSCDigi") << "CSC ALCT #" << setw(1) << getTrknmb() << ": Valid = " << setw(1) << isValid()
+                                << " Quality = " << setw(2) << getQuality() << " Accel. = " << setw(1)
+                                << getAccelerator() << " PatternB = " << setw(1) << getCollisionB()
+                                << " Key wire group = " << setw(3) << getKeyWG() << " BX = " << setw(2) << getBX()
+                                << " Full BX= " << std::setw(1) << getFullBX();
+  } else {
     edm::LogVerbatim("CSCDigi") << "Not a valid Anode LCT.";
   }
 }
 
-std::ostream & operator<<(std::ostream & o, const CSCALCTDigi& digi) {
-  return o << "CSC ALCT #"         << digi.getTrknmb()
-           << ": Valid = "         << digi.isValid()
-           << " Quality = "        << digi.getQuality()
-           << " Accel. = "         << digi.getAccelerator()
-           << " PatternB = "       << digi.getCollisionB()
-           << " Key wire group = " << digi.getKeyWG()
-           << " BX = "             << digi.getBX();
+std::ostream& operator<<(std::ostream& o, const CSCALCTDigi& digi) {
+  return o << "CSC ALCT #" << digi.getTrknmb() << ": Valid = " << digi.isValid() << " Quality = " << digi.getQuality()
+           << " Accel. = " << digi.getAccelerator() << " PatternB = " << digi.getCollisionB()
+           << " Key wire group = " << digi.getKeyWG() << " BX = " << digi.getBX();
 }
diff --git a/DataFormats/CSCDigi/src/CSCALCTStatusDigi.cc b/DataFormats/CSCDigi/src/CSCALCTStatusDigi.cc
index 02a31346d95c2..b6c92a52ac943 100644
--- a/DataFormats/CSCDigi/src/CSCALCTStatusDigi.cc
+++ b/DataFormats/CSCDigi/src/CSCALCTStatusDigi.cc
@@ -10,18 +10,16 @@
 #include <cstring>
 #include <cstdint>
 
-CSCALCTStatusDigi::CSCALCTStatusDigi(const uint16_t * header, const uint16_t * trailer)
-{
-  uint16_t headerSizeInBytes =16;
-  uint16_t trailerSizeInBytes =8;
+CSCALCTStatusDigi::CSCALCTStatusDigi(const uint16_t* header, const uint16_t* trailer) {
+  uint16_t headerSizeInBytes = 16;
+  uint16_t trailerSizeInBytes = 8;
   memcpy(header_, header, headerSizeInBytes);
   memcpy(trailer_, trailer, trailerSizeInBytes);
 }
 
-std::ostream & operator<<(std::ostream & o, const CSCALCTStatusDigi& digi) {
-  o << " ";  
-  o <<"\n";
+std::ostream& operator<<(std::ostream& o, const CSCALCTStatusDigi& digi) {
+  o << " ";
+  o << "\n";
 
   return o;
 }
-
diff --git a/DataFormats/CSCDigi/src/CSCCFEBStatusDigi.cc b/DataFormats/CSCDigi/src/CSCCFEBStatusDigi.cc
index 24666369ecf0c..074f0bf341d1e 100644
--- a/DataFormats/CSCDigi/src/CSCCFEBStatusDigi.cc
+++ b/DataFormats/CSCDigi/src/CSCCFEBStatusDigi.cc
@@ -8,13 +8,13 @@
 #include <iostream>
 #include <cstdint>
 
-            /// Shift and select
-int CSCCFEBStatusDigi::ShiftSel(int nmb,int nshift,int nsel) const {
-    int tmp=nmb;
-    tmp=tmp>>nshift;
-    return tmp= tmp & nsel;
+/// Shift and select
+int CSCCFEBStatusDigi::ShiftSel(int nmb, int nshift, int nsel) const {
+  int tmp = nmb;
+  tmp = tmp >> nshift;
+  return tmp = tmp & nsel;
 }
-            /// Get SCA Full Condition
+/// Get SCA Full Condition
 std::vector<uint16_t> CSCCFEBStatusDigi::getSCAFullCond() const {
   /*    std::vector<int> vec(4,0);
     vec[0]=ShiftSel(SCAFullCond_,0,15);  // 4-bit FIFO1 word count
@@ -27,149 +27,172 @@ std::vector<uint16_t> CSCCFEBStatusDigi::getSCAFullCond() const {
     return vec;*/
   return bWords_;
 }
-            /// Get TS_FLAG bit from SCA Controller data  per each time slice
+/// Get TS_FLAG bit from SCA Controller data  per each time slice
 std::vector<int> CSCCFEBStatusDigi::getTS_FLAG() const {
-    std::vector<int> vec(contrWords_.size(),0);
-    int nmb;
-    for(unsigned int i=0;i<vec.size();i++) {
-      nmb=contrWords_[i];
-      vec[i]=ShiftSel(nmb,15,1);
-    }
-    return vec;
+  std::vector<int> vec(contrWords_.size(), 0);
+  int nmb;
+  for (unsigned int i = 0; i < vec.size(); i++) {
+    nmb = contrWords_[i];
+    vec[i] = ShiftSel(nmb, 15, 1);
+  }
+  return vec;
 }
 
-            /// Get SCA_FULL bit from SCA Controller data  per each time slice
+/// Get SCA_FULL bit from SCA Controller data  per each time slice
 std::vector<int> CSCCFEBStatusDigi::getSCA_FULL() const {
-    std::vector<int> vec(contrWords_.size(),0);
-    int nmb;
-    for(unsigned int i=0;i<vec.size();i++) {
-      nmb=contrWords_[i];
-      vec[i]=ShiftSel(nmb,14,1);
-    }
-    return vec;
+  std::vector<int> vec(contrWords_.size(), 0);
+  int nmb;
+  for (unsigned int i = 0; i < vec.size(); i++) {
+    nmb = contrWords_[i];
+    vec[i] = ShiftSel(nmb, 14, 1);
+  }
+  return vec;
 }
 
-            /// Get LCT_PHASE bit from SCA Controller data  per each time slice
+/// Get LCT_PHASE bit from SCA Controller data  per each time slice
 std::vector<int> CSCCFEBStatusDigi::getLCT_PHASE() const {
-    std::vector<int> vec(contrWords_.size(),0);
-    int nmb;
-    for(unsigned int i=0;i<vec.size();i++) {
-      nmb=contrWords_[i];
-      vec[i]=ShiftSel(nmb,13,1);
-    }
-    return vec;
+  std::vector<int> vec(contrWords_.size(), 0);
+  int nmb;
+  for (unsigned int i = 0; i < vec.size(); i++) {
+    nmb = contrWords_[i];
+    vec[i] = ShiftSel(nmb, 13, 1);
+  }
+  return vec;
 }
 
-            /// Get L1A_PHASE bit from SCA Controller data  per each time slice
+/// Get L1A_PHASE bit from SCA Controller data  per each time slice
 std::vector<int> CSCCFEBStatusDigi::getL1A_PHASE() const {
-    std::vector<int> vec(contrWords_.size(),0);
-    int nmb;
-    for(unsigned int i=0;i<vec.size();i++) {
-      nmb=contrWords_[i];
-      vec[i]=ShiftSel(nmb,12,1);
-    }
-    return vec;
+  std::vector<int> vec(contrWords_.size(), 0);
+  int nmb;
+  for (unsigned int i = 0; i < vec.size(); i++) {
+    nmb = contrWords_[i];
+    vec[i] = ShiftSel(nmb, 12, 1);
+  }
+  return vec;
 }
- 
-            /// Get SCA_BLK 4 bit word from SCA Controller data  per each time slice
+
+/// Get SCA_BLK 4 bit word from SCA Controller data  per each time slice
 std::vector<int> CSCCFEBStatusDigi::getSCA_BLK() const {
-    std::vector<int> vec(contrWords_.size(),0);
-    int nmb;
-    for(unsigned int i=0;i<vec.size();i++) {
-      nmb=contrWords_[i];
-      vec[i]=ShiftSel(nmb,8,15);
-    }
-    return vec;
+  std::vector<int> vec(contrWords_.size(), 0);
+  int nmb;
+  for (unsigned int i = 0; i < vec.size(); i++) {
+    nmb = contrWords_[i];
+    vec[i] = ShiftSel(nmb, 8, 15);
+  }
+  return vec;
 }
 
-            /// Get TRIG_TIME 8 bit word from SCA Controller data  per each time  slice
+/// Get TRIG_TIME 8 bit word from SCA Controller data  per each time  slice
 std::vector<int> CSCCFEBStatusDigi::getTRIG_TIME() const {
-    std::vector<int> vec(contrWords_.size(),0);
-    int nmb;
-    for(unsigned int i=0;i<vec.size();i++) {
-      nmb=contrWords_[i];
-      vec[i]=ShiftSel(nmb,0,255);
-    }
-    return vec;
+  std::vector<int> vec(contrWords_.size(), 0);
+  int nmb;
+  for (unsigned int i = 0; i < vec.size(); i++) {
+    nmb = contrWords_[i];
+    vec[i] = ShiftSel(nmb, 0, 255);
+  }
+  return vec;
 }
 
-            /// Debug
+/// Debug
 void CSCCFEBStatusDigi::print() const {
   edm::LogVerbatim("CSCDigi") << "CSC CFEB # : " << getCFEBNmb();
-  
+
   std::ostringstream ost;
   ost << " SCAFullCond: ";
-  if(!getSCAFullCond().empty()){
-    for (size_t i = 0; i<4; ++i ){ ost << " " <<(getSCAFullCond())[i]; }
+  if (!getSCAFullCond().empty()) {
+    for (size_t i = 0; i < 4; ++i) {
+      ost << " " << (getSCAFullCond())[i];
+    }
+  } else {
+    ost << " "
+        << "BWORD is not valid";
   }
-  else {
-    ost << " " <<"BWORD is not valid";
-  }	
   edm::LogVerbatim("CSCDigi") << ost.str();
 
   ost.clear();
   ost << " CRC: ";
-  for (size_t i = 0; i<getCRC().size(); ++i ){ ost << " " <<(getCRC())[i]; }
+  for (size_t i = 0; i < getCRC().size(); ++i) {
+    ost << " " << (getCRC())[i];
+  }
   edm::LogVerbatim("CSCDigi") << ost.str();
 
   ost.clear();
   ost << " TS_FLAG: ";
-  for (size_t i = 0; i<getTS_FLAG().size(); ++i ){ ost << " " <<(getTS_FLAG())[i]; }
+  for (size_t i = 0; i < getTS_FLAG().size(); ++i) {
+    ost << " " << (getTS_FLAG())[i];
+  }
   edm::LogVerbatim("CSCDigi") << ost.str();
 
   ost.clear();
   ost << " SCA_FULL: ";
-  for (size_t i = 0; i<getSCA_FULL().size(); ++i ){ ost << " " <<(getSCA_FULL())[i]; }
+  for (size_t i = 0; i < getSCA_FULL().size(); ++i) {
+    ost << " " << (getSCA_FULL())[i];
+  }
   edm::LogVerbatim("CSCDigi") << ost.str();
 
   ost.clear();
   ost << " LCT_PHASE: ";
-  for (size_t i = 0; i<getLCT_PHASE().size(); ++i ){ ost << " " <<(getLCT_PHASE())[i]; }
+  for (size_t i = 0; i < getLCT_PHASE().size(); ++i) {
+    ost << " " << (getLCT_PHASE())[i];
+  }
   edm::LogVerbatim("CSCDigi") << ost.str();
 
   ost.clear();
   ost << " L1A_PHASE: ";
-  for (size_t i = 0; i<getL1A_PHASE().size(); ++i ){ ost << " " <<(getL1A_PHASE())[i]; }
+  for (size_t i = 0; i < getL1A_PHASE().size(); ++i) {
+    ost << " " << (getL1A_PHASE())[i];
+  }
   edm::LogVerbatim("CSCDigi") << ost.str();
 
   ost.clear();
   ost << " SCA_BLK: ";
-  for (size_t i = 0; i<getSCA_BLK().size(); ++i ){ ost << " " <<(getSCA_BLK())[i]; }
+  for (size_t i = 0; i < getSCA_BLK().size(); ++i) {
+    ost << " " << (getSCA_BLK())[i];
+  }
   edm::LogVerbatim("CSCDigi") << ost.str();
 
   ost.clear();
   ost << " TRIG_TIME: ";
-  for (size_t i = 0; i<getTRIG_TIME().size(); ++i ){ ost << " " <<(getTRIG_TIME())[i]; }
+  for (size_t i = 0; i < getTRIG_TIME().size(); ++i) {
+    ost << " " << (getTRIG_TIME())[i];
+  }
   edm::LogVerbatim("CSCDigi") << ost.str();
 }
 
-std::ostream & operator<<(std::ostream & o, const CSCCFEBStatusDigi& digi) {
-  o << " " << digi.getCFEBNmb()<<"\n";
-  for (size_t i = 0; i<4; ++i ){
-        o <<" " <<(digi.getSCAFullCond())[i]; }
-  o <<"\n";
-  for (size_t i = 0; i<digi.getCRC().size(); ++i ){
-    o <<" " <<(digi.getCRC())[i]; }
-  o<<"\n";
-  for (size_t i = 0; i<digi.getTS_FLAG().size(); ++i ){
-    o <<" " <<(digi.getTS_FLAG())[i]; }
-  o<<"\n";
-  for (size_t i = 0; i<digi.getSCA_FULL().size(); ++i ){
-    o <<" " <<(digi.getSCA_FULL())[i]; }
-  o<<"\n";
-  for (size_t i = 0; i<digi.getLCT_PHASE().size(); ++i ){
-    o <<" " <<(digi.getLCT_PHASE())[i]; }
-  o<<"\n";
-  for (size_t i = 0; i<digi.getL1A_PHASE().size(); ++i ){
-    o <<" " <<(digi.getL1A_PHASE())[i]; }
-  o<<"\n";
-  for (size_t i = 0; i<digi.getSCA_BLK().size(); ++i ){
-    o <<" " <<(digi.getSCA_BLK())[i]; }
-  o<<"\n";
-  for (size_t i = 0; i<digi.getTRIG_TIME().size(); ++i ){
-    o <<" " <<(digi.getTRIG_TIME())[i]; }
-  o<<"\n";
+std::ostream& operator<<(std::ostream& o, const CSCCFEBStatusDigi& digi) {
+  o << " " << digi.getCFEBNmb() << "\n";
+  for (size_t i = 0; i < 4; ++i) {
+    o << " " << (digi.getSCAFullCond())[i];
+  }
+  o << "\n";
+  for (size_t i = 0; i < digi.getCRC().size(); ++i) {
+    o << " " << (digi.getCRC())[i];
+  }
+  o << "\n";
+  for (size_t i = 0; i < digi.getTS_FLAG().size(); ++i) {
+    o << " " << (digi.getTS_FLAG())[i];
+  }
+  o << "\n";
+  for (size_t i = 0; i < digi.getSCA_FULL().size(); ++i) {
+    o << " " << (digi.getSCA_FULL())[i];
+  }
+  o << "\n";
+  for (size_t i = 0; i < digi.getLCT_PHASE().size(); ++i) {
+    o << " " << (digi.getLCT_PHASE())[i];
+  }
+  o << "\n";
+  for (size_t i = 0; i < digi.getL1A_PHASE().size(); ++i) {
+    o << " " << (digi.getL1A_PHASE())[i];
+  }
+  o << "\n";
+  for (size_t i = 0; i < digi.getSCA_BLK().size(); ++i) {
+    o << " " << (digi.getSCA_BLK())[i];
+  }
+  o << "\n";
+  for (size_t i = 0; i < digi.getTRIG_TIME().size(); ++i) {
+    o << " " << (digi.getTRIG_TIME())[i];
+  }
+  o << "\n";
 
   return o;
 }
-
diff --git a/DataFormats/CSCDigi/src/CSCCLCTDigi.cc b/DataFormats/CSCDigi/src/CSCCLCTDigi.cc
index 149c6e62ec499..0404e78c8c72d 100644
--- a/DataFormats/CSCDigi/src/CSCCLCTDigi.cc
+++ b/DataFormats/CSCDigi/src/CSCCLCTDigi.cc
@@ -12,21 +12,27 @@
 #include <iostream>
 
 /// Constructors
-CSCCLCTDigi::CSCCLCTDigi(const int valid, const int quality, const int pattern,
-			 const int striptype, const int bend, const int strip,
-			 const int cfeb, const int bx, const int trknmb, const int fullbx):
-  valid_(valid),
-  quality_(quality),
-  pattern_(pattern),
-  striptype_(striptype),
-  bend_(bend),
-  strip_(strip),
-  cfeb_(cfeb),
-  bx_(bx),
-  trknmb_(trknmb),
-  //fullbx_(0)
-  fullbx_(fullbx)
- {
+CSCCLCTDigi::CSCCLCTDigi(const int valid,
+                         const int quality,
+                         const int pattern,
+                         const int striptype,
+                         const int bend,
+                         const int strip,
+                         const int cfeb,
+                         const int bx,
+                         const int trknmb,
+                         const int fullbx)
+    : valid_(valid),
+      quality_(quality),
+      pattern_(pattern),
+      striptype_(striptype),
+      bend_(bend),
+      strip_(strip),
+      cfeb_(cfeb),
+      bx_(bx),
+      trknmb_(trknmb),
+      //fullbx_(0)
+      fullbx_(fullbx) {
   //valid_     = valid;
   //quality_   = quality;
   //pattern_   = pattern;
@@ -39,36 +45,26 @@ CSCCLCTDigi::CSCCLCTDigi(const int valid, const int quality, const int pattern,
 }
 
 /// Default
-CSCCLCTDigi::CSCCLCTDigi () :
-  valid_(0),
-  quality_(0),
-  pattern_(0),
-  striptype_(0),
-  bend_(0),
-  strip_(0),
-  cfeb_(0),
-  bx_(0),
-  trknmb_(0),
-  fullbx_(0)
-{
-//  clear(); // set contents to zero
+CSCCLCTDigi::CSCCLCTDigi()
+    : valid_(0), quality_(0), pattern_(0), striptype_(0), bend_(0), strip_(0), cfeb_(0), bx_(0), trknmb_(0), fullbx_(0) {
+  //  clear(); // set contents to zero
 }
 
 /// Clears this CLCT.
 void CSCCLCTDigi::clear() {
-  valid_     = 0;
-  quality_   = 0;
-  pattern_   = 0;
+  valid_ = 0;
+  quality_ = 0;
+  pattern_ = 0;
   striptype_ = 0;
-  bend_      = 0;
-  strip_     = 0;
-  cfeb_      = 0;
-  bx_        = 0;
-  trknmb_    = 0;
-  fullbx_    = 0;
+  bend_ = 0;
+  strip_ = 0;
+  cfeb_ = 0;
+  bx_ = 0;
+  trknmb_ = 0;
+  fullbx_ = 0;
 }
 
-bool CSCCLCTDigi::operator > (const CSCCLCTDigi& rhs) const {
+bool CSCCLCTDigi::operator>(const CSCCLCTDigi& rhs) const {
   // Several versions of CLCT sorting criteria were used before 2008.
   // They are available in CMSSW versions prior to 3_1_0; here we only keep
   // the latest one, used in TMB-07 firmware (w/o distrips).
@@ -78,7 +74,7 @@ bool CSCCLCTDigi::operator > (const CSCCLCTDigi& rhs) const {
   int quality2 = rhs.getQuality();
   // The bend-direction bit pid[0] is ignored (left and right bends have
   // equal quality).
-  int pattern1 = getPattern()     & 14;
+  int pattern1 = getPattern() & 14;
   int pattern2 = rhs.getPattern() & 14;
 
   // Better-quality CLCTs are preferred.
@@ -87,30 +83,30 @@ bool CSCCLCTDigi::operator > (const CSCCLCTDigi& rhs) const {
   // the same quality.
   // If both qualities and pattern id's are the same, lower keystrip
   // is preferred.
-  if ((quality1  > quality2) ||
-      (quality1 == quality2 && pattern1 > pattern2) ||
-      (quality1 == quality2 && pattern1 == pattern2 &&
-       getKeyStrip() < rhs.getKeyStrip())) {returnValue = true;}
+  if ((quality1 > quality2) || (quality1 == quality2 && pattern1 > pattern2) ||
+      (quality1 == quality2 && pattern1 == pattern2 && getKeyStrip() < rhs.getKeyStrip())) {
+    returnValue = true;
+  }
 
   return returnValue;
 }
 
-bool CSCCLCTDigi::operator == (const CSCCLCTDigi& rhs) const {
+bool CSCCLCTDigi::operator==(const CSCCLCTDigi& rhs) const {
   // Exact equality.
   bool returnValue = false;
-  if (isValid()      == rhs.isValid()    && getQuality() == rhs.getQuality() &&
-      getPattern()   == rhs.getPattern() && getKeyStrip()== rhs.getKeyStrip()&&
-      getStripType() == rhs.getStripType() && getBend()  == getBend()        &&
-      getBX()        == rhs.getBX()) {
+  if (isValid() == rhs.isValid() && getQuality() == rhs.getQuality() && getPattern() == rhs.getPattern() &&
+      getKeyStrip() == rhs.getKeyStrip() && getStripType() == rhs.getStripType() && getBend() == getBend() &&
+      getBX() == rhs.getBX()) {
     returnValue = true;
   }
   return returnValue;
 }
 
-bool CSCCLCTDigi::operator != (const CSCCLCTDigi& rhs) const {
+bool CSCCLCTDigi::operator!=(const CSCCLCTDigi& rhs) const {
   // True if == is false.
   bool returnValue = true;
-  if ((*this) == rhs) returnValue = false;
+  if ((*this) == rhs)
+    returnValue = false;
   return returnValue;
 }
 
@@ -118,35 +114,23 @@ bool CSCCLCTDigi::operator != (const CSCCLCTDigi& rhs) const {
 void CSCCLCTDigi::print() const {
   if (isValid()) {
     char stripType = (getStripType() == 0) ? 'D' : 'H';
-    char bend      = (getBend()      == 0) ? 'L' : 'R';
+    char bend = (getBend() == 0) ? 'L' : 'R';
 
-    edm::LogVerbatim("CSCDigi")
-              << " CSC CLCT #"    << std::setw(1) << getTrknmb()
-	      << ": Valid = "     << std::setw(1) << isValid()
-	      << " Key Strip = "  << std::setw(3) << getKeyStrip()
-	      << " Strip = "      << std::setw(2) << getStrip()
-	      << " Quality = "    << std::setw(1) << getQuality()
-	      << " Pattern = "    << std::setw(1) << getPattern()
-	      << " Bend = "       << std::setw(1) << bend
-	      << " Strip type = " << std::setw(1) << stripType
-	      << " CFEB ID = "    << std::setw(1) << getCFEB()
-	      << " BX = "         << std::setw(1) << getBX() 
-              << " Full BX= "     << std::setw(1) << getFullBX();
-  }
-  else {
+    edm::LogVerbatim("CSCDigi") << " CSC CLCT #" << std::setw(1) << getTrknmb() << ": Valid = " << std::setw(1)
+                                << isValid() << " Key Strip = " << std::setw(3) << getKeyStrip()
+                                << " Strip = " << std::setw(2) << getStrip() << " Quality = " << std::setw(1)
+                                << getQuality() << " Pattern = " << std::setw(1) << getPattern()
+                                << " Bend = " << std::setw(1) << bend << " Strip type = " << std::setw(1) << stripType
+                                << " CFEB ID = " << std::setw(1) << getCFEB() << " BX = " << std::setw(1) << getBX()
+                                << " Full BX= " << std::setw(1) << getFullBX();
+  } else {
     edm::LogVerbatim("CSCDigi") << "Not a valid Cathode LCT.";
   }
 }
 
-std::ostream & operator<<(std::ostream & o, const CSCCLCTDigi& digi) {
-  return o << "CSC CLCT #"    << digi.getTrknmb()
-           << ": Valid = "    << digi.isValid()
-           << " Quality = "   << digi.getQuality()
-           << " Pattern = "   << digi.getPattern()
-           << " StripType = " << digi.getStripType()
-           << " Bend = "      << digi.getBend()
-           << " Strip = "     << digi.getStrip()
-           << " KeyStrip = "  << digi.getKeyStrip()
-           << " CFEB = "      << digi.getCFEB()
-           << " BX = "        << digi.getBX();
+std::ostream& operator<<(std::ostream& o, const CSCCLCTDigi& digi) {
+  return o << "CSC CLCT #" << digi.getTrknmb() << ": Valid = " << digi.isValid() << " Quality = " << digi.getQuality()
+           << " Pattern = " << digi.getPattern() << " StripType = " << digi.getStripType()
+           << " Bend = " << digi.getBend() << " Strip = " << digi.getStrip() << " KeyStrip = " << digi.getKeyStrip()
+           << " CFEB = " << digi.getCFEB() << " BX = " << digi.getBX();
 }
diff --git a/DataFormats/CSCDigi/src/CSCCLCTPreTriggerDigi.cc b/DataFormats/CSCDigi/src/CSCCLCTPreTriggerDigi.cc
index 8ccac7feb0016..fd5ff41d2c2a6 100644
--- a/DataFormats/CSCDigi/src/CSCCLCTPreTriggerDigi.cc
+++ b/DataFormats/CSCDigi/src/CSCCLCTPreTriggerDigi.cc
@@ -5,52 +5,55 @@
 #include <iostream>
 
 /// Constructors
-CSCCLCTPreTriggerDigi::CSCCLCTPreTriggerDigi(const int valid, const int quality, const int pattern,
-			 const int striptype, const int bend, const int strip,
-			 const int cfeb, const int bx, const int trknmb, const int fullbx):
-  valid_(valid),
-  quality_(quality),
-  pattern_(pattern),
-  striptype_(striptype),
-  bend_(bend),
-  strip_(strip),
-  cfeb_(cfeb),
-  bx_(bx),
-  trknmb_(trknmb),
-  fullbx_(fullbx)
-{
-}
+CSCCLCTPreTriggerDigi::CSCCLCTPreTriggerDigi(const int valid,
+                                             const int quality,
+                                             const int pattern,
+                                             const int striptype,
+                                             const int bend,
+                                             const int strip,
+                                             const int cfeb,
+                                             const int bx,
+                                             const int trknmb,
+                                             const int fullbx)
+    : valid_(valid),
+      quality_(quality),
+      pattern_(pattern),
+      striptype_(striptype),
+      bend_(bend),
+      strip_(strip),
+      cfeb_(cfeb),
+      bx_(bx),
+      trknmb_(trknmb),
+      fullbx_(fullbx) {}
 
 /// Default
-CSCCLCTPreTriggerDigi::CSCCLCTPreTriggerDigi () :
-  valid_(0),
-  quality_(0),
-  pattern_(0),
-  striptype_(0),
-  bend_(0),
-  strip_(0),
-  cfeb_(0),
-  bx_(0),
-  trknmb_(0),
-  fullbx_(0)
-{
-}
+CSCCLCTPreTriggerDigi::CSCCLCTPreTriggerDigi()
+    : valid_(0),
+      quality_(0),
+      pattern_(0),
+      striptype_(0),
+      bend_(0),
+      strip_(0),
+      cfeb_(0),
+      bx_(0),
+      trknmb_(0),
+      fullbx_(0) {}
 
 /// Clears this CLCT.
 void CSCCLCTPreTriggerDigi::clear() {
-  valid_     = 0;
-  quality_   = 0;
-  pattern_   = 0;
+  valid_ = 0;
+  quality_ = 0;
+  pattern_ = 0;
   striptype_ = 0;
-  bend_      = 0;
-  strip_     = 0;
-  cfeb_      = 0;
-  bx_        = 0;
-  trknmb_    = 0;
-  fullbx_    = 0;
+  bend_ = 0;
+  strip_ = 0;
+  cfeb_ = 0;
+  bx_ = 0;
+  trknmb_ = 0;
+  fullbx_ = 0;
 }
 
-bool CSCCLCTPreTriggerDigi::operator > (const CSCCLCTPreTriggerDigi& rhs) const {
+bool CSCCLCTPreTriggerDigi::operator>(const CSCCLCTPreTriggerDigi& rhs) const {
   // Several versions of CLCT sorting criteria were used before 2008.
   // They are available in CMSSW versions prior to 3_1_0; here we only keep
   // the latest one, used in TMB-07 firmware (w/o distrips).
@@ -60,7 +63,7 @@ bool CSCCLCTPreTriggerDigi::operator > (const CSCCLCTPreTriggerDigi& rhs) const
   int quality2 = rhs.getQuality();
   // The bend-direction bit pid[0] is ignored (left and right bends have
   // equal quality).
-  int pattern1 = getPattern()     & 14;
+  int pattern1 = getPattern() & 14;
   int pattern2 = rhs.getPattern() & 14;
 
   // Better-quality CLCTs are preferred.
@@ -69,30 +72,30 @@ bool CSCCLCTPreTriggerDigi::operator > (const CSCCLCTPreTriggerDigi& rhs) const
   // the same quality.
   // If both qualities and pattern id's are the same, lower keystrip
   // is preferred.
-  if ((quality1  > quality2) ||
-      (quality1 == quality2 && pattern1 > pattern2) ||
-      (quality1 == quality2 && pattern1 == pattern2 &&
-       getKeyStrip() < rhs.getKeyStrip())) {returnValue = true;}
+  if ((quality1 > quality2) || (quality1 == quality2 && pattern1 > pattern2) ||
+      (quality1 == quality2 && pattern1 == pattern2 && getKeyStrip() < rhs.getKeyStrip())) {
+    returnValue = true;
+  }
 
   return returnValue;
 }
 
-bool CSCCLCTPreTriggerDigi::operator == (const CSCCLCTPreTriggerDigi& rhs) const {
+bool CSCCLCTPreTriggerDigi::operator==(const CSCCLCTPreTriggerDigi& rhs) const {
   // Exact equality.
   bool returnValue = false;
-  if (isValid()      == rhs.isValid()    && getQuality() == rhs.getQuality() &&
-      getPattern()   == rhs.getPattern() && getKeyStrip()== rhs.getKeyStrip()&&
-      getStripType() == rhs.getStripType() && getBend()  == getBend()        &&
-      getBX()        == rhs.getBX()) {
+  if (isValid() == rhs.isValid() && getQuality() == rhs.getQuality() && getPattern() == rhs.getPattern() &&
+      getKeyStrip() == rhs.getKeyStrip() && getStripType() == rhs.getStripType() && getBend() == getBend() &&
+      getBX() == rhs.getBX()) {
     returnValue = true;
   }
   return returnValue;
 }
 
-bool CSCCLCTPreTriggerDigi::operator != (const CSCCLCTPreTriggerDigi& rhs) const {
+bool CSCCLCTPreTriggerDigi::operator!=(const CSCCLCTPreTriggerDigi& rhs) const {
   // True if == is false.
   bool returnValue = true;
-  if ((*this) == rhs) returnValue = false;
+  if ((*this) == rhs)
+    returnValue = false;
   return returnValue;
 }
 
@@ -100,35 +103,23 @@ bool CSCCLCTPreTriggerDigi::operator != (const CSCCLCTPreTriggerDigi& rhs) const
 void CSCCLCTPreTriggerDigi::print() const {
   if (isValid()) {
     char stripType = (getStripType() == 0) ? 'D' : 'H';
-    char bend      = (getBend()      == 0) ? 'L' : 'R';
+    char bend = (getBend() == 0) ? 'L' : 'R';
 
-    edm::LogVerbatim("CSCDigi")
-              << " CSC CLCT #"    << std::setw(1) << getTrknmb()
-	      << ": Valid = "     << std::setw(1) << isValid()
-	      << " Key Strip = "  << std::setw(3) << getKeyStrip()
-	      << " Strip = "      << std::setw(2) << getStrip()
-	      << " Quality = "    << std::setw(1) << getQuality()
-	      << " Pattern = "    << std::setw(1) << getPattern()
-	      << " Bend = "       << std::setw(1) << bend
-	      << " Strip type = " << std::setw(1) << stripType
-	      << " CFEB ID = "    << std::setw(1) << getCFEB()
-	      << " BX = "         << std::setw(1) << getBX()
-              << " Full BX= "     << std::setw(1) << getFullBX();
-  }
-  else {
+    edm::LogVerbatim("CSCDigi") << " CSC CLCT #" << std::setw(1) << getTrknmb() << ": Valid = " << std::setw(1)
+                                << isValid() << " Key Strip = " << std::setw(3) << getKeyStrip()
+                                << " Strip = " << std::setw(2) << getStrip() << " Quality = " << std::setw(1)
+                                << getQuality() << " Pattern = " << std::setw(1) << getPattern()
+                                << " Bend = " << std::setw(1) << bend << " Strip type = " << std::setw(1) << stripType
+                                << " CFEB ID = " << std::setw(1) << getCFEB() << " BX = " << std::setw(1) << getBX()
+                                << " Full BX= " << std::setw(1) << getFullBX();
+  } else {
     edm::LogVerbatim("CSCDigi") << "Not a valid Cathode LCT.";
   }
 }
 
-std::ostream & operator<<(std::ostream & o, const CSCCLCTPreTriggerDigi& digi) {
-  return o << "CSC CLCT #"    << digi.getTrknmb()
-           << ": Valid = "    << digi.isValid()
-           << " Quality = "   << digi.getQuality()
-           << " Pattern = "   << digi.getPattern()
-           << " StripType = " << digi.getStripType()
-           << " Bend = "      << digi.getBend()
-           << " Strip = "     << digi.getStrip()
-           << " KeyStrip = "  << digi.getKeyStrip()
-           << " CFEB = "      << digi.getCFEB()
-           << " BX = "        << digi.getBX();
+std::ostream& operator<<(std::ostream& o, const CSCCLCTPreTriggerDigi& digi) {
+  return o << "CSC CLCT #" << digi.getTrknmb() << ": Valid = " << digi.isValid() << " Quality = " << digi.getQuality()
+           << " Pattern = " << digi.getPattern() << " StripType = " << digi.getStripType()
+           << " Bend = " << digi.getBend() << " Strip = " << digi.getStrip() << " KeyStrip = " << digi.getKeyStrip()
+           << " CFEB = " << digi.getCFEB() << " BX = " << digi.getBX();
 }
diff --git a/DataFormats/CSCDigi/src/CSCComparatorDigi.cc b/DataFormats/CSCDigi/src/CSCComparatorDigi.cc
index faadbc28c8ac2..dcb18382c811b 100644
--- a/DataFormats/CSCDigi/src/CSCComparatorDigi.cc
+++ b/DataFormats/CSCDigi/src/CSCComparatorDigi.cc
@@ -12,27 +12,23 @@
 using namespace std;
 
 // Constructors
-CSCComparatorDigi::CSCComparatorDigi( int strip, int comparator, int timeBinWord )
-  : strip_( strip ), comparator_( comparator ), timeBinWord_( timeBinWord ) {
-}
-
-
-CSCComparatorDigi::CSCComparatorDigi() 
-  : strip_( 0 ), comparator_( 0 ), timeBinWord_( 0 ) {
-}
+CSCComparatorDigi::CSCComparatorDigi(int strip, int comparator, int timeBinWord)
+    : strip_(strip), comparator_(comparator), timeBinWord_(timeBinWord) {}
 
+CSCComparatorDigi::CSCComparatorDigi() : strip_(0), comparator_(0), timeBinWord_(0) {}
 
 // Comparison
 
-bool
-CSCComparatorDigi::operator == (const CSCComparatorDigi& digi) const {
-  if ( getStrip() != digi.getStrip() ) return false;
-  if ( getComparator() != digi.getComparator() ) return false;
-  if ( getTimeBinWord() != digi.getTimeBinWord() ) return false;
+bool CSCComparatorDigi::operator==(const CSCComparatorDigi& digi) const {
+  if (getStrip() != digi.getStrip())
+    return false;
+  if (getComparator() != digi.getComparator())
+    return false;
+  if (getTimeBinWord() != digi.getTimeBinWord())
+    return false;
   return true;
 }
 
-
 //@@ If one wanted to order comparator digis how would one want op< to behave?
 // I don't know...
 // I think LHS < RHS only makes sense if
@@ -41,28 +37,26 @@ CSCComparatorDigi::operator == (const CSCComparatorDigi& digi) const {
 // ii) strip(LHS) .lt. strip(RHS)
 // But I don't see how this can be useful.
 
-bool 
-CSCComparatorDigi::operator<(const CSCComparatorDigi& digi) const {
+bool CSCComparatorDigi::operator<(const CSCComparatorDigi& digi) const {
   bool result = false;
-  if(getTimeBin() == digi.getTimeBin()) {
+  if (getTimeBin() == digi.getTimeBin()) {
     result = (getStrip() < digi.getStrip());
   }
   return result;
 }
 
-
 // Getters
 
 int CSCComparatorDigi::getTimeBin() const {
   // Find first bin which fired, counting from 0
-  uint16_t tbit=1;
-  int tbin=-1;
-  for(int i=0;i<16;++i) {
-    if(tbit & timeBinWord_) {
-      tbin=i;
+  uint16_t tbit = 1;
+  int tbin = -1;
+  for (int i = 0; i < 16; ++i) {
+    if (tbit & timeBinWord_) {
+      tbin = i;
       break;
     }
-    tbit=tbit<<1;
+    tbit = tbit << 1;
   }
   return tbin;
 }
@@ -70,55 +64,45 @@ int CSCComparatorDigi::getTimeBin() const {
 // This definition is consistent with the one used in
 // the function CSCCLCTData::add() in EventFilter/CSCRawToDigi
 // The halfstrip counts from 0!
-int CSCComparatorDigi::getHalfStrip() const {
-  return (getStrip() - 1) * 2 + getComparator();
-}
+int CSCComparatorDigi::getHalfStrip() const { return (getStrip() - 1) * 2 + getComparator(); }
 
 // Return the fractional half-strip
-float CSCComparatorDigi::getFractionalStrip() const {
-  return getStrip() + getComparator() * 0.5f - 0.75f;
-}
+float CSCComparatorDigi::getFractionalStrip() const { return getStrip() + getComparator() * 0.5f - 0.75f; }
 
 std::vector<int> CSCComparatorDigi::getTimeBinsOn() const {
   std::vector<int> tbins;
   uint16_t tbit = timeBinWord_;
-  const uint16_t one=1;
-  for(int i=0;i<16;++i) {
-    if(tbit & one) tbins.push_back(i);
-    tbit=tbit>>1;
-    if(tbit==0) break; // end already if no more bits set
+  const uint16_t one = 1;
+  for (int i = 0; i < 16; ++i) {
+    if (tbit & one)
+      tbins.push_back(i);
+    tbit = tbit >> 1;
+    if (tbit == 0)
+      break;  // end already if no more bits set
   }
-  return tbins;                                  
+  return tbins;
 }
 
 // Setters
 //@@ No way to set time word?
 
-void CSCComparatorDigi::setStrip(int strip) {
-  strip_ = strip;
-}
-void CSCComparatorDigi::setComparator(int comparator) {
-  comparator_ = comparator;
-}
+void CSCComparatorDigi::setStrip(int strip) { strip_ = strip; }
+void CSCComparatorDigi::setComparator(int comparator) { comparator_ = comparator; }
 
 // Output
 
-void
-CSCComparatorDigi::print() const {
+void CSCComparatorDigi::print() const {
   std::ostringstream ost;
-  ost << "CSCComparatorDigi | strip " << getStrip()
-      << " | comparator " << getComparator() 
-      << " | first time bin "  << getTimeBin() << " | time bins on ";
-  std::vector<int> tbins=getTimeBinsOn();
-  for(unsigned int i=0; i<tbins.size();i++) {ost << tbins[i] << " ";}
+  ost << "CSCComparatorDigi | strip " << getStrip() << " | comparator " << getComparator() << " | first time bin "
+      << getTimeBin() << " | time bins on ";
+  std::vector<int> tbins = getTimeBinsOn();
+  for (unsigned int i = 0; i < tbins.size(); i++) {
+    ost << tbins[i] << " ";
+  }
   edm::LogVerbatim("CSCDigi") << ost.str();
 }
 
 //@@ Doesn't print all time bins
-std::ostream & operator<<(std::ostream & o, const CSCComparatorDigi& digi) {
-  return o << " " << digi.getStrip()
-	   << " " << digi.getComparator()
-	   << " " << digi.getTimeBin();
-}  
-
-
+std::ostream& operator<<(std::ostream& o, const CSCComparatorDigi& digi) {
+  return o << " " << digi.getStrip() << " " << digi.getComparator() << " " << digi.getTimeBin();
+}
diff --git a/DataFormats/CSCDigi/src/CSCCorrelatedLCTDigi.cc b/DataFormats/CSCDigi/src/CSCCorrelatedLCTDigi.cc
index 0414f1a4ac4a3..144337f3769e5 100644
--- a/DataFormats/CSCDigi/src/CSCCorrelatedLCTDigi.cc
+++ b/DataFormats/CSCDigi/src/CSCCorrelatedLCTDigi.cc
@@ -11,94 +11,80 @@
 #include <iostream>
 
 /// Constructors
-CSCCorrelatedLCTDigi::CSCCorrelatedLCTDigi(const int itrknmb, const int ivalid,
-					   const int iquality,
-					   const int ikeywire,
-					   const int istrip,
-					   const int ipattern, const int ibend,
-					   const int ibx, const int impclink, 
-					   const uint16_t ibx0,
-					   const uint16_t isyncErr, 
-					   const uint16_t icscID):
-  trknmb(itrknmb),
-  valid(ivalid),
-  quality(iquality),
-  keywire(ikeywire),
-  strip(istrip),
-  pattern(ipattern),
-  bend(ibend),
-  bx(ibx),
-  mpclink(impclink),
-  bx0(ibx0),
-  syncErr(isyncErr),
-  cscID(icscID)
-{}
+CSCCorrelatedLCTDigi::CSCCorrelatedLCTDigi(const int itrknmb,
+                                           const int ivalid,
+                                           const int iquality,
+                                           const int ikeywire,
+                                           const int istrip,
+                                           const int ipattern,
+                                           const int ibend,
+                                           const int ibx,
+                                           const int impclink,
+                                           const uint16_t ibx0,
+                                           const uint16_t isyncErr,
+                                           const uint16_t icscID)
+    : trknmb(itrknmb),
+      valid(ivalid),
+      quality(iquality),
+      keywire(ikeywire),
+      strip(istrip),
+      pattern(ipattern),
+      bend(ibend),
+      bx(ibx),
+      mpclink(impclink),
+      bx0(ibx0),
+      syncErr(isyncErr),
+      cscID(icscID) {}
 
 /// Default
 CSCCorrelatedLCTDigi::CSCCorrelatedLCTDigi() {
-  clear(); // set contents to zero
+  clear();  // set contents to zero
 }
 
 /// Clears this LCT.
 void CSCCorrelatedLCTDigi::clear() {
-  trknmb  = 0;
-  valid   = 0;
+  trknmb = 0;
+  valid = 0;
   quality = 0;
   keywire = 0;
-  strip   = 0;
+  strip = 0;
   pattern = 0;
-  bend    = 0;
-  bx      = 0;
+  bend = 0;
+  bx = 0;
   mpclink = 0;
-  bx0     = 0; 
+  bx0 = 0;
   syncErr = 0;
-  cscID   = 0;
+  cscID = 0;
 }
 
 /// return the fractional strip
-float CSCCorrelatedLCTDigi::getFractionalStrip() const{
-  return 0.5f * (getStrip() + 1) - 0.25f;
-}
+float CSCCorrelatedLCTDigi::getFractionalStrip() const { return 0.5f * (getStrip() + 1) - 0.25f; }
 
 /// Comparison
-bool CSCCorrelatedLCTDigi::operator==(const CSCCorrelatedLCTDigi &rhs) const {
-  return ((trknmb == rhs.trknmb)   && (quality == rhs.quality) &&
-	  (keywire == rhs.keywire) && (strip == rhs.strip)     &&
-	  (pattern == rhs.pattern) && (bend == rhs.bend)       &&
-	  (bx == rhs.bx)           && (valid == rhs.valid) && (mpclink == rhs.mpclink) );
+bool CSCCorrelatedLCTDigi::operator==(const CSCCorrelatedLCTDigi& rhs) const {
+  return ((trknmb == rhs.trknmb) && (quality == rhs.quality) && (keywire == rhs.keywire) && (strip == rhs.strip) &&
+          (pattern == rhs.pattern) && (bend == rhs.bend) && (bx == rhs.bx) && (valid == rhs.valid) &&
+          (mpclink == rhs.mpclink));
 }
 
 /// Debug
 void CSCCorrelatedLCTDigi::print() const {
   if (isValid()) {
-    edm::LogVerbatim("CSCDigi")
-              << "CSC LCT #"        << getTrknmb() 
-	      << ": Valid = "       << isValid()
-	      << " Quality = "      << getQuality()
-	      << " Key Wire = "     << getKeyWG()
-	      << " Strip = "        << getStrip()
-              << " Pattern = "      << getPattern()
-	      << " Bend = "         << ( (getBend() == 0) ? 'L' : 'R' )
-	      << " BX = "           << getBX() 
-	      << " MPC Link = "     << getMPCLink();
-  }
-  else {
+    edm::LogVerbatim("CSCDigi") << "CSC LCT #" << getTrknmb() << ": Valid = " << isValid()
+                                << " Quality = " << getQuality() << " Key Wire = " << getKeyWG()
+                                << " Strip = " << getStrip() << " Pattern = " << getPattern()
+                                << " Bend = " << ((getBend() == 0) ? 'L' : 'R') << " BX = " << getBX()
+                                << " MPC Link = " << getMPCLink();
+  } else {
     edm::LogVerbatim("CSCDigi") << "Not a valid correlated LCT.";
   }
 }
 
-std::ostream & operator<<(std::ostream & o,
-			  const CSCCorrelatedLCTDigi& digi) {
-  return o << "CSC LCT #"   << digi.getTrknmb()
-           << ": Valid = "  << digi.isValid()
-           << " Quality = " << digi.getQuality()
-           << " MPC Link = " << digi.getMPCLink()
-	   << " cscID = "   << digi.getCSCID() << "\n"
-           <<"  cathode info: Strip = "    << digi.getStrip()
-	   << " Pattern = " << digi.getPattern()
-           << " Bend = "    << ((digi.getBend() == 0) ? 'L' : 'R') << "\n"
-           <<"    anode info: Key wire = " << digi.getKeyWG()
-           << " BX = "      << digi.getBX()
-           << " bx0 = "     << digi.getBX0()
+std::ostream& operator<<(std::ostream& o, const CSCCorrelatedLCTDigi& digi) {
+  return o << "CSC LCT #" << digi.getTrknmb() << ": Valid = " << digi.isValid() << " Quality = " << digi.getQuality()
+           << " MPC Link = " << digi.getMPCLink() << " cscID = " << digi.getCSCID() << "\n"
+           << "  cathode info: Strip = " << digi.getStrip() << " Pattern = " << digi.getPattern()
+           << " Bend = " << ((digi.getBend() == 0) ? 'L' : 'R') << "\n"
+           << "    anode info: Key wire = " << digi.getKeyWG() << " BX = " << digi.getBX() << " bx0 = " << digi.getBX0()
            << " syncErr = " << digi.getSyncErr() << "\n";
 }
diff --git a/DataFormats/CSCDigi/src/CSCDCCFormatStatusDigi.cc b/DataFormats/CSCDigi/src/CSCDCCFormatStatusDigi.cc
index bed96ab3f4036..415b8992b29f1 100644
--- a/DataFormats/CSCDigi/src/CSCDCCFormatStatusDigi.cc
+++ b/DataFormats/CSCDigi/src/CSCDCCFormatStatusDigi.cc
@@ -22,7 +22,7 @@
 #include <iostream>
 #include <iomanip>
 
- /**
+/**
    * @brief  setExaminerInfo 
    * @param  fDCC_MASK_ DCC Examiner mask used (for information purposes).
    * @param  fCSC_MASK_ Examiner mask per chamber
@@ -33,13 +33,12 @@
    * @param  mCSC_STATUS_ List of statuses per CSC
    */
 void CSCDCCFormatStatusDigi::setDCCExaminerInfo(const ExaminerMaskType fDCC_MASK_,
-                         const ExaminerMaskType fCSC_MASK_,
-                         const ExaminerStatusType fDDU_SUMMARY_ERRORS_,
-                         const std::map<DDUIdType, ExaminerStatusType>& mDDU_ERRORS_,
-                         const std::map<CSCIdType, ExaminerStatusType>& mCSC_ERRORS_,
-                         const std::map<CSCIdType, ExaminerStatusType>& mCSC_PAYLOADS_,
-                         const std::map<CSCIdType, ExaminerStatusType>& mCSC_STATUS_)
-{
+                                                const ExaminerMaskType fCSC_MASK_,
+                                                const ExaminerStatusType fDDU_SUMMARY_ERRORS_,
+                                                const std::map<DDUIdType, ExaminerStatusType>& mDDU_ERRORS_,
+                                                const std::map<CSCIdType, ExaminerStatusType>& mCSC_ERRORS_,
+                                                const std::map<CSCIdType, ExaminerStatusType>& mCSC_PAYLOADS_,
+                                                const std::map<CSCIdType, ExaminerStatusType>& mCSC_STATUS_) {
   fDCC_MASK = fDCC_MASK_;
   fCSC_MASK = fCSC_MASK_;
   fDDU_SUMMARY_ERRORS = fDDU_SUMMARY_ERRORS_;
@@ -49,78 +48,70 @@ void CSCDCCFormatStatusDigi::setDCCExaminerInfo(const ExaminerMaskType fDCC_MASK
   mCSC_STATUS = mCSC_STATUS_;
 }
 
-
-            /// Debug
+/// Debug
 void CSCDCCFormatStatusDigi::print() const {
-
   // Keep original code in case I messed up the formatting in some subtle way when switching to MessageLogger
   //
-  //   std::cout << "CSCDCCFormatStatusDigi: DCC=" << std::dec << getDCCId() 
+  //   std::cout << "CSCDCCFormatStatusDigi: DCC=" << std::dec << getDCCId()
   //	<< " DCCMask=0x" << std::hex << std::setw(8) << std::setfill('0') << getDCCMask()
   //	<< " CSCMask=0x" << std::hex << std::setw(8) << std::setfill('0') << getCSCMask()
-  //	<< " DCCErrors=0x" << std::hex << std::setw(8) << std::setfill('0') << getDDUSummaryErrors() 
+  //	<< " DCCErrors=0x" << std::hex << std::setw(8) << std::setfill('0') << getDDUSummaryErrors()
   //	<< std::dec << "\n";
   //   std::set<DDUIdType> ddu_list = getListOfDDUs();
   //   for (std::set<DDUIdType>::iterator itr=ddu_list.begin(); itr != ddu_list.end(); ++itr) {
-  //   	std::cout << "DDU_" << std::dec << ((*itr)&0xFF) 
-  //	<< " Errors=0x" << std::hex << std::setw(8) << std::setfill('0') << getDDUErrors(*itr) << "\n"; 
+  //   	std::cout << "DDU_" << std::dec << ((*itr)&0xFF)
+  //	<< " Errors=0x" << std::hex << std::setw(8) << std::setfill('0') << getDDUErrors(*itr) << "\n";
   //   }
   //   std::set<CSCIdType> csc_list = getListOfCSCs();
   //   for (std::set<CSCIdType>::iterator itr=csc_list.begin(); itr != csc_list.end(); ++itr) {
-  //	
-  //        std::cout << "CSC_" << std::dec << (((*itr)>>4)&0xFF) << "_" << ((*itr)&0xF) 
-  //		<< " Errors=0x" << std::hex << std::setw(8) << std::setfill('0') << getCSCErrors(*itr) 
-  //		<< " Payload=0x" << std::setw(8) << std::setfill('0') << getCSCPayload(*itr) 
+  //
+  //        std::cout << "CSC_" << std::dec << (((*itr)>>4)&0xFF) << "_" << ((*itr)&0xF)
+  //		<< " Errors=0x" << std::hex << std::setw(8) << std::setfill('0') << getCSCErrors(*itr)
+  //		<< " Payload=0x" << std::setw(8) << std::setfill('0') << getCSCPayload(*itr)
   //		<< " Status=0x" << std::setw(8) << std::setfill('0') << getCSCStatus(*itr) << "\n";
   //   }
 
-  edm::LogVerbatim("CSCDigi") << "CSCDCCFormatStatusDigi: DCC=" << std::dec << getDCCId() 
-	<< " DCCMask=0x" << std::hex << std::setw(8) << std::setfill('0') << getDCCMask()
-	<< " CSCMask=0x" << std::hex << std::setw(8) << std::setfill('0') << getCSCMask()
-	<< " DCCErrors=0x" << std::hex << std::setw(8) << std::setfill('0') << getDDUSummaryErrors() 
-        << std::dec;
+  edm::LogVerbatim("CSCDigi") << "CSCDCCFormatStatusDigi: DCC=" << std::dec << getDCCId() << " DCCMask=0x" << std::hex
+                              << std::setw(8) << std::setfill('0') << getDCCMask() << " CSCMask=0x" << std::hex
+                              << std::setw(8) << std::setfill('0') << getCSCMask() << " DCCErrors=0x" << std::hex
+                              << std::setw(8) << std::setfill('0') << getDDUSummaryErrors() << std::dec;
 
-   std::ostringstream ost;
+  std::ostringstream ost;
 
-   std::set<DDUIdType> ddu_list = getListOfDDUs();
-   for (std::set<DDUIdType>::iterator itr=ddu_list.begin(); itr != ddu_list.end(); ++itr) {
-   	ost  << "DDU_" << std::dec << ((*itr)&0xFF) 
-	     << " Errors=0x" << std::hex << std::setw(8) << std::setfill('0') << getDDUErrors(*itr);
-	edm::LogVerbatim("CSCDigi") << ost.str();
-	ost.clear();
-   }
-
-   std::set<CSCIdType> csc_list = getListOfCSCs();
-   for (std::set<CSCIdType>::iterator itr=csc_list.begin(); itr != csc_list.end(); ++itr) {
-        ost << "CSC_" << std::dec << (((*itr)>>4)&0xFF) << "_" << ((*itr)&0xF) 
-		<< " Errors=0x" << std::hex << std::setw(8) << std::setfill('0') << getCSCErrors(*itr) 
-		<< " Payload=0x" << std::setw(8) << std::setfill('0') << getCSCPayload(*itr) 
-	    << " Status=0x" << std::setw(8) << std::setfill('0') << getCSCStatus(*itr);
-	edm::LogVerbatim("CSCDigi") << ost.str();
-	ost.clear();
-   }
+  std::set<DDUIdType> ddu_list = getListOfDDUs();
+  for (std::set<DDUIdType>::iterator itr = ddu_list.begin(); itr != ddu_list.end(); ++itr) {
+    ost << "DDU_" << std::dec << ((*itr) & 0xFF) << " Errors=0x" << std::hex << std::setw(8) << std::setfill('0')
+        << getDDUErrors(*itr);
+    edm::LogVerbatim("CSCDigi") << ost.str();
+    ost.clear();
+  }
 
+  std::set<CSCIdType> csc_list = getListOfCSCs();
+  for (std::set<CSCIdType>::iterator itr = csc_list.begin(); itr != csc_list.end(); ++itr) {
+    ost << "CSC_" << std::dec << (((*itr) >> 4) & 0xFF) << "_" << ((*itr) & 0xF) << " Errors=0x" << std::hex
+        << std::setw(8) << std::setfill('0') << getCSCErrors(*itr) << " Payload=0x" << std::setw(8) << std::setfill('0')
+        << getCSCPayload(*itr) << " Status=0x" << std::setw(8) << std::setfill('0') << getCSCStatus(*itr);
+    edm::LogVerbatim("CSCDigi") << ost.str();
+    ost.clear();
+  }
 }
 
-std::ostream & operator<<(std::ostream & o, const CSCDCCFormatStatusDigi& digi) {
-   o << "CSCDCCFormatStatusDigi: DCC=" << std::dec << digi.getDCCId() 
-        << " DCCMask=0x" << std::hex << std::setw(8) << std::setfill('0') << digi.getDCCMask()
-        << " CSCMask=0x" << std::hex << std::setw(8) << std::setfill('0') << digi.getCSCMask()
-        << " DCCErrors=0x" << std::hex << std::setw(8) << std::setfill('0') << digi.getDDUSummaryErrors() 
-        << std::dec << "\n";
-   std::set<DDUIdType> ddu_list = digi.getListOfDDUs();
-   for (std::set<DDUIdType>::iterator itr=ddu_list.begin(); itr != ddu_list.end(); ++itr) {
-        o << "DDU_" << std::dec << ((*itr)&0xFF) 
-        << " Errors=0x" << std::hex << std::setw(8) << std::setfill('0') << digi.getDDUErrors(*itr) << "\n"; 
-   }
-   std::set<CSCIdType> csc_list = digi.getListOfCSCs();
-   for (std::set<CSCIdType>::iterator itr=csc_list.begin(); itr != csc_list.end(); ++itr) {
-        
-        o << "CSC_" << std::dec << (((*itr)>>4)&0xFF) << "_" << ((*itr)&0xF) 
-                << " Errors=0x" << std::hex << std::setw(8) << std::setfill('0') << digi.getCSCErrors(*itr) 
-                << " Payload=0x" << std::setw(8) << std::setfill('0') << digi. getCSCPayload(*itr) 
-                << " Status=0x" << std::setw(8) << std::setfill('0') << digi.getCSCStatus(*itr) << "\n";
-   }
+std::ostream& operator<<(std::ostream& o, const CSCDCCFormatStatusDigi& digi) {
+  o << "CSCDCCFormatStatusDigi: DCC=" << std::dec << digi.getDCCId() << " DCCMask=0x" << std::hex << std::setw(8)
+    << std::setfill('0') << digi.getDCCMask() << " CSCMask=0x" << std::hex << std::setw(8) << std::setfill('0')
+    << digi.getCSCMask() << " DCCErrors=0x" << std::hex << std::setw(8) << std::setfill('0')
+    << digi.getDDUSummaryErrors() << std::dec << "\n";
+  std::set<DDUIdType> ddu_list = digi.getListOfDDUs();
+  for (std::set<DDUIdType>::iterator itr = ddu_list.begin(); itr != ddu_list.end(); ++itr) {
+    o << "DDU_" << std::dec << ((*itr) & 0xFF) << " Errors=0x" << std::hex << std::setw(8) << std::setfill('0')
+      << digi.getDDUErrors(*itr) << "\n";
+  }
+  std::set<CSCIdType> csc_list = digi.getListOfCSCs();
+  for (std::set<CSCIdType>::iterator itr = csc_list.begin(); itr != csc_list.end(); ++itr) {
+    o << "CSC_" << std::dec << (((*itr) >> 4) & 0xFF) << "_" << ((*itr) & 0xF) << " Errors=0x" << std::hex
+      << std::setw(8) << std::setfill('0') << digi.getCSCErrors(*itr) << " Payload=0x" << std::setw(8)
+      << std::setfill('0') << digi.getCSCPayload(*itr) << " Status=0x" << std::setw(8) << std::setfill('0')
+      << digi.getCSCStatus(*itr) << "\n";
+  }
   return o;
 }
-
diff --git a/DataFormats/CSCDigi/src/CSCDCCStatusDigi.cc b/DataFormats/CSCDigi/src/CSCDCCStatusDigi.cc
index 17c496abf80bb..ae4b2c672668f 100644
--- a/DataFormats/CSCDigi/src/CSCDCCStatusDigi.cc
+++ b/DataFormats/CSCDigi/src/CSCDCCStatusDigi.cc
@@ -10,32 +10,31 @@
 #include <cstring>
 #include <iostream>
 
-CSCDCCStatusDigi::CSCDCCStatusDigi(const uint16_t * header, const uint16_t * trailer, const uint32_t & error, 
-                                   short unsigned tts) 
-{
-  errorFlag_=error;
-  uint16_t headerSizeInBytes =16;
-  uint16_t trailerSizeInBytes =16;
+CSCDCCStatusDigi::CSCDCCStatusDigi(const uint16_t* header,
+                                   const uint16_t* trailer,
+                                   const uint32_t& error,
+                                   short unsigned tts) {
+  errorFlag_ = error;
+  uint16_t headerSizeInBytes = 16;
+  uint16_t trailerSizeInBytes = 16;
   memcpy(header_, header, headerSizeInBytes);
   memcpy(trailer_, trailer, trailerSizeInBytes);
   tts_ = tts;
 }
 
 const uint16_t CSCDCCStatusDigi::getDCCTTS() const {
-         uint16_t ttsBits = (tts_ & 0x00F0) >> 4;
-         return ttsBits;
+  uint16_t ttsBits = (tts_ & 0x00F0) >> 4;
+  return ttsBits;
 }
 
 void CSCDCCStatusDigi::print() const {
-  edm::LogVerbatim("CSCDigi") << " Header: " << std::hex << *header_ <<
-    " Trailer: " << std::hex << *trailer_ << " ErrorFlag: " <<  errorFlag_ <<
-    " TTS: " << getDCCTTS() << std::dec;
+  edm::LogVerbatim("CSCDigi") << " Header: " << std::hex << *header_ << " Trailer: " << std::hex << *trailer_
+                              << " ErrorFlag: " << errorFlag_ << " TTS: " << getDCCTTS() << std::dec;
 }
 
-std::ostream & operator<<(std::ostream & o, const CSCDCCStatusDigi& digi) {
+std::ostream& operator<<(std::ostream& o, const CSCDCCStatusDigi& digi) {
   o << " ";
-  o <<"\n";
+  o << "\n";
 
   return o;
 }
-
diff --git a/DataFormats/CSCDigi/src/CSCDDUStatusDigi.cc b/DataFormats/CSCDigi/src/CSCDDUStatusDigi.cc
index 7cdcbdff68b08..b63a4fc02b935 100644
--- a/DataFormats/CSCDigi/src/CSCDDUStatusDigi.cc
+++ b/DataFormats/CSCDigi/src/CSCDDUStatusDigi.cc
@@ -10,29 +10,27 @@
 #include <cstring>
 #include <iostream>
 
-CSCDDUStatusDigi::CSCDDUStatusDigi(const uint16_t * header, const uint16_t * trailer, uint16_t tts)
-{
-  uint16_t headerSizeInBytes =24;
-  uint16_t trailerSizeInBytes =24;
+CSCDDUStatusDigi::CSCDDUStatusDigi(const uint16_t* header, const uint16_t* trailer, uint16_t tts) {
+  uint16_t headerSizeInBytes = 24;
+  uint16_t trailerSizeInBytes = 24;
   memcpy(header_, header, headerSizeInBytes);
   memcpy(trailer_, trailer, trailerSizeInBytes);
-  tts_=tts;
+  tts_ = tts;
 }
 
 const uint16_t CSCDDUStatusDigi::getDDUTTS() const {
-         uint16_t ttsBits = (tts_ & 0x00F0) >> 4;
-         return ttsBits;
+  uint16_t ttsBits = (tts_ & 0x00F0) >> 4;
+  return ttsBits;
 }
 
 void CSCDDUStatusDigi::print() const {
-  edm::LogVerbatim("CSCDigi") << " Header: " << std::hex << *header_ <<
-    " Trailer: " << std::hex << *trailer_ << " TTS: " << getDDUTTS() << std::dec;
+  edm::LogVerbatim("CSCDigi") << " Header: " << std::hex << *header_ << " Trailer: " << std::hex << *trailer_
+                              << " TTS: " << getDDUTTS() << std::dec;
 }
 
-std::ostream & operator<<(std::ostream & o, const CSCDDUStatusDigi& digi) {
-  o << " "; 
-  o <<"\n";
- 
+std::ostream& operator<<(std::ostream& o, const CSCDDUStatusDigi& digi) {
+  o << " ";
+  o << "\n";
+
   return o;
 }
-
diff --git a/DataFormats/CSCDigi/src/CSCDMBStatusDigi.cc b/DataFormats/CSCDigi/src/CSCDMBStatusDigi.cc
index 2aa7f87391236..922e94a6e81e1 100644
--- a/DataFormats/CSCDigi/src/CSCDMBStatusDigi.cc
+++ b/DataFormats/CSCDigi/src/CSCDMBStatusDigi.cc
@@ -9,18 +9,16 @@
 #include <cstring>
 #include <cstdint>
 
-CSCDMBStatusDigi::CSCDMBStatusDigi(const uint16_t * header, const uint16_t * trailer)
-{
-  uint16_t headerSizeInBytes =16;
-  uint16_t trailerSizeInBytes =16;
+CSCDMBStatusDigi::CSCDMBStatusDigi(const uint16_t* header, const uint16_t* trailer) {
+  uint16_t headerSizeInBytes = 16;
+  uint16_t trailerSizeInBytes = 16;
   memcpy(header_, header, headerSizeInBytes);
   memcpy(trailer_, trailer, trailerSizeInBytes);
 }
 
-std::ostream & operator<<(std::ostream & o, const CSCDMBStatusDigi& digi) {
-  o << " "; 
-  o <<"\n";
- 
+std::ostream& operator<<(std::ostream& o, const CSCDMBStatusDigi& digi) {
+  o << " ";
+  o << "\n";
+
   return o;
 }
-
diff --git a/DataFormats/CSCDigi/src/CSCRPCDigi.cc b/DataFormats/CSCDigi/src/CSCRPCDigi.cc
index 00bc78a8d8554..757833a2f316d 100644
--- a/DataFormats/CSCDigi/src/CSCRPCDigi.cc
+++ b/DataFormats/CSCDigi/src/CSCRPCDigi.cc
@@ -6,37 +6,34 @@
  * \author N. Terentiev, CMU
  */
 
-
 #include "DataFormats/CSCDigi/interface/CSCRPCDigi.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <iostream>
 
 /// Constructors
 
-CSCRPCDigi::CSCRPCDigi (int rpc, int pad, int bxn, int tbin){
+CSCRPCDigi::CSCRPCDigi(int rpc, int pad, int bxn, int tbin) {
   rpc_ = rpc;
-  pad_ = pad; 
+  pad_ = pad;
   bxn_ = bxn;
   tbin_ = tbin;
 }
 
 /// Default
-CSCRPCDigi::CSCRPCDigi (){
+CSCRPCDigi::CSCRPCDigi() {
   rpc_ = 0;
-  pad_ = 0; 
+  pad_ = 0;
   bxn_ = 0;
   tbin_ = 0;
 }
 
 /// Debug
 void CSCRPCDigi::print() const {
-  edm::LogVerbatim("CSCDigi") << "CSCRPCDigi | rpc " << getRpc() << " | pad " << getPad()
-	    << " | tbin " << getTbin() << " | bxn  " << getBXN();
+  edm::LogVerbatim("CSCDigi") << "CSCRPCDigi | rpc " << getRpc() << " | pad " << getPad() << " | tbin " << getTbin()
+                              << " | bxn  " << getBXN();
 }
 
-std::ostream & operator<<(std::ostream & o, const CSCRPCDigi& digi) {
-  return o << " RPC = " << digi.getRpc() << "  Pad = "<< digi.getPad()
-           << "  Tbin = " << digi.getTbin() << "  Bxn = " << digi.getBXN();
+std::ostream& operator<<(std::ostream& o, const CSCRPCDigi& digi) {
+  return o << " RPC = " << digi.getRpc() << "  Pad = " << digi.getPad() << "  Tbin = " << digi.getTbin()
+           << "  Bxn = " << digi.getBXN();
 }
-
-
diff --git a/DataFormats/CSCDigi/src/CSCStripDigi.cc b/DataFormats/CSCDigi/src/CSCStripDigi.cc
index 95c791f54ec36..eaa01654d1feb 100644
--- a/DataFormats/CSCDigi/src/CSCStripDigi.cc
+++ b/DataFormats/CSCDigi/src/CSCStripDigi.cc
@@ -8,53 +8,57 @@
 #include <iostream>
 #include <cstdint>
 
-
 // Comparison
-bool
-CSCStripDigi::operator == (const CSCStripDigi& digi) const {
-  if ( getStrip() != digi.getStrip() ) return false;
-  if ( getADCCounts().size() != digi.getADCCounts().size() ) return false;
-  if ( getADCCounts() != digi.getADCCounts() ) return false;
+bool CSCStripDigi::operator==(const CSCStripDigi& digi) const {
+  if (getStrip() != digi.getStrip())
+    return false;
+  if (getADCCounts().size() != digi.getADCCounts().size())
+    return false;
+  if (getADCCounts() != digi.getADCCounts())
+    return false;
   return true;
 }
 
-
-
-void CSCStripDigi::setADCCounts(const std::vector<int>&vADCCounts) {
+void CSCStripDigi::setADCCounts(const std::vector<int>& vADCCounts) {
   bool badVal = false;
-  for (int i=0; i<(int)vADCCounts.size(); i++) {
-    if (vADCCounts[i] < 1) badVal = true;
+  for (int i = 0; i < (int)vADCCounts.size(); i++) {
+    if (vADCCounts[i] < 1)
+      badVal = true;
   }
-  if ( !badVal ) {
+  if (!badVal) {
     ADCCounts = vADCCounts;
   } else {
-    std::vector<int> ZeroCounts(8,0);
+    std::vector<int> ZeroCounts(8, 0);
     ADCCounts = ZeroCounts;
   }
 }
 
 // Debug
-void
-CSCStripDigi::print() const {
+void CSCStripDigi::print() const {
   std::ostringstream ost;
   ost << "CSCStripDigi | strip " << getStrip() << " | ADCCounts ";
-  for (int i=0; i<(int)getADCCounts().size(); i++) {ost << getADCCounts()[i] << " ";}
+  for (int i = 0; i < (int)getADCCounts().size(); i++) {
+    ost << getADCCounts()[i] << " ";
+  }
   ost << " | Overflow ";
-  for (int i=0; i<(int)getADCOverflow().size(); i++) {ost << getADCOverflow()[i] << " ";}
+  for (int i = 0; i < (int)getADCOverflow().size(); i++) {
+    ost << getADCOverflow()[i] << " ";
+  }
   ost << " | Overlapped ";
-  for (int i=0; i<(int)getOverlappedSample().size(); i++) {ost << getOverlappedSample()[i] << " ";}
+  for (int i = 0; i < (int)getOverlappedSample().size(); i++) {
+    ost << getOverlappedSample()[i] << " ";
+  }
   ost << " | L1APhase ";
-  for(int i=0; i<(int)getL1APhase().size(); i++){ost << getL1APhase()[i] << " ";}
+  for (int i = 0; i < (int)getL1APhase().size(); i++) {
+    ost << getL1APhase()[i] << " ";
+  }
   edm::LogVerbatim("CSCDigi") << ost.str();
 }
 
-std::ostream & operator<<(std::ostream & o, const CSCStripDigi& digi) {
+std::ostream& operator<<(std::ostream& o, const CSCStripDigi& digi) {
   o << " " << digi.getStrip();
-  for (size_t i = 0; i<digi.getADCCounts().size(); ++i ){
-    o <<" " <<(digi.getADCCounts())[i]; }
+  for (size_t i = 0; i < digi.getADCCounts().size(); ++i) {
+    o << " " << (digi.getADCCounts())[i];
+  }
   return o;
-
 }
-
-
-
diff --git a/DataFormats/CSCDigi/src/CSCTMBStatusDigi.cc b/DataFormats/CSCDigi/src/CSCTMBStatusDigi.cc
index 0ebd5899767ac..d153724c280ae 100644
--- a/DataFormats/CSCDigi/src/CSCTMBStatusDigi.cc
+++ b/DataFormats/CSCDigi/src/CSCTMBStatusDigi.cc
@@ -9,18 +9,16 @@
 #include <cstring>
 #include <cstdint>
 
-CSCTMBStatusDigi::CSCTMBStatusDigi(const uint16_t * header, const uint16_t * trailer)
-{
-  uint16_t headerSizeInBytes =54;
-  uint16_t trailerSizeInBytes =16;
+CSCTMBStatusDigi::CSCTMBStatusDigi(const uint16_t* header, const uint16_t* trailer) {
+  uint16_t headerSizeInBytes = 54;
+  uint16_t trailerSizeInBytes = 16;
   memcpy(header_, header, headerSizeInBytes);
   memcpy(trailer_, trailer, trailerSizeInBytes);
 }
 
-std::ostream & operator<<(std::ostream & o, const CSCTMBStatusDigi& digi) {
-  o << " "; 
-  o <<"\n";
- 
+std::ostream& operator<<(std::ostream& o, const CSCTMBStatusDigi& digi) {
+  o << " ";
+  o << "\n";
+
   return o;
 }
-
diff --git a/DataFormats/CSCDigi/src/CSCWireDigi.cc b/DataFormats/CSCDigi/src/CSCWireDigi.cc
index d5572a3daa6f5..81d92880721e4 100644
--- a/DataFormats/CSCDigi/src/CSCWireDigi.cc
+++ b/DataFormats/CSCDigi/src/CSCWireDigi.cc
@@ -9,73 +9,76 @@
 #include <iostream>
 #include <cstdint>
 
-  /// Constructors
+/// Constructors
 
-CSCWireDigi::CSCWireDigi (int wire, unsigned int tbinb){
+CSCWireDigi::CSCWireDigi(int wire, unsigned int tbinb) {
   /// Wire group number in the digi (16 lower bits from the wire group number)
-  wire_  = wire & 0x0000FFFF;
+  wire_ = wire & 0x0000FFFF;
   tbinb_ = tbinb;
   /// BX in the wire digis (16 upper bits from the wire group number)
-  wireBX_= (wire >> 16) & 0x0000FFFF;
-  /// BX wire group combination 
-  wireBXandWires_=wire;
+  wireBX_ = (wire >> 16) & 0x0000FFFF;
+  /// BX wire group combination
+  wireBXandWires_ = wire;
 }
 
-   /// Default
-CSCWireDigi::CSCWireDigi (){
+/// Default
+CSCWireDigi::CSCWireDigi() {
   wire_ = 0;
   tbinb_ = 0;
-  wireBX_=0;
-  wireBXandWires_=0;
+  wireBX_ = 0;
+  wireBXandWires_ = 0;
 }
 
-  /// return tbin number (obsolete, use getTimeBin() instead)
-int CSCWireDigi::getBeamCrossingTag() const {
-  return getTimeBin();
-}
-  /// return first tbin ON number
+/// return tbin number (obsolete, use getTimeBin() instead)
+int CSCWireDigi::getBeamCrossingTag() const { return getTimeBin(); }
+/// return first tbin ON number
 int CSCWireDigi::getTimeBin() const {
-  uint32_t tbit=1;
-  int tbin=-1;
-  for(int i=0;i<32;i++) {
-    if(tbit & tbinb_) tbin=i;
-    if(tbin>-1) break;
-    tbit=tbit<<1;
+  uint32_t tbit = 1;
+  int tbin = -1;
+  for (int i = 0; i < 32; i++) {
+    if (tbit & tbinb_)
+      tbin = i;
+    if (tbin > -1)
+      break;
+    tbit = tbit << 1;
   }
   return tbin;
 }
-  /// return vector of time bins ON
+/// return vector of time bins ON
 std::vector<int> CSCWireDigi::getTimeBinsOn() const {
   std::vector<int> tbins;
-  uint32_t tbit=tbinb_;
-  uint32_t one=1;
-  for(int i=0;i<32;i++) {
-    if(tbit & one) tbins.push_back(i);
-    tbit=tbit>>1;
-    if(tbit==0) break;
+  uint32_t tbit = tbinb_;
+  uint32_t one = 1;
+  for (int i = 0; i < 32; i++) {
+    if (tbit & one)
+      tbins.push_back(i);
+    tbit = tbit >> 1;
+    if (tbit == 0)
+      break;
   }
   return tbins;
 }
 
-  /// Debug
+/// Debug
 
 void CSCWireDigi::print() const {
   std::ostringstream ost;
   ost << "CSCWireDigi | wg " << getWireGroup() << " | "
       << " BX # " << getWireGroupBX() << " | "
-      << " BX + Wire " << std::hex << getBXandWireGroup() << " | " << std::dec
-      << " First Time Bin On " << getTimeBin() << " | Time Bins On ";
-  std::vector<int> tbins=getTimeBinsOn();
-  for(unsigned int i=0; i<tbins.size();i++) {ost << tbins[i] << " ";}
+      << " BX + Wire " << std::hex << getBXandWireGroup() << " | " << std::dec << " First Time Bin On " << getTimeBin()
+      << " | Time Bins On ";
+  std::vector<int> tbins = getTimeBinsOn();
+  for (unsigned int i = 0; i < tbins.size(); i++) {
+    ost << tbins[i] << " ";
+  }
   edm::LogVerbatim("CSCDigi") << ost.str();
 }
 
-std::ostream & operator<<(std::ostream & o, const CSCWireDigi& digi) {
-  o << " CSC Wire " << digi.getWireGroup()
-           << " CSC Wire First Time Bin On " << digi.getTimeBin()
-           << " CSC Time Bins On ";
-  for (unsigned int i = 0; i<digi.getTimeBinsOn().size(); ++i ){
-    o <<" " <<digi.getTimeBinsOn()[i]; }
+std::ostream& operator<<(std::ostream& o, const CSCWireDigi& digi) {
+  o << " CSC Wire " << digi.getWireGroup() << " CSC Wire First Time Bin On " << digi.getTimeBin()
+    << " CSC Time Bins On ";
+  for (unsigned int i = 0; i < digi.getTimeBinsOn().size(); ++i) {
+    o << " " << digi.getTimeBinsOn()[i];
+  }
   return o;
 }
-
diff --git a/DataFormats/CSCDigi/src/classes.h b/DataFormats/CSCDigi/src/classes.h
index cdd118633656b..3fd68a54e4e96 100644
--- a/DataFormats/CSCDigi/src/classes.h
+++ b/DataFormats/CSCDigi/src/classes.h
@@ -37,4 +37,3 @@ struct GEMCSCLCTDigiCollection {};
 #include "DataFormats/Common/interface/Wrapper.h"
 #include <vector>
 #include <map>
-
diff --git a/DataFormats/CSCDigi/test/testCSCDigis.cpp b/DataFormats/CSCDigi/test/testCSCDigis.cpp
index ef03882e45050..40c75d34ae363 100644
--- a/DataFormats/CSCDigi/test/testCSCDigis.cpp
+++ b/DataFormats/CSCDigi/test/testCSCDigis.cpp
@@ -16,7 +16,7 @@
 
 #include "DataFormats/CSCDigi/interface/CSCWireDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
-                                                                                
+
 #include "DataFormats/CSCDigi/interface/CSCComparatorDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h"
 
@@ -52,19 +52,18 @@
 
 using namespace std;
 
-CSCIdType makeCSCId(const uint16_t crateId, const uint16_t dmbId) 
-        { return ( (CSCIdType(crateId&0xFF)<<4) | (dmbId&0xF) ); }
-
-class testCSCDigis: public CppUnit::TestFixture {
+CSCIdType makeCSCId(const uint16_t crateId, const uint16_t dmbId) {
+  return ((CSCIdType(crateId & 0xFF) << 4) | (dmbId & 0xF));
+}
 
+class testCSCDigis : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testCSCDigis);
   CPPUNIT_TEST(testDigiCollectionPut);
   CPPUNIT_TEST_SUITE_END();
 
 public:
-
-  void setUp(){}
-  void tearDown(){}  
+  void setUp() {}
+  void tearDown() {}
 
   void fillCSCWireDigi(CSCWireDigiCollection &);
   void fillCSCComparatorDigi(CSCComparatorDigiCollection &);
@@ -76,7 +75,7 @@ class testCSCDigis: public CppUnit::TestFixture {
   void fillCSCCFEBStatusDigi(CSCCFEBStatusDigiCollection &);
   void fillCSCTMBStatusDigi(CSCTMBStatusDigiCollection &);
   void fillCSCDCCFormatStatusDigi(CSCDCCFormatStatusDigiCollection &);
-//  void fillCSCEventFormatStatusDigi(CSCEventFormatStatusDigiCollection &);
+  //  void fillCSCEventFormatStatusDigi(CSCEventFormatStatusDigiCollection &);
 
   void readCSCWireDigi(CSCWireDigiCollection &);
   void readCSCComparatorDigi(CSCComparatorDigiCollection &);
@@ -88,263 +87,252 @@ class testCSCDigis: public CppUnit::TestFixture {
   void readCSCCFEBStatusDigi(CSCCFEBStatusDigiCollection &);
   void readCSCTMBStatusDigi(CSCTMBStatusDigiCollection &);
   void readCSCDCCFormatStatusDigi(CSCDCCFormatStatusDigiCollection &);
-//  void readCSCEventFormatStatusDigi(CSCEventFormatStatusDigiCollection &);
+  //  void readCSCEventFormatStatusDigi(CSCEventFormatStatusDigiCollection &);
 
   void testDigiCollectionPut();
-}; 
+};
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testCSCDigis);
 
-
-void testCSCDigis::fillCSCWireDigi(CSCWireDigiCollection & collection){
-
-  for(int endcp=1; endcp<3; endcp++)
-   for(int stn=1; stn<5; stn++)
-    for(int rng=1; rng<4; rng++)
-     for(int csc=1; csc<37; csc++)
-      for(int pln=1; pln<7; pln++) {
-  
-       CSCDetId detid(endcp,stn,rng,csc,pln);
-                                                                                
-       std::vector<CSCWireDigi> digivec;
-       for (int i=10; i<11; ++i){
-           int wire=i;
-//           int tbin=104; // Time bins 3,5,6 - Bits 3,5,6 ON i.e. 
-                                  // 64+32+8 = 1101000 in binary
-           unsigned int tbinb=0, tbit=1;
-           for(int j=0;j<32;j++) {
-              if(j==0 || j==3 || j==5 || j==6 || j==31) tbinb=tbinb+tbit;
-              tbit=tbit<<1;
-                          // Time bins 0,3,5,6,31 - Bits 0,3,5,6,31 ON i.e
-                          // in binary - 0b10000000000000000000000001101001
-           } 
-           CSCWireDigi digi(wire,tbinb);
-           digivec.push_back(digi);
-        }
-  
-        collection.put(std::make_pair(digivec.begin(),digivec.end()),detid);
-  
-      } // end of for(int endcp=1 ...for(int pln=1 ...) 
+void testCSCDigis::fillCSCWireDigi(CSCWireDigiCollection &collection) {
+  for (int endcp = 1; endcp < 3; endcp++)
+    for (int stn = 1; stn < 5; stn++)
+      for (int rng = 1; rng < 4; rng++)
+        for (int csc = 1; csc < 37; csc++)
+          for (int pln = 1; pln < 7; pln++) {
+            CSCDetId detid(endcp, stn, rng, csc, pln);
+
+            std::vector<CSCWireDigi> digivec;
+            for (int i = 10; i < 11; ++i) {
+              int wire = i;
+              //           int tbin=104; // Time bins 3,5,6 - Bits 3,5,6 ON i.e.
+              // 64+32+8 = 1101000 in binary
+              unsigned int tbinb = 0, tbit = 1;
+              for (int j = 0; j < 32; j++) {
+                if (j == 0 || j == 3 || j == 5 || j == 6 || j == 31)
+                  tbinb = tbinb + tbit;
+                tbit = tbit << 1;
+                // Time bins 0,3,5,6,31 - Bits 0,3,5,6,31 ON i.e
+                // in binary - 0b10000000000000000000000001101001
+              }
+              CSCWireDigi digi(wire, tbinb);
+              digivec.push_back(digi);
+            }
+
+            collection.put(std::make_pair(digivec.begin(), digivec.end()), detid);
+
+          }  // end of for(int endcp=1 ...for(int pln=1 ...)
 }
 
-void testCSCDigis::fillCSCComparatorDigi(CSCComparatorDigiCollection & collection){
+void testCSCDigis::fillCSCComparatorDigi(CSCComparatorDigiCollection &collection) {
+  for (int endcp = 1; endcp < 3; endcp++)
+    for (int stn = 1; stn < 5; stn++)
+      for (int rng = 1; rng < 4; rng++)
+        for (int csc = 1; csc < 37; csc++)
+          for (int pln = 1; pln < 7; pln++) {
+            CSCDetId detid(endcp, stn, rng, csc, pln);
+
+            std::vector<CSCComparatorDigi> digivec;
+            for (int i = 10; i < 11; ++i) {
+              int aStrip = i;
+              int aComparator = 2;
+              int aTbin = 6;  // time bin word 0...110 (16-bits) bits 1 and 2 ON
+              CSCComparatorDigi digi(aStrip, aComparator, aTbin);
+              digivec.push_back(digi);
+            }
+
+            collection.put(std::make_pair(digivec.begin(), digivec.end()), detid);
+
+          }  // end of for(int endcp=1 ...for(int pln=1 ...)
+}
 
-  for(int endcp=1; endcp<3; endcp++)
-   for(int stn=1; stn<5; stn++)
-    for(int rng=1; rng<4; rng++)
-     for(int csc=1; csc<37; csc++)
-      for(int pln=1; pln<7; pln++) {
- 
-       CSCDetId detid(endcp,stn,rng,csc,pln);
- 
-       std::vector<CSCComparatorDigi> digivec;
-       for (int i=10; i<11; ++i){
-           int aStrip = i;
-           int aComparator = 2;
-	   int aTbin = 6; // time bin word 0...110 (16-bits) bits 1 and 2 ON
-	   CSCComparatorDigi digi(aStrip, aComparator, aTbin);
-           digivec.push_back(digi);
-        }
- 
-        collection.put(std::make_pair(digivec.begin(), digivec.end()),detid);
- 
-      } // end of for(int endcp=1 ...for(int pln=1 ...)
+void testCSCDigis::fillCSCStripDigi(CSCStripDigiCollection &collection) {
+  for (int endcp = 1; endcp < 3; endcp++)
+    for (int stn = 1; stn < 5; stn++)
+      for (int rng = 1; rng < 4; rng++)
+        for (int csc = 1; csc < 37; csc++)
+          for (int pln = 1; pln < 7; pln++) {
+            CSCDetId detid(endcp, stn, rng, csc, pln);
+
+            std::vector<CSCStripDigi> digivec;
+            for (int i = 10; i < 11; ++i) {
+              int aStrip = i;
+              std::vector<int> someADCCounts(8);
+              someADCCounts[0] = 9;
+              someADCCounts[1] = 11;
+              someADCCounts[2] = 23;
+              someADCCounts[3] = 51;
+              someADCCounts[4] = 102;
+              someADCCounts[5] = 88;
+              someADCCounts[6] = 48;
+              someADCCounts[7] = 19;
+
+              std::vector<uint16_t> someVec(8);
+
+              CSCStripDigi digi(aStrip, someADCCounts, someVec, someVec, someVec);
+              digivec.push_back(digi);
+            }
+
+            collection.put(std::make_pair(digivec.begin(), digivec.end()), detid);
+
+          }  // end of for(int endcp=1 ...for(int pln=1 ...)
 }
 
-void testCSCDigis::fillCSCStripDigi(CSCStripDigiCollection & collection){
+void testCSCDigis::fillCSCRPCDigi(CSCRPCDigiCollection &collection) {
+  ///rpc digis need to be tested using
+  ///CSCDetIDs and CSC relevant RAT readout A.T.
 
-  for(int endcp=1; endcp<3; endcp++)
-   for(int stn=1; stn<5; stn++)
-    for(int rng=1; rng<4; rng++)
-     for(int csc=1; csc<37; csc++)
-      for(int pln=1; pln<7; pln++) {
- 
-       CSCDetId detid(endcp,stn,rng,csc,pln);
- 
-       std::vector<CSCStripDigi> digivec;
-       for (int i=10; i<11; ++i){
-           int aStrip = i;
-           std::vector<int> someADCCounts(8);
-           someADCCounts[0] = 9;
-           someADCCounts[1] = 11;
-           someADCCounts[2] = 23;
-           someADCCounts[3] = 51;
-           someADCCounts[4] = 102;
-           someADCCounts[5] = 88;
-           someADCCounts[6] = 48;
-           someADCCounts[7] = 19;
-
-	   std::vector<uint16_t> someVec(8);
-
-	   CSCStripDigi digi(aStrip, someADCCounts, someVec, someVec, someVec);
-           digivec.push_back(digi);
-        }
- 
-        collection.put(std::make_pair(digivec.begin(), digivec.end()),detid);
- 
-      } // end of for(int endcp=1 ...for(int pln=1 ...) 
+  for (int endcp = 1; endcp < 3; endcp++)
+    for (int stn = 1; stn < 5; stn++)
+      for (int rng = 1; rng < 4; rng++)
+        for (int csc = 1; csc < 37; csc++)
+          for (int pln = 3; pln < 4; pln++) {  // ALCT primitives are for layer 3 only
+
+            CSCDetId detid(endcp, stn, rng, csc, pln);
+
+            std::vector<CSCRPCDigi> digivec;
+            for (int i = 5; i < 6; ++i) {
+              int rpc = i;
+              int bxn = 1;
+              int pad = 1;
+              int tbin = 3;
+              CSCRPCDigi digi(rpc, pad, bxn, tbin);
+              digivec.push_back(digi);
+            }
+
+            collection.put(std::make_pair(digivec.begin(), digivec.end()), detid);
+          }
 }
 
-void testCSCDigis::fillCSCRPCDigi(CSCRPCDigiCollection & collection){
-  ///rpc digis need to be tested using 
-  ///CSCDetIDs and CSC relevant RAT readout A.T.
+void testCSCDigis::fillCSCALCTDigi(CSCALCTDigiCollection &collection) {
+  for (int endcp = 1; endcp < 3; endcp++)
+    for (int stn = 1; stn < 5; stn++)
+      for (int rng = 1; rng < 4; rng++)
+        for (int csc = 1; csc < 37; csc++)
+          for (int pln = 3; pln < 4; pln++) {  // ALCT primitives are for layer 3 only
 
-  for(int endcp=1; endcp<3; endcp++)
-    for(int stn=1; stn<5; stn++)
-      for(int rng=1; rng<4; rng++)
-	for(int csc=1; csc<37; csc++)
-	  for(int pln=3; pln<4; pln++) {  // ALCT primitives are for layer 3 only
-   
-	    CSCDetId detid(endcp,stn,rng,csc,pln);
-   
-	    std::vector<CSCRPCDigi> digivec;
-	    for (int i=5; i<6; ++i){
-	      int rpc=i;
-	      int bxn=1;
-	      int pad=1;
-	      int tbin=3;
-	      CSCRPCDigi digi(rpc, pad, bxn, tbin);
-	      digivec.push_back(digi);
-	    }
- 
-	    collection.put(std::make_pair(digivec.begin(),digivec.end()),detid);
-	  }
+            CSCDetId detid(endcp, stn, rng, csc, pln);
 
-}
+            std::vector<CSCALCTDigi> digivec;
+            for (int i = 1; i < 3; ++i) {
+              int valid = 1;
+              int quality = 3;
+              int accel = 0;
+              int patternb = 1;
+              int keywire = 16;
+              int bx = 4;
+              int trknmb = 1;
 
-void testCSCDigis::fillCSCALCTDigi(CSCALCTDigiCollection & collection){
- 
-  for(int endcp=1; endcp<3; endcp++)
-   for(int stn=1; stn<5; stn++)
-    for(int rng=1; rng<4; rng++)
-     for(int csc=1; csc<37; csc++)
-      for(int pln=3; pln<4; pln++) {  // ALCT primitives are for layer 3 only
-   
-       CSCDetId detid(endcp,stn,rng,csc,pln);
-                                                                                
-       std::vector<CSCALCTDigi> digivec;
-       for (int i=1; i<3; ++i){
-           int valid=1;
-           int quality=3;
-           int accel=0;
-           int patternb=1;
-           int keywire=16;
-           int bx=4;
-           int trknmb=1;
-
-           CSCALCTDigi digi(valid,quality,accel,patternb,keywire,bx,trknmb);
-           digivec.push_back(digi);
-        }
-        
-        collection.put(std::make_pair(digivec.begin(),digivec.end()),detid);
+              CSCALCTDigi digi(valid, quality, accel, patternb, keywire, bx, trknmb);
+              digivec.push_back(digi);
+            }
 
-      } // end of for(int endcp=1 ...for(int pln=1 ...)
-}
+            collection.put(std::make_pair(digivec.begin(), digivec.end()), detid);
 
-void testCSCDigis::fillCSCCLCTDigi(CSCCLCTDigiCollection & collection){
-  
-  for(int endcp=1; endcp<3; endcp++)
-   for(int stn=1; stn<5; stn++)
-    for(int rng=1; rng<4; rng++)
-     for(int csc=1; csc<37; csc++)
-      for(int pln=3; pln<4; pln++) {  // CLCT primitives are for layer 3 only
-    
-       CSCDetId detid(endcp,stn,rng,csc,pln);
-                                                                                
-       std::vector<CSCCLCTDigi> digivec;
-       for (int i=1; i<3; ++i){
-           int valid=1;
-           int quality=3;
-           int patshape=2;
-           int striptype=1;
-           int bend=0;
-           int strip=16;
-           int cfeb=5;
-           int bx=3;
-           int trknmb=1;
- 
-           CSCCLCTDigi digi(valid, quality, patshape, striptype, bend, strip, cfeb, bx, trknmb);
-           digivec.push_back(digi);
-        }
-        
-collection.put(std::make_pair(digivec.begin(),digivec.end()),detid);
- 
-      } // end of for(int endcp=1 ...for(int pln=1 ...)
+          }  // end of for(int endcp=1 ...for(int pln=1 ...)
 }
 
-void testCSCDigis::fillCSCCorrLCTDigi(CSCCorrelatedLCTDigiCollection & collection)
-{
-  for(int endcap = 1; endcap <=2; ++endcap)
-    for(int station = 1; station <=4; ++station)
-      for(int ring = 1; ring <= ((station == 1) ? 3 : 2); ++ring)
-	for(int chamber = 1; chamber <= ((ring == 1 && station != 1) ? 18 : 36); ++chamber)
-	  for(int layer = 3; layer <=3; ++layer)
-	    {
-	      CSCDetId detid(endcap,station,ring,chamber,layer);
-	      std::vector<CSCCorrelatedLCTDigi> digivec;
-
-	      for(int trknmb = 1; trknmb <=2 ; ++trknmb)
-                {
-		  int valid = 1;
-		  int quality = 15;
-		  int pattern = 2;
-		  int strip = 16;
-		  int keywire = 10;
-		  int bend = 1;
-		  int bx = 0;
-		  int mpclink = 1;
-
-		  CSCCorrelatedLCTDigi digi(trknmb,valid,quality,keywire,strip,pattern,bend,bx,mpclink);
-		  digivec.push_back(digi);
-		}
-	      collection.put(std::make_pair(digivec.begin(),digivec.end()),detid);
-	    }
+void testCSCDigis::fillCSCCLCTDigi(CSCCLCTDigiCollection &collection) {
+  for (int endcp = 1; endcp < 3; endcp++)
+    for (int stn = 1; stn < 5; stn++)
+      for (int rng = 1; rng < 4; rng++)
+        for (int csc = 1; csc < 37; csc++)
+          for (int pln = 3; pln < 4; pln++) {  // CLCT primitives are for layer 3 only
+
+            CSCDetId detid(endcp, stn, rng, csc, pln);
+
+            std::vector<CSCCLCTDigi> digivec;
+            for (int i = 1; i < 3; ++i) {
+              int valid = 1;
+              int quality = 3;
+              int patshape = 2;
+              int striptype = 1;
+              int bend = 0;
+              int strip = 16;
+              int cfeb = 5;
+              int bx = 3;
+              int trknmb = 1;
+
+              CSCCLCTDigi digi(valid, quality, patshape, striptype, bend, strip, cfeb, bx, trknmb);
+              digivec.push_back(digi);
+            }
+
+            collection.put(std::make_pair(digivec.begin(), digivec.end()), detid);
+
+          }  // end of for(int endcp=1 ...for(int pln=1 ...)
 }
 
-void testCSCDigis::fillCSCCFEBStatusDigi(CSCCFEBStatusDigiCollection & collection){
+void testCSCDigis::fillCSCCorrLCTDigi(CSCCorrelatedLCTDigiCollection &collection) {
+  for (int endcap = 1; endcap <= 2; ++endcap)
+    for (int station = 1; station <= 4; ++station)
+      for (int ring = 1; ring <= ((station == 1) ? 3 : 2); ++ring)
+        for (int chamber = 1; chamber <= ((ring == 1 && station != 1) ? 18 : 36); ++chamber)
+          for (int layer = 3; layer <= 3; ++layer) {
+            CSCDetId detid(endcap, station, ring, chamber, layer);
+            std::vector<CSCCorrelatedLCTDigi> digivec;
+
+            for (int trknmb = 1; trknmb <= 2; ++trknmb) {
+              int valid = 1;
+              int quality = 15;
+              int pattern = 2;
+              int strip = 16;
+              int keywire = 10;
+              int bend = 1;
+              int bx = 0;
+              int mpclink = 1;
+
+              CSCCorrelatedLCTDigi digi(trknmb, valid, quality, keywire, strip, pattern, bend, bx, mpclink);
+              digivec.push_back(digi);
+            }
+            collection.put(std::make_pair(digivec.begin(), digivec.end()), detid);
+          }
+}
 
-  for(int endcp=1; endcp<3; endcp++)
-   for(int stn=1; stn<5; stn++)
-    for(int rng=1; rng<4; rng++)
-      for(int csc=1; csc<37; csc++) {
- 
-       CSCDetId detid(endcp,stn,rng,csc,0);
- 
-       std::vector<CSCCFEBStatusDigi> digivec;
-       for (int i=1; i<6; ++i) // loop over cfeb=1-5
-       {
-           int aCfeb = i;
-           CSCCFEBStatusDigi digi(aCfeb);
-           std::vector<uint16_t> crc(8,0); crc[0]=1;crc[7]=8;
-           digi.setCRC(crc);
-           std::vector<uint16_t> scac(8,0); scac[0]=11;scac[7]=18;
-           scac[0]=scac[0]+256+2048+4096+8192+16384+32768;
-           scac[7]=scac[7]+256+2048+4096+8192+16384+32768;
-           digi.setSCAC(scac);
-           digivec.push_back(digi);
-       }
- 
-        collection.put(std::make_pair(digivec.begin(), digivec.end()),detid);
- 
-      } // end of for(int endcp=1 ...for(int csc=1 ...) 
+void testCSCDigis::fillCSCCFEBStatusDigi(CSCCFEBStatusDigiCollection &collection) {
+  for (int endcp = 1; endcp < 3; endcp++)
+    for (int stn = 1; stn < 5; stn++)
+      for (int rng = 1; rng < 4; rng++)
+        for (int csc = 1; csc < 37; csc++) {
+          CSCDetId detid(endcp, stn, rng, csc, 0);
+
+          std::vector<CSCCFEBStatusDigi> digivec;
+          for (int i = 1; i < 6; ++i)  // loop over cfeb=1-5
+          {
+            int aCfeb = i;
+            CSCCFEBStatusDigi digi(aCfeb);
+            std::vector<uint16_t> crc(8, 0);
+            crc[0] = 1;
+            crc[7] = 8;
+            digi.setCRC(crc);
+            std::vector<uint16_t> scac(8, 0);
+            scac[0] = 11;
+            scac[7] = 18;
+            scac[0] = scac[0] + 256 + 2048 + 4096 + 8192 + 16384 + 32768;
+            scac[7] = scac[7] + 256 + 2048 + 4096 + 8192 + 16384 + 32768;
+            digi.setSCAC(scac);
+            digivec.push_back(digi);
+          }
+
+          collection.put(std::make_pair(digivec.begin(), digivec.end()), detid);
+
+        }  // end of for(int endcp=1 ...for(int csc=1 ...)
 }
 
-void testCSCDigis::fillCSCTMBStatusDigi(CSCTMBStatusDigiCollection & collection) {
-  for(int endcp=1; endcp<3; endcp++)
-   for(int stn=1; stn<5; stn++)
-    for(int rng=1; rng<4; rng++)
-      for(int csc=1; csc<37; csc++) {
-                                                                                
-       CSCDetId detid(endcp,stn,rng,csc,0);
-                                                                                
-       std::vector<CSCTMBStatusDigi> digivec;
-       CSCTMBStatusDigi digi;
-       digivec.push_back(digi);
-                                                                                
-       collection.put(std::make_pair(digivec.begin(), digivec.end()),detid);
-                                                                                
-      } // end of for(int endcp=1 ...for(int csc=1 ...)
+void testCSCDigis::fillCSCTMBStatusDigi(CSCTMBStatusDigiCollection &collection) {
+  for (int endcp = 1; endcp < 3; endcp++)
+    for (int stn = 1; stn < 5; stn++)
+      for (int rng = 1; rng < 4; rng++)
+        for (int csc = 1; csc < 37; csc++) {
+          CSCDetId detid(endcp, stn, rng, csc, 0);
+
+          std::vector<CSCTMBStatusDigi> digivec;
+          CSCTMBStatusDigi digi;
+          digivec.push_back(digi);
+
+          collection.put(std::make_pair(digivec.begin(), digivec.end()), detid);
+
+        }  // end of for(int endcp=1 ...for(int csc=1 ...)
 }
 /*
 void testCSCDigis::fillCSCDCCFormatStatusDigi(CSCDCCFormatStatusDigiCollection & collection){
@@ -371,262 +359,279 @@ void testCSCDigis::fillCSCDCCFormatStatusDigi(CSCDCCFormatStatusDigiCollection &
   collection.put(std::make_pair(digivec.begin(), digivec.end()),detid);
 }
 */
-void testCSCDigis::fillCSCDCCFormatStatusDigi(CSCDCCFormatStatusDigiCollection & collection)
-{
+void testCSCDigis::fillCSCDCCFormatStatusDigi(CSCDCCFormatStatusDigiCollection &collection) {
   std::vector<CSCDCCFormatStatusDigi> digivec;
-  CSCDetId detid(0,0,0,0,0);
-  for(int dcc=FEDNumbering::MINCSCFEDID; dcc<FEDNumbering::MAXCSCFEDID; dcc++) {
-            
-           CSCDCCFormatStatusDigi digi(dcc);
+  CSCDetId detid(0, 0, 0, 0, 0);
+  for (int dcc = FEDNumbering::MINCSCFEDID; dcc < FEDNumbering::MAXCSCFEDID; dcc++) {
+    CSCDCCFormatStatusDigi digi(dcc);
 #ifdef DEBUG
-	   digi.setDCCId(dcc);
-	   digi.setDCCMask(0x111);
-	   digi.setCSCMask(0x01);
-	   for (int i=1; i<5; i++)
-	   	digi.setDDUErrors(i, i);
-	   for (int i=40; i<50;i++) 
-		for (int j=1; j<10; j++) {
-			digi.setCSCPayload(makeCSCId(i,j),i*j);
-			digi.setCSCErrors(makeCSCId(i,j),i*j);
-		}
+    digi.setDCCId(dcc);
+    digi.setDCCMask(0x111);
+    digi.setCSCMask(0x01);
+    for (int i = 1; i < 5; i++)
+      digi.setDDUErrors(i, i);
+    for (int i = 40; i < 50; i++)
+      for (int j = 1; j < 10; j++) {
+        digi.setCSCPayload(makeCSCId(i, j), i * j);
+        digi.setCSCErrors(makeCSCId(i, j), i * j);
+      }
 #endif
-           digivec.push_back(digi);
-    }
-  collection.put(std::make_pair(digivec.begin(), digivec.end()),detid);
-} 
+    digivec.push_back(digi);
+  }
+  collection.put(std::make_pair(digivec.begin(), digivec.end()), detid);
+}
 
-void testCSCDigis::readCSCCorrLCTDigi(CSCCorrelatedLCTDigiCollection & collection)
-{
+void testCSCDigis::readCSCCorrLCTDigi(CSCCorrelatedLCTDigiCollection &collection) {
   int count = 0;
   CSCCorrelatedLCTDigiCollection::DigiRangeIterator detUnitIt;
 
-  for(detUnitIt = collection.begin() ; detUnitIt != collection.end();
-      detUnitIt++)
-    {
-      const CSCDetId& id = (*detUnitIt).first;
-
-      const CSCCorrelatedLCTDigiCollection::Range& range = (*detUnitIt).second;
-
-      for(CSCCorrelatedLCTDigiCollection::const_iterator digiIt = range.first;
-	  digiIt != range.second; digiIt++)
-	{
-	  ++count;
-	  CPPUNIT_ASSERT(digiIt->isValid() == 1);
-	  CPPUNIT_ASSERT(digiIt->getQuality() == 15);
-	  CPPUNIT_ASSERT(digiIt->getCLCTPattern() == 2);
-	  CPPUNIT_ASSERT(digiIt->getStrip() == 16);
-	  CPPUNIT_ASSERT(digiIt->getKeyWG() == 10);
-	  CPPUNIT_ASSERT(digiIt->getBend() == 1);
-	  CPPUNIT_ASSERT(digiIt->getBX() == 0);
-	  
-	  std::cout << "CSC Correlated LCT - endcap station ring csc layer LCT# Quality: " << id.endcap() << " " << id.station()
-		    << " " << id.ring() << " " << id.chamber() << " " << id.layer() << " " << digiIt->getTrknmb() << " " 
-		    << digiIt->getQuality() << std::endl;
-	}
+  for (detUnitIt = collection.begin(); detUnitIt != collection.end(); detUnitIt++) {
+    const CSCDetId &id = (*detUnitIt).first;
+
+    const CSCCorrelatedLCTDigiCollection::Range &range = (*detUnitIt).second;
+
+    for (CSCCorrelatedLCTDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; digiIt++) {
+      ++count;
+      CPPUNIT_ASSERT(digiIt->isValid() == 1);
+      CPPUNIT_ASSERT(digiIt->getQuality() == 15);
+      CPPUNIT_ASSERT(digiIt->getCLCTPattern() == 2);
+      CPPUNIT_ASSERT(digiIt->getStrip() == 16);
+      CPPUNIT_ASSERT(digiIt->getKeyWG() == 10);
+      CPPUNIT_ASSERT(digiIt->getBend() == 1);
+      CPPUNIT_ASSERT(digiIt->getBX() == 0);
+
+      std::cout << "CSC Correlated LCT - endcap station ring csc layer LCT# Quality: " << id.endcap() << " "
+                << id.station() << " " << id.ring() << " " << id.chamber() << " " << id.layer() << " "
+                << digiIt->getTrknmb() << " " << digiIt->getQuality() << std::endl;
     }
+  }
   std::cout << "CSC Correlated LCT Digi count - " << count << std::endl;
 }
 
-void testCSCDigis::readCSCWireDigi(CSCWireDigiCollection & collection){
+void testCSCDigis::readCSCWireDigi(CSCWireDigiCollection &collection) {
+  int count = 0;
+  CSCWireDigiCollection::DigiRangeIterator detUnitIt;
+  for (detUnitIt = collection.begin(); detUnitIt != collection.end(); ++detUnitIt) {
+    const CSCDetId &id = (*detUnitIt).first;
+    const CSCWireDigiCollection::Range &range = (*detUnitIt).second;
 
-        int count=0;
-        CSCWireDigiCollection::DigiRangeIterator detUnitIt;
-        for (detUnitIt=collection.begin(); detUnitIt!=collection.end(); ++detUnitIt) {
-  
-          const CSCDetId& id = (*detUnitIt).first;
-          const CSCWireDigiCollection::Range& range =(*detUnitIt).second;
- 
-          for (CSCWireDigiCollection::const_iterator digiIt=range.first; digiIt!=range.second; ++digiIt) {
-  
-            count++;
-            CPPUNIT_ASSERT((*digiIt).getWireGroup()==10);
-            CPPUNIT_ASSERT((*digiIt).getTimeBin()==0);
-            printf("CSC Wire - endcap station ring csc layer wire tbin: %3d %3d %3d %3d %3d %3d  %3d\n",
-               id.endcap(),id.station(),id.ring(),id.chamber(),id.layer(),
-               (*digiIt).getWireGroup(),(*digiIt).getTimeBin());
-            std::cout << " CSC Wire Time Bins On ";
-            std::vector<int> tbins=(*digiIt).getTimeBinsOn();
-            for(unsigned int i=0; i<tbins.size();++i) std::cout<<tbins[i]<<" ";
-            std::cout<<std::endl; 
-            std::cout << " CSC Wire Word with Time Bins Bits On "
-                      <<(*digiIt).getTimeBinWord()<<std::endl;
-          }// for digis in layer
-        }// end of for (detUnitIt=...
-
-    printf("CSC Wire count:  %3d \n", count);
-} 
-
-void testCSCDigis::readCSCComparatorDigi(CSCComparatorDigiCollection & collection){
-
-  int count=0;
+    for (CSCWireDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) {
+      count++;
+      CPPUNIT_ASSERT((*digiIt).getWireGroup() == 10);
+      CPPUNIT_ASSERT((*digiIt).getTimeBin() == 0);
+      printf("CSC Wire - endcap station ring csc layer wire tbin: %3d %3d %3d %3d %3d %3d  %3d\n",
+             id.endcap(),
+             id.station(),
+             id.ring(),
+             id.chamber(),
+             id.layer(),
+             (*digiIt).getWireGroup(),
+             (*digiIt).getTimeBin());
+      std::cout << " CSC Wire Time Bins On ";
+      std::vector<int> tbins = (*digiIt).getTimeBinsOn();
+      for (unsigned int i = 0; i < tbins.size(); ++i)
+        std::cout << tbins[i] << " ";
+      std::cout << std::endl;
+      std::cout << " CSC Wire Word with Time Bins Bits On " << (*digiIt).getTimeBinWord() << std::endl;
+    }  // for digis in layer
+  }    // end of for (detUnitIt=...
+
+  printf("CSC Wire count:  %3d \n", count);
+}
+
+void testCSCDigis::readCSCComparatorDigi(CSCComparatorDigiCollection &collection) {
+  int count = 0;
   CSCComparatorDigiCollection::DigiRangeIterator detUnitIt;
-  for (detUnitIt=collection.begin(); detUnitIt!=collection.end(); ++detUnitIt) {
- 
-    const CSCDetId& id = (*detUnitIt).first;
-    const CSCComparatorDigiCollection::Range& range = (*detUnitIt).second;
+  for (detUnitIt = collection.begin(); detUnitIt != collection.end(); ++detUnitIt) {
+    const CSCDetId &id = (*detUnitIt).first;
+    const CSCComparatorDigiCollection::Range &range = (*detUnitIt).second;
 
-    for (CSCComparatorDigiCollection::const_iterator digiIt=range.first; digiIt!=range.second; ++digiIt) {
+    for (CSCComparatorDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) {
       count++;
-      CPPUNIT_ASSERT((*digiIt).getComparator()==2);
-      CPPUNIT_ASSERT((*digiIt).getStrip()==10);
-      CPPUNIT_ASSERT((*digiIt).getTimeBin()==1); // time bin word=6 means bit 1 should be first!
-      printf("CSCComparatorDigi - endcap station ring csc layer strip comparator time: %3d %3d %3d %3d %3d %3d %3d %3d\n",
-         id.endcap(),id.station(),id.ring(),id.chamber(),id.layer(),
-	     (*digiIt).getStrip(), (*digiIt).getComparator(), (*digiIt).getTimeBin());
+      CPPUNIT_ASSERT((*digiIt).getComparator() == 2);
+      CPPUNIT_ASSERT((*digiIt).getStrip() == 10);
+      CPPUNIT_ASSERT((*digiIt).getTimeBin() == 1);  // time bin word=6 means bit 1 should be first!
+      printf(
+          "CSCComparatorDigi - endcap station ring csc layer strip comparator time: %3d %3d %3d %3d %3d %3d %3d %3d\n",
+          id.endcap(),
+          id.station(),
+          id.ring(),
+          id.chamber(),
+          id.layer(),
+          (*digiIt).getStrip(),
+          (*digiIt).getComparator(),
+          (*digiIt).getTimeBin());
       std::cout << " CSCComparatorDigi - time bins ON: ";
-      std::vector<int> tbins=(*digiIt).getTimeBinsOn();
-      for(unsigned int i=0; i<tbins.size();++i) std::cout<<tbins[i]<<" ";
-      std::cout<<std::endl; 
+      std::vector<int> tbins = (*digiIt).getTimeBinsOn();
+      for (unsigned int i = 0; i < tbins.size(); ++i)
+        std::cout << tbins[i] << " ";
+      std::cout << std::endl;
+
+    }  // for digis in layer
+  }    // end of for (detUnitIt=...
 
-    }// for digis in layer
-  }// end of for (detUnitIt=...
-   
   printf("CSCComparatorDigi count:  %3d \n", count);
- 
 }
 
-void testCSCDigis::readCSCStripDigi(CSCStripDigiCollection & collection){
-
-  int count=0;
+void testCSCDigis::readCSCStripDigi(CSCStripDigiCollection &collection) {
+  int count = 0;
 
   CSCStripDigiCollection::DigiRangeIterator detUnitIt;
-  for (detUnitIt=collection.begin();
-       detUnitIt!=collection.end();
-       ++detUnitIt){
- 
-    const CSCDetId& id = (*detUnitIt).first;
- 
-    const CSCStripDigiCollection::Range& range = (*detUnitIt).second;
-    for (CSCStripDigiCollection::const_iterator digiIt =
-           range.first; digiIt!=range.second; ++digiIt){
+  for (detUnitIt = collection.begin(); detUnitIt != collection.end(); ++detUnitIt) {
+    const CSCDetId &id = (*detUnitIt).first;
+
+    const CSCStripDigiCollection::Range &range = (*detUnitIt).second;
+    for (CSCStripDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) {
       count++;
-      CPPUNIT_ASSERT((*digiIt).getStrip()==10);
-      printf("CSC Strip - endcap station ring csc layer: %3d %3d %3d %3d %3d strip: %3d  ADC: %4d %4d %4d %4d %4d %4d %4d %4d\n",
-             id.endcap(),id.station(),id.ring(),id.chamber(),id.layer(),
-             (*digiIt).getStrip(),
-             (*digiIt).getADCCounts()[0],
-             (*digiIt).getADCCounts()[1],
-             (*digiIt).getADCCounts()[2],
-             (*digiIt).getADCCounts()[3],
-             (*digiIt).getADCCounts()[4],
-             (*digiIt).getADCCounts()[5],
-             (*digiIt).getADCCounts()[6],
-             (*digiIt).getADCCounts()[7]);
- 
-    }// for digis in layer
-  }// end of for (detUnitIt=...
-   
+      CPPUNIT_ASSERT((*digiIt).getStrip() == 10);
+      printf(
+          "CSC Strip - endcap station ring csc layer: %3d %3d %3d %3d %3d strip: %3d  ADC: %4d %4d %4d %4d %4d %4d %4d "
+          "%4d\n",
+          id.endcap(),
+          id.station(),
+          id.ring(),
+          id.chamber(),
+          id.layer(),
+          (*digiIt).getStrip(),
+          (*digiIt).getADCCounts()[0],
+          (*digiIt).getADCCounts()[1],
+          (*digiIt).getADCCounts()[2],
+          (*digiIt).getADCCounts()[3],
+          (*digiIt).getADCCounts()[4],
+          (*digiIt).getADCCounts()[5],
+          (*digiIt).getADCCounts()[6],
+          (*digiIt).getADCCounts()[7]);
+
+    }  // for digis in layer
+  }    // end of for (detUnitIt=...
+
   printf("CSC Strip count:  %3d \n", count);
 }
 
-void testCSCDigis::readCSCRPCDigi(CSCRPCDigiCollection & collection){
+void testCSCDigis::readCSCRPCDigi(CSCRPCDigiCollection &collection) {
+  int count = 0;
+  CSCRPCDigiCollection::DigiRangeIterator detUnitIt;
+  for (detUnitIt = collection.begin(); detUnitIt != collection.end(); ++detUnitIt) {
+    const CSCDetId &id = (*detUnitIt).first;
 
-        int count=0;
-        CSCRPCDigiCollection::DigiRangeIterator detUnitIt;
-        for (detUnitIt=collection.begin();
-             detUnitIt!=collection.end();
-           ++detUnitIt){
- 
-           const CSCDetId& id = (*detUnitIt).first;
- 
-           const CSCRPCDigiCollection::Range& range = (*detUnitIt).second;
-           for (CSCRPCDigiCollection::const_iterator digiIt =
-                range.first; digiIt!=range.second;
-              ++digiIt){
- 
-              count++;
-              CPPUNIT_ASSERT((*digiIt).getRpc()==5);
-              CPPUNIT_ASSERT((*digiIt).getBXN()==1);
-
-	      printf("RPC digi - endcap station ring csc layer: %3d %3d %3d %3d %3d %3d  %4d \n",id.endcap(),id.station(),id.ring(),id.chamber(),id.layer(),(*digiIt).getRpc(),(*digiIt).getBXN());
-   
-    }// for digis in layer
-   }// end of for (detUnitIt=...
- 
-    printf("RPC count:  %3d \n", count); 
+    const CSCRPCDigiCollection::Range &range = (*detUnitIt).second;
+    for (CSCRPCDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) {
+      count++;
+      CPPUNIT_ASSERT((*digiIt).getRpc() == 5);
+      CPPUNIT_ASSERT((*digiIt).getBXN() == 1);
+
+      printf("RPC digi - endcap station ring csc layer: %3d %3d %3d %3d %3d %3d  %4d \n",
+             id.endcap(),
+             id.station(),
+             id.ring(),
+             id.chamber(),
+             id.layer(),
+             (*digiIt).getRpc(),
+             (*digiIt).getBXN());
+
+    }  // for digis in layer
+  }    // end of for (detUnitIt=...
+
+  printf("RPC count:  %3d \n", count);
 }
 
-void testCSCDigis::readCSCALCTDigi(CSCALCTDigiCollection & collection){
- 
-        int count=0;
-        CSCALCTDigiCollection::DigiRangeIterator detUnitIt;
-        for (detUnitIt=collection.begin();
-             detUnitIt!=collection.end();
-           ++detUnitIt){
-   
-           const CSCDetId& id = (*detUnitIt).first;
-                                                                                
-           const CSCALCTDigiCollection::Range& range =(*detUnitIt).second;
-           for (CSCALCTDigiCollection::const_iterator digiIt =
-                range.first; digiIt!=range.second;
-              ++digiIt){
-   
-              count++;
-              CPPUNIT_ASSERT((*digiIt).isValid());
-              CPPUNIT_ASSERT((*digiIt).getQuality()==3);
-              CPPUNIT_ASSERT((*digiIt).getAccelerator()==0);
-              CPPUNIT_ASSERT((*digiIt).getCollisionB()==1);
-              CPPUNIT_ASSERT((*digiIt).getKeyWG()==16);
-              CPPUNIT_ASSERT((*digiIt).getBX()==4);
-              CPPUNIT_ASSERT((*digiIt).getTrknmb()==1);
-
- printf("CSC ALCT - endcap station ring csc layer valid quality accel pattern wire bx track: %3d %3d %3d %3d %3d %3d  %3d %3d %3d %3d %3d %3d\n",id.endcap(),id.station(),id.ring(),id.chamber(),id.layer(),(*digiIt).isValid(),(*digiIt).getQuality(),(*digiIt).getAccelerator(),(*digiIt).getCollisionB(),(*digiIt).getKeyWG(),(*digiIt).getBX(),(*digiIt).getTrknmb());
-    }// for digis in layer
-   }// end of for (detUnitIt=...
-    printf("CSC ALCT count:  %3d \n", count);
-}
+void testCSCDigis::readCSCALCTDigi(CSCALCTDigiCollection &collection) {
+  int count = 0;
+  CSCALCTDigiCollection::DigiRangeIterator detUnitIt;
+  for (detUnitIt = collection.begin(); detUnitIt != collection.end(); ++detUnitIt) {
+    const CSCDetId &id = (*detUnitIt).first;
 
-void testCSCDigis::readCSCCLCTDigi(CSCCLCTDigiCollection & collection){
-  
-        int count=0;
-        CSCCLCTDigiCollection::DigiRangeIterator detUnitIt;
-        for (detUnitIt=collection.begin();
-             detUnitIt!=collection.end();
-           ++detUnitIt){
-    
-           const CSCDetId& id = (*detUnitIt).first;
-                                                                                
-           const CSCCLCTDigiCollection::Range& range =(*detUnitIt).second;
-           for (CSCCLCTDigiCollection::const_iterator digiIt =
-                range.first; digiIt!=range.second;
-              ++digiIt){
-    
-              count++;
-              CPPUNIT_ASSERT((*digiIt).isValid());
-              CPPUNIT_ASSERT((*digiIt).getQuality()==3);
-              CPPUNIT_ASSERT((*digiIt).getPattern()==2);
-              CPPUNIT_ASSERT((*digiIt).getStripType()==1);
-              CPPUNIT_ASSERT((*digiIt).getBend()==0);
-              CPPUNIT_ASSERT((*digiIt).getStrip()==16);
-              CPPUNIT_ASSERT((*digiIt).getCFEB()==5);              
-              CPPUNIT_ASSERT((*digiIt).getBX()==3);
-              CPPUNIT_ASSERT((*digiIt).getTrknmb()==1);
-
- printf("CSC CLCT - endcap station ring csc layer valid quality pattern striptype bend strip cfeb bx tracknmb %3d %3d %3d %3d %3d %3d  %3d %3d %3d %3d %3d %3d %3d %3d\n",id.endcap(),id.station(),id.ring(),id.chamber(),id.layer(),(*digiIt).isValid(),(*digiIt).getQuality(),(*digiIt).getPattern(),(*digiIt).getStripType(),(*digiIt).getBend(),(*digiIt).getStrip(),(*digiIt).getCFEB(),(*digiIt).getBX(), (*digiIt).getTrknmb());
-    
-    }// for digis in layer
-   }// end of for (detUnitIt=...
-    printf("CSC CLCT count:  %3d \n", count);
+    const CSCALCTDigiCollection::Range &range = (*detUnitIt).second;
+    for (CSCALCTDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) {
+      count++;
+      CPPUNIT_ASSERT((*digiIt).isValid());
+      CPPUNIT_ASSERT((*digiIt).getQuality() == 3);
+      CPPUNIT_ASSERT((*digiIt).getAccelerator() == 0);
+      CPPUNIT_ASSERT((*digiIt).getCollisionB() == 1);
+      CPPUNIT_ASSERT((*digiIt).getKeyWG() == 16);
+      CPPUNIT_ASSERT((*digiIt).getBX() == 4);
+      CPPUNIT_ASSERT((*digiIt).getTrknmb() == 1);
+
+      printf(
+          "CSC ALCT - endcap station ring csc layer valid quality accel pattern wire bx track: %3d %3d %3d %3d %3d %3d "
+          " %3d %3d %3d %3d %3d %3d\n",
+          id.endcap(),
+          id.station(),
+          id.ring(),
+          id.chamber(),
+          id.layer(),
+          (*digiIt).isValid(),
+          (*digiIt).getQuality(),
+          (*digiIt).getAccelerator(),
+          (*digiIt).getCollisionB(),
+          (*digiIt).getKeyWG(),
+          (*digiIt).getBX(),
+          (*digiIt).getTrknmb());
+    }  // for digis in layer
+  }    // end of for (detUnitIt=...
+  printf("CSC ALCT count:  %3d \n", count);
 }
 
-void testCSCDigis::readCSCCFEBStatusDigi(CSCCFEBStatusDigiCollection & collection) {
+void testCSCDigis::readCSCCLCTDigi(CSCCLCTDigiCollection &collection) {
+  int count = 0;
+  CSCCLCTDigiCollection::DigiRangeIterator detUnitIt;
+  for (detUnitIt = collection.begin(); detUnitIt != collection.end(); ++detUnitIt) {
+    const CSCDetId &id = (*detUnitIt).first;
+
+    const CSCCLCTDigiCollection::Range &range = (*detUnitIt).second;
+    for (CSCCLCTDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) {
+      count++;
+      CPPUNIT_ASSERT((*digiIt).isValid());
+      CPPUNIT_ASSERT((*digiIt).getQuality() == 3);
+      CPPUNIT_ASSERT((*digiIt).getPattern() == 2);
+      CPPUNIT_ASSERT((*digiIt).getStripType() == 1);
+      CPPUNIT_ASSERT((*digiIt).getBend() == 0);
+      CPPUNIT_ASSERT((*digiIt).getStrip() == 16);
+      CPPUNIT_ASSERT((*digiIt).getCFEB() == 5);
+      CPPUNIT_ASSERT((*digiIt).getBX() == 3);
+      CPPUNIT_ASSERT((*digiIt).getTrknmb() == 1);
+
+      printf(
+          "CSC CLCT - endcap station ring csc layer valid quality pattern striptype bend strip cfeb bx tracknmb %3d "
+          "%3d %3d %3d %3d %3d  %3d %3d %3d %3d %3d %3d %3d %3d\n",
+          id.endcap(),
+          id.station(),
+          id.ring(),
+          id.chamber(),
+          id.layer(),
+          (*digiIt).isValid(),
+          (*digiIt).getQuality(),
+          (*digiIt).getPattern(),
+          (*digiIt).getStripType(),
+          (*digiIt).getBend(),
+          (*digiIt).getStrip(),
+          (*digiIt).getCFEB(),
+          (*digiIt).getBX(),
+          (*digiIt).getTrknmb());
+
+    }  // for digis in layer
+  }    // end of for (detUnitIt=...
+  printf("CSC CLCT count:  %3d \n", count);
+}
 
+void testCSCDigis::readCSCCFEBStatusDigi(CSCCFEBStatusDigiCollection &collection) {
   CSCCFEBStatusDigiCollection::DigiRangeIterator detUnitIt;
-  for (detUnitIt=collection.begin();
-       detUnitIt!=collection.end();
-       ++detUnitIt){
- 
-    const CSCDetId& id = (*detUnitIt).first;
- 
-    const CSCCFEBStatusDigiCollection::Range& range = (*detUnitIt).second;
+  for (detUnitIt = collection.begin(); detUnitIt != collection.end(); ++detUnitIt) {
+    const CSCDetId &id = (*detUnitIt).first;
 
-    int cfebcount=0;
-    for (CSCCFEBStatusDigiCollection::const_iterator digiIt =
-           range.first; digiIt!=range.second; ++digiIt){
+    const CSCCFEBStatusDigiCollection::Range &range = (*detUnitIt).second;
+
+    int cfebcount = 0;
+    for (CSCCFEBStatusDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) {
       cfebcount++;
-      CPPUNIT_ASSERT((*digiIt).getCFEBNmb()==cfebcount);
-      printf("CSC CFEBStatus - endcap station ring csc cfeb: %3d %3d %3d %3d %3d \n",id.endcap(),id.station(),id.ring(),id.chamber(),(*digiIt).getCFEBNmb());
-/*  Commented because the latest changes in CFEBStatusdDigi are not reflected
+      CPPUNIT_ASSERT((*digiIt).getCFEBNmb() == cfebcount);
+      printf("CSC CFEBStatus - endcap station ring csc cfeb: %3d %3d %3d %3d %3d \n",
+             id.endcap(),
+             id.station(),
+             id.ring(),
+             id.chamber(),
+             (*digiIt).getCFEBNmb());
+      /*  Commented because the latest changes in CFEBStatusdDigi are not reflected
       std::cout<<"CSC CFEBStatus - SCA Full Condition:";
       for(int i=0;i<4;i++) std::cout<<" "<<(*digiIt).getSCAFullCond()[i];
       std::cout<<std::endl;
@@ -652,23 +657,16 @@ void testCSCDigis::readCSCCFEBStatusDigi(CSCCFEBStatusDigiCollection & collectio
       for(int i=0;i<8;i++) std::cout<<" "<<(*digiIt).getTRIG_TIME()[i];
       std::cout<<std::endl;
 */
-    }// for digis in collection
-  }// end of for (detUnitIt=...
-   
+    }  // for digis in collection
+  }    // end of for (detUnitIt=...
 }
 
-void testCSCDigis::readCSCTMBStatusDigi(CSCTMBStatusDigiCollection & collection) {
-
+void testCSCDigis::readCSCTMBStatusDigi(CSCTMBStatusDigiCollection &collection) {
   CSCTMBStatusDigiCollection::DigiRangeIterator detUnitIt;
-  for (detUnitIt=collection.begin();
-       detUnitIt!=collection.end();
-       ++detUnitIt){
-
-    const CSCTMBStatusDigiCollection::Range& range = (*detUnitIt).second;
-
-    for (CSCTMBStatusDigiCollection::const_iterator digiIt =
-           range.first; digiIt!=range.second; ++digiIt){
+  for (detUnitIt = collection.begin(); detUnitIt != collection.end(); ++detUnitIt) {
+    const CSCTMBStatusDigiCollection::Range &range = (*detUnitIt).second;
 
+    for (CSCTMBStatusDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) {
       /*      CPPUNIT_ASSERT((*digiIt).getDAV()==7);
       //      CPPUNIT_ASSERT((*digiIt).getDAV()==3);
       CPPUNIT_ASSERT((*digiIt).getHALF()==0);
@@ -685,9 +683,8 @@ void testCSCDigis::readCSCTMBStatusDigi(CSCTMBStatusDigiCollection & collection)
       printf("CSC TMBStatus - endcap station ring csc TMB_DAV: %3d %3d %3d %3d%3d \n",id.endcap(),id.station(),id.ring(),id.chamber(),(*digiIt).getDAV());
       */
 
-    }// for digis in collection
-  }// end of for (detUnitIt=...
-
+    }  // for digis in collection
+  }    // end of for (detUnitIt=...
 }
 /*
 void testCSCDigis::readCSCDCCFormatStatusDigi(CSCDCCFormatStatusDigiCollection & collection) {
@@ -721,75 +718,69 @@ void testCSCDigis::readCSCDCCFormatStatusDigi(CSCDCCFormatStatusDigiCollection &
   }// end of for (detUnitIt=...
 }
 */
-void testCSCDigis::readCSCDCCFormatStatusDigi(CSCDCCFormatStatusDigiCollection & collection){
+void testCSCDigis::readCSCDCCFormatStatusDigi(CSCDCCFormatStatusDigiCollection &collection) {
   CSCDCCFormatStatusDigiCollection::DigiRangeIterator detUnitIt;
-  for (detUnitIt=collection.begin();
-       detUnitIt!=collection.end();
-       ++detUnitIt){
-       
-//   const CSCDetId& id = (*detUnitIt).first;
-
-    const CSCDCCFormatStatusDigiCollection::Range& range = (*detUnitIt).second;
+  for (detUnitIt = collection.begin(); detUnitIt != collection.end(); ++detUnitIt) {
+    //   const CSCDetId& id = (*detUnitIt).first;
 
-    for (CSCDCCFormatStatusDigiCollection::const_iterator digiIt = range.first; digiIt!=range.second; ++digiIt){
-	digiIt->print();
+    const CSCDCCFormatStatusDigiCollection::Range &range = (*detUnitIt).second;
 
+    for (CSCDCCFormatStatusDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) {
+      digiIt->print();
 
-    }// for digis in collection 
+    }  // for digis in collection
 
-  }// end of for (detUnitIt=...
+  }  // end of for (detUnitIt=...
 }
 
-void testCSCDigis::testDigiCollectionPut(){
+void testCSCDigis::testDigiCollectionPut() {
+  /************           Filling collections             *****************/
 
-/************           Filling collections             *****************/
+  CSCWireDigiCollection wiredigiCollection;
+  fillCSCWireDigi(wiredigiCollection);
 
-       CSCWireDigiCollection wiredigiCollection;
-       fillCSCWireDigi(wiredigiCollection);
+  CSCComparatorDigiCollection comparatordigiCollection;
+  fillCSCComparatorDigi(comparatordigiCollection);
 
-       CSCComparatorDigiCollection comparatordigiCollection;
-       fillCSCComparatorDigi(comparatordigiCollection);
+  CSCStripDigiCollection stripdigiCollection;
+  fillCSCStripDigi(stripdigiCollection);
 
-       CSCStripDigiCollection stripdigiCollection;
-       fillCSCStripDigi(stripdigiCollection);
+  CSCRPCDigiCollection rpcdigiCollection;
+  fillCSCRPCDigi(rpcdigiCollection);
 
+  CSCALCTDigiCollection alctdigiCollection;
+  fillCSCALCTDigi(alctdigiCollection);
 
-       CSCRPCDigiCollection rpcdigiCollection;
-       fillCSCRPCDigi(rpcdigiCollection);
+  CSCCLCTDigiCollection clctdigiCollection;
+  fillCSCCLCTDigi(clctdigiCollection);
 
-       CSCALCTDigiCollection alctdigiCollection;
-       fillCSCALCTDigi(alctdigiCollection);
+  CSCCorrelatedLCTDigiCollection corrlctdigiCollection;
+  fillCSCCorrLCTDigi(corrlctdigiCollection);
 
-       CSCCLCTDigiCollection clctdigiCollection;
-       fillCSCCLCTDigi(clctdigiCollection);
+  CSCCFEBStatusDigiCollection cfebstatusdigiCollection;
+  fillCSCCFEBStatusDigi(cfebstatusdigiCollection);
 
-       CSCCorrelatedLCTDigiCollection corrlctdigiCollection;
-       fillCSCCorrLCTDigi(corrlctdigiCollection);
+  CSCTMBStatusDigiCollection tmbstatusdigiCollection;
+  fillCSCTMBStatusDigi(tmbstatusdigiCollection);
 
-       CSCCFEBStatusDigiCollection cfebstatusdigiCollection;
-       fillCSCCFEBStatusDigi(cfebstatusdigiCollection);
+  CSCDCCFormatStatusDigiCollection dccformatstatusdigiCollection;
+  fillCSCDCCFormatStatusDigi(dccformatstatusdigiCollection);
 
-       CSCTMBStatusDigiCollection tmbstatusdigiCollection;
-       fillCSCTMBStatusDigi(tmbstatusdigiCollection);
+  //       CSCEventFormatStatusDigiCollection eventformatstatusdigiCollection;
+  //       fillCSCEventFormatStatusDigi(eventformatstatusdigiCollection);
 
-       CSCDCCFormatStatusDigiCollection dccformatstatusdigiCollection;
-       fillCSCDCCFormatStatusDigi(dccformatstatusdigiCollection);
+  /************           Reading collections             *****************/
 
-//       CSCEventFormatStatusDigiCollection eventformatstatusdigiCollection;
-//       fillCSCEventFormatStatusDigi(eventformatstatusdigiCollection);
-      
-/************           Reading collections             *****************/
-
-       readCSCWireDigi(wiredigiCollection);
-       readCSCComparatorDigi(comparatordigiCollection);
-       readCSCStripDigi(stripdigiCollection);
-       readCSCRPCDigi(rpcdigiCollection);
-       readCSCALCTDigi(alctdigiCollection);
-       readCSCCLCTDigi(clctdigiCollection);
-       readCSCCorrLCTDigi(corrlctdigiCollection);
-       readCSCCFEBStatusDigi(cfebstatusdigiCollection);
-       readCSCTMBStatusDigi(tmbstatusdigiCollection);
-       readCSCDCCFormatStatusDigi(dccformatstatusdigiCollection);
-//       readCSCEventFormatStatusDigi(eventformatstatusdigiCollection);
+  readCSCWireDigi(wiredigiCollection);
+  readCSCComparatorDigi(comparatordigiCollection);
+  readCSCStripDigi(stripdigiCollection);
+  readCSCRPCDigi(rpcdigiCollection);
+  readCSCALCTDigi(alctdigiCollection);
+  readCSCCLCTDigi(clctdigiCollection);
+  readCSCCorrLCTDigi(corrlctdigiCollection);
+  readCSCCFEBStatusDigi(cfebstatusdigiCollection);
+  readCSCTMBStatusDigi(tmbstatusdigiCollection);
+  readCSCDCCFormatStatusDigi(dccformatstatusdigiCollection);
+  //       readCSCEventFormatStatusDigi(eventformatstatusdigiCollection);
 }
 #include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
diff --git a/DataFormats/CTPPSDetId/interface/CTPPSDetId.h b/DataFormats/CTPPSDetId/interface/CTPPSDetId.h
index 090037e96bddd..d8f0bd159f730 100644
--- a/DataFormats/CTPPSDetId/interface/CTPPSDetId.h
+++ b/DataFormats/CTPPSDetId/interface/CTPPSDetId.h
@@ -29,133 +29,128 @@
  * The ...Name() methods implement the official naming scheme based on EDMS 906715.
 **/
 
-class CTPPSDetId : public DetId
-{  
-  public:
-    /// CTPPS sub-detectors
-    enum SubDetector { sdTrackingStrip = 3, sdTrackingPixel = 4, sdTimingDiamond = 5, sdTimingFastSilicon = 6 };
-
-    /// Construct from a raw id.
-    explicit CTPPSDetId(uint32_t id);
-  
-    /// Construct from hierarchy indeces.
-    CTPPSDetId(uint32_t SubDet, uint32_t Arm, uint32_t Station, uint32_t RomanPot=0);
-
-    //-------------------- bit assignment --------------------
-  
-    static const uint32_t startArmBit, maskArm, maxArm, lowMaskArm;
-    static const uint32_t startStationBit, maskStation, maxStation, lowMaskStation;
-    static const uint32_t startRPBit, maskRP, maxRP, lowMaskRP;
-    
-    //-------------------- component getters and setters --------------------
-     
-    uint32_t arm() const
-    {
-      return ((id_>>startArmBit) & maskArm);
-    }
+class CTPPSDetId : public DetId {
+public:
+  /// CTPPS sub-detectors
+  enum SubDetector { sdTrackingStrip = 3, sdTrackingPixel = 4, sdTimingDiamond = 5, sdTimingFastSilicon = 6 };
 
-    void setArm(uint32_t arm)
-    {
-      id_ &= ~(maskArm << startArmBit);
-      id_ |= ((arm & maskArm) << startArmBit);
-    }
+  /// Construct from a raw id.
+  explicit CTPPSDetId(uint32_t id);
 
-    uint32_t station() const
-    {
-      return ((id_>>startStationBit) & maskStation);
-    }
+  /// Construct from hierarchy indeces.
+  CTPPSDetId(uint32_t SubDet, uint32_t Arm, uint32_t Station, uint32_t RomanPot = 0);
 
-    void setStation(uint32_t station)
-    {
-      id_ &= ~(maskStation << startStationBit);
-      id_ |= ((station & maskStation) << startStationBit);
-    }
+  //-------------------- bit assignment --------------------
 
-    uint32_t rp() const
-    {
-      return ((id_>>startRPBit) & maskRP);
-    }
+  static const uint32_t startArmBit, maskArm, maxArm, lowMaskArm;
+  static const uint32_t startStationBit, maskStation, maxStation, lowMaskStation;
+  static const uint32_t startRPBit, maskRP, maxRP, lowMaskRP;
 
-    void setRP(uint32_t rp)
-    {
-      id_ &= ~(maskRP << startRPBit);
-      id_ |= ((rp & maskRP) << startRPBit);
-    }
+  //-------------------- component getters and setters --------------------
 
-    //-------------------- id getters for higher-level objects --------------------
+  uint32_t arm() const { return ((id_ >> startArmBit) & maskArm); }
 
-    CTPPSDetId getArmId() const
-    {
-      return CTPPSDetId( rawId() & (~lowMaskArm) );
-    }
+  void setArm(uint32_t arm) {
+    id_ &= ~(maskArm << startArmBit);
+    id_ |= ((arm & maskArm) << startArmBit);
+  }
 
-    CTPPSDetId getStationId() const
-    {
-      return CTPPSDetId( rawId() & (~lowMaskStation) );
-    }
+  uint32_t station() const { return ((id_ >> startStationBit) & maskStation); }
 
-    CTPPSDetId getRPId() const
-    {
-      return CTPPSDetId( rawId() & (~lowMaskRP) );
-    }
+  void setStation(uint32_t station) {
+    id_ &= ~(maskStation << startStationBit);
+    id_ |= ((station & maskStation) << startStationBit);
+  }
 
-    //-------------------- name methods --------------------
+  uint32_t rp() const { return ((id_ >> startRPBit) & maskRP); }
 
-    /// type of name returned by *Name functions
-    enum NameFlag { nShort, nFull, nPath };
+  void setRP(uint32_t rp) {
+    id_ &= ~(maskRP << startRPBit);
+    id_ |= ((rp & maskRP) << startRPBit);
+  }
 
-    inline void subDetectorName(std::string &name, NameFlag flag = nFull) const
-    {
-      if (flag == nPath)
-        name = subDetectorPaths[subdetId()];
-      else
-        name = subDetectorNames[subdetId()];
-    }
+  //-------------------- id getters for higher-level objects --------------------
 
-    inline void armName(std::string &name, NameFlag flag = nFull) const
-    {
-      switch (flag)
-      {
-        case nShort: name = ""; break;
-        case nFull: subDetectorName(name, flag); name += "_"; break;
-        case nPath: subDetectorName(name, flag); name += "/sector "; break;
-      }
+  CTPPSDetId getArmId() const { return CTPPSDetId(rawId() & (~lowMaskArm)); }
 
-      name += armNames[arm()];
-    }
+  CTPPSDetId getStationId() const { return CTPPSDetId(rawId() & (~lowMaskStation)); }
+
+  CTPPSDetId getRPId() const { return CTPPSDetId(rawId() & (~lowMaskRP)); }
 
-    inline void stationName(std::string &name, NameFlag flag = nFull) const
-    {
-      switch (flag)
-      {
-        case nShort: name = ""; break;
-        case nFull: armName(name, flag); name += "_"; break;
-        case nPath: armName(name, flag); name += "/station "; break;
-      }
+  //-------------------- name methods --------------------
 
-      name += stationNames[station()];
+  /// type of name returned by *Name functions
+  enum NameFlag { nShort, nFull, nPath };
+
+  inline void subDetectorName(std::string &name, NameFlag flag = nFull) const {
+    if (flag == nPath)
+      name = subDetectorPaths[subdetId()];
+    else
+      name = subDetectorNames[subdetId()];
+  }
+
+  inline void armName(std::string &name, NameFlag flag = nFull) const {
+    switch (flag) {
+      case nShort:
+        name = "";
+        break;
+      case nFull:
+        subDetectorName(name, flag);
+        name += "_";
+        break;
+      case nPath:
+        subDetectorName(name, flag);
+        name += "/sector ";
+        break;
     }
 
-    inline void rpName(std::string &name, NameFlag flag = nFull) const
-    {
-      switch (flag)
-      {
-        case nShort: name = ""; break;
-        case nFull: stationName(name, flag); name += "_"; break;
-        case nPath: stationName(name, flag); name += "/"; break;
-      }
+    name += armNames[arm()];
+  }
+
+  inline void stationName(std::string &name, NameFlag flag = nFull) const {
+    switch (flag) {
+      case nShort:
+        name = "";
+        break;
+      case nFull:
+        armName(name, flag);
+        name += "_";
+        break;
+      case nPath:
+        armName(name, flag);
+        name += "/station ";
+        break;
+    }
 
-      name += rpNames[rp()];
+    name += stationNames[station()];
+  }
+
+  inline void rpName(std::string &name, NameFlag flag = nFull) const {
+    switch (flag) {
+      case nShort:
+        name = "";
+        break;
+      case nFull:
+        stationName(name, flag);
+        name += "_";
+        break;
+      case nPath:
+        stationName(name, flag);
+        name += "/";
+        break;
     }
 
-  private:
-    static const std::string subDetectorNames[];
-    static const std::string subDetectorPaths[];
-    static const std::string armNames[];
-    static const std::string stationNames[];
-    static const std::string rpNames[];
+    name += rpNames[rp()];
+  }
+
+private:
+  static const std::string subDetectorNames[];
+  static const std::string subDetectorPaths[];
+  static const std::string armNames[];
+  static const std::string stationNames[];
+  static const std::string rpNames[];
 };
 
-std::ostream& operator<<(std::ostream& os, const CTPPSDetId& id);
+std::ostream &operator<<(std::ostream &os, const CTPPSDetId &id);
 
-#endif 
+#endif
diff --git a/DataFormats/CTPPSDetId/interface/CTPPSDiamondDetId.h b/DataFormats/CTPPSDetId/interface/CTPPSDiamondDetId.h
index 640cffaba79f3..8bf42dfc3dd93 100644
--- a/DataFormats/CTPPSDetId/interface/CTPPSDiamondDetId.h
+++ b/DataFormats/CTPPSDetId/interface/CTPPSDiamondDetId.h
@@ -22,86 +22,83 @@
  * Bits [0:11]  : unspecified yet
  **/
 
-class CTPPSDiamondDetId : public CTPPSDetId
-{  
- public:
+class CTPPSDiamondDetId : public CTPPSDetId {
+public:
   /// Construct from a raw id
   explicit CTPPSDiamondDetId(uint32_t id);
 
- CTPPSDiamondDetId(const CTPPSDetId &id) : CTPPSDetId(id)
-  {
-  }
-  
+  CTPPSDiamondDetId(const CTPPSDetId& id) : CTPPSDetId(id) {}
+
   /// Construct from hierarchy indeces.
-  CTPPSDiamondDetId(uint32_t Arm, uint32_t Station, uint32_t RomanPot=0, uint32_t Plane=0, uint32_t Channel=0);
+  CTPPSDiamondDetId(uint32_t Arm, uint32_t Station, uint32_t RomanPot = 0, uint32_t Plane = 0, uint32_t Channel = 0);
 
   static const uint32_t startPlaneBit, maskPlane, maxPlane, lowMaskPlane;
   static const uint32_t startDetBit, maskChannel, maxChannel, lowMaskChannel;
 
   /// returns true if the raw ID is a PPS-timing one
-  static bool check(unsigned int raw)
-  {
-    return (((raw >>DetId::kDetOffset) & 0xF) == DetId::VeryForward &&
-	    ((raw >> DetId::kSubdetOffset) & 0x7) == sdTimingDiamond);
-  }    
-  //-------------------- getting and setting methods --------------------
-     
-  uint32_t plane() const
-  {
-    return ((id_>>startPlaneBit) & maskPlane);
+  static bool check(unsigned int raw) {
+    return (((raw >> DetId::kDetOffset) & 0xF) == DetId::VeryForward &&
+            ((raw >> DetId::kSubdetOffset) & 0x7) == sdTimingDiamond);
   }
+  //-------------------- getting and setting methods --------------------
+
+  uint32_t plane() const { return ((id_ >> startPlaneBit) & maskPlane); }
 
-  void setPlane(uint32_t channel)
-  {
+  void setPlane(uint32_t channel) {
     id_ &= ~(maskPlane << startPlaneBit);
     id_ |= ((channel & maskPlane) << startPlaneBit);
   }
 
-  uint32_t channel() const
-  {
-    return ((id_>>startDetBit) & maskChannel);
-  }
+  uint32_t channel() const { return ((id_ >> startDetBit) & maskChannel); }
 
-  void setChannel(uint32_t channel)
-  {
+  void setChannel(uint32_t channel) {
     id_ &= ~(maskChannel << startDetBit);
     id_ |= ((channel & maskChannel) << startDetBit);
   }
 
   //-------------------- id getters for higher-level objects --------------------
 
-  CTPPSDiamondDetId getPlaneId() const
-  {
-    return CTPPSDiamondDetId( rawId() & (~lowMaskPlane) );
-  }
+  CTPPSDiamondDetId getPlaneId() const { return CTPPSDiamondDetId(rawId() & (~lowMaskPlane)); }
 
   //-------------------- name methods --------------------
 
-    inline void planeName(std::string &name, NameFlag flag = nFull) const
-    {
-      switch (flag)
-      {
-        case nShort: name = ""; break;
-        case nFull: rpName(name, flag); name += "_"; break;
-        case nPath: rpName(name, flag); name += "/plane "; break;
-      }
-
-      name += std::to_string(plane());
+  inline void planeName(std::string& name, NameFlag flag = nFull) const {
+    switch (flag) {
+      case nShort:
+        name = "";
+        break;
+      case nFull:
+        rpName(name, flag);
+        name += "_";
+        break;
+      case nPath:
+        rpName(name, flag);
+        name += "/plane ";
+        break;
     }
 
-    inline void channelName(std::string &name, NameFlag flag = nFull) const
-    {
-      switch (flag)
-      {
-        case nShort: name = ""; break;
-        case nFull: planeName(name, flag); name += "_"; break;
-        case nPath: planeName(name, flag); name += "/channel "; break;
-      }
+    name += std::to_string(plane());
+  }
 
-      name += std::to_string(channel());
+  inline void channelName(std::string& name, NameFlag flag = nFull) const {
+    switch (flag) {
+      case nShort:
+        name = "";
+        break;
+      case nFull:
+        planeName(name, flag);
+        name += "_";
+        break;
+      case nPath:
+        planeName(name, flag);
+        name += "/channel ";
+        break;
     }
+
+    name += std::to_string(channel());
+  }
 };
 
 std::ostream& operator<<(std::ostream& os, const CTPPSDiamondDetId& id);
 
-#endif 
+#endif
diff --git a/DataFormats/CTPPSDetId/interface/CTPPSPixelDetId.h b/DataFormats/CTPPSDetId/interface/CTPPSPixelDetId.h
index b237a7f3aa038..c219be94480d7 100644
--- a/DataFormats/CTPPSDetId/interface/CTPPSPixelDetId.h
+++ b/DataFormats/CTPPSDetId/interface/CTPPSPixelDetId.h
@@ -13,56 +13,41 @@
 #include <iosfwd>
 #include <iostream>
 
-
-class CTPPSPixelDetId :public CTPPSDetId {
-  
+class CTPPSPixelDetId : public CTPPSDetId {
 public:
-
   /// Construct from a packed id.
   explicit CTPPSPixelDetId(uint32_t id);
-  
-CTPPSPixelDetId(const CTPPSDetId &id) : CTPPSDetId(id)
-  {
-  }
+
+  CTPPSPixelDetId(const CTPPSDetId& id) : CTPPSDetId(id) {}
   /// Construct from fully qualified identifier.
-  CTPPSPixelDetId(uint32_t Arm, uint32_t Station, uint32_t RP=0, uint32_t Plane=0);
+  CTPPSPixelDetId(uint32_t Arm, uint32_t Station, uint32_t RP = 0, uint32_t Plane = 0);
 
   /// Bit 24 = Arm: 0=z>0 1=z<0
-  /// Bits [22:23] Station (0 = 210 or ex 147) 
+  /// Bits [22:23] Station (0 = 210 or ex 147)
   /// Bits [19:21] RP
   /// Bits [16:18] Si Plane
 
   static const uint32_t startPlaneBit, maskPlane, maxPlane;
 
-  static bool check(unsigned int raw)
-  {
-    return (((raw >>DetId::kDetOffset) & 0xF) == DetId::VeryForward &&
-	    ((raw >> DetId::kSubdetOffset) & 0x7) == sdTrackingPixel);
-  }    
-
-  uint32_t plane() const{
-    return int((id_>>startPlaneBit) & maskPlane);
+  static bool check(unsigned int raw) {
+    return (((raw >> DetId::kDetOffset) & 0xF) == DetId::VeryForward &&
+            ((raw >> DetId::kSubdetOffset) & 0x7) == sdTrackingPixel);
   }
 
-  void set(uint32_t a, uint32_t b, uint32_t c,uint32_t d ){
-    this->init(a,b,c,d);
-  }
- 
-  void setPlane(uint32_t pl)
-  {
+  uint32_t plane() const { return int((id_ >> startPlaneBit) & maskPlane); }
+
+  void set(uint32_t a, uint32_t b, uint32_t c, uint32_t d) { this->init(a, b, c, d); }
+
+  void setPlane(uint32_t pl) {
     id_ &= ~(maskPlane << startPlaneBit);
     id_ |= ((pl & maskPlane) << startPlaneBit);
   }
 
-
 private:
-  void init(uint32_t Arm, uint32_t Station,uint32_t RP, uint32_t Plane); 
+  void init(uint32_t Arm, uint32_t Station, uint32_t RP, uint32_t Plane);
 
+};  // CTPPSPixelDetId
 
-}; // CTPPSPixelDetId
-
-std::ostream& operator<<( std::ostream& os, const CTPPSPixelDetId& id );
+std::ostream& operator<<(std::ostream& os, const CTPPSPixelDetId& id);
 
 #endif
-
-
diff --git a/DataFormats/CTPPSDetId/interface/TotemRPDetId.h b/DataFormats/CTPPSDetId/interface/TotemRPDetId.h
index 9061423db5409..53d5d1fd95c7d 100644
--- a/DataFormats/CTPPSDetId/interface/TotemRPDetId.h
+++ b/DataFormats/CTPPSDetId/interface/TotemRPDetId.h
@@ -27,110 +27,96 @@
  * Bits [0:12] => not assigned
 **/
 
-class TotemRPDetId : public CTPPSDetId
-{  
-  public:
-    /// Construct from a raw id. It is required that the Detector part of
-    /// id is Totem and the SubDet part is RP, otherwise an exception is thrown.
-    explicit TotemRPDetId(uint32_t id);
-
-    TotemRPDetId(const CTPPSDetId &id) : CTPPSDetId(id)
-    {
-    }
-  
-    /// Construct from hierarchy indeces.
-    TotemRPDetId(uint32_t Arm, uint32_t Station, uint32_t RomanPot=0, uint32_t Plane=0, uint32_t Chip=0);
-
-    static const uint32_t startPlaneBit, maskPlane, maxPlane, lowMaskPlane;
-    static const uint32_t startChipBit, maskChip, maxChip, lowMaskChip;
-    
-    //-------------------- component getters and setters --------------------
-     
-    uint32_t plane() const
-    {
-      return ((id_>>startPlaneBit) & maskPlane);
-    }
+class TotemRPDetId : public CTPPSDetId {
+public:
+  /// Construct from a raw id. It is required that the Detector part of
+  /// id is Totem and the SubDet part is RP, otherwise an exception is thrown.
+  explicit TotemRPDetId(uint32_t id);
 
-    void setPlane(uint32_t det)
-    {
-      id_ &= ~(maskPlane << startPlaneBit);
-      id_ |= ((det & maskPlane) << startPlaneBit);
-    }
+  TotemRPDetId(const CTPPSDetId& id) : CTPPSDetId(id) {}
 
-    uint32_t chip() const
-    {
-      return ((id_>>startChipBit) & maskChip);
-    }
+  /// Construct from hierarchy indeces.
+  TotemRPDetId(uint32_t Arm, uint32_t Station, uint32_t RomanPot = 0, uint32_t Plane = 0, uint32_t Chip = 0);
 
-    void setChip(uint32_t chip)
-    {
-      id_ &= ~(maskChip << startChipBit);
-      id_ |= ((chip & maskChip) << startChipBit);
-    }
+  static const uint32_t startPlaneBit, maskPlane, maxPlane, lowMaskPlane;
+  static const uint32_t startChipBit, maskChip, maxChip, lowMaskChip;
 
-    //-------------------- id getters for higher-level objects --------------------
+  //-------------------- component getters and setters --------------------
 
-    TotemRPDetId getPlaneId() const
-    {
-      return TotemRPDetId( rawId() & (~lowMaskPlane) );
-    }
+  uint32_t plane() const { return ((id_ >> startPlaneBit) & maskPlane); }
 
-    //-------------------- strip orientation methods --------------------
+  void setPlane(uint32_t det) {
+    id_ &= ~(maskPlane << startPlaneBit);
+    id_ |= ((det & maskPlane) << startPlaneBit);
+  }
 
-    bool isStripsCoordinateUDirection() const
-    {
-      return plane() % 2;
-    }
+  uint32_t chip() const { return ((id_ >> startChipBit) & maskChip); }
 
-    bool isStripsCoordinateVDirection() const
-    {
-      return !isStripsCoordinateUDirection();
-    }
+  void setChip(uint32_t chip) {
+    id_ &= ~(maskChip << startChipBit);
+    id_ |= ((chip & maskChip) << startChipBit);
+  }
 
-    //-------------------- conversions to the obsolete decimal representation --------------------
-    // NOTE: only for backward compatibility, do not use otherwise!
-    
-    inline uint32_t getRPDecimalId() const
-    {
-      return rp() + station()*10 + arm()*100;
-    }
+  //-------------------- id getters for higher-level objects --------------------
 
-    inline uint32_t getPlaneDecimalId() const
-    {
-      return plane() + getRPDecimalId()*10;
-    }
+  TotemRPDetId getPlaneId() const { return TotemRPDetId(rawId() & (~lowMaskPlane)); }
 
-    //-------------------- name methods --------------------
+  //-------------------- strip orientation methods --------------------
 
-    inline void planeName(std::string &name, NameFlag flag = nFull) const
-    {
-      switch (flag)
-      {
-        case nShort: name = ""; break;
-        case nFull: rpName(name, flag); name += "_"; break;
-        case nPath: rpName(name, flag); name += "/plane "; break;
-      }
+  bool isStripsCoordinateUDirection() const { return plane() % 2; }
 
-      name += planeNames[plane()];
-    }
+  bool isStripsCoordinateVDirection() const { return !isStripsCoordinateUDirection(); }
+
+  //-------------------- conversions to the obsolete decimal representation --------------------
+  // NOTE: only for backward compatibility, do not use otherwise!
+
+  inline uint32_t getRPDecimalId() const { return rp() + station() * 10 + arm() * 100; }
 
-    inline void chipName(std::string &name, NameFlag flag = nFull) const
-    {
-      switch (flag)
-      {
-        case nShort: name = ""; break;
-        case nFull: planeName(name, flag); name += "_"; break;
-        case nPath: planeName(name, flag); name += "/chip "; break;
-      }
+  inline uint32_t getPlaneDecimalId() const { return plane() + getRPDecimalId() * 10; }
 
-      name += chipNames[chip()];
+  //-------------------- name methods --------------------
+
+  inline void planeName(std::string& name, NameFlag flag = nFull) const {
+    switch (flag) {
+      case nShort:
+        name = "";
+        break;
+      case nFull:
+        rpName(name, flag);
+        name += "_";
+        break;
+      case nPath:
+        rpName(name, flag);
+        name += "/plane ";
+        break;
+    }
+
+    name += planeNames[plane()];
+  }
+
+  inline void chipName(std::string& name, NameFlag flag = nFull) const {
+    switch (flag) {
+      case nShort:
+        name = "";
+        break;
+      case nFull:
+        planeName(name, flag);
+        name += "_";
+        break;
+      case nPath:
+        planeName(name, flag);
+        name += "/chip ";
+        break;
     }
 
-  private:
-    static const std::string planeNames[];
-    static const std::string chipNames[];
+    name += chipNames[chip()];
+  }
+
+private:
+  static const std::string planeNames[];
+  static const std::string chipNames[];
 };
 
 std::ostream& operator<<(std::ostream& os, const TotemRPDetId& id);
 
-#endif 
+#endif
diff --git a/DataFormats/CTPPSDetId/interface/TotemTimingDetId.h b/DataFormats/CTPPSDetId/interface/TotemTimingDetId.h
index b9348a647112b..b6424da72c34c 100644
--- a/DataFormats/CTPPSDetId/interface/TotemTimingDetId.h
+++ b/DataFormats/CTPPSDetId/interface/TotemTimingDetId.h
@@ -24,82 +24,82 @@
  * This class is very similar to CTPPSDiamondDetId; however the detector is completely separated, therefore it is useful to keep them separate and independent.
  **/
 
-class TotemTimingDetId : public CTPPSDetId
-{
- public:
+class TotemTimingDetId : public CTPPSDetId {
+public:
   enum { ID_NOT_SET = 28 };
 
   /// Construct from a raw id
-  explicit TotemTimingDetId( uint32_t id );
-  TotemTimingDetId( const CTPPSDetId&id ) : CTPPSDetId( id ) {}
+  explicit TotemTimingDetId(uint32_t id);
+  TotemTimingDetId(const CTPPSDetId& id) : CTPPSDetId(id) {}
 
   /// Construct from hierarchy indices.
-  TotemTimingDetId( uint32_t arm, uint32_t station, uint32_t romanPot = 0, uint32_t plane = 0, uint32_t channel = 0 );
+  TotemTimingDetId(uint32_t arm, uint32_t station, uint32_t romanPot = 0, uint32_t plane = 0, uint32_t channel = 0);
 
   static constexpr uint32_t startPlaneBit = 17, maskPlane = 0x3, maxPlane = 3, lowMaskPlane = 0x1FFFF;
   static constexpr uint32_t startDetBit = 12, maskChannel = 0x1F, maxChannel = 31, lowMaskChannel = 0xFFF;
 
   /// returns true if the raw ID is a PPS-timing one
-  static bool check( unsigned int raw )
-  {
-    return ( ( ( raw >> DetId::kDetOffset ) & 0xF ) == DetId::VeryForward
-          && ( ( raw >> DetId::kSubdetOffset ) & 0x7 ) == sdTimingFastSilicon );
+  static bool check(unsigned int raw) {
+    return (((raw >> DetId::kDetOffset) & 0xF) == DetId::VeryForward &&
+            ((raw >> DetId::kSubdetOffset) & 0x7) == sdTimingFastSilicon);
   }
   //-------------------- getting and setting methods --------------------
 
-  uint32_t plane() const
-  {
-    return ( ( id_ >> startPlaneBit ) & maskPlane );
-  }
+  uint32_t plane() const { return ((id_ >> startPlaneBit) & maskPlane); }
 
-  void setPlane( uint32_t channel )
-  {
-    id_ &= ~( maskPlane << startPlaneBit );
-    id_ |= ( ( channel & maskPlane ) << startPlaneBit );
+  void setPlane(uint32_t channel) {
+    id_ &= ~(maskPlane << startPlaneBit);
+    id_ |= ((channel & maskPlane) << startPlaneBit);
   }
 
-  uint32_t channel() const
-  {
-    return ( ( id_ >> startDetBit ) & maskChannel );
-  }
+  uint32_t channel() const { return ((id_ >> startDetBit) & maskChannel); }
 
-  void setChannel( uint32_t channel )
-  {
-    id_ &= ~( maskChannel << startDetBit );
-    id_ |= ( ( channel & maskChannel ) << startDetBit );
+  void setChannel(uint32_t channel) {
+    id_ &= ~(maskChannel << startDetBit);
+    id_ |= ((channel & maskChannel) << startDetBit);
   }
 
   //-------------------- id getters for higher-level objects --------------------
 
-  TotemTimingDetId getPlaneId() const
-  {
-    return TotemTimingDetId( rawId() & ( ~lowMaskPlane ) );
-  }
+  TotemTimingDetId getPlaneId() const { return TotemTimingDetId(rawId() & (~lowMaskPlane)); }
 
   //-------------------- name methods --------------------
 
-  inline void planeName( std::string& name, NameFlag flag = nFull ) const
-  {
-    switch ( flag ) {
-      case nShort: name = ""; break;
-      case nFull: rpName( name, flag ); name += "_"; break;
-      case nPath: rpName( name, flag ); name += "/plane "; break;
+  inline void planeName(std::string& name, NameFlag flag = nFull) const {
+    switch (flag) {
+      case nShort:
+        name = "";
+        break;
+      case nFull:
+        rpName(name, flag);
+        name += "_";
+        break;
+      case nPath:
+        rpName(name, flag);
+        name += "/plane ";
+        break;
     }
-    name += std::to_string( plane() );
+    name += std::to_string(plane());
   }
 
-  inline void channelName( std::string& name, NameFlag flag = nFull ) const
-  {
-    switch ( flag ) {
-      case nShort: name = ""; break;
-      case nFull: planeName( name, flag ); name += "_"; break;
-      case nPath: planeName( name, flag ); name += "/channel "; break;
+  inline void channelName(std::string& name, NameFlag flag = nFull) const {
+    switch (flag) {
+      case nShort:
+        name = "";
+        break;
+      case nFull:
+        planeName(name, flag);
+        name += "_";
+        break;
+      case nPath:
+        planeName(name, flag);
+        name += "/channel ";
+        break;
     }
-    name += std::to_string( channel() );
+    name += std::to_string(channel());
   }
 };
 
-std::ostream& operator<<( std::ostream& os, const TotemTimingDetId& id );
+std::ostream& operator<<(std::ostream& os, const TotemTimingDetId& id);
 
 #endif
-
diff --git a/DataFormats/CTPPSDetId/src/CTPPSDetId.cc b/DataFormats/CTPPSDetId/src/CTPPSDetId.cc
index 9f808ea48ef82..2a420fa455840 100644
--- a/DataFormats/CTPPSDetId/src/CTPPSDetId.cc
+++ b/DataFormats/CTPPSDetId/src/CTPPSDetId.cc
@@ -7,7 +7,6 @@
  *
  ****************************************************************************/
 
-
 #include "DataFormats/CTPPSDetId/interface/CTPPSDetId.h"
 
 #include "FWCore/Utilities/interface/Exception.h"
@@ -16,52 +15,49 @@ using namespace std;
 
 //----------------------------------------------------------------------------------------------------
 
-const uint32_t CTPPSDetId::startArmBit = 24, CTPPSDetId::maskArm = 0x1, CTPPSDetId::maxArm = 1, CTPPSDetId::lowMaskArm = 0xFFFFFF;
-const uint32_t CTPPSDetId::startStationBit = 22, CTPPSDetId::maskStation = 0x3, CTPPSDetId::maxStation = 2, CTPPSDetId::lowMaskStation = 0x3FFFFF;
-const uint32_t CTPPSDetId::startRPBit = 19, CTPPSDetId::maskRP = 0x7, CTPPSDetId::maxRP = 6, CTPPSDetId::lowMaskRP = 0x7FFFF;
-
-const string CTPPSDetId::subDetectorNames[] = { "", "", "", "ctpps_tr_strip", "ctpps_tr_pixel", "ctpps_ti_diamond", "ctpps_ti_fastsilicon" };
-const string CTPPSDetId::subDetectorPaths[] = { "", "", "", "CTPPS/TrackingStrip", "CTPPS/TrackingPixel", "CTPPS/TimingDiamond", "CTPPS/TimingFastSilicon" };
-const string CTPPSDetId::armNames[] = { "45", "56" };
-const string CTPPSDetId::stationNames[] = { "210", "220cyl", "220" };
-const string CTPPSDetId::rpNames[] = { "nr_tp", "nr_bt", "nr_hr", "fr_hr", "fr_tp", "fr_bt", "cyl_hr" };
+const uint32_t CTPPSDetId::startArmBit = 24, CTPPSDetId::maskArm = 0x1, CTPPSDetId::maxArm = 1,
+               CTPPSDetId::lowMaskArm = 0xFFFFFF;
+const uint32_t CTPPSDetId::startStationBit = 22, CTPPSDetId::maskStation = 0x3, CTPPSDetId::maxStation = 2,
+               CTPPSDetId::lowMaskStation = 0x3FFFFF;
+const uint32_t CTPPSDetId::startRPBit = 19, CTPPSDetId::maskRP = 0x7, CTPPSDetId::maxRP = 6,
+               CTPPSDetId::lowMaskRP = 0x7FFFF;
+
+const string CTPPSDetId::subDetectorNames[] = {
+    "", "", "", "ctpps_tr_strip", "ctpps_tr_pixel", "ctpps_ti_diamond", "ctpps_ti_fastsilicon"};
+const string CTPPSDetId::subDetectorPaths[] = {
+    "", "", "", "CTPPS/TrackingStrip", "CTPPS/TrackingPixel", "CTPPS/TimingDiamond", "CTPPS/TimingFastSilicon"};
+const string CTPPSDetId::armNames[] = {"45", "56"};
+const string CTPPSDetId::stationNames[] = {"210", "220cyl", "220"};
+const string CTPPSDetId::rpNames[] = {"nr_tp", "nr_bt", "nr_hr", "fr_hr", "fr_tp", "fr_bt", "cyl_hr"};
 
 //----------------------------------------------------------------------------------------------------
 
-CTPPSDetId::CTPPSDetId(uint32_t id) : DetId(id)
-{
+CTPPSDetId::CTPPSDetId(uint32_t id) : DetId(id) {
   bool inputOK = (det() == DetId::VeryForward);
 
-  if (!inputOK)
-  {
+  if (!inputOK) {
     throw cms::Exception("InvalidDetId") << "CTPPSDetId ctor:"
-      << " det: " << det()
-      << " subdet: " << subdetId()
-      << " is not a valid CTPPS id.";  
+                                         << " det: " << det() << " subdet: " << subdetId()
+                                         << " is not a valid CTPPS id.";
   }
 }
 
 //----------------------------------------------------------------------------------------------------
 
-CTPPSDetId::CTPPSDetId(uint32_t SubDet, uint32_t Arm, uint32_t Station, uint32_t RomanPot) :       
-  DetId(DetId::VeryForward, SubDet)
-{
-  if (SubDet != sdTrackingStrip && SubDet != sdTrackingPixel && SubDet != sdTimingDiamond && SubDet != sdTimingFastSilicon)
-  {
+CTPPSDetId::CTPPSDetId(uint32_t SubDet, uint32_t Arm, uint32_t Station, uint32_t RomanPot)
+    : DetId(DetId::VeryForward, SubDet) {
+  if (SubDet != sdTrackingStrip && SubDet != sdTrackingPixel && SubDet != sdTimingDiamond &&
+      SubDet != sdTimingFastSilicon) {
     throw cms::Exception("InvalidDetId") << "CTPPSDetId ctor: invalid sub-detector " << SubDet << ".";
   }
 
-  if (Arm > maxArm || Station > maxStation || RomanPot > maxRP)
-  {
-    throw cms::Exception("InvalidDetId") << "CTPPSDetId ctor:" 
-           << " Invalid parameters:" 
-           << " arm=" << Arm
-           << " station=" << Station
-           << " rp=" << RomanPot
-           << std::endl;
+  if (Arm > maxArm || Station > maxStation || RomanPot > maxRP) {
+    throw cms::Exception("InvalidDetId") << "CTPPSDetId ctor:"
+                                         << " Invalid parameters:"
+                                         << " arm=" << Arm << " station=" << Station << " rp=" << RomanPot << std::endl;
   }
 
-  uint32_t ok=0xfe000000;
+  uint32_t ok = 0xfe000000;
   id_ &= ok;
 
   id_ |= ((Arm & maskArm) << startArmBit);
@@ -71,13 +67,8 @@ CTPPSDetId::CTPPSDetId(uint32_t SubDet, uint32_t Arm, uint32_t Station, uint32_t
 
 //----------------------------------------------------------------------------------------------------
 
-std::ostream& operator << (std::ostream& os, const CTPPSDetId& id)
-{
-  os
-    << "subDet=" << id.subdetId()
-    << " arm=" << id.arm()
-    << " station=" << id.station()
-    << " rp=" << id.rp();
+std::ostream& operator<<(std::ostream& os, const CTPPSDetId& id) {
+  os << "subDet=" << id.subdetId() << " arm=" << id.arm() << " station=" << id.station() << " rp=" << id.rp();
 
   return os;
 }
diff --git a/DataFormats/CTPPSDetId/src/CTPPSDiamondDetId.cc b/DataFormats/CTPPSDetId/src/CTPPSDiamondDetId.cc
index cef719759c80d..324dcfb8393c7 100644
--- a/DataFormats/CTPPSDetId/src/CTPPSDiamondDetId.cc
+++ b/DataFormats/CTPPSDetId/src/CTPPSDiamondDetId.cc
@@ -3,7 +3,6 @@
  * Spetember 2016
  ****************************************************************************/
 
-
 #include "DataFormats/CTPPSDetId/interface/CTPPSDiamondDetId.h"
 
 #include "FWCore/Utilities/interface/Exception.h"
@@ -12,40 +11,33 @@ using namespace std;
 
 //----------------------------------------------------------------------------------------------------
 
-const uint32_t CTPPSDiamondDetId::startPlaneBit = 17, CTPPSDiamondDetId::maskPlane = 0x3, CTPPSDiamondDetId::maxPlane = 3, CTPPSDiamondDetId::lowMaskPlane = 0x1FFFF;
-const uint32_t CTPPSDiamondDetId::startDetBit = 12, CTPPSDiamondDetId::maskChannel = 0x1F, CTPPSDiamondDetId::maxChannel = 31, CTPPSDiamondDetId::lowMaskChannel = 0xFFF;
+const uint32_t CTPPSDiamondDetId::startPlaneBit = 17, CTPPSDiamondDetId::maskPlane = 0x3,
+               CTPPSDiamondDetId::maxPlane = 3, CTPPSDiamondDetId::lowMaskPlane = 0x1FFFF;
+const uint32_t CTPPSDiamondDetId::startDetBit = 12, CTPPSDiamondDetId::maskChannel = 0x1F,
+               CTPPSDiamondDetId::maxChannel = 31, CTPPSDiamondDetId::lowMaskChannel = 0xFFF;
 
 //----------------------------------------------------------------------------------------------------
 
-CTPPSDiamondDetId::CTPPSDiamondDetId(uint32_t id) : CTPPSDetId(id)
-{
-  if (! check(id))
-    {
-      throw cms::Exception("InvalidDetId") << "CTPPSDiamondDetId ctor:"
-					   << " channel: " << channel()
-					   << " subdet: " << subdetId()
-					   << " is not a valid CTPPS Timing Diamond id";  
-    }
+CTPPSDiamondDetId::CTPPSDiamondDetId(uint32_t id) : CTPPSDetId(id) {
+  if (!check(id)) {
+    throw cms::Exception("InvalidDetId") << "CTPPSDiamondDetId ctor:"
+                                         << " channel: " << channel() << " subdet: " << subdetId()
+                                         << " is not a valid CTPPS Timing Diamond id";
+  }
 }
 
 //----------------------------------------------------------------------------------------------------
 
-CTPPSDiamondDetId::CTPPSDiamondDetId(uint32_t Arm, uint32_t Station, uint32_t RomanPot, uint32_t Plane, uint32_t Channel) :       
-  CTPPSDetId(sdTimingDiamond, Arm, Station, RomanPot)
-{
-  if (Arm > maxArm || Station > maxStation || RomanPot > maxRP || Plane > maxPlane || Channel > maxChannel)
-    {
-      throw cms::Exception("InvalidDetId") << "CTPPSDiamondDetId ctor:" 
-					   << " Invalid parameters:" 
-					   << " arm=" << Arm
-					   << " station=" << Station
-					   << " rp=" << RomanPot
-					   << " plane=" << Plane
-					   << " detector=" << Channel
-					   << std::endl;
-    }
+CTPPSDiamondDetId::CTPPSDiamondDetId(uint32_t Arm, uint32_t Station, uint32_t RomanPot, uint32_t Plane, uint32_t Channel)
+    : CTPPSDetId(sdTimingDiamond, Arm, Station, RomanPot) {
+  if (Arm > maxArm || Station > maxStation || RomanPot > maxRP || Plane > maxPlane || Channel > maxChannel) {
+    throw cms::Exception("InvalidDetId") << "CTPPSDiamondDetId ctor:"
+                                         << " Invalid parameters:"
+                                         << " arm=" << Arm << " station=" << Station << " rp=" << RomanPot
+                                         << " plane=" << Plane << " detector=" << Channel << std::endl;
+  }
 
-  uint32_t ok=0xfe000000;
+  uint32_t ok = 0xfe000000;
   id_ &= ok;
 
   id_ |= ((Arm & maskArm) << startArmBit);
@@ -57,12 +49,8 @@ CTPPSDiamondDetId::CTPPSDiamondDetId(uint32_t Arm, uint32_t Station, uint32_t Ro
 
 //----------------------------------------------------------------------------------------------------
 
-std::ostream& operator << (std::ostream& os, const CTPPSDiamondDetId& id)
-{
-  os << "arm=" << id.arm()
-     << " station=" << id.station()
-     << " rp=" << id.rp()
-     << " plane=" << id.plane()
+std::ostream& operator<<(std::ostream& os, const CTPPSDiamondDetId& id) {
+  os << "arm=" << id.arm() << " station=" << id.station() << " rp=" << id.rp() << " plane=" << id.plane()
      << " Detector=" << id.channel();
 
   return os;
diff --git a/DataFormats/CTPPSDetId/src/CTPPSPixelDetId.cc b/DataFormats/CTPPSDetId/src/CTPPSPixelDetId.cc
index 6f237978a269f..bd3f642501fd4 100644
--- a/DataFormats/CTPPSDetId/src/CTPPSPixelDetId.cc
+++ b/DataFormats/CTPPSDetId/src/CTPPSPixelDetId.cc
@@ -8,58 +8,40 @@
 
 // VeryForward =7, Tracker = 4
 
-const uint32_t CTPPSPixelDetId::startPlaneBit = 16, CTPPSPixelDetId::maskPlane = 0x7, CTPPSPixelDetId::maxPlane = 5; 
+const uint32_t CTPPSPixelDetId::startPlaneBit = 16, CTPPSPixelDetId::maskPlane = 0x7, CTPPSPixelDetId::maxPlane = 5;
 
-CTPPSPixelDetId::CTPPSPixelDetId(uint32_t id):CTPPSDetId(id) {
-
-  if (! check(id))
-    {
-      throw cms::Exception("InvalidDetId") << "CTPPSPixelDetId ctor:"
-					   << " det: " << det()
-					   << " subdet: " << subdetId()
-					   << " is not a valid CTPPS Pixel id";  
-    }
+CTPPSPixelDetId::CTPPSPixelDetId(uint32_t id) : CTPPSDetId(id) {
+  if (!check(id)) {
+    throw cms::Exception("InvalidDetId") << "CTPPSPixelDetId ctor:"
+                                         << " det: " << det() << " subdet: " << subdetId()
+                                         << " is not a valid CTPPS Pixel id";
+  }
 }
 
-
-
-CTPPSPixelDetId::CTPPSPixelDetId(unsigned int Arm, unsigned int Station, unsigned int RP, unsigned int Plane):	      
-  CTPPSDetId(sdTrackingPixel,Arm,Station,RP)
-{
-  this->init(Arm,Station,RP,Plane);
+CTPPSPixelDetId::CTPPSPixelDetId(unsigned int Arm, unsigned int Station, unsigned int RP, unsigned int Plane)
+    : CTPPSDetId(sdTrackingPixel, Arm, Station, RP) {
+  this->init(Arm, Station, RP, Plane);
 }
 
-void CTPPSPixelDetId::init(unsigned int Arm, unsigned int Station, unsigned int RP, unsigned int Plane)
-{
-  if ( 
-      Arm > maxArm || Station > maxStation || RP > maxRP || Plane > maxPlane
-       ) {
-    throw cms::Exception("InvalidDetId") << "CTPPSPixelDetId ctor:" 
-					 << " Invalid parameterss: " 
-					 << " Arm "<<Arm
-					 << " Station "<<Station
-					 << " RP "<<RP
-					 << " Plane "<<Plane
-					 << std::endl;
+void CTPPSPixelDetId::init(unsigned int Arm, unsigned int Station, unsigned int RP, unsigned int Plane) {
+  if (Arm > maxArm || Station > maxStation || RP > maxRP || Plane > maxPlane) {
+    throw cms::Exception("InvalidDetId") << "CTPPSPixelDetId ctor:"
+                                         << " Invalid parameterss: "
+                                         << " Arm " << Arm << " Station " << Station << " RP " << RP << " Plane "
+                                         << Plane << std::endl;
   }
 
-  uint32_t ok=0xfe000000;
+  uint32_t ok = 0xfe000000;
   id_ &= ok;
 
   id_ |= ((Arm & maskArm) << startArmBit);
   id_ |= ((Station & maskStation) << startStationBit);
   id_ |= ((RP & maskRP) << startRPBit);
   id_ |= ((Plane & maskPlane) << startPlaneBit);
-
 }
 
-std::ostream& operator<<( std::ostream& os, const CTPPSPixelDetId& id ){
-  os <<  " Arm "<<id.arm()
-     << " Station " << id.station()
-     << " RP "<<id.rp()
-     << " Plane "<<id.plane();
+std::ostream& operator<<(std::ostream& os, const CTPPSPixelDetId& id) {
+  os << " Arm " << id.arm() << " Station " << id.station() << " RP " << id.rp() << " Plane " << id.plane();
 
   return os;
 }
-
-
diff --git a/DataFormats/CTPPSDetId/src/TotemRPDetId.cc b/DataFormats/CTPPSDetId/src/TotemRPDetId.cc
index 88b80c91d3cd6..f5756ad57ab32 100644
--- a/DataFormats/CTPPSDetId/src/TotemRPDetId.cc
+++ b/DataFormats/CTPPSDetId/src/TotemRPDetId.cc
@@ -7,7 +7,6 @@
  *
  ****************************************************************************/
 
-
 #include "DataFormats/CTPPSDetId/interface/TotemRPDetId.h"
 
 #include "FWCore/Utilities/interface/Exception.h"
@@ -16,45 +15,38 @@ using namespace std;
 
 //----------------------------------------------------------------------------------------------------
 
-const uint32_t TotemRPDetId::startPlaneBit = 15, TotemRPDetId::maskPlane = 0xF, TotemRPDetId::maxPlane = 9, TotemRPDetId::lowMaskPlane = 0x7FFF;
-const uint32_t TotemRPDetId::startChipBit = 13, TotemRPDetId::maskChip = 0x3, TotemRPDetId::maxChip = 3, TotemRPDetId::lowMaskChip = 0x1FFF;
+const uint32_t TotemRPDetId::startPlaneBit = 15, TotemRPDetId::maskPlane = 0xF, TotemRPDetId::maxPlane = 9,
+               TotemRPDetId::lowMaskPlane = 0x7FFF;
+const uint32_t TotemRPDetId::startChipBit = 13, TotemRPDetId::maskChip = 0x3, TotemRPDetId::maxChip = 3,
+               TotemRPDetId::lowMaskChip = 0x1FFF;
 
-const string TotemRPDetId::planeNames[] = { "01", "02", "03", "04", "05", "06", "07", "08", "09", "10" };
-const string TotemRPDetId::chipNames[] = { "1", "2", "3", "4" };
+const string TotemRPDetId::planeNames[] = {"01", "02", "03", "04", "05", "06", "07", "08", "09", "10"};
+const string TotemRPDetId::chipNames[] = {"1", "2", "3", "4"};
 
 //----------------------------------------------------------------------------------------------------
 
-TotemRPDetId::TotemRPDetId(uint32_t id) : CTPPSDetId(id)
-{
+TotemRPDetId::TotemRPDetId(uint32_t id) : CTPPSDetId(id) {
   bool inputOK = (det() == DetId::VeryForward && subdetId() == sdTrackingStrip);
 
-  if (!inputOK)
-  {
+  if (!inputOK) {
     throw cms::Exception("InvalidDetId") << "TotemRPDetId ctor:"
-      << " det: " << det()
-      << " subdet: " << subdetId()
-      << " is not a valid TotemRP id.";  
+                                         << " det: " << det() << " subdet: " << subdetId()
+                                         << " is not a valid TotemRP id.";
   }
 }
 
 //----------------------------------------------------------------------------------------------------
 
-TotemRPDetId::TotemRPDetId(uint32_t Arm, uint32_t Station, uint32_t RomanPot, uint32_t Plane, uint32_t Chip) :       
-  CTPPSDetId(sdTrackingStrip, Arm, Station, RomanPot)
-{
-  if (Arm > maxArm || Station > maxStation || RomanPot > maxRP || Plane > maxPlane || Chip > maxChip)
-  {
-      throw cms::Exception("InvalidDetId") << "TotemRPDetId ctor:" 
-             << " Invalid parameters:" 
-             << " arm=" << Arm
-             << " station=" << Station
-             << " rp=" << RomanPot
-             << " plane=" << Plane
-             << " chip=" << Chip
-             << std::endl;
+TotemRPDetId::TotemRPDetId(uint32_t Arm, uint32_t Station, uint32_t RomanPot, uint32_t Plane, uint32_t Chip)
+    : CTPPSDetId(sdTrackingStrip, Arm, Station, RomanPot) {
+  if (Arm > maxArm || Station > maxStation || RomanPot > maxRP || Plane > maxPlane || Chip > maxChip) {
+    throw cms::Exception("InvalidDetId") << "TotemRPDetId ctor:"
+                                         << " Invalid parameters:"
+                                         << " arm=" << Arm << " station=" << Station << " rp=" << RomanPot
+                                         << " plane=" << Plane << " chip=" << Chip << std::endl;
   }
 
-  uint32_t ok=0xfe000000;
+  uint32_t ok = 0xfe000000;
   id_ &= ok;
 
   id_ |= ((Arm & maskArm) << startArmBit);
@@ -66,12 +58,8 @@ TotemRPDetId::TotemRPDetId(uint32_t Arm, uint32_t Station, uint32_t RomanPot, ui
 
 //----------------------------------------------------------------------------------------------------
 
-std::ostream& operator << (std::ostream& os, const TotemRPDetId& id)
-{
-  os << "arm=" << id.arm()
-     << " station=" << id.station()
-     << " rp=" << id.rp()
-     << " plane=" << id.plane()
+std::ostream& operator<<(std::ostream& os, const TotemRPDetId& id) {
+  os << "arm=" << id.arm() << " station=" << id.station() << " rp=" << id.rp() << " plane=" << id.plane()
      << " chip=" << id.chip();
 
   return os;
diff --git a/DataFormats/CTPPSDetId/src/TotemTimingDetId.cc b/DataFormats/CTPPSDetId/src/TotemTimingDetId.cc
index e9fff959ff21a..f62afd14d342f 100644
--- a/DataFormats/CTPPSDetId/src/TotemTimingDetId.cc
+++ b/DataFormats/CTPPSDetId/src/TotemTimingDetId.cc
@@ -8,53 +8,38 @@
 
 //----------------------------------------------------------------------------------------------------
 
-TotemTimingDetId::TotemTimingDetId( uint32_t id ) :
-  CTPPSDetId( id )
-{
-  if ( !check( id ) ) {
-    throw cms::Exception( "InvalidDetId" )
-      << "TotemTimingDetId ctor:"
-      << " channel: " << channel()
-      << " subdet: " << subdetId()
-      << " is not a valid Totem Timing id";
+TotemTimingDetId::TotemTimingDetId(uint32_t id) : CTPPSDetId(id) {
+  if (!check(id)) {
+    throw cms::Exception("InvalidDetId") << "TotemTimingDetId ctor:"
+                                         << " channel: " << channel() << " subdet: " << subdetId()
+                                         << " is not a valid Totem Timing id";
   }
 }
 
 //----------------------------------------------------------------------------------------------------
 
-TotemTimingDetId::TotemTimingDetId( uint32_t arm, uint32_t station, uint32_t romanPot, uint32_t plane, uint32_t channel ) :
-  CTPPSDetId( sdTimingFastSilicon, arm, station, romanPot )
-{
-  if ( arm > maxArm || station > maxStation || romanPot > maxRP || plane > maxPlane || channel > maxChannel ) {
-    throw cms::Exception( "InvalidDetId" )
-      << "TotemTimingDetId ctor:"
-      << " Invalid parameters:"
-      << " arm=" << arm
-      << " station=" << station
-      << " rp=" << romanPot
-      << " plane=" << plane
-      << " detector=" << channel
-      << std::endl;
+TotemTimingDetId::TotemTimingDetId(uint32_t arm, uint32_t station, uint32_t romanPot, uint32_t plane, uint32_t channel)
+    : CTPPSDetId(sdTimingFastSilicon, arm, station, romanPot) {
+  if (arm > maxArm || station > maxStation || romanPot > maxRP || plane > maxPlane || channel > maxChannel) {
+    throw cms::Exception("InvalidDetId") << "TotemTimingDetId ctor:"
+                                         << " Invalid parameters:"
+                                         << " arm=" << arm << " station=" << station << " rp=" << romanPot
+                                         << " plane=" << plane << " detector=" << channel << std::endl;
   }
 
   uint32_t ok = 0xfe000000;
   id_ &= ok;
 
-  id_ |= ( ( arm & maskArm ) << startArmBit );
-  id_ |= ( ( station & maskStation ) << startStationBit );
-  id_ |= ( ( romanPot & maskRP ) << startRPBit );
-  id_ |= ( ( plane & maskPlane ) << startPlaneBit );
-  id_ |= ( ( channel & maskChannel ) << startDetBit );
+  id_ |= ((arm & maskArm) << startArmBit);
+  id_ |= ((station & maskStation) << startStationBit);
+  id_ |= ((romanPot & maskRP) << startRPBit);
+  id_ |= ((plane & maskPlane) << startPlaneBit);
+  id_ |= ((channel & maskChannel) << startDetBit);
 }
 
 //----------------------------------------------------------------------------------------------------
 
-std::ostream& operator<<( std::ostream& os, const TotemTimingDetId& id )
-{
-  return os
-     << "arm=" << id.arm()
-     << " station=" << id.station()
-     << " rp=" << id.rp()
-     << " plane=" << id.plane()
-     << " Detector=" << id.channel();
+std::ostream& operator<<(std::ostream& os, const TotemTimingDetId& id) {
+  return os << "arm=" << id.arm() << " station=" << id.station() << " rp=" << id.rp() << " plane=" << id.plane()
+            << " Detector=" << id.channel();
 }
diff --git a/DataFormats/Common/test/OwnVector_t.cpp b/DataFormats/Common/test/OwnVector_t.cpp
index d3e62d79ce7d2..05153a7a808ee 100644
--- a/DataFormats/Common/test/OwnVector_t.cpp
+++ b/DataFormats/Common/test/OwnVector_t.cpp
@@ -5,7 +5,7 @@
 #include "DataFormats/Common/interface/OwnVector.h"
 #include "FWCore/Utilities/interface/propagate_const.h"
 
-
+namespace ownvector_test {
 struct Base
 {
   virtual ~Base();
@@ -26,6 +26,10 @@ struct Derived : Base
   edm::propagate_const<int*> pointer;
 };
 
+void Derived::swap(Derived& other)
+{
+  std::swap(pointer, other.pointer);
+}
 Derived::Derived(int n) : pointer(new int(n)) { }
 
 Derived::Derived(Derived const& other) : pointer(new int(*other.pointer)) { }
@@ -37,16 +41,6 @@ Derived& Derived::operator=(Derived const& other)
   return *this;
 }
 
-void Derived::swap(Derived& other)
-{
-  std::swap(pointer, other.pointer);
-}
-
-void swap(Derived& a, Derived& b)
-{
-  a.swap(b);
-}
-
 Derived::~Derived()
 {
   delete pointer.get();
@@ -60,6 +54,19 @@ Derived::clone() const
 
 
 
+void swap(Derived& a, Derived& b)
+{
+  a.swap(b);
+}
+
+}
+
+using namespace ownvector_test;
+
+namespace {
+
+
+/*
 void same_guy_twice()
 {
   edm::OwnVector<Base> vec;
@@ -76,7 +83,7 @@ void two_different_owners()
   v1.push_back(p);
   v2.push_back(p);
 }
-
+  */
 // void guy_on_stack()
 // {
 //   edm::OwnVector<Base> v;
@@ -106,12 +113,18 @@ void assign_to_other()
   v2 = v1;
 }
 
+
+void do_assign(edm::OwnVector<Base>&iLHS, edm::OwnVector<Base>& iRHS) {
+  iLHS = iRHS;
+}
+
 void assign_to_self()
 {
   // Self-assignment happens, often by accident...
   edm::OwnVector<Base> v1;
   v1.push_back(new Derived(100));
-  v1 = v1;
+  auto& v2 = v1;
+  do_assign(v1,v2);
 }
 
 void pop_one()
@@ -200,7 +213,7 @@ void insert_with_iter()
   assert(&v1[2] == backup[2]);
 }
 
-
+}
 
 
 
diff --git a/DataFormats/DTDigi/interface/DTuROSControlData.h b/DataFormats/DTDigi/interface/DTuROSControlData.h
index 59d3b207320f4..65712b4e47f27 100644
--- a/DataFormats/DTDigi/interface/DTuROSControlData.h
+++ b/DataFormats/DTDigi/interface/DTuROSControlData.h
@@ -24,10 +24,9 @@ class DTuROSROSData {
 public:
 
   /// Constructor
-  DTuROSROSData() {
-    slot_ = -1;
-    for (int i=0; i<SEISXOK; i++) okxword_[i] = 0;
-  }
+  DTuROSROSData() : slot_(-1), header1_(0), header2_(0), 
+                    trailer_(0), okword1_(0), okword2_(0)
+    { for (int i=0; i<SEISXOK; i++) okxword_[i] = 0; }
 
   /// Destructor
   ~DTuROSROSData(){};
@@ -92,7 +91,7 @@ class DTuROSROSData {
 
   long header1_, header2_, trailer_;
 
-  long okword1_=0, okword2_=0, okxword_[SEISXOK];
+  long okword1_, okword2_, okxword_[SEISXOK];
 
   std::vector<long> exword_;
 
@@ -106,7 +105,9 @@ class DTuROSFEDData {
 public:
 
   /// Constructor
-  DTuROSFEDData() {for (int i=0; i<DOCESLOTS; i++) rsize_[i] = 0;} 
+  DTuROSFEDData() : header1_(0), header2_(0), trailer_(0),
+                    fed_(-1), nslots_(0), evtLgth_(0) 
+  { for (int i=0; i<DOCESLOTS; i++) rsize_[i] = 0; } 
 
   /// Destructor
   ~DTuROSFEDData(){};
diff --git a/DataFormats/EcalDetId/interface/EBDetId.h b/DataFormats/EcalDetId/interface/EBDetId.h
index a952cf11f17de..926798e3569c3 100644
--- a/DataFormats/EcalDetId/interface/EBDetId.h
+++ b/DataFormats/EcalDetId/interface/EBDetId.h
@@ -8,17 +8,15 @@
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 #include "DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h"
 
-
 /** \class EBDetId
  *  Crystal identifier class for the ECAL barrel
  *
  *
  */
 
-
 class EBDetId : public DetId {
- public:
-  enum { Subdet=EcalBarrel};
+public:
+  enum { Subdet = EcalBarrel };
   /** Constructor of a null id */
   EBDetId() {}
   /** Constructor from a raw value */
@@ -26,104 +24,99 @@ class EBDetId : public DetId {
   /** Constructor from crystal ieta and iphi 
       or from SM# and crystal# */
   // fast
-  EBDetId(  int crystal_ieta, int crystal_iphi) : DetId(Ecal,EcalBarrel) {
-    id_|=((crystal_ieta>0)?(0x10000|(crystal_ieta<<9)):((-crystal_ieta)<<9))|(crystal_iphi&0x1FF);
+  EBDetId(int crystal_ieta, int crystal_iphi) : DetId(Ecal, EcalBarrel) {
+    id_ |= ((crystal_ieta > 0) ? (0x10000 | (crystal_ieta << 9)) : ((-crystal_ieta) << 9)) | (crystal_iphi & 0x1FF);
   }
   // slow
   EBDetId(int index1, int index2, int mode);
   /** Constructor from a generic cell id */
-  EBDetId(const DetId& id) : DetId(id){}
+  EBDetId(const DetId& id) : DetId(id) {}
   /** Assignment operator from cell id */
   EBDetId& operator=(const DetId& id) {
-    id_=id.rawId();
-  return *this;
+    id_ = id.rawId();
+    return *this;
   }
 
   /// get the subdetector .i.e EcalBarrel (what else?)
   // EcalSubdetector subdet() const { return EcalSubdetector(subdetId()); }
-  static EcalSubdetector subdet() { return EcalBarrel;}
+  static EcalSubdetector subdet() { return EcalBarrel; }
 
   /// get the z-side of the crystal (1/-1)
-  int zside() const { return (id_&0x10000)?(1):(-1); }
+  int zside() const { return (id_ & 0x10000) ? (1) : (-1); }
   /// get the absolute value of the crystal ieta
-  int ietaAbs() const { return (id_>>9)&0x7F; }
+  int ietaAbs() const { return (id_ >> 9) & 0x7F; }
   /// get the crystal ieta
-  int ieta() const { return zside()*ietaAbs(); }
+  int ieta() const { return zside() * ietaAbs(); }
   /// get the crystal iphi
-  int iphi() const { return id_&0x1FF; }
+  int iphi() const { return id_ & 0x1FF; }
   /// get the HCAL/trigger ieta of this crystal
-  int tower_ieta() const { return ((ietaAbs()-1)/5+1)*zside(); }
+  int tower_ieta() const { return ((ietaAbs() - 1) / 5 + 1) * zside(); }
   /// get the HCAL/trigger iphi of this crystal
   int tower_iphi() const;
   /// get the HCAL/trigger iphi of this crystal
-  EcalTrigTowerDetId tower() const { return EcalTrigTowerDetId(zside(),EcalBarrel,abs(tower_ieta()),tower_iphi()); }
+  EcalTrigTowerDetId tower() const { return EcalTrigTowerDetId(zside(), EcalBarrel, abs(tower_ieta()), tower_iphi()); }
   /// get the ECAL/SM id
-  int ism() const  {
-    int id = ( iphi() - 1 ) / kCrystalsInPhi + 1;
-    return positiveZ() ? id : id+18;
+  int ism() const {
+    int id = (iphi() - 1) / kCrystalsInPhi + 1;
+    return positiveZ() ? id : id + 18;
   }
   /// get the number of module inside the SM (1-4)
   int im() const {
-    int ii = (ietaAbs()-26);
-    return ii<0 ? 1 : (ii/20 +2);
+    int ii = (ietaAbs() - 26);
+    return ii < 0 ? 1 : (ii / 20 + 2);
   }
   /// get ECAL/crystal number inside SM
   int ic() const;
   /// get the crystal ieta in the SM convention (1-85)
   int ietaSM() const { return ietaAbs(); }
   /// get the crystal iphi (1-20)
-  int iphiSM() const { return (( ic() -1 ) % kCrystalsInPhi ) + 1; }
-  
+  int iphiSM() const { return ((ic() - 1) % kCrystalsInPhi) + 1; }
+
   // is z positive?
-  bool positiveZ() const { return id_&0x10000;}
+  bool positiveZ() const { return id_ & 0x10000; }
   // crystal number in eta-phi grid
-  int numberByEtaPhi() const { 
-    return (MAX_IETA + (positiveZ() ? ietaAbs()-1 : -ietaAbs()) )*MAX_IPHI+ iphi()-1;
-  }
+  int numberByEtaPhi() const { return (MAX_IETA + (positiveZ() ? ietaAbs() - 1 : -ietaAbs())) * MAX_IPHI + iphi() - 1; }
   // index numbering crystal by SM
-  int numberBySM() const; 
+  int numberBySM() const;
   /// get a compact index for arrays
   int hashedIndex() const { return numberByEtaPhi(); }
 
-  uint32_t denseIndex() const { return hashedIndex() ; }
+  uint32_t denseIndex() const { return hashedIndex(); }
 
   /** returns a new EBDetId offset by nrStepsEta and nrStepsPhi (can be negative), 
     * returns EBDetId(0) if invalid */
-  EBDetId offsetBy( int nrStepsEta, int nrStepsPhi ) const;
+  EBDetId offsetBy(int nrStepsEta, int nrStepsPhi) const;
 
   /** returns a new EBDetId on the other zside of barrel (ie iEta*-1), 
     * returns EBDetId(0) if invalid (shouldnt happen) */
   EBDetId switchZSide() const;
- 
+
   /** following are static member functions of the above two functions
     * which take and return a DetId, returns DetId(0) if invalid 
     */
-  static DetId offsetBy( const DetId startId, int nrStepsEta, int nrStepsPhi );
-  static DetId switchZSide( const DetId startId );
+  static DetId offsetBy(const DetId startId, int nrStepsEta, int nrStepsPhi);
+  static DetId switchZSide(const DetId startId);
 
   /** return an approximate values of eta (~0.15% precise)
    */
   float approxEta() const { return ieta() * crystalUnitToEta; }
-  static float approxEta( const DetId id );
+  static float approxEta(const DetId id);
 
-  static bool validDenseIndex( uint32_t din ) { return ( din < kSizeForDenseIndexing ) ; }
+  static bool validDenseIndex(uint32_t din) { return (din < kSizeForDenseIndexing); }
 
-  static EBDetId detIdFromDenseIndex( uint32_t di ) { return unhashIndex( di ) ; }
+  static EBDetId detIdFromDenseIndex(uint32_t di) { return unhashIndex(di); }
 
   /// get a DetId from a compact index for arrays
-  static EBDetId unhashIndex( int hi ) {
-    const int pseudo_eta = hi/MAX_IPHI - MAX_IETA;
-    return ( validHashIndex( hi ) ?
-	     EBDetId(pseudo_eta<0 ? pseudo_eta :  pseudo_eta+1, hi%MAX_IPHI+1) :
-	     EBDetId() ) ;
+  static EBDetId unhashIndex(int hi) {
+    const int pseudo_eta = hi / MAX_IPHI - MAX_IETA;
+    return (validHashIndex(hi) ? EBDetId(pseudo_eta < 0 ? pseudo_eta : pseudo_eta + 1, hi % MAX_IPHI + 1) : EBDetId());
   }
 
-  static bool validHashIndex(int i) { return !(i<MIN_HASH || i>MAX_HASH); }
+  static bool validHashIndex(int i) { return !(i < MIN_HASH || i > MAX_HASH); }
 
   /// check if a valid index combination
   static bool validDetId(int i, int j) {
-    return i!=0 && (std::abs(i) <= MAX_IETA)
-      && (j>=MIN_IPHI) && (j <= MAX_IPHI); 
+    return i != 0 && (std::abs(i) <= MAX_IETA) && (j >= MIN_IPHI) && (j <= MAX_IPHI);
   }
 
   static bool isNextToBoundary(EBDetId id);
@@ -133,9 +126,9 @@ class EBDetId : public DetId {
   static bool isNextToPhiBoundary(EBDetId id);
 
   //return the distance in eta units between two EBDetId
-  static int distanceEta(const EBDetId& a,const EBDetId& b); 
+  static int distanceEta(const EBDetId& a, const EBDetId& b);
   //return the distance in phi units between two EBDetId
-  static int distancePhi(const EBDetId& a,const EBDetId& b); 
+  static int distancePhi(const EBDetId& a, const EBDetId& b);
 
   /// range constants
   static const int MIN_IETA = 1;
@@ -145,29 +138,27 @@ class EBDetId : public DetId {
   static const int kChannelsPerCard = 5;
   static const int kTowersInPhi = 4;  // per SM
   static const int kModulesPerSM = 4;
-  static const int kModuleBoundaries[4] ;
-  static const int kCrystalsInPhi = 20; // per SM
-  static const int kCrystalsInEta = 85; // per SM
+  static const int kModuleBoundaries[4];
+  static const int kCrystalsInPhi = 20;  // per SM
+  static const int kCrystalsInEta = 85;  // per SM
   static const int kCrystalsPerSM = 1700;
   static const int MIN_SM = 1;
   static const int MAX_SM = 36;
   static const int MIN_C = 1;
   static const int MAX_C = kCrystalsPerSM;
-  static const int MIN_HASH =  0; // always 0 ...
-  static const int MAX_HASH =  2*MAX_IPHI*MAX_IETA-1;
+  static const int MIN_HASH = 0;  // always 0 ...
+  static const int MAX_HASH = 2 * MAX_IPHI * MAX_IETA - 1;
 
   // eta coverage of one crystal (approximate)
   static const float crystalUnitToEta;
 
-  enum { kSizeForDenseIndexing = MAX_HASH + 1 } ;
-  
+  enum { kSizeForDenseIndexing = MAX_HASH + 1 };
 
   // function modes for (int, int) constructor
   static const int ETAPHIMODE = 0;
   static const int SMCRYSTALMODE = 1;
 };
 
-std::ostream& operator<<(std::ostream& s,const EBDetId& id);
-
+std::ostream& operator<<(std::ostream& s, const EBDetId& id);
 
 #endif
diff --git a/DataFormats/EcalDetId/interface/EEDetId.h b/DataFormats/EcalDetId/interface/EEDetId.h
index ddfa9b3665728..a4a2b4e60d49c 100644
--- a/DataFormats/EcalDetId/interface/EEDetId.h
+++ b/DataFormats/EcalDetId/interface/EEDetId.h
@@ -6,7 +6,6 @@
 #include "DataFormats/EcalDetId/interface/EcalScDetId.h"
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 
-
 /** \class EEDetId
  *  Crystal/cell identifier class for the ECAL endcap
  *
@@ -17,18 +16,18 @@ class EEDetId : public DetId {
   enum {
     /** Sudetector type. Here it is ECAL endcap.
      */
-    Subdet=EcalEndcap
+    Subdet = EcalEndcap
   };
-  
+
   /** Constructor of a null id
    */
   EEDetId() {}
-  
+
   /** Constructor from a raw value
    * @param rawid det ID number
    */
   EEDetId(uint32_t rawid) : DetId(rawid) {}
-  
+
   /** Constructor from crystal ix,iy,iz (iz=+1/-1) (mode = XYMODE)
    * or from sc,cr,iz (mode = SCCRYSTALMODE).
    * <p>ix runs from 1 to 100 along x-axis of standard CMS coordinates<br>
@@ -41,55 +40,57 @@ class EEDetId : public DetId {
    * @param iz iz/zside index: -1 for EE-, +1 for EE+
    * @param mode pass XYMODE if i j refer to ix, iy, SCCRYSTALMODE if thery refer to isc, ic
    */
-  // fast  
-  EEDetId(int crystal_ix, int crystal_iy, int iz) : 
-    DetId( Ecal, EcalEndcap ) {
-    id_|=(crystal_iy&0x7f)|((crystal_ix&0x7f)<<7)|((iz>0)?(0x4000):(0));
+  // fast
+  EEDetId(int crystal_ix, int crystal_iy, int iz) : DetId(Ecal, EcalEndcap) {
+    id_ |= (crystal_iy & 0x7f) | ((crystal_ix & 0x7f) << 7) | ((iz > 0) ? (0x4000) : (0));
   }
   // slow
   EEDetId(int i, int j, int iz, int mode);
-  
+
   /** Constructor from a generic cell id
    * @param id source detid
    */
-  EEDetId(const DetId& id) : DetId(id){}
-  
+  EEDetId(const DetId& id) : DetId(id) {}
+
   /** Assignment operator
    * @param id source det id
-   */ 
-  EEDetId& operator=(const DetId& id) {id_ = id.rawId(); return *this;}
-  
+   */
+  EEDetId& operator=(const DetId& id) {
+    id_ = id.rawId();
+    return *this;
+  }
+
   /** Gets the subdetector
    * @return subdetectot ID, that is EcalEndcap
    */
-  static EcalSubdetector subdet() { return EcalEndcap;}
-  
+  static EcalSubdetector subdet() { return EcalEndcap; }
+
   /** Gets the z-side of the crystal (1/-1)
    * @return -1 for EE-, +1 for EE+
    */
-  int zside() const { return (id_&0x4000)?(1):(-1); }
-  
+  int zside() const { return (id_ & 0x4000) ? (1) : (-1); }
+
   /** Gets the crystal x-index.
    * @see EEDetId(int, int, int, int) for x-index definition
    * @return x-index
    */
-  int ix() const { return (id_>>7)&0x7F; }
-  
+  int ix() const { return (id_ >> 7) & 0x7F; }
+
   /** Get the crystal y-index
    * @see EEDetId(int, int, int, int) for y-index definition.
    * @return y-index
    */
-  int iy() const { return id_&0x7F; }
-  
+  int iy() const { return id_ & 0x7F; }
+
   /** Gets the DetId of the supercrystal the crystal belong to.
    * @return the supercrystal det id
    * @throw cms::Exception if the crystal det id is invalid 
-   */ 
+   */
   EcalScDetId sc() const {
     const int scEdge = 5;
-    return EcalScDetId(1+(ix()-1)/scEdge, 1+(iy()-1)/scEdge, zside());
+    return EcalScDetId(1 + (ix() - 1) / scEdge, 1 + (iy() - 1) / scEdge, zside());
   }
-  
+
   /** Gets the SuperCrystal number within the endcap. This number runs from 1 to 316,
    * numbers 70 149 228 307 are not used.
    *
@@ -122,8 +123,8 @@ class EEDetId : public DetId {
    * considers the isc as a local index. The discrepancy is most probably due to a bug in the
    * implementation of this isc() method.
    */
-  int isc() const ;
-  
+  int isc() const;
+
   /** Gets crystal number inside SuperCrystal.
    * Crystal numbering withing a supercrystal in each quadrant:
    * \verbatim
@@ -148,7 +149,7 @@ class EEDetId : public DetId {
    * @return crystal number from 1 to 25
    */
   int ic() const;
-  
+
   /** Gets the quadrant of the DetId.
    * Quadrant number definition, x and y in std CMS coordinates, for EE+:
    *
@@ -165,79 +166,78 @@ class EEDetId : public DetId {
    *
    * @return quadrant number
    */
-  int iquadrant() const ;
-  
+  int iquadrant() const;
+
   /** Checks if crystal is in EE+
    * @return true for EE+, false for EE-
    */
-  bool positiveZ() const { return id_&0x4000;}
-  
-  int iPhiOuterRing() const ; // 1-360 else==0 if not on outer ring!
-  
-  static EEDetId idOuterRing( int iPhi , int zEnd ) ;
-  
+  bool positiveZ() const { return id_ & 0x4000; }
+
+  int iPhiOuterRing() const;  // 1-360 else==0 if not on outer ring!
+
+  static EEDetId idOuterRing(int iPhi, int zEnd);
+
   /** Gets a compact index for arrays
    * @return compact index from 0 to kSizeForDenseIndexing-1
    */
-  int hashedIndex() const 
-  {
-    const uint32_t jx ( ix() ) ;
-    const uint32_t jd ( 2*( iy() - 1 ) + ( jx - 1 )/50 ) ;
-    return (  ( positiveZ() ? kEEhalf : 0) + kdi[jd] + jx - kxf[jd] ) ;
+  int hashedIndex() const {
+    const uint32_t jx(ix());
+    const uint32_t jd(2 * (iy() - 1) + (jx - 1) / 50);
+    return ((positiveZ() ? kEEhalf : 0) + kdi[jd] + jx - kxf[jd]);
   }
-  
+
   /** Same as hashedIndex()
    * @return compact index from 0 to kSizeForDenseIndexing-1
    */
-  uint32_t denseIndex() const { return hashedIndex() ; }
-  
+  uint32_t denseIndex() const { return hashedIndex(); }
+
   /** returns a new EEDetId offset by nrStepsX and nrStepsY (can be negative),
    * returns EEDetId(0) if invalid */
-  EEDetId offsetBy( int nrStepsX, int nrStepsY ) const;
-  
-      /** returns a new EEDetId swapped (same iX, iY) to the other endcap, 
+  EEDetId offsetBy(int nrStepsX, int nrStepsY) const;
+
+  /** returns a new EEDetId swapped (same iX, iY) to the other endcap, 
        * returns EEDetId(0) if invalid (shouldnt happen) */
   EEDetId switchZSide() const;
-  
+
   /** following are static member functions of the above two functions
    *  which take and return a DetId, returns DetId(0) if invalid 
    */
-  static DetId offsetBy( const DetId startId, int nrStepsX, int nrStepsY );
-  static DetId switchZSide( const DetId startId );
-  
+  static DetId offsetBy(const DetId startId, int nrStepsX, int nrStepsY);
+  static DetId switchZSide(const DetId startId);
+
   /** Checks validity of a dense/hashed index
    * @param din dense/hashed index as returned by hashedIndex() or denseIndex()
    * method
    * @return true if index is valid, false otherwise
    */
-  static bool validDenseIndex( uint32_t din ) { return validHashIndex( din ) ; }
-  
+  static bool validDenseIndex(uint32_t din) { return validHashIndex(din); }
+
   /** Converts a hashed/dense index as defined in hashedIndex() and denseIndex()
    * methods to a det id.
    * @param din hashed/dense index
    * @return det id
    */
-  static EEDetId detIdFromDenseIndex( uint32_t din ) { return unhashIndex( din ) ; }
-  
-  static bool isNextToBoundary(     EEDetId id ) ;
-  
-  static bool isNextToDBoundary(    EEDetId id ) ;
-  
-  static bool isNextToRingBoundary( EEDetId id ) ;
-  
+  static EEDetId detIdFromDenseIndex(uint32_t din) { return unhashIndex(din); }
+
+  static bool isNextToBoundary(EEDetId id);
+
+  static bool isNextToDBoundary(EEDetId id);
+
+  static bool isNextToRingBoundary(EEDetId id);
+
   /** Gets a DetId from a compact index for arrays. Converse of hashedIndex() method.
    * @param hi dense/hashed index
    * @return det id
    */
-  static EEDetId unhashIndex( int hi ) ;
-  
+  static EEDetId unhashIndex(int hi);
+
   /** Checks if a hashed/dense index is valid
    * @see hashedIndex(), denseIndex()
    * @param i hashed/dense index
    * @return true if the index is valid, false otherwise
    */
-  static bool validHashIndex( int i ) { return ( i < kSizeForDenseIndexing ) ; }
-  
+  static bool validHashIndex(int i) { return (i < kSizeForDenseIndexing); }
+
   /** Checks validity of a crystal (x,y.z) index triplet.
    * @param crystal_ix crystal x-index
    * @param crystal_iy crystal y-index
@@ -246,12 +246,8 @@ class EEDetId : public DetId {
    * @return true if valid, false otherwise
    */
   static bool validDetId(int crystal_ix, int crystal_iy, int iz) {
-    return 
-      crystal_ix >= IX_MIN && crystal_ix <= IX_MAX &&
-      crystal_iy >= IY_MIN && crystal_iy <= IY_MAX &&  
-      std::abs(iz)==1 && 
-      ( fastValidDetId(crystal_ix,crystal_iy) ||
-	slowValidDetId(crystal_ix,crystal_iy) );
+    return crystal_ix >= IX_MIN && crystal_ix <= IX_MAX && crystal_iy >= IY_MIN && crystal_iy <= IY_MAX &&
+           std::abs(iz) == 1 && (fastValidDetId(crystal_ix, crystal_iy) || slowValidDetId(crystal_ix, crystal_iy));
   }
   static bool slowValidDetId(int crystal_ix, int crystal_iy);
 
@@ -260,7 +256,8 @@ class EEDetId : public DetId {
    *   if not the slow version shall be called
    */
   static bool fastValidDetId(int crystal_ix, int crystal_iy) {
-    float x =  crystal_ix; float y =  crystal_iy;
+    float x = crystal_ix;
+    float y = crystal_iy;
     float r = (x - 50.5f) * (x - 50.5f) + (y - 50.5f) * (y - 50.5f);
     return r > 12.f * 12.f && r < 48.f * 48.f;
   }
@@ -270,99 +267,96 @@ class EEDetId : public DetId {
    * @param b det id of second crystal
    * @return distance
    */
-  static int distanceX(const EEDetId& a,const EEDetId& b);
-  
+  static int distanceX(const EEDetId& a, const EEDetId& b);
+
   /** Returns the distance along y-axis in crystal units between two EEDetId
    * @param a det id of first crystal
    * @param b det id of second crystal
    * @return distance
    */
-  static int distanceY(const EEDetId& a,const EEDetId& b); 
-  
-  
+  static int distanceY(const EEDetId& a, const EEDetId& b);
+
   /** Gives supercrystal index from endcap *supercrystal* x and y indexes.
    * @see isc() for the index definition
    * @param iscCol supercrystal column number: supecrystal x-index for EE+
    * @param iscRow: supecrystal y-index
    * @return supercystal index
    */
-  static int isc( int iscCol,   // output is 1-316
-		  int iscRow ) ; // 
-  
+  static int isc(int iscCol,   // output is 1-316
+                 int iscRow);  //
+
   /** Lower bound of EE crystal x-index
    */
-  static const int IX_MIN =1;
-  
+  static const int IX_MIN = 1;
+
   /** Lower bound of EE crystal y-index
    */
-  static const int IY_MIN =1;
-  
+  static const int IY_MIN = 1;
+
   /** Upper bound of EE crystal y-index
    */
-  static const int IX_MAX =100;
-  
+  static const int IX_MAX = 100;
+
   /** Upper bound of EE crystal y-index
    */
-  static const int IY_MAX =100;
-  
+  static const int IY_MAX = 100;
+
   /** Lower bound of supercystal index as defined in isc()
    */
-  static const int ISC_MIN=1;
-  
+  static const int ISC_MIN = 1;
+
   /** Lower bound of crystal index within a supercrystal
    */
-  static const int ICR_MIN=1;
-  
+  static const int ICR_MIN = 1;
+
   /** Upper bound of supercystal index defined in isc()
    * <p>Beware it differs from the number of supercrystals in one endcap,
    * which is 312, because the numbering is not dense.
    */
-  static const int ISC_MAX=316;
-  
+  static const int ISC_MAX = 316;
+
   /** Upper bound of crystal index within a supercrystal
    */
-  static const int ICR_MAX=25;
-  
+  static const int ICR_MAX = 25;
+
   enum {
     /** Number of crystals per Dee
      */
-    kEEhalf = 7324 ,
+    kEEhalf = 7324,
     /** Number of dense crystal indices, that is number of
      * crystals per endcap.
      */
-    kSizeForDenseIndexing = 2*kEEhalf
+    kSizeForDenseIndexing = 2 * kEEhalf
   };
-  
+
   /*@{*/
   /** function modes for EEDetId(int, int, int, int) constructor
    */
-  static const int XYMODE        = 0;
+  static const int XYMODE = 0;
   static const int SCCRYSTALMODE = 1;
   /*@}*/
-  
+
 private:
-  
-  bool        isOuterRing() const ;
-  
-  static bool isOuterRingXY( int ax, int ay ) ;
-  
+  bool isOuterRing() const;
+
+  static bool isOuterRingXY(int ax, int ay);
+
   //Functions from B. Kennedy to retrieve ix and iy from SC and Crystal number
-  
+
   static const int nCols = 10;
   static const int nCrys = 5; /* Number of crystals per row in SC */
-  static const int QuadColLimits[nCols+1];
-  static const int iYoffset[nCols+1];
-  
-  static const unsigned short kxf[2*IY_MAX] ;
-  static const unsigned short kdi[2*IY_MAX] ;
-  
-  int ix( int iSC, int iCrys ) const;
-  int iy( int iSC, int iCrys ) const;
+  static const int QuadColLimits[nCols + 1];
+  static const int iYoffset[nCols + 1];
+
+  static const unsigned short kxf[2 * IY_MAX];
+  static const unsigned short kdi[2 * IY_MAX];
+
+  int ix(int iSC, int iCrys) const;
+  int iy(int iSC, int iCrys) const;
   int ixQuadrantOne() const;
   int iyQuadrantOne() const;
 };
 
-
-std::ostream& operator<<(std::ostream& s,const EEDetId& id);
+std::ostream& operator<<(std::ostream& s, const EEDetId& id);
 
 #endif
diff --git a/DataFormats/EcalDetId/interface/ESDetId.h b/DataFormats/EcalDetId/interface/ESDetId.h
index 640323a92b640..cecac59bf4e2d 100644
--- a/DataFormats/EcalDetId/interface/ESDetId.h
+++ b/DataFormats/EcalDetId/interface/ESDetId.h
@@ -13,25 +13,19 @@
 */
 
 class ESDetId : public DetId {
- public:
-
-  enum { Subdet = EcalPreshower } ;
+public:
+  enum { Subdet = EcalPreshower };
   /** Constructor of a null id */
-  ESDetId(){}
+  ESDetId() {}
   /** Constructor from a raw value */
-  ESDetId( uint32_t rawid ) : DetId( rawid ) {}
-
+  ESDetId(uint32_t rawid) : DetId(rawid) {}
 
   /// constructor from strip, ix, iy, plane, and iz
-  ESDetId(int strip, int ixs, int iys, int plane, int iz, bool doverify=false) :
-   DetId( Ecal, EcalPreshower ) {
-   id_ |=  (strip&0x3F) |
-         ((ixs&0x3F)<<6) |
-         ((iys&0x3F)<<12) |
-         (((plane-1)&0x1)<<18) |
-         ((iz>0)?(1<<19):(0))
-       ;
-   if (doverify) verify(strip, ixs, iys, plane, iz); 
+  ESDetId(int strip, int ixs, int iys, int plane, int iz, bool doverify = false) : DetId(Ecal, EcalPreshower) {
+    id_ |= (strip & 0x3F) | ((ixs & 0x3F) << 6) | ((iys & 0x3F) << 12) | (((plane - 1) & 0x1) << 18) |
+           ((iz > 0) ? (1 << 19) : (0));
+    if (doverify)
+      verify(strip, ixs, iys, plane, iz);
   }
 
   /** constructor from a generic DetId */
@@ -42,104 +36,90 @@ class ESDetId : public DetId {
   /// get the subdetector
   EcalSubdetector subdet() const { return EcalSubdetector(subdetId()); }
   /** get the zside */
-  int zside() const { return (id_&0x80000)?(1):(-1); }
+  int zside() const { return (id_ & 0x80000) ? (1) : (-1); }
   /** get the plane */
-  int plane() const { return ((id_>>18)&0x1)+1; }
+  int plane() const { return ((id_ >> 18) & 0x1) + 1; }
   /** get the sensor ix */
-  int six() const { return (id_>>6)&0x3F; }
+  int six() const { return (id_ >> 6) & 0x3F; }
   /** get the sensor iy */
-  int siy() const { return (id_>>12)&0x3F; }
+  int siy() const { return (id_ >> 12) & 0x3F; }
   /** get the strip */
-  int strip() const { return (id_&0x3F); }
+  int strip() const { return (id_ & 0x3F); }
   /// get a compact index for arrays [TODO: NEEDS WORK]
-  int hashedIndex() const ;
+  int hashedIndex() const;
 
-  uint32_t denseIndex() const { return hashedIndex() ; }
+  uint32_t denseIndex() const { return hashedIndex(); }
 
-  static bool validDenseIndex( uint32_t din ) { return validHashIndex( din ) ; }
+  static bool validDenseIndex(uint32_t din) { return validHashIndex(din); }
 
-  static ESDetId detIdFromDenseIndex( uint32_t din ) { return unhashIndex( din ) ; }
+  static ESDetId detIdFromDenseIndex(uint32_t din) { return unhashIndex(din); }
 
   /// get a DetId from a compact index for arrays
-  static ESDetId unhashIndex(    int hi ) ;
-  static bool    validHashIndex( int hi ) { return ( hi < kSizeForDenseIndexing ) ; }
+  static ESDetId unhashIndex(int hi);
+  static bool validHashIndex(int hi) { return (hi < kSizeForDenseIndexing); }
   /// check if a valid index combination
-  static bool validDetId(int istrip, int ixs, int iys, int iplane, int iz) ;
-  static void verify(int istrip, int ixs, int iys, int iplane, int iz) ;
-
-
-  static const int IX_MIN=1;
-  static const int IY_MIN=1;
-  static const int IX_MAX=40;
-  static const int IY_MAX=40;
-  static const int ISTRIP_MIN=1;
-  static const int ISTRIP_MAX=32;
-  static const int PLANE_MIN=1;
-  static const int PLANE_MAX=2;
-  static const int IZ_NUM=2;
-
-   private :
-
-      enum { kXYMAX=1072,
-	     kXYMIN=   1,
-	     kXMAX =  40,
-	     kYMAX =  40,
-	     kXMIN =   1,
-	     kYMIN =   1,
-	     // now normalize to A-D notation for ease of use
-	     kNa   =IZ_NUM,
-	     kNb   =PLANE_MAX - PLANE_MIN + 1,
-	     kNc   =kXYMAX - kXYMIN + 1,
-	     kNd   =ISTRIP_MAX - ISTRIP_MIN + 1,
-	     kLd   =kNd,
-	     kLc   =kLd*kNc,
-	     kLb   =kLc*kNb,
-	     kLa   =kLb*kNa } ;
-      
-      static const unsigned short hxy1[ kXMAX ][ kYMAX ] ;
-      static const unsigned short hx1[ kXYMAX ] ;
-      static const unsigned short hy1[ kXYMAX ] ;
-      
-      static const unsigned short hxy2[ kXMAX ][ kYMAX ] ;
-      static const unsigned short hx2[ kXYMAX ] ;
-      static const unsigned short hy2[ kXYMAX ] ;
-
-   public:
-
-      enum { kSizeForDenseIndexing = kLa } ;
-
+  static bool validDetId(int istrip, int ixs, int iys, int iplane, int iz);
+  static void verify(int istrip, int ixs, int iys, int iplane, int iz);
+
+  static const int IX_MIN = 1;
+  static const int IY_MIN = 1;
+  static const int IX_MAX = 40;
+  static const int IY_MAX = 40;
+  static const int ISTRIP_MIN = 1;
+  static const int ISTRIP_MAX = 32;
+  static const int PLANE_MIN = 1;
+  static const int PLANE_MAX = 2;
+  static const int IZ_NUM = 2;
+
+private:
+  enum {
+    kXYMAX = 1072,
+    kXYMIN = 1,
+    kXMAX = 40,
+    kYMAX = 40,
+    kXMIN = 1,
+    kYMIN = 1,
+    // now normalize to A-D notation for ease of use
+    kNa = IZ_NUM,
+    kNb = PLANE_MAX - PLANE_MIN + 1,
+    kNc = kXYMAX - kXYMIN + 1,
+    kNd = ISTRIP_MAX - ISTRIP_MIN + 1,
+    kLd = kNd,
+    kLc = kLd * kNc,
+    kLb = kLc * kNb,
+    kLa = kLb * kNa
+  };
+
+  static const unsigned short hxy1[kXMAX][kYMAX];
+  static const unsigned short hx1[kXYMAX];
+  static const unsigned short hy1[kXYMAX];
+
+  static const unsigned short hxy2[kXMAX][kYMAX];
+  static const unsigned short hx2[kXYMAX];
+  static const unsigned short hy2[kXYMAX];
+
+public:
+  enum { kSizeForDenseIndexing = kLa };
 };
 
-std::ostream& operator<<(std::ostream&,const ESDetId& id);
+std::ostream& operator<<(std::ostream&, const ESDetId& id);
 
-inline
-ESDetId::ESDetId( const DetId& gen ) : DetId(gen) 
-{
+inline ESDetId::ESDetId(const DetId& gen) : DetId(gen) {
 #ifdef EDM_ML_DEBUG
-   if( !gen.null() &&
-       ( gen.det()	!= Ecal          ||
-         gen.subdetId() != EcalPreshower    ) )
-   {
-      throw cms::Exception("InvalidDetId");
-   }
+  if (!gen.null() && (gen.det() != Ecal || gen.subdetId() != EcalPreshower)) {
+    throw cms::Exception("InvalidDetId");
+  }
 #endif
 }
 
-inline
-ESDetId&
-ESDetId::operator=( const DetId& gen )
-{
+inline ESDetId& ESDetId::operator=(const DetId& gen) {
 #ifdef EDM_ML_DEBUG
-   if (!gen.null() &&
-       ( gen.det()      != Ecal          ||                              
-         gen.subdetId() != EcalPreshower    ) )
-   {
-      throw cms::Exception("InvalidDetId");
-   }
+  if (!gen.null() && (gen.det() != Ecal || gen.subdetId() != EcalPreshower)) {
+    throw cms::Exception("InvalidDetId");
+  }
 #endif
-   id_=gen.rawId();
-   return *this;
+  id_ = gen.rawId();
+  return *this;
 }
 
-
 #endif
diff --git a/DataFormats/EcalDetId/interface/EcalContainer.h b/DataFormats/EcalDetId/interface/EcalContainer.h
index 774a064adc56c..2dd9d9743090b 100644
--- a/DataFormats/EcalDetId/interface/EcalContainer.h
+++ b/DataFormats/EcalDetId/interface/EcalContainer.h
@@ -8,121 +8,98 @@
 
 // #include <iostream>
 
-
-
 /* a generic container for ecal items
  * provides access by hashedIndex and by DetId...
  */
 
-template<typename DetId, typename T>
+template <typename DetId, typename T>
 class EcalContainer {
-
-        public:
-
-                typedef EcalContainer<DetId, T> self;
-                typedef T Item;
-                typedef Item value_type;
-                typedef typename std::vector<Item> Items; 
-                typedef typename std::vector<Item>::const_iterator const_iterator;
-                typedef typename std::vector<Item>::iterator iterator;
-
-                   
-                EcalContainer() {checkAndResize();}
-
-                void clear() {
-                        m_items.clear();
-                        checkAndResize();
-                }
-
-                void insert(std::pair<uint32_t, Item> const &a) {
-                        (*this)[a.first] = a.second;
-                }
-
-                inline const Item & item(size_t hashid) const {
-                        return m_items[hashid];
-                }
-
-                inline const Items & items() const {
-                        return m_items;
-                }
-
-                inline Item & operator[](uint32_t rawId) {
-		  checkAndResize();
-		  static Item dummy;
-		  DetId id(rawId);
-		  if ( !isValidId(id) ) return dummy;
-		  return m_items[id.hashedIndex()];
-                }
-
-
-		void checkAndResize() {
-		  if (m_items.empty()) {
-		    //		    std::cout << "resizing to " << DetId::kSizeForDenseIndexing << std::endl;
-		    m_items.resize(DetId::kSizeForDenseIndexing);
-		  }
-		}
-
-
-		void checkAndResize( size_t priv_size ) {
-		  // this method allows to resize the vector to a specific size forcing a specific value
-		  if (m_items.empty()) {
-		    //		    std::cout << "resizing to " << priv_size << std::endl;
-		    m_items.resize(priv_size);
-		  }
-		}
-
-                inline Item const & operator[](uint32_t rawId) const {
-		  //                        if (m_items.size()==0) {
-		  //	  std::cout << "resizing to " << DetId::kSizeForDenseIndexing << std::endl;
-                  //              m_items.resize((size_t) DetId::kSizeForDenseIndexing);
-                  //      }
-                        DetId id(rawId);
-                        if ( !isValidId(id) ) return dummy_item();
-                        return m_items[id.hashedIndex()];
-                }
-
-                inline const_iterator find(uint32_t rawId) const {
-                        DetId ib(rawId);
-                        if ( !isValidId(ib) ) return m_items.end();
-                        return m_items.begin() + ib.hashedIndex();
-                }
-
-                inline const_iterator begin() const {
-                        return m_items.begin();
-                }
-
-                inline const_iterator end() const {
-                        return m_items.end();
-                }
-
-                inline size_t size() const {
-                        return m_items.size();
-                }
-
-                void setItems(const std::vector<Item> & items) {
-                    m_items = items;
-                }
-        private:
-
-		//Cint can't parse the new C++11 initialization syntax
+public:
+  typedef EcalContainer<DetId, T> self;
+  typedef T Item;
+  typedef Item value_type;
+  typedef typename std::vector<Item> Items;
+  typedef typename std::vector<Item>::const_iterator const_iterator;
+  typedef typename std::vector<Item>::iterator iterator;
+
+  EcalContainer() { checkAndResize(); }
+
+  void clear() {
+    m_items.clear();
+    checkAndResize();
+  }
+
+  void insert(std::pair<uint32_t, Item> const& a) { (*this)[a.first] = a.second; }
+
+  inline const Item& item(size_t hashid) const { return m_items[hashid]; }
+
+  inline const Items& items() const { return m_items; }
+
+  inline Item& operator[](uint32_t rawId) {
+    checkAndResize();
+    static Item dummy;
+    DetId id(rawId);
+    if (!isValidId(id))
+      return dummy;
+    return m_items[id.hashedIndex()];
+  }
+
+  void checkAndResize() {
+    if (m_items.empty()) {
+      //		    std::cout << "resizing to " << DetId::kSizeForDenseIndexing << std::endl;
+      m_items.resize(DetId::kSizeForDenseIndexing);
+    }
+  }
+
+  void checkAndResize(size_t priv_size) {
+    // this method allows to resize the vector to a specific size forcing a specific value
+    if (m_items.empty()) {
+      //		    std::cout << "resizing to " << priv_size << std::endl;
+      m_items.resize(priv_size);
+    }
+  }
+
+  inline Item const& operator[](uint32_t rawId) const {
+    //                        if (m_items.size()==0) {
+    //	  std::cout << "resizing to " << DetId::kSizeForDenseIndexing << std::endl;
+    //              m_items.resize((size_t) DetId::kSizeForDenseIndexing);
+    //      }
+    DetId id(rawId);
+    if (!isValidId(id))
+      return dummy_item();
+    return m_items[id.hashedIndex()];
+  }
+
+  inline const_iterator find(uint32_t rawId) const {
+    DetId ib(rawId);
+    if (!isValidId(ib))
+      return m_items.end();
+    return m_items.begin() + ib.hashedIndex();
+  }
+
+  inline const_iterator begin() const { return m_items.begin(); }
+
+  inline const_iterator end() const { return m_items.end(); }
+
+  inline size_t size() const { return m_items.size(); }
+
+  void setItems(const std::vector<Item>& items) { m_items = items; }
+
+private:
+  //Cint can't parse the new C++11 initialization syntax
 #if !defined(__CINT__) && !defined(__MAKECINT__) && !defined(__REFLEX__)
 
-		static const Item& dummy_item() {
-		  static const Item s_dummy{};
-		  return s_dummy;
-		}
+  static const Item& dummy_item() {
+    static const Item s_dummy{};
+    return s_dummy;
+  }
 #else
-		static const Item& dummy_item();
+  static const Item& dummy_item();
 #endif
-                // not protected on EB <--> EE swap -- FIXME?
-                inline bool isValidId(const DetId id) const {
-                        return id.det() == ::DetId::Ecal;
-                };
-
-                std::vector<Item> m_items;
+  // not protected on EB <--> EE swap -- FIXME?
+  inline bool isValidId(const DetId id) const { return id.det() == ::DetId::Ecal; };
 
+  std::vector<Item> m_items;
 };
 
-
-
-#endif // ECALCONTAINER
+#endif  // ECALCONTAINER
diff --git a/DataFormats/EcalDetId/interface/EcalDetIdCollections.h b/DataFormats/EcalDetId/interface/EcalDetIdCollections.h
index 66eb42b439243..563bb2d60c497 100644
--- a/DataFormats/EcalDetId/interface/EcalDetIdCollections.h
+++ b/DataFormats/EcalDetId/interface/EcalDetIdCollections.h
@@ -10,7 +10,6 @@
 #include "DataFormats/EcalDetId/interface/EcalScDetId.h"
 #include "DataFormats/EcalDetId/interface/EcalTriggerElectronicsId.h"
 
-
 typedef edm::EDCollection<EBDetId> EBDetIdCollection;
 typedef edm::EDCollection<EEDetId> EEDetIdCollection;
 typedef edm::EDCollection<EcalElectronicsId> EcalElectronicsIdCollection;
diff --git a/DataFormats/EcalDetId/interface/EcalElectronicsId.h b/DataFormats/EcalDetId/interface/EcalElectronicsId.h
index c58ee06e89ef6..6fc5ac5c8b106 100644
--- a/DataFormats/EcalDetId/interface/EcalElectronicsId.h
+++ b/DataFormats/EcalDetId/interface/EcalElectronicsId.h
@@ -6,7 +6,6 @@
 
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 
-
 /** \brief Ecal readout channel identification
     [32:20] Unused (so far)
     [19:13]  DCC id
@@ -16,29 +15,26 @@
     Index starts from 1
  */
 
-
 class EcalElectronicsId {
-  
- public:
-
+public:
   /** Default constructor -- invalid value */
   EcalElectronicsId();
   /** from raw */
   EcalElectronicsId(uint32_t);
   /** Constructor from dcc,tower,channel **/
   EcalElectronicsId(int dccid, int towerid, int stripid, int xtalid);
-  
+
   uint32_t operator()() { return EcalElectronicsId_; }
   uint32_t rawId() const { return EcalElectronicsId_; }
-  
+
   /// get the DCC (Ecal Local DCC value not global one) id
-  int dccId() const { return (EcalElectronicsId_>>13)&0x7F; }
+  int dccId() const { return (EcalElectronicsId_ >> 13) & 0x7F; }
   /// get the tower id
-  int towerId() const { return (EcalElectronicsId_>>6)&0x7F; }
+  int towerId() const { return (EcalElectronicsId_ >> 6) & 0x7F; }
   /// get the tower id
-  int stripId() const { return (EcalElectronicsId_>>3)&0x7; }
+  int stripId() const { return (EcalElectronicsId_ >> 3) & 0x7; }
   /// get the channel id
-  int xtalId() const { return (EcalElectronicsId_&0x7); }
+  int xtalId() const { return (EcalElectronicsId_ & 0x7); }
 
   /// zside = +1 or -1
   int zside() const;
@@ -50,9 +46,9 @@ class EcalElectronicsId {
   int linearIndex() const { return (EcalElectronicsId_)&0x3FFFFF; }
 
   /// so far for EndCap only :
-  int channelId() const;	// xtal id between 1 and 25
-  
-  static const int MAX_DCCID = 54; //To be updated with correct and final number
+  int channelId() const;  // xtal id between 1 and 25
+
+  static const int MAX_DCCID = 54;  //To be updated with correct and final number
   static const int MIN_DCCID = 1;
   static const int MAX_TOWERID = 70;
   static const int MIN_TOWERID = 1;
@@ -62,7 +58,7 @@ class EcalElectronicsId {
   static const int MIN_CHANNELID = 1;
   static const int MAX_XTALID = 5;
   static const int MIN_XTALID = 1;
-  
+
   static const int MIN_DCCID_EEM = 1;
   static const int MAX_DCCID_EEM = 9;
   static const int MIN_DCCID_EBM = 10;
@@ -76,25 +72,22 @@ class EcalElectronicsId {
   static const int DCCID_PHI0_EBP = 28;
 
   static const int kDCCChannelBoundary = 17;
-  static const int DCC_EBM = 10;        // id of the DCC in EB- which contains phi=0 deg.
-  static const int DCC_EBP = 28;        // id of the DCC in EB+ which contains phi=0 deg.
-  static const int DCC_EEM = 1;         // id of the DCC in EE- which contains phi=0 deg.
-  static const int DCC_EEP = 46;        // id of the DCC in EE+ which contains phi=0 deg.
-
+  static const int DCC_EBM = 10;  // id of the DCC in EB- which contains phi=0 deg.
+  static const int DCC_EBP = 28;  // id of the DCC in EB+ which contains phi=0 deg.
+  static const int DCC_EEM = 1;   // id of the DCC in EE- which contains phi=0 deg.
+  static const int DCC_EEP = 46;  // id of the DCC in EE+ which contains phi=0 deg.
 
   /** Equality operator */
-  int operator==(const EcalElectronicsId& id) const { return id.EcalElectronicsId_==EcalElectronicsId_; }
+  int operator==(const EcalElectronicsId& id) const { return id.EcalElectronicsId_ == EcalElectronicsId_; }
   /** Non-Equality operator */
-  int operator!=(const EcalElectronicsId& id) const { return id.EcalElectronicsId_!=EcalElectronicsId_; }
+  int operator!=(const EcalElectronicsId& id) const { return id.EcalElectronicsId_ != EcalElectronicsId_; }
   /// Compare the id to another id for use in a map
-  int operator<(const EcalElectronicsId& id) const { return EcalElectronicsId_<id.EcalElectronicsId_; }
-  
- private:
-  
+  int operator<(const EcalElectronicsId& id) const { return EcalElectronicsId_ < id.EcalElectronicsId_; }
+
+private:
   uint32_t EcalElectronicsId_;
 };
 
-std::ostream& operator<<(std::ostream&,const EcalElectronicsId&);
+std::ostream& operator<<(std::ostream&, const EcalElectronicsId&);
 
-  
 #endif
diff --git a/DataFormats/EcalDetId/interface/EcalPnDiodeDetId.h b/DataFormats/EcalDetId/interface/EcalPnDiodeDetId.h
index 1392a0af517fd..1a8ed831a82b8 100644
--- a/DataFormats/EcalDetId/interface/EcalPnDiodeDetId.h
+++ b/DataFormats/EcalDetId/interface/EcalPnDiodeDetId.h
@@ -5,7 +5,6 @@
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 
-
 /** \class EcalPnDiodeDetId
     
    DetId for an Calo Trigger tower
@@ -20,13 +19,12 @@
 
 */
 
-
 class EcalPnDiodeDetId : public DetId {
- public:
+public:
   /** Constructor of a null id */
   EcalPnDiodeDetId();
   /** Constructor from a raw value */
-  EcalPnDiodeDetId(uint32_t rawid);  
+  EcalPnDiodeDetId(uint32_t rawid);
   /** \brief Constructor from signed EcalSubDetectorId, DCCId, PnId
    */
   EcalPnDiodeDetId(int EcalSubDetectorId, int DCCId, int PnId);
@@ -37,20 +35,19 @@ class EcalPnDiodeDetId : public DetId {
 
   static const int MAX_DCCID = 54;
   static const int MIN_DCCID = 1;
-  static const int MAX_PNID = 15; 
+  static const int MAX_PNID = 15;
   static const int MIN_PNID = 1;
 
   /// get EcalSubDetectorId
-  int iEcalSubDetectorId() const { return (id_ & 0x800 ) ? (EcalEndcap):(EcalBarrel); }
+  int iEcalSubDetectorId() const { return (id_ & 0x800) ? (EcalEndcap) : (EcalBarrel); }
   /// get the DCCId
-  int iDCCId() const { return (id_>>4) & 0x7F; }
+  int iDCCId() const { return (id_ >> 4) & 0x7F; }
   /// get the PnId
-  int iPnId() const { return id_&0xF; }
+  int iPnId() const { return id_ & 0xF; }
   /// get a compact index for arrays [TODO: NEEDS WORK]
   int hashedIndex() const;
-
 };
 
-std::ostream& operator<<(std::ostream&,const EcalPnDiodeDetId& id);
+std::ostream& operator<<(std::ostream&, const EcalPnDiodeDetId& id);
 
 #endif
diff --git a/DataFormats/EcalDetId/interface/EcalScDetId.h b/DataFormats/EcalDetId/interface/EcalScDetId.h
index 6e84879b23a73..a4db454fc2777 100644
--- a/DataFormats/EcalDetId/interface/EcalScDetId.h
+++ b/DataFormats/EcalDetId/interface/EcalScDetId.h
@@ -22,12 +22,11 @@
  */
 
 class EcalScDetId : public DetId {
- public:
-
+public:
   /** Constructor of a null id
    */
   EcalScDetId();
-  
+
   /** Constructor from a raw value
    * @param rawid det ID number of the supecrystal, as defined in this class
    * description.
@@ -43,7 +42,7 @@ class EcalScDetId : public DetId {
    * @param iz z-side /z-index: -1 for EE-, +1 for EE+
    */
   EcalScDetId(int ix, int iy, int iz);
-  
+
   /** Constructor from a raw value
    * @param id det ID number
    */
@@ -51,31 +50,31 @@ class EcalScDetId : public DetId {
 
   /** Assignment operator
    * @param id source det id
-   */ 
+   */
   EcalScDetId& operator=(const DetId& id);
 
   /** Gets the subdetector
    * @return subdetectot ID, that is EcalEndcap
    */
   EcalSubdetector subdet() const { return EcalSubdetector(subdetId()); }
-  
+
   /** Gets the z-side of the crystal (1/-1)
    * @return -1 for EE-, +1 for EE+
    */
-  int zside() const { return (id_&0x4000)?(1):(-1); }
-  
+  int zside() const { return (id_ & 0x4000) ? (1) : (-1); }
+
   /** Gets the crystal x-index.
    * @see EcalDetId(int, int, int) for x-index definition
    * @return x-index
    */
-  int ix() const { return (id_>>7)&0x7F; }
-  
+  int ix() const { return (id_ >> 7) & 0x7F; }
+
   /** Get the crystal y-index
    * @see EcalDetId(int, int, int) for y-index definition.
    * @return y-index
    */
-  int iy() const { return id_&0x7F; }
-  
+  int iy() const { return id_ & 0x7F; }
+
   /** Gets the quadrant of the DetId.
    *
    * Quadrant number definition for EE+, x and y in std CMS coordinates:
@@ -98,33 +97,34 @@ class EcalScDetId : public DetId {
    * @return quadrant number, from 1 to 4.
    * @deprecated This method might be withdraw in a future release
    */
-  int iquadrant() const ;
-  
-  
+  int iquadrant() const;
+
   /** Gets a compact index for arrays. Index runs from 0 to 623.
    * They are ordered by increasing z (EE- then EE+), then for
    * same z by increasing y. then for same z and y by increasing x
    */
-  int hashedIndex() const{
+  int hashedIndex() const {
     checkHashedIndexMap();
-    if(!validDetId(ix(),iy(),zside())) return -1;
-    return xyz2HashedIndex[ix()-IX_MIN][iy()-IY_MIN][zside()>0?1:0];
+    if (!validDetId(ix(), iy(), zside()))
+      return -1;
+    return xyz2HashedIndex[ix() - IX_MIN][iy() - IY_MIN][zside() > 0 ? 1 : 0];
   }
 
   /** Gets EcalScDetId from hasedIndex as defined by hashedIndex method
    * @param hi hashed index
    * @return the EcalScDetId. If hi is invalid return a null EcalScDetId.
    */
-  static EcalScDetId unhashIndex(int hi){
+  static EcalScDetId unhashIndex(int hi) {
     checkHashedIndexMap();
-    if(hi < 0 || hi >= kSizeForDenseIndexing) return EcalScDetId();
+    if (hi < 0 || hi >= kSizeForDenseIndexing)
+      return EcalScDetId();
     return hashedIndex2DetId[hi];
   }
-  
+
   /** Same as hashed index.
    * @return the dense/hashed index
    */
-  uint32_t denseIndex() const { return hashedIndex() ; }
+  uint32_t denseIndex() const { return hashedIndex(); }
 
   /** Validates a hashed index.
    * @param din hashed index to validate
@@ -132,32 +132,31 @@ class EcalScDetId : public DetId {
    */
   static bool validDenseIndex(uint32_t din) { return din < kSizeForDenseIndexing; }
 
-  
   /** Validates a hashed index.
    * @param hi hashed index to validate
    * @return true if the index is valid, false if it is invalid.
    */
-  static bool validHashIndex(int hi) { return validDenseIndex(hi) ; }
+  static bool validHashIndex(int hi) { return validDenseIndex(hi); }
 
   /** Number of supercrystals per endcap
    */
   static const int SC_PER_EE_CNT = 312;
-  
+
   /** Lower bound of EE supercrystal x-index
    */
-  static const int IX_MIN=1;
+  static const int IX_MIN = 1;
 
   /** Lower bound of EE supercrystal y-index
    */
-  static const int IY_MIN=1;
+  static const int IY_MIN = 1;
 
   /** Upper bound of EE crystal y-index
    */
-  static const int IX_MAX=20;
+  static const int IX_MAX = 20;
 
   /** Upper bound of EE crystal y-index
    */
-  static const int IY_MAX=20;
+  static const int IY_MAX = 20;
 
   /** Lower bound for hashed/dense index
    */
@@ -165,8 +164,8 @@ class EcalScDetId : public DetId {
 
   /** Upper bound for hashed/dense index
    */
-  static const int IHASHED_MAX = SC_PER_EE_CNT*2 - 1;
-  
+  static const int IHASHED_MAX = SC_PER_EE_CNT * 2 - 1;
+
   /** Checks validity of a crystal (x,y.z) index triplet.
    * @param ix supercrystal x-index
    * @param iy supercrystal y-index
@@ -174,13 +173,12 @@ class EcalScDetId : public DetId {
    * @see EEDetId(int, int, int) for index definition
    * @return true if valid, false otherwise
    */
-  static bool validDetId(int ix, int iy, int iz) ;
+  static bool validDetId(int ix, int iy, int iz);
 
 private:
   /** Initializes x,y,z <-> hashed index map if not yet done.
    */
   static void checkHashedIndexMap();
-  
 
   //fields
 public:
@@ -192,22 +190,20 @@ class EcalScDetId : public DetId {
 
 private:
   static const int nEndcaps = 2;
-  
+
   /** Map of z,x,y index to hashed index. See hashedIndex/
    */
   CMS_THREAD_SAFE static short xyz2HashedIndex[IX_MAX][IY_MAX][nEndcaps];
-  
+
   /** Map of hased index to x,y,z. See hashedIndex/
    */
   CMS_THREAD_SAFE static EcalScDetId hashedIndex2DetId[kSizeForDenseIndexing];
-  
+
   /*The two arrays are thread safe since they are filled safely using std::call_once and
     then only read and never modified.
    */
 };
 
+std::ostream& operator<<(std::ostream& s, const EcalScDetId& id);
 
-std::ostream& operator<<(std::ostream& s,const EcalScDetId& id);
-
-
-#endif //EcalDetId_EcalScDetId_h not defined
+#endif  //EcalDetId_EcalScDetId_h not defined
diff --git a/DataFormats/EcalDetId/interface/EcalSubdetector.h b/DataFormats/EcalDetId/interface/EcalSubdetector.h
index 08411cd003514..467da423882d3 100644
--- a/DataFormats/EcalDetId/interface/EcalSubdetector.h
+++ b/DataFormats/EcalDetId/interface/EcalSubdetector.h
@@ -7,7 +7,6 @@
  *
  */
 
-
-enum EcalSubdetector { EcalBarrel=1, EcalEndcap=2, EcalPreshower=3, EcalTriggerTower=4, EcalLaserPnDiode=5 };
+enum EcalSubdetector { EcalBarrel = 1, EcalEndcap = 2, EcalPreshower = 3, EcalTriggerTower = 4, EcalLaserPnDiode = 5 };
 
 #endif
diff --git a/DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h b/DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h
index 097621c5e80cd..101fdce463d43 100644
--- a/DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h
+++ b/DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h
@@ -5,134 +5,121 @@
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 
-
 /** \class EcalTrigTowerDetId
     
    DetId for an Ecal Trigger tower
 
 */
 
-
 class EcalTrigTowerDetId : public DetId {
- public:
+public:
   /** Constructor of a null id */
   EcalTrigTowerDetId();
   /** Constructor from a raw value */
-  EcalTrigTowerDetId(uint32_t rawid);  
+  EcalTrigTowerDetId(uint32_t rawid);
   /** \brief Constructor from signed ieta, iphi
    */
-  EcalTrigTowerDetId(int zside, EcalSubdetector subdet, int i, int j, int mode=SUBDETIJMODE);
-  
+  EcalTrigTowerDetId(int zside, EcalSubdetector subdet, int i, int j, int mode = SUBDETIJMODE);
+
   /** Constructor from a generic cell id */
   EcalTrigTowerDetId(const DetId& id);
   /** Assignment from a generic cell id */
   EcalTrigTowerDetId& operator=(const DetId& id);
-  
 
   /// get the z-side of the tower (1/-1)
-  int zside() const { return (id_&0x8000)?(1):(-1); }
+  int zside() const { return (id_ & 0x8000) ? (1) : (-1); }
 
   /// get the subDetector associated to the Trigger Tower
-  EcalSubdetector subDet() const { return (id_&0x4000) ? EcalBarrel:EcalEndcap; }
-
-  /// get the absolute value of the tower ieta 
-  int ietaAbs() const 
-   { 
-     /*       if ( subDet() == EcalBarrel) */
-     return (id_>>7)&0x7f; 
-     /*       else */
-     /* 	throw(std::runtime_error("EcalTrigTowerDetId: ietaAbs not applicable for this subDetector.")); */
-   }  
-
-  /// get the tower ieta 
-  int ieta() const 
-    { 
-      /*       if ( subDet() == EcalBarrel) */
-      return zside()*ietaAbs(); 
-      /*       else */
-      /* 	throw(std::runtime_error("EcalTrigTowerDetId: ieta not applicable for this subDetector.")); */
-    } 
-  
-  /// get the tower iphi 
-  int iphi() const 
-    { 
-      /*       if ( subDet() == EcalBarrel) */
-      return id_&0x7F; 
-      /*       else */
-      /* 	throw(std::runtime_error("EcalTrigTowerDetId: iphi not applicable for this subDetector.")); */
-      
-    } 
-
-  int iquadrant() const ; 
-
-
-   /// get the tower ix (Endcap case) */
-   int ix() const  
-     {  
-       if ( subDet() == EcalEndcap) 
- 	return (id_>>7)&0x7f;  
-       else 
- 	throw(std::runtime_error("EcalTrigTowerDetId: ix not applicable for this subDetector."));
-     }  
-  
-   /// get the tower iy (Endcap case) */
-   int iy() const
-     { 
-      if ( subDet() == EcalEndcap)
-        return id_&0x7F; 
-      else 
-        throw(std::runtime_error("EcalTrigTowerDetId: ix not applicable for this subDetector.")); 
-     }  
-  
+  EcalSubdetector subDet() const { return (id_ & 0x4000) ? EcalBarrel : EcalEndcap; }
+
+  /// get the absolute value of the tower ieta
+  int ietaAbs() const {
+    /*       if ( subDet() == EcalBarrel) */
+    return (id_ >> 7) & 0x7f;
+    /*       else */
+    /* 	throw(std::runtime_error("EcalTrigTowerDetId: ietaAbs not applicable for this subDetector.")); */
+  }
+
+  /// get the tower ieta
+  int ieta() const {
+    /*       if ( subDet() == EcalBarrel) */
+    return zside() * ietaAbs();
+    /*       else */
+    /* 	throw(std::runtime_error("EcalTrigTowerDetId: ieta not applicable for this subDetector.")); */
+  }
+
+  /// get the tower iphi
+  int iphi() const {
+    /*       if ( subDet() == EcalBarrel) */
+    return id_ & 0x7F;
+    /*       else */
+    /* 	throw(std::runtime_error("EcalTrigTowerDetId: iphi not applicable for this subDetector.")); */
+  }
+
+  int iquadrant() const;
+
+  /// get the tower ix (Endcap case) */
+  int ix() const {
+    if (subDet() == EcalEndcap)
+      return (id_ >> 7) & 0x7f;
+    else
+      throw(std::runtime_error("EcalTrigTowerDetId: ix not applicable for this subDetector."));
+  }
+
+  /// get the tower iy (Endcap case) */
+  int iy() const {
+    if (subDet() == EcalEndcap)
+      return id_ & 0x7F;
+    else
+      throw(std::runtime_error("EcalTrigTowerDetId: ix not applicable for this subDetector."));
+  }
 
   /// get a compact index for arrays [TODO: NEEDS WORK]
   int hashedIndex() const;
 
-  uint32_t denseIndex() const { return hashedIndex() ; }
+  uint32_t denseIndex() const { return hashedIndex(); }
 
-  static bool validDenseIndex( uint32_t din ) { return ( din < kSizeForDenseIndexing ) ; }
+  static bool validDenseIndex(uint32_t din) { return (din < kSizeForDenseIndexing); }
 
-  static EcalTrigTowerDetId detIdFromDenseIndex( uint32_t di ) ;
+  static EcalTrigTowerDetId detIdFromDenseIndex(uint32_t di);
 
   /// check if a valid index combination
-  static bool validDetId( int iz, 
-			  EcalSubdetector sd, 
-			  int i, int j ) ;
+  static bool validDetId(int iz, EcalSubdetector sd, int i, int j);
 
   /// get the ECAL DCC id - in the  barrrel ism == iDCC
-  int iDCC() const ; 
+  int iDCC() const;
 
   /// sequential index within one DCC
-  int iTT() const ; 
-
-
+  int iTT() const;
 
   static const int MIN_I = 1;
   static const int MIN_J = 1;
   static const int MAX_I = 127;
   static const int MAX_J = 127;
 
-  static const int kEBTowersInPhi = 4; // per SM (in the Barrel)
-  static const int kEBTowersPerSM = 68; // per SM (in the Barrel)
-  static const int kEBTowersInEta = 17; // per SM (in the Barrel)
-//  static const int kEETowersInEta = 11; // Endcap
-  static const int kEETowersInPhiPerQuadrant = 18; // per Quadrant (in the Endcap)
+  static const int kEBTowersInPhi = 4;              // per SM (in the Barrel)
+  static const int kEBTowersPerSM = 68;             // per SM (in the Barrel)
+  static const int kEBTowersInEta = 17;             // per SM (in the Barrel)
+                                                    //  static const int kEETowersInEta = 11; // Endcap
+  static const int kEETowersInPhiPerQuadrant = 18;  // per Quadrant (in the Endcap)
 
   // function modes for (int, int) constructor
   static const int SUBDETIJMODE = 0;
   static const int SUBDETDCCTTMODE = 1;
 
-      enum { kEETowersInPhiPerEndcap = 4* kEETowersInPhiPerQuadrant ,
-	     kEEOuterEta             = 18 ,
-	     kEEInnerEta             = 28 ,
-	     kEETowersInEta          = ( kEEInnerEta - kEEOuterEta + 1 ) ,
-	     kEBHalfTowers           = kEBTowersPerSM*18 ,
-	     kEBTotalTowers          = kEBHalfTowers*2 ,
-	     kEETowersPerEndcap      = kEETowersInEta*kEETowersInPhiPerEndcap - 72,
-	     kEETotalTowers          = kEETowersPerEndcap*2,
-	     kSizeForDenseIndexing   = kEBTotalTowers + kEETotalTowers } ;
+  enum {
+    kEETowersInPhiPerEndcap = 4 * kEETowersInPhiPerQuadrant,
+    kEEOuterEta = 18,
+    kEEInnerEta = 28,
+    kEETowersInEta = (kEEInnerEta - kEEOuterEta + 1),
+    kEBHalfTowers = kEBTowersPerSM * 18,
+    kEBTotalTowers = kEBHalfTowers * 2,
+    kEETowersPerEndcap = kEETowersInEta * kEETowersInPhiPerEndcap - 72,
+    kEETotalTowers = kEETowersPerEndcap * 2,
+    kSizeForDenseIndexing = kEBTotalTowers + kEETotalTowers
+  };
 };
 
-std::ostream& operator<<(std::ostream&,const EcalTrigTowerDetId& id);
+std::ostream& operator<<(std::ostream&, const EcalTrigTowerDetId& id);
 
 #endif
diff --git a/DataFormats/EcalDetId/interface/EcalTriggerElectronicsId.h b/DataFormats/EcalDetId/interface/EcalTriggerElectronicsId.h
index 3c444f56863da..b2672a9fe650d 100644
--- a/DataFormats/EcalDetId/interface/EcalTriggerElectronicsId.h
+++ b/DataFormats/EcalDetId/interface/EcalTriggerElectronicsId.h
@@ -6,7 +6,6 @@
 
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 
-
 /** \brief Ecal trigger electronics identification
     [32:20] Unused (so far)
     [19:13]  TCC id
@@ -16,39 +15,36 @@
     Index starts from 1
  */
 
-
 class EcalTriggerElectronicsId {
-  
- public:
-
+public:
   /** Default constructor -- invalid value */
   EcalTriggerElectronicsId();
   /** from raw */
   EcalTriggerElectronicsId(uint32_t);
   /** Constructor from tcc,tt,pseudostrip,channel **/
   EcalTriggerElectronicsId(int tccid, int towerid, int pseudostripid, int channelid);
-  
+
   uint32_t operator()() { return EcalTriggerElectronicsId_; }
   uint32_t rawId() const { return EcalTriggerElectronicsId_; }
-  
+
   /// get the DCC (Ecal Local DCC value not global one) id
-  int tccId() const { return (EcalTriggerElectronicsId_>>13)&0x7F; }
+  int tccId() const { return (EcalTriggerElectronicsId_ >> 13) & 0x7F; }
   /// get the tower id
-  int ttId() const { return (EcalTriggerElectronicsId_>>6)&0x7F; }
+  int ttId() const { return (EcalTriggerElectronicsId_ >> 6) & 0x7F; }
   /// get the tower id
-  int pseudoStripId() const { return (EcalTriggerElectronicsId_>>3)&0x7; }
+  int pseudoStripId() const { return (EcalTriggerElectronicsId_ >> 3) & 0x7; }
   /// get the channel id
-  int channelId() const { return (EcalTriggerElectronicsId_&0x7); }
+  int channelId() const { return (EcalTriggerElectronicsId_ & 0x7); }
   /// get a fast, compact, unique index for linear lookups (maximum value = 1048575)
   int linearIndex() const { return (EcalTriggerElectronicsId_)&0xFFFFF; }
-  
+
   /// get the zside() +1 / -1
   int zside() const;
 
   /// get the subdet
   EcalSubdetector subdet() const;
 
-  static const int MAX_TCCID = 108; //To be updated with correct and final number
+  static const int MAX_TCCID = 108;  //To be updated with correct and final number
   static const int MIN_TCCID = 1;
   static const int MAX_TTID = 68;
   static const int MIN_TTID = 1;
@@ -65,28 +61,31 @@ class EcalTriggerElectronicsId {
   static const int MAX_TCCID_EBP = 72;
   static const int MIN_TCCID_EEP = 73;
   static const int MAX_TCCID_EEP = 108;
-  
-  static const int TCCID_PHI0_EEM_IN  = 1;     // id of the inner TCC in EE- which contains phi=0 deg.
-  static const int TCCID_PHI0_EEM_OUT = 19;    // id of the outer TCC in EE- which contains phi=0 deg.
-  static const int TCCID_PHI0_EEP_IN  = 91;    // id of the inner TCC in EE+ which contains phi=0 deg.
-  static const int TCCID_PHI0_EEP_OUT = 73;    // id of the outer TCC in EE+ which contains phi=0 deg.
-  static const int TCCID_PHI0_EBM = 37;        // id of the TCC in EB- which contains phi=0 deg.
-  static const int TCCID_PHI0_EBP = 55;        // id of the TCC in EB+ which contains phi=0 deg.
 
+  static const int TCCID_PHI0_EEM_IN = 1;    // id of the inner TCC in EE- which contains phi=0 deg.
+  static const int TCCID_PHI0_EEM_OUT = 19;  // id of the outer TCC in EE- which contains phi=0 deg.
+  static const int TCCID_PHI0_EEP_IN = 91;   // id of the inner TCC in EE+ which contains phi=0 deg.
+  static const int TCCID_PHI0_EEP_OUT = 73;  // id of the outer TCC in EE+ which contains phi=0 deg.
+  static const int TCCID_PHI0_EBM = 37;      // id of the TCC in EB- which contains phi=0 deg.
+  static const int TCCID_PHI0_EBP = 55;      // id of the TCC in EB+ which contains phi=0 deg.
 
   /** Equality operator */
-  int operator==(const EcalTriggerElectronicsId& id) const { return id.EcalTriggerElectronicsId_==EcalTriggerElectronicsId_; }
+  int operator==(const EcalTriggerElectronicsId& id) const {
+    return id.EcalTriggerElectronicsId_ == EcalTriggerElectronicsId_;
+  }
   /** Non-Equality operator */
-  int operator!=(const EcalTriggerElectronicsId& id) const { return id.EcalTriggerElectronicsId_!=EcalTriggerElectronicsId_; }
+  int operator!=(const EcalTriggerElectronicsId& id) const {
+    return id.EcalTriggerElectronicsId_ != EcalTriggerElectronicsId_;
+  }
   /// Compare the id to another id for use in a map
-  int operator<(const EcalTriggerElectronicsId& id) const { return EcalTriggerElectronicsId_<id.EcalTriggerElectronicsId_; }
-  
- private:
-  
+  int operator<(const EcalTriggerElectronicsId& id) const {
+    return EcalTriggerElectronicsId_ < id.EcalTriggerElectronicsId_;
+  }
+
+private:
   uint32_t EcalTriggerElectronicsId_;
 };
 
-std::ostream& operator<<(std::ostream&,const EcalTriggerElectronicsId&);
+std::ostream& operator<<(std::ostream&, const EcalTriggerElectronicsId&);
 
-  
 #endif
diff --git a/DataFormats/EcalDetId/src/EBDetId.cc b/DataFormats/EcalDetId/src/EBDetId.cc
index 48ebac50fa1ad..d73763dcc9f67 100644
--- a/DataFormats/EcalDetId/src/EBDetId.cc
+++ b/DataFormats/EcalDetId/src/EBDetId.cc
@@ -2,129 +2,112 @@
 #include "FWCore/Utilities/interface/Exception.h"
 
 #include <algorithm>
-const int EBDetId::kModuleBoundaries[4] = { 25, 45, 65, 85 };
+const int EBDetId::kModuleBoundaries[4] = {25, 45, 65, 85};
 
 // pi / 180.
 const float EBDetId::crystalUnitToEta = 0.017453292519943295;
 
- 
-EBDetId::EBDetId(int index1, int index2, int mode) 
-  : DetId(Ecal,EcalBarrel)
-{
+EBDetId::EBDetId(int index1, int index2, int mode) : DetId(Ecal, EcalBarrel) {
   int crystal_ieta;
   int crystal_iphi;
   if (mode == ETAPHIMODE) {
     crystal_ieta = index1;
-    crystal_iphi = index2;  
+    crystal_iphi = index2;
   } else if (mode == SMCRYSTALMODE) {
     int SM = index1;
     int crystal = index2;
-    int i = (int)  floor((crystal-1) / kCrystalsInPhi);
-    int j = ((crystal-1) - (kCrystalsInPhi*i));
+    int i = (int)floor((crystal - 1) / kCrystalsInPhi);
+    int j = ((crystal - 1) - (kCrystalsInPhi * i));
     if (SM <= 18) {
       crystal_ieta = i + 1;
-      crystal_iphi = ((SM-1) * kCrystalsInPhi) + (kCrystalsInPhi-j);
+      crystal_iphi = ((SM - 1) * kCrystalsInPhi) + (kCrystalsInPhi - j);
     } else {
-      crystal_ieta = -(i+1);
-      crystal_iphi = ((SM-19) * kCrystalsInPhi) + j+1;
+      crystal_ieta = -(i + 1);
+      crystal_iphi = ((SM - 19) * kCrystalsInPhi) + j + 1;
     }
   } else {
-    throw cms::Exception("InvalidDetId") << "EBDetId:  Cannot create object.  Unknown mode for (int, int) constructor."; 
+    throw cms::Exception("InvalidDetId") << "EBDetId:  Cannot create object.  Unknown mode for (int, int) constructor.";
   }
 
-  if ( !validDetId(crystal_ieta, crystal_iphi) ) {
+  if (!validDetId(crystal_ieta, crystal_iphi)) {
     //    std::cout << "crystal_eta " << crystal_ieta << "crystal_phi " << crystal_iphi << std::endl;
-    throw cms::Exception("InvalidDetId") << "EBDetId:  Cannot create object.  Indexes out of bounds \n" 
+    throw cms::Exception("InvalidDetId") << "EBDetId:  Cannot create object.  Indexes out of bounds \n"
                                          << "eta = " << crystal_ieta << " phi = " << crystal_iphi;
   }
-  id_|=((crystal_ieta>0)?(0x10000|(crystal_ieta<<9)):((-crystal_ieta)<<9))|(crystal_iphi&0x1FF);
+  id_ |= ((crystal_ieta > 0) ? (0x10000 | (crystal_ieta << 9)) : ((-crystal_ieta) << 9)) | (crystal_iphi & 0x1FF);
 }
-  
 
-
-//Following TB 2004  numbering scheme 
+//Following TB 2004  numbering scheme
 int EBDetId::ic() const {
-  int ie = ietaAbs() -1;
-  return  (ie * kCrystalsInPhi)
-    +  ( positiveZ() ?
-	 ( kCrystalsInPhi - ( (iphi() -1 ) % kCrystalsInPhi ) )
-	 : ( ( iphi() -1 ) % kCrystalsInPhi  + 1)  
-	 );
+  int ie = ietaAbs() - 1;
+  return (ie * kCrystalsInPhi) +
+         (positiveZ() ? (kCrystalsInPhi - ((iphi() - 1) % kCrystalsInPhi)) : ((iphi() - 1) % kCrystalsInPhi + 1));
 }
 
-
 //Maintains SM crystals in bunch of 1700 indices
-int EBDetId::numberBySM() const {
-  return (ism()-1) * kCrystalsPerSM + ic() -1;
-}
-
-EBDetId EBDetId::offsetBy(int nrStepsEta, int nrStepsPhi ) const
-{
-        int newEta = ieta()+nrStepsEta;
-        if( newEta*ieta() <= 0 ) {
-                if( ieta() < 0 ) {
-                        newEta++;
-                } else if ( ieta() > 0 ) {
-                        newEta--;
-                }
-        }
-        int newPhi = iphi() + nrStepsPhi;
-        while ( newPhi>360 ) newPhi -= 360;
-        while ( newPhi<=0  ) newPhi += 360;
-
-        if( validDetId( newEta, newPhi ) ) {
-                return EBDetId( newEta, newPhi);
-        } else {
-                return EBDetId(0);
-        }
+int EBDetId::numberBySM() const { return (ism() - 1) * kCrystalsPerSM + ic() - 1; }
+
+EBDetId EBDetId::offsetBy(int nrStepsEta, int nrStepsPhi) const {
+  int newEta = ieta() + nrStepsEta;
+  if (newEta * ieta() <= 0) {
+    if (ieta() < 0) {
+      newEta++;
+    } else if (ieta() > 0) {
+      newEta--;
+    }
+  }
+  int newPhi = iphi() + nrStepsPhi;
+  while (newPhi > 360)
+    newPhi -= 360;
+  while (newPhi <= 0)
+    newPhi += 360;
+
+  if (validDetId(newEta, newPhi)) {
+    return EBDetId(newEta, newPhi);
+  } else {
+    return EBDetId(0);
+  }
 }
 
-EBDetId EBDetId::switchZSide() const
-{
-        int newEta = ieta()*-1;
-        if( validDetId( newEta, iphi() ) ) {
-                return EBDetId( newEta, iphi() );
-        } else {
-                return EBDetId(0);
-        }
+EBDetId EBDetId::switchZSide() const {
+  int newEta = ieta() * -1;
+  if (validDetId(newEta, iphi())) {
+    return EBDetId(newEta, iphi());
+  } else {
+    return EBDetId(0);
+  }
 }
 
-
-DetId EBDetId::offsetBy(const DetId startId, int nrStepsEta, int nrStepsPhi )
-{
-        if( startId.det() == DetId::Ecal && startId.subdetId() == EcalBarrel ) {
-                EBDetId ebStartId(startId);
-                return ebStartId.offsetBy( nrStepsEta, nrStepsPhi ).rawId();
-        } else {
-                return DetId(0);
-        }
+DetId EBDetId::offsetBy(const DetId startId, int nrStepsEta, int nrStepsPhi) {
+  if (startId.det() == DetId::Ecal && startId.subdetId() == EcalBarrel) {
+    EBDetId ebStartId(startId);
+    return ebStartId.offsetBy(nrStepsEta, nrStepsPhi).rawId();
+  } else {
+    return DetId(0);
+  }
 }
 
-DetId EBDetId::switchZSide( const DetId startId )
-{
-        if( startId.det() == DetId::Ecal && startId.subdetId() == EcalBarrel ) {
-                EBDetId ebStartId(startId);
-                return ebStartId.switchZSide().rawId();
-        } else {
-                return DetId(0);
-        }
+DetId EBDetId::switchZSide(const DetId startId) {
+  if (startId.det() == DetId::Ecal && startId.subdetId() == EcalBarrel) {
+    EBDetId ebStartId(startId);
+    return ebStartId.switchZSide().rawId();
+  } else {
+    return DetId(0);
+  }
 }
 
 //corrects for HB/EB differing iphi=1
-int EBDetId::tower_iphi() const { 
-  int iphi_simple=((iphi()-1)/5)+1; 
-  iphi_simple-=2;
-  return ((iphi_simple<=0)?(iphi_simple+72):(iphi_simple));
+int EBDetId::tower_iphi() const {
+  int iphi_simple = ((iphi() - 1) / 5) + 1;
+  iphi_simple -= 2;
+  return ((iphi_simple <= 0) ? (iphi_simple + 72) : (iphi_simple));
 }
 
-
-bool EBDetId::isNextToBoundary(EBDetId id) {
-  return isNextToEtaBoundary( id ) || isNextToPhiBoundary( id );
-}
+bool EBDetId::isNextToBoundary(EBDetId id) { return isNextToEtaBoundary(id) || isNextToPhiBoundary(id); }
 
 bool EBDetId::isNextToEtaBoundary(EBDetId id) {
   int ieta = id.ietaSM();
-  return ieta == 1 || (kModuleBoundaries + 4)!=std::find( kModuleBoundaries, kModuleBoundaries + 4, ieta );
+  return ieta == 1 || (kModuleBoundaries + 4) != std::find(kModuleBoundaries, kModuleBoundaries + 4, ieta);
 }
 
 bool EBDetId::isNextToPhiBoundary(EBDetId id) {
@@ -132,37 +115,34 @@ bool EBDetId::isNextToPhiBoundary(EBDetId id) {
   return iphi == 1 || iphi == 20;
 }
 
-int EBDetId::distanceEta(const EBDetId& a,const EBDetId& b)
-{
+int EBDetId::distanceEta(const EBDetId& a, const EBDetId& b) {
   if (a.ieta() * b.ieta() > 0)
-    return abs(a.ieta()-b.ieta());
+    return abs(a.ieta() - b.ieta());
   else
-    return abs(a.ieta()-b.ieta())-1;
+    return abs(a.ieta() - b.ieta()) - 1;
 }
 
-int EBDetId::distancePhi(const EBDetId& a,const EBDetId& b) {
+int EBDetId::distancePhi(const EBDetId& a, const EBDetId& b) {
   int PI = 180;
-  int  result = a.iphi() - b.iphi();
-  
-  while  (result > PI)    result -= 2*PI;
-  while  (result <= -PI)  result += 2*PI;
-  return abs(result);
+  int result = a.iphi() - b.iphi();
 
+  while (result > PI)
+    result -= 2 * PI;
+  while (result <= -PI)
+    result += 2 * PI;
+  return abs(result);
 }
 
-float EBDetId::approxEta( const DetId id ) {
-  if( id.subdetId() == EcalBarrel ) {
-    EBDetId ebId( id );
+float EBDetId::approxEta(const DetId id) {
+  if (id.subdetId() == EcalBarrel) {
+    EBDetId ebId(id);
     return ebId.approxEta();
   } else {
     return 0;
   }
 }
-  
 
-#include<ostream>
-std::ostream& operator<<(std::ostream& s,const EBDetId& id) {
-  return s << "(EB ieta " << id.ieta() << ", iphi " << id.iphi() 
-	   << " ; ism " << id.ism() << " , ic " << id.ic()  << ')';
+#include <ostream>
+std::ostream& operator<<(std::ostream& s, const EBDetId& id) {
+  return s << "(EB ieta " << id.ieta() << ", iphi " << id.iphi() << " ; ism " << id.ism() << " , ic " << id.ic() << ')';
 }
-  
diff --git a/DataFormats/EcalDetId/src/EEDetId.cc b/DataFormats/EcalDetId/src/EEDetId.cc
index f0ac508870dc3..3e674974f8283 100644
--- a/DataFormats/EcalDetId/src/EEDetId.cc
+++ b/DataFormats/EcalDetId/src/EEDetId.cc
@@ -1,121 +1,81 @@
 #include "DataFormats/EcalDetId/interface/EEDetId.h"
 #include "FWCore/Utilities/interface/Exception.h"
-    
+
 #include <algorithm>
-   
-const int EEDetId::QuadColLimits[EEDetId::nCols+1] = { 0, 8,17,27,36,45,54,62,70,76,79 };
 
-const int EEDetId::iYoffset[EEDetId::nCols+1]      = { 0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0 };
+const int EEDetId::QuadColLimits[EEDetId::nCols + 1] = {0, 8, 17, 27, 36, 45, 54, 62, 70, 76, 79};
+
+const int EEDetId::iYoffset[EEDetId::nCols + 1] = {0, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0};
 
 const unsigned short EEDetId::kxf[] = {
-  41,  51,  41,  51,  41,  51,  36,  51,  36,  51,
-  26,  51,  26,  51,  26,  51,  21,  51,  21,  51,
-  21,  51,  21,  51,  21,  51,  16,  51,  16,  51,
-  14,  51,  14,  51,  14,  51,  14,  51,  14,  51,
-   9,  51,   9,  51,   9,  51,   9,  51,   9,  51,
-   6,  51,   6,  51,   6,  51,   6,  51,   6,  51,
-   6,  51,   6,  51,   6,  51,   6,  51,   6,  51,
-   4,  51,   4,  51,   4,  51,   4,  51,   4,  56,
-   1,  58,   1,  59,   1,  60,   1,  61,   1,  61,
-   1,  62,   1,  62,   1,  62,   1,  62,   1,  62,
-   1,  62,   1,  62,   1,  62,   1,  62,   1,  62,
-   1,  61,   1,  61,   1,  60,   1,  59,   1,  58,
-   4,  56,   4,  51,   4,  51,   4,  51,   4,  51,
-   6,  51,   6,  51,   6,  51,   6,  51,   6,  51,
-   6,  51,   6,  51,   6,  51,   6,  51,   6,  51,
-   9,  51,   9,  51,   9,  51,   9,  51,   9,  51,
-  14,  51,  14,  51,  14,  51,  14,  51,  14,  51,
-  16,  51,  16,  51,  21,  51,  21,  51,  21,  51,
-  21,  51,  21,  51,  26,  51,  26,  51,  26,  51,
-  36,  51,  36,  51,  41,  51,  41,  51,  41,  51
-} ;
+    41, 51, 41, 51, 41, 51, 36, 51, 36, 51, 26, 51, 26, 51, 26, 51, 21, 51, 21, 51, 21, 51, 21, 51, 21, 51, 16, 51, 16,
+    51, 14, 51, 14, 51, 14, 51, 14, 51, 14, 51, 9,  51, 9,  51, 9,  51, 9,  51, 9,  51, 6,  51, 6,  51, 6,  51, 6,  51,
+    6,  51, 6,  51, 6,  51, 6,  51, 6,  51, 6,  51, 4,  51, 4,  51, 4,  51, 4,  51, 4,  56, 1,  58, 1,  59, 1,  60, 1,
+    61, 1,  61, 1,  62, 1,  62, 1,  62, 1,  62, 1,  62, 1,  62, 1,  62, 1,  62, 1,  62, 1,  62, 1,  61, 1,  61, 1,  60,
+    1,  59, 1,  58, 4,  56, 4,  51, 4,  51, 4,  51, 4,  51, 6,  51, 6,  51, 6,  51, 6,  51, 6,  51, 6,  51, 6,  51, 6,
+    51, 6,  51, 6,  51, 9,  51, 9,  51, 9,  51, 9,  51, 9,  51, 14, 51, 14, 51, 14, 51, 14, 51, 14, 51, 16, 51, 16, 51,
+    21, 51, 21, 51, 21, 51, 21, 51, 21, 51, 26, 51, 26, 51, 26, 51, 36, 51, 36, 51, 41, 51, 41, 51, 41, 51};
 
 const unsigned short EEDetId::kdi[] = {
-    0,   10,   20,   30,   40,   50,   60,   75,   90,  105,
-  120,  145,  170,  195,  220,  245,  270,  300,  330,  360,
-  390,  420,  450,  480,  510,  540,  570,  605,  640,  675,
-  710,  747,  784,  821,  858,  895,  932,  969, 1006, 1043,
- 1080, 1122, 1164, 1206, 1248, 1290, 1332, 1374, 1416, 1458,
- 1500, 1545, 1590, 1635, 1680, 1725, 1770, 1815, 1860, 1905,
- 1950, 1995, 2040, 2085, 2130, 2175, 2220, 2265, 2310, 2355,
- 2400, 2447, 2494, 2541, 2588, 2635, 2682, 2729, 2776, 2818,
- 2860, 2903, 2946, 2988, 3030, 3071, 3112, 3152, 3192, 3232,
- 3272, 3311, 3350, 3389, 3428, 3467, 3506, 3545, 3584, 3623,
- 3662, 3701, 3740, 3779, 3818, 3857, 3896, 3935, 3974, 4013,
- 4052, 4092, 4132, 4172, 4212, 4253, 4294, 4336, 4378, 4421,
- 4464, 4506, 4548, 4595, 4642, 4689, 4736, 4783, 4830, 4877,
- 4924, 4969, 5014, 5059, 5104, 5149, 5194, 5239, 5284, 5329,
- 5374, 5419, 5464, 5509, 5554, 5599, 5644, 5689, 5734, 5779,
- 5824, 5866, 5908, 5950, 5992, 6034, 6076, 6118, 6160, 6202,
- 6244, 6281, 6318, 6355, 6392, 6429, 6466, 6503, 6540, 6577,
- 6614, 6649, 6684, 6719, 6754, 6784, 6814, 6844, 6874, 6904,
- 6934, 6964, 6994, 7024, 7054, 7079, 7104, 7129, 7154, 7179,
- 7204, 7219, 7234, 7249, 7264, 7274, 7284, 7294, 7304, 7314
-} ;
-
-EEDetId::EEDetId( int index1, int index2, int iz, int mode ) : DetId( Ecal, EcalEndcap ) 
-{
-   int crystal_ix=0;
-   int crystal_iy=0;
-   if (mode == XYMODE) 
-   {
-      crystal_ix = index1;
-      crystal_iy = index2;  
-   } 
-   else if (mode == SCCRYSTALMODE) 
-   {
-      int SC = index1;
-      int crystal = index2;
-      //      std::cout << "iz " << iz << " SC " << index1 << "crystal " << index2  << std::endl;
-      
-      crystal_ix=iz*ix(SC,crystal);
-      if (crystal_ix<0)
-	crystal_ix++;
-      crystal_ix+=50;
-      crystal_iy=iy(SC,crystal);
-      if (crystal_iy<0)
-	 crystal_iy++;
-      crystal_iy+=50;
-
-   } 
-   else 
-   {
-      throw cms::Exception("InvalidDetId") << "EEDetId:  Cannot create object.  Unknown mode for (int, int, int) constructor.";
-   }
-  
-   if (!validDetId(crystal_ix,crystal_iy,iz))
-   {
-      throw cms::Exception("InvalidDetId") << "EEDetId:  Cannot create object.  Indexes out of bounds \n"
-                                           << "x = " << crystal_ix << " y = " << crystal_iy << " z = " << iz;
-   }
-  
-   id_|=(crystal_iy&0x7f)|((crystal_ix&0x7f)<<7)|((iz>0)?(0x4000):(0));
+    0,    10,   20,   30,   40,   50,   60,   75,   90,   105,  120,  145,  170,  195,  220,  245,  270,  300,  330,
+    360,  390,  420,  450,  480,  510,  540,  570,  605,  640,  675,  710,  747,  784,  821,  858,  895,  932,  969,
+    1006, 1043, 1080, 1122, 1164, 1206, 1248, 1290, 1332, 1374, 1416, 1458, 1500, 1545, 1590, 1635, 1680, 1725, 1770,
+    1815, 1860, 1905, 1950, 1995, 2040, 2085, 2130, 2175, 2220, 2265, 2310, 2355, 2400, 2447, 2494, 2541, 2588, 2635,
+    2682, 2729, 2776, 2818, 2860, 2903, 2946, 2988, 3030, 3071, 3112, 3152, 3192, 3232, 3272, 3311, 3350, 3389, 3428,
+    3467, 3506, 3545, 3584, 3623, 3662, 3701, 3740, 3779, 3818, 3857, 3896, 3935, 3974, 4013, 4052, 4092, 4132, 4172,
+    4212, 4253, 4294, 4336, 4378, 4421, 4464, 4506, 4548, 4595, 4642, 4689, 4736, 4783, 4830, 4877, 4924, 4969, 5014,
+    5059, 5104, 5149, 5194, 5239, 5284, 5329, 5374, 5419, 5464, 5509, 5554, 5599, 5644, 5689, 5734, 5779, 5824, 5866,
+    5908, 5950, 5992, 6034, 6076, 6118, 6160, 6202, 6244, 6281, 6318, 6355, 6392, 6429, 6466, 6503, 6540, 6577, 6614,
+    6649, 6684, 6719, 6754, 6784, 6814, 6844, 6874, 6904, 6934, 6964, 6994, 7024, 7054, 7079, 7104, 7129, 7154, 7179,
+    7204, 7219, 7234, 7249, 7264, 7274, 7284, 7294, 7304, 7314};
+
+EEDetId::EEDetId(int index1, int index2, int iz, int mode) : DetId(Ecal, EcalEndcap) {
+  int crystal_ix = 0;
+  int crystal_iy = 0;
+  if (mode == XYMODE) {
+    crystal_ix = index1;
+    crystal_iy = index2;
+  } else if (mode == SCCRYSTALMODE) {
+    int SC = index1;
+    int crystal = index2;
+    //      std::cout << "iz " << iz << " SC " << index1 << "crystal " << index2  << std::endl;
+
+    crystal_ix = iz * ix(SC, crystal);
+    if (crystal_ix < 0)
+      crystal_ix++;
+    crystal_ix += 50;
+    crystal_iy = iy(SC, crystal);
+    if (crystal_iy < 0)
+      crystal_iy++;
+    crystal_iy += 50;
+
+  } else {
+    throw cms::Exception("InvalidDetId")
+        << "EEDetId:  Cannot create object.  Unknown mode for (int, int, int) constructor.";
+  }
+
+  if (!validDetId(crystal_ix, crystal_iy, iz)) {
+    throw cms::Exception("InvalidDetId") << "EEDetId:  Cannot create object.  Indexes out of bounds \n"
+                                         << "x = " << crystal_ix << " y = " << crystal_iy << " z = " << iz;
+  }
+
+  id_ |= (crystal_iy & 0x7f) | ((crystal_ix & 0x7f) << 7) | ((iz > 0) ? (0x4000) : (0));
 }
-  
-
-  
-
-EEDetId 
-EEDetId::unhashIndex( int hi )
-{
-   if( validHashIndex( hi ) )
-   {
-      const int iz ( hi<kEEhalf ? -1 : 1 ) ;
-      const uint32_t di ( hi%kEEhalf ) ;
-      const int ii ( ( std::upper_bound( kdi, kdi+(2*IY_MAX), di ) - kdi ) - 1 ) ;
-      const int iy ( 1 + ii/2 ) ;
-      const int ix ( kxf[ii] + di - kdi[ii] ) ;
-      return EEDetId( ix, iy, iz ) ;
-   }
-   else
-   {
-      return EEDetId() ;
-   }
+
+EEDetId EEDetId::unhashIndex(int hi) {
+  if (validHashIndex(hi)) {
+    const int iz(hi < kEEhalf ? -1 : 1);
+    const uint32_t di(hi % kEEhalf);
+    const int ii((std::upper_bound(kdi, kdi + (2 * IY_MAX), di) - kdi) - 1);
+    const int iy(1 + ii / 2);
+    const int ix(kxf[ii] + di - kdi[ii]);
+    return EEDetId(ix, iy, iz);
+  } else {
+    return EEDetId();
+  }
 }
 
-int 
-EEDetId::ix( int iSC, int iCrys ) const 
-{
+int EEDetId::ix(int iSC, int iCrys) const {
   /*
    *  ix() return individual crystal x-coordinate
    *
@@ -126,60 +86,51 @@ EEDetId::ix( int iSC, int iCrys ) const
    *
    *  Input     : iSC, iCrys - Supercrystal and crystal ids
    */
-  
-  
-   int nSCinQuadrant = QuadColLimits[nCols];
-
-   if (iSC > 4*nSCinQuadrant || iSC < 1) 
-   {
-      throw new std::exception();
-   }
-  
-   //  Map SC number into (x>0,y>0) quadrant.
-   int iSCmap, iqx,iq;
-   if (iSC > 3*nSCinQuadrant) 
-   {
-      iSCmap = iSC - 3*nSCinQuadrant;
-      iqx =  1;
-      iq=4;
-   } 
-   else if (iSC > 2*nSCinQuadrant) 
-   {
-      iSCmap = iSC - 2*nSCinQuadrant;
-      iqx = -1;
-      iq=3;
-   } 
-   else if (iSC > nSCinQuadrant) 
-   {
-      iSCmap = iSC - nSCinQuadrant;
-      iqx = -1;
-      iq=2;
-   } 
-   else 
-   {
-      iSCmap = iSC;
-      iqx = 1;
-      iq=1;
-   }
-
-   // Decide which column the SC is in
-   int iCol = 0 ;
-   while (iSCmap > QuadColLimits[iCol++]) ;
-   iCol-- ;
-
-   int ixCrys=-1;
-   if (iq == 1 || iq == 3) 
-      ixCrys = iqx*(5*(iCol-1) + (int)(iCrys+4)/5);
-   else   if (iq == 2 || iq == 4) 
-      ixCrys = iqx*(5*(iCol-1) + (iCrys-1)%5 + 1);
-   
-   // returning a value from 1 to 100  
-
-   return ixCrys;
+
+  int nSCinQuadrant = QuadColLimits[nCols];
+
+  if (iSC > 4 * nSCinQuadrant || iSC < 1) {
+    throw new std::exception();
+  }
+
+  //  Map SC number into (x>0,y>0) quadrant.
+  int iSCmap, iqx, iq;
+  if (iSC > 3 * nSCinQuadrant) {
+    iSCmap = iSC - 3 * nSCinQuadrant;
+    iqx = 1;
+    iq = 4;
+  } else if (iSC > 2 * nSCinQuadrant) {
+    iSCmap = iSC - 2 * nSCinQuadrant;
+    iqx = -1;
+    iq = 3;
+  } else if (iSC > nSCinQuadrant) {
+    iSCmap = iSC - nSCinQuadrant;
+    iqx = -1;
+    iq = 2;
+  } else {
+    iSCmap = iSC;
+    iqx = 1;
+    iq = 1;
+  }
+
+  // Decide which column the SC is in
+  int iCol = 0;
+  while (iSCmap > QuadColLimits[iCol++])
+    ;
+  iCol--;
+
+  int ixCrys = -1;
+  if (iq == 1 || iq == 3)
+    ixCrys = iqx * (5 * (iCol - 1) + (int)(iCrys + 4) / 5);
+  else if (iq == 2 || iq == 4)
+    ixCrys = iqx * (5 * (iCol - 1) + (iCrys - 1) % 5 + 1);
+
+  // returning a value from 1 to 100
+
+  return ixCrys;
 }
 
-int EEDetId::iy( int iSC, int iCrys ) const 
-{
+int EEDetId::iy(int iSC, int iCrys) const {
   /*
    *  iy() return individual crystal y-coordinate
    *
@@ -191,139 +142,108 @@ int EEDetId::iy( int iSC, int iCrys ) const
    *  Input     : iSC, iCrys - Supercrystal and crystal ids
    */
 
-   int nSCinQuadrant = QuadColLimits[nCols];
-   if (iSC > 4*nSCinQuadrant || iSC < 1) 
-   {
-      throw new std::exception();
-   }
-
-   //  Map SC number into (x>0,y>0) quadrant
-   int iSCmap, iqy,iq;
-   if (iSC > 3*nSCinQuadrant) 
-   {
-      iSCmap = iSC - 3*nSCinQuadrant;
-      iqy = -1;
-      iq=4;
-   } 
-   else if (iSC > 2*nSCinQuadrant) 
-   {
-      iSCmap = iSC - 2*nSCinQuadrant;
-      iqy = -1;
-      iq=3;
-   } 
-   else if (iSC > nSCinQuadrant) 
-   {
-      iSCmap = iSC - nSCinQuadrant;
-      iqy = 1;
-      iq=2;
-   } else 
-   {
-      iSCmap = iSC;
-      iqy = 1;
-      iq=1;
-   }
-
-   // Decide which column the SC is in
-   int iCol = 0;
-   while (iSCmap > QuadColLimits[iCol++]) ;
-   iCol--;
-
-   int iSCy = iSCmap - QuadColLimits[iCol-1] + iYoffset[iCol];
-  
-   int iyCrys=-1;
-   if (iq == 1 || iq == 3)
-      iyCrys = iqy*(5*(iSCy-1) + (iCrys-1)%5 + 1);
-   else if (iq == 2 || iq == 4)
-      iyCrys = iqy*(5*(iSCy-1) + (int)(iCrys+4)/5 );
-   return iyCrys;
+  int nSCinQuadrant = QuadColLimits[nCols];
+  if (iSC > 4 * nSCinQuadrant || iSC < 1) {
+    throw new std::exception();
+  }
+
+  //  Map SC number into (x>0,y>0) quadrant
+  int iSCmap, iqy, iq;
+  if (iSC > 3 * nSCinQuadrant) {
+    iSCmap = iSC - 3 * nSCinQuadrant;
+    iqy = -1;
+    iq = 4;
+  } else if (iSC > 2 * nSCinQuadrant) {
+    iSCmap = iSC - 2 * nSCinQuadrant;
+    iqy = -1;
+    iq = 3;
+  } else if (iSC > nSCinQuadrant) {
+    iSCmap = iSC - nSCinQuadrant;
+    iqy = 1;
+    iq = 2;
+  } else {
+    iSCmap = iSC;
+    iqy = 1;
+    iq = 1;
+  }
+
+  // Decide which column the SC is in
+  int iCol = 0;
+  while (iSCmap > QuadColLimits[iCol++])
+    ;
+  iCol--;
+
+  int iSCy = iSCmap - QuadColLimits[iCol - 1] + iYoffset[iCol];
+
+  int iyCrys = -1;
+  if (iq == 1 || iq == 3)
+    iyCrys = iqy * (5 * (iSCy - 1) + (iCrys - 1) % 5 + 1);
+  else if (iq == 2 || iq == 4)
+    iyCrys = iqy * (5 * (iSCy - 1) + (int)(iCrys + 4) / 5);
+  return iyCrys;
 }
 
-int EEDetId::ixQuadrantOne() const
-{ 
-   int iQuadrant = iquadrant();
-   if ( iQuadrant == 1 || iQuadrant == 4)
-      return (ix() - 50);
-   else if ( iQuadrant == 2 || iQuadrant == 3)
-      return (51 - ix());
-   //Should never be reached
-   return -1;
+int EEDetId::ixQuadrantOne() const {
+  int iQuadrant = iquadrant();
+  if (iQuadrant == 1 || iQuadrant == 4)
+    return (ix() - 50);
+  else if (iQuadrant == 2 || iQuadrant == 3)
+    return (51 - ix());
+  //Should never be reached
+  return -1;
 }
 
-int EEDetId::iyQuadrantOne() const
-{ 
-   int iQuadrant = iquadrant();
-   if ( iQuadrant == 1 || iQuadrant == 2)
-      return (iy() - 50);
-   else if ( iQuadrant == 3 || iQuadrant == 4)
-      return 51 - iy();
-   //Should never be reached
-   return -1;
+int EEDetId::iyQuadrantOne() const {
+  int iQuadrant = iquadrant();
+  if (iQuadrant == 1 || iQuadrant == 2)
+    return (iy() - 50);
+  else if (iQuadrant == 3 || iQuadrant == 4)
+    return 51 - iy();
+  //Should never be reached
+  return -1;
 }
 
-int 
-EEDetId::iquadrant() const 
-{
-   if (ix()>50)
-   {
-      if(iy()>50)
-	 return 1;
-      else
-	 return 4;
-   }
-   else
-   {
-      if(iy()>50)
-	 return 2;
-      else
-	 return 3;
-   }
-   //Should never be reached
-   return -1;
-}  
-
-int 
-EEDetId::isc() const
-{ 
-   return isc( 1 + ( ix() - 1 )/nCrys,
-	       1 + ( iy() - 1 )/nCrys ) ; 
+int EEDetId::iquadrant() const {
+  if (ix() > 50) {
+    if (iy() > 50)
+      return 1;
+    else
+      return 4;
+  } else {
+    if (iy() > 50)
+      return 2;
+    else
+      return 3;
+  }
+  //Should never be reached
+  return -1;
+}
+
+int EEDetId::isc() const { return isc(1 + (ix() - 1) / nCrys, 1 + (iy() - 1) / nCrys); }
+
+int EEDetId::isc(int jx, int jy) {
+  if (0 < jx && 21 > jx && 0 < jy && 21 > jy) {
+    const int iquad((10 < jx && 10 < jy ? 1 : (11 > jx && 10 < jy ? 2 : (11 > jx && 11 > jy ? 3 : 4))));
+
+    const int iCol = (1 == iquad || 4 == iquad ? jx - 10 : 11 - jx);
+    const int iRow = (1 == iquad || 2 == iquad ? jy - 10 : 11 - jy);
+
+    static const int nSCinQuadrant = ISC_MAX / 4;
+
+    const int yOff(iYoffset[iCol]);
+
+    const int qOff(nSCinQuadrant * (iquad - 1));
+
+    const int iscOne(QuadColLimits[iCol - 1] + iRow - yOff);
+
+    return (yOff >= iRow ? -1 : (QuadColLimits[iCol] < iscOne ? -2 : iscOne + qOff));
+  } else {
+    return -3;  // bad inputs
+  }
 }
 
-int 
-EEDetId::isc( int jx, int jy ) 
-{
-   if( 0  < jx &&
-       21 > jx &&
-       0  < jy &&
-       21 > jy    )
-   {
-      const int iquad (  ( 10<jx && 10<jy ? 1 :
-			   ( 11>jx && 10<jy ? 2 :
-			     ( 11>jx && 11>jy ? 3 : 4 ) ) ) ) ;
-  
-      const int iCol = ( 1 == iquad || 4 == iquad ? jx - 10 : 11 - jx ) ;
-      const int iRow = ( 1 == iquad || 2 == iquad ? jy - 10 : 11 - jy ) ;
-
-      static const int nSCinQuadrant = ISC_MAX/4;
-
-      const int yOff ( iYoffset[iCol] ) ;
-
-      const int qOff ( nSCinQuadrant*( iquad - 1 ) ) ;
-
-      const int iscOne ( QuadColLimits[iCol-1] + iRow - yOff ) ;
-
-      return ( yOff                >= iRow   ? -1 : 
-	       ( QuadColLimits[iCol] <  iscOne ? -2 :
-		 iscOne + qOff ) ) ;
-   }
-   else
-   {
-      return -3 ; // bad inputs
-   }
-}  
-
-int EEDetId::ic() const 
-{
-   /*
+int EEDetId::ic() const {
+  /*
     *  Return crystal number from (x,y) coordinates.
     *
     *  Author    : B W Kennedy
@@ -333,260 +253,229 @@ int EEDetId::ic() const
     *
     *  Input     : ix, iy - (x,y) position of crystal
     */
-   
-   /*  Useful constants . */
-   int iQuadrant = iquadrant();
-   int icrCol=-1;
-   int icrRow=-1;
-   
-   if (iQuadrant == 1 || iQuadrant == 3)
-   {
-      icrCol=(ixQuadrantOne()-1) % nCrys;
-      icrRow=(iyQuadrantOne()-1) % nCrys;
-   }
-  
-   else if (iQuadrant == 2 || iQuadrant == 4)
-   {
-      icrRow=(ixQuadrantOne()-1) % nCrys;
-      icrCol=(iyQuadrantOne()-1) % nCrys;
-   } 
-
-   int icrys = 5*icrCol + icrRow + 1;
-  
-   return icrys;
-}  
-
-
-bool 
-EEDetId::isNextToBoundary( EEDetId id ) 
-{
-   return isNextToDBoundary( id ) || isNextToRingBoundary( id ) ;
-}
 
-bool 
-EEDetId::isNextToDBoundary( EEDetId id ) 
-{
-   // hardcoded values for D boundary
-   return id.ix() == 50 || id.ix() == 51 ;
-}
+  /*  Useful constants . */
+  int iQuadrant = iquadrant();
+  int icrCol = -1;
+  int icrRow = -1;
 
+  if (iQuadrant == 1 || iQuadrant == 3) {
+    icrCol = (ixQuadrantOne() - 1) % nCrys;
+    icrRow = (iyQuadrantOne() - 1) % nCrys;
+  }
 
-bool 
-EEDetId::isNextToRingBoundary(EEDetId id) 
-{
-   for (int i = -1; i <= 1; ++i) {
-      for (int j = -1; j <= 1; ++j) {
-	 if ( ! validDetId( id.ix() + i, id.iy() + j, id.zside() ) ) {
-	    return true;
-	 }
-      }
-   }
-   return false;
-}
+  else if (iQuadrant == 2 || iQuadrant == 4) {
+    icrRow = (ixQuadrantOne() - 1) % nCrys;
+    icrCol = (iyQuadrantOne() - 1) % nCrys;
+  }
 
-int
-EEDetId::iPhiOuterRing() const
-{
-   int returnValue ( 0 ) ;
-   if( isOuterRing() )
-   {
-      const int ax ( abs( ix() - IX_MAX/2 ) ) ;
-      const int ay ( abs( iy() - IY_MAX/2 ) ) ;
-      returnValue = ax + 50 - ay ;
-      if( ay <= 47 ) --returnValue ;
-      if( ay <= 45 ) --returnValue ;
-      if( ay <= 42 ) --returnValue ;
-      if( ay <= 37 ) --returnValue ;
-      if( ay <= 35 ) --returnValue ;
-      if( ay <= 30 ) --returnValue ;
-      if( ay <= 25 ) --returnValue ;
-      if( ay <= 15 ) --returnValue ;
-      if( ay <= 10 ) --returnValue ;
-      const int iq ( iquadrant() ) ;
-      if( 1==iq )
-      {
-	 returnValue = 91 - returnValue ;
-      }
-      else
-      {
-	 if( 2==iq )
-	 {
-	    returnValue += 90 ;
-	 }
-	 else
-	 {
-	    if( 3==iq )
-	    {
-	       returnValue = 271 - returnValue ;
-	    }
-	    else
-	    {
-	       returnValue += 270 ;
-	    }
-	 }
-      }
-      returnValue = 1 + ( 360 + returnValue - 10 -1 )%360 ;
-   }
-//   if( positiveZ() ) returnValue += 360 ;
-   return returnValue ;
-}
+  int icrys = 5 * icrCol + icrRow + 1;
 
-EEDetId 
-EEDetId::idOuterRing( int iPhi , int zEnd )
-{
-   iPhi -= 10 ; // phi=1 in barrel is at -10deg
-   while( iPhi <   1 ) iPhi+=360 ;
-   while( iPhi > 360 ) iPhi-=360 ;
-
-   const int index1 ( iPhi - 1 ) ;
-   const int quad   ( index1/90 ) ;
-   int       indexq (  index1 - quad*90 + 1 ) ;
-   if( 0==quad || 2==quad ) indexq = 91 - indexq ;
-   const int indexh ( indexq > 45 ? 91 - indexq : indexq ) ;
-   const int axh    ( indexh<=10 ? indexh :
-		      ( indexh<=12 ? 10 :
-			( indexh<=17 ? indexh - 2 :
-			  ( indexh<=18 ? 15 :
-			    ( indexh<=28 ? indexh - 3 :
-			      ( indexh<=30 ? 25 :
-				( indexh<=35 ? indexh - 5 :
-				  ( indexh<=39 ? 30 :
-				    ( indexh<=44 ? indexh - 9 : 35 ))))))))) ;
-   const int ayh    ( indexh<=10 ? 50 :
-		      ( indexh<=12 ? 60 - indexh :
-			( indexh<=17 ? 47 :
-			  ( indexh<=18 ? 64 - indexh : 
-			    ( indexh<=28 ? 45 :
-			      ( indexh<=30 ? 73 - indexh :
-				( indexh<=35 ? 42 :
-				  ( indexh<=39 ? 77 - indexh :
-				    ( indexh<=44 ? 37 : 36 ))))))))) ;
-   const int bxh ( indexq>45 ? ayh : axh ) ;
-   const int byh ( indexq>45 ? axh : ayh ) ;
-   const int cx  ( ( quad==0 || quad==3 ? bxh : -bxh+1 ) + IX_MAX/2 ) ;
-   const int cy  ( ( quad==0 || quad==1 ? byh : -byh+1 ) + IY_MAX/2 ) ;
-
-   return EEDetId( cx, cy, ( zEnd > 0 ? 1 : -1 ) ) ;
+  return icrys;
 }
 
+bool EEDetId::isNextToBoundary(EEDetId id) { return isNextToDBoundary(id) || isNextToRingBoundary(id); }
 
-EEDetId 
-EEDetId::offsetBy(int nrStepsX, int nrStepsY ) const
-{
-        int newX = ix() + nrStepsX;
-        int newY = iy() + nrStepsY;
+bool EEDetId::isNextToDBoundary(EEDetId id) {
+  // hardcoded values for D boundary
+  return id.ix() == 50 || id.ix() == 51;
+}
 
-        if( validDetId( newX, newY, zside() ) ) {
-                return EEDetId( newX, newY, zside() );
-        } else {
-                return EEDetId(0);
-        }
+bool EEDetId::isNextToRingBoundary(EEDetId id) {
+  for (int i = -1; i <= 1; ++i) {
+    for (int j = -1; j <= 1; ++j) {
+      if (!validDetId(id.ix() + i, id.iy() + j, id.zside())) {
+        return true;
+      }
+    }
+  }
+  return false;
 }
 
-EEDetId
-EEDetId::switchZSide() const
-{
-        int newZSide = -1 * zside();
-        if( validDetId(ix(), iy(), newZSide ) ) {
-                return EEDetId( ix(), iy(), newZSide );
+int EEDetId::iPhiOuterRing() const {
+  int returnValue(0);
+  if (isOuterRing()) {
+    const int ax(abs(ix() - IX_MAX / 2));
+    const int ay(abs(iy() - IY_MAX / 2));
+    returnValue = ax + 50 - ay;
+    if (ay <= 47)
+      --returnValue;
+    if (ay <= 45)
+      --returnValue;
+    if (ay <= 42)
+      --returnValue;
+    if (ay <= 37)
+      --returnValue;
+    if (ay <= 35)
+      --returnValue;
+    if (ay <= 30)
+      --returnValue;
+    if (ay <= 25)
+      --returnValue;
+    if (ay <= 15)
+      --returnValue;
+    if (ay <= 10)
+      --returnValue;
+    const int iq(iquadrant());
+    if (1 == iq) {
+      returnValue = 91 - returnValue;
+    } else {
+      if (2 == iq) {
+        returnValue += 90;
+      } else {
+        if (3 == iq) {
+          returnValue = 271 - returnValue;
         } else {
-                return EEDetId(0);
+          returnValue += 270;
         }
+      }
+    }
+    returnValue = 1 + (360 + returnValue - 10 - 1) % 360;
+  }
+  //   if( positiveZ() ) returnValue += 360 ;
+  return returnValue;
 }
 
-DetId 
-EEDetId::offsetBy( const DetId startId, int nrStepsX, int nrStepsY )
-{
-        if( startId.det() == DetId::Ecal && startId.subdetId() == EcalEndcap ) {
-                EEDetId eeStartId( startId );
-                return eeStartId.offsetBy( nrStepsX, nrStepsY ).rawId();
-        } else {
-                return DetId(0);
-        }
+EEDetId EEDetId::idOuterRing(int iPhi, int zEnd) {
+  iPhi -= 10;  // phi=1 in barrel is at -10deg
+  while (iPhi < 1)
+    iPhi += 360;
+  while (iPhi > 360)
+    iPhi -= 360;
+
+  const int index1(iPhi - 1);
+  const int quad(index1 / 90);
+  int indexq(index1 - quad * 90 + 1);
+  if (0 == quad || 2 == quad)
+    indexq = 91 - indexq;
+  const int indexh(indexq > 45 ? 91 - indexq : indexq);
+  const int axh(
+      indexh <= 10
+          ? indexh
+          : (indexh <= 12
+                 ? 10
+                 : (indexh <= 17
+                        ? indexh - 2
+                        : (indexh <= 18
+                               ? 15
+                               : (indexh <= 28
+                                      ? indexh - 3
+                                      : (indexh <= 30
+                                             ? 25
+                                             : (indexh <= 35
+                                                    ? indexh - 5
+                                                    : (indexh <= 39 ? 30 : (indexh <= 44 ? indexh - 9 : 35)))))))));
+  const int ayh(
+      indexh <= 10
+          ? 50
+          : (indexh <= 12
+                 ? 60 - indexh
+                 : (indexh <= 17
+                        ? 47
+                        : (indexh <= 18
+                               ? 64 - indexh
+                               : (indexh <= 28
+                                      ? 45
+                                      : (indexh <= 30 ? 73 - indexh
+                                                      : (indexh <= 35 ? 42
+                                                                      : (indexh <= 39 ? 77 - indexh
+                                                                                      : (indexh <= 44 ? 37 : 36)))))))));
+  const int bxh(indexq > 45 ? ayh : axh);
+  const int byh(indexq > 45 ? axh : ayh);
+  const int cx((quad == 0 || quad == 3 ? bxh : -bxh + 1) + IX_MAX / 2);
+  const int cy((quad == 0 || quad == 1 ? byh : -byh + 1) + IY_MAX / 2);
+
+  return EEDetId(cx, cy, (zEnd > 0 ? 1 : -1));
 }
 
-DetId 
-EEDetId::switchZSide( const DetId startId )
-{
-        if( startId.det() == DetId::Ecal && startId.subdetId() == EcalEndcap ) {
-                EEDetId eeStartId(startId);
-                return eeStartId.switchZSide().rawId();
-        } else {
-                return DetId(0);
-        }
+EEDetId EEDetId::offsetBy(int nrStepsX, int nrStepsY) const {
+  int newX = ix() + nrStepsX;
+  int newY = iy() + nrStepsY;
+
+  if (validDetId(newX, newY, zside())) {
+    return EEDetId(newX, newY, zside());
+  } else {
+    return EEDetId(0);
+  }
 }
 
-bool 
-EEDetId::isOuterRing() const
-{
-   const int kx ( ix() ) ;
-   const int ky ( iy() ) ;
-   const int ax ( kx>IX_MAX/2 ? kx-IX_MAX/2 : IX_MAX/2 + 1 - kx ) ;
-   const int ay ( ky>IY_MAX/2 ? ky-IY_MAX/2 : IY_MAX/2 + 1 - ky ) ;
-   return ( isOuterRingXY( ax, ay ) ||
-	    isOuterRingXY( ay, ax )    ) ;
+EEDetId EEDetId::switchZSide() const {
+  int newZSide = -1 * zside();
+  if (validDetId(ix(), iy(), newZSide)) {
+    return EEDetId(ix(), iy(), newZSide);
+  } else {
+    return EEDetId(0);
+  }
 }
 
-bool 
-EEDetId::isOuterRingXY( int ax, int ay )
-{
-   return ( ( ax<=10 &&           ay==50 ) ||
-	    ( ax==10 &&           ay>=48 ) ||
-	    ( ax<=15 && ax>=11 && ay==47 ) ||
-	    ( ax==15 &&           ay==46 ) ||
-	    ( ax<=25 && ax>=16 && ay==45 ) ||
-	    ( ax==25 &&           ay<=44 && ay>=43 ) ||
-	    ( ax<=30 && ax>=26 && ay==42 ) ||
-	    ( ax==30 &&           ay<=41 && ay>=38 ) ||
-	    ( ax<=35 && ax>=31 && ay==37 ) ||
-	    ( ax==35 &&           ay==36 )              ) ;
+DetId EEDetId::offsetBy(const DetId startId, int nrStepsX, int nrStepsY) {
+  if (startId.det() == DetId::Ecal && startId.subdetId() == EcalEndcap) {
+    EEDetId eeStartId(startId);
+    return eeStartId.offsetBy(nrStepsX, nrStepsY).rawId();
+  } else {
+    return DetId(0);
+  }
 }
 
-bool 
-EEDetId::slowValidDetId(int crystal_ix, int crystal_iy) 
-{
-  return // negative logic!
-    !( 
-      (crystal_ix >= 1 && crystal_ix <= 3 && (crystal_iy <= 40 || crystal_iy > 60) ) ||
-      (crystal_ix >= 4 && crystal_ix <= 5 && (crystal_iy <= 35 || crystal_iy > 65) ) || 
-      (crystal_ix >= 6 && crystal_ix <= 8 && (crystal_iy <= 25 || crystal_iy > 75) ) || 
-      (crystal_ix >= 9 && crystal_ix <= 13 && (crystal_iy <= 20 || crystal_iy > 80) ) || 
-      (crystal_ix >= 14 && crystal_ix <= 15 && (crystal_iy <= 15 || crystal_iy > 85) ) || 
-      (crystal_ix >= 16 && crystal_ix <= 20 && (crystal_iy <= 13 || crystal_iy > 87) ) || 
-      (crystal_ix >= 21 && crystal_ix <= 25 && (crystal_iy <= 8 || crystal_iy > 92) ) || 
-      (crystal_ix >= 26 && crystal_ix <= 35 && (crystal_iy <= 5 || crystal_iy > 95) ) || 
-      (crystal_ix >= 36 && crystal_ix <= 39 && (crystal_iy <= 3 || crystal_iy > 97) ) || 
-      (crystal_ix >= 98 && crystal_ix <= 100 && (crystal_iy <= 40 || crystal_iy > 60) ) ||
-      (crystal_ix >= 96 && crystal_ix <= 97 && (crystal_iy <= 35 || crystal_iy > 65) ) || 
-      (crystal_ix >= 93 && crystal_ix <= 95 && (crystal_iy <= 25 || crystal_iy > 75) ) || 
-      (crystal_ix >= 88 && crystal_ix <= 92 && (crystal_iy <= 20 || crystal_iy > 80) ) || 
-      (crystal_ix >= 86 && crystal_ix <= 87 && (crystal_iy <= 15 || crystal_iy > 85) ) || 
-      (crystal_ix >= 81 && crystal_ix <= 85 && (crystal_iy <= 13 || crystal_iy > 87) ) || 
-      (crystal_ix >= 76 && crystal_ix <= 80 && (crystal_iy <= 8 || crystal_iy > 92) ) || 
-      (crystal_ix >= 66 && crystal_ix <= 75 && (crystal_iy <= 5 || crystal_iy > 95) ) || 
-      (crystal_ix >= 62 && crystal_ix <= 65 && (crystal_iy <= 3 || crystal_iy > 97) ) ||
-      ( (crystal_ix == 40 || crystal_ix == 61) && ( (crystal_iy >= 46 && crystal_iy <= 55 ) || crystal_iy <= 3 || crystal_iy > 97 )) ||
-      ( (crystal_ix == 41 || crystal_ix == 60) && crystal_iy >= 44 && crystal_iy <= 57 ) ||
-      ( (crystal_ix == 42 || crystal_ix == 59) && crystal_iy >= 43 && crystal_iy <= 58 ) ||
-      ( (crystal_ix == 43 || crystal_ix == 58) && crystal_iy >= 42 && crystal_iy <= 59 ) ||
-      ( (crystal_ix == 44 || crystal_ix == 45 || crystal_ix == 57 || crystal_ix == 56) && crystal_iy >= 41 && crystal_iy <= 60 ) ||
-      ( crystal_ix >= 46 && crystal_ix <= 55 && crystal_iy >= 40 && crystal_iy <= 61 ) 
-       );
+DetId EEDetId::switchZSide(const DetId startId) {
+  if (startId.det() == DetId::Ecal && startId.subdetId() == EcalEndcap) {
+    EEDetId eeStartId(startId);
+    return eeStartId.switchZSide().rawId();
+  } else {
+    return DetId(0);
+  }
 }
 
-int EEDetId::distanceX(const EEDetId& a,const EEDetId& b)
-{
-    return abs(a.ix()-b.ix());
+bool EEDetId::isOuterRing() const {
+  const int kx(ix());
+  const int ky(iy());
+  const int ax(kx > IX_MAX / 2 ? kx - IX_MAX / 2 : IX_MAX / 2 + 1 - kx);
+  const int ay(ky > IY_MAX / 2 ? ky - IY_MAX / 2 : IY_MAX / 2 + 1 - ky);
+  return (isOuterRingXY(ax, ay) || isOuterRingXY(ay, ax));
 }
 
-int EEDetId::distanceY(const EEDetId& a,const EEDetId& b)
-{
-  return abs(a.iy() - b.iy()); 
+bool EEDetId::isOuterRingXY(int ax, int ay) {
+  return ((ax <= 10 && ay == 50) || (ax == 10 && ay >= 48) || (ax <= 15 && ax >= 11 && ay == 47) ||
+          (ax == 15 && ay == 46) || (ax <= 25 && ax >= 16 && ay == 45) || (ax == 25 && ay <= 44 && ay >= 43) ||
+          (ax <= 30 && ax >= 26 && ay == 42) || (ax == 30 && ay <= 41 && ay >= 38) ||
+          (ax <= 35 && ax >= 31 && ay == 37) || (ax == 35 && ay == 36));
 }
 
+bool EEDetId::slowValidDetId(int crystal_ix, int crystal_iy) {
+  return  // negative logic!
+      !((crystal_ix >= 1 && crystal_ix <= 3 && (crystal_iy <= 40 || crystal_iy > 60)) ||
+        (crystal_ix >= 4 && crystal_ix <= 5 && (crystal_iy <= 35 || crystal_iy > 65)) ||
+        (crystal_ix >= 6 && crystal_ix <= 8 && (crystal_iy <= 25 || crystal_iy > 75)) ||
+        (crystal_ix >= 9 && crystal_ix <= 13 && (crystal_iy <= 20 || crystal_iy > 80)) ||
+        (crystal_ix >= 14 && crystal_ix <= 15 && (crystal_iy <= 15 || crystal_iy > 85)) ||
+        (crystal_ix >= 16 && crystal_ix <= 20 && (crystal_iy <= 13 || crystal_iy > 87)) ||
+        (crystal_ix >= 21 && crystal_ix <= 25 && (crystal_iy <= 8 || crystal_iy > 92)) ||
+        (crystal_ix >= 26 && crystal_ix <= 35 && (crystal_iy <= 5 || crystal_iy > 95)) ||
+        (crystal_ix >= 36 && crystal_ix <= 39 && (crystal_iy <= 3 || crystal_iy > 97)) ||
+        (crystal_ix >= 98 && crystal_ix <= 100 && (crystal_iy <= 40 || crystal_iy > 60)) ||
+        (crystal_ix >= 96 && crystal_ix <= 97 && (crystal_iy <= 35 || crystal_iy > 65)) ||
+        (crystal_ix >= 93 && crystal_ix <= 95 && (crystal_iy <= 25 || crystal_iy > 75)) ||
+        (crystal_ix >= 88 && crystal_ix <= 92 && (crystal_iy <= 20 || crystal_iy > 80)) ||
+        (crystal_ix >= 86 && crystal_ix <= 87 && (crystal_iy <= 15 || crystal_iy > 85)) ||
+        (crystal_ix >= 81 && crystal_ix <= 85 && (crystal_iy <= 13 || crystal_iy > 87)) ||
+        (crystal_ix >= 76 && crystal_ix <= 80 && (crystal_iy <= 8 || crystal_iy > 92)) ||
+        (crystal_ix >= 66 && crystal_ix <= 75 && (crystal_iy <= 5 || crystal_iy > 95)) ||
+        (crystal_ix >= 62 && crystal_ix <= 65 && (crystal_iy <= 3 || crystal_iy > 97)) ||
+        ((crystal_ix == 40 || crystal_ix == 61) &&
+         ((crystal_iy >= 46 && crystal_iy <= 55) || crystal_iy <= 3 || crystal_iy > 97)) ||
+        ((crystal_ix == 41 || crystal_ix == 60) && crystal_iy >= 44 && crystal_iy <= 57) ||
+        ((crystal_ix == 42 || crystal_ix == 59) && crystal_iy >= 43 && crystal_iy <= 58) ||
+        ((crystal_ix == 43 || crystal_ix == 58) && crystal_iy >= 42 && crystal_iy <= 59) ||
+        ((crystal_ix == 44 || crystal_ix == 45 || crystal_ix == 57 || crystal_ix == 56) && crystal_iy >= 41 &&
+         crystal_iy <= 60) ||
+        (crystal_ix >= 46 && crystal_ix <= 55 && crystal_iy >= 40 && crystal_iy <= 61));
+}
+
+int EEDetId::distanceX(const EEDetId& a, const EEDetId& b) { return abs(a.ix() - b.ix()); }
+
+int EEDetId::distanceY(const EEDetId& a, const EEDetId& b) { return abs(a.iy() - b.iy()); }
+
 #include <ostream>
-std::ostream& operator<<(std::ostream& s,const EEDetId& id) 
-{
-   return s << "(EE iz " << ((id.zside()>0)?("+ "):("- ")) 
-	    << " ix " << id.ix() << " , iy " << id.iy() << ')';
+std::ostream& operator<<(std::ostream& s, const EEDetId& id) {
+  return s << "(EE iz " << ((id.zside() > 0) ? ("+ ") : ("- ")) << " ix " << id.ix() << " , iy " << id.iy() << ')';
 }
diff --git a/DataFormats/EcalDetId/src/ESDetId.cc b/DataFormats/EcalDetId/src/ESDetId.cc
index a9e068068e22d..2317b887135ea 100644
--- a/DataFormats/EcalDetId/src/ESDetId.cc
+++ b/DataFormats/EcalDetId/src/ESDetId.cc
@@ -3,881 +3,388 @@
 
 #include <ostream>
 
-void ESDetId::verify( int strip,
-                 int ixs,
-                 int iys,
-                 int plane,
-                 int iz     )
-{
-   if( !validDetId( strip, ixs, iys, plane, iz) )
-      throw cms::Exception("InvalidDetId") 
-        << "ESDetId:  Cannot create object.  Indexes out of bounds \n" 
-        << " strip = " << strip << " x = " << ixs << " y = " << iys << "\n" 
-        << " plane = " << plane << " z = " << iz
-        << " hxy = " << (1==plane?hxy1[ixs-1][iys-1]:hxy2[ixs-1][iys-1])
-        << "\n";
+void ESDetId::verify(int strip, int ixs, int iys, int plane, int iz) {
+  if (!validDetId(strip, ixs, iys, plane, iz))
+    throw cms::Exception("InvalidDetId") << "ESDetId:  Cannot create object.  Indexes out of bounds \n"
+                                         << " strip = " << strip << " x = " << ixs << " y = " << iys << "\n"
+                                         << " plane = " << plane << " z = " << iz
+                                         << " hxy = " << (1 == plane ? hxy1[ixs - 1][iys - 1] : hxy2[ixs - 1][iys - 1])
+                                         << "\n";
 }
 
-bool 
-ESDetId::validDetId( int istrip, 
-		     int ixs, 
-		     int iys, 
-		     int iplane, 
-		     int iz      ) 
-{
-  return ( !( ( istrip < ISTRIP_MIN ) ||
-	      ( istrip > ISTRIP_MAX ) ||
-	      ( ixs    < IX_MIN     ) || 
-	      ( ixs    > IX_MAX     ) ||
-	      ( iys    < IY_MIN     ) ||
-	      ( iys    > IY_MAX     ) ||
-	      ( abs( iz ) != 1      ) ||
-	      ( iplane < PLANE_MIN  ) ||
-	      ( iplane > PLANE_MAX  ) ||
-	      ( ( 1 == iplane ) &&
-		0 == hxy1[ixs-1][iys-1]  ) ||
-	      ( ( 2 == iplane ) &&
-		0 == hxy2[ixs-1][iys-1]  )    ) ) ;
+bool ESDetId::validDetId(int istrip, int ixs, int iys, int iplane, int iz) {
+  return (!((istrip < ISTRIP_MIN) || (istrip > ISTRIP_MAX) || (ixs < IX_MIN) || (ixs > IX_MAX) || (iys < IY_MIN) ||
+            (iys > IY_MAX) || (abs(iz) != 1) || (iplane < PLANE_MIN) || (iplane > PLANE_MAX) ||
+            ((1 == iplane) && 0 == hxy1[ixs - 1][iys - 1]) || ((2 == iplane) && 0 == hxy2[ixs - 1][iys - 1])));
 }
-  
-int 
-ESDetId::hashedIndex() const 
-{
-   const int ia ( 1 == zside() ? 2 : 1 ) ;
-   const int ib ( plane() ) ;
-   const int ix ( six() ) ;
-   const int iy ( siy() ) ;
-   const int ic ( 1 == ib ?
-		  hxy1[ ix - 1 ][ iy - 1 ] :
-		  hxy2[ ix - 1 ][ iy - 1 ] ) ;
-   const int id ( strip() ) ;
 
-   return ( ( ia - 1 )*kLb +
-	    ( ib - 1 )*kLc +
-	    ( ic - 1 )*kLd + 
-	    id             - 1 ) ;
+int ESDetId::hashedIndex() const {
+  const int ia(1 == zside() ? 2 : 1);
+  const int ib(plane());
+  const int ix(six());
+  const int iy(siy());
+  const int ic(1 == ib ? hxy1[ix - 1][iy - 1] : hxy2[ix - 1][iy - 1]);
+  const int id(strip());
+
+  return ((ia - 1) * kLb + (ib - 1) * kLc + (ic - 1) * kLd + id - 1);
 }
 
-ESDetId 
-ESDetId::unhashIndex( int hi ) 
-{
-   if( validHashIndex( hi ) )
-   {
-      const int id ( hi%kLd + 1 ) ;
-      const int nd ( hi - id + 1 ) ;
-      const int ic ( ( nd%kLc )/kLd + 1 ) ;
-      const int nc ( nd - ( ic - 1 )*kLd ) ;
-      const int ib ( ( nc%kLb )/kLc + 1 ) ;
-      const int nb ( nc - ( ib - 1 )*kLc ) ;
-      const int ia ( nb/kLb + 1 );// + 1 ) ;
+ESDetId ESDetId::unhashIndex(int hi) {
+  if (validHashIndex(hi)) {
+    const int id(hi % kLd + 1);
+    const int nd(hi - id + 1);
+    const int ic((nd % kLc) / kLd + 1);
+    const int nc(nd - (ic - 1) * kLd);
+    const int ib((nc % kLb) / kLc + 1);
+    const int nb(nc - (ib - 1) * kLc);
+    const int ia(nb / kLb + 1);  // + 1 ) ;
 
-      const int st    ( id ) ;
-      const int pl    ( ib ) ;
-      int ix ;
-      int iy ;
-      const int ic1 ( ic - 1 ) ;
-      if( 1 == pl )
-      {
-	 ix = hx1[ ic1 ] ;
-	 iy = hy1[ ic1 ] ;
-      }
-      else
-      {
-	 ix = hx2[ ic1 ] ;
-	 iy = hy2[ ic1 ] ;
-      }
-      const int iz ( 1 == ia ? -1 : 1 ) ;
+    const int st(id);
+    const int pl(ib);
+    int ix;
+    int iy;
+    const int ic1(ic - 1);
+    if (1 == pl) {
+      ix = hx1[ic1];
+      iy = hy1[ic1];
+    } else {
+      ix = hx2[ic1];
+      iy = hy2[ic1];
+    }
+    const int iz(1 == ia ? -1 : 1);
 
-      return ESDetId( st, ix, iy, pl, iz ) ;
-   }
-   else
-   {
-      return ESDetId() ;
-   }
-}
-  
-std::ostream& operator<<(std::ostream& s,const ESDetId& id) 
-{
-   return s << "(ES z=" << id.zside() 
-	    << "  plane " << id.plane() 
-	    << " " 
-	    << id.six() 
-	    << ':' 
-	    << id.siy() 
-	    << " " 
-	    << id.strip() 
-	    << ')'           
-	    << " hashIndex = ";
-//	    << id.hashedIndex() ;
+    return ESDetId(st, ix, iy, pl, iz);
+  } else {
+    return ESDetId();
+  }
 }
 
+std::ostream& operator<<(std::ostream& s, const ESDetId& id) {
+  return s << "(ES z=" << id.zside() << "  plane " << id.plane() << " " << id.six() << ':' << id.siy() << " "
+           << id.strip() << ')' << " hashIndex = ";
+  //	    << id.hashedIndex() ;
+}
 
-const unsigned short ESDetId::hxy1[ kXMAX ][ kYMAX ] = {
-{    0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0 } , //1
-{    0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     1,     2,     3,     4,     5,     6,
-     7,     8,     9,    10,    11,    12,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0 } , //2
-{    0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,    13,    14,    15,    16,    17,    18,    19,    20,
-    21,    22,    23,    24,    25,    26,    27,    28,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0 } , //3
-{    0,     0,     0,     0,     0,     0,     0,     0,     0,    29,
-    30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-    40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-    50,     0,     0,     0,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,     0,    51,    52,
-    53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-    63,    64,    65,    66,    67,    68,    69,    70,    71,    72,
-    73,    74,     0,     0,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,    75,    76,    77,
-    78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-    88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
-    98,    99,   100,     0,     0,     0,     0,     0,     0,     0 } ,//6
-{    0,     0,     0,     0,     0,     0,   101,   102,   103,   104,
-   105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-   115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-   125,   126,   127,   128,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,   129,   130,   131,   132,   133,   134,
-   135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
-   145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-   155,   156,   157,   158,   159,   160,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,   161,   162,   163,   164,   165,   166,
-   167,   168,   169,   170,   171,   172,   173,   174,   175,   176,
-   177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
-   187,   188,   189,   190,   191,   192,     0,     0,     0,     0 } ,
-{    0,     0,     0,   193,   194,   195,   196,   197,   198,   199,
-   200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
-   210,   211,   212,   213,   214,   215,   216,   217,   218,   219,
-   220,   221,   222,   223,   224,   225,   226,     0,     0,     0 } ,//10
-{    0,     0,   227,   228,   229,   230,   231,   232,   233,   234,
-   235,   236,   237,   238,   239,   240,   241,   242,   243,   244,
-   245,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-   255,   256,   257,   258,   259,   260,   261,   262,     0,     0 } ,
-{    0,     0,   263,   264,   265,   266,   267,   268,   269,   270,
-   271,   272,   273,   274,   275,   276,   277,   278,   279,   280,
-   281,   282,   283,   284,   285,   286,   287,   288,   289,   290,
-   291,   292,   293,   294,   295,   296,   297,   298,     0,     0 } ,
-{    0,     0,   299,   300,   301,   302,   303,   304,   305,   306,
-   307,   308,   309,   310,   311,   312,   313,   314,   315,   316,
-   317,   318,   319,   320,   321,   322,   323,   324,   325,   326,
-   327,   328,   329,   330,   331,   332,   333,   334,     0,     0 } ,
-{    0,   335,   336,   337,   338,   339,   340,   341,   342,   343,
-   344,   345,   346,   347,   348,   349,   350,   351,     0,     0,
-     0,     0,   352,   353,   354,   355,   356,   357,   358,   359,
-   360,   361,   362,   363,   364,   365,   366,   367,   368,     0 } ,
-{    0,   369,   370,   371,   372,   373,   374,   375,   376,   377,
-   378,   379,   380,   381,   382,   383,     0,     0,     0,     0,
-     0,     0,     0,     0,   384,   385,   386,   387,   388,   389,
-   390,   391,   392,   393,   394,   395,   396,   397,   398,     0 } ,//15
-{  399,   400,   401,   402,   403,   404,   405,   406,   407,   408,
-   409,   410,   411,   412,   413,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,   414,   415,   416,   417,   418,
-   419,   420,   421,   422,   423,   424,   425,   426,   427,   428 } ,
-{  429,   430,   431,   432,   433,   434,   435,   436,   437,   438,
-   439,   440,   441,   442,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   443,   444,   445,   446,
-   447,   448,   449,   450,   451,   452,   453,   454,   455,   456 } ,
-{  457,   458,   459,   460,   461,   462,   463,   464,   465,   466,
-   467,   468,   469,   470,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   471,   472,   473,   474,
-   475,   476,   477,   478,   479,   480,   481,   482,   483,   484 } ,
-{  485,   486,   487,   488,   489,   490,   491,   492,   493,   494,
-   495,   496,   497,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   498,   499,   500,
-   501,   502,   503,   504,   505,   506,   507,   508,   509,   510 } ,
-{  511,   512,   513,   514,   515,   516,   517,   518,   519,   520,
-   521,   522,   523,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   524,   525,   526,
-   527,   528,   529,   530,   531,   532,   533,   534,   535,   536 } ,
-{  537,   538,   539,   540,   541,   542,   543,   544,   545,   546,
-   547,   548,   549,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   550,   551,   552,
-   553,   554,   555,   556,   557,   558,   559,   560,   561,   562 } ,
-{  563,   564,   565,   566,   567,   568,   569,   570,   571,   572,
-   573,   574,   575,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   576,   577,   578,
-   579,   580,   581,   582,   583,   584,   585,   586,   587,   588 } ,
-{  589,   590,   591,   592,   593,   594,   595,   596,   597,   598,
-   599,   600,   601,   602,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   603,   604,   605,   606,
-   607,   608,   609,   610,   611,   612,   613,   614,   615,   616 } ,
-{  617,   618,   619,   620,   621,   622,   623,   624,   625,   626,
-   627,   628,   629,   630,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   631,   632,   633,   634,
-   635,   636,   637,   638,   639,   640,   641,   642,   643,   644 } ,
-{  645,   646,   647,   648,   649,   650,   651,   652,   653,   654,
-   655,   656,   657,   658,   659,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,   660,   661,   662,   663,   664,
-   665,   666,   667,   668,   669,   670,   671,   672,   673,   674 } ,
-{    0,   675,   676,   677,   678,   679,   680,   681,   682,   683,
-   684,   685,   686,   687,   688,   689,     0,     0,     0,     0,
-     0,     0,     0,     0,   690,   691,   692,   693,   694,   695,
-   696,   697,   698,   699,   700,   701,   702,   703,   704,     0 } ,
-{    0,   705,   706,   707,   708,   709,   710,   711,   712,   713,
-   714,   715,   716,   717,   718,   719,   720,   721,     0,     0,
-     0,     0,   722,   723,   724,   725,   726,   727,   728,   729,
-   730,   731,   732,   733,   734,   735,   736,   737,   738,     0 } ,
-{    0,     0,   739,   740,   741,   742,   743,   744,   745,   746,
-   747,   748,   749,   750,   751,   752,   753,   754,   755,   756,
-   757,   758,   759,   760,   761,   762,   763,   764,   765,   766,
-   767,   768,   769,   770,   771,   772,   773,   774,     0,     0 } ,
-{    0,     0,   775,   776,   777,   778,   779,   780,   781,   782,
-   783,   784,   785,   786,   787,   788,   789,   790,   791,   792,
-   793,   794,   795,   796,   797,   798,   799,   800,   801,   802,
-   803,   804,   805,   806,   807,   808,   809,   810,     0,     0 } ,
-{    0,     0,   811,   812,   813,   814,   815,   816,   817,   818,
-   819,   820,   821,   822,   823,   824,   825,   826,   827,   828,
-   829,   830,   831,   832,   833,   834,   835,   836,   837,   838,
-   839,   840,   841,   842,   843,   844,   845,   846,     0,     0 } ,
-{    0,     0,     0,   847,   848,   849,   850,   851,   852,   853,
-   854,   855,   856,   857,   858,   859,   860,   861,   862,   863,
-   864,   865,   866,   867,   868,   869,   870,   871,   872,   873,
-   874,   875,   876,   877,   878,   879,   880,     0,     0,     0 } ,
-{    0,     0,     0,     0,   881,   882,   883,   884,   885,   886,
-   887,   888,   889,   890,   891,   892,   893,   894,   895,   896,
-   897,   898,   899,   900,   901,   902,   903,   904,   905,   906,
-   907,   908,   909,   910,   911,   912,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,   913,   914,   915,   916,   917,   918,
-   919,   920,   921,   922,   923,   924,   925,   926,   927,   928,
-   929,   930,   931,   932,   933,   934,   935,   936,   937,   938,
-   939,   940,   941,   942,   943,   944,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,   945,   946,   947,   948,
-   949,   950,   951,   952,   953,   954,   955,   956,   957,   958,
-   959,   960,   961,   962,   963,   964,   965,   966,   967,   968,
-   969,   970,   971,   972,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,   973,   974,   975,
-   976,   977,   978,   979,   980,   981,   982,   983,   984,   985,
-   986,   987,   988,   989,   990,   991,   992,   993,   994,   995,
-   996,   997,   998,     0,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,     0,   999,  1000,
-  1001,  1002,  1003,  1004,  1005,  1006,  1007,  1008,  1009,  1010,
-  1011,  1012,  1013,  1014,  1015,  1016,  1017,  1018,  1019,  1020,
-  1021,  1022,     0,     0,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,     0,     0,  1023,
-  1024,  1025,  1026,  1027,  1028,  1029,  1030,  1031,  1032,  1033,
-  1034,  1035,  1036,  1037,  1038,  1039,  1040,  1041,  1042,  1043,
-  1044,     0,     0,     0,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,  1045,  1046,  1047,  1048,  1049,  1050,  1051,  1052,
-  1053,  1054,  1055,  1056,  1057,  1058,  1059,  1060,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,  1061,  1062,  1063,  1064,  1065,  1066,
-  1067,  1068,  1069,  1070,  1071,  1072,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0 } 
-};
+const unsigned short ESDetId::hxy1[kXMAX][kYMAX] = {
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},  //1
+    {0, 0, 0, 0,  0,  0,  0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6,
+     7, 8, 9, 10, 11, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},  //2
+    {0,  0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 13, 14, 15, 16, 17, 18, 19, 20,
+     21, 22, 23, 24, 25, 26, 27, 28, 0, 0, 0, 0, 0,  0,  0,  0,  0,  0,  0,  0},  //3
+    {0,  0,  0,  0,  0,  0,  0,  0,  0,  29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+     40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 0,  0,  0,  0,  0,  0,  0,  0,  0},
+    {0,  0,  0,  0,  0,  0,  0,  0,  51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+     63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 0,  0,  0,  0,  0,  0,  0,  0},
+    {0,  0,  0,  0,  0,  0,  0,  75, 76, 77, 78, 79, 80,  81, 82, 83, 84, 85, 86, 87,
+     88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 0,  0,  0,  0,  0,  0,  0},  //6
+    {0,   0,   0,   0,   0,   0,   101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
+     115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 0,   0,   0,   0,   0,   0},
+    {0,   0,   0,   0,   129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
+     145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 0,   0,   0,   0},
+    {0,   0,   0,   0,   161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176,
+     177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 0,   0,   0,   0},
+    {0,   0,   0,   193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+     210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 0,   0,   0},  //10
+    {0,   0,   227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244,
+     245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 0,   0},
+    {0,   0,   263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280,
+     281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 0,   0},
+    {0,   0,   299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
+     317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 0,   0},
+    {0, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 347, 348, 349, 350, 351, 0,   0,
+     0, 0,   352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363, 364, 365, 366, 367, 368, 0},
+    {0, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 0,   0,   0,   0,
+     0, 0,   0,   0,   384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 0},  //15
+    {399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   414, 415, 416, 417, 418, 419, 420, 421, 422, 423, 424, 425, 426, 427, 428},
+    {429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442, 0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456},
+    {457, 458, 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, 469, 470, 0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484},
+    {485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   498, 499, 500, 501, 502, 503, 504, 505, 506, 507, 508, 509, 510},
+    {511, 512, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   524, 525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536},
+    {537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549, 0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   550, 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, 561, 562},
+    {563, 564, 565, 566, 567, 568, 569, 570, 571, 572, 573, 574, 575, 0,   0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   0,   576, 577, 578, 579, 580, 581, 582, 583, 584, 585, 586, 587, 588},
+    {589, 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, 601, 602, 0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, 616},
+    {617, 618, 619, 620, 621, 622, 623, 624, 625, 626, 627, 628, 629, 630, 0,   0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   0,   631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642, 643, 644},
+    {645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 0,   0,   0,   0,   0,
+     0,   0,   0,   0,   0,   660, 661, 662, 663, 664, 665, 666, 667, 668, 669, 670, 671, 672, 673, 674},
+    {0, 675, 676, 677, 678, 679, 680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 0,   0,   0,   0,
+     0, 0,   0,   0,   690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 0},
+    {0, 705, 706, 707, 708, 709, 710, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, 0,   0,
+     0, 0,   722, 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, 0},
+    {0,   0,   739, 740, 741, 742, 743, 744, 745, 746, 747, 748, 749, 750, 751, 752, 753, 754, 755, 756,
+     757, 758, 759, 760, 761, 762, 763, 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 0,   0},
+    {0,   0,   775, 776, 777, 778, 779, 780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792,
+     793, 794, 795, 796, 797, 798, 799, 800, 801, 802, 803, 804, 805, 806, 807, 808, 809, 810, 0,   0},
+    {0,   0,   811, 812, 813, 814, 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, 826, 827, 828,
+     829, 830, 831, 832, 833, 834, 835, 836, 837, 838, 839, 840, 841, 842, 843, 844, 845, 846, 0,   0},
+    {0,   0,   0,   847, 848, 849, 850, 851, 852, 853, 854, 855, 856, 857, 858, 859, 860, 861, 862, 863,
+     864, 865, 866, 867, 868, 869, 870, 871, 872, 873, 874, 875, 876, 877, 878, 879, 880, 0,   0,   0},
+    {0,   0,   0,   0,   881, 882, 883, 884, 885, 886, 887, 888, 889, 890, 891, 892, 893, 894, 895, 896,
+     897, 898, 899, 900, 901, 902, 903, 904, 905, 906, 907, 908, 909, 910, 911, 912, 0,   0,   0,   0},
+    {0,   0,   0,   0,   913, 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, 927, 928,
+     929, 930, 931, 932, 933, 934, 935, 936, 937, 938, 939, 940, 941, 942, 943, 944, 0,   0,   0,   0},
+    {0,   0,   0,   0,   0,   0,   945, 946, 947, 948, 949, 950, 951, 952, 953, 954, 955, 956, 957, 958,
+     959, 960, 961, 962, 963, 964, 965, 966, 967, 968, 969, 970, 971, 972, 0,   0,   0,   0,   0,   0},
+    {0,   0,   0,   0,   0,   0,   0,   973, 974, 975, 976, 977, 978, 979, 980, 981, 982, 983, 984, 985,
+     986, 987, 988, 989, 990, 991, 992, 993, 994, 995, 996, 997, 998, 0,   0,   0,   0,   0,   0,   0},
+    {0,    0,    0,    0,    0,    0,    0,    0,    999,  1000, 1001, 1002, 1003, 1004,
+     1005, 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018,
+     1019, 1020, 1021, 1022, 0,    0,    0,    0,    0,    0,    0,    0},
+    {0,    0,    0,    0,    0,    0,    0,    0,    0,    1023, 1024, 1025, 1026, 1027,
+     1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039, 1040, 1041,
+     1042, 1043, 1044, 0,    0,    0,    0,    0,    0,    0,    0,    0},
+    {0,    0,    0,    0,    0,    0,    0,    0,    0, 0, 0, 0, 1045, 1046, 1047, 1048, 1049, 1050, 1051, 1052,
+     1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060, 0, 0, 0, 0, 0,    0,    0,    0,    0,    0,    0,    0},
+    {0,    0,    0,    0,    0,    0,    0, 0, 0, 0, 0, 0, 0, 0, 1061, 1062, 1063, 1064, 1065, 1066,
+     1067, 1068, 1069, 1070, 1071, 1072, 0, 0, 0, 0, 0, 0, 0, 0, 0,    0,    0,    0,    0,    0},
+    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}};
 
-const unsigned short ESDetId::hxy2[ kXMAX ][ kYMAX ] = {
-{    0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     1,     2,     3,     4,     5,
-     6,     7,     8,     9,    10,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,    11,    12,    13,    14,    15,    16,    17,
-    18,    19,    20,    21,    22,    23,    24,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-    25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-    35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,     0,     0,    45,
-    46,    47,    48,    49,    50,    51,    52,    53,    54,    55,
-    56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-    66,     0,     0,     0,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,    67,    68,    69,
-    70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-    80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-    90,    91,    92,     0,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,    93,    94,    95,
-    96,    97,    98,    99,   100,   101,   102,   103,   104,   105,
-   106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-   116,   117,   118,     0,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,   119,   120,   121,   122,
-   123,   124,   125,   126,   127,   128,   129,   130,   131,   132,
-   133,   134,   135,   136,   137,   138,   139,   140,   141,   142,
-   143,   144,   145,   146,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,   147,   148,   149,   150,   151,
-   152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
-   162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
-   172,   173,   174,   175,   176,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,   177,   178,   179,   180,   181,   182,
-   183,   184,   185,   186,   187,   188,   189,   190,   191,   192,
-   193,   194,   195,   196,   197,   198,   199,   200,   201,   202,
-   203,   204,   205,   206,   207,   208,     0,     0,     0,     0 } ,
-{    0,     0,     0,   209,   210,   211,   212,   213,   214,   215,
-   216,   217,   218,   219,   220,   221,   222,   223,   224,   225,
-   226,   227,   228,   229,   230,   231,   232,   233,   234,   235,
-   236,   237,   238,   239,   240,   241,   242,     0,     0,     0 } ,
-{    0,     0,     0,   243,   244,   245,   246,   247,   248,   249,
-   250,   251,   252,   253,   254,   255,   256,   257,   258,   259,
-   260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
-   270,   271,   272,   273,   274,   275,   276,     0,     0,     0 } ,
-{    0,     0,     0,   277,   278,   279,   280,   281,   282,   283,
-   284,   285,   286,   287,   288,   289,   290,   291,   292,   293,
-   294,   295,   296,   297,   298,   299,   300,   301,   302,   303,
-   304,   305,   306,   307,   308,   309,   310,     0,     0,     0 } ,
-{    0,     0,   311,   312,   313,   314,   315,   316,   317,   318,
-   319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
-   329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
-   339,   340,   341,   342,   343,   344,   345,   346,     0,     0 } ,
-{    0,     0,   347,   348,   349,   350,   351,   352,   353,   354,
-   355,   356,   357,   358,   359,   360,   361,   362,     0,     0,
-     0,     0,   363,   364,   365,   366,   367,   368,   369,   370,
-   371,   372,   373,   374,   375,   376,   377,   378,     0,     0 } ,
-{    0,   379,   380,   381,   382,   383,   384,   385,   386,   387,
-   388,   389,   390,   391,   392,   393,     0,     0,     0,     0,
-     0,     0,     0,     0,   394,   395,   396,   397,   398,   399,
-   400,   401,   402,   403,   404,   405,   406,   407,   408,     0 } ,
-{    0,   409,   410,   411,   412,   413,   414,   415,   416,   417,
-   418,   419,   420,   421,   422,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,   423,   424,   425,   426,   427,
-   428,   429,   430,   431,   432,   433,   434,   435,   436,     0 } ,
-{    0,   437,   438,   439,   440,   441,   442,   443,   444,   445,
-   446,   447,   448,   449,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   450,   451,   452,   453,
-   454,   455,   456,   457,   458,   459,   460,   461,   462,     0 } ,
-{    0,   463,   464,   465,   466,   467,   468,   469,   470,   471,
-   472,   473,   474,   475,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   476,   477,   478,   479,
-   480,   481,   482,   483,   484,   485,   486,   487,   488,     0 } ,
-{    0,   489,   490,   491,   492,   493,   494,   495,   496,   497,
-   498,   499,   500,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   501,   502,   503,
-   504,   505,   506,   507,   508,   509,   510,   511,   512,     0 } ,
-{    0,   513,   514,   515,   516,   517,   518,   519,   520,   521,
-   522,   523,   524,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   525,   526,   527,
-   528,   529,   530,   531,   532,   533,   534,   535,   536,     0 } ,
-{    0,   537,   538,   539,   540,   541,   542,   543,   544,   545,
-   546,   547,   548,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   549,   550,   551,
-   552,   553,   554,   555,   556,   557,   558,   559,   560,     0 } ,
-{    0,   561,   562,   563,   564,   565,   566,   567,   568,   569,
-   570,   571,   572,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,   573,   574,   575,
-   576,   577,   578,   579,   580,   581,   582,   583,   584,     0 } ,
-{    0,   585,   586,   587,   588,   589,   590,   591,   592,   593,
-   594,   595,   596,   597,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   598,   599,   600,   601,
-   602,   603,   604,   605,   606,   607,   608,   609,   610,     0 } ,
-{    0,   611,   612,   613,   614,   615,   616,   617,   618,   619,
-   620,   621,   622,   623,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,   624,   625,   626,   627,
-   628,   629,   630,   631,   632,   633,   634,   635,   636,     0 } ,
-{    0,   637,   638,   639,   640,   641,   642,   643,   644,   645,
-   646,   647,   648,   649,   650,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,   651,   652,   653,   654,   655,
-   656,   657,   658,   659,   660,   661,   662,   663,   664,     0 } ,
-{    0,   665,   666,   667,   668,   669,   670,   671,   672,   673,
-   674,   675,   676,   677,   678,   679,     0,     0,     0,     0,
-     0,     0,     0,     0,   680,   681,   682,   683,   684,   685,
-   686,   687,   688,   689,   690,   691,   692,   693,   694,     0 } ,
-{    0,     0,   695,   696,   697,   698,   699,   700,   701,   702,
-   703,   704,   705,   706,   707,   708,   709,   710,     0,     0,
-     0,     0,   711,   712,   713,   714,   715,   716,   717,   718,
-   719,   720,   721,   722,   723,   724,   725,   726,     0,     0 } ,
-{    0,     0,   727,   728,   729,   730,   731,   732,   733,   734,
-   735,   736,   737,   738,   739,   740,   741,   742,   743,   744,
-   745,   746,   747,   748,   749,   750,   751,   752,   753,   754,
-   755,   756,   757,   758,   759,   760,   761,   762,     0,     0 } ,
-{    0,     0,     0,   763,   764,   765,   766,   767,   768,   769,
-   770,   771,   772,   773,   774,   775,   776,   777,   778,   779,
-   780,   781,   782,   783,   784,   785,   786,   787,   788,   789,
-   790,   791,   792,   793,   794,   795,   796,     0,     0,     0 } ,
-{    0,     0,     0,   797,   798,   799,   800,   801,   802,   803,
-   804,   805,   806,   807,   808,   809,   810,   811,   812,   813,
-   814,   815,   816,   817,   818,   819,   820,   821,   822,   823,
-   824,   825,   826,   827,   828,   829,   830,     0,     0,     0 } ,
-{    0,     0,     0,   831,   832,   833,   834,   835,   836,   837,
-   838,   839,   840,   841,   842,   843,   844,   845,   846,   847,
-   848,   849,   850,   851,   852,   853,   854,   855,   856,   857,
-   858,   859,   860,   861,   862,   863,   864,     0,     0,     0 } ,
-{    0,     0,     0,     0,   865,   866,   867,   868,   869,   870,
-   871,   872,   873,   874,   875,   876,   877,   878,   879,   880,
-   881,   882,   883,   884,   885,   886,   887,   888,   889,   890,
-   891,   892,   893,   894,   895,   896,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,   897,   898,   899,   900,   901,
-   902,   903,   904,   905,   906,   907,   908,   909,   910,   911,
-   912,   913,   914,   915,   916,   917,   918,   919,   920,   921,
-   922,   923,   924,   925,   926,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,   927,   928,   929,   930,
-   931,   932,   933,   934,   935,   936,   937,   938,   939,   940,
-   941,   942,   943,   944,   945,   946,   947,   948,   949,   950,
-   951,   952,   953,   954,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,   955,   956,   957,
-   958,   959,   960,   961,   962,   963,   964,   965,   966,   967,
-   968,   969,   970,   971,   972,   973,   974,   975,   976,   977,
-   978,   979,   980,     0,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,   981,   982,   983,
-   984,   985,   986,   987,   988,   989,   990,   991,   992,   993,
-   994,   995,   996,   997,   998,   999,  1000,  1001,  1002,  1003,
-  1004,  1005,  1006,     0,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,     0,     0,  1007,
-  1008,  1009,  1010,  1011,  1012,  1013,  1014,  1015,  1016,  1017,
-  1018,  1019,  1020,  1021,  1022,  1023,  1024,  1025,  1026,  1027,
-  1028,     0,     0,     0,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-  1029,  1030,  1031,  1032,  1033,  1034,  1035,  1036,  1037,  1038,
-  1039,  1040,  1041,  1042,  1043,  1044,  1045,  1046,  1047,  1048,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,  1049,  1050,  1051,  1052,  1053,  1054,  1055,
-  1056,  1057,  1058,  1059,  1060,  1061,  1062,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0 } ,
-{    0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,  1063,  1064,  1065,  1066,  1067,
-  1068,  1069,  1070,  1071,  1072,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0 } 
-};
+const unsigned short ESDetId::hxy2[kXMAX][kYMAX] = {
+    {0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5,
+     6, 7, 8, 9, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+    {0,  0,  0,  0,  0,  0,  0,  0, 0, 0, 0, 0, 0, 11, 12, 13, 14, 15, 16, 17,
+     18, 19, 20, 21, 22, 23, 24, 0, 0, 0, 0, 0, 0, 0,  0,  0,  0,  0,  0,  0},
+    {0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+     35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 0,  0,  0,  0,  0,  0,  0,  0,  0,  0},
+    {0,  0,  0,  0,  0,  0,  0,  0,  0,  45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+     56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 0,  0,  0,  0,  0,  0,  0,  0,  0},
+    {0,  0,  0,  0,  0,  0,  0,  67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+     80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 0,  0,  0,  0,  0,  0,  0},
+    {0,   0,   0,   0,   0,   0,   0,   93,  94,  95,  96,  97,  98,  99, 100, 101, 102, 103, 104, 105,
+     106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 0,  0,   0,   0,   0,   0,   0},
+    {0,   0,   0,   0,   0,   0,   119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+     133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 0,   0,   0,   0,   0,   0},
+    {0,   0,   0,   0,   0,   147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161,
+     162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 0,   0,   0,   0,   0},
+    {0,   0,   0,   0,   177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192,
+     193, 194, 195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 0,   0,   0,   0},
+    {0,   0,   0,   209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225,
+     226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 0,   0,   0},
+    {0,   0,   0,   243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259,
+     260, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 0,   0,   0},
+    {0,   0,   0,   277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293,
+     294, 295, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 0,   0,   0},
+    {0,   0,   311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328,
+     329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342, 343, 344, 345, 346, 0,   0},
+    {0, 0, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 0, 0,
+     0, 0, 363, 364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 0, 0},
+    {0, 379, 380, 381, 382, 383, 384, 385, 386, 387, 388, 389, 390, 391, 392, 393, 0,   0,   0,   0,
+     0, 0,   0,   0,   394, 395, 396, 397, 398, 399, 400, 401, 402, 403, 404, 405, 406, 407, 408, 0},
+    {0, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421, 422, 0,   0,   0,   0,   0,
+     0, 0,   0,   0,   0,   423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 0},
+    {0, 437, 438, 439, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 0,   0,   0,   0,   0,   0,
+     0, 0,   0,   0,   0,   0,   450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 0},
+    {0, 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 0,   0,   0,   0,   0,   0,
+     0, 0,   0,   0,   0,   0,   476, 477, 478, 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, 0},
+    {0, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500, 0,   0,   0,   0,   0,   0,   0,
+     0, 0,   0,   0,   0,   0,   0,   501, 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, 0},
+    {0, 513, 514, 515, 516, 517, 518, 519, 520, 521, 522, 523, 524, 0,   0,   0,   0,   0,   0,   0,
+     0, 0,   0,   0,   0,   0,   0,   525, 526, 527, 528, 529, 530, 531, 532, 533, 534, 535, 536, 0},
+    {0, 537, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 0,   0,   0,   0,   0,   0,   0,
+     0, 0,   0,   0,   0,   0,   0,   549, 550, 551, 552, 553, 554, 555, 556, 557, 558, 559, 560, 0},
+    {0, 561, 562, 563, 564, 565, 566, 567, 568, 569, 570, 571, 572, 0,   0,   0,   0,   0,   0,   0,
+     0, 0,   0,   0,   0,   0,   0,   573, 574, 575, 576, 577, 578, 579, 580, 581, 582, 583, 584, 0},
+    {0, 585, 586, 587, 588, 589, 590, 591, 592, 593, 594, 595, 596, 597, 0,   0,   0,   0,   0,   0,
+     0, 0,   0,   0,   0,   0,   598, 599, 600, 601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 0},
+    {0, 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621, 622, 623, 0,   0,   0,   0,   0,   0,
+     0, 0,   0,   0,   0,   0,   624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 0},
+    {0, 637, 638, 639, 640, 641, 642, 643, 644, 645, 646, 647, 648, 649, 650, 0,   0,   0,   0,   0,
+     0, 0,   0,   0,   0,   651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663, 664, 0},
+    {0, 665, 666, 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, 0,   0,   0,   0,
+     0, 0,   0,   0,   680, 681, 682, 683, 684, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, 0},
+    {0, 0, 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708, 709, 710, 0, 0,
+     0, 0, 711, 712, 713, 714, 715, 716, 717, 718, 719, 720, 721, 722, 723, 724, 725, 726, 0, 0},
+    {0,   0,   727, 728, 729, 730, 731, 732, 733, 734, 735, 736, 737, 738, 739, 740, 741, 742, 743, 744,
+     745, 746, 747, 748, 749, 750, 751, 752, 753, 754, 755, 756, 757, 758, 759, 760, 761, 762, 0,   0},
+    {0,   0,   0,   763, 764, 765, 766, 767, 768, 769, 770, 771, 772, 773, 774, 775, 776, 777, 778, 779,
+     780, 781, 782, 783, 784, 785, 786, 787, 788, 789, 790, 791, 792, 793, 794, 795, 796, 0,   0,   0},
+    {0,   0,   0,   797, 798, 799, 800, 801, 802, 803, 804, 805, 806, 807, 808, 809, 810, 811, 812, 813,
+     814, 815, 816, 817, 818, 819, 820, 821, 822, 823, 824, 825, 826, 827, 828, 829, 830, 0,   0,   0},
+    {0,   0,   0,   831, 832, 833, 834, 835, 836, 837, 838, 839, 840, 841, 842, 843, 844, 845, 846, 847,
+     848, 849, 850, 851, 852, 853, 854, 855, 856, 857, 858, 859, 860, 861, 862, 863, 864, 0,   0,   0},
+    {0,   0,   0,   0,   865, 866, 867, 868, 869, 870, 871, 872, 873, 874, 875, 876, 877, 878, 879, 880,
+     881, 882, 883, 884, 885, 886, 887, 888, 889, 890, 891, 892, 893, 894, 895, 896, 0,   0,   0,   0},
+    {0,   0,   0,   0,   0,   897, 898, 899, 900, 901, 902, 903, 904, 905, 906, 907, 908, 909, 910, 911,
+     912, 913, 914, 915, 916, 917, 918, 919, 920, 921, 922, 923, 924, 925, 926, 0,   0,   0,   0,   0},
+    {0,   0,   0,   0,   0,   0,   927, 928, 929, 930, 931, 932, 933, 934, 935, 936, 937, 938, 939, 940,
+     941, 942, 943, 944, 945, 946, 947, 948, 949, 950, 951, 952, 953, 954, 0,   0,   0,   0,   0,   0},
+    {0,   0,   0,   0,   0,   0,   0,   955, 956, 957, 958, 959, 960, 961, 962, 963, 964, 965, 966, 967,
+     968, 969, 970, 971, 972, 973, 974, 975, 976, 977, 978, 979, 980, 0,   0,   0,   0,   0,   0,   0},
+    {0,   0,   0,   0,   0,   0,   0,    981,  982,  983,  984,  985,  986,  987, 988, 989, 990, 991, 992, 993,
+     994, 995, 996, 997, 998, 999, 1000, 1001, 1002, 1003, 1004, 1005, 1006, 0,   0,   0,   0,   0,   0,   0},
+    {0,    0,    0,    0,    0,    0,    0,    0,    0,    1007, 1008, 1009, 1010, 1011,
+     1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025,
+     1026, 1027, 1028, 0,    0,    0,    0,    0,    0,    0,    0,    0},
+    {0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    1029, 1030, 1031, 1032,
+     1033, 1034, 1035, 1036, 1037, 1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046,
+     1047, 1048, 0,    0,    0,    0,    0,    0,    0,    0,    0,    0},
+    {0,    0,    0,    0,    0,    0,    0,    0, 0, 0, 0, 0, 0, 1049, 1050, 1051, 1052, 1053, 1054, 1055,
+     1056, 1057, 1058, 1059, 1060, 1061, 1062, 0, 0, 0, 0, 0, 0, 0,    0,    0,    0,    0,    0,    0},
+    {0,    0,    0,    0,    0,    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1063, 1064, 1065, 1066, 1067,
+     1068, 1069, 1070, 1071, 1072, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,    0,    0,    0,    0}};
 
-const unsigned short ESDetId::hx1[ kXYMAX ] = {
-    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-    2,    2,    3,    3,    3,    3,    3,    3,    3,    3,
-    3,    3,    3,    3,    3,    3,    3,    3,    4,    4,
-    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-    5,    5,    5,    5,    6,    6,    6,    6,    6,    6,
-    6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
-    6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
-    7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
-    7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
-    7,    7,    7,    7,    7,    7,    7,    7,    8,    8,
-    8,    8,    8,    8,    8,    8,    8,    8,    8,    8,
-    8,    8,    8,    8,    8,    8,    8,    8,    8,    8,
-    8,    8,    8,    8,    8,    8,    8,    8,    8,    8,
-    9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-    9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-    9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-    9,    9,   10,   10,   10,   10,   10,   10,   10,   10,
-   10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-   10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-   10,   10,   10,   10,   10,   10,   11,   11,   11,   11,
-   11,   11,   11,   11,   11,   11,   11,   11,   11,   11,
-   11,   11,   11,   11,   11,   11,   11,   11,   11,   11,
-   11,   11,   11,   11,   11,   11,   11,   11,   11,   11,
-   11,   11,   12,   12,   12,   12,   12,   12,   12,   12,
-   12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-   12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-   12,   12,   12,   12,   12,   12,   12,   12,   13,   13,
-   13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-   13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-   13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-   13,   13,   13,   13,   14,   14,   14,   14,   14,   14,
-   14,   14,   14,   14,   14,   14,   14,   14,   14,   14,
-   14,   14,   14,   14,   14,   14,   14,   14,   14,   14,
-   14,   14,   14,   14,   14,   14,   14,   14,   15,   15,
-   15,   15,   15,   15,   15,   15,   15,   15,   15,   15,
-   15,   15,   15,   15,   15,   15,   15,   15,   15,   15,
-   15,   15,   15,   15,   15,   15,   15,   15,   16,   16,
-   16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
-   16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
-   16,   16,   16,   16,   16,   16,   16,   16,   17,   17,
-   17,   17,   17,   17,   17,   17,   17,   17,   17,   17,
-   17,   17,   17,   17,   17,   17,   17,   17,   17,   17,
-   17,   17,   17,   17,   17,   17,   18,   18,   18,   18,
-   18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
-   18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
-   18,   18,   18,   18,   19,   19,   19,   19,   19,   19,
-   19,   19,   19,   19,   19,   19,   19,   19,   19,   19,
-   19,   19,   19,   19,   19,   19,   19,   19,   19,   19,
-   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
-   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
-   20,   20,   20,   20,   20,   20,   21,   21,   21,   21,
-   21,   21,   21,   21,   21,   21,   21,   21,   21,   21,
-   21,   21,   21,   21,   21,   21,   21,   21,   21,   21,
-   21,   21,   22,   22,   22,   22,   22,   22,   22,   22,
-   22,   22,   22,   22,   22,   22,   22,   22,   22,   22,
-   22,   22,   22,   22,   22,   22,   22,   22,   23,   23,
-   23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-   23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-   23,   23,   23,   23,   23,   23,   24,   24,   24,   24,
-   24,   24,   24,   24,   24,   24,   24,   24,   24,   24,
-   24,   24,   24,   24,   24,   24,   24,   24,   24,   24,
-   24,   24,   24,   24,   25,   25,   25,   25,   25,   25,
-   25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
-   25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
-   25,   25,   25,   25,   26,   26,   26,   26,   26,   26,
-   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
-   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
-   26,   26,   26,   26,   27,   27,   27,   27,   27,   27,
-   27,   27,   27,   27,   27,   27,   27,   27,   27,   27,
-   27,   27,   27,   27,   27,   27,   27,   27,   27,   27,
-   27,   27,   27,   27,   27,   27,   27,   27,   28,   28,
-   28,   28,   28,   28,   28,   28,   28,   28,   28,   28,
-   28,   28,   28,   28,   28,   28,   28,   28,   28,   28,
-   28,   28,   28,   28,   28,   28,   28,   28,   28,   28,
-   28,   28,   28,   28,   29,   29,   29,   29,   29,   29,
-   29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
-   29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
-   29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
-   30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-   30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-   30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-   30,   30,   30,   30,   30,   30,   31,   31,   31,   31,
-   31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-   31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-   31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-   32,   32,   32,   32,   32,   32,   32,   32,   32,   32,
-   32,   32,   32,   32,   32,   32,   32,   32,   32,   32,
-   32,   32,   32,   32,   32,   32,   32,   32,   32,   32,
-   32,   32,   33,   33,   33,   33,   33,   33,   33,   33,
-   33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-   33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-   33,   33,   33,   33,   34,   34,   34,   34,   34,   34,
-   34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
-   34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
-   34,   34,   35,   35,   35,   35,   35,   35,   35,   35,
-   35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
-   35,   35,   35,   35,   35,   35,   35,   35,   36,   36,
-   36,   36,   36,   36,   36,   36,   36,   36,   36,   36,
-   36,   36,   36,   36,   36,   36,   36,   36,   36,   36,
-   36,   36,   37,   37,   37,   37,   37,   37,   37,   37,
-   37,   37,   37,   37,   37,   37,   37,   37,   37,   37,
-   37,   37,   37,   37,   38,   38,   38,   38,   38,   38,
-   38,   38,   38,   38,   38,   38,   38,   38,   38,   38,
-   39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-   39,   39
-};
+const unsigned short ESDetId::hx1[kXYMAX] = {
+    2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  4,
+    4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  5,  5,  5,  5,  5,  5,  5,  5,
+    5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+    6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+    7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+    8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+    10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11,
+    11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+    11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+    12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+    13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+    15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17,
+    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18,
+    18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+    19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+    20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+    21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+    22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+    23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+    24, 24, 24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+    25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+    26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+    27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+    28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+    29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 30, 30,
+    30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
+    30, 30, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,
+    33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35,
+    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36,
+    36, 36, 36, 36, 36, 36, 36, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
+    38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39};
 
-const unsigned short ESDetId::hy1[ kXYMAX ] = {
-   15,   16,   17,   18,   19,   20,   21,   22,   23,   24,
-   25,   26,   13,   14,   15,   16,   17,   18,   19,   20,
-   21,   22,   23,   24,   25,   26,   27,   28,   10,   11,
-   12,   13,   14,   15,   16,   17,   18,   19,   20,   21,
-   22,   23,   24,   25,   26,   27,   28,   29,   30,   31,
-    9,   10,   11,   12,   13,   14,   15,   16,   17,   18,
-   19,   20,   21,   22,   23,   24,   25,   26,   27,   28,
-   29,   30,   31,   32,    8,    9,   10,   11,   12,   13,
-   14,   15,   16,   17,   18,   19,   20,   21,   22,   23,
-   24,   25,   26,   27,   28,   29,   30,   31,   32,   33,
-    7,    8,    9,   10,   11,   12,   13,   14,   15,   16,
-   17,   18,   19,   20,   21,   22,   23,   24,   25,   26,
-   27,   28,   29,   30,   31,   32,   33,   34,    5,    6,
-    7,    8,    9,   10,   11,   12,   13,   14,   15,   16,
-   17,   18,   19,   20,   21,   22,   23,   24,   25,   26,
-   27,   28,   29,   30,   31,   32,   33,   34,   35,   36,
-    5,    6,    7,    8,    9,   10,   11,   12,   13,   14,
-   15,   16,   17,   18,   19,   20,   21,   22,   23,   24,
-   25,   26,   27,   28,   29,   30,   31,   32,   33,   34,
-   35,   36,    4,    5,    6,    7,    8,    9,   10,   11,
-   12,   13,   14,   15,   16,   17,   18,   19,   20,   21,
-   22,   23,   24,   25,   26,   27,   28,   29,   30,   31,
-   32,   33,   34,   35,   36,   37,    3,    4,    5,    6,
-    7,    8,    9,   10,   11,   12,   13,   14,   15,   16,
-   17,   18,   19,   20,   21,   22,   23,   24,   25,   26,
-   27,   28,   29,   30,   31,   32,   33,   34,   35,   36,
-   37,   38,    3,    4,    5,    6,    7,    8,    9,   10,
-   11,   12,   13,   14,   15,   16,   17,   18,   19,   20,
-   21,   22,   23,   24,   25,   26,   27,   28,   29,   30,
-   31,   32,   33,   34,   35,   36,   37,   38,    3,    4,
-    5,    6,    7,    8,    9,   10,   11,   12,   13,   14,
-   15,   16,   17,   18,   19,   20,   21,   22,   23,   24,
-   25,   26,   27,   28,   29,   30,   31,   32,   33,   34,
-   35,   36,   37,   38,    2,    3,    4,    5,    6,    7,
-    8,    9,   10,   11,   12,   13,   14,   15,   16,   17,
-   18,   23,   24,   25,   26,   27,   28,   29,   30,   31,
-   32,   33,   34,   35,   36,   37,   38,   39,    2,    3,
-    4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
-   14,   15,   16,   25,   26,   27,   28,   29,   30,   31,
-   32,   33,   34,   35,   36,   37,   38,   39,    1,    2,
-    3,    4,    5,    6,    7,    8,    9,   10,   11,   12,
-   13,   14,   15,   26,   27,   28,   29,   30,   31,   32,
-   33,   34,   35,   36,   37,   38,   39,   40,    1,    2,
-    3,    4,    5,    6,    7,    8,    9,   10,   11,   12,
-   13,   14,   27,   28,   29,   30,   31,   32,   33,   34,
-   35,   36,   37,   38,   39,   40,    1,    2,    3,    4,
-    5,    6,    7,    8,    9,   10,   11,   12,   13,   14,
-   27,   28,   29,   30,   31,   32,   33,   34,   35,   36,
-   37,   38,   39,   40,    1,    2,    3,    4,    5,    6,
-    7,    8,    9,   10,   11,   12,   13,   28,   29,   30,
-   31,   32,   33,   34,   35,   36,   37,   38,   39,   40,
-    1,    2,    3,    4,    5,    6,    7,    8,    9,   10,
-   11,   12,   13,   28,   29,   30,   31,   32,   33,   34,
-   35,   36,   37,   38,   39,   40,    1,    2,    3,    4,
-    5,    6,    7,    8,    9,   10,   11,   12,   13,   28,
-   29,   30,   31,   32,   33,   34,   35,   36,   37,   38,
-   39,   40,    1,    2,    3,    4,    5,    6,    7,    8,
-    9,   10,   11,   12,   13,   28,   29,   30,   31,   32,
-   33,   34,   35,   36,   37,   38,   39,   40,    1,    2,
-    3,    4,    5,    6,    7,    8,    9,   10,   11,   12,
-   13,   14,   27,   28,   29,   30,   31,   32,   33,   34,
-   35,   36,   37,   38,   39,   40,    1,    2,    3,    4,
-    5,    6,    7,    8,    9,   10,   11,   12,   13,   14,
-   27,   28,   29,   30,   31,   32,   33,   34,   35,   36,
-   37,   38,   39,   40,    1,    2,    3,    4,    5,    6,
-    7,    8,    9,   10,   11,   12,   13,   14,   15,   26,
-   27,   28,   29,   30,   31,   32,   33,   34,   35,   36,
-   37,   38,   39,   40,    2,    3,    4,    5,    6,    7,
-    8,    9,   10,   11,   12,   13,   14,   15,   16,   25,
-   26,   27,   28,   29,   30,   31,   32,   33,   34,   35,
-   36,   37,   38,   39,    2,    3,    4,    5,    6,    7,
-    8,    9,   10,   11,   12,   13,   14,   15,   16,   17,
-   18,   23,   24,   25,   26,   27,   28,   29,   30,   31,
-   32,   33,   34,   35,   36,   37,   38,   39,    3,    4,
-    5,    6,    7,    8,    9,   10,   11,   12,   13,   14,
-   15,   16,   17,   18,   19,   20,   21,   22,   23,   24,
-   25,   26,   27,   28,   29,   30,   31,   32,   33,   34,
-   35,   36,   37,   38,    3,    4,    5,    6,    7,    8,
-    9,   10,   11,   12,   13,   14,   15,   16,   17,   18,
-   19,   20,   21,   22,   23,   24,   25,   26,   27,   28,
-   29,   30,   31,   32,   33,   34,   35,   36,   37,   38,
-    3,    4,    5,    6,    7,    8,    9,   10,   11,   12,
-   13,   14,   15,   16,   17,   18,   19,   20,   21,   22,
-   23,   24,   25,   26,   27,   28,   29,   30,   31,   32,
-   33,   34,   35,   36,   37,   38,    4,    5,    6,    7,
-    8,    9,   10,   11,   12,   13,   14,   15,   16,   17,
-   18,   19,   20,   21,   22,   23,   24,   25,   26,   27,
-   28,   29,   30,   31,   32,   33,   34,   35,   36,   37,
-    5,    6,    7,    8,    9,   10,   11,   12,   13,   14,
-   15,   16,   17,   18,   19,   20,   21,   22,   23,   24,
-   25,   26,   27,   28,   29,   30,   31,   32,   33,   34,
-   35,   36,    5,    6,    7,    8,    9,   10,   11,   12,
-   13,   14,   15,   16,   17,   18,   19,   20,   21,   22,
-   23,   24,   25,   26,   27,   28,   29,   30,   31,   32,
-   33,   34,   35,   36,    7,    8,    9,   10,   11,   12,
-   13,   14,   15,   16,   17,   18,   19,   20,   21,   22,
-   23,   24,   25,   26,   27,   28,   29,   30,   31,   32,
-   33,   34,    8,    9,   10,   11,   12,   13,   14,   15,
-   16,   17,   18,   19,   20,   21,   22,   23,   24,   25,
-   26,   27,   28,   29,   30,   31,   32,   33,    9,   10,
-   11,   12,   13,   14,   15,   16,   17,   18,   19,   20,
-   21,   22,   23,   24,   25,   26,   27,   28,   29,   30,
-   31,   32,   10,   11,   12,   13,   14,   15,   16,   17,
-   18,   19,   20,   21,   22,   23,   24,   25,   26,   27,
-   28,   29,   30,   31,   13,   14,   15,   16,   17,   18,
-   19,   20,   21,   22,   23,   24,   25,   26,   27,   28,
-   15,   16,   17,   18,   19,   20,   21,   22,   23,   24,
-   25,   26
-};
+const unsigned short ESDetId::hy1[kXYMAX] = {
+    15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 10,
+    11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 9,  10, 11, 12, 13, 14, 15, 16,
+    17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+    21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+    23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+    22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18,
+    19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14,
+    15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 3,  4,  5,  6,  7,  8,
+    9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+    38, 3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+    31, 32, 33, 34, 35, 36, 37, 38, 3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+    24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15,
+    16, 17, 18, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 2,  3,  4,  5,  6,  7,  8,  9,  10,
+    11, 12, 13, 14, 15, 16, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 1,  2,  3,  4,  5,  6,  7,  8,
+    9,  10, 11, 12, 13, 14, 15, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 1,  2,  3,  4,  5,  6,  7,
+    8,  9,  10, 11, 12, 13, 14, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 1,  2,  3,  4,  5,  6,  7,  8,
+    9,  10, 11, 12, 13, 14, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 1,  2,  3,  4,  5,  6,  7,  8,  9,
+    10, 11, 12, 13, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12,
+    13, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 28, 29,
+    30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 28, 29, 30, 31, 32,
+    33, 34, 35, 36, 37, 38, 39, 40, 1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 27, 28, 29, 30, 31, 32, 33,
+    34, 35, 36, 37, 38, 39, 40, 1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 27, 28, 29, 30, 31, 32, 33, 34,
+    35, 36, 37, 38, 39, 40, 1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 26, 27, 28, 29, 30, 31, 32, 33,
+    34, 35, 36, 37, 38, 39, 40, 2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 25, 26, 27, 28, 29, 30, 31,
+    32, 33, 34, 35, 36, 37, 38, 39, 2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 23, 24, 25, 26,
+    27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18,
+    19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 3,  4,  5,  6,  7,  8,  9,  10, 11,
+    12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 3,  4,
+    5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+    34, 35, 36, 37, 38, 4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+    28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+    24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+    21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+    20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+    22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+    26, 27, 28, 29, 30, 31, 32, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+    13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26};
 
-const unsigned short ESDetId::hx2[ kXYMAX ] = {
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-    2,    2,    2,    2,    3,    3,    3,    3,    3,    3,
-    3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-    3,    3,    3,    3,    4,    4,    4,    4,    4,    4,
-    4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-    4,    4,    4,    4,    4,    4,    5,    5,    5,    5,
-    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-    5,    5,    6,    6,    6,    6,    6,    6,    6,    6,
-    6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
-    6,    6,    6,    6,    6,    6,    6,    6,    7,    7,
-    7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
-    7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
-    7,    7,    7,    7,    7,    7,    8,    8,    8,    8,
-    8,    8,    8,    8,    8,    8,    8,    8,    8,    8,
-    8,    8,    8,    8,    8,    8,    8,    8,    8,    8,
-    8,    8,    8,    8,    8,    8,    9,    9,    9,    9,
-    9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-    9,    9,    9,    9,    9,    9,    9,    9,    9,    9,
-    9,    9,    9,    9,    9,    9,    9,    9,   10,   10,
-   10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-   10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-   10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-   10,   10,   11,   11,   11,   11,   11,   11,   11,   11,
-   11,   11,   11,   11,   11,   11,   11,   11,   11,   11,
-   11,   11,   11,   11,   11,   11,   11,   11,   11,   11,
-   11,   11,   11,   11,   11,   11,   12,   12,   12,   12,
-   12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-   12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-   12,   12,   12,   12,   12,   12,   12,   12,   12,   12,
-   13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-   13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-   13,   13,   13,   13,   13,   13,   13,   13,   13,   13,
-   13,   13,   13,   13,   13,   13,   14,   14,   14,   14,
-   14,   14,   14,   14,   14,   14,   14,   14,   14,   14,
-   14,   14,   14,   14,   14,   14,   14,   14,   14,   14,
-   14,   14,   14,   14,   14,   14,   14,   14,   15,   15,
-   15,   15,   15,   15,   15,   15,   15,   15,   15,   15,
-   15,   15,   15,   15,   15,   15,   15,   15,   15,   15,
-   15,   15,   15,   15,   15,   15,   15,   15,   16,   16,
-   16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
-   16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
-   16,   16,   16,   16,   16,   16,   17,   17,   17,   17,
-   17,   17,   17,   17,   17,   17,   17,   17,   17,   17,
-   17,   17,   17,   17,   17,   17,   17,   17,   17,   17,
-   17,   17,   18,   18,   18,   18,   18,   18,   18,   18,
-   18,   18,   18,   18,   18,   18,   18,   18,   18,   18,
-   18,   18,   18,   18,   18,   18,   18,   18,   19,   19,
-   19,   19,   19,   19,   19,   19,   19,   19,   19,   19,
-   19,   19,   19,   19,   19,   19,   19,   19,   19,   19,
-   19,   19,   20,   20,   20,   20,   20,   20,   20,   20,
-   20,   20,   20,   20,   20,   20,   20,   20,   20,   20,
-   20,   20,   20,   20,   20,   20,   21,   21,   21,   21,
-   21,   21,   21,   21,   21,   21,   21,   21,   21,   21,
-   21,   21,   21,   21,   21,   21,   21,   21,   21,   21,
-   22,   22,   22,   22,   22,   22,   22,   22,   22,   22,
-   22,   22,   22,   22,   22,   22,   22,   22,   22,   22,
-   22,   22,   22,   22,   23,   23,   23,   23,   23,   23,
-   23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-   23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-   24,   24,   24,   24,   24,   24,   24,   24,   24,   24,
-   24,   24,   24,   24,   24,   24,   24,   24,   24,   24,
-   24,   24,   24,   24,   24,   24,   25,   25,   25,   25,
-   25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
-   25,   25,   25,   25,   25,   25,   25,   25,   25,   25,
-   25,   25,   25,   25,   26,   26,   26,   26,   26,   26,
-   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
-   26,   26,   26,   26,   26,   26,   26,   26,   26,   26,
-   26,   26,   26,   26,   27,   27,   27,   27,   27,   27,
-   27,   27,   27,   27,   27,   27,   27,   27,   27,   27,
-   27,   27,   27,   27,   27,   27,   27,   27,   27,   27,
-   27,   27,   27,   27,   27,   27,   28,   28,   28,   28,
-   28,   28,   28,   28,   28,   28,   28,   28,   28,   28,
-   28,   28,   28,   28,   28,   28,   28,   28,   28,   28,
-   28,   28,   28,   28,   28,   28,   28,   28,   28,   28,
-   28,   28,   29,   29,   29,   29,   29,   29,   29,   29,
-   29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
-   29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
-   29,   29,   29,   29,   29,   29,   30,   30,   30,   30,
-   30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-   30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-   30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-   31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-   31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-   31,   31,   31,   31,   31,   31,   31,   31,   31,   31,
-   31,   31,   31,   31,   32,   32,   32,   32,   32,   32,
-   32,   32,   32,   32,   32,   32,   32,   32,   32,   32,
-   32,   32,   32,   32,   32,   32,   32,   32,   32,   32,
-   32,   32,   32,   32,   32,   32,   33,   33,   33,   33,
-   33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-   33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
-   33,   33,   33,   33,   33,   33,   34,   34,   34,   34,
-   34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
-   34,   34,   34,   34,   34,   34,   34,   34,   34,   34,
-   34,   34,   34,   34,   35,   35,   35,   35,   35,   35,
-   35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
-   35,   35,   35,   35,   35,   35,   35,   35,   35,   35,
-   36,   36,   36,   36,   36,   36,   36,   36,   36,   36,
-   36,   36,   36,   36,   36,   36,   36,   36,   36,   36,
-   36,   36,   36,   36,   36,   36,   37,   37,   37,   37,
-   37,   37,   37,   37,   37,   37,   37,   37,   37,   37,
-   37,   37,   37,   37,   37,   37,   37,   37,   38,   38,
-   38,   38,   38,   38,   38,   38,   38,   38,   38,   38,
-   38,   38,   38,   38,   38,   38,   38,   38,   39,   39,
-   39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-   39,   39,   40,   40,   40,   40,   40,   40,   40,   40,
-   40,   40
-};
+const unsigned short ESDetId::hx2[kXYMAX] = {
+    1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  3,  3,  3,  3,  3,
+    3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,  4,
+    4,  4,  4,  4,  4,  4,  4,  4,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,
+    5,  5,  5,  5,  5,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,
+    6,  6,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,  7,
+    7,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,
+    8,  8,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,
+    9,  9,  9,  9,  9,  10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10,
+    10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
+    11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
+    12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+    13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 14, 14,
+    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
+    14, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+    15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    16, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 18, 18,
+    18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, 19,
+    19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+    20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+    21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+    22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+    23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 25, 25,
+    25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26,
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27,
+    27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
+    27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+    28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
+    29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
+    30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31,
+    31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, 32, 32, 32, 32,
+    32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33,
+    33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34,
+    34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35,
+    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, 36, 36, 36, 36, 36,
+    36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 37, 37, 37, 37, 37, 37, 37, 37, 37,
+    37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
+    38, 38, 38, 38, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40};
 
-const unsigned short ESDetId::hy2[ kXYMAX ] = {
-   16,   17,   18,   19,   20,   21,   22,   23,   24,   25,
-   14,   15,   16,   17,   18,   19,   20,   21,   22,   23,
-   24,   25,   26,   27,   11,   12,   13,   14,   15,   16,
-   17,   18,   19,   20,   21,   22,   23,   24,   25,   26,
-   27,   28,   29,   30,   10,   11,   12,   13,   14,   15,
-   16,   17,   18,   19,   20,   21,   22,   23,   24,   25,
-   26,   27,   28,   29,   30,   31,    8,    9,   10,   11,
-   12,   13,   14,   15,   16,   17,   18,   19,   20,   21,
-   22,   23,   24,   25,   26,   27,   28,   29,   30,   31,
-   32,   33,    8,    9,   10,   11,   12,   13,   14,   15,
-   16,   17,   18,   19,   20,   21,   22,   23,   24,   25,
-   26,   27,   28,   29,   30,   31,   32,   33,    7,    8,
-    9,   10,   11,   12,   13,   14,   15,   16,   17,   18,
-   19,   20,   21,   22,   23,   24,   25,   26,   27,   28,
-   29,   30,   31,   32,   33,   34,    6,    7,    8,    9,
-   10,   11,   12,   13,   14,   15,   16,   17,   18,   19,
-   20,   21,   22,   23,   24,   25,   26,   27,   28,   29,
-   30,   31,   32,   33,   34,   35,    5,    6,    7,    8,
-    9,   10,   11,   12,   13,   14,   15,   16,   17,   18,
-   19,   20,   21,   22,   23,   24,   25,   26,   27,   28,
-   29,   30,   31,   32,   33,   34,   35,   36,    4,    5,
-    6,    7,    8,    9,   10,   11,   12,   13,   14,   15,
-   16,   17,   18,   19,   20,   21,   22,   23,   24,   25,
-   26,   27,   28,   29,   30,   31,   32,   33,   34,   35,
-   36,   37,    4,    5,    6,    7,    8,    9,   10,   11,
-   12,   13,   14,   15,   16,   17,   18,   19,   20,   21,
-   22,   23,   24,   25,   26,   27,   28,   29,   30,   31,
-   32,   33,   34,   35,   36,   37,    4,    5,    6,    7,
-    8,    9,   10,   11,   12,   13,   14,   15,   16,   17,
-   18,   19,   20,   21,   22,   23,   24,   25,   26,   27,
-   28,   29,   30,   31,   32,   33,   34,   35,   36,   37,
-    3,    4,    5,    6,    7,    8,    9,   10,   11,   12,
-   13,   14,   15,   16,   17,   18,   19,   20,   21,   22,
-   23,   24,   25,   26,   27,   28,   29,   30,   31,   32,
-   33,   34,   35,   36,   37,   38,    3,    4,    5,    6,
-    7,    8,    9,   10,   11,   12,   13,   14,   15,   16,
-   17,   18,   23,   24,   25,   26,   27,   28,   29,   30,
-   31,   32,   33,   34,   35,   36,   37,   38,    2,    3,
-    4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
-   14,   15,   16,   25,   26,   27,   28,   29,   30,   31,
-   32,   33,   34,   35,   36,   37,   38,   39,    2,    3,
-    4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
-   14,   15,   26,   27,   28,   29,   30,   31,   32,   33,
-   34,   35,   36,   37,   38,   39,    2,    3,    4,    5,
-    6,    7,    8,    9,   10,   11,   12,   13,   14,   27,
-   28,   29,   30,   31,   32,   33,   34,   35,   36,   37,
-   38,   39,    2,    3,    4,    5,    6,    7,    8,    9,
-   10,   11,   12,   13,   14,   27,   28,   29,   30,   31,
-   32,   33,   34,   35,   36,   37,   38,   39,    2,    3,
-    4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
-   28,   29,   30,   31,   32,   33,   34,   35,   36,   37,
-   38,   39,    2,    3,    4,    5,    6,    7,    8,    9,
-   10,   11,   12,   13,   28,   29,   30,   31,   32,   33,
-   34,   35,   36,   37,   38,   39,    2,    3,    4,    5,
-    6,    7,    8,    9,   10,   11,   12,   13,   28,   29,
-   30,   31,   32,   33,   34,   35,   36,   37,   38,   39,
-    2,    3,    4,    5,    6,    7,    8,    9,   10,   11,
-   12,   13,   28,   29,   30,   31,   32,   33,   34,   35,
-   36,   37,   38,   39,    2,    3,    4,    5,    6,    7,
-    8,    9,   10,   11,   12,   13,   14,   27,   28,   29,
-   30,   31,   32,   33,   34,   35,   36,   37,   38,   39,
-    2,    3,    4,    5,    6,    7,    8,    9,   10,   11,
-   12,   13,   14,   27,   28,   29,   30,   31,   32,   33,
-   34,   35,   36,   37,   38,   39,    2,    3,    4,    5,
-    6,    7,    8,    9,   10,   11,   12,   13,   14,   15,
-   26,   27,   28,   29,   30,   31,   32,   33,   34,   35,
-   36,   37,   38,   39,    2,    3,    4,    5,    6,    7,
-    8,    9,   10,   11,   12,   13,   14,   15,   16,   25,
-   26,   27,   28,   29,   30,   31,   32,   33,   34,   35,
-   36,   37,   38,   39,    3,    4,    5,    6,    7,    8,
-    9,   10,   11,   12,   13,   14,   15,   16,   17,   18,
-   23,   24,   25,   26,   27,   28,   29,   30,   31,   32,
-   33,   34,   35,   36,   37,   38,    3,    4,    5,    6,
-    7,    8,    9,   10,   11,   12,   13,   14,   15,   16,
-   17,   18,   19,   20,   21,   22,   23,   24,   25,   26,
-   27,   28,   29,   30,   31,   32,   33,   34,   35,   36,
-   37,   38,    4,    5,    6,    7,    8,    9,   10,   11,
-   12,   13,   14,   15,   16,   17,   18,   19,   20,   21,
-   22,   23,   24,   25,   26,   27,   28,   29,   30,   31,
-   32,   33,   34,   35,   36,   37,    4,    5,    6,    7,
-    8,    9,   10,   11,   12,   13,   14,   15,   16,   17,
-   18,   19,   20,   21,   22,   23,   24,   25,   26,   27,
-   28,   29,   30,   31,   32,   33,   34,   35,   36,   37,
-    4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
-   14,   15,   16,   17,   18,   19,   20,   21,   22,   23,
-   24,   25,   26,   27,   28,   29,   30,   31,   32,   33,
-   34,   35,   36,   37,    5,    6,    7,    8,    9,   10,
-   11,   12,   13,   14,   15,   16,   17,   18,   19,   20,
-   21,   22,   23,   24,   25,   26,   27,   28,   29,   30,
-   31,   32,   33,   34,   35,   36,    6,    7,    8,    9,
-   10,   11,   12,   13,   14,   15,   16,   17,   18,   19,
-   20,   21,   22,   23,   24,   25,   26,   27,   28,   29,
-   30,   31,   32,   33,   34,   35,    7,    8,    9,   10,
-   11,   12,   13,   14,   15,   16,   17,   18,   19,   20,
-   21,   22,   23,   24,   25,   26,   27,   28,   29,   30,
-   31,   32,   33,   34,    8,    9,   10,   11,   12,   13,
-   14,   15,   16,   17,   18,   19,   20,   21,   22,   23,
-   24,   25,   26,   27,   28,   29,   30,   31,   32,   33,
-    8,    9,   10,   11,   12,   13,   14,   15,   16,   17,
-   18,   19,   20,   21,   22,   23,   24,   25,   26,   27,
-   28,   29,   30,   31,   32,   33,   10,   11,   12,   13,
-   14,   15,   16,   17,   18,   19,   20,   21,   22,   23,
-   24,   25,   26,   27,   28,   29,   30,   31,   11,   12,
-   13,   14,   15,   16,   17,   18,   19,   20,   21,   22,
-   23,   24,   25,   26,   27,   28,   29,   30,   14,   15,
-   16,   17,   18,   19,   20,   21,   22,   23,   24,   25,
-   26,   27,   16,   17,   18,   19,   20,   21,   22,   23,
-   24,   25
-};
+const unsigned short ESDetId::hy2[kXYMAX] = {
+    16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 11, 12, 13, 14, 15,
+    16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+    24, 25, 26, 27, 28, 29, 30, 31, 8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+    29, 30, 31, 32, 33, 8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+    32, 33, 7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+    34, 6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+    34, 35, 5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+    32, 33, 34, 35, 36, 4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+    28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+    23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17,
+    18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 3,  4,  5,  6,  7,  8,  9,  10, 11,
+    12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 3,  4,
+    5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+    38, 2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+    38, 39, 2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+    39, 2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 2,  3,
+    4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 2,  3,  4,  5,  6,
+    7,  8,  9,  10, 11, 12, 13, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 2,  3,  4,  5,  6,  7,  8,  9,  10, 11,
+    12, 13, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 28, 29, 30,
+    31, 32, 33, 34, 35, 36, 37, 38, 39, 2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 28, 29, 30, 31, 32, 33, 34, 35,
+    36, 37, 38, 39, 2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+    39, 2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 2,  3,
+    4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 2,  3,  4,
+    5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 3,  4,
+    5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37,
+    38, 3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+    31, 32, 33, 34, 35, 36, 37, 38, 4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+    25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+    20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14,
+    15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 5,  6,  7,  8,  9,  10,
+    11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 6,  7,  8,
+    9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 7,  8,
+    9,  10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 8,  9,  10,
+    11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 8,  9,  10, 11, 12, 13,
+    14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+    19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+    27, 28, 29, 30, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25};
diff --git a/DataFormats/EcalDetId/src/EcalElectronicsId.cc b/DataFormats/EcalDetId/src/EcalElectronicsId.cc
index be340b498eafe..c668b93f9d189 100644
--- a/DataFormats/EcalDetId/src/EcalElectronicsId.cc
+++ b/DataFormats/EcalDetId/src/EcalElectronicsId.cc
@@ -3,80 +3,83 @@
 
 #include <ostream>
 
-EcalElectronicsId::EcalElectronicsId() {
-  EcalElectronicsId_=0xFFFFFFFFu;
-}
+EcalElectronicsId::EcalElectronicsId() { EcalElectronicsId_ = 0xFFFFFFFFu; }
 
-EcalElectronicsId::EcalElectronicsId(uint32_t id) {
-  EcalElectronicsId_=id;
-}
+EcalElectronicsId::EcalElectronicsId(uint32_t id) { EcalElectronicsId_ = id; }
 
-EcalElectronicsId::EcalElectronicsId(int dccid, int towerid, int stripid, int xtalid){
-  if ( (dccid < MIN_DCCID) || (dccid > MAX_DCCID) ||  
-       (towerid < MIN_TOWERID) || (towerid > MAX_TOWERID) ||  
-       (stripid < MIN_STRIPID) || (stripid > MAX_STRIPID) ||  
-       (xtalid < MIN_XTALID) || (xtalid > MAX_XTALID) )
-    throw cms::Exception("InvalidDetId") << "EcalElectronicsId:  Cannot create object.  Indexes out of bounds. Dcc tower strip xtal " << dccid << " " << towerid << " " << stripid << " " << xtalid << ".";
-  EcalElectronicsId_= (xtalid&0x7) | ( (stripid&0x7) << 3) | ( (towerid&0x7F) << 6) | ((dccid&0x7F) << 13);
+EcalElectronicsId::EcalElectronicsId(int dccid, int towerid, int stripid, int xtalid) {
+  if ((dccid < MIN_DCCID) || (dccid > MAX_DCCID) || (towerid < MIN_TOWERID) || (towerid > MAX_TOWERID) ||
+      (stripid < MIN_STRIPID) || (stripid > MAX_STRIPID) || (xtalid < MIN_XTALID) || (xtalid > MAX_XTALID))
+    throw cms::Exception("InvalidDetId")
+        << "EcalElectronicsId:  Cannot create object.  Indexes out of bounds. Dcc tower strip xtal " << dccid << " "
+        << towerid << " " << stripid << " " << xtalid << ".";
+  EcalElectronicsId_ = (xtalid & 0x7) | ((stripid & 0x7) << 3) | ((towerid & 0x7F) << 6) | ((dccid & 0x7F) << 13);
 }
 
-
 EcalSubdetector EcalElectronicsId::subdet() const {
-	int dcc = dccId();
-	if ( (dcc >= MIN_DCCID_EBM && dcc <= MAX_DCCID_EBM) ||
-	     (dcc >= MIN_DCCID_EBP && dcc <= MAX_DCCID_EBP) ) return EcalBarrel;
-	else return EcalEndcap;
+  int dcc = dccId();
+  if ((dcc >= MIN_DCCID_EBM && dcc <= MAX_DCCID_EBM) || (dcc >= MIN_DCCID_EBP && dcc <= MAX_DCCID_EBP))
+    return EcalBarrel;
+  else
+    return EcalEndcap;
 }
 
 int EcalElectronicsId::zside() const {
-	int dcc = dccId();
-	if ( (dcc >= MIN_DCCID_EEM && dcc <= MAX_DCCID_EEM)) return -1;
-        if ( (dcc >= MIN_DCCID_EBM && dcc <= MAX_DCCID_EBM)) return -1;
-        if ( (dcc >= MIN_DCCID_EEP && dcc <= MAX_DCCID_EEP)) return +1;
-        if ( (dcc >= MIN_DCCID_EBP && dcc <= MAX_DCCID_EBP)) return +1;
-	return 0;
+  int dcc = dccId();
+  if ((dcc >= MIN_DCCID_EEM && dcc <= MAX_DCCID_EEM))
+    return -1;
+  if ((dcc >= MIN_DCCID_EBM && dcc <= MAX_DCCID_EBM))
+    return -1;
+  if ((dcc >= MIN_DCCID_EEP && dcc <= MAX_DCCID_EEP))
+    return +1;
+  if ((dcc >= MIN_DCCID_EBP && dcc <= MAX_DCCID_EBP))
+    return +1;
+  return 0;
 }
 
-
-
 static int EEQuadrant(int dcc, int dcc_channel) {
-        // Q1 = EE+N or EE-F, Top
-        // Q2 = EE+F or EE-N, Top
-        // Q3 = EE+F or EE-N, Bottom
-        // Q4 = EE+N or EE-F, Bottom
-        //  (local notation)
-        // in Q1-Q3 and in Q2-Q4, the relation between strip#, channel# and xtal_id
-        // is the same
- int q=-1;
-  if ( (dcc == EcalElectronicsId::DCC_EEP + 1) || ( dcc == EcalElectronicsId::DCC_EEP + 2) ||
-       (dcc == EcalElectronicsId::DCC_EEP && dcc_channel <= EcalElectronicsId::kDCCChannelBoundary) ||
-       (dcc == EcalElectronicsId::DCC_EEM + 3) || ( dcc == EcalElectronicsId::DCC_EEM + 4) ||
-       (dcc == EcalElectronicsId::DCC_EEM + 5 && dcc_channel <= EcalElectronicsId::kDCCChannelBoundary) ) q=1;
-  else if ( (dcc == EcalElectronicsId::DCC_EEP + 3) || ( dcc == EcalElectronicsId::DCC_EEP + 4) ||
-       (dcc == EcalElectronicsId::DCC_EEP+5 && dcc_channel <= EcalElectronicsId::kDCCChannelBoundary) ||
-       (dcc == EcalElectronicsId::DCC_EEM && dcc_channel <= EcalElectronicsId::kDCCChannelBoundary) ||
-       (dcc == EcalElectronicsId::DCC_EEM + 1) || ( dcc == EcalElectronicsId::DCC_EEM + 2) ) q=2;
-  else if ( (dcc == EcalElectronicsId::DCC_EEP + 6) ||
-       (dcc == EcalElectronicsId::DCC_EEP + 5 && dcc_channel > EcalElectronicsId::kDCCChannelBoundary) ||
-       (dcc == EcalElectronicsId::DCC_EEP + 7 && dcc_channel > EcalElectronicsId::kDCCChannelBoundary) ||
-       (dcc == EcalElectronicsId::DCC_EEM && dcc_channel > EcalElectronicsId::kDCCChannelBoundary) ||
-       (dcc == EcalElectronicsId::DCC_EEM + 8) ||
-       (dcc == EcalElectronicsId::DCC_EEM + 7 && dcc_channel > EcalElectronicsId::kDCCChannelBoundary)) q=3;
+  // Q1 = EE+N or EE-F, Top
+  // Q2 = EE+F or EE-N, Top
+  // Q3 = EE+F or EE-N, Bottom
+  // Q4 = EE+N or EE-F, Bottom
+  //  (local notation)
+  // in Q1-Q3 and in Q2-Q4, the relation between strip#, channel# and xtal_id
+  // is the same
+  int q = -1;
+  if ((dcc == EcalElectronicsId::DCC_EEP + 1) || (dcc == EcalElectronicsId::DCC_EEP + 2) ||
+      (dcc == EcalElectronicsId::DCC_EEP && dcc_channel <= EcalElectronicsId::kDCCChannelBoundary) ||
+      (dcc == EcalElectronicsId::DCC_EEM + 3) || (dcc == EcalElectronicsId::DCC_EEM + 4) ||
+      (dcc == EcalElectronicsId::DCC_EEM + 5 && dcc_channel <= EcalElectronicsId::kDCCChannelBoundary))
+    q = 1;
+  else if ((dcc == EcalElectronicsId::DCC_EEP + 3) || (dcc == EcalElectronicsId::DCC_EEP + 4) ||
+           (dcc == EcalElectronicsId::DCC_EEP + 5 && dcc_channel <= EcalElectronicsId::kDCCChannelBoundary) ||
+           (dcc == EcalElectronicsId::DCC_EEM && dcc_channel <= EcalElectronicsId::kDCCChannelBoundary) ||
+           (dcc == EcalElectronicsId::DCC_EEM + 1) || (dcc == EcalElectronicsId::DCC_EEM + 2))
+    q = 2;
+  else if ((dcc == EcalElectronicsId::DCC_EEP + 6) ||
+           (dcc == EcalElectronicsId::DCC_EEP + 5 && dcc_channel > EcalElectronicsId::kDCCChannelBoundary) ||
+           (dcc == EcalElectronicsId::DCC_EEP + 7 && dcc_channel > EcalElectronicsId::kDCCChannelBoundary) ||
+           (dcc == EcalElectronicsId::DCC_EEM && dcc_channel > EcalElectronicsId::kDCCChannelBoundary) ||
+           (dcc == EcalElectronicsId::DCC_EEM + 8) ||
+           (dcc == EcalElectronicsId::DCC_EEM + 7 && dcc_channel > EcalElectronicsId::kDCCChannelBoundary))
+    q = 3;
   else
-       q=4;
+    q = 4;
   return q;
 }
 
 int EcalElectronicsId::channelId() const {
- int dcc = dccId() ;
- int dcc_channel = towerId();
- int quadrant = EEQuadrant(dcc, dcc_channel);
- int strip = stripId();
- int xtal = xtalId();
- int channel;
- if (quadrant ==1 || quadrant== 3) channel = 5*(strip-1) + xtal;
- else channel = 5*(xtal-1) + strip;
- return channel;
+  int dcc = dccId();
+  int dcc_channel = towerId();
+  int quadrant = EEQuadrant(dcc, dcc_channel);
+  int strip = stripId();
+  int xtal = xtalId();
+  int channel;
+  if (quadrant == 1 || quadrant == 3)
+    channel = 5 * (strip - 1) + xtal;
+  else
+    channel = 5 * (xtal - 1) + strip;
+  return channel;
 }
 
 /*
@@ -103,10 +106,6 @@ int EcalElectronicsId::XtalInStripId() {
 }
 */
 
-
-
-std::ostream& operator<<(std::ostream& os,const EcalElectronicsId& id) 
-{
-  return os << id.dccId() << ',' << id.towerId() << ',' << id.stripId() << ',' << id.xtalId() ;
+std::ostream& operator<<(std::ostream& os, const EcalElectronicsId& id) {
+  return os << id.dccId() << ',' << id.towerId() << ',' << id.stripId() << ',' << id.xtalId();
 }
-
diff --git a/DataFormats/EcalDetId/src/EcalPnDiodeDetId.cc b/DataFormats/EcalDetId/src/EcalPnDiodeDetId.cc
index 1705d98a33598..508df17374042 100644
--- a/DataFormats/EcalDetId/src/EcalPnDiodeDetId.cc
+++ b/DataFormats/EcalDetId/src/EcalPnDiodeDetId.cc
@@ -1,44 +1,34 @@
 #include "DataFormats/EcalDetId/interface/EcalPnDiodeDetId.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-EcalPnDiodeDetId::EcalPnDiodeDetId() {
-}
-  
-  
-EcalPnDiodeDetId::EcalPnDiodeDetId(uint32_t rawid) : DetId(rawid) {
-}
-  
-EcalPnDiodeDetId::EcalPnDiodeDetId(int EcalSubDetectorId, int DCCId, int PnId) : DetId(Ecal,EcalLaserPnDiode) {
-  if ( (DCCId < MIN_DCCID) || (DCCId > MAX_DCCID) ||  
-       (PnId < MIN_PNID) || (PnId > MAX_PNID) ||  
-       (EcalSubDetectorId != EcalBarrel && EcalSubDetectorId != EcalEndcap))
+EcalPnDiodeDetId::EcalPnDiodeDetId() {}
+
+EcalPnDiodeDetId::EcalPnDiodeDetId(uint32_t rawid) : DetId(rawid) {}
+
+EcalPnDiodeDetId::EcalPnDiodeDetId(int EcalSubDetectorId, int DCCId, int PnId) : DetId(Ecal, EcalLaserPnDiode) {
+  if ((DCCId < MIN_DCCID) || (DCCId > MAX_DCCID) || (PnId < MIN_PNID) || (PnId > MAX_PNID) ||
+      (EcalSubDetectorId != EcalBarrel && EcalSubDetectorId != EcalEndcap))
     throw cms::Exception("InvalidDetId") << "EcalPnDiodeDetId:  Cannot create object.  Indexes out of bounds.";
-  id_|= ((((EcalSubDetectorId==EcalBarrel)?(0):(1))<<11) | 
-	((DCCId&0x7F)<<4) |
-	(PnId&0xF));
+  id_ |= ((((EcalSubDetectorId == EcalBarrel) ? (0) : (1)) << 11) | ((DCCId & 0x7F) << 4) | (PnId & 0xF));
 }
-  
+
 EcalPnDiodeDetId::EcalPnDiodeDetId(const DetId& gen) {
-  if (!gen.null() && ( gen.det()!=Ecal || gen.subdetId()!=EcalLaserPnDiode)) {
+  if (!gen.null() && (gen.det() != Ecal || gen.subdetId() != EcalLaserPnDiode)) {
     throw cms::Exception("InvalidDetId");
   }
-  id_=gen.rawId();
+  id_ = gen.rawId();
 }
-  
+
 EcalPnDiodeDetId& EcalPnDiodeDetId::operator=(const DetId& gen) {
-  if (!gen.null() && ( gen.det()!=Ecal || gen.subdetId()!=EcalLaserPnDiode)) {
+  if (!gen.null() && (gen.det() != Ecal || gen.subdetId() != EcalLaserPnDiode)) {
     throw cms::Exception("InvalidDetId");
   }
-  id_=gen.rawId();
+  id_ = gen.rawId();
   return *this;
 }
 
-int EcalPnDiodeDetId::hashedIndex() const
-{
-  throw cms::Exception("MethodNotImplemented");
-}    
+int EcalPnDiodeDetId::hashedIndex() const { throw cms::Exception("MethodNotImplemented"); }
 
-std::ostream& operator<<(std::ostream& s,const EcalPnDiodeDetId& id) {
+std::ostream& operator<<(std::ostream& s, const EcalPnDiodeDetId& id) {
   return s << "(EcalPnDiode " << id.iEcalSubDetectorId() << ',' << id.iDCCId() << ',' << id.iPnId() << ')';
 }
-
diff --git a/DataFormats/EcalDetId/src/EcalScDetId.cc b/DataFormats/EcalDetId/src/EcalScDetId.cc
index b0519845e2995..3a08fccb1b11b 100644
--- a/DataFormats/EcalDetId/src/EcalScDetId.cc
+++ b/DataFormats/EcalDetId/src/EcalScDetId.cc
@@ -9,103 +9,97 @@ short EcalScDetId::xyz2HashedIndex[EcalScDetId::IX_MAX][EcalScDetId::IY_MAX][Eca
 
 EcalScDetId EcalScDetId::hashedIndex2DetId[kSizeForDenseIndexing];
 
+EcalScDetId::EcalScDetId() : DetId() {}
 
-EcalScDetId::EcalScDetId() : DetId() {
-}
-
-EcalScDetId::EcalScDetId(uint32_t rawid) : DetId(rawid) {
-}
+EcalScDetId::EcalScDetId(uint32_t rawid) : DetId(rawid) {}
 
-EcalScDetId::EcalScDetId(int ix, int iy, int iz) : DetId(Ecal,EcalEndcap) 
-{
-  if(!validDetId(ix,iy,iz))
-    {
-      throw cms::Exception("InvalidDetId") << "EcalScDetId:  Cannot create object.  Indexes out of bounds \n" 
-                                           << "x = " << ix << " y = " << iy << " z = " << iz;
-    }
-  const int scBit = 1<<15; //bit set to 1 to distinguish from crystal id (EEDetId)
+EcalScDetId::EcalScDetId(int ix, int iy, int iz) : DetId(Ecal, EcalEndcap) {
+  if (!validDetId(ix, iy, iz)) {
+    throw cms::Exception("InvalidDetId") << "EcalScDetId:  Cannot create object.  Indexes out of bounds \n"
+                                         << "x = " << ix << " y = " << iy << " z = " << iz;
+  }
+  const int scBit = 1 << 15;  //bit set to 1 to distinguish from crystal id (EEDetId)
   //                         and for a reasonale behaviour of DetId ccomparison operators.
-  id_|=(iy&0x7f)|((ix&0x7f)<<7)|((iz>0)?(1<<14):(0))|scBit;
+  id_ |= (iy & 0x7f) | ((ix & 0x7f) << 7) | ((iz > 0) ? (1 << 14) : (0)) | scBit;
 }
-  
+
 EcalScDetId::EcalScDetId(const DetId& gen) {
-  if (!gen.null() && (gen.det()!=Ecal || gen.subdetId()!=EcalEndcap)) {
-    throw cms::Exception("InvalidDetId"); 
+  if (!gen.null() && (gen.det() != Ecal || gen.subdetId() != EcalEndcap)) {
+    throw cms::Exception("InvalidDetId");
   }
-  id_=gen.rawId();
+  id_ = gen.rawId();
 }
-  
+
 EcalScDetId& EcalScDetId::operator=(const DetId& gen) {
-  if (!gen.null() && ( gen.det()!=Ecal || gen.subdetId()!=EcalEndcap )) {
-    throw cms::Exception("InvalidDetId"); 
+  if (!gen.null() && (gen.det() != Ecal || gen.subdetId() != EcalEndcap)) {
+    throw cms::Exception("InvalidDetId");
   }
-  id_=gen.rawId();
+  id_ = gen.rawId();
   return *this;
 }
-  
+
 int EcalScDetId::iquadrant() const {
-  const int xMiddle = IX_MAX/2; //y = 0 between xMiddle and xMiddle+1
-  const int yMiddle = IY_MAX/2; //x = 0 between yMiddle and yMiddle+1
-  if (iy()>yMiddle){// y>0
-    if(ix()>xMiddle)   //             A y	     
-      return 1;        //             |		     
-    else	       //      Q2     |    Q1	     
-      return 2;        //             |		     
-  } else{// y<0	       //   ----------o---------> x   
-    if(ix()>xMiddle)   //             |		      
-      return 4;        //      Q3     |    Q4	    
-    else	       //             |               
+  const int xMiddle = IX_MAX / 2;  //y = 0 between xMiddle and xMiddle+1
+  const int yMiddle = IY_MAX / 2;  //x = 0 between yMiddle and yMiddle+1
+  if (iy() > yMiddle) {            // y>0
+    if (ix() > xMiddle)            //             A y
+      return 1;                    //             |
+    else                           //      Q2     |    Q1
+      return 2;                    //             |
+  } else {                         // y<0	       //   ----------o---------> x
+    if (ix() > xMiddle)            //             |
+      return 4;                    //      Q3     |    Q4
+    else                           //             |
       return 3;
   }
   //Should never be reached
   return -1;
-}  
+}
 
 bool EcalScDetId::validDetId(int iX, int iY, int iZ) {
   static const char endcapMap[401] = {
-    "       XXXXXX       "
-    "    XXXXXXXXXXXX    "
-    "   XXXXXXXXXXXXXX   "
-    "  XXXXXXXXXXXXXXXX  "
-    " XXXXXXXXXXXXXXXXXX "
-    " XXXXXXXXXXXXXXXXXX "             //    Z
-    " XXXXXXXXXXXXXXXXXX "             //     x-----> X
-    "XXXXXXXXXXXXXXXXXXXX"             //     |
-    "XXXXXXXXX  XXXXXXXXX"             //     |
-    "XXXXXXXX    XXXXXXXX"//_          //     |
-    "XXXXXXXX    XXXXXXXX"             //     V Y
-    "XXXXXXXXX  XXXXXXXXX"
-    "XXXXXXXXXXXXXXXXXXXX"
-    " XXXXXXXXXXXXXXXXXX "
-    " XXXXXXXXXXXXXXXXXX "
-    " XXXXXXXXXXXXXXXXXX "
-    "  XXXXXXXXXXXXXXXX  "
-    "   XXXXXXXXXXXXXX   "
-    "    XXXXXXXXXXXX    "
-    "       XXXXXX       "};
+      "       XXXXXX       "
+      "    XXXXXXXXXXXX    "
+      "   XXXXXXXXXXXXXX   "
+      "  XXXXXXXXXXXXXXXX  "
+      " XXXXXXXXXXXXXXXXXX "
+      " XXXXXXXXXXXXXXXXXX "  //    Z
+      " XXXXXXXXXXXXXXXXXX "  //     x-----> X
+      "XXXXXXXXXXXXXXXXXXXX"  //     |
+      "XXXXXXXXX  XXXXXXXXX"  //     |
+      "XXXXXXXX    XXXXXXXX"  //_          //     |
+      "XXXXXXXX    XXXXXXXX"  //     V Y
+      "XXXXXXXXX  XXXXXXXXX"
+      "XXXXXXXXXXXXXXXXXXXX"
+      " XXXXXXXXXXXXXXXXXX "
+      " XXXXXXXXXXXXXXXXXX "
+      " XXXXXXXXXXXXXXXXXX "
+      "  XXXXXXXXXXXXXXXX  "
+      "   XXXXXXXXXXXXXX   "
+      "    XXXXXXXXXXXX    "
+      "       XXXXXX       "};
 
-  return abs(iZ)==1 && endcapMap[iX-1+(iY-1)*20]!=' ';
+  return abs(iZ) == 1 && endcapMap[iX - 1 + (iY - 1) * 20] != ' ';
 }
 
-std::ostream& operator<<(std::ostream& s,const EcalScDetId& id) {
-  return s << "(EE iz " << ((id.zside()>0)?("+ "):("- ")) << " ix " << id.ix() << " , iy " << id.iy() << ')';
+std::ostream& operator<<(std::ostream& s, const EcalScDetId& id) {
+  return s << "(EE iz " << ((id.zside() > 0) ? ("+ ") : ("- ")) << " ix " << id.ix() << " , iy " << id.iy() << ')';
 }
 
 //NOTE: When looping is possible in constexpr, this should be changed to one
 static std::once_flag initializedFlag;
-void EcalScDetId::checkHashedIndexMap(){
-  std::call_once(initializedFlag, []() 
-  {
+void EcalScDetId::checkHashedIndexMap() {
+  std::call_once(initializedFlag, []() {
     int hashedIndex = -1;
-    for(int iZ = -1; iZ <= +1; iZ+=2){
-      for(int iY = IY_MIN; iY <= IY_MAX; ++iY){
-	for(int iX = IX_MIN; iX <= IX_MAX; ++iX){
-	  if(validDetId(iX,iY,iZ)){
-	    xyz2HashedIndex[iX-IX_MIN][iY-IY_MIN][iZ>0?1:0] = ++hashedIndex;
-	    assert((unsigned)hashedIndex < sizeof(hashedIndex2DetId)/sizeof(hashedIndex2DetId[0]));
-	    hashedIndex2DetId[hashedIndex] = EcalScDetId(iX, iY, iZ);
-	  }
-	}
+    for (int iZ = -1; iZ <= +1; iZ += 2) {
+      for (int iY = IY_MIN; iY <= IY_MAX; ++iY) {
+        for (int iX = IX_MIN; iX <= IX_MAX; ++iX) {
+          if (validDetId(iX, iY, iZ)) {
+            xyz2HashedIndex[iX - IX_MIN][iY - IY_MIN][iZ > 0 ? 1 : 0] = ++hashedIndex;
+            assert((unsigned)hashedIndex < sizeof(hashedIndex2DetId) / sizeof(hashedIndex2DetId[0]));
+            hashedIndex2DetId[hashedIndex] = EcalScDetId(iX, iY, iZ);
+          }
+        }
       }
     }
   });
diff --git a/DataFormats/EcalDetId/src/EcalTrigTowerDetId.cc b/DataFormats/EcalDetId/src/EcalTrigTowerDetId.cc
index 9187d0f2632e1..b053bfbac0804 100644
--- a/DataFormats/EcalDetId/src/EcalTrigTowerDetId.cc
+++ b/DataFormats/EcalDetId/src/EcalTrigTowerDetId.cc
@@ -2,173 +2,141 @@
 #include "FWCore/Utilities/interface/Exception.h"
 #include <cassert>
 
-EcalTrigTowerDetId::EcalTrigTowerDetId() {
-}
-  
-  
-EcalTrigTowerDetId::EcalTrigTowerDetId(uint32_t rawid) : DetId(rawid) {
-}
+EcalTrigTowerDetId::EcalTrigTowerDetId() {}
+
+EcalTrigTowerDetId::EcalTrigTowerDetId(uint32_t rawid) : DetId(rawid) {}
 
 EcalTrigTowerDetId::EcalTrigTowerDetId(int zside, EcalSubdetector subDet, int i, int j, int mode)
-  : DetId(Ecal,EcalTriggerTower) 
-{
-  int tower_i=0;
-  int tower_j=0;
+    : DetId(Ecal, EcalTriggerTower) {
+  int tower_i = 0;
+  int tower_j = 0;
 
-  if (mode == SUBDETIJMODE)
-    {
-      tower_i=i;
-      tower_j=j;
-    }
-  else if (mode == SUBDETDCCTTMODE)
-    {
-      throw cms::Exception("InvalidDetId") << "EcalTriggerTowerDetId:  Cannot create object. SUBDETDCCTTMODE not yet implemented.";   
-    }
-  else
-    throw cms::Exception("InvalidDetId") << "EcalTriggerTowerDetId:  Cannot create object.  Unknown mode for (int, EcalSubdetector, int, int) constructor.";
-  
-  if (tower_i > MAX_I || tower_i < MIN_I  || tower_j > MAX_J || tower_j < MIN_J)
+  if (mode == SUBDETIJMODE) {
+    tower_i = i;
+    tower_j = j;
+  } else if (mode == SUBDETDCCTTMODE) {
+    throw cms::Exception("InvalidDetId")
+        << "EcalTriggerTowerDetId:  Cannot create object. SUBDETDCCTTMODE not yet implemented.";
+  } else
+    throw cms::Exception("InvalidDetId") << "EcalTriggerTowerDetId:  Cannot create object.  Unknown mode for (int, "
+                                            "EcalSubdetector, int, int) constructor.";
+
+  if (tower_i > MAX_I || tower_i < MIN_I || tower_j > MAX_J || tower_j < MIN_J)
     throw cms::Exception("InvalidDetId") << "EcalTriggerTowerDetId:  Cannot create object.  Indexes out of bounds.";
-  
-  id_|= ((zside>0)?(0x8000):(0x0)) | ((subDet == EcalBarrel)?(0x4000):(0x0)) | (tower_i<<7) | (tower_j & 0x7F);
 
+  id_ |= ((zside > 0) ? (0x8000) : (0x0)) | ((subDet == EcalBarrel) ? (0x4000) : (0x0)) | (tower_i << 7) |
+         (tower_j & 0x7F);
 }
-  
-EcalTrigTowerDetId::EcalTrigTowerDetId(const DetId& gen) 
-{
-  if (!gen.null() && ( gen.det()!=Ecal || gen.subdetId()!=EcalTriggerTower )) {
-    throw cms::Exception("InvalidDetId");  }
-  id_=gen.rawId();
+
+EcalTrigTowerDetId::EcalTrigTowerDetId(const DetId& gen) {
+  if (!gen.null() && (gen.det() != Ecal || gen.subdetId() != EcalTriggerTower)) {
+    throw cms::Exception("InvalidDetId");
+  }
+  id_ = gen.rawId();
 }
-  
+
 EcalTrigTowerDetId& EcalTrigTowerDetId::operator=(const DetId& gen) {
-  if (!gen.null() && ( gen.det()!=Ecal || gen.subdetId()!=EcalTriggerTower )) {
+  if (!gen.null() && (gen.det() != Ecal || gen.subdetId() != EcalTriggerTower)) {
     throw cms::Exception("InvalidDetId");
   }
-  id_=gen.rawId();
+  id_ = gen.rawId();
   return *this;
 }
 
-//New SM numbering scheme. Avoids discontinuity in phi crossing \eta=0  
-int EcalTrigTowerDetId::iDCC() const 
-{
-  if ( subDet() == EcalBarrel )
-    {
-      //Correction since iphi is uniformized with HB convention 
-      int iphi_simple = iphi() + 2 ;
-      if (iphi_simple > 72 ) iphi_simple = iphi_simple % 72;
-      int id = ( iphi_simple - 1 ) / kEBTowersInPhi + 1;
-      if ( zside() < 0 ) id += 18;
-      return id;
-    }
-  else
+//New SM numbering scheme. Avoids discontinuity in phi crossing \eta=0
+int EcalTrigTowerDetId::iDCC() const {
+  if (subDet() == EcalBarrel) {
+    //Correction since iphi is uniformized with HB convention
+    int iphi_simple = iphi() + 2;
+    if (iphi_simple > 72)
+      iphi_simple = iphi_simple % 72;
+    int id = (iphi_simple - 1) / kEBTowersInPhi + 1;
+    if (zside() < 0)
+      id += 18;
+    return id;
+  } else
     throw cms::Exception("MethodNotImplemented") << "EcalTriggerTowerDetId: iDCC not yet implemented";
 }
 
-int EcalTrigTowerDetId::iTT() const 
-{
-  if ( subDet() == EcalBarrel )
-    {
-      int ie = ietaAbs() -1;
-      int ip;
-      int iphi_simple = iphi() + 2 ;
-      if (iphi_simple > 72 )  iphi_simple = iphi_simple % 72;
-      if (zside() < 0) {
-	ip = (( iphi_simple -1 ) % kEBTowersInPhi ) + 1;
-      } else {
-	ip = kEBTowersInPhi - ((iphi_simple -1 ) % kEBTowersInPhi );
-      }
-      
-      return (ie * kEBTowersInPhi) + ip;
+int EcalTrigTowerDetId::iTT() const {
+  if (subDet() == EcalBarrel) {
+    int ie = ietaAbs() - 1;
+    int ip;
+    int iphi_simple = iphi() + 2;
+    if (iphi_simple > 72)
+      iphi_simple = iphi_simple % 72;
+    if (zside() < 0) {
+      ip = ((iphi_simple - 1) % kEBTowersInPhi) + 1;
+    } else {
+      ip = kEBTowersInPhi - ((iphi_simple - 1) % kEBTowersInPhi);
     }
-  else
+
+    return (ie * kEBTowersInPhi) + ip;
+  } else
     throw cms::Exception("MethodNotImplemented") << "EcalTriggerTowerDetId: iTT not yet implemented";
 }
 
-int EcalTrigTowerDetId::iquadrant() const
-{
-  if ( subDet() == EcalEndcap )
-    return int((iphi()-1)/kEETowersInPhiPerQuadrant)+1;
+int EcalTrigTowerDetId::iquadrant() const {
+  if (subDet() == EcalEndcap)
+    return int((iphi() - 1) / kEETowersInPhiPerQuadrant) + 1;
   else
     throw cms::Exception("MethodNotApplicable") << "EcalTriggerTowerDetId: iquadrant not applicable";
-}  
-
-bool
-EcalTrigTowerDetId::validDetId( int iz, EcalSubdetector sd , int i, int j )
-{
-   return ( 1 == abs( iz )               &&
-	    0 <  i                       &&
-	    0 <  j                       &&
-	    kEETowersInPhiPerEndcap >= j &&
-	    ( ( EcalBarrel     == sd &&
-		kEBTowersInEta >=  i     ) ||
-	      ( EcalEndcap     == sd &&
-		kEEOuterEta    <=  i &&
-		kEEInnerEta    >=  i &&
-		( 27 > i ||
-		  (  ( 0 >  iz  &&
-		       0 == j%2    ) ||
-		     ( 0 <  iz  &&
-		       1 == j%2         ) ) ) ) ) ) ;
-	    
 }
 
-int 
-EcalTrigTowerDetId::hashedIndex() const 
-{
-   const unsigned int iea ( ietaAbs() ) ;
-   const unsigned int iph ( iphi()    ) ;
-   return ( subDet() == EcalBarrel  ? 
-	    ( iDCC() - 1 )*kEBTowersPerSM + iTT() - 1 :
-	    kEBTotalTowers + ( ( zside() + 1 )/2 )*kEETowersPerEndcap +
-	    ( ( iea < 27 ? iea : 27 ) - kEEOuterEta )*kEETowersInPhiPerEndcap + 
-	    ( iea < 27 ? iph : // for iphi=27,28 only half TT present, odd for EE-, even EE+
-	      ( iea - 27 )*kEETowersInPhiPerEndcap/2 + ( iph + 1 )/2 ) - 1 ) ;
+bool EcalTrigTowerDetId::validDetId(int iz, EcalSubdetector sd, int i, int j) {
+  return (
+      1 == abs(iz) && 0 < i && 0 < j && kEETowersInPhiPerEndcap >= j &&
+      ((EcalBarrel == sd && kEBTowersInEta >= i) || (EcalEndcap == sd && kEEOuterEta <= i && kEEInnerEta >= i &&
+                                                     (27 > i || ((0 > iz && 0 == j % 2) || (0 < iz && 1 == j % 2))))));
 }
 
-EcalTrigTowerDetId 
-EcalTrigTowerDetId::detIdFromDenseIndex( uint32_t di ) 
-{
-   const EcalSubdetector sd ( di < kEBTotalTowers ? EcalBarrel : EcalEndcap ) ;
-   const int iz ( di < kEBTotalTowers ? 
-		  ( di < kEBHalfTowers ?  1 : -1 ) :
-		  ( di - kEBTotalTowers < kEETowersPerEndcap ? -1 : 1 ) ) ;
-   int i ;
-   int j ;
-   if( di < kEBTotalTowers ) // barrel
-   {
-      const unsigned int itt ( di%kEBTowersPerSM ) ;
-      const unsigned int idc ( di/kEBTowersPerSM ) ;
-      j = (idc%18)*kEBTowersInPhi + 
-	 ( (1+iz)/2 )*kEBTowersInPhi - 
-	 iz*(itt%kEBTowersInPhi)  + 1 - (1+iz)/2 - 2 ;
-      if( j < 1 ) j += 72 ;
-      i = 1 + itt/kEBTowersInPhi ;
-   }
-   else
-   {
-      const int eonly ( ( di - kEBTotalTowers )%kEETowersPerEndcap ) ;
-      i = kEEOuterEta + eonly/kEETowersInPhiPerEndcap ;
-      j = 1 + eonly%kEETowersInPhiPerEndcap ;
-      if( 27 == i ) // last two rings have half of normal phi elementes
-      {
-	 if( j > kEETowersInPhiPerEndcap/2 )
-	 {
-	    ++i ; 
-	    j -= kEETowersInPhiPerEndcap/2 ;
-	 }
-	 j = 2*j ;
-	 if( 0 < iz ) --j ;
+int EcalTrigTowerDetId::hashedIndex() const {
+  const unsigned int iea(ietaAbs());
+  const unsigned int iph(iphi());
+  return (subDet() == EcalBarrel ? (iDCC() - 1) * kEBTowersPerSM + iTT() - 1
+                                 : kEBTotalTowers + ((zside() + 1) / 2) * kEETowersPerEndcap +
+                                       ((iea < 27 ? iea : 27) - kEEOuterEta) * kEETowersInPhiPerEndcap +
+                                       (iea < 27 ? iph :  // for iphi=27,28 only half TT present, odd for EE-, even EE+
+                                            (iea - 27) * kEETowersInPhiPerEndcap / 2 + (iph + 1) / 2) -
+                                       1);
+}
+
+EcalTrigTowerDetId EcalTrigTowerDetId::detIdFromDenseIndex(uint32_t di) {
+  const EcalSubdetector sd(di < kEBTotalTowers ? EcalBarrel : EcalEndcap);
+  const int iz(di < kEBTotalTowers ? (di < kEBHalfTowers ? 1 : -1)
+                                   : (di - kEBTotalTowers < kEETowersPerEndcap ? -1 : 1));
+  int i;
+  int j;
+  if (di < kEBTotalTowers)  // barrel
+  {
+    const unsigned int itt(di % kEBTowersPerSM);
+    const unsigned int idc(di / kEBTowersPerSM);
+    j = (idc % 18) * kEBTowersInPhi + ((1 + iz) / 2) * kEBTowersInPhi - iz * (itt % kEBTowersInPhi) + 1 - (1 + iz) / 2 -
+        2;
+    if (j < 1)
+      j += 72;
+    i = 1 + itt / kEBTowersInPhi;
+  } else {
+    const int eonly((di - kEBTotalTowers) % kEETowersPerEndcap);
+    i = kEEOuterEta + eonly / kEETowersInPhiPerEndcap;
+    j = 1 + eonly % kEETowersInPhiPerEndcap;
+    if (27 == i)  // last two rings have half of normal phi elementes
+    {
+      if (j > kEETowersInPhiPerEndcap / 2) {
+        ++i;
+        j -= kEETowersInPhiPerEndcap / 2;
       }
-   }
-   assert( validDetId( iz, sd, i, j ) ) ;
-   return EcalTrigTowerDetId( iz, sd, i, j ) ;
+      j = 2 * j;
+      if (0 < iz)
+        --j;
+    }
+  }
+  assert(validDetId(iz, sd, i, j));
+  return EcalTrigTowerDetId(iz, sd, i, j);
 }
 
 #include <ostream>
-std::ostream& operator<<(std::ostream& s,const EcalTrigTowerDetId& id) {
-  return s << "(EcalTT subDet " << ((id.subDet()==EcalBarrel)?("Barrel"):("Endcap")) 
-	   <<  " iz " << ((id.zside()>0)?("+ "):("- ")) << " ieta " 
-	   << id.ietaAbs() << " iphi " << id.iphi() << ')';
+std::ostream& operator<<(std::ostream& s, const EcalTrigTowerDetId& id) {
+  return s << "(EcalTT subDet " << ((id.subDet() == EcalBarrel) ? ("Barrel") : ("Endcap")) << " iz "
+           << ((id.zside() > 0) ? ("+ ") : ("- ")) << " ieta " << id.ietaAbs() << " iphi " << id.iphi() << ')';
 }
-
diff --git a/DataFormats/EcalDetId/src/EcalTriggerElectronicsId.cc b/DataFormats/EcalDetId/src/EcalTriggerElectronicsId.cc
index 8b2a2b076ff73..738d54fe903c1 100644
--- a/DataFormats/EcalDetId/src/EcalTriggerElectronicsId.cc
+++ b/DataFormats/EcalDetId/src/EcalTriggerElectronicsId.cc
@@ -3,43 +3,40 @@
 
 #include <ostream>
 
+EcalTriggerElectronicsId::EcalTriggerElectronicsId() { EcalTriggerElectronicsId_ = 0xFFFFFFFFu; }
 
-EcalTriggerElectronicsId::EcalTriggerElectronicsId() {
-  EcalTriggerElectronicsId_=0xFFFFFFFFu;
-}
-
-EcalTriggerElectronicsId::EcalTriggerElectronicsId(uint32_t id) {
-  EcalTriggerElectronicsId_=id;
-}
+EcalTriggerElectronicsId::EcalTriggerElectronicsId(uint32_t id) { EcalTriggerElectronicsId_ = id; }
 
-EcalTriggerElectronicsId::EcalTriggerElectronicsId(int tccid, int ttid, int pseudostripid, int channelid){
-  if ( (tccid < MIN_TCCID) || (tccid > MAX_TCCID) ||  
-       (ttid < MIN_TTID) || (ttid > MAX_TTID) ||  
-       (pseudostripid < MIN_PSEUDOSTRIPID) || (pseudostripid > MAX_PSEUDOSTRIPID) ||  
-       (channelid < MIN_CHANNELID) || (channelid > MAX_CHANNELID) )
+EcalTriggerElectronicsId::EcalTriggerElectronicsId(int tccid, int ttid, int pseudostripid, int channelid) {
+  if ((tccid < MIN_TCCID) || (tccid > MAX_TCCID) || (ttid < MIN_TTID) || (ttid > MAX_TTID) ||
+      (pseudostripid < MIN_PSEUDOSTRIPID) || (pseudostripid > MAX_PSEUDOSTRIPID) || (channelid < MIN_CHANNELID) ||
+      (channelid > MAX_CHANNELID))
     throw cms::Exception("InvalidDetId") << "EcalTriggerElectronicsId:  Cannot create object.  Indexes out of bounds.";
-  EcalTriggerElectronicsId_= (channelid&0x7) | ( (pseudostripid&0x7) << 3) | ( (ttid&0x7F) << 6) | ((tccid&0x7F) << 13);
+  EcalTriggerElectronicsId_ =
+      (channelid & 0x7) | ((pseudostripid & 0x7) << 3) | ((ttid & 0x7F) << 6) | ((tccid & 0x7F) << 13);
 }
 
 int EcalTriggerElectronicsId::zside() const {
-        int tcc = tccId();
-        if ( (tcc >= MIN_TCCID_EEM && tcc <= MAX_TCCID_EEM)) return -1;
-        if ( (tcc >= MIN_TCCID_EBM && tcc <= MAX_TCCID_EBM)) return -1;
-        if ( (tcc >= MIN_TCCID_EEP && tcc <= MAX_TCCID_EEP)) return +1;
-        if ( (tcc >= MIN_TCCID_EBP && tcc <= MAX_TCCID_EBP)) return +1;
-        return 0;
+  int tcc = tccId();
+  if ((tcc >= MIN_TCCID_EEM && tcc <= MAX_TCCID_EEM))
+    return -1;
+  if ((tcc >= MIN_TCCID_EBM && tcc <= MAX_TCCID_EBM))
+    return -1;
+  if ((tcc >= MIN_TCCID_EEP && tcc <= MAX_TCCID_EEP))
+    return +1;
+  if ((tcc >= MIN_TCCID_EBP && tcc <= MAX_TCCID_EBP))
+    return +1;
+  return 0;
 }
 
-
 EcalSubdetector EcalTriggerElectronicsId::subdet() const {
-	int tcc = tccId();
-	if ( (tcc >= MIN_TCCID_EBM && tcc <= MAX_TCCID_EBM) ||
-	     (tcc >= MIN_TCCID_EBP && tcc <= MAX_TCCID_EBP) ) return EcalBarrel;
-	else return EcalEndcap;
+  int tcc = tccId();
+  if ((tcc >= MIN_TCCID_EBM && tcc <= MAX_TCCID_EBM) || (tcc >= MIN_TCCID_EBP && tcc <= MAX_TCCID_EBP))
+    return EcalBarrel;
+  else
+    return EcalEndcap;
 }
 
-std::ostream& operator<<(std::ostream& os,const EcalTriggerElectronicsId& id) 
-{
-  return os << id.tccId() << ',' << id.ttId()  << ',' << id.pseudoStripId() << ',' << id.channelId() ;
+std::ostream& operator<<(std::ostream& os, const EcalTriggerElectronicsId& id) {
+  return os << id.tccId() << ',' << id.ttId() << ',' << id.pseudoStripId() << ',' << id.channelId();
 }
-
diff --git a/DataFormats/EcalDetId/src/classes.h b/DataFormats/EcalDetId/src/classes.h
index ca3ede0460dfe..beceb93475162 100644
--- a/DataFormats/EcalDetId/src/classes.h
+++ b/DataFormats/EcalDetId/src/classes.h
@@ -1,5 +1,5 @@
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
-#include <boost/cstdint.hpp> 
+#include <boost/cstdint.hpp>
 #include "DataFormats/EcalDetId/interface/EEDetId.h"
 #include "DataFormats/EcalDetId/interface/ESDetId.h"
 #include "DataFormats/EcalDetId/interface/EcalElectronicsId.h"
@@ -9,5 +9,3 @@
 
 #include "DataFormats/EcalDetId/interface/EcalDetIdCollections.h"
 #include "DataFormats/Common/interface/Wrapper.h"
-
-
diff --git a/DataFormats/EcalDetId/test/printEBDetId.cpp b/DataFormats/EcalDetId/test/printEBDetId.cpp
index 2484a61704fe9..ad2350320c91e 100644
--- a/DataFormats/EcalDetId/test/printEBDetId.cpp
+++ b/DataFormats/EcalDetId/test/printEBDetId.cpp
@@ -12,28 +12,28 @@ int main(int argc, char* argv[]) {
   try {
     for (int SM = 1; SM <= 36; SM++) {
       for (int crystal = 1; crystal <= 1700; crystal++) {
-	EBDetId detid(SM, crystal, EBDetId::SMCRYSTALMODE);
-	cout << "SMCRYSTALMODE: SM " << SM << " Crystal " << crystal << " -> "
-	     << "ieta " << detid.ieta() << " iphi " << detid.iphi() << endl;
-	if (SM != detid.ism() || crystal != detid.ic()) {
-	  cout << "^^^ INSANE ^^^" << endl;
-	}
-
+        EBDetId detid(SM, crystal, EBDetId::SMCRYSTALMODE);
+        cout << "SMCRYSTALMODE: SM " << SM << " Crystal " << crystal << " -> "
+             << "ieta " << detid.ieta() << " iphi " << detid.iphi() << endl;
+        if (SM != detid.ism() || crystal != detid.ic()) {
+          cout << "^^^ INSANE ^^^" << endl;
+        }
       }
     }
 
     for (int ieta = -EBDetId::MAX_IETA; ieta <= EBDetId::MAX_IETA; ieta++) {
-      if (ieta == 0) continue;
+      if (ieta == 0)
+        continue;
       for (int iphi = EBDetId::MIN_IPHI; iphi <= EBDetId::MAX_IPHI; iphi++) {
-	EBDetId detid(ieta, iphi);
-	cout << "ETAPHIMODE: ieta " << ieta << " iphi " << iphi << " -> "
-	     << "SM " << detid.ism() << " Crystal " << detid.ic() << endl;
-	if (ieta != detid.ieta() || iphi != detid.iphi()) {
-	  cout << "^^^ INSANE ^^^" << endl;
-	}
+        EBDetId detid(ieta, iphi);
+        cout << "ETAPHIMODE: ieta " << ieta << " iphi " << iphi << " -> "
+             << "SM " << detid.ism() << " Crystal " << detid.ic() << endl;
+        if (ieta != detid.ieta() || iphi != detid.iphi()) {
+          cout << "^^^ INSANE ^^^" << endl;
+        }
       }
     }
-  } catch (exception &e) {
+  } catch (exception& e) {
     cerr << e.what();
   }
 }
diff --git a/DataFormats/EcalDetId/test/printEEDetId.cpp b/DataFormats/EcalDetId/test/printEEDetId.cpp
index 67f0b5665bbf7..9f985120b3a8f 100644
--- a/DataFormats/EcalDetId/test/printEEDetId.cpp
+++ b/DataFormats/EcalDetId/test/printEEDetId.cpp
@@ -9,110 +9,138 @@
 
 using namespace std;
 
-ostream& pcenter(unsigned w, string s){
+ostream& pcenter(unsigned w, string s) {
   int pad = ((int)w - (int)s.size()) / 2;
   //  if(pad<0) pad = 0;
-  for(int i = 0; i < pad; ++i) cout << " ";
+  for (int i = 0; i < pad; ++i)
+    cout << " ";
   cout << s;
-  for(int i = pad + s.size(); i < (int)w; ++i) cout << " ";
+  for (int i = pad + s.size(); i < (int)w; ++i)
+    cout << " ";
   return cout;
 }
 
 int main(int argc, char* argv[]) {
   const int colsize = 8;
 #define COL cout << setw(colsize)
-  
+
   cout << right;
-  pcenter(3*(colsize+1)-1, "input") << "|";
-  pcenter(11*(colsize+1), "detid") << "|";
-  pcenter(4*(colsize+1), "detid->(isc,ic,iz)->detid") << "|";
-  pcenter(3*(colsize+1), "sc_detid") << "\n";
-  
+  pcenter(3 * (colsize + 1) - 1, "input") << "|";
+  pcenter(11 * (colsize + 1), "detid") << "|";
+  pcenter(4 * (colsize + 1), "detid->(isc,ic,iz)->detid") << "|";
+  pcenter(3 * (colsize + 1), "sc_detid") << "\n";
+
   //input
-  COL <<  "ix" << " ";
-  COL <<  "iy" << " ";
-  COL <<  "iz" << "|";
-  
+  COL << "ix"
+      << " ";
+  COL << "iy"
+      << " ";
+  COL << "iz"
+      << "|";
+
   //detId
-  COL <<  "ix" << " ";
-  COL <<  "iy" << " ";
-  COL <<  "zside" << " ";
-  COL <<  "iquad" << " ";
-  COL <<  "Z" << " ";
-  COL <<  "phi_out" << " ";
-  COL <<  "hash_ind" << " ";
-  COL <<  "hash_chk" << " ";
-  COL <<  "dense_ind" <<  " ";
-  COL <<  "isc" << " ";
-  COL <<  "ic" << "|";
+  COL << "ix"
+      << " ";
+  COL << "iy"
+      << " ";
+  COL << "zside"
+      << " ";
+  COL << "iquad"
+      << " ";
+  COL << "Z"
+      << " ";
+  COL << "phi_out"
+      << " ";
+  COL << "hash_ind"
+      << " ";
+  COL << "hash_chk"
+      << " ";
+  COL << "dense_ind"
+      << " ";
+  COL << "isc"
+      << " ";
+  COL << "ic"
+      << "|";
 
   //detid->isc,ic->detid
-  COL <<  "ix" << " ";
-  COL <<  "iy" << " ";
-  COL <<  "iz" << " ";
-  COL <<  "iscic_chk" << "\n";
+  COL << "ix"
+      << " ";
+  COL << "iy"
+      << " ";
+  COL << "iz"
+      << " ";
+  COL << "iscic_chk"
+      << "\n";
 
   //sc det id
-  COL << "ix" << " ";
-  COL << "iy" << " ";
-  COL << "iz" << " ";
-  
+  COL << "ix"
+      << " ";
+  COL << "iy"
+      << " ";
+  COL << "iz"
+      << " ";
 
   try {
-    for(int iz = -1 ; iz <= 1; iz += 2){
-      COL << "========== " << (iz>0 ? "EE+" : "EE-" ) << " ========== \n";
-      for(int ix = 1; ix <= 100; ++ix){
-	for(int iy = 1; iy <= 100; ++iy){
-	  if(!EEDetId::validDetId(ix,iy,iz)) continue;
-	  
-	  //input
-	  COL << ix << " ";
-	  COL << iy << " ";
-	  COL << iz << " ";
-	  //detid
-	  EEDetId id(ix,iy,iz);
-	  COL << id.ix() << (ix != id.ix() ? "!!!" : "") << " ";
-	  COL << id.iy() << (iy != id.iy() ? "!!!" : "") << " ";
-	  COL << id.zside() << (iz != id.zside() ? "!!!" : "") << " ";
-	  COL << id.iquadrant() << " ";
-	  COL << (id.positiveZ() ? "z+" : "z-") <<  (id.positiveZ() != (iz > 0) ? "!!!" : "" ) << " ";
-	  COL << id.iPhiOuterRing() << " ";
-	  
-	  //hashed index
-	  int ih = id.hashedIndex() ;
-	  COL << ih << " ";
-	  if(!EEDetId::validHashIndex(ih) || EEDetId::unhashIndex(ih)!=id || EEDetId::unhashIndex(ih).rawId() != id.rawId()){
-	    COL << "ERR!!!" << " ";
-	  } else{
-	      COL << "OK" << " ";
-	  }
-	  
-	  COL << id.denseIndex() << (id.denseIndex() != (uint32_t)ih ? "!!!" : "") << " ";
-	  
-	  //ISC
-	  const int isc = id.isc();
-	  COL << isc << " ";
-	  const int icInSc = id.ic();
-	  COL << icInSc << " ";
-	  EEDetId id1(isc, icInSc, iz, EEDetId::SCCRYSTALMODE);
-	  COL << id1.ix()  << (id1.ix()!=ix ? "!!!" : "") << " ";
-	  COL << id1.iy()  << (id1.iy()!=iy ? "!!!" : "") << " ";
-	  COL << id1.zside()  << (id1.zside()!=iz ? "!!!" : "") << " ";			    
-	  if(id!=id1 || id.rawId()!=id1.rawId()){
-	    COL << "ERR!!!" << " ";
-	  } else{
-	    COL << "OK" << " ";
-	  }
-
-	  //SC det id
-	  COL << id.sc().ix() << " ";
-	  COL << id.sc().iy() << " ";
-	  COL << id.sc().zside() << " ";
-	  COL << "\n";
-	} //next iy
-      } //next ix
-    } //next iz
-  } catch (exception &e) {
+    for (int iz = -1; iz <= 1; iz += 2) {
+      COL << "========== " << (iz > 0 ? "EE+" : "EE-") << " ========== \n";
+      for (int ix = 1; ix <= 100; ++ix) {
+        for (int iy = 1; iy <= 100; ++iy) {
+          if (!EEDetId::validDetId(ix, iy, iz))
+            continue;
+
+          //input
+          COL << ix << " ";
+          COL << iy << " ";
+          COL << iz << " ";
+          //detid
+          EEDetId id(ix, iy, iz);
+          COL << id.ix() << (ix != id.ix() ? "!!!" : "") << " ";
+          COL << id.iy() << (iy != id.iy() ? "!!!" : "") << " ";
+          COL << id.zside() << (iz != id.zside() ? "!!!" : "") << " ";
+          COL << id.iquadrant() << " ";
+          COL << (id.positiveZ() ? "z+" : "z-") << (id.positiveZ() != (iz > 0) ? "!!!" : "") << " ";
+          COL << id.iPhiOuterRing() << " ";
+
+          //hashed index
+          int ih = id.hashedIndex();
+          COL << ih << " ";
+          if (!EEDetId::validHashIndex(ih) || EEDetId::unhashIndex(ih) != id ||
+              EEDetId::unhashIndex(ih).rawId() != id.rawId()) {
+            COL << "ERR!!!"
+                << " ";
+          } else {
+            COL << "OK"
+                << " ";
+          }
+
+          COL << id.denseIndex() << (id.denseIndex() != (uint32_t)ih ? "!!!" : "") << " ";
+
+          //ISC
+          const int isc = id.isc();
+          COL << isc << " ";
+          const int icInSc = id.ic();
+          COL << icInSc << " ";
+          EEDetId id1(isc, icInSc, iz, EEDetId::SCCRYSTALMODE);
+          COL << id1.ix() << (id1.ix() != ix ? "!!!" : "") << " ";
+          COL << id1.iy() << (id1.iy() != iy ? "!!!" : "") << " ";
+          COL << id1.zside() << (id1.zside() != iz ? "!!!" : "") << " ";
+          if (id != id1 || id.rawId() != id1.rawId()) {
+            COL << "ERR!!!"
+                << " ";
+          } else {
+            COL << "OK"
+                << " ";
+          }
+
+          //SC det id
+          COL << id.sc().ix() << " ";
+          COL << id.sc().iy() << " ";
+          COL << id.sc().zside() << " ";
+          COL << "\n";
+        }  //next iy
+      }    //next ix
+    }      //next iz
+  } catch (exception& e) {
     cerr << e.what();
   }
 }
diff --git a/DataFormats/EcalDetId/test/testEBHashedIndex.cpp b/DataFormats/EcalDetId/test/testEBHashedIndex.cpp
index 3d3a965c54562..913767862162c 100644
--- a/DataFormats/EcalDetId/test/testEBHashedIndex.cpp
+++ b/DataFormats/EcalDetId/test/testEBHashedIndex.cpp
@@ -12,32 +12,32 @@
 
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
 
-int main(int argc, char* argv[]) {
-  FILE *ofile = fopen("eb_next_to_boundary.dat","w");
+int main(int argc, char *argv[]) {
+  FILE *ofile = fopen("eb_next_to_boundary.dat", "w");
   int hi = -1;
   try {
-          for (int ieta=EBDetId::MIN_IETA;ieta<=EBDetId::MAX_IETA;ieta++) {
-                  for (int iphi=EBDetId::MIN_IPHI;iphi<=EBDetId::MAX_IPHI;iphi++) {
-                          if (EBDetId::validDetId(ieta,iphi)) {
-                                  EBDetId id = EBDetId(ieta, iphi);
-                                  if ( EBDetId::isNextToBoundary( id ) ) {
-                                          fprintf(ofile, "%d %d %d %d\n", id.ieta(), id.iphi(), hi, 1);
-                                  } else {
-                                          fprintf(ofile, "%d %d %d %d\n", id.ieta(), id.iphi(), hi, 0);
-                                  }
-                          }
-                          if (EBDetId::validDetId(-ieta,iphi)) {
-                                  EBDetId id = EBDetId(-ieta, iphi);
-                                  if ( EBDetId::isNextToBoundary( id ) ) {
-                                          fprintf(ofile, "%d %d %d %d\n", id.ieta(), id.iphi(), hi, 1);
-                                  } else {
-                                          fprintf(ofile, "%d %d %d %d\n", id.ieta(), id.iphi(), hi, 0);
-                                  }
-                          }
-                  }
-	  }
+    for (int ieta = EBDetId::MIN_IETA; ieta <= EBDetId::MAX_IETA; ieta++) {
+      for (int iphi = EBDetId::MIN_IPHI; iphi <= EBDetId::MAX_IPHI; iphi++) {
+        if (EBDetId::validDetId(ieta, iphi)) {
+          EBDetId id = EBDetId(ieta, iphi);
+          if (EBDetId::isNextToBoundary(id)) {
+            fprintf(ofile, "%d %d %d %d\n", id.ieta(), id.iphi(), hi, 1);
+          } else {
+            fprintf(ofile, "%d %d %d %d\n", id.ieta(), id.iphi(), hi, 0);
+          }
+        }
+        if (EBDetId::validDetId(-ieta, iphi)) {
+          EBDetId id = EBDetId(-ieta, iphi);
+          if (EBDetId::isNextToBoundary(id)) {
+            fprintf(ofile, "%d %d %d %d\n", id.ieta(), id.iphi(), hi, 1);
+          } else {
+            fprintf(ofile, "%d %d %d %d\n", id.ieta(), id.iphi(), hi, 0);
+          }
+        }
+      }
+    }
   } catch (std::exception &e) {
-	  std::cerr << e.what();
+    std::cerr << e.what();
   }
   fclose(ofile);
 }
diff --git a/DataFormats/EcalDetId/test/testEEHashedIndex.cpp b/DataFormats/EcalDetId/test/testEEHashedIndex.cpp
index 35a9edd3eb296..58e1a1d4a5256 100644
--- a/DataFormats/EcalDetId/test/testEEHashedIndex.cpp
+++ b/DataFormats/EcalDetId/test/testEEHashedIndex.cpp
@@ -12,41 +12,45 @@
 
 #include "DataFormats/EcalDetId/interface/EEDetId.h"
 
-const int nBegin[EEDetId::IX_MAX] = { 41, 41, 41, 36, 36, 26, 26, 26, 21, 21, 21, 21, 21, 16, 16, 14, 14, 14, 14, 14, 9, 9, 9, 9, 9, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4, 4, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 9, 9, 9, 9, 9, 14, 14, 14, 14, 14, 16, 16, 21, 21, 21, 21, 21, 26, 26, 26, 36, 36, 41, 41, 41 };
+const int nBegin[EEDetId::IX_MAX] = {41, 41, 41, 36, 36, 26, 26, 26, 21, 21, 21, 21, 21, 16, 16, 14, 14, 14, 14, 14,
+                                     9,  9,  9,  9,  9,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  4,  4,  4,  4,  4,
+                                     1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+                                     4,  4,  4,  4,  4,  6,  6,  6,  6,  6,  6,  6,  6,  6,  6,  9,  9,  9,  9,  9,
+                                     14, 14, 14, 14, 14, 16, 16, 21, 21, 21, 21, 21, 26, 26, 26, 36, 36, 41, 41, 41};
 
-int main(int argc, char* argv[]) {
-  FILE *ofile = fopen("ee_numbering.dat","w");
-  FILE *ofile_2 = fopen("ee_next_to_boundary.dat","w");
+int main(int argc, char *argv[]) {
+  FILE *ofile = fopen("ee_numbering.dat", "w");
+  FILE *ofile_2 = fopen("ee_next_to_boundary.dat", "w");
   int hi = -1;
   try {
-	  for (int iz = -1; iz<2; iz+=2) {
-		  for (int ix = EEDetId::IX_MIN; ix <= EEDetId::IX_MAX; ix++) {
-			  for (int iy=nBegin[ix-1]; iy<=100-nBegin[ix-1]+1; iy++) {
-				  hi = -1;
-				  if (EEDetId::validDetId(ix, iy, iz)) {
-					  EEDetId id = EEDetId( ix, iy, iz );
-					  hi = id.hashedIndex();
-					  assert( EEDetId::unhashIndex( hi ) == id );
-					  //std::cout << id << " " << hi << " " << EEDetId::unhashIndex( hi ) << std::endl;
-					  fprintf(ofile, "%d %d %d %d %d\n", ix, iy, iz, hi, 1);
-                                          if ( EEDetId::isNextToBoundary( id ) ) {
-					        fprintf(ofile_2, "%d %d %d %d %d\n", ix, iy, iz, hi, 1);
-                                          } else {
-					        fprintf(ofile_2, "%d %d %d %d %d\n", ix, iy, iz, hi, 0);
-                                          }
-				  } else {
-					  fprintf(ofile, "%d %d %d %d %d\n", ix, iy, iz, hi, 0);
-					  //std::cout << "Invalid detId " << ix << " " << iy << " " << iz << std::endl;
-				  }
-			  }
-		  }
-	  }
-	  for (int i=0; i<15480; i++) {
-		  EEDetId id = EEDetId::unhashIndex( hi );
-		  assert( EEDetId::validDetId( id.ix(), id.iy(), id.zside() ) );
-	  }
+    for (int iz = -1; iz < 2; iz += 2) {
+      for (int ix = EEDetId::IX_MIN; ix <= EEDetId::IX_MAX; ix++) {
+        for (int iy = nBegin[ix - 1]; iy <= 100 - nBegin[ix - 1] + 1; iy++) {
+          hi = -1;
+          if (EEDetId::validDetId(ix, iy, iz)) {
+            EEDetId id = EEDetId(ix, iy, iz);
+            hi = id.hashedIndex();
+            assert(EEDetId::unhashIndex(hi) == id);
+            //std::cout << id << " " << hi << " " << EEDetId::unhashIndex( hi ) << std::endl;
+            fprintf(ofile, "%d %d %d %d %d\n", ix, iy, iz, hi, 1);
+            if (EEDetId::isNextToBoundary(id)) {
+              fprintf(ofile_2, "%d %d %d %d %d\n", ix, iy, iz, hi, 1);
+            } else {
+              fprintf(ofile_2, "%d %d %d %d %d\n", ix, iy, iz, hi, 0);
+            }
+          } else {
+            fprintf(ofile, "%d %d %d %d %d\n", ix, iy, iz, hi, 0);
+            //std::cout << "Invalid detId " << ix << " " << iy << " " << iz << std::endl;
+          }
+        }
+      }
+    }
+    for (int i = 0; i < 15480; i++) {
+      EEDetId id = EEDetId::unhashIndex(hi);
+      assert(EEDetId::validDetId(id.ix(), id.iy(), id.zside()));
+    }
   } catch (std::exception &e) {
-	  std::cerr << e.what();
+    std::cerr << e.what();
   }
   fclose(ofile);
   fclose(ofile_2);
diff --git a/DataFormats/EcalDetId/test/testEcalContainer.cpp b/DataFormats/EcalDetId/test/testEcalContainer.cpp
index 77b2eed06bb25..662a90c96c933 100644
--- a/DataFormats/EcalDetId/test/testEcalContainer.cpp
+++ b/DataFormats/EcalDetId/test/testEcalContainer.cpp
@@ -12,78 +12,66 @@
 #include <DataFormats/EcalDetId/interface/EcalContainer.h>
 #include "FWCore/Utilities/interface/Exception.h"
 
-#include<vector>
+#include <vector>
 
 #include <iostream>
 
-class testEcalContainer: public CppUnit::TestFixture {
-
+class testEcalContainer : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testEcalContainer);
   CPPUNIT_TEST(testContainer);
   CPPUNIT_TEST_SUITE_END();
 
 public:
-
   void testContainer();
- 
-}; 
+};
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testEcalContainer);
 
 void testEcalContainer::testContainer() {
-
   EcalContainer<EBDetId, float> ec;
   std::cout << "EcalContainer istantiated." << std::endl;
 
-  for (int ieta=EBDetId::MIN_IETA;ieta<=EBDetId::MAX_IETA;ieta++)
-    for (int iphi=EBDetId::MIN_IPHI;iphi<=EBDetId::MAX_IPHI;iphi++)
-      {
-	//EBDetId Zside 1 
-	try
-	  {
-	    {
-	      EBDetId aPositiveId(ieta,iphi);
-              ec[aPositiveId] = aPositiveId.hashedIndex();
-              EcalContainer<EBDetId, float>::const_iterator citer = ec.find(aPositiveId.rawId());
-              if ( citer != ec.end() ) {
-                      CPPUNIT_ASSERT( *(ec.find(aPositiveId.rawId())) == aPositiveId.hashedIndex());
-              }
-	    }
+  for (int ieta = EBDetId::MIN_IETA; ieta <= EBDetId::MAX_IETA; ieta++)
+    for (int iphi = EBDetId::MIN_IPHI; iphi <= EBDetId::MAX_IPHI; iphi++) {
+      //EBDetId Zside 1
+      try {
+        {
+          EBDetId aPositiveId(ieta, iphi);
+          ec[aPositiveId] = aPositiveId.hashedIndex();
+          EcalContainer<EBDetId, float>::const_iterator citer = ec.find(aPositiveId.rawId());
+          if (citer != ec.end()) {
+            CPPUNIT_ASSERT(*(ec.find(aPositiveId.rawId())) == aPositiveId.hashedIndex());
+          }
+        }
 
-	    //EBDetId Zside -1 
-	    {
-	      EBDetId aNegativeId(-1*ieta,iphi);
-              ec[aNegativeId] = aNegativeId.hashedIndex();
-              EcalContainer<EBDetId, float>::const_iterator citer = ec.find(aNegativeId.rawId());
-              if ( citer != ec.end() ) {
-                      CPPUNIT_ASSERT( *(ec.find(aNegativeId.rawId())) == aNegativeId.hashedIndex());
-              }
-	    }
-	  }
-	catch ( cms::Exception &e ) 
-	  { 
-	    bool cmsExceptionCought=false;
-	    CPPUNIT_ASSERT(cmsExceptionCought);
-	  }
-	catch ( std::exception &e ) 
-	  { 
-	    bool stdExceptionCought=false;
-	    CPPUNIT_ASSERT(stdExceptionCought);
-	  }
+        //EBDetId Zside -1
+        {
+          EBDetId aNegativeId(-1 * ieta, iphi);
+          ec[aNegativeId] = aNegativeId.hashedIndex();
+          EcalContainer<EBDetId, float>::const_iterator citer = ec.find(aNegativeId.rawId());
+          if (citer != ec.end()) {
+            CPPUNIT_ASSERT(*(ec.find(aNegativeId.rawId())) == aNegativeId.hashedIndex());
+          }
+        }
+      } catch (cms::Exception &e) {
+        bool cmsExceptionCought = false;
+        CPPUNIT_ASSERT(cmsExceptionCought);
+      } catch (std::exception &e) {
+        bool stdExceptionCought = false;
+        CPPUNIT_ASSERT(stdExceptionCought);
       }
+    }
   std::cout << "Loop finished." << std::endl;
-  
-  for (int i=0; i!= EBDetId::kSizeForDenseIndexing;++i) {
-	    CPPUNIT_ASSERT( ec.item(i) == i);
-          //std::cout << ec.item(i) << " " << i << std::endl;
+
+  for (int i = 0; i != EBDetId::kSizeForDenseIndexing; ++i) {
+    CPPUNIT_ASSERT(ec.item(i) == i);
+    //std::cout << ec.item(i) << " " << i << std::endl;
   }
 
   float i = 0.;
-  for ( EcalContainer<EBDetId, float>::const_iterator citer = ec.begin(); citer != ec.end(); citer++) {
-	    CPPUNIT_ASSERT( (*citer) == i);
-            ++i;
+  for (EcalContainer<EBDetId, float>::const_iterator citer = ec.begin(); citer != ec.end(); citer++) {
+    CPPUNIT_ASSERT((*citer) == i);
+    ++i;
   }
-  
-  
 }
diff --git a/DataFormats/EcalDetId/test/testEcalDetId.cpp b/DataFormats/EcalDetId/test/testEcalDetId.cpp
index e120793ec635a..a45a811c7f847 100644
--- a/DataFormats/EcalDetId/test/testEcalDetId.cpp
+++ b/DataFormats/EcalDetId/test/testEcalDetId.cpp
@@ -15,12 +15,11 @@
 #include <DataFormats/EcalDetId/interface/EcalPnDiodeDetId.h>
 #include "FWCore/Utilities/interface/Exception.h"
 
-#include<vector>
-#include<algorithm>
+#include <vector>
+#include <algorithm>
 #include <iostream>
 
-class testEcalDetId: public CppUnit::TestFixture {
-
+class testEcalDetId : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testEcalDetId);
 
   CPPUNIT_TEST(testEBDetId);
@@ -30,14 +29,12 @@ class testEcalDetId: public CppUnit::TestFixture {
   // CPPUNIT_TEST(testEcalElectronicsId);
   CPPUNIT_TEST(testPnDiodeDetId);
   CPPUNIT_TEST(testDistancePhi);
-  
+
   CPPUNIT_TEST_SUITE_END();
 
 public:
-
-
-  void setUp(){}
-  void tearDown(){}  
+  void setUp() {}
+  void tearDown() {}
   void testEBDetId();
   void testEEDetId();
   void testESDetId();
@@ -45,268 +42,240 @@ class testEcalDetId: public CppUnit::TestFixture {
   // void testEcalElectronicsId();
   void testPnDiodeDetId();
   void testDistancePhi();
-}; 
+};
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testEcalDetId);
 
-void testEcalDetId::testEBDetId(){
-
+void testEcalDetId::testEBDetId() {
   EBDetId smId;
 
-  std::vector<unsigned int> detIds(EBDetId::kSizeForDenseIndexing,0);
-
-  CPPUNIT_ASSERT(!EBDetId::validDetId(0,1));
-  CPPUNIT_ASSERT(!EBDetId::validDetId(1,0));
-  CPPUNIT_ASSERT(!EBDetId::validDetId(1,-1));
-  CPPUNIT_ASSERT(!EBDetId::validDetId(1,EBDetId::MAX_IPHI+1));
-  CPPUNIT_ASSERT(!EBDetId::validDetId(EBDetId::MAX_IETA+1,1));
-  CPPUNIT_ASSERT(!EBDetId::validDetId(-EBDetId::MAX_IETA-1,1));
-
-  for (int ieta=EBDetId::MIN_IETA;ieta<=EBDetId::MAX_IETA;ieta++)
-    for (int iphi=EBDetId::MIN_IPHI;iphi<=EBDetId::MAX_IPHI;iphi++)
-      {
-	//EBDetId Zside 1 
-	try
-	  {
-	    {
-	      EBDetId aPositiveId(ieta,iphi);
-	      CPPUNIT_ASSERT(EBDetId::validDetId(ieta,iphi));
-	      CPPUNIT_ASSERT(aPositiveId.ieta()==ieta);
-	      CPPUNIT_ASSERT(aPositiveId.iphi()==iphi);
-	      CPPUNIT_ASSERT(aPositiveId.zside()==1);
-	      CPPUNIT_ASSERT(aPositiveId.ietaAbs()==ieta);
-	      int i=0;
-	      for(; i!=4; ++i) if (aPositiveId.ietaAbs()<=EBDetId::kModuleBoundaries[i]) break;
-	      CPPUNIT_ASSERT(aPositiveId.im()==i+1);
-	      CPPUNIT_ASSERT(!(EBDetId::isNextToEtaBoundary(aPositiveId)^
-			       (ieta==1||std::binary_search(EBDetId::kModuleBoundaries,EBDetId::kModuleBoundaries + 4, ieta ))
-			       ));
-
-	      smId = EBDetId(aPositiveId.ism(), aPositiveId.ic(),
-			     EBDetId::SMCRYSTALMODE);
-	      CPPUNIT_ASSERT(aPositiveId==smId);
-	      CPPUNIT_ASSERT(aPositiveId.ism()==smId.ism());
-	      CPPUNIT_ASSERT(aPositiveId.ic()==smId.ic());
-	      CPPUNIT_ASSERT(smId.ism()>=EBDetId::MIN_SM);
-	      CPPUNIT_ASSERT(smId.ism()<=EBDetId::MAX_SM);
-	      CPPUNIT_ASSERT(smId.ic()>=EBDetId::MIN_C);
-	      CPPUNIT_ASSERT(smId.ic()<=EBDetId::MAX_C);
-	      CPPUNIT_ASSERT(EBDetId::validHashIndex(aPositiveId.hashedIndex()));
-	      CPPUNIT_ASSERT(EBDetId::unhashIndex(aPositiveId.hashedIndex())==aPositiveId);
-	      detIds.at(aPositiveId.hashedIndex()) = aPositiveId;
-	    }
-
-	    //EBDetId Zside -1 
-	    {
-	      EBDetId aNegativeId(-1*ieta,iphi);
-	      CPPUNIT_ASSERT(EBDetId::validDetId(-ieta,iphi));
-	      CPPUNIT_ASSERT(aNegativeId.ieta()==-1*ieta);
-	      CPPUNIT_ASSERT(aNegativeId.iphi()==iphi);
-	      CPPUNIT_ASSERT(aNegativeId.zside()==-1);
-	      CPPUNIT_ASSERT(aNegativeId.ietaAbs()==ieta);
-
-	      smId = EBDetId(aNegativeId.ism(), aNegativeId.ic(),
-			     EBDetId::SMCRYSTALMODE);
-	      CPPUNIT_ASSERT(aNegativeId==smId);
-	      CPPUNIT_ASSERT(aNegativeId.ism()==smId.ism());
-	      CPPUNIT_ASSERT(aNegativeId.ic()==smId.ic());
-	      CPPUNIT_ASSERT(smId.ism()>=EBDetId::MIN_SM);
-	      CPPUNIT_ASSERT(smId.ism()<=EBDetId::MAX_SM);
-	      CPPUNIT_ASSERT(smId.ic()>=EBDetId::MIN_C);
-	      CPPUNIT_ASSERT(smId.ic()<=EBDetId::MAX_C);
-	      CPPUNIT_ASSERT(EBDetId::validHashIndex(aNegativeId.hashedIndex()));
-	      CPPUNIT_ASSERT(EBDetId::unhashIndex(aNegativeId.hashedIndex())==aNegativeId);
-	      detIds.at(aNegativeId.hashedIndex()) = aNegativeId;
-	    }
-	  }
-	catch ( cms::Exception &e ) 
-	  { 
-	    std::cout << e.what() << " failed for " << ieta << "," <<iphi << std::endl;
-	    bool cmsExceptionCought=false;
-	    CPPUNIT_ASSERT(cmsExceptionCought);
-	  }
-	catch ( std::exception &e ) 
-	  { 
-	    std::cout << e.what() <<" failed for " << ieta << "," <<iphi << std::endl;
-	    bool stdExceptionCought=false;
-	    CPPUNIT_ASSERT(stdExceptionCought);
-	  }
+  std::vector<unsigned int> detIds(EBDetId::kSizeForDenseIndexing, 0);
+
+  CPPUNIT_ASSERT(!EBDetId::validDetId(0, 1));
+  CPPUNIT_ASSERT(!EBDetId::validDetId(1, 0));
+  CPPUNIT_ASSERT(!EBDetId::validDetId(1, -1));
+  CPPUNIT_ASSERT(!EBDetId::validDetId(1, EBDetId::MAX_IPHI + 1));
+  CPPUNIT_ASSERT(!EBDetId::validDetId(EBDetId::MAX_IETA + 1, 1));
+  CPPUNIT_ASSERT(!EBDetId::validDetId(-EBDetId::MAX_IETA - 1, 1));
+
+  for (int ieta = EBDetId::MIN_IETA; ieta <= EBDetId::MAX_IETA; ieta++)
+    for (int iphi = EBDetId::MIN_IPHI; iphi <= EBDetId::MAX_IPHI; iphi++) {
+      //EBDetId Zside 1
+      try {
+        {
+          EBDetId aPositiveId(ieta, iphi);
+          CPPUNIT_ASSERT(EBDetId::validDetId(ieta, iphi));
+          CPPUNIT_ASSERT(aPositiveId.ieta() == ieta);
+          CPPUNIT_ASSERT(aPositiveId.iphi() == iphi);
+          CPPUNIT_ASSERT(aPositiveId.zside() == 1);
+          CPPUNIT_ASSERT(aPositiveId.ietaAbs() == ieta);
+          int i = 0;
+          for (; i != 4; ++i)
+            if (aPositiveId.ietaAbs() <= EBDetId::kModuleBoundaries[i])
+              break;
+          CPPUNIT_ASSERT(aPositiveId.im() == i + 1);
+          CPPUNIT_ASSERT(
+              !(EBDetId::isNextToEtaBoundary(aPositiveId) ^
+                (ieta == 1 || std::binary_search(EBDetId::kModuleBoundaries, EBDetId::kModuleBoundaries + 4, ieta))));
+
+          smId = EBDetId(aPositiveId.ism(), aPositiveId.ic(), EBDetId::SMCRYSTALMODE);
+          CPPUNIT_ASSERT(aPositiveId == smId);
+          CPPUNIT_ASSERT(aPositiveId.ism() == smId.ism());
+          CPPUNIT_ASSERT(aPositiveId.ic() == smId.ic());
+          CPPUNIT_ASSERT(smId.ism() >= EBDetId::MIN_SM);
+          CPPUNIT_ASSERT(smId.ism() <= EBDetId::MAX_SM);
+          CPPUNIT_ASSERT(smId.ic() >= EBDetId::MIN_C);
+          CPPUNIT_ASSERT(smId.ic() <= EBDetId::MAX_C);
+          CPPUNIT_ASSERT(EBDetId::validHashIndex(aPositiveId.hashedIndex()));
+          CPPUNIT_ASSERT(EBDetId::unhashIndex(aPositiveId.hashedIndex()) == aPositiveId);
+          detIds.at(aPositiveId.hashedIndex()) = aPositiveId;
+        }
+
+        //EBDetId Zside -1
+        {
+          EBDetId aNegativeId(-1 * ieta, iphi);
+          CPPUNIT_ASSERT(EBDetId::validDetId(-ieta, iphi));
+          CPPUNIT_ASSERT(aNegativeId.ieta() == -1 * ieta);
+          CPPUNIT_ASSERT(aNegativeId.iphi() == iphi);
+          CPPUNIT_ASSERT(aNegativeId.zside() == -1);
+          CPPUNIT_ASSERT(aNegativeId.ietaAbs() == ieta);
+
+          smId = EBDetId(aNegativeId.ism(), aNegativeId.ic(), EBDetId::SMCRYSTALMODE);
+          CPPUNIT_ASSERT(aNegativeId == smId);
+          CPPUNIT_ASSERT(aNegativeId.ism() == smId.ism());
+          CPPUNIT_ASSERT(aNegativeId.ic() == smId.ic());
+          CPPUNIT_ASSERT(smId.ism() >= EBDetId::MIN_SM);
+          CPPUNIT_ASSERT(smId.ism() <= EBDetId::MAX_SM);
+          CPPUNIT_ASSERT(smId.ic() >= EBDetId::MIN_C);
+          CPPUNIT_ASSERT(smId.ic() <= EBDetId::MAX_C);
+          CPPUNIT_ASSERT(EBDetId::validHashIndex(aNegativeId.hashedIndex()));
+          CPPUNIT_ASSERT(EBDetId::unhashIndex(aNegativeId.hashedIndex()) == aNegativeId);
+          detIds.at(aNegativeId.hashedIndex()) = aNegativeId;
+        }
+      } catch (cms::Exception &e) {
+        std::cout << e.what() << " failed for " << ieta << "," << iphi << std::endl;
+        bool cmsExceptionCought = false;
+        CPPUNIT_ASSERT(cmsExceptionCought);
+      } catch (std::exception &e) {
+        std::cout << e.what() << " failed for " << ieta << "," << iphi << std::endl;
+        bool stdExceptionCought = false;
+        CPPUNIT_ASSERT(stdExceptionCought);
       }
-  
-  for (int i=0;i!=EBDetId::kSizeForDenseIndexing;++i) {
-    CPPUNIT_ASSERT(detIds[i]!=0);
-    CPPUNIT_ASSERT(EBDetId(detIds[i]).hashedIndex()==i);
-    CPPUNIT_ASSERT(EBDetId::unhashIndex(i)==detIds[i]);
+    }
+
+  for (int i = 0; i != EBDetId::kSizeForDenseIndexing; ++i) {
+    CPPUNIT_ASSERT(detIds[i] != 0);
+    CPPUNIT_ASSERT(EBDetId(detIds[i]).hashedIndex() == i);
+    CPPUNIT_ASSERT(EBDetId::unhashIndex(i) == detIds[i]);
   }
-  
 }
 
-void testEcalDetId::testEEDetId(){
-
-  std::vector<unsigned int> detIds(EEDetId::kSizeForDenseIndexing,0);
-  
-  
-  for (int ix=EEDetId::IX_MIN;ix<=EEDetId::IX_MAX;ix++)
-    for (int iy=EEDetId::IY_MIN;iy<=EEDetId::IY_MAX;iy++)
-      try
-	{
-	  bool fastV = EEDetId::fastValidDetId(ix,iy);
-	  //EEDetId Zside 1 
-	  if ( EEDetId::slowValidDetId(ix,iy) ) {
-	    CPPUNIT_ASSERT(EEDetId::validDetId(ix,iy,1));
-	    EEDetId aPositiveId(ix,iy,1);
-	    CPPUNIT_ASSERT(aPositiveId.ix()==ix);
-	    CPPUNIT_ASSERT(aPositiveId.iy()==iy);
-	    CPPUNIT_ASSERT(aPositiveId.zside()==1);
-	    CPPUNIT_ASSERT(EEDetId::validHashIndex(aPositiveId.hashedIndex()));
-	    CPPUNIT_ASSERT(EEDetId::unhashIndex(aPositiveId.hashedIndex())==aPositiveId);
-	    detIds.at(aPositiveId.hashedIndex()) = aPositiveId;
-	  } else {
-	    CPPUNIT_ASSERT(!fastV);
-	  }
-	  //EEDetId Zside -1 
-	  if ( EEDetId::slowValidDetId(ix,iy) ) {
-	    CPPUNIT_ASSERT(EEDetId::validDetId(ix,iy,-1));
-	    EEDetId aNegativeId(ix,iy,-1);
-	    CPPUNIT_ASSERT(aNegativeId.ix()==ix);
-	    CPPUNIT_ASSERT(aNegativeId.iy()==iy);
-	    CPPUNIT_ASSERT(aNegativeId.zside()==-1);
-	    CPPUNIT_ASSERT(EEDetId::validHashIndex(aNegativeId.hashedIndex()));
-	    CPPUNIT_ASSERT(EEDetId::unhashIndex(aNegativeId.hashedIndex())==aNegativeId);
-	    detIds.at(aNegativeId.hashedIndex()) = aNegativeId;
-	  }
-	}
-      catch ( cms::Exception &e ) 
-	{ 
-	  bool cmsExceptionCought=false;
-	  CPPUNIT_ASSERT(cmsExceptionCought);
-	}
-      catch ( std::exception &e ) 
-	{ 
-	  bool stdExceptionCought=false;
-	  CPPUNIT_ASSERT(stdExceptionCought);
-	}
+void testEcalDetId::testEEDetId() {
+  std::vector<unsigned int> detIds(EEDetId::kSizeForDenseIndexing, 0);
+
+  for (int ix = EEDetId::IX_MIN; ix <= EEDetId::IX_MAX; ix++)
+    for (int iy = EEDetId::IY_MIN; iy <= EEDetId::IY_MAX; iy++)
+      try {
+        bool fastV = EEDetId::fastValidDetId(ix, iy);
+        //EEDetId Zside 1
+        if (EEDetId::slowValidDetId(ix, iy)) {
+          CPPUNIT_ASSERT(EEDetId::validDetId(ix, iy, 1));
+          EEDetId aPositiveId(ix, iy, 1);
+          CPPUNIT_ASSERT(aPositiveId.ix() == ix);
+          CPPUNIT_ASSERT(aPositiveId.iy() == iy);
+          CPPUNIT_ASSERT(aPositiveId.zside() == 1);
+          CPPUNIT_ASSERT(EEDetId::validHashIndex(aPositiveId.hashedIndex()));
+          CPPUNIT_ASSERT(EEDetId::unhashIndex(aPositiveId.hashedIndex()) == aPositiveId);
+          detIds.at(aPositiveId.hashedIndex()) = aPositiveId;
+        } else {
+          CPPUNIT_ASSERT(!fastV);
+        }
+        //EEDetId Zside -1
+        if (EEDetId::slowValidDetId(ix, iy)) {
+          CPPUNIT_ASSERT(EEDetId::validDetId(ix, iy, -1));
+          EEDetId aNegativeId(ix, iy, -1);
+          CPPUNIT_ASSERT(aNegativeId.ix() == ix);
+          CPPUNIT_ASSERT(aNegativeId.iy() == iy);
+          CPPUNIT_ASSERT(aNegativeId.zside() == -1);
+          CPPUNIT_ASSERT(EEDetId::validHashIndex(aNegativeId.hashedIndex()));
+          CPPUNIT_ASSERT(EEDetId::unhashIndex(aNegativeId.hashedIndex()) == aNegativeId);
+          detIds.at(aNegativeId.hashedIndex()) = aNegativeId;
+        }
+      } catch (cms::Exception &e) {
+        bool cmsExceptionCought = false;
+        CPPUNIT_ASSERT(cmsExceptionCought);
+      } catch (std::exception &e) {
+        bool stdExceptionCought = false;
+        CPPUNIT_ASSERT(stdExceptionCought);
+      }
 
-  int holes=0;
-  for (int i=0;i!=EEDetId::kSizeForDenseIndexing;++i) {
+  int holes = 0;
+  for (int i = 0; i != EEDetId::kSizeForDenseIndexing; ++i) {
     // CPPUNIT_ASSERT(detIds[i]!=0);
-    if (detIds[i]==0) { holes++; continue; }// there are holes...
-    CPPUNIT_ASSERT(EEDetId(detIds[i]).hashedIndex()==i);
-    CPPUNIT_ASSERT(EEDetId::unhashIndex(i)==detIds[i]);
+    if (detIds[i] == 0) {
+      holes++;
+      continue;
+    }  // there are holes...
+    CPPUNIT_ASSERT(EEDetId(detIds[i]).hashedIndex() == i);
+    CPPUNIT_ASSERT(EEDetId::unhashIndex(i) == detIds[i]);
   }
-  CPPUNIT_ASSERT(holes==0);
+  CPPUNIT_ASSERT(holes == 0);
   //FIXME hope a better test...
   //CPPUNIT_ASSERT(holes>EEDetId::kSizeForDenseIndexing/100);
   //CPPUNIT_ASSERT(holes<EEDetId::kSizeForDenseIndexing/10);
 }
 
-void testEcalDetId::testESDetId(){
-  
-  
-  for (int istrip=ESDetId::ISTRIP_MIN;istrip<=ESDetId::ISTRIP_MAX;istrip++)
-    for (int ix=ESDetId::IX_MIN;ix<=ESDetId::IX_MAX;ix++)
-      for (int iy=ESDetId::IY_MIN;iy<=ESDetId::IY_MAX;iy++)
-	{
-	  try 
-	    {
-	      //ESDetId Plane 0 Zside 1 
-	      {
-		ESDetId aPositiveId(istrip,ix,iy,1,1);
-		CPPUNIT_ASSERT(aPositiveId.strip()==istrip);
-		CPPUNIT_ASSERT(aPositiveId.six()==ix);
-		CPPUNIT_ASSERT(aPositiveId.siy()==iy);
-		CPPUNIT_ASSERT(aPositiveId.plane()==1);
-		CPPUNIT_ASSERT(aPositiveId.zside()==1);
-
-	      }
-	      //ESDetId Plane 1 Zside 1 
-	      {
-		ESDetId aPositiveId(istrip,ix,iy,2,1);
-		CPPUNIT_ASSERT(aPositiveId.strip()==istrip);
-		CPPUNIT_ASSERT(aPositiveId.six()==ix);
-		CPPUNIT_ASSERT(aPositiveId.siy()==iy);
-		CPPUNIT_ASSERT(aPositiveId.plane()==2);
-		CPPUNIT_ASSERT(aPositiveId.zside()==1);
-	      }
-	      //ESDetId Plane 0 Zside -1 
-	      {
-		ESDetId aNegativeId(istrip,ix,iy,1,-1);
-		CPPUNIT_ASSERT(aNegativeId.strip()==istrip);
-		CPPUNIT_ASSERT(aNegativeId.six()==ix);
-		CPPUNIT_ASSERT(aNegativeId.siy()==iy);
-		CPPUNIT_ASSERT(aNegativeId.plane()==1);
-		CPPUNIT_ASSERT(aNegativeId.zside()==-1);
-	      }
-	      //ESDetId Plane 1 Zside -1 
-	      {
-		ESDetId aNegativeId(istrip,ix,iy,2,-1);
-		CPPUNIT_ASSERT(aNegativeId.strip()==istrip);
-		CPPUNIT_ASSERT(aNegativeId.six()==ix);
-		CPPUNIT_ASSERT(aNegativeId.siy()==iy);
-		CPPUNIT_ASSERT(aNegativeId.plane()==2);
-		CPPUNIT_ASSERT(aNegativeId.zside()==-1);
-	      }
-	    }
-	  catch ( cms::Exception &e ) 
-	    { 
-	    }
-	}
+void testEcalDetId::testESDetId() {
+  for (int istrip = ESDetId::ISTRIP_MIN; istrip <= ESDetId::ISTRIP_MAX; istrip++)
+    for (int ix = ESDetId::IX_MIN; ix <= ESDetId::IX_MAX; ix++)
+      for (int iy = ESDetId::IY_MIN; iy <= ESDetId::IY_MAX; iy++) {
+        try {
+          //ESDetId Plane 0 Zside 1
+          {
+            ESDetId aPositiveId(istrip, ix, iy, 1, 1);
+            CPPUNIT_ASSERT(aPositiveId.strip() == istrip);
+            CPPUNIT_ASSERT(aPositiveId.six() == ix);
+            CPPUNIT_ASSERT(aPositiveId.siy() == iy);
+            CPPUNIT_ASSERT(aPositiveId.plane() == 1);
+            CPPUNIT_ASSERT(aPositiveId.zside() == 1);
+          }
+          //ESDetId Plane 1 Zside 1
+          {
+            ESDetId aPositiveId(istrip, ix, iy, 2, 1);
+            CPPUNIT_ASSERT(aPositiveId.strip() == istrip);
+            CPPUNIT_ASSERT(aPositiveId.six() == ix);
+            CPPUNIT_ASSERT(aPositiveId.siy() == iy);
+            CPPUNIT_ASSERT(aPositiveId.plane() == 2);
+            CPPUNIT_ASSERT(aPositiveId.zside() == 1);
+          }
+          //ESDetId Plane 0 Zside -1
+          {
+            ESDetId aNegativeId(istrip, ix, iy, 1, -1);
+            CPPUNIT_ASSERT(aNegativeId.strip() == istrip);
+            CPPUNIT_ASSERT(aNegativeId.six() == ix);
+            CPPUNIT_ASSERT(aNegativeId.siy() == iy);
+            CPPUNIT_ASSERT(aNegativeId.plane() == 1);
+            CPPUNIT_ASSERT(aNegativeId.zside() == -1);
+          }
+          //ESDetId Plane 1 Zside -1
+          {
+            ESDetId aNegativeId(istrip, ix, iy, 2, -1);
+            CPPUNIT_ASSERT(aNegativeId.strip() == istrip);
+            CPPUNIT_ASSERT(aNegativeId.six() == ix);
+            CPPUNIT_ASSERT(aNegativeId.siy() == iy);
+            CPPUNIT_ASSERT(aNegativeId.plane() == 2);
+            CPPUNIT_ASSERT(aNegativeId.zside() == -1);
+          }
+        } catch (cms::Exception &e) {
+        }
+      }
 }
 
-
 void testEcalDetId::testEcalTrigTowerDetId() {
-
-  for (int ieta=EcalTrigTowerDetId::MIN_I;ieta<=EcalTrigTowerDetId::MAX_I;ieta++)
-    for (int iphi=EcalTrigTowerDetId::MIN_I;iphi<=EcalTrigTowerDetId::MAX_I;iphi++)
-      {
-	try
-	  {
-	    //EcalTrigTowerDetId Zside 1 
-	    {
-	      EcalTrigTowerDetId aPositiveId(1,EcalBarrel,ieta,iphi);
-	      CPPUNIT_ASSERT(aPositiveId.subDet()==EcalBarrel);
-	      CPPUNIT_ASSERT(aPositiveId.ieta()==ieta);
-	      CPPUNIT_ASSERT(aPositiveId.iphi()==iphi);
-	      CPPUNIT_ASSERT(aPositiveId.zside()==1);
-	      CPPUNIT_ASSERT(aPositiveId.ietaAbs()==ieta);
-	    }
-	    //EcalTrigTowerDetId Zside -1 
-	    {
-	      EcalTrigTowerDetId aNegativeId(-1,EcalBarrel,ieta,iphi);
-	      CPPUNIT_ASSERT(aNegativeId.subDet()==EcalBarrel);
-	      CPPUNIT_ASSERT(aNegativeId.ieta()==-1*ieta);
-	      CPPUNIT_ASSERT(aNegativeId.iphi()==iphi);
-	      CPPUNIT_ASSERT(aNegativeId.zside()==-1);
-	      CPPUNIT_ASSERT(aNegativeId.ietaAbs()==ieta);
-	    }
-	  }
-	catch ( cms::Exception &e ) 
-	  { 
-	  }
-	try
-	  {
-	    //EcalTrigTowerDetId Zside 1 
-	    {
-	      EcalTrigTowerDetId aPositiveId(1,EcalEndcap,ieta,iphi);
-	      CPPUNIT_ASSERT(aPositiveId.ieta()==ieta);
-	      CPPUNIT_ASSERT(aPositiveId.subDet()==EcalEndcap);
-	      CPPUNIT_ASSERT(aPositiveId.iphi()==iphi);
-	      CPPUNIT_ASSERT(aPositiveId.zside()==1);
-	    }
-	    //EcalTrigTowerDetId Zside -1 
-	    {
-	      EcalTrigTowerDetId aNegativeId(-1,EcalEndcap,ieta,iphi);
-	      CPPUNIT_ASSERT(aNegativeId.subDet()==EcalEndcap);
-	      CPPUNIT_ASSERT(aNegativeId.ieta()==-1*ieta);
-	      CPPUNIT_ASSERT(aNegativeId.iphi()==iphi);
-	      CPPUNIT_ASSERT(aNegativeId.zside()==-1);
-	    }
-	  }
-	catch ( cms::Exception &e ) 
-	  { 
-	  }
+  for (int ieta = EcalTrigTowerDetId::MIN_I; ieta <= EcalTrigTowerDetId::MAX_I; ieta++)
+    for (int iphi = EcalTrigTowerDetId::MIN_I; iphi <= EcalTrigTowerDetId::MAX_I; iphi++) {
+      try {
+        //EcalTrigTowerDetId Zside 1
+        {
+          EcalTrigTowerDetId aPositiveId(1, EcalBarrel, ieta, iphi);
+          CPPUNIT_ASSERT(aPositiveId.subDet() == EcalBarrel);
+          CPPUNIT_ASSERT(aPositiveId.ieta() == ieta);
+          CPPUNIT_ASSERT(aPositiveId.iphi() == iphi);
+          CPPUNIT_ASSERT(aPositiveId.zside() == 1);
+          CPPUNIT_ASSERT(aPositiveId.ietaAbs() == ieta);
+        }
+        //EcalTrigTowerDetId Zside -1
+        {
+          EcalTrigTowerDetId aNegativeId(-1, EcalBarrel, ieta, iphi);
+          CPPUNIT_ASSERT(aNegativeId.subDet() == EcalBarrel);
+          CPPUNIT_ASSERT(aNegativeId.ieta() == -1 * ieta);
+          CPPUNIT_ASSERT(aNegativeId.iphi() == iphi);
+          CPPUNIT_ASSERT(aNegativeId.zside() == -1);
+          CPPUNIT_ASSERT(aNegativeId.ietaAbs() == ieta);
+        }
+      } catch (cms::Exception &e) {
+      }
+      try {
+        //EcalTrigTowerDetId Zside 1
+        {
+          EcalTrigTowerDetId aPositiveId(1, EcalEndcap, ieta, iphi);
+          CPPUNIT_ASSERT(aPositiveId.ieta() == ieta);
+          CPPUNIT_ASSERT(aPositiveId.subDet() == EcalEndcap);
+          CPPUNIT_ASSERT(aPositiveId.iphi() == iphi);
+          CPPUNIT_ASSERT(aPositiveId.zside() == 1);
+        }
+        //EcalTrigTowerDetId Zside -1
+        {
+          EcalTrigTowerDetId aNegativeId(-1, EcalEndcap, ieta, iphi);
+          CPPUNIT_ASSERT(aNegativeId.subDet() == EcalEndcap);
+          CPPUNIT_ASSERT(aNegativeId.ieta() == -1 * ieta);
+          CPPUNIT_ASSERT(aNegativeId.iphi() == iphi);
+          CPPUNIT_ASSERT(aNegativeId.zside() == -1);
+        }
+      } catch (cms::Exception &e) {
       }
+    }
 }
 
 /*
@@ -330,46 +299,36 @@ void testEcalDetId::testEcalElectronicsId() {
 */
 
 void testEcalDetId::testPnDiodeDetId() {
-
-  for (int iEcalSubDet=EcalBarrel ; iEcalSubDet<=EcalEndcap ; iEcalSubDet++)
-    for (int iDCC=1;iDCC<=36;iDCC++)
-      for (int iPn=1;iPn<=10;iPn++)
-	{
-	  try
-	    {
-	      //EcalTrigTowerDetId Zside 1 
-	      {
-		EcalPnDiodeDetId aId(iEcalSubDet,iDCC,iPn);
-		CPPUNIT_ASSERT(aId.iEcalSubDetectorId()==iEcalSubDet);
-		CPPUNIT_ASSERT(aId.iDCCId()==iDCC);
-		CPPUNIT_ASSERT(aId.iPnId()==iPn);
-	      }
-	    }
-	  catch ( cms::Exception &e ) 
-	    { 
-	    }
-	}
+  for (int iEcalSubDet = EcalBarrel; iEcalSubDet <= EcalEndcap; iEcalSubDet++)
+    for (int iDCC = 1; iDCC <= 36; iDCC++)
+      for (int iPn = 1; iPn <= 10; iPn++) {
+        try {
+          //EcalTrigTowerDetId Zside 1
+          {
+            EcalPnDiodeDetId aId(iEcalSubDet, iDCC, iPn);
+            CPPUNIT_ASSERT(aId.iEcalSubDetectorId() == iEcalSubDet);
+            CPPUNIT_ASSERT(aId.iDCCId() == iDCC);
+            CPPUNIT_ASSERT(aId.iPnId() == iPn);
+          }
+        } catch (cms::Exception &e) {
+        }
+      }
 }
 
-void testEcalDetId::testDistancePhi(){
-
-  EBDetId a1(1,360);
-  EBDetId b1(1,1);
-  CPPUNIT_ASSERT(EBDetId::distancePhi(a1,b1)==1);
-
-
-  EBDetId  a2(1,1);
-  EBDetId  b2(1,360);
-  CPPUNIT_ASSERT(EBDetId::distancePhi(a2,b2)==1);
+void testEcalDetId::testDistancePhi() {
+  EBDetId a1(1, 360);
+  EBDetId b1(1, 1);
+  CPPUNIT_ASSERT(EBDetId::distancePhi(a1, b1) == 1);
 
-  EBDetId  a3(1,175);
-  EBDetId  b3(1,185);
-  CPPUNIT_ASSERT(EBDetId::distancePhi(a3,b3)==10);
-  
+  EBDetId a2(1, 1);
+  EBDetId b2(1, 360);
+  CPPUNIT_ASSERT(EBDetId::distancePhi(a2, b2) == 1);
 
-  EBDetId  a4(1,350);
-  EBDetId  b4(1,3);
-  CPPUNIT_ASSERT(EBDetId::distancePhi(a4,b4)==13);
-  
+  EBDetId a3(1, 175);
+  EBDetId b3(1, 185);
+  CPPUNIT_ASSERT(EBDetId::distancePhi(a3, b3) == 10);
 
+  EBDetId a4(1, 350);
+  EBDetId b4(1, 3);
+  CPPUNIT_ASSERT(EBDetId::distancePhi(a4, b4) == 13);
 }
diff --git a/DataFormats/EcalDetId/test/testEcalDetIdLoop.cpp b/DataFormats/EcalDetId/test/testEcalDetIdLoop.cpp
index bd43830ad1632..e4c034da1035f 100644
--- a/DataFormats/EcalDetId/test/testEcalDetIdLoop.cpp
+++ b/DataFormats/EcalDetId/test/testEcalDetIdLoop.cpp
@@ -8,31 +8,28 @@
 
 #include <iostream>
 
-int main()
-{
-        std::cout << "Example of loop on DetId" << std::endl;
-        int cntEB = 0;
-        int cntEE = 0;
-        // Barrel
-        std::cerr << "BARREL --" << std::endl;
-        for ( int i = 0; i < EBDetId::kSizeForDenseIndexing; ++i )
-        {
-                EBDetId id = EBDetId::unhashIndex( i );
-                if ( id != EBDetId(0) ) {
-                        std::cout << " id " << id.rawId() << " -> (" << id.ieta() << ", " << id.iphi() << ") " << id.ic() << "\n";
-                }
-                ++cntEB;
-        }
-        // Endcap
-        std::cerr << "ENDCAP --" << std::endl;
-        for ( int i = 0; i < EEDetId::kSizeForDenseIndexing; ++i )
-        {
-                EEDetId id = EEDetId::unhashIndex( i );
-                if ( id != EEDetId(0) ) {
-                        std::cout << " id " << id.rawId() << " -> (" << id.ix() << ", " << id.iy() << ", " << id.zside() << ")\n";
-                }
-                ++cntEE;
-        }
-        std::cerr << "Total of " << cntEB << " DetId's counted for EB and " << cntEE << " for EE.\n";
-        return 0;
+int main() {
+  std::cout << "Example of loop on DetId" << std::endl;
+  int cntEB = 0;
+  int cntEE = 0;
+  // Barrel
+  std::cerr << "BARREL --" << std::endl;
+  for (int i = 0; i < EBDetId::kSizeForDenseIndexing; ++i) {
+    EBDetId id = EBDetId::unhashIndex(i);
+    if (id != EBDetId(0)) {
+      std::cout << " id " << id.rawId() << " -> (" << id.ieta() << ", " << id.iphi() << ") " << id.ic() << "\n";
+    }
+    ++cntEB;
+  }
+  // Endcap
+  std::cerr << "ENDCAP --" << std::endl;
+  for (int i = 0; i < EEDetId::kSizeForDenseIndexing; ++i) {
+    EEDetId id = EEDetId::unhashIndex(i);
+    if (id != EEDetId(0)) {
+      std::cout << " id " << id.rawId() << " -> (" << id.ix() << ", " << id.iy() << ", " << id.zside() << ")\n";
+    }
+    ++cntEE;
+  }
+  std::cerr << "Total of " << cntEB << " DetId's counted for EB and " << cntEE << " for EE.\n";
+  return 0;
 }
diff --git a/DataFormats/EcalDetId/test/testScHashedIndex.cpp b/DataFormats/EcalDetId/test/testScHashedIndex.cpp
index e3ae3fccf9bf1..0e9a7b4c244c5 100644
--- a/DataFormats/EcalDetId/test/testScHashedIndex.cpp
+++ b/DataFormats/EcalDetId/test/testScHashedIndex.cpp
@@ -17,24 +17,24 @@ int main(int argc, char* argv[]) {
   std::ofstream out(filename);
   try {
     out << "iX\tiY\tiZ\thashed\tERR\tERR\tiX\tiY\tiZ\n";
-    for(int iZ = -1; iZ <= +1; iZ += 2){
-      for(int iY = EcalScDetId::IY_MIN; iY <= EcalScDetId::IY_MAX; ++iY){
-	for(int iX = EcalScDetId::IX_MIN; iX <= EcalScDetId::IX_MAX; ++iX){
-	  if(!EcalScDetId::validDetId(iX,iY,iZ)) continue;
-	  EcalScDetId sc1(iX,iY,iZ);
-	  int ih =  sc1.hashedIndex();
-	  out << iX << "\t" << iY << "\t" << iZ << "\t" << ih;
-	  EcalScDetId sc2 = EcalScDetId::unhashIndex(ih);
-	  out << "\t" << (sc1.rawId() == sc2.rawId() ? "OK" : "ERROR");
-	  out << "\t" << (sc1 == sc2 ? "OK" : "ERROR");
-	  out << "\t" << sc2.ix() << "\t" << sc2.iy()<< "\t" << sc2.zside();
-	  out << "\n";
-	}
+    for (int iZ = -1; iZ <= +1; iZ += 2) {
+      for (int iY = EcalScDetId::IY_MIN; iY <= EcalScDetId::IY_MAX; ++iY) {
+        for (int iX = EcalScDetId::IX_MIN; iX <= EcalScDetId::IX_MAX; ++iX) {
+          if (!EcalScDetId::validDetId(iX, iY, iZ))
+            continue;
+          EcalScDetId sc1(iX, iY, iZ);
+          int ih = sc1.hashedIndex();
+          out << iX << "\t" << iY << "\t" << iZ << "\t" << ih;
+          EcalScDetId sc2 = EcalScDetId::unhashIndex(ih);
+          out << "\t" << (sc1.rawId() == sc2.rawId() ? "OK" : "ERROR");
+          out << "\t" << (sc1 == sc2 ? "OK" : "ERROR");
+          out << "\t" << sc2.ix() << "\t" << sc2.iy() << "\t" << sc2.zside();
+          out << "\n";
+        }
       }
     }
     std::cout << "Supercystal indices have been dumped in file " << filename << std::endl;
-  } catch (std::exception &e) {
-	  std::cerr << e.what();
+  } catch (std::exception& e) {
+    std::cerr << e.what();
   }
 }
-
diff --git a/DataFormats/EcalRawData/interface/ESDCCHeaderBlock.h b/DataFormats/EcalRawData/interface/ESDCCHeaderBlock.h
index 6dfc0c048b2f8..c3e308d30900e 100644
--- a/DataFormats/EcalRawData/interface/ESDCCHeaderBlock.h
+++ b/DataFormats/EcalRawData/interface/ESDCCHeaderBlock.h
@@ -4,9 +4,7 @@
 #include <vector>
 
 class ESDCCHeaderBlock {
-
-  public :
-
+public:
   typedef int key_type;
 
   enum ESDCCRunType {
@@ -18,21 +16,11 @@ class ESDCCHeaderBlock {
     TEST_RUN = 6,
     GLOBAL_COSMIC_RUN = 7
   };
-  
-  enum ESSeqType {
-    STD_SEQ = 0,
-    DELTASCAN_SEQ = 1,
-    DELAYSCAN_SEQ = 2,
-    PULSESHAPE_SEQ = 3
-  };
 
-  enum ESTriggerType {
-    PHYSICS_TRIGGER = 1,
-    CALIBRATION_TRIGGER = 2,
-    TEST_TRIGGER = 3,
-    TECHNICAL_EXTERNAL_TRIGGER = 4
-  };
-  
+  enum ESSeqType { STD_SEQ = 0, DELTASCAN_SEQ = 1, DELAYSCAN_SEQ = 2, PULSESHAPE_SEQ = 3 };
+
+  enum ESTriggerType { PHYSICS_TRIGGER = 1, CALIBRATION_TRIGGER = 2, TEST_TRIGGER = 3, TECHNICAL_EXTERNAL_TRIGGER = 4 };
+
   ESDCCHeaderBlock();
   ESDCCHeaderBlock(const int& dccId);
 
@@ -45,18 +33,18 @@ class ESDCCHeaderBlock {
   void setLV1(const int& LV1) { LV1_ = LV1; };
   void setBX(const int& BX) { BX_ = BX; }
   void setGain(const int& gain) { gain_ = gain; }
-  void setPrecision(const int& precision) { precision_ = precision; } 
+  void setPrecision(const int& precision) { precision_ = precision; }
   void setDAC(const int& dac) { dac_ = dac; }
-  void setEventLength(const int &evtLen) { evtLen_ = evtLen; };
+  void setEventLength(const int& evtLen) { evtLen_ = evtLen; };
   void setDCCErrors(const int& dccErrs) { dccErrs_ = dccErrs; };
   void setRunNumber(const int& runNum) { runNum_ = runNum; };
   void setRunType(const int& runType) { runType_ = runType; };
   void setSeqType(const int& seqType) { seqType_ = seqType; };
   void setTriggerType(const int& trgType) { trgType_ = trgType; };
   void setCompressionFlag(const int& compFlag) { compFlag_ = compFlag; };
-  void setOrbitNumber(const int& orbit) {orbit_ = orbit; };
-  void setMajorVersion(const int& vmajor) {vmajor_ = vmajor; };
-  void setMinorVersion(const int& vminor) {vminor_ = vminor; };
+  void setOrbitNumber(const int& orbit) { orbit_ = orbit; };
+  void setMajorVersion(const int& vmajor) { vmajor_ = vmajor; };
+  void setMinorVersion(const int& vminor) { vminor_ = vminor; };
   void setOptoRX0(const int& optoRX0) { optoRX0_ = optoRX0; };
   void setOptoRX1(const int& optoRX1) { optoRX1_ = optoRX1; };
   void setOptoRX2(const int& optoRX2) { optoRX2_ = optoRX2; };
@@ -64,34 +52,34 @@ class ESDCCHeaderBlock {
   void setOptoBC1(const int& optoBC1) { optoBC1_ = optoBC1; };
   void setOptoBC2(const int& optoBC2) { optoBC2_ = optoBC2; };
   void setFEChannelStatus(const std::vector<int>& FEch) { FEch_ = FEch; };
-  // crepe thing 
-  void setPacketLength(const int & packetLen) { packetLen_ = packetLen; };  
-  void setBC(const int & bc) { bc_ = bc; };  
-  void setEV(const int & ev) { ev_ = ev; };  
+  // crepe thing
+  void setPacketLength(const int& packetLen) { packetLen_ = packetLen; };
+  void setBC(const int& bc) { bc_ = bc; };
+  void setEV(const int& ev) { ev_ = ev; };
   // top level supervisor
-  void setBMMeasurements(const int & BMMeasurements) { BMMeasurements_ = BMMeasurements; };     
-  void setBeginOfSpillSec(const int & beginOfSpillSec) { beginOfSpillSec_ = beginOfSpillSec; };
-  void setBeginOfSpillMilliSec(const int & beginOfSpillMilliSec) { beginOfSpillMilliSec_ = beginOfSpillMilliSec; };
-  void setEndOfSpillSec(const int & endOfSpillSec) { endOfSpillSec_ = endOfSpillSec; };
-  void setEndOfSpillMilliSec(const int & endOfSpillMilliSec) { endOfSpillMilliSec_ = endOfSpillMilliSec; };
-  void setBeginOfSpillLV1(const int & beginOfSpillLV1) { beginOfSpillLV1_ = beginOfSpillLV1; };
-  void setEndOfSpillLV1(const int & endOfSpillLV1) { endOfSpillLV1_ = endOfSpillLV1; };
+  void setBMMeasurements(const int& BMMeasurements) { BMMeasurements_ = BMMeasurements; };
+  void setBeginOfSpillSec(const int& beginOfSpillSec) { beginOfSpillSec_ = beginOfSpillSec; };
+  void setBeginOfSpillMilliSec(const int& beginOfSpillMilliSec) { beginOfSpillMilliSec_ = beginOfSpillMilliSec; };
+  void setEndOfSpillSec(const int& endOfSpillSec) { endOfSpillSec_ = endOfSpillSec; };
+  void setEndOfSpillMilliSec(const int& endOfSpillMilliSec) { endOfSpillMilliSec_ = endOfSpillMilliSec; };
+  void setBeginOfSpillLV1(const int& beginOfSpillLV1) { beginOfSpillLV1_ = beginOfSpillLV1; };
+  void setEndOfSpillLV1(const int& endOfSpillLV1) { endOfSpillLV1_ = endOfSpillLV1; };
   // Cosmic Trigger Supervisor
-  void setTimeStampSec(const int & timestamp_sec) { timestamp_sec_ = timestamp_sec; };
-  void setTimeStampUSec(const int & timestamp_usec) { timestamp_usec_ = timestamp_usec; };
-  void setSpillNumber(const int & spillNum) { spillNum_ = spillNum; };
-  void setEventInSpill(const int & evtInSpill) { evtInSpill_ = evtInSpill; };
-  void setCAMACError(const int & camacErr) { camacErr_ = camacErr; };
-  void setVMEError(const int & vmeErr) { vmeErr_ = vmeErr; };
-  void setADCChannelStatus(const std::vector<int>& ADCch_status) { ADCch_status_ = ADCch_status; }; 
-  void setADCChannel(const std::vector<int>& ADCch) { ADCch_ = ADCch; }; 
-  void setTDCChannelStatus(const std::vector<int>& TDCch_status) { TDCch_status_ = TDCch_status; }; 
-  void setTDCChannel(const std::vector<int>& TDCch) { TDCch_ = TDCch; }; 
+  void setTimeStampSec(const int& timestamp_sec) { timestamp_sec_ = timestamp_sec; };
+  void setTimeStampUSec(const int& timestamp_usec) { timestamp_usec_ = timestamp_usec; };
+  void setSpillNumber(const int& spillNum) { spillNum_ = spillNum; };
+  void setEventInSpill(const int& evtInSpill) { evtInSpill_ = evtInSpill; };
+  void setCAMACError(const int& camacErr) { camacErr_ = camacErr; };
+  void setVMEError(const int& vmeErr) { vmeErr_ = vmeErr; };
+  void setADCChannelStatus(const std::vector<int>& ADCch_status) { ADCch_status_ = ADCch_status; };
+  void setADCChannel(const std::vector<int>& ADCch) { ADCch_ = ADCch; };
+  void setTDCChannelStatus(const std::vector<int>& TDCch_status) { TDCch_status_ = TDCch_status; };
+  void setTDCChannel(const std::vector<int>& TDCch) { TDCch_ = TDCch; };
 
   int getLV1() const { return LV1_; }
   int getBX() const { return BX_; }
   int getGain() const { return gain_; }
-  int getPrecision() const { return precision_; } 
+  int getPrecision() const { return precision_; }
   int getDAC() const { return dac_; }
   int getEventLength() const { return evtLen_; }
   int getDCCErrors() const { return dccErrs_; }
@@ -120,7 +108,7 @@ class ESDCCHeaderBlock {
   int getEndOfSpillMiliSec() const { return endOfSpillMilliSec_; }
   int getBeginOfSpillLV1() const { return beginOfSpillLV1_; }
   int getEndOfSpillLV1() const { return endOfSpillLV1_; }
-  int getTimeStampSec() const { return timestamp_sec_; } 
+  int getTimeStampSec() const { return timestamp_sec_; }
   int getTimeStampUSec() const { return timestamp_usec_; }
   int getSpillNumber() const { return spillNum_; }
   int getEventInSpill() const { return evtInSpill_; }
@@ -130,9 +118,8 @@ class ESDCCHeaderBlock {
   const std::vector<int>& getADCChannel() const { return ADCch_; }
   const std::vector<int>& getTDCChannelStatus() const { return TDCch_status_; }
   const std::vector<int>& getTDCChannel() const { return TDCch_; }
-  
-  private :
-    
+
+private:
   int dccId_;
   int fedId_;
   int LV1_;
@@ -177,9 +164,6 @@ class ESDCCHeaderBlock {
   std::vector<int> ADCch_;
   std::vector<int> TDCch_status_;
   std::vector<int> TDCch_;
-
 };
 
 #endif
-
-
diff --git a/DataFormats/EcalRawData/interface/ESKCHIPBlock.h b/DataFormats/EcalRawData/interface/ESKCHIPBlock.h
index 7c653f2d6b45b..8d100dd0395ed 100644
--- a/DataFormats/EcalRawData/interface/ESKCHIPBlock.h
+++ b/DataFormats/EcalRawData/interface/ESKCHIPBlock.h
@@ -4,10 +4,8 @@
 #include <vector>
 
 class ESKCHIPBlock {
-  
-  public :
-    
-  typedef int key_type; // For the sorted collection 
+public:
+  typedef int key_type;  // For the sorted collection
 
   ESKCHIPBlock();
   ESKCHIPBlock(const int& kId);
@@ -26,8 +24,8 @@ class ESKCHIPBlock {
 
   void setBC(const int& BC) { BC_ = BC; }
   void setEC(const int& EC) { EC_ = EC; }
-  void setOptoBC(const int & OptoBC) { OptoBC_ = BC_; } 
-  void setOptoEC(const int & OptoEC) { OptoEC_ = EC_; } 
+  void setOptoBC(const int& OptoBC) { OptoBC_ = BC_; }
+  void setOptoEC(const int& OptoEC) { OptoEC_ = EC_; }
   void setFlag1(const int& flag1) { flag1_ = flag1; };
   void setFlag2(const int& flag2) { flag2_ = flag2; };
   void setCRC(const int& CRC) { CRC_ = CRC; }
@@ -40,8 +38,7 @@ class ESKCHIPBlock {
   int getFlag2() const { return flag2_; }
   int getCRC() const { return CRC_; }
 
-  private :
-
+private:
   int kId_;
   int dccId_;
   int fedId_;
@@ -53,9 +50,6 @@ class ESKCHIPBlock {
   int flag1_;
   int flag2_;
   int CRC_;
-
 };
 
 #endif
-
-
diff --git a/DataFormats/EcalRawData/interface/ESListOfFEDS.h b/DataFormats/EcalRawData/interface/ESListOfFEDS.h
index 68cb566f6b35d..560faae406aa8 100644
--- a/DataFormats/EcalRawData/interface/ESListOfFEDS.h
+++ b/DataFormats/EcalRawData/interface/ESListOfFEDS.h
@@ -4,18 +4,16 @@
 #include <vector>
 
 class ESListOfFEDS {
+public:
+  ESListOfFEDS();
+  void AddFED(int fed);
+  std::vector<int> GetList() const { return list_of_feds; }
+  void SetList(std::vector<int>& feds) { list_of_feds = feds; }
 
- public:
-	ESListOfFEDS();
-	void AddFED(int fed);
-	std::vector<int> GetList() const { return list_of_feds; }
-	void SetList(std::vector<int>& feds) { list_of_feds = feds; }
-
- private:
-	std::vector<int> list_of_feds;
+private:
+  std::vector<int> list_of_feds;
 };
 
 typedef std::vector<ESListOfFEDS> ESListOfFEDSCollection;
 
-
 #endif
diff --git a/DataFormats/EcalRawData/interface/EcalDCCHeaderBlock.h b/DataFormats/EcalRawData/interface/EcalDCCHeaderBlock.h
index 4a262a8f56bb7..b8a50269e91ad 100644
--- a/DataFormats/EcalRawData/interface/EcalDCCHeaderBlock.h
+++ b/DataFormats/EcalRawData/interface/EcalDCCHeaderBlock.h
@@ -14,66 +14,56 @@
 #define MAX_TCC_SIZE 4
 #define MAX_TT_SIZE 70
 
+class EcalDCCHeaderBlock {
+public:
+  typedef int key_type;  ///< For the sorted collection
 
-
-class EcalDCCHeaderBlock
-{
-
- public:
-
-  typedef int key_type; ///< For the sorted collection 
-
-  enum EcalDCCRuntype{
+  enum EcalDCCRuntype {
 
     // run types pre-global runs
-    COSMIC                   =0,
-    BEAMH4                   =1, 
-    BEAMH2                   =2,  
-    MTCC                     =3,
-    LASER_STD                =4,
-    LASER_POWER_SCAN         =5,
-    LASER_DELAY_SCAN         =6,
-    TESTPULSE_SCAN_MEM       =7,
-    TESTPULSE_MGPA           =8,
-    PEDESTAL_STD             =9,
-    PEDESTAL_OFFSET_SCAN     =10,
-    PEDESTAL_25NS_SCAN       =11,
-    LED_STD                  =12,
+    COSMIC = 0,
+    BEAMH4 = 1,
+    BEAMH2 = 2,
+    MTCC = 3,
+    LASER_STD = 4,
+    LASER_POWER_SCAN = 5,
+    LASER_DELAY_SCAN = 6,
+    TESTPULSE_SCAN_MEM = 7,
+    TESTPULSE_MGPA = 8,
+    PEDESTAL_STD = 9,
+    PEDESTAL_OFFSET_SCAN = 10,
+    PEDESTAL_25NS_SCAN = 11,
+    LED_STD = 12,
 
     // physics triggers in global runs
-    PHYSICS_GLOBAL           =13,
-    COSMICS_GLOBAL           =14,
-    HALO_GLOBAL              =15,
+    PHYSICS_GLOBAL = 13,
+    COSMICS_GLOBAL = 14,
+    HALO_GLOBAL = 15,
 
     // gap events in global runs
-    LASER_GAP                =16,
-    TESTPULSE_GAP            =17,
-    PEDESTAL_GAP             =18,
-    LED_GAP                  =19,
+    LASER_GAP = 16,
+    TESTPULSE_GAP = 17,
+    PEDESTAL_GAP = 18,
+    LED_GAP = 19,
 
     // physics triggers in local runs
-    PHYSICS_LOCAL            =20,
-    COSMICS_LOCAL            =21,
-    HALO_LOCAL               =22,
-    CALIB_LOCAL              =23
+    PHYSICS_LOCAL = 20,
+    COSMICS_LOCAL = 21,
+    HALO_LOCAL = 22,
+    CALIB_LOCAL = 23
 
   };
-  
-  enum EcalBasicTriggerType{
-    PHYSICS_TRIGGER            =1,
-    CALIBRATION_TRIGGER        =2,
-    TEST_TRIGGER               =3,
-    TECHNICAL_EXTERNAL_TRIGGER =4
-  };
-  
-  enum TTC_DTT_TYPE{
-    TTC_LASER     = 4,
-    TTC_LED       = 5,
-    TTC_TESTPULSE = 6,
-    TTC_PEDESTAL  = 7
+
+  enum EcalBasicTriggerType {
+    PHYSICS_TRIGGER = 1,
+    CALIBRATION_TRIGGER = 2,
+    TEST_TRIGGER = 3,
+    TECHNICAL_EXTERNAL_TRIGGER = 4
   };
 
-  struct EcalDCCEventSettings{
+  enum TTC_DTT_TYPE { TTC_LASER = 4, TTC_LED = 5, TTC_TESTPULSE = 6, TTC_PEDESTAL = 7 };
+
+  struct EcalDCCEventSettings {
     short LaserPower;
     short LaserFilter;
     short wavelength;
@@ -95,78 +85,72 @@ class EcalDCCHeaderBlock
   // CMS: 601-654         TB and COSM: 0-35
   const int fedId() const { return fedId_; }
 
-  void setId(const int& dccId) { dccId_=dccId; };
-  void setFedId(const int& fedId) { fedId_=fedId; };
-
-  void setErrors(const int& dccErrors) { dccErrors_=dccErrors; };
-  void setDccInTTCCommand(const int& dccInTTCCommand) { dccInTTCCommand_=dccInTTCCommand; };
-  void setRunNumber(const int& run){runNumber_ = run;}
-  void setLV1(const int& LV1){LV1event_ = LV1;}
-  void setBX(const int& BX){BX_ = BX;}
-  void setOrbit(const int& orbit){orbitNumber_ = orbit;}
-  void setEventSettings(const  EcalDCCEventSettings& EventSettings) { EventSettings_=EventSettings; };
-  void setRunType(const short& runType) { runType_=runType; };
-  void setZs(const short& zs) { zs_=zs;};
-  void setBasicTriggerType(const short& triggerType) { basic_trigger_type_=triggerType; };
+  void setId(const int& dccId) { dccId_ = dccId; };
+  void setFedId(const int& fedId) { fedId_ = fedId; };
+
+  void setErrors(const int& dccErrors) { dccErrors_ = dccErrors; };
+  void setDccInTTCCommand(const int& dccInTTCCommand) { dccInTTCCommand_ = dccInTTCCommand; };
+  void setRunNumber(const int& run) { runNumber_ = run; }
+  void setLV1(const int& LV1) { LV1event_ = LV1; }
+  void setBX(const int& BX) { BX_ = BX; }
+  void setOrbit(const int& orbit) { orbitNumber_ = orbit; }
+  void setEventSettings(const EcalDCCEventSettings& EventSettings) { EventSettings_ = EventSettings; };
+  void setRunType(const short& runType) { runType_ = runType; };
+  void setZs(const short& zs) { zs_ = zs; };
+  void setBasicTriggerType(const short& triggerType) { basic_trigger_type_ = triggerType; };
   //void setSequence(const short& sequence) { sequence_=sequence; } ;
-  void setRtHalf(const short& rtHalf) { rtHalf_=rtHalf; } ;
-  void setMgpaGain(const short& mgpaGain) { mgpaGain_=mgpaGain; };
-  void setMemGain(const short& memGain) { memGain_=memGain; };
-  void setSelectiveReadout(const bool& selectiveReadout) { selectiveReadout_=selectiveReadout; };
-  void setZeroSuppression(const bool& zeroSuppression) { zeroSuppression_=zeroSuppression; };
+  void setRtHalf(const short& rtHalf) { rtHalf_ = rtHalf; };
+  void setMgpaGain(const short& mgpaGain) { mgpaGain_ = mgpaGain; };
+  void setMemGain(const short& memGain) { memGain_ = memGain; };
+  void setSelectiveReadout(const bool& selectiveReadout) { selectiveReadout_ = selectiveReadout; };
+  void setZeroSuppression(const bool& zeroSuppression) { zeroSuppression_ = zeroSuppression; };
   void setTestZeroSuppression(const bool& testZeroSuppression) { testZeroSuppression_ = testZeroSuppression; };
-  void setSrpStatus(const short& srpStatus) { srpStatus_=srpStatus; };
-  void setTccStatus(const std::vector<short>& tccStatus) { tccStatus_=tccStatus; };
+  void setSrpStatus(const short& srpStatus) { srpStatus_ = srpStatus; };
+  void setTccStatus(const std::vector<short>& tccStatus) { tccStatus_ = tccStatus; };
   void setTriggerTowerFlags(const std::vector<short>& triggerTowerFlag) { triggerTowerFlag_ = triggerTowerFlag; };
   void setFEStatus(const std::vector<short>& feStatus) { feStatus_ = feStatus; };
 
-  void setFEBx(const std::vector<short>& feBx)  { feBx_  = feBx;  }
-  void setTCCBx(const std::vector<short>& tccBx){ tccBx_ = tccBx; }
-  void setSRPBx(const short & srpBx)            { srpBx_ = srpBx; }
-  
-  void setFELv1(const std::vector<short>& feLv1)  { feLv1_ = feLv1;   }
-  void setTCCLv1(const std::vector<short>& tccLv1){ tccLv1_ = tccLv1; }
-  void setSRPLv1(const short & srpLv1)            { srpLv1_ = srpLv1; }
-
-
-
+  void setFEBx(const std::vector<short>& feBx) { feBx_ = feBx; }
+  void setTCCBx(const std::vector<short>& tccBx) { tccBx_ = tccBx; }
+  void setSRPBx(const short& srpBx) { srpBx_ = srpBx; }
 
+  void setFELv1(const std::vector<short>& feLv1) { feLv1_ = feLv1; }
+  void setTCCLv1(const std::vector<short>& tccLv1) { tccLv1_ = tccLv1; }
+  void setSRPLv1(const short& srpLv1) { srpLv1_ = srpLv1; }
 
   //TODO add all the get methods
-  
-  int getDCCErrors() const{ return dccErrors_;}
-  int getDccInTCCCommand() const{ return dccInTTCCommand_; };
-  int getRunNumber() const {return runNumber_ ;}
-  int getLV1() const {return LV1event_ ;}
-  int getBX() const {return BX_ ;}
-  int getOrbit() const {return orbitNumber_;}
-  EcalDCCEventSettings getEventSettings() const { return EventSettings_;}
-  short getRunType() const {return runType_ ;}
-  short getZs() const {return zs_ ;}
-  short getBasicTriggerType() const {return basic_trigger_type_ ;}
-
-  short getRtHalf() const { return rtHalf_; } 
-  short getMgpaGain() const { return mgpaGain_;}
-  short getMemGain() const  { return memGain_;}
-  short getSelectiveReadout() const { return selectiveReadout_;}
-  bool getZeroSuppression() const { return zeroSuppression_;}
-  bool getTestZeroSuppression() const {return testZeroSuppression_ ;}
-  short getSrpStatus() const  { return srpStatus_;}
-  const std::vector<short>& getTccStatus() const { return tccStatus_ ;}
-  const std::vector<short>& getTriggerTowerFlag() const { return triggerTowerFlag_ ;}
-  const std::vector<short>& getFEStatus() const { return feStatus_ ;}
-
-  const std::vector<short>& getFEBxs() const { return feBx_;}
-  const std::vector<short>& getTCCBx() const { return tccBx_;}
-  short              getSRPBx() const { return srpBx_; }
-  
-  const std::vector<short>& getFELv1() const { return feLv1_;}
-  const std::vector<short>& getTCCLv1()const { return tccLv1_;}
-  short              getSRPLv1() const { return srpLv1_; }
-  
-  
- private:
 
+  int getDCCErrors() const { return dccErrors_; }
+  int getDccInTCCCommand() const { return dccInTTCCommand_; };
+  int getRunNumber() const { return runNumber_; }
+  int getLV1() const { return LV1event_; }
+  int getBX() const { return BX_; }
+  int getOrbit() const { return orbitNumber_; }
+  EcalDCCEventSettings getEventSettings() const { return EventSettings_; }
+  short getRunType() const { return runType_; }
+  short getZs() const { return zs_; }
+  short getBasicTriggerType() const { return basic_trigger_type_; }
+
+  short getRtHalf() const { return rtHalf_; }
+  short getMgpaGain() const { return mgpaGain_; }
+  short getMemGain() const { return memGain_; }
+  short getSelectiveReadout() const { return selectiveReadout_; }
+  bool getZeroSuppression() const { return zeroSuppression_; }
+  bool getTestZeroSuppression() const { return testZeroSuppression_; }
+  short getSrpStatus() const { return srpStatus_; }
+  const std::vector<short>& getTccStatus() const { return tccStatus_; }
+  const std::vector<short>& getTriggerTowerFlag() const { return triggerTowerFlag_; }
+  const std::vector<short>& getFEStatus() const { return feStatus_; }
+
+  const std::vector<short>& getFEBxs() const { return feBx_; }
+  const std::vector<short>& getTCCBx() const { return tccBx_; }
+  short getSRPBx() const { return srpBx_; }
+
+  const std::vector<short>& getFELv1() const { return feLv1_; }
+  const std::vector<short>& getTCCLv1() const { return tccLv1_; }
+  short getSRPLv1() const { return srpLv1_; }
+
+private:
   int dccId_;  //to be used as the Key
   int fedId_;
   int dccErrors_;
@@ -180,28 +164,27 @@ class EcalDCCHeaderBlock
   int LV1event_;
   int runNumber_;
   int BX_;
-  EcalDCCEventSettings  EventSettings_;
-  
+  EcalDCCEventSettings EventSettings_;
+
   short rtHalf_;
   short mgpaGain_;
   short memGain_;
   bool selectiveReadout_;
   bool testZeroSuppression_;
   bool zeroSuppression_;
-  
+
   short srpStatus_;
   std::vector<short> tccStatus_;
   std::vector<short> triggerTowerFlag_;
   std::vector<short> feStatus_;
-  
-  std::vector<short> feBx_;  
-  std::vector<short> tccBx_; 
-  short              srpBx_; 
-  
-  std::vector<short> feLv1_;  
-  std::vector<short> tccLv1_; 
-  short              srpLv1_; 
- 
+
+  std::vector<short> feBx_;
+  std::vector<short> tccBx_;
+  short srpBx_;
+
+  std::vector<short> feLv1_;
+  std::vector<short> tccLv1_;
+  short srpLv1_;
 };
 
 #endif
diff --git a/DataFormats/EcalRawData/interface/EcalListOfFEDS.h b/DataFormats/EcalRawData/interface/EcalListOfFEDS.h
index beac417df4f3d..e58878d58ff7f 100644
--- a/DataFormats/EcalRawData/interface/EcalListOfFEDS.h
+++ b/DataFormats/EcalRawData/interface/EcalListOfFEDS.h
@@ -4,18 +4,16 @@
 #include <vector>
 
 class EcalListOfFEDS {
+public:
+  EcalListOfFEDS();
+  void AddFED(int fed);
+  std::vector<int> GetList() const { return list_of_feds; }
+  void SetList(std::vector<int>& feds) { list_of_feds = feds; }
 
- public:
-	EcalListOfFEDS();
-	void AddFED(int fed);
-	std::vector<int> GetList() const { return list_of_feds; }
-	void SetList(std::vector<int>& feds) { list_of_feds = feds; }
-
- private:
-	std::vector<int> list_of_feds;
+private:
+  std::vector<int> list_of_feds;
 };
 
 typedef std::vector<EcalListOfFEDS> EcalListOfFEDSCollection;
 
-
 #endif
diff --git a/DataFormats/EcalRawData/src/ESDCCHeaderBlock.cc b/DataFormats/EcalRawData/src/ESDCCHeaderBlock.cc
index 0ba2eba52c6b3..01398bfc37972 100644
--- a/DataFormats/EcalRawData/src/ESDCCHeaderBlock.cc
+++ b/DataFormats/EcalRawData/src/ESDCCHeaderBlock.cc
@@ -1,8 +1,6 @@
 #include "DataFormats/EcalRawData/interface/ESDCCHeaderBlock.h"
 
-ESDCCHeaderBlock::ESDCCHeaderBlock()
-{
-
+ESDCCHeaderBlock::ESDCCHeaderBlock() {
   dccId_ = -1;
   fedId_ = -1;
   LV1_ = -1;
@@ -47,12 +45,9 @@ ESDCCHeaderBlock::ESDCCHeaderBlock()
   ADCch_.reserve(12);
   TDCch_status_.reserve(8);
   TDCch_.reserve(8);
-
 }
 
-ESDCCHeaderBlock::ESDCCHeaderBlock(const int& dccId)
-{
-
+ESDCCHeaderBlock::ESDCCHeaderBlock(const int& dccId) {
   dccId_ = dccId;
   fedId_ = -1;
   LV1_ = -1;
@@ -97,5 +92,4 @@ ESDCCHeaderBlock::ESDCCHeaderBlock(const int& dccId)
   ADCch_.reserve(12);
   TDCch_status_.reserve(8);
   TDCch_.reserve(8);
-
 }
diff --git a/DataFormats/EcalRawData/src/ESKCHIPBlock.cc b/DataFormats/EcalRawData/src/ESKCHIPBlock.cc
index c38630c9b7392..14fc5f6359095 100644
--- a/DataFormats/EcalRawData/src/ESKCHIPBlock.cc
+++ b/DataFormats/EcalRawData/src/ESKCHIPBlock.cc
@@ -1,7 +1,6 @@
 #include "DataFormats/EcalRawData/interface/ESKCHIPBlock.h"
 
-ESKCHIPBlock::ESKCHIPBlock()
-{
+ESKCHIPBlock::ESKCHIPBlock() {
   kId_ = -1;
   dccId_ = -1;
   fedId_ = -1;
@@ -13,11 +12,9 @@ ESKCHIPBlock::ESKCHIPBlock()
   flag1_ = -1;
   flag2_ = -1;
   CRC_ = -1;
-
 }
 
-ESKCHIPBlock::ESKCHIPBlock(const int& kId)
-{
+ESKCHIPBlock::ESKCHIPBlock(const int& kId) {
   kId_ = kId;
   dccId_ = -1;
   fedId_ = -1;
diff --git a/DataFormats/EcalRawData/src/ESListOfFEDS.cc b/DataFormats/EcalRawData/src/ESListOfFEDS.cc
index 61fb8429d943f..31aa3a04f97e2 100644
--- a/DataFormats/EcalRawData/src/ESListOfFEDS.cc
+++ b/DataFormats/EcalRawData/src/ESListOfFEDS.cc
@@ -1,12 +1,6 @@
 #include <iostream>
 #include "DataFormats/EcalRawData/interface/ESListOfFEDS.h"
 
-ESListOfFEDS::ESListOfFEDS() {
- list_of_feds.clear();
-}
-
-void ESListOfFEDS::AddFED(int fed) {
- list_of_feds.push_back(fed);
-}
-
+ESListOfFEDS::ESListOfFEDS() { list_of_feds.clear(); }
 
+void ESListOfFEDS::AddFED(int fed) { list_of_feds.push_back(fed); }
diff --git a/DataFormats/EcalRawData/src/EcalDCCHeaderBlock.cc b/DataFormats/EcalRawData/src/EcalDCCHeaderBlock.cc
index 543a50540d06f..03e768e3adfc6 100644
--- a/DataFormats/EcalRawData/src/EcalDCCHeaderBlock.cc
+++ b/DataFormats/EcalRawData/src/EcalDCCHeaderBlock.cc
@@ -1,10 +1,9 @@
 #include <DataFormats/EcalRawData/interface/EcalDCCHeaderBlock.h>
 
-EcalDCCHeaderBlock::EcalDCCHeaderBlock()
-{
-  dccId_ = -1; // initialize
-  fedId_ = -1; // initialize
-  dccInTTCCommand_ = -1; // initialize
+EcalDCCHeaderBlock::EcalDCCHeaderBlock() {
+  dccId_ = -1;            // initialize
+  fedId_ = -1;            // initialize
+  dccInTTCCommand_ = -1;  // initialize
   tccStatus_.reserve(MAX_TCC_SIZE);
   triggerTowerFlag_.reserve(MAX_TT_SIZE);
   feStatus_.reserve(MAX_TT_SIZE);
@@ -14,40 +13,39 @@ EcalDCCHeaderBlock::EcalDCCHeaderBlock()
   tccBx_.reserve(MAX_TCC_SIZE);
   tccLv1_.reserve(MAX_TCC_SIZE);
 
-  srpLv1_=-1;
-  srpBx_=-1;
+  srpLv1_ = -1;
+  srpBx_ = -1;
+
+  dccErrors_ = -1;
+  orbitNumber_ = -1;  // do we need it here?
+  runType_ = -1;
+  zs_ = -1;
+  basic_trigger_type_ = -1;
+  LV1event_ = -1;
+  runNumber_ = -1;
+  BX_ = -1;
 
-  dccErrors_=-1;
-  orbitNumber_=-1; // do we need it here?
-  runType_=-1;
-  zs_=-1;
-  basic_trigger_type_=-1;
-  LV1event_ =-1;
-  runNumber_ =-1;
-  BX_ =-1;
- 
   EcalDCCEventSettings dummySettings;
-  dummySettings.LaserPower =-1;
-  dummySettings.LaserFilter =-1;
-  dummySettings.wavelength =-1;
-  dummySettings.delay =-1;
-  dummySettings.MEMVinj =-1;
-  dummySettings.mgpa_content =-1;
-  dummySettings.ped_offset =-1;
+  dummySettings.LaserPower = -1;
+  dummySettings.LaserFilter = -1;
+  dummySettings.wavelength = -1;
+  dummySettings.delay = -1;
+  dummySettings.MEMVinj = -1;
+  dummySettings.mgpa_content = -1;
+  dummySettings.ped_offset = -1;
 
   EventSettings_ = dummySettings;
 
-  rtHalf_=-1;
-  mgpaGain_=-1;
-  memGain_=-1;
-  srpStatus_ =-1;
-  selectiveReadout_=false;
-  testZeroSuppression_=false;
-  zeroSuppression_=false; 
+  rtHalf_ = -1;
+  mgpaGain_ = -1;
+  memGain_ = -1;
+  srpStatus_ = -1;
+  selectiveReadout_ = false;
+  testZeroSuppression_ = false;
+  zeroSuppression_ = false;
 }
 
-EcalDCCHeaderBlock::EcalDCCHeaderBlock(const int& dccId)
-{
+EcalDCCHeaderBlock::EcalDCCHeaderBlock(const int& dccId) {
   dccId_ = dccId;
   fedId_ = -1;  // initialize
   tccStatus_.reserve(MAX_TCC_SIZE);
@@ -59,36 +57,34 @@ EcalDCCHeaderBlock::EcalDCCHeaderBlock(const int& dccId)
   tccBx_.reserve(MAX_TCC_SIZE);
   tccLv1_.reserve(MAX_TCC_SIZE);
 
-  srpLv1_=-1;
-  srpBx_=-1;
+  srpLv1_ = -1;
+  srpBx_ = -1;
 
+  dccErrors_ = -1;
+  orbitNumber_ = -1;  // do we need it here?
+  runType_ = -1;
+  basic_trigger_type_ = -1;
+  LV1event_ = -1;
+  runNumber_ = -1;
+  BX_ = -1;
 
-  dccErrors_=-1;
-  orbitNumber_=-1; // do we need it here?
-  runType_=-1;
-  basic_trigger_type_=-1;
-  LV1event_ =-1;
-  runNumber_ =-1;
-  BX_ =-1;
- 
   EcalDCCEventSettings dummySettings;
-  dummySettings.LaserPower =-1;
-  dummySettings.LaserFilter =-1;
-  dummySettings.wavelength =-1;
-  dummySettings.delay =-1;
-  dummySettings.MEMVinj =-1;
-  dummySettings.mgpa_content =-1;
-  dummySettings.ped_offset =-1;
+  dummySettings.LaserPower = -1;
+  dummySettings.LaserFilter = -1;
+  dummySettings.wavelength = -1;
+  dummySettings.delay = -1;
+  dummySettings.MEMVinj = -1;
+  dummySettings.mgpa_content = -1;
+  dummySettings.ped_offset = -1;
 
   EventSettings_ = dummySettings;
 
-  rtHalf_=-1;
-  mgpaGain_=-1;
-  memGain_=-1;
-  srpStatus_ =-1;
-  
-  selectiveReadout_=false;
-  testZeroSuppression_=false;
-  zeroSuppression_=false;  
-}
+  rtHalf_ = -1;
+  mgpaGain_ = -1;
+  memGain_ = -1;
+  srpStatus_ = -1;
 
+  selectiveReadout_ = false;
+  testZeroSuppression_ = false;
+  zeroSuppression_ = false;
+}
diff --git a/DataFormats/EcalRawData/src/EcalListOfFEDS.cc b/DataFormats/EcalRawData/src/EcalListOfFEDS.cc
index 233184cb43b5f..520971283ed7f 100644
--- a/DataFormats/EcalRawData/src/EcalListOfFEDS.cc
+++ b/DataFormats/EcalRawData/src/EcalListOfFEDS.cc
@@ -1,12 +1,6 @@
 #include <iostream>
 #include "DataFormats/EcalRawData/interface/EcalListOfFEDS.h"
 
-EcalListOfFEDS::EcalListOfFEDS() {
- list_of_feds.clear();
-}
-
-void EcalListOfFEDS::AddFED(int fed) {
- list_of_feds.push_back(fed);
-}
-
+EcalListOfFEDS::EcalListOfFEDS() { list_of_feds.clear(); }
 
+void EcalListOfFEDS::AddFED(int fed) { list_of_feds.push_back(fed); }
diff --git a/DataFormats/EcalRawData/src/classes.h b/DataFormats/EcalRawData/src/classes.h
index 45f8221a7ebc9..84beb0039b35c 100644
--- a/DataFormats/EcalRawData/src/classes.h
+++ b/DataFormats/EcalRawData/src/classes.h
@@ -9,4 +9,3 @@
 #include <DataFormats/EcalRawData/interface/ESKCHIPBlock.h>
 
 #include <DataFormats/Common/interface/Wrapper.h>
-
diff --git a/DataFormats/EgammaCandidates/interface/GsfElectron.h b/DataFormats/EgammaCandidates/interface/GsfElectron.h
index 0071ddafe308d..0bcd0116efd83 100644
--- a/DataFormats/EgammaCandidates/interface/GsfElectron.h
+++ b/DataFormats/EgammaCandidates/interface/GsfElectron.h
@@ -7,6 +7,7 @@
 #include "DataFormats/GsfTrackReco/interface/GsfTrackFwd.h"
 //#include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
+#include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/EgammaReco/interface/SuperCluster.h"
 #include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
 #include "DataFormats/CaloRecHit/interface/CaloClusterFwd.h"
@@ -183,11 +184,14 @@ class GsfElectron : public RecoCandidate
     // forward core methods
     SuperClusterRef superCluster() const override { return core()->superCluster() ; }
     GsfTrackRef gsfTrack() const override { return core()->gsfTrack() ; }
-    virtual TrackRef closestTrack() const { return core()->ctfTrack() ; }
     float ctfGsfOverlap() const { return core()->ctfGsfOverlap() ; }
     bool ecalDrivenSeed() const { return core()->ecalDrivenSeed() ; }
     bool trackerDrivenSeed() const { return core()->trackerDrivenSeed() ; }
     virtual SuperClusterRef parentSuperCluster() const { return core()->parentSuperCluster() ; }
+    bool closestCtfTrackRefValid() const { return closestCtfTrackRef().isAvailable() && closestCtfTrackRef().isNonnull() ; }
+    //methods used for MVA variables
+    float closestCtfTrackNormChi2() const { return closestCtfTrackRefValid() ? closestCtfTrackRef()->normalizedChi2() : 0; }
+    int closestCtfTrackNLayers() const { return closestCtfTrackRefValid() ? closestCtfTrackRef()->hitPattern().trackerLayersWithMeasurement() : -1; }
 
     // backward compatibility
     struct ClosestCtfTrack
@@ -530,14 +534,15 @@ class GsfElectron : public RecoCandidate
 
     struct IsolationVariables
      {
-      float tkSumPt ;                // track iso deposit with electron footprint removed
+      float tkSumPt ;                // track iso with electron footprint removed
+      float tkSumPtHEEP ;            // track iso used for the HEEP ID
       float ecalRecHitSumEt ;        // ecal iso deposit with electron footprint removed
       float hcalDepth1TowerSumEt ;   // hcal depht 1 iso deposit with electron footprint removed
       float hcalDepth2TowerSumEt ;   // hcal depht 2 iso deposit with electron footprint removed
       float hcalDepth1TowerSumEtBc ; // hcal depht 1 iso deposit without towers behind clusters
       float hcalDepth2TowerSumEtBc ; // hcal depht 2 iso deposit without towers behind clusters
       IsolationVariables()
-       : tkSumPt(0.), ecalRecHitSumEt(0.),
+       : tkSumPt(0.), tkSumPtHEEP(0.), ecalRecHitSumEt(0.),
          hcalDepth1TowerSumEt(0.), hcalDepth2TowerSumEt(0.),
          hcalDepth1TowerSumEtBc(0.), hcalDepth2TowerSumEtBc(0.)
        {}
@@ -545,6 +550,7 @@ class GsfElectron : public RecoCandidate
 
     // 03 accessors
     float dr03TkSumPt() const { return dr03_.tkSumPt ; }
+    float dr03TkSumPtHEEP() const { return dr03_.tkSumPtHEEP ; }
     float dr03EcalRecHitSumEt() const { return dr03_.ecalRecHitSumEt ; }
     float dr03HcalDepth1TowerSumEt() const { return dr03_.hcalDepth1TowerSumEt ; }
     float dr03HcalDepth2TowerSumEt() const { return dr03_.hcalDepth2TowerSumEt ; }
@@ -556,6 +562,7 @@ class GsfElectron : public RecoCandidate
 
     // 04 accessors
     float dr04TkSumPt() const { return dr04_.tkSumPt ; }
+    float dr04TkSumPtHEEP() const { return dr04_.tkSumPtHEEP ; }
     float dr04EcalRecHitSumEt() const { return dr04_.ecalRecHitSumEt ; }
     float dr04HcalDepth1TowerSumEt() const { return dr04_.hcalDepth1TowerSumEt ; }
     float dr04HcalDepth2TowerSumEt() const { return dr04_.hcalDepth2TowerSumEt ; }
@@ -595,11 +602,13 @@ class GsfElectron : public RecoCandidate
       float dist ; // distance to the conversion partner
       float dcot ; // difference of cot(angle) with the conversion partner track
       float radius ; // signed conversion radius
+      float vtxFitProb ; //fit probablity (chi2/ndof) of the matched conversion vtx
       ConversionRejection()
        : flags(-1),
          dist(std::numeric_limits<float>::max()),
          dcot(std::numeric_limits<float>::max()),
-         radius(std::numeric_limits<float>::max())
+         radius(std::numeric_limits<float>::max()),
+	 vtxFitProb(std::numeric_limits<float>::max())
        {}
      } ;
 
@@ -609,8 +618,9 @@ class GsfElectron : public RecoCandidate
     float convDist() const { return conversionRejection_.dist ; }
     float convDcot() const { return conversionRejection_.dcot ; }
     float convRadius() const { return conversionRejection_.radius ; }
+    float convVtxFitProb() const { return conversionRejection_.vtxFitProb ; } 
     const ConversionRejection & conversionRejectionVariables() const { return conversionRejection_ ; }
-
+    void setConversionRejectionVariables(const ConversionRejection& convRej) { conversionRejection_ = convRej ; }
   private:
 
     // attributes
diff --git a/DataFormats/EgammaCandidates/interface/Photon.h b/DataFormats/EgammaCandidates/interface/Photon.h
index 932ca599398be..f03745aeecba0 100644
--- a/DataFormats/EgammaCandidates/interface/Photon.h
+++ b/DataFormats/EgammaCandidates/interface/Photon.h
@@ -166,6 +166,9 @@ namespace reco {
       float e2x5Right;
       float e2x5Top;
       float e2x5Bottom;
+      float smMajor;
+      float smMinor;
+      float smAlpha;
       ShowerShape()
 	: sigmaEtaEta(std::numeric_limits<float>::max()),
 	   sigmaIetaIeta(std::numeric_limits<float>::max()),
@@ -193,7 +196,10 @@ namespace reco {
           e2x5Left(0.f),
           e2x5Right(0.f),
           e2x5Top(0.f),
-          e2x5Bottom(0.f)	   
+          e2x5Bottom(0.f),
+	  smMajor(0.f),
+	  smMinor(0.f),
+	  smAlpha(0.f)
       {}
     } ;
     const ShowerShape& showerShapeVariables() const { return showerShapeBlock_; }
@@ -460,30 +466,24 @@ namespace reco {
     struct PflowIsolationVariables
     {
 
-      float chargedHadronIso; //  equivalent to sumChargedHadronPt in  DataFormats/MuonReco/interface/MuonPFIsolation.h
-      float chargedHadronIsoWrongVtx; //  equivalent to sumChargedHadronPt in  DataFormats/MuonReco/interface/MuonPFIsolation.h
-      float neutralHadronIso; //  equivalent to sumNeutralHadronPt in  DataFormats/MuonReco/interface/MuonPFIsolation.h
-      float photonIso ;       //  equivalent to sumPhotonPt in  DataFormats/MuonReco/interface/MuonPFIsolation.h
-      float modFrixione ;      
-      float sumChargedParticlePt; //!< sum-pt of charged Particles(inludes e/mu) 
-      float sumNeutralHadronEtHighThreshold;  //!< sum pt of neutral hadrons with a higher threshold
-      float sumPhotonEtHighThreshold;  //!< sum pt of PF photons with a higher threshold
-      float sumPUPt;  //!< sum pt of charged Particles not from PV  (for Pu corrections)
+      float chargedHadronIso; //charged hadron isolation with dxy,dz match to pv
+      float chargedHadronWorstVtxIso;  //max charged hadron isolation when dxy/dz matching to given vtx
+      float chargedHadronWorstVtxGeomVetoIso; //as chargedHadronWorstVtxIso but an additional geometry based veto cone
+      float chargedHadronPFPVIso; //only considers particles assigned to the primary vertex (PV) by particle flow, corresponds to <10_6 chargedHadronIso
+      float neutralHadronIso; 
+      float photonIso;       
       float sumEcalClusterEt; //sum pt of ecal clusters, vetoing clusters part of photon
       float sumHcalClusterEt; //sum pt of hcal clusters, vetoing clusters part of photon
       PflowIsolationVariables():
 	
-	chargedHadronIso(0),
-	chargedHadronIsoWrongVtx(0),
-	neutralHadronIso(0),
-	photonIso(0),
-        modFrixione(0),
-	sumChargedParticlePt(0),
-      	sumNeutralHadronEtHighThreshold(0),
-	sumPhotonEtHighThreshold(0),
-	sumPUPt(0),
-	sumEcalClusterEt(0),
-	sumHcalClusterEt(0)
+	chargedHadronIso(0.),
+	chargedHadronWorstVtxIso(0.),
+	chargedHadronWorstVtxGeomVetoIso(0.),
+	chargedHadronPFPVIso(0.),
+	neutralHadronIso(0.),
+	photonIso(0.),
+	sumEcalClusterEt(0.),
+	sumHcalClusterEt(0.)
       {}
       
       
@@ -491,13 +491,12 @@ namespace reco {
 
     /// Accessors for Particle Flow Isolation variables 
     float chargedHadronIso() const {return  pfIsolation_.chargedHadronIso;}
-    float chargedHadronIsoWrongVtx() const {return  pfIsolation_.chargedHadronIsoWrongVtx;}
+    float chargedHadronWorstVtxIso() const {return  pfIsolation_.chargedHadronWorstVtxIso;}
+    float chargedHadronWorstVtxGeomVetoIso() const {return  pfIsolation_.chargedHadronWorstVtxGeomVetoIso;}
+    float chargedHadronPFPVIso() const {return  pfIsolation_.chargedHadronPFPVIso;}
     float neutralHadronIso() const {return  pfIsolation_.neutralHadronIso;}
     float photonIso() const {return  pfIsolation_.photonIso;}
-    float sumChargedParticlePt() const {return pfIsolation_.sumChargedParticlePt;}
-    float sumNeutralHadronEtHighThreshold() const {return pfIsolation_.sumNeutralHadronEtHighThreshold;}
-    float sumPhotonEtHighThreshold() const {return pfIsolation_.sumPhotonEtHighThreshold;}
-    float sumPUPt() const {return pfIsolation_.sumPUPt;} 
+    
     
     //backwards compat functions for pat::Photon
     float ecalPFClusterIso() const { return pfIsolation_.sumEcalClusterEt; };
diff --git a/DataFormats/EgammaCandidates/src/GsfElectron.cc b/DataFormats/EgammaCandidates/src/GsfElectron.cc
index 600647967a0ce..2bb17a115565e 100644
--- a/DataFormats/EgammaCandidates/src/GsfElectron.cc
+++ b/DataFormats/EgammaCandidates/src/GsfElectron.cc
@@ -244,4 +244,3 @@ float GsfElectron::p4Error( P4Kind kind ) const
     default: throw cms::Exception("GsfElectron")<<"unexpected p4 kind: "<<kind ;
    }
  }
-
diff --git a/DataFormats/EgammaCandidates/src/classes_def.xml b/DataFormats/EgammaCandidates/src/classes_def.xml
index b6ccb80436975..006e1a5df9c90 100644
--- a/DataFormats/EgammaCandidates/src/classes_def.xml
+++ b/DataFormats/EgammaCandidates/src/classes_def.xml
@@ -38,8 +38,9 @@
   <class name="reco::Photon::FiducialFlags" ClassVersion="10">
    <version ClassVersion="10" checksum="2148735796"/>
   </class>
-  <class name="reco::Photon::ShowerShape" ClassVersion="13">
-   <version ClassVersion="13" checksum="641067911"/>
+  <class name="reco::Photon::ShowerShape" ClassVersion="14">
+    <version ClassVersion="14" checksum="228715893"/>
+    <version ClassVersion="13" checksum="641067911"/>
    <version ClassVersion="12" checksum="1586705784"/>
    <version ClassVersion="11" checksum="2494542444"/>
   </class>
@@ -53,10 +54,18 @@
    <version ClassVersion="10" checksum="3308689624"/>
    <version ClassVersion="11" checksum="3649971983"/>
   </class>
-  <class name="reco::Photon::PflowIsolationVariables"  ClassVersion="13">
+  <class name="reco::Photon::PflowIsolationVariables"  ClassVersion="14">
    <version ClassVersion="11" checksum="3200292660"/>
    <version ClassVersion="12" checksum="114160170"/>
    <version ClassVersion="13" checksum="3959509359"/>
+   <version ClassVersion="14" checksum="4260050122"/>
+   <ioread sourceClass="reco::Photon::PflowIsolationVariables"
+	   version="[1-13]"
+	   source="float chargedHadronIso"
+	   targetClass="reco::Photon::PflowIsolationVariables"
+	   target="chargedHadronPFPVIso">
+     <![CDATA[chargedHadronPFPVIso = onfile.chargedHadronIso;]]>
+   </ioread>
   </class>
   <class name="reco::Photon::PflowIDVariables"  ClassVersion="3">
    <version ClassVersion="3" checksum="2819734289"/>
@@ -169,10 +178,12 @@
    <version ClassVersion="11" checksum="3451347438"/>
    <version ClassVersion="10" checksum="3070677812"/>
   </class>
-  <class name="reco::GsfElectron::IsolationVariables" ClassVersion="10">
+  <class name="reco::GsfElectron::IsolationVariables" ClassVersion="11">
+   <version ClassVersion="11" checksum="1799511018"/>
    <version ClassVersion="10" checksum="4260674990"/>
   </class>
-  <class name="reco::GsfElectron::ConversionRejection" ClassVersion="10">
+  <class name="reco::GsfElectron::ConversionRejection" ClassVersion="11">
+   <version ClassVersion="11" checksum="2813508647"/>
    <version ClassVersion="10" checksum="190549577"/>
   </class>
   <class name="reco::GsfElectron::Corrections" ClassVersion="12">
diff --git a/DataFormats/EgammaTrackReco/BuildFile.xml b/DataFormats/EgammaTrackReco/BuildFile.xml
index 683c67ed0ccce..fdf269fb29421 100644
--- a/DataFormats/EgammaTrackReco/BuildFile.xml
+++ b/DataFormats/EgammaTrackReco/BuildFile.xml
@@ -1,4 +1,3 @@
-<use   name="TrackingTools/PatternTools"/>
 <use   name="DataFormats/Common"/>
 <use   name="DataFormats/TrackReco"/>
 <use   name="clhepheader"/>
diff --git a/DataFormats/FEDRawData/interface/DaqData.h b/DataFormats/FEDRawData/interface/DaqData.h
deleted file mode 100644
index feac014678e90..0000000000000
--- a/DataFormats/FEDRawData/interface/DaqData.h
+++ /dev/null
@@ -1,607 +0,0 @@
-#ifndef FEDRawData_DaqData_h
-#define FEDRawData_DaqData_h
-
-/**  \class DaqData
- *  
- *  This is the basic class accomplishing raw data 
- *  formatting/unformatting.
- *
- *  
- *  1) Creation of a buffer of bytes representing the raw data 
- *
- *  the user must create a DaqData object providing as input the data 
- *  in the form of a vector of unsigned integers. The input data 
- *  are all the values necessary to specify one (or more) object of the given
- *  format, which is the templated type. In case more than one object 
- *  of the same given format should be put in the buffer, then the values 
- *  of the second object must follow in the vector those of the first 
- *  object and so on. DaqData will then compress these values in a bitstream 
- *  according to the desired format. The bitstream is always aligned 
- *  to the byte. 
- *  The user, after successful compression, can request the pointer to the 
- *  beginning of the buffer of bytes that represent the raw data 
- *  (method Buffer() ) and the length of this buffer (method Size() ).  
- *
- *
- *  2) Interpretation of a buffer of bytes representing the raw data
- *
- *  the user must create a DaqData object providing as input a pointer 
- *  to a buffer of bytes and the length in bytes of this buffer. DaqData will 
- *  then extract the values (unsigned integers) present in the buffer 
- *  according to a proper format, which is again the templated type.
- *  After successful uncompression of the buffer, the user can request 
- *  the number of objects of the given format that were present in the buffer 
- *  ( method Nobjects() ) and retrieve the individual values characterizing 
- *  these objects ( method getValue() ).
- *
- *  WARNING: at the moment the interpretation of a buffer of bytes proceeds
- *           through the constructor of DaqData. This operation implies more 
- *           than one copy of the data, which is not the most efficient way 
- *           of accomplishing the task. In a future version of DaqData, 
- *           more efficient methods will be made available.
- *
- *  \author G. Bruno  - CERN, EP Division
- */
-
-
-#include <typeinfo>  
-#include <vector>  
-#include <map>
-#include <string>
-#include <cmath>
-#include <iostream>
-   
-template <class Format>
-class DaqData {
-
- public:
-
-  DaqData(std::vector<unsigned int> & v) : size_(0), buffer_(0), nobjects_(0) {
-
-    try {
-
-      if (v.size() == 0)  throw string("DaqData: empty input data vector provided: ");     
-
-      int Nfields = Format::getNumberOfFields();
-      if (v.size()%Nfields != 0)  throw string("DaqData: ERROR. You must provide a number of input values compatibles with the requested format: ");
-
-
-      int ObjSize = Format::getFieldLastBit(Nfields-1)+1;
-      nobjects_ = v.size()/Nfields;
-      //      cout<<"Going to create "<<nobjects_<< " objects of type "<<typeid(Format).name()<<endl;
-
-      
-      size_ = (int) ceil(((double)(ObjSize*nobjects_))/8);
-      buffer_= new  char[size_];      
-      //   cout<<"The buffer will be "<<size_ <<" bytes long"<<endl; 
-
-      std::vector<unsigned int>::iterator vit = v.begin();
-      char * p = buffer_;
-      int bitsalreadyfilled = 0;
-
-      int Totbytes=1;
-
-      for(int i=0; i<nobjects_; i++) {
-
-	//additional bytes necessary to accomodate the current object
-	int Nbytes = (int) ceil((double)(Format::getFieldLastBit(Nfields-1)+1-8+bitsalreadyfilled)/8); 
-
-	if ((Totbytes+=Nbytes)  > size_) throw string("Exceeded allocated buffer size");
-	
-	compressObject(p, vit, bitsalreadyfilled);
-
-       	// cout<<"Successfully compressed object "<< i <<endl; 
-	  
-	data_.insert(std::pair< int, std::vector<unsigned int> >(i,std::vector<unsigned int>(vit-Nfields,vit) ));
-
-	//the second term is necessary in the case the last byte has been fully used 
-	p+=(Nbytes+(8-bitsalreadyfilled)/8) ;
-	Totbytes+=(8-bitsalreadyfilled)/8 ;
-      }
-      if(bitsalreadyfilled==0) Totbytes--;
-
-      /*
-       cout << "Compression successful. "<< Totbytes<<" bytes compressed in total"<< endl;
-       cout<< "Buffer pointer: "<<hex<< buffer_<< dec << "Size of buffer= "<< size_<<endl;
-      for(int i=0; i<nobjects_; i++) {
-	cout << "Object # "<< i << " fields: " <<endl;
-	for(int j=0; j<Format::getNumberOfFields(); j++) cout << getValue(j,i) <<endl;
-      }
-      */
-
-    }
-
-    catch (std::string s){
-
-      std::cout<<"DaqData - Exception caught: " << s <<endl;
-      std::cout<<"Object compression failed! No data has been constructed for format: "<< string(typeid(Format).name())<<endl;
-      
-    }
-
-  }
-
-
-  DaqData(const unsigned char * ptr, 
-	  int sizeinbytes) : size_(0), buffer_(0), nobjects_(0) {
-
-
-    try {
-
-      if (sizeinbytes==0) throw std::string("Buffer size is zero");
-
-      int Nfields = Format::getNumberOfFields();
-      int ObjSize = Format::getFieldLastBit(Nfields-1)+1;
-      nobjects_ = (sizeinbytes*8)/ObjSize;
-
-      // cout<<"Going to create "<<nobjects_<< " objects of type "<<typeid(Format).name()<<endl;
-      // cout<<"The buffer will be "<<size_ <<" bytes long"<<endl;      
-
-      if ((sizeinbytes*8)%ObjSize != 0) {
-	std::cout<<"DaqData: there will be  " << (sizeinbytes*8)%ObjSize <<" meaningless bits at the end of the buffer"<<endl;
-      }
-
-      //     buffer_ = new char[sizeinbytes];
-      //     memmove(buffer_,ptr,sizeinbytes);
-
-      //      char * p = buffer_;
-
-      const unsigned char * p = ptr;
-      int bitsalreadyfilled = 0;
-      
-      int Totbytes=1;
-
-      for(int i=0; i<nobjects_; i++) {
-
-	std::vector<unsigned int> objdata;
-	objdata.reserve(Nfields);
-
-	//additional bytes necessary to accomodate the current object
-	int Nbytes = (int) ceil((double)(Format::getFieldLastBit(Nfields-1)+1-8+bitsalreadyfilled)/8); 
-
-
-	if ((Totbytes+=Nbytes) > sizeinbytes) throw std::string("Exceeded allocated buffer size");
-
-	
-	uncompressObject(p, objdata, bitsalreadyfilled);
-     
-	//	cout<<"Successfully uncompressed object "<< i <<endl; 
-	data_.insert(std::pair< int, std::vector<unsigned int> >(i,objdata) );
-
-	//the second term is necessary in the case the last byte has been fully used 
-	p+= (Nbytes + (8-bitsalreadyfilled)/8);
-	Totbytes+= (8-bitsalreadyfilled)/8;
-
-      }
-
-      if(bitsalreadyfilled==0) Totbytes--;
-
-      /*
-      cout << "Uncompression succeeded. "<< Totbytes<<" bytes uncompressed in total"<< endl;
-      cout<< "Buffer pointer: "<<hex<< buffer_<< dec<< "Size of buffer= "<< size_<<endl;
-
-      for(int i=0; i<nobjects_; i++) {
-	cout << "Object # "<< i << " fields: " <<endl;
-	for(int j=0; j<Format::getNumberOfFields(); j++) cout << getValue(j,i) <<endl;
-      }
-      */
-
-    }
-    catch (std::string s){
-
-      std::cout<<"DaqData - Exception caught: " << s <<std::endl;
-      std::cout<<"Object uncompression failed! No data has been constructed for format: "<<std::string(typeid(Format).name())<<endl; 
-      
-    }
-
-  }
-
-
-  DaqData(const DaqData & a) {
-
-    size_ = a.Size();
-    buffer_ = new char[size_];
-    memmove(buffer_,a.Buffer(),size_);    
-    nobjects_ = a.Nobjects();
-
-    for(int i=0; i<nobjects_; i++) {
-      std::vector<unsigned int> vec;
-      for(int j=0; j<Format::getNumberOfFields(); j++) vec.push_back(a.getValue(j,i)); 
-      data_.insert(std::pair< int, std::vector<unsigned int> >(i, vec));
-    }
-
-  }
-
-
-  ~DaqData(){
-
-    // cout<<"Deleting DaqData of type "<<typeid(Format).name()<<endl;
-    if (buffer_!=0) delete [] buffer_;
-
-  };
-
-
-  char * Buffer() const {return buffer_;}
-
-  int Size() const {return size_;}
-
-  int Nobjects() const {
-    return nobjects_;
-    /*    cout<<"Nobjects()"<<endl;
-    int Nfields = Format::getNumberOfFields();
-    return size_/(Format::getFieldLastBit(Nfields-1)+1);
-    */
-  }
-
-  unsigned int getValue(int indfield, int indobj=0) const {
-    
-    if (indobj<nobjects_ && indfield < Format::getNumberOfFields()) {
-      std::map < int, std::vector<unsigned int> >::const_iterator it = data_.find(indobj);
-      if (it != data_.end()) return ((*it).second)[indfield];
-      else {
-	std::cout<<"DaqData - Strange: object should exist but was not found "<<endl;
-	return 0;
-      }
-    }
-    else  std::cout<<"DaqData - Non existent field or object"<<endl;
-    return 0;
-
-  }
-
- private:
-
-  void uncompressObject(const  unsigned char * ptr, 
-			std::vector<unsigned int> & objdata, 
-			int & bitsalreadyfilled) {
-
-    int Nfields = Format::getNumberOfFields();
-
-    int bitstoaccomodate=Format::getFieldLastBit(0)+1; // of current field
-
-    int ifield = 0;
-    unsigned int value = 0; 
-
-    while (ifield < Nfields) {
-
-      if(bitstoaccomodate > 8 - bitsalreadyfilled ) {
-
-       	// cout<<"can't complete value from current byte"<<endl;
-	// cout <<"bitstoaccomodate= "<<bitstoaccomodate<<" bitsalreadyfilled= "<<bitsalreadyfilled<<" ifield="<< ifield<<" Nfields="<<Nfields<<endl;
-
-	//1)The syntax below could be faster. 
-	//  To be checked as soon as time available(check started with prog test4.C) .
-	//2)check if all cast to unsigned int are really necessary(done, they are not).
-	//3)Instead of using pow(2,1;2;3;4;5..), a faster enum could be used
-	//Lower all bits but those not yet read
-	//value += ( (*ptr & ((unsigned int)pow(2.,8-bitsalreadyfilled)-1)) << bitstoaccomodate + bitsalreadyfilled - 8 ) ;
-	//       	if(bitstoaccomodate > 8) value += ( ((((unsigned int)(*ptr)) << bitsalreadyfilled) & 0xff) << (bitstoaccomodate - 8) );
-	// 	else value += ( ((((unsigned int)(*ptr)) << bitsalreadyfilled) & 0xff) >> (8 - bitstoaccomodate) );
-
-
-	if(bitstoaccomodate > 8) value += ( ( (*ptr << bitsalreadyfilled) & 0xff ) << (bitstoaccomodate - 8) );
-       	else value += ( ( (*ptr << bitsalreadyfilled) & 0xff) >> (8 - bitstoaccomodate) );
-	
-
-       	// cout<< "value: "<< hex << value << " - " << dec <<  value<< endl;
-       	// cout<< "byte: "<< hex << (unsigned int)(*ptr) << " - " << dec << (unsigned int)(*ptr) << endl;
-
-
-	ptr++;
-	bitstoaccomodate -= (8-bitsalreadyfilled);
-	bitsalreadyfilled = 0;
-
-      	// cout <<"bitstoaccomodate= "<<bitstoaccomodate<<" bitsalreadyfilled= "<<bitsalreadyfilled<<" ifield="<< ifield<<" Nfields="<<Nfields<<endl;
-	
-      } 
-
-      else if(bitstoaccomodate < (8 - bitsalreadyfilled) && bitstoaccomodate >0){
-       	// cout<<"value can be completed from current byte, which still contain info"<<endl;
-
-       	// cout <<"bitstoaccomodate= "<<bitstoaccomodate<<" bitsalreadyfilled= "<<bitsalreadyfilled<<" ifield="<< ifield<<" Nfields="<<Nfields<<endl;
-
-	//1)The syntax below could be faster. 
-	//  To be checked as soon as time available.
-	//2)check if all cast to unsigned int are really necessary.
-	//3)Instead of using pow(2,1;2;3;4;5..), a faster enum could be used
-	//Lower all bits but those not yet read
-	//value += (*ptr & ((unsigned int)pow(2.,8-bitsalreadyfilled)-1)) >> (8 - bitstoaccomodate - bitsalreadyfilled);
-
-       	value += ( ( (*ptr << bitsalreadyfilled) & 0xff ) >> (8 - bitstoaccomodate) ) ;
-
-       	// cout<< "value: "<< hex << value << " - " << dec <<  value<< endl;
-       	// cout<< "byte: "<< hex << (unsigned int)(*ptr) << " - " << dec << (unsigned int)(*ptr) << endl;
-
-
-	objdata.push_back(value);
-	value = 0;
-	bitsalreadyfilled+=bitstoaccomodate;
-
-       	// cout<<"Field completed"<<endl;
-
-	if(ifield==Nfields-1) return;
-       
-       	// cout<<"Uncompressing new Field"<<endl;
-
-	ifield++;
-	bitstoaccomodate=Format::getFieldLastBit(ifield)-Format::getFieldLastBit(ifield-1); 
-	
-       	// cout <<"bitstoaccomodate= "<<bitstoaccomodate<<" bitsalreadyfilled= "<<bitsalreadyfilled<<" ifield="<< ifield<<" Nfields="<<Nfields<<endl;
-
-      }
-
-      else if(bitstoaccomodate == (8 - bitsalreadyfilled) && bitstoaccomodate >0){
-       	// cout<<"value can be completed from what left in current byte"<<endl; 
-       	// cout <<"bitstoaccomodate= "<<bitstoaccomodate<<" bitsalreadyfilled= "<<bitsalreadyfilled<<" ifield="<< ifield<<" Nfields="<<Nfields<<endl;
-
-	//1)The syntax below could be faster. 
-	//  To be checked as soon as time available.
-	//2)check if all cast to unsigned int are really necessary.
-	//3)Instead of using pow(2,1;2;3;4;5..), a faster enum could be used
-	//Lower all bits but those not yet read
-	//	value += *ptr & ((unsigned int)pow(2.,8-bitsalreadyfilled)-1);
-
-       	value += ( ( (*ptr << bitsalreadyfilled) & 0xff ) >> (8 - bitstoaccomodate) ) ;
-
-       	// cout<< "value: "<< hex << value << " - " << dec <<  value<< endl;
-       	// cout<< "byte: "<< hex << (unsigned int)(*ptr) << " - " << dec << (unsigned int)(*ptr) << endl;
-
-
-	objdata.push_back(value);
-	value = 0;
-	bitsalreadyfilled=0;
-
-       	// cout<<"Field completed"<<endl;
-
-	if(ifield==Nfields-1) return;
-
-       	// cout<<"Uncompressing new Field"<<endl;
-
-	ptr++;
-	ifield++;
-	bitstoaccomodate=Format::getFieldLastBit(ifield)-Format::getFieldLastBit(ifield-1); 	
-
-       	// cout <<"bitstoaccomodate= "<<bitstoaccomodate<<" bitsalreadyfilled= "<<bitsalreadyfilled<<" ifield="<< ifield<<" Nfields="<<Nfields<<endl;
-
-      }
-      else throw std::string(" unexpected situation during uncompression");
-
-    } //end of cycle over fields
-    
-  }
-
-
-
-
-  void compressObject(const unsigned char * ptr, std::vector<unsigned int>::iterator & vit, int & bitsalreadyfilled) {
-
-    int Nfields = Format::getNumberOfFields();
-
-    int bitstoaccomodate=Format::getFieldLastBit(0)+1; // of current field
-    
-    if (*vit > pow(2.,bitstoaccomodate)-1) throw string("The value is too large to fit in the field ");
- 
-    int ifield = 0;
-
-    //Lower all bits but those already filled
-    *ptr &= 0xff + 1 - (unsigned int)pow(2.,8-bitsalreadyfilled);
-
-    while (ifield < Nfields) {
-
-
-      if(bitstoaccomodate > 8 - bitsalreadyfilled ) {
-
-       	// cout<<"Field cannot be compressed from what left in current byte"<<endl;
-	// cout <<"bitstoaccomodate= "<<bitstoaccomodate<<" bitsalreadyfilled= "<<bitsalreadyfilled<<" ifield="<< ifield<<" Nfields="<<Nfields<<endl;
-
-	*ptr += (((*vit) >> (bitstoaccomodate - (8 - bitsalreadyfilled))) & 0xff);
-	// cout<< "value: "<< hex << *vit <<" - " << dec <<  *vit<< endl;
-	// cout<< "byte: "<< hex << (unsigned int)(*ptr) <<" - "<< dec << (unsigned int)(*ptr) << endl;
-
-
-	bitstoaccomodate -= (8-bitsalreadyfilled);
-	bitsalreadyfilled = 0;
-	ptr++;
-	*ptr &= 0xff + 1 - (unsigned int)pow(2.,8-bitsalreadyfilled);
-
-	// cout <<"bitstoaccomodate= "<<bitstoaccomodate<<" bitsalreadyfilled= "<<bitsalreadyfilled<<" ifield="<< ifield<<" Nfields="<<Nfields<<endl;
-
-      } 
-
-      else if(bitstoaccomodate < (8 - bitsalreadyfilled) && bitstoaccomodate >0){
-
-	// cout<<"Field can be compressed in the current byte, which will not be completely filled"<<endl;
-
-	*ptr += ( (((*vit) << 8-bitstoaccomodate) & 0xff) >> (bitsalreadyfilled) );
-
-	// cout <<"bitstoaccomodate= "<<bitstoaccomodate<<" bitsalreadyfilled= "<<bitsalreadyfilled<<" ifield="<< ifield<<" Nfields="<<Nfields<<endl;
-	// cout<< "value: "<< hex << *vit <<" - " << dec <<  *vit<< endl;
-	// cout<< "byte: "<< hex << (unsigned int)(*ptr) <<" - "<< dec << (unsigned int)(*ptr) << endl;
-
-	vit++;
-	bitsalreadyfilled+=bitstoaccomodate;
-
-	// cout<<"Field completed"<<endl;
-
-	if(ifield==Nfields-1) return;
-
-	// cout<<"Compressing new Field"<<endl;
-       
-	ifield++;
-	bitstoaccomodate=Format::getFieldLastBit(ifield)-Format::getFieldLastBit(ifield-1); 
-	if (*vit > pow(2.,bitstoaccomodate)-1) throw string("The value is too large to fit in the field ");
-
-	// cout <<"bitstoaccomodate= "<<bitstoaccomodate<<" bitsalreadyfilled= "<<bitsalreadyfilled<<" ifield="<< ifield<<" Nfields="<<Nfields<<endl;
-
-      }
-
-      else if(bitstoaccomodate == (8 - bitsalreadyfilled) && bitstoaccomodate >0){
-
-	// cout<<"Field can be compressed in the current byte, which will be completely filled"<<endl;
-
-
-	*ptr += ( (((*vit) << 8-bitstoaccomodate) & 0xff) >> (bitsalreadyfilled) );
-
-	// cout <<"bitstoaccomodate= "<<bitstoaccomodate<<" bitsalreadyfilled= "<<bitsalreadyfilled<<" ifield="<< ifield<<" Nfields="<<Nfields<<endl;
-	// cout<< "value: "<< hex << *vit <<" - " << dec <<  *vit<< endl;
-	// cout<< "byte: "<< hex << (unsigned int)(*ptr) <<" - "<< dec << (unsigned int)(*ptr) << endl;
-
-	vit++;
-	bitsalreadyfilled=0;
-
-	// cout<<"Field completed"<<endl;
-
-	if(ifield==Nfields-1) return;
-
-	// cout<<"Compressing new Field"<<endl;
-
-	ptr++;
-	*ptr &= 0xff + 1 - (unsigned int)pow(2.,8-bitsalreadyfilled);
-
-	ifield++;
-	bitstoaccomodate=Format::getFieldLastBit(ifield)-Format::getFieldLastBit(ifield-1); 	
-
-	if (*vit > pow(2.,bitstoaccomodate)-1) throw string("The value is too large to fit in the field ");
-
-	// cout <<"bitstoaccomodate= "<<bitstoaccomodate<<" bitsalreadyfilled= "<<bitsalreadyfilled<<" ifield="<< ifield<<" Nfields="<<Nfields<<endl;
-
-      }
-      else throw string(" unexpected situation during compression");
-
-    } //end of cycle over fields
-    
-  }
-
-
- private:
-
-  std::map < int, std::vector<unsigned int> > data_;
-
-  int size_;
-  unsigned char * buffer_;
-  int nobjects_;
-
-  /* Old implementation of compress
- 
-  //assumes a correct number of objects has been sent. Alignment to the byte
-  int compressObject(unsigned char * p, vector<unsigned int>::iterator & vit, int & bitsalreadyfilled){
- 
-    int Nfields = Format::getNumberOfFields();
-    int Nbytes = (int) (ceil((double)(Format::getFieldLastBit(Nfields-1)+1)/8));
- 
-    unsigned int indfield=0; // index of current field
-    unsigned int bitstoaccomodate=Format::getFieldLastBit(indfield)+1; // of current field
-
-    //Here there should be a check on the size of the first value against the available bits
-
-    for (int ibyte = 0; ibyte < Nbytes ; ibyte++){
-
-      //      int bitsalreadyfilled = 0; // of current byte
-
-      if(bitstoaccomodate>8-bitsalreadyfilled) {
-	cout<<"More than available bits to accomodate"<<endl;
-
-	*p = ( (*vit) >> (bitstoaccomodate - 8) ) & 0xff;
-	cout<< "value: "<< hex << *vit << dec <<  *vit<< endl;
-	cout<< "byte: "<< hex << *p << dec << *p << endl;
-
-	bitstoaccomodate -= 8;
-	p++;
-	bitsalreadyfilled = 0;     
-      } 
-
-      else if(bitstoaccomodate<=8-bitsalreadyfilled && bitstoaccomodate>0){
-
-	cout<<"bits to accomodate less than available"<<endl;
-
-	unsigned int bytevalue=0;
-
-	// First, put the bits of the current object in the current byte
-	
-	bytevalue += ( (*vit) << ( 8 - bitstoaccomodate ) ) & 0xff;
-	cout<< "value: "<< hex << *vit << dec <<  *vit<< endl;
-	cout<< "byte: "<< hex << bytevalue << dec << bytevalue << endl;
-
-
-	bitsalreadyfilled = bitstoaccomodate;
-	indfield++;
-
-	if (indfield>=Nfields)  return 0;
-       
-	vit++;
-
-	//Here there should be a check on the size of the current value against the left available bits
-
-	if(bitsalreadyfilled==8) {
-	  bitstoaccomodate=Format::getFieldLastBit(indfield)-Format::getFieldLastBit(indfield-1);
-	  p++;
-	  continue;
-	}
-
-	//This is the case of remaining fields and space left in the byte
-      
-	//Compute the last field that can be treated for this byte
-	int lastfield=indfield;
-	int ntotbits=bitsalreadyfilled+Format::getFieldLastBit(indfield)-Format::getFieldLastBit(indfield-1);
-	while(ntotbits < 8 && lastfield<Nfields )  {
-	  lastfield++;
-	  ntotbits+=Format::getFieldLastBit(lastfield)-Format::getFieldLastBit(lastfield-1);
-	}
-
-	// First, fit fields, if there are, that for sure fully fit into the current byte leaving at least one free bit
-	for(; indfield < lastfield  ; indfield++) {
-	  bitsalreadyfilled += Format::getFieldLastBit(indfield)-Format::getFieldLastBit(indfield-1);
-	  
-	  bytevalue += ((*vit)<<(8-bitsalreadyfilled)) ;
-	  cout<< "value: "<< hex << *vit << dec <<  *vit<< endl;
-	  cout<< "byte: "<< hex << bytevalue << dec << bytevalue << endl;
-	  
-	  if(indfield<Nfields-1) {
-	    vit++;
-	    //Here there should be a check on the size of the current value against the left available bits.
-	  }
-	  else return 0;
-	}
-
-	//Special treatment of last field having at least some space in the byte. At this point it should always be indfield==lastfield 
-	
-	int lastfieldbits=Format::getFieldLastBit(indfield)-Format::getFieldLastBit(indfield-1);
-	bitstoaccomodate = lastfieldbits - (8-bitsalreadyfilled);
-	
-	bytevalue += ((*vit) >> (lastfieldbits - (8-bitsalreadyfilled))) ; 
-	cout<< "value: "<< hex << *vit << dec <<  *vit<< endl;
-	cout<< "byte: "<< hex << bytevalue << dec << bytevalue << endl;
-	
-	*p=bytevalue;
-	
-	//Treatment of the case in which the last field fits too in the current byte
-	if (bitstoaccomodate==0) {
-
-	  if (indfield < Nfields-1) {
-
-	    indfield++;
-	    vit++;
-
-	    //Here there should be a check on the size of the current value against the left available bits.
-	    
-	    bitstoaccomodate=Format::getFieldLastBit(indfield)-Format::getFieldLastBit(indfield-1);
-	  }
-	  else return 0;
-	}
-	p++;
-      }
-      else{
-	cout<<"DaqData - ERROR: unexpected situation"<<endl;
-      }
-    } //end of cycle over bytes
-  
-    return 0;
-
-  }
-
-*/
-
-
-
-};
-
-
-#endif
diff --git a/DataFormats/FP420Digi/interface/DigiCollectionFP420.h b/DataFormats/FP420Digi/interface/DigiCollectionFP420.h
index 20c1f6f0f5464..224c08c60dd12 100644
--- a/DataFormats/FP420Digi/interface/DigiCollectionFP420.h
+++ b/DataFormats/FP420Digi/interface/DigiCollectionFP420.h
@@ -12,39 +12,33 @@
 #include <iostream>
 
 class DigiCollectionFP420 {
-
- public:
-  
+public:
   typedef std::vector<HDigiFP420>::const_iterator ContainerIterator;
   typedef std::pair<ContainerIterator, ContainerIterator> Range;
   typedef std::pair<unsigned int, unsigned int> IndexRange;
   typedef std::map<unsigned int, IndexRange> Registry;
   typedef std::map<unsigned int, IndexRange>::const_iterator RegistryIterator;
-  typedef std::map< unsigned int, std::vector<HDigiFP420> > HDigiFP420Container; 
+  typedef std::map<unsigned int, std::vector<HDigiFP420> > HDigiFP420Container;
 
   DigiCollectionFP420() {}
-  
+
   void put(Range input, unsigned int detID);
   const Range get(unsigned int detID) const;
   const Range get1(unsigned int detID) const;
   const std::vector<unsigned int> detIDs() const;
 
-  void add( unsigned int& det_id, std::vector<HDigiFP420>& digis ); 
-  void digis( unsigned int& det_id, std::vector<HDigiFP420>& digis ) const; 
-  void detIDs( std::vector<unsigned int>& det_ids ) const; 
+  void add(unsigned int& det_id, std::vector<HDigiFP420>& digis);
+  void digis(unsigned int& det_id, std::vector<HDigiFP420>& digis) const;
+  void detIDs(std::vector<unsigned int>& det_ids) const;
 
   void putclear(Range input, unsigned int detID);
   void clear();
- private:
 
+private:
   std::vector<HDigiFP420> container_;
   Registry map_;
 
-  HDigiFP420Container digiMap_; 
-
-
+  HDigiFP420Container digiMap_;
 };
 
-#endif 
-
-
+#endif
diff --git a/DataFormats/FP420Digi/interface/HDigiFP420.h b/DataFormats/FP420Digi/interface/HDigiFP420.h
index 5f4855d9e8f13..0bff49a292ac3 100644
--- a/DataFormats/FP420Digi/interface/HDigiFP420.h
+++ b/DataFormats/FP420Digi/interface/HDigiFP420.h
@@ -3,37 +3,34 @@
 
 class HDigiFP420 {
 public:
-
   //typedef unsigned int ChannelType;
 
-  HDigiFP420() : strip_(0), adc_(0) {
-}
+  HDigiFP420() : strip_(0), adc_(0) {}
 
-  HDigiFP420( int strip, int adc) : strip_(strip), adc_(adc) {
-}
-    HDigiFP420( short strip, short adc) : strip_(strip), adc_(adc) {
-//    numStripsY = 200;        // Y plane number of strips:200*0.050=10mm (zside=1) H
-//    numStripsX = 400;        // X plane number of strips:400*0.050=20mm (zside=2) V
-}
+  HDigiFP420(int strip, int adc) : strip_(strip), adc_(adc) {}
+  HDigiFP420(short strip, short adc) : strip_(strip), adc_(adc) {
+    //    numStripsY = 200;        // Y plane number of strips:200*0.050=10mm (zside=1) H
+    //    numStripsX = 400;        // X plane number of strips:400*0.050=20mm (zside=2) V
+  }
 
   // Access to digi information
-  int strip() const   {return strip_;}
-  int adc() const     {return adc_;}
-  int channel() const {return strip();}
+  int strip() const { return strip_; }
+  int adc() const { return adc_; }
+  int channel() const { return strip(); }
 
-  int stripVW() const {return (strip_/numStripsX);}
+  int stripVW() const { return (strip_ / numStripsX); }
   //int stripVW() const {return (strip_/401);}
-  int stripV() const {return (strip_-stripVW()*numStripsX);}
+  int stripV() const { return (strip_ - stripVW() * numStripsX); }
   //int stripHW() const {return (strip_/201) ;}
-  int stripHW() const {return (strip_/numStripsY) ;}
-  int stripH() const {return (strip_-stripHW()*numStripsY) ;}
+  int stripHW() const { return (strip_ / numStripsY); }
+  int stripH() const { return (strip_ - stripHW() * numStripsY); }
   //                                             //
   //		  int iy= istrip.channel()/numStripsY;
   //		  int ix= istrip.channel() - iy*numStripsY;
   //                                             //
 private:
-  static const int  numStripsY = 144;        // Y plate number of strips:144*0.050=7.2mm (xytype=1)
-  static const int  numStripsX = 160;        // X plate number of strips:160*0.050=8.0mm (xytype=2)
+  static const int numStripsY = 144;  // Y plate number of strips:144*0.050=7.2mm (xytype=1)
+  static const int numStripsX = 160;  // X plate number of strips:160*0.050=8.0mm (xytype=2)
   //static const int  numStripsY= 200 ;        // Y plate number of strips:200*0.050=10mm (zside=1)
   //static const int  numStripsX= 400 ;        // X plate number of strips:400*0.050=20mm (zside=2)
   short strip_;
@@ -41,9 +38,7 @@ class HDigiFP420 {
 };
 
 // Comparison operators
-inline bool operator<( const HDigiFP420& one, const HDigiFP420& other) {
-  return one.channel() < other.channel();
-}
+inline bool operator<(const HDigiFP420& one, const HDigiFP420& other) { return one.channel() < other.channel(); }
 //std::ostream& operator<<(std::ostream& s, const HDigiFP420& hit) {
 //  return s << hit.channel() << ": " << hit.adc() << " adc, " << hit.strip() << " number";
 //}
diff --git a/DataFormats/FP420Digi/src/DigiCollectionFP420.cc b/DataFormats/FP420Digi/src/DigiCollectionFP420.cc
index fc04df4a88296..6a448227c3b2b 100644
--- a/DataFormats/FP420Digi/src/DigiCollectionFP420.cc
+++ b/DataFormats/FP420Digi/src/DigiCollectionFP420.cc
@@ -2,7 +2,7 @@
 // File: DigiCollectionFP420.cc
 // Date: 12.2006
 // Description: DigiCollectionFP420 for FP420
-// Modifications: 
+// Modifications:
 ///////////////////////////////////////////////////////////////////////////////
 //#include "SimRomanPot/SimFP420/interface/DigiCollectionFP420.h"
 //#include "SimRomanPot/DataFormats/interface/DigiCollectionFP420.h"
@@ -14,211 +14,188 @@
 
 void DigiCollectionFP420::put(Range input, unsigned int detID) {
   // put in Digis of detID
-  
+
   // store size of vector before put
   IndexRange inputRange;
-  
+
   // put in HDigiFP420s from input
   bool first = true;
-  
+
   // fill input in temporary vector for sorting
   std::vector<HDigiFP420> temporary;
   DigiCollectionFP420::ContainerIterator sort_begin = input.first;
   DigiCollectionFP420::ContainerIterator sort_end = input.second;
 #ifdef mydigidebug
-  std::cout <<"   !!!!!!!!!!!!!!!!    DigiCollectionFP420:: !!!!  put !!!!  start detID=" << detID << std::endl;
+  std::cout << "   !!!!!!!!!!!!!!!!    DigiCollectionFP420:: !!!!  put !!!!  start detID=" << detID << std::endl;
 #endif
-  for ( ;sort_begin != sort_end; ++sort_begin ) {
+  for (; sort_begin != sort_end; ++sort_begin) {
     temporary.push_back(*sort_begin);
 #ifdef mydigidebug
-    std::cout <<"digi put: temporary.push_back " << std::endl;
+    std::cout << "digi put: temporary.push_back " << std::endl;
 #endif
-  } // for
-  std::sort(temporary.begin(),temporary.end());
-  
+  }  // for
+  std::sort(temporary.begin(), temporary.end());
+
   // iterators over input
   DigiCollectionFP420::ContainerIterator begin = temporary.begin();
   DigiCollectionFP420::ContainerIterator end = temporary.end();
-  for ( ;begin != end; ++begin ) {
+  for (; begin != end; ++begin) {
     container_.push_back(*begin);
-    if ( first ) {
-      inputRange.first = container_.size()-1;
+    if (first) {
+      inputRange.first = container_.size() - 1;
 #ifdef mydigidebug
-      std::cout <<"digi put:first  container_.size() = " << container_.size() << std::endl;
-      std::cout <<"digi put:first  inputRange.first = " << inputRange.first << std::endl;
+      std::cout << "digi put:first  container_.size() = " << container_.size() << std::endl;
+      std::cout << "digi put:first  inputRange.first = " << inputRange.first << std::endl;
 #endif
       first = false;
-    } // if
-  } //for
-  
+    }  // if
+  }    //for
+
   // since we start from 0, then the last element will be size-1
-  if(!container_.empty()) {
-    inputRange.second = container_.size()-1;
-  }
-  else {
+  if (!container_.empty()) {
+    inputRange.second = container_.size() - 1;
+  } else {
     inputRange.first = container_.size();
     inputRange.second = container_.size();
   }
 #ifdef mydigidebug
-  std::cout <<"digi put: container_.size() = " << container_.size() << std::endl;
-  std::cout <<"digi put:  inputRange.first = " << inputRange.first << std::endl;
-  std::cout <<"digi put:  inputRange.second = " << inputRange.second << std::endl;
+  std::cout << "digi put: container_.size() = " << container_.size() << std::endl;
+  std::cout << "digi put:  inputRange.first = " << inputRange.first << std::endl;
+  std::cout << "digi put:  inputRange.second = " << inputRange.second << std::endl;
 #endif
-  
+
   // fill map
   map_[detID] = inputRange;
-  
 }
 
-
-void DigiCollectionFP420::clear() {
-  container_.clear();
-}
+void DigiCollectionFP420::clear() { container_.clear(); }
 void DigiCollectionFP420::putclear(DigiCollectionFP420::Range input, unsigned int detID) {
-  
   DigiCollectionFP420::IndexRange inputRange;
-  
+
   std::vector<HDigiFP420> temporary;
   DigiCollectionFP420::ContainerIterator sort_begin = input.first;
   DigiCollectionFP420::ContainerIterator sort_end = input.second;
-  for ( ;sort_begin != sort_end; ++sort_begin ) {
+  for (; sort_begin != sort_end; ++sort_begin) {
     temporary.push_back(*sort_begin);
   }
-  std::sort(temporary.begin(),temporary.end());
-  
+  std::sort(temporary.begin(), temporary.end());
+
   //	temporary.clear();
   DigiCollectionFP420::ContainerIterator begin = temporary.begin();
   DigiCollectionFP420::ContainerIterator end = temporary.end();
-  for ( ;begin != end; ++begin ) {
+  for (; begin != end; ++begin) {
     container_.push_back(*begin);
   }
   //container_.clear();
-  inputRange.first = container_.size()-container_.size();
-  inputRange.second = container_.size()-container_.size();
-  
+  inputRange.first = container_.size() - container_.size();
+  inputRange.second = container_.size() - container_.size();
+
 #ifdef mydigidebug
-  std::cout <<"digi putclear: container_.size() = " << container_.size() << std::endl;
-  std::cout <<"digi putclear:  inputRange.first = " << inputRange.first << std::endl;
-  std::cout <<"digi putclear:  inputRange.second = " << inputRange.second << std::endl;
+  std::cout << "digi putclear: container_.size() = " << container_.size() << std::endl;
+  std::cout << "digi putclear:  inputRange.first = " << inputRange.first << std::endl;
+  std::cout << "digi putclear:  inputRange.second = " << inputRange.second << std::endl;
 #endif
-  
-  
+
   map_[detID] = inputRange;
 }
 
-
-
-
-
-
 const DigiCollectionFP420::Range DigiCollectionFP420::get(unsigned int detID) const {
   // get Digis of detID
-  
+
 #ifdef mydigidebug
-  std::cout <<"DigiCollectionFP420::get1:detID= " << detID << std::endl;
+  std::cout << "DigiCollectionFP420::get1:detID= " << detID << std::endl;
 #endif
   auto found = map_.find(detID);
-  if(found == map_.end()) {
-    return DigiCollectionFP420::Range{container_.begin(),container_.begin()};
+  if (found == map_.end()) {
+    return DigiCollectionFP420::Range{container_.begin(), container_.begin()};
   }
 
   DigiCollectionFP420::IndexRange returnIndexRange = found->second;
   //
   DigiCollectionFP420::Range returnRange;
-  returnRange.first  = container_.begin()+returnIndexRange.first;
-  if(returnIndexRange.second != 0 ) {
-    returnRange.second = container_.begin()+returnIndexRange.second+1;
-  }else{
-    returnRange.second = container_.begin()+returnIndexRange.second;
+  returnRange.first = container_.begin() + returnIndexRange.first;
+  if (returnIndexRange.second != 0) {
+    returnRange.second = container_.begin() + returnIndexRange.second + 1;
+  } else {
+    returnRange.second = container_.begin() + returnIndexRange.second;
   }
-  
+
 #ifdef mydigidebug
-  std::cout <<"digi get1: container_.size() = " << container_.size() << std::endl;
-  std::cout <<"digi get1: returnIndexRange.first= " << returnIndexRange.first << std::endl;
-  std::cout <<"digi get1: returnIndexRange.second= " << returnIndexRange.second << std::endl;
+  std::cout << "digi get1: container_.size() = " << container_.size() << std::endl;
+  std::cout << "digi get1: returnIndexRange.first= " << returnIndexRange.first << std::endl;
+  std::cout << "digi get1: returnIndexRange.second= " << returnIndexRange.second << std::endl;
 #endif
   return returnRange;
 }
 
-
 const DigiCollectionFP420::Range DigiCollectionFP420::get1(unsigned int detID) const {
   // get Digis of detID
-  
+
 #ifdef mydigidebug
-  std::cout <<"DigiCollectionFP420::get :detID= " << detID << std::endl;
+  std::cout << "DigiCollectionFP420::get :detID= " << detID << std::endl;
 #endif
   DigiCollectionFP420::RegistryIterator returnIndex = map_.find(detID);
   DigiCollectionFP420::IndexRange returnIndexRange = returnIndex->second;
 #ifdef mydigidebug
-  std::cout <<"DigiCollectionFP420::get : returnIndexRange.first= " << returnIndexRange.first << std::endl;
-  std::cout <<"DigiCollectionFP420::get : returnIndexRange.second= " << returnIndexRange.second << std::endl;
+  std::cout << "DigiCollectionFP420::get : returnIndexRange.first= " << returnIndexRange.first << std::endl;
+  std::cout << "DigiCollectionFP420::get : returnIndexRange.second= " << returnIndexRange.second << std::endl;
 #endif
-  
+
   DigiCollectionFP420::Range returnRange;
-  returnRange.first  = container_.begin()+returnIndexRange.first;
-  if(returnIndexRange.second != 0 ) {
-    returnRange.second = container_.begin()+returnIndexRange.second+1;
-  }else{
-    returnRange.second = container_.begin()+returnIndexRange.second;
+  returnRange.first = container_.begin() + returnIndexRange.first;
+  if (returnIndexRange.second != 0) {
+    returnRange.second = container_.begin() + returnIndexRange.second + 1;
+  } else {
+    returnRange.second = container_.begin() + returnIndexRange.second;
   }
 #ifdef mydigidebug
-  std::cout <<"DigiCollectionFP420::get : container_.size() = " << container_.size() << std::endl;
-  std::cout <<"DigiCollectionFP420::get : returnIndexRange.first= " << returnIndexRange.first << std::endl;
-  std::cout <<"DigiCollectionFP420::get : returnIndexRange.second= " << returnIndexRange.second << std::endl;
+  std::cout << "DigiCollectionFP420::get : container_.size() = " << container_.size() << std::endl;
+  std::cout << "DigiCollectionFP420::get : returnIndexRange.first= " << returnIndexRange.first << std::endl;
+  std::cout << "DigiCollectionFP420::get : returnIndexRange.second= " << returnIndexRange.second << std::endl;
 #endif
   return returnRange;
 }
 
-
-
-
-
-
-
 const std::vector<unsigned int> DigiCollectionFP420::detIDs() const {
   // returns vector of detIDs in map
-  
+
   DigiCollectionFP420::RegistryIterator begin = map_.begin();
-  DigiCollectionFP420::RegistryIterator end   = map_.end();
-  
+  DigiCollectionFP420::RegistryIterator end = map_.end();
+
 #ifdef mydigidebug
-  std::cout <<"DigiCollectionFP420::detIDs:start " << std::endl;
+  std::cout << "DigiCollectionFP420::detIDs:start " << std::endl;
 #endif
   std::vector<unsigned int> output;
-  
+
   for (; begin != end; ++begin) {
     output.push_back(begin->first);
   }
-  
+
   return output;
-  
 }
 
 // -----------------------------------------------------------------------------
 // Appends HDigiFP420s to the vector of the given DetId.
-void DigiCollectionFP420::add( unsigned int& det_id, 
-			       std::vector<HDigiFP420>& digis ) {
-  
+void DigiCollectionFP420::add(unsigned int& det_id, std::vector<HDigiFP420>& digis) {
 #ifdef mydigidebug
-  std::cout <<"DigiCollectionFP420::add:    det_id=    " << det_id << std::endl;
+  std::cout << "DigiCollectionFP420::add:    det_id=    " << det_id << std::endl;
 #endif
-  digiMap_[det_id].reserve( digiMap_[det_id].size() + digis.size() );
-  if ( digiMap_[det_id].empty() ) { 
+  digiMap_[det_id].reserve(digiMap_[det_id].size() + digis.size());
+  if (digiMap_[det_id].empty()) {
     digiMap_[det_id] = digis;
   } else {
-    copy( digis.begin(), digis.end(), back_inserter(digiMap_[det_id]) );
+    copy(digis.begin(), digis.end(), back_inserter(digiMap_[det_id]));
   }
 }
 
 // -----------------------------------------------------------------------------
 // Returns (by reference) all Digis for a given DetId.
-void DigiCollectionFP420::digis( unsigned int& det_id,
-				 std::vector<HDigiFP420>& digis ) const {
+void DigiCollectionFP420::digis(unsigned int& det_id, std::vector<HDigiFP420>& digis) const {
 #ifdef mydigidebug
-  std::cout <<"DigiCollectionFP420::digis:det_id= " << det_id << std::endl;
+  std::cout << "DigiCollectionFP420::digis:det_id= " << det_id << std::endl;
 #endif
-  auto found = digiMap_.find( det_id );
-  if ( found != digiMap_.end() ) { 
+  auto found = digiMap_.find(det_id);
+  if (found != digiMap_.end()) {
     digis = found->second;
   } else {
     digis = std::vector<HDigiFP420>();
@@ -227,14 +204,14 @@ void DigiCollectionFP420::digis( unsigned int& det_id,
 
 // -----------------------------------------------------------------------------
 // Returns (by reference) vector of DetIds with Digis.
-void DigiCollectionFP420::detIDs( std::vector<unsigned int>& det_ids ) const {
-  det_ids.clear(); 
-  det_ids.reserve( static_cast<unsigned int>(digiMap_.size()) );
+void DigiCollectionFP420::detIDs(std::vector<unsigned int>& det_ids) const {
+  det_ids.clear();
+  det_ids.reserve(static_cast<unsigned int>(digiMap_.size()));
 #ifdef mydigidebug
-  std::cout <<"DigiCollectionFP420::  detIDs:  digiMap    size= " << digiMap_.size() << std::endl;
+  std::cout << "DigiCollectionFP420::  detIDs:  digiMap    size= " << digiMap_.size() << std::endl;
 #endif
   HDigiFP420Container::const_iterator iter;
-  for (iter = digiMap_.begin(); iter != digiMap_.end(); iter++ ) {
-    det_ids.push_back( iter->first );
+  for (iter = digiMap_.begin(); iter != digiMap_.end(); iter++) {
+    det_ids.push_back(iter->first);
   }
 }
diff --git a/DataFormats/FP420Digi/src/classes.h b/DataFormats/FP420Digi/src/classes.h
index 2fa8633cd8eeb..b813493e869b0 100644
--- a/DataFormats/FP420Digi/src/classes.h
+++ b/DataFormats/FP420Digi/src/classes.h
@@ -10,5 +10,4 @@
 #include <vector>
 #include <string>
 
-
-#endif // HDigiFP420_CLASSES_H
+#endif  // HDigiFP420_CLASSES_H
diff --git a/DataFormats/GeometryCommonDetAlgo/interface/DeepCopyPointer.h b/DataFormats/GeometryCommonDetAlgo/interface/DeepCopyPointer.h
index 3b298d75a1f3b..497a0bb7344c8 100644
--- a/DataFormats/GeometryCommonDetAlgo/interface/DeepCopyPointer.h
+++ b/DataFormats/GeometryCommonDetAlgo/interface/DeepCopyPointer.h
@@ -1,8 +1,7 @@
 #ifndef DeepCopyPointer_H
 #define DeepCopyPointer_H
 
-
-#include<algorithm>
+#include <algorithm>
 
 /** A "smart" pointer that implements deep copy and ownership.
  *  In other words, when the pointer is copied it copies the 
@@ -15,41 +14,43 @@
 template <class T>
 class DeepCopyPointer {
 public:
-  
-  ~DeepCopyPointer() { delete theData;}
+  ~DeepCopyPointer() { delete theData; }
 
   DeepCopyPointer() : theData(0) {}
 
-  DeepCopyPointer( T* t) : theData(t) {}
+  DeepCopyPointer(T* t) : theData(t) {}
 
-  DeepCopyPointer( const DeepCopyPointer& other) {
-    if (other.theData) theData = new T( *other); else theData = 0;
+  DeepCopyPointer(const DeepCopyPointer& other) {
+    if (other.theData)
+      theData = new T(*other);
+    else
+      theData = 0;
   }
 
-  DeepCopyPointer& operator=( const DeepCopyPointer& other) {
-    if ( theData != other.theData) {
+  DeepCopyPointer& operator=(const DeepCopyPointer& other) {
+    if (theData != other.theData) {
       delete theData;
-      if (other.theData) theData = new T( *other); else theData = 0;
+      if (other.theData)
+        theData = new T(*other);
+      else
+        theData = 0;
     }
     return *this;
   }
 
   // straight from http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n2027.html
-  DeepCopyPointer( DeepCopyPointer&& other) : theData(other.theData) {
-    other.theData=0;
-  }
-  DeepCopyPointer& operator=( DeepCopyPointer&& other) {
-    std::swap(theData,other.theData);
+  DeepCopyPointer(DeepCopyPointer&& other) : theData(other.theData) { other.theData = 0; }
+  DeepCopyPointer& operator=(DeepCopyPointer&& other) {
+    std::swap(theData, other.theData);
     return *this;
   }
 
-
   /// Assing a new bare pointer to this DeepCopyPointer, taking ownership of it.
-  /// The old content of this DeepCopyPointer is deleted 
-  void replaceWith(T * otherP) {
-    if ( theData != otherP ) {
-        delete theData;
-        theData = otherP;
+  /// The old content of this DeepCopyPointer is deleted
+  void replaceWith(T* otherP) {
+    if (theData != otherP) {
+      delete theData;
+      theData = otherP;
     }
   }
 
@@ -57,26 +58,23 @@ class DeepCopyPointer {
   // at the moment all the work is done by the client i.e.
   // call the distructor
   // new in place
-  // with c++0X a templated method can encasulate it all here... 
-  T* replaceInplace() {
-    return theData;
-  }
- 
+  // with c++0X a templated method can encasulate it all here...
+  T* replaceInplace() { return theData; }
 
-  T&       operator*()       { return *theData;}
-  const T& operator*() const { return *theData;}
+  T& operator*() { return *theData; }
+  const T& operator*() const { return *theData; }
 
-  T*       operator->()       { return theData;}
-  const T* operator->() const { return theData;}
+  T* operator->() { return theData; }
+  const T* operator->() const { return theData; }
 
   /// to allow test like " if (p) {...}"
-  operator bool() const { return theData != 0;}
+  operator bool() const { return theData != 0; }
 
   /// to allow test like " if (p == &someT) {...}"
-  bool operator==( const T* otherP) const { return theData == otherP;}
+  bool operator==(const T* otherP) const { return theData == otherP; }
 
 private:
   T* theData;
 };
 
-#endif // DeepCopyPointer_H
+#endif  // DeepCopyPointer_H
diff --git a/DataFormats/GeometryCommonDetAlgo/interface/DeepCopyPointerByClone.h b/DataFormats/GeometryCommonDetAlgo/interface/DeepCopyPointerByClone.h
index 5d1f8c6b03202..cf231fc386572 100644
--- a/DataFormats/GeometryCommonDetAlgo/interface/DeepCopyPointerByClone.h
+++ b/DataFormats/GeometryCommonDetAlgo/interface/DeepCopyPointerByClone.h
@@ -1,7 +1,7 @@
 #ifndef DeepCopyPointerByClone_H
 #define DeepCopyPointerByClone_H
 
-#include<algorithm>
+#include <algorithm>
 
 /** Same as DeepCopyPointer, except that it copies the object
  *  pointed to wsing the clone() virtual copy constructor.
@@ -10,49 +10,50 @@
 template <class T>
 class DeepCopyPointerByClone {
 public:
-  
-  ~DeepCopyPointerByClone() { delete theData;}
+  ~DeepCopyPointerByClone() { delete theData; }
   DeepCopyPointerByClone() : theData(nullptr) {}
 
-  DeepCopyPointerByClone( T* t) : theData(t) {}
+  DeepCopyPointerByClone(T* t) : theData(t) {}
 
-  DeepCopyPointerByClone( const DeepCopyPointerByClone& other) {
-    if (other.theData) theData = other->clone(); else theData = nullptr;
+  DeepCopyPointerByClone(const DeepCopyPointerByClone& other) {
+    if (other.theData)
+      theData = other->clone();
+    else
+      theData = nullptr;
   }
 
-
-  DeepCopyPointerByClone& operator=( const DeepCopyPointerByClone& other) {
-    if ( theData != other.theData) {
+  DeepCopyPointerByClone& operator=(const DeepCopyPointerByClone& other) {
+    if (theData != other.theData) {
       delete theData;
-      if (other.theData) theData = other->clone(); else theData = 0;
+      if (other.theData)
+        theData = other->clone();
+      else
+        theData = 0;
     }
     return *this;
   }
 
   // straight from http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n2027.html
-  DeepCopyPointerByClone( DeepCopyPointerByClone&& other) : theData(other.theData) {
-    other.theData=0;
-  }
-  DeepCopyPointerByClone& operator=( DeepCopyPointerByClone&& other) {
-    std::swap(theData,other.theData);
+  DeepCopyPointerByClone(DeepCopyPointerByClone&& other) : theData(other.theData) { other.theData = 0; }
+  DeepCopyPointerByClone& operator=(DeepCopyPointerByClone&& other) {
+    std::swap(theData, other.theData);
     return *this;
   }
 
+  T& operator*() { return *theData; }
+  const T& operator*() const { return *theData; }
 
-  T&       operator*()       { return *theData;}
-  const T& operator*() const { return *theData;}
-
-  T*       operator->()       { return theData;}
-  const T* operator->() const { return theData;}
+  T* operator->() { return theData; }
+  const T* operator->() const { return theData; }
 
   /// to allow test like " if (p) {...}"
-  operator bool() const { return theData != 0;}
+  operator bool() const { return theData != 0; }
 
   /// to allow test like " if (p == &someT) {...}"
-  bool operator==( const T* otherP) const { return theData == otherP;}
+  bool operator==(const T* otherP) const { return theData == otherP; }
 
 private:
   T* theData;
 };
 
-#endif // DeepCopyPointerByClone_H
+#endif  // DeepCopyPointerByClone_H
diff --git a/DataFormats/GeometryCommonDetAlgo/interface/ErrorFrameTransformer.h b/DataFormats/GeometryCommonDetAlgo/interface/ErrorFrameTransformer.h
index e48545706d372..235a6522e4b36 100644
--- a/DataFormats/GeometryCommonDetAlgo/interface/ErrorFrameTransformer.h
+++ b/DataFormats/GeometryCommonDetAlgo/interface/ErrorFrameTransformer.h
@@ -6,96 +6,93 @@
 #include "DataFormats/GeometryCommonDetAlgo/interface/LocalError.h"
 #include "DataFormats/Math/interface/AlgebraicROOTObjects.h"
 
-
 #include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
 
+struct ErrorFrameTransformer {
+  typedef Surface::Scalar Scalar;
 
-struct   ErrorFrameTransformer {
-  
-  typedef Surface::Scalar         Scalar;
- 
-  //old version 1 
+  //old version 1
   static GlobalError transform(const LocalError& le, const Surface& surf) {
     // the GlobalError is a sym matrix, initialisation takes only
     // 6 T because GlobalError is stored as a lower triangular matrix.
     Scalar cxx = le.xx();
     Scalar cxy = le.xy();
     Scalar cyy = le.yy();
-    
-    Surface::RotationType r=surf.rotation();
-   
-    return GlobalError( r.xx()*(r.xx()*cxx+r.yx()*cxy) + r.yx()*(r.xx()*cxy+r.yx()*cyy) ,
-                        r.xx()*(r.xy()*cxx+r.yy()*cxy) + r.yx()*(r.xy()*cxy+r.yy()*cyy) ,
-                        r.xy()*(r.xy()*cxx+r.yy()*cxy) + r.yy()*(r.xy()*cxy+r.yy()*cyy) ,
-                        r.xx()*(r.xz()*cxx+r.yz()*cxy) + r.yx()*(r.xz()*cxy+r.yz()*cyy) ,
-                        r.xy()*(r.xz()*cxx+r.yz()*cxy) + r.yy()*(r.xz()*cxy+r.yz()*cyy) ,
-                        r.xz()*(r.xz()*cxx+r.yz()*cxy) + r.yz()*(r.xz()*cxy+r.yz()*cyy) );
+
+    Surface::RotationType r = surf.rotation();
+
+    return GlobalError(r.xx() * (r.xx() * cxx + r.yx() * cxy) + r.yx() * (r.xx() * cxy + r.yx() * cyy),
+                       r.xx() * (r.xy() * cxx + r.yy() * cxy) + r.yx() * (r.xy() * cxy + r.yy() * cyy),
+                       r.xy() * (r.xy() * cxx + r.yy() * cxy) + r.yy() * (r.xy() * cxy + r.yy() * cyy),
+                       r.xx() * (r.xz() * cxx + r.yz() * cxy) + r.yx() * (r.xz() * cxy + r.yz() * cyy),
+                       r.xy() * (r.xz() * cxx + r.yz() * cxy) + r.yy() * (r.xz() * cxy + r.yz() * cyy),
+                       r.xz() * (r.xz() * cxx + r.yz() * cxy) + r.yz() * (r.xz() * cxy + r.yz() * cyy));
   }
- 
+
   static LocalError transform(const GlobalError& ge, const Surface& surf) {
-    Scalar cxx = ge.cxx(); Scalar cyx = ge.cyx(); Scalar cyy = ge.cyy();
-    Scalar czx = ge.czx(); Scalar czy = ge.czy(); Scalar czz = ge.czz();
-    
-    Surface::RotationType r=surf.rotation();
-    
-    Scalar l11 
-      = r.xx()*(r.xx()*cxx + r.xy()*cyx + r.xz()*czx)
-      + r.xy()*(r.xx()*cyx + r.xy()*cyy + r.xz()*czy)
-      + r.xz()*(r.xx()*czx + r.xy()*czy + r.xz()*czz);
-    Scalar l12 
-      = r.yx()*(r.xx()*cxx + r.xy()*cyx + r.xz()*czx)
-      + r.yy()*(r.xx()*cyx + r.xy()*cyy + r.xz()*czy)
-      + r.yz()*(r.xx()*czx + r.xy()*czy + r.xz()*czz);
-    Scalar l22
-      = r.yx()*(r.yx()*cxx + r.yy()*cyx + r.yz()*czx)
-      + r.yy()*(r.yx()*cyx + r.yy()*cyy + r.yz()*czy)
-      + r.yz()*(r.yx()*czx + r.yy()*czy + r.yz()*czz);
-    
-    return LocalError( l11, l12, l22);
+    Scalar cxx = ge.cxx();
+    Scalar cyx = ge.cyx();
+    Scalar cyy = ge.cyy();
+    Scalar czx = ge.czx();
+    Scalar czy = ge.czy();
+    Scalar czz = ge.czz();
+
+    Surface::RotationType r = surf.rotation();
+
+    Scalar l11 = r.xx() * (r.xx() * cxx + r.xy() * cyx + r.xz() * czx) +
+                 r.xy() * (r.xx() * cyx + r.xy() * cyy + r.xz() * czy) +
+                 r.xz() * (r.xx() * czx + r.xy() * czy + r.xz() * czz);
+    Scalar l12 = r.yx() * (r.xx() * cxx + r.xy() * cyx + r.xz() * czx) +
+                 r.yy() * (r.xx() * cyx + r.xy() * cyy + r.xz() * czy) +
+                 r.yz() * (r.xx() * czx + r.xy() * czy + r.xz() * czz);
+    Scalar l22 = r.yx() * (r.yx() * cxx + r.yy() * cyx + r.yz() * czx) +
+                 r.yy() * (r.yx() * cyx + r.yy() * cyy + r.yz() * czy) +
+                 r.yz() * (r.yx() * czx + r.yy() * czy + r.yz() * czz);
+
+    return LocalError(l11, l12, l22);
   }
 
   //new Jacobian for 6x6 APE in muon code
-  static LocalErrorExtended transform46(const GlobalErrorExtended& ge, const AlgebraicVector& positions, const AlgebraicVector& directions) {
-
+  static LocalErrorExtended transform46(const GlobalErrorExtended& ge,
+                                        const AlgebraicVector& positions,
+                                        const AlgebraicVector& directions) {
     const AlgebraicSymMatrix66& as(ge.matrix());
 
     AlgebraicMatrix46 jacobian46;
     jacobian46[0][0] = 1.;
     jacobian46[0][1] = 0.;
     jacobian46[0][2] = -directions[0];
-    jacobian46[0][3] = -positions[1]*directions[0];
-    jacobian46[0][4] = positions[0]*directions[0];
+    jacobian46[0][3] = -positions[1] * directions[0];
+    jacobian46[0][4] = positions[0] * directions[0];
     jacobian46[0][5] = -positions[1];
 
     jacobian46[1][0] = 0.;
     jacobian46[1][1] = 1.;
     jacobian46[1][2] = -directions[1];
-    jacobian46[1][3] = -positions[1]*directions[1];
-    jacobian46[1][4] = positions[0]*directions[1];
+    jacobian46[1][3] = -positions[1] * directions[1];
+    jacobian46[1][4] = positions[0] * directions[1];
     jacobian46[1][5] = positions[0];
 
     jacobian46[2][0] = 0.;
     jacobian46[2][1] = 0.;
     jacobian46[2][2] = 0.;
-    jacobian46[2][3] = -directions[1]*directions[0];
-    jacobian46[2][4] = 1.+directions[0]*directions[0];
+    jacobian46[2][3] = -directions[1] * directions[0];
+    jacobian46[2][4] = 1. + directions[0] * directions[0];
     jacobian46[2][5] = -directions[1];
 
     jacobian46[3][0] = 0.;
     jacobian46[3][1] = 0.;
     jacobian46[3][2] = 0.;
-    jacobian46[3][3] = -1.-directions[1]*directions[1];
-    jacobian46[3][4] = directions[0]*directions[1];
+    jacobian46[3][3] = -1. - directions[1] * directions[1];
+    jacobian46[3][4] = directions[0] * directions[1];
     jacobian46[3][5] = directions[0];
 
-    AlgebraicSymMatrix44 out = ROOT::Math::Similarity(jacobian46,as); 
+    AlgebraicSymMatrix44 out = ROOT::Math::Similarity(jacobian46, as);
 
     LocalErrorExtended newError(out);
 
     return newError;
   }
-
-
 };
 
 #endif
diff --git a/DataFormats/GeometryCommonDetAlgo/interface/ErrorMatrixTag.h b/DataFormats/GeometryCommonDetAlgo/interface/ErrorMatrixTag.h
index 526417652614f..25fcfe57226dd 100644
--- a/DataFormats/GeometryCommonDetAlgo/interface/ErrorMatrixTag.h
+++ b/DataFormats/GeometryCommonDetAlgo/interface/ErrorMatrixTag.h
@@ -1,14 +1,13 @@
 #ifndef ErrorMatrixTag_H
 #define ErrorMatrixTag_H
 
-  /**
+/**
    * Tag to apply to class GlobalErrorBase to give it the meaning of a 
    * covariance matrix.
    * A typedef to a  GlobalErrorBase object defined as a covariance is 
    * available in GlobalError
    */
 
-
-class ErrorMatrixTag{};
+class ErrorMatrixTag {};
 
 #endif
diff --git a/DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h b/DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h
index 7ee8ffc1d56e0..1d784453eb137 100644
--- a/DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h
+++ b/DataFormats/GeometryCommonDetAlgo/interface/GlobalError.h
@@ -5,12 +5,12 @@
 #include "DataFormats/GeometryCommonDetAlgo/interface/GlobalErrorBaseExtended.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/ErrorMatrixTag.h"
 
-  /**
+/**
    * typedef to a  GlobalErrorBase object defined as a 4*4 covariance matrix
    * acts like a 3*3 matrix to preserve backwards compatibility
    */
 
-typedef GlobalErrorBase<double,ErrorMatrixTag> GlobalError;
-typedef GlobalErrorBaseExtended<double,ErrorMatrixTag> GlobalErrorExtended;
+typedef GlobalErrorBase<double, ErrorMatrixTag> GlobalError;
+typedef GlobalErrorBaseExtended<double, ErrorMatrixTag> GlobalErrorExtended;
 
 #endif
diff --git a/DataFormats/GeometryCommonDetAlgo/interface/GlobalErrorBase.h b/DataFormats/GeometryCommonDetAlgo/interface/GlobalErrorBase.h
index 4302af3364357..22e538a9310a8 100644
--- a/DataFormats/GeometryCommonDetAlgo/interface/GlobalErrorBase.h
+++ b/DataFormats/GeometryCommonDetAlgo/interface/GlobalErrorBase.h
@@ -9,7 +9,7 @@
 //
 #include "FWCore/Utilities/interface/Exception.h"
 
-  /**
+/**
    * Templated class representing a symmetric 3*3 matrix describing,  according
    * to the ErrorWeightType tag, a (cartesian) covariance matrix or the weight
    * matrix (the inverse of the covariance matrix).
@@ -21,14 +21,11 @@
    * The typedefs should be used in the code.
    */
 
-
-template <class T, class ErrorWeightType> 
-class GlobalErrorBase
-{
-
+template <class T, class ErrorWeightType>
+class GlobalErrorBase {
 public:
   /// Tag to request a null error matrix
-  class NullMatrix{};
+  class NullMatrix {};
 
   /**
    * Default constructor, creating a null 3*3 matrix (all values are 0)
@@ -38,166 +35,137 @@ class GlobalErrorBase
   /** 
    * Obsolete  Constructor that allocates a null GlobalErrorBase (it does not create the error matrix at all)
    */
-  GlobalErrorBase(const NullMatrix &) {}
-
+  GlobalErrorBase(const NullMatrix&) {}
 
   /**
    * Constructor.
    * The symmetric matrix stored as a lower triangular matrix
    */
   GlobalErrorBase(T c11, T c21, T c22, T c31, T c32, T c33) {
-    theCartesianError(0,0)=c11;
-    theCartesianError(1,0)=c21;
-    theCartesianError(1,1)=c22;
-    theCartesianError(2,0)=c31;
-    theCartesianError(2,1)=c32;
-    theCartesianError(2,2)=c33;
-    theCartesianError(3,0) = 0.;
-    theCartesianError(3,1) = 0.;
-    theCartesianError(3,2) = 0.;
-    theCartesianError(3,3) = 0.;
+    theCartesianError(0, 0) = c11;
+    theCartesianError(1, 0) = c21;
+    theCartesianError(1, 1) = c22;
+    theCartesianError(2, 0) = c31;
+    theCartesianError(2, 1) = c32;
+    theCartesianError(2, 2) = c33;
+    theCartesianError(3, 0) = 0.;
+    theCartesianError(3, 1) = 0.;
+    theCartesianError(3, 2) = 0.;
+    theCartesianError(3, 3) = 0.;
   }
-  
+
   /**
    * Constructor.
    * The symmetric matrix stored as a lower triangular matrix (4D)
    */
   GlobalErrorBase(T c11, T c21, T c22, T c31, T c32, T c33, T c41, T c42, T c43, T c44) {
-    theCartesianError(0,0)=c11;
-    theCartesianError(1,0)=c21;
-    theCartesianError(1,1)=c22;
-    theCartesianError(2,0)=c31;
-    theCartesianError(2,1)=c32;
-    theCartesianError(2,2)=c33;
-    theCartesianError(3,0)=c41;
-    theCartesianError(3,1)=c42;
-    theCartesianError(3,2)=c43;
-    theCartesianError(3,3)=c44;
+    theCartesianError(0, 0) = c11;
+    theCartesianError(1, 0) = c21;
+    theCartesianError(1, 1) = c22;
+    theCartesianError(2, 0) = c31;
+    theCartesianError(2, 1) = c32;
+    theCartesianError(2, 2) = c33;
+    theCartesianError(3, 0) = c41;
+    theCartesianError(3, 1) = c42;
+    theCartesianError(3, 2) = c43;
+    theCartesianError(3, 3) = c44;
   }
-  
+
   /**
    * Constructor from SymMatrix. The original matrix has to be a 3*3 matrix.
    */
- GlobalErrorBase(const AlgebraicSymMatrix33 & err) { 
-     theCartesianError(0,0) = err(0,0);
-     theCartesianError(1,0) = err(1,0);
-     theCartesianError(1,1) = err(1,1);
-     theCartesianError(2,0) = err(2,0);
-     theCartesianError(2,1) = err(2,1);
-     theCartesianError(2,2) = err(2,2);
-     theCartesianError(3,0) = 0.;
-     theCartesianError(3,1) = 0.;
-     theCartesianError(3,2) = 0.;
-     theCartesianError(3,3) = 0.;
+  GlobalErrorBase(const AlgebraicSymMatrix33& err) {
+    theCartesianError(0, 0) = err(0, 0);
+    theCartesianError(1, 0) = err(1, 0);
+    theCartesianError(1, 1) = err(1, 1);
+    theCartesianError(2, 0) = err(2, 0);
+    theCartesianError(2, 1) = err(2, 1);
+    theCartesianError(2, 2) = err(2, 2);
+    theCartesianError(3, 0) = 0.;
+    theCartesianError(3, 1) = 0.;
+    theCartesianError(3, 2) = 0.;
+    theCartesianError(3, 3) = 0.;
   }
 
   /**
    * Constructor from SymMatrix. The original matrix has to be a 4*4 matrix.
    */
- GlobalErrorBase(const AlgebraicSymMatrix44 & err) : 
-  theCartesianError(err) { }
+  GlobalErrorBase(const AlgebraicSymMatrix44& err) : theCartesianError(err) {}
 
-  
   ~GlobalErrorBase() {}
 
-  T cxx() const {
-    return theCartesianError(0,0);
-  }
-  
-  T cyx() const {
-    return theCartesianError(1,0);
-  }
-  
-  T cyy() const {
-    return theCartesianError(1,1);
-  }
-  
-  T czx() const {
-    return theCartesianError(2,0);
-  }
-  
-  T czy() const {
-    return theCartesianError(2,1);
-  }
-  
-  T czz() const {
-    return theCartesianError(2,2);
-  }
+  T cxx() const { return theCartesianError(0, 0); }
 
-  T ctx() const {
-    return theCartesianError(3,0);
-  }
-  
-  T cty() const {
-    return theCartesianError(3,1);
-  }
-  
-  T ctz() const {
-    return theCartesianError(3,2);
-  }
+  T cyx() const { return theCartesianError(1, 0); }
+
+  T cyy() const { return theCartesianError(1, 1); }
+
+  T czx() const { return theCartesianError(2, 0); }
+
+  T czy() const { return theCartesianError(2, 1); }
+
+  T czz() const { return theCartesianError(2, 2); }
+
+  T ctx() const { return theCartesianError(3, 0); }
+
+  T cty() const { return theCartesianError(3, 1); }
+
+  T ctz() const { return theCartesianError(3, 2); }
+
+  T ctt() const { return theCartesianError(3, 3); }
 
-  T ctt() const {
-    return theCartesianError(3,3);
-  }
-  
   /**
    * Access method to the matrix,
    * /return The SymMatrix
    */
   const AlgebraicSymMatrix33 matrix() const {
     AlgebraicSymMatrix33 out;
-    out(0,0) = theCartesianError(0,0);
-    out(1,0) = theCartesianError(1,0);
-    out(1,1) = theCartesianError(1,1);
-    out(2,0) = theCartesianError(2,0);
-    out(2,1) = theCartesianError(2,1);
-    out(2,2) = theCartesianError(2,2);
+    out(0, 0) = theCartesianError(0, 0);
+    out(1, 0) = theCartesianError(1, 0);
+    out(1, 1) = theCartesianError(1, 1);
+    out(2, 0) = theCartesianError(2, 0);
+    out(2, 1) = theCartesianError(2, 1);
+    out(2, 2) = theCartesianError(2, 2);
     return out;
-  }  
+  }
 
- /**
+  /**
    * Access method to the matrix,
    * /return The SymMatrix 4x4
    */
-  const AlgebraicSymMatrix44& matrix4D() const {
-    return theCartesianError;
-  }
+  const AlgebraicSymMatrix44& matrix4D() const { return theCartesianError; }
 
   T rerr(const GlobalPoint& aPoint) const {
     T r2 = aPoint.perp2();
-    T x2 = aPoint.x()*aPoint.x();
-    T y2 = aPoint.y()*aPoint.y();
-    T xy = aPoint.x()*aPoint.y();
-    if(r2 != 0) 
-      return std::max<T>(0, (1./r2)*(x2*cxx() + 2.*xy*cyx() + y2*cyy()));
-    else 
-      return 0.5*(cxx() + cyy());  
+    T x2 = aPoint.x() * aPoint.x();
+    T y2 = aPoint.y() * aPoint.y();
+    T xy = aPoint.x() * aPoint.y();
+    if (r2 != 0)
+      return std::max<T>(0, (1. / r2) * (x2 * cxx() + 2. * xy * cyx() + y2 * cyy()));
+    else
+      return 0.5 * (cxx() + cyy());
   }
 
   T phierr(const GlobalPoint& aPoint) const {
     T r2 = aPoint.perp2();
-    T x2 = aPoint.x()*aPoint.x();
-    T y2 = aPoint.y()*aPoint.y();
-    T xy = aPoint.x()*aPoint.y();
-    if (r2 != 0) 
-      return std::max<T>(0, (1./(r2*r2))*(y2*cxx() - 2.*xy*cyx() + x2*cyy()));
+    T x2 = aPoint.x() * aPoint.x();
+    T y2 = aPoint.y() * aPoint.y();
+    T xy = aPoint.x() * aPoint.y();
+    if (r2 != 0)
+      return std::max<T>(0, (1. / (r2 * r2)) * (y2 * cxx() - 2. * xy * cyx() + x2 * cyy()));
     else
       return 0;
   }
 
-  GlobalErrorBase operator+ (const GlobalErrorBase& err) const {
+  GlobalErrorBase operator+(const GlobalErrorBase& err) const {
     return GlobalErrorBase(theCartesianError + err.theCartesianError);
   }
-  GlobalErrorBase operator- (const GlobalErrorBase& err) const {
+  GlobalErrorBase operator-(const GlobalErrorBase& err) const {
     return GlobalErrorBase(theCartesianError - err.theCartesianError);
   }
- 
-private:
 
+private:
   AlgebraicSymMatrix44 theCartesianError;
-
 };
 
 #endif
-
-
diff --git a/DataFormats/GeometryCommonDetAlgo/interface/GlobalErrorBaseExtended.h b/DataFormats/GeometryCommonDetAlgo/interface/GlobalErrorBaseExtended.h
index c8db536b2c83c..66d0e5dce337b 100644
--- a/DataFormats/GeometryCommonDetAlgo/interface/GlobalErrorBaseExtended.h
+++ b/DataFormats/GeometryCommonDetAlgo/interface/GlobalErrorBaseExtended.h
@@ -9,221 +9,183 @@
 //
 #include "FWCore/Utilities/interface/Exception.h"
 
-template <class T, class ErrorWeightType> 
-class GlobalErrorBaseExtended
-{
-
+template <class T, class ErrorWeightType>
+class GlobalErrorBaseExtended {
 public:
   /// Tag to request a null error matrix
-  class NullMatrix{};
+  class NullMatrix {};
 
   GlobalErrorBaseExtended() {}
-  GlobalErrorBaseExtended(const NullMatrix &) {}
-
+  GlobalErrorBaseExtended(const NullMatrix&) {}
 
   /**
    * Constructor.
    * The symmetric matrix stored as a lower triangular matrix
    */
-  GlobalErrorBaseExtended(T c11, T c21, T c31, T c41, T c51, T c61,
-                          T c22, T c32, T c42, T c52, T c62,
-                          T c33, T c43, T c53, T c63,
-                          T c44, T c54, T c64,
-                          T c55, T c65,
-                          T c66
-                          ) {
-    theCartesianError(0,0)=c11;
-    theCartesianError(1,0)=c21;
-    theCartesianError(2,0)=c31;
-    theCartesianError(3,0)=c41;
-    theCartesianError(4,0)=c51;
-    theCartesianError(5,0)=c61;
-
-    theCartesianError(1,1)=c22;
-    theCartesianError(2,1)=c32;
-    theCartesianError(3,1)=c42;
-    theCartesianError(4,1)=c52;
-    theCartesianError(5,1)=c62;
-
-    theCartesianError(2,2)=c33;
-    theCartesianError(3,2)=c43;
-    theCartesianError(4,2)=c53;
-    theCartesianError(5,2)=c63;
-
-    theCartesianError(3,3)=c44;
-    theCartesianError(4,3)=c54;
-    theCartesianError(5,3)=c64;
-
-    theCartesianError(4,4)=c55;
-    theCartesianError(5,4)=c65;
-
-    theCartesianError(5,5)=c66;
+  GlobalErrorBaseExtended(T c11,
+                          T c21,
+                          T c31,
+                          T c41,
+                          T c51,
+                          T c61,
+                          T c22,
+                          T c32,
+                          T c42,
+                          T c52,
+                          T c62,
+                          T c33,
+                          T c43,
+                          T c53,
+                          T c63,
+                          T c44,
+                          T c54,
+                          T c64,
+                          T c55,
+                          T c65,
+                          T c66) {
+    theCartesianError(0, 0) = c11;
+    theCartesianError(1, 0) = c21;
+    theCartesianError(2, 0) = c31;
+    theCartesianError(3, 0) = c41;
+    theCartesianError(4, 0) = c51;
+    theCartesianError(5, 0) = c61;
+
+    theCartesianError(1, 1) = c22;
+    theCartesianError(2, 1) = c32;
+    theCartesianError(3, 1) = c42;
+    theCartesianError(4, 1) = c52;
+    theCartesianError(5, 1) = c62;
+
+    theCartesianError(2, 2) = c33;
+    theCartesianError(3, 2) = c43;
+    theCartesianError(4, 2) = c53;
+    theCartesianError(5, 2) = c63;
+
+    theCartesianError(3, 3) = c44;
+    theCartesianError(4, 3) = c54;
+    theCartesianError(5, 3) = c64;
+
+    theCartesianError(4, 4) = c55;
+    theCartesianError(5, 4) = c65;
+
+    theCartesianError(5, 5) = c66;
+  }
+
+  GlobalErrorBaseExtended(const AlgebraicSymMatrix66& err) : theCartesianError(err) {}
+
+  GlobalErrorBaseExtended(const AlgebraicSymMatrix33& err) {
+    theCartesianError(0, 0) = err[0][0];
+    theCartesianError(1, 0) = err[1][0];
+    theCartesianError(2, 0) = err[2][0];
+    theCartesianError(3, 0) = 0;
+    theCartesianError(4, 0) = 0;
+    theCartesianError(5, 0) = 0;
+
+    theCartesianError(1, 1) = err[1][1];
+    theCartesianError(2, 1) = err[2][1];
+    theCartesianError(3, 1) = 0;
+    theCartesianError(4, 1) = 0;
+    theCartesianError(5, 1) = 0;
+
+    theCartesianError(2, 2) = err[2][2];
+    theCartesianError(3, 2) = 0;
+    theCartesianError(4, 2) = 0;
+    theCartesianError(5, 2) = 0;
+
+    theCartesianError(3, 3) = 0;
+    theCartesianError(4, 3) = 0;
+    theCartesianError(5, 3) = 0;
+
+    theCartesianError(4, 4) = 0;
+    theCartesianError(5, 4) = 0;
+
+    theCartesianError(5, 5) = 0;
   }
-  
-    GlobalErrorBaseExtended(const AlgebraicSymMatrix66 & err) : 
-      theCartesianError(err) { }
-
-    GlobalErrorBaseExtended(const AlgebraicSymMatrix33 & err) {
-     theCartesianError(0,0)=err[0][0];
-     theCartesianError(1,0)=err[1][0];
-     theCartesianError(2,0)=err[2][0];
-     theCartesianError(3,0)=0;
-     theCartesianError(4,0)=0;
-     theCartesianError(5,0)=0;
-
-     theCartesianError(1,1)=err[1][1];
-     theCartesianError(2,1)=err[2][1];
-     theCartesianError(3,1)=0;
-     theCartesianError(4,1)=0;
-     theCartesianError(5,1)=0;
-
-     theCartesianError(2,2)=err[2][2];
-     theCartesianError(3,2)=0;
-     theCartesianError(4,2)=0;
-     theCartesianError(5,2)=0;
-
-     theCartesianError(3,3)=0;
-     theCartesianError(4,3)=0;
-     theCartesianError(5,3)=0;
-
-     theCartesianError(4,4)=0;
-     theCartesianError(5,4)=0;
-
-     theCartesianError(5,5)=0;
-    }
- 
+
   ~GlobalErrorBaseExtended() {}
 
-  T cxx() const {
-    return theCartesianError(0,0);
-  }
-  
-  T cyx() const {
-    return theCartesianError(1,0);
-  }
+  T cxx() const { return theCartesianError(0, 0); }
 
-  T czx() const {
-    return theCartesianError(2,0);
-  }
+  T cyx() const { return theCartesianError(1, 0); }
 
-  T cphixx() const {
-    return theCartesianError(3,0);
-  }
+  T czx() const { return theCartesianError(2, 0); }
 
-  T cphiyx() const {
-    return theCartesianError(4,0);
-  }
+  T cphixx() const { return theCartesianError(3, 0); }
 
-  T cphizx() const {
-    return theCartesianError(5,0);
-  } 
+  T cphiyx() const { return theCartesianError(4, 0); }
 
-  T cyy() const {
-    return theCartesianError(1,1);
-  }
+  T cphizx() const { return theCartesianError(5, 0); }
 
-  T czy() const {
-    return theCartesianError(2,1);
-  }
+  T cyy() const { return theCartesianError(1, 1); }
 
-  T cphixy() const {
-    return theCartesianError(3,1);
-  }
+  T czy() const { return theCartesianError(2, 1); }
 
-  T cphiyy() const {
-    return theCartesianError(4,1);
-  }
+  T cphixy() const { return theCartesianError(3, 1); }
 
-  T cphizy() const {
-    return theCartesianError(5,1);
-  }
+  T cphiyy() const { return theCartesianError(4, 1); }
 
-  T czz() const {
-    return theCartesianError(2,2);
-  } 
-  
-  T cphixz() const {
-    return theCartesianError(3,2);
-  }
+  T cphizy() const { return theCartesianError(5, 1); }
 
-  T cphiyz() const {
-    return theCartesianError(4,2);
-  } 
-    
-  T cphizz() const {
-    return theCartesianError(5,2);
-  }
+  T czz() const { return theCartesianError(2, 2); }
 
-  T cphixphix() const {
-    return theCartesianError(3,3);
-  }
+  T cphixz() const { return theCartesianError(3, 2); }
 
-  T cphiyphix() const {
-    return theCartesianError(4,3);
-  }
+  T cphiyz() const { return theCartesianError(4, 2); }
 
-  T cphizphix() const {
-    return theCartesianError(5,3);
-  }
+  T cphizz() const { return theCartesianError(5, 2); }
 
-  T cphiyphiy() const {
-    return theCartesianError(4,4);
-  }
+  T cphixphix() const { return theCartesianError(3, 3); }
 
-  T cphizphiy() const {
-    return theCartesianError(5,4);
-  }
+  T cphiyphix() const { return theCartesianError(4, 3); }
 
-  T cphizphiz() const {
-    return theCartesianError(5,5);
-  }
+  T cphizphix() const { return theCartesianError(5, 3); }
+
+  T cphiyphiy() const { return theCartesianError(4, 4); }
+
+  T cphizphiy() const { return theCartesianError(5, 4); }
+
+  T cphizphiz() const { return theCartesianError(5, 5); }
 
- /**
+  /**
    * Access method to the matrix,
    * /return The SymMatrix
    */
-  const AlgebraicSymMatrix66 & matrix() const {
-    return theCartesianError;
-  }
-  const AlgebraicSymMatrix66 & matrix_new() const {
-    return theCartesianError;
-  }
+  const AlgebraicSymMatrix66& matrix() const { return theCartesianError; }
+  const AlgebraicSymMatrix66& matrix_new() const { return theCartesianError; }
 
   //FIXME to be reimplemented
   T rerr(const GlobalPoint& aPoint) const {
     T r2 = aPoint.perp2();
-    T x2 = aPoint.x()*aPoint.x();
-    T y2 = aPoint.y()*aPoint.y();
-    T xy = aPoint.x()*aPoint.y();
-    if(r2 != 0) 
-      return std::max<T>(0, (1./r2)*(x2*cxx() + 2.*xy*cyx() + y2*cyy()));
-    else 
-      return 0.5*(cxx() + cyy());  
+    T x2 = aPoint.x() * aPoint.x();
+    T y2 = aPoint.y() * aPoint.y();
+    T xy = aPoint.x() * aPoint.y();
+    if (r2 != 0)
+      return std::max<T>(0, (1. / r2) * (x2 * cxx() + 2. * xy * cyx() + y2 * cyy()));
+    else
+      return 0.5 * (cxx() + cyy());
   }
 
   //FIXME to be reimplemented
   T phierr(const GlobalPoint& aPoint) const {
     T r2 = aPoint.perp2();
-    T x2 = aPoint.x()*aPoint.x();
-    T y2 = aPoint.y()*aPoint.y();
-    T xy = aPoint.x()*aPoint.y();
-    if (r2 != 0) 
-      return std::max<T>(0, (1./(r2*r2))*(y2*cxx() - 2.*xy*cyx() + x2*cyy()));
+    T x2 = aPoint.x() * aPoint.x();
+    T y2 = aPoint.y() * aPoint.y();
+    T xy = aPoint.x() * aPoint.y();
+    if (r2 != 0)
+      return std::max<T>(0, (1. / (r2 * r2)) * (y2 * cxx() - 2. * xy * cyx() + x2 * cyy()));
     else
       return 0;
   }
 
-  GlobalErrorBaseExtended operator+ (const GlobalErrorBaseExtended& err) const {
+  GlobalErrorBaseExtended operator+(const GlobalErrorBaseExtended& err) const {
     return GlobalErrorBaseExtended(theCartesianError + err.theCartesianError);
   }
-  GlobalErrorBaseExtended operator- (const GlobalErrorBaseExtended& err) const {
+  GlobalErrorBaseExtended operator-(const GlobalErrorBaseExtended& err) const {
     return GlobalErrorBaseExtended(theCartesianError - err.theCartesianError);
   }
- 
-private:
 
+private:
   AlgebraicSymMatrix66 theCartesianError;
-
 };
 
 #endif
diff --git a/DataFormats/GeometryCommonDetAlgo/interface/GlobalWeight.h b/DataFormats/GeometryCommonDetAlgo/interface/GlobalWeight.h
index 6f37b2f111639..cc07a2f0007b1 100644
--- a/DataFormats/GeometryCommonDetAlgo/interface/GlobalWeight.h
+++ b/DataFormats/GeometryCommonDetAlgo/interface/GlobalWeight.h
@@ -1,16 +1,14 @@
 #ifndef _TRACKER_GLOBAL_WEIGHT_H_
 #define _TRACKER_GLOBAL_WEIGHT_H_
 
-
 #include "DataFormats/GeometryCommonDetAlgo/interface/GlobalErrorBase.h"
 #include "DataFormats/GeometryCommonDetAlgo/interface/WeightMatrixTag.h"
 
-  /**
+/**
    * typedef to a  GlobalErrorBase object defined as a 3*3 weight matrix 
    * (i.e. the inverse of the covariance matrix)
    */
 
 typedef GlobalErrorBase<double, WeightMatrixTag> GlobalWeight;
 
-
 #endif
diff --git a/DataFormats/GeometryCommonDetAlgo/interface/LocalError.h b/DataFormats/GeometryCommonDetAlgo/interface/LocalError.h
index b3a7df48719c6..9ee6f9e1bbb40 100644
--- a/DataFormats/GeometryCommonDetAlgo/interface/LocalError.h
+++ b/DataFormats/GeometryCommonDetAlgo/interface/LocalError.h
@@ -4,4 +4,4 @@
 #include "DataFormats/GeometrySurface/interface/LocalError.h"
 #include "DataFormats/GeometrySurface/interface/LocalErrorExtended.h"
 
-#endif // LocalError_H
+#endif  // LocalError_H
diff --git a/DataFormats/GeometryCommonDetAlgo/interface/Measurement1D.h b/DataFormats/GeometryCommonDetAlgo/interface/Measurement1D.h
index 0d1c596f80737..6598b9f3bbd19 100644
--- a/DataFormats/GeometryCommonDetAlgo/interface/Measurement1D.h
+++ b/DataFormats/GeometryCommonDetAlgo/interface/Measurement1D.h
@@ -9,48 +9,33 @@
  */
 
 class Measurement1D {
-
 public:
-// construct
+  // construct
 
-Measurement1D() : theValue(0.) , theError(0.) {};
+  Measurement1D() : theValue(0.), theError(0.){};
 
-Measurement1D( const double& aValue) : 
-  theValue(aValue) , theError(0.) {};
+  Measurement1D(const double& aValue) : theValue(aValue), theError(0.){};
 
-Measurement1D( const double& aValue, const double& aError) 
-  : theValue(aValue) , theError(aError) {}; 
+  Measurement1D(const double& aValue, const double& aError) : theValue(aValue), theError(aError){};
 
-//destruct
+  //destruct
 
-~Measurement1D() {} ;
+  ~Measurement1D(){};
 
-double value() const { return theValue;}
+  double value() const { return theValue; }
 
-double error() const { return theError;}
+  double error() const { return theError; }
 
-double significance() const {
-  if (theError == 0) return 0;
-  else return theValue/theError;
-}
+  double significance() const {
+    if (theError == 0)
+      return 0;
+    else
+      return theValue / theError;
+  }
 
 private:
-
-double  theValue;
-double  theError;
-
+  double theValue;
+  double theError;
 };
 
-
-
 #endif
-
-
-
-
-
-
-
-
-
-
diff --git a/DataFormats/GeometryCommonDetAlgo/interface/Measurement1DFloat.h b/DataFormats/GeometryCommonDetAlgo/interface/Measurement1DFloat.h
index 38df895ee4a88..6408fdc8bd6cf 100644
--- a/DataFormats/GeometryCommonDetAlgo/interface/Measurement1DFloat.h
+++ b/DataFormats/GeometryCommonDetAlgo/interface/Measurement1DFloat.h
@@ -7,48 +7,33 @@
  */
 
 class Measurement1DFloat {
-
 public:
-// construct
+  // construct
 
-Measurement1DFloat() : theValue(0.) , theError(0.) {}
+  Measurement1DFloat() : theValue(0.), theError(0.) {}
 
-Measurement1DFloat( const float& aValue) : 
-  theValue(aValue) , theError(0.) {}
+  Measurement1DFloat(const float& aValue) : theValue(aValue), theError(0.) {}
 
-Measurement1DFloat( const float& aValue, const float& aError) 
-  : theValue(aValue) , theError(aError) {} 
+  Measurement1DFloat(const float& aValue, const float& aError) : theValue(aValue), theError(aError) {}
 
-//destruct
+  //destruct
 
-~Measurement1DFloat() {} ;
+  ~Measurement1DFloat(){};
 
-float value() const { return theValue; }
+  float value() const { return theValue; }
 
-float error() const { return theError; }
+  float error() const { return theError; }
 
-float significance() const {
-  if (theError == 0) return 0;
-  else return theValue/theError;
-}
+  float significance() const {
+    if (theError == 0)
+      return 0;
+    else
+      return theValue / theError;
+  }
 
 private:
-
-float  theValue;
-float  theError;
-
+  float theValue;
+  float theError;
 };
 
-
-
 #endif
-
-
-
-
-
-
-
-
-
-
diff --git a/DataFormats/GeometryCommonDetAlgo/interface/MeasurementError.h b/DataFormats/GeometryCommonDetAlgo/interface/MeasurementError.h
index 14de7f3521f74..8ae6998ebf75b 100644
--- a/DataFormats/GeometryCommonDetAlgo/interface/MeasurementError.h
+++ b/DataFormats/GeometryCommonDetAlgo/interface/MeasurementError.h
@@ -7,23 +7,18 @@
 
 class MeasurementError {
 public:
-
   MeasurementError() : theuu(0), theuv(0), thevv(0) {}
 
-  MeasurementError( float uu, float uv, float vv) :
-    theuu(uu), theuv(uv), thevv(vv) {}
+  MeasurementError(float uu, float uv, float vv) : theuu(uu), theuv(uv), thevv(vv) {}
 
-  float uu() const { return theuu;}
-  float uv() const { return theuv;}
-  float vv() const { return thevv;}
+  float uu() const { return theuu; }
+  float uv() const { return theuv; }
+  float vv() const { return thevv; }
 
 private:
-
   float theuu;
   float theuv;
   float thevv;
+};
 
-};  
-
-
-#endif // MeasurementError_H
+#endif  // MeasurementError_H
diff --git a/DataFormats/GeometryCommonDetAlgo/interface/MeasurementPoint.h b/DataFormats/GeometryCommonDetAlgo/interface/MeasurementPoint.h
index 23c808a2db07d..1481db94931ab 100644
--- a/DataFormats/GeometryCommonDetAlgo/interface/MeasurementPoint.h
+++ b/DataFormats/GeometryCommonDetAlgo/interface/MeasurementPoint.h
@@ -5,11 +5,10 @@
 #include "DataFormats/GeometryVector/interface/Point2DBase.h"
 #include "DataFormats/GeometryVector/interface/Point3DBase.h"
 
-typedef Point2DBase< float, MeasurementTag>    Measurement2DPoint;
-typedef Point3DBase< float, MeasurementTag>    Measurement3DPoint;
+typedef Point2DBase<float, MeasurementTag> Measurement2DPoint;
+typedef Point3DBase<float, MeasurementTag> Measurement3DPoint;
 
 /// Measurement points are two-dimensional by default.
-typedef Measurement2DPoint                     MeasurementPoint;
-
-#endif // MeasurementPoint_H
+typedef Measurement2DPoint MeasurementPoint;
 
+#endif  // MeasurementPoint_H
diff --git a/DataFormats/GeometryCommonDetAlgo/interface/MeasurementVector.h b/DataFormats/GeometryCommonDetAlgo/interface/MeasurementVector.h
index 99ef0b7c5a969..760c60b11ade9 100644
--- a/DataFormats/GeometryCommonDetAlgo/interface/MeasurementVector.h
+++ b/DataFormats/GeometryCommonDetAlgo/interface/MeasurementVector.h
@@ -5,10 +5,10 @@
 #include "DataFormats/GeometryVector/interface/Vector2DBase.h"
 #include "DataFormats/GeometryVector/interface/Vector3DBase.h"
 
-typedef Vector2DBase< float, MeasurementTag>    Measurement2DVector;
-typedef Vector3DBase< float, MeasurementTag>    Measurement3DVector;
+typedef Vector2DBase<float, MeasurementTag> Measurement2DVector;
+typedef Vector3DBase<float, MeasurementTag> Measurement3DVector;
 
 /// Measurement Vectors are three-dimensional by default.
-typedef Measurement3DVector                     MeasurementVector;
+typedef Measurement3DVector MeasurementVector;
 
-#endif // MeasurementVector_H
+#endif  // MeasurementVector_H
diff --git a/DataFormats/GeometryCommonDetAlgo/interface/PerpendicularBoundPlaneBuilder.h b/DataFormats/GeometryCommonDetAlgo/interface/PerpendicularBoundPlaneBuilder.h
index 416b6af034438..dc8d0818ab2bb 100644
--- a/DataFormats/GeometryCommonDetAlgo/interface/PerpendicularBoundPlaneBuilder.h
+++ b/DataFormats/GeometryCommonDetAlgo/interface/PerpendicularBoundPlaneBuilder.h
@@ -10,10 +10,7 @@
 
 class PerpendicularBoundPlaneBuilder {
 public:
-
-  BoundPlane* operator()( const Surface::GlobalPoint& origin,
-			  const Surface::GlobalVector& perp) const;
-
+  BoundPlane* operator()(const Surface::GlobalPoint& origin, const Surface::GlobalVector& perp) const;
 };
-  
+
 #endif
diff --git a/DataFormats/GeometryCommonDetAlgo/interface/TransverseBoundPlaneFactory.h b/DataFormats/GeometryCommonDetAlgo/interface/TransverseBoundPlaneFactory.h
index f310e06f3430c..adf3185d64388 100644
--- a/DataFormats/GeometryCommonDetAlgo/interface/TransverseBoundPlaneFactory.h
+++ b/DataFormats/GeometryCommonDetAlgo/interface/TransverseBoundPlaneFactory.h
@@ -8,10 +8,7 @@
 
 class TransverseBoundPlaneFactory {
 public:
-
-  BoundPlane* operator()( const Surface::GlobalPoint& origin,
-			  const Surface::GlobalVector& perp) const;
-
+  BoundPlane* operator()(const Surface::GlobalPoint& origin, const Surface::GlobalVector& perp) const;
 };
-  
+
 #endif
diff --git a/DataFormats/GeometryCommonDetAlgo/interface/WeightMatrixTag.h b/DataFormats/GeometryCommonDetAlgo/interface/WeightMatrixTag.h
index 7fac7334f37b7..bddb3c1df9c7c 100644
--- a/DataFormats/GeometryCommonDetAlgo/interface/WeightMatrixTag.h
+++ b/DataFormats/GeometryCommonDetAlgo/interface/WeightMatrixTag.h
@@ -1,13 +1,13 @@
 #ifndef WeightMatrixTag_H
 #define WeightMatrixTag_H
 
-  /**
+/**
    * Tag to apply to class GlobalErrorBase to give it the meaning of a 
    * weight matrix (i.e. the inverse of the covariance matrix).
    * A typedef to a  GlobalErrorBase object defined as a weight is 
    * available in GlobalWeight
    */
 
-class WeightMatrixTag{};
+class WeightMatrixTag {};
 
 #endif
diff --git a/DataFormats/GeometryCommonDetAlgo/src/PerpendicularBoundPlaneBuilder.cc b/DataFormats/GeometryCommonDetAlgo/src/PerpendicularBoundPlaneBuilder.cc
index be8007e25db35..4b720e38fca36 100644
--- a/DataFormats/GeometryCommonDetAlgo/src/PerpendicularBoundPlaneBuilder.cc
+++ b/DataFormats/GeometryCommonDetAlgo/src/PerpendicularBoundPlaneBuilder.cc
@@ -2,29 +2,25 @@
 
 #include "DataFormats/GeometryCommonDetAlgo/interface/PerpendicularBoundPlaneBuilder.h"
 
-BoundPlane* 
-PerpendicularBoundPlaneBuilder::operator()( const Surface::GlobalPoint& origin,
-					    const Surface::GlobalVector& perp) const
-{
+BoundPlane* PerpendicularBoundPlaneBuilder::operator()(const Surface::GlobalPoint& origin,
+                                                       const Surface::GlobalVector& perp) const {
   // z axis coincides with perp
   GlobalVector zAxis = perp.unit();
 
   // x axis has no global Z component
   GlobalVector xAxis;
-  if ( zAxis.x() != 0 || zAxis.y() != 0) {
+  if (zAxis.x() != 0 || zAxis.y() != 0) {
     // precision is not an issue here, just protect against divizion by zero
-    xAxis = GlobalVector( -zAxis.y(), zAxis.x(), 0).unit();
-  }
-  else { // perp coincides with global Z
-    xAxis = GlobalVector( 1, 0, 0);
+    xAxis = GlobalVector(-zAxis.y(), zAxis.x(), 0).unit();
+  } else {  // perp coincides with global Z
+    xAxis = GlobalVector(1, 0, 0);
   }
 
   // y axis obtained by cross product
-  GlobalVector yAxis( zAxis.cross( xAxis));
+  GlobalVector yAxis(zAxis.cross(xAxis));
 
-  Surface::RotationType rot( xAxis.x(), xAxis.y(), xAxis.z(),
-			     yAxis.x(), yAxis.y(), yAxis.z(),
-			     zAxis.x(), zAxis.y(), zAxis.z());
+  Surface::RotationType rot(
+      xAxis.x(), xAxis.y(), xAxis.z(), yAxis.x(), yAxis.y(), yAxis.z(), zAxis.x(), zAxis.y(), zAxis.z());
 
-  return new BoundPlane( origin, rot);
+  return new BoundPlane(origin, rot);
 }
diff --git a/DataFormats/GeometryCommonDetAlgo/src/TransverseBoundPlaneFactory.cc b/DataFormats/GeometryCommonDetAlgo/src/TransverseBoundPlaneFactory.cc
index 7bb59793e7ed1..036a97c98d078 100644
--- a/DataFormats/GeometryCommonDetAlgo/src/TransverseBoundPlaneFactory.cc
+++ b/DataFormats/GeometryCommonDetAlgo/src/TransverseBoundPlaneFactory.cc
@@ -2,10 +2,8 @@
 
 #include "DataFormats/GeometryCommonDetAlgo/interface/TransverseBoundPlaneFactory.h"
 
-BoundPlane* 
-TransverseBoundPlaneFactory::operator()(const Surface::GlobalPoint& origin,
-					const Surface::GlobalVector& dir) const {
-
+BoundPlane* TransverseBoundPlaneFactory::operator()(const Surface::GlobalPoint& origin,
+                                                    const Surface::GlobalVector& dir) const {
   // z axis perpendicular to transverse momentum
   GlobalVector zAxis = GlobalVector(dir.x(), dir.y(), 0.).unit();
 
@@ -15,11 +13,10 @@ TransverseBoundPlaneFactory::operator()(const Surface::GlobalPoint& origin,
   // x axis obtained by cross product
   GlobalVector xAxis = (yAxis.cross(zAxis)).unit();
 
-  Surface::RotationType rot( xAxis.x(), xAxis.y(), xAxis.z(),
-			     yAxis.x(), yAxis.y(), yAxis.z(),
-			     zAxis.x(), zAxis.y(), zAxis.z());
+  Surface::RotationType rot(
+      xAxis.x(), xAxis.y(), xAxis.z(), yAxis.x(), yAxis.y(), yAxis.z(), zAxis.x(), zAxis.y(), zAxis.z());
 
   //  Surface::RotationType rot(yAxis, zAxis);
 
-  return new BoundPlane( origin, rot);
+  return new BoundPlane(origin, rot);
 }
diff --git a/DataFormats/GeometryCommonDetAlgo/src/classes.h b/DataFormats/GeometryCommonDetAlgo/src/classes.h
index 38cf1842bd8d7..1916a600f5753 100644
--- a/DataFormats/GeometryCommonDetAlgo/src/classes.h
+++ b/DataFormats/GeometryCommonDetAlgo/src/classes.h
@@ -2,4 +2,3 @@
 #include "DataFormats/GeometryCommonDetAlgo/interface/Measurement1DFloat.h"
 #include "DataFormats/Common/interface/ValueMap.h"
 #include "DataFormats/Common/interface/Wrapper.h"
-
diff --git a/DataFormats/GeometryCommonDetAlgo/test/PerpendicularBoundPlaneBuilderTest.cpp b/DataFormats/GeometryCommonDetAlgo/test/PerpendicularBoundPlaneBuilderTest.cpp
index f5be69202289f..23447f916fe86 100644
--- a/DataFormats/GeometryCommonDetAlgo/test/PerpendicularBoundPlaneBuilderTest.cpp
+++ b/DataFormats/GeometryCommonDetAlgo/test/PerpendicularBoundPlaneBuilderTest.cpp
@@ -8,13 +8,11 @@
 
 using namespace std;
 int main() {
-
   PerpendicularBoundPlaneBuilder builder;
 
-  GlobalVector v( 1, 2, 3);
+  GlobalVector v(1, 2, 3);
 
-  BoundPlane* plane = builder( GlobalPoint(0,0,0), v);
+  BoundPlane* plane = builder(GlobalPoint(0, 0, 0), v);
 
   cout << "Local direction is " << plane->toLocal(v) << endl;
-
 }
diff --git a/DataFormats/HcalDetId/src/HcalCalibDetId.cc b/DataFormats/HcalDetId/src/HcalCalibDetId.cc
index dcb47350962c8..1a3e291b77c55 100644
--- a/DataFormats/HcalDetId/src/HcalCalibDetId.cc
+++ b/DataFormats/HcalDetId/src/HcalCalibDetId.cc
@@ -86,7 +86,7 @@ HcalSubdetector HcalCalibDetId::hcalSubdet() const {
     
 int HcalCalibDetId::ieta() const {
   CalibDetType cf = calibFlavor();
-  return (cf==CalibrationBox)?(((id_>>11)&0x7)-2):((cf==HOCrosstalk)?(((id_>>7)&0xF)*zside()):(cf==LASERMON?((id_>>10)&0x3F):(((cf==HBX || cf==HEX)?((id_>>10)&0x1F)*zside():(0)))));
+  return (cf==CalibrationBox)?(((id_>>11)&0x7)-2):((cf==HOCrosstalk)?(((id_>>7)&0xF)*zside()):(cf==LASERMON?((id_>>10)&0x3F):(((cf==HBX || cf==HEX)?((id_>>7)&0x1F)*zside():(0)))));
 }
 
 int HcalCalibDetId::iphi() const {
@@ -96,7 +96,7 @@ int HcalCalibDetId::iphi() const {
 
 int HcalCalibDetId::zside() const {
   CalibDetType cf = calibFlavor(); 
-  return (cf==HOCrosstalk)?(((id_>>11)&0x1)?(1):(-1)):((cf==HBX || cf==HEX)?((id_>>12)&0x1)?(1):(-1):(0));
+  return (cf==HOCrosstalk)?(((id_>>11)&0x1)?(1):(-1)):((cf==HBX || cf==HEX)?(((id_>>12)&0x1)?(1):(-1)):(0));
 }
 
 std::string HcalCalibDetId::cboxChannelString() const {
diff --git a/DataFormats/MuonReco/interface/Muon.h b/DataFormats/MuonReco/interface/Muon.h
index dda42aaa900e2..f53881550d096 100755
--- a/DataFormats/MuonReco/interface/Muon.h
+++ b/DataFormats/MuonReco/interface/Muon.h
@@ -219,13 +219,17 @@ namespace reco {
       MultiIsoMedium         = 1UL<<26,   // miniIso with ptRatio and ptRel 
       PuppiIsoLoose          = 1UL<<27,
       PuppiIsoMedium         = 1UL<<28,
-      PuppiIsoTight          = 1UL<<29
+      PuppiIsoTight          = 1UL<<29, 
+      MvaVTight              = 1UL<<30,
+      MvaVVTight             = 1UL<<31,
+      LowPtMvaLoose          = 1UL<<32,
+      LowPtMvaMedium         = 1UL<<33,
     };
     
-    bool passed( unsigned int selection ) const { return (selectors_ & selection)==selection; }
+    bool passed( uint64_t selection ) const { return (selectors_ & selection)==selection; }
     bool passed( Selector selection ) const { return passed(static_cast<unsigned int>(selection)); }
-    unsigned int selectors() const { return selectors_; }
-    void setSelectors( unsigned int selectors ){ selectors_ = selectors; }
+    uint64_t selectors() const { return selectors_; }
+    void setSelectors( uint64_t selectors ){ selectors_ = selectors; }
     void setSelector(Selector selector, bool passed){ 
       if (passed)
 	selectors_ |= selector;
@@ -351,7 +355,7 @@ namespace reco {
     std::pair<const MuonChamberMatch*,const MuonSegmentMatch*> pair( const std::vector<const MuonChamberMatch*> &,
 								     ArbitrationType type = SegmentAndTrackArbitration ) const;
     /// selector bitmap
-    unsigned int selectors_;
+    uint64_t selectors_;
    public:
      /// get number of segments
     int numberOfSegments( int station, int muonSubdetId, ArbitrationType type = SegmentAndTrackArbitration ) const;
diff --git a/DataFormats/MuonReco/src/classes_def.xml b/DataFormats/MuonReco/src/classes_def.xml
index 03703b0181ab0..41c4901add71c 100644
--- a/DataFormats/MuonReco/src/classes_def.xml
+++ b/DataFormats/MuonReco/src/classes_def.xml
@@ -8,7 +8,8 @@ not be used as version numbers. By convention, CMS will use 3 as the
 initial version number of a class which has never been stored before.
 -->
 <lcgdict>
-  <class name="reco::Muon" ClassVersion="19">
+  <class name="reco::Muon" ClassVersion="20">
+   <version ClassVersion="20" checksum="1015091642"/>
    <version ClassVersion="19" checksum="3201675353"/>
    <version ClassVersion="18" checksum="2257088106"/>
    <version ClassVersion="17" checksum="2296096670"/>
diff --git a/DataFormats/PatCandidates/interface/HcalDepthEnergyFractions.h b/DataFormats/PatCandidates/interface/HcalDepthEnergyFractions.h
new file mode 100644
index 0000000000000..ef01fe49cea7a
--- /dev/null
+++ b/DataFormats/PatCandidates/interface/HcalDepthEnergyFractions.h
@@ -0,0 +1,69 @@
+#ifndef DataFormats_PatCandidates_HcalDepthEnergyFractions_h
+#define DataFormats_PatCandidates_HcalDepthEnergyFractions_h
+
+#include <vector>
+#include <cstdint>
+
+namespace pat{
+
+  //
+  // Hcal depth energy fracrtion struct
+  //
+  class HcalDepthEnergyFractions {
+
+  private:
+    //do not store
+    std::vector<float> fractions_;
+    //store
+    std::vector<uint8_t> fractionsI_;
+  public:
+    explicit HcalDepthEnergyFractions(const std::vector<float>& v):
+                              fractions_(v),fractionsI_() { initUint8Vector(); }
+    HcalDepthEnergyFractions():fractions_(),fractionsI_() { }
+    
+    // produce vector of uint8 from vector of float
+    void initUint8Vector() {
+      fractionsI_.clear();
+      for (auto frac : fractions_) fractionsI_.push_back((uint8_t)(frac*200.));
+    }
+    
+    // produce vector of float from vector of uint8_t
+    void initFloatVector() {
+      fractions_.clear();
+      for (auto fracI : fractionsI_) fractions_.push_back(float(fracI)/200.);
+    }
+
+    // reset vectors
+    void reset(std::vector<float> v) {
+      fractions_ = v;
+      initUint8Vector();
+    }
+
+    // provide a full vector for each depth
+    const std::vector<float>& fractions() const {
+      return fractions_;
+    }
+
+    // provide info for individual depth
+    float fraction(unsigned int i) const {
+      if (i<fractions_.size()) return fractions_[i];
+      else return -1.;
+    }
+    
+    // provide a full vector (in uint8_t) for each depth
+    const std::vector<uint8_t>& fractionsI() const {
+      return fractionsI_;
+    }
+
+    // provide info for individual depth (uint8_t)
+    int fractionI(unsigned int i) const {
+      if (i<fractionsI_.size()) return int(fractionsI_[i]);
+      else return -1; // physical range 0-200
+    }
+    
+  };
+
+}
+ 
+#endif
+
diff --git a/DataFormats/PatCandidates/interface/Muon.h b/DataFormats/PatCandidates/interface/Muon.h
index 3ba951890518f..6d7052626d11a 100644
--- a/DataFormats/PatCandidates/interface/Muon.h
+++ b/DataFormats/PatCandidates/interface/Muon.h
@@ -276,6 +276,10 @@ namespace pat {
       float mvaValue() const { return mvaValue_; }
       void  setMvaValue(float mva){ mvaValue_ = mva; }
 
+      // Low pt Muon MVA
+      float lowptMvaValue() const { return lowptMvaValue_; }
+      void  setLowPtMvaValue(float lowptmva){ lowptMvaValue_ = lowptmva; }
+
       /// Soft Muon MVA
       float softMvaValue() const { return softMvaValue_; }
       void  setSoftMvaValue(float softmva){ softMvaValue_ = softmva; }
@@ -292,11 +296,13 @@ namespace pat {
       int simPdgId() const { return simPdgId_;}
       int simMotherPdgId() const { return simMotherPdgId_;}
       int simBX() const { return simBX_;}
+      int simTpEvent() const {   return simTpEvent_;}
       float simProdRho() const { return simProdRho_;}
       float simProdZ() const {   return simProdZ_;}
       float simPt() const {      return simPt_;}
       float simEta() const {     return simEta_;}
       float simPhi() const {     return simPhi_;}
+      float simMatchQuality() const {     return simMatchQuality_;}
 
       void initSimInfo(void); 
       void setSimType(reco::MuonSimType type){ simType_ = type; }
@@ -306,11 +312,13 @@ namespace pat {
       void setSimPdgId(int id){ simPdgId_ = id;}
       void setSimMotherPdgId(int id){ simMotherPdgId_ = id;}
       void setSimBX(int bx){ simBX_ = bx;}
+      void setSimTpEvent(int tpEvent){ simTpEvent_ = tpEvent;}
       void setSimProdRho(float rho){ simProdRho_ = rho;}
       void setSimProdZ(float z){ simProdZ_ = z;}
       void setSimPt(float pt){ simPt_ = pt;}
       void setSimEta(float eta){ simEta_ = eta;}
       void setSimPhi(float phi){ simPhi_ = phi;}
+      void setSimMatchQuality(float quality){ simMatchQuality_ = quality;}
       
       /// Trigger information
       const pat::TriggerObjectStandAlone* l1Object(const size_t idx=0)  const { 
@@ -397,6 +405,7 @@ namespace pat {
 
       /// Muon MVA
       float mvaValue_;
+      float lowptMvaValue_;
       float softMvaValue_;
 
       /// MC matching information
@@ -407,11 +416,13 @@ namespace pat {
       int simPdgId_;
       int simMotherPdgId_;
       int simBX_;
+      int simTpEvent_;
       float simProdRho_;
       float simProdZ_;
       float simPt_;
       float simEta_;
       float simPhi_;
+      float simMatchQuality_;
   };
 
 
diff --git a/DataFormats/PatCandidates/interface/PackedCandidate.h b/DataFormats/PatCandidates/interface/PackedCandidate.h
index fdcbc366891f8..5118a70f6ff5c 100644
--- a/DataFormats/PatCandidates/interface/PackedCandidate.h
+++ b/DataFormats/PatCandidates/interface/PackedCandidate.h
@@ -1,796 +1,1098 @@
 #ifndef __DataFormats_PatCandidates_PackedCandidate_h__
 #define __DataFormats_PatCandidates_PackedCandidate_h__
 
-#include <atomic>
-#include <mutex>
 #include "DataFormats/Candidate/interface/Candidate.h"
 #include "DataFormats/Candidate/interface/CandidateFwd.h"
-#include "DataFormats/Common/interface/RefVector.h"
 #include "DataFormats/Common/interface/Association.h"
-#include "DataFormats/VertexReco/interface/VertexFwd.h"
+#include "DataFormats/Common/interface/RefVector.h"
+#include "DataFormats/Math/interface/deltaPhi.h"
+#include "DataFormats/PatCandidates/interface/CovarianceParameterization.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
-#include "DataFormats/Math/interface/deltaPhi.h" 
+#include "DataFormats/VertexReco/interface/VertexFwd.h"
 #include "FWCore/Utilities/interface/thread_safety_macros.h"
-#include "DataFormats/PatCandidates/interface/CovarianceParameterization.h"
+#include <atomic>
+#include <mutex>
 
 /* #include "DataFormats/Math/interface/PtEtaPhiMass.h" */
 
-//forward declare testing structure
+// forward declare testing structure
 class testPackedCandidate;
 
 namespace pat {
-  class PackedCandidate : public reco::Candidate {
-  public:
-    /// collection of daughter candidates                                                 
-    typedef reco::CandidateCollection daughters;
-    /// Lorentz vector                                                                    
-    typedef math::XYZTLorentzVector LorentzVector;
-    /// Lorentz vector                                                                    
-    typedef math::PtEtaPhiMLorentzVector PolarLorentzVector;
-    /// point in the space                                                                
-    typedef math::XYZPoint Point;
-    /// point in the space                                                                
-    typedef math::XYZVector Vector;
-
-    typedef unsigned int index;
-    /// default constructor
-    PackedCandidate() : 
-      packedPt_(0), packedEta_(0),
-      packedPhi_(0), packedM_(0),
-      packedDxy_(0), packedDz_(0), packedDPhi_(0), packedDEta_(0),packedDTrkPt_(0),
-      packedCovariance_(),
-      packedPuppiweight_(0),
-      packedPuppiweightNoLepDiff_(0),
-      rawCaloFraction_(0),
-      hcalFraction_(0),
-      packedTime_(0),
-      packedTimeError_(0),
-      isIsolatedChargedHadron_(false),
-      p4_(new PolarLorentzVector(0,0,0,0)), p4c_( new LorentzVector(0,0,0,0)), 
-      vertex_(new Point(0,0,0)), dphi_(0), deta_(0), dtrkpt_(0),track_(nullptr), pdgId_(0),
-      qualityFlags_(0), pvRefKey_(reco::VertexRef::invalidKey()),
-      m_(nullptr), packedHits_(0), packedLayers_(0), normalizedChi2_(0),covarianceVersion_(0),covarianceSchema_(0),firstHit_(0) { }
-
-    explicit PackedCandidate( const reco::Candidate & c,
-                              const reco::VertexRefProd &pvRefProd,
-                              reco::VertexRef::key_type pvRefKey) :
-      packedPuppiweight_(0), packedPuppiweightNoLepDiff_(0), rawCaloFraction_(0), hcalFraction_(0),
-      packedTime_(0), packedTimeError_(0), isIsolatedChargedHadron_(false),
-      p4_( new PolarLorentzVector(c.pt(), c.eta(), c.phi(), c.mass())), 
-      p4c_( new LorentzVector(*p4_)), vertex_( new Point(c.vertex())), 
-      dphi_(0), deta_(0), dtrkpt_(0),
-      track_(nullptr), pdgId_(c.pdgId()), qualityFlags_(0), pvRefProd_(pvRefProd),
-      pvRefKey_(pvRefKey),m_(nullptr), packedHits_(0), packedLayers_(0),
-      normalizedChi2_(0),covarianceVersion_(0), covarianceSchema_(0),firstHit_(0) {
-      packBoth();
-    }
-
-    explicit PackedCandidate( const PolarLorentzVector &p4, const Point &vtx,
-                              float trkPt,float etaAtVtx,float phiAtVtx,int pdgId,
-                              const reco::VertexRefProd &pvRefProd,
-                              reco::VertexRef::key_type pvRefKey) :
-      packedPuppiweight_(0), packedPuppiweightNoLepDiff_(0), rawCaloFraction_(0), hcalFraction_(0),
-      packedTime_(0), packedTimeError_(0), isIsolatedChargedHadron_(false),
-      p4_( new PolarLorentzVector(p4) ), p4c_( new LorentzVector(*p4_)), 
-      vertex_( new Point(vtx) ), 
-      dphi_(reco::deltaPhi(phiAtVtx,p4_.load()->phi())), 
-      deta_(std::abs(etaAtVtx-p4_.load()->eta())>=kMinDEtaToStore_ ? etaAtVtx-p4_.load()->eta() : 0.), 
-      dtrkpt_(std::abs(trkPt-p4_.load()->pt())>=kMinDTrkPtToStore_ ? trkPt-p4_.load()->pt() : 0.),
-      track_(nullptr), pdgId_(pdgId),
-      qualityFlags_(0), pvRefProd_(pvRefProd), pvRefKey_(pvRefKey),
-      m_(nullptr),packedHits_(0), packedLayers_(0),normalizedChi2_(0),covarianceVersion_(0),covarianceSchema_(0),firstHit_(0) {
-      packBoth();
-    }
+class PackedCandidate : public reco::Candidate {
+public:
+  /// collection of daughter candidates
+  typedef reco::CandidateCollection daughters;
+  /// Lorentz vector
+  typedef math::XYZTLorentzVector LorentzVector;
+  /// Lorentz vector
+  typedef math::PtEtaPhiMLorentzVector PolarLorentzVector;
+  /// point in the space
+  typedef math::XYZPoint Point;
+  /// point in the space
+  typedef math::XYZVector Vector;
 
-    explicit PackedCandidate( const LorentzVector &p4, const Point &vtx,
-                              float trkPt, float etaAtVtx, float phiAtVtx, int pdgId,
-                              const reco::VertexRefProd &pvRefProd,
-                              reco::VertexRef::key_type pvRefKey) :
-      packedPuppiweight_(0), packedPuppiweightNoLepDiff_(0), rawCaloFraction_(0), hcalFraction_(0),
-      packedTime_(0), packedTimeError_(0), isIsolatedChargedHadron_(false),
-      p4_(new PolarLorentzVector(p4.Pt(), p4.Eta(), p4.Phi(), p4.M())), 
-      p4c_( new LorentzVector(p4)), vertex_( new Point(vtx) ) ,
-      dphi_(reco::deltaPhi(phiAtVtx,p4_.load()->phi())), 
-      deta_(std::abs(etaAtVtx-p4_.load()->eta())>=kMinDEtaToStore_ ? etaAtVtx-p4_.load()->eta() : 0.), 
-      dtrkpt_(std::abs(trkPt-p4_.load()->pt())>=kMinDTrkPtToStore_ ? trkPt-p4_.load()->pt() : 0.),
-      track_(nullptr), pdgId_(pdgId), qualityFlags_(0),
-      pvRefProd_(pvRefProd), pvRefKey_(pvRefKey),
-      m_(nullptr),packedHits_(0),packedLayers_(0),normalizedChi2_(0),covarianceVersion_(0),covarianceSchema_(0),firstHit_(0)  {
-      packBoth();
-    }
+  typedef unsigned int index;
+  /// default constructor
+  PackedCandidate()
+      : packedPt_(0), packedEta_(0), packedPhi_(0), packedM_(0), packedDxy_(0),
+        packedDz_(0), packedDPhi_(0), packedDEta_(0), packedDTrkPt_(0),
+        packedCovariance_(), packedPuppiweight_(0),
+        packedPuppiweightNoLepDiff_(0), rawCaloFraction_(0),
+        rawHcalFraction_(0), caloFraction_(0), hcalFraction_(0), packedTime_(0),
+        packedTimeError_(0), isIsolatedChargedHadron_(false),
+        p4_(new PolarLorentzVector(0, 0, 0, 0)),
+        p4c_(new LorentzVector(0, 0, 0, 0)), vertex_(new Point(0, 0, 0)),
+        dphi_(0), deta_(0), dtrkpt_(0), track_(nullptr), pdgId_(0),
+        qualityFlags_(0), pvRefKey_(reco::VertexRef::invalidKey()), m_(nullptr),
+        packedHits_(0), packedLayers_(0), normalizedChi2_(0),
+        covarianceVersion_(0), covarianceSchema_(0), firstHit_(0) {}
 
-    PackedCandidate( const PackedCandidate& iOther) :
-      packedPt_(iOther.packedPt_), packedEta_(iOther.packedEta_),
-      packedPhi_(iOther.packedPhi_), packedM_(iOther.packedM_),
-      packedDxy_(iOther.packedDxy_), packedDz_(iOther.packedDz_), 
-      packedDPhi_(iOther.packedDPhi_),packedDEta_(iOther.packedDEta_),packedDTrkPt_(iOther.packedDTrkPt_),
-      packedCovariance_(iOther.packedCovariance_),
-      packedPuppiweight_(iOther.packedPuppiweight_), 
-      packedPuppiweightNoLepDiff_(iOther.packedPuppiweightNoLepDiff_),
-      rawCaloFraction_(iOther.rawCaloFraction_),
-      hcalFraction_(iOther.hcalFraction_),
-      packedTime_(iOther.packedTime_),
-      packedTimeError_(iOther.packedTimeError_),
-      isIsolatedChargedHadron_(iOther.isIsolatedChargedHadron_),
-      //Need to trigger unpacking in iOther
-      p4_( new PolarLorentzVector(iOther.polarP4() ) ),
-      p4c_( new LorentzVector(iOther.p4())), vertex_( new Point(iOther.vertex())),
-      dxy_(iOther.dxy_), dz_(iOther.dz_),
-      dphi_(iOther.dphi_), deta_(iOther.deta_), dtrkpt_(iOther.dtrkpt_),
-      track_( iOther.track_ ? new reco::Track(*iOther.track_) : nullptr),
-      pdgId_(iOther.pdgId_), qualityFlags_(iOther.qualityFlags_), 
-      pvRefProd_(iOther.pvRefProd_),pvRefKey_(iOther.pvRefKey_),
-      m_(iOther.m_? new reco::TrackBase::CovarianceMatrix(*iOther.m_) : nullptr),
-      packedHits_(iOther.packedHits_),packedLayers_(iOther.packedLayers_),  normalizedChi2_(iOther.normalizedChi2_),
-      covarianceVersion_(iOther.covarianceVersion_), covarianceSchema_(iOther.covarianceSchema_),firstHit_(iOther.firstHit_)  {
-      }
+  explicit PackedCandidate(const reco::Candidate &c,
+                           const reco::VertexRefProd &pvRefProd,
+                           reco::VertexRef::key_type pvRefKey)
+      : packedPuppiweight_(0), packedPuppiweightNoLepDiff_(0),
+        rawCaloFraction_(0), rawHcalFraction_(0), caloFraction_(0),
+        hcalFraction_(0), packedTime_(0), packedTimeError_(0),
+        isIsolatedChargedHadron_(false),
+        p4_(new PolarLorentzVector(c.pt(), c.eta(), c.phi(), c.mass())),
+        p4c_(new LorentzVector(*p4_)), vertex_(new Point(c.vertex())), dphi_(0),
+        deta_(0), dtrkpt_(0), track_(nullptr), pdgId_(c.pdgId()),
+        qualityFlags_(0), pvRefProd_(pvRefProd), pvRefKey_(pvRefKey),
+        m_(nullptr), packedHits_(0), packedLayers_(0), normalizedChi2_(0),
+        covarianceVersion_(0), covarianceSchema_(0), firstHit_(0) {
+    packBoth();
+  }
 
-    PackedCandidate( PackedCandidate&& iOther) :
-      packedPt_(iOther.packedPt_), packedEta_(iOther.packedEta_),
-      packedPhi_(iOther.packedPhi_), packedM_(iOther.packedM_),
-      packedDxy_(iOther.packedDxy_), packedDz_(iOther.packedDz_), 
-      packedDPhi_(iOther.packedDPhi_), packedDEta_(iOther.packedDEta_), packedDTrkPt_(iOther.packedDTrkPt_),  
-      packedCovariance_(iOther.packedCovariance_),
-      packedPuppiweight_(iOther.packedPuppiweight_), 
-      packedPuppiweightNoLepDiff_(iOther.packedPuppiweightNoLepDiff_),
-      rawCaloFraction_(iOther.rawCaloFraction_),
-      hcalFraction_(iOther.hcalFraction_),
-      packedTime_(iOther.packedTime_),
-      packedTimeError_(iOther.packedTimeError_),
-      isIsolatedChargedHadron_(iOther.isIsolatedChargedHadron_),
-      p4_( iOther.p4_.exchange(nullptr) ) ,
-      p4c_( iOther.p4c_.exchange(nullptr)), vertex_(iOther.vertex_.exchange(nullptr)),
-      dxy_(iOther.dxy_), dz_(iOther.dz_),
-      dphi_(iOther.dphi_), deta_(iOther.deta_), dtrkpt_(iOther.dtrkpt_),
-      track_( iOther.track_.exchange(nullptr) ),
-      pdgId_(iOther.pdgId_), qualityFlags_(iOther.qualityFlags_), 
-      pvRefProd_(std::move(iOther.pvRefProd_)),pvRefKey_(iOther.pvRefKey_),
-      m_( iOther.m_.exchange(nullptr)),
-      packedHits_(iOther.packedHits_), packedLayers_(iOther.packedLayers_),normalizedChi2_(iOther.normalizedChi2_),
-      covarianceVersion_(iOther.covarianceVersion_), covarianceSchema_(iOther.covarianceSchema_),firstHit_(iOther.firstHit_)  {
-      }
+  explicit PackedCandidate(const PolarLorentzVector &p4, const Point &vtx,
+                           float trkPt, float etaAtVtx, float phiAtVtx,
+                           int pdgId, const reco::VertexRefProd &pvRefProd,
+                           reco::VertexRef::key_type pvRefKey)
+      : packedPuppiweight_(0), packedPuppiweightNoLepDiff_(0),
+        rawCaloFraction_(0), rawHcalFraction_(0), caloFraction_(0),
+        hcalFraction_(0), packedTime_(0), packedTimeError_(0),
+        isIsolatedChargedHadron_(false), p4_(new PolarLorentzVector(p4)),
+        p4c_(new LorentzVector(*p4_)), vertex_(new Point(vtx)),
+        dphi_(reco::deltaPhi(phiAtVtx, p4_.load()->phi())),
+        deta_(std::abs(etaAtVtx - p4_.load()->eta()) >= kMinDEtaToStore_
+                  ? etaAtVtx - p4_.load()->eta()
+                  : 0.),
+        dtrkpt_(std::abs(trkPt - p4_.load()->pt()) >= kMinDTrkPtToStore_
+                    ? trkPt - p4_.load()->pt()
+                    : 0.),
+        track_(nullptr), pdgId_(pdgId), qualityFlags_(0), pvRefProd_(pvRefProd),
+        pvRefKey_(pvRefKey), m_(nullptr), packedHits_(0), packedLayers_(0),
+        normalizedChi2_(0), covarianceVersion_(0), covarianceSchema_(0),
+        firstHit_(0) {
+    packBoth();
+  }
 
+  explicit PackedCandidate(const LorentzVector &p4, const Point &vtx,
+                           float trkPt, float etaAtVtx, float phiAtVtx,
+                           int pdgId, const reco::VertexRefProd &pvRefProd,
+                           reco::VertexRef::key_type pvRefKey)
+      : packedPuppiweight_(0), packedPuppiweightNoLepDiff_(0),
+        rawCaloFraction_(0), rawHcalFraction_(0), caloFraction_(0),
+        hcalFraction_(0), packedTime_(0), packedTimeError_(0),
+        isIsolatedChargedHadron_(false),
+        p4_(new PolarLorentzVector(p4.Pt(), p4.Eta(), p4.Phi(), p4.M())),
+        p4c_(new LorentzVector(p4)), vertex_(new Point(vtx)),
+        dphi_(reco::deltaPhi(phiAtVtx, p4_.load()->phi())),
+        deta_(std::abs(etaAtVtx - p4_.load()->eta()) >= kMinDEtaToStore_
+                  ? etaAtVtx - p4_.load()->eta()
+                  : 0.),
+        dtrkpt_(std::abs(trkPt - p4_.load()->pt()) >= kMinDTrkPtToStore_
+                    ? trkPt - p4_.load()->pt()
+                    : 0.),
+        track_(nullptr), pdgId_(pdgId), qualityFlags_(0), pvRefProd_(pvRefProd),
+        pvRefKey_(pvRefKey), m_(nullptr), packedHits_(0), packedLayers_(0),
+        normalizedChi2_(0), covarianceVersion_(0), covarianceSchema_(0),
+        firstHit_(0) {
+    packBoth();
+  }
 
-    PackedCandidate& operator=(const PackedCandidate& iOther) {
-      if(this == &iOther) {
-        return *this;
-      }
-      packedPt_ =iOther.packedPt_;
-      packedEta_=iOther.packedEta_;
-      packedPhi_=iOther.packedPhi_; 
-      packedM_=iOther.packedM_;
-      packedDxy_=iOther.packedDxy_; 
-      packedDz_=iOther.packedDz_; 
-      packedDPhi_=iOther.packedDPhi_;
-      packedDEta_=iOther.packedDEta_;
-      packedDTrkPt_=iOther.packedDTrkPt_;
-      packedCovariance_=iOther.packedCovariance_;
-      packedPuppiweight_=iOther.packedPuppiweight_; 
-      packedPuppiweightNoLepDiff_=iOther.packedPuppiweightNoLepDiff_;
-      rawCaloFraction_=iOther.rawCaloFraction_;
-      hcalFraction_=iOther.hcalFraction_;
-      packedTime_=iOther.packedTime_;
-      packedTimeError_=iOther.packedTimeError_;
-      isIsolatedChargedHadron_=iOther.isIsolatedChargedHadron_;
-      //Need to trigger unpacking in iOther
-      if(p4_) {
-        *p4_ = iOther.polarP4();
-      } else {
-        p4_.store( new PolarLorentzVector(iOther.polarP4() ) ) ;
-      }
-      if(p4c_) {
-        *p4c_ = iOther.p4();
-      } else {
-        p4c_.store( new LorentzVector(iOther.p4()));
-      }
-      if(vertex_) {
-        *vertex_ = iOther.vertex();
-      } else {
-        vertex_.store( new Point(iOther.vertex()));
-      }
-      dxy_=iOther.dxy_;
-      dz_ = iOther.dz_;
-      dphi_=iOther.dphi_; 
-      deta_=iOther.deta_; 
-      dtrkpt_=iOther.dtrkpt_; 
-      
-      if(!iOther.track_) {
-        delete track_.exchange(nullptr);
-      } else {
-        if(!track_) {
-          track_.store( new reco::Track(*iOther.track_));
-        } else {
-          *track_ = *(iOther.track_);
-        }
-      }
+  PackedCandidate(const PackedCandidate &iOther)
+      : packedPt_(iOther.packedPt_), packedEta_(iOther.packedEta_),
+        packedPhi_(iOther.packedPhi_), packedM_(iOther.packedM_),
+        packedDxy_(iOther.packedDxy_), packedDz_(iOther.packedDz_),
+        packedDPhi_(iOther.packedDPhi_), packedDEta_(iOther.packedDEta_),
+        packedDTrkPt_(iOther.packedDTrkPt_),
+        packedCovariance_(iOther.packedCovariance_),
+        packedPuppiweight_(iOther.packedPuppiweight_),
+        packedPuppiweightNoLepDiff_(iOther.packedPuppiweightNoLepDiff_),
+        rawCaloFraction_(iOther.rawCaloFraction_),
+        rawHcalFraction_(iOther.rawHcalFraction_),
+        caloFraction_(iOther.caloFraction_),
+        hcalFraction_(iOther.hcalFraction_), packedTime_(iOther.packedTime_),
+        packedTimeError_(iOther.packedTimeError_),
+        isIsolatedChargedHadron_(iOther.isIsolatedChargedHadron_),
+        // Need to trigger unpacking in iOther
+        p4_(new PolarLorentzVector(iOther.polarP4())),
+        p4c_(new LorentzVector(iOther.p4())),
+        vertex_(new Point(iOther.vertex())), dxy_(iOther.dxy_), dz_(iOther.dz_),
+        dphi_(iOther.dphi_), deta_(iOther.deta_), dtrkpt_(iOther.dtrkpt_),
+        track_(iOther.track_ ? new reco::Track(*iOther.track_) : nullptr),
+        pdgId_(iOther.pdgId_), qualityFlags_(iOther.qualityFlags_),
+        pvRefProd_(iOther.pvRefProd_), pvRefKey_(iOther.pvRefKey_),
+        m_(iOther.m_ ? new reco::TrackBase::CovarianceMatrix(*iOther.m_)
+                     : nullptr),
+        packedHits_(iOther.packedHits_), packedLayers_(iOther.packedLayers_),
+        normalizedChi2_(iOther.normalizedChi2_),
+        covarianceVersion_(iOther.covarianceVersion_),
+        covarianceSchema_(iOther.covarianceSchema_),
+        firstHit_(iOther.firstHit_) {}
 
-      pdgId_=iOther.pdgId_; 
-      qualityFlags_=iOther.qualityFlags_; 
-      pvRefProd_=iOther.pvRefProd_;
-      pvRefKey_=iOther.pvRefKey_;
-      if(!iOther.m_) {
-        delete m_.exchange(nullptr);
-       } else {
-        if(!m_) {
-          m_.store( new reco::Track::CovarianceMatrix(*iOther.m_));
-        } else {
-          *m_ = *(iOther.m_);
-        }
-      }
-      
-	
-      packedHits_=iOther.packedHits_; 
-      packedLayers_=iOther.packedLayers_; 
-      normalizedChi2_=iOther.normalizedChi2_;
-      covarianceVersion_=iOther.covarianceVersion_;
-      covarianceSchema_=iOther.covarianceSchema_;
-      firstHit_=iOther.firstHit_;
-      return *this;
-    }
+  PackedCandidate(PackedCandidate &&iOther)
+      : packedPt_(iOther.packedPt_), packedEta_(iOther.packedEta_),
+        packedPhi_(iOther.packedPhi_), packedM_(iOther.packedM_),
+        packedDxy_(iOther.packedDxy_), packedDz_(iOther.packedDz_),
+        packedDPhi_(iOther.packedDPhi_), packedDEta_(iOther.packedDEta_),
+        packedDTrkPt_(iOther.packedDTrkPt_),
+        packedCovariance_(iOther.packedCovariance_),
+        packedPuppiweight_(iOther.packedPuppiweight_),
+        packedPuppiweightNoLepDiff_(iOther.packedPuppiweightNoLepDiff_),
+        rawCaloFraction_(iOther.rawCaloFraction_),
+        rawHcalFraction_(iOther.rawHcalFraction_),
+        caloFraction_(iOther.caloFraction_),
+        hcalFraction_(iOther.hcalFraction_), packedTime_(iOther.packedTime_),
+        packedTimeError_(iOther.packedTimeError_),
+        isIsolatedChargedHadron_(iOther.isIsolatedChargedHadron_),
+        p4_(iOther.p4_.exchange(nullptr)), p4c_(iOther.p4c_.exchange(nullptr)),
+        vertex_(iOther.vertex_.exchange(nullptr)), dxy_(iOther.dxy_),
+        dz_(iOther.dz_), dphi_(iOther.dphi_), deta_(iOther.deta_),
+        dtrkpt_(iOther.dtrkpt_), track_(iOther.track_.exchange(nullptr)),
+        pdgId_(iOther.pdgId_), qualityFlags_(iOther.qualityFlags_),
+        pvRefProd_(std::move(iOther.pvRefProd_)), pvRefKey_(iOther.pvRefKey_),
+        m_(iOther.m_.exchange(nullptr)), packedHits_(iOther.packedHits_),
+        packedLayers_(iOther.packedLayers_),
+        normalizedChi2_(iOther.normalizedChi2_),
+        covarianceVersion_(iOther.covarianceVersion_),
+        covarianceSchema_(iOther.covarianceSchema_),
+        firstHit_(iOther.firstHit_) {}
 
-    PackedCandidate& operator=(PackedCandidate&& iOther) {
-      if(this == &iOther) {
-        return *this;
-      }
-      packedPt_ =iOther.packedPt_;
-      packedEta_=iOther.packedEta_;
-      packedPhi_=iOther.packedPhi_; 
-      packedM_=iOther.packedM_;
-      packedDxy_=iOther.packedDxy_; 
-      packedDz_=iOther.packedDz_; 
-      packedDPhi_=iOther.packedDPhi_;
-      packedDEta_=iOther.packedDEta_;
-      packedDTrkPt_=iOther.packedDTrkPt_;
-      packedCovariance_=iOther.packedCovariance_;
-      packedPuppiweight_=iOther.packedPuppiweight_; 
-      packedPuppiweightNoLepDiff_=iOther.packedPuppiweightNoLepDiff_;
-      rawCaloFraction_=iOther.rawCaloFraction_;
-      hcalFraction_=iOther.hcalFraction_;
-      packedTime_=iOther.packedTime_;
-      packedTimeError_=iOther.packedTimeError_;
-      isIsolatedChargedHadron_=iOther.isIsolatedChargedHadron_;
-      delete p4_.exchange(iOther.p4_.exchange(nullptr));
-      delete p4c_.exchange(iOther.p4c_.exchange(nullptr));
-      delete vertex_.exchange(iOther.vertex_.exchange(nullptr));
-      dxy_=iOther.dxy_;
-      dz_ = iOther.dz_;
-      dphi_=iOther.dphi_;      
-      deta_=iOther.deta_; 
-      dtrkpt_=iOther.dtrkpt_;
-      delete track_.exchange(iOther.track_.exchange( nullptr));
-      pdgId_=iOther.pdgId_; 
-      qualityFlags_=iOther.qualityFlags_; 
-      pvRefProd_=iOther.pvRefProd_;
-      pvRefKey_=iOther.pvRefKey_;
-      delete m_.exchange(iOther.m_.exchange(nullptr));
-      packedHits_=iOther.packedHits_; 
-      packedLayers_=iOther.packedLayers_; 
-      normalizedChi2_=iOther.normalizedChi2_;
-      covarianceVersion_=iOther.covarianceVersion_;
-      covarianceSchema_=iOther.covarianceSchema_;
-      firstHit_=iOther.firstHit_;
+  PackedCandidate &operator=(const PackedCandidate &iOther) {
+    if (this == &iOther) {
       return *this;
     }
-
-    /// destructor
-    ~PackedCandidate() override;
-    /// number of daughters
-    size_t numberOfDaughters() const override;
-    /// return daughter at a given position (throws an exception)
-    const reco::Candidate * daughter( size_type ) const override;
-    /// number of mothers
-    size_t numberOfMothers() const override;
-    /// return mother at a given position (throws an exception)
-    const reco::Candidate * mother( size_type ) const override;
-    /// return daughter at a given position (throws an exception)
-    reco::Candidate * daughter( size_type ) override;
-    /// return daughter with a specified role name
-    reco::Candidate * daughter(const std::string& s ) override;
-    /// return daughter with a specified role name                                        
-    const reco::Candidate * daughter(const std::string& s ) const override;
-    /// return the number of source Candidates                                            
-    /// ( the candidates used to construct this Candidate)                                
-    size_t numberOfSourceCandidatePtrs() const override {return 0;}
-    /// return a Ptr to one of the source Candidates                                      
-    /// ( the candidates used to construct this Candidate)                                
-    reco::CandidatePtr sourceCandidatePtr( size_type i ) const override {
-      return reco::CandidatePtr();
-    }
-
-    /// electric charge
-    int charge() const override {
-      switch (abs(pdgId_)) {
-      case 211: return (pdgId_>0)-(pdgId_<0);
-      case 11:  return (-1)*(pdgId_>0)+(pdgId_<0); //e
-      case 13:  return (-1)*(pdgId_>0)+(pdgId_<0); //mu
-      case 15:  return (-1)*(pdgId_>0)+(pdgId_<0); //tau
-      case 24:  return (pdgId_>0)-(pdgId_<0); //W
-      default:  return 0;  //FIXME: charge is not defined
-      }
-    }
-    /// set electric charge                                                               
-    void setCharge( int charge) override {}
-    /// electric charge                                                                   
-    int threeCharge() const override {return charge()*3;}
-    /// set electric charge                                                               
-    void setThreeCharge( int threecharge) override {}
-    /// four-momentum Lorentz vecto r                                                      
-    const LorentzVector & p4() const override { if (!p4c_) unpack(); return *p4c_; }  
-    /// four-momentum Lorentz vector                                                      
-    const PolarLorentzVector & polarP4() const override { if (!p4c_) unpack(); return *p4_; }
-    /// spatial momentum vector                                                           
-    Vector momentum() const override  { if (!p4c_) unpack(); return p4c_.load()->Vect(); }
-    /// boost vector to boost a Lorentz vector                                            
-    /// to the particle center of mass system                                             
-    Vector boostToCM() const override { if (!p4c_) unpack(); return p4c_.load()->BoostToCM(); }
-    /// magnitude of momentum vector                                                      
-    double p() const override { if (!p4c_) unpack(); return p4c_.load()->P(); }
-    /// energy                                                                            
-    double energy() const override { if (!p4c_) unpack(); return p4c_.load()->E(); }
-   /// transverse energy 
-    double et() const override { return (pt()<=0) ? 0 : p4c_.load()->Et(); }  
-    /// transverse energy squared (use this for cuts)!
-    double et2() const override { return (pt()<=0) ? 0 : p4c_.load()->Et2(); }   
-    /// mass                                                                              
-    double mass() const override { if (!p4c_) unpack(); return p4_.load()->M(); }
-    /// mass squared                                                                      
-    double massSqr() const override { if (!p4c_) unpack(); auto m = p4_.load()->M(); return m*m;}
-
-    /// transverse mass                                                                   
-    double mt() const override { if (!p4c_) unpack(); return p4_.load()->Mt(); }
-    /// transverse mass squared                                                           
-    double mtSqr() const override { if (!p4c_) unpack(); return p4_.load()->Mt2(); }
-    /// x coordinate of momentum vector                                                   
-    double px() const override { if (!p4c_) unpack(); return p4c_.load()->Px(); }
-    /// y coordinate of momentum vector                                                   
-    double py() const override { if (!p4c_) unpack(); return p4c_.load()->Py(); }
-    /// z coordinate of momentum vector                                                   
-    double pz() const override { if (!p4c_) unpack(); return p4c_.load()->Pz(); }
-    /// transverse momentum                                                               
-    double pt() const override { if (!p4c_) unpack(); return p4_.load()->Pt();}
-    /// momentum azimuthal angle                                                          
-    double phi() const override { if (!p4c_) unpack(); return p4_.load()->Phi(); }
-   
-    /// pt from the track (normally identical to pt())
-    virtual double ptTrk() const {
-        maybeUnpackBoth(); 
-	return p4_.load()->pt() + dtrkpt_;
-    }
-    /// momentum azimuthal angle from the track (normally identical to phi())
-    virtual float phiAtVtx() const { 
-        maybeUnpackBoth(); 
-        float ret = p4_.load()->Phi() + dphi_; 
-        while (ret >  float(M_PI)) ret -= 2*float(M_PI); 
-        while (ret < -float(M_PI)) ret += 2*float(M_PI); 
-        return ret; 
-    } 
-    /// eta from the track (normally identical to eta())
-    virtual float etaAtVtx() const { 
-        maybeUnpackBoth(); 
-        return p4_.load()->eta() + deta_; 
-    }
-    
-    /// momentum polar angle                                                              
-    double theta() const override { if (!p4c_) unpack(); return p4_.load()->Theta(); }
-    /// momentum pseudorapidity                                                           
-    double eta() const override { if (!p4c_) unpack(); return p4_.load()->Eta(); }
-    /// rapidity                                                                          
-    double rapidity() const override { if (!p4c_) unpack(); return p4_.load()->Rapidity(); }
-    /// rapidity                                                                          
-    double y() const override { if (!p4c_) unpack(); return p4_.load()->Rapidity(); }
-    /// set 4-momentum                                                                    
-    void setP4( const LorentzVector & p4 ) override { 
-        maybeUnpackBoth(); // changing px,py,pz changes also mapping between dxy,dz and x,y,z
-	dphi_+=polarP4().Phi()-p4.Phi();
-	deta_+=polarP4().Eta()-p4.Eta();
-	dtrkpt_+=polarP4().Pt()-p4.Pt();
-        *p4_ = PolarLorentzVector(p4.Pt(), p4.Eta(), p4.Phi(), p4.M());
-        packBoth();
+    packedPt_ = iOther.packedPt_;
+    packedEta_ = iOther.packedEta_;
+    packedPhi_ = iOther.packedPhi_;
+    packedM_ = iOther.packedM_;
+    packedDxy_ = iOther.packedDxy_;
+    packedDz_ = iOther.packedDz_;
+    packedDPhi_ = iOther.packedDPhi_;
+    packedDEta_ = iOther.packedDEta_;
+    packedDTrkPt_ = iOther.packedDTrkPt_;
+    packedCovariance_ = iOther.packedCovariance_;
+    packedPuppiweight_ = iOther.packedPuppiweight_;
+    packedPuppiweightNoLepDiff_ = iOther.packedPuppiweightNoLepDiff_;
+    rawCaloFraction_ = iOther.rawCaloFraction_;
+    rawHcalFraction_ = iOther.rawHcalFraction_;
+    caloFraction_ = iOther.caloFraction_;
+    hcalFraction_ = iOther.hcalFraction_;
+    packedTime_ = iOther.packedTime_;
+    packedTimeError_ = iOther.packedTimeError_;
+    isIsolatedChargedHadron_ = iOther.isIsolatedChargedHadron_;
+    // Need to trigger unpacking in iOther
+    if (p4_) {
+      *p4_ = iOther.polarP4();
+    } else {
+      p4_.store(new PolarLorentzVector(iOther.polarP4()));
     }
-    /// set 4-momentum                                                                    
-    void setP4( const PolarLorentzVector & p4 ) override { 
-        maybeUnpackBoth(); // changing px,py,pz changes also mapping between dxy,dz and x,y,z
-	dphi_+=polarP4().Phi()-p4.Phi();
-	deta_+=polarP4().Eta()-p4.Eta();
-	dtrkpt_+=polarP4().Pt()-p4.Pt();
-        *p4_ = p4; 
-        packBoth();
+    if (p4c_) {
+      *p4c_ = iOther.p4();
+    } else {
+      p4c_.store(new LorentzVector(iOther.p4()));
     }
-    /// set particle mass                                                                 
-    void setMass( double m ) override {
-      if (!p4c_) unpack(); 
-      *p4_ = PolarLorentzVector(p4_.load()->Pt(), p4_.load()->Eta(), p4_.load()->Phi(), m); 
-      pack();
-    }
-    void setPz( double pz ) override {
-      maybeUnpackBoth(); // changing px,py,pz changes also mapping between dxy,dz and x,y,z
-      *p4c_ = LorentzVector(p4c_.load()->Px(), p4c_.load()->Py(), pz, p4c_.load()->E());
-      dphi_+=polarP4().Phi()- p4c_.load()->Phi();
-      deta_+=polarP4().Eta()- p4c_.load()->Eta();
-      dtrkpt_+=polarP4().Pt()- p4c_.load()->Pt();
-      *p4_  = PolarLorentzVector(p4c_.load()->Pt(), p4c_.load()->Eta(), p4c_.load()->Phi(), p4c_.load()->M());
-      packBoth();
-    }
-    /// set impact parameters covariance
-
-    // Note: mask is also the maximum value
-    enum trackHitShiftsAndMasks {
-      trackPixelHitsMask = 7,
-      trackStripHitsMask = 31, trackStripHitsShift = 3
-    };
-
-    // set number of tracker hits and layers
-    virtual void setHits( const reco::Track & tk) {
-      // first we count the number of layers with hits
-      int numberOfPixelLayers_ = tk.hitPattern().pixelLayersWithMeasurement();
-      if (numberOfPixelLayers_ > trackPixelHitsMask) numberOfPixelLayers_ = trackPixelHitsMask;
-      int numberOfStripLayers_ = tk.hitPattern().stripLayersWithMeasurement();
-      if (numberOfStripLayers_ > trackStripHitsMask) numberOfStripLayers_ = trackStripHitsMask;
-      packedLayers_ = (numberOfPixelLayers_&trackPixelHitsMask) | (numberOfStripLayers_ << trackStripHitsShift);
-      // now we count number of additional hits, beyond the one-per-layer implied by packedLayers_
-      int numberOfPixelHits_ = tk.hitPattern().numberOfValidPixelHits() - numberOfPixelLayers_;
-      if (numberOfPixelHits_ > trackPixelHitsMask) numberOfPixelHits_ = trackPixelHitsMask;
-      int numberOfStripHits_ = tk.hitPattern().numberOfValidHits() - numberOfPixelHits_ - numberOfPixelLayers_ - numberOfStripLayers_;
-      if (numberOfStripHits_ > trackStripHitsMask) numberOfStripHits_ = trackStripHitsMask;
-
-      packedHits_ = (numberOfPixelHits_&trackPixelHitsMask) | (numberOfStripHits_ << trackStripHitsShift);
-    }
-  
-    virtual void setTrackProperties( const reco::Track & tk, const reco::Track::CovarianceMatrix & covariance,int quality,int covarianceVersion) {
-      covarianceVersion_ = covarianceVersion ;
-      covarianceSchema_ = quality ;
-      normalizedChi2_ = tk.normalizedChi2();
-      setHits(tk);
-      packBoth();
-      packCovariance(covariance,false); 
+    if (vertex_) {
+      *vertex_ = iOther.vertex();
+    } else {
+      vertex_.store(new Point(iOther.vertex()));
     }
+    dxy_ = iOther.dxy_;
+    dz_ = iOther.dz_;
+    dphi_ = iOther.dphi_;
+    deta_ = iOther.deta_;
+    dtrkpt_ = iOther.dtrkpt_;
 
-    // set track properties using quality and covarianceVersion to define the level of details in the cov. matrix	
-    virtual void setTrackProperties( const reco::Track & tk,int quality,int covarianceVersion ) {
-	setTrackProperties(tk,tk.covariance(), quality,covarianceVersion );
-    }	
- 
-    int numberOfPixelHits() const { return (packedHits_ & trackPixelHitsMask) + pixelLayersWithMeasurement(); }
-    int numberOfHits() const { return (packedHits_ >> trackStripHitsShift) + stripLayersWithMeasurement() + numberOfPixelHits(); }
-    int pixelLayersWithMeasurement() const { return packedLayers_ & trackPixelHitsMask; }
-    int stripLayersWithMeasurement() const { return (packedLayers_ >> trackStripHitsShift); }
-    int trackerLayersWithMeasurement() const { return stripLayersWithMeasurement() + pixelLayersWithMeasurement(); }
-    virtual void setCovarianceVersion(int v) {covarianceVersion_=v;}
-    int covarianceVersion() const { return covarianceVersion_;}
-    int covarianceSchema() const { return covarianceSchema_;}
-
-	
-    /// vertex position
-    const Point & vertex() const override { maybeUnpackBoth(); return *vertex_; }//{ if (fromPV_) return Point(0,0,0); else return Point(0,0,100); }
-    /// x coordinate of vertex position                                                   
-    double vx() const override  { maybeUnpackBoth(); return vertex_.load()->X(); }//{ return 0; }
-    /// y coordinate of vertex position                                                   
-    double vy() const override  { maybeUnpackBoth(); return vertex_.load()->Y(); }//{ return 0; }
-    /// z coordinate of vertex position                                                   
-    double vz() const override  { maybeUnpackBoth(); return vertex_.load()->Z(); }//{ if (fromPV_) return 0; else return 100; }
-    /// set vertex                                                                        
-    void setVertex( const Point & vertex ) override { maybeUnpackBoth(); *vertex_ = vertex; packVtx(); }
-
-    ///This refers to the association to PV=ipv. >=PVLoose corresponds to JME definition, >=PVTight to isolation definition
-    enum PVAssoc { NoPV=0, PVLoose=1, PVTight=2, PVUsedInFit=3 } ;
-    const PVAssoc fromPV(size_t ipv=0) const {
-        reco::VertexRef pvRef = vertexRef();
-        if(pvAssociationQuality()==UsedInFitTight and pvRef.key()==ipv) return PVUsedInFit;
-        if(pvRef.key()==ipv or abs(pdgId())==13 or abs(pdgId())==11 ) return PVTight;
-        if(pvAssociationQuality() == CompatibilityBTag and std::abs(dzAssociatedPV()) >  std::abs(dz(ipv))) return PVTight; // it is not closest, but at least prevents the B assignment stealing
-        if(pvAssociationQuality() < UsedInFitLoose or pvRef->ndof() < 4.0 ) return PVLoose;
-        return NoPV;
+    if (!iOther.track_) {
+      delete track_.exchange(nullptr);
+    } else {
+      if (!track_) {
+        track_.store(new reco::Track(*iOther.track_));
+      } else {
+        *track_ = *(iOther.track_);
+      }
     }
 
-    /// The following contains information about how the association to the PV, given in vertexRef, is obtained.
-    ///
-    enum PVAssociationQuality { NotReconstructedPrimary=0,OtherDeltaZ=1,CompatibilityBTag=4,CompatibilityDz=5,UsedInFitLoose=6,UsedInFitTight=7};
-    const PVAssociationQuality pvAssociationQuality() const { return PVAssociationQuality((qualityFlags_ & assignmentQualityMask)>>assignmentQualityShift); }
-    void setAssociationQuality( PVAssociationQuality q )   {  qualityFlags_ = (qualityFlags_ & ~assignmentQualityMask) | ((q << assignmentQualityShift) & assignmentQualityMask);  }
-
-    const reco::VertexRef vertexRef() const { return reco::VertexRef(pvRefProd_, pvRefKey_); }
-
-    /// dxy with respect to the PV ref
-    virtual float dxy() const { maybeUnpackBoth(); return dxy_; }
-    /// dz with respect to the PV[ipv]
-    virtual float dz(size_t ipv=0)  const { maybeUnpackBoth(); return dz_ + (*pvRefProd_)[pvRefKey_].position().z()-(*pvRefProd_)[ipv].position().z(); }
-    /// dz with respect to the PV ref
-    virtual float dzAssociatedPV()  const { maybeUnpackBoth(); return dz_; }
-    /// dxy with respect to another point
-    virtual float dxy(const Point &p) const ;
-    /// dz  with respect to another point
-    virtual float dz(const Point &p)  const ;
-
-    /// uncertainty on dz 
-    float dzError() const override { maybeUnpackCovariance(); return sqrt((*m_.load())(4,4)); }
-    /// uncertainty on dxy
-    float dxyError() const override { maybeUnpackCovariance(); return sqrt((*m_.load())(3,3)); }
-
-
-    /// Return reference to a pseudo track made with candidate kinematics, parameterized error for eta,phi,pt and full IP covariance	
-    virtual const reco::Track & pseudoTrack() const { if (!track_) unpackTrk(); return *track_; }
-
-    /// return a pointer to the track if present. otherwise, return a null pointer
-    const reco::Track * bestTrack() const override {
-      if (packedHits_!=0 || packedLayers_ !=0) {
-        maybeUnpackTrack();
-        return track_.load();
+    pdgId_ = iOther.pdgId_;
+    qualityFlags_ = iOther.qualityFlags_;
+    pvRefProd_ = iOther.pvRefProd_;
+    pvRefKey_ = iOther.pvRefKey_;
+    if (!iOther.m_) {
+      delete m_.exchange(nullptr);
+    } else {
+      if (!m_) {
+        m_.store(new reco::Track::CovarianceMatrix(*iOther.m_));
+      } else {
+        *m_ = *(iOther.m_);
       }
-      else
-        return nullptr;
-    }
-    /// Return true if a bestTrack can be extracted from this Candidate
-    bool hasTrackDetails() const {return  (packedHits_!=0 || packedLayers_ !=0); }
-      
-
-    /// true if the track had the highPurity quality bit
-    bool trackHighPurity() const { return (qualityFlags_ & trackHighPurityMask)>>trackHighPurityShift; }
-    /// set to true if the track had the highPurity quality bit
-    void setTrackHighPurity(bool highPurity) {  qualityFlags_ = (qualityFlags_ & ~trackHighPurityMask) | ((highPurity << trackHighPurityShift) & trackHighPurityMask);  }
-
-    /// Enumerator specifying the 
-    enum LostInnerHits {
-        validHitInFirstPixelBarrelLayer=-1,
-        noLostInnerHits=0,   // it could still not have a hit in the first layer, e.g. if it crosses an inactive sensor
-        oneLostInnerHit=1,   
-        moreLostInnerHits=2
-    };
-    LostInnerHits lostInnerHits() const {
-         return LostInnerHits(int16_t((qualityFlags_ & lostInnerHitsMask)>>lostInnerHitsShift)-1);
-    }
-    void setLostInnerHits(LostInnerHits hits) {
-        int lost = hits; if (lost > 2) lost = 2; // protection against misuse
-        lost++; // shift so it's 0 .. 3 instead of (-1) .. 2
-        qualityFlags_ = (qualityFlags_ & ~lostInnerHitsMask) | ((lost << lostInnerHitsShift) & lostInnerHitsMask); 
     }
 
-    /// Set first hit from HitPattern
-    void setFirstHit(uint16_t pattern) {
-	firstHit_=pattern;
-    }
-    /// Return first hit from HitPattern for tracks with high level details
-    uint16_t firstHit() const { return	firstHit_;}
+    packedHits_ = iOther.packedHits_;
+    packedLayers_ = iOther.packedLayers_;
+    normalizedChi2_ = iOther.normalizedChi2_;
+    covarianceVersion_ = iOther.covarianceVersion_;
+    covarianceSchema_ = iOther.covarianceSchema_;
+    firstHit_ = iOther.firstHit_;
+    return *this;
+  }
 
-    void setMuonID(bool isStandAlone, bool isGlobal) {
-        int16_t muonFlags = isStandAlone | (2*isGlobal);
-        qualityFlags_ = (qualityFlags_ & ~muonFlagsMask) | ((muonFlags << muonFlagsShift) & muonFlagsMask);
+  PackedCandidate &operator=(PackedCandidate &&iOther) {
+    if (this == &iOther) {
+      return *this;
     }
+    packedPt_ = iOther.packedPt_;
+    packedEta_ = iOther.packedEta_;
+    packedPhi_ = iOther.packedPhi_;
+    packedM_ = iOther.packedM_;
+    packedDxy_ = iOther.packedDxy_;
+    packedDz_ = iOther.packedDz_;
+    packedDPhi_ = iOther.packedDPhi_;
+    packedDEta_ = iOther.packedDEta_;
+    packedDTrkPt_ = iOther.packedDTrkPt_;
+    packedCovariance_ = iOther.packedCovariance_;
+    packedPuppiweight_ = iOther.packedPuppiweight_;
+    packedPuppiweightNoLepDiff_ = iOther.packedPuppiweightNoLepDiff_;
+    rawCaloFraction_ = iOther.rawCaloFraction_;
+    rawHcalFraction_ = iOther.rawHcalFraction_;
+    caloFraction_ = iOther.caloFraction_;
+    hcalFraction_ = iOther.hcalFraction_;
+    packedTime_ = iOther.packedTime_;
+    packedTimeError_ = iOther.packedTimeError_;
+    isIsolatedChargedHadron_ = iOther.isIsolatedChargedHadron_;
+    delete p4_.exchange(iOther.p4_.exchange(nullptr));
+    delete p4c_.exchange(iOther.p4c_.exchange(nullptr));
+    delete vertex_.exchange(iOther.vertex_.exchange(nullptr));
+    dxy_ = iOther.dxy_;
+    dz_ = iOther.dz_;
+    dphi_ = iOther.dphi_;
+    deta_ = iOther.deta_;
+    dtrkpt_ = iOther.dtrkpt_;
+    delete track_.exchange(iOther.track_.exchange(nullptr));
+    pdgId_ = iOther.pdgId_;
+    qualityFlags_ = iOther.qualityFlags_;
+    pvRefProd_ = iOther.pvRefProd_;
+    pvRefKey_ = iOther.pvRefKey_;
+    delete m_.exchange(iOther.m_.exchange(nullptr));
+    packedHits_ = iOther.packedHits_;
+    packedLayers_ = iOther.packedLayers_;
+    normalizedChi2_ = iOther.normalizedChi2_;
+    covarianceVersion_ = iOther.covarianceVersion_;
+    covarianceSchema_ = iOther.covarianceSchema_;
+    firstHit_ = iOther.firstHit_;
+    return *this;
+  }
 
-    void setGoodEgamma(bool isGoodEgamma = true) {
-        int16_t egFlags = (isGoodEgamma << egammaFlagsShift) & egammaFlagsMask;
-        qualityFlags_ = (qualityFlags_& ~egammaFlagsMask) | egFlags;
-    }
+  /// destructor
+  ~PackedCandidate() override;
+  /// number of daughters
+  size_t numberOfDaughters() const override;
+  /// return daughter at a given position (throws an exception)
+  const reco::Candidate *daughter(size_type) const override;
+  /// number of mothers
+  size_t numberOfMothers() const override;
+  /// return mother at a given position (throws an exception)
+  const reco::Candidate *mother(size_type) const override;
+  /// return daughter at a given position (throws an exception)
+  reco::Candidate *daughter(size_type) override;
+  /// return daughter with a specified role name
+  reco::Candidate *daughter(const std::string &s) override;
+  /// return daughter with a specified role name
+  const reco::Candidate *daughter(const std::string &s) const override;
+  /// return the number of source Candidates
+  /// ( the candidates used to construct this Candidate)
+  size_t numberOfSourceCandidatePtrs() const override { return 0; }
+  /// return a Ptr to one of the source Candidates
+  /// ( the candidates used to construct this Candidate)
+  reco::CandidatePtr sourceCandidatePtr(size_type i) const override {
+    return reco::CandidatePtr();
+  }
 
-    /// PDG identifier                                                                    
-    int pdgId() const override   { return pdgId_; }
-    // set PDG identifier                                                                 
-    void setPdgId( int pdgId ) override   { pdgId_ = pdgId; }
-    /// status word                                                                       
-    int status() const override   { return qualityFlags_; } /*FIXME*/
-    /// set status word                                                                   
-    void setStatus( int status ) override {} /*FIXME*/
-    /// long lived flag                                                                   
-    static const unsigned int longLivedTag = 0; /*FIXME*/
-    /// set long lived flag                                                               
-    void setLongLived() override {} /*FIXME*/
-    /// is long lived?                                                                    
-    bool longLived() const override;
-    /// do mass constraint flag
-    static const unsigned int massConstraintTag = 0; /*FIXME*/ 
-    /// set mass constraint flag
-    void setMassConstraint() override {} /*FIXME*/
-    /// do mass constraint?
-    bool massConstraint() const override;
-
-    /// returns a clone of the Candidate object                                           
-    PackedCandidate * clone() const override  {
-      return new PackedCandidate( *this );
+  /// electric charge
+  int charge() const override {
+    switch (abs(pdgId_)) {
+    case 211:
+      return (pdgId_ > 0) - (pdgId_ < 0);
+    case 11:
+      return (-1) * (pdgId_ > 0) + (pdgId_ < 0); // e
+    case 13:
+      return (-1) * (pdgId_ > 0) + (pdgId_ < 0); // mu
+    case 15:
+      return (-1) * (pdgId_ > 0) + (pdgId_ < 0); // tau
+    case 24:
+      return (pdgId_ > 0) - (pdgId_ < 0); // W
+    default:
+      return 0; // FIXME: charge is not defined
     }
+  }
+  /// set electric charge
+  void setCharge(int charge) override {}
+  /// electric charge
+  int threeCharge() const override { return charge() * 3; }
+  /// set electric charge
+  void setThreeCharge(int threecharge) override {}
+  /// four-momentum Lorentz vecto r
+  const LorentzVector &p4() const override {
+    if (!p4c_)
+      unpack();
+    return *p4c_;
+  }
+  /// four-momentum Lorentz vector
+  const PolarLorentzVector &polarP4() const override {
+    if (!p4c_)
+      unpack();
+    return *p4_;
+  }
+  /// spatial momentum vector
+  Vector momentum() const override {
+    if (!p4c_)
+      unpack();
+    return p4c_.load()->Vect();
+  }
+  /// boost vector to boost a Lorentz vector
+  /// to the particle center of mass system
+  Vector boostToCM() const override {
+    if (!p4c_)
+      unpack();
+    return p4c_.load()->BoostToCM();
+  }
+  /// magnitude of momentum vector
+  double p() const override {
+    if (!p4c_)
+      unpack();
+    return p4c_.load()->P();
+  }
+  /// energy
+  double energy() const override {
+    if (!p4c_)
+      unpack();
+    return p4c_.load()->E();
+  }
+  /// transverse energy
+  double et() const override { return (pt() <= 0) ? 0 : p4c_.load()->Et(); }
+  /// transverse energy squared (use this for cuts)!
+  double et2() const override { return (pt() <= 0) ? 0 : p4c_.load()->Et2(); }
+  /// mass
+  double mass() const override {
+    if (!p4c_)
+      unpack();
+    return p4_.load()->M();
+  }
+  /// mass squared
+  double massSqr() const override {
+    if (!p4c_)
+      unpack();
+    auto m = p4_.load()->M();
+    return m * m;
+  }
 
-    /// chi-squares                                                                                                    
-    double vertexChi2() const override;
-    /** Number of degrees of freedom                                                                                   
-     *  Meant to be Double32_t for soft-assignment fitters:                                                            
-     *  tracks may contribute to the vertex with fractional weights.                                                   
-     *  The ndof is then = to the sum of the track weights.                                                            
-     *  see e.g. CMS NOTE-2006/032, CMS NOTE-2004/002                                                                  
-     */
-    double vertexNdof() const override;
-    /// chi-squared divided by n.d.o.f.                                                                                
-    double vertexNormalizedChi2() const override;
-    /// (i, j)-th element of error matrix, i, j = 0, ... 2                                                             
-    double vertexCovariance(int i, int j) const override;
-    /// return SMatrix                                                                                                 
-    CovarianceMatrix vertexCovariance() const override   { CovarianceMatrix m; fillVertexCovariance(m); return m; }
-    /// fill SMatrix                                                                                                   
-    void fillVertexCovariance(CovarianceMatrix & v) const override;
-    /// returns true if this candidate has a reference to a master clone.                                              
-    /// This only happens if the concrete Candidate type is ShallowCloneCandidate                                      
-    bool hasMasterClone() const override;
-    /// returns ptr to master clone, if existing.                                                                      
-    /// Throws an exception unless the concrete Candidate type is ShallowCloneCandidate                                
-    const reco::CandidateBaseRef & masterClone() const override;
-    /// returns true if this candidate has a ptr to a master clone.                                                    
-    /// This only happens if the concrete Candidate type is ShallowClonePtrCandidate                                   
-    bool hasMasterClonePtr() const override;
-    /// returns ptr to master clone, if existing.                                                                      
-    /// Throws an exception unless the concrete Candidate type is ShallowClonePtrCandidate                             
-
-    const reco::CandidatePtr & masterClonePtr() const override;
-
-    /// cast master clone reference to a concrete type
-    template<typename Ref>
-      Ref masterRef() const { return masterClone().template castTo<Ref>(); }
-
-    bool isElectron() const override { return false; }
-    bool isMuon() const override { return false; }
-    bool isStandAloneMuon() const override { return ((qualityFlags_ & muonFlagsMask) >> muonFlagsShift) & 1; }
-    bool isGlobalMuon() const override { return ((qualityFlags_ & muonFlagsMask) >> muonFlagsShift) & 2; }
-    bool isTrackerMuon() const override { return false; }
-    bool isCaloMuon() const override { return false; }
-    bool isPhoton() const override { return false; }
-    bool isConvertedPhoton() const override { return false; }
-    bool isJet() const override { return false; }
-    bool isGoodEgamma() const { return (qualityFlags_ & egammaFlagsMask) !=0; }
-
-    // puppiweights
-    void setPuppiWeight(float p, float p_nolep = 0.0);  /// Set both weights at once (with option for only full PUPPI)
-    float puppiWeight() const;                          /// Weight from full PUPPI
-    float puppiWeightNoLep() const;                     /// Weight from PUPPI removing leptons
-    
-    // for the neutral fractions
-    void setRawCaloFraction(float p);                      /// Set the raw ECAL+HCAL energy over candidate energy for isolated charged hadrons
-    float rawCaloFraction() const { return (rawCaloFraction_/100.); }    /// Raw ECAL+HCAL energy over candidate energy for isolated charged hadrons
-    void setHcalFraction(float p);                      /// Set the fraction of Hcal needed for HF and neutral hadrons and isolated charged hadrons
-    float hcalFraction() const { return (hcalFraction_/100.); }    /// Fraction of Ecal and Hcal for HF and neutral hadrons and isolated charged hadrons
-
-     // isolated charged hadrons
-    void setIsIsolatedChargedHadron(bool p);                      /// Set isolation (as in particle flow, i.e. at calorimeter surface rather than at PV) flat for charged hadrons
-    bool isIsolatedChargedHadron() const { return isIsolatedChargedHadron_; }    /// Flag isolation (as in particle flow, i.e. at calorimeter surface rather than at PV) flag for charged hadrons
-
-    struct PackedCovariance {
-        PackedCovariance(): dxydxy(0),dxydz(0),dzdz(0),dlambdadz(0),dphidxy(0),dptdpt(0),detadeta(0),dphidphi(0) {}
-        //3D IP covariance
-        uint16_t dxydxy;
-        uint16_t dxydz;
-        uint16_t dzdz;
-        //other IP relevant elements
-        uint16_t dlambdadz;
-        uint16_t dphidxy;
-        //other diag elements
-        uint16_t dptdpt;
-        uint16_t detadeta;
-        uint16_t dphidphi;
-    };
-
-    /// time (wrt nominal zero of the collision)
-    virtual float time()  const { return vertexRef()->t() + dtimeAssociatedPV(); }
-    /// dtime with respect to the PV[ipv]
-    virtual float dtime(size_t ipv=0)  const { return dtimeAssociatedPV() + (*pvRefProd_)[pvRefKey_].t()-(*pvRefProd_)[ipv].t(); }
-    /// dtime with respect to the PV ref
-    virtual float dtimeAssociatedPV()  const {
-        if (packedTime_ == 0) return 0.f;
-        if (packedTimeError_ > 0) return unpackTimeWithError(packedTime_,packedTimeError_);
-        else return unpackTimeNoError(packedTime_);
-    }
-    /// time measurement uncertainty (-1 if not available)
-    virtual float timeError() const { return unpackTimeError(packedTimeError_); }
-    /// set time measurement
-    void setDTimeAssociatedPV(float aTime, float aTimeError=0) ;
-    /// set time measurement
-    void setTime(float aTime, float aTimeError=0) { setDTimeAssociatedPV(aTime - vertexRef()->t(), aTimeError); }
-
-  private:
-    void unpackCovarianceElement(reco::TrackBase::CovarianceMatrix & m, uint16_t packed, int i,int j) const {
-      m(i,j)= covarianceParameterization().unpack(packed,covarianceSchema_,i,j,pt(),eta(),numberOfHits(), numberOfPixelHits());
-    }
-    uint16_t packCovarianceElement(const reco::TrackBase::CovarianceMatrix &m,int i,int j) const {
-      return covarianceParameterization().pack(m(i,j),covarianceSchema_,i,j,pt(),eta(),numberOfHits(), numberOfPixelHits());
-    }
+  /// transverse mass
+  double mt() const override {
+    if (!p4c_)
+      unpack();
+    return p4_.load()->Mt();
+  }
+  /// transverse mass squared
+  double mtSqr() const override {
+    if (!p4c_)
+      unpack();
+    return p4_.load()->Mt2();
+  }
+  /// x coordinate of momentum vector
+  double px() const override {
+    if (!p4c_)
+      unpack();
+    return p4c_.load()->Px();
+  }
+  /// y coordinate of momentum vector
+  double py() const override {
+    if (!p4c_)
+      unpack();
+    return p4c_.load()->Py();
+  }
+  /// z coordinate of momentum vector
+  double pz() const override {
+    if (!p4c_)
+      unpack();
+    return p4c_.load()->Pz();
+  }
+  /// transverse momentum
+  double pt() const override {
+    if (!p4c_)
+      unpack();
+    return p4_.load()->Pt();
+  }
+  /// momentum azimuthal angle
+  double phi() const override {
+    if (!p4c_)
+      unpack();
+    return p4_.load()->Phi();
+  }
+
+  /// pt from the track (normally identical to pt())
+  virtual double ptTrk() const {
+    maybeUnpackBoth();
+    return p4_.load()->pt() + dtrkpt_;
+  }
+  /// momentum azimuthal angle from the track (normally identical to phi())
+  virtual float phiAtVtx() const {
+    maybeUnpackBoth();
+    float ret = p4_.load()->Phi() + dphi_;
+    while (ret > float(M_PI))
+      ret -= 2 * float(M_PI);
+    while (ret < -float(M_PI))
+      ret += 2 * float(M_PI);
+    return ret;
+  }
+  /// eta from the track (normally identical to eta())
+  virtual float etaAtVtx() const {
+    maybeUnpackBoth();
+    return p4_.load()->eta() + deta_;
+  }
+
+  /// momentum polar angle
+  double theta() const override {
+    if (!p4c_)
+      unpack();
+    return p4_.load()->Theta();
+  }
+  /// momentum pseudorapidity
+  double eta() const override {
+    if (!p4c_)
+      unpack();
+    return p4_.load()->Eta();
+  }
+  /// rapidity
+  double rapidity() const override {
+    if (!p4c_)
+      unpack();
+    return p4_.load()->Rapidity();
+  }
+  /// rapidity
+  double y() const override {
+    if (!p4c_)
+      unpack();
+    return p4_.load()->Rapidity();
+  }
+  /// set 4-momentum
+  void setP4(const LorentzVector &p4) override {
+    maybeUnpackBoth(); // changing px,py,pz changes also mapping between dxy,dz
+                       // and x,y,z
+    dphi_ += polarP4().Phi() - p4.Phi();
+    deta_ += polarP4().Eta() - p4.Eta();
+    dtrkpt_ += polarP4().Pt() - p4.Pt();
+    *p4_ = PolarLorentzVector(p4.Pt(), p4.Eta(), p4.Phi(), p4.M());
+    packBoth();
+  }
+  /// set 4-momentum
+  void setP4(const PolarLorentzVector &p4) override {
+    maybeUnpackBoth(); // changing px,py,pz changes also mapping between dxy,dz
+                       // and x,y,z
+    dphi_ += polarP4().Phi() - p4.Phi();
+    deta_ += polarP4().Eta() - p4.Eta();
+    dtrkpt_ += polarP4().Pt() - p4.Pt();
+    *p4_ = p4;
+    packBoth();
+  }
+  /// set particle mass
+  void setMass(double m) override {
+    if (!p4c_)
+      unpack();
+    *p4_ = PolarLorentzVector(p4_.load()->Pt(), p4_.load()->Eta(),
+                              p4_.load()->Phi(), m);
+    pack();
+  }
+  void setPz(double pz) override {
+    maybeUnpackBoth(); // changing px,py,pz changes also mapping between dxy,dz
+                       // and x,y,z
+    *p4c_ = LorentzVector(p4c_.load()->Px(), p4c_.load()->Py(), pz,
+                          p4c_.load()->E());
+    dphi_ += polarP4().Phi() - p4c_.load()->Phi();
+    deta_ += polarP4().Eta() - p4c_.load()->Eta();
+    dtrkpt_ += polarP4().Pt() - p4c_.load()->Pt();
+    *p4_ = PolarLorentzVector(p4c_.load()->Pt(), p4c_.load()->Eta(),
+                              p4c_.load()->Phi(), p4c_.load()->M());
+    packBoth();
+  }
+  /// set impact parameters covariance
+
+  // Note: mask is also the maximum value
+  enum trackHitShiftsAndMasks {
+    trackPixelHitsMask = 7,
+    trackStripHitsMask = 31,
+    trackStripHitsShift = 3
+  };
+
+  // set number of tracker hits and layers
+  virtual void setHits(const reco::Track &tk) {
+    // first we count the number of layers with hits
+    int numberOfPixelLayers_ = tk.hitPattern().pixelLayersWithMeasurement();
+    if (numberOfPixelLayers_ > trackPixelHitsMask)
+      numberOfPixelLayers_ = trackPixelHitsMask;
+    int numberOfStripLayers_ = tk.hitPattern().stripLayersWithMeasurement();
+    if (numberOfStripLayers_ > trackStripHitsMask)
+      numberOfStripLayers_ = trackStripHitsMask;
+    packedLayers_ = (numberOfPixelLayers_ & trackPixelHitsMask) |
+                    (numberOfStripLayers_ << trackStripHitsShift);
+    // now we count number of additional hits, beyond the one-per-layer implied
+    // by packedLayers_
+    int numberOfPixelHits_ =
+        tk.hitPattern().numberOfValidPixelHits() - numberOfPixelLayers_;
+    if (numberOfPixelHits_ > trackPixelHitsMask)
+      numberOfPixelHits_ = trackPixelHitsMask;
+    int numberOfStripHits_ = tk.hitPattern().numberOfValidHits() -
+                             numberOfPixelHits_ - numberOfPixelLayers_ -
+                             numberOfStripLayers_;
+    if (numberOfStripHits_ > trackStripHitsMask)
+      numberOfStripHits_ = trackStripHitsMask;
+
+    packedHits_ = (numberOfPixelHits_ & trackPixelHitsMask) |
+                  (numberOfStripHits_ << trackStripHitsShift);
+  }
+
+  virtual void
+  setTrackProperties(const reco::Track &tk,
+                     const reco::Track::CovarianceMatrix &covariance,
+                     int quality, int covarianceVersion) {
+    covarianceVersion_ = covarianceVersion;
+    covarianceSchema_ = quality;
+    normalizedChi2_ = tk.normalizedChi2();
+    setHits(tk);
+    packBoth();
+    packCovariance(covariance, false);
+  }
+
+  // set track properties using quality and covarianceVersion to define the
+  // level of details in the cov. matrix
+  virtual void setTrackProperties(const reco::Track &tk, int quality,
+                                  int covarianceVersion) {
+    setTrackProperties(tk, tk.covariance(), quality, covarianceVersion);
+  }
+
+  int numberOfPixelHits() const {
+    return (packedHits_ & trackPixelHitsMask) + pixelLayersWithMeasurement();
+  }
+  int numberOfHits() const {
+    return (packedHits_ >> trackStripHitsShift) + stripLayersWithMeasurement() +
+           numberOfPixelHits();
+  }
+  int pixelLayersWithMeasurement() const {
+    return packedLayers_ & trackPixelHitsMask;
+  }
+  int stripLayersWithMeasurement() const {
+    return (packedLayers_ >> trackStripHitsShift);
+  }
+  int trackerLayersWithMeasurement() const {
+    return stripLayersWithMeasurement() + pixelLayersWithMeasurement();
+  }
+  virtual void setCovarianceVersion(int v) { covarianceVersion_ = v; }
+  int covarianceVersion() const { return covarianceVersion_; }
+  int covarianceSchema() const { return covarianceSchema_; }
+
+  /// vertex position
+  const Point &vertex() const override {
+    maybeUnpackBoth();
+    return *vertex_;
+  } //{ if (fromPV_) return Point(0,0,0); else return Point(0,0,100); }
+  /// x coordinate of vertex position
+  double vx() const override {
+    maybeUnpackBoth();
+    return vertex_.load()->X();
+  } //{ return 0; }
+  /// y coordinate of vertex position
+  double vy() const override {
+    maybeUnpackBoth();
+    return vertex_.load()->Y();
+  } //{ return 0; }
+  /// z coordinate of vertex position
+  double vz() const override {
+    maybeUnpackBoth();
+    return vertex_.load()->Z();
+  } //{ if (fromPV_) return 0; else return 100; }
+  /// set vertex
+  void setVertex(const Point &vertex) override {
+    maybeUnpackBoth();
+    *vertex_ = vertex;
+    packVtx();
+  }
+
+  /// This refers to the association to PV=ipv. >=PVLoose corresponds to JME
+  /// definition, >=PVTight to isolation definition
+  enum PVAssoc { NoPV = 0, PVLoose = 1, PVTight = 2, PVUsedInFit = 3 };
+  const PVAssoc fromPV(size_t ipv = 0) const {
+    reco::VertexRef pvRef = vertexRef();
+    if (pvAssociationQuality() == UsedInFitTight and pvRef.key() == ipv)
+      return PVUsedInFit;
+    if (pvRef.key() == ipv or abs(pdgId()) == 13 or abs(pdgId()) == 11)
+      return PVTight;
+    if (pvAssociationQuality() == CompatibilityBTag and
+        std::abs(dzAssociatedPV()) > std::abs(dz(ipv)))
+      return PVTight; // it is not closest, but at least prevents the B
+                      // assignment stealing
+    if (pvAssociationQuality() < UsedInFitLoose or pvRef->ndof() < 4.0)
+      return PVLoose;
+    return NoPV;
+  }
+
+  /// The following contains information about how the association to the PV,
+  /// given in vertexRef, is obtained.
+  ///
+  enum PVAssociationQuality {
+    NotReconstructedPrimary = 0,
+    OtherDeltaZ = 1,
+    CompatibilityBTag = 4,
+    CompatibilityDz = 5,
+    UsedInFitLoose = 6,
+    UsedInFitTight = 7
+  };
+  const PVAssociationQuality pvAssociationQuality() const {
+    return PVAssociationQuality((qualityFlags_ & assignmentQualityMask) >>
+                                assignmentQualityShift);
+  }
+  void setAssociationQuality(PVAssociationQuality q) {
+    qualityFlags_ = (qualityFlags_ & ~assignmentQualityMask) |
+                    ((q << assignmentQualityShift) & assignmentQualityMask);
+  }
+
+  const reco::VertexRef vertexRef() const {
+    return reco::VertexRef(pvRefProd_, pvRefKey_);
+  }
+
+  /// dxy with respect to the PV ref
+  virtual float dxy() const {
+    maybeUnpackBoth();
+    return dxy_;
+  }
+  /// dz with respect to the PV[ipv]
+  virtual float dz(size_t ipv = 0) const {
+    maybeUnpackBoth();
+    return dz_ + (*pvRefProd_)[pvRefKey_].position().z() -
+           (*pvRefProd_)[ipv].position().z();
+  }
+  /// dz with respect to the PV ref
+  virtual float dzAssociatedPV() const {
+    maybeUnpackBoth();
+    return dz_;
+  }
+  /// dxy with respect to another point
+  virtual float dxy(const Point &p) const;
+  /// dz  with respect to another point
+  virtual float dz(const Point &p) const;
+
+  /// uncertainty on dz
+  float dzError() const override {
+    maybeUnpackCovariance();
+    return sqrt((*m_.load())(4, 4));
+  }
+  /// uncertainty on dxy
+  float dxyError() const override {
+    maybeUnpackCovariance();
+    return sqrt((*m_.load())(3, 3));
+  }
+
+  /// Return reference to a pseudo track made with candidate kinematics,
+  /// parameterized error for eta,phi,pt and full IP covariance
+  virtual const reco::Track &pseudoTrack() const {
+    if (!track_)
+      unpackTrk();
+    return *track_;
+  }
+
+  /// return a pointer to the track if present. otherwise, return a null pointer
+  const reco::Track *bestTrack() const override {
+    if (packedHits_ != 0 || packedLayers_ != 0) {
+      maybeUnpackTrack();
+      return track_.load();
+    } else
+      return nullptr;
+  }
+  /// Return true if a bestTrack can be extracted from this Candidate
+  bool hasTrackDetails() const {
+    return (packedHits_ != 0 || packedLayers_ != 0);
+  }
+
+  /// true if the track had the highPurity quality bit
+  bool trackHighPurity() const {
+    return (qualityFlags_ & trackHighPurityMask) >> trackHighPurityShift;
+  }
+  /// set to true if the track had the highPurity quality bit
+  void setTrackHighPurity(bool highPurity) {
+    qualityFlags_ =
+        (qualityFlags_ & ~trackHighPurityMask) |
+        ((highPurity << trackHighPurityShift) & trackHighPurityMask);
+  }
+
+  /// Enumerator specifying the
+  enum LostInnerHits {
+    validHitInFirstPixelBarrelLayer = -1,
+    noLostInnerHits = 0, // it could still not have a hit in the first layer,
+                         // e.g. if it crosses an inactive sensor
+    oneLostInnerHit = 1,
+    moreLostInnerHits = 2
+  };
+  LostInnerHits lostInnerHits() const {
+    return LostInnerHits(
+        int16_t((qualityFlags_ & lostInnerHitsMask) >> lostInnerHitsShift) - 1);
+  }
+  void setLostInnerHits(LostInnerHits hits) {
+    int lost = hits;
+    if (lost > 2)
+      lost = 2; // protection against misuse
+    lost++;     // shift so it's 0 .. 3 instead of (-1) .. 2
+    qualityFlags_ = (qualityFlags_ & ~lostInnerHitsMask) |
+                    ((lost << lostInnerHitsShift) & lostInnerHitsMask);
+  }
+
+  /// Set first hit from HitPattern
+  void setFirstHit(uint16_t pattern) { firstHit_ = pattern; }
+  /// Return first hit from HitPattern for tracks with high level details
+  uint16_t firstHit() const { return firstHit_; }
 
-  protected:
-    friend class ::testPackedCandidate;
-    static constexpr float kMinDEtaToStore_=0.001;
-    static constexpr float kMinDTrkPtToStore_=0.001;
-    
-
-    uint16_t packedPt_, packedEta_, packedPhi_, packedM_;
-    uint16_t packedDxy_, packedDz_, packedDPhi_, packedDEta_, packedDTrkPt_;
-    PackedCovariance packedCovariance_;
-
-    void pack(bool unpackAfterwards=true) ;
-    void unpack() const ;
-    void packVtx(bool unpackAfterwards=true) ;
-    void unpackVtx() const ;
-    void packCovariance(const reco::TrackBase::CovarianceMatrix  & m,bool unpackAfterwards=true) ;
-    void unpackCovariance() const;
-    void maybeUnpackBoth() const { if (!p4c_) unpack(); if (!vertex_) unpackVtx(); }
-    void maybeUnpackTrack() const { if (!track_) unpackTrk(); }
-    void maybeUnpackCovariance() const { if (!m_) unpackCovariance(); }
-    void packBoth() { pack(false); packVtx(false); delete p4_.exchange(nullptr); delete p4c_.exchange(nullptr); delete vertex_.exchange(nullptr); unpack(); unpackVtx(); } // do it this way, so that we don't loose precision on the angles before computing dxy,dz
-    void unpackTrk() const ;
-
-    uint8_t packedPuppiweight_;
-    int8_t packedPuppiweightNoLepDiff_; // storing the DIFFERENCE of (all - "no lep") for compression optimization
-    uint8_t rawCaloFraction_;
-    int8_t hcalFraction_;
-    int16_t packedTime_;
-    uint8_t packedTimeError_;
-
-    bool isIsolatedChargedHadron_;
-
-    /// the four vector                                                 
-    mutable std::atomic<PolarLorentzVector*> p4_;
-    mutable std::atomic<LorentzVector*> p4c_;
-    /// vertex position                                                                   
-    mutable std::atomic<Point*> vertex_;
-    CMS_THREAD_GUARD(vertex_) mutable float dxy_, dz_, dphi_, deta_, dtrkpt_;
-    /// reco::Track                                                                   
-    mutable std::atomic<reco::Track*> track_;
-    /// PDG identifier                                                                    
-    int pdgId_;
-    uint16_t qualityFlags_;
-    /// Use these to build a Ref to primary vertex
-    reco::VertexRefProd pvRefProd_;
-    reco::VertexRef::key_type pvRefKey_;
-
-    /// IP covariance	
-    mutable std::atomic<reco::TrackBase::CovarianceMatrix *> m_;
-    uint8_t packedHits_, packedLayers_; // packedLayers_ -> layers with valid hits; packedHits_ -> extra hits beyond the one-per-layer implied by packedLayers_
-    
-    /// track quality information
-    uint8_t normalizedChi2_; 
-    uint16_t covarianceVersion_;
-    uint16_t covarianceSchema_;
-    CMS_THREAD_SAFE static CovarianceParameterization covarianceParameterization_;
-    //static std::atomic<CovarianceParameterization*> covarianceParameterization_;
-    static std::once_flag covariance_load_flag;
-    const CovarianceParameterization & covarianceParameterization() const {
-	if (!hasTrackDetails()) throw edm::Exception(edm::errors::InvalidReference, "Trying to access covariance matrix for a PackedCandidate for which it's not available. Check hasTrackDetails() before!\n");
-	std::call_once(covariance_load_flag,[](int v) { covarianceParameterization_.load(v); } ,covarianceVersion_ );
-        if(covarianceParameterization_.loadedVersion() != covarianceVersion_ )
-        {
-          throw edm::Exception(edm::errors::UnimplementedFeature)
-           << "Attempting to load multiple covariance version in same process. This is not supported.";
-        }
-        return  covarianceParameterization_;
+  void setMuonID(bool isStandAlone, bool isGlobal) {
+    int16_t muonFlags = isStandAlone | (2 * isGlobal);
+    qualityFlags_ = (qualityFlags_ & ~muonFlagsMask) |
+                    ((muonFlags << muonFlagsShift) & muonFlagsMask);
+  }
+
+  void setGoodEgamma(bool isGoodEgamma = true) {
+    int16_t egFlags = (isGoodEgamma << egammaFlagsShift) & egammaFlagsMask;
+    qualityFlags_ = (qualityFlags_ & ~egammaFlagsMask) | egFlags;
+  }
+
+  /// PDG identifier
+  int pdgId() const override { return pdgId_; }
+  // set PDG identifier
+  void setPdgId(int pdgId) override { pdgId_ = pdgId; }
+  /// status word
+  int status() const override { return qualityFlags_; } /*FIXME*/
+  /// set status word
+  void setStatus(int status) override {} /*FIXME*/
+  /// long lived flag
+  static const unsigned int longLivedTag = 0; /*FIXME*/
+  /// set long lived flag
+  void setLongLived() override {} /*FIXME*/
+  /// is long lived?
+  bool longLived() const override;
+  /// do mass constraint flag
+  static const unsigned int massConstraintTag = 0; /*FIXME*/
+  /// set mass constraint flag
+  void setMassConstraint() override {} /*FIXME*/
+  /// do mass constraint?
+  bool massConstraint() const override;
+
+  /// returns a clone of the Candidate object
+  PackedCandidate *clone() const override { return new PackedCandidate(*this); }
+
+  /// chi-squares
+  double vertexChi2() const override;
+  /** Number of degrees of freedom
+   *  Meant to be Double32_t for soft-assignment fitters:
+   *  tracks may contribute to the vertex with fractional weights.
+   *  The ndof is then = to the sum of the track weights.
+   *  see e.g. CMS NOTE-2006/032, CMS NOTE-2004/002
+   */
+  double vertexNdof() const override;
+  /// chi-squared divided by n.d.o.f.
+  double vertexNormalizedChi2() const override;
+  /// (i, j)-th element of error matrix, i, j = 0, ... 2
+  double vertexCovariance(int i, int j) const override;
+  /// return SMatrix
+  CovarianceMatrix vertexCovariance() const override {
+    CovarianceMatrix m;
+    fillVertexCovariance(m);
+    return m;
+  }
+  /// fill SMatrix
+  void fillVertexCovariance(CovarianceMatrix &v) const override;
+  /// returns true if this candidate has a reference to a master clone.
+  /// This only happens if the concrete Candidate type is ShallowCloneCandidate
+  bool hasMasterClone() const override;
+  /// returns ptr to master clone, if existing.
+  /// Throws an exception unless the concrete Candidate type is
+  /// ShallowCloneCandidate
+  const reco::CandidateBaseRef &masterClone() const override;
+  /// returns true if this candidate has a ptr to a master clone.
+  /// This only happens if the concrete Candidate type is
+  /// ShallowClonePtrCandidate
+  bool hasMasterClonePtr() const override;
+  /// returns ptr to master clone, if existing.
+  /// Throws an exception unless the concrete Candidate type is
+  /// ShallowClonePtrCandidate
+
+  const reco::CandidatePtr &masterClonePtr() const override;
+
+  /// cast master clone reference to a concrete type
+  template <typename Ref> Ref masterRef() const {
+    return masterClone().template castTo<Ref>();
+  }
+
+  bool isElectron() const override { return false; }
+  bool isMuon() const override { return false; }
+  bool isStandAloneMuon() const override {
+    return ((qualityFlags_ & muonFlagsMask) >> muonFlagsShift) & 1;
+  }
+  bool isGlobalMuon() const override {
+    return ((qualityFlags_ & muonFlagsMask) >> muonFlagsShift) & 2;
+  }
+  bool isTrackerMuon() const override { return false; }
+  bool isCaloMuon() const override { return false; }
+  bool isPhoton() const override { return false; }
+  bool isConvertedPhoton() const override { return false; }
+  bool isJet() const override { return false; }
+  bool isGoodEgamma() const { return (qualityFlags_ & egammaFlagsMask) != 0; }
+
+  // puppiweights
+  void setPuppiWeight(float p,
+                      float p_nolep = 0.0); /// Set both weights at once (with
+                                            /// option for only full PUPPI)
+  float puppiWeight() const;                /// Weight from full PUPPI
+  float puppiWeightNoLep() const; /// Weight from PUPPI removing leptons
+
+  // for the neutral fractions
+  void
+  setRawCaloFraction(float p); /// Set the raw ECAL+HCAL energy over candidate
+                               /// energy for isolated charged hadrons
+  float rawCaloFraction() const {
+    return (rawCaloFraction_ / 100.);
+  } /// Raw ECAL+HCAL energy over candidate energy for isolated charged hadrons
+  void setRawHcalFraction(
+      float p); /// Set the fraction of Hcal needed isolated charged hadrons
+  float rawHcalFraction() const {
+    return (rawHcalFraction_ / 100.);
+  } /// Fraction of Hcal for isolated charged hadrons
+  void setCaloFraction(
+      float p); /// Set the fraction of ECAL+HCAL energy over candidate energy
+  float caloFraction() const {
+    return (caloFraction_ / 100.);
+  } /// Fraction of ECAL+HCAL energy over candidate energy
+  void setHcalFraction(float p); /// Set the fraction of Hcal needed for HF,
+                                 /// neutral hadrons, and charged particles
+  float hcalFraction() const {
+    return (hcalFraction_ / 100.);
+  } /// Fraction of Hcal for HF, neutral hadrons, and charged particles
+
+  // isolated charged hadrons
+  void setIsIsolatedChargedHadron(
+      bool p); /// Set isolation (as in particle flow, i.e. at calorimeter
+               /// surface rather than at PV) flat for charged hadrons
+  bool isIsolatedChargedHadron() const {
+    return isIsolatedChargedHadron_;
+  } /// Flag isolation (as in particle flow, i.e. at calorimeter surface rather
+    /// than at PV) flag for charged hadrons
+
+  struct PackedCovariance {
+    PackedCovariance()
+        : dxydxy(0), dxydz(0), dzdz(0), dlambdadz(0), dphidxy(0), dptdpt(0),
+          detadeta(0), dphidphi(0) {}
+    // 3D IP covariance
+    uint16_t dxydxy;
+    uint16_t dxydz;
+    uint16_t dzdz;
+    // other IP relevant elements
+    uint16_t dlambdadz;
+    uint16_t dphidxy;
+    // other diag elements
+    uint16_t dptdpt;
+    uint16_t detadeta;
+    uint16_t dphidphi;
+  };
+
+  /// time (wrt nominal zero of the collision)
+  virtual float time() const { return vertexRef()->t() + dtimeAssociatedPV(); }
+  /// dtime with respect to the PV[ipv]
+  virtual float dtime(size_t ipv = 0) const {
+    return dtimeAssociatedPV() + (*pvRefProd_)[pvRefKey_].t() -
+           (*pvRefProd_)[ipv].t();
+  }
+  /// dtime with respect to the PV ref
+  virtual float dtimeAssociatedPV() const {
+    if (packedTime_ == 0)
+      return 0.f;
+    if (packedTimeError_ > 0)
+      return unpackTimeWithError(packedTime_, packedTimeError_);
+    else
+      return unpackTimeNoError(packedTime_);
+  }
+  /// time measurement uncertainty (-1 if not available)
+  virtual float timeError() const { return unpackTimeError(packedTimeError_); }
+  /// set time measurement
+  void setDTimeAssociatedPV(float aTime, float aTimeError = 0);
+  /// set time measurement
+  void setTime(float aTime, float aTimeError = 0) {
+    setDTimeAssociatedPV(aTime - vertexRef()->t(), aTimeError);
+  }
+
+private:
+  void unpackCovarianceElement(reco::TrackBase::CovarianceMatrix &m,
+                               uint16_t packed, int i, int j) const {
+    m(i, j) = covarianceParameterization().unpack(
+        packed, covarianceSchema_, i, j, pt(), eta(), numberOfHits(),
+        numberOfPixelHits());
+  }
+  uint16_t packCovarianceElement(const reco::TrackBase::CovarianceMatrix &m,
+                                 int i, int j) const {
+    return covarianceParameterization().pack(m(i, j), covarianceSchema_, i, j,
+                                             pt(), eta(), numberOfHits(),
+                                             numberOfPixelHits());
+  }
+
+protected:
+  friend class ::testPackedCandidate;
+  static constexpr float kMinDEtaToStore_ = 0.001;
+  static constexpr float kMinDTrkPtToStore_ = 0.001;
+
+  uint16_t packedPt_, packedEta_, packedPhi_, packedM_;
+  uint16_t packedDxy_, packedDz_, packedDPhi_, packedDEta_, packedDTrkPt_;
+  PackedCovariance packedCovariance_;
+
+  void pack(bool unpackAfterwards = true);
+  void unpack() const;
+  void packVtx(bool unpackAfterwards = true);
+  void unpackVtx() const;
+  void packCovariance(const reco::TrackBase::CovarianceMatrix &m,
+                      bool unpackAfterwards = true);
+  void unpackCovariance() const;
+  void maybeUnpackBoth() const {
+    if (!p4c_)
+      unpack();
+    if (!vertex_)
+      unpackVtx();
+  }
+  void maybeUnpackTrack() const {
+    if (!track_)
+      unpackTrk();
+  }
+  void maybeUnpackCovariance() const {
+    if (!m_)
+      unpackCovariance();
+  }
+  void packBoth() {
+    pack(false);
+    packVtx(false);
+    delete p4_.exchange(nullptr);
+    delete p4c_.exchange(nullptr);
+    delete vertex_.exchange(nullptr);
+    unpack();
+    unpackVtx();
+  } // do it this way, so that we don't loose precision on the angles before
+    // computing dxy,dz
+  void unpackTrk() const;
+
+  uint8_t packedPuppiweight_;
+  int8_t packedPuppiweightNoLepDiff_; // storing the DIFFERENCE of (all - "no
+                                      // lep") for compression optimization
+  uint8_t rawCaloFraction_;
+  int8_t rawHcalFraction_;
+  uint8_t caloFraction_;
+  int8_t hcalFraction_;
+  int16_t packedTime_;
+  uint8_t packedTimeError_;
+
+  bool isIsolatedChargedHadron_;
+
+  /// the four vector
+  mutable std::atomic<PolarLorentzVector *> p4_;
+  mutable std::atomic<LorentzVector *> p4c_;
+  /// vertex position
+  mutable std::atomic<Point *> vertex_;
+  CMS_THREAD_GUARD(vertex_) mutable float dxy_, dz_, dphi_, deta_, dtrkpt_;
+  /// reco::Track
+  mutable std::atomic<reco::Track *> track_;
+  /// PDG identifier
+  int pdgId_;
+  uint16_t qualityFlags_;
+  /// Use these to build a Ref to primary vertex
+  reco::VertexRefProd pvRefProd_;
+  reco::VertexRef::key_type pvRefKey_;
+
+  /// IP covariance
+  mutable std::atomic<reco::TrackBase::CovarianceMatrix *> m_;
+  uint8_t packedHits_,
+      packedLayers_; // packedLayers_ -> layers with valid hits; packedHits_ ->
+                     // extra hits beyond the one-per-layer implied by
+                     // packedLayers_
+
+  /// track quality information
+  uint8_t normalizedChi2_;
+  uint16_t covarianceVersion_;
+  uint16_t covarianceSchema_;
+  CMS_THREAD_SAFE static CovarianceParameterization covarianceParameterization_;
+  // static std::atomic<CovarianceParameterization*>
+  // covarianceParameterization_;
+  static std::once_flag covariance_load_flag;
+  const CovarianceParameterization &covarianceParameterization() const {
+    if (!hasTrackDetails())
+      throw edm::Exception(edm::errors::InvalidReference,
+                           "Trying to access covariance matrix for a "
+                           "PackedCandidate for which it's not available. "
+                           "Check hasTrackDetails() before!\n");
+    std::call_once(covariance_load_flag,
+                   [](int v) { covarianceParameterization_.load(v); },
+                   covarianceVersion_);
+    if (covarianceParameterization_.loadedVersion() != covarianceVersion_) {
+      throw edm::Exception(edm::errors::UnimplementedFeature)
+          << "Attempting to load multiple covariance version in same process. "
+             "This is not supported.";
     }
+    return covarianceParameterization_;
+  }
+
+  /// check overlap with another Candidate
+  bool overlap(const reco::Candidate &) const override;
+  template <typename, typename, typename> friend struct component;
+  friend class ::OverlapChecker;
+  friend class ShallowCloneCandidate;
+  friend class ShallowClonePtrCandidate;
 
-    /// check overlap with another Candidate                                              
-    bool overlap( const reco::Candidate & ) const override;
-    template<typename, typename, typename> friend struct component;
-    friend class ::OverlapChecker;
-    friend class ShallowCloneCandidate;
-    friend class ShallowClonePtrCandidate;
-
-    enum qualityFlagsShiftsAndMasks {
-        assignmentQualityMask = 0x7, assignmentQualityShift = 0,
-        trackHighPurityMask  = 0x8, trackHighPurityShift=3,
-        lostInnerHitsMask = 0x30, lostInnerHitsShift=4,
-        muonFlagsMask = 0x0600, muonFlagsShift=9,
-	egammaFlagsMask = 0x0800, egammaFlagsShift=11
-    };
-    
-    /// static to allow unit testing
-    static uint8_t packTimeError(float timeError) ;
-    static float unpackTimeError(uint8_t timeError) ;
-    static float unpackTimeNoError(int16_t time) ;
-    static int16_t packTimeNoError(float time) ;
-    static float unpackTimeWithError(int16_t time, uint8_t timeError) ;
-    static int16_t packTimeWithError(float   time, float   timeError) ;
-    static constexpr float MIN_TIMEERROR = 0.002f; // 2 ps, smallest storable non-zero uncertainty
-    static constexpr float MIN_TIME_NOERROR = 0.0002f; // 0.2 ps, smallest non-zero time that can be stored by packTimeNoError
-    static constexpr int EXPO_TIMEERROR = 5; // power of 2 used in encoding timeError
-    static constexpr int EXPO_TIME_NOERROR = 6; // power of 2 used in encoding time without timeError
-    static constexpr int EXPO_TIME_WITHERROR = -6; // power of 2 used in encoding time with timeError
-  public:
-    uint16_t firstHit_;
-    
+  enum qualityFlagsShiftsAndMasks {
+    assignmentQualityMask = 0x7,
+    assignmentQualityShift = 0,
+    trackHighPurityMask = 0x8,
+    trackHighPurityShift = 3,
+    lostInnerHitsMask = 0x30,
+    lostInnerHitsShift = 4,
+    muonFlagsMask = 0x0600,
+    muonFlagsShift = 9,
+    egammaFlagsMask = 0x0800,
+    egammaFlagsShift = 11
   };
 
-  typedef std::vector<pat::PackedCandidate> PackedCandidateCollection;
-  typedef edm::Ref<pat::PackedCandidateCollection> PackedCandidateRef;
-  typedef edm::RefVector<pat::PackedCandidateCollection> PackedCandidateRefVector;
-}
+  /// static to allow unit testing
+  static uint8_t packTimeError(float timeError);
+  static float unpackTimeError(uint8_t timeError);
+  static float unpackTimeNoError(int16_t time);
+  static int16_t packTimeNoError(float time);
+  static float unpackTimeWithError(int16_t time, uint8_t timeError);
+  static int16_t packTimeWithError(float time, float timeError);
+  static constexpr float MIN_TIMEERROR =
+      0.002f; // 2 ps, smallest storable non-zero uncertainty
+  static constexpr float MIN_TIME_NOERROR =
+      0.0002f; // 0.2 ps, smallest non-zero time that can be stored by
+               // packTimeNoError
+  static constexpr int EXPO_TIMEERROR =
+      5; // power of 2 used in encoding timeError
+  static constexpr int EXPO_TIME_NOERROR =
+      6; // power of 2 used in encoding time without timeError
+  static constexpr int EXPO_TIME_WITHERROR =
+      -6; // power of 2 used in encoding time with timeError
+public:
+  uint16_t firstHit_;
+};
+
+typedef std::vector<pat::PackedCandidate> PackedCandidateCollection;
+typedef edm::Ref<pat::PackedCandidateCollection> PackedCandidateRef;
+typedef edm::RefVector<pat::PackedCandidateCollection> PackedCandidateRefVector;
+} // namespace pat
 
 #endif
diff --git a/DataFormats/PatCandidates/src/Muon.cc b/DataFormats/PatCandidates/src/Muon.cc
index 64852fe6484e9..2cc31e84bbe82 100644
--- a/DataFormats/PatCandidates/src/Muon.cc
+++ b/DataFormats/PatCandidates/src/Muon.cc
@@ -33,6 +33,7 @@ Muon::Muon() :
     jetPtRatio_(0),
     jetPtRel_(0),
     mvaValue_(0),
+    lowptMvaValue_(0),
     softMvaValue_(0)
 {
   initImpactParameters();
@@ -62,6 +63,7 @@ Muon::Muon(const reco::Muon & aMuon) :
     jetPtRatio_(0),
     jetPtRel_(0),
     mvaValue_(0),
+    lowptMvaValue_(0),
     softMvaValue_(0)
 {
   initImpactParameters();
@@ -91,6 +93,7 @@ Muon::Muon(const edm::RefToBase<reco::Muon> & aMuonRef) :
     jetPtRatio_(0),
     jetPtRel_(0),
     mvaValue_(0),
+    lowptMvaValue_(0),
     softMvaValue_(0)
 {
   initImpactParameters();
@@ -120,6 +123,7 @@ Muon::Muon(const edm::Ptr<reco::Muon> & aMuonRef) :
     jetPtRatio_(0),
     jetPtRel_(0),
     mvaValue_(0),
+    lowptMvaValue_(0),
     softMvaValue_(0)
 {
   initImpactParameters();
diff --git a/DataFormats/PatCandidates/src/PackedCandidate.cc b/DataFormats/PatCandidates/src/PackedCandidate.cc
index 9559fc2c9e60a..a4395ed40c459 100644
--- a/DataFormats/PatCandidates/src/PackedCandidate.cc
+++ b/DataFormats/PatCandidates/src/PackedCandidate.cc
@@ -1,8 +1,8 @@
+#include "DataFormats/Math/interface/deltaPhi.h"
+#include "DataFormats/Math/interface/libminifloat.h"
 #include "DataFormats/PatCandidates/interface/PackedCandidate.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
-#include "DataFormats/Math/interface/libminifloat.h"
-#include "DataFormats/Math/interface/deltaPhi.h"
 
 #include "DataFormats/Math/interface/liblogintpack.h"
 using namespace logintpack;
@@ -11,129 +11,148 @@ CovarianceParameterization pat::PackedCandidate::covarianceParameterization_;
 std::once_flag pat::PackedCandidate::covariance_load_flag;
 
 void pat::PackedCandidate::pack(bool unpackAfterwards) {
-    packedPt_  =  MiniFloatConverter::float32to16(p4_.load()->Pt());
-    packedEta_ =  int16_t(std::round(p4_.load()->Eta()/6.0f*std::numeric_limits<int16_t>::max()));
-    packedPhi_ =  int16_t(std::round(p4_.load()->Phi()/3.2f*std::numeric_limits<int16_t>::max()));
-    packedM_   =  MiniFloatConverter::float32to16(p4_.load()->M());
-    if (unpackAfterwards) {
-      delete p4_.exchange(nullptr);
-      delete p4c_.exchange(nullptr);
-      unpack(); // force the values to match with the packed ones
-    }
+  packedPt_ = MiniFloatConverter::float32to16(p4_.load()->Pt());
+  packedEta_ = int16_t(std::round(p4_.load()->Eta() / 6.0f *
+                                  std::numeric_limits<int16_t>::max()));
+  packedPhi_ = int16_t(std::round(p4_.load()->Phi() / 3.2f *
+                                  std::numeric_limits<int16_t>::max()));
+  packedM_ = MiniFloatConverter::float32to16(p4_.load()->M());
+  if (unpackAfterwards) {
+    delete p4_.exchange(nullptr);
+    delete p4c_.exchange(nullptr);
+    unpack(); // force the values to match with the packed ones
+  }
 }
 
 void pat::PackedCandidate::packVtx(bool unpackAfterwards) {
-    reco::VertexRef pvRef = vertexRef();
-    Point pv = pvRef.isNonnull() ? pvRef->position() : Point();
-    float dxPV = vertex_.load()->X() - pv.X(), dyPV = vertex_.load()->Y() - pv.Y(); //, rPV = std::hypot(dxPV, dyPV);
-    float s = std::sin(float(p4_.load()->Phi())+dphi_), c = std::cos(float(p4_.load()->Phi()+dphi_)); // not the fastest option, but we're in reduced precision already, so let's avoid more roundoffs
-    dxy_  = - dxPV * s + dyPV * c;    
-    // if we want to go back to the full x,y,z we need to store also
-    // float dl = dxPV * c + dyPV * s; 
-    // float xRec = - dxy_ * s + dl * c, yRec = dxy_ * c + dl * s;
-    float pzpt = p4_.load()->Pz()/p4_.load()->Pt();
-    dz_ = vertex_.load()->Z() - pv.Z() - (dxPV*c + dyPV*s) * pzpt;
-    packedDxy_ = MiniFloatConverter::float32to16(dxy_*100);
-    packedDz_   = pvRef.isNonnull() ? MiniFloatConverter::float32to16(dz_*100) : int16_t(std::round(dz_/40.f*std::numeric_limits<int16_t>::max()));
-    packedDPhi_ =  int16_t(std::round(dphi_/3.2f*std::numeric_limits<int16_t>::max()));
-    packedDEta_ =  MiniFloatConverter::float32to16(deta_);
-    packedDTrkPt_ = MiniFloatConverter::float32to16(dtrkpt_);
- 
-    if (unpackAfterwards) {
-      delete vertex_.exchange(nullptr);
-      unpackVtx();
-    }
+  reco::VertexRef pvRef = vertexRef();
+  Point pv = pvRef.isNonnull() ? pvRef->position() : Point();
+  float dxPV = vertex_.load()->X() - pv.X(),
+        dyPV = vertex_.load()->Y() - pv.Y(); //, rPV = std::hypot(dxPV, dyPV);
+  float s = std::sin(float(p4_.load()->Phi()) + dphi_),
+        c = std::cos(
+            float(p4_.load()->Phi() +
+                  dphi_)); // not the fastest option, but we're in reduced
+                           // precision already, so let's avoid more roundoffs
+  dxy_ = -dxPV * s + dyPV * c;
+  // if we want to go back to the full x,y,z we need to store also
+  // float dl = dxPV * c + dyPV * s;
+  // float xRec = - dxy_ * s + dl * c, yRec = dxy_ * c + dl * s;
+  float pzpt = p4_.load()->Pz() / p4_.load()->Pt();
+  dz_ = vertex_.load()->Z() - pv.Z() - (dxPV * c + dyPV * s) * pzpt;
+  packedDxy_ = MiniFloatConverter::float32to16(dxy_ * 100);
+  packedDz_ = pvRef.isNonnull()
+                  ? MiniFloatConverter::float32to16(dz_ * 100)
+                  : int16_t(std::round(dz_ / 40.f *
+                                       std::numeric_limits<int16_t>::max()));
+  packedDPhi_ =
+      int16_t(std::round(dphi_ / 3.2f * std::numeric_limits<int16_t>::max()));
+  packedDEta_ = MiniFloatConverter::float32to16(deta_);
+  packedDTrkPt_ = MiniFloatConverter::float32to16(dtrkpt_);
+
+  if (unpackAfterwards) {
+    delete vertex_.exchange(nullptr);
+    unpackVtx();
+  }
 }
 
 void pat::PackedCandidate::unpack() const {
-    float pt = MiniFloatConverter::float16to32(packedPt_);
-    double shift = (pt<1. ? 0.1*pt : 0.1/pt); // shift particle phi to break degeneracies in angular separations
-    double sign = ( ( int(pt*10) % 2 == 0 ) ? 1 : -1 ); // introduce a pseudo-random sign of the shift
-    double phi = int16_t(packedPhi_)*3.2f/std::numeric_limits<int16_t>::max() + sign*shift*3.2/std::numeric_limits<int16_t>::max();
-    auto p4 = std::make_unique<PolarLorentzVector>(pt,
-                             int16_t(packedEta_)*6.0f/std::numeric_limits<int16_t>::max(),
-                             phi,
-                             MiniFloatConverter::float16to32(packedM_));
-    auto p4c = std::make_unique<LorentzVector>( *p4 );
-    PolarLorentzVector* expectp4= nullptr;
-    if( p4_.compare_exchange_strong(expectp4,p4.get()) ) {
-      p4.release();
-    }
-
-    //p4c_ works as the guard for unpacking so it
-    // must be set last
-    LorentzVector* expectp4c = nullptr;
-    if(p4c_.compare_exchange_strong(expectp4c, p4c.get()) ) {
-      p4c.release();
-    }
-}
-
-void pat::PackedCandidate::packCovariance(const reco::TrackBase::CovarianceMatrix &m, bool unpackAfterwards){
-    packedCovariance_.dptdpt = packCovarianceElement(m,0,0);
-    packedCovariance_.detadeta = packCovarianceElement(m,1,1);
-    packedCovariance_.dphidphi = packCovarianceElement(m,2,2); 
-    packedCovariance_.dxydxy =packCovarianceElement(m,3,3);
-    packedCovariance_.dzdz = packCovarianceElement(m,4,4);
-    packedCovariance_.dxydz = packCovarianceElement(m,3,4);
-    packedCovariance_.dlambdadz = packCovarianceElement(m,1,4);
-    packedCovariance_.dphidxy = packCovarianceElement(m,2,3);
-   //unpack afterwards
-   if(unpackAfterwards) unpackCovariance();
+  float pt = MiniFloatConverter::float16to32(packedPt_);
+  double shift =
+      (pt < 1. ? 0.1 * pt : 0.1 / pt); // shift particle phi to break
+                                       // degeneracies in angular separations
+  double sign = ((int(pt * 10) % 2 == 0)
+                     ? 1
+                     : -1); // introduce a pseudo-random sign of the shift
+  double phi =
+      int16_t(packedPhi_) * 3.2f / std::numeric_limits<int16_t>::max() +
+      sign * shift * 3.2 / std::numeric_limits<int16_t>::max();
+  auto p4 = std::make_unique<PolarLorentzVector>(
+      pt, int16_t(packedEta_) * 6.0f / std::numeric_limits<int16_t>::max(), phi,
+      MiniFloatConverter::float16to32(packedM_));
+  auto p4c = std::make_unique<LorentzVector>(*p4);
+  PolarLorentzVector *expectp4 = nullptr;
+  if (p4_.compare_exchange_strong(expectp4, p4.get())) {
+    p4.release();
+  }
+
+  // p4c_ works as the guard for unpacking so it
+  // must be set last
+  LorentzVector *expectp4c = nullptr;
+  if (p4c_.compare_exchange_strong(expectp4c, p4c.get())) {
+    p4c.release();
+  }
+}
+
+void pat::PackedCandidate::packCovariance(
+    const reco::TrackBase::CovarianceMatrix &m, bool unpackAfterwards) {
+  packedCovariance_.dptdpt = packCovarianceElement(m, 0, 0);
+  packedCovariance_.detadeta = packCovarianceElement(m, 1, 1);
+  packedCovariance_.dphidphi = packCovarianceElement(m, 2, 2);
+  packedCovariance_.dxydxy = packCovarianceElement(m, 3, 3);
+  packedCovariance_.dzdz = packCovarianceElement(m, 4, 4);
+  packedCovariance_.dxydz = packCovarianceElement(m, 3, 4);
+  packedCovariance_.dlambdadz = packCovarianceElement(m, 1, 4);
+  packedCovariance_.dphidxy = packCovarianceElement(m, 2, 3);
+  // unpack afterwards
+  if (unpackAfterwards)
+    unpackCovariance();
 }
 
 void pat::PackedCandidate::unpackCovariance() const {
-    const CovarianceParameterization & p=covarianceParameterization();
-    if(p.isValid()) 
-    {
-      auto m = std::make_unique<reco::TrackBase::CovarianceMatrix>() ;
-      for(int i=0;i<5;i++)
-        for(int j=0;j<5;j++){
-          (*m)(i,j)=0;
-      }
-      unpackCovarianceElement(*m,packedCovariance_.dptdpt,0,0);
-      unpackCovarianceElement(*m,packedCovariance_.detadeta,1,1);
-      unpackCovarianceElement(*m,packedCovariance_.dphidphi,2,2);
-      unpackCovarianceElement(*m,packedCovariance_.dxydxy,3,3);
-      unpackCovarianceElement(*m,packedCovariance_.dzdz,4,4);
-      unpackCovarianceElement(*m,packedCovariance_.dxydz,3,4);
-      unpackCovarianceElement(*m,packedCovariance_.dlambdadz,1,4);
-      unpackCovarianceElement(*m,packedCovariance_.dphidxy,2,3);
-      reco::TrackBase::CovarianceMatrix* expected = nullptr;
-      if( m_.compare_exchange_strong(expected,m.get()) ) {
-         m.release();
+  const CovarianceParameterization &p = covarianceParameterization();
+  if (p.isValid()) {
+    auto m = std::make_unique<reco::TrackBase::CovarianceMatrix>();
+    for (int i = 0; i < 5; i++)
+      for (int j = 0; j < 5; j++) {
+        (*m)(i, j) = 0;
       }
-
-    } else {
-     throw edm::Exception(edm::errors::UnimplementedFeature)
-     << "You do not have a valid track parameters file loaded. "
-     << "Please check that the release version is compatible with your input data"
-     <<"or avoid accessing track parameter uncertainties. ";
+    unpackCovarianceElement(*m, packedCovariance_.dptdpt, 0, 0);
+    unpackCovarianceElement(*m, packedCovariance_.detadeta, 1, 1);
+    unpackCovarianceElement(*m, packedCovariance_.dphidphi, 2, 2);
+    unpackCovarianceElement(*m, packedCovariance_.dxydxy, 3, 3);
+    unpackCovarianceElement(*m, packedCovariance_.dzdz, 4, 4);
+    unpackCovarianceElement(*m, packedCovariance_.dxydz, 3, 4);
+    unpackCovarianceElement(*m, packedCovariance_.dlambdadz, 1, 4);
+    unpackCovarianceElement(*m, packedCovariance_.dphidxy, 2, 3);
+    reco::TrackBase::CovarianceMatrix *expected = nullptr;
+    if (m_.compare_exchange_strong(expected, m.get())) {
+      m.release();
     }
-}
 
-void pat::PackedCandidate::unpackVtx() const {
-    reco::VertexRef pvRef = vertexRef();
-    dphi_ = int16_t(packedDPhi_)*3.2f/std::numeric_limits<int16_t>::max(),
-    deta_ = MiniFloatConverter::float16to32(packedDEta_);
-    dtrkpt_ = MiniFloatConverter::float16to32(packedDTrkPt_);
-    dxy_ = MiniFloatConverter::float16to32(packedDxy_)/100.;
-    dz_   = pvRef.isNonnull() ? MiniFloatConverter::float16to32(packedDz_)/100. : int16_t(packedDz_)*40.f/std::numeric_limits<int16_t>::max();
-    Point pv = pvRef.isNonnull() ? pvRef->position() : Point();
-    float phi = p4_.load()->Phi()+dphi_, s = std::sin(phi), c = std::cos(phi);
-    auto vertex = std::make_unique<Point>(pv.X() - dxy_ * s,
-                    pv.Y() + dxy_ * c,
-                    pv.Z() + dz_ ); // for our choice of using the PCA to the PV, by definition the remaining term -(dx*cos(phi) + dy*sin(phi))*(pz/pt) is zero
-
-     
-
- 
-    Point* expected = nullptr;
-    if( vertex_.compare_exchange_strong(expected,vertex.get()) ) {
-      vertex.release();
-    }
+  } else {
+    throw edm::Exception(edm::errors::UnimplementedFeature)
+        << "You do not have a valid track parameters file loaded. "
+        << "Please check that the release version is compatible with your "
+           "input data"
+        << "or avoid accessing track parameter uncertainties. ";
+  }
 }
 
-pat::PackedCandidate::~PackedCandidate() { 
+void pat::PackedCandidate::unpackVtx() const {
+  reco::VertexRef pvRef = vertexRef();
+  dphi_ = int16_t(packedDPhi_) * 3.2f / std::numeric_limits<int16_t>::max(),
+  deta_ = MiniFloatConverter::float16to32(packedDEta_);
+  dtrkpt_ = MiniFloatConverter::float16to32(packedDTrkPt_);
+  dxy_ = MiniFloatConverter::float16to32(packedDxy_) / 100.;
+  dz_ = pvRef.isNonnull()
+            ? MiniFloatConverter::float16to32(packedDz_) / 100.
+            : int16_t(packedDz_) * 40.f / std::numeric_limits<int16_t>::max();
+  Point pv = pvRef.isNonnull() ? pvRef->position() : Point();
+  float phi = p4_.load()->Phi() + dphi_, s = std::sin(phi), c = std::cos(phi);
+  auto vertex = std::make_unique<Point>(
+      pv.X() - dxy_ * s, pv.Y() + dxy_ * c,
+      pv.Z() +
+          dz_); // for our choice of using the PCA to the PV, by definition the
+                // remaining term -(dx*cos(phi) + dy*sin(phi))*(pz/pt) is zero
+
+  Point *expected = nullptr;
+  if (vertex_.compare_exchange_strong(expected, vertex.get())) {
+    vertex.release();
+  }
+}
+
+pat::PackedCandidate::~PackedCandidate() {
   delete p4_.load();
   delete p4c_.load();
   delete vertex_.load();
@@ -141,304 +160,369 @@ pat::PackedCandidate::~PackedCandidate() {
   delete m_.load();
 }
 
-
 float pat::PackedCandidate::dxy(const Point &p) const {
-	maybeUnpackBoth();
-	const float phi = float(p4_.load()->Phi())+dphi_;
-	return -(vertex_.load()->X()-p.X()) * std::sin(phi) + (vertex_.load()->Y()-p.Y()) * std::cos(phi);
+  maybeUnpackBoth();
+  const float phi = float(p4_.load()->Phi()) + dphi_;
+  return -(vertex_.load()->X() - p.X()) * std::sin(phi) +
+         (vertex_.load()->Y() - p.Y()) * std::cos(phi);
 }
 float pat::PackedCandidate::dz(const Point &p) const {
-    maybeUnpackBoth();
-    const float phi = float(p4_.load()->Phi())+dphi_;
-    const float pzpt = deta_ ? std::sinh(etaAtVtx()) : p4_.load()->Pz()/p4_.load()->Pt();
-    return (vertex_.load()->Z()-p.Z())  - ((vertex_.load()->X()-p.X()) * std::cos(phi) + (vertex_.load()->Y()-p.Y()) * std::sin(phi)) * pzpt;
+  maybeUnpackBoth();
+  const float phi = float(p4_.load()->Phi()) + dphi_;
+  const float pzpt =
+      deta_ ? std::sinh(etaAtVtx()) : p4_.load()->Pz() / p4_.load()->Pt();
+  return (vertex_.load()->Z() - p.Z()) -
+         ((vertex_.load()->X() - p.X()) * std::cos(phi) +
+          (vertex_.load()->Y() - p.Y()) * std::sin(phi)) *
+             pzpt;
 }
 
 void pat::PackedCandidate::unpackTrk() const {
-    maybeUnpackBoth();
-    math::RhoEtaPhiVector p3(ptTrk(),etaAtVtx(),phiAtVtx());
-    maybeUnpackCovariance();
-    int numberOfStripLayers = stripLayersWithMeasurement(), numberOfPixelLayers = pixelLayersWithMeasurement();
-    int numberOfPixelHits = this->numberOfPixelHits();
-    int numberOfHits = this->numberOfHits();
-
-    int ndof = numberOfHits+numberOfPixelHits-5;
-    LostInnerHits innerLost = lostInnerHits();
-    
-    auto track = std::make_unique<reco::Track>(normalizedChi2_*ndof,ndof,*vertex_,math::XYZVector(p3.x(),p3.y(),p3.z()),charge(),*(m_.load()),reco::TrackBase::undefAlgorithm,reco::TrackBase::loose);
-    int i=0;
-    if ( firstHit_ == 0) { //Backward compatible 
-	   if(innerLost == validHitInFirstPixelBarrelLayer){
-	      track->appendTrackerHitPattern(PixelSubdetector::PixelBarrel, 1, 0, TrackingRecHit::valid); 		
-	      i=1;
-	   } 
-    } else {
-	   track->appendHitPattern(firstHit_,TrackingRecHit::valid);
-    }
-
-    if(firstHit_!=0 && reco::HitPattern::pixelHitFilter(firstHit_)) i=1;
-
-    // add hits to match the number of laters and validHitInFirstPixelBarrelLayer
-    if(innerLost == validHitInFirstPixelBarrelLayer){
-        // then to encode the number of layers, we add more hits on distinct layers (B2, B3, B4, F1, ...)
-        for(; i<numberOfPixelLayers; i++) {
-            if (i <= 3) { 
-                track->appendTrackerHitPattern(PixelSubdetector::PixelBarrel, i+1, 0, TrackingRecHit::valid); 
-            } else {    
-                track->appendTrackerHitPattern(PixelSubdetector::PixelEndcap, i-3, 0, TrackingRecHit::valid); 
-            }
-        }
-    } else {
-        // to encode the information on the layers, we add one valid hits per layer but skipping PXB1
-    	int iOffset=0;	
-        if(firstHit_!=0 && reco::HitPattern::pixelHitFilter(firstHit_)) {
-         iOffset=reco::HitPattern::getLayer(firstHit_);
-         if(reco::HitPattern::getSubStructure(firstHit_)==PixelSubdetector::PixelEndcap) iOffset+=3;
-	} else {iOffset=1; }
-        for(;i<numberOfPixelLayers; i++) {
-            if (i+iOffset <= 2 ) { track->appendTrackerHitPattern(PixelSubdetector::PixelBarrel, i+iOffset+1, 0, TrackingRecHit::valid);   }
-	    else {track->appendTrackerHitPattern(PixelSubdetector::PixelEndcap, i+iOffset-3+1, 0, TrackingRecHit::valid);  }
-
-        }
+  maybeUnpackBoth();
+  math::RhoEtaPhiVector p3(ptTrk(), etaAtVtx(), phiAtVtx());
+  maybeUnpackCovariance();
+  int numberOfStripLayers = stripLayersWithMeasurement(),
+      numberOfPixelLayers = pixelLayersWithMeasurement();
+  int numberOfPixelHits = this->numberOfPixelHits();
+  int numberOfHits = this->numberOfHits();
+
+  int ndof = numberOfHits + numberOfPixelHits - 5;
+  LostInnerHits innerLost = lostInnerHits();
+
+  auto track = std::make_unique<reco::Track>(
+      normalizedChi2_ * ndof, ndof, *vertex_,
+      math::XYZVector(p3.x(), p3.y(), p3.z()), charge(), *(m_.load()),
+      reco::TrackBase::undefAlgorithm, reco::TrackBase::loose);
+  int i = 0;
+  if (firstHit_ == 0) { // Backward compatible
+    if (innerLost == validHitInFirstPixelBarrelLayer) {
+      track->appendTrackerHitPattern(PixelSubdetector::PixelBarrel, 1, 0,
+                                     TrackingRecHit::valid);
+      i = 1;
     }
-    // add extra hits (overlaps, etc), all on the first layer with a hit - to avoid increasing the layer count
-    for(;i<numberOfPixelHits; i++) { 
-       if(firstHit_ !=0 && reco::HitPattern::pixelHitFilter(firstHit_)) { 
-          track->appendTrackerHitPattern(reco::HitPattern::getSubStructure(firstHit_), reco::HitPattern::getLayer(firstHit_), 0, TrackingRecHit::valid); 
-	} else {
-          track->appendTrackerHitPattern(PixelSubdetector::PixelBarrel, (innerLost == validHitInFirstPixelBarrelLayer ? 1 : 2), 0, TrackingRecHit::valid); 
-	}
+  } else {
+    track->appendHitPattern(firstHit_, TrackingRecHit::valid);
+  }
+
+  if (firstHit_ != 0 && reco::HitPattern::pixelHitFilter(firstHit_))
+    i = 1;
+
+  // add hits to match the number of laters and validHitInFirstPixelBarrelLayer
+  if (innerLost == validHitInFirstPixelBarrelLayer) {
+    // then to encode the number of layers, we add more hits on distinct layers
+    // (B2, B3, B4, F1, ...)
+    for (; i < numberOfPixelLayers; i++) {
+      if (i <= 3) {
+        track->appendTrackerHitPattern(PixelSubdetector::PixelBarrel, i + 1, 0,
+                                       TrackingRecHit::valid);
+      } else {
+        track->appendTrackerHitPattern(PixelSubdetector::PixelEndcap, i - 3, 0,
+                                       TrackingRecHit::valid);
+      }
     }
-    // now start adding strip layers, putting one hit on each layer so that the hitPattern.stripLayersWithMeasurement works.
-    // we don't know what the layers where, so we just start with TIB (4 layers), then TOB (6 layers), then TEC (9)
-    // and then TID(3), so that we can get a number of valid strip layers up to 4+6+9+3
-    if(firstHit_!=0 && reco::HitPattern::stripHitFilter(firstHit_)) i+=1;
-    int slOffset=0;	
-    if(firstHit_!=0 && reco::HitPattern::stripHitFilter(firstHit_)) { 
-         slOffset=reco::HitPattern::getLayer(firstHit_)-1;
-         if(reco::HitPattern::getSubStructure(firstHit_)==StripSubdetector::TID) slOffset+=4;
-         if(reco::HitPattern::getSubStructure(firstHit_)==StripSubdetector::TOB) slOffset+=7;
-         if(reco::HitPattern::getSubStructure(firstHit_)==StripSubdetector::TEC) slOffset+=13;
+  } else {
+    // to encode the information on the layers, we add one valid hits per layer
+    // but skipping PXB1
+    int iOffset = 0;
+    if (firstHit_ != 0 && reco::HitPattern::pixelHitFilter(firstHit_)) {
+      iOffset = reco::HitPattern::getLayer(firstHit_);
+      if (reco::HitPattern::getSubStructure(firstHit_) ==
+          PixelSubdetector::PixelEndcap)
+        iOffset += 3;
+    } else {
+      iOffset = 1;
     }
-    for(int sl=slOffset; sl < numberOfStripLayers+slOffset; ++sl, ++i) {
-        if      (sl < 4)    track->appendTrackerHitPattern(StripSubdetector::TIB,   sl   +1, 1, TrackingRecHit::valid);
-        else if (sl < 4+3)  track->appendTrackerHitPattern(StripSubdetector::TID, (sl- 4)+1, 1, TrackingRecHit::valid);
-        else if (sl < 7+6) track->appendTrackerHitPattern(StripSubdetector::TOB, (sl-7)+1, 1, TrackingRecHit::valid);
-        else if (sl < 13+9) track->appendTrackerHitPattern(StripSubdetector::TEC, (sl-13)+1, 1, TrackingRecHit::valid);
-        else break; // wtf?
+    for (; i < numberOfPixelLayers; i++) {
+      if (i + iOffset <= 2) {
+        track->appendTrackerHitPattern(PixelSubdetector::PixelBarrel,
+                                       i + iOffset + 1, 0,
+                                       TrackingRecHit::valid);
+      } else {
+        track->appendTrackerHitPattern(PixelSubdetector::PixelEndcap,
+                                       i + iOffset - 3 + 1, 0,
+                                       TrackingRecHit::valid);
+      }
     }
-    // finally we account for extra strip hits beyond the one-per-layer added above. we put them all on TIB1,
-    // to avoid incrementing the number of layersWithMeasurement.
-    for(;i<numberOfHits;i++) {
-	  if(reco::HitPattern::stripHitFilter(firstHit_)) { 
-              track->appendTrackerHitPattern(reco::HitPattern::getSubStructure(firstHit_),  reco::HitPattern::getLayer(firstHit_), 1, TrackingRecHit::valid);
-	  } else {
-              track->appendTrackerHitPattern(StripSubdetector::TIB, 1, 1, TrackingRecHit::valid);
-	  }
+  }
+  // add extra hits (overlaps, etc), all on the first layer with a hit - to
+  // avoid increasing the layer count
+  for (; i < numberOfPixelHits; i++) {
+    if (firstHit_ != 0 && reco::HitPattern::pixelHitFilter(firstHit_)) {
+      track->appendTrackerHitPattern(
+          reco::HitPattern::getSubStructure(firstHit_),
+          reco::HitPattern::getLayer(firstHit_), 0, TrackingRecHit::valid);
+    } else {
+      track->appendTrackerHitPattern(
+          PixelSubdetector::PixelBarrel,
+          (innerLost == validHitInFirstPixelBarrelLayer ? 1 : 2), 0,
+          TrackingRecHit::valid);
     }
-
-
-    switch (innerLost) {
-        case validHitInFirstPixelBarrelLayer:
-            break;
-        case noLostInnerHits:
-            break;
-        case oneLostInnerHit:
-            track->appendTrackerHitPattern(PixelSubdetector::PixelBarrel, 1, 0, TrackingRecHit::missing_inner);
-            break;
-        case moreLostInnerHits:
-            track->appendTrackerHitPattern(PixelSubdetector::PixelBarrel, 1, 0, TrackingRecHit::missing_inner);
-            track->appendTrackerHitPattern(PixelSubdetector::PixelBarrel, 2, 0, TrackingRecHit::missing_inner);
-            break;
-    };
-
-    if (trackHighPurity()) track->setQuality(reco::TrackBase::highPurity);
-    
-    reco::Track* expected = nullptr;
-    if( track_.compare_exchange_strong(expected,track.get()) ) {
-      track.release();
+  }
+  // now start adding strip layers, putting one hit on each layer so that the
+  // hitPattern.stripLayersWithMeasurement works. we don't know what the layers
+  // where, so we just start with TIB (4 layers), then TOB (6 layers), then TEC
+  // (9) and then TID(3), so that we can get a number of valid strip layers up
+  // to 4+6+9+3
+  if (firstHit_ != 0 && reco::HitPattern::stripHitFilter(firstHit_))
+    i += 1;
+  int slOffset = 0;
+  if (firstHit_ != 0 && reco::HitPattern::stripHitFilter(firstHit_)) {
+    slOffset = reco::HitPattern::getLayer(firstHit_) - 1;
+    if (reco::HitPattern::getSubStructure(firstHit_) == StripSubdetector::TID)
+      slOffset += 4;
+    if (reco::HitPattern::getSubStructure(firstHit_) == StripSubdetector::TOB)
+      slOffset += 7;
+    if (reco::HitPattern::getSubStructure(firstHit_) == StripSubdetector::TEC)
+      slOffset += 13;
+  }
+  for (int sl = slOffset; sl < numberOfStripLayers + slOffset; ++sl, ++i) {
+    if (sl < 4)
+      track->appendTrackerHitPattern(StripSubdetector::TIB, sl + 1, 1,
+                                     TrackingRecHit::valid);
+    else if (sl < 4 + 3)
+      track->appendTrackerHitPattern(StripSubdetector::TID, (sl - 4) + 1, 1,
+                                     TrackingRecHit::valid);
+    else if (sl < 7 + 6)
+      track->appendTrackerHitPattern(StripSubdetector::TOB, (sl - 7) + 1, 1,
+                                     TrackingRecHit::valid);
+    else if (sl < 13 + 9)
+      track->appendTrackerHitPattern(StripSubdetector::TEC, (sl - 13) + 1, 1,
+                                     TrackingRecHit::valid);
+    else
+      break; // wtf?
+  }
+  // finally we account for extra strip hits beyond the one-per-layer added
+  // above. we put them all on TIB1, to avoid incrementing the number of
+  // layersWithMeasurement.
+  for (; i < numberOfHits; i++) {
+    if (reco::HitPattern::stripHitFilter(firstHit_)) {
+      track->appendTrackerHitPattern(
+          reco::HitPattern::getSubStructure(firstHit_),
+          reco::HitPattern::getLayer(firstHit_), 1, TrackingRecHit::valid);
+    } else {
+      track->appendTrackerHitPattern(StripSubdetector::TIB, 1, 1,
+                                     TrackingRecHit::valid);
     }
-
-
+  }
+
+  switch (innerLost) {
+  case validHitInFirstPixelBarrelLayer:
+    break;
+  case noLostInnerHits:
+    break;
+  case oneLostInnerHit:
+    track->appendTrackerHitPattern(PixelSubdetector::PixelBarrel, 1, 0,
+                                   TrackingRecHit::missing_inner);
+    break;
+  case moreLostInnerHits:
+    track->appendTrackerHitPattern(PixelSubdetector::PixelBarrel, 1, 0,
+                                   TrackingRecHit::missing_inner);
+    track->appendTrackerHitPattern(PixelSubdetector::PixelBarrel, 2, 0,
+                                   TrackingRecHit::missing_inner);
+    break;
+  };
+
+  if (trackHighPurity())
+    track->setQuality(reco::TrackBase::highPurity);
+
+  reco::Track *expected = nullptr;
+  if (track_.compare_exchange_strong(expected, track.get())) {
+    track.release();
+  }
 }
 
 //// Everything below is just trivial implementations of reco::Candidate methods
 
-const reco::CandidateBaseRef & pat::PackedCandidate::masterClone() const {
+const reco::CandidateBaseRef &pat::PackedCandidate::masterClone() const {
   throw cms::Exception("Invalid Reference")
-    << "this Candidate has no master clone reference."
-    << "Can't call masterClone() method.\n";
+      << "this Candidate has no master clone reference."
+      << "Can't call masterClone() method.\n";
 }
 
-bool pat::PackedCandidate::hasMasterClone() const {
-  return false;
-}
-
-bool pat::PackedCandidate::hasMasterClonePtr() const {
-  return false;
-}
+bool pat::PackedCandidate::hasMasterClone() const { return false; }
 
+bool pat::PackedCandidate::hasMasterClonePtr() const { return false; }
 
-const reco::CandidatePtr & pat::PackedCandidate::masterClonePtr() const {
+const reco::CandidatePtr &pat::PackedCandidate::masterClonePtr() const {
   throw cms::Exception("Invalid Reference")
-    << "this Candidate has no master clone ptr."
-    << "Can't call masterClonePtr() method.\n";
+      << "this Candidate has no master clone ptr."
+      << "Can't call masterClonePtr() method.\n";
 }
 
-size_t pat::PackedCandidate::numberOfDaughters() const { 
-  return 0; 
-}
+size_t pat::PackedCandidate::numberOfDaughters() const { return 0; }
 
-size_t pat::PackedCandidate::numberOfMothers() const { 
-  return 0; 
-}
+size_t pat::PackedCandidate::numberOfMothers() const { return 0; }
 
-bool pat::PackedCandidate::overlap( const reco::Candidate & o ) const { 
-  return  p4() == o.p4() && vertex() == o.vertex() && charge() == o.charge();
-//  return  p4() == o.p4() && charge() == o.charge();
+bool pat::PackedCandidate::overlap(const reco::Candidate &o) const {
+  return p4() == o.p4() && vertex() == o.vertex() && charge() == o.charge();
+  //  return  p4() == o.p4() && charge() == o.charge();
 }
 
-const reco::Candidate * pat::PackedCandidate::daughter( size_type ) const {
+const reco::Candidate *pat::PackedCandidate::daughter(size_type) const {
   return nullptr;
 }
 
-const reco::Candidate * pat::PackedCandidate::mother( size_type ) const {
+const reco::Candidate *pat::PackedCandidate::mother(size_type) const {
   return nullptr;
 }
 
-const reco::Candidate * pat::PackedCandidate::daughter(const std::string&) const {
+const reco::Candidate *
+pat::PackedCandidate::daughter(const std::string &) const {
   throw edm::Exception(edm::errors::UnimplementedFeature)
-    << "This Candidate type does not implement daughter(std::string). "
-    << "Please use CompositeCandidate or NamedCompositeCandidate.\n";
+      << "This Candidate type does not implement daughter(std::string). "
+      << "Please use CompositeCandidate or NamedCompositeCandidate.\n";
 }
 
-reco::Candidate * pat::PackedCandidate::daughter(const std::string&) {
+reco::Candidate *pat::PackedCandidate::daughter(const std::string &) {
   throw edm::Exception(edm::errors::UnimplementedFeature)
-    << "This Candidate type does not implement daughter(std::string). "
-    << "Please use CompositeCandidate or NamedCompositeCandidate.\n";
+      << "This Candidate type does not implement daughter(std::string). "
+      << "Please use CompositeCandidate or NamedCompositeCandidate.\n";
 }
 
+reco::Candidate *pat::PackedCandidate::daughter(size_type) { return nullptr; }
 
+double pat::PackedCandidate::vertexChi2() const { return 0; }
 
-reco::Candidate * pat::PackedCandidate::daughter( size_type ) {
-  return nullptr;
-}
-
-double pat::PackedCandidate::vertexChi2() const {
-  return 0;
-}
-
-double pat::PackedCandidate::vertexNdof() const {
-  return 0;
-}
+double pat::PackedCandidate::vertexNdof() const { return 0; }
 
-double pat::PackedCandidate::vertexNormalizedChi2() const {
-  return 0;
-}
+double pat::PackedCandidate::vertexNormalizedChi2() const { return 0; }
 
 double pat::PackedCandidate::vertexCovariance(int i, int j) const {
   throw edm::Exception(edm::errors::UnimplementedFeature)
-    << "reco::ConcreteCandidate does not implement vertex covariant matrix.\n";
+      << "reco::ConcreteCandidate does not implement vertex covariant "
+         "matrix.\n";
 }
 
-void pat::PackedCandidate::fillVertexCovariance(CovarianceMatrix & err) const {
+void pat::PackedCandidate::fillVertexCovariance(CovarianceMatrix &err) const {
   throw edm::Exception(edm::errors::UnimplementedFeature)
-    << "reco::ConcreteCandidate does not implement vertex covariant matrix.\n";
+      << "reco::ConcreteCandidate does not implement vertex covariant "
+         "matrix.\n";
 }
 
+bool pat::PackedCandidate::longLived() const { return false; }
 
-bool pat::PackedCandidate::longLived() const {return false;}
-
-bool pat::PackedCandidate::massConstraint() const {return false;}
+bool pat::PackedCandidate::massConstraint() const { return false; }
 
 // puppiweight
 void pat::PackedCandidate::setPuppiWeight(float p, float p_nolep) {
-  // Set both weights at once to avoid misconfigured weights if called in the wrong order
-  packedPuppiweight_ = std::numeric_limits<uint8_t>::max()*p;
-  packedPuppiweightNoLepDiff_ = std::numeric_limits<int8_t>::max()*(p_nolep-p);
+  // Set both weights at once to avoid misconfigured weights if called in the
+  // wrong order
+  packedPuppiweight_ = std::numeric_limits<uint8_t>::max() * p;
+  packedPuppiweightNoLepDiff_ =
+      std::numeric_limits<int8_t>::max() * (p_nolep - p);
 }
 
-float pat::PackedCandidate::puppiWeight() const { return 1.f*packedPuppiweight_/std::numeric_limits<uint8_t>::max();}
+float pat::PackedCandidate::puppiWeight() const {
+  return 1.f * packedPuppiweight_ / std::numeric_limits<uint8_t>::max();
+}
 
-float pat::PackedCandidate::puppiWeightNoLep() const { return 1.f*packedPuppiweightNoLepDiff_/std::numeric_limits<int8_t>::max() + 1.f*packedPuppiweight_/std::numeric_limits<uint8_t>::max();}
+float pat::PackedCandidate::puppiWeightNoLep() const {
+  return 1.f * packedPuppiweightNoLepDiff_ /
+             std::numeric_limits<int8_t>::max() +
+         1.f * packedPuppiweight_ / std::numeric_limits<uint8_t>::max();
+}
 
 void pat::PackedCandidate::setRawCaloFraction(float p) {
-  if(100*p>std::numeric_limits<uint8_t>::max())
-    rawCaloFraction_ = std::numeric_limits<uint8_t>::max(); // Set to overflow value
+  if (100 * p > std::numeric_limits<uint8_t>::max())
+    rawCaloFraction_ =
+        std::numeric_limits<uint8_t>::max(); // Set to overflow value
   else
-    rawCaloFraction_ = 100*p;
+    rawCaloFraction_ = 100 * p;
 }
 
-void pat::PackedCandidate::setHcalFraction(float p) {
-  hcalFraction_ = 100*p;
+void pat::PackedCandidate::setRawHcalFraction(float p) {
+  rawHcalFraction_ = 100 * p;
 }
 
+void pat::PackedCandidate::setCaloFraction(float p) { caloFraction_ = 100 * p; }
+
+void pat::PackedCandidate::setHcalFraction(float p) { hcalFraction_ = 100 * p; }
+
 void pat::PackedCandidate::setIsIsolatedChargedHadron(bool p) {
   isIsolatedChargedHadron_ = p;
 }
 
 void pat::PackedCandidate::setDTimeAssociatedPV(float aTime, float aTimeError) {
-    if (aTime == 0 && aTimeError == 0) {
-        packedTime_ = 0; packedTimeError_ = 0;
-    } else if (aTimeError == 0) {
-        packedTimeError_ = 0;
-        packedTime_ = packTimeNoError(aTime);
-    } else {
-        packedTimeError_ = packTimeError(aTimeError);
-        aTimeError = unpackTimeError(packedTimeError_); // for reproducibility
-        packedTime_ = packTimeWithError(aTime, aTimeError);
-    }
+  if (aTime == 0 && aTimeError == 0) {
+    packedTime_ = 0;
+    packedTimeError_ = 0;
+  } else if (aTimeError == 0) {
+    packedTimeError_ = 0;
+    packedTime_ = packTimeNoError(aTime);
+  } else {
+    packedTimeError_ = packTimeError(aTimeError);
+    aTimeError = unpackTimeError(packedTimeError_); // for reproducibility
+    packedTime_ = packTimeWithError(aTime, aTimeError);
+  }
 }
 
 /// static to allow unit testing
 uint8_t pat::PackedCandidate::packTimeError(float timeError) {
-    if (timeError <= 0) return 0;
-    // log-scale packing.
-    // for MIN_TIMEERROR = 0.002, EXPO_TIMEERROR = 5:
-    //      minimum value 0.002 = 2ps (packed as 1)
-    //      maximum value 0.5 ns      (packed as 255)
-    //      constant *relative* precision of about 2%
-    return std::max<uint8_t>( std::min(std::round(std::ldexp(std::log2(timeError/MIN_TIMEERROR), +EXPO_TIMEERROR)), 255.f), 1);
+  if (timeError <= 0)
+    return 0;
+  // log-scale packing.
+  // for MIN_TIMEERROR = 0.002, EXPO_TIMEERROR = 5:
+  //      minimum value 0.002 = 2ps (packed as 1)
+  //      maximum value 0.5 ns      (packed as 255)
+  //      constant *relative* precision of about 2%
+  return std::max<uint8_t>(
+      std::min(std::round(std::ldexp(std::log2(timeError / MIN_TIMEERROR),
+                                     +EXPO_TIMEERROR)),
+               255.f),
+      1);
 }
 float pat::PackedCandidate::unpackTimeError(uint8_t timeError) {
-    return timeError > 0 ? MIN_TIMEERROR * std::exp2(std::ldexp(float(timeError),-EXPO_TIMEERROR)) : -1.0f;
+  return timeError > 0
+             ? MIN_TIMEERROR *
+                   std::exp2(std::ldexp(float(timeError), -EXPO_TIMEERROR))
+             : -1.0f;
 }
 float pat::PackedCandidate::unpackTimeNoError(int16_t time) {
-    if (time == 0) return 0.f;
-    return (time > 0 ? MIN_TIME_NOERROR : -MIN_TIME_NOERROR) * std::exp2(std::ldexp(float(std::abs(time)),-EXPO_TIME_NOERROR));
+  if (time == 0)
+    return 0.f;
+  return (time > 0 ? MIN_TIME_NOERROR : -MIN_TIME_NOERROR) *
+         std::exp2(std::ldexp(float(std::abs(time)), -EXPO_TIME_NOERROR));
 }
 int16_t pat::PackedCandidate::packTimeNoError(float time) {
-    // encoding in log scale to store times in a large range with few bits.
-    // for MIN_TIME_NOERROR = 0.0002 and EXPO_TIME_NOERROR = 6:
-    //    smallest non-zero time = 0.2 ps (encoded as +/-1)
-    //    one BX, +/- 12.5 ns, is fully covered with 11 bits (+/- 1023)
-    //    12 bits cover by far any plausible value (+/-2047 corresponds to about +/- 0.8 ms!)
-    //    constant *relative* ~1% precision
-    if (std::abs(time) < MIN_TIME_NOERROR) return 0; // prevent underflows
-    float fpacked = std::ldexp(std::log2(std::abs(time/MIN_TIME_NOERROR)),+EXPO_TIME_NOERROR);
-    return (time > 0 ? +1 : -1)*std::min(std::round(fpacked), 2047.f);
-}
-float pat::PackedCandidate::unpackTimeWithError(int16_t time, uint8_t timeError) {
-    if (time % 2 == 0) {
-        // no overflow: drop rightmost bit and unpack in units of timeError
-        return std::ldexp(unpackTimeError(timeError), EXPO_TIME_WITHERROR) * float(time/2);
-    } else {
-        // overflow: drop rightmost bit, unpack using the noError encoding
-        return pat::PackedCandidate::unpackTimeNoError(time/2);
-    }
+  // encoding in log scale to store times in a large range with few bits.
+  // for MIN_TIME_NOERROR = 0.0002 and EXPO_TIME_NOERROR = 6:
+  //    smallest non-zero time = 0.2 ps (encoded as +/-1)
+  //    one BX, +/- 12.5 ns, is fully covered with 11 bits (+/- 1023)
+  //    12 bits cover by far any plausible value (+/-2047 corresponds to about
+  //    +/- 0.8 ms!) constant *relative* ~1% precision
+  if (std::abs(time) < MIN_TIME_NOERROR)
+    return 0; // prevent underflows
+  float fpacked = std::ldexp(std::log2(std::abs(time / MIN_TIME_NOERROR)),
+                             +EXPO_TIME_NOERROR);
+  return (time > 0 ? +1 : -1) * std::min(std::round(fpacked), 2047.f);
+}
+float pat::PackedCandidate::unpackTimeWithError(int16_t time,
+                                                uint8_t timeError) {
+  if (time % 2 == 0) {
+    // no overflow: drop rightmost bit and unpack in units of timeError
+    return std::ldexp(unpackTimeError(timeError), EXPO_TIME_WITHERROR) *
+           float(time / 2);
+  } else {
+    // overflow: drop rightmost bit, unpack using the noError encoding
+    return pat::PackedCandidate::unpackTimeNoError(time / 2);
+  }
+}
+int16_t pat::PackedCandidate::packTimeWithError(float time, float timeError) {
+  // Encode in units of timeError * 2^EXPO_TIME_WITHERROR (~1.6% if
+  // EXPO_TIME_WITHERROR = -6) the largest value that can be stored in 14 bits +
+  // sign bit + overflow bit is about 260 sigmas values larger than that will be
+  // stored using the no-timeError packing (with less precision). overflows of
+  // these kinds should happen only for particles that are late arriving,
+  // out-of-time, or mis-reconstructed, as timeError is O(20ps) and the beam
+  // spot witdth is O(200ps)
+  float fpacked = std::round(time / std::ldexp(timeError, EXPO_TIME_WITHERROR));
+  if (std::abs(fpacked) < 16383.f) { // 16383 = (2^14 - 1) = largest absolute
+                                     // value for a signed 15 bit integer
+    return int16_t(fpacked) * 2; // make it even, and fit in a signed 16 bit int
+  } else {
+    int16_t packed = packTimeNoError(time); // encode
+    return packed * 2 +
+           (time > 0 ? +1
+                     : -1); // make it odd, to signal that there was an overlow
+  }
 }
-int16_t pat::PackedCandidate::packTimeWithError(float   time, float   timeError) {
-    // Encode in units of timeError * 2^EXPO_TIME_WITHERROR (~1.6% if EXPO_TIME_WITHERROR = -6)
-    // the largest value that can be stored in 14 bits + sign bit + overflow bit is about 260 sigmas
-    // values larger than that will be stored using the no-timeError packing (with less precision).
-    // overflows of these kinds should happen only for particles that are late arriving, out-of-time,
-    // or mis-reconstructed, as timeError is O(20ps) and the beam spot witdth is O(200ps)
-    float fpacked = std::round(time/std::ldexp(timeError, EXPO_TIME_WITHERROR));
-    if (std::abs(fpacked) < 16383.f) { // 16383 = (2^14 - 1) = largest absolute value for a signed 15 bit integer
-        return int16_t(fpacked) * 2; // make it even, and fit in a signed 16 bit int
-    } else {
-        int16_t packed = packTimeNoError(time); // encode
-        return packed * 2 + (time > 0 ? +1 : -1); // make it odd, to signal that there was an overlow
-    }
-}
-
diff --git a/DataFormats/PatCandidates/src/classes_def_objects.xml b/DataFormats/PatCandidates/src/classes_def_objects.xml
index 528ecfb3191f4..3fb32a11d63ab 100644
--- a/DataFormats/PatCandidates/src/classes_def_objects.xml
+++ b/DataFormats/PatCandidates/src/classes_def_objects.xml
@@ -67,7 +67,9 @@
   </ioread>
 
 
-  <class name="pat::Muon"  ClassVersion="25">
+  <class name="pat::Muon"  ClassVersion="27">
+   <version ClassVersion="27" checksum="3473399161"/>
+   <version ClassVersion="26" checksum="1156855644"/>
    <version ClassVersion="25" checksum="574733987"/>
    <version ClassVersion="24" checksum="2298704767"/>
    <version ClassVersion="23" checksum="3471390119"/>
@@ -336,7 +338,8 @@
   <class name="pat::PackedCandidate::PackedCovariance" ClassVersion="3">
    <version ClassVersion="3" checksum="3320406063"/>
   </class>
-  <class name="pat::PackedCandidate" ClassVersion="33">
+  <class name="pat::PackedCandidate" ClassVersion="34">
+   <version ClassVersion="34" checksum="3953181632"/>
    <version ClassVersion="33" checksum="1092680546"/>
    <version ClassVersion="32" checksum="926869123"/>
    <version ClassVersion="31" checksum="1248040002"/>
@@ -419,6 +422,18 @@
             packedPuppiweightNoLepDiff_ = std::numeric_limits<int8_t>::max()*(logintpack::unpack8logClosed(onfile.packedPuppiweightNoLepDiff_+onfile.packedPuppiweight_,-2,0,64)/2. - logintpack::unpack8logClosed(onfile.packedPuppiweight_,-2,0,64)/2.);
    ]]>
    </ioread>
+  <ioread sourceClass="pat::PackedCandidate" source="int8_t hcalFraction_; int pdgId_" version="[-33]" targetClass="pat::PackedCandidate" target="rawHcalFraction_,hcalFraction_,pdgId_">
+   <![CDATA[
+      int absPdgId = abs(onfile.pdgId_);
+      if (absPdgId == 211 || absPdgId == 11 || absPdgId == 13) {
+        rawHcalFraction_ = onfile.hcalFraction_;
+        hcalFraction_ = 0;
+      } else {
+        hcalFraction_ = onfile.hcalFraction_;
+      }
+      pdgId_ = onfile.pdgId_;
+   ]]>
+   </ioread>
 
 
   <class name="pat::PackedGenParticle" ClassVersion="12">
diff --git a/DataFormats/PatCandidates/src/classes_def_other.xml b/DataFormats/PatCandidates/src/classes_def_other.xml
index 48d36da5229ab..cf9459847ae20 100644
--- a/DataFormats/PatCandidates/src/classes_def_other.xml
+++ b/DataFormats/PatCandidates/src/classes_def_other.xml
@@ -71,6 +71,23 @@
   <class name="edm::Wrapper<edm::ValueMap<vid::CutFlowResult> >"/>
   <class name="pat::UserHolder<vid::CutFlowResult>"/>
 
+  <class name="pat::HcalDepthEnergyFractions" ClassVersion="3">
+    <version ClassVersion="3" checksum="4055779358"/>
+    <field name="fractions_" transient="true"/>
+  </class>
+  <class name="std::vector<pat::HcalDepthEnergyFractions>"/>
+  <class name="edm::Wrapper<std::vector<pat::HcalDepthEnergyFractions> >"/>
+  <class name="edm::ValueMap<pat::HcalDepthEnergyFractions>" />
+  <class name="edm::Wrapper<edm::ValueMap<pat::HcalDepthEnergyFractions> >"/>
+
+  <ioread sourceClass = "pat::HcalDepthEnergyFractions" version="[1-]"
+                targetClass="pat::HcalDepthEnergyFractions"
+		source="std::vector<uint8_t> fractionsI_"
+		target="fractions_">
+  <![CDATA[ newObj->initFloatVector();
+  ]]>
+  </ioread>
+  
   </selection>
  <exclusion>
  </exclusion>
diff --git a/DataFormats/PatCandidates/src/classes_other.h b/DataFormats/PatCandidates/src/classes_other.h
index acd7253cf91bd..f4ae9148b504e 100644
--- a/DataFormats/PatCandidates/src/classes_other.h
+++ b/DataFormats/PatCandidates/src/classes_other.h
@@ -21,3 +21,5 @@
 
 #include "DataFormats/PatCandidates/interface/VIDCutFlowResult.h"
 
+#include "DataFormats/PatCandidates/interface/HcalDepthEnergyFractions.h"
+
diff --git a/DataFormats/RPCDigi/interface/DataRecord.h b/DataFormats/RPCDigi/interface/DataRecord.h
index a5bfd1309b9be..cf472bb0627fd 100644
--- a/DataFormats/RPCDigi/interface/DataRecord.h
+++ b/DataFormats/RPCDigi/interface/DataRecord.h
@@ -6,46 +6,44 @@
 #include <bitset>
 #include <sstream>
 
-namespace rpcrawtodigi { 
-class DataRecord {
-public:
-  typedef uint16_t Data;
-  enum DataRecordType {
-    None = 0,
-    StartOfBXData = 1,
-    StartOfTbLinkInputNumberData = 2,
-    ChamberData = 3,
-    Empty = 4,
-    RDDM = 5,
-    SDDM = 6,
-    RCDM = 7,
-    RDM  = 8, 
-    UndefinedType = 9
+namespace rpcrawtodigi {
+  class DataRecord {
+  public:
+    typedef uint16_t Data;
+    enum DataRecordType {
+      None = 0,
+      StartOfBXData = 1,
+      StartOfTbLinkInputNumberData = 2,
+      ChamberData = 3,
+      Empty = 4,
+      RDDM = 5,
+      SDDM = 6,
+      RCDM = 7,
+      RDM = 8,
+      UndefinedType = 9
+    };
+
+  public:
+    explicit DataRecord(const Data& data = None) : theData(data) {}
+
+    virtual ~DataRecord() {}
+
+    const Data& data() const { return theData; }
+
+    DataRecordType type() const;
+
+    static std::string name(const DataRecordType& code);
+
+    std::string print() const {
+      std::ostringstream str;
+      str << std::bitset<16>(theData);
+      return str.str();
+    }
+
+    static std::string print(const DataRecord& record);
+
+  protected:
+    Data theData;
   };
-
-public:
-
-  explicit DataRecord(const Data& data = None) : theData(data) {}
-
-  virtual ~DataRecord() {}
-
-  const Data & data() const { return theData; }
-  
-  DataRecordType type() const;
-
-  static std::string name(const DataRecordType& code);
-
-  std::string print() const {
-    std::ostringstream str;
-    str << std::bitset<16>(theData); 
-    return str.str();
-  }
-
-  static std::string print(const DataRecord & record);
-  
-protected:
-  Data theData;
-
-};
-}
-#endif 
+}  // namespace rpcrawtodigi
+#endif
diff --git a/DataFormats/RPCDigi/interface/EmptyWord.h b/DataFormats/RPCDigi/interface/EmptyWord.h
index f3126a90e9422..3e1c8228a99e2 100644
--- a/DataFormats/RPCDigi/interface/EmptyWord.h
+++ b/DataFormats/RPCDigi/interface/EmptyWord.h
@@ -4,15 +4,16 @@
 #include "DataFormats/RPCDigi/interface/DataRecord.h"
 #include <string>
 
-namespace rpcrawtodigi{
-class EmptyWord : public DataRecord {
-private:
-  static const int  EW_TYPE = 0xE800;
-public:
-  EmptyWord() : DataRecord(EW_TYPE) {}
-  ~EmptyWord() override{}
-  std::string print()  const { return " EMPTY "; }
-  static bool matchType(const DataRecord & record) { return record.data()==EW_TYPE; }
-};
-}
-#endif 
+namespace rpcrawtodigi {
+  class EmptyWord : public DataRecord {
+  private:
+    static const int EW_TYPE = 0xE800;
+
+  public:
+    EmptyWord() : DataRecord(EW_TYPE) {}
+    ~EmptyWord() override {}
+    std::string print() const { return " EMPTY "; }
+    static bool matchType(const DataRecord& record) { return record.data() == EW_TYPE; }
+  };
+}  // namespace rpcrawtodigi
+#endif
diff --git a/DataFormats/RPCDigi/interface/ErrorRCDM.h b/DataFormats/RPCDigi/interface/ErrorRCDM.h
index fc5829773d76e..4ea7a8d5d1339 100644
--- a/DataFormats/RPCDigi/interface/ErrorRCDM.h
+++ b/DataFormats/RPCDigi/interface/ErrorRCDM.h
@@ -2,32 +2,31 @@
 #define DataFormats_RPCDigi_ErrorRCDM_H
 
 #include <bitset>
-#include <string> 
+#include <string>
 #include "DataFormats/RPCDigi/interface/DataRecord.h"
 
 namespace rpcrawtodigi {
 
-class ErrorRCDM : public DataRecord {
-public:
+  class ErrorRCDM : public DataRecord {
+  public:
+    ErrorRCDM(const DataRecord r) : DataRecord(r) {}
 
-  ErrorRCDM(const DataRecord r) : DataRecord(r) {}
+    static bool matchType(const DataRecord& record);
+    std::string print() const;
 
-  static bool matchType(const DataRecord & record);
-  std::string print() const;
+    unsigned int rmb() const;
+    unsigned int link() const;
 
-  unsigned int rmb() const;
-  unsigned int link() const;
+  private:
+    static const unsigned int RCDM_TYPE_FLAG = 0x1C;  // 11100
+    static const unsigned int RCDM_TYPE_SHIFT = 11;
 
-private:
-  static const unsigned int RCDM_TYPE_FLAG = 0x1C;  // 11100 
-  static const unsigned int RCDM_TYPE_SHIFT = 11; 
+    static const unsigned int RMB_MASK = 0x3F;  // 111111
+    static const unsigned int RMB_SHIFT = 5;
 
-  static const unsigned int RMB_MASK  = 0x3F;  // 111111
-  static const unsigned int RMB_SHIFT = 5; 
+    static const unsigned int LNK_MASK = 0x1F;  //11111
+  };
 
-  static const unsigned int LNK_MASK = 0x1F;   //11111 
-};
-
-}
+}  // namespace rpcrawtodigi
 
 #endif
diff --git a/DataFormats/RPCDigi/interface/ErrorRDDM.h b/DataFormats/RPCDigi/interface/ErrorRDDM.h
index 0d4f87287f7a6..89c60c0e25031 100644
--- a/DataFormats/RPCDigi/interface/ErrorRDDM.h
+++ b/DataFormats/RPCDigi/interface/ErrorRDDM.h
@@ -2,32 +2,31 @@
 #define DataFormats_RPCDigi_ErrorRDDM_H
 
 #include <bitset>
-#include <string> 
+#include <string>
 #include "DataFormats/RPCDigi/interface/DataRecord.h"
 
 namespace rpcrawtodigi {
 
-class ErrorRDDM : public DataRecord {
-public:
+  class ErrorRDDM : public DataRecord {
+  public:
+    ErrorRDDM(const DataRecord r) : DataRecord(r) {}
 
-  ErrorRDDM(const DataRecord r) : DataRecord(r) {}
+    static bool matchType(const DataRecord& record);
+    std::string print() const;
 
-  static bool matchType(const DataRecord & record);
-  std::string print() const;
+    unsigned int rmb() const;
+    unsigned int link() const;
 
-  unsigned int rmb() const;
-  unsigned int link() const;
+  private:
+    static const unsigned int RDDM_TYPE_FLAG = 0x1E;  // 11110
+    static const unsigned int RDDM_TYPE_SHIFT = 11;
 
-private:
-  static const unsigned int RDDM_TYPE_FLAG = 0x1E;  // 11110 
-  static const unsigned int RDDM_TYPE_SHIFT = 11; 
+    static const unsigned int RMB_MASK = 0x3F;  // 111111
+    static const unsigned int RMB_SHIFT = 5;
 
-  static const unsigned int RMB_MASK  = 0x3F;  // 111111
-  static const unsigned int RMB_SHIFT = 5; 
+    static const unsigned int LNK_MASK = 0x1F;  //11111
+  };
 
-  static const unsigned int LNK_MASK = 0x1F;   //11111 
-};
-
-}
+}  // namespace rpcrawtodigi
 
 #endif
diff --git a/DataFormats/RPCDigi/interface/ErrorRDM.h b/DataFormats/RPCDigi/interface/ErrorRDM.h
index 13eb735b19cf2..91ae125385aee 100644
--- a/DataFormats/RPCDigi/interface/ErrorRDM.h
+++ b/DataFormats/RPCDigi/interface/ErrorRDM.h
@@ -2,27 +2,26 @@
 #define DataFormats_RPCDigi_ErrorRDM_H
 
 #include <bitset>
-#include <string> 
+#include <string>
 #include "DataFormats/RPCDigi/interface/DataRecord.h"
 
 namespace rpcrawtodigi {
 
-class ErrorRDM : public DataRecord {
-public:
+  class ErrorRDM : public DataRecord {
+  public:
+    ErrorRDM(const DataRecord r) : DataRecord(r) {}
 
-  ErrorRDM(const DataRecord r) : DataRecord(r) {}
+    static bool matchType(const DataRecord& record);
+    std::string print() const;
 
-  static bool matchType(const DataRecord & record);
-  std::string print() const;
+    unsigned int rmb() const;
 
-  unsigned int rmb() const;
+  private:
+    static const unsigned int RDM_TYPE_FLAG = 0x3A1;  // 1110100001
+    static const unsigned int RDM_TYPE_SHIFT = 6;
+    static const unsigned int RMB_MASK = 0x3F;  // 111111
+  };
 
-private:
-  static const unsigned int RDM_TYPE_FLAG = 0x3A1;  // 1110100001 
-  static const unsigned int RDM_TYPE_SHIFT = 6; 
-  static const unsigned int RMB_MASK  = 0x3F;  // 111111
-};
-
-}
+}  // namespace rpcrawtodigi
 
 #endif
diff --git a/DataFormats/RPCDigi/interface/ErrorSDDM.h b/DataFormats/RPCDigi/interface/ErrorSDDM.h
index d6d633eaaaada..e86bc49e4decf 100644
--- a/DataFormats/RPCDigi/interface/ErrorSDDM.h
+++ b/DataFormats/RPCDigi/interface/ErrorSDDM.h
@@ -2,20 +2,20 @@
 #define DataFormats_RPCDigi_ErrorSDDM_H
 
 #include <bitset>
-#include <string> 
+#include <string>
 #include "DataFormats/RPCDigi/interface/DataRecord.h"
 
 namespace rpcrawtodigi {
 
-class ErrorSDDM : public DataRecord {
-private:
-  static const unsigned int SDDM_TYPE_FLAG = 0xE801;  // 1110100000000001 
-public:
-  ErrorSDDM(const DataRecord & r = DataRecord(SDDM_TYPE_FLAG)) : DataRecord(r) {}
-  static bool matchType(const DataRecord & record) { return ( SDDM_TYPE_FLAG == record.data() ); }
-  std::string print() const { return " SDDM "; }
-};
+  class ErrorSDDM : public DataRecord {
+  private:
+    static const unsigned int SDDM_TYPE_FLAG = 0xE801;  // 1110100000000001
+  public:
+    ErrorSDDM(const DataRecord& r = DataRecord(SDDM_TYPE_FLAG)) : DataRecord(r) {}
+    static bool matchType(const DataRecord& record) { return (SDDM_TYPE_FLAG == record.data()); }
+    std::string print() const { return " SDDM "; }
+  };
 
-}
+}  // namespace rpcrawtodigi
 
 #endif
diff --git a/DataFormats/RPCDigi/interface/RPCAMCLinkCounters.h b/DataFormats/RPCDigi/interface/RPCAMCLinkCounters.h
index 17d443cb07777..ac351ba972ba3 100644
--- a/DataFormats/RPCDigi/interface/RPCAMCLinkCounters.h
+++ b/DataFormats/RPCDigi/interface/RPCAMCLinkCounters.h
@@ -6,25 +6,24 @@
 
 #include "CondFormats/RPCObjects/interface/RPCAMCLink.h"
 
-class RPCAMCLinkCounters
-{
+class RPCAMCLinkCounters {
 public:
-    typedef std::map<std::pair<unsigned int, std::uint32_t>, unsigned int> map_type;
+  typedef std::map<std::pair<unsigned int, std::uint32_t>, unsigned int> map_type;
 
 public:
-    RPCAMCLinkCounters();
+  RPCAMCLinkCounters();
 
-    void add(unsigned int event, RPCAMCLink const & link, unsigned int count = 1);
-    void reset();
-    void reset(unsigned int event);
-    void reset(unsigned int event, RPCAMCLink const & link);
+  void add(unsigned int event, RPCAMCLink const& link, unsigned int count = 1);
+  void reset();
+  void reset(unsigned int event);
+  void reset(unsigned int event, RPCAMCLink const& link);
 
-    map_type const & getCounters() const;
+  map_type const& getCounters() const;
 
 protected:
-    map_type type_link_count_;
+  map_type type_link_count_;
 };
 
 #include "DataFormats/RPCDigi/interface/RPCAMCLinkCounters.icc"
 
-#endif // DataFormats_RPCDigi_RPCAMCLinkCounters_h
+#endif  // DataFormats_RPCDigi_RPCAMCLinkCounters_h
diff --git a/DataFormats/RPCDigi/interface/RPCAMCLinkCounters.icc b/DataFormats/RPCDigi/interface/RPCAMCLinkCounters.icc
index cd6f298f82d59..e042472d4b7dd 100644
--- a/DataFormats/RPCDigi/interface/RPCAMCLinkCounters.icc
+++ b/DataFormats/RPCDigi/interface/RPCAMCLinkCounters.icc
@@ -3,37 +3,27 @@
 
 #include "DataFormats/RPCDigi/interface/RPCAMCLinkCounters.h"
 
-inline void RPCAMCLinkCounters::add(unsigned int event, RPCAMCLink const & link, unsigned int count)
-{
-    type_link_count_[std::pair<unsigned int, std::uint32_t>(event, link.getId())] += count;
+inline void RPCAMCLinkCounters::add(unsigned int event, RPCAMCLink const& link, unsigned int count) {
+  type_link_count_[std::pair<unsigned int, std::uint32_t>(event, link.getId())] += count;
 }
 
-inline void RPCAMCLinkCounters::reset()
-{
-    type_link_count_.clear();
-}
+inline void RPCAMCLinkCounters::reset() { type_link_count_.clear(); }
 
-inline void RPCAMCLinkCounters::reset(unsigned int event)
-{
-    map_type::iterator first(type_link_count_.lower_bound(std::pair<unsigned int, std::uint32_t>(event, 0)));
-    if (first != type_link_count_.end()) {
-        map_type::iterator last(type_link_count_.upper_bound(std::pair<unsigned int, std::uint32_t>(event, 0xffffffff)));
-        type_link_count_.erase(first, last);
-    }
+inline void RPCAMCLinkCounters::reset(unsigned int event) {
+  map_type::iterator first(type_link_count_.lower_bound(std::pair<unsigned int, std::uint32_t>(event, 0)));
+  if (first != type_link_count_.end()) {
+    map_type::iterator last(type_link_count_.upper_bound(std::pair<unsigned int, std::uint32_t>(event, 0xffffffff)));
+    type_link_count_.erase(first, last);
+  }
 }
 
-inline void RPCAMCLinkCounters::reset(unsigned int event, RPCAMCLink const & link)
-{
-    map_type::iterator pos(type_link_count_.find(std::pair<unsigned int, std::uint32_t>(event, link.getId())));
-    if (pos != type_link_count_.end()) {
-        type_link_count_.erase(pos);
-    }
+inline void RPCAMCLinkCounters::reset(unsigned int event, RPCAMCLink const& link) {
+  map_type::iterator pos(type_link_count_.find(std::pair<unsigned int, std::uint32_t>(event, link.getId())));
+  if (pos != type_link_count_.end()) {
+    type_link_count_.erase(pos);
+  }
 }
 
-inline RPCAMCLinkCounters::map_type const &
-RPCAMCLinkCounters::getCounters() const
-{
-    return type_link_count_;
-}
+inline RPCAMCLinkCounters::map_type const& RPCAMCLinkCounters::getCounters() const { return type_link_count_; }
 
-#endif // DataFormats_RPCDigi_RPCAMCLinkCounters_icc
+#endif  // DataFormats_RPCDigi_RPCAMCLinkCounters_icc
diff --git a/DataFormats/RPCDigi/interface/RPCDigi.h b/DataFormats/RPCDigi/interface/RPCDigi.h
index 71b949bf0fad3..8125e8433a10b 100644
--- a/DataFormats/RPCDigi/interface/RPCDigi.h
+++ b/DataFormats/RPCDigi/interface/RPCDigi.h
@@ -16,11 +16,10 @@
 #include <cstdint>
 #include <iosfwd>
 
-class RPCDigi{
-
+class RPCDigi {
 public:
-  explicit RPCDigi (int strip, int bx);
-  RPCDigi ();
+  explicit RPCDigi(int strip, int bx);
+  RPCDigi();
 
   bool operator==(const RPCDigi& digi) const;
   bool operator<(const RPCDigi& digi) const;
@@ -39,19 +38,17 @@ class RPCDigi{
   double deltaTime() const { return deltaTime_; }
   double deltaX() const { return deltaX_; }
   double deltaY() const { return deltaY_; }
-  void setTime(double time) { time_ = time;}
+  void setTime(double time) { time_ = time; }
   void setDeltaTime(double dt) { deltaTime_ = dt; }
   void setX(double x) { coordinateX_ = x; }
   void setY(double y) { coordinateY_ = y; }
   void setDeltaX(double dx) { deltaX_ = dx; }
   void setDeltaY(double dy) { deltaY_ = dy; }
-  bool isPseudoDigi() const { return hasX_ || hasY_ ; }
-
-
+  bool isPseudoDigi() const { return hasX_ || hasY_; }
 
 private:
   uint16_t strip_;
-  int32_t  bx_;
+  int32_t bx_;
   double time_;
   double coordinateX_;
   double coordinateY_;
@@ -63,7 +60,6 @@ class RPCDigi{
   bool hasY_;
 };
 
-std::ostream & operator<<(std::ostream & o, const RPCDigi& digi);
+std::ostream& operator<<(std::ostream& o, const RPCDigi& digi);
 
 #endif
-
diff --git a/DataFormats/RPCDigi/interface/RPCDigiCollection.h b/DataFormats/RPCDigi/interface/RPCDigiCollection.h
index 1b9ac72e9b5b1..664f6d3b7c5a5 100644
--- a/DataFormats/RPCDigi/interface/RPCDigiCollection.h
+++ b/DataFormats/RPCDigi/interface/RPCDigiCollection.h
@@ -13,4 +13,3 @@
 typedef MuonDigiCollection<RPCDetId, RPCDigi> RPCDigiCollection;
 
 #endif
-
diff --git a/DataFormats/RPCDigi/interface/RPCDigiL1Link.h b/DataFormats/RPCDigi/interface/RPCDigiL1Link.h
index ba354d63101a9..cdccf345a66ff 100644
--- a/DataFormats/RPCDigi/interface/RPCDigiL1Link.h
+++ b/DataFormats/RPCDigi/interface/RPCDigiL1Link.h
@@ -5,7 +5,7 @@
 #include <map>
 
 class RPCDigiL1Link {
- public:
+public:
   RPCDigiL1Link();
 
   ~RPCDigiL1Link();
@@ -21,11 +21,11 @@ class RPCDigiL1Link {
 
   // Setters --layer run from 1 to nlayer
   void setLink(unsigned int layer, unsigned int rpcdetId, int strip, int bx);
-  
- private:
+
+private:
   void checklayer(unsigned int layer) const;
- private:
-  std::vector< std::pair<unsigned int, int> > _link;
-  
+
+private:
+  std::vector<std::pair<unsigned int, int> > _link;
 };
 #endif
diff --git a/DataFormats/RPCDigi/interface/RPCRawDataCounts.h b/DataFormats/RPCDigi/interface/RPCRawDataCounts.h
index e7605160472a0..0a96862537d23 100644
--- a/DataFormats/RPCDigi/interface/RPCRawDataCounts.h
+++ b/DataFormats/RPCDigi/interface/RPCRawDataCounts.h
@@ -5,30 +5,31 @@
 #include <vector>
 #include <string>
 
-namespace rpcrawtodigi { class DataRecord; }
-namespace rpcrawtodigi { class ReadoutError; }
+namespace rpcrawtodigi {
+  class DataRecord;
+}
+namespace rpcrawtodigi {
+  class ReadoutError;
+}
 
 class RPCRawDataCounts {
 public:
-
   RPCRawDataCounts() {}
-  ~RPCRawDataCounts() { }
-  void addDccRecord(int fedId, const rpcrawtodigi::DataRecord & record, int weight=1);
-  void addReadoutError(int fedId, const rpcrawtodigi::ReadoutError & error, int weight=1);
-  void operator+= (const RPCRawDataCounts& );
+  ~RPCRawDataCounts() {}
+  void addDccRecord(int fedId, const rpcrawtodigi::DataRecord& record, int weight = 1);
+  void addReadoutError(int fedId, const rpcrawtodigi::ReadoutError& error, int weight = 1);
+  void operator+=(const RPCRawDataCounts&);
   std::string print() const;
 
-  int fedBxRecords(int fedId) const; 
+  int fedBxRecords(int fedId) const;
   int fedFormatErrors(int fedId) const;
   int fedErrorRecords(int fedId) const;
 
 private:
-
-  friend class  RPCMonitorRaw;
-  std::map< std::pair<int,int>, int> theRecordTypes;
-  std::map< std::pair<int,int>, int> theReadoutErrors; 
-  std::map< std::pair<int,int>, int> theGoodEvents;
-  std::map< std::pair<int,int>, int> theBadEvents;
-
+  friend class RPCMonitorRaw;
+  std::map<std::pair<int, int>, int> theRecordTypes;
+  std::map<std::pair<int, int>, int> theReadoutErrors;
+  std::map<std::pair<int, int>, int> theGoodEvents;
+  std::map<std::pair<int, int>, int> theBadEvents;
 };
 #endif
diff --git a/DataFormats/RPCDigi/interface/RPCRawSynchro.h b/DataFormats/RPCDigi/interface/RPCRawSynchro.h
index fd93d9fc23330..9d05080df0782 100644
--- a/DataFormats/RPCDigi/interface/RPCRawSynchro.h
+++ b/DataFormats/RPCDigi/interface/RPCRawSynchro.h
@@ -6,8 +6,7 @@
 
 namespace RPCRawSynchro {
 
-  typedef std::vector< std::pair<LinkBoardElectronicIndex, int> > ProdItem;
+  typedef std::vector<std::pair<LinkBoardElectronicIndex, int> > ProdItem;
 }
 
 #endif
-
diff --git a/DataFormats/RPCDigi/interface/ReadoutError.h b/DataFormats/RPCDigi/interface/ReadoutError.h
index f43a3f26986ec..d35095f0b2845 100644
--- a/DataFormats/RPCDigi/interface/ReadoutError.h
+++ b/DataFormats/RPCDigi/interface/ReadoutError.h
@@ -4,11 +4,10 @@
 #include "CondFormats/RPCObjects/interface/LinkBoardElectronicIndex.h"
 #include <string>
 
-namespace rpcrawtodigi { 
-class ReadoutError {
-public:
-
-  enum ReadoutErrorType { 
+namespace rpcrawtodigi {
+  class ReadoutError {
+  public:
+    enum ReadoutErrorType {
       NoProblem = 0,
       HeaderCheckFail = 1,
       InconsitentFedId = 2,
@@ -17,27 +16,26 @@ class ReadoutError {
       InvalidLB = 5,
       EmptyPackedStrips = 6,
       InvalidDetId = 7,
-      InvalidStrip = 8, 
-      EOD = 9 
-  };
+      InvalidStrip = 8,
+      EOD = 9
+    };
 
-  explicit ReadoutError(unsigned int rawCode=0) : theError(rawCode) {}
+    explicit ReadoutError(unsigned int rawCode = 0) : theError(rawCode) {}
 
-  ReadoutError(const LinkBoardElectronicIndex&, const ReadoutErrorType&);
+    ReadoutError(const LinkBoardElectronicIndex&, const ReadoutErrorType&);
 
-  ReadoutErrorType type() const;
-  LinkBoardElectronicIndex where() const;
+    ReadoutErrorType type() const;
+    LinkBoardElectronicIndex where() const;
 
-  static std::string name(const ReadoutErrorType & code);
+    static std::string name(const ReadoutErrorType& code);
 
-  std::string name() const { return name(type()); }
+    std::string name() const { return name(type()); }
 
-  unsigned int rawCode() const { return theError;}
+    unsigned int rawCode() const { return theError; }
 
-private:
-  unsigned int theError;
-};
+  private:
+    unsigned int theError;
+  };
 
-}
+}  // namespace rpcrawtodigi
 #endif
-
diff --git a/DataFormats/RPCDigi/interface/RecordBX.h b/DataFormats/RPCDigi/interface/RecordBX.h
index 120c41f844e3c..8dff9861dd9b7 100644
--- a/DataFormats/RPCDigi/interface/RecordBX.h
+++ b/DataFormats/RPCDigi/interface/RecordBX.h
@@ -3,33 +3,31 @@
 
 #include "DataFormats/RPCDigi/interface/DataRecord.h"
 
-namespace rpcrawtodigi{
-class RecordBX : public DataRecord {
-
-private:
-  static const int BX_TYPE_FLAG = 0xD;
-  static const int BX_TYPE_SHIFT= 12;
-  static const int BX_MASK  = 0xFFF;
-  static const int BX_SHIFT = 0;
-
-public:
-
-  // empty record 
-  RecordBX() : DataRecord() { }
-
-  // set BX
-  RecordBX(int bx) : DataRecord(0) {
-    theData = (BX_TYPE_FLAG << BX_TYPE_SHIFT);
-    theData |= (bx << BX_SHIFT);
-  } 
-
-  // specialize given recort to this type
-  RecordBX(const DataRecord & rec) : DataRecord(rec) {}
-
-  ~RecordBX() override {}
-  int bx() const { return ((theData>>BX_SHIFT)&BX_MASK); } 
-  std::string print()  const;
-  static bool matchType(const DataRecord & record);
-};
-}
+namespace rpcrawtodigi {
+  class RecordBX : public DataRecord {
+  private:
+    static const int BX_TYPE_FLAG = 0xD;
+    static const int BX_TYPE_SHIFT = 12;
+    static const int BX_MASK = 0xFFF;
+    static const int BX_SHIFT = 0;
+
+  public:
+    // empty record
+    RecordBX() : DataRecord() {}
+
+    // set BX
+    RecordBX(int bx) : DataRecord(0) {
+      theData = (BX_TYPE_FLAG << BX_TYPE_SHIFT);
+      theData |= (bx << BX_SHIFT);
+    }
+
+    // specialize given recort to this type
+    RecordBX(const DataRecord& rec) : DataRecord(rec) {}
+
+    ~RecordBX() override {}
+    int bx() const { return ((theData >> BX_SHIFT) & BX_MASK); }
+    std::string print() const;
+    static bool matchType(const DataRecord& record);
+  };
+}  // namespace rpcrawtodigi
 #endif
diff --git a/DataFormats/RPCDigi/interface/RecordCD.h b/DataFormats/RPCDigi/interface/RecordCD.h
index 206e25184e1d2..c0c141edf815e 100644
--- a/DataFormats/RPCDigi/interface/RecordCD.h
+++ b/DataFormats/RPCDigi/interface/RecordCD.h
@@ -4,62 +4,59 @@
 #include "DataFormats/RPCDigi/interface/DataRecord.h"
 #include <vector>
 
-namespace rpcrawtodigi{
-class RecordCD : public DataRecord {
+namespace rpcrawtodigi {
+  class RecordCD : public DataRecord {
+  private:
+    static const int CD_TYPE_LESSTHENFLAG = 0x3;
+    static const int CD_TYPE_SHIFT = 14;
 
-private:
-  static const int CD_TYPE_LESSTHENFLAG = 0x3;
-  static const int CD_TYPE_SHIFT= 14;
+    static const int PARTITION_DATA_MASK = 0XFF;
+    static const int PARTITION_DATA_SHIFT = 0;
 
-  static const int PARTITION_DATA_MASK  = 0XFF;
-  static const int PARTITION_DATA_SHIFT =0;
+    static const int PARTITION_NUMBER_MASK = 0XF;
+    static const int PARTITION_NUMBER_SHIFT = 10;
 
-  static const int PARTITION_NUMBER_MASK = 0XF;
-  static const int PARTITION_NUMBER_SHIFT =10;
+    static const int HALFP_MASK = 0X1;
+    static const int HALFP_SHIFT = 8;
 
-  static const int HALFP_MASK = 0X1;
-  static const int HALFP_SHIFT =8;
+    static const int EOD_MASK = 0X1;
+    static const int EOD_SHIFT = 9;
 
-  static const int EOD_MASK = 0X1;
-  static const int EOD_SHIFT =9;
+    static const int CHAMBER_MASK = 0X3;
+    static const int CHAMBER_SHIFT = 14;
 
-  static const int CHAMBER_MASK = 0X3;
-  static const int CHAMBER_SHIFT =14;
+    static const int BITS_PER_PARTITION = 8;
 
-  static const int BITS_PER_PARTITION=8; 
+  public:
+    // empty record
+    RecordCD() : DataRecord() {}
 
-public:
+    // set with Data
+    RecordCD(int chamber, int partitionNumber, int eod, int halfP, const std::vector<int>& packedStrips);
 
-  // empty record 
-  RecordCD() : DataRecord() { }
+    // set LB from raw
+    RecordCD(const Data& lbData) : DataRecord(lbData) {}
 
-  // set with Data
-  RecordCD(int chamber, int partitionNumber, int eod, int halfP, 
-      const std::vector<int> & packedStrips);
+    // specialize given recort to this type
+    RecordCD(const DataRecord& rec) : DataRecord(rec) {}
 
-  // set LB from raw
-  RecordCD(const Data & lbData) : DataRecord(lbData) {} 
+    ~RecordCD() override {}
 
-  // specialize given recort to this type
-  RecordCD(const DataRecord & rec) : DataRecord(rec) {}
+    static bool matchType(const DataRecord& record) {
+      return ((record.data() >> CD_TYPE_SHIFT) < CD_TYPE_LESSTHENFLAG);
+    }
 
-  ~RecordCD() override {}
+    // more precisly - link board in link number
+    int lbInLink() const;
 
-  static bool matchType(const DataRecord & record) {
-    return ( (record.data() >> CD_TYPE_SHIFT) < CD_TYPE_LESSTHENFLAG);
-  }
+    int partitionNumber() const;
+    int eod() const;
+    int halfP() const;
 
-  // more precisly - link board in link number
-  int lbInLink() const;
+    std::vector<int> packedStrips() const;
+    int partitionData() const;
 
-  int partitionNumber() const;
-  int eod() const;
-  int halfP() const;
-
-  std::vector<int> packedStrips() const;
-  int partitionData() const;
-
-  std::string print()  const;
-};
-}
+    std::string print() const;
+  };
+}  // namespace rpcrawtodigi
 #endif
diff --git a/DataFormats/RPCDigi/interface/RecordSLD.h b/DataFormats/RPCDigi/interface/RecordSLD.h
index 66ce852fc76cd..05348cf5d64b7 100644
--- a/DataFormats/RPCDigi/interface/RecordSLD.h
+++ b/DataFormats/RPCDigi/interface/RecordSLD.h
@@ -3,45 +3,38 @@
 
 #include "DataFormats/RPCDigi/interface/DataRecord.h"
 
-namespace rpcrawtodigi{
-class RecordSLD : public DataRecord {
-
-private:
-  static const int SLD_TYPE_FLAG = 0x1F; 
-  static const int SLD_TYPE_SHIFT = 11;
-  static const int TB_LINK_INPUT_NUMBER_MASK  = 0x1F;
-  static const int TB_LINK_INPUT_NUMBER_SHIFT =0;
-  static const int TB_RMB_MASK = 0X3F;
-  static const int TB_RMB_SHIFT =5;
-
-public:
-
-  // empty record 
-  RecordSLD() : DataRecord() { }
-
-  // set TB
-  RecordSLD(int tbLinkInputNumber, int rmb) : DataRecord(0) {
-    theData = SLD_TYPE_FLAG << SLD_TYPE_SHIFT;
-    theData |= (tbLinkInputNumber << TB_LINK_INPUT_NUMBER_SHIFT);
-    theData |= (rmb << TB_RMB_SHIFT);
-  } 
-
-  // specialize given recort to this type
-  RecordSLD(const DataRecord & rec) : DataRecord(rec) {}
-
-  ~RecordSLD() override {}
-
-  int tbLinkInputNumber() const {
-     return (theData >> TB_LINK_INPUT_NUMBER_SHIFT)& TB_LINK_INPUT_NUMBER_MASK;
-  }
-
-  int rmb() const { return (theData >> TB_RMB_SHIFT) & TB_RMB_MASK; }
-
-  static bool matchType(const DataRecord & record) {
-    return (SLD_TYPE_FLAG == (record.data() >> SLD_TYPE_SHIFT));
-  }
-  std::string print()  const;
-
-};
-}
+namespace rpcrawtodigi {
+  class RecordSLD : public DataRecord {
+  private:
+    static const int SLD_TYPE_FLAG = 0x1F;
+    static const int SLD_TYPE_SHIFT = 11;
+    static const int TB_LINK_INPUT_NUMBER_MASK = 0x1F;
+    static const int TB_LINK_INPUT_NUMBER_SHIFT = 0;
+    static const int TB_RMB_MASK = 0X3F;
+    static const int TB_RMB_SHIFT = 5;
+
+  public:
+    // empty record
+    RecordSLD() : DataRecord() {}
+
+    // set TB
+    RecordSLD(int tbLinkInputNumber, int rmb) : DataRecord(0) {
+      theData = SLD_TYPE_FLAG << SLD_TYPE_SHIFT;
+      theData |= (tbLinkInputNumber << TB_LINK_INPUT_NUMBER_SHIFT);
+      theData |= (rmb << TB_RMB_SHIFT);
+    }
+
+    // specialize given recort to this type
+    RecordSLD(const DataRecord& rec) : DataRecord(rec) {}
+
+    ~RecordSLD() override {}
+
+    int tbLinkInputNumber() const { return (theData >> TB_LINK_INPUT_NUMBER_SHIFT) & TB_LINK_INPUT_NUMBER_MASK; }
+
+    int rmb() const { return (theData >> TB_RMB_SHIFT) & TB_RMB_MASK; }
+
+    static bool matchType(const DataRecord& record) { return (SLD_TYPE_FLAG == (record.data() >> SLD_TYPE_SHIFT)); }
+    std::string print() const;
+  };
+}  // namespace rpcrawtodigi
 #endif
diff --git a/DataFormats/RPCDigi/src/DataRecord.cc b/DataFormats/RPCDigi/src/DataRecord.cc
index 475d6361fc0f0..9192d9ca136c0 100644
--- a/DataFormats/RPCDigi/src/DataRecord.cc
+++ b/DataFormats/RPCDigi/src/DataRecord.cc
@@ -10,51 +10,91 @@
 
 using namespace rpcrawtodigi;
 
-rpcrawtodigi::DataRecord::DataRecordType  rpcrawtodigi::DataRecord::type() const
-{
+rpcrawtodigi::DataRecord::DataRecordType rpcrawtodigi::DataRecord::type() const {
   DataRecordType wordType = UndefinedType;
-  if (RecordBX::matchType(*this)) wordType = StartOfBXData;
-  if (RecordSLD::matchType(*this)) wordType = StartOfTbLinkInputNumberData;
-  if (RecordCD::matchType(*this)) wordType = ChamberData;
-  if (EmptyWord::matchType(*this)) wordType = Empty;
-  if (ErrorRCDM::matchType(*this)) wordType = RCDM;
-  if (ErrorSDDM::matchType(*this)) wordType = SDDM;
-  if (ErrorRDDM::matchType(*this)) wordType = RDDM;
-  if (ErrorRDM::matchType(*this))  wordType = RDM;
+  if (RecordBX::matchType(*this))
+    wordType = StartOfBXData;
+  if (RecordSLD::matchType(*this))
+    wordType = StartOfTbLinkInputNumberData;
+  if (RecordCD::matchType(*this))
+    wordType = ChamberData;
+  if (EmptyWord::matchType(*this))
+    wordType = Empty;
+  if (ErrorRCDM::matchType(*this))
+    wordType = RCDM;
+  if (ErrorSDDM::matchType(*this))
+    wordType = SDDM;
+  if (ErrorRDDM::matchType(*this))
+    wordType = RDDM;
+  if (ErrorRDM::matchType(*this))
+    wordType = RDM;
 
   return wordType;
 }
 
-std::string rpcrawtodigi::DataRecord::print(const rpcrawtodigi::DataRecord & record) 
-{
+std::string rpcrawtodigi::DataRecord::print(const rpcrawtodigi::DataRecord& record) {
   std::ostringstream str;
-  
-  if (RecordBX::matchType(record)) return RecordBX(record).print();
-  if (RecordSLD::matchType(record)) return RecordSLD(record).print();
-  if (RecordCD::matchType(record)) return RecordCD(record).print();
-  if (EmptyWord::matchType(record)) return EmptyWord().print();
-  if (ErrorRCDM::matchType(record)) return ErrorRCDM(record).print();
-  if (ErrorSDDM::matchType(record)) return ErrorSDDM(record).print();
-  if (ErrorRDDM::matchType(record)) return ErrorRDDM(record).print();
-  if (ErrorRDM::matchType(record))  return ErrorRDM(record).print();
+
+  if (RecordBX::matchType(record))
+    return RecordBX(record).print();
+  if (RecordSLD::matchType(record))
+    return RecordSLD(record).print();
+  if (RecordCD::matchType(record))
+    return RecordCD(record).print();
+  if (EmptyWord::matchType(record))
+    return EmptyWord().print();
+  if (ErrorRCDM::matchType(record))
+    return ErrorRCDM(record).print();
+  if (ErrorSDDM::matchType(record))
+    return ErrorSDDM(record).print();
+  if (ErrorRDDM::matchType(record))
+    return ErrorRDDM(record).print();
+  if (ErrorRDM::matchType(record))
+    return ErrorRDM(record).print();
 
   return str.str();
 }
 
-std::string rpcrawtodigi::DataRecord::name(const rpcrawtodigi::DataRecord::DataRecordType& code)
-{
+std::string rpcrawtodigi::DataRecord::name(const rpcrawtodigi::DataRecord::DataRecordType& code) {
   std::string result;
   switch (code) {
-    case (None)                         : { result = "None"; break; }
-    case (StartOfBXData)                : { result = "StartOfBXData"; break; }
-    case (StartOfTbLinkInputNumberData) : { result = "StartOfTBLnkData"; break; }
-    case (ChamberData)                  : { result = "ChamberData"; break; }
-    case (Empty)                        : { result = "Empty"; break; }
-    case (RDDM)                         : { result = "RDDM"; break; }
-    case (SDDM)                         : { result = "SDDM"; break; }
-    case (RCDM)                         : { result = "RCDM"; break; }
-    case (RDM)                          : { result = "RDM"; break; }
-    default                             : { result = "UndefinedType"; } 
+    case (None): {
+      result = "None";
+      break;
+    }
+    case (StartOfBXData): {
+      result = "StartOfBXData";
+      break;
+    }
+    case (StartOfTbLinkInputNumberData): {
+      result = "StartOfTBLnkData";
+      break;
+    }
+    case (ChamberData): {
+      result = "ChamberData";
+      break;
+    }
+    case (Empty): {
+      result = "Empty";
+      break;
+    }
+    case (RDDM): {
+      result = "RDDM";
+      break;
+    }
+    case (SDDM): {
+      result = "SDDM";
+      break;
+    }
+    case (RCDM): {
+      result = "RCDM";
+      break;
+    }
+    case (RDM): {
+      result = "RDM";
+      break;
+    }
+    default: { result = "UndefinedType"; }
   }
   return result;
 }
diff --git a/DataFormats/RPCDigi/src/ErrorRCDM.cc b/DataFormats/RPCDigi/src/ErrorRCDM.cc
index 9344a64488d52..e9ab317e66f03 100644
--- a/DataFormats/RPCDigi/src/ErrorRCDM.cc
+++ b/DataFormats/RPCDigi/src/ErrorRCDM.cc
@@ -2,27 +2,16 @@
 
 using namespace rpcrawtodigi;
 
-bool ErrorRCDM::matchType(const DataRecord & record)
-{
-  return ( RCDM_TYPE_FLAG == static_cast<unsigned int>(record.data() >> RCDM_TYPE_SHIFT) ); 
+bool ErrorRCDM::matchType(const DataRecord& record) {
+  return (RCDM_TYPE_FLAG == static_cast<unsigned int>(record.data() >> RCDM_TYPE_SHIFT));
 }
 
-unsigned int ErrorRCDM::rmb() const
-{
-  return ((theData >> RMB_SHIFT) & RMB_MASK);
-}
-
-unsigned int ErrorRCDM::link() const
-{
-  return (theData & LNK_MASK);
-}
+unsigned int ErrorRCDM::rmb() const { return ((theData >> RMB_SHIFT) & RMB_MASK); }
 
+unsigned int ErrorRCDM::link() const { return (theData & LNK_MASK); }
 
-std::string ErrorRCDM::print() const
-{
+std::string ErrorRCDM::print() const {
   std::ostringstream str;
-  str <<" RCDM,  rmb: "<< rmb() <<" lnk: "<<link();
+  str << " RCDM,  rmb: " << rmb() << " lnk: " << link();
   return str.str();
-} 
-
-
+}
diff --git a/DataFormats/RPCDigi/src/ErrorRDDM.cc b/DataFormats/RPCDigi/src/ErrorRDDM.cc
index ae0a35a4b5022..ae10cb795f5fd 100644
--- a/DataFormats/RPCDigi/src/ErrorRDDM.cc
+++ b/DataFormats/RPCDigi/src/ErrorRDDM.cc
@@ -2,27 +2,16 @@
 
 using namespace rpcrawtodigi;
 
-bool ErrorRDDM::matchType(const DataRecord & record)
-{
-  return ( RDDM_TYPE_FLAG == static_cast<unsigned int>(record.data() >> RDDM_TYPE_SHIFT) ); 
+bool ErrorRDDM::matchType(const DataRecord& record) {
+  return (RDDM_TYPE_FLAG == static_cast<unsigned int>(record.data() >> RDDM_TYPE_SHIFT));
 }
 
-unsigned int ErrorRDDM::rmb() const
-{
-  return ((theData >> RMB_SHIFT) & RMB_MASK);
-}
-
-unsigned int ErrorRDDM::link() const
-{
-  return (theData & LNK_MASK);
-}
+unsigned int ErrorRDDM::rmb() const { return ((theData >> RMB_SHIFT) & RMB_MASK); }
 
+unsigned int ErrorRDDM::link() const { return (theData & LNK_MASK); }
 
-std::string ErrorRDDM::print() const
-{
+std::string ErrorRDDM::print() const {
   std::ostringstream str;
-  str <<" RDDM, rmb: "<< rmb() <<" lnk: "<<link();
+  str << " RDDM, rmb: " << rmb() << " lnk: " << link();
   return str.str();
-} 
-
-
+}
diff --git a/DataFormats/RPCDigi/src/ErrorRDM.cc b/DataFormats/RPCDigi/src/ErrorRDM.cc
index c7a94c1fc32a8..feaa35edcf2d7 100644
--- a/DataFormats/RPCDigi/src/ErrorRDM.cc
+++ b/DataFormats/RPCDigi/src/ErrorRDM.cc
@@ -2,21 +2,14 @@
 
 using namespace rpcrawtodigi;
 
-bool ErrorRDM::matchType(const DataRecord & record)
-{
-  return ( RDM_TYPE_FLAG == static_cast<unsigned int>(record.data() >> RDM_TYPE_SHIFT) ); 
+bool ErrorRDM::matchType(const DataRecord& record) {
+  return (RDM_TYPE_FLAG == static_cast<unsigned int>(record.data() >> RDM_TYPE_SHIFT));
 }
 
-unsigned int ErrorRDM::rmb() const
-{
-  return (theData & RMB_MASK);
-}
+unsigned int ErrorRDM::rmb() const { return (theData & RMB_MASK); }
 
-std::string ErrorRDM::print() const
-{
+std::string ErrorRDM::print() const {
   std::ostringstream str;
-  str <<" RDM,  rmb: "<< rmb();
+  str << " RDM,  rmb: " << rmb();
   return str.str();
-} 
-
-
+}
diff --git a/DataFormats/RPCDigi/src/RPCAMCLinkCounters.cc b/DataFormats/RPCDigi/src/RPCAMCLinkCounters.cc
index 412e58394a493..d33f30d7bfda4 100644
--- a/DataFormats/RPCDigi/src/RPCAMCLinkCounters.cc
+++ b/DataFormats/RPCDigi/src/RPCAMCLinkCounters.cc
@@ -1,4 +1,3 @@
 #include "DataFormats/RPCDigi/interface/RPCAMCLinkCounters.h"
 
-RPCAMCLinkCounters::RPCAMCLinkCounters()
-{}
+RPCAMCLinkCounters::RPCAMCLinkCounters() {}
diff --git a/DataFormats/RPCDigi/src/RPCDigi.cc b/DataFormats/RPCDigi/src/RPCDigi.cc
index d3e19ec829e4c..ad546042214ef 100644
--- a/DataFormats/RPCDigi/src/RPCDigi.cc
+++ b/DataFormats/RPCDigi/src/RPCDigi.cc
@@ -9,60 +9,50 @@
  *
  */
 
-
 #include "DataFormats/RPCDigi/interface/RPCDigi.h"
 #include <iostream>
 
-RPCDigi::RPCDigi (int strip, int bx) :
-  strip_(strip),
-  bx_(bx),
-  time_(0),
-  coordinateX_(0),
-  coordinateY_(0),
-  deltaTime_(0),
-  deltaX_(0),
-  deltaY_(0),
-  hasTime_(false),
-  hasX_(false),
-  hasY_(false)
-{}
-
-RPCDigi::RPCDigi ():
-  strip_(0),
-  bx_(0),
-  time_(0),
-  coordinateX_(0),
-  coordinateY_(0),
-  deltaTime_(0),
-  deltaX_(0),
-  deltaY_(0),
-  hasTime_(false),
-  hasX_(false),
-  hasY_(false)
-{}
-
+RPCDigi::RPCDigi(int strip, int bx)
+    : strip_(strip),
+      bx_(bx),
+      time_(0),
+      coordinateX_(0),
+      coordinateY_(0),
+      deltaTime_(0),
+      deltaX_(0),
+      deltaY_(0),
+      hasTime_(false),
+      hasX_(false),
+      hasY_(false) {}
+
+RPCDigi::RPCDigi()
+    : strip_(0),
+      bx_(0),
+      time_(0),
+      coordinateX_(0),
+      coordinateY_(0),
+      deltaTime_(0),
+      deltaX_(0),
+      deltaY_(0),
+      hasTime_(false),
+      hasX_(false),
+      hasY_(false) {}
 
 // Comparison
-bool RPCDigi::operator == (const RPCDigi& digi) const {
-  if ( strip_ != digi.strip() ||
-       bx_    != digi.bx() ) return false;
+bool RPCDigi::operator==(const RPCDigi& digi) const {
+  if (strip_ != digi.strip() || bx_ != digi.bx())
+    return false;
   return true;
 }
 
 ///Precedence operator
-bool RPCDigi::operator<(const RPCDigi& digi) const{
-  if(digi.bx() == this->bx())
-    return digi.strip()<this->strip();
-  else 
-    return digi.bx()<this->bx();
+bool RPCDigi::operator<(const RPCDigi& digi) const {
+  if (digi.bx() == this->bx())
+    return digi.strip() < this->strip();
+  else
+    return digi.bx() < this->bx();
 }
 
-std::ostream & operator<<(std::ostream & o, const RPCDigi& digi) {
-  return o << " " << digi.strip()
-           << " " << digi.bx();
-}
+std::ostream& operator<<(std::ostream& o, const RPCDigi& digi) { return o << " " << digi.strip() << " " << digi.bx(); }
 
-void RPCDigi::print() const {
-  std::cout << "Strip " << strip() 
-	    << " bx " << bx() <<std::endl;
-}
+void RPCDigi::print() const { std::cout << "Strip " << strip() << " bx " << bx() << std::endl; }
diff --git a/DataFormats/RPCDigi/src/RPCDigiL1Link.cc b/DataFormats/RPCDigi/src/RPCDigiL1Link.cc
index 3f7ec333aac71..133fcc928a2a3 100644
--- a/DataFormats/RPCDigi/src/RPCDigiL1Link.cc
+++ b/DataFormats/RPCDigi/src/RPCDigiL1Link.cc
@@ -1,86 +1,56 @@
 #include "DataFormats/RPCDigi/interface/RPCDigiL1Link.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-RPCDigiL1Link::RPCDigiL1Link()
-{
-  for (unsigned int i=0;i<7;i++){
-    std::pair<unsigned int, int > c(0,0);
+RPCDigiL1Link::RPCDigiL1Link() {
+  for (unsigned int i = 0; i < 7; i++) {
+    std::pair<unsigned int, int> c(0, 0);
     _link.push_back(c);
   }
 }
 
-    
-RPCDigiL1Link::~RPCDigiL1Link()
-{}
+RPCDigiL1Link::~RPCDigiL1Link() {}
 
-
-bool 
-RPCDigiL1Link::empty() const
-{
-  bool e=true;
-  for (unsigned int l=1;l<=6;l++){
-    if (!this->empty(l)) e=false;
-  } 
+bool RPCDigiL1Link::empty() const {
+  bool e = true;
+  for (unsigned int l = 1; l <= 6; l++) {
+    if (!this->empty(l))
+      e = false;
+  }
   return e;
 }
 
-
-bool 
-RPCDigiL1Link::empty(unsigned int layer) const
-{
+bool RPCDigiL1Link::empty(unsigned int layer) const {
   this->checklayer(layer);
-  return this->rawdetId(layer)==0;
+  return this->rawdetId(layer) == 0;
 }
 
-
-unsigned int 
-RPCDigiL1Link::rawdetId(unsigned int layer) const
-{
+unsigned int RPCDigiL1Link::rawdetId(unsigned int layer) const {
   this->checklayer(layer);
-  return _link[layer-1].first;
+  return _link[layer - 1].first;
 }
- 
 
-int 
-RPCDigiL1Link::strip(unsigned int layer) const
-{
+int RPCDigiL1Link::strip(unsigned int layer) const {
   this->checklayer(layer);
-  return abs(_link[layer-1].second)%1000;
+  return abs(_link[layer - 1].second) % 1000;
 }
 
-int 
-RPCDigiL1Link::bx(unsigned int layer) const
-{
+int RPCDigiL1Link::bx(unsigned int layer) const {
   this->checklayer(layer);
-  return _link[layer-1].second/1000;
-}
-
-unsigned int
-RPCDigiL1Link::nlayer() const
-{
-  return _link.size()-1;
+  return _link[layer - 1].second / 1000;
 }
 
+unsigned int RPCDigiL1Link::nlayer() const { return _link.size() - 1; }
 
-void 
-RPCDigiL1Link::setLink(unsigned int layer, 
-		       unsigned int rpcdetId, 
-		       int strip, int bx)
-{
+void RPCDigiL1Link::setLink(unsigned int layer, unsigned int rpcdetId, int strip, int bx) {
   this->checklayer(layer);
-  int pdigi=abs(bx)*1000+strip;
-  if (bx<0)
-    pdigi*=-1;
-  std::pair<unsigned int, int> digi(rpcdetId,pdigi);
-  _link[layer-1]=digi;
-
+  int pdigi = abs(bx) * 1000 + strip;
+  if (bx < 0)
+    pdigi *= -1;
+  std::pair<unsigned int, int> digi(rpcdetId, pdigi);
+  _link[layer - 1] = digi;
 }
 
-
-void 
-RPCDigiL1Link::checklayer(unsigned int layer)const {
-  if (layer == 0 || layer > 6) 
-    throw cms::Exception("RPCException")
-      <<"RPCDigiL1Link: layer must be in the range from 1 to 6"
-<<std::endl; 
+void RPCDigiL1Link::checklayer(unsigned int layer) const {
+  if (layer == 0 || layer > 6)
+    throw cms::Exception("RPCException") << "RPCDigiL1Link: layer must be in the range from 1 to 6" << std::endl;
 }
diff --git a/DataFormats/RPCDigi/src/RPCRawDataCounts.cc b/DataFormats/RPCDigi/src/RPCRawDataCounts.cc
index 0ae1557bbc975..40d3d043a1d8b 100644
--- a/DataFormats/RPCDigi/src/RPCRawDataCounts.cc
+++ b/DataFormats/RPCDigi/src/RPCRawDataCounts.cc
@@ -14,84 +14,88 @@
 using namespace rpcrawtodigi;
 using namespace std;
 
-typedef std::map< std::pair<int,int>, int >::const_iterator IT;
+typedef std::map<std::pair<int, int>, int>::const_iterator IT;
 
-int RPCRawDataCounts::fedBxRecords(int fedId) const
-{
-  int type= DataRecord::StartOfBXData;
-  IT im = theRecordTypes.find(make_pair(fedId,type));
-  return (im==theRecordTypes.end())? 0 : im->second;
+int RPCRawDataCounts::fedBxRecords(int fedId) const {
+  int type = DataRecord::StartOfBXData;
+  IT im = theRecordTypes.find(make_pair(fedId, type));
+  return (im == theRecordTypes.end()) ? 0 : im->second;
 }
 
-int  RPCRawDataCounts::fedFormatErrors(int fedId) const
-{
-  for (IT im=theReadoutErrors.begin(); im != theReadoutErrors.end(); ++im) {
-    if (im->first.first != fedId) continue;
-    if (im->first.second > ReadoutError::NoProblem && im->first.second <= ReadoutError::InconsistentDataSize) return 1; 
+int RPCRawDataCounts::fedFormatErrors(int fedId) const {
+  for (IT im = theReadoutErrors.begin(); im != theReadoutErrors.end(); ++im) {
+    if (im->first.first != fedId)
+      continue;
+    if (im->first.second > ReadoutError::NoProblem && im->first.second <= ReadoutError::InconsistentDataSize)
+      return 1;
   }
   return 0;
 }
 
-int  RPCRawDataCounts::fedErrorRecords(int fedId) const
-{
-  for (IT im=theRecordTypes.begin(); im != theRecordTypes.end(); ++im) {
-    if (im->first.first != fedId) continue;
-    if (im->first.second > DataRecord::Empty) return 1; 
+int RPCRawDataCounts::fedErrorRecords(int fedId) const {
+  for (IT im = theRecordTypes.begin(); im != theRecordTypes.end(); ++im) {
+    if (im->first.first != fedId)
+      continue;
+    if (im->first.second > DataRecord::Empty)
+      return 1;
   }
   return 0;
 }
 
-void RPCRawDataCounts::addDccRecord(int fed, const rpcrawtodigi::DataRecord & record, int weight)
-{
+void RPCRawDataCounts::addDccRecord(int fed, const rpcrawtodigi::DataRecord& record, int weight) {
   DataRecord::DataRecordType type = record.type();
   switch (type) {
-    case (DataRecord::StartOfTbLinkInputNumberData) : { theGoodEvents[make_pair(fed, RecordSLD(record).rmb())] += weight; break; }
-    case (DataRecord::RDDM)                         : { theBadEvents[make_pair(fed,ErrorRDDM(record).rmb())]   += weight; break;}
-    case (DataRecord::RDM)                          : { theBadEvents[make_pair(fed,ErrorRDM(record).rmb())]    += weight; break;}
-    case (DataRecord::RCDM)                         : { theBadEvents[make_pair(fed,ErrorRCDM(record).rmb())]   += weight; break;}
-    default : {}
+    case (DataRecord::StartOfTbLinkInputNumberData): {
+      theGoodEvents[make_pair(fed, RecordSLD(record).rmb())] += weight;
+      break;
+    }
+    case (DataRecord::RDDM): {
+      theBadEvents[make_pair(fed, ErrorRDDM(record).rmb())] += weight;
+      break;
+    }
+    case (DataRecord::RDM): {
+      theBadEvents[make_pair(fed, ErrorRDM(record).rmb())] += weight;
+      break;
+    }
+    case (DataRecord::RCDM): {
+      theBadEvents[make_pair(fed, ErrorRCDM(record).rmb())] += weight;
+      break;
+    }
+    default: {}
   }
-  
-  theRecordTypes[ make_pair(fed,type) ] += weight;
-}
-
-
-
 
-
-void RPCRawDataCounts::addReadoutError(int fed, const rpcrawtodigi::ReadoutError & e, int weight)
-{
-  theReadoutErrors[ make_pair(fed,e.rawCode()) ] +=  weight;
+  theRecordTypes[make_pair(fed, type)] += weight;
 }
 
-void RPCRawDataCounts::operator+= (const RPCRawDataCounts & o)
-{
+void RPCRawDataCounts::addReadoutError(int fed, const rpcrawtodigi::ReadoutError& e, int weight) {
+  theReadoutErrors[make_pair(fed, e.rawCode())] += weight;
+}
 
-  for (IT irt= o.theRecordTypes.begin(); irt != o.theRecordTypes.end(); ++irt) {
-    theRecordTypes[ make_pair(irt->first.first,irt->first.second) ] += irt->second;
+void RPCRawDataCounts::operator+=(const RPCRawDataCounts& o) {
+  for (IT irt = o.theRecordTypes.begin(); irt != o.theRecordTypes.end(); ++irt) {
+    theRecordTypes[make_pair(irt->first.first, irt->first.second)] += irt->second;
   }
 
-  for (IT ire=o.theReadoutErrors.begin(); ire != o.theReadoutErrors.end();++ire) {
-    theReadoutErrors[ make_pair(ire->first.first,ire->first.second) ] += ire->second;
+  for (IT ire = o.theReadoutErrors.begin(); ire != o.theReadoutErrors.end(); ++ire) {
+    theReadoutErrors[make_pair(ire->first.first, ire->first.second)] += ire->second;
   }
 
-  for (IT ire=o.theGoodEvents.begin(); ire != o.theGoodEvents.end();++ire) {
-    theGoodEvents[ make_pair(ire->first.first,ire->first.second) ] += ire->second;
+  for (IT ire = o.theGoodEvents.begin(); ire != o.theGoodEvents.end(); ++ire) {
+    theGoodEvents[make_pair(ire->first.first, ire->first.second)] += ire->second;
   }
 
-  for (IT ire=o.theBadEvents.begin(); ire != o.theBadEvents.end();++ire) {
-    theBadEvents[ make_pair(ire->first.first,ire->first.second) ] += ire->second;
+  for (IT ire = o.theBadEvents.begin(); ire != o.theBadEvents.end(); ++ire) {
+    theBadEvents[make_pair(ire->first.first, ire->first.second)] += ire->second;
   }
 }
 
-std::string RPCRawDataCounts::print() const 
-{
+std::string RPCRawDataCounts::print() const {
   std::ostringstream str;
-  for (IT irt=theRecordTypes.begin(); irt != theRecordTypes.end(); ++irt) {
-    str << "RECORD ("<<irt->first.first<<","<<irt->first.second<<")"<<irt->second;
+  for (IT irt = theRecordTypes.begin(); irt != theRecordTypes.end(); ++irt) {
+    str << "RECORD (" << irt->first.first << "," << irt->first.second << ")" << irt->second;
+  }
+  for (IT ire = theReadoutErrors.begin(); ire != theReadoutErrors.end(); ++ire) {
+    str << "ERROR(" << ire->first.first << "," << ire->first.second << ")=" << ire->second << endl;
   }
-  for (IT ire=theReadoutErrors.begin(); ire != theReadoutErrors.end();++ire) {
-    str <<"ERROR("<<ire->first.first<<","<<ire->first.second<<")="<<ire->second<<endl;
-  } 
   return str.str();
 }
diff --git a/DataFormats/RPCDigi/src/ReadoutError.cc b/DataFormats/RPCDigi/src/ReadoutError.cc
index fc1148ea649d9..d9e3aa212901f 100644
--- a/DataFormats/RPCDigi/src/ReadoutError.cc
+++ b/DataFormats/RPCDigi/src/ReadoutError.cc
@@ -4,45 +4,68 @@
 
 using namespace rpcrawtodigi;
 
-ReadoutError::ReadoutError(const LinkBoardElectronicIndex &path, const ReadoutErrorType & type) {
-
-  unsigned int where = (path.dccId<< 13) | (path.dccInputChannelNum << 7) | (path.tbLinkInputNum << 2) | path.lbNumInLink;
-  unsigned int what  = type;
-  theError =  (where<<4) | (what & 0xf);
+ReadoutError::ReadoutError(const LinkBoardElectronicIndex &path, const ReadoutErrorType &type) {
+  unsigned int where =
+      (path.dccId << 13) | (path.dccInputChannelNum << 7) | (path.tbLinkInputNum << 2) | path.lbNumInLink;
+  unsigned int what = type;
+  theError = (where << 4) | (what & 0xf);
 }
 
-ReadoutError::ReadoutErrorType ReadoutError::type() const
-{
-//return static_cast<ReadoutErrorType>(theError&0xf);
+ReadoutError::ReadoutErrorType ReadoutError::type() const {
+  //return static_cast<ReadoutErrorType>(theError&0xf);
   return ReadoutErrorType(theError & 0xf);
 }
 
-LinkBoardElectronicIndex ReadoutError::where() const
-{
-  unsigned int data= (theError>>4);
+LinkBoardElectronicIndex ReadoutError::where() const {
+  unsigned int data = (theError >> 4);
   LinkBoardElectronicIndex ele;
   ele.dccId = (data >> 13);
-  ele.dccInputChannelNum= (data >> 7) & 63;
+  ele.dccInputChannelNum = (data >> 7) & 63;
   ele.tbLinkInputNum = (data >> 2) & 31;
   ele.lbNumInLink = data & 3;
   return ele;
 }
 
-std::string ReadoutError::name(const ReadoutErrorType & code) 
-{
+std::string ReadoutError::name(const ReadoutErrorType &code) {
   std::string result;
   switch (code) {
-    case (HeaderCheckFail)      : { result = "HeaderCheckFail"; break; }
-    case (InconsitentFedId)     : { result = "InconsitentFedId"; break; }
-    case (TrailerCheckFail)     : { result = "TrailerCheckFail"; break; }
-    case (InconsistentDataSize) : { result = "InconsistentDataSize"; break; }
-    case (InvalidLB)            : { result = "InvalidLB"; break; }
-    case (EmptyPackedStrips)    : { result = "EmptyPackedStrips"; break; }
-    case (InvalidDetId)         : { result = "InvalidDetId"; break; }
-    case (InvalidStrip)         : { result = "InvalidStrip"; break; }
-    case (EOD)                  : { result = "EOD"; break; }
-    default                     : { result = "NoProblem"; }
+    case (HeaderCheckFail): {
+      result = "HeaderCheckFail";
+      break;
+    }
+    case (InconsitentFedId): {
+      result = "InconsitentFedId";
+      break;
+    }
+    case (TrailerCheckFail): {
+      result = "TrailerCheckFail";
+      break;
+    }
+    case (InconsistentDataSize): {
+      result = "InconsistentDataSize";
+      break;
+    }
+    case (InvalidLB): {
+      result = "InvalidLB";
+      break;
+    }
+    case (EmptyPackedStrips): {
+      result = "EmptyPackedStrips";
+      break;
+    }
+    case (InvalidDetId): {
+      result = "InvalidDetId";
+      break;
+    }
+    case (InvalidStrip): {
+      result = "InvalidStrip";
+      break;
+    }
+    case (EOD): {
+      result = "EOD";
+      break;
+    }
+    default: { result = "NoProblem"; }
   }
   return result;
 }
-
diff --git a/DataFormats/RPCDigi/src/RecordBX.cc b/DataFormats/RPCDigi/src/RecordBX.cc
index e6594fed788b8..37d983e64800c 100644
--- a/DataFormats/RPCDigi/src/RecordBX.cc
+++ b/DataFormats/RPCDigi/src/RecordBX.cc
@@ -1,15 +1,10 @@
 #include "DataFormats/RPCDigi/interface/RecordBX.h"
 using namespace rpcrawtodigi;
 
-bool RecordBX::matchType(const DataRecord & record)
-{
-  return ( BX_TYPE_FLAG == (record.data() >> BX_TYPE_SHIFT) );
-}
-
+bool RecordBX::matchType(const DataRecord& record) { return (BX_TYPE_FLAG == (record.data() >> BX_TYPE_SHIFT)); }
 
-std::string RecordBX::print() const 
-{
-  std::ostringstream str; 
-  str <<" BX,    bx = "<<bx(); 
-  return str.str(); 
+std::string RecordBX::print() const {
+  std::ostringstream str;
+  str << " BX,    bx = " << bx();
+  return str.str();
 }
diff --git a/DataFormats/RPCDigi/src/RecordCD.cc b/DataFormats/RPCDigi/src/RecordCD.cc
index ae2038fb86eeb..45deb3568c1af 100644
--- a/DataFormats/RPCDigi/src/RecordCD.cc
+++ b/DataFormats/RPCDigi/src/RecordCD.cc
@@ -5,66 +5,49 @@
 using namespace rpcrawtodigi;
 using namespace std;
 
-RecordCD::RecordCD(int lbInLink, int partitionNumber, int eod, int halfP, 
-  const std::vector<int> & packedStrips) : DataRecord(0)
-{
+RecordCD::RecordCD(int lbInLink, int partitionNumber, int eod, int halfP, const std::vector<int>& packedStrips)
+    : DataRecord(0) {
   theData = 0;
 
-  theData |= (lbInLink <<CHAMBER_SHIFT);
+  theData |= (lbInLink << CHAMBER_SHIFT);
 
-  theData |= (partitionNumber<<PARTITION_NUMBER_SHIFT);
+  theData |= (partitionNumber << PARTITION_NUMBER_SHIFT);
 
-  theData |= (eod<<EOD_SHIFT );
+  theData |= (eod << EOD_SHIFT);
 
-  theData |= (halfP<<HALFP_SHIFT);
+  theData |= (halfP << HALFP_SHIFT);
 
   int partitionData = 0;
-  for (vector<int>::const_iterator iv = packedStrips.begin(); iv != packedStrips.end(); iv++ ) {
-    int ibit = (partitionNumber) ? (*iv)%(partitionNumber*BITS_PER_PARTITION) : (*iv);
-    partitionData |= (1<<ibit);
+  for (vector<int>::const_iterator iv = packedStrips.begin(); iv != packedStrips.end(); iv++) {
+    int ibit = (partitionNumber) ? (*iv) % (partitionNumber * BITS_PER_PARTITION) : (*iv);
+    partitionData |= (1 << ibit);
   }
-  theData |= (partitionData<<PARTITION_DATA_SHIFT);
+  theData |= (partitionData << PARTITION_DATA_SHIFT);
 }
 
-int RecordCD::lbInLink() const
-{
-  return (theData >> CHAMBER_SHIFT ) & CHAMBER_MASK ;
-}
+int RecordCD::lbInLink() const { return (theData >> CHAMBER_SHIFT) & CHAMBER_MASK; }
 
-int RecordCD::partitionNumber() const
-{
-  return (theData >> PARTITION_NUMBER_SHIFT ) & PARTITION_NUMBER_MASK;
-}
+int RecordCD::partitionNumber() const { return (theData >> PARTITION_NUMBER_SHIFT) & PARTITION_NUMBER_MASK; }
 
-int RecordCD::eod() const
-{
-  return (theData >> EOD_SHIFT ) & EOD_MASK; 
-}
+int RecordCD::eod() const { return (theData >> EOD_SHIFT) & EOD_MASK; }
 
-int RecordCD::halfP() const
-{
-  return (theData >> HALFP_SHIFT ) & HALFP_MASK;
-}
+int RecordCD::halfP() const { return (theData >> HALFP_SHIFT) & HALFP_MASK; }
 
-int RecordCD::partitionData() const
-{
-  return (theData>>PARTITION_DATA_SHIFT)&PARTITION_DATA_MASK; 
-}
+int RecordCD::partitionData() const { return (theData >> PARTITION_DATA_SHIFT) & PARTITION_DATA_MASK; }
 
-std::vector<int> RecordCD::packedStrips() const
-{
+std::vector<int> RecordCD::packedStrips() const {
   int partitionNumber = this->partitionNumber();
   int partitionData = this->partitionData();
   std::vector<int> strips;
-  for (int ib=0; ib <8; ++ib) {
-    if ((partitionData>>ib)& 1) strips.push_back( partitionNumber* BITS_PER_PARTITION + ib); 
+  for (int ib = 0; ib < 8; ++ib) {
+    if ((partitionData >> ib) & 1)
+      strips.push_back(partitionNumber * BITS_PER_PARTITION + ib);
   }
   return strips;
 }
 
-std::string RecordCD::print() const
-{
+std::string RecordCD::print() const {
   std::ostringstream str;
-  str <<" DATA";  
+  str << " DATA";
   return str.str();
 }
diff --git a/DataFormats/RPCDigi/src/RecordSLD.cc b/DataFormats/RPCDigi/src/RecordSLD.cc
index f77117c0d6d57..d64e5a33d372d 100644
--- a/DataFormats/RPCDigi/src/RecordSLD.cc
+++ b/DataFormats/RPCDigi/src/RecordSLD.cc
@@ -1,11 +1,9 @@
 #include "DataFormats/RPCDigi/interface/RecordSLD.h"
 using namespace rpcrawtodigi;
 
-std::string RecordSLD::print() const 
-{
+std::string RecordSLD::print() const {
   std::ostringstream str;
-  str <<" SLD,   rmb = "<<rmb(); 
-  str <<" lnk = "<<tbLinkInputNumber();
-  return str.str(); 
+  str << " SLD,   rmb = " << rmb();
+  str << " lnk = " << tbLinkInputNumber();
+  return str.str();
 }
-
diff --git a/DataFormats/RPCDigi/src/classes.h b/DataFormats/RPCDigi/src/classes.h
index 020dfce9227c0..8a38045fdb89f 100644
--- a/DataFormats/RPCDigi/src/classes.h
+++ b/DataFormats/RPCDigi/src/classes.h
@@ -8,4 +8,3 @@
 #include <DataFormats/Common/interface/Wrapper.h>
 #include <vector>
 #include <map>
-
diff --git a/DataFormats/SiPixelDetId/interface/PXBDetId.h b/DataFormats/SiPixelDetId/interface/PXBDetId.h
index 2bf3a68e15ba3..e0ead4cb7d97f 100644
--- a/DataFormats/SiPixelDetId/interface/PXBDetId.h
+++ b/DataFormats/SiPixelDetId/interface/PXBDetId.h
@@ -11,48 +11,40 @@
 
 class PXBDetId;
 
-std::ostream& operator<<(std::ostream& os,const PXBDetId& id);
+std::ostream& operator<<(std::ostream& os, const PXBDetId& id);
 
 class PXBDetId : public DetId {
- public:
+public:
   /** Constructor of a null id */
   PXBDetId();
   /** Constructor from a raw value */
   PXBDetId(uint32_t rawid);
   /**Construct from generic DetId */
-  PXBDetId(const DetId& id); 
-  
-  PXBDetId(uint32_t layer,
-	   uint32_t ladder,
-	   uint32_t module) : DetId(DetId::Tracker,PixelSubdetector::PixelBarrel){
-    id_ |= (layer& layerMask_) << layerStartBit_     |
-      (ladder& ladderMask_) << ladderStartBit_  |
-      (module& moduleMask_) << moduleStartBit_;
+  PXBDetId(const DetId& id);
+
+  PXBDetId(uint32_t layer, uint32_t ladder, uint32_t module) : DetId(DetId::Tracker, PixelSubdetector::PixelBarrel) {
+    id_ |= (layer & layerMask_) << layerStartBit_ | (ladder & ladderMask_) << ladderStartBit_ |
+           (module & moduleMask_) << moduleStartBit_;
   }
-  
-  
+
   /// layer id
-  unsigned int layer() const{
-    return int((id_>>layerStartBit_) & layerMask_);}
-  
+  unsigned int layer() const { return int((id_ >> layerStartBit_) & layerMask_); }
+
   /// ladder  id
-  unsigned int ladder() const
-    { return ((id_>>ladderStartBit_) & ladderMask_) ;}
-  
+  unsigned int ladder() const { return ((id_ >> ladderStartBit_) & ladderMask_); }
+
   /// det id
-  unsigned int module() const 
-    { return ((id_>>moduleStartBit_)& moduleMask_) ;}
-  
- private:
+  unsigned int module() const { return ((id_ >> moduleStartBit_) & moduleMask_); }
+
+private:
   /// two bits would be enough, but  we could use the number "0" as a wildcard
-  static const unsigned int layerStartBit_=   16;
-  static const unsigned int ladderStartBit_=   8;
-  static const unsigned int moduleStartBit_=      2;
+  static const unsigned int layerStartBit_ = 16;
+  static const unsigned int ladderStartBit_ = 8;
+  static const unsigned int moduleStartBit_ = 2;
   /// two bits would be enough, but  we could use the number "0" as a wildcard
-  static const unsigned int layerMask_=       0xF;
-  static const unsigned int ladderMask_=      0xFF;
-  static const unsigned int moduleMask_=         0x3F;
+  static const unsigned int layerMask_ = 0xF;
+  static const unsigned int ladderMask_ = 0xFF;
+  static const unsigned int moduleMask_ = 0x3F;
 };
 
-
 #endif
diff --git a/DataFormats/SiPixelDetId/interface/PXFDetId.h b/DataFormats/SiPixelDetId/interface/PXFDetId.h
index 0840d277e4b82..5ac5e0beea1b0 100644
--- a/DataFormats/SiPixelDetId/interface/PXFDetId.h
+++ b/DataFormats/SiPixelDetId/interface/PXFDetId.h
@@ -10,66 +10,53 @@
  */
 class PXFDetId;
 
-std::ostream& operator<<(std::ostream& os,const PXFDetId& id);
+std::ostream& operator<<(std::ostream& os, const PXFDetId& id);
 
 class PXFDetId : public DetId {
- public:
+public:
   /** Constructor of a null id */
   PXFDetId();
   /** Constructor from a raw value */
   PXFDetId(uint32_t rawid);
   /**Construct from generic DetId */
-  PXFDetId(const DetId& id); 
-  
-  PXFDetId(uint32_t side,
-	   uint32_t disk,
-	   uint32_t blade,
-	   uint32_t panel,
-	   uint32_t module) : DetId(DetId::Tracker,PixelSubdetector::PixelEndcap){
-    id_ |= (side& sideMask_)  << sideStartBit_   |
-      (disk& diskMask_)        << diskStartBit_      |
-      (blade& bladeMask_)      << bladeStartBit_     |
-      (panel& panelMask_)      << panelStartBit_     |
-      (module& moduleMask_)    << moduleStartBit_  ;
+  PXFDetId(const DetId& id);
+
+  PXFDetId(uint32_t side, uint32_t disk, uint32_t blade, uint32_t panel, uint32_t module)
+      : DetId(DetId::Tracker, PixelSubdetector::PixelEndcap) {
+    id_ |= (side & sideMask_) << sideStartBit_ | (disk & diskMask_) << diskStartBit_ |
+           (blade & bladeMask_) << bladeStartBit_ | (panel & panelMask_) << panelStartBit_ |
+           (module & moduleMask_) << moduleStartBit_;
   }
-  
-  
+
   /// positive or negative id
-  unsigned int side() const{
-    return int((id_>>sideStartBit_) & sideMask_);
-  }
-  
+  unsigned int side() const { return int((id_ >> sideStartBit_) & sideMask_); }
+
   /// disk id
-  unsigned int disk() const{
-    return int((id_>>diskStartBit_) & diskMask_);
-  }
-  
+  unsigned int disk() const { return int((id_ >> diskStartBit_) & diskMask_); }
+
   /// blade id
-  unsigned int blade() const
-    { return ((id_>>bladeStartBit_) & bladeMask_) ;}
-  
- /// panel id
-  unsigned int panel() const
-    { return ((id_>>panelStartBit_) & panelMask_) ;}
+  unsigned int blade() const { return ((id_ >> bladeStartBit_) & bladeMask_); }
+
+  /// panel id
+  unsigned int panel() const { return ((id_ >> panelStartBit_) & panelMask_); }
 
   /// det id
-  unsigned int module() const
-    { return ((id_>>moduleStartBit_) & moduleMask_) ;}
-  
- private:
+  unsigned int module() const { return ((id_ >> moduleStartBit_) & moduleMask_); }
+
+private:
   /// two bits would be enough, but  we could use the number "0" as a wildcard
-  static const unsigned int sideStartBit_=   23;
-  static const unsigned int diskStartBit_=   16;
-  static const unsigned int bladeStartBit_=  10;
-  static const unsigned int panelStartBit_=  8;
-  static const unsigned int moduleStartBit_= 2;
+  static const unsigned int sideStartBit_ = 23;
+  static const unsigned int diskStartBit_ = 16;
+  static const unsigned int bladeStartBit_ = 10;
+  static const unsigned int panelStartBit_ = 8;
+  static const unsigned int moduleStartBit_ = 2;
   /// two bits would be enough, but  we could use the number "0" as a wildcard
-  
-  static const unsigned int sideMask_=     0x3;
-  static const unsigned int diskMask_=     0xF;
-  static const unsigned int bladeMask_=    0x3F;
-  static const unsigned int panelMask_=    0x3;
-  static const unsigned int moduleMask_=   0x3F;
+
+  static const unsigned int sideMask_ = 0x3;
+  static const unsigned int diskMask_ = 0xF;
+  static const unsigned int bladeMask_ = 0x3F;
+  static const unsigned int panelMask_ = 0x3;
+  static const unsigned int moduleMask_ = 0x3F;
 };
 
 #endif
diff --git a/DataFormats/SiPixelDetId/interface/PixelBarrelName.h b/DataFormats/SiPixelDetId/interface/PixelBarrelName.h
index c240713cb7247..311625365aa47 100644
--- a/DataFormats/SiPixelDetId/interface/PixelBarrelName.h
+++ b/DataFormats/SiPixelDetId/interface/PixelBarrelName.h
@@ -15,25 +15,22 @@ class TrackerTopology;
 
 class PixelBarrelName : public PixelModuleName {
 public:
-
-  enum Shell { mO = 1, mI = 2 , pO =3 , pI =4 };
+  enum Shell { mO = 1, mI = 2, pO = 3, pI = 4 };
 
   /// ctor from DetId
-  PixelBarrelName(const DetId &, const TrackerTopology* tt, bool phase=false);
+  PixelBarrelName(const DetId&, const TrackerTopology* tt, bool phase = false);
 
-  // do not use, works only for phase0 and old pixel classes 
-  PixelBarrelName(const DetId &, bool phase=false);
+  // do not use, works only for phase0 and old pixel classes
+  PixelBarrelName(const DetId&, bool phase = false);
 
   /// ctor for defined name with dummy parameters
- PixelBarrelName(Shell shell=mO, int layer=0, int module=0, int ladder=0, bool phase=false)
-   : PixelModuleName(true), 
-    thePart(shell), theLayer(layer), theModule(module), theLadder(ladder), phase1(phase) 
-  { }
+  PixelBarrelName(Shell shell = mO, int layer = 0, int module = 0, int ladder = 0, bool phase = false)
+      : PixelModuleName(true), thePart(shell), theLayer(layer), theModule(module), theLadder(ladder), phase1(phase) {}
 
   /// ctor from name string
-  PixelBarrelName(std::string name, bool phase=false);
+  PixelBarrelName(std::string name, bool phase = false);
 
-  ~PixelBarrelName() override { }
+  ~PixelBarrelName() override {}
 
   inline int convertLadderNumber(int oldLadder);
 
@@ -42,30 +39,30 @@ class PixelBarrelName : public PixelModuleName {
 
   Shell shell() const { return thePart; }
 
-  /// layer id 
-  int layerName() const { return theLayer; }   
+  /// layer id
+  int layerName() const { return theLayer; }
 
-  /// module id (index in z) 
-  int moduleName() const { return theModule; }  
+  /// module id (index in z)
+  int moduleName() const { return theModule; }
 
-  /// ladder id (index in phi) 
-  int ladderName() const { return theLadder; } 
+  /// ladder id (index in phi)
+  int ladderName() const { return theLadder; }
 
   /// sector id
   int sectorName() const;
 
   /// full or half module
   bool isHalfModule() const;
-  
+
   /// module Type
-  PixelModuleName::ModuleType  moduleType() const override;
+  PixelModuleName::ModuleType moduleType() const override;
 
   /// return the DetId
   PXBDetId getDetId();
   DetId getDetId(const TrackerTopology* tt);
 
   /// check equality of modules from datamemebers
-  bool operator== (const PixelModuleName &) const override;
+  bool operator==(const PixelModuleName&) const override;
 
 private:
   Shell thePart;
@@ -73,5 +70,5 @@ class PixelBarrelName : public PixelModuleName {
   bool phase1;
 };
 
-std::ostream & operator<<( std::ostream& out, const PixelBarrelName::Shell& t);
+std::ostream& operator<<(std::ostream& out, const PixelBarrelName::Shell& t);
 #endif
diff --git a/DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h b/DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h
index 0c0bb5912859c..3699879ff7908 100644
--- a/DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h
+++ b/DataFormats/SiPixelDetId/interface/PixelBarrelNameUpgrade.h
@@ -9,60 +9,57 @@
 #include <string>
 #include "DataFormats/SiPixelDetId/interface/PXBDetId.h"
 
-class DetId; 
+class DetId;
 
 class PixelBarrelNameUpgrade : public PixelModuleName {
 public:
-
-  enum Shell { mO = 1, mI = 2 , pO =3 , pI =4 };
+  enum Shell { mO = 1, mI = 2, pO = 3, pI = 4 };
 
   /// ctor from DetId
-  PixelBarrelNameUpgrade(const DetId &);
+  PixelBarrelNameUpgrade(const DetId&);
 
   /// ctor for defined name with dummy parameters
-  PixelBarrelNameUpgrade(Shell shell=mO, int layer=0, int module=0, int ladder=0)
-    : PixelModuleName(true), 
-      thePart(shell), theLayer(layer), theModule(module), theLadder(ladder) 
-  { }
+  PixelBarrelNameUpgrade(Shell shell = mO, int layer = 0, int module = 0, int ladder = 0)
+      : PixelModuleName(true), thePart(shell), theLayer(layer), theModule(module), theLadder(ladder) {}
 
   /// ctor from name string
   PixelBarrelNameUpgrade(std::string name);
 
-  ~PixelBarrelNameUpgrade() override { }
+  ~PixelBarrelNameUpgrade() override {}
 
   /// from base class
   std::string name() const override;
 
   Shell shell() const { return thePart; }
 
-  /// layer id 
-  int layerName() const { return theLayer; }   
+  /// layer id
+  int layerName() const { return theLayer; }
 
-  /// module id (index in z) 
-  int moduleName() const { return theModule; }  
+  /// module id (index in z)
+  int moduleName() const { return theModule; }
 
-  /// ladder id (index in phi) 
-  int ladderName() const { return theLadder; } 
+  /// ladder id (index in phi)
+  int ladderName() const { return theLadder; }
 
   /// sector id
   int sectorName() const;
 
   /// full or half module
   bool isHalfModule() const;
-  
+
   /// module Type
-  PixelModuleName::ModuleType  moduleType() const override;
+  PixelModuleName::ModuleType moduleType() const override;
 
   /// return the DetId
   PXBDetId getDetId();
 
   /// check equality of modules from datamemebers
-  bool operator== (const PixelModuleName &) const override;
+  bool operator==(const PixelModuleName&) const override;
 
 private:
   Shell thePart;
   int theLayer, theModule, theLadder;
 };
 
-std::ostream & operator<<( std::ostream& out, const PixelBarrelNameUpgrade::Shell& t);
+std::ostream& operator<<(std::ostream& out, const PixelBarrelNameUpgrade::Shell& t);
 #endif
diff --git a/DataFormats/SiPixelDetId/interface/PixelChannelIdentifier.h b/DataFormats/SiPixelDetId/interface/PixelChannelIdentifier.h
index c9523b39c1dd2..47a39f10a25b5 100644
--- a/DataFormats/SiPixelDetId/interface/PixelChannelIdentifier.h
+++ b/DataFormats/SiPixelDetId/interface/PixelChannelIdentifier.h
@@ -4,73 +4,68 @@
 #include <utility>
 #include "FWCore/Utilities/interface/GCC11Compatibility.h"
 
-class PixelChannelIdentifier{
- public:
-  
+class PixelChannelIdentifier {
+public:
   typedef unsigned int PackedDigiType;
   typedef unsigned int ChannelType;
-  
-  static std::pair<int,int> channelToPixel( int ch) {
-    int row = ( ch >> thePacking.column_width) & thePacking.row_mask;
+
+  static std::pair<int, int> channelToPixel(int ch) {
+    int row = (ch >> thePacking.column_width) & thePacking.row_mask;
     int col = ch & thePacking.column_mask;
-    return std::pair<int,int>(row,col);
-  }
-  
-  static int pixelToChannel( int row, int col) {
-    return (row << thePacking.column_width) | col;
+    return std::pair<int, int>(row, col);
   }
-  
+
+  static int pixelToChannel(int row, int col) { return (row << thePacking.column_width) | col; }
+
   /**
    * Pack the pixel information to use less memory
    */
 
   class Packing {
   public:
-    
     // Constructor: pre-computes masks and shifts from field widths
     // gcc4.8: sorry, unimplemented: use of the value of the object being constructed in a constant expression
     // no constexpr yet....
-    Packing(unsigned int row_w, unsigned int column_w,
-	    unsigned int time_w, unsigned int adc_w) :
-      row_width(row_w), column_width(column_w), adc_width(adc_w)
-      ,row_shift(0)
-      ,column_shift(row_shift + row_w)
-      ,time_shift(column_shift + column_w)
-      ,adc_shift(time_shift + time_w)
-      ,row_mask(~(~0U << row_w))
-      ,column_mask( ~(~0U << column_w))
-      ,time_mask(~(~0U << time_w))
-      ,adc_mask(~(~0U << adc_w))
-      ,rowcol_mask(~(~0U << (column_w+row_w)))
-      ,max_row(row_mask)
-      ,max_column(column_mask)
-      ,max_adc(adc_mask){}
+    Packing(unsigned int row_w, unsigned int column_w, unsigned int time_w, unsigned int adc_w)
+        : row_width(row_w),
+          column_width(column_w),
+          adc_width(adc_w),
+          row_shift(0),
+          column_shift(row_shift + row_w),
+          time_shift(column_shift + column_w),
+          adc_shift(time_shift + time_w),
+          row_mask(~(~0U << row_w)),
+          column_mask(~(~0U << column_w)),
+          time_mask(~(~0U << time_w)),
+          adc_mask(~(~0U << adc_w)),
+          rowcol_mask(~(~0U << (column_w + row_w))),
+          max_row(row_mask),
+          max_column(column_mask),
+          max_adc(adc_mask) {}
 
-							   
     int row_width;
     int column_width;
     int adc_width;
-    
+
     int row_shift;
     int column_shift;
     int time_shift;
     int adc_shift;
-   
+
     PackedDigiType row_mask;
     PackedDigiType column_mask;
     PackedDigiType time_mask;
     PackedDigiType adc_mask;
     PackedDigiType rowcol_mask;
-    
-    
+
     int max_row;
     int max_column;
     int max_adc;
   };
-  
- public:
+
+public:
   //#ifndef CMS_NOCXX11
-  static Packing packing() { return Packing(8, 9, 4, 11);}
+  static Packing packing() { return Packing(8, 9, 4, 11); }
 
   static const Packing thePacking;
 
@@ -79,7 +74,6 @@ class PixelChannelIdentifier{
 
   //static constexpr Packing thePacking = packing();
   //#endif
-};  
-
+};
 
 #endif
diff --git a/DataFormats/SiPixelDetId/interface/PixelEndcapName.h b/DataFormats/SiPixelDetId/interface/PixelEndcapName.h
index 91914c0bb1928..feea4db5b1c14 100644
--- a/DataFormats/SiPixelDetId/interface/PixelEndcapName.h
+++ b/DataFormats/SiPixelDetId/interface/PixelEndcapName.h
@@ -15,30 +15,31 @@ class TrackerTopology;
 
 class PixelEndcapName : public PixelModuleName {
 public:
-
-  enum HalfCylinder { mO = 1, mI = 2 , pO =3 , pI =4 };
+  enum HalfCylinder { mO = 1, mI = 2, pO = 3, pI = 4 };
 
   /// ctor from DetId
-  PixelEndcapName(const DetId &, bool phase=false);
-  PixelEndcapName(const DetId &, const TrackerTopology* tt, bool phase=false);
-  
+  PixelEndcapName(const DetId&, bool phase = false);
+  PixelEndcapName(const DetId&, const TrackerTopology* tt, bool phase = false);
+
   /// ctor for defined name
-  PixelEndcapName( HalfCylinder part = mO, int disk =0, int blade =0, int pannel=0, 
-		   int plaq=0, bool phase=false) 
-    : PixelModuleName(false), 
-      thePart(part), theDisk(disk), theBlade(blade), thePannel(pannel), 
-    thePlaquette(plaq), phase1(phase)
-  { }
+  PixelEndcapName(HalfCylinder part = mO, int disk = 0, int blade = 0, int pannel = 0, int plaq = 0, bool phase = false)
+      : PixelModuleName(false),
+        thePart(part),
+        theDisk(disk),
+        theBlade(blade),
+        thePannel(pannel),
+        thePlaquette(plaq),
+        phase1(phase) {}
 
   /// ctor from name string
-  PixelEndcapName(std::string name, bool phase=false);
+  PixelEndcapName(std::string name, bool phase = false);
 
-  ~PixelEndcapName() override { }
+  ~PixelEndcapName() override {}
 
   /// from base class
   std::string name() const override;
 
-  HalfCylinder halfCylinder() const { return thePart; } 
+  HalfCylinder halfCylinder() const { return thePart; }
 
   /// disk id
   int diskName() const { return theDisk; }
@@ -46,7 +47,7 @@ class PixelEndcapName : public PixelModuleName {
   /// blade id
   int bladeName() const { return theBlade; }
 
-  /// pannel id 
+  /// pannel id
   int pannelName() const { return thePannel; }
 
   /// plaquetteId (in pannel)
@@ -56,15 +57,14 @@ class PixelEndcapName : public PixelModuleName {
   int ringName() const { return thePlaquette; }
 
   /// module Type
-   PixelModuleName::ModuleType  moduleType() const override;
+  PixelModuleName::ModuleType moduleType() const override;
 
   /// return DetId
-  PXFDetId getDetId(); 
-  DetId getDetId(const TrackerTopology* tt); 
+  PXFDetId getDetId();
+  DetId getDetId(const TrackerTopology* tt);
 
   /// check equality of modules from datamemebers
-  bool operator== (const PixelModuleName &) const override;
-
+  bool operator==(const PixelModuleName&) const override;
 
 private:
   HalfCylinder thePart;
@@ -72,5 +72,5 @@ class PixelEndcapName : public PixelModuleName {
   bool phase1;
 };
 
-std::ostream & operator<<( std::ostream& out, const PixelEndcapName::HalfCylinder & t);
+std::ostream& operator<<(std::ostream& out, const PixelEndcapName::HalfCylinder& t);
 #endif
diff --git a/DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h b/DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h
index 0c063d5c58eeb..c689d613bd8d6 100644
--- a/DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h
+++ b/DataFormats/SiPixelDetId/interface/PixelEndcapNameUpgrade.h
@@ -15,27 +15,24 @@ class DetId;
 
 class PixelEndcapNameUpgrade : public PixelModuleName {
 public:
-
-  enum HalfCylinder { mO = 1, mI = 2 , pO =3 , pI =4 };
+  enum HalfCylinder { mO = 1, mI = 2, pO = 3, pI = 4 };
 
   /// ctor from DetId
   PixelEndcapNameUpgrade(const DetId &);
-  
+
   /// ctor for defined name
-  PixelEndcapNameUpgrade( HalfCylinder part = mO, int disk =0, int blade =0, int pannel=0, int plaq=0) 
-    : PixelModuleName(false), 
-      thePart(part), theDisk(disk), theBlade(blade), thePannel(pannel), thePlaquette(plaq)
-  { }
+  PixelEndcapNameUpgrade(HalfCylinder part = mO, int disk = 0, int blade = 0, int pannel = 0, int plaq = 0)
+      : PixelModuleName(false), thePart(part), theDisk(disk), theBlade(blade), thePannel(pannel), thePlaquette(plaq) {}
 
   /// ctor from name string
   PixelEndcapNameUpgrade(std::string name);
 
-  ~PixelEndcapNameUpgrade() override { }
+  ~PixelEndcapNameUpgrade() override {}
 
   /// from base class
   std::string name() const override;
 
-  HalfCylinder halfCylinder() const { return thePart; } 
+  HalfCylinder halfCylinder() const { return thePart; }
 
   /// disk id
   int diskName() const { return theDisk; }
@@ -43,26 +40,25 @@ class PixelEndcapNameUpgrade : public PixelModuleName {
   /// blade id
   int bladeName() const { return theBlade; }
 
-  /// pannel id 
+  /// pannel id
   int pannelName() const { return thePannel; }
 
   /// plaquetteId (in pannel)
   int plaquetteName() const { return thePlaquette; }
 
   /// module Type
-   PixelModuleName::ModuleType  moduleType() const override;
+  PixelModuleName::ModuleType moduleType() const override;
 
   /// return DetId
-  PXFDetId getDetId(); 
+  PXFDetId getDetId();
 
   /// check equality of modules from datamemebers
-  bool operator== (const PixelModuleName &) const override;
-
+  bool operator==(const PixelModuleName &) const override;
 
 private:
   HalfCylinder thePart;
   int theDisk, theBlade, thePannel, thePlaquette;
 };
 
-std::ostream & operator<<( std::ostream& out, const PixelEndcapNameUpgrade::HalfCylinder & t);
+std::ostream &operator<<(std::ostream &out, const PixelEndcapNameUpgrade::HalfCylinder &t);
 #endif
diff --git a/DataFormats/SiPixelDetId/interface/PixelFEDChannel.h b/DataFormats/SiPixelDetId/interface/PixelFEDChannel.h
index f0e7bcd946c56..ae9262b6144d3 100644
--- a/DataFormats/SiPixelDetId/interface/PixelFEDChannel.h
+++ b/DataFormats/SiPixelDetId/interface/PixelFEDChannel.h
@@ -7,8 +7,9 @@ struct PixelFEDChannel {
   unsigned int fed, link, roc_first, roc_last;
 };
 
-inline bool operator<( const PixelFEDChannel& one, const PixelFEDChannel& other) {
-  if (one.fed == other.fed) return one.link<other.link;
+inline bool operator<(const PixelFEDChannel& one, const PixelFEDChannel& other) {
+  if (one.fed == other.fed)
+    return one.link < other.link;
   return one.fed < other.fed;
 }
 
diff --git a/DataFormats/SiPixelDetId/interface/PixelModuleName.h b/DataFormats/SiPixelDetId/interface/PixelModuleName.h
index 6f29a8e5065e6..027f9afe681fc 100644
--- a/DataFormats/SiPixelDetId/interface/PixelModuleName.h
+++ b/DataFormats/SiPixelDetId/interface/PixelModuleName.h
@@ -11,29 +11,28 @@
 
 class PixelModuleName {
 public:
+  enum ModuleType { v1x2, v1x5, v1x8, v2x3, v2x4, v2x5, v2x8 };
 
-  enum ModuleType { v1x2, v1x5, v1x8, v2x3, v2x4, v2x5, v2x8 } ;
-
-  PixelModuleName(bool isBarrel) : barrel(isBarrel) { }
-  virtual ~PixelModuleName() { }
+  PixelModuleName(bool isBarrel) : barrel(isBarrel) {}
+  virtual ~PixelModuleName() {}
 
   /// true for barrel modules
   virtual bool isBarrel() const { return barrel; }
 
-  static bool isBarrel(uint32_t rawDetId) { return ( 1==((rawDetId>>25)&0x7)); }
+  static bool isBarrel(uint32_t rawDetId) { return (1 == ((rawDetId >> 25) & 0x7)); }
 
-  /// associated name 
+  /// associated name
   virtual std::string name() const = 0;
 
   /// module type
   virtual ModuleType moduleType() const = 0;
 
   /// check equality of modules
-  virtual  bool operator== (const PixelModuleName &) const = 0;
+  virtual bool operator==(const PixelModuleName&) const = 0;
 
 private:
   bool barrel;
 };
 
-std::ostream & operator<<( std::ostream& out, const PixelModuleName::ModuleType & t);
+std::ostream& operator<<(std::ostream& out, const PixelModuleName::ModuleType& t);
 #endif
diff --git a/DataFormats/SiPixelDetId/interface/PixelPannelType.h b/DataFormats/SiPixelDetId/interface/PixelPannelType.h
index b9bbce951000b..b0c4b9ac1e41e 100644
--- a/DataFormats/SiPixelDetId/interface/PixelPannelType.h
+++ b/DataFormats/SiPixelDetId/interface/PixelPannelType.h
@@ -7,10 +7,10 @@ class PixelPannelType {
 public:
   enum PannelType { p3L, p3R, p4L, p4R, p2x8 };
 
-  static PannelType pannelType( const PixelEndcapName & name) {
-    PannelType type = (name.pannelName()==1) ? p4L : p3L;
+  static PannelType pannelType(const PixelEndcapName& name) {
+    PannelType type = (name.pannelName() == 1) ? p4L : p3L;
     return type;
-  } 
+  }
 };
 
 #endif
diff --git a/DataFormats/SiPixelDetId/interface/PixelSubdetector.h b/DataFormats/SiPixelDetId/interface/PixelSubdetector.h
index 26a2fea2fc117..6f33b240a328e 100644
--- a/DataFormats/SiPixelDetId/interface/PixelSubdetector.h
+++ b/DataFormats/SiPixelDetId/interface/PixelSubdetector.h
@@ -6,10 +6,9 @@
  *
  */
 
-class PixelSubdetector { 
- public:
-  enum SubDetector {PixelBarrel=1,PixelEndcap=2};
-
+class PixelSubdetector {
+public:
+  enum SubDetector { PixelBarrel = 1, PixelEndcap = 2 };
 };
 
 #endif
diff --git a/DataFormats/SiPixelDetId/src/ES_PixelFEDChannelCollectionMap.cc b/DataFormats/SiPixelDetId/src/ES_PixelFEDChannelCollectionMap.cc
index 3cc237783e027..8a9b0bcef3b18 100644
--- a/DataFormats/SiPixelDetId/src/ES_PixelFEDChannelCollectionMap.cc
+++ b/DataFormats/SiPixelDetId/src/ES_PixelFEDChannelCollectionMap.cc
@@ -1,6 +1,7 @@
 #include "DataFormats/SiPixelDetId/interface/PixelFEDChannel.h"
 #include "FWCore/Utilities/interface/typelookup.h"
 
-typedef std::unordered_map<std::string,PixelFEDChannelCollection> PixelFEDChannelCollectionMap;
+#include <unordered_map>
+typedef std::unordered_map<std::string, PixelFEDChannelCollection> PixelFEDChannelCollectionMap;
 
 TYPELOOKUP_DATA_REG(PixelFEDChannelCollectionMap);
diff --git a/DataFormats/SiPixelDetId/src/PXBDetId.cc b/DataFormats/SiPixelDetId/src/PXBDetId.cc
index ee9f99257ee8f..7c73b22200fe6 100644
--- a/DataFormats/SiPixelDetId/src/PXBDetId.cc
+++ b/DataFormats/SiPixelDetId/src/PXBDetId.cc
@@ -1,17 +1,10 @@
 #include "DataFormats/SiPixelDetId/interface/PXBDetId.h"
 
-PXBDetId::PXBDetId() : DetId() {
-}
-
-PXBDetId::PXBDetId(uint32_t rawid) : DetId(rawid) {
-}
-PXBDetId::PXBDetId(const DetId& id) : DetId(id.rawId()) {
-}
+PXBDetId::PXBDetId() : DetId() {}
 
+PXBDetId::PXBDetId(uint32_t rawid) : DetId(rawid) {}
+PXBDetId::PXBDetId(const DetId& id) : DetId(id.rawId()) {}
 
-std::ostream& operator<<(std::ostream& os,const PXBDetId& id) {
-  return os << "(PixelBarrel " 
-	   << id.layer() << ',' 
-	   << id.ladder() << ',' 
-	   << id.module() << ')'; 
+std::ostream& operator<<(std::ostream& os, const PXBDetId& id) {
+  return os << "(PixelBarrel " << id.layer() << ',' << id.ladder() << ',' << id.module() << ')';
 }
diff --git a/DataFormats/SiPixelDetId/src/PXFDetId.cc b/DataFormats/SiPixelDetId/src/PXFDetId.cc
index a8dbed4428bff..645ec4098a9c8 100644
--- a/DataFormats/SiPixelDetId/src/PXFDetId.cc
+++ b/DataFormats/SiPixelDetId/src/PXFDetId.cc
@@ -1,17 +1,10 @@
 #include "DataFormats/SiPixelDetId/interface/PXFDetId.h"
 
-PXFDetId::PXFDetId() : DetId() {
-}
+PXFDetId::PXFDetId() : DetId() {}
 
-PXFDetId::PXFDetId(uint32_t rawid) : DetId(rawid) {
-}
-PXFDetId::PXFDetId(const DetId& id) : DetId(id.rawId()) {
-}
+PXFDetId::PXFDetId(uint32_t rawid) : DetId(rawid) {}
+PXFDetId::PXFDetId(const DetId& id) : DetId(id.rawId()) {}
 
-std::ostream& operator<<(std::ostream& os,const PXFDetId& id) {
-  return os << "(PixelEndcap " 
-	   << id.disk() << ',' 
-	   << id.blade()  << ',' 
-	   << id.panel()  << ',' 
-	   << id.module()   << ')'; 
+std::ostream& operator<<(std::ostream& os, const PXFDetId& id) {
+  return os << "(PixelEndcap " << id.disk() << ',' << id.blade() << ',' << id.panel() << ',' << id.module() << ')';
 }
diff --git a/DataFormats/SiPixelDetId/src/PixelBarrelName.cc b/DataFormats/SiPixelDetId/src/PixelBarrelName.cc
index 7d6894c19648f..1e262462f538c 100644
--- a/DataFormats/SiPixelDetId/src/PixelBarrelName.cc
+++ b/DataFormats/SiPixelDetId/src/PixelBarrelName.cc
@@ -9,37 +9,39 @@
 #include <iostream>
 
 using namespace std;
- 
+
 namespace {
   // ladder limits
   // for phase 0
-  const int lL[2][12] ={{5,15,26, 8,24,41,11,33,56, 0, 0, 0},
-			{3, 9,16, 7,21,36,11,33,56,16,48,81}};
+  const int lL[2][12] = {{5, 15, 26, 8, 24, 41, 11, 33, 56, 0, 0, 0}, {3, 9, 16, 7, 21, 36, 11, 33, 56, 16, 48, 81}};
   // for phase 1
-  //const int lL[12] ={ 3, 9,16, 7,21,36,11,33,56,16,48,81};  
-  //const bool phase1 = false; // this has to come from the trackerTopology class 
-}
-
-PixelBarrelName::PixelBarrelName(const DetId & id, const TrackerTopology* tt, bool phase) 
-  : PixelModuleName(true), thePart(mO), theLayer(0),
-    theModule(0), theLadder(0), phase1(phase) {
+  //const int lL[12] ={ 3, 9,16, 7,21,36,11,33,56,16,48,81};
+  //const bool phase1 = false; // this has to come from the trackerTopology class
+}  // namespace
 
+PixelBarrelName::PixelBarrelName(const DetId& id, const TrackerTopology* tt, bool phase)
+    : PixelModuleName(true), thePart(mO), theLayer(0), theModule(0), theLadder(0), phase1(phase) {
   theLayer = tt->pxbLayer(id);
-  int oldModule = tt->pxbModule(id);  // CMSSW convention 
+  int oldModule = tt->pxbModule(id);  // CMSSW convention
   int oldLadder = tt->pxbLadder(id);  // CMSSW convention
 
-  int ladder = convertLadderNumber(oldLadder); // convert to online convention
-  int module = oldModule-4; // convert 
-  if (module<=0) module--; 
+  int ladder = convertLadderNumber(oldLadder);  // convert to online convention
+  int module = oldModule - 4;                   // convert
+  if (module <= 0)
+    module--;
 
   //
   // part
   //
-  if      (module < 0 && ladder < 0) thePart = mO; 
-  else if (module > 0 && ladder < 0) thePart = pO;
-  else if (module < 0 && ladder > 0) thePart = mI;
-  else if (module > 0 && ladder > 0) thePart = pI;
-  
+  if (module < 0 && ladder < 0)
+    thePart = mO;
+  else if (module > 0 && ladder < 0)
+    thePart = pO;
+  else if (module < 0 && ladder > 0)
+    thePart = mI;
+  else if (module > 0 && ladder > 0)
+    thePart = pI;
+
   //
   // ladder
   //
@@ -49,72 +51,90 @@ PixelBarrelName::PixelBarrelName(const DetId & id, const TrackerTopology* tt, bo
   // module
   //
   theModule = abs(module);
-
 }
 
 // Old constructor, works with the old pixel classes  DO NOT USE
-PixelBarrelName::PixelBarrelName(const DetId & id, bool phase) 
-  : PixelModuleName(true), thePart(mO), theLayer(0),
-    theModule(0), theLadder(0), phase1(phase) {
- 
-  //  uint32_t rawId = id.rawId(); 
+PixelBarrelName::PixelBarrelName(const DetId& id, bool phase)
+    : PixelModuleName(true), thePart(mO), theLayer(0), theModule(0), theLadder(0), phase1(phase) {
+  //  uint32_t rawId = id.rawId();
   PXBDetId cmssw_numbering(id);
 
   theLayer = cmssw_numbering.layer();
 
-  int oldModule = cmssw_numbering.module() -4; if (oldModule<=0) oldModule--;
+  int oldModule = cmssw_numbering.module() - 4;
+  if (oldModule <= 0)
+    oldModule--;
   int oldLadder = cmssw_numbering.ladder();
 
-  if(phase1) { // phase 1
+  if (phase1) {  // phase 1
 
     if (theLayer == 1) {
-      if (oldLadder <= 3) oldLadder = 4-oldLadder;                                // +1, ..., +3
-      else if (oldLadder >= 4 && oldLadder <= 9 ) oldLadder = 3-oldLadder;        // -1, ..., -6
-      else if (oldLadder >= 10) oldLadder = 16-oldLadder;                         // +6, ..., +4
-    } 
-    else if (theLayer == 2) {
-      if (oldLadder <= 7) oldLadder = 8-oldLadder;
-      else if (oldLadder >= 8 && oldLadder <= 21) oldLadder = 7-oldLadder;
-      else if (oldLadder >= 22) oldLadder = 36-oldLadder; 
-    } 
-    else if (theLayer == 3) {
-      if (oldLadder <= 11) oldLadder = 12-oldLadder;
-      else if (oldLadder >= 12 && oldLadder <= 33) oldLadder = 11-oldLadder;
-      else if (oldLadder >= 34) oldLadder = 56-oldLadder;
-    } 
-    else if (theLayer == 4) {
-      if (oldLadder <= 16) oldLadder = 17-oldLadder;
-      else if (oldLadder >= 17 && oldLadder <= 48) oldLadder = 16-oldLadder;
-      else if (oldLadder >= 49) oldLadder = 81-oldLadder;
-    } 
-    
-  } else { // phase 0
+      if (oldLadder <= 3)
+        oldLadder = 4 - oldLadder;  // +1, ..., +3
+      else if (oldLadder >= 4 && oldLadder <= 9)
+        oldLadder = 3 - oldLadder;  // -1, ..., -6
+      else if (oldLadder >= 10)
+        oldLadder = 16 - oldLadder;  // +6, ..., +4
+    } else if (theLayer == 2) {
+      if (oldLadder <= 7)
+        oldLadder = 8 - oldLadder;
+      else if (oldLadder >= 8 && oldLadder <= 21)
+        oldLadder = 7 - oldLadder;
+      else if (oldLadder >= 22)
+        oldLadder = 36 - oldLadder;
+    } else if (theLayer == 3) {
+      if (oldLadder <= 11)
+        oldLadder = 12 - oldLadder;
+      else if (oldLadder >= 12 && oldLadder <= 33)
+        oldLadder = 11 - oldLadder;
+      else if (oldLadder >= 34)
+        oldLadder = 56 - oldLadder;
+    } else if (theLayer == 4) {
+      if (oldLadder <= 16)
+        oldLadder = 17 - oldLadder;
+      else if (oldLadder >= 17 && oldLadder <= 48)
+        oldLadder = 16 - oldLadder;
+      else if (oldLadder >= 49)
+        oldLadder = 81 - oldLadder;
+    }
+
+  } else {  // phase 0
 
     if (theLayer == 1) {
-      if (oldLadder <= 5) oldLadder = 6-oldLadder;
-      else if (oldLadder >= 6 && oldLadder <= 15 ) oldLadder = 5-oldLadder;
-      else if (oldLadder >= 16) oldLadder = 26-oldLadder;
-    } 
-    else if (theLayer == 2) {
-      if (oldLadder <= 8) oldLadder = 9-oldLadder;
-      else if (oldLadder >= 9 && oldLadder <= 24) oldLadder = 8-oldLadder;
-      else if (oldLadder >= 25) oldLadder = 41-oldLadder; 
-    } 
-    else if (theLayer == 3) {
-      if (oldLadder <= 11) oldLadder = 12-oldLadder;
-      else if (oldLadder >= 12 && oldLadder <= 33) oldLadder = 11-oldLadder;
-      else if (oldLadder >= 34) oldLadder = 56-oldLadder;
-    } 
-  } // end phase 0/1
- 
+      if (oldLadder <= 5)
+        oldLadder = 6 - oldLadder;
+      else if (oldLadder >= 6 && oldLadder <= 15)
+        oldLadder = 5 - oldLadder;
+      else if (oldLadder >= 16)
+        oldLadder = 26 - oldLadder;
+    } else if (theLayer == 2) {
+      if (oldLadder <= 8)
+        oldLadder = 9 - oldLadder;
+      else if (oldLadder >= 9 && oldLadder <= 24)
+        oldLadder = 8 - oldLadder;
+      else if (oldLadder >= 25)
+        oldLadder = 41 - oldLadder;
+    } else if (theLayer == 3) {
+      if (oldLadder <= 11)
+        oldLadder = 12 - oldLadder;
+      else if (oldLadder >= 12 && oldLadder <= 33)
+        oldLadder = 11 - oldLadder;
+      else if (oldLadder >= 34)
+        oldLadder = 56 - oldLadder;
+    }
+  }  // end phase 0/1
+
   //
   // part
   //
-  if      (oldModule < 0 && oldLadder < 0) thePart = mO; 
-  else if (oldModule > 0 && oldLadder < 0) thePart = pO;
-  else if (oldModule < 0 && oldLadder > 0) thePart = mI;
-  else if (oldModule > 0 && oldLadder > 0) thePart = pI;
-  
+  if (oldModule < 0 && oldLadder < 0)
+    thePart = mO;
+  else if (oldModule > 0 && oldLadder < 0)
+    thePart = pO;
+  else if (oldModule < 0 && oldLadder > 0)
+    thePart = mI;
+  else if (oldModule > 0 && oldLadder > 0)
+    thePart = pI;
 
   //
   // ladder
@@ -125,72 +145,61 @@ PixelBarrelName::PixelBarrelName(const DetId & id, bool phase)
   // module
   //
   theModule = abs(oldModule);
-
 }
 
-
-// convert ladder number 
+// convert ladder number
 int PixelBarrelName::convertLadderNumber(int oldLadder) {
-  int ladder=-1;
-  int ind=0;
-  if(phase1) ind=1;
+  int ladder = -1;
+  int ind = 0;
+  if (phase1)
+    ind = 1;
 
   if (theLayer == 1) {
-    if       (oldLadder <= lL[ind][0] )                         
-      ladder =(lL[ind][0]+1)-oldLadder;
-    else if (oldLadder >= (lL[ind][0]+1) && oldLadder <= lL[ind][1]) 
-      ladder = lL[ind][0]-oldLadder;
-    else if (oldLadder >= (lL[ind][1]+1) )                      
-      ladder = lL[ind][2]-oldLadder;
+    if (oldLadder <= lL[ind][0])
+      ladder = (lL[ind][0] + 1) - oldLadder;
+    else if (oldLadder >= (lL[ind][0] + 1) && oldLadder <= lL[ind][1])
+      ladder = lL[ind][0] - oldLadder;
+    else if (oldLadder >= (lL[ind][1] + 1))
+      ladder = lL[ind][2] - oldLadder;
 
   } else if (theLayer == 2) {
-
-    if      (oldLadder <=  lL[ind][3])                          
-      ladder =(lL[ind][3]+1)-oldLadder;
-    else if (oldLadder >= (lL[ind][3]+1) && oldLadder <= lL[ind][4]) 
-      ladder = lL[ind][3]-oldLadder;
-    else if (oldLadder >= (lL[ind][4]+1))                       
-      ladder = lL[ind][5]-oldLadder; 
+    if (oldLadder <= lL[ind][3])
+      ladder = (lL[ind][3] + 1) - oldLadder;
+    else if (oldLadder >= (lL[ind][3] + 1) && oldLadder <= lL[ind][4])
+      ladder = lL[ind][3] - oldLadder;
+    else if (oldLadder >= (lL[ind][4] + 1))
+      ladder = lL[ind][5] - oldLadder;
 
   } else if (theLayer == 3) {
-
-    if      (oldLadder <=  lL[ind][6])                          
-      ladder = (lL[ind][6]+1)-oldLadder;
-    else if (oldLadder >= (lL[ind][6]+1) && oldLadder <= lL[ind][7]) 
-      ladder = lL[ind][6]-oldLadder;
-    else if (oldLadder >= (lL[ind][7]+1))                       
-      ladder = lL[ind][8]-oldLadder;
+    if (oldLadder <= lL[ind][6])
+      ladder = (lL[ind][6] + 1) - oldLadder;
+    else if (oldLadder >= (lL[ind][6] + 1) && oldLadder <= lL[ind][7])
+      ladder = lL[ind][6] - oldLadder;
+    else if (oldLadder >= (lL[ind][7] + 1))
+      ladder = lL[ind][8] - oldLadder;
 
   } else if (theLayer == 4) {
+    if (oldLadder <= lL[ind][9])
+      ladder = (lL[ind][9] + 1) - oldLadder;
+    else if (oldLadder >= (lL[ind][9] + 1) && oldLadder <= lL[ind][10])
+      ladder = lL[ind][9] - oldLadder;
+    else if (oldLadder >= (lL[ind][10] + 1))
+      ladder = lL[ind][11] - oldLadder;
+  }
 
-    if      (oldLadder <=  lL[ind][9])                           
-      ladder =(lL[ind][9]+1)-oldLadder;
-    else if (oldLadder >= (lL[ind][9]+1) && oldLadder <= lL[ind][10]) 
-      ladder = lL[ind][9]-oldLadder;
-    else if (oldLadder >= (lL[ind][10]+1))                       
-      ladder = lL[ind][11]-oldLadder;
-
-  } 
-  
   return ladder;
 }
 
 // constructor from name string
-PixelBarrelName::PixelBarrelName(std::string name, bool phase) 
-  : PixelModuleName(true), thePart(mO), theLayer(0),
-    theModule(0), theLadder(0), phase1(phase) {
-
+PixelBarrelName::PixelBarrelName(std::string name, bool phase)
+    : PixelModuleName(true), thePart(mO), theLayer(0), theModule(0), theLadder(0), phase1(phase) {
   // parse the name string
   // first, check to make sure this is an BPix name, should start with "BPix_"
   // also check to make sure the needed parts are present
-  if ( (name.substr(0, 5) != "BPix_") ||
-       (name.find("_B") == string::npos) || 
-       (name.find("_LYR") == string::npos) ||
-       (name.find("_LDR") == string::npos) || 
-       (name.find("_MOD") == string::npos) ) {
-    edm::LogError ("BadNameString|SiPixel") 
-      << "Bad name string in PixelBarrelName::PixelBarrelName(std::string): "
-      << name;
+  if ((name.substr(0, 5) != "BPix_") || (name.find("_B") == string::npos) || (name.find("_LYR") == string::npos) ||
+      (name.find("_LDR") == string::npos) || (name.find("_MOD") == string::npos)) {
+    edm::LogError("BadNameString|SiPixel")
+        << "Bad name string in PixelBarrelName::PixelBarrelName(std::string): " << name;
     return;
   }
 
@@ -199,98 +208,111 @@ PixelBarrelName::PixelBarrelName(std::string name, bool phase)
     name = name.substr(0, name.find("_ROC"));
 
   // find shell
-  string shellString = name.substr(name.find("_B")+2, name.find("_SEC")-name.find("_B")-2);
-  if (shellString == "mO") thePart = mO;
-  else if (shellString == "mI") thePart = mI;
-  else if (shellString == "pO") thePart = pO;
-  else if (shellString == "pI") thePart = pI;
+  string shellString = name.substr(name.find("_B") + 2, name.find("_SEC") - name.find("_B") - 2);
+  if (shellString == "mO")
+    thePart = mO;
+  else if (shellString == "mI")
+    thePart = mI;
+  else if (shellString == "pO")
+    thePart = pO;
+  else if (shellString == "pI")
+    thePart = pI;
   else {
-    edm::LogError ("BadNameString|SiPixel")
-      << "Unable to determine shell in PixelBarrelName::PixelBarrelName(std::string): "
-      << name;
+    edm::LogError("BadNameString|SiPixel")
+        << "Unable to determine shell in PixelBarrelName::PixelBarrelName(std::string): " << name;
   }
 
   // find the layer
-  string layerString = name.substr(name.find("_LYR")+4, name.find("_LDR")-name.find("_LYR")-4);
-  if (layerString == "1") theLayer = 1;
-  else if (layerString == "2") theLayer = 2;
-  else if (layerString == "3") theLayer = 3;
-  else if (phase1 && layerString == "4") theLayer = 4;
+  string layerString = name.substr(name.find("_LYR") + 4, name.find("_LDR") - name.find("_LYR") - 4);
+  if (layerString == "1")
+    theLayer = 1;
+  else if (layerString == "2")
+    theLayer = 2;
+  else if (layerString == "3")
+    theLayer = 3;
+  else if (phase1 && layerString == "4")
+    theLayer = 4;
   else {
-    edm::LogError ("BadNameString|SiPixel")
-      << "Unable to determine layer in PixelBarrelName::PixelBarrelName(std::string): "
-      << name;
+    edm::LogError("BadNameString|SiPixel")
+        << "Unable to determine layer in PixelBarrelName::PixelBarrelName(std::string): " << name;
   }
 
   // find the ladder
-  string ladderString = name.substr(name.find("_LDR")+4, name.find("_MOD")-name.find("_LDR")-4);
+  string ladderString = name.substr(name.find("_LDR") + 4, name.find("_MOD") - name.find("_LDR") - 4);
 
-  if(phase1) { // phase 1 ladders
+  if (phase1) {  // phase 1 ladders
     // do we want to kee the "F" for phase1?
-    if (ladderString.substr(ladderString.size()-1, 1) == "F") {
-      int ladderNum = atoi(ladderString.substr(0, ladderString.size() -1).c_str());
-      if (theLayer == 1 && ladderNum >= 1 && ladderNum <= 6) theLadder = ladderNum;
-      else if (theLayer == 2 && ladderNum >= 1 && ladderNum <= 14) theLadder = ladderNum;
-      else if (theLayer == 3 && ladderNum >= 1 && ladderNum <= 22) theLadder = ladderNum;
-      else if (theLayer == 4 && ladderNum >= 1 && ladderNum <= 32) theLadder = ladderNum;
+    if (ladderString.substr(ladderString.size() - 1, 1) == "F") {
+      int ladderNum = atoi(ladderString.substr(0, ladderString.size() - 1).c_str());
+      if (theLayer == 1 && ladderNum >= 1 && ladderNum <= 6)
+        theLadder = ladderNum;
+      else if (theLayer == 2 && ladderNum >= 1 && ladderNum <= 14)
+        theLadder = ladderNum;
+      else if (theLayer == 3 && ladderNum >= 1 && ladderNum <= 22)
+        theLadder = ladderNum;
+      else if (theLayer == 4 && ladderNum >= 1 && ladderNum <= 32)
+        theLadder = ladderNum;
       else {
-	edm::LogError ("BadNameString|SiPixel")
-	  << "Unable to determine ladder in PixelBarrelNameUpgrade::PixelBarrelName(std::string): "
-	  << name;
+        edm::LogError("BadNameString|SiPixel")
+            << "Unable to determine ladder in PixelBarrelNameUpgrade::PixelBarrelName(std::string): " << name;
       }
-    } // full ladders
+    }  // full ladders
     else {
-      edm::LogError ("BadNameString|SiPixel")
-	<< "Unable to determine ladder in PixelBarrelNameUpgrade::PixelBarrelName(std::string): "
-	<< name;
+      edm::LogError("BadNameString|SiPixel")
+          << "Unable to determine ladder in PixelBarrelNameUpgrade::PixelBarrelName(std::string): " << name;
     }
 
-
-  } else { // phase 0 ladders
-
-    if (ladderString == "1H") theLadder = 1;
-    else if (ladderString == "10H" && theLayer == 1) theLadder = 10;
-    else if (ladderString == "16H" && theLayer == 2) theLadder = 16;
-    else if (ladderString == "22H" && theLayer == 3) theLadder = 22;
-    else if (ladderString.substr(ladderString.size()-1, 1) == "F") {
-      int ladderNum = atoi(ladderString.substr(0, ladderString.size() -1).c_str());
-      if (theLayer == 1 && ladderNum > 1 && ladderNum < 10) theLadder = ladderNum;
-      else if (theLayer == 2 && ladderNum > 1 && ladderNum < 16) theLadder = ladderNum;
-      else if (theLayer == 3 && ladderNum > 1 && ladderNum < 22) theLadder = ladderNum;
+  } else {  // phase 0 ladders
+
+    if (ladderString == "1H")
+      theLadder = 1;
+    else if (ladderString == "10H" && theLayer == 1)
+      theLadder = 10;
+    else if (ladderString == "16H" && theLayer == 2)
+      theLadder = 16;
+    else if (ladderString == "22H" && theLayer == 3)
+      theLadder = 22;
+    else if (ladderString.substr(ladderString.size() - 1, 1) == "F") {
+      int ladderNum = atoi(ladderString.substr(0, ladderString.size() - 1).c_str());
+      if (theLayer == 1 && ladderNum > 1 && ladderNum < 10)
+        theLadder = ladderNum;
+      else if (theLayer == 2 && ladderNum > 1 && ladderNum < 16)
+        theLadder = ladderNum;
+      else if (theLayer == 3 && ladderNum > 1 && ladderNum < 22)
+        theLadder = ladderNum;
       else {
-	edm::LogError ("BadNameString|SiPixel")
-	  << "Unable to determine ladder in PixelBarrelName::PixelBarrelName(std::string): "
-	  << name;
+        edm::LogError("BadNameString|SiPixel")
+            << "Unable to determine ladder in PixelBarrelName::PixelBarrelName(std::string): " << name;
       }
-    } // full ladders
+    }  // full ladders
     else {
-      edm::LogError ("BadNameString|SiPixel")
-	<< "Unable to determine ladder in PixelBarrelName::PixelBarrelName(std::string): "
-	<< name;
+      edm::LogError("BadNameString|SiPixel")
+          << "Unable to determine ladder in PixelBarrelName::PixelBarrelName(std::string): " << name;
     }
-  } // phase0/1
+  }  // phase0/1
 
   // find the module
-  string moduleString = name.substr(name.find("_MOD")+4, name.size()-name.find("_MOD")-4);
-  if (moduleString == "1") theModule = 1;
-  else if (moduleString == "2") theModule = 2;
-  else if (moduleString == "3") theModule = 3;
-  else if (moduleString == "4") theModule = 4;
+  string moduleString = name.substr(name.find("_MOD") + 4, name.size() - name.find("_MOD") - 4);
+  if (moduleString == "1")
+    theModule = 1;
+  else if (moduleString == "2")
+    theModule = 2;
+  else if (moduleString == "3")
+    theModule = 3;
+  else if (moduleString == "4")
+    theModule = 4;
   else {
-    edm::LogError ("BadNameString|SiPixel")
-      << "Unable to determine module in PixelBarrelName::PixelBarrelName(std::string): "
-      << name;
+    edm::LogError("BadNameString|SiPixel")
+        << "Unable to determine module in PixelBarrelName::PixelBarrelName(std::string): " << name;
   }
 
-} // PixelBarrelName::PixelBarrelName(std::string name)
+}  // PixelBarrelName::PixelBarrelName(std::string name)
 
-int PixelBarrelName::sectorName() const
-{
+int PixelBarrelName::sectorName() const {
   int sector = 0;
 
-  if (theLayer==1) {
-
-    if(phase1) { // phase 1
+  if (theLayer == 1) {
+    if (phase1) {  // phase 1
       // Layer 1 for phase1 is special, modules on a ladder are shared in different sectors
       // Ladder   Module    Sector
       //   1      2,3,4       1
@@ -307,170 +329,416 @@ int PixelBarrelName::sectorName() const
       //   6      1,2,3       8
 
       switch (theLadder) {
-      case 1 :  {  // ladder 1
-	if(theModule>=2) {sector = 1; break;}  // mods 2,3,4
-	else             {sector = 2; break;}  // mods 1
-      }
-      case 2 :  { // ladder 2
-	if(theModule>=3) {sector = 2; break;} // mods 3,4
-	else             {sector = 3; break;} // mods 1,2
-      }
-      case 3 :  { // ladder 3
-	if(theModule>=4) {sector = 3; break;}
-	else             {sector = 4; break;}
-	sector = 3; break;
-      }
-      case 4 :  { // ladder 4
-	if(theModule>=2) {sector = 5; break;}
-	else             {sector = 6; break;}
-	sector = 6; break;
-      }
-      case 5 :  { // ladder 5
-	if(theModule>=3) {sector = 6; break;}
-	else             {sector = 7; break;}
-	sector = 7; break;
-      }
-      case 6 :  { // ladder 6
-	if(theModule>=4) {sector = 7; break;} // mods 4
-	else             {sector = 8; break;} // mods 1,2,3
-	sector = 8; break;
-      }
-      default: ;
+        case 1: {  // ladder 1
+          if (theModule >= 2) {
+            sector = 1;
+            break;
+          }  // mods 2,3,4
+          else {
+            sector = 2;
+            break;
+          }  // mods 1
+        }
+        case 2: {  // ladder 2
+          if (theModule >= 3) {
+            sector = 2;
+            break;
+          }  // mods 3,4
+          else {
+            sector = 3;
+            break;
+          }  // mods 1,2
+        }
+        case 3: {  // ladder 3
+          if (theModule >= 4) {
+            sector = 3;
+            break;
+          } else {
+            sector = 4;
+            break;
+          }
+          sector = 3;
+          break;
+        }
+        case 4: {  // ladder 4
+          if (theModule >= 2) {
+            sector = 5;
+            break;
+          } else {
+            sector = 6;
+            break;
+          }
+          sector = 6;
+          break;
+        }
+        case 5: {  // ladder 5
+          if (theModule >= 3) {
+            sector = 6;
+            break;
+          } else {
+            sector = 7;
+            break;
+          }
+          sector = 7;
+          break;
+        }
+        case 6: {  // ladder 6
+          if (theModule >= 4) {
+            sector = 7;
+            break;
+          }  // mods 4
+          else {
+            sector = 8;
+            break;
+          }  // mods 1,2,3
+          sector = 8;
+          break;
+        }
+        default:;
       };
 
-    } else { // phase 0
+    } else {  // phase 0
       switch (theLadder) {
-      case 1 : case 2: {sector = 1; break;}
-      case 3 :         {sector = 2; break;}
-      case 4 :         {sector = 3; break;}
-      case 5 :         {sector = 4; break;}
-      case 6 :         {sector = 5; break;}
-      case 7 :         {sector = 6; break;}
-      case 8 :         {sector = 7; break;}
-      case 9 : case 10:{sector = 8; break;}
-      default: ;
+        case 1:
+        case 2: {
+          sector = 1;
+          break;
+        }
+        case 3: {
+          sector = 2;
+          break;
+        }
+        case 4: {
+          sector = 3;
+          break;
+        }
+        case 5: {
+          sector = 4;
+          break;
+        }
+        case 6: {
+          sector = 5;
+          break;
+        }
+        case 7: {
+          sector = 6;
+          break;
+        }
+        case 8: {
+          sector = 7;
+          break;
+        }
+        case 9:
+        case 10: {
+          sector = 8;
+          break;
+        }
+        default:;
       };
-    } // phase0/1
-
-  } else if (theLayer==2) {
+    }  // phase0/1
 
-    if(phase1) { // phase 1
+  } else if (theLayer == 2) {
+    if (phase1) {  // phase 1
       switch (theLadder) {
-      case  1: case  2: {sector = 1; break;}
-      case  3: case  4: {sector = 2; break;}
-      case  5:          {sector = 3; break;}
-      case  6: case  7: {sector = 4; break;}
-      case  8: case  9: {sector = 5; break;}
-      case 10:          {sector = 6; break;}
-      case 11: case 12: {sector = 7; break;}
-      case 13: case 14: {sector = 8; break;}    
-      default: ;
+        case 1:
+        case 2: {
+          sector = 1;
+          break;
+        }
+        case 3:
+        case 4: {
+          sector = 2;
+          break;
+        }
+        case 5: {
+          sector = 3;
+          break;
+        }
+        case 6:
+        case 7: {
+          sector = 4;
+          break;
+        }
+        case 8:
+        case 9: {
+          sector = 5;
+          break;
+        }
+        case 10: {
+          sector = 6;
+          break;
+        }
+        case 11:
+        case 12: {
+          sector = 7;
+          break;
+        }
+        case 13:
+        case 14: {
+          sector = 8;
+          break;
+        }
+        default:;
       };
 
-    } else { // phase 0
+    } else {  // phase 0
       switch (theLadder) {
-      case  1 : case  2: {sector = 1; break;}
-      case  3 : case  4: {sector = 2; break;}
-      case  5 : case  6: {sector = 3; break;}
-      case  7 : case  8: {sector = 4; break;}
-      case  9 : case 10: {sector = 5; break;}
-      case 11 : case 12: {sector = 6; break;}
-      case 13 : case 14: {sector = 7; break;}
-      case 15 : case 16: {sector = 8; break;}
-      default: ;
+        case 1:
+        case 2: {
+          sector = 1;
+          break;
+        }
+        case 3:
+        case 4: {
+          sector = 2;
+          break;
+        }
+        case 5:
+        case 6: {
+          sector = 3;
+          break;
+        }
+        case 7:
+        case 8: {
+          sector = 4;
+          break;
+        }
+        case 9:
+        case 10: {
+          sector = 5;
+          break;
+        }
+        case 11:
+        case 12: {
+          sector = 6;
+          break;
+        }
+        case 13:
+        case 14: {
+          sector = 7;
+          break;
+        }
+        case 15:
+        case 16: {
+          sector = 8;
+          break;
+        }
+        default:;
       };
-    } // enad phase0/1
+    }  // enad phase0/1
 
-  } else if (theLayer==3) {
-
-    if(phase1) { // phase 1
+  } else if (theLayer == 3) {
+    if (phase1) {  // phase 1
       switch (theLadder) {
-      case  1: case  2:          {sector = 1; break;}
-      case  3: case  4: case  5: {sector = 2; break;}
-      case  6: case  7: case  8: {sector = 3; break;}
-      case  9: case 10: case 11: {sector = 4; break;}
-      case 12: case 13: case 14: {sector = 5; break;}
-      case 15: case 16: case 17: {sector = 6; break;}
-      case 18: case 19: case 20: {sector = 7; break;}
-      case 21: case 22:          {sector = 8; break;}
-      default: ;
+        case 1:
+        case 2: {
+          sector = 1;
+          break;
+        }
+        case 3:
+        case 4:
+        case 5: {
+          sector = 2;
+          break;
+        }
+        case 6:
+        case 7:
+        case 8: {
+          sector = 3;
+          break;
+        }
+        case 9:
+        case 10:
+        case 11: {
+          sector = 4;
+          break;
+        }
+        case 12:
+        case 13:
+        case 14: {
+          sector = 5;
+          break;
+        }
+        case 15:
+        case 16:
+        case 17: {
+          sector = 6;
+          break;
+        }
+        case 18:
+        case 19:
+        case 20: {
+          sector = 7;
+          break;
+        }
+        case 21:
+        case 22: {
+          sector = 8;
+          break;
+        }
+        default:;
       };
 
-    } else { // phase 0
+    } else {  // phase 0
       switch (theLadder) {
-      case  1 : case  2: case  3: {sector = 1; break;}
-      case  4 : case  5: case  6: {sector = 2; break;}
-      case  7 : case  8: case  9: {sector = 3; break;}
-      case 10 : case 11:          {sector = 4; break;}
-      case 12 : case 13:          {sector = 5; break;}
-      case 14 : case 15: case 16: {sector = 6; break;}
-      case 17 : case 18: case 19: {sector = 7; break;}
-      case 20 : case 21: case 22: {sector = 8; break;}
-      default: ;
+        case 1:
+        case 2:
+        case 3: {
+          sector = 1;
+          break;
+        }
+        case 4:
+        case 5:
+        case 6: {
+          sector = 2;
+          break;
+        }
+        case 7:
+        case 8:
+        case 9: {
+          sector = 3;
+          break;
+        }
+        case 10:
+        case 11: {
+          sector = 4;
+          break;
+        }
+        case 12:
+        case 13: {
+          sector = 5;
+          break;
+        }
+        case 14:
+        case 15:
+        case 16: {
+          sector = 6;
+          break;
+        }
+        case 17:
+        case 18:
+        case 19: {
+          sector = 7;
+          break;
+        }
+        case 20:
+        case 21:
+        case 22: {
+          sector = 8;
+          break;
+        }
+        default:;
       };
-    } // end phase 0/1
+    }  // end phase 0/1
 
-  } else if (theLayer==4) {
- 
-    if(phase1) { // phase 1
+  } else if (theLayer == 4) {
+    if (phase1) {  // phase 1
       switch (theLadder) {
-      case  1 : case  2: case  3:  case  4: {sector = 1; break;}
-      case  5 : case  6: case  7:  case  8: {sector = 2; break;}
-      case  9 : case 10: case 11:  case 12: {sector = 3; break;}
-      case 13 : case 14: case 15:  case 16: {sector = 4; break;}
-      case 17 : case 18: case 19:  case 20: {sector = 5; break;}
-      case 21 : case 22: case 23:  case 24: {sector = 6; break;}
-      case 25 : case 26: case 27:  case 28: {sector = 7; break;}
-      case 29 : case 30: case 31:  case 32: {sector = 8; break;}
-      default: ;
+        case 1:
+        case 2:
+        case 3:
+        case 4: {
+          sector = 1;
+          break;
+        }
+        case 5:
+        case 6:
+        case 7:
+        case 8: {
+          sector = 2;
+          break;
+        }
+        case 9:
+        case 10:
+        case 11:
+        case 12: {
+          sector = 3;
+          break;
+        }
+        case 13:
+        case 14:
+        case 15:
+        case 16: {
+          sector = 4;
+          break;
+        }
+        case 17:
+        case 18:
+        case 19:
+        case 20: {
+          sector = 5;
+          break;
+        }
+        case 21:
+        case 22:
+        case 23:
+        case 24: {
+          sector = 6;
+          break;
+        }
+        case 25:
+        case 26:
+        case 27:
+        case 28: {
+          sector = 7;
+          break;
+        }
+        case 29:
+        case 30:
+        case 31:
+        case 32: {
+          sector = 8;
+          break;
+        }
+        default:;
       };
-    } // end phase1
+    }  // end phase1
 
-  } // layer
+  }  // layer
 
   return sector;
-
 }
 
-bool PixelBarrelName::isHalfModule() const 
-{
+bool PixelBarrelName::isHalfModule() const {
   bool halfModule = false;
 
-  if(!phase1) {
-    if (theLadder == 1) halfModule = true;
-    if (theLayer == 1 && theLadder == 10) halfModule = true;
-    if (theLayer == 2 && theLadder == 16) halfModule = true;
-    if (theLayer == 3 && theLadder == 22) halfModule = true;
+  if (!phase1) {
+    if (theLadder == 1)
+      halfModule = true;
+    if (theLayer == 1 && theLadder == 10)
+      halfModule = true;
+    if (theLayer == 2 && theLadder == 16)
+      halfModule = true;
+    if (theLayer == 3 && theLadder == 22)
+      halfModule = true;
   }
   return halfModule;
 }
 
-PixelModuleName::ModuleType  PixelBarrelName::moduleType() const 
-{
+PixelModuleName::ModuleType PixelBarrelName::moduleType() const {
   return isHalfModule() ? PixelBarrelName::v1x8 : PixelBarrelName::v2x8;
 }
 
-bool PixelBarrelName::operator==(const PixelModuleName &o) const
-{
-  if ( o.isBarrel() ) { 
-    const PixelBarrelName *other = dynamic_cast<const PixelBarrelName*>(&o);
-    return (    other
-             && thePart   == other->thePart 
-             && theLayer  == other->theLayer 
-             && theModule == other->theModule 
-             && theLadder == other->theLadder);
-  } else return false; 
+bool PixelBarrelName::operator==(const PixelModuleName& o) const {
+  if (o.isBarrel()) {
+    const PixelBarrelName* other = dynamic_cast<const PixelBarrelName*>(&o);
+    return (other && thePart == other->thePart && theLayer == other->theLayer && theModule == other->theModule &&
+            theLadder == other->theLadder);
+  } else
+    return false;
 }
 
-string PixelBarrelName::name() const 
-{
-   std::ostringstream stm;
-   
-   stm<<"BPix_B"<<thePart<<"_SEC"<<sectorName()<<"_LYR"<<theLayer<<"_LDR"<<theLadder;
-   if ( isHalfModule() ) stm <<"H"; else stm <<"F";
-   stm << "_MOD" << theModule;
+string PixelBarrelName::name() const {
+  std::ostringstream stm;
+
+  stm << "BPix_B" << thePart << "_SEC" << sectorName() << "_LYR" << theLayer << "_LDR" << theLadder;
+  if (isHalfModule())
+    stm << "H";
+  else
+    stm << "F";
+  stm << "_MOD" << theModule;
 
-   return stm.str();
+  return stm.str();
 }
 
 // return the DetId, uses the new topology class
@@ -486,8 +754,9 @@ DetId PixelBarrelName::getDetId(const TrackerTopology* tt) {
   // translate the ladder number from the naming convention to the cmssw convention
   bool outer = false;
   Shell shell = thePart;
-  int ind=0;
-  if(phase1) ind=1;
+  int ind = 0;
+  if (phase1)
+    ind = 1;
   outer = (shell == mO) || (shell == pO);
   if (outer) {
     if (layer == 1)
@@ -498,37 +767,44 @@ DetId PixelBarrelName::getDetId(const TrackerTopology* tt) {
       ladder = tmpLadder + lL[ind][6];
     else if (layer == 4)
       ladder = tmpLadder + lL[ind][9];
-  } // outer
-  else { // inner
+  }       // outer
+  else {  // inner
     if (layer == 1) {
-      if (tmpLadder <= lL[ind][0]) ladder = (lL[ind][0]+1) - tmpLadder;
-      else                         ladder =  lL[ind][2]    - tmpLadder;
+      if (tmpLadder <= lL[ind][0])
+        ladder = (lL[ind][0] + 1) - tmpLadder;
+      else
+        ladder = lL[ind][2] - tmpLadder;
     } else if (layer == 2) {
-      if (tmpLadder <= lL[ind][3]) ladder = (lL[ind][3]+1) - tmpLadder;
-      else                         ladder =  lL[ind][5]    - tmpLadder;
+      if (tmpLadder <= lL[ind][3])
+        ladder = (lL[ind][3] + 1) - tmpLadder;
+      else
+        ladder = lL[ind][5] - tmpLadder;
     } else if (layer == 3) {
-      if (tmpLadder <= lL[ind][6]) ladder = (lL[ind][6]+1) - tmpLadder;
-      else                         ladder =  lL[ind][8]    - tmpLadder;
+      if (tmpLadder <= lL[ind][6])
+        ladder = (lL[ind][6] + 1) - tmpLadder;
+      else
+        ladder = lL[ind][8] - tmpLadder;
     } else if (layer == 4) {
-      if (tmpLadder <= lL[ind][9]) ladder = (lL[ind][9]+1) - tmpLadder;
-      else                         ladder =  lL[ind][11]   - tmpLadder;
-    } // layer 
-  } // inner
+      if (tmpLadder <= lL[ind][9])
+        ladder = (lL[ind][9] + 1) - tmpLadder;
+      else
+        ladder = lL[ind][11] - tmpLadder;
+    }  // layer
+  }    // inner
 
   // translate the module number from naming convention to cmssw convention
   // numbering starts at positive z
   if (shell == pO || shell == pI)
     module = tmpModule + 4;
-  else // negative z side
+  else  // negative z side
     module = 5 - tmpModule;
 
   DetId id = tt->pxbDetId(layer, ladder, module);
   return id;
-}  
+}
 
 // return the pixel DetId, obsolete, uses the old index class
 PXBDetId PixelBarrelName::getDetId() {
-  
   uint32_t layer = 0;
   uint32_t ladder = 0;
   uint32_t module = 0;
@@ -542,75 +818,100 @@ PXBDetId PixelBarrelName::getDetId() {
   Shell shell = thePart;
   outer = (shell == mO) || (shell == pO);
 
-  if(phase1) { // phase 1
+  if (phase1) {  // phase 1
 
     if (outer) {  // outer
       if (layer == 1)
-	ladder = tmpLadder + 3;
+        ladder = tmpLadder + 3;
       else if (layer == 2)
-	ladder = tmpLadder + 7;
+        ladder = tmpLadder + 7;
       else if (layer == 3)
-	ladder = tmpLadder + 11;
+        ladder = tmpLadder + 11;
       else if (layer == 4)
-	ladder = tmpLadder + 16;
-    } else { // inner
+        ladder = tmpLadder + 16;
+    } else {  // inner
       if (layer == 1) {
-	if (tmpLadder <= 3) ladder = 4 - tmpLadder;
-	else if (tmpLadder <= 6) ladder = 16 - tmpLadder;
+        if (tmpLadder <= 3)
+          ladder = 4 - tmpLadder;
+        else if (tmpLadder <= 6)
+          ladder = 16 - tmpLadder;
       } else if (layer == 2) {
-	if (tmpLadder <= 7) ladder = 8 - tmpLadder;
-	else if (tmpLadder <= 14) ladder = 36 - tmpLadder;
+        if (tmpLadder <= 7)
+          ladder = 8 - tmpLadder;
+        else if (tmpLadder <= 14)
+          ladder = 36 - tmpLadder;
       } else if (layer == 3) {
-      if (tmpLadder <= 11) ladder = 12 - tmpLadder;
-      else if (tmpLadder <= 22) ladder = 56 - tmpLadder;
+        if (tmpLadder <= 11)
+          ladder = 12 - tmpLadder;
+        else if (tmpLadder <= 22)
+          ladder = 56 - tmpLadder;
       } else if (layer == 4) {
-	if (tmpLadder <= 16) ladder = 17 - tmpLadder;
-	else if (tmpLadder <= 32) ladder = 81 - tmpLadder;
-      } // layer 
-    } // inner
-
-  } else { // phase 0
-    if (outer) { // outer 
+        if (tmpLadder <= 16)
+          ladder = 17 - tmpLadder;
+        else if (tmpLadder <= 32)
+          ladder = 81 - tmpLadder;
+      }  // layer
+    }    // inner
+
+  } else {        // phase 0
+    if (outer) {  // outer
       if (layer == 1)
-	ladder = tmpLadder + 5;
+        ladder = tmpLadder + 5;
       else if (layer == 2)
-	ladder = tmpLadder + 8;
+        ladder = tmpLadder + 8;
       else if (layer == 3)
-	ladder = tmpLadder + 11;
-    } else { // inner
+        ladder = tmpLadder + 11;
+    } else {             // inner
       if (layer == 1) {  // layer 1
-	if (tmpLadder <= 5) ladder = 6 - tmpLadder;
-	else if (tmpLadder <= 10) ladder = 26 - tmpLadder;
-      } else if (layer == 2) { // layer 2
-	if (tmpLadder <= 8) ladder = 9 - tmpLadder;
-	else if (tmpLadder <= 16) ladder = 41 - tmpLadder;
-      } else if (layer == 3) { // layer 3
-	if (tmpLadder <= 11) ladder = 12 - tmpLadder;
-	else if (tmpLadder <= 22) ladder = 56 - tmpLadder;
-      } // end layer 
-    } // inner
-
-  } // phase
-
+        if (tmpLadder <= 5)
+          ladder = 6 - tmpLadder;
+        else if (tmpLadder <= 10)
+          ladder = 26 - tmpLadder;
+      } else if (layer == 2) {  // layer 2
+        if (tmpLadder <= 8)
+          ladder = 9 - tmpLadder;
+        else if (tmpLadder <= 16)
+          ladder = 41 - tmpLadder;
+      } else if (layer == 3) {  // layer 3
+        if (tmpLadder <= 11)
+          ladder = 12 - tmpLadder;
+        else if (tmpLadder <= 22)
+          ladder = 56 - tmpLadder;
+      }  // end layer
+    }    // inner
+
+  }  // phase
 
   // translate the module number from naming convention to cmssw convention
   // numbering starts at positive z
   if (shell == pO || shell == pI)
     module = tmpModule + 4;
-  else // negative z side
+  else  // negative z side
     module = 5 - tmpModule;
 
   return PXBDetId(layer, ladder, module);
-} 
+}
 
-std::ostream & operator<<( std::ostream& out, const PixelBarrelName::Shell& t)
-{
+std::ostream& operator<<(std::ostream& out, const PixelBarrelName::Shell& t) {
   switch (t) {
-    case(PixelBarrelName::pI) : {out << "pI"; break;}
-    case(PixelBarrelName::pO) : {out << "pO"; break;}
-    case(PixelBarrelName::mI) : {out << "mI"; break;}
-    case(PixelBarrelName::mO) : {out << "mO"; break;}
-    default: out << "unknown";
+    case (PixelBarrelName::pI): {
+      out << "pI";
+      break;
+    }
+    case (PixelBarrelName::pO): {
+      out << "pO";
+      break;
+    }
+    case (PixelBarrelName::mI): {
+      out << "mI";
+      break;
+    }
+    case (PixelBarrelName::mO): {
+      out << "mO";
+      break;
+    }
+    default:
+      out << "unknown";
   };
   return out;
 }
diff --git a/DataFormats/SiPixelDetId/src/PixelBarrelNameUpgrade.cc b/DataFormats/SiPixelDetId/src/PixelBarrelNameUpgrade.cc
index 8705169554339..0410e56047d24 100644
--- a/DataFormats/SiPixelDetId/src/PixelBarrelNameUpgrade.cc
+++ b/DataFormats/SiPixelDetId/src/PixelBarrelNameUpgrade.cc
@@ -8,50 +8,61 @@
 
 using namespace std;
 
-PixelBarrelNameUpgrade::PixelBarrelNameUpgrade(const DetId & id) 
-  : PixelModuleName(true)
-{
- 
-//  uint32_t rawId = id.rawId(); 
+PixelBarrelNameUpgrade::PixelBarrelNameUpgrade(const DetId& id) : PixelModuleName(true) {
+  //  uint32_t rawId = id.rawId();
   PXBDetId cmssw_numbering(id);
 
-
   theLayer = cmssw_numbering.layer();
 
-  int oldModule = cmssw_numbering.module() -4; if (oldModule<=0) oldModule--;	// -4, ..., -1, +1, ...,+4
+  int oldModule = cmssw_numbering.module() - 4;
+  if (oldModule <= 0)
+    oldModule--;  // -4, ..., -1, +1, ...,+4
 
   int oldLadder = cmssw_numbering.ladder();
 
   if (theLayer == 1) {
-    if (oldLadder <= 3) oldLadder = 4-oldLadder;				// +1, ..., +3
-    else if (oldLadder >= 4 && oldLadder <= 9 ) oldLadder = 3-oldLadder;	// -1, ..., -6
-    else if (oldLadder >= 10) oldLadder = 16-oldLadder;				// +6, ..., +4
-  } 
-  else if (theLayer == 2) {
-    if (oldLadder <= 7) oldLadder = 8-oldLadder;
-    else if (oldLadder >= 8 && oldLadder <= 21) oldLadder = 7-oldLadder;
-    else if (oldLadder >= 22) oldLadder = 36-oldLadder; 
-  } 
-  else if (theLayer == 3) {
-    if (oldLadder <= 11) oldLadder = 12-oldLadder;
-    else if (oldLadder >= 12 && oldLadder <= 33) oldLadder = 11-oldLadder;
-    else if (oldLadder >= 34) oldLadder = 56-oldLadder;
-  } 
-  else if (theLayer == 4) {
-    if (oldLadder <= 16) oldLadder = 17-oldLadder;
-    else if (oldLadder >= 17 && oldLadder <= 48) oldLadder = 16-oldLadder;
-    else if (oldLadder >= 49) oldLadder = 81-oldLadder;
-  } 
-  
+    if (oldLadder <= 3)
+      oldLadder = 4 - oldLadder;  // +1, ..., +3
+    else if (oldLadder >= 4 && oldLadder <= 9)
+      oldLadder = 3 - oldLadder;  // -1, ..., -6
+    else if (oldLadder >= 10)
+      oldLadder = 16 - oldLadder;  // +6, ..., +4
+  } else if (theLayer == 2) {
+    if (oldLadder <= 7)
+      oldLadder = 8 - oldLadder;
+    else if (oldLadder >= 8 && oldLadder <= 21)
+      oldLadder = 7 - oldLadder;
+    else if (oldLadder >= 22)
+      oldLadder = 36 - oldLadder;
+  } else if (theLayer == 3) {
+    if (oldLadder <= 11)
+      oldLadder = 12 - oldLadder;
+    else if (oldLadder >= 12 && oldLadder <= 33)
+      oldLadder = 11 - oldLadder;
+    else if (oldLadder >= 34)
+      oldLadder = 56 - oldLadder;
+  } else if (theLayer == 4) {
+    if (oldLadder <= 16)
+      oldLadder = 17 - oldLadder;
+    else if (oldLadder >= 17 && oldLadder <= 48)
+      oldLadder = 16 - oldLadder;
+    else if (oldLadder >= 49)
+      oldLadder = 81 - oldLadder;
+  }
+
   //
   // part
   //
-  if      (oldModule < 0 && oldLadder < 0) thePart = mO; 
-  else if (oldModule > 0 && oldLadder < 0) thePart = pO;  
-  else if (oldModule < 0 && oldLadder > 0) thePart = mI; 
-  else if (oldModule > 0 && oldLadder > 0) thePart = pI; 
+  if (oldModule < 0 && oldLadder < 0)
+    thePart = mO;
+  else if (oldModule > 0 && oldLadder < 0)
+    thePart = pO;
+  else if (oldModule < 0 && oldLadder > 0)
+    thePart = mI;
+  else if (oldModule > 0 && oldLadder > 0)
+    thePart = pI;
   //std::cout << "(oldModule, oldLadder)============(" << oldModule << ", "<< oldLadder<<" )" << std::endl;
-  
+
   //
   // ladder
   //
@@ -61,26 +72,19 @@ PixelBarrelNameUpgrade::PixelBarrelNameUpgrade(const DetId & id)
   // module
   //
   theModule = abs(oldModule);
- 
 }
 
-
 // constructor from name string
-PixelBarrelNameUpgrade::PixelBarrelNameUpgrade(std::string name) 
-  : PixelModuleName(true), thePart(mO), theLayer(0),
-    theModule(0), theLadder(0) {
-  std::cout<<"NAME="<<name<<std::endl;
+PixelBarrelNameUpgrade::PixelBarrelNameUpgrade(std::string name)
+    : PixelModuleName(true), thePart(mO), theLayer(0), theModule(0), theLadder(0) {
+  std::cout << "NAME=" << name << std::endl;
   // parse the name string
   // first, check to make sure this is an BPix name, should start with "BPix_"
   // also check to make sure the needed parts are present
-  if ( (name.substr(0, 5) != "BPix_") ||
-       (name.find("_B") == string::npos) || 
-       (name.find("_LYR") == string::npos) ||
-       (name.find("_LDR") == string::npos) || 
-       (name.find("_MOD") == string::npos) ) {
-    edm::LogError ("BadNameString|SiPixel") 
-      << "Bad name string in PixelBarrelNameUpgrade::PixelBarrelName(std::string): "
-      << name;
+  if ((name.substr(0, 5) != "BPix_") || (name.find("_B") == string::npos) || (name.find("_LYR") == string::npos) ||
+      (name.find("_LDR") == string::npos) || (name.find("_MOD") == string::npos)) {
+    edm::LogError("BadNameString|SiPixel")
+        << "Bad name string in PixelBarrelNameUpgrade::PixelBarrelName(std::string): " << name;
     return;
   }
 
@@ -89,163 +93,293 @@ PixelBarrelNameUpgrade::PixelBarrelNameUpgrade(std::string name)
     name = name.substr(0, name.find("_ROC"));
 
   // find shell
-  string shellString = name.substr(name.find("_B")+2, name.find("_SEC")-name.find("_B")-2);
-  if (shellString == "mO") thePart = mO;
-  else if (shellString == "mI") thePart = mI;
-  else if (shellString == "pO") thePart = pO;
-  else if (shellString == "pI") thePart = pI;
+  string shellString = name.substr(name.find("_B") + 2, name.find("_SEC") - name.find("_B") - 2);
+  if (shellString == "mO")
+    thePart = mO;
+  else if (shellString == "mI")
+    thePart = mI;
+  else if (shellString == "pO")
+    thePart = pO;
+  else if (shellString == "pI")
+    thePart = pI;
   else {
-    edm::LogError ("BadNameString|SiPixel")
-      << "Unable to determine shell in PixelBarrelNameUpgrade::PixelBarrelName(std::string): "
-      << name;
+    edm::LogError("BadNameString|SiPixel")
+        << "Unable to determine shell in PixelBarrelNameUpgrade::PixelBarrelName(std::string): " << name;
   }
 
   // find the layer
-  string layerString = name.substr(name.find("_LYR")+4, name.find("_LDR")-name.find("_LYR")-4);
-  if (layerString == "1") theLayer = 1;
-  else if (layerString == "2") theLayer = 2;
-  else if (layerString == "3") theLayer = 3;
-  else if (layerString == "4") theLayer = 4;
+  string layerString = name.substr(name.find("_LYR") + 4, name.find("_LDR") - name.find("_LYR") - 4);
+  if (layerString == "1")
+    theLayer = 1;
+  else if (layerString == "2")
+    theLayer = 2;
+  else if (layerString == "3")
+    theLayer = 3;
+  else if (layerString == "4")
+    theLayer = 4;
   else {
-    edm::LogError ("BadNameString|SiPixel")
-      << "Unable to determine layer in PixelBarrelNameUpgrade::PixelBarrelName(std::string): "
-      << name;
+    edm::LogError("BadNameString|SiPixel")
+        << "Unable to determine layer in PixelBarrelNameUpgrade::PixelBarrelName(std::string): " << name;
   }
-  
+
   // find the ladder
-  string ladderString = name.substr(name.find("_LDR")+4, name.find("_MOD")-name.find("_LDR")-4);
-  if (ladderString.substr(ladderString.size()-1, 1) == "F") {
-    int ladderNum = atoi(ladderString.substr(0, ladderString.size() -1).c_str());
-    if (theLayer == 1 && ladderNum >= 1 && ladderNum <= 6) theLadder = ladderNum;
-    else if (theLayer == 2 && ladderNum >= 1 && ladderNum <= 14) theLadder = ladderNum;
-    else if (theLayer == 3 && ladderNum >= 1 && ladderNum <= 22) theLadder = ladderNum;
-    else if (theLayer == 4 && ladderNum >= 1 && ladderNum <= 32) theLadder = ladderNum;
+  string ladderString = name.substr(name.find("_LDR") + 4, name.find("_MOD") - name.find("_LDR") - 4);
+  if (ladderString.substr(ladderString.size() - 1, 1) == "F") {
+    int ladderNum = atoi(ladderString.substr(0, ladderString.size() - 1).c_str());
+    if (theLayer == 1 && ladderNum >= 1 && ladderNum <= 6)
+      theLadder = ladderNum;
+    else if (theLayer == 2 && ladderNum >= 1 && ladderNum <= 14)
+      theLadder = ladderNum;
+    else if (theLayer == 3 && ladderNum >= 1 && ladderNum <= 22)
+      theLadder = ladderNum;
+    else if (theLayer == 4 && ladderNum >= 1 && ladderNum <= 32)
+      theLadder = ladderNum;
     else {
-      edm::LogError ("BadNameString|SiPixel")
-	<< "Unable to determine ladder in PixelBarrelNameUpgrade::PixelBarrelName(std::string): "
-	<< name;
+      edm::LogError("BadNameString|SiPixel")
+          << "Unable to determine ladder in PixelBarrelNameUpgrade::PixelBarrelName(std::string): " << name;
     }
-  } // full ladders
+  }  // full ladders
   else {
-    edm::LogError ("BadNameString|SiPixel")
-      << "Unable to determine ladder in PixelBarrelNameUpgrade::PixelBarrelName(std::string): "
-      << name;
+    edm::LogError("BadNameString|SiPixel")
+        << "Unable to determine ladder in PixelBarrelNameUpgrade::PixelBarrelName(std::string): " << name;
   }
 
   // find the module
-  string moduleString = name.substr(name.find("_MOD")+4, name.size()-name.find("_MOD")-4);
-  if (moduleString == "1") theModule = 1;
-  else if (moduleString == "2") theModule = 2;
-  else if (moduleString == "3") theModule = 3;
-  else if (moduleString == "4") theModule = 4;
+  string moduleString = name.substr(name.find("_MOD") + 4, name.size() - name.find("_MOD") - 4);
+  if (moduleString == "1")
+    theModule = 1;
+  else if (moduleString == "2")
+    theModule = 2;
+  else if (moduleString == "3")
+    theModule = 3;
+  else if (moduleString == "4")
+    theModule = 4;
   else {
-    edm::LogError ("BadNameString|SiPixel")
-      << "Unable to determine module in PixelBarrelNameUpgrade::PixelBarrelName(std::string): "
-      << name;
+    edm::LogError("BadNameString|SiPixel")
+        << "Unable to determine module in PixelBarrelNameUpgrade::PixelBarrelName(std::string): " << name;
   }
 
-} // PixelBarrelNameUpgrade::PixelBarrelName(std::string name)
-
+}  // PixelBarrelNameUpgrade::PixelBarrelName(std::string name)
 
-int PixelBarrelNameUpgrade::sectorName() const
-{
+int PixelBarrelNameUpgrade::sectorName() const {
   int sector = 0;
-  if (theLayer==1) {
+  if (theLayer == 1) {
     switch (theLadder) {
-    case 1 :  {sector = 1; break;}
-    case 2 :  {sector = 2; break;}
-    case 3 :  {sector = 3; break;}
-    case 4 :  {sector = 6; break;}
-    case 5 :  {sector = 7; break;}
-    case 6 :  {sector = 8; break;}
-    default: ;
+      case 1: {
+        sector = 1;
+        break;
+      }
+      case 2: {
+        sector = 2;
+        break;
+      }
+      case 3: {
+        sector = 3;
+        break;
+      }
+      case 4: {
+        sector = 6;
+        break;
+      }
+      case 5: {
+        sector = 7;
+        break;
+      }
+      case 6: {
+        sector = 8;
+        break;
+      }
+      default:;
     };
-  } else if (theLayer==2) {
+  } else if (theLayer == 2) {
     switch (theLadder) {
-    case  1 : case  2: {sector = 1; break;}
-    case  3 : case  4: {sector = 2; break;}
-    case  5 : case  6: {sector = 3; break;}
-    case  7 :          {sector = 4; break;}
-    case  8 : 	       {sector = 5; break;}
-    case  9 : case 10: {sector = 6; break;}
-    case 11 : case 12: {sector = 7; break;}
-    case 13 : case 14: {sector = 8; break;}    
-    default: ;
+      case 1:
+      case 2: {
+        sector = 1;
+        break;
+      }
+      case 3:
+      case 4: {
+        sector = 2;
+        break;
+      }
+      case 5:
+      case 6: {
+        sector = 3;
+        break;
+      }
+      case 7: {
+        sector = 4;
+        break;
+      }
+      case 8: {
+        sector = 5;
+        break;
+      }
+      case 9:
+      case 10: {
+        sector = 6;
+        break;
+      }
+      case 11:
+      case 12: {
+        sector = 7;
+        break;
+      }
+      case 13:
+      case 14: {
+        sector = 8;
+        break;
+      }
+      default:;
     };
-  } else if (theLayer==3) {
+  } else if (theLayer == 3) {
     switch (theLadder) {
-    case  1 : case  2: case  3: {sector = 1; break;}
-    case  4 : case  5: case  6: {sector = 2; break;}
-    case  7 : case  8: case  9: {sector = 3; break;}
-    case 10 : case 11:          {sector = 4; break;}
-    case 12 : case 13:          {sector = 5; break;}
-    case 14 : case 15: case 16: {sector = 6; break;}
-    case 17 : case 18: case 19: {sector = 7; break;}
-    case 20 : case 21: case 22: {sector = 8; break;}
-    default: ;
+      case 1:
+      case 2:
+      case 3: {
+        sector = 1;
+        break;
+      }
+      case 4:
+      case 5:
+      case 6: {
+        sector = 2;
+        break;
+      }
+      case 7:
+      case 8:
+      case 9: {
+        sector = 3;
+        break;
+      }
+      case 10:
+      case 11: {
+        sector = 4;
+        break;
+      }
+      case 12:
+      case 13: {
+        sector = 5;
+        break;
+      }
+      case 14:
+      case 15:
+      case 16: {
+        sector = 6;
+        break;
+      }
+      case 17:
+      case 18:
+      case 19: {
+        sector = 7;
+        break;
+      }
+      case 20:
+      case 21:
+      case 22: {
+        sector = 8;
+        break;
+      }
+      default:;
     };
-  }
-   else if (theLayer==4) {
+  } else if (theLayer == 4) {
     switch (theLadder) {
-    case  1 : case  2: case  3:  case  4: {sector = 1; break;}
-    case  5 : case  6: case  7:  case  8: {sector = 2; break;}
-    case  9 : case 10: case 11:  case 12: {sector = 3; break;}
-    case 13 : case 14: case 15:  case 16: {sector = 4; break;}
-    case 17 : case 18: case 19:  case 20: {sector = 5; break;}
-    case 21 : case 22: case 23:  case 24: {sector = 6; break;}
-    case 25 : case 26: case 27:  case 28: {sector = 7; break;}
-    case 29 : case 30: case 31:  case 32: {sector = 8; break;}
-    default: ;
+      case 1:
+      case 2:
+      case 3:
+      case 4: {
+        sector = 1;
+        break;
+      }
+      case 5:
+      case 6:
+      case 7:
+      case 8: {
+        sector = 2;
+        break;
+      }
+      case 9:
+      case 10:
+      case 11:
+      case 12: {
+        sector = 3;
+        break;
+      }
+      case 13:
+      case 14:
+      case 15:
+      case 16: {
+        sector = 4;
+        break;
+      }
+      case 17:
+      case 18:
+      case 19:
+      case 20: {
+        sector = 5;
+        break;
+      }
+      case 21:
+      case 22:
+      case 23:
+      case 24: {
+        sector = 6;
+        break;
+      }
+      case 25:
+      case 26:
+      case 27:
+      case 28: {
+        sector = 7;
+        break;
+      }
+      case 29:
+      case 30:
+      case 31:
+      case 32: {
+        sector = 8;
+        break;
+      }
+      default:;
     };
   }
-  
-  
-  return sector;
 
+  return sector;
 }
 
 //---- this needs to be removed --------------------------------
 //---- there is no half module in the upgraded geometry!!! -----
-bool PixelBarrelNameUpgrade::isHalfModule() const 
-{
+bool PixelBarrelNameUpgrade::isHalfModule() const {
   bool halfModule = false;
-//  if (theLadder == 1) halfModule = true;
-//  if (theLayer == 1 && theLadder == 10) halfModule = true;
-//  if (theLayer == 2 && theLadder == 16) halfModule = true;
-//  if (theLayer == 3 && theLadder == 22) halfModule = true;
+  //  if (theLadder == 1) halfModule = true;
+  //  if (theLayer == 1 && theLadder == 10) halfModule = true;
+  //  if (theLayer == 2 && theLadder == 16) halfModule = true;
+  //  if (theLayer == 3 && theLadder == 22) halfModule = true;
   return halfModule;
 }
 
-
-PixelModuleName::ModuleType  PixelBarrelNameUpgrade::moduleType() const 
-{
+PixelModuleName::ModuleType PixelBarrelNameUpgrade::moduleType() const {
   return isHalfModule() ? PixelBarrelNameUpgrade::v1x8 : PixelBarrelNameUpgrade::v2x8;
 }
 
-
-
-bool PixelBarrelNameUpgrade::operator==(const PixelModuleName &o) const
-{
-  if ( o.isBarrel() ) { 
-    const PixelBarrelNameUpgrade *other = dynamic_cast<const PixelBarrelNameUpgrade*>(&o);
-    return (    other
-             && thePart   == other->thePart 
-             && theLayer  == other->theLayer 
-             && theModule == other->theModule 
-             && theLadder == other->theLadder);
-  } else return false; 
+bool PixelBarrelNameUpgrade::operator==(const PixelModuleName& o) const {
+  if (o.isBarrel()) {
+    const PixelBarrelNameUpgrade* other = dynamic_cast<const PixelBarrelNameUpgrade*>(&o);
+    return (other && thePart == other->thePart && theLayer == other->theLayer && theModule == other->theModule &&
+            theLadder == other->theLadder);
+  } else
+    return false;
 }
 
+string PixelBarrelNameUpgrade::name() const {
+  std::ostringstream stm;
 
-string PixelBarrelNameUpgrade::name() const 
-{
-   std::ostringstream stm;
-   
-   stm<<"BPix_B"<<thePart<<"_SEC"<<sectorName()<<"_LYR"<<theLayer<<"_LDR"<<theLadder;
-   stm <<"F";
-   stm << "_MOD" << theModule;
-   
-   return stm.str();
+  stm << "BPix_B" << thePart << "_SEC" << sectorName() << "_LYR" << theLayer << "_LDR" << theLadder;
+  stm << "F";
+  stm << "_MOD" << theModule;
+
+  return stm.str();
 }
 /*
 string PixelBarrelNameUpgrade::name() const 
@@ -262,7 +396,6 @@ string PixelBarrelNameUpgrade::name() const
 
 // return the DetId
 PXBDetId PixelBarrelNameUpgrade::getDetId() {
-  
   uint32_t layer = 0;
   uint32_t ladder = 0;
   uint32_t module = 0;
@@ -284,49 +417,65 @@ PXBDetId PixelBarrelNameUpgrade::getDetId() {
       ladder = tmpLadder + 11;
     else if (layer == 4)
       ladder = tmpLadder + 16;
-  } // outer
-  else { // inner
+  }       // outer
+  else {  // inner
     if (layer == 1) {
-      if (tmpLadder <= 3) ladder = 4 - tmpLadder;
-      else if (tmpLadder <= 6) ladder = 16 - tmpLadder;
-    } // layer 1
+      if (tmpLadder <= 3)
+        ladder = 4 - tmpLadder;
+      else if (tmpLadder <= 6)
+        ladder = 16 - tmpLadder;
+    }  // layer 1
     else if (layer == 2) {
-      if (tmpLadder <= 7) ladder = 8 - tmpLadder;
-      else if (tmpLadder <= 14) ladder = 36 - tmpLadder;
-    } // layer 2
+      if (tmpLadder <= 7)
+        ladder = 8 - tmpLadder;
+      else if (tmpLadder <= 14)
+        ladder = 36 - tmpLadder;
+    }  // layer 2
     else if (layer == 3) {
-      if (tmpLadder <= 11) ladder = 12 - tmpLadder;
-      else if (tmpLadder <= 22) ladder = 56 - tmpLadder;
-    } // layer 3
+      if (tmpLadder <= 11)
+        ladder = 12 - tmpLadder;
+      else if (tmpLadder <= 22)
+        ladder = 56 - tmpLadder;
+    }  // layer 3
     else if (layer == 4) {
-      if (tmpLadder <= 16) ladder = 17 - tmpLadder;
-      else if (tmpLadder <= 32) ladder = 81 - tmpLadder;
-    } // layer 4
-  } // inner
+      if (tmpLadder <= 16)
+        ladder = 17 - tmpLadder;
+      else if (tmpLadder <= 32)
+        ladder = 81 - tmpLadder;
+    }  // layer 4
+  }    // inner
 
   // translate the module number from naming convention to cmssw convention
   // numbering starts at positive z
   if (shell == pO || shell == pI)
     module = tmpModule + 4;
-  else // negative z side
+  else  // negative z side
     module = 5 - tmpModule;
 
   return PXBDetId(layer, ladder, module);
 
-} // PXBDetId PixelBarrelNameUpgrade::getDetId()
+}  // PXBDetId PixelBarrelNameUpgrade::getDetId()
 
-
-
-std::ostream & operator<<( std::ostream& out, const PixelBarrelNameUpgrade::Shell& t)
-{
+std::ostream& operator<<(std::ostream& out, const PixelBarrelNameUpgrade::Shell& t) {
   switch (t) {
-    case(PixelBarrelNameUpgrade::pI) : {out << "pI"; break;}
-    case(PixelBarrelNameUpgrade::pO) : {out << "pO"; break;}
-    case(PixelBarrelNameUpgrade::mI) : {out << "mI"; break;}
-    case(PixelBarrelNameUpgrade::mO) : {out << "mO"; break;}
-    default: out << "unknown";
+    case (PixelBarrelNameUpgrade::pI): {
+      out << "pI";
+      break;
+    }
+    case (PixelBarrelNameUpgrade::pO): {
+      out << "pO";
+      break;
+    }
+    case (PixelBarrelNameUpgrade::mI): {
+      out << "mI";
+      break;
+    }
+    case (PixelBarrelNameUpgrade::mO): {
+      out << "mO";
+      break;
+    }
+    default:
+      out << "unknown";
   };
   return out;
 }
-
-
diff --git a/DataFormats/SiPixelDetId/src/PixelChannelIdentifier.cc b/DataFormats/SiPixelDetId/src/PixelChannelIdentifier.cc
index fb623ca0d5192..ac24c141e9232 100644
--- a/DataFormats/SiPixelDetId/src/PixelChannelIdentifier.cc
+++ b/DataFormats/SiPixelDetId/src/PixelChannelIdentifier.cc
@@ -2,7 +2,6 @@
 //
 #include "DataFormats/SiPixelDetId/interface/PixelChannelIdentifier.h"
 
-
 /*
 // Extract from CMSIM manual (version Thu Jul 31 16:38:50 MET DST 1997)
 // --------------------------------------------------------------------
@@ -30,4 +29,4 @@
 */
 
 // Initialization of static data members - DEFINES DIGI PACKING !
-const PixelChannelIdentifier::Packing PixelChannelIdentifier::thePacking( 11, 11, 0, 10); // row, col, time, adc
+const PixelChannelIdentifier::Packing PixelChannelIdentifier::thePacking(11, 11, 0, 10);  // row, col, time, adc
diff --git a/DataFormats/SiPixelDetId/src/PixelEndcapName.cc b/DataFormats/SiPixelDetId/src/PixelEndcapName.cc
index c6e7f2f43c2fc..988b703e4857c 100644
--- a/DataFormats/SiPixelDetId/src/PixelEndcapName.cc
+++ b/DataFormats/SiPixelDetId/src/PixelEndcapName.cc
@@ -8,190 +8,185 @@ using namespace std;
 
 namespace {
   //const bool phase1 = false;
-  const bool pilot_blade = false;  
-}
+  const bool pilot_blade = false;
+}  // namespace
 
 // Decodes the pixel name from the cmssw DetID, uses tracker topology
-PixelEndcapName::PixelEndcapName(const DetId & id, const TrackerTopology* tt, bool phase)
-  : PixelModuleName(false), thePart(mO), theDisk(0), 
-    theBlade(0), thePannel(0), thePlaquette(0), phase1(phase) {
-
-
+PixelEndcapName::PixelEndcapName(const DetId& id, const TrackerTopology* tt, bool phase)
+    : PixelModuleName(false), thePart(mO), theDisk(0), theBlade(0), thePannel(0), thePlaquette(0), phase1(phase) {
   //PXFDetId cmssw_numbering(id);
-  int side     = tt->pxfSide(id);
+  int side = tt->pxfSide(id);
   int tmpBlade = tt->pxfBlade(id);
-  theDisk      = tt->pxfDisk(id);
-  thePannel    = tt->pxfPanel(id);
-  bool outer = false;   // outer means with respect to the LHC ring (x - axis) Bm(p)I/O
+  theDisk = tt->pxfDisk(id);
+  thePannel = tt->pxfPanel(id);
+  bool outer = false;  // outer means with respect to the LHC ring (x - axis) Bm(p)I/O
 
-  if(phase1) {  // phase 1
+  if (phase1) {  // phase 1
 
-    int ring=0; // ring number , according to radius, 1-lower, 2- higher
+    int ring = 0;  // ring number , according to radius, 1-lower, 2- higher
 
-    if (tmpBlade>=7 && tmpBlade<=17) {  // ring 1, O
+    if (tmpBlade >= 7 && tmpBlade <= 17) {  // ring 1, O
       outer = true;
-      theBlade = tmpBlade-6;                      //7...17-->1...11
-      ring = 1;   // lower radius
+      theBlade = tmpBlade - 6;  //7...17-->1...11
+      ring = 1;                 // lower radius
 
-    } else if( tmpBlade<=6 ) {  // ring 1, I
-      theBlade = 7-tmpBlade;                      //1...6-->6...1
-      ring=1;
+    } else if (tmpBlade <= 6) {  // ring 1, I
+      theBlade = 7 - tmpBlade;   //1...6-->6...1
+      ring = 1;
 
-    } else if( tmpBlade>=18 && tmpBlade<=22 ) {  // ring 1, I
-      theBlade = 29-tmpBlade;                     //18...22-->11...7
-      ring=1;
+    } else if (tmpBlade >= 18 && tmpBlade <= 22) {  // ring 1, I
+      theBlade = 29 - tmpBlade;                     //18...22-->11...7
+      ring = 1;
 
-    } else if (tmpBlade>=32 && tmpBlade<=48) {  // ring 2, O
+    } else if (tmpBlade >= 32 && tmpBlade <= 48) {  // ring 2, O
       outer = true;
-      theBlade = tmpBlade-31;                     //32...48-->28...12
-      ring=2;  // higher radius
+      theBlade = tmpBlade - 31;  //32...48-->28...12
+      ring = 2;                  // higher radius
 
-    } else if( tmpBlade>=23 && tmpBlade<=31 ) { // ring 2, I
-      theBlade = 32-tmpBlade;                     //23...31-->9...1
-      ring=2;
+    } else if (tmpBlade >= 23 && tmpBlade <= 31) {  // ring 2, I
+      theBlade = 32 - tmpBlade;                     //23...31-->9...1
+      ring = 2;
 
-    } else if( tmpBlade>=49 && tmpBlade<=56 ) { // ring 2, I
-      theBlade = 66-tmpBlade;                     //49...56-->28...21
-      ring=2;
+    } else if (tmpBlade >= 49 && tmpBlade <= 56) {  // ring 2, I
+      theBlade = 66 - tmpBlade;                     //49...56-->28...21
+      ring = 2;
 
-    } //  end
+    }  //  end
 
     thePlaquette = ring;
 
-
-  } else { // phase0
+  } else {  // phase0
 
     // hack for the pilot blade
-    if(pilot_blade && theDisk==3 ) { // do only for disk 3
+    if (pilot_blade && theDisk == 3) {  // do only for disk 3
       //cout<<tmpBlade<<" "<<theDisk<<endl;
-      if(tmpBlade>=1 && tmpBlade<=4) {
-	// convert the sequential counting of pilot blades to std. cmssw convention
-	if(tmpBlade<3) tmpBlade +=3;
-	else  tmpBlade +=13;
+      if (tmpBlade >= 1 && tmpBlade <= 4) {
+        // convert the sequential counting of pilot blades to std. cmssw convention
+        if (tmpBlade < 3)
+          tmpBlade += 3;
+        else
+          tmpBlade += 13;
       } else {
-	edm::LogError ("Bad PilotBlade blade number ") 
-	  << tmpBlade;      
+        edm::LogError("Bad PilotBlade blade number ") << tmpBlade;
       }
     }
 
     if (tmpBlade >= 7 && tmpBlade <= 18) {
       outer = true;
-      theBlade = tmpBlade-6;
-    } else if( tmpBlade <=6 ) { 
-      theBlade = 7-tmpBlade; 
-    } else if( tmpBlade >= 19) { 
-      theBlade = 31-tmpBlade; 
-    } 
+      theBlade = tmpBlade - 6;
+    } else if (tmpBlade <= 6) {
+      theBlade = 7 - tmpBlade;
+    } else if (tmpBlade >= 19) {
+      theBlade = 31 - tmpBlade;
+    }
 
     thePlaquette = tt->pxfModule(id);  // ring number is coded as plaqutte (plaqs are unused)
-    
-  } // end phase1
 
-       if( side == 1 &&  outer ) thePart = mO;
-  else if( side == 1 && !outer ) thePart = mI;
-  else if( side == 2 &&  outer ) thePart = pO;
-  else if( side == 2 && !outer ) thePart = pI;
+  }  // end phase1
 
+  if (side == 1 && outer)
+    thePart = mO;
+  else if (side == 1 && !outer)
+    thePart = mI;
+  else if (side == 2 && outer)
+    thePart = pO;
+  else if (side == 2 && !outer)
+    thePart = pI;
 }
 
 // Decodes the pixel name from the cmssw DetID, uses old pixel name classes
-PixelEndcapName::PixelEndcapName(const DetId & id, bool phase)
-  : PixelModuleName(false), thePart(mO), theDisk(0), 
-    theBlade(0), thePannel(0), thePlaquette(0), phase1(phase) {
-
+PixelEndcapName::PixelEndcapName(const DetId& id, bool phase)
+    : PixelModuleName(false), thePart(mO), theDisk(0), theBlade(0), thePannel(0), thePlaquette(0), phase1(phase) {
   PXFDetId cmssw_numbering(id);
   int side = cmssw_numbering.side();
   int tmpBlade = cmssw_numbering.blade();
   theDisk = cmssw_numbering.disk();
-  thePannel = cmssw_numbering.panel();  
-  bool outer = false;   // outer means with respect to the LHC ring (x - axis)
+  thePannel = cmssw_numbering.panel();
+  bool outer = false;  // outer means with respect to the LHC ring (x - axis)
 
-  if(phase1) { // phase1
+  if (phase1) {  // phase1
 
-    int ring=0; // ring number , according to radius, 1-lower, 2- higher
+    int ring = 0;  // ring number , according to radius, 1-lower, 2- higher
 
-    if (tmpBlade>=7 && tmpBlade<=17) {  // ring 1, O
+    if (tmpBlade >= 7 && tmpBlade <= 17) {  // ring 1, O
       outer = true;
-      theBlade = tmpBlade-6;                      //7...17-->1...11
-      ring = 1;   // lower radius
+      theBlade = tmpBlade - 6;  //7...17-->1...11
+      ring = 1;                 // lower radius
 
-    } else if( tmpBlade<=6 ) {  // ring 1, I
-      theBlade = 7-tmpBlade;                      //1...6-->6...1
-      ring=1;
+    } else if (tmpBlade <= 6) {  // ring 1, I
+      theBlade = 7 - tmpBlade;   //1...6-->6...1
+      ring = 1;
 
-    } else if( tmpBlade>=18 && tmpBlade<=22 ) {  // ring 1, I
-      theBlade = 29-tmpBlade;                     //18...22-->11...7
-      ring=1;
+    } else if (tmpBlade >= 18 && tmpBlade <= 22) {  // ring 1, I
+      theBlade = 29 - tmpBlade;                     //18...22-->11...7
+      ring = 1;
 
-    } else if (tmpBlade>=32 && tmpBlade<=48) {  // ring 2, O
+    } else if (tmpBlade >= 32 && tmpBlade <= 48) {  // ring 2, O
       outer = true;
-      theBlade = tmpBlade-31;                     //32...48-->28...12
-      ring=2;  // higher radius
+      theBlade = tmpBlade - 31;  //32...48-->28...12
+      ring = 2;                  // higher radius
 
-    } else if( tmpBlade>=23 && tmpBlade<=31 ) { // ring 2, I
-      theBlade = 32-tmpBlade;                     //23...31-->9...1
-      ring=2;
+    } else if (tmpBlade >= 23 && tmpBlade <= 31) {  // ring 2, I
+      theBlade = 32 - tmpBlade;                     //23...31-->9...1
+      ring = 2;
 
-    } else if( tmpBlade>=49 && tmpBlade<=56 ) { // ring 2, I
-      theBlade = 66-tmpBlade;                     //49...56-->28...21
-      ring=2;
+    } else if (tmpBlade >= 49 && tmpBlade <= 56) {  // ring 2, I
+      theBlade = 66 - tmpBlade;                     //49...56-->28...21
+      ring = 2;
 
-    } //  end
+    }  //  end
 
     thePlaquette = ring;
 
-  } else { // phase 0
+  } else {  // phase 0
 
     // hack for the pilot blade
-    if(pilot_blade && theDisk==3 ) { // do only for disk 3
-      if(tmpBlade>=1 && tmpBlade<=4) {
-	// convert the sequential counting of pilot blades to std. cmssw convention
-	if(tmpBlade<3) tmpBlade +=3;
-	else  tmpBlade +=13;
+    if (pilot_blade && theDisk == 3) {  // do only for disk 3
+      if (tmpBlade >= 1 && tmpBlade <= 4) {
+        // convert the sequential counting of pilot blades to std. cmssw convention
+        if (tmpBlade < 3)
+          tmpBlade += 3;
+        else
+          tmpBlade += 13;
       } else {
-	edm::LogError ("Bad PilotBlade blade number ") 
-	  << tmpBlade;      
+        edm::LogError("Bad PilotBlade blade number ") << tmpBlade;
       }
     }
 
     if (tmpBlade >= 7 && tmpBlade <= 18) {
-      outer = true;   // outer means with respect to the LHC ring (x - axis)
-      theBlade = tmpBlade-6;
-    } else if( tmpBlade <=6 ) { 
-      theBlade = 7-tmpBlade; 
-    } else if( tmpBlade >= 19) { 
-      theBlade = 31-tmpBlade; 
+      outer = true;  // outer means with respect to the LHC ring (x - axis)
+      theBlade = tmpBlade - 6;
+    } else if (tmpBlade <= 6) {
+      theBlade = 7 - tmpBlade;
+    } else if (tmpBlade >= 19) {
+      theBlade = 31 - tmpBlade;
     }
 
     thePlaquette = cmssw_numbering.module();
- 
-  } // end phase1
-
-  if( side == 1 &&  outer ) thePart = mO;
-  else if( side == 1 && !outer ) thePart = mI;
-  else if( side == 2 &&  outer ) thePart = pO;
-  else if( side == 2 && !outer ) thePart = pI;
- 
+
+  }  // end phase1
+
+  if (side == 1 && outer)
+    thePart = mO;
+  else if (side == 1 && !outer)
+    thePart = mI;
+  else if (side == 2 && outer)
+    thePart = pO;
+  else if (side == 2 && !outer)
+    thePart = pI;
 }
 
 // constructor from name string
 PixelEndcapName::PixelEndcapName(std::string name, bool phase)
-  : PixelModuleName(false), thePart(mO), theDisk(0), 
-    theBlade(0), thePannel(0), thePlaquette(0), phase1(phase) {
-
+    : PixelModuleName(false), thePart(mO), theDisk(0), theBlade(0), thePannel(0), thePlaquette(0), phase1(phase) {
   // parse the name string
   // first, check to make sure this is an FPix name, should start with "FPix_"
   // also check to make sure the needed parts are present
-  if ( (name.substr(0, 5) != "FPix_") ||
-       (name.find("_B") == string::npos) || 
-       (name.find("_D") == string::npos) ||
-       (name.find("_BLD") == string::npos) || 
-       (name.find("_PNL") == string::npos) ||
-       ( (phase1  && name.find("_RNG") == string::npos) ) ||
-       ( (!phase1 && name.find("_PLQ") == string::npos) ) ) {
-    edm::LogError ("BadNameString|SiPixel") 
-      << "Bad name string in PixelEndcapName::PixelEndcapName(std::string): "
-      << name;
+  if ((name.substr(0, 5) != "FPix_") || (name.find("_B") == string::npos) || (name.find("_D") == string::npos) ||
+      (name.find("_BLD") == string::npos) || (name.find("_PNL") == string::npos) ||
+      ((phase1 && name.find("_RNG") == string::npos)) || ((!phase1 && name.find("_PLQ") == string::npos))) {
+    edm::LogError("BadNameString|SiPixel")
+        << "Bad name string in PixelEndcapName::PixelEndcapName(std::string): " << name;
     return;
   }
 
@@ -200,168 +195,212 @@ PixelEndcapName::PixelEndcapName(std::string name, bool phase)
     name = name.substr(0, name.find("_ROC"));
 
   // get the half cylinder
-  string hcString = name.substr(name.find("_B")+2, name.find("_D")-name.find("_B")-2);
-  if (hcString == "mO") thePart = mO;
-  else if (hcString == "mI") thePart = mI;
-  else if (hcString == "pO") thePart = pO;
-  else if (hcString == "pI") thePart = pI;
+  string hcString = name.substr(name.find("_B") + 2, name.find("_D") - name.find("_B") - 2);
+  if (hcString == "mO")
+    thePart = mO;
+  else if (hcString == "mI")
+    thePart = mI;
+  else if (hcString == "pO")
+    thePart = pO;
+  else if (hcString == "pI")
+    thePart = pI;
   else {
-    edm::LogError ("BadNameString|SiPixel") 
-      << "Unable to determine half cylinder in PixelEndcapName::PixelEndcapName(std::string): "
-      << name;
+    edm::LogError("BadNameString|SiPixel")
+        << "Unable to determine half cylinder in PixelEndcapName::PixelEndcapName(std::string): " << name;
   }
 
   // get the disk
-  string diskString = name.substr(name.find("_D")+2, name.find("_BLD")-name.find("_D")-2);
-  if (diskString == "1") theDisk = 1;
-  else if (diskString == "2") theDisk = 2;
-  else if (diskString == "3") theDisk = 3;
+  string diskString = name.substr(name.find("_D") + 2, name.find("_BLD") - name.find("_D") - 2);
+  if (diskString == "1")
+    theDisk = 1;
+  else if (diskString == "2")
+    theDisk = 2;
+  else if (diskString == "3")
+    theDisk = 3;
   else {
-    edm::LogError ("BadNameString|SiPixel") 
-      << "Unable to determine disk number in PixelEndcapName::PixelEndcapName(std::string): "
-      << name;
+    edm::LogError("BadNameString|SiPixel")
+        << "Unable to determine disk number in PixelEndcapName::PixelEndcapName(std::string): " << name;
   }
 
   // get the blade
-  string bladeString = name.substr(name.find("_BLD")+4, name.find("_PNL")-name.find("_BLD")-4);
+  string bladeString = name.substr(name.find("_BLD") + 4, name.find("_PNL") - name.find("_BLD") - 4);
   // since atoi() doesn't report errors, do it the long way
-  if (bladeString == "1") theBlade = 1;
-  else if (bladeString == "2") theBlade = 2;
-  else if (bladeString == "3") theBlade = 3;
-  else if (bladeString == "4") theBlade = 4;
-  else if (bladeString == "5") theBlade = 5;
-  else if (bladeString == "6") theBlade = 6;
-  else if (bladeString == "7") theBlade = 7;
-  else if (bladeString == "8") theBlade = 8;
-  else if (bladeString == "9") theBlade = 9;
-  else if (bladeString == "10") theBlade = 10;
-  else if (bladeString == "11") theBlade = 11;
-  else if (bladeString == "12") theBlade = 12;
-  else if (bladeString == "13") theBlade = 13;
-  else if (bladeString == "14") theBlade = 14;
-  else if (bladeString == "15") theBlade = 15;
-  else if (bladeString == "16") theBlade = 16;
-  else if (bladeString == "17") theBlade = 17;
+  if (bladeString == "1")
+    theBlade = 1;
+  else if (bladeString == "2")
+    theBlade = 2;
+  else if (bladeString == "3")
+    theBlade = 3;
+  else if (bladeString == "4")
+    theBlade = 4;
+  else if (bladeString == "5")
+    theBlade = 5;
+  else if (bladeString == "6")
+    theBlade = 6;
+  else if (bladeString == "7")
+    theBlade = 7;
+  else if (bladeString == "8")
+    theBlade = 8;
+  else if (bladeString == "9")
+    theBlade = 9;
+  else if (bladeString == "10")
+    theBlade = 10;
+  else if (bladeString == "11")
+    theBlade = 11;
+  else if (bladeString == "12")
+    theBlade = 12;
+  else if (bladeString == "13")
+    theBlade = 13;
+  else if (bladeString == "14")
+    theBlade = 14;
+  else if (bladeString == "15")
+    theBlade = 15;
+  else if (bladeString == "16")
+    theBlade = 16;
+  else if (bladeString == "17")
+    theBlade = 17;
   else {
-    edm::LogError ("BadNameString|SiPixel") 
-      << "Unable to determine blade number in PixelEndcapName::PixelEndcapName(std::string): "
-      << name;
+    edm::LogError("BadNameString|SiPixel")
+        << "Unable to determine blade number in PixelEndcapName::PixelEndcapName(std::string): " << name;
   }
 
   // find the panel
   string panelString;
-  if(phase1) panelString = name.substr(name.find("_PNL")+4, name.find("_RNG")-name.find("_PNL")-4);
-  else       panelString = name.substr(name.find("_PNL")+4, name.find("_PLQ")-name.find("_PNL")-4);
-
-  if      (panelString == "1") thePannel = 1;
-  else if (panelString == "2") thePannel = 2;
+  if (phase1)
+    panelString = name.substr(name.find("_PNL") + 4, name.find("_RNG") - name.find("_PNL") - 4);
+  else
+    panelString = name.substr(name.find("_PNL") + 4, name.find("_PLQ") - name.find("_PNL") - 4);
+
+  if (panelString == "1")
+    thePannel = 1;
+  else if (panelString == "2")
+    thePannel = 2;
   else {
-    edm::LogError ("BadNameString|SiPixel") 
-      << "Unable to determine panel number in PixelEndcapName::PixelEndcapName(std::string): "
-      << name;
+    edm::LogError("BadNameString|SiPixel")
+        << "Unable to determine panel number in PixelEndcapName::PixelEndcapName(std::string): " << name;
   }
 
   // find the plaquette, for phase 1 this is the rung number
-  if(phase1) { // phase1
+  if (phase1) {  // phase1
 
-    string ringString = name.substr(name.find("_RNG")+4, name.size()-name.find("_RNG")-4);
-    if (ringString == "1")      thePlaquette = 1; // code ring in the plaquette
-    else if (ringString == "2") thePlaquette = 2;
+    string ringString = name.substr(name.find("_RNG") + 4, name.size() - name.find("_RNG") - 4);
+    if (ringString == "1")
+      thePlaquette = 1;  // code ring in the plaquette
+    else if (ringString == "2")
+      thePlaquette = 2;
     else {
-      edm::LogError ("BadNameString|SiPixel") 
-	<< "Unable to determine ring number in PixelEndcapName::PixelEndcapName(std::string): "
-	<< name;
+      edm::LogError("BadNameString|SiPixel")
+          << "Unable to determine ring number in PixelEndcapName::PixelEndcapName(std::string): " << name;
     }
 
-  } else { // phase 0
+  } else {  // phase 0
 
     // find the plaquette
-    string plaquetteString = name.substr(name.find("_PLQ")+4, name.size()-name.find("_PLQ")-4);
-    if (plaquetteString == "1") thePlaquette = 1;
-    else if (plaquetteString == "2") thePlaquette = 2;
-    else if (plaquetteString == "3") thePlaquette = 3;
-    else if (plaquetteString == "4") thePlaquette = 4;
+    string plaquetteString = name.substr(name.find("_PLQ") + 4, name.size() - name.find("_PLQ") - 4);
+    if (plaquetteString == "1")
+      thePlaquette = 1;
+    else if (plaquetteString == "2")
+      thePlaquette = 2;
+    else if (plaquetteString == "3")
+      thePlaquette = 3;
+    else if (plaquetteString == "4")
+      thePlaquette = 4;
     else {
-      edm::LogError ("BadNameString|SiPixel") 
-	<< "Unable to determine plaquette number in PixelEndcapName::PixelEndcapName(std::string): "
-	<< name;
+      edm::LogError("BadNameString|SiPixel")
+          << "Unable to determine plaquette number in PixelEndcapName::PixelEndcapName(std::string): " << name;
     }
-    
-  } // end phase1
 
+  }  // end phase1
 
-} // PixelEndcapName::PixelEndcapName(std::string name)
+}  // PixelEndcapName::PixelEndcapName(std::string name)
 
-PixelModuleName::ModuleType  PixelEndcapName::moduleType() const
-{
+PixelModuleName::ModuleType PixelEndcapName::moduleType() const {
   ModuleType type = v1x2;
 
-  if(phase1) { // phase1
+  if (phase1) {  // phase1
 
     type = v2x8;
 
-  } else { // phase 0
+  } else {  // phase 0
 
     if (pannelName() == 1) {
-      if (plaquetteName() == 1)      { type = v1x2; }
-      else if (plaquetteName() == 2) { type = v2x3; }
-      else if (plaquetteName() == 3) { type = v2x4; }
-      else if (plaquetteName() == 4) { type = v1x5; }
+      if (plaquetteName() == 1) {
+        type = v1x2;
+      } else if (plaquetteName() == 2) {
+        type = v2x3;
+      } else if (plaquetteName() == 3) {
+        type = v2x4;
+      } else if (plaquetteName() == 4) {
+        type = v1x5;
+      }
     } else {
-      if (plaquetteName() == 1)      { type = v2x3; }
-      else if (plaquetteName() == 2) { type = v2x4; }
-      else if (plaquetteName() == 3) { type = v2x5; }
+      if (plaquetteName() == 1) {
+        type = v2x3;
+      } else if (plaquetteName() == 2) {
+        type = v2x4;
+      } else if (plaquetteName() == 3) {
+        type = v2x5;
+      }
     }
 
     // hack for the pilot blade
-    if(pilot_blade && theDisk==3 ) {type=v2x8;} // do only for disk 3
+    if (pilot_blade && theDisk == 3) {
+      type = v2x8;
+    }  // do only for disk 3
 
-  } // end phase1
+  }  // end phase1
 
   return type;
 }
 
-bool PixelEndcapName::operator== (const PixelModuleName & o) const
-{
+bool PixelEndcapName::operator==(const PixelModuleName& o) const {
   if (!o.isBarrel()) {
-    const PixelEndcapName * other = dynamic_cast<const PixelEndcapName *>(&o);
-    return (    other 
-             && thePart      == other->thePart
-             && theDisk      == other->theDisk
-             && theBlade     == other->theBlade
-             && thePannel    == other->thePannel
-             && thePlaquette == other->thePlaquette ); 
-  } else return false;
+    const PixelEndcapName* other = dynamic_cast<const PixelEndcapName*>(&o);
+    return (other && thePart == other->thePart && theDisk == other->theDisk && theBlade == other->theBlade &&
+            thePannel == other->thePannel && thePlaquette == other->thePlaquette);
+  } else
+    return false;
 }
 
-
-string PixelEndcapName::name() const 
-{
+string PixelEndcapName::name() const {
   std::ostringstream stm;
 
-  if(phase1) 
-    stm <<"FPix_B"<<thePart<<"_D"<<theDisk<<"_BLD"<<theBlade<<"_PNL"<<thePannel<<"_RNG"<<thePlaquette;
-  else 
-    stm <<"FPix_B"<<thePart<<"_D"<<theDisk<<"_BLD"<<theBlade<<"_PNL"<<thePannel<<"_PLQ"<<thePlaquette;
+  if (phase1)
+    stm << "FPix_B" << thePart << "_D" << theDisk << "_BLD" << theBlade << "_PNL" << thePannel << "_RNG"
+        << thePlaquette;
+  else
+    stm << "FPix_B" << thePart << "_D" << theDisk << "_BLD" << theBlade << "_PNL" << thePannel << "_PLQ"
+        << thePlaquette;
 
   return stm.str();
 }
 
-std::ostream & operator<<( std::ostream& out, const PixelEndcapName::HalfCylinder& t)
-{
+std::ostream& operator<<(std::ostream& out, const PixelEndcapName::HalfCylinder& t) {
   switch (t) {
-    case(PixelEndcapName::pI) : {out << "pI"; break;}
-    case(PixelEndcapName::pO) : {out << "pO"; break;}
-    case(PixelEndcapName::mI) : {out << "mI"; break;}
-    case(PixelEndcapName::mO) : {out << "mO"; break;}
-    default: out << "unknown";
+    case (PixelEndcapName::pI): {
+      out << "pI";
+      break;
+    }
+    case (PixelEndcapName::pO): {
+      out << "pO";
+      break;
+    }
+    case (PixelEndcapName::mI): {
+      out << "mI";
+      break;
+    }
+    case (PixelEndcapName::mO): {
+      out << "mO";
+      break;
+    }
+    default:
+      out << "unknown";
   };
   return out;
 }
 
 // return the DetId
 DetId PixelEndcapName::getDetId(const TrackerTopology* tt) {
-  
   uint32_t side = 0;
   uint32_t disk = 0;
   uint32_t blade = 0;
@@ -370,9 +409,11 @@ DetId PixelEndcapName::getDetId(const TrackerTopology* tt) {
 
   // figure out the side
   HalfCylinder hc = halfCylinder();
-  if (hc == mO || hc == mI) side = 1;
-  else if (hc == pO || hc == pI) side = 2;
-  
+  if (hc == mO || hc == mI)
+    side = 1;
+  else if (hc == pO || hc == pI)
+    side = 2;
+
   // get disk/blade/panel/module numbers from PixelEndcapName object
   disk = static_cast<uint32_t>(diskName());
   uint32_t tmpBlade = static_cast<uint32_t>(bladeName());
@@ -382,59 +423,66 @@ DetId PixelEndcapName::getDetId(const TrackerTopology* tt) {
   bool outer = false;
   outer = (hc == mO) || (hc == pO);
 
-  if(phase1) { // phase1
+  if (phase1) {  // phase1
 
-    module=1;
-    int ring  = static_cast<uint32_t>(ringName()); // this is ring for phase1
-    if(ring==1) { // ring 1, lower radius 
+    module = 1;
+    int ring = static_cast<uint32_t>(ringName());  // this is ring for phase1
+    if (ring == 1) {                               // ring 1, lower radius
       if (outer) {
-	if          (tmpBlade>=1 && tmpBlade<=11)    blade = tmpBlade+6;
-      } else { //inner
-	if          (tmpBlade<=6 )                   blade = 7-tmpBlade;
-	else                                         blade = 29-tmpBlade;
+        if (tmpBlade >= 1 && tmpBlade <= 11)
+          blade = tmpBlade + 6;
+      } else {  //inner
+        if (tmpBlade <= 6)
+          blade = 7 - tmpBlade;
+        else
+          blade = 29 - tmpBlade;
       }
 
-    } else if (ring==2) { //ring 2, upper radius 
+    } else if (ring == 2) {  //ring 2, upper radius
       if (outer) {
-	if          (tmpBlade>=1 && tmpBlade<=17)    blade = tmpBlade+31;
-      } else { //inner
-	if          (tmpBlade<=9 )                   blade = 32-tmpBlade;
-	else                                         blade = 66-tmpBlade;
+        if (tmpBlade >= 1 && tmpBlade <= 17)
+          blade = tmpBlade + 31;
+      } else {  //inner
+        if (tmpBlade <= 9)
+          blade = 32 - tmpBlade;
+        else
+          blade = 66 - tmpBlade;
       }
     }
-  
-  } else { // phase 0
- 
+
+  } else {  // phase 0
+
     if (outer) {
       blade = tmpBlade + 6;
-    } else { // inner
-      if (tmpBlade <= 6) blade = 7 - tmpBlade;
-      else if (tmpBlade <= 12) blade = 31 - tmpBlade;
+    } else {  // inner
+      if (tmpBlade <= 6)
+        blade = 7 - tmpBlade;
+      else if (tmpBlade <= 12)
+        blade = 31 - tmpBlade;
     }
 
     // hack for the pilot blade
-    if(pilot_blade && theDisk==3 ) { // do only for disk 3
+    if (pilot_blade && theDisk == 3) {  // do only for disk 3
       //cout<<tmpBlade<<" "<<blade<<endl;
-      if(blade<=5) blade -=3;
-      else         blade -=13;
+      if (blade <= 5)
+        blade -= 3;
+      else
+        blade -= 13;
       //cout<<tmpBlade<<" "<<blade<<endl;
     }
 
     module = static_cast<uint32_t>(plaquetteName());
-  } // end phase1
-
+  }  // end phase1
 
   // create and return the DetId
   DetId id = tt->pxfDetId(side, disk, blade, panel, module);
 
   return id;
 
-} // PXFDetId PixelEndcapName::getDetId()
-
+}  // PXFDetId PixelEndcapName::getDetId()
 
 // return the DetId
 PXFDetId PixelEndcapName::getDetId() {
-  
   uint32_t side = 0;
   uint32_t disk = 0;
   uint32_t blade = 0;
@@ -443,9 +491,11 @@ PXFDetId PixelEndcapName::getDetId() {
 
   // figure out the side
   HalfCylinder hc = halfCylinder();
-  if (hc == mO || hc == mI) side = 1;
-  else if (hc == pO || hc == pI) side = 2;
-  
+  if (hc == mO || hc == mI)
+    side = 1;
+  else if (hc == pO || hc == pI)
+    side = 2;
+
   // get disk/blade/panel/module numbers from PixelEndcapName object
   disk = static_cast<uint32_t>(diskName());
   uint32_t tmpBlade = static_cast<uint32_t>(bladeName());
@@ -455,48 +505,58 @@ PXFDetId PixelEndcapName::getDetId() {
   bool outer = false;
   outer = (hc == mO) || (hc == pO);
 
-  if(phase1) { // phase1
+  if (phase1) {  // phase1
 
-    module = 1;  // for phase 1 always 1, 
-    int ring = static_cast<uint32_t>(ringName()); // this is ring for phase1
-    if(ring==1) { // ring 1, lower radius 
+    module = 1;                                    // for phase 1 always 1,
+    int ring = static_cast<uint32_t>(ringName());  // this is ring for phase1
+    if (ring == 1) {                               // ring 1, lower radius
       if (outer) {
-	if          (tmpBlade>=1 && tmpBlade<=11)    blade = tmpBlade+6;
-      } else { //inner
-	if          (tmpBlade<=6 )                   blade = 7-tmpBlade;
-	else                                         blade = 29-tmpBlade;
+        if (tmpBlade >= 1 && tmpBlade <= 11)
+          blade = tmpBlade + 6;
+      } else {  //inner
+        if (tmpBlade <= 6)
+          blade = 7 - tmpBlade;
+        else
+          blade = 29 - tmpBlade;
       }
 
-    } else if (ring==2) { //ring 2, upper radius 
+    } else if (ring == 2) {  //ring 2, upper radius
       if (outer) {
-	if          (tmpBlade>=1 && tmpBlade<=17)    blade = tmpBlade+31;
-      } else { //inner
-	if          (tmpBlade<=9 )                   blade = 32-tmpBlade;
-	else                                         blade = 66-tmpBlade;
+        if (tmpBlade >= 1 && tmpBlade <= 17)
+          blade = tmpBlade + 31;
+      } else {  //inner
+        if (tmpBlade <= 9)
+          blade = 32 - tmpBlade;
+        else
+          blade = 66 - tmpBlade;
       }
     }
-  
-  } else { // phase 0
+
+  } else {  // phase 0
 
     if (outer) {
       blade = tmpBlade + 6;
-    } else { // inner
-      if (tmpBlade <= 6) blade = 7 - tmpBlade;
-      else if (tmpBlade <= 12) blade = 31 - tmpBlade;
+    } else {  // inner
+      if (tmpBlade <= 6)
+        blade = 7 - tmpBlade;
+      else if (tmpBlade <= 12)
+        blade = 31 - tmpBlade;
     }
 
     // hack for the pilot blade
-    if(pilot_blade && theDisk==3 ) { // do only for disk 3
+    if (pilot_blade && theDisk == 3) {  // do only for disk 3
       //cout<<tmpBlade<<" "<<blade<<endl;
-      if(blade<=5) blade -=3;
-      else         blade -=13;
+      if (blade <= 5)
+        blade -= 3;
+      else
+        blade -= 13;
       //cout<<tmpBlade<<" "<<blade<<endl;
     }
 
     module = static_cast<uint32_t>(plaquetteName());
-  } // end phase1
+  }  // end phase1
 
   // create and return the DetId
   return PXFDetId(side, disk, blade, panel, module);
 
-} // PXFDetId PixelEndcapName::getDetId()
+}  // PXFDetId PixelEndcapName::getDetId()
diff --git a/DataFormats/SiPixelDetId/src/PixelEndcapNameUpgrade.cc b/DataFormats/SiPixelDetId/src/PixelEndcapNameUpgrade.cc
index 6684687a98b48..e7fd67be8e8f3 100644
--- a/DataFormats/SiPixelDetId/src/PixelEndcapNameUpgrade.cc
+++ b/DataFormats/SiPixelDetId/src/PixelEndcapNameUpgrade.cc
@@ -8,18 +8,13 @@
 
 using namespace std;
 
-
-
-
-PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(const DetId & id)
-  : PixelModuleName(false)
-{
+PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(const DetId& id) : PixelModuleName(false) {
   PXFDetId cmssw_numbering(id);
   int side = cmssw_numbering.side();
   int tmpBlade = cmssw_numbering.blade();
   bool outer = false;
-  
-/*
+
+  /*
   //    iasonas1-with this we determine inner-outer ring, NOT x-direction
   if (tmpBlade >= 23 && tmpBlade <= 56) {       //23-56-->outer ring
     outer = true;
@@ -31,169 +26,194 @@ PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(const DetId & id)
 */
   //    iasonas2-with this we determine inner-outer x-position (x>0-x<0), NOT ring
   //    m/pI:1-6,18-31,49-56. m/pO:7-17,32-48.
-  if (tmpBlade>=7 && tmpBlade<=17) {
+  if (tmpBlade >= 7 && tmpBlade <= 17) {
     outer = true;
-    theBlade = tmpBlade-6;                      //7...17-->1...11
-  } else if (tmpBlade>=32 && tmpBlade<=48) {
+    theBlade = tmpBlade - 6;  //7...17-->1...11
+  } else if (tmpBlade >= 32 && tmpBlade <= 48) {
     outer = true;
-    theBlade = 60-tmpBlade;                     //32...48-->28...12
-  } else if( tmpBlade<=6 ) {
-    theBlade = 7-tmpBlade;                      //1...6-->6...1
-  } else if( tmpBlade>=18 && tmpBlade<=31 ) {
-    theBlade = 38-tmpBlade;                     //18...31-->20...7
-  } else if( tmpBlade>=49 && tmpBlade<=56 ) {
-    theBlade = 77-tmpBlade;                     //49...56-->28...21
-  } //  iasonas2-end
-  
-       if( side == 1 &&  outer ) thePart = mO;
-  else if( side == 1 && !outer ) thePart = mI;
-  else if( side == 2 &&  outer ) thePart = pO;
-  else if( side == 2 && !outer ) thePart = pI;
-  
+    theBlade = 60 - tmpBlade;  //32...48-->28...12
+  } else if (tmpBlade <= 6) {
+    theBlade = 7 - tmpBlade;  //1...6-->6...1
+  } else if (tmpBlade >= 18 && tmpBlade <= 31) {
+    theBlade = 38 - tmpBlade;  //18...31-->20...7
+  } else if (tmpBlade >= 49 && tmpBlade <= 56) {
+    theBlade = 77 - tmpBlade;  //49...56-->28...21
+  }                            //  iasonas2-end
+
+  if (side == 1 && outer)
+    thePart = mO;
+  else if (side == 1 && !outer)
+    thePart = mI;
+  else if (side == 2 && outer)
+    thePart = pO;
+  else if (side == 2 && !outer)
+    thePart = pI;
+
   theDisk = cmssw_numbering.disk();
   thePannel = cmssw_numbering.panel();
   thePlaquette = cmssw_numbering.module();
-  
 }
 
-
 // constructor from name string
 PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(std::string name)
-  : PixelModuleName(false), thePart(mO), theDisk(0), 
-    theBlade(0), thePannel(0), thePlaquette(0) {
+    : PixelModuleName(false), thePart(mO), theDisk(0), theBlade(0), thePannel(0), thePlaquette(0) {
   // parse the name string
   // first, check to make sure this is an FPix name, should start with "FPix_"
   // also check to make sure the needed parts are present
-  if ( (name.substr(0, 5) != "FPix_") ||
-       (name.find("_B") == string::npos) || 
-       (name.find("_D") == string::npos) ||
-       (name.find("_BLD") == string::npos) || 
-       (name.find("_PNL") == string::npos) ||
-       (name.find("_PLQ") == string::npos) ) {
-    edm::LogError ("BadNameString|SiPixel") 
-      << "Bad name string in PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(std::string): "
-      << name;
+  if ((name.substr(0, 5) != "FPix_") || (name.find("_B") == string::npos) || (name.find("_D") == string::npos) ||
+      (name.find("_BLD") == string::npos) || (name.find("_PNL") == string::npos) ||
+      (name.find("_PLQ") == string::npos)) {
+    edm::LogError("BadNameString|SiPixel")
+        << "Bad name string in PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(std::string): " << name;
     return;
   }
   // strip off ROC part if it's there
   if (name.find("_ROC") != string::npos)
     name = name.substr(0, name.find("_ROC"));
   // get the half cylinder
-  string hcString = name.substr(name.find("_B")+2, name.find("_D")-name.find("_B")-2);
-  if (hcString == "mO") thePart = mO;
-  else if (hcString == "mI") thePart = mI;
-  else if (hcString == "pO") thePart = pO;
-  else if (hcString == "pI") thePart = pI;
+  string hcString = name.substr(name.find("_B") + 2, name.find("_D") - name.find("_B") - 2);
+  if (hcString == "mO")
+    thePart = mO;
+  else if (hcString == "mI")
+    thePart = mI;
+  else if (hcString == "pO")
+    thePart = pO;
+  else if (hcString == "pI")
+    thePart = pI;
   else {
-    edm::LogError ("BadNameString|SiPixel") 
-      << "Unable to determine half cylinder in PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(std::string): "
-      << name;
+    edm::LogError("BadNameString|SiPixel")
+        << "Unable to determine half cylinder in PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(std::string): " << name;
   }
   // get the disk
-  string diskString = name.substr(name.find("_D")+2, name.find("_BLD")-name.find("_D")-2);
-  if (diskString == "1") theDisk = 1;
-  else if (diskString == "2") theDisk = 2;
-  else if (diskString == "3") theDisk = 3;
+  string diskString = name.substr(name.find("_D") + 2, name.find("_BLD") - name.find("_D") - 2);
+  if (diskString == "1")
+    theDisk = 1;
+  else if (diskString == "2")
+    theDisk = 2;
+  else if (diskString == "3")
+    theDisk = 3;
   else {
-    edm::LogError ("BadNameString|SiPixel") 
-      << "Unable to determine disk number in PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(std::string): "
-      << name;
+    edm::LogError("BadNameString|SiPixel")
+        << "Unable to determine disk number in PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(std::string): " << name;
   }
   // get the blade
-  string bladeString = name.substr(name.find("_BLD")+4, name.find("_PNL")-name.find("_BLD")-4);
+  string bladeString = name.substr(name.find("_BLD") + 4, name.find("_PNL") - name.find("_BLD") - 4);
   // since atoi() doesn't report errors, do it the long way
-  if (bladeString == "1") theBlade = 1;
-  else if (bladeString == "2") theBlade = 2;
-  else if (bladeString == "3") theBlade = 3;
-  else if (bladeString == "4") theBlade = 4;
-  else if (bladeString == "5") theBlade = 5;
-  else if (bladeString == "6") theBlade = 6;
-  else if (bladeString == "7") theBlade = 7;
-  else if (bladeString == "8") theBlade = 8;
-  else if (bladeString == "9") theBlade = 9;
-  else if (bladeString == "10") theBlade = 10;
-  else if (bladeString == "11") theBlade = 11;
-  else if (bladeString == "12") theBlade = 12;
-  else if (bladeString == "13") theBlade = 13;
-  else if (bladeString == "14") theBlade = 14;
-  else if (bladeString == "15") theBlade = 15;
-  else if (bladeString == "16") theBlade = 16;
-  else if (bladeString == "17") theBlade = 17;
+  if (bladeString == "1")
+    theBlade = 1;
+  else if (bladeString == "2")
+    theBlade = 2;
+  else if (bladeString == "3")
+    theBlade = 3;
+  else if (bladeString == "4")
+    theBlade = 4;
+  else if (bladeString == "5")
+    theBlade = 5;
+  else if (bladeString == "6")
+    theBlade = 6;
+  else if (bladeString == "7")
+    theBlade = 7;
+  else if (bladeString == "8")
+    theBlade = 8;
+  else if (bladeString == "9")
+    theBlade = 9;
+  else if (bladeString == "10")
+    theBlade = 10;
+  else if (bladeString == "11")
+    theBlade = 11;
+  else if (bladeString == "12")
+    theBlade = 12;
+  else if (bladeString == "13")
+    theBlade = 13;
+  else if (bladeString == "14")
+    theBlade = 14;
+  else if (bladeString == "15")
+    theBlade = 15;
+  else if (bladeString == "16")
+    theBlade = 16;
+  else if (bladeString == "17")
+    theBlade = 17;
   else {
-    edm::LogError ("BadNameString|SiPixel") 
-      << "Unable to determine blade number in PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(std::string): "
-      << name;
+    edm::LogError("BadNameString|SiPixel")
+        << "Unable to determine blade number in PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(std::string): " << name;
   }
   // find the panel
-  string panelString = name.substr(name.find("_PNL")+4, name.find("_PLQ")-name.find("_PNL")-4);
-  if (panelString == "1") thePannel = 1;
-  else if (panelString == "2") thePannel = 2;
+  string panelString = name.substr(name.find("_PNL") + 4, name.find("_PLQ") - name.find("_PNL") - 4);
+  if (panelString == "1")
+    thePannel = 1;
+  else if (panelString == "2")
+    thePannel = 2;
   else {
-    edm::LogError ("BadNameString|SiPixel") 
-      << "Unable to determine panel number in PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(std::string): "
-      << name;
+    edm::LogError("BadNameString|SiPixel")
+        << "Unable to determine panel number in PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(std::string): " << name;
   }
   // find the plaquette
-  string plaquetteString = name.substr(name.find("_PLQ")+4, name.size()-name.find("_PLQ")-4);
-  if (plaquetteString == "1") thePlaquette = 1;
+  string plaquetteString = name.substr(name.find("_PLQ") + 4, name.size() - name.find("_PLQ") - 4);
+  if (plaquetteString == "1")
+    thePlaquette = 1;
   else {
-    edm::LogError ("BadNameString|SiPixel") 
-      << "Unable to determine plaquette number in PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(std::string): "
-      << name;
+    edm::LogError("BadNameString|SiPixel")
+        << "Unable to determine plaquette number in PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(std::string): "
+        << name;
   }
 
-} // PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(std::string name)
-
+}  // PixelEndcapNameUpgrade::PixelEndcapNameUpgrade(std::string name)
 
-PixelModuleName::ModuleType  PixelEndcapNameUpgrade::moduleType() const
-{
+PixelModuleName::ModuleType PixelEndcapNameUpgrade::moduleType() const {
   ModuleType type = v2x8;
   if (pannelName() == 1) {
-    if (plaquetteName() == 1)      { type = v2x8; }
-  }
-  else {
-    if (plaquetteName() == 1)      { type = v2x8; }
+    if (plaquetteName() == 1) {
+      type = v2x8;
+    }
+  } else {
+    if (plaquetteName() == 1) {
+      type = v2x8;
+    }
   }
   return type;
 }
 
-
-bool PixelEndcapNameUpgrade::operator== (const PixelModuleName & o) const
-{
+bool PixelEndcapNameUpgrade::operator==(const PixelModuleName& o) const {
   if (!o.isBarrel()) {
-    const PixelEndcapNameUpgrade * other = dynamic_cast<const PixelEndcapNameUpgrade *>(&o);
-    return (    other 
-             && thePart      == other->thePart
-             && theDisk      == other->theDisk
-             && theBlade     == other->theBlade
-             && thePannel    == other->thePannel
-             && thePlaquette == other->thePlaquette ); 
-  } else return false;
+    const PixelEndcapNameUpgrade* other = dynamic_cast<const PixelEndcapNameUpgrade*>(&o);
+    return (other && thePart == other->thePart && theDisk == other->theDisk && theBlade == other->theBlade &&
+            thePannel == other->thePannel && thePlaquette == other->thePlaquette);
+  } else
+    return false;
 }
 
-string PixelEndcapNameUpgrade::name() const 
-{
+string PixelEndcapNameUpgrade::name() const {
   std::ostringstream stm;
-  stm <<"FPix_B"<<thePart<<"_D"<<theDisk<<"_BLD"<<theBlade<<"_PNL"<<thePannel<<"_PLQ"<<thePlaquette;
+  stm << "FPix_B" << thePart << "_D" << theDisk << "_BLD" << theBlade << "_PNL" << thePannel << "_PLQ" << thePlaquette;
   return stm.str();
 }
 
-std::ostream & operator<<( std::ostream& out, const PixelEndcapNameUpgrade::HalfCylinder& t)
-{
+std::ostream& operator<<(std::ostream& out, const PixelEndcapNameUpgrade::HalfCylinder& t) {
   switch (t) {
-    case(PixelEndcapNameUpgrade::pI) : {out << "pI"; break;}
-    case(PixelEndcapNameUpgrade::pO) : {out << "pO"; break;}
-    case(PixelEndcapNameUpgrade::mI) : {out << "mI"; break;}
-    case(PixelEndcapNameUpgrade::mO) : {out << "mO"; break;}
-    default: out << "unknown";
+    case (PixelEndcapNameUpgrade::pI): {
+      out << "pI";
+      break;
+    }
+    case (PixelEndcapNameUpgrade::pO): {
+      out << "pO";
+      break;
+    }
+    case (PixelEndcapNameUpgrade::mI): {
+      out << "mI";
+      break;
+    }
+    case (PixelEndcapNameUpgrade::mO): {
+      out << "mO";
+      break;
+    }
+    default:
+      out << "unknown";
   };
   return out;
 }
 
-
 // return the DetId
 PXFDetId PixelEndcapNameUpgrade::getDetId() {
-  
   uint32_t side = 0;
   uint32_t disk = 0;
   uint32_t blade = 0;
@@ -202,9 +222,11 @@ PXFDetId PixelEndcapNameUpgrade::getDetId() {
 
   // figure out the side
   HalfCylinder hc = halfCylinder();
-  if (hc == mO || hc == mI) side = 1;
-  else if (hc == pO || hc == pI) side = 2;
-  
+  if (hc == mO || hc == mI)
+    side = 1;
+  else if (hc == pO || hc == pI)
+    side = 2;
+
   // get disk/blade/panel/module numbers from PixelEndcapNameUpgrade object
   disk = static_cast<uint32_t>(diskName());
   uint32_t tmpBlade = static_cast<uint32_t>(bladeName());
@@ -214,7 +236,7 @@ PXFDetId PixelEndcapNameUpgrade::getDetId() {
   // convert blade numbering to cmssw convention
   bool outer = false;
   outer = (hc == mO) || (hc == pO);
-/*
+  /*
   //iasonas1
   if (outer) {blade = 57 - tmpBlade;}
   else       {blade = 23 - tmpBlade;}
@@ -222,24 +244,20 @@ PXFDetId PixelEndcapNameUpgrade::getDetId() {
 */
   //iasonas2    m/pI:1-6,18-31,49-56. m/pO:7-17,32-48.
   if (outer) {
-    if          (tmpBlade>=7 && tmpBlade<=17)    theBlade = tmpBlade+6;
-    else if     (tmpBlade>=32 && tmpBlade<=48)   theBlade = 60-tmpBlade;
-  } else { //inner
-    if          (tmpBlade<=6 )                   theBlade = 7-tmpBlade;
-    else if     (tmpBlade>=18 && tmpBlade<=31)   theBlade = 38-tmpBlade;
-    else if     (tmpBlade>=49 && tmpBlade<=56)   theBlade = 77-tmpBlade;
+    if (tmpBlade >= 7 && tmpBlade <= 17)
+      theBlade = tmpBlade + 6;
+    else if (tmpBlade >= 32 && tmpBlade <= 48)
+      theBlade = 60 - tmpBlade;
+  } else {  //inner
+    if (tmpBlade <= 6)
+      theBlade = 7 - tmpBlade;
+    else if (tmpBlade >= 18 && tmpBlade <= 31)
+      theBlade = 38 - tmpBlade;
+    else if (tmpBlade >= 49 && tmpBlade <= 56)
+      theBlade = 77 - tmpBlade;
   }
 
   // create and return the DetId
   return PXFDetId(side, disk, blade, panel, module);
 
-} // PXFDetId PixelEndcapNameUpgrade::getDetId()
-
-
-
-
-
-
-
-
-
+}  // PXFDetId PixelEndcapNameUpgrade::getDetId()
diff --git a/DataFormats/SiPixelDetId/src/PixelModuleName.cc b/DataFormats/SiPixelDetId/src/PixelModuleName.cc
index 46477a1ef35af..e7ed9a331eacb 100644
--- a/DataFormats/SiPixelDetId/src/PixelModuleName.cc
+++ b/DataFormats/SiPixelDetId/src/PixelModuleName.cc
@@ -1,18 +1,37 @@
 #include "DataFormats/SiPixelDetId/interface/PixelModuleName.h"
 
-
-std::ostream & operator<<( std::ostream& out, const PixelModuleName::ModuleType & t)
-{
+std::ostream& operator<<(std::ostream& out, const PixelModuleName::ModuleType& t) {
   switch (t) {
-    case(PixelModuleName::v1x2) : {out << "v1x2"; break;}
-    case(PixelModuleName::v1x5) : {out << "v1x5"; break;}
-    case(PixelModuleName::v1x8) : {out << "v1x8"; break;}
-    case(PixelModuleName::v2x3) : {out << "v2x3"; break;}
-    case(PixelModuleName::v2x4) : {out << "v2x4"; break;}
-    case(PixelModuleName::v2x5) : {out << "v2x5"; break;}
-    case(PixelModuleName::v2x8) : {out << "v2x8"; break;}
-    default: out << "unknown";
+    case (PixelModuleName::v1x2): {
+      out << "v1x2";
+      break;
+    }
+    case (PixelModuleName::v1x5): {
+      out << "v1x5";
+      break;
+    }
+    case (PixelModuleName::v1x8): {
+      out << "v1x8";
+      break;
+    }
+    case (PixelModuleName::v2x3): {
+      out << "v2x3";
+      break;
+    }
+    case (PixelModuleName::v2x4): {
+      out << "v2x4";
+      break;
+    }
+    case (PixelModuleName::v2x5): {
+      out << "v2x5";
+      break;
+    }
+    case (PixelModuleName::v2x8): {
+      out << "v2x8";
+      break;
+    }
+    default:
+      out << "unknown";
   };
   return out;
 }
-
diff --git a/DataFormats/SiPixelDetId/src/classes.h b/DataFormats/SiPixelDetId/src/classes.h
index f8063a8cdaeb5..7e5b66548ff97 100644
--- a/DataFormats/SiPixelDetId/src/classes.h
+++ b/DataFormats/SiPixelDetId/src/classes.h
@@ -1,9 +1,8 @@
 #include "DataFormats/SiPixelDetId/interface/PXBDetId.h"
-#include <boost/cstdint.hpp> 
+#include <boost/cstdint.hpp>
 #include "DataFormats/SiPixelDetId/interface/PXFDetId.h"
 
 #include "DataFormats/SiPixelDetId/interface/PixelFEDChannel.h"
 #include "DataFormats/Common/interface/EDCollection.h"
 #include "DataFormats/Common/interface/DetSetVectorNew.h"
 #include "DataFormats/Common/interface/Wrapper.h"
-
diff --git a/DataFormats/SiPixelDigi/interface/PixelDigifwd.h b/DataFormats/SiPixelDigi/interface/PixelDigifwd.h
deleted file mode 100644
index a507a65967900..0000000000000
--- a/DataFormats/SiPixelDigi/interface/PixelDigifwd.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef TRACKINGOBJECTS_PIXELDIGIFWD_H
-#define TRACKINGOBJECTS_PIXELDIGIFWD_H
-class PixelDigi::Packing;
-class PixelDigi;
-#endif // TRACKINGOBJECTS_PIXELDIGIFWD_H
diff --git a/DataFormats/SiPixelRawData/interface/SiPixelRawDataError.h b/DataFormats/SiPixelRawData/interface/SiPixelRawDataError.h
index bdbdd6e4e684a..d2aa75e7d43ac 100644
--- a/DataFormats/SiPixelRawData/interface/SiPixelRawDataError.h
+++ b/DataFormats/SiPixelRawData/interface/SiPixelRawDataError.h
@@ -6,7 +6,7 @@
 //!  \brief Pixel error -- collection of errors and error information
 //!
 //!  Class to contain and store all information about errors
-//!  
+//!
 //!
 //!  \author Andrew York, University of Tennessee
 //---------------------------------------------------------------------------
@@ -17,41 +17,42 @@
 #include <cstdint>
 
 class SiPixelRawDataError {
-  public:
-
-    /// Default constructor
-    SiPixelRawDataError();
-    /// Constructor for 32-bit error word
-    SiPixelRawDataError(cms_uint32_t errorWord32, const int errorType, int fedId);
-    /// Constructor with 64-bit error word and type included (header or trailer word)
-    SiPixelRawDataError(cms_uint64_t errorWord64, const int errorType, int fedId);
-    /// Destructor
-    ~SiPixelRawDataError();
-
-    void setWord32(cms_uint32_t errorWord32);		// function to allow user to input the error word (if 32-bit) after instantiation
-    void setWord64(cms_uint64_t errorWord64);		// function to allow user to input the error word (if 64-bit) after instantiation
-    void setType(int errorType);			// function to allow user to input the error type after instantiation
-    void setFedId(int fedId);			        // function to allow user to input the fedID after instantiation
-    void setMessage();				        // function to create an error message based on errorType
-
-    inline cms_uint32_t getWord32() const {return errorWord32_;} // the 32-bit word that contains the error information
-    inline cms_uint64_t getWord64() const {return errorWord64_;} // the 64-bit word that contains the error information
-    inline int getType() const {return errorType_;} 	         // the number associated with the error type (26-31 for ROC number errors, 32-33 for calibration errors)
-    inline int getFedId() const {return fedId_;} 	         // the fedId where the error occured
-    inline std::string getMessage() const {return errorMessage_;}     // the error message to be displayed with the error	
-
-  private:
-
-    cms_uint32_t errorWord32_;
-    cms_uint64_t errorWord64_;
-    int errorType_;
-    int fedId_;
-    std::string errorMessage_;
-    
+public:
+  /// Default constructor
+  SiPixelRawDataError();
+  /// Constructor for 32-bit error word
+  SiPixelRawDataError(cms_uint32_t errorWord32, const int errorType, int fedId);
+  /// Constructor with 64-bit error word and type included (header or trailer word)
+  SiPixelRawDataError(cms_uint64_t errorWord64, const int errorType, int fedId);
+  /// Destructor
+  ~SiPixelRawDataError();
+
+  void setWord32(
+      cms_uint32_t errorWord32);  // function to allow user to input the error word (if 32-bit) after instantiation
+  void setWord64(
+      cms_uint64_t errorWord64);  // function to allow user to input the error word (if 64-bit) after instantiation
+  void setType(int errorType);    // function to allow user to input the error type after instantiation
+  void setFedId(int fedId);       // function to allow user to input the fedID after instantiation
+  void setMessage();              // function to create an error message based on errorType
+
+  inline cms_uint32_t getWord32() const { return errorWord32_; }  // the 32-bit word that contains the error information
+  inline cms_uint64_t getWord64() const { return errorWord64_; }  // the 64-bit word that contains the error information
+  inline int getType() const {
+    return errorType_;
+  }  // the number associated with the error type (26-31 for ROC number errors, 32-33 for calibration errors)
+  inline int getFedId() const { return fedId_; }                   // the fedId where the error occured
+  inline std::string getMessage() const { return errorMessage_; }  // the error message to be displayed with the error
+
+private:
+  cms_uint32_t errorWord32_;
+  cms_uint64_t errorWord64_;
+  int errorType_;
+  int fedId_;
+  std::string errorMessage_;
 };
 
 // Comparison operators
-inline bool operator<( const SiPixelRawDataError& one, const SiPixelRawDataError& other) {
+inline bool operator<(const SiPixelRawDataError& one, const SiPixelRawDataError& other) {
   return one.getFedId() < other.getFedId();
 }
 
diff --git a/DataFormats/SiPixelRawData/src/SiPixelRawDataError.cc b/DataFormats/SiPixelRawData/src/SiPixelRawDataError.cc
index 2faa7cb69000a..e591ecc195349 100644
--- a/DataFormats/SiPixelRawData/src/SiPixelRawDataError.cc
+++ b/DataFormats/SiPixelRawData/src/SiPixelRawDataError.cc
@@ -5,7 +5,7 @@
 //!  \brief Pixel error -- collection of errors and error information
 //!
 //!  Class to contain and store all information about errors
-//!  
+//!
 //!
 //!  \author Andrew York, University of Tennessee
 //---------------------------------------------------------------------------
@@ -14,21 +14,15 @@
 
 SiPixelRawDataError::SiPixelRawDataError() {}
 
-SiPixelRawDataError::SiPixelRawDataError(cms_uint32_t errorWord32, const int errorType, int fedId) : 
-  errorWord32_(errorWord32),
-  errorType_(errorType),
-  fedId_(fedId)
-  {
-    setMessage();
-  }
+SiPixelRawDataError::SiPixelRawDataError(cms_uint32_t errorWord32, const int errorType, int fedId)
+    : errorWord32_(errorWord32), errorType_(errorType), fedId_(fedId) {
+  setMessage();
+}
 
-SiPixelRawDataError::SiPixelRawDataError(cms_uint64_t errorWord64, const int errorType, int fedId) : 
-  errorWord64_(errorWord64),
-  errorType_(errorType),
-  fedId_(fedId)
-  {
-    setMessage();
-  }
+SiPixelRawDataError::SiPixelRawDataError(cms_uint64_t errorWord64, const int errorType, int fedId)
+    : errorWord64_(errorWord64), errorType_(errorType), fedId_(fedId) {
+  setMessage();
+}
 
 //Destructor
 
@@ -36,77 +30,72 @@ SiPixelRawDataError::~SiPixelRawDataError() {}
 
 //functions to get error words and types
 
-void SiPixelRawDataError::setWord32(cms_uint32_t errorWord32) {
-  errorWord32_ = errorWord32;
-}
+void SiPixelRawDataError::setWord32(cms_uint32_t errorWord32) { errorWord32_ = errorWord32; }
 
-void SiPixelRawDataError::setWord64(cms_uint64_t errorWord64) {
-  errorWord64_ = errorWord64;
-}
+void SiPixelRawDataError::setWord64(cms_uint64_t errorWord64) { errorWord64_ = errorWord64; }
 
 void SiPixelRawDataError::setType(int errorType) {
-errorType_ = errorType; 
-setMessage();
-} 
+  errorType_ = errorType;
+  setMessage();
+}
 
-void SiPixelRawDataError::setFedId(int fedId) {
-fedId_ = fedId; 
-} 
+void SiPixelRawDataError::setFedId(int fedId) { fedId_ = fedId; }
 
 void SiPixelRawDataError::setMessage() {
   switch (errorType_) {
-    case(25) : {
-     errorMessage_ = "Error: Disabled FED channel (ROC=25)";
-     break;
-   }
-   case(26) : {
-     errorMessage_ = "Error: Gap word";
-     break;
-   }
-   case(27) : {
-     errorMessage_ = "Error: Dummy word";
-     break;
-   }
-   case(28) : {
-     errorMessage_ = "Error: FIFO nearly full";
-     break;
-   }
-   case(29) : {
-     errorMessage_ = "Error: Timeout";
-     break;
-   }
-   case(30) : {
-     errorMessage_ = "Error: Trailer";
-     break;
-   }
-   case(31) : {
-     errorMessage_ = "Error: Event number mismatch";
-     break;
-   }
-   case(32) : {
-     errorMessage_ = "Error: Invalid or missing header";
-     break;
-   }
-   case(33) : {
-     errorMessage_ = "Error: Invalid or missing trailer";
-     break;
-   }
-   case(34) : {
-     errorMessage_ = "Error: Size mismatch";
-     break;
-   }
-   case(35) : {
-     errorMessage_ = "Error: Invalid channel";
-     break;
-   }
-   case(36) : {
-     errorMessage_ = "Error: Invalid ROC number";
-     break;
-   }
-   case(37) : {
-     errorMessage_ = "Error: Invalid dcol/pixel address";
-     break;
-   }
-   default: errorMessage_ = "Error: Unknown error type";
+    case (25): {
+      errorMessage_ = "Error: Disabled FED channel (ROC=25)";
+      break;
+    }
+    case (26): {
+      errorMessage_ = "Error: Gap word";
+      break;
+    }
+    case (27): {
+      errorMessage_ = "Error: Dummy word";
+      break;
+    }
+    case (28): {
+      errorMessage_ = "Error: FIFO nearly full";
+      break;
+    }
+    case (29): {
+      errorMessage_ = "Error: Timeout";
+      break;
+    }
+    case (30): {
+      errorMessage_ = "Error: Trailer";
+      break;
+    }
+    case (31): {
+      errorMessage_ = "Error: Event number mismatch";
+      break;
+    }
+    case (32): {
+      errorMessage_ = "Error: Invalid or missing header";
+      break;
+    }
+    case (33): {
+      errorMessage_ = "Error: Invalid or missing trailer";
+      break;
+    }
+    case (34): {
+      errorMessage_ = "Error: Size mismatch";
+      break;
+    }
+    case (35): {
+      errorMessage_ = "Error: Invalid channel";
+      break;
+    }
+    case (36): {
+      errorMessage_ = "Error: Invalid ROC number";
+      break;
+    }
+    case (37): {
+      errorMessage_ = "Error: Invalid dcol/pixel address";
+      break;
+    }
+    default:
+      errorMessage_ = "Error: Unknown error type";
   };
-} 
+}
diff --git a/DataFormats/SiPixelRawData/src/classes.h b/DataFormats/SiPixelRawData/src/classes.h
index ab6b5d5f11363..73768cc373013 100644
--- a/DataFormats/SiPixelRawData/src/classes.h
+++ b/DataFormats/SiPixelRawData/src/classes.h
@@ -6,6 +6,4 @@
 #include "DataFormats/Common/interface/DetSetVector.h"
 #include <vector>
 
-
-#endif // SIPIXELRAWDATA_CLASSES_H
-
+#endif  // SIPIXELRAWDATA_CLASSES_H
diff --git a/DataFormats/SiStripDetId/interface/SiStripDetId.h b/DataFormats/SiStripDetId/interface/SiStripDetId.h
index 8a5c18456e941..8decfa5129832 100644
--- a/DataFormats/SiStripDetId/interface/SiStripDetId.h
+++ b/DataFormats/SiStripDetId/interface/SiStripDetId.h
@@ -7,94 +7,83 @@
 class SiStripDetId;
 
 /** Debug info for SiStripDetId class. */
-std::ostream& operator<< ( std::ostream&, const SiStripDetId& );
+std::ostream &operator<<(std::ostream &, const SiStripDetId &);
 
-/** 
+/**
     @class SiStripDetId
     @author R.Bainbridge
     @brief Detector identifier class for the strip tracker.
 */
 class SiStripDetId : public DetId {
-  
- public:
-
+public:
   // ---------- Constructors, enumerated types ----------
-  
+
   /** Construct a null id */
-  SiStripDetId()  : DetId() {;}
+  SiStripDetId() : DetId() { ; }
 
   /** Construct from a raw value */
-  SiStripDetId( const uint32_t& raw_id ) : DetId( raw_id ) {;}
+  SiStripDetId(const uint32_t &raw_id) : DetId(raw_id) { ; }
 
   /** Construct from generic DetId */
-  SiStripDetId( const DetId& det_id )  : DetId( det_id.rawId() ) {;}
+  SiStripDetId(const DetId &det_id) : DetId(det_id.rawId()) { ; }
 
   /** Construct and fill only the det and sub-det fields. */
-  SiStripDetId( Detector det, int subdet ) : DetId( det, subdet ) {;}
+  SiStripDetId(Detector det, int subdet) : DetId(det, subdet) { ; }
 
   /** Enumerated type for tracker sub-deteector systems. */
-  enum SubDetector { UNKNOWN=0, TIB=3, TID=4, TOB=5, TEC=6 };
-  
+  enum SubDetector { UNKNOWN = 0, TIB = 3, TID = 4, TOB = 5, TEC = 6 };
+
   /** Enumerated type for tracker module geometries. */
-  enum ModuleGeometry {UNKNOWNGEOMETRY, IB1, IB2, OB1, OB2, W1A, W2A, W3A, W1B, W2B, W3B, W4, W5, W6, W7};
+  enum ModuleGeometry { UNKNOWNGEOMETRY, IB1, IB2, OB1, OB2, W1A, W2A, W3A, W1B, W2B, W3B, W4, W5, W6, W7 };
 
   // ---------- Common methods ----------
 
   /** Returns enumerated type specifying sub-detector. */
   inline SubDetector subDetector() const;
-  
+
   /** Returns enumerated type specifying sub-detector. */
   inline ModuleGeometry moduleGeometry() const;
 
   /** A non-zero value means a glued module, null means not glued. */
   inline uint32_t glued() const;
-  
+
   /** A non-zero value means a stereo module, null means not stereo. */
   inline uint32_t stereo() const;
 
   /** Returns DetId of the partner module if glued, otherwise null. */
   inline uint32_t partnerDetId() const;
- 
+
   /** Returns strip length of strip tracker sensor, otherwise null. */
   inline double stripLength() const;
-  
-  
+
   // ---------- Constructors that set "reserved" field ----------
-  
+
   /** Construct from a raw value and set "reserved" field. */
-  SiStripDetId( const uint32_t& raw_id, 
-		const uint16_t& reserved )
-    : DetId( raw_id ) 
-  {
-    id_ &= ( ~static_cast<uint32_t>(reservedMask_<<reservedStartBit_) );
-    id_ |= ( ( reserved & reservedMask_ ) << reservedStartBit_ );
+  SiStripDetId(const uint32_t &raw_id, const uint16_t &reserved) : DetId(raw_id) {
+    id_ &= (~static_cast<uint32_t>(reservedMask_ << reservedStartBit_));
+    id_ |= ((reserved & reservedMask_) << reservedStartBit_);
   }
-  
+
   // -----------------------------------------------------------------------------
   //
-  
+
   /** Construct from generic DetId and set "reserved" field. */
-  SiStripDetId( const DetId& det_id, 
-		const uint16_t& reserved )
-    : DetId( det_id.rawId() ) 
-  {
-    id_ &= ( ~static_cast<uint32_t>(reservedMask_<<reservedStartBit_) );
-    id_ |= ( ( reserved & reservedMask_ ) << reservedStartBit_ );
+  SiStripDetId(const DetId &det_id, const uint16_t &reserved) : DetId(det_id.rawId()) {
+    id_ &= (~static_cast<uint32_t>(reservedMask_ << reservedStartBit_));
+    id_ |= ((reserved & reservedMask_) << reservedStartBit_);
   }
 
-  
   /** Returns value of "reserved" field. */
   inline uint16_t reserved() const;
-  
+
 private:
-  
-  /** Position of "reserved" bit field. */ 
+  /** Position of "reserved" bit field. */
   static const uint16_t reservedStartBit_ = 20;
-  
+
   /** */
   static const uint32_t sterStartBit_ = 0;
 
-  /** Mask for "reserved" bit field (3-bits wide). */ 
+  /** Mask for "reserved" bit field (3-bits wide). */
   static const uint16_t reservedMask_ = 0x7;
 
   /** */
@@ -102,11 +91,10 @@ class SiStripDetId : public DetId {
 
   static const unsigned layerStartBit_ = 14;
   static const unsigned layerMask_ = 0x7;
-  static const unsigned ringStartBitTID_= 9;
-  static const unsigned ringMaskTID_= 0x3;
-  static const unsigned ringStartBitTEC_= 5;
-  static const unsigned ringMaskTEC_= 0x7;
-  
+  static const unsigned ringStartBitTID_ = 9;
+  static const unsigned ringMaskTID_ = 0x3;
+  static const unsigned ringStartBitTEC_ = 5;
+  static const unsigned ringMaskTEC_ = 0x7;
 };
 
 // ---------- inline methods ----------
@@ -117,68 +105,77 @@ SiStripDetId::SubDetector SiStripDetId::subDetector() const {
 
 SiStripDetId::ModuleGeometry SiStripDetId::moduleGeometry() const {
   SiStripDetId::ModuleGeometry geometry = UNKNOWNGEOMETRY;
-  switch(subDetector()) {
-  case TIB: geometry = int((id_>>layerStartBit_) & layerMask_)<3? IB1 : IB2;
-    break;
-  case TOB: geometry = int((id_>>layerStartBit_) & layerMask_)<5? OB2 : OB1;
-    break;
-  case TID: switch ((id_>>ringStartBitTID_) & ringMaskTID_) {
-    case 1: geometry = W1A;
-      break;
-    case 2: geometry = W2A;
+  switch (subDetector()) {
+    case TIB:
+      geometry = int((id_ >> layerStartBit_) & layerMask_) < 3 ? IB1 : IB2;
       break;
-    case 3: geometry = W3A;
+    case TOB:
+      geometry = int((id_ >> layerStartBit_) & layerMask_) < 5 ? OB2 : OB1;
       break;
-    }
-    break;
-  case TEC: switch ((id_>>ringStartBitTEC_) & ringMaskTEC_) {
-    case 1: geometry = W1B;
+    case TID:
+      switch ((id_ >> ringStartBitTID_) & ringMaskTID_) {
+        case 1:
+          geometry = W1A;
+          break;
+        case 2:
+          geometry = W2A;
+          break;
+        case 3:
+          geometry = W3A;
+          break;
+      }
       break;
-    case 2: geometry = W2B;
-      break;
-    case 3: geometry = W3B;
-      break;
-    case 4: geometry = W4;
-      break;
-    case 5: geometry = W5;
-      break;
-    case 6: geometry = W6;
-      break;
-    case 7: geometry = W7;
-      break;
-    }
-  case UNKNOWN: default:;  
+    case TEC:
+      switch ((id_ >> ringStartBitTEC_) & ringMaskTEC_) {
+        case 1:
+          geometry = W1B;
+          break;
+        case 2:
+          geometry = W2B;
+          break;
+        case 3:
+          geometry = W3B;
+          break;
+        case 4:
+          geometry = W4;
+          break;
+        case 5:
+          geometry = W5;
+          break;
+        case 6:
+          geometry = W6;
+          break;
+        case 7:
+          geometry = W7;
+          break;
+      }
+    case UNKNOWN:
+    default:;
   }
   return geometry;
 }
 
 uint32_t SiStripDetId::glued() const {
-  uint32_t testId = (id_>>sterStartBit_) & sterMask_;
-  return ( testId == 0 ) ? 0 : (id_ - testId);
-}
- 
-uint32_t SiStripDetId::stereo() const {
-  return ( ((id_>>sterStartBit_) & sterMask_) == 1 ) ? 1 : 0;
+  uint32_t testId = (id_ >> sterStartBit_) & sterMask_;
+  return (testId == 0) ? 0 : (id_ - testId);
 }
- 
+
+uint32_t SiStripDetId::stereo() const { return (((id_ >> sterStartBit_) & sterMask_) == 1) ? 1 : 0; }
+
 uint32_t SiStripDetId::partnerDetId() const {
-  uint32_t testId = (id_>>sterStartBit_) & sterMask_;
-  if ( testId == 1 ) {
+  uint32_t testId = (id_ >> sterStartBit_) & sterMask_;
+  if (testId == 1) {
     testId = id_ + 1;
-  } else if ( testId == 2 ) {
+  } else if (testId == 2) {
     testId = id_ - 1;
-  } else { testId = 0; }
+  } else {
+    testId = 0;
+  }
   return testId;
 }
- 
-double SiStripDetId::stripLength() const {
-  return 0.;
-}
-
 
-uint16_t SiStripDetId::reserved() const { 
-  return static_cast<uint16_t>( (id_>>reservedStartBit_) & reservedMask_ );
-}
+double SiStripDetId::stripLength() const { return 0.; }
 
-#endif // DataFormats_SiStripDetId_SiStripDetId_h
+uint16_t SiStripDetId::reserved() const { return static_cast<uint16_t>((id_ >> reservedStartBit_) & reservedMask_); }
 
+#endif  // DataFormats_SiStripDetId_SiStripDetId_h
diff --git a/DataFormats/SiStripDetId/interface/SiStripSubStructure.h b/DataFormats/SiStripDetId/interface/SiStripSubStructure.h
index f595c9debab28..ab661ce5674cd 100644
--- a/DataFormats/SiStripDetId/interface/SiStripSubStructure.h
+++ b/DataFormats/SiStripDetId/interface/SiStripSubStructure.h
@@ -5,9 +5,11 @@
 // Package:     SiStripDetId
 // Class  :     SiStripSubStructure
 //
-/**\class SiStripSubStructure SiStripSubStructure.h DataFormats/SiStripDetId/interface/SiStripSubStructure.h
+/**\class SiStripSubStructure SiStripSubStructure.h
+ DataFormats/SiStripDetId/interface/SiStripSubStructure.h
 
- Description: <Assign detector Ids to different substructures of the SiStripTracker: TOB, TIB, etc>
+ Description: <Assign detector Ids to different substructures of the
+ SiStripTracker: TOB, TIB, etc>
 
  Usage:
     <usage>
@@ -18,44 +20,43 @@
 //         Created:  Wed Jan 25 07:18:21 CET 2006
 //
 
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 class TrackerTopology;
 
 namespace SiStripSubStructure {
-  void getTIBDetectors(const std::vector<uint32_t> & inputDetRawIds, // INPUT
-                       std::vector<uint32_t> & tibDetRawIds,         // OUTPUT
-                       const TrackerTopology* trackerTopology,       // TrackerTopology
-                       uint32_t layer         = 0,                   // SELECTION: layer = 1..4, 0(ALL)
+  void getTIBDetectors(const std::vector<uint32_t> &inputDetRawIds,  // INPUT
+                       std::vector<uint32_t> &tibDetRawIds,          // OUTPUT
+                       const TrackerTopology *trackerTopology,       // TrackerTopology
+                       uint32_t layer = 0,                           // SELECTION: layer = 1..4, 0(ALL)
                        uint32_t bkw_frw = 0,                         // bkw_frw = 1(TIB-), 2(TIB+) 0(ALL)
                        uint32_t int_ext = 0,                         // int_ext = 1 (internal), 2(external), 0(ALL)
-                       uint32_t string        = 0);                  // string = 1..N, 0(ALL)
-
-  void getTIDDetectors(const std::vector<uint32_t> & inputDetRawIds, // INPUT
-                       std::vector<uint32_t> & tidDetRawIds,         // OUTPUT
-                       const TrackerTopology* trackerTopology,       // TrackerTopology
-                       uint32_t side        = 0,                     // SELECTION: side = 1(back), 2(front), 0(ALL)
-                       uint32_t wheel       = 0,                     // wheel = 1..3, 0(ALL)
-                       uint32_t ring        = 0,                     // ring  = 1..3, 0(ALL)
-                       uint32_t ster        = 0);                    // ster = 1(stereo), else (nonstereo), 0(ALL)
-
-  void getTOBDetectors(const std::vector<uint32_t> & inputDetRawIds, // INPUT
-                       std::vector<uint32_t> & tobDetRawIds,         // OUTPUT
-                       const TrackerTopology* trackerTopology,       // TrackerTopology
-                       uint32_t layer      = 0,                      // SELECTION: layer = 1..6, 0(ALL)
-                       uint32_t bkw_frw    = 0,                      // bkw_frw = 1(TOB-) 2(TOB+) 0(everything)
-                       uint32_t rod        = 0);                     // rod = 1..N, 0(ALL)
-
-
-  void getTECDetectors(const std::vector<uint32_t> & inputDetRawIds, // INPUT
-                       std::vector<uint32_t> & tecDetRawIds,         // OUTPUT
-                       const TrackerTopology* trackerTopology,       // TrackerTopology
-                       uint32_t side          = 0,                   // SELECTION: side = 1(TEC-), 2(TEC+),  0(ALL)
-                       uint32_t wheel         = 0,                   // wheel = 1..9, 0(ALL)
+                       uint32_t string = 0);                         // string = 1..N, 0(ALL)
+
+  void getTIDDetectors(const std::vector<uint32_t> &inputDetRawIds,  // INPUT
+                       std::vector<uint32_t> &tidDetRawIds,          // OUTPUT
+                       const TrackerTopology *trackerTopology,       // TrackerTopology
+                       uint32_t side = 0,                            // SELECTION: side = 1(back), 2(front), 0(ALL)
+                       uint32_t wheel = 0,                           // wheel = 1..3, 0(ALL)
+                       uint32_t ring = 0,                            // ring  = 1..3, 0(ALL)
+                       uint32_t ster = 0);                           // ster = 1(stereo), else (nonstereo), 0(ALL)
+
+  void getTOBDetectors(const std::vector<uint32_t> &inputDetRawIds,  // INPUT
+                       std::vector<uint32_t> &tobDetRawIds,          // OUTPUT
+                       const TrackerTopology *trackerTopology,       // TrackerTopology
+                       uint32_t layer = 0,                           // SELECTION: layer = 1..6, 0(ALL)
+                       uint32_t bkw_frw = 0,                         // bkw_frw = 1(TOB-) 2(TOB+) 0(everything)
+                       uint32_t rod = 0);                            // rod = 1..N, 0(ALL)
+
+  void getTECDetectors(const std::vector<uint32_t> &inputDetRawIds,  // INPUT
+                       std::vector<uint32_t> &tecDetRawIds,          // OUTPUT
+                       const TrackerTopology *trackerTopology,       // TrackerTopology
+                       uint32_t side = 0,                            // SELECTION: side = 1(TEC-), 2(TEC+),  0(ALL)
+                       uint32_t wheel = 0,                           // wheel = 1..9, 0(ALL)
                        uint32_t petal_bkw_frw = 0,                   // petal_bkw_frw = 1(backward) 2(forward) 0(all)
-                       uint32_t petal         = 0,                   // petal = 1..8, 0(ALL)
-                       uint32_t ring          = 0,                   // ring = 1..7, 0(ALL)
-                       uint32_t ster          = 0);                  // ster = 1(sterero), else(nonstereo), 0(ALL)
-};
+                       uint32_t petal = 0,                           // petal = 1..8, 0(ALL)
+                       uint32_t ring = 0,                            // ring = 1..7, 0(ALL)
+                       uint32_t ster = 0);                           // ster = 1(sterero), else(nonstereo), 0(ALL)
+};                                                                   // namespace SiStripSubStructure
 #endif
diff --git a/DataFormats/SiStripDetId/interface/StripSubdetector.h b/DataFormats/SiStripDetId/interface/StripSubdetector.h
index c408285ddd497..d6b9ed5f0091e 100644
--- a/DataFormats/SiStripDetId/interface/StripSubdetector.h
+++ b/DataFormats/SiStripDetId/interface/StripSubdetector.h
@@ -1,79 +1,71 @@
 #ifndef DataFormats_SiStripDetId_StripSubdetector_H
 #define DataFormats_SiStripDetId_StripSubdetector_H
 
-/** 
+/**
  *  Enumeration for Strip Tracker Subdetectors
  *
  */
 
-
 #include "DataFormats/DetId/interface/DetId.h"
 
-class StripSubdetector :public DetId { 
- public:
- enum SubDetector { TIB=3,TID=4,TOB=5,TEC=6 };
- 
- /** Constructor from a raw value */
- StripSubdetector(uint32_t rawid) : DetId(rawid) {}
- /**Construct from generic DetId */
- StripSubdetector(const DetId& id) : DetId(id) {}
- 
- 
- /// glued
- /**
-  * glued() = 0 it's not a glued module
-  * glued() != 0 it's a glued module
-  */
- unsigned int glued() const
-   {
-     if(((id_>>sterStartBit_)& sterMask_) == 1){
-       return (id_ -1);
-     }else if(((id_>>sterStartBit_)& sterMask_) == 2){
-       return (id_ -2);
-     }else{
-       return 0;
-     }
-   }
- 
- /// stereo 
- /**
-  * stereo() = 0 it's not a stereo module
-  * stereo() = 1 it's a stereo module
-  */
- unsigned int stereo() const 
-   {
-     if(((id_>>sterStartBit_)& sterMask_)==1){
-       return ((id_>>sterStartBit_)& sterMask_);
-     }else{
-       return 0;
-     }
-   }
- 
- /**
-  * If the DetId identify a glued module return 
-  * the DetId of your partner otherwise return 0
-  */
- 
- unsigned int partnerDetId() const
-   {
-     if(((id_>>sterStartBit_)& sterMask_)==1){
-       return (id_ + 1);
-     }else if(((id_>>sterStartBit_)& sterMask_)==2){
-       return (id_ - 1);
-     }else{
-       return 0;
-     }
-   }
- 
- private:
- static const unsigned int detStartBit_=       2;
- static const unsigned int sterStartBit_=      0;
- 
- static const unsigned int detMask_=           0x3;
- static const unsigned int sterMask_=          0x3;
- 
- 
-};
+class StripSubdetector : public DetId {
+public:
+  enum SubDetector { TIB = 3, TID = 4, TOB = 5, TEC = 6 };
+
+  /** Constructor from a raw value */
+  StripSubdetector(uint32_t rawid) : DetId(rawid) {}
+  /**Construct from generic DetId */
+  StripSubdetector(const DetId &id) : DetId(id) {}
+
+  /// glued
+  /**
+   * glued() = 0 it's not a glued module
+   * glued() != 0 it's a glued module
+   */
+  unsigned int glued() const {
+    if (((id_ >> sterStartBit_) & sterMask_) == 1) {
+      return (id_ - 1);
+    } else if (((id_ >> sterStartBit_) & sterMask_) == 2) {
+      return (id_ - 2);
+    } else {
+      return 0;
+    }
+  }
+
+  /// stereo
+  /**
+   * stereo() = 0 it's not a stereo module
+   * stereo() = 1 it's a stereo module
+   */
+  unsigned int stereo() const {
+    if (((id_ >> sterStartBit_) & sterMask_) == 1) {
+      return ((id_ >> sterStartBit_) & sterMask_);
+    } else {
+      return 0;
+    }
+  }
 
+  /**
+   * If the DetId identify a glued module return
+   * the DetId of your partner otherwise return 0
+   */
+
+  unsigned int partnerDetId() const {
+    if (((id_ >> sterStartBit_) & sterMask_) == 1) {
+      return (id_ + 1);
+    } else if (((id_ >> sterStartBit_) & sterMask_) == 2) {
+      return (id_ - 1);
+    } else {
+      return 0;
+    }
+  }
+
+private:
+  static const unsigned int detStartBit_ = 2;
+  static const unsigned int sterStartBit_ = 0;
+
+  static const unsigned int detMask_ = 0x3;
+  static const unsigned int sterMask_ = 0x3;
+};
 
 #endif
diff --git a/DataFormats/SiStripDetId/src/SiStripDetId.cc b/DataFormats/SiStripDetId/src/SiStripDetId.cc
index e636f489f5c3b..8d9b8a4214624 100644
--- a/DataFormats/SiStripDetId/src/SiStripDetId.cc
+++ b/DataFormats/SiStripDetId/src/SiStripDetId.cc
@@ -1,20 +1,13 @@
 #include "DataFormats/SiStripDetId/interface/SiStripDetId.h"
 #include <iomanip>
 
-
-
-std::ostream& operator<< ( std::ostream& os, const SiStripDetId& id ) {
+std::ostream &operator<<(std::ostream &os, const SiStripDetId &id) {
   return os << "[SiStripDetId::print]" << std::endl
-	    << " rawId       : 0x" 
-	    << std::hex << std::setfill('0') << std::setw(8)
-	    << id.rawId()
-	    << std::dec << std::endl
-	    << " bits[0:24]  : " 
-	    << std::hex << std::setfill('0') << std::setw(8) 
-	    << (0x01FFFFFF & id.rawId())
-	    << std::dec << std::endl
-	    << " Detector    : " << id.det() << std::endl 
-	    << " SubDetector : " << id.subdetId() << std::endl
-	    << " reserved    : " << id.reserved();
+            << " rawId       : 0x" << std::hex << std::setfill('0') << std::setw(8) << id.rawId() << std::dec
+            << std::endl
+            << " bits[0:24]  : " << std::hex << std::setfill('0') << std::setw(8) << (0x01FFFFFF & id.rawId())
+            << std::dec << std::endl
+            << " Detector    : " << id.det() << std::endl
+            << " SubDetector : " << id.subdetId() << std::endl
+            << " reserved    : " << id.reserved();
 }
-
diff --git a/DataFormats/SiStripDetId/src/SiStripSubStructure.cc b/DataFormats/SiStripDetId/src/SiStripSubStructure.cc
index 4e10e36c65065..530b95e357fb4 100644
--- a/DataFormats/SiStripDetId/src/SiStripSubStructure.cc
+++ b/DataFormats/SiStripDetId/src/SiStripSubStructure.cc
@@ -2,85 +2,101 @@
 //
 // Package:     SiStripDetId
 // Class  :     SiStripSubStructure
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
 // Original Author:  dkcira
 //         Created:  Wed Jan 25 07:19:38 CET 2006
 //
-#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
+#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include <algorithm>
 
 #include "DataFormats/SiStripDetId/interface/SiStripSubStructure.h"
 
-void SiStripSubStructure::getTIBDetectors(const std::vector<uint32_t> & inputDetRawIds, std::vector<uint32_t> & tibDetRawIds,
-                                          const TrackerTopology* tTopo,
-                                          uint32_t rq_layer, uint32_t rq_bkw_frw, uint32_t rq_int_ext, uint32_t rq_string)
-{
-  std::copy_if(std::begin(inputDetRawIds), std::end(inputDetRawIds), std::back_inserter(tibDetRawIds),
-      [tTopo,rq_layer,rq_bkw_frw,rq_int_ext,rq_string] ( DetId det ) {
-        return ( ( StripSubdetector::TIB == det.subdetId() )
-                 // check if TIB is from the ones requested
-                 // take everything if default value is 0
-            &&  ( (rq_layer   == 0) || (rq_layer   == tTopo->tibLayer (det)) )
-            &&  ( (rq_bkw_frw == 0) || (rq_bkw_frw == tTopo->tibSide  (det)) )
-            &&  ( (rq_int_ext == 0) || (rq_int_ext == tTopo->tibOrder (det)) )
-            &&  ( (rq_string  == 0) || (rq_string  == tTopo->tibString(det)) )
-            );
-      });
+void SiStripSubStructure::getTIBDetectors(const std::vector<uint32_t> &inputDetRawIds,
+                                          std::vector<uint32_t> &tibDetRawIds,
+                                          const TrackerTopology *tTopo,
+                                          uint32_t rq_layer,
+                                          uint32_t rq_bkw_frw,
+                                          uint32_t rq_int_ext,
+                                          uint32_t rq_string) {
+  std::copy_if(std::begin(inputDetRawIds),
+               std::end(inputDetRawIds),
+               std::back_inserter(tibDetRawIds),
+               [tTopo, rq_layer, rq_bkw_frw, rq_int_ext, rq_string](DetId det) {
+                 return ((StripSubdetector::TIB == det.subdetId())
+                         // check if TIB is from the ones requested
+                         // take everything if default value is 0
+                         && ((rq_layer == 0) || (rq_layer == tTopo->tibLayer(det))) &&
+                         ((rq_bkw_frw == 0) || (rq_bkw_frw == tTopo->tibSide(det))) &&
+                         ((rq_int_ext == 0) || (rq_int_ext == tTopo->tibOrder(det))) &&
+                         ((rq_string == 0) || (rq_string == tTopo->tibString(det))));
+               });
 }
 
-void SiStripSubStructure::getTIDDetectors(const std::vector<uint32_t> & inputDetRawIds, std::vector<uint32_t> & tidDetRawIds,
-                                          const TrackerTopology* tTopo,
-                                          uint32_t rq_side, uint32_t rq_wheel, uint32_t rq_ring, uint32_t rq_ster)
-{
-  std::copy_if(std::begin(inputDetRawIds), std::end(inputDetRawIds), std::back_inserter(tidDetRawIds),
-      [tTopo,rq_side,rq_wheel,rq_ring,rq_ster] ( DetId det ) {
-        return ( ( StripSubdetector::TID == det.subdetId() )
-                 // check if TID is from the ones requested
-                 // take everything if default value is 0
-            &&  ( (rq_side  == 0) || (rq_side  == tTopo->tidSide  (det)) )
-            &&  ( (rq_wheel == 0) || (rq_wheel == tTopo->tidWheel (det)) )
-            &&  ( (rq_ring  == 0) || (rq_ring  == tTopo->tidRing  (det)) )
-            &&  ( (rq_ster  == 0) || (rq_ster  == tTopo->tidStereo(det)) )
-            );
-      });
+void SiStripSubStructure::getTIDDetectors(const std::vector<uint32_t> &inputDetRawIds,
+                                          std::vector<uint32_t> &tidDetRawIds,
+                                          const TrackerTopology *tTopo,
+                                          uint32_t rq_side,
+                                          uint32_t rq_wheel,
+                                          uint32_t rq_ring,
+                                          uint32_t rq_ster) {
+  std::copy_if(std::begin(inputDetRawIds),
+               std::end(inputDetRawIds),
+               std::back_inserter(tidDetRawIds),
+               [tTopo, rq_side, rq_wheel, rq_ring, rq_ster](DetId det) {
+                 return ((StripSubdetector::TID == det.subdetId())
+                         // check if TID is from the ones requested
+                         // take everything if default value is 0
+                         && ((rq_side == 0) || (rq_side == tTopo->tidSide(det))) &&
+                         ((rq_wheel == 0) || (rq_wheel == tTopo->tidWheel(det))) &&
+                         ((rq_ring == 0) || (rq_ring == tTopo->tidRing(det))) &&
+                         ((rq_ster == 0) || (rq_ster == tTopo->tidStereo(det))));
+               });
 }
 
-void SiStripSubStructure::getTOBDetectors(const std::vector<uint32_t> & inputDetRawIds, std::vector<uint32_t> & tobDetRawIds,
-                                          const TrackerTopology* tTopo,
-                                          uint32_t rq_layer, uint32_t rq_bkw_frw, uint32_t rq_rod)
-{
-  std::copy_if(std::begin(inputDetRawIds), std::end(inputDetRawIds), std::back_inserter(tobDetRawIds),
-      [tTopo,rq_layer,rq_bkw_frw,rq_rod] ( DetId det ) {
-        return ( ( StripSubdetector::TOB == det.subdetId() )
-                 // check if TOB is from the ones requested
-                 // take everything if default value is 0
-            &&  ( (rq_layer   == 0) || (rq_layer   == tTopo->tobLayer (det)) )
-            &&  ( (rq_bkw_frw == 0) || (rq_bkw_frw == tTopo->tobSide  (det)) )
-            &&  ( (rq_rod     == 0) || (rq_rod     == tTopo->tobRod   (det)) )
-            );
-      });
+void SiStripSubStructure::getTOBDetectors(const std::vector<uint32_t> &inputDetRawIds,
+                                          std::vector<uint32_t> &tobDetRawIds,
+                                          const TrackerTopology *tTopo,
+                                          uint32_t rq_layer,
+                                          uint32_t rq_bkw_frw,
+                                          uint32_t rq_rod) {
+  std::copy_if(std::begin(inputDetRawIds),
+               std::end(inputDetRawIds),
+               std::back_inserter(tobDetRawIds),
+               [tTopo, rq_layer, rq_bkw_frw, rq_rod](DetId det) {
+                 return ((StripSubdetector::TOB == det.subdetId())
+                         // check if TOB is from the ones requested
+                         // take everything if default value is 0
+                         && ((rq_layer == 0) || (rq_layer == tTopo->tobLayer(det))) &&
+                         ((rq_bkw_frw == 0) || (rq_bkw_frw == tTopo->tobSide(det))) &&
+                         ((rq_rod == 0) || (rq_rod == tTopo->tobRod(det))));
+               });
 }
 
-
-void SiStripSubStructure::getTECDetectors(const std::vector<uint32_t> & inputDetRawIds, std::vector<uint32_t> & tecDetRawIds,
-                                          const TrackerTopology* tTopo,
-                                          uint32_t rq_side, uint32_t rq_wheel, uint32_t rq_petal_bkw_frw, uint32_t rq_petal, uint32_t rq_ring, uint32_t rq_ster)
-{
-  std::copy_if(std::begin(inputDetRawIds), std::end(inputDetRawIds), std::back_inserter(tecDetRawIds),
-      [tTopo,rq_side,rq_wheel,rq_petal_bkw_frw,rq_petal,rq_ring,rq_ster] ( DetId det ) {
-        return ( ( StripSubdetector::TEC == det.subdetId() )
-                 // check if TEC is from the ones requested
-                 // take everything if default value is 0
-            &&  ( (rq_side          == 0) || (rq_side            == tTopo->tecSide       (det)) )
-            &&  ( (rq_wheel         == 0) || (rq_wheel           == tTopo->tecWheel      (det)) )
-            &&  ( (rq_petal_bkw_frw == 0) || (rq_petal_bkw_frw-1 == tTopo->tecOrder      (det)) )
-            &&  ( (rq_petal         == 0) || (rq_petal           == tTopo->tecPetalNumber(det)) )
-            &&  ( (rq_ring          == 0) || (rq_ring            == tTopo->tecRing       (det)) )
-            &&  ( (rq_ster          == 0) || (rq_ster            == tTopo->tecStereo     (det)) )
-            );
-      });
+void SiStripSubStructure::getTECDetectors(const std::vector<uint32_t> &inputDetRawIds,
+                                          std::vector<uint32_t> &tecDetRawIds,
+                                          const TrackerTopology *tTopo,
+                                          uint32_t rq_side,
+                                          uint32_t rq_wheel,
+                                          uint32_t rq_petal_bkw_frw,
+                                          uint32_t rq_petal,
+                                          uint32_t rq_ring,
+                                          uint32_t rq_ster) {
+  std::copy_if(std::begin(inputDetRawIds),
+               std::end(inputDetRawIds),
+               std::back_inserter(tecDetRawIds),
+               [tTopo, rq_side, rq_wheel, rq_petal_bkw_frw, rq_petal, rq_ring, rq_ster](DetId det) {
+                 return ((StripSubdetector::TEC == det.subdetId())
+                         // check if TEC is from the ones requested
+                         // take everything if default value is 0
+                         && ((rq_side == 0) || (rq_side == tTopo->tecSide(det))) &&
+                         ((rq_wheel == 0) || (rq_wheel == tTopo->tecWheel(det))) &&
+                         ((rq_petal_bkw_frw == 0) || (rq_petal_bkw_frw - 1 == tTopo->tecOrder(det))) &&
+                         ((rq_petal == 0) || (rq_petal == tTopo->tecPetalNumber(det))) &&
+                         ((rq_ring == 0) || (rq_ring == tTopo->tecRing(det))) &&
+                         ((rq_ster == 0) || (rq_ster == tTopo->tecStereo(det))));
+               });
 }
diff --git a/DataFormats/SiStripDigi/interface/SiStripDigi.h b/DataFormats/SiStripDigi/interface/SiStripDigi.h
index c318665805923..abb4748d988ef 100644
--- a/DataFormats/SiStripDigi/interface/SiStripDigi.h
+++ b/DataFormats/SiStripDigi/interface/SiStripDigi.h
@@ -10,39 +10,29 @@
      zero-suppresed hit information.
 */
 class SiStripDigi {
+public:
+  SiStripDigi(const uint16_t& strip, const uint16_t& adc) : strip_(strip), adc_(adc) { ; }
 
- public:
+  SiStripDigi() : strip_(0), adc_(0) { ; }
+  ~SiStripDigi() { ; }
 
-  SiStripDigi( const uint16_t& strip, 
-	     const uint16_t& adc ) : 
-    strip_(strip), 
-    adc_(adc) {;}
-  
-  SiStripDigi() : strip_(0), adc_(0) {;}
-  ~SiStripDigi() {;}
-  
   inline const uint16_t& strip() const;
   inline const uint16_t& adc() const;
   inline const uint16_t& channel() const;
 
-  inline bool operator< ( const SiStripDigi& other ) const;
-  
- private:
-  
+  inline bool operator<(const SiStripDigi& other) const;
+
+private:
   uint16_t strip_;
   uint16_t adc_;
-  
 };
 
-std::ostream & operator<<(std::ostream & o, const SiStripDigi& digi);
+std::ostream& operator<<(std::ostream& o, const SiStripDigi& digi);
 
 // inline methods
 const uint16_t& SiStripDigi::strip() const { return strip_; }
 const uint16_t& SiStripDigi::adc() const { return adc_; }
 const uint16_t& SiStripDigi::channel() const { return strip(); }
-bool SiStripDigi::operator< ( const SiStripDigi& other ) const { return strip() < other.strip(); }
-
-#endif // DataFormats_SiStripDigi_SiStripDigi_H
-
-
+bool SiStripDigi::operator<(const SiStripDigi& other) const { return strip() < other.strip(); }
 
+#endif  // DataFormats_SiStripDigi_SiStripDigi_H
diff --git a/DataFormats/SiStripDigi/interface/SiStripProcessedRawDigi.h b/DataFormats/SiStripDigi/interface/SiStripProcessedRawDigi.h
index 892b0a86d8797..a3c95a0bbc4f1 100644
--- a/DataFormats/SiStripDigi/interface/SiStripProcessedRawDigi.h
+++ b/DataFormats/SiStripDigi/interface/SiStripProcessedRawDigi.h
@@ -14,33 +14,28 @@
     container (the DetSet private vector).
 */
 class SiStripProcessedRawDigi : public edm::DoNotSortUponInsertion {
-  
- public:
+public:
+  SiStripProcessedRawDigi(const float& adc) : adc_(adc) { ; }
 
-  SiStripProcessedRawDigi( const float& adc ) : adc_(adc) {;}
+  SiStripProcessedRawDigi() : adc_(0) { ; }
+  ~SiStripProcessedRawDigi() { ; }
 
-  SiStripProcessedRawDigi() : adc_(0) {;}
-  ~SiStripProcessedRawDigi() {;}
-  
   inline const float& adc() const;
-  
+
   /** Not used! (even if implementation is required). */
-  inline bool operator< ( const SiStripProcessedRawDigi& other ) const;
-  
- private:
-  
+  inline bool operator<(const SiStripProcessedRawDigi& other) const;
+
+private:
   float adc_;
-  
 };
 
-#include<iostream>
-inline std::ostream & operator<<(std::ostream & o, const SiStripProcessedRawDigi& digi) {
-  return o << " " << digi.adc();
-}
+#include <iostream>
+inline std::ostream& operator<<(std::ostream& o, const SiStripProcessedRawDigi& digi) { return o << " " << digi.adc(); }
 
-// inline methods 
-const float& SiStripProcessedRawDigi::adc() const {  return adc_; }
-bool SiStripProcessedRawDigi::operator< ( const SiStripProcessedRawDigi& other ) const { return ( this->adc() < other.adc() ); }
-
-#endif // AnalysisDataFormats_SiStripDigi_SiStripProcessedRawDigi_H
+// inline methods
+const float& SiStripProcessedRawDigi::adc() const { return adc_; }
+bool SiStripProcessedRawDigi::operator<(const SiStripProcessedRawDigi& other) const {
+  return (this->adc() < other.adc());
+}
 
+#endif  // AnalysisDataFormats_SiStripDigi_SiStripProcessedRawDigi_H
diff --git a/DataFormats/SiStripDigi/interface/SiStripRawDigi.h b/DataFormats/SiStripDigi/interface/SiStripRawDigi.h
index 86f524ffc1633..cce8e1dc6a952 100644
--- a/DataFormats/SiStripDigi/interface/SiStripRawDigi.h
+++ b/DataFormats/SiStripDigi/interface/SiStripRawDigi.h
@@ -13,33 +13,26 @@
     within its container (the DetSet private vector).
 */
 class SiStripRawDigi : public edm::DoNotSortUponInsertion {
-  
- public:
+public:
+  SiStripRawDigi(const uint16_t& adc) : adc_(adc) { ; }
 
-  SiStripRawDigi( const uint16_t& adc ) : adc_(adc) {;}
+  SiStripRawDigi() : adc_(0) { ; }
+  ~SiStripRawDigi() { ; }
 
-  SiStripRawDigi() : adc_(0) {;}
-  ~SiStripRawDigi() {;}
-  
   inline const uint16_t& adc() const;
-  
+
   /** Not used! (even if implementation is required). */
-  inline bool operator< ( const SiStripRawDigi& other ) const;
-  
- private:
-  
+  inline bool operator<(const SiStripRawDigi& other) const;
+
+private:
   uint16_t adc_;
-  
 };
 
-#include<iostream>
-inline std::ostream & operator<<(std::ostream & o, const SiStripRawDigi& digi) {
-  return o << " " << digi.adc();
-}
-
-// inline methods 
-const uint16_t& SiStripRawDigi::adc() const {  return adc_; }
-bool SiStripRawDigi::operator< ( const SiStripRawDigi& other ) const { return ( this->adc() < other.adc() ); }
+#include <iostream>
+inline std::ostream& operator<<(std::ostream& o, const SiStripRawDigi& digi) { return o << " " << digi.adc(); }
 
-#endif // DataFormats_SiStripDigi_SiStripRawDigi_H
+// inline methods
+const uint16_t& SiStripRawDigi::adc() const { return adc_; }
+bool SiStripRawDigi::operator<(const SiStripRawDigi& other) const { return (this->adc() < other.adc()); }
 
+#endif  // DataFormats_SiStripDigi_SiStripRawDigi_H
diff --git a/DataFormats/SiStripDigi/src/SiStripDigi.cc b/DataFormats/SiStripDigi/src/SiStripDigi.cc
index a15c46da06fd7..368ca187b0f63 100644
--- a/DataFormats/SiStripDigi/src/SiStripDigi.cc
+++ b/DataFormats/SiStripDigi/src/SiStripDigi.cc
@@ -1,7 +1,5 @@
 #include "DataFormats/SiStripDigi/interface/SiStripDigi.h"
 #include <ostream>
-std::ostream & operator<<(std::ostream & o, const SiStripDigi& digi) {
-  return o << " " << digi.strip()
-           << " " << digi.adc();
+std::ostream& operator<<(std::ostream& o, const SiStripDigi& digi) {
+  return o << " " << digi.strip() << " " << digi.adc();
 }
-
diff --git a/DataFormats/SiStripDigi/src/classes.h b/DataFormats/SiStripDigi/src/classes.h
index e30a9fa916e53..3c6437393a905 100644
--- a/DataFormats/SiStripDigi/src/classes.h
+++ b/DataFormats/SiStripDigi/src/classes.h
@@ -11,11 +11,8 @@
 #include "DataFormats/SiStripDigi/interface/SiStripDigi.h"
 
 #include "DataFormats/SiStripDigi/interface/SiStripRawDigi.h"
-#include "boost/cstdint.hpp" 
+#include "boost/cstdint.hpp"
 
 #include "DataFormats/SiStripDigi/interface/SiStripProcessedRawDigi.h"
 
-#endif // DataFormats_SiStripDigi_Classes_H
-
-
- 
+#endif  // DataFormats_SiStripDigi_Classes_H
diff --git a/DetectorDescription/DDCMS/data/cms-2015-muon-geometry.xml b/DetectorDescription/DDCMS/data/cms-2015-muon-geometry.xml
index 3b2e3eecbff54..37f82bc858c08 100644
--- a/DetectorDescription/DDCMS/data/cms-2015-muon-geometry.xml
+++ b/DetectorDescription/DDCMS/data/cms-2015-muon-geometry.xml
@@ -57,7 +57,7 @@
     <Include ref='Geometry/MuonCommonData/data/csc/2015/v2/csc.xml'/>
     <Include ref='Geometry/MuonCommonData/data/mfshield/2015/v1/mfshield.xml'/>
     <Include ref='Geometry/MuonCommonData/data/muonNumbering/2015/v2/muonNumbering.xml'/>
-    <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2019/v1/dtSpecsFilter.xml'/>
+    <Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml'/>
     <Include ref='Geometry/MuonSimData/data/muonProdCuts.xml'/>
     <Include ref='DetectorDescription/DDCMS/data/trackerParameters.xml'/>
   </IncludeSection>
diff --git a/DetectorDescription/DDCMS/data/cms-test-tid-axial-cable-algorithm.xml b/DetectorDescription/DDCMS/data/cms-test-tid-axial-cable-algorithm.xml
new file mode 100644
index 0000000000000..5f5a8e5e7daea
--- /dev/null
+++ b/DetectorDescription/DDCMS/data/cms-test-tid-axial-cable-algorithm.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<DDDefinition>
+  <debug>
+    <debug_shapes/>
+    <debug_includes/>
+    <debug_rotations/>
+    <debug_includes/>
+    <debug_volumes/>
+    <debug_constants/>
+    <debug_materials/>
+    <debug_namespaces/>
+    <debug_placements/>
+    <debug_algorithms/>
+  </debug>
+
+  <open_geometry/>
+  <close_geometry/>
+
+  <ConstantsSection label="" eval="true">
+    <Constant name="world_x" value="5*m"/>
+    <Constant name="world_y" value="5*m"/>
+    <Constant name="world_z" value="5*m"/>
+    <Constant name="fm"      value="1e-12*m"/>
+    <Constant name="Air"     value="materials:Air"     type="string"/>
+    <Constant name="Vacuum"  value="materials:Vacuum"  type="string"/>
+  </ConstantsSection>
+
+  <IncludeSection>
+    <Include ref="DetectorDescription/DDCMS/data/testDDTIDAxialCableAlgorithm.xml"/>
+    <Include ref="DetectorDescription/DDCMS/data/materials.xml"/>
+  </IncludeSection>
+  
+</DDDefinition>
diff --git a/DetectorDescription/DDCMS/data/testDDTIDAxialCableAlgorithm.xml b/DetectorDescription/DDCMS/data/testDDTIDAxialCableAlgorithm.xml
new file mode 100644
index 0000000000000..331782d85a6aa
--- /dev/null
+++ b/DetectorDescription/DDCMS/data/testDDTIDAxialCableAlgorithm.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<DDDefinition>
+  <SolidSection>
+    <Box name="MotherOfAllBoxes" dx="10*m" dy="10*m" dz="10*m"/>
+  </SolidSection>
+  <LogicalPartSection>
+    <LogicalPart name="MotherOfAllBoxes">
+      <rMaterial name="materials:Air"/>
+      <rSolid name="MotherOfAllBoxes"/>
+    </LogicalPart> 
+  </LogicalPartSection>
+  <Algorithm name="track:DDTIDAxialCableAlgo">
+    <rParent name="testDDTIDAxialCableAlgorithm:MotherOfAllBoxes"/>
+    <String name="ChildName" value="tidAxialCable"/>
+    <String name="MaterialIn" value="materials:Air"/>
+    <String name="MaterialOut" value="materials:Air"/>
+    <Numeric name="ZBend" value="30.*cm"/>
+    <Numeric name="ZEnd" value="30.*cm"/>
+    <Numeric name="RMin" value="10.*cm"/>
+    <Numeric name="RMax" value="15.*cm"/>
+    <Numeric name="RTop" value="20.*cm"/>
+    <Numeric name="Width" value="1.*mm"/>
+    <Numeric name="Thick" value="3.*mm"/>
+    <Vector name="Angles" type="numeric" nEntries="3"> 30.*deg, 10.*deg, 5.*deg </Vector>
+    <Vector name="ZPosWheel" type="numeric" nEntries="1"> 1.*cm</Vector>
+    <Vector name="ZPosRing" type="numeric" nEntries="1"> 1.*cm</Vector>
+  </Algorithm>
+  <PosPartSection label="">
+    <PosPart copyNumber="2">
+      <rParent name=":world_volume"/>
+      <rChild name="testDDTIDAxialCableAlgorithm:MotherOfAllBoxes"/>
+    </PosPart>
+  </PosPartSection>
+</DDDefinition>
diff --git a/DetectorDescription/DDCMS/test/python/testDDTIDAxialCableAlgorithm.py b/DetectorDescription/DDCMS/test/python/testDDTIDAxialCableAlgorithm.py
new file mode 100644
index 0000000000000..33d9691e6040e
--- /dev/null
+++ b/DetectorDescription/DDCMS/test/python/testDDTIDAxialCableAlgorithm.py
@@ -0,0 +1,51 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process("DDCMSDetectorTest")
+
+process.source = cms.Source("EmptySource")
+
+process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1) )
+
+process.MessageLogger = cms.Service(
+    "MessageLogger",
+    statistics = cms.untracked.vstring('cout', 'testTIDAxialCableAlgo'),
+    categories = cms.untracked.vstring('TIDGeom'),
+    cout = cms.untracked.PSet(
+        threshold = cms.untracked.string('WARNING'),
+        noLineBreaks = cms.untracked.bool(True)
+        ),
+    testTIDAxialCableAlgo = cms.untracked.PSet(
+        INFO = cms.untracked.PSet(
+            limit = cms.untracked.int32(0)
+            ),
+        noLineBreaks = cms.untracked.bool(True),
+        DEBUG = cms.untracked.PSet(
+            limit = cms.untracked.int32(0)
+            ),
+        WARNING = cms.untracked.PSet(
+            limit = cms.untracked.int32(0)
+            ),
+        ERROR = cms.untracked.PSet(
+            limit = cms.untracked.int32(0)
+            ),
+        threshold = cms.untracked.string('INFO'),
+        TIDGeom = cms.untracked.PSet(
+            limit = cms.untracked.int32(-1)
+            )
+        ),
+    destinations = cms.untracked.vstring('cout',
+                                         'testTIDAxialCableAlgo')
+    )
+
+process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
+    confGeomXMLFiles = cms.FileInPath(
+        'DetectorDescription/DDCMS/data/cms-test-tid-axial-cable-algorithm.xml'
+    ),
+    appendToDataLabel = cms.string('TestTIDAxialCable')
+)
+
+process.testDump = cms.EDAnalyzer("DDTestDumpFile",
+    DDDetector = cms.ESInputTag('TestTIDAxialCable')
+)
+
+process.p = cms.Path(process.testDump)
diff --git a/EgammaAnalysis/CSA07Skims/BuildFile.xml b/EgammaAnalysis/CSA07Skims/BuildFile.xml
deleted file mode 100644
index c0b7fd9b537ce..0000000000000
--- a/EgammaAnalysis/CSA07Skims/BuildFile.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/CLHEP"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/Utilities"/>
-<use   name="Geometry/Records"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="clhep"/>
-<use   name="root"/>
-<flags   EDM_PLUGIN="1"/>
diff --git a/EgammaAnalysis/CSA07Skims/interface/EgammaProbeSelector.h b/EgammaAnalysis/CSA07Skims/interface/EgammaProbeSelector.h
deleted file mode 100644
index cfb0c47dd68f9..0000000000000
--- a/EgammaAnalysis/CSA07Skims/interface/EgammaProbeSelector.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef EgammaProbeSelector_h
-#define EgammaProbeSelector_h
-
-/** \class EgammaProbeSelector
- *
- *
- *  Filter to select events passing
- *  offline jets and superclusters
- *
- *
- */
-
-// system include files
-#include <memory>
-
-// user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDFilter.h"
-
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Utilities/interface/InputTag.h"
-
-
-#include "DataFormats/JetReco/interface/CaloJetCollection.h"
-#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
-
-#include <cmath>
-
-class EgammaProbeSelector : public edm::EDFilter {
-
-    public:
-        explicit EgammaProbeSelector(const edm::ParameterSet&);
-        ~EgammaProbeSelector() override;
-
-  	bool filter(edm::Event&, const edm::EventSetup& ) override;
-
-   private:
-	bool 		debug;
-
-	edm::EDGetTokenT<reco::CaloJetCollection> jetToken;
-        int 		minNumberOfjets;
-        double 		jetEtMin;
-        double 		jetEtaMin;
-        double 		jetEtaMax;
-
-	edm::EDGetTokenT<reco::SuperClusterCollection> scToken;
-        edm::EDGetTokenT<reco::SuperClusterCollection> scEEToken;
-        int 		minNumberOfSuperClusters;
-        double 		scEtMin;
-        double 		scEtaMin;
-        double 		scEtaMax;
-
-        int nEvents, nSelectedEvents;
-};
-#endif
-
-
-
diff --git a/EgammaAnalysis/CSA07Skims/python/AODSIMEgammaSkimEventContent_cff.py b/EgammaAnalysis/CSA07Skims/python/AODSIMEgammaSkimEventContent_cff.py
deleted file mode 100644
index 9609e37c60a3c..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/AODSIMEgammaSkimEventContent_cff.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# Egamma AODSIM event content 
-# Saves standard AODSIM and Egamma-specific data (which might not be empty)
-#
-from Configuration.EventContent.EventContent_cff import *
-from EgammaAnalysis.CSA07Skims.EgammaSkimEventContent_cff import *
-AODSIMEgammaSkimEventContent = cms.PSet(
-    outputCommands = cms.untracked.vstring()
-)
-AODSIMEgammaSkimEventContent.outputCommands.extend(AODSIMEventContent.outputCommands)
-AODSIMEgammaSkimEventContent.outputCommands.extend(egammaSkimEventContent.outputCommands)
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaLooseZOutputModule_cfi.py b/EgammaAnalysis/CSA07Skims/python/EgammaLooseZOutputModule_cfi.py
deleted file mode 100644
index 2b0a39c4eb4ea..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaLooseZOutputModule_cfi.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from EgammaAnalysis.CSA07Skims.egammaLooseZOutputModuleAODSIM_cfi import *
-from EgammaAnalysis.CSA07Skims.egammaLooseZOutputModuleRECOSIM_cfi import *
-from EgammaAnalysis.CSA07Skims.egammaLooseZOutputModuleFEVTSIM_cfi import *
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaLowEtTrigger_cfi.py b/EgammaAnalysis/CSA07Skims/python/EgammaLowEtTrigger_cfi.py
deleted file mode 100644
index a956a9d0f9877..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaLowEtTrigger_cfi.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-import copy
-from HLTrigger.HLTfilters.hltHighLevel_cfi import *
-EgammaLowEtTrigger = copy.deepcopy(hltHighLevel)
-EgammaLowEtTrigger.HLTPaths = ['HLT_IsoEle18_L1R']
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaSkimEventContent_cff.py b/EgammaAnalysis/CSA07Skims/python/EgammaSkimEventContent_cff.py
deleted file mode 100644
index e2dd7f26d254b..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaSkimEventContent_cff.py
+++ /dev/null
@@ -1,44 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-#
-# Egamma specific data, currently empty
-#
-egammaSkimEventContent = cms.PSet(
-    outputCommands = cms.untracked.vstring()
-)
-#
-# Loose Z selection (originally from EWK group) for electron validation
-#
-egammaLooseZEventSelection = cms.PSet(
-    SelectEvents = cms.untracked.PSet(
-        SelectEvents = cms.vstring('egammaLooseZCluster', 
-            'egammaLooseZTrack')
-    )
-)
-#
-# keep only very high pt clusters for control studies
-#
-egammaVeryHighEtEventSelection = cms.PSet(
-    SelectEvents = cms.untracked.PSet(
-        SelectEvents = cms.vstring('egammaVeryHighEt')
-    )
-)
-#
-# W + EM object or Jet for fake rate studies
-#
-egammaWPlusEMOrJetEventSelection = cms.PSet(
-    SelectEvents = cms.untracked.PSet(
-        SelectEvents = cms.vstring('electronFilterWPath', 
-            'muonFilterWPath')
-    )
-)
-#
-# Z + EM object or Jet for fake rate studies
-#
-egammaZPlusEMOrJetEventSelection = cms.PSet(
-    SelectEvents = cms.untracked.PSet(
-        SelectEvents = cms.vstring('electronFilterZPath', 
-            'muonFilterZPath')
-    )
-)
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaVeryHighEtOutputModule_cfi.py b/EgammaAnalysis/CSA07Skims/python/EgammaVeryHighEtOutputModule_cfi.py
deleted file mode 100644
index fe5ddd056127c..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaVeryHighEtOutputModule_cfi.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from EgammaAnalysis.CSA07Skims.egammaVeryHighEtOutputModuleAODSIM_cfi import *
-from EgammaAnalysis.CSA07Skims.egammaVeryHighEtOutputModuleRECOSIM_cfi import *
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaVeryHighEtPath_cff.py b/EgammaAnalysis/CSA07Skims/python/EgammaVeryHighEtPath_cff.py
deleted file mode 100644
index 6cef3659d7920..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaVeryHighEtPath_cff.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-#
-#Egamma skim, very high Et control sample
-#
-#The skim selects events based on HLT information alone
-#
-from EgammaAnalysis.CSA07Skims.EgammaVeryHighEtTrigger_cfi import *
-egammaVeryHighEt = cms.Path(EgammaVeryHighEtTrigger)
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaVeryHighEtTrigger_cfi.py b/EgammaAnalysis/CSA07Skims/python/EgammaVeryHighEtTrigger_cfi.py
deleted file mode 100644
index af073d3a3531e..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaVeryHighEtTrigger_cfi.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-import copy
-from HLTrigger.HLTfilters.hltHighLevel_cfi import *
-EgammaVeryHighEtTrigger = copy.deepcopy(hltHighLevel)
-EgammaVeryHighEtTrigger.HLTPaths = ['HLT_EM200']
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaWJetOutputModule_cfi.py b/EgammaAnalysis/CSA07Skims/python/EgammaWJetOutputModule_cfi.py
deleted file mode 100644
index a9f8a6c6dbc09..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaWJetOutputModule_cfi.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from Configuration.EventContent.EventContent_cff import *
-AODSIMWJetEventContent = cms.OutputModule("PoolOutputModule",
-    AODSIMEventContent,
-    dataset = cms.untracked.PSet(
-        filterName = cms.untracked.string('EgammaWJetFilter'),
-        dataTier = cms.untracked.string('AODSIM')
-    ),
-    SelectEvents = cms.untracked.PSet(
-        SelectEvents = cms.vstring('electronFilterPath', 
-            'muonFilterPath')
-    ),
-    fileName = cms.untracked.string('WJetFilteredAODSIM.root')
-)
-
-RECOSIMWJetEventContent = cms.OutputModule("PoolOutputModule",
-    RECOSIMEventContent,
-    dataset = cms.untracked.PSet(
-        filterName = cms.untracked.string('EgammaWJetFilter'),
-        dataTier = cms.untracked.string('RECOSIM')
-    ),
-    SelectEvents = cms.untracked.PSet(
-        SelectEvents = cms.vstring('electronFilterWPath', 
-            'muonFilterWPath')
-    ),
-    fileName = cms.untracked.string('WJetFilteredRECOSIM.root')
-)
-
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaWJetSkimPath_cff.py b/EgammaAnalysis/CSA07Skims/python/EgammaWJetSkimPath_cff.py
deleted file mode 100644
index b9932b9885904..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaWJetSkimPath_cff.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from EgammaAnalysis.CSA07Skims.EgammaWJetToEleHLT_cfi import *
-from EgammaAnalysis.CSA07Skims.EgammaWJetToMuHLT_cfi import *
-from EgammaAnalysis.CSA07Skims.EgammaWJetToElePlusProbe_cfi import *
-from EgammaAnalysis.CSA07Skims.EgammaWJetToMuPlusProbe_cfi import *
-electronFilterWPath = cms.Path(EgammaWJetToEleHLT+EgammaWJetToElePlusProbe)
-muonFilterWPath = cms.Path(EgammaWJetToMuHLT+EgammaWJetToMuPlusProbe)
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaWJetToEleHLT_cfi.py b/EgammaAnalysis/CSA07Skims/python/EgammaWJetToEleHLT_cfi.py
deleted file mode 100644
index 7b5f3f56866d4..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaWJetToEleHLT_cfi.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-import copy
-from HLTrigger.HLTfilters.hltHighLevel_cfi import *
-EgammaWJetToEleHLT = copy.deepcopy(hltHighLevel)
-EgammaWJetToEleHLT.HLTPaths = ['HLT_IsoEle15_L1I', 'HLT_IsoEle18_L1R']
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaWJetToElePlusProbe_cfi.py b/EgammaAnalysis/CSA07Skims/python/EgammaWJetToElePlusProbe_cfi.py
deleted file mode 100644
index affa6b9faaf57..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaWJetToElePlusProbe_cfi.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-EgammaWJetToElePlusProbe = cms.EDFilter("EgammaProbeSelector",
-    JetEtaMax = cms.double(2.7),
-    JetEtaMin = cms.double(-2.7),
-    ScEtaMin = cms.double(-2.7),
-    SuperClusterEndCapCollection = cms.InputTag("correctedEndcapSuperClustersWithPreshower"),
-    MinNumberOfSuperClusters = cms.int32(2),
-    MinNumberOfJets = cms.int32(1),
-    ScEtMin = cms.double(15.0),
-    SuperClusterBarrelCollection = cms.InputTag("correctedHybridSuperClusters"),
-    JetEtMin = cms.double(9999999.0),
-    JetCollection = cms.InputTag("iterativeCone5CaloJets"),
-    ScEtaMax = cms.double(2.7)
-)
-
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaWJetToMuHLT_cfi.py b/EgammaAnalysis/CSA07Skims/python/EgammaWJetToMuHLT_cfi.py
deleted file mode 100644
index 0c9d3c52616e0..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaWJetToMuHLT_cfi.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-import copy
-from HLTrigger.HLTfilters.hltHighLevel_cfi import *
-EgammaWJetToMuHLT = copy.deepcopy(hltHighLevel)
-EgammaWJetToMuHLT.HLTPaths = ['HLT_IsoMu11', 'HLT_Mu15_L1Mu7']
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaWJetToMuPlusProbe_cfi.py b/EgammaAnalysis/CSA07Skims/python/EgammaWJetToMuPlusProbe_cfi.py
deleted file mode 100644
index 5ff37d04709f4..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaWJetToMuPlusProbe_cfi.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-EgammaWJetToMuPlusProbe = cms.EDFilter("EgammaProbeSelector",
-    JetEtaMax = cms.double(2.7),
-    JetEtaMin = cms.double(-2.7),
-    ScEtaMin = cms.double(-2.7),
-    SuperClusterEndCapCollection = cms.InputTag("correctedEndcapSuperClustersWithPreshower"),
-    MinNumberOfSuperClusters = cms.int32(1),
-    MinNumberOfJets = cms.int32(1),
-    ScEtMin = cms.double(15.0),
-    SuperClusterBarrelCollection = cms.InputTag("correctedHybridSuperClusters"),
-    JetEtMin = cms.double(9999999.0),
-    JetCollection = cms.InputTag("iterativeCone5CaloJets"),
-    ScEtaMax = cms.double(2.7)
-)
-
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaWPlusEMOrJetOutputModule_cfi.py b/EgammaAnalysis/CSA07Skims/python/EgammaWPlusEMOrJetOutputModule_cfi.py
deleted file mode 100644
index 26836613a5634..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaWPlusEMOrJetOutputModule_cfi.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from EgammaAnalysis.CSA07Skims.egammaWPlusEMOrJetOutputModuleAODSIM_cfi import *
-from EgammaAnalysis.CSA07Skims.egammaWPlusEMOrJetOutputModuleRECOSIM_cfi import *
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaWPlusEMOrJetPath_cff.py b/EgammaAnalysis/CSA07Skims/python/EgammaWPlusEMOrJetPath_cff.py
deleted file mode 100644
index b9932b9885904..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaWPlusEMOrJetPath_cff.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from EgammaAnalysis.CSA07Skims.EgammaWJetToEleHLT_cfi import *
-from EgammaAnalysis.CSA07Skims.EgammaWJetToMuHLT_cfi import *
-from EgammaAnalysis.CSA07Skims.EgammaWJetToElePlusProbe_cfi import *
-from EgammaAnalysis.CSA07Skims.EgammaWJetToMuPlusProbe_cfi import *
-electronFilterWPath = cms.Path(EgammaWJetToEleHLT+EgammaWJetToElePlusProbe)
-muonFilterWPath = cms.Path(EgammaWJetToMuHLT+EgammaWJetToMuPlusProbe)
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaZJetOutputModule_cfi.py b/EgammaAnalysis/CSA07Skims/python/EgammaZJetOutputModule_cfi.py
deleted file mode 100644
index 9a081281cdb9b..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaZJetOutputModule_cfi.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from Configuration.EventContent.EventContent_cff import *
-AODSIMZJetEventContent = cms.OutputModule("PoolOutputModule",
-    AODSIMEventContent,
-    dataset = cms.untracked.PSet(
-        filterName = cms.untracked.string('EgammaZJetFilter'),
-        dataTier = cms.untracked.string('AODSIM')
-    ),
-    SelectEvents = cms.untracked.PSet(
-        SelectEvents = cms.vstring('electronFilterPath', 
-            'muonFilterPath')
-    ),
-    fileName = cms.untracked.string('ZJetFilteredAODSIM.root')
-)
-
-RECOSIMZJetEventContent = cms.OutputModule("PoolOutputModule",
-    RECOSIMEventContent,
-    dataset = cms.untracked.PSet(
-        filterName = cms.untracked.string('EgammaZJetFilter'),
-        dataTier = cms.untracked.string('RECOSIM')
-    ),
-    SelectEvents = cms.untracked.PSet(
-        SelectEvents = cms.vstring('electronFilterZPath', 
-            'muonFilterZPath')
-    ),
-    fileName = cms.untracked.string('ZJetFilteredRECOSIM.root')
-)
-
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaZJetSkimPath_cff.py b/EgammaAnalysis/CSA07Skims/python/EgammaZJetSkimPath_cff.py
deleted file mode 100644
index e1102ba388079..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaZJetSkimPath_cff.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from EgammaAnalysis.CSA07Skims.EgammaZJetToEleHLT_cfi import *
-from EgammaAnalysis.CSA07Skims.EgammaZJetToMuHLT_cfi import *
-from EgammaAnalysis.CSA07Skims.EgammaZJetToElePlusProbe_cfi import *
-from EgammaAnalysis.CSA07Skims.EgammaZJetToMuPlusProbe_cfi import *
-electronFilterZPath = cms.Path(EgammaZJetToEleHLT+EgammaZJetToElePlusProbe)
-muonFilterZPath = cms.Path(EgammaZJetToMuHLT+EgammaZJetToMuPlusProbe)
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaZJetToEleHLT_cfi.py b/EgammaAnalysis/CSA07Skims/python/EgammaZJetToEleHLT_cfi.py
deleted file mode 100644
index da6dcab3a3506..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaZJetToEleHLT_cfi.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-import copy
-from HLTrigger.HLTfilters.hltHighLevel_cfi import *
-EgammaZJetToEleHLT = copy.deepcopy(hltHighLevel)
-EgammaZJetToEleHLT.HLTPaths = ['HLT_DoubleIsoEle10_L1I', 'HLT_DoubleIsoEle12_L1R']
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaZJetToElePlusProbe_cfi.py b/EgammaAnalysis/CSA07Skims/python/EgammaZJetToElePlusProbe_cfi.py
deleted file mode 100644
index c3c8b0a76e5ff..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaZJetToElePlusProbe_cfi.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-EgammaZJetToElePlusProbe = cms.EDFilter("EgammaProbeSelector",
-    JetEtaMax = cms.double(2.7),
-    JetEtaMin = cms.double(-2.7),
-    ScEtaMin = cms.double(-2.7),
-    SuperClusterEndCapCollection = cms.InputTag("correctedEndcapSuperClustersWithPreshower"),
-    MinNumberOfSuperClusters = cms.int32(3),
-    MinNumberOfJets = cms.int32(1),
-    ScEtMin = cms.double(5.0),
-    SuperClusterBarrelCollection = cms.InputTag("correctedHybridSuperClusters"),
-    JetEtMin = cms.double(9999999.0),
-    JetCollection = cms.InputTag("iterativeCone5CaloJets"),
-    ScEtaMax = cms.double(2.7)
-)
-
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaZJetToMuHLT_cfi.py b/EgammaAnalysis/CSA07Skims/python/EgammaZJetToMuHLT_cfi.py
deleted file mode 100644
index ff5e77bd043e6..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaZJetToMuHLT_cfi.py
+++ /dev/null
@@ -1,7 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-import copy
-from HLTrigger.HLTfilters.hltHighLevel_cfi import *
-EgammaZJetToMuHLT = copy.deepcopy(hltHighLevel)
-EgammaZJetToMuHLT.HLTPaths = ['HLT_DoubleMu3']
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaZJetToMuPlusProbe_cfi.py b/EgammaAnalysis/CSA07Skims/python/EgammaZJetToMuPlusProbe_cfi.py
deleted file mode 100644
index 3f6684bef63f8..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaZJetToMuPlusProbe_cfi.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-EgammaZJetToMuPlusProbe = cms.EDFilter("EgammaProbeSelector",
-    JetEtaMax = cms.double(2.7),
-    JetEtaMin = cms.double(-2.7),
-    ScEtaMin = cms.double(-2.7),
-    SuperClusterEndCapCollection = cms.InputTag("correctedEndcapSuperClustersWithPreshower"),
-    MinNumberOfSuperClusters = cms.int32(1),
-    MinNumberOfJets = cms.int32(1),
-    ScEtMin = cms.double(5.0),
-    SuperClusterBarrelCollection = cms.InputTag("correctedHybridSuperClusters"),
-    JetEtMin = cms.double(9999999.0),
-    JetCollection = cms.InputTag("iterativeCone5CaloJets"),
-    ScEtaMax = cms.double(2.7)
-)
-
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaZPlusEMOrJetOutputModule_cfi.py b/EgammaAnalysis/CSA07Skims/python/EgammaZPlusEMOrJetOutputModule_cfi.py
deleted file mode 100644
index e2a340329fa88..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaZPlusEMOrJetOutputModule_cfi.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from EgammaAnalysis.CSA07Skims.egammaZPlusEMOrJetOutputModuleAODSIM_cfi import *
-from EgammaAnalysis.CSA07Skims.egammaZPlusEMOrJetOutputModuleRECOSIM_cfi import *
-
diff --git a/EgammaAnalysis/CSA07Skims/python/EgammaZPlusEMOrJetPath_cff.py b/EgammaAnalysis/CSA07Skims/python/EgammaZPlusEMOrJetPath_cff.py
deleted file mode 100644
index e1102ba388079..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/EgammaZPlusEMOrJetPath_cff.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from EgammaAnalysis.CSA07Skims.EgammaZJetToEleHLT_cfi import *
-from EgammaAnalysis.CSA07Skims.EgammaZJetToMuHLT_cfi import *
-from EgammaAnalysis.CSA07Skims.EgammaZJetToElePlusProbe_cfi import *
-from EgammaAnalysis.CSA07Skims.EgammaZJetToMuPlusProbe_cfi import *
-electronFilterZPath = cms.Path(EgammaZJetToEleHLT+EgammaZJetToElePlusProbe)
-muonFilterZPath = cms.Path(EgammaZJetToMuHLT+EgammaZJetToMuPlusProbe)
-
diff --git a/EgammaAnalysis/CSA07Skims/python/FEVTSIMEgammaSkimEventContent_cff.py b/EgammaAnalysis/CSA07Skims/python/FEVTSIMEgammaSkimEventContent_cff.py
deleted file mode 100644
index 2d8072500971c..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/FEVTSIMEgammaSkimEventContent_cff.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from Configuration.EventContent.EventContent_cff import *
-from EgammaAnalysis.CSA07Skims.EgammaSkimEventContent_cff import *
-FEVTSIMEgammaSkimEventContent = cms.PSet(
-    outputCommands = cms.untracked.vstring()
-)
-FEVTSIMEgammaSkimEventContent.outputCommands.extend(FEVTSIMEventContent.outputCommands)
-FEVTSIMEgammaSkimEventContent.outputCommands.extend(egammaSkimEventContent.outputCommands)
-
diff --git a/EgammaAnalysis/CSA07Skims/python/RECOSIMEgammaSkimEventContent_cff.py b/EgammaAnalysis/CSA07Skims/python/RECOSIMEgammaSkimEventContent_cff.py
deleted file mode 100644
index 9d993755c642b..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/RECOSIMEgammaSkimEventContent_cff.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# Egamma RECOSIM event content 
-# Saves standard RECOSIM and Egamma-specific data (which might not be empty)
-#
-from Configuration.EventContent.EventContent_cff import *
-from EgammaAnalysis.CSA07Skims.EgammaSkimEventContent_cff import *
-RECOSIMEgammaSkimEventContent = cms.PSet(
-    outputCommands = cms.untracked.vstring()
-)
-RECOSIMEgammaSkimEventContent.outputCommands.extend(RECOSIMEventContent.outputCommands)
-RECOSIMEgammaSkimEventContent.outputCommands.extend(egammaSkimEventContent.outputCommands)
-
diff --git a/EgammaAnalysis/CSA07Skims/python/egammaLooseZOutputModuleAODSIM_cfi.py b/EgammaAnalysis/CSA07Skims/python/egammaLooseZOutputModuleAODSIM_cfi.py
deleted file mode 100644
index 4ccd3ff48bbfb..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/egammaLooseZOutputModuleAODSIM_cfi.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from EgammaAnalysis.CSA07Skims.EgammaSkimEventContent_cff import *
-from EgammaAnalysis.CSA07Skims.AODSIMEgammaSkimEventContent_cff import *
-egammaLooseZOutputModuleAODSIM = cms.OutputModule("PoolOutputModule",
-    AODSIMEgammaSkimEventContent,
-    egammaLooseZEventSelection,
-    dataset = cms.untracked.PSet(
-        filterName = cms.untracked.string('egammaLooseZAODSIM'),
-        dataTier = cms.untracked.string('USER')
-    ),
-    fileName = cms.untracked.string('egammaLooseZAODSIM.root')
-)
-
-
diff --git a/EgammaAnalysis/CSA07Skims/python/egammaLooseZOutputModuleFEVTSIM_cfi.py b/EgammaAnalysis/CSA07Skims/python/egammaLooseZOutputModuleFEVTSIM_cfi.py
deleted file mode 100644
index d1b61baaa234b..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/egammaLooseZOutputModuleFEVTSIM_cfi.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from EgammaAnalysis.CSA07Skims.EgammaSkimEventContent_cff import *
-from EgammaAnalysis.CSA07Skims.FEVTSIMEgammaSkimEventContent_cff import *
-egammaLooseZOutputModuleFEVTSIM = cms.OutputModule("PoolOutputModule",
-    FEVTSIMEgammaSkimEventContent,
-    egammaLooseZEventSelection,
-    dataset = cms.untracked.PSet(
-        filterName = cms.untracked.string('egammaLooseZFEVTSIM'),
-        dataTier = cms.untracked.string('USER')
-    ),
-    fileName = cms.untracked.string('egammaLooseZFEVTSIM.root')
-)
-
-
diff --git a/EgammaAnalysis/CSA07Skims/python/egammaLooseZOutputModuleRECOSIM_cfi.py b/EgammaAnalysis/CSA07Skims/python/egammaLooseZOutputModuleRECOSIM_cfi.py
deleted file mode 100644
index 858ae41b41e90..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/egammaLooseZOutputModuleRECOSIM_cfi.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from EgammaAnalysis.CSA07Skims.EgammaSkimEventContent_cff import *
-from EgammaAnalysis.CSA07Skims.RECOSIMEgammaSkimEventContent_cff import *
-egammaLooseZOutputModuleRECOSIM = cms.OutputModule("PoolOutputModule",
-    RECOSIMEgammaSkimEventContent,
-    egammaLooseZEventSelection,
-    dataset = cms.untracked.PSet(
-        filterName = cms.untracked.string('egammaLooseZRECOSIM'),
-        dataTier = cms.untracked.string('USER')
-    ),
-    fileName = cms.untracked.string('egammaLooseZRECOSIM.root')
-)
-
-
diff --git a/EgammaAnalysis/CSA07Skims/python/egammaVeryHighEtOutputModuleAODSIM_cfi.py b/EgammaAnalysis/CSA07Skims/python/egammaVeryHighEtOutputModuleAODSIM_cfi.py
deleted file mode 100644
index 25ebdcf92c7ed..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/egammaVeryHighEtOutputModuleAODSIM_cfi.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from EgammaAnalysis.CSA07Skims.EgammaSkimEventContent_cff import *
-from EgammaAnalysis.CSA07Skims.AODSIMEgammaSkimEventContent_cff import *
-egammaVeryHighEtOutputModuleAODSIM = cms.OutputModule("PoolOutputModule",
-    AODSIMEgammaSkimEventContent,
-    egammaVeryHighEtEventSelection,
-    dataset = cms.untracked.PSet(
-        filterName = cms.untracked.string('egammaVeryHighEtAODSIM'),
-        dataTier = cms.untracked.string('USER')
-    ),
-    fileName = cms.untracked.string('egammaVeryHighEtAODSIM.root')
-)
-
-
diff --git a/EgammaAnalysis/CSA07Skims/python/egammaVeryHighEtOutputModuleRECOSIM_cfi.py b/EgammaAnalysis/CSA07Skims/python/egammaVeryHighEtOutputModuleRECOSIM_cfi.py
deleted file mode 100644
index 691674bbc9728..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/egammaVeryHighEtOutputModuleRECOSIM_cfi.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from EgammaAnalysis.CSA07Skims.EgammaSkimEventContent_cff import *
-from EgammaAnalysis.CSA07Skims.RECOSIMEgammaSkimEventContent_cff import *
-egammaVeryHighEtOutputModuleRECOSIM = cms.OutputModule("PoolOutputModule",
-    RECOSIMEgammaSkimEventContent,
-    egammaVeryHighEtEventSelection,
-    dataset = cms.untracked.PSet(
-        filterName = cms.untracked.string('egammaVeryHighEtRECOSIM'),
-        dataTier = cms.untracked.string('USER')
-    ),
-    fileName = cms.untracked.string('egammaVeryHighEtRECOSIM.root')
-)
-
-
diff --git a/EgammaAnalysis/CSA07Skims/python/egammaWPlusEMOrJetOutputModuleAODSIM_cfi.py b/EgammaAnalysis/CSA07Skims/python/egammaWPlusEMOrJetOutputModuleAODSIM_cfi.py
deleted file mode 100644
index a730fe6c9f66e..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/egammaWPlusEMOrJetOutputModuleAODSIM_cfi.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from EgammaAnalysis.CSA07Skims.EgammaSkimEventContent_cff import *
-from EgammaAnalysis.CSA07Skims.AODSIMEgammaSkimEventContent_cff import *
-egammaWPlusEMOrJetOutputModuleAODSIM = cms.OutputModule("PoolOutputModule",
-    egammaWPlusEMOrJetEventSelection,
-    AODSIMEgammaSkimEventContent,
-    dataset = cms.untracked.PSet(
-        filterName = cms.untracked.string('egammaWPlusEMOrJetAODSIM'),
-        dataTier = cms.untracked.string('USER')
-    ),
-    fileName = cms.untracked.string('egammaWPlusEMOrJetAODSIM.root')
-)
-
-
diff --git a/EgammaAnalysis/CSA07Skims/python/egammaWPlusEMOrJetOutputModuleRECOSIM_cfi.py b/EgammaAnalysis/CSA07Skims/python/egammaWPlusEMOrJetOutputModuleRECOSIM_cfi.py
deleted file mode 100644
index bcd08097bf9cb..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/egammaWPlusEMOrJetOutputModuleRECOSIM_cfi.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from EgammaAnalysis.CSA07Skims.EgammaSkimEventContent_cff import *
-from EgammaAnalysis.CSA07Skims.RECOSIMEgammaSkimEventContent_cff import *
-egammaWPlusEMOrJetOutputModuleRECOSIM = cms.OutputModule("PoolOutputModule",
-    egammaWPlusEMOrJetEventSelection,
-    RECOSIMEgammaSkimEventContent,
-    dataset = cms.untracked.PSet(
-        filterName = cms.untracked.string('egammaWPlusEMOrJetRECOSIM'),
-        dataTier = cms.untracked.string('USER')
-    ),
-    fileName = cms.untracked.string('egammaWPlusEMOrJetRECOSIM.root')
-)
-
-
diff --git a/EgammaAnalysis/CSA07Skims/python/egammaZPlusEMOrJetOutputModuleAODSIM_cfi.py b/EgammaAnalysis/CSA07Skims/python/egammaZPlusEMOrJetOutputModuleAODSIM_cfi.py
deleted file mode 100644
index 8f461e68e4b78..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/egammaZPlusEMOrJetOutputModuleAODSIM_cfi.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from EgammaAnalysis.CSA07Skims.EgammaSkimEventContent_cff import *
-from EgammaAnalysis.CSA07Skims.AODSIMEgammaSkimEventContent_cff import *
-egammaZPlusEMOrJetOutputModuleAODSIM = cms.OutputModule("PoolOutputModule",
-    AODSIMEgammaSkimEventContent,
-    egammaZPlusEMOrJetEventSelection,
-    dataset = cms.untracked.PSet(
-        filterName = cms.untracked.string('egammaZPlusEMOrJetAODSIM'),
-        dataTier = cms.untracked.string('USER')
-    ),
-    fileName = cms.untracked.string('egammaZPlusEMOrJetAODSIM.root')
-)
-
-
diff --git a/EgammaAnalysis/CSA07Skims/python/egammaZPlusEMOrJetOutputModuleRECOSIM_cfi.py b/EgammaAnalysis/CSA07Skims/python/egammaZPlusEMOrJetOutputModuleRECOSIM_cfi.py
deleted file mode 100644
index 1c634fb0cc586..0000000000000
--- a/EgammaAnalysis/CSA07Skims/python/egammaZPlusEMOrJetOutputModuleRECOSIM_cfi.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from EgammaAnalysis.CSA07Skims.EgammaSkimEventContent_cff import *
-from EgammaAnalysis.CSA07Skims.RECOSIMEgammaSkimEventContent_cff import *
-egammaZPlusEMOrJetOutputModuleRECOSIM = cms.OutputModule("PoolOutputModule",
-    RECOSIMEgammaSkimEventContent,
-    egammaZPlusEMOrJetEventSelection,
-    dataset = cms.untracked.PSet(
-        filterName = cms.untracked.string('egammaZPlusEMOrJetRECOSIM'),
-        dataTier = cms.untracked.string('USER')
-    ),
-    fileName = cms.untracked.string('egammaZPlusEMOrJetRECOSIM.root')
-)
-
-
diff --git a/EgammaAnalysis/CSA07Skims/src/EgammaProbeSelector.cc b/EgammaAnalysis/CSA07Skims/src/EgammaProbeSelector.cc
deleted file mode 100644
index 2e9375a35fd16..0000000000000
--- a/EgammaAnalysis/CSA07Skims/src/EgammaProbeSelector.cc
+++ /dev/null
@@ -1,111 +0,0 @@
-
-/** \class EgammaProbeSelector
- *
- *
- *  This class is an EDFilter for heavy W+jet and Z+jet events
- *
- *
- */
-
-#include "EgammaAnalysis/CSA07Skims/interface/EgammaProbeSelector.h"
-#include "DataFormats/JetReco/interface/Jet.h"
-#include "DataFormats/EgammaReco/interface/SuperCluster.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include <iostream>
-#include <TMath.h>
-
-using namespace edm;
-using namespace std;
-using namespace reco;
-
-
-EgammaProbeSelector::EgammaProbeSelector(const edm::ParameterSet& iConfig) {
-
-  jetToken        = consumes<CaloJetCollection>(iConfig.getParameter<InputTag>("JetCollection"));
-  minNumberOfjets = iConfig.getParameter<int>("MinNumberOfJets");
-  jetEtMin        = iConfig.getParameter<double>("JetEtMin");
-  jetEtaMin       = iConfig.getParameter<double>("JetEtaMin");
-  jetEtaMax       = iConfig.getParameter<double>("JetEtaMax");
-
-  nEvents         = 0;
-  nSelectedEvents = 0;
-
-  scToken          = consumes<SuperClusterCollection>(iConfig.getParameter<InputTag>("SuperClusterBarrelCollection"));
-  scEEToken        = consumes<SuperClusterCollection>(iConfig.getParameter<InputTag>("SuperClusterEndCapCollection"));
-  minNumberOfSuperClusters = iConfig.getParameter<int>("MinNumberOfSuperClusters");
-  scEtMin          = iConfig.getParameter<double>("ScEtMin");
-  scEtaMin         = iConfig.getParameter<double>("ScEtaMin");
-  scEtaMax         = iConfig.getParameter<double>("ScEtaMax");
-}
-
-
-EgammaProbeSelector::~EgammaProbeSelector(){
-  edm::LogVerbatim("EgammaProbeSelector")
-    << " Number_events_read " << nEvents
-    << " Number_events_kept " << nSelectedEvents
-    << " Efficiency         " << ((double)nSelectedEvents)/((double) nEvents + 0.01) << std::endl;
-
-}
-
-
-bool EgammaProbeSelector::filter(edm::Event& iEvent, const edm::EventSetup& iSetup ){
-  int nSC   = 0;
-  int nJets = 0;
-  nEvents++;
-
-  // Get reconstructed Jets, check their Et and eta, and count their number
-  Handle<CaloJetCollection> jetHandle;
-  iEvent.getByToken(jetToken,jetHandle);
-
-  if(jetHandle.isValid()){
-    const reco::CaloJetCollection & jets = *(jetHandle.product());
-    CaloJetCollection::const_iterator ijet;
-    for(ijet = jets.begin(); ijet!= jets.end(); ijet++){
-      if(ijet->pt()  > jetEtMin  &&
-	 ijet->eta() > jetEtaMin &&
-	 ijet->eta() < jetEtaMax )
-	nJets++;
-    }
-  }
-
-  // Get Super Clusters, check their Et and eta, and count their number
-  // EB
-  Handle<reco::SuperClusterCollection> scHandle;
-  iEvent.getByToken(scToken,scHandle);
-
-  if(scHandle.isValid()){
-    const reco::SuperClusterCollection & SCs = *(scHandle.product());
-
-    for(reco::SuperClusterCollection::const_iterator scIt = SCs.begin();
-	scIt!= SCs.end(); scIt++){
-
-      double scEt   = scIt->energy() * TMath::Sin(scIt->position().theta());
-      double _eta = scIt->position().eta();
-      if(scEt  > scEtMin && _eta > scEtaMin && _eta < scEtaMax)	nSC++;
-    }
-  }
-
-  // EE
-  Handle<reco::SuperClusterCollection> scEEHandle;
-  iEvent.getByToken(scEEToken,scEEHandle);
-
-  if(scEEHandle.isValid()){
-    const reco::SuperClusterCollection & SCs = *(scEEHandle.product());
-    for(reco::SuperClusterCollection::const_iterator scIt = SCs.begin();
-	scIt!= SCs.end(); scIt++){
-
-      double scEt   = scIt->energy() * TMath::Sin(scIt->position().theta());
-      double _eta = scIt->position().eta();
-      if(scEt  > scEtMin && _eta > scEtaMin && _eta < scEtaMax) nSC++;
-    }
-  }
-
-  // Make final desicion on passed events
-  bool accepted = false;
-  if(nJets >= minNumberOfjets || nSC >=minNumberOfSuperClusters) {
-    accepted = true;
-    nSelectedEvents++;
-  }
-
-  return accepted;
-}
diff --git a/EgammaAnalysis/CSA07Skims/src/SealModule.cc b/EgammaAnalysis/CSA07Skims/src/SealModule.cc
deleted file mode 100644
index 2da2d7e80ae81..0000000000000
--- a/EgammaAnalysis/CSA07Skims/src/SealModule.cc
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <FWCore/PluginManager/interface/ModuleDef.h>
-#include <FWCore/Framework/interface/MakerMacros.h>
-
-#include <EgammaAnalysis/CSA07Skims/interface/EgammaProbeSelector.h>
-
-
-
-DEFINE_FWK_MODULE(EgammaProbeSelector);
diff --git a/EgammaAnalysis/Configuration/python/EgammaAnalysis_EventContent_cff.py b/EgammaAnalysis/Configuration/python/EgammaAnalysis_EventContent_cff.py
deleted file mode 100644
index dc26e25a2ef9a..0000000000000
--- a/EgammaAnalysis/Configuration/python/EgammaAnalysis_EventContent_cff.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from EgammaAnalysis.CSA07Skims.EgammaSkimEventContent_cff import *
-#
-# EgammaAnalysis event content
-# 
-# the accumulated event contents should not be used, 
-# but it's important that all EventContent definitions are included here
-#
-EgammaAnalysisEventContent = cms.PSet(
-    outputCommands = cms.untracked.vstring()
-)
-EgammaAnalysisEventContent.outputCommands.extend(egammaSkimEventContent.outputCommands)
-
diff --git a/EgammaAnalysis/Configuration/python/EgammaAnalysis_OutputModules_cff.py b/EgammaAnalysis/Configuration/python/EgammaAnalysis_OutputModules_cff.py
deleted file mode 100644
index 571fa5c0d51cf..0000000000000
--- a/EgammaAnalysis/Configuration/python/EgammaAnalysis_OutputModules_cff.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-#
-#
-#  Collection of all outputModules for Egamma
-#
-#
-#Egamma skims
-from EgammaAnalysis.CSA07Skims.EgammaLooseZOutputModule_cfi import *
-from EgammaAnalysis.CSA07Skims.EgammaVeryHighEtOutputModule_cfi import *
-from EgammaAnalysis.CSA07Skims.EgammaZPlusEMOrJetOutputModule_cfi import *
-from EgammaAnalysis.CSA07Skims.EgammaWPlusEMOrJetOutputModule_cfi import *
-
diff --git a/EgammaAnalysis/Configuration/python/EgammaAnalysis_SkimPaths_cff.py b/EgammaAnalysis/Configuration/python/EgammaAnalysis_SkimPaths_cff.py
deleted file mode 100644
index dcfda73a1a609..0000000000000
--- a/EgammaAnalysis/Configuration/python/EgammaAnalysis_SkimPaths_cff.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-#
-#
-#  Collection of all Skim paths for Egamma
-#
-#
-#Egamma skims
-from EgammaAnalysis.CSA07Skims.EgammaVeryHighEtPath_cff import *
-from EgammaAnalysis.CSA07Skims.EgammaZPlusEMOrJetPath_cff import *
-from EgammaAnalysis.CSA07Skims.EgammaWPlusEMOrJetPath_cff import *
-
diff --git a/EgammaAnalysis/ElectronIDESSources/python/likelihoodESetup_cfi.py b/EgammaAnalysis/ElectronIDESSources/python/likelihoodESetup_cfi.py
deleted file mode 100644
index 879b8c0f4636b..0000000000000
--- a/EgammaAnalysis/ElectronIDESSources/python/likelihoodESetup_cfi.py
+++ /dev/null
@@ -1,84 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# ESSource for Electron ID likelihood
-ElectronLikelihoodESSource = cms.ESProducer("ElectronLikelihoodESSource",
-    useEoverPOut = cms.double(1.0),
-    piEBNarrowFracGt15 = cms.double(1.0),
-    #! fisher coefficients
-    fisherCoeffEBLt15_constant = cms.double(0.693496),
-    piWeight = cms.double(1.0),
-    fisherCoeffEBLt15_sigmaEtaEta = cms.double(-12.7018),
-    piEENarrowFracGt15 = cms.double(1.0),
-    eleEBNarrowFracGt15 = cms.double(1.0),
-    useShapeFisher = cms.double(0.0),
-    piEBShoweringFracGt15 = cms.double(1.0),
-    piEBShoweringFracLt15 = cms.double(1.0),
-    piEEShoweringFracGt15 = cms.double(1.0),
-    piEEGoldenFracGt15 = cms.double(1.0),
-    eleEBGoldenFracGt15 = cms.double(1.0),
-    #! a priori probabilities (fullclass fractions). Use flat priors for now
-    eleEBGoldenFracLt15 = cms.double(1.0),
-    piEEBigbremFracLt15 = cms.double(1.0),
-    eleEEGoldenFracGt15 = cms.double(1.0),
-    fisherCoeffEBLt15_s9s25 = cms.double(1.23863),
-    eleEBBigbremFracGt15 = cms.double(1.0),
-    eleEBBigbremFracLt15 = cms.double(1.0),
-    fisherCoeffEBGt15_constant = cms.double(6.02184),
-    fisherCoeffEEGt15_etaLat = cms.double(-9.3025),
-    splitBackgroundPdfs = cms.bool(False),
-    piEBNarrowFracLt15 = cms.double(1.0),
-    fisherCoeffEBGt15_s9s25 = cms.double(2.49634),
-    piEBBigbremFracGt15 = cms.double(1.0),
-    fisherCoeffEELt15_s9s25 = cms.double(4.51575),
-    eleEBShoweringFracGt15 = cms.double(1.0),
-    #! a priori probabilies having an electron/hadron (cross sections)
-    eleWeight = cms.double(1.0),
-    eleEEGoldenFracLt15 = cms.double(1.0),
-    useSigmaEtaEta = cms.double(1.0),
-    piEENarrowFracLt15 = cms.double(1.0),
-    eleEEShoweringFracLt15 = cms.double(1.0),
-    #! use dedicated PDF's for each class defined by 
-    #! signalWeightSplitting category
-    #! for now no splitted PDFs are in the DB for Bkg (lack of statistics)
-    splitSignalPdfs = cms.bool(True),
-    fisherCoeffEELt15_constant = cms.double(-1.11814),
-    piEBBigbremFracLt15 = cms.double(1.0),
-    piEBGoldenFracLt15 = cms.double(1.0),
-    eleEBNarrowFracLt15 = cms.double(1.0),
-    fisherCoeffEBGt15_etaLat = cms.double(-30.1528),
-    fisherCoeffEELt15_sigmaEtaEta = cms.double(-5.3288),
-    fisherCoeffEELt15_a20 = cms.double(0.0),
-    fisherCoeffEBGt15_sigmaEtaEta = cms.double(-49.2656),
-    fisherCoeffEEGt15_s9s25 = cms.double(3.61809),
-    fisherCoeffEEGt15_sigmaEtaEta = cms.double(-11.7401),
-    piEEGoldenFracLt15 = cms.double(1.0),
-    backgroundWeightSplitting = cms.string('class'),
-    useHoverE = cms.double(1.0),
-    fisherCoeffEELt15_etaLat = cms.double(-6.47578),
-    eleEEBigbremFracLt15 = cms.double(1.0),
-    #! switch the use of one variable ON / OFF
-    useDeltaEtaCalo = cms.double(1.0),
-    #! PDF's splitting rule
-    #! class: split by non-showering / showering+cracks
-    #! fullclass: split by golden / bigbrem / narrow / showering+cracks
-    #    string signalWeightSplitting = "fullclass"
-    #    string backgroundWeightSplitting = "fullclass"
-    signalWeightSplitting = cms.string('class'),
-    eleEENarrowFracLt15 = cms.double(1.0),
-    eleEEBigbremFracGt15 = cms.double(1.0),
-    eleEENarrowFracGt15 = cms.double(1.0),
-    fisherCoeffEBGt15_a20 = cms.double(0.0),
-    piEEShoweringFracLt15 = cms.double(1.0),
-    eleEEShoweringFracGt15 = cms.double(1.0),
-    eleEBShoweringFracLt15 = cms.double(1.0),
-    piEEBigbremFracGt15 = cms.double(1.0),
-    fisherCoeffEEGt15_constant = cms.double(0.536351),
-    useDeltaPhiIn = cms.double(1.0),
-    fisherCoeffEBLt15_etaLat = cms.double(-10.115),
-    useE9overE25 = cms.double(1.0),
-    fisherCoeffEEGt15_a20 = cms.double(0.0),
-    fisherCoeffEBLt15_a20 = cms.double(0.0),
-    piEBGoldenFracGt15 = cms.double(1.0)
-)
-
-
diff --git a/EgammaAnalysis/ElectronIDESSources/python/likelihoodPdfsDB_cfi.py b/EgammaAnalysis/ElectronIDESSources/python/likelihoodPdfsDB_cfi.py
deleted file mode 100644
index 44308af60a832..0000000000000
--- a/EgammaAnalysis/ElectronIDESSources/python/likelihoodPdfsDB_cfi.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-from CondCore.DBCommon.CondDBCommon_cfi import *
-# for CMSSW >= 1_6_8
-#replace CondDBCommon.connect = "sqlite_file:/afs/cern.ch/user/e/emanuele/public/4Likelihood/PDFsSQLite/CMSSW_1_6_8/electronIdLikelihoodTkIsolated.db"    
-#replace CondDBCommon.catalog = "file:/afs/cern.ch/user/e/emanuele/public/4Likelihood/PDFsSQLite/CMSSW_1_6_8/electronIdLikelihoodTkIsolated.xml"
-PoolDBESSource = cms.ESSource("PoolDBESSource",
-    CondDBCommon,
-    toGet = cms.VPSet(cms.PSet(
-        record = cms.string('ElectronLikelihoodPdfsRcd'),
-        tag = cms.string('ElectronLikelihoodPdfsRcd_tag')
-    ))
-)
-
-# for CMSSW >= 1_7_X and for 2_0_0
-CondDBCommon.connect = cms.InputTag("sqlite_fip","electronIdLikelihoodTkIsolated.db")
-
diff --git a/EgammaAnalysis/PhotonIDProducers/BuildFile.xml b/EgammaAnalysis/PhotonIDProducers/BuildFile.xml
deleted file mode 100644
index 900fdcd8b8dcf..0000000000000
--- a/EgammaAnalysis/PhotonIDProducers/BuildFile.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="RecoEcal/EgammaClusterAlgos"/>
-<use   name="clhep"/>
-<flags   EDM_PLUGIN="1"/>
diff --git a/EgammaAnalysis/PhotonIDProducers/interface/PiZeroDiscriminatorProducer.h b/EgammaAnalysis/PhotonIDProducers/interface/PiZeroDiscriminatorProducer.h
deleted file mode 100644
index 8c7bf06e018a3..0000000000000
--- a/EgammaAnalysis/PhotonIDProducers/interface/PiZeroDiscriminatorProducer.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef RecoEcal_EgammaClusterProducers_PiZeroDiscriminatorProducer_h
-#define RecoEcal_EgammaClusterProducers_PiZeroDiscriminatorProducer_h
-
-
-#include <memory>
-
-#include "FWCore/Framework/interface/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/EcalDetId/interface/ESDetId.h"
-
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-
-#include "DataFormats/EgammaReco/interface/PreshowerClusterShape.h"
-#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
-#include "DataFormats/EgammaCandidates/interface/PhotonFwd.h"
-
-#include "RecoEcal/EgammaClusterAlgos/interface/EndcapPiZeroDiscriminatorAlgo.h"
-
-#include "TH1.h"
-class TFile;
-
-
-// authors A. Kyriakis, D. Maletic
-
-class PiZeroDiscriminatorProducer : public edm::EDProducer {
-
- public:
-
-//  typedef math::XYZPoint Point;
-
-  explicit PiZeroDiscriminatorProducer (const edm::ParameterSet& ps);
-
-  ~PiZeroDiscriminatorProducer() override;
-
-  void produce( edm::Event& evt, const edm::EventSetup& es) override;
-
- private:
-
-  int nEvt_;         // internal counter of events
-
-  //clustering parameters:
-  edm::EDGetTokenT<reco::PreshowerClusterShapeCollection> pPreshowerShapeClustersXToken_;
-  edm::EDGetTokenT<reco::PreshowerClusterShapeCollection> pPreshowerShapeClustersYToken_;
-
-  edm::EDGetTokenT<reco::PhotonCollection> correctedPhotonToken_;
-  std::string PhotonPi0DiscriminatorAssociationMap_;
-
-  edm::InputTag barrelRecHitCollection_;
-  edm::EDGetTokenT<EcalRecHitCollection> barrelRecHitCollectionToken_;
-  edm::InputTag endcapRecHitCollection_;
-  edm::EDGetTokenT<EcalRecHitCollection> endcapRecHitCollectionToken_;
-
-  int EScorr_;
-
-  int preshNst_;
-
-  double preshStripECut_;
-
-  double w0_;
-
-  EndcapPiZeroDiscriminatorAlgo * presh_pi0_algo; // algorithm doing the real work
-  enum DebugLevel_pi0 { pDEBUG = 0, pINFO = 1, pERROR = 2 };
-  DebugLevel_pi0 debugL_pi0;
-};
-#endif
-
diff --git a/EgammaAnalysis/PhotonIDProducers/python/piZeroDiscriminators_cfi.py b/EgammaAnalysis/PhotonIDProducers/python/piZeroDiscriminators_cfi.py
deleted file mode 100644
index b9032959d2b5c..0000000000000
--- a/EgammaAnalysis/PhotonIDProducers/python/piZeroDiscriminators_cfi.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# Preshower cluster producer
-piZeroDiscriminators = cms.EDProducer("PiZeroDiscriminatorProducer",
-    # building preshower clusters
-    preshClusterShapeProducer = cms.string('preshowerClusterShape'),
-    corrPhoProducer = cms.string('photons'),
-    correctedPhotonCollection = cms.string(''),
-    preshStripEnergyCut = cms.double(0.0),
-    w0 = cms.double(4.2),
-    EScorr = cms.int32(1),
-    Pi0Association = cms.string('PhotonPi0DiscriminatorAssociationMap'),
-    preshPi0Nstrip = cms.int32(5),
-    preshClusterShapeCollectionX = cms.string('preshowerXClustersShape'),    
-    preshClusterShapeCollectionY = cms.string('preshowerYClustersShape'),
-    barrelRecHitCollection = cms.InputTag('reducedEcalRecHitsEB'),
-    endcapRecHitCollection = cms.InputTag('reducedEcalRecHitsEE'),
-    # DEBUG: very verbose  INFO: minimal printout
-    debugLevel = cms.string('INFO')
-    #debugLevel = cms.string('DEBUG')
-)
-
-
diff --git a/EgammaAnalysis/PhotonIDProducers/src/PiZeroDiscriminatorProducer.cc b/EgammaAnalysis/PhotonIDProducers/src/PiZeroDiscriminatorProducer.cc
deleted file mode 100644
index 47ab02f24a92a..0000000000000
--- a/EgammaAnalysis/PhotonIDProducers/src/PiZeroDiscriminatorProducer.cc
+++ /dev/null
@@ -1,386 +0,0 @@
-// system include files
-#include <vector>
-
-// user include files
-
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-
-// Reconstruction Classes
-#include "DataFormats/EgammaReco/interface/SuperCluster.h"
-#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
-
-#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
-#include <fstream>
-#include <sstream>
-
-#include "EgammaAnalysis/PhotonIDProducers/interface/PiZeroDiscriminatorProducer.h"
-
-// Class for Cluster Shape Algorithm
-#include "DataFormats/EgammaReco/interface/BasicCluster.h"
-#include "DataFormats/EgammaReco/interface/BasicClusterFwd.h"
-
-#include "DataFormats/EgammaCandidates/interface/Photon.h"
-#include "DataFormats/EgammaCandidates/interface/PhotonPi0DiscriminatorAssociation.h"
-
-// to compute on-the-fly cluster shapes
-//#include "RecoEcal/EgammaCoreTools/interface/EcalClusterLazyTools.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h"
-#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
-#include "Geometry/CaloTopology/interface/CaloTopology.h"
-#include "Geometry/Records/interface/CaloGeometryRecord.h"
-#include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
-
-
-using namespace std;
-using namespace reco;
-using namespace edm;
-///----
-
-PiZeroDiscriminatorProducer::PiZeroDiscriminatorProducer(const ParameterSet& ps) {
-  // use configuration file to setup input/output collection names
-
-  pPreshowerShapeClustersXToken_ = consumes<PreshowerClusterShapeCollection>(edm::InputTag(ps.getParameter<std::string>("preshClusterShapeProducer"), ps.getParameter<std::string>("preshClusterShapeCollectionX")));
-  pPreshowerShapeClustersYToken_ = consumes<PreshowerClusterShapeCollection>(edm::InputTag(ps.getParameter<std::string>("preshClusterShapeProducer"), ps.getParameter<std::string>("preshClusterShapeCollectionY")));
-
-  correctedPhotonToken_ = consumes<PhotonCollection>(edm::InputTag(ps.getParameter<string>("corrPhoProducer"), ps.getParameter<string>("correctedPhotonCollection")));
-
-  barrelRecHitCollection_ = ps.getParameter<edm::InputTag>("barrelRecHitCollection");
-  barrelRecHitCollectionToken_ = consumes<EcalRecHitCollection>(barrelRecHitCollection_);
-  endcapRecHitCollection_ = ps.getParameter<edm::InputTag>("endcapRecHitCollection");
-  endcapRecHitCollectionToken_ = consumes<EcalRecHitCollection>(endcapRecHitCollection_);
-
-  EScorr_ = ps.getParameter<int>("EScorr");
-
-  preshNst_ = ps.getParameter<int>("preshPi0Nstrip");
-
-  preshStripECut_ = ps.getParameter<double>("preshStripEnergyCut");
-
-  w0_ = ps.getParameter<double>("w0");
-
-  PhotonPi0DiscriminatorAssociationMap_ = ps.getParameter<string>("Pi0Association");
-
-  string debugString = ps.getParameter<string>("debugLevel");
-
-  if      (debugString == "DEBUG")   debugL_pi0 = pDEBUG;
-  else if (debugString == "INFO")    debugL_pi0 = pINFO;
-  else                               debugL_pi0 = pERROR;
-
-  string tmpPath = ps.getUntrackedParameter<string>("pathToWeightFiles","RecoEcal/EgammaClusterProducers/data/");
-
-  presh_pi0_algo = new EndcapPiZeroDiscriminatorAlgo(preshStripECut_, preshNst_, tmpPath);
-
-  produces< PhotonPi0DiscriminatorAssociationMap >(PhotonPi0DiscriminatorAssociationMap_);
-
-
-  nEvt_ = 0;
-
-}
-
-
-PiZeroDiscriminatorProducer::~PiZeroDiscriminatorProducer() {
-   delete presh_pi0_algo;
-}
-
-
-void PiZeroDiscriminatorProducer::produce(Event& evt, const EventSetup& es) {
-
-  ostringstream ostr; // use this stream for all messages in produce
-
-  if ( debugL_pi0 <= pDEBUG )
-       cout << "\n PiZeroDiscriminatorProducer: .......  Event " << evt.id() << " with Number = " <<  nEvt_+1
-            << " is analyzing ....... " << endl << endl;
-
-  // Get ES clusters in X plane
-  Handle<reco::PreshowerClusterShapeCollection> pPreshowerShapeClustersX;
-  evt.getByToken(pPreshowerShapeClustersXToken_, pPreshowerShapeClustersX);
-  const reco::PreshowerClusterShapeCollection *clustersX = pPreshowerShapeClustersX.product();
-  if ( debugL_pi0 <= pDEBUG ) {
-    cout << "\n PiZeroDiscriminatorProducer: pPreshowerShapeClustersX->size() = " << clustersX->size() << endl;
-  }
-  // Get ES clusters in Y plane
-  Handle<reco::PreshowerClusterShapeCollection> pPreshowerShapeClustersY;
-  evt.getByToken(pPreshowerShapeClustersYToken_, pPreshowerShapeClustersY);
-  const reco::PreshowerClusterShapeCollection *clustersY = pPreshowerShapeClustersY.product();
-  if ( debugL_pi0 <= pDEBUG ) {
-    cout << "\n PiZeroDiscriminatorProducer: pPreshowerShapeClustersY->size() = " << clustersY->size() << endl;
-  }
-
-  Handle< EcalRecHitCollection > pEBRecHits;
-  evt.getByToken( barrelRecHitCollectionToken_, pEBRecHits );
-  const EcalRecHitCollection *ebRecHits = pEBRecHits.product();
-
-  Handle< EcalRecHitCollection > pEERecHits;
-  evt.getByToken( endcapRecHitCollectionToken_, pEERecHits );
-  const EcalRecHitCollection *eeRecHits = pEERecHits.product();
-
-  ESHandle<CaloGeometry> pGeometry;
-  es.get<CaloGeometryRecord>().get(pGeometry);
-  const CaloGeometry *geometry = pGeometry.product();
-
-  ESHandle<CaloTopology> pTopology;
-  es.get<CaloTopologyRecord>().get(pTopology);
-  const CaloTopology *topology = pTopology.product();
-
-  //make cycle over Photon Collection
-  Handle<PhotonCollection> correctedPhotonHandle;
-  evt.getByToken(correctedPhotonToken_, correctedPhotonHandle);
-  const PhotonCollection corrPhoCollection = *(correctedPhotonHandle.product());
-  if ( debugL_pi0 <= pDEBUG ) {
-    cout << " PiZeroDiscriminatorProducer: Photon Collection size : " << corrPhoCollection.size() << endl;
-  }
-
-  unique_ptr<PhotonPi0DiscriminatorAssociationMap> Pi0Assocs_p(new PhotonPi0DiscriminatorAssociationMap(correctedPhotonHandle));
-
-  for( PhotonCollection::const_iterator  iPho = corrPhoCollection.begin(); iPho != corrPhoCollection.end(); iPho++) {
-
-      float Phot_En   = iPho->energy();
-      float Phot_Et   = Phot_En*sin(2*atan(exp(-iPho->eta())));
-      float Phot_eta  = iPho->eta();
-      float Phot_phi  = iPho->phi();
-      float Phot_R9   = iPho->r9();
-
-      if ( debugL_pi0 <= pDEBUG ) {
-         cout << " PiZeroDiscriminatorProducer: Photon index : " << iPho - corrPhoCollection.begin()
-                           << " with Energy = " <<  Phot_En
-			   << " Et = " << Phot_Et
-                           << " ETA = " << Phot_eta
-       		           << " PHI = " << Phot_phi
-			   << " R9 = " << Phot_R9 << endl;
-      }
-      SuperClusterRef it_super = iPho->superCluster();
-
-      float SC_En   = it_super->energy();
-      float SC_Et   = SC_En*sin(2*atan(exp(-it_super->eta())));
-      float SC_eta  = it_super->eta();
-      float SC_phi  = it_super->phi();
-
-      if ( debugL_pi0 <= pDEBUG ) {
-        cout << " PiZeroDiscriminatorProducer: superE = " << SC_En
-	          << " superEt = " << SC_Et
-                  << " superETA = " << SC_eta
-       		  << " superPHI = " << SC_phi << endl;
-      }
-
-      //  New way to get ClusterShape info
-      // Find the entry in the map corresponding to the seed BasicCluster of the SuperCluster
-      // DetId id = it_super->seed()->hitsAndFractions()[0].first;
-
-      // get on-the-fly the cluster shapes
-//      EcalClusterLazyTools lazyTool( evt, es, barrelRecHitCollection_, endcapRecHitCollection_ );
-
-      float nnoutput = -1.;
-      if(fabs(SC_eta) >= 1.65 && fabs(SC_eta) <= 2.5) {  //  Use Preshower region only
-          const GlobalPoint pointSC(it_super->x(),it_super->y(),it_super->z()); // get the centroid of the SC
-          if ( debugL_pi0 <= pDEBUG ) cout << "SC centroind = " << pointSC << endl;
-          double SC_seed_energy = it_super->seed()->energy();
-
-          const CaloClusterPtr  seed = it_super->seed();
-
-	  EcalClusterTools::eMax( *seed, ebRecHits );
-
-          double SC_seed_Shape_E1 = EcalClusterTools::eMax( *seed, eeRecHits );
-          double SC_seed_Shape_E3x3 = EcalClusterTools::e3x3( *seed, eeRecHits, topology );
-          double SC_seed_Shape_E5x5 = EcalClusterTools::e5x5( *seed, eeRecHits, topology );
-
-          if ( debugL_pi0 <= pDEBUG ) {
-            cout << "PiZeroDiscriminatorProducer: ( SeedBC_energy, E1, E3x3, E5x5) = "
-	         <<  SC_seed_energy << " "
-                 <<  SC_seed_Shape_E1 <<  " "
-                 <<  SC_seed_Shape_E3x3 <<  " "
-                 <<  SC_seed_Shape_E5x5 << endl;
-          }
-
-// Get the Preshower 2-planes energy vectors associated with the given SC
-          vector<float> vout_stripE1;
-	  vector<float> vout_stripE2;
-          for(reco::PreshowerClusterShapeCollection::const_iterator esClus = clustersX->begin();
-                                                       esClus !=clustersX->end(); esClus++) {
-             SuperClusterRef sc_ref = esClus->superCluster();
-             float dR = sqrt((SC_eta-sc_ref->eta())*(SC_eta-sc_ref->eta()) +
-	                     (SC_phi-sc_ref->phi())*(SC_phi-sc_ref->phi()));
-             if(dR < 0.01 ) {
-
-	       vout_stripE1 = esClus->getStripEnergies();
-
-             }
-          }
-	  for(reco::PreshowerClusterShapeCollection::const_iterator esClus = clustersY->begin();
-                                                       esClus !=clustersY->end(); esClus++) {
-            SuperClusterRef sc_ref = esClus->superCluster();
-	    float dR = sqrt((SC_eta-sc_ref->eta())*(SC_eta-sc_ref->eta()) +
-	                     (SC_phi-sc_ref->phi())*(SC_phi-sc_ref->phi()));
-             if(dR < 0.01 ) {
-
-               vout_stripE2 = esClus->getStripEnergies();
-
-	    }
-          }
-
-          if(vout_stripE1.empty() || vout_stripE2.empty() ) {
-            if ( debugL_pi0 <= pDEBUG )
-	            cout  << " PiZeroDiscriminatorProducer: Attention!!!!!  Not Valid ES NN input Variables Return NNout = -1" << endl;
-	    Pi0Assocs_p->insert(Ref<PhotonCollection>(correctedPhotonHandle,iPho - corrPhoCollection.begin()), nnoutput);
-            continue;
-	  }
-
-          if ( debugL_pi0 <= pDEBUG ) {
-            cout  << "PiZeroDiscriminatorProducer : vout_stripE1.size = " << vout_stripE1.size()
-	          << " vout_stripE2.size = " << vout_stripE2.size() << endl;
-            cout  << "PiZeroDiscriminatorProducer : ES_input_vector = " ;
-            for(int k1=0;k1<11;k1++) {
-              cout  << vout_stripE1[k1] << " " ;
-            }
-            for(int k1=0;k1<11;k1++) {
-              cout  << vout_stripE2[k1] << " " ;
-            }
-            cout  << endl;
-          }
-
-          bool valid_NNinput = presh_pi0_algo->calculateNNInputVariables(vout_stripE1, vout_stripE2,
-                                                 SC_seed_Shape_E1, SC_seed_Shape_E3x3, SC_seed_Shape_E5x5, EScorr_);
-
-          if(!valid_NNinput) {
-            if ( debugL_pi0 <= pDEBUG )
-	           cout  << " PiZeroDiscriminatorProducer: Attention!!!!!  Not Valid ES NN input Variables Return NNout = -1" << endl;
-	    Pi0Assocs_p->insert(Ref<PhotonCollection>(correctedPhotonHandle,iPho - corrPhoCollection.begin()), nnoutput);
-	    continue;
-	  }
-
-          if ( debugL_pi0 <= pDEBUG ) {
-            cout  << " PiZeroDiscriminatorProducer: NN_ESEndcap_input_vector+Et+Eta+Phi+R9 = " ;
-            for(auto v: presh_pi0_algo->get_input_vector()) {
-              cout  << v << " " ;
-            }
-            cout  << SC_Et << " " << SC_eta << " " << SC_phi << " " << Phot_R9  << endl;
-	  }
-
-          nnoutput = presh_pi0_algo->GetNNOutput(SC_Et);
-
-          if ( debugL_pi0 <= pDEBUG ) {
-               cout << " PiZeroDiscriminatorProducer: Event : " <<  evt.id()
-	            << " SC id = " << iPho - corrPhoCollection.begin()
-		    << " with Pt = " << SC_Et
-		    << " eta = " << SC_eta
-		    << " phi = " << SC_phi
-		    << " contains: " << it_super->clustersSize() << " BCs "
-		    << " has NNout = " <<  nnoutput << endl;
-         }
-
- 	 Pi0Assocs_p->insert(Ref<PhotonCollection>(correctedPhotonHandle,iPho - corrPhoCollection.begin()), nnoutput);
-
-      } else if((fabs(SC_eta) <= 1.4442) || (fabs(SC_eta) < 1.65 && fabs(SC_eta) >= 1.566) || fabs(SC_eta) >= 2.5) {
-
-         const CaloClusterPtr seed = it_super->seed();
-
-         double SC_seed_Shape_E1 = EcalClusterTools::eMax( *seed, ebRecHits );
-         double SC_seed_Shape_E3x3 = EcalClusterTools::e3x3( *seed, ebRecHits, topology );
-         double SC_seed_Shape_E5x5 = EcalClusterTools::e5x5( *seed, ebRecHits, topology );
-         double SC_seed_Shape_E2 = EcalClusterTools::e2nd( *seed, ebRecHits );
-
-	 std::vector<float> vCov = EcalClusterTools::covariances( *seed, ebRecHits , topology, geometry, w0_ );
-
-         double SC_seed_Shape_cEE = vCov[0];
-         double SC_seed_Shape_cEP = vCov[1];
-         double SC_seed_Shape_cPP = vCov[2];
-
-         double SC_seed_Shape_E2x2 = EcalClusterTools::e2x2( *seed, ebRecHits, topology );
-         double SC_seed_Shape_E3x2 = EcalClusterTools::e3x2( *seed, ebRecHits, topology );
-
-	 double SC_seed_Shape_E3x2r = 0.0;
-	 double SC_seed_Shape_ELeft = EcalClusterTools::eLeft( *seed, ebRecHits, topology );
-	 double SC_seed_Shape_ERight = EcalClusterTools::eRight( *seed, ebRecHits, topology );
-	 double SC_seed_Shape_ETop = EcalClusterTools::eTop( *seed, ebRecHits, topology );
-	 double SC_seed_Shape_EBottom = EcalClusterTools::eBottom( *seed, ebRecHits, topology );
-
-         double DA = SC_seed_Shape_E2x2 - SC_seed_Shape_E2 - SC_seed_Shape_E1;
-
-         if(SC_seed_Shape_E2==SC_seed_Shape_ETop || SC_seed_Shape_E2==SC_seed_Shape_EBottom) {
-	   if( SC_seed_Shape_ELeft > SC_seed_Shape_ERight ) {
-	     SC_seed_Shape_E3x2r = (DA - SC_seed_Shape_ELeft)/(0.25+SC_seed_Shape_ELeft);
-	   } else {
-	     SC_seed_Shape_E3x2r = (DA - SC_seed_Shape_ERight)/(0.25+SC_seed_Shape_ERight);
-	   }
-
-	 } else if(SC_seed_Shape_E2==SC_seed_Shape_ELeft || SC_seed_Shape_E2==SC_seed_Shape_ERight) {
-
-	   if( SC_seed_Shape_ETop > SC_seed_Shape_EBottom ) {
-	     SC_seed_Shape_E3x2r = (DA - SC_seed_Shape_ETop)/(0.25+SC_seed_Shape_ETop);
-	   } else {
-	     SC_seed_Shape_E3x2r = (DA - SC_seed_Shape_EBottom)/(0.25+SC_seed_Shape_EBottom);
-	   }
-
-         }
-
-         double SC_seed_Shape_xcog = EcalClusterTools::eRight( *seed, ebRecHits, topology ) - EcalClusterTools::e2x5Left( *seed, ebRecHits, topology );
-         double SC_seed_Shape_ycog = EcalClusterTools::e2x5Top( *seed, ebRecHits, topology ) - EcalClusterTools::e2x5Bottom( *seed, ebRecHits, topology );
-
-
-         if ( debugL_pi0 <= pDEBUG ) {
-            cout << "PiZeroDiscriminatorProduce: lazyTool  (E1,E3x3,E5x5,E2,cEE,cEP,cPP,E2x2,E3x2_E3x2r,Xcog,Ycog,E2x5Bottom,E2x5Top,Et,Eta,PhiR9) = ( "
-	         <<   SC_seed_Shape_E1 << " "
-                 <<   SC_seed_Shape_E3x3 << " "
-                 <<   SC_seed_Shape_E5x5 << " "
-                 <<   SC_seed_Shape_E2 << " "
-                 <<   SC_seed_Shape_cEE <<  " "
-                 <<   SC_seed_Shape_cEP << " "
-                 <<   SC_seed_Shape_cPP << " "
-                 <<   SC_seed_Shape_E2x2 <<  " "
-                 <<   SC_seed_Shape_E3x2 << " "
-                 <<   SC_seed_Shape_E3x2r << " "
-                 <<   SC_seed_Shape_xcog <<  " "
-                 <<   SC_seed_Shape_ycog << " "
-		 <<   EcalClusterTools::e2x5Bottom( *seed, ebRecHits, topology ) << " "
-		 <<   EcalClusterTools::e2x5Top( *seed, ebRecHits, topology ) << " "
-		 <<   SC_Et << " "
-		 <<   SC_eta << " "
-		 <<   SC_phi << " "
-	         <<   Phot_R9 << " )" << endl;
-         }
-
-         float SC_et = it_super->energy()*sin(2*atan(exp(-it_super->eta())));
-
-         presh_pi0_algo->calculateBarrelNNInputVariables(SC_et, SC_seed_Shape_E1, SC_seed_Shape_E3x3,
-					      SC_seed_Shape_E5x5, SC_seed_Shape_E2,
-					      SC_seed_Shape_cEE, SC_seed_Shape_cEP,
-					      SC_seed_Shape_cPP, SC_seed_Shape_E2x2,
-					      SC_seed_Shape_E3x2, SC_seed_Shape_E3x2r,
-					      SC_seed_Shape_xcog, SC_seed_Shape_ycog);
-
-  	 if ( debugL_pi0 <= pDEBUG ) {
-           cout  << " PiZeroDiscriminatorProducer : NN_barrel_nonESEndcap_variables+Et+Eta+Phi+R9 = " ;
-           for(auto v: presh_pi0_algo->get_input_vector()) {
-             cout  << v << " " ;
-           }
-           cout  << SC_Et << " " << SC_eta << " " << SC_phi << " " << Phot_R9 << endl;
-
-         }
-
-         nnoutput = presh_pi0_algo->GetBarrelNNOutput(SC_et);
-
-
-         if ( debugL_pi0 <= pDEBUG ) {
-           cout << "PiZeroDiscriminatorProducer : Event : " <<  evt.id()
-	            << " SC id = " << iPho - corrPhoCollection.begin()
-		    << " with Pt = " << SC_Et
-		    << " eta = " << SC_eta
-		    << " phi = " << SC_phi
-		    << " contains: " << it_super->clustersSize() << " BCs "
-		    << " has NNout = " <<  nnoutput
-	            << endl;
-         }
-
- 	 Pi0Assocs_p->insert(Ref<PhotonCollection>(correctedPhotonHandle,iPho - corrPhoCollection.begin()), nnoutput);
-      } else { Pi0Assocs_p->insert(Ref<PhotonCollection>(correctedPhotonHandle,iPho - corrPhoCollection.begin()), -1.);}
-  } // end of cycle over Photons
-
-  evt.put(std::move(Pi0Assocs_p),PhotonPi0DiscriminatorAssociationMap_);
-  if ( debugL_pi0 <= pDEBUG ) cout << "PiZeroDiscriminatorProducer: PhotonPi0DiscriminatorAssociationMap added to the event" << endl;
-
-  nEvt_++;
-
-  LogDebug("PiZeroDiscriminatorDebug") << ostr.str();
-
-
-}
diff --git a/EgammaAnalysis/PhotonIDProducers/src/SealModule.cc b/EgammaAnalysis/PhotonIDProducers/src/SealModule.cc
deleted file mode 100644
index 201d2ce54156a..0000000000000
--- a/EgammaAnalysis/PhotonIDProducers/src/SealModule.cc
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "EgammaAnalysis/PhotonIDProducers/interface/PiZeroDiscriminatorProducer.h"
-
-
-
-DEFINE_FWK_MODULE(PiZeroDiscriminatorProducer);
diff --git a/EventFilter/CSCRawToDigi/interface/CSCDMBHeader.h b/EventFilter/CSCRawToDigi/interface/CSCDMBHeader.h
index 611f7732748fa..0491c28331da4 100644
--- a/EventFilter/CSCRawToDigi/interface/CSCDMBHeader.h
+++ b/EventFilter/CSCRawToDigi/interface/CSCDMBHeader.h
@@ -4,10 +4,10 @@
 #include <cassert>
 #include <iosfwd>
 #include <cstring> // bzero
+#include <memory>
 #include "FWCore/Utilities/interface/Exception.h"
 #include "DataFormats/CSCDigi/interface/CSCDMBStatusDigi.h"
 #include "EventFilter/CSCRawToDigi/interface/CSCVDMBHeaderFormat.h"
-#include <boost/shared_ptr.hpp>
 
 struct CSCDMBHeader2005;
 struct CSCDMBHeader2013;
@@ -19,11 +19,6 @@ class CSCDMBHeader  {
   
   CSCDMBHeader(const uint16_t * buf, uint16_t firmware_version = 2005);
 
-  CSCDMBHeader(const CSCDMBStatusDigi & digi)
-    {
-      memcpy(this, digi.header(), sizeInWords()*2);
-    }
-
 
 
   bool cfebAvailable(unsigned icfeb) { 
@@ -73,7 +68,7 @@ class CSCDMBHeader  {
 
  private:
 
-  boost::shared_ptr<CSCVDMBHeaderFormat> theHeaderFormat;
+  std::shared_ptr<CSCVDMBHeaderFormat> theHeaderFormat;
   int theFirmwareVersion;
 
 
diff --git a/EventFilter/CSCRawToDigi/interface/CSCDMBTrailer.h b/EventFilter/CSCRawToDigi/interface/CSCDMBTrailer.h
index 93b5f633aedf7..914c002e015eb 100644
--- a/EventFilter/CSCRawToDigi/interface/CSCDMBTrailer.h
+++ b/EventFilter/CSCRawToDigi/interface/CSCDMBTrailer.h
@@ -4,14 +4,13 @@
 #include <cassert>
 #include <iosfwd>
 #include <cstring> // bzero
+#include <memory>
 #include "FWCore/Utilities/interface/Exception.h"
 #include "DataFormats/CSCDigi/interface/CSCDMBStatusDigi.h"
 #include "EventFilter/CSCRawToDigi/interface/CSCVDMBTrailerFormat.h"
 #include "EventFilter/CSCRawToDigi/interface/CSCDMBHeader.h"
-#include <boost/shared_ptr.hpp>
 
 
-// class CSCDMBHeader;
 struct CSCDMBTrailer2005;
 struct CSCDMBTrailer2013;
 
@@ -21,11 +20,6 @@ class CSCDMBTrailer {
   CSCDMBTrailer(uint16_t firmware_version = 2005);
 
   CSCDMBTrailer(const uint16_t * buf, uint16_t firmware_version = 2005);
-  
-  CSCDMBTrailer(const CSCDMBStatusDigi & digi) 
-    {
-      memcpy(this, digi.trailer(), sizeInWords()*2);
-    }
 
 
   ///@@ NEEDS TO BE DONE
@@ -78,7 +72,7 @@ class CSCDMBTrailer {
 
  private:
   
-  boost::shared_ptr<CSCVDMBTrailerFormat> theTrailerFormat;
+  std::shared_ptr<CSCVDMBTrailerFormat> theTrailerFormat;
   int theFirmwareVersion;
 
 };
diff --git a/EventFilter/CSCRawToDigi/interface/CSCEventData.h b/EventFilter/CSCRawToDigi/interface/CSCEventData.h
index 9b2412c732528..187b2734b7761 100644
--- a/EventFilter/CSCRawToDigi/interface/CSCEventData.h
+++ b/EventFilter/CSCRawToDigi/interface/CSCEventData.h
@@ -2,22 +2,10 @@
 #define CSCEventData_h
 
 class CSCCFEBData;
-class CLCTData;
-class TMBScope;
-class CSCDMBHeader;
-class CSCDMBTrailer;
-class CSCStripDigi;
-class CSCALCTHeader;
-struct CSCALCTHeader2007;
-class CSCAnodeData;
-class CSCALCTTrailer;
 class CSCTMBHeader;
-class CSCTMBData;
 class CSCCLCTData;
-class CSCTMBTrailer;
 class CSCWireDigi;
 class CSCStripDigi;
-class CSCComparatorOutput;
 #include <map>
 #include <vector>
 #ifndef LOCAL_UNPACK
@@ -25,8 +13,6 @@ class CSCComparatorOutput;
 #endif
 #include "EventFilter/CSCRawToDigi/interface/CSCDMBHeader.h"
 #include "EventFilter/CSCRawToDigi/interface/CSCDMBTrailer.h"
-#include "EventFilter/CSCRawToDigi/interface/CSCDMBHeader.h"
-#include "EventFilter/CSCRawToDigi/interface/CSCDMBTrailer.h"
 #include "EventFilter/CSCRawToDigi/interface/CSCALCTHeader.h"
 #include "EventFilter/CSCRawToDigi/interface/CSCAnodeData.h"
 #include "EventFilter/CSCRawToDigi/interface/CSCALCTTrailer.h"
diff --git a/EventFilter/CSCRawToDigi/src/CSCDCCExaminer.cc b/EventFilter/CSCRawToDigi/src/CSCDCCExaminer.cc
index 72aaae4ddc12a..d29925f165c5d 100644
--- a/EventFilter/CSCRawToDigi/src/CSCDCCExaminer.cc
+++ b/EventFilter/CSCRawToDigi/src/CSCDCCExaminer.cc
@@ -273,18 +273,14 @@ int32_t CSCDCCExaminer::check(const uint16_t* &buffer, int32_t length)
 
 
   /// Check for presence of data blocks inside TMB data
-  bool fTMB_Scope_Start = false;
   bool fTMB_MiniScope_Start = false;
   bool fTMB_RPC_Start = false;
   bool fTMB_BlockedCFEBs_Start = false;
 
-  bool fTMB_Scope = false;
   bool fTMB_MiniScope = false;
   bool fTMB_RPC = false;
   bool fTMB_BlockedCFEBs = false;
 
-  fTMB_Scope = fTMB_Scope && true; // WARNING in 5_0_X
-
   while( length>0 )
     {
       // == Store last 4 read buffers in pipeline-like memory (note that memcpy works quite slower!)
@@ -633,12 +629,10 @@ int32_t CSCDCCExaminer::check(const uint16_t* &buffer, int32_t length)
           uniqueALCT   = true;
           uniqueTMB    = true;
 
-          fTMB_Scope_Start = false;
           fTMB_MiniScope_Start = false;
           fTMB_RPC_Start = false;
           fTMB_BlockedCFEBs_Start = false;
 
-          fTMB_Scope = false;
           fTMB_MiniScope = false;
           fTMB_RPC = false;
           fTMB_BlockedCFEBs = false;
@@ -1031,12 +1025,6 @@ int32_t CSCDCCExaminer::check(const uint16_t* &buffer, int32_t length)
           fTMB_RPC_Start = true;
         }
 
-      // Check for Scope data
-      if ( fTMB_Header && (scanbuf(buf0,4, 0x6B05)>=0) )
-        {
-          fTMB_Scope_Start = true;
-        }
-
       // Check for Mini-Scope data
       if ( fTMB_Header && (scanbuf(buf0,4, 0x6B07)>=0) )
         {
@@ -1057,13 +1045,6 @@ int32_t CSCDCCExaminer::check(const uint16_t* &buffer, int32_t length)
           fTMB_RPC = true;
         }
 
-      // Check for end of Scope data
-      if ( fTMB_Header && fTMB_Scope_Start
-           && (scanbuf(buf0,4, 0x6E05)>=0) )
-        {
-          fTMB_Scope = true;
-        }
-
       // Check for end of Mini-Scope data
       if ( fTMB_Header && fTMB_MiniScope_Start
            && (scanbuf(buf0,4, 0x6E07)>=0) )
diff --git a/EventFilter/CSCRawToDigi/src/CSCDDUEventData.cc b/EventFilter/CSCRawToDigi/src/CSCDDUEventData.cc
index 9ed43bff073fc..61a8af7ff1791 100644
--- a/EventFilter/CSCRawToDigi/src/CSCDDUEventData.cc
+++ b/EventFilter/CSCRawToDigi/src/CSCDDUEventData.cc
@@ -172,7 +172,6 @@ void CSCDDUEventData::unpack_data(const uint16_t *buf, CSCDCCExaminer* examiner)
      std::cout << i << " " << std::hex << buf[4*i+3] << " " << buf[4*i+2] << " " 
 						<< buf[4*i+1] << " " << buf[4*i] << std::endl;
     }
-  //std::cout << "DDU Size: " << std::dec << theDDUHeader.sizeInWords() << std::endl;
 
   theDDUHeader.setFromBuffer(buf);
   
@@ -196,10 +195,6 @@ void CSCDDUEventData::unpack_data(const uint16_t *buf, CSCDCCExaminer* examiner)
    {
      theFormatVersion = 2013;
    }
-   
-  // std::cout << "Format Version: " << theFormatVersion << std::endl;
-  //std::cout << "sandrik dduID =" << theDDUHeader.source_id() << std::endl; 
-  //int i=-1;
 
  
   // we really don't want to copy CSCEventData's while filling the vec
@@ -246,7 +241,6 @@ void CSCDDUEventData::unpack_data(const uint16_t *buf, CSCDCCExaminer* examiner)
 	{
 	  LogTrace ("CSCDDUEventData|CSCRawToDigi") << "size of vector of cscData = " << theData.size();
 	}
-      // std::cout << std::dec << theDDUTrailer.sizeInWords() << std::endl;
       // decode ddu tail
       theDDUTrailer.setFromBuffer(inputBuf+dduBufSize);
       // memcpy(&theDDUTrailer, dduBlock+(dduBufSize-theDDUTrailer.sizeInWords())*2, theDDUTrailer.sizeInWords()*2);
@@ -277,7 +271,6 @@ void CSCDDUEventData::unpack_data(const uint16_t *buf, CSCDCCExaminer* examiner)
 
     }
     theSizeInWords = dduBufSize+12;
-    buf=inputBuf+dduBufSize;
 	
   } else {
 
@@ -326,7 +319,6 @@ void CSCDDUEventData::unpack_data(const uint16_t *buf, CSCDCCExaminer* examiner)
     theSizeInWords = buf - inputBuf;
   }
 
-//std::cout << "DDUevData Size: " << theSizeInWords << " BUFlast: " << std::hex << inputBuf0[theSizeInWords-4] << //std::endl;
 /// Pack Trailer 0 (to access TTS)
 theDDUTrailer0 = inputBuf0[theSizeInWords-4];
 }
diff --git a/EventFilter/CSCRawToDigi/src/CSCDMBHeader.cc b/EventFilter/CSCRawToDigi/src/CSCDMBHeader.cc
index 23afb2c3ba420..ea8b3331d6530 100644
--- a/EventFilter/CSCRawToDigi/src/CSCDMBHeader.cc
+++ b/EventFilter/CSCRawToDigi/src/CSCDMBHeader.cc
@@ -10,9 +10,9 @@ CSCDMBHeader::CSCDMBHeader(uint16_t firmware_version)
 {
 
   if (theFirmwareVersion == 2013) {
-    theHeaderFormat = boost::shared_ptr<CSCVDMBHeaderFormat>(new CSCDMBHeader2013());
+    theHeaderFormat = std::make_shared<CSCDMBHeader2013>();
   } else {
-    theHeaderFormat = boost::shared_ptr<CSCVDMBHeaderFormat>(new CSCDMBHeader2005());
+    theHeaderFormat = std::make_shared<CSCDMBHeader2005>();
   }
 
 }
@@ -21,14 +21,14 @@ CSCDMBHeader::CSCDMBHeader(const uint16_t * buf, uint16_t firmware_version)
 : theHeaderFormat(), theFirmwareVersion(firmware_version) 
 {
   if (theFirmwareVersion == 2013) {
-    theHeaderFormat = boost::shared_ptr<CSCVDMBHeaderFormat>(new CSCDMBHeader2013(buf));
+    theHeaderFormat = std::make_shared<CSCDMBHeader2013>(buf);
   } else {
-    theHeaderFormat = boost::shared_ptr<CSCVDMBHeaderFormat>(new CSCDMBHeader2005(buf));
+    theHeaderFormat = std::make_shared<CSCDMBHeader2005>(buf);
   }
 }
 
 CSCDMBHeader2005 CSCDMBHeader::dmbHeader2005()   const {
-  CSCDMBHeader2005 * result = dynamic_cast<CSCDMBHeader2005 *>(theHeaderFormat.get());
+  const CSCDMBHeader2005 * result = dynamic_cast<const CSCDMBHeader2005 *>(theHeaderFormat.get());
   if(result == nullptr)
   {
     throw cms::Exception("Could not get 2005 DMB header format");
@@ -38,7 +38,7 @@ CSCDMBHeader2005 CSCDMBHeader::dmbHeader2005()   const {
 
 
 CSCDMBHeader2013 CSCDMBHeader::dmbHeader2013()   const {
-  CSCDMBHeader2013 * result = dynamic_cast<CSCDMBHeader2013 *>(theHeaderFormat.get());
+  const CSCDMBHeader2013 * result = dynamic_cast<const CSCDMBHeader2013 *>(theHeaderFormat.get());
   if(result == nullptr)
   {
     throw cms::Exception("Could not get 2013 DMB header format");
diff --git a/EventFilter/CSCRawToDigi/src/CSCDMBTrailer.cc b/EventFilter/CSCRawToDigi/src/CSCDMBTrailer.cc
index 8d98fb122438c..451d885cf8500 100644
--- a/EventFilter/CSCRawToDigi/src/CSCDMBTrailer.cc
+++ b/EventFilter/CSCRawToDigi/src/CSCDMBTrailer.cc
@@ -10,9 +10,9 @@ CSCDMBTrailer::CSCDMBTrailer(uint16_t firmware_version)
 {
 
   if (theFirmwareVersion == 2013) {
-    theTrailerFormat = boost::shared_ptr<CSCVDMBTrailerFormat>(new CSCDMBTrailer2013());
+    theTrailerFormat = std::make_shared<CSCDMBTrailer2013>();
   } else {
-    theTrailerFormat = boost::shared_ptr<CSCVDMBTrailerFormat>(new CSCDMBTrailer2005());
+    theTrailerFormat = std::make_shared<CSCDMBTrailer2005>();
   }
 
 }
@@ -21,14 +21,14 @@ CSCDMBTrailer::CSCDMBTrailer(const uint16_t * buf, uint16_t firmware_version)
 : theTrailerFormat(), theFirmwareVersion(firmware_version) 
 {
   if (theFirmwareVersion == 2013) {
-    theTrailerFormat = boost::shared_ptr<CSCVDMBTrailerFormat>(new CSCDMBTrailer2013(buf));
+    theTrailerFormat = std::make_shared<CSCDMBTrailer2013>(buf);
   } else {
-    theTrailerFormat = boost::shared_ptr<CSCVDMBTrailerFormat>(new CSCDMBTrailer2005(buf));
+    theTrailerFormat = std::make_shared<CSCDMBTrailer2005>(buf);
   }
 }
 
 CSCDMBTrailer2005 CSCDMBTrailer::dmbTrailer2005()   const {
-  CSCDMBTrailer2005 * result = dynamic_cast<CSCDMBTrailer2005 *>(theTrailerFormat.get());
+  const CSCDMBTrailer2005 * result = dynamic_cast<const CSCDMBTrailer2005 *>(theTrailerFormat.get());
   if(result == nullptr)
   {
     throw cms::Exception("Could not get 2005 DMB trailer format");
@@ -38,7 +38,7 @@ CSCDMBTrailer2005 CSCDMBTrailer::dmbTrailer2005()   const {
 
 
 CSCDMBTrailer2013 CSCDMBTrailer::dmbTrailer2013()   const {
-  CSCDMBTrailer2013 * result = dynamic_cast<CSCDMBTrailer2013 *>(theTrailerFormat.get());
+  const CSCDMBTrailer2013 * result = dynamic_cast<const CSCDMBTrailer2013 *>(theTrailerFormat.get());
   if(result == nullptr)
   {
     throw cms::Exception("Could not get 2013 DMB trailer format");
diff --git a/EventFilter/CSCRawToDigi/src/CSCTMBData.cc b/EventFilter/CSCRawToDigi/src/CSCTMBData.cc
index b5f6919c9bb10..09f39ef520dd9 100644
--- a/EventFilter/CSCRawToDigi/src/CSCTMBData.cc
+++ b/EventFilter/CSCRawToDigi/src/CSCTMBData.cc
@@ -166,26 +166,21 @@ int CSCTMBData::UnpackTMB(const uint16_t *buf) {
   ///determine 2007 or 2006 version
   unsigned short int firmwareVersion=0;
   int Ntbins = 0 ;
-  int NHeaderFrames = 0; //WARNING in 5_0_X
   int NRPCtbins = 0; // =VB= number of RPC tbins  
   
   int b0cLine=0;///assumes that buf starts at the tmb data
                 ///this is not true if something is wrong in the data 
                 ///before TMB - then we skip the whole event
 
-  NHeaderFrames++; NHeaderFrames--;
-
   if (buf[b0cLine]==0xdb0c) {
     firmwareVersion=2007;
     Ntbins = buf[b0cLine+19]&0xF8;
     NRPCtbins = (buf[b0cLine+36]>>5)&0x1F; // =VB= get RPC tbins  
-    NHeaderFrames = buf[b0cLine+5]&0x3F; //WARNING in 5_0_X
   } 
   else if (buf[b0cLine]==0x6b0c) {
     firmwareVersion=2006;
     Ntbins =  buf[b0cLine+1]&0x1f ;
     NRPCtbins = Ntbins;
-    NHeaderFrames = buf[b0cLine+4]&0x1f; //WARNING in 5_0_X
   } 
   else {
     LogTrace("CSCTMBData|CSCRawToDigi") << "+++ Can't find b0C flag";
diff --git a/EventFilter/CSCTFRawToDigi/src/CSCSPEvent.cc b/EventFilter/CSCTFRawToDigi/src/CSCSPEvent.cc
index a9940eb614c0f..a803c5f021757 100644
--- a/EventFilter/CSCTFRawToDigi/src/CSCSPEvent.cc
+++ b/EventFilter/CSCTFRawToDigi/src/CSCSPEvent.cc
@@ -67,7 +67,7 @@ bool CSCSPEvent::unpack(const unsigned short *&buf) throw() {
 				if( track.ME1_id() ){ // if track contains LCT from the ME1
 					unsigned int mpc = ( track.ME1_id()>3 ? 1 : 0 );
 					int ME1_tbin = tbin + second_earliest_lct_delay - track.ME1_tbin();
-///					if( track.ME1_tbin()>2 ) unpackError |= true; // because bxaDepth<=2
+///                                     if( track.ME1_tbin()>2 ) unpackError |= true; // because bxaDepth<=2
 					if( ME1_tbin>=0 && ME1_tbin<7 ) {
 						std::vector<CSCSP_MEblock> lcts = record_[ME1_tbin].LCTs(mpc);
 						for(std::vector<CSCSP_MEblock>::const_iterator lct=lcts.begin(); lct!=lcts.end(); lct++)
@@ -81,7 +81,7 @@ bool CSCSPEvent::unpack(const unsigned short *&buf) throw() {
 				}
 				if( track.ME2_id() ){ // ... ME2
 					int ME2_tbin = tbin + second_earliest_lct_delay - track.ME2_tbin();
-///					if( track.ME2_tbin()>2 ) unpackError |= true; // because bxaDepth<=2
+///                                     if( track.ME2_tbin()>2 ) unpackError |= true; // because bxaDepth<=2
 					if( ME2_tbin>=0 && ME2_tbin<7 ) {
 						std::vector<CSCSP_MEblock> lcts = record_[ME2_tbin].LCTs(2);
 						for(std::vector<CSCSP_MEblock>::const_iterator lct=lcts.begin(); lct!=lcts.end(); lct++)
@@ -95,7 +95,7 @@ bool CSCSPEvent::unpack(const unsigned short *&buf) throw() {
 				}
 				if( track.ME3_id() ){ // ... ME3
 					int ME3_tbin = tbin + second_earliest_lct_delay - track.ME3_tbin();
-///					if( track.ME3_tbin()>2 ) unpackError |= true; // because bxaDepth<=2
+///                                     if( track.ME3_tbin()>2 ) unpackError |= true; // because bxaDepth<=2
 					if( ME3_tbin>=0 && ME3_tbin<7 ) {
 						std::vector<CSCSP_MEblock> lcts = record_[ME3_tbin].LCTs(3);
 						for(std::vector<CSCSP_MEblock>::const_iterator lct=lcts.begin(); lct!=lcts.end(); lct++)
@@ -109,7 +109,7 @@ bool CSCSPEvent::unpack(const unsigned short *&buf) throw() {
 				}
 				if( track.ME4_id() ){ // ... fourth station
 					int ME4_tbin = tbin + second_earliest_lct_delay - track.ME4_tbin();
-///					if( track.ME4_tbin()>2 ) unpackError |= true; // because bxaDepth<=2
+///                                     if( track.ME4_tbin()>2 ) unpackError |= true; // because bxaDepth<=2
 					if( ME4_tbin>=0 && ME4_tbin<7 ) {
 						std::vector<CSCSP_MEblock> lcts = record_[ME4_tbin].LCTs(4);
 						for(std::vector<CSCSP_MEblock>::const_iterator lct=lcts.begin(); lct!=lcts.end(); lct++)
@@ -123,7 +123,7 @@ bool CSCSPEvent::unpack(const unsigned short *&buf) throw() {
 				}
 				if( track.MB_id() ){  // ... barrel
 					int MB_tbin = tbin + second_earliest_lct_delay - track.MB_tbin();
-///					if( track.MB_tbin()>2 ) unpackError |= true; // because bxaDepth<=2
+///                                     if( track.MB_tbin()>2 ) unpackError |= true; // because bxaDepth<=2
 					if( MB_tbin>=0 && MB_tbin<7 ) {
 						std::vector<CSCSP_MBblock> stubs = record_[MB_tbin].mbStubs();
 						for(std::vector<CSCSP_MBblock>::const_iterator stub=stubs.begin(); stub!=stubs.end(); stub++)
diff --git a/EventFilter/DTRawToDigi/plugins/DTuROSRawToDigi.cc b/EventFilter/DTRawToDigi/plugins/DTuROSRawToDigi.cc
index 945548a8ee680..ca0ed2c6ad595 100644
--- a/EventFilter/DTRawToDigi/plugins/DTuROSRawToDigi.cc
+++ b/EventFilter/DTRawToDigi/plugins/DTuROSRawToDigi.cc
@@ -77,7 +77,7 @@ bool DTuROSRawToDigi::fillRawData(edm::Event& e, const edm::EventSetup& c,
   for (int w_i = 0; w_i < nfeds_; ++w_i) {
     DTuROSFEDData fwords;
     process(feds_[w_i], data, mapping, digis, fwords);
-    words.push_back(fwords);
+    if (fwords.getfed() >= 0) words.push_back(fwords);
   }
   
   return true;
diff --git a/EventFilter/DTTFRawToDigi/interface/DTTFFEDReader.h b/EventFilter/DTTFRawToDigi/interface/DTTFFEDReader.h
index 1beaf3e4c8fda..7fab0beee8fef 100644
--- a/EventFilter/DTTFRawToDigi/interface/DTTFFEDReader.h
+++ b/EventFilter/DTTFRawToDigi/interface/DTTFFEDReader.h
@@ -14,11 +14,10 @@
 #ifndef DTTFRawToDigi_DTTFFEDReader_h
 #define DTTFRawToDigi_DTTFFEDReader_h
 
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "DataFormats/L1DTTrackFinder/interface/L1MuDTChambPhContainer.h"
 #include "DataFormats/L1DTTrackFinder/interface/L1MuDTChambThContainer.h"
 #include "DataFormats/L1DTTrackFinder/interface/L1MuDTTrackContainer.h"
-
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 
 #include "FWCore/Framework/interface/stream/EDProducer.h"
 #include <DataFormats/FEDRawData/interface/FEDRawData.h>
@@ -31,25 +30,23 @@
 
 class DTTFFEDReader : public edm::stream::EDProducer<> {
 
- public:
-
+public:
   /// Constructor
-  DTTFFEDReader(const edm::ParameterSet& pset);
+  DTTFFEDReader(const edm::ParameterSet &pset);
 
   /// Destructor
   ~DTTFFEDReader() override;
 
   /// Produce digis out of raw data
-  void produce(edm::Event & e, const edm::EventSetup& c) override;
+  void produce(edm::Event &e, const edm::EventSetup &c) override;
 
   /// Generate and fill FED raw data for a full event
-  bool fillRawData(edm::Event& e,
-		   L1MuDTChambPhContainer::Phi_Container& phi_data,
-		   L1MuDTChambThContainer::The_Container& the_data,
-		   L1MuDTTrackContainer::TrackContainer&  tra_data);
+  bool fillRawData(edm::Event &e,
+                   L1MuDTChambPhContainer::Phi_Container &phi_data,
+                   L1MuDTChambThContainer::The_Container &the_data,
+                   L1MuDTTrackContainer::TrackContainer &tra_data);
 
- private:
-  
+private:
   edm::InputTag DTTFInputTag;
 
   bool verbose_;
@@ -57,20 +54,20 @@ class DTTFFEDReader : public edm::stream::EDProducer<> {
   // Operations
 
   // access data
-  const L1MuDTChambPhContainer::Phi_Container& p_data();
+  const L1MuDTChambPhContainer::Phi_Container &p_data();
 
-  const L1MuDTChambThContainer::The_Container& t_data();
+  const L1MuDTChambThContainer::The_Container &t_data();
 
-  const L1MuDTTrackContainer::TrackContainer&  k_data();
+  const L1MuDTTrackContainer::TrackContainer &k_data();
 
   // Process one event
-  void analyse(edm::Event& e);
+  void analyse(edm::Event &e);
 
   // clear data container
   void clear();
 
   // process data
-  void process(edm::Event& e);
+  void process(edm::Event &e);
 
   // Match PHTF - ETTF tracks
   void match();
@@ -80,7 +77,7 @@ class DTTFFEDReader : public edm::stream::EDProducer<> {
 
   L1MuDTChambThContainer::The_Container theSegments;
 
-  L1MuDTTrackContainer::TrackContainer  dtTracks;
+  L1MuDTTrackContainer::TrackContainer dtTracks;
 
   unsigned int etTrack[3][12][6][2];
 
@@ -98,6 +95,5 @@ class DTTFFEDReader : public edm::stream::EDProducer<> {
   edm::InputTag getDTTFInputTag() { return DTTFInputTag; }
 
   edm::EDGetTokenT<FEDRawDataCollection> Raw_token;
-
 };
 #endif
diff --git a/EventFilter/DTTFRawToDigi/interface/DTTFFEDSim.h b/EventFilter/DTTFRawToDigi/interface/DTTFFEDSim.h
index 66b7d43f9d38b..31d9febe1d98c 100644
--- a/EventFilter/DTTFRawToDigi/interface/DTTFFEDSim.h
+++ b/EventFilter/DTTFRawToDigi/interface/DTTFFEDSim.h
@@ -28,29 +28,26 @@
 
 class DTTFFEDSim : public edm::stream::EDProducer<> {
 
- public:
-
+public:
   /// Constructor
-  DTTFFEDSim(const edm::ParameterSet& pset);
+  DTTFFEDSim(const edm::ParameterSet &pset);
 
   /// Destructor
   ~DTTFFEDSim() override;
 
   /// Produce digis out of raw data
-  void produce(edm::Event & e, const edm::EventSetup& c) override;
+  void produce(edm::Event &e, const edm::EventSetup &c) override;
 
   /// Generate and fill FED raw data for a full event
-  bool fillRawData(edm::Event& e,
-                   FEDRawDataCollection& data);
+  bool fillRawData(edm::Event &e, FEDRawDataCollection &data);
 
- private:
-  
+private:
   unsigned int eventNum;
 
   edm::InputTag DTDigiInputTag;
   edm::InputTag DTPHTFInputTag;
 
- // utilities
+  // utilities
   int channel(int wheel, int sector, int bx);
 
   int bxNr(int channel);
@@ -64,8 +61,6 @@ class DTTFFEDSim : public edm::stream::EDProducer<> {
 
   edm::EDGetTokenT<L1MuDTChambPhContainer> ChPh_tok;
   edm::EDGetTokenT<L1MuDTChambThContainer> ChTh_tok;
-  edm::EDGetTokenT<L1MuDTTrackContainer>   Trk_tok;
-
-
+  edm::EDGetTokenT<L1MuDTTrackContainer> Trk_tok;
 };
 #endif
diff --git a/EventFilter/DTTFRawToDigi/src/DTTFFEDReader.cc b/EventFilter/DTTFRawToDigi/src/DTTFFEDReader.cc
index 33a7b069dd2ed..9ca7235ee3a2b 100644
--- a/EventFilter/DTTFRawToDigi/src/DTTFFEDReader.cc
+++ b/EventFilter/DTTFRawToDigi/src/DTTFFEDReader.cc
@@ -23,8 +23,7 @@
 
 using namespace std;
 
-
-DTTFFEDReader::DTTFFEDReader(const edm::ParameterSet& pset) {
+DTTFFEDReader::DTTFFEDReader(const edm::ParameterSet &pset) {
 
   produces<L1MuDTChambPhContainer>();
   produces<L1MuDTChambThContainer>();
@@ -32,25 +31,25 @@ DTTFFEDReader::DTTFFEDReader(const edm::ParameterSet& pset) {
 
   DTTFInputTag = pset.getParameter<edm::InputTag>("DTTF_FED_Source");
 
-  verbose_ =  pset.getUntrackedParameter<bool>("verbose",false);
+  verbose_ = pset.getUntrackedParameter<bool>("verbose", false);
 
   Raw_token = consumes<FEDRawDataCollection>(DTTFInputTag);
-
 }
 
-DTTFFEDReader::~DTTFFEDReader(){}
+DTTFFEDReader::~DTTFFEDReader() {}
 
-void DTTFFEDReader::produce(edm::Event& e, const edm::EventSetup& c) {
+void DTTFFEDReader::produce(edm::Event &e, const edm::EventSetup &c) {
 
   unique_ptr<L1MuDTChambPhContainer> phi_product(new L1MuDTChambPhContainer);
   unique_ptr<L1MuDTChambThContainer> the_product(new L1MuDTChambThContainer);
-  unique_ptr<L1MuDTTrackContainer>   tra_product(new L1MuDTTrackContainer);
+  unique_ptr<L1MuDTTrackContainer> tra_product(new L1MuDTTrackContainer);
 
   L1MuDTChambPhContainer::Phi_Container phi_data;
   L1MuDTChambThContainer::The_Container the_data;
-  L1MuDTTrackContainer::TrackContainer  tra_data;
+  L1MuDTTrackContainer::TrackContainer tra_data;
 
-  if (!fillRawData(e, phi_data, the_data, tra_data)) return;
+  if (!fillRawData(e, phi_data, the_data, tra_data))
+    return;
 
   phi_product->setContainer(phi_data);
   the_product->setContainer(the_data);
@@ -58,14 +57,13 @@ void DTTFFEDReader::produce(edm::Event& e, const edm::EventSetup& c) {
 
   e.put(std::move(phi_product));
   e.put(std::move(the_product));
-  e.put(std::move(tra_product),"DATA");
-
+  e.put(std::move(tra_product), "DATA");
 }
 
-bool DTTFFEDReader::fillRawData(edm::Event& e,
-                                L1MuDTChambPhContainer::Phi_Container& phi_data,
-                                L1MuDTChambThContainer::The_Container& the_data,
-                                L1MuDTTrackContainer::TrackContainer&  tra_data) {
+bool DTTFFEDReader::fillRawData(
+    edm::Event &e, L1MuDTChambPhContainer::Phi_Container &phi_data,
+    L1MuDTChambThContainer::The_Container &the_data,
+    L1MuDTTrackContainer::TrackContainer &tra_data) {
 
   analyse(e);
 
@@ -79,7 +77,7 @@ bool DTTFFEDReader::fillRawData(edm::Event& e,
 //--------------
 // Operations --
 //--------------
-void DTTFFEDReader::analyse(edm::Event& e) {
+void DTTFFEDReader::analyse(edm::Event &e) {
   clear();
   process(e);
   match();
@@ -87,65 +85,67 @@ void DTTFFEDReader::analyse(edm::Event& e) {
 }
 
 // process data
-void DTTFFEDReader::process(edm::Event& e) {
+void DTTFFEDReader::process(edm::Event &e) {
 
   // Container
-  vector<int> DTTFWordContainer; 
+  vector<int> DTTFWordContainer;
   vector<int>::iterator DTTFiterator;
 
   // Header constituents
   int BOEevTy, DTTFId;
 
-  // DTTF Payload constituents 
+  // DTTF Payload constituents
   int DTTFWord;
   int DTTFChan, bitsID;
-  int addr1[2] = { 3,  3};
+  int addr1[2] = {3, 3};
   int addr2[2] = {15, 15};
   int addr3[2] = {15, 15};
   int addr4[2] = {15, 15};
 
   // Trailer constituents
-  int evtLgth , CRC;
+  int evtLgth, CRC;
 
   //--> Header
 
   edm::Handle<FEDRawDataCollection> data;
-  e.getByToken(Raw_token,data);
+  e.getByToken(Raw_token, data);
   FEDRawData dttfdata = data->FEDData(0x030C);
-  if ( dttfdata.size() == 0 ) return;
-
-  int* dataWord1 = new int;
-  int* dataWord2 = new int;
-  unsigned char* LineFED=dttfdata.data();
-  *dataWord2=*((int*)LineFED);
-  LineFED+=4;
-  *dataWord1=*((int*)LineFED);
-  int lines  = 1; // already counting header
-
-  BOEevTy = ((*dataWord1)&0xFF000000)>>24; // positions 57 ->64
-  DTTFId  = ((*dataWord2)&0x000FFF00)>>8;  // positions 9 ->20
-
-  if( (BOEevTy != 0x50) || ( DTTFId != 0x030C) ){
-    if ( verbose_ ) edm::LogWarning("dttf_unpacker")
-      << "Not a DTTF header " << hex << *dataWord1;
+  if (dttfdata.size() == 0)
+    return;
+
+  int *dataWord1 = new int;
+  int *dataWord2 = new int;
+  unsigned char *LineFED = dttfdata.data();
+  *dataWord2 = *((int *)LineFED);
+  LineFED += 4;
+  *dataWord1 = *((int *)LineFED);
+  int lines = 1; // already counting header
+
+  BOEevTy = ((*dataWord1) & 0xFF000000) >> 24; // positions 57 ->64
+  DTTFId = ((*dataWord2) & 0x000FFF00) >> 8;   // positions 9 ->20
+
+  if ((BOEevTy != 0x50) || (DTTFId != 0x030C)) {
+    if (verbose_)
+      edm::LogWarning("dttf_unpacker")
+          << "Not a DTTF header " << hex << *dataWord1;
     delete dataWord1;
     delete dataWord2;
     return;
   }
 
-  int newCRC =  0xFFFF;
+  int newCRC = 0xFFFF;
   dt_crc::calcCRC(*dataWord1, *dataWord2, newCRC);
 
-  //--> DTTF data 
+  //--> DTTF data
 
-  LineFED+=4;
-  *dataWord2=*((int*)LineFED);
-  LineFED+=4;
-  *dataWord1=*((int*)LineFED);
-  int chkEOE = ((*dataWord1)&0xFFF00000)>>20; 
+  LineFED += 4;
+  *dataWord2 = *((int *)LineFED);
+  LineFED += 4;
+  *dataWord1 = *((int *)LineFED);
+  int chkEOE = ((*dataWord1) & 0xFFF00000) >> 20;
   lines++;
 
-  while(chkEOE != 0xA00){
+  while (chkEOE != 0xA00) {
 
     dt_crc::calcCRC(*dataWord1, *dataWord2, newCRC);
 
@@ -154,16 +154,20 @@ void DTTFFEDReader::process(edm::Event& e) {
     DTTFWord = *dataWord2;
     DTTFWordContainer.push_back(DTTFWord);
 
-    LineFED+=4;
-    *dataWord2=*((int*)LineFED);
-    LineFED+=4;
-    *dataWord1=*((int*)LineFED);
-    chkEOE = ((*dataWord1)&0xFFF00000)>>20; 
+    LineFED += 4;
+    *dataWord2 = *((int *)LineFED);
+    LineFED += 4;
+    *dataWord1 = *((int *)LineFED);
+    chkEOE = ((*dataWord1) & 0xFFF00000) >> 20;
     lines++;
 
-    if(lines > 3026){
-      if ( verbose_ ) edm::LogWarning("dttf_unpacker")
-        << "Warning : number of DTTF lines > 3026 "; // 3026 = 1(header) + 3024(max # PHTF-ETTF 64 bits words) + 1(trailer)
+    if (lines > 3026) {
+      if (verbose_)
+        edm::LogWarning("dttf_unpacker")
+            << "Warning : number of DTTF lines > 3026 "; // 3026 = 1(header) +
+                                                         // 3024(max # PHTF-ETTF
+                                                         // 64 bits words) +
+                                                         // 1(trailer)
       delete dataWord1;
       delete dataWord2;
       return;
@@ -171,243 +175,262 @@ void DTTFFEDReader::process(edm::Event& e) {
 
   } // end while-Data loop
 
-
   //--> Trailer
 
-  evtLgth   = ((*dataWord1)&0x00FFFFFF);     // positions 33 ->56
-  CRC       = ((*dataWord2)&0xFFFF0000)>>16; // positions 17 ->32
+  evtLgth = ((*dataWord1) & 0x00FFFFFF);   // positions 33 ->56
+  CRC = ((*dataWord2) & 0xFFFF0000) >> 16; // positions 17 ->32
 
-  dt_crc::calcCRC(*dataWord1, (*dataWord2)&0xFFFF, newCRC);
+  dt_crc::calcCRC(*dataWord1, (*dataWord2) & 0xFFFF, newCRC);
 
-  if( newCRC != CRC){
-    if ( verbose_ ) edm::LogWarning("dttf_unpacker")
-      << "Calculated CRC " << hex << newCRC << " differs from CRC in trailer " << hex << CRC;
+  if (newCRC != CRC) {
+    if (verbose_)
+      edm::LogWarning("dttf_unpacker")
+          << "Calculated CRC " << hex << newCRC
+          << " differs from CRC in trailer " << hex << CRC;
     delete dataWord1;
     delete dataWord2;
     return;
   }
 
-  if( lines != evtLgth){
-    if ( verbose_ ) edm::LogWarning("dttf_unpacker")
-      << "Number of words read != event length " << dec << lines << " " << evtLgth;
+  if (lines != evtLgth) {
+    if (verbose_)
+      edm::LogWarning("dttf_unpacker")
+          << "Number of words read != event length " << dec << lines << " "
+          << evtLgth;
     delete dataWord1;
     delete dataWord2;
     return;
   }
 
+  // --> analyse event
 
-  // --> analyse event    
-
-  for( DTTFiterator =  DTTFWordContainer.begin();
-       DTTFiterator != DTTFWordContainer.end();
-       DTTFiterator++ ){
+  for (DTTFiterator = DTTFWordContainer.begin();
+       DTTFiterator != DTTFWordContainer.end(); DTTFiterator++) {
 
-    DTTFChan = ((*DTTFiterator)&0xFF000000)>>24;
+    DTTFChan = ((*DTTFiterator) & 0xFF000000) >> 24;
     DTTFiterator++;
-    bitsID   = ((*DTTFiterator)&0xF0000000)>>28;
+    bitsID = ((*DTTFiterator) & 0xF0000000) >> 28;
+
+    int bxID = bxNr(DTTFChan);
+    if (bxID == -999)
+      continue;
+    int wheelID = wheel(DTTFChan);
+    if (wheelID == -999)
+      continue;
+    int sectorID = sector(DTTFChan);
+    if (sectorID == -999)
+      continue;
+
+    // Input
+    if (wheelID != 0 && bitsID <= 0x9) {
+
+      int wheelPh = (abs(wheelID) - 1) * wheelID / abs(wheelID);
+      int stationID = 0;
+      int ra = 0;
+      int ba = 0;
+      int tsqual = 0;
+      int ts2tag = 0;
 
-    int bxID     = bxNr(DTTFChan);
-    if(bxID     == -999) continue;
-    int wheelID  = wheel(DTTFChan);    
-    if(wheelID  == -999) continue;
-    int sectorID = sector(DTTFChan);    
-    if(sectorID == -999) continue;
+      if ((bitsID >> 1) == 0) {
+        stationID = 1;
+      }
+      if ((bitsID >> 1) == 1) {
+        stationID = 2;
+      }
+      if ((bitsID >> 1) == 4) {
+        stationID = 3;
+      }
+      if ((bitsID >> 1) == 2) {
+        stationID = 4;
+      }
 
-    //Input
-    if(wheelID!=0 && bitsID<=0x9){   
+      if (stationID != 3) {
 
-      int wheelPh   = (abs(wheelID)-1)*wheelID/abs(wheelID); 
-      int stationID = 0;
-      int     ra    = 0;
-      int     ba    = 0;
-      int tsqual    = 0;
-      int ts2tag    = 0;
-
-      if ( ( bitsID >> 1 ) == 0 ){ stationID = 1;}
-      if ( ( bitsID >> 1 ) == 1 ){ stationID = 2;}
-      if ( ( bitsID >> 1 ) == 4 ){ stationID = 3;}
-      if ( ( bitsID >> 1 ) == 2 ){ stationID = 4;}
-
-      if(stationID != 3){ 
-	  
         ts2tag = (bitsID)&0x1;
-	tsqual = (~(*DTTFiterator)&0x07)-1;
-	ba     = (~(*DTTFiterator)&0x1FF8)>>3;
-        if( ba>0x1FF) ba-=0x400;
-	ra     = (~(*DTTFiterator)&0x1FFE000)>>13;
-        if( ra>0x7FF) ra-=0x1000;
-      }   
-      else{ 
+        tsqual = (~(*DTTFiterator) & 0x07) - 1;
+        ba = (~(*DTTFiterator) & 0x1FF8) >> 3;
+        if (ba > 0x1FF)
+          ba -= 0x400;
+        ra = (~(*DTTFiterator) & 0x1FFE000) >> 13;
+        if (ra > 0x7FF)
+          ra -= 0x1000;
+      } else {
 
         ts2tag = (bitsID)&0x1;
-	tsqual = (~(*DTTFiterator)&0x07)-1;
-	ra     = (~(*DTTFiterator)&0x7FF8)>>3;
-        if( ra>0x7FF) ra-=0x1000;
+        tsqual = (~(*DTTFiterator) & 0x07) - 1;
+        ra = (~(*DTTFiterator) & 0x7FF8) >> 3;
+        if (ra > 0x7FF)
+          ra -= 0x1000;
       }
 
-      if(tsqual!=7 && wheelID!=-1){
-        phiSegments.push_back(
-		    L1MuDTChambPhDigi( bxID+ts2tag, wheelPh, sectorID, stationID,
-		    ra, ba, tsqual, ts2tag, 0) );
+      if (tsqual != 7 && wheelID != -1) {
+        phiSegments.push_back(L1MuDTChambPhDigi(bxID + ts2tag, wheelPh,
+                                                sectorID, stationID, ra, ba,
+                                                tsqual, ts2tag, 0));
       }
     }
-    //Input
+    // Input
+
+    // Input
+    if (wheelID == 0 && bitsID <= 0x4) {
 
-    //Input
-    if(wheelID==0 && bitsID<=0x4){
-   
-      int wheelTh = bitsID-2;
+      int wheelTh = bitsID - 2;
 
       int posALL, posBTI[7];
 
-      if ( wheelTh == -2 || wheelTh == -1 || 
-	   ( wheelTh == 0 && (sectorID == 0 || sectorID == 3 || sectorID == 4 || sectorID == 7 || sectorID == 8 || sectorID == 11) ) ) {
-
-	posALL    =  ~(*DTTFiterator)&0x7F;
-	posBTI[0] =  ~(*DTTFiterator)&0x01;
-	posBTI[1] = (~(*DTTFiterator)&0x02)>>1;
-	posBTI[2] = (~(*DTTFiterator)&0x04)>>2;
-	posBTI[3] = (~(*DTTFiterator)&0x08)>>3;
-	posBTI[4] = (~(*DTTFiterator)&0x10)>>4;
-	posBTI[5] = (~(*DTTFiterator)&0x20)>>5;
-	posBTI[6] = (~(*DTTFiterator)&0x40)>>6;
-
-	if(posALL){
-	  theSegments.push_back(
-		      L1MuDTChambThDigi( bxID, wheelTh, sectorID, 1, posBTI) );
-	}
-
-	posALL    =  ~(*DTTFiterator)&0x3F80;
-	posBTI[0] = (~(*DTTFiterator)&0x0080)>>7;
-	posBTI[1] = (~(*DTTFiterator)&0x0100)>>8;
-	posBTI[2] = (~(*DTTFiterator)&0x0200)>>9;
-	posBTI[3] = (~(*DTTFiterator)&0x0400)>>10;
-	posBTI[4] = (~(*DTTFiterator)&0x0800)>>11;
-	posBTI[5] = (~(*DTTFiterator)&0x1000)>>12;
-	posBTI[6] = (~(*DTTFiterator)&0x2000)>>13;
-
-	if(posALL){
-	  theSegments.push_back(
-		      L1MuDTChambThDigi( bxID, wheelTh, sectorID, 2, posBTI) );
-	}
-
-	posALL    =  ~(*DTTFiterator)&0x1FC000;
-	posBTI[0] = (~(*DTTFiterator)&0x004000)>>14;
-	posBTI[1] = (~(*DTTFiterator)&0x008000)>>15;
-	posBTI[2] = (~(*DTTFiterator)&0x010000)>>16;
-	posBTI[3] = (~(*DTTFiterator)&0x020000)>>17;
-	posBTI[4] = (~(*DTTFiterator)&0x040000)>>18;
-	posBTI[5] = (~(*DTTFiterator)&0x080000)>>19;
-	posBTI[6] = (~(*DTTFiterator)&0x100000)>>20;
-
-	if(posALL){
-	  theSegments.push_back(
-		      L1MuDTChambThDigi( bxID, wheelTh, sectorID, 3, posBTI) );
-	}
+      if (wheelTh == -2 || wheelTh == -1 ||
+          (wheelTh == 0 &&
+           (sectorID == 0 || sectorID == 3 || sectorID == 4 || sectorID == 7 ||
+            sectorID == 8 || sectorID == 11))) {
+
+        posALL = ~(*DTTFiterator) & 0x7F;
+        posBTI[0] = ~(*DTTFiterator) & 0x01;
+        posBTI[1] = (~(*DTTFiterator) & 0x02) >> 1;
+        posBTI[2] = (~(*DTTFiterator) & 0x04) >> 2;
+        posBTI[3] = (~(*DTTFiterator) & 0x08) >> 3;
+        posBTI[4] = (~(*DTTFiterator) & 0x10) >> 4;
+        posBTI[5] = (~(*DTTFiterator) & 0x20) >> 5;
+        posBTI[6] = (~(*DTTFiterator) & 0x40) >> 6;
+
+        if (posALL) {
+          theSegments.push_back(
+              L1MuDTChambThDigi(bxID, wheelTh, sectorID, 1, posBTI));
+        }
+
+        posALL = ~(*DTTFiterator) & 0x3F80;
+        posBTI[0] = (~(*DTTFiterator) & 0x0080) >> 7;
+        posBTI[1] = (~(*DTTFiterator) & 0x0100) >> 8;
+        posBTI[2] = (~(*DTTFiterator) & 0x0200) >> 9;
+        posBTI[3] = (~(*DTTFiterator) & 0x0400) >> 10;
+        posBTI[4] = (~(*DTTFiterator) & 0x0800) >> 11;
+        posBTI[5] = (~(*DTTFiterator) & 0x1000) >> 12;
+        posBTI[6] = (~(*DTTFiterator) & 0x2000) >> 13;
+
+        if (posALL) {
+          theSegments.push_back(
+              L1MuDTChambThDigi(bxID, wheelTh, sectorID, 2, posBTI));
+        }
+
+        posALL = ~(*DTTFiterator) & 0x1FC000;
+        posBTI[0] = (~(*DTTFiterator) & 0x004000) >> 14;
+        posBTI[1] = (~(*DTTFiterator) & 0x008000) >> 15;
+        posBTI[2] = (~(*DTTFiterator) & 0x010000) >> 16;
+        posBTI[3] = (~(*DTTFiterator) & 0x020000) >> 17;
+        posBTI[4] = (~(*DTTFiterator) & 0x040000) >> 18;
+        posBTI[5] = (~(*DTTFiterator) & 0x080000) >> 19;
+        posBTI[6] = (~(*DTTFiterator) & 0x100000) >> 20;
+
+        if (posALL) {
+          theSegments.push_back(
+              L1MuDTChambThDigi(bxID, wheelTh, sectorID, 3, posBTI));
+        }
       }
 
       else {
 
-	posALL    =  ~(*DTTFiterator)&0x7F;
-	posBTI[6] =  ~(*DTTFiterator)&0x01;
-	posBTI[5] = (~(*DTTFiterator)&0x02)>>1;
-	posBTI[4] = (~(*DTTFiterator)&0x04)>>2;
-	posBTI[3] = (~(*DTTFiterator)&0x08)>>3;
-	posBTI[2] = (~(*DTTFiterator)&0x10)>>4;
-	posBTI[1] = (~(*DTTFiterator)&0x20)>>5;
-	posBTI[0] = (~(*DTTFiterator)&0x40)>>6;
-
-	if(posALL){
-	  theSegments.push_back(
-		      L1MuDTChambThDigi( bxID, wheelTh, sectorID, 1, posBTI) );
-	}
-
-	posALL    =  ~(*DTTFiterator)&0x3F80;
-	posBTI[6] = (~(*DTTFiterator)&0x0080)>>7;
-	posBTI[5] = (~(*DTTFiterator)&0x0100)>>8;
-	posBTI[4] = (~(*DTTFiterator)&0x0200)>>9;
-	posBTI[3] = (~(*DTTFiterator)&0x0400)>>10;
-	posBTI[2] = (~(*DTTFiterator)&0x0800)>>11;
-	posBTI[1] = (~(*DTTFiterator)&0x1000)>>12;
-	posBTI[0] = (~(*DTTFiterator)&0x2000)>>13;
-
-	if(posALL){
-	  theSegments.push_back(
-		      L1MuDTChambThDigi( bxID, wheelTh, sectorID, 2, posBTI) );
-	}
-
-	posALL    =  ~(*DTTFiterator)&0x1FC000;
-	posBTI[6] = (~(*DTTFiterator)&0x004000)>>14;
-	posBTI[5] = (~(*DTTFiterator)&0x008000)>>15;
-	posBTI[4] = (~(*DTTFiterator)&0x010000)>>16;
-	posBTI[3] = (~(*DTTFiterator)&0x020000)>>17;
-	posBTI[2] = (~(*DTTFiterator)&0x040000)>>18;
-	posBTI[1] = (~(*DTTFiterator)&0x080000)>>19;
-	posBTI[0] = (~(*DTTFiterator)&0x100000)>>20;
-
-	if(posALL){
-	  theSegments.push_back(
-		      L1MuDTChambThDigi( bxID, wheelTh, sectorID, 3, posBTI) );
-	}
+        posALL = ~(*DTTFiterator) & 0x7F;
+        posBTI[6] = ~(*DTTFiterator) & 0x01;
+        posBTI[5] = (~(*DTTFiterator) & 0x02) >> 1;
+        posBTI[4] = (~(*DTTFiterator) & 0x04) >> 2;
+        posBTI[3] = (~(*DTTFiterator) & 0x08) >> 3;
+        posBTI[2] = (~(*DTTFiterator) & 0x10) >> 4;
+        posBTI[1] = (~(*DTTFiterator) & 0x20) >> 5;
+        posBTI[0] = (~(*DTTFiterator) & 0x40) >> 6;
+
+        if (posALL) {
+          theSegments.push_back(
+              L1MuDTChambThDigi(bxID, wheelTh, sectorID, 1, posBTI));
+        }
+
+        posALL = ~(*DTTFiterator) & 0x3F80;
+        posBTI[6] = (~(*DTTFiterator) & 0x0080) >> 7;
+        posBTI[5] = (~(*DTTFiterator) & 0x0100) >> 8;
+        posBTI[4] = (~(*DTTFiterator) & 0x0200) >> 9;
+        posBTI[3] = (~(*DTTFiterator) & 0x0400) >> 10;
+        posBTI[2] = (~(*DTTFiterator) & 0x0800) >> 11;
+        posBTI[1] = (~(*DTTFiterator) & 0x1000) >> 12;
+        posBTI[0] = (~(*DTTFiterator) & 0x2000) >> 13;
+
+        if (posALL) {
+          theSegments.push_back(
+              L1MuDTChambThDigi(bxID, wheelTh, sectorID, 2, posBTI));
+        }
+
+        posALL = ~(*DTTFiterator) & 0x1FC000;
+        posBTI[6] = (~(*DTTFiterator) & 0x004000) >> 14;
+        posBTI[5] = (~(*DTTFiterator) & 0x008000) >> 15;
+        posBTI[4] = (~(*DTTFiterator) & 0x010000) >> 16;
+        posBTI[3] = (~(*DTTFiterator) & 0x020000) >> 17;
+        posBTI[2] = (~(*DTTFiterator) & 0x040000) >> 18;
+        posBTI[1] = (~(*DTTFiterator) & 0x080000) >> 19;
+        posBTI[0] = (~(*DTTFiterator) & 0x100000) >> 20;
+
+        if (posALL) {
+          theSegments.push_back(
+              L1MuDTChambThDigi(bxID, wheelTh, sectorID, 3, posBTI));
+        }
       }
     }
-    //Input
+    // Input
 
-    //Addresses
-    if(wheelID!=0 && bitsID>=0xA && bitsID<=0xB){   
+    // Addresses
+    if (wheelID != 0 && bitsID >= 0xA && bitsID <= 0xB) {
 
-      int candID   = bitsID - 0xA;
+      int candID = bitsID - 0xA;
 
-      addr4[candID]   = ((*DTTFiterator)&0x0F);
-      addr3[candID]   = ((*DTTFiterator)&0xF0)>>4;
-      addr2[candID]   = ((*DTTFiterator)&0xF00)>>8;
-      addr1[candID]   = ((*DTTFiterator)&0x3000)>>12;
+      addr4[candID] = ((*DTTFiterator) & 0x0F);
+      addr3[candID] = ((*DTTFiterator) & 0xF0) >> 4;
+      addr2[candID] = ((*DTTFiterator) & 0xF00) >> 8;
+      addr1[candID] = ((*DTTFiterator) & 0x3000) >> 12;
     }
-    //Addresses
+    // Addresses
 
-    //Output
-    if(wheelID!=0 && bitsID>=0xC){   
+    // Output
+    if (wheelID != 0 && bitsID >= 0xC) {
 
       int muonID = 0;
-      int     pt = 0;
-      int     ch = 0;
-      int    phi = 0;
-      int   qual = 0;  
-
-      muonID = (bitsID&0x1);
-      qual   = (~(*DTTFiterator)&0x07);
-      phi    = ((*DTTFiterator)&0x7F8)>>3;
-      ch     = (~(*DTTFiterator)&0x800)>>11;
-      pt     = (~(*DTTFiterator)&0x1F000)>>12;
-
-      if(qual!=0){
-        dtTracks.push_back(
-		    L1MuDTTrackCand( 0, phi, 0, pt, ch, 1, 0, qual, bxID, wheelID, sectorID,
-                    muonID, addr1[muonID], addr2[muonID], addr3[muonID], addr4[muonID] ) );
+      int pt = 0;
+      int ch = 0;
+      int phi = 0;
+      int qual = 0;
+
+      muonID = (bitsID & 0x1);
+      qual = (~(*DTTFiterator) & 0x07);
+      phi = ((*DTTFiterator) & 0x7F8) >> 3;
+      ch = (~(*DTTFiterator) & 0x800) >> 11;
+      pt = (~(*DTTFiterator) & 0x1F000) >> 12;
+
+      if (qual != 0) {
+        dtTracks.push_back(L1MuDTTrackCand(
+            0, phi, 0, pt, ch, 1, 0, qual, bxID, wheelID, sectorID, muonID,
+            addr1[muonID], addr2[muonID], addr3[muonID], addr4[muonID]));
       }
     }
-    //Output
+    // Output
 
-    //Output
-    if(wheelID==0 && bitsID>=0x8){
-   
-      int wheelTh = bitsID&0x7;
+    // Output
+    if (wheelID == 0 && bitsID >= 0x8) {
+
+      int wheelTh = bitsID & 0x7;
 
       int etaALL;
 
-      etaALL =  ~(*DTTFiterator)&0x007F;
+      etaALL = ~(*DTTFiterator) & 0x007F;
       if (etaALL) {
-        etTrack[bxID+1][sectorID][wheelTh][0] =   (*DTTFiterator)&0x003F;
-        efTrack[bxID+1][sectorID][wheelTh][0] = (~(*DTTFiterator)&0x0040)>>6;
+        etTrack[bxID + 1][sectorID][wheelTh][0] = (*DTTFiterator) & 0x003F;
+        efTrack[bxID + 1][sectorID][wheelTh][0] =
+            (~(*DTTFiterator) & 0x0040) >> 6;
       }
 
-      etaALL =  (~(*DTTFiterator)&0x3F80)>>7;
+      etaALL = (~(*DTTFiterator) & 0x3F80) >> 7;
       if (etaALL) {
-        etTrack[bxID+1][sectorID][wheelTh][1]= ( (*DTTFiterator)&0x1F80)>>7;
-        efTrack[bxID+1][sectorID][wheelTh][1]= (~(*DTTFiterator)&0x2000)>>13;
+        etTrack[bxID + 1][sectorID][wheelTh][1] =
+            ((*DTTFiterator) & 0x1F80) >> 7;
+        efTrack[bxID + 1][sectorID][wheelTh][1] =
+            (~(*DTTFiterator) & 0x2000) >> 13;
       }
     }
-    //Output
+    // Output
 
   } // end for-loop container content
 
@@ -418,14 +441,14 @@ void DTTFFEDReader::process(edm::Event& e) {
 
 void DTTFFEDReader::match() {
 
-  for ( L1MuDTTrackContainer::TrackIterator i  = dtTracks.begin();
-                                            i != dtTracks.end();
-                                            i++ ) {
-    int bxTh     = i->bx()+1;
+  for (L1MuDTTrackContainer::TrackIterator i = dtTracks.begin();
+       i != dtTracks.end(); i++) {
+    int bxTh = i->bx() + 1;
     int sectorTh = i->scNum();
-    int wheelTh  = i->whNum()+3;
-    if(wheelTh > 3) wheelTh-=1;
-    int muonTh   = i->TrkTag();
+    int wheelTh = i->whNum() + 3;
+    if (wheelTh > 3)
+      wheelTh -= 1;
+    int muonTh = i->TrkTag();
 
     i->setEtaPacked(etTrack[bxTh][sectorTh][wheelTh][muonTh]);
     i->setFineHaloPacked(efTrack[bxTh][sectorTh][wheelTh][muonTh]);
@@ -435,15 +458,15 @@ void DTTFFEDReader::match() {
 }
 
 // access data
-const L1MuDTChambPhContainer::Phi_Container& DTTFFEDReader::p_data() {
+const L1MuDTChambPhContainer::Phi_Container &DTTFFEDReader::p_data() {
   return phiSegments;
 }
 
-const L1MuDTChambThContainer::The_Container& DTTFFEDReader::t_data() {
+const L1MuDTChambThContainer::The_Container &DTTFFEDReader::t_data() {
   return theSegments;
 }
 
-const L1MuDTTrackContainer::TrackContainer&  DTTFFEDReader::k_data() {
+const L1MuDTTrackContainer::TrackContainer &DTTFFEDReader::k_data() {
   return dtTracks;
 }
 
@@ -452,73 +475,89 @@ void DTTFFEDReader::clear() {
   theSegments.clear();
   dtTracks.clear();
 
-  for(int i=0; i<3;  i++){
-    for(int j=0; j<12; j++){
-      for(int k=0; k<6;  k++){
-        for(int l=0; l<2;  l++){
+  for (int i = 0; i < 3; i++) {
+    for (int j = 0; j < 12; j++) {
+      for (int k = 0; k < 6; k++) {
+        for (int l = 0; l < 2; l++) {
           etTrack[i][j][k][l] = 0;
           efTrack[i][j][k][l] = 0;
-        } 
-      } 
-    } 
+        }
+      }
+    }
   }
 
   return;
 }
 
-int DTTFFEDReader::channel( int wheel, int sector,  int bx ){
+int DTTFFEDReader::channel(int wheel, int sector, int bx) {
 
   // wheel  :  -3 -2 -1 +1 +2 +3 <=> PHTF's : N2, N1, N0, P0, P1, P2
-  //                           0 <=> ETTF  
+  //                           0 <=> ETTF
   // sector :  0 -> 11
   // bx     : -1 -> +1
 
   int myChannel = 255;
 
-  if ( abs(bx) > 1)               { return myChannel; }
-  if ( sector < 0 || sector > 11) { return myChannel; }
-  if ( abs(wheel) > 3)            { return myChannel; }
+  if (abs(bx) > 1) {
+    return myChannel;
+  }
+  if (sector < 0 || sector > 11) {
+    return myChannel;
+  }
+  if (abs(wheel) > 3) {
+    return myChannel;
+  }
 
-  myChannel = sector*21 + wheel*3 - bx + 10 ; 
+  myChannel = sector * 21 + wheel * 3 - bx + 10;
 
-  if (myChannel > 125) myChannel += 2;
+  if (myChannel > 125)
+    myChannel += 2;
 
   return myChannel;
 }
 
-int DTTFFEDReader::bxNr( int channel ){
+int DTTFFEDReader::bxNr(int channel) {
 
   int myChannel = channel;
 
-  if (myChannel > 127) myChannel -= 2;
+  if (myChannel > 127)
+    myChannel -= 2;
 
-  if (myChannel < 0 || myChannel > 251 ){ return -999; }
+  if (myChannel < 0 || myChannel > 251) {
+    return -999;
+  }
 
-  int myBx = 1-(myChannel%3);
+  int myBx = 1 - (myChannel % 3);
 
   return myBx;
 }
 
-int DTTFFEDReader::sector( int channel ){
+int DTTFFEDReader::sector(int channel) {
 
   int myChannel = channel;
 
-  if (myChannel > 127) myChannel -= 2;
+  if (myChannel > 127)
+    myChannel -= 2;
 
-  if (myChannel < 0 || myChannel > 251 ){ return -999; }
+  if (myChannel < 0 || myChannel > 251) {
+    return -999;
+  }
 
-  return myChannel/21;
+  return myChannel / 21;
 }
 
-int DTTFFEDReader::wheel( int channel ){
+int DTTFFEDReader::wheel(int channel) {
 
   int myChannel = channel;
 
-  if (myChannel > 127) myChannel -= 2;
+  if (myChannel > 127)
+    myChannel -= 2;
 
-  if (myChannel < 0 || myChannel > 251 ){ return -999; }
+  if (myChannel < 0 || myChannel > 251) {
+    return -999;
+  }
 
-  int myWheel = ((myChannel%21)/3)-3;
+  int myWheel = ((myChannel % 21) / 3) - 3;
 
   return myWheel;
 }
diff --git a/EventFilter/DTTFRawToDigi/src/DTTFFEDSim.cc b/EventFilter/DTTFRawToDigi/src/DTTFFEDSim.cc
index 14edd3df7bb8c..f8f9a7b8cd5c4 100644
--- a/EventFilter/DTTFRawToDigi/src/DTTFFEDSim.cc
+++ b/EventFilter/DTTFRawToDigi/src/DTTFFEDSim.cc
@@ -16,14 +16,14 @@
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/Event.h"
 
-#include <DataFormats/FEDRawData/interface/FEDRawData.h>
 #include "EventFilter/Utilities/interface/DTCRC.h"
+#include <DataFormats/FEDRawData/interface/FEDRawData.h>
 
 #include <iostream>
 
 using namespace std;
 
-DTTFFEDSim::DTTFFEDSim(const edm::ParameterSet& pset) : eventNum(0) {
+DTTFFEDSim::DTTFFEDSim(const edm::ParameterSet &pset) : eventNum(0) {
 
   produces<FEDRawDataCollection>();
 
@@ -33,66 +33,63 @@ DTTFFEDSim::DTTFFEDSim(const edm::ParameterSet& pset) : eventNum(0) {
   ChPh_tok = consumes<L1MuDTChambPhContainer>(DTDigiInputTag);
   ChTh_tok = consumes<L1MuDTChambThContainer>(DTDigiInputTag);
   Trk_tok = consumes<L1MuDTTrackContainer>(DTPHTFInputTag);
-
 }
 
-DTTFFEDSim::~DTTFFEDSim(){}
+DTTFFEDSim::~DTTFFEDSim() {}
 
-void DTTFFEDSim::produce(edm::Event& e, const edm::EventSetup& c) {
+void DTTFFEDSim::produce(edm::Event &e, const edm::EventSetup &c) {
 
   FEDRawDataCollection data;
 
-  if (!fillRawData(e, data)) return;
+  if (!fillRawData(e, data))
+    return;
 
   unique_ptr<FEDRawDataCollection> fed_product(new FEDRawDataCollection(data));
 
   e.put(std::move(fed_product));
-
 }
 
-bool DTTFFEDSim::fillRawData(edm::Event& e,
-                             FEDRawDataCollection& data) {
+bool DTTFFEDSim::fillRawData(edm::Event &e, FEDRawDataCollection &data) {
 
   eventNum = e.id().event();
 
   int lines = 2;
 
   edm::Handle<L1MuDTChambPhContainer> phtrig;
-  e.getByToken(ChPh_tok,phtrig);
+  e.getByToken(ChPh_tok, phtrig);
   lines += phtrig->bxSize(-1, 1);
 
   edm::Handle<L1MuDTChambThContainer> thtrig;
-  e.getByToken(ChTh_tok,thtrig);
+  e.getByToken(ChTh_tok, thtrig);
   lines += thtrig->bxSize(-1, 1);
 
-  edm::Handle<L1MuDTTrackContainer>   trtrig;
-  e.getByToken(Trk_tok,trtrig);
-  lines += trtrig->bxSize(-1, 1)*3;
+  edm::Handle<L1MuDTTrackContainer> trtrig;
+  e.getByToken(Trk_tok, trtrig);
+  lines += trtrig->bxSize(-1, 1) * 3;
 
-  FEDRawData& dttfdata = data.FEDData(0x30C);
-  dttfdata.resize(lines*8); // size in bytes
-  unsigned char* LineFED=dttfdata.data();
+  FEDRawData &dttfdata = data.FEDData(0x30C);
+  dttfdata.resize(lines * 8); // size in bytes
+  unsigned char *LineFED = dttfdata.data();
 
-  int* dataWord1 = new int;
-  int* dataWord2 = new int;
+  int *dataWord1 = new int;
+  int *dataWord2 = new int;
 
   //--> Header
 
-  *dataWord1 = 0x50000000
-             + (eventNum&0xFFFFFF);
+  *dataWord1 = 0x50000000 + (eventNum & 0xFFFFFF);
   *dataWord2 = 0x00030C00;
 
-  int newCRC =  0xFFFF;
+  int newCRC = 0xFFFF;
   dt_crc::calcCRC(*dataWord1, *dataWord2, newCRC);
 
-  *((int*)LineFED)=*dataWord2; 
-  LineFED+=4;
-  *((int*)LineFED)=*dataWord1; 
+  *((int *)LineFED) = *dataWord2;
+  LineFED += 4;
+  *((int *)LineFED) = *dataWord1;
 
-  //--> DTTF data 
+  //--> DTTF data
 
-  int TS1Id[4], TS2Id[4];   // word identifier for TS #1,#2 for stations 
-  TS1Id[0] = 0x0E;      
+  int TS1Id[4], TS2Id[4]; // word identifier for TS #1,#2 for stations
+  TS1Id[0] = 0x0E;
   TS2Id[0] = 0x1E;
   TS1Id[1] = 0x2E;
   TS2Id[1] = 0x3E;
@@ -101,233 +98,238 @@ bool DTTFFEDSim::fillRawData(edm::Event& e,
   TS1Id[2] = 0x8FFF8;
   TS2Id[2] = 0x9FFF8;
 
-  //Input
+  // Input
   L1MuDTChambPhContainer::Phi_iterator tsphi;
 
-  for ( tsphi =  phtrig->getContainer()->begin();
-        tsphi != phtrig->getContainer()->end();
-        tsphi++ ) {
-    if ( tsphi->code() != 7 ) {
-
-      int wheelID   = tsphi->whNum()+1;
-      if ( wheelID <= 0 ) wheelID -= 2;
-      int stationID = tsphi->stNum()-1;
-      int is2nd     = tsphi->Ts2Tag();
-
-      int channelNr = channel(wheelID, tsphi->scNum(), tsphi->bxNum()-is2nd);
-      if ( channelNr == 255 ) continue;
-      int TSId = ( is2nd == 0 ) ? TS1Id[stationID] : TS2Id[stationID];
-
-      *dataWord1 = ((channelNr&0xFF)<<24)
-                 + 0x00FFFFFF;
-
-      if ( stationID != 2 ){
-        *dataWord2 = (             (TSId&0x0FF)<<24)
-	           + (~(tsphi->code()+1)&0x007)
-	           + (   (~tsphi->phiB()&0x3FF)<<3) 
-	           + (    (~tsphi->phi()&0xFFF)<<13);
-      }
-      else {
-        *dataWord2 = (             (TSId&0xFFFFF)<<12) 
-	           + (~(tsphi->code()+1)&0x00007)
-	           + (    (~tsphi->phi()&0x00FFF)<<3);
+  for (tsphi = phtrig->getContainer()->begin();
+       tsphi != phtrig->getContainer()->end(); tsphi++) {
+    if (tsphi->code() != 7) {
+
+      int wheelID = tsphi->whNum() + 1;
+      if (wheelID <= 0)
+        wheelID -= 2;
+      int stationID = tsphi->stNum() - 1;
+      int is2nd = tsphi->Ts2Tag();
+
+      int channelNr = channel(wheelID, tsphi->scNum(), tsphi->bxNum() - is2nd);
+      if (channelNr == 255)
+        continue;
+      int TSId = (is2nd == 0) ? TS1Id[stationID] : TS2Id[stationID];
+
+      *dataWord1 = ((channelNr & 0xFF) << 24) + 0x00FFFFFF;
+
+      if (stationID != 2) {
+        *dataWord2 = ((TSId & 0x0FF) << 24) + (~(tsphi->code() + 1) & 0x007) +
+                     ((~tsphi->phiB() & 0x3FF) << 3) +
+                     ((~tsphi->phi() & 0xFFF) << 13);
+      } else {
+        *dataWord2 = ((TSId & 0xFFFFF) << 12) +
+                     (~(tsphi->code() + 1) & 0x00007) +
+                     ((~tsphi->phi() & 0x00FFF) << 3);
       }
 
       dt_crc::calcCRC(*dataWord1, *dataWord2, newCRC);
 
-      LineFED+=4;
-      *((int*)LineFED)=*dataWord2; 
-      LineFED+=4;
-      *((int*)LineFED)=*dataWord1; 
+      LineFED += 4;
+      *((int *)LineFED) = *dataWord2;
+      LineFED += 4;
+      *((int *)LineFED) = *dataWord1;
     }
   }
-  //Input
+  // Input
 
-  //Input
+  // Input
   L1MuDTChambThContainer::The_iterator tsthe;
 
-  for ( tsthe =  thtrig->getContainer()->begin();
-        tsthe != thtrig->getContainer()->end();
-        tsthe++ ) {
+  for (tsthe = thtrig->getContainer()->begin();
+       tsthe != thtrig->getContainer()->end(); tsthe++) {
 
-    int wheelTh  = tsthe->whNum();
+    int wheelTh = tsthe->whNum();
     int sectorID = tsthe->scNum();
 
     int channelNr = channel(0, sectorID, tsthe->bxNum());
-    if ( channelNr == 255 ) continue;
-    int TSId = wheelTh+2;
+    if (channelNr == 255)
+      continue;
+    int TSId = wheelTh + 2;
 
-    *dataWord1 = ((channelNr&0xFF)<<24)
-               + 0x00FFFFFF;
+    *dataWord1 = ((channelNr & 0xFF) << 24) + 0x00FFFFFF;
 
-    *dataWord2 = ((TSId&0x07)<<28)
-               + 0x0FFFFFFF;
+    *dataWord2 = ((TSId & 0x07) << 28) + 0x0FFFFFFF;
 
-    int stationID = tsthe->stNum()-1;
-    for ( int bti = 0; bti < 7; bti++ )
-      if ( wheelTh == -2 || wheelTh == -1 || 
-	   ( wheelTh == 0 && (sectorID == 0 || sectorID == 3 || sectorID == 4 || sectorID == 7 || sectorID == 8 || sectorID == 11) ) )
-	*dataWord2 -= (tsthe->position(bti)&0x1)<<(stationID*7+bti);
+    int stationID = tsthe->stNum() - 1;
+    for (int bti = 0; bti < 7; bti++)
+      if (wheelTh == -2 || wheelTh == -1 ||
+          (wheelTh == 0 && (sectorID == 0 || sectorID == 3 || sectorID == 4 ||
+                            sectorID == 7 || sectorID == 8 || sectorID == 11)))
+        *dataWord2 -= (tsthe->position(bti) & 0x1) << (stationID * 7 + bti);
       else
-	*dataWord2 -= (tsthe->position(6-bti)&0x1)<<(stationID*7+bti);
+        *dataWord2 -= (tsthe->position(6 - bti) & 0x1) << (stationID * 7 + bti);
 
     dt_crc::calcCRC(*dataWord1, *dataWord2, newCRC);
 
-    LineFED+=4;
-    *((int*)LineFED)=*dataWord2; 
-    LineFED+=4;
-    *((int*)LineFED)=*dataWord1; 
+    LineFED += 4;
+    *((int *)LineFED) = *dataWord2;
+    LineFED += 4;
+    *((int *)LineFED) = *dataWord1;
   }
-  //Input
+  // Input
 
-  //Output
+  // Output
   L1MuDTTrackContainer::Trackiterator tstrk;
 
-  for ( tstrk =  trtrig->getContainer()->begin();
-        tstrk != trtrig->getContainer()->end();
-        tstrk++ ) {
+  for (tstrk = trtrig->getContainer()->begin();
+       tstrk != trtrig->getContainer()->end(); tstrk++) {
 
     int channelNr = channel(tstrk->whNum(), tstrk->scNum(), tstrk->bx());
-    if ( channelNr == 255 ) continue;
-    int TSId = ( tstrk->TrkTag() == 0 ) ? 0xAFFF : 0xBFFF;
+    if (channelNr == 255)
+      continue;
+    int TSId = (tstrk->TrkTag() == 0) ? 0xAFFF : 0xBFFF;
 
-    *dataWord1 = ((channelNr&0xFF)<<24)
-               + 0x00FFFFFF;
+    *dataWord1 = ((channelNr & 0xFF) << 24) + 0x00FFFFFF;
 
-    *dataWord2 = (           (TSId&0xFFFF)<<16)
-	       + ( tstrk->stNum(4)&0x0000F)
-               + ((tstrk->stNum(3)&0x0000F)<<4)
-               + ((tstrk->stNum(2)&0x0000F)<<8)
-	       + ((tstrk->stNum(1)&0x00003)<<12);
+    *dataWord2 = ((TSId & 0xFFFF) << 16) + (tstrk->stNum(4) & 0x0000F) +
+                 ((tstrk->stNum(3) & 0x0000F) << 4) +
+                 ((tstrk->stNum(2) & 0x0000F) << 8) +
+                 ((tstrk->stNum(1) & 0x00003) << 12);
 
     dt_crc::calcCRC(*dataWord1, *dataWord2, newCRC);
 
-    LineFED+=4;
-    *((int*)LineFED)=*dataWord2; 
-    LineFED+=4;
-    *((int*)LineFED)=*dataWord1; 
+    LineFED += 4;
+    *((int *)LineFED) = *dataWord2;
+    LineFED += 4;
+    *((int *)LineFED) = *dataWord1;
 
-    TSId = ( tstrk->TrkTag() == 0 ) ? 0xCFFE : 0xDFFE;
+    TSId = (tstrk->TrkTag() == 0) ? 0xCFFE : 0xDFFE;
 
-    *dataWord1 = ((channelNr&0xFF)<<24)
-               + 0x00FFFFFF;
+    *dataWord1 = ((channelNr & 0xFF) << 24) + 0x00FFFFFF;
 
-    *dataWord2 = (                    (TSId&0xFFFE)<<16)
-	       + ( ~tstrk->quality_packed()&0x0007)
-               + (     (tstrk->phi_packed()&0x00FF)<<3)
-               + ( (~tstrk->charge_packed()&0x0001)<<11)
-	       + (     (~tstrk->pt_packed()&0x001F)<<12);
+    *dataWord2 = ((TSId & 0xFFFE) << 16) + (~tstrk->quality_packed() & 0x0007) +
+                 ((tstrk->phi_packed() & 0x00FF) << 3) +
+                 ((~tstrk->charge_packed() & 0x0001) << 11) +
+                 ((~tstrk->pt_packed() & 0x001F) << 12);
 
     dt_crc::calcCRC(*dataWord1, *dataWord2, newCRC);
 
-    LineFED+=4;
-    *((int*)LineFED)=*dataWord2; 
-    LineFED+=4;
-    *((int*)LineFED)=*dataWord1; 
+    LineFED += 4;
+    *((int *)LineFED) = *dataWord2;
+    LineFED += 4;
+    *((int *)LineFED) = *dataWord1;
 
     channelNr = channel(0, tstrk->scNum(), tstrk->bx());
-    if ( channelNr == 255 ) continue;
-    TSId = (tstrk->whNum()+3)<<16;
-    TSId += ( tstrk->whNum() < 0 ) ? 0x8FFFC : 0x7FFFC;
+    if (channelNr == 255)
+      continue;
+    TSId = (tstrk->whNum() + 3) << 16;
+    TSId += (tstrk->whNum() < 0) ? 0x8FFFC : 0x7FFFC;
 
-    *dataWord1 = ((channelNr&0xFF)<<24)
-               + 0x00FFFFFF;
+    *dataWord1 = ((channelNr & 0xFF) << 24) + 0x00FFFFFF;
 
-    *dataWord2 = (TSId&0xFFFFC)<<12;
+    *dataWord2 = (TSId & 0xFFFFC) << 12;
 
-    if ( tstrk->TrkTag() == 0 ) {
-      *dataWord2 +=                            0x3F80
-                 + (       tstrk->eta_packed()&0x003F)
-                 + ((~tstrk->finehalo_packed()&0x0001)<<6);
-    }
-    else {
-      *dataWord2 +=                            0x007F
-                 + (     ( tstrk->eta_packed()&0x003F)<<7)
-                 + ((~tstrk->finehalo_packed()&0x0001)<<13);
+    if (tstrk->TrkTag() == 0) {
+      *dataWord2 += 0x3F80 + (tstrk->eta_packed() & 0x003F) +
+                    ((~tstrk->finehalo_packed() & 0x0001) << 6);
+    } else {
+      *dataWord2 += 0x007F + ((tstrk->eta_packed() & 0x003F) << 7) +
+                    ((~tstrk->finehalo_packed() & 0x0001) << 13);
     }
 
     dt_crc::calcCRC(*dataWord1, *dataWord2, newCRC);
 
-    LineFED+=4;
-    *((int*)LineFED)=*dataWord2; 
-    LineFED+=4;
-    *((int*)LineFED)=*dataWord1; 
+    LineFED += 4;
+    *((int *)LineFED) = *dataWord2;
+    LineFED += 4;
+    *((int *)LineFED) = *dataWord1;
   }
-  //Output
+  // Output
 
   //--> Trailer
 
-  *dataWord1 = 0xA0000000
-             + (lines&0xFFFFFF);
+  *dataWord1 = 0xA0000000 + (lines & 0xFFFFFF);
   *dataWord2 = 0;
 
-  dt_crc::calcCRC(*dataWord1, *dataWord2&0xFFFF, newCRC);
+  dt_crc::calcCRC(*dataWord1, *dataWord2 & 0xFFFF, newCRC);
 
-  *dataWord2 += (newCRC&0xFFFF)<<16;
+  *dataWord2 += (newCRC & 0xFFFF) << 16;
 
-  LineFED+=4;
-  *((int*)LineFED)=*dataWord2; 
-  LineFED+=4;
-  *((int*)LineFED)=*dataWord1; 
+  LineFED += 4;
+  *((int *)LineFED) = *dataWord2;
+  LineFED += 4;
+  *((int *)LineFED) = *dataWord1;
 
   delete dataWord1;
   delete dataWord2;
   return true;
 }
 
-int DTTFFEDSim::channel( int wheel, int sector,  int bx ){
+int DTTFFEDSim::channel(int wheel, int sector, int bx) {
 
   // wheel  :  -3 -2 -1 +1 +2 +3 <=> PHTF's : N2, N1, N0, P0, P1, P2
-  //                           0 <=> ETTF  
+  //                           0 <=> ETTF
   // sector :  0 -> 11
   // bx     : -1 -> +1
 
   int myChannel = 255;
 
-  if ( abs(bx) > 1)               { return myChannel; }
-  if ( sector < 0 || sector > 11) { return myChannel; }
-  if ( abs(wheel) > 3)            { return myChannel; }
+  if (abs(bx) > 1) {
+    return myChannel;
+  }
+  if (sector < 0 || sector > 11) {
+    return myChannel;
+  }
+  if (abs(wheel) > 3) {
+    return myChannel;
+  }
 
-  myChannel = sector*21 + wheel*3 - bx + 10 ; 
+  myChannel = sector * 21 + wheel * 3 - bx + 10;
 
-  if (myChannel > 125) myChannel += 2;
+  if (myChannel > 125)
+    myChannel += 2;
 
   return myChannel;
 }
 
-int DTTFFEDSim::bxNr( int channel ){
+int DTTFFEDSim::bxNr(int channel) {
 
   int myChannel = channel;
 
-  if (myChannel > 127) myChannel -= 2;
+  if (myChannel > 127)
+    myChannel -= 2;
 
-  if (myChannel < 0 || myChannel > 251 ){ return -999; }
+  if (myChannel < 0 || myChannel > 251) {
+    return -999;
+  }
 
-  int myBx = 1-(myChannel%3);
+  int myBx = 1 - (myChannel % 3);
 
   return myBx;
 }
 
-int DTTFFEDSim::sector( int channel ){
+int DTTFFEDSim::sector(int channel) {
 
   int myChannel = channel;
 
-  if (myChannel > 127) myChannel -= 2;
+  if (myChannel > 127)
+    myChannel -= 2;
 
-  if (myChannel < 0 || myChannel > 251 ){ return -999; }
+  if (myChannel < 0 || myChannel > 251) {
+    return -999;
+  }
 
-  return myChannel/21;
+  return myChannel / 21;
 }
 
-int DTTFFEDSim::wheel( int channel ){
+int DTTFFEDSim::wheel(int channel) {
 
   int myChannel = channel;
 
-  if (myChannel > 127) myChannel -= 2;
+  if (myChannel > 127)
+    myChannel -= 2;
 
-  if (myChannel < 0 || myChannel > 251 ){ return -999; }
+  if (myChannel < 0 || myChannel > 251) {
+    return -999;
+  }
 
-  int myWheel = ((myChannel%21)/3)-3;
+  int myWheel = ((myChannel % 21) / 3) - 3;
 
   return myWheel;
 }
diff --git a/EventFilter/DTTFRawToDigi/src/SealModule.cc b/EventFilter/DTTFRawToDigi/src/SealModule.cc
index 0ea062f87c31d..df7e230f00fa9 100644
--- a/EventFilter/DTTFRawToDigi/src/SealModule.cc
+++ b/EventFilter/DTTFRawToDigi/src/SealModule.cc
@@ -1,6 +1,6 @@
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "EventFilter/DTTFRawToDigi/interface/DTTFFEDReader.h"
 #include "EventFilter/DTTFRawToDigi/interface/DTTFFEDSim.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 
 DEFINE_FWK_MODULE(DTTFFEDReader);
 DEFINE_FWK_MODULE(DTTFFEDSim);
diff --git a/EventFilter/GEMRawToDigi/test/unpackData-GEM.py b/EventFilter/GEMRawToDigi/test/unpackData-GEM.py
index c4e7e38e218cc..a0451debf43d9 100644
--- a/EventFilter/GEMRawToDigi/test/unpackData-GEM.py
+++ b/EventFilter/GEMRawToDigi/test/unpackData-GEM.py
@@ -49,11 +49,6 @@
                  VarParsing.VarParsing.multiplicity.singleton,
                  VarParsing.VarParsing.varType.bool,
                  "Filter on validation events")
-options.register('process',
-                 '',
-                 VarParsing.VarParsing.multiplicity.singleton,
-                 VarParsing.VarParsing.varType.string,
-                 "Rename process if used")
 options.register('mps',
                  '',
                  VarParsing.VarParsing.multiplicity.list,
@@ -73,16 +68,10 @@
 options.parseArguments()
 
 
-pname="Raw2Digi"
-if (options.process!=""):
-    pname=options.process
-#process = cms.Process(pname)
-
-#from Configuration.StandardSequences.Eras import eras
-#process = cms.Process(pname, eras.Run2_2017, eras.run2_GEM_2017)
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('RECO',eras.Run2_2017,eras.run2_GEM_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017
+process = cms.Process('RECO',Run2_2017,run2_GEM_2017)
 
 process.load('Configuration.StandardSequences.L1Reco_cff')
 process.load('Configuration.StandardSequences.Reconstruction_cff')
diff --git a/EventFilter/HcalRawToDigi/python/HcalDigiToRaw_cfi.py b/EventFilter/HcalRawToDigi/python/HcalDigiToRaw_cfi.py
index 2cd476f876035..11023859ae669 100644
--- a/EventFilter/HcalRawToDigi/python/HcalDigiToRaw_cfi.py
+++ b/EventFilter/HcalRawToDigi/python/HcalDigiToRaw_cfi.py
@@ -9,12 +9,13 @@
     TRIG =  cms.untracked.InputTag("simHcalTriggerPrimitiveDigis")
 )
 
-hcalRawData = cms.Sequence(hcalRawDataVME)
+hcalRawDataTask = cms.Task(hcalRawDataVME)
+hcalRawData = cms.Sequence(hcalRawDataTask)
 
 from EventFilter.HcalRawToDigi.hcalDigiToRawuHTR_cfi import hcalDigiToRawuHTR as hcalRawDatauHTR
 
-_phase1_hcalRawData = hcalRawData.copy()
-_phase1_hcalRawData += hcalRawDatauHTR
+_phase1_hcalRawDataTask = hcalRawDataTask.copy()
+_phase1_hcalRawDataTask.add(hcalRawDatauHTR)
 
 from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017
 run2_HCAL_2017.toModify( hcalRawDataVME,
@@ -22,4 +23,4 @@
     HF = cms.untracked.InputTag(""),
     TRIG = cms.untracked.InputTag("")
 )
-run2_HCAL_2017.toReplaceWith(hcalRawData,_phase1_hcalRawData)
+run2_HCAL_2017.toReplaceWith(hcalRawDataTask,_phase1_hcalRawDataTask)
diff --git a/EventFilter/L1TRawToDigi/python/caloLayer1Raw_cfi.py b/EventFilter/L1TRawToDigi/python/caloLayer1Raw_cfi.py
index b439234834772..c8c5d8dda0622 100644
--- a/EventFilter/L1TRawToDigi/python/caloLayer1Raw_cfi.py
+++ b/EventFilter/L1TRawToDigi/python/caloLayer1Raw_cfi.py
@@ -17,4 +17,4 @@
 caloLayer1RawFed1358 = caloLayer1RawFed1354.clone()
 caloLayer1RawFed1358.FedId = 1358
 
-caloLayer1Raw = cms.Sequence(caloLayer1RawFed1354 + caloLayer1RawFed1356 + caloLayer1RawFed1358)
+caloLayer1Raw = cms.Task(caloLayer1RawFed1354, caloLayer1RawFed1356, caloLayer1RawFed1358)
diff --git a/EventFilter/L1TRawToDigi/test/test_CaloLayer1.py b/EventFilter/L1TRawToDigi/test/test_CaloLayer1.py
index aaf439761dbe6..336f43cb9e6dc 100644
--- a/EventFilter/L1TRawToDigi/test/test_CaloLayer1.py
+++ b/EventFilter/L1TRawToDigi/test/test_CaloLayer1.py
@@ -104,8 +104,8 @@
 # Path and EndPath definitions
 process.path = cms.Path(
     process.caloLayer1Digis *
-    process.caloLayer1Raw *
-    process.collectPackers
+    process.collectPackers,
+    process.caloLayer1Raw
 )
 
 process.out = cms.EndPath(
diff --git a/EventFilter/SiPixelRawToDigi/interface/ErrorChecker.h b/EventFilter/SiPixelRawToDigi/interface/ErrorChecker.h
index afe2b06412575..42567c5032c29 100644
--- a/EventFilter/SiPixelRawToDigi/interface/ErrorChecker.h
+++ b/EventFilter/SiPixelRawToDigi/interface/ErrorChecker.h
@@ -5,22 +5,13 @@
  *  
  */
 
-#include "DataFormats/SiPixelRawData/interface/SiPixelRawDataError.h"
+#include "EventFilter/SiPixelRawToDigi/interface/ErrorCheckerBase.h"
 #include "FWCore/Utilities/interface/typedefs.h"
 
-#include <vector>
-#include <map>
 
-class FEDRawData;
-
-class SiPixelFrameConverter;
-class SiPixelFedCabling;
-
-class ErrorChecker {
+class ErrorChecker : public ErrorCheckerBase {
 
 public:
-//  typedef unsigned int Word32;
-//  typedef long long Word64;
   typedef cms_uint32_t Word32;
   typedef cms_uint64_t Word64;
 
@@ -29,29 +20,29 @@ class ErrorChecker {
 
   ErrorChecker();
 
-  void setErrorStatus(bool ErrorStatus);
+  void setErrorStatus(bool ErrorStatus) override;
 
-  bool checkCRC(bool& errorsInEvent, int fedId, const Word64* trailer, Errors& errors);
+  bool checkCRC(bool& errorsInEvent, int fedId, const Word64* trailer, Errors& errors) override;
 
-  bool checkHeader(bool& errorsInEvent, int fedId, const Word64* header, Errors& errors);
+  bool checkHeader(bool& errorsInEvent, int fedId, const Word64* header, Errors& errors) override;
 
-  bool checkTrailer(bool& errorsInEvent, int fedId, unsigned int nWords, const Word64* trailer, Errors& errors);
+  bool checkTrailer(bool& errorsInEvent, int fedId, unsigned int nWords, const Word64* trailer, Errors& errors) override;
 
   bool checkROC(bool& errorsInEvent, int fedId, const SiPixelFrameConverter* converter, 
 		const SiPixelFedCabling* theCablingTree,
-		Word32& errorWord, Errors& errors);
+		Word32& errorWord, Errors& errors) override;
 
 
 
   void conversionError(int fedId, const SiPixelFrameConverter* converter, 
-		       int status, Word32& errorWord, Errors& errors);
+		       int status, Word32& errorWord, Errors& errors) override;
 
 private:
 
   bool includeErrors;
 
   cms_uint32_t errorDetId(const SiPixelFrameConverter* converter, 
-	 	          int errorType, const Word32 & word) const;
+	 	          int errorType, const Word32 & word) const override;
 
 };
 
diff --git a/EventFilter/SiPixelRawToDigi/interface/ErrorCheckerBase.h b/EventFilter/SiPixelRawToDigi/interface/ErrorCheckerBase.h
new file mode 100644
index 0000000000000..49a1f1f4f3943
--- /dev/null
+++ b/EventFilter/SiPixelRawToDigi/interface/ErrorCheckerBase.h
@@ -0,0 +1,52 @@
+#ifndef ErrorCheckerBase_H
+#define ErrorCheckerBase_H
+/** \class ErrorCheckerBase
+ *
+ *  
+ */
+
+#include "DataFormats/SiPixelRawData/interface/SiPixelRawDataError.h"
+
+#include <vector>
+#include <map>
+
+
+class SiPixelFrameConverter;
+class SiPixelFedCabling;
+
+class ErrorCheckerBase {
+
+public:
+  typedef cms_uint32_t Word32;
+  typedef cms_uint64_t Word64;
+
+  typedef std::vector<SiPixelRawDataError> DetErrors;
+  typedef std::map<cms_uint32_t, DetErrors> Errors;
+
+  virtual ~ErrorCheckerBase() {};
+
+  virtual void setErrorStatus(bool ErrorStatus)=0;
+
+  virtual bool checkCRC(bool& errorsInEvent, int fedId, const Word64* trailer, Errors& errors)=0;
+
+  virtual bool checkHeader(bool& errorsInEvent, int fedId, const Word64* header, Errors& errors)=0;
+
+  virtual bool checkTrailer(bool& errorsInEvent, int fedId, unsigned int nWords, const Word64* trailer, Errors& errors)=0;
+
+  virtual bool checkROC(bool& errorsInEvent, int fedId, const SiPixelFrameConverter* converter, 
+		const SiPixelFedCabling* theCablingTree,
+		Word32& errorWord, Errors& errors)=0;
+
+
+
+  virtual void conversionError(int fedId, const SiPixelFrameConverter* converter, 
+		       int status, Word32& errorWord, Errors& errors)=0;
+
+private:
+
+  virtual  cms_uint32_t errorDetId(const SiPixelFrameConverter* converter, 
+	 	          int errorType, const Word32 & word) const =0;
+
+};
+
+#endif
diff --git a/EventFilter/SiPixelRawToDigi/interface/ErrorCheckerPhase0.h b/EventFilter/SiPixelRawToDigi/interface/ErrorCheckerPhase0.h
new file mode 100644
index 0000000000000..20ac3b883e51d
--- /dev/null
+++ b/EventFilter/SiPixelRawToDigi/interface/ErrorCheckerPhase0.h
@@ -0,0 +1,49 @@
+#ifndef ErrorCheckerPhase0_H
+#define ErrorCheckerPhase0_H
+/** \class ErrorCheckerPhase0
+ *
+ *  
+ */
+
+#include "EventFilter/SiPixelRawToDigi/interface/ErrorCheckerBase.h"
+#include "FWCore/Utilities/interface/typedefs.h"
+
+
+class ErrorCheckerPhase0 : public ErrorCheckerBase {
+
+public:
+  typedef cms_uint32_t Word32;
+  typedef cms_uint64_t Word64;
+
+  typedef std::vector<SiPixelRawDataError> DetErrors;
+  typedef std::map<cms_uint32_t, DetErrors> Errors;
+
+  ErrorCheckerPhase0();
+
+  void setErrorStatus(bool ErrorStatus) override;
+
+  bool checkCRC(bool& errorsInEvent, int fedId, const Word64* trailer, Errors& errors) override;
+
+  bool checkHeader(bool& errorsInEvent, int fedId, const Word64* header, Errors& errors) override;
+
+  bool checkTrailer(bool& errorsInEvent, int fedId, unsigned int nWords, const Word64* trailer, Errors& errors) override;
+
+  bool checkROC(bool& errorsInEvent, int fedId, const SiPixelFrameConverter* converter, 
+		const SiPixelFedCabling* theCablingTree,
+		Word32& errorWord, Errors& errors) override;
+
+
+
+  void conversionError(int fedId, const SiPixelFrameConverter* converter, 
+		       int status, Word32& errorWord, Errors& errors) override;
+
+private:
+
+  bool includeErrors;
+
+  cms_uint32_t errorDetId(const SiPixelFrameConverter* converter, 
+	 	          int errorType, const Word32 & word) const override;
+
+};
+
+#endif
diff --git a/EventFilter/SiPixelRawToDigi/interface/PixelDataFormatter.h b/EventFilter/SiPixelRawToDigi/interface/PixelDataFormatter.h
index 47c312a091870..baa1980d9cda4 100644
--- a/EventFilter/SiPixelRawToDigi/interface/PixelDataFormatter.h
+++ b/EventFilter/SiPixelRawToDigi/interface/PixelDataFormatter.h
@@ -39,6 +39,7 @@
 #include "DataFormats/SiPixelRawData/interface/SiPixelRawDataError.h"
 #include "DataFormats/Common/interface/DetSetVector.h"
 #include "EventFilter/SiPixelRawToDigi/interface/ErrorChecker.h"
+#include "EventFilter/SiPixelRawToDigi/interface/ErrorCheckerPhase0.h"
 #include "FWCore/Utilities/interface/typedefs.h"
 #include "DataFormats/SiPixelDetId/interface/PixelFEDChannel.h"
 
@@ -101,7 +102,7 @@ class PixelDataFormatter {
   bool debug;
   int allDetDigis;
   int hasDetDigis;
-  ErrorChecker errorcheck;
+  std::unique_ptr<ErrorCheckerBase> errorcheck;
 
   // For the 32bit data format (moved from *.cc namespace, keep uppercase for compatibility)
   // Add special layer 1 roc for phase1
diff --git a/EventFilter/SiPixelRawToDigi/plugins/SiPixelDigiToRaw.cc b/EventFilter/SiPixelRawToDigi/plugins/SiPixelDigiToRaw.cc
index bd8244d7527db..e4d0b0c6551aa 100644
--- a/EventFilter/SiPixelRawToDigi/plugins/SiPixelDigiToRaw.cc
+++ b/EventFilter/SiPixelRawToDigi/plugins/SiPixelDigiToRaw.cc
@@ -136,7 +136,7 @@ void SiPixelDigiToRaw::produce( edm::StreamID, edm::Event& ev,
 
   PixelDataFormatter::BadChannels badChannels;
   edm::Handle<PixelFEDChannelCollection> pixelFEDChannelCollectionHandle;
-  if (ev.getByToken(theBadPixelFEDChannelsToken, pixelFEDChannelCollectionHandle)){
+  if (usePhase1 && ev.getByToken(theBadPixelFEDChannelsToken, pixelFEDChannelCollectionHandle)){
     for (auto const& fedChannels: *pixelFEDChannelCollectionHandle) {
       PixelDataFormatter::DetBadChannels detBadChannels;
       for(const auto& fedChannel: fedChannels) {
diff --git a/EventFilter/SiPixelRawToDigi/plugins/SiPixelRawToDigi.cc b/EventFilter/SiPixelRawToDigi/plugins/SiPixelRawToDigi.cc
index 1c08c35009918..7495fc1d62706 100644
--- a/EventFilter/SiPixelRawToDigi/plugins/SiPixelRawToDigi.cc
+++ b/EventFilter/SiPixelRawToDigi/plugins/SiPixelRawToDigi.cc
@@ -51,12 +51,10 @@ SiPixelRawToDigi::SiPixelRawToDigi( const edm::ParameterSet& conf )
   
   includeErrors = config_.getParameter<bool>("IncludeErrors");
   useQuality = config_.getParameter<bool>("UseQualityInfo");
-  if (config_.exists("ErrorList")) {
-    tkerrorlist = config_.getParameter<std::vector<int> > ("ErrorList");
-  }
-  if (config_.exists("UserErrorList")) {
-    usererrorlist = config_.getParameter<std::vector<int> > ("UserErrorList");
-  }
+
+  tkerrorlist = config_.getParameter<std::vector<int> > ("ErrorList");
+  usererrorlist = config_.getParameter<std::vector<int> > ("UserErrorList");
+
   tFEDRawDataCollection = consumes <FEDRawDataCollection> (config_.getParameter<edm::InputTag>("InputLabel"));
   
   //start counters
@@ -73,11 +71,8 @@ SiPixelRawToDigi::SiPixelRawToDigi( const edm::ParameterSet& conf )
   }
   
   // regions
-  if (config_.exists("Regions")) {
-    if(!config_.getParameter<edm::ParameterSet>("Regions").getParameterNames().empty())
-    {
-      regions_ = new PixelUnpackingRegions(config_, consumesCollector());
-    }
+  if(!config_.getParameter<edm::ParameterSet>("Regions").getParameterNames().empty()) {
+    regions_ = new PixelUnpackingRegions(config_, consumesCollector());
   }
 
   // Timing
@@ -89,18 +84,13 @@ SiPixelRawToDigi::SiPixelRawToDigi( const edm::ParameterSet& conf )
   }
 
   // Control the usage of pilot-blade data, FED=40
-  usePilotBlade = false; 
-  if (config_.exists("UsePilotBlade")) {
-    usePilotBlade = config_.getParameter<bool> ("UsePilotBlade");
-    if(usePilotBlade) edm::LogInfo("SiPixelRawToDigi")  << " Use pilot blade data (FED 40)";
-  }
+  usePilotBlade = config_.getParameter<bool> ("UsePilotBlade");
+  if(usePilotBlade) edm::LogInfo("SiPixelRawToDigi")  << " Use pilot blade data (FED 40)";
 
   // Control the usage of phase1
-  usePhase1 = false;
-  if (config_.exists("UsePhase1")) {
-    usePhase1 = config_.getParameter<bool> ("UsePhase1");
-    if(usePhase1) edm::LogInfo("SiPixelRawToDigi")  << " Using phase1";
-  }
+  usePhase1 = config_.getParameter<bool> ("UsePhase1");
+  if(usePhase1) edm::LogInfo("SiPixelRawToDigi")  << " Using phase1";
+
   //CablingMap could have a label //Tav
   cablingMapLabel = config_.getParameter<std::string> ("CablingMapLabel");
 
@@ -197,7 +187,6 @@ void SiPixelRawToDigi::produce( edm::Event& ev,
   auto usererror_detidcollection = std::make_unique<DetIdCollection>();
   auto disabled_channelcollection = std::make_unique<edmNew::DetSetVector<PixelFEDChannel> >();
 
-  //PixelDataFormatter formatter(cabling_.get()); // phase 0 only
   PixelDataFormatter formatter(cabling_.get(), usePhase1); // for phase 1 & 0
 
   formatter.setErrorStatus(includeErrors);
@@ -252,7 +241,7 @@ void SiPixelRawToDigi::produce( edm::Event& ev,
 	  for (auto const& aPixelError : errorDetSet) {
 	    // For the time being, we extend the error handling functionality with ErrorType 25
 	    // In the future, we should sort out how the usage of tkerrorlist can be generalized
-	    if (aPixelError.getType()==25) {
+	    if (usePhase1 && aPixelError.getType()==25) {
 	      assert(aPixelError.getFedId()==fedId);
 	      const sipixelobjects::PixelFEDCabling* fed = cabling_->fed(fedId);
 	      if (fed) {
diff --git a/EventFilter/SiPixelRawToDigi/src/ErrorCheckerPhase0.cc b/EventFilter/SiPixelRawToDigi/src/ErrorCheckerPhase0.cc
new file mode 100644
index 0000000000000..5870a24f19d29
--- /dev/null
+++ b/EventFilter/SiPixelRawToDigi/src/ErrorCheckerPhase0.cc
@@ -0,0 +1,296 @@
+#include "EventFilter/SiPixelRawToDigi/interface/ErrorCheckerPhase0.h"
+
+#include "CondFormats/SiPixelObjects/interface/SiPixelFrameConverter.h"
+
+#include "DataFormats/DetId/interface/DetId.h"
+#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "DataFormats/FEDRawData/interface/FEDHeader.h"
+#include "DataFormats/FEDRawData/interface/FEDTrailer.h"
+
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+
+#include <bitset>
+#include <sstream>
+#include <iostream>
+
+using namespace std;
+using namespace edm;
+using namespace sipixelobjects;
+
+namespace {
+  constexpr int CRC_bits = 1;
+  constexpr int LINK_bits = 6;
+  constexpr int ROC_bits  = 5;
+  constexpr int DCOL_bits = 5;
+  constexpr int PXID_bits = 8;
+  constexpr int ADC_bits  = 8;
+  constexpr int OMIT_ERR_bits = 1;
+  
+  constexpr int CRC_shift = 2;
+  constexpr int ADC_shift  = 0;
+  constexpr int PXID_shift = ADC_shift + ADC_bits;
+  constexpr int DCOL_shift = PXID_shift + PXID_bits;
+  constexpr int ROC_shift  = DCOL_shift + DCOL_bits;
+  constexpr int LINK_shift = ROC_shift + ROC_bits;
+  constexpr int OMIT_ERR_shift = 20;
+  
+  constexpr cms_uint32_t dummyDetId = 0xffffffff;
+  
+  constexpr ErrorCheckerPhase0::Word64 CRC_mask = ~(~ErrorCheckerPhase0::Word64(0) << CRC_bits);
+  constexpr ErrorCheckerPhase0::Word32 ERROR_mask = ~(~ErrorCheckerPhase0::Word32(0) << ROC_bits);
+  constexpr ErrorCheckerPhase0::Word32 LINK_mask = ~(~ErrorCheckerPhase0::Word32(0) << LINK_bits);
+  constexpr ErrorCheckerPhase0::Word32 ROC_mask  = ~(~ErrorCheckerPhase0::Word32(0) << ROC_bits);
+  constexpr ErrorCheckerPhase0::Word32 OMIT_ERR_mask = ~(~ErrorCheckerPhase0::Word32(0) << OMIT_ERR_bits);
+}  
+
+ErrorCheckerPhase0::ErrorCheckerPhase0() {
+
+  includeErrors = false;
+}
+
+void ErrorCheckerPhase0::setErrorStatus(bool ErrorStatus)
+{
+  includeErrors = ErrorStatus;
+}
+
+bool ErrorCheckerPhase0::checkCRC(bool& errorsInEvent, int fedId, const Word64* trailer, Errors& errors)
+{
+  int CRC_BIT = (*trailer >> CRC_shift) & CRC_mask;
+  if (CRC_BIT == 0) return true;
+  errorsInEvent = true;
+  if (includeErrors) {
+    int errorType = 39;
+    SiPixelRawDataError error(*trailer, errorType, fedId);
+    errors[dummyDetId].push_back(error);
+  }
+  return false;
+}
+
+bool ErrorCheckerPhase0::checkHeader(bool& errorsInEvent, int fedId, const Word64* header, Errors& errors)
+{
+  FEDHeader fedHeader( reinterpret_cast<const unsigned char*>(header));
+  if ( !fedHeader.check() ) return false; // throw exception?
+  if ( fedHeader.sourceID() != fedId) { 
+    LogDebug("PixelDataFormatter::interpretRawData, fedHeader.sourceID() != fedId")
+      <<", sourceID = " <<fedHeader.sourceID()
+      <<", fedId = "<<fedId<<", errorType = 32"; 
+    errorsInEvent = true;
+    if (includeErrors) {
+      int errorType = 32;
+      SiPixelRawDataError error(*header, errorType, fedId);
+      errors[dummyDetId].push_back(error);
+    }
+  }
+  return fedHeader.moreHeaders();
+}
+
+bool ErrorCheckerPhase0::checkTrailer(bool& errorsInEvent, int fedId, unsigned int nWords, const Word64* trailer, Errors& errors)
+{
+  FEDTrailer fedTrailer(reinterpret_cast<const unsigned char*>(trailer));
+  if ( !fedTrailer.check()) { 
+    if(includeErrors) {
+      int errorType = 33;
+      SiPixelRawDataError error(*trailer, errorType, fedId);
+      errors[dummyDetId].push_back(error);
+    }
+    errorsInEvent = true;
+    LogError("FedTrailerCheck")
+      <<"fedTrailer.check failed, Fed: " << fedId << ", errorType = 33";
+    return false; 
+  } 
+  if ( fedTrailer.fragmentLength()!= nWords) {
+    LogError("FedTrailerLenght")<< "fedTrailer.fragmentLength()!= nWords !! Fed: " << fedId << ", errorType = 34";
+    errorsInEvent = true;
+    if(includeErrors) {
+      int errorType = 34;
+      SiPixelRawDataError error(*trailer, errorType, fedId);
+      errors[dummyDetId].push_back(error);
+    }
+  }
+  return fedTrailer.moreTrailers();
+}
+
+bool ErrorCheckerPhase0::checkROC(bool& errorsInEvent, int fedId, const SiPixelFrameConverter* converter, 
+			    const SiPixelFedCabling* theCablingTree, Word32& errorWord, Errors& errors)
+{
+  int errorType = (errorWord >> ROC_shift) & ERROR_mask;
+  if LIKELY(errorType<25) return true;
+
+ switch (errorType) {
+    case(25) : {
+     LogDebug("")<<"  invalid ROC=25 found (errorType=25)";
+     errorsInEvent = true;
+     break;
+   }
+   case(26) : {
+     return false;
+   }
+   case(27) : {
+     return false;
+   }
+   case(28) : {
+     LogDebug("")<<"  error fifo nearly full (errorType=28)";
+     errorsInEvent = true;
+     break;
+   }
+   case(29) : {
+     LogDebug("")<<"  timeout on a channel (errorType=29)";
+     errorsInEvent = true;
+     if ((errorWord >> OMIT_ERR_shift) & OMIT_ERR_mask) {
+       LogDebug("")<<"  ...first errorType=29 error, this gets masked out";
+       return false;
+     }
+     break;
+   }
+   case(30) : {
+     LogDebug("")<<"  TBM error trailer (errorType=30)";
+     errorsInEvent = true;
+     break;
+   }
+   case(31) : {
+     LogDebug("")<<"  event number error (errorType=31)";
+     errorsInEvent = true;
+     break;
+   }
+   default: return true;
+ };
+
+ if(includeErrors) {
+   // check to see if overflow error for type 30, change type to 40 if so
+   if(errorType==30) {
+     int StateMach_bits      = 4;
+     int StateMach_shift     = 8;
+     uint32_t StateMach_mask = ~(~uint32_t(0) << StateMach_bits);
+     int StateMach = (errorWord >> StateMach_shift) & StateMach_mask;
+     if( StateMach==4 || StateMach==9 ) errorType = 40;
+   }
+
+   // store error
+   SiPixelRawDataError error(errorWord, errorType, fedId);
+   cms_uint32_t detId;
+   detId = errorDetId(converter, errorType, errorWord);
+   errors[detId].push_back(error);
+ }
+ return false;
+}
+
+void ErrorCheckerPhase0::conversionError(int fedId, const SiPixelFrameConverter* converter, int status, Word32& errorWord, Errors& errors)
+{
+  switch (status) {
+  case(1) : {
+    LogDebug("ErrorCheckerPhase0::conversionError") << " Fed: " << fedId << "  invalid channel Id (errorType=35)";
+    if(includeErrors) {
+      int errorType = 35;
+      SiPixelRawDataError error(errorWord, errorType, fedId);
+      cms_uint32_t detId = errorDetId(converter, errorType, errorWord);
+      errors[detId].push_back(error);
+    }
+    break;
+  }
+  case(2) : {
+    LogDebug("ErrorCheckerPhase0::conversionError")<< " Fed: " << fedId << "  invalid ROC Id (errorType=36)";
+    if(includeErrors) {
+      int errorType = 36;
+      SiPixelRawDataError error(errorWord, errorType, fedId);
+      cms_uint32_t detId = errorDetId(converter, errorType, errorWord);
+      errors[detId].push_back(error);
+    }
+    break;
+  }
+  case(3) : {
+    LogDebug("ErrorCheckerPhase0::conversionError")<< " Fed: " << fedId << "  invalid dcol/pixel value (errorType=37)";
+    if(includeErrors) {
+      int errorType = 37;
+      SiPixelRawDataError error(errorWord, errorType, fedId);
+      cms_uint32_t detId = errorDetId(converter, errorType, errorWord);
+      errors[detId].push_back(error);
+    }
+    break;
+  }
+  case(4) : {
+    LogDebug("ErrorCheckerPhase0::conversionError")<< " Fed: " << fedId << "  dcol/pixel read out of order (errorType=38)";
+    if(includeErrors) {
+      int errorType = 38;
+      SiPixelRawDataError error(errorWord, errorType, fedId);
+      cms_uint32_t detId = errorDetId(converter, errorType, errorWord);
+      errors[detId].push_back(error);
+    }
+    break;
+  }
+  default: LogDebug("ErrorCheckerPhase0::conversionError")<<"  cabling check returned unexpected result, status = "<< status;
+  };
+}
+
+// this function finds the detId for an error word that cannot be processed in word2digi
+cms_uint32_t ErrorCheckerPhase0::errorDetId(const SiPixelFrameConverter* converter, 
+    int errorType, const Word32 & word) const
+{
+  if (!converter) return dummyDetId;
+
+  ElectronicIndex cabling;
+
+  switch (errorType) {
+    case  25 : case  30 : case  31 : case  36 : case 40 : {
+      // set dummy values for cabling just to get detId from link if in Barrel
+      cabling.dcol = 0;
+      cabling.pxid = 2;
+      cabling.roc  = 1;
+      cabling.link = (word >> LINK_shift) & LINK_mask;  
+
+      DetectorIndex detIdx;
+      int status = converter->toDetector(cabling, detIdx);
+      if (status) break;
+      if(DetId(detIdx.rawId).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) return detIdx.rawId;
+      break;
+    }
+    case  29 : {
+      int chanNmbr = 0;
+      const int DB0_shift = 0;
+      const int DB1_shift = DB0_shift + 1;
+      const int DB2_shift = DB1_shift + 1;
+      const int DB3_shift = DB2_shift + 1;
+      const int DB4_shift = DB3_shift + 1;
+      const cms_uint32_t DataBit_mask = ~(~cms_uint32_t(0) << 1);
+
+      int CH1 = (word >> DB0_shift) & DataBit_mask;
+      int CH2 = (word >> DB1_shift) & DataBit_mask;
+      int CH3 = (word >> DB2_shift) & DataBit_mask;
+      int CH4 = (word >> DB3_shift) & DataBit_mask;
+      int CH5 = (word >> DB4_shift) & DataBit_mask;
+      int BLOCK_bits      = 3;
+      int BLOCK_shift     = 8;
+      cms_uint32_t BLOCK_mask = ~(~cms_uint32_t(0) << BLOCK_bits);
+      int BLOCK = (word >> BLOCK_shift) & BLOCK_mask;
+      int localCH = 1*CH1+2*CH2+3*CH3+4*CH4+5*CH5;
+      if (BLOCK%2==0) chanNmbr=(BLOCK/2)*9+localCH;
+      else chanNmbr = ((BLOCK-1)/2)*9+4+localCH;
+      if ((chanNmbr<1)||(chanNmbr>36)) break;  // signifies unexpected result
+      
+      // set dummy values for cabling just to get detId from link if in Barrel
+      cabling.dcol = 0;
+      cabling.pxid = 2;
+      cabling.roc  = 1;
+      cabling.link = chanNmbr;  
+      DetectorIndex detIdx;
+      int status = converter->toDetector(cabling, detIdx);
+      if (status) break;
+      if(DetId(detIdx.rawId).subdetId() == static_cast<int>(PixelSubdetector::PixelBarrel)) return detIdx.rawId;
+      break;
+    }
+    case  37 : case  38: {
+      cabling.dcol = 0;
+      cabling.pxid = 2;
+      cabling.roc  = (word >> ROC_shift) & ROC_mask;
+      cabling.link = (word >> LINK_shift) & LINK_mask;
+
+      DetectorIndex detIdx;
+      int status = converter->toDetector(cabling, detIdx);
+      if (status) break;
+
+      return detIdx.rawId;
+      break;
+    }
+  default : break;
+  };
+  return dummyDetId;
+}
diff --git a/EventFilter/SiPixelRawToDigi/src/PixelDataFormatter.cc b/EventFilter/SiPixelRawToDigi/src/PixelDataFormatter.cc
index 84ce0a7d9396c..b28273e3c9f90 100644
--- a/EventFilter/SiPixelRawToDigi/src/PixelDataFormatter.cc
+++ b/EventFilter/SiPixelRawToDigi/src/PixelDataFormatter.cc
@@ -100,12 +100,17 @@ PixelDataFormatter::PixelDataFormatter( const SiPixelFedCabling* map, bool phase
   PXID_mask = ~(~PixelDataFormatter::Word32(0) << PXID_bits);
   ADC_mask  = ~(~PixelDataFormatter::Word32(0) << ADC_bits);
 
+  if (phase1) {
+    errorcheck=std::unique_ptr<ErrorCheckerBase>(new ErrorChecker());
+  } else {
+    errorcheck=std::unique_ptr<ErrorCheckerBase>(new ErrorCheckerPhase0());
+  }
 }
 
 void PixelDataFormatter::setErrorStatus(bool ErrorStatus)
 {
   includeErrors = ErrorStatus;
-  errorcheck.setErrorStatus(includeErrors);
+  errorcheck->setErrorStatus(includeErrors);
 }
 
 void PixelDataFormatter::setQualityStatus(bool QualityStatus, const SiPixelQuality* QualityInfo)
@@ -135,7 +140,7 @@ void PixelDataFormatter::interpretRawData(bool& errorsInEvent, int fedId, const
 
   // check CRC bit
   const Word64* trailer = reinterpret_cast<const Word64* >(rawData.data())+(nWords-1);  
-  if(!errorcheck.checkCRC(errorsInEvent, fedId, trailer, errors)) return;
+  if(!errorcheck->checkCRC(errorsInEvent, fedId, trailer, errors)) return;
 
   // check headers
   const Word64* header = reinterpret_cast<const Word64* >(rawData.data()); header--;
@@ -143,7 +148,7 @@ void PixelDataFormatter::interpretRawData(bool& errorsInEvent, int fedId, const
   while (moreHeaders) {
     header++;
     LogTrace("")<<"HEADER:  " <<  print(*header);
-    bool headerStatus = errorcheck.checkHeader(errorsInEvent, fedId, header, errors);
+    bool headerStatus = errorcheck->checkHeader(errorsInEvent, fedId, header, errors);
     moreHeaders = headerStatus;
   }
 
@@ -153,7 +158,7 @@ void PixelDataFormatter::interpretRawData(bool& errorsInEvent, int fedId, const
   while (moreTrailers) {
     trailer--;
     LogTrace("")<<"TRAILER: " <<  print(*trailer);
-    bool trailerStatus = errorcheck.checkTrailer(errorsInEvent, fedId, nWords, trailer, errors);
+    bool trailerStatus = errorcheck->checkTrailer(errorsInEvent, fedId, nWords, trailer, errors);
     moreTrailers = trailerStatus;
   }
 
@@ -183,12 +188,12 @@ void PixelDataFormatter::interpretRawData(bool& errorsInEvent, int fedId, const
 
     if ( (nlink!=link) | (nroc!=roc) ) {  // new roc
       link = nlink; roc=nroc;
-      skipROC = LIKELY(roc<maxROCIndex) ? false : !errorcheck.checkROC(errorsInEvent, fedId, &converter, theCablingTree, ww, errors);
+      skipROC = LIKELY(roc<maxROCIndex) ? false : !errorcheck->checkROC(errorsInEvent, fedId, &converter, theCablingTree, ww, errors);
       if (skipROC) continue;
       rocp = converter.toRoc(link,roc);
       if UNLIKELY(!rocp) {
 	errorsInEvent = true;
-	errorcheck.conversionError(fedId, &converter, 2, ww, errors);
+	errorcheck->conversionError(fedId, &converter, 2, ww, errors);
 	skipROC=true;
 	continue;
       }
@@ -231,7 +236,7 @@ void PixelDataFormatter::interpretRawData(bool& errorsInEvent, int fedId, const
 	  LogDebug("PixelDataFormatter::interpretRawData") 
 	    << "status #3";
 	  errorsInEvent = true;
-	  errorcheck.conversionError(fedId, &converter, 3, ww, errors);
+	  errorcheck->conversionError(fedId, &converter, 3, ww, errors);
 	  continue;
 	}
       local = std::make_unique<LocalPixel>(localCR); // local pixel coordinate 
@@ -250,7 +255,7 @@ void PixelDataFormatter::interpretRawData(bool& errorsInEvent, int fedId, const
 	  LogDebug("PixelDataFormatter::interpretRawData") 
 	    << "status #3";
 	  errorsInEvent = true;
-	  errorcheck.conversionError(fedId, &converter, 3, ww, errors);
+	  errorcheck->conversionError(fedId, &converter, 3, ww, errors);
 	  continue;
 	}
       local = std::make_unique<LocalPixel>(localDP); // local pixel coordinate 
diff --git a/EventFilter/Utilities/src/FastMonitoringService.cc b/EventFilter/Utilities/src/FastMonitoringService.cc
index 9ef34fb76d8cf..fbb406b856969 100644
--- a/EventFilter/Utilities/src/FastMonitoringService.cc
+++ b/EventFilter/Utilities/src/FastMonitoringService.cc
@@ -192,7 +192,7 @@ namespace evf{
       throw cms::Exception("FastMonitoringService") << "EvFDaqDirector is not present";
     
     }
-    boost::filesystem::path runDirectory(edm::Service<evf::EvFDaqDirector>()->baseRunDir());
+    boost::filesystem::path runDirectory{edm::Service<evf::EvFDaqDirector>()->baseRunDir()};
     workingDirectory_ = runDirectory_ = runDirectory;
     workingDirectory_ /= "mon";
 
diff --git a/EventFilter/Utilities/test/testGlobalNumbers.cc b/EventFilter/Utilities/test/testGlobalNumbers.cc
index 6ac4d369646b1..523643ca9fd53 100755
--- a/EventFilter/Utilities/test/testGlobalNumbers.cc
+++ b/EventFilter/Utilities/test/testGlobalNumbers.cc
@@ -103,29 +103,30 @@ namespace test{
                                                << "  summarySize;" << std::hex << (unsigned int)record->sizes.summarySize
                                                << "  headerSize;" << std::hex << (unsigned int)record->sizes.headerSize
                                                << std::endl;
-        edm::LogInfo( "GlobalNumberAnalysis" ) << "macAddress;          " << std::hex << (uint64_t)record->header.macAddress
-                                               << "\nswVersion;          " << std::hex << (unsigned int)record->header.swVersion
-                                               << "\nfwVersion;          " << std::hex <<(unsigned int)record->header.fwVersion
-                                               << "\nreserved0;	   " << std::hex <<(unsigned int)record->header.reserved0
-                                               << "\nrecordVersion;          " << std::hex <<(unsigned int)record->header.recordVersion
-                                               << "\nrunNumber;	   " << std::dec << (unsigned int)record->header.runNumber
-                                               << "\nreserved1;	   " << std::hex <<(unsigned int)record->header.reserved1
-                                               << "\nactivePartitions2;   " << std::hex <<(unsigned int)record->header.activePartitions2
-                                               << "\nbstReceptionStatus;  " << std::hex <<(unsigned int)record->header.bstReceptionStatus
-                                               << "\nactivePartitions0;   " << std::hex << (unsigned int)record->header.activePartitions0
-                                               << "\nactivePartitions1;   " << std::hex <<(unsigned int)record->header.activePartitions1
-                                               << "\nnibble;		   " << std::dec << (unsigned int)record->header.nibble
-                                               << "\nlumiSection;	   " << std::dec << (unsigned int)record->header.lumiSection
-                                               << "\nnibblesPerLumiSection;" << std::hex <<(unsigned int)record->header.nibblesPerLumiSection
-                                               << "\ntriggerTypeFlags;	   " << std::hex <<(unsigned int)record->header.triggerTypeFlags
-                                               << "\nreserved5;	   " << std::hex <<(unsigned int)record->header.reserved5
-                                               << "\ninputs;		   " << std::hex <<(unsigned int)record->header.inputs
-                                               << "\nbxid;		   " << std::dec << (unsigned int)record->header.bxid
-                                               << "\norbitLow;		   " << std::dec << (unsigned int)record->header.orbitLow
-                                               << "\norbitHigh;	   " << std::dec << (unsigned int)record->header.orbitHigh
-                                               << "\ntriggerCount;	   " << std::dec << (uint64_t)record->header.triggerCount
-                                               << "\neventNumber;         " << std::dec << (uint64_t)record->header.eventNumber
-                                               << std::endl;
+        edm::LogInfo( "GlobalNumberAnalysis" ) 
+            << "macAddress;             " << std::hex << (uint64_t)record->header.macAddress
+            << "\nswVersion;            " << std::hex << (unsigned int)record->header.swVersion
+            << "\nfwVersion;            " << std::hex <<(unsigned int)record->header.fwVersion
+            << "\nreserved0;            " << std::hex <<(unsigned int)record->header.reserved0
+            << "\nrecordVersion;        " << std::hex <<(unsigned int)record->header.recordVersion
+            << "\nrunNumber;            " << std::dec << (unsigned int)record->header.runNumber
+            << "\nreserved1;            " << std::hex <<(unsigned int)record->header.reserved1
+            << "\nactivePartitions2;    " << std::hex <<(unsigned int)record->header.activePartitions2
+            << "\nbstReceptionStatus;   " << std::hex <<(unsigned int)record->header.bstReceptionStatus
+            << "\nactivePartitions0;    " << std::hex << (unsigned int)record->header.activePartitions0
+            << "\nactivePartitions1;    " << std::hex <<(unsigned int)record->header.activePartitions1
+            << "\nnibble;               " << std::dec << (unsigned int)record->header.nibble
+            << "\nlumiSection;          " << std::dec << (unsigned int)record->header.lumiSection
+            << "\nnibblesPerLumiSection;" << std::hex <<(unsigned int)record->header.nibblesPerLumiSection
+            << "\ntriggerTypeFlags;     " << std::hex <<(unsigned int)record->header.triggerTypeFlags
+            << "\nreserved5;            " << std::hex <<(unsigned int)record->header.reserved5
+            << "\ninputs;               " << std::hex <<(unsigned int)record->header.inputs
+            << "\nbxid;                 " << std::dec << (unsigned int)record->header.bxid
+            << "\norbitLow;             " << std::dec << (unsigned int)record->header.orbitLow
+            << "\norbitHigh;            " << std::dec << (unsigned int)record->header.orbitHigh
+            << "\ntriggerCount;         " << std::dec << (uint64_t)record->header.triggerCount
+            << "\neventNumber;          " << std::dec << (uint64_t)record->header.eventNumber
+            << std::endl;
 
         std::ostringstream osl1ah;
         osl1ah << "====================l1a history===================";
diff --git a/FWCore/Catalog/interface/FileLocator.h b/FWCore/Catalog/interface/FileLocator.h
index aec8eace25740..fae8549e4f42a 100644
--- a/FWCore/Catalog/interface/FileLocator.h
+++ b/FWCore/Catalog/interface/FileLocator.h
@@ -11,7 +11,6 @@
 namespace edm {
 
   class FileLocator {
-
   public:
     explicit FileLocator(std::string const& catUrl, bool fallback);
     ~FileLocator();
@@ -37,8 +36,7 @@ namespace edm {
 
     void init(std::string const& catUrl, bool fallback);
 
-    void parseRule(xercesc::DOMNode* ruleNode,
-                   ProtocolRules& rules);
+    void parseRule(xercesc::DOMNode* ruleNode, ProtocolRules& rules);
 
     std::string applyRules(ProtocolRules const& protocolRules,
                            std::string const& protocol,
@@ -53,11 +51,11 @@ namespace edm {
     /** Inverse rules are used to do the mapping from PFN to LFN*/
     ProtocolRules m_inverseRules;
 
-    std::string                 m_fileType;
-    std::string                 m_filename;
-    std::vector<std::string>    m_protocols;
-    std::string                 m_destination;
+    std::string m_fileType;
+    std::string m_filename;
+    std::vector<std::string> m_protocols;
+    std::string m_destination;
   };
-}
+}  // namespace edm
 
-#endif //  FWCore_Catalog_FileLocator_h
+#endif  //  FWCore_Catalog_FileLocator_h
diff --git a/FWCore/Catalog/interface/InputFileCatalog.h b/FWCore/Catalog/interface/InputFileCatalog.h
index 694b19ac2f8f7..808a3f9214a9d 100644
--- a/FWCore/Catalog/interface/InputFileCatalog.h
+++ b/FWCore/Catalog/interface/InputFileCatalog.h
@@ -16,10 +16,12 @@ namespace edm {
   class FileCatalogItem {
   public:
     FileCatalogItem() : pfn_(), lfn_(), fallbackPfn_() {}
-    FileCatalogItem(std::string const& pfn, std::string const& lfn, std::string const& fallbackPfn) : pfn_(pfn), lfn_(lfn), fallbackPfn_(fallbackPfn) {}
-    std::string const& fileName() const {return pfn_;}
-    std::string const& logicalFileName() const {return lfn_;}
-    std::string const& fallbackFileName() const {return fallbackPfn_;}
+    FileCatalogItem(std::string const& pfn, std::string const& lfn, std::string const& fallbackPfn)
+        : pfn_(pfn), lfn_(lfn), fallbackPfn_(fallbackPfn) {}
+    std::string const& fileName() const { return pfn_; }
+    std::string const& logicalFileName() const { return lfn_; }
+    std::string const& fallbackFileName() const { return fallbackPfn_; }
+
   private:
     std::string pfn_;
     std::string lfn_;
@@ -28,21 +30,24 @@ namespace edm {
 
   class InputFileCatalog {
   public:
-    InputFileCatalog(std::vector<std::string> const& fileNames, std::string const& override, bool useLFNasPFNifLFNnotFound = false);
-    InputFileCatalog(std::vector<std::string> const& fileNames, std::string const& override, std::string const& overrideFallback, bool useLFNasPFNifLFNnotFound = false);
+    InputFileCatalog(std::vector<std::string> const& fileNames,
+                     std::string const& override,
+                     bool useLFNasPFNifLFNnotFound = false);
+    InputFileCatalog(std::vector<std::string> const& fileNames,
+                     std::string const& override,
+                     std::string const& overrideFallback,
+                     bool useLFNasPFNifLFNnotFound = false);
     ~InputFileCatalog();
-    std::vector<FileCatalogItem> const& fileCatalogItems() const {return fileCatalogItems_;}
-    std::vector<std::string> const& logicalFileNames() const {return logicalFileNames_;}
-    std::vector<std::string> const& fileNames() const {return fileNames_;}
-    std::vector<std::string> const& fallbackFileNames() const {return fallbackFileNames_;}
-    bool empty() const {return fileCatalogItems_.empty();}
-    static bool isPhysical(std::string const& name) {
-      return (name.empty() || name.find(':') != std::string::npos);
-    }
-    
+    std::vector<FileCatalogItem> const& fileCatalogItems() const { return fileCatalogItems_; }
+    std::vector<std::string> const& logicalFileNames() const { return logicalFileNames_; }
+    std::vector<std::string> const& fileNames() const { return fileNames_; }
+    std::vector<std::string> const& fallbackFileNames() const { return fallbackFileNames_; }
+    bool empty() const { return fileCatalogItems_.empty(); }
+    static bool isPhysical(std::string const& name) { return (name.empty() || name.find(':') != std::string::npos); }
+
   private:
     void init(std::string const& override, std::string const& overrideFallback, bool useLFNasPFNifLFNnotFound);
-    void findFile(std::string & pfn, std::string & fallbackPfn, std::string const& lfn, bool useLFNasPFNifLFNnotFound);
+    void findFile(std::string& pfn, std::string& fallbackPfn, std::string const& lfn, bool useLFNasPFNifLFNnotFound);
     std::vector<std::string> logicalFileNames_;
     std::vector<std::string> fileNames_;
     std::vector<std::string> fallbackFileNames_;
@@ -52,6 +57,6 @@ namespace edm {
     edm::propagate_const<std::unique_ptr<FileLocator>> fallbackFileLocator_;
     edm::propagate_const<std::unique_ptr<FileLocator>> overrideFallbackFileLocator_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Catalog/interface/SiteLocalConfig.h b/FWCore/Catalog/interface/SiteLocalConfig.h
index a346d827b4d87..e9e5c8aaa1230 100644
--- a/FWCore/Catalog/interface/SiteLocalConfig.h
+++ b/FWCore/Catalog/interface/SiteLocalConfig.h
@@ -2,18 +2,18 @@
 #define FWCore_Catalog_SiteLocalConfig_h
 
 // INCLUDES
-# include <set>
-# include <string>
-# include <vector>
-# include <netdb.h>
+#include <set>
+#include <string>
+#include <vector>
+#include <netdb.h>
 
 // PUBLIC DEFINES
 // PUBLIC CONSTANTS
 // PUBLIC TYPES
 namespace edm {
-    class ParameterSet;
-    class ActivityRegistry;
-}
+  class ParameterSet;
+  class ActivityRegistry;
+}  // namespace edm
 
 // PUBLIC VARIABLES
 // PUBLIC FUNCTIONS
@@ -22,13 +22,13 @@ namespace edm {
 namespace edm {
   class SiteLocalConfig {
   public:
-    SiteLocalConfig () {}
+    SiteLocalConfig() {}
     virtual ~SiteLocalConfig() {}
 
-    virtual std::string const dataCatalog (void) const = 0;
-    virtual std::string const fallbackDataCatalog (void) const = 0;
-    virtual std::string const lookupCalibConnect (std::string const& input) const = 0;
-    virtual std::string const rfioType (void) const = 0;
+    virtual std::string const dataCatalog(void) const = 0;
+    virtual std::string const fallbackDataCatalog(void) const = 0;
+    virtual std::string const lookupCalibConnect(std::string const& input) const = 0;
+    virtual std::string const rfioType(void) const = 0;
 
     virtual std::string const* sourceCacheTempDir() const = 0;
     virtual double const* sourceCacheMinFree() const = 0;
@@ -40,17 +40,17 @@ namespace edm {
     virtual bool enablePrefetching() const = 0;
     virtual unsigned int debugLevel() const = 0;
     virtual std::vector<std::string> const* sourceNativeProtocols() const = 0;
-    virtual struct addrinfo const * statisticsDestination() const = 0;
+    virtual struct addrinfo const* statisticsDestination() const = 0;
     virtual std::set<std::string> const* statisticsInfo() const = 0;
-    virtual std::string const& siteName (void) const = 0;
+    virtual std::string const& siteName(void) const = 0;
 
     // implicit copy constructor
     // implicit assignment operator
   private:
   };
-}
+}  // namespace edm
 
 // INLINE PUBLIC FUNCTIONS
 // INLINE MEMBER FUNCTIONS
 
-#endif //FWCore_Catalog_SiteLocalConfig_h
+#endif  //FWCore_Catalog_SiteLocalConfig_h
diff --git a/FWCore/Catalog/src/FileLocator.cc b/FWCore/Catalog/src/FileLocator.cc
index 4dfc428f9e7a6..ac6ff158e76f5 100644
--- a/FWCore/Catalog/src/FileLocator.cc
+++ b/FWCore/Catalog/src/FileLocator.cc
@@ -20,9 +20,7 @@ using namespace cms::xerces;
 
 namespace {
 
-  std::string
-  replaceWithRegexp(std::smatch const& matches,
-                    std::string const& outputFormat) {
+  std::string replaceWithRegexp(std::smatch const& matches, std::string const& outputFormat) {
     std::string result = outputFormat;
     std::stringstream str;
 
@@ -38,27 +36,25 @@ namespace {
     // std::cerr << "Final string: " << result << std::endl;
     return result;
   }
-}
+}  // namespace
 
 namespace edm {
 
   int FileLocator::s_numberOfInstances = 0;
 
-  FileLocator::FileLocator(std::string const& catUrl, bool fallback)
-    : m_destination("any") {
+  FileLocator::FileLocator(std::string const& catUrl, bool fallback) : m_destination("any") {
     try {
       //  << "Xerces-c initialization Number "
       //   << s_numberOfInstances <<
       if (s_numberOfInstances == 0) {
         cms::concurrency::xercesInitialize();
       }
-    }
-    catch (XMLException const& e) {
+    } catch (XMLException const& e) {
       // << "Xerces-c error in initialization \n"
       //      << "Exception message is:  \n"
       //      << toString(e.getMessage()) <<
-      throw
-        cms::Exception("TrivialFileCatalog", std::string("Fatal Error on edm::FileLocator:")+ toString(e.getMessage()));
+      throw cms::Exception("TrivialFileCatalog",
+                           std::string("Fatal Error on edm::FileLocator:") + toString(e.getMessage()));
     }
     ++s_numberOfInstances;
 
@@ -68,21 +64,13 @@ namespace edm {
     // std::cout << m_directRules[m_protocols[0]].size() << " rules" << std::endl;
   }
 
-  FileLocator::~FileLocator()
-  {}
+  FileLocator::~FileLocator() {}
 
-  std::string
-  FileLocator::pfn(std::string const& ilfn) const {
-    return convert(ilfn, m_directRules, true);
-  }
+  std::string FileLocator::pfn(std::string const& ilfn) const { return convert(ilfn, m_directRules, true); }
 
-  std::string
-  FileLocator::lfn(std::string const& ipfn) const {
-    return convert(ipfn, m_inverseRules, false);
-  }
+  std::string FileLocator::lfn(std::string const& ipfn) const { return convert(ipfn, m_inverseRules, false); }
 
-  std::string
-  FileLocator::convert(std::string const& input, ProtocolRules const& rules, bool direct) const {
+  std::string FileLocator::convert(std::string const& input, ProtocolRules const& rules, bool direct) const {
     std::string out = "";
 
     for (size_t pi = 0, pe = m_protocols.size(); pi != pe; ++pi) {
@@ -93,15 +81,14 @@ namespace edm {
     return out;
   }
 
-  void
-  FileLocator::parseRule(DOMNode* ruleNode, ProtocolRules& rules) {
+  void FileLocator::parseRule(DOMNode* ruleNode, ProtocolRules& rules) {
     if (!ruleNode) {
       throw cms::Exception("TrivialFileCatalog", std::string("TrivialFileCatalog::connect: Malformed trivial catalog"));
     }
 
     // ruleNode is actually always a DOMElement because it's the result of
     // a `getElementsByTagName()` in the calling method.
-    DOMElement* ruleElement = static_cast<DOMElement *>(ruleNode);
+    DOMElement* ruleElement = static_cast<DOMElement*>(ruleNode);
 
     std::string const protocol = toString(ruleElement->getAttribute(uStr("protocol").ptr()));
     std::string destinationMatchRegexp = toString(ruleElement->getAttribute(uStr("destination-match").ptr()));
@@ -110,12 +97,9 @@ namespace edm {
       destinationMatchRegexp = ".*";
     }
 
-    std::string const pathMatchRegexp
-      = toString(ruleElement->getAttribute(uStr("path-match").ptr()));
-    std::string const result
-      = toString(ruleElement->getAttribute(uStr("result").ptr()));
-    std::string const chain
-      = toString(ruleElement->getAttribute(uStr("chain").ptr()));
+    std::string const pathMatchRegexp = toString(ruleElement->getAttribute(uStr("path-match").ptr()));
+    std::string const result = toString(ruleElement->getAttribute(uStr("result").ptr()));
+    std::string const chain = toString(ruleElement->getAttribute(uStr("chain").ptr()));
 
     Rule rule;
     rule.pathMatch.assign(pathMatchRegexp);
@@ -125,14 +109,13 @@ namespace edm {
     rules[protocol].push_back(rule);
   }
 
-  void
-  FileLocator::init(std::string const& catUrl, bool fallback) {
+  void FileLocator::init(std::string const& catUrl, bool fallback) {
     std::string m_url = catUrl;
-      
+
     if (m_url.empty()) {
       Service<SiteLocalConfig> localconfservice;
       if (!localconfservice.isAvailable())
-              throw cms::Exception("TrivialFileCatalog", "edm::SiteLocalConfigService is not available");
+        throw cms::Exception("TrivialFileCatalog", "edm::SiteLocalConfigService is not available");
 
       m_url = (fallback ? localconfservice->fallbackDataCatalog() : localconfservice->dataCatalog());
     }
@@ -140,7 +123,8 @@ namespace edm {
     // std::cout << "Connecting to the catalog " << m_url << std::endl;
 
     if (m_url.find("file:") == std::string::npos) {
-      throw cms::Exception("TrivialFileCatalog", "TrivialFileCatalog::connect: Malformed url for file catalog configuration");
+      throw cms::Exception("TrivialFileCatalog",
+                           "TrivialFileCatalog::connect: Malformed url for file catalog configuration");
     }
 
     m_url = m_url.erase(0, m_url.find(":") + 1);
@@ -163,7 +147,8 @@ namespace edm {
         boost::algorithm::split(argTokens, option, boost::is_any_of(equalSign));
 
         if (argTokens.size() != 2) {
-          throw  cms::Exception("TrivialFileCatalog", "TrivialFileCatalog::connect: Malformed url for file catalog configuration");
+          throw cms::Exception("TrivialFileCatalog",
+                               "TrivialFileCatalog::connect: Malformed url for file catalog configuration");
         }
 
         if (argTokens[0] == "protocol") {
@@ -175,7 +160,8 @@ namespace edm {
     }
 
     if (m_protocols.empty()) {
-      throw cms::Exception("TrivialFileCatalog", "TrivialFileCatalog::connect: protocol was not supplied in the contact string");
+      throw cms::Exception("TrivialFileCatalog",
+                           "TrivialFileCatalog::connect: protocol was not supplied in the contact string");
     }
 
     std::ifstream configFile;
@@ -185,7 +171,8 @@ namespace edm {
     // std::cout << "Using catalog configuration " << m_filename << std::endl;
 
     if (!configFile.good() || !configFile.is_open()) {
-      throw cms::Exception("TrivialFileCatalog", "TrivialFileCatalog::connect: Unable to open trivial file catalog " + m_filename);
+      throw cms::Exception("TrivialFileCatalog",
+                           "TrivialFileCatalog::connect: Unable to open trivial file catalog " + m_filename);
     }
 
     configFile.close();
@@ -212,39 +199,37 @@ namespace edm {
 
       /*first of all do the lfn-to-pfn bit*/
       {
-	DOMNodeList* rules = doc->getElementsByTagName(uStr("lfn-to-pfn").ptr());
-	XMLSize_t const ruleTagsNum = rules->getLength();
+        DOMNodeList* rules = doc->getElementsByTagName(uStr("lfn-to-pfn").ptr());
+        XMLSize_t const ruleTagsNum = rules->getLength();
 
-	// FIXME: we should probably use a DTD for checking validity
+        // FIXME: we should probably use a DTD for checking validity
 
-	for (XMLSize_t i = 0; i < ruleTagsNum; ++i) {
-	  DOMNode* ruleNode = rules->item(i);
-	  parseRule(ruleNode, m_directRules);
-	}
+        for (XMLSize_t i = 0; i < ruleTagsNum; ++i) {
+          DOMNode* ruleNode = rules->item(i);
+          parseRule(ruleNode, m_directRules);
+        }
       }
       /*Then we handle the pfn-to-lfn bit*/
       {
-	DOMNodeList* rules = doc->getElementsByTagName(uStr("pfn-to-lfn").ptr());
-	XMLSize_t ruleTagsNum = rules->getLength();
-	
-	for (XMLSize_t i = 0; i < ruleTagsNum; ++i) {
-	  DOMNode* ruleNode = rules->item(i);
-	  parseRule(ruleNode, m_inverseRules);
-	}
+        DOMNodeList* rules = doc->getElementsByTagName(uStr("pfn-to-lfn").ptr());
+        XMLSize_t ruleTagsNum = rules->getLength();
+
+        for (XMLSize_t i = 0; i < ruleTagsNum; ++i) {
+          DOMNode* ruleNode = rules->item(i);
+          parseRule(ruleNode, m_inverseRules);
+        }
       }
-    }
-    catch (xercesc::DOMException const& e) {
-      throw cms::Exception("TrivialFileCatalog") << "Xerces XML parser threw this exception: " << cStr(e.getMessage()).ptr() << std::endl;
+    } catch (xercesc::DOMException const& e) {
+      throw cms::Exception("TrivialFileCatalog")
+          << "Xerces XML parser threw this exception: " << cStr(e.getMessage()).ptr() << std::endl;
     }
   }
 
-  std::string
-  FileLocator::applyRules(ProtocolRules const& protocolRules,
-                          std::string const& protocol,
-                          std::string const& destination,
-                          bool direct,
-                          std::string name) const {
-
+  std::string FileLocator::applyRules(ProtocolRules const& protocolRules,
+                                      std::string const& protocol,
+                                      std::string const& destination,
+                                      bool direct,
+                                      std::string name) const {
     // std::cerr << "Calling apply rules with protocol: " << protocol << "\n destination: " << destination << "\n " << " on name " << name << std::endl;
 
     ProtocolRules::const_iterator const rulesIterator = protocolRules.find(protocol);
@@ -259,7 +244,6 @@ namespace edm {
 
     /* Look up for a matching rule*/
     for (Rules::const_iterator i = rules.begin(); i != rules.end(); ++i) {
-
       if (!std::regex_match(destination, destinationMatches, i->destinationMatch)) {
         continue;
       }
@@ -271,7 +255,7 @@ namespace edm {
       // std::cerr << "Rule " << i->pathMatch << "matched! " << std::endl;
 
       std::string const chain = i->chain;
-      if ((direct == true) && (chain != "")) {
+      if ((direct == true) && (!chain.empty())) {
         name = applyRules(protocolRules, chain, destination, direct, name);
         if (name.empty()) {
           return "";
@@ -281,11 +265,11 @@ namespace edm {
       std::regex_match(name, nameMatches, i->pathMatch);
       name = replaceWithRegexp(nameMatches, i->result);
 
-      if ((direct == false) && (chain != "")) {
+      if ((direct == false) && (!chain.empty())) {
         name = applyRules(protocolRules, chain, destination, direct, name);
       }
       return name;
     }
     return "";
   }
-}
+}  // namespace edm
diff --git a/FWCore/Catalog/src/InputFileCatalog.cc b/FWCore/Catalog/src/InputFileCatalog.cc
index e583a2113ff2f..dc0d7509ff162 100644
--- a/FWCore/Catalog/src/InputFileCatalog.cc
+++ b/FWCore/Catalog/src/InputFileCatalog.cc
@@ -11,68 +11,79 @@
 
 namespace edm {
 
-  InputFileCatalog::InputFileCatalog(std::vector<std::string> const& fileNames, std::string const& override, bool useLFNasPFNifLFNnotFound) :
-    logicalFileNames_(fileNames),
-    fileNames_(fileNames),
-    fallbackFileNames_(fileNames.size()),
-    fileCatalogItems_(),
-    fileLocator_(),
-    overrideFileLocator_(),
-    fallbackFileLocator_(),
-    overrideFallbackFileLocator_() {
-
+  InputFileCatalog::InputFileCatalog(std::vector<std::string> const& fileNames,
+                                     std::string const& override,
+                                     bool useLFNasPFNifLFNnotFound)
+      : logicalFileNames_(fileNames),
+        fileNames_(fileNames),
+        fallbackFileNames_(fileNames.size()),
+        fileCatalogItems_(),
+        fileLocator_(),
+        overrideFileLocator_(),
+        fallbackFileLocator_(),
+        overrideFallbackFileLocator_() {
     init(override, "", useLFNasPFNifLFNnotFound);
   }
 
-  InputFileCatalog::InputFileCatalog(std::vector<std::string> const& fileNames, std::string const& override, std::string const& overrideFallback, bool useLFNasPFNifLFNnotFound) :
-    logicalFileNames_(fileNames),
-    fileNames_(fileNames),
-    fallbackFileNames_(fileNames.size()),
-    fileCatalogItems_(),
-    fileLocator_(),
-    overrideFileLocator_(),
-    fallbackFileLocator_(),
-    overrideFallbackFileLocator_() {
-
+  InputFileCatalog::InputFileCatalog(std::vector<std::string> const& fileNames,
+                                     std::string const& override,
+                                     std::string const& overrideFallback,
+                                     bool useLFNasPFNifLFNnotFound)
+      : logicalFileNames_(fileNames),
+        fileNames_(fileNames),
+        fallbackFileNames_(fileNames.size()),
+        fileCatalogItems_(),
+        fileLocator_(),
+        overrideFileLocator_(),
+        fallbackFileLocator_(),
+        overrideFallbackFileLocator_() {
     init(override, overrideFallback, useLFNasPFNifLFNnotFound);
   }
 
   InputFileCatalog::~InputFileCatalog() {}
 
-  void InputFileCatalog::init(std::string const& inputOverride, std::string const& inputOverrideFallback, bool useLFNasPFNifLFNnotFound) {
-
+  void InputFileCatalog::init(std::string const& inputOverride,
+                              std::string const& inputOverrideFallback,
+                              bool useLFNasPFNifLFNnotFound) {
     fileCatalogItems_.reserve(fileNames_.size());
     typedef std::vector<std::string>::iterator iter;
-    for(iter it = fileNames_.begin(), lt = logicalFileNames_.begin(), itEnd = fileNames_.end(), ft = fallbackFileNames_.begin();
-        it != itEnd; ++it, ++lt, ++ft) {
+    for (iter it = fileNames_.begin(),
+              lt = logicalFileNames_.begin(),
+              itEnd = fileNames_.end(),
+              ft = fallbackFileNames_.begin();
+         it != itEnd;
+         ++it, ++lt, ++ft) {
       boost::trim(*it);
       if (it->empty()) {
         throw Exception(errors::Configuration, "InputFileCatalog::InputFileCatalog()\n")
-          << "An empty string specified in the fileNames parameter for input source.\n";
+            << "An empty string specified in the fileNames parameter for input source.\n";
       }
       if (isPhysical(*it)) {
-        if(it->back() == ':') {
+        if (it->back() == ':') {
           throw Exception(errors::Configuration, "InputFileCatalog::InputFileCatalog()\n")
-            << "An empty physical file name specified in the fileNames parameter for input source.\n";
+              << "An empty physical file name specified in the fileNames parameter for input source.\n";
         }
         // Clear the LFN.
         lt->clear();
       } else {
         if (!fileLocator_) {
-          fileLocator_ = std::make_unique<FileLocator>("", false); // propagate_const<T> has no reset() function
+          fileLocator_ = std::make_unique<FileLocator>("", false);  // propagate_const<T> has no reset() function
         }
         if (!overrideFileLocator_ && !inputOverride.empty()) {
-          overrideFileLocator_ = std::make_unique<FileLocator>(inputOverride, false); // propagate_const<T> has no reset() function
+          overrideFileLocator_ =
+              std::make_unique<FileLocator>(inputOverride, false);  // propagate_const<T> has no reset() function
         }
         if (!fallbackFileLocator_) {
           try {
-            fallbackFileLocator_ = std::make_unique<FileLocator>("", true); // propagate_const<T> has no reset() function
+            fallbackFileLocator_ =
+                std::make_unique<FileLocator>("", true);  // propagate_const<T> has no reset() function
           } catch (cms::Exception const& e) {
             // No valid fallback locator is OK too.
           }
         }
         if (!overrideFallbackFileLocator_ && !inputOverrideFallback.empty()) {
-          overrideFallbackFileLocator_ = std::make_unique<FileLocator>(inputOverrideFallback, true); // propagate_const<T> has no reset() function
+          overrideFallbackFileLocator_ =
+              std::make_unique<FileLocator>(inputOverrideFallback, true);  // propagate_const<T> has no reset() function
         }
         boost::trim(*lt);
         findFile(*it, *ft, *lt, useLFNasPFNifLFNnotFound);
@@ -81,7 +92,10 @@ namespace edm {
     }
   }
 
-  void InputFileCatalog::findFile(std::string& pfn, std::string& fallbackPfn, std::string const& lfn, bool useLFNasPFNifLFNnotFound) {
+  void InputFileCatalog::findFile(std::string& pfn,
+                                  std::string& fallbackPfn,
+                                  std::string const& lfn,
+                                  bool useLFNasPFNifLFNnotFound) {
     if (overrideFileLocator_) {
       pfn = overrideFileLocator_->pfn(lfn);
       if (pfn.empty()) {
@@ -105,4 +119,4 @@ namespace edm {
       // Empty fallback PFN is OK.
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/Catalog/test/FileLocator_t.cpp b/FWCore/Catalog/test/FileLocator_t.cpp
index 33ca8e067889e..76628d75bfb68 100644
--- a/FWCore/Catalog/test/FileLocator_t.cpp
+++ b/FWCore/Catalog/test/FileLocator_t.cpp
@@ -8,15 +8,14 @@
 #include <iostream>
 
 int main() {
-
   try {
     edmplugin::PluginManager::configure(edmplugin::standard::config());
 
     std::string config =
-      "import FWCore.ParameterSet.Config as cms\n"
-      "process = cms.Process('edmFileUtil')\n"
-      "process.InitRootHandlers = cms.Service('InitRootHandlers')\n"
-      "process.SiteLocalConfigService = cms.Service('SiteLocalConfigService')\n";
+        "import FWCore.ParameterSet.Config as cms\n"
+        "process = cms.Process('edmFileUtil')\n"
+        "process.InitRootHandlers = cms.Service('InitRootHandlers')\n"
+        "process.SiteLocalConfigService = cms.Service('SiteLocalConfigService')\n";
 
     //create the services
     std::unique_ptr<edm::ParameterSet> params;
@@ -29,72 +28,66 @@ int main() {
     {
       edm::FileLocator fl("", false);
 
-      const char * lfn[] = {
-      "/store/group/bha/bho",
-      "/bha/bho",
-      "bha",
-      "file:bha",
-      "file:/bha/bho",
-      "/castor/cern.ch/cms/bha/bho",
-      "rfio:/castor/cern.ch/cms/bha/bho",
-      "rfio:/bha/bho"
-      };
-      int nfile=8;
-    
+      const char* lfn[] = {"/store/group/bha/bho",
+                           "/bha/bho",
+                           "bha",
+                           "file:bha",
+                           "file:/bha/bho",
+                           "/castor/cern.ch/cms/bha/bho",
+                           "rfio:/castor/cern.ch/cms/bha/bho",
+                           "rfio:/bha/bho"};
+      int nfile = 8;
+
       std::cout << "lfn2pfn" << std::endl;
-      for (int i=0; i<nfile; ++i)
+      for (int i = 0; i < nfile; ++i)
         std::cout << lfn[i] << " -> " << fl.pfn(lfn[i]) << std::endl;
-    
+
       std::cout << "pfn2lfn" << std::endl;
-      for (int i=0; i<nfile; ++i)
+      for (int i = 0; i < nfile; ++i)
         std::cout << lfn[i] << " -> " << fl.lfn(lfn[i]) << std::endl;
-   }
+    }
 
     {
-      
       std::string CMSSW_BASE(std::getenv("CMSSW_BASE"));
       std::string CMSSW_RELEASE_BASE(std::getenv("CMSSW_RELEASE_BASE"));
       std::string file_name("/src/FWCore/Catalog/test/override_catalog.xml");
-      std::string full_file_name = boost::filesystem::exists((CMSSW_BASE+file_name).c_str()) ? CMSSW_BASE+file_name : CMSSW_RELEASE_BASE+file_name;
-      
-      edm::FileLocator fl(("trivialcatalog_file:"+full_file_name+"?protocol=override").c_str(), false);
-      
-      const char * lfn[] = {
-      "/store/unmerged/relval/CMSSW_3_8_0_pre3/RelValZTT/GEN-SIM-DIGI-RAW-HLTDEBUG/START38_V2-v1/0666/80EC0BCD-D279-DF11-B1DB-0030487C90EE.root",
-      "/store/group/bha/bho",
-      "/bha/bho",
-      "bha",
-      "file:bha",
-      "file:/bha/bho",
-      "/castor/cern.ch/cms/bha/bho",
-      "rfio:/castor/cern.ch/cms/bha/bho",
-      "rfio:/bha/bho"
-      };
-      int nfile=9;
-    
+      std::string full_file_name = boost::filesystem::exists((CMSSW_BASE + file_name).c_str())
+                                       ? CMSSW_BASE + file_name
+                                       : CMSSW_RELEASE_BASE + file_name;
+
+      edm::FileLocator fl(("trivialcatalog_file:" + full_file_name + "?protocol=override").c_str(), false);
+
+      const char* lfn[] = {
+          "/store/unmerged/relval/CMSSW_3_8_0_pre3/RelValZTT/GEN-SIM-DIGI-RAW-HLTDEBUG/START38_V2-v1/0666/"
+          "80EC0BCD-D279-DF11-B1DB-0030487C90EE.root",
+          "/store/group/bha/bho",
+          "/bha/bho",
+          "bha",
+          "file:bha",
+          "file:/bha/bho",
+          "/castor/cern.ch/cms/bha/bho",
+          "rfio:/castor/cern.ch/cms/bha/bho",
+          "rfio:/bha/bho"};
+      int nfile = 9;
+
       std::cout << "lfn2pfn" << std::endl;
-      for (int i=0; i<nfile; ++i)
+      for (int i = 0; i < nfile; ++i)
         std::cout << lfn[i] << " -> " << fl.pfn(lfn[i]) << std::endl;
-    
+
       std::cout << "pfn2lfn" << std::endl;
-      for (int i=0; i<nfile; ++i)
+      for (int i = 0; i < nfile; ++i)
         std::cout << lfn[i] << " -> " << fl.lfn(lfn[i]) << std::endl;
-   }
-
+    }
 
-  } 
-  catch (cms::Exception const & e) {
-    std::cout << e.what()  << std::endl;
+  } catch (cms::Exception const& e) {
+    std::cout << e.what() << std::endl;
     return 1;
   }
-  
+
   catch (...) {
     std::cout << "got a problem..." << std::endl;
     return 1;
   }
 
-
-
   return 0;
-
 }
diff --git a/FWCore/Common/interface/EventBase.h b/FWCore/Common/interface/EventBase.h
index 9c851f184e46f..754fc2b460b0b 100644
--- a/FWCore/Common/interface/EventBase.h
+++ b/FWCore/Common/interface/EventBase.h
@@ -37,82 +37,79 @@
 
 namespace edm {
 
-   class ProcessHistory;
-   class ProductID;
-   class TriggerResults;
-   class TriggerNames;
-   class ParameterSet;
-
-   class EventBase {
-
-   public:
-      EventBase();
-      virtual ~EventBase();
-
-      // ---------- const member functions ---------------------
-      template<typename T>
-      bool getByLabel(InputTag const&, Handle<T>&) const;
-
-      template<typename T>
-      bool get(ProductID const&, Handle<T>&) const;
-
-      // AUX functions.
-      edm::EventID id() const {return eventAuxiliary().id();}
-      edm::Timestamp time() const {return eventAuxiliary().time();}
-      edm::LuminosityBlockNumber_t
-      luminosityBlock() const {return eventAuxiliary().luminosityBlock();}
-      bool isRealData() const {return eventAuxiliary().isRealData();}
-      edm::EventAuxiliary::ExperimentType experimentType() const {return eventAuxiliary().experimentType();}
-      int bunchCrossing() const {return eventAuxiliary().bunchCrossing();}
-      int orbitNumber() const {return eventAuxiliary().orbitNumber();}
-      virtual edm::EventAuxiliary const& eventAuxiliary() const = 0;
-
-      virtual TriggerNames const& triggerNames(edm::TriggerResults const& triggerResults) const = 0;
-      virtual TriggerResultsByName triggerResultsByName(edm::TriggerResults const& triggerResults) const = 0;
-      virtual ProcessHistory const& processHistory() const = 0;
-
-      virtual edm::ParameterSet const* parameterSet(edm::ParameterSetID const& psID) const = 0;
-   protected:
-
-      static TriggerNames const* triggerNames_(edm::TriggerResults const& triggerResults);
-
-      static edm::ParameterSet const* parameterSetForID_(edm::ParameterSetID const& psID);
-
-   private:
-      //EventBase(EventBase const&); // allow default
-
-      //EventBase const& operator=(EventBase const&); // allow default
-
-      virtual BasicHandle getByLabelImpl(std::type_info const& iWrapperType, std::type_info const& iProductType, InputTag const& iTag) const = 0;
-      virtual BasicHandle getImpl(std::type_info const& iProductType, ProductID const& iTag) const = 0;
-      // ---------- member data --------------------------------
-
-   };
-
-   template<typename T>
-   bool
-   EventBase::getByLabel(InputTag const& tag, Handle<T>& result) const {
-      result.clear();
-      BasicHandle bh = this->getByLabelImpl(typeid(edm::Wrapper<T>), typeid(T), tag);
-     result = convert_handle<T>(std::move(bh));
-      if (result.failedToGet()) {
-         return false;
-      }
-      return true;
-   }
-
-   template<typename T>
-   bool
-   EventBase::get(ProductID const& pid, Handle<T>& result) const {
-      result.clear();
-      BasicHandle bh = this->getImpl(typeid(T), pid);
-      result = convert_handle_check_type<T>(std::move(bh));
-      if (result.failedToGet()) {
-         return false;
-      }
-      return true;
-   }
-  
-}
+  class ProcessHistory;
+  class ProductID;
+  class TriggerResults;
+  class TriggerNames;
+  class ParameterSet;
+
+  class EventBase {
+  public:
+    EventBase();
+    virtual ~EventBase();
+
+    // ---------- const member functions ---------------------
+    template <typename T>
+    bool getByLabel(InputTag const&, Handle<T>&) const;
+
+    template <typename T>
+    bool get(ProductID const&, Handle<T>&) const;
+
+    // AUX functions.
+    edm::EventID id() const { return eventAuxiliary().id(); }
+    edm::Timestamp time() const { return eventAuxiliary().time(); }
+    edm::LuminosityBlockNumber_t luminosityBlock() const { return eventAuxiliary().luminosityBlock(); }
+    bool isRealData() const { return eventAuxiliary().isRealData(); }
+    edm::EventAuxiliary::ExperimentType experimentType() const { return eventAuxiliary().experimentType(); }
+    int bunchCrossing() const { return eventAuxiliary().bunchCrossing(); }
+    int orbitNumber() const { return eventAuxiliary().orbitNumber(); }
+    virtual edm::EventAuxiliary const& eventAuxiliary() const = 0;
+
+    virtual TriggerNames const& triggerNames(edm::TriggerResults const& triggerResults) const = 0;
+    virtual TriggerResultsByName triggerResultsByName(edm::TriggerResults const& triggerResults) const = 0;
+    virtual ProcessHistory const& processHistory() const = 0;
+
+    virtual edm::ParameterSet const* parameterSet(edm::ParameterSetID const& psID) const = 0;
+
+  protected:
+    static TriggerNames const* triggerNames_(edm::TriggerResults const& triggerResults);
+
+    static edm::ParameterSet const* parameterSetForID_(edm::ParameterSetID const& psID);
+
+  private:
+    //EventBase(EventBase const&); // allow default
+
+    //EventBase const& operator=(EventBase const&); // allow default
+
+    virtual BasicHandle getByLabelImpl(std::type_info const& iWrapperType,
+                                       std::type_info const& iProductType,
+                                       InputTag const& iTag) const = 0;
+    virtual BasicHandle getImpl(std::type_info const& iProductType, ProductID const& iTag) const = 0;
+    // ---------- member data --------------------------------
+  };
+
+  template <typename T>
+  bool EventBase::getByLabel(InputTag const& tag, Handle<T>& result) const {
+    result.clear();
+    BasicHandle bh = this->getByLabelImpl(typeid(edm::Wrapper<T>), typeid(T), tag);
+    result = convert_handle<T>(std::move(bh));
+    if (result.failedToGet()) {
+      return false;
+    }
+    return true;
+  }
+
+  template <typename T>
+  bool EventBase::get(ProductID const& pid, Handle<T>& result) const {
+    result.clear();
+    BasicHandle bh = this->getImpl(typeid(T), pid);
+    result = convert_handle_check_type<T>(std::move(bh));
+    if (result.failedToGet()) {
+      return false;
+    }
+    return true;
+  }
+
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Common/interface/LuminosityBlockBase.h b/FWCore/Common/interface/LuminosityBlockBase.h
index e95e144371971..3b434b2efcae4 100644
--- a/FWCore/Common/interface/LuminosityBlockBase.h
+++ b/FWCore/Common/interface/LuminosityBlockBase.h
@@ -37,48 +37,37 @@ namespace edm {
     virtual ~LuminosityBlockBase();
 
     // AUX functions.
-    LuminosityBlockNumber_t luminosityBlock() const {
-      return luminosityBlockAuxiliary().luminosityBlock();
-    }
+    LuminosityBlockNumber_t luminosityBlock() const { return luminosityBlockAuxiliary().luminosityBlock(); }
 
-    RunNumber_t run() const {
-      return luminosityBlockAuxiliary().run();
-    }
+    RunNumber_t run() const { return luminosityBlockAuxiliary().run(); }
 
-    LuminosityBlockID id() const {
-      return luminosityBlockAuxiliary().id();
-    }
+    LuminosityBlockID id() const { return luminosityBlockAuxiliary().id(); }
 
-    Timestamp const& beginTime() const {
-      return luminosityBlockAuxiliary().beginTime();
-    }
-    Timestamp const& endTime() const {
-      return luminosityBlockAuxiliary().endTime();
-    }
+    Timestamp const& beginTime() const { return luminosityBlockAuxiliary().beginTime(); }
+    Timestamp const& endTime() const { return luminosityBlockAuxiliary().endTime(); }
 
     virtual edm::LuminosityBlockAuxiliary const& luminosityBlockAuxiliary() const = 0;
 
     /// same as above, but using the InputTag class
-    template<typename PROD>
-    bool
-    getByLabel(InputTag const& tag, Handle<PROD>& result) const;
+    template <typename PROD>
+    bool getByLabel(InputTag const& tag, Handle<PROD>& result) const;
 
   private:
-    virtual BasicHandle getByLabelImpl(std::type_info const& iWrapperType, std::type_info const& iProductType, const InputTag& iTag) const = 0;
-
+    virtual BasicHandle getByLabelImpl(std::type_info const& iWrapperType,
+                                       std::type_info const& iProductType,
+                                       const InputTag& iTag) const = 0;
   };
 
-   template<class T>
-   bool
-   LuminosityBlockBase::getByLabel(const InputTag& tag, Handle<T>& result) const {
-      result.clear();
-      BasicHandle bh = this->getByLabelImpl(typeid(Wrapper<T>), typeid(T), tag);
-      result = convert_handle<T>(std::move(bh));
-      if (result.failedToGet()) {
-         return false;
-      }
-      return true;
-   }
-
-}
+  template <class T>
+  bool LuminosityBlockBase::getByLabel(const InputTag& tag, Handle<T>& result) const {
+    result.clear();
+    BasicHandle bh = this->getByLabelImpl(typeid(Wrapper<T>), typeid(T), tag);
+    result = convert_handle<T>(std::move(bh));
+    if (result.failedToGet()) {
+      return false;
+    }
+    return true;
+  }
+
+}  // namespace edm
 #endif
diff --git a/FWCore/Common/interface/Provenance.h b/FWCore/Common/interface/Provenance.h
index e8dfcd9000bdf..280915e2aef7e 100644
--- a/FWCore/Common/interface/Provenance.h
+++ b/FWCore/Common/interface/Provenance.h
@@ -8,5 +8,5 @@ namespace edm {
   class ParameterSet;
   std::string moduleName(Provenance const& provenance);
   ParameterSet const& parameterSet(Provenance const& provenance);
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Common/interface/RunBase.h b/FWCore/Common/interface/RunBase.h
index b8431cd43c3a1..fa3697db9e491 100644
--- a/FWCore/Common/interface/RunBase.h
+++ b/FWCore/Common/interface/RunBase.h
@@ -36,36 +36,33 @@ namespace edm {
     virtual ~RunBase();
 
     // AUX functions.
-    RunID const& id() const {return runAuxiliary().id();}
-    RunNumber_t run() const {return runAuxiliary().run();}
-    Timestamp const& beginTime() const {return runAuxiliary().beginTime();}
-    Timestamp const& endTime() const {return runAuxiliary().endTime();}
-
+    RunID const& id() const { return runAuxiliary().id(); }
+    RunNumber_t run() const { return runAuxiliary().run(); }
+    Timestamp const& beginTime() const { return runAuxiliary().beginTime(); }
+    Timestamp const& endTime() const { return runAuxiliary().endTime(); }
 
     virtual edm::RunAuxiliary const& runAuxiliary() const = 0;
 
     /// same as above, but using the InputTag class
     template <typename PROD>
-    bool
-    getByLabel(InputTag const& tag, Handle<PROD>& result) const;
+    bool getByLabel(InputTag const& tag, Handle<PROD>& result) const;
 
   private:
-
-    virtual BasicHandle getByLabelImpl(std::type_info const& iWrapperType, std::type_info const& iProductType, InputTag const& iTag) const = 0;
-
+    virtual BasicHandle getByLabelImpl(std::type_info const& iWrapperType,
+                                       std::type_info const& iProductType,
+                                       InputTag const& iTag) const = 0;
   };
 
-   template<typename T>
-   bool
-   RunBase::getByLabel(InputTag const& tag, Handle<T>& result) const {
-      result.clear();
-      BasicHandle bh = this->getByLabelImpl(typeid(Wrapper<T>), typeid(T), tag);
-      result = convert_handle<T>(std::move(bh));
-      if (result.failedToGet()) {
-         return false;
-      }
-      return true;
-   }
-
-}
+  template <typename T>
+  bool RunBase::getByLabel(InputTag const& tag, Handle<T>& result) const {
+    result.clear();
+    BasicHandle bh = this->getByLabelImpl(typeid(Wrapper<T>), typeid(T), tag);
+    result = convert_handle<T>(std::move(bh));
+    if (result.failedToGet()) {
+      return false;
+    }
+    return true;
+  }
+
+}  // namespace edm
 #endif
diff --git a/FWCore/Common/interface/TriggerNames.h b/FWCore/Common/interface/TriggerNames.h
index c38f65740a29c..c6c5f000a485c 100644
--- a/FWCore/Common/interface/TriggerNames.h
+++ b/FWCore/Common/interface/TriggerNames.h
@@ -53,9 +53,7 @@ namespace edm {
   class ParameterSet;
 
   class TriggerNames {
-
   public:
-
     typedef std::vector<std::string> Strings;
     typedef std::map<std::string, unsigned int> IndexMap;
 
@@ -82,11 +80,10 @@ namespace edm {
     ParameterSetID const& parameterSetID() const;
 
   private:
-
     ParameterSetID psetID_;
 
     Strings triggerNames_;
     IndexMap indexMap_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Common/interface/TriggerResultsByName.h b/FWCore/Common/interface/TriggerResultsByName.h
index 6dee066e363eb..ba70fe1fb8cc7 100644
--- a/FWCore/Common/interface/TriggerResultsByName.h
+++ b/FWCore/Common/interface/TriggerResultsByName.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Common
 // Class  :     TriggerResultsByName
-// 
+//
 /**\class TriggerResultsByName TriggerResultsByName.h FWCore/Common/interface/TriggerResultsByName.h
 
  Description: Class which provides methods to access trigger results
@@ -46,11 +46,8 @@ namespace edm {
   class HLTPathStatus;
 
   class TriggerResultsByName {
-
   public:
-
-    TriggerResultsByName(TriggerResults const* triggerResults,
-                         TriggerNames const* triggerNames);
+    TriggerResultsByName(TriggerResults const* triggerResults, TriggerNames const* triggerNames);
 
     bool isValid() const;
 
@@ -63,7 +60,7 @@ namespace edm {
     bool accept() const;
 
     // Has any path encountered an error (exception)
-    bool  error() const;
+    bool error() const;
 
     HLTPathStatus const& at(std::string const& pathName) const;
     HLTPathStatus const& at(unsigned i) const;
@@ -104,7 +101,6 @@ namespace edm {
     std::vector<std::string>::size_type size() const;
 
   private:
-
     unsigned getAndCheckIndex(std::string const& pathName) const;
 
     void throwTriggerResultsMissing() const;
@@ -113,5 +109,5 @@ namespace edm {
     TriggerResults const* triggerResults_;
     TriggerNames const* triggerNames_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Common/src/EventBase.cc b/FWCore/Common/src/EventBase.cc
index a4a0ecd6ca77d..855e25d7f21ca 100644
--- a/FWCore/Common/src/EventBase.cc
+++ b/FWCore/Common/src/EventBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Common
 // Class  :     EventBase
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -25,87 +25,73 @@
 #include "FWCore/ParameterSet/interface/Registry.h"
 
 namespace {
-   struct key_hash {
-      std::size_t operator()(edm::ParameterSetID const& iKey) const{
-         return iKey.smallHash();
-      }
-   };
-   typedef tbb::concurrent_unordered_map<edm::ParameterSetID, edm::TriggerNames, key_hash> TriggerNamesMap;
-   CMS_THREAD_SAFE TriggerNamesMap triggerNamesMap;
-}
+  struct key_hash {
+    std::size_t operator()(edm::ParameterSetID const& iKey) const { return iKey.smallHash(); }
+  };
+  typedef tbb::concurrent_unordered_map<edm::ParameterSetID, edm::TriggerNames, key_hash> TriggerNamesMap;
+  CMS_THREAD_SAFE TriggerNamesMap triggerNamesMap;
+}  // namespace
 
-namespace edm
-{
+namespace edm {
 
-   EventBase::EventBase()
-   {
-   }
+  EventBase::EventBase() {}
 
-   EventBase::~EventBase()
-   {
-   }
+  EventBase::~EventBase() {}
 
-   edm::ParameterSet const*
-   EventBase::parameterSetForID_(edm::ParameterSetID const& iPSID) {
-      return edm::pset::Registry::instance()->getMapped(iPSID);
-   }
+  edm::ParameterSet const* EventBase::parameterSetForID_(edm::ParameterSetID const& iPSID) {
+    return edm::pset::Registry::instance()->getMapped(iPSID);
+  }
 
-   TriggerNames const*
-   EventBase::triggerNames_(edm::TriggerResults const& triggerResults) {
-
-      // If TriggerNames was already created and cached here in the map,
-      // then look it up and return that one
-      TriggerNamesMap::const_iterator iter =
-         triggerNamesMap.find(triggerResults.parameterSetID());
-      if (iter != triggerNamesMap.end()) {
-         return &iter->second;
-      }
+  TriggerNames const* EventBase::triggerNames_(edm::TriggerResults const& triggerResults) {
+    // If TriggerNames was already created and cached here in the map,
+    // then look it up and return that one
+    TriggerNamesMap::const_iterator iter = triggerNamesMap.find(triggerResults.parameterSetID());
+    if (iter != triggerNamesMap.end()) {
+      return &iter->second;
+    }
 
-      // Look for the parameter set containing the trigger names in the parameter
-      // set registry using the ID from TriggerResults as the key used to find it.
-      edm::pset::Registry* psetRegistry = edm::pset::Registry::instance();
-      edm::ParameterSet const* pset=nullptr;
-      if (nullptr!=(pset=psetRegistry->getMapped(triggerResults.parameterSetID()))) {
+    // Look for the parameter set containing the trigger names in the parameter
+    // set registry using the ID from TriggerResults as the key used to find it.
+    edm::pset::Registry* psetRegistry = edm::pset::Registry::instance();
+    edm::ParameterSet const* pset = nullptr;
+    if (nullptr != (pset = psetRegistry->getMapped(triggerResults.parameterSetID()))) {
+      if (pset->existsAs<std::vector<std::string> >("@trigger_paths", true)) {
+        TriggerNames triggerNames(*pset);
 
-	 if (pset->existsAs<std::vector<std::string> >("@trigger_paths", true)) {
-            TriggerNames triggerNames(*pset);
+        // This should never happen
+        if (triggerNames.size() != triggerResults.size()) {
+          throw cms::Exception("LogicError") << "edm::EventBase::triggerNames_ Encountered vector\n"
+                                                "of trigger names and a TriggerResults object with\n"
+                                                "different sizes.  This should be impossible.\n"
+                                                "Please send information to reproduce this problem to\n"
+                                                "the edm developers.\n";
+        }
 
-            // This should never happen
-            if (triggerNames.size() != triggerResults.size()) {
-               throw cms::Exception("LogicError")
-                  << "edm::EventBase::triggerNames_ Encountered vector\n"
-                     "of trigger names and a TriggerResults object with\n"
-                     "different sizes.  This should be impossible.\n"
-                     "Please send information to reproduce this problem to\n"
-                     "the edm developers.\n";
-            }
-
-            std::pair<TriggerNamesMap::iterator, bool> ret =
-               triggerNamesMap.insert(std::pair<edm::ParameterSetID, edm::TriggerNames>(triggerResults.parameterSetID(), triggerNames));
-            return &(ret.first->second);
-         }
+        std::pair<TriggerNamesMap::iterator, bool> ret = triggerNamesMap.insert(
+            std::pair<edm::ParameterSetID, edm::TriggerNames>(triggerResults.parameterSetID(), triggerNames));
+        return &(ret.first->second);
       }
-      // For backward compatibility to very old data
-      if (!triggerResults.getTriggerNames().empty()) {
-	 edm::ParameterSet fakePset;
-         fakePset.addParameter<std::vector<std::string> >("@trigger_paths", triggerResults.getTriggerNames());
-         fakePset.registerIt();
-         TriggerNames triggerNames(fakePset);
-
-         // This should never happen
-         if (triggerNames.size() != triggerResults.size()) {
-            throw cms::Exception("LogicError")
-               << "edm::EventBase::triggerNames_ Encountered vector\n"
-                  "of trigger names and a TriggerResults object with\n"
-                  "different sizes.  This should be impossible.\n"
-                  "Please send information to reproduce this problem to\n"
-                  "the edm developers (2).\n";
-         }
+    }
+    // For backward compatibility to very old data
+    if (!triggerResults.getTriggerNames().empty()) {
+      edm::ParameterSet fakePset;
+      fakePset.addParameter<std::vector<std::string> >("@trigger_paths", triggerResults.getTriggerNames());
+      fakePset.registerIt();
+      TriggerNames triggerNames(fakePset);
 
-         std::pair<TriggerNamesMap::iterator, bool> ret =
-            triggerNamesMap.insert(std::pair<edm::ParameterSetID, edm::TriggerNames>(fakePset.id(), triggerNames));
-         return &(ret.first->second);
+      // This should never happen
+      if (triggerNames.size() != triggerResults.size()) {
+        throw cms::Exception("LogicError") << "edm::EventBase::triggerNames_ Encountered vector\n"
+                                              "of trigger names and a TriggerResults object with\n"
+                                              "different sizes.  This should be impossible.\n"
+                                              "Please send information to reproduce this problem to\n"
+                                              "the edm developers (2).\n";
       }
-      return nullptr;
-   }
-}
+
+      std::pair<TriggerNamesMap::iterator, bool> ret =
+          triggerNamesMap.insert(std::pair<edm::ParameterSetID, edm::TriggerNames>(fakePset.id(), triggerNames));
+      return &(ret.first->second);
+    }
+    return nullptr;
+  }
+}  // namespace edm
diff --git a/FWCore/Common/src/LuminosityBlockBase.cc b/FWCore/Common/src/LuminosityBlockBase.cc
index 62cc13cf3c7dd..0688ed10dea79 100644
--- a/FWCore/Common/src/LuminosityBlockBase.cc
+++ b/FWCore/Common/src/LuminosityBlockBase.cc
@@ -24,21 +24,16 @@
 //#include "FWCore/ParameterSet/interface/ParameterSet.h"
 //#include "FWCore/ParameterSet/interface/Registry.h"
 
-namespace edm
-{
-//    typedef std::map<edm::ParameterSetID, edm::TriggerNames> TriggerNamesMap;
-//    static TriggerNamesMap triggerNamesMap;
-//    static TriggerNamesMap::const_iterator previousTriggerName;
+namespace edm {
+  //    typedef std::map<edm::ParameterSetID, edm::TriggerNames> TriggerNamesMap;
+  //    static TriggerNamesMap triggerNamesMap;
+  //    static TriggerNamesMap::const_iterator previousTriggerName;
 
-   LuminosityBlockBase::LuminosityBlockBase()
-   {
-   }
+  LuminosityBlockBase::LuminosityBlockBase() {}
 
-   LuminosityBlockBase::~LuminosityBlockBase()
-   {
-   }
+  LuminosityBlockBase::~LuminosityBlockBase() {}
 
-/*   TriggerNames const*
+  /*   TriggerNames const*
    EventBase::triggerNames_(edm::TriggerResults const& triggerResults) {
 
       // If the current and previous requests are for the same TriggerNames
@@ -107,4 +102,4 @@ namespace edm
       }
       return 0;
    }*/
-}
+}  // namespace edm
diff --git a/FWCore/Common/src/Provenance.cc b/FWCore/Common/src/Provenance.cc
index e50a254c2798f..66c560025c197 100644
--- a/FWCore/Common/src/Provenance.cc
+++ b/FWCore/Common/src/Provenance.cc
@@ -15,9 +15,9 @@ namespace edm {
     std::string const& label = provenance.moduleLabel();
     if (!processParameterSet.existsAs<ParameterSet>(label)) {
       // Trigger results and input sources are special cases
-      if(label == triggerResults) {
+      if (label == triggerResults) {
         return processParameterSet.getParameterSet("@trigger_paths");
-      } else if(label == source) {
+      } else if (label == source) {
         return processParameterSet.getParameterSet("@main_input");
       }
     }
@@ -26,9 +26,9 @@ namespace edm {
 
   std::string moduleName(Provenance const& provenance) {
     // Trigger results ia a special case
-    if(provenance.moduleLabel() == triggerResults) {
-      return triggerResultsInserter; 
+    if (provenance.moduleLabel() == triggerResults) {
+      return triggerResultsInserter;
     }
     return parameterSet(provenance).getParameter<std::string>("@module_type");
   }
-}
+}  // namespace edm
diff --git a/FWCore/Common/src/RunBase.cc b/FWCore/Common/src/RunBase.cc
index 84a9337e3815f..fc3d2cbab56c7 100644
--- a/FWCore/Common/src/RunBase.cc
+++ b/FWCore/Common/src/RunBase.cc
@@ -17,15 +17,10 @@
 // user include files
 #include "FWCore/Common/interface/RunBase.h"
 
-namespace edm
-{
+namespace edm {
 
-   RunBase::RunBase()
-   {
-   }
+  RunBase::RunBase() {}
 
-   RunBase::~RunBase()
-   {
-   }
+  RunBase::~RunBase() {}
 
-}
+}  // namespace edm
diff --git a/FWCore/Common/src/TriggerNames.cc b/FWCore/Common/src/TriggerNames.cc
index 975e3e99ca2cb..e1cd5d8b94b78 100644
--- a/FWCore/Common/src/TriggerNames.cc
+++ b/FWCore/Common/src/TriggerNames.cc
@@ -4,40 +4,31 @@
 
 namespace edm {
 
-  TriggerNames::TriggerNames() { }
+  TriggerNames::TriggerNames() {}
 
   TriggerNames::TriggerNames(edm::ParameterSet const& pset) {
-
     triggerNames_ = pset.getParameter<Strings>("@trigger_paths");
 
     unsigned int index = 0;
-    for (Strings::const_iterator iName = triggerNames_.begin(),
-         iEnd = triggerNames_.end();
-         iName != iEnd;
+    for (Strings::const_iterator iName = triggerNames_.begin(), iEnd = triggerNames_.end(); iName != iEnd;
          ++iName, ++index) {
       indexMap_[*iName] = index;
     }
     psetID_ = pset.id();
   }
 
-  TriggerNames::Strings const&
-  TriggerNames::triggerNames() const { return triggerNames_; }
+  TriggerNames::Strings const& TriggerNames::triggerNames() const { return triggerNames_; }
 
-  std::string const&
-  TriggerNames::triggerName(unsigned int index) const {
-    return triggerNames_.at(index);
-  }
+  std::string const& TriggerNames::triggerName(unsigned int index) const { return triggerNames_.at(index); }
 
-  unsigned int
-  TriggerNames::triggerIndex(const std::string& name) const {
+  unsigned int TriggerNames::triggerIndex(const std::string& name) const {
     IndexMap::const_iterator const pos = indexMap_.find(name);
-    if (pos == indexMap_.end()) return indexMap_.size();
+    if (pos == indexMap_.end())
+      return indexMap_.size();
     return pos->second;
   }
 
-  TriggerNames::Strings::size_type
-  TriggerNames::size() const { return triggerNames_.size(); }
+  TriggerNames::Strings::size_type TriggerNames::size() const { return triggerNames_.size(); }
 
-  ParameterSetID const&
-  TriggerNames::parameterSetID() const { return psetID_; }
-}
+  ParameterSetID const& TriggerNames::parameterSetID() const { return psetID_; }
+}  // namespace edm
diff --git a/FWCore/Common/src/TriggerResultsByName.cc b/FWCore/Common/src/TriggerResultsByName.cc
index 55fad312df316..015657ed633ae 100644
--- a/FWCore/Common/src/TriggerResultsByName.cc
+++ b/FWCore/Common/src/TriggerResultsByName.cc
@@ -6,239 +6,209 @@
 
 namespace edm {
 
-  TriggerResultsByName::
-  TriggerResultsByName(TriggerResults const* triggerResults,
-                       TriggerNames const* triggerNames) :
-    triggerResults_(triggerResults),
-    triggerNames_(triggerNames) {
-
-   // If either of these is true the object is in an invalid state
-   if (triggerResults_ == nullptr || triggerNames_ == nullptr) {
-     return;
-   }
-
-   if (triggerResults_->parameterSetID() != triggerNames_->parameterSetID()) {
+  TriggerResultsByName::TriggerResultsByName(TriggerResults const* triggerResults, TriggerNames const* triggerNames)
+      : triggerResults_(triggerResults), triggerNames_(triggerNames) {
+    // If either of these is true the object is in an invalid state
+    if (triggerResults_ == nullptr || triggerNames_ == nullptr) {
+      return;
+    }
+
+    if (triggerResults_->parameterSetID() != triggerNames_->parameterSetID()) {
       throw edm::Exception(edm::errors::Unknown)
-        << "TriggerResultsByName::TriggerResultsByName, Trigger names vector and TriggerResults\n"
-           "have different ParameterSetID's.  This should be impossible when the object is obtained\n"
-           "from the function named triggerResultsByName in the Event class, which is the way\n"
-           "TriggerResultsByName should always be created. If this is the case, please send\n"
-           "information to reproduce this problem to the edm developers.  Otherwise, you are\n"
-	   "using this class incorrectly and in a way that is not supported.\n";
+          << "TriggerResultsByName::TriggerResultsByName, Trigger names vector and TriggerResults\n"
+             "have different ParameterSetID's.  This should be impossible when the object is obtained\n"
+             "from the function named triggerResultsByName in the Event class, which is the way\n"
+             "TriggerResultsByName should always be created. If this is the case, please send\n"
+             "information to reproduce this problem to the edm developers.  Otherwise, you are\n"
+             "using this class incorrectly and in a way that is not supported.\n";
     }
 
     if (triggerResults_->size() != triggerNames_->size()) {
       throw edm::Exception(edm::errors::Unknown)
-        << "TriggerResultsByName::TriggerResultsByName, Trigger names vector\n"
-           "and TriggerResults have different sizes.  This should be impossible,\n"
-           "please send information to reproduce this problem to the edm developers.\n";
+          << "TriggerResultsByName::TriggerResultsByName, Trigger names vector\n"
+             "and TriggerResults have different sizes.  This should be impossible,\n"
+             "please send information to reproduce this problem to the edm developers.\n";
     }
   }
 
-  bool
-  TriggerResultsByName::
-  isValid() const {
-    if (triggerResults_ == nullptr || triggerNames_ == nullptr) return false;
+  bool TriggerResultsByName::isValid() const {
+    if (triggerResults_ == nullptr || triggerNames_ == nullptr)
+      return false;
     return true;
   }
 
-  ParameterSetID const&
-  TriggerResultsByName::
-  parameterSetID() const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  ParameterSetID const& TriggerResultsByName::parameterSetID() const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     return triggerResults_->parameterSetID();
   }
 
-  bool
-  TriggerResultsByName::
-  wasrun() const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  bool TriggerResultsByName::wasrun() const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     return triggerResults_->wasrun();
   }
 
-  bool
-  TriggerResultsByName::
-  accept() const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  bool TriggerResultsByName::accept() const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     return triggerResults_->accept();
   }
 
-  bool
-  TriggerResultsByName::
-  error() const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  bool TriggerResultsByName::error() const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     return triggerResults_->error();
   }
 
-  HLTPathStatus const& 
-  TriggerResultsByName::
-  at(std::string const& pathName) const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  HLTPathStatus const& TriggerResultsByName::at(std::string const& pathName) const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     unsigned i = getAndCheckIndex(pathName);
     return triggerResults_->at(i);
   }
 
-  HLTPathStatus const&
-  TriggerResultsByName::
-  at(unsigned i) const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  HLTPathStatus const& TriggerResultsByName::at(unsigned i) const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     return triggerResults_->at(i);
   }
 
-  HLTPathStatus const& 
-  TriggerResultsByName::
-  operator[](std::string const& pathName) const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  HLTPathStatus const& TriggerResultsByName::operator[](std::string const& pathName) const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     unsigned i = getAndCheckIndex(pathName);
     return triggerResults_->at(i);
   }
 
-  HLTPathStatus const&
-  TriggerResultsByName::
-  operator[](unsigned i) const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  HLTPathStatus const& TriggerResultsByName::operator[](unsigned i) const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     return triggerResults_->at(i);
   }
 
-  bool
-  TriggerResultsByName::
-  wasrun(std::string const& pathName) const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  bool TriggerResultsByName::wasrun(std::string const& pathName) const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     unsigned i = getAndCheckIndex(pathName);
     return triggerResults_->wasrun(i);
   }
 
-  bool
-  TriggerResultsByName::
-  wasrun(unsigned i) const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  bool TriggerResultsByName::wasrun(unsigned i) const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     return triggerResults_->wasrun(i);
   }
 
-  bool
-  TriggerResultsByName::
-  accept(std::string const& pathName) const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  bool TriggerResultsByName::accept(std::string const& pathName) const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     unsigned i = getAndCheckIndex(pathName);
     return triggerResults_->accept(i);
   }
 
-  bool
-  TriggerResultsByName::
-  accept(unsigned i) const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  bool TriggerResultsByName::accept(unsigned i) const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     return triggerResults_->accept(i);
   }
 
-  bool
-  TriggerResultsByName::
-  error(std::string const& pathName) const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  bool TriggerResultsByName::error(std::string const& pathName) const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     unsigned i = getAndCheckIndex(pathName);
     return triggerResults_->error(i);
   }
 
-  bool
-  TriggerResultsByName::
-  error(unsigned i) const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  bool TriggerResultsByName::error(unsigned i) const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     return triggerResults_->error(i);
   }
 
-  hlt::HLTState
-  TriggerResultsByName::
-  state(std::string const& pathName) const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  hlt::HLTState TriggerResultsByName::state(std::string const& pathName) const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     unsigned i = getAndCheckIndex(pathName);
     return triggerResults_->state(i);
   }
 
-  hlt::HLTState
-  TriggerResultsByName::
-  state(unsigned i) const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  hlt::HLTState TriggerResultsByName::state(unsigned i) const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     return triggerResults_->state(i);
   }
 
-  unsigned
-  TriggerResultsByName::
-  index(std::string const& pathName) const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  unsigned TriggerResultsByName::index(std::string const& pathName) const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     unsigned i = getAndCheckIndex(pathName);
     return triggerResults_->index(i);
   }
 
-  unsigned
-  TriggerResultsByName::
-  index(unsigned i) const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  unsigned TriggerResultsByName::index(unsigned i) const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     return triggerResults_->index(i);
   }
 
-  std::vector<std::string> const&
-  TriggerResultsByName::
-  triggerNames() const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
-    if (triggerNames_ == nullptr) throwTriggerNamesMissing(); 
+  std::vector<std::string> const& TriggerResultsByName::triggerNames() const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
+    if (triggerNames_ == nullptr)
+      throwTriggerNamesMissing();
     return triggerNames_->triggerNames();
   }
 
-  std::string const&
-  TriggerResultsByName::
-  triggerName(unsigned i) const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
-    if (triggerNames_ == nullptr) throwTriggerNamesMissing(); 
-    return triggerNames_->triggerName(i);    
+  std::string const& TriggerResultsByName::triggerName(unsigned i) const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
+    if (triggerNames_ == nullptr)
+      throwTriggerNamesMissing();
+    return triggerNames_->triggerName(i);
   }
 
-  unsigned
-  TriggerResultsByName::
-  triggerIndex(std::string const& pathName) const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
-    if (triggerNames_ == nullptr) throwTriggerNamesMissing(); 
-    return triggerNames_->triggerIndex(pathName);    
+  unsigned TriggerResultsByName::triggerIndex(std::string const& pathName) const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
+    if (triggerNames_ == nullptr)
+      throwTriggerNamesMissing();
+    return triggerNames_->triggerIndex(pathName);
   }
 
-  std::vector<std::string>::size_type
-  TriggerResultsByName::
-  size() const {
-    if (triggerResults_ == nullptr) throwTriggerResultsMissing();
+  std::vector<std::string>::size_type TriggerResultsByName::size() const {
+    if (triggerResults_ == nullptr)
+      throwTriggerResultsMissing();
     return triggerResults_->size();
   }
 
-  unsigned
-  TriggerResultsByName::
-  getAndCheckIndex(std::string const& pathName) const {
-    if (triggerNames_ == nullptr) throwTriggerNamesMissing(); 
+  unsigned TriggerResultsByName::getAndCheckIndex(std::string const& pathName) const {
+    if (triggerNames_ == nullptr)
+      throwTriggerNamesMissing();
     unsigned i = triggerNames_->triggerIndex(pathName);
     if (i == triggerNames_->size()) {
       throw edm::Exception(edm::errors::LogicError)
-        << "TriggerResultsByName::getAndCheckIndex\n"
-	<< "Requested trigger name \""
-        << pathName << "\" does not match any known trigger.\n";
+          << "TriggerResultsByName::getAndCheckIndex\n"
+          << "Requested trigger name \"" << pathName << "\" does not match any known trigger.\n";
     }
     return i;
   }
 
-  void
-  TriggerResultsByName::
-  throwTriggerResultsMissing() const {
+  void TriggerResultsByName::throwTriggerResultsMissing() const {
     throw edm::Exception(edm::errors::ProductNotFound)
-      << "TriggerResultsByName has a null pointer to TriggerResults.\n"
-      << "This probably means TriggerResults was not found in the Event\n"
-      << "because the product was dropped or never created. It could also\n"
-      << "mean it was requested for a process that does not exist or was\n"
-      << "misspelled\n";
+        << "TriggerResultsByName has a null pointer to TriggerResults.\n"
+        << "This probably means TriggerResults was not found in the Event\n"
+        << "because the product was dropped or never created. It could also\n"
+        << "mean it was requested for a process that does not exist or was\n"
+        << "misspelled\n";
   }
 
-  void
-  TriggerResultsByName::
-  throwTriggerNamesMissing() const {
+  void TriggerResultsByName::throwTriggerNamesMissing() const {
     throw edm::Exception(edm::errors::LogicError)
-      << "TriggerResultsByName has a null pointer to TriggerNames.\n"
-      << "This should never happen. It could indicate the ParameterSet\n"
-      << "containing the names is missing from the ParameterSet registry.\n"
-      << "Please report this to the edm developers along with instructions\n"
-      << "to reproduce the problem\n";
+        << "TriggerResultsByName has a null pointer to TriggerNames.\n"
+        << "This should never happen. It could indicate the ParameterSet\n"
+        << "containing the names is missing from the ParameterSet registry.\n"
+        << "Please report this to the edm developers along with instructions\n"
+        << "to reproduce the problem\n";
   }
-}
+}  // namespace edm
diff --git a/FWCore/Concurrency/interface/FunctorTask.h b/FWCore/Concurrency/interface/FunctorTask.h
index 301d8c5b17916..bee041d435432 100644
--- a/FWCore/Concurrency/interface/FunctorTask.h
+++ b/FWCore/Concurrency/interface/FunctorTask.h
@@ -4,7 +4,7 @@
 //
 // Package:     Concurrency
 // Class  :     FunctorTask
-// 
+//
 /**\class FunctorTask FunctorTask.h FWCore/Concurrency/interface/FunctorTask.h
 
  Description: Builds a tbb::task from a lambda.
@@ -29,24 +29,24 @@
 // forward declarations
 
 namespace edm {
-  template<typename F>
+  template <typename F>
   class FunctorTask : public tbb::task {
   public:
-    explicit FunctorTask( F f): func_(std::move(f)) {}
-    
+    explicit FunctorTask(F f) : func_(std::move(f)) {}
+
     task* execute() override {
       func_();
       return nullptr;
     };
-    
+
   private:
     F func_;
   };
-  
-  template< typename ALLOC, typename F>
-  FunctorTask<F>* make_functor_task( ALLOC&& iAlloc, F f) {
+
+  template <typename ALLOC, typename F>
+  FunctorTask<F>* make_functor_task(ALLOC&& iAlloc, F f) {
     return new (iAlloc) FunctorTask<F>(std::move(f));
   }
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Concurrency/interface/LimitedTaskQueue.h b/FWCore/Concurrency/interface/LimitedTaskQueue.h
index e792179dd7c2f..de82a344a4208 100644
--- a/FWCore/Concurrency/interface/LimitedTaskQueue.h
+++ b/FWCore/Concurrency/interface/LimitedTaskQueue.h
@@ -4,7 +4,7 @@
 //
 // Package:     Concurrency
 // Class  :     LimitedTaskQueue
-// 
+//
 /**\class LimitedTaskQueue LimitedTaskQueue.h "FWCore/Concurrency/interface/LimitedTaskQueue.h"
 
  Description: Runs a set number of tasks from the queue at a time
@@ -35,144 +35,141 @@
 
 // forward declarations
 namespace edm {
-   class LimitedTaskQueue
-   {
-   public:
-     LimitedTaskQueue(unsigned int iLimit):
-     m_queues{iLimit}
-      {  }
-      
-     
-      // ---------- member functions ---------------------------
-     
-      /// asynchronously pushes functor iAction into queue
-      /**
+  class LimitedTaskQueue {
+  public:
+    LimitedTaskQueue(unsigned int iLimit) : m_queues{iLimit} {}
+
+    // ---------- member functions ---------------------------
+
+    /// asynchronously pushes functor iAction into queue
+    /**
        * The function will return immediately and iAction will either
        * process concurrently with the calling thread or wait until the
        * protected resource becomes available or until a CPU becomes available.
        * \param[in] iAction Must be a functor that takes no arguments and return no values.
        */
-      template<typename T>
-      void push(T&& iAction);
-      
-      /// synchronously pushes functor iAction into queue
-      /**
+    template <typename T>
+    void push(T&& iAction);
+
+    /// synchronously pushes functor iAction into queue
+    /**
        * The function will wait until iAction has completed before returning.
        * If another task is already running on the queue, the system is allowed
        * to find another TBB task to execute while waiting for the iAction to finish.
        * In that way the core is not idled while waiting.
        * \param[in] iAction Must be a functor that takes no arguments and return no values.
        */
-      template<typename T>
-      void pushAndWait(T&& iAction);
-     
-      class Resumer {
-      public:
-         friend class LimitedTaskQueue;
-         
-         Resumer() = default;
-         ~Resumer(){
-            resume();
-         }
-
-         Resumer(Resumer&& iOther): m_queue(iOther.m_queue){
-            iOther.m_queue = nullptr;
-         }
-
-         Resumer(Resumer const& iOther): m_queue(iOther.m_queue) {
-            if(m_queue) {
-               m_queue->pause();
-            }
-         }
-
-         Resumer& operator=(Resumer const& iOther) {
-            auto t = iOther;
-            return (*this = std::move(t));
-         }
-         Resumer& operator=(Resumer&& iOther) {
-            if(m_queue) { m_queue->resume();}
-            m_queue = iOther.m_queue;
-            iOther.m_queue = nullptr;
-            return *this;
-         }
-         
-         bool resume() {
-            if(m_queue) {
-               auto q = m_queue;
-               m_queue = nullptr;
-               return q->resume();
-            }
-            return false;
-         }
-      private:
-         Resumer(SerialTaskQueue* iQueue): m_queue{iQueue}{}
-         SerialTaskQueue* m_queue=nullptr;
-      };
-
-      /// asynchronously pushes functor iAction into queue then pause the queue and run iAction
-      /** iAction must take as argument a copy of a LimitedTaskQueue::Resumer. To resume
+    template <typename T>
+    void pushAndWait(T&& iAction);
+
+    class Resumer {
+    public:
+      friend class LimitedTaskQueue;
+
+      Resumer() = default;
+      ~Resumer() { resume(); }
+
+      Resumer(Resumer&& iOther) : m_queue(iOther.m_queue) { iOther.m_queue = nullptr; }
+
+      Resumer(Resumer const& iOther) : m_queue(iOther.m_queue) {
+        if (m_queue) {
+          m_queue->pause();
+        }
+      }
+
+      Resumer& operator=(Resumer const& iOther) {
+        auto t = iOther;
+        return (*this = std::move(t));
+      }
+      Resumer& operator=(Resumer&& iOther) {
+        if (m_queue) {
+          m_queue->resume();
+        }
+        m_queue = iOther.m_queue;
+        iOther.m_queue = nullptr;
+        return *this;
+      }
+
+      bool resume() {
+        if (m_queue) {
+          auto q = m_queue;
+          m_queue = nullptr;
+          return q->resume();
+        }
+        return false;
+      }
+
+    private:
+      Resumer(SerialTaskQueue* iQueue) : m_queue{iQueue} {}
+      SerialTaskQueue* m_queue = nullptr;
+    };
+
+    /// asynchronously pushes functor iAction into queue then pause the queue and run iAction
+    /** iAction must take as argument a copy of a LimitedTaskQueue::Resumer. To resume
        the queue let the last copy of the Resumer go out of scope, or call Resumer::resume().
        Using this function will decrease the allowed concurrency limit by 1.
        */
-      template<typename T>
-      void pushAndPause(T&& iAction);
-     
-     unsigned int concurrencyLimit() const { return m_queues.size(); }
-   private:
-      LimitedTaskQueue(const LimitedTaskQueue&) = delete;
-      const LimitedTaskQueue& operator=(const LimitedTaskQueue&) = delete;
-     
-      // ---------- member data --------------------------------
-     std::vector<SerialTaskQueue> m_queues;
-   };
-   
-   template<typename T>
-   void LimitedTaskQueue::push(T&& iAction) {
-     auto set_to_run = std::make_shared<std::atomic<bool>>(false);
-     for(auto& q: m_queues) {
-       q.push([set_to_run,iAction]() mutable{
-         bool expected = false;
-         if(set_to_run->compare_exchange_strong(expected,true)) {
-           iAction();
-         }
-       });
-     }
-   }
-   
-   template<typename T>
-   void LimitedTaskQueue::pushAndWait(T&& iAction) {
-      tbb::empty_task* waitTask = new (tbb::task::allocate_root()) tbb::empty_task;
-      waitTask->set_ref_count(2);
-     auto set_to_run = std::make_shared<std::atomic<bool>>(false);
-     for(auto& q: m_queues) {
-       q.push([set_to_run,waitTask,iAction]() mutable{
-         bool expected = false;
-         if(set_to_run->compare_exchange_strong(expected,true)) {
-           try {
-             iAction();
-           }catch(...) {}
-           waitTask->decrement_ref_count();
-         }
-       });
-     }
-     waitTask->wait_for_all();
-     tbb::task::destroy(*waitTask);
-   }
-  
-   template<typename T>
-   void LimitedTaskQueue::pushAndPause(T&& iAction) {
-      auto set_to_run = std::make_shared<std::atomic<bool>>(false);
-      for(auto& q: m_queues) {
-         q.push([&q,set_to_run,iAction]() mutable{
-            bool expected = false;
-            if(set_to_run->compare_exchange_strong(expected,true)) {
-               q.pause();
-               iAction(Resumer(&q));
-            }
-         });
-      }
-   }
-  
-}
+    template <typename T>
+    void pushAndPause(T&& iAction);
+
+    unsigned int concurrencyLimit() const { return m_queues.size(); }
+
+  private:
+    LimitedTaskQueue(const LimitedTaskQueue&) = delete;
+    const LimitedTaskQueue& operator=(const LimitedTaskQueue&) = delete;
+
+    // ---------- member data --------------------------------
+    std::vector<SerialTaskQueue> m_queues;
+  };
+
+  template <typename T>
+  void LimitedTaskQueue::push(T&& iAction) {
+    auto set_to_run = std::make_shared<std::atomic<bool>>(false);
+    for (auto& q : m_queues) {
+      q.push([set_to_run, iAction]() mutable {
+        bool expected = false;
+        if (set_to_run->compare_exchange_strong(expected, true)) {
+          iAction();
+        }
+      });
+    }
+  }
+
+  template <typename T>
+  void LimitedTaskQueue::pushAndWait(T&& iAction) {
+    tbb::empty_task* waitTask = new (tbb::task::allocate_root()) tbb::empty_task;
+    waitTask->set_ref_count(2);
+    auto set_to_run = std::make_shared<std::atomic<bool>>(false);
+    for (auto& q : m_queues) {
+      q.push([set_to_run, waitTask, iAction]() mutable {
+        bool expected = false;
+        if (set_to_run->compare_exchange_strong(expected, true)) {
+          try {
+            iAction();
+          } catch (...) {
+          }
+          waitTask->decrement_ref_count();
+        }
+      });
+    }
+    waitTask->wait_for_all();
+    tbb::task::destroy(*waitTask);
+  }
+
+  template <typename T>
+  void LimitedTaskQueue::pushAndPause(T&& iAction) {
+    auto set_to_run = std::make_shared<std::atomic<bool>>(false);
+    for (auto& q : m_queues) {
+      q.push([&q, set_to_run, iAction]() mutable {
+        bool expected = false;
+        if (set_to_run->compare_exchange_strong(expected, true)) {
+          q.pause();
+          iAction(Resumer(&q));
+        }
+      });
+    }
+  }
+
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Concurrency/interface/SerialTaskQueue.h b/FWCore/Concurrency/interface/SerialTaskQueue.h
index 4751223c869b3..72898d3befd67 100644
--- a/FWCore/Concurrency/interface/SerialTaskQueue.h
+++ b/FWCore/Concurrency/interface/SerialTaskQueue.h
@@ -4,7 +4,7 @@
 //
 // Package:     Concurrency
 // Class  :     SerialTaskQueue
-// 
+//
 /**\class SerialTaskQueue SerialTaskQueue.h "FWCore/Concurrency/interface/SerialTaskQueue.h"
 
  Description: Runs only one task from the queue at a time
@@ -63,33 +63,28 @@
 
 // forward declarations
 namespace edm {
-   class SerialTaskQueue
-   {
-   public:
-      SerialTaskQueue():
-      m_taskChosen(false),
-      m_pauseCount{0}
-      {  }
-      
-      SerialTaskQueue(SerialTaskQueue&& iOther):
-        m_tasks(std::move(iOther.m_tasks)),
-        m_taskChosen(iOther.m_taskChosen.exchange(false)),
-        m_pauseCount(iOther.m_pauseCount.exchange(0))
-      {
-        assert(m_tasks.empty() and m_taskChosen == false);
-      }
-      ~SerialTaskQueue();
-      
-      // ---------- const member functions ---------------------
-      /// Checks to see if the queue has been paused.
-      /**\return true if the queue is paused
+  class SerialTaskQueue {
+  public:
+    SerialTaskQueue() : m_taskChosen(false), m_pauseCount{0} {}
+
+    SerialTaskQueue(SerialTaskQueue&& iOther)
+        : m_tasks(std::move(iOther.m_tasks)),
+          m_taskChosen(iOther.m_taskChosen.exchange(false)),
+          m_pauseCount(iOther.m_pauseCount.exchange(0)) {
+      assert(m_tasks.empty() and m_taskChosen == false);
+    }
+    ~SerialTaskQueue();
+
+    // ---------- const member functions ---------------------
+    /// Checks to see if the queue has been paused.
+    /**\return true if the queue is paused
        * \sa pause(), resume()
        */
-      bool isPaused() const { return m_pauseCount.load()!=0;}
-      
-      // ---------- member functions ---------------------------
-      /// Pauses processing of additional tasks from the queue.
-      /**
+    bool isPaused() const { return m_pauseCount.load() != 0; }
+
+    // ---------- member functions ---------------------------
+    /// Pauses processing of additional tasks from the queue.
+    /**
        * Any task already running will not be paused however once that
        * running task finishes no further tasks will be started.
        * Multiple calls to pause() are allowed, however each call to 
@@ -97,43 +92,41 @@ namespace edm {
        * \return false if queue was already paused.
        * \sa resume(), isPaused()
        */
-      bool pause() {
-         return 1 == ++m_pauseCount;
-      }
-      
-      /// Resumes processing if the queue was paused.
-      /**
+    bool pause() { return 1 == ++m_pauseCount; }
+
+    /// Resumes processing if the queue was paused.
+    /**
        * Multiple calls to resume() are allowed if there
        * were multiple calls to pause(). Only when we reach as
        * many resume() calls as pause() calls will the queue restart.
        * \return true if the call really restarts the queue
        * \sa pause(), isPaused()
        */
-      bool resume();
-      
-      /// asynchronously pushes functor iAction into queue
-      /**
+    bool resume();
+
+    /// asynchronously pushes functor iAction into queue
+    /**
        * The function will return immediately and iAction will either
        * process concurrently with the calling thread or wait until the
        * protected resource becomes available or until a CPU becomes available.
        * \param[in] iAction Must be a functor that takes no arguments and return no values.
        */
-      template<typename T>
-      void push(const T& iAction);
-      
-      /// synchronously pushes functor iAction into queue
-      /**
+    template <typename T>
+    void push(const T& iAction);
+
+    /// synchronously pushes functor iAction into queue
+    /**
        * The function will wait until iAction has completed before returning.
        * If another task is already running on the queue, the system is allowed
        * to find another TBB task to execute while waiting for the iAction to finish.
        * In that way the core is not idled while waiting.
        * \param[in] iAction Must be a functor that takes no arguments and return no values.
        */
-      template<typename T>
-      void pushAndWait(const T& iAction);
-      
-      /// asynchronously pushes functor iAction into queue and finds next task to execute
-      /**
+    template <typename T>
+    void pushAndWait(const T& iAction);
+
+    /// asynchronously pushes functor iAction into queue and finds next task to execute
+    /**
        * This function is useful if you are accessing the SerialTaskQueue for the execute()
        * method of a TBB task and want to efficiently schedule the next task from the queue.
        * In that case you can take the return value and return it directly from your execute() method.
@@ -141,91 +134,88 @@ namespace edm {
        * \param[in] iAction Must be a functor that takes no arguments and return no values.
        * \return Returns either the next task that the user must schedule with TBB or a nullptr.
        */
-      template<typename T>
-      tbb::task* pushAndGetNextTaskToRun(const T& iAction);
-      
-   private:
-      SerialTaskQueue(const SerialTaskQueue&) = delete;
-      const SerialTaskQueue& operator=(const SerialTaskQueue&) = delete;
-      
-      /** Base class for all tasks held by the SerialTaskQueue */
-      class TaskBase : public tbb::task {
-         friend class SerialTaskQueue;
-         TaskBase(): m_queue(nullptr) {}
-         
-      protected:
-         tbb::task* finishedTask();
-      private:
-         void setQueue(SerialTaskQueue* iQueue) { m_queue = iQueue;}
-         
-         SerialTaskQueue* m_queue;
-      };
-      
-      template< typename T>
-      class QueuedTask : public TaskBase {
-      public:
-         QueuedTask( const T& iAction):
-         m_action(iAction) {}
-         
-      private:
-         tbb::task* execute() override;
-         
-         T m_action;
-      };
-      
-      friend class TaskBase;
-      
-      void pushTask(TaskBase*);
-      tbb::task* pushAndGetNextTask(TaskBase*);
+    template <typename T>
+    tbb::task* pushAndGetNextTaskToRun(const T& iAction);
+
+  private:
+    SerialTaskQueue(const SerialTaskQueue&) = delete;
+    const SerialTaskQueue& operator=(const SerialTaskQueue&) = delete;
+
+    /** Base class for all tasks held by the SerialTaskQueue */
+    class TaskBase : public tbb::task {
+      friend class SerialTaskQueue;
+      TaskBase() : m_queue(nullptr) {}
+
+    protected:
       tbb::task* finishedTask();
-      //returns nullptr if a task is already being processed
-      TaskBase* pickNextTask();
-      
-      void pushAndWait(tbb::empty_task* iWait,TaskBase*);
-      
-      
-      // ---------- member data --------------------------------
-      tbb::concurrent_queue<TaskBase*> m_tasks;
-      std::atomic<bool> m_taskChosen;
-      std::atomic<unsigned long> m_pauseCount;
-   };
-   
-   template<typename T>
-   void SerialTaskQueue::push(const T& iAction) {
-      QueuedTask<T>* pTask{ new (tbb::task::allocate_root()) QueuedTask<T>{iAction} };
-      pTask->setQueue(this);
-      pushTask(pTask);
-   }
-   
-   template<typename T>
-   void SerialTaskQueue::pushAndWait(const T& iAction) {
-      tbb::empty_task* waitTask = new (tbb::task::allocate_root()) tbb::empty_task;
-      waitTask->set_ref_count(2);
-      QueuedTask<T>* pTask{ new (waitTask->allocate_child()) QueuedTask<T>{iAction} };
-      pTask->setQueue(this);
-      pushAndWait(waitTask,pTask);
-   }
-   
-   template<typename T>
-   tbb::task* SerialTaskQueue::pushAndGetNextTaskToRun(const T& iAction) {
-      QueuedTask<T>* pTask{ new (tbb::task::allocate_root()) QueuedTask<T>{iAction} };
-      pTask->setQueue(this);
-      return pushAndGetNextTask(pTask);
-   }
-   
-   inline
-   tbb::task*
-   SerialTaskQueue::TaskBase::finishedTask() {return m_queue->finishedTask();}
-   
-   template <typename T>
-   tbb::task*
-   SerialTaskQueue::QueuedTask<T>::execute() {
-      try {
-         this->m_action();
-      } catch(...) {}
-      return this->finishedTask();
-   }
-   
-}
+
+    private:
+      void setQueue(SerialTaskQueue* iQueue) { m_queue = iQueue; }
+
+      SerialTaskQueue* m_queue;
+    };
+
+    template <typename T>
+    class QueuedTask : public TaskBase {
+    public:
+      QueuedTask(const T& iAction) : m_action(iAction) {}
+
+    private:
+      tbb::task* execute() override;
+
+      T m_action;
+    };
+
+    friend class TaskBase;
+
+    void pushTask(TaskBase*);
+    tbb::task* pushAndGetNextTask(TaskBase*);
+    tbb::task* finishedTask();
+    //returns nullptr if a task is already being processed
+    TaskBase* pickNextTask();
+
+    void pushAndWait(tbb::empty_task* iWait, TaskBase*);
+
+    // ---------- member data --------------------------------
+    tbb::concurrent_queue<TaskBase*> m_tasks;
+    std::atomic<bool> m_taskChosen;
+    std::atomic<unsigned long> m_pauseCount;
+  };
+
+  template <typename T>
+  void SerialTaskQueue::push(const T& iAction) {
+    QueuedTask<T>* pTask{new (tbb::task::allocate_root()) QueuedTask<T>{iAction}};
+    pTask->setQueue(this);
+    pushTask(pTask);
+  }
+
+  template <typename T>
+  void SerialTaskQueue::pushAndWait(const T& iAction) {
+    tbb::empty_task* waitTask = new (tbb::task::allocate_root()) tbb::empty_task;
+    waitTask->set_ref_count(2);
+    QueuedTask<T>* pTask{new (waitTask->allocate_child()) QueuedTask<T>{iAction}};
+    pTask->setQueue(this);
+    pushAndWait(waitTask, pTask);
+  }
+
+  template <typename T>
+  tbb::task* SerialTaskQueue::pushAndGetNextTaskToRun(const T& iAction) {
+    QueuedTask<T>* pTask{new (tbb::task::allocate_root()) QueuedTask<T>{iAction}};
+    pTask->setQueue(this);
+    return pushAndGetNextTask(pTask);
+  }
+
+  inline tbb::task* SerialTaskQueue::TaskBase::finishedTask() { return m_queue->finishedTask(); }
+
+  template <typename T>
+  tbb::task* SerialTaskQueue::QueuedTask<T>::execute() {
+    try {
+      this->m_action();
+    } catch (...) {
+    }
+    return this->finishedTask();
+  }
+
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Concurrency/interface/SerialTaskQueueChain.h b/FWCore/Concurrency/interface/SerialTaskQueueChain.h
index b2b6c642288f7..c8afc35b2b5ca 100644
--- a/FWCore/Concurrency/interface/SerialTaskQueueChain.h
+++ b/FWCore/Concurrency/interface/SerialTaskQueueChain.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Concurrency
 // Class  :     SerialTaskQueueChain
-// 
+//
 /**\class SerialTaskQueueChain SerialTaskQueueChain.h "SerialTaskQueueChain.h"
 
  Description: [one line class summary]
@@ -28,28 +28,23 @@
 
 // forward declarations
 namespace edm {
-  class SerialTaskQueueChain
-  {
-    
+  class SerialTaskQueueChain {
   public:
     SerialTaskQueueChain() {}
-    explicit SerialTaskQueueChain(std::vector<std::shared_ptr<SerialTaskQueue>> iQueues):
-    m_queues(std::move(iQueues)) {}
-    
+    explicit SerialTaskQueueChain(std::vector<std::shared_ptr<SerialTaskQueue>> iQueues)
+        : m_queues(std::move(iQueues)) {}
+
     SerialTaskQueueChain(const SerialTaskQueueChain&) = delete;
     SerialTaskQueueChain& operator=(const SerialTaskQueueChain&) = delete;
-    SerialTaskQueueChain(SerialTaskQueueChain&& iOld):
-      m_queues(std::move(iOld.m_queues)),
-      m_outstandingTasks{ iOld.m_outstandingTasks.load() } {}
+    SerialTaskQueueChain(SerialTaskQueueChain&& iOld)
+        : m_queues(std::move(iOld.m_queues)), m_outstandingTasks{iOld.m_outstandingTasks.load()} {}
 
     SerialTaskQueueChain& operator=(SerialTaskQueueChain&& iOld) {
       m_queues = std::move(iOld.m_queues);
-      m_outstandingTasks.store( iOld.m_outstandingTasks.load());
+      m_outstandingTasks.store(iOld.m_outstandingTasks.load());
       return *this;
     }
 
-
-    
     /// asynchronously pushes functor iAction into queue
     /**
      * The function will return immediately and iAction will either
@@ -57,9 +52,9 @@ namespace edm {
      * protected resource becomes available or until a CPU becomes available.
      * \param[in] iAction Must be a functor that takes no arguments and return no values.
      */
-    template<typename T>
+    template <typename T>
     void push(T&& iAction);
-    
+
     /// synchronously pushes functor iAction into queue
     /**
      * The function will wait until iAction has completed before returning.
@@ -68,98 +63,92 @@ namespace edm {
      * In that way the core is not idled while waiting.
      * \param[in] iAction Must be a functor that takes no arguments and return no values.
      */
-    template<typename T>
+    template <typename T>
     void pushAndWait(T&& iAction);
-    
+
     unsigned long outstandingTasks() const { return m_outstandingTasks; }
-    std::size_t numberOfQueues() const {return m_queues.size(); }
+    std::size_t numberOfQueues() const { return m_queues.size(); }
+
   private:
-    
     // ---------- member data --------------------------------
     std::vector<std::shared_ptr<SerialTaskQueue>> m_queues;
     std::atomic<unsigned long> m_outstandingTasks{0};
-    
-    template<typename T>
+
+    template <typename T>
     void passDownChain(unsigned int iIndex, T&& iAction);
-    
-    template<typename T>
-    void actionToRun(T&& iAction);
 
+    template <typename T>
+    void actionToRun(T&& iAction);
   };
-  
-  template<typename T>
+
+  template <typename T>
   void SerialTaskQueueChain::push(T&& iAction) {
     ++m_outstandingTasks;
-    if(m_queues.size() == 1) {
-      m_queues[0]->push( [this,iAction]() mutable {this->actionToRun(iAction);} );
+    if (m_queues.size() == 1) {
+      m_queues[0]->push([this, iAction]() mutable { this->actionToRun(iAction); });
     } else {
       assert(!m_queues.empty());
-      m_queues[0]->push([this, iAction]() mutable {
-        this->passDownChain(1, iAction);
-      });
+      m_queues[0]->push([this, iAction]() mutable { this->passDownChain(1, iAction); });
     }
   }
-  
-  template<typename T>
+
+  template <typename T>
   void SerialTaskQueueChain::pushAndWait(T&& iAction) {
     auto destry = [](tbb::task* iTask) { tbb::task::destroy(*iTask); };
-    
-    std::unique_ptr<tbb::task, decltype(destry)> waitTask( new (tbb::task::allocate_root()) tbb::empty_task, destry );
+
+    std::unique_ptr<tbb::task, decltype(destry)> waitTask(new (tbb::task::allocate_root()) tbb::empty_task, destry);
     waitTask->set_ref_count(3);
-    
+
     std::exception_ptr ptr;
     auto waitTaskPtr = waitTask.get();
-    push([waitTaskPtr, iAction,&ptr](){
+    push([waitTaskPtr, iAction, &ptr]() {
       //must wait until exception ptr would be set
-      auto dec = [](tbb::task* iTask){ iTask->decrement_ref_count();};
-      std::unique_ptr<tbb::task, decltype(dec)> sentry(waitTaskPtr,dec);
+      auto dec = [](tbb::task* iTask) { iTask->decrement_ref_count(); };
+      std::unique_ptr<tbb::task, decltype(dec)> sentry(waitTaskPtr, dec);
       try {
         iAction();
-      }catch(...) {
+      } catch (...) {
         ptr = std::current_exception();
       }
     });
-    
+
     waitTask->decrement_ref_count();
     waitTask->wait_for_all();
-    
-    if(ptr) {
+
+    if (ptr) {
       std::rethrow_exception(ptr);
     }
   }
-  
-  template<typename T>
+
+  template <typename T>
   void SerialTaskQueueChain::passDownChain(unsigned int iQueueIndex, T&& iAction) {
     //Have to be sure the queue associated to this running task
     // does not attempt to start another task
-    m_queues[iQueueIndex-1]->pause();
+    m_queues[iQueueIndex - 1]->pause();
     //is this the last queue?
-    if(iQueueIndex +1 == m_queues.size()) {
-      m_queues[iQueueIndex]->push([this,iAction]() mutable { this->actionToRun(iAction); });
+    if (iQueueIndex + 1 == m_queues.size()) {
+      m_queues[iQueueIndex]->push([this, iAction]() mutable { this->actionToRun(iAction); });
     } else {
-      auto nextQueue = iQueueIndex+1;
-      m_queues[iQueueIndex]->push([this, nextQueue, iAction]() mutable {
-        this->passDownChain(nextQueue, iAction);
-      });
+      auto nextQueue = iQueueIndex + 1;
+      m_queues[iQueueIndex]->push([this, nextQueue, iAction]() mutable { this->passDownChain(nextQueue, iAction); });
     }
   }
-  
-  template<typename T>
+
+  template <typename T>
   void SerialTaskQueueChain::actionToRun(T&& iAction) {
     //even if an exception happens we will resume the queues.
-    using Queues= std::vector<std::shared_ptr<SerialTaskQueue>>;
+    using Queues = std::vector<std::shared_ptr<SerialTaskQueue>>;
     auto sentryAction = [](SerialTaskQueueChain* iChain) {
       auto& vec = iChain->m_queues;
-      for(auto it = vec.rbegin()+1; it != vec.rend(); ++it) {
+      for (auto it = vec.rbegin() + 1; it != vec.rend(); ++it) {
         (*it)->resume();
       }
       --(iChain->m_outstandingTasks);
     };
-    
-    std::unique_ptr<SerialTaskQueueChain,decltype(sentryAction)> sentry( this, sentryAction);
+
+    std::unique_ptr<SerialTaskQueueChain, decltype(sentryAction)> sentry(this, sentryAction);
     iAction();
   }
-}
-
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Concurrency/interface/SharedResourceNames.h b/FWCore/Concurrency/interface/SharedResourceNames.h
index 29dd0382aa479..29921b61bd2b0 100644
--- a/FWCore/Concurrency/interface/SharedResourceNames.h
+++ b/FWCore/Concurrency/interface/SharedResourceNames.h
@@ -46,5 +46,5 @@ namespace edm {
   // the same shared resource name, there will be no performance effects.
   // This function provides a unique name to be used for that purpose.
   std::string uniqueSharedResourceName();
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Concurrency/interface/ThreadSafeAddOnlyContainer.h b/FWCore/Concurrency/interface/ThreadSafeAddOnlyContainer.h
index 2f8f4a937199d..5dadd6a3c29c3 100644
--- a/FWCore/Concurrency/interface/ThreadSafeAddOnlyContainer.h
+++ b/FWCore/Concurrency/interface/ThreadSafeAddOnlyContainer.h
@@ -30,7 +30,6 @@ namespace edm {
   template <typename T>
   class ThreadSafeAddOnlyContainer {
   public:
-
     ThreadSafeAddOnlyContainer();
 
     ~ThreadSafeAddOnlyContainer();
@@ -39,10 +38,8 @@ namespace edm {
     T* makeAndHold(Args&&... args);
 
   private:
-
     class Node {
     public:
-
       template <typename... Args>
       Node(Node* iNext, Args&&... args);
       Node const* next() const { return next_; }
@@ -50,7 +47,6 @@ namespace edm {
       T* address() { return &data_; }
 
     private:
-
       Node* next_;
       T data_;
     };
@@ -59,9 +55,7 @@ namespace edm {
   };
 
   template <typename T>
-  ThreadSafeAddOnlyContainer<T>::ThreadSafeAddOnlyContainer() :
-      front_(nullptr) {
-  }
+  ThreadSafeAddOnlyContainer<T>::ThreadSafeAddOnlyContainer() : front_(nullptr) {}
 
   template <typename T>
   ThreadSafeAddOnlyContainer<T>::~ThreadSafeAddOnlyContainer() {
@@ -87,10 +81,8 @@ namespace edm {
 
   template <typename T>
   template <typename... Args>
-  ThreadSafeAddOnlyContainer<T>::Node::Node(Node* iNext, Args&&... args) :
-    next_(iNext),
-    data_(std::forward<Args>(args)...) {
-  }
-}
+  ThreadSafeAddOnlyContainer<T>::Node::Node(Node* iNext, Args&&... args)
+      : next_(iNext), data_(std::forward<Args>(args)...) {}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Concurrency/interface/ThreadSafeOutputFileStream.h b/FWCore/Concurrency/interface/ThreadSafeOutputFileStream.h
index 1c422745bfe4a..0f03a3ebebb77 100644
--- a/FWCore/Concurrency/interface/ThreadSafeOutputFileStream.h
+++ b/FWCore/Concurrency/interface/ThreadSafeOutputFileStream.h
@@ -18,9 +18,9 @@ namespace edm {
 
   private:
     std::ofstream file_;
-    std::atomic<bool> msgBeingLogged_ {false};
-    tbb::concurrent_queue<std::string> waitingMessages_ {};
+    std::atomic<bool> msgBeingLogged_{false};
+    tbb::concurrent_queue<std::string> waitingMessages_{};
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Concurrency/interface/WaitingTask.h b/FWCore/Concurrency/interface/WaitingTask.h
index bf5c189755c1e..905bcf5ac72df 100644
--- a/FWCore/Concurrency/interface/WaitingTask.h
+++ b/FWCore/Concurrency/interface/WaitingTask.h
@@ -4,7 +4,7 @@
 //
 // Package:     Concurrency
 // Class  :     WaitingTask
-// 
+//
 /**\class WaitingTask WaitingTask.h FWCore/Concurrency/interface/WaitingTask.h
 
  Description: Task used by WaitingTaskList.
@@ -34,28 +34,23 @@ namespace edm {
   class WaitingTaskWithArenaHolder;
 
   class WaitingTask : public tbb::task {
-      
-   public:
+  public:
     friend class WaitingTaskList;
     friend class WaitingTaskHolder;
     friend class WaitingTaskWithArenaHolder;
 
     ///Constructor
     WaitingTask() : m_ptr{nullptr} {}
-    ~WaitingTask() override {
-      delete m_ptr.load();
-    };
-      
+    ~WaitingTask() override { delete m_ptr.load(); };
+
     // ---------- const member functions ---------------------------
-      
+
     ///Returns exception thrown by dependent task
     /** If the value is non-null then the dependent task failed.
     */
-    std::exception_ptr const * exceptionPtr() const {
-      return m_ptr.load();
-    }
-   private:
-    
+    std::exception_ptr const* exceptionPtr() const { return m_ptr.load(); }
+
+  private:
     ///Called if waited for task failed
     /**Allows transfer of the exception caused by the dependent task to be
      * moved to another thread.
@@ -65,34 +60,34 @@ namespace edm {
       if (iPtr and not m_ptr) {
         auto temp = std::make_unique<std::exception_ptr>(iPtr);
         std::exception_ptr* expected = nullptr;
-        if( m_ptr.compare_exchange_strong(expected, temp.get()) ) {
+        if (m_ptr.compare_exchange_strong(expected, temp.get())) {
           temp.release();
         }
       }
     }
-    
+
     std::atomic<std::exception_ptr*> m_ptr;
   };
- 
-  template<typename F>
+
+  template <typename F>
   class FunctorWaitingTask : public WaitingTask {
   public:
-    explicit FunctorWaitingTask( F f): func_(std::move(f)) {}
-    
+    explicit FunctorWaitingTask(F f) : func_(std::move(f)) {}
+
     task* execute() override {
       func_(exceptionPtr());
       return nullptr;
     };
-    
+
   private:
     F func_;
   };
-  
-  template< typename ALLOC, typename F>
-  FunctorWaitingTask<F>* make_waiting_task( ALLOC&& iAlloc, F f) {
+
+  template <typename ALLOC, typename F>
+  FunctorWaitingTask<F>* make_waiting_task(ALLOC&& iAlloc, F f) {
     return new (iAlloc) FunctorWaitingTask<F>(std::move(f));
   }
-  
-}
+
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Concurrency/interface/WaitingTaskHolder.h b/FWCore/Concurrency/interface/WaitingTaskHolder.h
index 336fb0e7511da..a65365403c1c8 100644
--- a/FWCore/Concurrency/interface/WaitingTaskHolder.h
+++ b/FWCore/Concurrency/interface/WaitingTaskHolder.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Concurrency
 // Class  :     WaitingTaskHolder
-// 
+//
 /**\class WaitingTaskHolder WaitingTaskHolder.h "WaitingTaskHolder.h"
 
  Description: [one line class summary]
@@ -27,58 +27,47 @@
 // forward declarations
 
 namespace edm {
-  class WaitingTaskHolder
-  {
-    
+  class WaitingTaskHolder {
   public:
-    WaitingTaskHolder():
-    m_task(nullptr) {}
-    
-    explicit WaitingTaskHolder(edm::WaitingTask* iTask):
-    m_task(iTask)
-    {m_task->increment_ref_count();}
+    WaitingTaskHolder() : m_task(nullptr) {}
+
+    explicit WaitingTaskHolder(edm::WaitingTask* iTask) : m_task(iTask) { m_task->increment_ref_count(); }
     ~WaitingTaskHolder() {
-      if(m_task) {
+      if (m_task) {
         doneWaiting(std::exception_ptr{});
       }
     }
 
-    WaitingTaskHolder(const WaitingTaskHolder& iHolder) :
-    m_task(iHolder.m_task) {
-      m_task->increment_ref_count();
-    }
+    WaitingTaskHolder(const WaitingTaskHolder& iHolder) : m_task(iHolder.m_task) { m_task->increment_ref_count(); }
+
+    WaitingTaskHolder(WaitingTaskHolder&& iOther) : m_task(iOther.m_task) { iOther.m_task = nullptr; }
 
-    WaitingTaskHolder(WaitingTaskHolder&& iOther) :
-    m_task(iOther.m_task) {
-      iOther.m_task = nullptr;
-    }
-    
     WaitingTaskHolder& operator=(const WaitingTaskHolder& iRHS) {
       WaitingTaskHolder tmp(iRHS);
       std::swap(m_task, tmp.m_task);
       return *this;
     }
-    
+
     // ---------- const member functions ---------------------
     bool taskHasFailed() const { return m_task->exceptionPtr() != nullptr; }
-    
+
     // ---------- static member functions --------------------
-    
+
     // ---------- member functions ---------------------------
-    
+
     /** Use in the case where you need to inform the parent task of a
      failure before some other child task which may be run later reports
      a different, but related failure. You must later call doneWaiting
      in the same thread passing the same exceptoin.
      */
     void presetTaskAsFailed(std::exception_ptr iExcept) {
-      if(iExcept) {
+      if (iExcept) {
         m_task->dependentTaskFailed(iExcept);
       }
     }
-    
+
     void doneWaiting(std::exception_ptr iExcept) {
-      if(iExcept) {
+      if (iExcept) {
         m_task->dependentTaskFailed(iExcept);
       }
       //spawn can run the task before we finish
@@ -87,16 +76,15 @@ namespace edm {
       // before spawn avoids problems
       auto task = m_task;
       m_task = nullptr;
-      if(0==task->decrement_ref_count()){
+      if (0 == task->decrement_ref_count()) {
         tbb::task::spawn(*task);
       }
     }
-    
+
   private:
-    
     // ---------- member data --------------------------------
     WaitingTask* m_task;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Concurrency/interface/WaitingTaskList.h b/FWCore/Concurrency/interface/WaitingTaskList.h
index 44653ba889faa..7a78f65b7beb4 100644
--- a/FWCore/Concurrency/interface/WaitingTaskList.h
+++ b/FWCore/Concurrency/interface/WaitingTaskList.h
@@ -4,7 +4,7 @@
 //
 // Package:     Concurrency
 // Class  :     WaitingTaskList
-// 
+//
 /**\class WaitingTaskList WaitingTaskList.h FWCore/Concurrency/interface/WaitingTaskList.h
 
  Description: Handles starting tasks once some resource becomes available.
@@ -80,105 +80,97 @@
 // forward declarations
 
 namespace edm {
-   class EmptyWaitingTask : public WaitingTask {
-   public:
-      EmptyWaitingTask() = default;
-      
-      tbb::task* execute() override { return nullptr;}
-   };
-
-   namespace waitingtask {
-      struct TaskDestroyer {
-         void operator()(tbb::task* iTask) const {
-            tbb::task::destroy(*iTask);
-         }
-      };
-   }
-   ///Create an EmptyWaitingTask which will properly be destroyed
-   inline std::unique_ptr<edm::EmptyWaitingTask, waitingtask::TaskDestroyer> make_empty_waiting_task() {
-      return std::unique_ptr<edm::EmptyWaitingTask, waitingtask::TaskDestroyer>( new (tbb::task::allocate_root()) edm::EmptyWaitingTask{});
-   }
-
-   class WaitingTaskList
-   {
-      
-   public:
-      ///Constructor
-      /**The WaitingTaskList is initial set to waiting.
+  class EmptyWaitingTask : public WaitingTask {
+  public:
+    EmptyWaitingTask() = default;
+
+    tbb::task* execute() override { return nullptr; }
+  };
+
+  namespace waitingtask {
+    struct TaskDestroyer {
+      void operator()(tbb::task* iTask) const { tbb::task::destroy(*iTask); }
+    };
+  }  // namespace waitingtask
+  ///Create an EmptyWaitingTask which will properly be destroyed
+  inline std::unique_ptr<edm::EmptyWaitingTask, waitingtask::TaskDestroyer> make_empty_waiting_task() {
+    return std::unique_ptr<edm::EmptyWaitingTask, waitingtask::TaskDestroyer>(new (tbb::task::allocate_root())
+                                                                                  edm::EmptyWaitingTask{});
+  }
+
+  class WaitingTaskList {
+  public:
+    ///Constructor
+    /**The WaitingTaskList is initial set to waiting.
        * \param[in] iInitialSize specifies the initial size of the cache used to hold waiting tasks.
        * The value is only useful for optimization as the object can resize itself.
        */
-      explicit WaitingTaskList(unsigned int iInitialSize = 2);
-      ~WaitingTaskList() = default;
-      
-      // ---------- member functions ---------------------------
-      
-      /** Use in the case where you need to inform the parent task of a
+    explicit WaitingTaskList(unsigned int iInitialSize = 2);
+    ~WaitingTaskList() = default;
+
+    // ---------- member functions ---------------------------
+
+    /** Use in the case where you need to inform the parent task of a
        failure before some other child task which may be run later reports
        a different, but related failure. You must later call doneWaiting
        with same exception later in the same thread.
        */
-      void presetTaskAsFailed(std::exception_ptr iExcept);
+    void presetTaskAsFailed(std::exception_ptr iExcept);
 
-      ///Adds task to the waiting list
-      /**If doneWaiting() has already been called then the added task will immediately be spawned.
+    ///Adds task to the waiting list
+    /**If doneWaiting() has already been called then the added task will immediately be spawned.
        * If that is not the case then the task will be held until doneWaiting() is called and will
        * then be spawned.
        * Calls to add() and doneWaiting() can safely be done concurrently.
        */
-      void add(WaitingTask*);
-      
-      ///Signals that the resource is now available and tasks should be spawned
-      /**The owner of the resource calls this function to allow the waiting tasks to
+    void add(WaitingTask*);
+
+    ///Signals that the resource is now available and tasks should be spawned
+    /**The owner of the resource calls this function to allow the waiting tasks to
        * start accessing it.
        * If the task fails, a non 'null' std::exception_ptr should be used.
        * To have tasks wait again one must call reset().
        * Calls to add() and doneWaiting() can safely be done concurrently.
        */
-      void doneWaiting(std::exception_ptr iPtr);
-      
-      ///Resets access to the resource so that added tasks will wait.
-      /**The owner of the resouce calls reset() to make tasks wait.
+    void doneWaiting(std::exception_ptr iPtr);
+
+    ///Resets access to the resource so that added tasks will wait.
+    /**The owner of the resouce calls reset() to make tasks wait.
        * Calling reset() is NOT thread safe. The system must guarantee that no tasks are
        * using the resource when reset() is called and neither add() nor doneWaiting() can
        * be called concurrently with reset().
        */
-      void reset();
-      
-   private:
-      WaitingTaskList(const WaitingTaskList&) = delete; // stop default
-      const WaitingTaskList& operator=(const WaitingTaskList&) = delete; // stop default
-      
-      /**Handles spawning the tasks,
+    void reset();
+
+  private:
+    WaitingTaskList(const WaitingTaskList&) = delete;                   // stop default
+    const WaitingTaskList& operator=(const WaitingTaskList&) = delete;  // stop default
+
+    /**Handles spawning the tasks,
        * safe to call from multiple threads
        */
-      void announce();
-      
-      struct WaitNode {
-         WaitingTask* m_task;
-         std::atomic<WaitNode*> m_next;
-         bool m_fromCache;
-         
-         void setNextNode(WaitNode* iNext){
-            m_next = iNext;
-         }
-         
-         WaitNode* nextNode() const {
-            return m_next;
-         }
-      };
-      
-      WaitNode* createNode(WaitingTask* iTask);
-      
-      
-      // ---------- member data --------------------------------
-      std::atomic<WaitNode*> m_head;
-      std::unique_ptr<WaitNode[]> m_nodeCache;
-      CMS_THREAD_GUARD(m_waiting) std::exception_ptr m_exceptionPtr;
-      unsigned int m_nodeCacheSize;
-      std::atomic<unsigned int> m_lastAssignedCacheIndex;
-      std::atomic<bool> m_waiting;    
-   };
-}
+    void announce();
+
+    struct WaitNode {
+      WaitingTask* m_task;
+      std::atomic<WaitNode*> m_next;
+      bool m_fromCache;
+
+      void setNextNode(WaitNode* iNext) { m_next = iNext; }
+
+      WaitNode* nextNode() const { return m_next; }
+    };
+
+    WaitNode* createNode(WaitingTask* iTask);
+
+    // ---------- member data --------------------------------
+    std::atomic<WaitNode*> m_head;
+    std::unique_ptr<WaitNode[]> m_nodeCache;
+    CMS_THREAD_GUARD(m_waiting) std::exception_ptr m_exceptionPtr;
+    unsigned int m_nodeCacheSize;
+    std::atomic<unsigned int> m_lastAssignedCacheIndex;
+    std::atomic<bool> m_waiting;
+  };
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Concurrency/interface/WaitingTaskWithArenaHolder.h b/FWCore/Concurrency/interface/WaitingTaskWithArenaHolder.h
index ea2a466ab2360..efc7d9e6cde0b 100644
--- a/FWCore/Concurrency/interface/WaitingTaskWithArenaHolder.h
+++ b/FWCore/Concurrency/interface/WaitingTaskWithArenaHolder.h
@@ -31,7 +31,6 @@ namespace edm {
 
   class WaitingTaskWithArenaHolder {
   public:
-
     WaitingTaskWithArenaHolder();
 
     // Note that the arena will be the one containing the thread
@@ -69,10 +68,9 @@ namespace edm {
     WaitingTaskHolder makeWaitingTaskHolderAndRelease();
 
   private:
-
     // ---------- member data --------------------------------
     WaitingTask* m_task;
     std::shared_ptr<tbb::task_arena> m_arena;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Concurrency/interface/Xerces.h b/FWCore/Concurrency/interface/Xerces.h
index ac19e9757f3c3..11dd3859c4cc4 100644
--- a/FWCore/Concurrency/interface/Xerces.h
+++ b/FWCore/Concurrency/interface/Xerces.h
@@ -8,7 +8,7 @@ namespace cms {
     // a multithreaded environment.
     void xercesInitialize();
     void xercesTerminate();
-  }
-}
+  }  // namespace concurrency
+}  // namespace cms
 
-#endif // FWCore_Concurrency_h
+#endif  // FWCore_Concurrency_h
diff --git a/FWCore/Concurrency/interface/hardware_pause.h b/FWCore/Concurrency/interface/hardware_pause.h
index e79acfae999b0..eb15d0516a6e5 100644
--- a/FWCore/Concurrency/interface/hardware_pause.h
+++ b/FWCore/Concurrency/interface/hardware_pause.h
@@ -4,7 +4,7 @@
 //
 // Package:     Concurrency
 // Class  :     hardware_pause
-// 
+//
 /**\class hardware_pause hardware_pause.h FWCore/Concurrency/interface/hardware_pause.h
 
  Description: assembler instruction to allow a short pause
@@ -23,12 +23,11 @@
 
 //NOTE: Taken from libdispatch shims/atomics.h
 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)
-#define hardware_pause()      asm("")
+#define hardware_pause() asm("")
 #endif
 #if defined(__x86_64__) || defined(__i386__)
 #undef hardware_pause
 #define hardware_pause() asm("pause")
 #endif
 
-
 #endif
diff --git a/FWCore/Concurrency/src/SerialTaskQueue.cc b/FWCore/Concurrency/src/SerialTaskQueue.cc
index b9a191574da96..40611dd2b44c7 100644
--- a/FWCore/Concurrency/src/SerialTaskQueue.cc
+++ b/FWCore/Concurrency/src/SerialTaskQueue.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Concurrency
 // Class  :     SerialTaskQueue
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -23,21 +23,19 @@ using namespace edm;
 //
 // member functions
 //
-SerialTaskQueue::~SerialTaskQueue()
-{
+SerialTaskQueue::~SerialTaskQueue() {
   //be certain all tasks have completed
   bool isEmpty = m_tasks.empty();
   bool isTaskChosen = m_taskChosen;
-  if ( (not isEmpty and not isPaused()) or isTaskChosen) {
-    pushAndWait([]() {return;});
+  if ((not isEmpty and not isPaused()) or isTaskChosen) {
+    pushAndWait([]() { return; });
   }
 }
 
-bool
-SerialTaskQueue::resume() {
-  if(0==--m_pauseCount) {
+bool SerialTaskQueue::resume() {
+  if (0 == --m_pauseCount) {
     tbb::task* t = pickNextTask();
-    if(nullptr != t) {
+    if (nullptr != t) {
       tbb::task::spawn(*t);
     }
     return true;
@@ -45,76 +43,73 @@ SerialTaskQueue::resume() {
   return false;
 }
 
-void
-SerialTaskQueue::pushTask(TaskBase* iTask) {
+void SerialTaskQueue::pushTask(TaskBase* iTask) {
   tbb::task* t = pushAndGetNextTask(iTask);
-  if(nullptr!=t) {
-    tbb::task::spawn(*t);      
+  if (nullptr != t) {
+    tbb::task::spawn(*t);
   }
 }
 
-tbb::task* 
-SerialTaskQueue::pushAndGetNextTask(TaskBase* iTask) {
+tbb::task* SerialTaskQueue::pushAndGetNextTask(TaskBase* iTask) {
   tbb::task* returnValue{nullptr};
-  if LIKELY(nullptr!=iTask) {
-    m_tasks.push(iTask);
-    returnValue = pickNextTask();
-  }
+  if
+    LIKELY(nullptr != iTask) {
+      m_tasks.push(iTask);
+      returnValue = pickNextTask();
+    }
   return returnValue;
 }
 
-
-tbb::task*
-SerialTaskQueue::finishedTask() {
+tbb::task* SerialTaskQueue::finishedTask() {
   m_taskChosen.store(false);
   return pickNextTask();
 }
 
-SerialTaskQueue::TaskBase*
-SerialTaskQueue::pickNextTask() {
-  
+SerialTaskQueue::TaskBase* SerialTaskQueue::pickNextTask() {
   bool expect = false;
-  if LIKELY(0 == m_pauseCount and m_taskChosen.compare_exchange_strong(expect,true)) {
-    TaskBase* t=nullptr;
-    if LIKELY(m_tasks.try_pop(t)) {
-      return t;
-    }
-    //no task was actually pulled
-    m_taskChosen.store(false);
-    
-    //was a new entry added after we called 'try_pop' but before we did the clear?
-    expect = false;
-    if(not m_tasks.empty() and m_taskChosen.compare_exchange_strong(expect,true)) {
-      TaskBase* t=nullptr;
-      if(m_tasks.try_pop(t)) {
-        return t;
-      }
-      //no task was still pulled since a different thread beat us to it
+  if
+    LIKELY(0 == m_pauseCount and m_taskChosen.compare_exchange_strong(expect, true)) {
+      TaskBase* t = nullptr;
+      if
+        LIKELY(m_tasks.try_pop(t)) { return t; }
+      //no task was actually pulled
       m_taskChosen.store(false);
-      
+
+      //was a new entry added after we called 'try_pop' but before we did the clear?
+      expect = false;
+      if (not m_tasks.empty() and m_taskChosen.compare_exchange_strong(expect, true)) {
+        TaskBase* t = nullptr;
+        if (m_tasks.try_pop(t)) {
+          return t;
+        }
+        //no task was still pulled since a different thread beat us to it
+        m_taskChosen.store(false);
+      }
     }
-  }
   return nullptr;
 }
 
 void SerialTaskQueue::pushAndWait(tbb::empty_task* iWait, TaskBase* iTask) {
-   auto nextTask = pushAndGetNextTask(iTask);
-   if LIKELY(nullptr != nextTask) {
-     if LIKELY(nextTask == iTask) {
-        //spawn and wait for all requires the task to have its parent set
-        iWait->spawn_and_wait_for_all(*nextTask);
-     } else {
+  auto nextTask = pushAndGetNextTask(iTask);
+  if
+    LIKELY(nullptr != nextTask) {
+      if
+        LIKELY(nextTask == iTask) {
+          //spawn and wait for all requires the task to have its parent set
+          iWait->spawn_and_wait_for_all(*nextTask);
+        }
+      else {
         tbb::task::spawn(*nextTask);
         iWait->wait_for_all();
-     }
-   } else {
-     //a task must already be running in this queue
-     iWait->wait_for_all();              
-   }
-   tbb::task::destroy(*iWait);
+      }
+    }
+  else {
+    //a task must already be running in this queue
+    iWait->wait_for_all();
+  }
+  tbb::task::destroy(*iWait);
 }
 
-
 //
 // const member functions
 //
diff --git a/FWCore/Concurrency/src/ThreadSafeOutputFileStream.cc b/FWCore/Concurrency/src/ThreadSafeOutputFileStream.cc
index fbf2c112471af..9a6ac96a79243 100644
--- a/FWCore/Concurrency/src/ThreadSafeOutputFileStream.cc
+++ b/FWCore/Concurrency/src/ThreadSafeOutputFileStream.cc
@@ -4,12 +4,9 @@
 
 namespace edm {
 
-  ThreadSafeOutputFileStream::ThreadSafeOutputFileStream(std::string const& name)
-    : file_{name}
-  {}
+  ThreadSafeOutputFileStream::ThreadSafeOutputFileStream(std::string const& name) : file_{name} {}
 
-  ThreadSafeOutputFileStream::~ThreadSafeOutputFileStream()
-  {
+  ThreadSafeOutputFileStream::~ThreadSafeOutputFileStream() {
     std::string tmp;
     while (waitingMessages_.try_pop(tmp)) {
       file_ << tmp;
@@ -17,11 +14,9 @@ namespace edm {
     file_.close();
   }
 
-  void
-  ThreadSafeOutputFileStream::write(std::string&& msg)
-  {
+  void ThreadSafeOutputFileStream::write(std::string&& msg) {
     waitingMessages_.push(std::move(msg));
-    bool expected {false};
+    bool expected{false};
     if (msgBeingLogged_.compare_exchange_strong(expected, true)) {
       std::string tmp;
       while (waitingMessages_.try_pop(tmp)) {
@@ -30,4 +25,4 @@ namespace edm {
       msgBeingLogged_.store(false);
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/Concurrency/src/WaitingTaskList.cc b/FWCore/Concurrency/src/WaitingTaskList.cc
index a8f2a335323d7..40678b0257a09 100644
--- a/FWCore/Concurrency/src/WaitingTaskList.cc
+++ b/FWCore/Concurrency/src/WaitingTaskList.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Concurrency
 // Class  :     WaitingTaskList
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -33,25 +33,22 @@ using namespace edm;
 //
 // constructors and destructor
 //
-WaitingTaskList::WaitingTaskList(unsigned int iInitialSize):
-m_head{nullptr},
-m_nodeCache{new WaitNode[iInitialSize]},
-m_nodeCacheSize{iInitialSize},
-m_lastAssignedCacheIndex{0},
-m_waiting{true}
-{
+WaitingTaskList::WaitingTaskList(unsigned int iInitialSize)
+    : m_head{nullptr},
+      m_nodeCache{new WaitNode[iInitialSize]},
+      m_nodeCacheSize{iInitialSize},
+      m_lastAssignedCacheIndex{0},
+      m_waiting{true} {
   auto nodeCache = m_nodeCache.get();
-  for(auto it = nodeCache, itEnd = nodeCache+m_nodeCacheSize; it!=itEnd; ++it) {
-    it->m_fromCache=true;
+  for (auto it = nodeCache, itEnd = nodeCache + m_nodeCacheSize; it != itEnd; ++it) {
+    it->m_fromCache = true;
   }
 }
 
 //
 // member functions
 //
-void
-WaitingTaskList::reset()
-{
+void WaitingTaskList::reset() {
   m_exceptionPtr = std::exception_ptr{};
   unsigned int nSeenTasks = m_lastAssignedCacheIndex;
   m_lastAssignedCacheIndex = 0;
@@ -60,46 +57,42 @@ WaitingTaskList::reset()
     //need to expand so next time we don't have to do any
     // memory requests
     m_nodeCacheSize = nSeenTasks;
-    m_nodeCache.reset( new WaitNode[nSeenTasks] );
+    m_nodeCache.reset(new WaitNode[nSeenTasks]);
     auto nodeCache = m_nodeCache.get();
-    for(auto it = nodeCache, itEnd = nodeCache+m_nodeCacheSize; it!=itEnd; ++it) {
-      it->m_fromCache=true;
+    for (auto it = nodeCache, itEnd = nodeCache + m_nodeCacheSize; it != itEnd; ++it) {
+      it->m_fromCache = true;
     }
   }
   //this will make sure all cores see the changes
   m_waiting = true;
 }
 
-WaitingTaskList::WaitNode*
-WaitingTaskList::createNode(WaitingTask* iTask)
-{
+WaitingTaskList::WaitNode* WaitingTaskList::createNode(WaitingTask* iTask) {
   unsigned int index = m_lastAssignedCacheIndex++;
-  
+
   WaitNode* returnValue;
-  if( index < m_nodeCacheSize) {
-    returnValue = m_nodeCache.get()+index;
+  if (index < m_nodeCacheSize) {
+    returnValue = m_nodeCache.get() + index;
   } else {
     returnValue = new WaitNode;
-    returnValue->m_fromCache=false;
+    returnValue->m_fromCache = false;
   }
   returnValue->m_task = iTask;
   //No other thread can see m_next yet. The caller to create node
   // will be doing a synchronization operation anyway which will
   // make sure m_task and m_next are synched across threads
-  returnValue->m_next.store(returnValue,std::memory_order_relaxed);
-  
+  returnValue->m_next.store(returnValue, std::memory_order_relaxed);
+
   return returnValue;
 }
 
-
-void
-WaitingTaskList::add(WaitingTask* iTask) {
+void WaitingTaskList::add(WaitingTask* iTask) {
   iTask->increment_ref_count();
-  if(!m_waiting) {
-    if(UNLIKELY(bool(m_exceptionPtr))) {
+  if (!m_waiting) {
+    if (UNLIKELY(bool(m_exceptionPtr))) {
       iTask->dependentTaskFailed(m_exceptionPtr);
     }
-    if(0==iTask->decrement_ref_count()) {
+    if (0 == iTask->decrement_ref_count()) {
       tbb::task::spawn(*iTask);
     }
   } else {
@@ -115,8 +108,8 @@ WaitingTaskList::add(WaitingTask* iTask) {
     // the ordering of 'm_head.exchange' call so iTask
     // is guaranteed to be in the link list
 
-    if(nullptr == oldHead) {
-      if(!m_waiting) {
+    if (nullptr == oldHead) {
+      if (!m_waiting) {
         //if finished waiting right before we did the
         // exchange our task will not be spawned. Also,
         // additional threads may be calling add() and swapping
@@ -128,13 +121,12 @@ WaitingTaskList::add(WaitingTask* iTask) {
   }
 }
 
-void
-WaitingTaskList::presetTaskAsFailed(std::exception_ptr iExcept) {
-  if(iExcept and m_waiting) {
+void WaitingTaskList::presetTaskAsFailed(std::exception_ptr iExcept) {
+  if (iExcept and m_waiting) {
     WaitNode* node = m_head.load();
-    while(node) {
+    while (node) {
       WaitNode* next;
-      while(node == (next=node->nextNode())) {
+      while (node == (next = node->nextNode())) {
         hardware_pause();
       }
       node->m_task->dependentTaskFailed(iExcept);
@@ -143,43 +135,39 @@ WaitingTaskList::presetTaskAsFailed(std::exception_ptr iExcept) {
   }
 }
 
-void
-WaitingTaskList::announce()
-{
+void WaitingTaskList::announce() {
   //Need a temporary storage since one of these tasks could
   // cause the next event to start processing which would refill
   // this waiting list after it has been reset
   WaitNode* n = m_head.exchange(nullptr);
   WaitNode* next;
-  while(n) {
+  while (n) {
     //it is possible that 'WaitingTaskList::add' is running in a different
     // thread and we have a new 'head' but the old head has not yet been
     // attached to the new head (we identify this since 'nextNode' will return itself).
     //  In that case we have to wait until the link has been established before going on.
-    while(n == (next=n->nextNode())) {
+    while (n == (next = n->nextNode())) {
       hardware_pause();
     }
     auto t = n->m_task;
-    if(UNLIKELY(bool(m_exceptionPtr))) {
+    if (UNLIKELY(bool(m_exceptionPtr))) {
       t->dependentTaskFailed(m_exceptionPtr);
     }
-    if(!n->m_fromCache ) {
+    if (!n->m_fromCache) {
       delete n;
     }
-    n=next;
+    n = next;
 
     //the task may indirectly call WaitingTaskList::reset
     // so we need to call spawn after we are done using the node.
-    if(0==t->decrement_ref_count()){
+    if (0 == t->decrement_ref_count()) {
       tbb::task::spawn(*t);
     }
   }
 }
 
-void
-WaitingTaskList::doneWaiting(std::exception_ptr iPtr)
-{
+void WaitingTaskList::doneWaiting(std::exception_ptr iPtr) {
   m_exceptionPtr = iPtr;
-  m_waiting=false;
+  m_waiting = false;
   announce();
 }
diff --git a/FWCore/Concurrency/src/WaitingTaskWithArenaHolder.cc b/FWCore/Concurrency/src/WaitingTaskWithArenaHolder.cc
index d890bfc316cf8..a80aa82ece829 100644
--- a/FWCore/Concurrency/src/WaitingTaskWithArenaHolder.cc
+++ b/FWCore/Concurrency/src/WaitingTaskWithArenaHolder.cc
@@ -12,16 +12,13 @@
 
 namespace edm {
 
-  WaitingTaskWithArenaHolder::WaitingTaskWithArenaHolder() : m_task(nullptr) {
-  }
+  WaitingTaskWithArenaHolder::WaitingTaskWithArenaHolder() : m_task(nullptr) {}
 
   // Note that the arena will be the one containing the thread
   // that runs this constructor. This is the arena where you
   // eventually intend for the task to be spawned.
-  WaitingTaskWithArenaHolder::WaitingTaskWithArenaHolder(WaitingTask* iTask) :
-    m_task(iTask),
-    m_arena(std::make_shared<tbb::task_arena>(tbb::task_arena::attach())) {
-
+  WaitingTaskWithArenaHolder::WaitingTaskWithArenaHolder(WaitingTask* iTask)
+      : m_task(iTask), m_arena(std::make_shared<tbb::task_arena>(tbb::task_arena::attach())) {
     m_task->increment_ref_count();
   }
 
@@ -31,17 +28,13 @@ namespace edm {
     }
   }
 
-  WaitingTaskWithArenaHolder::WaitingTaskWithArenaHolder(WaitingTaskWithArenaHolder const& iHolder) :
-    m_task(iHolder.m_task),
-    m_arena(iHolder.m_arena) {
-
+  WaitingTaskWithArenaHolder::WaitingTaskWithArenaHolder(WaitingTaskWithArenaHolder const& iHolder)
+      : m_task(iHolder.m_task), m_arena(iHolder.m_arena) {
     m_task->increment_ref_count();
   }
 
-  WaitingTaskWithArenaHolder::WaitingTaskWithArenaHolder(WaitingTaskWithArenaHolder&& iOther) :
-    m_task(iOther.m_task),
-    m_arena(std::move(iOther.m_arena)) {
-
+  WaitingTaskWithArenaHolder::WaitingTaskWithArenaHolder(WaitingTaskWithArenaHolder&& iOther)
+      : m_task(iOther.m_task), m_arena(std::move(iOther.m_arena)) {
     iOther.m_task = nullptr;
   }
 
@@ -76,7 +69,7 @@ namespace edm {
     if (0 == task->decrement_ref_count()) {
       // The enqueue call will cause a worker thread to be created in
       // the arena if there is not one already.
-      m_arena->enqueue( [task = task](){ tbb::task::spawn(*task); });
+      m_arena->enqueue([task = task]() { tbb::task::spawn(*task); });
     }
   }
 
@@ -98,4 +91,4 @@ namespace edm {
     m_task = nullptr;
     return holder;
   }
-}
+}  // namespace edm
diff --git a/FWCore/Concurrency/src/Xerces.cc b/FWCore/Concurrency/src/Xerces.cc
index e5088aed53d49..ec5365d748e3e 100644
--- a/FWCore/Concurrency/src/Xerces.cc
+++ b/FWCore/Concurrency/src/Xerces.cc
@@ -24,6 +24,5 @@ namespace cms {
       std::unique_lock<std::mutex> l(g_xerces_mutex);
       XMLPlatformUtils::Terminate();
     }
-  }
-}
-
+  }  // namespace concurrency
+}  // namespace cms
diff --git a/FWCore/Concurrency/test/ThreadSafeAddOnlyContainer_t.cpp b/FWCore/Concurrency/test/ThreadSafeAddOnlyContainer_t.cpp
index 13cc573f0a49a..680a7d95b9614 100644
--- a/FWCore/Concurrency/test/ThreadSafeAddOnlyContainer_t.cpp
+++ b/FWCore/Concurrency/test/ThreadSafeAddOnlyContainer_t.cpp
@@ -7,9 +7,7 @@ namespace {
   template <typename U, typename V>
   class X {
   public:
-    X(U const& a, V const& b, double c) : a_(a), b_(b), c_(c) {
-      std::cout << "Constructing " << a_ << std::endl;
-    }
+    X(U const& a, V const& b, double c) : a_(a), b_(b), c_(c) { std::cout << "Constructing " << a_ << std::endl; }
     ~X() { std::cout << "~X " << a_ << std::endl; }
     U a_;
     V b_;
@@ -21,26 +19,27 @@ namespace {
     Y() { std::cout << "constructing Y" << std::endl; }
     ~Y() { std::cout << "~Y" << std::endl; }
   };
-}
+}  // namespace
 
 int main() {
-
   edm::ThreadSafeAddOnlyContainer<int> container1;
   int* ptr1 = container1.makeAndHold(11);
   // std::cout << *ptr1 << std::endl;
-  if (*ptr1 != 11) abort();
+  if (*ptr1 != 11)
+    abort();
 
-  edm::ThreadSafeAddOnlyContainer<X<std::string,int> > container2;
+  edm::ThreadSafeAddOnlyContainer<X<std::string, int> > container2;
   X<std::string, int>* ptr2 = container2.makeAndHold(std::string("FOO"), 11, 21.0);
   // std::cout << ptr2->a_ << " " << ptr2->b_ << " " << ptr2->c_ << std::endl;
-  if (ptr2->a_ != "FOO" || ptr2->b_ != 11 || ptr2->c_ != 21.0) abort();
-
+  if (ptr2->a_ != "FOO" || ptr2->b_ != 11 || ptr2->c_ != 21.0)
+    abort();
 
   X<std::string, int>* ptr3 = container2.makeAndHold(std::string("BAR"), 111, 121.0);
   // std::cout << ptr3->a_ << " " << ptr3->b_ << " " << ptr3->c_ << std::endl;
-  if (ptr3->a_ != "BAR" || ptr3->b_ != 111 || ptr3->c_ != 121.0) abort();
+  if (ptr3->a_ != "BAR" || ptr3->b_ != 111 || ptr3->c_ != 121.0)
+    abort();
 
-  edm::ThreadSafeAddOnlyContainer<X<std::string,int> > container3;
+  edm::ThreadSafeAddOnlyContainer<X<std::string, int> > container3;
 
   edm::ThreadSafeAddOnlyContainer<Y> container4;
   container4.makeAndHold();
diff --git a/FWCore/Concurrency/test/limitedtaskqueue_t.cppunit.cpp b/FWCore/Concurrency/test/limitedtaskqueue_t.cppunit.cpp
index 84d4af4b86ab8..ac42a87384202 100644
--- a/FWCore/Concurrency/test/limitedtaskqueue_t.cppunit.cpp
+++ b/FWCore/Concurrency/test/limitedtaskqueue_t.cppunit.cpp
@@ -22,282 +22,279 @@ class LimitedTaskQueue_test : public CppUnit::TestFixture {
   CPPUNIT_TEST(testPause);
   CPPUNIT_TEST(stressTest);
   CPPUNIT_TEST_SUITE_END();
-  
+
 public:
   void testPush();
   void testPushAndWait();
   void testPause();
   void stressTest();
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 };
 
-CPPUNIT_TEST_SUITE_REGISTRATION( LimitedTaskQueue_test );
+CPPUNIT_TEST_SUITE_REGISTRATION(LimitedTaskQueue_test);
 
-void LimitedTaskQueue_test::testPush()
-{
+void LimitedTaskQueue_test::testPush() {
   {
-   std::atomic<unsigned int> count{0};
-   
-   edm::LimitedTaskQueue queue{1};
-   {
+    std::atomic<unsigned int> count{0};
+
+    edm::LimitedTaskQueue queue{1};
+    {
       std::shared_ptr<tbb::task> waitTask{new (tbb::task::allocate_root()) tbb::empty_task{},
-                                            [](tbb::task* iTask){tbb::task::destroy(*iTask);} };
-      waitTask->set_ref_count(1+3);
+                                          [](tbb::task* iTask) { tbb::task::destroy(*iTask); }};
+      waitTask->set_ref_count(1 + 3);
       tbb::task* pWaitTask = waitTask.get();
-   
-      queue.push([&count,pWaitTask]{
-         CPPUNIT_ASSERT(count++ == 0);
-         usleep(10);
-         pWaitTask->decrement_ref_count();
+
+      queue.push([&count, pWaitTask] {
+        CPPUNIT_ASSERT(count++ == 0);
+        usleep(10);
+        pWaitTask->decrement_ref_count();
       });
 
-      queue.push([&count,pWaitTask]{
-         CPPUNIT_ASSERT(count++ == 1);
-         usleep(10);
-         pWaitTask->decrement_ref_count();
+      queue.push([&count, pWaitTask] {
+        CPPUNIT_ASSERT(count++ == 1);
+        usleep(10);
+        pWaitTask->decrement_ref_count();
       });
 
-      queue.push([&count,pWaitTask]{
-         CPPUNIT_ASSERT(count++ == 2);
-         usleep(10);
-         pWaitTask->decrement_ref_count();
+      queue.push([&count, pWaitTask] {
+        CPPUNIT_ASSERT(count++ == 2);
+        usleep(10);
+        pWaitTask->decrement_ref_count();
       });
 
       waitTask->wait_for_all();
-      CPPUNIT_ASSERT(count==3);
-   }
+      CPPUNIT_ASSERT(count == 3);
+    }
   }
-  
+
   {
     std::atomic<unsigned int> count{0};
-    
+
     constexpr unsigned int kMax = 2;
     edm::LimitedTaskQueue queue{kMax};
     {
       std::shared_ptr<tbb::task> waitTask{new (tbb::task::allocate_root()) tbb::empty_task{},
-        [](tbb::task* iTask){tbb::task::destroy(*iTask);} };
-      waitTask->set_ref_count(1+3);
+                                          [](tbb::task* iTask) { tbb::task::destroy(*iTask); }};
+      waitTask->set_ref_count(1 + 3);
       tbb::task* pWaitTask = waitTask.get();
-      
-      queue.push([&count,pWaitTask]{
+
+      queue.push([&count, pWaitTask] {
         CPPUNIT_ASSERT(count++ < kMax);
         usleep(10);
         --count;
         pWaitTask->decrement_ref_count();
       });
-      
-      queue.push([&count,pWaitTask]{
+
+      queue.push([&count, pWaitTask] {
         CPPUNIT_ASSERT(count++ < kMax);
         usleep(10);
         --count;
         pWaitTask->decrement_ref_count();
       });
-      
-      queue.push([&count,pWaitTask]{
+
+      queue.push([&count, pWaitTask] {
         CPPUNIT_ASSERT(count++ < kMax);
         usleep(10);
         --count;
         pWaitTask->decrement_ref_count();
       });
-      
+
       waitTask->wait_for_all();
-      CPPUNIT_ASSERT(count==0);
+      CPPUNIT_ASSERT(count == 0);
     }
   }
 }
 
-void LimitedTaskQueue_test::testPushAndWait()
-{
+void LimitedTaskQueue_test::testPushAndWait() {
   {
-   std::atomic<unsigned int> count{0};
-   
-   edm::LimitedTaskQueue queue{1};
-   {
-      queue.push([&count]{
-         CPPUNIT_ASSERT(count++ == 0);
-         usleep(10);
+    std::atomic<unsigned int> count{0};
+
+    edm::LimitedTaskQueue queue{1};
+    {
+      queue.push([&count] {
+        CPPUNIT_ASSERT(count++ == 0);
+        usleep(10);
       });
 
-      queue.push([&count]{
-         CPPUNIT_ASSERT(count++ == 1);
-         usleep(10);
+      queue.push([&count] {
+        CPPUNIT_ASSERT(count++ == 1);
+        usleep(10);
       });
 
-      queue.pushAndWait([&count]{
-         CPPUNIT_ASSERT(count++ == 2);
-         usleep(10);
-      }); 
+      queue.pushAndWait([&count] {
+        CPPUNIT_ASSERT(count++ == 2);
+        usleep(10);
+      });
 
-      CPPUNIT_ASSERT(count==3);
-   }
+      CPPUNIT_ASSERT(count == 3);
+    }
   }
-  
+
   {
     std::atomic<unsigned int> count{0};
     std::atomic<unsigned int> countTasksRun{0};
     constexpr unsigned int kMax = 2;
-    
+
     edm::LimitedTaskQueue queue{kMax};
     {
-      
-      queue.pushAndWait([&count,&countTasksRun]{
+      queue.pushAndWait([&count, &countTasksRun] {
         CPPUNIT_ASSERT(count++ < kMax);
         usleep(10);
         --count;
-        CPPUNIT_ASSERT( 1==++countTasksRun);
+        CPPUNIT_ASSERT(1 == ++countTasksRun);
       });
-      
-      queue.pushAndWait([&count,&countTasksRun]{
+
+      queue.pushAndWait([&count, &countTasksRun] {
         CPPUNIT_ASSERT(count++ < kMax);
         usleep(10);
         --count;
-        CPPUNIT_ASSERT( 2==++countTasksRun);
+        CPPUNIT_ASSERT(2 == ++countTasksRun);
       });
-      
-      queue.pushAndWait([&count,&countTasksRun]{
+
+      queue.pushAndWait([&count, &countTasksRun] {
         CPPUNIT_ASSERT(count++ < kMax);
         usleep(10);
         --count;
-        CPPUNIT_ASSERT( 3==++countTasksRun);
+        CPPUNIT_ASSERT(3 == ++countTasksRun);
       });
-      
+
       auto c = count.load();
-      if( c != 0) {
-        std::cout <<"ERROR count "<< c<<" != 0"<<std::endl;
+      if (c != 0) {
+        std::cout << "ERROR count " << c << " != 0" << std::endl;
       }
-      CPPUNIT_ASSERT(count==0);
-      
+      CPPUNIT_ASSERT(count == 0);
+
       auto v = countTasksRun.load();
-      if(v != 3) {
-        std::cout <<"ERROR # tasks Run "<< v<<" != 3"<<std::endl;
+      if (v != 3) {
+        std::cout << "ERROR # tasks Run " << v << " != 3" << std::endl;
       }
-      CPPUNIT_ASSERT(v==3);
+      CPPUNIT_ASSERT(v == 3);
     }
   }
-
 }
-void LimitedTaskQueue_test::testPause()
-{
+void LimitedTaskQueue_test::testPause() {
   std::atomic<unsigned int> count{0};
-  
+
   edm::LimitedTaskQueue queue{1};
   {
     {
       std::shared_ptr<tbb::task> waitTask{new (tbb::task::allocate_root()) tbb::empty_task{},
-        [](tbb::task* iTask){tbb::task::destroy(*iTask);} };
-      waitTask->set_ref_count(1+3);
+                                          [](tbb::task* iTask) { tbb::task::destroy(*iTask); }};
+      waitTask->set_ref_count(1 + 3);
       tbb::task* pWaitTask = waitTask.get();
       edm::LimitedTaskQueue::Resumer resumer;
       std::atomic<bool> resumerSet{false};
       std::exception_ptr e1;
-      queue.pushAndPause([&resumer,&resumerSet,&count,pWaitTask,&e1](edm::LimitedTaskQueue::Resumer iResumer){
+      queue.pushAndPause([&resumer, &resumerSet, &count, pWaitTask, &e1](edm::LimitedTaskQueue::Resumer iResumer) {
         resumer = std::move(iResumer);
         resumerSet = true;
         try {
           CPPUNIT_ASSERT(++count == 1);
-        } catch(...) {
+        } catch (...) {
           e1 = std::current_exception();
         }
         pWaitTask->decrement_ref_count();
       });
 
       std::exception_ptr e2;
-      queue.push([&count,pWaitTask,&e2]{
-        try{
+      queue.push([&count, pWaitTask, &e2] {
+        try {
           CPPUNIT_ASSERT(++count == 2);
-        } catch(...) {
+        } catch (...) {
           e2 = std::current_exception();
         }
         pWaitTask->decrement_ref_count();
       });
-      
+
       std::exception_ptr e3;
-      queue.push([&count,pWaitTask,&e3]{
+      queue.push([&count, pWaitTask, &e3] {
         try {
           CPPUNIT_ASSERT(++count == 3);
-        }catch(...){
+        } catch (...) {
           e3 = std::current_exception();
         }
         pWaitTask->decrement_ref_count();
       });
       usleep(100);
       //can't do == since the queue may not have processed the first task yet
-      CPPUNIT_ASSERT(2>=count);
-      while(not resumerSet) {}
+      CPPUNIT_ASSERT(2 >= count);
+      while (not resumerSet) {
+      }
       CPPUNIT_ASSERT(resumer.resume());
       waitTask->wait_for_all();
-      CPPUNIT_ASSERT(count==3);
-      if(e1) { std::rethrow_exception(e1);}
-      if(e2) { std::rethrow_exception(e2);}
-      if(e3) { std::rethrow_exception(e3);}
+      CPPUNIT_ASSERT(count == 3);
+      if (e1) {
+        std::rethrow_exception(e1);
+      }
+      if (e2) {
+        std::rethrow_exception(e2);
+      }
+      if (e3) {
+        std::rethrow_exception(e3);
+      }
     }
   }
 }
 
-void LimitedTaskQueue_test::stressTest()
-{
-   constexpr unsigned int kMax = 3;
-   edm::LimitedTaskQueue queue{kMax};
-   
-   unsigned int index = 100;
-   const unsigned int nTasks = 1000;
-   while(0 != --index) {
-      std::shared_ptr<tbb::task> waitTask{new (tbb::task::allocate_root()) tbb::empty_task{},
-                                            [](tbb::task* iTask){tbb::task::destroy(*iTask);} };
-      waitTask->set_ref_count(3);
-      tbb::task* pWaitTask=waitTask.get();
-      std::atomic<unsigned int> count{0};
-      std::atomic<unsigned int> nRunningTasks{0};
-     
-      std::atomic<bool> waitToStart{true};
-      {
-         auto j = edm::make_functor_task(tbb::task::allocate_root(),
-                                    [&queue,&waitToStart,pWaitTask,&count,&nRunningTasks]{
-            //gcc 4.7 doesn't preserve the 'atomic' nature of waitToStart in the loop
-            while(waitToStart.load()) {__sync_synchronize();};
-                 std::shared_ptr<tbb::task> guard{pWaitTask,[](tbb::task*iTask) {
-                   iTask->decrement_ref_count();}};
-                  for(unsigned int i = 0; i<nTasks;++i) {
-                     pWaitTask->increment_ref_count();
-                     queue.push([&count,pWaitTask,&nRunningTasks] {
-                       std::shared_ptr<tbb::task> guard{pWaitTask,[](tbb::task*iTask) {
-                         iTask->decrement_ref_count();}};
-                       auto nrt = nRunningTasks++;
-                       if( nrt >= kMax) {
-                         std::cout <<"ERROR "<<nRunningTasks<< " >= "<<kMax<<std::endl;
-                       }
-                        CPPUNIT_ASSERT(nrt < kMax);
-                        ++count;
-                        --nRunningTasks;
-                     });
-                  }
-         });
-         tbb::task::enqueue(*j);
-        
-         waitToStart=false;
-         for(unsigned int i=0; i<nTasks;++i) {
-            pWaitTask->increment_ref_count();
-            queue.push([&count,pWaitTask,&nRunningTasks] {
-              std::shared_ptr<tbb::task> guard{pWaitTask,[](tbb::task*iTask) {
-                iTask->decrement_ref_count();}};
-              auto nrt = nRunningTasks++;
-              if( nrt >= kMax) {
-                std::cout <<"ERROR "<<nRunningTasks<< " >= "<<kMax<<std::endl;
-              }
-              CPPUNIT_ASSERT(nrt < kMax);
-               ++count;
-               --nRunningTasks;
-            });
-         }
-         pWaitTask->decrement_ref_count();
-      }
-      waitTask->wait_for_all();
+void LimitedTaskQueue_test::stressTest() {
+  constexpr unsigned int kMax = 3;
+  edm::LimitedTaskQueue queue{kMax};
 
-      CPPUNIT_ASSERT( 0 == nRunningTasks);
-      CPPUNIT_ASSERT(2*nTasks==count);
-   }
-}
+  unsigned int index = 100;
+  const unsigned int nTasks = 1000;
+  while (0 != --index) {
+    std::shared_ptr<tbb::task> waitTask{new (tbb::task::allocate_root()) tbb::empty_task{},
+                                        [](tbb::task* iTask) { tbb::task::destroy(*iTask); }};
+    waitTask->set_ref_count(3);
+    tbb::task* pWaitTask = waitTask.get();
+    std::atomic<unsigned int> count{0};
+    std::atomic<unsigned int> nRunningTasks{0};
 
+    std::atomic<bool> waitToStart{true};
+    {
+      auto j =
+          edm::make_functor_task(tbb::task::allocate_root(), [&queue, &waitToStart, pWaitTask, &count, &nRunningTasks] {
+            //gcc 4.7 doesn't preserve the 'atomic' nature of waitToStart in the loop
+            while (waitToStart.load()) {
+              __sync_synchronize();
+            };
+            std::shared_ptr<tbb::task> guard{pWaitTask, [](tbb::task* iTask) { iTask->decrement_ref_count(); }};
+            for (unsigned int i = 0; i < nTasks; ++i) {
+              pWaitTask->increment_ref_count();
+              queue.push([&count, pWaitTask, &nRunningTasks] {
+                std::shared_ptr<tbb::task> guard{pWaitTask, [](tbb::task* iTask) { iTask->decrement_ref_count(); }};
+                auto nrt = nRunningTasks++;
+                if (nrt >= kMax) {
+                  std::cout << "ERROR " << nRunningTasks << " >= " << kMax << std::endl;
+                }
+                CPPUNIT_ASSERT(nrt < kMax);
+                ++count;
+                --nRunningTasks;
+              });
+            }
+          });
+      tbb::task::enqueue(*j);
 
+      waitToStart = false;
+      for (unsigned int i = 0; i < nTasks; ++i) {
+        pWaitTask->increment_ref_count();
+        queue.push([&count, pWaitTask, &nRunningTasks] {
+          std::shared_ptr<tbb::task> guard{pWaitTask, [](tbb::task* iTask) { iTask->decrement_ref_count(); }};
+          auto nrt = nRunningTasks++;
+          if (nrt >= kMax) {
+            std::cout << "ERROR " << nRunningTasks << " >= " << kMax << std::endl;
+          }
+          CPPUNIT_ASSERT(nrt < kMax);
+          ++count;
+          --nRunningTasks;
+        });
+      }
+      pWaitTask->decrement_ref_count();
+    }
+    waitTask->wait_for_all();
 
+    CPPUNIT_ASSERT(0 == nRunningTasks);
+    CPPUNIT_ASSERT(2 * nTasks == count);
+  }
+}
diff --git a/FWCore/Concurrency/test/serialtaskqueue_t.cppunit.cpp b/FWCore/Concurrency/test/serialtaskqueue_t.cppunit.cpp
index a73a6186c6119..e15057db697ee 100644
--- a/FWCore/Concurrency/test/serialtaskqueue_t.cppunit.cpp
+++ b/FWCore/Concurrency/test/serialtaskqueue_t.cppunit.cpp
@@ -22,179 +22,172 @@ class SerialTaskQueue_test : public CppUnit::TestFixture {
   CPPUNIT_TEST(testPause);
   CPPUNIT_TEST(stressTest);
   CPPUNIT_TEST_SUITE_END();
-  
+
 public:
   void testPush();
   void testPushAndWait();
   void testPause();
   void stressTest();
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 };
 
-CPPUNIT_TEST_SUITE_REGISTRATION( SerialTaskQueue_test );
+CPPUNIT_TEST_SUITE_REGISTRATION(SerialTaskQueue_test);
+
+void SerialTaskQueue_test::testPush() {
+  std::atomic<unsigned int> count{0};
+
+  edm::SerialTaskQueue queue;
+  {
+    std::shared_ptr<tbb::task> waitTask{new (tbb::task::allocate_root()) tbb::empty_task{},
+                                        [](tbb::task* iTask) { tbb::task::destroy(*iTask); }};
+    waitTask->set_ref_count(1 + 3);
+    tbb::task* pWaitTask = waitTask.get();
+
+    queue.push([&count, pWaitTask] {
+      CPPUNIT_ASSERT(count++ == 0);
+      usleep(10);
+      pWaitTask->decrement_ref_count();
+    });
+
+    queue.push([&count, pWaitTask] {
+      CPPUNIT_ASSERT(count++ == 1);
+      usleep(10);
+      pWaitTask->decrement_ref_count();
+    });
+
+    queue.push([&count, pWaitTask] {
+      CPPUNIT_ASSERT(count++ == 2);
+      usleep(10);
+      pWaitTask->decrement_ref_count();
+    });
+
+    waitTask->wait_for_all();
+    CPPUNIT_ASSERT(count == 3);
+  }
+}
 
-void SerialTaskQueue_test::testPush()
-{
-   std::atomic<unsigned int> count{0};
-   
-   edm::SerialTaskQueue queue;
-   {
-      std::shared_ptr<tbb::task> waitTask{new (tbb::task::allocate_root()) tbb::empty_task{},
-                                            [](tbb::task* iTask){tbb::task::destroy(*iTask);} };
-      waitTask->set_ref_count(1+3);
-      tbb::task* pWaitTask = waitTask.get();
-   
-      queue.push([&count,pWaitTask]{
-         CPPUNIT_ASSERT(count++ == 0);
-         usleep(10);
-         pWaitTask->decrement_ref_count();
-      });
+void SerialTaskQueue_test::testPushAndWait() {
+  std::atomic<unsigned int> count{0};
 
-      queue.push([&count,pWaitTask]{
-         CPPUNIT_ASSERT(count++ == 1);
-         usleep(10);
-         pWaitTask->decrement_ref_count();
-      });
+  edm::SerialTaskQueue queue;
+  {
+    queue.push([&count] {
+      CPPUNIT_ASSERT(count++ == 0);
+      usleep(10);
+    });
 
-      queue.push([&count,pWaitTask]{
-         CPPUNIT_ASSERT(count++ == 2);
-         usleep(10);
-         pWaitTask->decrement_ref_count();
-      });
+    queue.push([&count] {
+      CPPUNIT_ASSERT(count++ == 1);
+      usleep(10);
+    });
 
-      waitTask->wait_for_all();
-      CPPUNIT_ASSERT(count==3);
-   }
-   
+    queue.pushAndWait([&count] {
+      CPPUNIT_ASSERT(count++ == 2);
+      usleep(10);
+    });
+
+    CPPUNIT_ASSERT(count == 3);
+  }
 }
 
-void SerialTaskQueue_test::testPushAndWait()
-{
-   std::atomic<unsigned int> count{0};
-   
-   edm::SerialTaskQueue queue;
-   {
-      queue.push([&count]{
-         CPPUNIT_ASSERT(count++ == 0);
-         usleep(10);
-      });
+void SerialTaskQueue_test::testPause() {
+  std::atomic<unsigned int> count{0};
+
+  edm::SerialTaskQueue queue;
+  {
+    queue.pause();
+    {
+      std::shared_ptr<tbb::task> waitTask{new (tbb::task::allocate_root()) tbb::empty_task{},
+                                          [](tbb::task* iTask) { tbb::task::destroy(*iTask); }};
+      waitTask->set_ref_count(1 + 1);
+      tbb::task* pWaitTask = waitTask.get();
 
-      queue.push([&count]{
-         CPPUNIT_ASSERT(count++ == 1);
-         usleep(10);
+      queue.push([&count, pWaitTask] {
+        CPPUNIT_ASSERT(count++ == 0);
+        pWaitTask->decrement_ref_count();
       });
+      usleep(1000);
+      CPPUNIT_ASSERT(0 == count);
+      queue.resume();
+      waitTask->wait_for_all();
+      CPPUNIT_ASSERT(count == 1);
+    }
 
-      queue.pushAndWait([&count]{
-         CPPUNIT_ASSERT(count++ == 2);
-         usleep(10);
-      }); 
+    {
+      std::shared_ptr<tbb::task> waitTask{new (tbb::task::allocate_root()) tbb::empty_task{},
+                                          [](tbb::task* iTask) { tbb::task::destroy(*iTask); }};
+      waitTask->set_ref_count(1 + 3);
+      tbb::task* pWaitTask = waitTask.get();
 
-      CPPUNIT_ASSERT(count==3);
-   }
+      queue.push([&count, &queue, pWaitTask] {
+        queue.pause();
+        CPPUNIT_ASSERT(count++ == 1);
+        pWaitTask->decrement_ref_count();
+      });
+      queue.push([&count, pWaitTask] {
+        CPPUNIT_ASSERT(count++ == 2);
+        pWaitTask->decrement_ref_count();
+      });
+      queue.push([&count, pWaitTask] {
+        CPPUNIT_ASSERT(count++ == 3);
+        pWaitTask->decrement_ref_count();
+      });
+      usleep(100);
+      //can't do == since the queue may not have processed the first task yet
+      CPPUNIT_ASSERT(2 >= count);
+      queue.resume();
+      waitTask->wait_for_all();
+      CPPUNIT_ASSERT(count == 4);
+    }
+  }
 }
 
-void SerialTaskQueue_test::testPause()
-{
-   std::atomic<unsigned int> count{0};
-   
-   edm::SerialTaskQueue queue;
-   {
-      queue.pause();
-      {
-         std::shared_ptr<tbb::task> waitTask{new (tbb::task::allocate_root()) tbb::empty_task{},
-                                             [](tbb::task* iTask){tbb::task::destroy(*iTask);} };
-         waitTask->set_ref_count(1+1);
-         tbb::task* pWaitTask = waitTask.get();
-   
-         queue.push([&count,pWaitTask]{
-            CPPUNIT_ASSERT(count++ == 0);
-            pWaitTask->decrement_ref_count();
-         });
-         usleep(1000);
-         CPPUNIT_ASSERT(0==count);
-         queue.resume();
-         waitTask->wait_for_all();
-         CPPUNIT_ASSERT(count==1);
-      }
-
-      {
-         std::shared_ptr<tbb::task> waitTask{new (tbb::task::allocate_root()) tbb::empty_task{},
-                                             [](tbb::task* iTask){tbb::task::destroy(*iTask);} };
-         waitTask->set_ref_count(1+3);
-         tbb::task* pWaitTask = waitTask.get();
-   
-         queue.push([&count,&queue,pWaitTask]{
-            queue.pause();
-            CPPUNIT_ASSERT(count++ == 1);
-            pWaitTask->decrement_ref_count();
-         });
-         queue.push([&count,pWaitTask]{
-            CPPUNIT_ASSERT(count++ == 2);
-            pWaitTask->decrement_ref_count();
-         });
-         queue.push([&count,pWaitTask]{
-            CPPUNIT_ASSERT(count++ == 3);
+void SerialTaskQueue_test::stressTest() {
+  edm::SerialTaskQueue queue;
+
+  unsigned int index = 100;
+  const unsigned int nTasks = 1000;
+  while (0 != --index) {
+    std::shared_ptr<tbb::task> waitTask{new (tbb::task::allocate_root()) tbb::empty_task{},
+                                        [](tbb::task* iTask) { tbb::task::destroy(*iTask); }};
+    waitTask->set_ref_count(3);
+    tbb::task* pWaitTask = waitTask.get();
+    std::atomic<unsigned int> count{0};
+
+    std::atomic<bool> waitToStart{true};
+    {
+      auto j = edm::make_functor_task(tbb::task::allocate_root(), [&queue, &waitToStart, pWaitTask, &count] {
+        //gcc 4.7 doesn't preserve the 'atomic' nature of waitToStart in the loop
+        while (waitToStart.load()) {
+          __sync_synchronize();
+        };
+        for (unsigned int i = 0; i < nTasks; ++i) {
+          pWaitTask->increment_ref_count();
+          queue.push([&count, pWaitTask] {
+            ++count;
             pWaitTask->decrement_ref_count();
-         });
-         usleep(100);
-         //can't do == since the queue may not have processed the first task yet
-         CPPUNIT_ASSERT(2>=count);
-         queue.resume();
-         waitTask->wait_for_all();
-         CPPUNIT_ASSERT(count==4);
-      }
-   }
-   
-}
+          });
+        }
 
-void SerialTaskQueue_test::stressTest()
-{
-   edm::SerialTaskQueue queue;
-   
-   unsigned int index = 100;
-   const unsigned int nTasks = 1000;
-   while(0 != --index) {
-      std::shared_ptr<tbb::task> waitTask{new (tbb::task::allocate_root()) tbb::empty_task{},
-                                            [](tbb::task* iTask){tbb::task::destroy(*iTask);} };
-      waitTask->set_ref_count(3);
-      tbb::task* pWaitTask=waitTask.get();
-      std::atomic<unsigned int> count{0};
-      
-      std::atomic<bool> waitToStart{true};
-      {
-         auto j = edm::make_functor_task(tbb::task::allocate_root(),
-                                         [&queue,&waitToStart,pWaitTask,&count]{
-	    //gcc 4.7 doesn't preserve the 'atomic' nature of waitToStart in the loop
-	    while(waitToStart.load()) {__sync_synchronize();};
-            for(unsigned int i = 0; i<nTasks;++i) {
-               pWaitTask->increment_ref_count();
-               queue.push([&count,pWaitTask] {
-                  ++count;
-                  pWaitTask->decrement_ref_count();
-               });
-            }
-         
-            pWaitTask->decrement_ref_count();
-            });
-         tbb::task::enqueue(*j);
-         
-         waitToStart=false;
-         for(unsigned int i=0; i<nTasks;++i) {
-            pWaitTask->increment_ref_count();
-            queue.push([&count,pWaitTask] {
-               ++count;
-               pWaitTask->decrement_ref_count();
-            });
-         }
-         pWaitTask->decrement_ref_count();
+        pWaitTask->decrement_ref_count();
+      });
+      tbb::task::enqueue(*j);
+
+      waitToStart = false;
+      for (unsigned int i = 0; i < nTasks; ++i) {
+        pWaitTask->increment_ref_count();
+        queue.push([&count, pWaitTask] {
+          ++count;
+          pWaitTask->decrement_ref_count();
+        });
       }
-      waitTask->wait_for_all();
+      pWaitTask->decrement_ref_count();
+    }
+    waitTask->wait_for_all();
 
-      CPPUNIT_ASSERT(2*nTasks==count);
-   }
+    CPPUNIT_ASSERT(2 * nTasks == count);
+  }
 }
 
-
-
 #include <Utilities/Testing/interface/CppUnit_testdriver.icpp>
diff --git a/FWCore/Concurrency/test/serialtaskqueuechain_t.cppunit.cpp b/FWCore/Concurrency/test/serialtaskqueuechain_t.cppunit.cpp
index 4bf146b6be468..6fda4d8092f09 100644
--- a/FWCore/Concurrency/test/serialtaskqueuechain_t.cppunit.cpp
+++ b/FWCore/Concurrency/test/serialtaskqueuechain_t.cppunit.cpp
@@ -24,204 +24,201 @@ class SerialTaskQueueChain_test : public CppUnit::TestFixture {
   CPPUNIT_TEST(testPushAndWaitOne);
   CPPUNIT_TEST(stressTest);
   CPPUNIT_TEST_SUITE_END();
-  
+
 public:
   void testPush();
   void testPushOne();
   void testPushAndWait();
   void testPushAndWaitOne();
   void stressTest();
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 };
 
-CPPUNIT_TEST_SUITE_REGISTRATION( SerialTaskQueueChain_test );
-
-void SerialTaskQueueChain_test::testPush()
-{
-   std::atomic<unsigned int> count{0};
-  
-  
-  std::vector<std::shared_ptr<edm::SerialTaskQueue>> queues = {std::make_shared<edm::SerialTaskQueue>(), std::make_shared<edm::SerialTaskQueue>()};
-   edm::SerialTaskQueueChain chain(queues);
-   {
-      std::shared_ptr<tbb::task> waitTask{new (tbb::task::allocate_root()) tbb::empty_task{},
-                                            [](tbb::task* iTask){tbb::task::destroy(*iTask);} };
-      waitTask->set_ref_count(1+3);
-      tbb::task* pWaitTask = waitTask.get();
-   
-      chain.push([&count,pWaitTask]{
-         CPPUNIT_ASSERT(count++ == 0);
-         usleep(10);
-         pWaitTask->decrement_ref_count();
-      });
+CPPUNIT_TEST_SUITE_REGISTRATION(SerialTaskQueueChain_test);
 
-      chain.push([&count,pWaitTask]{
-         CPPUNIT_ASSERT(count++ == 1);
-         usleep(10);
-         pWaitTask->decrement_ref_count();
-      });
+void SerialTaskQueueChain_test::testPush() {
+  std::atomic<unsigned int> count{0};
 
-      chain.push([&count,pWaitTask]{
-         CPPUNIT_ASSERT(count++ == 2);
-         usleep(10);
-         pWaitTask->decrement_ref_count();
-      });
+  std::vector<std::shared_ptr<edm::SerialTaskQueue>> queues = {std::make_shared<edm::SerialTaskQueue>(),
+                                                               std::make_shared<edm::SerialTaskQueue>()};
+  edm::SerialTaskQueueChain chain(queues);
+  {
+    std::shared_ptr<tbb::task> waitTask{new (tbb::task::allocate_root()) tbb::empty_task{},
+                                        [](tbb::task* iTask) { tbb::task::destroy(*iTask); }};
+    waitTask->set_ref_count(1 + 3);
+    tbb::task* pWaitTask = waitTask.get();
 
-      waitTask->wait_for_all();
-      CPPUNIT_ASSERT(count==3);
-      while(chain.outstandingTasks() != 0);
-   }
-   
+    chain.push([&count, pWaitTask] {
+      CPPUNIT_ASSERT(count++ == 0);
+      usleep(10);
+      pWaitTask->decrement_ref_count();
+    });
+
+    chain.push([&count, pWaitTask] {
+      CPPUNIT_ASSERT(count++ == 1);
+      usleep(10);
+      pWaitTask->decrement_ref_count();
+    });
+
+    chain.push([&count, pWaitTask] {
+      CPPUNIT_ASSERT(count++ == 2);
+      usleep(10);
+      pWaitTask->decrement_ref_count();
+    });
+
+    waitTask->wait_for_all();
+    CPPUNIT_ASSERT(count == 3);
+    while (chain.outstandingTasks() != 0)
+      ;
+  }
 }
 
-void SerialTaskQueueChain_test::testPushOne()
-{
+void SerialTaskQueueChain_test::testPushOne() {
   std::atomic<unsigned int> count{0};
-  
-  
+
   std::vector<std::shared_ptr<edm::SerialTaskQueue>> queues = {std::make_shared<edm::SerialTaskQueue>()};
   edm::SerialTaskQueueChain chain(queues);
   {
     std::shared_ptr<tbb::task> waitTask{new (tbb::task::allocate_root()) tbb::empty_task{},
-      [](tbb::task* iTask){tbb::task::destroy(*iTask);} };
-    waitTask->set_ref_count(1+3);
+                                        [](tbb::task* iTask) { tbb::task::destroy(*iTask); }};
+    waitTask->set_ref_count(1 + 3);
     tbb::task* pWaitTask = waitTask.get();
-    
-    chain.push([&count,pWaitTask]{
+
+    chain.push([&count, pWaitTask] {
       CPPUNIT_ASSERT(count++ == 0);
       usleep(10);
       pWaitTask->decrement_ref_count();
     });
-    
-    chain.push([&count,pWaitTask]{
+
+    chain.push([&count, pWaitTask] {
       CPPUNIT_ASSERT(count++ == 1);
       usleep(10);
       pWaitTask->decrement_ref_count();
     });
-    
-    chain.push([&count,pWaitTask]{
+
+    chain.push([&count, pWaitTask] {
       CPPUNIT_ASSERT(count++ == 2);
       usleep(10);
       pWaitTask->decrement_ref_count();
     });
-    
+
     waitTask->wait_for_all();
-    CPPUNIT_ASSERT(count==3);
-    while(chain.outstandingTasks() != 0);
+    CPPUNIT_ASSERT(count == 3);
+    while (chain.outstandingTasks() != 0)
+      ;
   }
-  
 }
 
+void SerialTaskQueueChain_test::testPushAndWait() {
+  std::atomic<unsigned int> count{0};
 
-void SerialTaskQueueChain_test::testPushAndWait()
-{
-   std::atomic<unsigned int> count{0};
-   
-   std::vector<std::shared_ptr<edm::SerialTaskQueue>> queues = {std::make_shared<edm::SerialTaskQueue>(), std::make_shared<edm::SerialTaskQueue>()};
-   edm::SerialTaskQueueChain chain(queues);
-   {
-      chain.push([&count]{
-         CPPUNIT_ASSERT(count++ == 0);
-         usleep(10);
-      });
-
-      chain.push([&count]{
-         CPPUNIT_ASSERT(count++ == 1);
-         usleep(10);
-      });
+  std::vector<std::shared_ptr<edm::SerialTaskQueue>> queues = {std::make_shared<edm::SerialTaskQueue>(),
+                                                               std::make_shared<edm::SerialTaskQueue>()};
+  edm::SerialTaskQueueChain chain(queues);
+  {
+    chain.push([&count] {
+      CPPUNIT_ASSERT(count++ == 0);
+      usleep(10);
+    });
 
-      chain.pushAndWait([&count]{
-         CPPUNIT_ASSERT(count++ == 2);
-         usleep(10);
-      }); 
+    chain.push([&count] {
+      CPPUNIT_ASSERT(count++ == 1);
+      usleep(10);
+    });
 
-      CPPUNIT_ASSERT(count==3);
-   }
-   while(chain.outstandingTasks() != 0);
+    chain.pushAndWait([&count] {
+      CPPUNIT_ASSERT(count++ == 2);
+      usleep(10);
+    });
 
+    CPPUNIT_ASSERT(count == 3);
+  }
+  while (chain.outstandingTasks() != 0)
+    ;
 }
 
-void SerialTaskQueueChain_test::testPushAndWaitOne()
-{
+void SerialTaskQueueChain_test::testPushAndWaitOne() {
   std::atomic<unsigned int> count{0};
-  
+
   std::vector<std::shared_ptr<edm::SerialTaskQueue>> queues = {std::make_shared<edm::SerialTaskQueue>()};
   edm::SerialTaskQueueChain chain(queues);
   {
-    chain.push([&count]{
+    chain.push([&count] {
       CPPUNIT_ASSERT(count++ == 0);
       usleep(10);
     });
-    
-    chain.push([&count]{
+
+    chain.push([&count] {
       CPPUNIT_ASSERT(count++ == 1);
       usleep(10);
     });
-    
-    chain.pushAndWait([&count]{
+
+    chain.pushAndWait([&count] {
       CPPUNIT_ASSERT(count++ == 2);
       usleep(10);
     });
-    
-    CPPUNIT_ASSERT(count==3);
+
+    CPPUNIT_ASSERT(count == 3);
   }
-  while(chain.outstandingTasks() != 0);
-  
+  while (chain.outstandingTasks() != 0)
+    ;
 }
 
 namespace {
-   void join_thread(std::thread* iThread){
-      if(iThread->joinable()){iThread->join();}
-   }
-}
+  void join_thread(std::thread* iThread) {
+    if (iThread->joinable()) {
+      iThread->join();
+    }
+  }
+}  // namespace
+
+void SerialTaskQueueChain_test::stressTest() {
+  std::vector<std::shared_ptr<edm::SerialTaskQueue>> queues = {std::make_shared<edm::SerialTaskQueue>(),
+                                                               std::make_shared<edm::SerialTaskQueue>()};
 
-void SerialTaskQueueChain_test::stressTest()
-{
-   std::vector<std::shared_ptr<edm::SerialTaskQueue>> queues = {std::make_shared<edm::SerialTaskQueue>(), std::make_shared<edm::SerialTaskQueue>()};
-
-   edm::SerialTaskQueueChain chain(queues);
-   
-   unsigned int index = 100;
-   const unsigned int nTasks = 1000;
-   while(0 != --index) {
-      std::shared_ptr<tbb::task> waitTask{new (tbb::task::allocate_root()) tbb::empty_task{},
-                                            [](tbb::task* iTask){tbb::task::destroy(*iTask);} };
-      waitTask->set_ref_count(3);
-      tbb::task* pWaitTask=waitTask.get();
-      std::atomic<unsigned int> count{0};
-      
-      std::atomic<bool> waitToStart{true};
-      {
-         std::thread pushThread([&chain,&waitToStart,pWaitTask,&count]{
-	    while(waitToStart.load()) {};
-            for(unsigned int i = 0; i<nTasks;++i) {
-               pWaitTask->increment_ref_count();
-               chain.push([&count,pWaitTask] {
-                  ++count;
-                  pWaitTask->decrement_ref_count();
-               });
-            }
-         
+  edm::SerialTaskQueueChain chain(queues);
+
+  unsigned int index = 100;
+  const unsigned int nTasks = 1000;
+  while (0 != --index) {
+    std::shared_ptr<tbb::task> waitTask{new (tbb::task::allocate_root()) tbb::empty_task{},
+                                        [](tbb::task* iTask) { tbb::task::destroy(*iTask); }};
+    waitTask->set_ref_count(3);
+    tbb::task* pWaitTask = waitTask.get();
+    std::atomic<unsigned int> count{0};
+
+    std::atomic<bool> waitToStart{true};
+    {
+      std::thread pushThread([&chain, &waitToStart, pWaitTask, &count] {
+        while (waitToStart.load()) {
+        };
+        for (unsigned int i = 0; i < nTasks; ++i) {
+          pWaitTask->increment_ref_count();
+          chain.push([&count, pWaitTask] {
+            ++count;
             pWaitTask->decrement_ref_count();
-            });
-         
-         waitToStart=false;
-         for(unsigned int i=0; i<nTasks;++i) {
-            pWaitTask->increment_ref_count();
-            chain.push([&count,pWaitTask] {
-               ++count;
-               pWaitTask->decrement_ref_count();
-            });
-         }
-         pWaitTask->decrement_ref_count();
-         std::shared_ptr<std::thread>(&pushThread,join_thread);
-      }
-      waitTask->wait_for_all();
+          });
+        }
 
-      CPPUNIT_ASSERT(2*nTasks==count);
-   }
-   while(chain.outstandingTasks() != 0);
+        pWaitTask->decrement_ref_count();
+      });
 
-}
+      waitToStart = false;
+      for (unsigned int i = 0; i < nTasks; ++i) {
+        pWaitTask->increment_ref_count();
+        chain.push([&count, pWaitTask] {
+          ++count;
+          pWaitTask->decrement_ref_count();
+        });
+      }
+      pWaitTask->decrement_ref_count();
+      std::shared_ptr<std::thread>(&pushThread, join_thread);
+    }
+    waitTask->wait_for_all();
 
+    CPPUNIT_ASSERT(2 * nTasks == count);
+  }
+  while (chain.outstandingTasks() != 0)
+    ;
+}
diff --git a/FWCore/Concurrency/test/test_threadSafeOutputFileStream.cpp b/FWCore/Concurrency/test/test_threadSafeOutputFileStream.cpp
index 19ac9309920a6..14e0d22418294 100644
--- a/FWCore/Concurrency/test/test_threadSafeOutputFileStream.cpp
+++ b/FWCore/Concurrency/test/test_threadSafeOutputFileStream.cpp
@@ -7,28 +7,26 @@
 
 namespace {
 
-  std::atomic<int> nWaitingForThreads {};
+  std::atomic<int> nWaitingForThreads{};
 
-  void
-  logToFile(unsigned const thread_index, edm::ThreadSafeOutputFileStream& f)
-  {
+  void logToFile(unsigned const thread_index, edm::ThreadSafeOutputFileStream& f) {
     --nWaitingForThreads;
-    while (nWaitingForThreads != 0);  // Spin until all threads have been launched.
+    while (nWaitingForThreads != 0)
+      ;  // Spin until all threads have been launched.
 
     std::ostringstream oss;
     oss << "Thread index: " << thread_index << " Entry: ";
     auto const& prefix = oss.str();
     for (int i{}; i < 4; ++i) {
-      f.write(prefix+std::to_string(i)+"\n");
+      f.write(prefix + std::to_string(i) + "\n");
     }
   }
-}
+}  // namespace
 
-int main()
-{
-  edm::ThreadSafeOutputFileStream f {"thread_safe_ofstream_test.txt"};
+int main() {
+  edm::ThreadSafeOutputFileStream f{"thread_safe_ofstream_test.txt"};
   std::vector<std::thread> threads;
-  unsigned const nThreads {3};
+  unsigned const nThreads{3};
   nWaitingForThreads = nThreads;
   for (unsigned i{}; i < nThreads; ++i) {
     threads.emplace_back(logToFile, i, std::ref(f));
diff --git a/FWCore/Concurrency/test/test_xercesInitialize.cpp b/FWCore/Concurrency/test/test_xercesInitialize.cpp
index 2d9831406df2e..2d9a6e0bb563d 100644
--- a/FWCore/Concurrency/test/test_xercesInitialize.cpp
+++ b/FWCore/Concurrency/test/test_xercesInitialize.cpp
@@ -6,26 +6,22 @@
 
 XERCES_CPP_NAMESPACE_USE
 
-void
-testInit()
-{
+void testInit() {
   cms::concurrency::xercesInitialize();
   {
-      std::cerr << std::this_thread::get_id() << std::endl;
-      XercesDOMParser parser;
+    std::cerr << std::this_thread::get_id() << std::endl;
+    XercesDOMParser parser;
   }
   cms::concurrency::xercesTerminate();
 }
 
-int
-main()
-{
+int main() {
   std::vector<std::thread> threads;
   threads.emplace_back(testInit);
   threads.emplace_back(testInit);
   threads.emplace_back(testInit);
   threads.emplace_back(testInit);
 
-  for (auto &thread : threads) 
+  for (auto &thread : threads)
     thread.join();
 }
diff --git a/FWCore/Concurrency/test/waitingtasklist_t.cppunit.cpp b/FWCore/Concurrency/test/waitingtasklist_t.cppunit.cpp
index 75ba1c50b004d..e6c597dea5172 100644
--- a/FWCore/Concurrency/test/waitingtasklist_t.cppunit.cpp
+++ b/FWCore/Concurrency/test/waitingtasklist_t.cppunit.cpp
@@ -27,210 +27,206 @@ class WaitingTaskList_test : public CppUnit::TestFixture {
   CPPUNIT_TEST(doneThenAddFailed);
   CPPUNIT_TEST(stressTest);
   CPPUNIT_TEST_SUITE_END();
-  
+
 public:
   void addThenDone();
   void doneThenAdd();
   void addThenDoneFailed();
   void doneThenAddFailed();
   void stressTest();
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 };
 
-namespace  {
-   class TestCalledTask : public edm::WaitingTask {
-   public:
-     TestCalledTask(std::atomic<bool>& iCalled, std::exception_ptr& iPtr): m_called(iCalled), m_ptr(iPtr) {}
-
-      tbb::task* execute() {
-         if(exceptionPtr()) {
-           m_ptr = *exceptionPtr();
-         }
-         m_called = true;
-         return nullptr;
+namespace {
+  class TestCalledTask : public edm::WaitingTask {
+  public:
+    TestCalledTask(std::atomic<bool>& iCalled, std::exception_ptr& iPtr) : m_called(iCalled), m_ptr(iPtr) {}
+
+    tbb::task* execute() {
+      if (exceptionPtr()) {
+        m_ptr = *exceptionPtr();
       }
-      
-   private:
-      std::atomic<bool>& m_called;
-      std::exception_ptr& m_ptr;
-   };
-   
-   class TestValueSetTask : public edm::WaitingTask {
-   public:
-      TestValueSetTask(std::atomic<bool>& iValue): m_value(iValue) {}
-         tbb::task* execute() {
-            CPPUNIT_ASSERT(m_value);
-            return nullptr;
-         }
-
-      private:
-         std::atomic<bool>& m_value;
-   };
-   
-}
+      m_called = true;
+      return nullptr;
+    }
+
+  private:
+    std::atomic<bool>& m_called;
+    std::exception_ptr& m_ptr;
+  };
+
+  class TestValueSetTask : public edm::WaitingTask {
+  public:
+    TestValueSetTask(std::atomic<bool>& iValue) : m_value(iValue) {}
+    tbb::task* execute() {
+      CPPUNIT_ASSERT(m_value);
+      return nullptr;
+    }
+
+  private:
+    std::atomic<bool>& m_value;
+  };
+
+}  // namespace
+
+void WaitingTaskList_test::addThenDone() {
+  std::atomic<bool> called{false};
+  std::exception_ptr excPtr;
+
+  edm::WaitingTaskList waitList;
+  {
+    auto waitTask = edm::make_empty_waiting_task();
+    waitTask->set_ref_count(2);
+    //NOTE: allocate_child does NOT increment the ref_count of waitTask!
+    auto t = new (waitTask->allocate_child()) TestCalledTask{called, excPtr};
+
+    waitList.add(t);
 
-void WaitingTaskList_test::addThenDone()
-{
-   std::atomic<bool> called{false};
-   std::exception_ptr excPtr;
-  
-   edm::WaitingTaskList waitList;
-   {
-      auto waitTask = edm::make_empty_waiting_task();
-      waitTask->set_ref_count(2);
-      //NOTE: allocate_child does NOT increment the ref_count of waitTask!
-      auto t = new (waitTask->allocate_child()) TestCalledTask{called,excPtr};
-   
-      waitList.add(t);
-
-      usleep(10);
-      __sync_synchronize();
-      CPPUNIT_ASSERT(false==called);
-   
-      waitList.doneWaiting(std::exception_ptr{});
-      waitTask->wait_for_all();
-      __sync_synchronize();
-      CPPUNIT_ASSERT(true==called);
-      CPPUNIT_ASSERT( bool(excPtr) == false);
-   }
-   
-   waitList.reset();
-   called = false;
-   
-   {
-      std::exception_ptr excPtr;
-
-      auto waitTask = edm::make_empty_waiting_task();
-      waitTask->set_ref_count(2);
-   
-      auto t = new (waitTask->allocate_child()) TestCalledTask{called, excPtr};
-   
-      waitList.add(t);
-
-      usleep(10);
-      CPPUNIT_ASSERT(false==called);
-   
-      waitList.doneWaiting(std::exception_ptr{});
-      waitTask->wait_for_all();
-      CPPUNIT_ASSERT(true==called);
-      CPPUNIT_ASSERT( bool(excPtr) == false);
-   }
+    usleep(10);
+    __sync_synchronize();
+    CPPUNIT_ASSERT(false == called);
+
+    waitList.doneWaiting(std::exception_ptr{});
+    waitTask->wait_for_all();
+    __sync_synchronize();
+    CPPUNIT_ASSERT(true == called);
+    CPPUNIT_ASSERT(bool(excPtr) == false);
+  }
+
+  waitList.reset();
+  called = false;
+
+  {
+    std::exception_ptr excPtr;
+
+    auto waitTask = edm::make_empty_waiting_task();
+    waitTask->set_ref_count(2);
+
+    auto t = new (waitTask->allocate_child()) TestCalledTask{called, excPtr};
+
+    waitList.add(t);
+
+    usleep(10);
+    CPPUNIT_ASSERT(false == called);
+
+    waitList.doneWaiting(std::exception_ptr{});
+    waitTask->wait_for_all();
+    CPPUNIT_ASSERT(true == called);
+    CPPUNIT_ASSERT(bool(excPtr) == false);
+  }
 }
 
-void WaitingTaskList_test::doneThenAdd()
-{
-   std::atomic<bool> called{false};
-   std::exception_ptr excPtr;
-
-   edm::WaitingTaskList waitList;
-   {
-      auto waitTask = edm::make_empty_waiting_task();
-      waitTask->set_ref_count(2);
-   
-      auto t = new (waitTask->allocate_child()) TestCalledTask{called,excPtr};
-
-      waitList.doneWaiting(std::exception_ptr{});
-   
-      waitList.add(t);
-      waitTask->wait_for_all();
-      CPPUNIT_ASSERT(true==called);
-      CPPUNIT_ASSERT( bool(excPtr) == false);
-   }
+void WaitingTaskList_test::doneThenAdd() {
+  std::atomic<bool> called{false};
+  std::exception_ptr excPtr;
+
+  edm::WaitingTaskList waitList;
+  {
+    auto waitTask = edm::make_empty_waiting_task();
+    waitTask->set_ref_count(2);
+
+    auto t = new (waitTask->allocate_child()) TestCalledTask{called, excPtr};
+
+    waitList.doneWaiting(std::exception_ptr{});
+
+    waitList.add(t);
+    waitTask->wait_for_all();
+    CPPUNIT_ASSERT(true == called);
+    CPPUNIT_ASSERT(bool(excPtr) == false);
+  }
 }
 
-void WaitingTaskList_test::addThenDoneFailed()
-{
+void WaitingTaskList_test::addThenDoneFailed() {
   std::atomic<bool> called{false};
   std::exception_ptr excPtr;
-  
+
   edm::WaitingTaskList waitList;
   {
     std::exception_ptr excPtr;
-    
+
     auto waitTask = edm::make_empty_waiting_task();
     waitTask->set_ref_count(2);
-    
+
     auto t = new (waitTask->allocate_child()) TestCalledTask{called, excPtr};
-    
+
     waitList.add(t);
-    
+
     usleep(10);
-    CPPUNIT_ASSERT(false==called);
-    
+    CPPUNIT_ASSERT(false == called);
+
     waitList.doneWaiting(std::make_exception_ptr(std::string("failed")));
     waitTask->wait_for_all();
-    CPPUNIT_ASSERT(true==called);
-    CPPUNIT_ASSERT( bool(excPtr) == true);
+    CPPUNIT_ASSERT(true == called);
+    CPPUNIT_ASSERT(bool(excPtr) == true);
   }
 }
 
-void WaitingTaskList_test::doneThenAddFailed()
-{
+void WaitingTaskList_test::doneThenAddFailed() {
   std::atomic<bool> called{false};
   std::exception_ptr excPtr;
-  
+
   edm::WaitingTaskList waitList;
   {
     auto waitTask = edm::make_empty_waiting_task();
     waitTask->set_ref_count(2);
-    
-    auto t = new (waitTask->allocate_child()) TestCalledTask{called,excPtr};
-    
+
+    auto t = new (waitTask->allocate_child()) TestCalledTask{called, excPtr};
+
     waitList.doneWaiting(std::make_exception_ptr(std::string("failed")));
-    
+
     waitList.add(t);
     waitTask->wait_for_all();
-    CPPUNIT_ASSERT(true==called);
-    CPPUNIT_ASSERT( bool(excPtr) == true);
+    CPPUNIT_ASSERT(true == called);
+    CPPUNIT_ASSERT(bool(excPtr) == true);
   }
 }
 
 namespace {
 #if defined(CXX_THREAD_AVAILABLE)
-   void join_thread(std::thread* iThread){
-      if(iThread->joinable()){iThread->join();}
-   }
+  void join_thread(std::thread* iThread) {
+    if (iThread->joinable()) {
+      iThread->join();
+    }
+  }
 #endif
-}
+}  // namespace
 
-void WaitingTaskList_test::stressTest()
-{
+void WaitingTaskList_test::stressTest() {
 #if defined(CXX_THREAD_AVAILABLE)
-   std::atomic<bool> called{false};
-   std::exception_ptr excPtr;
-   edm::WaitingTaskList waitList;
-   
-   unsigned int index = 1000;
-   const unsigned int nTasks = 10000;
-   while(0 != --index) {
-      called = false;
-      auto waitTask = edm::make_empty_waiting_task();
-      waitTask->set_ref_count(3);
-      tbb::task* pWaitTask=waitTask.get();
-      
-      {
-         std::thread makeTasksThread([&waitList,pWaitTask,&called,&excPtr]{
-            for(unsigned int i = 0; i<nTasks;++i) {
-               auto t = new (tbb::task::allocate_additional_child_of(*pWaitTask)) TestCalledTask{called, excPtr};
-               waitList.add(t);
-            }
-         
-            pWaitTask->decrement_ref_count();
-            });
-         std::shared_ptr<std::thread>(&makeTasksThread,join_thread);
-         
-         std::thread doneWaitThread([&waitList,&called,pWaitTask]{
-            called=true;
-            waitList.doneWaiting(std::exception_ptr{});
-            pWaitTask->decrement_ref_count();
-            });
-         std::shared_ptr<std::thread>(&doneWaitThread,join_thread);
-      }
-      waitTask->wait_for_all();
-   }
+  std::atomic<bool> called{false};
+  std::exception_ptr excPtr;
+  edm::WaitingTaskList waitList;
+
+  unsigned int index = 1000;
+  const unsigned int nTasks = 10000;
+  while (0 != --index) {
+    called = false;
+    auto waitTask = edm::make_empty_waiting_task();
+    waitTask->set_ref_count(3);
+    tbb::task* pWaitTask = waitTask.get();
+
+    {
+      std::thread makeTasksThread([&waitList, pWaitTask, &called, &excPtr] {
+        for (unsigned int i = 0; i < nTasks; ++i) {
+          auto t = new (tbb::task::allocate_additional_child_of(*pWaitTask)) TestCalledTask{called, excPtr};
+          waitList.add(t);
+        }
+
+        pWaitTask->decrement_ref_count();
+      });
+      std::shared_ptr<std::thread>(&makeTasksThread, join_thread);
+
+      std::thread doneWaitThread([&waitList, &called, pWaitTask] {
+        called = true;
+        waitList.doneWaiting(std::exception_ptr{});
+        pWaitTask->decrement_ref_count();
+      });
+      std::shared_ptr<std::thread>(&doneWaitThread, join_thread);
+    }
+    waitTask->wait_for_all();
+  }
 #endif
 }
 
-
-CPPUNIT_TEST_SUITE_REGISTRATION( WaitingTaskList_test );
+CPPUNIT_TEST_SUITE_REGISTRATION(WaitingTaskList_test);
diff --git a/FWCore/FWLite/bin/storageSize.cc b/FWCore/FWLite/bin/storageSize.cc
index 4d4e4ed0c2674..6f5f5d69c0107 100644
--- a/FWCore/FWLite/bin/storageSize.cc
+++ b/FWCore/FWLite/bin/storageSize.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWLite
 // Class  :     storageSize
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -20,80 +20,76 @@
 #include "FWCore/FWLite/interface/FWLiteEnabler.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-
 //
 // constants, enums and typedefs
 //
 static char const* const kClassNameOpt = "className";
 static char const* const kHelpOpt = "help";
-static char const* const kHelpCommandOpt="help,h";
+static char const* const kHelpCommandOpt = "help,h";
+
+int main(int argc, char* argv[]) try {
+  std::string descString(argv[0]);
+  descString += " [options] [--";
+  descString += kClassNameOpt;
+  descString +=
+      "] class_name"
+      "\n The program dumps information about how much storage space is needed to store the class"
+      "\nAllowed options";
+  boost::program_options::options_description desc(descString);
+  desc.add_options()(kHelpCommandOpt, "show this help message")(kClassNameOpt, "name of class");
+
+  boost::program_options::positional_options_description p;
+  p.add(kClassNameOpt, 1);
+
+  boost::program_options::variables_map vm;
+  try {
+    store(boost::program_options::command_line_parser(argc, argv).options(desc).positional(p).run(), vm);
+    notify(vm);
+  } catch (boost::program_options::error const& iException) {
+    std::cerr << "failed to parse command line \n" << iException.what() << "\n";
+    return 1;
+  }
+
+  if (vm.count(kHelpOpt)) {
+    std::cout << desc << std::endl;
+    return 0;
+  }
+
+  if (!vm.count(kClassNameOpt)) {
+    std::cerr << "no class name given\n";
+    return 1;
+  }
+
+  std::string className(vm[kClassNameOpt].as<std::string>());
+
+  FWLiteEnabler::enable();
 
+  TClass* cls = TClass::GetClass(className.c_str());
+  if (nullptr == cls) {
+    std::cerr << "class '" << className << "' is unknown by ROOT\n";
+    return 1;
+  }
 
-int main(int argc, char* argv[]) try
-{
-   std::string descString(argv[0]);
-   descString += " [options] [--";
-   descString += kClassNameOpt;
-   descString += "] class_name"
-   "\n The program dumps information about how much storage space is needed to store the class"
-   "\nAllowed options";
-   boost::program_options::options_description desc(descString);
-   desc.add_options()
-   (kHelpCommandOpt, "show this help message")
-   (kClassNameOpt,"name of class");
+  void* objInstance = cls->New();
+  if (nullptr == objInstance) {
+    std::cerr << "unable to create a default instance of the class " << className;
+    return 1;
+  }
 
-   boost::program_options::positional_options_description p;
-   p.add(kClassNameOpt, 1);
+  TBufferFile bf(TBuffer::kWrite);
 
-   boost::program_options::variables_map vm;
-   try {
-      store(boost::program_options::command_line_parser(argc,argv).options(desc).positional(p).run(),vm);
-      notify(vm);
-   } catch(boost::program_options::error const& iException) {
-      std::cerr <<"failed to parse command line \n"<<iException.what()<<"\n";
-      return 1;
-   }
-   
-   if(vm.count(kHelpOpt)) {
-      std::cout << desc <<std::endl;
-      return 0;
-   }
-   
-   if(!vm.count(kClassNameOpt)) {
-      std::cerr <<"no class name given\n";
-      return 1;
-   }
-   
-   std::string className(vm[kClassNameOpt].as<std::string>());
-   
-   FWLiteEnabler::enable();
+  gDebug = 3;
+  cls->WriteBuffer(bf, objInstance);
 
-   TClass* cls = TClass::GetClass(className.c_str());
-   if(nullptr == cls) {
-      std::cerr <<"class '"<<className<<"' is unknown by ROOT\n";
-      return 1;
-   }
-   
-   void* objInstance = cls->New();
-   if(nullptr == objInstance) {
-      std::cerr <<"unable to create a default instance of the class "<<className;
-      return 1;
-   }
-   
-   TBufferFile bf(TBuffer::kWrite);
-   
-   gDebug = 3;
-   cls->WriteBuffer(bf, objInstance);
- 
-   gDebug = 0;
-   std::cout <<"Total amount stored: "<<bf.Length()<<" bytes"<<std::endl;
-   std::cout<<"\nNOTE: add 4 bytes for each 'has written' value because of a bug in ROOT's printout of the accounting"
-   <<"\n  Each class (inheriting or as member data) has metadata an overhead of 10 bytes"<<std::endl;
-   return 0;
-} catch(cms::Exception const& e) {
+  gDebug = 0;
+  std::cout << "Total amount stored: " << bf.Length() << " bytes" << std::endl;
+  std::cout << "\nNOTE: add 4 bytes for each 'has written' value because of a bug in ROOT's printout of the accounting"
+            << "\n  Each class (inheriting or as member data) has metadata an overhead of 10 bytes" << std::endl;
+  return 0;
+} catch (cms::Exception const& e) {
   std::cerr << e.explainSelf() << std::endl;
   return 1;
-} catch(std::exception const& e) {
+} catch (std::exception const& e) {
   std::cerr << e.what() << std::endl;
   return 1;
 }
diff --git a/FWCore/FWLite/bin/storageSizeForBranch.cc b/FWCore/FWLite/bin/storageSizeForBranch.cc
index ffbadca25a134..62258a6fd5885 100644
--- a/FWCore/FWLite/bin/storageSizeForBranch.cc
+++ b/FWCore/FWLite/bin/storageSizeForBranch.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWLite
 // Class  :     storageSize
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -23,126 +23,123 @@
 #include "FWCore/FWLite/interface/FWLiteEnabler.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-
 //
 // constants, enums and typedefs
 //
 static char const* const kBranchNameOpt = "branchName";
 static char const* const kFileNameOpt = "fileName";
 static char const* const kHelpOpt = "help";
-static char const* const kHelpCommandOpt="help,h";
+static char const* const kHelpCommandOpt = "help,h";
 static char const* const kEntryNumberCommandOpt = "entryNumber,e";
 static char const* const kEntryNumberOpt = "entryNumber";
 
-int main(int argc, char* argv[]) try
-{
-   std::string descString(argv[0]);
-   descString += " [options] [--";
-   descString += kBranchNameOpt;
-   descString += "] branch_name [--";
-   descString += kFileNameOpt;
-   descString += "] file_name"
-   "\n The program dumps information about how much storage space is needed to store a given TBranch within a ROOT file"
-   "\nAllowed options";
-   boost::program_options::options_description desc(descString);
-   desc.add_options()
-   (kHelpCommandOpt, "show this help message")
-   (kEntryNumberCommandOpt, boost::program_options::value<int>(),"read branch from the given entry value (default 0)")
-   (kBranchNameOpt,"name of branch")
-   (kFileNameOpt,"name of file");
-
-   boost::program_options::positional_options_description p;
-   p.add(kBranchNameOpt, 1);
-   p.add(kFileNameOpt, 1);
-
-   boost::program_options::variables_map vm;
-   try {
-      store(boost::program_options::command_line_parser(argc,argv).options(desc).positional(p).run(),vm);
-      notify(vm);
-   } catch(boost::program_options::error const& iException) {
-      std::cerr <<"failed to parse command line \n"<<iException.what()<<"\n";
-      return 1;
-   }
-   
-   if(vm.count(kHelpOpt)) {
-      std::cout << desc <<std::endl;
-      return 0;
-   }
-   int entryNumber = 0;
-   if(vm.count(kEntryNumberOpt)) {
-      entryNumber = vm[kEntryNumberOpt].as<int>();
-   }
-   
-   if(!vm.count(kBranchNameOpt)) {
-      std::cerr <<"no branch name given\n";
-      return 1;
-   }
-
-   
-   if(!vm.count(kFileNameOpt)) {
-      std::cerr <<"no branch name given\n";
-      return 1;
-   }
-   
-   std::string branchName(vm[kBranchNameOpt].as<std::string>());
-   std::string fileName(vm[kFileNameOpt].as<std::string>());
-   
-   TFile* file = TFile::Open(fileName.c_str());
-   if (nullptr == file) {
-      std::cerr <<"failed to open '"<<fileName<<"'";
-      return 1;
-   }
-   
-   TTree* eventTree = dynamic_cast<TTree*> (file->Get("Events"));
-   
-   if(nullptr == eventTree) {
-      std::cerr <<"The file '"<<fileName<<"' does not contain an 'Events' TTree";
-      return 1;
-   }
-   
-   TBranch* branch = eventTree->GetBranch(branchName.c_str());
-   
-   if(nullptr == branch) {
-      std::cerr <<"The Events TTree does not contain the branch "<<branchName;
-      return 1;
-   }
-   
-   
-   FWLiteEnabler::enable();
-
-   TClass* cls = TClass::GetClass(branch->GetClassName());
-   if(nullptr == cls) {
-      std::cerr <<"class '"<<branch->GetClassName()<<"' is unknown by ROOT\n";
-      return 1;
-   }
-   
-   void* objInstance = cls->New();
-   if(nullptr == objInstance) {
-      std::cerr <<"unable to create a default instance of the class "<<branch->GetClassName();
-      return 1;
-   }
-
-   //associate this with the branch
-   void* pObjInstance = &objInstance;
-   
-   branch->SetAddress(pObjInstance);
-   
-   branch->GetEntry(entryNumber);
-   
-   TBufferFile bf(TBuffer::kWrite);
-   
-   gDebug = 3;
-   cls->WriteBuffer(bf, objInstance);
- 
-   gDebug = 0;
-   std::cout <<"Total amount stored: "<<bf.Length()<<" bytes"<<std::endl;
-   std::cout<<"\nNOTE: add 4 bytes for each 'has written' value because of a bug in ROOT's printout of the accounting"
-   <<"\n  Each class (inheriting or as member data) has metadata an overhead of 10 bytes"<<std::endl;
-   return 0;
-} catch(cms::Exception const& e) {
+int main(int argc, char* argv[]) try {
+  std::string descString(argv[0]);
+  descString += " [options] [--";
+  descString += kBranchNameOpt;
+  descString += "] branch_name [--";
+  descString += kFileNameOpt;
+  descString +=
+      "] file_name"
+      "\n The program dumps information about how much storage space is needed to store a given TBranch within a ROOT "
+      "file"
+      "\nAllowed options";
+  boost::program_options::options_description desc(descString);
+  desc.add_options()(kHelpCommandOpt, "show this help message")(kEntryNumberCommandOpt,
+                                                                boost::program_options::value<int>(),
+                                                                "read branch from the given entry value (default 0)")(
+      kBranchNameOpt, "name of branch")(kFileNameOpt, "name of file");
+
+  boost::program_options::positional_options_description p;
+  p.add(kBranchNameOpt, 1);
+  p.add(kFileNameOpt, 1);
+
+  boost::program_options::variables_map vm;
+  try {
+    store(boost::program_options::command_line_parser(argc, argv).options(desc).positional(p).run(), vm);
+    notify(vm);
+  } catch (boost::program_options::error const& iException) {
+    std::cerr << "failed to parse command line \n" << iException.what() << "\n";
+    return 1;
+  }
+
+  if (vm.count(kHelpOpt)) {
+    std::cout << desc << std::endl;
+    return 0;
+  }
+  int entryNumber = 0;
+  if (vm.count(kEntryNumberOpt)) {
+    entryNumber = vm[kEntryNumberOpt].as<int>();
+  }
+
+  if (!vm.count(kBranchNameOpt)) {
+    std::cerr << "no branch name given\n";
+    return 1;
+  }
+
+  if (!vm.count(kFileNameOpt)) {
+    std::cerr << "no branch name given\n";
+    return 1;
+  }
+
+  std::string branchName(vm[kBranchNameOpt].as<std::string>());
+  std::string fileName(vm[kFileNameOpt].as<std::string>());
+
+  TFile* file = TFile::Open(fileName.c_str());
+  if (nullptr == file) {
+    std::cerr << "failed to open '" << fileName << "'";
+    return 1;
+  }
+
+  TTree* eventTree = dynamic_cast<TTree*>(file->Get("Events"));
+
+  if (nullptr == eventTree) {
+    std::cerr << "The file '" << fileName << "' does not contain an 'Events' TTree";
+    return 1;
+  }
+
+  TBranch* branch = eventTree->GetBranch(branchName.c_str());
+
+  if (nullptr == branch) {
+    std::cerr << "The Events TTree does not contain the branch " << branchName;
+    return 1;
+  }
+
+  FWLiteEnabler::enable();
+
+  TClass* cls = TClass::GetClass(branch->GetClassName());
+  if (nullptr == cls) {
+    std::cerr << "class '" << branch->GetClassName() << "' is unknown by ROOT\n";
+    return 1;
+  }
+
+  void* objInstance = cls->New();
+  if (nullptr == objInstance) {
+    std::cerr << "unable to create a default instance of the class " << branch->GetClassName();
+    return 1;
+  }
+
+  //associate this with the branch
+  void* pObjInstance = &objInstance;
+
+  branch->SetAddress(pObjInstance);
+
+  branch->GetEntry(entryNumber);
+
+  TBufferFile bf(TBuffer::kWrite);
+
+  gDebug = 3;
+  cls->WriteBuffer(bf, objInstance);
+
+  gDebug = 0;
+  std::cout << "Total amount stored: " << bf.Length() << " bytes" << std::endl;
+  std::cout << "\nNOTE: add 4 bytes for each 'has written' value because of a bug in ROOT's printout of the accounting"
+            << "\n  Each class (inheriting or as member data) has metadata an overhead of 10 bytes" << std::endl;
+  return 0;
+} catch (cms::Exception const& e) {
   std::cerr << e.explainSelf() << std::endl;
   return 1;
-} catch(std::exception const& e) {
+} catch (std::exception const& e) {
   std::cerr << e.what() << std::endl;
   return 1;
 }
diff --git a/FWCore/FWLite/interface/AutoLibraryLoader.h b/FWCore/FWLite/interface/AutoLibraryLoader.h
index b5bec69780887..614fda338dfac 100644
--- a/FWCore/FWLite/interface/AutoLibraryLoader.h
+++ b/FWCore/FWLite/interface/AutoLibraryLoader.h
@@ -13,19 +13,19 @@ class DummyClassToStopCompilerWarning;
 
 class AutoLibraryLoader {
   friend class DummyClassToStopCompilerWarning;
+
 public:
-  /// enable automatic library loading  
+  /// enable automatic library loading
   static void enable();
-  
+
   /// load all known libraries holding dictionaries
   static void loadAll();
 
 private:
   static bool enabled_;
   AutoLibraryLoader();
-  AutoLibraryLoader(const AutoLibraryLoader&) = delete; // stop default
-  const AutoLibraryLoader& operator=(const AutoLibraryLoader&) = delete; // stop default
+  AutoLibraryLoader(const AutoLibraryLoader&) = delete;                   // stop default
+  const AutoLibraryLoader& operator=(const AutoLibraryLoader&) = delete;  // stop default
 };
 
-
 #endif
diff --git a/FWCore/FWLite/interface/BranchMapReader.h b/FWCore/FWLite/interface/BranchMapReader.h
index bf62347d54b96..54391bfc93b52 100644
--- a/FWCore/FWLite/interface/BranchMapReader.h
+++ b/FWCore/FWLite/interface/BranchMapReader.h
@@ -65,27 +65,29 @@ namespace fwlite {
       Long_t runEntry_;
       int fileVersion_;
     };
-  }
+  }  // namespace internal
 
   class BranchMapReader {
   public:
     BranchMapReader(TFile* file);
-    BranchMapReader() : strategy_(nullptr),fileVersion_(0) {}
+    BranchMapReader() : strategy_(nullptr), fileVersion_(0) {}
 
-      // ---------- const member functions ---------------------
+    // ---------- const member functions ---------------------
 
-      // ---------- static member functions --------------------
+    // ---------- static member functions --------------------
 
-      // ---------- member functions ---------------------------
+    // ---------- member functions ---------------------------
     bool updateFile(TFile* file);
     bool updateEvent(Long_t eventEntry);
     bool updateLuminosityBlock(Long_t luminosityBlockEntry);
     bool updateRun(Long_t runEntry);
     edm::BranchID productToBranchID(const edm::ProductID& pid) { return strategy_->productToBranchID(pid); }
     const edm::BranchDescription& productToBranch(const edm::ProductID& pid);
-    const edm::BranchDescription& branchIDToBranch(const edm::BranchID& bid) const { return strategy_->branchIDToBranch(bid); }
+    const edm::BranchDescription& branchIDToBranch(const edm::BranchID& bid) const {
+      return strategy_->branchIDToBranch(bid);
+    }
     int getFileVersion(TFile* file);
-    int getFileVersion() const { return  fileVersion_;}
+    int getFileVersion() const { return fileVersion_; }
 
     TFile const* getFile() const { return strategy_->currentFile_; }
     TFile* getFile() { return strategy_->currentFile_; }
@@ -100,15 +102,20 @@ namespace fwlite {
     Long_t getLuminosityBlockEntry() const { return strategy_->luminosityBlockEntry_; }
     Long_t getRunEntry() const { return strategy_->runEntry_; }
     const std::vector<edm::BranchDescription>& getBranchDescriptions();
-    const edm::BranchListIndexes& branchListIndexes() const { strategy_->updateMap(); return strategy_->branchListIndexes(); }
-    const edm::ThinnedAssociationsHelper& thinnedAssociationsHelper() const { return strategy_->thinnedAssociationsHelper(); }
-
-      // ---------- member data --------------------------------
+    const edm::BranchListIndexes& branchListIndexes() const {
+      strategy_->updateMap();
+      return strategy_->branchListIndexes();
+    }
+    const edm::ThinnedAssociationsHelper& thinnedAssociationsHelper() const {
+      return strategy_->thinnedAssociationsHelper();
+    }
+
+    // ---------- member data --------------------------------
   private:
     std::unique_ptr<internal::BMRStrategy> newStrategy(TFile* file, int fileVersion);
-    std::unique_ptr<internal::BMRStrategy> strategy_; // Contains caches, so we do not propagate_const
+    std::unique_ptr<internal::BMRStrategy> strategy_;  // Contains caches, so we do not propagate_const
     int fileVersion_;
   };
-}
+}  // namespace fwlite
 
 #endif
diff --git a/FWCore/FWLite/interface/FWLiteEnabler.h b/FWCore/FWLite/interface/FWLiteEnabler.h
index 4856a09c99b47..db2e2f7a3ffc2 100644
--- a/FWCore/FWLite/interface/FWLiteEnabler.h
+++ b/FWCore/FWLite/interface/FWLiteEnabler.h
@@ -10,10 +10,11 @@ class DummyClassToStopCompilerWarning;
 
 class FWLiteEnabler {
   friend class DummyClassToStopCompilerWarning;
+
 public:
-  FWLiteEnabler(const FWLiteEnabler&) = delete; // stop default
-  FWLiteEnabler const& operator=(FWLiteEnabler const&) = delete; // stop default
-  /// enable automatic library loading  
+  FWLiteEnabler(const FWLiteEnabler&) = delete;                   // stop default
+  FWLiteEnabler const& operator=(FWLiteEnabler const&) = delete;  // stop default
+  /// enable automatic library loading
   static void enable();
 
 private:
@@ -21,5 +22,4 @@ class FWLiteEnabler {
   FWLiteEnabler();
 };
 
-
 #endif
diff --git a/FWCore/FWLite/interface/setRefStreamer.h b/FWCore/FWLite/interface/setRefStreamer.h
index 77516d5b9dd66..db101c413c6d7 100644
--- a/FWCore/FWLite/interface/setRefStreamer.h
+++ b/FWCore/FWLite/interface/setRefStreamer.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWLite
 // Class  :     setRefStreamer
-// 
+//
 /**\class setRefStreamer setRefStreamer.h FWCore/FWLite/interface/setRefStreamer.h
 
  Description: Allows one to set the EDProductGetter used by the Ref's and returns the old getter
@@ -29,19 +29,15 @@ namespace edm {
 
 namespace fwlite {
   edm::EDProductGetter const* setRefStreamer(edm::EDProductGetter const* ep);
-  
+
   class GetterOperate {
-public:
-    GetterOperate(edm::EDProductGetter const* iEP): old_(nullptr) {
-      old_ = setRefStreamer(iEP);
-    }
-    ~GetterOperate() {
-      setRefStreamer(old_);
-    }
-private:
+  public:
+    GetterOperate(edm::EDProductGetter const* iEP) : old_(nullptr) { old_ = setRefStreamer(iEP); }
+    ~GetterOperate() { setRefStreamer(old_); }
+
+  private:
     edm::EDProductGetter const* old_;
   };
-}
-
+}  // namespace fwlite
 
 #endif
diff --git a/FWCore/FWLite/src/AutoLibraryLoader.cc b/FWCore/FWLite/src/AutoLibraryLoader.cc
index c946ae87c8033..71ec7a542910c 100644
--- a/FWCore/FWLite/src/AutoLibraryLoader.cc
+++ b/FWCore/FWLite/src/AutoLibraryLoader.cc
@@ -2,11 +2,11 @@
 //
 // Package:     LibraryLoader
 // Class  :     AutoLibraryLoader
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
-// Original Author:  
+// Original Author:
 //         Created:  Wed Nov 30 14:55:01 EST 2005
 //
 
@@ -24,30 +24,23 @@
 // static data member definitions
 //
 
-
 //
 // constructors and destructor
 //
-AutoLibraryLoader::AutoLibraryLoader() {
-}
-
+AutoLibraryLoader::AutoLibraryLoader() {}
 
 //
 // member functions
 //
 
-void
-AutoLibraryLoader::enable() {
-  std::cerr << "WARNING: AutoLibraryloader::enable() and AutoLibraryLoader.h are deprecated.\n" <<
-  "Use FWLiteEnabler::enable() and FWLiteEnabler.h instead"  << std::endl;
+void AutoLibraryLoader::enable() {
+  std::cerr << "WARNING: AutoLibraryloader::enable() and AutoLibraryLoader.h are deprecated.\n"
+            << "Use FWLiteEnabler::enable() and FWLiteEnabler.h instead" << std::endl;
   FWLiteEnabler::enable();
 }
 
-void
-AutoLibraryLoader::loadAll()
-{
-  std::cerr << "WARNING: AutoLibraryloader::loadAll() and AutoLibraryLoader.h are deprecated.\n" <<
-  "Use FWLiteEnabler::enable() and FWLiteEnabler.h instead"  << std::endl;
+void AutoLibraryLoader::loadAll() {
+  std::cerr << "WARNING: AutoLibraryloader::loadAll() and AutoLibraryLoader.h are deprecated.\n"
+            << "Use FWLiteEnabler::enable() and FWLiteEnabler.h instead" << std::endl;
   FWLiteEnabler::enable();
 }
-
diff --git a/FWCore/FWLite/src/BareRootProductGetter.cc b/FWCore/FWLite/src/BareRootProductGetter.cc
index 26779cb0ad8b6..9933312e3b0c0 100644
--- a/FWCore/FWLite/src/BareRootProductGetter.cc
+++ b/FWCore/FWLite/src/BareRootProductGetter.cc
@@ -41,15 +41,13 @@
 //
 // constructors and destructor
 //
-BareRootProductGetter::BareRootProductGetter() {
-}
+BareRootProductGetter::BareRootProductGetter() {}
 
 // BareRootProductGetter::BareRootProductGetter(BareRootProductGetter const& rhs) {
 //    // do actual copying here;
 // }
 
-BareRootProductGetter::~BareRootProductGetter() {
-}
+BareRootProductGetter::~BareRootProductGetter() {}
 
 //
 // assignment operators
@@ -69,23 +67,21 @@ BareRootProductGetter::~BareRootProductGetter() {
 //
 // const member functions
 //
-edm::WrapperBase const*
-BareRootProductGetter::getIt(edm::ProductID const& pid) const  {
+edm::WrapperBase const* BareRootProductGetter::getIt(edm::ProductID const& pid) const {
   // std::cout << "getIt called " << pid << std::endl;
   TFile* currentFile = dynamic_cast<TFile*>(gROOT->GetListOfFiles()->Last());
-  if(nullptr == currentFile) {
-     throw cms::Exception("FileNotFound")
-        << "unable to find the TFile '" << gROOT->GetListOfFiles()->Last() << "'\n"
-        << "retrieved by calling 'gROOT->GetListOfFiles()->Last()'\n"
-        << "Please check the list of files.";
+  if (nullptr == currentFile) {
+    throw cms::Exception("FileNotFound") << "unable to find the TFile '" << gROOT->GetListOfFiles()->Last() << "'\n"
+                                         << "retrieved by calling 'gROOT->GetListOfFiles()->Last()'\n"
+                                         << "Please check the list of files.";
   }
-  if(branchMap_.updateFile(currentFile)) {
+  if (branchMap_.updateFile(currentFile)) {
     idToBuffers_.clear();
   }
   TTree* eventTree = branchMap_.getEventTree();
   // std::cout << "eventTree " << eventTree << std::endl;
-  if(nullptr == eventTree) {
-     throw cms::Exception("NoEventsTree")
+  if (nullptr == eventTree) {
+    throw cms::Exception("NoEventsTree")
         << "unable to find the TTree '" << edm::poolNames::eventTreeName() << "' in the last open file, \n"
         << "file: '" << branchMap_.getFile()->GetName()
         << "'\n Please check that the file is a standard CMS ROOT format.\n"
@@ -94,11 +90,10 @@ BareRootProductGetter::getIt(edm::ProductID const& pid) const  {
   Long_t eventEntry = eventTree->GetReadEntry();
   // std::cout << "eventEntry " << eventEntry << std::endl;
   branchMap_.updateEvent(eventEntry);
-  if(eventEntry < 0) {
-     throw cms::Exception("GetEntryNotCalled")
+  if (eventEntry < 0) {
+    throw cms::Exception("GetEntryNotCalled")
         << "please call GetEntry for the 'Events' TTree for each event in order to make edm::Ref's work."
-        << "\n Also be sure to call 'SetAddress' for all Branches after calling the GetEntry."
-        ;
+        << "\n Also be sure to call 'SetAddress' for all Branches after calling the GetEntry.";
   }
 
   edm::BranchID branchID = branchMap_.productToBranchID(pid);
@@ -106,33 +101,29 @@ BareRootProductGetter::getIt(edm::ProductID const& pid) const  {
   return getIt(branchID, eventEntry);
 }
 
-edm::WrapperBase const*
-BareRootProductGetter::getIt(edm::BranchID const& branchID, Long_t eventEntry) const  {
-
+edm::WrapperBase const* BareRootProductGetter::getIt(edm::BranchID const& branchID, Long_t eventEntry) const {
   Buffer* buffer = nullptr;
   IdToBuffers::iterator itBuffer = idToBuffers_.find(branchID);
 
   // std::cout << "Buffers" << std::endl;
-  if(itBuffer == idToBuffers_.end()) {
+  if (itBuffer == idToBuffers_.end()) {
     buffer = createNewBuffer(branchID);
     // std::cout << "buffer " << buffer << std::endl;
-    if(nullptr == buffer) {
-       return nullptr;
+    if (nullptr == buffer) {
+      return nullptr;
     }
   } else {
     buffer = &(itBuffer->second);
   }
-  if(nullptr == buffer) {
-     throw cms::Exception("NullBuffer")
-        << "Found a null buffer which is supposed to hold the data item."
-        << "\n Please contact developers since this message should not happen.";
+  if (nullptr == buffer) {
+    throw cms::Exception("NullBuffer") << "Found a null buffer which is supposed to hold the data item."
+                                       << "\n Please contact developers since this message should not happen.";
   }
-  if(nullptr == buffer->branch_) {
-     throw cms::Exception("NullBranch")
-        << "The TBranch which should hold the data item is null."
-        << "\n Please contact the developers since this message should not happen.";
+  if (nullptr == buffer->branch_) {
+    throw cms::Exception("NullBranch") << "The TBranch which should hold the data item is null."
+                                       << "\n Please contact the developers since this message should not happen.";
   }
-  if(buffer->eventEntry_ != eventEntry) {
+  if (buffer->eventEntry_ != eventEntry) {
     //NOTE: Need to reset address because user could have set the address themselves
     //std::cout << "new event" << std::endl;
 
@@ -140,13 +131,13 @@ BareRootProductGetter::getIt(edm::BranchID const& branchID, Long_t eventEntry) c
     void* address = buffer->class_->New();
 
     static TClass const* edproductTClass = TClass::GetClass(typeid(edm::WrapperBase));
-    edm::WrapperBase const* prod = static_cast<edm::WrapperBase const*>(buffer->class_->DynamicCast(edproductTClass,address,true));
+    edm::WrapperBase const* prod =
+        static_cast<edm::WrapperBase const*>(buffer->class_->DynamicCast(edproductTClass, address, true));
 
-    if(nullptr == prod) {
-      cms::Exception("FailedConversion")
-      << "failed to convert a '" << buffer->class_->GetName()
-      << "' to a edm::WrapperBase."
-      << "Please contact developers since something is very wrong.";
+    if (nullptr == prod) {
+      cms::Exception("FailedConversion") << "failed to convert a '" << buffer->class_->GetName()
+                                         << "' to a edm::WrapperBase."
+                                         << "Please contact developers since something is very wrong.";
     }
     buffer->address_ = address;
     buffer->product_ = std::shared_ptr<edm::WrapperBase const>(prod);
@@ -158,50 +149,49 @@ BareRootProductGetter::getIt(edm::BranchID const& branchID, Long_t eventEntry) c
     buffer->branch_->GetEntry(eventEntry);
     buffer->eventEntry_ = eventEntry;
   }
-  if(!buffer->product_) {
-     throw cms::Exception("BranchGetEntryFailed")
-        << "Calling GetEntry with index " << eventEntry
-        << "for branch " << buffer->branch_->GetName() << " failed.";
+  if (!buffer->product_) {
+    throw cms::Exception("BranchGetEntryFailed")
+        << "Calling GetEntry with index " << eventEntry << "for branch " << buffer->branch_->GetName() << " failed.";
   }
 
   return buffer->product_.get();
 }
 
-edm::WrapperBase const*
-BareRootProductGetter::getThinnedProduct(edm::ProductID const& pid, unsigned int& key) const {
-
+edm::WrapperBase const* BareRootProductGetter::getThinnedProduct(edm::ProductID const& pid, unsigned int& key) const {
   Long_t eventEntry = branchMap_.getEventTree()->GetReadEntry();
   edm::BranchID parent = branchMap_.productToBranchID(pid);
-  if(!parent.isValid()) return nullptr;
+  if (!parent.isValid())
+    return nullptr;
   edm::ThinnedAssociationsHelper const& thinnedAssociationsHelper = branchMap_.thinnedAssociationsHelper();
 
   // Loop over thinned containers which were made by selecting elements from the parent container
-  for(auto associatedBranches = thinnedAssociationsHelper.parentBegin(parent),
-                         iEnd = thinnedAssociationsHelper.parentEnd(parent);
-      associatedBranches != iEnd; ++associatedBranches) {
-
+  for (auto associatedBranches = thinnedAssociationsHelper.parentBegin(parent),
+            iEnd = thinnedAssociationsHelper.parentEnd(parent);
+       associatedBranches != iEnd;
+       ++associatedBranches) {
     edm::ThinnedAssociation const* thinnedAssociation =
-      getThinnedAssociation(associatedBranches->association(), eventEntry);
-    if(thinnedAssociation == nullptr) continue;
+        getThinnedAssociation(associatedBranches->association(), eventEntry);
+    if (thinnedAssociation == nullptr)
+      continue;
 
-    if(associatedBranches->parent() != branchMap_.productToBranchID(thinnedAssociation->parentCollectionID())) {
+    if (associatedBranches->parent() != branchMap_.productToBranchID(thinnedAssociation->parentCollectionID())) {
       continue;
     }
 
     unsigned int thinnedIndex = 0;
     // Does this thinned container have the element referenced by key?
     // If yes, thinnedIndex is set to point to it in the thinned container
-    if(!thinnedAssociation->hasParentIndex(key, thinnedIndex)) {
+    if (!thinnedAssociation->hasParentIndex(key, thinnedIndex)) {
       continue;
     }
     // Get the thinned container and return a pointer if we can find it
     edm::ProductID const& thinnedCollectionPID = thinnedAssociation->thinnedCollectionID();
     edm::WrapperBase const* thinnedCollection = getIt(thinnedCollectionPID);
-    if(thinnedCollection == nullptr) {
+    if (thinnedCollection == nullptr) {
       // Thinned container is not found, try looking recursively in thinned containers
       // which were made by selecting elements from this thinned container.
       edm::WrapperBase const* thinnedFromRecursiveCall = getThinnedProduct(thinnedCollectionPID, thinnedIndex);
-      if(thinnedFromRecursiveCall != nullptr) {
+      if (thinnedFromRecursiveCall != nullptr) {
         key = thinnedIndex;
         return thinnedFromRecursiveCall;
       } else {
@@ -214,26 +204,26 @@ BareRootProductGetter::getThinnedProduct(edm::ProductID const& pid, unsigned int
   return nullptr;
 }
 
-void
-BareRootProductGetter::getThinnedProducts(edm::ProductID const& pid,
-                                          std::vector<edm::WrapperBase const*>& foundContainers,
-                                          std::vector<unsigned int>& keys) const {
-
+void BareRootProductGetter::getThinnedProducts(edm::ProductID const& pid,
+                                               std::vector<edm::WrapperBase const*>& foundContainers,
+                                               std::vector<unsigned int>& keys) const {
   Long_t eventEntry = branchMap_.getEventTree()->GetReadEntry();
   edm::BranchID parent = branchMap_.productToBranchID(pid);
-  if(!parent.isValid()) return;
+  if (!parent.isValid())
+    return;
   edm::ThinnedAssociationsHelper const& thinnedAssociationsHelper = branchMap_.thinnedAssociationsHelper();
 
   // Loop over thinned containers which were made by selecting elements from the parent container
-  for(auto associatedBranches = thinnedAssociationsHelper.parentBegin(parent),
-                         iEnd = thinnedAssociationsHelper.parentEnd(parent);
-      associatedBranches != iEnd; ++associatedBranches) {
-
+  for (auto associatedBranches = thinnedAssociationsHelper.parentBegin(parent),
+            iEnd = thinnedAssociationsHelper.parentEnd(parent);
+       associatedBranches != iEnd;
+       ++associatedBranches) {
     edm::ThinnedAssociation const* thinnedAssociation =
-      getThinnedAssociation(associatedBranches->association(), eventEntry);
-    if(thinnedAssociation == nullptr) continue;
+        getThinnedAssociation(associatedBranches->association(), eventEntry);
+    if (thinnedAssociation == nullptr)
+      continue;
 
-    if(associatedBranches->parent() != branchMap_.productToBranchID(thinnedAssociation->parentCollectionID())) {
+    if (associatedBranches->parent() != branchMap_.productToBranchID(thinnedAssociation->parentCollectionID())) {
       continue;
     }
 
@@ -241,19 +231,21 @@ BareRootProductGetter::getThinnedProducts(edm::ProductID const& pid,
     unsigned int doNotLookForThisIndex = std::numeric_limits<unsigned int>::max();
     std::vector<unsigned int> thinnedIndexes(nKeys, doNotLookForThisIndex);
     bool hasAny = false;
-    for(unsigned k = 0; k < nKeys; ++k) {
+    for (unsigned k = 0; k < nKeys; ++k) {
       // Already found this one
-      if(foundContainers[k] != nullptr) continue;
+      if (foundContainers[k] != nullptr)
+        continue;
       // Already know this one is not in this thinned container
-      if(keys[k] == doNotLookForThisIndex) continue;
+      if (keys[k] == doNotLookForThisIndex)
+        continue;
       // Does the thinned container hold the entry of interest?
       // Modifies thinnedIndexes[k] only if it returns true and
       // sets it to the index in the thinned collection.
-      if(thinnedAssociation->hasParentIndex(keys[k], thinnedIndexes[k])) {
+      if (thinnedAssociation->hasParentIndex(keys[k], thinnedIndexes[k])) {
         hasAny = true;
       }
     }
-    if(!hasAny) {
+    if (!hasAny) {
       continue;
     }
     // Get the thinned container and set the pointers and indexes into
@@ -261,18 +253,21 @@ BareRootProductGetter::getThinnedProducts(edm::ProductID const& pid,
     edm::ProductID thinnedCollectionPID = thinnedAssociation->thinnedCollectionID();
     edm::WrapperBase const* thinnedCollection = getIt(thinnedCollectionPID);
 
-    if(thinnedCollection == nullptr) {
+    if (thinnedCollection == nullptr) {
       // Thinned container is not found, try looking recursively in thinned containers
       // which were made by selecting elements from this thinned container.
       getThinnedProducts(thinnedCollectionPID, foundContainers, thinnedIndexes);
-      for(unsigned k = 0; k < nKeys; ++k) {
-        if(foundContainers[k] == nullptr) continue;
-        if(thinnedIndexes[k] == doNotLookForThisIndex) continue;
+      for (unsigned k = 0; k < nKeys; ++k) {
+        if (foundContainers[k] == nullptr)
+          continue;
+        if (thinnedIndexes[k] == doNotLookForThisIndex)
+          continue;
         keys[k] = thinnedIndexes[k];
       }
     } else {
-      for(unsigned k = 0; k < nKeys; ++k) {
-        if(thinnedIndexes[k] == doNotLookForThisIndex) continue;
+      for (unsigned k = 0; k < nKeys; ++k) {
+        if (thinnedIndexes[k] == doNotLookForThisIndex)
+          continue;
         keys[k] = thinnedIndexes[k];
         foundContainers[k] = thinnedCollection;
       }
@@ -280,42 +275,38 @@ BareRootProductGetter::getThinnedProducts(edm::ProductID const& pid,
   }
 }
 
-BareRootProductGetter::Buffer*
-BareRootProductGetter::createNewBuffer(edm::BranchID const& branchID) const {
+BareRootProductGetter::Buffer* BareRootProductGetter::createNewBuffer(edm::BranchID const& branchID) const {
   //find the branch
   edm::BranchDescription const& bdesc = branchMap_.branchIDToBranch(branchID);
 
-  TBranch* branch= branchMap_.getEventTree()->GetBranch(bdesc.branchName().c_str());
-  if(nullptr == branch) {
-     //we do not thrown on missing branches since 'getIt' should not throw under that condition
+  TBranch* branch = branchMap_.getEventTree()->GetBranch(bdesc.branchName().c_str());
+  if (nullptr == branch) {
+    //we do not thrown on missing branches since 'getIt' should not throw under that condition
     return nullptr;
   }
   //find the class type
   std::string const fullName = edm::wrappedClassName(bdesc.className());
   edm::TypeWithDict classType(edm::TypeWithDict::byName(fullName));
-  if(!bool(classType)) {
-    throw cms::Exception("MissingDictionary")
-       << "could not find dictionary for type '" << fullName << "'"
-       << "\n Please make sure all the necessary libraries are available.";
+  if (!bool(classType)) {
+    throw cms::Exception("MissingDictionary") << "could not find dictionary for type '" << fullName << "'"
+                                              << "\n Please make sure all the necessary libraries are available.";
     return nullptr;
   }
 
   TClass* rootClassType = TClass::GetClass(classType.typeInfo());
-  if(nullptr == rootClassType) {
-    throw cms::Exception("MissingRootDictionary")
-    << "could not find a ROOT dictionary for type '" << fullName << "'"
-    << "\n Please make sure all the necessary libraries are available.";
+  if (nullptr == rootClassType) {
+    throw cms::Exception("MissingRootDictionary") << "could not find a ROOT dictionary for type '" << fullName << "'"
+                                                  << "\n Please make sure all the necessary libraries are available.";
     return nullptr;
   }
   void* address = rootClassType->New();
 
   static TClass const* edproductTClass = TClass::GetClass(typeid(edm::WrapperBase));
-  edm::WrapperBase const* prod = static_cast<edm::WrapperBase const*>( rootClassType->DynamicCast(edproductTClass,address,true));
-  if(nullptr == prod) {
-     throw cms::Exception("FailedConversion")
-        << "failed to convert a '" << fullName
-        << "' to a edm::WrapperBase."
-        << "Please contact developers since something is very wrong.";
+  edm::WrapperBase const* prod =
+      static_cast<edm::WrapperBase const*>(rootClassType->DynamicCast(edproductTClass, address, true));
+  if (nullptr == prod) {
+    throw cms::Exception("FailedConversion") << "failed to convert a '" << fullName << "' to a edm::WrapperBase."
+                                             << "Please contact developers since something is very wrong.";
   }
 
   //connect the instance to the branch
@@ -331,20 +322,19 @@ BareRootProductGetter::createNewBuffer(edm::BranchID const& branchID) const {
   return &(idToBuffers_[branchID]);
 }
 
-edm::ThinnedAssociation const*
-BareRootProductGetter::getThinnedAssociation(edm::BranchID const& branchID, Long_t eventEntry) const {
-
+edm::ThinnedAssociation const* BareRootProductGetter::getThinnedAssociation(edm::BranchID const& branchID,
+                                                                            Long_t eventEntry) const {
   edm::WrapperBase const* wrapperBase = getIt(branchID, eventEntry);
-  if(wrapperBase == nullptr) {
+  if (wrapperBase == nullptr) {
     throw edm::Exception(edm::errors::LogicError)
-      << "BareRootProductGetter::getThinnedAssociation, product ThinnedAssociation not found.\n";
+        << "BareRootProductGetter::getThinnedAssociation, product ThinnedAssociation not found.\n";
   }
-  if(!(typeid(edm::ThinnedAssociation) == wrapperBase->dynamicTypeInfo())) {
+  if (!(typeid(edm::ThinnedAssociation) == wrapperBase->dynamicTypeInfo())) {
     throw edm::Exception(edm::errors::LogicError)
-      << "BareRootProductGetter::getThinnedAssociation, product has wrong type, not a ThinnedAssociation.\n";
+        << "BareRootProductGetter::getThinnedAssociation, product has wrong type, not a ThinnedAssociation.\n";
   }
   edm::Wrapper<edm::ThinnedAssociation> const* wrapper =
-    static_cast<edm::Wrapper<edm::ThinnedAssociation> const*>(wrapperBase);
+      static_cast<edm::Wrapper<edm::ThinnedAssociation> const*>(wrapperBase);
 
   edm::ThinnedAssociation const* thinnedAssociation = wrapper->product();
   return thinnedAssociation;
diff --git a/FWCore/FWLite/src/BareRootProductGetter.h b/FWCore/FWLite/src/BareRootProductGetter.h
index a11cd1ff77598..5dbf4112cc133 100644
--- a/FWCore/FWLite/src/BareRootProductGetter.h
+++ b/FWCore/FWLite/src/BareRootProductGetter.h
@@ -35,81 +35,74 @@ class TBranch;
 class TClass;
 
 namespace edm {
-   class BranchID;
-   class ProductID;
-   class ThinnedAssociation;
-}
+  class BranchID;
+  class ProductID;
+  class ThinnedAssociation;
+}  // namespace edm
 
 class BareRootProductGetter : public edm::EDProductGetter {
-
-   public:
-      BareRootProductGetter();
-      ~BareRootProductGetter() override;
-
-      // ---------- const member functions ---------------------
-      edm::WrapperBase const* getIt(edm::ProductID const&) const override;
-
-     // getThinnedProduct assumes getIt was already called and failed to find
-     // the product. The input key is the index of the desired element in the
-     // container identified by ProductID (which cannot be found).
-     // If the return value is not null, then the desired element was found
-     // in a thinned container and key is modified to be the index into
-     // that thinned container. If the desired element is not found, then
-     // nullptr is returned.
-      edm::WrapperBase const* getThinnedProduct(edm::ProductID const&,
-                                                        unsigned int& key) const override;
-
-     // getThinnedProducts assumes getIt was already called and failed to find
-     // the product. The input keys are the indexes into the container identified
-     // by ProductID (which cannot be found). On input the WrapperBase pointers
-     // must all be set to nullptr (except when the function calls itself
-     // recursively where non-null pointers mark already found elements).
-     // Thinned containers derived from the product are searched to see
-     // if they contain the desired elements. For each that is
-     // found, the corresponding WrapperBase pointer is set and the key
-     // is modified to be the key into the container where the element
-     // was found. The WrapperBase pointers might or might not all point
-     // to the same thinned container.
-      void getThinnedProducts(edm::ProductID const&,
-                                      std::vector<edm::WrapperBase const*>& foundContainers,
-                                      std::vector<unsigned int>& keys) const override;
-
-   private:
-
-      // ---------- static member functions --------------------
-
-      // ---------- member functions ---------------------------
-      unsigned int transitionIndex_() const override {
-        return 0u;
-      }
-
-      edm::WrapperBase const* getIt(edm::BranchID const&, Long_t eventEntry) const;
-
-      struct Buffer {
-        Buffer(edm::WrapperBase const* iProd, TBranch* iBranch, void* iAddress,
-               TClass* iClass) :
-        product_(iProd), branch_(iBranch), address_(iAddress), eventEntry_(-1),
-        class_(iClass) {}
-        Buffer() : product_(), branch_(), address_(), eventEntry_(-1), class_(nullptr) {}
-
-        std::shared_ptr<edm::WrapperBase const> product_;
-        edm::propagate_const<TBranch*> branch_;
-        void* address_; //the address to pass to Root since as of 5.13 they cache that info
-        Long_t eventEntry_; //the event Entry used with the last GetEntry call
-        edm::propagate_const<TClass*> class_;
-      };
-
-      BareRootProductGetter(BareRootProductGetter const&) = delete; // stop default
-
-      BareRootProductGetter const& operator=(BareRootProductGetter const&) = delete; // stop default
-
-      Buffer* createNewBuffer(edm::BranchID const&) const;
-      edm::ThinnedAssociation const* getThinnedAssociation(edm::BranchID const& branchID, Long_t eventEntry) const;
-
-      // ---------- member data --------------------------------
-
-      typedef std::map<edm::BranchID, Buffer> IdToBuffers;
-      mutable IdToBuffers idToBuffers_;
-      mutable fwlite::BranchMapReader branchMap_;
+public:
+  BareRootProductGetter();
+  ~BareRootProductGetter() override;
+
+  // ---------- const member functions ---------------------
+  edm::WrapperBase const* getIt(edm::ProductID const&) const override;
+
+  // getThinnedProduct assumes getIt was already called and failed to find
+  // the product. The input key is the index of the desired element in the
+  // container identified by ProductID (which cannot be found).
+  // If the return value is not null, then the desired element was found
+  // in a thinned container and key is modified to be the index into
+  // that thinned container. If the desired element is not found, then
+  // nullptr is returned.
+  edm::WrapperBase const* getThinnedProduct(edm::ProductID const&, unsigned int& key) const override;
+
+  // getThinnedProducts assumes getIt was already called and failed to find
+  // the product. The input keys are the indexes into the container identified
+  // by ProductID (which cannot be found). On input the WrapperBase pointers
+  // must all be set to nullptr (except when the function calls itself
+  // recursively where non-null pointers mark already found elements).
+  // Thinned containers derived from the product are searched to see
+  // if they contain the desired elements. For each that is
+  // found, the corresponding WrapperBase pointer is set and the key
+  // is modified to be the key into the container where the element
+  // was found. The WrapperBase pointers might or might not all point
+  // to the same thinned container.
+  void getThinnedProducts(edm::ProductID const&,
+                          std::vector<edm::WrapperBase const*>& foundContainers,
+                          std::vector<unsigned int>& keys) const override;
+
+private:
+  // ---------- static member functions --------------------
+
+  // ---------- member functions ---------------------------
+  unsigned int transitionIndex_() const override { return 0u; }
+
+  edm::WrapperBase const* getIt(edm::BranchID const&, Long_t eventEntry) const;
+
+  struct Buffer {
+    Buffer(edm::WrapperBase const* iProd, TBranch* iBranch, void* iAddress, TClass* iClass)
+        : product_(iProd), branch_(iBranch), address_(iAddress), eventEntry_(-1), class_(iClass) {}
+    Buffer() : product_(), branch_(), address_(), eventEntry_(-1), class_(nullptr) {}
+
+    std::shared_ptr<edm::WrapperBase const> product_;
+    edm::propagate_const<TBranch*> branch_;
+    void* address_;      //the address to pass to Root since as of 5.13 they cache that info
+    Long_t eventEntry_;  //the event Entry used with the last GetEntry call
+    edm::propagate_const<TClass*> class_;
+  };
+
+  BareRootProductGetter(BareRootProductGetter const&) = delete;  // stop default
+
+  BareRootProductGetter const& operator=(BareRootProductGetter const&) = delete;  // stop default
+
+  Buffer* createNewBuffer(edm::BranchID const&) const;
+  edm::ThinnedAssociation const* getThinnedAssociation(edm::BranchID const& branchID, Long_t eventEntry) const;
+
+  // ---------- member data --------------------------------
+
+  typedef std::map<edm::BranchID, Buffer> IdToBuffers;
+  mutable IdToBuffers idToBuffers_;
+  mutable fwlite::BranchMapReader branchMap_;
 };
 #endif
diff --git a/FWCore/FWLite/src/BranchMapReader.cc b/FWCore/FWLite/src/BranchMapReader.cc
index e8b83457558cf..163400e05b75c 100644
--- a/FWCore/FWLite/src/BranchMapReader.cc
+++ b/FWCore/FWLite/src/BranchMapReader.cc
@@ -40,14 +40,19 @@ namespace fwlite {
     static const edm::BranchDescription kDefaultBranchDescription;
 
     BMRStrategy::BMRStrategy(TFile* file, int fileVersion)
-      : currentFile_(file), eventTree_(nullptr), luminosityBlockTree_(nullptr), runTree_(nullptr),
-        eventEntry_(-1), luminosityBlockEntry_(-1), runEntry_(-1), fileVersion_(fileVersion) {
+        : currentFile_(file),
+          eventTree_(nullptr),
+          luminosityBlockTree_(nullptr),
+          runTree_(nullptr),
+          eventEntry_(-1),
+          luminosityBlockEntry_(-1),
+          runEntry_(-1),
+          fileVersion_(fileVersion) {
       // do in derived obects
       // updateFile(file);
     }
 
-    BMRStrategy::~BMRStrategy() {
-    }
+    BMRStrategy::~BMRStrategy() {}
 
     class Strategy : public BMRStrategy {
     public:
@@ -56,7 +61,10 @@ namespace fwlite {
       Strategy(TFile* file, int fileVersion);
       ~Strategy() override;
       bool updateFile(TFile* file) override;
-      bool updateEvent(Long_t eventEntry) override { eventEntry_ = eventEntry; return true; }
+      bool updateEvent(Long_t eventEntry) override {
+        eventEntry_ = eventEntry;
+        return true;
+      }
       bool updateLuminosityBlock(Long_t luminosityBlockEntry) override {
         luminosityBlockEntry_ = luminosityBlockEntry;
         return true;
@@ -70,7 +78,9 @@ namespace fwlite {
       edm::BranchDescription const& productToBranch(edm::ProductID const& pid) override;
       edm::BranchDescription const& branchIDToBranch(edm::BranchID const& bid) const override;
       std::vector<edm::BranchDescription> const& getBranchDescriptions() override;
-      edm::ThinnedAssociationsHelper const& thinnedAssociationsHelper() const override { return *thinnedAssociationsHelper_; }
+      edm::ThinnedAssociationsHelper const& thinnedAssociationsHelper() const override {
+        return *thinnedAssociationsHelper_;
+      }
 
       TBranch* getBranchRegistry(edm::ProductRegistry** pReg);
 
@@ -81,7 +91,9 @@ namespace fwlite {
     };
 
     Strategy::Strategy(TFile* file, int fileVersion)
-      : BMRStrategy(file, fileVersion), mapperFilled_(false), thinnedAssociationsHelper_(new edm::ThinnedAssociationsHelper) {
+        : BMRStrategy(file, fileVersion),
+          mapperFilled_(false),
+          thinnedAssociationsHelper_(new edm::ThinnedAssociationsHelper) {
       // do in derived obects
       // updateFile(file);
     }
@@ -105,7 +117,7 @@ namespace fwlite {
       TBranch* bReg(nullptr);
 
       TTree* metaDataTree = dynamic_cast<TTree*>(currentFile_->Get(edm::poolNames::metaDataTreeName().c_str()));
-      if(nullptr != metaDataTree) {
+      if (nullptr != metaDataTree) {
         bReg = metaDataTree->GetBranch(edm::poolNames::productDescriptionBranchName().c_str());
         bReg->SetAddress(ppReg);
         bReg->GetEntry(0);
@@ -113,35 +125,31 @@ namespace fwlite {
       return bReg;
     }
 
-    std::vector<edm::BranchDescription> const&
-    Strategy::getBranchDescriptions() {
-      if(bDesc_.empty()) {
-        for(auto const& item : branchDescriptionMap_) {
+    std::vector<edm::BranchDescription> const& Strategy::getBranchDescriptions() {
+      if (bDesc_.empty()) {
+        for (auto const& item : branchDescriptionMap_) {
           bDesc_.push_back(item.second);
         }
       }
       return bDesc_;
     }
 
-    edm::BranchID
-    Strategy::productToBranchID(edm::ProductID const&) {
+    edm::BranchID Strategy::productToBranchID(edm::ProductID const&) {
       throw edm::Exception(edm::errors::UnimplementedFeature) << "Unsupported EDM file version";
     }
 
-    edm::BranchDescription const &
-    Strategy::productToBranch(edm::ProductID const& pid) {
+    edm::BranchDescription const& Strategy::productToBranch(edm::ProductID const& pid) {
       edm::BranchID bid = productToBranchID(pid);
       bidToDesc::const_iterator bdi = branchDescriptionMap_.find(bid);
-      if(branchDescriptionMap_.end() == bdi) {
+      if (branchDescriptionMap_.end() == bdi) {
         return kDefaultBranchDescription;
       }
       return bdi->second;
     }
 
-    edm::BranchDescription const &
-    Strategy::branchIDToBranch(edm::BranchID const& bid) const {
+    edm::BranchDescription const& Strategy::branchIDToBranch(edm::BranchID const& bid) const {
       bidToDesc::const_iterator bdi = branchDescriptionMap_.find(bid);
-      if(branchDescriptionMap_.end() == bdi) {
+      if (branchDescriptionMap_.end() == bdi) {
         return kDefaultBranchDescription;
       }
       return bdi->second;
@@ -152,18 +160,18 @@ namespace fwlite {
       BranchMapReaderStrategyV1(TFile* file, int fileVersion);
       bool updateFile(TFile* file) override;
       bool updateMap() override;
-      edm::BranchListIndexes const& branchListIndexes() const override {return dummyBranchListIndexes_;}
+      edm::BranchListIndexes const& branchListIndexes() const override { return dummyBranchListIndexes_; }
+
     private:
       edm::BranchListIndexes dummyBranchListIndexes_;
     };
 
-    BranchMapReaderStrategyV1::BranchMapReaderStrategyV1(TFile* file, int fileVersion)
-      : Strategy(file, fileVersion) {
+    BranchMapReaderStrategyV1::BranchMapReaderStrategyV1(TFile* file, int fileVersion) : Strategy(file, fileVersion) {
       updateFile(file);
     }
 
     bool BranchMapReaderStrategyV1::updateFile(TFile* file) {
-      if(Strategy::updateFile(file)) {
+      if (Strategy::updateFile(file)) {
         mapperFilled_ = false;
         return true;
       }
@@ -171,7 +179,7 @@ namespace fwlite {
     }
 
     bool BranchMapReaderStrategyV1::updateMap() {
-      if(mapperFilled_) {
+      if (mapperFilled_) {
         return true;
       }
 
@@ -182,12 +190,12 @@ namespace fwlite {
       edm::ProductRegistry* pReg = &reg;
       TBranch* br = getBranchRegistry(&pReg);
 
-      if(nullptr != br) {
+      if (nullptr != br) {
         edm::ProductRegistry::ProductList& prodList = reg.productListUpdator();
 
-        for(auto& item : prodList) {
+        for (auto& item : prodList) {
           edm::BranchDescription& prod = item.second;
-          if(edm::InEvent == prod.branchType()) {
+          if (edm::InEvent == prod.branchType()) {
             // call to regenerate branchName
             prod.init();
             branchDescriptionMap_.insert(bidToDesc::value_type(prod.branchID(), prod));
@@ -203,13 +211,14 @@ namespace fwlite {
     class BranchMapReaderStrategyV7 : public BranchMapReaderStrategyV1 {
     public:
       BranchMapReaderStrategyV7(TFile* file, int fileVersion);
-      edm::BranchListIndexes const& branchListIndexes() const override {return dummyBranchListIndexes_;}
+      edm::BranchListIndexes const& branchListIndexes() const override { return dummyBranchListIndexes_; }
+
     private:
       edm::BranchListIndexes dummyBranchListIndexes_;
     };
 
     BranchMapReaderStrategyV7::BranchMapReaderStrategyV7(TFile* file, int fileVersion)
-    : BranchMapReaderStrategyV1(file, fileVersion) {
+        : BranchMapReaderStrategyV1(file, fileVersion) {
       updateFile(file);
     }
 
@@ -221,23 +230,23 @@ namespace fwlite {
       bool updateLuminosityBlock(Long_t luminosityBlockEntry) override;
       bool updateRun(Long_t runEntry) override;
       bool updateMap() override;
-      edm::BranchListIndexes const& branchListIndexes() const override {return dummyBranchListIndexes_;}
+      edm::BranchListIndexes const& branchListIndexes() const override { return dummyBranchListIndexes_; }
+
     private:
       edm::propagate_const<TBranch*> entryInfoBranch_;
-      edm::EventEntryInfoVector  eventEntryInfoVector_;
+      edm::EventEntryInfoVector eventEntryInfoVector_;
       edm::EventEntryInfoVector const* pEventEntryInfoVector_;
       edm::BranchListIndexes dummyBranchListIndexes_;
     };
 
     BranchMapReaderStrategyV8::BranchMapReaderStrategyV8(TFile* file, int fileVersion)
-    : Strategy(file, fileVersion),
-      eventEntryInfoVector_(), pEventEntryInfoVector_(&eventEntryInfoVector_) {
+        : Strategy(file, fileVersion), eventEntryInfoVector_(), pEventEntryInfoVector_(&eventEntryInfoVector_) {
       updateFile(file);
     }
 
     bool BranchMapReaderStrategyV8::updateEvent(Long_t newevent) {
       // std::cout << "v8 updateevent " << newevent << std::endl;
-      if(newevent != eventEntry_) {
+      if (newevent != eventEntry_) {
         eventEntry_ = newevent;
         mapperFilled_ = false;
       }
@@ -245,7 +254,7 @@ namespace fwlite {
     }
 
     bool BranchMapReaderStrategyV8::updateLuminosityBlock(Long_t newLumi) {
-      if(newLumi != luminosityBlockEntry_) {
+      if (newLumi != luminosityBlockEntry_) {
         luminosityBlockEntry_ = newLumi;
         mapperFilled_ = false;
       }
@@ -253,7 +262,7 @@ namespace fwlite {
     }
 
     bool BranchMapReaderStrategyV8::updateRun(Long_t newRun) {
-      if(newRun != runEntry_) {
+      if (newRun != runEntry_) {
         runEntry_ = newRun;
         mapperFilled_ = false;
       }
@@ -265,9 +274,9 @@ namespace fwlite {
       mapperFilled_ = false;
       entryInfoBranch_ = nullptr;
       TTree* metaDataTree = dynamic_cast<TTree*>(currentFile_->Get(edm::poolNames::eventMetaDataTreeName().c_str()));
-      if(nullptr != metaDataTree) {
+      if (nullptr != metaDataTree) {
         entryInfoBranch_ = metaDataTree->GetBranch(BranchTypeToBranchEntryInfoBranchName(edm::InEvent).c_str());
-//         std::cout << "entryInfoBranch for " << BranchTypeToBranchEntryInfoBranchName(edm::InEvent) << " " << entryInfoBranch_ << std::endl;
+        //         std::cout << "entryInfoBranch for " << BranchTypeToBranchEntryInfoBranchName(edm::InEvent) << " " << entryInfoBranch_ << std::endl;
       } else {
         return false;
       }
@@ -279,14 +288,14 @@ namespace fwlite {
 
       edm::ProductRegistry reg;
       edm::ProductRegistry* pReg = &reg;
-      TBranch *br = getBranchRegistry(&pReg);
+      TBranch* br = getBranchRegistry(&pReg);
 
-      if(nullptr != br) {
+      if (nullptr != br) {
         edm::ProductRegistry::ProductList& prodList = reg.productListUpdator();
 
-        for(auto& item : prodList) {
+        for (auto& item : prodList) {
           edm::BranchDescription& prod = item.second;
-          if(edm::InEvent == prod.branchType()) {
+          if (edm::InEvent == prod.branchType()) {
             // call to regenerate branchName
             prod.init();
             branchDescriptionMap_.insert(bidToDesc::value_type(prod.branchID(), prod));
@@ -298,7 +307,7 @@ namespace fwlite {
     }
 
     bool BranchMapReaderStrategyV8::updateMap() {
-      if(mapperFilled_) {
+      if (mapperFilled_) {
         return true;
       }
 
@@ -306,9 +315,9 @@ namespace fwlite {
 
       entryInfoBranch_->GetEntry(eventEntry_);
 
-//      for(auto const& item : *pEventEntryInfoVector_) {
-//         eventInfoMap_.insert(item);
-//      }
+      //      for(auto const& item : *pEventEntryInfoVector_) {
+      //         eventInfoMap_.insert(item);
+      //      }
       mapperFilled_ = true;
       return true;
     }
@@ -322,7 +331,8 @@ namespace fwlite {
       bool updateRun(Long_t runEntry) override;
       bool updateMap() override;
       edm::BranchID productToBranchID(edm::ProductID const& pid) override;
-      edm::BranchListIndexes const& branchListIndexes() const override {return history_.branchListIndexes();}
+      edm::BranchListIndexes const& branchListIndexes() const override { return history_.branchListIndexes(); }
+
     private:
       edm::propagate_const<std::unique_ptr<edm::BranchIDLists>> branchIDLists_;
       edm::propagate_const<TTree*> eventHistoryTree_;
@@ -331,13 +341,13 @@ namespace fwlite {
     };
 
     BranchMapReaderStrategyV11::BranchMapReaderStrategyV11(TFile* file, int fileVersion)
-    : Strategy(file, fileVersion), eventHistoryTree_(nullptr), pHistory_(&history_) {
+        : Strategy(file, fileVersion), eventHistoryTree_(nullptr), pHistory_(&history_) {
       updateFile(file);
     }
 
     bool BranchMapReaderStrategyV11::updateEvent(Long_t newevent) {
-//      std::cout << "v11 updateevent " << newevent << std::endl;
-      if(newevent != eventEntry_) {
+      //      std::cout << "v11 updateevent " << newevent << std::endl;
+      if (newevent != eventEntry_) {
         eventEntry_ = newevent;
         mapperFilled_ = false;
       }
@@ -345,7 +355,7 @@ namespace fwlite {
     }
 
     bool BranchMapReaderStrategyV11::updateLuminosityBlock(Long_t newlumi) {
-      if(newlumi != luminosityBlockEntry_) {
+      if (newlumi != luminosityBlockEntry_) {
         luminosityBlockEntry_ = newlumi;
         mapperFilled_ = false;
       }
@@ -353,7 +363,7 @@ namespace fwlite {
     }
 
     bool BranchMapReaderStrategyV11::updateRun(Long_t newRun) {
-      if(newRun != runEntry_) {
+      if (newRun != runEntry_) {
         runEntry_ = newRun;
         mapperFilled_ = false;
       }
@@ -365,20 +375,19 @@ namespace fwlite {
       mapperFilled_ = false;
       TTree* metaDataTree = dynamic_cast<TTree*>(currentFile_->Get(edm::poolNames::metaDataTreeName().c_str()));
 
-      if(nullptr == metaDataTree) {
-         throw edm::Exception(edm::errors::EventCorruption)
-           <<"No "<<edm::poolNames::metaDataTreeName()<<" TTree in file";
+      if (nullptr == metaDataTree) {
+        throw edm::Exception(edm::errors::EventCorruption)
+            << "No " << edm::poolNames::metaDataTreeName() << " TTree in file";
       }
       branchIDLists_ = std::make_unique<edm::BranchIDLists>();
       edm::BranchIDLists* branchIDListsPtr = branchIDLists_.get();
-      if(metaDataTree->FindBranch(edm::poolNames::branchIDListBranchName().c_str()) != nullptr) {
+      if (metaDataTree->FindBranch(edm::poolNames::branchIDListBranchName().c_str()) != nullptr) {
         TBranch* b = metaDataTree->GetBranch(edm::poolNames::branchIDListBranchName().c_str());
         b->SetAddress(&branchIDListsPtr);
         b->GetEntry(0);
-//         std::cout << "--> " << branchIDLists_->size() << std::endl;
+        //         std::cout << "--> " << branchIDLists_->size() << std::endl;
       } else {
-        throw edm::Exception(edm::errors::EventCorruption)
-          << "FindBranch of branchIDList failed";
+        throw edm::Exception(edm::errors::EventCorruption) << "FindBranch of branchIDList failed";
         return false;
       }
 
@@ -389,31 +398,30 @@ namespace fwlite {
 
       edm::ProductRegistry reg;
       edm::ProductRegistry* pReg = &reg;
-      TBranch *br = getBranchRegistry(&pReg);
+      TBranch* br = getBranchRegistry(&pReg);
 
-      if(nullptr != br) {
+      if (nullptr != br) {
         edm::ProductRegistry::ProductList& prodList = reg.productListUpdator();
 
-        for(auto& item : prodList) {
+        for (auto& item : prodList) {
           edm::BranchDescription& prod = item.second;
-          if(edm::InEvent == prod.branchType()) {
+          if (edm::InEvent == prod.branchType()) {
             // call to regenerate branchName
             prod.init();
             branchDescriptionMap_.insert(bidToDesc::value_type(prod.branchID(), prod));
-//             std::cout << "v11 updatefile " << prod.branchID() << std::endl;
-                }
-              }
+            //             std::cout << "v11 updatefile " << prod.branchID() << std::endl;
+          }
+        }
       }
       reg.setFrozen(false);
       return nullptr != br;
     }
 
     bool BranchMapReaderStrategyV11::updateMap() {
-      if(!mapperFilled_) {
+      if (!mapperFilled_) {
         TBranch* eventHistoryBranch = eventHistoryTree_->GetBranch(edm::poolNames::eventHistoryBranchName().c_str());
-        if(!eventHistoryBranch) {
-          throw edm::Exception(edm::errors::EventCorruption)
-            << "Failed to find history branch in event history tree";
+        if (!eventHistoryBranch) {
+          throw edm::Exception(edm::errors::EventCorruption) << "Failed to find history branch in event history tree";
           return false;
         }
         // yes, SetAddress really does need to be called every time...
@@ -424,8 +432,7 @@ namespace fwlite {
       return true;
     }
 
-    edm::BranchID
-    BranchMapReaderStrategyV11::productToBranchID(edm::ProductID const& pid) {
+    edm::BranchID BranchMapReaderStrategyV11::productToBranchID(edm::ProductID const& pid) {
       updateMap();
       return edm::productIDToBranchID(pid, *branchIDLists_, history_.branchListIndexes());
     }
@@ -439,7 +446,8 @@ namespace fwlite {
       bool updateRun(Long_t runEntry) override;
       bool updateMap() override;
       edm::BranchID productToBranchID(edm::ProductID const& pid) override;
-      edm::BranchListIndexes const& branchListIndexes() const override {return branchListIndexes_;}
+      edm::BranchListIndexes const& branchListIndexes() const override { return branchListIndexes_; }
+
     private:
       edm::propagate_const<std::unique_ptr<edm::BranchIDLists>> branchIDLists_;
       edm::propagate_const<TTree*> eventsTree_;
@@ -448,13 +456,13 @@ namespace fwlite {
     };
 
     BranchMapReaderStrategyV17::BranchMapReaderStrategyV17(TFile* file, int fileVersion)
-    : Strategy(file, fileVersion), eventsTree_(nullptr), pBranchListIndexes_(&branchListIndexes_) {
+        : Strategy(file, fileVersion), eventsTree_(nullptr), pBranchListIndexes_(&branchListIndexes_) {
       updateFile(file);
     }
 
     bool BranchMapReaderStrategyV17::updateEvent(Long_t newevent) {
-//      std::cout << "v11 updateevent " << newevent << std::endl;
-      if(newevent != eventEntry_) {
+      //      std::cout << "v11 updateevent " << newevent << std::endl;
+      if (newevent != eventEntry_) {
         eventEntry_ = newevent;
         mapperFilled_ = false;
       }
@@ -462,7 +470,7 @@ namespace fwlite {
     }
 
     bool BranchMapReaderStrategyV17::updateLuminosityBlock(Long_t newlumi) {
-      if(newlumi != luminosityBlockEntry_) {
+      if (newlumi != luminosityBlockEntry_) {
         luminosityBlockEntry_ = newlumi;
         mapperFilled_ = false;
       }
@@ -470,7 +478,7 @@ namespace fwlite {
     }
 
     bool BranchMapReaderStrategyV17::updateRun(Long_t newRun) {
-      if(newRun != runEntry_) {
+      if (newRun != runEntry_) {
         runEntry_ = newRun;
         mapperFilled_ = false;
       }
@@ -481,13 +489,14 @@ namespace fwlite {
       Strategy::updateFile(file);
       mapperFilled_ = false;
       TTree* metaDataTree = dynamic_cast<TTree*>(currentFile_->Get(edm::poolNames::metaDataTreeName().c_str()));
-      if(nullptr == metaDataTree) {
-         throw edm::Exception(edm::errors::EventCorruption) <<"No "<<edm::poolNames::metaDataTreeName()<<" TTree in file";
+      if (nullptr == metaDataTree) {
+        throw edm::Exception(edm::errors::EventCorruption)
+            << "No " << edm::poolNames::metaDataTreeName() << " TTree in file";
       }
 
       thinnedAssociationsHelper_ = std::make_unique<edm::ThinnedAssociationsHelper>();
       edm::ThinnedAssociationsHelper* thinnedAssociationsHelperPtr = thinnedAssociationsHelper_.get();
-      if(metaDataTree->FindBranch(edm::poolNames::thinnedAssociationsHelperBranchName().c_str()) != nullptr) {
+      if (metaDataTree->FindBranch(edm::poolNames::thinnedAssociationsHelperBranchName().c_str()) != nullptr) {
         TBranch* b = metaDataTree->GetBranch(edm::poolNames::thinnedAssociationsHelperBranchName().c_str());
         b->SetAddress(&thinnedAssociationsHelperPtr);
         b->GetEntry(0);
@@ -495,14 +504,13 @@ namespace fwlite {
 
       branchIDLists_ = std::make_unique<edm::BranchIDLists>();
       edm::BranchIDLists* branchIDListsPtr = branchIDLists_.get();
-      if(metaDataTree->FindBranch(edm::poolNames::branchIDListBranchName().c_str()) != nullptr) {
+      if (metaDataTree->FindBranch(edm::poolNames::branchIDListBranchName().c_str()) != nullptr) {
         TBranch* b = metaDataTree->GetBranch(edm::poolNames::branchIDListBranchName().c_str());
         b->SetAddress(&branchIDListsPtr);
         b->GetEntry(0);
-//         std::cout << "--> " << branchIDLists_->size() << std::endl;
+        //         std::cout << "--> " << branchIDLists_->size() << std::endl;
       } else {
-        throw edm::Exception(edm::errors::EventCorruption)
-          << "FindBranch of branchIDList failed";
+        throw edm::Exception(edm::errors::EventCorruption) << "FindBranch of branchIDList failed";
         return false;
       }
 
@@ -513,31 +521,32 @@ namespace fwlite {
 
       edm::ProductRegistry reg;
       edm::ProductRegistry* pReg = &reg;
-      TBranch *br = getBranchRegistry(&pReg);
+      TBranch* br = getBranchRegistry(&pReg);
 
-      if(nullptr != br) {
+      if (nullptr != br) {
         edm::ProductRegistry::ProductList& prodList = reg.productListUpdator();
 
-        for(auto& item : prodList) {
+        for (auto& item : prodList) {
           edm::BranchDescription& prod = item.second;
-          if(edm::InEvent == prod.branchType()) {
+          if (edm::InEvent == prod.branchType()) {
             // call to regenerate branchName
             prod.init();
             branchDescriptionMap_.insert(bidToDesc::value_type(prod.branchID(), prod));
-//             std::cout << "v11 updatefile " << prod.branchID() << std::endl;
-                }
-              }
+            //             std::cout << "v11 updatefile " << prod.branchID() << std::endl;
+          }
+        }
       }
       reg.setFrozen(false);
       return nullptr != br;
     }
 
     bool BranchMapReaderStrategyV17::updateMap() {
-      if(!mapperFilled_) {
-        TBranch* branchListIndexesBranch = eventsTree_->GetBranch(edm::poolNames::branchListIndexesBranchName().c_str());
-        if(!branchListIndexesBranch) {
+      if (!mapperFilled_) {
+        TBranch* branchListIndexesBranch =
+            eventsTree_->GetBranch(edm::poolNames::branchListIndexesBranchName().c_str());
+        if (!branchListIndexesBranch) {
           throw edm::Exception(edm::errors::EventCorruption)
-            << "Failed to find branch list indexes branch in event tree";
+              << "Failed to find branch list indexes branch in event tree";
           return false;
         }
         // yes, SetAddress really does need to be called every time...
@@ -548,117 +557,105 @@ namespace fwlite {
       return true;
     }
 
-    edm::BranchID
-    BranchMapReaderStrategyV17::productToBranchID(edm::ProductID const& pid) {
+    edm::BranchID BranchMapReaderStrategyV17::productToBranchID(edm::ProductID const& pid) {
       updateMap();
       return edm::productIDToBranchID(pid, *branchIDLists_, branchListIndexes_);
     }
-  }
+  }  // namespace internal
 
-//
-// constants, enums and typedefs
-//
+  //
+  // constants, enums and typedefs
+  //
 
-//
-// static data member definitions
-//
+  //
+  // static data member definitions
+  //
 
-//
-// constructors and destructor
-//
+  //
+  // constructors and destructor
+  //
 
-BranchMapReader::BranchMapReader(TFile* file) :
-    fileVersion_(-1) {
-  if(nullptr == file) {
-     throw cms::Exception("NoFile")<<"The TFile pointer is null";
+  BranchMapReader::BranchMapReader(TFile* file) : fileVersion_(-1) {
+    if (nullptr == file) {
+      throw cms::Exception("NoFile") << "The TFile pointer is null";
+    }
+    strategy_ = newStrategy(file, getFileVersion(file));
   }
-  strategy_ = newStrategy(file, getFileVersion(file));
-}
 
-//
-// member functions
-//
+  //
+  // member functions
+  //
+
+  int BranchMapReader::getFileVersion(TFile* file) {
+    TTree* metaDataTree = dynamic_cast<TTree*>(file->Get(edm::poolNames::metaDataTreeName().c_str()));
+    if (nullptr == metaDataTree) {
+      return 0;
+    }
 
-int BranchMapReader::getFileVersion(TFile* file) {
-  TTree* metaDataTree = dynamic_cast<TTree*>(file->Get(edm::poolNames::metaDataTreeName().c_str()));
-  if(nullptr == metaDataTree) {
-    return 0;
+    edm::FileFormatVersion v;
+    edm::FileFormatVersion* pV = &v;
+    TBranch* bVer = metaDataTree->GetBranch(edm::poolNames::fileFormatVersionBranchName().c_str());
+    bVer->SetAddress(&pV);
+    bVer->GetEntry(0);
+    fileVersion_ = v.value();
+    return v.value();
   }
 
-  edm::FileFormatVersion v;
-  edm::FileFormatVersion* pV=&v;
-  TBranch* bVer = metaDataTree->GetBranch(edm::poolNames::fileFormatVersionBranchName().c_str());
-  bVer->SetAddress(&pV);
-  bVer->GetEntry(0);
-  fileVersion_ = v.value();
-  return v.value();
-}
-
-bool BranchMapReader::updateEvent(Long_t newevent) {
-  return strategy_->updateEvent(newevent);
-}
-
-bool BranchMapReader::updateLuminosityBlock(Long_t newlumi) {
-  return strategy_->updateLuminosityBlock(newlumi);
-}
-
-bool BranchMapReader::updateRun(Long_t newRun) {
-  return strategy_->updateRun(newRun);
-}
-
-bool BranchMapReader::updateFile(TFile* file) {
-  if(nullptr == strategy_.get()) {
-    strategy_ = newStrategy(file, getFileVersion(file));
-    return true;
+  bool BranchMapReader::updateEvent(Long_t newevent) { return strategy_->updateEvent(newevent); }
+
+  bool BranchMapReader::updateLuminosityBlock(Long_t newlumi) { return strategy_->updateLuminosityBlock(newlumi); }
+
+  bool BranchMapReader::updateRun(Long_t newRun) { return strategy_->updateRun(newRun); }
+
+  bool BranchMapReader::updateFile(TFile* file) {
+    if (nullptr == strategy_.get()) {
+      strategy_ = newStrategy(file, getFileVersion(file));
+      return true;
+    }
+
+    TFile* currentFile(strategy_->currentFile_);
+    bool isNew(file != currentFile);
+
+    if (!isNew) {
+      //could still have a new TFile which just happens to share the same memory address as the previous file
+      //will assume that if the Event tree's address and UUID are the same as before then we do not have
+      // to treat this like a new file
+      TTree* eventTreeTemp = dynamic_cast<TTree*>(currentFile->Get(edm::poolNames::eventTreeName().c_str()));
+      isNew = eventTreeTemp != strategy_->eventTree_ || strategy_->fileUUID_ != currentFile->GetUUID();
+    }
+    if (isNew) {
+      int fileVersion = getFileVersion(file);
+      if (fileVersion != strategy_->fileVersion_) {
+        strategy_ = newStrategy(file, fileVersion);
+      } else {
+        strategy_->updateFile(file);
+      }
+    }
+    return isNew;
   }
 
-  TFile* currentFile(strategy_->currentFile_);
-  bool isNew(file != currentFile);
+  edm::BranchDescription const& BranchMapReader::productToBranch(edm::ProductID const& pid) {
+    return strategy_->productToBranch(pid);
+  }
 
-  if(!isNew) {
-    //could still have a new TFile which just happens to share the same memory address as the previous file
-    //will assume that if the Event tree's address and UUID are the same as before then we do not have
-    // to treat this like a new file
-    TTree* eventTreeTemp = dynamic_cast<TTree*>(currentFile->Get(edm::poolNames::eventTreeName().c_str()));
-    isNew = eventTreeTemp != strategy_->eventTree_ || strategy_->fileUUID_ != currentFile->GetUUID();
+  std::vector<edm::BranchDescription> const& BranchMapReader::getBranchDescriptions() {
+    return strategy_->getBranchDescriptions();
   }
-  if(isNew) {
-    int fileVersion = getFileVersion(file);
-    if(fileVersion != strategy_->fileVersion_) {
-      strategy_ = newStrategy(file, fileVersion);
+
+  std::unique_ptr<internal::BMRStrategy> BranchMapReader::newStrategy(TFile* file, int fileVersion) {
+    std::unique_ptr<internal::BMRStrategy> s;
+
+    if (fileVersion >= 17) {
+      s = std::make_unique<internal::BranchMapReaderStrategyV17>(file, fileVersion);
+    } else if (fileVersion >= 11) {
+      s = std::make_unique<internal::BranchMapReaderStrategyV11>(file, fileVersion);
+    } else if (fileVersion >= 8) {
+      s = std::make_unique<internal::BranchMapReaderStrategyV8>(file, fileVersion);
+    } else if (fileVersion >= 7) {
+      s = std::make_unique<internal::BranchMapReaderStrategyV7>(file, fileVersion);
     } else {
-      strategy_->updateFile(file);
+      s = std::make_unique<internal::BranchMapReaderStrategyV1>(file, fileVersion);
     }
+    return s;
   }
-  return isNew;
-}
-
-edm::BranchDescription const &
-BranchMapReader::productToBranch(edm::ProductID const& pid) {
-  return strategy_->productToBranch(pid);
-}
-
-std::vector<edm::BranchDescription> const&
-BranchMapReader::getBranchDescriptions() {
-  return strategy_->getBranchDescriptions();
-}
-
-
-std::unique_ptr<internal::BMRStrategy>
-BranchMapReader::newStrategy(TFile* file, int fileVersion) {
-  std::unique_ptr<internal::BMRStrategy> s;
-
-  if(fileVersion >= 17) {
-    s = std::make_unique<internal::BranchMapReaderStrategyV17>(file, fileVersion);
-  } else if(fileVersion >= 11) {
-    s = std::make_unique<internal::BranchMapReaderStrategyV11>(file, fileVersion);
-  } else if(fileVersion >= 8) {
-    s = std::make_unique<internal::BranchMapReaderStrategyV8>(file, fileVersion);
-  } else if(fileVersion >= 7) {
-    s = std::make_unique<internal::BranchMapReaderStrategyV7>(file, fileVersion);
-  } else {
-    s = std::make_unique<internal::BranchMapReaderStrategyV1>(file, fileVersion);
-  }
-  return s;
-}
-}
+}  // namespace fwlite
diff --git a/FWCore/FWLite/src/FWLiteEnabler.cc b/FWCore/FWLite/src/FWLiteEnabler.cc
index 5400e210035a3..561a2681f5741 100644
--- a/FWCore/FWLite/src/FWLiteEnabler.cc
+++ b/FWCore/FWLite/src/FWLiteEnabler.cc
@@ -30,73 +30,71 @@
 // static data member definitions
 //
 
-  bool FWLiteEnabler::enabled_(false);
-
+bool FWLiteEnabler::enabled_(false);
 
 //
 // constructors and destructor
 //
 // Note: this ctor will never be invoked.
 // All data and functions are static
-  FWLiteEnabler::FWLiteEnabler() {
-  }
-
+FWLiteEnabler::FWLiteEnabler() {}
 
 //
 // member functions
 //
 
-  void
-  FWLiteEnabler::enable() {
-   if (enabled_) { return; }
-   enabled_ = true;
-
-   edmplugin::PluginManager::configure(edmplugin::standard::config());
-   static BareRootProductGetter s_getter;
-   //this function must be called
-   // so that the TClass we need will be available
-   fwlite::setRefStreamer(&s_getter);
-
-   //Make it easy to load our headers
-   TInterpreter* intrp= gROOT->GetInterpreter();
-   char const* env = getenv("CMSSW_FWLITE_INCLUDE_PATH");
-   if(nullptr != env) {
-     //this is a comma separated list
-     char const* start = env;
-     char const* end;
-     do {
-       //find end
-       for(end=start; *end!=0 and *end != ':';++end);
-       std::string dir(start, end);
-       intrp->AddIncludePath(dir.c_str());
-       start = end+1;
-     } while(*end != 0);
-   }
-
-   bool foundCMSIncludes = false;
-   env = getenv("CMSSW_BASE");
-   if(nullptr != env) {
-     foundCMSIncludes = true;
-     std::string dir(env);
-     dir += "/src";
-     intrp->AddIncludePath(dir.c_str());
-   }
+void FWLiteEnabler::enable() {
+  if (enabled_) {
+    return;
+  }
+  enabled_ = true;
+
+  edmplugin::PluginManager::configure(edmplugin::standard::config());
+  static BareRootProductGetter s_getter;
+  //this function must be called
+  // so that the TClass we need will be available
+  fwlite::setRefStreamer(&s_getter);
+
+  //Make it easy to load our headers
+  TInterpreter* intrp = gROOT->GetInterpreter();
+  char const* env = getenv("CMSSW_FWLITE_INCLUDE_PATH");
+  if (nullptr != env) {
+    //this is a comma separated list
+    char const* start = env;
+    char const* end;
+    do {
+      //find end
+      for (end = start; *end != 0 and *end != ':'; ++end)
+        ;
+      std::string dir(start, end);
+      intrp->AddIncludePath(dir.c_str());
+      start = end + 1;
+    } while (*end != 0);
+  }
 
-   env = getenv("CMSSW_RELEASE_BASE");
-   if(nullptr != env) {
-     foundCMSIncludes = true;
-     std::string dir(env);
-     dir += "/src";
-     intrp->AddIncludePath(dir.c_str());
-   }
-   if(not foundCMSIncludes) {
-     std::cerr <<"Could not find the environment variables \n"
-     <<"  CMSSW_BASE or\n"
-     <<"  CMSSW_RELEASE_BASE\n"
-     <<" therefore attempting to '#include' any CMS headers will not work"<<std::endl;
-   }
-   if (nullptr != gApplication) {
-     gApplication->InitializeGraphics();
-   }
+  bool foundCMSIncludes = false;
+  env = getenv("CMSSW_BASE");
+  if (nullptr != env) {
+    foundCMSIncludes = true;
+    std::string dir(env);
+    dir += "/src";
+    intrp->AddIncludePath(dir.c_str());
   }
 
+  env = getenv("CMSSW_RELEASE_BASE");
+  if (nullptr != env) {
+    foundCMSIncludes = true;
+    std::string dir(env);
+    dir += "/src";
+    intrp->AddIncludePath(dir.c_str());
+  }
+  if (not foundCMSIncludes) {
+    std::cerr << "Could not find the environment variables \n"
+              << "  CMSSW_BASE or\n"
+              << "  CMSSW_RELEASE_BASE\n"
+              << " therefore attempting to '#include' any CMS headers will not work" << std::endl;
+  }
+  if (nullptr != gApplication) {
+    gApplication->InitializeGraphics();
+  }
+}
diff --git a/FWCore/FWLite/src/RefStreamer.cc b/FWCore/FWLite/src/RefStreamer.cc
index 105bd1b6b1b46..fd18f93990c66 100644
--- a/FWCore/FWLite/src/RefStreamer.cc
+++ b/FWCore/FWLite/src/RefStreamer.cc
@@ -11,4 +11,4 @@ namespace fwlite {
   edm::EDProductGetter const* setRefStreamer(edm::EDProductGetter const* ep) {
     return edm::EDProductGetter::switchProductGetter(ep);
   }
-}
+}  // namespace fwlite
diff --git a/FWCore/FWLite/src/branchToClass.cc b/FWCore/FWLite/src/branchToClass.cc
index 5bdf4dbc8b4f2..012d3339e6a51 100644
--- a/FWCore/FWLite/src/branchToClass.cc
+++ b/FWCore/FWLite/src/branchToClass.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWLite
 // Class  :     BranchToClass
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -19,35 +19,27 @@ class TClass;
 #include "FWCore/FWLite/src/branchToClass.h"
 
 namespace {
-class BranchToClass : private TVirtualBranchBrowsable
-{
-  
-public:
-  static TClass* doit( const TBranch* iBranch );
-  
-private:
-  ///NOTE: do not call this, it is only here because ROOT demands it
-  BranchToClass() = delete;
-};
-
-TClass*
-BranchToClass::doit( const TBranch* iBranch )
-{
-  TClass* contained = nullptr;
-  TClass* type = TVirtualBranchBrowsable::GetCollectionContainedType(iBranch,nullptr,contained);
-  if( type == nullptr) {
-    type = contained;
+  class BranchToClass : private TVirtualBranchBrowsable {
+  public:
+    static TClass* doit(const TBranch* iBranch);
+
+  private:
+    ///NOTE: do not call this, it is only here because ROOT demands it
+    BranchToClass() = delete;
+  };
+
+  TClass* BranchToClass::doit(const TBranch* iBranch) {
+    TClass* contained = nullptr;
+    TClass* type = TVirtualBranchBrowsable::GetCollectionContainedType(iBranch, nullptr, contained);
+    if (type == nullptr) {
+      type = contained;
+    }
+    return type;
   }
-  return type;  
-}
 
-}
+}  // namespace
 
-TClass*
-branchToClass(const TBranch* iBranch)
-{
-  return BranchToClass::doit(iBranch);
-}
+TClass* branchToClass(const TBranch* iBranch) { return BranchToClass::doit(iBranch); }
 //
 // constants, enums and typedefs
 //
diff --git a/FWCore/FWLite/src/branchToClass.h b/FWCore/FWLite/src/branchToClass.h
index 51382daa5b17a..d879dff834c83 100644
--- a/FWCore/FWLite/src/branchToClass.h
+++ b/FWCore/FWLite/src/branchToClass.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWLite
 // Class  :     BranchToClass
-// 
+//
 /**\class BranchToClass BranchToClass.h FWCore/FWLite/interface/BranchToClass.h
 
  Description: Given a TBranch it will return the TClass of the class type stored in the branch
@@ -26,8 +26,6 @@
 class TClass;
 class TBranch;
 
-TClass* branchToClass( const TBranch* iBranch);
-
-
+TClass* branchToClass(const TBranch* iBranch);
 
 #endif
diff --git a/FWCore/FWLite/test/ref_t.cppunit.cpp b/FWCore/FWLite/test/ref_t.cppunit.cpp
index c765864c41b44..1669f372be38a 100644
--- a/FWCore/FWLite/test/ref_t.cppunit.cpp
+++ b/FWCore/FWLite/test/ref_t.cppunit.cpp
@@ -68,47 +68,44 @@ static char* gArgV = nullptr;
 
 extern "C" char** environ;
 
-#define CHARSTAR(x) const_cast<char *>(x)
+#define CHARSTAR(x) const_cast<char*>(x)
 
-class testRefInROOT: public CppUnit::TestFixture
-{
+class testRefInROOT : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testRefInROOT);
-  
+
   CPPUNIT_TEST(testOneGoodFile);
-  CPPUNIT_TEST_EXCEPTION(failOneBadFile,std::exception);
+  CPPUNIT_TEST_EXCEPTION(failOneBadFile, std::exception);
   CPPUNIT_TEST(testGoodChain);
   CPPUNIT_TEST(testTwoGoodFiles);
   CPPUNIT_TEST(testMissingRef);
 
   // CPPUNIT_TEST_EXCEPTION(failChainWithMissingFile,std::exception);
   //failTwoDifferentFiles
-  CPPUNIT_TEST_EXCEPTION(failDidNotCallGetEntryForEvents,std::exception);
+  CPPUNIT_TEST_EXCEPTION(failDidNotCallGetEntryForEvents, std::exception);
   CPPUNIT_TEST(testThinning);
 
   CPPUNIT_TEST_SUITE_END();
+
 public:
-  testRefInROOT() { }
-  ~testRefInROOT() { }
-  void setUp()
-  {
-    if(!sWasRun_) {
+  testRefInROOT() {}
+  ~testRefInROOT() {}
+  void setUp() {
+    if (!sWasRun_) {
       gSystem->Load("libFWCoreFWLite.so");
       FWLiteEnabler::enable();
-      
-      char* argv[] = {CHARSTAR("testFWCoreFWLite"),
-		      CHARSTAR("/bin/bash"),
-		      CHARSTAR("FWCore/FWLite/test"),
-		      CHARSTAR("RefTest.sh")};
+
+      char* argv[] = {
+          CHARSTAR("testFWCoreFWLite"), CHARSTAR("/bin/bash"), CHARSTAR("FWCore/FWLite/test"), CHARSTAR("RefTest.sh")};
       argv[0] = gArgV;
-      if(0!=ptomaine(sizeof(argv)/sizeof(const char*), argv, environ) ) {
-        std::cerr <<"could not run script needed to make test files\n";
+      if (0 != ptomaine(sizeof(argv) / sizeof(const char*), argv, environ)) {
+        std::cerr << "could not run script needed to make test files\n";
         ::exit(-1);
       }
       sWasRun_ = true;
     }
   }
-  void tearDown(){}
-  
+  void tearDown() {}
+
   void testOneGoodFile();
   void testTwoGoodFiles();
   void failOneBadFile();
@@ -118,180 +115,168 @@ class testRefInROOT: public CppUnit::TestFixture
   void testMissingRef();
   void testThinning();
 
-
- private:
+private:
   static bool sWasRun_;
 };
 
-bool testRefInROOT::sWasRun_=false;
+bool testRefInROOT::sWasRun_ = false;
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testRefInROOT);
 
-static void checkMatch(const edmtest::OtherThingCollection* pOthers,
-                       const edmtest::ThingCollection* pThings)
-{
+static void checkMatch(const edmtest::OtherThingCollection* pOthers, const edmtest::ThingCollection* pThings) {
   CPPUNIT_ASSERT(pOthers != nullptr);
   CPPUNIT_ASSERT(pThings != nullptr);
   CPPUNIT_ASSERT(pOthers->size() == pThings->size());
-  
+
   //This test requires at least one entry
-  CPPUNIT_ASSERT(pOthers->size() > 0 );
+  CPPUNIT_ASSERT(pOthers->size() > 0);
   const edm::View<edmtest::Thing>& view = *(pOthers->front().refToBaseProd);
   CPPUNIT_ASSERT(view.size() == pOthers->size());
 
   edmtest::ThingCollection::const_iterator itThing = pThings->begin(), itThingEnd = pThings->end();
   edmtest::OtherThingCollection::const_iterator itOther = pOthers->begin();
   edm::View<edmtest::Thing>::const_iterator itView = view.begin();
-  
-  for( ; itThing != itThingEnd; ++itThing, ++itOther,++itView) {
+
+  for (; itThing != itThingEnd; ++itThing, ++itOther, ++itView) {
     //I'm assuming the following is true
     CPPUNIT_ASSERT(itOther->ref.key() == static_cast<unsigned int>(itThing - pThings->begin()));
     //std::cout <<" ref "<<itOther->ref.get()->a<<" thing "<<itThing->a<<std::endl;
-    if(itOther->ref.get()->a != itThing->a) {
-      std::cout <<" *PROBLEM: ref "<<itOther->ref.get()->a<<"!= thing "<<itThing->a<<std::endl;
+    if (itOther->ref.get()->a != itThing->a) {
+      std::cout << " *PROBLEM: ref " << itOther->ref.get()->a << "!= thing " << itThing->a << std::endl;
     }
-    CPPUNIT_ASSERT( itOther->ref.get()->a == itThing->a);
+    CPPUNIT_ASSERT(itOther->ref.get()->a == itThing->a);
 
     CPPUNIT_ASSERT(itOther->refToBase.key() == static_cast<unsigned int>(itThing - pThings->begin()));
     //std::cout <<" ref "<<itOther->ref.get()->a<<" thing "<<itThing->a<<std::endl;
-    if(itOther->refToBase.get()->a != itThing->a) {
-      std::cout <<" *PROBLEM: refToBase "<<itOther->refToBase.get()->a<<"!= thing "<<itThing->a<<std::endl;
+    if (itOther->refToBase.get()->a != itThing->a) {
+      std::cout << " *PROBLEM: refToBase " << itOther->refToBase.get()->a << "!= thing " << itThing->a << std::endl;
     }
-    CPPUNIT_ASSERT( itOther->refToBase.get()->a == itThing->a);
+    CPPUNIT_ASSERT(itOther->refToBase.get()->a == itThing->a);
 
     CPPUNIT_ASSERT(itOther->ptr.key() == static_cast<unsigned int>(itThing - pThings->begin()));
     //std::cout <<" ref "<<itOther->ref.get()->a<<" thing "<<itThing->a<<std::endl;
-    if(itOther->ptr.get()->a != itThing->a) {
-      std::cout <<" *PROBLEM: ptr "<<itOther->ptr.get()->a<<"!= thing "<<itThing->a<<std::endl;
+    if (itOther->ptr.get()->a != itThing->a) {
+      std::cout << " *PROBLEM: ptr " << itOther->ptr.get()->a << "!= thing " << itThing->a << std::endl;
     }
-    CPPUNIT_ASSERT( itOther->ptr.get()->a == itThing->a);
+    CPPUNIT_ASSERT(itOther->ptr.get()->a == itThing->a);
 
-    if(itView->a != itThing->a) {
-      std::cout <<" *PROBLEM: RefToBaseProd "<<itView->a<<"!= thing "<<itThing->a<<std::endl;
+    if (itView->a != itThing->a) {
+      std::cout << " *PROBLEM: RefToBaseProd " << itView->a << "!= thing " << itThing->a << std::endl;
     }
-    CPPUNIT_ASSERT( itView->a == itThing->a);
+    CPPUNIT_ASSERT(itView->a == itThing->a);
   }
 }
 
 static void testTree(TTree* events) {
-  CPPUNIT_ASSERT(events !=0);
-  
+  CPPUNIT_ASSERT(events != 0);
+
   /*
    edmtest::OtherThingCollection* pOthers = nullptr;
    TBranch* otherBranch = events->GetBranch("edmtestOtherThings_OtherThing_testUserTag_TEST.obj");
    this does NOT work, must get the wrapper
    */
-  edm::Wrapper<edmtest::OtherThingCollection> *pOthers = nullptr;
+  edm::Wrapper<edmtest::OtherThingCollection>* pOthers = nullptr;
   TBranch* otherBranch = events->GetBranch("edmtestOtherThings_OtherThing_testUserTag_TEST.");
-  
+
   CPPUNIT_ASSERT(otherBranch != nullptr);
-  
+
   //edmtest::ThingCollection things;
   edm::Wrapper<edmtest::ThingCollection>* pThings = nullptr;
   //NOTE: the period at the end is needed
   TBranch* thingBranch = events->GetBranch("edmtestThings_Thing__TEST.");
-  CPPUNIT_ASSERT( thingBranch != nullptr);
+  CPPUNIT_ASSERT(thingBranch != nullptr);
 
   int nev = events->GetEntries();
-  for( int ev=0; ev<nev; ++ev) {
-
-    events->GetEntry(ev,0);
+  for (int ev = 0; ev < nev; ++ev) {
+    events->GetEntry(ev, 0);
     otherBranch->SetAddress(&pOthers);
     thingBranch->SetAddress(&pThings);
     thingBranch->GetEntry(ev);
     otherBranch->GetEntry(ev);
-    checkMatch(pOthers->product(),pThings->product());
+    checkMatch(pOthers->product(), pThings->product());
   }
 }
 
-void testRefInROOT::testOneGoodFile()
-{
-   TFile file("good.root");
-   TTree* events = dynamic_cast<TTree*>(file.Get(edm::poolNames::eventTreeName().c_str()));
-   testTree(events);
+void testRefInROOT::testOneGoodFile() {
+  TFile file("good.root");
+  TTree* events = dynamic_cast<TTree*>(file.Get(edm::poolNames::eventTreeName().c_str()));
+  testTree(events);
 }
 
-void testRefInROOT::failOneBadFile()
-{
+void testRefInROOT::failOneBadFile() {
   TFile file("thisFileDoesNotExist.root");
   TTree* events = dynamic_cast<TTree*>(file.Get(edm::poolNames::eventTreeName().c_str()));
-  
+
   testTree(events);
 }
 
-void testRefInROOT::testTwoGoodFiles()
-{
-  std::cout <<"gFile "<<gFile<<std::endl;
+void testRefInROOT::testTwoGoodFiles() {
+  std::cout << "gFile " << gFile << std::endl;
   TFile file("good.root");
-  std::cout <<" file :" << &file<<" gFile: "<<gFile<<std::endl;
-  
+  std::cout << " file :" << &file << " gFile: " << gFile << std::endl;
+
   TTree* events = dynamic_cast<TTree*>(file.Get(edm::poolNames::eventTreeName().c_str()));
-  
+
   testTree(events);
-  std::cout <<"working on second file"<<std::endl;
+  std::cout << "working on second file" << std::endl;
   TFile file2("good2.root");
-  std::cout <<" file2 :"<< &file2<<" gFile: "<<gFile<<std::endl;
+  std::cout << " file2 :" << &file2 << " gFile: " << gFile << std::endl;
   events = dynamic_cast<TTree*>(file2.Get(edm::poolNames::eventTreeName().c_str()));
-  
+
   testTree(events);
 }
 
-
-void testRefInROOT::testGoodChain()
-{
+void testRefInROOT::testGoodChain() {
   TChain eventChain(edm::poolNames::eventTreeName().c_str());
   eventChain.Add("good.root");
   eventChain.Add("good_delta5.root");
 
-  edm::Wrapper<edmtest::OtherThingCollection> *pOthers = nullptr;
+  edm::Wrapper<edmtest::OtherThingCollection>* pOthers = nullptr;
   TBranch* othersBranch = nullptr;
-  eventChain.SetBranchAddress("edmtestOtherThings_OtherThing_testUserTag_TEST.",&pOthers,&othersBranch);
-  
+  eventChain.SetBranchAddress("edmtestOtherThings_OtherThing_testUserTag_TEST.", &pOthers, &othersBranch);
+
   edm::Wrapper<edmtest::ThingCollection>* pThings = nullptr;
   TBranch* thingsBranch = nullptr;
-  eventChain.SetBranchAddress("edmtestThings_Thing__TEST.",&pThings,&thingsBranch);
-  
+  eventChain.SetBranchAddress("edmtestThings_Thing__TEST.", &pThings, &thingsBranch);
+
   int nev = eventChain.GetEntries();
-  for( int ev=0; ev<nev; ++ev) {
-    std::cout <<"event #" <<ev<<std::endl;
+  for (int ev = 0; ev < nev; ++ev) {
+    std::cout << "event #" << ev << std::endl;
     othersBranch->SetAddress(&pOthers);
     thingsBranch->SetAddress(&pThings);
     othersBranch->GetEntry(ev);
     thingsBranch->GetEntry(ev);
-    eventChain.GetEntry(ev,0);
+    eventChain.GetEntry(ev, 0);
     CPPUNIT_ASSERT(pOthers != nullptr);
     CPPUNIT_ASSERT(pThings != nullptr);
-    checkMatch(pOthers->product(),pThings->product());
+    checkMatch(pOthers->product(), pThings->product());
   }
-  
 }
 
-void testRefInROOT::testMissingRef()
-{
-   TFile file("other_only.root");
-   TTree* events = dynamic_cast<TTree*>(file.Get(edm::poolNames::eventTreeName().c_str()));
-   CPPUNIT_ASSERT(events != nullptr);
-   if(events == nullptr) return; // To silence Coverity
-   
-   edm::Wrapper<edmtest::OtherThingCollection> *pOthers = nullptr;
-   TBranch* otherBranch = events->GetBranch("edmtestOtherThings_OtherThing_testUserTag_TEST.");
-   
-   CPPUNIT_ASSERT(otherBranch != nullptr);
-   
-   int nev = events->GetEntries();
-   for( int ev=0; ev<nev; ++ev) {
-      
-      events->GetEntry(ev,0);
-      otherBranch->SetAddress(&pOthers);
-      otherBranch->GetEntry(ev);
-      
-      for(auto const& prod : *pOthers->product()) {
-         CPPUNIT_ASSERT(not prod.ref.isAvailable());
-         CPPUNIT_ASSERT_THROW(prod.ref.get(), cms::Exception);
-      }
-      
-   }   
+void testRefInROOT::testMissingRef() {
+  TFile file("other_only.root");
+  TTree* events = dynamic_cast<TTree*>(file.Get(edm::poolNames::eventTreeName().c_str()));
+  CPPUNIT_ASSERT(events != nullptr);
+  if (events == nullptr)
+    return;  // To silence Coverity
+
+  edm::Wrapper<edmtest::OtherThingCollection>* pOthers = nullptr;
+  TBranch* otherBranch = events->GetBranch("edmtestOtherThings_OtherThing_testUserTag_TEST.");
+
+  CPPUNIT_ASSERT(otherBranch != nullptr);
+
+  int nev = events->GetEntries();
+  for (int ev = 0; ev < nev; ++ev) {
+    events->GetEntry(ev, 0);
+    otherBranch->SetAddress(&pOthers);
+    otherBranch->GetEntry(ev);
+
+    for (auto const& prod : *pOthers->product()) {
+      CPPUNIT_ASSERT(not prod.ref.isAvailable());
+      CPPUNIT_ASSERT_THROW(prod.ref.get(), cms::Exception);
+    }
+  }
 }
 
 /*
@@ -318,26 +303,26 @@ void testRefInROOT::failChainWithMissingFile()
   
 }
 */
-void testRefInROOT::failDidNotCallGetEntryForEvents()
-{
+void testRefInROOT::failDidNotCallGetEntryForEvents() {
   TFile file("good.root");
   TTree* events = dynamic_cast<TTree*>(file.Get(edm::poolNames::eventTreeName().c_str()));
   CPPUNIT_ASSERT(events != nullptr);
-  if(events == nullptr) return; // To silence Coverity
-  
+  if (events == nullptr)
+    return;  // To silence Coverity
+
   /*
    edmtest::OtherThingCollection* pOthers = nullptr;
    TBranch* otherBranch = events->GetBranch("edmtestOtherThings_OtherThing_testUserTag_TEST.obj");
    this does NOT work, must get the wrapper
    */
-  edm::Wrapper<edmtest::OtherThingCollection> *pOthers = nullptr;
+  edm::Wrapper<edmtest::OtherThingCollection>* pOthers = nullptr;
   TBranch* otherBranch = events->GetBranch("edmtestOtherThings_OtherThing_testUserTag_TEST.");
-  
-  CPPUNIT_ASSERT( otherBranch != nullptr);
+
+  CPPUNIT_ASSERT(otherBranch != nullptr);
   otherBranch->SetAddress(&pOthers);
-  
+
   otherBranch->GetEntry(0);
-  
+
   CPPUNIT_ASSERT(pOthers->product() != nullptr);
 
   pOthers->product()->at(0).ref.get();
@@ -347,27 +332,25 @@ void testRefInROOT::testThinning() {
   TFile file("good.root");
   TTree* events = dynamic_cast<TTree*>(file.Get(edm::poolNames::eventTreeName().c_str()));
   CPPUNIT_ASSERT(events != nullptr);
-  if(events == nullptr) return; // To silence Coverity
-  edm::Wrapper<std::vector<edmtest::TrackOfThings> > *pTracks = nullptr;
+  if (events == nullptr)
+    return;  // To silence Coverity
+  edm::Wrapper<std::vector<edmtest::TrackOfThings> >* pTracks = nullptr;
   TBranch* tracksBranchD = events->GetBranch("edmtestTrackOfThingss_trackOfThingsProducerDPlus__TEST.");
   TBranch* tracksBranchG = events->GetBranch("edmtestTrackOfThingss_trackOfThingsProducerG__TEST.");
   TBranch* tracksBranchM = events->GetBranch("edmtestTrackOfThingss_trackOfThingsProducerM__TEST.");
-  CPPUNIT_ASSERT( tracksBranchD != nullptr &&
-                  tracksBranchG != nullptr &&
-                  tracksBranchM != nullptr);
+  CPPUNIT_ASSERT(tracksBranchD != nullptr && tracksBranchG != nullptr && tracksBranchM != nullptr);
 
   std::vector<edmtest::TrackOfThings> const* vTracks = nullptr;
 
   int nev = events->GetEntries();
-  for( int ev=0; ev<nev; ++ev) {
-
+  for (int ev = 0; ev < nev; ++ev) {
     // The values in the tests below have no particular meaning.
     // It is just checking that we read the values known to be
     // be put in by the relevant producer.
 
     int offset = 200 + ev * 100;
 
-    events->GetEntry(ev,0);
+    events->GetEntry(ev, 0);
 
     // In the D branch this tests accessing a value in
     // thinned collection made from a thinned collection
@@ -509,47 +492,40 @@ void testRefInROOT::testThinning() {
 #include <cppunit/TestResultCollector.h>
 #include <cppunit/TestRunner.h>
 #include <cppunit/TextTestProgressListener.h>
-#include <stdexcept>  
+#include <stdexcept>
 
-int 
-main( int argc, char* argv[] )
-{
+int main(int argc, char* argv[]) {
   gArgV = argv[0];
   std::string testPath = (argc > 1) ? std::string(argv[1]) : "";
-  
+
   // Create the event manager and test controller
   CppUnit::TestResult controller;
-  
+
   // Add a listener that colllects test result
   CppUnit::TestResultCollector result;
-  controller.addListener( &result );        
-  
+  controller.addListener(&result);
+
   // Add a listener that print dots as test run.
   CppUnit::TextTestProgressListener progress;
-  controller.addListener( &progress );      
-  
+  controller.addListener(&progress);
+
   // Add the top suite to the test runner
   CppUnit::TestRunner runner;
-  runner.addTest( CppUnit::TestFactoryRegistry::getRegistry().makeTest() );   
-  try
-  {
-    std::cout << "Running "  <<  testPath;
-    runner.run( controller, testPath );
-    
+  runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+  try {
+    std::cout << "Running " << testPath;
+    runner.run(controller, testPath);
+
     std::cerr << std::endl;
-    
+
     // Print test in a compiler compatible format.
-    CppUnit::CompilerOutputter outputter( &result, std::cerr );
-    outputter.write();                      
-  }
-  catch ( std::invalid_argument &e )  // Test path not resolved
+    CppUnit::CompilerOutputter outputter(&result, std::cerr);
+    outputter.write();
+  } catch (std::invalid_argument& e)  // Test path not resolved
   {
-    std::cerr  <<  std::endl  
-    <<  "ERROR: "  <<  e.what()
-    << std::endl;
+    std::cerr << std::endl << "ERROR: " << e.what() << std::endl;
     return 0;
   }
-  
+
   return result.wasSuccessful() ? 0 : 1;
 }
-
diff --git a/FWCore/Framework/bin/cmsRun.cpp b/FWCore/Framework/bin/cmsRun.cpp
index e7c6061bd1002..f9948c544d8a6 100644
--- a/FWCore/Framework/bin/cmsRun.cpp
+++ b/FWCore/Framework/bin/cmsRun.cpp
@@ -47,7 +47,7 @@ static char const* const kJobreportOpt = "jobreport";
 static char const* const kEnableJobreportCommandOpt = "enablejobreport,e";
 static const char* const kEnableJobreportOpt = "enablejobreport";
 static char const* const kJobModeCommandOpt = "mode,m";
-static char const* const kJobModeOpt="mode";
+static char const* const kJobModeOpt = "mode";
 static char const* const kMultiThreadMessageLoggerOpt = "multithreadML,t";
 static char const* const kNumberOfThreadsCommandOpt = "numThreads,n";
 static char const* const kNumberOfThreadsOpt = "numThreads";
@@ -57,48 +57,41 @@ static char const* const kHelpOpt = "help";
 static char const* const kHelpCommandOpt = "help,h";
 static char const* const kStrictOpt = "strict";
 
-constexpr unsigned int kDefaultSizeOfStackForThreadsInKB = 10*1024; //10MB
+constexpr unsigned int kDefaultSizeOfStackForThreadsInKB = 10 * 1024;  //10MB
 // -----------------------------------------------
 namespace {
   class EventProcessorWithSentry {
   public:
     explicit EventProcessorWithSentry() : ep_(nullptr), callEndJob_(false) {}
-    explicit EventProcessorWithSentry(std::unique_ptr<edm::EventProcessor> ep) :
-      ep_(std::move(ep)),
-      callEndJob_(false) {}
+    explicit EventProcessorWithSentry(std::unique_ptr<edm::EventProcessor> ep)
+        : ep_(std::move(ep)), callEndJob_(false) {}
     ~EventProcessorWithSentry() {
-      if(callEndJob_ && ep_.get()) {
+      if (callEndJob_ && ep_.get()) {
         try {
           ep_->endJob();
-        }
-        catch (...) {
-	  edm::LogSystem("MoreExceptions")
-            << "After a fatal primary exception was caught, there was an attempt to run\n"
-            << "endJob methods. Another exception was caught while endJob was running\n"
-            << "and we give up trying to run endJob.";
+        } catch (...) {
+          edm::LogSystem("MoreExceptions")
+              << "After a fatal primary exception was caught, there was an attempt to run\n"
+              << "endJob methods. Another exception was caught while endJob was running\n"
+              << "and we give up trying to run endJob.";
         }
       }
       edm::clearMessageLog();
     }
     EventProcessorWithSentry(EventProcessorWithSentry const&) = delete;
     EventProcessorWithSentry const& operator=(EventProcessorWithSentry const&) = delete;
-    EventProcessorWithSentry(EventProcessorWithSentry&&) = default; // Allow Moving
-    EventProcessorWithSentry& operator=(EventProcessorWithSentry&&) = default; // Allow moving
+    EventProcessorWithSentry(EventProcessorWithSentry&&) = default;             // Allow Moving
+    EventProcessorWithSentry& operator=(EventProcessorWithSentry&&) = default;  // Allow moving
+
+    void on() { callEndJob_ = true; }
+    void off() { callEndJob_ = false; }
+    edm::EventProcessor* operator->() { return ep_.get(); }
 
-    void on() {
-      callEndJob_ = true;
-    }
-    void off() {
-      callEndJob_ = false;
-    }
-    edm::EventProcessor* operator->() {
-      return ep_.get();
-    }
   private:
     std::unique_ptr<edm::EventProcessor> ep_;
     bool callEndJob_;
   };
-  
+
   unsigned int setNThreads(unsigned int iNThreads,
                            unsigned int iStackSize,
                            std::unique_ptr<tbb::task_scheduler_init>& oPtr) {
@@ -112,20 +105,19 @@ namespace {
     iStackSize *= 1024;
 
     oPtr.reset();
-    if(0==iNThreads) {
+    if (0 == iNThreads) {
       //Allow TBB to decide how many threads. This is normally the number of CPUs in the machine.
       iNThreads = tbb::task_scheduler_init::default_num_threads();
     }
-    oPtr = std::make_unique<tbb::task_scheduler_init>(static_cast<int>(iNThreads),iStackSize);
+    oPtr = std::make_unique<tbb::task_scheduler_init>(static_cast<int>(iNThreads), iStackSize);
 
     return iNThreads;
   }
-}
+}  // namespace
 
 int main(int argc, char* argv[]) {
-
   edm::TimingServiceBase::jobStarted();
-  
+
   int returnCode = 0;
   std::string context;
   bool alwaysAddContext = true;
@@ -133,21 +125,22 @@ int main(int argc, char* argv[]) {
   // and python configuration) since the plugin system or message logger may be using TBB.
   //NOTE: with new version of TBB (44_20160316oss) we can only construct 1 tbb::task_scheduler_init per job
   // else we get a crash. So for now we can't have any services use tasks in their constructors.
-  std::unique_ptr<tbb::task_scheduler_init> tsiPtr = std::make_unique<tbb::task_scheduler_init>(edm::s_defaultNumberOfThreads, kDefaultSizeOfStackForThreadsInKB * 1024);
+  std::unique_ptr<tbb::task_scheduler_init> tsiPtr = std::make_unique<tbb::task_scheduler_init>(
+      edm::s_defaultNumberOfThreads, kDefaultSizeOfStackForThreadsInKB * 1024);
   std::shared_ptr<edm::Presence> theMessageServicePresence;
   std::unique_ptr<std::ofstream> jobReportStreamPtr;
   std::shared_ptr<edm::serviceregistry::ServiceWrapper<edm::JobReport> > jobRep;
   EventProcessorWithSentry proc;
 
   try {
-    returnCode = edm::convertException::wrap([&]()->int {
-
-      // NOTE: MacOs X has a lower rlimit for opened file descriptor than Linux (256
-      // in Snow Leopard vs 512 in SLC5). This is a problem for some of the workflows
-      // that open many small root datafiles.  Notice that this is safe to do also
-      // for Linux, but we agreed not to change the behavior there for the moment.
-      // Also the limits imposed by ulimit are not affected and still apply, if
-      // there.
+    returnCode = edm::convertException::wrap([&]() -> int {
+
+    // NOTE: MacOs X has a lower rlimit for opened file descriptor than Linux (256
+    // in Snow Leopard vs 512 in SLC5). This is a problem for some of the workflows
+    // that open many small root datafiles.  Notice that this is safe to do also
+    // for Linux, but we agreed not to change the behavior there for the moment.
+    // Also the limits imposed by ulimit are not affected and still apply, if
+    // there.
 #ifdef __APPLE__
       context = "Setting file descriptor limit";
       struct rlimit limits;
@@ -165,9 +158,8 @@ int main(int argc, char* argv[]) {
       //    the message logger)
       context = "Initializing either multi-threaded or single-threaded message logger";
       bool multiThreadML = false;
-      for(int i = 0; i < argc; ++i) {
-        if((std::strncmp (argv[i], "-t", 20) == 0) ||
-           (std::strncmp (argv[i], "--multithreadML", 20) == 0)) {
+      for (int i = 0; i < argc; ++i) {
+        if ((std::strncmp(argv[i], "-t", 20) == 0) || (std::strncmp(argv[i], "--multithreadML", 20) == 0)) {
           multiThreadML = true;
           break;
         }
@@ -175,13 +167,12 @@ int main(int argc, char* argv[]) {
 
       // Load the message service plug-in
 
-      if(multiThreadML) {
-        theMessageServicePresence = std::shared_ptr<edm::Presence>(edm::PresenceFactory::get()->
-          makePresence("MessageServicePresence").release());
-      }
-      else {
-        theMessageServicePresence = std::shared_ptr<edm::Presence>(edm::PresenceFactory::get()->
-          makePresence("SingleThreadMSPresence").release());
+      if (multiThreadML) {
+        theMessageServicePresence = std::shared_ptr<edm::Presence>(
+            edm::PresenceFactory::get()->makePresence("MessageServicePresence").release());
+      } else {
+        theMessageServicePresence = std::shared_ptr<edm::Presence>(
+            edm::PresenceFactory::get()->makePresence("SingleThreadMSPresence").release());
       }
 
       context = "Processing command line arguments";
@@ -191,22 +182,23 @@ int main(int argc, char* argv[]) {
       descString += "] config_file \nAllowed options";
       boost::program_options::options_description desc(descString);
 
-      desc.add_options()
-        (kHelpCommandOpt, "produce help message")
-        (kParameterSetCommandOpt, boost::program_options::value<std::string>(), "configuration file")
-        (kJobreportCommandOpt, boost::program_options::value<std::string>(),
-                "file name to use for a job report file: default extension is .xml")
-        (kEnableJobreportCommandOpt,
-                "enable job report files (if any) specified in configuration file")
-        (kJobModeCommandOpt, boost::program_options::value<std::string>(),
-                "Job Mode for MessageLogger defaults - default mode is grid")
-	(kNumberOfThreadsCommandOpt,boost::program_options::value<unsigned int>(),
-                "Number of threads to use in job (0 is use all CPUs)")
-	(kSizeOfStackForThreadCommandOpt,boost::program_options::value<unsigned int>(),
-   	        "Size of stack in KB to use for extra threads (0 is use system default size)")
-        (kMultiThreadMessageLoggerOpt,
-                "MessageLogger handles multiple threads - default is single-thread")
-        (kStrictOpt, "strict parsing");
+      desc.add_options()(kHelpCommandOpt, "produce help message")(
+          kParameterSetCommandOpt, boost::program_options::value<std::string>(), "configuration file")(
+          kJobreportCommandOpt,
+          boost::program_options::value<std::string>(),
+          "file name to use for a job report file: default extension is .xml")(
+          kEnableJobreportCommandOpt, "enable job report files (if any) specified in configuration file")(
+          kJobModeCommandOpt,
+          boost::program_options::value<std::string>(),
+          "Job Mode for MessageLogger defaults - default mode is grid")(
+          kNumberOfThreadsCommandOpt,
+          boost::program_options::value<unsigned int>(),
+          "Number of threads to use in job (0 is use all CPUs)")(
+          kSizeOfStackForThreadCommandOpt,
+          boost::program_options::value<unsigned int>(),
+          "Size of stack in KB to use for extra threads (0 is use system default size)")(
+          kMultiThreadMessageLoggerOpt, "MessageLogger handles multiple threads - default is single-thread")(
+          kStrictOpt, "strict parsing");
 
       // anything at the end will be ignored, and sent to python
       boost::program_options::positional_options_description p;
@@ -217,9 +209,10 @@ int main(int argc, char* argv[]) {
       // purposes.  We originally used it when implementing the boost
       // state machine code.
       boost::program_options::options_description hidden("hidden options");
-      hidden.add_options()("fwk", "For use only by Framework Developers")
-        (kPythonOpt, boost::program_options::value< std::vector<std::string> >(),
-         "options at the end to be passed to python");
+      hidden.add_options()("fwk", "For use only by Framework Developers")(
+          kPythonOpt,
+          boost::program_options::value<std::vector<std::string> >(),
+          "options at the end to be passed to python");
 
       boost::program_options::options_description all_options("All Options");
       all_options.add(desc).add(hidden);
@@ -228,23 +221,23 @@ int main(int argc, char* argv[]) {
       try {
         store(boost::program_options::command_line_parser(argc, argv).options(all_options).positional(p).run(), vm);
         notify(vm);
-      }
-      catch (boost::program_options::error const& iException) {
-        edm::LogAbsolute("CommandLineProcessing") << "cmsRun: Error while trying to process command line arguments:\n"
-          << iException.what()
-	  << "\nFor usage and an options list, please do 'cmsRun --help'.";
+      } catch (boost::program_options::error const& iException) {
+        edm::LogAbsolute("CommandLineProcessing")
+            << "cmsRun: Error while trying to process command line arguments:\n"
+            << iException.what() << "\nFor usage and an options list, please do 'cmsRun --help'.";
         return edm::errors::CommandLineProcessing;
       }
 
       if (vm.count(kHelpOpt)) {
         std::cout << desc << std::endl;
-        if (!vm.count(kParameterSetOpt)) edm::HaltMessageLogging();
+        if (!vm.count(kParameterSetOpt))
+          edm::HaltMessageLogging();
         return 0;
       }
-      
+
       if (!vm.count(kParameterSetOpt)) {
         edm::LogAbsolute("ConfigFileNotFound") << "cmsRun: No configuration file given.\n"
-          << "For usage and an options list, please do 'cmsRun --help'.";
+                                               << "For usage and an options list, please do 'cmsRun --help'.";
         edm::HaltMessageLogging();
         return edm::errors::ConfigFileNotFound;
       }
@@ -261,7 +254,7 @@ int main(int argc, char* argv[]) {
       std::string jobReportFile;
       if (vm.count(kJobreportOpt)) {
         jobReportFile = vm[kJobreportOpt].as<std::string>();
-      } else if(vm.count(kEnableJobreportOpt)) {
+      } else if (vm.count(kEnableJobreportOpt)) {
         jobReportFile = "FrameworkJobReport.xml";
       }
       jobReportStreamPtr = jobReportFile.empty() ? nullptr : std::make_unique<std::ofstream>(jobReportFile.c_str());
@@ -270,8 +263,7 @@ int main(int argc, char* argv[]) {
       // is called jobReportStreamPtr is still valid
       auto jobRepPtr = std::make_unique<edm::JobReport>(jobReportStreamPtr.get());
       jobRep.reset(new edm::serviceregistry::ServiceWrapper<edm::JobReport>(std::move(jobRepPtr)));
-      edm::ServiceToken jobReportToken =
-        edm::ServiceRegistry::createContaining(jobRep);
+      edm::ServiceToken jobReportToken = edm::ServiceRegistry::createContaining(jobRep);
 
       context = "Processing the python configuration file named ";
       context += fileName;
@@ -279,12 +271,11 @@ int main(int argc, char* argv[]) {
       try {
         std::unique_ptr<edm::ParameterSet> parameterSet = edm::readConfig(fileName, argc, argv);
         processDesc.reset(new edm::ProcessDesc(std::move(parameterSet)));
-      }
-      catch(cms::Exception& iException) {
+      } catch (cms::Exception& iException) {
         edm::Exception e(edm::errors::ConfigFileReadError, "", iException);
         throw e;
       }
-      
+
       // Determine the number of threads to use, and the per-thread stack size:
       //   - from the command line
       //   - from the "options" ParameterSet, if it exists
@@ -297,7 +288,7 @@ int main(int argc, char* argv[]) {
       context = "Setting up number of threads";
       {
         // default values
-        unsigned int nThreads  = edm::s_defaultNumberOfThreads;
+        unsigned int nThreads = edm::s_defaultNumberOfThreads;
         unsigned int stackSize = kDefaultSizeOfStackForThreadsInKB;
 
         // check the "options" ParameterSet
@@ -350,7 +341,7 @@ int main(int argc, char* argv[]) {
 
       context = "Constructing the EventProcessor";
       EventProcessorWithSentry procTmp(
-        std::make_unique<edm::EventProcessor>(processDesc, jobReportToken, edm::serviceregistry::kTokenOverrides));
+          std::make_unique<edm::EventProcessor>(processDesc, jobReportToken, edm::serviceregistry::kTokenOverrides));
       proc = std::move(procTmp);
 
       alwaysAddContext = false;
@@ -358,7 +349,8 @@ int main(int argc, char* argv[]) {
       proc->beginJob();
 
       alwaysAddContext = false;
-      context = "Calling EventProcessor::runToCompletion (which does almost everything after beginJob and before endJob)";
+      context =
+          "Calling EventProcessor::runToCompletion (which does almost everything after beginJob and before endJob)";
       proc.on();
       auto status = proc->runToCompletion();
       if (status == edm::EventProcessor::epSignal) {
@@ -378,16 +370,14 @@ int main(int argc, char* argv[]) {
     if (!context.empty()) {
       if (alwaysAddContext) {
         ex.addContext(context);
-      }
-      else if (ex.context().empty()) {
+      } else if (ex.context().empty()) {
         ex.addContext(context);
       }
     }
     if (!ex.alreadyPrinted()) {
       if (jobRep.get() != nullptr) {
         edm::printCmsException(ex, &(jobRep->get()), returnCode);
-      }
-      else {
+      } else {
         edm::printCmsException(ex);
       }
     }
diff --git a/FWCore/Framework/bin/cmsRunPython3.cpp b/FWCore/Framework/bin/cmsRunPython3.cpp
index 3b3852daaa9df..2cd239768e1a4 100644
--- a/FWCore/Framework/bin/cmsRunPython3.cpp
+++ b/FWCore/Framework/bin/cmsRunPython3.cpp
@@ -47,7 +47,7 @@ static char const* const kJobreportOpt = "jobreport";
 static char const* const kEnableJobreportCommandOpt = "enablejobreport,e";
 static const char* const kEnableJobreportOpt = "enablejobreport";
 static char const* const kJobModeCommandOpt = "mode,m";
-static char const* const kJobModeOpt="mode";
+static char const* const kJobModeOpt = "mode";
 static char const* const kMultiThreadMessageLoggerOpt = "multithreadML,t";
 static char const* const kNumberOfThreadsCommandOpt = "numThreads,n";
 static char const* const kNumberOfThreadsOpt = "numThreads";
@@ -57,48 +57,41 @@ static char const* const kHelpOpt = "help";
 static char const* const kHelpCommandOpt = "help,h";
 static char const* const kStrictOpt = "strict";
 
-constexpr unsigned int kDefaultSizeOfStackForThreadsInKB = 10*1024; //10MB
+constexpr unsigned int kDefaultSizeOfStackForThreadsInKB = 10 * 1024;  //10MB
 // -----------------------------------------------
 namespace {
   class EventProcessorWithSentry {
   public:
     explicit EventProcessorWithSentry() : ep_(nullptr), callEndJob_(false) {}
-    explicit EventProcessorWithSentry(std::unique_ptr<edm::EventProcessor> ep) :
-      ep_(std::move(ep)),
-      callEndJob_(false) {}
+    explicit EventProcessorWithSentry(std::unique_ptr<edm::EventProcessor> ep)
+        : ep_(std::move(ep)), callEndJob_(false) {}
     ~EventProcessorWithSentry() {
-      if(callEndJob_ && ep_.get()) {
+      if (callEndJob_ && ep_.get()) {
         try {
           ep_->endJob();
-        }
-        catch (...) {
-	  edm::LogSystem("MoreExceptions")
-            << "After a fatal primary exception was caught, there was an attempt to run\n"
-            << "endJob methods. Another exception was caught while endJob was running\n"
-            << "and we give up trying to run endJob.";
+        } catch (...) {
+          edm::LogSystem("MoreExceptions")
+              << "After a fatal primary exception was caught, there was an attempt to run\n"
+              << "endJob methods. Another exception was caught while endJob was running\n"
+              << "and we give up trying to run endJob.";
         }
       }
       edm::clearMessageLog();
     }
     EventProcessorWithSentry(EventProcessorWithSentry const&) = delete;
     EventProcessorWithSentry const& operator=(EventProcessorWithSentry const&) = delete;
-    EventProcessorWithSentry(EventProcessorWithSentry&&) = default; // Allow Moving
-    EventProcessorWithSentry& operator=(EventProcessorWithSentry&&) = default; // Allow moving
+    EventProcessorWithSentry(EventProcessorWithSentry&&) = default;             // Allow Moving
+    EventProcessorWithSentry& operator=(EventProcessorWithSentry&&) = default;  // Allow moving
+
+    void on() { callEndJob_ = true; }
+    void off() { callEndJob_ = false; }
+    edm::EventProcessor* operator->() { return ep_.get(); }
 
-    void on() {
-      callEndJob_ = true;
-    }
-    void off() {
-      callEndJob_ = false;
-    }
-    edm::EventProcessor* operator->() {
-      return ep_.get();
-    }
   private:
     std::unique_ptr<edm::EventProcessor> ep_;
     bool callEndJob_;
   };
-  
+
   unsigned int setNThreads(unsigned int iNThreads,
                            unsigned int iStackSize,
                            std::unique_ptr<tbb::task_scheduler_init>& oPtr) {
@@ -112,20 +105,19 @@ namespace {
     iStackSize *= 1024;
 
     oPtr.reset();
-    if(0==iNThreads) {
+    if (0 == iNThreads) {
       //Allow TBB to decide how many threads. This is normally the number of CPUs in the machine.
       iNThreads = tbb::task_scheduler_init::default_num_threads();
     }
-    oPtr = std::make_unique<tbb::task_scheduler_init>(static_cast<int>(iNThreads),iStackSize);
+    oPtr = std::make_unique<tbb::task_scheduler_init>(static_cast<int>(iNThreads), iStackSize);
 
     return iNThreads;
   }
-}
+}  // namespace
 
 int main(int argc, char* argv[]) {
-
   edm::TimingServiceBase::jobStarted();
-  
+
   int returnCode = 0;
   std::string context;
   bool alwaysAddContext = true;
@@ -133,21 +125,22 @@ int main(int argc, char* argv[]) {
   // and python configuration) since the plugin system or message logger may be using TBB.
   //NOTE: with new version of TBB (44_20160316oss) we can only construct 1 tbb::task_scheduler_init per job
   // else we get a crash. So for now we can't have any services use tasks in their constructors.
-  std::unique_ptr<tbb::task_scheduler_init> tsiPtr = std::make_unique<tbb::task_scheduler_init>(edm::s_defaultNumberOfThreads, kDefaultSizeOfStackForThreadsInKB * 1024);
+  std::unique_ptr<tbb::task_scheduler_init> tsiPtr = std::make_unique<tbb::task_scheduler_init>(
+      edm::s_defaultNumberOfThreads, kDefaultSizeOfStackForThreadsInKB * 1024);
   std::shared_ptr<edm::Presence> theMessageServicePresence;
   std::unique_ptr<std::ofstream> jobReportStreamPtr;
   std::shared_ptr<edm::serviceregistry::ServiceWrapper<edm::JobReport> > jobRep;
   EventProcessorWithSentry proc;
 
   try {
-    returnCode = edm::convertException::wrap([&]()->int {
-
-      // NOTE: MacOs X has a lower rlimit for opened file descriptor than Linux (256
-      // in Snow Leopard vs 512 in SLC5). This is a problem for some of the workflows
-      // that open many small root datafiles.  Notice that this is safe to do also
-      // for Linux, but we agreed not to change the behavior there for the moment.
-      // Also the limits imposed by ulimit are not affected and still apply, if
-      // there.
+    returnCode = edm::convertException::wrap([&]() -> int {
+
+    // NOTE: MacOs X has a lower rlimit for opened file descriptor than Linux (256
+    // in Snow Leopard vs 512 in SLC5). This is a problem for some of the workflows
+    // that open many small root datafiles.  Notice that this is safe to do also
+    // for Linux, but we agreed not to change the behavior there for the moment.
+    // Also the limits imposed by ulimit are not affected and still apply, if
+    // there.
 #ifdef __APPLE__
       context = "Setting file descriptor limit";
       struct rlimit limits;
@@ -165,9 +158,8 @@ int main(int argc, char* argv[]) {
       //    the message logger)
       context = "Initializing either multi-threaded or single-threaded message logger";
       bool multiThreadML = false;
-      for(int i = 0; i < argc; ++i) {
-        if((std::strncmp (argv[i], "-t", 20) == 0) ||
-           (std::strncmp (argv[i], "--multithreadML", 20) == 0)) {
+      for (int i = 0; i < argc; ++i) {
+        if ((std::strncmp(argv[i], "-t", 20) == 0) || (std::strncmp(argv[i], "--multithreadML", 20) == 0)) {
           multiThreadML = true;
           break;
         }
@@ -175,13 +167,12 @@ int main(int argc, char* argv[]) {
 
       // Load the message service plug-in
 
-      if(multiThreadML) {
-        theMessageServicePresence = std::shared_ptr<edm::Presence>(edm::PresenceFactory::get()->
-          makePresence("MessageServicePresence").release());
-      }
-      else {
-        theMessageServicePresence = std::shared_ptr<edm::Presence>(edm::PresenceFactory::get()->
-          makePresence("SingleThreadMSPresence").release());
+      if (multiThreadML) {
+        theMessageServicePresence = std::shared_ptr<edm::Presence>(
+            edm::PresenceFactory::get()->makePresence("MessageServicePresence").release());
+      } else {
+        theMessageServicePresence = std::shared_ptr<edm::Presence>(
+            edm::PresenceFactory::get()->makePresence("SingleThreadMSPresence").release());
       }
 
       context = "Processing command line arguments";
@@ -191,22 +182,23 @@ int main(int argc, char* argv[]) {
       descString += "] config_file \nAllowed options";
       boost::program_options::options_description desc(descString);
 
-      desc.add_options()
-        (kHelpCommandOpt, "produce help message")
-        (kParameterSetCommandOpt, boost::program_options::value<std::string>(), "configuration file")
-        (kJobreportCommandOpt, boost::program_options::value<std::string>(),
-                "file name to use for a job report file: default extension is .xml")
-        (kEnableJobreportCommandOpt,
-                "enable job report files (if any) specified in configuration file")
-        (kJobModeCommandOpt, boost::program_options::value<std::string>(),
-                "Job Mode for MessageLogger defaults - default mode is grid")
-	(kNumberOfThreadsCommandOpt,boost::program_options::value<unsigned int>(),
-                "Number of threads to use in job (0 is use all CPUs)")
-	(kSizeOfStackForThreadCommandOpt,boost::program_options::value<unsigned int>(),
-   	        "Size of stack in KB to use for extra threads (0 is use system default size)")
-        (kMultiThreadMessageLoggerOpt,
-                "MessageLogger handles multiple threads - default is single-thread")
-        (kStrictOpt, "strict parsing");
+      desc.add_options()(kHelpCommandOpt, "produce help message")(
+          kParameterSetCommandOpt, boost::program_options::value<std::string>(), "configuration file")(
+          kJobreportCommandOpt,
+          boost::program_options::value<std::string>(),
+          "file name to use for a job report file: default extension is .xml")(
+          kEnableJobreportCommandOpt, "enable job report files (if any) specified in configuration file")(
+          kJobModeCommandOpt,
+          boost::program_options::value<std::string>(),
+          "Job Mode for MessageLogger defaults - default mode is grid")(
+          kNumberOfThreadsCommandOpt,
+          boost::program_options::value<unsigned int>(),
+          "Number of threads to use in job (0 is use all CPUs)")(
+          kSizeOfStackForThreadCommandOpt,
+          boost::program_options::value<unsigned int>(),
+          "Size of stack in KB to use for extra threads (0 is use system default size)")(
+          kMultiThreadMessageLoggerOpt, "MessageLogger handles multiple threads - default is single-thread")(
+          kStrictOpt, "strict parsing");
 
       // anything at the end will be ignored, and sent to python
       boost::program_options::positional_options_description p;
@@ -217,9 +209,10 @@ int main(int argc, char* argv[]) {
       // purposes.  We originally used it when implementing the boost
       // state machine code.
       boost::program_options::options_description hidden("hidden options");
-      hidden.add_options()("fwk", "For use only by Framework Developers")
-        (kPythonOpt, boost::program_options::value< std::vector<std::string> >(),
-         "options at the end to be passed to python");
+      hidden.add_options()("fwk", "For use only by Framework Developers")(
+          kPythonOpt,
+          boost::program_options::value<std::vector<std::string> >(),
+          "options at the end to be passed to python");
 
       boost::program_options::options_description all_options("All Options");
       all_options.add(desc).add(hidden);
@@ -228,23 +221,23 @@ int main(int argc, char* argv[]) {
       try {
         store(boost::program_options::command_line_parser(argc, argv).options(all_options).positional(p).run(), vm);
         notify(vm);
-      }
-      catch (boost::program_options::error const& iException) {
-        edm::LogAbsolute("CommandLineProcessing") << "cmsRun: Error while trying to process command line arguments:\n"
-          << iException.what()
-	  << "\nFor usage and an options list, please do 'cmsRun --help'.";
+      } catch (boost::program_options::error const& iException) {
+        edm::LogAbsolute("CommandLineProcessing")
+            << "cmsRun: Error while trying to process command line arguments:\n"
+            << iException.what() << "\nFor usage and an options list, please do 'cmsRun --help'.";
         return edm::errors::CommandLineProcessing;
       }
 
       if (vm.count(kHelpOpt)) {
         std::cout << desc << std::endl;
-        if (!vm.count(kParameterSetOpt)) edm::HaltMessageLogging();
+        if (!vm.count(kParameterSetOpt))
+          edm::HaltMessageLogging();
         return 0;
       }
-      
+
       if (!vm.count(kParameterSetOpt)) {
         edm::LogAbsolute("ConfigFileNotFound") << "cmsRun: No configuration file given.\n"
-          << "For usage and an options list, please do 'cmsRun --help'.";
+                                               << "For usage and an options list, please do 'cmsRun --help'.";
         edm::HaltMessageLogging();
         return edm::errors::ConfigFileNotFound;
       }
@@ -261,7 +254,7 @@ int main(int argc, char* argv[]) {
       std::string jobReportFile;
       if (vm.count(kJobreportOpt)) {
         jobReportFile = vm[kJobreportOpt].as<std::string>();
-      } else if(vm.count(kEnableJobreportOpt)) {
+      } else if (vm.count(kEnableJobreportOpt)) {
         jobReportFile = "FrameworkJobReport.xml";
       }
       jobReportStreamPtr = jobReportFile.empty() ? nullptr : std::make_unique<std::ofstream>(jobReportFile.c_str());
@@ -270,8 +263,7 @@ int main(int argc, char* argv[]) {
       // is called jobReportStreamPtr is still valid
       auto jobRepPtr = std::make_unique<edm::JobReport>(jobReportStreamPtr.get());
       jobRep.reset(new edm::serviceregistry::ServiceWrapper<edm::JobReport>(std::move(jobRepPtr)));
-      edm::ServiceToken jobReportToken =
-        edm::ServiceRegistry::createContaining(jobRep);
+      edm::ServiceToken jobReportToken = edm::ServiceRegistry::createContaining(jobRep);
 
       context = "Processing the python configuration file named ";
       context += fileName;
@@ -279,12 +271,11 @@ int main(int argc, char* argv[]) {
       try {
         std::unique_ptr<edm::ParameterSet> parameterSet = edm::cmspybind11_p3::readConfig(fileName, argc, argv);
         processDesc.reset(new edm::ProcessDesc(std::move(parameterSet)));
-      }
-      catch(cms::Exception& iException) {
+      } catch (cms::Exception& iException) {
         edm::Exception e(edm::errors::ConfigFileReadError, "", iException);
         throw e;
       }
-      
+
       // Determine the number of threads to use, and the per-thread stack size:
       //   - from the command line
       //   - from the "options" ParameterSet, if it exists
@@ -297,7 +288,7 @@ int main(int argc, char* argv[]) {
       context = "Setting up number of threads";
       {
         // default values
-        unsigned int nThreads  = edm::s_defaultNumberOfThreads;
+        unsigned int nThreads = edm::s_defaultNumberOfThreads;
         unsigned int stackSize = kDefaultSizeOfStackForThreadsInKB;
 
         // check the "options" ParameterSet
@@ -350,7 +341,7 @@ int main(int argc, char* argv[]) {
 
       context = "Constructing the EventProcessor";
       EventProcessorWithSentry procTmp(
-        std::make_unique<edm::EventProcessor>(processDesc, jobReportToken, edm::serviceregistry::kTokenOverrides));
+          std::make_unique<edm::EventProcessor>(processDesc, jobReportToken, edm::serviceregistry::kTokenOverrides));
       proc = std::move(procTmp);
 
       alwaysAddContext = false;
@@ -358,7 +349,8 @@ int main(int argc, char* argv[]) {
       proc->beginJob();
 
       alwaysAddContext = false;
-      context = "Calling EventProcessor::runToCompletion (which does almost everything after beginJob and before endJob)";
+      context =
+          "Calling EventProcessor::runToCompletion (which does almost everything after beginJob and before endJob)";
       proc.on();
       auto status = proc->runToCompletion();
       if (status == edm::EventProcessor::epSignal) {
@@ -378,16 +370,14 @@ int main(int argc, char* argv[]) {
     if (!context.empty()) {
       if (alwaysAddContext) {
         ex.addContext(context);
-      }
-      else if (ex.context().empty()) {
+      } else if (ex.context().empty()) {
         ex.addContext(context);
       }
     }
     if (!ex.alreadyPrinted()) {
       if (jobRep.get() != nullptr) {
         edm::printCmsException(ex, &(jobRep->get()), returnCode);
-      }
-      else {
+      } else {
         edm::printCmsException(ex);
       }
     }
diff --git a/FWCore/Framework/interface/Callback.h b/FWCore/Framework/interface/Callback.h
index 5cd6020044dcc..b0ec8b6c4604d 100644
--- a/FWCore/Framework/interface/Callback.h
+++ b/FWCore/Framework/interface/Callback.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     Callback
-// 
+//
 /**\class Callback Callback.h FWCore/Framework/interface/Callback.h
 
  Description: Functional object used as the 'callback' for the CallbackProxy
@@ -24,94 +24,97 @@
 // user include files
 #include "FWCore/Framework/interface/produce_helpers.h"
 #include "FWCore/Utilities/interface/propagate_const.h"
+#include "FWCore/Utilities/interface/ESIndices.h"
 
 // forward declarations
 namespace edm {
-   namespace eventsetup {
-      
-      //need a virtual distructor since owner of callback only knows
-      // about the base class.  Other users of callback know the specific
-      // type
-      struct CallbackBase { virtual ~CallbackBase() {} };
-      
-      // The default decorator that does nothing
-      template< typename TRecord>
-      struct CallbackSimpleDecorator {
-         void pre(const TRecord&) {}
-         void post(const TRecord&) {}
-      };
-      
-      template<typename T,         //producer's type
-               typename TReturn,   //return type of the producer's method
-               typename TRecord,   //the record passed in as an argument
-               typename TDecorator //allows customization using pre/post calls 
-                             =CallbackSimpleDecorator<TRecord> >
-      class Callback : public CallbackBase {
-       public:
-         using  method_type = TReturn (T ::*)(const TRecord&);
-         
-         Callback(T* iProd, 
-                   method_type iMethod,
-                   const TDecorator& iDec = TDecorator()) :
-            proxyData_{},
-            producer_(iProd), 
+  namespace eventsetup {
+
+    //need a virtual distructor since owner of callback only knows
+    // about the base class.  Other users of callback know the specific
+    // type
+    struct CallbackBase {
+      virtual ~CallbackBase() {}
+    };
+
+    // The default decorator that does nothing
+    template <typename TRecord>
+    struct CallbackSimpleDecorator {
+      void pre(const TRecord&) {}
+      void post(const TRecord&) {}
+    };
+
+    template <typename T,          //producer's type
+              typename TReturn,    //return type of the producer's method
+              typename TRecord,    //the record passed in as an argument
+              typename TDecorator  //allows customization using pre/post calls
+              = CallbackSimpleDecorator<TRecord> >
+    class Callback : public CallbackBase {
+    public:
+      using method_type = TReturn (T ::*)(const TRecord&);
+
+      Callback(T* iProd, method_type iMethod, unsigned int iID, const TDecorator& iDec = TDecorator())
+          : proxyData_{},
+            producer_(iProd),
             method_(iMethod),
+            id_(iID),
             wasCalledForThisRecord_(false),
             decorator_(iDec) {}
-         
-         
-         // ---------- const member functions ---------------------
-         
-         // ---------- static member functions --------------------
-         
-         // ---------- member functions ---------------------------
-         
-         
-         void operator()(const TRecord& iRecord) { 
-            if(!wasCalledForThisRecord_) {
-               decorator_.pre(iRecord);
-               storeReturnedValues((producer_->*method_)(iRecord));                  
-               wasCalledForThisRecord_ = true;
-               decorator_.post(iRecord);
-            }
-         }
-         
-         template<class DataT>
-            void holdOntoPointer(DataT* iData) {
-               proxyData_[produce::find_index<TReturn,DataT>::value] = iData;
-            }
-         
-         void storeReturnedValues(TReturn iReturn) {
-            //std::cout <<" storeReturnedValues "<< iReturn <<" " <<iReturn->value_ <<std::endl;
-            using type = typename produce::product_traits<TReturn>::type;
-            setData<typename type::head_type, typename type::tail_type>(iReturn);
-         }
-         
-         template<class RemainingContainerT, class DataT, class ProductsT>
-            void setData(ProductsT& iProducts) {
-               DataT* temp = reinterpret_cast< DataT*>(proxyData_[produce::find_index<TReturn,DataT>::value]) ;
-               if(nullptr != temp) { moveFromTo(iProducts, *temp); }
-               if constexpr( not std::is_same_v<produce::Null,RemainingContainerT> ) {
-                 setData<typename RemainingContainerT::head_type,
-                       typename RemainingContainerT::tail_type>(iProducts);
-               }
-            }
-         void newRecordComing() {
-            wasCalledForThisRecord_ = false;
-         }
-         
-     private:
-         Callback(const Callback&) = delete; // stop default
-         
-         const Callback& operator=(const Callback&) = delete; // stop default
-
-        std::array<void*, produce::size< TReturn >::value> proxyData_;
-         edm::propagate_const<T*> producer_;
-         method_type method_;
-         bool wasCalledForThisRecord_;
-         TDecorator decorator_;
-      };
-   }
-}
+
+      // ---------- const member functions ---------------------
+
+      // ---------- static member functions --------------------
+
+      // ---------- member functions ---------------------------
+
+      void operator()(const TRecord& iRecord) {
+        if (!wasCalledForThisRecord_) {
+          decorator_.pre(iRecord);
+          storeReturnedValues((producer_->*method_)(iRecord));
+          wasCalledForThisRecord_ = true;
+          decorator_.post(iRecord);
+        }
+      }
+
+      template <class DataT>
+      void holdOntoPointer(DataT* iData) {
+        proxyData_[produce::find_index<TReturn, DataT>::value] = iData;
+      }
+
+      void storeReturnedValues(TReturn iReturn) {
+        //std::cout <<" storeReturnedValues "<< iReturn <<" " <<iReturn->value_ <<std::endl;
+        using type = typename produce::product_traits<TReturn>::type;
+        setData<typename type::head_type, typename type::tail_type>(iReturn);
+      }
+
+      template <class RemainingContainerT, class DataT, class ProductsT>
+      void setData(ProductsT& iProducts) {
+        DataT* temp = reinterpret_cast<DataT*>(proxyData_[produce::find_index<TReturn, DataT>::value]);
+        if (nullptr != temp) {
+          moveFromTo(iProducts, *temp);
+        }
+        if constexpr (not std::is_same_v<produce::Null, RemainingContainerT>) {
+          setData<typename RemainingContainerT::head_type, typename RemainingContainerT::tail_type>(iProducts);
+        }
+      }
+      void newRecordComing() { wasCalledForThisRecord_ = false; }
+
+      unsigned int transitionID() const { return id_; }
+      ESProxyIndex const* getTokenIndices() const { return producer_->getTokenIndices(id_); }
+
+    private:
+      Callback(const Callback&) = delete;  // stop default
+
+      const Callback& operator=(const Callback&) = delete;  // stop default
+
+      std::array<void*, produce::size<TReturn>::value> proxyData_;
+      edm::propagate_const<T*> producer_;
+      method_type method_;
+      unsigned int id_;
+      bool wasCalledForThisRecord_;
+      TDecorator decorator_;
+    };
+  }  // namespace eventsetup
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/CallbackProxy.h b/FWCore/Framework/interface/CallbackProxy.h
index 35c641d2ab310..041f57c3df637 100644
--- a/FWCore/Framework/interface/CallbackProxy.h
+++ b/FWCore/Framework/interface/CallbackProxy.h
@@ -33,15 +33,14 @@
 // forward declarations
 namespace edm::eventsetup {
 
-  template<class CallbackT, class RecordT, class DataT>
+  template <class CallbackT, class RecordT, class DataT>
   class CallbackProxy : public DataProxy {
   public:
     using smart_pointer_traits = produce::smart_pointer_traits<DataT>;
     using value_type = typename smart_pointer_traits::type;
     using record_type = RecordT;
 
-    CallbackProxy(std::shared_ptr<CallbackT>& iCallback) :
-      callback_{iCallback} {
+    CallbackProxy(std::shared_ptr<CallbackT>& iCallback) : callback_{iCallback} {
       //The callback fills the data directly.  This is done so that the callback does not have to
       //  hold onto a temporary copy of the result of the callback since the callback is allowed
       //  to return multiple items where only one item is needed by this Proxy
@@ -56,7 +55,7 @@ namespace edm::eventsetup {
     const void* getImpl(const EventSetupRecordImpl& iRecord, const DataKey&) override {
       assert(iRecord.key() == RecordT::keyForClass());
       record_type rec;
-      rec.setImpl(&iRecord);
+      rec.setImpl(&iRecord, callback_->transitionID(), callback_->getTokenIndices());
       (*callback_)(rec);
       return smart_pointer_traits::getPointer(data_);
     }
@@ -75,6 +74,6 @@ namespace edm::eventsetup {
     edm::propagate_const<std::shared_ptr<CallbackT>> callback_;
   };
 
-}
+}  // namespace edm::eventsetup
 
 #endif
diff --git a/FWCore/Framework/interface/CommonParams.h b/FWCore/Framework/interface/CommonParams.h
index 0c7ef9fee1537..9a6689a01568c 100644
--- a/FWCore/Framework/interface/CommonParams.h
+++ b/FWCore/Framework/interface/CommonParams.h
@@ -12,24 +12,15 @@ namespace edm {
   //
 
   struct CommonParams {
-    CommonParams() :
-      maxEventsInput_(),
-      maxLumisInput_(),
-      maxSecondsUntilRampdown_() {
-    }
-
-    CommonParams(int maxEvents,
-                 int maxLumis,
-                 int maxSecondsUntilRampdown) :
-      maxEventsInput_(maxEvents),
-      maxLumisInput_(maxLumis),
-      maxSecondsUntilRampdown_(maxSecondsUntilRampdown) {
-    }
-      
+    CommonParams() : maxEventsInput_(), maxLumisInput_(), maxSecondsUntilRampdown_() {}
+
+    CommonParams(int maxEvents, int maxLumis, int maxSecondsUntilRampdown)
+        : maxEventsInput_(maxEvents), maxLumisInput_(maxLumis), maxSecondsUntilRampdown_(maxSecondsUntilRampdown) {}
+
     int maxEventsInput_;
     int maxLumisInput_;
     int maxSecondsUntilRampdown_;
-  }; // struct CommonParams
-}
+  };  // struct CommonParams
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/ComponentDescription.h b/FWCore/Framework/interface/ComponentDescription.h
index 88693fa852d88..d263a346f6e61 100644
--- a/FWCore/Framework/interface/ComponentDescription.h
+++ b/FWCore/Framework/interface/ComponentDescription.h
@@ -26,44 +26,30 @@
 
 // forward declarations
 namespace edm {
-   namespace eventsetup {
-      struct ComponentDescription {
-         std::string label_; // A human friendly string that uniquely identifies the label
-         std::string type_;  // A human friendly string that uniquely identifies the name
-         bool isSource_;
-         bool isLooper_;
-
-         // ID of parameter set of the creator
-         ParameterSetID pid_;
-
-         /* ----------- end of provenance information ------------- */
-
-         ComponentDescription() :
-             label_(),
-             type_(),
-             isSource_(false),
-             isLooper_(false),
-             pid_() {}
-
-         ComponentDescription(std::string const& iType,
-                              std::string const& iLabel,
-                              bool iIsSource,
-                              bool iIsLooper = false) :
-                                label_(iLabel),
-                                type_(iType),
-                                isSource_(iIsSource),
-                                isLooper_(iIsLooper),
-                                pid_() {}
-
-         bool operator<(ComponentDescription const& iRHS) const {
-            return (type_ == iRHS.type_) ? (label_ < iRHS.label_) : (type_<iRHS.type_);
-         }
-         bool operator==(ComponentDescription const& iRHS) const {
-            return label_ == iRHS.label_ &&
-            type_ == iRHS.type_ &&
-            isSource_ == iRHS.isSource_;
-         }
-      };
-   }
-}
+  namespace eventsetup {
+    struct ComponentDescription {
+      std::string label_;  // A human friendly string that uniquely identifies the label
+      std::string type_;   // A human friendly string that uniquely identifies the name
+      bool isSource_;
+      bool isLooper_;
+
+      // ID of parameter set of the creator
+      ParameterSetID pid_;
+
+      /* ----------- end of provenance information ------------- */
+
+      ComponentDescription() : label_(), type_(), isSource_(false), isLooper_(false), pid_() {}
+
+      ComponentDescription(std::string const& iType, std::string const& iLabel, bool iIsSource, bool iIsLooper = false)
+          : label_(iLabel), type_(iType), isSource_(iIsSource), isLooper_(iIsLooper), pid_() {}
+
+      bool operator<(ComponentDescription const& iRHS) const {
+        return (type_ == iRHS.type_) ? (label_ < iRHS.label_) : (type_ < iRHS.type_);
+      }
+      bool operator==(ComponentDescription const& iRHS) const {
+        return label_ == iRHS.label_ && type_ == iRHS.type_ && isSource_ == iRHS.isSource_;
+      }
+    };
+  }  // namespace eventsetup
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ComponentFactory.h b/FWCore/Framework/interface/ComponentFactory.h
index e86c7c30a1267..a7d501bbf5a8c 100644
--- a/FWCore/Framework/interface/ComponentFactory.h
+++ b/FWCore/Framework/interface/ComponentFactory.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     ComponentFactory
-// 
+//
 /**\class ComponentFactory ComponentFactory.h FWCore/Framework/interface/ComponentFactory.h
 
  Description: Factory for building the Factories for the various 'plug-in' components needed for the EventSetup
@@ -34,100 +34,99 @@
 
 // forward declarations
 namespace edm {
-   namespace eventsetup {
-      class EventSetupProvider;
-      class EventSetupsController;
-      
-template<typename T>
-  class ComponentFactory
-{
-
-   public:
-   ComponentFactory(): makers_() {}
-   //~ComponentFactory();
-
-   typedef  ComponentMakerBase<T> Maker;
-   typedef std::map<std::string, std::shared_ptr<Maker> > MakerMap;
-   typedef typename T::base_type base_type;
+  namespace eventsetup {
+    class EventSetupProvider;
+    class EventSetupsController;
+
+    template <typename T>
+    class ComponentFactory {
+    public:
+      ComponentFactory() : makers_() {}
+      //~ComponentFactory();
+
+      typedef ComponentMakerBase<T> Maker;
+      typedef std::map<std::string, std::shared_ptr<Maker> > MakerMap;
+      typedef typename T::base_type base_type;
       // ---------- const member functions ---------------------
-   std::shared_ptr<base_type> addTo(EventSetupsController& esController,
-                                      EventSetupProvider& iProvider,
-                                      edm::ParameterSet const& iConfiguration,
-                                      bool replaceExisting = false) const
-      {
-         std::string modtype = iConfiguration.template getParameter<std::string>("@module_type");
-         //cerr << "Factory: module_type = " << modtype << endl;
-         typename MakerMap::iterator it = makers_.find(modtype);
-         
-         if(it == makers_.end())
-         {
-            std::shared_ptr<Maker> wm(edmplugin::PluginFactory<ComponentMakerBase<T>* ()>::get()->create(modtype));
-            
-            if(wm.get() == nullptr) {
-	      Exception::throwThis(errors::Configuration,
-	      "UnknownModule",
-	       T::name().c_str(),
-              " of type ",
-              modtype.c_str(),
-              " has not been registered.\n"
-              "Perhaps your module type is misspelled or is not a "
-              "framework plugin.\n"
-              "Try running EdmPluginDump to obtain a list of "
-              "available Plugins.");            
-            }
-            
-            //cerr << "Factory: created the worker" << endl;
-            
-            std::pair<typename MakerMap::iterator,bool> ret =
-               makers_.insert(std::pair<std::string,std::shared_ptr<Maker> >(modtype,wm));
-            
-            if(ret.second == false) {
-	      Exception::throwThis(errors::Configuration,"Maker Factory map insert failed");
-            }
-            
-            it = ret.first;
-         }
-         
-         try {
-           return convertException::wrap([&]() -> std::shared_ptr<base_type> {
-             return it->second->addTo(esController, iProvider, iConfiguration, replaceExisting);
-           });
-         }
-         catch(cms::Exception & iException) {
-           std::string edmtype = iConfiguration.template getParameter<std::string>("@module_edm_type");
-           std::string label = iConfiguration.template getParameter<std::string>("@module_label");
-           std::ostringstream ost;
-           ost << "Constructing " << edmtype << ": class=" << modtype << " label='" << label << "'";
-           iException.addContext(ost.str());
-           throw;
-         }
-         return std::shared_ptr<base_type>();
+      std::shared_ptr<base_type> addTo(EventSetupsController& esController,
+                                       EventSetupProvider& iProvider,
+                                       edm::ParameterSet const& iConfiguration,
+                                       bool replaceExisting = false) const {
+        std::string modtype = iConfiguration.template getParameter<std::string>("@module_type");
+        //cerr << "Factory: module_type = " << modtype << endl;
+        typename MakerMap::iterator it = makers_.find(modtype);
+
+        if (it == makers_.end()) {
+          std::shared_ptr<Maker> wm(edmplugin::PluginFactory<ComponentMakerBase<T>*()>::get()->create(modtype));
+
+          if (wm.get() == nullptr) {
+            Exception::throwThis(errors::Configuration,
+                                 "UnknownModule",
+                                 T::name().c_str(),
+                                 " of type ",
+                                 modtype.c_str(),
+                                 " has not been registered.\n"
+                                 "Perhaps your module type is misspelled or is not a "
+                                 "framework plugin.\n"
+                                 "Try running EdmPluginDump to obtain a list of "
+                                 "available Plugins.");
+          }
+
+          //cerr << "Factory: created the worker" << endl;
+
+          std::pair<typename MakerMap::iterator, bool> ret =
+              makers_.insert(std::pair<std::string, std::shared_ptr<Maker> >(modtype, wm));
+
+          if (ret.second == false) {
+            Exception::throwThis(errors::Configuration, "Maker Factory map insert failed");
+          }
+
+          it = ret.first;
+        }
+
+        try {
+          return convertException::wrap([&]() -> std::shared_ptr<base_type> {
+            return it->second->addTo(esController, iProvider, iConfiguration, replaceExisting);
+          });
+        } catch (cms::Exception& iException) {
+          std::string edmtype = iConfiguration.template getParameter<std::string>("@module_edm_type");
+          std::string label = iConfiguration.template getParameter<std::string>("@module_label");
+          std::ostringstream ost;
+          ost << "Constructing " << edmtype << ": class=" << modtype << " label='" << label << "'";
+          iException.addContext(ost.str());
+          throw;
+        }
+        return std::shared_ptr<base_type>();
       }
-   
+
       // ---------- static member functions --------------------
       static ComponentFactory<T> const* get();
 
       // ---------- member functions ---------------------------
 
-   private:
-      
-      ComponentFactory(const ComponentFactory&); // stop default
+    private:
+      ComponentFactory(const ComponentFactory&);  // stop default
 
-      const ComponentFactory& operator=(const ComponentFactory&); // stop default
+      const ComponentFactory& operator=(const ComponentFactory&);  // stop default
 
       // ---------- member data --------------------------------
       mutable MakerMap makers_;
-};
-
-   }
-}
-#define COMPONENTFACTORY_GET(_type_) \
-EDM_REGISTER_PLUGINFACTORY(edmplugin::PluginFactory<edm::eventsetup::ComponentMakerBase<_type_>* ()>,_type_::name()); \
-static edm::eventsetup::ComponentFactory<_type_> const s_dummyfactory; \
-namespace edm { namespace eventsetup { \
-template<> edm::eventsetup::ComponentFactory<_type_> const* edm::eventsetup::ComponentFactory<_type_>::get() \
-{ return &s_dummyfactory; } \
-  } } \
-typedef int componentfactory_get_needs_semicolon
+    };
+
+  }  // namespace eventsetup
+}  // namespace edm
+#define COMPONENTFACTORY_GET(_type_)                                                                      \
+  EDM_REGISTER_PLUGINFACTORY(edmplugin::PluginFactory<edm::eventsetup::ComponentMakerBase<_type_>*()>,    \
+                             _type_::name());                                                             \
+  static edm::eventsetup::ComponentFactory<_type_> const s_dummyfactory;                                  \
+  namespace edm {                                                                                         \
+    namespace eventsetup {                                                                                \
+      template <>                                                                                         \
+      edm::eventsetup::ComponentFactory<_type_> const* edm::eventsetup::ComponentFactory<_type_>::get() { \
+        return &s_dummyfactory;                                                                           \
+      }                                                                                                   \
+    }                                                                                                     \
+  }                                                                                                       \
+  typedef int componentfactory_get_needs_semicolon
 
 #endif
diff --git a/FWCore/Framework/interface/ComponentMaker.h b/FWCore/Framework/interface/ComponentMaker.h
index c78115b3f4991..ac154b7c441ba 100644
--- a/FWCore/Framework/interface/ComponentMaker.h
+++ b/FWCore/Framework/interface/ComponentMaker.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     ComponentMaker
-// 
+//
 /**\class ComponentMaker ComponentMaker.h FWCore/Framework/interface/ComponentMaker.h
 
  Description: <one line class summary>
@@ -30,51 +30,49 @@
 // forward declarations
 
 namespace edm {
-   namespace eventsetup {
-      class EventSetupProvider;
-      class EventSetupsController;
-      class DataProxyProvider;
-    
-      class ComponentMakerBaseHelper
-      {
-      public:
-        virtual ~ComponentMakerBaseHelper() {}
-      protected:
-        ComponentDescription createComponentDescription(ParameterSet const& iConfiguration) const;
-      };
- 
-      template <class T>
-      class ComponentMakerBase : public ComponentMakerBaseHelper {
-      public:
-         typedef typename T::base_type base_type;
-         virtual std::shared_ptr<base_type> addTo(EventSetupsController& esController,
-                                                  EventSetupProvider& iProvider,
-                                                  ParameterSet const& iConfiguration,
-                                                  bool replaceExisting) const = 0;
-      };
-      
-   template <class T, class TComponent>
-   class ComponentMaker : public ComponentMakerBase<T>
-   {
-
-   public:
-   ComponentMaker() {}
+  namespace eventsetup {
+    class EventSetupProvider;
+    class EventSetupsController;
+    class DataProxyProvider;
+
+    class ComponentMakerBaseHelper {
+    public:
+      virtual ~ComponentMakerBaseHelper() {}
+
+    protected:
+      ComponentDescription createComponentDescription(ParameterSet const& iConfiguration) const;
+    };
+
+    template <class T>
+    class ComponentMakerBase : public ComponentMakerBaseHelper {
+    public:
+      typedef typename T::base_type base_type;
+      virtual std::shared_ptr<base_type> addTo(EventSetupsController& esController,
+                                               EventSetupProvider& iProvider,
+                                               ParameterSet const& iConfiguration,
+                                               bool replaceExisting) const = 0;
+    };
+
+    template <class T, class TComponent>
+    class ComponentMaker : public ComponentMakerBase<T> {
+    public:
+      ComponentMaker() {}
       //virtual ~ComponentMaker();
-   typedef typename T::base_type base_type;
+      typedef typename T::base_type base_type;
 
       // ---------- const member functions ---------------------
-   std::shared_ptr<base_type> addTo(EventSetupsController& esController,
-                                              EventSetupProvider& iProvider,
-                                              ParameterSet const& iConfiguration,
-                                              bool replaceExisting) const override;
-   
+      std::shared_ptr<base_type> addTo(EventSetupsController& esController,
+                                       EventSetupProvider& iProvider,
+                                       ParameterSet const& iConfiguration,
+                                       bool replaceExisting) const override;
+
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------
-   private:
-      ComponentMaker(const ComponentMaker&) = delete; // stop default
+    private:
+      ComponentMaker(const ComponentMaker&) = delete;  // stop default
 
-      const ComponentMaker& operator=(const ComponentMaker&) = delete; // stop default
+      const ComponentMaker& operator=(const ComponentMaker&) = delete;  // stop default
 
       void setDescription(DataProxyProvider* iProv, const ComponentDescription& iDesc) const {
         iProv->setDescription(iDesc);
@@ -87,69 +85,65 @@ namespace edm {
         // the ParameterSet is not sent to the base class we must set the value after construction
         iProv->setAppendToDataLabel(iPSet);
       }
-      void setDescription(void*, const ComponentDescription&) const {
-      }
-      void setDescriptionForFinder(void*, const ComponentDescription&) const {
-      }
-      void setPostConstruction(void*, const edm::ParameterSet&) const {
-      }
+      void setDescription(void*, const ComponentDescription&) const {}
+      void setDescriptionForFinder(void*, const ComponentDescription&) const {}
+      void setPostConstruction(void*, const edm::ParameterSet&) const {}
       // ---------- member data --------------------------------
+    };
+
+    template <class T, class TComponent>
+    std::shared_ptr<typename ComponentMaker<T, TComponent>::base_type> ComponentMaker<T, TComponent>::addTo(
+        EventSetupsController& esController,
+        EventSetupProvider& iProvider,
+        ParameterSet const& iConfiguration,
+        bool replaceExisting) const {
+      // This adds components to the EventSetupProvider for the process. It might
+      // make a new component then add it or reuse a component from an earlier
+      // SubProcess or the top level process and add that.
+
+      if (!replaceExisting) {
+        std::shared_ptr<typename T::base_type> alreadyMadeComponent =
+            T::getComponentAndRegisterProcess(esController, iConfiguration);
+
+        if (alreadyMadeComponent) {
+          // This is for the case when a component is shared between
+          // a SubProcess and a previous SubProcess or the top level process
+          // because the component has an identical configuration to a component
+          // from the top level process or earlier SubProcess.
+          std::shared_ptr<TComponent> component(
+              std::static_pointer_cast<TComponent, typename T::base_type>(alreadyMadeComponent));
+          T::addTo(iProvider, component, iConfiguration, true);
+          return component;
+        }
+      }
 
-};
-
-template< class T, class TComponent>
-std::shared_ptr<typename ComponentMaker<T,TComponent>::base_type>
-ComponentMaker<T,TComponent>::addTo(EventSetupsController& esController,
-                                    EventSetupProvider& iProvider,
-                                    ParameterSet const& iConfiguration,
-                                    bool replaceExisting) const
-{
-   // This adds components to the EventSetupProvider for the process. It might
-   // make a new component then add it or reuse a component from an earlier
-   // SubProcess or the top level process and add that.
-
-   if (!replaceExisting) {
-      std::shared_ptr<typename T::base_type> alreadyMadeComponent = T::getComponentAndRegisterProcess(esController, iConfiguration);
-
-      if (alreadyMadeComponent) {
-         // This is for the case when a component is shared between
-         // a SubProcess and a previous SubProcess or the top level process
-         // because the component has an identical configuration to a component
-         // from the top level process or earlier SubProcess.
-         std::shared_ptr<TComponent> component(std::static_pointer_cast<TComponent, typename T::base_type>(alreadyMadeComponent));
-         T::addTo(iProvider, component, iConfiguration, true);
-         return component;
+      std::shared_ptr<TComponent> component = std::make_shared<TComponent>(iConfiguration);
+      ComponentDescription description = this->createComponentDescription(iConfiguration);
+
+      this->setDescription(component.get(), description);
+      this->setDescriptionForFinder(component.get(), description);
+      this->setPostConstruction(component.get(), iConfiguration);
+
+      if (replaceExisting) {
+        // This case is for ESProducers where in the first pass
+        // the algorithm thought the component could be shared
+        // across SubProcess's because there was an ESProducer
+        // from a previous process with an identical configuration.
+        // But in a later check it was determined that sharing was not
+        // possible because other components associated with the
+        // same record or records that record depends on had
+        // differing configurations.
+        T::replaceExisting(iProvider, component);
+      } else {
+        // This is for the case when a new component is being constructed.
+        // All components for the top level process fall in this category.
+        // Or it could be a SubProcess where neither the top level process
+        // nor any prior SubProcess had a component with exactly the same configuration.
+        T::addTo(iProvider, component, iConfiguration, false);
+        T::putComponent(esController, iConfiguration, component);
       }
-   }
-
-   std::shared_ptr<TComponent> component = std::make_shared<TComponent>(iConfiguration);
-   ComponentDescription description =
-      this->createComponentDescription(iConfiguration);
-
-   this->setDescription(component.get(),description);
-   this->setDescriptionForFinder(component.get(),description);
-   this->setPostConstruction(component.get(),iConfiguration);
-
-   if (replaceExisting) {
-      // This case is for ESProducers where in the first pass
-      // the algorithm thought the component could be shared
-      // across SubProcess's because there was an ESProducer
-      // from a previous process with an identical configuration.
-      // But in a later check it was determined that sharing was not
-      // possible because other components associated with the
-      // same record or records that record depends on had
-      // differing configurations.
-      T::replaceExisting(iProvider, component);
-   } else {
-      // This is for the case when a new component is being constructed.
-      // All components for the top level process fall in this category.
-      // Or it could be a SubProcess where neither the top level process
-      // nor any prior SubProcess had a component with exactly the same configuration.
-      T::addTo(iProvider, component, iConfiguration, false);
-      T::putComponent(esController, iConfiguration, component);
-   }
-   return component;
-}
-   }
-}
+      return component;
+    }
+  }  // namespace eventsetup
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ConstProductRegistry.h b/FWCore/Framework/interface/ConstProductRegistry.h
index 42a31bee75b89..5800d492eb7cd 100644
--- a/FWCore/Framework/interface/ConstProductRegistry.h
+++ b/FWCore/Framework/interface/ConstProductRegistry.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     ConstProductRegistry
-// 
+//
 /**\class ConstProductRegistry ConstProductRegistry.h FWCore/Framework/interface/ConstProductRegistry.h
 
 Description: Provides a 'service' interface to the ProductRegistry
@@ -29,54 +29,47 @@ Description: Provides a 'service' interface to the ProductRegistry
 
 // forward declarations
 namespace edm {
-  class ConstProductRegistry
-  {
-
+  class ConstProductRegistry {
   public:
     typedef ProductRegistry::ProductList ProductList;
-     
-    ConstProductRegistry(SignallingProductRegistry& iReg) : reg_(&iReg) { }
 
-    ConstProductRegistry(ConstProductRegistry const&) = delete; // Disallow copying and moving
-    ConstProductRegistry& operator=(ConstProductRegistry const&) = delete; // Disallow copying and moving
-     
+    ConstProductRegistry(SignallingProductRegistry& iReg) : reg_(&iReg) {}
+
+    ConstProductRegistry(ConstProductRegistry const&) = delete;             // Disallow copying and moving
+    ConstProductRegistry& operator=(ConstProductRegistry const&) = delete;  // Disallow copying and moving
+
     // ---------- const member functions ---------------------
-    ProductRegistry const& productRegistry() const {return *reg_;}
+    ProductRegistry const& productRegistry() const { return *reg_; }
 
-    ProductList const& productList() const {return reg_->productList();}
+    ProductList const& productList() const { return reg_->productList(); }
 
     // Return all the branch names currently known to *this.  This
     // does a return-by-value of the vector so that it may be used in
     // a colon-initialization list.
-    std::vector<std::string> allBranchNames() const {return reg_->allBranchNames();}
+    std::vector<std::string> allBranchNames() const { return reg_->allBranchNames(); }
 
     // Return pointers to (const) BranchDescriptions for all the
     // BranchDescriptions known to *this.  This does a
     // return-by-value of the vector so that it may be used in a
     // colon-initialization list.
-    std::vector<BranchDescription const*> allBranchDescriptions() const {return reg_->allBranchDescriptions();}
-
-    bool anyProductProduced() const {return reg_->anyProductProduced();}
-     
-    template< class T>
-    void watchProductAdditions(const T& iFunc)
-    {
-      serviceregistry::connect_but_block_self(reg_->productAddedSignal_, 
-					      iFunc);
+    std::vector<BranchDescription const*> allBranchDescriptions() const { return reg_->allBranchDescriptions(); }
+
+    bool anyProductProduced() const { return reg_->anyProductProduced(); }
+
+    template <class T>
+    void watchProductAdditions(const T& iFunc) {
+      serviceregistry::connect_but_block_self(reg_->productAddedSignal_, iFunc);
     }
-    template< class T, class TMethod>
-    void watchProductAdditions(T const& iObj, TMethod iMethod)
-    {
+    template <class T, class TMethod>
+    void watchProductAdditions(T const& iObj, TMethod iMethod) {
       using std::placeholders::_1;
-      serviceregistry::connect_but_block_self(reg_->productAddedSignal_, 
-					      std::bind(iMethod, iObj,_1));
+      serviceregistry::connect_but_block_self(reg_->productAddedSignal_, std::bind(iMethod, iObj, _1));
     }
-     
-  private:
 
+  private:
     // ---------- member data --------------------------------
     edm::propagate_const<SignallingProductRegistry*> reg_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/ConsumesCollector.h b/FWCore/Framework/interface/ConsumesCollector.h
index c8023696e8d37..a47cc7b1ae31f 100644
--- a/FWCore/Framework/interface/ConsumesCollector.h
+++ b/FWCore/Framework/interface/ConsumesCollector.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::ConsumesCollector
-// 
+//
 /**\class edm::ConsumesCollector ConsumesCollector.h "FWCore/Framework/interface/ConsumesCollector.h"
 
  Description: Helper class to gather consumes information for EDConsumerBase class.
@@ -35,12 +35,9 @@ a functor passed to the Framework with a call to callWhenNewProductsRegistered.
 // forward declarations
 namespace edm {
   class EDConsumerBase;
-  
-  class ConsumesCollector
-  {
-    
-  public:
 
+  class ConsumesCollector {
+  public:
     ConsumesCollector() = delete;
     ConsumesCollector(ConsumesCollector const&) = default;
     ConsumesCollector(ConsumesCollector&&) = default;
@@ -48,81 +45,67 @@ namespace edm {
     ConsumesCollector& operator=(ConsumesCollector&&) = default;
 
     // ---------- member functions ---------------------------
-    template <typename ProductType, BranchType B=InEvent>
+    template <typename ProductType, BranchType B = InEvent>
     EDGetTokenT<ProductType> consumes(edm::InputTag const& tag) {
-      return m_consumer->consumes<ProductType,B>(tag);
+      return m_consumer->consumes<ProductType, B>(tag);
     }
-    
-    EDGetToken consumes(const TypeToGet& id, edm::InputTag const& tag) {
-      return m_consumer->consumes(id,tag);
-    }
-    
+
+    EDGetToken consumes(const TypeToGet& id, edm::InputTag const& tag) { return m_consumer->consumes(id, tag); }
+
     template <BranchType B>
     EDGetToken consumes(TypeToGet const& id, edm::InputTag const& tag) {
-      return m_consumer->consumes<B>(id,tag);
+      return m_consumer->consumes<B>(id, tag);
     }
-    
-    template <typename ProductType, BranchType B=InEvent>
+
+    template <typename ProductType, BranchType B = InEvent>
     EDGetTokenT<ProductType> mayConsume(edm::InputTag const& tag) {
-      return m_consumer->mayConsume<ProductType,B>(tag);
+      return m_consumer->mayConsume<ProductType, B>(tag);
     }
-    
-    
-    EDGetToken mayConsume(const TypeToGet& id, edm::InputTag const& tag) {
-      return m_consumer->mayConsume(id,tag);
-    }
-    
+
+    EDGetToken mayConsume(const TypeToGet& id, edm::InputTag const& tag) { return m_consumer->mayConsume(id, tag); }
+
     template <BranchType B>
     EDGetToken mayConsume(const TypeToGet& id, edm::InputTag const& tag) {
-      return m_consumer->mayConsume<B>(id,tag);
+      return m_consumer->mayConsume<B>(id, tag);
     }
-    
-    template <typename ProductType, BranchType B=InEvent>
+
+    template <typename ProductType, BranchType B = InEvent>
     void consumesMany() {
-      m_consumer->consumesMany<ProductType,B>();
+      m_consumer->consumesMany<ProductType, B>();
     }
-    
-    
-    void consumesMany(const TypeToGet& id) {
-      m_consumer->consumesMany(id);
-    }
-    
+
+    void consumesMany(const TypeToGet& id) { m_consumer->consumesMany(id); }
+
     template <BranchType B>
     void consumesMany(const TypeToGet& id) {
       m_consumer->consumesMany<B>(id);
     }
-    
+
     // For consuming event-setup products
     template <typename ESProduct, typename ESRecord, Transition Tr = Transition::Event>
-    auto esConsumes()
-    {
+    auto esConsumes() {
       return esConsumes<ESProduct, ESRecord, Tr>(ESInputTag{});
     }
 
     template <typename ESProduct, typename ESRecord, Transition Tr = Transition::Event>
-    auto esConsumes(ESInputTag const& tag)
-    {
+    auto esConsumes(ESInputTag const& tag) {
       return m_consumer->esConsumes<ESProduct, ESRecord, Tr>(tag);
     }
 
     template <typename ESProduct, Transition Tr = Transition::Event>
-    auto esConsumes(eventsetup::EventSetupRecordKey const& key, ESInputTag const& tag)
-    {
+    auto esConsumes(eventsetup::EventSetupRecordKey const& key, ESInputTag const& tag) {
       return m_consumer->esConsumes<ESProduct, Tr>(key, tag);
     }
 
   private:
     //only EDConsumerBase is allowed to make an instance of this class
     friend class EDConsumerBase;
-    
-    ConsumesCollector(EDConsumerBase* iConsumer):
-    m_consumer(iConsumer) {}
+
+    ConsumesCollector(EDConsumerBase* iConsumer) : m_consumer(iConsumer) {}
 
     // ---------- member data --------------------------------
     edm::propagate_const<EDConsumerBase*> m_consumer;
-    
   };
-}
-
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/DataKey.h b/FWCore/Framework/interface/DataKey.h
index 677641b62d868..76771284ddbab 100644
--- a/FWCore/Framework/interface/DataKey.h
+++ b/FWCore/Framework/interface/DataKey.h
@@ -26,37 +26,25 @@
 
 // forward declarations
 namespace edm::eventsetup {
-  class DataKey
-  {
-
+  class DataKey {
     friend void swap(DataKey&, DataKey&);
+
   public:
     enum DoNotCopyMemory { kDoNotCopyMemory };
 
     DataKey();
-    DataKey(const TypeTag& iType,
-            const IdTags& iId) :
-      type_(iType),
-      name_(iId),
-      ownMemory_() {
-      makeCopyOfMemory();
-    }
+    DataKey(const TypeTag& iType, const IdTags& iId) : type_(iType), name_(iId), ownMemory_() { makeCopyOfMemory(); }
 
-    DataKey(const TypeTag& iType,
-            const IdTags& iId,
-            DoNotCopyMemory) :
-      type_(iType),
-      name_(iId),
-      ownMemory_(false) {}
-
-    DataKey(const DataKey& iRHS) :
-      type_(iRHS.type_),
-      name_(iRHS.name_),
-      ownMemory_() {
-      makeCopyOfMemory();
+    DataKey(const TypeTag& iType, const IdTags& iId, DoNotCopyMemory) : type_(iType), name_(iId), ownMemory_(false) {}
+
+    DataKey(const DataKey& iRHS) : type_(iRHS.type_), name_(iRHS.name_), ownMemory_() { makeCopyOfMemory(); }
+
+    DataKey(DataKey&& iRHS) : type_(iRHS.type_), name_(iRHS.name_), ownMemory_(iRHS.ownMemory_) {
+      iRHS.ownMemory_ = false;
     }
 
     DataKey& operator=(const DataKey&);
+    DataKey& operator=(DataKey&&);
 
     ~DataKey() { releaseMemory(); }
 
@@ -65,13 +53,11 @@ namespace edm::eventsetup {
     const NameTag& name() const { return name_; }
 
     bool operator==(const DataKey& iRHS) const;
-    inline bool operator!=(const DataKey& iRHS) const {
-      return not (*this == iRHS);
-    }
+    inline bool operator!=(const DataKey& iRHS) const { return not(*this == iRHS); }
     bool operator<(const DataKey& iRHS) const;
 
     // ---------- static member functions --------------------
-    template<class T>
+    template <class T>
     static TypeTag makeTypeTag() {
       return heterocontainer::HCTypeTag::make<T>();
     }
@@ -81,7 +67,7 @@ namespace edm::eventsetup {
   private:
     void makeCopyOfMemory();
     void releaseMemory() {
-      if(ownMemory_) {
+      if (ownMemory_) {
         deleteMemory();
         ownMemory_ = false;
       }
@@ -96,11 +82,6 @@ namespace edm::eventsetup {
   };
 
   // Free swap function
-  inline
-  void
-  swap(DataKey& a, DataKey& b)
-  {
-    a.swap(b);
-  }
-}
+  inline void swap(DataKey& a, DataKey& b) { a.swap(b); }
+}  // namespace edm::eventsetup
 #endif
diff --git a/FWCore/Framework/interface/DataKeyTags.h b/FWCore/Framework/interface/DataKeyTags.h
index 0e6f36da8e59c..7d0a9de20c6e7 100644
--- a/FWCore/Framework/interface/DataKeyTags.h
+++ b/FWCore/Framework/interface/DataKeyTags.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     DataKeyTags
-// 
+//
 /**\class DataKeyTags DataKeyTags.h FWCore/Framework/interface/DataKeyTags.h
 
  Description: <one line class summary>
@@ -25,30 +25,30 @@
 
 // forward declarations
 namespace edm {
-   namespace eventsetup {
-      
-      typedef heterocontainer::HCTypeTag TypeTag;
-      
-      class SimpleStringTag {
-        public:
-         SimpleStringTag(const char* iString) : tag_(iString) {}
-         SimpleStringTag() : tag_("") {}
-         bool operator==(const SimpleStringTag& iRHS) const ;
-         bool operator<(const SimpleStringTag& iRHS) const ;
-         
-         const char* value() const { return tag_; }
-         
-        private:
-         const char* tag_;
-      };
-
-      class NameTag : public SimpleStringTag {
-       public:
-         NameTag(const char* iUsage) : SimpleStringTag(iUsage) {}
-         NameTag() : SimpleStringTag() {}
-      };
-      
-      typedef NameTag IdTags;
-   }
-}
+  namespace eventsetup {
+
+    typedef heterocontainer::HCTypeTag TypeTag;
+
+    class SimpleStringTag {
+    public:
+      SimpleStringTag(const char* iString) : tag_(iString) {}
+      SimpleStringTag() : tag_("") {}
+      bool operator==(const SimpleStringTag& iRHS) const;
+      bool operator<(const SimpleStringTag& iRHS) const;
+
+      const char* value() const { return tag_; }
+
+    private:
+      const char* tag_;
+    };
+
+    class NameTag : public SimpleStringTag {
+    public:
+      NameTag(const char* iUsage) : SimpleStringTag(iUsage) {}
+      NameTag() : SimpleStringTag() {}
+    };
+
+    typedef NameTag IdTags;
+  }  // namespace eventsetup
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/DataProxy.h b/FWCore/Framework/interface/DataProxy.h
index 74962d0152d16..42dc1ff4a411c 100644
--- a/FWCore/Framework/interface/DataProxy.h
+++ b/FWCore/Framework/interface/DataProxy.h
@@ -27,75 +27,78 @@
 
 // forward declarations
 namespace edm {
-   class ActivityRegistry;
-
-   namespace eventsetup {
-      struct ComponentDescription;
-      class DataKey;
-      class EventSetupRecordImpl;
-
-      class DataProxy {
-
-      public:
-         DataProxy();
-         virtual ~DataProxy();
-
-         // ---------- const member functions ---------------------
-         bool cacheIsValid() const { return cacheIsValid_.load(std::memory_order_acquire); }
-
-         void doGet(EventSetupRecordImpl const& iRecord, DataKey const& iKey, bool iTransiently, ActivityRegistry const*) const;
-         void const* get(EventSetupRecordImpl const&, DataKey const& iKey, bool iTransiently, ActivityRegistry const*) const;
-
-         ///returns the description of the DataProxyProvider which owns this Proxy
-         ComponentDescription const* providerDescription() const {
-            return description_;
-         }
-         // ---------- static member functions --------------------
-
-         // ---------- member functions ---------------------------
-         void invalidate() {
-            clearCacheIsValid();
-            invalidateCache();
-         }
-
-         void resetIfTransient();
-
-         void setProviderDescription(ComponentDescription const* iDesc) {
-            description_ = iDesc;
-         }
-      protected:
-         /**This is the function which does the real work of getting the data if it is not
+  class ActivityRegistry;
+
+  namespace eventsetup {
+    struct ComponentDescription;
+    class DataKey;
+    class EventSetupRecordImpl;
+
+    class DataProxy {
+    public:
+      DataProxy();
+      virtual ~DataProxy();
+
+      // ---------- const member functions ---------------------
+      bool cacheIsValid() const { return cacheIsValid_.load(std::memory_order_acquire); }
+
+      void doGet(EventSetupRecordImpl const& iRecord,
+                 DataKey const& iKey,
+                 bool iTransiently,
+                 ActivityRegistry const*) const;
+      void const* get(EventSetupRecordImpl const&,
+                      DataKey const& iKey,
+                      bool iTransiently,
+                      ActivityRegistry const*) const;
+
+      ///returns the description of the DataProxyProvider which owns this Proxy
+      ComponentDescription const* providerDescription() const { return description_; }
+      // ---------- static member functions --------------------
+
+      // ---------- member functions ---------------------------
+      void invalidate() {
+        clearCacheIsValid();
+        invalidateCache();
+      }
+
+      void resetIfTransient();
+
+      void setProviderDescription(ComponentDescription const* iDesc) { description_ = iDesc; }
+
+    protected:
+      /**This is the function which does the real work of getting the data if it is not
           already cached.  The returning 'void const*' must point to an instance of the class
           type corresponding to the type designated in iKey. So if iKey refers to a base class interface
           the pointer must be a pointer to that base class interface and not a pointer to an inheriting class
           instance.
           */
-         virtual void const* getImpl(EventSetupRecordImpl const&, DataKey const& iKey) =0;
+      virtual void const* getImpl(EventSetupRecordImpl const&, DataKey const& iKey) = 0;
 
-         /** indicates that the Proxy should invalidate any cached information
+      /** indicates that the Proxy should invalidate any cached information
           as that information has 'expired' (i.e. we have moved to a new IOV)
           */
-         virtual void invalidateCache() = 0;
+      virtual void invalidateCache() = 0;
 
-         /** indicates that the Proxy should invalidate any cached information
+      /** indicates that the Proxy should invalidate any cached information
           as that information was accessed transiently and therefore is not
           intended to be kept over the entire IOV.  Default is to call
           invalidateCache().
           */
-         virtual void invalidateTransientCache();
-
-         void clearCacheIsValid();
-      private:
-         DataProxy(DataProxy const&) = delete; // stop default
-
-         DataProxy const& operator=(DataProxy const&) = delete; // stop default
-
-         // ---------- member data --------------------------------
-         CMS_THREAD_SAFE mutable void const* cache_; //protected by a global mutex
-         mutable std::atomic<bool> cacheIsValid_;
-         mutable std::atomic<bool> nonTransientAccessRequested_;
-         ComponentDescription const* description_;
-      };
-   }
-}
+      virtual void invalidateTransientCache();
+
+      void clearCacheIsValid();
+
+    private:
+      DataProxy(DataProxy const&) = delete;  // stop default
+
+      DataProxy const& operator=(DataProxy const&) = delete;  // stop default
+
+      // ---------- member data --------------------------------
+      CMS_THREAD_SAFE mutable void const* cache_;  //protected by a global mutex
+      mutable std::atomic<bool> cacheIsValid_;
+      mutable std::atomic<bool> nonTransientAccessRequested_;
+      ComponentDescription const* description_;
+    };
+  }  // namespace eventsetup
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/DataProxyProvider.h b/FWCore/Framework/interface/DataProxyProvider.h
index 0cd4e02b60298..5be137c142e27 100644
--- a/FWCore/Framework/interface/DataProxyProvider.h
+++ b/FWCore/Framework/interface/DataProxyProvider.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     DataProxyProvider
-// 
+//
 /**\class DataProxyProvider DataProxyProvider.h FWCore/Framework/interface/DataProxyProvider.h
 
  Description: <one line class summary>
@@ -33,93 +33,86 @@
 
 // forward declarations
 namespace edm {
-   class ValidityInterval;
-   class ParameterSet;
-   class ConfigurationDescriptions;
-   namespace eventsetup {
-      class DataProxy;
-      
-      
-class DataProxyProvider
-{
-
-   public:   
-      typedef std::vector< EventSetupRecordKey> Keys;
+  class ValidityInterval;
+  class ParameterSet;
+  class ConfigurationDescriptions;
+  namespace eventsetup {
+    class DataProxy;
+    class ESRecordsToProxyIndices;
+
+    class DataProxyProvider {
+    public:
+      typedef std::vector<EventSetupRecordKey> Keys;
       typedef std::vector<std::pair<DataKey, edm::propagate_const<std::shared_ptr<DataProxy>>>> KeyedProxies;
       typedef std::map<EventSetupRecordKey, KeyedProxies> RecordProxies;
-      
+
       DataProxyProvider();
       virtual ~DataProxyProvider() noexcept(false);
 
       // ---------- const member functions ---------------------
       bool isUsingRecord(const EventSetupRecordKey&) const;
-      
+
       std::set<EventSetupRecordKey> usingRecords() const;
-      
-      const KeyedProxies& keyedProxies(const EventSetupRecordKey& iRecordKey) const ;
-      
-      const ComponentDescription& description() const { return description_;}
+
+      const KeyedProxies& keyedProxies(const EventSetupRecordKey& iRecordKey) const;
+
+      const ComponentDescription& description() const { return description_; }
       // ---------- static member functions --------------------
       /**Used to add parameters available to all inheriting classes
       */
       static void prevalidate(ConfigurationDescriptions&);
 
       // ---------- member functions ---------------------------
-      
+
+      virtual void updateLookup(ESRecordsToProxyIndices const&);
+
       ///called when a new interval of validity occurs for iRecordType
-      virtual void newInterval(const EventSetupRecordKey& iRecordType,
-                                const ValidityInterval& iInterval) = 0;
-      
-      void setDescription(const ComponentDescription& iDescription) {
-         description_ = iDescription;
-      }
-      
+      virtual void newInterval(const EventSetupRecordKey& iRecordType, const ValidityInterval& iInterval) = 0;
+
+      void setDescription(const ComponentDescription& iDescription) { description_ = iDescription; }
+
       /**This method is only to be called by the framework, it sets the string
         which will be appended to the labels of all data products being produced
       **/
       void setAppendToDataLabel(const edm::ParameterSet&);
-      
+
       void resetProxies(const EventSetupRecordKey& iRecordType);
       void resetProxiesIfTransient(const EventSetupRecordKey& iRecordType);
 
-   protected:
-      template< class T>
+    protected:
+      template <class T>
       void usingRecord() {
-         usingRecordWithKey(EventSetupRecordKey::makeKey<T>());
+        usingRecordWithKey(EventSetupRecordKey::makeKey<T>());
       }
-      
+
       void usingRecordWithKey(const EventSetupRecordKey&);
 
-      void invalidateProxies(const EventSetupRecordKey& iRecordKey) ;
+      void invalidateProxies(const EventSetupRecordKey& iRecordKey);
+
+      virtual void registerProxies(const EventSetupRecordKey& iRecordKey, KeyedProxies& aProxyList) = 0;
 
-      virtual void registerProxies(const EventSetupRecordKey& iRecordKey ,
-                                    KeyedProxies& aProxyList) = 0 ;
-      
       ///deletes all the Proxies in aStream
-      void eraseAll(const EventSetupRecordKey& iRecordKey) ;
+      void eraseAll(const EventSetupRecordKey& iRecordKey);
 
-   private:
-      DataProxyProvider(const DataProxyProvider&); // stop default
+    private:
+      DataProxyProvider(const DataProxyProvider&);  // stop default
 
-      const DataProxyProvider& operator=(const DataProxyProvider&); // stop default
+      const DataProxyProvider& operator=(const DataProxyProvider&);  // stop default
 
       // ---------- member data --------------------------------
       RecordProxies recordProxies_;
       ComponentDescription description_;
       std::string appendToDataLabel_;
-};
-
-template<class ProxyT>
-inline void insertProxy(DataProxyProvider::KeyedProxies& iList,
-                        std::shared_ptr<ProxyT> iProxy,
-                        const char* iName="") {
-   iList.push_back(DataProxyProvider::KeyedProxies::value_type(
-                                             DataKey(DataKey::makeTypeTag<typename ProxyT::value_type>(),
-                                                     iName),
-                                             iProxy));
-   
-}
-
-   }
-}
+    };
+
+    template <class ProxyT>
+    inline void insertProxy(DataProxyProvider::KeyedProxies& iList,
+                            std::shared_ptr<ProxyT> iProxy,
+                            const char* iName = "") {
+      iList.push_back(DataProxyProvider::KeyedProxies::value_type(
+          DataKey(DataKey::makeTypeTag<typename ProxyT::value_type>(), iName), iProxy));
+    }
+
+  }  // namespace eventsetup
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/DataProxyTemplate.h b/FWCore/Framework/interface/DataProxyTemplate.h
index bd5b80eca09b5..8d3fd6a9ce621 100644
--- a/FWCore/Framework/interface/DataProxyTemplate.h
+++ b/FWCore/Framework/interface/DataProxyTemplate.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     DataProxyTemplate
-// 
+//
 /**\class DataProxyTemplate DataProxyTemplate.h FWCore/Framework/interface/DataProxyTemplate.h
 
  Description: A DataProxy base class which allows one to write type-safe proxies
@@ -24,20 +24,19 @@
 #include "FWCore/Framework/interface/DataProxy.h"
 #include "FWCore/Framework/interface/EventSetupRecord.h"
 #include <cassert>
+#include <limits>
 
 // forward declarations
 
 namespace edm {
-   namespace eventsetup {
-template<class RecordT, class DataT>
-class DataProxyTemplate : public DataProxy
-{
-
-   public:
+  namespace eventsetup {
+    template <class RecordT, class DataT>
+    class DataProxyTemplate : public DataProxy {
+    public:
       typedef DataT value_type;
       typedef RecordT record_type;
-   
-      DataProxyTemplate(){}
+
+      DataProxyTemplate() {}
       //virtual ~DataProxyTemplate();
 
       // ---------- const member functions ---------------------
@@ -45,25 +44,24 @@ class DataProxyTemplate : public DataProxy
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------
-      const void* getImpl(const EventSetupRecordImpl& iRecord,
-                                  const DataKey& iKey) override {
-         assert(iRecord.key() == RecordT::keyForClass());
-         RecordT rec;
-         rec.setImpl(&iRecord);
-         return this->make(rec, iKey);
+      const void* getImpl(const EventSetupRecordImpl& iRecord, const DataKey& iKey) override {
+        assert(iRecord.key() == RecordT::keyForClass());
+        RecordT rec;
+        rec.setImpl(&iRecord, std::numeric_limits<unsigned int>::max(), nullptr);
+        return this->make(rec, iKey);
       }
-      
-   protected:
+
+    protected:
       virtual const DataT* make(const RecordT&, const DataKey&) = 0;
-      
-   private:
-      DataProxyTemplate(const DataProxyTemplate&) = delete; // stop default
 
-      const DataProxyTemplate& operator=(const DataProxyTemplate&) = delete; // stop default
+    private:
+      DataProxyTemplate(const DataProxyTemplate&) = delete;  // stop default
+
+      const DataProxyTemplate& operator=(const DataProxyTemplate&) = delete;  // stop default
 
       // ---------- member data --------------------------------
-};
+    };
 
-   }
-}
+  }  // namespace eventsetup
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/DelayedReader.h b/FWCore/Framework/interface/DelayedReader.h
index b2bb03e70bb61..19d2964e61796 100644
--- a/FWCore/Framework/interface/DelayedReader.h
+++ b/FWCore/Framework/interface/DelayedReader.h
@@ -22,7 +22,8 @@ namespace edm {
   class StreamContext;
 
   namespace signalslot {
-    template <typename T> class Signal;
+    template <typename T>
+    class Signal;
   }
 
   class DelayedReader {
@@ -32,25 +33,22 @@ namespace edm {
                                             EDProductGetter const* ep,
                                             ModuleCallingContext const* mcc = nullptr);
 
-    void mergeReaders(DelayedReader* other) {mergeReaders_(other);}
-    void reset() {reset_();}
-    
-    std::pair<SharedResourcesAcquirer*, std::recursive_mutex*> sharedResources() const {
-      return sharedResources_();
-    }
-    
+    void mergeReaders(DelayedReader* other) { mergeReaders_(other); }
+    void reset() { reset_(); }
 
-    virtual signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* preEventReadFromSourceSignal() const = 0;
-    virtual signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* postEventReadFromSourceSignal() const = 0;
+    std::pair<SharedResourcesAcquirer*, std::recursive_mutex*> sharedResources() const { return sharedResources_(); }
+
+    virtual signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const*
+    preEventReadFromSourceSignal() const = 0;
+    virtual signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const*
+    postEventReadFromSourceSignal() const = 0;
 
-    
   private:
     virtual std::unique_ptr<WrapperBase> getProduct_(BranchID const& k, EDProductGetter const* ep) = 0;
     virtual void mergeReaders_(DelayedReader*) = 0;
     virtual void reset_() = 0;
     virtual std::pair<SharedResourcesAcquirer*, std::recursive_mutex*> sharedResources_() const;
-
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/DependentRecordImplementation.h b/FWCore/Framework/interface/DependentRecordImplementation.h
index 34761bbb91a2f..2401f51a6e9bc 100644
--- a/FWCore/Framework/interface/DependentRecordImplementation.h
+++ b/FWCore/Framework/interface/DependentRecordImplementation.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     DependentRecordImplementation
-// 
+//
 /**\class DependentRecordImplementation DependentRecordImplementation.h FWCore/Framework/interface/DependentRecordImplementation.h
 
  Description: <one line class summary>
@@ -27,6 +27,7 @@
 // user include files
 #include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
 #include "FWCore/Framework/interface/EventSetupImpl.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/NoRecordException.h"
 #include "FWCore/Framework/interface/DependentRecordTag.h"
 
@@ -36,56 +37,100 @@
 
 // forward declarations
 namespace edm {
-namespace eventsetup {
-   
-template< class RecordT, class ListT>
-class DependentRecordImplementation : public EventSetupRecordImplementation<RecordT>, public DependentRecordTag
-{
+  namespace eventsetup {
 
-   public:
+    template <class RecordT, class ListT>
+    class DependentRecordImplementation : public EventSetupRecordImplementation<RecordT>, public DependentRecordTag {
+    public:
       DependentRecordImplementation() {}
       typedef ListT list_type;
       //virtual ~DependentRecordImplementation();
-      
+
       // ---------- const member functions ---------------------
-      template<class DepRecordT>
+      template <class DepRecordT>
       const DepRecordT getRecord() const {
         //Make sure that DepRecordT is a type in ListT
-        typedef typename boost::mpl::end< ListT >::type EndItrT;
-        typedef typename boost::mpl::find< ListT, DepRecordT>::type FoundItrT;
-        static_assert(! std::is_same<FoundItrT, EndItrT>::value, "Trying to get a Record from another Record where the second Record is not dependent on the first Record.");
+        typedef typename boost::mpl::end<ListT>::type EndItrT;
+        typedef typename boost::mpl::find<ListT, DepRecordT>::type FoundItrT;
+        static_assert(
+            !std::is_same<FoundItrT, EndItrT>::value,
+            "Trying to get a Record from another Record where the second Record is not dependent on the first Record.");
         try {
-          EventSetupImpl const& eventSetupT = this->eventSetup();
+          EventSetup const eventSetupT{this->eventSetup(), this->transitionID(), this->getTokenIndices()};
           return eventSetupT.get<DepRecordT>();
-        } catch(cms::Exception& e) {
+        } catch (cms::Exception& e) {
           std::ostringstream sstrm;
-          sstrm <<"While getting dependent Record from Record "<<this->key().type().name();
+          sstrm << "While getting dependent Record from Record " << this->key().type().name();
           e.addContext(sstrm.str());
           throw;
         }
       }
 
-      template<class DepRecordT>
+      template <class DepRecordT>
       std::optional<DepRecordT> tryToGetRecord() const {
         //Make sure that DepRecordT is a type in ListT
-        typedef typename boost::mpl::end< ListT >::type EndItrT;
-        typedef typename boost::mpl::find< ListT, DepRecordT>::type FoundItrT;
-        static_assert(! std::is_same<FoundItrT, EndItrT>::value, "Trying to get a Record from another Record where the second Record is not dependent on the first Record.");
-        EventSetupImpl const& eventSetupT = this->eventSetup();
+        typedef typename boost::mpl::end<ListT>::type EndItrT;
+        typedef typename boost::mpl::find<ListT, DepRecordT>::type FoundItrT;
+        static_assert(
+            !std::is_same<FoundItrT, EndItrT>::value,
+            "Trying to get a Record from another Record where the second Record is not dependent on the first Record.");
+        EventSetup const eventSetupT{this->eventSetup(), this->transitionID(), this->getTokenIndices()};
         return eventSetupT.tryToGet<DepRecordT>();
       }
 
+      using EventSetupRecordImplementation<RecordT>::getHandle;
+
+      template <typename ProductT, typename DepRecordT>
+      ESHandle<ProductT> getHandle(ESGetToken<ProductT, DepRecordT> const& iToken) const {
+        //Make sure that DepRecordT is a type in ListT
+        using EndItrT = typename boost::mpl::end<ListT>::type;
+        using FoundItrT = typename boost::mpl::find<ListT, DepRecordT>::type;
+        static_assert(!std::is_same<FoundItrT, EndItrT>::value,
+                      "Trying to get a product with an ESGetToken specifying a Record from another Record where the "
+                      "second Record is not dependent on the first Record.");
+        return getRecord<DepRecordT>().getHandle(iToken);
+      }
+
+      using EventSetupRecordImplementation<RecordT>::getTransientHandle;
+
+      template <typename ProductT, typename DepRecordT>
+      ESTransientHandle<ProductT> getTransientHandle(ESGetToken<ProductT, DepRecordT> const& iToken) const {
+        //Make sure that DepRecordT is a type in ListT
+        using EndItrT = typename boost::mpl::end<ListT>::type;
+        using FoundItrT = typename boost::mpl::find<ListT, DepRecordT>::type;
+        static_assert(!std::is_same<FoundItrT, EndItrT>::value,
+                      "Trying to get a product with an ESGetToken specifying a Record from another Record where the "
+                      "second Record is not dependent on the first Record.");
+        return getRecord<DepRecordT>().getTransientHandle(iToken);
+      }
+
+      using EventSetupRecordImplementation<RecordT>::get;
+
+      template <typename ProductT, typename DepRecordT>
+      ProductT const& get(ESGetToken<ProductT, DepRecordT> const& iToken) const {
+        //Make sure that DepRecordT is a type in ListT
+        using EndItrT = typename boost::mpl::end<ListT>::type;
+        using FoundItrT = typename boost::mpl::find<ListT, DepRecordT>::type;
+        static_assert(!std::is_same<FoundItrT, EndItrT>::value,
+                      "Trying to get a product with an ESGetToken specifying a Record from another Record where the "
+                      "second Record is not dependent on the first Record.");
+        return getRecord<DepRecordT>().get(iToken);
+      }
+
+      template <typename ProductT, typename DepRecordT>
+      ProductT const& get(ESGetToken<ProductT, DepRecordT>& iToken) const {
+        return get(const_cast<ESGetToken<ProductT, DepRecordT> const&>(iToken));
+      }
+
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------
 
-   private:
-
+    private:
       // ---------- member data --------------------------------
+    };
 
-};
-
-  }
-}
+  }  // namespace eventsetup
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/DependentRecordIntervalFinder.h b/FWCore/Framework/interface/DependentRecordIntervalFinder.h
index 03f6c00c143d8..04090d47abdf4 100644
--- a/FWCore/Framework/interface/DependentRecordIntervalFinder.h
+++ b/FWCore/Framework/interface/DependentRecordIntervalFinder.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     DependentRecordIntervalFinder
-// 
+//
 /**\class DependentRecordIntervalFinder DependentRecordIntervalFinder.h FWCore/Framework/interface/DependentRecordIntervalFinder.h
 
  Description: Finds the intersection of the ValidityInterval for several Providers
@@ -30,45 +30,40 @@
 
 // forward declarations
 namespace edm {
-   namespace eventsetup {
-      class EventSetupRecordProvider;
-      
-class DependentRecordIntervalFinder : public EventSetupRecordIntervalFinder
-{
+  namespace eventsetup {
+    class EventSetupRecordProvider;
 
-   public:
+    class DependentRecordIntervalFinder : public EventSetupRecordIntervalFinder {
+    public:
       DependentRecordIntervalFinder(const EventSetupRecordKey&);
       ~DependentRecordIntervalFinder() override;
 
       // ---------- const member functions ---------------------
-      bool haveProviders() const {
-        return !providers_.empty();
-      }
+      bool haveProviders() const { return !providers_.empty(); }
 
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------
       void addProviderWeAreDependentOn(std::shared_ptr<EventSetupRecordProvider>);
-      
+
       void setAlternateFinder(std::shared_ptr<EventSetupRecordIntervalFinder>);
-   protected:
-      void setIntervalFor(const EventSetupRecordKey&,
-                                   const IOVSyncValue& , 
-                                   ValidityInterval&) override;
-      
-   private:
-      DependentRecordIntervalFinder(const DependentRecordIntervalFinder&) = delete; // stop default
 
-      const DependentRecordIntervalFinder& operator=(const DependentRecordIntervalFinder&) = delete; // stop default
+    protected:
+      void setIntervalFor(const EventSetupRecordKey&, const IOVSyncValue&, ValidityInterval&) override;
+
+    private:
+      DependentRecordIntervalFinder(const DependentRecordIntervalFinder&) = delete;  // stop default
+
+      const DependentRecordIntervalFinder& operator=(const DependentRecordIntervalFinder&) = delete;  // stop default
 
       // ---------- member data --------------------------------
       typedef std::vector<edm::propagate_const<std::shared_ptr<EventSetupRecordProvider>>> Providers;
       Providers providers_;
-      
+
       edm::propagate_const<std::shared_ptr<EventSetupRecordIntervalFinder>> alternate_;
       std::vector<ValidityInterval> previousIOVs_;
-};
+    };
 
-   }
-}
+  }  // namespace eventsetup
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/DependentRecordTag.h b/FWCore/Framework/interface/DependentRecordTag.h
index 76f5039cb7700..d2128d9107939 100644
--- a/FWCore/Framework/interface/DependentRecordTag.h
+++ b/FWCore/Framework/interface/DependentRecordTag.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     DependentRecordTag
-// 
+//
 /**\class DependentRecordTag DependentRecordTag.h FWCore/Framework/interface/DependentRecordTag.h
 
  Description: Identifies a Record as being dependent upon other Records
@@ -24,9 +24,9 @@
 
 // forward declarations
 namespace edm {
-namespace eventsetup {
-   struct DependentRecordTag {};
-  }
-}
+  namespace eventsetup {
+    struct DependentRecordTag {};
+  }  // namespace eventsetup
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/EDAnalyzer.h b/FWCore/Framework/interface/EDAnalyzer.h
index 0ef2a97a63d5e..c640f5afdeaa3 100644
--- a/FWCore/Framework/interface/EDAnalyzer.h
+++ b/FWCore/Framework/interface/EDAnalyzer.h
@@ -22,89 +22,91 @@ namespace edm {
   class WaitingTask;
 
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
   }
 
   class EDAnalyzer : public EDConsumerBase {
   public:
-    template <typename T> friend class maker::ModuleHolderT;
-    template <typename T> friend class WorkerT;
+    template <typename T>
+    friend class maker::ModuleHolderT;
+    template <typename T>
+    friend class WorkerT;
     typedef EDAnalyzer ModuleType;
 
     EDAnalyzer();
     ~EDAnalyzer() override;
-    
-    std::string workerType() const {return "WorkerT<EDAnalyzer>";}
+
+    std::string workerType() const { return "WorkerT<EDAnalyzer>"; }
 
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
     static const std::string& baseType();
-    static   void prevalidate(ConfigurationDescriptions& );
+    static void prevalidate(ConfigurationDescriptions&);
 
     // Warning: the returned moduleDescription will be invalid during construction
     ModuleDescription const& moduleDescription() const { return moduleDescription_; }
-    
-    static bool wantsGlobalRuns() {return true;}
-    static bool wantsGlobalLuminosityBlocks() {return true;}
-    static bool wantsStreamRuns() {return false;}
-    static bool wantsStreamLuminosityBlocks() {return false;};
+
+    static bool wantsGlobalRuns() { return true; }
+    static bool wantsGlobalLuminosityBlocks() { return true; }
+    static bool wantsStreamRuns() { return false; }
+    static bool wantsStreamLuminosityBlocks() { return false; };
 
     void callWhenNewProductsRegistered(std::function<void(BranchDescription const&)> const& func);
 
-    SerialTaskQueue* globalRunsQueue() { return &runQueue_;}
-    SerialTaskQueue* globalLuminosityBlocksQueue() { return &luminosityBlockQueue_;}
+    SerialTaskQueue* globalRunsQueue() { return &runQueue_; }
+    SerialTaskQueue* globalLuminosityBlocksQueue() { return &luminosityBlockQueue_; }
+
   private:
-    bool doEvent(EventPrincipal const& ep, EventSetupImpl const&  c,
+    bool doEvent(EventPrincipal const& ep,
+                 EventSetupImpl const& c,
                  ActivityRegistry* act,
                  ModuleCallingContext const* mcc);
     //Needed by Worker but not something supported
-    void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
+    void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                      ModuleCallingContext const& iModuleCallingContext,
+                                      Principal const& iPrincipal) const {}
 
     void doPreallocate(PreallocationConfiguration const&) {}
     void doBeginJob();
     void doEndJob();
-    bool doBeginRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                    ModuleCallingContext const* mcc);
-    bool doEndRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                  ModuleCallingContext const* mcc);
-    bool doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+    bool doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc);
+    bool doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc);
+    bool doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                EventSetupImpl const& c,
                                 ModuleCallingContext const* mcc);
-    bool doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+    bool doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                              EventSetupImpl const& c,
                               ModuleCallingContext const* mcc);
     void doRespondToOpenInputFile(FileBlock const& fb);
     void doRespondToCloseInputFile(FileBlock const& fb);
-    void doRegisterThinnedAssociations(ProductRegistry const&,
-                                       ThinnedAssociationsHelper&) { }
+    void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
 
     void registerProductsAndCallbacks(EDAnalyzer const*, ProductRegistry* reg);
-    
-    SharedResourcesAcquirer& sharedResourcesAcquirer() {
-      return resourceAcquirer_;
-    }
+
+    SharedResourcesAcquirer& sharedResourcesAcquirer() { return resourceAcquirer_; }
 
     virtual void analyze(Event const&, EventSetup const&) = 0;
-    virtual void beginJob(){}
-    virtual void endJob(){}
-    virtual void beginRun(Run const&, EventSetup const&){}
-    virtual void endRun(Run const&, EventSetup const&){}
-    virtual void beginLuminosityBlock(LuminosityBlock const&, EventSetup const&){}
-    virtual void endLuminosityBlock(LuminosityBlock const&, EventSetup const&){}
+    virtual void beginJob() {}
+    virtual void endJob() {}
+    virtual void beginRun(Run const&, EventSetup const&) {}
+    virtual void endRun(Run const&, EventSetup const&) {}
+    virtual void beginLuminosityBlock(LuminosityBlock const&, EventSetup const&) {}
+    virtual void endLuminosityBlock(LuminosityBlock const&, EventSetup const&) {}
     virtual void respondToOpenInputFile(FileBlock const&) {}
     virtual void respondToCloseInputFile(FileBlock const&) {}
 
     bool hasAcquire() const { return false; }
     bool hasAccumulator() const { return false; }
 
-    void setModuleDescription(ModuleDescription const& md) {
-      moduleDescription_ = md;
-    }
+    void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
     ModuleDescription moduleDescription_;
     SharedResourcesAcquirer resourceAcquirer_;
 
     SerialTaskQueue runQueue_;
     SerialTaskQueue luminosityBlockQueue_;
-    
+
     std::function<void(BranchDescription const&)> callWhenNewProductsRegistered_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/EDConsumerBase.h b/FWCore/Framework/interface/EDConsumerBase.h
index 1c2e1b6e976a4..0365ca74f8038 100644
--- a/FWCore/Framework/interface/EDConsumerBase.h
+++ b/FWCore/Framework/interface/EDConsumerBase.h
@@ -28,6 +28,10 @@
 #include "DataFormats/Provenance/interface/BranchType.h"
 #include "FWCore/Framework/interface/ProductResolverIndexAndSkipBit.h"
 #include "FWCore/Framework/interface/EventSetupRecordKey.h"
+#include "FWCore/Framework/interface/HCTypeTag.h"
+#include "FWCore/Framework/interface/DataKey.h"
+#include "FWCore/Framework/interface/data_default_record_trait.h"
+#include "FWCore/Utilities/interface/ESIndices.h"
 #include "FWCore/ServiceRegistry/interface/ConsumesInfo.h"
 #include "FWCore/Utilities/interface/TypeID.h"
 #include "FWCore/Utilities/interface/TypeToGet.h"
@@ -41,7 +45,6 @@
 #include "FWCore/Utilities/interface/ProductKindOfType.h"
 #include "FWCore/Utilities/interface/ProductLabels.h"
 
-
 // forward declarations
 
 namespace edm {
@@ -49,13 +52,16 @@ namespace edm {
   class ProductResolverIndexHelper;
   class ProductRegistry;
   class ConsumesCollector;
-  template<typename T> class WillGetIfMatch;
+  template <typename T>
+  class WillGetIfMatch;
 
-  class EDConsumerBase
-  {
+  namespace eventsetup {
+    class ESRecordsToProxyIndices;
+  }
 
+  class EDConsumerBase {
   public:
-    EDConsumerBase() : frozen_(false), containsCurrentProcessAlias_(false) {}
+    EDConsumerBase() : m_tokenLabels{'\0'}, frozen_(false), containsCurrentProcessAlias_(false) {}
     virtual ~EDConsumerBase() noexcept(false);
 
     // disallow copying
@@ -73,7 +79,9 @@ namespace edm {
     void itemsToGet(BranchType, std::vector<ProductResolverIndexAndSkipBit>&) const;
     void itemsMayGet(BranchType, std::vector<ProductResolverIndexAndSkipBit>&) const;
 
-    std::vector<ProductResolverIndexAndSkipBit> const& itemsToGetFrom(BranchType iType) const { return itemsToGetFromBranch_[iType]; }
+    std::vector<ProductResolverIndexAndSkipBit> const& itemsToGetFrom(BranchType iType) const {
+      return itemsToGetFromBranch_[iType];
+    }
 
     ///\return true if the product corresponding to the index was registered via consumes or mayConsume call
     bool registeredToConsume(ProductResolverIndex, bool, BranchType) const;
@@ -83,9 +91,8 @@ namespace edm {
     // ---------- static member functions --------------------
 
     // ---------- member functions ---------------------------
-    void updateLookup(BranchType iBranchType,
-                      ProductResolverIndexHelper const&,
-                      bool iPrefetchMayGet);
+    void updateLookup(BranchType iBranchType, ProductResolverIndexHelper const&, bool iPrefetchMayGet);
+    void updateLookup(eventsetup::ESRecordsToProxyIndices const&);
 
     typedef ProductLabels Labels;
     void labelsForToken(EDGetToken iToken, Labels& oLabels) const;
@@ -100,16 +107,25 @@ namespace edm {
 
     std::vector<ConsumesInfo> consumesInfo() const;
 
+    ESProxyIndex const* esGetTokenIndices(edm::Transition iTrans) const {
+      auto const& v = esItemsToGetFromTransition_[static_cast<unsigned int>(iTrans)];
+      if (v.empty()) {
+        return nullptr;
+      }
+      return &(esItemsToGetFromTransition_[static_cast<unsigned int>(iTrans)].front());
+    }
+
   protected:
     friend class ConsumesCollector;
-    template<typename T> friend class WillGetIfMatch;
+    template <typename T>
+    friend class WillGetIfMatch;
     ///Use a ConsumesCollector to gather consumes information from helper functions
     ConsumesCollector consumesCollector();
 
-    template <typename ProductType, BranchType B=InEvent>
+    template <typename ProductType, BranchType B = InEvent>
     EDGetTokenT<ProductType> consumes(edm::InputTag const& tag) {
-      TypeToGet tid=TypeToGet::make<ProductType>();
-      return EDGetTokenT<ProductType>{recordConsumes(B,tid, checkIfEmpty(tag),true)};
+      TypeToGet tid = TypeToGet::make<ProductType>();
+      return EDGetTokenT<ProductType>{recordConsumes(B, tid, checkIfEmpty(tag), true)};
     }
 
     EDGetToken consumes(const TypeToGet& id, edm::InputTag const& tag) {
@@ -121,51 +137,58 @@ namespace edm {
       return EDGetToken{recordConsumes(B, id, checkIfEmpty(tag), true)};
     }
 
-    template <typename ProductType, BranchType B=InEvent>
+    template <typename ProductType, BranchType B = InEvent>
     EDGetTokenT<ProductType> mayConsume(edm::InputTag const& tag) {
-      TypeToGet tid=TypeToGet::make<ProductType>();
+      TypeToGet tid = TypeToGet::make<ProductType>();
       return EDGetTokenT<ProductType>{recordConsumes(B, tid, checkIfEmpty(tag), false)};
     }
 
-    EDGetToken mayConsume(const TypeToGet& id, edm::InputTag const& tag) {
-      return mayConsume<InEvent>(id,tag);
-    }
+    EDGetToken mayConsume(const TypeToGet& id, edm::InputTag const& tag) { return mayConsume<InEvent>(id, tag); }
 
     template <BranchType B>
     EDGetToken mayConsume(const TypeToGet& id, edm::InputTag const& tag) {
-      return EDGetToken{recordConsumes(B,id,checkIfEmpty(tag),false)};
+      return EDGetToken{recordConsumes(B, id, checkIfEmpty(tag), false)};
     }
 
-    template <typename ProductType, BranchType B=InEvent>
+    template <typename ProductType, BranchType B = InEvent>
     void consumesMany() {
-      TypeToGet tid=TypeToGet::make<ProductType>();
+      TypeToGet tid = TypeToGet::make<ProductType>();
       consumesMany<B>(tid);
     }
 
-    void consumesMany(const TypeToGet& id) {
-      consumesMany<InEvent>(id);
-    }
+    void consumesMany(const TypeToGet& id) { consumesMany<InEvent>(id); }
 
     template <BranchType B>
     void consumesMany(const TypeToGet& id) {
-      recordConsumes(B,id,edm::InputTag{},true);
+      recordConsumes(B, id, edm::InputTag{}, true);
     }
 
     // For consuming event-setup products
     template <typename ESProduct, typename ESRecord, Transition Tr = Transition::Event>
-    auto esConsumes()
-    {
+    auto esConsumes() {
       return esConsumes<ESProduct, ESRecord, Tr>(ESInputTag{});
     }
 
     template <typename ESProduct, typename ESRecord, Transition Tr = Transition::Event>
-    auto esConsumes(ESInputTag const& tag)
-    {
-      return ESGetToken<ESProduct, ESRecord>{tag};
+    auto esConsumes(ESInputTag const& tag) {
+      auto index = recordESConsumes(Tr,
+                                    eventsetup::EventSetupRecordKey::makeKey<
+                                        std::conditional_t<std::is_same_v<ESRecord, edm::DefaultRecord>,
+                                                           eventsetup::default_record_t<ESHandleAdapter<ESProduct>>,
+                                                           ESRecord>>(),
+                                    eventsetup::heterocontainer::HCTypeTag::make<ESProduct>(),
+                                    tag);
+      return ESGetToken<ESProduct, ESRecord>{static_cast<unsigned int>(Tr), index, labelFor(index)};
     }
 
   private:
     unsigned int recordConsumes(BranchType iBranch, TypeToGet const& iType, edm::InputTag const& iTag, bool iAlwaysGets);
+    ESTokenIndex recordESConsumes(Transition,
+                                  eventsetup::EventSetupRecordKey const&,
+                                  eventsetup::heterocontainer::HCTypeTag const&,
+                                  edm::ESInputTag const& iTag);
+
+    const char* labelFor(ESTokenIndex) const;
 
     void throwTypeMismatch(edm::TypeID const&, EDGetToken) const;
     void throwBranchMismatch(BranchType, EDGetToken) const;
@@ -176,11 +199,8 @@ namespace edm {
     // ---------- member data --------------------------------
 
     struct TokenLookupInfo {
-      TokenLookupInfo(edm::TypeID const& iID,
-                      ProductResolverIndex iIndex,
-                      bool skipCurrentProcess,
-                      BranchType iBranch):
-        m_type(iID),m_index(iIndex, skipCurrentProcess), m_branchType(iBranch){}
+      TokenLookupInfo(edm::TypeID const& iID, ProductResolverIndex iIndex, bool skipCurrentProcess, BranchType iBranch)
+          : m_type(iID), m_index(iIndex, skipCurrentProcess), m_branchType(iBranch) {}
       edm::TypeID m_type;
       ProductResolverIndexAndSkipBit m_index;
       BranchType m_branchType;
@@ -189,18 +209,18 @@ namespace edm {
     struct LabelPlacement {
       LabelPlacement(unsigned int iStartOfModuleLabel,
                      unsigned short iDeltaToProductInstance,
-                     unsigned short iDeltaToProcessName):
-      m_startOfModuleLabel(iStartOfModuleLabel),
-      m_deltaToProductInstance(iDeltaToProductInstance),
-      m_deltaToProcessName(iDeltaToProcessName) {}
+                     unsigned short iDeltaToProcessName)
+          : m_startOfModuleLabel(iStartOfModuleLabel),
+            m_deltaToProductInstance(iDeltaToProductInstance),
+            m_deltaToProcessName(iDeltaToProcessName) {}
       unsigned int m_startOfModuleLabel;
       unsigned short m_deltaToProductInstance;
       unsigned short m_deltaToProcessName;
     };
 
     //define the purpose of each 'column' in m_tokenInfo
-    enum {kLookupInfo,kAlwaysGets,kLabels,kKind};
-    edm::SoATuple<TokenLookupInfo,bool,LabelPlacement,edm::KindOfType> m_tokenInfo;
+    enum { kLookupInfo, kAlwaysGets, kLabels, kKind };
+    edm::SoATuple<TokenLookupInfo, bool, LabelPlacement, edm::KindOfType> m_tokenInfo;
 
     //m_tokenStartOfLabels holds the entries into this container
     // for each of the 3 labels needed to id the data
@@ -208,9 +228,28 @@ namespace edm {
 
     std::array<std::vector<ProductResolverIndexAndSkipBit>, edm::NumBranchTypes> itemsToGetFromBranch_;
 
+    struct ESTokenLookupInfo {
+      eventsetup::EventSetupRecordKey m_record;
+      eventsetup::DataKey m_key;
+      unsigned int m_startOfComponentName;
+    };
+
+    // TODO We would like to be able to access m_esTokenInfo from the
+    // index in the token, but this is currently not possible. One idea
+    // for this is to order the entries in m_esToken so that all the ones
+    // for transition 0 come first, then the ones for for transition 1
+    // and so on for all the transitions. Within a transition, the
+    // entries would be in the same order in m_esTokenInfo and
+    // esItemsToGetFromTransition_. This is something for future
+    // development and might require a change to SoATuple to support
+    // inserts in the middle of the data structure.
+    enum { kESLookupInfo, kESProxyIndex };
+    edm::SoATuple<ESTokenLookupInfo, ESProxyIndex> m_esTokenInfo;
+    std::array<std::vector<ESProxyIndex>, static_cast<unsigned int>(edm::Transition::NumberOfTransitions)>
+        esItemsToGetFromTransition_;
     bool frozen_;
     bool containsCurrentProcessAlias_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/EDFilter.h b/FWCore/Framework/interface/EDFilter.h
index 8a029338322db..7a7c7c9593e32 100644
--- a/FWCore/Framework/interface/EDFilter.h
+++ b/FWCore/Framework/interface/EDFilter.h
@@ -25,7 +25,8 @@ These products should be informational products about the filter decision.
 
 namespace edm {
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
   }
 
   class ModuleCallingContext;
@@ -37,78 +38,79 @@ namespace edm {
 
   class EDFilter : public ProducerBase, public EDConsumerBase {
   public:
-    template <typename T> friend class maker::ModuleHolderT;
-    template <typename T> friend class WorkerT;
+    template <typename T>
+    friend class maker::ModuleHolderT;
+    template <typename T>
+    friend class WorkerT;
     typedef EDFilter ModuleType;
-    
+
     EDFilter();
     ~EDFilter() override;
 
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
-    static void prevalidate(ConfigurationDescriptions& );
+    static void prevalidate(ConfigurationDescriptions&);
 
     static const std::string& baseType();
 
     // Warning: the returned moduleDescription will be invalid during construction
     ModuleDescription const& moduleDescription() const { return moduleDescription_; }
 
-    static bool wantsGlobalRuns() {return true;}
-    static bool wantsGlobalLuminosityBlocks() {return true;}
-    static bool wantsStreamRuns() {return false;}
-    static bool wantsStreamLuminosityBlocks() {return false;};
+    static bool wantsGlobalRuns() { return true; }
+    static bool wantsGlobalLuminosityBlocks() { return true; }
+    static bool wantsStreamRuns() { return false; }
+    static bool wantsStreamLuminosityBlocks() { return false; };
+
+    SerialTaskQueue* globalRunsQueue() { return &runQueue_; }
+    SerialTaskQueue* globalLuminosityBlocksQueue() { return &luminosityBlockQueue_; }
 
-    SerialTaskQueue* globalRunsQueue() { return &runQueue_;}
-    SerialTaskQueue* globalLuminosityBlocksQueue() { return &luminosityBlockQueue_;}
   private:
-    bool doEvent(EventPrincipal const& ep, EventSetupImpl const&  c,
+    bool doEvent(EventPrincipal const& ep,
+                 EventSetupImpl const& c,
                  ActivityRegistry* act,
                  ModuleCallingContext const* mcc);
     //Needed by WorkerT but not supported
-    void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
+    void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                      ModuleCallingContext const& iModuleCallingContext,
+                                      Principal const& iPrincipal) const {}
 
     void doPreallocate(PreallocationConfiguration const&) {}
     void doBeginJob();
-    void doEndJob();    
-    void doBeginRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                    ModuleCallingContext const* mcc);
-    void doEndRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                  ModuleCallingContext const* mcc);
-    void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+    void doEndJob();
+    void doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc);
+    void doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc);
+    void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                EventSetupImpl const& c,
                                 ModuleCallingContext const* mcc);
-    void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+    void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                              EventSetupImpl const& c,
                               ModuleCallingContext const* mcc);
     void doRespondToOpenInputFile(FileBlock const& fb);
     void doRespondToCloseInputFile(FileBlock const& fb);
-    void doRegisterThinnedAssociations(ProductRegistry const&,
-                                       ThinnedAssociationsHelper&) { }
+    void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
 
     void registerProductsAndCallbacks(EDFilter* module, ProductRegistry* reg) {
       registerProducts(module, reg, moduleDescription_);
     }
 
-    std::string workerType() const {return "WorkerT<EDFilter>";}
-    
-    SharedResourcesAcquirer& sharedResourcesAcquirer() {
-      return resourceAcquirer_;
-    }
+    std::string workerType() const { return "WorkerT<EDFilter>"; }
+
+    SharedResourcesAcquirer& sharedResourcesAcquirer() { return resourceAcquirer_; }
 
     virtual bool filter(Event&, EventSetup const&) = 0;
-    virtual void beginJob(){}
-    virtual void endJob(){}
+    virtual void beginJob() {}
+    virtual void endJob() {}
 
-    virtual void beginRun(Run const&, EventSetup const&){}
-    virtual void endRun(Run const&, EventSetup const&){}
-    virtual void beginLuminosityBlock(LuminosityBlock const&, EventSetup const&){}
-    virtual void endLuminosityBlock(LuminosityBlock const&, EventSetup const&){}
+    virtual void beginRun(Run const&, EventSetup const&) {}
+    virtual void endRun(Run const&, EventSetup const&) {}
+    virtual void beginLuminosityBlock(LuminosityBlock const&, EventSetup const&) {}
+    virtual void endLuminosityBlock(LuminosityBlock const&, EventSetup const&) {}
     virtual void respondToOpenInputFile(FileBlock const&) {}
     virtual void respondToCloseInputFile(FileBlock const&) {}
 
     bool hasAcquire() const { return false; }
     bool hasAccumulator() const { return false; }
 
-    void setModuleDescription(ModuleDescription const& md) {
-      moduleDescription_ = md;
-    }
+    void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
     ModuleDescription moduleDescription_;
     std::vector<BranchID> previousParentage_;
     SharedResourcesAcquirer resourceAcquirer_;
@@ -116,6 +118,6 @@ namespace edm {
     SerialTaskQueue luminosityBlockQueue_;
     ParentageID previousParentageId_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/EDLooper.h b/FWCore/Framework/interface/EDLooper.h
index eb6f04b62cff1..3f0537fe09d24 100644
--- a/FWCore/Framework/interface/EDLooper.h
+++ b/FWCore/Framework/interface/EDLooper.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Module:      EDLooper
-// 
+//
 /**\class EDLooper EDLooper.h FWCore/Framework/interface/EDLooper.h
 
  Description: Standard base class for looping components
@@ -24,28 +24,23 @@
 
 namespace edm {
 
-  class EDLooper : public EDLooperBase
-  {
-    public:
-
-      EDLooper();
-      ~EDLooper() override;
+  class EDLooper : public EDLooperBase {
+  public:
+    EDLooper();
+    ~EDLooper() override;
 
-      EDLooper(EDLooper const&) = delete; // Disallow copying and moving
-      EDLooper& operator=(EDLooper const&) = delete; // Disallow copying and moving
-
-    private:
+    EDLooper(EDLooper const&) = delete;             // Disallow copying and moving
+    EDLooper& operator=(EDLooper const&) = delete;  // Disallow copying and moving
 
+  private:
     /**Called after all event modules have had a chance to process the edm::Event.
      */
-    virtual Status duringLoop(const edm::Event&, const edm::EventSetup&) = 0; 
-    
+    virtual Status duringLoop(const edm::Event&, const edm::EventSetup&) = 0;
+
     /**override base class interface and just call the above duringLoop
      */
-    Status duringLoop(const edm::Event&, const edm::EventSetup&, ProcessingController& ) override;
-    
-    
+    Status duringLoop(const edm::Event&, const edm::EventSetup&, ProcessingController&) override;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/EDLooperBase.h b/FWCore/Framework/interface/EDLooperBase.h
index faec78a074dc1..ceb0fb3071ada 100644
--- a/FWCore/Framework/interface/EDLooperBase.h
+++ b/FWCore/Framework/interface/EDLooperBase.h
@@ -65,7 +65,7 @@ namespace edm {
   namespace eventsetup {
     class EventSetupRecordKey;
     class EventSetupProvider;
-  }
+  }  // namespace eventsetup
   class ExceptionToActionTable;
   class ProcessContext;
   class ScheduleInfo;
@@ -75,86 +75,85 @@ namespace edm {
   class ActivityRegistry;
 
   class EDLooperBase {
-    public:
-      enum Status {kContinue, kStop};
+  public:
+    enum Status { kContinue, kStop };
 
-      EDLooperBase();
-      virtual ~EDLooperBase() noexcept(false);
+    EDLooperBase();
+    virtual ~EDLooperBase() noexcept(false);
 
-      EDLooperBase(EDLooperBase const&) = delete; // Disallow copying and moving
-      EDLooperBase& operator=(EDLooperBase const&) = delete; // Disallow copying and moving
+    EDLooperBase(EDLooperBase const&) = delete;             // Disallow copying and moving
+    EDLooperBase& operator=(EDLooperBase const&) = delete;  // Disallow copying and moving
 
-      void doStartingNewLoop();
-      Status doDuringLoop(EventPrincipal& eventPrincipal, EventSetupImpl const&  es, ProcessingController&, StreamContext*);
-      Status doEndOfLoop(EventSetupImpl const&  es);
-      void prepareForNextLoop(eventsetup::EventSetupProvider* esp);
-      void doBeginRun(RunPrincipal&, EventSetupImpl const& , ProcessContext*);
-      void doEndRun(RunPrincipal&, EventSetupImpl const& , ProcessContext*);
-      void doBeginLuminosityBlock(LuminosityBlockPrincipal&, EventSetupImpl const& , ProcessContext*);
-      void doEndLuminosityBlock(LuminosityBlockPrincipal&, EventSetupImpl const& , ProcessContext*);
+    void doStartingNewLoop();
+    Status doDuringLoop(EventPrincipal& eventPrincipal, EventSetupImpl const& es, ProcessingController&, StreamContext*);
+    Status doEndOfLoop(EventSetupImpl const& es);
+    void prepareForNextLoop(eventsetup::EventSetupProvider* esp);
+    void doBeginRun(RunPrincipal&, EventSetupImpl const&, ProcessContext*);
+    void doEndRun(RunPrincipal&, EventSetupImpl const&, ProcessContext*);
+    void doBeginLuminosityBlock(LuminosityBlockPrincipal&, EventSetupImpl const&, ProcessContext*);
+    void doEndLuminosityBlock(LuminosityBlockPrincipal&, EventSetupImpl const&, ProcessContext*);
 
-      void beginOfJob(EventSetupImpl const& );
-      //This interface is deprecated
-      virtual void beginOfJob(EventSetup const& );
-      virtual void beginOfJob();
+    void beginOfJob(EventSetupImpl const&);
+    //This interface is deprecated
+    virtual void beginOfJob(EventSetup const&);
+    virtual void beginOfJob();
 
-      virtual void endOfJob();
+    virtual void endOfJob();
 
-      ///Override this method if you need to monitor the state of the processing
-      virtual void attachTo(ActivityRegistry&);
+    ///Override this method if you need to monitor the state of the processing
+    virtual void attachTo(ActivityRegistry&);
 
-      void setActionTable(ExceptionToActionTable const* actionTable) { act_table_ = actionTable; }
+    void setActionTable(ExceptionToActionTable const* actionTable) { act_table_ = actionTable; }
 
-      virtual std::set<eventsetup::EventSetupRecordKey> modifyingRecords() const;
+    virtual std::set<eventsetup::EventSetupRecordKey> modifyingRecords() const;
 
-      void copyInfo(ScheduleInfo const&);
-      void setModuleChanger(ModuleChanger*);
+    void copyInfo(ScheduleInfo const&);
+    void setModuleChanger(ModuleChanger*);
 
-    protected:
-      ///This only returns a non-zero value during the call to endOfLoop
-      ModuleChanger* moduleChanger();
-      ///This returns a non-zero value after the constructor has been called
-      ScheduleInfo const* scheduleInfo() const;
-    private:
+  protected:
+    ///This only returns a non-zero value during the call to endOfLoop
+    ModuleChanger* moduleChanger();
+    ///This returns a non-zero value after the constructor has been called
+    ScheduleInfo const* scheduleInfo() const;
 
-      /**Called before system starts to loop over the events. The argument is a count of
+  private:
+    /**Called before system starts to loop over the events. The argument is a count of
        how many loops have been processed.  For the first time through the events the argument
        will be 0.
        */
-      virtual void startingNewLoop(unsigned int ) = 0;
+    virtual void startingNewLoop(unsigned int) = 0;
 
-      /**Called after all event modules have had a chance to process the Event.
+    /**Called after all event modules have had a chance to process the Event.
        */
-      virtual Status duringLoop(Event const&, EventSetup const&, ProcessingController&) = 0;
+    virtual Status duringLoop(Event const&, EventSetup const&, ProcessingController&) = 0;
 
-      /**Called after the system has finished one loop over the events. Thar argument is a
+    /**Called after the system has finished one loop over the events. Thar argument is a
        count of how many loops have been processed before this loo.  For the first time through
        the events the argument will be 0.
        */
-      virtual Status endOfLoop(EventSetup const&, unsigned int iCounter) = 0;
+    virtual Status endOfLoop(EventSetup const&, unsigned int iCounter) = 0;
 
-      ///Called after all event modules have processed the begin of a Run
-      virtual void beginRun(Run const&, EventSetup const&);
+    ///Called after all event modules have processed the begin of a Run
+    virtual void beginRun(Run const&, EventSetup const&);
 
-      ///Called after all event modules have processed the end of a Run
-      virtual void endRun(Run const&, EventSetup const&);
+    ///Called after all event modules have processed the end of a Run
+    virtual void endRun(Run const&, EventSetup const&);
 
-      ///Called after all event modules have processed the begin of a LuminosityBlock
-      virtual void beginLuminosityBlock(LuminosityBlock const&, EventSetup const&);
+    ///Called after all event modules have processed the begin of a LuminosityBlock
+    virtual void beginLuminosityBlock(LuminosityBlock const&, EventSetup const&);
 
-      ///Called after all event modules have processed the end of a LuminosityBlock
-      virtual void endLuminosityBlock(LuminosityBlock const&, EventSetup const&);
+    ///Called after all event modules have processed the end of a LuminosityBlock
+    virtual void endLuminosityBlock(LuminosityBlock const&, EventSetup const&);
 
+    unsigned int iCounter_;
+    ExceptionToActionTable const* act_table_;
 
-      unsigned int iCounter_;
-      ExceptionToActionTable const* act_table_;
+    edm::propagate_const<std::unique_ptr<ScheduleInfo>> scheduleInfo_;
+    edm::propagate_const<ModuleChanger*> moduleChanger_;
 
-      edm::propagate_const<std::unique_ptr<ScheduleInfo>> scheduleInfo_;
-      edm::propagate_const<ModuleChanger*> moduleChanger_;
-
-      ModuleDescription moduleDescription_;
-      ModuleCallingContext moduleCallingContext_;
+    ModuleDescription moduleDescription_;
+    ModuleCallingContext moduleCallingContext_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/EDProducer.h b/FWCore/Framework/interface/EDProducer.h
index 82e410d8584d8..70c5d9ae8b5c9 100644
--- a/FWCore/Framework/interface/EDProducer.h
+++ b/FWCore/Framework/interface/EDProducer.h
@@ -29,16 +29,19 @@ namespace edm {
   class WaitingTask;
 
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
   }
 
   class EDProducer : public ProducerBase, public EDConsumerBase {
   public:
-    template <typename T> friend class maker::ModuleHolderT;
-    template <typename T> friend class WorkerT;
+    template <typename T>
+    friend class maker::ModuleHolderT;
+    template <typename T>
+    friend class WorkerT;
     typedef EDProducer ModuleType;
 
-    EDProducer ();
+    EDProducer();
     ~EDProducer() override;
 
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
@@ -47,63 +50,62 @@ namespace edm {
 
     // Warning: the returned moduleDescription will be invalid during construction
     ModuleDescription const& moduleDescription() const { return moduleDescription_; }
-    
-    static bool wantsGlobalRuns() {return true;}
-    static bool wantsGlobalLuminosityBlocks() {return true;}
-    static bool wantsStreamRuns() {return false;}
-    static bool wantsStreamLuminosityBlocks() {return false;};
-
-    SerialTaskQueue* globalRunsQueue() { return &runQueue_;}
-    SerialTaskQueue* globalLuminosityBlocksQueue() { return &luminosityBlockQueue_;}
+
+    static bool wantsGlobalRuns() { return true; }
+    static bool wantsGlobalLuminosityBlocks() { return true; }
+    static bool wantsStreamRuns() { return false; }
+    static bool wantsStreamLuminosityBlocks() { return false; };
+
+    SerialTaskQueue* globalRunsQueue() { return &runQueue_; }
+    SerialTaskQueue* globalLuminosityBlocksQueue() { return &luminosityBlockQueue_; }
+
   private:
-    bool doEvent(EventPrincipal const& ep, EventSetupImpl const&  c,
+    bool doEvent(EventPrincipal const& ep,
+                 EventSetupImpl const& c,
                  ActivityRegistry* act,
                  ModuleCallingContext const* mcc);
     //Needed by WorkerT but not supported
-    void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
+    void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                      ModuleCallingContext const& iModuleCallingContext,
+                                      Principal const& iPrincipal) const {}
 
     void doPreallocate(PreallocationConfiguration const&) {}
     void doBeginJob();
     void doEndJob();
-    void doBeginRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                    ModuleCallingContext const* mcc);
-    void doEndRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                  ModuleCallingContext const* mcc);
-    void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+    void doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc);
+    void doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc);
+    void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                EventSetupImpl const& c,
                                 ModuleCallingContext const* mcc);
-    void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+    void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                              EventSetupImpl const& c,
                               ModuleCallingContext const* mcc);
     void doRespondToOpenInputFile(FileBlock const& fb);
     void doRespondToCloseInputFile(FileBlock const& fb);
-    void doRegisterThinnedAssociations(ProductRegistry const&,
-                                       ThinnedAssociationsHelper&) { }
+    void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
     void registerProductsAndCallbacks(EDProducer* module, ProductRegistry* reg) {
       registerProducts(module, reg, moduleDescription_);
     }
 
-    std::string workerType() const {return "WorkerT<EDProducer>";}
-    
-    SharedResourcesAcquirer& sharedResourcesAcquirer() {
-      return resourceAcquirer_;
-    }
+    std::string workerType() const { return "WorkerT<EDProducer>"; }
+
+    SharedResourcesAcquirer& sharedResourcesAcquirer() { return resourceAcquirer_; }
 
     virtual void produce(Event&, EventSetup const&) = 0;
     virtual void beginJob() {}
-    virtual void endJob(){}
+    virtual void endJob() {}
 
-    virtual void beginRun(Run const& /* iR */, EventSetup const& /* iE */){}
-    virtual void endRun(Run const& /* iR */, EventSetup const& /* iE */){}
-    virtual void beginLuminosityBlock(LuminosityBlock const& /* iL */, EventSetup const& /* iE */){}
-    virtual void endLuminosityBlock(LuminosityBlock const& /* iL */, EventSetup const& /* iE */){}
+    virtual void beginRun(Run const& /* iR */, EventSetup const& /* iE */) {}
+    virtual void endRun(Run const& /* iR */, EventSetup const& /* iE */) {}
+    virtual void beginLuminosityBlock(LuminosityBlock const& /* iL */, EventSetup const& /* iE */) {}
+    virtual void endLuminosityBlock(LuminosityBlock const& /* iL */, EventSetup const& /* iE */) {}
     virtual void respondToOpenInputFile(FileBlock const&) {}
     virtual void respondToCloseInputFile(FileBlock const&) {}
 
     bool hasAcquire() const { return false; }
     bool hasAccumulator() const { return false; }
 
-    void setModuleDescription(ModuleDescription const& md) {
-      moduleDescription_ = md;
-    }
+    void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
     ModuleDescription moduleDescription_;
     std::vector<BranchID> previousParentage_;
     SharedResourcesAcquirer resourceAcquirer_;
@@ -111,6 +113,6 @@ namespace edm {
     SerialTaskQueue luminosityBlockQueue_;
     ParentageID previousParentageId_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/ESConsumesCollector.h b/FWCore/Framework/interface/ESConsumesCollector.h
index 67cf0851d8342..f7d89b037b598 100644
--- a/FWCore/Framework/interface/ESConsumesCollector.h
+++ b/FWCore/Framework/interface/ESConsumesCollector.h
@@ -29,15 +29,20 @@
 //
 
 #include "FWCore/Framework/interface/EventSetupRecordKey.h"
+#include "FWCore/Framework/interface/DataKey.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"
 #include "FWCore/Utilities/interface/ESInputTag.h"
 #include "FWCore/Utilities/interface/propagate_const.h"
 #include "FWCore/Utilities/interface/Transition.h"
 
+#include <vector>
+#include <memory>
 namespace edm {
+  using ESConsumesInfo =
+      std::vector<std::tuple<edm::eventsetup::EventSetupRecordKey, edm::eventsetup::DataKey, std::string> >;
+
   class ESConsumesCollector {
   public:
-
     ESConsumesCollector() = delete;
     ESConsumesCollector(ESConsumesCollector const&) = default;
     ESConsumesCollector(ESConsumesCollector&&) = default;
@@ -47,48 +52,50 @@ namespace edm {
     // ---------- member functions ---------------------------
     template <typename Product, typename Record>
     auto consumesFrom(ESInputTag const& tag) {
-      return ESGetToken<Product,Record>{tag};
+      using namespace edm::eventsetup;
+      ESTokenIndex index{static_cast<ESTokenIndex::Value_t>(m_consumer->size())};
+      m_consumer->emplace_back(EventSetupRecordKey::makeKey<Record>(),
+                               DataKey(DataKey::makeTypeTag<Product>(), tag.data().c_str()),
+                               tag.module());
+      //even though m_consumer may expand, the address for
+      // name().value() remains the same since it is 'moved'.
+      return ESGetToken<Product, Record>{m_transitionID, index, std::get<1>(m_consumer->back()).name().value()};
     }
 
   protected:
-    explicit ESConsumesCollector(ESProducer* const iConsumer) :
-    m_consumer{iConsumer}
-    {}
+    explicit ESConsumesCollector(ESConsumesInfo* const iConsumer, unsigned int iTransitionID)
+        : m_consumer{iConsumer}, m_transitionID{iTransitionID} {}
 
   private:
-
     // ---------- member data --------------------------------
-    edm::propagate_const<ESProducer*> m_consumer{nullptr};
+    edm::propagate_const<ESConsumesInfo*> m_consumer{nullptr};
+    unsigned int m_transitionID{0};
   };
-  
-  template<typename RECORD>
+
+  template <typename RECORD>
   class ESConsumesCollectorT : public ESConsumesCollector {
   public:
-    
     ESConsumesCollectorT() = delete;
     ESConsumesCollectorT(ESConsumesCollectorT<RECORD> const&) = default;
     ESConsumesCollectorT(ESConsumesCollectorT<RECORD>&&) = default;
     ESConsumesCollectorT<RECORD>& operator=(ESConsumesCollectorT<RECORD> const&) = default;
     ESConsumesCollectorT<RECORD>& operator=(ESConsumesCollectorT<RECORD>&&) = default;
-    
+
     // ---------- member functions ---------------------------
-    
+
     template <typename Product>
     auto consumes(ESInputTag const& tag) {
       return consumesFrom<Product, RECORD>(tag);
     }
-    
+
   private:
     //only ESProducer is allowed to make an instance of this class
     friend class ESProducer;
-    
-    explicit ESConsumesCollectorT(ESProducer* const iConsumer) :
-    ESConsumesCollector(iConsumer)
-    {}
-    
-  };
 
-}
+    explicit ESConsumesCollectorT(ESConsumesInfo* const iConsumer, unsigned int iTransitionID)
+        : ESConsumesCollector(iConsumer, iTransitionID) {}
+  };
 
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/ESHandle.h b/FWCore/Framework/interface/ESHandle.h
index f657f016dbc44..0152dcb6207f6 100644
--- a/FWCore/Framework/interface/ESHandle.h
+++ b/FWCore/Framework/interface/ESHandle.h
@@ -30,86 +30,73 @@
 
 namespace edm {
 
-class ESHandleBase {
-   public:
-      ESHandleBase() = default;
-      ESHandleBase(void const* iData, edm::eventsetup::ComponentDescription const* desc)
-           : data_(iData), description_(desc) {}
+  class ESHandleBase {
+  public:
+    ESHandleBase() = default;
+    ESHandleBase(void const* iData, edm::eventsetup::ComponentDescription const* desc)
+        : data_(iData), description_(desc) {}
 
-      ///Used when the attempt to get the data failed
-      ESHandleBase(std::shared_ptr<ESHandleExceptionFactory>&& iWhyFailed) :
-        whyFailedFactory_(std::move(iWhyFailed)) {}
+    ///Used when the attempt to get the data failed
+    ESHandleBase(std::shared_ptr<ESHandleExceptionFactory>&& iWhyFailed) : whyFailedFactory_(std::move(iWhyFailed)) {}
 
-      edm::eventsetup::ComponentDescription const* description() const;
+    edm::eventsetup::ComponentDescription const* description() const;
 
-      bool isValid() const { return nullptr != data_ && nullptr != description_; }
+    bool isValid() const { return nullptr != data_ && nullptr != description_; }
 
-      bool failedToGet() const { return bool(whyFailedFactory_); }
+    bool failedToGet() const { return bool(whyFailedFactory_); }
 
-      explicit operator bool () const {
-         return isValid();
-      }
-  
-      bool operator!() const {
-        return not isValid();
-      }
-
-      void swap(ESHandleBase& iOther) {
-         std::swap(data_, iOther.data_);
-         std::swap(description_, iOther.description_);
-         std::swap(whyFailedFactory_, iOther.whyFailedFactory_);
-      }
-
-      std::shared_ptr<ESHandleExceptionFactory> const&
-      whyFailedFactory() const { return whyFailedFactory_;}
+    explicit operator bool() const { return isValid(); }
 
-   protected:
-      void const *productStorage() const {
-        if (whyFailedFactory_) {
-          std::rethrow_exception(whyFailedFactory_->make());
-        }
-        return data_;
-      }
+    bool operator!() const { return not isValid(); }
 
-   private:
-      // ---------- member data --------------------------------
-      void const* data_{nullptr};
-      edm::eventsetup::ComponentDescription const* description_{nullptr};
-      std::shared_ptr<ESHandleExceptionFactory> whyFailedFactory_{nullptr};
-};
+    void swap(ESHandleBase& iOther) {
+      std::swap(data_, iOther.data_);
+      std::swap(description_, iOther.description_);
+      std::swap(whyFailedFactory_, iOther.whyFailedFactory_);
+    }
 
-template<typename T>
-class ESHandle : public ESHandleBase {
-   public:
-      typedef T value_type;
+    std::shared_ptr<ESHandleExceptionFactory> const& whyFailedFactory() const { return whyFailedFactory_; }
 
-      ESHandle() = default;
-      ESHandle(T const* iData) : ESHandleBase(iData, nullptr) {}
-      ESHandle(T const* iData, edm::eventsetup::ComponentDescription const* desc) : ESHandleBase(iData, desc) {}
-      ESHandle(std::shared_ptr<ESHandleExceptionFactory> &&);
-
-      // ---------- const member functions ---------------------
-      T const* product() const { return static_cast<T const *>(productStorage()); }
-      T const* operator->() const { return product(); }
-      T const& operator*() const { return *product(); }
-      // ---------- static member functions --------------------
-      static constexpr bool transientAccessOnly = false;
-
-      // ---------- member functions ---------------------------
-
-};
-
-template <class T>
-ESHandle<T>::ESHandle(std::shared_ptr<edm::ESHandleExceptionFactory> && iWhyFailed) :
-  ESHandleBase(std::move(iWhyFailed))
-{ }
+  protected:
+    void const* productStorage() const {
+      if (whyFailedFactory_) {
+        std::rethrow_exception(whyFailedFactory_->make());
+      }
+      return data_;
+    }
+
+  private:
+    // ---------- member data --------------------------------
+    void const* data_{nullptr};
+    edm::eventsetup::ComponentDescription const* description_{nullptr};
+    std::shared_ptr<ESHandleExceptionFactory> whyFailedFactory_{nullptr};
+  };
+
+  template <typename T>
+  class ESHandle : public ESHandleBase {
+  public:
+    typedef T value_type;
+
+    ESHandle() = default;
+    ESHandle(T const* iData) : ESHandleBase(iData, nullptr) {}
+    ESHandle(T const* iData, edm::eventsetup::ComponentDescription const* desc) : ESHandleBase(iData, desc) {}
+    ESHandle(std::shared_ptr<ESHandleExceptionFactory>&&);
+
+    // ---------- const member functions ---------------------
+    T const* product() const { return static_cast<T const*>(productStorage()); }
+    T const* operator->() const { return product(); }
+    T const& operator*() const { return *product(); }
+    // ---------- static member functions --------------------
+    static constexpr bool transientAccessOnly = false;
+
+    // ---------- member functions ---------------------------
+  };
+
+  template <class T>
+  ESHandle<T>::ESHandle(std::shared_ptr<edm::ESHandleExceptionFactory>&& iWhyFailed)
+      : ESHandleBase(std::move(iWhyFailed)) {}
 
   // Free swap function
-  inline
-  void
-  swap(ESHandleBase& a, ESHandleBase& b)
-  {
-    a.swap(b);
-  }
-}
+  inline void swap(ESHandleBase& a, ESHandleBase& b) { a.swap(b); }
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ESHandleExceptionFactory.h b/FWCore/Framework/interface/ESHandleExceptionFactory.h
index 738998e8ef260..151ae5eed4f9b 100644
--- a/FWCore/Framework/interface/ESHandleExceptionFactory.h
+++ b/FWCore/Framework/interface/ESHandleExceptionFactory.h
@@ -28,14 +28,12 @@
 
 namespace edm {
 
-  class ESHandleExceptionFactory
-  {
-
+  class ESHandleExceptionFactory {
   public:
     ESHandleExceptionFactory();
     virtual ~ESHandleExceptionFactory();
 
     virtual std::exception_ptr make() const = 0;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ESOutlet.h b/FWCore/Framework/interface/ESOutlet.h
index 64f7ff035952f..bccdaa584e036 100644
--- a/FWCore/Framework/interface/ESOutlet.h
+++ b/FWCore/Framework/interface/ESOutlet.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     ESOutlet
-// 
+//
 /**\class ESOutlet ESOutlet.h FWCore/Framework/interface/ESOutlet.h
 
  Description: An outlet which gets its data from the EventSetup and passes it to an edm::ExtensionCord
@@ -32,51 +32,40 @@ from the EDProducer to the object which needs the data.
 
 namespace edm {
   template <class T, class TRec>
-  class ESOutlet :private OutletBase<T>
-  {
+  class ESOutlet : private OutletBase<T> {
     class Getter : public extensioncord::ECGetterBase<T> {
-public:
-      Getter(const edm::EventSetup& iES,
-             const std::string& iLabel = std::string()) :
-      es_(&iES),
-      label_(iLabel) {}
-private:
+    public:
+      Getter(const edm::EventSetup& iES, const std::string& iLabel = std::string()) : es_(&iES), label_(iLabel) {}
+
+    private:
       virtual const T* getImpl() const {
         ESHandle<T> data;
-        es_->template get<TRec>().get(label_,data);
+        es_->template get<TRec>().get(label_, data);
         return &(*data);
       }
       const edm::EventSetup* es_;
       const std::string label_;
     };
-    
-    
-   public:
-      ESOutlet(const edm::EventSetup& iES,
-               ExtensionCord<T>& iCord):
-       OutletBase<T>(iCord),
-       getter_(iES)  {
-         this->setGetter(&getter_);
-      }
 
-      ESOutlet( const edm::EventSetup& iES,
-              const std::string& iLabel,
-              ExtensionCord<T>& iCord):
-       getter_(iES,iLabel) {
-         this->setGetter( &getter_);
-      }
-    
-    //virtual ~ESOutlet();
+  public:
+    ESOutlet(const edm::EventSetup& iES, ExtensionCord<T>& iCord) : OutletBase<T>(iCord), getter_(iES) {
+      this->setGetter(&getter_);
+    }
+
+    ESOutlet(const edm::EventSetup& iES, const std::string& iLabel, ExtensionCord<T>& iCord) : getter_(iES, iLabel) {
+      this->setGetter(&getter_);
+    }
 
-   private:
-      ESOutlet(const ESOutlet&); // stop default
+    //virtual ~ESOutlet();
 
-      const ESOutlet& operator=(const ESOutlet&); // stop default
+  private:
+    ESOutlet(const ESOutlet&);  // stop default
 
-      // ---------- member data --------------------------------
-      Getter getter_;
+    const ESOutlet& operator=(const ESOutlet&);  // stop default
 
+    // ---------- member data --------------------------------
+    Getter getter_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/ESPreFunctorDecorator.h b/FWCore/Framework/interface/ESPreFunctorDecorator.h
index a3e153a871ee7..61dc29e404dbe 100644
--- a/FWCore/Framework/interface/ESPreFunctorDecorator.h
+++ b/FWCore/Framework/interface/ESPreFunctorDecorator.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     ESPreFunctorDecorator
-// 
+//
 /**\class ESPreFunctorDecorator ESPreFunctorDecorator.h FWCore/Framework/interface/ESPreFunctorDecorator.h
 
  Description: A Decorator that works as a adapter to call a Functor before each call to the decorated method
@@ -27,15 +27,12 @@ the ESProducer's 'produce' method.
 // forward declarations
 
 namespace edm {
-   namespace eventsetup {
-
-template<class TRecord, class TFunctor >
-class ESPreFunctorDecorator
-{
+  namespace eventsetup {
 
-   public:
-      ESPreFunctorDecorator(const TFunctor& iCaller) :
-         caller_(iCaller) {}
+    template <class TRecord, class TFunctor>
+    class ESPreFunctorDecorator {
+    public:
+      ESPreFunctorDecorator(const TFunctor& iCaller) : caller_(iCaller) {}
       //virtual ~ESPreFunctorDecorator();
 
       // ---------- const member functions ---------------------
@@ -43,23 +40,20 @@ class ESPreFunctorDecorator
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------
-      void pre(const TRecord& iRecord) {
-         caller_(iRecord);
-      }
-   
-      void post(const TRecord&) {
-      }
-   
-   private:
+      void pre(const TRecord& iRecord) { caller_(iRecord); }
+
+      void post(const TRecord&) {}
+
+    private:
       //ESPreFunctorDecorator(const ESPreFunctorDecorator&); // stop default
 
-      const ESPreFunctorDecorator& operator=(const ESPreFunctorDecorator&) = delete; // stop default
+      const ESPreFunctorDecorator& operator=(const ESPreFunctorDecorator&) = delete;  // stop default
 
       // ---------- member data --------------------------------
       TFunctor caller_;
-};
+    };
 
-   }
-}
+  }  // namespace eventsetup
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/ESProducer.h b/FWCore/Framework/interface/ESProducer.h
index 9da3c93998720..0c1a4fd1a769f 100644
--- a/FWCore/Framework/interface/ESProducer.h
+++ b/FWCore/Framework/interface/ESProducer.h
@@ -87,17 +87,16 @@ Example: two algorithms each creating only one objects
 namespace edm {
   namespace eventsetup {
 
+    class ESRecordsToProxyIndices;
     //used by ESProducer to create the proper Decorator based on the
     //  argument type passed.  The default it to just 'pass through'
     //  the argument as the decorator itself
-    template< typename T, typename TRecord, typename TDecorator >
+    template <typename T, typename TRecord, typename TDecorator>
     inline const TDecorator& createDecoratorFrom(T*, const TRecord*, const TDecorator& iDec) {
       return iDec;
     }
-  }
-  class ESProducer : public ESProxyFactoryProducer
-  {
-
+  }  // namespace eventsetup
+  class ESProducer : public ESProxyFactoryProducer {
   public:
     ESProducer();
     ~ESProducer() noexcept(false) override;
@@ -107,39 +106,46 @@ namespace edm {
     // ---------- static member functions --------------------
 
     // ---------- member functions ---------------------------
+    void updateLookup(eventsetup::ESRecordsToProxyIndices const&) final;
+    ESProxyIndex const* getTokenIndices(unsigned int iIndex) const {
+      if (itemsToGetFromRecords_.empty()) {
+        return nullptr;
+      }
+      return (itemsToGetFromRecords_[iIndex].empty()) ? static_cast<ESProxyIndex const*>(nullptr)
+                                                      : &(itemsToGetFromRecords_[iIndex].front());
+    }
+
   protected:
     /** \param iThis the 'this' pointer to an inheriting class instance
         The method determines the Record argument and return value of the 'produce'
         method in order to do the registration with the EventSetup
     */
-    template<typename T>
+    template <typename T>
     auto setWhatProduced(T* iThis, const es::Label& iLabel = {}) {
-      return setWhatProduced(iThis , &T::produce, iLabel);
+      return setWhatProduced(iThis, &T::produce, iLabel);
     }
 
-    template<typename T>
+    template <typename T>
     auto setWhatProduced(T* iThis, const char* iLabel) {
-      return setWhatProduced(iThis , es::Label(iLabel));
+      return setWhatProduced(iThis, es::Label(iLabel));
     }
-    template<typename T>
+    template <typename T>
     auto setWhatProduced(T* iThis, const std::string& iLabel) {
-      return setWhatProduced(iThis , es::Label(iLabel));
+      return setWhatProduced(iThis, es::Label(iLabel));
     }
 
-    template<typename T, typename TDecorator >
+    template <typename T, typename TDecorator>
     auto setWhatProduced(T* iThis, const TDecorator& iDec, const es::Label& iLabel = {}) {
-      return setWhatProduced(iThis , &T::produce, iDec, iLabel);
+      return setWhatProduced(iThis, &T::produce, iDec, iLabel);
     }
     /** \param iThis the 'this' pointer to an inheriting class instance
         \param iMethod a member method of then inheriting class
         The method determines the Record argument and return value of the iMethod argument
         method in order to do the registration with the EventSetup
     */
-    template<typename T, typename TReturn, typename TRecord>
-    auto setWhatProduced(T* iThis,
-                         TReturn (T ::* iMethod)(const TRecord&),
-                         const es::Label& iLabel = {}) {
-      return setWhatProduced(iThis, iMethod, eventsetup::CallbackSimpleDecorator<TRecord>(),iLabel);
+    template <typename T, typename TReturn, typename TRecord>
+    auto setWhatProduced(T* iThis, TReturn (T ::*iMethod)(const TRecord&), const es::Label& iLabel = {}) {
+      return setWhatProduced(iThis, iMethod, eventsetup::CallbackSimpleDecorator<TRecord>(), iLabel);
     }
     /** \param iThis the 'this' pointer to an inheriting class instance
         \param iMethod a member method of then inheriting class
@@ -147,54 +153,54 @@ namespace edm {
         The method determines the Record argument and return value of the iMethod argument
         method in order to do the registration with the EventSetup
     */
-    template<typename T, typename TReturn, typename TRecord, typename TArg>
+    template <typename T, typename TReturn, typename TRecord, typename TArg>
     ESConsumesCollectorT<TRecord> setWhatProduced(T* iThis,
-                         TReturn (T ::* iMethod)(const TRecord&),
-                         const TArg& iDec,
-                         const es::Label& iLabel = {}) {
-      auto callback = std::make_shared<eventsetup::Callback<T,
-                                                            TReturn,
-                                                            TRecord,
-                                                            typename eventsetup::DecoratorFromArg<T,TRecord,TArg>::Decorator_t>>(iThis,
-                                                                                                                                 iMethod,
-                                                                                                                                 createDecoratorFrom(iThis,
-                                                                                                                                                     static_cast<const TRecord*>(nullptr),
-                                                                                                                                                     iDec));
+                                                  TReturn (T ::*iMethod)(const TRecord&),
+                                                  const TArg& iDec,
+                                                  const es::Label& iLabel = {}) {
+      const auto id = consumesInfos_.size();
+      auto callback = std::make_shared<
+          eventsetup::Callback<T, TReturn, TRecord, typename eventsetup::DecoratorFromArg<T, TRecord, TArg>::Decorator_t>>(
+          iThis, iMethod, id, createDecoratorFrom(iThis, static_cast<const TRecord*>(nullptr), iDec));
       registerProducts(callback,
-                       static_cast<const typename eventsetup::produce::product_traits<TReturn>::type *>(nullptr),
+                       static_cast<const typename eventsetup::produce::product_traits<TReturn>::type*>(nullptr),
                        static_cast<const TRecord*>(nullptr),
                        iLabel);
-      return ESConsumesCollectorT<TRecord>{iThis};
+      consumesInfos_.push_back(std::make_unique<ESConsumesInfo>());
+      return ESConsumesCollectorT<TRecord>(consumesInfos_.back().get(), id);
     }
 
-    ESProducer(const ESProducer&) = delete; // stop default
-    ESProducer const& operator=(const ESProducer&) = delete; // stop default
+    ESProducer(const ESProducer&) = delete;                   // stop default
+    ESProducer const& operator=(const ESProducer&) = delete;  // stop default
 
   private:
-
-    template<typename CallbackT, typename TList, typename TRecord>
-    void registerProducts(std::shared_ptr<CallbackT> iCallback, const TList*, const TRecord* iRecord,
+    template <typename CallbackT, typename TList, typename TRecord>
+    void registerProducts(std::shared_ptr<CallbackT> iCallback,
+                          const TList*,
+                          const TRecord* iRecord,
                           const es::Label& iLabel) {
       registerProduct(iCallback, static_cast<const typename TList::tail_type*>(nullptr), iRecord, iLabel);
       registerProducts(iCallback, static_cast<const typename TList::head_type*>(nullptr), iRecord, iLabel);
     }
 
-    template<typename T, typename TRecord>
-    void registerProducts(std::shared_ptr<T>, const eventsetup::produce::Null*, const TRecord*,const es::Label&) {
+    template <typename T, typename TRecord>
+    void registerProducts(std::shared_ptr<T>, const eventsetup::produce::Null*, const TRecord*, const es::Label&) {
       //do nothing
     }
 
-    template<typename T, typename TProduct, typename TRecord>
-    void registerProduct(std::shared_ptr<T> iCallback, const TProduct*, const TRecord*,const es::Label& iLabel) {
+    template <typename T, typename TProduct, typename TRecord>
+    void registerProduct(std::shared_ptr<T> iCallback, const TProduct*, const TRecord*, const es::Label& iLabel) {
       typedef eventsetup::CallbackProxy<T, TRecord, TProduct> ProxyType;
       typedef eventsetup::ProxyArgumentFactoryTemplate<ProxyType, std::shared_ptr<T>> FactoryType;
       registerFactory(std::make_unique<FactoryType>(iCallback), iLabel.default_);
     }
 
-    template<typename T, typename TProduct, typename TRecord, int IIndex>
-    void registerProduct(std::shared_ptr<T> iCallback, const es::L<TProduct,IIndex>*, const TRecord*,const es::Label& iLabel) {
-      if(iLabel.labels_.size() <= IIndex ||
-         iLabel.labels_[IIndex] == es::Label::def()) {
+    template <typename T, typename TProduct, typename TRecord, int IIndex>
+    void registerProduct(std::shared_ptr<T> iCallback,
+                         const es::L<TProduct, IIndex>*,
+                         const TRecord*,
+                         const es::Label& iLabel) {
+      if (iLabel.labels_.size() <= IIndex || iLabel.labels_[IIndex] == es::Label::def()) {
         Exception::throwThis(errors::Configuration,
                              "Unnamed Label\nthe index ",
                              IIndex,
@@ -205,6 +211,11 @@ namespace edm {
       registerFactory(std::make_unique<FactoryType>(iCallback), iLabel.labels_[IIndex]);
     }
 
+    std::vector<std::unique_ptr<ESConsumesInfo>> consumesInfos_;
+    std::vector<std::vector<ESProxyIndex>> itemsToGetFromRecords_;
+    //need another structure to say which record to get the data from in
+    // order to make prefetching work
+    std::vector<std::vector<ESRecordIndex>> recordsUsedDuringGet_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ESProducerLooper.h b/FWCore/Framework/interface/ESProducerLooper.h
index c5a8c569fabc3..be2f7b62b8523 100644
--- a/FWCore/Framework/interface/ESProducerLooper.h
+++ b/FWCore/Framework/interface/ESProducerLooper.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     ESProducerLooper
-// 
+//
 /**\class ESProducerLooper ESProducerLooper.h FWCore/Framework/interface/ESProducerLooper.h
 
  Description: <one line class summary>
@@ -30,37 +30,35 @@
 
 // forward declarations
 namespace edm {
-  class ESProducerLooper : public ESProducer, public EventSetupRecordIntervalFinder, public EDLooper
-{
+  class ESProducerLooper : public ESProducer, public EventSetupRecordIntervalFinder, public EDLooper {
+  public:
+    ESProducerLooper();
+    //virtual ~ESProducerLooper();
 
-   public:
-      ESProducerLooper();
-      //virtual ~ESProducerLooper();
+    // ---------- const member functions ---------------------
 
-      // ---------- const member functions ---------------------
+    // ---------- static member functions --------------------
 
-      // ---------- static member functions --------------------
+    std::set<eventsetup::EventSetupRecordKey> modifyingRecords() const override;
+    // ---------- member functions ---------------------------
 
-      std::set<eventsetup::EventSetupRecordKey> modifyingRecords() const override;
-      // ---------- member functions ---------------------------
+  protected:
+    void setIntervalFor(const eventsetup::EventSetupRecordKey& iKey,
+                        const IOVSyncValue& iTime,
+                        ValidityInterval& oInterval) override;
 
-   protected:
-      void setIntervalFor(const eventsetup::EventSetupRecordKey& iKey,
-                          const IOVSyncValue& iTime, 
-                          ValidityInterval& oInterval) override;
-        
-      //use this to 'snoop' on what records are being used by the Producer
-      void registerFactoryWithKey(const eventsetup::EventSetupRecordKey& iRecord ,
-                                          std::unique_ptr<eventsetup::ProxyFactoryBase> iFactory,
-                                          const std::string& iLabel= std::string() ) override;
-private:
-      ESProducerLooper(const ESProducerLooper&) = delete; // stop default
+    //use this to 'snoop' on what records are being used by the Producer
+    void registerFactoryWithKey(const eventsetup::EventSetupRecordKey& iRecord,
+                                std::unique_ptr<eventsetup::ProxyFactoryBase> iFactory,
+                                const std::string& iLabel = std::string()) override;
 
-      const ESProducerLooper& operator=(const ESProducerLooper&) = delete; // stop default
+  private:
+    ESProducerLooper(const ESProducerLooper&) = delete;  // stop default
 
-      // ---------- member data --------------------------------
+    const ESProducerLooper& operator=(const ESProducerLooper&) = delete;  // stop default
 
-};
-}
+    // ---------- member data --------------------------------
+  };
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/ESProductHost.h b/FWCore/Framework/interface/ESProductHost.h
index 68f07ed1fa216..0a92a8be72104 100644
--- a/FWCore/Framework/interface/ESProductHost.h
+++ b/FWCore/Framework/interface/ESProductHost.h
@@ -89,23 +89,19 @@ namespace edm {
   // selected does not mattter, just that some order exists
   // so we know which cacheID corresponds to which type.
 
-  template <typename Product, typename ... RecordTypes>
+  template <typename Product, typename... RecordTypes>
   class ESProductHost final : public Product {
-
   public:
-
     template <typename... Args>
-    ESProductHost(Args&&... args) : Product(std::forward<Args>(args)...),
-                                    cacheIDs_(numberOfRecordTypes(), 0) { }
+    ESProductHost(Args&&... args) : Product(std::forward<Args>(args)...), cacheIDs_(numberOfRecordTypes(), 0) {}
 
     // Execute FUNC if the cacheIdentifier in the EventSetup RecordType
     // has changed since the last time we called FUNC for
     // this EventSetup product.
 
     template <typename RecordType, typename ContainingRecordType, typename FUNC>
-    void ifRecordChanges(ContainingRecordType const& containingRecord,
-                         FUNC func) {
-      RecordType const& record = containingRecord. template getRecord<RecordType>();
+    void ifRecordChanges(ContainingRecordType const& containingRecord, FUNC func) {
+      RecordType const& record = containingRecord.template getRecord<RecordType>();
       unsigned long long cacheIdentifier = record.cacheIdentifier();
       std::size_t iRecord = index<RecordType>();
       if (cacheIdentifier != cacheIDs_[iRecord]) {
@@ -141,17 +137,16 @@ namespace edm {
         return I;
       } else {
         static_assert(I + 1 < numberOfRecordTypes(), "unknown record type passed to ESProductHost::index");
-        return indexLoop<I+1, U, M...>();
+        return indexLoop<I + 1, U, M...>();
       }
     }
 
   private:
-
     // Data member, this holds the cache identifiers from the record which
     // are used to determine whether the EventSetup cache for that record has
     // been updated since this Product was lasted updated.
 
     std::vector<unsigned long long> cacheIDs_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ESProducts.h b/FWCore/Framework/interface/ESProducts.h
index f4e94c4957a07..961bd23163059 100644
--- a/FWCore/Framework/interface/ESProducts.h
+++ b/FWCore/Framework/interface/ESProducts.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     ESProducts
-// 
+//
 /**\class ESProducts ESProducts.h FWCore/Framework/interface/ESProducts.h
 
  Description: Container for multiple products created by an ESProducer
@@ -28,115 +28,112 @@
 
 // forward declarations
 namespace edm {
-   namespace eventsetup {      
-      namespace produce {
-         template<typename T1, typename... TArgs>
-            struct ProductHolder : public ProductHolder<TArgs...> {
-              using parent_type = ProductHolder<TArgs...>;
-              
-              ProductHolder() : value() {}
-              ProductHolder(ProductHolder<T1,TArgs...>&&) = default;
-              ProductHolder(ProductHolder<T1,TArgs...> const&) = default;
-              ProductHolder<T1, TArgs...>& operator=(ProductHolder<T1,TArgs...>&&) = default;
-              ProductHolder<T1, TArgs...>& operator=(ProductHolder<T1,TArgs...> const&) = default;
-
-               template<typename T>
-                  void setAllValues(T& iValuesFrom) {
-                     iValuesFrom.setFromRecursive(*this);
-                  }
-               using parent_type::moveTo;
-               void moveTo(T1& oValue) { oValue = std::move(value); }
-
-               using parent_type::setFrom;
-               void setFrom(T1& iValue) { value = iValue ; }
-               void setFrom(T1&& iValue) { value = std::move(iValue) ; }
-
-               template<typename T>
-                  void setFromRecursive(T& iValuesTo) {
-                     iValuesTo.setFrom(value);
-                     parent_type::setFromRecursive(iValuesTo);
-                  }
-
-               template<typename T>
-                  void moveToRecursive(T& iValuesTo) {
-                     iValuesTo.moveTo(value);
-                     parent_type::moveToRecursive(iValuesTo);
-                  }
-               T1 value;
-               
-               using tail_type = T1;
-               using head_type = parent_type;
-            };
-         
-         template<typename T1>
-            struct ProductHolder<T1> {
-               
-              ProductHolder() : value() {}
-              ProductHolder(ProductHolder<T1>&&) = default;
-              ProductHolder(ProductHolder<T1> const&) = default;
-              ProductHolder<T1>& operator=(ProductHolder<T1>&&) = default;
-              ProductHolder<T1>& operator=(ProductHolder<T1> const&) = default;
-
-              template<typename T>
-               void setAllValues(T& iValuesFrom) {
-                  iValuesFrom.moveToRecursive(*this);
-               }
-               void moveTo(T1& oValue) { oValue = std::move(value); }
-               void setFrom(T1& iValue) { value = iValue ; }
-               void setFrom(T1&& iValue) { value = std::move(iValue) ; }
-               template<typename T>
-               void moveToRecursive(T& iValuesTo) {
-                  iValuesTo.moveTo(value);
-               }
-               template<typename T>
-               void setFromRecursive(T& iValuesTo) {
-                  iValuesTo.setFrom(value);
-               }
-               T1 value;
-               
-               using tail_type = T1;
-               using head_type = Null;
-            };
-         
-      }
-   }
-   struct ESFillDirectly {};
-
-   template<typename ...TArgs>
-   struct ESProducts : public eventsetup::produce::ProductHolder<TArgs...> {
-      typedef eventsetup::produce::ProductHolder<TArgs...> parent_type;
-      template<typename... S>
-      ESProducts(ESProducts<S...>&& iProducts) {
-         parent_type::setAllValues(iProducts);
-      }
-      template<typename T>
-      /*explicit*/ ESProducts(T&& iValues) {
-         parent_type::setAllValues(iValues);
-      }
-      template<typename ...Vars>
-      ESProducts(ESFillDirectly, Vars&&... vars) {
-         (this->setFrom(std::forward<Vars>(vars)), ...);
-      }
-
-      ESProducts(ESProducts<TArgs...> const&) = default;
-      ESProducts(ESProducts<TArgs...>&&) = default;
-      ESProducts<TArgs...>& operator=(ESProducts<TArgs...> const&) = default;
-      ESProducts<TArgs...>& operator=(ESProducts<TArgs...>&&) = default;
-   };
-
-   namespace es {
-      template<typename ...TArgs>
-      ESProducts<std::remove_reference_t<TArgs>...> products(TArgs&&... args) {
-         return ESProducts<std::remove_reference_t<TArgs>...>(edm::ESFillDirectly{}, std::forward<TArgs>(args)...);
-      }
-   }
-
-   template<typename ...TArgs, typename ToT>
-     void moveFromTo(ESProducts<TArgs...>& iFrom,
-                     ToT& iTo) {
-       iFrom.moveTo(iTo);
-     }
-}
-
+  namespace eventsetup {
+    namespace produce {
+      template <typename T1, typename... TArgs>
+      struct ProductHolder : public ProductHolder<TArgs...> {
+        using parent_type = ProductHolder<TArgs...>;
+
+        ProductHolder() : value() {}
+        ProductHolder(ProductHolder<T1, TArgs...>&&) = default;
+        ProductHolder(ProductHolder<T1, TArgs...> const&) = default;
+        ProductHolder<T1, TArgs...>& operator=(ProductHolder<T1, TArgs...>&&) = default;
+        ProductHolder<T1, TArgs...>& operator=(ProductHolder<T1, TArgs...> const&) = default;
+
+        template <typename T>
+        void setAllValues(T& iValuesFrom) {
+          iValuesFrom.setFromRecursive(*this);
+        }
+        using parent_type::moveTo;
+        void moveTo(T1& oValue) { oValue = std::move(value); }
+
+        using parent_type::setFrom;
+        void setFrom(T1& iValue) { value = iValue; }
+        void setFrom(T1&& iValue) { value = std::move(iValue); }
+
+        template <typename T>
+        void setFromRecursive(T& iValuesTo) {
+          iValuesTo.setFrom(value);
+          parent_type::setFromRecursive(iValuesTo);
+        }
+
+        template <typename T>
+        void moveToRecursive(T& iValuesTo) {
+          iValuesTo.moveTo(value);
+          parent_type::moveToRecursive(iValuesTo);
+        }
+        T1 value;
+
+        using tail_type = T1;
+        using head_type = parent_type;
+      };
+
+      template <typename T1>
+      struct ProductHolder<T1> {
+        ProductHolder() : value() {}
+        ProductHolder(ProductHolder<T1>&&) = default;
+        ProductHolder(ProductHolder<T1> const&) = default;
+        ProductHolder<T1>& operator=(ProductHolder<T1>&&) = default;
+        ProductHolder<T1>& operator=(ProductHolder<T1> const&) = default;
+
+        template <typename T>
+        void setAllValues(T& iValuesFrom) {
+          iValuesFrom.moveToRecursive(*this);
+        }
+        void moveTo(T1& oValue) { oValue = std::move(value); }
+        void setFrom(T1& iValue) { value = iValue; }
+        void setFrom(T1&& iValue) { value = std::move(iValue); }
+        template <typename T>
+        void moveToRecursive(T& iValuesTo) {
+          iValuesTo.moveTo(value);
+        }
+        template <typename T>
+        void setFromRecursive(T& iValuesTo) {
+          iValuesTo.setFrom(value);
+        }
+        T1 value;
+
+        using tail_type = T1;
+        using head_type = Null;
+      };
+
+    }  // namespace produce
+  }    // namespace eventsetup
+  struct ESFillDirectly {};
+
+  template <typename... TArgs>
+  struct ESProducts : public eventsetup::produce::ProductHolder<TArgs...> {
+    typedef eventsetup::produce::ProductHolder<TArgs...> parent_type;
+    template <typename... S>
+    ESProducts(ESProducts<S...>&& iProducts) {
+      parent_type::setAllValues(iProducts);
+    }
+    template <typename T>
+    /*explicit*/ ESProducts(T&& iValues) {
+      parent_type::setAllValues(iValues);
+    }
+    template <typename... Vars>
+    ESProducts(ESFillDirectly, Vars&&... vars) {
+      (this->setFrom(std::forward<Vars>(vars)), ...);
+    }
+
+    ESProducts(ESProducts<TArgs...> const&) = default;
+    ESProducts(ESProducts<TArgs...>&&) = default;
+    ESProducts<TArgs...>& operator=(ESProducts<TArgs...> const&) = default;
+    ESProducts<TArgs...>& operator=(ESProducts<TArgs...>&&) = default;
+  };
+
+  namespace es {
+    template <typename... TArgs>
+    ESProducts<std::remove_reference_t<TArgs>...> products(TArgs&&... args) {
+      return ESProducts<std::remove_reference_t<TArgs>...>(edm::ESFillDirectly{}, std::forward<TArgs>(args)...);
+    }
+  }  // namespace es
+
+  template <typename... TArgs, typename ToT>
+  void moveFromTo(ESProducts<TArgs...>& iFrom, ToT& iTo) {
+    iFrom.moveTo(iTo);
+  }
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/ESProxyFactoryProducer.h b/FWCore/Framework/interface/ESProxyFactoryProducer.h
index d1d1a15cf479a..d0e489e9107bb 100644
--- a/FWCore/Framework/interface/ESProxyFactoryProducer.h
+++ b/FWCore/Framework/interface/ESProxyFactoryProducer.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     ESProxyFactoryProducer
-// 
+//
 /**\class ESProxyFactoryProducer ESProxyFactoryProducer.h FWCore/Framework/interface/ESProxyFactoryProducer.h
 
  Description: An EventSetup algorithmic Provider that manages Factories of Proxies
@@ -62,72 +62,60 @@ BarProd::BarProd(const edm::ParameterSet& iPS) {
 #include "FWCore/Utilities/interface/propagate_const.h"
 
 namespace edm {
-   namespace eventsetup {
-      class ProxyFactoryBase;
-      
-      struct FactoryInfo {
-         FactoryInfo() : key_(), factory_() {}
-         FactoryInfo(const DataKey& iKey, 
-                      std::shared_ptr<ProxyFactoryBase> iFactory)
-         : key_(iKey), 
-         factory_(iFactory) {} 
-         DataKey key_;
-         edm::propagate_const<std::shared_ptr<ProxyFactoryBase>> factory_;
-      };
-   }      
-   
-class ESProxyFactoryProducer : public eventsetup::DataProxyProvider
-{
+  namespace eventsetup {
+    class ProxyFactoryBase;
 
-   public:
-      ESProxyFactoryProducer();
-      ~ESProxyFactoryProducer() noexcept(false) override;
+    struct FactoryInfo {
+      FactoryInfo() : key_(), factory_() {}
+      FactoryInfo(const DataKey& iKey, std::shared_ptr<ProxyFactoryBase> iFactory) : key_(iKey), factory_(iFactory) {}
+      DataKey key_;
+      edm::propagate_const<std::shared_ptr<ProxyFactoryBase>> factory_;
+    };
+  }  // namespace eventsetup
 
-      // ---------- const member functions ---------------------
+  class ESProxyFactoryProducer : public eventsetup::DataProxyProvider {
+  public:
+    ESProxyFactoryProducer();
+    ~ESProxyFactoryProducer() noexcept(false) override;
 
-      // ---------- static member functions --------------------
+    // ---------- const member functions ---------------------
 
-      // ---------- member functions ---------------------------
-      ///overrides DataProxyProvider method
-      void newInterval(const eventsetup::EventSetupRecordKey& iRecordType,
-                                const ValidityInterval& iInterval) override ;
+    // ---------- static member functions --------------------
 
-   protected:
-      ///override DataProxyProvider method
-      void registerProxies(const eventsetup::EventSetupRecordKey& iRecord ,
-                                    KeyedProxies& aProxyList) override ;
+    // ---------- member functions ---------------------------
+    ///overrides DataProxyProvider method
+    void newInterval(const eventsetup::EventSetupRecordKey& iRecordType, const ValidityInterval& iInterval) override;
 
-      /** \param iFactory unique_ptr holding a new instance of a Factory
+  protected:
+    ///override DataProxyProvider method
+    void registerProxies(const eventsetup::EventSetupRecordKey& iRecord, KeyedProxies& aProxyList) override;
+
+    /** \param iFactory unique_ptr holding a new instance of a Factory
          \param iLabel extra string label used to get data (optional)
          Producer takes ownership of the Factory and uses it create the appropriate
          Proxy which is then registered with the EventSetup.  If used, this method should
          be called in inheriting class' constructor.
       */
-      template< class TFactory>
-         void registerFactory(std::unique_ptr<TFactory> iFactory,
-                              const std::string& iLabel = std::string()) {
-            std::unique_ptr<eventsetup::ProxyFactoryBase> temp(iFactory.release());
-            registerFactoryWithKey(
-                                   eventsetup::EventSetupRecordKey::makeKey<typename TFactory::record_type>(),
-                                   std::move(temp),
-                                   iLabel);
-         }
-      
-      virtual void registerFactoryWithKey(const eventsetup::EventSetupRecordKey& iRecord ,
-                                          std::unique_ptr<eventsetup::ProxyFactoryBase> iFactory,
-                                          const std::string& iLabel= std::string() );
-
-   private:
-      ESProxyFactoryProducer(const ESProxyFactoryProducer&) = delete; // stop default
-
-      const ESProxyFactoryProducer& operator=(const ESProxyFactoryProducer&) = delete; // stop default
-
-      
-      // ---------- member data --------------------------------
-      std::multimap< eventsetup::EventSetupRecordKey, eventsetup::FactoryInfo > record2Factories_;
+    template <class TFactory>
+    void registerFactory(std::unique_ptr<TFactory> iFactory, const std::string& iLabel = std::string()) {
+      std::unique_ptr<eventsetup::ProxyFactoryBase> temp(iFactory.release());
+      registerFactoryWithKey(
+          eventsetup::EventSetupRecordKey::makeKey<typename TFactory::record_type>(), std::move(temp), iLabel);
+    }
 
-};
+    virtual void registerFactoryWithKey(const eventsetup::EventSetupRecordKey& iRecord,
+                                        std::unique_ptr<eventsetup::ProxyFactoryBase> iFactory,
+                                        const std::string& iLabel = std::string());
+
+  private:
+    ESProxyFactoryProducer(const ESProxyFactoryProducer&) = delete;  // stop default
+
+    const ESProxyFactoryProducer& operator=(const ESProxyFactoryProducer&) = delete;  // stop default
+
+    // ---------- member data --------------------------------
+    std::multimap<eventsetup::EventSetupRecordKey, eventsetup::FactoryInfo> record2Factories_;
+  };
 
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/ESRecordsToProxyIndices.h b/FWCore/Framework/interface/ESRecordsToProxyIndices.h
new file mode 100644
index 0000000000000..e527380f46c13
--- /dev/null
+++ b/FWCore/Framework/interface/ESRecordsToProxyIndices.h
@@ -0,0 +1,71 @@
+#ifndef FWCore_Framework_ESRecordsToProxyIndices_h
+#define FWCore_Framework_ESRecordsToProxyIndices_h
+// -*- C++ -*-
+//
+// Package:     Framework
+// Class  :     ESRecordsToProxyIndices
+//
+/**\class ESRecordsToProxyIndices ESRecordsToProxyIndices.h FWCore/Framework/interface/ESRecordsToProxyIndices.h
+
+ Description: Key used to identify data within a EventSetupRecord
+
+ Usage:
+    <usage>
+
+*/
+//
+// Author:      Chris Jones
+// Created:     Tues Feb 12 14:31:03 EST 2019
+//
+
+// system include files
+#include <limits>
+
+// user include files
+#include "FWCore/Framework/interface/DataKey.h"
+#include "FWCore/Framework/interface/EventSetupRecordKey.h"
+#include "FWCore/Utilities/interface/ESIndices.h"
+
+#include <vector>
+// forward declarations
+namespace edm::eventsetup {
+  struct ComponentDescription;
+
+  class ESRecordsToProxyIndices {
+  public:
+    ESRecordsToProxyIndices(std::vector<EventSetupRecordKey> iRecords);
+
+    // ---------- const member functions ---------------------
+    ///If the index is not found, returns missingProxyIndex()
+    ESProxyIndex indexInRecord(EventSetupRecordKey const& iRK, DataKey const& iDK) const noexcept;
+
+    ComponentDescription const* component(EventSetupRecordKey const& iRK, DataKey const& iDK) const noexcept;
+
+    static constexpr ESProxyIndex missingProxyIndex() noexcept { return ESProxyIndex{std::numeric_limits<int>::max()}; }
+    static constexpr ESRecordIndex missingRecordIndex() noexcept {
+      return ESRecordIndex{std::numeric_limits<int>::max()};
+    }
+
+    ESRecordIndex recordIndexFor(EventSetupRecordKey const& iRK) const noexcept;
+    // ---------- member functions ---------------------------
+    ///This should be called for all records in the list passed to the constructor and
+    /// in the same order as the list.
+    unsigned int dataKeysInRecord(unsigned int iRecordIndex,
+                                  EventSetupRecordKey const& iRecord,
+                                  std::vector<DataKey> const& iDataKeys,
+                                  std::vector<ComponentDescription const*> const& iComponents);
+
+  private:
+    // ---------- member data --------------------------------
+    std::vector<EventSetupRecordKey> recordKeys_;
+    //for each item in recordKeys_ this holds the index to the first
+    // DataKey for that item in dataKeys_
+    // recordOffset_ is 1 size larger than recordKeys_ with the
+    // last entry being dataKeys_.size()
+    std::vector<unsigned int> recordOffsets_;
+    std::vector<DataKey> dataKeys_;
+    std::vector<ComponentDescription const*> components_;
+  };
+
+}  // namespace edm::eventsetup
+#endif
diff --git a/FWCore/Framework/interface/ESTransientHandle.h b/FWCore/Framework/interface/ESTransientHandle.h
index 2e7a47fef46dc..9f04146b8174d 100644
--- a/FWCore/Framework/interface/ESTransientHandle.h
+++ b/FWCore/Framework/interface/ESTransientHandle.h
@@ -35,34 +35,33 @@ the end of the actual IOV for the data.  In this way the system can claim back s
 // forward declarations
 namespace edm {
 
-class ESHandleExceptionFactory;
+  class ESHandleExceptionFactory;
 
-template<typename T>
-class ESTransientHandle : public ESHandleBase {
-   public:
-      typedef T value_type;
+  template <typename T>
+  class ESTransientHandle : public ESHandleBase {
+  public:
+    typedef T value_type;
 
-      ESTransientHandle() : ESHandleBase() {}
-      ESTransientHandle(T const* iData) : ESHandleBase(iData, 0) {}
-      ESTransientHandle(T const* iData, edm::eventsetup::ComponentDescription const* desc) : ESHandleBase(iData, desc) {}
-      ESTransientHandle(std::shared_ptr<ESHandleExceptionFactory> &&);
+    ESTransientHandle() : ESHandleBase() {}
+    ESTransientHandle(T const* iData) : ESHandleBase(iData, 0) {}
+    ESTransientHandle(T const* iData, edm::eventsetup::ComponentDescription const* desc) : ESHandleBase(iData, desc) {}
+    ESTransientHandle(std::shared_ptr<ESHandleExceptionFactory>&&);
 
-      // ---------- const member functions ---------------------
-      T const* product() const { return static_cast<T const *>(productStorage()); }
-      T const* operator->() const { return product(); }
-      T const& operator*() const { return *product(); }
-      // ---------- static member functions --------------------
-      static constexpr bool transientAccessOnly = true;
+    // ---------- const member functions ---------------------
+    T const* product() const { return static_cast<T const*>(productStorage()); }
+    T const* operator->() const { return product(); }
+    T const& operator*() const { return *product(); }
+    // ---------- static member functions --------------------
+    static constexpr bool transientAccessOnly = true;
 
-      // ---------- member functions ---------------------------
+    // ---------- member functions ---------------------------
 
-   private:
-};
+  private:
+  };
 
-template <class T>
-ESTransientHandle<T>::ESTransientHandle(std::shared_ptr<edm::ESHandleExceptionFactory> && iWhyFailed) :
-  ESHandleBase(std::move(iWhyFailed))
-{ }
+  template <class T>
+  ESTransientHandle<T>::ESTransientHandle(std::shared_ptr<edm::ESHandleExceptionFactory>&& iWhyFailed)
+      : ESHandleBase(std::move(iWhyFailed)) {}
 
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ESValidHandle.h b/FWCore/Framework/interface/ESValidHandle.h
index 80ca2aa436c91..ce935d7f8e1bf 100644
--- a/FWCore/Framework/interface/ESValidHandle.h
+++ b/FWCore/Framework/interface/ESValidHandle.h
@@ -33,46 +33,43 @@ namespace edm {
     void throwIfNotValid(const void*) noexcept(false);
   }
 
-template<typename T>
-class ESValidHandle {
-   public:
-      typedef T value_type;
-
-      ESValidHandle() = delete;
-      ESValidHandle(T const& iData, edm::eventsetup::ComponentDescription const* desc) noexcept :
-      data_{&iData},
-      description_{desc} {}
-
-      ESValidHandle(ESValidHandle<T> const&) = default;
-      ESValidHandle(ESValidHandle<T>&&) = default;
-      ESValidHandle& operator=(ESValidHandle<T> const&) = default;
-      ESValidHandle& operator=(ESValidHandle<T>&&) = default;
-
-      // ---------- const member functions ---------------------
-      T const* product() const noexcept { return data_; }
-      T const* operator->() const noexcept { return product(); }
-      T const& operator*() const noexcept { return *product(); }
-      // ---------- static member functions --------------------
-      static constexpr bool transientAccessOnly = false;
-
-      // ---------- member functions ---------------------------
-   private:
-      T const* data_{nullptr};
-      edm::eventsetup::ComponentDescription const* description_{nullptr};
-
-};
+  template <typename T>
+  class ESValidHandle {
+  public:
+    typedef T value_type;
+
+    ESValidHandle() = delete;
+    ESValidHandle(T const& iData, edm::eventsetup::ComponentDescription const* desc) noexcept
+        : data_{&iData}, description_{desc} {}
+
+    ESValidHandle(ESValidHandle<T> const&) = default;
+    ESValidHandle(ESValidHandle<T>&&) = default;
+    ESValidHandle& operator=(ESValidHandle<T> const&) = default;
+    ESValidHandle& operator=(ESValidHandle<T>&&) = default;
+
+    // ---------- const member functions ---------------------
+    T const* product() const noexcept { return data_; }
+    T const* operator->() const noexcept { return product(); }
+    T const& operator*() const noexcept { return *product(); }
+    // ---------- static member functions --------------------
+    static constexpr bool transientAccessOnly = false;
+
+    // ---------- member functions ---------------------------
+  private:
+    T const* data_{nullptr};
+    edm::eventsetup::ComponentDescription const* description_{nullptr};
+  };
 
   /** Take a handle (e.g. edm::ESHandle<T>) and
    create a edm::ESValidHandle<T>. If the argument is an invalid handle,
    an exception will be thrown.
    */
-  template<typename U>
-  auto
-  makeESValid(const U& iOtherHandleType) noexcept(false) {
+  template <typename U>
+  auto makeESValid(const U& iOtherHandleType) noexcept(false) {
     esvhhelper::throwIfNotValid(iOtherHandleType.product());
     //because of the check, we know this is valid and do not have to check again
     return ESValidHandle<typename U::value_type>(*iOtherHandleType.product(), iOtherHandleType.description());
   }
 
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ESWatcher.h b/FWCore/Framework/interface/ESWatcher.h
index f53046153ec13..6b57ec1a28739 100644
--- a/FWCore/Framework/interface/ESWatcher.h
+++ b/FWCore/Framework/interface/ESWatcher.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     ESWatcher
-// 
+//
 /**\class ESWatcher ESWatcher.h FWCore/Framework/interface/ESWatcher.h
 
  Description: Watches an EventSetup Record and reports when it changes
@@ -28,50 +28,46 @@
 
 namespace edm {
   template <class T>
-  class ESWatcher
-  {
-
-   public:
-    
+  class ESWatcher {
+  public:
     struct NullFunction {
-      void operator()(const T& ) {}
+      void operator()(const T&) {}
     };
-    
-    ESWatcher() :callback_(NullFunction()), cacheId_(0) {}
-    
+
+    ESWatcher() : callback_(NullFunction()), cacheId_(0) {}
+
     template <class TFunc>
-    ESWatcher(TFunc iFunctor):callback_(iFunctor),cacheId_(0) {}
-    
+    ESWatcher(TFunc iFunctor) : callback_(iFunctor), cacheId_(0) {}
+
     template <class TObj, class TMemFunc>
-    ESWatcher(TObj const& iObj, TMemFunc iFunc):
-    callback_(std::bind(iFunc,iObj,std::placeholders::_1)),
-    cacheId_(0)
-     {}
-      //virtual ~ESWatcher();
-
-      // ---------- const member functions ---------------------
-    
-      // ---------- static member functions --------------------
-
-      // ---------- member functions ---------------------------
-      bool check(const edm::EventSetup& iSetup) {
-        const T& record = iSetup.template get<T>();
-        bool result = cacheId_ != record.cacheIdentifier();
-        if(result) {
-          callback_(record);
-        }
-        cacheId_ = record.cacheIdentifier();
-        return result;
+    ESWatcher(TObj const& iObj, TMemFunc iFunc)
+        : callback_(std::bind(iFunc, iObj, std::placeholders::_1)), cacheId_(0) {}
+    //virtual ~ESWatcher();
+
+    // ---------- const member functions ---------------------
+
+    // ---------- static member functions --------------------
+
+    // ---------- member functions ---------------------------
+    bool check(const edm::EventSetup& iSetup) {
+      const T& record = iSetup.template get<T>();
+      bool result = cacheId_ != record.cacheIdentifier();
+      if (result) {
+        callback_(record);
       }
-   private:
-      ESWatcher(const ESWatcher&) = delete; // stop default
+      cacheId_ = record.cacheIdentifier();
+      return result;
+    }
+
+  private:
+    ESWatcher(const ESWatcher&) = delete;  // stop default
 
-      const ESWatcher& operator=(const ESWatcher&) = delete; // stop default
+    const ESWatcher& operator=(const ESWatcher&) = delete;  // stop default
 
-      // ---------- member data --------------------------------
-      std::function<void (const T&)> callback_;
-      unsigned long long cacheId_;
-};
-}
+    // ---------- member data --------------------------------
+    std::function<void(const T&)> callback_;
+    unsigned long long cacheId_;
+  };
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/Event.h b/FWCore/Framework/interface/Event.h
index 76a1d08acf83f..6d611c6ab952f 100644
--- a/FWCore/Framework/interface/Event.h
+++ b/FWCore/Framework/interface/Event.h
@@ -64,22 +64,21 @@ namespace edm {
   class SharedResourcesAcquirer;
 
   namespace stream {
-    template< typename T> class ProducingModuleAdaptorBase;
+    template <typename T>
+    class ProducingModuleAdaptorBase;
   }
 
   class Event : public EventBase {
   public:
-    Event(EventPrincipal const& ep, ModuleDescription const& md,
-          ModuleCallingContext const*);
+    Event(EventPrincipal const& ep, ModuleDescription const& md, ModuleCallingContext const*);
     ~Event() override;
 
     //Used in conjunction with EDGetToken
     void setConsumer(EDConsumerBase const* iConsumer);
 
-    void setSharedResourcesAcquirer( SharedResourcesAcquirer* iResourceAcquirer);
+    void setSharedResourcesAcquirer(SharedResourcesAcquirer* iResourceAcquirer);
 
-    void setProducerCommon(ProducerBase const* iProd,
-                           std::vector<BranchID>* previousParentage);
+    void setProducerCommon(ProducerBase const* iProd, std::vector<BranchID>* previousParentage);
 
     void setProducer(ProducerBase const* iProd,
                      std::vector<BranchID>* previousParentage,
@@ -90,23 +89,16 @@ namespace edm {
                                std::vector<BranchID>& gotBranchIDsFromAcquire);
 
     // AUX functions are defined in EventBase
-    EventAuxiliary const& eventAuxiliary() const override {return aux_;}
+    EventAuxiliary const& eventAuxiliary() const override { return aux_; }
 
     ///\return The id for the particular Stream processing the Event
-    StreamID streamID() const {
-      return streamID_;
-    }
+    StreamID streamID() const { return streamID_; }
 
-    LuminosityBlock const&
-    getLuminosityBlock() const {
-      return *luminosityBlock_;
-    }
+    LuminosityBlock const& getLuminosityBlock() const { return *luminosityBlock_; }
 
-    Run const&
-    getRun() const;
+    Run const& getRun() const;
 
-    RunNumber_t
-    run() const {return id().run();}
+    RunNumber_t run() const { return id().run(); }
 
     /**If you are caching data from the Event, you should also keep
      this number.  If this number changes then you know that
@@ -115,165 +107,131 @@ namespace edm {
      denote that you have not yet checked the value.
      */
     typedef unsigned long CacheIdentifier_t;
-    CacheIdentifier_t
-    cacheIdentifier() const;
+    CacheIdentifier_t cacheIdentifier() const;
 
-    template<typename PROD>
-    bool
-    get(ProductID const& oid, Handle<PROD>& result) const;
+    template <typename PROD>
+    bool get(ProductID const& oid, Handle<PROD>& result) const;
 
     // Template member overload to deal with Views.
-    template<typename ELEMENT>
-    bool
-    get(ProductID const& oid, Handle<View<ELEMENT> >& result) const ;
+    template <typename ELEMENT>
+    bool get(ProductID const& oid, Handle<View<ELEMENT>>& result) const;
 
     EventSelectionIDVector const& eventSelectionIDs() const;
 
     ProcessHistoryID const& processHistoryID() const;
 
     ///Put a new product.
-    template<typename PROD>
-    OrphanHandle<PROD>
-    put(std::unique_ptr<PROD> product) {return put<PROD>(std::move(product), std::string());}
+    template <typename PROD>
+    OrphanHandle<PROD> put(std::unique_ptr<PROD> product) {
+      return put<PROD>(std::move(product), std::string());
+    }
 
     ///Put a new product with a 'product instance name'
-    template<typename PROD>
-    OrphanHandle<PROD>
-    put(std::unique_ptr<PROD> product, std::string const& productInstanceName);
+    template <typename PROD>
+    OrphanHandle<PROD> put(std::unique_ptr<PROD> product, std::string const& productInstanceName);
 
-    template<typename PROD>
-    OrphanHandle<PROD>
-    put(EDPutToken token, std::unique_ptr<PROD> product);
+    template <typename PROD>
+    OrphanHandle<PROD> put(EDPutToken token, std::unique_ptr<PROD> product);
 
-    template<typename PROD>
-    OrphanHandle<PROD>
-    put(EDPutTokenT<PROD> token, std::unique_ptr<PROD> product);
+    template <typename PROD>
+    OrphanHandle<PROD> put(EDPutTokenT<PROD> token, std::unique_ptr<PROD> product);
 
     ///puts a new product
-    template<typename PROD, typename... Args>
-    OrphanHandle<PROD>
-    emplace(EDPutTokenT<PROD> token, Args&&... args);
-
-    template<typename PROD, typename... Args>
-    OrphanHandle<PROD>
-    emplace(EDPutToken token, Args&&... args);
+    template <typename PROD, typename... Args>
+    OrphanHandle<PROD> emplace(EDPutTokenT<PROD> token, Args&&... args);
 
+    template <typename PROD, typename... Args>
+    OrphanHandle<PROD> emplace(EDPutToken token, Args&&... args);
 
     ///Returns a RefProd to a product before that product has been placed into the Event.
     /// The RefProd (and any Ref's made from it) will no work properly until after the
     /// Event has been committed (which happens after leaving the EDProducer::produce method)
-    template<typename PROD>
-    RefProd<PROD>
-    getRefBeforePut() {return getRefBeforePut<PROD>(std::string());}
+    template <typename PROD>
+    RefProd<PROD> getRefBeforePut() {
+      return getRefBeforePut<PROD>(std::string());
+    }
 
-    template<typename PROD>
-    RefProd<PROD>
-    getRefBeforePut(std::string const& productInstanceName);
+    template <typename PROD>
+    RefProd<PROD> getRefBeforePut(std::string const& productInstanceName);
 
-    template<typename PROD>
-    RefProd<PROD>
-    getRefBeforePut(EDPutTokenT<PROD>);
+    template <typename PROD>
+    RefProd<PROD> getRefBeforePut(EDPutTokenT<PROD>);
 
-    template<typename PROD>
-    RefProd<PROD>
-    getRefBeforePut(EDPutToken);
+    template <typename PROD>
+    RefProd<PROD> getRefBeforePut(EDPutToken);
 
-    template<typename PROD>
-    bool
-    getByLabel(InputTag const& tag, Handle<PROD>& result) const;
+    template <typename PROD>
+    bool getByLabel(InputTag const& tag, Handle<PROD>& result) const;
 
-    template<typename PROD>
-    bool
-    getByLabel(std::string const& label, Handle<PROD>& result) const;
+    template <typename PROD>
+    bool getByLabel(std::string const& label, Handle<PROD>& result) const;
 
-    template<typename PROD>
-    bool
-    getByLabel(std::string const& label, std::string const& productInstanceName, Handle<PROD>& result) const;
+    template <typename PROD>
+    bool getByLabel(std::string const& label, std::string const& productInstanceName, Handle<PROD>& result) const;
 
-    template<typename PROD>
-    void
-    getManyByType(std::vector<Handle<PROD> >& results) const;
+    template <typename PROD>
+    void getManyByType(std::vector<Handle<PROD>>& results) const;
 
-    template<typename PROD>
-    bool
-    getByToken(EDGetToken token, Handle<PROD>& result) const;
+    template <typename PROD>
+    bool getByToken(EDGetToken token, Handle<PROD>& result) const;
 
-    template<typename PROD>
-    bool
-    getByToken(EDGetTokenT<PROD> token, Handle<PROD>& result) const;
+    template <typename PROD>
+    bool getByToken(EDGetTokenT<PROD> token, Handle<PROD>& result) const;
 
-    template<typename PROD>
-    Handle<PROD>
-    getHandle(EDGetTokenT<PROD> token) const;
+    template <typename PROD>
+    Handle<PROD> getHandle(EDGetTokenT<PROD> token) const;
 
-    template<typename PROD>
-    PROD const &
-    get(EDGetTokenT<PROD> token) const noexcept(false);
+    template <typename PROD>
+    PROD const& get(EDGetTokenT<PROD> token) const noexcept(false);
 
     // Template member overload to deal with Views.
-    template<typename ELEMENT>
-    bool
-    getByLabel(std::string const& label,
-               Handle<View<ELEMENT> >& result) const;
+    template <typename ELEMENT>
+    bool getByLabel(std::string const& label, Handle<View<ELEMENT>>& result) const;
 
-    template<typename ELEMENT>
-    bool
-    getByLabel(std::string const& label,
-               std::string const& productInstanceName,
-               Handle<View<ELEMENT> >& result) const;
+    template <typename ELEMENT>
+    bool getByLabel(std::string const& label,
+                    std::string const& productInstanceName,
+                    Handle<View<ELEMENT>>& result) const;
 
-    template<typename ELEMENT>
-    bool
-    getByLabel(InputTag const& tag, Handle<View<ELEMENT> >& result) const;
+    template <typename ELEMENT>
+    bool getByLabel(InputTag const& tag, Handle<View<ELEMENT>>& result) const;
 
-    template<typename ELEMENT>
-    bool
-    getByToken(EDGetToken token, Handle<View<ELEMENT>>& result) const;
+    template <typename ELEMENT>
+    bool getByToken(EDGetToken token, Handle<View<ELEMENT>>& result) const;
 
-    template<typename ELEMENT>
-    bool
-    getByToken(EDGetTokenT<View<ELEMENT>> token, Handle<View<ELEMENT>>& result) const;
+    template <typename ELEMENT>
+    bool getByToken(EDGetTokenT<View<ELEMENT>> token, Handle<View<ELEMENT>>& result) const;
 
-    template<typename ELEMENT>
-    Handle<View<ELEMENT>>
-    getHandle(EDGetTokenT<View<ELEMENT>> token) const;
+    template <typename ELEMENT>
+    Handle<View<ELEMENT>> getHandle(EDGetTokenT<View<ELEMENT>> token) const;
 
-    template<typename ELEMENT>
-    View<ELEMENT> const &
-    get(EDGetTokenT<View<ELEMENT>> token) const noexcept(false);
+    template <typename ELEMENT>
+    View<ELEMENT> const& get(EDGetTokenT<View<ELEMENT>> token) const noexcept(false);
 
-    template<typename ELEMENT>
-    Handle<View<ELEMENT> >
-    fillView_(BasicHandle& bh) const;
+    template <typename ELEMENT>
+    Handle<View<ELEMENT>> fillView_(BasicHandle& bh) const;
 
-    Provenance
-    getProvenance(BranchID const& theID) const;
+    Provenance getProvenance(BranchID const& theID) const;
 
-    Provenance
-    getProvenance(ProductID const& theID) const;
+    Provenance getProvenance(ProductID const& theID) const;
 
     // Get the provenance for all products that may be in the event
-    void
-    getAllProvenance(std::vector<Provenance const*>& provenances) const;
+    void getAllProvenance(std::vector<Provenance const*>& provenances) const;
 
     // Get the provenance for all products that may be in the event,
     // excluding the per-event provenance (the parentage information).
     // The excluded information may change from event to event.
-    void
-    getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const;
+    void getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const;
 
     // Return true if this Event has been subjected to a process with
     // the given processName, and false otherwise.
     // If true is returned, then ps is filled with the ParameterSet
     // used to configure the identified process.
-    bool
-    getProcessParameterSet(std::string const& processName, ParameterSet& ps) const;
+    bool getProcessParameterSet(std::string const& processName, ParameterSet& ps) const;
 
-    ProcessHistory const&
-    processHistory() const override;
+    ProcessHistory const& processHistory() const override;
 
-    edm::ParameterSet const*
-    parameterSet(edm::ParameterSetID const& psID) const override;
+    edm::ParameterSet const* parameterSet(edm::ParameterSetID const& psID) const override;
 
     size_t size() const;
 
@@ -282,37 +240,36 @@ namespace edm {
 
     ModuleCallingContext const* moduleCallingContext() const { return moduleCallingContext_; }
 
-    void labelsForToken(EDGetToken const& iToken, ProductLabels& oLabels) const { provRecorder_.labelsForToken(iToken, oLabels); }
+    void labelsForToken(EDGetToken const& iToken, ProductLabels& oLabels) const {
+      provRecorder_.labelsForToken(iToken, oLabels);
+    }
 
     typedef std::vector<edm::propagate_const<std::unique_ptr<WrapperBase>>> ProductPtrVec;
 
-    EDProductGetter const&
-    productGetter() const;
+    EDProductGetter const& productGetter() const;
 
   private:
     //for testing
     friend class ::testEventGetRefBeforePut;
     friend class ::testEvent;
-    
-    EventPrincipal const&
-    eventPrincipal() const;
 
-    ProductID
-    makeProductID(BranchDescription const& desc) const;
+    EventPrincipal const& eventPrincipal() const;
+
+    ProductID makeProductID(BranchDescription const& desc) const;
 
     //override used by EventBase class
-    BasicHandle getByLabelImpl(std::type_info const& iWrapperType, std::type_info const& iProductType, InputTag const& iTag) const override;
+    BasicHandle getByLabelImpl(std::type_info const& iWrapperType,
+                               std::type_info const& iProductType,
+                               InputTag const& iTag) const override;
 
     //override used by EventBase class
     BasicHandle getImpl(std::type_info const& iProductType, ProductID const& pid) const override;
 
-    template<typename PROD>
-    OrphanHandle<PROD>
-    putImpl(EDPutToken::value_type token, std::unique_ptr<PROD> product);
+    template <typename PROD>
+    OrphanHandle<PROD> putImpl(EDPutToken::value_type token, std::unique_ptr<PROD> product);
 
-    template<typename PROD, typename... Args>
-    OrphanHandle<PROD>
-    emplaceImpl(EDPutToken::value_type token, Args&&... args);
+    template <typename PROD, typename... Args>
+    OrphanHandle<PROD> emplaceImpl(EDPutToken::value_type token, Args&&... args);
 
     // commit_() is called to complete the transaction represented by
     // this PrincipalGetAdapter. The friendships required seems gross, but any
@@ -322,16 +279,16 @@ namespace edm {
     friend class InputSource;
     friend class RawInputSource;
     friend class ProducerBase;
-    template<typename T> friend class stream::ProducingModuleAdaptorBase;
+    template <typename T>
+    friend class stream::ProducingModuleAdaptorBase;
 
     void commit_(std::vector<edm::ProductResolverIndex> const& iShouldPut, ParentageID* previousParentageId = nullptr);
     void commit_aux(ProductPtrVec& products, ParentageID* previousParentageId = nullptr);
 
-    BasicHandle
-    getByProductID_(ProductID const& oid) const;
+    BasicHandle getByProductID_(ProductID const& oid) const;
 
-    ProductPtrVec& putProducts() {return putProducts_;}
-    ProductPtrVec const& putProducts() const {return putProducts_;}
+    ProductPtrVec& putProducts() { return putProducts_; }
+    ProductPtrVec const& putProducts() const { return putProducts_; }
 
     PrincipalGetAdapter provRecorder_;
 
@@ -357,7 +314,7 @@ namespace edm {
     void addToGotBranchIDs(BranchID const& branchID) const;
 
     // We own the retrieved Views, and have to destroy them.
-    mutable std::vector<std::shared_ptr<ViewBase> > gotViews_;
+    mutable std::vector<std::shared_ptr<ViewBase>> gotViews_;
 
     StreamID streamID_;
     ModuleCallingContext const* moduleCallingContext_;
@@ -365,375 +322,333 @@ namespace edm {
     static const std::string emptyString_;
   };
 
-  template<typename PROD>
-  bool
-  Event::get(ProductID const& oid, Handle<PROD>& result) const {
+  template <typename PROD>
+  bool Event::get(ProductID const& oid, Handle<PROD>& result) const {
     result.clear();
     BasicHandle bh = this->getByProductID_(oid);
     result = convert_handle_check_type<PROD>(std::move(bh));  // throws on conversion error
-    if(result.failedToGet()) {
+    if (result.failedToGet()) {
       return false;
     }
     addToGotBranchIDs(*bh.provenance());
     return true;
   }
 
-  template<typename ELEMENT>
-  bool
-  Event::get(ProductID const& oid, Handle<View<ELEMENT> >& result) const {
-      result.clear();
-      BasicHandle bh = this->getByProductID_(oid);
-
-      if(bh.failedToGet()) {
-          result = Handle<View<ELEMENT> >(makeHandleExceptionFactory([oid]()->std::shared_ptr<cms::Exception> {
-            std::shared_ptr<cms::Exception> whyFailed = std::make_shared<edm::Exception>(edm::errors::ProductNotFound);
-            *whyFailed
-            << "get View by ID failed: no product with ID = " << oid <<"\n";
-            return whyFailed;
-          }));
-          return false;
-      }
+  template <typename ELEMENT>
+  bool Event::get(ProductID const& oid, Handle<View<ELEMENT>>& result) const {
+    result.clear();
+    BasicHandle bh = this->getByProductID_(oid);
+
+    if (bh.failedToGet()) {
+      result = Handle<View<ELEMENT>>(makeHandleExceptionFactory([oid]() -> std::shared_ptr<cms::Exception> {
+        std::shared_ptr<cms::Exception> whyFailed = std::make_shared<edm::Exception>(edm::errors::ProductNotFound);
+        *whyFailed << "get View by ID failed: no product with ID = " << oid << "\n";
+        return whyFailed;
+      }));
+      return false;
+    }
 
-      result = fillView_<ELEMENT>(bh);
-      return true;
+    result = fillView_<ELEMENT>(bh);
+    return true;
   }
 
-  template<typename PROD>
-  OrphanHandle<PROD>
-  Event::putImpl(EDPutToken::value_type index, std::unique_ptr<PROD> product) {
+  template <typename PROD>
+  OrphanHandle<PROD> Event::putImpl(EDPutToken::value_type index, std::unique_ptr<PROD> product) {
     // The following will call post_insert if T has such a function,
     // and do nothing if T has no such function.
-    std::conditional_t<detail::has_postinsert<PROD>::value,
-    DoPostInsert<PROD>,
-    DoNotPostInsert<PROD>> maybe_inserter;
+    std::conditional_t<detail::has_postinsert<PROD>::value, DoPostInsert<PROD>, DoNotPostInsert<PROD>> maybe_inserter;
     maybe_inserter(product.get());
-    
+
     assert(index < putProducts().size());
-    
-    std::unique_ptr<Wrapper<PROD> > wp(new Wrapper<PROD>(std::move(product)));
+
+    std::unique_ptr<Wrapper<PROD>> wp(new Wrapper<PROD>(std::move(product)));
     PROD const* prod = wp->product();
-    
-    putProducts()[index]=std::move(wp);
+
+    putProducts()[index] = std::move(wp);
     auto const& prodID = provRecorder_.getProductID(index);
-    return(OrphanHandle<PROD>(prod, prodID));
+    return (OrphanHandle<PROD>(prod, prodID));
   }
 
-  template<typename PROD>
-  OrphanHandle<PROD>
-  Event::put(std::unique_ptr<PROD> product, std::string const& productInstanceName) {
-    if(UNLIKELY(product.get() == nullptr)) {                // null pointer is illegal
+  template <typename PROD>
+  OrphanHandle<PROD> Event::put(std::unique_ptr<PROD> product, std::string const& productInstanceName) {
+    if (UNLIKELY(product.get() == nullptr)) {  // null pointer is illegal
       TypeID typeID(typeid(PROD));
       principal_get_adapter_detail::throwOnPutOfNullProduct("Event", typeID, productInstanceName);
     }
 
-    auto index =
-      provRecorder_.getPutTokenIndex(TypeID(*product), productInstanceName);
+    auto index = provRecorder_.getPutTokenIndex(TypeID(*product), productInstanceName);
     return putImpl(index, std::move(product));
   }
 
-  template<typename PROD>
-  OrphanHandle<PROD>
-  Event::put(EDPutTokenT<PROD> token, std::unique_ptr<PROD> product) {
-    if(UNLIKELY(product.get() == 0)) {                // null pointer is illegal
+  template <typename PROD>
+  OrphanHandle<PROD> Event::put(EDPutTokenT<PROD> token, std::unique_ptr<PROD> product) {
+    if (UNLIKELY(product.get() == 0)) {  // null pointer is illegal
       TypeID typeID(typeid(PROD));
       principal_get_adapter_detail::throwOnPutOfNullProduct("Event", typeID, provRecorder_.productInstanceLabel(token));
     }
-    if(UNLIKELY(token.isUninitialized())) {
+    if (UNLIKELY(token.isUninitialized())) {
       principal_get_adapter_detail::throwOnPutOfUninitializedToken("Event", typeid(PROD));
     }
-    return putImpl(token.index(),std::move(product));
+    return putImpl(token.index(), std::move(product));
   }
 
-  template<typename PROD>
-  OrphanHandle<PROD>
-  Event::put(EDPutToken token, std::unique_ptr<PROD> product) {
-    if(UNLIKELY(product.get() == 0)) {                // null pointer is illegal
+  template <typename PROD>
+  OrphanHandle<PROD> Event::put(EDPutToken token, std::unique_ptr<PROD> product) {
+    if (UNLIKELY(product.get() == 0)) {  // null pointer is illegal
       TypeID typeID(typeid(PROD));
       principal_get_adapter_detail::throwOnPutOfNullProduct("Event", typeID, provRecorder_.productInstanceLabel(token));
     }
-    if(UNLIKELY(token.isUninitialized())) {
+    if (UNLIKELY(token.isUninitialized())) {
       principal_get_adapter_detail::throwOnPutOfUninitializedToken("Event", typeid(PROD));
     }
-    if(UNLIKELY(provRecorder_.getTypeIDForPutTokenIndex(token.index()) != TypeID{typeid(PROD)})) {
-      principal_get_adapter_detail::throwOnPutOfWrongType(typeid(PROD), provRecorder_.getTypeIDForPutTokenIndex(token.index()));
+    if (UNLIKELY(provRecorder_.getTypeIDForPutTokenIndex(token.index()) != TypeID{typeid(PROD)})) {
+      principal_get_adapter_detail::throwOnPutOfWrongType(typeid(PROD),
+                                                          provRecorder_.getTypeIDForPutTokenIndex(token.index()));
     }
 
-    return putImpl(token.index(),std::move(product));
+    return putImpl(token.index(), std::move(product));
   }
 
-  template<typename PROD, typename... Args>
-  OrphanHandle<PROD>
-  Event::emplace(EDPutTokenT<PROD> token, Args&&... args) {
-    if(UNLIKELY(token.isUninitialized())) {
+  template <typename PROD, typename... Args>
+  OrphanHandle<PROD> Event::emplace(EDPutTokenT<PROD> token, Args&&... args) {
+    if (UNLIKELY(token.isUninitialized())) {
       principal_get_adapter_detail::throwOnPutOfUninitializedToken("Event", typeid(PROD));
     }
-    return emplaceImpl<PROD>(token.index(),std::forward<Args>(args)...);
+    return emplaceImpl<PROD>(token.index(), std::forward<Args>(args)...);
   }
 
-  template<typename PROD, typename... Args>
-  OrphanHandle<PROD>
-  Event::emplace(EDPutToken token, Args&&... args) {
-    if(UNLIKELY(token.isUninitialized())) {
+  template <typename PROD, typename... Args>
+  OrphanHandle<PROD> Event::emplace(EDPutToken token, Args&&... args) {
+    if (UNLIKELY(token.isUninitialized())) {
       principal_get_adapter_detail::throwOnPutOfUninitializedToken("Event", typeid(PROD));
     }
-    if(UNLIKELY(provRecorder_.getTypeIDForPutTokenIndex(token.index()) != TypeID{typeid(PROD)})) {
-      principal_get_adapter_detail::throwOnPutOfWrongType(typeid(PROD), provRecorder_.getTypeIDForPutTokenIndex(token.index()));
+    if (UNLIKELY(provRecorder_.getTypeIDForPutTokenIndex(token.index()) != TypeID{typeid(PROD)})) {
+      principal_get_adapter_detail::throwOnPutOfWrongType(typeid(PROD),
+                                                          provRecorder_.getTypeIDForPutTokenIndex(token.index()));
     }
-    
-    return emplaceImpl(token.index(),std::forward<Args>(args)...);
+
+    return emplaceImpl(token.index(), std::forward<Args>(args)...);
   }
 
-  template<typename PROD, typename... Args>
-  OrphanHandle<PROD>
-  Event::emplaceImpl(EDPutToken::value_type index, Args&&... args) {
-    
+  template <typename PROD, typename... Args>
+  OrphanHandle<PROD> Event::emplaceImpl(EDPutToken::value_type index, Args&&... args) {
     assert(index < putProducts().size());
-    
-    std::unique_ptr<Wrapper<PROD> > wp(new Wrapper<PROD>(WrapperBase::Emplace{}, std::forward<Args>(args)...));
+
+    std::unique_ptr<Wrapper<PROD>> wp(new Wrapper<PROD>(WrapperBase::Emplace{}, std::forward<Args>(args)...));
 
     // The following will call post_insert if T has such a function,
     // and do nothing if T has no such function.
-    std::conditional_t<detail::has_postinsert<PROD>::value,
-    DoPostInsert<PROD>,
-    DoNotPostInsert<PROD>> maybe_inserter;
+    std::conditional_t<detail::has_postinsert<PROD>::value, DoPostInsert<PROD>, DoNotPostInsert<PROD>> maybe_inserter;
     maybe_inserter(&(wp->bareProduct()));
 
     PROD const* prod = wp->product();
-    
-    putProducts()[index]=std::move(wp);
+
+    putProducts()[index] = std::move(wp);
     auto const& prodID = provRecorder_.getProductID(index);
-    return(OrphanHandle<PROD>(prod, prodID));
+    return (OrphanHandle<PROD>(prod, prodID));
   }
 
-  
-  template<typename PROD>
-  RefProd<PROD>
-  Event::getRefBeforePut(std::string const& productInstanceName) {
-    auto index =
-    provRecorder_.getPutTokenIndex(TypeID{typeid(PROD)},
-                                   productInstanceName);
+  template <typename PROD>
+  RefProd<PROD> Event::getRefBeforePut(std::string const& productInstanceName) {
+    auto index = provRecorder_.getPutTokenIndex(TypeID{typeid(PROD)}, productInstanceName);
 
     //should keep track of what Ref's have been requested and make sure they are 'put'
-    return RefProd<PROD>(provRecorder_.getProductID(index),
-                         provRecorder_.prodGetter());
+    return RefProd<PROD>(provRecorder_.getProductID(index), provRecorder_.prodGetter());
   }
 
-  template<typename PROD>
-  RefProd<PROD>
-  Event::getRefBeforePut(EDPutTokenT<PROD> token)
-  {
-    if(UNLIKELY(token.isUninitialized())) {
+  template <typename PROD>
+  RefProd<PROD> Event::getRefBeforePut(EDPutTokenT<PROD> token) {
+    if (UNLIKELY(token.isUninitialized())) {
       principal_get_adapter_detail::throwOnPutOfUninitializedToken("Event", typeid(PROD));
     }
-   return RefProd<PROD>(provRecorder_.getProductID(token.index()),
-                         provRecorder_.prodGetter());
-  }
-  
-  template<typename PROD>
-  RefProd<PROD>
-  Event::getRefBeforePut(EDPutToken token)
-  {
-    if(UNLIKELY(token.isUninitialized())) {
+    return RefProd<PROD>(provRecorder_.getProductID(token.index()), provRecorder_.prodGetter());
+  }
+
+  template <typename PROD>
+  RefProd<PROD> Event::getRefBeforePut(EDPutToken token) {
+    if (UNLIKELY(token.isUninitialized())) {
       principal_get_adapter_detail::throwOnPutOfUninitializedToken("Event", typeid(PROD));
     }
-    if(UNLIKELY(provRecorder_.getTypeIDForPutTokenIndex(token.index()) != TypeID{typeid(PROD)})) {
-      principal_get_adapter_detail::throwOnPutOfWrongType(typeid(PROD), provRecorder_.getTypeIDForPutTokenIndex(token.index()));
+    if (UNLIKELY(provRecorder_.getTypeIDForPutTokenIndex(token.index()) != TypeID{typeid(PROD)})) {
+      principal_get_adapter_detail::throwOnPutOfWrongType(typeid(PROD),
+                                                          provRecorder_.getTypeIDForPutTokenIndex(token.index()));
     }
-    return RefProd<PROD>(provRecorder_.getProductID(token.index()),
-                         provRecorder_.prodGetter());
+    return RefProd<PROD>(provRecorder_.getProductID(token.index()), provRecorder_.prodGetter());
   }
 
-  template<typename PROD>
-  bool
-  Event::getByLabel(InputTag const& tag, Handle<PROD>& result) const {
+  template <typename PROD>
+  bool Event::getByLabel(InputTag const& tag, Handle<PROD>& result) const {
     result.clear();
     BasicHandle bh = provRecorder_.getByLabel_(TypeID(typeid(PROD)), tag, moduleCallingContext_);
     result = convert_handle<PROD>(std::move(bh));  // throws on conversion error
-    if UNLIKELY(result.failedToGet()) {
-      return false;
-    }
+    if
+      UNLIKELY(result.failedToGet()) { return false; }
     addToGotBranchIDs(*result.provenance());
     return true;
   }
 
-  template<typename PROD>
-  bool
-  Event::getByLabel(std::string const& label,
-                    std::string const& productInstanceName,
-                    Handle<PROD>& result) const {
+  template <typename PROD>
+  bool Event::getByLabel(std::string const& label, std::string const& productInstanceName, Handle<PROD>& result) const {
     result.clear();
-    BasicHandle bh = provRecorder_.getByLabel_(TypeID(typeid(PROD)), label, productInstanceName, emptyString_, moduleCallingContext_);
+    BasicHandle bh = provRecorder_.getByLabel_(
+        TypeID(typeid(PROD)), label, productInstanceName, emptyString_, moduleCallingContext_);
     result = convert_handle<PROD>(std::move(bh));  // throws on conversion error
-    if UNLIKELY(result.failedToGet()) {
-      return false;
-    }
+    if
+      UNLIKELY(result.failedToGet()) { return false; }
     addToGotBranchIDs(*result.provenance());
     return true;
   }
 
-  template<typename PROD>
-  bool
-  Event::getByLabel(std::string const& label, Handle<PROD>& result) const {
+  template <typename PROD>
+  bool Event::getByLabel(std::string const& label, Handle<PROD>& result) const {
     return getByLabel(label, emptyString_, result);
   }
 
-  template<typename PROD>
-  void
-  Event::getManyByType(std::vector<Handle<PROD> >& results) const {
+  template <typename PROD>
+  void Event::getManyByType(std::vector<Handle<PROD>>& results) const {
     provRecorder_.getManyByType(results, moduleCallingContext_);
-    for(typename std::vector<Handle<PROD> >::const_iterator it = results.begin(), itEnd = results.end();
-        it != itEnd; ++it) {
+    for (typename std::vector<Handle<PROD>>::const_iterator it = results.begin(), itEnd = results.end(); it != itEnd;
+         ++it) {
       addToGotBranchIDs(*it->provenance());
     }
   }
 
-  template<typename PROD>
-  bool
-  Event::getByToken(EDGetToken token, Handle<PROD>& result) const {
+  template <typename PROD>
+  bool Event::getByToken(EDGetToken token, Handle<PROD>& result) const {
     result.clear();
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)),PRODUCT_TYPE, token, moduleCallingContext_);
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)), PRODUCT_TYPE, token, moduleCallingContext_);
     result = convert_handle<PROD>(std::move(bh));  // throws on conversion error
-    if UNLIKELY(result.failedToGet()) {
-      return false;
-    }
+    if
+      UNLIKELY(result.failedToGet()) { return false; }
     addToGotBranchIDs(*result.provenance());
     return true;
   }
 
-  template<typename PROD>
-  bool
-  Event::getByToken(EDGetTokenT<PROD> token, Handle<PROD>& result) const {
+  template <typename PROD>
+  bool Event::getByToken(EDGetTokenT<PROD> token, Handle<PROD>& result) const {
     result.clear();
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)),PRODUCT_TYPE, token, moduleCallingContext_);
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)), PRODUCT_TYPE, token, moduleCallingContext_);
     result = convert_handle<PROD>(std::move(bh));
-    if UNLIKELY(result.failedToGet()) {
-      return false;
-    }
+    if
+      UNLIKELY(result.failedToGet()) { return false; }
     addToGotBranchIDs(*result.provenance());
     return true;
   }
 
-  template<typename PROD>
-  Handle<PROD>
-  Event::getHandle(EDGetTokenT<PROD> token) const {
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)),PRODUCT_TYPE, token, moduleCallingContext_);
+  template <typename PROD>
+  Handle<PROD> Event::getHandle(EDGetTokenT<PROD> token) const {
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)), PRODUCT_TYPE, token, moduleCallingContext_);
     auto result = convert_handle<PROD>(std::move(bh));
-    if LIKELY(not result.failedToGet()) {
-      addToGotBranchIDs(*result.provenance());
-    }
+    if
+      LIKELY(not result.failedToGet()) { addToGotBranchIDs(*result.provenance()); }
     return result;
   }
 
-  template<typename PROD>
-  PROD const&
-  Event::get(EDGetTokenT<PROD> token) const noexcept(false) {
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)),PRODUCT_TYPE, token, moduleCallingContext_);
+  template <typename PROD>
+  PROD const& Event::get(EDGetTokenT<PROD> token) const noexcept(false) {
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)), PRODUCT_TYPE, token, moduleCallingContext_);
     auto result = convert_handle<PROD>(std::move(bh));
-    if LIKELY(not result.failedToGet()) {
-      addToGotBranchIDs(*result.provenance());
-    }
+    if
+      LIKELY(not result.failedToGet()) { addToGotBranchIDs(*result.provenance()); }
     return *result;
   }
 
-
-  template<typename ELEMENT>
-  bool
-  Event::getByLabel(InputTag const& tag, Handle<View<ELEMENT> >& result) const {
+  template <typename ELEMENT>
+  bool Event::getByLabel(InputTag const& tag, Handle<View<ELEMENT>>& result) const {
     result.clear();
     BasicHandle bh = provRecorder_.getMatchingSequenceByLabel_(TypeID(typeid(ELEMENT)), tag, moduleCallingContext_);
-    if UNLIKELY(bh.failedToGet()) {
-      Handle<View<ELEMENT> > h(std::move(bh.whyFailedFactory()));
-      h.swap(result);
-      return false;
-    }
+    if
+      UNLIKELY(bh.failedToGet()) {
+        Handle<View<ELEMENT>> h(std::move(bh.whyFailedFactory()));
+        h.swap(result);
+        return false;
+      }
     result = fillView_<ELEMENT>(bh);
     return true;
   }
 
-  template<typename ELEMENT>
-  bool
-  Event::getByLabel(std::string const& moduleLabel,
-                    std::string const& productInstanceName,
-                    Handle<View<ELEMENT> >& result) const {
+  template <typename ELEMENT>
+  bool Event::getByLabel(std::string const& moduleLabel,
+                         std::string const& productInstanceName,
+                         Handle<View<ELEMENT>>& result) const {
     result.clear();
-    BasicHandle bh = provRecorder_.getMatchingSequenceByLabel_(TypeID(typeid(ELEMENT)), moduleLabel, productInstanceName, emptyString_, moduleCallingContext_);
-    if UNLIKELY(bh.failedToGet()) {
-      Handle<View<ELEMENT> > h(std::move(bh.whyFailedFactory()));
-      h.swap(result);
-      return false;
-    }
+    BasicHandle bh = provRecorder_.getMatchingSequenceByLabel_(
+        TypeID(typeid(ELEMENT)), moduleLabel, productInstanceName, emptyString_, moduleCallingContext_);
+    if
+      UNLIKELY(bh.failedToGet()) {
+        Handle<View<ELEMENT>> h(std::move(bh.whyFailedFactory()));
+        h.swap(result);
+        return false;
+      }
     result = fillView_<ELEMENT>(bh);
     return true;
   }
 
-  template<typename ELEMENT>
-  bool
-  Event::getByLabel(std::string const& moduleLabel, Handle<View<ELEMENT> >& result) const {
+  template <typename ELEMENT>
+  bool Event::getByLabel(std::string const& moduleLabel, Handle<View<ELEMENT>>& result) const {
     return getByLabel(moduleLabel, emptyString_, result);
   }
 
-  template<typename ELEMENT>
-  bool
-  Event::getByToken(EDGetToken token, Handle<View<ELEMENT>>& result) const {
+  template <typename ELEMENT>
+  bool Event::getByToken(EDGetToken token, Handle<View<ELEMENT>>& result) const {
     result.clear();
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(ELEMENT)),ELEMENT_TYPE, token, moduleCallingContext_);
-    if UNLIKELY(bh.failedToGet()) {
-      Handle<View<ELEMENT> > h(std::move(bh.whyFailedFactory()));
-      h.swap(result);
-      return false;
-    }
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(ELEMENT)), ELEMENT_TYPE, token, moduleCallingContext_);
+    if
+      UNLIKELY(bh.failedToGet()) {
+        Handle<View<ELEMENT>> h(std::move(bh.whyFailedFactory()));
+        h.swap(result);
+        return false;
+      }
     result = fillView_<ELEMENT>(bh);
     return true;
   }
 
-  template<typename ELEMENT>
-  bool
-  Event::getByToken(EDGetTokenT<View<ELEMENT>> token, Handle<View<ELEMENT>>& result) const {
+  template <typename ELEMENT>
+  bool Event::getByToken(EDGetTokenT<View<ELEMENT>> token, Handle<View<ELEMENT>>& result) const {
     result.clear();
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(ELEMENT)),ELEMENT_TYPE, token, moduleCallingContext_);
-    if UNLIKELY(bh.failedToGet()) {
-      Handle<View<ELEMENT> > h(std::move(bh.whyFailedFactory()));
-      h.swap(result);
-      return false;
-    }
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(ELEMENT)), ELEMENT_TYPE, token, moduleCallingContext_);
+    if
+      UNLIKELY(bh.failedToGet()) {
+        Handle<View<ELEMENT>> h(std::move(bh.whyFailedFactory()));
+        h.swap(result);
+        return false;
+      }
     result = fillView_<ELEMENT>(bh);
     return true;
   }
 
-  template<typename ELEMENT>
-  Handle<View<ELEMENT>>
-  Event::getHandle(EDGetTokenT<View<ELEMENT>> token) const {
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(ELEMENT)),ELEMENT_TYPE, token, moduleCallingContext_);
-    if UNLIKELY(bh.failedToGet()) {
-      return Handle<View<ELEMENT> >(std::move(bh.whyFailedFactory()));;
-    }
+  template <typename ELEMENT>
+  Handle<View<ELEMENT>> Event::getHandle(EDGetTokenT<View<ELEMENT>> token) const {
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(ELEMENT)), ELEMENT_TYPE, token, moduleCallingContext_);
+    if
+      UNLIKELY(bh.failedToGet()) {
+        return Handle<View<ELEMENT>>(std::move(bh.whyFailedFactory()));
+        ;
+      }
     return fillView_<ELEMENT>(bh);
   }
 
-  template<typename ELEMENT>
-  View<ELEMENT> const &
-  Event::get(EDGetTokenT<View<ELEMENT>> token) const noexcept(false) {
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(ELEMENT)),ELEMENT_TYPE, token, moduleCallingContext_);
-    if UNLIKELY(bh.failedToGet()) {
-      bh.whyFailedFactory()->make()->raise();
-    }
+  template <typename ELEMENT>
+  View<ELEMENT> const& Event::get(EDGetTokenT<View<ELEMENT>> token) const noexcept(false) {
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(ELEMENT)), ELEMENT_TYPE, token, moduleCallingContext_);
+    if
+      UNLIKELY(bh.failedToGet()) { bh.whyFailedFactory()->make()->raise(); }
     return *fillView_<ELEMENT>(bh);
   }
 
-  template<typename ELEMENT>
-  Handle<View<ELEMENT> >
-  Event::fillView_(BasicHandle& bh) const {
+  template <typename ELEMENT>
+  Handle<View<ELEMENT>> Event::fillView_(BasicHandle& bh) const {
     std::vector<void const*> pointersToElements;
     FillViewHelperVector helpers;
     // the following must initialize the
     //  fill the helper vector
     bh.wrapper()->fillView(bh.id(), pointersToElements, helpers);
 
-    auto newview = std::make_shared<View<ELEMENT> >(pointersToElements, helpers, &(productGetter()));
+    auto newview = std::make_shared<View<ELEMENT>>(pointersToElements, helpers, &(productGetter()));
 
     addToGotBranchIDs(*bh.provenance());
     gotViews_.push_back(newview);
-    return Handle<View<ELEMENT> >(newview.get(), bh.provenance());
+    return Handle<View<ELEMENT>>(newview.get(), bh.provenance());
   }
 
   // Free functions to retrieve a collection from the Event.
@@ -744,7 +659,7 @@ namespace edm {
     Handle<T> handle;
     event.getByLabel(tag, handle);
     // throw if the handle is not valid
-    return * handle.product();
+    return *handle.product();
   }
 
   template <typename T>
@@ -752,7 +667,7 @@ namespace edm {
     Handle<T> handle;
     event.getByToken(token, handle);
     // throw if the handle is not valid
-    return * handle.product();
+    return *handle.product();
   }
 
   template <typename T>
@@ -760,6 +675,6 @@ namespace edm {
     return event.get(token);
   }
 
-}
+}  // namespace edm
 
-#endif // FWCore_Framework_Event_h
+#endif  // FWCore_Framework_Event_h
diff --git a/FWCore/Framework/interface/EventForOutput.h b/FWCore/Framework/interface/EventForOutput.h
index 9a8df060dc49a..a2feb0c8d3857 100644
--- a/FWCore/Framework/interface/EventForOutput.h
+++ b/FWCore/Framework/interface/EventForOutput.h
@@ -49,32 +49,24 @@ namespace edm {
 
   class EventForOutput : public OccurrenceForOutput {
   public:
-    EventForOutput(EventPrincipal const& ep, ModuleDescription const& md,
-          ModuleCallingContext const*);
+    EventForOutput(EventPrincipal const& ep, ModuleDescription const& md, ModuleCallingContext const*);
     ~EventForOutput() override;
-    
-    EventAuxiliary const& eventAuxiliary() const {return aux_;}
-    EventID const& id() const {return aux_.id();}
-    EventNumber_t event() const {return aux_.event();}
-    LuminosityBlockNumber_t luminosityBlock() const {return aux_.luminosityBlock();}
-    Timestamp const& time() const {return aux_.time();}
-    
+
+    EventAuxiliary const& eventAuxiliary() const { return aux_; }
+    EventID const& id() const { return aux_.id(); }
+    EventNumber_t event() const { return aux_.event(); }
+    LuminosityBlockNumber_t luminosityBlock() const { return aux_.luminosityBlock(); }
+    Timestamp const& time() const { return aux_.time(); }
+
     ///\return The id for the particular Stream processing the Event
-    StreamID streamID() const {
-      return streamID_;
-    }
+    StreamID streamID() const { return streamID_; }
+
+    LuminosityBlockForOutput const& getLuminosityBlock() const { return *luminosityBlock_; }
 
-    LuminosityBlockForOutput const&
-    getLuminosityBlock() const {
-      return *luminosityBlock_;
-    }
+    RunForOutput const& getRun() const;
 
-    RunForOutput const&
-    getRun() const;
+    RunNumber_t run() const { return id().run(); }
 
-    RunNumber_t
-    run() const {return id().run();}
-    
     BranchListIndexes const& branchListIndexes() const;
 
     EventSelectionIDVector const& eventSelectionIDs() const;
@@ -82,16 +74,14 @@ namespace edm {
     ProductProvenanceRetriever const* productProvenanceRetrieverPtr() const;
 
   private:
-    friend class edmtest::TestOutputModule; // For testing
+    friend class edmtest::TestOutputModule;  // For testing
 
-    EventPrincipal const&
-    eventPrincipal() const;
+    EventPrincipal const& eventPrincipal() const;
 
     EventAuxiliary const& aux_;
     std::shared_ptr<LuminosityBlockForOutput const> const luminosityBlock_;
 
     StreamID streamID_;
   };
-}
+}  // namespace edm
 #endif
-
diff --git a/FWCore/Framework/interface/EventPrincipal.h b/FWCore/Framework/interface/EventPrincipal.h
index 044a45040acfc..bd3080d836945 100644
--- a/FWCore/Framework/interface/EventPrincipal.h
+++ b/FWCore/Framework/interface/EventPrincipal.h
@@ -51,18 +51,17 @@ namespace edm {
     typedef Base::ConstProductResolverPtr ConstProductResolverPtr;
     static int const invalidBunchXing = EventAuxiliary::invalidBunchXing;
     static int const invalidStoreNumber = EventAuxiliary::invalidStoreNumber;
-    EventPrincipal(
-        std::shared_ptr<ProductRegistry const> reg,
-        std::shared_ptr<BranchIDListHelper const> branchIDListHelper,
-        std::shared_ptr<ThinnedAssociationsHelper const> thinnedAssociationsHelper,
-        ProcessConfiguration const& pc,
-        HistoryAppender* historyAppender,
-        unsigned int streamIndex = 0,
-        bool isForPrimaryProcess = true);
+    EventPrincipal(std::shared_ptr<ProductRegistry const> reg,
+                   std::shared_ptr<BranchIDListHelper const> branchIDListHelper,
+                   std::shared_ptr<ThinnedAssociationsHelper const> thinnedAssociationsHelper,
+                   ProcessConfiguration const& pc,
+                   HistoryAppender* historyAppender,
+                   unsigned int streamIndex = 0,
+                   bool isForPrimaryProcess = true);
     ~EventPrincipal() override {}
 
     void fillEventPrincipal(EventAuxiliary const& aux,
-        ProcessHistoryRegistry const& processHistoryRegistry,
+                            ProcessHistoryRegistry const& processHistoryRegistry,
                             DelayedReader* reader = nullptr);
     void fillEventPrincipal(EventAuxiliary const& aux,
                             ProcessHistoryRegistry const& processHistoryRegistry,
@@ -77,97 +76,66 @@ namespace edm {
                             DelayedReader* reader = nullptr,
                             bool deepCopyRetriever = true);
 
-    
     void clearEventPrincipal();
 
-    LuminosityBlockPrincipal const& luminosityBlockPrincipal() const {
-      return *luminosityBlockPrincipal_;
-    }
+    LuminosityBlockPrincipal const& luminosityBlockPrincipal() const { return *luminosityBlockPrincipal_; }
 
-    LuminosityBlockPrincipal& luminosityBlockPrincipal() {
-      return *luminosityBlockPrincipal_;
-    }
+    LuminosityBlockPrincipal& luminosityBlockPrincipal() { return *luminosityBlockPrincipal_; }
 
-    bool luminosityBlockPrincipalPtrValid() const {
-      return luminosityBlockPrincipal_ != nullptr;
-    }
+    bool luminosityBlockPrincipalPtrValid() const { return luminosityBlockPrincipal_ != nullptr; }
 
     //does not share ownership
     void setLuminosityBlockPrincipal(LuminosityBlockPrincipal* lbp);
 
     void setRunAndLumiNumber(RunNumber_t run, LuminosityBlockNumber_t lumi);
 
-    EventID const& id() const {
-      return aux().id();
-    }
+    EventID const& id() const { return aux().id(); }
 
-    Timestamp const& time() const {
-      return aux().time();
-    }
+    Timestamp const& time() const { return aux().time(); }
 
-    bool isReal() const {
-      return aux().isRealData();
-    }
+    bool isReal() const { return aux().isRealData(); }
 
-    EventAuxiliary::ExperimentType ExperimentType() const {
-      return aux().experimentType();
-    }
+    EventAuxiliary::ExperimentType ExperimentType() const { return aux().experimentType(); }
 
-    int bunchCrossing() const {
-      return aux().bunchCrossing();
-    }
+    int bunchCrossing() const { return aux().bunchCrossing(); }
 
-    int storeNumber() const {
-      return aux().storeNumber();
-    }
+    int storeNumber() const { return aux().storeNumber(); }
 
-    EventAuxiliary const& aux() const {
-      return aux_;
-    }
+    EventAuxiliary const& aux() const { return aux_; }
 
-    StreamID streamID() const { return streamID_;}
+    StreamID streamID() const { return streamID_; }
 
-    LuminosityBlockNumber_t luminosityBlock() const {
-      return id().luminosityBlock();
-    }
+    LuminosityBlockNumber_t luminosityBlock() const { return id().luminosityBlock(); }
 
-    RunNumber_t run() const {
-      return id().run();
-    }
+    RunNumber_t run() const { return id().run(); }
 
     RunPrincipal const& runPrincipal() const;
 
-    ProductProvenanceRetriever const* productProvenanceRetrieverPtr() const {return provRetrieverPtr_.get();}
+    ProductProvenanceRetriever const* productProvenanceRetrieverPtr() const { return provRetrieverPtr_.get(); }
 
     EventSelectionIDVector const& eventSelectionIDs() const;
 
     BranchListIndexes const& branchListIndexes() const;
 
-    Provenance
-    getProvenance(ProductID const& pid, ModuleCallingContext const* mcc) const;
-
-    BasicHandle
-    getByProductID(ProductID const& oid) const;
+    Provenance getProvenance(ProductID const& pid, ModuleCallingContext const* mcc) const;
 
-    void put(
-        BranchDescription const& bd,
-        std::unique_ptr<WrapperBase> edp,
-        ProductProvenance const& productProvenance) const;
+    BasicHandle getByProductID(ProductID const& oid) const;
 
-    void put(ProductResolverIndex index,
+    void put(BranchDescription const& bd,
              std::unique_ptr<WrapperBase> edp,
-             ParentageID productProvenance) const;
+             ProductProvenance const& productProvenance) const;
 
-    void putOnRead(
-        BranchDescription const& bd,
-        std::unique_ptr<WrapperBase> edp,
-        ProductProvenance const* productProvenance) const;
+    void put(ProductResolverIndex index, std::unique_ptr<WrapperBase> edp, ParentageID productProvenance) const;
+
+    void putOnRead(BranchDescription const& bd,
+                   std::unique_ptr<WrapperBase> edp,
+                   ProductProvenance const* productProvenance) const;
 
     WrapperBase const* getIt(ProductID const& pid) const override;
     WrapperBase const* getThinnedProduct(ProductID const& pid, unsigned int& key) const override;
     void getThinnedProducts(ProductID const& pid,
-                                    std::vector<WrapperBase const*>& foundContainers,
-                                    std::vector<unsigned int>& keys) const override;
+                            std::vector<WrapperBase const*>& foundContainers,
+                            std::vector<unsigned int>& keys) const override;
 
     ProductID branchIDToProductID(BranchID const& bid) const;
 
@@ -178,18 +146,18 @@ namespace edm {
     using Base::getProvenance;
 
   private:
-
     BranchID pidToBid(ProductID const& pid) const;
 
     edm::ThinnedAssociation const* getThinnedAssociation(edm::BranchID const& branchID) const;
 
     unsigned int transitionIndex_() const override;
-    
-    std::shared_ptr<ProductProvenanceRetriever const> provRetrieverPtr() const {return get_underlying_safe(provRetrieverPtr_);}
-    std::shared_ptr<ProductProvenanceRetriever>& provRetrieverPtr() {return get_underlying_safe(provRetrieverPtr_);}
 
-  private:
+    std::shared_ptr<ProductProvenanceRetriever const> provRetrieverPtr() const {
+      return get_underlying_safe(provRetrieverPtr_);
+    }
+    std::shared_ptr<ProductProvenanceRetriever>& provRetrieverPtr() { return get_underlying_safe(provRetrieverPtr_); }
 
+  private:
     EventAuxiliary aux_;
 
     edm::propagate_const<LuminosityBlockPrincipal*> luminosityBlockPrincipal_;
@@ -205,16 +173,10 @@ namespace edm {
     BranchListIndexes branchListIndexes_;
 
     std::map<BranchListIndex, ProcessIndex> branchListIndexToProcessIndex_;
-    
-    StreamID streamID_;
 
+    StreamID streamID_;
   };
 
-  inline
-  bool
-  isSameEvent(EventPrincipal const& a, EventPrincipal const& b) {
-    return isSameEvent(a.aux(), b.aux());
-  }
-}
+  inline bool isSameEvent(EventPrincipal const& a, EventPrincipal const& b) { return isSameEvent(a.aux(), b.aux()); }
+}  // namespace edm
 #endif
-
diff --git a/FWCore/Framework/interface/EventProcessor.h b/FWCore/Framework/interface/EventProcessor.h
index bc5418851189a..301eea93fc1a3 100644
--- a/FWCore/Framework/interface/EventProcessor.h
+++ b/FWCore/Framework/interface/EventProcessor.h
@@ -55,15 +55,14 @@ namespace edm {
   class LuminosityBlockPrincipal;
   class LuminosityBlockProcessingStatus;
   class IOVSyncValue;
-  
+
   namespace eventsetup {
     class EventSetupProvider;
     class EventSetupsController;
-  }
+  }  // namespace eventsetup
 
   class EventProcessor {
   public:
-
     // Status codes:
     //   0     successful completion
     //   1     exception of unknown type caught
@@ -72,8 +71,15 @@ namespace edm {
     //   4     input complete
     //   5     call timed out
     //   6     input count complete
-    enum StatusCode { epSuccess=0, epException=1, epOther=2, epSignal=3,
-      epInputComplete=4, epTimedOut=5, epCountComplete=6 };
+    enum StatusCode {
+      epSuccess = 0,
+      epException = 1,
+      epOther = 2,
+      epSignal = 3,
+      epInputComplete = 4,
+      epTimedOut = 5,
+      epCountComplete = 6
+    };
 
     // The input 'parameterSet' contains the entire contents of a  configuration file.
     // Also allows the attachement of pre-existing services specified  by 'token', and
@@ -98,8 +104,8 @@ namespace edm {
 
     ~EventProcessor();
 
-    EventProcessor(EventProcessor const&) = delete; // Disallow copying and moving
-    EventProcessor& operator=(EventProcessor const&) = delete; // Disallow copying and moving
+    EventProcessor(EventProcessor const&) = delete;             // Disallow copying and moving
+    EventProcessor& operator=(EventProcessor const&) = delete;  // Disallow copying and moving
 
     /**This should be called before the first call to 'run'
        If this is not called in time, it will automatically be called
@@ -125,8 +131,7 @@ namespace edm {
     /// *** passed to the caller. Do not call delete on these
     /// *** pointers!
 
-    std::vector<ModuleDescription const*>
-    getAllModuleDescriptions() const;
+    std::vector<ModuleDescription const*> getAllModuleDescriptions() const;
 
     ProcessConfiguration const& processConfiguration() const { return *processConfiguration_; }
 
@@ -186,11 +191,15 @@ namespace edm {
     // transition handling.
 
     InputSource::ItemType nextTransitionType();
-    InputSource::ItemType lastTransitionType() const { if(deferredExceptionPtrIsSet_) {return InputSource::IsStop;}
-                                                          return lastSourceTransition_;}
+    InputSource::ItemType lastTransitionType() const {
+      if (deferredExceptionPtrIsSet_) {
+        return InputSource::IsStop;
+      }
+      return lastSourceTransition_;
+    }
     std::pair<edm::ProcessHistoryID, edm::RunNumber_t> nextRunID();
     edm::LuminosityBlockNumber_t nextLuminosityBlockID();
-    
+
     void readFile();
     void closeInputFile(bool cleaningUpAfterException);
     void openOutputFiles();
@@ -207,31 +216,38 @@ namespace edm {
 
     void doErrorStuff();
 
-    void beginRun(ProcessHistoryID const& phid, RunNumber_t run, bool& globalBeginSucceeded,
+    void beginRun(ProcessHistoryID const& phid,
+                  RunNumber_t run,
+                  bool& globalBeginSucceeded,
                   bool& eventSetupForInstanceSucceeded);
     void endRun(ProcessHistoryID const& phid, RunNumber_t run, bool globalBeginSucceeded, bool cleaningUpAfterException);
-    void endUnfinishedRun(ProcessHistoryID const& phid, RunNumber_t run,
-                          bool globalBeginSucceeded, bool cleaningUpAfterException,
+    void endUnfinishedRun(ProcessHistoryID const& phid,
+                          RunNumber_t run,
+                          bool globalBeginSucceeded,
+                          bool cleaningUpAfterException,
                           bool eventSetupForInstanceSucceeded);
 
     InputSource::ItemType processLumis(std::shared_ptr<void> const& iRunResource);
     void endUnfinishedLumi();
-    
+
     void beginLumiAsync(edm::IOVSyncValue const& iSyncValue,
                         std::shared_ptr<void> const& iRunResource,
                         edm::WaitingTaskHolder iHolder);
     void continueLumiAsync(edm::WaitingTaskHolder iHolder);
-    
+
     void handleEndLumiExceptions(std::exception_ptr const* iPtr, WaitingTaskHolder& holder);
     void globalEndLumiAsync(edm::WaitingTaskHolder iTask, std::shared_ptr<LuminosityBlockProcessingStatus> iLumiStatus);
     void streamEndLumiAsync(edm::WaitingTaskHolder iTask,
                             unsigned int iStreamIndex,
                             std::shared_ptr<LuminosityBlockProcessingStatus> iLumiStatus);
-    std::pair<ProcessHistoryID,RunNumber_t> readRun();
-    std::pair<ProcessHistoryID,RunNumber_t> readAndMergeRun();
+    std::pair<ProcessHistoryID, RunNumber_t> readRun();
+    std::pair<ProcessHistoryID, RunNumber_t> readAndMergeRun();
     void readLuminosityBlock(LuminosityBlockProcessingStatus&);
     int readAndMergeLumi(LuminosityBlockProcessingStatus&);
-    void writeRunAsync(WaitingTaskHolder, ProcessHistoryID const& phid, RunNumber_t run, MergeableRunProductMetadata const*);
+    void writeRunAsync(WaitingTaskHolder,
+                       ProcessHistoryID const& phid,
+                       RunNumber_t run,
+                       MergeableRunProductMetadata const*);
     void deleteRunFromCache(ProcessHistoryID const& phid, RunNumber_t run);
     void writeLumiAsync(WaitingTaskHolder, LuminosityBlockPrincipal& lumiPrincipal);
     void deleteLumiFromCache(LuminosityBlockProcessingStatus&);
@@ -249,41 +265,40 @@ namespace edm {
     //
     // Now private functions.
     // init() is used by only by constructors
-    void init(std::shared_ptr<ProcessDesc>& processDesc,
-              ServiceToken const& token,
-              serviceregistry::ServiceLegacy);
+    void init(std::shared_ptr<ProcessDesc>& processDesc, ServiceToken const& token, serviceregistry::ServiceLegacy);
 
-    bool readNextEventForStream(unsigned int iStreamIndex,
-                                LuminosityBlockProcessingStatus& iLumiStatus);
+    bool readNextEventForStream(unsigned int iStreamIndex, LuminosityBlockProcessingStatus& iLumiStatus);
 
-    void handleNextEventForStreamAsync(WaitingTaskHolder iTask,
-                                       unsigned int iStreamIndex);
+    void handleNextEventForStreamAsync(WaitingTaskHolder iTask, unsigned int iStreamIndex);
 
-    
     //read the next event using Stream iStreamIndex
     void readEvent(unsigned int iStreamIndex);
 
     //process the already read event using Stream iStreamIndex
-    void processEventAsync(WaitingTaskHolder iHolder,
-                           unsigned int iStreamIndex);
+    void processEventAsync(WaitingTaskHolder iHolder, unsigned int iStreamIndex);
 
-    void processEventAsyncImpl(WaitingTaskHolder iHolder,
-                               unsigned int iStreamIndex);
+    void processEventAsyncImpl(WaitingTaskHolder iHolder, unsigned int iStreamIndex);
 
     //returns true if an asynchronous stop was requested
     bool checkForAsyncStopRequest(StatusCode&);
-    
+
     void processEventWithLooper(EventPrincipal&);
 
-    std::shared_ptr<ProductRegistry const> preg() const {return get_underlying_safe(preg_);}
-    std::shared_ptr<ProductRegistry>& preg() {return get_underlying_safe(preg_);}
-    std::shared_ptr<BranchIDListHelper const> branchIDListHelper() const {return get_underlying_safe(branchIDListHelper_);}
-    std::shared_ptr<BranchIDListHelper>& branchIDListHelper() {return get_underlying_safe(branchIDListHelper_);}
-    std::shared_ptr<ThinnedAssociationsHelper const> thinnedAssociationsHelper() const {return get_underlying_safe(thinnedAssociationsHelper_);}
-    std::shared_ptr<ThinnedAssociationsHelper>& thinnedAssociationsHelper() {return get_underlying_safe(thinnedAssociationsHelper_);}
-    std::shared_ptr<EDLooperBase const> looper() const {return get_underlying_safe(looper_);}
-    std::shared_ptr<EDLooperBase>& looper() {return get_underlying_safe(looper_);}
-    
+    std::shared_ptr<ProductRegistry const> preg() const { return get_underlying_safe(preg_); }
+    std::shared_ptr<ProductRegistry>& preg() { return get_underlying_safe(preg_); }
+    std::shared_ptr<BranchIDListHelper const> branchIDListHelper() const {
+      return get_underlying_safe(branchIDListHelper_);
+    }
+    std::shared_ptr<BranchIDListHelper>& branchIDListHelper() { return get_underlying_safe(branchIDListHelper_); }
+    std::shared_ptr<ThinnedAssociationsHelper const> thinnedAssociationsHelper() const {
+      return get_underlying_safe(thinnedAssociationsHelper_);
+    }
+    std::shared_ptr<ThinnedAssociationsHelper>& thinnedAssociationsHelper() {
+      return get_underlying_safe(thinnedAssociationsHelper_);
+    }
+    std::shared_ptr<EDLooperBase const> looper() const { return get_underlying_safe(looper_); }
+    std::shared_ptr<EDLooperBase>& looper() { return get_underlying_safe(looper_); }
+
     void warnAboutModulesRequiringLuminosityBLockSynchronization() const;
     //------------------------------------------------------------------
     //
@@ -292,27 +307,27 @@ namespace edm {
     // only during construction, and never again. If they aren't
     // really needed, we should remove them.
 
-    std::shared_ptr<ActivityRegistry> actReg_; // We do not use propagate_const because the registry itself is mutable.
+    std::shared_ptr<ActivityRegistry> actReg_;  // We do not use propagate_const because the registry itself is mutable.
     edm::propagate_const<std::shared_ptr<ProductRegistry>> preg_;
     edm::propagate_const<std::shared_ptr<BranchIDListHelper>> branchIDListHelper_;
     edm::propagate_const<std::shared_ptr<ThinnedAssociationsHelper>> thinnedAssociationsHelper_;
-    ServiceToken                                  serviceToken_;
+    ServiceToken serviceToken_;
     edm::propagate_const<std::unique_ptr<InputSource>> input_;
     InputSource::ItemType lastSourceTransition_;
     edm::propagate_const<std::unique_ptr<eventsetup::EventSetupsController>> espController_;
     edm::propagate_const<std::shared_ptr<eventsetup::EventSetupProvider>> esp_;
     edm::SerialTaskQueue iovQueue_;
-    std::unique_ptr<ExceptionToActionTable const>          act_table_;
-    std::shared_ptr<ProcessConfiguration const>       processConfiguration_;
-    ProcessContext                                processContext_;
-    PathsAndConsumesOfModules                     pathsAndConsumesOfModules_;
+    std::unique_ptr<ExceptionToActionTable const> act_table_;
+    std::shared_ptr<ProcessConfiguration const> processConfiguration_;
+    ProcessContext processContext_;
+    PathsAndConsumesOfModules pathsAndConsumesOfModules_;
     MergeableRunProductProcesses mergeableRunProductProcesses_;
     edm::propagate_const<std::unique_ptr<Schedule>> schedule_;
     std::vector<edm::SerialTaskQueue> streamQueues_;
     std::unique_ptr<edm::LimitedTaskQueue> lumiQueue_;
     std::vector<std::shared_ptr<LuminosityBlockProcessingStatus>> streamLumiStatus_;
-    std::atomic<unsigned int> streamLumiActive_{0}; //works as guard for streamLumiStatus
-    
+    std::atomic<unsigned int> streamLumiActive_{0};  //works as guard for streamLumiStatus
+
     std::vector<SubProcess> subProcesses_;
     edm::propagate_const<std::unique_ptr<HistoryAppender>> historyAppender_;
 
@@ -320,41 +335,37 @@ namespace edm {
     edm::propagate_const<std::shared_ptr<EDLooperBase>> looper_;
 
     //The atomic protects concurrent access of deferredExceptionPtr_
-    std::atomic<bool>                             deferredExceptionPtrIsSet_;
-    std::exception_ptr                            deferredExceptionPtr_;
-    
-    SharedResourcesAcquirer                       sourceResourcesAcquirer_;
-    std::shared_ptr<std::recursive_mutex>         sourceMutex_;
-    PrincipalCache                                principalCache_;
-    bool                                          beginJobCalled_;
-    bool                                          shouldWeStop_;
-    bool                                          fileModeNoMerge_;
-    std::string                                   exceptionMessageFiles_;
-    std::string                                   exceptionMessageRuns_;
-    std::atomic<bool>                             exceptionMessageLumis_;
-    bool                                          forceLooperToEnd_;
-    bool                                          looperBeginJobRun_;
-    bool                                          forceESCacheClearOnNewRun_;
-    
-    PreallocationConfiguration                    preallocations_;
-    
-    bool                                          asyncStopRequestedWhileProcessingEvents_;
-    StatusCode                                    asyncStopStatusCodeFromProcessingEvents_;
-    bool firstEventInBlock_=true;
-    
-    typedef std::set<std::pair<std::string, std::string> > ExcludedData;
+    std::atomic<bool> deferredExceptionPtrIsSet_;
+    std::exception_ptr deferredExceptionPtr_;
+
+    SharedResourcesAcquirer sourceResourcesAcquirer_;
+    std::shared_ptr<std::recursive_mutex> sourceMutex_;
+    PrincipalCache principalCache_;
+    bool beginJobCalled_;
+    bool shouldWeStop_;
+    bool fileModeNoMerge_;
+    std::string exceptionMessageFiles_;
+    std::string exceptionMessageRuns_;
+    std::atomic<bool> exceptionMessageLumis_;
+    bool forceLooperToEnd_;
+    bool looperBeginJobRun_;
+    bool forceESCacheClearOnNewRun_;
+
+    PreallocationConfiguration preallocations_;
+
+    bool asyncStopRequestedWhileProcessingEvents_;
+    StatusCode asyncStopStatusCodeFromProcessingEvents_;
+    bool firstEventInBlock_ = true;
+
+    typedef std::set<std::pair<std::string, std::string>> ExcludedData;
     typedef std::map<std::string, ExcludedData> ExcludedDataMap;
-    ExcludedDataMap                               eventSetupDataToExcludeFromPrefetching_;
-    
+    ExcludedDataMap eventSetupDataToExcludeFromPrefetching_;
+
     bool printDependencies_ = false;
-  }; // class EventProcessor
+  };  // class EventProcessor
 
   //--------------------------------------------------------------------
 
-  inline
-  EventProcessor::StatusCode
-  EventProcessor::run() {
-    return runToCompletion();
-  }
-}
+  inline EventProcessor::StatusCode EventProcessor::run() { return runToCompletion(); }
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/EventSelector.h b/FWCore/Framework/interface/EventSelector.h
index 217c31eac9e51..7409d1003fe8c 100644
--- a/FWCore/Framework/interface/EventSelector.h
+++ b/FWCore/Framework/interface/EventSelector.h
@@ -9,7 +9,7 @@
 // Change Log
 //
 // 1 - Mark Fischler Feb 6, 2008
-//	Internals for implementation of glob-style wildcard selection 
+//	Internals for implementation of glob-style wildcard selection
 //	In particular, !xyz* requires the vector nonveto_bits_
 //	nonveto_bits_ is designed to also accomodate an AND of triggers
 //      selection criterion, if that is wanted at some future date.
@@ -24,33 +24,23 @@
 #include <vector>
 #include <string>
 
-namespace edm
-{
+namespace edm {
   // possible return codes for the testSelectionOverlap
   // method defined below.
-  namespace evtSel
-  {
-    enum OverlapResult {InvalidSelection = 0,
-                        NoOverlap = 1,
-                        PartialOverlap = 2,
-                        ExactMatch = 3};
+  namespace evtSel {
+    enum OverlapResult { InvalidSelection = 0, NoOverlap = 1, PartialOverlap = 2, ExactMatch = 3 };
   }
 
   class ParameterSetDescription;
-  class EventSelector
-  {
+  class EventSelector {
   public:
-
     typedef std::vector<std::string> Strings;
 
-    EventSelector(Strings const& pathspecs,
-		  Strings const& names);
+    EventSelector(Strings const& pathspecs, Strings const& names);
 
-    explicit
-    EventSelector(Strings const& pathspecs);
+    explicit EventSelector(Strings const& pathspecs);
 
-    EventSelector(edm::ParameterSet const& pset,
-		  Strings const& pathNames);
+    EventSelector(edm::ParameterSet const& pset, Strings const& pathNames);
 
     bool wantAll() const { return accept_all_; }
     bool acceptEvent(TriggerResults const&);
@@ -58,25 +48,19 @@ namespace edm
 
     // 29-Jan-2008, KAB - added methods for testing and using
     // trigger selections (pathspecs).
-    static bool selectionIsValid(Strings const& pathspec,
-                                 Strings const& fullPathList);
-    static evtSel::OverlapResult
-      testSelectionOverlap(Strings const& pathspec1,
-                           Strings const& pathspec2,
-                           Strings const& fullPathList);
-    std::shared_ptr<TriggerResults>
-      maskTriggerResults(TriggerResults const& inputResults);
-    static std::vector<std::string>
-      getEventSelectionVString(edm::ParameterSet const& pset);
+    static bool selectionIsValid(Strings const& pathspec, Strings const& fullPathList);
+    static evtSel::OverlapResult testSelectionOverlap(Strings const& pathspec1,
+                                                      Strings const& pathspec2,
+                                                      Strings const& fullPathList);
+    std::shared_ptr<TriggerResults> maskTriggerResults(TriggerResults const& inputResults);
+    static std::vector<std::string> getEventSelectionVString(edm::ParameterSet const& pset);
 
     static void fillDescription(ParameterSetDescription& desc);
 
   private:
-
-    struct BitInfo
-    {
-      BitInfo(unsigned int pos, bool state):pos_(pos),accept_state_(state) { }
-      BitInfo():pos_(),accept_state_() { }
+    struct BitInfo {
+      BitInfo(unsigned int pos, bool state) : pos_(pos), accept_state_(state) {}
+      BitInfo() : pos_(), accept_state_() {}
 
       unsigned int pos_;
       bool accept_state_;
@@ -89,11 +73,11 @@ namespace edm
 
     typedef std::vector<BitInfo> Bits;
 
-    Bits absolute_acceptors_;					// change 3
-    Bits conditional_acceptors_;				// change 3
-    Bits exception_acceptors_;					// change 3
-    std::vector<Bits> all_must_fail_;				// change 1
-    std::vector<Bits> all_must_fail_noex_;			// change 3
+    Bits absolute_acceptors_;               // change 3
+    Bits conditional_acceptors_;            // change 3
+    Bits exception_acceptors_;              // change 3
+    std::vector<Bits> all_must_fail_;       // change 1
+    std::vector<Bits> all_must_fail_noex_;  // change 3
 
     ParameterSetID psetID_;
 
@@ -109,36 +93,23 @@ namespace edm
 
     bool acceptTriggerPath(HLTPathStatus const&, BitInfo const&) const;
 
-    bool acceptOneBit (Bits const & b, 
-    		       HLTGlobalStatus const & tr, 
-    		       hlt::HLTState const & s = hlt::Ready) const;
-    bool acceptAllBits (Bits const & b, 
-    		        HLTGlobalStatus const & tr) const;
+    bool acceptOneBit(Bits const& b, HLTGlobalStatus const& tr, hlt::HLTState const& s = hlt::Ready) const;
+    bool acceptAllBits(Bits const& b, HLTGlobalStatus const& tr) const;
+
+    bool containsExceptions(HLTGlobalStatus const& tr) const;
+
+    bool selectionDecision(HLTGlobalStatus const& tr) const;
 
-    bool containsExceptions(HLTGlobalStatus const & tr) const;
-    
-    bool selectionDecision(HLTGlobalStatus const & tr) const;
-    
     static std::string glob2reg(std::string const& s);
-    static std::vector< Strings::const_iterator > 
-      matching_triggers(Strings const& trigs, std::string const& s);
-      
-    static bool identical (std::vector<bool> const & a, 
-    			   std::vector<bool> const & b); 
-    static bool identical (EventSelector const & a, 
-    			   EventSelector const & b,
-			   unsigned int N); 
-    static std::vector<bool> expandDecisionList ( 
-    		Bits const & b,  
-		bool PassOrFail,
-		unsigned int n);
-    static bool overlapping ( std::vector<bool> const& a, 
-    			      std::vector<bool> const& b );
-    static bool subset  ( std::vector<bool> const& a, 
-    			  std::vector<bool> const& b );
-    static std::vector<bool> combine ( std::vector<bool> const& a, 
-    			               std::vector<bool> const& b );
+    static std::vector<Strings::const_iterator> matching_triggers(Strings const& trigs, std::string const& s);
+
+    static bool identical(std::vector<bool> const& a, std::vector<bool> const& b);
+    static bool identical(EventSelector const& a, EventSelector const& b, unsigned int N);
+    static std::vector<bool> expandDecisionList(Bits const& b, bool PassOrFail, unsigned int n);
+    static bool overlapping(std::vector<bool> const& a, std::vector<bool> const& b);
+    static bool subset(std::vector<bool> const& a, std::vector<bool> const& b);
+    static std::vector<bool> combine(std::vector<bool> const& a, std::vector<bool> const& b);
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/EventSetup.h b/FWCore/Framework/interface/EventSetup.h
index bb5d4b5a2db37..53995d4ee4e9f 100644
--- a/FWCore/Framework/interface/EventSetup.h
+++ b/FWCore/Framework/interface/EventSetup.h
@@ -28,6 +28,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ESTransientHandle.h"
 #include "FWCore/Framework/interface/EventSetupRecordKey.h"
 #include "FWCore/Framework/interface/EventSetupRecord.h"
 #include "FWCore/Framework/interface/EventSetupImpl.h"
@@ -36,109 +37,148 @@
 #include "FWCore/Framework/interface/IOVSyncValue.h"
 #include "FWCore/Framework/interface/data_default_record_trait.h"
 #include "FWCore/Utilities/interface/Transition.h"
+#include "FWCore/Utilities/interface/ESIndices.h"
 
 // forward declarations
 
 namespace edm {
-   class ActivityRegistry;
-   class ESInputTag;
-   template <class T, class R>
-   class ESGetToken;
-   class PileUp;
-
-   namespace eventsetup {
-      class EventSetupProvider;
-      class EventSetupRecord;
-      class EventSetupRecordImpl;
-   }
-
-  class EventSetup
-  {
+  class ActivityRegistry;
+  class ESInputTag;
+  template <class T, class R>
+  class ESGetToken;
+  class PileUp;
+
+  namespace eventsetup {
+    class EventSetupProvider;
+    class EventSetupRecord;
+    class EventSetupRecordImpl;
+  }  // namespace eventsetup
+
+  class EventSetup {
     ///Needed until a better solution can be found
     friend class edm::PileUp;
-    public:
 
-      explicit EventSetup(EventSetupImpl const& iSetup):
-      m_setup{iSetup} {}
-      EventSetup(EventSetup const&) = delete;
-      EventSetup& operator=(EventSetup const&) = delete;
+  public:
+    explicit EventSetup(EventSetupImpl const& iSetup, unsigned int iTransitionID, ESProxyIndex const* iGetTokenIndices)
+        : m_setup{iSetup}, m_getTokenIndices{iGetTokenIndices}, m_id{iTransitionID} {}
+    EventSetup(EventSetup const&) = delete;
+    EventSetup& operator=(EventSetup const&) = delete;
 
-      // ---------- const member functions ---------------------
-      /** returns the Record of type T.  If no such record available
+    // ---------- const member functions ---------------------
+    /** returns the Record of type T.  If no such record available
           a eventsetup::NoRecordException<T> is thrown */
-      template< typename T>
-         T get() const {
-           return m_setup.get<T>();
-         }
-
-      /** returns the Record of type T.  If no such record available
-       a null pointer is returned */
-      template< typename T>
-        std::optional<T> tryToGet() const {
-           return m_setup.tryToGet<T>();
-        }
-
-      /** can directly access data if data_default_record_trait<> is defined for this data type **/
-      template< typename T>
-         bool getData(T& iHolder) const {
-            return getData(std::string{}, iHolder);
-         }
-
-      template< typename T>
-         bool getData(const std::string& iLabel, T& iHolder) const {
-            auto const& rec = this->get<eventsetup::default_record_t<T>>();
-            return rec.get(iLabel, iHolder);
-         }
-
-      template< typename T>
-        bool getData(const ESInputTag& iTag, T& iHolder) const {
-           auto const& rec = this->get<eventsetup::default_record_t<T>>();
-           return rec.get(iTag, iHolder);
-        }
-
-      template< typename T, typename R>
-        T const& getData(const ESGetToken<T, R>& iToken) const noexcept(false) {
-           return this->get<std::conditional_t<std::is_same_v<R, edm::DefaultRecord>,
-                                               eventsetup::default_record_t<ESHandle<T>>,
-                                               R>>().get(iToken);
-        }
-        template< typename T, typename R>
-        T const& getData(ESGetToken<T, R>& iToken) const noexcept(false) {
-           return this->getData( const_cast<const ESGetToken<T,R>&>(iToken));
-        }
-
-      template <typename T, typename R>
-       ESHandle<T> getHandle(const ESGetToken<T, R>& iToken) const {
-          if constexpr ( std::is_same_v<R, edm::DefaultRecord> ) {
-             auto const& rec = this->get<eventsetup::default_record_t<ESHandle<T>>>();
-             return rec.getHandle(iToken);
-          } else {
-             auto const& rec = this->get<R>();
-             return rec.getHandle(iToken);
-          }
+    template <typename T>
+    T get() const {
+      using namespace eventsetup;
+      using namespace eventsetup::heterocontainer;
+      //NOTE: this will catch the case where T does not inherit from EventSetupRecord
+      //  HOWEVER the error message under gcc 3.x is awful
+      static_assert(std::is_base_of_v<edm::eventsetup::EventSetupRecord, T>,
+                    "Trying to get a class that is not a Record from EventSetup");
+
+      auto const temp = m_setup.findImpl(makeKey<typename type_from_itemtype<eventsetup::EventSetupRecordKey, T>::Type,
+                                                 eventsetup::EventSetupRecordKey>());
+      if (nullptr == temp) {
+        throw eventsetup::NoRecordException<T>(recordDoesExist(m_setup, eventsetup::EventSetupRecordKey::makeKey<T>()));
       }
+      T returnValue;
+      returnValue.setImpl(temp, m_id, m_getTokenIndices);
+      return returnValue;
+    }
 
-      std::optional<eventsetup::EventSetupRecordGeneric> find(const eventsetup::EventSetupRecordKey& iKey) const {
-         return m_setup.find(iKey);
+    /** returns the Record of type T.  If no such record available
+       a null pointer is returned */
+    template <typename T>
+    std::optional<T> tryToGet() const {
+      using namespace eventsetup;
+      using namespace eventsetup::heterocontainer;
+
+      //NOTE: this will catch the case where T does not inherit from EventSetupRecord
+      static_assert(std::is_base_of_v<edm::eventsetup::EventSetupRecord, T>,
+                    "Trying to get a class that is not a Record from EventSetup");
+      auto const temp = impl().findImpl(makeKey<typename type_from_itemtype<eventsetup::EventSetupRecordKey, T>::Type,
+                                                eventsetup::EventSetupRecordKey>());
+      if (temp != nullptr) {
+        T rec;
+        rec.setImpl(temp, m_id, m_getTokenIndices);
+        return rec;
       }
-
-      ///clears the oToFill vector and then fills it with the keys for all available records
-      void fillAvailableRecordKeys(std::vector<eventsetup::EventSetupRecordKey>& oToFill) const {
-         m_setup.fillAvailableRecordKeys(oToFill);
+      return std::nullopt;
+    }
+
+    /** can directly access data if data_default_record_trait<> is defined for this data type **/
+    template <typename T>
+    bool getData(T& iHolder) const {
+      return getData(std::string{}, iHolder);
+    }
+
+    template <typename T>
+    bool getData(const std::string& iLabel, T& iHolder) const {
+      auto const& rec = this->get<eventsetup::default_record_t<T>>();
+      return rec.get(iLabel, iHolder);
+    }
+
+    template <typename T>
+    bool getData(const ESInputTag& iTag, T& iHolder) const {
+      auto const& rec = this->get<eventsetup::default_record_t<T>>();
+      return rec.get(iTag, iHolder);
+    }
+
+    template <typename T, typename R>
+    T const& getData(const ESGetToken<T, R>& iToken) const noexcept(false) {
+      return this
+          ->get<std::conditional_t<std::is_same_v<R, edm::DefaultRecord>, eventsetup::default_record_t<ESHandle<T>>, R>>()
+          .get(iToken);
+    }
+    template <typename T, typename R>
+    T const& getData(ESGetToken<T, R>& iToken) const noexcept(false) {
+      return this->getData(const_cast<const ESGetToken<T, R>&>(iToken));
+    }
+
+    template <typename T, typename R>
+    ESHandle<T> getHandle(const ESGetToken<T, R>& iToken) const {
+      if constexpr (std::is_same_v<R, edm::DefaultRecord>) {
+        auto const& rec = this->get<eventsetup::default_record_t<ESHandle<T>>>();
+        return rec.getHandle(iToken);
+      } else {
+        auto const& rec = this->get<R>();
+        return rec.getHandle(iToken);
       }
-      ///returns true if the Record is provided by a Source or a Producer
-      /// a value of true does not mean this EventSetup object holds such a record
-      bool recordIsProvidedByAModule( eventsetup::EventSetupRecordKey const& iKey) const {
-         return m_setup.recordIsProvidedByAModule(iKey);
+    }
+
+    template <typename T, typename R>
+    ESTransientHandle<T> getTransientHandle(const ESGetToken<T, R>& iToken) const {
+      if constexpr (std::is_same_v<R, edm::DefaultRecord>) {
+        auto const& rec = this->get<eventsetup::default_record_t<ESTransientHandle<T>>>();
+        return rec.getTransientHandle(iToken);
+      } else {
+        auto const& rec = this->get<R>();
+        return rec.getTransientHandle(iToken);
       }
-      // ---------- static member functions --------------------
-      
-    private:
-      edm::EventSetupImpl const& impl() const {return m_setup;}
-
-
-      // ---------- member data --------------------------------
-     edm::EventSetupImpl const& m_setup;
+    }
+
+    std::optional<eventsetup::EventSetupRecordGeneric> find(const eventsetup::EventSetupRecordKey& iKey) const {
+      return m_setup.find(iKey, m_id, m_getTokenIndices);
+    }
+
+    ///clears the oToFill vector and then fills it with the keys for all available records
+    void fillAvailableRecordKeys(std::vector<eventsetup::EventSetupRecordKey>& oToFill) const {
+      m_setup.fillAvailableRecordKeys(oToFill);
+    }
+    ///returns true if the Record is provided by a Source or a Producer
+    /// a value of true does not mean this EventSetup object holds such a record
+    bool recordIsProvidedByAModule(eventsetup::EventSetupRecordKey const& iKey) const {
+      return m_setup.recordIsProvidedByAModule(iKey);
+    }
+    // ---------- static member functions --------------------
+
+  private:
+    edm::EventSetupImpl const& impl() const { return m_setup; }
+
+    // ---------- member data --------------------------------
+    edm::EventSetupImpl const& m_setup;
+    ESProxyIndex const* m_getTokenIndices;
+    unsigned int m_id;
   };
 
   // Free functions to retrieve an object from the EventSetup.
@@ -150,18 +190,20 @@ namespace edm {
     // throw if the record is not available
     setup.get<R>().get(handle);
     // throw if the handle is not valid
-    return * handle.product();
+    return *handle.product();
   }
 
-  template <typename T, typename R = typename eventsetup::data_default_record_trait<typename T::value_type>::type, typename L>
-  T const& get(EventSetup const& setup, L && label) {
+  template <typename T,
+            typename R = typename eventsetup::data_default_record_trait<typename T::value_type>::type,
+            typename L>
+  T const& get(EventSetup const& setup, L&& label) {
     ESHandle<T> handle;
     // throw if the record is not available
     setup.get<R>().get(std::forward(label), handle);
     // throw if the handle is not valid
-    return * handle.product();
+    return *handle.product();
   }
 
-}
+}  // namespace edm
 
-#endif // FWCore_Framework_EventSetup_h
+#endif  // FWCore_Framework_EventSetup_h
diff --git a/FWCore/Framework/interface/EventSetupImpl.h b/FWCore/Framework/interface/EventSetupImpl.h
index de1ee636e4866..465058e3efc2f 100644
--- a/FWCore/Framework/interface/EventSetupImpl.h
+++ b/FWCore/Framework/interface/EventSetupImpl.h
@@ -19,146 +19,76 @@
 //
 
 // system include files
-#include <cassert>
 #include <map>
 #include <optional>
-#include <string>
-#include <type_traits>
 #include <vector>
 
 // user include files
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetupRecordKey.h"
 #include "FWCore/Framework/interface/EventSetupRecord.h"
-#include "FWCore/Framework/interface/HCMethods.h"
-#include "FWCore/Framework/interface/NoRecordException.h"
-#include "FWCore/Framework/interface/IOVSyncValue.h"
-#include "FWCore/Framework/interface/data_default_record_trait.h"
-#include "FWCore/Utilities/interface/Transition.h"
+#include "FWCore/Utilities/interface/ESIndices.h"
 
 // forward declarations
 
 namespace edm {
-   class ActivityRegistry;
-   class ESInputTag;
-   template <class T>
-   class ESGetTokenT;
-
-   namespace eventsetup {
-      class EventSetupProvider;
-      class EventSetupRecord;
-      class EventSetupRecordImpl;
-   }
-
-  class EventSetupImpl
-  {
+  class ActivityRegistry;
+  class ESInputTag;
+
+  namespace eventsetup {
+    class EventSetupProvider;
+    class EventSetupRecordImpl;
+  }  // namespace eventsetup
+
+  class EventSetupImpl {
     ///Only EventSetupProvider allowed to create a EventSetup
     friend class eventsetup::EventSetupProvider;
-    public:
-      ~EventSetupImpl();
-
-      EventSetupImpl(EventSetupImpl const&) = delete;
-      EventSetupImpl& operator=(EventSetupImpl const&) = delete;
-
-      // ---------- const member functions ---------------------
-      /** returns the Record of type T.  If no such record available
-          a eventsetup::NoRecordException<T> is thrown */
-      template< typename T>
-         T get() const {
-           using namespace eventsetup;
-           using namespace eventsetup::heterocontainer;
-            //NOTE: this will catch the case where T does not inherit from EventSetupRecord
-            //  HOWEVER the error message under gcc 3.x is awful
-            static_assert(std::is_base_of_v<edm::eventsetup::EventSetupRecord, T>, "Trying to get a class that is not a Record from EventSetup");
-
-           auto const temp = findImpl(makeKey<typename type_from_itemtype<eventsetup::EventSetupRecordKey,T>::Type,eventsetup::EventSetupRecordKey>());
-           if(nullptr == temp) {
-             throw eventsetup::NoRecordException<T>(recordDoesExist(*this, eventsetup::EventSetupRecordKey::makeKey<T>()));
-           }
-           T returnValue;
-           returnValue.setImpl(temp);
-           return returnValue;
-         }
-
-      /** returns the Record of type T.  If no such record available
-       a null pointer is returned */
-      template< typename T>
-        std::optional<T> tryToGet() const {
-           using namespace eventsetup;
-           using namespace eventsetup::heterocontainer;
-
-           //NOTE: this will catch the case where T does not inherit from EventSetupRecord
-           static_assert(std::is_base_of_v<edm::eventsetup::EventSetupRecord, T>,"Trying to get a class that is not a Record from EventSetup");
-           auto const temp = findImpl(makeKey<typename type_from_itemtype<eventsetup::EventSetupRecordKey,T>::Type,eventsetup::EventSetupRecordKey>());
-           if(temp != nullptr) {
-              T rec;
-              rec.setImpl(temp);
-              return rec;
-           }
-           return std::nullopt;
-        }
-
-      /** can directly access data if data_default_record_trait<> is defined for this data type **/
-      template< typename T>
-         bool getData(T& iHolder) const {
-            return getData(std::string{}, iHolder);
-         }
-
-      template< typename T>
-         bool getData(const std::string& iLabel, T& iHolder) const {
-            auto const& rec = this->get<eventsetup::default_record_t<T>>();
-            return rec.get(iLabel, iHolder);
-         }
-
-      template< typename T>
-        bool getData(const ESInputTag& iTag, T& iHolder) const {
-           auto const& rec = this->get<eventsetup::default_record_t<T>>();
-           return rec.get(iTag, iHolder);
-        }
-
-      template <typename T>
-      bool getData(const ESGetTokenT<T>& iToken, ESHandle<T>& iHolder) const {
-        return getData(iToken.m_tag, iHolder);
-      }
-
-      std::optional<eventsetup::EventSetupRecordGeneric> find(const eventsetup::EventSetupRecordKey&) const;
-
-      ///clears the oToFill vector and then fills it with the keys for all available records
-      void fillAvailableRecordKeys(std::vector<eventsetup::EventSetupRecordKey>& oToFill) const;
-
-      ///returns true if the Record is provided by a Source or a Producer
-      /// a value of true does not mean this EventSetup object holds such a record
-      bool recordIsProvidedByAModule( eventsetup::EventSetupRecordKey const& ) const;
-      // ---------- static member functions --------------------
-
-      friend class eventsetup::EventSetupRecordImpl;
-
-    protected:
-
-      void add(const eventsetup::EventSetupRecordImpl& iRecord);
-
-      void clear();
-
-    private:
-      EventSetupImpl(ActivityRegistry const*);
-
-      ActivityRegistry const* activityRegistry() const { return activityRegistry_; }
-      eventsetup::EventSetupRecordImpl const* findImpl(const eventsetup::EventSetupRecordKey&) const;
-
-      void insert(const eventsetup::EventSetupRecordKey&,
-                  const eventsetup::EventSetupRecordImpl*);
-
-      void setKeyIters(std::vector<eventsetup::EventSetupRecordKey>::const_iterator const& keysBegin,
-                       std::vector<eventsetup::EventSetupRecordKey>::const_iterator const& keysEnd);
-
-      // ---------- member data --------------------------------
-
-      std::vector<eventsetup::EventSetupRecordKey>::const_iterator keysBegin_;
-      std::vector<eventsetup::EventSetupRecordKey>::const_iterator keysEnd_;
-      std::vector<eventsetup::EventSetupRecordImpl const*> recordImpls_;
-      ActivityRegistry const* activityRegistry_;
+
+  public:
+    ~EventSetupImpl();
+
+    EventSetupImpl(EventSetupImpl const&) = delete;
+    EventSetupImpl& operator=(EventSetupImpl const&) = delete;
+
+    // ---------- const member functions ---------------------
+    eventsetup::EventSetupRecordImpl const* findImpl(const eventsetup::EventSetupRecordKey&) const;
+
+    std::optional<eventsetup::EventSetupRecordGeneric> find(const eventsetup::EventSetupRecordKey&,
+                                                            unsigned int iTransitionID,
+                                                            ESProxyIndex const* getTokenIndices) const;
+
+    ///clears the oToFill vector and then fills it with the keys for all available records
+    void fillAvailableRecordKeys(std::vector<eventsetup::EventSetupRecordKey>& oToFill) const;
+
+    ///returns true if the Record is provided by a Source or a Producer
+    /// a value of true does not mean this EventSetup object holds such a record
+    bool recordIsProvidedByAModule(eventsetup::EventSetupRecordKey const&) const;
+    // ---------- static member functions --------------------
+
+    friend class eventsetup::EventSetupRecordImpl;
+
+  protected:
+    void add(const eventsetup::EventSetupRecordImpl& iRecord);
+
+    void clear();
+
+  private:
+    EventSetupImpl(ActivityRegistry const*);
+
+    ActivityRegistry const* activityRegistry() const { return activityRegistry_; }
+
+    void insert(const eventsetup::EventSetupRecordKey&, const eventsetup::EventSetupRecordImpl*);
+
+    void setKeyIters(std::vector<eventsetup::EventSetupRecordKey>::const_iterator const& keysBegin,
+                     std::vector<eventsetup::EventSetupRecordKey>::const_iterator const& keysEnd);
+
+    // ---------- member data --------------------------------
+
+    std::vector<eventsetup::EventSetupRecordKey>::const_iterator keysBegin_;
+    std::vector<eventsetup::EventSetupRecordKey>::const_iterator keysEnd_;
+    std::vector<eventsetup::EventSetupRecordImpl const*> recordImpls_;
+    ActivityRegistry const* activityRegistry_;
   };
 
-}
+}  // namespace edm
 
-#endif // FWCore_Framework_EventSetup_h
+#endif  // FWCore_Framework_EventSetup_h
diff --git a/FWCore/Framework/interface/EventSetupProvider.h b/FWCore/Framework/interface/EventSetupProvider.h
index 686a303641444..5abf1646715ab 100644
--- a/FWCore/Framework/interface/EventSetupProvider.h
+++ b/FWCore/Framework/interface/EventSetupProvider.h
@@ -29,27 +29,26 @@
 #include <string>
 #include <vector>
 
-
 // forward declarations
 namespace edm {
-   class ActivityRegistry;
-   class EventSetupRecordIntervalFinder;
-   class IOVSyncValue;
-   class ParameterSet;
-
-   namespace eventsetup {
-      struct ComponentDescription;
-      class DataKey;
-      class DataProxyProvider;
-      class EventSetupRecordImpl;
-      class EventSetupRecordKey;
-      class EventSetupRecordProvider;
-      class EventSetupsController;
-      class ParameterSetIDHolder;
-
-class EventSetupProvider {
-
-   public:
+  class ActivityRegistry;
+  class EventSetupRecordIntervalFinder;
+  class IOVSyncValue;
+  class ParameterSet;
+
+  namespace eventsetup {
+    struct ComponentDescription;
+    class DataKey;
+    class DataProxyProvider;
+    class EventSetupRecordImpl;
+    class EventSetupRecordKey;
+    class EventSetupRecordProvider;
+    class EventSetupsController;
+    class ParameterSetIDHolder;
+    class ESRecordsToProxyIndices;
+
+    class EventSetupProvider {
+    public:
       typedef std::string RecordName;
       typedef std::string DataType;
       typedef std::string DataLabel;
@@ -57,19 +56,22 @@ class EventSetupProvider {
       typedef std::multimap<RecordName, DataKeyInfo> RecordToDataMap;
       typedef std::map<ComponentDescription, RecordToDataMap> PreferredProviderInfo;
 
-      EventSetupProvider(ActivityRegistry*, unsigned subProcessIndex = 0U, PreferredProviderInfo const* iInfo = nullptr);
+      EventSetupProvider(ActivityRegistry*,
+                         unsigned subProcessIndex = 0U,
+                         PreferredProviderInfo const* iInfo = nullptr);
       virtual ~EventSetupProvider();
 
       // ---------- const member functions ---------------------
       std::set<ComponentDescription> proxyProviderDescriptions() const;
-      bool isWithinValidityInterval(IOVSyncValue const& ) const;
-  
+      bool isWithinValidityInterval(IOVSyncValue const&) const;
+
+      ESRecordsToProxyIndices recordsToProxyIndices() const;
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------
       EventSetupImpl const& eventSetupForInstance(IOVSyncValue const&);
 
-      EventSetupImpl const& eventSetup() const {return eventSetup_;}
+      EventSetupImpl const& eventSetup() const { return eventSetup_; }
 
       //called by specializations of EventSetupRecordProviders
       void addRecordToEventSetup(EventSetupRecordImpl& iRecord);
@@ -86,14 +88,15 @@ class EventSetupProvider {
       ///Used when testing that all code properly updates on IOV changes of all Records
       void forceCacheClear();
 
-      void checkESProducerSharing(EventSetupProvider & precedingESProvider,
-                                  std::set<ParameterSetIDHolder>& sharingCheckDone,
-                                  std::map<EventSetupRecordKey, std::vector<ComponentDescription const*> >& referencedESProducers,
-                                  EventSetupsController & esController);
+      void checkESProducerSharing(
+          EventSetupProvider& precedingESProvider,
+          std::set<ParameterSetIDHolder>& sharingCheckDone,
+          std::map<EventSetupRecordKey, std::vector<ComponentDescription const*>>& referencedESProducers,
+          EventSetupsController& esController);
 
-      bool doRecordsMatch(EventSetupProvider & precedingESProvider,
+      bool doRecordsMatch(EventSetupProvider& precedingESProvider,
                           EventSetupRecordKey const& eventSetupRecordKey,
-                          std::map<EventSetupRecordKey, bool> & allComponentsMatch,
+                          std::map<EventSetupRecordKey, bool>& allComponentsMatch,
                           EventSetupsController const& esController);
 
       void fillReferencedDataKeys(EventSetupRecordKey const& eventSetupRecordKey);
@@ -109,15 +112,13 @@ class EventSetupProvider {
       /// Intended for use only in tests
       void addRecord(const EventSetupRecordKey& iKey);
 
-   protected:
-
+    protected:
       void insert(std::unique_ptr<EventSetupRecordProvider> iRecordProvider);
 
-   private:
-
-      EventSetupProvider(EventSetupProvider const&) = delete; // stop default
+    private:
+      EventSetupProvider(EventSetupProvider const&) = delete;  // stop default
 
-      EventSetupProvider const& operator=(EventSetupProvider const&) = delete; // stop default
+      EventSetupProvider const& operator=(EventSetupProvider const&) = delete;  // stop default
 
       std::shared_ptr<EventSetupRecordProvider>& recordProvider(const EventSetupRecordKey& iKey);
       EventSetupRecordProvider* tryToGetRecordProvider(const EventSetupRecordKey& iKey);
@@ -140,15 +141,16 @@ class EventSetupProvider {
       // The following are all used only during initialization and then cleared.
 
       std::unique_ptr<PreferredProviderInfo> preferredProviderInfo_;
-      std::unique_ptr<std::vector<std::shared_ptr<EventSetupRecordIntervalFinder> > > finders_;
-      std::unique_ptr<std::vector<std::shared_ptr<DataProxyProvider> > > dataProviders_;
-      std::unique_ptr<std::map<EventSetupRecordKey, std::map<DataKey, ComponentDescription const*> > > referencedDataKeys_;
-      std::unique_ptr<std::map<EventSetupRecordKey, std::vector<std::shared_ptr<EventSetupRecordIntervalFinder> > > > recordToFinders_;
-      std::unique_ptr<std::map<ParameterSetIDHolder, std::set<EventSetupRecordKey> > > psetIDToRecordKey_;
-      std::unique_ptr<std::map<EventSetupRecordKey, std::map<DataKey, ComponentDescription> > > recordToPreferred_;
-      std::unique_ptr<std::set<EventSetupRecordKey> > recordsWithALooperProxy_;
-};
-
-   }
-}
+      std::unique_ptr<std::vector<std::shared_ptr<EventSetupRecordIntervalFinder>>> finders_;
+      std::unique_ptr<std::vector<std::shared_ptr<DataProxyProvider>>> dataProviders_;
+      std::unique_ptr<std::map<EventSetupRecordKey, std::map<DataKey, ComponentDescription const*>>> referencedDataKeys_;
+      std::unique_ptr<std::map<EventSetupRecordKey, std::vector<std::shared_ptr<EventSetupRecordIntervalFinder>>>>
+          recordToFinders_;
+      std::unique_ptr<std::map<ParameterSetIDHolder, std::set<EventSetupRecordKey>>> psetIDToRecordKey_;
+      std::unique_ptr<std::map<EventSetupRecordKey, std::map<DataKey, ComponentDescription>>> recordToPreferred_;
+      std::unique_ptr<std::set<EventSetupRecordKey>> recordsWithALooperProxy_;
+    };
+
+  }  // namespace eventsetup
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/EventSetupProviderMaker.h b/FWCore/Framework/interface/EventSetupProviderMaker.h
index 602f89a34beaa..ce6532a2d2047 100644
--- a/FWCore/Framework/interface/EventSetupProviderMaker.h
+++ b/FWCore/Framework/interface/EventSetupProviderMaker.h
@@ -12,16 +12,13 @@ namespace edm {
     class EventSetupProvider;
     class EventSetupsController;
 
-    std::unique_ptr<EventSetupProvider>
-    makeEventSetupProvider(ParameterSet const& params, unsigned subProcessIndex, ActivityRegistry*);
+    std::unique_ptr<EventSetupProvider> makeEventSetupProvider(ParameterSet const& params,
+                                                               unsigned subProcessIndex,
+                                                               ActivityRegistry*);
 
-    void
-    fillEventSetupProvider(EventSetupsController& esController,
-                           EventSetupProvider& cp,
-                           ParameterSet& params);
+    void fillEventSetupProvider(EventSetupsController& esController, EventSetupProvider& cp, ParameterSet& params);
 
-    void
-    validateEventSetupParameters(ParameterSet& pset);
-  }
-}
+    void validateEventSetupParameters(ParameterSet& pset);
+  }  // namespace eventsetup
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/EventSetupRecord.h b/FWCore/Framework/interface/EventSetupRecord.h
index c6822000fca85..32d755a789bc3 100644
--- a/FWCore/Framework/interface/EventSetupRecord.h
+++ b/FWCore/Framework/interface/EventSetupRecord.h
@@ -47,7 +47,6 @@ using the 'setEventSetup' and 'clearEventSetup' functions.
 // Created:     Fri Mar 25 14:38:35 EST 2005
 //
 
-
 // user include files
 #include "FWCore/Framework/interface/FunctorESHandleExceptionFactory.h"
 #include "FWCore/Framework/interface/DataKey.h"
@@ -56,6 +55,8 @@ using the 'setEventSetup' and 'clearEventSetup' functions.
 #include "FWCore/Framework/interface/EventSetupRecordImpl.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"
 #include "FWCore/Utilities/interface/ESInputTag.h"
+#include "FWCore/Utilities/interface/ESIndices.h"
+#include "FWCore/Utilities/interface/Likely.h"
 
 // system include files
 #include <exception>
@@ -64,106 +65,110 @@ using the 'setEventSetup' and 'clearEventSetup' functions.
 #include <utility>
 #include <vector>
 #include <atomic>
+#include <cassert>
+#include <limits>
 
 // forward declarations
 namespace cms {
-   class Exception;
+  class Exception;
 }
 
 class testEventsetup;
 class testEventsetupRecord;
 
 namespace edm {
-   template<typename T>
-   class ESHandle;
-   class ESHandleExceptionFactory;
-   class ESInputTag;
-   class EventSetupImpl;
-
-   namespace eventsetup {
-      struct ComponentDescription;
-      class DataProxy;
-      class EventSetupRecordKey;
-
-      class EventSetupRecord {
-
-        friend class ::testEventsetup;
-        friend class ::testEventsetupRecord;
-      public:
-         EventSetupRecord();
-         EventSetupRecord(EventSetupRecord&&) = default;
-         EventSetupRecord& operator=(EventSetupRecord&&) = default;
-
-         EventSetupRecord(EventSetupRecord const&) = default;
-         EventSetupRecord& operator=(EventSetupRecord const&) = default;
-         virtual ~EventSetupRecord();
-
-         // ---------- const member functions ---------------------
-         ValidityInterval const& validityInterval() const {
-            return impl_->validityInterval();
-         }
-
-        void setImpl( EventSetupRecordImpl const* iImpl ) { impl_ = iImpl; }
-
-         template<typename HolderT>
-         bool get(HolderT& iHolder) const {
-            return get("", iHolder);
-         }
-
-         template<typename HolderT>
-         bool get(char const* iName, HolderT& iHolder) const {
-            typename HolderT::value_type const* value = nullptr;
-            ComponentDescription const* desc = nullptr;
-            std::shared_ptr<ESHandleExceptionFactory> whyFailedFactory;
-            impl_->getImplementation(value, iName, desc, iHolder.transientAccessOnly, whyFailedFactory);
-
-            if(value) {
-              iHolder = HolderT(value, desc);
-              return true;
-            } else {
-              iHolder = HolderT(std::move(whyFailedFactory));
-              return false;
-            }
-         }
-         template<typename HolderT>
-         bool get(std::string const& iName, HolderT& iHolder) const {
-           return get(iName.c_str(), iHolder);
-         }
-
-         template<typename HolderT>
-         bool get(ESInputTag const& iTag, HolderT& iHolder) const {
-            typename HolderT::value_type const* value = nullptr;
-            ComponentDescription const* desc = nullptr;
-            std::shared_ptr<ESHandleExceptionFactory> whyFailedFactory;
-            impl_->getImplementation(value, iTag.data().c_str(), desc, iHolder.transientAccessOnly, whyFailedFactory);
-
-            if(value) {
-              validate(desc, iTag);
-              iHolder = HolderT(value, desc);
-              return true;
-            } else {
-              iHolder = HolderT(std::move(whyFailedFactory));
-              return false;
-            }
-         }
-
-         ///returns false if no data available for key
-         bool doGet(DataKey const& aKey, bool aGetTransiently = false) const;
-
-         /**returns true only if someone has already requested data for this key
+  template <typename T>
+  class ESHandle;
+  class ESHandleExceptionFactory;
+  class ESInputTag;
+  class EventSetupImpl;
+
+  namespace eventsetup {
+    struct ComponentDescription;
+    class DataProxy;
+    class EventSetupRecordKey;
+
+    class EventSetupRecord {
+      friend class ::testEventsetup;
+      friend class ::testEventsetupRecord;
+
+    public:
+      EventSetupRecord();
+      EventSetupRecord(EventSetupRecord&&) = default;
+      EventSetupRecord& operator=(EventSetupRecord&&) = default;
+
+      EventSetupRecord(EventSetupRecord const&) = default;
+      EventSetupRecord& operator=(EventSetupRecord const&) = default;
+      virtual ~EventSetupRecord();
+
+      // ---------- const member functions ---------------------
+      ValidityInterval const& validityInterval() const { return impl_->validityInterval(); }
+
+      void setImpl(EventSetupRecordImpl const* iImpl, unsigned int transitionID, ESProxyIndex const* getTokenIndices) {
+        impl_ = iImpl;
+        transitionID_ = transitionID;
+        getTokenIndices_ = getTokenIndices;
+      }
+
+      template <typename HolderT>
+      bool get(HolderT& iHolder) const {
+        return get("", iHolder);
+      }
+
+      template <typename HolderT>
+      bool get(char const* iName, HolderT& iHolder) const {
+        typename HolderT::value_type const* value = nullptr;
+        ComponentDescription const* desc = nullptr;
+        std::shared_ptr<ESHandleExceptionFactory> whyFailedFactory;
+        impl_->getImplementation(value, iName, desc, iHolder.transientAccessOnly, whyFailedFactory);
+
+        if (value) {
+          iHolder = HolderT(value, desc);
+          return true;
+        } else {
+          iHolder = HolderT(std::move(whyFailedFactory));
+          return false;
+        }
+      }
+      template <typename HolderT>
+      bool get(std::string const& iName, HolderT& iHolder) const {
+        return get(iName.c_str(), iHolder);
+      }
+
+      template <typename HolderT>
+      bool get(ESInputTag const& iTag, HolderT& iHolder) const {
+        typename HolderT::value_type const* value = nullptr;
+        ComponentDescription const* desc = nullptr;
+        std::shared_ptr<ESHandleExceptionFactory> whyFailedFactory;
+        impl_->getImplementation(value, iTag.data().c_str(), desc, iHolder.transientAccessOnly, whyFailedFactory);
+
+        if (value) {
+          validate(desc, iTag);
+          iHolder = HolderT(value, desc);
+          return true;
+        } else {
+          iHolder = HolderT(std::move(whyFailedFactory));
+          return false;
+        }
+      }
+
+      ///returns false if no data available for key
+      bool doGet(DataKey const& aKey, bool aGetTransiently = false) const;
+
+      /**returns true only if someone has already requested data for this key
           and the data was retrieved
           */
-         bool wasGotten(DataKey const& aKey) const;
+      bool wasGotten(DataKey const& aKey) const;
 
-         /**returns the ComponentDescription for the module which creates the data or 0
+      /**returns the ComponentDescription for the module which creates the data or 0
           if no module has been registered for the data. This does not cause the data to
           actually be constructed.
           */
-         ComponentDescription const* providerDescription(DataKey const& aKey) const;
+      ComponentDescription const* providerDescription(DataKey const& aKey) const;
 
-         virtual EventSetupRecordKey key() const = 0;
+      virtual EventSetupRecordKey key() const = 0;
 
-         /**If you are caching data from the Record, you should also keep
+      /**If you are caching data from the Record, you should also keep
           this number.  If this number changes then you know that
           the data you have cached is invalid. This is NOT true if
           if the validityInterval() hasn't changed since it is possible that
@@ -173,57 +178,95 @@ namespace edm {
           The value of '0' will never be returned so you can use that to
           denote that you have not yet checked the value.
           */
-         unsigned long long cacheIdentifier() const {
-            return impl_->cacheIdentifier();
-         }
-
-         ///clears the oToFill vector and then fills it with the keys for all registered data keys
-         void fillRegisteredDataKeys(std::vector<DataKey>& oToFill) const {
-           impl_->fillRegisteredDataKeys(oToFill);
-         }
-      protected:
-
-         template<typename T, typename R>
-         ESHandle<T> getHandleImpl(ESGetToken<T,R> const& iToken) const {
-           ESHandle<T> h;
-           (void) get(iToken.m_tag, h);
-           return h;
-         }
-        
-
-         DataProxy const* find(DataKey const& aKey) const ;
-
-         EventSetupImpl const& eventSetup() const {
-            return impl_->eventSetup();
-         }
-
-         void validate(ComponentDescription const*, ESInputTag const&) const;
-
-         void addTraceInfoToCmsException(cms::Exception& iException, char const* iName, ComponentDescription const*, DataKey const&) const;
-         void changeStdExceptionToCmsException(char const* iExceptionWhatMessage, char const* iName, ComponentDescription const*, DataKey const&) const;
-
-        EventSetupRecordImpl const* impl() const { return impl_;}
-      private:
-
-         void const* getFromProxy(DataKey const& iKey ,
-                                  ComponentDescription const*& iDesc,
-                                  bool iTransientAccessOnly) const;
-
-
-         // ---------- member data --------------------------------
-         EventSetupRecordImpl const* impl_ = nullptr;
-      };
-
-     class EventSetupRecordGeneric : public EventSetupRecord {
-     public:
-       EventSetupRecordGeneric(EventSetupRecordImpl const* iImpl) {
-         setImpl(iImpl);
-       }
-
-       EventSetupRecordKey key() const final {
-         return impl()->key();
-       }
-     };
-   }
-}
+      unsigned long long cacheIdentifier() const { return impl_->cacheIdentifier(); }
+
+      ///clears the oToFill vector and then fills it with the keys for all registered data keys
+      void fillRegisteredDataKeys(std::vector<DataKey>& oToFill) const { impl_->fillRegisteredDataKeys(oToFill); }
+
+    protected:
+      template <template <typename> typename H, typename T, typename R>
+      H<T> getHandleImpl(ESGetToken<T, R> const& iToken) const {
+        assert(iToken.transitionID() == transitionID());
+        assert(iToken.isInitialized());
+        assert(getTokenIndices_);
+        //need to check token has valid index
+        if
+          UNLIKELY(not iToken.hasValidIndex()) { return invalidTokenHandle<H>(iToken); }
+
+        auto proxyIndex = getTokenIndices_[iToken.index().value()];
+        if
+          UNLIKELY(proxyIndex.value() == std::numeric_limits<int>::max()) { return noProxyHandle<H>(iToken); }
+
+        T const* value = nullptr;
+        ComponentDescription const* desc = nullptr;
+        std::shared_ptr<ESHandleExceptionFactory> whyFailedFactory;
+        impl_->getImplementation(value, proxyIndex, H<T>::transientAccessOnly, desc, whyFailedFactory);
+
+        if
+          UNLIKELY(not value) { return H<T>(std::move(whyFailedFactory)); }
+        return H<T>(value, desc);
+      }
+
+      DataProxy const* find(DataKey const& aKey) const;
+
+      EventSetupImpl const& eventSetup() const { return impl_->eventSetup(); }
+
+      ESProxyIndex const* getTokenIndices() const { return getTokenIndices_; }
+
+      void validate(ComponentDescription const*, ESInputTag const&) const;
+
+      void addTraceInfoToCmsException(cms::Exception& iException,
+                                      char const* iName,
+                                      ComponentDescription const*,
+                                      DataKey const&) const;
+      void changeStdExceptionToCmsException(char const* iExceptionWhatMessage,
+                                            char const* iName,
+                                            ComponentDescription const*,
+                                            DataKey const&) const;
+
+      EventSetupRecordImpl const* impl() const { return impl_; }
+
+      unsigned int transitionID() const { return transitionID_; }
+
+    private:
+      template <template <typename> typename H, typename T, typename R>
+      H<T> invalidTokenHandle(ESGetToken<T, R> const& iToken) const {
+        auto const key = this->key();
+        return H<T>{
+            makeESHandleExceptionFactory([key] { return makeInvalidTokenException(key, DataKey::makeTypeTag<T>()); })};
+      }
+
+      template <template <typename> typename H, typename T, typename R>
+      H<T> noProxyHandle(ESGetToken<T, R> const& iToken) const {
+        auto const key = this->key();
+        auto name = iToken.name();
+        return H<T>{makeESHandleExceptionFactory([key, name] {
+          NoProxyException<T> ex(key, DataKey{DataKey::makeTypeTag<T>(), name});
+          return std::make_exception_ptr(ex);
+        })};
+      }
+
+      void const* getFromProxy(DataKey const& iKey,
+                               ComponentDescription const*& iDesc,
+                               bool iTransientAccessOnly) const;
+
+      static std::exception_ptr makeInvalidTokenException(EventSetupRecordKey const&, TypeTag const&);
+      // ---------- member data --------------------------------
+      EventSetupRecordImpl const* impl_ = nullptr;
+      ESProxyIndex const* getTokenIndices_ = nullptr;
+      unsigned int transitionID_ = std::numeric_limits<unsigned int>::max();
+    };
+
+    class EventSetupRecordGeneric : public EventSetupRecord {
+    public:
+      EventSetupRecordGeneric(EventSetupRecordImpl const* iImpl,
+                              unsigned int iTransitionID,
+                              ESProxyIndex const* getTokenIndices) {
+        setImpl(iImpl, iTransitionID, getTokenIndices);
+      }
+
+      EventSetupRecordKey key() const final { return impl()->key(); }
+    };
+  }  // namespace eventsetup
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/EventSetupRecordImpl.h b/FWCore/Framework/interface/EventSetupRecordImpl.h
index af1bbca034132..87cd007dccf5c 100644
--- a/FWCore/Framework/interface/EventSetupRecordImpl.h
+++ b/FWCore/Framework/interface/EventSetupRecordImpl.h
@@ -47,7 +47,6 @@ using the 'setEventSetup' and 'clearEventSetup' functions.
 // Created:     Fri Mar 25 14:38:35 EST 2005
 //
 
-
 // user include files
 #include "FWCore/Framework/interface/FunctorESHandleExceptionFactory.h"
 #include "FWCore/Framework/interface/DataKey.h"
@@ -56,6 +55,7 @@ using the 'setEventSetup' and 'clearEventSetup' functions.
 #include "FWCore/Framework/interface/EventSetupRecordKey.h"
 #include "FWCore/Utilities/interface/propagate_const.h"
 #include "FWCore/Utilities/interface/ESInputTag.h"
+#include "FWCore/Utilities/interface/ESIndices.h"
 
 // system include files
 #include <exception>
@@ -64,50 +64,48 @@ using the 'setEventSetup' and 'clearEventSetup' functions.
 #include <utility>
 #include <vector>
 #include <atomic>
+#include <cassert>
 
 // forward declarations
 namespace cms {
-   class Exception;
+  class Exception;
 }
 
 namespace edm {
-   class ESHandleExceptionFactory;
-   class ESInputTag;
-   class EventSetupImpl;
-
-   namespace eventsetup {
-      struct ComponentDescription;
-      class DataProxy;
+  class ESHandleExceptionFactory;
+  class ESInputTag;
+  class EventSetupImpl;
 
-      class EventSetupRecordImpl {
+  namespace eventsetup {
+    struct ComponentDescription;
+    class DataProxy;
 
-        friend class EventSetupRecord;
+    class EventSetupRecordImpl {
+      friend class EventSetupRecord;
 
-      public:
-         EventSetupRecordImpl(const EventSetupRecordKey& iKey);
+    public:
+      EventSetupRecordImpl(const EventSetupRecordKey& iKey);
 
-         // ---------- const member functions ---------------------
-         ValidityInterval const& validityInterval() const {
-            return validity_;
-         }
+      // ---------- const member functions ---------------------
+      ValidityInterval const& validityInterval() const { return validity_; }
 
-         ///returns false if no data available for key
-         bool doGet(DataKey const& aKey, bool aGetTransiently = false) const;
+      ///returns false if no data available for key
+      bool doGet(DataKey const& aKey, bool aGetTransiently = false) const;
 
-         /**returns true only if someone has already requested data for this key
+      /**returns true only if someone has already requested data for this key
           and the data was retrieved
           */
-         bool wasGotten(DataKey const& aKey) const;
+      bool wasGotten(DataKey const& aKey) const;
 
-         /**returns the ComponentDescription for the module which creates the data or 0
+      /**returns the ComponentDescription for the module which creates the data or 0
           if no module has been registered for the data. This does not cause the data to
           actually be constructed.
           */
-         ComponentDescription const* providerDescription(DataKey const& aKey) const;
+      ComponentDescription const* providerDescription(DataKey const& aKey) const;
 
-         EventSetupRecordKey const& key() const { return key_; }
+      EventSetupRecordKey const& key() const { return key_; }
 
-         /**If you are caching data from the Record, you should also keep
+      /**If you are caching data from the Record, you should also keep
           this number.  If this number changes then you know that
           the data you have cached is invalid. This is NOT true if
           if the validityInterval() hasn't changed since it is possible that
@@ -117,83 +115,114 @@ namespace edm {
           The value of '0' will never be returned so you can use that to
           denote that you have not yet checked the value.
           */
-         unsigned long long cacheIdentifier() const {
-            return cacheIdentifier_;
-         }
+      unsigned long long cacheIdentifier() const { return cacheIdentifier_; }
 
-         ///clears the oToFill vector and then fills it with the keys for all registered data keys
-         void fillRegisteredDataKeys(std::vector<DataKey>& oToFill) const;
-         // ---------- static member functions --------------------
+      ///clears the oToFill vector and then fills it with the keys for all registered data keys
+      void fillRegisteredDataKeys(std::vector<DataKey>& oToFill) const;
+      ///there is a 1-to-1 correspondence between elements returned and the elements returned from fillRegisteredDataKey.
+      std::vector<ComponentDescription const*> componentsForRegisteredDataKeys() const;
+      // ---------- static member functions --------------------
 
-         // ---------- member functions ---------------------------
+      // ---------- member functions ---------------------------
 
-         // The following member functions should only be used by EventSetupRecordProvider
-         bool add(DataKey const& iKey ,
-                  DataProxy const* iProxy) ;
-         void clearProxies();
-         void cacheReset() ;
-         /// returns 'true' if a transient request has occurred since the last call to transientReset.
-         bool transientReset() ;
+      // The following member functions should only be used by EventSetupRecordProvider
+      bool add(DataKey const& iKey, DataProxy const* iProxy);
+      void clearProxies();
+      void cacheReset();
+      /// returns 'true' if a transient request has occurred since the last call to transientReset.
+      bool transientReset();
 
-         void set(ValidityInterval const&);
-         void setEventSetup(EventSetupImpl const* iEventSetup) {eventSetup_ = iEventSetup; }
-
-         void getESProducers(std::vector<ComponentDescription const*>& esproducers);
-         void fillReferencedDataKeys(std::map<DataKey, ComponentDescription const*>& referencedDataKeys);
+      void set(ValidityInterval const&);
+      void setEventSetup(EventSetupImpl const* iEventSetup) { eventSetup_ = iEventSetup; }
 
+      void getESProducers(std::vector<ComponentDescription const*>& esproducers);
       //protected:
 
-         DataProxy const* find(DataKey const& aKey) const ;
+      DataProxy const* find(DataKey const& aKey) const;
 
-        EventSetupImpl const& eventSetup() const {
-          return *eventSetup_;
-        }
+      EventSetupImpl const& eventSetup() const { return *eventSetup_; }
 
-         void validate(ComponentDescription const*, ESInputTag const&) const;
-
-         void addTraceInfoToCmsException(cms::Exception& iException, char const* iName, ComponentDescription const*, DataKey const&) const;
-         void changeStdExceptionToCmsException(char const* iExceptionWhatMessage, char const* iName, ComponentDescription const*, DataKey const&) const;
-
-         void transientAccessRequested() const { transientAccessRequested_ = true;}
-      private:
-         EventSetupRecordImpl(EventSetupRecordImpl const&) = delete;
-
-         EventSetupRecordImpl const& operator=(EventSetupRecordImpl const&) = delete;
-
-         void const* getFromProxy(DataKey const& iKey ,
-                                  ComponentDescription const*& iDesc,
-                                  bool iTransientAccessOnly) const;
-
-         template <typename DataT>
-         void getImplementation(DataT const*& iData ,
-                                char const* iName,
-                                ComponentDescription const*& iDesc,
-                                bool iTransientAccessOnly,
-                                std::shared_ptr<ESHandleExceptionFactory>& whyFailedFactory) const {
-            DataKey dataKey(DataKey::makeTypeTag<DataT>(),
-                            iName,
-                            DataKey::kDoNotCopyMemory);
-
-            void const* pValue = this->getFromProxy(dataKey, iDesc, iTransientAccessOnly);
-            if(nullptr == pValue) {
-              whyFailedFactory =
-                makeESHandleExceptionFactory([=] {
-                    NoProxyException<DataT> ex(this->key(), dataKey);
-                    return std::make_exception_ptr(ex);
-                });
-            }
-            iData = reinterpret_cast<DataT const*> (pValue);
-         }
-
-         // ---------- member data --------------------------------
-         ValidityInterval validity_;
-         EventSetupRecordKey key_;
-         std::vector<DataKey> keysForProxies_;
-         std::vector<DataProxy const*> proxies_;
-         EventSetupImpl const* eventSetup_;
-         unsigned long long cacheIdentifier_;
-         mutable std::atomic<bool> transientAccessRequested_;
-      };
-   }
-}
+      void validate(ComponentDescription const*, ESInputTag const&) const;
+
+      void addTraceInfoToCmsException(cms::Exception& iException,
+                                      char const* iName,
+                                      ComponentDescription const*,
+                                      DataKey const&) const;
+      void changeStdExceptionToCmsException(char const* iExceptionWhatMessage,
+                                            char const* iName,
+                                            ComponentDescription const*,
+                                            DataKey const&) const;
+
+      void transientAccessRequested() const { transientAccessRequested_ = true; }
+
+    private:
+      EventSetupRecordImpl(EventSetupRecordImpl const&) = delete;
+
+      EventSetupRecordImpl const& operator=(EventSetupRecordImpl const&) = delete;
+
+      void const* getFromProxy(DataKey const& iKey,
+                               ComponentDescription const*& iDesc,
+                               bool iTransientAccessOnly) const;
+
+      void const* getFromProxy(ESProxyIndex iProxyIndex,
+                               bool iTransientAccessOnly,
+                               ComponentDescription const*& iDesc,
+                               DataKey const*& oGottenKey) const;
+
+      template <typename DataT>
+      void getImplementation(DataT const*& iData,
+                             char const* iName,
+                             ComponentDescription const*& iDesc,
+                             bool iTransientAccessOnly,
+                             std::shared_ptr<ESHandleExceptionFactory>& whyFailedFactory) const {
+        DataKey dataKey(DataKey::makeTypeTag<DataT>(), iName, DataKey::kDoNotCopyMemory);
+
+        void const* pValue = this->getFromProxy(dataKey, iDesc, iTransientAccessOnly);
+        if (nullptr == pValue) {
+          whyFailedFactory = makeESHandleExceptionFactory([=] {
+            NoProxyException<DataT> ex(this->key(), dataKey);
+            return std::make_exception_ptr(ex);
+          });
+        }
+        iData = reinterpret_cast<DataT const*>(pValue);
+      }
+
+      template <typename DataT>
+      void getImplementation(DataT const*& iData,
+                             ESProxyIndex iProxyIndex,
+                             bool iTransientAccessOnly,
+                             ComponentDescription const*& oDesc,
+                             std::shared_ptr<ESHandleExceptionFactory>& whyFailedFactory) const {
+        DataKey const* dataKey = nullptr;
+        if (iProxyIndex.value() == std::numeric_limits<int>::max()) {
+          whyFailedFactory = makeESHandleExceptionFactory([=] {
+            NoProxyException<DataT> ex(this->key(), {});
+            return std::make_exception_ptr(ex);
+          });
+          iData = nullptr;
+          return;
+        }
+        assert(iProxyIndex.value() > -1 and
+               iProxyIndex.value() < static_cast<ESProxyIndex::Value_t>(keysForProxies_.size()));
+        void const* pValue = this->getFromProxy(iProxyIndex, iTransientAccessOnly, oDesc, dataKey);
+        if (nullptr == pValue) {
+          whyFailedFactory = makeESHandleExceptionFactory([=] {
+            NoProxyException<DataT> ex(this->key(), *dataKey);
+            return std::make_exception_ptr(ex);
+          });
+        }
+        iData = reinterpret_cast<DataT const*>(pValue);
+      }
+
+      // ---------- member data --------------------------------
+      ValidityInterval validity_;
+      EventSetupRecordKey key_;
+      std::vector<DataKey> keysForProxies_;
+      std::vector<DataProxy const*> proxies_;
+      EventSetupImpl const* eventSetup_;
+      unsigned long long cacheIdentifier_;
+      mutable std::atomic<bool> transientAccessRequested_;
+    };
+  }  // namespace eventsetup
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/EventSetupRecordImplementation.h b/FWCore/Framework/interface/EventSetupRecordImplementation.h
index b23d3d26c8b2b..ae6a76c6a491f 100644
--- a/FWCore/Framework/interface/EventSetupRecordImplementation.h
+++ b/FWCore/Framework/interface/EventSetupRecordImplementation.h
@@ -25,6 +25,7 @@
 
 #include "FWCore/Framework/interface/EventSetupRecord.h"
 #include "FWCore/Framework/interface/EventSetupRecordKey.h"
+#include "FWCore/Framework/interface/ESTransientHandle.h"
 #include "FWCore/Framework/interface/data_default_record_trait.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"
 
@@ -32,66 +33,75 @@
 
 // forward declarations
 namespace edm {
-   namespace eventsetup {
-      struct ComponentDescription;
-
-      template<typename T>
-      class EventSetupRecordImplementation : public EventSetupRecord {
-
-      public:
-         //virtual ~EventSetupRecordImplementation();
-
-         // ---------- const member functions ---------------------
-         EventSetupRecordKey key() const override {
-            return EventSetupRecordKey::makeKey<T>();
-         }
-
-         template<typename PRODUCT>
-         ESHandle<PRODUCT> getHandle(ESGetToken<PRODUCT,T> const& iToken) const {
-           return getHandleImpl(iToken);
-         }
-
-         template<typename PRODUCT>
-         ESHandle<PRODUCT> getHandle(ESGetToken<PRODUCT,edm::DefaultRecord> const& iToken) const {
-           static_assert(std::is_same_v<T, eventsetup::default_record_t<ESHandle<PRODUCT>>>, "The Record being used to retrieve the product is not the default record for the product type");
-           return getHandleImpl(iToken);
-         }
-
-         using EventSetupRecord::get;
-        
-         template<typename PRODUCT>
-         PRODUCT const& get(ESGetToken<PRODUCT,T> const& iToken) const {
-           return *getHandleImpl(iToken);
-         }
-        template<typename PRODUCT>
-        PRODUCT const& get(ESGetToken<PRODUCT,T>& iToken) const {
-          return *getHandleImpl(const_cast<const ESGetToken<PRODUCT,T>&>(iToken));
-        }
-
-         template<typename PRODUCT>
-         PRODUCT const& get(ESGetToken<PRODUCT,edm::DefaultRecord> const& iToken) const {
-           static_assert(std::is_same_v<T, eventsetup::default_record_t<ESHandle<PRODUCT>>>, "The Record being used to retrieve the product is not the default record for the product type");
-           return *getHandleImpl(iToken);
-         }
-        template<typename PRODUCT>
-        PRODUCT const& get(ESGetToken<PRODUCT,edm::DefaultRecord>& iToken) const {
-          return get(const_cast<const ESGetToken<PRODUCT,edm::DefaultRecord>&>(iToken) );
-        }
-
-         // ---------- static member functions --------------------
-         static EventSetupRecordKey keyForClass()  {
-            return EventSetupRecordKey::makeKey<T>();
-         }
-
-         // ---------- member functions ---------------------------
-
-      protected:
-         EventSetupRecordImplementation() {}
-
-      private:
-         // ---------- member data --------------------------------
-      };
-   }
-}
+  namespace eventsetup {
+    struct ComponentDescription;
+
+    template <typename T>
+    class EventSetupRecordImplementation : public EventSetupRecord {
+    public:
+      //virtual ~EventSetupRecordImplementation();
+
+      // ---------- const member functions ---------------------
+      EventSetupRecordKey key() const override { return EventSetupRecordKey::makeKey<T>(); }
+
+      template <typename PRODUCT>
+      ESHandle<PRODUCT> getHandle(ESGetToken<PRODUCT, T> const& iToken) const {
+        return getHandleImpl<ESHandle>(iToken);
+      }
+
+      template <typename PRODUCT>
+      ESHandle<PRODUCT> getHandle(ESGetToken<PRODUCT, edm::DefaultRecord> const& iToken) const {
+        static_assert(std::is_same_v<T, eventsetup::default_record_t<ESHandle<PRODUCT>>>,
+                      "The Record being used to retrieve the product is not the default record for the product type");
+        return getHandleImpl<ESHandle>(iToken);
+      }
+
+      template <typename PRODUCT>
+      ESTransientHandle<PRODUCT> getTransientHandle(ESGetToken<PRODUCT, T> const& iToken) const {
+        return getHandleImpl<ESTransientHandle>(iToken);
+      }
+
+      template <typename PRODUCT>
+      ESTransientHandle<PRODUCT> getTransientHandle(ESGetToken<PRODUCT, edm::DefaultRecord> const& iToken) const {
+        static_assert(std::is_same_v<T, eventsetup::default_record_t<ESTransientHandle<PRODUCT>>>,
+                      "The Record being used to retrieve the product is not the default record for the product type");
+        return getHandleImpl<ESTransientHandle>(iToken);
+      }
+
+      using EventSetupRecord::get;
+
+      template <typename PRODUCT>
+      PRODUCT const& get(ESGetToken<PRODUCT, T> const& iToken) const {
+        return *getHandleImpl<ESHandle>(iToken);
+      }
+      template <typename PRODUCT>
+      PRODUCT const& get(ESGetToken<PRODUCT, T>& iToken) const {
+        return *getHandleImpl<ESHandle>(const_cast<const ESGetToken<PRODUCT, T>&>(iToken));
+      }
+
+      template <typename PRODUCT>
+      PRODUCT const& get(ESGetToken<PRODUCT, edm::DefaultRecord> const& iToken) const {
+        static_assert(std::is_same_v<T, eventsetup::default_record_t<ESHandle<PRODUCT>>>,
+                      "The Record being used to retrieve the product is not the default record for the product type");
+        return *getHandleImpl<ESHandle>(iToken);
+      }
+      template <typename PRODUCT>
+      PRODUCT const& get(ESGetToken<PRODUCT, edm::DefaultRecord>& iToken) const {
+        return get(const_cast<const ESGetToken<PRODUCT, edm::DefaultRecord>&>(iToken));
+      }
+
+      // ---------- static member functions --------------------
+      static EventSetupRecordKey keyForClass() { return EventSetupRecordKey::makeKey<T>(); }
+
+      // ---------- member functions ---------------------------
+
+    protected:
+      EventSetupRecordImplementation() {}
+
+    private:
+      // ---------- member data --------------------------------
+    };
+  }  // namespace eventsetup
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/EventSetupRecordIntervalFinder.h b/FWCore/Framework/interface/EventSetupRecordIntervalFinder.h
index e96f9a36ad409..7b0f09e9f2d39 100644
--- a/FWCore/Framework/interface/EventSetupRecordIntervalFinder.h
+++ b/FWCore/Framework/interface/EventSetupRecordIntervalFinder.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     EventSetupRecordIntervalFinder
-// 
+//
 /**\class EventSetupRecordIntervalFinder EventSetupRecordIntervalFinder.h FWCore/Framework/interface/EventSetupRecordIntervalFinder.h
 
  Description: <one line class summary>
@@ -30,54 +30,48 @@
 // forward declarations
 namespace edm {
 
-class EventSetupRecordIntervalFinder
-{
+  class EventSetupRecordIntervalFinder {
+  public:
+    EventSetupRecordIntervalFinder() : intervals_() {}
+    virtual ~EventSetupRecordIntervalFinder() noexcept(false);
 
-   public:
-      EventSetupRecordIntervalFinder() : intervals_() {}
-      virtual ~EventSetupRecordIntervalFinder() noexcept(false);
+    // ---------- const member functions ---------------------
+    std::set<eventsetup::EventSetupRecordKey> findingForRecords() const;
 
-      // ---------- const member functions ---------------------
-      std::set<eventsetup::EventSetupRecordKey> findingForRecords() const ;
-   
-      const eventsetup::ComponentDescription& descriptionForFinder() const { return description_;}
-      // ---------- static member functions --------------------
+    const eventsetup::ComponentDescription& descriptionForFinder() const { return description_; }
+    // ---------- static member functions --------------------
 
-      // ---------- member functions ---------------------------
-      /**returns the 'default constructed' ValidityInterval if no valid interval.
+    // ---------- member functions ---------------------------
+    /**returns the 'default constructed' ValidityInterval if no valid interval.
        If upperbound is not known, it should be set to IOVSyncValue::invalidIOVSyncValue()
       */
-      const ValidityInterval& findIntervalFor(const eventsetup::EventSetupRecordKey&,
-                                            const IOVSyncValue&);
-   
-      void setDescriptionForFinder(const eventsetup::ComponentDescription& iDescription) {
-        description_ = iDescription;
-      }
-   protected:
-      virtual void setIntervalFor(const eventsetup::EventSetupRecordKey&,
-                                   const IOVSyncValue& , 
-                                   ValidityInterval&) = 0;
-
-      template< class T>
-         void findingRecord() {
-            findingRecordWithKey(eventsetup::EventSetupRecordKey::makeKey<T>());
-         }
-      
-      void findingRecordWithKey(const eventsetup::EventSetupRecordKey&);
-      
-private:
-      EventSetupRecordIntervalFinder(const EventSetupRecordIntervalFinder&) = delete; // stop default
-
-      const EventSetupRecordIntervalFinder& operator=(const EventSetupRecordIntervalFinder&) = delete; // stop default
-
-      /** override this method if you need to delay setting what records you will be using until after all modules are loaded*/
-      virtual void delaySettingRecords();
-      // ---------- member data --------------------------------
-      typedef  std::map<eventsetup::EventSetupRecordKey,ValidityInterval> Intervals;
-      Intervals intervals_;
-
-      eventsetup::ComponentDescription description_;
-};
-
-}
+    const ValidityInterval& findIntervalFor(const eventsetup::EventSetupRecordKey&, const IOVSyncValue&);
+
+    void setDescriptionForFinder(const eventsetup::ComponentDescription& iDescription) { description_ = iDescription; }
+
+  protected:
+    virtual void setIntervalFor(const eventsetup::EventSetupRecordKey&, const IOVSyncValue&, ValidityInterval&) = 0;
+
+    template <class T>
+    void findingRecord() {
+      findingRecordWithKey(eventsetup::EventSetupRecordKey::makeKey<T>());
+    }
+
+    void findingRecordWithKey(const eventsetup::EventSetupRecordKey&);
+
+  private:
+    EventSetupRecordIntervalFinder(const EventSetupRecordIntervalFinder&) = delete;  // stop default
+
+    const EventSetupRecordIntervalFinder& operator=(const EventSetupRecordIntervalFinder&) = delete;  // stop default
+
+    /** override this method if you need to delay setting what records you will be using until after all modules are loaded*/
+    virtual void delaySettingRecords();
+    // ---------- member data --------------------------------
+    typedef std::map<eventsetup::EventSetupRecordKey, ValidityInterval> Intervals;
+    Intervals intervals_;
+
+    eventsetup::ComponentDescription description_;
+  };
+
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/EventSetupRecordKey.h b/FWCore/Framework/interface/EventSetupRecordKey.h
index 7f0196962c6b4..6103a4f5ea7e0 100644
--- a/FWCore/Framework/interface/EventSetupRecordKey.h
+++ b/FWCore/Framework/interface/EventSetupRecordKey.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     EventSetupRecordKey
-// 
+//
 /**\class EventSetupRecordKey EventSetupRecordKey.h FWCore/Framework/interface/EventSetupRecordKey.h
 
  Description: Key used to lookup a EventSetupRecord within the EventSetup
@@ -26,51 +26,41 @@
 
 // forward declarations
 namespace edm {
-   namespace eventsetup {
-class EventSetupRecordKey
-{
+  namespace eventsetup {
+    class EventSetupRecordKey {
+    public:
+      typedef heterocontainer::HCTypeTag TypeTag;
 
-   public:
-   typedef heterocontainer::HCTypeTag TypeTag;
-      
       EventSetupRecordKey();
-      EventSetupRecordKey(const TypeTag& iType) :
-         type_(iType) {}
+      EventSetupRecordKey(const TypeTag& iType) : type_(iType) {}
 
       //virtual ~EventSetupRecordKey();
 
       // ---------- const member functions ---------------------
-      const TypeTag& type() const { return type_;}
-      
-      bool operator<(const EventSetupRecordKey& iRHS) const {
-         return type_ < iRHS.type_;
-      }
-      bool operator==(const EventSetupRecordKey& iRHS) const {
-         return type_ == iRHS.type_;
-      }
-      inline bool operator!=(const EventSetupRecordKey& iRHS) const {
-         return not (*this == iRHS);
-      }
+      const TypeTag& type() const { return type_; }
+
+      bool operator<(const EventSetupRecordKey& iRHS) const { return type_ < iRHS.type_; }
+      bool operator==(const EventSetupRecordKey& iRHS) const { return type_ == iRHS.type_; }
+      inline bool operator!=(const EventSetupRecordKey& iRHS) const { return not(*this == iRHS); }
 
       const char* name() const { return type().name(); }
       // ---------- static member functions --------------------
-      template<class T>
-         static EventSetupRecordKey makeKey() {
-            return eventsetup::heterocontainer::makeKey<T,EventSetupRecordKey>();
-         }
-      
+      template <class T>
+      static EventSetupRecordKey makeKey() {
+        return eventsetup::heterocontainer::makeKey<T, EventSetupRecordKey>();
+      }
+
       // ---------- member functions ---------------------------
 
-   private:
+    private:
       //EventSetupRecordKey(const EventSetupRecordKey&); // allow default
 
       //const EventSetupRecordKey& operator=(const EventSetupRecordKey&); // allow default
 
       // ---------- member data --------------------------------
       TypeTag type_;
-         
-};
-   }
-}
+    };
+  }  // namespace eventsetup
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/EventSetupRecordProvider.h b/FWCore/Framework/interface/EventSetupRecordProvider.h
index 0cd655371a1b0..c6d03ad33faff 100644
--- a/FWCore/Framework/interface/EventSetupRecordProvider.h
+++ b/FWCore/Framework/interface/EventSetupRecordProvider.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     EventSetupRecordProvider
-// 
+//
 /**\class EventSetupRecordProvider EventSetupRecordProvider.h FWCore/Framework/interface/EventSetupRecordProvider.h
 
  Description: Coordinates all EventSetupDataProviders with the same 'interval of validity'
@@ -33,87 +33,87 @@
 
 // forward declarations
 namespace edm {
-   class EventSetupRecordIntervalFinder;
-
-   namespace eventsetup {
-      struct ComponentDescription;
-      class DataKey;
-      class DataProxyProvider;
-      class EventSetupProvider;
-      class EventSetupRecordImpl;
-      class ParameterSetIDHolder;
-      
-class EventSetupRecordProvider {
-
-   public:
+  class EventSetupRecordIntervalFinder;
+
+  namespace eventsetup {
+    struct ComponentDescription;
+    class DataKey;
+    class DataProxyProvider;
+    class EventSetupProvider;
+    class EventSetupRecordImpl;
+    class ParameterSetIDHolder;
+
+    class EventSetupRecordProvider {
+    public:
       typedef std::map<DataKey, ComponentDescription> DataToPreferredProviderMap;
-   
+
       EventSetupRecordProvider(EventSetupRecordKey const& iKey);
 
       // ---------- const member functions ---------------------
 
-      ValidityInterval const& validityInterval() const {
-         return validityInterval_;
-      }
-      EventSetupRecordKey const& key() const { return key_; }      
+      ValidityInterval const& validityInterval() const { return validityInterval_; }
+      EventSetupRecordKey const& key() const { return key_; }
 
-      EventSetupRecordImpl const& record() const {return record_;}
-      EventSetupRecordImpl& record() { return record_;}
+      EventSetupRecordImpl const& record() const { return record_; }
+      EventSetupRecordImpl& record() { return record_; }
 
       ///Returns the list of Records the provided Record depends on (usually none)
       std::set<EventSetupRecordKey> dependentRecords() const;
-      
+
       ///return information on which DataProxyProviders are supplying information
       std::set<ComponentDescription> proxyProviderDescriptions() const;
-  
-      // ---------- static member functions --------------------
 
+      /// The available DataKeys in the Record. The order can be used to request the data by index
+      std::vector<DataKey> registeredDataKeys() const;
+
+      std::vector<ComponentDescription const*> componentsForRegisteredDataKeys() const;
       // ---------- member functions ---------------------------
 
       ///returns the first matching DataProxyProvider or a 'null' if not found
       std::shared_ptr<DataProxyProvider> proxyProvider(ComponentDescription const&);
-  
+
       ///returns the first matching DataProxyProvider or a 'null' if not found
       std::shared_ptr<DataProxyProvider> proxyProvider(ParameterSetIDHolder const&);
-  
 
       void resetProxyProvider(ParameterSetIDHolder const&, std::shared_ptr<DataProxyProvider> const&);
 
       void addRecordTo(EventSetupProvider&);
-      void addRecordToIfValid(EventSetupProvider&, IOVSyncValue const&) ;
+      void addRecordToIfValid(EventSetupProvider&, IOVSyncValue const&);
 
       void add(std::shared_ptr<DataProxyProvider>);
       ///For now, only use one finder
       void addFinder(std::shared_ptr<EventSetupRecordIntervalFinder>);
       void setValidityInterval(ValidityInterval const&);
-      
+
       ///sets interval to this time and returns true if have a valid interval for time
       bool setValidityIntervalFor(IOVSyncValue const&);
 
       ///If the provided Record depends on other Records, here are the dependent Providers
-      void setDependentProviders(std::vector<std::shared_ptr<EventSetupRecordProvider> >const&);
+      void setDependentProviders(std::vector<std::shared_ptr<EventSetupRecordProvider>> const&);
 
       /**In the case of a conflict, sets what Provider to call.  This must be called after
          all providers have been added.  An empty map is acceptable. */
       void usePreferred(DataToPreferredProviderMap const&);
-      
+
       ///This will clear the cache's of all the Proxies so that next time they are called they will run
       void resetProxies();
-      
-      std::shared_ptr<EventSetupRecordIntervalFinder const> finder() const {return get_underlying_safe(finder_);}
-      std::shared_ptr<EventSetupRecordIntervalFinder>& finder() {return get_underlying_safe(finder_);}
 
-      void getReferencedESProducers(std::map<EventSetupRecordKey, std::vector<ComponentDescription const*> >& referencedESProducers);
+      std::shared_ptr<EventSetupRecordIntervalFinder const> finder() const { return get_underlying_safe(finder_); }
+      std::shared_ptr<EventSetupRecordIntervalFinder>& finder() { return get_underlying_safe(finder_); }
 
-      void fillReferencedDataKeys(std::map<DataKey, ComponentDescription const*>& referencedDataKeys);
+      void getReferencedESProducers(
+          std::map<EventSetupRecordKey, std::vector<ComponentDescription const*>>& referencedESProducers);
+
+      void fillReferencedDataKeys(std::map<DataKey, ComponentDescription const*>& referencedDataKeys) const;
 
       void resetRecordToProxyPointers(DataToPreferredProviderMap const& iMap);
 
-   protected:
+    protected:
       void addProxiesToRecordHelper(edm::propagate_const<std::shared_ptr<DataProxyProvider>>& dpp,
-                              DataToPreferredProviderMap const& mp) {addProxiesToRecord(get_underlying_safe(dpp), mp);}
-      void addProxiesToRecord(std::shared_ptr<DataProxyProvider>,
-                              DataToPreferredProviderMap const&);
+                                    DataToPreferredProviderMap const& mp) {
+        addProxiesToRecord(get_underlying_safe(dpp), mp);
+      }
+      void addProxiesToRecord(std::shared_ptr<DataProxyProvider>, DataToPreferredProviderMap const&);
       void cacheReset();
 
       std::shared_ptr<EventSetupRecordIntervalFinder> swapFinder(std::shared_ptr<EventSetupRecordIntervalFinder> iNew) {
@@ -121,10 +121,10 @@ class EventSetupRecordProvider {
         return iNew;
       }
 
-   private:
-      EventSetupRecordProvider(EventSetupRecordProvider const&) = delete; // stop default
+    private:
+      EventSetupRecordProvider(EventSetupRecordProvider const&) = delete;  // stop default
 
-      EventSetupRecordProvider const& operator=(EventSetupRecordProvider const&) = delete; // stop default
+      EventSetupRecordProvider const& operator=(EventSetupRecordProvider const&) = delete;  // stop default
 
       void resetTransients();
       bool checkResetTransients();
@@ -134,10 +134,11 @@ class EventSetupRecordProvider {
       ValidityInterval validityInterval_;
       edm::propagate_const<std::shared_ptr<EventSetupRecordIntervalFinder>> finder_;
       std::vector<edm::propagate_const<std::shared_ptr<DataProxyProvider>>> providers_;
-      std::unique_ptr<std::vector<edm::propagate_const<std::shared_ptr<EventSetupRecordIntervalFinder>>>> multipleFinders_;
+      std::unique_ptr<std::vector<edm::propagate_const<std::shared_ptr<EventSetupRecordIntervalFinder>>>>
+          multipleFinders_;
       bool lastSyncWasBeginOfRun_;
-};
-   }
-}
+    };
+  }  // namespace eventsetup
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/ExceptionActions.h b/FWCore/Framework/interface/ExceptionActions.h
index 3cca7a7d83378..186334b5c14a8 100644
--- a/FWCore/Framework/interface/ExceptionActions.h
+++ b/FWCore/Framework/interface/ExceptionActions.h
@@ -8,16 +8,10 @@
 
 namespace edm {
   namespace exception_actions {
-    enum ActionCodes {
-      IgnoreCompletely=0,
-      Rethrow,
-      SkipEvent,
-      FailPath,
-      LastCode
-    };
+    enum ActionCodes { IgnoreCompletely = 0, Rethrow, SkipEvent, FailPath, LastCode };
 
     const char* actionName(ActionCodes code);
-  }
+  }  // namespace exception_actions
 
   class ExceptionToActionTable {
   public:
@@ -34,5 +28,5 @@ namespace edm {
     void addDefaults();
     ActionMap map_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ExceptionHelpers.h b/FWCore/Framework/interface/ExceptionHelpers.h
index af9a30de648cf..321ea375cf709 100644
--- a/FWCore/Framework/interface/ExceptionHelpers.h
+++ b/FWCore/Framework/interface/ExceptionHelpers.h
@@ -43,26 +43,20 @@
 
 namespace edm {
 
-  void addContextAndPrintException(char const* context,
-                                   cms::Exception& ex,
-                                   bool disablePrint);
+  void addContextAndPrintException(char const* context, cms::Exception& ex, bool disablePrint);
 
   template <typename TReturn>
-  TReturn callWithTryCatchAndPrint(std::function<TReturn (void)> iFunc,
+  TReturn callWithTryCatchAndPrint(std::function<TReturn(void)> iFunc,
                                    char const* context = nullptr,
                                    bool disablePrint = false) {
-
     try {
-      return convertException::wrap([iFunc]() {
-        return iFunc();
-      });
-    }
-    catch(cms::Exception& ex) {
+      return convertException::wrap([iFunc]() { return iFunc(); });
+    } catch (cms::Exception& ex) {
       addContextAndPrintException(context, ex, disablePrint);
       throw;
     }
     return TReturn();
   }
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/FileBlock.h b/FWCore/Framework/interface/FileBlock.h
index 7aadfd00f6b78..5a2e8e5cb9e65 100644
--- a/FWCore/Framework/interface/FileBlock.h
+++ b/FWCore/Framework/interface/FileBlock.h
@@ -20,8 +20,7 @@ namespace edm {
   class FileBlock {
   public:
     // bit mask for reasons fast cloning can be disabled or not applicable
-    enum
-    WhyNotFastClonable {
+    enum WhyNotFastClonable {
       CanFastClone = 0x0,
 
       // For entire job
@@ -55,63 +54,67 @@ namespace edm {
       BranchMismatch = (SplitLevelMismatch << 1)
     };
 
-    FileBlock() :
-      fileFormatVersion_(),
-      tree_(nullptr), metaTree_(nullptr),
-      lumiTree_(nullptr), lumiMetaTree_(nullptr),
-      runTree_(nullptr), runMetaTree_(nullptr),
-      whyNotFastClonable_(NoRootInputSource),
-      hasNewlyDroppedBranch_(),
-      fileName_(),
-      branchListIndexesUnchanged_(false),
-      modifiedIDs_(false),
-      branchChildren_(new BranchChildren) {}
+    FileBlock()
+        : fileFormatVersion_(),
+          tree_(nullptr),
+          metaTree_(nullptr),
+          lumiTree_(nullptr),
+          lumiMetaTree_(nullptr),
+          runTree_(nullptr),
+          runMetaTree_(nullptr),
+          whyNotFastClonable_(NoRootInputSource),
+          hasNewlyDroppedBranch_(),
+          fileName_(),
+          branchListIndexesUnchanged_(false),
+          modifiedIDs_(false),
+          branchChildren_(new BranchChildren) {}
 
     FileBlock(FileFormatVersion const& version,
-              TTree const* ev, TTree const* meta,
-              TTree const* lumi, TTree const* lumiMeta,
-              TTree const* run, TTree const* runMeta,
+              TTree const* ev,
+              TTree const* meta,
+              TTree const* lumi,
+              TTree const* lumiMeta,
+              TTree const* run,
+              TTree const* runMeta,
               int whyNotFastClonable,
               std::array<bool, NumBranchTypes> const& hasNewlyDroppedBranch,
               std::string const& fileName,
               bool branchListIndexesUnchanged,
               bool modifiedIDs,
-              std::shared_ptr<BranchChildren const> branchChildren) :
-      fileFormatVersion_(version),
-      tree_(const_cast<TTree*>(ev)),
-      metaTree_(const_cast<TTree*>(meta)),
-      lumiTree_(const_cast<TTree*>(lumi)),
-      lumiMetaTree_(const_cast<TTree*>(lumiMeta)),
-      runTree_(const_cast<TTree*>(run)),
-      runMetaTree_(const_cast<TTree*>(runMeta)),
-      whyNotFastClonable_(whyNotFastClonable),
-      hasNewlyDroppedBranch_(hasNewlyDroppedBranch),
-      fileName_(fileName),
-      branchListIndexesUnchanged_(branchListIndexesUnchanged),
-      modifiedIDs_(modifiedIDs),
-      branchChildren_(branchChildren) {}
+              std::shared_ptr<BranchChildren const> branchChildren)
+        : fileFormatVersion_(version),
+          tree_(const_cast<TTree*>(ev)),
+          metaTree_(const_cast<TTree*>(meta)),
+          lumiTree_(const_cast<TTree*>(lumi)),
+          lumiMetaTree_(const_cast<TTree*>(lumiMeta)),
+          runTree_(const_cast<TTree*>(run)),
+          runMetaTree_(const_cast<TTree*>(runMeta)),
+          whyNotFastClonable_(whyNotFastClonable),
+          hasNewlyDroppedBranch_(hasNewlyDroppedBranch),
+          fileName_(fileName),
+          branchListIndexesUnchanged_(branchListIndexesUnchanged),
+          modifiedIDs_(modifiedIDs),
+          branchChildren_(branchChildren) {}
 
     ~FileBlock() {}
 
-    FileFormatVersion const& fileFormatVersion() const {return fileFormatVersion_;}
-    TTree* tree() const {return tree_;}
-    TTree* metaTree() const {return metaTree_;}
-    TTree* lumiTree() const {return lumiTree_;}
-    TTree* lumiMetaTree() const {return lumiMetaTree_;}
-    TTree* runTree() const {return runTree_;}
-    TTree* runMetaTree() const {return runMetaTree_;}
-
-    int whyNotFastClonable() const {return whyNotFastClonable_;}
-    std::array<bool, NumBranchTypes> const& hasNewlyDroppedBranch() const {return hasNewlyDroppedBranch_;}
-    std::string const& fileName() const {return fileName_;}
-    bool branchListIndexesUnchanged() const {return branchListIndexesUnchanged_;}
-    bool modifiedIDs() const {return modifiedIDs_;}
-
-    void setNotFastClonable(WhyNotFastClonable const& why) {
-      whyNotFastClonable_ |= why;
-    }
+    FileFormatVersion const& fileFormatVersion() const { return fileFormatVersion_; }
+    TTree* tree() const { return tree_; }
+    TTree* metaTree() const { return metaTree_; }
+    TTree* lumiTree() const { return lumiTree_; }
+    TTree* lumiMetaTree() const { return lumiMetaTree_; }
+    TTree* runTree() const { return runTree_; }
+    TTree* runMetaTree() const { return runMetaTree_; }
+
+    int whyNotFastClonable() const { return whyNotFastClonable_; }
+    std::array<bool, NumBranchTypes> const& hasNewlyDroppedBranch() const { return hasNewlyDroppedBranch_; }
+    std::string const& fileName() const { return fileName_; }
+    bool branchListIndexesUnchanged() const { return branchListIndexesUnchanged_; }
+    bool modifiedIDs() const { return modifiedIDs_; }
+
+    void setNotFastClonable(WhyNotFastClonable const& why) { whyNotFastClonable_ |= why; }
     BranchChildren const& branchChildren() const { return *branchChildren_; }
-    void close () {runMetaTree_ = lumiMetaTree_ = metaTree_ = runTree_ = lumiTree_ = tree_ = nullptr;}
+    void close() { runMetaTree_ = lumiMetaTree_ = metaTree_ = runTree_ = lumiTree_ = tree_ = nullptr; }
 
   private:
     FileFormatVersion fileFormatVersion_;
@@ -129,5 +132,5 @@ namespace edm {
     bool modifiedIDs_;
     std::shared_ptr<BranchChildren const> branchChildren_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/Frameworkfwd.h b/FWCore/Framework/interface/Frameworkfwd.h
index f9e0204e90390..68d71f5c1724f 100644
--- a/FWCore/Framework/interface/Frameworkfwd.h
+++ b/FWCore/Framework/interface/Frameworkfwd.h
@@ -46,8 +46,10 @@ namespace edm {
   struct EventSummary;
   struct PathSummary;
   struct TriggerReport;
-  template <typename T> class View;
-  template <typename T> class WorkerT;
-}
+  template <typename T>
+  class View;
+  template <typename T>
+  class WorkerT;
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/FunctorESHandleExceptionFactory.h b/FWCore/Framework/interface/FunctorESHandleExceptionFactory.h
index d2d264f14675e..890806b7a9b7e 100644
--- a/FWCore/Framework/interface/FunctorESHandleExceptionFactory.h
+++ b/FWCore/Framework/interface/FunctorESHandleExceptionFactory.h
@@ -26,22 +26,20 @@
 
 namespace edm {
 
-  template<typename T>
+  template <typename T>
   class FunctorESHandleExceptionFactory : public ESHandleExceptionFactory {
-
   public:
     FunctorESHandleExceptionFactory(T&& iFunctor) : m_functor(std::move(iFunctor)) {}
 
-    std::exception_ptr make() const override {
-      return m_functor();
-    }
+    std::exception_ptr make() const override { return m_functor(); }
+
   private:
     T m_functor;
   };
 
-  template<typename T>
+  template <typename T>
   std::shared_ptr<ESHandleExceptionFactory> makeESHandleExceptionFactory(T&& iFunctor) {
     return std::make_shared<FunctorESHandleExceptionFactory<T>>(std::move(iFunctor));
   }
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/GenericHandle.h b/FWCore/Framework/interface/GenericHandle.h
index 9ad26a574bbfe..da1a143473230 100644
--- a/FWCore/Framework/interface/GenericHandle.h
+++ b/FWCore/Framework/interface/GenericHandle.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     GenericHandle
-// 
+//
 /**\class GenericHandle GenericHandle.h FWCore/Framework/interface/GenericHandle.h
 
  Description: Allows interaction with data in the Event without actually using the C++ class
@@ -36,116 +36,101 @@
 
 // forward declarations
 namespace edm {
-   ///This class is just a 'tag' used to allow a specialization of edm::Handle
-struct GenericObject {
-};
+  ///This class is just a 'tag' used to allow a specialization of edm::Handle
+  struct GenericObject {};
 
-template<>
-class Handle<GenericObject> {
-public:
+  template <>
+  class Handle<GenericObject> {
+  public:
     ///Throws exception if iName is not a known C++ class type
-    Handle(std::string const& iName) : 
-       type_(TypeWithDict::byName(iName)), prod_(), prov_(nullptr) {
-          if(!bool(type_)) {
-             Exception::throwThis(errors::NotFound,
-             "Handle<GenericObject> told to use uknown type '",
-             iName.c_str(),
-             "'.\n Please check spelling or that a module uses this type in the job.");
-           }
-        }
-   
-   ///Throws exception if iType is invalid
-   Handle(TypeWithDict const& iType) :
-      type_(iType), prod_(), prov_(nullptr) {
-         if(!bool(iType)) {
-            Exception::throwThis(errors::NotFound, "Handle<GenericObject> given an invalid type");
-         }
+    Handle(std::string const& iName) : type_(TypeWithDict::byName(iName)), prod_(), prov_(nullptr) {
+      if (!bool(type_)) {
+        Exception::throwThis(errors::NotFound,
+                             "Handle<GenericObject> told to use uknown type '",
+                             iName.c_str(),
+                             "'.\n Please check spelling or that a module uses this type in the job.");
+      }
+    }
+
+    ///Throws exception if iType is invalid
+    Handle(TypeWithDict const& iType) : type_(iType), prod_(), prov_(nullptr) {
+      if (!bool(iType)) {
+        Exception::throwThis(errors::NotFound, "Handle<GenericObject> given an invalid type");
       }
-   
-   Handle(Handle<GenericObject> const& h):
-   type_(h.type_),
-   prod_(h.prod_),
-   prov_(h.prov_),
-   whyFailedFactory_(h.whyFailedFactory_) {
-   }
-   
-   Handle(ObjectWithDict const& prod, Provenance const* prov, ProductID const&):
-   type_(prod.typeOf()),
-   prod_(prod),
-   prov_(prov) { 
+    }
+
+    Handle(Handle<GenericObject> const& h)
+        : type_(h.type_), prod_(h.prod_), prov_(h.prov_), whyFailedFactory_(h.whyFailedFactory_) {}
+
+    Handle(ObjectWithDict const& prod, Provenance const* prov, ProductID const&)
+        : type_(prod.typeOf()), prod_(prod), prov_(prov) {
       assert(prod_);
       assert(prov_);
-   }
-   
-      //~Handle();
-      
-   void swap(Handle<GenericObject>& other) {
+    }
+
+    //~Handle();
+
+    void swap(Handle<GenericObject>& other) {
       // use unqualified swap for user defined classes
       using std::swap;
       swap(type_, other.type_);
       std::swap(prod_, other.prod_);
       swap(prov_, other.prov_);
       swap(whyFailedFactory_, other.whyFailedFactory_);
-   }
-   
-   
-   Handle<GenericObject>& operator=(Handle<GenericObject> const& rhs) {
+    }
+
+    Handle<GenericObject>& operator=(Handle<GenericObject> const& rhs) {
       Handle<GenericObject> temp(rhs);
       this->swap(temp);
       return *this;
-   }
-   
-   bool isValid() const {
-      return prod_ && nullptr!= prov_;
-   }
-
-   bool failedToGet() const {
-     return bool(whyFailedFactory_);
-   }
-   ObjectWithDict const* product() const { 
-     if(this->failedToGet()) {
-       whyFailedFactory_->make()->raise();
-     } 
-     return &prod_;
-   }
-   ObjectWithDict const* operator->() const {return this->product();}
-   ObjectWithDict const& operator*() const {return *(this->product());}
-   
-   TypeWithDict const& type() const {return type_;}
-   Provenance const* provenance() const {return prov_;}
-   
-   ProductID id() const {return prov_->productID();}
-
-   void clear() { prov_ = nullptr; whyFailedFactory_=nullptr;}
-      
-  void setWhyFailedFactory(std::shared_ptr<HandleExceptionFactory> const& iWhyFailed) {
-    whyFailedFactory_=iWhyFailed;
-  }
-private:
-   TypeWithDict type_;
-   ObjectWithDict prod_;
-   Provenance const* prov_;    
-  std::shared_ptr<HandleExceptionFactory> whyFailedFactory_;
-
-};
-
-typedef Handle<GenericObject> GenericHandle;
-
-///specialize this function for GenericHandle
-void convert_handle(BasicHandle && orig,
-                    Handle<GenericObject>& result);
-
-
-///Specialize the Event's getByLabel method to work with a Handle<GenericObject>
-template<>
-bool
-edm::Event::getByLabel<GenericObject>(std::string const& label,
-                                      std::string const& productInstanceName,
-                                      Handle<GenericObject>& result) const;
-
-template <>
-bool
-edm::Event::getByLabel(edm::InputTag const& tag, Handle<GenericObject>& result) const;
-
-}
+    }
+
+    bool isValid() const { return prod_ && nullptr != prov_; }
+
+    bool failedToGet() const { return bool(whyFailedFactory_); }
+    ObjectWithDict const* product() const {
+      if (this->failedToGet()) {
+        whyFailedFactory_->make()->raise();
+      }
+      return &prod_;
+    }
+    ObjectWithDict const* operator->() const { return this->product(); }
+    ObjectWithDict const& operator*() const { return *(this->product()); }
+
+    TypeWithDict const& type() const { return type_; }
+    Provenance const* provenance() const { return prov_; }
+
+    ProductID id() const { return prov_->productID(); }
+
+    void clear() {
+      prov_ = nullptr;
+      whyFailedFactory_ = nullptr;
+    }
+
+    void setWhyFailedFactory(std::shared_ptr<HandleExceptionFactory> const& iWhyFailed) {
+      whyFailedFactory_ = iWhyFailed;
+    }
+
+  private:
+    TypeWithDict type_;
+    ObjectWithDict prod_;
+    Provenance const* prov_;
+    std::shared_ptr<HandleExceptionFactory> whyFailedFactory_;
+  };
+
+  typedef Handle<GenericObject> GenericHandle;
+
+  ///specialize this function for GenericHandle
+  void convert_handle(BasicHandle&& orig, Handle<GenericObject>& result);
+
+  ///Specialize the Event's getByLabel method to work with a Handle<GenericObject>
+  template <>
+  bool edm::Event::getByLabel<GenericObject>(std::string const& label,
+                                             std::string const& productInstanceName,
+                                             Handle<GenericObject>& result) const;
+
+  template <>
+  bool edm::Event::getByLabel(edm::InputTag const& tag, Handle<GenericObject>& result) const;
+
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/GetterOfProducts.h b/FWCore/Framework/interface/GetterOfProducts.h
index 082a6714c5a98..86c7fc76a6174 100644
--- a/FWCore/Framework/interface/GetterOfProducts.h
+++ b/FWCore/Framework/interface/GetterOfProducts.h
@@ -117,79 +117,75 @@ There are some variants for special cases
 
 namespace edm {
 
-   template <typename T>
-   class GetterOfProducts {
-   public:
-
-      GetterOfProducts() : branchType_(edm::InEvent) { }
-
-      template <typename U, typename M>
-      GetterOfProducts(U const& match, M* module, edm::BranchType branchType = edm::InEvent) : 
-        matcher_(WillGetIfMatch<T>(match, module)),
-        tokens_(new std::vector<edm::EDGetTokenT<T>>),
-        branchType_(branchType) {
-      }
-
-      void operator()(edm::BranchDescription const& branchDescription) {
-
-         if (branchDescription.dropped()) return;
-         if (branchDescription.branchType() == branchType_ &&
-             branchDescription.unwrappedTypeID() == edm::TypeID(typeid(T))) {
-
-            auto const& token =matcher_(branchDescription);
-            if (not token.isUninitialized()) {
-               tokens_->push_back(token);
-           }
-         }
+  template <typename T>
+  class GetterOfProducts {
+  public:
+    GetterOfProducts() : branchType_(edm::InEvent) {}
+
+    template <typename U, typename M>
+    GetterOfProducts(U const& match, M* module, edm::BranchType branchType = edm::InEvent)
+        : matcher_(WillGetIfMatch<T>(match, module)),
+          tokens_(new std::vector<edm::EDGetTokenT<T>>),
+          branchType_(branchType) {}
+
+    void operator()(edm::BranchDescription const& branchDescription) {
+      if (branchDescription.dropped())
+        return;
+      if (branchDescription.branchType() == branchType_ &&
+          branchDescription.unwrappedTypeID() == edm::TypeID(typeid(T))) {
+        auto const& token = matcher_(branchDescription);
+        if (not token.isUninitialized()) {
+          tokens_->push_back(token);
+        }
       }
-
-      void fillHandles(edm::Event const& event, std::vector<edm::Handle<T> >& handles) const {
-         handles.clear();
-         if(branchType_ == edm::InEvent) {
-            handles.reserve(tokens_->size());
-            edm::Handle<T> handle;
-            for (auto const& token : *tokens_) {
-               if (auto handle = event.getHandle(token)) {
-                  handles.push_back(handle);
-               }
-            }
-         }
+    }
+
+    void fillHandles(edm::Event const& event, std::vector<edm::Handle<T>>& handles) const {
+      handles.clear();
+      if (branchType_ == edm::InEvent) {
+        handles.reserve(tokens_->size());
+        edm::Handle<T> handle;
+        for (auto const& token : *tokens_) {
+          if (auto handle = event.getHandle(token)) {
+            handles.push_back(handle);
+          }
+        }
       }
-
-      void fillHandles(edm::LuminosityBlock const& lumi, std::vector<edm::Handle<T> >& handles) const {
-         handles.clear();
-         if(branchType_ == edm::InLumi ) {
-            handles.reserve(tokens_->size());
-            for (auto const& token : *tokens_) {
-               if (auto handle = lumi.getHandle(token)) {
-                  handles.push_back(handle);
-               }
-            }
-         }
+    }
+
+    void fillHandles(edm::LuminosityBlock const& lumi, std::vector<edm::Handle<T>>& handles) const {
+      handles.clear();
+      if (branchType_ == edm::InLumi) {
+        handles.reserve(tokens_->size());
+        for (auto const& token : *tokens_) {
+          if (auto handle = lumi.getHandle(token)) {
+            handles.push_back(handle);
+          }
+        }
       }
-
-      void fillHandles(edm::Run const& run, std::vector<edm::Handle<T> >& handles) const {
-         handles.clear();
-         if(branchType_ == edm::InRun) {
-            handles.reserve(tokens_->size());
-            for (auto const& token : *tokens_) {
-               if (auto handle = run.getHandle(token)) {
-                  handles.push_back(handle);
-               }
-            }
-         }
+    }
+
+    void fillHandles(edm::Run const& run, std::vector<edm::Handle<T>>& handles) const {
+      handles.clear();
+      if (branchType_ == edm::InRun) {
+        handles.reserve(tokens_->size());
+        for (auto const& token : *tokens_) {
+          if (auto handle = run.getHandle(token)) {
+            handles.push_back(handle);
+          }
+        }
       }
-
-      std::vector<edm::EDGetTokenT<T>> const& tokens() const { return *tokens_; }
-      edm::BranchType branchType() const { return branchType_; }
-
-   private:
-
-      std::function<EDGetTokenT<T> (BranchDescription const&)> matcher_;
-      // A shared pointer is needed because objects of this type get assigned
-      // to std::function's and we want the copies in those to share the same vector.
-      std::shared_ptr<std::vector<edm::EDGetTokenT<T>> > tokens_;
-      edm::BranchType branchType_;
-   };
-}
+    }
+
+    std::vector<edm::EDGetTokenT<T>> const& tokens() const { return *tokens_; }
+    edm::BranchType branchType() const { return branchType_; }
+
+  private:
+    std::function<EDGetTokenT<T>(BranchDescription const&)> matcher_;
+    // A shared pointer is needed because objects of this type get assigned
+    // to std::function's and we want the copies in those to share the same vector.
+    std::shared_ptr<std::vector<edm::EDGetTokenT<T>>> tokens_;
+    edm::BranchType branchType_;
+  };
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/HCMethods.h b/FWCore/Framework/interface/HCMethods.h
index c0a81b20c4faa..488b29664f89f 100644
--- a/FWCore/Framework/interface/HCMethods.h
+++ b/FWCore/Framework/interface/HCMethods.h
@@ -4,8 +4,8 @@
 //
 // Package:     HeteroContainer
 // Module:      HCMethods
-// 
-// Description: Templated methods to be used to 'construct' a 
+//
+// Description: Templated methods to be used to 'construct' a
 //              heterogenous container
 //
 // Usage:
@@ -24,56 +24,51 @@
 namespace edm {
   namespace eventsetup {
     namespace heterocontainer {
-      template< class Type, class Key, class IdTag >
+      template <class Type, class Key, class IdTag>
       inline Key makeKey(const IdTag& iIdTag) {
-	HCTypeTag typeTag = HCTypeTag::make<Type>();
-	return Key(typeTag, iIdTag);
+        HCTypeTag typeTag = HCTypeTag::make<Type>();
+        return Key(typeTag, iIdTag);
       }
-      
-      template< class Type, class Key>
+
+      template <class Type, class Key>
       inline Key makeKey() {
-	HCTypeTag typeTag = HCTypeTag::make<Type>();
-	return Key(typeTag);
+        HCTypeTag typeTag = HCTypeTag::make<Type>();
+        return Key(typeTag);
       }
-      
+
       //NOTE: the following functions use this struct to determine
       //  how to find the 'Type' (what is returned from the Storage)
-      //  when given only an ItemType (what is stored in Storage). 
+      //  when given only an ItemType (what is stored in Storage).
       //  This allows the Storage to be composed of proxies instead of
       //  the 'Type' themselves
-      template<class Key, class ItemType> struct type_from_itemtype {
-	typedef typename std::remove_const<ItemType>::type Type;
+      template <class Key, class ItemType>
+      struct type_from_itemtype {
+        typedef typename std::remove_const<ItemType>::type Type;
       };
 
-      template<class Key, class ItemType, class Storage, class IdTag >
+      template <class Key, class ItemType, class Storage, class IdTag>
       inline bool insert(Storage& iStorage, ItemType* iItem, const IdTag& iIdTag) {
-	return iStorage.insert(makeKey< typename type_from_itemtype<Key, ItemType>::Type, 
-			       Key>(iIdTag) , iItem);
+        return iStorage.insert(makeKey<typename type_from_itemtype<Key, ItemType>::Type, Key>(iIdTag), iItem);
       }
-      
-      template<  class Key, class ItemType, class Storage>
+
+      template <class Key, class ItemType, class Storage>
       inline bool insert(Storage& iStorage, ItemType* iItem) {
-	return iStorage.insert(makeKey<ItemType,
-			       Key>() , iItem);
-         }
-      
-      
-      template< class Key, class ItemType, class Storage, class IdTag >
+        return iStorage.insert(makeKey<ItemType, Key>(), iItem);
+      }
+
+      template <class Key, class ItemType, class Storage, class IdTag>
       inline ItemType* find(const Storage& iStorage, const IdTag& iIdTag) {
-	//The cast should be safe since the Key tells us the type
-	return static_cast<ItemType*>(iStorage.find(
-						    makeKey<typename type_from_itemtype<Key,
-						    ItemType>::Type,Key>(iIdTag)));
+        //The cast should be safe since the Key tells us the type
+        return static_cast<ItemType*>(
+            iStorage.find(makeKey<typename type_from_itemtype<Key, ItemType>::Type, Key>(iIdTag)));
       }
-      
-      template< class Key, class ItemType, class Storage>
+
+      template <class Key, class ItemType, class Storage>
       inline ItemType* find(const Storage& iStorage) {
-	//The cast should be safe since the Key tells us the type
-	return static_cast<ItemType*>( iStorage.find(
-						     makeKey<typename type_from_itemtype<Key,
-						     ItemType>::Type,Key>()));
-         }
-    }
-  }
-}
+        //The cast should be safe since the Key tells us the type
+        return static_cast<ItemType*>(iStorage.find(makeKey<typename type_from_itemtype<Key, ItemType>::Type, Key>()));
+      }
+    }  // namespace heterocontainer
+  }    // namespace eventsetup
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/HCTypeTag.h b/FWCore/Framework/interface/HCTypeTag.h
index ad800edf33c8c..78969a3659be8 100644
--- a/FWCore/Framework/interface/HCTypeTag.h
+++ b/FWCore/Framework/interface/HCTypeTag.h
@@ -37,7 +37,6 @@ namespace edm {
 
       class HCTypeTag : public TypeIDBase {
       public:
-
         HCTypeTag() = default;
 
         // ---------- member functions ---------------------------
@@ -52,23 +51,21 @@ namespace edm {
 
         template <typename T>
         static HCTypeTag make() {
-          return HCTypeTag(typelookup::classTypeInfo<T>(),typelookup::className<T>());
+          return HCTypeTag(typelookup::classTypeInfo<T>(), typelookup::className<T>());
         }
 
       protected:
         // ---------- protected member functions -----------------
-        HCTypeTag(std::type_info const& iValue, char const* iName) :
-          TypeIDBase(iValue), m_name(iName) {}
+        HCTypeTag(std::type_info const& iValue, char const* iName) : TypeIDBase(iValue), m_name(iName) {}
 
-        HCTypeTag(TypeIDBase const& iValue, const char* iName) :
-          TypeIDBase(iValue), m_name(iName) {}
+        HCTypeTag(TypeIDBase const& iValue, const char* iName) : TypeIDBase(iValue), m_name(iName) {}
 
       private:
         char const* m_name{""};
       };
-    }
-  }
-}
+    }  // namespace heterocontainer
+  }    // namespace eventsetup
+}  // namespace edm
 #define HCTYPETAG_HELPER_METHODS(_dataclass_) TYPELOOKUP_METHODS(_dataclass_)
 
 #define DEFINE_HCTYPETAG_REGISTRATION(type) DEFINE_TYPELOOKUP_REGISTRATION(type)
diff --git a/FWCore/Framework/interface/HistoryAppender.h b/FWCore/Framework/interface/HistoryAppender.h
index 274def8ee2dd8..11ade9f95d2f5 100644
--- a/FWCore/Framework/interface/HistoryAppender.h
+++ b/FWCore/Framework/interface/HistoryAppender.h
@@ -13,16 +13,14 @@ namespace edm {
 
   class HistoryAppender {
   public:
-
     HistoryAppender();
 
     // Used to append the current process to the process history
     // when necessary. Optimized to cache the results so it
     // does not need to repeat the same calculations many times.
-    std::shared_ptr<ProcessHistory const>
-    appendToProcessHistory(ProcessHistoryID const& inputPHID,
-                           ProcessHistory const* inputProcessHistory,
-                           ProcessConfiguration const& pc);
+    std::shared_ptr<ProcessHistory const> appendToProcessHistory(ProcessHistoryID const& inputPHID,
+                                                                 ProcessHistory const* inputProcessHistory,
+                                                                 ProcessConfiguration const& pc);
 
   private:
     HistoryAppender(HistoryAppender const&) = delete;
@@ -30,11 +28,10 @@ namespace edm {
 
     // Throws if the new process name is already in the process
     // process history
-    void checkProcessHistory(ProcessHistory const& ph,
-                             ProcessConfiguration const& pc) const;
+    void checkProcessHistory(ProcessHistory const& ph, ProcessConfiguration const& pc) const;
 
     ProcessHistoryID m_cachedInputPHID;
     std::shared_ptr<ProcessHistory const> m_cachedHistory;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/IOVSyncValue.h b/FWCore/Framework/interface/IOVSyncValue.h
index d09b1dc04fd33..c3a1351a8553e 100644
--- a/FWCore/Framework/interface/IOVSyncValue.h
+++ b/FWCore/Framework/interface/IOVSyncValue.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     IOVSyncValue
-// 
+//
 /**\class IOVSyncValue IOVSyncValue.h FWCore/Framework/interface/IOVSyncValue.h
 
  Description: Provides the information needed to synchronize the EventSetup IOV with an Event
@@ -28,94 +28,81 @@
 // forward declarations
 
 namespace edm {
-class IOVSyncValue
-{
-
-   public:
-      IOVSyncValue();
-      //virtual ~IOVSyncValue();
-      explicit IOVSyncValue(const EventID& iID);
-      explicit IOVSyncValue(const Timestamp& iTime);
-      IOVSyncValue(const EventID& iID, const Timestamp& iTime);
-
-      // ---------- const member functions ---------------------
-      const EventID& eventID() const { return eventID_;}
-      LuminosityBlockNumber_t luminosityBlockNumber() const { return eventID_.luminosityBlock();}
-      const Timestamp& time() const {return time_; }
-      
-      bool operator==(const IOVSyncValue& iRHS) const {
-	 return comparable(iRHS) && doOp<std::equal_to>(iRHS);
-      }
-      bool operator!=(const IOVSyncValue& iRHS) const {
-	return (!comparable(iRHS)) || doOp<std::not_equal_to>(iRHS);
-      }
-      
-      bool operator<(const IOVSyncValue& iRHS) const {
-         return doOp<std::less>(iRHS);
-      }
-      bool operator<=(const IOVSyncValue& iRHS) const {
-         return doOp<std::less_equal>(iRHS);
-      }
-      bool operator>(const IOVSyncValue& iRHS) const {
-         return doOp<std::greater>(iRHS);
-      }
-      bool operator>=(const IOVSyncValue& iRHS) const {
-         return doOp<std::greater_equal>(iRHS);
-      }
-      
-      /** returns true if comparison operations are possible. Comparisons only fail if
+  class IOVSyncValue {
+  public:
+    IOVSyncValue();
+    //virtual ~IOVSyncValue();
+    explicit IOVSyncValue(const EventID& iID);
+    explicit IOVSyncValue(const Timestamp& iTime);
+    IOVSyncValue(const EventID& iID, const Timestamp& iTime);
+
+    // ---------- const member functions ---------------------
+    const EventID& eventID() const { return eventID_; }
+    LuminosityBlockNumber_t luminosityBlockNumber() const { return eventID_.luminosityBlock(); }
+    const Timestamp& time() const { return time_; }
+
+    bool operator==(const IOVSyncValue& iRHS) const { return comparable(iRHS) && doOp<std::equal_to>(iRHS); }
+    bool operator!=(const IOVSyncValue& iRHS) const { return (!comparable(iRHS)) || doOp<std::not_equal_to>(iRHS); }
+
+    bool operator<(const IOVSyncValue& iRHS) const { return doOp<std::less>(iRHS); }
+    bool operator<=(const IOVSyncValue& iRHS) const { return doOp<std::less_equal>(iRHS); }
+    bool operator>(const IOVSyncValue& iRHS) const { return doOp<std::greater>(iRHS); }
+    bool operator>=(const IOVSyncValue& iRHS) const { return doOp<std::greater_equal>(iRHS); }
+
+    /** returns true if comparison operations are possible. Comparisons only fail if
 	  a time only value is compared to a run/lumi/event only value.
        */
-      bool comparable(const IOVSyncValue& iOther) const {
-	return (haveID_==iOther.haveID_) || (haveTime_==iOther.haveTime_);
+    bool comparable(const IOVSyncValue& iOther) const {
+      return (haveID_ == iOther.haveID_) || (haveTime_ == iOther.haveTime_);
+    }
+
+    // ---------- static member functions --------------------
+    static const IOVSyncValue& invalidIOVSyncValue();
+    static const IOVSyncValue& endOfTime();
+    static const IOVSyncValue& beginOfTime();
+
+    // ---------- member functions ---------------------------
+
+  private:
+    //IOVSyncValue(const IOVSyncValue&); // stop default
+
+    //const IOVSyncValue& operator=(const IOVSyncValue&); // stop default
+    void throwInvalidComparison() const;
+    template <template <typename> class Op>
+    bool doOp(const IOVSyncValue& iRHS) const {
+      bool returnValue = false;
+      if (haveID_ && iRHS.haveID_) {
+        if (luminosityBlockNumber() == 0 || iRHS.luminosityBlockNumber() == 0 ||
+            luminosityBlockNumber() == iRHS.luminosityBlockNumber()) {
+          Op<EventID> op;
+          returnValue = op(eventID_, iRHS.eventID_);
+        } else {
+          if (iRHS.eventID_.run() == eventID_.run()) {
+            Op<LuminosityBlockNumber_t> op;
+            returnValue = op(luminosityBlockNumber(), iRHS.luminosityBlockNumber());
+          } else {
+            Op<RunNumber_t> op;
+            returnValue = op(eventID_.run(), iRHS.eventID_.run());
+          }
+        }
+
+      } else if (haveTime_ && iRHS.haveTime_) {
+        Op<Timestamp> op;
+        returnValue = op(time_, iRHS.time_);
+      } else {
+        //error
+        throwInvalidComparison();
       }
+      return returnValue;
+    }
+
+    // ---------- member data --------------------------------
+    EventID eventID_;
+    Timestamp time_;
+    bool haveID_;
+    bool haveTime_;
+  };
 
-      // ---------- static member functions --------------------
-      static const IOVSyncValue& invalidIOVSyncValue();
-      static const IOVSyncValue& endOfTime();
-      static const IOVSyncValue& beginOfTime();
-
-      // ---------- member functions ---------------------------
-
-   private:
-      //IOVSyncValue(const IOVSyncValue&); // stop default
-
-      //const IOVSyncValue& operator=(const IOVSyncValue&); // stop default
-      void throwInvalidComparison() const;
-      template< template <typename> class Op >
-         bool doOp(const IOVSyncValue& iRHS) const {
-            bool returnValue = false;
-            if(haveID_ && iRHS.haveID_) {
-               if(luminosityBlockNumber()==0 || iRHS.luminosityBlockNumber()==0 || luminosityBlockNumber()==iRHS.luminosityBlockNumber()) {
-                  Op<EventID> op;
-                  returnValue = op(eventID_, iRHS.eventID_);
-               } else {
-                  if(iRHS.eventID_.run() == eventID_.run()) {
-                     Op<LuminosityBlockNumber_t> op;
-                     returnValue = op(luminosityBlockNumber(), iRHS.luminosityBlockNumber());
-                  } else {
-                     Op<RunNumber_t> op;
-                     returnValue = op(eventID_.run(), iRHS.eventID_.run());
-                  }
-               }
-
-            } else if (haveTime_ && iRHS.haveTime_) {
-               Op<Timestamp> op;
-               returnValue = op(time_, iRHS.time_);
-            } else {
-               //error
- 	       throwInvalidComparison();
-            }
-            return returnValue;
-         }
-         
-      // ---------- member data --------------------------------
-      EventID eventID_;
-      Timestamp time_;
-      bool haveID_;
-      bool haveTime_;
-};
-
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/InputSource.h b/FWCore/Framework/interface/InputSource.h
index 29bb88884c7e2..32ca0bca68f98 100644
--- a/FWCore/Framework/interface/InputSource.h
+++ b/FWCore/Framework/interface/InputSource.h
@@ -75,22 +75,9 @@ namespace edm {
 
   class InputSource {
   public:
-    enum ItemType {
-      IsInvalid,
-      IsStop,
-      IsFile,
-      IsRun,
-      IsLumi,
-      IsEvent,
-      IsRepeat,
-      IsSynchronize
-    };
+    enum ItemType { IsInvalid, IsStop, IsFile, IsRun, IsLumi, IsEvent, IsRepeat, IsSynchronize };
 
-    enum ProcessingMode {
-      Runs,
-      RunsAndLumis,
-      RunsLumisAndEvents
-    };
+    enum ProcessingMode { Runs, RunsAndLumis, RunsLumisAndEvents };
 
     /// Constructor
     explicit InputSource(ParameterSet const&, InputSourceDescription const&);
@@ -98,22 +85,22 @@ namespace edm {
     /// Destructor
     virtual ~InputSource() noexcept(false);
 
-    InputSource(InputSource const&) = delete; // Disallow copying and moving
-    InputSource& operator=(InputSource const&) = delete; // Disallow copying and moving
+    InputSource(InputSource const&) = delete;             // Disallow copying and moving
+    InputSource& operator=(InputSource const&) = delete;  // Disallow copying and moving
 
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
     static const std::string& baseType();
     static void fillDescription(ParameterSetDescription& desc);
-    static void prevalidate(ConfigurationDescriptions& );
+    static void prevalidate(ConfigurationDescriptions&);
 
     /// Advances the source to the next item
     ItemType nextItemType();
 
     /// Read next event
-    void readEvent(EventPrincipal& ep, StreamContext &);
+    void readEvent(EventPrincipal& ep, StreamContext&);
 
     /// Read a specific event
-    bool readEvent(EventPrincipal& ep, EventID const&, StreamContext &);
+    bool readEvent(EventPrincipal& ep, EventID const&, StreamContext&);
 
     /// Read next luminosity block Auxilary
     std::shared_ptr<LuminosityBlockAuxiliary> readLuminosityBlockAuxiliary();
@@ -149,10 +136,10 @@ namespace edm {
     void rewind();
 
     /// Set the run number
-    void setRunNumber(RunNumber_t r) {setRun(r);}
+    void setRunNumber(RunNumber_t r) { setRun(r); }
 
     /// Set the luminosity block ID
-    void setLuminosityBlockNumber_t(LuminosityBlockNumber_t lb) {setLumi(lb);}
+    void setLuminosityBlockNumber_t(LuminosityBlockNumber_t lb) { setLumi(lb); }
 
     /// issue an event report
     void issueReports(EventID const& eventID, StreamID streamID);
@@ -161,54 +148,60 @@ namespace edm {
     virtual void registerProducts();
 
     /// Accessors for product registry
-    std::shared_ptr<ProductRegistry const> productRegistry() const {return get_underlying_safe(productRegistry_);}
-    std::shared_ptr<ProductRegistry>& productRegistry() {return get_underlying_safe(productRegistry_);}
+    std::shared_ptr<ProductRegistry const> productRegistry() const { return get_underlying_safe(productRegistry_); }
+    std::shared_ptr<ProductRegistry>& productRegistry() { return get_underlying_safe(productRegistry_); }
 
     /// Accessors for process history registry.
-    ProcessHistoryRegistry const& processHistoryRegistry() const {return *processHistoryRegistry_;}
-    ProcessHistoryRegistry& processHistoryRegistry() {return *processHistoryRegistry_;}
+    ProcessHistoryRegistry const& processHistoryRegistry() const { return *processHistoryRegistry_; }
+    ProcessHistoryRegistry& processHistoryRegistry() { return *processHistoryRegistry_; }
 
     /// Accessors for branchIDListHelper
-    std::shared_ptr<BranchIDListHelper const> branchIDListHelper() const {return get_underlying_safe(branchIDListHelper_);}
-    std::shared_ptr<BranchIDListHelper>& branchIDListHelper() {return get_underlying_safe(branchIDListHelper_);}
+    std::shared_ptr<BranchIDListHelper const> branchIDListHelper() const {
+      return get_underlying_safe(branchIDListHelper_);
+    }
+    std::shared_ptr<BranchIDListHelper>& branchIDListHelper() { return get_underlying_safe(branchIDListHelper_); }
 
     /// Accessors for thinnedAssociationsHelper
-    std::shared_ptr<ThinnedAssociationsHelper const> thinnedAssociationsHelper() const {return get_underlying_safe(thinnedAssociationsHelper_);}
-    std::shared_ptr<ThinnedAssociationsHelper>& thinnedAssociationsHelper() {return get_underlying_safe(thinnedAssociationsHelper_);}
+    std::shared_ptr<ThinnedAssociationsHelper const> thinnedAssociationsHelper() const {
+      return get_underlying_safe(thinnedAssociationsHelper_);
+    }
+    std::shared_ptr<ThinnedAssociationsHelper>& thinnedAssociationsHelper() {
+      return get_underlying_safe(thinnedAssociationsHelper_);
+    }
 
     /// Reset the remaining number of events/lumis to the maximum number.
     void repeat() {
       remainingEvents_ = maxEvents_;
       remainingLumis_ = maxLumis_;
     }
-    
+
     /// Returns nullptr if no resource shared between the Source and a DelayedReader
-    std::pair<SharedResourcesAcquirer*,std::recursive_mutex*> resourceSharedWithDelayedReader();
+    std::pair<SharedResourcesAcquirer*, std::recursive_mutex*> resourceSharedWithDelayedReader();
 
     /// Accessor for maximum number of events to be read.
     /// -1 is used for unlimited.
-    int maxEvents() const {return maxEvents_;}
+    int maxEvents() const { return maxEvents_; }
 
     /// Accessor for remaining number of events to be read.
     /// -1 is used for unlimited.
-    int remainingEvents() const {return remainingEvents_;}
+    int remainingEvents() const { return remainingEvents_; }
 
     /// Accessor for maximum number of lumis to be read.
     /// -1 is used for unlimited.
-    int maxLuminosityBlocks() const {return maxLumis_;}
+    int maxLuminosityBlocks() const { return maxLumis_; }
 
     /// Accessor for remaining number of lumis to be read.
     /// -1 is used for unlimited.
-    int remainingLuminosityBlocks() const {return remainingLumis_;}
+    int remainingLuminosityBlocks() const { return remainingLumis_; }
 
     /// Accessor for 'module' description.
-    ModuleDescription const& moduleDescription() const {return moduleDescription_;}
+    ModuleDescription const& moduleDescription() const { return moduleDescription_; }
 
     /// Accessor for Process Configuration
-    ProcessConfiguration const& processConfiguration() const {return moduleDescription().processConfiguration();}
+    ProcessConfiguration const& processConfiguration() const { return moduleDescription().processConfiguration(); }
 
     /// Accessor for global process identifier
-    std::string const& processGUID() const {return processGUID_;}
+    std::string const& processGUID() const { return processGUID_; }
 
     /// Called by framework at beginning of job
     void doBeginJob();
@@ -223,12 +216,12 @@ namespace edm {
     virtual void doBeginRun(RunPrincipal& rp, ProcessContext const*);
 
     /// Accessor for the current time, as seen by the input source
-    Timestamp const& timestamp() const {return time_;}
+    Timestamp const& timestamp() const { return time_; }
 
     /// Accessor for the reduced process history ID of the current run.
     /// This is the ID of the input process history which does not include
     /// the current process.
-    ProcessHistoryID const&  reducedProcessHistoryID() const;
+    ProcessHistoryID const& reducedProcessHistoryID() const;
 
     /// Accessor for current run number
     RunNumber_t run() const;
@@ -237,16 +230,16 @@ namespace edm {
     LuminosityBlockNumber_t luminosityBlock() const;
 
     /// RunsLumisAndEvents (default), RunsAndLumis, or Runs.
-    ProcessingMode processingMode() const {return processingMode_;}
+    ProcessingMode processingMode() const { return processingMode_; }
 
     /// Accessor for Activity Registry
-    std::shared_ptr<ActivityRegistry> actReg() const {return actReg_;}
+    std::shared_ptr<ActivityRegistry> actReg() const { return actReg_; }
 
     /// Called by the framework to merge or insert run in principal cache.
-    std::shared_ptr<RunAuxiliary> runAuxiliary() const {return runAuxiliary_;}
+    std::shared_ptr<RunAuxiliary> runAuxiliary() const { return runAuxiliary_; }
 
     /// Called by the framework to merge or insert lumi in principal cache.
-    std::shared_ptr<LuminosityBlockAuxiliary> luminosityBlockAuxiliary() const {return lumiAuxiliary_;}
+    std::shared_ptr<LuminosityBlockAuxiliary> luminosityBlockAuxiliary() const { return lumiAuxiliary_; }
 
     bool randomAccess() const;
     ProcessingController::ForwardState forwardState() const;
@@ -254,15 +247,15 @@ namespace edm {
 
     class EventSourceSentry {
     public:
-      EventSourceSentry(InputSource const& source, StreamContext & sc);
+      EventSourceSentry(InputSource const& source, StreamContext& sc);
       ~EventSourceSentry();
 
-      EventSourceSentry(EventSourceSentry const&) = delete; // Disallow copying and moving
-      EventSourceSentry& operator=(EventSourceSentry const&) = delete; // Disallow copying and moving
+      EventSourceSentry(EventSourceSentry const&) = delete;             // Disallow copying and moving
+      EventSourceSentry& operator=(EventSourceSentry const&) = delete;  // Disallow copying and moving
 
     private:
       InputSource const& source_;
-      StreamContext & sc_;
+      StreamContext& sc_;
     };
 
     class LumiSourceSentry {
@@ -270,8 +263,8 @@ namespace edm {
       LumiSourceSentry(InputSource const& source, LuminosityBlockIndex id);
       ~LumiSourceSentry();
 
-      LumiSourceSentry(LumiSourceSentry const&) = delete; // Disallow copying and moving
-      LumiSourceSentry& operator=(LumiSourceSentry const&) = delete; // Disallow copying and moving
+      LumiSourceSentry(LumiSourceSentry const&) = delete;             // Disallow copying and moving
+      LumiSourceSentry& operator=(LumiSourceSentry const&) = delete;  // Disallow copying and moving
 
     private:
       InputSource const& source_;
@@ -283,8 +276,8 @@ namespace edm {
       RunSourceSentry(InputSource const& source, RunIndex id);
       ~RunSourceSentry();
 
-      RunSourceSentry(RunSourceSentry const&) = delete; // Disallow copying and moving
-      RunSourceSentry& operator=(RunSourceSentry const&) = delete; // Disallow copying and moving
+      RunSourceSentry(RunSourceSentry const&) = delete;             // Disallow copying and moving
+      RunSourceSentry& operator=(RunSourceSentry const&) = delete;  // Disallow copying and moving
 
     private:
       InputSource const& source_;
@@ -297,8 +290,8 @@ namespace edm {
       explicit FileOpenSentry(InputSource const& source, std::string const& lfn, bool usedFallback);
       ~FileOpenSentry();
 
-      FileOpenSentry(FileOpenSentry const&) = delete; // Disallow copying and moving
-      FileOpenSentry& operator=(FileOpenSentry const&) = delete; // Disallow copying and moving
+      FileOpenSentry(FileOpenSentry const&) = delete;             // Disallow copying and moving
+      FileOpenSentry& operator=(FileOpenSentry const&) = delete;  // Disallow copying and moving
 
     private:
       Sig& post_;
@@ -312,8 +305,8 @@ namespace edm {
       explicit FileCloseSentry(InputSource const& source, std::string const& lfn, bool usedFallback);
       ~FileCloseSentry();
 
-      FileCloseSentry(FileCloseSentry const&) = delete; // Disallow copying and moving
-      FileCloseSentry& operator=(FileCloseSentry const&) = delete; // Disallow copying and moving
+      FileCloseSentry(FileCloseSentry const&) = delete;             // Disallow copying and moving
+      FileCloseSentry& operator=(FileCloseSentry const&) = delete;  // Disallow copying and moving
 
     private:
       Sig& post_;
@@ -323,17 +316,16 @@ namespace edm {
 
     signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> preEventReadFromSourceSignal_;
     signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> postEventReadFromSourceSignal_;
-    
 
   protected:
     virtual void skip(int offset);
 
     /// To set the current time, as seen by the input source
-    void setTimestamp(Timestamp const& theTime) {time_ = theTime;}
+    void setTimestamp(Timestamp const& theTime) { time_ = theTime; }
 
-    ProductRegistry& productRegistryUpdate() {return *productRegistry_;}
-    ProcessHistoryRegistry& processHistoryRegistryForUpdate() {return *processHistoryRegistry_;}
-    ItemType state() const{return state_;}
+    ProductRegistry& productRegistryUpdate() { return *productRegistry_; }
+    ProcessHistoryRegistry& processHistoryRegistryForUpdate() { return *processHistoryRegistry_; }
+    ItemType state() const { return state_; }
     void setRunAuxiliary(RunAuxiliary* rp) {
       runAuxiliary_.reset(rp);
       newRun_ = newLumi_ = true;
@@ -355,32 +347,38 @@ namespace edm {
       resetRunAuxiliary();
       state_ = IsInvalid;
     }
-    bool newRun() const {return newRun_;}
-    void setNewRun() {newRun_ = true;}
-    void resetNewRun() {newRun_ = false;}
-    bool newLumi() const {return newLumi_;}
-    void setNewLumi() {newLumi_ = true;}
-    void resetNewLumi() {newLumi_ = false;}
-    bool eventCached() const {return eventCached_;}
+    bool newRun() const { return newRun_; }
+    void setNewRun() { newRun_ = true; }
+    void resetNewRun() { newRun_ = false; }
+    bool newLumi() const { return newLumi_; }
+    void setNewLumi() { newLumi_ = true; }
+    void resetNewLumi() { newLumi_ = false; }
+    bool eventCached() const { return eventCached_; }
     /// Called by the framework to merge or ached() const {return eventCached_;}
-    void setEventCached() {eventCached_ = true;}
-    void resetEventCached() {eventCached_ = false;}
+    void setEventCached() { eventCached_ = true; }
+    void resetEventCached() { eventCached_ = false; }
 
     ///Called by inheriting classes when running multicore when the receiver has told them to
     /// skip some events.
     void decreaseRemainingEventsBy(int iSkipped);
 
   private:
-    bool eventLimitReached() const {return remainingEvents_ == 0;}
+    bool eventLimitReached() const { return remainingEvents_ == 0; }
     bool lumiLimitReached() const {
-      if (remainingLumis_ == 0) {return true;}
-      if (maxSecondsUntilRampdown_ <= 0) {return false;}
+      if (remainingLumis_ == 0) {
+        return true;
+      }
+      if (maxSecondsUntilRampdown_ <= 0) {
+        return false;
+      }
       auto end = std::chrono::steady_clock::now();
       auto elapsed = end - processingStart_;
-      if (std::chrono::duration_cast<std::chrono::seconds>(elapsed).count() > maxSecondsUntilRampdown_) {return true;}
+      if (std::chrono::duration_cast<std::chrono::seconds>(elapsed).count() > maxSecondsUntilRampdown_) {
+        return true;
+      }
       return false;
     }
-    bool limitReached() const {return eventLimitReached() || lumiLimitReached();}
+    bool limitReached() const { return eventLimitReached() || lumiLimitReached(); }
     virtual ItemType getNextItemType() = 0;
     ItemType nextItemType_();
     virtual std::shared_ptr<RunAuxiliary> readRunAuxiliary_() = 0;
@@ -397,15 +395,14 @@ namespace edm {
     virtual void rewind_();
     virtual void beginJob();
     virtual void endJob();
-    virtual std::pair<SharedResourcesAcquirer*,std::recursive_mutex*> resourceSharedWithDelayedReader_();
+    virtual std::pair<SharedResourcesAcquirer*, std::recursive_mutex*> resourceSharedWithDelayedReader_();
 
     virtual bool randomAccess_() const;
     virtual ProcessingController::ForwardState forwardState_() const;
     virtual ProcessingController::ReverseState reverseState_() const;
 
   private:
-
-    std::shared_ptr<ActivityRegistry> actReg_; // We do not use propagate_const because the registry itself is mutable.
+    std::shared_ptr<ActivityRegistry> actReg_;  // We do not use propagate_const because the registry itself is mutable.
     int maxEvents_;
     int remainingEvents_;
     int maxLumis_;
@@ -426,11 +423,11 @@ namespace edm {
     bool eventCached_;
     mutable ItemType state_;
     mutable std::shared_ptr<RunAuxiliary> runAuxiliary_;
-    mutable std::shared_ptr<LuminosityBlockAuxiliary>  lumiAuxiliary_;
+    mutable std::shared_ptr<LuminosityBlockAuxiliary> lumiAuxiliary_;
     std::string statusFileName_;
 
     unsigned int numberOfEventsBeforeBigSkip_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/InputSourceDescription.h b/FWCore/Framework/interface/InputSourceDescription.h
index ad8e86b86cb6b..ca8476c98b81d 100644
--- a/FWCore/Framework/interface/InputSourceDescription.h
+++ b/FWCore/Framework/interface/InputSourceDescription.h
@@ -18,14 +18,13 @@ namespace edm {
   class ThinnedAssociationsHelper;
 
   struct InputSourceDescription {
-    InputSourceDescription() :
-      moduleDescription_(),
-      productRegistry_(nullptr),
-      actReg_(),
-      maxEvents_(-1),
-      maxLumis_(-1),
-      allocations_(nullptr) {
-    }
+    InputSourceDescription()
+        : moduleDescription_(),
+          productRegistry_(nullptr),
+          actReg_(),
+          maxEvents_(-1),
+          maxLumis_(-1),
+          allocations_(nullptr) {}
 
     InputSourceDescription(ModuleDescription const& md,
                            std::shared_ptr<ProductRegistry> preg,
@@ -35,28 +34,27 @@ namespace edm {
                            int maxEvents,
                            int maxLumis,
                            int maxSecondsUntilRampdown,
-                           PreallocationConfiguration const& allocations) :
-      moduleDescription_(md),
-      productRegistry_(preg),
-      branchIDListHelper_(branchIDListHelper),
-      thinnedAssociationsHelper_(thinnedAssociationsHelper),
-      actReg_(areg),
-      maxEvents_(maxEvents),
-      maxLumis_(maxLumis),
-      maxSecondsUntilRampdown_(maxSecondsUntilRampdown),
-      allocations_(&allocations) {
-   }
+                           PreallocationConfiguration const& allocations)
+        : moduleDescription_(md),
+          productRegistry_(preg),
+          branchIDListHelper_(branchIDListHelper),
+          thinnedAssociationsHelper_(thinnedAssociationsHelper),
+          actReg_(areg),
+          maxEvents_(maxEvents),
+          maxLumis_(maxLumis),
+          maxSecondsUntilRampdown_(maxSecondsUntilRampdown),
+          allocations_(&allocations) {}
 
     ModuleDescription moduleDescription_;
     std::shared_ptr<ProductRegistry> productRegistry_;
     std::shared_ptr<BranchIDListHelper> branchIDListHelper_;
     std::shared_ptr<ThinnedAssociationsHelper> thinnedAssociationsHelper_;
-    std::shared_ptr<ActivityRegistry> actReg_; // We do not use propagate_const because the registry itself is mutable.
+    std::shared_ptr<ActivityRegistry> actReg_;  // We do not use propagate_const because the registry itself is mutable.
     int maxEvents_;
     int maxLumis_;
     int maxSecondsUntilRampdown_;
     PreallocationConfiguration const* allocations_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/InputSourceMacros.h b/FWCore/Framework/interface/InputSourceMacros.h
index 971dc2c10e2d3..14d4fd393f4bc 100644
--- a/FWCore/Framework/interface/InputSourceMacros.h
+++ b/FWCore/Framework/interface/InputSourceMacros.h
@@ -5,7 +5,8 @@
 #include "FWCore/Framework/interface/InputSource.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescriptionFillerPluginFactory.h"
 
-#define DEFINE_FWK_INPUT_SOURCE(type) \
-  DEFINE_EDM_PLUGIN (edm::InputSourcePluginFactory,type,#type); DEFINE_FWK_PSET_DESC_FILLER(type)
+#define DEFINE_FWK_INPUT_SOURCE(type)                            \
+  DEFINE_EDM_PLUGIN(edm::InputSourcePluginFactory, type, #type); \
+  DEFINE_FWK_PSET_DESC_FILLER(type)
 
 #endif
diff --git a/FWCore/Framework/interface/InputTagMatch.h b/FWCore/Framework/interface/InputTagMatch.h
index f0d6664e60f25..b5a96b8b852ba 100644
--- a/FWCore/Framework/interface/InputTagMatch.h
+++ b/FWCore/Framework/interface/InputTagMatch.h
@@ -17,32 +17,32 @@ See comments in the file GetterOfProducts.h for a description.
 
 namespace edm {
 
-   class InputTagMatch {
-   public:
-
-      InputTagMatch(edm::InputTag const& inputTag) : inputTag_(inputTag) { }
-
-      bool operator()(edm::BranchDescription const& branchDescription) {
-         bool result(true);
-         bool match(false);
-         if (!inputTag_.label().empty()) {
-           match = true;
-           result = (result && branchDescription.moduleLabel() == inputTag_.label());
-         }
-         if (!inputTag_.instance().empty()) {
-           match = true;
-           result = (result && branchDescription.productInstanceName() == inputTag_.instance());
-         }
-         if (!inputTag_.process().empty()) {
-           match = true;
-           result = (result && branchDescription.processName() == inputTag_.process());
-         }
-         if (match) return result;
-         return false;
+  class InputTagMatch {
+  public:
+    InputTagMatch(edm::InputTag const& inputTag) : inputTag_(inputTag) {}
+
+    bool operator()(edm::BranchDescription const& branchDescription) {
+      bool result(true);
+      bool match(false);
+      if (!inputTag_.label().empty()) {
+        match = true;
+        result = (result && branchDescription.moduleLabel() == inputTag_.label());
       }
-
-   private:
-      edm::InputTag inputTag_;
-   };
-}
+      if (!inputTag_.instance().empty()) {
+        match = true;
+        result = (result && branchDescription.productInstanceName() == inputTag_.instance());
+      }
+      if (!inputTag_.process().empty()) {
+        match = true;
+        result = (result && branchDescription.processName() == inputTag_.process());
+      }
+      if (match)
+        return result;
+      return false;
+    }
+
+  private:
+    edm::InputTag inputTag_;
+  };
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/LooperFactory.h b/FWCore/Framework/interface/LooperFactory.h
index fe196e837290a..1274ce0bf723d 100644
--- a/FWCore/Framework/interface/LooperFactory.h
+++ b/FWCore/Framework/interface/LooperFactory.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     LooperFactory
-// 
+//
 /**\class LooperFactory LooperFactory.h FWCore/Framework/interface/LooperFactory.h
 
  Description: PluginManager factory for creating EDLoopers
@@ -28,89 +28,83 @@
 
 // forward declarations
 namespace edm {
-   class EDLooperBase;
-   class EventSetupRecordIntervalFinder;
-   class ParameterSet;
-
-   namespace eventsetup {
-
-      class DataProxyProvider;
-      class EventSetupsController;
-
-      namespace looper {
-      template<class T>
-         void addProviderTo(EventSetupProvider& iProvider, std::shared_ptr<T> iComponent, const DataProxyProvider*) 
-      {
-            std::shared_ptr<DataProxyProvider> pProvider(iComponent);
-            ComponentDescription description = pProvider->description();
-            description.isSource_=true;
-            description.isLooper_=true;
-	    if(description.label_ =="@main_looper") {
-	       //remove the 'hidden' label so that es_prefer statements will work
-	       description.label_ ="";
-	    }
-            pProvider->setDescription(description);
-            iProvider.add(pProvider);
+  class EDLooperBase;
+  class EventSetupRecordIntervalFinder;
+  class ParameterSet;
+
+  namespace eventsetup {
+
+    class DataProxyProvider;
+    class EventSetupsController;
+
+    namespace looper {
+      template <class T>
+      void addProviderTo(EventSetupProvider& iProvider, std::shared_ptr<T> iComponent, const DataProxyProvider*) {
+        std::shared_ptr<DataProxyProvider> pProvider(iComponent);
+        ComponentDescription description = pProvider->description();
+        description.isSource_ = true;
+        description.isLooper_ = true;
+        if (description.label_ == "@main_looper") {
+          //remove the 'hidden' label so that es_prefer statements will work
+          description.label_ = "";
+        }
+        pProvider->setDescription(description);
+        iProvider.add(pProvider);
       }
-      template<class T>
-         void addProviderTo(EventSetupProvider& /* iProvider */, std::shared_ptr<T> /*iComponent*/, const void*) 
-      {
-            //do nothing
+      template <class T>
+      void addProviderTo(EventSetupProvider& /* iProvider */, std::shared_ptr<T> /*iComponent*/, const void*) {
+        //do nothing
       }
 
-      template<class T>
-        void addFinderTo(EventSetupProvider& iProvider, std::shared_ptr<T> iComponent, const EventSetupRecordIntervalFinder*) 
-      {
-          std::shared_ptr<EventSetupRecordIntervalFinder> pFinder(iComponent);
-
-          ComponentDescription description = pFinder->descriptionForFinder();
-          description.isSource_=true;
-          description.isLooper_=true;
-          if(description.label_ =="@main_looper") {
-            //remove the 'hidden' label so that es_prefer statements will work
-            description.label_ ="";
-          }
-          pFinder->setDescriptionForFinder(description);
-          
-          iProvider.add(pFinder);
+      template <class T>
+      void addFinderTo(EventSetupProvider& iProvider,
+                       std::shared_ptr<T> iComponent,
+                       const EventSetupRecordIntervalFinder*) {
+        std::shared_ptr<EventSetupRecordIntervalFinder> pFinder(iComponent);
+
+        ComponentDescription description = pFinder->descriptionForFinder();
+        description.isSource_ = true;
+        description.isLooper_ = true;
+        if (description.label_ == "@main_looper") {
+          //remove the 'hidden' label so that es_prefer statements will work
+          description.label_ = "";
+        }
+        pFinder->setDescriptionForFinder(description);
+
+        iProvider.add(pFinder);
       }
-      template<class T>
-        void addFinderTo(EventSetupProvider& /* iProvider */, std::shared_ptr<T> /*iComponent*/, const void*) 
-      {
-          //do nothing
+      template <class T>
+      void addFinderTo(EventSetupProvider& /* iProvider */, std::shared_ptr<T> /*iComponent*/, const void*) {
+        //do nothing
       }
+    }  // namespace looper
+    struct LooperMakerTraits {
+      typedef EDLooperBase base_type;
+      static std::string name();
+      template <class T>
+      static void addTo(EventSetupProvider& iProvider, std::shared_ptr<T> iComponent, ParameterSet const&, bool) {
+        //a looper does not always have to be a provider or a finder
+        looper::addProviderTo(iProvider, iComponent, static_cast<const T*>(nullptr));
+        looper::addFinderTo(iProvider, iComponent, static_cast<const T*>(nullptr));
       }
-      struct LooperMakerTraits {
-         typedef EDLooperBase base_type;
-         static std::string name();
-         template<class T>
-         static void addTo(EventSetupProvider& iProvider,
-                           std::shared_ptr<T> iComponent,
-                           ParameterSet const&,
-                           bool)
-            {
-               //a looper does not always have to be a provider or a finder
-               looper::addProviderTo(iProvider, iComponent, static_cast<const T*>(nullptr));
-               looper::addFinderTo(iProvider, iComponent, static_cast<const T*>(nullptr));
-            }
-
-         static void replaceExisting(EventSetupProvider& iProvider, std::shared_ptr<EDLooperBase> iComponent); 
-
-         static std::shared_ptr<base_type> getComponentAndRegisterProcess(EventSetupsController& esController,
-                                                                            ParameterSet const& iConfiguration);               
-         static void putComponent(EventSetupsController& esController,
-                                  ParameterSet const& iConfiguration,
-                                  std::shared_ptr<base_type> const& component);
-      };
-      template< class TType>
-         struct LooperMaker : public ComponentMaker<edm::eventsetup::LooperMakerTraits,TType> {};
-      typedef  ComponentFactory<LooperMakerTraits> LooperFactory ;
-      
-      typedef edmplugin::PluginFactory<edm::eventsetup::ComponentMakerBase<LooperMakerTraits>* ()> LooperPluginFactory;
-   }
-}
+
+      static void replaceExisting(EventSetupProvider& iProvider, std::shared_ptr<EDLooperBase> iComponent);
+
+      static std::shared_ptr<base_type> getComponentAndRegisterProcess(EventSetupsController& esController,
+                                                                       ParameterSet const& iConfiguration);
+      static void putComponent(EventSetupsController& esController,
+                               ParameterSet const& iConfiguration,
+                               std::shared_ptr<base_type> const& component);
+    };
+    template <class TType>
+    struct LooperMaker : public ComponentMaker<edm::eventsetup::LooperMakerTraits, TType> {};
+    typedef ComponentFactory<LooperMakerTraits> LooperFactory;
+
+    typedef edmplugin::PluginFactory<edm::eventsetup::ComponentMakerBase<LooperMakerTraits>*()> LooperPluginFactory;
+  }  // namespace eventsetup
+}  // namespace edm
 
 #define DEFINE_FWK_LOOPER(type) \
-DEFINE_EDM_PLUGIN (edm::eventsetup::LooperPluginFactory,edm::eventsetup::LooperMaker<type>,#type)
+  DEFINE_EDM_PLUGIN(edm::eventsetup::LooperPluginFactory, edm::eventsetup::LooperMaker<type>, #type)
 
 #endif
diff --git a/FWCore/Framework/interface/LuminosityBlock.h b/FWCore/Framework/interface/LuminosityBlock.h
index 4b74e23f6f1c9..d44a1b40d140d 100644
--- a/FWCore/Framework/interface/LuminosityBlock.h
+++ b/FWCore/Framework/interface/LuminosityBlock.h
@@ -40,18 +40,20 @@ namespace edm {
   class SharedResourcesAcquirer;
 
   namespace stream {
-    template< typename T> class ProducingModuleAdaptorBase;
+    template <typename T>
+    class ProducingModuleAdaptorBase;
   }
 
-
   class LuminosityBlock : public LuminosityBlockBase {
   public:
-    LuminosityBlock(LuminosityBlockPrincipal const& lbp, ModuleDescription const& md,
-                    ModuleCallingContext const*, bool isAtEnd);
+    LuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                    ModuleDescription const& md,
+                    ModuleCallingContext const*,
+                    bool isAtEnd);
     ~LuminosityBlock() override;
 
     // AUX functions are defined in LuminosityBlockBase
-    LuminosityBlockAuxiliary const& luminosityBlockAuxiliary() const override {return aux_;}
+    LuminosityBlockAuxiliary const& luminosityBlockAuxiliary() const override { return aux_; }
 
     /**\return Reusable index which can be used to separate data for different simultaneous LuminosityBlocks.
      */
@@ -64,117 +66,96 @@ namespace edm {
      denote that you have not yet checked the value.
      */
     typedef unsigned long CacheIdentifier_t;
-    CacheIdentifier_t
-    cacheIdentifier() const;
+    CacheIdentifier_t cacheIdentifier() const;
 
     //Used in conjunction with EDGetToken
     void setConsumer(EDConsumerBase const* iConsumer);
 
-    void setSharedResourcesAcquirer( SharedResourcesAcquirer* iResourceAcquirer);
+    void setSharedResourcesAcquirer(SharedResourcesAcquirer* iResourceAcquirer);
 
     void setProducer(ProducerBase const* iProducer);
 
     template <typename PROD>
-    bool
-    getByLabel(std::string const& label, Handle<PROD>& result) const;
+    bool getByLabel(std::string const& label, Handle<PROD>& result) const;
 
     template <typename PROD>
-    bool
-    getByLabel(std::string const& label,
-               std::string const& productInstanceName,
-               Handle<PROD>& result) const;
+    bool getByLabel(std::string const& label, std::string const& productInstanceName, Handle<PROD>& result) const;
 
     /// same as above, but using the InputTag class
     template <typename PROD>
-    bool
-    getByLabel(InputTag const& tag, Handle<PROD>& result) const;
-
-    template<typename PROD>
-    bool
-    getByToken(EDGetToken token, Handle<PROD>& result) const;
+    bool getByLabel(InputTag const& tag, Handle<PROD>& result) const;
 
-    template<typename PROD>
-    bool
-    getByToken(EDGetTokenT<PROD> token, Handle<PROD>& result) const;
+    template <typename PROD>
+    bool getByToken(EDGetToken token, Handle<PROD>& result) const;
 
-    template<typename PROD>
-    Handle<PROD>
-    getHandle(EDGetTokenT<PROD> token) const;
+    template <typename PROD>
+    bool getByToken(EDGetTokenT<PROD> token, Handle<PROD>& result) const;
 
-    template<typename PROD>
-    PROD const&
-    get(EDGetTokenT<PROD> token) const noexcept(false);
+    template <typename PROD>
+    Handle<PROD> getHandle(EDGetTokenT<PROD> token) const;
 
+    template <typename PROD>
+    PROD const& get(EDGetTokenT<PROD> token) const noexcept(false);
 
     template <typename PROD>
-    void
-    getManyByType(std::vector<Handle<PROD> >& results) const;
+    void getManyByType(std::vector<Handle<PROD>>& results) const;
 
-    Run const&
-    getRun() const {
-      return *run_;
-    }
+    Run const& getRun() const { return *run_; }
 
     ///Put a new product.
     template <typename PROD>
-    void
-    put(std::unique_ptr<PROD> product) {put<PROD>(std::move(product), std::string());}
+    void put(std::unique_ptr<PROD> product) {
+      put<PROD>(std::move(product), std::string());
+    }
 
     ///Put a new product with a 'product instance name'
     template <typename PROD>
-    void
-    put(std::unique_ptr<PROD> product, std::string const& productInstanceName);
+    void put(std::unique_ptr<PROD> product, std::string const& productInstanceName);
+
+    template <typename PROD>
+    void put(EDPutToken token, std::unique_ptr<PROD> product);
 
-    template<typename PROD>
-    void
-    put(EDPutToken token, std::unique_ptr<PROD> product);
-    
-    template<typename PROD>
-    void
-    put(EDPutTokenT<PROD> token, std::unique_ptr<PROD> product);
+    template <typename PROD>
+    void put(EDPutTokenT<PROD> token, std::unique_ptr<PROD> product);
 
     ///puts a new product
-    template<typename PROD, typename... Args>
-    void
-    emplace(EDPutTokenT<PROD> token, Args&&... args);
-    
-    template<typename PROD, typename... Args>
-    void
-    emplace(EDPutToken token, Args&&... args);
+    template <typename PROD, typename... Args>
+    void emplace(EDPutTokenT<PROD> token, Args&&... args);
+
+    template <typename PROD, typename... Args>
+    void emplace(EDPutToken token, Args&&... args);
 
-    Provenance
-    getProvenance(BranchID const& theID) const;
+    Provenance getProvenance(BranchID const& theID) const;
 
-    void
-    getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const;
+    void getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const;
 
     ProcessHistoryID const& processHistoryID() const;
 
-    ProcessHistory const&
-    processHistory() const;
+    ProcessHistory const& processHistory() const;
 
     ModuleCallingContext const* moduleCallingContext() const { return moduleCallingContext_; }
 
-    void labelsForToken(EDGetToken const& iToken, ProductLabels& oLabels) const { provRecorder_.labelsForToken(iToken, oLabels); }
+    void labelsForToken(EDGetToken const& iToken, ProductLabels& oLabels) const {
+      provRecorder_.labelsForToken(iToken, oLabels);
+    }
 
   private:
-    LuminosityBlockPrincipal const&
-    luminosityBlockPrincipal() const;
+    LuminosityBlockPrincipal const& luminosityBlockPrincipal() const;
 
     // Override version from LuminosityBlockBase class
-    BasicHandle getByLabelImpl(std::type_info const& iWrapperType, std::type_info const& iProductType, InputTag const& iTag) const override;
+    BasicHandle getByLabelImpl(std::type_info const& iWrapperType,
+                               std::type_info const& iProductType,
+                               InputTag const& iTag) const override;
 
-    template<typename PROD>
-    void
-    putImpl(EDPutToken::value_type token, std::unique_ptr<PROD> product);
+    template <typename PROD>
+    void putImpl(EDPutToken::value_type token, std::unique_ptr<PROD> product);
 
-    template<typename PROD, typename... Args>
-    void
-    emplaceImpl(EDPutToken::value_type token, Args&&... args);
+    template <typename PROD, typename... Args>
+    void emplaceImpl(EDPutToken::value_type token, Args&&... args);
 
     typedef std::vector<edm::propagate_const<std::unique_ptr<WrapperBase>>> ProductPtrVec;
-    ProductPtrVec& putProducts() {return putProducts_;}
-    ProductPtrVec const& putProducts() const {return putProducts_;}
+    ProductPtrVec& putProducts() { return putProducts_; }
+    ProductPtrVec const& putProducts() const { return putProducts_; }
 
     // commit_() is called to complete the transaction represented by
     // this PrincipalGetAdapter. The friendships required seems gross, but any
@@ -182,8 +163,8 @@ namespace edm {
     // public interface is asking for trouble
     friend class RawInputSource;
     friend class ProducerBase;
-    template<typename T> friend class stream::ProducingModuleAdaptorBase;
-
+    template <typename T>
+    friend class stream::ProducingModuleAdaptorBase;
 
     void commit_(std::vector<edm::ProductResolverIndex> const& iShouldPut);
 
@@ -197,120 +178,109 @@ namespace edm {
   };
 
   template <typename PROD>
-  void
-  LuminosityBlock::putImpl(EDPutToken::value_type index,std::unique_ptr<PROD> product) {
+  void LuminosityBlock::putImpl(EDPutToken::value_type index, std::unique_ptr<PROD> product) {
     // The following will call post_insert if T has such a function,
     // and do nothing if T has no such function.
-    std::conditional_t<detail::has_postinsert<PROD>::value,
-    DoPostInsert<PROD>,
-    DoNotPostInsert<PROD>> maybe_inserter;
+    std::conditional_t<detail::has_postinsert<PROD>::value, DoPostInsert<PROD>, DoNotPostInsert<PROD>> maybe_inserter;
     maybe_inserter(product.get());
-    
+
     assert(index < putProducts().size());
-    
-    std::unique_ptr<Wrapper<PROD> > wp(new Wrapper<PROD>(std::move(product)));
-    putProducts()[index]=std::move(wp);
+
+    std::unique_ptr<Wrapper<PROD>> wp(new Wrapper<PROD>(std::move(product)));
+    putProducts()[index] = std::move(wp);
   }
 
   template <typename PROD>
-  void
-  LuminosityBlock::put(std::unique_ptr<PROD> product, std::string const& productInstanceName) {
-    if(UNLIKELY(product.get() == nullptr)) {                // null pointer is illegal
+  void LuminosityBlock::put(std::unique_ptr<PROD> product, std::string const& productInstanceName) {
+    if (UNLIKELY(product.get() == nullptr)) {  // null pointer is illegal
       TypeID typeID(typeid(PROD));
       principal_get_adapter_detail::throwOnPutOfNullProduct("LuminosityBlock", typeID, productInstanceName);
     }
-    auto index =
-    provRecorder_.getPutTokenIndex(TypeID(*product), productInstanceName);
+    auto index = provRecorder_.getPutTokenIndex(TypeID(*product), productInstanceName);
     putImpl(index, std::move(product));
   }
 
-  template<typename PROD>
-  void
-  LuminosityBlock::put(EDPutTokenT<PROD> token, std::unique_ptr<PROD> product) {
-    if(UNLIKELY(product.get() == 0)) {                // null pointer is illegal
+  template <typename PROD>
+  void LuminosityBlock::put(EDPutTokenT<PROD> token, std::unique_ptr<PROD> product) {
+    if (UNLIKELY(product.get() == 0)) {  // null pointer is illegal
       TypeID typeID(typeid(PROD));
-      principal_get_adapter_detail::throwOnPutOfNullProduct("LuminosityBlock", typeID, provRecorder_.productInstanceLabel(token));
+      principal_get_adapter_detail::throwOnPutOfNullProduct(
+          "LuminosityBlock", typeID, provRecorder_.productInstanceLabel(token));
     }
-    if(UNLIKELY(token.isUninitialized())) {
+    if (UNLIKELY(token.isUninitialized())) {
       principal_get_adapter_detail::throwOnPutOfUninitializedToken("LuminosityBlock", typeid(PROD));
     }
-    putImpl(token.index(),std::move(product));
+    putImpl(token.index(), std::move(product));
   }
-  
-  template<typename PROD>
-  void
-  LuminosityBlock::put(EDPutToken token, std::unique_ptr<PROD> product) {
-    if(UNLIKELY(product.get() == 0)) {                // null pointer is illegal
+
+  template <typename PROD>
+  void LuminosityBlock::put(EDPutToken token, std::unique_ptr<PROD> product) {
+    if (UNLIKELY(product.get() == 0)) {  // null pointer is illegal
       TypeID typeID(typeid(PROD));
-      principal_get_adapter_detail::throwOnPutOfNullProduct("LuminosityBlock", typeID, provRecorder_.productInstanceLabel(token));
+      principal_get_adapter_detail::throwOnPutOfNullProduct(
+          "LuminosityBlock", typeID, provRecorder_.productInstanceLabel(token));
     }
-    if(UNLIKELY(token.isUninitialized())) {
+    if (UNLIKELY(token.isUninitialized())) {
       principal_get_adapter_detail::throwOnPutOfUninitializedToken("LuminosityBlock", typeid(PROD));
     }
-    if(UNLIKELY(provRecorder_.getTypeIDForPutTokenIndex(token.index()) != TypeID{typeid(PROD)})) {
-      principal_get_adapter_detail::throwOnPutOfWrongType(typeid(PROD), provRecorder_.getTypeIDForPutTokenIndex(token.index()));
+    if (UNLIKELY(provRecorder_.getTypeIDForPutTokenIndex(token.index()) != TypeID{typeid(PROD)})) {
+      principal_get_adapter_detail::throwOnPutOfWrongType(typeid(PROD),
+                                                          provRecorder_.getTypeIDForPutTokenIndex(token.index()));
     }
-    
-    putImpl(token.index(),std::move(product));
+
+    putImpl(token.index(), std::move(product));
   }
 
-  template<typename PROD, typename... Args>
-  void
-  LuminosityBlock::emplace(EDPutTokenT<PROD> token, Args&&... args) {
-    if(UNLIKELY(token.isUninitialized())) {
+  template <typename PROD, typename... Args>
+  void LuminosityBlock::emplace(EDPutTokenT<PROD> token, Args&&... args) {
+    if (UNLIKELY(token.isUninitialized())) {
       principal_get_adapter_detail::throwOnPutOfUninitializedToken("LuminosityBlock", typeid(PROD));
     }
-    emplaceImpl<PROD>(token.index(),std::forward<Args>(args)...);
+    emplaceImpl<PROD>(token.index(), std::forward<Args>(args)...);
   }
-  
-  template<typename PROD, typename... Args>
-  void
-  LuminosityBlock::emplace(EDPutToken token, Args&&... args) {
-    if(UNLIKELY(token.isUninitialized())) {
+
+  template <typename PROD, typename... Args>
+  void LuminosityBlock::emplace(EDPutToken token, Args&&... args) {
+    if (UNLIKELY(token.isUninitialized())) {
       principal_get_adapter_detail::throwOnPutOfUninitializedToken("LuminosityBlock", typeid(PROD));
     }
-    if(UNLIKELY(provRecorder_.getTypeIDForPutTokenIndex(token.index()) != TypeID{typeid(PROD)})) {
-      principal_get_adapter_detail::throwOnPutOfWrongType(typeid(PROD), provRecorder_.getTypeIDForPutTokenIndex(token.index()));
+    if (UNLIKELY(provRecorder_.getTypeIDForPutTokenIndex(token.index()) != TypeID{typeid(PROD)})) {
+      principal_get_adapter_detail::throwOnPutOfWrongType(typeid(PROD),
+                                                          provRecorder_.getTypeIDForPutTokenIndex(token.index()));
     }
-    
-    emplaceImpl(token.index(),std::forward<Args>(args)...);
+
+    emplaceImpl(token.index(), std::forward<Args>(args)...);
   }
-  
-  template<typename PROD, typename... Args>
-  void
-  LuminosityBlock::emplaceImpl(EDPutToken::value_type index, Args&&... args) {
-    
+
+  template <typename PROD, typename... Args>
+  void LuminosityBlock::emplaceImpl(EDPutToken::value_type index, Args&&... args) {
     assert(index < putProducts().size());
-    
-    std::unique_ptr<Wrapper<PROD> > wp(new Wrapper<PROD>(WrapperBase::Emplace{},
-                                                         std::forward<Args>(args)...));
-    
+
+    std::unique_ptr<Wrapper<PROD>> wp(new Wrapper<PROD>(WrapperBase::Emplace{}, std::forward<Args>(args)...));
+
     // The following will call post_insert if T has such a function,
     // and do nothing if T has no such function.
-    std::conditional_t<detail::has_postinsert<PROD>::value,
-    DoPostInsert<PROD>,
-    DoNotPostInsert<PROD>> maybe_inserter;
+    std::conditional_t<detail::has_postinsert<PROD>::value, DoPostInsert<PROD>, DoNotPostInsert<PROD>> maybe_inserter;
     maybe_inserter(&(wp->bareProduct()));
-    
-    putProducts()[index]=std::move(wp);
+
+    putProducts()[index] = std::move(wp);
   }
 
-  template<typename PROD>
-  bool
-  LuminosityBlock::getByLabel(std::string const& label, Handle<PROD>& result) const {
+  template <typename PROD>
+  bool LuminosityBlock::getByLabel(std::string const& label, Handle<PROD>& result) const {
     return getByLabel(label, emptyString_, result);
   }
 
-  template<typename PROD>
-  bool
-  LuminosityBlock::getByLabel(std::string const& label,
-                  std::string const& productInstanceName,
-                  Handle<PROD>& result) const {
-    if(!provRecorder_.checkIfComplete<PROD>()) {
+  template <typename PROD>
+  bool LuminosityBlock::getByLabel(std::string const& label,
+                                   std::string const& productInstanceName,
+                                   Handle<PROD>& result) const {
+    if (!provRecorder_.checkIfComplete<PROD>()) {
       principal_get_adapter_detail::throwOnPrematureRead("Lumi", TypeID(typeid(PROD)), label, productInstanceName);
     }
     result.clear();
-    BasicHandle bh = provRecorder_.getByLabel_(TypeID(typeid(PROD)), label, productInstanceName, emptyString_, moduleCallingContext_);
+    BasicHandle bh = provRecorder_.getByLabel_(
+        TypeID(typeid(PROD)), label, productInstanceName, emptyString_, moduleCallingContext_);
     result = convert_handle<PROD>(std::move(bh));  // throws on conversion error
     if (result.failedToGet()) {
       return false;
@@ -319,10 +289,9 @@ namespace edm {
   }
 
   /// same as above, but using the InputTag class
-  template<typename PROD>
-  bool
-  LuminosityBlock::getByLabel(InputTag const& tag, Handle<PROD>& result) const {
-    if(!provRecorder_.checkIfComplete<PROD>()) {
+  template <typename PROD>
+  bool LuminosityBlock::getByLabel(InputTag const& tag, Handle<PROD>& result) const {
+    if (!provRecorder_.checkIfComplete<PROD>()) {
       principal_get_adapter_detail::throwOnPrematureRead("Lumi", TypeID(typeid(PROD)), tag.label(), tag.instance());
     }
     result.clear();
@@ -334,14 +303,13 @@ namespace edm {
     return true;
   }
 
-  template<typename PROD>
-  bool
-  LuminosityBlock::getByToken(EDGetToken token, Handle<PROD>& result) const {
-    if(!provRecorder_.checkIfComplete<PROD>()) {
+  template <typename PROD>
+  bool LuminosityBlock::getByToken(EDGetToken token, Handle<PROD>& result) const {
+    if (!provRecorder_.checkIfComplete<PROD>()) {
       principal_get_adapter_detail::throwOnPrematureRead("Lumi", TypeID(typeid(PROD)), token);
     }
     result.clear();
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)),PRODUCT_TYPE, token, moduleCallingContext_);
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)), PRODUCT_TYPE, token, moduleCallingContext_);
     result = convert_handle<PROD>(std::move(bh));  // throws on conversion error
     if (result.failedToGet()) {
       return false;
@@ -349,14 +317,13 @@ namespace edm {
     return true;
   }
 
-  template<typename PROD>
-  bool
-  LuminosityBlock::getByToken(EDGetTokenT<PROD> token, Handle<PROD>& result) const {
-    if(!provRecorder_.checkIfComplete<PROD>()) {
+  template <typename PROD>
+  bool LuminosityBlock::getByToken(EDGetTokenT<PROD> token, Handle<PROD>& result) const {
+    if (!provRecorder_.checkIfComplete<PROD>()) {
       principal_get_adapter_detail::throwOnPrematureRead("Lumi", TypeID(typeid(PROD)), token);
     }
     result.clear();
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)),PRODUCT_TYPE, token, moduleCallingContext_);
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)), PRODUCT_TYPE, token, moduleCallingContext_);
     result = convert_handle<PROD>(std::move(bh));  // throws on conversion error
     if (result.failedToGet()) {
       return false;
@@ -364,30 +331,29 @@ namespace edm {
     return true;
   }
 
-  template<typename PROD>
-  Handle<PROD>
-  LuminosityBlock::getHandle(EDGetTokenT<PROD> token) const {
-    if UNLIKELY(!provRecorder_.checkIfComplete<PROD>()) {
-      principal_get_adapter_detail::throwOnPrematureRead("Lumi", TypeID(typeid(PROD)), token);
-    }
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)),PRODUCT_TYPE, token, moduleCallingContext_);
+  template <typename PROD>
+  Handle<PROD> LuminosityBlock::getHandle(EDGetTokenT<PROD> token) const {
+    if
+      UNLIKELY(!provRecorder_.checkIfComplete<PROD>()) {
+        principal_get_adapter_detail::throwOnPrematureRead("Lumi", TypeID(typeid(PROD)), token);
+      }
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)), PRODUCT_TYPE, token, moduleCallingContext_);
     return convert_handle<PROD>(std::move(bh));
   }
 
-  template<typename PROD>
-  PROD const&
-  LuminosityBlock::get(EDGetTokenT<PROD> token) const noexcept(false) {
-    if UNLIKELY(!provRecorder_.checkIfComplete<PROD>()) {
-      principal_get_adapter_detail::throwOnPrematureRead("Lumi", TypeID(typeid(PROD)), token);
-    }
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)),PRODUCT_TYPE, token, moduleCallingContext_);
+  template <typename PROD>
+  PROD const& LuminosityBlock::get(EDGetTokenT<PROD> token) const noexcept(false) {
+    if
+      UNLIKELY(!provRecorder_.checkIfComplete<PROD>()) {
+        principal_get_adapter_detail::throwOnPrematureRead("Lumi", TypeID(typeid(PROD)), token);
+      }
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)), PRODUCT_TYPE, token, moduleCallingContext_);
     return *convert_handle<PROD>(std::move(bh));
   }
 
-  template<typename PROD>
-  void
-  LuminosityBlock::getManyByType(std::vector<Handle<PROD> >& results) const {
-    if(!provRecorder_.checkIfComplete<PROD>()) {
+  template <typename PROD>
+  void LuminosityBlock::getManyByType(std::vector<Handle<PROD>>& results) const {
+    if (!provRecorder_.checkIfComplete<PROD>()) {
       principal_get_adapter_detail::throwOnPrematureRead("Lumi", TypeID(typeid(PROD)));
     }
     return provRecorder_.getManyByType(results, moduleCallingContext_);
@@ -401,7 +367,7 @@ namespace edm {
     Handle<T> handle;
     event.getByLabel(tag, handle);
     // throw if the handle is not valid
-    return * handle.product();
+    return *handle.product();
   }
 
   template <typename T>
@@ -409,7 +375,7 @@ namespace edm {
     Handle<T> handle;
     event.getByToken(token, handle);
     // throw if the handle is not valid
-    return * handle.product();
+    return *handle.product();
   }
 
   template <typename T>
@@ -417,9 +383,9 @@ namespace edm {
     Handle<T> handle;
     event.getByToken(token, handle);
     // throw if the handle is not valid
-    return * handle.product();
+    return *handle.product();
   }
 
-}
+}  // namespace edm
 
-#endif // FWCore_Framework_LuminosityBlock_h
+#endif  // FWCore_Framework_LuminosityBlock_h
diff --git a/FWCore/Framework/interface/LuminosityBlockForOutput.h b/FWCore/Framework/interface/LuminosityBlockForOutput.h
index 1679ef6890b01..0cf7170548b94 100644
--- a/FWCore/Framework/interface/LuminosityBlockForOutput.h
+++ b/FWCore/Framework/interface/LuminosityBlockForOutput.h
@@ -36,38 +36,36 @@ namespace edmtest {
 
 namespace edm {
   class ModuleCallingContext;
-  
+
   class LuminosityBlockForOutput : public OccurrenceForOutput {
   public:
-    LuminosityBlockForOutput(LuminosityBlockPrincipal const& lbp, ModuleDescription const& md,
-                    ModuleCallingContext const*, bool isAtEnd);
+    LuminosityBlockForOutput(LuminosityBlockPrincipal const& lbp,
+                             ModuleDescription const& md,
+                             ModuleCallingContext const*,
+                             bool isAtEnd);
     ~LuminosityBlockForOutput() override;
 
-    LuminosityBlockAuxiliary const& luminosityBlockAuxiliary() const {return aux_;}
-    LuminosityBlockID const& id() const {return aux_.id();}
-    LuminosityBlockNumber_t luminosityBlock() const {return aux_.luminosityBlock();}
-    RunNumber_t run() const {return aux_.run();}
-    Timestamp const& beginTime() const {return aux_.beginTime();}
-    Timestamp const& endTime() const {return aux_.endTime();}
+    LuminosityBlockAuxiliary const& luminosityBlockAuxiliary() const { return aux_; }
+    LuminosityBlockID const& id() const { return aux_.id(); }
+    LuminosityBlockNumber_t luminosityBlock() const { return aux_.luminosityBlock(); }
+    RunNumber_t run() const { return aux_.run(); }
+    Timestamp const& beginTime() const { return aux_.beginTime(); }
+    Timestamp const& endTime() const { return aux_.endTime(); }
 
     /**\return Reusable index which can be used to separate data for different simultaneous LuminosityBlocks.
      */
     LuminosityBlockIndex index() const;
 
-    RunForOutput const&
-    getRun() const {
-      return *run_;
-    }
+    RunForOutput const& getRun() const { return *run_; }
 
   private:
-    friend class edmtest::TestOutputModule; // For testing
+    friend class edmtest::TestOutputModule;  // For testing
 
-    LuminosityBlockPrincipal const&
-    luminosityBlockPrincipal() const;
+    LuminosityBlockPrincipal const& luminosityBlockPrincipal() const;
 
     LuminosityBlockAuxiliary const& aux_;
     std::shared_ptr<RunForOutput const> const run_;
   };
 
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/LuminosityBlockPrincipal.h b/FWCore/Framework/interface/LuminosityBlockPrincipal.h
index 9764be35319d7..43f4d4aee7df8 100644
--- a/FWCore/Framework/interface/LuminosityBlockPrincipal.h
+++ b/FWCore/Framework/interface/LuminosityBlockPrincipal.h
@@ -12,7 +12,6 @@ is the DataBlock.
 
 ----------------------------------------------------------------------*/
 
-
 #include "DataFormats/Provenance/interface/LuminosityBlockAuxiliary.h"
 #include "DataFormats/Provenance/interface/RunID.h"
 #include "FWCore/Utilities/interface/LuminosityBlockIndex.h"
@@ -34,75 +33,47 @@ namespace edm {
   public:
     typedef LuminosityBlockAuxiliary Auxiliary;
     typedef Principal Base;
-    LuminosityBlockPrincipal(
-        std::shared_ptr<ProductRegistry const> reg,
-        ProcessConfiguration const& pc,
-        HistoryAppender* historyAppender,
-        unsigned int index,
-        bool isForPrimaryProcess=true);
+    LuminosityBlockPrincipal(std::shared_ptr<ProductRegistry const> reg,
+                             ProcessConfiguration const& pc,
+                             HistoryAppender* historyAppender,
+                             unsigned int index,
+                             bool isForPrimaryProcess = true);
 
     ~LuminosityBlockPrincipal() override {}
 
-    void fillLuminosityBlockPrincipal(ProcessHistoryRegistry const& processHistoryRegistry, DelayedReader* reader = nullptr);
+    void fillLuminosityBlockPrincipal(ProcessHistoryRegistry const& processHistoryRegistry,
+                                      DelayedReader* reader = nullptr);
 
-    RunPrincipal const& runPrincipal() const {
-      return *runPrincipal_;
-    }
+    RunPrincipal const& runPrincipal() const { return *runPrincipal_; }
 
-    RunPrincipal& runPrincipal() {
-      return *runPrincipal_;
-    }
+    RunPrincipal& runPrincipal() { return *runPrincipal_; }
 
-    void setRunPrincipal(std::shared_ptr<RunPrincipal> rp) {
-      runPrincipal_ = rp;
-    }
+    void setRunPrincipal(std::shared_ptr<RunPrincipal> rp) { runPrincipal_ = rp; }
 
-    LuminosityBlockIndex index() const {
-      return index_;
-    }
-    
-    LuminosityBlockID id() const {
-      return aux().id();
-    }
+    LuminosityBlockIndex index() const { return index_; }
 
-    Timestamp const& beginTime() const {
-      return aux().beginTime();
-    }
+    LuminosityBlockID id() const { return aux().id(); }
 
-    Timestamp const& endTime() const {
-      return aux().endTime();
-    }
+    Timestamp const& beginTime() const { return aux().beginTime(); }
 
-    void setEndTime(Timestamp const& time) {
-      aux_.setEndTime(time);
-    }
+    Timestamp const& endTime() const { return aux().endTime(); }
 
-    LuminosityBlockNumber_t luminosityBlock() const {
-      return aux().luminosityBlock();
-    }
+    void setEndTime(Timestamp const& time) { aux_.setEndTime(time); }
 
-    void setAux( LuminosityBlockAuxiliary iAux) { aux_ = std::move(iAux);}
-    LuminosityBlockAuxiliary const& aux() const {
-      return aux_;
-    }
+    LuminosityBlockNumber_t luminosityBlock() const { return aux().luminosityBlock(); }
 
-    RunNumber_t run() const {
-      return aux().run();
-    }
+    void setAux(LuminosityBlockAuxiliary iAux) { aux_ = std::move(iAux); }
+    LuminosityBlockAuxiliary const& aux() const { return aux_; }
 
-    void mergeAuxiliary(LuminosityBlockAuxiliary const& aux) {
-      return aux_.mergeAuxiliary(aux);
-    }
+    RunNumber_t run() const { return aux().run(); }
 
-    void put(
-        BranchDescription const& bd,
-        std::unique_ptr<WrapperBase> edp) const;
+    void mergeAuxiliary(LuminosityBlockAuxiliary const& aux) { return aux_.mergeAuxiliary(aux); }
 
-    void put(ProductResolverIndex index,
-             std::unique_ptr<WrapperBase> edp) const;
+    void put(BranchDescription const& bd, std::unique_ptr<WrapperBase> edp) const;
 
-  private:
+    void put(ProductResolverIndex index, std::unique_ptr<WrapperBase> edp) const;
 
+  private:
     unsigned int transitionIndex_() const override;
 
     edm::propagate_const<std::shared_ptr<RunPrincipal>> runPrincipal_;
@@ -111,6 +82,5 @@ namespace edm {
 
     LuminosityBlockIndex index_;
   };
-}
+}  // namespace edm
 #endif
-
diff --git a/FWCore/Framework/interface/MakeDataException.h b/FWCore/Framework/interface/MakeDataException.h
index a070676503f4b..44850d23c71eb 100644
--- a/FWCore/Framework/interface/MakeDataException.h
+++ b/FWCore/Framework/interface/MakeDataException.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     MakeDataException
-// 
+//
 /**\class MakeDataException MakeDataException.h FWCore/Framework/interface/MakeDataException.h
 
 Description: An exception that is thrown whenever a Proxy had a problem with
@@ -40,32 +40,29 @@ if(outOfBoundsValue) {
 
 // forward declarations
 namespace edm {
-   namespace eventsetup {
+  namespace eventsetup {
 
-class MakeDataException : public cms::Exception
-{
-   public:
-      MakeDataException(const EventSetupRecordKey&, const DataKey&);  
+    class MakeDataException : public cms::Exception {
+    public:
+      MakeDataException(const EventSetupRecordKey&, const DataKey&);
       ~MakeDataException() noexcept override {}
 
       // ---------- const member functions ---------------------
-      const char* myMessage() const noexcept {
-         return message_.c_str();
-      }
-   
+      const char* myMessage() const noexcept { return message_.c_str(); }
+
       // ---------- static member functions --------------------
-      static std::string standardMessage(const EventSetupRecordKey&, const DataKey&); 
-   // ---------- member functions ---------------------------
+      static std::string standardMessage(const EventSetupRecordKey&, const DataKey&);
+      // ---------- member functions ---------------------------
 
-   private:
+    private:
       //MakeDataException(const MakeDataException&); // stop default
 
       //const MakeDataException& operator=(const MakeDataException&); // stop default
 
       // ---------- member data --------------------------------
       std::string message_;
-};
+    };
 
-   }
-}
+  }  // namespace eventsetup
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/MakerMacros.h b/FWCore/Framework/interface/MakerMacros.h
index 6806d05726636..b2edd882fdf3b 100644
--- a/FWCore/Framework/interface/MakerMacros.h
+++ b/FWCore/Framework/interface/MakerMacros.h
@@ -13,7 +13,7 @@
 // implementation file only.
 #include "FWCore/Framework/src/WorkerT.h"
 
-
-#define DEFINE_FWK_MODULE(type) \
-  DEFINE_EDM_PLUGIN (edm::MakerPluginFactory,edm::WorkerMaker<type>,#type); DEFINE_FWK_PSET_DESC_FILLER(type)
+#define DEFINE_FWK_MODULE(type)                                              \
+  DEFINE_EDM_PLUGIN(edm::MakerPluginFactory, edm::WorkerMaker<type>, #type); \
+  DEFINE_FWK_PSET_DESC_FILLER(type)
 #endif
diff --git a/FWCore/Framework/interface/MergeableRunProductMetadata.h b/FWCore/Framework/interface/MergeableRunProductMetadata.h
index 2b60131697180..d50a62553c959 100644
--- a/FWCore/Framework/interface/MergeableRunProductMetadata.h
+++ b/FWCore/Framework/interface/MergeableRunProductMetadata.h
@@ -51,7 +51,6 @@ namespace edm {
 
   class MergeableRunProductMetadata : public MergeableRunProductMetadataBase {
   public:
-
     enum MergeDecision { MERGE, REPLACE, IGNORE };
 
     MergeableRunProductMetadata(MergeableRunProductProcesses const&);
@@ -65,10 +64,9 @@ namespace edm {
     // should be called before the run products themselves are read
     // because it sets the decision whether to merge, replace, or ignore
     // run products as they read.
-    void readRun(
-      long long inputRunEntry,
-      StoredMergeableRunProductMetadata const& inputStoredMergeableRunProductMetadata,
-      IndexIntoFileItrHolder const& inputIndexIntoFileItr);
+    void readRun(long long inputRunEntry,
+                 StoredMergeableRunProductMetadata const& inputStoredMergeableRunProductMetadata,
+                 IndexIntoFileItrHolder const& inputIndexIntoFileItr);
 
     // Called to record which lumis were processed by the current run
     void writeLumi(LuminosityBlockNumber_t lumi);
@@ -92,7 +90,6 @@ namespace edm {
 
     class MetadataForProcess {
     public:
-
       MetadataForProcess() = default;
 
       std::vector<LuminosityBlockNumber_t>& lumis() { return lumis_; }
@@ -113,7 +110,6 @@ namespace edm {
       void reset();
 
     private:
-
       std::vector<LuminosityBlockNumber_t> lumis_;
       MergeDecision mergeDecision_ = MERGE;
       bool valid_ = true;
@@ -124,19 +120,15 @@ namespace edm {
     MetadataForProcess const* metadataForOneProcess(std::string const& processName) const;
 
     // The next few functions are only intended to be used in tests.
-    std::vector<MetadataForProcess> const&
-    metadataForProcesses() const { return metadataForProcesses_; }
+    std::vector<MetadataForProcess> const& metadataForProcesses() const { return metadataForProcesses_; }
 
-    std::vector<LuminosityBlockNumber_t> const &
-    lumisFromIndexIntoFile() const { return lumisFromIndexIntoFile_; }
+    std::vector<LuminosityBlockNumber_t> const& lumisFromIndexIntoFile() const { return lumisFromIndexIntoFile_; }
 
     bool gotLumisFromIndexIntoFile() const { return gotLumisFromIndexIntoFile_; }
 
-    tbb::concurrent_vector<LuminosityBlockNumber_t> const&
-    lumisProcessed() const { return lumisProcessed_; }
+    tbb::concurrent_vector<LuminosityBlockNumber_t> const& lumisProcessed() const { return lumisProcessed_; }
 
   private:
-
     void mergeLumisFromIndexIntoFile();
 
     bool addProcess(StoredMergeableRunProductMetadata& storedMetadata,
@@ -158,5 +150,5 @@ namespace edm {
 
     tbb::concurrent_vector<LuminosityBlockNumber_t> lumisProcessed_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/MergeableRunProductProcesses.h b/FWCore/Framework/interface/MergeableRunProductProcesses.h
index d9b08025806de..e57b01f699474 100644
--- a/FWCore/Framework/interface/MergeableRunProductProcesses.h
+++ b/FWCore/Framework/interface/MergeableRunProductProcesses.h
@@ -10,31 +10,25 @@ namespace edm {
 
   class MergeableRunProductProcesses {
   public:
-
     MergeableRunProductProcesses();
 
     std::vector<std::string> const& processesWithMergeableRunProducts() const {
       return processesWithMergeableRunProducts_;
     }
 
-    std::string const& getProcessName(unsigned int index) const {
-      return processesWithMergeableRunProducts_[index];
-    }
+    std::string const& getProcessName(unsigned int index) const { return processesWithMergeableRunProducts_[index]; }
 
-    std::vector<std::string>::size_type size() const {
-      return processesWithMergeableRunProducts_.size();
-    }
+    std::vector<std::string>::size_type size() const { return processesWithMergeableRunProducts_.size(); }
 
     // Called once in a job right after the ProductRegistry is frozen.
     // After that the names stored in this class are never modified.
     void setProcessesWithMergeableRunProducts(ProductRegistry const& productRegistry);
 
   private:
-
     // Holds the process names for processes that created mergeable
     // run products that are in the input of the current job.
     // Note this does not include the current process.
     std::vector<std::string> processesWithMergeableRunProducts_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ModuleChanger.h b/FWCore/Framework/interface/ModuleChanger.h
index 3d663043cdb54..f4b3368ba95ee 100644
--- a/FWCore/Framework/interface/ModuleChanger.h
+++ b/FWCore/Framework/interface/ModuleChanger.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     ModuleChanger
-// 
+//
 /**\class ModuleChanger ModuleChanger.h FWCore/Framework/interface/ModuleChanger.h
 
  Description: Handles modifying a module after the job has started
@@ -24,36 +24,36 @@
 
 // user include files
 #include "FWCore/Utilities/interface/propagate_const.h"
+#include "FWCore/Framework/interface/ESRecordsToProxyIndices.h"
 
 // forward declarations
 
 namespace edm {
-   class ParameterSet;
-   class Schedule;
-   class ProductRegistry;
-
-   class ModuleChanger {
+  class ParameterSet;
+  class Schedule;
+  class ProductRegistry;
 
-   public:
-      ModuleChanger(Schedule*, ProductRegistry const* iReg);
-      virtual ~ModuleChanger();
+  class ModuleChanger {
+  public:
+    ModuleChanger(Schedule*, ProductRegistry const* iReg, eventsetup::ESRecordsToProxyIndices);
+    virtual ~ModuleChanger();
 
-      // ---------- const member functions ---------------------
+    // ---------- const member functions ---------------------
 
-      // ---------- static member functions --------------------
+    // ---------- static member functions --------------------
 
-      // ---------- member functions ---------------------------
-      bool changeModule(const std::string& iLabel,
-                        const ParameterSet& iPSet);
+    // ---------- member functions ---------------------------
+    bool changeModule(const std::string& iLabel, const ParameterSet& iPSet);
 
-   private:
-      ModuleChanger(const ModuleChanger&) = delete; // stop default
+  private:
+    ModuleChanger(const ModuleChanger&) = delete;  // stop default
 
-      const ModuleChanger& operator=(const ModuleChanger&) = delete; // stop default
+    const ModuleChanger& operator=(const ModuleChanger&) = delete;  // stop default
 
-      // ---------- member data --------------------------------
-      edm::propagate_const<Schedule*> schedule_;
-      ProductRegistry const* registry_;
-   };
-}
+    // ---------- member data --------------------------------
+    edm::propagate_const<Schedule*> schedule_;
+    ProductRegistry const* registry_;
+    eventsetup::ESRecordsToProxyIndices indices_;
+  };
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ModuleContextSentry.h b/FWCore/Framework/interface/ModuleContextSentry.h
index e32269142c0f0..f5aafc4a4d53c 100644
--- a/FWCore/Framework/interface/ModuleContextSentry.h
+++ b/FWCore/Framework/interface/ModuleContextSentry.h
@@ -10,19 +10,19 @@ namespace edm {
 
   class ModuleContextSentry {
   public:
-    ModuleContextSentry(ModuleCallingContext* moduleCallingContext,
-                        ParentContext const& parentContext) :
-      moduleCallingContext_(moduleCallingContext) {
-      moduleCallingContext_->setContext(ModuleCallingContext::State::kRunning, parentContext,
-                                        CurrentModuleOnThread::getCurrentModuleOnThread());
+    ModuleContextSentry(ModuleCallingContext* moduleCallingContext, ParentContext const& parentContext)
+        : moduleCallingContext_(moduleCallingContext) {
+      moduleCallingContext_->setContext(
+          ModuleCallingContext::State::kRunning, parentContext, CurrentModuleOnThread::getCurrentModuleOnThread());
       CurrentModuleOnThread::setCurrentModuleOnThread(moduleCallingContext_);
     }
     ~ModuleContextSentry() {
       CurrentModuleOnThread::setCurrentModuleOnThread(moduleCallingContext_->previousModuleOnThread());
       moduleCallingContext_->setContext(ModuleCallingContext::State::kInvalid, ParentContext(), nullptr);
     }
+
   private:
     edm::propagate_const<ModuleCallingContext*> moduleCallingContext_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ModuleFactory.h b/FWCore/Framework/interface/ModuleFactory.h
index 1a4eb7706c0e7..42a6c66661558 100644
--- a/FWCore/Framework/interface/ModuleFactory.h
+++ b/FWCore/Framework/interface/ModuleFactory.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     ModuleFactory
-// 
+//
 /**\class ModuleFactory ModuleFactory.h FWCore/Framework/interface/ModuleFactory.h
 
  Description: Factory which is dynamically loadable and used to create an eventstore module
@@ -28,38 +28,37 @@
 
 // forward declarations
 namespace edm {
-   class ParameterSet;
+  class ParameterSet;
 
-   namespace eventsetup {
-      class DataProxyProvider;
-      class EventSetupsController;
+  namespace eventsetup {
+    class DataProxyProvider;
+    class EventSetupsController;
 
-      struct ModuleMakerTraits {
-         typedef DataProxyProvider base_type;
-        
-         static std::string name();
-         static void addTo(EventSetupProvider& iProvider,
-                           std::shared_ptr<DataProxyProvider> iComponent,
-                           ParameterSet const&,
-                           bool);
-         static void replaceExisting(EventSetupProvider& iProvider, std::shared_ptr<DataProxyProvider> iComponent); 
-         static std::shared_ptr<base_type> getComponentAndRegisterProcess(EventSetupsController& esController,
-                                                                            ParameterSet const& iConfiguration);
-         static void putComponent(EventSetupsController& esController,
-                                  ParameterSet const& iConfiguration,
-                                  std::shared_ptr<base_type> const& component);
-      };
-      template< class TType>
-         struct ModuleMaker : public ComponentMaker<edm::eventsetup::ModuleMakerTraits,TType> {};
-      
-      typedef  ComponentFactory<ModuleMakerTraits> ModuleFactory ;
-      typedef edmplugin::PluginFactory<edm::eventsetup::ComponentMakerBase<ModuleMakerTraits>* ()> ModulePluginFactory;
-   }
-}
+    struct ModuleMakerTraits {
+      typedef DataProxyProvider base_type;
 
-#define DEFINE_FWK_EVENTSETUP_MODULE(type) \
-DEFINE_EDM_PLUGIN (edm::eventsetup::ModulePluginFactory,edm::eventsetup::ModuleMaker<type>,#type); \
-DEFINE_DESC_FILLER_FOR_ESPRODUCERS(type)
+      static std::string name();
+      static void addTo(EventSetupProvider& iProvider,
+                        std::shared_ptr<DataProxyProvider> iComponent,
+                        ParameterSet const&,
+                        bool);
+      static void replaceExisting(EventSetupProvider& iProvider, std::shared_ptr<DataProxyProvider> iComponent);
+      static std::shared_ptr<base_type> getComponentAndRegisterProcess(EventSetupsController& esController,
+                                                                       ParameterSet const& iConfiguration);
+      static void putComponent(EventSetupsController& esController,
+                               ParameterSet const& iConfiguration,
+                               std::shared_ptr<base_type> const& component);
+    };
+    template <class TType>
+    struct ModuleMaker : public ComponentMaker<edm::eventsetup::ModuleMakerTraits, TType> {};
 
-#endif
+    typedef ComponentFactory<ModuleMakerTraits> ModuleFactory;
+    typedef edmplugin::PluginFactory<edm::eventsetup::ComponentMakerBase<ModuleMakerTraits>*()> ModulePluginFactory;
+  }  // namespace eventsetup
+}  // namespace edm
 
+#define DEFINE_FWK_EVENTSETUP_MODULE(type)                                                            \
+  DEFINE_EDM_PLUGIN(edm::eventsetup::ModulePluginFactory, edm::eventsetup::ModuleMaker<type>, #type); \
+  DEFINE_DESC_FILLER_FOR_ESPRODUCERS(type)
+
+#endif
diff --git a/FWCore/Framework/interface/ModuleLabelMatch.h b/FWCore/Framework/interface/ModuleLabelMatch.h
index 67701757b7aa4..eabdca09d6917 100644
--- a/FWCore/Framework/interface/ModuleLabelMatch.h
+++ b/FWCore/Framework/interface/ModuleLabelMatch.h
@@ -16,17 +16,16 @@ See comments in the file GetterOfProducts.h for a description.
 
 namespace edm {
 
-   class ModuleLabelMatch {
-   public:
-
-      ModuleLabelMatch(std::string const& moduleLabel) : moduleLabel_(moduleLabel) { }
-
-      bool operator()(edm::BranchDescription const& branchDescription) {
-         return branchDescription.moduleLabel() == moduleLabel_;
-      }
-
-   private:
-      std::string moduleLabel_;
-   };
-}
+  class ModuleLabelMatch {
+  public:
+    ModuleLabelMatch(std::string const& moduleLabel) : moduleLabel_(moduleLabel) {}
+
+    bool operator()(edm::BranchDescription const& branchDescription) {
+      return branchDescription.moduleLabel() == moduleLabel_;
+    }
+
+  private:
+    std::string moduleLabel_;
+  };
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/NoDataException.h b/FWCore/Framework/interface/NoDataException.h
index 2c64da7062f1e..cfbebc6a25407 100644
--- a/FWCore/Framework/interface/NoDataException.h
+++ b/FWCore/Framework/interface/NoDataException.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Module:      NoDataException
-// 
+//
 /**\class NoDataException NoDataException.h Exception/interface/NoDataException.h
 
  Description: An exception that is thrown whenever data was not available
@@ -73,58 +73,53 @@
 
 // forward declarations
 namespace edm {
-   namespace eventsetup {
-
-class NoDataExceptionBase : public cms::Exception
-{
-public:
-  NoDataExceptionBase(const EventSetupRecordKey& iRecordKey,
-                        const DataKey& iDataKey,
-                        const char* category_name = "NoDataException") ;
-  ~NoDataExceptionBase() noexcept override;
-  const DataKey& dataKey() const;
-protected:
-  static std::string providerButNoDataMessage(const EventSetupRecordKey& iKey);
-  static std::string noProxyMessage();
-  void constructMessage(const char* iClassName, const std::string& iExtraInfo);
-private:
-  void beginDataTypeMessage(std::string&) const;
-  void endDataTypeMessage(std::string&) const;
-  
-  // ---------- Constructors and destructor ----------------
-  //NoDataExceptionBase(const NoDataExceptionBase&) ; //allow default
-  //const NoDataExceptionBase& operator=(const NoDataExceptionBase&); // allow default
-
-  // ---------- data members -------------------------------
-  EventSetupRecordKey record_;
-  DataKey dataKey_;
-};
-
-template <class T>
- class NoDataException : public NoDataExceptionBase 
-{
-public:
-  NoDataException(const EventSetupRecordKey& iRecordKey,
-                  const DataKey& iDataKey,
-                  const char* category_name = "NoDataException") :
-  NoDataExceptionBase(iRecordKey, iDataKey, category_name)
-  {
-    constructMessage(heterocontainer::className<T>(),
-                     providerButNoDataMessage(iRecordKey));
-  }
-
-  NoDataException(const EventSetupRecordKey& iRecordKey,
-                  const DataKey& iDataKey,
-                  const char* category_name ,
-                  const std::string& iExtraInfo ) :
-  NoDataExceptionBase(iRecordKey, iDataKey, category_name)  
-  {
-    constructMessage(heterocontainer::className<T>(),
-                     iExtraInfo);
-  }
-
-};
-
-   }
-}
+  namespace eventsetup {
+
+    class NoDataExceptionBase : public cms::Exception {
+    public:
+      NoDataExceptionBase(const EventSetupRecordKey& iRecordKey,
+                          const DataKey& iDataKey,
+                          const char* category_name = "NoDataException");
+      ~NoDataExceptionBase() noexcept override;
+      const DataKey& dataKey() const;
+
+    protected:
+      static std::string providerButNoDataMessage(const EventSetupRecordKey& iKey);
+      static std::string noProxyMessage();
+      void constructMessage(const char* iClassName, const std::string& iExtraInfo);
+
+    private:
+      void beginDataTypeMessage(std::string&) const;
+      void endDataTypeMessage(std::string&) const;
+
+      // ---------- Constructors and destructor ----------------
+      //NoDataExceptionBase(const NoDataExceptionBase&) ; //allow default
+      //const NoDataExceptionBase& operator=(const NoDataExceptionBase&); // allow default
+
+      // ---------- data members -------------------------------
+      EventSetupRecordKey record_;
+      DataKey dataKey_;
+    };
+
+    template <class T>
+    class NoDataException : public NoDataExceptionBase {
+    public:
+      NoDataException(const EventSetupRecordKey& iRecordKey,
+                      const DataKey& iDataKey,
+                      const char* category_name = "NoDataException")
+          : NoDataExceptionBase(iRecordKey, iDataKey, category_name) {
+        constructMessage(heterocontainer::className<T>(), providerButNoDataMessage(iRecordKey));
+      }
+
+      NoDataException(const EventSetupRecordKey& iRecordKey,
+                      const DataKey& iDataKey,
+                      const char* category_name,
+                      const std::string& iExtraInfo)
+          : NoDataExceptionBase(iRecordKey, iDataKey, category_name) {
+        constructMessage(heterocontainer::className<T>(), iExtraInfo);
+      }
+    };
+
+  }  // namespace eventsetup
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/NoProxyException.h b/FWCore/Framework/interface/NoProxyException.h
index 6b19b925c783b..b7d1f3255933b 100644
--- a/FWCore/Framework/interface/NoProxyException.h
+++ b/FWCore/Framework/interface/NoProxyException.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Module:      NoProxyException
-// 
+//
 /**\class NoProxyException NoProxyException.h FWCore/Framework/interface/NoProxyException.h
 
  Description: An exception that is thrown whenever proxy was not available
@@ -26,25 +26,21 @@
 
 // forward declarations
 namespace edm {
-   namespace eventsetup {
-template <class T>
-class NoProxyException : public NoDataException<T>
-{
+  namespace eventsetup {
+    template <class T>
+    class NoProxyException : public NoDataException<T> {
       // ---------- friend classes and functions ---------------
 
-   public:
+    public:
       // ---------- constants, enums and typedefs --------------
 
       // ---------- Constructors and destructor ----------------
-      NoProxyException(const EventSetupRecordKey& iKey,
-			  const DataKey& iDataKey) :
-       NoDataException<T>(iKey, iDataKey,"NoProxyException",NoDataExceptionBase::noProxyMessage()) 
-       {
-       }
+      NoProxyException(const EventSetupRecordKey& iKey, const DataKey& iDataKey)
+          : NoDataException<T>(iKey, iDataKey, "NoProxyException", NoDataExceptionBase::noProxyMessage()) {}
 
       // ---------- member functions ---------------------------
 
-   private:
+    private:
       // ---------- const member functions ---------------------
 
       // ---------- static member functions --------------------
@@ -54,10 +50,10 @@ class NoProxyException : public NoDataException<T>
 
       //const NoProxyException& operator=(const NoProxyException&); // allow default
 
-      // ---------- data members -------------------------------      
-};
-   }
-}
+      // ---------- data members -------------------------------
+    };
+  }  // namespace eventsetup
+}  // namespace edm
 // inline function definitions
 
 #endif
diff --git a/FWCore/Framework/interface/NoRecordException.h b/FWCore/Framework/interface/NoRecordException.h
index 968a71818f622..82732f3742c17 100644
--- a/FWCore/Framework/interface/NoRecordException.h
+++ b/FWCore/Framework/interface/NoRecordException.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Module:      NoRecordException
-// 
+//
 /**\class NoRecordException NoRecordException.h Framework/interface/NoRecordException.h
 
  Description: An exception that is thrown whenever a EventSetup is asked to retrieve
@@ -35,24 +35,21 @@
 
 // forward declarations
 namespace edm {
-   class IOVSyncValue;
-   class EventSetupImpl;
-   namespace eventsetup {
-      class EventSetupRecordKey;
-      void no_record_exception_message_builder(cms::Exception&,const char*, bool iKnownRecord);
-     bool recordDoesExist( edm::EventSetupImpl const& , edm::eventsetup::EventSetupRecordKey const&);
+  class IOVSyncValue;
+  class EventSetupImpl;
+  namespace eventsetup {
+    class EventSetupRecordKey;
+    void no_record_exception_message_builder(cms::Exception&, const char*, bool iKnownRecord);
+    bool recordDoesExist(edm::EventSetupImpl const&, edm::eventsetup::EventSetupRecordKey const&);
 
-//NOTE: when EDM gets own exception hierarchy, will need to change inheritance
-template <class T>
-class NoRecordException : public cms::Exception
-{
- public:
-  // ---------- Constructors and destructor ----------------
-  explicit NoRecordException(bool iKnownRecord )
-  :cms::Exception("NoRecord")
-  {
-    no_record_exception_message_builder(*this,heterocontainer::className<T>(), iKnownRecord);
-  }
+    //NOTE: when EDM gets own exception hierarchy, will need to change inheritance
+    template <class T>
+    class NoRecordException : public cms::Exception {
+    public:
+      // ---------- Constructors and destructor ----------------
+      explicit NoRecordException(bool iKnownRecord) : cms::Exception("NoRecord") {
+        no_record_exception_message_builder(*this, heterocontainer::className<T>(), iKnownRecord);
+      }
 
       ~NoRecordException() noexcept override {}
 
@@ -61,8 +58,8 @@ class NoRecordException : public cms::Exception
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------
-   
-   private:
+
+    private:
       // ---------- Constructors and destructor ----------------
       //NoRecordException(const NoRecordException&); // stop default
 
@@ -70,9 +67,9 @@ class NoRecordException : public cms::Exception
       //const NoRecordException& operator=(const NoRecordException&); // stop default
 
       // ---------- data members -------------------------------
-};
+    };
 
-// inline function definitions
-   }
-}
+    // inline function definitions
+  }  // namespace eventsetup
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/OccurrenceForOutput.h b/FWCore/Framework/interface/OccurrenceForOutput.h
index 11edbd8a7f793..107e048b5c881 100644
--- a/FWCore/Framework/interface/OccurrenceForOutput.h
+++ b/FWCore/Framework/interface/OccurrenceForOutput.h
@@ -44,8 +44,7 @@ namespace edm {
 
   class OccurrenceForOutput {
   public:
-    OccurrenceForOutput(Principal const& ep, ModuleDescription const& md,
-          ModuleCallingContext const*, bool isAtEnd);
+    OccurrenceForOutput(Principal const& ep, ModuleDescription const& md, ModuleCallingContext const*, bool isAtEnd);
     virtual ~OccurrenceForOutput();
 
     //Used in conjunction with EDGetToken
@@ -53,41 +52,32 @@ namespace edm {
 
     ProcessHistoryID const& processHistoryID() const;
 
-    BasicHandle
-    getByToken(EDGetToken token, TypeID const& typeID) const;
+    BasicHandle getByToken(EDGetToken token, TypeID const& typeID) const;
 
-    template<typename PROD>
-    bool
-    getByToken(EDGetToken token, Handle<PROD>& result) const;
+    template <typename PROD>
+    bool getByToken(EDGetToken token, Handle<PROD>& result) const;
 
-    template<typename PROD>
-    bool
-    getByToken(EDGetTokenT<PROD> token, Handle<PROD>& result) const;
+    template <typename PROD>
+    bool getByToken(EDGetTokenT<PROD> token, Handle<PROD>& result) const;
 
-    template<typename PROD>
-    Handle<PROD>
-    getHandle(EDGetTokenT<PROD> token) const;
+    template <typename PROD>
+    Handle<PROD> getHandle(EDGetTokenT<PROD> token) const;
 
-    Provenance
-    getProvenance(BranchID const& theID) const;
+    Provenance getProvenance(BranchID const& theID) const;
 
-    void
-    getAllProvenance(std::vector<Provenance const*>& provenances) const;
+    void getAllProvenance(std::vector<Provenance const*>& provenances) const;
 
-    void
-    getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const;
+    void getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const;
 
-    virtual ProcessHistory const&
-    processHistory() const;
+    virtual ProcessHistory const& processHistory() const;
 
     size_t size() const;
 
   protected:
-    Principal const&
-    principal() const;
+    Principal const& principal() const;
 
   private:
-    friend class edmtest::TestOutputModule; // For testing
+    friend class edmtest::TestOutputModule;  // For testing
     ModuleCallingContext const* moduleCallingContext() const { return moduleCallingContext_; }
 
     PrincipalGetAdapter provRecorder_;
@@ -95,13 +85,12 @@ namespace edm {
     ModuleCallingContext const* moduleCallingContext_;
   };
 
-  template<typename PROD>
-  bool
-  OccurrenceForOutput::getByToken(EDGetToken token, Handle<PROD>& result) const {
-    if(!provRecorder_.checkIfComplete<PROD>()) {
+  template <typename PROD>
+  bool OccurrenceForOutput::getByToken(EDGetToken token, Handle<PROD>& result) const {
+    if (!provRecorder_.checkIfComplete<PROD>()) {
       principal_get_adapter_detail::throwOnPrematureRead("RunOrLumi", TypeID(typeid(PROD)), token);
     }
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)),PRODUCT_TYPE, token, moduleCallingContext_);
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)), PRODUCT_TYPE, token, moduleCallingContext_);
     result = convert_handle<PROD>(std::move(bh));  // throws on conversion error
     if (result.failedToGet()) {
       return false;
@@ -109,13 +98,12 @@ namespace edm {
     return true;
   }
 
-  template<typename PROD>
-  bool
-  OccurrenceForOutput::getByToken(EDGetTokenT<PROD> token, Handle<PROD>& result) const {
-    if(!provRecorder_.checkIfComplete<PROD>()) {
+  template <typename PROD>
+  bool OccurrenceForOutput::getByToken(EDGetTokenT<PROD> token, Handle<PROD>& result) const {
+    if (!provRecorder_.checkIfComplete<PROD>()) {
       principal_get_adapter_detail::throwOnPrematureRead("RunOrLumi", TypeID(typeid(PROD)), token);
     }
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)),PRODUCT_TYPE, token, moduleCallingContext_);
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)), PRODUCT_TYPE, token, moduleCallingContext_);
     result = convert_handle<PROD>(std::move(bh));  // throws on conversion error
     if (result.failedToGet()) {
       return false;
@@ -123,16 +111,14 @@ namespace edm {
     return true;
   }
 
-  template<typename PROD>
-  Handle<PROD>
-  OccurrenceForOutput::getHandle(EDGetTokenT<PROD> token) const {
-    if(!provRecorder_.checkIfComplete<PROD>()) {
+  template <typename PROD>
+  Handle<PROD> OccurrenceForOutput::getHandle(EDGetTokenT<PROD> token) const {
+    if (!provRecorder_.checkIfComplete<PROD>()) {
       principal_get_adapter_detail::throwOnPrematureRead("RunOrLumi", TypeID(typeid(PROD)), token);
     }
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)),PRODUCT_TYPE, token, moduleCallingContext_);
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)), PRODUCT_TYPE, token, moduleCallingContext_);
     return convert_handle<PROD>(std::move(bh));  // throws on conversion error
   }
 
-}
+}  // namespace edm
 #endif
-
diff --git a/FWCore/Framework/interface/OccurrenceTraits.h b/FWCore/Framework/interface/OccurrenceTraits.h
index f18e967abe274..9a04d14f98967 100644
--- a/FWCore/Framework/interface/OccurrenceTraits.h
+++ b/FWCore/Framework/interface/OccurrenceTraits.h
@@ -21,13 +21,14 @@
 #include "FWCore/ServiceRegistry/interface/StreamContext.h"
 #include "FWCore/Utilities/interface/LuminosityBlockIndex.h"
 
-#include<string>
+#include <string>
 
 namespace edm {
 
   class ProcessContext;
 
-  template <typename T, BranchActionType B> class OccurrenceTraits;
+  template <typename T, BranchActionType B>
+  class OccurrenceTraits;
 
   template <>
   class OccurrenceTraits<EventPrincipal, BranchActionStreamBegin> {
@@ -44,22 +45,20 @@ namespace edm {
       streamContext.setTimestamp(principal.time());
     }
 
-    static void preScheduleSignal(ActivityRegistry *a, StreamContext const* streamContext) {
+    static void preScheduleSignal(ActivityRegistry* a, StreamContext const* streamContext) {
       a->preEventSignal_(*streamContext);
     }
-    static void postScheduleSignal(ActivityRegistry *a, StreamContext const* streamContext) {
+    static void postScheduleSignal(ActivityRegistry* a, StreamContext const* streamContext) {
       a->postEventSignal_(*streamContext);
     }
-    static void prePathSignal(ActivityRegistry *a, PathContext const* pathContext) {
+    static void prePathSignal(ActivityRegistry* a, PathContext const* pathContext) {
       a->prePathEventSignal_(*pathContext->streamContext(), *pathContext);
     }
-    static void postPathSignal(ActivityRegistry *a, HLTPathStatus const& status, PathContext const* pathContext) {
+    static void postPathSignal(ActivityRegistry* a, HLTPathStatus const& status, PathContext const* pathContext) {
       a->postPathEventSignal_(*pathContext->streamContext(), *pathContext, status);
     }
-    
-    static const char* transitionName() {
-      return "Event";
-    }
+
+    static const char* transitionName() { return "Event"; }
   };
 
   template <>
@@ -80,25 +79,25 @@ namespace edm {
                            processContext);
     }
 
-    static void preScheduleSignal(ActivityRegistry *a, GlobalContext const* globalContext) {
+    static void preScheduleSignal(ActivityRegistry* a, GlobalContext const* globalContext) {
       a->preGlobalBeginRunSignal_(*globalContext);
     }
-    static void postScheduleSignal(ActivityRegistry *a, GlobalContext const* globalContext) {
+    static void postScheduleSignal(ActivityRegistry* a, GlobalContext const* globalContext) {
       a->postGlobalBeginRunSignal_(*globalContext);
     }
-    static void prePathSignal(ActivityRegistry *, PathContext const* ) {
-    }
-    static void postPathSignal(ActivityRegistry *, HLTPathStatus const& , PathContext const* ) {
-    }
-    static void preModuleSignal(ActivityRegistry *a, GlobalContext const* globalContext, ModuleCallingContext const*  moduleCallingContext) {
+    static void prePathSignal(ActivityRegistry*, PathContext const*) {}
+    static void postPathSignal(ActivityRegistry*, HLTPathStatus const&, PathContext const*) {}
+    static void preModuleSignal(ActivityRegistry* a,
+                                GlobalContext const* globalContext,
+                                ModuleCallingContext const* moduleCallingContext) {
       a->preModuleGlobalBeginRunSignal_(*globalContext, *moduleCallingContext);
     }
-    static void postModuleSignal(ActivityRegistry *a, GlobalContext const* globalContext, ModuleCallingContext const*  moduleCallingContext) {
+    static void postModuleSignal(ActivityRegistry* a,
+                                 GlobalContext const* globalContext,
+                                 ModuleCallingContext const* moduleCallingContext) {
       a->postModuleGlobalBeginRunSignal_(*globalContext, *moduleCallingContext);
     }
-    static const char* transitionName() {
-      return "global begin Run";
-    }
+    static const char* transitionName() { return "global begin Run"; }
   };
 
   template <>
@@ -118,25 +117,25 @@ namespace edm {
       streamContext.setTimestamp(principal.beginTime());
     }
 
-    static void preScheduleSignal(ActivityRegistry *a, StreamContext const* streamContext) {
+    static void preScheduleSignal(ActivityRegistry* a, StreamContext const* streamContext) {
       a->preStreamBeginRunSignal_(*streamContext);
     }
-    static void postScheduleSignal(ActivityRegistry *a, StreamContext const* streamContext) {
+    static void postScheduleSignal(ActivityRegistry* a, StreamContext const* streamContext) {
       a->postStreamBeginRunSignal_(*streamContext);
     }
-    static void prePathSignal(ActivityRegistry *, PathContext const* ) {
-    }
-    static void postPathSignal(ActivityRegistry *, HLTPathStatus const& , PathContext const*) {
-    }
-    static void preModuleSignal(ActivityRegistry *a, StreamContext const* streamContext, ModuleCallingContext const*  moduleCallingContext) {
+    static void prePathSignal(ActivityRegistry*, PathContext const*) {}
+    static void postPathSignal(ActivityRegistry*, HLTPathStatus const&, PathContext const*) {}
+    static void preModuleSignal(ActivityRegistry* a,
+                                StreamContext const* streamContext,
+                                ModuleCallingContext const* moduleCallingContext) {
       a->preModuleStreamBeginRunSignal_(*streamContext, *moduleCallingContext);
     }
-    static void postModuleSignal(ActivityRegistry *a, StreamContext const* streamContext, ModuleCallingContext const*  moduleCallingContext) {
+    static void postModuleSignal(ActivityRegistry* a,
+                                 StreamContext const* streamContext,
+                                 ModuleCallingContext const* moduleCallingContext) {
       a->postModuleStreamBeginRunSignal_(*streamContext, *moduleCallingContext);
     }
-    static const char* transitionName() {
-      return "stream begin Run";
-    }
+    static const char* transitionName() { return "stream begin Run"; }
   };
 
   template <>
@@ -156,25 +155,25 @@ namespace edm {
       streamContext.setTimestamp(principal.endTime());
     }
 
-    static void preScheduleSignal(ActivityRegistry *a, StreamContext const* streamContext) {
+    static void preScheduleSignal(ActivityRegistry* a, StreamContext const* streamContext) {
       a->preStreamEndRunSignal_(*streamContext);
     }
-    static void postScheduleSignal(ActivityRegistry *a, StreamContext const* streamContext) {
+    static void postScheduleSignal(ActivityRegistry* a, StreamContext const* streamContext) {
       a->postStreamEndRunSignal_(*streamContext);
     }
-    static void prePathSignal(ActivityRegistry *, PathContext const* ) {
-    }
-    static void postPathSignal(ActivityRegistry *, HLTPathStatus const& , PathContext const* ) {
-    }
-    static void preModuleSignal(ActivityRegistry *a, StreamContext const* streamContext, ModuleCallingContext const*  moduleCallingContext) {
+    static void prePathSignal(ActivityRegistry*, PathContext const*) {}
+    static void postPathSignal(ActivityRegistry*, HLTPathStatus const&, PathContext const*) {}
+    static void preModuleSignal(ActivityRegistry* a,
+                                StreamContext const* streamContext,
+                                ModuleCallingContext const* moduleCallingContext) {
       a->preModuleStreamEndRunSignal_(*streamContext, *moduleCallingContext);
     }
-    static void postModuleSignal(ActivityRegistry *a, StreamContext const* streamContext, ModuleCallingContext const*  moduleCallingContext) {
+    static void postModuleSignal(ActivityRegistry* a,
+                                 StreamContext const* streamContext,
+                                 ModuleCallingContext const* moduleCallingContext) {
       a->postModuleStreamEndRunSignal_(*streamContext, *moduleCallingContext);
     }
-    static const char* transitionName() {
-      return "stream end Run";
-    }
+    static const char* transitionName() { return "stream end Run"; }
   };
 
   template <>
@@ -195,25 +194,25 @@ namespace edm {
                            processContext);
     }
 
-    static void preScheduleSignal(ActivityRegistry *a, GlobalContext const* globalContext) {
+    static void preScheduleSignal(ActivityRegistry* a, GlobalContext const* globalContext) {
       a->preGlobalEndRunSignal_(*globalContext);
     }
-    static void postScheduleSignal(ActivityRegistry *a, GlobalContext const* globalContext) {
+    static void postScheduleSignal(ActivityRegistry* a, GlobalContext const* globalContext) {
       a->postGlobalEndRunSignal_(*globalContext);
     }
-    static void prePathSignal(ActivityRegistry *, PathContext const*) {
-    }
-    static void postPathSignal(ActivityRegistry *, HLTPathStatus const& , PathContext const* ) {
-    }
-    static void preModuleSignal(ActivityRegistry *a, GlobalContext const* globalContext, ModuleCallingContext const*  moduleCallingContext) {
+    static void prePathSignal(ActivityRegistry*, PathContext const*) {}
+    static void postPathSignal(ActivityRegistry*, HLTPathStatus const&, PathContext const*) {}
+    static void preModuleSignal(ActivityRegistry* a,
+                                GlobalContext const* globalContext,
+                                ModuleCallingContext const* moduleCallingContext) {
       a->preModuleGlobalEndRunSignal_(*globalContext, *moduleCallingContext);
     }
-    static void postModuleSignal(ActivityRegistry *a, GlobalContext const* globalContext, ModuleCallingContext const*  moduleCallingContext) {
+    static void postModuleSignal(ActivityRegistry* a,
+                                 GlobalContext const* globalContext,
+                                 ModuleCallingContext const* moduleCallingContext) {
       a->postModuleGlobalEndRunSignal_(*globalContext, *moduleCallingContext);
     }
-    static const char* transitionName() {
-      return "global end Run";
-    }
+    static const char* transitionName() { return "global end Run"; }
   };
 
   template <>
@@ -234,25 +233,25 @@ namespace edm {
                            processContext);
     }
 
-    static void preScheduleSignal(ActivityRegistry *a, GlobalContext const* globalContext) {
+    static void preScheduleSignal(ActivityRegistry* a, GlobalContext const* globalContext) {
       a->preGlobalBeginLumiSignal_(*globalContext);
     }
-    static void postScheduleSignal(ActivityRegistry *a, GlobalContext const* globalContext) {
+    static void postScheduleSignal(ActivityRegistry* a, GlobalContext const* globalContext) {
       a->postGlobalBeginLumiSignal_(*globalContext);
     }
-    static void prePathSignal(ActivityRegistry *, PathContext const*) {
-    }
-    static void postPathSignal(ActivityRegistry *, HLTPathStatus const&, PathContext const*) {
-    }
-    static void preModuleSignal(ActivityRegistry *a, GlobalContext const* globalContext, ModuleCallingContext const*  moduleCallingContext) {
+    static void prePathSignal(ActivityRegistry*, PathContext const*) {}
+    static void postPathSignal(ActivityRegistry*, HLTPathStatus const&, PathContext const*) {}
+    static void preModuleSignal(ActivityRegistry* a,
+                                GlobalContext const* globalContext,
+                                ModuleCallingContext const* moduleCallingContext) {
       a->preModuleGlobalBeginLumiSignal_(*globalContext, *moduleCallingContext);
     }
-    static void postModuleSignal(ActivityRegistry *a, GlobalContext const* globalContext, ModuleCallingContext const*  moduleCallingContext) {
+    static void postModuleSignal(ActivityRegistry* a,
+                                 GlobalContext const* globalContext,
+                                 ModuleCallingContext const* moduleCallingContext) {
       a->postModuleGlobalBeginLumiSignal_(*globalContext, *moduleCallingContext);
     }
-    static const char* transitionName() {
-      return "global begin LuminosityBlock";
-    }
+    static const char* transitionName() { return "global begin LuminosityBlock"; }
   };
 
   template <>
@@ -272,25 +271,25 @@ namespace edm {
       streamContext.setTimestamp(principal.beginTime());
     }
 
-    static void preScheduleSignal(ActivityRegistry *a, StreamContext const* streamContext) {
+    static void preScheduleSignal(ActivityRegistry* a, StreamContext const* streamContext) {
       a->preStreamBeginLumiSignal_(*streamContext);
     }
-    static void postScheduleSignal(ActivityRegistry *a, StreamContext const* streamContext) {
+    static void postScheduleSignal(ActivityRegistry* a, StreamContext const* streamContext) {
       a->postStreamBeginLumiSignal_(*streamContext);
     }
-    static void prePathSignal(ActivityRegistry *, PathContext const*) {
-    }
-    static void postPathSignal(ActivityRegistry *, HLTPathStatus const&, PathContext const*) {
-    }
-    static void preModuleSignal(ActivityRegistry *a, StreamContext const* streamContext, ModuleCallingContext const*  moduleCallingContext) {
+    static void prePathSignal(ActivityRegistry*, PathContext const*) {}
+    static void postPathSignal(ActivityRegistry*, HLTPathStatus const&, PathContext const*) {}
+    static void preModuleSignal(ActivityRegistry* a,
+                                StreamContext const* streamContext,
+                                ModuleCallingContext const* moduleCallingContext) {
       a->preModuleStreamBeginLumiSignal_(*streamContext, *moduleCallingContext);
     }
-    static void postModuleSignal(ActivityRegistry *a, StreamContext const* streamContext, ModuleCallingContext const*  moduleCallingContext) {
+    static void postModuleSignal(ActivityRegistry* a,
+                                 StreamContext const* streamContext,
+                                 ModuleCallingContext const* moduleCallingContext) {
       a->postModuleStreamBeginLumiSignal_(*streamContext, *moduleCallingContext);
     }
-    static const char* transitionName() {
-      return "stream begin LuminosityBlock";
-    }
+    static const char* transitionName() { return "stream begin LuminosityBlock"; }
   };
 
   template <>
@@ -312,25 +311,25 @@ namespace edm {
       streamContext.setTimestamp(principal.endTime());
     }
 
-    static void preScheduleSignal(ActivityRegistry *a, StreamContext const* streamContext) {
+    static void preScheduleSignal(ActivityRegistry* a, StreamContext const* streamContext) {
       a->preStreamEndLumiSignal_(*streamContext);
     }
-    static void postScheduleSignal(ActivityRegistry *a, StreamContext const* streamContext) {
+    static void postScheduleSignal(ActivityRegistry* a, StreamContext const* streamContext) {
       a->postStreamEndLumiSignal_(*streamContext);
     }
-    static void prePathSignal(ActivityRegistry *, PathContext const* ) {
-    }
-    static void postPathSignal(ActivityRegistry *, HLTPathStatus const&, PathContext const*) {
-    }
-    static void preModuleSignal(ActivityRegistry *a, StreamContext const* streamContext, ModuleCallingContext const*  moduleCallingContext) {
+    static void prePathSignal(ActivityRegistry*, PathContext const*) {}
+    static void postPathSignal(ActivityRegistry*, HLTPathStatus const&, PathContext const*) {}
+    static void preModuleSignal(ActivityRegistry* a,
+                                StreamContext const* streamContext,
+                                ModuleCallingContext const* moduleCallingContext) {
       a->preModuleStreamEndLumiSignal_(*streamContext, *moduleCallingContext);
     }
-    static void postModuleSignal(ActivityRegistry *a, StreamContext const* streamContext, ModuleCallingContext const*  moduleCallingContext) {
+    static void postModuleSignal(ActivityRegistry* a,
+                                 StreamContext const* streamContext,
+                                 ModuleCallingContext const* moduleCallingContext) {
       a->postModuleStreamEndLumiSignal_(*streamContext, *moduleCallingContext);
     }
-    static const char* transitionName() {
-      return "end stream LuminosityBlock";
-    }
+    static const char* transitionName() { return "end stream LuminosityBlock"; }
   };
 
   template <>
@@ -351,25 +350,25 @@ namespace edm {
                            processContext);
     }
 
-    static void preScheduleSignal(ActivityRegistry *a, GlobalContext const* globalContext) {
+    static void preScheduleSignal(ActivityRegistry* a, GlobalContext const* globalContext) {
       a->preGlobalEndLumiSignal_(*globalContext);
     }
-    static void postScheduleSignal(ActivityRegistry *a, GlobalContext const* globalContext) {
+    static void postScheduleSignal(ActivityRegistry* a, GlobalContext const* globalContext) {
       a->postGlobalEndLumiSignal_(*globalContext);
     }
-    static void prePathSignal(ActivityRegistry *, PathContext const*) {
-    }
-    static void postPathSignal(ActivityRegistry *, HLTPathStatus const& , PathContext const* ) {
-    }
-    static void preModuleSignal(ActivityRegistry *a, GlobalContext const* globalContext, ModuleCallingContext const*  moduleCallingContext) {
+    static void prePathSignal(ActivityRegistry*, PathContext const*) {}
+    static void postPathSignal(ActivityRegistry*, HLTPathStatus const&, PathContext const*) {}
+    static void preModuleSignal(ActivityRegistry* a,
+                                GlobalContext const* globalContext,
+                                ModuleCallingContext const* moduleCallingContext) {
       a->preModuleGlobalEndLumiSignal_(*globalContext, *moduleCallingContext);
     }
-    static void postModuleSignal(ActivityRegistry *a, GlobalContext const* globalContext, ModuleCallingContext const*  moduleCallingContext) {
+    static void postModuleSignal(ActivityRegistry* a,
+                                 GlobalContext const* globalContext,
+                                 ModuleCallingContext const* moduleCallingContext) {
       a->postModuleGlobalEndLumiSignal_(*globalContext, *moduleCallingContext);
     }
-    static const char* transitionName() {
-      return "end global LuminosityBlock";
-    }
+    static const char* transitionName() { return "end global LuminosityBlock"; }
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/OutputModule.h b/FWCore/Framework/interface/OutputModule.h
index eaa93a611f5cf..ca9cb2f3478ee 100644
--- a/FWCore/Framework/interface/OutputModule.h
+++ b/FWCore/Framework/interface/OutputModule.h
@@ -45,63 +45,66 @@ namespace edm {
   class WaitingTask;
 
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
   }
 
   typedef detail::TriggerResultsBasedEventSelector::handle_t Trig;
 
   class OutputModule : public EDConsumerBase {
   public:
-    template <typename T> friend class maker::ModuleHolderT;
-    template <typename T> friend class WorkerT;
-    template <typename T> friend class OutputModuleCommunicatorT;
+    template <typename T>
+    friend class maker::ModuleHolderT;
+    template <typename T>
+    friend class WorkerT;
+    template <typename T>
+    friend class OutputModuleCommunicatorT;
     typedef OutputModule ModuleType;
 
     explicit OutputModule(ParameterSet const& pset);
     ~OutputModule() override;
 
-    OutputModule(OutputModule const&) = delete; // Disallow copying and moving
-    OutputModule& operator=(OutputModule const&) = delete; // Disallow copying and moving
+    OutputModule(OutputModule const&) = delete;             // Disallow copying and moving
+    OutputModule& operator=(OutputModule const&) = delete;  // Disallow copying and moving
 
     /// Accessor for maximum number of events to be written.
     /// -1 is used for unlimited.
-    int maxEvents() const {return maxEvents_;}
+    int maxEvents() const { return maxEvents_; }
 
     /// Accessor for remaining number of events to be written.
     /// -1 is used for unlimited.
-    int remainingEvents() const {return remainingEvents_;}
+    int remainingEvents() const { return remainingEvents_; }
 
     bool selected(BranchDescription const& desc) const;
 
     void selectProducts(ProductRegistry const& preg, ThinnedAssociationsHelper const&);
-    std::string const& processName() const {return process_name_;}
-    SelectedProductsForBranchType const& keptProducts() const {return keptProducts_;}
-    std::array<bool, NumBranchTypes> const& hasNewlyDroppedBranch() const {return hasNewlyDroppedBranch_;}
+    std::string const& processName() const { return process_name_; }
+    SelectedProductsForBranchType const& keptProducts() const { return keptProducts_; }
+    std::array<bool, NumBranchTypes> const& hasNewlyDroppedBranch() const { return hasNewlyDroppedBranch_; }
 
-    static void fillDescription(ParameterSetDescription & desc, std::vector<std::string> const& iDefaultOutputCommands = ProductSelectorRules::defaultSelectionStrings());
+    static void fillDescription(
+        ParameterSetDescription& desc,
+        std::vector<std::string> const& iDefaultOutputCommands = ProductSelectorRules::defaultSelectionStrings());
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
     static const std::string& baseType();
-    static void prevalidate(ConfigurationDescriptions& );
+    static void prevalidate(ConfigurationDescriptions&);
 
-    static bool wantsGlobalRuns() {return true;}
-    static bool wantsGlobalLuminosityBlocks() {return true;}
-    static bool wantsStreamRuns() {return false;}
-    static bool wantsStreamLuminosityBlocks() {return false;};
+    static bool wantsGlobalRuns() { return true; }
+    static bool wantsGlobalLuminosityBlocks() { return true; }
+    static bool wantsStreamRuns() { return false; }
+    static bool wantsStreamLuminosityBlocks() { return false; };
 
-    SerialTaskQueue* globalRunsQueue() { return &runQueue_;}
-    SerialTaskQueue* globalLuminosityBlocksQueue() { return &luminosityBlockQueue_;}
-    SharedResourcesAcquirer& sharedResourcesAcquirer() {
-      return resourceAcquirer_;
-    }
+    SerialTaskQueue* globalRunsQueue() { return &runQueue_; }
+    SerialTaskQueue* globalLuminosityBlocksQueue() { return &luminosityBlockQueue_; }
+    SharedResourcesAcquirer& sharedResourcesAcquirer() { return resourceAcquirer_; }
 
-    bool wantAllEvents() const {return wantAllEvents_;}
+    bool wantAllEvents() const { return wantAllEvents_; }
 
     BranchIDLists const* branchIDLists();
 
     ThinnedAssociationsHelper const* thinnedAssociationsHelper() const;
 
   protected:
-
     // This function is needed for compatibility with older code. We
     // need to clean up the use of EventForOutputand EventPrincipal, to avoid
     // creation of multiple EventForOutputobjects when handling a single
@@ -109,8 +112,7 @@ namespace edm {
     Trig getTriggerResults(EDGetTokenT<TriggerResults> const& token, EventForOutput const& e) const;
 
     ModuleDescription const& description() const;
-    ModuleDescription const& moduleDescription() const { return moduleDescription_;
-    }
+    ModuleDescription const& moduleDescription() const { return moduleDescription_; }
 
     ParameterSetID selectorConfig() const { return selector_config_id_; }
 
@@ -118,23 +120,27 @@ namespace edm {
 
     void doBeginJob();
     void doEndJob();
-    bool doEvent(EventPrincipal const& ep, EventSetupImpl const&  c,
+    bool doEvent(EventPrincipal const& ep,
+                 EventSetupImpl const& c,
                  ActivityRegistry* act,
                  ModuleCallingContext const* mcc);
     //Needed by WorkerT but not supported
-    void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
-
-    bool doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c,
-                    ModuleCallingContext const* mcc);
-    bool doEndRun(RunPrincipal const& rp, EventSetupImpl const& c,
-                  ModuleCallingContext const* mcc);
-    bool doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& c,
+    void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                      ModuleCallingContext const& iModuleCallingContext,
+                                      Principal const& iPrincipal) const {}
+
+    bool doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc);
+    bool doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc);
+    bool doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                EventSetupImpl const& c,
                                 ModuleCallingContext const* mcc);
-    bool doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& c,
+    bool doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                              EventSetupImpl const& c,
                               ModuleCallingContext const* mcc);
 
-    void setEventSelectionInfo(std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
-                               bool anyProductProduced);
+    void setEventSelectionInfo(
+        std::map<std::string, std::vector<std::pair<std::string, int>>> const& outputModulePathPositions,
+        bool anyProductProduced);
 
     void configure(OutputModuleDescription const& desc);
 
@@ -143,7 +149,6 @@ namespace edm {
     }
 
   private:
-
     int maxEvents_;
     std::atomic<int> remainingEvents_;
 
@@ -198,11 +203,10 @@ namespace edm {
     void doOpenFile(FileBlock const& fb);
     void doRespondToOpenInputFile(FileBlock const& fb);
     void doRespondToCloseInputFile(FileBlock const& fb);
-    void doRegisterThinnedAssociations(ProductRegistry const&,
-                                       ThinnedAssociationsHelper&) { }
+    void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
+
+    std::string workerType() const { return "WorkerT<OutputModule>"; }
 
-    std::string workerType() const {return "WorkerT<OutputModule>";}
-    
     /// Tell the OutputModule that is must end the current file.
     void doCloseFile();
 
@@ -211,22 +215,22 @@ namespace edm {
     virtual void reallyCloseFile();
 
     void registerProductsAndCallbacks(OutputModule const*, ProductRegistry const*) {}
-    
+
     bool needToRunSelection() const;
     std::vector<ProductResolverIndexAndSkipBit> productsUsedBySelection() const;
     bool prePrefetchSelection(StreamID id, EventPrincipal const&, ModuleCallingContext const*);
 
     /// Ask the OutputModule if we should end the current file.
-    virtual bool shouldWeCloseFile() const {return false;}
+    virtual bool shouldWeCloseFile() const { return false; }
 
     virtual void write(EventForOutput const&) = 0;
-    virtual void beginJob(){}
-    virtual void endJob(){}
-    virtual void beginRun(RunForOutput const&){}
-    virtual void endRun(RunForOutput const&){}
+    virtual void beginJob() {}
+    virtual void endJob() {}
+    virtual void beginRun(RunForOutput const&) {}
+    virtual void endRun(RunForOutput const&) {}
     virtual void writeRun(RunForOutput const&) = 0;
-    virtual void beginLuminosityBlock(LuminosityBlockForOutput const&){}
-    virtual void endLuminosityBlock(LuminosityBlockForOutput const&){}
+    virtual void beginLuminosityBlock(LuminosityBlockForOutput const&) {}
+    virtual void endLuminosityBlock(LuminosityBlockForOutput const&) {}
     virtual void writeLuminosityBlock(LuminosityBlockForOutput const&) = 0;
     virtual void openFile(FileBlock const&) {}
     virtual void respondToOpenInputFile(FileBlock const&) {}
@@ -243,11 +247,9 @@ namespace edm {
                         std::map<BranchID, BranchDescription const*>& trueBranchIDToKeptBranchDesc,
                         std::set<BranchID>& keptProductsInEvent);
 
-    void setModuleDescription(ModuleDescription const& md) {
-      moduleDescription_ = md;
-    }
+    void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
 
-    bool limitReached() const {return remainingEvents_ == 0;}
+    bool limitReached() const { return remainingEvents_ == 0; }
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/OutputModuleDescription.h b/FWCore/Framework/interface/OutputModuleDescription.h
index ac8d27d093eee..2ee714b68cfe2 100644
--- a/FWCore/Framework/interface/OutputModuleDescription.h
+++ b/FWCore/Framework/interface/OutputModuleDescription.h
@@ -18,15 +18,14 @@ namespace edm {
     //OutputModuleDescription() : maxEvents_(-1) {}
     explicit OutputModuleDescription(BranchIDLists const& branchIDLists,
                                      int maxEvents = -1,
-                                     SubProcessParentageHelper const* subProcessParentageHelper = nullptr) :
-      branchIDLists_(&branchIDLists),
-      maxEvents_(maxEvents),
-      subProcessParentageHelper_(subProcessParentageHelper)
-    {}
+                                     SubProcessParentageHelper const* subProcessParentageHelper = nullptr)
+        : branchIDLists_(&branchIDLists),
+          maxEvents_(maxEvents),
+          subProcessParentageHelper_(subProcessParentageHelper) {}
     BranchIDLists const* branchIDLists_;
     int maxEvents_;
     SubProcessParentageHelper const* subProcessParentageHelper_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/ParameterSetIDHolder.h b/FWCore/Framework/interface/ParameterSetIDHolder.h
index f64fc2122f578..9ea60befb4139 100644
--- a/FWCore/Framework/interface/ParameterSetIDHolder.h
+++ b/FWCore/Framework/interface/ParameterSetIDHolder.h
@@ -7,16 +7,17 @@
 #include "DataFormats/Provenance/interface/ParameterSetID.h"
 
 namespace edm {
-   namespace eventsetup {
+  namespace eventsetup {
 
-      class ParameterSetIDHolder {
-      public:
-         ParameterSetIDHolder(ParameterSetID const& psetID) : psetID_(psetID) { }
-         ParameterSetID const& psetID() const { return psetID_; }
-         bool operator<(ParameterSetIDHolder const& other) const { return psetID() < other.psetID(); }
-         bool operator==(ParameterSetIDHolder const& other) const { return psetID() == other.psetID(); }
-      private:
-         ParameterSetID psetID_;
-      };
-   }
-}
+    class ParameterSetIDHolder {
+    public:
+      ParameterSetIDHolder(ParameterSetID const& psetID) : psetID_(psetID) {}
+      ParameterSetID const& psetID() const { return psetID_; }
+      bool operator<(ParameterSetIDHolder const& other) const { return psetID() < other.psetID(); }
+      bool operator==(ParameterSetIDHolder const& other) const { return psetID() == other.psetID(); }
+
+    private:
+      ParameterSetID psetID_;
+    };
+  }  // namespace eventsetup
+}  // namespace edm
diff --git a/FWCore/Framework/interface/PathsAndConsumesOfModules.h b/FWCore/Framework/interface/PathsAndConsumesOfModules.h
index dde639f26a3c2..0cfcbcc5517e6 100644
--- a/FWCore/Framework/interface/PathsAndConsumesOfModules.h
+++ b/FWCore/Framework/interface/PathsAndConsumesOfModules.h
@@ -28,13 +28,11 @@ namespace edm {
 
   class PathsAndConsumesOfModules : public PathsAndConsumesOfModulesBase {
   public:
-
     ~PathsAndConsumesOfModules() override;
 
     void initialize(Schedule const*, std::shared_ptr<ProductRegistry const>);
 
   private:
-
     std::vector<std::string> const& doPaths() const override { return paths_; }
     std::vector<std::string> const& doEndPaths() const override { return endPaths_; }
 
@@ -43,7 +41,8 @@ namespace edm {
 
     std::vector<ModuleDescription const*> const& doModulesOnPath(unsigned int pathIndex) const override;
     std::vector<ModuleDescription const*> const& doModulesOnEndPath(unsigned int endPathIndex) const override;
-    std::vector<ModuleDescription const*> const& doModulesWhoseProductsAreConsumedBy(unsigned int moduleID) const override;
+    std::vector<ModuleDescription const*> const& doModulesWhoseProductsAreConsumedBy(
+        unsigned int moduleID) const override;
 
     std::vector<ConsumesInfo> doConsumesInfo(unsigned int moduleID) const override;
 
@@ -68,9 +67,7 @@ namespace edm {
     Schedule const* schedule_;
     std::shared_ptr<ProductRegistry const> preg_;
   };
-  
-  void
-  checkForModuleDependencyCorrectness(edm::PathsAndConsumesOfModulesBase const& iPnC,
-                                      bool iPrintDependencies);
-}
+
+  void checkForModuleDependencyCorrectness(edm::PathsAndConsumesOfModulesBase const& iPnC, bool iPrintDependencies);
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/Principal.h b/FWCore/Framework/interface/Principal.h
index 356f0d3c148b9..eae9e2c0ca751 100644
--- a/FWCore/Framework/interface/Principal.h
+++ b/FWCore/Framework/interface/Principal.h
@@ -52,12 +52,12 @@ namespace edm {
   class UnscheduledConfigurator;
 
   struct FilledProductPtr {
-    bool operator()(propagate_const<std::shared_ptr<ProductResolverBase>> const& iObj) { return bool(iObj);}
+    bool operator()(propagate_const<std::shared_ptr<ProductResolverBase>> const& iObj) { return bool(iObj); }
   };
 
   class Principal : public EDProductGetter {
   public:
-    typedef std::vector<propagate_const<std::shared_ptr<ProductResolverBase>> > ProductResolverCollection;
+    typedef std::vector<propagate_const<std::shared_ptr<ProductResolverBase>>> ProductResolverCollection;
     typedef boost::filter_iterator<FilledProductPtr, ProductResolverCollection::const_iterator> const_iterator;
     typedef boost::filter_iterator<FilledProductPtr, ProductResolverCollection::iterator> iterator;
     typedef ProcessHistory::const_iterator ProcessNameConstIterator;
@@ -84,12 +84,12 @@ namespace edm {
     void fillPrincipal(ProcessHistoryID const& hist, ProcessHistoryRegistry const& phr, DelayedReader* reader);
 
     void clearPrincipal();
-    
+
     void setupUnscheduled(UnscheduledConfigurator const&);
-  
+
     void deleteProduct(BranchID const& id) const;
-    
-    EDProductGetter const* prodGetter() const {return this;}
+
+    EDProductGetter const* prodGetter() const { return this; }
 
     // Return a BasicHandle to the product which:
     //   1. matches the given label, instance, and process
@@ -101,22 +101,22 @@ namespace edm {
     //      c.  typeID is the same as or a public base of
     //      this value_type,
 
-    BasicHandle  getByLabel(KindOfType kindOfType,
-                            TypeID const& typeID,
-                            InputTag const& inputTag,
-                            EDConsumerBase const* consumes,
-                            SharedResourcesAcquirer* sra,
-                            ModuleCallingContext const* mcc) const;
-
-    BasicHandle  getByLabel(KindOfType kindOfType,
-                            TypeID const& typeID,
-                            std::string const& label,
-                            std::string const& instance,
-                            std::string const& process,
-                            EDConsumerBase const* consumes,
-                            SharedResourcesAcquirer* sra,
-                            ModuleCallingContext const* mcc) const;
-    
+    BasicHandle getByLabel(KindOfType kindOfType,
+                           TypeID const& typeID,
+                           InputTag const& inputTag,
+                           EDConsumerBase const* consumes,
+                           SharedResourcesAcquirer* sra,
+                           ModuleCallingContext const* mcc) const;
+
+    BasicHandle getByLabel(KindOfType kindOfType,
+                           TypeID const& typeID,
+                           std::string const& label,
+                           std::string const& instance,
+                           std::string const& process,
+                           EDConsumerBase const* consumes,
+                           SharedResourcesAcquirer* sra,
+                           ModuleCallingContext const* mcc) const;
+
     BasicHandle getByToken(KindOfType kindOfType,
                            TypeID const& typeID,
                            ProductResolverIndex index,
@@ -137,63 +137,67 @@ namespace edm {
                        SharedResourcesAcquirer* sra,
                        ModuleCallingContext const* mcc) const;
 
-    ProcessHistory const& processHistory() const {
-      return *processHistoryPtr_;
-    }
+    ProcessHistory const& processHistory() const { return *processHistoryPtr_; }
 
-    ProcessHistoryID const& processHistoryID() const {
-      return processHistoryID_;
-    }
+    ProcessHistoryID const& processHistoryID() const { return processHistoryID_; }
 
-    ProcessConfiguration const& processConfiguration() const {return *processConfiguration_;}
+    ProcessConfiguration const& processConfiguration() const { return *processConfiguration_; }
 
-    ProductRegistry const& productRegistry() const {return *preg_;}
+    ProductRegistry const& productRegistry() const { return *preg_; }
 
-    ProductResolverIndexHelper const& productLookup() const {return *productLookup_;}
+    ProductResolverIndexHelper const& productLookup() const { return *productLookup_; }
 
     // merge Principals containing different products.
     void recombine(Principal& other, std::vector<BranchID> const& bids);
 
     ProductResolverBase* getModifiableProductResolver(BranchID const& oid) {
-      return const_cast<ProductResolverBase*>( const_cast<const Principal*>(this)->getProductResolver(oid));
+      return const_cast<ProductResolverBase*>(const_cast<const Principal*>(this)->getProductResolver(oid));
     }
 
     size_t size() const;
 
     // These iterators skip over any null shared pointers
-    const_iterator begin() const {return boost::make_filter_iterator<FilledProductPtr>(productResolvers_.begin(), productResolvers_.end());}
-    const_iterator end() const {return  boost::make_filter_iterator<FilledProductPtr>(productResolvers_.end(), productResolvers_.end());}
+    const_iterator begin() const {
+      return boost::make_filter_iterator<FilledProductPtr>(productResolvers_.begin(), productResolvers_.end());
+    }
+    const_iterator end() const {
+      return boost::make_filter_iterator<FilledProductPtr>(productResolvers_.end(), productResolvers_.end());
+    }
 
-    iterator begin() {return boost::make_filter_iterator<FilledProductPtr>(productResolvers_.begin(), productResolvers_.end());}
-    iterator end() {return  boost::make_filter_iterator<FilledProductPtr>(productResolvers_.end(), productResolvers_.end());}
+    iterator begin() {
+      return boost::make_filter_iterator<FilledProductPtr>(productResolvers_.begin(), productResolvers_.end());
+    }
+    iterator end() {
+      return boost::make_filter_iterator<FilledProductPtr>(productResolvers_.end(), productResolvers_.end());
+    }
 
-    Provenance getProvenance(BranchID const& bid,
-                             ModuleCallingContext const* mcc) const;
+    Provenance getProvenance(BranchID const& bid, ModuleCallingContext const* mcc) const;
 
     void getAllProvenance(std::vector<Provenance const*>& provenances) const;
 
     void getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const;
 
-    BranchType const& branchType() const {return branchType_;}
-    
+    BranchType const& branchType() const { return branchType_; }
+
     //This will never return 0 so you can use 0 to mean unset
     typedef unsigned long CacheIdentifier_t;
-    CacheIdentifier_t cacheIdentifier() const {return cacheIdentifier_;}
+    CacheIdentifier_t cacheIdentifier() const { return cacheIdentifier_; }
 
-    DelayedReader* reader() const {return reader_;}
+    DelayedReader* reader() const { return reader_; }
 
     ConstProductResolverPtr getProductResolver(BranchID const& oid) const;
 
-    ProductData const* findProductByTag(TypeID const& typeID, InputTag const& tag, ModuleCallingContext const* mcc) const;
+    ProductData const* findProductByTag(TypeID const& typeID,
+                                        InputTag const& tag,
+                                        ModuleCallingContext const* mcc) const;
 
     void readAllFromSourceAndMergeImmediately(MergeableRunProductMetadata const* mergeableRunProductMetadata = nullptr);
-    
+
     std::vector<unsigned int> const& lookupProcessOrder() const { return lookupProcessOrder_; }
 
     ConstProductResolverPtr getProductResolverByIndex(ProductResolverIndex const& oid) const;
 
   protected:
-
     // ----- Add a new ProductResolver
     // *this takes ownership of the ProductResolver, which in turn owns its
     // data.
@@ -203,18 +207,17 @@ namespace edm {
     ProductResolverBase const* getExistingProduct(BranchID const& branchID) const;
     ProductResolverBase const* getExistingProduct(ProductResolverBase const& phb) const;
 
-    void putOrMerge(BranchDescription const& bd, std::unique_ptr<WrapperBase>  edp) const;
-    
+    void putOrMerge(BranchDescription const& bd, std::unique_ptr<WrapperBase> edp) const;
+
     //F must take an argument of type ProductResolverBase*
     template <typename F>
-    void applyToResolvers( F iFunc) {
-      for(auto& resolver: productResolvers_) {
+    void applyToResolvers(F iFunc) {
+      for (auto& resolver : productResolvers_) {
         iFunc(resolver.get());
       }
     }
-    
-  private:
 
+  private:
     void addScheduledProduct(std::shared_ptr<BranchDescription const> bd);
     void addSourceProduct(std::shared_ptr<BranchDescription const> bd);
     void addInputProduct(std::shared_ptr<BranchDescription const> bd);
@@ -223,13 +226,12 @@ namespace edm {
     void addSwitchProducerProduct(std::shared_ptr<BranchDescription const> bd);
     void addSwitchAliasProduct(std::shared_ptr<BranchDescription const> bd);
     void addParentProcessProduct(std::shared_ptr<BranchDescription const> bd);
-    
 
     WrapperBase const* getIt(ProductID const&) const override;
     WrapperBase const* getThinnedProduct(ProductID const&, unsigned int&) const override;
     void getThinnedProducts(ProductID const&,
-                                    std::vector<WrapperBase const*>&,
-                                    std::vector<unsigned int>&) const override;
+                            std::vector<WrapperBase const*>&,
+                            std::vector<unsigned int>&) const override;
 
     void findProducts(std::vector<ProductResolverBase const*> const& holders,
                       TypeID const& typeID,
@@ -254,7 +256,7 @@ namespace edm {
                                           ModuleCallingContext const* mcc) const;
 
     void putOrMerge(std::unique_ptr<WrapperBase> prod, ProductResolverBase const* productResolver) const;
-    
+
     std::shared_ptr<ProcessHistory const> processHistoryPtr_;
 
     ProcessHistoryID processHistoryID_;
@@ -263,7 +265,7 @@ namespace edm {
     ProcessConfiguration const* processConfiguration_;
 
     // A vector of product holders.
-    ProductResolverCollection productResolvers_; // products and provenances are persistent
+    ProductResolverCollection productResolvers_;  // products and provenances are persistent
 
     // Pointer to the product registry. There is one entry in the registry
     // for each EDProduct in the event.
@@ -283,24 +285,24 @@ namespace edm {
     // input ProcessHistory, the following pointer should be null.
     // The Principal does not own this object.
     edm::propagate_const<HistoryAppender*> historyAppender_;
-    
+
     CacheIdentifier_t cacheIdentifier_;
   };
 
   template <typename PROD>
-  inline
-  std::shared_ptr<Wrapper<PROD> const>
-    getProductByTag(Principal const& ep, InputTag const& tag, ModuleCallingContext const* mcc) {
+  inline std::shared_ptr<Wrapper<PROD> const> getProductByTag(Principal const& ep,
+                                                              InputTag const& tag,
+                                                              ModuleCallingContext const* mcc) {
     TypeID tid = TypeID(typeid(PROD));
     ProductData const* result = ep.findProductByTag(tid, tag, mcc);
-    if(result == nullptr) {
-      return std::shared_ptr<Wrapper<PROD> const>(); 
+    if (result == nullptr) {
+      return std::shared_ptr<Wrapper<PROD> const>();
     }
 
-    if(!(result->wrapper()->dynamicTypeInfo() == typeid(PROD))) {
+    if (!(result->wrapper()->dynamicTypeInfo() == typeid(PROD))) {
       handleimpl::throwConvertTypeError(typeid(PROD), result->wrapper()->dynamicTypeInfo());
     }
     return std::static_pointer_cast<Wrapper<PROD> const>(result->sharedConstWrapper());
   }
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/PrincipalGetAdapter.h b/FWCore/Framework/interface/PrincipalGetAdapter.h
index 70a450923d02b..dc3b2388af03d 100644
--- a/FWCore/Framework/interface/PrincipalGetAdapter.h
+++ b/FWCore/Framework/interface/PrincipalGetAdapter.h
@@ -5,7 +5,7 @@
 //
 
 // Class  :     PrincipalGetAdapter
-// 
+//
 /**\class PrincipalGetAdapter PrincipalGetAdapter.h FWCore/Framework/interface/PrincipalGetAdapter.h
 
 Description: This is the implementation for accessing EDProducts and 
@@ -108,7 +108,6 @@ edm::Ref<AppleCollection> ref(refApples, index);
 #include "FWCore/Utilities/interface/propagate_const.h"
 #include "FWCore/Utilities/interface/Transition.h"
 
-
 namespace edm {
 
   class ModuleCallingContext;
@@ -116,81 +115,66 @@ namespace edm {
   class ProducerBase;
 
   namespace principal_get_adapter_detail {
-    void
-    throwOnPutOfNullProduct(char const* principalType, TypeID const& productType, std::string const& productInstanceName);
-    void
-    throwOnPutOfUninitializedToken(char const* principalType, std::type_info const& productType);
-    void
-    throwOnPutOfWrongType(std::type_info const& wrongType, TypeID const& rightType);
-    void
-    throwOnPrematureRead(char const* principalType, TypeID const& productType, std::string const& moduleLabel, std::string const& productInstanceName);
-    void
-    throwOnPrematureRead(char const* principalType, TypeID const& productType);
-
-    void
-    throwOnPrematureRead(char const* principalType, TypeID const& productType, EDGetToken);
-
-  }
+    void throwOnPutOfNullProduct(char const* principalType,
+                                 TypeID const& productType,
+                                 std::string const& productInstanceName);
+    void throwOnPutOfUninitializedToken(char const* principalType, std::type_info const& productType);
+    void throwOnPutOfWrongType(std::type_info const& wrongType, TypeID const& rightType);
+    void throwOnPrematureRead(char const* principalType,
+                              TypeID const& productType,
+                              std::string const& moduleLabel,
+                              std::string const& productInstanceName);
+    void throwOnPrematureRead(char const* principalType, TypeID const& productType);
+
+    void throwOnPrematureRead(char const* principalType, TypeID const& productType, EDGetToken);
+
+  }  // namespace principal_get_adapter_detail
   class PrincipalGetAdapter {
   public:
-    PrincipalGetAdapter(Principal const& pcpl,
-		 ModuleDescription const& md, bool isComplete);
+    PrincipalGetAdapter(Principal const& pcpl, ModuleDescription const& md, bool isComplete);
 
     ~PrincipalGetAdapter();
 
-    PrincipalGetAdapter(PrincipalGetAdapter const&) = delete; // Disallow copying and moving
-    PrincipalGetAdapter& operator=(PrincipalGetAdapter const&) = delete; // Disallow copying and moving
+    PrincipalGetAdapter(PrincipalGetAdapter const&) = delete;             // Disallow copying and moving
+    PrincipalGetAdapter& operator=(PrincipalGetAdapter const&) = delete;  // Disallow copying and moving
 
     //size_t size() const;
-    
-    void setConsumer(EDConsumerBase const* iConsumer) {
-      consumer_ = iConsumer;
-    }
-    
-    void setSharedResourcesAcquirer(SharedResourcesAcquirer* iSra) {
-      resourcesAcquirer_ = iSra;
-    }
 
-    void setProducer(ProducerBase const* iProd) {
-      prodBase_ = iProd;
-    }
+    void setConsumer(EDConsumerBase const* iConsumer) { consumer_ = iConsumer; }
 
-    size_t numberOfProductsConsumed() const ;
-    
-    bool isComplete() const { return isComplete_;}
+    void setSharedResourcesAcquirer(SharedResourcesAcquirer* iSra) { resourcesAcquirer_ = iSra; }
+
+    void setProducer(ProducerBase const* iProd) { prodBase_ = iProd; }
+
+    size_t numberOfProductsConsumed() const;
+
+    bool isComplete() const { return isComplete_; }
 
     template <typename PROD>
-    bool 
-    checkIfComplete() const;
-    
+    bool checkIfComplete() const;
+
     Transition transition() const;
 
     template <typename PROD>
-    void 
-    getManyByType(std::vector<Handle<PROD> >& results, ModuleCallingContext const* mcc) const;
+    void getManyByType(std::vector<Handle<PROD> >& results, ModuleCallingContext const* mcc) const;
 
-    ProcessHistory const&
-    processHistory() const;
+    ProcessHistory const& processHistory() const;
 
-    Principal const& principal() const {return principal_;}
+    Principal const& principal() const { return principal_; }
 
-    BranchDescription const&
-    getBranchDescription(TypeID const& type, std::string const& productInstanceName) const;
+    BranchDescription const& getBranchDescription(TypeID const& type, std::string const& productInstanceName) const;
 
-    EDPutToken::value_type
-    getPutTokenIndex(TypeID const& type, std::string const& productInstanceName) const;
+    EDPutToken::value_type getPutTokenIndex(TypeID const& type, std::string const& productInstanceName) const;
 
     TypeID const& getTypeIDForPutTokenIndex(EDPutToken::value_type index) const;
     std::string const& productInstanceLabel(EDPutToken) const;
-    typedef std::vector<BasicHandle>  BasicHandleVec;
+    typedef std::vector<BasicHandle> BasicHandleVec;
 
-    BranchDescription const&
-    getBranchDescription(unsigned int iPutTokenIndex) const;
+    BranchDescription const& getBranchDescription(unsigned int iPutTokenIndex) const;
     ProductID const& getProductID(unsigned int iPutTokenIndex) const;
-    
-    std::vector<edm::ProductResolverIndex> const&
-    putTokenIndexToProductResolverIndex() const ;
-    
+
+    std::vector<edm::ProductResolverIndex> const& putTokenIndexToProductResolverIndex() const;
+
     //uses the EDPutToken index
     std::vector<bool> const& recordProvenanceList() const;
     //------------------------------------------------------------
@@ -200,37 +184,30 @@ namespace edm {
     // The following 'get' functions serve to isolate the PrincipalGetAdapter class
     // from the Principal class.
 
-    BasicHandle 
-    getByLabel_(TypeID const& tid, InputTag const& tag,
-                ModuleCallingContext const* mcc) const;
-
-    BasicHandle 
-    getByLabel_(TypeID const& tid,
-                std::string const& label,
-                std::string const& instance,
-                std::string const& process,
-                ModuleCallingContext const* mcc) const;
-
-    BasicHandle
-    getByToken_(TypeID const& id, KindOfType kindOfType, EDGetToken token,
-                ModuleCallingContext const* mcc) const;
-
-    BasicHandle
-    getMatchingSequenceByLabel_(TypeID const& typeID,
-                                InputTag const& tag,
-                                ModuleCallingContext const* mcc) const;
-
-    BasicHandle
-    getMatchingSequenceByLabel_(TypeID const& typeID,
-                                std::string const& label,
-                                std::string const& instance,
-                                std::string const& process,
-                                ModuleCallingContext const* mcc) const;
-    
-    void 
-    getManyByType_(TypeID const& tid, 
-		   BasicHandleVec& results,
-                   ModuleCallingContext const* mcc) const;
+    BasicHandle getByLabel_(TypeID const& tid, InputTag const& tag, ModuleCallingContext const* mcc) const;
+
+    BasicHandle getByLabel_(TypeID const& tid,
+                            std::string const& label,
+                            std::string const& instance,
+                            std::string const& process,
+                            ModuleCallingContext const* mcc) const;
+
+    BasicHandle getByToken_(TypeID const& id,
+                            KindOfType kindOfType,
+                            EDGetToken token,
+                            ModuleCallingContext const* mcc) const;
+
+    BasicHandle getMatchingSequenceByLabel_(TypeID const& typeID,
+                                            InputTag const& tag,
+                                            ModuleCallingContext const* mcc) const;
+
+    BasicHandle getMatchingSequenceByLabel_(TypeID const& typeID,
+                                            std::string const& label,
+                                            std::string const& instance,
+                                            std::string const& process,
+                                            ModuleCallingContext const* mcc) const;
+
+    void getManyByType_(TypeID const& tid, BasicHandleVec& results, ModuleCallingContext const* mcc) const;
 
     // Also isolates the PrincipalGetAdapter class
     // from the Principal class.
@@ -242,15 +219,12 @@ namespace edm {
     // Is this an Event, a LuminosityBlock, or a Run.
     BranchType const& branchType() const;
 
-    BasicHandle
-    makeFailToGetException(KindOfType,TypeID const&,EDGetToken) const;
+    BasicHandle makeFailToGetException(KindOfType, TypeID const&, EDGetToken) const;
+
+    void throwAmbiguousException(TypeID const& productType, EDGetToken token) const;
 
-    void
-    throwAmbiguousException(TypeID const& productType, EDGetToken token) const;
+    void throwUnregisteredPutException(TypeID const& type, std::string const& productInstanceLabel) const;
 
-    void
-    throwUnregisteredPutException(TypeID const& type,
-                                  std::string const& productInstanceLabel) const;
   private:
     //------------------------------------------------------------
     // Data members
@@ -263,22 +237,19 @@ namespace edm {
     // Each PrincipalGetAdapter must have a description of the module executing the
     // "transaction" which the PrincipalGetAdapter represents.
     ModuleDescription const& md_;
-    
+
     EDConsumerBase const* consumer_;
-    SharedResourcesAcquirer* resourcesAcquirer_; // We do not use propagate_const because the acquirer is itself mutable.
+    SharedResourcesAcquirer* resourcesAcquirer_;  // We do not use propagate_const because the acquirer is itself mutable.
     ProducerBase const* prodBase_ = nullptr;
     bool isComplete_;
   };
 
   template <typename PROD>
-  inline
-  std::ostream& 
-  operator<<(std::ostream& os, Handle<PROD> const& h) {
+  inline std::ostream& operator<<(std::ostream& os, Handle<PROD> const& h) {
     os << h.product() << " " << h.provenance() << " " << h.id();
     return os;
   }
 
-
   //------------------------------------------------------------
   // Metafunction support for compile-time selection of code used in
   // PrincipalGetAdapter::put member template.
@@ -294,23 +265,25 @@ namespace edm {
   // no such member function.
 
   namespace detail {
-    using no_tag = std::false_type; // type indicating FALSE
-    using yes_tag = std::true_type; // type indicating TRUE
+    using no_tag = std::false_type;  // type indicating FALSE
+    using yes_tag = std::true_type;  // type indicating TRUE
 
     // Definitions forthe following struct and function templates are
     // not needed; we only require the declarations.
-    template <typename T, void (T::*)()>  struct postinsert_function;
-    template <typename T> no_tag  has_postinsert_helper(...);
-    template <typename T> yes_tag has_postinsert_helper(postinsert_function<T, &T::post_insert> * p);
-
-
-    template<typename T>
+    template <typename T, void (T::*)()>
+    struct postinsert_function;
+    template <typename T>
+    no_tag has_postinsert_helper(...);
+    template <typename T>
+    yes_tag has_postinsert_helper(postinsert_function<T, &T::post_insert>* p);
+
+    template <typename T>
     struct has_postinsert {
       static constexpr bool value = std::is_same<decltype(has_postinsert_helper<T>(nullptr)), yes_tag>::value &&
-	!std::is_base_of<DoNotSortUponInsertion, T>::value;
+                                    !std::is_base_of<DoNotSortUponInsertion, T>::value;
     };
 
-  }
+  }  // namespace detail
 
   //------------------------------------------------------------
 
@@ -325,7 +298,7 @@ namespace edm {
 
   template <typename T>
   struct DoNotPostInsert {
-    void operator()(T*) const { }
+    void operator()(T*) const {}
   };
 
   // Implementation of  PrincipalGetAdapter  member templates. See  PrincipalGetAdapter.cc for the
@@ -333,20 +306,16 @@ namespace edm {
   //
 
   template <typename PROD>
-  inline
-  bool 
-  PrincipalGetAdapter::checkIfComplete() const { 
+  inline bool PrincipalGetAdapter::checkIfComplete() const {
     return isComplete() || !detail::has_mergeProduct_function<PROD>::value;
   }
 
   template <typename PROD>
-  inline
-  void 
-  PrincipalGetAdapter::getManyByType(std::vector<Handle<PROD> >& results,
-                                     ModuleCallingContext const* mcc) const { 
+  inline void PrincipalGetAdapter::getManyByType(std::vector<Handle<PROD> >& results,
+                                                 ModuleCallingContext const* mcc) const {
     BasicHandleVec bhv;
     this->getManyByType_(TypeID(typeid(PROD)), bhv, mcc);
-    
+
     // Go through the returned handles; for each element,
     //   1. create a Handle<PROD> and
     //
@@ -370,5 +339,5 @@ namespace edm {
     }
     results.swap(products);
   }
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ProcessMatch.h b/FWCore/Framework/interface/ProcessMatch.h
index 8a0216e73da67..1ed859becb0c0 100644
--- a/FWCore/Framework/interface/ProcessMatch.h
+++ b/FWCore/Framework/interface/ProcessMatch.h
@@ -16,17 +16,16 @@ See comments in the file GetterOfProducts.h for a description.
 
 namespace edm {
 
-   class ProcessMatch {
-   public:
-
-      ProcessMatch(std::string const& processName) : processName_(processName) { }
-
-      bool operator()(edm::BranchDescription const& branchDescription) {
-         return branchDescription.processName() == processName_ || processName_ == "*";
-      }
-
-   private:
-      std::string processName_;
-   };
-}
+  class ProcessMatch {
+  public:
+    ProcessMatch(std::string const& processName) : processName_(processName) {}
+
+    bool operator()(edm::BranchDescription const& branchDescription) {
+      return branchDescription.processName() == processName_ || processName_ == "*";
+    }
+
+  private:
+    std::string processName_;
+  };
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ProcessingController.h b/FWCore/Framework/interface/ProcessingController.h
index 6509adacf19e3..d0ed2876fa36a 100644
--- a/FWCore/Framework/interface/ProcessingController.h
+++ b/FWCore/Framework/interface/ProcessingController.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     ProcessingController
-// 
+//
 /**\class ProcessingController ProcessingController.h FWCore/Framework/interface/ProcessingController.h
 
  Description: Interface used by an EDLooper to specify what event we should process next
@@ -25,83 +25,78 @@
 
 // forward declarations
 namespace edm {
-   
-   class ProcessingController {
-      
-   public:
-      enum ForwardState {
-         kEventsAheadInFile,
-         kNextFileExists, // but no events ahead in this file
-         kAtLastEvent,
-         kUnknownForward // returned by a source which is not random accessible
-      };
-
-      enum ReverseState {
-         kEventsBackwardsInFile,
-         kPreviousFileExists, // but no events backwards in this file
-         kAtFirstEvent,
-         kUnknownReverse // returned by a source which is not random accessible
-      };
-
-      ProcessingController(ForwardState forwardState, ReverseState reverseState, bool iCanRandomAccess);
-      //virtual ~ProcessingController();
-      
-      // ---------- const member functions ---------------------
-
-      ///Returns the present state of processing
-      ForwardState forwardState() const;
-      ReverseState reverseState() const;
-
-      ///Returns 'true' if the job's source can randomly access
-      bool canRandomAccess() const;
-
-      enum Transition {
-         kToNextEvent,
-         kToPreviousEvent,
-         kToSpecifiedEvent
-      };
-      
-      Transition requestedTransition() const;
-      
-      ///If 'setTransitionToEvent was called this returns the value passed,
-      /// else it returns an invalid EventID
-      edm::EventID specifiedEventTransition() const;
-
-      bool lastOperationSucceeded() const;
-
-      // ---------- static member functions --------------------
-      
-      // ---------- member functions ---------------------------
-      
-      /** Tells the framework that we should go onto the next event in the sequence.
+
+  class ProcessingController {
+  public:
+    enum ForwardState {
+      kEventsAheadInFile,
+      kNextFileExists,  // but no events ahead in this file
+      kAtLastEvent,
+      kUnknownForward  // returned by a source which is not random accessible
+    };
+
+    enum ReverseState {
+      kEventsBackwardsInFile,
+      kPreviousFileExists,  // but no events backwards in this file
+      kAtFirstEvent,
+      kUnknownReverse  // returned by a source which is not random accessible
+    };
+
+    ProcessingController(ForwardState forwardState, ReverseState reverseState, bool iCanRandomAccess);
+    //virtual ~ProcessingController();
+
+    // ---------- const member functions ---------------------
+
+    ///Returns the present state of processing
+    ForwardState forwardState() const;
+    ReverseState reverseState() const;
+
+    ///Returns 'true' if the job's source can randomly access
+    bool canRandomAccess() const;
+
+    enum Transition { kToNextEvent, kToPreviousEvent, kToSpecifiedEvent };
+
+    Transition requestedTransition() const;
+
+    ///If 'setTransitionToEvent was called this returns the value passed,
+    /// else it returns an invalid EventID
+    edm::EventID specifiedEventTransition() const;
+
+    bool lastOperationSucceeded() const;
+
+    // ---------- static member functions --------------------
+
+    // ---------- member functions ---------------------------
+
+    /** Tells the framework that we should go onto the next event in the sequence.
        If there is no next event the job will drop out of the event loop.
        */
-      void setTransitionToNextEvent();
-      
-      /** Tells the framework we should backup and run the previous event seen in the sequence.
+    void setTransitionToNextEvent();
+
+    /** Tells the framework we should backup and run the previous event seen in the sequence.
        If you are already at the first event the job will drop out of the event loop
        */
-      void setTransitionToPreviousEvent();
-      
-      /** Tells the framework that the next event to processes should be iID.
+    void setTransitionToPreviousEvent();
+
+    /** Tells the framework that the next event to processes should be iID.
        If event iID can not be found in the source, the job will drop out of the event loop.
        */
-      void setTransitionToEvent( edm::EventID const& iID);
-
-      void setLastOperationSucceeded(bool value);
-
-   private:
-      ProcessingController(const ProcessingController&) = delete; // stop default
-      
-      const ProcessingController& operator=(const ProcessingController&) = delete; // stop default
-      
-      // ---------- member data --------------------------------
-      ForwardState forwardState_;
-      ReverseState reverseState_;
-      Transition transition_;
-      EventID specifiedEvent_;
-      bool canRandomAccess_;
-      bool lastOperationSucceeded_;
-   };
-}
+    void setTransitionToEvent(edm::EventID const& iID);
+
+    void setLastOperationSucceeded(bool value);
+
+  private:
+    ProcessingController(const ProcessingController&) = delete;  // stop default
+
+    const ProcessingController& operator=(const ProcessingController&) = delete;  // stop default
+
+    // ---------- member data --------------------------------
+    ForwardState forwardState_;
+    ReverseState reverseState_;
+    Transition transition_;
+    EventID specifiedEvent_;
+    bool canRandomAccess_;
+    bool lastOperationSucceeded_;
+  };
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ProducerBase.h b/FWCore/Framework/interface/ProducerBase.h
index 865b2d4953080..b1a21d1f3f1d6 100644
--- a/FWCore/Framework/interface/ProducerBase.h
+++ b/FWCore/Framework/interface/ProducerBase.h
@@ -24,73 +24,76 @@ namespace edm {
   class Event;
   class LuminosityBlock;
   class Run;
-  
+
   class EDProducer;
   class EDFilter;
   namespace one {
     class EDProducerBase;
     class EDFilterBase;
-  }
+  }  // namespace one
   namespace global {
     class EDProducerBase;
     class EDFilterBase;
-  }
+  }  // namespace global
   namespace limited {
     class EDProducerBase;
     class EDFilterBase;
-  }
+  }  // namespace limited
   namespace stream {
-    template<typename T> class ProducingModuleAdaptorBase;
+    template <typename T>
+    class ProducingModuleAdaptorBase;
   }
-  
-  namespace producerbasehelper{
-    template<typename P> struct PrincipalTraits;
-    template<> struct PrincipalTraits<Run> {
+
+  namespace producerbasehelper {
+    template <typename P>
+    struct PrincipalTraits;
+    template <>
+    struct PrincipalTraits<Run> {
       static constexpr int kBranchType = InRun;
     };
-    template<> struct PrincipalTraits<LuminosityBlock> {
+    template <>
+    struct PrincipalTraits<LuminosityBlock> {
       static constexpr int kBranchType = InLumi;
     };
-    template<> struct PrincipalTraits<Event> {
+    template <>
+    struct PrincipalTraits<Event> {
       static constexpr int kBranchType = InEvent;
     };
-  }
-  
+  }  // namespace producerbasehelper
+
   class ProducerBase : private ProductRegistryHelper {
   public:
     typedef ProductRegistryHelper::TypeLabelList TypeLabelList;
-    ProducerBase ();
+    ProducerBase();
     ~ProducerBase() noexcept(false) override;
- 
+
     /// used by the fwk to register list of products
     std::function<void(BranchDescription const&)> registrationCallback() const;
 
-    void registerProducts(ProducerBase*,
-			ProductRegistry*,
-			ModuleDescription const&);
+    void registerProducts(ProducerBase*, ProductRegistry*, ModuleDescription const&);
 
     using ProductRegistryHelper::produces;
-    using ProductRegistryHelper::typeLabelList;
     using ProductRegistryHelper::recordProvenanceList;
+    using ProductRegistryHelper::typeLabelList;
 
     void callWhenNewProductsRegistered(std::function<void(BranchDescription const&)> const& func) {
-       callWhenNewProductsRegistered_ = func;
+      callWhenNewProductsRegistered_ = func;
     }
-    
-    using ModuleToResolverIndicies = std::unordered_multimap<std::string,
-    std::tuple<edm::TypeID const*, const char*, edm::ProductResolverIndex>>;
+
+    using ModuleToResolverIndicies =
+        std::unordered_multimap<std::string, std::tuple<edm::TypeID const*, const char*, edm::ProductResolverIndex>>;
     void resolvePutIndicies(BranchType iBranchType,
                             ModuleToResolverIndicies const& iIndicies,
                             std::string const& moduleLabel);
-    
+
     std::vector<edm::ProductResolverIndex> const& indiciesForPutProducts(BranchType iBranchType) const {
       return putIndicies_[iBranchType];
     }
-    
-    std::vector<edm::ProductResolverIndex> const&
-    putTokenIndexToProductResolverIndex() const {
+
+    std::vector<edm::ProductResolverIndex> const& putTokenIndexToProductResolverIndex() const {
       return putTokenToResolverIndex_;
     }
+
   private:
     friend class EDProducer;
     friend class EDFilter;
@@ -101,14 +104,15 @@ namespace edm {
     friend class limited::EDProducerBase;
     friend class limited::EDFilterBase;
     friend class PuttableSourceBase;
-    template<typename T> friend class stream::ProducingModuleAdaptorBase;
-    
-    template< typename P>
+    template <typename T>
+    friend class stream::ProducingModuleAdaptorBase;
+
+    template <typename P>
     void commit_(P& iPrincipal) {
       iPrincipal.commit_(putIndicies_[producerbasehelper::PrincipalTraits<P>::kBranchType]);
     }
 
-    template< typename P, typename I>
+    template <typename P, typename I>
     void commit_(P& iPrincipal, I* iID) {
       iPrincipal.commit_(putIndicies_[producerbasehelper::PrincipalTraits<P>::kBranchType], iID);
     }
@@ -117,5 +121,5 @@ namespace edm {
     std::array<std::vector<edm::ProductResolverIndex>, edm::NumBranchTypes> putIndicies_;
     std::vector<edm::ProductResolverIndex> putTokenToResolverIndex_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ProductDeletedException.h b/FWCore/Framework/interface/ProductDeletedException.h
index 6c30d5e87ce86..e479532e05352 100644
--- a/FWCore/Framework/interface/ProductDeletedException.h
+++ b/FWCore/Framework/interface/ProductDeletedException.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     ProductDeletedException
-// 
+//
 /**\class ProductDeletedException ProductDeletedException.h FWCore/Framework/interface/ProductDeletedException.h
 
  Description: Exception thrown if attempt to get data that has been deleted
@@ -26,25 +26,23 @@
 // forward declarations
 namespace edm {
   class ProductDeletedException : public cms::Exception {
-    
   public:
     ProductDeletedException();
     //virtual ~ProductDeletedException();
-    
+
     // ---------- const member functions ---------------------
-    
+
     // ---------- static member functions --------------------
-    
+
     // ---------- member functions ---------------------------
-    
+
   private:
     //ProductDeletedException(const ProductDeletedException&); // stop default
-    
+
     //const ProductDeletedException& operator=(const ProductDeletedException&); // stop default
-    
+
     // ---------- member data --------------------------------
-    
   };
-  
-}
+
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ProductRegistryHelper.h b/FWCore/Framework/interface/ProductRegistryHelper.h
index 7beeb12b59938..0b7ded33120c4 100644
--- a/FWCore/Framework/interface/ProductRegistryHelper.h
+++ b/FWCore/Framework/interface/ProductRegistryHelper.h
@@ -19,7 +19,7 @@ namespace edm {
   class ModuleDescription;
   class ProductRegistry;
   struct DoNotRecordParents;
-  
+
   class ProductRegistryHelper {
   public:
     virtual ~ProductRegistryHelper() noexcept(false);
@@ -29,19 +29,18 @@ namespace edm {
     // record parentage for type T, and false otherwise.
     template <typename T>
     struct has_donotrecordparents {
-      static constexpr bool value =
-      std::is_base_of<DoNotRecordParents,T>::value;
+      static constexpr bool value = std::is_base_of<DoNotRecordParents, T>::value;
     };
 
     struct TypeLabelItem {
       enum class AliasType { kBranchAlias, kSwitchAlias };
 
-      TypeLabelItem (Transition const& transition, TypeID const& tid, std::string pin) :
-	      transition_(transition),
-        typeID_(tid),
-        productInstanceName_(std::move(pin)),
-        branchAlias_(),
-        aliasType_(AliasType::kBranchAlias) {}
+      TypeLabelItem(Transition const& transition, TypeID const& tid, std::string pin)
+          : transition_(transition),
+            typeID_(tid),
+            productInstanceName_(std::move(pin)),
+            branchAlias_(),
+            aliasType_(AliasType::kBranchAlias) {}
       Transition transition_;
       TypeID typeID_;
       std::string productInstanceName_;
@@ -50,9 +49,8 @@ namespace edm {
     };
 
     struct BranchAliasSetter {
-      BranchAliasSetter(TypeLabelItem& iItem, EDPutToken iToken):
-      value_(iItem), token_(std::move(iToken)) {}
-      
+      BranchAliasSetter(TypeLabelItem& iItem, EDPutToken iToken) : value_(iItem), token_(std::move(iToken)) {}
+
       BranchAliasSetter& setBranchAlias(std::string alias) {
         value_.branchAlias_ = std::move(alias);
         return *this;
@@ -64,120 +62,116 @@ namespace edm {
       }
       TypeLabelItem& value_;
       EDPutToken token_;
-      
-      operator EDPutToken() { return token_;}
+
+      operator EDPutToken() { return token_; }
     };
 
     template <typename T>
     struct BranchAliasSetterT {
-      BranchAliasSetterT(TypeLabelItem& iItem, EDPutTokenT<T> iToken):
-      value_(iItem), token_(std::move(iToken)) {}
+      BranchAliasSetterT(TypeLabelItem& iItem, EDPutTokenT<T> iToken) : value_(iItem), token_(std::move(iToken)) {}
+
+      BranchAliasSetterT(BranchAliasSetter&& iS) : value_(iS.value_), token_(iS.token_.index()) {}
 
-      BranchAliasSetterT( BranchAliasSetter&& iS):
-      value_(iS.value_), token_(iS.token_.index()) {}
-      
       BranchAliasSetterT<T>& setBranchAlias(std::string alias) {
         value_.branchAlias_ = std::move(alias);
         return *this;
       }
       TypeLabelItem& value_;
       EDPutTokenT<T> token_;
-      
-      operator EDPutTokenT<T>() { return token_;}
+
+      operator EDPutTokenT<T>() { return token_; }
       operator EDPutToken() { return EDPutToken(token_.index()); }
     };
 
     typedef std::vector<TypeLabelItem> TypeLabelList;
 
-    /// used by the fwk to register the list of products of this module 
+    /// used by the fwk to register the list of products of this module
     TypeLabelList const& typeLabelList() const;
-    
-    std::vector<bool> const& recordProvenanceList() const { return recordProvenanceList_;}
-
-    static
-    void addToRegistry(TypeLabelList::const_iterator const& iBegin,
-                             TypeLabelList::const_iterator const& iEnd,
-                             ModuleDescription const& iDesc,
-                             ProductRegistry& iReg,
-                             ProductRegistryHelper* iProd,
-                             bool iIsListener=false);
-
-    /// declare what type of product will make and with which optional label 
+
+    std::vector<bool> const& recordProvenanceList() const { return recordProvenanceList_; }
+
+    static void addToRegistry(TypeLabelList::const_iterator const& iBegin,
+                              TypeLabelList::const_iterator const& iEnd,
+                              ModuleDescription const& iDesc,
+                              ProductRegistry& iReg,
+                              ProductRegistryHelper* iProd,
+                              bool iIsListener = false);
+
+    /// declare what type of product will make and with which optional label
     /** the statement
         \code
            produces<ProductType>("optlabel");
         \endcode
         should be added to the producer ctor for every product */
 
-
-    template <class ProductType> 
+    template <class ProductType>
     BranchAliasSetterT<ProductType> produces() {
       return produces<ProductType, InEvent>(std::string());
     }
 
-    template <class ProductType> 
+    template <class ProductType>
     BranchAliasSetterT<ProductType> produces(std::string instanceName) {
-      return produces<ProductType, InEvent>( std::move(instanceName));
+      return produces<ProductType, InEvent>(std::move(instanceName));
     }
 
-    template <typename ProductType, BranchType B> 
+    template <typename ProductType, BranchType B>
     BranchAliasSetterT<ProductType> produces() {
       return produces<ProductType, B>(std::string());
     }
 
-    template <typename ProductType, BranchType B> 
+    template <typename ProductType, BranchType B>
     BranchAliasSetterT<ProductType> produces(std::string instanceName) {
       TypeID tid(typeid(ProductType));
-      return BranchAliasSetterT<ProductType>{produces<B>(tid,std::move(instanceName),
-                                                         (not has_donotrecordparents<ProductType>::value) and B == InEvent)};
+      return BranchAliasSetterT<ProductType>{
+          produces<B>(tid, std::move(instanceName), (not has_donotrecordparents<ProductType>::value) and B == InEvent)};
     }
 
     template <typename ProductType, Transition B>
     BranchAliasSetterT<ProductType> produces() {
       return produces<ProductType, B>(std::string());
     }
-    
+
     template <typename ProductType, Transition B>
     BranchAliasSetterT<ProductType> produces(std::string instanceName) {
       TypeID tid(typeid(ProductType));
-      return BranchAliasSetterT<ProductType>{produces<B>(tid,std::move(instanceName),
-                                                         (not has_donotrecordparents<ProductType>::value) and B == Transition::Event)};
+      return BranchAliasSetterT<ProductType>{produces<B>(
+          tid, std::move(instanceName), (not has_donotrecordparents<ProductType>::value) and B == Transition::Event)};
     }
 
-   
-    BranchAliasSetter produces(const TypeID& id, std::string instanceName=std::string(), bool recordProvenance = true) {
-      return produces<Transition::Event>(id,std::move(instanceName),recordProvenance);
+    BranchAliasSetter produces(const TypeID& id,
+                               std::string instanceName = std::string(),
+                               bool recordProvenance = true) {
+      return produces<Transition::Event>(id, std::move(instanceName), recordProvenance);
     }
 
     template <BranchType B>
-    BranchAliasSetter produces(const TypeID& id, std::string instanceName=std::string(), bool recordProvenance = true) {
-      unsigned int index =typeLabelList_.size();
+    BranchAliasSetter produces(const TypeID& id,
+                               std::string instanceName = std::string(),
+                               bool recordProvenance = true) {
+      unsigned int index = typeLabelList_.size();
       typeLabelList_.emplace_back(convertToTransition(B), id, std::move(instanceName));
       recordProvenanceList_.push_back(recordProvenance and B == InEvent);
-      return BranchAliasSetter{typeLabelList_.back(),EDPutToken{static_cast<unsigned int>(index)}};
+      return BranchAliasSetter{typeLabelList_.back(), EDPutToken{static_cast<unsigned int>(index)}};
     }
     template <Transition B>
-    BranchAliasSetter produces(const TypeID& id, std::string instanceName=std::string(), bool recordProvenance = true) {
-      unsigned int index =typeLabelList_.size();
+    BranchAliasSetter produces(const TypeID& id,
+                               std::string instanceName = std::string(),
+                               bool recordProvenance = true) {
+      unsigned int index = typeLabelList_.size();
       typeLabelList_.emplace_back(B, id, std::move(instanceName));
       recordProvenanceList_.push_back(recordProvenance and B == Transition::Event);
-      return BranchAliasSetter{typeLabelList_.back(),EDPutToken{ index }};
+      return BranchAliasSetter{typeLabelList_.back(), EDPutToken{index}};
     }
 
-    virtual bool hasAbilityToProduceInRuns() const {
-      return false;
-    }
+    virtual bool hasAbilityToProduceInRuns() const { return false; }
 
-    virtual bool hasAbilityToProduceInLumis() const {
-      return false;
-    }
+    virtual bool hasAbilityToProduceInLumis() const { return false; }
 
   private:
     TypeLabelList typeLabelList_;
     std::vector<bool> recordProvenanceList_;
   };
 
-
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/ProductResolverBase.h b/FWCore/Framework/interface/ProductResolverBase.h
index fc4112a2b0775..810505a20c8d8 100644
--- a/FWCore/Framework/interface/ProductResolverBase.h
+++ b/FWCore/Framework/interface/ProductResolverBase.h
@@ -33,36 +33,37 @@ namespace edm {
 
   class ProductResolverBase {
   public:
-
     class Resolution {
     public:
       static std::uintptr_t constexpr kAmbiguityValue = 0x1;
       static std::uintptr_t constexpr kAmbiguityMask = std::numeric_limits<std::uintptr_t>::max() ^ kAmbiguityValue;
-      explicit Resolution( ProductData const* iData):
-      m_data(iData) {}
-      
+      explicit Resolution(ProductData const* iData) : m_data(iData) {}
+
       bool isAmbiguous() const { return reinterpret_cast<std::uintptr_t>(m_data) == kAmbiguityValue; }
-      
-      ProductData const* data() const { return reinterpret_cast<ProductData const*>(kAmbiguityMask & reinterpret_cast<std::uintptr_t>(m_data)); }
-      
+
+      ProductData const* data() const {
+        return reinterpret_cast<ProductData const*>(kAmbiguityMask & reinterpret_cast<std::uintptr_t>(m_data));
+      }
+
       static Resolution makeAmbiguous() { return Resolution(reinterpret_cast<ProductData const*>(kAmbiguityValue)); }
+
     private:
       ProductData const* m_data;
     };
-    
+
     ProductResolverBase();
     virtual ~ProductResolverBase();
 
-    ProductResolverBase(ProductResolverBase const&) = delete; // Disallow copying and moving
-    ProductResolverBase& operator=(ProductResolverBase const&) = delete; // Disallow copying and moving
+    ProductResolverBase(ProductResolverBase const&) = delete;             // Disallow copying and moving
+    ProductResolverBase& operator=(ProductResolverBase const&) = delete;  // Disallow copying and moving
 
     Resolution resolveProduct(Principal const& principal,
                               bool skipCurrentProcess,
                               SharedResourcesAcquirer* sra,
                               ModuleCallingContext const* mcc) const {
-      return resolveProduct_( principal, skipCurrentProcess, sra, mcc);
+      return resolveProduct_(principal, skipCurrentProcess, sra, mcc);
     }
-    
+
     /** oDataFetchedIsValid is allowed to be nullptr in which case no value will be assigned
      */
     void prefetchAsync(WaitingTask* waitTask,
@@ -74,18 +75,17 @@ namespace edm {
       return prefetchAsync_(waitTask, principal, skipCurrentProcess, token, sra, mcc);
     }
 
-    void retrieveAndMerge(Principal const& principal, MergeableRunProductMetadata const* mergeableRunProductMetadata) const {
+    void retrieveAndMerge(Principal const& principal,
+                          MergeableRunProductMetadata const* mergeableRunProductMetadata) const {
       retrieveAndMerge_(principal, mergeableRunProductMetadata);
     }
     void resetProductData() { resetProductData_(false); }
 
-    void unsafe_deleteProduct() const {
-      const_cast<ProductResolverBase*>(this)->resetProductData_(true);
-    }
-    
+    void unsafe_deleteProduct() const { const_cast<ProductResolverBase*>(this)->resetProductData_(true); }
+
     // product is not available (dropped or never created)
-    bool productUnavailable() const {return productUnavailable_();}
-    
+    bool productUnavailable() const { return productUnavailable_(); }
+
     // returns true if resolveProduct was already called for this product
     bool productResolved() const { return productResolved_(); }
 
@@ -94,50 +94,58 @@ namespace edm {
 
     // Only returns true if the module is unscheduled and was not run
     //   all other cases return false
-    bool unscheduledWasNotRun() const {return unscheduledWasNotRun_();}
-    
+    bool unscheduledWasNotRun() const { return unscheduledWasNotRun_(); }
+
     // Product was deleted early in order to save memory
-    bool productWasDeleted() const {return productWasDeleted_();}
-    
-    bool productWasFetchedAndIsValid(bool iSkipCurrentProcess) const { return productWasFetchedAndIsValid_(iSkipCurrentProcess); }
+    bool productWasDeleted() const { return productWasDeleted_(); }
+
+    bool productWasFetchedAndIsValid(bool iSkipCurrentProcess) const {
+      return productWasFetchedAndIsValid_(iSkipCurrentProcess);
+    }
 
     // Retrieves pointer to the per event(lumi)(run) provenance.
     ProductProvenance const* productProvenancePtr() const { return productProvenancePtr_(); }
 
     // Retrieves a reference to the event independent provenance.
-    BranchDescription const& branchDescription() const {return branchDescription_();}
+    BranchDescription const& branchDescription() const { return branchDescription_(); }
 
     // Retrieves a reference to the event independent provenance.
-    bool singleProduct() const {return singleProduct_();}
+    bool singleProduct() const { return singleProduct_(); }
 
     // Sets the pointer to the event independent provenance.
-    void resetBranchDescription(std::shared_ptr<BranchDescription const> bd) {resetBranchDescription_(bd);}
+    void resetBranchDescription(std::shared_ptr<BranchDescription const> bd) { resetBranchDescription_(bd); }
 
     // Retrieves a reference to the module label.
-    std::string const& moduleLabel() const {return branchDescription().moduleLabel();}
+    std::string const& moduleLabel() const { return branchDescription().moduleLabel(); }
 
     // Same as moduleLabel except in the case of an AliasProductResolver, in which
     // case it resolves the module which actually produces the product and returns
     // its module label
-    std::string const& resolvedModuleLabel() const {return resolvedModuleLabel_();}
+    std::string const& resolvedModuleLabel() const { return resolvedModuleLabel_(); }
 
     // Retrieves a reference to the product instance name
-    std::string const& productInstanceName() const {return branchDescription().productInstanceName();}
+    std::string const& productInstanceName() const { return branchDescription().productInstanceName(); }
 
     // Retrieves a reference to the process name
-    std::string const& processName() const {return branchDescription().processName();}
+    std::string const& processName() const { return branchDescription().processName(); }
 
     // Retrieves pointer to a class containing both the event independent and the per even provenance.
     Provenance const* provenance() const;
 
     // Retrieves pointer to a class containing the event independent provenance.
-    StableProvenance const* stableProvenance() const {return &provenance()->stable();}
+    StableProvenance const* stableProvenance() const { return &provenance()->stable(); }
 
     // Initializes the event independent portion of the provenance, plus the process history ID, the product ID, and the provRetriever.
-    void setProvenance(ProductProvenanceRetriever const* provRetriever, ProcessHistory const& ph, ProductID const& pid) { setProvenance_(provRetriever, ph, pid); }
+    void setProvenance(ProductProvenanceRetriever const* provRetriever,
+                       ProcessHistory const& ph,
+                       ProductID const& pid) {
+      setProvenance_(provRetriever, ph, pid);
+    }
 
     // Initializes the portion of the provenance related to mergeable run products.
-    void setMergeableRunProductMetadata(MergeableRunProductMetadata const* mrpm) { setMergeableRunProductMetadata_(mrpm); }
+    void setMergeableRunProductMetadata(MergeableRunProductMetadata const* mrpm) {
+      setMergeableRunProductMetadata_(mrpm);
+    }
 
     // Initializes the process history.
     void setProcessHistory(ProcessHistory const& ph) { setProcessHistory_(ph); }
@@ -151,18 +159,17 @@ namespace edm {
     TypeID productType() const;
 
     // Retrieves the product ID of the product.
-    ProductID const& productID() const {return provenance()->productID();}
+    ProductID const& productID() const { return provenance()->productID(); }
 
     // Puts the product into the ProductResolver.
-    void putProduct(std::unique_ptr<WrapperBase> edp) const {
-      putProduct_(std::move(edp));
-    }
+    void putProduct(std::unique_ptr<WrapperBase> edp) const { putProduct_(std::move(edp)); }
 
     // If the product already exists we merge, else will put
-    void putOrMergeProduct(std::unique_ptr<WrapperBase> edp, MergeableRunProductMetadata const* mergeableRunProductMetadata = nullptr) const {
+    void putOrMergeProduct(std::unique_ptr<WrapperBase> edp,
+                           MergeableRunProductMetadata const* mergeableRunProductMetadata = nullptr) const {
       putOrMergeProduct_(std::move(edp), mergeableRunProductMetadata);
     }
-    
+
     virtual void connectTo(ProductResolverBase const&, Principal const*) = 0;
     virtual void setupUnscheduled(UnscheduledConfigurator const&);
 
@@ -177,9 +184,9 @@ namespace edm {
                                 ServiceToken const& token,
                                 SharedResourcesAcquirer* sra,
                                 ModuleCallingContext const* mcc) const = 0;
-    
-    virtual void retrieveAndMerge_(Principal const& principal, MergeableRunProductMetadata const* mergeableRunProductMetadata) const;
 
+    virtual void retrieveAndMerge_(Principal const& principal,
+                                   MergeableRunProductMetadata const* mergeableRunProductMetadata) const;
 
     virtual bool unscheduledWasNotRun_() const = 0;
     virtual bool productUnavailable_() const = 0;
@@ -188,12 +195,15 @@ namespace edm {
     virtual bool productWasFetchedAndIsValid_(bool iSkipCurrentProcess) const = 0;
 
     virtual void putProduct_(std::unique_ptr<WrapperBase> edp) const = 0;
-    virtual void putOrMergeProduct_(std::unique_ptr<WrapperBase> edp, MergeableRunProductMetadata const* mergeableRunProductMetadata) const = 0;
+    virtual void putOrMergeProduct_(std::unique_ptr<WrapperBase> edp,
+                                    MergeableRunProductMetadata const* mergeableRunProductMetadata) const = 0;
     virtual BranchDescription const& branchDescription_() const = 0;
     virtual void resetBranchDescription_(std::shared_ptr<BranchDescription const> bd) = 0;
     virtual Provenance const* provenance_() const = 0;
     virtual std::string const& resolvedModuleLabel_() const = 0;
-    virtual void setProvenance_(ProductProvenanceRetriever const* provRetriever, ProcessHistory const& ph, ProductID const& pid) = 0;
+    virtual void setProvenance_(ProductProvenanceRetriever const* provRetriever,
+                                ProcessHistory const& ph,
+                                ProductID const& pid) = 0;
     virtual void setMergeableRunProductMetadata_(MergeableRunProductMetadata const*);
     virtual void setProcessHistory_(ProcessHistory const& ph) = 0;
     virtual ProductProvenance const* productProvenancePtr_() const = 0;
@@ -201,12 +211,10 @@ namespace edm {
     virtual bool singleProduct_() const = 0;
   };
 
-  inline
-  std::ostream&
-  operator<<(std::ostream& os, ProductResolverBase const& phb) {
+  inline std::ostream& operator<<(std::ostream& os, ProductResolverBase const& phb) {
     phb.write(os);
     return os;
   }
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/ProductResolverIndexAndSkipBit.h b/FWCore/Framework/interface/ProductResolverIndexAndSkipBit.h
index ec7272e981685..e657d71008421 100644
--- a/FWCore/Framework/interface/ProductResolverIndexAndSkipBit.h
+++ b/FWCore/Framework/interface/ProductResolverIndexAndSkipBit.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::ProductResolverIndexAndSkipBit
-// 
+//
 /**\class edm::ProductResolverIndexAndSkipBit
 
  Description:  This class holds a ProductIndexHolder and a boolean value
@@ -27,24 +27,20 @@ namespace edm {
 
   class ProductResolverIndexAndSkipBit {
   public:
-    ProductResolverIndexAndSkipBit(ProductResolverIndex productResolverIndex, bool skipCurrentProcess) :
-      value_(skipCurrentProcess ? s_skipMask | productResolverIndex :
-                                  ~s_skipMask & productResolverIndex) { }
-      ProductResolverIndex productResolverIndex() const {
-        bool specialIndexValue = (value_ & ProductResolverIndexValuesBit) != 0;
-        return specialIndexValue ? value_ | s_skipMask :
-                                   value_ & ~s_skipMask;
-      }
-      bool skipCurrentProcess() const { return (value_ & s_skipMask) != 0; }
-
-      bool operator==(ProductResolverIndexAndSkipBit const& r) {
-        return value_ == r.value_;
-      }
+    ProductResolverIndexAndSkipBit(ProductResolverIndex productResolverIndex, bool skipCurrentProcess)
+        : value_(skipCurrentProcess ? s_skipMask | productResolverIndex : ~s_skipMask & productResolverIndex) {}
+    ProductResolverIndex productResolverIndex() const {
+      bool specialIndexValue = (value_ & ProductResolverIndexValuesBit) != 0;
+      return specialIndexValue ? value_ | s_skipMask : value_ & ~s_skipMask;
+    }
+    bool skipCurrentProcess() const { return (value_ & s_skipMask) != 0; }
+
+    bool operator==(ProductResolverIndexAndSkipBit const& r) { return value_ == r.value_; }
 
   private:
-      static const unsigned int s_skipMask = 1U << 31;
+    static const unsigned int s_skipMask = 1U << 31;
 
-      unsigned int value_;
+    unsigned int value_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ProductSelector.h b/FWCore/Framework/interface/ProductSelector.h
index 1736882be7891..569761ee4ea7a 100644
--- a/FWCore/Framework/interface/ProductSelector.h
+++ b/FWCore/Framework/interface/ProductSelector.h
@@ -28,15 +28,14 @@ namespace edm {
     ProductSelector();
 
     // N.B.: we assume there are not null pointers in the vector allBranches.
-    void initialize(ProductSelectorRules const& rules,
-		    std::vector<BranchDescription const*> const& branchDescriptions);
+    void initialize(ProductSelectorRules const& rules, std::vector<BranchDescription const*> const& branchDescriptions);
 
     bool selected(BranchDescription const& desc) const;
 
     // Printout intended for debugging purposes.
     void print(std::ostream& os) const;
 
-    bool initialized() const {return initialized_;}
+    bool initialized() const { return initialized_; }
 
     static void checkForDuplicateKeptBranch(BranchDescription const& desc,
                                             std::map<BranchID, BranchDescription const*>& trueBranchIDToKeptBranchDesc);
@@ -46,7 +45,6 @@ namespace edm {
                                   std::map<BranchID::value_type, BranchID::value_type>& droppedBranchIDToKeptBranchID_);
 
   private:
-
     // We keep a sorted collection of branch names, indicating the
     // products which are to be selected.
 
@@ -60,11 +58,8 @@ namespace edm {
     bool initialized_;
   };
 
-  std::ostream&
-  operator<< (std::ostream& os, const ProductSelector& gs);
-
-} // namespace edm
-
+  std::ostream& operator<<(std::ostream& os, const ProductSelector& gs);
 
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/ProductSelectorRules.h b/FWCore/Framework/interface/ProductSelectorRules.h
index cb8a64626fd0c..bfb6da0c97aaf 100644
--- a/FWCore/Framework/interface/ProductSelectorRules.h
+++ b/FWCore/Framework/interface/ProductSelectorRules.h
@@ -23,61 +23,64 @@ namespace edm {
 
   class ProductSelectorRules {
   public:
-    ProductSelectorRules(ParameterSet const& pset, std::string const& parameterName, std::string const& parameterOwnerName);
+    ProductSelectorRules(ParameterSet const& pset,
+                         std::string const& parameterName,
+                         std::string const& parameterOwnerName);
     //--------------------------------------------------
     // BranchSelectState is a struct which associates a BranchDescription
     // (*desc) with a bool indicating whether or not the branch with
     // that name is to be selected.  Note that desc may not be null.
     struct BranchSelectState {
       edm::BranchDescription const* desc;
-      bool                          selectMe;
-  
+      bool selectMe;
+
       // N.B.: We assume bd is not null.
-      explicit BranchSelectState (edm::BranchDescription const* bd) : 
-        desc(bd), 
-        selectMe(false)
-      { }
+      explicit BranchSelectState(edm::BranchDescription const* bd) : desc(bd), selectMe(false) {}
     };
-  
+
     void applyToAll(std::vector<BranchSelectState>& branchstates) const;
 
-    bool keepAll() const {return keepAll_;}
+    bool keepAll() const { return keepAll_; }
 
-    static void fillDescription(ParameterSetDescription& desc, char const* parameterName, std::vector<std::string> const& defaultStrings = defaultSelectionStrings());
+    static void fillDescription(ParameterSetDescription& desc,
+                                char const* parameterName,
+                                std::vector<std::string> const& defaultStrings = defaultSelectionStrings());
 
     static const std::vector<std::string>& defaultSelectionStrings();
+
   private:
     class Rule {
     public:
       Rule(std::string const& s, std::string const& parameterName, std::string const& owner);
-  
+
       // Apply the rule to all the given branch states. This may modify
       // the given branch states.
       void applyToAll(std::vector<BranchSelectState>& branchstates) const;
-  
+
       // Apply the rule to the given BranchDescription. The return value
       // is the value to which the 'select bit' should be set, according
       // to application of this rule.
       //bool applyToOne(BranchDescription const* branch) const;
-  
+
       // If this rule applies to the given BranchDescription, then
       // modify 'result' to match the rule's select flag. If the rule does
       // not apply, do not modify 'result'.
       void applyToOne(BranchDescription const* branch, bool& result) const;
-  
+
       // Return the answer to the question: "Does the rule apply to this
       // BranchDescription?"
       bool appliesTo(BranchDescription const* branch) const;
-  
+
     private:
       // selectflag_ carries the value to which we should set the 'select
       // bit' if this rule matches.
-      bool   selectflag_;
+      bool selectflag_;
       std::regex productType_;
       std::regex moduleLabel_;
       std::regex instanceName_;
       std::regex processName_;
     };
+
   private:
     std::vector<Rule> rules_;
     std::string parameterName_;
@@ -85,8 +88,6 @@ namespace edm {
     bool keepAll_;
   };
 
-} // namespace edm
-
-
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/ProxyArgumentFactoryTemplate.h b/FWCore/Framework/interface/ProxyArgumentFactoryTemplate.h
index 237d8d1a380a2..1bbd1571b388a 100644
--- a/FWCore/Framework/interface/ProxyArgumentFactoryTemplate.h
+++ b/FWCore/Framework/interface/ProxyArgumentFactoryTemplate.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     ProxyArgumentFactoryTemplate
-// 
+//
 /**\class ProxyArgumentFactoryTemplate ProxyArgumentFactoryTemplate.h FWCore/Framework/interface/ProxyArgumentFactoryTemplate.h
 
  Description: <one line class summary>
@@ -28,40 +28,36 @@
 
 // forward declarations
 namespace edm {
-   namespace eventsetup {
-      
-template <class T, class ArgT>
-class ProxyArgumentFactoryTemplate : public ProxyFactoryBase
-{
+  namespace eventsetup {
 
-   public:
+    template <class T, class ArgT>
+    class ProxyArgumentFactoryTemplate : public ProxyFactoryBase {
+    public:
       typedef typename T::record_type record_type;
 
       ProxyArgumentFactoryTemplate(ArgT iArg) : arg_(iArg) {}
       //virtual ~ProxyArgumentFactoryTemplate()
 
       // ---------- const member functions ---------------------
-      std::unique_ptr<DataProxy> makeProxy() const override {
-         return std::make_unique<T>(arg_);
-      }
-            
+      std::unique_ptr<DataProxy> makeProxy() const override { return std::make_unique<T>(arg_); }
+
       DataKey makeKey(const std::string& iName) const override {
-         return DataKey(DataKey::makeTypeTag< typename T::value_type>(),iName.c_str());
+        return DataKey(DataKey::makeTypeTag<typename T::value_type>(), iName.c_str());
       }
-      
+
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------
 
-   private:
-      ProxyArgumentFactoryTemplate(const ProxyArgumentFactoryTemplate&) = delete; // stop default
+    private:
+      ProxyArgumentFactoryTemplate(const ProxyArgumentFactoryTemplate&) = delete;  // stop default
 
-      const ProxyArgumentFactoryTemplate& operator=(const ProxyArgumentFactoryTemplate&) = delete; // stop default
+      const ProxyArgumentFactoryTemplate& operator=(const ProxyArgumentFactoryTemplate&) = delete;  // stop default
 
       // ---------- member data --------------------------------
       mutable ArgT arg_;
-};
+    };
 
-   }
-}
+  }  // namespace eventsetup
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ProxyFactoryBase.h b/FWCore/Framework/interface/ProxyFactoryBase.h
index 7d5d158481432..36364491e4e54 100644
--- a/FWCore/Framework/interface/ProxyFactoryBase.h
+++ b/FWCore/Framework/interface/ProxyFactoryBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     ProxyFactoryBase
-// 
+//
 /**\class ProxyFactoryBase ProxyFactoryBase.h FWCore/Framework/interface/ProxyFactoryBase.h
 
  Description: <one line class summary>
@@ -27,33 +27,30 @@
 
 // forward declarations
 namespace edm {
-   namespace eventsetup {
-      class DataProxy;
-class ProxyFactoryBase
-{
-
-   public:
+  namespace eventsetup {
+    class DataProxy;
+    class ProxyFactoryBase {
+    public:
       ProxyFactoryBase() {}
       virtual ~ProxyFactoryBase() {}
 
       // ---------- const member functions ---------------------
       virtual std::unique_ptr<DataProxy> makeProxy() const = 0;
-      
+
       virtual DataKey makeKey(const std::string& iName) const = 0;
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------
 
-   private:
-      ProxyFactoryBase(const ProxyFactoryBase&) = delete; // stop default
+    private:
+      ProxyFactoryBase(const ProxyFactoryBase&) = delete;  // stop default
 
-      const ProxyFactoryBase& operator=(const ProxyFactoryBase&) = delete; // stop default
+      const ProxyFactoryBase& operator=(const ProxyFactoryBase&) = delete;  // stop default
 
       // ---------- member data --------------------------------
+    };
 
-};
-
-   }
-}
+  }  // namespace eventsetup
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/ProxyFactoryTemplate.h b/FWCore/Framework/interface/ProxyFactoryTemplate.h
index 6917c488b476b..fabbccc11487a 100644
--- a/FWCore/Framework/interface/ProxyFactoryTemplate.h
+++ b/FWCore/Framework/interface/ProxyFactoryTemplate.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     ProxyFactoryTemplate
-// 
+//
 /**\class ProxyFactoryTemplate ProxyFactoryTemplate.h FWCore/Framework/interface/ProxyFactoryTemplate.h
 
  Description: <one line class summary>
@@ -28,42 +28,36 @@
 
 // forward declarations
 namespace edm {
-   namespace eventsetup {
-
-template <class T>
-class ProxyFactoryTemplate : public ProxyFactoryBase
-{
+  namespace eventsetup {
 
-   public:
+    template <class T>
+    class ProxyFactoryTemplate : public ProxyFactoryBase {
+    public:
       typedef typename T::record_type record_type;
-   
+
       ProxyFactoryTemplate() {}
       //virtual ~ProxyFactoryTemplate();
 
       // ---------- const member functions ---------------------
-      virtual std::unique_ptr<DataProxy> makeProxy() const {
-         return std::make_unique<T>();
-      }
-      
-      
+      virtual std::unique_ptr<DataProxy> makeProxy() const { return std::make_unique<T>(); }
+
       virtual DataKey makeKey(const std::string& iName) const {
-         return DataKey(DataKey::makeTypeTag< typename T::value_type>(),iName.c_str());
+        return DataKey(DataKey::makeTypeTag<typename T::value_type>(), iName.c_str());
       }
-      
+
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------
 
-   private:
-      ProxyFactoryTemplate(const ProxyFactoryTemplate&); // stop default
+    private:
+      ProxyFactoryTemplate(const ProxyFactoryTemplate&);  // stop default
 
-      const ProxyFactoryTemplate& operator=(const ProxyFactoryTemplate&); // stop default
+      const ProxyFactoryTemplate& operator=(const ProxyFactoryTemplate&);  // stop default
 
       // ---------- member data --------------------------------
+    };
 
-};
-
-   }
-}
+  }  // namespace eventsetup
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/RecordDependencyRegister.h b/FWCore/Framework/interface/RecordDependencyRegister.h
index bca41c2010eec..4d0a3687e6da0 100644
--- a/FWCore/Framework/interface/RecordDependencyRegister.h
+++ b/FWCore/Framework/interface/RecordDependencyRegister.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     RecordDependencyRegister
-// 
+//
 /**\class RecordDependencyRegister RecordDependencyRegister.h "RecordDependencyRegister.h"
 
  Description: [one line class summary]
@@ -25,27 +25,23 @@
 #include "FWCore/Framework/interface/EventSetupRecordKey.h"
 #include "FWCore/Framework/interface/findDependentRecordsFor.h"
 
-
 // forward declarations
 
 namespace edm {
   namespace eventsetup {
-      using DepFunction = std::set<EventSetupRecordKey> (*)();
-      
-      std::set<EventSetupRecordKey> dependencies(EventSetupRecordKey const&);
-      
-      void addDependencyFunction(EventSetupRecordKey iKey, DepFunction iFunction);
-      
-    
-    template<typename T>
+    using DepFunction = std::set<EventSetupRecordKey> (*)();
+
+    std::set<EventSetupRecordKey> dependencies(EventSetupRecordKey const&);
+
+    void addDependencyFunction(EventSetupRecordKey iKey, DepFunction iFunction);
+
+    template <typename T>
     struct RecordDependencyRegister {
       RecordDependencyRegister() {
-        addDependencyFunction(EventSetupRecordKey::makeKey<T>(),
-                              &findDependentRecordsFor<T>);
+        addDependencyFunction(EventSetupRecordKey::makeKey<T>(), &findDependentRecordsFor<T>);
       }
     };
-  }
-}
-
+  }  // namespace eventsetup
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/Run.h b/FWCore/Framework/interface/Run.h
index e344672faa446..1c97ab5c7163f 100644
--- a/FWCore/Framework/interface/Run.h
+++ b/FWCore/Framework/interface/Run.h
@@ -38,21 +38,19 @@ namespace edm {
   class SharedResourcesAcquirer;
 
   namespace stream {
-    template< typename T> class ProducingModuleAdaptorBase;
+    template <typename T>
+    class ProducingModuleAdaptorBase;
   }
 
   class Run : public RunBase {
   public:
-    Run(RunPrincipal const& rp, ModuleDescription const& md,
-        ModuleCallingContext const*, bool isAtEnd);
+    Run(RunPrincipal const& rp, ModuleDescription const& md, ModuleCallingContext const*, bool isAtEnd);
     ~Run() override;
 
     //Used in conjunction with EDGetToken
-    void setConsumer(EDConsumerBase const* iConsumer) {
-      provRecorder_.setConsumer(iConsumer);
-    }
+    void setConsumer(EDConsumerBase const* iConsumer) { provRecorder_.setConsumer(iConsumer); }
 
-    void setSharedResourcesAcquirer( SharedResourcesAcquirer* iResourceAcquirer) {
+    void setSharedResourcesAcquirer(SharedResourcesAcquirer* iResourceAcquirer) {
       provRecorder_.setSharedResourcesAcquirer(iResourceAcquirer);
     }
 
@@ -60,12 +58,12 @@ namespace edm {
 
     typedef PrincipalGetAdapter Base;
     // AUX functions are defined in RunBase
-    RunAuxiliary const& runAuxiliary() const override {return aux_;}
+    RunAuxiliary const& runAuxiliary() const override { return aux_; }
     // AUX functions.
-//     RunID const& id() const {return aux_.id();}
-//     RunNumber_t run() const {return aux_.run();}
-//     Timestamp const& beginTime() const {return aux_.beginTime();}
-//     Timestamp const& endTime() const {return aux_.endTime();}
+    //     RunID const& id() const {return aux_.id();}
+    //     RunNumber_t run() const {return aux_.run();}
+    //     Timestamp const& beginTime() const {return aux_.beginTime();}
+    //     Timestamp const& endTime() const {return aux_.endTime();}
 
     /**\return Reusable index which can be used to separate data for different simultaneous Runs.
      */
@@ -78,78 +76,59 @@ namespace edm {
      denote that you have not yet checked the value.
      */
     typedef unsigned long CacheIdentifier_t;
-    CacheIdentifier_t
-    cacheIdentifier() const;
-
+    CacheIdentifier_t cacheIdentifier() const;
 
     template <typename PROD>
-    bool
-    getByLabel(std::string const& label, Handle<PROD>& result) const;
+    bool getByLabel(std::string const& label, Handle<PROD>& result) const;
 
     template <typename PROD>
-    bool
-    getByLabel(std::string const& label,
-               std::string const& productInstanceName,
-               Handle<PROD>& result) const;
+    bool getByLabel(std::string const& label, std::string const& productInstanceName, Handle<PROD>& result) const;
 
     /// same as above, but using the InputTag class
     template <typename PROD>
-    bool
-    getByLabel(InputTag const& tag, Handle<PROD>& result) const;
-
-    template<typename PROD>
-    bool
-    getByToken(EDGetToken token, Handle<PROD>& result) const;
-
-    template<typename PROD>
-    bool
-    getByToken(EDGetTokenT<PROD> token, Handle<PROD>& result) const;
-
-    template<typename PROD>
-    Handle<PROD>
-    getHandle(EDGetTokenT<PROD> token) const;
-    
-    template<typename PROD>
-    PROD const&
-    get(EDGetTokenT<PROD> token) const noexcept(false);
-    
+    bool getByLabel(InputTag const& tag, Handle<PROD>& result) const;
+
+    template <typename PROD>
+    bool getByToken(EDGetToken token, Handle<PROD>& result) const;
+
+    template <typename PROD>
+    bool getByToken(EDGetTokenT<PROD> token, Handle<PROD>& result) const;
+
+    template <typename PROD>
+    Handle<PROD> getHandle(EDGetTokenT<PROD> token) const;
+
+    template <typename PROD>
+    PROD const& get(EDGetTokenT<PROD> token) const noexcept(false);
 
     template <typename PROD>
-    void
-    getManyByType(std::vector<Handle<PROD> >& results) const;
+    void getManyByType(std::vector<Handle<PROD>>& results) const;
 
     ///Put a new product.
     template <typename PROD>
-    void
-    put(std::unique_ptr<PROD> product) {put<PROD>(std::move(product), std::string());}
+    void put(std::unique_ptr<PROD> product) {
+      put<PROD>(std::move(product), std::string());
+    }
 
     ///Put a new product with a 'product instance name'
     template <typename PROD>
-    void
-    put(std::unique_ptr<PROD> product, std::string const& productInstanceName);
+    void put(std::unique_ptr<PROD> product, std::string const& productInstanceName);
 
-    template<typename PROD>
-    void
-    put(EDPutToken token, std::unique_ptr<PROD> product);
-    
-    template<typename PROD>
-    void
-    put(EDPutTokenT<PROD> token, std::unique_ptr<PROD> product);
+    template <typename PROD>
+    void put(EDPutToken token, std::unique_ptr<PROD> product);
+
+    template <typename PROD>
+    void put(EDPutTokenT<PROD> token, std::unique_ptr<PROD> product);
 
     ///puts a new product
-    template<typename PROD, typename... Args>
-    void
-    emplace(EDPutTokenT<PROD> token, Args&&... args);
-    
-    template<typename PROD, typename... Args>
-    void
-    emplace(EDPutToken token, Args&&... args);
+    template <typename PROD, typename... Args>
+    void emplace(EDPutTokenT<PROD> token, Args&&... args);
+
+    template <typename PROD, typename... Args>
+    void emplace(EDPutToken token, Args&&... args);
 
-    Provenance
-    getProvenance(BranchID const& theID) const;
+    Provenance getProvenance(BranchID const& theID) const;
 
-    void
-    getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const;
+    void getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const;
 
     // Return true if this Run has been subjected to a process with
     // the given processName, and false otherwise.
@@ -163,31 +142,31 @@ namespace edm {
 
     ProcessHistoryID const& processHistoryID() const;
 
-    ProcessHistory const&
-    processHistory() const;
+    ProcessHistory const& processHistory() const;
 
     ModuleCallingContext const* moduleCallingContext() const { return moduleCallingContext_; }
 
-    void labelsForToken(EDGetToken const& iToken, ProductLabels& oLabels) const { provRecorder_.labelsForToken(iToken, oLabels); }
+    void labelsForToken(EDGetToken const& iToken, ProductLabels& oLabels) const {
+      provRecorder_.labelsForToken(iToken, oLabels);
+    }
 
   private:
-    RunPrincipal const&
-    runPrincipal() const;
+    RunPrincipal const& runPrincipal() const;
 
     // Override version from RunBase class
-    BasicHandle getByLabelImpl(std::type_info const& iWrapperType, std::type_info const& iProductType, InputTag const& iTag) const override;
+    BasicHandle getByLabelImpl(std::type_info const& iWrapperType,
+                               std::type_info const& iProductType,
+                               InputTag const& iTag) const override;
+
+    template <typename PROD>
+    void putImpl(EDPutToken::value_type token, std::unique_ptr<PROD> product);
 
-    template<typename PROD>
-    void
-    putImpl(EDPutToken::value_type token, std::unique_ptr<PROD> product);
-    
-    template<typename PROD, typename... Args>
-    void
-    emplaceImpl(EDPutToken::value_type token, Args&&... args);
+    template <typename PROD, typename... Args>
+    void emplaceImpl(EDPutToken::value_type token, Args&&... args);
 
     typedef std::vector<edm::propagate_const<std::unique_ptr<WrapperBase>>> ProductPtrVec;
-    ProductPtrVec& putProducts() {return putProducts_;}
-    ProductPtrVec const& putProducts() const {return putProducts_;}
+    ProductPtrVec& putProducts() { return putProducts_; }
+    ProductPtrVec const& putProducts() const { return putProducts_; }
 
     // commit_() is called to complete the transaction represented by
     // this PrincipalGetAdapter. The friendships required seems gross, but any
@@ -195,7 +174,8 @@ namespace edm {
     // public interface is asking for trouble
     friend class RawInputSource;
     friend class ProducerBase;
-    template<typename T> friend class stream::ProducingModuleAdaptorBase;
+    template <typename T>
+    friend class stream::ProducingModuleAdaptorBase;
 
     void commit_(std::vector<edm::ProductResolverIndex> const& iShouldPut);
 
@@ -203,127 +183,112 @@ namespace edm {
     ProductPtrVec putProducts_;
     RunAuxiliary const& aux_;
     ModuleCallingContext const* moduleCallingContext_;
-    SharedResourcesAcquirer* sharedResourcesAcquirer_; // We do not use propagate_const because the acquirer is itself mutable.
+    SharedResourcesAcquirer*
+        sharedResourcesAcquirer_;  // We do not use propagate_const because the acquirer is itself mutable.
 
     static const std::string emptyString_;
   };
 
   template <typename PROD>
-  void
-  Run::putImpl(EDPutToken::value_type index,std::unique_ptr<PROD> product) {
+  void Run::putImpl(EDPutToken::value_type index, std::unique_ptr<PROD> product) {
     // The following will call post_insert if T has such a function,
     // and do nothing if T has no such function.
-    std::conditional_t<detail::has_postinsert<PROD>::value,
-    DoPostInsert<PROD>,
-    DoNotPostInsert<PROD>> maybe_inserter;
+    std::conditional_t<detail::has_postinsert<PROD>::value, DoPostInsert<PROD>, DoNotPostInsert<PROD>> maybe_inserter;
     maybe_inserter(product.get());
-    
+
     assert(index < putProducts().size());
-    
-    std::unique_ptr<Wrapper<PROD> > wp(new Wrapper<PROD>(std::move(product)));
-    putProducts()[index]=std::move(wp);
+
+    std::unique_ptr<Wrapper<PROD>> wp(new Wrapper<PROD>(std::move(product)));
+    putProducts()[index] = std::move(wp);
   }
-  
+
   template <typename PROD>
-  void
-  Run::put(std::unique_ptr<PROD> product, std::string const& productInstanceName) {
-    if(UNLIKELY(product.get() == nullptr)) {                // null pointer is illegal
+  void Run::put(std::unique_ptr<PROD> product, std::string const& productInstanceName) {
+    if (UNLIKELY(product.get() == nullptr)) {  // null pointer is illegal
       TypeID typeID(typeid(PROD));
       principal_get_adapter_detail::throwOnPutOfNullProduct("Run", typeID, productInstanceName);
     }
-    auto index =
-    provRecorder_.getPutTokenIndex(TypeID(*product), productInstanceName);
+    auto index = provRecorder_.getPutTokenIndex(TypeID(*product), productInstanceName);
     putImpl(index, std::move(product));
   }
-  
-  template<typename PROD>
-  void
-  Run::put(EDPutTokenT<PROD> token, std::unique_ptr<PROD> product) {
-    if(UNLIKELY(product.get() == 0)) {                // null pointer is illegal
+
+  template <typename PROD>
+  void Run::put(EDPutTokenT<PROD> token, std::unique_ptr<PROD> product) {
+    if (UNLIKELY(product.get() == 0)) {  // null pointer is illegal
       TypeID typeID(typeid(PROD));
       principal_get_adapter_detail::throwOnPutOfNullProduct("Run", typeID, provRecorder_.productInstanceLabel(token));
     }
-    if(UNLIKELY(token.isUninitialized())) {
+    if (UNLIKELY(token.isUninitialized())) {
       principal_get_adapter_detail::throwOnPutOfUninitializedToken("Run", typeid(PROD));
     }
-    putImpl(token.index(),std::move(product));
+    putImpl(token.index(), std::move(product));
   }
-  
-  template<typename PROD>
-  void
-  Run::put(EDPutToken token, std::unique_ptr<PROD> product) {
-    if(UNLIKELY(product.get() == 0)) {                // null pointer is illegal
+
+  template <typename PROD>
+  void Run::put(EDPutToken token, std::unique_ptr<PROD> product) {
+    if (UNLIKELY(product.get() == 0)) {  // null pointer is illegal
       TypeID typeID(typeid(PROD));
       principal_get_adapter_detail::throwOnPutOfNullProduct("Run", typeID, provRecorder_.productInstanceLabel(token));
     }
-    if(UNLIKELY(token.isUninitialized())) {
+    if (UNLIKELY(token.isUninitialized())) {
       principal_get_adapter_detail::throwOnPutOfUninitializedToken("Run", typeid(PROD));
     }
-    if(UNLIKELY(provRecorder_.getTypeIDForPutTokenIndex(token.index()) != TypeID{typeid(PROD)})) {
-      principal_get_adapter_detail::throwOnPutOfWrongType(typeid(PROD), provRecorder_.getTypeIDForPutTokenIndex(token.index()));
+    if (UNLIKELY(provRecorder_.getTypeIDForPutTokenIndex(token.index()) != TypeID{typeid(PROD)})) {
+      principal_get_adapter_detail::throwOnPutOfWrongType(typeid(PROD),
+                                                          provRecorder_.getTypeIDForPutTokenIndex(token.index()));
     }
-    
-    putImpl(token.index(),std::move(product));
+
+    putImpl(token.index(), std::move(product));
   }
-  
-  template<typename PROD, typename... Args>
-  void
-  Run::emplace(EDPutTokenT<PROD> token, Args&&... args) {
-    if(UNLIKELY(token.isUninitialized())) {
+
+  template <typename PROD, typename... Args>
+  void Run::emplace(EDPutTokenT<PROD> token, Args&&... args) {
+    if (UNLIKELY(token.isUninitialized())) {
       principal_get_adapter_detail::throwOnPutOfUninitializedToken("Run", typeid(PROD));
     }
-    emplaceImpl<PROD>(token.index(),std::forward<Args>(args)...);
+    emplaceImpl<PROD>(token.index(), std::forward<Args>(args)...);
   }
-  
-  template<typename PROD, typename... Args>
-  void
-  Run::emplace(EDPutToken token, Args&&... args) {
-    if(UNLIKELY(token.isUninitialized())) {
+
+  template <typename PROD, typename... Args>
+  void Run::emplace(EDPutToken token, Args&&... args) {
+    if (UNLIKELY(token.isUninitialized())) {
       principal_get_adapter_detail::throwOnPutOfUninitializedToken("Run", typeid(PROD));
     }
-    if(UNLIKELY(provRecorder_.getTypeIDForPutTokenIndex(token.index()) != TypeID{typeid(PROD)})) {
-      principal_get_adapter_detail::throwOnPutOfWrongType(typeid(PROD), provRecorder_.getTypeIDForPutTokenIndex(token.index()));
+    if (UNLIKELY(provRecorder_.getTypeIDForPutTokenIndex(token.index()) != TypeID{typeid(PROD)})) {
+      principal_get_adapter_detail::throwOnPutOfWrongType(typeid(PROD),
+                                                          provRecorder_.getTypeIDForPutTokenIndex(token.index()));
     }
-    
-    emplaceImpl(token.index(),std::forward<Args>(args)...);
+
+    emplaceImpl(token.index(), std::forward<Args>(args)...);
   }
-  
-  template<typename PROD, typename... Args>
-  void
-  Run::emplaceImpl(EDPutToken::value_type index, Args&&... args) {
-    
+
+  template <typename PROD, typename... Args>
+  void Run::emplaceImpl(EDPutToken::value_type index, Args&&... args) {
     assert(index < putProducts().size());
-    
-    std::unique_ptr<Wrapper<PROD> > wp(new Wrapper<PROD>(WrapperBase::Emplace{},
-                                                         std::forward<Args>(args)...));
-    
+
+    std::unique_ptr<Wrapper<PROD>> wp(new Wrapper<PROD>(WrapperBase::Emplace{}, std::forward<Args>(args)...));
+
     // The following will call post_insert if T has such a function,
     // and do nothing if T has no such function.
-    std::conditional_t<detail::has_postinsert<PROD>::value,
-    DoPostInsert<PROD>,
-    DoNotPostInsert<PROD>> maybe_inserter;
+    std::conditional_t<detail::has_postinsert<PROD>::value, DoPostInsert<PROD>, DoNotPostInsert<PROD>> maybe_inserter;
     maybe_inserter(&(wp->bareProduct()));
-    
-    putProducts()[index]=std::move(wp);
-  }
 
+    putProducts()[index] = std::move(wp);
+  }
 
   template <typename PROD>
-  bool
-  Run::getByLabel(std::string const& label, Handle<PROD>& result) const {
+  bool Run::getByLabel(std::string const& label, Handle<PROD>& result) const {
     return getByLabel(label, emptyString_, result);
   }
 
   template <typename PROD>
-  bool
-  Run::getByLabel(std::string const& label,
-                  std::string const& productInstanceName,
-                  Handle<PROD>& result) const {
-    if(!provRecorder_.checkIfComplete<PROD>()) {
+  bool Run::getByLabel(std::string const& label, std::string const& productInstanceName, Handle<PROD>& result) const {
+    if (!provRecorder_.checkIfComplete<PROD>()) {
       principal_get_adapter_detail::throwOnPrematureRead("Run", TypeID(typeid(PROD)), label, productInstanceName);
     }
     result.clear();
-    BasicHandle bh = provRecorder_.getByLabel_(TypeID(typeid(PROD)), label, productInstanceName, emptyString_, moduleCallingContext_);
+    BasicHandle bh = provRecorder_.getByLabel_(
+        TypeID(typeid(PROD)), label, productInstanceName, emptyString_, moduleCallingContext_);
     result = convert_handle<PROD>(std::move(bh));  // throws on conversion error
     if (result.failedToGet()) {
       return false;
@@ -333,9 +298,8 @@ namespace edm {
 
   /// same as above, but using the InputTag class
   template <typename PROD>
-  bool
-  Run::getByLabel(InputTag const& tag, Handle<PROD>& result) const {
-    if(!provRecorder_.checkIfComplete<PROD>()) {
+  bool Run::getByLabel(InputTag const& tag, Handle<PROD>& result) const {
+    if (!provRecorder_.checkIfComplete<PROD>()) {
       principal_get_adapter_detail::throwOnPrematureRead("Run", TypeID(typeid(PROD)), tag.label(), tag.instance());
     }
     result.clear();
@@ -347,14 +311,13 @@ namespace edm {
     return true;
   }
 
-  template<typename PROD>
-  bool
-  Run::getByToken(EDGetToken token, Handle<PROD>& result) const {
-    if(!provRecorder_.checkIfComplete<PROD>()) {
+  template <typename PROD>
+  bool Run::getByToken(EDGetToken token, Handle<PROD>& result) const {
+    if (!provRecorder_.checkIfComplete<PROD>()) {
       principal_get_adapter_detail::throwOnPrematureRead("Run", TypeID(typeid(PROD)), token);
     }
     result.clear();
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)),PRODUCT_TYPE, token, moduleCallingContext_);
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)), PRODUCT_TYPE, token, moduleCallingContext_);
     result = convert_handle<PROD>(std::move(bh));  // throws on conversion error
     if (result.failedToGet()) {
       return false;
@@ -362,14 +325,13 @@ namespace edm {
     return true;
   }
 
-  template<typename PROD>
-  bool
-  Run::getByToken(EDGetTokenT<PROD> token, Handle<PROD>& result) const {
-    if(!provRecorder_.checkIfComplete<PROD>()) {
+  template <typename PROD>
+  bool Run::getByToken(EDGetTokenT<PROD> token, Handle<PROD>& result) const {
+    if (!provRecorder_.checkIfComplete<PROD>()) {
       principal_get_adapter_detail::throwOnPrematureRead("Run", TypeID(typeid(PROD)), token);
     }
     result.clear();
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)),PRODUCT_TYPE, token, moduleCallingContext_);
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)), PRODUCT_TYPE, token, moduleCallingContext_);
     result = convert_handle<PROD>(std::move(bh));  // throws on conversion error
     if (result.failedToGet()) {
       return false;
@@ -377,30 +339,27 @@ namespace edm {
     return true;
   }
 
-  template<typename PROD>
-  Handle<PROD>
-  Run::getHandle(EDGetTokenT<PROD> token) const {
-    if(!provRecorder_.checkIfComplete<PROD>()) {
+  template <typename PROD>
+  Handle<PROD> Run::getHandle(EDGetTokenT<PROD> token) const {
+    if (!provRecorder_.checkIfComplete<PROD>()) {
       principal_get_adapter_detail::throwOnPrematureRead("Run", TypeID(typeid(PROD)), token);
     }
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)),PRODUCT_TYPE, token, moduleCallingContext_);
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)), PRODUCT_TYPE, token, moduleCallingContext_);
     return convert_handle<PROD>(std::move(bh));
   }
 
-  template<typename PROD>
-  PROD const&
-  Run::get(EDGetTokenT<PROD> token) const noexcept(false) {
-    if(!provRecorder_.checkIfComplete<PROD>()) {
+  template <typename PROD>
+  PROD const& Run::get(EDGetTokenT<PROD> token) const noexcept(false) {
+    if (!provRecorder_.checkIfComplete<PROD>()) {
       principal_get_adapter_detail::throwOnPrematureRead("Run", TypeID(typeid(PROD)), token);
     }
-    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)),PRODUCT_TYPE, token, moduleCallingContext_);
+    BasicHandle bh = provRecorder_.getByToken_(TypeID(typeid(PROD)), PRODUCT_TYPE, token, moduleCallingContext_);
     return *convert_handle<PROD>(std::move(bh));
   }
 
   template <typename PROD>
-  void
-  Run::getManyByType(std::vector<Handle<PROD> >& results) const {
-    if(!provRecorder_.checkIfComplete<PROD>()) {
+  void Run::getManyByType(std::vector<Handle<PROD>>& results) const {
+    if (!provRecorder_.checkIfComplete<PROD>()) {
       principal_get_adapter_detail::throwOnPrematureRead("Run", TypeID(typeid(PROD)));
     }
     return provRecorder_.getManyByType(results, moduleCallingContext_);
@@ -414,7 +373,7 @@ namespace edm {
     Handle<T> handle;
     event.getByLabel(tag, handle);
     // throw if the handle is not valid
-    return * handle.product();
+    return *handle.product();
   }
 
   template <typename T>
@@ -422,7 +381,7 @@ namespace edm {
     Handle<T> handle;
     event.getByToken(token, handle);
     // throw if the handle is not valid
-    return * handle.product();
+    return *handle.product();
   }
 
   template <typename T>
@@ -430,9 +389,9 @@ namespace edm {
     Handle<T> handle;
     event.getByToken(token, handle);
     // throw if the handle is not valid
-    return * handle.product();
+    return *handle.product();
   }
 
-}
+}  // namespace edm
 
-#endif // FWCore_Framework_Run_h
+#endif  // FWCore_Framework_Run_h
diff --git a/FWCore/Framework/interface/RunForOutput.h b/FWCore/Framework/interface/RunForOutput.h
index 6fbddf7173cd5..b1e95f5136cb7 100644
--- a/FWCore/Framework/interface/RunForOutput.h
+++ b/FWCore/Framework/interface/RunForOutput.h
@@ -35,26 +35,27 @@ namespace edmtest {
 namespace edm {
   class MergeableRunProductMetadata;
   class ModuleCallingContext;
-  
+
   class RunForOutput : public OccurrenceForOutput {
   public:
-    RunForOutput(RunPrincipal const& rp, ModuleDescription const& md,
-                 ModuleCallingContext const*, bool isAtEnd,
+    RunForOutput(RunPrincipal const& rp,
+                 ModuleDescription const& md,
+                 ModuleCallingContext const*,
+                 bool isAtEnd,
                  MergeableRunProductMetadata const* = nullptr);
     ~RunForOutput() override;
 
-    RunAuxiliary const& runAuxiliary() const {return aux_;}
-    RunID const& id() const {return aux_.id();}
-    RunNumber_t run() const {return aux_.run();}
-    Timestamp const& beginTime() const {return aux_.beginTime();}
-    Timestamp const& endTime() const {return aux_.endTime();}
+    RunAuxiliary const& runAuxiliary() const { return aux_; }
+    RunID const& id() const { return aux_.id(); }
+    RunNumber_t run() const { return aux_.run(); }
+    Timestamp const& beginTime() const { return aux_.beginTime(); }
+    Timestamp const& endTime() const { return aux_.endTime(); }
     MergeableRunProductMetadata const* mergeableRunProductMetadata() const { return mergeableRunProductMetadata_; }
 
   private:
-    friend class edmtest::TestOutputModule; // For testing
+    friend class edmtest::TestOutputModule;  // For testing
 
-    RunPrincipal const&
-    runPrincipal() const;
+    RunPrincipal const& runPrincipal() const;
 
     RunAuxiliary const& aux_;
 
@@ -62,5 +63,5 @@ namespace edm {
 
     static const std::string emptyString_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/RunPrincipal.h b/FWCore/Framework/interface/RunPrincipal.h
index 1dc11e4e06d33..c250dd5c97464 100644
--- a/FWCore/Framework/interface/RunPrincipal.h
+++ b/FWCore/Framework/interface/RunPrincipal.h
@@ -35,14 +35,13 @@ namespace edm {
     typedef RunAuxiliary Auxiliary;
     typedef Principal Base;
 
-    RunPrincipal(
-        std::shared_ptr<RunAuxiliary> aux,
-        std::shared_ptr<ProductRegistry const> reg,
-        ProcessConfiguration const& pc,
-        HistoryAppender* historyAppender,
-        unsigned int iRunIndex,
-        bool isForPrimaryProcess=true,
-        MergeableRunProductProcesses const* mergeableRunProductProcesses = nullptr);
+    RunPrincipal(std::shared_ptr<RunAuxiliary> aux,
+                 std::shared_ptr<ProductRegistry const> reg,
+                 ProcessConfiguration const& pc,
+                 HistoryAppender* historyAppender,
+                 unsigned int iRunIndex,
+                 bool isForPrimaryProcess = true,
+                 MergeableRunProductProcesses const* mergeableRunProductProcesses = nullptr);
     ~RunPrincipal() override;
 
     void fillRunPrincipal(ProcessHistoryRegistry const& processHistoryRegistry, DelayedReader* reader = nullptr);
@@ -54,55 +53,33 @@ namespace edm {
      value will be reused once the processing of the previous Run 
      using that index has been completed.
      */
-    RunIndex index() const {
-      return index_;
-    }
-    
-    RunAuxiliary const& aux() const {
-      return *aux_;
-    }
-
-    RunNumber_t run() const {
-      return aux().run();
-    }
-    
-    ProcessHistoryID const& reducedProcessHistoryID() const {
-      return m_reducedHistoryID;
-    }
-
-    RunID const& id() const {
-      return aux().id();
-    }
-
-    Timestamp const& beginTime() const {
-      return aux().beginTime();
-    }
-
-    Timestamp const& endTime() const {
-      return aux().endTime();
-    }
-
-    void setEndTime(Timestamp const& time) {
-      aux_->setEndTime(time);
-    }
-
-    void mergeAuxiliary(RunAuxiliary const& aux) {
-      return aux_->mergeAuxiliary(aux);
-    }
-
-    void put(
-        BranchDescription const& bd,
-        std::unique_ptr<WrapperBase> edp) const;
-
-    void put(ProductResolverIndex index,
-             std::unique_ptr<WrapperBase> edp) const;
-
-    MergeableRunProductMetadata* mergeableRunProductMetadata() {return mergeableRunProductMetadataPtr_.get();}
+    RunIndex index() const { return index_; }
+
+    RunAuxiliary const& aux() const { return *aux_; }
+
+    RunNumber_t run() const { return aux().run(); }
+
+    ProcessHistoryID const& reducedProcessHistoryID() const { return m_reducedHistoryID; }
+
+    RunID const& id() const { return aux().id(); }
+
+    Timestamp const& beginTime() const { return aux().beginTime(); }
+
+    Timestamp const& endTime() const { return aux().endTime(); }
+
+    void setEndTime(Timestamp const& time) { aux_->setEndTime(time); }
+
+    void mergeAuxiliary(RunAuxiliary const& aux) { return aux_->mergeAuxiliary(aux); }
+
+    void put(BranchDescription const& bd, std::unique_ptr<WrapperBase> edp) const;
+
+    void put(ProductResolverIndex index, std::unique_ptr<WrapperBase> edp) const;
+
+    MergeableRunProductMetadata* mergeableRunProductMetadata() { return mergeableRunProductMetadataPtr_.get(); }
 
     void preReadFile();
 
   private:
-
     unsigned int transitionIndex_() const override;
 
     edm::propagate_const<std::shared_ptr<RunAuxiliary>> aux_;
@@ -114,6 +91,5 @@ namespace edm {
     // per concurrent run. In all other cases, this should just be null.
     edm::propagate_const<std::unique_ptr<MergeableRunProductMetadata>> mergeableRunProductMetadataPtr_;
   };
-}
+}  // namespace edm
 #endif
-
diff --git a/FWCore/Framework/interface/Schedule.h b/FWCore/Framework/interface/Schedule.h
index 99515aac710be..6bd0e65646231 100644
--- a/FWCore/Framework/interface/Schedule.h
+++ b/FWCore/Framework/interface/Schedule.h
@@ -95,6 +95,10 @@ namespace edm {
   namespace service {
     class TriggerNamesService;
   }
+  namespace evetnsetup {
+    class ESRecordsToProxyIndices;
+  }
+
   class ActivityRegistry;
   class BranchIDListHelper;
   class EventSetupImpl;
@@ -115,7 +119,6 @@ namespace edm {
   class EndPathStatusInserter;
   class WaitingTaskHolder;
 
-  
   class Schedule {
   public:
     typedef std::vector<std::string> vstring;
@@ -158,9 +161,9 @@ namespace edm {
                                ServiceToken const& token,
                                bool cleaningUpAfterException = false);
 
-    void beginJob(ProductRegistry const&);
-    void endJob(ExceptionCollector & collector);
-    
+    void beginJob(ProductRegistry const&, eventsetup::ESRecordsToProxyIndices const&);
+    void endJob(ExceptionCollector& collector);
+
     void beginStream(unsigned int);
     void endStream(unsigned int);
 
@@ -212,8 +215,7 @@ namespace edm {
     void endPaths(std::vector<std::string>& oLabelsToFill) const;
 
     ///adds to oLabelsToFill in execution order the labels of all modules in path iPathLabel
-    void modulesInPath(std::string const& iPathLabel,
-                       std::vector<std::string>& oLabelsToFill) const;
+    void modulesInPath(std::string const& iPathLabel, std::vector<std::string>& oLabelsToFill) const;
 
     ///adds the ModuleDescriptions into the vector for the modules scheduled in path iPathLabel
     ///hint is a performance optimization if you might know the position of the module in the path
@@ -228,8 +230,8 @@ namespace edm {
                                      unsigned int hint) const;
 
     void fillModuleAndConsumesInfo(std::vector<ModuleDescription const*>& allModuleDescriptions,
-                                   std::vector<std::pair<unsigned int, unsigned int> >& moduleIDToIndex,
-                                   std::vector<std::vector<ModuleDescription const*> >& modulesWhoseProductsAreConsumedBy,
+                                   std::vector<std::pair<unsigned int, unsigned int>>& moduleIDToIndex,
+                                   std::vector<std::vector<ModuleDescription const*>>& modulesWhoseProductsAreConsumedBy,
                                    ProductRegistry const& preg) const;
 
     /// Return the number of events this Schedule has tried to process
@@ -256,7 +258,7 @@ namespace edm {
     /// Return the trigger report information on paths,
     /// modules-in-path, modules-in-endpath, and modules.
     void getTriggerReport(TriggerReport& rep) const;
-    
+
     /// Return the trigger timing report information on paths,
     /// modules-in-path, modules-in-endpath, and modules.
     void getTriggerTimingReport(TriggerTimingReport& rep) const;
@@ -269,7 +271,10 @@ namespace edm {
 
     /// clone the type of module with label iLabel but configure with iPSet.
     /// Returns true if successful.
-    bool changeModule(std::string const& iLabel, ParameterSet const& iPSet, const ProductRegistry& iRegistry);
+    bool changeModule(std::string const& iLabel,
+                      ParameterSet const& iPSet,
+                      const ProductRegistry& iRegistry,
+                      eventsetup::ESRecordsToProxyIndices const&);
 
     /// returns the collection of pointers to workers
     AllWorkers const& allWorkers() const;
@@ -278,15 +283,16 @@ namespace edm {
     void convertCurrentProcessAlias(std::string const& processName);
 
   private:
-
     void limitOutput(ParameterSet const& proc_pset,
                      BranchIDLists const& branchIDLists,
                      SubProcessParentageHelper const* subProcessParentageHelper);
 
-    std::shared_ptr<TriggerResultInserter const> resultsInserter() const {return get_underlying_safe(resultsInserter_);}
-    std::shared_ptr<TriggerResultInserter>& resultsInserter() {return get_underlying_safe(resultsInserter_);}
-    std::shared_ptr<ModuleRegistry const> moduleRegistry() const {return get_underlying_safe(moduleRegistry_);}
-    std::shared_ptr<ModuleRegistry>& moduleRegistry() {return get_underlying_safe(moduleRegistry_);}
+    std::shared_ptr<TriggerResultInserter const> resultsInserter() const {
+      return get_underlying_safe(resultsInserter_);
+    }
+    std::shared_ptr<TriggerResultInserter>& resultsInserter() { return get_underlying_safe(resultsInserter_); }
+    std::shared_ptr<ModuleRegistry const> moduleRegistry() const { return get_underlying_safe(moduleRegistry_); }
+    std::shared_ptr<ModuleRegistry>& moduleRegistry() { return get_underlying_safe(moduleRegistry_); }
 
     edm::propagate_const<std::shared_ptr<TriggerResultInserter>> resultsInserter_;
     std::vector<edm::propagate_const<std::shared_ptr<PathStatusInserter>>> pathStatusInserters_;
@@ -296,8 +302,8 @@ namespace edm {
     //In the future, we will have one GlobalSchedule per simultaneous transition
     edm::propagate_const<std::unique_ptr<GlobalSchedule>> globalSchedule_;
 
-    AllOutputModuleCommunicators         all_output_communicators_;
-    PreallocationConfiguration           preallocConfig_;
+    AllOutputModuleCommunicators all_output_communicators_;
+    PreallocationConfiguration preallocConfig_;
 
     edm::propagate_const<std::unique_ptr<SystemTimeKeeper>> summaryTimeKeeper_;
 
@@ -305,10 +311,9 @@ namespace edm {
     std::vector<std::string> const* endPathNames_;
     bool wantSummary_;
 
-    volatile bool           endpathsAreActive_;
+    volatile bool endpathsAreActive_;
   };
 
-  
   template <typename T>
   void Schedule::processOneStreamAsync(WaitingTaskHolder iTaskHolder,
                                        unsigned int iStreamID,
@@ -316,19 +321,19 @@ namespace edm {
                                        EventSetupImpl const& es,
                                        ServiceToken const& token,
                                        bool cleaningUpAfterException) {
-    assert(iStreamID<streamSchedules_.size());
-    streamSchedules_[iStreamID]->processOneStreamAsync<T>(std::move(iTaskHolder),ep,es,token,cleaningUpAfterException);
+    assert(iStreamID < streamSchedules_.size());
+    streamSchedules_[iStreamID]->processOneStreamAsync<T>(
+        std::move(iTaskHolder), ep, es, token, cleaningUpAfterException);
   }
 
   template <typename T>
-  void
-  Schedule::processOneGlobalAsync(WaitingTaskHolder iTaskHolder,
-                                  typename T::MyPrincipal& ep,
-                                  EventSetupImpl const& es,
-                                  ServiceToken const& token,
-                                  bool cleaningUpAfterException) {
-    globalSchedule_->processOneGlobalAsync<T>(iTaskHolder,ep,es,token,cleaningUpAfterException);
+  void Schedule::processOneGlobalAsync(WaitingTaskHolder iTaskHolder,
+                                       typename T::MyPrincipal& ep,
+                                       EventSetupImpl const& es,
+                                       ServiceToken const& token,
+                                       bool cleaningUpAfterException) {
+    globalSchedule_->processOneGlobalAsync<T>(iTaskHolder, ep, es, token, cleaningUpAfterException);
   }
 
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/ScheduleInfo.h b/FWCore/Framework/interface/ScheduleInfo.h
index d2faab211d1e4..7c64beb4339c4 100644
--- a/FWCore/Framework/interface/ScheduleInfo.h
+++ b/FWCore/Framework/interface/ScheduleInfo.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     ScheduleInfo
-// 
+//
 /**\class ScheduleInfo ScheduleInfo.h FWCore/Framework/interface/ScheduleInfo.h
 
  Description: Provides module and path information to EDLoopers
@@ -26,45 +26,42 @@
 
 // forward declarations
 namespace edm {
-   class ParameterSet;
-   class Schedule;
-   
-   class ScheduleInfo {
-      
-   public:
-      ScheduleInfo(const Schedule*);
-      virtual ~ScheduleInfo();
-      
-      // ---------- const member functions ---------------------
-      
-      ///adds to oLabelsToFill the labels for all modules used in the process
-      void availableModuleLabels(std::vector<std::string>& oLabelsToFill) const;
-      
-      /**returns a pointer to the parameters for the module with label iLabel, returns 0 if 
+  class ParameterSet;
+  class Schedule;
+
+  class ScheduleInfo {
+  public:
+    ScheduleInfo(const Schedule*);
+    virtual ~ScheduleInfo();
+
+    // ---------- const member functions ---------------------
+
+    ///adds to oLabelsToFill the labels for all modules used in the process
+    void availableModuleLabels(std::vector<std::string>& oLabelsToFill) const;
+
+    /**returns a pointer to the parameters for the module with label iLabel, returns 0 if 
        no module exists with that label.
        */
-      const edm::ParameterSet* parametersForModule(const std::string& iLabel) const;
-      
-      ///adds to oLabelsToFill the labels for all paths in the process
-      void availablePaths( std::vector<std::string>& oLabelsToFill) const;
-      
-      ///add to oLabelsToFill in execution order the labels of all modules in path iPathLabel
-      void modulesInPath(const std::string& iPathLabel,
-                         std::vector<std::string>& oLabelsToFill) const;
-      // ---------- static member functions --------------------      
-      
-      // ---------- member functions ---------------------------
-      
-   private:
-      //ScheduleInfo(const ScheduleInfo&); // stop default
-      
-      //const ScheduleInfo& operator=(const ScheduleInfo&); // stop default
-      
-      // ---------- member data --------------------------------
-      const Schedule* schedule_;
-      
-   };
-
-}
+    const edm::ParameterSet* parametersForModule(const std::string& iLabel) const;
+
+    ///adds to oLabelsToFill the labels for all paths in the process
+    void availablePaths(std::vector<std::string>& oLabelsToFill) const;
+
+    ///add to oLabelsToFill in execution order the labels of all modules in path iPathLabel
+    void modulesInPath(const std::string& iPathLabel, std::vector<std::string>& oLabelsToFill) const;
+    // ---------- static member functions --------------------
+
+    // ---------- member functions ---------------------------
+
+  private:
+    //ScheduleInfo(const ScheduleInfo&); // stop default
+
+    //const ScheduleInfo& operator=(const ScheduleInfo&); // stop default
+
+    // ---------- member data --------------------------------
+    const Schedule* schedule_;
+  };
+
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/ScheduleItems.h b/FWCore/Framework/interface/ScheduleItems.h
index fb7f985c56886..a9823734cf97d 100644
--- a/FWCore/Framework/interface/ScheduleItems.h
+++ b/FWCore/Framework/interface/ScheduleItems.h
@@ -30,42 +30,47 @@ namespace edm {
 
     ScheduleItems(ProductRegistry const& preg, SubProcess const& om);
 
-    ScheduleItems(ScheduleItems const&) = delete; // Disallow copying and moving
-    ScheduleItems& operator=(ScheduleItems const&) = delete; // Disallow copying and moving
+    ScheduleItems(ScheduleItems const&) = delete;             // Disallow copying and moving
+    ScheduleItems& operator=(ScheduleItems const&) = delete;  // Disallow copying and moving
 
-    ServiceToken
-    initServices(std::vector<ParameterSet>& servicePSets,
-                 ParameterSet& processPSet,
-                 ServiceToken const& iToken,
-                 serviceregistry::ServiceLegacy iLegacy,
-                 bool associate);
+    ServiceToken initServices(std::vector<ParameterSet>& servicePSets,
+                              ParameterSet& processPSet,
+                              ServiceToken const& iToken,
+                              serviceregistry::ServiceLegacy iLegacy,
+                              bool associate);
 
-    ServiceToken
-    addCPRandTNS(ParameterSet const& parameterSet, ServiceToken const& token);
+    ServiceToken addCPRandTNS(ParameterSet const& parameterSet, ServiceToken const& token);
 
-    std::shared_ptr<CommonParams>
-    initMisc(ParameterSet& parameterSet);
+    std::shared_ptr<CommonParams> initMisc(ParameterSet& parameterSet);
 
-    std::unique_ptr<Schedule>
-    initSchedule(ParameterSet& parameterSet,
-                 bool hasSubprocesses,
-                 PreallocationConfiguration const& iAllocConfig,
-                 ProcessContext const*);
+    std::unique_ptr<Schedule> initSchedule(ParameterSet& parameterSet,
+                                           bool hasSubprocesses,
+                                           PreallocationConfiguration const& iAllocConfig,
+                                           ProcessContext const*);
 
-    void
-    clear();
+    void clear();
 
-    std::shared_ptr<SignallingProductRegistry const> preg() const {return get_underlying_safe(preg_);}
-    std::shared_ptr<SignallingProductRegistry>& preg() {return get_underlying_safe(preg_);}
-    std::shared_ptr<BranchIDListHelper const> branchIDListHelper() const {return get_underlying_safe(branchIDListHelper_);}
-    std::shared_ptr<BranchIDListHelper>& branchIDListHelper() {return get_underlying_safe(branchIDListHelper_);}
-    std::shared_ptr<ThinnedAssociationsHelper const> thinnedAssociationsHelper() const {return get_underlying_safe(thinnedAssociationsHelper_);}
-    std::shared_ptr<ThinnedAssociationsHelper>& thinnedAssociationsHelper() {return get_underlying_safe(thinnedAssociationsHelper_);}
-    std::shared_ptr<SubProcessParentageHelper>& subProcessParentageHelper() {return get_underlying_safe(subProcessParentageHelper_);}
-    std::shared_ptr<ProcessConfiguration const> processConfiguration() const {return get_underlying_safe(processConfiguration_);}
-    std::shared_ptr<ProcessConfiguration>& processConfiguration() {return get_underlying_safe(processConfiguration_);}
+    std::shared_ptr<SignallingProductRegistry const> preg() const { return get_underlying_safe(preg_); }
+    std::shared_ptr<SignallingProductRegistry>& preg() { return get_underlying_safe(preg_); }
+    std::shared_ptr<BranchIDListHelper const> branchIDListHelper() const {
+      return get_underlying_safe(branchIDListHelper_);
+    }
+    std::shared_ptr<BranchIDListHelper>& branchIDListHelper() { return get_underlying_safe(branchIDListHelper_); }
+    std::shared_ptr<ThinnedAssociationsHelper const> thinnedAssociationsHelper() const {
+      return get_underlying_safe(thinnedAssociationsHelper_);
+    }
+    std::shared_ptr<ThinnedAssociationsHelper>& thinnedAssociationsHelper() {
+      return get_underlying_safe(thinnedAssociationsHelper_);
+    }
+    std::shared_ptr<SubProcessParentageHelper>& subProcessParentageHelper() {
+      return get_underlying_safe(subProcessParentageHelper_);
+    }
+    std::shared_ptr<ProcessConfiguration const> processConfiguration() const {
+      return get_underlying_safe(processConfiguration_);
+    }
+    std::shared_ptr<ProcessConfiguration>& processConfiguration() { return get_underlying_safe(processConfiguration_); }
 
-    std::shared_ptr<ActivityRegistry> actReg_; // We do not use propagate_const because the registry itself is mutable.
+    std::shared_ptr<ActivityRegistry> actReg_;  // We do not use propagate_const because the registry itself is mutable.
     edm::propagate_const<std::shared_ptr<SignallingProductRegistry>> preg_;
     edm::propagate_const<std::shared_ptr<BranchIDListHelper>> branchIDListHelper_;
     edm::propagate_const<std::shared_ptr<ThinnedAssociationsHelper>> thinnedAssociationsHelper_;
@@ -73,5 +78,5 @@ namespace edm {
     std::unique_ptr<ExceptionToActionTable const> act_table_;
     edm::propagate_const<std::shared_ptr<ProcessConfiguration>> processConfiguration_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/SharedResourcesAcquirer.h b/FWCore/Framework/interface/SharedResourcesAcquirer.h
index f0b07eee5ab66..710caca6c8521 100644
--- a/FWCore/Framework/interface/SharedResourcesAcquirer.h
+++ b/FWCore/Framework/interface/SharedResourcesAcquirer.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     SharedResourcesAcquirer
-// 
+//
 /**\class SharedResourcesAcquirer SharedResourcesAcquirer.h "SharedResourcesAcquirer.h"
 
  Description: Handles acquiring and releasing a group of resources shared between modules
@@ -30,34 +30,32 @@ namespace edm {
   class SerialTaskQueueChain;
   class SerialTaskQueue;
 
-  class SharedResourcesAcquirer
-  {
+  class SharedResourcesAcquirer {
   public:
     friend class ::testSharedResourcesRegistry;
-    
+
     SharedResourcesAcquirer() = default;
-    explicit SharedResourcesAcquirer(std::vector<std::shared_ptr<SerialTaskQueue>>  iQueues):
-    m_queues(std::move(iQueues)){}
-    
+    explicit SharedResourcesAcquirer(std::vector<std::shared_ptr<SerialTaskQueue>> iQueues)
+        : m_queues(std::move(iQueues)) {}
+
     SharedResourcesAcquirer(SharedResourcesAcquirer&&) = default;
     SharedResourcesAcquirer(const SharedResourcesAcquirer&) = delete;
     SharedResourcesAcquirer& operator=(const SharedResourcesAcquirer&) = delete;
-    
+
     SharedResourcesAcquirer& operator=(SharedResourcesAcquirer&&) = default;
     ~SharedResourcesAcquirer() = default;
-    
+
     // ---------- member functions ---------------------------
-    
+
     ///The number returned may be less than the number of resources requested if a resource is only used by one module and therefore is not being shared.
-    size_t numberOfResources() const { return m_queues.numberOfQueues();}
-    
+    size_t numberOfResources() const { return m_queues.numberOfQueues(); }
+
     SerialTaskQueueChain& serialQueueChain() const { return m_queues; }
+
   private:
-    
     // ---------- member data --------------------------------
     mutable SerialTaskQueueChain m_queues;
   };
-}
-
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/SourceFactory.h b/FWCore/Framework/interface/SourceFactory.h
index a5bee9abb5cd0..9a58342ac37c9 100644
--- a/FWCore/Framework/interface/SourceFactory.h
+++ b/FWCore/Framework/interface/SourceFactory.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     SourceFactory
-// 
+//
 /**\class SourceFactory SourceFactory.h FWCore/Framework/interface/SourceFactory.h
 
  Description: <one line class summary>
@@ -30,67 +30,66 @@
 // forward declarations
 
 namespace edm {
-   class EventSetupRecordIntervalFinder;
-   class ParameterSet;
-
-   namespace eventsetup {
-      class DataProxyProvider;
-      class EventSetupsController;
-      
-      template<class T>
-         void addProviderTo(EventSetupProvider& iProvider, std::shared_ptr<T> iComponent, const DataProxyProvider*) 
-      {
-            std::shared_ptr<DataProxyProvider> pProvider(iComponent);
-            ComponentDescription description = pProvider->description();
-            description.isSource_=true;
-            pProvider->setDescription(description);
-            iProvider.add(pProvider);
-      }
-      template<class T>
-         void addProviderTo(EventSetupProvider& /* iProvider */, std::shared_ptr<T> /*iComponent*/, const void*) 
-      {
-            //do nothing
+  class EventSetupRecordIntervalFinder;
+  class ParameterSet;
+
+  namespace eventsetup {
+    class DataProxyProvider;
+    class EventSetupsController;
+
+    template <class T>
+    void addProviderTo(EventSetupProvider& iProvider, std::shared_ptr<T> iComponent, const DataProxyProvider*) {
+      std::shared_ptr<DataProxyProvider> pProvider(iComponent);
+      ComponentDescription description = pProvider->description();
+      description.isSource_ = true;
+      pProvider->setDescription(description);
+      iProvider.add(pProvider);
+    }
+    template <class T>
+    void addProviderTo(EventSetupProvider& /* iProvider */, std::shared_ptr<T> /*iComponent*/, const void*) {
+      //do nothing
+    }
+
+    struct SourceMakerTraits {
+      typedef EventSetupRecordIntervalFinder base_type;
+      static std::string name();
+      template <class T>
+      static void addTo(EventSetupProvider& iProvider,
+                        std::shared_ptr<T> iComponent,
+                        ParameterSet const& iConfiguration,
+                        bool matchesPreceding) {
+        if (matchesPreceding) {
+          logInfoWhenSharing(iConfiguration);
+        }
+        //a source does not always have to be a provider
+        addProviderTo(iProvider, iComponent, static_cast<const T*>(nullptr));
+        std::shared_ptr<EventSetupRecordIntervalFinder> pFinder(iComponent);
+        iProvider.add(pFinder);
       }
-      
-      struct SourceMakerTraits {
-         typedef EventSetupRecordIntervalFinder base_type;
-         static std::string name();
-         template<class T>
-         static void addTo(EventSetupProvider& iProvider,
-                           std::shared_ptr<T> iComponent,
-                           ParameterSet const& iConfiguration,
-                           bool matchesPreceding)
-            {
-               if (matchesPreceding) {
-                  logInfoWhenSharing(iConfiguration);
-               }
-               //a source does not always have to be a provider
-               addProviderTo(iProvider, iComponent, static_cast<const T*>(nullptr));
-               std::shared_ptr<EventSetupRecordIntervalFinder> pFinder(iComponent);
-               iProvider.add(pFinder);
-            }
-         static void replaceExisting(EventSetupProvider& iProvider, std::shared_ptr<EventSetupRecordIntervalFinder> iComponent); 
-               
-         static std::shared_ptr<base_type> getComponentAndRegisterProcess(EventSetupsController& esController,
-                                                                            ParameterSet const& iConfiguration);
-
-         static void putComponent(EventSetupsController& esController,
-                                  ParameterSet const& iConfiguration,
-                                  std::shared_ptr<base_type> const& component);
-
-         static void logInfoWhenSharing(ParameterSet const& iConfiguration);
-      };
-
-      template< class TType>
-         struct SourceMaker : public ComponentMaker<edm::eventsetup::SourceMakerTraits,TType> {};
-      typedef  ComponentFactory<SourceMakerTraits> SourceFactory ;
-      
-      typedef edmplugin::PluginFactory<edm::eventsetup::ComponentMakerBase<edm::eventsetup::SourceMakerTraits>* ()> SourcePluginFactory;
-   }
-}
-
-#define DEFINE_FWK_EVENTSETUP_SOURCE(type) \
-DEFINE_EDM_PLUGIN (edm::eventsetup::SourcePluginFactory,edm::eventsetup::SourceMaker<type>,#type); \
-DEFINE_DESC_FILLER_FOR_ESSOURCES(type)
+      static void replaceExisting(EventSetupProvider& iProvider,
+                                  std::shared_ptr<EventSetupRecordIntervalFinder> iComponent);
+
+      static std::shared_ptr<base_type> getComponentAndRegisterProcess(EventSetupsController& esController,
+                                                                       ParameterSet const& iConfiguration);
+
+      static void putComponent(EventSetupsController& esController,
+                               ParameterSet const& iConfiguration,
+                               std::shared_ptr<base_type> const& component);
+
+      static void logInfoWhenSharing(ParameterSet const& iConfiguration);
+    };
+
+    template <class TType>
+    struct SourceMaker : public ComponentMaker<edm::eventsetup::SourceMakerTraits, TType> {};
+    typedef ComponentFactory<SourceMakerTraits> SourceFactory;
+
+    typedef edmplugin::PluginFactory<edm::eventsetup::ComponentMakerBase<edm::eventsetup::SourceMakerTraits>*()>
+        SourcePluginFactory;
+  }  // namespace eventsetup
+}  // namespace edm
+
+#define DEFINE_FWK_EVENTSETUP_SOURCE(type)                                                            \
+  DEFINE_EDM_PLUGIN(edm::eventsetup::SourcePluginFactory, edm::eventsetup::SourceMaker<type>, #type); \
+  DEFINE_DESC_FILLER_FOR_ESSOURCES(type)
 
 #endif
diff --git a/FWCore/Framework/interface/SubProcess.h b/FWCore/Framework/interface/SubProcess.h
index 667f2dfe1476a..51921771a7365 100644
--- a/FWCore/Framework/interface/SubProcess.h
+++ b/FWCore/Framework/interface/SubProcess.h
@@ -58,32 +58,38 @@ namespace edm {
 
     ~SubProcess() override;
 
-    SubProcess(SubProcess const&) = delete; // Disallow copying
-    SubProcess& operator=(SubProcess const&) = delete; // Disallow copying
-    SubProcess(SubProcess&&) = default; // Allow Moving
-    SubProcess& operator=(SubProcess&&) = default; // Allow moving
+    SubProcess(SubProcess const&) = delete;             // Disallow copying
+    SubProcess& operator=(SubProcess const&) = delete;  // Disallow copying
+    SubProcess(SubProcess&&) = default;                 // Allow Moving
+    SubProcess& operator=(SubProcess&&) = default;      // Allow moving
 
     //From OutputModule
     void selectProducts(ProductRegistry const& preg,
                         ThinnedAssociationsHelper const& parentThinnedAssociationsHelper,
                         std::map<BranchID, bool>& keepAssociation);
 
-    SelectedProductsForBranchType const& keptProducts() const {return keptProducts_;}
+    SelectedProductsForBranchType const& keptProducts() const { return keptProducts_; }
 
     void doBeginJob();
     void doEndJob();
 
-    void doEventAsync(WaitingTaskHolder iHolder,
-                      EventPrincipal const& principal);
+    void doEventAsync(WaitingTaskHolder iHolder, EventPrincipal const& principal);
 
     void doBeginRunAsync(WaitingTaskHolder iHolder, RunPrincipal const& principal, IOVSyncValue const& ts);
 
-    void doEndRunAsync(WaitingTaskHolder iHolder, RunPrincipal const& principal, IOVSyncValue const& ts, bool cleaningUpAfterException);
+    void doEndRunAsync(WaitingTaskHolder iHolder,
+                       RunPrincipal const& principal,
+                       IOVSyncValue const& ts,
+                       bool cleaningUpAfterException);
 
-    void doBeginLuminosityBlockAsync(WaitingTaskHolder iHolder, LuminosityBlockPrincipal const& principal, IOVSyncValue const& ts);
-
-    void doEndLuminosityBlockAsync(WaitingTaskHolder iHolder, LuminosityBlockPrincipal const& principal, IOVSyncValue const& ts, bool cleaningUpAfterException);
+    void doBeginLuminosityBlockAsync(WaitingTaskHolder iHolder,
+                                     LuminosityBlockPrincipal const& principal,
+                                     IOVSyncValue const& ts);
 
+    void doEndLuminosityBlockAsync(WaitingTaskHolder iHolder,
+                                   LuminosityBlockPrincipal const& principal,
+                                   IOVSyncValue const& ts,
+                                   bool cleaningUpAfterException);
 
     void doBeginStream(unsigned int);
     void doEndStream(unsigned int);
@@ -93,7 +99,8 @@ namespace edm {
                                IOVSyncValue const& ts);
 
     void doStreamEndRunAsync(WaitingTaskHolder iHolder,
-                             unsigned int iID, RunPrincipal const& principal,
+                             unsigned int iID,
+                             RunPrincipal const& principal,
                              IOVSyncValue const& ts,
                              bool cleaningUpAfterException);
 
@@ -108,14 +115,16 @@ namespace edm {
                                          IOVSyncValue const& ts,
                                          bool cleaningUpAfterException);
 
-
     // Write the luminosity block
     void writeLumiAsync(WaitingTaskHolder, LuminosityBlockPrincipal&);
 
     void deleteLumiFromCache(LuminosityBlockPrincipal&);
 
     // Write the run
-    void writeRunAsync(WaitingTaskHolder, ProcessHistoryID const& parentPhID, int runNumber, MergeableRunProductMetadata const*);
+    void writeRunAsync(WaitingTaskHolder,
+                       ProcessHistoryID const& parentPhID,
+                       int runNumber,
+                       MergeableRunProductMetadata const*);
 
     void deleteRunFromCache(ProcessHistoryID const& parentPhID, int runNumber);
 
@@ -148,11 +157,11 @@ namespace edm {
     // Call shouldWeCloseFile() on all OutputModules.
     bool shouldWeCloseOutput() const {
       ServiceRegistry::Operate operate(serviceToken_);
-      if(schedule_->shouldWeCloseOutput()) {
+      if (schedule_->shouldWeCloseOutput()) {
         return true;
       }
-      for(auto const& subProcess : subProcesses_) {
-        if(subProcess.shouldWeCloseOutput()) {
+      for (auto const& subProcess : subProcesses_) {
+        if (subProcess.shouldWeCloseOutput()) {
           return true;
         }
       }
@@ -169,9 +178,7 @@ namespace edm {
     /// Return the number of events this SubProcess has tried to process
     /// (inclues both successes and failures, including failures due
     /// to exceptions during processing).
-    int totalEvents() const {
-      return schedule_->totalEvents();
-    }
+    int totalEvents() const { return schedule_->totalEvents(); }
 
     /// Return the number of events which have been passed by one or more trigger paths.
     int totalEventsPassed() const {
@@ -191,7 +198,7 @@ namespace edm {
     void enableEndPaths(bool active) {
       ServiceRegistry::Operate operate(serviceToken_);
       schedule_->enableEndPaths(active);
-      for_all(subProcesses_, [active](auto& subProcess){ subProcess.enableEndPaths(active); });
+      for_all(subProcesses_, [active](auto& subProcess) { subProcess.enableEndPaths(active); });
     }
 
     /// Return true if end_paths are active, and false if they are inactive.
@@ -211,11 +218,11 @@ namespace edm {
     /// If there is a subprocess, get this information from the subprocess.
     bool terminate() const {
       ServiceRegistry::Operate operate(serviceToken_);
-      if(schedule_->terminate()) {
+      if (schedule_->terminate()) {
         return true;
       }
-      for(auto const& subProcess : subProcesses_) {
-        if(subProcess.terminate()) {
+      for (auto const& subProcess : subProcesses_) {
+        if (subProcess.terminate()) {
           return true;
         }
       }
@@ -226,7 +233,7 @@ namespace edm {
     void clearCounters() {
       ServiceRegistry::Operate operate(serviceToken_);
       schedule_->clearCounters();
-      for_all(subProcesses_, [](auto& subProcess){ subProcess.clearCounters(); });
+      for_all(subProcesses_, [](auto& subProcess) { subProcess.clearCounters(); });
     }
 
   private:
@@ -239,7 +246,8 @@ namespace edm {
     void endLuminosityBlock(LuminosityBlockPrincipal const& lb, IOVSyncValue const& ts, bool cleaningUpAfterException);
 
     void propagateProducts(BranchType type, Principal const& parentPrincipal, Principal& principal) const;
-    void fixBranchIDListsForEDAliases(std::map<BranchID::value_type, BranchID::value_type> const& droppedBranchIDToKeptBranchID);
+    void fixBranchIDListsForEDAliases(
+        std::map<BranchID::value_type, BranchID::value_type> const& droppedBranchIDToKeptBranchID);
     void keepThisBranch(BranchDescription const& desc,
                         std::map<BranchID, BranchDescription const*>& trueBranchIDToKeptBranchDesc,
                         std::set<BranchID>& keptProductsInEvent);
@@ -248,34 +256,40 @@ namespace edm {
       return droppedBranchIDToKeptBranchID_;
     }
 
-    std::shared_ptr<BranchIDListHelper const> branchIDListHelper() const {return get_underlying_safe(branchIDListHelper_);}
-    std::shared_ptr<BranchIDListHelper>& branchIDListHelper() {return get_underlying_safe(branchIDListHelper_);}
-    std::shared_ptr<ThinnedAssociationsHelper const> thinnedAssociationsHelper() const {return get_underlying_safe(thinnedAssociationsHelper_);}
-    std::shared_ptr<ThinnedAssociationsHelper> thinnedAssociationsHelper() {return get_underlying_safe(thinnedAssociationsHelper_);}
+    std::shared_ptr<BranchIDListHelper const> branchIDListHelper() const {
+      return get_underlying_safe(branchIDListHelper_);
+    }
+    std::shared_ptr<BranchIDListHelper>& branchIDListHelper() { return get_underlying_safe(branchIDListHelper_); }
+    std::shared_ptr<ThinnedAssociationsHelper const> thinnedAssociationsHelper() const {
+      return get_underlying_safe(thinnedAssociationsHelper_);
+    }
+    std::shared_ptr<ThinnedAssociationsHelper> thinnedAssociationsHelper() {
+      return get_underlying_safe(thinnedAssociationsHelper_);
+    }
 
-    std::shared_ptr<ActivityRegistry>             actReg_; // We do not use propagate_const because the registry itself is mutable.
-    ServiceToken                                  serviceToken_;
-    std::shared_ptr<ProductRegistry const>        parentPreg_;
-    std::shared_ptr<ProductRegistry const>        preg_;
+    std::shared_ptr<ActivityRegistry> actReg_;  // We do not use propagate_const because the registry itself is mutable.
+    ServiceToken serviceToken_;
+    std::shared_ptr<ProductRegistry const> parentPreg_;
+    std::shared_ptr<ProductRegistry const> preg_;
     edm::propagate_const<std::shared_ptr<BranchIDListHelper>> branchIDListHelper_;
     edm::propagate_const<std::shared_ptr<ThinnedAssociationsHelper>> thinnedAssociationsHelper_;
     edm::propagate_const<std::shared_ptr<SubProcessParentageHelper>> subProcessParentageHelper_;
     std::unique_ptr<ExceptionToActionTable const> act_table_;
-    std::shared_ptr<ProcessConfiguration const>   processConfiguration_;
-    ProcessContext                                processContext_;
-    PathsAndConsumesOfModules                     pathsAndConsumesOfModules_;
+    std::shared_ptr<ProcessConfiguration const> processConfiguration_;
+    ProcessContext processContext_;
+    PathsAndConsumesOfModules pathsAndConsumesOfModules_;
     //We require 1 history for each Run, Lumi and Stream
     // The vectors first hold Stream info, then Lumi then Run
-    unsigned int                                  historyLumiOffset_;
-    unsigned int                                  historyRunOffset_;
-    std::vector<ProcessHistoryRegistry>           processHistoryRegistries_;
-    std::vector<HistoryAppender>                  historyAppenders_;
-    PrincipalCache                                principalCache_;
+    unsigned int historyLumiOffset_;
+    unsigned int historyRunOffset_;
+    std::vector<ProcessHistoryRegistry> processHistoryRegistries_;
+    std::vector<HistoryAppender> historyAppenders_;
+    PrincipalCache principalCache_;
     //vector index is principal lumi's index value
     std::vector<std::shared_ptr<LuminosityBlockPrincipal>> inUseLumiPrincipals_;
     edm::propagate_const<std::shared_ptr<eventsetup::EventSetupProvider>> esp_;
     edm::propagate_const<std::unique_ptr<Schedule>> schedule_;
-    std::map<ProcessHistoryID, ProcessHistoryID>  parentToChildPhID_;
+    std::map<ProcessHistoryID, ProcessHistoryID> parentToChildPhID_;
     std::vector<SubProcess> subProcesses_;
     edm::propagate_const<std::unique_ptr<ParameterSet>> processParameterSet_;
 
@@ -295,10 +309,9 @@ namespace edm {
     // needed because of possible EDAliases.
     // filled in only if key and value are different.
     std::map<BranchID::value_type, BranchID::value_type> droppedBranchIDToKeptBranchID_;
-
   };
 
   // free function
   std::vector<ParameterSet> popSubProcessVParameterSet(ParameterSet& parameterSet);
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/TriggerNamesService.h b/FWCore/Framework/interface/TriggerNamesService.h
index e66f32c7d3c08..1d31fafaf4510 100644
--- a/FWCore/Framework/interface/TriggerNamesService.h
+++ b/FWCore/Framework/interface/TriggerNamesService.h
@@ -39,10 +39,8 @@ namespace edm {
   class TriggerResults;
 
   namespace service {
-    class TriggerNamesService
-    {
+    class TriggerNamesService {
     public:
-
       typedef std::vector<std::string> Strings;
       typedef std::map<std::string, unsigned int> PosMap;
       typedef PosMap::size_type size_type;
@@ -55,8 +53,8 @@ namespace edm {
       // Return the number of trigger paths in the current process.
       size_type size() const { return trignames_.size(); }
       Strings const& getTrigPaths() const { return trignames_; }
-      std::string const&  getTrigPath(size_type const i) const { return trignames_.at(i);}
-      size_type  findTrigPath(std::string const& name) const { return find(trigpos_,name);}
+      std::string const& getTrigPath(size_type const i) const { return trignames_.at(i); }
+      size_type findTrigPath(std::string const& name) const { return find(trigpos_, name); }
 
       // Get the ordered vector of trigger names that corresponds to the bits
       // in the TriggerResults object.  Unlike the other functions in this class,
@@ -65,54 +63,45 @@ namespace edm {
       // works for modules in end paths, because the TriggerResults object is
       // not created until the normal paths complete execution.
       // Returns false if it fails to find the trigger path names.
-      bool getTrigPaths(TriggerResults const& triggerResults,
-                        Strings& trigPaths);
+      bool getTrigPaths(TriggerResults const& triggerResults, Strings& trigPaths);
 
       // This is the same as the previous function except the value returned in
       // the last argument indicates whether the results were retrieved from the
       // ParameterSet registry.  This will always be true except in old data where
       // the trigger names were stored inside of the TriggerResults object.
-      bool getTrigPaths(TriggerResults const& triggerResults,
-                        Strings& trigPaths,
-                        bool& fromPSetRegistry);
+      bool getTrigPaths(TriggerResults const& triggerResults, Strings& trigPaths, bool& fromPSetRegistry);
 
       Strings const& getEndPaths() const { return end_names_; }
-      std::string const&  getEndPath(size_type const i) const { return end_names_.at(i);}
-      size_type  findEndPath(std::string const& name) const { return find(end_pos_,name);}
+      std::string const& getEndPath(size_type const i) const { return end_names_.at(i); }
+      size_type findEndPath(std::string const& name) const { return find(end_pos_, name); }
 
-      Strings const& getTrigPathModules(std::string const& name) const {
-	return modulenames_.at(find(trigpos_,name));
-      }
-      Strings const& getTrigPathModules(size_type const i) const {
-	return modulenames_.at(i);
-      }
-      std::string const&  getTrigPathModule (std::string const& name, size_type const j) const {
-	return (modulenames_.at(find(trigpos_,name))).at(j);
+      Strings const& getTrigPathModules(std::string const& name) const { return modulenames_.at(find(trigpos_, name)); }
+      Strings const& getTrigPathModules(size_type const i) const { return modulenames_.at(i); }
+      std::string const& getTrigPathModule(std::string const& name, size_type const j) const {
+        return (modulenames_.at(find(trigpos_, name))).at(j);
       }
-      std::string const&  getTrigPathModule (size_type const i, size_type const j) const {
-	return (modulenames_.at(i)).at(j);
+      std::string const& getTrigPathModule(size_type const i, size_type const j) const {
+        return (modulenames_.at(i)).at(j);
       }
 
       Strings const& getEndPathModules(std::string const& name) const {
-	return end_modulenames_.at(find(end_pos_,name));
+        return end_modulenames_.at(find(end_pos_, name));
       }
-      Strings const& getEndPathModules(size_type const i) const {
-	return end_modulenames_.at(i);
+      Strings const& getEndPathModules(size_type const i) const { return end_modulenames_.at(i); }
+      std::string const& getEndPathModule(std::string const& name, size_type const j) const {
+        return (end_modulenames_.at(find(end_pos_, name))).at(j);
       }
-      std::string const&  getEndPathModule (std::string const& name, size_type const j) const {
-	return (end_modulenames_.at(find(end_pos_,name))).at(j);
-      }
-      std::string const&  getEndPathModule (size_type const i, size_type const j) const {
-	return (end_modulenames_.at(i)).at(j);
+      std::string const& getEndPathModule(size_type const i, size_type const j) const {
+        return (end_modulenames_.at(i)).at(j);
       }
 
-      size_type find (PosMap const& posmap, std::string const& name) const {
-	PosMap::const_iterator const pos(posmap.find(name));
+      size_type find(PosMap const& posmap, std::string const& name) const {
+        PosMap::const_iterator const pos(posmap.find(name));
         if (pos == posmap.end()) {
-	  return posmap.size();
-	} else {
+          return posmap.size();
+        } else {
           return pos->second;
-	}
+        }
       }
 
       std::string const& getProcessName() const { return process_name_; }
@@ -122,28 +111,27 @@ namespace edm {
       edm::ParameterSet const& getTriggerPSet() const { return trigger_pset_; }
 
     private:
-
       void loadPosMap(PosMap& posmap, Strings const& names) {
         size_type const n(names.size());
-	for (size_type i = 0; i != n; ++i) {
-	  posmap[names[i]] = i;
-	}
+        for (size_type i = 0; i != n; ++i) {
+          posmap[names[i]] = i;
+        }
       }
 
       edm::ParameterSet trigger_pset_;
 
       Strings trignames_;
-      PosMap  trigpos_;
+      PosMap trigpos_;
       Strings end_names_;
-      PosMap  end_pos_;
+      PosMap end_pos_;
 
-      std::vector<Strings> modulenames_;        // modules on trigger paths
-      std::vector<Strings> end_modulenames_;    // modules on endpaths
+      std::vector<Strings> modulenames_;      // modules on trigger paths
+      std::vector<Strings> end_modulenames_;  // modules on endpaths
 
       std::string process_name_;
       bool wantSummary_;
     };
-  }
-}
+  }  // namespace service
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/TriggerReport.h b/FWCore/Framework/interface/TriggerReport.h
index a72dd4012971f..a3a875367f47a 100644
--- a/FWCore/Framework/interface/TriggerReport.h
+++ b/FWCore/Framework/interface/TriggerReport.h
@@ -15,15 +15,13 @@ creation.
 
 namespace edm {
 
-  struct EventSummary
-  {
+  struct EventSummary {
     int totalEvents = 0;
     int totalEventsPassed = 0;
     int totalEventsFailed = 0;
   };
 
-  struct ModuleInPathSummary
-  {
+  struct ModuleInPathSummary {
     int timesVisited = 0;
     int timesPassed = 0;
     int timesFailed = 0;
@@ -32,9 +30,7 @@ namespace edm {
     std::string moduleLabel;
   };
 
-
-  struct PathSummary
-  {
+  struct PathSummary {
     int bitPosition = 0;
     int timesRun = 0;
     int timesPassed = 0;
@@ -45,8 +41,7 @@ namespace edm {
     std::vector<ModuleInPathSummary> moduleInPathSummaries;
   };
 
-  struct WorkerSummary
-  {
+  struct WorkerSummary {
     int timesVisited = 0;
     int timesRun = 0;
     int timesPassed = 0;
@@ -56,18 +51,14 @@ namespace edm {
     std::string moduleLabel;
   };
 
-  inline
-  bool operator<(WorkerSummary const& a, WorkerSummary const& b) {
-    return a.moduleLabel < b.moduleLabel;
-  }
+  inline bool operator<(WorkerSummary const& a, WorkerSummary const& b) { return a.moduleLabel < b.moduleLabel; }
 
-  struct TriggerReport
-  {
-    EventSummary               eventSummary;
-    std::vector<PathSummary>   trigPathSummaries;
-    std::vector<PathSummary>   endPathSummaries;
+  struct TriggerReport {
+    EventSummary eventSummary;
+    std::vector<PathSummary> trigPathSummaries;
+    std::vector<PathSummary> endPathSummaries;
     std::vector<WorkerSummary> workerSummaries;
   };
 
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/TriggerResultsBasedEventSelector.h b/FWCore/Framework/interface/TriggerResultsBasedEventSelector.h
index 93ce04d963d48..7dbe66b93032a 100644
--- a/FWCore/Framework/interface/TriggerResultsBasedEventSelector.h
+++ b/FWCore/Framework/interface/TriggerResultsBasedEventSelector.h
@@ -29,47 +29,40 @@ namespace edm {
 
     class NamedEventSelector {
     public:
-      NamedEventSelector(std::string const& n, EventSelector const& s, ConsumesCollector&& iC) :
-	inputTag_("TriggerResults", "", n),
-        token_(iC.consumes<TriggerResults>(inputTag_)),
-	eventSelector_(s)
-      { }
-
-      bool match(TriggerResults const& product) {
-	return eventSelector_.acceptEvent(product);
-      }
-
-      InputTag const& inputTag() const {
-        return inputTag_;
-      }
-
-      EDGetTokenT<TriggerResults> const& token() const {
-        return token_;
-      }
+      NamedEventSelector(std::string const& n, EventSelector const& s, ConsumesCollector&& iC)
+          : inputTag_("TriggerResults", "", n), token_(iC.consumes<TriggerResults>(inputTag_)), eventSelector_(s) {}
+
+      bool match(TriggerResults const& product) { return eventSelector_.acceptEvent(product); }
+
+      InputTag const& inputTag() const { return inputTag_; }
+
+      EDGetTokenT<TriggerResults> const& token() const { return token_; }
+
     private:
-      InputTag            inputTag_;
+      InputTag inputTag_;
       EDGetTokenT<TriggerResults> token_;
-      EventSelector       eventSelector_;
+      EventSelector eventSelector_;
     };
 
     class TriggerResultsBasedEventSelector {
     public:
       TriggerResultsBasedEventSelector();
-      typedef detail::handle_t                    handle_t;
-      typedef std::vector<NamedEventSelector>     selectors_t;
+      typedef detail::handle_t handle_t;
+      typedef std::vector<NamedEventSelector> selectors_t;
       typedef std::pair<std::string, std::string> parsed_path_spec_t;
 
       void setupDefault();
 
       void setup(std::vector<parsed_path_spec_t> const& path_specs,
-		 std::vector<std::string> const& triggernames,
+                 std::vector<std::string> const& triggernames,
                  std::string const& process_name,
                  ConsumesCollector&& iC);
 
       bool wantEvent(EventForOutput const& e);
 
-      unsigned int numberOfTokens() const { return selectors_.size();}
-      EDGetToken token(unsigned int index) const {return selectors_[index].token();}
+      unsigned int numberOfTokens() const { return selectors_.size(); }
+      EDGetToken token(unsigned int index) const { return selectors_[index].token(); }
+
     private:
       selectors_t selectors_;
       bool wantAllEvents_;
@@ -86,12 +79,13 @@ namespace edm {
     /** Takes the user specified SelectEvents PSet and creates a new one
      which conforms to the canonical format required for provenance
      */
-    ParameterSetID registerProperSelectionInfo(edm::ParameterSet const& iInitial,
-                                               std::string const& iLabel,
-                                               std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
-                                               bool anyProductProduced);
-
-  }
-}
+    ParameterSetID registerProperSelectionInfo(
+        edm::ParameterSet const& iInitial,
+        std::string const& iLabel,
+        std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
+        bool anyProductProduced);
+
+  }  // namespace detail
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/TriggerTimingReport.h b/FWCore/Framework/interface/TriggerTimingReport.h
index 639758e0125da..3726c0a1afb81 100644
--- a/FWCore/Framework/interface/TriggerTimingReport.h
+++ b/FWCore/Framework/interface/TriggerTimingReport.h
@@ -14,54 +14,47 @@ reporting on the timing of the trigger.
 
 namespace edm {
 
-  struct EventTimingSummary
-  {
+  struct EventTimingSummary {
     int totalEvents = 0;
     double cpuTime = 0.;
-    double realTime =0.;
+    double realTime = 0.;
     double sumStreamRealTime = 0.;
   };
 
-  struct ModuleInPathTimingSummary
-  {
+  struct ModuleInPathTimingSummary {
     int timesVisited = 0;
-    double realTime =0.;
+    double realTime = 0.;
 
     std::string moduleLabel;
   };
 
-
-  struct PathTimingSummary
-  {
+  struct PathTimingSummary {
     int bitPosition = 0;
     int timesRun = 0;
-    double realTime =0.;
+    double realTime = 0.;
 
     std::string name;
     std::vector<ModuleInPathTimingSummary> moduleInPathSummaries;
   };
 
-  struct WorkerTimingSummary
-  {
+  struct WorkerTimingSummary {
     int timesVisited = 0;
     int timesRun = 0;
-    double realTime =0.;
+    double realTime = 0.;
 
     std::string moduleLabel;
   };
 
-  inline
-  bool operator<(WorkerTimingSummary const& a, WorkerTimingSummary const& b) {
+  inline bool operator<(WorkerTimingSummary const& a, WorkerTimingSummary const& b) {
     return a.moduleLabel < b.moduleLabel;
   }
 
-  struct TriggerTimingReport
-  {
-    EventTimingSummary               eventSummary;
-    std::vector<PathTimingSummary>   trigPathSummaries;
-    std::vector<PathTimingSummary>   endPathSummaries;
+  struct TriggerTimingReport {
+    EventTimingSummary eventSummary;
+    std::vector<PathTimingSummary> trigPathSummaries;
+    std::vector<PathTimingSummary> endPathSummaries;
     std::vector<WorkerTimingSummary> workerSummaries;
   };
 
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/UnknownModuleException.h b/FWCore/Framework/interface/UnknownModuleException.h
index d90ec360055bb..0bda1332f97dc 100644
--- a/FWCore/Framework/interface/UnknownModuleException.h
+++ b/FWCore/Framework/interface/UnknownModuleException.h
@@ -26,20 +26,17 @@ namespace edm {
   */
   class UnknownModuleException : public cms::Exception {
   public:
-
-    UnknownModuleException(const std::string & moduletype):
-      cms::Exception("UnknownModule")
-    {
-      (*this) << "Module " << moduletype << " was not registered \n"
-	"Perhaps your module type is misspelled or is not a "
-	"framework plugin \n"
-	"Try running EdmPluginDump to obtain a list "
-	"of available Plugins\n";
+    UnknownModuleException(const std::string& moduletype) : cms::Exception("UnknownModule") {
+      (*this) << "Module " << moduletype
+              << " was not registered \n"
+                 "Perhaps your module type is misspelled or is not a "
+                 "framework plugin \n"
+                 "Try running EdmPluginDump to obtain a list "
+                 "of available Plugins\n";
     }
-    ~UnknownModuleException() noexcept override{}
-  }; // UnknownModuleException
-
+    ~UnknownModuleException() noexcept override {}
+  };  // UnknownModuleException
 
-} // edm
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/UnscheduledCallProducer.h b/FWCore/Framework/interface/UnscheduledCallProducer.h
index 3d69081324b87..6f51b274f326a 100644
--- a/FWCore/Framework/interface/UnscheduledCallProducer.h
+++ b/FWCore/Framework/interface/UnscheduledCallProducer.h
@@ -34,10 +34,9 @@ namespace edm {
 
   class UnscheduledCallProducer {
   public:
-    
     using worker_container = std::vector<Worker*>;
     using const_iterator = worker_container::const_iterator;
-    
+
     UnscheduledCallProducer(ActivityRegistry& iReg) : unscheduledWorkers_() {
       aux_.preModuleDelayedGetSignal_.connect(std::cref(iReg.preModuleEventDelayedGetSignal_));
       aux_.postModuleDelayedGetSignal_.connect(std::cref(iReg.postModuleEventDelayedGetSignal_));
@@ -49,24 +48,25 @@ namespace edm {
         accumulatorWorkers_.push_back(aWorker);
       }
     }
-    
-    void setEventSetup(EventSetupImpl const& iSetup) {
-      aux_.setEventSetup(&iSetup);
-    }
+
+    void setEventSetup(EventSetupImpl const& iSetup) { aux_.setEventSetup(&iSetup); }
 
     UnscheduledAuxiliary const& auxiliary() const { return aux_; }
 
     const_iterator begin() const { return unscheduledWorkers_.begin(); }
     const_iterator end() const { return unscheduledWorkers_.end(); }
-    
+
     template <typename T, typename U>
     void runNowAsync(WaitingTask* task,
-                     typename T::MyPrincipal& p, EventSetupImpl const& es,
-                     ServiceToken const& token, StreamID streamID,
-                     typename T::Context const* topContext, U const* context) const {
+                     typename T::MyPrincipal& p,
+                     EventSetupImpl const& es,
+                     ServiceToken const& token,
+                     StreamID streamID,
+                     typename T::Context const* topContext,
+                     U const* context) const {
       //do nothing for event since we will run when requested
-      if(!T::isEvent_) {
-        for(auto worker: unscheduledWorkers_) {
+      if (!T::isEvent_) {
+        for (auto worker : unscheduledWorkers_) {
           ParentContext parentContext(context);
 
           // We do not need to run prefetching here because this only handles
@@ -96,7 +96,7 @@ namespace edm {
     template <typename T, typename ID>
     void addContextToException(cms::Exception& ex, Worker const* worker, ID const& id) const {
       std::ostringstream ost;
-      ost << "Processing " << T::transitionName()<<" "<< id;
+      ost << "Processing " << T::transitionName() << " " << id;
       ex.addContext(ost.str());
     }
     worker_container unscheduledWorkers_;
@@ -104,7 +104,6 @@ namespace edm {
     UnscheduledAuxiliary aux_;
   };
 
-}
+}  // namespace edm
 
 #endif
-
diff --git a/FWCore/Framework/interface/ValidityInterval.h b/FWCore/Framework/interface/ValidityInterval.h
index 69256e815a87c..adec700d84ff7 100644
--- a/FWCore/Framework/interface/ValidityInterval.h
+++ b/FWCore/Framework/interface/ValidityInterval.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     ValidityInterval
-// 
+//
 /**\class ValidityInterval ValidityInterval.h FWCore/Framework/interface/ValidityInterval.h
 
  Description: <one line class summary>
@@ -25,49 +25,37 @@
 
 // forward declarations
 namespace edm {
-class ValidityInterval
-{
+  class ValidityInterval {
+  public:
+    ValidityInterval();
+    ValidityInterval(const IOVSyncValue& iFirst, const IOVSyncValue& iLast);
+    //virtual ~ValidityInterval();
+
+    // ---------- const member functions ---------------------
+    bool validFor(const IOVSyncValue&) const;
+
+    const IOVSyncValue& first() const { return first_; }
+    const IOVSyncValue& last() const { return last_; }
+
+    bool operator==(const ValidityInterval& iRHS) const { return iRHS.first_ == first_ && iRHS.last_ == last_; }
+    bool operator!=(const ValidityInterval& iRHS) const { return !(*this == iRHS); }
+
+    // ---------- static member functions --------------------
+    static const ValidityInterval& invalidInterval();
 
-   public:
-      ValidityInterval();
-      ValidityInterval(const IOVSyncValue& iFirst,
-                       const IOVSyncValue& iLast);
-      //virtual ~ValidityInterval();
+    // ---------- member functions ---------------------------
+    void setFirst(const IOVSyncValue& iTime) { first_ = iTime; }
+    void setLast(const IOVSyncValue& iTime) { last_ = iTime; }
 
-      // ---------- const member functions ---------------------
-      bool validFor(const IOVSyncValue&) const;
-      
-      const IOVSyncValue& first() const { return first_; }
-      const IOVSyncValue& last() const { return last_; }
-      
-      bool operator==(const ValidityInterval& iRHS) const {
-         return iRHS.first_ == first_ && 
-         iRHS.last_ == last_ ;
-      }
-      bool operator!=(const ValidityInterval& iRHS) const {
-         return ! (*this == iRHS);
-      }
-      
-      // ---------- static member functions --------------------
-      static const ValidityInterval& invalidInterval();
-      
-      // ---------- member functions ---------------------------
-      void setFirst(const IOVSyncValue& iTime) {
-         first_ = iTime;
-      }
-      void setLast(const IOVSyncValue& iTime) {
-         last_ = iTime;
-      }
-      
-   private:
-      //ValidityInterval(const ValidityInterval&); // stop default
+  private:
+    //ValidityInterval(const ValidityInterval&); // stop default
 
-      //const ValidityInterval& operator=(const ValidityInterval&); // stop default
+    //const ValidityInterval& operator=(const ValidityInterval&); // stop default
 
-      // ---------- member data --------------------------------
-      IOVSyncValue first_;
-      IOVSyncValue last_;
-};
+    // ---------- member data --------------------------------
+    IOVSyncValue first_;
+    IOVSyncValue last_;
+  };
 
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/WillGetIfMatch.h b/FWCore/Framework/interface/WillGetIfMatch.h
index 16de3f6970d52..5d71bda7a4585 100644
--- a/FWCore/Framework/interface/WillGetIfMatch.h
+++ b/FWCore/Framework/interface/WillGetIfMatch.h
@@ -18,36 +18,31 @@ See comments in the file GetterOfProducts.h.
 
 namespace edm {
 
-  template<typename T>
+  template <typename T>
   class WillGetIfMatch {
   public:
-
     template <typename U>
-    WillGetIfMatch(U const& match, EDConsumerBase* module):
-      match_(match),
-      module_(module) {
-    }
-    
-    EDGetTokenT<T>  operator()(BranchDescription const& branchDescription) {
-      if (match_(branchDescription)){
+    WillGetIfMatch(U const& match, EDConsumerBase* module) : match_(match), module_(module) {}
+
+    EDGetTokenT<T> operator()(BranchDescription const& branchDescription) {
+      if (match_(branchDescription)) {
         auto transition = branchDescription.branchType();
-        edm::InputTag tag{branchDescription.moduleLabel(),
-                          branchDescription.productInstanceName(),
-                          branchDescription.processName()};
-        if(transition == edm::InEvent) {
+        edm::InputTag tag{
+            branchDescription.moduleLabel(), branchDescription.productInstanceName(), branchDescription.processName()};
+        if (transition == edm::InEvent) {
           return module_->template consumes<T>(tag);
-        } else if(transition == edm::InLumi) {
-          return module_->template consumes<T,edm::InLumi>(tag);
-        } else if(transition == edm::InRun) {
-          return module_->template consumes<T,edm::InRun>(tag);
+        } else if (transition == edm::InLumi) {
+          return module_->template consumes<T, edm::InLumi>(tag);
+        } else if (transition == edm::InRun) {
+          return module_->template consumes<T, edm::InRun>(tag);
         }
       }
       return EDGetTokenT<T>{};
     }
-    
+
   private:
     std::function<bool(BranchDescription const&)> match_;
     EDConsumerBase* module_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/WorkerManager.h b/FWCore/Framework/interface/WorkerManager.h
index 28a235cb5d738..3fbde44ba3389 100644
--- a/FWCore/Framework/interface/WorkerManager.h
+++ b/FWCore/Framework/interface/WorkerManager.h
@@ -27,7 +27,9 @@ namespace edm {
   class StreamContext;
   class ModuleRegistry;
   class PreallocationConfiguration;
-  
+  namespace eventsetup {
+    class ESRecordsToProxyIndices;
+  }
   class WorkerManager {
   public:
     typedef std::vector<Worker*> AllWorkers;
@@ -47,21 +49,20 @@ namespace edm {
                                  std::vector<std::string>& shouldBeUsedLabels);
 
     template <typename T, typename U>
-      void processOneOccurrence(typename T::MyPrincipal& principal,
-                                EventSetupImpl const& eventSetup,
-                                StreamID streamID,
-                                typename T::Context const* topContext,
-                                U const* context,
-                                bool cleaningUpAfterException = false);
-    template <typename T, typename U>
-    void processOneOccurrenceAsync(
-                              WaitingTask* task,
-                              typename T::MyPrincipal& principal,
+    void processOneOccurrence(typename T::MyPrincipal& principal,
                               EventSetupImpl const& eventSetup,
-                              ServiceToken const& token,
                               StreamID streamID,
                               typename T::Context const* topContext,
-                              U const* context);
+                              U const* context,
+                              bool cleaningUpAfterException = false);
+    template <typename T, typename U>
+    void processOneOccurrenceAsync(WaitingTask* task,
+                                   typename T::MyPrincipal& principal,
+                                   EventSetupImpl const& eventSetup,
+                                   ServiceToken const& token,
+                                   StreamID streamID,
+                                   typename T::Context const* topContext,
+                                   U const* context);
 
     template <typename T>
     void processAccumulatorsAsync(WaitingTask* task,
@@ -74,18 +75,18 @@ namespace edm {
 
     void setupOnDemandSystem(Principal& principal, EventSetupImpl const& es);
 
-    void beginJob(ProductRegistry const& iRegistry);
+    void beginJob(ProductRegistry const& iRegistry, eventsetup::ESRecordsToProxyIndices const&);
     void endJob();
     void endJob(ExceptionCollector& collector);
 
     void beginStream(StreamID iID, StreamContext& streamContext);
     void endStream(StreamID iID, StreamContext& streamContext);
-    
-    AllWorkers const& allWorkers() const {return allWorkers_;}
+
+    AllWorkers const& allWorkers() const { return allWorkers_; }
 
     void addToAllWorkers(Worker* w);
 
-    ExceptionToActionTable const&  actionTable() const {return *actionTable_;}
+    ExceptionToActionTable const& actionTable() const { return *actionTable_; }
 
     Worker* getWorker(ParameterSet& pset,
                       ProductRegistry& preg,
@@ -96,36 +97,34 @@ namespace edm {
     void resetAll();
 
   private:
-
-    WorkerRegistry      workerReg_;
-    ExceptionToActionTable const*  actionTable_;
-    AllWorkers          allWorkers_;
+    WorkerRegistry workerReg_;
+    ExceptionToActionTable const* actionTable_;
+    AllWorkers allWorkers_;
     UnscheduledCallProducer unscheduled_;
     void const* lastSetupEventPrincipal_;
   };
 
   template <typename T, typename U>
-  void
-    WorkerManager::processOneOccurrence(typename T::MyPrincipal& ep,
-                                        EventSetupImpl const& es,
-                                        StreamID streamID,
-                                        typename T::Context const* topContext,
-                                        U const* context,
-                                        bool cleaningUpAfterException) {
+  void WorkerManager::processOneOccurrence(typename T::MyPrincipal& ep,
+                                           EventSetupImpl const& es,
+                                           StreamID streamID,
+                                           typename T::Context const* topContext,
+                                           U const* context,
+                                           bool cleaningUpAfterException) {
     this->resetAll();
 
     auto waitTask = make_empty_waiting_task();
     waitTask->increment_ref_count();
-    processOneOccurrenceAsync<T,U>(waitTask.get(), ep, es, ServiceRegistry::instance().presentToken(), streamID, topContext, context);
+    processOneOccurrenceAsync<T, U>(
+        waitTask.get(), ep, es, ServiceRegistry::instance().presentToken(), streamID, topContext, context);
     waitTask->wait_for_all();
-    if(waitTask->exceptionPtr() != nullptr) {
-      try{ 
-      convertException::wrap([&]() {
-          std::rethrow_exception(* (waitTask->exceptionPtr()) );
-        });
-      } catch(cms::Exception& ex) {
+    if (waitTask->exceptionPtr() != nullptr) {
+      try {
+        convertException::wrap([&]() { std::rethrow_exception(*(waitTask->exceptionPtr())); });
+      } catch (cms::Exception& ex) {
         if (ex.context().empty()) {
-          addContextAndPrintException("Calling function WorkerManager::processOneOccurrence", ex, cleaningUpAfterException);
+          addContextAndPrintException(
+              "Calling function WorkerManager::processOneOccurrence", ex, cleaningUpAfterException);
         } else {
           addContextAndPrintException("", ex, cleaningUpAfterException);
         }
@@ -135,29 +134,27 @@ namespace edm {
   }
 
   template <typename T, typename U>
-  void
-  WorkerManager::processOneOccurrenceAsync(WaitingTask* task,
-                                           typename T::MyPrincipal& ep,
-                                           EventSetupImpl const& es,
-                                           ServiceToken const& token,
-                                           StreamID streamID,
-                                           typename T::Context const* topContext,
-                                           U const* context) {
+  void WorkerManager::processOneOccurrenceAsync(WaitingTask* task,
+                                                typename T::MyPrincipal& ep,
+                                                EventSetupImpl const& es,
+                                                ServiceToken const& token,
+                                                StreamID streamID,
+                                                typename T::Context const* topContext,
+                                                U const* context) {
     //make sure the unscheduled items see this run or lumi transition
-    unscheduled_.runNowAsync<T,U>(task,ep, es, token, streamID, topContext, context);
+    unscheduled_.runNowAsync<T, U>(task, ep, es, token, streamID, topContext, context);
   }
 
   template <typename T>
-  void
-  WorkerManager::processAccumulatorsAsync(WaitingTask* task,
-                                          typename T::MyPrincipal const& ep,
-                                          EventSetupImpl const& es,
-                                          ServiceToken const& token,
-                                          StreamID streamID,
-                                          ParentContext const& parentContext,
-                                          typename T::Context const* context) {
+  void WorkerManager::processAccumulatorsAsync(WaitingTask* task,
+                                               typename T::MyPrincipal const& ep,
+                                               EventSetupImpl const& es,
+                                               ServiceToken const& token,
+                                               StreamID streamID,
+                                               ParentContext const& parentContext,
+                                               typename T::Context const* context) {
     unscheduled_.runAccumulatorsAsync<T>(task, ep, es, token, streamID, parentContext, context);
   }
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/data_default_record_trait.h b/FWCore/Framework/interface/data_default_record_trait.h
index 2b13bbf451e14..3dd53100a8f0a 100644
--- a/FWCore/Framework/interface/data_default_record_trait.h
+++ b/FWCore/Framework/interface/data_default_record_trait.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     data_default_record_trait
-// 
+//
 /**\class data_default_record_trait data_default_record_trait.h FWCore/Framework/interface/data_default_record_trait.h
 
  Description: trait class that assigns a default EventSetup Record to a particular data type
@@ -48,15 +48,15 @@ namespace edm {
   // Special class to denote that the default record should be used.
   struct DefaultRecord {};
 
-   namespace eventsetup {
-      template< class T> struct MUST_GET_RECORD_FROM_EVENTSETUP_TO_GET_DATA;
-      
-      template<class DataT>
-         struct data_default_record_trait
-      {
-         //NOTE: by default, a data item does not have a default record
-         typedef MUST_GET_RECORD_FROM_EVENTSETUP_TO_GET_DATA<DataT> type;
-      };
+  namespace eventsetup {
+    template <class T>
+    struct MUST_GET_RECORD_FROM_EVENTSETUP_TO_GET_DATA;
+
+    template <class DataT>
+    struct data_default_record_trait {
+      //NOTE: by default, a data item does not have a default record
+      typedef MUST_GET_RECORD_FROM_EVENTSETUP_TO_GET_DATA<DataT> type;
+    };
 
     template <typename T>
     struct default_record {
@@ -66,10 +66,20 @@ namespace edm {
 
     template <typename T>
     using default_record_t = typename default_record<T>::RecordT;
-   }
-}
+  }  // namespace eventsetup
+
+  template <typename T>
+  struct ESHandleAdapter {
+    using value_type = T;
+  };
+}  // namespace edm
 
 #define EVENTSETUP_DATA_DEFAULT_RECORD(_data_, _record_) \
-  namespace edm::eventsetup { template<> struct data_default_record_trait<_data_>{ typedef _record_ type; }; }
+  namespace edm::eventsetup {                            \
+    template <>                                          \
+    struct data_default_record_trait<_data_> {           \
+      typedef _record_ type;                             \
+    };                                                   \
+  }
 
 #endif
diff --git a/FWCore/Framework/interface/defaultCmsRunServices.h b/FWCore/Framework/interface/defaultCmsRunServices.h
index cd9ba0b46acfc..b05955425f4d6 100644
--- a/FWCore/Framework/interface/defaultCmsRunServices.h
+++ b/FWCore/Framework/interface/defaultCmsRunServices.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     defaultCmsRunServices
-// 
+//
 /**\class defaultCmsRunServices defaultCmsRunServices.h FWCore/Framework/interface/defaultCmsRunServices.h
 
  Description: Returns the names of the standard cmsRun default services
@@ -28,7 +28,7 @@
 // forward declarations
 
 namespace edm {
-   std::vector<std::string> defaultCmsRunServices();
+  std::vector<std::string> defaultCmsRunServices();
 }
 
 #endif
diff --git a/FWCore/Framework/interface/es_Label.h b/FWCore/Framework/interface/es_Label.h
index 4f1da089d80a7..57e303be0f3c9 100644
--- a/FWCore/Framework/interface/es_Label.h
+++ b/FWCore/Framework/interface/es_Label.h
@@ -32,7 +32,7 @@
 
 namespace edm::es {
 
-  template<typename T, int ILabel>
+  template <typename T, int ILabel>
   struct L {
     using element_type = T;
 
@@ -41,49 +41,43 @@ namespace edm::es {
     explicit L(std::unique_ptr<T> iP) : product_{std::move(iP)} {}
     explicit L(T* iP) : product_(iP) {}
 
-    T& operator*() { return *product_;}
+    T& operator*() { return *product_; }
     T* operator->() { return product_.get(); }
     mutable std::shared_ptr<T> product_{nullptr};
   };
 
-  template<int ILabel, typename T>
-  L<T,ILabel> l(std::shared_ptr<T>& iP) {
-    return L<T,ILabel>{iP};
+  template <int ILabel, typename T>
+  L<T, ILabel> l(std::shared_ptr<T>& iP) {
+    return L<T, ILabel>{iP};
   }
 
   struct Label {
     Label() = default;
     Label(const char* iLabel) : default_{iLabel} {}
     Label(const std::string& iString) : default_{iString} {}
-    Label(const std::string& iString, unsigned int const iIndex) :
-      labels_(iIndex+1, def())
-    {
+    Label(const std::string& iString, unsigned int const iIndex) : labels_(iIndex + 1, def()) {
       labels_[iIndex] = iString;
     }
 
-    Label& operator()(const std::string& iString, unsigned int const iIndex)
-    {
+    Label& operator()(const std::string& iString, unsigned int const iIndex) {
       if (iIndex == labels_.size()) {
         labels_.push_back(iString);
-      } else if(iIndex > labels_.size()) {
-        std::vector<std::string> temp(iIndex+1,def());
+      } else if (iIndex > labels_.size()) {
+        std::vector<std::string> temp(iIndex + 1, def());
         copy_all(labels_, temp.begin());
         labels_.swap(temp);
       } else {
-        if( labels_[iIndex] != def() ) {
-          Exception e(errors::Configuration,"Duplicate Label");
-          e <<"The index "<<iIndex<<" was previously assigned the label \""
-            <<labels_[iIndex]<<"\" and then was later assigned \""
-            <<iString<<"\"";
+        if (labels_[iIndex] != def()) {
+          Exception e(errors::Configuration, "Duplicate Label");
+          e << "The index " << iIndex << " was previously assigned the label \"" << labels_[iIndex]
+            << "\" and then was later assigned \"" << iString << "\"";
           e.raise();
         }
         labels_[iIndex] = iString;
       }
       return *this;
     }
-    Label& operator()(int iIndex, const std::string& iString) {
-      return (*this)(iString, iIndex);
-    }
+    Label& operator()(int iIndex, const std::string& iString) { return (*this)(iString, iIndex); }
 
     static const std::string& def() {
       static const std::string s_def("\n\t");
@@ -94,12 +88,8 @@ namespace edm::es {
     std::string default_{};
   };
 
-  inline Label label(const std::string& iString, int iIndex) {
-    return Label(iString, iIndex);
-  }
-  inline Label label(int iIndex, const std::string& iString) {
-    return Label(iString, iIndex);
-  }
-}
+  inline Label label(const std::string& iString, int iIndex) { return Label(iString, iIndex); }
+  inline Label label(int iIndex, const std::string& iString) { return Label(iString, iIndex); }
+}  // namespace edm::es
 
 #endif
diff --git a/FWCore/Framework/interface/eventsetup_dependsOn.h b/FWCore/Framework/interface/eventsetup_dependsOn.h
index 9534bef7ac55b..829e53063ce6a 100644
--- a/FWCore/Framework/interface/eventsetup_dependsOn.h
+++ b/FWCore/Framework/interface/eventsetup_dependsOn.h
@@ -5,7 +5,7 @@
 //
 // Package:     Framework
 // Class  :     eventsetup_dependsOn
-// 
+//
 /**\class eventsetup_dependsOn eventsetup_dependsOn.h FWCore/Framework/interface/eventsetup_dependsOn.h
 
  Description: function used to set what methods to call when a dependent Record changes
@@ -54,151 +54,160 @@
 
 // forward declarations
 
-
 namespace edm {
-   namespace eventsetup {
-      
-      //Simple functor that checks to see if a Record has changed since the last time it was called
-      // and if so, calls the appropriate member method.  Multiple callers can be chained together using the
-      // TCallerChain template argument.
-     template<class T, class TRecord, class TDependsOnRecord, class TCallerChain >
-	struct DependsOnCaller
-	{
-	DependsOnCaller(T* iCallee, void(T::* iMethod)(const TDependsOnRecord&) , const TCallerChain& iChain) : 
-	  callee_(iCallee), method_(iMethod), chain_(iChain),cacheID_(0){} 
-      
-	    void operator()(const TRecord& iRecord) {
-	    const TDependsOnRecord& record = iRecord.template getRecord<TDependsOnRecord>();
-	    if(record.cacheIdentifier() != cacheID_) {
-	      (callee_->*method_)(record);
-	      cacheID_=record.cacheIdentifier();
-	    }
-	    //call next 'functor' in our chain
-	    chain_(iRecord);
-	  }
-	private:
-	  T* callee_;
-	  void (T::*method_)(const TDependsOnRecord&);
-	  TCallerChain chain_;
-	  unsigned long long cacheID_;
-	};
-
-      //helper function to help create a DependsOnCaller
-      template<class T, class TRecord, class TDependsOnRecord, class TCallerChain >
-         DependsOnCaller<T,TRecord, TDependsOnRecord, TCallerChain>
-         createDependsOnCaller(T* iCallee, const TRecord*, void(T::*iMethod)(const TDependsOnRecord&), const TCallerChain& iChain) 
-      {
-            return DependsOnCaller<T,TRecord, TDependsOnRecord, TCallerChain>(iCallee, iMethod, iChain);
+  namespace eventsetup {
+
+    //Simple functor that checks to see if a Record has changed since the last time it was called
+    // and if so, calls the appropriate member method.  Multiple callers can be chained together using the
+    // TCallerChain template argument.
+    template <class T, class TRecord, class TDependsOnRecord, class TCallerChain>
+    struct DependsOnCaller {
+      DependsOnCaller(T* iCallee, void (T::*iMethod)(const TDependsOnRecord&), const TCallerChain& iChain)
+          : callee_(iCallee), method_(iMethod), chain_(iChain), cacheID_(0) {}
+
+      void operator()(const TRecord& iRecord) {
+        const TDependsOnRecord& record = iRecord.template getRecord<TDependsOnRecord>();
+        if (record.cacheIdentifier() != cacheID_) {
+          (callee_->*method_)(record);
+          cacheID_ = record.cacheIdentifier();
+        }
+        //call next 'functor' in our chain
+        chain_(iRecord);
+      }
+
+    private:
+      T* callee_;
+      void (T::*method_)(const TDependsOnRecord&);
+      TCallerChain chain_;
+      unsigned long long cacheID_;
+    };
+
+    //helper function to help create a DependsOnCaller
+    template <class T, class TRecord, class TDependsOnRecord, class TCallerChain>
+    DependsOnCaller<T, TRecord, TDependsOnRecord, TCallerChain> createDependsOnCaller(
+        T* iCallee, const TRecord*, void (T::*iMethod)(const TDependsOnRecord&), const TCallerChain& iChain) {
+      return DependsOnCaller<T, TRecord, TDependsOnRecord, TCallerChain>(iCallee, iMethod, iChain);
+    }
+
+    //A 'do nothing' functor that is used to terminate our chain of functors
+    template <class TRecord>
+    struct DependsOnDoNothingCaller {
+      void operator()(const TRecord&) {}
+    };
+
+    //put implementation details used to get the dependsOn method to work into their own namespace
+    namespace depends_on {
+      //class to hold onto one member method pointer
+      template <class T, class TDependsOnRecord>
+      struct OneHolder {
+        typedef T Prod_t;
+        typedef TDependsOnRecord DependsOnRecord_t;
+
+        OneHolder(void (T::*iHoldee)(const TDependsOnRecord&)) : holdee_(iHoldee) {}
+        void (T::*holdee_)(const TDependsOnRecord&);
+      };
+
+      //class to create a linked list of member method pointers
+      template <class T, class U>
+      struct TwoHolder {
+        typedef T T1_t;
+        typedef U T2_t;
+        TwoHolder(const T& i1, const U& i2) : h1_(i1), h2_(i2) {}
+        T h1_;
+        U h2_;
+      };
+
+      //allows one to create the linked list by applying operator & to member method pointers
+      template <class T, class U>
+      TwoHolder<T, U> operator&(const T& iT, const U& iU) {
+        return TwoHolder<T, U>(iT, iU);
       }
-      
-      //A 'do nothing' functor that is used to terminate our chain of functors
-      template<class TRecord>
-         struct DependsOnDoNothingCaller { void operator()(const TRecord&) {} };
-      
-      //put implementation details used to get the dependsOn method to work into their own namespace
-      namespace depends_on {
-         //class to hold onto one member method pointer
-         template <class T, class TDependsOnRecord>
-         struct OneHolder {
-            typedef T Prod_t;
-            typedef TDependsOnRecord DependsOnRecord_t;
-            
-            OneHolder(void (T::*iHoldee)(const TDependsOnRecord&)) : holdee_(iHoldee) {}
-            void (T::*holdee_)(const TDependsOnRecord&);
-            
-         };
-         
-         //class to create a linked list of member method pointers
-         template <class T, class U>
-            struct TwoHolder {
-               typedef T T1_t;
-               typedef U T2_t;
-               TwoHolder(const T& i1, const U& i2) : h1_(i1), h2_(i2) {}
-               T h1_;
-               U h2_;
-            };
-
-         //allows one to create the linked list by applying operator & to member method pointers
-         template< class T, class U>
-            TwoHolder<T,U> operator&(const T& iT, const U& iU) {
-               return TwoHolder<T,U>(iT, iU);
-            }
-         
-         //HolderToCaller is used to state how a OneHolder or TwoHolder is converted into the appropriate 
-         // DependsOnCaller.  This class is needed to define the return value of the makeCaller function
-         template< class TRecord, class THolder>
-            struct HolderToCaller {
-            };
-         template< class TRecord, class T, class TDependsOnRecord >
-            struct HolderToCaller<TRecord, OneHolder<T, TDependsOnRecord> > {
-               typedef DependsOnCaller<T,TRecord, TDependsOnRecord, DependsOnDoNothingCaller<TRecord> > Caller_t;
-            };
-         template< class TRecord, class T, class T1, class T2>
-            struct HolderToCaller< TRecord, TwoHolder<T1, void (T::*)(const T2&) > > {
-               typedef DependsOnCaller<T, TRecord, T2 , typename HolderToCaller<TRecord,T1>::Caller_t > Caller_t;
-            };
-
-         //helper function to convert a OneHolder or TwoHolder into a DependsOnCaller.
-         template<class T, class TDependsOnRecord, class TRecord>
-            DependsOnCaller<T,TRecord, TDependsOnRecord, DependsOnDoNothingCaller<TRecord> >
-            makeCaller(T*iT, const TRecord* iRec, const OneHolder<T, TDependsOnRecord>& iHolder) {
-               return createDependsOnCaller(iT, iRec, iHolder.holdee_, DependsOnDoNothingCaller<TRecord>());
-            }
-         
-         template<class T, class T1, class T2, class TRecord>
-            DependsOnCaller<T,TRecord, T2, typename HolderToCaller<TRecord, T1>::Caller_t >
-            makeCaller(T*iT, const TRecord* iRec, const TwoHolder<T1, void (T::*)(const T2&)>& iHolder) {
-               return createDependsOnCaller(iT, iRec, iHolder.h2_, makeCaller(iT, iRec, iHolder.h1_));
-            }
+
+      //HolderToCaller is used to state how a OneHolder or TwoHolder is converted into the appropriate
+      // DependsOnCaller.  This class is needed to define the return value of the makeCaller function
+      template <class TRecord, class THolder>
+      struct HolderToCaller {};
+      template <class TRecord, class T, class TDependsOnRecord>
+      struct HolderToCaller<TRecord, OneHolder<T, TDependsOnRecord> > {
+        typedef DependsOnCaller<T, TRecord, TDependsOnRecord, DependsOnDoNothingCaller<TRecord> > Caller_t;
+      };
+      template <class TRecord, class T, class T1, class T2>
+      struct HolderToCaller<TRecord, TwoHolder<T1, void (T::*)(const T2&)> > {
+        typedef DependsOnCaller<T, TRecord, T2, typename HolderToCaller<TRecord, T1>::Caller_t> Caller_t;
+      };
+
+      //helper function to convert a OneHolder or TwoHolder into a DependsOnCaller.
+      template <class T, class TDependsOnRecord, class TRecord>
+      DependsOnCaller<T, TRecord, TDependsOnRecord, DependsOnDoNothingCaller<TRecord> > makeCaller(
+          T* iT, const TRecord* iRec, const OneHolder<T, TDependsOnRecord>& iHolder) {
+        return createDependsOnCaller(iT, iRec, iHolder.holdee_, DependsOnDoNothingCaller<TRecord>());
+      }
+
+      template <class T, class T1, class T2, class TRecord>
+      DependsOnCaller<T, TRecord, T2, typename HolderToCaller<TRecord, T1>::Caller_t> makeCaller(
+          T* iT, const TRecord* iRec, const TwoHolder<T1, void (T::*)(const T2&)>& iHolder) {
+        return createDependsOnCaller(iT, iRec, iHolder.h2_, makeCaller(iT, iRec, iHolder.h1_));
       }
-      
-      //DecoratorFromArg is used to declare the return type of 'createDecoratorFrom' based on the arguments to the function.
-      template< typename T, typename TRecord, typename TArg>
-         struct DecoratorFromArg { typedef TArg Decorator_t; };
-      
-      template< typename T, typename TRecord, typename TDependsOnRecord>
-         struct DecoratorFromArg<T,TRecord, depends_on::OneHolder<T,TDependsOnRecord> > { 
-            typedef ESPreFunctorDecorator<TRecord,DependsOnCaller<T,TRecord, TDependsOnRecord, DependsOnDoNothingCaller<TRecord> > > Decorator_t; 
-         };
-      
-      
-      template< typename T, typename TRecord, typename TDependsOnRecord >
-         inline ESPreFunctorDecorator<TRecord,DependsOnCaller<T,TRecord, TDependsOnRecord, DependsOnDoNothingCaller<TRecord> > > 
-         createDecoratorFrom(T* iT, const TRecord*iRec, const depends_on::OneHolder<T,TDependsOnRecord>& iHolder) {
-            DependsOnDoNothingCaller<TRecord> tCaller;
-            ESPreFunctorDecorator<TRecord,DependsOnCaller<T,TRecord, TDependsOnRecord, DependsOnDoNothingCaller<TRecord> > >
-               temp(createDependsOnCaller(iT, iRec, iHolder.holdee_, tCaller));
-            return temp;
-         }
-      
-      template< typename T, typename TRecord, typename T1, typename T2>
-         struct DecoratorFromArg<T,TRecord, depends_on::TwoHolder<T1,T2> > { 
-            typedef ESPreFunctorDecorator<TRecord,typename depends_on::HolderToCaller<TRecord, depends_on::TwoHolder<T1, T2> >::Caller_t >
-            Decorator_t; 
-         };
-      template< typename T, typename TRecord, typename T1, typename T2>
-         inline ESPreFunctorDecorator<TRecord,typename depends_on::HolderToCaller<TRecord, depends_on::TwoHolder<T1, T2> >::Caller_t >
-         createDecoratorFrom(T* iT, const TRecord*iRec, const depends_on::TwoHolder<T1,T2>& iHolder) {
-            return ESPreFunctorDecorator<TRecord, typename depends_on::HolderToCaller<TRecord,depends_on::TwoHolder< T1, T2> >::Caller_t >
-            (createDependsOnCaller(iT, iRec, iHolder.h2_, makeCaller(iT, iRec, iHolder.h1_)));
-         }
-      
-      
-      //The actual dependsOn functions which users call
-      template <typename T, typename TDependsOnRecord>
-         depends_on::OneHolder<T,TDependsOnRecord> 
-         dependsOn(void(T::*iT)(const TDependsOnRecord&)) { return iT ; }
-      
-      template< typename T, typename T1, typename T2>
-         depends_on::TwoHolder<depends_on::OneHolder<T,T1>, T2> 
-         dependsOn(void (T::* iT1)(const T1&), T2 iT2) { return depends_on::OneHolder<T, T1>(iT1) & iT2; }
-      
-      template< typename T, typename T1, typename T2, typename T3>
-         depends_on::TwoHolder< depends_on::TwoHolder<depends_on::OneHolder<T,T1>, T2>, T3>
-         dependsOn(void(T::* iT1)(const T1&), T2 iT2, T3 iT3) { return depends_on::OneHolder<T,T1>(iT1) & iT2 & iT3; }
-      
-
-   }
-}
+    }  // namespace depends_on
+
+    //DecoratorFromArg is used to declare the return type of 'createDecoratorFrom' based on the arguments to the function.
+    template <typename T, typename TRecord, typename TArg>
+    struct DecoratorFromArg {
+      typedef TArg Decorator_t;
+    };
+
+    template <typename T, typename TRecord, typename TDependsOnRecord>
+    struct DecoratorFromArg<T, TRecord, depends_on::OneHolder<T, TDependsOnRecord> > {
+      typedef ESPreFunctorDecorator<TRecord,
+                                    DependsOnCaller<T, TRecord, TDependsOnRecord, DependsOnDoNothingCaller<TRecord> > >
+          Decorator_t;
+    };
+
+    template <typename T, typename TRecord, typename TDependsOnRecord>
+    inline ESPreFunctorDecorator<TRecord,
+                                 DependsOnCaller<T, TRecord, TDependsOnRecord, DependsOnDoNothingCaller<TRecord> > >
+    createDecoratorFrom(T* iT, const TRecord* iRec, const depends_on::OneHolder<T, TDependsOnRecord>& iHolder) {
+      DependsOnDoNothingCaller<TRecord> tCaller;
+      ESPreFunctorDecorator<TRecord, DependsOnCaller<T, TRecord, TDependsOnRecord, DependsOnDoNothingCaller<TRecord> > >
+          temp(createDependsOnCaller(iT, iRec, iHolder.holdee_, tCaller));
+      return temp;
+    }
+
+    template <typename T, typename TRecord, typename T1, typename T2>
+    struct DecoratorFromArg<T, TRecord, depends_on::TwoHolder<T1, T2> > {
+      typedef ESPreFunctorDecorator<
+          TRecord,
+          typename depends_on::HolderToCaller<TRecord, depends_on::TwoHolder<T1, T2> >::Caller_t>
+          Decorator_t;
+    };
+    template <typename T, typename TRecord, typename T1, typename T2>
+    inline ESPreFunctorDecorator<TRecord,
+                                 typename depends_on::HolderToCaller<TRecord, depends_on::TwoHolder<T1, T2> >::Caller_t>
+    createDecoratorFrom(T* iT, const TRecord* iRec, const depends_on::TwoHolder<T1, T2>& iHolder) {
+      return ESPreFunctorDecorator<
+          TRecord,
+          typename depends_on::HolderToCaller<TRecord, depends_on::TwoHolder<T1, T2> >::Caller_t>(
+          createDependsOnCaller(iT, iRec, iHolder.h2_, makeCaller(iT, iRec, iHolder.h1_)));
+    }
+
+    //The actual dependsOn functions which users call
+    template <typename T, typename TDependsOnRecord>
+    depends_on::OneHolder<T, TDependsOnRecord> dependsOn(void (T::*iT)(const TDependsOnRecord&)) {
+      return iT;
+    }
+
+    template <typename T, typename T1, typename T2>
+    depends_on::TwoHolder<depends_on::OneHolder<T, T1>, T2> dependsOn(void (T::*iT1)(const T1&), T2 iT2) {
+      return depends_on::OneHolder<T, T1>(iT1) & iT2;
+    }
+
+    template <typename T, typename T1, typename T2, typename T3>
+    depends_on::TwoHolder<depends_on::TwoHolder<depends_on::OneHolder<T, T1>, T2>, T3> dependsOn(
+        void (T::*iT1)(const T1&), T2 iT2, T3 iT3) {
+      return depends_on::OneHolder<T, T1>(iT1) & iT2 & iT3;
+    }
+
+  }  // namespace eventsetup
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/eventsetuprecord_registration_macro.h b/FWCore/Framework/interface/eventsetuprecord_registration_macro.h
index c26b51397717f..b1d9dce1ca95e 100644
--- a/FWCore/Framework/interface/eventsetuprecord_registration_macro.h
+++ b/FWCore/Framework/interface/eventsetuprecord_registration_macro.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     eventsetuprecord_registration_macro
-// 
+//
 /**\class eventsetuprecord_registration_macro eventsetuprecord_registration_macro.h FWCore/Framework/interface/eventsetuprecord_registration_macro.h
 
  Description: CPP macro used to register a new EventSetupRecord into the system
@@ -33,11 +33,11 @@ macro EVENTSETUP_RECORD_REG is used to create that code.
 
 #include "FWCore/Framework/interface/RecordDependencyRegister.h"
 
-#define EVENTSETUP_RECORD_NAME2(_a_, _b_) EVENTSETUP_RECORD_NAME2_HIDDEN(_a_,_b_)
-#define EVENTSETUP_RECORD_NAME2_HIDDEN(_a_,_b_) _a_ ## _b_
+#define EVENTSETUP_RECORD_NAME2(_a_, _b_) EVENTSETUP_RECORD_NAME2_HIDDEN(_a_, _b_)
+#define EVENTSETUP_RECORD_NAME2_HIDDEN(_a_, _b_) _a_##_b_
 
 #define EVENTSETUP_RECORD_REG(_recordclassname_) \
-TYPELOOKUP_DATA_REG(_recordclassname_); \
-static const edm::eventsetup::RecordDependencyRegister<_recordclassname_> EVENTSETUP_RECORD_NAME2(s_factory,__LINE__)
+  TYPELOOKUP_DATA_REG(_recordclassname_);        \
+  static const edm::eventsetup::RecordDependencyRegister<_recordclassname_> EVENTSETUP_RECORD_NAME2(s_factory, __LINE__)
 
 #endif
diff --git a/FWCore/Framework/interface/findDependentRecordsFor.h b/FWCore/Framework/interface/findDependentRecordsFor.h
index 6aa7a5eb3e31c..18514be065f9e 100644
--- a/FWCore/Framework/interface/findDependentRecordsFor.h
+++ b/FWCore/Framework/interface/findDependentRecordsFor.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     findDependentRecordsFor
-// 
+//
 /**\function findDependentRecordsFor findDependentRecordsFor.h "findDependentRecordsFor.h"
 
  Description: [one line class summary]
@@ -32,50 +32,45 @@
 // forward declarations
 namespace edm {
   namespace eventsetup {
-    
+
     //If the types are the same, stop the recursion
     template <typename T>
-    void addRecordToDependencies(const T*,
-                                 const T*,
-                                 std::set<EventSetupRecordKey>&) { }
-    
+    void addRecordToDependencies(const T*, const T*, std::set<EventSetupRecordKey>&) {}
+
     //Recursively desend container while adding first type's info to set
-    template< typename TFirst, typename TEnd>
-    void addRecordToDependencies(const TFirst*, const TEnd* iEnd,
-                                 std::set<EventSetupRecordKey>& oSet) {
+    template <typename TFirst, typename TEnd>
+    void addRecordToDependencies(const TFirst*, const TEnd* iEnd, std::set<EventSetupRecordKey>& oSet) {
       oSet.insert(EventSetupRecordKey::makeKey<typename boost::mpl::deref<TFirst>::type>());
-      const  typename boost::mpl::next< TFirst >::type * next(nullptr);
+      const typename boost::mpl::next<TFirst>::type* next(nullptr);
       addRecordToDependencies(next, iEnd, oSet);
     }
-    
+
     //Handle the case where a Record has dependencies
     template <typename T>
     struct FindDependenciesFromDependentRecord {
-      inline static void dependentRecords(std::set<EventSetupRecordKey>& oSet)  {
+      inline static void dependentRecords(std::set<EventSetupRecordKey>& oSet) {
         typedef typename T::list_type list_type;
-        const  typename boost::mpl::begin<list_type>::type * begin(nullptr);
-        const  typename boost::mpl::end<list_type>::type * end(nullptr);
+        const typename boost::mpl::begin<list_type>::type* begin(nullptr);
+        const typename boost::mpl::end<list_type>::type* end(nullptr);
         addRecordToDependencies(begin, end, oSet);
       }
     };
-    
+
     //Handle the case where a Record has no dependencies
     struct NoDependenciesForRecord {
-      inline static void dependentRecords(std::set<EventSetupRecordKey>&)  {
-      }
+      inline static void dependentRecords(std::set<EventSetupRecordKey>&) {}
     };
-    
+
     template <typename T>
-    std::set<EventSetupRecordKey>
-    findDependentRecordsFor() {
-      typedef typename boost::mpl::if_< typename std::is_base_of<edm::eventsetup::DependentRecordTag, T>::type,
-      FindDependenciesFromDependentRecord<T>,
-      NoDependenciesForRecord>::type DepFinder;
+    std::set<EventSetupRecordKey> findDependentRecordsFor() {
+      typedef typename boost::mpl::if_<typename std::is_base_of<edm::eventsetup::DependentRecordTag, T>::type,
+                                       FindDependenciesFromDependentRecord<T>,
+                                       NoDependenciesForRecord>::type DepFinder;
       std::set<EventSetupRecordKey> returnValue;
       DepFinder::dependentRecords(returnValue);
       return returnValue;
     }
-  }
-}
+  }  // namespace eventsetup
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/getAllTriggerNames.h b/FWCore/Framework/interface/getAllTriggerNames.h
index 43eb2693b652a..5575044d94447 100644
--- a/FWCore/Framework/interface/getAllTriggerNames.h
+++ b/FWCore/Framework/interface/getAllTriggerNames.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     getAllTriggerNames
-// 
+//
 /**\function getAllTriggerNames getAllTriggerNames.h "FWCore/Framework/interface/getAllTriggerNames.h"
 
  Description: Returns a list of all the trigger names in the current process
diff --git a/FWCore/Framework/interface/getProducerParameterSet.h b/FWCore/Framework/interface/getProducerParameterSet.h
index b77bcb7c53f27..cfa541ac615f3 100644
--- a/FWCore/Framework/interface/getProducerParameterSet.h
+++ b/FWCore/Framework/interface/getProducerParameterSet.h
@@ -26,7 +26,6 @@ namespace edm {
   class ParameterSet;
   class Provenance;
 
-  ParameterSet const*
-  getProducerParameterSet(Provenance const& provenance);
-}
+  ParameterSet const* getProducerParameterSet(Provenance const& provenance);
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/global/EDAnalyzer.h b/FWCore/Framework/interface/global/EDAnalyzer.h
index d32c702cf7f91..559fa8764e442 100644
--- a/FWCore/Framework/interface/global/EDAnalyzer.h
+++ b/FWCore/Framework/interface/global/EDAnalyzer.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::global::EDAnalyzer
-// 
+//
 /**\class edm::global::EDAnalyzer EDAnalyzer.h "FWCore/Framework/interface/global/EDAnalyzer.h"
 
  Description: [one line class summary]
@@ -28,48 +28,36 @@
 
 namespace edm {
   namespace global {
-    template< typename... T>
-    class EDAnalyzer : public analyzer::AbilityToImplementor<T>::Type...,
-                       public virtual EDAnalyzerBase
-    {
-      
+    template <typename... T>
+    class EDAnalyzer : public analyzer::AbilityToImplementor<T>::Type..., public virtual EDAnalyzerBase {
     public:
       EDAnalyzer() = default;
 // We do this only in the case of the intel compiler as this might
-// end up creating a lot of code bloat due to inline symbols being generated 
+// end up creating a lot of code bloat due to inline symbols being generated
 // in each DSO which uses this header.
 #ifdef __INTEL_COMPILER
       virtual ~EDAnalyzer() {}
 #endif
       // ---------- const member functions ---------------------
-      bool wantsGlobalRuns() const final {
-        return WantsGlobalRunTransitions<T...>::value;
-      }
-      bool wantsGlobalLuminosityBlocks() const final {
-        return WantsGlobalLuminosityBlockTransitions<T...>::value;
-      }
+      bool wantsGlobalRuns() const final { return WantsGlobalRunTransitions<T...>::value; }
+      bool wantsGlobalLuminosityBlocks() const final { return WantsGlobalLuminosityBlockTransitions<T...>::value; }
 
-      bool wantsStreamRuns() const final {
-        return WantsStreamRunTransitions<T...>::value;
-      }
-      bool wantsStreamLuminosityBlocks() const final {
-        return WantsStreamLuminosityBlockTransitions<T...>::value;
-      }
+      bool wantsStreamRuns() const final { return WantsStreamRunTransitions<T...>::value; }
+      bool wantsStreamLuminosityBlocks() const final { return WantsStreamLuminosityBlockTransitions<T...>::value; }
 
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
-      
+
     private:
       EDAnalyzer(const EDAnalyzer&) = delete;
-      
+
       const EDAnalyzer& operator=(const EDAnalyzer&) = delete;
-      
+
       // ---------- member data --------------------------------
-      
     };
 
-  }
-}
+  }  // namespace global
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/global/EDAnalyzerBase.h b/FWCore/Framework/interface/global/EDAnalyzerBase.h
index 82f1aba0a6def..4f43d16f09909 100644
--- a/FWCore/Framework/interface/global/EDAnalyzerBase.h
+++ b/FWCore/Framework/interface/global/EDAnalyzerBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDAnalyzerBase
-// 
+//
 /**\class EDAnalyzerBase EDAnalyzerBase.h "EDAnalyzerBase.h"
 
  Description: [one line class summary]
@@ -38,17 +38,18 @@ namespace edm {
   class WaitingTask;
 
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
   }
 
   namespace global {
-    
-    class EDAnalyzerBase : public EDConsumerBase
-    {
-      
+
+    class EDAnalyzerBase : public EDConsumerBase {
     public:
-      template <typename T> friend class edm::WorkerT;
-      template <typename T> friend class edm::maker::ModuleHolderT;
+      template <typename T>
+      friend class edm::WorkerT;
+      template <typename T>
+      friend class edm::maker::ModuleHolderT;
       typedef EDAnalyzerBase ModuleType;
 
       EDAnalyzerBase();
@@ -61,68 +62,59 @@ namespace edm {
       // Warning: the returned moduleDescription will be invalid during construction
       ModuleDescription const& moduleDescription() const { return moduleDescription_; }
 
-      virtual bool wantsGlobalRuns() const =0;
-      virtual bool wantsGlobalLuminosityBlocks() const =0;
-      virtual bool wantsStreamRuns() const =0;
-      virtual bool wantsStreamLuminosityBlocks() const =0;
+      virtual bool wantsGlobalRuns() const = 0;
+      virtual bool wantsGlobalLuminosityBlocks() const = 0;
+      virtual bool wantsStreamRuns() const = 0;
+      virtual bool wantsStreamLuminosityBlocks() const = 0;
 
       void callWhenNewProductsRegistered(std::function<void(BranchDescription const&)> const& func) {
         callWhenNewProductsRegistered_ = func;
       }
 
     private:
-      bool doEvent(EventPrincipal const& ep, EventSetupImpl const&  c,
-                   ActivityRegistry*,
-                   ModuleCallingContext const*);
+      bool doEvent(EventPrincipal const& ep, EventSetupImpl const& c, ActivityRegistry*, ModuleCallingContext const*);
       //For now this is a placeholder
-      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
+      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                                    ModuleCallingContext const& iModuleCallingContext,
+                                                    Principal const& iPrincipal) const {}
 
       void doPreallocate(PreallocationConfiguration const&);
       void doBeginJob();
       void doEndJob();
-      
+
       void doBeginStream(StreamID id);
       void doEndStream(StreamID id);
-      void doStreamBeginRun(StreamID id,
-                            RunPrincipal const& ep,
-                            EventSetupImpl const&  c,
-                            ModuleCallingContext const*);
-      void doStreamEndRun(StreamID id,
-                          RunPrincipal const& ep,
-                          EventSetupImpl const&  c,
-                          ModuleCallingContext const*);
+      void doStreamBeginRun(StreamID id, RunPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doStreamEndRun(StreamID id, RunPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const*);
       void doStreamBeginLuminosityBlock(StreamID id,
                                         LuminosityBlockPrincipal const& ep,
-                                        EventSetupImpl const&  c,
+                                        EventSetupImpl const& c,
                                         ModuleCallingContext const*);
       void doStreamEndLuminosityBlock(StreamID id,
                                       LuminosityBlockPrincipal const& ep,
-                                      EventSetupImpl const&  c,
+                                      EventSetupImpl const& c,
                                       ModuleCallingContext const*);
 
-      
-      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                      ModuleCallingContext const*);
-      void doEndRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                    ModuleCallingContext const*);
-      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                  EventSetupImpl const& c,
                                   ModuleCallingContext const*);
-      void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                EventSetupImpl const& c,
                                 ModuleCallingContext const*);
-      
+
       //For now, the following are just dummy implemenations with no ability for users to override
       void doRespondToOpenInputFile(FileBlock const& fb);
       void doRespondToCloseInputFile(FileBlock const& fb);
-      void doRegisterThinnedAssociations(ProductRegistry const&,
-                                         ThinnedAssociationsHelper&) { }
+      void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
 
       void registerProductsAndCallbacks(EDAnalyzerBase* module, ProductRegistry* reg);
-      std::string workerType() const {return "WorkerT<EDAnalyzer>";}
-      
-      virtual void analyze(StreamID, Event const& , EventSetup const& ) const= 0;
+      std::string workerType() const { return "WorkerT<EDAnalyzer>"; }
+
+      virtual void analyze(StreamID, Event const&, EventSetup const&) const = 0;
       virtual void beginJob() {}
-      virtual void endJob(){}
-      
+      virtual void endJob() {}
 
       virtual void preallocStreams(unsigned int);
       virtual void preallocLumis(unsigned int);
@@ -148,15 +140,13 @@ namespace edm {
       bool hasAcquire() const { return false; }
       bool hasAccumulator() const { return false; }
 
-      void setModuleDescription(ModuleDescription const& md) {
-        moduleDescription_ = md;
-      }
+      void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
       ModuleDescription moduleDescription_;
 
       std::function<void(BranchDescription const&)> callWhenNewProductsRegistered_;
     };
 
-  }
-}
+  }  // namespace global
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/global/EDFilter.h b/FWCore/Framework/interface/global/EDFilter.h
index bc6295ff0834f..e0a1ca574acd2 100644
--- a/FWCore/Framework/interface/global/EDFilter.h
+++ b/FWCore/Framework/interface/global/EDFilter.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::global::EDFilter
-// 
+//
 /**\class edm::global::EDFilter EDFilter.h "FWCore/Framework/interface/global/EDFilter.h"
 
  Description: [one line class summary]
@@ -28,60 +28,46 @@
 
 namespace edm {
   namespace global {
-    template< typename... T>
-    class EDFilter : 
-              public virtual EDFilterBase,
-              public filter::SpecializeAbilityToImplementor<
-        CheckAbility<edm::module::Abilities::kRunSummaryCache,T...>::kHasIt & CheckAbility<edm::module::Abilities::kEndRunProducer,T...>::kHasIt,
-        CheckAbility<edm::module::Abilities::kLuminosityBlockSummaryCache,T...>::kHasIt & CheckAbility<edm::module::Abilities::kEndLuminosityBlockProducer,T...>::kHasIt,
-        T>::Type...
-    {
-      
+    template <typename... T>
+    class EDFilter : public virtual EDFilterBase,
+                     public filter::SpecializeAbilityToImplementor<
+                         CheckAbility<edm::module::Abilities::kRunSummaryCache, T...>::kHasIt &
+                             CheckAbility<edm::module::Abilities::kEndRunProducer, T...>::kHasIt,
+                         CheckAbility<edm::module::Abilities::kLuminosityBlockSummaryCache, T...>::kHasIt &
+                             CheckAbility<edm::module::Abilities::kEndLuminosityBlockProducer, T...>::kHasIt,
+                         T>::Type... {
     public:
       EDFilter() = default;
 // We do this only in the case of the intel compiler as this might
-// end up creating a lot of code bloat due to inline symbols being generated 
+// end up creating a lot of code bloat due to inline symbols being generated
 // in each DSO which uses this header.
 #ifdef __INTEL_COMPILER
       virtual ~EDFilter() = default;
 #endif
       // ---------- const member functions ---------------------
-      bool wantsGlobalRuns() const final {
-        return WantsGlobalRunTransitions<T...>::value;
-      }
-      bool wantsGlobalLuminosityBlocks() const final {
-        return WantsGlobalLuminosityBlockTransitions<T...>::value;
-      }
-
-      bool wantsStreamRuns() const final {
-        return WantsStreamRunTransitions<T...>::value;
-      }
-      bool wantsStreamLuminosityBlocks() const final {
-        return WantsStreamLuminosityBlockTransitions<T...>::value;
-      }
-
-      bool hasAbilityToProduceInRuns() const final {
-        return HasAbilityToProduceInRuns<T...>::value;
-      }
-
-      bool hasAbilityToProduceInLumis() const final {
-        return HasAbilityToProduceInLumis<T...>::value;
-      }
+      bool wantsGlobalRuns() const final { return WantsGlobalRunTransitions<T...>::value; }
+      bool wantsGlobalLuminosityBlocks() const final { return WantsGlobalLuminosityBlockTransitions<T...>::value; }
+
+      bool wantsStreamRuns() const final { return WantsStreamRunTransitions<T...>::value; }
+      bool wantsStreamLuminosityBlocks() const final { return WantsStreamLuminosityBlockTransitions<T...>::value; }
+
+      bool hasAbilityToProduceInRuns() const final { return HasAbilityToProduceInRuns<T...>::value; }
+
+      bool hasAbilityToProduceInLumis() const final { return HasAbilityToProduceInLumis<T...>::value; }
 
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
-      
+
     private:
       EDFilter(const EDFilter&) = delete;
-      
+
       const EDFilter& operator=(const EDFilter&) = delete;
-      
+
       // ---------- member data --------------------------------
-      
     };
 
-  }
-}
+  }  // namespace global
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/global/EDFilterBase.h b/FWCore/Framework/interface/global/EDFilterBase.h
index aabbb7529a328..43739f694b831 100644
--- a/FWCore/Framework/interface/global/EDFilterBase.h
+++ b/FWCore/Framework/interface/global/EDFilterBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDFilterBase
-// 
+//
 /**\class EDFilterBase EDFilterBase.h "EDFilterBase.h"
 
  Description: [one line class summary]
@@ -41,17 +41,18 @@ namespace edm {
   class WaitingTaskWithArenaHolder;
 
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
   }
 
   namespace global {
-    
-    class EDFilterBase : public ProducerBase, public EDConsumerBase
-    {
-      
+
+    class EDFilterBase : public ProducerBase, public EDConsumerBase {
     public:
-      template <typename T> friend class edm::maker::ModuleHolderT;
-      template <typename T> friend class edm::WorkerT;
+      template <typename T>
+      friend class edm::maker::ModuleHolderT;
+      template <typename T>
+      friend class edm::WorkerT;
       typedef EDFilterBase ModuleType;
 
       EDFilterBase();
@@ -64,69 +65,62 @@ namespace edm {
       // Warning: the returned moduleDescription will be invalid during construction
       ModuleDescription const& moduleDescription() const { return moduleDescription_; }
 
-      virtual bool wantsGlobalRuns() const =0;
-      virtual bool wantsGlobalLuminosityBlocks() const =0;
-      virtual bool wantsStreamRuns() const =0;
-      virtual bool wantsStreamLuminosityBlocks() const =0;
+      virtual bool wantsGlobalRuns() const = 0;
+      virtual bool wantsGlobalLuminosityBlocks() const = 0;
+      virtual bool wantsStreamRuns() const = 0;
+      virtual bool wantsStreamLuminosityBlocks() const = 0;
 
     private:
-      bool doEvent(EventPrincipal const&, EventSetupImpl const& ,
-                   ActivityRegistry*,
-                   ModuleCallingContext const*);
-      void doAcquire(EventPrincipal const&, EventSetupImpl const& ,
+      bool doEvent(EventPrincipal const&, EventSetupImpl const&, ActivityRegistry*, ModuleCallingContext const*);
+      void doAcquire(EventPrincipal const&,
+                     EventSetupImpl const&,
                      ActivityRegistry*,
                      ModuleCallingContext const*,
                      WaitingTaskWithArenaHolder&);
       //For now this is a placeholder
-      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
+      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                                    ModuleCallingContext const& iModuleCallingContext,
+                                                    Principal const& iPrincipal) const {}
 
       void doPreallocate(PreallocationConfiguration const&);
       void doBeginJob();
       void doEndJob();
-      
+
       void doBeginStream(StreamID id);
       void doEndStream(StreamID id);
-      void doStreamBeginRun(StreamID id,
-                            RunPrincipal const& ep,
-                            EventSetupImpl const&  c,
-                            ModuleCallingContext const*);
-      void doStreamEndRun(StreamID id,
-                          RunPrincipal const& ep,
-                          EventSetupImpl const&  c,
-                          ModuleCallingContext const*);
+      void doStreamBeginRun(StreamID id, RunPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doStreamEndRun(StreamID id, RunPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const*);
       void doStreamBeginLuminosityBlock(StreamID id,
                                         LuminosityBlockPrincipal const& ep,
-                                        EventSetupImpl const&  c,
+                                        EventSetupImpl const& c,
                                         ModuleCallingContext const*);
       void doStreamEndLuminosityBlock(StreamID id,
                                       LuminosityBlockPrincipal const& ep,
-                                      EventSetupImpl const&  c,
+                                      EventSetupImpl const& c,
                                       ModuleCallingContext const*);
 
-      
-      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                      ModuleCallingContext const*);
-      void doEndRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                    ModuleCallingContext const*);
-      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                  EventSetupImpl const& c,
                                   ModuleCallingContext const*);
-      void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                EventSetupImpl const& c,
                                 ModuleCallingContext const*);
-      
+
       //For now, the following are just dummy implemenations with no ability for users to override
       void doRespondToOpenInputFile(FileBlock const& fb);
       void doRespondToCloseInputFile(FileBlock const& fb);
-      void doRegisterThinnedAssociations(ProductRegistry const&,
-                                         ThinnedAssociationsHelper&) { }
+      void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
 
       void registerProductsAndCallbacks(EDFilterBase* module, ProductRegistry* reg) {
         registerProducts(module, reg, moduleDescription_);
       }
-      std::string workerType() const {return "WorkerT<EDProducer>";}
-      
-      virtual bool filter(StreamID, Event&, EventSetup const&) const= 0;
+      std::string workerType() const { return "WorkerT<EDProducer>"; }
+
+      virtual bool filter(StreamID, Event&, EventSetup const&) const = 0;
       virtual void beginJob() {}
-      virtual void endJob(){}
+      virtual void endJob() {}
 
       virtual void preallocStreams(unsigned int);
       virtual void preallocLumis(unsigned int);
@@ -148,7 +142,7 @@ namespace edm {
       virtual void doBeginLuminosityBlockSummary_(LuminosityBlock const& rp, EventSetup const& c);
       virtual void doEndLuminosityBlockSummary_(LuminosityBlock const& lb, EventSetup const& c);
       virtual void doEndLuminosityBlock_(LuminosityBlock const& lb, EventSetup const& c);
-      
+
       virtual void doBeginRunProduce_(Run& rp, EventSetup const& c);
       virtual void doEndRunProduce_(Run& rp, EventSetup const& c);
       virtual void doBeginLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c);
@@ -159,15 +153,13 @@ namespace edm {
 
       virtual void doAcquire_(StreamID, Event const&, edm::EventSetup const&, WaitingTaskWithArenaHolder&);
 
-      void setModuleDescription(ModuleDescription const& md) {
-        moduleDescription_ = md;
-      }
+      void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
       ModuleDescription moduleDescription_;
-      std::unique_ptr<std::vector<BranchID>[]> previousParentages_; //Per stream in the future?
+      std::unique_ptr<std::vector<BranchID>[]> previousParentages_;  //Per stream in the future?
       std::unique_ptr<std::vector<BranchID>[]> gotBranchIDsFromAcquire_;
       std::unique_ptr<ParentageID[]> previousParentageIds_;
     };
-  }
-}
+  }  // namespace global
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/global/EDProducer.h b/FWCore/Framework/interface/global/EDProducer.h
index 07109d11c16a7..920135626ed0b 100644
--- a/FWCore/Framework/interface/global/EDProducer.h
+++ b/FWCore/Framework/interface/global/EDProducer.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::global::EDProducer
-// 
+//
 /**\class edm::global::EDProducer EDProducer.h "FWCore/Framework/interface/global/EDProducer.h"
 
  Description: [one line class summary]
@@ -28,54 +28,41 @@
 
 namespace edm {
   namespace global {
-    template< typename... T>
+    template <typename... T>
     class EDProducer : public producer::SpecializeAbilityToImplementor<
-        CheckAbility<edm::module::Abilities::kRunSummaryCache,T...>::kHasIt & CheckAbility<edm::module::Abilities::kEndRunProducer,T...>::kHasIt,
-        CheckAbility<edm::module::Abilities::kLuminosityBlockSummaryCache,T...>::kHasIt & CheckAbility<edm::module::Abilities::kEndLuminosityBlockProducer,T...>::kHasIt,
-        T>::Type...,
-                       public virtual EDProducerBase
-    {
-      
+                           CheckAbility<edm::module::Abilities::kRunSummaryCache, T...>::kHasIt &
+                               CheckAbility<edm::module::Abilities::kEndRunProducer, T...>::kHasIt,
+                           CheckAbility<edm::module::Abilities::kLuminosityBlockSummaryCache, T...>::kHasIt &
+                               CheckAbility<edm::module::Abilities::kEndLuminosityBlockProducer, T...>::kHasIt,
+                           T>::Type...,
+                       public virtual EDProducerBase {
     public:
       EDProducer() = default;
-      
+
       // ---------- const member functions ---------------------
-      bool wantsGlobalRuns() const final {
-        return WantsGlobalRunTransitions<T...>::value;
-      }
-      bool wantsGlobalLuminosityBlocks() const final {
-        return WantsGlobalLuminosityBlockTransitions<T...>::value;
-      }
-
-      bool wantsStreamRuns() const final {
-        return WantsStreamRunTransitions<T...>::value;
-      }
-      bool wantsStreamLuminosityBlocks() const final {
-        return WantsStreamLuminosityBlockTransitions<T...>::value;
-      }
-
-      bool hasAbilityToProduceInRuns() const final {
-        return HasAbilityToProduceInRuns<T...>::value;
-      }
-
-      bool hasAbilityToProduceInLumis() const final {
-        return HasAbilityToProduceInLumis<T...>::value;
-      }
+      bool wantsGlobalRuns() const final { return WantsGlobalRunTransitions<T...>::value; }
+      bool wantsGlobalLuminosityBlocks() const final { return WantsGlobalLuminosityBlockTransitions<T...>::value; }
+
+      bool wantsStreamRuns() const final { return WantsStreamRunTransitions<T...>::value; }
+      bool wantsStreamLuminosityBlocks() const final { return WantsStreamLuminosityBlockTransitions<T...>::value; }
+
+      bool hasAbilityToProduceInRuns() const final { return HasAbilityToProduceInRuns<T...>::value; }
+
+      bool hasAbilityToProduceInLumis() const final { return HasAbilityToProduceInLumis<T...>::value; }
 
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
-      
+
     private:
       EDProducer(const EDProducer&) = delete;
-      
+
       const EDProducer& operator=(const EDProducer&) = delete;
-      
+
       // ---------- member data --------------------------------
-      
     };
 
-  }
-}
+  }  // namespace global
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/global/EDProducerBase.h b/FWCore/Framework/interface/global/EDProducerBase.h
index b9eb15d2bd6b3..17ba683906245 100644
--- a/FWCore/Framework/interface/global/EDProducerBase.h
+++ b/FWCore/Framework/interface/global/EDProducerBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDProducerBase
-// 
+//
 /**\class EDProducerBase EDProducerBase.h "EDProducerBase.h"
 
  Description: [one line class summary]
@@ -42,19 +42,20 @@ namespace edm {
   class WaitingTaskWithArenaHolder;
 
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
   }
-  
+
   namespace global {
-    
-    class EDProducerBase : public ProducerBase, public EDConsumerBase
-    {
-      
+
+    class EDProducerBase : public ProducerBase, public EDConsumerBase {
     public:
-      template <typename T> friend class edm::maker::ModuleHolderT;
-      template <typename T> friend class edm::WorkerT;
+      template <typename T>
+      friend class edm::maker::ModuleHolderT;
+      template <typename T>
+      friend class edm::WorkerT;
       typedef EDProducerBase ModuleType;
-      
+
       friend class edm::GlobalSchedule;
 
       EDProducerBase();
@@ -67,69 +68,62 @@ namespace edm {
       // Warning: the returned moduleDescription will be invalid during construction
       ModuleDescription const& moduleDescription() const { return moduleDescription_; }
 
-      virtual bool wantsGlobalRuns() const =0;
-      virtual bool wantsGlobalLuminosityBlocks() const =0;
-      virtual bool wantsStreamRuns() const =0;
-      virtual bool wantsStreamLuminosityBlocks() const =0;
+      virtual bool wantsGlobalRuns() const = 0;
+      virtual bool wantsGlobalLuminosityBlocks() const = 0;
+      virtual bool wantsStreamRuns() const = 0;
+      virtual bool wantsStreamLuminosityBlocks() const = 0;
 
     private:
-      bool doEvent(EventPrincipal const&, EventSetupImpl const& ,
-                   ActivityRegistry*,
-                   ModuleCallingContext const*);
-      void doAcquire(EventPrincipal const&, EventSetupImpl const& ,
+      bool doEvent(EventPrincipal const&, EventSetupImpl const&, ActivityRegistry*, ModuleCallingContext const*);
+      void doAcquire(EventPrincipal const&,
+                     EventSetupImpl const&,
                      ActivityRegistry*,
                      ModuleCallingContext const*,
                      WaitingTaskWithArenaHolder&);
       void doPreallocate(PreallocationConfiguration const&);
       void doBeginJob();
       void doEndJob();
-      
+
       void doBeginStream(StreamID id);
       void doEndStream(StreamID id);
-      void doStreamBeginRun(StreamID id,
-                            RunPrincipal const& ep,
-                            EventSetupImpl const&  c,
-                            ModuleCallingContext const*);
-      void doStreamEndRun(StreamID id,
-                          RunPrincipal const& ep,
-                          EventSetupImpl const&  c,
-                          ModuleCallingContext const*);
+      void doStreamBeginRun(StreamID id, RunPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doStreamEndRun(StreamID id, RunPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const*);
       void doStreamBeginLuminosityBlock(StreamID id,
                                         LuminosityBlockPrincipal const& ep,
-                                        EventSetupImpl const&  c,
+                                        EventSetupImpl const& c,
                                         ModuleCallingContext const*);
       void doStreamEndLuminosityBlock(StreamID id,
                                       LuminosityBlockPrincipal const& ep,
-                                      EventSetupImpl const&  c,
+                                      EventSetupImpl const& c,
                                       ModuleCallingContext const*);
 
-      
-      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                      ModuleCallingContext const*);
-      void doEndRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                    ModuleCallingContext const*);
-      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                  EventSetupImpl const& c,
                                   ModuleCallingContext const*);
-      void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                EventSetupImpl const& c,
                                 ModuleCallingContext const*);
-      
+
       //For now, the following are just dummy implemenations with no ability for users to override
       void doRespondToOpenInputFile(FileBlock const& fb);
       void doRespondToCloseInputFile(FileBlock const& fb);
-      void doRegisterThinnedAssociations(ProductRegistry const&,
-                                         ThinnedAssociationsHelper&) { }
+      void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
 
       void registerProductsAndCallbacks(EDProducerBase* module, ProductRegistry* reg) {
         registerProducts(module, reg, moduleDescription_);
       }
-      std::string workerType() const {return "WorkerT<EDProducer>";}
-      
-      virtual void produce(StreamID, Event&, EventSetup const&) const= 0;
+      std::string workerType() const { return "WorkerT<EDProducer>"; }
+
+      virtual void produce(StreamID, Event&, EventSetup const&) const = 0;
       //For now this is a placeholder
-      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
+      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                                    ModuleCallingContext const& iModuleCallingContext,
+                                                    Principal const& iPrincipal) const {}
 
       virtual void beginJob() {}
-      virtual void endJob(){}
+      virtual void endJob() {}
 
       virtual void preallocStreams(unsigned int);
       virtual void preallocLumis(unsigned int);
@@ -151,7 +145,7 @@ namespace edm {
       virtual void doBeginLuminosityBlockSummary_(LuminosityBlock const& rp, EventSetup const& c);
       virtual void doEndLuminosityBlockSummary_(LuminosityBlock const& lb, EventSetup const& c);
       virtual void doEndLuminosityBlock_(LuminosityBlock const& lb, EventSetup const& c);
-      
+
       virtual void doBeginRunProduce_(Run& rp, EventSetup const& c);
       virtual void doEndRunProduce_(Run& rp, EventSetup const& c);
       virtual void doBeginLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c);
@@ -163,16 +157,14 @@ namespace edm {
 
       virtual void doAcquire_(StreamID, Event const&, edm::EventSetup const&, WaitingTaskWithArenaHolder&);
 
-      void setModuleDescription(ModuleDescription const& md) {
-        moduleDescription_ = md;
-      }
+      void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
       ModuleDescription moduleDescription_;
       std::unique_ptr<std::vector<BranchID>[]> previousParentages_;
       std::unique_ptr<std::vector<BranchID>[]> gotBranchIDsFromAcquire_;
       std::unique_ptr<ParentageID[]> previousParentageIds_;
     };
 
-  }
-}
+  }  // namespace global
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/global/OutputModule.h b/FWCore/Framework/interface/global/OutputModule.h
index 089d1290bbd83..ae628a66c4b7e 100644
--- a/FWCore/Framework/interface/global/OutputModule.h
+++ b/FWCore/Framework/interface/global/OutputModule.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::global::OutputModule
-// 
+//
 /**\class edm::global::OutputModule OutputModule.h "FWCore/Framework/interface/global/OutputModule.h"
 
  Description: [one line class summary]
@@ -24,15 +24,11 @@
 // forward declarations
 namespace edm {
   namespace global {
-    template< typename... T>
-    class OutputModule : public virtual OutputModuleBase,
-        public outputmodule::AbilityToImplementor<T>::Type...
-    {
-      
+    template <typename... T>
+    class OutputModule : public virtual OutputModuleBase, public outputmodule::AbilityToImplementor<T>::Type... {
     public:
-      OutputModule(edm::ParameterSet const& iPSet): OutputModuleBase(iPSet),
-      outputmodule::AbilityToImplementor<T>::Type(iPSet)...
-       {}
+      OutputModule(edm::ParameterSet const& iPSet)
+          : OutputModuleBase(iPSet), outputmodule::AbilityToImplementor<T>::Type(iPSet)... {}
       // Required to work around ICC bug, but possible source of bloat in gcc.
       // We do this only in the case of the intel compiler as this might end up
       // creating a lot of code bloat due to inline symbols being generated in
@@ -40,28 +36,23 @@ namespace edm {
 #ifdef __INTEL_COMPILER
       virtual ~OutputModule() = default;
 #endif
-      
+
       // ---------- const member functions ---------------------
-      bool wantsStreamRuns() const final {
-        return WantsStreamRunTransitions<T...>::value;
-      }
-      bool wantsStreamLuminosityBlocks() const final {
-        return WantsStreamLuminosityBlockTransitions<T...>::value;
-      }
-      
+      bool wantsStreamRuns() const final { return WantsStreamRunTransitions<T...>::value; }
+      bool wantsStreamLuminosityBlocks() const final { return WantsStreamLuminosityBlockTransitions<T...>::value; }
+
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
-      
+
     private:
-      OutputModule(const OutputModule&) = delete; // stop default
-      
-      const OutputModule& operator=(const OutputModule&) =delete; // stop default
-      
+      OutputModule(const OutputModule&) = delete;  // stop default
+
+      const OutputModule& operator=(const OutputModule&) = delete;  // stop default
+
       // ---------- member data --------------------------------
-      
     };
-  }
-}
+  }  // namespace global
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/global/OutputModuleBase.h b/FWCore/Framework/interface/global/OutputModuleBase.h
index 6535704f9d97b..cd47c235d00c1 100644
--- a/FWCore/Framework/interface/global/OutputModuleBase.h
+++ b/FWCore/Framework/interface/global/OutputModuleBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     OutputModuleBase
-// 
+//
 /**\class OutputModuleBase OutputModuleBase.h "FWCore/Framework/interface/global/OutputModuleBase.h"
 
  Description: Base class for all 'global' OutputModules
@@ -52,68 +52,70 @@ namespace edm {
   class ThinnedAssociationsHelper;
   class WaitingTask;
 
-  template <typename T> class OutputModuleCommunicatorT;
-  
+  template <typename T>
+  class OutputModuleCommunicatorT;
+
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
   }
 
   namespace global {
-    
+
     class OutputModuleBase : public EDConsumerBase {
     public:
-      template <typename U> friend class edm::maker::ModuleHolderT;
-      template <typename T> friend class ::edm::WorkerT;
-      template <typename T> friend class ::edm::OutputModuleCommunicatorT;
+      template <typename U>
+      friend class edm::maker::ModuleHolderT;
+      template <typename T>
+      friend class ::edm::WorkerT;
+      template <typename T>
+      friend class ::edm::OutputModuleCommunicatorT;
       typedef OutputModuleBase ModuleType;
-      
+
       explicit OutputModuleBase(ParameterSet const& pset);
       ~OutputModuleBase() override;
-      
-      OutputModuleBase(OutputModuleBase const&) = delete; // Disallow copying and moving
-      OutputModuleBase& operator=(OutputModuleBase const&) = delete; // Disallow copying and moving
-      
+
+      OutputModuleBase(OutputModuleBase const&) = delete;             // Disallow copying and moving
+      OutputModuleBase& operator=(OutputModuleBase const&) = delete;  // Disallow copying and moving
+
       /// Accessor for maximum number of events to be written.
       /// -1 is used for unlimited.
-      int maxEvents() const {return maxEvents_;}
-      
+      int maxEvents() const { return maxEvents_; }
+
       /// Accessor for remaining number of events to be written.
       /// -1 is used for unlimited.
-      int remainingEvents() const {return remainingEvents_;}
-      
+      int remainingEvents() const { return remainingEvents_; }
+
       bool selected(BranchDescription const& desc) const;
-      
+
       void selectProducts(ProductRegistry const& preg, ThinnedAssociationsHelper const&);
-      std::string const& processName() const {return process_name_;}
-      SelectedProductsForBranchType const& keptProducts() const {return keptProducts_;}
-      std::array<bool, NumBranchTypes> const& hasNewlyDroppedBranch() const {return hasNewlyDroppedBranch_;}
-      
-      static void fillDescription(ParameterSetDescription & desc);
+      std::string const& processName() const { return process_name_; }
+      SelectedProductsForBranchType const& keptProducts() const { return keptProducts_; }
+      std::array<bool, NumBranchTypes> const& hasNewlyDroppedBranch() const { return hasNewlyDroppedBranch_; }
+
+      static void fillDescription(ParameterSetDescription& desc);
       static void fillDescriptions(ConfigurationDescriptions& descriptions);
       static const std::string& baseType();
-      static void prevalidate(ConfigurationDescriptions& );
-      
-      bool wantAllEvents() const {return wantAllEvents_;}
+      static void prevalidate(ConfigurationDescriptions&);
+
+      bool wantAllEvents() const { return wantAllEvents_; }
 
       BranchIDLists const* branchIDLists() const;
 
       ThinnedAssociationsHelper const* thinnedAssociationsHelper() const;
-      
-      const ModuleDescription& moduleDescription() const {
-        return moduleDescription_;
-      }
-      
+
+      const ModuleDescription& moduleDescription() const { return moduleDescription_; }
+
       //Output modules always need writeRun and writeLumi to be called
-      bool wantsGlobalRuns() const {return true;}
-      bool wantsGlobalLuminosityBlocks() const {return true;}
+      bool wantsGlobalRuns() const { return true; }
+      bool wantsGlobalLuminosityBlocks() const { return true; }
 
-      virtual bool wantsStreamRuns() const =0;
-      virtual bool wantsStreamLuminosityBlocks() const =0;
+      virtual bool wantsStreamRuns() const = 0;
+      virtual bool wantsStreamLuminosityBlocks() const = 0;
 
     protected:
-      
       ModuleDescription const& description() const;
-      
+
       ParameterSetID selectorConfig() const { return selector_config_id_; }
 
       void doPreallocate(PreallocationConfiguration const&);
@@ -123,52 +125,46 @@ namespace edm {
 
       void doBeginStream(StreamID id);
       void doEndStream(StreamID id);
-      void doStreamBeginRun(StreamID id,
-                            RunPrincipal& ep,
-                            EventSetupImpl const&  c,
-                            ModuleCallingContext const*);
-      void doStreamEndRun(StreamID id,
-                          RunPrincipal& ep,
-                          EventSetupImpl const&  c,
-                          ModuleCallingContext const*);
+      void doStreamBeginRun(StreamID id, RunPrincipal& ep, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doStreamEndRun(StreamID id, RunPrincipal& ep, EventSetupImpl const& c, ModuleCallingContext const*);
       void doStreamBeginLuminosityBlock(StreamID id,
                                         LuminosityBlockPrincipal& ep,
-                                        EventSetupImpl const&  c,
+                                        EventSetupImpl const& c,
                                         ModuleCallingContext const*);
       void doStreamEndLuminosityBlock(StreamID id,
                                       LuminosityBlockPrincipal& ep,
-                                      EventSetupImpl const&  c,
+                                      EventSetupImpl const& c,
                                       ModuleCallingContext const*);
 
-      bool doEvent(EventPrincipal const& ep, EventSetupImpl const&  c,
-                   ActivityRegistry*,
-                   ModuleCallingContext const*);
+      bool doEvent(EventPrincipal const& ep, EventSetupImpl const& c, ActivityRegistry*, ModuleCallingContext const*);
       //For now this is a placeholder
-      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
+      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                                    ModuleCallingContext const& iModuleCallingContext,
+                                                    Principal const& iPrincipal) const {}
 
-      bool doBeginRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                      ModuleCallingContext const*);
-      bool doEndRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                    ModuleCallingContext const*);
-      bool doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      bool doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      bool doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      bool doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                  EventSetupImpl const& c,
                                   ModuleCallingContext const*);
-      bool doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      bool doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                EventSetupImpl const& c,
                                 ModuleCallingContext const*);
-      
-      void setEventSelectionInfo(std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
-                                 bool anyProductProduced);
-      
+
+      void setEventSelectionInfo(
+          std::map<std::string, std::vector<std::pair<std::string, int>>> const& outputModulePathPositions,
+          bool anyProductProduced);
+
       void configure(OutputModuleDescription const& desc);
-      
+
       std::map<BranchID::value_type, BranchID::value_type> const& droppedBranchIDToKeptBranchID() {
         return droppedBranchIDToKeptBranchID_;
       }
-      
+
     private:
-      
       int maxEvents_;
       std::atomic<int> remainingEvents_;
-      
+
       // TODO: Give OutputModule
       // an interface (protected?) that supplies client code with the
       // needed functionality *without* giving away implementation
@@ -179,26 +175,26 @@ namespace edm {
       // clients (classes derived from OutputModule) to use the
       // newly-introduced interface.
       // TODO: Consider using shared pointers here?
-      
+
       // keptProducts_ are pointers to the BranchDescription objects describing
       // the branches we are to write.
       //
       // We do not own the BranchDescriptions to which we point.
       SelectedProductsForBranchType keptProducts_;
       std::array<bool, NumBranchTypes> hasNewlyDroppedBranch_;
-      
+
       std::string process_name_;
       ProductSelectorRules productSelectorRules_;
       ProductSelector productSelector_;
       ModuleDescription moduleDescription_;
-      
+
       bool wantAllEvents_;
       std::vector<detail::TriggerResultsBasedEventSelector> selectors_;
       ParameterSet selectEvents_;
       // ID of the ParameterSet that configured the event selector
       // subsystem.
       ParameterSetID selector_config_id_;
-      
+
       // needed because of possible EDAliases.
       // filled in only if key and value are different.
       std::map<BranchID::value_type, BranchID::value_type> droppedBranchIDToKeptBranchID_;
@@ -219,56 +215,54 @@ namespace edm {
       void doOpenFile(FileBlock const& fb);
       void doRespondToOpenInputFile(FileBlock const& fb);
       void doRespondToCloseInputFile(FileBlock const& fb);
-      void doRegisterThinnedAssociations(ProductRegistry const&,
-                                         ThinnedAssociationsHelper&) { }
+      void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
+
+      std::string workerType() const { return "WorkerT<edm::global::OutputModuleBase>"; }
 
-      std::string workerType() const {return "WorkerT<edm::global::OutputModuleBase>";}
-      
       /// Tell the OutputModule that is must end the current file.
       void doCloseFile();
-      
+
       void registerProductsAndCallbacks(OutputModuleBase const*, ProductRegistry const*) {}
 
       bool needToRunSelection() const;
       std::vector<ProductResolverIndexAndSkipBit> productsUsedBySelection() const;
       bool prePrefetchSelection(StreamID id, EventPrincipal const&, ModuleCallingContext const*);
-      
+
       // Do the end-of-file tasks; this is only called internally, after
       // the appropriate tests have been done.
       virtual void reallyCloseFile();
-      
-      
+
       /// Ask the OutputModule if we should end the current file.
-      virtual bool shouldWeCloseFile() const {return false;}
-      
+      virtual bool shouldWeCloseFile() const { return false; }
+
       virtual void write(EventForOutput const&) = 0;
-      virtual void beginJob(){}
-      virtual void endJob(){}
+      virtual void beginJob() {}
+      virtual void endJob() {}
       virtual void writeLuminosityBlock(LuminosityBlockForOutput const&) = 0;
       virtual void writeRun(RunForOutput const&) = 0;
       virtual void openFile(FileBlock const&) {}
       virtual bool isFileOpen() const { return true; }
-      
-      virtual void preallocStreams(unsigned int){}
-      virtual void preallocLumis(unsigned int){}
-      virtual void preallocate(PreallocationConfiguration const&){}
-      virtual void doBeginStream_(StreamID){}
-      virtual void doEndStream_(StreamID){}
-      virtual void doStreamBeginRun_(StreamID, RunForOutput const&, EventSetup const&){}
-      virtual void doStreamEndRun_(StreamID, RunForOutput const&, EventSetup const&){}
-      virtual void doStreamEndRunSummary_(StreamID, RunForOutput const&, EventSetup const&){}
-      virtual void doStreamBeginLuminosityBlock_(StreamID, LuminosityBlockForOutput const&, EventSetup const&){}
-      virtual void doStreamEndLuminosityBlock_(StreamID, LuminosityBlockForOutput const&, EventSetup const&){}
-      virtual void doStreamEndLuminosityBlockSummary_(StreamID, LuminosityBlockForOutput const&, EventSetup const&){}
-
-      virtual void doBeginRun_(RunForOutput const&){}
-      virtual void doBeginRunSummary_(RunForOutput const&, EventSetup const&){}
-      virtual void doEndRun_(RunForOutput const& ){}
-      virtual void doEndRunSummary_(RunForOutput const&, EventSetup const&){}
-      virtual void doBeginLuminosityBlock_(LuminosityBlockForOutput const&){}
-      virtual void doBeginLuminosityBlockSummary_(LuminosityBlockForOutput const&, EventSetup const&){}
-      virtual void doEndLuminosityBlock_(LuminosityBlockForOutput const&){}
-      virtual void doEndLuminosityBlockSummary_(LuminosityBlockForOutput const&, EventSetup const&){}
+
+      virtual void preallocStreams(unsigned int) {}
+      virtual void preallocLumis(unsigned int) {}
+      virtual void preallocate(PreallocationConfiguration const&) {}
+      virtual void doBeginStream_(StreamID) {}
+      virtual void doEndStream_(StreamID) {}
+      virtual void doStreamBeginRun_(StreamID, RunForOutput const&, EventSetup const&) {}
+      virtual void doStreamEndRun_(StreamID, RunForOutput const&, EventSetup const&) {}
+      virtual void doStreamEndRunSummary_(StreamID, RunForOutput const&, EventSetup const&) {}
+      virtual void doStreamBeginLuminosityBlock_(StreamID, LuminosityBlockForOutput const&, EventSetup const&) {}
+      virtual void doStreamEndLuminosityBlock_(StreamID, LuminosityBlockForOutput const&, EventSetup const&) {}
+      virtual void doStreamEndLuminosityBlockSummary_(StreamID, LuminosityBlockForOutput const&, EventSetup const&) {}
+
+      virtual void doBeginRun_(RunForOutput const&) {}
+      virtual void doBeginRunSummary_(RunForOutput const&, EventSetup const&) {}
+      virtual void doEndRun_(RunForOutput const&) {}
+      virtual void doEndRunSummary_(RunForOutput const&, EventSetup const&) {}
+      virtual void doBeginLuminosityBlock_(LuminosityBlockForOutput const&) {}
+      virtual void doBeginLuminosityBlockSummary_(LuminosityBlockForOutput const&, EventSetup const&) {}
+      virtual void doEndLuminosityBlock_(LuminosityBlockForOutput const&) {}
+      virtual void doEndLuminosityBlockSummary_(LuminosityBlockForOutput const&, EventSetup const&) {}
       virtual void doRespondToOpenInputFile_(FileBlock const&) {}
       virtual void doRespondToCloseInputFile_(FileBlock const&) {}
 
@@ -281,12 +275,10 @@ namespace edm {
                           std::map<BranchID, BranchDescription const*>& trueBranchIDToKeptBranchDesc,
                           std::set<BranchID>& keptProductsInEvent);
 
-      void setModuleDescription(ModuleDescription const& md) {
-        moduleDescription_ = md;
-      }
-      
-      bool limitReached() const {return remainingEvents_ == 0;}
+      void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
+
+      bool limitReached() const { return remainingEvents_ == 0; }
     };
-  }
-}
+  }  // namespace global
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/global/analyzerAbilityToImplementor.h b/FWCore/Framework/interface/global/analyzerAbilityToImplementor.h
index 214e31276727b..d77857f1367e4 100644
--- a/FWCore/Framework/interface/global/analyzerAbilityToImplementor.h
+++ b/FWCore/Framework/interface/global/analyzerAbilityToImplementor.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // File  :     analyzerAbilityToImplementor
-// 
+//
 /**\file  analyzerAbilityToImplementor.h "FWCore/Framework/interface/global/analyzerAbilityToImplementor.h"
 
  Description: Class used to pair a module Ability to the actual base class used to implement that ability
@@ -29,34 +29,35 @@
 namespace edm {
   namespace global {
     namespace analyzer {
-      template<typename T> struct AbilityToImplementor;
-      
-      template<typename C>
+      template <typename T>
+      struct AbilityToImplementor;
+
+      template <typename C>
       struct AbilityToImplementor<edm::StreamCache<C>> {
-        typedef edm::global::impl::StreamCacheHolder<edm::global::EDAnalyzerBase,C> Type;
+        typedef edm::global::impl::StreamCacheHolder<edm::global::EDAnalyzerBase, C> Type;
       };
 
-      template<typename C>
+      template <typename C>
       struct AbilityToImplementor<edm::RunCache<C>> {
-        typedef edm::global::impl::RunCacheHolder<edm::global::EDAnalyzerBase,C> Type;
+        typedef edm::global::impl::RunCacheHolder<edm::global::EDAnalyzerBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::RunSummaryCache<C>> {
-        typedef edm::global::impl::RunSummaryCacheHolder<edm::global::EDAnalyzerBase,C> Type;
+        typedef edm::global::impl::RunSummaryCacheHolder<edm::global::EDAnalyzerBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::LuminosityBlockCache<C>> {
-        typedef edm::global::impl::LuminosityBlockCacheHolder<edm::global::EDAnalyzerBase,C> Type;
+        typedef edm::global::impl::LuminosityBlockCacheHolder<edm::global::EDAnalyzerBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::LuminosityBlockSummaryCache<C>> {
-        typedef edm::global::impl::LuminosityBlockSummaryCacheHolder<edm::global::EDAnalyzerBase,C> Type;
+        typedef edm::global::impl::LuminosityBlockSummaryCacheHolder<edm::global::EDAnalyzerBase, C> Type;
       };
-    }
-  }
-}
+    }  // namespace analyzer
+  }    // namespace global
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/global/filterAbilityToImplementor.h b/FWCore/Framework/interface/global/filterAbilityToImplementor.h
index d64c4dd0a7522..943ee242001a0 100644
--- a/FWCore/Framework/interface/global/filterAbilityToImplementor.h
+++ b/FWCore/Framework/interface/global/filterAbilityToImplementor.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // File  :     filterAbilityToImplementor
-// 
+//
 /**\file  filterAbilityToImplementor.h "FWCore/Framework/interface/global/filterAbilityToImplementor.h"
 
  Description: Class used to pair a module Ability to the actual base class used to implement that ability
@@ -29,78 +29,84 @@
 namespace edm {
   namespace global {
     namespace filter {
-      template<typename T> struct AbilityToImplementor;
-      
-      template<typename C>
+      template <typename T>
+      struct AbilityToImplementor;
+
+      template <typename C>
       struct AbilityToImplementor<edm::StreamCache<C>> {
-        typedef edm::global::impl::StreamCacheHolder<edm::global::EDFilterBase,C> Type;
+        typedef edm::global::impl::StreamCacheHolder<edm::global::EDFilterBase, C> Type;
       };
 
-      template<typename C>
+      template <typename C>
       struct AbilityToImplementor<edm::RunCache<C>> {
-        typedef edm::global::impl::RunCacheHolder<edm::global::EDFilterBase,C> Type;
+        typedef edm::global::impl::RunCacheHolder<edm::global::EDFilterBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::RunSummaryCache<C>> {
-        typedef edm::global::impl::RunSummaryCacheHolder<edm::global::EDFilterBase,C> Type;
+        typedef edm::global::impl::RunSummaryCacheHolder<edm::global::EDFilterBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::LuminosityBlockCache<C>> {
-        typedef edm::global::impl::LuminosityBlockCacheHolder<edm::global::EDFilterBase,C> Type;
+        typedef edm::global::impl::LuminosityBlockCacheHolder<edm::global::EDFilterBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::LuminosityBlockSummaryCache<C>> {
-        typedef edm::global::impl::LuminosityBlockSummaryCacheHolder<edm::global::EDFilterBase,C> Type;
+        typedef edm::global::impl::LuminosityBlockSummaryCacheHolder<edm::global::EDFilterBase, C> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::BeginRunProducer> {
         typedef edm::global::impl::BeginRunProducer<edm::global::EDFilterBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::EndRunProducer> {
         typedef edm::global::impl::EndRunProducer<edm::global::EDFilterBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::BeginLuminosityBlockProducer> {
         typedef edm::global::impl::BeginLuminosityBlockProducer<edm::global::EDFilterBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::EndLuminosityBlockProducer> {
         typedef edm::global::impl::EndLuminosityBlockProducer<edm::global::EDFilterBase> Type;
       };
-      template<>
+      template <>
       struct AbilityToImplementor<edm::ExternalWork> {
         typedef edm::global::impl::ExternalWork<edm::global::EDFilterBase> Type;
       };
 
-      template<bool,bool,typename T> struct SpecializeAbilityToImplementor {
+      template <bool, bool, typename T>
+      struct SpecializeAbilityToImplementor {
         typedef typename AbilityToImplementor<T>::Type Type;
       };
-      
-      template<bool B,typename C> struct SpecializeAbilityToImplementor<true,B,edm::RunSummaryCache<C>> {
-        typedef typename edm::global::impl::EndRunSummaryProducer<edm::global::EDFilterBase,C> Type;
+
+      template <bool B, typename C>
+      struct SpecializeAbilityToImplementor<true, B, edm::RunSummaryCache<C>> {
+        typedef typename edm::global::impl::EndRunSummaryProducer<edm::global::EDFilterBase, C> Type;
       };
-      
-      template<bool B> struct SpecializeAbilityToImplementor<true,B,edm::EndRunProducer> {
+
+      template <bool B>
+      struct SpecializeAbilityToImplementor<true, B, edm::EndRunProducer> {
         typedef typename edm::global::impl::EmptyType Type;
       };
 
-      template<bool B,typename C> struct SpecializeAbilityToImplementor<B,true,edm::LuminosityBlockSummaryCache<C>> {
-        typedef typename edm::global::impl::EndLuminosityBlockSummaryProducer<edm::global::EDFilterBase,C> Type;
+      template <bool B, typename C>
+      struct SpecializeAbilityToImplementor<B, true, edm::LuminosityBlockSummaryCache<C>> {
+        typedef typename edm::global::impl::EndLuminosityBlockSummaryProducer<edm::global::EDFilterBase, C> Type;
       };
-      
-      template<bool B> struct SpecializeAbilityToImplementor<B,true,edm::EndLuminosityBlockProducer> {
+
+      template <bool B>
+      struct SpecializeAbilityToImplementor<B, true, edm::EndLuminosityBlockProducer> {
         typedef typename edm::global::impl::EmptyType Type;
       };
-    }
-  }
-}
+    }  // namespace filter
+  }    // namespace global
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/global/implementors.h b/FWCore/Framework/interface/global/implementors.h
index f226b36d2032e..e629c1e7273f3 100644
--- a/FWCore/Framework/interface/global/implementors.h
+++ b/FWCore/Framework/interface/global/implementors.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     implementors
-// 
+//
 /**\file implementors.h "FWCore/Framework/interface/global/implementors.h"
 
  Description: Base classes used to implement the interfaces for the edm::global::* module  abilities
@@ -34,135 +34,133 @@
 namespace edm {
 
   class WaitingTaskWithArenaHolder;
-  
+
   namespace global {
     namespace impl {
       class EmptyType {};
-      
-      
+
       template <typename T, typename C>
       class StreamCacheHolder : public virtual T {
       public:
         StreamCacheHolder() = default;
-        StreamCacheHolder( StreamCacheHolder<T,C> const&) = delete;
-        StreamCacheHolder<T,C>& operator=(StreamCacheHolder<T,C> const&) = delete;
+        StreamCacheHolder(StreamCacheHolder<T, C> const&) = delete;
+        StreamCacheHolder<T, C>& operator=(StreamCacheHolder<T, C> const&) = delete;
         ~StreamCacheHolder() override {
-          for(auto c: caches_){
+          for (auto c : caches_) {
             delete c;
           }
         }
+
       protected:
-        C * streamCache(edm::StreamID iID) const { return caches_[iID.value()]; }
+        C* streamCache(edm::StreamID iID) const { return caches_[iID.value()]; }
+
       private:
-        void preallocStreams(unsigned int iNStreams) final {
-          caches_.resize(iNStreams,static_cast<C*>(nullptr));
-        }
-        void doBeginStream_(StreamID id) final {
-          caches_[id.value()] = beginStream(id).release();
-        }
+        void preallocStreams(unsigned int iNStreams) final { caches_.resize(iNStreams, static_cast<C*>(nullptr)); }
+        void doBeginStream_(StreamID id) final { caches_[id.value()] = beginStream(id).release(); }
         void doEndStream_(StreamID id) final {
           endStream(id);
           delete caches_[id.value()];
-          caches_[id.value()]=nullptr;
-        }
-        void doStreamBeginRun_(StreamID id, Run const& rp, EventSetup const& c) final {
-          streamBeginRun(id,rp,c);
-        }
-        void doStreamEndRun_(StreamID id, Run const& rp, EventSetup const& c) final {
-          streamEndRun(id,rp,c);
+          caches_[id.value()] = nullptr;
         }
+        void doStreamBeginRun_(StreamID id, Run const& rp, EventSetup const& c) final { streamBeginRun(id, rp, c); }
+        void doStreamEndRun_(StreamID id, Run const& rp, EventSetup const& c) final { streamEndRun(id, rp, c); }
         void doStreamBeginLuminosityBlock_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) final {
-          streamBeginLuminosityBlock(id,lbp,c);
+          streamBeginLuminosityBlock(id, lbp, c);
         }
         void doStreamEndLuminosityBlock_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) final {
-          streamEndLuminosityBlock(id,lbp,c);
+          streamEndLuminosityBlock(id, lbp, c);
         }
 
         virtual std::unique_ptr<C> beginStream(edm::StreamID) const = 0;
-        virtual void streamBeginRun(edm::StreamID, edm::Run const&, edm::EventSetup const&) const  {}
-        virtual void streamBeginLuminosityBlock(edm::StreamID, edm::LuminosityBlock const&, edm::EventSetup const&) const {}
-        virtual void streamEndLuminosityBlock(edm::StreamID, edm::LuminosityBlock const&, edm::EventSetup const&) const {}
+        virtual void streamBeginRun(edm::StreamID, edm::Run const&, edm::EventSetup const&) const {}
+        virtual void streamBeginLuminosityBlock(edm::StreamID,
+                                                edm::LuminosityBlock const&,
+                                                edm::EventSetup const&) const {}
+        virtual void streamEndLuminosityBlock(edm::StreamID,
+                                              edm::LuminosityBlock const&,
+                                              edm::EventSetup const&) const {}
         virtual void streamEndRun(edm::StreamID, edm::Run const&, edm::EventSetup const&) const {}
         virtual void endStream(edm::StreamID) const {}
 
         //When threaded we will have a container for N items whre N is # of streams
         std::vector<C*> caches_;
       };
-      
+
       template <typename T, typename C>
       class RunCacheHolder : public virtual T {
       public:
         RunCacheHolder() = default;
-        RunCacheHolder( RunCacheHolder<T,C> const&) = delete;
-        RunCacheHolder<T,C>& operator=(RunCacheHolder<T,C> const&) = delete;
-        ~RunCacheHolder() noexcept(false) override {};
+        RunCacheHolder(RunCacheHolder<T, C> const&) = delete;
+        RunCacheHolder<T, C>& operator=(RunCacheHolder<T, C> const&) = delete;
+        ~RunCacheHolder() noexcept(false) override{};
+
       protected:
         C const* runCache(edm::RunIndex iID) const { return cache_.get(); }
+
       private:
-        void doBeginRun_(Run const& rp, EventSetup const& c) final {
-          cache_ = globalBeginRun(rp,c);
-        }
+        void doBeginRun_(Run const& rp, EventSetup const& c) final { cache_ = globalBeginRun(rp, c); }
         void doEndRun_(Run const& rp, EventSetup const& c) final {
-          globalEndRun(rp,c);
-          cache_ = nullptr; // propagate_const<T> has no reset() function
+          globalEndRun(rp, c);
+          cache_ = nullptr;  // propagate_const<T> has no reset() function
         }
-        
+
         virtual std::shared_ptr<C> globalBeginRun(edm::Run const&, edm::EventSetup const&) const = 0;
         virtual void globalEndRun(edm::Run const&, edm::EventSetup const&) const = 0;
         //When threaded we will have a container for N items whre N is # of simultaneous runs
         edm::propagate_const<std::shared_ptr<C>> cache_;
       };
-      
+
       template <typename T, typename C>
       class LuminosityBlockCacheHolder : public virtual T {
       public:
         LuminosityBlockCacheHolder() = default;
-        LuminosityBlockCacheHolder( LuminosityBlockCacheHolder<T,C> const&) = delete;
-        LuminosityBlockCacheHolder<T,C>& operator=(LuminosityBlockCacheHolder<T,C> const&) = delete;
-        ~LuminosityBlockCacheHolder() noexcept(false) override {};
+        LuminosityBlockCacheHolder(LuminosityBlockCacheHolder<T, C> const&) = delete;
+        LuminosityBlockCacheHolder<T, C>& operator=(LuminosityBlockCacheHolder<T, C> const&) = delete;
+        ~LuminosityBlockCacheHolder() noexcept(false) override{};
+
       protected:
-        void preallocLumis(unsigned int iNLumis) final {
-          caches_.reset( new std::shared_ptr<C>[iNLumis]);
-        }
+        void preallocLumis(unsigned int iNLumis) final { caches_.reset(new std::shared_ptr<C>[iNLumis]); }
 
         C const* luminosityBlockCache(edm::LuminosityBlockIndex iID) const { return caches_[iID].get(); }
+
       private:
         void doBeginLuminosityBlock_(LuminosityBlock const& lp, EventSetup const& c) final {
-          caches_[lp.index()] = globalBeginLuminosityBlock(lp,c);
+          caches_[lp.index()] = globalBeginLuminosityBlock(lp, c);
         }
         void doEndLuminosityBlock_(LuminosityBlock const& lp, EventSetup const& c) final {
-          globalEndLuminosityBlock(lp,c);
+          globalEndLuminosityBlock(lp, c);
           caches_[lp.index()].reset();
         }
-        
-        virtual std::shared_ptr<C> globalBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const = 0;
+
+        virtual std::shared_ptr<C> globalBeginLuminosityBlock(edm::LuminosityBlock const&,
+                                                              edm::EventSetup const&) const = 0;
         virtual void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const = 0;
         //When threaded we will have a container for N items whre N is # of simultaneous runs
         std::unique_ptr<std::shared_ptr<C>[]> caches_;
       };
-      
-      template<typename T, typename C> class EndRunSummaryProducer;
-      
+
+      template <typename T, typename C>
+      class EndRunSummaryProducer;
+
       template <typename T, typename C>
       class RunSummaryCacheHolder : public virtual T {
       public:
         RunSummaryCacheHolder() = default;
-        RunSummaryCacheHolder( RunSummaryCacheHolder<T,C> const&) = delete;
-        RunSummaryCacheHolder<T,C>& operator=(RunSummaryCacheHolder<T,C> const&) = delete;
-        ~RunSummaryCacheHolder() noexcept(false) {};
+        RunSummaryCacheHolder(RunSummaryCacheHolder<T, C> const&) = delete;
+        RunSummaryCacheHolder<T, C>& operator=(RunSummaryCacheHolder<T, C> const&) = delete;
+        ~RunSummaryCacheHolder() noexcept(false){};
+
       private:
-        friend class EndRunSummaryProducer<T,C>;
+        friend class EndRunSummaryProducer<T, C>;
         void doBeginRunSummary_(edm::Run const& rp, EventSetup const& c) final {
-          cache_ = globalBeginRunSummary(rp,c);
+          cache_ = globalBeginRunSummary(rp, c);
         }
         void doStreamEndRunSummary_(StreamID id, Run const& rp, EventSetup const& c) final {
           //NOTE: in future this will need to be serialized
           std::lock_guard<std::mutex> guard(mutex_);
-          streamEndRunSummary(id,rp,c,cache_.get());
-        }
-        void doEndRunSummary_(Run const& rp, EventSetup const& c) final {
-          globalEndRunSummary(rp,c,cache_.get());
+          streamEndRunSummary(id, rp, c, cache_.get());
         }
+        void doEndRunSummary_(Run const& rp, EventSetup const& c) final { globalEndRunSummary(rp, c, cache_.get()); }
 
         virtual std::shared_ptr<C> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&) const = 0;
         virtual void streamEndRunSummary(StreamID, edm::Run const&, edm::EventSetup const&, C*) const = 0;
@@ -174,86 +172,87 @@ namespace edm {
         std::mutex mutex_;
       };
 
-      template<typename T, typename C> class EndLuminosityBlockSummaryProducer;
+      template <typename T, typename C>
+      class EndLuminosityBlockSummaryProducer;
 
-      
       template <typename T, typename C>
       class LuminosityBlockSummaryCacheHolder : public virtual T {
       public:
         LuminosityBlockSummaryCacheHolder() = default;
-        LuminosityBlockSummaryCacheHolder( LuminosityBlockSummaryCacheHolder<T,C> const&) = delete;
-        LuminosityBlockSummaryCacheHolder<T,C>& operator=(LuminosityBlockSummaryCacheHolder<T,C> const&) = delete;
-        ~LuminosityBlockSummaryCacheHolder() noexcept(false) override {};
+        LuminosityBlockSummaryCacheHolder(LuminosityBlockSummaryCacheHolder<T, C> const&) = delete;
+        LuminosityBlockSummaryCacheHolder<T, C>& operator=(LuminosityBlockSummaryCacheHolder<T, C> const&) = delete;
+        ~LuminosityBlockSummaryCacheHolder() noexcept(false) override{};
+
       private:
-        friend class EndLuminosityBlockSummaryProducer<T,C>;
-        
+        friend class EndLuminosityBlockSummaryProducer<T, C>;
+
         void doBeginLuminosityBlockSummary_(edm::LuminosityBlock const& lb, EventSetup const& c) final {
-          cache_ = globalBeginLuminosityBlockSummary(lb,c);
+          cache_ = globalBeginLuminosityBlockSummary(lb, c);
         }
 
-        void doStreamEndLuminosityBlockSummary_(StreamID id, LuminosityBlock const& lb, EventSetup const& c) final
-        {
+        void doStreamEndLuminosityBlockSummary_(StreamID id, LuminosityBlock const& lb, EventSetup const& c) final {
           std::lock_guard<std::mutex> guard(mutex_);
-          streamEndLuminosityBlockSummary(id,lb,c,cache_.get());
+          streamEndLuminosityBlockSummary(id, lb, c, cache_.get());
         }
         void doEndLuminosityBlockSummary_(LuminosityBlock const& lb, EventSetup const& c) final {
-          globalEndLuminosityBlockSummary(lb,c,cache_.get());
+          globalEndLuminosityBlockSummary(lb, c, cache_.get());
         }
 
-        virtual std::shared_ptr<C> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&) const = 0;
-        virtual void streamEndLuminosityBlockSummary(StreamID, edm::LuminosityBlock const&, edm::EventSetup const&, C*) const = 0;
-        
+        virtual std::shared_ptr<C> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                                     edm::EventSetup const&) const = 0;
+        virtual void streamEndLuminosityBlockSummary(StreamID,
+                                                     edm::LuminosityBlock const&,
+                                                     edm::EventSetup const&,
+                                                     C*) const = 0;
+
         virtual void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, C*) const = 0;
-        
+
         //When threaded we will have a container for N items where N is # of simultaneous Lumis
         std::shared_ptr<C> cache_;
         std::mutex mutex_;
       };
 
-      
       template <typename T>
       class BeginRunProducer : public virtual T {
       public:
         BeginRunProducer() = default;
-        BeginRunProducer( BeginRunProducer const&) = delete;
+        BeginRunProducer(BeginRunProducer const&) = delete;
         BeginRunProducer& operator=(BeginRunProducer const&) = delete;
-        ~BeginRunProducer() noexcept(false) override {};
-        
+        ~BeginRunProducer() noexcept(false) override{};
+
       private:
         void doBeginRunProduce_(Run& rp, EventSetup const& c) final;
-        
+
         virtual void globalBeginRunProduce(edm::Run&, edm::EventSetup const&) const = 0;
       };
-      
+
       template <typename T>
       class EndRunProducer : public virtual T {
       public:
         EndRunProducer() = default;
-        EndRunProducer( EndRunProducer const&) = delete;
+        EndRunProducer(EndRunProducer const&) = delete;
         EndRunProducer& operator=(EndRunProducer const&) = delete;
-        ~EndRunProducer() noexcept(false) override {};
-        
+        ~EndRunProducer() noexcept(false) override{};
+
       private:
-        
         void doEndRunProduce_(Run& rp, EventSetup const& c) final;
-        
+
         virtual void globalEndRunProduce(edm::Run&, edm::EventSetup const&) const = 0;
       };
 
       template <typename T, typename C>
-      class EndRunSummaryProducer : public RunSummaryCacheHolder<T,C> {
+      class EndRunSummaryProducer : public RunSummaryCacheHolder<T, C> {
       public:
         EndRunSummaryProducer() = default;
-        EndRunSummaryProducer( EndRunSummaryProducer const&) = delete;
+        EndRunSummaryProducer(EndRunSummaryProducer const&) = delete;
         EndRunSummaryProducer& operator=(EndRunSummaryProducer const&) = delete;
-        ~EndRunSummaryProducer() noexcept(false) {};
-        
+        ~EndRunSummaryProducer() noexcept(false){};
+
       private:
-        
         void doEndRunProduce_(Run& rp, EventSetup const& c) final {
-          globalEndRunProduce(rp,c,RunSummaryCacheHolder<T,C>::cache_.get());
+          globalEndRunProduce(rp, c, RunSummaryCacheHolder<T, C>::cache_.get());
         }
-        
+
         virtual void globalEndRunProduce(edm::Run&, edm::EventSetup const&, C const*) const = 0;
       };
 
@@ -261,41 +260,41 @@ namespace edm {
       class BeginLuminosityBlockProducer : public virtual T {
       public:
         BeginLuminosityBlockProducer() = default;
-        BeginLuminosityBlockProducer( BeginLuminosityBlockProducer const&) = delete;
+        BeginLuminosityBlockProducer(BeginLuminosityBlockProducer const&) = delete;
         BeginLuminosityBlockProducer& operator=(BeginLuminosityBlockProducer const&) = delete;
-        ~BeginLuminosityBlockProducer() noexcept(false) override {};
-        
+        ~BeginLuminosityBlockProducer() noexcept(false) override{};
+
       private:
         void doBeginLuminosityBlockProduce_(LuminosityBlock& lb, EventSetup const& c) final;
         virtual void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const = 0;
       };
-      
+
       template <typename T>
       class EndLuminosityBlockProducer : public virtual T {
       public:
         EndLuminosityBlockProducer() = default;
-        EndLuminosityBlockProducer( EndLuminosityBlockProducer const&) = delete;
+        EndLuminosityBlockProducer(EndLuminosityBlockProducer const&) = delete;
         EndLuminosityBlockProducer& operator=(EndLuminosityBlockProducer const&) = delete;
-        ~EndLuminosityBlockProducer() noexcept(false) override {};
-        
+        ~EndLuminosityBlockProducer() noexcept(false) override{};
+
       private:
         void doEndLuminosityBlockProduce_(LuminosityBlock& lb, EventSetup const& c) final;
         virtual void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const = 0;
       };
 
       template <typename T, typename S>
-      class EndLuminosityBlockSummaryProducer : public LuminosityBlockSummaryCacheHolder<T,S> {
+      class EndLuminosityBlockSummaryProducer : public LuminosityBlockSummaryCacheHolder<T, S> {
       public:
         EndLuminosityBlockSummaryProducer() = default;
-        EndLuminosityBlockSummaryProducer( EndLuminosityBlockSummaryProducer const&) = delete;
+        EndLuminosityBlockSummaryProducer(EndLuminosityBlockSummaryProducer const&) = delete;
         EndLuminosityBlockSummaryProducer& operator=(EndLuminosityBlockSummaryProducer const&) = delete;
-        ~EndLuminosityBlockSummaryProducer() noexcept(false) {};
-        
+        ~EndLuminosityBlockSummaryProducer() noexcept(false){};
+
       private:
         void doEndLuminosityBlockProduce_(LuminosityBlock& lb, EventSetup const& c) final {
-          globalEndLuminosityBlockProduce(lb,c,LuminosityBlockSummaryCacheHolder<T,S>::cache_.get());
+          globalEndLuminosityBlockProduce(lb, c, LuminosityBlockSummaryCacheHolder<T, S>::cache_.get());
         }
-        
+
         virtual void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&, S const*) const = 0;
       };
 
@@ -305,21 +304,14 @@ namespace edm {
         ExternalWork() = default;
         ExternalWork(ExternalWork const&) = delete;
         ExternalWork& operator=(ExternalWork const&) = delete;
-        ~ExternalWork() noexcept(false) override {};
+        ~ExternalWork() noexcept(false) override{};
 
       private:
-
         bool hasAcquire() const override { return true; }
 
-        void doAcquire_(StreamID,
-                        Event const&,
-                        edm::EventSetup const&,
-                        WaitingTaskWithArenaHolder&) final;
+        void doAcquire_(StreamID, Event const&, edm::EventSetup const&, WaitingTaskWithArenaHolder&) final;
 
-        virtual void acquire(StreamID,
-                             Event const&,
-                             edm::EventSetup const&,
-                             WaitingTaskWithArenaHolder) const = 0;
+        virtual void acquire(StreamID, Event const&, edm::EventSetup const&, WaitingTaskWithArenaHolder) const = 0;
       };
 
       template <typename T>
@@ -328,21 +320,17 @@ namespace edm {
         Accumulator() = default;
         Accumulator(Accumulator const&) = delete;
         Accumulator& operator=(Accumulator const&) = delete;
-        ~Accumulator() noexcept(false) override {};
+        ~Accumulator() noexcept(false) override{};
 
       private:
-
         bool hasAccumulator() const override { return true; }
 
-        void produce(StreamID streamID, Event& ev, EventSetup const& es) const final {
-          accumulate(streamID, ev, es);
-        }
+        void produce(StreamID streamID, Event& ev, EventSetup const& es) const final { accumulate(streamID, ev, es); }
 
         virtual void accumulate(StreamID streamID, Event const& ev, EventSetup const& es) const = 0;
       };
-    }
-  }
-}
-
+    }  // namespace impl
+  }    // namespace global
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/global/outputmoduleAbilityToImplementor.h b/FWCore/Framework/interface/global/outputmoduleAbilityToImplementor.h
index 3121d148e5993..216b73d1ce8f0 100644
--- a/FWCore/Framework/interface/global/outputmoduleAbilityToImplementor.h
+++ b/FWCore/Framework/interface/global/outputmoduleAbilityToImplementor.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     outputmodule::AbilityToImplementor
-// 
+//
 /**\class outputmodule::AbilityToImplementor outputmoduleAbilityToImplementor.h "FWCore/Framework/interface/global/outputmoduleAbilityToImplementor.h"
 
  Description: [one line class summary]
@@ -29,21 +29,21 @@
 namespace edm {
   class FileBlock;
   class ModuleCallingContext;
-  
+
   namespace global {
     namespace outputmodule {
 
       class InputFileWatcher : public virtual OutputModuleBase {
       public:
-        InputFileWatcher(edm::ParameterSet const&iPSet): OutputModuleBase(iPSet) {}
+        InputFileWatcher(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {}
         InputFileWatcher(InputFileWatcher const&) = delete;
         InputFileWatcher& operator=(InputFileWatcher const&) = delete;
-        ~InputFileWatcher() noexcept(false) override {};
-        
+        ~InputFileWatcher() noexcept(false) override{};
+
       private:
         void doRespondToOpenInputFile_(FileBlock const&) final;
         void doRespondToCloseInputFile_(FileBlock const&) final;
-        
+
         virtual void respondToOpenInputFile(FileBlock const&) = 0;
         virtual void respondToCloseInputFile(FileBlock const&) = 0;
       };
@@ -51,19 +51,19 @@ namespace edm {
       template <typename T, typename C>
       class RunCacheHolder : public virtual T {
       public:
-        RunCacheHolder(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) { }
-        RunCacheHolder( RunCacheHolder<T,C> const&) = delete;
-        RunCacheHolder<T,C>& operator=(RunCacheHolder<T,C> const&) = delete;
-        ~RunCacheHolder() noexcept(false) override {};
+        RunCacheHolder(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {}
+        RunCacheHolder(RunCacheHolder<T, C> const&) = delete;
+        RunCacheHolder<T, C>& operator=(RunCacheHolder<T, C> const&) = delete;
+        ~RunCacheHolder() noexcept(false) override{};
+
       protected:
         C const* runCache(edm::RunIndex iID) const { return cache_.get(); }
+
       private:
-        void doBeginRun_(RunForOutput const& rp) final {
-          cache_ = globalBeginRun(rp);
-        }
+        void doBeginRun_(RunForOutput const& rp) final { cache_ = globalBeginRun(rp); }
         void doEndRun_(RunForOutput const& rp) final {
           globalEndRun(rp);
-          cache_ = nullptr; // propagate_const<T> has no reset() function
+          cache_ = nullptr;  // propagate_const<T> has no reset() function
         }
 
         virtual std::shared_ptr<C> globalBeginRun(RunForOutput const&) const = 0;
@@ -75,15 +75,15 @@ namespace edm {
       template <typename T, typename C>
       class LuminosityBlockCacheHolder : public virtual T {
       public:
-        LuminosityBlockCacheHolder(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) { }
-        LuminosityBlockCacheHolder( LuminosityBlockCacheHolder<T,C> const&) = delete;
-        LuminosityBlockCacheHolder<T,C>& operator=(LuminosityBlockCacheHolder<T,C> const&) = delete;
-        ~LuminosityBlockCacheHolder() noexcept(false) override {};
+        LuminosityBlockCacheHolder(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {}
+        LuminosityBlockCacheHolder(LuminosityBlockCacheHolder<T, C> const&) = delete;
+        LuminosityBlockCacheHolder<T, C>& operator=(LuminosityBlockCacheHolder<T, C> const&) = delete;
+        ~LuminosityBlockCacheHolder() noexcept(false) override{};
+
       protected:
-        void preallocLumis(unsigned int iNLumis) final {
-          caches_.reset(new std::shared_ptr<C>[iNLumis]);
-        }
+        void preallocLumis(unsigned int iNLumis) final { caches_.reset(new std::shared_ptr<C>[iNLumis]); }
         C const* luminosityBlockCache(edm::LuminosityBlockIndex iID) const { return caches_[iID].get(); }
+
       private:
         void doBeginLuminosityBlock_(LuminosityBlockForOutput const& lp) final {
           caches_[lp.index()] = globalBeginLuminosityBlock(lp);
@@ -99,26 +99,26 @@ namespace edm {
         std::unique_ptr<std::shared_ptr<C>[]> caches_;
       };
 
-      template<typename T> struct AbilityToImplementor;
-      
-      template<>
+      template <typename T>
+      struct AbilityToImplementor;
+
+      template <>
       struct AbilityToImplementor<edm::WatchInputFiles> {
         typedef edm::global::outputmodule::InputFileWatcher Type;
       };
 
-      template<typename C>
+      template <typename C>
       struct AbilityToImplementor<edm::RunCache<C>> {
-        typedef edm::global::outputmodule::RunCacheHolder<edm::global::OutputModuleBase,C> Type;
+        typedef edm::global::outputmodule::RunCacheHolder<edm::global::OutputModuleBase, C> Type;
       };
 
-      template<typename C>
+      template <typename C>
       struct AbilityToImplementor<edm::LuminosityBlockCache<C>> {
-        typedef edm::global::outputmodule::LuminosityBlockCacheHolder<edm::global::OutputModuleBase,C> Type;
+        typedef edm::global::outputmodule::LuminosityBlockCacheHolder<edm::global::OutputModuleBase, C> Type;
       };
 
-    }
-  }
-}
-
+    }  // namespace outputmodule
+  }    // namespace global
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/global/producerAbilityToImplementor.h b/FWCore/Framework/interface/global/producerAbilityToImplementor.h
index 603bde7f92b9c..bfe2464408790 100644
--- a/FWCore/Framework/interface/global/producerAbilityToImplementor.h
+++ b/FWCore/Framework/interface/global/producerAbilityToImplementor.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // File  :     producerAbilityToImplementor
-// 
+//
 /**\file  producerAbilityToImplementor.h "FWCore/Framework/interface/global/producerAbilityToImplementor.h"
 
  Description: Class used to pair a module Ability to the actual base class used to implement that ability
@@ -29,84 +29,90 @@
 namespace edm {
   namespace global {
     namespace producer {
-      template<typename T> struct AbilityToImplementor;
-      
-      template<typename C>
+      template <typename T>
+      struct AbilityToImplementor;
+
+      template <typename C>
       struct AbilityToImplementor<edm::StreamCache<C>> {
-        typedef edm::global::impl::StreamCacheHolder<edm::global::EDProducerBase,C> Type;
+        typedef edm::global::impl::StreamCacheHolder<edm::global::EDProducerBase, C> Type;
       };
 
-      template<typename C>
+      template <typename C>
       struct AbilityToImplementor<edm::RunCache<C>> {
-        typedef edm::global::impl::RunCacheHolder<edm::global::EDProducerBase,C> Type;
+        typedef edm::global::impl::RunCacheHolder<edm::global::EDProducerBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::RunSummaryCache<C>> {
-        typedef edm::global::impl::RunSummaryCacheHolder<edm::global::EDProducerBase,C> Type;
+        typedef edm::global::impl::RunSummaryCacheHolder<edm::global::EDProducerBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::LuminosityBlockCache<C>> {
-        typedef edm::global::impl::LuminosityBlockCacheHolder<edm::global::EDProducerBase,C> Type;
+        typedef edm::global::impl::LuminosityBlockCacheHolder<edm::global::EDProducerBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::LuminosityBlockSummaryCache<C>> {
-        typedef edm::global::impl::LuminosityBlockSummaryCacheHolder<edm::global::EDProducerBase,C> Type;
+        typedef edm::global::impl::LuminosityBlockSummaryCacheHolder<edm::global::EDProducerBase, C> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::BeginRunProducer> {
         typedef edm::global::impl::BeginRunProducer<edm::global::EDProducerBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::EndRunProducer> {
         typedef edm::global::impl::EndRunProducer<edm::global::EDProducerBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::BeginLuminosityBlockProducer> {
         typedef edm::global::impl::BeginLuminosityBlockProducer<edm::global::EDProducerBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::EndLuminosityBlockProducer> {
         typedef edm::global::impl::EndLuminosityBlockProducer<edm::global::EDProducerBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::ExternalWork> {
         typedef edm::global::impl::ExternalWork<edm::global::EDProducerBase> Type;
       };
 
-      template<>
+      template <>
       struct AbilityToImplementor<edm::Accumulator> {
         typedef edm::global::impl::Accumulator<edm::global::EDProducerBase> Type;
       };
 
-      template<bool,bool,typename T> struct SpecializeAbilityToImplementor {
+      template <bool, bool, typename T>
+      struct SpecializeAbilityToImplementor {
         typedef typename AbilityToImplementor<T>::Type Type;
       };
-      
-      template<bool B,typename C> struct SpecializeAbilityToImplementor<true,B,edm::RunSummaryCache<C>> {
-        typedef typename edm::global::impl::EndRunSummaryProducer<edm::global::EDProducerBase,C> Type;
+
+      template <bool B, typename C>
+      struct SpecializeAbilityToImplementor<true, B, edm::RunSummaryCache<C>> {
+        typedef typename edm::global::impl::EndRunSummaryProducer<edm::global::EDProducerBase, C> Type;
       };
-      
-      template<bool B> struct SpecializeAbilityToImplementor<true,B,edm::EndRunProducer> {
+
+      template <bool B>
+      struct SpecializeAbilityToImplementor<true, B, edm::EndRunProducer> {
         typedef typename edm::global::impl::EmptyType Type;
       };
 
-      template<bool B,typename C> struct SpecializeAbilityToImplementor<B,true,edm::LuminosityBlockSummaryCache<C>> {
-        typedef typename edm::global::impl::EndLuminosityBlockSummaryProducer<edm::global::EDProducerBase,C> Type;
+      template <bool B, typename C>
+      struct SpecializeAbilityToImplementor<B, true, edm::LuminosityBlockSummaryCache<C>> {
+        typedef typename edm::global::impl::EndLuminosityBlockSummaryProducer<edm::global::EDProducerBase, C> Type;
       };
-      
-      template<bool B> struct SpecializeAbilityToImplementor<B,true,edm::EndLuminosityBlockProducer> {
+
+      template <bool B>
+      struct SpecializeAbilityToImplementor<B, true, edm::EndLuminosityBlockProducer> {
         typedef typename edm::global::impl::EmptyType Type;
       };
-    }
-  }
-}
+    }  // namespace producer
+  }    // namespace global
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/insertSelectedProcesses.h b/FWCore/Framework/interface/insertSelectedProcesses.h
index 0130f2a4b03c7..501b0dbad8a1d 100644
--- a/FWCore/Framework/interface/insertSelectedProcesses.h
+++ b/FWCore/Framework/interface/insertSelectedProcesses.h
@@ -8,7 +8,6 @@ namespace edm {
 
   class BranchDescription;
 
-  void insertSelectedProcesses(BranchDescription const& desc,
-                               std::set<std::string>& processes);
-}
+  void insertSelectedProcesses(BranchDescription const& desc, std::set<std::string>& processes);
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/limited/EDAnalyzer.h b/FWCore/Framework/interface/limited/EDAnalyzer.h
index 29551151311b5..ab8aafee32b80 100644
--- a/FWCore/Framework/interface/limited/EDAnalyzer.h
+++ b/FWCore/Framework/interface/limited/EDAnalyzer.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::limited::EDAnalyzer
-// 
+//
 /**\class edm::limited::EDAnalyzer EDAnalyzer.h "FWCore/Framework/interface/limited/EDAnalyzer.h"
 
  Description: [one line class summary]
@@ -28,47 +28,36 @@
 
 namespace edm {
   namespace limited {
-    template< typename... T>
-    class EDAnalyzer : public analyzer::AbilityToImplementor<T>::Type...,
-                       public virtual EDAnalyzerBase
-    {
-      
+    template <typename... T>
+    class EDAnalyzer : public analyzer::AbilityToImplementor<T>::Type..., public virtual EDAnalyzerBase {
     public:
-      EDAnalyzer(edm::ParameterSet const& iPSet) : EDAnalyzerBase(iPSet),analyzer::AbilityToImplementor<T>::Type(iPSet)...  {}
+      EDAnalyzer(edm::ParameterSet const& iPSet)
+          : EDAnalyzerBase(iPSet), analyzer::AbilityToImplementor<T>::Type(iPSet)... {}
 // We do this only in the case of the intel compiler as this might
-// end up creating a lot of code bloat due to inline symbols being generated 
+// end up creating a lot of code bloat due to inline symbols being generated
 // in each DSO which uses this header.
 #ifdef __INTEL_COMPILER
       virtual ~EDAnalyzer() {}
 #endif
       // ---------- const member functions ---------------------
-      bool wantsGlobalRuns() const final {
-        return WantsGlobalRunTransitions<T...>::value;
-      }
-      bool wantsGlobalLuminosityBlocks() const final {
-        return WantsGlobalLuminosityBlockTransitions<T...>::value;
-      }
-      bool wantsStreamRuns() const final {
-        return WantsStreamRunTransitions<T...>::value;
-      }
-      bool wantsStreamLuminosityBlocks() const final {
-        return WantsStreamLuminosityBlockTransitions<T...>::value;
-      }
+      bool wantsGlobalRuns() const final { return WantsGlobalRunTransitions<T...>::value; }
+      bool wantsGlobalLuminosityBlocks() const final { return WantsGlobalLuminosityBlockTransitions<T...>::value; }
+      bool wantsStreamRuns() const final { return WantsStreamRunTransitions<T...>::value; }
+      bool wantsStreamLuminosityBlocks() const final { return WantsStreamLuminosityBlockTransitions<T...>::value; }
 
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
-      
+
     private:
       EDAnalyzer(const EDAnalyzer&) = delete;
-      
+
       const EDAnalyzer& operator=(const EDAnalyzer&) = delete;
-      
+
       // ---------- member data --------------------------------
-      
     };
 
-  }
-}
+  }  // namespace limited
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/limited/EDAnalyzerBase.h b/FWCore/Framework/interface/limited/EDAnalyzerBase.h
index fa8e735269f22..f7042941d2d01 100644
--- a/FWCore/Framework/interface/limited/EDAnalyzerBase.h
+++ b/FWCore/Framework/interface/limited/EDAnalyzerBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDAnalyzerBase
-// 
+//
 /**\class limited::EDAnalyzerBase EDAnalyzerBase.h "EDAnalyzerBase.h"
 
  Description: [one line class summary]
@@ -39,17 +39,18 @@ namespace edm {
   class WaitingTask;
 
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
   }
 
   namespace limited {
-    
-    class EDAnalyzerBase : public EDConsumerBase
-    {
-      
+
+    class EDAnalyzerBase : public EDConsumerBase {
     public:
-      template <typename T> friend class edm::WorkerT;
-      template <typename T> friend class edm::maker::ModuleHolderT;
+      template <typename T>
+      friend class edm::WorkerT;
+      template <typename T>
+      friend class edm::maker::ModuleHolderT;
       typedef EDAnalyzerBase ModuleType;
 
       EDAnalyzerBase(ParameterSet const& pset);
@@ -61,11 +62,11 @@ namespace edm {
 
       // Warning: the returned moduleDescription will be invalid during construction
       ModuleDescription const& moduleDescription() const { return moduleDescription_; }
-      
-      virtual bool wantsGlobalRuns() const =0;
-      virtual bool wantsGlobalLuminosityBlocks() const =0;
-      virtual bool wantsStreamRuns() const =0;
-      virtual bool wantsStreamLuminosityBlocks() const =0;
+
+      virtual bool wantsGlobalRuns() const = 0;
+      virtual bool wantsGlobalLuminosityBlocks() const = 0;
+      virtual bool wantsStreamRuns() const = 0;
+      virtual bool wantsStreamLuminosityBlocks() const = 0;
 
       void callWhenNewProductsRegistered(std::function<void(BranchDescription const&)> const& func) {
         callWhenNewProductsRegistered_ = func;
@@ -73,62 +74,52 @@ namespace edm {
 
       unsigned int concurrencyLimit() const { return queue_.concurrencyLimit(); }
 
-      LimitedTaskQueue& queue() {
-        return queue_;
-      }
+      LimitedTaskQueue& queue() { return queue_; }
+
     private:
-      bool doEvent(EventPrincipal const& ep, EventSetupImpl const&  c,
-                   ActivityRegistry*,
-                   ModuleCallingContext const*);
+      bool doEvent(EventPrincipal const& ep, EventSetupImpl const& c, ActivityRegistry*, ModuleCallingContext const*);
       //For now this is a placeholder
-      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
+      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                                    ModuleCallingContext const& iModuleCallingContext,
+                                                    Principal const& iPrincipal) const {}
 
       void doPreallocate(PreallocationConfiguration const&);
       void doBeginJob();
       void doEndJob();
-      
+
       void doBeginStream(StreamID id);
       void doEndStream(StreamID id);
-      void doStreamBeginRun(StreamID id,
-                            RunPrincipal const& ep,
-                            EventSetupImpl const&  c,
-                            ModuleCallingContext const*);
-      void doStreamEndRun(StreamID id,
-                          RunPrincipal const& ep,
-                          EventSetupImpl const&  c,
-                          ModuleCallingContext const*);
+      void doStreamBeginRun(StreamID id, RunPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doStreamEndRun(StreamID id, RunPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const*);
       void doStreamBeginLuminosityBlock(StreamID id,
                                         LuminosityBlockPrincipal const& ep,
-                                        EventSetupImpl const&  c,
+                                        EventSetupImpl const& c,
                                         ModuleCallingContext const*);
       void doStreamEndLuminosityBlock(StreamID id,
                                       LuminosityBlockPrincipal const& ep,
-                                      EventSetupImpl const&  c,
+                                      EventSetupImpl const& c,
                                       ModuleCallingContext const*);
 
-      
-      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                      ModuleCallingContext const*);
-      void doEndRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                    ModuleCallingContext const*);
-      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                  EventSetupImpl const& c,
                                   ModuleCallingContext const*);
-      void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                EventSetupImpl const& c,
                                 ModuleCallingContext const*);
-      
+
       //For now, the following are just dummy implemenations with no ability for users to override
       void doRespondToOpenInputFile(FileBlock const& fb);
       void doRespondToCloseInputFile(FileBlock const& fb);
-      void doRegisterThinnedAssociations(ProductRegistry const&,
-                                         ThinnedAssociationsHelper&) { }
+      void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
 
       void registerProductsAndCallbacks(EDAnalyzerBase* module, ProductRegistry* reg);
-      std::string workerType() const {return "WorkerT<EDAnalyzer>";}
-      
-      virtual void analyze(StreamID, Event const& , EventSetup const&) const= 0;
+      std::string workerType() const { return "WorkerT<EDAnalyzer>"; }
+
+      virtual void analyze(StreamID, Event const&, EventSetup const&) const = 0;
       virtual void beginJob() {}
-      virtual void endJob(){}
-      
+      virtual void endJob() {}
 
       virtual void preallocStreams(unsigned int);
       virtual void preallocLumis(unsigned int);
@@ -154,17 +145,15 @@ namespace edm {
       bool hasAcquire() const { return false; }
       bool hasAccumulator() const { return false; }
 
-      void setModuleDescription(ModuleDescription const& md) {
-        moduleDescription_ = md;
-      }
+      void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
       ModuleDescription moduleDescription_;
 
       std::function<void(BranchDescription const&)> callWhenNewProductsRegistered_;
-      
+
       LimitedTaskQueue queue_;
     };
 
-  }
-}
+  }  // namespace limited
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/limited/EDFilter.h b/FWCore/Framework/interface/limited/EDFilter.h
index e8a4a07971c1d..22ae27ca587e2 100644
--- a/FWCore/Framework/interface/limited/EDFilter.h
+++ b/FWCore/Framework/interface/limited/EDFilter.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::limited::EDFilter
-// 
+//
 /**\class edm::limited::EDFilter EDFilter.h "FWCore/Framework/interface/limited/EDFilter.h"
 
  Description: [one line class summary]
@@ -28,22 +28,23 @@
 
 namespace edm {
   namespace limited {
-    template< typename... T>
-    class EDFilter : 
-              public virtual EDFilterBase,
-              public filter::SpecializeAbilityToImplementor<
-        CheckAbility<edm::module::Abilities::kRunSummaryCache,T...>::kHasIt & CheckAbility<edm::module::Abilities::kEndRunProducer,T...>::kHasIt,
-        CheckAbility<edm::module::Abilities::kLuminosityBlockSummaryCache,T...>::kHasIt & CheckAbility<edm::module::Abilities::kEndLuminosityBlockProducer,T...>::kHasIt,
-        T>::Type...
-    {
-      
+    template <typename... T>
+    class EDFilter : public virtual EDFilterBase,
+                     public filter::SpecializeAbilityToImplementor<
+                         CheckAbility<edm::module::Abilities::kRunSummaryCache, T...>::kHasIt &
+                             CheckAbility<edm::module::Abilities::kEndRunProducer, T...>::kHasIt,
+                         CheckAbility<edm::module::Abilities::kLuminosityBlockSummaryCache, T...>::kHasIt &
+                             CheckAbility<edm::module::Abilities::kEndLuminosityBlockProducer, T...>::kHasIt,
+                         T>::Type... {
     public:
-      EDFilter(edm::ParameterSet const& iPSet) : EDFilterBase(iPSet),
-      filter::SpecializeAbilityToImplementor<
-      CheckAbility<edm::module::Abilities::kRunSummaryCache,T...>::kHasIt & CheckAbility<edm::module::Abilities::kEndRunProducer,T...>::kHasIt,
-      CheckAbility<edm::module::Abilities::kLuminosityBlockSummaryCache,T...>::kHasIt & CheckAbility<edm::module::Abilities::kEndLuminosityBlockProducer,T...>::kHasIt,
-      T>::Type(iPSet)...
-      {}
+      EDFilter(edm::ParameterSet const& iPSet)
+          : EDFilterBase(iPSet),
+            filter::SpecializeAbilityToImplementor<
+                CheckAbility<edm::module::Abilities::kRunSummaryCache, T...>::kHasIt &
+                    CheckAbility<edm::module::Abilities::kEndRunProducer, T...>::kHasIt,
+                CheckAbility<edm::module::Abilities::kLuminosityBlockSummaryCache, T...>::kHasIt &
+                    CheckAbility<edm::module::Abilities::kEndLuminosityBlockProducer, T...>::kHasIt,
+                T>::Type(iPSet)... {}
 // We do this only in the case of the intel compiler as this might
 // end up creating a lot of code bloat due to inline symbols being generated
 // in each DSO which uses this header.
@@ -51,41 +52,28 @@ namespace edm {
       virtual ~EDFilter() = default;
 #endif
       // ---------- const member functions ---------------------
-      bool wantsGlobalRuns() const final {
-        return WantsGlobalRunTransitions<T...>::value;
-      }
-      bool wantsGlobalLuminosityBlocks() const final {
-        return WantsGlobalLuminosityBlockTransitions<T...>::value;
-      }
-      bool wantsStreamRuns() const final {
-        return WantsStreamRunTransitions<T...>::value;
-      }
-      bool wantsStreamLuminosityBlocks() const final {
-        return WantsStreamLuminosityBlockTransitions<T...>::value;
-      }
-
-      bool hasAbilityToProduceInRuns() const final {
-        return HasAbilityToProduceInRuns<T...>::value;
-      }
-
-      bool hasAbilityToProduceInLumis() const final {
-        return HasAbilityToProduceInLumis<T...>::value;
-      }
+      bool wantsGlobalRuns() const final { return WantsGlobalRunTransitions<T...>::value; }
+      bool wantsGlobalLuminosityBlocks() const final { return WantsGlobalLuminosityBlockTransitions<T...>::value; }
+      bool wantsStreamRuns() const final { return WantsStreamRunTransitions<T...>::value; }
+      bool wantsStreamLuminosityBlocks() const final { return WantsStreamLuminosityBlockTransitions<T...>::value; }
+
+      bool hasAbilityToProduceInRuns() const final { return HasAbilityToProduceInRuns<T...>::value; }
+
+      bool hasAbilityToProduceInLumis() const final { return HasAbilityToProduceInLumis<T...>::value; }
 
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
-      
+
     private:
       EDFilter(const EDFilter&) = delete;
-      
+
       const EDFilter& operator=(const EDFilter&) = delete;
-      
+
       // ---------- member data --------------------------------
-      
     };
 
-  }
-}
+  }  // namespace limited
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/limited/EDFilterBase.h b/FWCore/Framework/interface/limited/EDFilterBase.h
index cdb94fbc5c805..ac1da3c409246 100644
--- a/FWCore/Framework/interface/limited/EDFilterBase.h
+++ b/FWCore/Framework/interface/limited/EDFilterBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDFilterBase
-// 
+//
 /**\class EDFilterBase EDFilterBase.h "EDFilterBase.h"
 
  Description: [one line class summary]
@@ -41,17 +41,18 @@ namespace edm {
   class WaitingTask;
 
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
   }
 
   namespace limited {
-    
-    class EDFilterBase : public ProducerBase, public EDConsumerBase
-    {
-      
+
+    class EDFilterBase : public ProducerBase, public EDConsumerBase {
     public:
-      template <typename T> friend class edm::maker::ModuleHolderT;
-      template <typename T> friend class edm::WorkerT;
+      template <typename T>
+      friend class edm::maker::ModuleHolderT;
+      template <typename T>
+      friend class edm::WorkerT;
       typedef EDFilterBase ModuleType;
 
       EDFilterBase(ParameterSet const& pset);
@@ -64,70 +65,61 @@ namespace edm {
       // Warning: the returned moduleDescription will be invalid during construction
       ModuleDescription const& moduleDescription() const { return moduleDescription_; }
 
-      virtual bool wantsGlobalRuns() const =0;
-      virtual bool wantsGlobalLuminosityBlocks() const =0;
-      virtual bool wantsStreamRuns() const =0;
-      virtual bool wantsStreamLuminosityBlocks() const =0;
+      virtual bool wantsGlobalRuns() const = 0;
+      virtual bool wantsGlobalLuminosityBlocks() const = 0;
+      virtual bool wantsStreamRuns() const = 0;
+      virtual bool wantsStreamLuminosityBlocks() const = 0;
 
       unsigned int concurrencyLimit() const { return queue_.concurrencyLimit(); }
 
-      LimitedTaskQueue& queue() {
-        return queue_;
-      }
+      LimitedTaskQueue& queue() { return queue_; }
+
     private:
-      bool doEvent(EventPrincipal const& ep, EventSetupImpl const&  c,
-                   ActivityRegistry*,
-                   ModuleCallingContext const*);
+      bool doEvent(EventPrincipal const& ep, EventSetupImpl const& c, ActivityRegistry*, ModuleCallingContext const*);
       //For now this is a placeholder
-      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
+      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                                    ModuleCallingContext const& iModuleCallingContext,
+                                                    Principal const& iPrincipal) const {}
 
       void doPreallocate(PreallocationConfiguration const&);
       void doBeginJob();
       void doEndJob();
-      
+
       void doBeginStream(StreamID id);
       void doEndStream(StreamID id);
-      void doStreamBeginRun(StreamID id,
-                            RunPrincipal const& ep,
-                            EventSetupImpl const&  c,
-                            ModuleCallingContext const*);
-      void doStreamEndRun(StreamID id,
-                          RunPrincipal const& ep,
-                          EventSetupImpl const&  c,
-                          ModuleCallingContext const*);
+      void doStreamBeginRun(StreamID id, RunPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doStreamEndRun(StreamID id, RunPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const*);
       void doStreamBeginLuminosityBlock(StreamID id,
                                         LuminosityBlockPrincipal const& ep,
-                                        EventSetupImpl const&  c,
+                                        EventSetupImpl const& c,
                                         ModuleCallingContext const*);
       void doStreamEndLuminosityBlock(StreamID id,
                                       LuminosityBlockPrincipal const& ep,
-                                      EventSetupImpl const&  c,
+                                      EventSetupImpl const& c,
                                       ModuleCallingContext const*);
 
-      
-      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                      ModuleCallingContext const*);
-      void doEndRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                    ModuleCallingContext const*);
-      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                  EventSetupImpl const& c,
                                   ModuleCallingContext const*);
-      void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                EventSetupImpl const& c,
                                 ModuleCallingContext const*);
-      
+
       //For now, the following are just dummy implemenations with no ability for users to override
       void doRespondToOpenInputFile(FileBlock const& fb);
       void doRespondToCloseInputFile(FileBlock const& fb);
-      void doRegisterThinnedAssociations(ProductRegistry const&,
-                                         ThinnedAssociationsHelper&) { }
+      void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
 
       void registerProductsAndCallbacks(EDFilterBase* module, ProductRegistry* reg) {
         registerProducts(module, reg, moduleDescription_);
       }
-      std::string workerType() const {return "WorkerT<EDProducer>";}
-      
-      virtual bool filter(StreamID, Event&, EventSetup const&) const= 0;
+      std::string workerType() const { return "WorkerT<EDProducer>"; }
+
+      virtual bool filter(StreamID, Event&, EventSetup const&) const = 0;
       virtual void beginJob() {}
-      virtual void endJob(){}
+      virtual void endJob() {}
 
       virtual void preallocStreams(unsigned int);
       virtual void preallocLumis(unsigned int);
@@ -149,7 +141,7 @@ namespace edm {
       virtual void doBeginLuminosityBlockSummary_(LuminosityBlock const& rp, EventSetup const& c);
       virtual void doEndLuminosityBlockSummary_(LuminosityBlock const& lb, EventSetup const& c);
       virtual void doEndLuminosityBlock_(LuminosityBlock const& lb, EventSetup const& c);
-      
+
       virtual void doBeginRunProduce_(Run& rp, EventSetup const& c);
       virtual void doEndRunProduce_(Run& rp, EventSetup const& c);
       virtual void doBeginLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c);
@@ -158,17 +150,15 @@ namespace edm {
       bool hasAcquire() const { return false; }
       bool hasAccumulator() const { return false; }
 
-      void setModuleDescription(ModuleDescription const& md) {
-        moduleDescription_ = md;
-      }
+      void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
       ModuleDescription moduleDescription_;
-      std::unique_ptr<std::vector<BranchID>[]> previousParentages_; //Per stream in the future?
+      std::unique_ptr<std::vector<BranchID>[]> previousParentages_;  //Per stream in the future?
       std::unique_ptr<ParentageID[]> previousParentageIds_;
-      
+
       LimitedTaskQueue queue_;
     };
 
-  }
-}
+  }  // namespace limited
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/limited/EDProducer.h b/FWCore/Framework/interface/limited/EDProducer.h
index c4d7bf5b61233..3966804ff1901 100644
--- a/FWCore/Framework/interface/limited/EDProducer.h
+++ b/FWCore/Framework/interface/limited/EDProducer.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::limited::EDProducer
-// 
+//
 /**\class edm::limited::EDProducer EDProducer.h "FWCore/Framework/interface/limited/EDProducer.h"
 
  Description: [one line class summary]
@@ -28,57 +28,47 @@
 
 namespace edm {
   namespace limited {
-    template< typename... T>
+    template <typename... T>
     class EDProducer : public producer::SpecializeAbilityToImplementor<
-        CheckAbility<edm::module::Abilities::kRunSummaryCache,T...>::kHasIt & CheckAbility<edm::module::Abilities::kEndRunProducer,T...>::kHasIt,
-        CheckAbility<edm::module::Abilities::kLuminosityBlockSummaryCache,T...>::kHasIt & CheckAbility<edm::module::Abilities::kEndLuminosityBlockProducer,T...>::kHasIt,
-        T>::Type...,
-                       public virtual EDProducerBase
-    {
-      
+                           CheckAbility<edm::module::Abilities::kRunSummaryCache, T...>::kHasIt &
+                               CheckAbility<edm::module::Abilities::kEndRunProducer, T...>::kHasIt,
+                           CheckAbility<edm::module::Abilities::kLuminosityBlockSummaryCache, T...>::kHasIt &
+                               CheckAbility<edm::module::Abilities::kEndLuminosityBlockProducer, T...>::kHasIt,
+                           T>::Type...,
+                       public virtual EDProducerBase {
     public:
-      EDProducer(edm::ParameterSet const& iPSet): EDProducerBase(iPSet),
-      producer::SpecializeAbilityToImplementor<
-      CheckAbility<edm::module::Abilities::kRunSummaryCache,T...>::kHasIt & CheckAbility<edm::module::Abilities::kEndRunProducer,T...>::kHasIt,
-      CheckAbility<edm::module::Abilities::kLuminosityBlockSummaryCache,T...>::kHasIt & CheckAbility<edm::module::Abilities::kEndLuminosityBlockProducer,T...>::kHasIt,
-      T>::Type(iPSet)... {}
-      
+      EDProducer(edm::ParameterSet const& iPSet)
+          : EDProducerBase(iPSet),
+            producer::SpecializeAbilityToImplementor<
+                CheckAbility<edm::module::Abilities::kRunSummaryCache, T...>::kHasIt &
+                    CheckAbility<edm::module::Abilities::kEndRunProducer, T...>::kHasIt,
+                CheckAbility<edm::module::Abilities::kLuminosityBlockSummaryCache, T...>::kHasIt &
+                    CheckAbility<edm::module::Abilities::kEndLuminosityBlockProducer, T...>::kHasIt,
+                T>::Type(iPSet)... {}
+
       // ---------- const member functions ---------------------
-      bool wantsGlobalRuns() const final {
-        return WantsGlobalRunTransitions<T...>::value;
-      }
-      bool wantsGlobalLuminosityBlocks() const final {
-        return WantsGlobalLuminosityBlockTransitions<T...>::value;
-      }
-      bool wantsStreamRuns() const final {
-        return WantsStreamRunTransitions<T...>::value;
-      }
-      bool wantsStreamLuminosityBlocks() const final {
-        return WantsStreamLuminosityBlockTransitions<T...>::value;
-      }
-
-      bool hasAbilityToProduceInRuns() const final {
-        return HasAbilityToProduceInRuns<T...>::value;
-      }
-
-      bool hasAbilityToProduceInLumis() const final {
-        return HasAbilityToProduceInLumis<T...>::value;
-      }
+      bool wantsGlobalRuns() const final { return WantsGlobalRunTransitions<T...>::value; }
+      bool wantsGlobalLuminosityBlocks() const final { return WantsGlobalLuminosityBlockTransitions<T...>::value; }
+      bool wantsStreamRuns() const final { return WantsStreamRunTransitions<T...>::value; }
+      bool wantsStreamLuminosityBlocks() const final { return WantsStreamLuminosityBlockTransitions<T...>::value; }
+
+      bool hasAbilityToProduceInRuns() const final { return HasAbilityToProduceInRuns<T...>::value; }
+
+      bool hasAbilityToProduceInLumis() const final { return HasAbilityToProduceInLumis<T...>::value; }
 
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
-      
+
     private:
       EDProducer(const EDProducer&) = delete;
-      
+
       const EDProducer& operator=(const EDProducer&) = delete;
-      
+
       // ---------- member data --------------------------------
-      
     };
 
-  }
-}
+  }  // namespace limited
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/limited/EDProducerBase.h b/FWCore/Framework/interface/limited/EDProducerBase.h
index f3e082d330993..b095c3ebba859 100644
--- a/FWCore/Framework/interface/limited/EDProducerBase.h
+++ b/FWCore/Framework/interface/limited/EDProducerBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDProducerBase
-// 
+//
 /**\class EDProducerBase EDProducerBase.h "EDProducerBase.h"
 
  Description: [one line class summary]
@@ -42,19 +42,20 @@ namespace edm {
   class WaitingTask;
 
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
   }
-  
+
   namespace limited {
-    
-    class EDProducerBase : public ProducerBase, public EDConsumerBase
-    {
-      
+
+    class EDProducerBase : public ProducerBase, public EDConsumerBase {
     public:
-      template <typename T> friend class edm::maker::ModuleHolderT;
-      template <typename T> friend class edm::WorkerT;
+      template <typename T>
+      friend class edm::maker::ModuleHolderT;
+      template <typename T>
+      friend class edm::WorkerT;
       typedef EDProducerBase ModuleType;
-      
+
       friend class edm::GlobalSchedule;
 
       EDProducerBase(ParameterSet const& pset);
@@ -66,71 +67,62 @@ namespace edm {
 
       // Warning: the returned moduleDescription will be invalid during construction
       ModuleDescription const& moduleDescription() const { return moduleDescription_; }
-      
-      virtual bool wantsGlobalRuns() const =0;
-      virtual bool wantsGlobalLuminosityBlocks() const =0;
-      virtual bool wantsStreamRuns() const =0;
-      virtual bool wantsStreamLuminosityBlocks() const =0;
+
+      virtual bool wantsGlobalRuns() const = 0;
+      virtual bool wantsGlobalLuminosityBlocks() const = 0;
+      virtual bool wantsStreamRuns() const = 0;
+      virtual bool wantsStreamLuminosityBlocks() const = 0;
 
       unsigned int concurrencyLimit() const { return queue_.concurrencyLimit(); }
 
-      LimitedTaskQueue& queue() {
-        return queue_;
-      }
+      LimitedTaskQueue& queue() { return queue_; }
+
     private:
-      bool doEvent(EventPrincipal const& ep, EventSetupImpl const&  c,
-                   ActivityRegistry*,
-                   ModuleCallingContext const*);
+      bool doEvent(EventPrincipal const& ep, EventSetupImpl const& c, ActivityRegistry*, ModuleCallingContext const*);
       void doPreallocate(PreallocationConfiguration const&);
       void doBeginJob();
       void doEndJob();
-      
+
       void doBeginStream(StreamID id);
       void doEndStream(StreamID id);
-      void doStreamBeginRun(StreamID id,
-                            RunPrincipal const& ep,
-                            EventSetupImpl const&  c,
-                            ModuleCallingContext const*);
-      void doStreamEndRun(StreamID id,
-                          RunPrincipal const& ep,
-                          EventSetupImpl const&  c,
-                          ModuleCallingContext const*);
+      void doStreamBeginRun(StreamID id, RunPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doStreamEndRun(StreamID id, RunPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const*);
       void doStreamBeginLuminosityBlock(StreamID id,
                                         LuminosityBlockPrincipal const& ep,
-                                        EventSetupImpl const&  c,
+                                        EventSetupImpl const& c,
                                         ModuleCallingContext const*);
       void doStreamEndLuminosityBlock(StreamID id,
                                       LuminosityBlockPrincipal const& ep,
-                                      EventSetupImpl const&  c,
+                                      EventSetupImpl const& c,
                                       ModuleCallingContext const*);
 
-      
-      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                      ModuleCallingContext const*);
-      void doEndRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                    ModuleCallingContext const*);
-      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                  EventSetupImpl const& c,
                                   ModuleCallingContext const*);
-      void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                EventSetupImpl const& c,
                                 ModuleCallingContext const*);
-      
+
       //For now, the following are just dummy implemenations with no ability for users to override
       void doRespondToOpenInputFile(FileBlock const& fb);
       void doRespondToCloseInputFile(FileBlock const& fb);
-      void doRegisterThinnedAssociations(ProductRegistry const&,
-                                         ThinnedAssociationsHelper&) { }
+      void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
 
       void registerProductsAndCallbacks(EDProducerBase* module, ProductRegistry* reg) {
         registerProducts(module, reg, moduleDescription_);
       }
-      std::string workerType() const {return "WorkerT<EDProducer>";}
-      
-      virtual void produce(StreamID, Event&, EventSetup const&) const= 0;
+      std::string workerType() const { return "WorkerT<EDProducer>"; }
+
+      virtual void produce(StreamID, Event&, EventSetup const&) const = 0;
       //For now this is a placeholder
-      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
+      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                                    ModuleCallingContext const& iModuleCallingContext,
+                                                    Principal const& iPrincipal) const {}
 
       virtual void beginJob() {}
-      virtual void endJob(){}
+      virtual void endJob() {}
 
       virtual void preallocStreams(unsigned int);
       virtual void preallocLumis(unsigned int);
@@ -152,7 +144,7 @@ namespace edm {
       virtual void doBeginLuminosityBlockSummary_(LuminosityBlock const& rp, EventSetup const& c);
       virtual void doEndLuminosityBlockSummary_(LuminosityBlock const& lb, EventSetup const& c);
       virtual void doEndLuminosityBlock_(LuminosityBlock const& lb, EventSetup const& c);
-      
+
       virtual void doBeginRunProduce_(Run& rp, EventSetup const& c);
       virtual void doEndRunProduce_(Run& rp, EventSetup const& c);
       virtual void doBeginLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c);
@@ -162,16 +154,14 @@ namespace edm {
 
       bool hasAcquire() const { return false; }
 
-      void setModuleDescription(ModuleDescription const& md) {
-        moduleDescription_ = md;
-      }
+      void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
       ModuleDescription moduleDescription_;
       std::unique_ptr<std::vector<BranchID>[]> previousParentages_;
       std::unique_ptr<ParentageID[]> previousParentageIds_;
       LimitedTaskQueue queue_;
     };
 
-  }
-}
+  }  // namespace limited
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/limited/OutputModule.h b/FWCore/Framework/interface/limited/OutputModule.h
index d97b150dcc8fd..ce4f461395309 100644
--- a/FWCore/Framework/interface/limited/OutputModule.h
+++ b/FWCore/Framework/interface/limited/OutputModule.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::limited::OutputModule
-// 
+//
 /**\class edm::limited::OutputModule OutputModule.h "FWCore/Framework/interface/limited/OutputModule.h"
 
  Description: [one line class summary]
@@ -24,15 +24,11 @@
 // forward declarations
 namespace edm {
   namespace limited {
-    template< typename... T>
-    class OutputModule : public virtual OutputModuleBase,
-        public outputmodule::AbilityToImplementor<T>::Type...
-    {
-      
+    template <typename... T>
+    class OutputModule : public virtual OutputModuleBase, public outputmodule::AbilityToImplementor<T>::Type... {
     public:
-      OutputModule(edm::ParameterSet const& iPSet): OutputModuleBase(iPSet),
-      outputmodule::AbilityToImplementor<T>::Type(iPSet)...
-       {}
+      OutputModule(edm::ParameterSet const& iPSet)
+          : OutputModuleBase(iPSet), outputmodule::AbilityToImplementor<T>::Type(iPSet)... {}
       // Required to work around ICC bug, but possible source of bloat in gcc.
       // We do this only in the case of the intel compiler as this might end up
       // creating a lot of code bloat due to inline symbols being generated in
@@ -40,28 +36,23 @@ namespace edm {
 #ifdef __INTEL_COMPILER
       virtual ~OutputModule() = default;
 #endif
-      
+
       // ---------- const member functions ---------------------
-      bool wantsStreamRuns() const final {
-        return WantsStreamRunTransitions<T...>::value;
-      }
-      bool wantsStreamLuminosityBlocks() const final {
-        return WantsStreamLuminosityBlockTransitions<T...>::value;
-      }
+      bool wantsStreamRuns() const final { return WantsStreamRunTransitions<T...>::value; }
+      bool wantsStreamLuminosityBlocks() const final { return WantsStreamLuminosityBlockTransitions<T...>::value; }
 
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
-      
+
     private:
-      OutputModule(const OutputModule&) = delete; // stop default
-      
-      const OutputModule& operator=(const OutputModule&) =delete; // stop default
-      
+      OutputModule(const OutputModule&) = delete;  // stop default
+
+      const OutputModule& operator=(const OutputModule&) = delete;  // stop default
+
       // ---------- member data --------------------------------
-      
     };
-  }
-}
+  }  // namespace limited
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/limited/OutputModuleBase.h b/FWCore/Framework/interface/limited/OutputModuleBase.h
index 6f701958c4735..b1fc2c730d622 100644
--- a/FWCore/Framework/interface/limited/OutputModuleBase.h
+++ b/FWCore/Framework/interface/limited/OutputModuleBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     OutputModuleBase
-// 
+//
 /**\class OutputModuleBase OutputModuleBase.h "FWCore/Framework/interface/limited/OutputModuleBase.h"
 
  Description: Base class for all 'limited' OutputModules
@@ -53,72 +53,73 @@ namespace edm {
   class ThinnedAssociationsHelper;
   class WaitingTask;
 
-  template <typename T> class OutputModuleCommunicatorT;
-  
+  template <typename T>
+  class OutputModuleCommunicatorT;
+
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
   }
 
   namespace limited {
-    
+
     class OutputModuleBase : public EDConsumerBase {
     public:
-      template <typename U> friend class edm::maker::ModuleHolderT;
-      template <typename T> friend class ::edm::WorkerT;
-      template <typename T> friend class ::edm::OutputModuleCommunicatorT;
+      template <typename U>
+      friend class edm::maker::ModuleHolderT;
+      template <typename T>
+      friend class ::edm::WorkerT;
+      template <typename T>
+      friend class ::edm::OutputModuleCommunicatorT;
       typedef OutputModuleBase ModuleType;
-      
+
       explicit OutputModuleBase(ParameterSet const& pset);
       ~OutputModuleBase() override;
-      
-      OutputModuleBase(OutputModuleBase const&) = delete; // Disallow copying and moving
-      OutputModuleBase& operator=(OutputModuleBase const&) = delete; // Disallow copying and moving
-      
+
+      OutputModuleBase(OutputModuleBase const&) = delete;             // Disallow copying and moving
+      OutputModuleBase& operator=(OutputModuleBase const&) = delete;  // Disallow copying and moving
+
       /// Accessor for maximum number of events to be written.
       /// -1 is used for unlimited.
-      int maxEvents() const {return maxEvents_;}
-      
+      int maxEvents() const { return maxEvents_; }
+
       /// Accessor for remaining number of events to be written.
       /// -1 is used for unlimited.
-      int remainingEvents() const {return remainingEvents_;}
-      
+      int remainingEvents() const { return remainingEvents_; }
+
       bool selected(BranchDescription const& desc) const;
-      
+
       void selectProducts(ProductRegistry const& preg, ThinnedAssociationsHelper const&);
-      std::string const& processName() const {return process_name_;}
-      SelectedProductsForBranchType const& keptProducts() const {return keptProducts_;}
-      std::array<bool, NumBranchTypes> const& hasNewlyDroppedBranch() const {return hasNewlyDroppedBranch_;}
-      
-      static void fillDescription(ParameterSetDescription & desc);
+      std::string const& processName() const { return process_name_; }
+      SelectedProductsForBranchType const& keptProducts() const { return keptProducts_; }
+      std::array<bool, NumBranchTypes> const& hasNewlyDroppedBranch() const { return hasNewlyDroppedBranch_; }
+
+      static void fillDescription(ParameterSetDescription& desc);
       static void fillDescriptions(ConfigurationDescriptions& descriptions);
       static const std::string& baseType();
-      static void prevalidate(ConfigurationDescriptions& );
-      
-      bool wantAllEvents() const {return wantAllEvents_;}
-      
+      static void prevalidate(ConfigurationDescriptions&);
+
+      bool wantAllEvents() const { return wantAllEvents_; }
+
       BranchIDLists const* branchIDLists() const;
 
       ThinnedAssociationsHelper const* thinnedAssociationsHelper() const;
-      
-      const ModuleDescription& moduleDescription() const {
-        return moduleDescription_;
-      }
-      
+
+      const ModuleDescription& moduleDescription() const { return moduleDescription_; }
+
       //Output modules always need writeRun and writeLumi to be called
-      bool wantsGlobalRuns() const {return true;}
-      bool wantsGlobalLuminosityBlocks() const {return true;}
-      virtual bool wantsStreamRuns() const =0;
-      virtual bool wantsStreamLuminosityBlocks() const =0;
+      bool wantsGlobalRuns() const { return true; }
+      bool wantsGlobalLuminosityBlocks() const { return true; }
+      virtual bool wantsStreamRuns() const = 0;
+      virtual bool wantsStreamLuminosityBlocks() const = 0;
 
       unsigned int concurrencyLimit() const { return queue_.concurrencyLimit(); }
 
-      LimitedTaskQueue& queue() {
-        return queue_;
-      }
+      LimitedTaskQueue& queue() { return queue_; }
+
     protected:
-      
       ModuleDescription const& description() const;
-      
+
       ParameterSetID selectorConfig() const { return selector_config_id_; }
 
       void doPreallocate(PreallocationConfiguration const&);
@@ -128,52 +129,46 @@ namespace edm {
 
       void doBeginStream(StreamID id);
       void doEndStream(StreamID id);
-      void doStreamBeginRun(StreamID id,
-                            RunPrincipal& ep,
-                            EventSetupImpl const&  c,
-                            ModuleCallingContext const*);
-      void doStreamEndRun(StreamID id,
-                          RunPrincipal& ep,
-                          EventSetupImpl const&  c,
-                          ModuleCallingContext const*);
+      void doStreamBeginRun(StreamID id, RunPrincipal& ep, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doStreamEndRun(StreamID id, RunPrincipal& ep, EventSetupImpl const& c, ModuleCallingContext const*);
       void doStreamBeginLuminosityBlock(StreamID id,
                                         LuminosityBlockPrincipal& ep,
-                                        EventSetupImpl const&  c,
+                                        EventSetupImpl const& c,
                                         ModuleCallingContext const*);
       void doStreamEndLuminosityBlock(StreamID id,
                                       LuminosityBlockPrincipal& ep,
-                                      EventSetupImpl const&  c,
+                                      EventSetupImpl const& c,
                                       ModuleCallingContext const*);
 
-      bool doEvent(EventPrincipal const& ep, EventSetupImpl const&  c,
-                   ActivityRegistry*,
-                   ModuleCallingContext const*);
+      bool doEvent(EventPrincipal const& ep, EventSetupImpl const& c, ActivityRegistry*, ModuleCallingContext const*);
       //For now this is a placeholder
-      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
+      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                                    ModuleCallingContext const& iModuleCallingContext,
+                                                    Principal const& iPrincipal) const {}
 
-      bool doBeginRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                      ModuleCallingContext const*);
-      bool doEndRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                    ModuleCallingContext const*);
-      bool doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      bool doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      bool doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      bool doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                  EventSetupImpl const& c,
                                   ModuleCallingContext const*);
-      bool doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      bool doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                EventSetupImpl const& c,
                                 ModuleCallingContext const*);
-      
-      void setEventSelectionInfo(std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
-                                 bool anyProductProduced);
-      
+
+      void setEventSelectionInfo(
+          std::map<std::string, std::vector<std::pair<std::string, int>>> const& outputModulePathPositions,
+          bool anyProductProduced);
+
       void configure(OutputModuleDescription const& desc);
-      
+
       std::map<BranchID::value_type, BranchID::value_type> const& droppedBranchIDToKeptBranchID() {
         return droppedBranchIDToKeptBranchID_;
       }
-      
+
     private:
-      
       int maxEvents_;
       std::atomic<int> remainingEvents_;
-      
+
       // TODO: Give OutputModule
       // an interface (protected?) that supplies client code with the
       // needed functionality *without* giving away implementation
@@ -184,26 +179,26 @@ namespace edm {
       // clients (classes derived from OutputModule) to use the
       // newly-introduced interface.
       // TODO: Consider using shared pointers here?
-      
+
       // keptProducts_ are pointers to the BranchDescription objects describing
       // the branches we are to write.
       //
       // We do not own the BranchDescriptions to which we point.
       SelectedProductsForBranchType keptProducts_;
       std::array<bool, NumBranchTypes> hasNewlyDroppedBranch_;
-      
+
       std::string process_name_;
       ProductSelectorRules productSelectorRules_;
       ProductSelector productSelector_;
       ModuleDescription moduleDescription_;
-      
+
       bool wantAllEvents_;
       std::vector<detail::TriggerResultsBasedEventSelector> selectors_;
       ParameterSet selectEvents_;
       // ID of the ParameterSet that configured the event selector
       // subsystem.
       ParameterSetID selector_config_id_;
-      
+
       // needed because of possible EDAliases.
       // filled in only if key and value are different.
       std::map<BranchID::value_type, BranchID::value_type> droppedBranchIDToKeptBranchID_;
@@ -213,7 +208,7 @@ namespace edm {
       edm::propagate_const<std::unique_ptr<ThinnedAssociationsHelper>> thinnedAssociationsHelper_;
       std::map<BranchID, bool> keepAssociation_;
       LimitedTaskQueue queue_;
-      
+
       //------------------------------------------------------------------
       // private member functions
       //------------------------------------------------------------------
@@ -225,56 +220,54 @@ namespace edm {
       void doOpenFile(FileBlock const& fb);
       void doRespondToOpenInputFile(FileBlock const& fb);
       void doRespondToCloseInputFile(FileBlock const& fb);
-      void doRegisterThinnedAssociations(ProductRegistry const&,
-                                         ThinnedAssociationsHelper&) { }
+      void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
+
+      std::string workerType() const { return "WorkerT<edm::limited::OutputModuleBase>"; }
 
-      std::string workerType() const {return "WorkerT<edm::limited::OutputModuleBase>";}
-      
       /// Tell the OutputModule that is must end the current file.
       void doCloseFile();
-      
+
       void registerProductsAndCallbacks(OutputModuleBase const*, ProductRegistry const*) {}
 
       bool needToRunSelection() const;
       std::vector<ProductResolverIndexAndSkipBit> productsUsedBySelection() const;
       bool prePrefetchSelection(StreamID id, EventPrincipal const&, ModuleCallingContext const*);
-      
+
       // Do the end-of-file tasks; this is only called internally, after
       // the appropriate tests have been done.
       virtual void reallyCloseFile();
-      
-      
+
       /// Ask the OutputModule if we should end the current file.
-      virtual bool shouldWeCloseFile() const {return false;}
-      
+      virtual bool shouldWeCloseFile() const { return false; }
+
       virtual void write(EventForOutput const&) = 0;
-      virtual void beginJob(){}
-      virtual void endJob(){}
+      virtual void beginJob() {}
+      virtual void endJob() {}
       virtual void writeLuminosityBlock(LuminosityBlockForOutput const&) = 0;
       virtual void writeRun(RunForOutput const&) = 0;
       virtual void openFile(FileBlock const&) const {}
       virtual bool isFileOpen() const { return true; }
-      
-      virtual void preallocStreams(unsigned int){}
-      virtual void preallocLumis(unsigned int){}
-      virtual void preallocate(PreallocationConfiguration const&){}
-      virtual void doBeginStream_(StreamID){}
-      virtual void doEndStream_(StreamID){}
-      virtual void doStreamBeginRun_(StreamID, RunForOutput const&, EventSetup const&){}
-      virtual void doStreamEndRun_(StreamID, RunForOutput const&, EventSetup const&){}
-      virtual void doStreamEndRunSummary_(StreamID, RunForOutput const&, EventSetup const&){}
-      virtual void doStreamBeginLuminosityBlock_(StreamID, LuminosityBlockForOutput const&, EventSetup const&){}
-      virtual void doStreamEndLuminosityBlock_(StreamID, LuminosityBlockForOutput const&, EventSetup const&){}
-      virtual void doStreamEndLuminosityBlockSummary_(StreamID, LuminosityBlockForOutput const&, EventSetup const&){}
-
-      virtual void doBeginRun_(RunForOutput const&){}
-      virtual void doBeginRunSummary_(RunForOutput const&, EventSetup const&){}
-      virtual void doEndRun_(RunForOutput const& ){}
-      virtual void doEndRunSummary_(RunForOutput const&, EventSetup const&){}
-      virtual void doBeginLuminosityBlock_(LuminosityBlockForOutput const&){}
-      virtual void doBeginLuminosityBlockSummary_(LuminosityBlockForOutput const&, EventSetup const&){}
-      virtual void doEndLuminosityBlock_(LuminosityBlockForOutput const&){}
-      virtual void doEndLuminosityBlockSummary_(LuminosityBlockForOutput const&, EventSetup const&){}
+
+      virtual void preallocStreams(unsigned int) {}
+      virtual void preallocLumis(unsigned int) {}
+      virtual void preallocate(PreallocationConfiguration const&) {}
+      virtual void doBeginStream_(StreamID) {}
+      virtual void doEndStream_(StreamID) {}
+      virtual void doStreamBeginRun_(StreamID, RunForOutput const&, EventSetup const&) {}
+      virtual void doStreamEndRun_(StreamID, RunForOutput const&, EventSetup const&) {}
+      virtual void doStreamEndRunSummary_(StreamID, RunForOutput const&, EventSetup const&) {}
+      virtual void doStreamBeginLuminosityBlock_(StreamID, LuminosityBlockForOutput const&, EventSetup const&) {}
+      virtual void doStreamEndLuminosityBlock_(StreamID, LuminosityBlockForOutput const&, EventSetup const&) {}
+      virtual void doStreamEndLuminosityBlockSummary_(StreamID, LuminosityBlockForOutput const&, EventSetup const&) {}
+
+      virtual void doBeginRun_(RunForOutput const&) {}
+      virtual void doBeginRunSummary_(RunForOutput const&, EventSetup const&) {}
+      virtual void doEndRun_(RunForOutput const&) {}
+      virtual void doEndRunSummary_(RunForOutput const&, EventSetup const&) {}
+      virtual void doBeginLuminosityBlock_(LuminosityBlockForOutput const&) {}
+      virtual void doBeginLuminosityBlockSummary_(LuminosityBlockForOutput const&, EventSetup const&) {}
+      virtual void doEndLuminosityBlock_(LuminosityBlockForOutput const&) {}
+      virtual void doEndLuminosityBlockSummary_(LuminosityBlockForOutput const&, EventSetup const&) {}
       virtual void doRespondToOpenInputFile_(FileBlock const&) {}
       virtual void doRespondToCloseInputFile_(FileBlock const&) {}
 
@@ -287,12 +280,10 @@ namespace edm {
                           std::map<BranchID, BranchDescription const*>& trueBranchIDToKeptBranchDesc,
                           std::set<BranchID>& keptProductsInEvent);
 
-      void setModuleDescription(ModuleDescription const& md) {
-        moduleDescription_ = md;
-      }
-      
-      bool limitReached() const {return remainingEvents_ == 0;}
+      void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
+
+      bool limitReached() const { return remainingEvents_ == 0; }
     };
-  }
-}
+  }  // namespace limited
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/limited/analyzerAbilityToImplementor.h b/FWCore/Framework/interface/limited/analyzerAbilityToImplementor.h
index fb669a4455d4e..9db6f73b2ec9d 100644
--- a/FWCore/Framework/interface/limited/analyzerAbilityToImplementor.h
+++ b/FWCore/Framework/interface/limited/analyzerAbilityToImplementor.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // File  :     analyzerAbilityToImplementor
-// 
+//
 /**\file  analyzerAbilityToImplementor.h "FWCore/Framework/interface/limited/analyzerAbilityToImplementor.h"
 
  Description: Class used to pair a module Ability to the actual base class used to implement that ability
@@ -29,34 +29,35 @@
 namespace edm {
   namespace limited {
     namespace analyzer {
-      template<typename T> struct AbilityToImplementor;
-      
-      template<typename C>
+      template <typename T>
+      struct AbilityToImplementor;
+
+      template <typename C>
       struct AbilityToImplementor<edm::StreamCache<C>> {
-        typedef edm::limited::impl::StreamCacheHolder<edm::limited::EDAnalyzerBase,C> Type;
+        typedef edm::limited::impl::StreamCacheHolder<edm::limited::EDAnalyzerBase, C> Type;
       };
 
-      template<typename C>
+      template <typename C>
       struct AbilityToImplementor<edm::RunCache<C>> {
-        typedef edm::limited::impl::RunCacheHolder<edm::limited::EDAnalyzerBase,C> Type;
+        typedef edm::limited::impl::RunCacheHolder<edm::limited::EDAnalyzerBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::RunSummaryCache<C>> {
-        typedef edm::limited::impl::RunSummaryCacheHolder<edm::limited::EDAnalyzerBase,C> Type;
+        typedef edm::limited::impl::RunSummaryCacheHolder<edm::limited::EDAnalyzerBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::LuminosityBlockCache<C>> {
-        typedef edm::limited::impl::LuminosityBlockCacheHolder<edm::limited::EDAnalyzerBase,C> Type;
+        typedef edm::limited::impl::LuminosityBlockCacheHolder<edm::limited::EDAnalyzerBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::LuminosityBlockSummaryCache<C>> {
-        typedef edm::limited::impl::LuminosityBlockSummaryCacheHolder<edm::limited::EDAnalyzerBase,C> Type;
+        typedef edm::limited::impl::LuminosityBlockSummaryCacheHolder<edm::limited::EDAnalyzerBase, C> Type;
       };
-    }
-  }
-}
+    }  // namespace analyzer
+  }    // namespace limited
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/limited/filterAbilityToImplementor.h b/FWCore/Framework/interface/limited/filterAbilityToImplementor.h
index 5699997c64d81..7cf3537587376 100644
--- a/FWCore/Framework/interface/limited/filterAbilityToImplementor.h
+++ b/FWCore/Framework/interface/limited/filterAbilityToImplementor.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // File  :     filterAbilityToImplementor
-// 
+//
 /**\file  filterAbilityToImplementor.h "FWCore/Framework/interface/limited/filterAbilityToImplementor.h"
 
  Description: Class used to pair a module Ability to the actual base class used to implement that ability
@@ -29,74 +29,80 @@
 namespace edm {
   namespace limited {
     namespace filter {
-      template<typename T> struct AbilityToImplementor;
-      
-      template<typename C>
+      template <typename T>
+      struct AbilityToImplementor;
+
+      template <typename C>
       struct AbilityToImplementor<edm::StreamCache<C>> {
-        typedef edm::limited::impl::StreamCacheHolder<edm::limited::EDFilterBase,C> Type;
+        typedef edm::limited::impl::StreamCacheHolder<edm::limited::EDFilterBase, C> Type;
       };
 
-      template<typename C>
+      template <typename C>
       struct AbilityToImplementor<edm::RunCache<C>> {
-        typedef edm::limited::impl::RunCacheHolder<edm::limited::EDFilterBase,C> Type;
+        typedef edm::limited::impl::RunCacheHolder<edm::limited::EDFilterBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::RunSummaryCache<C>> {
-        typedef edm::limited::impl::RunSummaryCacheHolder<edm::limited::EDFilterBase,C> Type;
+        typedef edm::limited::impl::RunSummaryCacheHolder<edm::limited::EDFilterBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::LuminosityBlockCache<C>> {
-        typedef edm::limited::impl::LuminosityBlockCacheHolder<edm::limited::EDFilterBase,C> Type;
+        typedef edm::limited::impl::LuminosityBlockCacheHolder<edm::limited::EDFilterBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::LuminosityBlockSummaryCache<C>> {
-        typedef edm::limited::impl::LuminosityBlockSummaryCacheHolder<edm::limited::EDFilterBase,C> Type;
+        typedef edm::limited::impl::LuminosityBlockSummaryCacheHolder<edm::limited::EDFilterBase, C> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::BeginRunProducer> {
         typedef edm::limited::impl::BeginRunProducer<edm::limited::EDFilterBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::EndRunProducer> {
         typedef edm::limited::impl::EndRunProducer<edm::limited::EDFilterBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::BeginLuminosityBlockProducer> {
         typedef edm::limited::impl::BeginLuminosityBlockProducer<edm::limited::EDFilterBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::EndLuminosityBlockProducer> {
         typedef edm::limited::impl::EndLuminosityBlockProducer<edm::limited::EDFilterBase> Type;
       };
-      
-      template<bool,bool,typename T> struct SpecializeAbilityToImplementor {
+
+      template <bool, bool, typename T>
+      struct SpecializeAbilityToImplementor {
         typedef typename AbilityToImplementor<T>::Type Type;
       };
-      
-      template<bool B,typename C> struct SpecializeAbilityToImplementor<true,B,edm::RunSummaryCache<C>> {
-        typedef typename edm::limited::impl::EndRunSummaryProducer<edm::limited::EDFilterBase,C> Type;
+
+      template <bool B, typename C>
+      struct SpecializeAbilityToImplementor<true, B, edm::RunSummaryCache<C>> {
+        typedef typename edm::limited::impl::EndRunSummaryProducer<edm::limited::EDFilterBase, C> Type;
       };
-      
-      template<bool B> struct SpecializeAbilityToImplementor<true,B,edm::EndRunProducer> {
+
+      template <bool B>
+      struct SpecializeAbilityToImplementor<true, B, edm::EndRunProducer> {
         typedef typename edm::limited::impl::EmptyType Type;
       };
 
-      template<bool B,typename C> struct SpecializeAbilityToImplementor<B,true,edm::LuminosityBlockSummaryCache<C>> {
-        typedef typename edm::limited::impl::EndLuminosityBlockSummaryProducer<edm::limited::EDFilterBase,C> Type;
+      template <bool B, typename C>
+      struct SpecializeAbilityToImplementor<B, true, edm::LuminosityBlockSummaryCache<C>> {
+        typedef typename edm::limited::impl::EndLuminosityBlockSummaryProducer<edm::limited::EDFilterBase, C> Type;
       };
-      
-      template<bool B> struct SpecializeAbilityToImplementor<B,true,edm::EndLuminosityBlockProducer> {
+
+      template <bool B>
+      struct SpecializeAbilityToImplementor<B, true, edm::EndLuminosityBlockProducer> {
         typedef typename edm::limited::impl::EmptyType Type;
       };
-    }
-  }
-}
+    }  // namespace filter
+  }    // namespace limited
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/limited/implementors.h b/FWCore/Framework/interface/limited/implementors.h
index 476f12e147695..1c154ca0a0c4f 100644
--- a/FWCore/Framework/interface/limited/implementors.h
+++ b/FWCore/Framework/interface/limited/implementors.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     implementors
-// 
+//
 /**\file implementors.h "FWCore/Framework/interface/limited/implementors.h"
 
  Description: Base classes used to implement the interfaces for the edm::limited::* module  abilities
@@ -32,138 +32,136 @@
 
 // forward declarations
 namespace edm {
-  
+
   namespace limited {
     namespace impl {
       class EmptyType {
       public:
         EmptyType(edm::ParameterSet const&) {}
       };
-      
-      
+
       template <typename T, typename C>
       class StreamCacheHolder : public virtual T {
       public:
         StreamCacheHolder(edm::ParameterSet const& iPSet) : T(iPSet) {}
-        StreamCacheHolder( StreamCacheHolder<T,C> const&) = delete;
-        StreamCacheHolder<T,C>& operator=(StreamCacheHolder<T,C> const&) = delete;
+        StreamCacheHolder(StreamCacheHolder<T, C> const&) = delete;
+        StreamCacheHolder<T, C>& operator=(StreamCacheHolder<T, C> const&) = delete;
         ~StreamCacheHolder() {
-          for(auto c: caches_){
+          for (auto c : caches_) {
             delete c;
           }
         }
+
       protected:
-        C * streamCache(edm::StreamID iID) const { return caches_[iID.value()]; }
+        C* streamCache(edm::StreamID iID) const { return caches_[iID.value()]; }
+
       private:
-        void preallocStreams(unsigned int iNStreams) final {
-          caches_.resize(iNStreams,static_cast<C*>(nullptr));
-        }
-        void doBeginStream_(StreamID id) final {
-          caches_[id.value()] = beginStream(id).release();
-        }
+        void preallocStreams(unsigned int iNStreams) final { caches_.resize(iNStreams, static_cast<C*>(nullptr)); }
+        void doBeginStream_(StreamID id) final { caches_[id.value()] = beginStream(id).release(); }
         void doEndStream_(StreamID id) final {
           endStream(id);
           delete caches_[id.value()];
-          caches_[id.value()]=nullptr;
-        }
-        void doStreamBeginRun_(StreamID id, Run const& rp, EventSetup const& c) final {
-          streamBeginRun(id,rp,c);
-        }
-        void doStreamEndRun_(StreamID id, Run const& rp, EventSetup const& c) final {
-          streamEndRun(id,rp,c);
+          caches_[id.value()] = nullptr;
         }
+        void doStreamBeginRun_(StreamID id, Run const& rp, EventSetup const& c) final { streamBeginRun(id, rp, c); }
+        void doStreamEndRun_(StreamID id, Run const& rp, EventSetup const& c) final { streamEndRun(id, rp, c); }
         void doStreamBeginLuminosityBlock_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) final {
-          streamBeginLuminosityBlock(id,lbp,c);
+          streamBeginLuminosityBlock(id, lbp, c);
         }
         void doStreamEndLuminosityBlock_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) final {
-          streamEndLuminosityBlock(id,lbp,c);
+          streamEndLuminosityBlock(id, lbp, c);
         }
 
         virtual std::unique_ptr<C> beginStream(edm::StreamID) const = 0;
-        virtual void streamBeginRun(edm::StreamID, edm::Run const&, edm::EventSetup const&) const  {}
-        virtual void streamBeginLuminosityBlock(edm::StreamID, edm::LuminosityBlock const&, edm::EventSetup const&) const {}
-        virtual void streamEndLuminosityBlock(edm::StreamID, edm::LuminosityBlock const&, edm::EventSetup const&) const {}
+        virtual void streamBeginRun(edm::StreamID, edm::Run const&, edm::EventSetup const&) const {}
+        virtual void streamBeginLuminosityBlock(edm::StreamID,
+                                                edm::LuminosityBlock const&,
+                                                edm::EventSetup const&) const {}
+        virtual void streamEndLuminosityBlock(edm::StreamID,
+                                              edm::LuminosityBlock const&,
+                                              edm::EventSetup const&) const {}
         virtual void streamEndRun(edm::StreamID, edm::Run const&, edm::EventSetup const&) const {}
         virtual void endStream(edm::StreamID) const {}
 
         //When threaded we will have a container for N items whre N is # of streams
         std::vector<C*> caches_;
       };
-      
+
       template <typename T, typename C>
       class RunCacheHolder : public virtual T {
       public:
         RunCacheHolder(edm::ParameterSet const& iPSet) : T(iPSet) {}
-        RunCacheHolder( RunCacheHolder<T,C> const&) = delete;
-        RunCacheHolder<T,C>& operator=(RunCacheHolder<T,C> const&) = delete;
-        ~RunCacheHolder() noexcept(false) {};
+        RunCacheHolder(RunCacheHolder<T, C> const&) = delete;
+        RunCacheHolder<T, C>& operator=(RunCacheHolder<T, C> const&) = delete;
+        ~RunCacheHolder() noexcept(false){};
+
       protected:
         C const* runCache(edm::RunIndex iID) const { return cache_.get(); }
+
       private:
-        void doBeginRun_(Run const& rp, EventSetup const& c) final {
-          cache_ = globalBeginRun(rp,c);
-        }
+        void doBeginRun_(Run const& rp, EventSetup const& c) final { cache_ = globalBeginRun(rp, c); }
         void doEndRun_(Run const& rp, EventSetup const& c) final {
-          globalEndRun(rp,c);
-          cache_ = nullptr; // propagate_const<T> has no reset() function
+          globalEndRun(rp, c);
+          cache_ = nullptr;  // propagate_const<T> has no reset() function
         }
-        
+
         virtual std::shared_ptr<C> globalBeginRun(edm::Run const&, edm::EventSetup const&) const = 0;
         virtual void globalEndRun(edm::Run const&, edm::EventSetup const&) const = 0;
         //When threaded we will have a container for N items whre N is # of simultaneous runs
         edm::propagate_const<std::shared_ptr<C>> cache_;
       };
-      
+
       template <typename T, typename C>
       class LuminosityBlockCacheHolder : public virtual T {
       public:
         LuminosityBlockCacheHolder(edm::ParameterSet const& iPSet) : T(iPSet) {}
-        LuminosityBlockCacheHolder( LuminosityBlockCacheHolder<T,C> const&) = delete;
-        LuminosityBlockCacheHolder<T,C>& operator=(LuminosityBlockCacheHolder<T,C> const&) = delete;
-        ~LuminosityBlockCacheHolder() noexcept(false) {};
+        LuminosityBlockCacheHolder(LuminosityBlockCacheHolder<T, C> const&) = delete;
+        LuminosityBlockCacheHolder<T, C>& operator=(LuminosityBlockCacheHolder<T, C> const&) = delete;
+        ~LuminosityBlockCacheHolder() noexcept(false){};
+
       protected:
         C const* luminosityBlockCache(edm::LuminosityBlockIndex iID) const { return caches_[iID].get(); }
+
       private:
-        void preallocLumis(unsigned int iNLumis) final {
-          caches_.reset( new std::shared_ptr<C>[iNLumis]);
-        }
+        void preallocLumis(unsigned int iNLumis) final { caches_.reset(new std::shared_ptr<C>[iNLumis]); }
 
         void doBeginLuminosityBlock_(LuminosityBlock const& lp, EventSetup const& c) final {
-          caches_[lp.index()] = globalBeginLuminosityBlock(lp,c);
+          caches_[lp.index()] = globalBeginLuminosityBlock(lp, c);
         }
         void doEndLuminosityBlock_(LuminosityBlock const& lp, EventSetup const& c) final {
-          globalEndLuminosityBlock(lp,c);
+          globalEndLuminosityBlock(lp, c);
           caches_[lp.index()].reset();
         }
-        
-        virtual std::shared_ptr<C> globalBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const = 0;
+
+        virtual std::shared_ptr<C> globalBeginLuminosityBlock(edm::LuminosityBlock const&,
+                                                              edm::EventSetup const&) const = 0;
         virtual void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const = 0;
         //When threaded we will have a container for N items whre N is # of simultaneous runs
         std::unique_ptr<std::shared_ptr<C>[]> caches_;
       };
-      
-      template<typename T, typename C> class EndRunSummaryProducer;
-      
+
+      template <typename T, typename C>
+      class EndRunSummaryProducer;
+
       template <typename T, typename C>
       class RunSummaryCacheHolder : public virtual T {
       public:
         RunSummaryCacheHolder(edm::ParameterSet const& iPSet) : T(iPSet) {}
-        RunSummaryCacheHolder( RunSummaryCacheHolder<T,C> const&) = delete;
-        RunSummaryCacheHolder<T,C>& operator=(RunSummaryCacheHolder<T,C> const&) = delete;
-        ~RunSummaryCacheHolder() noexcept(false) {};
+        RunSummaryCacheHolder(RunSummaryCacheHolder<T, C> const&) = delete;
+        RunSummaryCacheHolder<T, C>& operator=(RunSummaryCacheHolder<T, C> const&) = delete;
+        ~RunSummaryCacheHolder() noexcept(false){};
+
       private:
-        friend class EndRunSummaryProducer<T,C>;
+        friend class EndRunSummaryProducer<T, C>;
         void doBeginRunSummary_(edm::Run const& rp, EventSetup const& c) final {
-          cache_ = globalBeginRunSummary(rp,c);
+          cache_ = globalBeginRunSummary(rp, c);
         }
         void doStreamEndRunSummary_(StreamID id, Run const& rp, EventSetup const& c) final {
           //NOTE: in future this will need to be serialized
           std::lock_guard<std::mutex> guard(mutex_);
-          streamEndRunSummary(id,rp,c,cache_.get());
-        }
-        void doEndRunSummary_(Run const& rp, EventSetup const& c) final {
-          globalEndRunSummary(rp,c,cache_.get());
+          streamEndRunSummary(id, rp, c, cache_.get());
         }
+        void doEndRunSummary_(Run const& rp, EventSetup const& c) final { globalEndRunSummary(rp, c, cache_.get()); }
 
         virtual std::shared_ptr<C> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&) const = 0;
         virtual void streamEndRunSummary(StreamID, edm::Run const&, edm::EventSetup const&, C*) const = 0;
@@ -175,86 +173,87 @@ namespace edm {
         std::mutex mutex_;
       };
 
-      template<typename T, typename C> class EndLuminosityBlockSummaryProducer;
+      template <typename T, typename C>
+      class EndLuminosityBlockSummaryProducer;
 
-      
       template <typename T, typename C>
       class LuminosityBlockSummaryCacheHolder : public virtual T {
       public:
         LuminosityBlockSummaryCacheHolder(edm::ParameterSet const& iPSet) : T(iPSet) {}
-        LuminosityBlockSummaryCacheHolder( LuminosityBlockSummaryCacheHolder<T,C> const&) = delete;
-        LuminosityBlockSummaryCacheHolder<T,C>& operator=(LuminosityBlockSummaryCacheHolder<T,C> const&) = delete;
-        ~LuminosityBlockSummaryCacheHolder() noexcept(false) {};
+        LuminosityBlockSummaryCacheHolder(LuminosityBlockSummaryCacheHolder<T, C> const&) = delete;
+        LuminosityBlockSummaryCacheHolder<T, C>& operator=(LuminosityBlockSummaryCacheHolder<T, C> const&) = delete;
+        ~LuminosityBlockSummaryCacheHolder() noexcept(false){};
+
       private:
-        friend class EndLuminosityBlockSummaryProducer<T,C>;
-        
+        friend class EndLuminosityBlockSummaryProducer<T, C>;
+
         void doBeginLuminosityBlockSummary_(edm::LuminosityBlock const& lb, EventSetup const& c) final {
-          cache_ = globalBeginLuminosityBlockSummary(lb,c);
+          cache_ = globalBeginLuminosityBlockSummary(lb, c);
         }
 
-        void doStreamEndLuminosityBlockSummary_(StreamID id, LuminosityBlock const& lb, EventSetup const& c) final
-        {
+        void doStreamEndLuminosityBlockSummary_(StreamID id, LuminosityBlock const& lb, EventSetup const& c) final {
           std::lock_guard<std::mutex> guard(mutex_);
-          streamEndLuminosityBlockSummary(id,lb,c,cache_.get());
+          streamEndLuminosityBlockSummary(id, lb, c, cache_.get());
         }
         void doEndLuminosityBlockSummary_(LuminosityBlock const& lb, EventSetup const& c) final {
-          globalEndLuminosityBlockSummary(lb,c,cache_.get());
+          globalEndLuminosityBlockSummary(lb, c, cache_.get());
         }
 
-        virtual std::shared_ptr<C> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&) const = 0;
-        virtual void streamEndLuminosityBlockSummary(StreamID, edm::LuminosityBlock const&, edm::EventSetup const&, C*) const = 0;
-        
+        virtual std::shared_ptr<C> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                                     edm::EventSetup const&) const = 0;
+        virtual void streamEndLuminosityBlockSummary(StreamID,
+                                                     edm::LuminosityBlock const&,
+                                                     edm::EventSetup const&,
+                                                     C*) const = 0;
+
         virtual void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, C*) const = 0;
-        
+
         //When threaded we will have a container for N items where N is # of simultaneous Lumis
         std::shared_ptr<C> cache_;
         std::mutex mutex_;
       };
 
-      
       template <typename T>
       class BeginRunProducer : public virtual T {
       public:
         BeginRunProducer(edm::ParameterSet const& iPSet) : T(iPSet) {}
-        BeginRunProducer( BeginRunProducer const&) = delete;
+        BeginRunProducer(BeginRunProducer const&) = delete;
         BeginRunProducer& operator=(BeginRunProducer const&) = delete;
-        ~BeginRunProducer() noexcept(false) override {};
-        
+        ~BeginRunProducer() noexcept(false) override{};
+
       private:
         void doBeginRunProduce_(Run& rp, EventSetup const& c) final;
-        
+
         virtual void globalBeginRunProduce(edm::Run&, edm::EventSetup const&) const = 0;
       };
-      
+
       template <typename T>
       class EndRunProducer : public virtual T {
       public:
         EndRunProducer(edm::ParameterSet const& iPSet) : T(iPSet) {}
-        EndRunProducer( EndRunProducer const&) = delete;
+        EndRunProducer(EndRunProducer const&) = delete;
         EndRunProducer& operator=(EndRunProducer const&) = delete;
-        ~EndRunProducer() noexcept(false) override {};
-        
+        ~EndRunProducer() noexcept(false) override{};
+
       private:
-        
         void doEndRunProduce_(Run& rp, EventSetup const& c) final;
-        
+
         virtual void globalEndRunProduce(edm::Run&, edm::EventSetup const&) const = 0;
       };
 
       template <typename T, typename C>
-      class EndRunSummaryProducer : public RunSummaryCacheHolder<T,C> {
+      class EndRunSummaryProducer : public RunSummaryCacheHolder<T, C> {
       public:
-        EndRunSummaryProducer(edm::ParameterSet const& iPSet) : T(iPSet), RunSummaryCacheHolder<T,C>(iPSet) {}
-        EndRunSummaryProducer( EndRunSummaryProducer const&) = delete;
+        EndRunSummaryProducer(edm::ParameterSet const& iPSet) : T(iPSet), RunSummaryCacheHolder<T, C>(iPSet) {}
+        EndRunSummaryProducer(EndRunSummaryProducer const&) = delete;
         EndRunSummaryProducer& operator=(EndRunSummaryProducer const&) = delete;
-        ~EndRunSummaryProducer() noexcept(false) {};
-        
+        ~EndRunSummaryProducer() noexcept(false){};
+
       private:
-        
         void doEndRunProduce_(Run& rp, EventSetup const& c) final {
-          globalEndRunProduce(rp,c,RunSummaryCacheHolder<T,C>::cache_.get());
+          globalEndRunProduce(rp, c, RunSummaryCacheHolder<T, C>::cache_.get());
         }
-        
+
         virtual void globalEndRunProduce(edm::Run&, edm::EventSetup const&, C const*) const = 0;
       };
 
@@ -262,41 +261,42 @@ namespace edm {
       class BeginLuminosityBlockProducer : public virtual T {
       public:
         BeginLuminosityBlockProducer(edm::ParameterSet const& iPSet) : T(iPSet) {}
-        BeginLuminosityBlockProducer( BeginLuminosityBlockProducer const&) = delete;
+        BeginLuminosityBlockProducer(BeginLuminosityBlockProducer const&) = delete;
         BeginLuminosityBlockProducer& operator=(BeginLuminosityBlockProducer const&) = delete;
-        ~BeginLuminosityBlockProducer() noexcept(false) override {};
-        
+        ~BeginLuminosityBlockProducer() noexcept(false) override{};
+
       private:
         void doBeginLuminosityBlockProduce_(LuminosityBlock& lb, EventSetup const& c) final;
         virtual void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const = 0;
       };
-      
+
       template <typename T>
       class EndLuminosityBlockProducer : public virtual T {
       public:
         EndLuminosityBlockProducer(edm::ParameterSet const& iPSet) : T(iPSet) {}
-        EndLuminosityBlockProducer( EndLuminosityBlockProducer const&) = delete;
+        EndLuminosityBlockProducer(EndLuminosityBlockProducer const&) = delete;
         EndLuminosityBlockProducer& operator=(EndLuminosityBlockProducer const&) = delete;
-        ~EndLuminosityBlockProducer() noexcept(false) override {};
-        
+        ~EndLuminosityBlockProducer() noexcept(false) override{};
+
       private:
         void doEndLuminosityBlockProduce_(LuminosityBlock& lb, EventSetup const& c) final;
         virtual void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const = 0;
       };
 
       template <typename T, typename S>
-      class EndLuminosityBlockSummaryProducer : public LuminosityBlockSummaryCacheHolder<T,S> {
+      class EndLuminosityBlockSummaryProducer : public LuminosityBlockSummaryCacheHolder<T, S> {
       public:
-        EndLuminosityBlockSummaryProducer(edm::ParameterSet const& iPSet) : T(iPSet), LuminosityBlockSummaryCacheHolder<T,S>(iPSet) {}
-        EndLuminosityBlockSummaryProducer( EndLuminosityBlockSummaryProducer const&) = delete;
+        EndLuminosityBlockSummaryProducer(edm::ParameterSet const& iPSet)
+            : T(iPSet), LuminosityBlockSummaryCacheHolder<T, S>(iPSet) {}
+        EndLuminosityBlockSummaryProducer(EndLuminosityBlockSummaryProducer const&) = delete;
         EndLuminosityBlockSummaryProducer& operator=(EndLuminosityBlockSummaryProducer const&) = delete;
-        ~EndLuminosityBlockSummaryProducer() noexcept(false) {};
-        
+        ~EndLuminosityBlockSummaryProducer() noexcept(false){};
+
       private:
         void doEndLuminosityBlockProduce_(LuminosityBlock& lb, EventSetup const& c) final {
-          globalEndLuminosityBlockProduce(lb,c,LuminosityBlockSummaryCacheHolder<T,S>::cache_.get());
+          globalEndLuminosityBlockProduce(lb, c, LuminosityBlockSummaryCacheHolder<T, S>::cache_.get());
         }
-        
+
         virtual void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&, S const*) const = 0;
       };
 
@@ -307,21 +307,17 @@ namespace edm {
         Accumulator() = default;
         Accumulator(Accumulator const&) = delete;
         Accumulator& operator=(Accumulator const&) = delete;
-        ~Accumulator() noexcept(false) override {};
+        ~Accumulator() noexcept(false) override{};
 
       private:
-
         bool hasAccumulator() const override { return true; }
 
-        void produce(StreamID streamID, Event& ev, EventSetup const& es) const final {
-          accumulate(streamID, ev, es);
-        }
+        void produce(StreamID streamID, Event& ev, EventSetup const& es) const final { accumulate(streamID, ev, es); }
 
         virtual void accumulate(StreamID streamID, Event const& ev, EventSetup const& es) const = 0;
       };
-    }
-  }
-}
-
+    }  // namespace impl
+  }    // namespace limited
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/limited/outputmoduleAbilityToImplementor.h b/FWCore/Framework/interface/limited/outputmoduleAbilityToImplementor.h
index a0659af9f3131..bb6b8ac1cb458 100644
--- a/FWCore/Framework/interface/limited/outputmoduleAbilityToImplementor.h
+++ b/FWCore/Framework/interface/limited/outputmoduleAbilityToImplementor.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     outputmodule::AbilityToImplementor
-// 
+//
 /**\class outputmodule::AbilityToImplementor outputmoduleAbilityToImplementor.h "FWCore/Framework/interface/limited/outputmoduleAbilityToImplementor.h"
 
  Description: [one line class summary]
@@ -29,20 +29,20 @@
 namespace edm {
   class FileBlock;
   class ModuleCallingContext;
-  
+
   namespace limited {
     namespace outputmodule {
       class InputFileWatcher : public virtual OutputModuleBase {
       public:
-        InputFileWatcher(edm::ParameterSet const&iPSet): OutputModuleBase(iPSet) {}
+        InputFileWatcher(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {}
         InputFileWatcher(InputFileWatcher const&) = delete;
         InputFileWatcher& operator=(InputFileWatcher const&) = delete;
-        ~InputFileWatcher() noexcept(false) override {};
-        
+        ~InputFileWatcher() noexcept(false) override{};
+
       private:
         void doRespondToOpenInputFile_(FileBlock const&) final;
         void doRespondToCloseInputFile_(FileBlock const&) final;
-        
+
         virtual void respondToOpenInputFile(FileBlock const&) = 0;
         virtual void respondToCloseInputFile(FileBlock const&) = 0;
       };
@@ -50,19 +50,19 @@ namespace edm {
       template <typename T, typename C>
       class RunCacheHolder : public virtual T {
       public:
-        RunCacheHolder(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) { }
-        RunCacheHolder( RunCacheHolder<T,C> const&) = delete;
-        RunCacheHolder<T,C>& operator=(RunCacheHolder<T,C> const&) = delete;
-        ~RunCacheHolder() noexcept(false) override {};
+        RunCacheHolder(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {}
+        RunCacheHolder(RunCacheHolder<T, C> const&) = delete;
+        RunCacheHolder<T, C>& operator=(RunCacheHolder<T, C> const&) = delete;
+        ~RunCacheHolder() noexcept(false) override{};
+
       protected:
         C const* runCache(edm::RunIndex iID) const { return cache_.get(); }
+
       private:
-        void doBeginRun_(RunForOutput const& rp) final {
-          cache_ = globalBeginRun(rp);
-        }
+        void doBeginRun_(RunForOutput const& rp) final { cache_ = globalBeginRun(rp); }
         void doEndRun_(RunForOutput const& rp) final {
           globalEndRun(rp);
-          cache_ = nullptr; // propagate_const<T> has no reset() function
+          cache_ = nullptr;  // propagate_const<T> has no reset() function
         }
 
         virtual std::shared_ptr<C> globalBeginRun(RunForOutput const&) const = 0;
@@ -74,16 +74,16 @@ namespace edm {
       template <typename T, typename C>
       class LuminosityBlockCacheHolder : public virtual T {
       public:
-        LuminosityBlockCacheHolder(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) { }
-        LuminosityBlockCacheHolder( LuminosityBlockCacheHolder<T,C> const&) = delete;
-        LuminosityBlockCacheHolder<T,C>& operator=(LuminosityBlockCacheHolder<T,C> const&) = delete;
-        ~LuminosityBlockCacheHolder() noexcept(false) override {};
+        LuminosityBlockCacheHolder(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {}
+        LuminosityBlockCacheHolder(LuminosityBlockCacheHolder<T, C> const&) = delete;
+        LuminosityBlockCacheHolder<T, C>& operator=(LuminosityBlockCacheHolder<T, C> const&) = delete;
+        ~LuminosityBlockCacheHolder() noexcept(false) override{};
+
       protected:
         C const* luminosityBlockCache(edm::LuminosityBlockIndex iID) const { return caches_[iID].get(); }
+
       private:
-        void preallocLumis(unsigned int iNLumis) final {
-          caches_.reset(new std::shared_ptr<C>[iNLumis]);
-        }
+        void preallocLumis(unsigned int iNLumis) final { caches_.reset(new std::shared_ptr<C>[iNLumis]); }
         void doBeginLuminosityBlock_(LuminosityBlockForOutput const& lp) final {
           caches_[lp.index()] = globalBeginLuminosityBlock(lp);
         }
@@ -98,26 +98,26 @@ namespace edm {
         std::unique_ptr<std::shared_ptr<C>[]> caches_;
       };
 
-      template<typename T> struct AbilityToImplementor;
-      
-      template<>
+      template <typename T>
+      struct AbilityToImplementor;
+
+      template <>
       struct AbilityToImplementor<edm::WatchInputFiles> {
         typedef edm::limited::outputmodule::InputFileWatcher Type;
       };
 
-      template<typename C>
+      template <typename C>
       struct AbilityToImplementor<edm::RunCache<C>> {
-        typedef edm::limited::outputmodule::RunCacheHolder<edm::limited::OutputModuleBase,C> Type;
+        typedef edm::limited::outputmodule::RunCacheHolder<edm::limited::OutputModuleBase, C> Type;
       };
 
-      template<typename C>
+      template <typename C>
       struct AbilityToImplementor<edm::LuminosityBlockCache<C>> {
-        typedef edm::limited::outputmodule::LuminosityBlockCacheHolder<edm::limited::OutputModuleBase,C> Type;
+        typedef edm::limited::outputmodule::LuminosityBlockCacheHolder<edm::limited::OutputModuleBase, C> Type;
       };
 
-    }
-  }
-}
-
+    }  // namespace outputmodule
+  }    // namespace limited
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/limited/producerAbilityToImplementor.h b/FWCore/Framework/interface/limited/producerAbilityToImplementor.h
index 9185ad03846da..6510d0767ed0d 100644
--- a/FWCore/Framework/interface/limited/producerAbilityToImplementor.h
+++ b/FWCore/Framework/interface/limited/producerAbilityToImplementor.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // File  :     producerAbilityToImplementor
-// 
+//
 /**\file  producerAbilityToImplementor.h "FWCore/Framework/interface/limited/producerAbilityToImplementor.h"
 
  Description: Class used to pair a module Ability to the actual base class used to implement that ability
@@ -29,79 +29,85 @@
 namespace edm {
   namespace limited {
     namespace producer {
-      template<typename T> struct AbilityToImplementor;
-      
-      template<typename C>
+      template <typename T>
+      struct AbilityToImplementor;
+
+      template <typename C>
       struct AbilityToImplementor<edm::StreamCache<C>> {
-        typedef edm::limited::impl::StreamCacheHolder<edm::limited::EDProducerBase,C> Type;
+        typedef edm::limited::impl::StreamCacheHolder<edm::limited::EDProducerBase, C> Type;
       };
 
-      template<typename C>
+      template <typename C>
       struct AbilityToImplementor<edm::RunCache<C>> {
-        typedef edm::limited::impl::RunCacheHolder<edm::limited::EDProducerBase,C> Type;
+        typedef edm::limited::impl::RunCacheHolder<edm::limited::EDProducerBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::RunSummaryCache<C>> {
-        typedef edm::limited::impl::RunSummaryCacheHolder<edm::limited::EDProducerBase,C> Type;
+        typedef edm::limited::impl::RunSummaryCacheHolder<edm::limited::EDProducerBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::LuminosityBlockCache<C>> {
-        typedef edm::limited::impl::LuminosityBlockCacheHolder<edm::limited::EDProducerBase,C> Type;
+        typedef edm::limited::impl::LuminosityBlockCacheHolder<edm::limited::EDProducerBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::LuminosityBlockSummaryCache<C>> {
-        typedef edm::limited::impl::LuminosityBlockSummaryCacheHolder<edm::limited::EDProducerBase,C> Type;
+        typedef edm::limited::impl::LuminosityBlockSummaryCacheHolder<edm::limited::EDProducerBase, C> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::BeginRunProducer> {
         typedef edm::limited::impl::BeginRunProducer<edm::limited::EDProducerBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::EndRunProducer> {
         typedef edm::limited::impl::EndRunProducer<edm::limited::EDProducerBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::BeginLuminosityBlockProducer> {
         typedef edm::limited::impl::BeginLuminosityBlockProducer<edm::limited::EDProducerBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::EndLuminosityBlockProducer> {
         typedef edm::limited::impl::EndLuminosityBlockProducer<edm::limited::EDProducerBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::Accumulator> {
         typedef edm::limited::impl::Accumulator<edm::limited::EDProducerBase> Type;
       };
 
-      template<bool,bool,typename T> struct SpecializeAbilityToImplementor {
+      template <bool, bool, typename T>
+      struct SpecializeAbilityToImplementor {
         typedef typename AbilityToImplementor<T>::Type Type;
       };
-      
-      template<bool B,typename C> struct SpecializeAbilityToImplementor<true,B,edm::RunSummaryCache<C>> {
-        typedef typename edm::limited::impl::EndRunSummaryProducer<edm::limited::EDProducerBase,C> Type;
+
+      template <bool B, typename C>
+      struct SpecializeAbilityToImplementor<true, B, edm::RunSummaryCache<C>> {
+        typedef typename edm::limited::impl::EndRunSummaryProducer<edm::limited::EDProducerBase, C> Type;
       };
-      
-      template<bool B> struct SpecializeAbilityToImplementor<true,B,edm::EndRunProducer> {
+
+      template <bool B>
+      struct SpecializeAbilityToImplementor<true, B, edm::EndRunProducer> {
         typedef typename edm::limited::impl::EmptyType Type;
       };
 
-      template<bool B,typename C> struct SpecializeAbilityToImplementor<B,true,edm::LuminosityBlockSummaryCache<C>> {
-        typedef typename edm::limited::impl::EndLuminosityBlockSummaryProducer<edm::limited::EDProducerBase,C> Type;
+      template <bool B, typename C>
+      struct SpecializeAbilityToImplementor<B, true, edm::LuminosityBlockSummaryCache<C>> {
+        typedef typename edm::limited::impl::EndLuminosityBlockSummaryProducer<edm::limited::EDProducerBase, C> Type;
       };
-      
-      template<bool B> struct SpecializeAbilityToImplementor<B,true,edm::EndLuminosityBlockProducer> {
+
+      template <bool B>
+      struct SpecializeAbilityToImplementor<B, true, edm::EndLuminosityBlockProducer> {
         typedef typename edm::limited::impl::EmptyType Type;
       };
-    }
-  }
-}
+    }  // namespace producer
+  }    // namespace limited
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/makeRefToBaseProdFrom.h b/FWCore/Framework/interface/makeRefToBaseProdFrom.h
index 474ee28531f2d..19deea555ab04 100644
--- a/FWCore/Framework/interface/makeRefToBaseProdFrom.h
+++ b/FWCore/Framework/interface/makeRefToBaseProdFrom.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     makeRefToBaseProdFrom
-// 
+//
 /**\class makeRefToBaseProdFrom makeRefToBaseProdFrom.h "FWCore/Framework/interface/makeRefToBaseProdFrom.h"
 
  Description: [one line class summary]
@@ -30,12 +30,12 @@
 // forward declarations
 
 namespace edm {
-  template<typename T>
-    RefToBaseProd<T> makeRefToBaseProdFrom(RefToBase<T> const& iRef, Event const& iEvent) {
+  template <typename T>
+  RefToBaseProd<T> makeRefToBaseProdFrom(RefToBase<T> const& iRef, Event const& iEvent) {
     Handle<View<T>> view;
-    iEvent.get(iRef.id(),view);
+    iEvent.get(iRef.id(), view);
 
     return RefToBaseProd<T>(view);
   }
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/moduleAbilities.h b/FWCore/Framework/interface/moduleAbilities.h
index 403260ea4a47c..65886c16fa5f7 100644
--- a/FWCore/Framework/interface/moduleAbilities.h
+++ b/FWCore/Framework/interface/moduleAbilities.h
@@ -29,139 +29,138 @@
 namespace edm {
   namespace module {
     //Used in the case where ability is not available
-    struct Empty{};
-  }
+    struct Empty {};
+  }  // namespace module
 
-  template<typename T>
+  template <typename T>
   struct GlobalCache {
-    static constexpr module::Abilities kAbilities=module::Abilities::kGlobalCache;
+    static constexpr module::Abilities kAbilities = module::Abilities::kGlobalCache;
     typedef T Type;
   };
 
-  template<typename T>
+  template <typename T>
   struct StreamCache {
-    static constexpr module::Abilities kAbilities=module::Abilities::kStreamCache;
+    static constexpr module::Abilities kAbilities = module::Abilities::kStreamCache;
     typedef T Type;
   };
 
-  template<typename T>
+  template <typename T>
   struct RunCache {
-    static constexpr module::Abilities kAbilities=module::Abilities::kRunCache;
+    static constexpr module::Abilities kAbilities = module::Abilities::kRunCache;
     typedef T Type;
   };
 
-  template<typename T>
+  template <typename T>
   struct LuminosityBlockCache {
-    static constexpr module::Abilities kAbilities=module::Abilities::kLuminosityBlockCache;
+    static constexpr module::Abilities kAbilities = module::Abilities::kLuminosityBlockCache;
     typedef T Type;
   };
 
-  template<typename T>
+  template <typename T>
   struct RunSummaryCache {
-    static constexpr module::Abilities kAbilities=module::Abilities::kRunSummaryCache;
+    static constexpr module::Abilities kAbilities = module::Abilities::kRunSummaryCache;
     typedef T Type;
   };
 
-  template<typename T>
+  template <typename T>
   struct LuminosityBlockSummaryCache {
-    static constexpr module::Abilities kAbilities=module::Abilities::kLuminosityBlockSummaryCache;
+    static constexpr module::Abilities kAbilities = module::Abilities::kLuminosityBlockSummaryCache;
     typedef T Type;
   };
 
   struct BeginRunProducer {
-    static constexpr module::Abilities kAbilities=module::Abilities::kBeginRunProducer;
+    static constexpr module::Abilities kAbilities = module::Abilities::kBeginRunProducer;
     typedef module::Empty Type;
   };
 
   struct EndRunProducer {
-    static constexpr module::Abilities kAbilities=module::Abilities::kEndRunProducer;
+    static constexpr module::Abilities kAbilities = module::Abilities::kEndRunProducer;
     typedef module::Empty Type;
   };
 
   struct BeginLuminosityBlockProducer {
-    static constexpr module::Abilities kAbilities=module::Abilities::kBeginLuminosityBlockProducer;
+    static constexpr module::Abilities kAbilities = module::Abilities::kBeginLuminosityBlockProducer;
     typedef module::Empty Type;
   };
 
   struct EndLuminosityBlockProducer {
-    static constexpr module::Abilities kAbilities=module::Abilities::kEndLuminosityBlockProducer;
+    static constexpr module::Abilities kAbilities = module::Abilities::kEndLuminosityBlockProducer;
     typedef module::Empty Type;
   };
 
   struct WatchInputFiles {
-    static constexpr module::Abilities kAbilities=module::Abilities::kWatchInputFiles;
+    static constexpr module::Abilities kAbilities = module::Abilities::kWatchInputFiles;
     typedef module::Empty Type;
   };
 
   struct ExternalWork {
-    static constexpr module::Abilities kAbilities=module::Abilities::kExternalWork;
+    static constexpr module::Abilities kAbilities = module::Abilities::kExternalWork;
     typedef module::Empty Type;
   };
 
   struct Accumulator {
-    static constexpr module::Abilities kAbilities=module::Abilities::kAccumulator;
+    static constexpr module::Abilities kAbilities = module::Abilities::kAccumulator;
     typedef module::Empty Type;
   };
 
   //Recursively checks VArgs template arguments looking for the ABILITY
-  template<module::Abilities ABILITY, typename... VArgs> struct CheckAbility;
+  template <module::Abilities ABILITY, typename... VArgs>
+  struct CheckAbility;
 
-  template<module::Abilities ABILITY, typename T, typename... VArgs>
-  struct CheckAbility<ABILITY,T,VArgs...> {
-    static constexpr bool kHasIt = (T::kAbilities==ABILITY) | CheckAbility<ABILITY,VArgs...>::kHasIt;
-    typedef std::conditional_t<(T::kAbilities==ABILITY),
-                               typename T::Type,
-                               typename CheckAbility<ABILITY,VArgs...>::Type> Type;
+  template <module::Abilities ABILITY, typename T, typename... VArgs>
+  struct CheckAbility<ABILITY, T, VArgs...> {
+    static constexpr bool kHasIt = (T::kAbilities == ABILITY) | CheckAbility<ABILITY, VArgs...>::kHasIt;
+    typedef std::
+        conditional_t<(T::kAbilities == ABILITY), typename T::Type, typename CheckAbility<ABILITY, VArgs...>::Type>
+            Type;
   };
 
   //End of the recursion
-  template<module::Abilities ABILITY>
+  template <module::Abilities ABILITY>
   struct CheckAbility<ABILITY> {
-    static constexpr bool kHasIt=false;
+    static constexpr bool kHasIt = false;
     typedef edm::module::Empty Type;
   };
 
-  template<typename... VArgs>
+  template <typename... VArgs>
   struct WantsGlobalRunTransitions {
-    static constexpr bool value = CheckAbility<module::Abilities::kRunCache,VArgs...>::kHasIt or
-    CheckAbility<module::Abilities::kRunSummaryCache,VArgs...>::kHasIt or
-    CheckAbility<module::Abilities::kBeginRunProducer,VArgs...>::kHasIt or
-    CheckAbility<module::Abilities::kEndRunProducer, VArgs...>::kHasIt;
+    static constexpr bool value = CheckAbility<module::Abilities::kRunCache, VArgs...>::kHasIt or
+                                  CheckAbility<module::Abilities::kRunSummaryCache, VArgs...>::kHasIt or
+                                  CheckAbility<module::Abilities::kBeginRunProducer, VArgs...>::kHasIt or
+                                  CheckAbility<module::Abilities::kEndRunProducer, VArgs...>::kHasIt;
   };
-  
-  template<typename... VArgs>
+
+  template <typename... VArgs>
   struct WantsGlobalLuminosityBlockTransitions {
-    static constexpr bool value = CheckAbility<module::Abilities::kLuminosityBlockCache,VArgs...>::kHasIt or
-    CheckAbility<module::Abilities::kLuminosityBlockSummaryCache,VArgs...>::kHasIt or
-    CheckAbility<module::Abilities::kBeginLuminosityBlockProducer,VArgs...>::kHasIt or
-    CheckAbility<module::Abilities::kEndLuminosityBlockProducer, VArgs...>::kHasIt;
+    static constexpr bool value = CheckAbility<module::Abilities::kLuminosityBlockCache, VArgs...>::kHasIt or
+                                  CheckAbility<module::Abilities::kLuminosityBlockSummaryCache, VArgs...>::kHasIt or
+                                  CheckAbility<module::Abilities::kBeginLuminosityBlockProducer, VArgs...>::kHasIt or
+                                  CheckAbility<module::Abilities::kEndLuminosityBlockProducer, VArgs...>::kHasIt;
   };
 
-  template<typename... VArgs>
+  template <typename... VArgs>
   struct WantsStreamRunTransitions {
-    static constexpr bool value = CheckAbility<module::Abilities::kStreamCache,VArgs...>::kHasIt or
-    CheckAbility<module::Abilities::kRunSummaryCache,VArgs...>::kHasIt ;
+    static constexpr bool value = CheckAbility<module::Abilities::kStreamCache, VArgs...>::kHasIt or
+                                  CheckAbility<module::Abilities::kRunSummaryCache, VArgs...>::kHasIt;
   };
-  
-  template<typename... VArgs>
+
+  template <typename... VArgs>
   struct WantsStreamLuminosityBlockTransitions {
-    static constexpr bool value = CheckAbility<module::Abilities::kStreamCache,VArgs...>::kHasIt or
-    CheckAbility<module::Abilities::kLuminosityBlockSummaryCache,VArgs...>::kHasIt;
+    static constexpr bool value = CheckAbility<module::Abilities::kStreamCache, VArgs...>::kHasIt or
+                                  CheckAbility<module::Abilities::kLuminosityBlockSummaryCache, VArgs...>::kHasIt;
   };
 
-  template<typename... VArgs>
+  template <typename... VArgs>
   struct HasAbilityToProduceInRuns {
-    static constexpr bool value =
-      CheckAbility<module::Abilities::kBeginRunProducer,VArgs...>::kHasIt or
-      CheckAbility<module::Abilities::kEndRunProducer, VArgs...>::kHasIt;
+    static constexpr bool value = CheckAbility<module::Abilities::kBeginRunProducer, VArgs...>::kHasIt or
+                                  CheckAbility<module::Abilities::kEndRunProducer, VArgs...>::kHasIt;
   };
 
-  template<typename... VArgs>
+  template <typename... VArgs>
   struct HasAbilityToProduceInLumis {
-    static constexpr bool value =
-      CheckAbility<module::Abilities::kBeginLuminosityBlockProducer,VArgs...>::kHasIt or
-      CheckAbility<module::Abilities::kEndLuminosityBlockProducer, VArgs...>::kHasIt;
+    static constexpr bool value = CheckAbility<module::Abilities::kBeginLuminosityBlockProducer, VArgs...>::kHasIt or
+                                  CheckAbility<module::Abilities::kEndLuminosityBlockProducer, VArgs...>::kHasIt;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/moduleAbilityEnums.h b/FWCore/Framework/interface/moduleAbilityEnums.h
index 1b5540722e105..a45dbccb1a59e 100644
--- a/FWCore/Framework/interface/moduleAbilityEnums.h
+++ b/FWCore/Framework/interface/moduleAbilityEnums.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     ModuleAbilityEnums
-// 
+//
 /**\class ModuleAbilityEnums ModuleAbilityEnums.h "FWCore/Framework/interface/ModuleAbilityEnums.h"
 
  Description: Enums used internally by framework to determine abilities of a module
@@ -25,8 +25,8 @@
 // forward declarations
 namespace edm {
   namespace module {
-    typedef  unsigned char AbilitiesType;
-    
+    typedef unsigned char AbilitiesType;
+
     enum class Abilities {
       kGlobalCache,
       kStreamCache,
@@ -45,43 +45,45 @@ namespace edm {
       kExternalWork,
       kAccumulator
     };
-    
+
     namespace AbilityBits {
       enum Bits {
-        kGlobalCache=1,
-        kStreamCache=2,
-        kRunCache=4,
-        kLuminosityBlockCache=8,
-        kRunSummaryCache=16,
-        kLuminosityBlockSummaryCache=32,
-        kBeginRunProducer=64,
-        kEndRunProducer=128,
-        kOneSharedResources=256,
-        kOneWatchRuns=512,
-        kOneWatchLuminosityBlocks=1024,
-        kWatchInputFiles=2048
+        kGlobalCache = 1,
+        kStreamCache = 2,
+        kRunCache = 4,
+        kLuminosityBlockCache = 8,
+        kRunSummaryCache = 16,
+        kLuminosityBlockSummaryCache = 32,
+        kBeginRunProducer = 64,
+        kEndRunProducer = 128,
+        kOneSharedResources = 256,
+        kOneWatchRuns = 512,
+        kOneWatchLuminosityBlocks = 1024,
+        kWatchInputFiles = 2048
       };
     }
-    
+
     namespace AbilityToTransitions {
       enum Bits {
-        kBeginStream=AbilityBits::kStreamCache,
-        kEndStream=AbilityBits::kStreamCache,
-        
-        kGlobalBeginRun=AbilityBits::kRunCache|AbilityBits::kRunSummaryCache|AbilityBits::kOneWatchRuns,
-        kGlobalEndRun=AbilityBits::kRunCache|AbilityBits::kRunSummaryCache|AbilityBits::kEndRunProducer|AbilityBits::kOneWatchRuns,
-        kStreamBeginRun=AbilityBits::kStreamCache,
-        kStreamEndRun=AbilityBits::kStreamCache|AbilityBits::kRunSummaryCache,
-        
-        kGlobalBeginLuminosityBlock=AbilityBits::kLuminosityBlockCache|AbilityBits::kLuminosityBlockSummaryCache|AbilityBits::kOneWatchLuminosityBlocks,
-        kGlobalEndLuminosityBlock=AbilityBits::kLuminosityBlockCache|AbilityBits::kLuminosityBlockSummaryCache|AbilityBits::kOneWatchLuminosityBlocks,
-        kStreamBeginLuminosityBlock=AbilityBits::kStreamCache|AbilityBits::kLuminosityBlockSummaryCache,
-        kStreamEndLuminosityBlock=AbilityBits::kStreamCache|AbilityBits::kLuminosityBlockSummaryCache
-        
+        kBeginStream = AbilityBits::kStreamCache,
+        kEndStream = AbilityBits::kStreamCache,
+
+        kGlobalBeginRun = AbilityBits::kRunCache | AbilityBits::kRunSummaryCache | AbilityBits::kOneWatchRuns,
+        kGlobalEndRun = AbilityBits::kRunCache | AbilityBits::kRunSummaryCache | AbilityBits::kEndRunProducer |
+                        AbilityBits::kOneWatchRuns,
+        kStreamBeginRun = AbilityBits::kStreamCache,
+        kStreamEndRun = AbilityBits::kStreamCache | AbilityBits::kRunSummaryCache,
+
+        kGlobalBeginLuminosityBlock = AbilityBits::kLuminosityBlockCache | AbilityBits::kLuminosityBlockSummaryCache |
+                                      AbilityBits::kOneWatchLuminosityBlocks,
+        kGlobalEndLuminosityBlock = AbilityBits::kLuminosityBlockCache | AbilityBits::kLuminosityBlockSummaryCache |
+                                    AbilityBits::kOneWatchLuminosityBlocks,
+        kStreamBeginLuminosityBlock = AbilityBits::kStreamCache | AbilityBits::kLuminosityBlockSummaryCache,
+        kStreamEndLuminosityBlock = AbilityBits::kStreamCache | AbilityBits::kLuminosityBlockSummaryCache
+
       };
     }
-  }
-}
-
+  }  // namespace module
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/one/EDAnalyzer.h b/FWCore/Framework/interface/one/EDAnalyzer.h
index e4a07fbffe6d4..aa27f24b5ff2b 100644
--- a/FWCore/Framework/interface/one/EDAnalyzer.h
+++ b/FWCore/Framework/interface/one/EDAnalyzer.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::one::EDAnalyzer
-// 
+//
 /**\class edm::one::EDAnalyzer EDAnalyzer.h "FWCore/Framework/interface/one/EDAnalyzer.h"
 
  Description: [one line class summary]
@@ -26,48 +26,42 @@
 // forward declarations
 namespace edm {
   namespace one {
-    template< typename... T>
-    class EDAnalyzer : public virtual EDAnalyzerBase,
-                       public analyzer::AbilityToImplementor<T>::Type... { 
+    template <typename... T>
+    class EDAnalyzer : public virtual EDAnalyzerBase, public analyzer::AbilityToImplementor<T>::Type... {
     public:
-      static_assert(not (CheckAbility<module::Abilities::kRunCache,T...>::kHasIt and
-                        CheckAbility<module::Abilities::kOneWatchRuns,T...>::kHasIt),
-                   "Cannot use both WatchRuns and RunCache");
-      static_assert(not (CheckAbility<module::Abilities::kLuminosityBlockCache,T...>::kHasIt and
-                        CheckAbility<module::Abilities::kOneWatchLuminosityBlocks,T...>::kHasIt),
-                   "Cannot use both WatchLuminosityBlocks and LuminosityBLockCache");
+      static_assert(not(CheckAbility<module::Abilities::kRunCache, T...>::kHasIt and
+                        CheckAbility<module::Abilities::kOneWatchRuns, T...>::kHasIt),
+                    "Cannot use both WatchRuns and RunCache");
+      static_assert(not(CheckAbility<module::Abilities::kLuminosityBlockCache, T...>::kHasIt and
+                        CheckAbility<module::Abilities::kOneWatchLuminosityBlocks, T...>::kHasIt),
+                    "Cannot use both WatchLuminosityBlocks and LuminosityBLockCache");
 
       EDAnalyzer() = default;
 #ifdef __INTEL_COMPILER
       virtual ~EDAnalyzer() = default;
 #endif
-      
+
       // ---------- const member functions ---------------------
-      bool wantsGlobalRuns() const final {
-        return WantsGlobalRunTransitions<T...>::value;
-      }
-      bool wantsGlobalLuminosityBlocks() const final {
-        return WantsGlobalLuminosityBlockTransitions<T...>::value;
-      }
+      bool wantsGlobalRuns() const final { return WantsGlobalRunTransitions<T...>::value; }
+      bool wantsGlobalLuminosityBlocks() const final { return WantsGlobalLuminosityBlockTransitions<T...>::value; }
 
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
-      SerialTaskQueue* globalRunsQueue() final { return globalRunsQueue_.queue();}
-      SerialTaskQueue* globalLuminosityBlocksQueue() final { return globalLuminosityBlocksQueue_.queue();}
+      SerialTaskQueue* globalRunsQueue() final { return globalRunsQueue_.queue(); }
+      SerialTaskQueue* globalLuminosityBlocksQueue() final { return globalLuminosityBlocksQueue_.queue(); }
 
     private:
       EDAnalyzer(const EDAnalyzer&) = delete;
       const EDAnalyzer& operator=(const EDAnalyzer&) = delete;
-      
+
       // ---------- member data --------------------------------
       impl::OptionalSerialTaskQueueHolder<WantsSerialGlobalRunTransitions<T...>::value> globalRunsQueue_;
-      impl::OptionalSerialTaskQueueHolder<WantsSerialGlobalLuminosityBlockTransitions<T...>::value> globalLuminosityBlocksQueue_;
-
+      impl::OptionalSerialTaskQueueHolder<WantsSerialGlobalLuminosityBlockTransitions<T...>::value>
+          globalLuminosityBlocksQueue_;
     };
-    
-  }
-}
 
+  }  // namespace one
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/one/EDAnalyzerBase.h b/FWCore/Framework/interface/one/EDAnalyzerBase.h
index 8bb7569e619eb..3cb0a6c43a2f0 100644
--- a/FWCore/Framework/interface/one/EDAnalyzerBase.h
+++ b/FWCore/Framework/interface/one/EDAnalyzerBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     one::EDAnalyzerBase
-// 
+//
 /**\class one::EDAnalyzerBase EDAnalyzerBase.h "FWCore/Framework/interface/one/EDAnalyzerBase.h"
 
  Description: Base class for edm::one::EDAnalyzer<>
@@ -38,24 +38,24 @@ namespace edm {
   class WaitingTask;
 
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
   }
 
   namespace one {
 
-    class EDAnalyzerBase : public EDConsumerBase
-    {
-      
+    class EDAnalyzerBase : public EDConsumerBase {
     public:
-      template <typename T> friend class edm::WorkerT;
-      template <typename T> friend class edm::maker::ModuleHolderT;
-      
+      template <typename T>
+      friend class edm::WorkerT;
+      template <typename T>
+      friend class edm::maker::ModuleHolderT;
+
       typedef EDAnalyzerBase ModuleType;
 
-      
       EDAnalyzerBase();
       ~EDAnalyzerBase() override;
-      
+
       static void fillDescriptions(ConfigurationDescriptions& descriptions);
       static void prevalidate(ConfigurationDescriptions& descriptions);
       static const std::string& baseType();
@@ -63,53 +63,50 @@ namespace edm {
       // Warning: the returned moduleDescription will be invalid during construction
       ModuleDescription const& moduleDescription() const { return moduleDescription_; }
 
-      virtual bool wantsGlobalRuns() const =0;
-      virtual bool wantsGlobalLuminosityBlocks() const =0;
-      bool wantsStreamRuns() const {return false;}
-      bool wantsStreamLuminosityBlocks() const {return false;};
+      virtual bool wantsGlobalRuns() const = 0;
+      virtual bool wantsGlobalLuminosityBlocks() const = 0;
+      bool wantsStreamRuns() const { return false; }
+      bool wantsStreamLuminosityBlocks() const { return false; };
 
       virtual SerialTaskQueue* globalRunsQueue();
       virtual SerialTaskQueue* globalLuminosityBlocksQueue();
       void callWhenNewProductsRegistered(std::function<void(BranchDescription const&)> const& func);
 
     private:
-      bool doEvent(EventPrincipal const& ep, EventSetupImpl const&  c,
-                   ActivityRegistry*,
-                   ModuleCallingContext const*);
+      bool doEvent(EventPrincipal const& ep, EventSetupImpl const& c, ActivityRegistry*, ModuleCallingContext const*);
       //For now this is a placeholder
-      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
+      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                                    ModuleCallingContext const& iModuleCallingContext,
+                                                    Principal const& iPrincipal) const {}
 
       void doPreallocate(PreallocationConfiguration const&);
       virtual void preallocLumis(unsigned int);
       void doBeginJob();
       void doEndJob();
-      
-      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                      ModuleCallingContext const*);
-      void doEndRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                    ModuleCallingContext const*);
-      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+
+      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                  EventSetupImpl const& c,
                                   ModuleCallingContext const*);
-      void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                EventSetupImpl const& c,
                                 ModuleCallingContext const*);
-      
+
       //For now, the following are just dummy implemenations with no ability for users to override
       void doRespondToOpenInputFile(FileBlock const& fb);
       void doRespondToCloseInputFile(FileBlock const& fb);
-      void doRegisterThinnedAssociations(ProductRegistry const&,
-                                         ThinnedAssociationsHelper&) { }
+      void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
 
       void registerProductsAndCallbacks(EDAnalyzerBase const* module, ProductRegistry* reg);
-      std::string workerType() const {return "WorkerT<EDAnalyzer>";}
-      
-      SharedResourcesAcquirer& sharedResourcesAcquirer() {
-        return resourcesAcquirer_;
-      }
-      
+      std::string workerType() const { return "WorkerT<EDAnalyzer>"; }
+
+      SharedResourcesAcquirer& sharedResourcesAcquirer() { return resourcesAcquirer_; }
+
       virtual void analyze(Event const&, EventSetup const&) = 0;
       virtual void beginJob() {}
-      virtual void endJob(){}
-      
+      virtual void endJob() {}
+
       virtual void doBeginRun_(Run const& rp, EventSetup const& c);
       virtual void doEndRun_(Run const& rp, EventSetup const& c);
       virtual void doBeginLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c);
@@ -120,14 +117,12 @@ namespace edm {
 
       virtual SharedResourcesAcquirer createAcquirer();
 
-      void setModuleDescription(ModuleDescription const& md) {
-        moduleDescription_ = md;
-      }
+      void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
       ModuleDescription moduleDescription_;
       std::function<void(BranchDescription const&)> callWhenNewProductsRegistered_;
-      
+
       SharedResourcesAcquirer resourcesAcquirer_;
     };
-  }
-}
+  }  // namespace one
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/one/EDFilter.h b/FWCore/Framework/interface/one/EDFilter.h
index 025145ed28252..f578273cc20b7 100644
--- a/FWCore/Framework/interface/one/EDFilter.h
+++ b/FWCore/Framework/interface/one/EDFilter.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::one::EDFilter
-// 
+//
 /**\class edm::one::EDFilter EDFilter.h "FWCore/Framework/interface/one/EDFilter.h"
 
  Description: [one line class summary]
@@ -26,54 +26,43 @@
 // forward declarations
 namespace edm {
   namespace one {
-    template< typename... T>
-    class EDFilter : public filter::AbilityToImplementor<T>::Type...,
-                       public virtual EDFilterBase {
-      
+    template <typename... T>
+    class EDFilter : public filter::AbilityToImplementor<T>::Type..., public virtual EDFilterBase {
     public:
-      static_assert(not (CheckAbility<module::Abilities::kRunCache,T...>::kHasIt and
-                      CheckAbility<module::Abilities::kOneWatchRuns,T...>::kHasIt),
-                 "Cannot use both WatchRuns and RunCache");
-      static_assert(not (CheckAbility<module::Abilities::kLuminosityBlockCache,T...>::kHasIt and
-                      CheckAbility<module::Abilities::kOneWatchLuminosityBlocks,T...>::kHasIt),
-                 "Cannot use both WatchLuminosityBlocks and LuminosityBLockCache");
+      static_assert(not(CheckAbility<module::Abilities::kRunCache, T...>::kHasIt and
+                        CheckAbility<module::Abilities::kOneWatchRuns, T...>::kHasIt),
+                    "Cannot use both WatchRuns and RunCache");
+      static_assert(not(CheckAbility<module::Abilities::kLuminosityBlockCache, T...>::kHasIt and
+                        CheckAbility<module::Abilities::kOneWatchLuminosityBlocks, T...>::kHasIt),
+                    "Cannot use both WatchLuminosityBlocks and LuminosityBLockCache");
       EDFilter() = default;
       //virtual ~EDFilter();
-      
+
       // ---------- const member functions ---------------------
-      bool wantsGlobalRuns() const final {
-        return WantsGlobalRunTransitions<T...>::value;
-      }
-      bool wantsGlobalLuminosityBlocks() const final {
-        return WantsGlobalLuminosityBlockTransitions<T...>::value;
-      }
+      bool wantsGlobalRuns() const final { return WantsGlobalRunTransitions<T...>::value; }
+      bool wantsGlobalLuminosityBlocks() const final { return WantsGlobalLuminosityBlockTransitions<T...>::value; }
 
-      bool hasAbilityToProduceInRuns() const final {
-        return HasAbilityToProduceInRuns<T...>::value;
-      }
+      bool hasAbilityToProduceInRuns() const final { return HasAbilityToProduceInRuns<T...>::value; }
 
-      bool hasAbilityToProduceInLumis() const final {
-        return HasAbilityToProduceInLumis<T...>::value;
-      }
+      bool hasAbilityToProduceInLumis() const final { return HasAbilityToProduceInLumis<T...>::value; }
 
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
-      SerialTaskQueue* globalRunsQueue() final { return globalRunsQueue_.queue();}
-      SerialTaskQueue* globalLuminosityBlocksQueue() final { return globalLuminosityBlocksQueue_.queue();}
+      SerialTaskQueue* globalRunsQueue() final { return globalRunsQueue_.queue(); }
+      SerialTaskQueue* globalLuminosityBlocksQueue() final { return globalLuminosityBlocksQueue_.queue(); }
 
     private:
       EDFilter(const EDFilter&) = delete;
       const EDFilter& operator=(const EDFilter&) = delete;
-      
+
       // ---------- member data --------------------------------
       impl::OptionalSerialTaskQueueHolder<WantsSerialGlobalRunTransitions<T...>::value> globalRunsQueue_;
-      impl::OptionalSerialTaskQueueHolder<WantsSerialGlobalLuminosityBlockTransitions<T...>::value> globalLuminosityBlocksQueue_;
-
+      impl::OptionalSerialTaskQueueHolder<WantsSerialGlobalLuminosityBlockTransitions<T...>::value>
+          globalLuminosityBlocksQueue_;
     };
-    
-  }
-}
 
+  }  // namespace one
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/one/EDFilterBase.h b/FWCore/Framework/interface/one/EDFilterBase.h
index 01b7565acf27e..2d9a613825c26 100644
--- a/FWCore/Framework/interface/one/EDFilterBase.h
+++ b/FWCore/Framework/interface/one/EDFilterBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     one::EDFilterBase
-// 
+//
 /**\class one::EDFilterBase EDFilterBase.h "FWCore/Framework/interface/one/EDFilterBase.h"
 
  Description: Base class for edm::one::EDFilter<>
@@ -37,25 +37,25 @@ namespace edm {
   class ProductRegistry;
   class ThinnedAssociationsHelper;
   class WaitingTask;
-  
+
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
   }
 
   namespace one {
 
-    class EDFilterBase : public ProducerBase, public EDConsumerBase
-    {
-      
+    class EDFilterBase : public ProducerBase, public EDConsumerBase {
     public:
-      template <typename T> friend class edm::maker::ModuleHolderT;
-      template <typename T> friend class edm::WorkerT;
+      template <typename T>
+      friend class edm::maker::ModuleHolderT;
+      template <typename T>
+      friend class edm::WorkerT;
       typedef EDFilterBase ModuleType;
 
-      
       EDFilterBase();
       ~EDFilterBase() override;
-      
+
       static void fillDescriptions(ConfigurationDescriptions& descriptions);
       static void prevalidate(ConfigurationDescriptions& descriptions);
       static const std::string& baseType();
@@ -63,53 +63,50 @@ namespace edm {
       // Warning: the returned moduleDescription will be invalid during construction
       ModuleDescription const& moduleDescription() const { return moduleDescription_; }
 
-      virtual bool wantsGlobalRuns() const =0;
-      virtual bool wantsGlobalLuminosityBlocks() const =0;
-      bool wantsStreamRuns() const {return false;}
-      bool wantsStreamLuminosityBlocks() const {return false;};
+      virtual bool wantsGlobalRuns() const = 0;
+      virtual bool wantsGlobalLuminosityBlocks() const = 0;
+      bool wantsStreamRuns() const { return false; }
+      bool wantsStreamLuminosityBlocks() const { return false; };
 
       virtual SerialTaskQueue* globalRunsQueue();
       virtual SerialTaskQueue* globalLuminosityBlocksQueue();
 
     private:
-      bool doEvent(EventPrincipal const& ep, EventSetupImpl const&  c,
-                   ActivityRegistry*,
-                   ModuleCallingContext const*);
+      bool doEvent(EventPrincipal const& ep, EventSetupImpl const& c, ActivityRegistry*, ModuleCallingContext const*);
       //For now this is a placeholder
-      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
+      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                                    ModuleCallingContext const& iModuleCallingContext,
+                                                    Principal const& iPrincipal) const {}
 
       void doPreallocate(PreallocationConfiguration const&);
       virtual void preallocLumis(unsigned int);
       void doBeginJob();
       void doEndJob();
-      
-      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                      ModuleCallingContext const*);
-      void doEndRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                    ModuleCallingContext const*);
-      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+
+      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                  EventSetupImpl const& c,
                                   ModuleCallingContext const*);
-      void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                EventSetupImpl const& c,
                                 ModuleCallingContext const*);
-      
+
       //For now, the following are just dummy implemenations with no ability for users to override
       void doRespondToOpenInputFile(FileBlock const& fb);
       void doRespondToCloseInputFile(FileBlock const& fb);
-      void doRegisterThinnedAssociations(ProductRegistry const&,
-                                         ThinnedAssociationsHelper&) { }
+      void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
 
       void registerProductsAndCallbacks(EDFilterBase* module, ProductRegistry* reg) {
         registerProducts(module, reg, moduleDescription_);
       }
-      std::string workerType() const {return "WorkerT<EDFilter>";}
-      
-      SharedResourcesAcquirer& sharedResourcesAcquirer() {
-        return resourcesAcquirer_;
-      }
-      
+      std::string workerType() const { return "WorkerT<EDFilter>"; }
+
+      SharedResourcesAcquirer& sharedResourcesAcquirer() { return resourcesAcquirer_; }
+
       virtual bool filter(Event&, EventSetup const&) = 0;
       virtual void beginJob() {}
-      virtual void endJob(){}
+      virtual void endJob() {}
 
       virtual void preallocThreads(unsigned int) {}
 
@@ -128,18 +125,15 @@ namespace edm {
 
       virtual SharedResourcesAcquirer createAcquirer();
 
-      void setModuleDescription(ModuleDescription const& md) {
-        moduleDescription_ = md;
-      }
+      void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
       ModuleDescription moduleDescription_;
       std::vector<BranchID> previousParentage_;
       ParentageID previousParentageId_;
 
       SharedResourcesAcquirer resourcesAcquirer_;
     };
-    
-  }
-}
 
+  }  // namespace one
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/one/EDProducer.h b/FWCore/Framework/interface/one/EDProducer.h
index e223beca8eb46..6e85245d6907b 100644
--- a/FWCore/Framework/interface/one/EDProducer.h
+++ b/FWCore/Framework/interface/one/EDProducer.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::one::EDProducer
-// 
+//
 /**\class edm::one::EDProducer EDProducer.h "FWCore/Framework/interface/one/EDProducer.h"
 
  Description: [one line class summary]
@@ -26,57 +26,48 @@
 // forward declarations
 namespace edm {
   namespace one {
-    template< typename... T>
-    class EDProducer : public virtual EDProducerBase,
-                       public producer::AbilityToImplementor<T>::Type... { 
+    template <typename... T>
+    class EDProducer : public virtual EDProducerBase, public producer::AbilityToImplementor<T>::Type... {
     public:
-      static_assert(not (CheckAbility<module::Abilities::kRunCache,T...>::kHasIt and
-                      CheckAbility<module::Abilities::kOneWatchRuns,T...>::kHasIt),
-                 "Cannot use both WatchRuns and RunCache");
-      static_assert(not (CheckAbility<module::Abilities::kLuminosityBlockCache,T...>::kHasIt and
-                      CheckAbility<module::Abilities::kOneWatchLuminosityBlocks,T...>::kHasIt),
-                 "Cannot use both WatchLuminosityBlocks and LuminosityBLockCache");
+      static_assert(not(CheckAbility<module::Abilities::kRunCache, T...>::kHasIt and
+                        CheckAbility<module::Abilities::kOneWatchRuns, T...>::kHasIt),
+                    "Cannot use both WatchRuns and RunCache");
+      static_assert(not(CheckAbility<module::Abilities::kLuminosityBlockCache, T...>::kHasIt and
+                        CheckAbility<module::Abilities::kOneWatchLuminosityBlocks, T...>::kHasIt),
+                    "Cannot use both WatchLuminosityBlocks and LuminosityBLockCache");
 
       EDProducer() = default;
 #ifdef __INTEL_COMPILER
       virtual ~EDProducer() = default;
 #endif
       //
-      
+
       // ---------- const member functions ---------------------
-      bool wantsGlobalRuns() const final {
-        return WantsGlobalRunTransitions<T...>::value;
-      }
-      bool wantsGlobalLuminosityBlocks() const final {
-        return WantsGlobalLuminosityBlockTransitions<T...>::value;
-      }
+      bool wantsGlobalRuns() const final { return WantsGlobalRunTransitions<T...>::value; }
+      bool wantsGlobalLuminosityBlocks() const final { return WantsGlobalLuminosityBlockTransitions<T...>::value; }
 
-      bool hasAbilityToProduceInRuns() const final {
-        return HasAbilityToProduceInRuns<T...>::value;
-      }
+      bool hasAbilityToProduceInRuns() const final { return HasAbilityToProduceInRuns<T...>::value; }
 
-      bool hasAbilityToProduceInLumis() const final {
-        return HasAbilityToProduceInLumis<T...>::value;
-      }
+      bool hasAbilityToProduceInLumis() const final { return HasAbilityToProduceInLumis<T...>::value; }
 
-      SerialTaskQueue* globalRunsQueue() final { return globalRunsQueue_.queue();}
-      SerialTaskQueue* globalLuminosityBlocksQueue() final { return globalLuminosityBlocksQueue_.queue();}
+      SerialTaskQueue* globalRunsQueue() final { return globalRunsQueue_.queue(); }
+      SerialTaskQueue* globalLuminosityBlocksQueue() final { return globalLuminosityBlocksQueue_.queue(); }
 
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
-      
+
     private:
       EDProducer(const EDProducer&) = delete;
       const EDProducer& operator=(const EDProducer&) = delete;
-      
+
       // ---------- member data --------------------------------
       impl::OptionalSerialTaskQueueHolder<WantsSerialGlobalRunTransitions<T...>::value> globalRunsQueue_;
-      impl::OptionalSerialTaskQueueHolder<WantsSerialGlobalLuminosityBlockTransitions<T...>::value> globalLuminosityBlocksQueue_;
+      impl::OptionalSerialTaskQueueHolder<WantsSerialGlobalLuminosityBlockTransitions<T...>::value>
+          globalLuminosityBlocksQueue_;
     };
-    
-  }
-}
 
+  }  // namespace one
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/one/EDProducerBase.h b/FWCore/Framework/interface/one/EDProducerBase.h
index db15f02a7f49b..f0cf701f10e41 100644
--- a/FWCore/Framework/interface/one/EDProducerBase.h
+++ b/FWCore/Framework/interface/one/EDProducerBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     one::EDProducerBase
-// 
+//
 /**\class one::EDProducerBase EDProducerBase.h "FWCore/Framework/interface/one/EDProducerBase.h"
 
  Description: Base class for edm::one::EDProducer<>
@@ -39,23 +39,23 @@ namespace edm {
   class WaitingTask;
 
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
   }
 
   namespace one {
 
-    class EDProducerBase : public ProducerBase, public EDConsumerBase
-    {
-      
+    class EDProducerBase : public ProducerBase, public EDConsumerBase {
     public:
-      template <typename T> friend class edm::maker::ModuleHolderT;
-      template <typename T> friend class edm::WorkerT;
+      template <typename T>
+      friend class edm::maker::ModuleHolderT;
+      template <typename T>
+      friend class edm::WorkerT;
       typedef EDProducerBase ModuleType;
 
-      
       EDProducerBase();
       ~EDProducerBase() override;
-      
+
       static void fillDescriptions(ConfigurationDescriptions& descriptions);
       static void prevalidate(ConfigurationDescriptions& descriptions);
       static const std::string& baseType();
@@ -63,53 +63,50 @@ namespace edm {
       // Warning: the returned moduleDescription will be invalid during construction
       ModuleDescription const& moduleDescription() const { return moduleDescription_; }
 
-      virtual bool wantsGlobalRuns() const =0;
-      virtual bool wantsGlobalLuminosityBlocks() const =0;
-      bool wantsStreamRuns() const {return false;}
-      bool wantsStreamLuminosityBlocks() const {return false;};
+      virtual bool wantsGlobalRuns() const = 0;
+      virtual bool wantsGlobalLuminosityBlocks() const = 0;
+      bool wantsStreamRuns() const { return false; }
+      bool wantsStreamLuminosityBlocks() const { return false; };
 
       virtual SerialTaskQueue* globalRunsQueue();
       virtual SerialTaskQueue* globalLuminosityBlocksQueue();
 
     private:
-      bool doEvent(EventPrincipal const& ep, EventSetupImpl const&  c,
-                   ActivityRegistry*,
-                   ModuleCallingContext const*);
+      bool doEvent(EventPrincipal const& ep, EventSetupImpl const& c, ActivityRegistry*, ModuleCallingContext const*);
       //For now this is a placeholder
-      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
+      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                                    ModuleCallingContext const& iModuleCallingContext,
+                                                    Principal const& iPrincipal) const {}
 
       void doPreallocate(PreallocationConfiguration const&);
       virtual void preallocLumis(unsigned int);
       void doBeginJob();
       void doEndJob();
 
-      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                      ModuleCallingContext const*);
-      void doEndRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                    ModuleCallingContext const*);
-      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                  EventSetupImpl const& c,
                                   ModuleCallingContext const*);
-      void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                EventSetupImpl const& c,
                                 ModuleCallingContext const*);
 
       //For now, the following are just dummy implemenations with no ability for users to override
       void doRespondToOpenInputFile(FileBlock const& fb);
       void doRespondToCloseInputFile(FileBlock const& fb);
-      void doRegisterThinnedAssociations(ProductRegistry const&,
-                                         ThinnedAssociationsHelper&) { }
+      void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
 
       void registerProductsAndCallbacks(EDProducerBase* module, ProductRegistry* reg) {
         registerProducts(module, reg, moduleDescription_);
       }
-      std::string workerType() const {return "WorkerT<EDProducer>";}
-      
-      SharedResourcesAcquirer& sharedResourcesAcquirer() {
-        return resourcesAcquirer_;
-      }
-      
+      std::string workerType() const { return "WorkerT<EDProducer>"; }
+
+      SharedResourcesAcquirer& sharedResourcesAcquirer() { return resourcesAcquirer_; }
+
       virtual void produce(Event&, EventSetup const&) = 0;
       virtual void beginJob() {}
-      virtual void endJob(){}
+      virtual void endJob() {}
 
       virtual void preallocThreads(unsigned int) {}
 
@@ -128,19 +125,16 @@ namespace edm {
       bool hasAcquire() const { return false; }
 
       virtual SharedResourcesAcquirer createAcquirer();
-      
-      void setModuleDescription(ModuleDescription const& md) {
-        moduleDescription_ = md;
-      }
+
+      void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
       ModuleDescription moduleDescription_;
       std::vector<BranchID> previousParentage_;
       ParentageID previousParentageId_;
 
       SharedResourcesAcquirer resourcesAcquirer_;
     };
-    
-  }
-}
 
+  }  // namespace one
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/one/OutputModule.h b/FWCore/Framework/interface/one/OutputModule.h
index c89efe7aad14b..0cfff45568ded 100644
--- a/FWCore/Framework/interface/one/OutputModule.h
+++ b/FWCore/Framework/interface/one/OutputModule.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::one::OutputModule
-// 
+//
 /**\class edm::one::OutputModule OutputModule.h "FWCore/Framework/interface/one/OutputModule.h"
 
  Description: [one line class summary]
@@ -26,15 +26,11 @@
 // forward declarations
 namespace edm {
   namespace one {
-    template< typename... T>
-    class OutputModule : public virtual OutputModuleBase,
-        public outputmodule::AbilityToImplementor<T>::Type...
-    {
-      
+    template <typename... T>
+    class OutputModule : public virtual OutputModuleBase, public outputmodule::AbilityToImplementor<T>::Type... {
     public:
-      OutputModule(edm::ParameterSet const& iPSet): OutputModuleBase(iPSet),
-      outputmodule::AbilityToImplementor<T>::Type(iPSet)...
-       {}
+      OutputModule(edm::ParameterSet const& iPSet)
+          : OutputModuleBase(iPSet), outputmodule::AbilityToImplementor<T>::Type(iPSet)... {}
       // Required to work around ICC bug, but possible source of bloat in gcc.
       // We do this only in the case of the intel compiler as this might end up
       // creating a lot of code bloat due to inline symbols being generated in
@@ -42,33 +38,29 @@ namespace edm {
 #ifdef __INTEL_COMPILER
       virtual ~OutputModule() = default;
 #endif
-      
+
       // ---------- const member functions ---------------------
-      bool wantsGlobalRuns() const final {
-        return WantsGlobalRunTransitions<T...>::value;
-      }
-      bool wantsGlobalLuminosityBlocks() const final {
-        return WantsGlobalLuminosityBlockTransitions<T...>::value;
-      }
+      bool wantsGlobalRuns() const final { return WantsGlobalRunTransitions<T...>::value; }
+      bool wantsGlobalLuminosityBlocks() const final { return WantsGlobalLuminosityBlockTransitions<T...>::value; }
 
-      SerialTaskQueue* globalRunsQueue() final { return globalRunsQueue_.queue();}
-      SerialTaskQueue* globalLuminosityBlocksQueue() final { return globalLuminosityBlocksQueue_.queue();}
+      SerialTaskQueue* globalRunsQueue() final { return globalRunsQueue_.queue(); }
+      SerialTaskQueue* globalLuminosityBlocksQueue() final { return globalLuminosityBlocksQueue_.queue(); }
 
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
-      
+
     private:
-      OutputModule(const OutputModule&) = delete; // stop default
-      
-      const OutputModule& operator=(const OutputModule&) =delete; // stop default
-      
+      OutputModule(const OutputModule&) = delete;  // stop default
+
+      const OutputModule& operator=(const OutputModule&) = delete;  // stop default
+
       // ---------- member data --------------------------------
       impl::OptionalSerialTaskQueueHolder<WantsSerialGlobalRunTransitions<T...>::value> globalRunsQueue_;
-      impl::OptionalSerialTaskQueueHolder<WantsSerialGlobalLuminosityBlockTransitions<T...>::value> globalLuminosityBlocksQueue_;
-      
+      impl::OptionalSerialTaskQueueHolder<WantsSerialGlobalLuminosityBlockTransitions<T...>::value>
+          globalLuminosityBlocksQueue_;
     };
-  }
-}
+  }  // namespace one
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/one/OutputModuleBase.h b/FWCore/Framework/interface/one/OutputModuleBase.h
index 8e85a00a1fc14..8a5442ca8e800 100644
--- a/FWCore/Framework/interface/one/OutputModuleBase.h
+++ b/FWCore/Framework/interface/one/OutputModuleBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     OutputModuleBase
-// 
+//
 /**\class OutputModuleBase OutputModuleBase.h "FWCore/Framework/interface/one/OutputModuleBase.h"
 
  Description: Base class for all 'one' OutputModules
@@ -55,109 +55,106 @@ namespace edm {
   class SubProcessParentageHelper;
   class WaitingTask;
 
-  template <typename T> class OutputModuleCommunicatorT;
-  
+  template <typename T>
+  class OutputModuleCommunicatorT;
+
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
   }
 
   namespace one {
-    
+
     class OutputModuleBase : public EDConsumerBase {
     public:
-      template <typename U> friend class edm::maker::ModuleHolderT;
-      template <typename T> friend class ::edm::WorkerT;
-      template <typename T> friend class ::edm::OutputModuleCommunicatorT;
+      template <typename U>
+      friend class edm::maker::ModuleHolderT;
+      template <typename T>
+      friend class ::edm::WorkerT;
+      template <typename T>
+      friend class ::edm::OutputModuleCommunicatorT;
       typedef OutputModuleBase ModuleType;
-      
+
       explicit OutputModuleBase(ParameterSet const& pset);
       ~OutputModuleBase() override;
-      
-      OutputModuleBase(OutputModuleBase const&) = delete; // Disallow copying and moving
-      OutputModuleBase& operator=(OutputModuleBase const&) = delete; // Disallow copying and moving
-      
+
+      OutputModuleBase(OutputModuleBase const&) = delete;             // Disallow copying and moving
+      OutputModuleBase& operator=(OutputModuleBase const&) = delete;  // Disallow copying and moving
+
       /// Accessor for maximum number of events to be written.
       /// -1 is used for unlimited.
-      int maxEvents() const {return maxEvents_;}
-      
+      int maxEvents() const { return maxEvents_; }
+
       /// Accessor for remaining number of events to be written.
       /// -1 is used for unlimited.
-      int remainingEvents() const {return remainingEvents_;}
-      
+      int remainingEvents() const { return remainingEvents_; }
+
       bool selected(BranchDescription const& desc) const;
-      
+
       void selectProducts(ProductRegistry const& preg, ThinnedAssociationsHelper const&);
-      std::string const& processName() const {return process_name_;}
-      SelectedProductsForBranchType const& keptProducts() const {return keptProducts_;}
-      std::array<bool, NumBranchTypes> const& hasNewlyDroppedBranch() const {return hasNewlyDroppedBranch_;}
-      
-      static void fillDescription(ParameterSetDescription & desc);
+      std::string const& processName() const { return process_name_; }
+      SelectedProductsForBranchType const& keptProducts() const { return keptProducts_; }
+      std::array<bool, NumBranchTypes> const& hasNewlyDroppedBranch() const { return hasNewlyDroppedBranch_; }
+
+      static void fillDescription(ParameterSetDescription& desc);
       static void fillDescriptions(ConfigurationDescriptions& descriptions);
       static const std::string& baseType();
-      static void prevalidate(ConfigurationDescriptions& );
-      
+      static void prevalidate(ConfigurationDescriptions&);
+
       //Output modules always need writeRun and writeLumi to be called
       virtual bool wantsGlobalRuns() const = 0;
       virtual bool wantsGlobalLuminosityBlocks() const = 0;
-      bool wantsStreamRuns() const {return false;}
-      bool wantsStreamLuminosityBlocks() const {return false;};
+      bool wantsStreamRuns() const { return false; }
+      bool wantsStreamLuminosityBlocks() const { return false; };
 
       virtual SerialTaskQueue* globalRunsQueue() { return nullptr; }
       virtual SerialTaskQueue* globalLuminosityBlocksQueue() { return nullptr; }
-      SharedResourcesAcquirer& sharedResourcesAcquirer() {
-        return resourcesAcquirer_;
-      }
+      SharedResourcesAcquirer& sharedResourcesAcquirer() { return resourcesAcquirer_; }
+
+      bool wantAllEvents() const { return wantAllEvents_; }
 
-      bool wantAllEvents() const {return wantAllEvents_;}
-      
       BranchIDLists const* branchIDLists();
 
       ThinnedAssociationsHelper const* thinnedAssociationsHelper() const;
 
-      SubProcessParentageHelper const* subProcessParentageHelper() const {
-         return subProcessParentageHelper_;
-      }
+      SubProcessParentageHelper const* subProcessParentageHelper() const { return subProcessParentageHelper_; }
+
+      const ModuleDescription& moduleDescription() const { return moduleDescription_; }
 
-      const ModuleDescription& moduleDescription() const {
-        return moduleDescription_;
-      }
     protected:
-      
       ModuleDescription const& description() const;
-      
+
       ParameterSetID selectorConfig() const { return selector_config_id_; }
 
       void doPreallocate(PreallocationConfiguration const&);
-      virtual void preallocLumis(unsigned int) ;
+      virtual void preallocLumis(unsigned int);
 
       void doBeginJob();
       void doEndJob();
-      bool doEvent(EventPrincipal const& ep, EventSetupImpl const&  c,
-                   ActivityRegistry*,
-                   ModuleCallingContext const*);
-      bool doBeginRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                      ModuleCallingContext const*);
-      bool doEndRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                    ModuleCallingContext const*);
-      bool doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      bool doEvent(EventPrincipal const& ep, EventSetupImpl const& c, ActivityRegistry*, ModuleCallingContext const*);
+      bool doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      bool doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*);
+      bool doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                  EventSetupImpl const& c,
                                   ModuleCallingContext const*);
-      bool doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
+      bool doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                EventSetupImpl const& c,
                                 ModuleCallingContext const*);
-      
-      void setEventSelectionInfo(std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
-                                 bool anyProductProduced);
-      
+
+      void setEventSelectionInfo(
+          std::map<std::string, std::vector<std::pair<std::string, int>>> const& outputModulePathPositions,
+          bool anyProductProduced);
+
       void configure(OutputModuleDescription const& desc);
-      
+
       std::map<BranchID::value_type, BranchID::value_type> const& droppedBranchIDToKeptBranchID() {
         return droppedBranchIDToKeptBranchID_;
       }
-      
+
     private:
-      
       int maxEvents_;
       std::atomic<int> remainingEvents_;
-      
+
       // TODO: Give OutputModule
       // an interface (protected?) that supplies client code with the
       // needed functionality *without* giving away implementation
@@ -168,26 +165,26 @@ namespace edm {
       // clients (classes derived from OutputModule) to use the
       // newly-introduced interface.
       // TODO: Consider using shared pointers here?
-      
+
       // keptProducts_ are pointers to the BranchDescription objects describing
       // the branches we are to write.
       //
       // We do not own the BranchDescriptions to which we point.
       SelectedProductsForBranchType keptProducts_;
       std::array<bool, NumBranchTypes> hasNewlyDroppedBranch_;
-      
+
       std::string process_name_;
       ProductSelectorRules productSelectorRules_;
       ProductSelector productSelector_;
       ModuleDescription moduleDescription_;
-      
+
       bool wantAllEvents_;
       std::vector<detail::TriggerResultsBasedEventSelector> selectors_;
       ParameterSet selectEvents_;
       // ID of the ParameterSet that configured the event selector
       // subsystem.
       ParameterSetID selector_config_id_;
-      
+
       // needed because of possible EDAliases.
       // filled in only if key and value are different.
       std::map<BranchID::value_type, BranchID::value_type> droppedBranchIDToKeptBranchID_;
@@ -206,50 +203,50 @@ namespace edm {
       //------------------------------------------------------------------
       // private member functions
       //------------------------------------------------------------------
-      
+
       virtual SharedResourcesAcquirer createAcquirer();
-      
+
       void doWriteRun(RunPrincipal const& rp, ModuleCallingContext const*, MergeableRunProductMetadata const*);
       void doWriteLuminosityBlock(LuminosityBlockPrincipal const& lbp, ModuleCallingContext const*);
       void doOpenFile(FileBlock const& fb);
       void doRespondToOpenInputFile(FileBlock const& fb);
       void doRespondToCloseInputFile(FileBlock const& fb);
-      void doRegisterThinnedAssociations(ProductRegistry const&,
-                                         ThinnedAssociationsHelper&) { }
+      void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
+
+      std::string workerType() const { return "WorkerT<edm::one::OutputModuleBase>"; }
 
-      std::string workerType() const {return "WorkerT<edm::one::OutputModuleBase>";}
-      
       /// Tell the OutputModule that is must end the current file.
       void doCloseFile();
-      
+
       void registerProductsAndCallbacks(OutputModuleBase const*, ProductRegistry const*) {}
 
       bool needToRunSelection() const;
       std::vector<ProductResolverIndexAndSkipBit> productsUsedBySelection() const;
       bool prePrefetchSelection(StreamID id, EventPrincipal const&, ModuleCallingContext const*);
-      
+
       // Do the end-of-file tasks; this is only called internally, after
       // the appropriate tests have been done.
       virtual void reallyCloseFile();
-      
-      
+
       /// Ask the OutputModule if we should end the current file.
-      virtual bool shouldWeCloseFile() const {return false;}
-      
+      virtual bool shouldWeCloseFile() const { return false; }
+
       virtual void write(EventForOutput const&) = 0;
-      virtual void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
+      virtual void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                                ModuleCallingContext const& iModuleCallingContext,
+                                                Principal const& iPrincipal) const {}
 
-      virtual void beginJob(){}
-      virtual void endJob(){}
+      virtual void beginJob() {}
+      virtual void endJob() {}
       virtual void writeLuminosityBlock(LuminosityBlockForOutput const&) = 0;
       virtual void writeRun(RunForOutput const&) = 0;
       virtual void openFile(FileBlock const&) {}
       virtual bool isFileOpen() const { return true; }
-      
-      virtual void doBeginRun_(RunForOutput const&){}
-      virtual void doEndRun_(RunForOutput const& ){}
-      virtual void doBeginLuminosityBlock_(LuminosityBlockForOutput const&){}
-      virtual void doEndLuminosityBlock_(LuminosityBlockForOutput const&){}
+
+      virtual void doBeginRun_(RunForOutput const&) {}
+      virtual void doEndRun_(RunForOutput const&) {}
+      virtual void doBeginLuminosityBlock_(LuminosityBlockForOutput const&) {}
+      virtual void doEndLuminosityBlock_(LuminosityBlockForOutput const&) {}
       virtual void doRespondToOpenInputFile_(FileBlock const&) {}
       virtual void doRespondToCloseInputFile_(FileBlock const&) {}
 
@@ -262,12 +259,10 @@ namespace edm {
                           std::map<BranchID, BranchDescription const*>& trueBranchIDToKeptBranchDesc,
                           std::set<BranchID>& keptProductsInEvent);
 
-      void setModuleDescription(ModuleDescription const& md) {
-        moduleDescription_ = md;
-      }
-      
-      bool limitReached() const {return remainingEvents_ == 0;}
+      void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
+
+      bool limitReached() const { return remainingEvents_ == 0; }
     };
-  }
-}
+  }  // namespace one
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/one/analyzerAbilityToImplementor.h b/FWCore/Framework/interface/one/analyzerAbilityToImplementor.h
index 250da72b11046..3806e0695d12d 100644
--- a/FWCore/Framework/interface/one/analyzerAbilityToImplementor.h
+++ b/FWCore/Framework/interface/one/analyzerAbilityToImplementor.h
@@ -4,7 +4,7 @@
 //
 // Package:     Package
 // Class  :     analyzer::AbilityToImplementor
-// 
+//
 /**\class analyzer::AbilityToImplementor analyzerAbilityToImplementor.h "FWCore/Framework/interface/one/analyzerAbilityToImplementor.h"
 
  Description: [one line class summary]
@@ -31,35 +31,35 @@
 namespace edm {
   namespace one {
     namespace analyzer {
-      template<typename T> struct AbilityToImplementor;
-      
-      template<>
+      template <typename T>
+      struct AbilityToImplementor;
+
+      template <>
       struct AbilityToImplementor<edm::one::SharedResources> {
         typedef edm::one::impl::SharedResourcesUser<edm::one::EDAnalyzerBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::one::WatchRuns> {
         typedef edm::one::impl::RunWatcher<edm::one::EDAnalyzerBase> Type;
       };
 
-      template<>
+      template <>
       struct AbilityToImplementor<edm::one::WatchLuminosityBlocks> {
         typedef edm::one::impl::LuminosityBlockWatcher<edm::one::EDAnalyzerBase> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::RunCache<C>> {
-        typedef edm::one::impl::RunCacheHolder<edm::one::EDAnalyzerBase,C> Type;
+        typedef edm::one::impl::RunCacheHolder<edm::one::EDAnalyzerBase, C> Type;
       };
 
-      template<typename C>
+      template <typename C>
       struct AbilityToImplementor<edm::LuminosityBlockCache<C>> {
-        typedef edm::one::impl::LuminosityBlockCacheHolder<edm::one::EDAnalyzerBase,C> Type;
+        typedef edm::one::impl::LuminosityBlockCacheHolder<edm::one::EDAnalyzerBase, C> Type;
       };
-    }
-  }
-}
-
+    }  // namespace analyzer
+  }    // namespace one
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/one/filterAbilityToImplementor.h b/FWCore/Framework/interface/one/filterAbilityToImplementor.h
index f7ab686045dc8..9998502c3e523 100644
--- a/FWCore/Framework/interface/one/filterAbilityToImplementor.h
+++ b/FWCore/Framework/interface/one/filterAbilityToImplementor.h
@@ -4,7 +4,7 @@
 //
 // Package:     Package
 // Class  :     filter::AbilityToImplementor
-// 
+//
 /**\class filter::AbilityToImplementor filterAbilityToImplementor.h "FWCore/Framework/interface/one/filterAbilityToImplementor.h"
 
  Description: [one line class summary]
@@ -31,56 +31,56 @@
 namespace edm {
   namespace one {
     namespace filter {
-      template<typename T> struct AbilityToImplementor;
-      
-      template<>
+      template <typename T>
+      struct AbilityToImplementor;
+
+      template <>
       struct AbilityToImplementor<edm::one::SharedResources> {
         typedef edm::one::impl::SharedResourcesUser<edm::one::EDFilterBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::one::WatchRuns> {
         typedef edm::one::impl::RunWatcher<edm::one::EDFilterBase> Type;
       };
 
-      template<>
+      template <>
       struct AbilityToImplementor<edm::one::WatchLuminosityBlocks> {
         typedef edm::one::impl::LuminosityBlockWatcher<edm::one::EDFilterBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::BeginRunProducer> {
         typedef edm::one::impl::BeginRunProducer<edm::one::EDFilterBase> Type;
       };
 
-      template<>
+      template <>
       struct AbilityToImplementor<edm::EndRunProducer> {
         typedef edm::one::impl::EndRunProducer<edm::one::EDFilterBase> Type;
       };
 
-      template<>
+      template <>
       struct AbilityToImplementor<edm::BeginLuminosityBlockProducer> {
         typedef edm::one::impl::BeginLuminosityBlockProducer<edm::one::EDFilterBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::EndLuminosityBlockProducer> {
         typedef edm::one::impl::EndLuminosityBlockProducer<edm::one::EDFilterBase> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::RunCache<C>> {
-        typedef edm::one::impl::RunCacheHolder<edm::one::EDFilterBase,C> Type;
+        typedef edm::one::impl::RunCacheHolder<edm::one::EDFilterBase, C> Type;
       };
 
-      template<typename C>
+      template <typename C>
       struct AbilityToImplementor<edm::LuminosityBlockCache<C>> {
-        typedef edm::one::impl::LuminosityBlockCacheHolder<edm::one::EDFilterBase,C> Type;
+        typedef edm::one::impl::LuminosityBlockCacheHolder<edm::one::EDFilterBase, C> Type;
       };
 
-    }
-  }
-}
-
+    }  // namespace filter
+  }    // namespace one
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/one/implementors.h b/FWCore/Framework/interface/one/implementors.h
index d5e3fa4786dd7..52b58236039ef 100644
--- a/FWCore/Framework/interface/one/implementors.h
+++ b/FWCore/Framework/interface/one/implementors.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     implementors
-// 
+//
 /**\file implementors.h "FWCore/Framework/interface/one/implementors.h"
 
  Description: Base classes used to implement the interfaces for the edm::one::* module  abilities
@@ -33,206 +33,202 @@
 // forward declarations
 
 namespace edm {
-   class SharedResourcesAcquirer;
-   
-   namespace one {
-      namespace impl {
-         template<bool V>
-         struct OptionalSerialTaskQueueHolder;
-         
-         template<>
-         struct OptionalSerialTaskQueueHolder<true> {
-            edm::SerialTaskQueue* queue() { return &queue_;}
-            edm::SerialTaskQueue queue_;
-         };
-
-         template<>
-         struct OptionalSerialTaskQueueHolder<false> {
-            edm::SerialTaskQueue* queue() { return nullptr;}
-         };
-
-         template<typename T>
-         class SharedResourcesUser : public virtual T {
-         public:
-            template< typename... Args>
-            SharedResourcesUser(Args... args) : T(args...) {}
-            SharedResourcesUser(SharedResourcesUser const&) = delete;
-            SharedResourcesUser& operator=(SharedResourcesUser const&) = delete;
-            
-            ~SharedResourcesUser() override {}
-            
-         protected:
-            
-            void usesResource(std::string const& iName);
-            void usesResource();
-         private:
-            SharedResourcesAcquirer createAcquirer() override;
-            std::set<std::string> resourceNames_;
-         };
-         
-         template <typename T>
-         class RunWatcher : public virtual T {
-         public:
-            RunWatcher() = default;
-            RunWatcher(RunWatcher const&) = delete;
-            RunWatcher& operator=(RunWatcher const&) = delete;
-            ~RunWatcher() noexcept(false) override {};
-            
-         private:
-            void doBeginRun_(Run const& rp, EventSetup const& c) final;
-            void doEndRun_(Run const& rp, EventSetup const& c) final;
-
-            
-            virtual void beginRun(edm::Run const&, edm::EventSetup const&) = 0;
-            virtual void endRun(edm::Run const&, edm::EventSetup const&) = 0;
-         };
-         
-         template <typename T>
-         class LuminosityBlockWatcher : public virtual T {
-         public:
-            LuminosityBlockWatcher() = default;
-            LuminosityBlockWatcher(LuminosityBlockWatcher const&) = delete;
-            LuminosityBlockWatcher& operator=(LuminosityBlockWatcher const&) = delete;
-            ~LuminosityBlockWatcher() noexcept(false) override {};
-            
-         private:
-            void doBeginLuminosityBlock_(LuminosityBlock const& rp, EventSetup const& c) final;
-            void doEndLuminosityBlock_(LuminosityBlock const& rp, EventSetup const& c) final;
-
-            virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) = 0;
-            virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) = 0;
-         };
-
-         template <typename T>
-         class BeginRunProducer : public virtual T {
-         public:
-            BeginRunProducer() = default;
-            BeginRunProducer( BeginRunProducer const&) = delete;
-            BeginRunProducer& operator=(BeginRunProducer const&) = delete;
-            ~BeginRunProducer() noexcept(false) override {};
-            
-         private:
-            void doBeginRunProduce_(Run& rp, EventSetup const& c) final;
-
-            virtual void beginRunProduce(edm::Run&, edm::EventSetup const&) = 0;
-         };
-
-         template <typename T>
-         class EndRunProducer : public virtual T {
-         public:
-            EndRunProducer() = default;
-            EndRunProducer( EndRunProducer const&) = delete;
-            EndRunProducer& operator=(EndRunProducer const&) = delete;
-            ~EndRunProducer() noexcept(false) override {};
-            
-         private:
-            
-            void doEndRunProduce_(Run& rp, EventSetup const& c) final;
-
-            virtual void endRunProduce(edm::Run&, edm::EventSetup const&) = 0;
-         };
-
-         template <typename T>
-         class BeginLuminosityBlockProducer : public virtual T {
-         public:
-            BeginLuminosityBlockProducer() = default;
-            BeginLuminosityBlockProducer( BeginLuminosityBlockProducer const&) = delete;
-            BeginLuminosityBlockProducer& operator=(BeginLuminosityBlockProducer const&) = delete;
-            ~BeginLuminosityBlockProducer() noexcept(false) override {};
-
-         private:
-            void doBeginLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c) final;
-
-            virtual void beginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) = 0;
-         };
-         
-         template <typename T>
-         class EndLuminosityBlockProducer : public virtual T {
-         public:
-            EndLuminosityBlockProducer() = default;
-            EndLuminosityBlockProducer( EndLuminosityBlockProducer const&) = delete;
-            EndLuminosityBlockProducer& operator=(EndLuminosityBlockProducer const&) = delete;
-            ~EndLuminosityBlockProducer() noexcept(false) override {};
-            
-         private:
-            void doEndLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c) final;
-
-            virtual void endLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) = 0;
-         };
-         
-         template <typename T, typename C>
-         class RunCacheHolder : public virtual T {
-         public:
-            RunCacheHolder() = default;
-            RunCacheHolder( RunCacheHolder<T,C> const&) = delete;
-            RunCacheHolder<T,C>& operator=(RunCacheHolder<T,C> const&) = delete;
-            ~RunCacheHolder() noexcept(false) override {};
-         protected:
-            C* runCache(edm::RunIndex iID) { return cache_.get(); }
-            C const* runCache(edm::RunIndex iID) const { return cache_.get(); }
-         private:
-            void doBeginRun_(Run const& rp, EventSetup const& c) final {
-               cache_ = globalBeginRun(rp,c);
-            }
-            void doEndRun_(Run const& rp, EventSetup const& c) final {
-               globalEndRun(rp,c);
-               cache_ = nullptr; // propagate_const<T> has no reset() function
-            }
-            
-            virtual std::shared_ptr<C> globalBeginRun(edm::Run const&, edm::EventSetup const&) const = 0;
-            virtual void globalEndRun(edm::Run const&, edm::EventSetup const&) = 0;
-            //When threaded we will have a container for N items whre N is # of simultaneous runs
-            edm::propagate_const<std::shared_ptr<C>> cache_;
-         };
-         
-         template <typename T, typename C>
-         class LuminosityBlockCacheHolder : public virtual T {
-         public:
-            LuminosityBlockCacheHolder() = default;
-            LuminosityBlockCacheHolder( LuminosityBlockCacheHolder<T,C> const&) = delete;
-            LuminosityBlockCacheHolder<T,C>& operator=(LuminosityBlockCacheHolder<T,C> const&) = delete;
-            ~LuminosityBlockCacheHolder() noexcept(false) override {};
-         protected:
-            void preallocLumis(unsigned int iNLumis) final {
-               caches_.reset( new std::shared_ptr<C>[iNLumis]);
-            }
-            
-            C const* luminosityBlockCache(edm::LuminosityBlockIndex iID) const { return caches_[iID].get(); }
-            C* luminosityBlockCache(edm::LuminosityBlockIndex iID) { return caches_[iID].get(); }
-         private:
-            void doBeginLuminosityBlock_(LuminosityBlock const& lp, EventSetup const& c) final {
-               caches_[lp.index()] = globalBeginLuminosityBlock(lp,c);
-            }
-            void doEndLuminosityBlock_(LuminosityBlock const& lp, EventSetup const& c) final {
-               globalEndLuminosityBlock(lp,c);
-               caches_[lp.index()].reset();
-            }
-            
-            virtual std::shared_ptr<C> globalBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const = 0;
-            virtual void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) = 0;
-            std::unique_ptr<std::shared_ptr<C>[]> caches_;
-         };
-
-         template <typename T>
-         class Accumulator : public virtual T {
-         public:
-            Accumulator() = default;
-            Accumulator(Accumulator const&) = delete;
-            Accumulator& operator=(Accumulator const&) = delete;
-            ~Accumulator() noexcept(false) override {};
-
-         private:
-
-            bool hasAccumulator() const override { return true; }
-
-            void produce(Event& ev, EventSetup const& es) final {
-               accumulate(ev, es);
-            }
-
-            virtual void accumulate(Event const& ev, EventSetup const& es) = 0;
-         };
-      }
-   }
-}
+  class SharedResourcesAcquirer;
+
+  namespace one {
+    namespace impl {
+      template <bool V>
+      struct OptionalSerialTaskQueueHolder;
+
+      template <>
+      struct OptionalSerialTaskQueueHolder<true> {
+        edm::SerialTaskQueue* queue() { return &queue_; }
+        edm::SerialTaskQueue queue_;
+      };
+
+      template <>
+      struct OptionalSerialTaskQueueHolder<false> {
+        edm::SerialTaskQueue* queue() { return nullptr; }
+      };
+
+      template <typename T>
+      class SharedResourcesUser : public virtual T {
+      public:
+        template <typename... Args>
+        SharedResourcesUser(Args... args) : T(args...) {}
+        SharedResourcesUser(SharedResourcesUser const&) = delete;
+        SharedResourcesUser& operator=(SharedResourcesUser const&) = delete;
+
+        ~SharedResourcesUser() override {}
+
+      protected:
+        void usesResource(std::string const& iName);
+        void usesResource();
+
+      private:
+        SharedResourcesAcquirer createAcquirer() override;
+        std::set<std::string> resourceNames_;
+      };
+
+      template <typename T>
+      class RunWatcher : public virtual T {
+      public:
+        RunWatcher() = default;
+        RunWatcher(RunWatcher const&) = delete;
+        RunWatcher& operator=(RunWatcher const&) = delete;
+        ~RunWatcher() noexcept(false) override{};
+
+      private:
+        void doBeginRun_(Run const& rp, EventSetup const& c) final;
+        void doEndRun_(Run const& rp, EventSetup const& c) final;
+
+        virtual void beginRun(edm::Run const&, edm::EventSetup const&) = 0;
+        virtual void endRun(edm::Run const&, edm::EventSetup const&) = 0;
+      };
+
+      template <typename T>
+      class LuminosityBlockWatcher : public virtual T {
+      public:
+        LuminosityBlockWatcher() = default;
+        LuminosityBlockWatcher(LuminosityBlockWatcher const&) = delete;
+        LuminosityBlockWatcher& operator=(LuminosityBlockWatcher const&) = delete;
+        ~LuminosityBlockWatcher() noexcept(false) override{};
+
+      private:
+        void doBeginLuminosityBlock_(LuminosityBlock const& rp, EventSetup const& c) final;
+        void doEndLuminosityBlock_(LuminosityBlock const& rp, EventSetup const& c) final;
+
+        virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) = 0;
+        virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) = 0;
+      };
+
+      template <typename T>
+      class BeginRunProducer : public virtual T {
+      public:
+        BeginRunProducer() = default;
+        BeginRunProducer(BeginRunProducer const&) = delete;
+        BeginRunProducer& operator=(BeginRunProducer const&) = delete;
+        ~BeginRunProducer() noexcept(false) override{};
+
+      private:
+        void doBeginRunProduce_(Run& rp, EventSetup const& c) final;
+
+        virtual void beginRunProduce(edm::Run&, edm::EventSetup const&) = 0;
+      };
+
+      template <typename T>
+      class EndRunProducer : public virtual T {
+      public:
+        EndRunProducer() = default;
+        EndRunProducer(EndRunProducer const&) = delete;
+        EndRunProducer& operator=(EndRunProducer const&) = delete;
+        ~EndRunProducer() noexcept(false) override{};
+
+      private:
+        void doEndRunProduce_(Run& rp, EventSetup const& c) final;
+
+        virtual void endRunProduce(edm::Run&, edm::EventSetup const&) = 0;
+      };
+
+      template <typename T>
+      class BeginLuminosityBlockProducer : public virtual T {
+      public:
+        BeginLuminosityBlockProducer() = default;
+        BeginLuminosityBlockProducer(BeginLuminosityBlockProducer const&) = delete;
+        BeginLuminosityBlockProducer& operator=(BeginLuminosityBlockProducer const&) = delete;
+        ~BeginLuminosityBlockProducer() noexcept(false) override{};
+
+      private:
+        void doBeginLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c) final;
+
+        virtual void beginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) = 0;
+      };
+
+      template <typename T>
+      class EndLuminosityBlockProducer : public virtual T {
+      public:
+        EndLuminosityBlockProducer() = default;
+        EndLuminosityBlockProducer(EndLuminosityBlockProducer const&) = delete;
+        EndLuminosityBlockProducer& operator=(EndLuminosityBlockProducer const&) = delete;
+        ~EndLuminosityBlockProducer() noexcept(false) override{};
+
+      private:
+        void doEndLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c) final;
+
+        virtual void endLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) = 0;
+      };
+
+      template <typename T, typename C>
+      class RunCacheHolder : public virtual T {
+      public:
+        RunCacheHolder() = default;
+        RunCacheHolder(RunCacheHolder<T, C> const&) = delete;
+        RunCacheHolder<T, C>& operator=(RunCacheHolder<T, C> const&) = delete;
+        ~RunCacheHolder() noexcept(false) override{};
+
+      protected:
+        C* runCache(edm::RunIndex iID) { return cache_.get(); }
+        C const* runCache(edm::RunIndex iID) const { return cache_.get(); }
+
+      private:
+        void doBeginRun_(Run const& rp, EventSetup const& c) final { cache_ = globalBeginRun(rp, c); }
+        void doEndRun_(Run const& rp, EventSetup const& c) final {
+          globalEndRun(rp, c);
+          cache_ = nullptr;  // propagate_const<T> has no reset() function
+        }
+
+        virtual std::shared_ptr<C> globalBeginRun(edm::Run const&, edm::EventSetup const&) const = 0;
+        virtual void globalEndRun(edm::Run const&, edm::EventSetup const&) = 0;
+        //When threaded we will have a container for N items whre N is # of simultaneous runs
+        edm::propagate_const<std::shared_ptr<C>> cache_;
+      };
+
+      template <typename T, typename C>
+      class LuminosityBlockCacheHolder : public virtual T {
+      public:
+        LuminosityBlockCacheHolder() = default;
+        LuminosityBlockCacheHolder(LuminosityBlockCacheHolder<T, C> const&) = delete;
+        LuminosityBlockCacheHolder<T, C>& operator=(LuminosityBlockCacheHolder<T, C> const&) = delete;
+        ~LuminosityBlockCacheHolder() noexcept(false) override{};
+
+      protected:
+        void preallocLumis(unsigned int iNLumis) final { caches_.reset(new std::shared_ptr<C>[iNLumis]); }
+
+        C const* luminosityBlockCache(edm::LuminosityBlockIndex iID) const { return caches_[iID].get(); }
+        C* luminosityBlockCache(edm::LuminosityBlockIndex iID) { return caches_[iID].get(); }
+
+      private:
+        void doBeginLuminosityBlock_(LuminosityBlock const& lp, EventSetup const& c) final {
+          caches_[lp.index()] = globalBeginLuminosityBlock(lp, c);
+        }
+        void doEndLuminosityBlock_(LuminosityBlock const& lp, EventSetup const& c) final {
+          globalEndLuminosityBlock(lp, c);
+          caches_[lp.index()].reset();
+        }
+
+        virtual std::shared_ptr<C> globalBeginLuminosityBlock(edm::LuminosityBlock const&,
+                                                              edm::EventSetup const&) const = 0;
+        virtual void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) = 0;
+        std::unique_ptr<std::shared_ptr<C>[]> caches_;
+      };
+
+      template <typename T>
+      class Accumulator : public virtual T {
+      public:
+        Accumulator() = default;
+        Accumulator(Accumulator const&) = delete;
+        Accumulator& operator=(Accumulator const&) = delete;
+        ~Accumulator() noexcept(false) override{};
+
+      private:
+        bool hasAccumulator() const override { return true; }
+
+        void produce(Event& ev, EventSetup const& es) final { accumulate(ev, es); }
+
+        virtual void accumulate(Event const& ev, EventSetup const& es) = 0;
+      };
+    }  // namespace impl
+  }    // namespace one
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/one/moduleAbilities.h b/FWCore/Framework/interface/one/moduleAbilities.h
index a2c404b272855..cca4f68d0ec05 100644
--- a/FWCore/Framework/interface/one/moduleAbilities.h
+++ b/FWCore/Framework/interface/one/moduleAbilities.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     moduleAbilities
-// 
+//
 /**\file moduleAbilities moduleAbilities.h "FWCore/Framework/interface/one/moduleAbilities.h"
 
  Description: Template arguments which only apply to one::{Module} classes
@@ -28,51 +28,50 @@
 namespace edm {
   namespace one {
     struct SharedResources {
-      static constexpr module::Abilities kAbilities=module::Abilities::kOneSharedResources;
+      static constexpr module::Abilities kAbilities = module::Abilities::kOneSharedResources;
       typedef module::Empty Type;
     };
 
     struct WatchRuns {
-      static constexpr module::Abilities kAbilities=module::Abilities::kOneWatchRuns;
+      static constexpr module::Abilities kAbilities = module::Abilities::kOneWatchRuns;
       typedef module::Empty Type;
     };
 
     struct WatchLuminosityBlocks {
-      static constexpr module::Abilities kAbilities=module::Abilities::kOneWatchLuminosityBlocks;
+      static constexpr module::Abilities kAbilities = module::Abilities::kOneWatchLuminosityBlocks;
       typedef module::Empty Type;
     };
-    
-    template<typename... VArgs>
+
+    template <typename... VArgs>
     struct WantsGlobalRunTransitions {
-      static constexpr bool value = CheckAbility<module::Abilities::kRunCache,VArgs...>::kHasIt or
-      CheckAbility<module::Abilities::kOneWatchRuns,VArgs...>::kHasIt or
-      CheckAbility<module::Abilities::kBeginRunProducer,VArgs...>::kHasIt or
-      CheckAbility<module::Abilities::kEndRunProducer, VArgs...>::kHasIt;
+      static constexpr bool value = CheckAbility<module::Abilities::kRunCache, VArgs...>::kHasIt or
+                                    CheckAbility<module::Abilities::kOneWatchRuns, VArgs...>::kHasIt or
+                                    CheckAbility<module::Abilities::kBeginRunProducer, VArgs...>::kHasIt or
+                                    CheckAbility<module::Abilities::kEndRunProducer, VArgs...>::kHasIt;
     };
-    
-    template<typename... VArgs>
+
+    template <typename... VArgs>
     struct WantsGlobalLuminosityBlockTransitions {
-      static constexpr bool value = CheckAbility<module::Abilities::kLuminosityBlockCache,VArgs...>::kHasIt or
-      CheckAbility<module::Abilities::kOneWatchLuminosityBlocks,VArgs...>::kHasIt or
-      CheckAbility<module::Abilities::kBeginLuminosityBlockProducer,VArgs...>::kHasIt or
-      CheckAbility<module::Abilities::kEndLuminosityBlockProducer, VArgs...>::kHasIt;
+      static constexpr bool value = CheckAbility<module::Abilities::kLuminosityBlockCache, VArgs...>::kHasIt or
+                                    CheckAbility<module::Abilities::kOneWatchLuminosityBlocks, VArgs...>::kHasIt or
+                                    CheckAbility<module::Abilities::kBeginLuminosityBlockProducer, VArgs...>::kHasIt or
+                                    CheckAbility<module::Abilities::kEndLuminosityBlockProducer, VArgs...>::kHasIt;
     };
 
     //RunCache and LuminosityBlockCache do not require serializing their
     // respective transitions
-    template<typename... VArgs>
+    template <typename... VArgs>
     struct WantsSerialGlobalRunTransitions {
-      static constexpr bool value =
-      WantsGlobalRunTransitions<VArgs...>::value and not CheckAbility<module::Abilities::kRunCache,VArgs...>::kHasIt;
+      static constexpr bool value = WantsGlobalRunTransitions<VArgs...>::value and
+                                    not CheckAbility<module::Abilities::kRunCache, VArgs...>::kHasIt;
     };
 
-    template<typename... VArgs>
+    template <typename... VArgs>
     struct WantsSerialGlobalLuminosityBlockTransitions {
-      static constexpr bool value =
-      WantsGlobalLuminosityBlockTransitions<VArgs...>::value and not CheckAbility<module::Abilities::kLuminosityBlockCache,VArgs...>::kHasIt;
+      static constexpr bool value = WantsGlobalLuminosityBlockTransitions<VArgs...>::value and
+                                    not CheckAbility<module::Abilities::kLuminosityBlockCache, VArgs...>::kHasIt;
     };
-  }
-}
-
+  }  // namespace one
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/one/outputmoduleAbilityToImplementor.h b/FWCore/Framework/interface/one/outputmoduleAbilityToImplementor.h
index 872526277e9f8..62e4aca078729 100644
--- a/FWCore/Framework/interface/one/outputmoduleAbilityToImplementor.h
+++ b/FWCore/Framework/interface/one/outputmoduleAbilityToImplementor.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     outputmodule::AbilityToImplementor
-// 
+//
 /**\class outputmodule::AbilityToImplementor outputmoduleAbilityToImplementor.h "FWCore/Framework/interface/one/outputmoduleAbilityToImplementor.h"
 
  Description: [one line class summary]
@@ -33,95 +33,94 @@
 namespace edm {
   class FileBlock;
   class ModuleCallingContext;
-  
+
   namespace one {
     namespace outputmodule {
       class RunWatcher : public virtual OutputModuleBase {
       public:
-        RunWatcher(edm::ParameterSet const&iPSet): OutputModuleBase(iPSet){}
+        RunWatcher(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {}
         RunWatcher(RunWatcher const&) = delete;
         RunWatcher& operator=(RunWatcher const&) = delete;
-        ~RunWatcher() noexcept(false) override {};
-        
+        ~RunWatcher() noexcept(false) override{};
+
       private:
         void doBeginRun_(RunForOutput const& r) final;
         void doEndRun_(RunForOutput const& r) final;
-        
+
         virtual void beginRun(edm::RunForOutput const&) = 0;
         virtual void endRun(edm::RunForOutput const&) = 0;
       };
-      
+
       class LuminosityBlockWatcher : public virtual OutputModuleBase {
       public:
-        LuminosityBlockWatcher(edm::ParameterSet const&iPSet): OutputModuleBase(iPSet) {}
+        LuminosityBlockWatcher(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {}
         LuminosityBlockWatcher(LuminosityBlockWatcher const&) = delete;
         LuminosityBlockWatcher& operator=(LuminosityBlockWatcher const&) = delete;
-        ~LuminosityBlockWatcher() noexcept(false) override {};
-        
+        ~LuminosityBlockWatcher() noexcept(false) override{};
+
       private:
         void doBeginLuminosityBlock_(LuminosityBlockForOutput const& lb) final;
         void doEndLuminosityBlock_(LuminosityBlockForOutput const& lb) final;
-        
+
         virtual void beginLuminosityBlock(edm::LuminosityBlockForOutput const&) = 0;
         virtual void endLuminosityBlock(edm::LuminosityBlockForOutput const&) = 0;
       };
 
       class InputFileWatcher : public virtual OutputModuleBase {
       public:
-        InputFileWatcher(edm::ParameterSet const&iPSet): OutputModuleBase(iPSet) {}
+        InputFileWatcher(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {}
         InputFileWatcher(InputFileWatcher const&) = delete;
         InputFileWatcher& operator=(InputFileWatcher const&) = delete;
-        ~InputFileWatcher() noexcept(false) override {};
-        
+        ~InputFileWatcher() noexcept(false) override{};
+
       private:
         void doRespondToOpenInputFile_(FileBlock const&) final;
         void doRespondToCloseInputFile_(FileBlock const&) final;
-        
+
         virtual void respondToOpenInputFile(FileBlock const&) = 0;
         virtual void respondToCloseInputFile(FileBlock const&) = 0;
       };
 
-
       template <typename C>
-        class RunCacheHolder : public virtual OutputModuleBase {
+      class RunCacheHolder : public virtual OutputModuleBase {
       public:
-        RunCacheHolder(edm::ParameterSet const& iPSet): OutputModuleBase(iPSet) {}
-        RunCacheHolder( RunCacheHolder<C> const&) = delete;
+        RunCacheHolder(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {}
+        RunCacheHolder(RunCacheHolder<C> const&) = delete;
         RunCacheHolder<C>& operator=(RunCacheHolder<C> const&) = delete;
-        ~RunCacheHolder() noexcept(false) override {};
+        ~RunCacheHolder() noexcept(false) override{};
+
       protected:
         C* runCache(edm::RunIndex iID) { return cache_.get(); }
         C const* runCache(edm::RunIndex iID) const { return cache_.get(); }
+
       private:
-        void doBeginRun_(edm::RunForOutput const&rp) final {
-          cache_ = globalBeginRun(rp);
-        }
-        void doEndRun_(edm::RunForOutput const&rp) final {
+        void doBeginRun_(edm::RunForOutput const& rp) final { cache_ = globalBeginRun(rp); }
+        void doEndRun_(edm::RunForOutput const& rp) final {
           globalEndRun(rp);
-          cache_ = nullptr; // propagate_const<T> has no reset() function
+          cache_ = nullptr;  // propagate_const<T> has no reset() function
         }
-        
+
         virtual std::shared_ptr<C> globalBeginRun(edm::RunForOutput const&) const = 0;
         virtual void globalEndRun(edm::RunForOutput const&) = 0;
         //When threaded we will have a container for N items whre N is # of simultaneous runs
         edm::propagate_const<std::shared_ptr<C>> cache_;
       };
-      
+
       template <typename C>
-        class LuminosityBlockCacheHolder : public virtual OutputModuleBase {
+      class LuminosityBlockCacheHolder : public virtual OutputModuleBase {
       public:
-        template<typename... A>
-          LuminosityBlockCacheHolder(edm::ParameterSet const& iPSet): OutputModuleBase(iPSet) {}
-        LuminosityBlockCacheHolder( LuminosityBlockCacheHolder<C> const&) = delete;
+        template <typename... A>
+        LuminosityBlockCacheHolder(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {}
+        LuminosityBlockCacheHolder(LuminosityBlockCacheHolder<C> const&) = delete;
         LuminosityBlockCacheHolder<C>& operator=(LuminosityBlockCacheHolder<C> const&) = delete;
-        ~LuminosityBlockCacheHolder() noexcept(false) override {};
+        ~LuminosityBlockCacheHolder() noexcept(false) override{};
+
       protected:
-        void preallocLumis(unsigned int iNLumis) final {
-          caches_.reset( new std::shared_ptr<C>[iNLumis]);
-        }
-        
+        void preallocLumis(unsigned int iNLumis) final { caches_.reset(new std::shared_ptr<C>[iNLumis]); }
+
         C const* luminosityBlockCache(edm::LuminosityBlockIndex iID) const { return caches_[iID].get(); }
         C* luminosityBlockCache(edm::LuminosityBlockIndex iID) { return caches_[iID].get(); }
+
       private:
         void doBeginLuminosityBlock_(edm::LuminosityBlockForOutput const& lp) final {
           caches_[lp.index()] = globalBeginLuminosityBlock(lp);
@@ -130,46 +129,46 @@ namespace edm {
           globalEndLuminosityBlock(lp);
           caches_[lp.index()].reset();
         }
-        
+
         virtual std::shared_ptr<C> globalBeginLuminosityBlock(edm::LuminosityBlockForOutput const&) const = 0;
         virtual void globalEndLuminosityBlock(edm::LuminosityBlockForOutput const&) = 0;
         std::unique_ptr<std::shared_ptr<C>[]> caches_;
       };
-      
-      template<typename T> struct AbilityToImplementor;
-      
-      template<>
+
+      template <typename T>
+      struct AbilityToImplementor;
+
+      template <>
       struct AbilityToImplementor<edm::one::SharedResources> {
         typedef edm::one::impl::SharedResourcesUser<edm::one::OutputModuleBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::one::WatchRuns> {
         typedef edm::one::outputmodule::RunWatcher Type;
       };
 
-      template<>
+      template <>
       struct AbilityToImplementor<edm::one::WatchLuminosityBlocks> {
         typedef edm::one::outputmodule::LuminosityBlockWatcher Type;
       };
 
-      template<>
+      template <>
       struct AbilityToImplementor<edm::WatchInputFiles> {
         typedef edm::one::outputmodule::InputFileWatcher Type;
       };
 
-      template<typename C>
+      template <typename C>
       struct AbilityToImplementor<edm::RunCache<C>> {
         typedef edm::one::outputmodule::RunCacheHolder<C> Type;
       };
 
-      template<typename C>
+      template <typename C>
       struct AbilityToImplementor<edm::LuminosityBlockCache<C>> {
         typedef edm::one::outputmodule::LuminosityBlockCacheHolder<C> Type;
       };
-}
-  }
-}
-
+    }  // namespace outputmodule
+  }    // namespace one
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/one/producerAbilityToImplementor.h b/FWCore/Framework/interface/one/producerAbilityToImplementor.h
index e03b26b573562..b7862c50f2fd2 100644
--- a/FWCore/Framework/interface/one/producerAbilityToImplementor.h
+++ b/FWCore/Framework/interface/one/producerAbilityToImplementor.h
@@ -4,7 +4,7 @@
 //
 // Package:     Package
 // Class  :     producer::AbilityToImplementor
-// 
+//
 /**\class producer::AbilityToImplementor producerAbilityToImplementor.h "FWCore/Framework/interface/one/producerAbilityToImplementor.h"
 
  Description: [one line class summary]
@@ -31,61 +31,61 @@
 namespace edm {
   namespace one {
     namespace producer {
-      template<typename T> struct AbilityToImplementor;
-      
-      template<>
+      template <typename T>
+      struct AbilityToImplementor;
+
+      template <>
       struct AbilityToImplementor<edm::one::SharedResources> {
         typedef edm::one::impl::SharedResourcesUser<edm::one::EDProducerBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::one::WatchRuns> {
         typedef edm::one::impl::RunWatcher<edm::one::EDProducerBase> Type;
       };
 
-      template<>
+      template <>
       struct AbilityToImplementor<edm::one::WatchLuminosityBlocks> {
         typedef edm::one::impl::LuminosityBlockWatcher<edm::one::EDProducerBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::BeginRunProducer> {
         typedef edm::one::impl::BeginRunProducer<edm::one::EDProducerBase> Type;
       };
 
-      template<>
+      template <>
       struct AbilityToImplementor<edm::EndRunProducer> {
         typedef edm::one::impl::EndRunProducer<edm::one::EDProducerBase> Type;
       };
 
-      template<>
+      template <>
       struct AbilityToImplementor<edm::BeginLuminosityBlockProducer> {
         typedef edm::one::impl::BeginLuminosityBlockProducer<edm::one::EDProducerBase> Type;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToImplementor<edm::EndLuminosityBlockProducer> {
         typedef edm::one::impl::EndLuminosityBlockProducer<edm::one::EDProducerBase> Type;
       };
 
-      template<typename C>
+      template <typename C>
       struct AbilityToImplementor<edm::RunCache<C>> {
-        typedef edm::one::impl::RunCacheHolder<edm::one::EDProducerBase,C> Type;
+        typedef edm::one::impl::RunCacheHolder<edm::one::EDProducerBase, C> Type;
       };
-      
-      template<typename C>
+
+      template <typename C>
       struct AbilityToImplementor<edm::LuminosityBlockCache<C>> {
-        typedef edm::one::impl::LuminosityBlockCacheHolder<edm::one::EDProducerBase,C> Type;
+        typedef edm::one::impl::LuminosityBlockCacheHolder<edm::one::EDProducerBase, C> Type;
       };
 
-      template<>
+      template <>
       struct AbilityToImplementor<edm::Accumulator> {
         typedef edm::one::impl::Accumulator<edm::one::EDProducerBase> Type;
       };
 
-    }
-  }
-}
-
+    }  // namespace producer
+  }    // namespace one
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/print_eventsetup_record_dependencies.h b/FWCore/Framework/interface/print_eventsetup_record_dependencies.h
index 9bf987a51f6d0..10b9f74963237 100644
--- a/FWCore/Framework/interface/print_eventsetup_record_dependencies.h
+++ b/FWCore/Framework/interface/print_eventsetup_record_dependencies.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     print_eventsetup_record_dependencies
-// 
+//
 /**\class print_eventsetup_record_dependencies print_eventsetup_record_dependencies.h FWCore/Framework/interface/print_eventsetup_record_dependencies.h
 
  Description: <one line class summary>
@@ -32,53 +32,56 @@
 // forward declarations
 
 namespace edm {
-   namespace eventsetup {
-     struct DependentRecordTag;
-   }
-   template<typename RecordT>
-   void print_eventsetup_record_dependencies(std::ostream& oStream, std::string const& iIndent = std::string());
-   
-   template<typename T>
-   void print_eventsetup_record_dependencies(std::ostream&,
-                                             std::string,
-                                             T const*,
-                                             T const*) { }
-
-   template<typename TFirst, typename TEnd>
-   void print_eventsetup_record_dependencies(std::ostream& oStream, 
-                                             std::string iIndent,
-                                             TFirst const*, TEnd const* iEnd) {
-      iIndent +=" ";
-      print_eventsetup_record_dependencies<typename boost::mpl::deref<TFirst>::type>(oStream,iIndent);
-      typename boost::mpl::next< TFirst >::type const* next(nullptr);
-      print_eventsetup_record_dependencies(oStream, iIndent, next, iEnd);
-   }
-   
-   namespace rec_dep {
-      boost::mpl::false_ inherits_from_DependentRecordTag(void const*) { return boost::mpl::false_();}
-      boost::mpl::true_ inherits_from_DependentRecordTag(edm::eventsetup::DependentRecordTag const*) { return boost::mpl::true_();}
-   }
-
-   template<typename RecordT>
-   void print_eventsetup_record_dependencies_recursive(std::ostream& oStream, std::string const& iIndent, boost::mpl::true_) {
-      typedef typename  RecordT::list_type list_type;
-      
-      typename boost::mpl::begin<list_type>::type const* begin(nullptr);
-      typename boost::mpl::end<list_type>::type const* end(nullptr);
-      print_eventsetup_record_dependencies(oStream, iIndent, begin, end);
-   }
-
-   template<typename RecordT>
-   void print_eventsetup_record_dependencies_recursive(std::ostream&, std::string const&, boost::mpl::false_) {
-      return;
-   }
-   
-   template<typename RecordT>
-   void print_eventsetup_record_dependencies(std::ostream& oStream, std::string const& iIndent) {
-      oStream<<iIndent<<edm::eventsetup::EventSetupRecordKey::makeKey<RecordT>().name()<<std::endl;
-      
-      print_eventsetup_record_dependencies_recursive<RecordT>(oStream, iIndent, rec_dep::inherits_from_DependentRecordTag(static_cast<RecordT const*>(nullptr)));
-   }
-}
+  namespace eventsetup {
+    struct DependentRecordTag;
+  }
+  template <typename RecordT>
+  void print_eventsetup_record_dependencies(std::ostream& oStream, std::string const& iIndent = std::string());
+
+  template <typename T>
+  void print_eventsetup_record_dependencies(std::ostream&, std::string, T const*, T const*) {}
+
+  template <typename TFirst, typename TEnd>
+  void print_eventsetup_record_dependencies(std::ostream& oStream,
+                                            std::string iIndent,
+                                            TFirst const*,
+                                            TEnd const* iEnd) {
+    iIndent += " ";
+    print_eventsetup_record_dependencies<typename boost::mpl::deref<TFirst>::type>(oStream, iIndent);
+    typename boost::mpl::next<TFirst>::type const* next(nullptr);
+    print_eventsetup_record_dependencies(oStream, iIndent, next, iEnd);
+  }
+
+  namespace rec_dep {
+    boost::mpl::false_ inherits_from_DependentRecordTag(void const*) { return boost::mpl::false_(); }
+    boost::mpl::true_ inherits_from_DependentRecordTag(edm::eventsetup::DependentRecordTag const*) {
+      return boost::mpl::true_();
+    }
+  }  // namespace rec_dep
+
+  template <typename RecordT>
+  void print_eventsetup_record_dependencies_recursive(std::ostream& oStream,
+                                                      std::string const& iIndent,
+                                                      boost::mpl::true_) {
+    typedef typename RecordT::list_type list_type;
+
+    typename boost::mpl::begin<list_type>::type const* begin(nullptr);
+    typename boost::mpl::end<list_type>::type const* end(nullptr);
+    print_eventsetup_record_dependencies(oStream, iIndent, begin, end);
+  }
+
+  template <typename RecordT>
+  void print_eventsetup_record_dependencies_recursive(std::ostream&, std::string const&, boost::mpl::false_) {
+    return;
+  }
+
+  template <typename RecordT>
+  void print_eventsetup_record_dependencies(std::ostream& oStream, std::string const& iIndent) {
+    oStream << iIndent << edm::eventsetup::EventSetupRecordKey::makeKey<RecordT>().name() << std::endl;
+
+    print_eventsetup_record_dependencies_recursive<RecordT>(
+        oStream, iIndent, rec_dep::inherits_from_DependentRecordTag(static_cast<RecordT const*>(nullptr)));
+  }
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/produce_helpers.h b/FWCore/Framework/interface/produce_helpers.h
index 56ec5359b16c1..78e2c5fab2ea2 100644
--- a/FWCore/Framework/interface/produce_helpers.h
+++ b/FWCore/Framework/interface/produce_helpers.h
@@ -25,93 +25,115 @@
 
 namespace edm::eventsetup {
 
-  namespace produce { struct Null;}
+  namespace produce {
+    struct Null;
+  }
 
-  template<typename FromT, typename ToT> void moveFromTo(FromT& iFrom,
-                                                         ToT& iTo) {
+  template <typename FromT, typename ToT>
+  void moveFromTo(FromT& iFrom, ToT& iTo) {
     iTo = std::move(iFrom);
   }
 
-  template<typename FromT, typename ToT> void moveFromTo(std::unique_ptr<FromT>& iFrom, ToT& iTo) {
+  template <typename FromT, typename ToT>
+  void moveFromTo(std::unique_ptr<FromT>& iFrom, ToT& iTo) {
     iTo = std::move(iFrom);
   }
-  template<typename FromT, typename ToT> void moveFromTo(std::optional<FromT>& iFrom, ToT& iTo) {
+  template <typename FromT, typename ToT>
+  void moveFromTo(std::optional<FromT>& iFrom, ToT& iTo) {
     iTo = std::move(iFrom.value());
   }
 
   namespace produce {
     struct Null {};
-    template <typename T> struct EndList {
-      static_assert((not std::is_pointer_v<T>), "use std::shared_ptr or std::unique_ptr to hold EventSetup data products, do not use bare pointers");
+    template <typename T>
+    struct EndList {
+      static_assert(
+          (not std::is_pointer_v<T>),
+          "use std::shared_ptr or std::unique_ptr to hold EventSetup data products, do not use bare pointers");
       using tail_type = T;
       using head_type = Null;
     };
-    template <typename T> struct product_traits {
+    template <typename T>
+    struct product_traits {
       using type = T;
     };
-    template< typename T> struct product_traits<T*> {
+    template <typename T>
+    struct product_traits<T*> {
       using type = EndList<T*>;
     };
-    template< typename T> struct product_traits<std::unique_ptr<T>> {
+    template <typename T>
+    struct product_traits<std::unique_ptr<T>> {
       using type = EndList<std::unique_ptr<T>>;
     };
-    template< typename T> struct product_traits<std::shared_ptr<T>> {
+    template <typename T>
+    struct product_traits<std::shared_ptr<T>> {
       using type = EndList<std::shared_ptr<T>>;
     };
-    template< typename T> struct product_traits<std::optional<T>> {
+    template <typename T>
+    struct product_traits<std::optional<T>> {
       using type = EndList<std::optional<T>>;
     };
 
-    template<typename T> struct size {
+    template <typename T>
+    struct size {
       using type = typename product_traits<T>::type;
-      constexpr static int value = size< typename type::head_type >::value + 1;
+      constexpr static int value = size<typename type::head_type>::value + 1;
     };
-    template<> struct size<Null> {
+    template <>
+    struct size<Null> {
       constexpr static int value = 0;
     };
 
-    template<typename T> struct smart_pointer_traits {
+    template <typename T>
+    struct smart_pointer_traits {
       using type = typename T::element_type;
-      static auto getPointer(T& iPtr)-> decltype(&*iPtr) { return &*iPtr;}
+      static auto getPointer(T& iPtr) -> decltype(&*iPtr) { return &*iPtr; }
     };
 
-    template<typename T> struct smart_pointer_traits<std::unique_ptr<const T>> {
+    template <typename T>
+    struct smart_pointer_traits<std::unique_ptr<const T>> {
       using type = T;
-      static auto getPointer(std::unique_ptr<const T>& iPtr)-> decltype(&*iPtr) { return &*iPtr;}
+      static auto getPointer(std::unique_ptr<const T>& iPtr) -> decltype(&*iPtr) { return &*iPtr; }
     };
 
-    template<typename T> struct smart_pointer_traits<std::shared_ptr<const T>> {
+    template <typename T>
+    struct smart_pointer_traits<std::shared_ptr<const T>> {
       using type = T;
-      static auto getPointer(std::shared_ptr<const T>& iPtr)-> decltype(&*iPtr) { return &*iPtr;}
+      static auto getPointer(std::shared_ptr<const T>& iPtr) -> decltype(&*iPtr) { return &*iPtr; }
     };
 
-    template<typename T> struct smart_pointer_traits<std::optional<T>> {
+    template <typename T>
+    struct smart_pointer_traits<std::optional<T>> {
       using type = T;
       static T* getPointer(std::optional<T>& iPtr) {
-        if(iPtr.has_value()) { return &*iPtr;}
+        if (iPtr.has_value()) {
+          return &*iPtr;
+        }
         return nullptr;
       }
     };
 
-    template<typename T, typename FindT> struct find_index {
+    template <typename T, typename FindT>
+    struct find_index {
       using container_type = typename product_traits<T>::type;
-      template<typename HeadT, typename TailT>
+      template <typename HeadT, typename TailT>
       constexpr static int findIndexOf() {
-        if constexpr(not std::is_same_v<TailT,FindT>) {
-            using container_type= typename product_traits<HeadT>::type;
-            return findIndexOf<typename container_type::head_type,
-                               typename container_type::tail_type>()+1;
-          } else {
+        if constexpr (not std::is_same_v<TailT, FindT>) {
+          using container_type = typename product_traits<HeadT>::type;
+          return findIndexOf<typename container_type::head_type, typename container_type::tail_type>() + 1;
+        } else {
           return 0;
         }
       }
-      constexpr static int value = findIndexOf<typename container_type::head_type, typename container_type::tail_type>();
+      constexpr static int value =
+          findIndexOf<typename container_type::head_type, typename container_type::tail_type>();
     };
     namespace test {
-      template<typename T> const char* name(const T*);
+      template <typename T>
+      const char* name(const T*);
     }
 
-  }
-}
+  }  // namespace produce
+}  // namespace edm::eventsetup
 
 #endif
diff --git a/FWCore/Framework/interface/stream/AbilityChecker.h b/FWCore/Framework/interface/stream/AbilityChecker.h
index 784d2292e83fc..2c38012ba3ec0 100644
--- a/FWCore/Framework/interface/stream/AbilityChecker.h
+++ b/FWCore/Framework/interface/stream/AbilityChecker.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     AbilityChecker
-// 
+//
 /**\class edm::stream::AbilityChecker AbilityChecker.h "FWCore/Framework/interface/stream/AbilityChecker.h"
 
  Description: [one line class summary]
@@ -28,66 +28,66 @@ namespace edm {
   namespace stream {
     namespace impl {
       struct LastCheck {};
-      
-      template<typename T, typename... U>
+
+      template <typename T, typename... U>
       struct HasAbility;
-      
-      template<typename G, typename... U>
+
+      template <typename G, typename... U>
       struct HasAbility<GlobalCache<G>, U...> : public HasAbility<U...> {
         static constexpr bool kGlobalCache = true;
       };
 
-      template<typename R, typename... U>
+      template <typename R, typename... U>
       struct HasAbility<RunCache<R>, U...> : public HasAbility<U...> {
         static constexpr bool kRunCache = true;
       };
 
-      template<typename R, typename... U>
+      template <typename R, typename... U>
       struct HasAbility<LuminosityBlockCache<R>, U...> : public HasAbility<U...> {
         static constexpr bool kLuminosityBlockCache = true;
       };
 
-      template<typename R, typename... U>
+      template <typename R, typename... U>
       struct HasAbility<RunSummaryCache<R>, U...> : public HasAbility<U...> {
         static constexpr bool kRunSummaryCache = true;
       };
-      
-      template<typename R, typename... U>
+
+      template <typename R, typename... U>
       struct HasAbility<LuminosityBlockSummaryCache<R>, U...> : public HasAbility<U...> {
         static constexpr bool kLuminosityBlockSummaryCache = true;
       };
 
-      template<typename... U>
-      struct HasAbility<edm::BeginRunProducer, U...> :public HasAbility<U...> {
+      template <typename... U>
+      struct HasAbility<edm::BeginRunProducer, U...> : public HasAbility<U...> {
         static constexpr bool kBeginRunProducer = true;
       };
-      
-      template<typename... U>
-      struct HasAbility<edm::EndRunProducer, U...> :public HasAbility<U...> {
+
+      template <typename... U>
+      struct HasAbility<edm::EndRunProducer, U...> : public HasAbility<U...> {
         static constexpr bool kEndRunProducer = true;
       };
-      
-      template<typename... U>
-      struct HasAbility<edm::BeginLuminosityBlockProducer, U...> :public HasAbility<U...> {
+
+      template <typename... U>
+      struct HasAbility<edm::BeginLuminosityBlockProducer, U...> : public HasAbility<U...> {
         static constexpr bool kBeginLuminosityBlockProducer = true;
       };
- 
-      template<typename... U>
-      struct HasAbility<edm::EndLuminosityBlockProducer, U...> :public HasAbility<U...> {
+
+      template <typename... U>
+      struct HasAbility<edm::EndLuminosityBlockProducer, U...> : public HasAbility<U...> {
         static constexpr bool kEndLuminosityBlockProducer = true;
       };
-      
-      template<typename... U>
-      struct HasAbility<edm::ExternalWork, U...> :public HasAbility<U...> {
+
+      template <typename... U>
+      struct HasAbility<edm::ExternalWork, U...> : public HasAbility<U...> {
         static constexpr bool kExternalWork = true;
       };
 
-      template<typename... U>
-      struct HasAbility<edm::Accumulator, U...> :public HasAbility<U...> {
+      template <typename... U>
+      struct HasAbility<edm::Accumulator, U...> : public HasAbility<U...> {
         static constexpr bool kAccumulator = true;
       };
 
-      template<>
+      template <>
       struct HasAbility<LastCheck> {
         static constexpr bool kGlobalCache = false;
         static constexpr bool kRunCache = false;
@@ -101,14 +101,10 @@ namespace edm {
         static constexpr bool kExternalWork = false;
         static constexpr bool kAccumulator = false;
       };
-    }
-    template<typename... T>
-    struct AbilityChecker : public impl::HasAbility<T...,impl::LastCheck>
-    {
-    };
-  }
-}
-
+    }  // namespace impl
+    template <typename... T>
+    struct AbilityChecker : public impl::HasAbility<T..., impl::LastCheck> {};
+  }  // namespace stream
+}  // namespace edm
 
 #endif
-
diff --git a/FWCore/Framework/interface/stream/AbilityToImplementor.h b/FWCore/Framework/interface/stream/AbilityToImplementor.h
index f7771d25adebe..9387299e5b2be 100644
--- a/FWCore/Framework/interface/stream/AbilityToImplementor.h
+++ b/FWCore/Framework/interface/stream/AbilityToImplementor.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // File  :     AbilityToImplementor
-// 
+//
 /**\class  edm::stream::AbilityToImplementor producerAbilityToImplementor.h "FWCore/Framework/interface/stream/AbilityToImplementor.h"
 
  Description: Class used to pair a module Ability to the actual base class used to implement that ability
@@ -27,65 +27,66 @@
 // forward declarations
 namespace edm {
   namespace stream {
-    template<typename T> struct AbilityToImplementor;
-    
-    template<typename C>
+    template <typename T>
+    struct AbilityToImplementor;
+
+    template <typename C>
     struct AbilityToImplementor<edm::GlobalCache<C>> {
       typedef edm::stream::impl::GlobalCacheHolder<C> Type;
     };
-    
-    template<typename C>
+
+    template <typename C>
     struct AbilityToImplementor<edm::RunCache<C>> {
       typedef edm::stream::impl::RunCacheHolder<C> Type;
     };
-    
-    template<typename C>
+
+    template <typename C>
     struct AbilityToImplementor<edm::RunSummaryCache<C>> {
       typedef edm::stream::impl::RunSummaryCacheHolder<C> Type;
     };
-    
-    template<typename C>
+
+    template <typename C>
     struct AbilityToImplementor<edm::LuminosityBlockCache<C>> {
       typedef edm::stream::impl::LuminosityBlockCacheHolder<C> Type;
     };
-    
-    template<typename C>
+
+    template <typename C>
     struct AbilityToImplementor<edm::LuminosityBlockSummaryCache<C>> {
       typedef edm::stream::impl::LuminosityBlockSummaryCacheHolder<C> Type;
     };
-    
-    template<>
+
+    template <>
     struct AbilityToImplementor<edm::BeginRunProducer> {
       typedef edm::stream::impl::BeginRunProducer Type;
     };
-    
-    template<>
+
+    template <>
     struct AbilityToImplementor<edm::EndRunProducer> {
       typedef edm::stream::impl::EndRunProducer Type;
     };
-    
-    template<>
+
+    template <>
     struct AbilityToImplementor<edm::BeginLuminosityBlockProducer> {
       typedef edm::stream::impl::BeginLuminosityBlockProducer Type;
     };
-    
-    template<>
+
+    template <>
     struct AbilityToImplementor<edm::EndLuminosityBlockProducer> {
       typedef edm::stream::impl::EndLuminosityBlockProducer Type;
     };
 
-    template<>
+    template <>
     struct AbilityToImplementor<edm::ExternalWork> {
       typedef edm::stream::impl::ExternalWork Type;
     };
 
     // As currently implemented this ability only works
     // with EDProducer, not with EDAnalyzers or EDFilters!
-    template<>
+    template <>
     struct AbilityToImplementor<edm::Accumulator> {
       typedef edm::stream::impl::Accumulator Type;
     };
-  }
-}
+  }  // namespace stream
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/stream/CacheContexts.h b/FWCore/Framework/interface/stream/CacheContexts.h
index 2336a4bf33665..5a13022a50498 100644
--- a/FWCore/Framework/interface/stream/CacheContexts.h
+++ b/FWCore/Framework/interface/stream/CacheContexts.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     CacheContexts
-// 
+//
 /**\class CacheContexts CacheContexts.h "FWCore/Framework/interface/stream/CacheContexts.h"
 
  Description: Helper class used to identify the caches requested by a module
@@ -28,50 +28,48 @@ namespace edm {
   namespace stream {
     namespace impl {
       struct Last {};
-      
-      template<typename T, typename... U>
+
+      template <typename T, typename... U>
       struct AbilityToCache : public AbilityToCache<U...> {};
-      
-      template<typename G, typename... U>
+
+      template <typename G, typename... U>
       struct AbilityToCache<GlobalCache<G>, U...> : public AbilityToCache<U...> {
         typedef G GlobalCache;
       };
-      
-      template<typename R, typename... U>
+
+      template <typename R, typename... U>
       struct AbilityToCache<RunCache<R>, U...> : public AbilityToCache<U...> {
         typedef R RunCache;
       };
-      
-      template<typename L, typename... U>
+
+      template <typename L, typename... U>
       struct AbilityToCache<LuminosityBlockCache<L>, U...> : public AbilityToCache<U...> {
         typedef L LuminosityBlockCache;
       };
 
-      template<typename R, typename... U>
+      template <typename R, typename... U>
       struct AbilityToCache<RunSummaryCache<R>, U...> : public AbilityToCache<U...> {
         typedef R RunSummaryCache;
       };
-      
-      template<typename L, typename... U>
+
+      template <typename L, typename... U>
       struct AbilityToCache<LuminosityBlockSummaryCache<L>, U...> : public AbilityToCache<U...> {
         typedef L LuminosityBlockSummaryCache;
       };
-      
-      template<>
+
+      template <>
       struct AbilityToCache<Last> {
-        typedef void GlobalCache ;
-        typedef void RunCache ;
-        typedef void LuminosityBlockCache ;
-        typedef void RunSummaryCache ;
-        typedef void LuminosityBlockSummaryCache ;
+        typedef void GlobalCache;
+        typedef void RunCache;
+        typedef void LuminosityBlockCache;
+        typedef void RunSummaryCache;
+        typedef void LuminosityBlockSummaryCache;
       };
-      
-    }
-    template <typename... T>
-    struct CacheContexts : public impl::AbilityToCache<T...,impl::Last>   {
-    };
-  }
-}
 
+    }  // namespace impl
+    template <typename... T>
+    struct CacheContexts : public impl::AbilityToCache<T..., impl::Last> {};
+  }  // namespace stream
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/stream/Contexts.h b/FWCore/Framework/interface/stream/Contexts.h
index 2c1b2b9fbffe4..0e419431eda4e 100644
--- a/FWCore/Framework/interface/stream/Contexts.h
+++ b/FWCore/Framework/interface/stream/Contexts.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     Contexts
-// 
+//
 /**\class Contexts Contexts.h "Contexts.h"
 
  Description: [one line class summary]
@@ -26,34 +26,35 @@
 
 namespace edm {
   namespace stream {
-    
-    template<typename R, typename G>
+
+    template <typename R, typename G>
     class RunContextT {
     public:
-      RunContextT(R const* iRun, G const* iGlobal): m_run(iRun), m_global(iGlobal) {}
-      R const* run() const { return m_run;}
-      G const* global() const { return m_global;}
-  
+      RunContextT(R const* iRun, G const* iGlobal) : m_run(iRun), m_global(iGlobal) {}
+      R const* run() const { return m_run; }
+      G const* global() const { return m_global; }
+
     private:
       R const* m_run;
       G const* m_global;
     };
-    
-    template<typename L, typename R, typename G>
+
+    template <typename L, typename R, typename G>
     class LuminosityBlockContextT {
     public:
-      LuminosityBlockContextT(L const* iLumi, R const* iRun, G const* iGlobal):
-      m_lumi(iLumi),m_run(iRun),m_global(iGlobal) {}
-      
-      L const* luminosityBlock() const { return m_lumi;}
-      R const* run() const {return m_run;}
-      G const* global() const { return m_global;}
+      LuminosityBlockContextT(L const* iLumi, R const* iRun, G const* iGlobal)
+          : m_lumi(iLumi), m_run(iRun), m_global(iGlobal) {}
+
+      L const* luminosityBlock() const { return m_lumi; }
+      R const* run() const { return m_run; }
+      G const* global() const { return m_global; }
+
     private:
       L const* m_lumi;
       R const* m_run;
       G const* m_global;
     };
-  }
-}
+  }  // namespace stream
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/stream/EDAnalyzer.h b/FWCore/Framework/interface/stream/EDAnalyzer.h
index 4e7070abbe7fb..f32203ca20bf8 100644
--- a/FWCore/Framework/interface/stream/EDAnalyzer.h
+++ b/FWCore/Framework/interface/stream/EDAnalyzer.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDAnalyzer
-// 
+//
 /**\class edm::stream::EDAnalyzer EDAnalyzer.h "FWCore/Framework/interface/stream/EDAnalyzer.h"
 
  Description: Base class for stream based EDAnalyzers
@@ -29,48 +29,40 @@
 // forward declarations
 namespace edm {
   namespace stream {
-    template< typename... T>
-    class EDAnalyzer : public AbilityToImplementor<T>::Type...,
-                       public EDAnalyzerBase
-    {
-      
+    template <typename... T>
+    class EDAnalyzer : public AbilityToImplementor<T>::Type..., public EDAnalyzerBase {
     public:
       typedef CacheContexts<T...> CacheTypes;
-      
+
       typedef typename CacheTypes::GlobalCache GlobalCache;
       typedef typename CacheTypes::RunCache RunCache;
       typedef typename CacheTypes::LuminosityBlockCache LuminosityBlockCache;
-      typedef RunContextT<RunCache,GlobalCache> RunContext;
-      typedef LuminosityBlockContextT<LuminosityBlockCache,
-                                     RunCache,
-                                     GlobalCache> LuminosityBlockContext;
+      typedef RunContextT<RunCache, GlobalCache> RunContext;
+      typedef LuminosityBlockContextT<LuminosityBlockCache, RunCache, GlobalCache> LuminosityBlockContext;
       typedef typename CacheTypes::RunSummaryCache RunSummaryCache;
       typedef typename CacheTypes::LuminosityBlockSummaryCache LuminosityBlockSummaryCache;
 
       typedef AbilityChecker<T...> HasAbility;
-      
-      
+
       EDAnalyzer() = default;
-      
+
       // ---------- const member functions ---------------------
-      
+
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
 
       using EDAnalyzerBase::callWhenNewProductsRegistered;
-      
+
     private:
-      EDAnalyzer(const EDAnalyzer&) = delete; // stop default
-      
-      const EDAnalyzer& operator=(const EDAnalyzer&) = delete; // stop default
-      
+      EDAnalyzer(const EDAnalyzer&) = delete;  // stop default
+
+      const EDAnalyzer& operator=(const EDAnalyzer&) = delete;  // stop default
+
       // ---------- member data --------------------------------
-      
     };
-    
-  }
-}
 
+  }  // namespace stream
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/stream/EDAnalyzerAdaptor.h b/FWCore/Framework/interface/stream/EDAnalyzerAdaptor.h
index 210871aa5b8d7..7b8e159404b0d 100644
--- a/FWCore/Framework/interface/stream/EDAnalyzerAdaptor.h
+++ b/FWCore/Framework/interface/stream/EDAnalyzerAdaptor.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDAnalyzerAdaptor
-// 
+//
 /**\class edm::stream::EDAnalyzerAdaptor EDAnalyzerAdaptor.h "EDAnalyzerAdaptor.h"
 
  Description: Adapts an edm::stream::EDAnalyzer<> to work with an edm::Worker
@@ -37,41 +37,36 @@
 namespace edm {
   namespace stream {
 
-    template<typename ABase, typename ModType> struct BaseToAdaptor;
+    template <typename ABase, typename ModType>
+    struct BaseToAdaptor;
 
-    template<typename T> class EDAnalyzerAdaptor;
-    template<typename ModType> struct BaseToAdaptor<EDAnalyzerAdaptorBase,ModType> {
+    template <typename T>
+    class EDAnalyzerAdaptor;
+    template <typename ModType>
+    struct BaseToAdaptor<EDAnalyzerAdaptorBase, ModType> {
       typedef EDAnalyzerAdaptor<ModType> Type;
     };
 
-    template<typename T>
-    class EDAnalyzerAdaptor : public EDAnalyzerAdaptorBase
-    {
-      
+    template <typename T>
+    class EDAnalyzerAdaptor : public EDAnalyzerAdaptorBase {
     public:
-      EDAnalyzerAdaptor( edm::ParameterSet const& iPSet):
-      m_pset(&iPSet)
-      {
+      EDAnalyzerAdaptor(edm::ParameterSet const& iPSet) : m_pset(&iPSet) {
         m_runs.resize(1);
         m_lumis.resize(1);
         m_runSummaries.resize(1);
         m_lumiSummaries.resize(1);
-        typename T::GlobalCache const* dummy=nullptr;
-        m_global = impl::makeGlobal<T>(iPSet,dummy);
-      }
-      ~EDAnalyzerAdaptor() override {
-      }
-      
-      static void fillDescriptions(ConfigurationDescriptions& descriptions) {
-        T::fillDescriptions(descriptions);
-      }
-      static void prevalidate(ConfigurationDescriptions& descriptions) {
-        T::prevalidate(descriptions);
+        typename T::GlobalCache const* dummy = nullptr;
+        m_global = impl::makeGlobal<T>(iPSet, dummy);
       }
+      ~EDAnalyzerAdaptor() override {}
 
-      bool wantsGlobalRuns() const final {
-        return T::HasAbility::kRunCache or T::HasAbility::kRunSummaryCache; }
-      bool wantsGlobalLuminosityBlocks() const final {return T::HasAbility::kLuminosityBlockCache or T::HasAbility::kLuminosityBlockSummaryCache;}
+      static void fillDescriptions(ConfigurationDescriptions& descriptions) { T::fillDescriptions(descriptions); }
+      static void prevalidate(ConfigurationDescriptions& descriptions) { T::prevalidate(descriptions); }
+
+      bool wantsGlobalRuns() const final { return T::HasAbility::kRunCache or T::HasAbility::kRunSummaryCache; }
+      bool wantsGlobalLuminosityBlocks() const final {
+        return T::HasAbility::kLuminosityBlockCache or T::HasAbility::kLuminosityBlockSummaryCache;
+      }
 
     private:
       typedef CallGlobal<T> MyGlobal;
@@ -79,14 +74,14 @@ namespace edm {
       typedef CallGlobalRunSummary<T> MyGlobalRunSummary;
       typedef CallGlobalLuminosityBlock<T> MyGlobalLuminosityBlock;
       typedef CallGlobalLuminosityBlockSummary<T> MyGlobalLuminosityBlockSummary;
-      
+
       void setupStreamModules() final {
-        this->createStreamModules([this] () -> EDAnalyzerBase* {
-          auto tmp = impl::makeStreamModule<T>(*m_pset,m_global.get());
-          MyGlobal::set(tmp,m_global.get());
+        this->createStreamModules([this]() -> EDAnalyzerBase* {
+          auto tmp = impl::makeStreamModule<T>(*m_pset, m_global.get());
+          MyGlobal::set(tmp, m_global.get());
           return tmp;
         });
-        m_pset= nullptr;
+        m_pset = nullptr;
       }
 
       void preallocLumis(unsigned int iNLumis) final {
@@ -94,22 +89,15 @@ namespace edm {
         m_lumiSummaries.resize(iNLumis);
       }
 
-      void doEndJob() final {
-        MyGlobal::endJob(m_global.get());
-      }
-      void setupRun(EDAnalyzerBase* iProd, RunIndex iIndex) final {
-        MyGlobalRun::set(iProd, m_runs[iIndex].get());
-      }
-      void streamEndRunSummary(EDAnalyzerBase* iProd,
-                               edm::Run const& iRun,
-                               edm::EventSetup const& iES) final {
+      void doEndJob() final { MyGlobal::endJob(m_global.get()); }
+      void setupRun(EDAnalyzerBase* iProd, RunIndex iIndex) final { MyGlobalRun::set(iProd, m_runs[iIndex].get()); }
+      void streamEndRunSummary(EDAnalyzerBase* iProd, edm::Run const& iRun, edm::EventSetup const& iES) final {
         auto s = m_runSummaries[iRun.index()].get();
         std::lock_guard<decltype(m_runSummaryLock)> guard(m_runSummaryLock);
-        MyGlobalRunSummary::streamEndRunSummary(iProd,iRun,iES,s);
+        MyGlobalRunSummary::streamEndRunSummary(iProd, iRun, iES, s);
       }
- 
-      void setupLuminosityBlock(EDAnalyzerBase* iProd, LuminosityBlockIndex iIndex) final
-      {
+
+      void setupLuminosityBlock(EDAnalyzerBase* iProd, LuminosityBlockIndex iIndex) final {
         MyGlobalLuminosityBlock::set(iProd, m_lumis[iIndex].get());
       }
       void streamEndLuminosityBlockSummary(EDAnalyzerBase* iProd,
@@ -117,79 +105,78 @@ namespace edm {
                                            edm::EventSetup const& iES) final {
         auto s = m_lumiSummaries[iLumi.index()].get();
         std::lock_guard<decltype(m_lumiSummaryLock)> guard(m_lumiSummaryLock);
-        MyGlobalLuminosityBlockSummary::streamEndLuminosityBlockSummary(iProd,iLumi,iES,s);
+        MyGlobalLuminosityBlockSummary::streamEndLuminosityBlockSummary(iProd, iLumi, iES, s);
       }
 
-      void doBeginRun(RunPrincipal const& rp,
-                      EventSetupImpl const&  ci,
-                      ModuleCallingContext const* mcc) final {
-        if constexpr(T::HasAbility::kRunCache or T::HasAbility::kRunSummaryCache) {
+      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) final {
+        if constexpr (T::HasAbility::kRunCache or T::HasAbility::kRunSummaryCache) {
           Run r(rp, moduleDescription(), mcc, false);
           r.setConsumer(consumer());
           Run const& cnstR = r;
           RunIndex ri = rp.index();
-          const EventSetup c{ci};
-          MyGlobalRun::beginRun(cnstR,c,m_global.get(),m_runs[ri]);
-          typename T::RunContext rc(m_runs[ri].get(),m_global.get());
-          MyGlobalRunSummary::beginRun(cnstR,c,&rc,m_runSummaries[ri]);
+          const EventSetup c{ci,
+                             static_cast<unsigned int>(Transition::BeginRun),
+                             this->consumer()->esGetTokenIndices(Transition::BeginRun)};
+          MyGlobalRun::beginRun(cnstR, c, m_global.get(), m_runs[ri]);
+          typename T::RunContext rc(m_runs[ri].get(), m_global.get());
+          MyGlobalRunSummary::beginRun(cnstR, c, &rc, m_runSummaries[ri]);
         }
       }
-      void doEndRun(RunPrincipal const& rp,
-                    EventSetupImpl const&  ci,
-                    ModuleCallingContext const* mcc) final
-      {
-        if constexpr(T::HasAbility::kRunCache or T::HasAbility::kRunSummaryCache) {
-          
+      void doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) final {
+        if constexpr (T::HasAbility::kRunCache or T::HasAbility::kRunSummaryCache) {
           Run r(rp, moduleDescription(), mcc, true);
           r.setConsumer(consumer());
 
           RunIndex ri = rp.index();
-          typename T::RunContext rc(m_runs[ri].get(),m_global.get());
-          const EventSetup c{ci};
-          MyGlobalRunSummary::globalEndRun(r,c,&rc,m_runSummaries[ri].get());
-          MyGlobalRun::endRun(r,c,&rc);
+          typename T::RunContext rc(m_runs[ri].get(), m_global.get());
+          const EventSetup c{ci,
+                             static_cast<unsigned int>(Transition::EndRun),
+                             this->consumer()->esGetTokenIndices(Transition::EndRun)};
+          MyGlobalRunSummary::globalEndRun(r, c, &rc, m_runSummaries[ri].get());
+          MyGlobalRun::endRun(r, c, &rc);
         }
       }
 
       void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
-                                  EventSetupImpl const&  ci,
-                                  ModuleCallingContext const* mcc) final
-      {
-        if constexpr(T::HasAbility::kLuminosityBlockCache or T::HasAbility::kLuminosityBlockSummaryCache) {
+                                  EventSetupImpl const& ci,
+                                  ModuleCallingContext const* mcc) final {
+        if constexpr (T::HasAbility::kLuminosityBlockCache or T::HasAbility::kLuminosityBlockSummaryCache) {
           LuminosityBlock lb(lbp, moduleDescription(), mcc, false);
           lb.setConsumer(consumer());
           LuminosityBlock const& cnstLb = lb;
           LuminosityBlockIndex li = lbp.index();
           RunIndex ri = lbp.runPrincipal().index();
-          typename T::RunContext rc(m_runs[ri].get(),m_global.get());
-          const EventSetup c{ci};
-          MyGlobalLuminosityBlock::beginLuminosityBlock(cnstLb,c,&rc,m_lumis[li]);
-          typename T::LuminosityBlockContext lc(m_lumis[li].get(),m_runs[ri].get(),m_global.get());
-          MyGlobalLuminosityBlockSummary::beginLuminosityBlock(cnstLb,c,&lc,m_lumiSummaries[li]);
+          typename T::RunContext rc(m_runs[ri].get(), m_global.get());
+          const EventSetup c{ci,
+                             static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                             this->consumer()->esGetTokenIndices(Transition::BeginLuminosityBlock)};
+          MyGlobalLuminosityBlock::beginLuminosityBlock(cnstLb, c, &rc, m_lumis[li]);
+          typename T::LuminosityBlockContext lc(m_lumis[li].get(), m_runs[ri].get(), m_global.get());
+          MyGlobalLuminosityBlockSummary::beginLuminosityBlock(cnstLb, c, &lc, m_lumiSummaries[li]);
         }
-        
       }
       void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
-                                EventSetupImpl const&  ci,
+                                EventSetupImpl const& ci,
                                 ModuleCallingContext const* mcc) final {
-        if constexpr(T::HasAbility::kLuminosityBlockCache or T::HasAbility::kLuminosityBlockSummaryCache) {
-          
+        if constexpr (T::HasAbility::kLuminosityBlockCache or T::HasAbility::kLuminosityBlockSummaryCache) {
           LuminosityBlock lb(lbp, moduleDescription(), mcc, true);
           lb.setConsumer(consumer());
-          
+
           LuminosityBlockIndex li = lbp.index();
           RunIndex ri = lbp.runPrincipal().index();
-          typename T::LuminosityBlockContext lc(m_lumis[li].get(),m_runs[ri].get(),m_global.get());
-          const EventSetup c{ci};
-          MyGlobalLuminosityBlockSummary::globalEndLuminosityBlock(lb,c,&lc,m_lumiSummaries[li].get());
-          MyGlobalLuminosityBlock::endLuminosityBlock(lb,c,&lc);
+          typename T::LuminosityBlockContext lc(m_lumis[li].get(), m_runs[ri].get(), m_global.get());
+          const EventSetup c{ci,
+                             static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                             this->consumer()->esGetTokenIndices(Transition::EndLuminosityBlock)};
+          MyGlobalLuminosityBlockSummary::globalEndLuminosityBlock(lb, c, &lc, m_lumiSummaries[li].get());
+          MyGlobalLuminosityBlock::endLuminosityBlock(lb, c, &lc);
         }
       }
 
-      EDAnalyzerAdaptor(const EDAnalyzerAdaptor&) = delete; // stop default
-      
-      const EDAnalyzerAdaptor& operator=(const EDAnalyzerAdaptor&) = delete; // stop default
-      
+      EDAnalyzerAdaptor(const EDAnalyzerAdaptor&) = delete;  // stop default
+
+      const EDAnalyzerAdaptor& operator=(const EDAnalyzerAdaptor&) = delete;  // stop default
+
       // ---------- member data --------------------------------
       typename impl::choose_unique_ptr<typename T::GlobalCache>::type m_global;
       typename impl::choose_shared_vec<typename T::RunCache const>::type m_runs;
@@ -200,21 +187,21 @@ namespace edm {
       typename impl::choose_mutex<typename T::LuminosityBlockSummaryCache>::type m_lumiSummaryLock;
       ParameterSet const* m_pset;
     };
-  }
-  
-  template<>
-  class MakeModuleHelper<edm::stream::EDAnalyzerAdaptorBase>
-  {
+  }  // namespace stream
+
+  template <>
+  class MakeModuleHelper<edm::stream::EDAnalyzerAdaptorBase> {
     typedef edm::stream::EDAnalyzerAdaptorBase Base;
+
   public:
-    template<typename ModType>
+    template <typename ModType>
     static std::unique_ptr<Base> makeModule(ParameterSet const& pset) {
-      typedef typename stream::BaseToAdaptor<Base,ModType>::Type Adaptor;
+      typedef typename stream::BaseToAdaptor<Base, ModType>::Type Adaptor;
       auto module = std::make_unique<Adaptor>(pset);
       return std::unique_ptr<Base>(module.release());
     }
   };
 
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/stream/EDAnalyzerAdaptorBase.h b/FWCore/Framework/interface/stream/EDAnalyzerAdaptorBase.h
index fc5ca8e6920d8..e3cab1dd9a63c 100644
--- a/FWCore/Framework/interface/stream/EDAnalyzerAdaptorBase.h
+++ b/FWCore/Framework/interface/stream/EDAnalyzerAdaptorBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDAnalyzerAdaptorBase
-// 
+//
 /**\class edm::stream::EDAnalyzerAdaptorBase EDAnalyzerAdaptorBase.h "FWCore/Framework/interface/stream/EDAnalyzerAdaptorBase.h"
 
  Description: [one line class summary]
@@ -34,7 +34,6 @@
 #include "FWCore/Utilities/interface/RunIndex.h"
 #include "FWCore/Utilities/interface/LuminosityBlockIndex.h"
 
-
 // forward declarations
 
 namespace edm {
@@ -49,56 +48,61 @@ namespace edm {
   class WaitingTask;
 
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
+  }
+
+  namespace eventsetup {
+    class ESRecordsToProxyIndices;
   }
-  
+
   namespace stream {
     class EDAnalyzerBase;
 
-    class EDAnalyzerAdaptorBase
-    {
-      
+    class EDAnalyzerAdaptorBase {
     public:
-      template <typename T> friend class edm::WorkerT;
-      template <typename T> friend class edm::maker::ModuleHolderT;
+      template <typename T>
+      friend class edm::WorkerT;
+      template <typename T>
+      friend class edm::maker::ModuleHolderT;
 
       EDAnalyzerAdaptorBase();
       virtual ~EDAnalyzerAdaptorBase();
-      
+
       // ---------- const member functions ---------------------
-      
+
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
-      const ModuleDescription& moduleDescription() const { return moduleDescription_;}
-      
+      const ModuleDescription& moduleDescription() const { return moduleDescription_; }
+
       virtual bool wantsGlobalRuns() const = 0;
       virtual bool wantsGlobalLuminosityBlocks() const = 0;
-      bool wantsStreamRuns() const {return true;}
-      bool wantsStreamLuminosityBlocks() const {return true;}
+      bool wantsStreamRuns() const { return true; }
+      bool wantsStreamLuminosityBlocks() const { return true; }
+
+      std::string workerType() const { return "WorkerT<EDAnalyzerAdaptorBase>"; }
+      void registerProductsAndCallbacks(EDAnalyzerAdaptorBase const*, ProductRegistry* reg);
 
-      std::string workerType() const { return "WorkerT<EDAnalyzerAdaptorBase>";}
-      void
-      registerProductsAndCallbacks(EDAnalyzerAdaptorBase const*, ProductRegistry* reg);
     protected:
-      template<typename T> void createStreamModules(T iFunc) {
-        for(auto& m: m_streamModules) {
+      template <typename T>
+      void createStreamModules(T iFunc) {
+        for (auto& m : m_streamModules) {
           m = iFunc();
           setModuleDescriptionPtr(m);
         }
       }
-      
+
       //Same interface as EDConsumerBase
       void itemsToGet(BranchType, std::vector<ProductResolverIndexAndSkipBit>&) const;
       void itemsMayGet(BranchType, std::vector<ProductResolverIndexAndSkipBit>&) const;
       std::vector<ProductResolverIndexAndSkipBit> const& itemsToGetFrom(BranchType) const;
 
-      void updateLookup(BranchType iBranchType,
-                        ProductResolverIndexHelper const&,
-                        bool iPrefetchMayGet);
-      
+      void updateLookup(BranchType iBranchType, ProductResolverIndexHelper const&, bool iPrefetchMayGet);
+      void updateLookup(eventsetup::ESRecordsToProxyIndices const&);
+
       const EDConsumerBase* consumer() const;
-      
+
       void modulesWhoseProductsAreConsumed(std::vector<ModuleDescription const*>& modules,
                                            ProductRegistry const& preg,
                                            std::map<std::string, ModuleDescription const*> const& labelsToDesc,
@@ -109,74 +113,67 @@ namespace edm {
       std::vector<ConsumesInfo> consumesInfo() const;
 
     private:
-      EDAnalyzerAdaptorBase(const EDAnalyzerAdaptorBase&) = delete; // stop default
-      
-      const EDAnalyzerAdaptorBase& operator=(const EDAnalyzerAdaptorBase&) = delete; // stop default
-      
-      bool doEvent(EventPrincipal const& ep, EventSetupImpl const&  c,
-                   ActivityRegistry*,
-                   ModuleCallingContext const*) ;
+      EDAnalyzerAdaptorBase(const EDAnalyzerAdaptorBase&) = delete;  // stop default
+
+      const EDAnalyzerAdaptorBase& operator=(const EDAnalyzerAdaptorBase&) = delete;  // stop default
+
+      bool doEvent(EventPrincipal const& ep, EventSetupImpl const& c, ActivityRegistry*, ModuleCallingContext const*);
       void doPreallocate(PreallocationConfiguration const&);
       virtual void preallocLumis(unsigned int) {}
-      
+
       //For now this is a placeholder
-      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
-      
+      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                                    ModuleCallingContext const& iModuleCallingContext,
+                                                    Principal const& iPrincipal) const {}
+
       virtual void setupStreamModules() = 0;
       void doBeginJob();
       virtual void doEndJob() = 0;
-      
+
       void doBeginStream(StreamID id);
       void doEndStream(StreamID id);
-      void doStreamBeginRun(StreamID id,
-                            RunPrincipal const& ep,
-                            EventSetupImpl const&  c,
-                            ModuleCallingContext const*);
+      void doStreamBeginRun(StreamID id, RunPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const*);
       virtual void setupRun(EDAnalyzerBase*, RunIndex) = 0;
-      void doStreamEndRun(StreamID id,
-                          RunPrincipal const& ep,
-                          EventSetupImpl const&  c,
-                          ModuleCallingContext const*);
-      virtual void streamEndRunSummary(EDAnalyzerBase*,edm::Run const&, edm::EventSetup const&) = 0;
+      void doStreamEndRun(StreamID id, RunPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const*);
+      virtual void streamEndRunSummary(EDAnalyzerBase*, edm::Run const&, edm::EventSetup const&) = 0;
 
       void doStreamBeginLuminosityBlock(StreamID id,
                                         LuminosityBlockPrincipal const& ep,
-                                        EventSetupImpl const&  c,
+                                        EventSetupImpl const& c,
                                         ModuleCallingContext const*);
       virtual void setupLuminosityBlock(EDAnalyzerBase*, LuminosityBlockIndex) = 0;
       void doStreamEndLuminosityBlock(StreamID id,
                                       LuminosityBlockPrincipal const& ep,
-                                      EventSetupImpl const&  c,
+                                      EventSetupImpl const& c,
                                       ModuleCallingContext const*);
-      virtual void streamEndLuminosityBlockSummary(EDAnalyzerBase*,edm::LuminosityBlock const&, edm::EventSetup const&) = 0;
-
-      virtual void doBeginRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                              ModuleCallingContext const*)=0;
-      virtual void doEndRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                            ModuleCallingContext const*)=0;
-      virtual void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
-                                          ModuleCallingContext const*)=0;
-      virtual void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  c,
-                                        ModuleCallingContext const*)=0;
+      virtual void streamEndLuminosityBlockSummary(EDAnalyzerBase*,
+                                                   edm::LuminosityBlock const&,
+                                                   edm::EventSetup const&) = 0;
+
+      virtual void doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*) = 0;
+      virtual void doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*) = 0;
+      virtual void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                          EventSetupImpl const& c,
+                                          ModuleCallingContext const*) = 0;
+      virtual void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                        EventSetupImpl const& c,
+                                        ModuleCallingContext const*) = 0;
 
       //For now, the following are just dummy implemenations with no ability for users to override
       void doRespondToOpenInputFile(FileBlock const& fb);
       void doRespondToCloseInputFile(FileBlock const& fb);
-      void doRegisterThinnedAssociations(ProductRegistry const&,
-                                         ThinnedAssociationsHelper&) { }
+      void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
 
       bool hasAcquire() const { return false; }
       bool hasAccumulator() const { return false; }
 
       // ---------- member data --------------------------------
       void setModuleDescriptionPtr(EDAnalyzerBase* m);
-      void setModuleDescription(ModuleDescription const& md) {
-        moduleDescription_ = md;
-      }
+      void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
       ModuleDescription moduleDescription_;
 
       std::vector<EDAnalyzerBase*> m_streamModules;
     };
-  }
-}
+  }  // namespace stream
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/stream/EDAnalyzerBase.h b/FWCore/Framework/interface/stream/EDAnalyzerBase.h
index 27657750cf34c..5d92375f8a9f8 100644
--- a/FWCore/Framework/interface/stream/EDAnalyzerBase.h
+++ b/FWCore/Framework/interface/stream/EDAnalyzerBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDAnalyzerBase
-// 
+//
 /**\class edm::stream::EDAnalyzerBase EDAnalyzerBase.h "FWCore/Framework/interface/stream/EDAnalyzerBase.h"
 
  Description: [one line class summary]
@@ -31,57 +31,48 @@
 namespace edm {
   namespace stream {
     class EDAnalyzerAdaptorBase;
-    
-    class EDAnalyzerBase : public edm::EDConsumerBase
-    {
+
+    class EDAnalyzerBase : public edm::EDConsumerBase {
       //This needs access to the parentage cache info
       friend class EDAnalyzerAdaptorBase;
 
     public:
       typedef EDAnalyzerAdaptorBase ModuleType;
 
-
       EDAnalyzerBase();
       ~EDAnalyzerBase() override;
-      
+
       static void fillDescriptions(ConfigurationDescriptions& descriptions);
       static void prevalidate(ConfigurationDescriptions& descriptions);
       static const std::string& baseType();
-      
+
       // Warning: the returned moduleDescription will be invalid during construction
-      ModuleDescription const& moduleDescription() const {
-        return *moduleDescriptionPtr_;
-      }
+      ModuleDescription const& moduleDescription() const { return *moduleDescriptionPtr_; }
 
       void callWhenNewProductsRegistered(std::function<void(BranchDescription const&)> const& func);
 
     private:
-      EDAnalyzerBase(const EDAnalyzerBase&) = delete; // stop default
-      
-      const EDAnalyzerBase& operator=(const EDAnalyzerBase&) = delete; // stop default
-      
+      EDAnalyzerBase(const EDAnalyzerBase&) = delete;  // stop default
+
+      const EDAnalyzerBase& operator=(const EDAnalyzerBase&) = delete;  // stop default
+
       void registerProductsAndCallbacks(EDAnalyzerBase const*, ProductRegistry* reg);
-      
+
       virtual void beginStream(StreamID) {}
       virtual void beginRun(edm::Run const&, edm::EventSetup const&) {}
       virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {}
       virtual void analyze(Event const&, EventSetup const&) = 0;
       virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {}
       virtual void endRun(edm::Run const&, edm::EventSetup const&) {}
-      virtual void endStream(){}
-      
+      virtual void endStream() {}
 
-      void setModuleDescriptionPtr(ModuleDescription const* iDesc) {
-        moduleDescriptionPtr_ = iDesc;
-      }
+      void setModuleDescriptionPtr(ModuleDescription const* iDesc) { moduleDescriptionPtr_ = iDesc; }
       // ---------- member data --------------------------------
       std::function<void(BranchDescription const&)> callWhenNewProductsRegistered_;
       ModuleDescription const* moduleDescriptionPtr_;
     };
-    
-  }
-}
-
 
+  }  // namespace stream
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/stream/EDFilter.h b/FWCore/Framework/interface/stream/EDFilter.h
index d343fb9780790..6297237064248 100644
--- a/FWCore/Framework/interface/stream/EDFilter.h
+++ b/FWCore/Framework/interface/stream/EDFilter.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDFilter
-// 
+//
 /**\class edm::stream::EDFilter EDFilter.h "FWCore/Framework/interface/stream/EDFilter.h"
 
  Description: Base class for stream based EDFilters
@@ -34,61 +34,47 @@ namespace edm {
   class WaitingTaskWithArenaHolder;
 
   namespace stream {
-    template< typename... T>
-    class EDFilter : public AbilityToImplementor<T>::Type...,
-                       public EDFilterBase
-    {
-      
+    template <typename... T>
+    class EDFilter : public AbilityToImplementor<T>::Type..., public EDFilterBase {
     public:
       typedef CacheContexts<T...> CacheTypes;
-      
+
       typedef typename CacheTypes::GlobalCache GlobalCache;
       typedef typename CacheTypes::RunCache RunCache;
       typedef typename CacheTypes::LuminosityBlockCache LuminosityBlockCache;
-      typedef RunContextT<RunCache,GlobalCache> RunContext;
-      typedef LuminosityBlockContextT<LuminosityBlockCache,
-                                     RunCache,
-                                     GlobalCache> LuminosityBlockContext;
+      typedef RunContextT<RunCache, GlobalCache> RunContext;
+      typedef LuminosityBlockContextT<LuminosityBlockCache, RunCache, GlobalCache> LuminosityBlockContext;
       typedef typename CacheTypes::RunSummaryCache RunSummaryCache;
       typedef typename CacheTypes::LuminosityBlockSummaryCache LuminosityBlockSummaryCache;
 
       typedef AbilityChecker<T...> HasAbility;
-      
-      
+
       EDFilter() = default;
       //virtual ~EDFilter();
-      
+
       // ---------- const member functions ---------------------
-      
+
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
 
-      bool hasAbilityToProduceInRuns() const final {
-        return HasAbilityToProduceInRuns<T...>::value;
-      }
+      bool hasAbilityToProduceInRuns() const final { return HasAbilityToProduceInRuns<T...>::value; }
 
-      bool hasAbilityToProduceInLumis() const final {
-        return HasAbilityToProduceInLumis<T...>::value;
-      }
+      bool hasAbilityToProduceInLumis() const final { return HasAbilityToProduceInLumis<T...>::value; }
 
     private:
-      EDFilter(const EDFilter&) = delete; // stop default
-      
-      const EDFilter& operator=(const EDFilter&) = delete; // stop default
+      EDFilter(const EDFilter&) = delete;  // stop default
+
+      const EDFilter& operator=(const EDFilter&) = delete;  // stop default
 
-      void doAcquire_(Event const& ev,
-                      EventSetup const& es,
-                      WaitingTaskWithArenaHolder& holder) override final {
+      void doAcquire_(Event const& ev, EventSetup const& es, WaitingTaskWithArenaHolder& holder) final {
         doAcquireIfNeeded(this, ev, es, holder);
       }
 
       // ---------- member data --------------------------------
-      
     };
-    
-  }
-}
 
+  }  // namespace stream
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/stream/EDFilterAdaptor.h b/FWCore/Framework/interface/stream/EDFilterAdaptor.h
index 87611c6c168a6..b69fab70c4fe5 100644
--- a/FWCore/Framework/interface/stream/EDFilterAdaptor.h
+++ b/FWCore/Framework/interface/stream/EDFilterAdaptor.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDFilterAdaptor
-// 
+//
 /**\class edm::stream::EDFilterAdaptor EDFilterAdaptor.h "EDFilterAdaptor.h"
 
  Description: Adapts an edm::stream::EDFilter<> to work with an edm::Worker
@@ -30,28 +30,31 @@
 namespace edm {
   namespace stream {
 
-    template<typename T> using EDFilterAdaptor = ProducingModuleAdaptor<T,EDFilterBase, EDFilterAdaptorBase>;
+    template <typename T>
+    using EDFilterAdaptor = ProducingModuleAdaptor<T, EDFilterBase, EDFilterAdaptorBase>;
 
-    template<typename ABase, typename ModType> struct BaseToAdaptor;
+    template <typename ABase, typename ModType>
+    struct BaseToAdaptor;
 
-    template<typename ModType> struct BaseToAdaptor<EDFilterAdaptorBase,ModType> {
+    template <typename ModType>
+    struct BaseToAdaptor<EDFilterAdaptorBase, ModType> {
       typedef EDFilterAdaptor<ModType> Type;
     };
-  }
-  
-  template<>
-  class MakeModuleHelper<edm::stream::EDFilterAdaptorBase>
-  {
+  }  // namespace stream
+
+  template <>
+  class MakeModuleHelper<edm::stream::EDFilterAdaptorBase> {
     typedef edm::stream::EDFilterAdaptorBase Base;
+
   public:
-    template<typename ModType>
+    template <typename ModType>
     static std::unique_ptr<Base> makeModule(ParameterSet const& pset) {
-      typedef typename stream::BaseToAdaptor<Base,ModType>::Type Adaptor;
+      typedef typename stream::BaseToAdaptor<Base, ModType>::Type Adaptor;
       auto module = std::make_unique<Adaptor>(pset);
       return std::unique_ptr<Base>(module.release());
     }
   };
 
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/stream/EDFilterAdaptorBase.h b/FWCore/Framework/interface/stream/EDFilterAdaptorBase.h
index 2f80e291293fd..054017c4ea71c 100644
--- a/FWCore/Framework/interface/stream/EDFilterAdaptorBase.h
+++ b/FWCore/Framework/interface/stream/EDFilterAdaptorBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDFilterAdaptorBase
-// 
+//
 /**\class edm::stream::EDFilterAdaptorBase EDFilterAdaptorBase.h "FWCore/Framework/interface/stream/EDFilterAdaptorBase.h"
 
  Description: [one line class summary]
@@ -29,7 +29,6 @@
 #include "FWCore/Utilities/interface/RunIndex.h"
 #include "FWCore/Utilities/interface/LuminosityBlockIndex.h"
 
-
 // forward declarations
 
 namespace edm {
@@ -40,49 +39,51 @@ namespace edm {
   class WaitingTaskWithArenaHolder;
 
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
   }
 
   namespace stream {
     class EDFilterBase;
-    class EDFilterAdaptorBase : public ProducingModuleAdaptorBase<EDFilterBase>
-    {
-      
+    class EDFilterAdaptorBase : public ProducingModuleAdaptorBase<EDFilterBase> {
     public:
-      template <typename T> friend class edm::maker::ModuleHolderT;
-      template <typename T> friend class edm::WorkerT;
+      template <typename T>
+      friend class edm::maker::ModuleHolderT;
+      template <typename T>
+      friend class edm::WorkerT;
 
       EDFilterAdaptorBase();
-      
+
       // ---------- const member functions ---------------------
-      
+
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
-      
-      std::string workerType() const { return "WorkerT<EDFilterAdaptorBase>";}
+
+      std::string workerType() const { return "WorkerT<EDFilterAdaptorBase>"; }
+
     protected:
       using ProducingModuleAdaptorBase<EDFilterBase>::commit;
 
     private:
-      EDFilterAdaptorBase(const EDFilterAdaptorBase&) =delete; // stop default
-      
-      const EDFilterAdaptorBase& operator=(const EDFilterAdaptorBase&) =delete; // stop default
+      EDFilterAdaptorBase(const EDFilterAdaptorBase&) = delete;  // stop default
+
+      const EDFilterAdaptorBase& operator=(const EDFilterAdaptorBase&) = delete;  // stop default
 
-      bool doEvent(EventPrincipal const&, EventSetupImpl const& ,
-                   ActivityRegistry*,
-                   ModuleCallingContext const*);
+      bool doEvent(EventPrincipal const&, EventSetupImpl const&, ActivityRegistry*, ModuleCallingContext const*);
 
-      void doAcquire(EventPrincipal const&, EventSetupImpl const& ,
+      void doAcquire(EventPrincipal const&,
+                     EventSetupImpl const&,
                      ActivityRegistry*,
                      ModuleCallingContext const*,
                      WaitingTaskWithArenaHolder&);
 
       //For now this is a placeholder
-      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
-
+      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                                    ModuleCallingContext const& iModuleCallingContext,
+                                                    Principal const& iPrincipal) const {}
     };
-  }
-}
+  }  // namespace stream
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/stream/EDFilterBase.h b/FWCore/Framework/interface/stream/EDFilterBase.h
index 6e2f886b5104d..94f4f61f74dfb 100644
--- a/FWCore/Framework/interface/stream/EDFilterBase.h
+++ b/FWCore/Framework/interface/stream/EDFilterBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDFilterBase
-// 
+//
 /**\class edm::stream::EDFilterBase EDFilterBase.h "FWCore/Framework/interface/stream/EDFilterBase.h"
 
  Description: [one line class summary]
@@ -37,10 +37,10 @@ namespace edm {
 
   namespace stream {
     class EDFilterAdaptorBase;
-    template<typename> class ProducingModuleAdaptorBase;
-    
-    class EDFilterBase : public edm::ProducerBase, public edm::EDConsumerBase
-    {
+    template <typename>
+    class ProducingModuleAdaptorBase;
+
+    class EDFilterBase : public edm::ProducerBase, public edm::EDConsumerBase {
       //This needs access to the parentage cache info
       friend class EDFilterAdaptorBase;
       friend class ProducingModuleAdaptorBase<EDFilterBase>;
@@ -48,41 +48,34 @@ namespace edm {
     public:
       typedef EDFilterAdaptorBase ModuleType;
 
-
       EDFilterBase();
       ~EDFilterBase() override;
-      
+
       static void fillDescriptions(ConfigurationDescriptions& descriptions);
       static void prevalidate(ConfigurationDescriptions& descriptions);
       static const std::string& baseType();
-      
+
       // Warning: the returned moduleDescription will be invalid during construction
-      ModuleDescription const& moduleDescription() const {
-        return *moduleDescriptionPtr_;
-      }
+      ModuleDescription const& moduleDescription() const { return *moduleDescriptionPtr_; }
+
     private:
-      EDFilterBase(const EDFilterBase&) = delete; // stop default
-      
-      const EDFilterBase& operator=(const EDFilterBase&) = delete; // stop default
-      
+      EDFilterBase(const EDFilterBase&) = delete;  // stop default
+
+      const EDFilterBase& operator=(const EDFilterBase&) = delete;  // stop default
+
       virtual void beginStream(StreamID) {}
       virtual void beginRun(edm::Run const&, edm::EventSetup const&) {}
       virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {}
       virtual bool filter(Event&, EventSetup const&) = 0;
       virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {}
       virtual void endRun(edm::Run const&, edm::EventSetup const&) {}
-      virtual void endStream(){}
+      virtual void endStream() {}
 
-      virtual void registerThinnedAssociations(ProductRegistry const&,
-                                               ThinnedAssociationsHelper&) { }
+      virtual void registerThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
 
-      virtual void doAcquire_(Event const&,
-                              EventSetup const&,
-                              WaitingTaskWithArenaHolder&) = 0;
+      virtual void doAcquire_(Event const&, EventSetup const&, WaitingTaskWithArenaHolder&) = 0;
 
-      void setModuleDescriptionPtr(ModuleDescription const* iDesc) {
-        moduleDescriptionPtr_ = iDesc;
-      }
+      void setModuleDescriptionPtr(ModuleDescription const* iDesc) { moduleDescriptionPtr_ = iDesc; }
       // ---------- member data --------------------------------
 
       std::vector<BranchID> previousParentage_;
@@ -90,6 +83,6 @@ namespace edm {
       ParentageID previousParentageId_;
       ModuleDescription const* moduleDescriptionPtr_;
     };
-  }
-}
+  }  // namespace stream
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/stream/EDProducer.h b/FWCore/Framework/interface/stream/EDProducer.h
index 82dc0109951e3..b1c7920decb3e 100644
--- a/FWCore/Framework/interface/stream/EDProducer.h
+++ b/FWCore/Framework/interface/stream/EDProducer.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDProducer
-// 
+//
 /**\class edm::stream::EDProducer EDProducer.h "FWCore/Framework/interface/stream/EDProducer.h"
 
  Description: Base class for stream based EDProducers
@@ -34,63 +34,50 @@ namespace edm {
   class WaitingTaskWithArenaHolder;
 
   namespace stream {
-    template< typename... T>
+    template <typename... T>
     class EDProducer : public AbilityToImplementor<T>::Type...,
-      public std::conditional<CheckAbility<edm::module::Abilities::kAccumulator,T...>::kHasIt,
-                              impl::EmptyType,
-                              EDProducerBase>::type
-    {
-      
+                       public std::conditional<CheckAbility<edm::module::Abilities::kAccumulator, T...>::kHasIt,
+                                               impl::EmptyType,
+                                               EDProducerBase>::type {
     public:
       typedef CacheContexts<T...> CacheTypes;
-      
+
       typedef typename CacheTypes::GlobalCache GlobalCache;
       typedef typename CacheTypes::RunCache RunCache;
       typedef typename CacheTypes::LuminosityBlockCache LuminosityBlockCache;
-      typedef RunContextT<RunCache,GlobalCache> RunContext;
-      typedef LuminosityBlockContextT<LuminosityBlockCache,
-                                     RunCache,
-                                     GlobalCache> LuminosityBlockContext;
+      typedef RunContextT<RunCache, GlobalCache> RunContext;
+      typedef LuminosityBlockContextT<LuminosityBlockCache, RunCache, GlobalCache> LuminosityBlockContext;
       typedef typename CacheTypes::RunSummaryCache RunSummaryCache;
       typedef typename CacheTypes::LuminosityBlockSummaryCache LuminosityBlockSummaryCache;
 
       typedef AbilityChecker<T...> HasAbility;
-      
-      
-      bool hasAbilityToProduceInRuns() const final {
-        return HasAbilityToProduceInRuns<T...>::value;
-      }
 
-      bool hasAbilityToProduceInLumis() const final {
-        return HasAbilityToProduceInLumis<T...>::value;
-      }
+      bool hasAbilityToProduceInRuns() const final { return HasAbilityToProduceInRuns<T...>::value; }
+
+      bool hasAbilityToProduceInLumis() const final { return HasAbilityToProduceInLumis<T...>::value; }
 
       EDProducer() = default;
       //virtual ~EDProducer();
-      
+
       // ---------- const member functions ---------------------
-      
+
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
-      
+
     private:
-      EDProducer(const EDProducer&) = delete; // stop default
-      
-      const EDProducer& operator=(const EDProducer&) = delete; // stop default
+      EDProducer(const EDProducer&) = delete;  // stop default
+
+      const EDProducer& operator=(const EDProducer&) = delete;  // stop default
 
-      void doAcquire_(Event const& ev,
-                      EventSetup const& es,
-                      WaitingTaskWithArenaHolder& holder) override final {
+      void doAcquire_(Event const& ev, EventSetup const& es, WaitingTaskWithArenaHolder& holder) override final {
         doAcquireIfNeeded(this, ev, es, holder);
       }
 
       // ---------- member data --------------------------------
-      
     };
-    
-  }
-}
 
+  }  // namespace stream
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/stream/EDProducerAdaptor.h b/FWCore/Framework/interface/stream/EDProducerAdaptor.h
index 7c0ec44c389e2..d3a7d5b347e6a 100644
--- a/FWCore/Framework/interface/stream/EDProducerAdaptor.h
+++ b/FWCore/Framework/interface/stream/EDProducerAdaptor.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDProducerAdaptor
-// 
+//
 /**\class edm::stream::EDProducerAdaptor EDProducerAdaptor.h "EDProducerAdaptor.h"
 
  Description: Adapts an edm::stream::EDProducer<> to work with an edm::Worker
@@ -28,27 +28,30 @@
 
 namespace edm {
   namespace stream {
-    template<typename ABase, typename ModType> struct BaseToAdaptor;
+    template <typename ABase, typename ModType>
+    struct BaseToAdaptor;
 
-    template<typename T> using EDProducerAdaptor = ProducingModuleAdaptor<T,EDProducerBase, EDProducerAdaptorBase>;
+    template <typename T>
+    using EDProducerAdaptor = ProducingModuleAdaptor<T, EDProducerBase, EDProducerAdaptorBase>;
 
-    template<typename ModType> struct BaseToAdaptor<EDProducerAdaptorBase,ModType> {
+    template <typename ModType>
+    struct BaseToAdaptor<EDProducerAdaptorBase, ModType> {
       typedef EDProducerAdaptor<ModType> Type;
     };
-  }
-  
-  template<>
-  class MakeModuleHelper<edm::stream::EDProducerAdaptorBase>
-  {
+  }  // namespace stream
+
+  template <>
+  class MakeModuleHelper<edm::stream::EDProducerAdaptorBase> {
     typedef edm::stream::EDProducerAdaptorBase Base;
+
   public:
-    template<typename ModType>
+    template <typename ModType>
     static std::unique_ptr<Base> makeModule(ParameterSet const& pset) {
-      typedef typename stream::BaseToAdaptor<Base,ModType>::Type Adaptor;
+      typedef typename stream::BaseToAdaptor<Base, ModType>::Type Adaptor;
       auto module = std::make_unique<Adaptor>(pset);
       return std::unique_ptr<Base>(module.release());
     }
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/stream/EDProducerAdaptorBase.h b/FWCore/Framework/interface/stream/EDProducerAdaptorBase.h
index 00029f85907f0..db35ba852fcc1 100644
--- a/FWCore/Framework/interface/stream/EDProducerAdaptorBase.h
+++ b/FWCore/Framework/interface/stream/EDProducerAdaptorBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDProducerAdaptorBase
-// 
+//
 /**\class edm::stream::EDProducerAdaptorBase EDProducerAdaptorBase.h "FWCore/Framework/interface/stream/EDProducerAdaptorBase.h"
 
  Description: [one line class summary]
@@ -29,7 +29,6 @@
 #include "FWCore/Utilities/interface/RunIndex.h"
 #include "FWCore/Utilities/interface/LuminosityBlockIndex.h"
 
-
 // forward declarations
 
 namespace edm {
@@ -40,49 +39,51 @@ namespace edm {
   class WaitingTaskWithArenaHolder;
 
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
   }
 
   namespace stream {
     class EDProducerBase;
-    class EDProducerAdaptorBase : public ProducingModuleAdaptorBase<EDProducerBase>
-    {
-      
+    class EDProducerAdaptorBase : public ProducingModuleAdaptorBase<EDProducerBase> {
     public:
-      template <typename T> friend class edm::maker::ModuleHolderT;
-      template <typename T> friend class edm::WorkerT;
+      template <typename T>
+      friend class edm::maker::ModuleHolderT;
+      template <typename T>
+      friend class edm::WorkerT;
 
       EDProducerAdaptorBase();
-      
+
       // ---------- const member functions ---------------------
-      
+
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
-      
-      std::string workerType() const { return "WorkerT<EDProducerAdaptorBase>";}
+
+      std::string workerType() const { return "WorkerT<EDProducerAdaptorBase>"; }
+
     protected:
       using ProducingModuleAdaptorBase<EDProducerBase>::commit;
 
     private:
-      EDProducerAdaptorBase(const EDProducerAdaptorBase&) =delete; // stop default
-      
-      const EDProducerAdaptorBase& operator=(const EDProducerAdaptorBase&) =delete; // stop default
+      EDProducerAdaptorBase(const EDProducerAdaptorBase&) = delete;  // stop default
+
+      const EDProducerAdaptorBase& operator=(const EDProducerAdaptorBase&) = delete;  // stop default
 
-      bool doEvent(EventPrincipal const&, EventSetupImpl const& ,
-                   ActivityRegistry*,
-                   ModuleCallingContext const*);
+      bool doEvent(EventPrincipal const&, EventSetupImpl const&, ActivityRegistry*, ModuleCallingContext const*);
 
-      void doAcquire(EventPrincipal const&, EventSetupImpl const& ,
+      void doAcquire(EventPrincipal const&,
+                     EventSetupImpl const&,
                      ActivityRegistry*,
                      ModuleCallingContext const*,
                      WaitingTaskWithArenaHolder&);
 
       //For now this is a placeholder
-      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {}
-
+      /*virtual*/ void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                                    ModuleCallingContext const& iModuleCallingContext,
+                                                    Principal const& iPrincipal) const {}
     };
-  }
-}
+  }  // namespace stream
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/stream/EDProducerBase.h b/FWCore/Framework/interface/stream/EDProducerBase.h
index 769d90557f398..8ddf6d0cb121d 100644
--- a/FWCore/Framework/interface/stream/EDProducerBase.h
+++ b/FWCore/Framework/interface/stream/EDProducerBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDProducerBase
-// 
+//
 /**\class edm::stream::EDProducerBase EDProducerBase.h "FWCore/Framework/interface/stream/EDProducerBase.h"
 
  Description: [one line class summary]
@@ -30,17 +30,18 @@
 
 // forward declarations
 namespace edm {
-  template<typename T> class WorkerT;
+  template <typename T>
+  class WorkerT;
   class ProductRegistry;
   class ThinnedAssociationsHelper;
   class WaitingTaskWithArenaHolder;
 
   namespace stream {
     class EDProducerAdaptorBase;
-    template<typename> class ProducingModuleAdaptorBase;
-    
-    class EDProducerBase : public edm::ProducerBase, public edm::EDConsumerBase
-    {
+    template <typename>
+    class ProducingModuleAdaptorBase;
+
+    class EDProducerBase : public edm::ProducerBase, public edm::EDConsumerBase {
       //This needs access to the parentage cache info
       friend class EDProducerAdaptorBase;
       friend class ProducingModuleAdaptorBase<EDProducerBase>;
@@ -50,48 +51,40 @@ namespace edm {
 
       EDProducerBase();
       ~EDProducerBase() override;
-      
+
       static void fillDescriptions(ConfigurationDescriptions& descriptions);
       static void prevalidate(ConfigurationDescriptions& descriptions);
       static const std::string& baseType();
-      
+
       // Warning: the returned moduleDescription will be invalid during construction
-      ModuleDescription const& moduleDescription() const {
-        return *moduleDescriptionPtr_;
-      }
+      ModuleDescription const& moduleDescription() const { return *moduleDescriptionPtr_; }
+
     private:
-      EDProducerBase(const EDProducerBase&) = delete; // stop default
-      
-      const EDProducerBase& operator=(const EDProducerBase&) = delete; // stop default
-      
+      EDProducerBase(const EDProducerBase&) = delete;  // stop default
+
+      const EDProducerBase& operator=(const EDProducerBase&) = delete;  // stop default
+
       virtual void beginStream(StreamID) {}
       virtual void beginRun(edm::Run const&, edm::EventSetup const&) {}
       virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {}
       virtual void produce(Event&, EventSetup const&) = 0;
       virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {}
       virtual void endRun(edm::Run const&, edm::EventSetup const&) {}
-      virtual void endStream(){}
+      virtual void endStream() {}
 
-      virtual void registerThinnedAssociations(ProductRegistry const&,
-                                               ThinnedAssociationsHelper&) { }
+      virtual void registerThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) {}
 
-      virtual void doAcquire_(Event const&,
-                              EventSetup const&,
-                              WaitingTaskWithArenaHolder&) = 0;
+      virtual void doAcquire_(Event const&, EventSetup const&, WaitingTaskWithArenaHolder&) = 0;
 
-      void setModuleDescriptionPtr(ModuleDescription const* iDesc) {
-        moduleDescriptionPtr_ = iDesc;
-      }
+      void setModuleDescriptionPtr(ModuleDescription const* iDesc) { moduleDescriptionPtr_ = iDesc; }
       // ---------- member data --------------------------------
       std::vector<BranchID> previousParentage_;
       std::vector<BranchID> gotBranchIDsFromAcquire_;
       ParentageID previousParentageId_;
       ModuleDescription const* moduleDescriptionPtr_;
     };
-    
-  }
-}
-
 
+  }  // namespace stream
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/stream/ProducingModuleAdaptor.h b/FWCore/Framework/interface/stream/ProducingModuleAdaptor.h
index 3be7867fa1759..0540d4ac128f6 100644
--- a/FWCore/Framework/interface/stream/ProducingModuleAdaptor.h
+++ b/FWCore/Framework/interface/stream/ProducingModuleAdaptor.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     ProducingModuleAdaptor
-// 
+//
 /**\class edm::stream::ProducingModuleAdaptor ProducingModuleAdaptor.h "ProducingModuleAdaptor.h"
 
  Description: Adapts an edm::stream::EDProducer<> to work with an edm::Worker
@@ -34,50 +34,36 @@
 namespace edm {
   class ConfigurationDescriptions;
   namespace stream {
-    
-    template<typename T, typename M, typename B>
-    class ProducingModuleAdaptor : public B
-    {
-      
+
+    template <typename T, typename M, typename B>
+    class ProducingModuleAdaptor : public B {
     public:
-      ProducingModuleAdaptor( edm::ParameterSet const& iPSet):
-      m_pset(&iPSet)
-      {
+      ProducingModuleAdaptor(edm::ParameterSet const& iPSet) : m_pset(&iPSet) {
         m_runs.resize(1);
         m_lumis.resize(1);
         m_runSummaries.resize(1);
         m_lumiSummaries.resize(1);
-        typename T::GlobalCache const* dummy=nullptr;
-        m_global = impl::makeGlobal<T>(iPSet,dummy);
-      }
-      ~ProducingModuleAdaptor() override {
-      }
-      
-      static void fillDescriptions(ConfigurationDescriptions& descriptions) {
-        T::fillDescriptions(descriptions);
-      }
-      static void prevalidate(ConfigurationDescriptions& descriptions) {
-        T::prevalidate(descriptions);
+        typename T::GlobalCache const* dummy = nullptr;
+        m_global = impl::makeGlobal<T>(iPSet, dummy);
       }
+      ~ProducingModuleAdaptor() override {}
+
+      static void fillDescriptions(ConfigurationDescriptions& descriptions) { T::fillDescriptions(descriptions); }
+      static void prevalidate(ConfigurationDescriptions& descriptions) { T::prevalidate(descriptions); }
 
       bool wantsGlobalRuns() const final {
-        return T::HasAbility::kRunCache or
-        T::HasAbility::kRunSummaryCache or
-        T::HasAbility::kBeginRunProducer or
-        T::HasAbility::kEndRunProducer; }
-      bool wantsGlobalLuminosityBlocks() const final {return T::HasAbility::kLuminosityBlockCache or
-        T::HasAbility::kLuminosityBlockSummaryCache or
-        T::HasAbility::kBeginLuminosityBlockProducer or
-        T::HasAbility::kEndLuminosityBlockProducer;}
-
-      bool hasAcquire() const final {
-        return T::HasAbility::kExternalWork;
+        return T::HasAbility::kRunCache or T::HasAbility::kRunSummaryCache or T::HasAbility::kBeginRunProducer or
+               T::HasAbility::kEndRunProducer;
       }
-
-      bool hasAccumulator() const final {
-        return T::HasAbility::kAccumulator;
+      bool wantsGlobalLuminosityBlocks() const final {
+        return T::HasAbility::kLuminosityBlockCache or T::HasAbility::kLuminosityBlockSummaryCache or
+               T::HasAbility::kBeginLuminosityBlockProducer or T::HasAbility::kEndLuminosityBlockProducer;
       }
 
+      bool hasAcquire() const final { return T::HasAbility::kExternalWork; }
+
+      bool hasAccumulator() const final { return T::HasAbility::kAccumulator; }
+
     private:
       typedef CallGlobal<T> MyGlobal;
       typedef CallGlobalRun<T> MyGlobalRun;
@@ -88,36 +74,29 @@ namespace edm {
       typedef CallGlobalLuminosityBlockSummary<T> MyGlobalLuminosityBlockSummary;
       typedef CallBeginLuminosityBlockProduce<T> MyBeginLuminosityBlockProduce;
       typedef CallEndLuminosityBlockProduce<T> MyEndLuminosityBlockProduce;
-      
+
       void setupStreamModules() final {
-        this->createStreamModules([this] () -> M* {
-          auto tmp = impl::makeStreamModule<T>(*m_pset,m_global.get());
-          MyGlobal::set(tmp,m_global.get());
+        this->createStreamModules([this]() -> M* {
+          auto tmp = impl::makeStreamModule<T>(*m_pset, m_global.get());
+          MyGlobal::set(tmp, m_global.get());
           return tmp;
         });
-        m_pset= nullptr;
+        m_pset = nullptr;
       }
 
       void preallocLumis(unsigned int iNLumis) final {
         m_lumis.resize(iNLumis);
         m_lumiSummaries.resize(iNLumis);
       }
-      void doEndJob() final {
-        MyGlobal::endJob(m_global.get());
-      }
-      void setupRun(M* iProd, RunIndex iIndex) final {
-        MyGlobalRun::set(iProd, m_runs[iIndex].get());
-      }
-      void streamEndRunSummary(M* iProd,
-                               edm::Run const& iRun,
-                               edm::EventSetup const& iES) final {
+      void doEndJob() final { MyGlobal::endJob(m_global.get()); }
+      void setupRun(M* iProd, RunIndex iIndex) final { MyGlobalRun::set(iProd, m_runs[iIndex].get()); }
+      void streamEndRunSummary(M* iProd, edm::Run const& iRun, edm::EventSetup const& iES) final {
         auto s = m_runSummaries[iRun.index()].get();
         std::lock_guard<decltype(m_runSummaryLock)> guard(m_runSummaryLock);
-        MyGlobalRunSummary::streamEndRunSummary(iProd,iRun,iES,s);
+        MyGlobalRunSummary::streamEndRunSummary(iProd, iRun, iES, s);
       }
- 
-      void setupLuminosityBlock(M* iProd, LuminosityBlockIndex iIndex) final
-      {
+
+      void setupLuminosityBlock(M* iProd, LuminosityBlockIndex iIndex) final {
         MyGlobalLuminosityBlock::set(iProd, m_lumis[iIndex].get());
       }
       void streamEndLuminosityBlockSummary(M* iProd,
@@ -125,99 +104,101 @@ namespace edm {
                                            edm::EventSetup const& iES) final {
         auto s = m_lumiSummaries[iLumi.index()].get();
         std::lock_guard<decltype(m_lumiSummaryLock)> guard(m_lumiSummaryLock);
-        MyGlobalLuminosityBlockSummary::streamEndLuminosityBlockSummary(iProd,iLumi,iES,s);
+        MyGlobalLuminosityBlockSummary::streamEndLuminosityBlockSummary(iProd, iLumi, iES, s);
       }
 
-      void doBeginRun(RunPrincipal const& rp,
-                      EventSetupImpl const&  ci,
-                      ModuleCallingContext const* mcc) final {
+      void doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) final {
         if constexpr (T::HasAbility::kRunCache or T::HasAbility::kRunSummaryCache or T::HasAbility::kBeginRunProducer) {
           Run r(rp, this->moduleDescription(), mcc, false);
           r.setConsumer(this->consumer());
           r.setProducer(this->producer());
           Run const& cnstR = r;
           RunIndex ri = rp.index();
-          const EventSetup c{ci};
-          MyGlobalRun::beginRun(cnstR,c,m_global.get(),m_runs[ri]);
-          typename T::RunContext rc(m_runs[ri].get(),m_global.get());
-          MyGlobalRunSummary::beginRun(cnstR,c,&rc,m_runSummaries[ri]);
+          const EventSetup c{ci,
+                             static_cast<unsigned int>(Transition::BeginRun),
+                             this->consumer()->esGetTokenIndices(Transition::BeginRun)};
+          MyGlobalRun::beginRun(cnstR, c, m_global.get(), m_runs[ri]);
+          typename T::RunContext rc(m_runs[ri].get(), m_global.get());
+          MyGlobalRunSummary::beginRun(cnstR, c, &rc, m_runSummaries[ri]);
           if constexpr (T::HasAbility::kBeginRunProducer) {
-            MyBeginRunProduce::produce(r,c,&rc);
+            MyBeginRunProduce::produce(r, c, &rc);
             this->commit(r);
           }
         }
       }
-      void doEndRun(RunPrincipal const& rp,
-                    EventSetupImpl const&  ci,
-                    ModuleCallingContext const* mcc) final
-      {
+      void doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) final {
         if constexpr (T::HasAbility::kRunCache or T::HasAbility::kRunSummaryCache or T::HasAbility::kEndRunProducer) {
-          
           Run r(rp, this->moduleDescription(), mcc, true);
           r.setConsumer(this->consumer());
           r.setProducer(this->producer());
 
           RunIndex ri = rp.index();
-          typename T::RunContext rc(m_runs[ri].get(),m_global.get());
-          const EventSetup c{ci};
+          typename T::RunContext rc(m_runs[ri].get(), m_global.get());
+          const EventSetup c{ci,
+                             static_cast<unsigned int>(Transition::EndRun),
+                             this->consumer()->esGetTokenIndices(Transition::EndRun)};
           if constexpr (T::HasAbility::kEndRunProducer) {
-            MyEndRunProduce::produce(r,c,&rc,m_runSummaries[ri].get());
+            MyEndRunProduce::produce(r, c, &rc, m_runSummaries[ri].get());
             this->commit(r);
           }
-          MyGlobalRunSummary::globalEndRun(r,c,&rc,m_runSummaries[ri].get());
-          MyGlobalRun::endRun(r,c,&rc);
+          MyGlobalRunSummary::globalEndRun(r, c, &rc, m_runSummaries[ri].get());
+          MyGlobalRun::endRun(r, c, &rc);
         }
       }
 
-      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const&  ci,
-                                  ModuleCallingContext const* mcc) final
-      {
-        if constexpr (T::HasAbility::kLuminosityBlockCache or T::HasAbility::kLuminosityBlockSummaryCache or T::HasAbility::kBeginLuminosityBlockProducer) {
+      void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                  EventSetupImpl const& ci,
+                                  ModuleCallingContext const* mcc) final {
+        if constexpr (T::HasAbility::kLuminosityBlockCache or T::HasAbility::kLuminosityBlockSummaryCache or
+                      T::HasAbility::kBeginLuminosityBlockProducer) {
           LuminosityBlock lb(lbp, this->moduleDescription(), mcc, false);
           lb.setConsumer(this->consumer());
           lb.setProducer(this->producer());
           LuminosityBlock const& cnstLb = lb;
           LuminosityBlockIndex li = lbp.index();
           RunIndex ri = lbp.runPrincipal().index();
-          typename T::RunContext rc(m_runs[ri].get(),m_global.get());
-          const EventSetup c{ci};
-
-          MyGlobalLuminosityBlock::beginLuminosityBlock(cnstLb,c,&rc,m_lumis[li]);
-          typename T::LuminosityBlockContext lc(m_lumis[li].get(),m_runs[ri].get(),m_global.get());
-          MyGlobalLuminosityBlockSummary::beginLuminosityBlock(cnstLb,c,&lc,m_lumiSummaries[li]);
+          typename T::RunContext rc(m_runs[ri].get(), m_global.get());
+          const EventSetup c{ci,
+                             static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                             this->consumer()->esGetTokenIndices(Transition::BeginLuminosityBlock)};
+
+          MyGlobalLuminosityBlock::beginLuminosityBlock(cnstLb, c, &rc, m_lumis[li]);
+          typename T::LuminosityBlockContext lc(m_lumis[li].get(), m_runs[ri].get(), m_global.get());
+          MyGlobalLuminosityBlockSummary::beginLuminosityBlock(cnstLb, c, &lc, m_lumiSummaries[li]);
           if constexpr (T::HasAbility::kBeginLuminosityBlockProducer) {
-            MyBeginLuminosityBlockProduce::produce(lb,c,&lc);
+            MyBeginLuminosityBlockProduce::produce(lb, c, &lc);
             this->commit(lb);
           }
         }
-        
       }
       void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
-                                EventSetupImpl const&  ci,
+                                EventSetupImpl const& ci,
                                 ModuleCallingContext const* mcc) final {
-        if constexpr (T::HasAbility::kLuminosityBlockCache or T::HasAbility::kLuminosityBlockSummaryCache or T::HasAbility::kEndLuminosityBlockProducer) {
-          
+        if constexpr (T::HasAbility::kLuminosityBlockCache or T::HasAbility::kLuminosityBlockSummaryCache or
+                      T::HasAbility::kEndLuminosityBlockProducer) {
           LuminosityBlock lb(lbp, this->moduleDescription(), mcc, true);
           lb.setConsumer(this->consumer());
           lb.setProducer(this->producer());
 
           LuminosityBlockIndex li = lbp.index();
           RunIndex ri = lbp.runPrincipal().index();
-          typename T::LuminosityBlockContext lc(m_lumis[li].get(),m_runs[ri].get(),m_global.get());
-          const EventSetup c{ci};
+          typename T::LuminosityBlockContext lc(m_lumis[li].get(), m_runs[ri].get(), m_global.get());
+          const EventSetup c{ci,
+                             static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                             this->consumer()->esGetTokenIndices(Transition::EndLuminosityBlock)};
           if constexpr (T::HasAbility::kEndLuminosityBlockProducer) {
-            MyEndLuminosityBlockProduce::produce(lb,c,&lc,m_lumiSummaries[li].get());
+            MyEndLuminosityBlockProduce::produce(lb, c, &lc, m_lumiSummaries[li].get());
             this->commit(lb);
           }
-          MyGlobalLuminosityBlockSummary::globalEndLuminosityBlock(lb,c,&lc,m_lumiSummaries[li].get());
-          MyGlobalLuminosityBlock::endLuminosityBlock(lb,c,&lc);
+          MyGlobalLuminosityBlockSummary::globalEndLuminosityBlock(lb, c, &lc, m_lumiSummaries[li].get());
+          MyGlobalLuminosityBlock::endLuminosityBlock(lb, c, &lc);
         }
       }
 
-      ProducingModuleAdaptor(const ProducingModuleAdaptor&) = delete; // stop default
-      
-      const ProducingModuleAdaptor& operator=(const ProducingModuleAdaptor&) = delete; // stop default
-      
+      ProducingModuleAdaptor(const ProducingModuleAdaptor&) = delete;  // stop default
+
+      const ProducingModuleAdaptor& operator=(const ProducingModuleAdaptor&) = delete;  // stop default
+
       // ---------- member data --------------------------------
       typename impl::choose_unique_ptr<typename T::GlobalCache>::type m_global;
       typename impl::choose_shared_vec<typename T::RunCache const>::type m_runs;
@@ -228,7 +209,7 @@ namespace edm {
       typename impl::choose_mutex<typename T::LuminosityBlockSummaryCache>::type m_lumiSummaryLock;
       ParameterSet const* m_pset;
     };
-  }
-}
+  }  // namespace stream
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/stream/ProducingModuleAdaptorBase.h b/FWCore/Framework/interface/stream/ProducingModuleAdaptorBase.h
index 74bd3af38f8f2..f0ca39f0839eb 100644
--- a/FWCore/Framework/interface/stream/ProducingModuleAdaptorBase.h
+++ b/FWCore/Framework/interface/stream/ProducingModuleAdaptorBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     ProducingModuleAdaptorBase
-// 
+//
 /**\class edm::stream::ProducingModuleAdaptorBase ProducingModuleAdaptorBase.h "FWCore/Framework/interface/stream/ProducingModuleAdaptorBase.h"
 
  Description: [one line class summary]
@@ -51,45 +51,48 @@ namespace edm {
   class ThinnedAssociationsHelper;
 
   namespace maker {
-    template<typename T> class ModuleHolderT;
+    template <typename T>
+    class ModuleHolderT;
+  }
+
+  namespace eventsetup {
+    class ESRecordsToProxyIndices;
   }
-  
+
   namespace stream {
-    template<typename T>
-    class ProducingModuleAdaptorBase
-    {
-      
+    template <typename T>
+    class ProducingModuleAdaptorBase {
     public:
-      template <typename U> friend class edm::WorkerT;
-      template <typename U> friend class edm::maker::ModuleHolderT;
+      template <typename U>
+      friend class edm::WorkerT;
+      template <typename U>
+      friend class edm::maker::ModuleHolderT;
 
       ProducingModuleAdaptorBase();
       virtual ~ProducingModuleAdaptorBase();
-      
+
       // ---------- const member functions ---------------------
-      
+
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
-      const ModuleDescription& moduleDescription() const { return moduleDescription_;}
-      
+      const ModuleDescription& moduleDescription() const { return moduleDescription_; }
+
       virtual bool wantsGlobalRuns() const = 0;
       virtual bool wantsGlobalLuminosityBlocks() const = 0;
       virtual bool hasAcquire() const = 0;
       virtual bool hasAccumulator() const = 0;
-      bool wantsStreamRuns() const {return true;}
-      bool wantsStreamLuminosityBlocks() const {return true;}
+      bool wantsStreamRuns() const { return true; }
+      bool wantsStreamLuminosityBlocks() const { return true; }
+
+      void registerProductsAndCallbacks(ProducingModuleAdaptorBase const*, ProductRegistry* reg);
 
-      void
-      registerProductsAndCallbacks(ProducingModuleAdaptorBase const*, ProductRegistry* reg);
-      
       void itemsToGet(BranchType, std::vector<ProductResolverIndexAndSkipBit>&) const;
       void itemsMayGet(BranchType, std::vector<ProductResolverIndexAndSkipBit>&) const;
       std::vector<ProductResolverIndexAndSkipBit> const& itemsToGetFrom(BranchType) const;
 
-      void updateLookup(BranchType iBranchType,
-                        ProductResolverIndexHelper const&,
-                        bool iPrefetchMayGet);
+      void updateLookup(BranchType iBranchType, ProductResolverIndexHelper const&, bool iPrefetchMayGet);
+      void updateLookup(eventsetup::ESRecordsToProxyIndices const&);
 
       void modulesWhoseProductsAreConsumed(std::vector<ModuleDescription const*>& modules,
                                            ProductRegistry const& preg,
@@ -100,105 +103,86 @@ namespace edm {
 
       std::vector<ConsumesInfo> consumesInfo() const;
 
-      using ModuleToResolverIndicies = std::unordered_multimap<std::string,
-      std::tuple<edm::TypeID const*, const char*, edm::ProductResolverIndex>>;
-      
+      using ModuleToResolverIndicies =
+          std::unordered_multimap<std::string, std::tuple<edm::TypeID const*, const char*, edm::ProductResolverIndex>>;
+
       void resolvePutIndicies(BranchType iBranchType,
                               ModuleToResolverIndicies const& iIndicies,
                               std::string const& moduleLabel);
-      
+
       std::vector<edm::ProductResolverIndex> const& indiciesForPutProducts(BranchType iBranchType) const;
 
     protected:
-      template<typename F> void createStreamModules(F iFunc) {
-        for(auto& m: m_streamModules) {
+      template <typename F>
+      void createStreamModules(F iFunc) {
+        for (auto& m : m_streamModules) {
           m = iFunc();
           m->setModuleDescriptionPtr(&moduleDescription_);
         }
       }
-      
-      void commit(Run& iRun) {
-        iRun.commit_(m_streamModules[0]->indiciesForPutProducts(InRun));
-      }
-      void commit(LuminosityBlock& iLumi) {
-        iLumi.commit_(m_streamModules[0]->indiciesForPutProducts(InLumi));
-      }
-      template<typename I>
+
+      void commit(Run& iRun) { iRun.commit_(m_streamModules[0]->indiciesForPutProducts(InRun)); }
+      void commit(LuminosityBlock& iLumi) { iLumi.commit_(m_streamModules[0]->indiciesForPutProducts(InLumi)); }
+      template <typename I>
       void commit(Event& iEvent, I* iID) {
         iEvent.commit_(m_streamModules[0]->indiciesForPutProducts(InEvent), iID);
       }
 
-      const EDConsumerBase* consumer() {
-        return m_streamModules[0];
-      }
-      
-      const ProducerBase* producer() {
-        return m_streamModules[0];
-      }
+      const EDConsumerBase* consumer() { return m_streamModules[0]; }
+
+      const ProducerBase* producer() { return m_streamModules[0]; }
 
     private:
-      ProducingModuleAdaptorBase(const ProducingModuleAdaptorBase&) = delete; // stop default
-      
-      const ProducingModuleAdaptorBase& operator=(const ProducingModuleAdaptorBase&) = delete; // stop default
+      ProducingModuleAdaptorBase(const ProducingModuleAdaptorBase&) = delete;  // stop default
+
+      const ProducingModuleAdaptorBase& operator=(const ProducingModuleAdaptorBase&) = delete;  // stop default
 
       void doPreallocate(PreallocationConfiguration const&);
       virtual void preallocLumis(unsigned int) {}
       virtual void setupStreamModules() = 0;
       void doBeginJob();
       virtual void doEndJob() = 0;
-      
+
       void doBeginStream(StreamID id);
       void doEndStream(StreamID id);
-      void doStreamBeginRun(StreamID id,
-                            RunPrincipal const& ep,
-                            EventSetupImpl const&  c,
-                            ModuleCallingContext const*);
+      void doStreamBeginRun(StreamID id, RunPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const*);
       virtual void setupRun(T*, RunIndex) = 0;
-      void doStreamEndRun(StreamID id,
-                          RunPrincipal const& ep,
-                          EventSetupImpl const&  c,
-                          ModuleCallingContext const*);
-      virtual void streamEndRunSummary(T*,edm::Run const&, edm::EventSetup const&) = 0;
+      void doStreamEndRun(StreamID id, RunPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const*);
+      virtual void streamEndRunSummary(T*, edm::Run const&, edm::EventSetup const&) = 0;
 
       void doStreamBeginLuminosityBlock(StreamID id,
                                         LuminosityBlockPrincipal const& ep,
-                                        EventSetupImpl const&  c,
+                                        EventSetupImpl const& c,
                                         ModuleCallingContext const*);
       virtual void setupLuminosityBlock(T*, LuminosityBlockIndex) = 0;
       void doStreamEndLuminosityBlock(StreamID id,
                                       LuminosityBlockPrincipal const& ep,
-                                      EventSetupImpl const&  c,
+                                      EventSetupImpl const& c,
                                       ModuleCallingContext const*);
-      virtual void streamEndLuminosityBlockSummary(T*,edm::LuminosityBlock const&, edm::EventSetup const&) = 0;
-      
-      
-      virtual void doBeginRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                              ModuleCallingContext const*)=0;
-      virtual void doEndRun(RunPrincipal const& rp, EventSetupImpl const&  c,
-                            ModuleCallingContext const*)=0;
+      virtual void streamEndLuminosityBlockSummary(T*, edm::LuminosityBlock const&, edm::EventSetup const&) = 0;
+
+      virtual void doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*) = 0;
+      virtual void doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const*) = 0;
       virtual void doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
-                                          EventSetupImpl const&  c,
-                                          ModuleCallingContext const*)=0;
+                                          EventSetupImpl const& c,
+                                          ModuleCallingContext const*) = 0;
       virtual void doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
-                                        EventSetupImpl const&  c,
-                                        ModuleCallingContext const*)=0;
-      
+                                        EventSetupImpl const& c,
+                                        ModuleCallingContext const*) = 0;
+
       //For now, the following are just dummy implemenations with no ability for users to override
       void doRespondToOpenInputFile(FileBlock const& fb);
       void doRespondToCloseInputFile(FileBlock const& fb);
-      void doRegisterThinnedAssociations(ProductRegistry const&,
-                                         ThinnedAssociationsHelper&);
+      void doRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&);
 
       // ---------- member data --------------------------------
-      void setModuleDescription(ModuleDescription const& md) {
-        moduleDescription_ = md;
-      }
+      void setModuleDescription(ModuleDescription const& md) { moduleDescription_ = md; }
       ModuleDescription moduleDescription_;
+
     protected:
       std::vector<T*> m_streamModules;
-
     };
-  }
-}
+  }  // namespace stream
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/stream/ProducingModuleHelper.h b/FWCore/Framework/interface/stream/ProducingModuleHelper.h
index b9ca1b963bb89..54074507ae1fe 100644
--- a/FWCore/Framework/interface/stream/ProducingModuleHelper.h
+++ b/FWCore/Framework/interface/stream/ProducingModuleHelper.h
@@ -22,15 +22,9 @@ namespace edm {
     // Two overloaded functions, the first is called by doAcquire_
     // when the module inherits from ExternalWork. The first function
     // calls acquire, while the second function does nothing.
-    void doAcquireIfNeeded(impl::ExternalWork*,
-                           Event const&,
-                           EventSetup const&,
-                           WaitingTaskWithArenaHolder&);
+    void doAcquireIfNeeded(impl::ExternalWork*, Event const&, EventSetup const&, WaitingTaskWithArenaHolder&);
 
-    void doAcquireIfNeeded(void*,
-                           Event const&,
-                           EventSetup const&,
-                           WaitingTaskWithArenaHolder&);
-  }
-}
+    void doAcquireIfNeeded(void*, Event const&, EventSetup const&, WaitingTaskWithArenaHolder&);
+  }  // namespace stream
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/stream/ThinningProducer.h b/FWCore/Framework/interface/stream/ThinningProducer.h
index 381333b1468f0..315be20378ccc 100644
--- a/FWCore/Framework/interface/stream/ThinningProducer.h
+++ b/FWCore/Framework/interface/stream/ThinningProducer.h
@@ -32,12 +32,13 @@ namespace edm {
     explicit ThinningProducer(ParameterSet const& pset);
     virtual ~ThinningProducer();
 
-    static void fillDescriptions(ConfigurationDescriptions & descriptions);
+    static void fillDescriptions(ConfigurationDescriptions& descriptions);
 
     virtual void produce(Event& event, EventSetup const& eventSetup) override;
 
     virtual void registerThinnedAssociations(ProductRegistry const& productRegistry,
                                              ThinnedAssociationsHelper& thinnedAssociationsHelper) override;
+
   private:
     edm::propagate_const<std::unique_ptr<Selector>> selector_;
     edm::EDGetTokenT<Collection> inputToken_;
@@ -47,10 +48,8 @@ namespace edm {
   };
 
   template <typename Collection, typename Selector>
-  ThinningProducer<Collection, Selector>::
-  ThinningProducer(ParameterSet const& pset) :
-    selector_(new Selector(pset, consumesCollector())) {
-
+  ThinningProducer<Collection, Selector>::ThinningProducer(ParameterSet const& pset)
+      : selector_(new Selector(pset, consumesCollector())) {
     inputTag_ = pset.getParameter<InputTag>("inputTag");
     inputToken_ = consumes<Collection>(inputTag_);
 
@@ -59,12 +58,10 @@ namespace edm {
   }
 
   template <typename Collection, typename Selector>
-  ThinningProducer<Collection, Selector>::
-  ~ThinningProducer() {}
+  ThinningProducer<Collection, Selector>::~ThinningProducer() {}
 
   template <typename Collection, typename Selector>
-  void ThinningProducer<Collection, Selector>::
-  fillDescriptions(ConfigurationDescriptions & descriptions) {
+  void ThinningProducer<Collection, Selector>::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     desc.setComment("Produces thinned collections and associations to them");
     desc.add<edm::InputTag>("inputTag");
@@ -73,9 +70,7 @@ namespace edm {
   }
 
   template <typename Collection, typename Selector>
-  void ThinningProducer<Collection, Selector>::
-  produce(Event& event, EventSetup const& eventSetup) {
-
+  void ThinningProducer<Collection, Selector>::produce(Event& event, EventSetup const& eventSetup) {
     auto inputCollection = event.getHandle(inputToken_);
 
     edm::Event const& constEvent = event;
@@ -85,25 +80,22 @@ namespace edm {
     ThinnedAssociation thinnedAssociation;
 
     unsigned int iIndex = 0;
-    for(auto iter = inputCollection->begin(), iterEnd = inputCollection->end();
-        iter != iterEnd; ++iter, ++iIndex) {
-      if(selector_->choose(iIndex, *iter)) {
+    for (auto iter = inputCollection->begin(), iterEnd = inputCollection->end(); iter != iterEnd; ++iter, ++iIndex) {
+      if (selector_->choose(iIndex, *iter)) {
         thinnedCollection.push_back(*iter);
         thinnedAssociation.push_back(iIndex);
       }
     }
-    OrphanHandle<Collection> orphanHandle = event.emplace(outputToken_,std::move(thinnedCollection));
+    OrphanHandle<Collection> orphanHandle = event.emplace(outputToken_, std::move(thinnedCollection));
 
     thinnedAssociation.setParentCollectionID(inputCollection.id());
     thinnedAssociation.setThinnedCollectionID(orphanHandle.id());
-    event.emplace(thinnedOutToken_,std::move(thinnedAssociation));
+    event.emplace(thinnedOutToken_, std::move(thinnedAssociation));
   }
 
   template <typename Collection, typename Selector>
-  void ThinningProducer<Collection, Selector>::
-  registerThinnedAssociations(ProductRegistry const& productRegistry,
-                              ThinnedAssociationsHelper& thinnedAssociationsHelper) {
-
+  void ThinningProducer<Collection, Selector>::registerThinnedAssociations(
+      ProductRegistry const& productRegistry, ThinnedAssociationsHelper& thinnedAssociationsHelper) {
     BranchID associationID;
     BranchID thinnedCollectionID;
 
@@ -121,23 +113,20 @@ namespace edm {
     std::vector<BranchID> parentCollectionIDs;
 
     ProductRegistry::ProductList const& productList = productRegistry.productList();
-    for(auto const& product : productList) {
+    for (auto const& product : productList) {
       BranchDescription const& desc = product.second;
-      if(desc.unwrappedType().typeInfo() == typeid(Collection) ) {
-        if(desc.produced() &&
-           desc.moduleLabel() == moduleDescription().moduleLabel() &&
-           desc.productInstanceName().empty()) {
-
+      if (desc.unwrappedType().typeInfo() == typeid(Collection)) {
+        if (desc.produced() && desc.moduleLabel() == moduleDescription().moduleLabel() &&
+            desc.productInstanceName().empty()) {
           thinnedCollectionID = desc.branchID();
         }
-        if(desc.moduleLabel() == inputTag_.label() &&
-           desc.productInstanceName() == inputTag_.instance()) {
-          if(inputTag_.willSkipCurrentProcess()) {
-            if(!desc.produced()) {
+        if (desc.moduleLabel() == inputTag_.label() && desc.productInstanceName() == inputTag_.instance()) {
+          if (inputTag_.willSkipCurrentProcess()) {
+            if (!desc.produced()) {
               parentCollectionIDs.push_back(desc.branchID());
             }
           } else if (inputTag_.process().empty() || inputTag_.process() == desc.processName()) {
-            if(desc.produced()) {
+            if (desc.produced()) {
               parentCollectionIDs.push_back(desc.originalBranchID());
             } else {
               parentCollectionIDs.push_back(desc.branchID());
@@ -145,24 +134,21 @@ namespace edm {
           }
         }
       }
-      if(desc.produced() &&
-         desc.unwrappedType().typeInfo() == typeid(ThinnedAssociation) &&
-         desc.moduleLabel() == moduleDescription().moduleLabel() &&
-         desc.productInstanceName().empty()) {
-
+      if (desc.produced() && desc.unwrappedType().typeInfo() == typeid(ThinnedAssociation) &&
+          desc.moduleLabel() == moduleDescription().moduleLabel() && desc.productInstanceName().empty()) {
         associationID = desc.branchID();
       }
     }
-    if(parentCollectionIDs.empty()) {
+    if (parentCollectionIDs.empty()) {
       // This could happen if the input collection was dropped. Go ahead and add
       // an entry and let the exception be thrown only if the module is run (when
       // it cannot find the product).
       thinnedAssociationsHelper.addAssociation(BranchID(), associationID, thinnedCollectionID);
     } else {
-      for(auto const& parentCollectionID : parentCollectionIDs) {
+      for (auto const& parentCollectionID : parentCollectionIDs) {
         thinnedAssociationsHelper.addAssociation(parentCollectionID, associationID, thinnedCollectionID);
       }
     }
   }
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/interface/stream/callAbilities.h b/FWCore/Framework/interface/stream/callAbilities.h
index 9b8073cdc34f9..9bacaa66cddaa 100644
--- a/FWCore/Framework/interface/stream/callAbilities.h
+++ b/FWCore/Framework/interface/stream/callAbilities.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     callAbilities
-// 
+//
 /**\class callAbilities callAbilities.h "FWCore/Framework/interface/stream/callAbilities.h"
 
  Description: [one line class summary]
@@ -32,227 +32,204 @@ namespace edm {
     //********************************
     // CallGlobal
     //********************************
-    template<typename T , bool>
+    template <typename T, bool>
     struct CallGlobalImpl {
-      template<typename B>
-      static void set(B* iProd,
-                      typename T::GlobalCache const* iCache) {
+      template <typename B>
+      static void set(B* iProd, typename T::GlobalCache const* iCache) {
         static_cast<T*>(iProd)->setGlobalCache(iCache);
       }
-      static void endJob(typename T::GlobalCache* iCache) {
-        T::globalEndJob(iCache);
-      }
+      static void endJob(typename T::GlobalCache* iCache) { T::globalEndJob(iCache); }
     };
-    template<typename T>
-    struct CallGlobalImpl<T,false> {
-      static void set(void* iProd,
-                      void const* iCache) {}
-      static void endJob(void* iCache) {
-      }
+    template <typename T>
+    struct CallGlobalImpl<T, false> {
+      static void set(void* iProd, void const* iCache) {}
+      static void endJob(void* iCache) {}
     };
-    
-    template<typename T> using CallGlobal = CallGlobalImpl<T,T::HasAbility::kGlobalCache>;
+
+    template <typename T>
+    using CallGlobal = CallGlobalImpl<T, T::HasAbility::kGlobalCache>;
     //********************************
     // CallGlobalRun
     //********************************
-    template<typename T, bool>
+    template <typename T, bool>
     struct CallGlobalRunImpl {
       static void beginRun(edm::Run const& iRun,
                            edm::EventSetup const& iES,
                            typename T::GlobalCache const* iGC,
                            std::shared_ptr<typename T::RunCache const>& oCache) {
-        oCache = T::globalBeginRun(iRun,iES,iGC);
+        oCache = T::globalBeginRun(iRun, iES, iGC);
       }
-    
+
       template <typename B>
       static void set(B* iProd, typename T::RunCache const* iCache) {
         static_cast<T*>(iProd)->setRunCache(iCache);
       }
-      
-      static void endRun(edm::Run const& iRun,
-                               edm::EventSetup const& iES,
-                               typename T::RunContext const* iContext) {
+
+      static void endRun(edm::Run const& iRun, edm::EventSetup const& iES, typename T::RunContext const* iContext) {
         T::globalEndRun(iRun, iES, iContext);
       }
     };
 
-    template<typename T>
-    struct CallGlobalRunImpl<T,false> {
-      static void beginRun(edm::Run const& ,
-                           edm::EventSetup const& ,
-                           typename T::GlobalCache const* ,
-                           impl::dummy_ptr ) {
-      }
-      static void set(void* iProd,
-                      typename T::RunCache const* iCache) {}
-      static void endRun(edm::Run const& ,
-                               edm::EventSetup const& ,
-                               typename T::RunContext const* ) {
-      }
+    template <typename T>
+    struct CallGlobalRunImpl<T, false> {
+      static void beginRun(edm::Run const&, edm::EventSetup const&, typename T::GlobalCache const*, impl::dummy_ptr) {}
+      static void set(void* iProd, typename T::RunCache const* iCache) {}
+      static void endRun(edm::Run const&, edm::EventSetup const&, typename T::RunContext const*) {}
     };
 
-    template<typename T> using  CallGlobalRun = CallGlobalRunImpl<T,T::HasAbility::kRunCache>;
+    template <typename T>
+    using CallGlobalRun = CallGlobalRunImpl<T, T::HasAbility::kRunCache>;
 
     //********************************
     // CallGlobalRunSummary
     //********************************
-    template<typename T, bool>
+    template <typename T, bool>
     struct CallGlobalRunSummaryImpl {
       static void beginRun(edm::Run const& iRun,
                            edm::EventSetup const& iES,
                            typename T::RunContext const* iRC,
                            std::shared_ptr<typename T::RunSummaryCache>& oCache) {
-        oCache = T::globalBeginRunSummary(iRun,iES,iRC);
+        oCache = T::globalBeginRunSummary(iRun, iES, iRC);
       }
-      template<typename B>
+      template <typename B>
       static void streamEndRunSummary(B* iProd,
                                       edm::Run const& iRun,
                                       edm::EventSetup const& iES,
                                       typename T::RunSummaryCache* iCache) {
-        static_cast<T*>(iProd)->endRunSummary(iRun,iES,iCache);
+        static_cast<T*>(iProd)->endRunSummary(iRun, iES, iCache);
       }
-      
+
       static void globalEndRun(edm::Run const& iRun,
                                edm::EventSetup const& iES,
                                typename T::RunContext const* iContext,
                                typename T::RunSummaryCache* iCache) {
-        T::globalEndRunSummary(iRun, iES, iContext,iCache);
+        T::globalEndRunSummary(iRun, iES, iContext, iCache);
       }
     };
-    
-    template<typename T>
-    struct CallGlobalRunSummaryImpl<T,false> {
-      static void beginRun(edm::Run const& ,
-                           edm::EventSetup const& ,
-                           typename T::RunContext const* ,
-                           impl::dummy_ptr ) {
-      }
+
+    template <typename T>
+    struct CallGlobalRunSummaryImpl<T, false> {
+      static void beginRun(edm::Run const&, edm::EventSetup const&, typename T::RunContext const*, impl::dummy_ptr) {}
       static void streamEndRunSummary(void* iProd,
                                       edm::Run const&,
                                       edm::EventSetup const&,
                                       typename T::RunSummaryCache const* iCache) {}
-      static void globalEndRun(edm::Run const& ,
-                               edm::EventSetup const& ,
+      static void globalEndRun(edm::Run const&,
+                               edm::EventSetup const&,
                                typename T::RunContext const*,
-                               typename T::RunSummaryCache* ) {
-      }
+                               typename T::RunSummaryCache*) {}
     };
 
-    template<typename T> using CallGlobalRunSummary = CallGlobalRunSummaryImpl<T,T::HasAbility::kRunSummaryCache>;
+    template <typename T>
+    using CallGlobalRunSummary = CallGlobalRunSummaryImpl<T, T::HasAbility::kRunSummaryCache>;
 
     //********************************
     // CallGlobalLuminosityBlock
     //********************************
-    template<typename T, bool>
+    template <typename T, bool>
     struct CallGlobalLuminosityBlockImpl {
       static void beginLuminosityBlock(edm::LuminosityBlock const& Lumi,
-                           edm::EventSetup const& iES,
-                           typename T::RunContext const* iRC,
-                           std::shared_ptr<typename T::LuminosityBlockCache const>& oCache) {
-        oCache = T::globalBeginLuminosityBlock(Lumi,iES,iRC);
+                                       edm::EventSetup const& iES,
+                                       typename T::RunContext const* iRC,
+                                       std::shared_ptr<typename T::LuminosityBlockCache const>& oCache) {
+        oCache = T::globalBeginLuminosityBlock(Lumi, iES, iRC);
       }
-      
+
       template <typename B>
       static void set(B* iProd, typename T::LuminosityBlockCache const* iCache) {
         static_cast<T*>(iProd)->setLuminosityBlockCache(iCache);
       }
-      
+
       static void endLuminosityBlock(edm::LuminosityBlock const& Lumi,
                                      edm::EventSetup const& iES,
                                      typename T::LuminosityBlockContext const* iContext) {
         T::globalEndLuminosityBlock(Lumi, iES, iContext);
       }
     };
-    
-    template<typename T>
-    struct CallGlobalLuminosityBlockImpl<T,false> {
-      static void beginLuminosityBlock(edm::LuminosityBlock const& ,
-                           edm::EventSetup const& ,
-                           typename T::RunContext const* ,
-                           impl::dummy_ptr ) {
-      }
-      static void set(void* iProd,
-                      typename T::LuminosityBlockCache const* iCache) {}
-      static void endLuminosityBlock(edm::LuminosityBlock const& ,
-                                     edm::EventSetup const& ,
-                                     typename T::LuminosityBlockContext const* ) {
-      }
+
+    template <typename T>
+    struct CallGlobalLuminosityBlockImpl<T, false> {
+      static void beginLuminosityBlock(edm::LuminosityBlock const&,
+                                       edm::EventSetup const&,
+                                       typename T::RunContext const*,
+                                       impl::dummy_ptr) {}
+      static void set(void* iProd, typename T::LuminosityBlockCache const* iCache) {}
+      static void endLuminosityBlock(edm::LuminosityBlock const&,
+                                     edm::EventSetup const&,
+                                     typename T::LuminosityBlockContext const*) {}
     };
-    template<typename T> using CallGlobalLuminosityBlock = CallGlobalLuminosityBlockImpl<T,T::HasAbility::kLuminosityBlockCache>;
+    template <typename T>
+    using CallGlobalLuminosityBlock = CallGlobalLuminosityBlockImpl<T, T::HasAbility::kLuminosityBlockCache>;
 
     //********************************
     // CallGlobalLuminosityBlockSummary
     //********************************
-    template<typename T, bool>
+    template <typename T, bool>
     struct CallGlobalLuminosityBlockSummaryImpl {
       static void beginLuminosityBlock(edm::LuminosityBlock const& Lumi,
-                           edm::EventSetup const& iES,
-                           typename T::LuminosityBlockContext const* iRC,
-                           std::shared_ptr<typename T::LuminosityBlockSummaryCache>& oCache) {
-        oCache = T::globalBeginLuminosityBlockSummary(Lumi,iES,iRC);
+                                       edm::EventSetup const& iES,
+                                       typename T::LuminosityBlockContext const* iRC,
+                                       std::shared_ptr<typename T::LuminosityBlockSummaryCache>& oCache) {
+        oCache = T::globalBeginLuminosityBlockSummary(Lumi, iES, iRC);
       }
-      template<typename B>
+      template <typename B>
       static void streamEndLuminosityBlockSummary(B* iProd,
                                                   edm::LuminosityBlock const& iLumi,
                                                   edm::EventSetup const& iES,
-                                      typename T::LuminosityBlockSummaryCache* iCache) {
-        static_cast<T*>(iProd)->endLuminosityBlockSummary(iLumi,iES,iCache);
+                                                  typename T::LuminosityBlockSummaryCache* iCache) {
+        static_cast<T*>(iProd)->endLuminosityBlockSummary(iLumi, iES, iCache);
       }
-      
+
       static void globalEndLuminosityBlock(edm::LuminosityBlock const& Lumi,
-                               edm::EventSetup const& iES,
-                               typename T::LuminosityBlockContext const* iContext,
-                               typename T::LuminosityBlockSummaryCache* iCache) {
-        T::globalEndLuminosityBlockSummary(Lumi, iES, iContext,iCache);
+                                           edm::EventSetup const& iES,
+                                           typename T::LuminosityBlockContext const* iContext,
+                                           typename T::LuminosityBlockSummaryCache* iCache) {
+        T::globalEndLuminosityBlockSummary(Lumi, iES, iContext, iCache);
       }
     };
-    
-    template<typename T>
-    struct CallGlobalLuminosityBlockSummaryImpl<T,false> {
-      static void beginLuminosityBlock(edm::LuminosityBlock const& ,
-                           edm::EventSetup const& ,
-                           typename T::LuminosityBlockContext const* ,
-                           impl::dummy_ptr ) {
-      }
+
+    template <typename T>
+    struct CallGlobalLuminosityBlockSummaryImpl<T, false> {
+      static void beginLuminosityBlock(edm::LuminosityBlock const&,
+                                       edm::EventSetup const&,
+                                       typename T::LuminosityBlockContext const*,
+                                       impl::dummy_ptr) {}
       static void streamEndLuminosityBlockSummary(void* iProd,
                                                   edm::LuminosityBlock const&,
                                                   edm::EventSetup const&,
                                                   typename T::LuminosityBlockSummaryCache* iCache) {}
-      static void globalEndLuminosityBlock(edm::LuminosityBlock const& ,
-                               edm::EventSetup const& ,
-                               typename T::LuminosityBlockContext const*,
-                               typename T::LuminosityBlockSummaryCache* ) {
-      }
+      static void globalEndLuminosityBlock(edm::LuminosityBlock const&,
+                                           edm::EventSetup const&,
+                                           typename T::LuminosityBlockContext const*,
+                                           typename T::LuminosityBlockSummaryCache*) {}
     };
-    
-    template<typename T> using CallGlobalLuminosityBlockSummary = CallGlobalLuminosityBlockSummaryImpl<T,T::HasAbility::kLuminosityBlockSummaryCache>;
+
+    template <typename T>
+    using CallGlobalLuminosityBlockSummary =
+        CallGlobalLuminosityBlockSummaryImpl<T, T::HasAbility::kLuminosityBlockSummaryCache>;
 
     //********************************
     // CallBeginRunProduce
     //********************************
-    template<typename T, bool >
+    template <typename T, bool>
     struct CallBeginRunProduceImpl {
-      static void produce(edm::Run& iRun,
-                          edm::EventSetup const& iES,
-                          typename T::RunContext const* iRC) {
-        T::globalBeginRunProduce(iRun,iES,iRC);
+      static void produce(edm::Run& iRun, edm::EventSetup const& iES, typename T::RunContext const* iRC) {
+        T::globalBeginRunProduce(iRun, iES, iRC);
       }
     };
-    
-    template<typename T>
-    struct CallBeginRunProduceImpl<T,false> {
-      static void produce(edm::Run& iRun,
-                          edm::EventSetup const& iES,
-                          typename T::RunContext const* iRC) {
-      }
+
+    template <typename T>
+    struct CallBeginRunProduceImpl<T, false> {
+      static void produce(edm::Run& iRun, edm::EventSetup const& iES, typename T::RunContext const* iRC) {}
     };
 
-    template<typename T> using CallBeginRunProduce = CallBeginRunProduceImpl<T,T::HasAbility::kBeginRunProducer>;
-    
+    template <typename T>
+    using CallBeginRunProduce = CallBeginRunProduceImpl<T, T::HasAbility::kBeginRunProducer>;
+
     //********************************
     // CallEndRunProduce
     //********************************
-    template<typename T, bool bProduce, bool bSummary>
+    template <typename T, bool bProduce, bool bSummary>
     struct CallEndRunProduceImpl {
       static void produce(edm::Run&,
                           edm::EventSetup const&,
@@ -260,85 +237,90 @@ namespace edm {
                           typename T::RunSummaryCache const*) {}
     };
 
-    template<typename T>
-    struct CallEndRunProduceImpl<T,true,false> {
+    template <typename T>
+    struct CallEndRunProduceImpl<T, true, false> {
       static void produce(edm::Run& iRun,
                           edm::EventSetup const& iES,
                           typename T::RunContext const* iRC,
                           typename T::RunSummaryCache const*) {
-        T::globalEndRunProduce(iRun,iES,iRC);
+        T::globalEndRunProduce(iRun, iES, iRC);
       }
     };
 
-    template<typename T>
-    struct CallEndRunProduceImpl<T,true,true> {
+    template <typename T>
+    struct CallEndRunProduceImpl<T, true, true> {
       static void produce(edm::Run& iRun,
                           edm::EventSetup const& iES,
                           typename T::RunContext const* iRC,
                           typename T::RunSummaryCache const* iRS) {
-        T::globalEndRunProduce(iRun,iES,iRC, iRS);
+        T::globalEndRunProduce(iRun, iES, iRC, iRS);
       }
     };
 
-    template<typename T>  using CallEndRunProduce = CallEndRunProduceImpl<T,T::HasAbility::kEndRunProducer, T::HasAbility::kRunSummaryCache>;
+    template <typename T>
+    using CallEndRunProduce = CallEndRunProduceImpl<T, T::HasAbility::kEndRunProducer, T::HasAbility::kRunSummaryCache>;
 
     //********************************
     // CallBeginLuminosityBlockProduce
     //********************************
-    template<typename T, bool >
+    template <typename T, bool>
     struct CallBeginLuminosityBlockProduceImpl {
       static void produce(edm::LuminosityBlock& Lumi,
                           edm::EventSetup const& iES,
                           typename T::LuminosityBlockContext const* iRC) {
-        T::globalBeginLuminosityBlockProduce(Lumi,iES,iRC);
+        T::globalBeginLuminosityBlockProduce(Lumi, iES, iRC);
       }
     };
-    
-    template<typename T>
-    struct CallBeginLuminosityBlockProduceImpl<T,false> {
+
+    template <typename T>
+    struct CallBeginLuminosityBlockProduceImpl<T, false> {
       static void produce(edm::LuminosityBlock& Lumi,
                           edm::EventSetup const& iES,
-                          typename T::LuminosityBlockContext const* iRC) {
-      }
+                          typename T::LuminosityBlockContext const* iRC) {}
     };
 
-    template<typename T> using CallBeginLuminosityBlockProduce = CallBeginLuminosityBlockProduceImpl<T,T::HasAbility::kBeginLuminosityBlockProducer> ;
+    template <typename T>
+    using CallBeginLuminosityBlockProduce =
+        CallBeginLuminosityBlockProduceImpl<T, T::HasAbility::kBeginLuminosityBlockProducer>;
 
     //********************************
     // CallEndLuminosityBlockProduce
     //********************************
-    template<typename T, bool bProduce, bool bSummary>
+    template <typename T, bool bProduce, bool bSummary>
     struct CallEndLuminosityBlockProduceImpl {
       static void produce(edm::LuminosityBlock&,
                           edm::EventSetup const&,
                           typename T::LuminosityBlockContext const*,
                           typename T::LuminosityBlockSummaryCache const*) {}
     };
-    
-    template<typename T>
-    struct CallEndLuminosityBlockProduceImpl<T,true,false> {
+
+    template <typename T>
+    struct CallEndLuminosityBlockProduceImpl<T, true, false> {
       static void produce(edm::LuminosityBlock& Lumi,
                           edm::EventSetup const& iES,
                           typename T::LuminosityBlockContext const* iRC,
                           typename T::LuminosityBlockSummaryCache const*) {
-        T::globalEndLuminosityBlockProduce(Lumi,iES,iRC);
+        T::globalEndLuminosityBlockProduce(Lumi, iES, iRC);
       }
     };
-    
-    template<typename T>
-    struct CallEndLuminosityBlockProduceImpl<T,true,true> {
+
+    template <typename T>
+    struct CallEndLuminosityBlockProduceImpl<T, true, true> {
       static void produce(edm::LuminosityBlock& Lumi,
                           edm::EventSetup const& iES,
                           typename T::LuminosityBlockContext const* iRC,
                           typename T::LuminosityBlockSummaryCache const* iRS) {
-        T::globalEndLuminosityBlockProduce(Lumi,iES,iRC, iRS);
+        T::globalEndLuminosityBlockProduce(Lumi, iES, iRC, iRS);
       }
     };
-    
-    template<typename T> using CallEndLuminosityBlockProduce = CallEndLuminosityBlockProduceImpl<T,T::HasAbility::kEndLuminosityBlockProducer, T::HasAbility::kLuminosityBlockSummaryCache>;
 
-  }
-}
+    template <typename T>
+    using CallEndLuminosityBlockProduce =
+        CallEndLuminosityBlockProduceImpl<T,
+                                          T::HasAbility::kEndLuminosityBlockProducer,
+                                          T::HasAbility::kLuminosityBlockSummaryCache>;
 
+  }  // namespace stream
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/stream/dummy_helpers.h b/FWCore/Framework/interface/stream/dummy_helpers.h
index 44a657d3ef0ed..01eae53af4c22 100644
--- a/FWCore/Framework/interface/stream/dummy_helpers.h
+++ b/FWCore/Framework/interface/stream/dummy_helpers.h
@@ -4,7 +4,7 @@
 //
 // Package:     Subsystem/Package
 // Class  :     dummy_helpers
-// 
+//
 /**\class dummy_helpers dummy_helpers.h "dummy_helpers.h"
 
  Description: [one line class summary]
@@ -30,58 +30,57 @@ namespace edm {
   namespace stream {
     namespace impl {
       struct dummy_ptr {
-        void * get() { return nullptr;}
+        void* get() { return nullptr; }
         void reset(void*) {}
-        void * release() { return nullptr;}
+        void* release() { return nullptr; }
       };
-      
+
       struct dummy_vec {
         void resize(size_t) {}
-        dummy_ptr operator[](unsigned int) { return dummy_ptr();}
+        dummy_ptr operator[](unsigned int) { return dummy_ptr(); }
       };
-      
+
       struct dummy_mutex {
         void lock() {}
         void unlock() {}
       };
-      
-      template<typename T>
+
+      template <typename T>
       struct choose_unique_ptr {
         typedef std::unique_ptr<T> type;
       };
-      template<>
+      template <>
       struct choose_unique_ptr<void> {
         typedef dummy_ptr type;
       };
-      
-      template<>
+
+      template <>
       struct choose_unique_ptr<void const> {
         typedef dummy_ptr type;
       };
-      
-      template<typename T>
+
+      template <typename T>
       struct choose_shared_vec {
         typedef std::vector<std::shared_ptr<T>> type;
       };
-      template<>
+      template <>
       struct choose_shared_vec<void> {
         typedef dummy_vec type;
       };
-      template<>
+      template <>
       struct choose_shared_vec<void const> {
         typedef dummy_vec type;
       };
-      template<typename T>
+      template <typename T>
       struct choose_mutex {
         using type = std::mutex;
       };
-      template<>
+      template <>
       struct choose_mutex<void> {
         using type = dummy_mutex;
       };
-    }
-  }
-}
-
+    }  // namespace impl
+  }    // namespace stream
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/stream/implementors.h b/FWCore/Framework/interface/stream/implementors.h
index 1759b7ddc6e4d..deb58412e5f61 100644
--- a/FWCore/Framework/interface/stream/implementors.h
+++ b/FWCore/Framework/interface/stream/implementors.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     implementors
-// 
+//
 /**\file implementors.h "FWCore/Framework/interface/stream/implementors.h"
 
  Description: Base classes used to implement the interfaces for the edm::stream::* module  abilities
@@ -32,61 +32,65 @@
 namespace edm {
 
   class WaitingTaskWithArenaHolder;
-  
+
   namespace stream {
     namespace impl {
       class EmptyType {};
-      
-      
+
       template <typename C>
       class GlobalCacheHolder {
       public:
         GlobalCacheHolder() = default;
-        GlobalCacheHolder( GlobalCacheHolder<C> const&) = delete;
+        GlobalCacheHolder(GlobalCacheHolder<C> const&) = delete;
         GlobalCacheHolder<C>& operator=(GlobalCacheHolder<C> const&) = delete;
 
-        void setGlobalCache(C const* iCache) {
-          cache_=iCache;
-        }
+        void setGlobalCache(C const* iCache) { cache_ = iCache; }
+
       protected:
         C const* globalCache() const { return cache_; }
+
       private:
         C const* cache_;
       };
-      
+
       template <typename C>
       class RunCacheHolder {
       public:
         RunCacheHolder() = default;
-        RunCacheHolder( RunCacheHolder<C> const&) = delete;
+        RunCacheHolder(RunCacheHolder<C> const&) = delete;
         RunCacheHolder<C>& operator=(RunCacheHolder<C> const&) = delete;
-        void setRunCache(C const* iCache) { cache_=iCache; }
+        void setRunCache(C const* iCache) { cache_ = iCache; }
+
       protected:
         C const* runCache() const { return cache_; }
+
       private:
         C const* cache_;
       };
-      
+
       template <typename C>
       class LuminosityBlockCacheHolder {
       public:
         LuminosityBlockCacheHolder() = default;
-        LuminosityBlockCacheHolder( LuminosityBlockCacheHolder<C> const&) = delete;
+        LuminosityBlockCacheHolder(LuminosityBlockCacheHolder<C> const&) = delete;
         LuminosityBlockCacheHolder<C>& operator=(LuminosityBlockCacheHolder<C> const&) = delete;
-        void setLuminosityBlockCache(C const* iCache) { cache_=iCache; }
+        void setLuminosityBlockCache(C const* iCache) { cache_ = iCache; }
+
       protected:
         C const* luminosityBlockCache() const { return cache_; }
+
       private:
         C const* cache_;
       };
-      
+
       template <typename C>
-      class RunSummaryCacheHolder  {
+      class RunSummaryCacheHolder {
       public:
         RunSummaryCacheHolder() = default;
-        RunSummaryCacheHolder( RunSummaryCacheHolder<C> const&) = delete;
+        RunSummaryCacheHolder(RunSummaryCacheHolder<C> const&) = delete;
         RunSummaryCacheHolder<C>& operator=(RunSummaryCacheHolder<C> const&) = delete;
         virtual ~RunSummaryCacheHolder() noexcept(false) {}
+
       private:
         virtual void endRunSummary(edm::Run const&, edm::EventSetup const&, C*) const = 0;
       };
@@ -95,33 +99,31 @@ namespace edm {
       class LuminosityBlockSummaryCacheHolder {
       public:
         LuminosityBlockSummaryCacheHolder() = default;
-        LuminosityBlockSummaryCacheHolder( LuminosityBlockSummaryCacheHolder<C> const&) = delete;
+        LuminosityBlockSummaryCacheHolder(LuminosityBlockSummaryCacheHolder<C> const&) = delete;
         LuminosityBlockSummaryCacheHolder<C>& operator=(LuminosityBlockSummaryCacheHolder<C> const&) = delete;
         virtual ~LuminosityBlockSummaryCacheHolder() noexcept(false) {}
+
       private:
-        
         virtual void endLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, C*) const = 0;
       };
 
-      
-      class BeginRunProducer{
+      class BeginRunProducer {
       public:
         BeginRunProducer() = default;
-        BeginRunProducer( BeginRunProducer const&) = delete;
+        BeginRunProducer(BeginRunProducer const&) = delete;
         BeginRunProducer& operator=(BeginRunProducer const&) = delete;
 
         ///requires the following be defined in the inheriting class
         ///static void globalBeginRunProduce(edm::Run&, edm::EventSetup const&, RunContext const* );
       };
-      
+
       class EndRunProducer {
       public:
         EndRunProducer() = default;
-        EndRunProducer( EndRunProducer const&) = delete;
+        EndRunProducer(EndRunProducer const&) = delete;
         EndRunProducer& operator=(EndRunProducer const&) = delete;
-        
+
       private:
-        
         ///requires the following be defined in the inheriting class
         /// static void globalEndRunProduce(edm::Run&, edm::EventSetup const&, RunContext const* )
       };
@@ -129,20 +131,20 @@ namespace edm {
       class BeginLuminosityBlockProducer {
       public:
         BeginLuminosityBlockProducer() = default;
-        BeginLuminosityBlockProducer( BeginLuminosityBlockProducer const&) = delete;
+        BeginLuminosityBlockProducer(BeginLuminosityBlockProducer const&) = delete;
         BeginLuminosityBlockProducer& operator=(BeginLuminosityBlockProducer const&) = delete;
-        
+
       private:
         ///requires the following be defined in the inheriting class
         ///static void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&, LuminosityBlockContext const*)
       };
-      
+
       class EndLuminosityBlockProducer {
       public:
         EndLuminosityBlockProducer() = default;
-        EndLuminosityBlockProducer( EndLuminosityBlockProducer const&) = delete;
+        EndLuminosityBlockProducer(EndLuminosityBlockProducer const&) = delete;
         EndLuminosityBlockProducer& operator=(EndLuminosityBlockProducer const&) = delete;
-        
+
       private:
         ///requires the following be defined in the inheriting class
         ///static void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&, LuminosityBlockContext const*)
@@ -153,29 +155,24 @@ namespace edm {
         ExternalWork() = default;
         ExternalWork(ExternalWork const&) = delete;
         ExternalWork& operator=(ExternalWork const&) = delete;
-        virtual ~ExternalWork() noexcept(false) {};
+        virtual ~ExternalWork() noexcept(false){};
 
-        virtual void acquire(Event const&,
-                             edm::EventSetup const&,
-                             WaitingTaskWithArenaHolder) = 0;
+        virtual void acquire(Event const&, edm::EventSetup const&, WaitingTaskWithArenaHolder) = 0;
       };
 
       class Accumulator : public EDProducerBase {
       public:
-         Accumulator() = default;
-         Accumulator(Accumulator const&) = delete;
-         Accumulator& operator=(Accumulator const&) = delete;
-         virtual ~Accumulator() noexcept(false) {};
+        Accumulator() = default;
+        Accumulator(Accumulator const&) = delete;
+        Accumulator& operator=(Accumulator const&) = delete;
+        ~Accumulator() noexcept(false) override{};
 
-         virtual void accumulate(Event const& ev, EventSetup const& es) = 0;
+        virtual void accumulate(Event const& ev, EventSetup const& es) = 0;
 
-         void produce(Event& ev, EventSetup const& es) final {
-           accumulate(ev, es);
-         }
+        void produce(Event& ev, EventSetup const& es) final { accumulate(ev, es); }
       };
-    }
-  }
-}
-
+    }  // namespace impl
+  }    // namespace stream
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/interface/stream/makeGlobal.h b/FWCore/Framework/interface/stream/makeGlobal.h
index 13cdf4c518a07..ac651102099cf 100644
--- a/FWCore/Framework/interface/stream/makeGlobal.h
+++ b/FWCore/Framework/interface/stream/makeGlobal.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     makeGlobal
-// 
+//
 /** Helper functions for making stream modules
 
  Description: [one line class summary]
@@ -28,27 +28,25 @@ namespace edm {
   class ParameterSet;
   namespace stream {
     namespace impl {
-      template<typename T, typename G>
+      template <typename T, typename G>
       std::unique_ptr<G> makeGlobal(edm::ParameterSet const& iPSet, G const*) {
         return T::initializeGlobalCache(iPSet);
       }
-      template<typename T>
+      template <typename T>
       dummy_ptr makeGlobal(edm::ParameterSet const& iPSet, void const*) {
         return dummy_ptr();
       }
-      
-      template< typename T, typename G>
-      T* makeStreamModule(edm::ParameterSet const& iPSet,
-                          G const* iGlobal) {
-        return new T(iPSet,iGlobal);
+
+      template <typename T, typename G>
+      T* makeStreamModule(edm::ParameterSet const& iPSet, G const* iGlobal) {
+        return new T(iPSet, iGlobal);
       }
-      
-      template< typename T>
-      T* makeStreamModule(edm::ParameterSet const& iPSet,
-                          void const* ) {
+
+      template <typename T>
+      T* makeStreamModule(edm::ParameterSet const& iPSet, void const*) {
         return new T(iPSet);
       }
-    }
-  }
-}
+    }  // namespace impl
+  }    // namespace stream
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/src/Breakpoints.cc b/FWCore/Framework/src/Breakpoints.cc
index e1c934f8d2e6f..e7123e3d2ae30 100644
--- a/FWCore/Framework/src/Breakpoints.cc
+++ b/FWCore/Framework/src/Breakpoints.cc
@@ -11,9 +11,7 @@
 */
 
 namespace bk {
-  void
-  beginJob() {}
+  void beginJob() {}
 
-  void
-  beginRuns() {}
-}
+  void beginRuns() {}
+}  // namespace bk
diff --git a/FWCore/Framework/src/Breakpoints.h b/FWCore/Framework/src/Breakpoints.h
index 14a3cd08e7a65..2290c01f1a3f3 100644
--- a/FWCore/Framework/src/Breakpoints.h
+++ b/FWCore/Framework/src/Breakpoints.h
@@ -12,11 +12,9 @@
 */
 
 namespace bk {
-  void
-  beginJob();
+  void beginJob();
 
-  void
-  beginRuns();
-}
+  void beginRuns();
+}  // namespace bk
 
 #endif
diff --git a/FWCore/Framework/src/ComponentMaker.cc b/FWCore/Framework/src/ComponentMaker.cc
index 8d056353eff90..876ce61b904b0 100644
--- a/FWCore/Framework/src/ComponentMaker.cc
+++ b/FWCore/Framework/src/ComponentMaker.cc
@@ -6,16 +6,14 @@
 namespace edm {
   namespace eventsetup {
 
-ComponentDescription 
-ComponentMakerBaseHelper::createComponentDescription(ParameterSet const& iConfiguration) const
-{
-  ComponentDescription description;
-  description.type_  = iConfiguration.getParameter<std::string>("@module_type");
-  description.label_ = iConfiguration.getParameter<std::string>("@module_label");
+    ComponentDescription ComponentMakerBaseHelper::createComponentDescription(ParameterSet const& iConfiguration) const {
+      ComponentDescription description;
+      description.type_ = iConfiguration.getParameter<std::string>("@module_type");
+      description.label_ = iConfiguration.getParameter<std::string>("@module_label");
 
-  description.pid_            = iConfiguration.id();
-  return description;
-}
+      description.pid_ = iConfiguration.id();
+      return description;
+    }
 
-} // namespace eventsetup
-} // namespace edm
+  }  // namespace eventsetup
+}  // namespace edm
diff --git a/FWCore/Framework/src/DataKey.cc b/FWCore/Framework/src/DataKey.cc
index c04b9c45d8108..c57fb5e75ce43 100644
--- a/FWCore/Framework/src/DataKey.cc
+++ b/FWCore/Framework/src/DataKey.cc
@@ -17,105 +17,98 @@
 // user include files
 #include "FWCore/Framework/interface/DataKey.h"
 
-
 //
 // constants, enums and typedefs
 //
 
 namespace {
-constexpr char kBlank[] = {'\0'};
+  constexpr char kBlank[] = {'\0'};
 }
 
 namespace edm::eventsetup {
 
-DataKey::DataKey() = default;
-
-DataKey& DataKey::operator=(const DataKey& rhs)
-{
-   //An exception safe implementation is
-   DataKey temp(rhs);
-   swap(temp);
-
-   return *this;
-}
-
-//
-// member functions
-//
-void
-DataKey::swap(DataKey& iOther)
-{
-   std::swap(ownMemory_, iOther.ownMemory_);
-   // unqualified swap is used for user defined classes.
-   // The using directive is needed so that std::swap will be used if there is no other matching swap.
-   using std::swap;
-   swap(type_, iOther.type_);
-   swap(name_, iOther.name_);
-}
-
-      namespace {
-         //used for exception safety
-         class ArrayHolder {
-         public:
-            ArrayHolder() = default;
-
-            void swap(ArrayHolder& iOther) {
-               const char* t = iOther.ptr_;
-               iOther.ptr_ = ptr_;
-               ptr_ = t;
-            }
-            ArrayHolder(const char* iPtr): ptr_(iPtr) {}
-            ~ArrayHolder() { delete [] ptr_; }
-            void release() { ptr_=nullptr;}
-         private:
-            const char* ptr_{nullptr};
-         };
+  DataKey::DataKey() = default;
+
+  DataKey& DataKey::operator=(const DataKey& rhs) {
+    //An exception safe implementation is
+    DataKey temp(rhs);
+    swap(temp);
+
+    return *this;
+  }
+
+  DataKey& DataKey::operator=(DataKey&& rhs) {
+    //An exception safe implementation is
+    DataKey temp(std::move(rhs));
+    swap(temp);
+
+    return *this;
+  }
+
+  //
+  // member functions
+  //
+  void DataKey::swap(DataKey& iOther) {
+    std::swap(ownMemory_, iOther.ownMemory_);
+    // unqualified swap is used for user defined classes.
+    // The using directive is needed so that std::swap will be used if there is no other matching swap.
+    using std::swap;
+    swap(type_, iOther.type_);
+    swap(name_, iOther.name_);
+  }
+
+  namespace {
+    //used for exception safety
+    class ArrayHolder {
+    public:
+      ArrayHolder() = default;
+
+      void swap(ArrayHolder& iOther) {
+        const char* t = iOther.ptr_;
+        iOther.ptr_ = ptr_;
+        ptr_ = t;
       }
-
-void
-DataKey::makeCopyOfMemory()
-{
-   //empty string is the most common case, so handle it special
-
-   char* pName = const_cast<char*>(kBlank);
-   //NOTE: if in the future additional tags are added then
-   // I should make sure that pName gets deleted in the case
-   // where an exception is thrown
-   ArrayHolder pNameHolder;
-   if(kBlank[0] != name().value()[0]) {
+      ArrayHolder(const char* iPtr) : ptr_(iPtr) {}
+      ~ArrayHolder() { delete[] ptr_; }
+      void release() { ptr_ = nullptr; }
+
+    private:
+      const char* ptr_{nullptr};
+    };
+  }  // namespace
+
+  void DataKey::makeCopyOfMemory() {
+    //empty string is the most common case, so handle it special
+
+    char* pName = const_cast<char*>(kBlank);
+    //NOTE: if in the future additional tags are added then
+    // I should make sure that pName gets deleted in the case
+    // where an exception is thrown
+    ArrayHolder pNameHolder;
+    if (kBlank[0] != name().value()[0]) {
       size_t const nBytes = std::strlen(name().value()) + 1;
       pName = new char[nBytes];
       ArrayHolder t(pName);
       pNameHolder.swap(t);
       std::strncpy(pName, name().value(), nBytes);
-   }
-   name_ = NameTag(pName);
-   ownMemory_ = true;
-   pNameHolder.release();
-}
-
-void
-DataKey::deleteMemory()
-{
-   if(kBlank[0] != name().value()[0]) {
-      delete [] const_cast<char*>(name().value());
-   }
-}
-
-//
-// const member functions
-//
-bool
-DataKey::operator==(const DataKey& iRHS) const
-{
-   return ((type_ == iRHS.type_) &&
-            (name_ == iRHS.name_));
-}
-
-bool
-DataKey::operator<(const DataKey& iRHS) const
-{
-   return (type_ < iRHS.type_) ||
-   ((type_ == iRHS.type_) && (name_ < iRHS.name_));
-}
-}
+    }
+    name_ = NameTag(pName);
+    ownMemory_ = true;
+    pNameHolder.release();
+  }
+
+  void DataKey::deleteMemory() {
+    if (kBlank[0] != name().value()[0]) {
+      delete[] const_cast<char*>(name().value());
+    }
+  }
+
+  //
+  // const member functions
+  //
+  bool DataKey::operator==(const DataKey& iRHS) const { return ((type_ == iRHS.type_) && (name_ == iRHS.name_)); }
+
+  bool DataKey::operator<(const DataKey& iRHS) const {
+    return (type_ < iRHS.type_) || ((type_ == iRHS.type_) && (name_ < iRHS.name_));
+  }
+}  // namespace edm::eventsetup
diff --git a/FWCore/Framework/src/DataKeyTags.cc b/FWCore/Framework/src/DataKeyTags.cc
index c287298c2509f..319bec7ad6d7c 100644
--- a/FWCore/Framework/src/DataKeyTags.cc
+++ b/FWCore/Framework/src/DataKeyTags.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     DataKeyTags
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -16,52 +16,43 @@
 // user include files
 #include "FWCore/Framework/interface/DataKeyTags.h"
 
-
 //
 // constants, enums and typedefs
 //
 namespace edm {
-   namespace eventsetup {
-//
-// static data member definitions
-//
-
-//
-// constructors and destructor
-
-//
-// assignment operators
-//
-// const DataKeyTags& DataKeyTags::operator=(const DataKeyTags& rhs)
-// {
-//   //An exception safe implementation is
-//   DataKeyTags temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
-
-//
-// member functions
-//
-
-//
-// const member functions
-//
-bool
-SimpleStringTag::operator==(const SimpleStringTag& iRHS) const
-{
-   return (0 == std::strcmp(tag_, iRHS.tag_));
-}
-
-bool
-SimpleStringTag::operator<(const SimpleStringTag& iRHS) const
-{
-   return (0 > std::strcmp(tag_, iRHS.tag_));
-}
-
-//
-// static member functions
-//
-   }
-}
+  namespace eventsetup {
+    //
+    // static data member definitions
+    //
+
+    //
+    // constructors and destructor
+
+    //
+    // assignment operators
+    //
+    // const DataKeyTags& DataKeyTags::operator=(const DataKeyTags& rhs)
+    // {
+    //   //An exception safe implementation is
+    //   DataKeyTags temp(rhs);
+    //   swap(rhs);
+    //
+    //   return *this;
+    // }
+
+    //
+    // member functions
+    //
+
+    //
+    // const member functions
+    //
+    bool SimpleStringTag::operator==(const SimpleStringTag& iRHS) const { return (0 == std::strcmp(tag_, iRHS.tag_)); }
+
+    bool SimpleStringTag::operator<(const SimpleStringTag& iRHS) const { return (0 > std::strcmp(tag_, iRHS.tag_)); }
+
+    //
+    // static member functions
+    //
+  }  // namespace eventsetup
+}  // namespace edm
diff --git a/FWCore/Framework/src/DataProxy.cc b/FWCore/Framework/src/DataProxy.cc
index 0eca2132f05d2..4f7843cd7de6d 100644
--- a/FWCore/Framework/src/DataProxy.cc
+++ b/FWCore/Framework/src/DataProxy.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     DataProxy
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -24,145 +24,136 @@
 // constants, enums and typedefs
 //
 namespace edm {
-   namespace eventsetup {
-     static std::recursive_mutex s_esGlobalMutex;
-//
-// static data member definitions
-//
-static
-const ComponentDescription*
-dummyDescription()
-{
-   static ComponentDescription s_desc;
-   return &s_desc;
-}     
-//
-// constructors and destructor
-//
-DataProxy::DataProxy() :
-   cache_(nullptr),
-   cacheIsValid_(false),
-   nonTransientAccessRequested_(false),
-   description_(dummyDescription())
-{
-}
+  namespace eventsetup {
+    static std::recursive_mutex s_esGlobalMutex;
+    //
+    // static data member definitions
+    //
+    static const ComponentDescription* dummyDescription() {
+      static ComponentDescription s_desc;
+      return &s_desc;
+    }
+    //
+    // constructors and destructor
+    //
+    DataProxy::DataProxy()
+        : cache_(nullptr),
+          cacheIsValid_(false),
+          nonTransientAccessRequested_(false),
+          description_(dummyDescription()) {}
 
-// DataProxy::DataProxy(const DataProxy& rhs)
-// {
-//    // do actual copying here;
-// }
+    // DataProxy::DataProxy(const DataProxy& rhs)
+    // {
+    //    // do actual copying here;
+    // }
 
-DataProxy::~DataProxy()
-{
-}
+    DataProxy::~DataProxy() {}
 
-//
-// assignment operators
-//
-// const DataProxy& DataProxy::operator=(const DataProxy& rhs)
-// {
-//   //An exception safe implementation is
-//   DataProxy temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
+    //
+    // assignment operators
+    //
+    // const DataProxy& DataProxy::operator=(const DataProxy& rhs)
+    // {
+    //   //An exception safe implementation is
+    //   DataProxy temp(rhs);
+    //   swap(rhs);
+    //
+    //   return *this;
+    // }
 
-//
-// member functions
-//
-void DataProxy::clearCacheIsValid() {
-   cacheIsValid_.store(false, std::memory_order_release);
-   nonTransientAccessRequested_.store(false, std::memory_order_release);
-   cache_ = nullptr;
-}
-      
-void 
-DataProxy::resetIfTransient() {
-   if (!nonTransientAccessRequested_.load(std::memory_order_acquire)) {
-      clearCacheIsValid();
-      invalidateTransientCache();
-   }
-}
+    //
+    // member functions
+    //
+    void DataProxy::clearCacheIsValid() {
+      cacheIsValid_.store(false, std::memory_order_release);
+      nonTransientAccessRequested_.store(false, std::memory_order_release);
+      cache_ = nullptr;
+    }
 
-void 
-DataProxy::invalidateTransientCache() {
-   invalidateCache();
-}
-//
-// const member functions
-//
-namespace  {
-   void throwMakeException(const EventSetupRecordImpl& iRecord,
-                           const DataKey& iKey)  {
-      throw MakeDataException(iRecord.key(),iKey);
-   }
-
-   class ESSignalSentry {
-   public:
-      ESSignalSentry(const EventSetupRecordImpl& iRecord,
-                     const DataKey& iKey,
-                     ComponentDescription const* componentDescription,
-                     ActivityRegistry const* activityRegistry) :
-         eventSetupRecord_(iRecord),
-         dataKey_(iKey),
-         componentDescription_(componentDescription),
-         calledPostLock_(false),
-         activityRegistry_(activityRegistry) {
-
-         activityRegistry->preLockEventSetupGetSignal_(componentDescription_, eventSetupRecord_.key(), dataKey_);
+    void DataProxy::resetIfTransient() {
+      if (!nonTransientAccessRequested_.load(std::memory_order_acquire)) {
+        clearCacheIsValid();
+        invalidateTransientCache();
       }
-      void sendPostLockSignal() {
-         calledPostLock_ = true;
-         activityRegistry_->postLockEventSetupGetSignal_(componentDescription_, eventSetupRecord_.key(), dataKey_);
+    }
+
+    void DataProxy::invalidateTransientCache() { invalidateCache(); }
+    //
+    // const member functions
+    //
+    namespace {
+      void throwMakeException(const EventSetupRecordImpl& iRecord, const DataKey& iKey) {
+        throw MakeDataException(iRecord.key(), iKey);
       }
-      ~ESSignalSentry() noexcept(false) {
-         if (!calledPostLock_) {
+
+      class ESSignalSentry {
+      public:
+        ESSignalSentry(const EventSetupRecordImpl& iRecord,
+                       const DataKey& iKey,
+                       ComponentDescription const* componentDescription,
+                       ActivityRegistry const* activityRegistry)
+            : eventSetupRecord_(iRecord),
+              dataKey_(iKey),
+              componentDescription_(componentDescription),
+              calledPostLock_(false),
+              activityRegistry_(activityRegistry) {
+          activityRegistry->preLockEventSetupGetSignal_(componentDescription_, eventSetupRecord_.key(), dataKey_);
+        }
+        void sendPostLockSignal() {
+          calledPostLock_ = true;
+          activityRegistry_->postLockEventSetupGetSignal_(componentDescription_, eventSetupRecord_.key(), dataKey_);
+        }
+        ~ESSignalSentry() noexcept(false) {
+          if (!calledPostLock_) {
             activityRegistry_->postLockEventSetupGetSignal_(componentDescription_, eventSetupRecord_.key(), dataKey_);
-         }
-         activityRegistry_->postEventSetupGetSignal_(componentDescription_, eventSetupRecord_.key(), dataKey_);
+          }
+          activityRegistry_->postEventSetupGetSignal_(componentDescription_, eventSetupRecord_.key(), dataKey_);
+        }
+
+      private:
+        EventSetupRecordImpl const& eventSetupRecord_;
+        DataKey const& dataKey_;
+        ComponentDescription const* componentDescription_;
+        bool calledPostLock_;
+        ActivityRegistry const* activityRegistry_;
+      };
+    }  // namespace
+
+    const void* DataProxy::get(const EventSetupRecordImpl& iRecord,
+                               const DataKey& iKey,
+                               bool iTransiently,
+                               ActivityRegistry const* activityRegistry) const {
+      if (!cacheIsValid()) {
+        ESSignalSentry signalSentry(iRecord, iKey, providerDescription(), activityRegistry);
+        std::lock_guard<std::recursive_mutex> guard(s_esGlobalMutex);
+        signalSentry.sendPostLockSignal();
+        if (!cacheIsValid()) {
+          cache_ = const_cast<DataProxy*>(this)->getImpl(iRecord, iKey);
+          cacheIsValid_.store(true, std::memory_order_release);
+        }
+      }
+      //We need to set the AccessType for each request so this can't be called in the if block above.
+      //This also must be before the cache_ check since we want to setCacheIsValid before a possible
+      // exception throw. If we don't, 'getImpl' will be called again on a second request for the data.
+      if (!iTransiently) {
+        nonTransientAccessRequested_.store(true, std::memory_order_release);
       }
-   private:
-      EventSetupRecordImpl const& eventSetupRecord_;
-      DataKey const& dataKey_;
-      ComponentDescription const* componentDescription_;
-      bool calledPostLock_;
-      ActivityRegistry const* activityRegistry_;
-   };
-}
 
-const void* 
-DataProxy::get(const EventSetupRecordImpl& iRecord, const DataKey& iKey, bool iTransiently, ActivityRegistry const* activityRegistry) const
-{
-   if(!cacheIsValid()) {
-      ESSignalSentry signalSentry(iRecord, iKey, providerDescription(), activityRegistry);
-      std::lock_guard<std::recursive_mutex> guard(s_esGlobalMutex);
-      signalSentry.sendPostLockSignal();
-      if(!cacheIsValid()) {
-         cache_ = const_cast<DataProxy*>(this)->getImpl(iRecord, iKey);
-         cacheIsValid_.store(true,std::memory_order_release);
+      if (nullptr == cache_) {
+        throwMakeException(iRecord, iKey);
       }
-   }
-   //We need to set the AccessType for each request so this can't be called in the if block above.
-   //This also must be before the cache_ check since we want to setCacheIsValid before a possible
-   // exception throw. If we don't, 'getImpl' will be called again on a second request for the data.
-   if(!iTransiently) {
-      nonTransientAccessRequested_.store(true, std::memory_order_release);
-   }
+      return cache_;
+    }
 
-   if(nullptr == cache_) {
-      throwMakeException(iRecord, iKey);
-   }
-   return cache_;
-}
+    void DataProxy::doGet(const EventSetupRecordImpl& iRecord,
+                          const DataKey& iKey,
+                          bool iTransiently,
+                          ActivityRegistry const* activityRegistry) const {
+      get(iRecord, iKey, iTransiently, activityRegistry);
+    }
 
-void DataProxy::doGet(const EventSetupRecordImpl& iRecord, const DataKey& iKey, bool iTransiently, ActivityRegistry const* activityRegistry) const {
-   get(iRecord, iKey, iTransiently, activityRegistry);
-}
-      
-      
-//
-// static member functions
-//
-   }
-}
+    //
+    // static member functions
+    //
+  }  // namespace eventsetup
+}  // namespace edm
diff --git a/FWCore/Framework/src/DataProxyProvider.cc b/FWCore/Framework/src/DataProxyProvider.cc
index adb8f404de0b7..c902e64a5fad0 100644
--- a/FWCore/Framework/src/DataProxyProvider.cc
+++ b/FWCore/Framework/src/DataProxyProvider.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     DataProxyProvider
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -21,172 +21,141 @@
 #include <cassert>
 
 namespace edm {
-   namespace eventsetup {
-//
-// constants, enums and typedefs
-//
+  namespace eventsetup {
+    //
+    // constants, enums and typedefs
+    //
+
+    //
+    // static data member definitions
+    //
+
+    //
+    // constructors and destructor
+    //
+    DataProxyProvider::DataProxyProvider() : recordProxies_(), description_() {}
+
+    // DataProxyProvider::DataProxyProvider(const DataProxyProvider& rhs)
+    // {
+    //    // do actual copying here;
+    // }
+
+    DataProxyProvider::~DataProxyProvider() noexcept(false) {}
+
+    //
+    // assignment operators
+    //
+    // const DataProxyProvider& DataProxyProvider::operator=(const DataProxyProvider& rhs)
+    // {
+    //   //An exception safe implementation is
+    //   DataProxyProvider temp(rhs);
+    //   swap(rhs);
+    //
+    //   return *this;
+    // }
+
+    //
+    // member functions
+    //
+
+    void DataProxyProvider::updateLookup(eventsetup::ESRecordsToProxyIndices const&) {}
+
+    void DataProxyProvider::usingRecordWithKey(const EventSetupRecordKey& iKey) {
+      recordProxies_[iKey];
+      //keys_.push_back(iKey);
+    }
+
+    void DataProxyProvider::invalidateProxies(const EventSetupRecordKey& iRecordKey) {
+      KeyedProxies& proxyList((*(recordProxies_.find(iRecordKey))).second);
+      KeyedProxies::iterator finished(proxyList.end());
+      for (KeyedProxies::iterator keyedProxy(proxyList.begin()); keyedProxy != finished; ++keyedProxy) {
+        (*((*keyedProxy).second)).invalidate();
+      }
+    }
 
-//
-// static data member definitions
-//
+    void DataProxyProvider::resetProxies(const EventSetupRecordKey& iRecordKey) { invalidateProxies(iRecordKey); }
 
-//
-// constructors and destructor
-//
-DataProxyProvider::DataProxyProvider() : recordProxies_(), description_()
-{
-}
+    void DataProxyProvider::resetProxiesIfTransient(const EventSetupRecordKey& iRecordKey) {
+      KeyedProxies& proxyList((*(recordProxies_.find(iRecordKey))).second);
+      KeyedProxies::iterator finished(proxyList.end());
+      for (KeyedProxies::iterator keyedProxy(proxyList.begin()); keyedProxy != finished; ++keyedProxy) {
+        (*((*keyedProxy).second)).resetIfTransient();
+      }
+    }
+
+    void DataProxyProvider::setAppendToDataLabel(const edm::ParameterSet& iToAppend) {
+      std::string oldValue(appendToDataLabel_);
+      //this can only be changed once and the default value is the empty string
+      assert(oldValue.empty());
 
-// DataProxyProvider::DataProxyProvider(const DataProxyProvider& rhs)
-// {
-//    // do actual copying here;
-// }
+      const std::string kParamName("appendToDataLabel");
+      if (iToAppend.exists(kParamName)) {
+        appendToDataLabel_ = iToAppend.getParameter<std::string>(kParamName);
+      }
+    }
+    //
+    // const member functions
+    //
+    bool DataProxyProvider::isUsingRecord(const EventSetupRecordKey& iKey) const {
+      return recordProxies_.end() != recordProxies_.find(iKey);
+    }
+
+    std::set<EventSetupRecordKey> DataProxyProvider::usingRecords() const {
+      std::set<EventSetupRecordKey> returnValue;
+      for (RecordProxies::const_iterator itRecProxies = recordProxies_.begin(), itRecProxiesEnd = recordProxies_.end();
+           itRecProxies != itRecProxiesEnd;
+           ++itRecProxies) {
+        returnValue.insert(returnValue.end(), itRecProxies->first);
+      }
+      //copy_all(keys_, std::inserter(returnValue, returnValue.end()));
+      return returnValue;
+    }
+
+    const DataProxyProvider::KeyedProxies& DataProxyProvider::keyedProxies(const EventSetupRecordKey& iRecordKey) const {
+      RecordProxies::const_iterator itFind = recordProxies_.find(iRecordKey);
+      assert(itFind != recordProxies_.end());
+
+      if (itFind->second.empty()) {
+        //delayed registration
+        KeyedProxies& proxies = const_cast<KeyedProxies&>(itFind->second);
+        const_cast<DataProxyProvider*>(this)->registerProxies(iRecordKey, proxies);
+
+        bool mustChangeLabels = (!appendToDataLabel_.empty());
+        for (KeyedProxies::iterator itProxy = proxies.begin(), itProxyEnd = proxies.end(); itProxy != itProxyEnd;
+             ++itProxy) {
+          itProxy->second->setProviderDescription(&description());
+          if (mustChangeLabels) {
+            //Using swap is fine since
+            // 1) the data structure is not a map and so we have not sorted on the keys
+            // 2) this is the first time filling this so no outside agency has yet seen
+            //   the label and therefore can not be dependent upon its value
+            std::string temp(std::string(itProxy->first.name().value()) + appendToDataLabel_);
+            DataKey newKey(itProxy->first.type(), temp.c_str());
+            swap(itProxy->first, newKey);
+          }
+        }
+      }
 
-DataProxyProvider::~DataProxyProvider() noexcept(false)
-{
-}
+      return itFind->second;
+    }
 
-//
-// assignment operators
-//
-// const DataProxyProvider& DataProxyProvider::operator=(const DataProxyProvider& rhs)
-// {
-//   //An exception safe implementation is
-//   DataProxyProvider temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
+    //
+    // static member functions
+    //
+    static const std::string kAppendToDataLabel("appendToDataLabel");
 
-//
-// member functions
-//
-void 
-DataProxyProvider::usingRecordWithKey(const EventSetupRecordKey& iKey)
-{
-   recordProxies_[iKey];
-   //keys_.push_back(iKey);
-}
-
-void 
-DataProxyProvider::invalidateProxies(const EventSetupRecordKey& iRecordKey) 
-{
-   KeyedProxies& proxyList((*(recordProxies_.find(iRecordKey))).second) ;
-   KeyedProxies::iterator finished(proxyList.end()) ;
-   for (KeyedProxies::iterator keyedProxy(proxyList.begin()) ;
-         keyedProxy != finished ;
-         ++keyedProxy) {
-      (*((*keyedProxy).second)).invalidate() ;
-   }
-   
-}
-
-void 
-DataProxyProvider::resetProxies(const EventSetupRecordKey& iRecordKey)
-{
-  invalidateProxies(iRecordKey);
-}
-      
-void 
-DataProxyProvider::resetProxiesIfTransient(const EventSetupRecordKey& iRecordKey) 
-{
-   KeyedProxies& proxyList((*(recordProxies_.find(iRecordKey))).second) ;
-   KeyedProxies::iterator finished(proxyList.end()) ;
-   for (KeyedProxies::iterator keyedProxy(proxyList.begin()) ;
-        keyedProxy != finished ;
-        ++keyedProxy) {
-      (*((*keyedProxy).second)).resetIfTransient() ;
-   }
-   
-}
-      
-void
-DataProxyProvider::setAppendToDataLabel(const edm::ParameterSet& iToAppend)
-{
-  std::string oldValue( appendToDataLabel_);
-  //this can only be changed once and the default value is the empty string
-  assert(oldValue.empty());
-  
-  const std::string kParamName("appendToDataLabel");
-  if(iToAppend.exists(kParamName) ) {    
-    appendToDataLabel_ = iToAppend.getParameter<std::string>(kParamName);
-  }
-}
-//
-// const member functions
-//
-bool 
-DataProxyProvider::isUsingRecord(const EventSetupRecordKey& iKey) const
-{
-   return recordProxies_.end() != recordProxies_.find(iKey);
-}
-
-std::set<EventSetupRecordKey> 
-DataProxyProvider::usingRecords() const
-{
-   std::set<EventSetupRecordKey> returnValue;
-   for(RecordProxies::const_iterator itRecProxies = recordProxies_.begin(),
-        itRecProxiesEnd = recordProxies_.end();
-        itRecProxies != itRecProxiesEnd;
-        ++itRecProxies) {
-      returnValue.insert(returnValue.end(), itRecProxies->first);
-   }
-   //copy_all(keys_, std::inserter(returnValue, returnValue.end()));
-   return returnValue;
-}   
-
-const DataProxyProvider::KeyedProxies& 
-DataProxyProvider::keyedProxies(const EventSetupRecordKey& iRecordKey) const
-{
-   RecordProxies::const_iterator itFind = recordProxies_.find(iRecordKey);
-   assert(itFind != recordProxies_.end());
-   
-   if(itFind->second.empty()) {
-      //delayed registration
-      KeyedProxies& proxies = const_cast<KeyedProxies&>(itFind->second);
-      const_cast<DataProxyProvider*>(this)->registerProxies(iRecordKey,
-                                                            proxies);
-
-      bool mustChangeLabels = (!appendToDataLabel_.empty());
-      for(KeyedProxies::iterator itProxy = proxies.begin(), itProxyEnd = proxies.end();
-          itProxy != itProxyEnd;
-          ++itProxy) {
-        itProxy->second->setProviderDescription(&description());
-        if( mustChangeLabels ) {
-          //Using swap is fine since
-          // 1) the data structure is not a map and so we have not sorted on the keys
-          // 2) this is the first time filling this so no outside agency has yet seen
-          //   the label and therefore can not be dependent upon its value
-          std::string temp(std::string(itProxy->first.name().value())+appendToDataLabel_);
-          DataKey newKey(itProxy->first.type(),temp.c_str());
-          swap(itProxy->first,newKey);
+    void DataProxyProvider::prevalidate(ConfigurationDescriptions& iDesc) {
+      if (iDesc.defaultDescription()) {
+        if (iDesc.defaultDescription()->isLabelUnused(kAppendToDataLabel)) {
+          iDesc.defaultDescription()->add<std::string>(kAppendToDataLabel, std::string(""));
         }
       }
-   }
-   
-   return itFind->second;
-}
-
-//
-// static member functions
-//
-static const std::string kAppendToDataLabel("appendToDataLabel");
-
-void
-DataProxyProvider::prevalidate(ConfigurationDescriptions& iDesc)
-{
-   if(iDesc.defaultDescription()) {
-     if (iDesc.defaultDescription()->isLabelUnused(kAppendToDataLabel)) {
-       iDesc.defaultDescription()->add<std::string>(kAppendToDataLabel, std::string(""));
-     }
-   }
-   for(auto& v: iDesc) {
-     if (v.second.isLabelUnused(kAppendToDataLabel)) {
-       v.second.add<std::string>(kAppendToDataLabel, std::string(""));
-     }
-   }
-}
-
-   }
-}
+      for (auto& v : iDesc) {
+        if (v.second.isLabelUnused(kAppendToDataLabel)) {
+          v.second.add<std::string>(kAppendToDataLabel, std::string(""));
+        }
+      }
+    }
 
+  }  // namespace eventsetup
+}  // namespace edm
diff --git a/FWCore/Framework/src/DelayedReader.cc b/FWCore/Framework/src/DelayedReader.cc
index de25861c76789..32ae6ebb02fba 100644
--- a/FWCore/Framework/src/DelayedReader.cc
+++ b/FWCore/Framework/src/DelayedReader.cc
@@ -11,24 +11,21 @@
 
 ----------------------------------------------------------------------*/
 
-
 namespace edm {
   DelayedReader::~DelayedReader() {}
 
-  std::unique_ptr<WrapperBase>
-  DelayedReader::getProduct(BranchID const& k,
-                            EDProductGetter const* ep,
-                            ModuleCallingContext const* mcc) {
-
+  std::unique_ptr<WrapperBase> DelayedReader::getProduct(BranchID const& k,
+                                                         EDProductGetter const* ep,
+                                                         ModuleCallingContext const* mcc) {
     auto preSignal = preEventReadFromSourceSignal();
-    if(mcc and preSignal) {
-      preSignal->emit(*(mcc->getStreamContext()),*mcc);
+    if (mcc and preSignal) {
+      preSignal->emit(*(mcc->getStreamContext()), *mcc);
     }
     auto postSignal = postEventReadFromSourceSignal();
-    
-    auto sentryCall = [&postSignal]( ModuleCallingContext const* iContext) {
-      if(postSignal) {
-        postSignal->emit(*(iContext->getStreamContext()),*iContext);
+
+    auto sentryCall = [&postSignal](ModuleCallingContext const* iContext) {
+      if (postSignal) {
+        postSignal->emit(*(iContext->getStreamContext()), *iContext);
       }
     };
     std::unique_ptr<ModuleCallingContext const, decltype(sentryCall)> sentry(mcc, sentryCall);
@@ -36,8 +33,7 @@ namespace edm {
     return getProduct_(k, ep);
   }
 
-  std::pair<SharedResourcesAcquirer*, std::recursive_mutex*>
-  DelayedReader::sharedResources_() const {
+  std::pair<SharedResourcesAcquirer*, std::recursive_mutex*> DelayedReader::sharedResources_() const {
     return std::pair<SharedResourcesAcquirer*, std::recursive_mutex*>(nullptr, nullptr);
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/DependentRecordIntervalFinder.cc b/FWCore/Framework/src/DependentRecordIntervalFinder.cc
index 9c049cfafea9f..d7c4d5fa4f812 100644
--- a/FWCore/Framework/src/DependentRecordIntervalFinder.cc
+++ b/FWCore/Framework/src/DependentRecordIntervalFinder.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     DependentRecordIntervalFinder
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -21,192 +21,183 @@
 // constants, enums and typedefs
 //
 namespace edm {
-   namespace eventsetup {
-//
-// static data member definitions
-//
+  namespace eventsetup {
+    //
+    // static data member definitions
+    //
 
-//
-// constructors and destructor
-//
-DependentRecordIntervalFinder::DependentRecordIntervalFinder(const EventSetupRecordKey& iKey) :
-  providers_()
-{
-   findingRecordWithKey(iKey);
-}
+    //
+    // constructors and destructor
+    //
+    DependentRecordIntervalFinder::DependentRecordIntervalFinder(const EventSetupRecordKey& iKey) : providers_() {
+      findingRecordWithKey(iKey);
+    }
 
-// DependentRecordIntervalFinder::DependentRecordIntervalFinder(const DependentRecordIntervalFinder& rhs)
-// {
-//    // do actual copying here;
-// }
+    // DependentRecordIntervalFinder::DependentRecordIntervalFinder(const DependentRecordIntervalFinder& rhs)
+    // {
+    //    // do actual copying here;
+    // }
 
-DependentRecordIntervalFinder::~DependentRecordIntervalFinder()
-{
-}
+    DependentRecordIntervalFinder::~DependentRecordIntervalFinder() {}
 
-//
-// assignment operators
-//
-// const DependentRecordIntervalFinder& DependentRecordIntervalFinder::operator=(const DependentRecordIntervalFinder& rhs)
-// {
-//   //An exception safe implementation is
-//   DependentRecordIntervalFinder temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
+    //
+    // assignment operators
+    //
+    // const DependentRecordIntervalFinder& DependentRecordIntervalFinder::operator=(const DependentRecordIntervalFinder& rhs)
+    // {
+    //   //An exception safe implementation is
+    //   DependentRecordIntervalFinder temp(rhs);
+    //   swap(rhs);
+    //
+    //   return *this;
+    // }
 
-//
-// member functions
-//
-void 
-DependentRecordIntervalFinder::addProviderWeAreDependentOn(std::shared_ptr<EventSetupRecordProvider> iProvider)
-{
-   providers_.push_back(iProvider);
-}
-
-void 
-DependentRecordIntervalFinder::setAlternateFinder(std::shared_ptr<EventSetupRecordIntervalFinder> iOther)
-{
-  alternate_ = iOther;
-}
-
-void 
-DependentRecordIntervalFinder::setIntervalFor(const EventSetupRecordKey& iKey,
-                                               const IOVSyncValue& iTime, 
-                                               ValidityInterval& oInterval)
-{
-   //NOTE: oInterval is the last value that was used so if nothing changed do not modify oInterval
-   
-   //I am assuming that an invalidTime is always less then the first valid time
-   assert(IOVSyncValue::invalidIOVSyncValue() < IOVSyncValue::beginOfTime());
-   if(providers_.empty() && alternate_.get() == nullptr ) {
-      oInterval = ValidityInterval::invalidInterval();
-      return;
-   }
-   bool haveAValidDependentRecord = false;
-   bool allRecordsValid = true;
-   ValidityInterval newInterval(IOVSyncValue::beginOfTime(), IOVSyncValue::endOfTime());
-   
-   if (alternate_.get() != nullptr) {
-     ValidityInterval test = alternate_->findIntervalFor(iKey, iTime);
-     if ( test != ValidityInterval::invalidInterval() ) {
-       haveAValidDependentRecord =true;
-       newInterval = test;
-     }
-   }
-   bool intervalsWereComparible = true;
-   for(Providers::iterator itProvider = providers_.begin(), itProviderEnd = providers_.end();
-       itProvider != itProviderEnd;
-       ++itProvider) {
-      if((*itProvider)->setValidityIntervalFor(iTime)) {
-         haveAValidDependentRecord=true;
-         ValidityInterval providerInterval = (*itProvider)->validityInterval();
-	 if( (!newInterval.first().comparable(providerInterval.first())) ||
-	     (!newInterval.last().comparable(providerInterval.last()))) {
-	   intervalsWereComparible=false;
-	   break;
-	 }
-         if(newInterval.first() < providerInterval.first()) {
+    //
+    // member functions
+    //
+    void DependentRecordIntervalFinder::addProviderWeAreDependentOn(
+        std::shared_ptr<EventSetupRecordProvider> iProvider) {
+      providers_.push_back(iProvider);
+    }
+
+    void DependentRecordIntervalFinder::setAlternateFinder(std::shared_ptr<EventSetupRecordIntervalFinder> iOther) {
+      alternate_ = iOther;
+    }
+
+    void DependentRecordIntervalFinder::setIntervalFor(const EventSetupRecordKey& iKey,
+                                                       const IOVSyncValue& iTime,
+                                                       ValidityInterval& oInterval) {
+      //NOTE: oInterval is the last value that was used so if nothing changed do not modify oInterval
+
+      //I am assuming that an invalidTime is always less then the first valid time
+      assert(IOVSyncValue::invalidIOVSyncValue() < IOVSyncValue::beginOfTime());
+      if (providers_.empty() && alternate_.get() == nullptr) {
+        oInterval = ValidityInterval::invalidInterval();
+        return;
+      }
+      bool haveAValidDependentRecord = false;
+      bool allRecordsValid = true;
+      ValidityInterval newInterval(IOVSyncValue::beginOfTime(), IOVSyncValue::endOfTime());
+
+      if (alternate_.get() != nullptr) {
+        ValidityInterval test = alternate_->findIntervalFor(iKey, iTime);
+        if (test != ValidityInterval::invalidInterval()) {
+          haveAValidDependentRecord = true;
+          newInterval = test;
+        }
+      }
+      bool intervalsWereComparible = true;
+      for (Providers::iterator itProvider = providers_.begin(), itProviderEnd = providers_.end();
+           itProvider != itProviderEnd;
+           ++itProvider) {
+        if ((*itProvider)->setValidityIntervalFor(iTime)) {
+          haveAValidDependentRecord = true;
+          ValidityInterval providerInterval = (*itProvider)->validityInterval();
+          if ((!newInterval.first().comparable(providerInterval.first())) ||
+              (!newInterval.last().comparable(providerInterval.last()))) {
+            intervalsWereComparible = false;
+            break;
+          }
+          if (newInterval.first() < providerInterval.first()) {
             newInterval.setFirst(providerInterval.first());
-         }
-         if(newInterval.last() > providerInterval.last()) {
+          }
+          if (newInterval.last() > providerInterval.last()) {
             newInterval.setLast(providerInterval.last());
-         }
-      } else {
-	allRecordsValid = false;
+          }
+        } else {
+          allRecordsValid = false;
+        }
       }
-   }
-   if(intervalsWereComparible) {
-     if(!haveAValidDependentRecord) {
-       //If no Finder has no valid time, then this record is also invalid for this time
-       newInterval = ValidityInterval::invalidInterval();
-     }
-     if(!allRecordsValid) {
-       //since some of the dependent providers do not have a valid IOV for this syncvalue
-       // we do not know what the true end IOV is.  Therefore we must make it open ended
-       // so that we can check each time to see if those providers become valid.
-       newInterval.setLast(IOVSyncValue::invalidIOVSyncValue());
-     }
-     oInterval = newInterval;
-     return;
-   }
-   //handle the case where some providers use time and others use run/lumi/event
-   // in this case all we can do is find an IOV which changed since last time
-   // and use its start time to do the synching and use an 'invalid' end time
-   // so the system always checks back to see if something has changed
-   if (previousIOVs_.empty()) {
-      std::vector<ValidityInterval> tmp(providers_.size(),ValidityInterval());
-      previousIOVs_.swap(tmp);
-   }
-
-   //I'm using an heuristic to pick a reasonable starting point for the IOV. The idea is to
-   // assume that lumi sections are 23 seconds long and therefore if we take a difference between
-   // iTime and the beginning of a changed IOV we can pick the changed IOV with the start time 
-   // closest to iTime. This doesn't have to be perfect, we just want to reduce the dependency
-   // on provider order to make the jobs more deterministic
-   
-   bool hadChangedIOV = false;
-   //both start at the smallest value
-   EventID closestID;
-   Timestamp closestTimeStamp(0);
-   std::vector<ValidityInterval>::iterator itIOVs = previousIOVs_.begin();
-   for(Providers::iterator itProvider = providers_.begin(), itProviderEnd = providers_.end();
-       itProvider != itProviderEnd;
-       ++itProvider, ++itIOVs) {
-      if((*itProvider)->setValidityIntervalFor(iTime)) {
-         ValidityInterval providerInterval = (*itProvider)->validityInterval();
-	 if(*itIOVs != providerInterval) {
+      if (intervalsWereComparible) {
+        if (!haveAValidDependentRecord) {
+          //If no Finder has no valid time, then this record is also invalid for this time
+          newInterval = ValidityInterval::invalidInterval();
+        }
+        if (!allRecordsValid) {
+          //since some of the dependent providers do not have a valid IOV for this syncvalue
+          // we do not know what the true end IOV is.  Therefore we must make it open ended
+          // so that we can check each time to see if those providers become valid.
+          newInterval.setLast(IOVSyncValue::invalidIOVSyncValue());
+        }
+        oInterval = newInterval;
+        return;
+      }
+      //handle the case where some providers use time and others use run/lumi/event
+      // in this case all we can do is find an IOV which changed since last time
+      // and use its start time to do the synching and use an 'invalid' end time
+      // so the system always checks back to see if something has changed
+      if (previousIOVs_.empty()) {
+        std::vector<ValidityInterval> tmp(providers_.size(), ValidityInterval());
+        previousIOVs_.swap(tmp);
+      }
+
+      //I'm using an heuristic to pick a reasonable starting point for the IOV. The idea is to
+      // assume that lumi sections are 23 seconds long and therefore if we take a difference between
+      // iTime and the beginning of a changed IOV we can pick the changed IOV with the start time
+      // closest to iTime. This doesn't have to be perfect, we just want to reduce the dependency
+      // on provider order to make the jobs more deterministic
+
+      bool hadChangedIOV = false;
+      //both start at the smallest value
+      EventID closestID;
+      Timestamp closestTimeStamp(0);
+      std::vector<ValidityInterval>::iterator itIOVs = previousIOVs_.begin();
+      for (Providers::iterator itProvider = providers_.begin(), itProviderEnd = providers_.end();
+           itProvider != itProviderEnd;
+           ++itProvider, ++itIOVs) {
+        if ((*itProvider)->setValidityIntervalFor(iTime)) {
+          ValidityInterval providerInterval = (*itProvider)->validityInterval();
+          if (*itIOVs != providerInterval) {
             hadChangedIOV = true;
-            if(providerInterval.first().time().value() == 0) {
-               //this is a run/lumi based one
-               if( closestID < providerInterval.first().eventID()) {
-                  closestID = providerInterval.first().eventID();
-               }
+            if (providerInterval.first().time().value() == 0) {
+              //this is a run/lumi based one
+              if (closestID < providerInterval.first().eventID()) {
+                closestID = providerInterval.first().eventID();
+              }
             } else {
-               if(closestTimeStamp < providerInterval.first().time()) {
-                  closestTimeStamp = providerInterval.first().time();
-               }
+              if (closestTimeStamp < providerInterval.first().time()) {
+                closestTimeStamp = providerInterval.first().time();
+              }
             }
             *itIOVs = providerInterval;
-         }
+          }
+        }
       }
-   }
-   if(hadChangedIOV) {
-      if(closestID.run() !=0) {
-         if(closestTimeStamp.value() == 0) {
+      if (hadChangedIOV) {
+        if (closestID.run() != 0) {
+          if (closestTimeStamp.value() == 0) {
             //no time
             oInterval = ValidityInterval(IOVSyncValue(closestID), IOVSyncValue::invalidIOVSyncValue());
-         } else {
-            if(closestID.run() == iTime.eventID().run()) {
-               //can compare time to lumi
-               const unsigned long long kLumiTimeLength = 23;
-               
-               if( (iTime.eventID().luminosityBlock() - closestID.luminosityBlock())*kLumiTimeLength < 
-                  iTime.time().unixTime() - closestTimeStamp.unixTime() ) {
-                  //closestID was closer
-                  oInterval = ValidityInterval(IOVSyncValue(closestID), IOVSyncValue::invalidIOVSyncValue());
-               } else {
-                  oInterval = ValidityInterval(IOVSyncValue(closestTimeStamp), IOVSyncValue::invalidIOVSyncValue());
-               }
+          } else {
+            if (closestID.run() == iTime.eventID().run()) {
+              //can compare time to lumi
+              const unsigned long long kLumiTimeLength = 23;
+
+              if ((iTime.eventID().luminosityBlock() - closestID.luminosityBlock()) * kLumiTimeLength <
+                  iTime.time().unixTime() - closestTimeStamp.unixTime()) {
+                //closestID was closer
+                oInterval = ValidityInterval(IOVSyncValue(closestID), IOVSyncValue::invalidIOVSyncValue());
+              } else {
+                oInterval = ValidityInterval(IOVSyncValue(closestTimeStamp), IOVSyncValue::invalidIOVSyncValue());
+              }
             } else {
-               //since we don't know how to change run # into time we can't compare
-               // so if we have a time just use it
-               oInterval = ValidityInterval(IOVSyncValue(closestTimeStamp), IOVSyncValue::invalidIOVSyncValue());
+              //since we don't know how to change run # into time we can't compare
+              // so if we have a time just use it
+              oInterval = ValidityInterval(IOVSyncValue(closestTimeStamp), IOVSyncValue::invalidIOVSyncValue());
             }
-         }
-      } else {
-         oInterval = ValidityInterval( IOVSyncValue(closestTimeStamp), IOVSyncValue::invalidIOVSyncValue());
+          }
+        } else {
+          oInterval = ValidityInterval(IOVSyncValue(closestTimeStamp), IOVSyncValue::invalidIOVSyncValue());
+        }
       }
-   }
-}
+    }
 
-//
-// const member functions
-//
+    //
+    // const member functions
+    //
 
-//
-// static member functions
-//
-   }
-}
+    //
+    // static member functions
+    //
+  }  // namespace eventsetup
+}  // namespace edm
diff --git a/FWCore/Framework/src/EDAnalyzer.cc b/FWCore/Framework/src/EDAnalyzer.cc
index 4c38ad3d8984c..e9769c438ae50 100644
--- a/FWCore/Framework/src/EDAnalyzer.cc
+++ b/FWCore/Framework/src/EDAnalyzer.cc
@@ -22,122 +22,98 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 namespace edm {
-  EDAnalyzer::~EDAnalyzer() {
-  }
+  EDAnalyzer::~EDAnalyzer() {}
   EDAnalyzer::EDAnalyzer() : moduleDescription_() {
-    SharedResourcesRegistry::instance()->registerSharedResource(
-                                                                SharedResourcesRegistry::kLegacyModuleResourceName);
+    SharedResourcesRegistry::instance()->registerSharedResource(SharedResourcesRegistry::kLegacyModuleResourceName);
   }
 
-
-  bool
-  EDAnalyzer::doEvent(EventPrincipal const& ep, EventSetupImpl const& ci,
-                      ActivityRegistry* act,
-                      ModuleCallingContext const* mcc) {
+  bool EDAnalyzer::doEvent(EventPrincipal const& ep,
+                           EventSetupImpl const& ci,
+                           ActivityRegistry* act,
+                           ModuleCallingContext const* mcc) {
     Event e(ep, moduleDescription_, mcc);
     e.setConsumer(this);
     e.setSharedResourcesAcquirer(&resourceAcquirer_);
-    EventSignalsSentry sentry(act,mcc);
-    const EventSetup c{ci};
+    EventSignalsSentry sentry(act, mcc);
+    const EventSetup c{ci, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event)};
     this->analyze(e, c);
     return true;
   }
 
-  void
-  EDAnalyzer::doBeginJob() {
+  void EDAnalyzer::doBeginJob() {
     std::vector<std::string> res = {SharedResourcesRegistry::kLegacyModuleResourceName};
     resourceAcquirer_ = SharedResourcesRegistry::instance()->createAcquirer(res);
 
     this->beginJob();
   }
 
-  void 
-  EDAnalyzer::doEndJob() {
-    this->endJob();
-  }
+  void EDAnalyzer::doEndJob() { this->endJob(); }
 
-  bool
-  EDAnalyzer::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                         ModuleCallingContext const* mcc) {
-    Run r(rp, moduleDescription_, mcc,false);
+  bool EDAnalyzer::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
+    Run r(rp, moduleDescription_, mcc, false);
     r.setConsumer(this);
-    const EventSetup c{ci};
+    const EventSetup c{ci, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun)};
     this->beginRun(r, c);
     return true;
   }
 
-  bool
-  EDAnalyzer::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                       ModuleCallingContext const* mcc) {
-    Run r(rp, moduleDescription_, mcc,true);
+  bool EDAnalyzer::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
+    Run r(rp, moduleDescription_, mcc, true);
     r.setConsumer(this);
-    const EventSetup c{ci};
+    const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun)};
     this->endRun(r, c);
     return true;
   }
 
-  bool
-  EDAnalyzer::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                     ModuleCallingContext const* mcc) {
-    LuminosityBlock lb(lbp, moduleDescription_, mcc,false);
+  bool EDAnalyzer::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                          EventSetupImpl const& ci,
+                                          ModuleCallingContext const* mcc) {
+    LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
     lb.setConsumer(this);
-    const EventSetup c{ci};
+    const EventSetup c{ci,
+                       static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                       esGetTokenIndices(Transition::BeginLuminosityBlock)};
     this->beginLuminosityBlock(lb, c);
     return true;
   }
 
-  bool
-  EDAnalyzer::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                   ModuleCallingContext const* mcc) {
-    LuminosityBlock lb(lbp, moduleDescription_, mcc,true);
+  bool EDAnalyzer::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                        EventSetupImpl const& ci,
+                                        ModuleCallingContext const* mcc) {
+    LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
     lb.setConsumer(this);
-    const EventSetup c{ci};
+    const EventSetup c{ci,
+                       static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                       esGetTokenIndices(Transition::EndLuminosityBlock)};
     this->endLuminosityBlock(lb, c);
     return true;
   }
 
-  void
-  EDAnalyzer::doRespondToOpenInputFile(FileBlock const& fb) {
-    respondToOpenInputFile(fb);
-  }
+  void EDAnalyzer::doRespondToOpenInputFile(FileBlock const& fb) { respondToOpenInputFile(fb); }
 
-  void
-  EDAnalyzer::doRespondToCloseInputFile(FileBlock const& fb) {
-    respondToCloseInputFile(fb);
-  }
+  void EDAnalyzer::doRespondToCloseInputFile(FileBlock const& fb) { respondToCloseInputFile(fb); }
 
-  void
-  EDAnalyzer::callWhenNewProductsRegistered(std::function<void(BranchDescription const&)> const& func) {
+  void EDAnalyzer::callWhenNewProductsRegistered(std::function<void(BranchDescription const&)> const& func) {
     callWhenNewProductsRegistered_ = func;
   }
 
-  void
-  EDAnalyzer::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void EDAnalyzer::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     desc.setUnknown();
     descriptions.addDefault(desc);
   }
-  
-  void
-  EDAnalyzer::prevalidate(ConfigurationDescriptions& iConfig) {
-    edmodule_mightGet_config(iConfig);
-  }
 
-  void
-  EDAnalyzer::registerProductsAndCallbacks(EDAnalyzer const*, ProductRegistry* reg) {
+  void EDAnalyzer::prevalidate(ConfigurationDescriptions& iConfig) { edmodule_mightGet_config(iConfig); }
 
+  void EDAnalyzer::registerProductsAndCallbacks(EDAnalyzer const*, ProductRegistry* reg) {
     if (callWhenNewProductsRegistered_) {
+      reg->callForEachBranch(callWhenNewProductsRegistered_);
 
-       reg->callForEachBranch(callWhenNewProductsRegistered_);
-
-       Service<ConstProductRegistry> regService;
-       regService->watchProductAdditions(callWhenNewProductsRegistered_);
+      Service<ConstProductRegistry> regService;
+      regService->watchProductAdditions(callWhenNewProductsRegistered_);
     }
   }
 
   static const std::string kBaseType("EDAnalyzer");
-  const std::string&
-  EDAnalyzer::baseType() {
-    return kBaseType;
-  }
-}
+  const std::string& EDAnalyzer::baseType() { return kBaseType; }
+}  // namespace edm
diff --git a/FWCore/Framework/src/EDConsumerBase.cc b/FWCore/Framework/src/EDConsumerBase.cc
index cfd28ef6e979b..e31ae52823f57 100644
--- a/FWCore/Framework/src/EDConsumerBase.cc
+++ b/FWCore/Framework/src/EDConsumerBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EDConsumerBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -20,6 +20,8 @@
 // user include files
 #include "FWCore/Framework/interface/EDConsumerBase.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/ESRecordsToProxyIndices.h"
+#include "FWCore/Framework/interface/ComponentDescription.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/BranchType.h"
 #include "FWCore/Utilities/interface/Likely.h"
@@ -49,9 +51,7 @@ using namespace edm;
 //    // do actual copying here;
 // }
 
-EDConsumerBase::~EDConsumerBase() noexcept(false)
-{
-}
+EDConsumerBase::~EDConsumerBase() noexcept(false) {}
 
 //
 // assignment operators
@@ -68,57 +68,54 @@ EDConsumerBase::~EDConsumerBase() noexcept(false)
 //
 // member functions
 //
-ConsumesCollector
-EDConsumerBase::consumesCollector() {
+ConsumesCollector EDConsumerBase::consumesCollector() {
   ConsumesCollector c{this};
   return c;
 }
 
 static const edm::InputTag kWasEmpty("@EmptyLabel@");
 
-edm::InputTag const&
-EDConsumerBase::checkIfEmpty(edm::InputTag const& iTag) {
+edm::InputTag const& EDConsumerBase::checkIfEmpty(edm::InputTag const& iTag) {
   if (iTag.label().empty()) {
     return kWasEmpty;
   }
   return iTag;
 }
 
-unsigned int
-EDConsumerBase::recordConsumes(BranchType iBranch, TypeToGet const& iType, edm::InputTag const& iTag, bool iAlwaysGets) {
-
-  if(frozen_) {
+unsigned int EDConsumerBase::recordConsumes(BranchType iBranch,
+                                            TypeToGet const& iType,
+                                            edm::InputTag const& iTag,
+                                            bool iAlwaysGets) {
+  if (frozen_) {
     throwConsumesCallAfterFrozen(iType, iTag);
   }
 
-  unsigned int index =m_tokenInfo.size();
+  unsigned int index = m_tokenInfo.size();
 
   bool skipCurrentProcess = iTag.willSkipCurrentProcess();
 
   const size_t labelSize = iTag.label().size();
   const size_t productInstanceSize = iTag.instance().size();
   unsigned int labelStart = m_tokenLabels.size();
-  unsigned short delta1 = labelSize+1;
-  unsigned short delta2 = labelSize+2+productInstanceSize;
+  unsigned short delta1 = labelSize + 1;
+  unsigned short delta2 = labelSize + 2 + productInstanceSize;
   m_tokenInfo.emplace_back(TokenLookupInfo{iType.type(), ProductResolverIndexInvalid, skipCurrentProcess, iBranch},
                            iAlwaysGets,
-                           LabelPlacement{labelStart,delta1,delta2},
+                           LabelPlacement{labelStart, delta1, delta2},
                            iType.kind());
 
-  const size_t additionalSize =
-      skipCurrentProcess ?
-      labelSize+productInstanceSize+3 :
-      labelSize+productInstanceSize+iTag.process().size()+3;
+  const size_t additionalSize = skipCurrentProcess ? labelSize + productInstanceSize + 3
+                                                   : labelSize + productInstanceSize + iTag.process().size() + 3;
 
-  m_tokenLabels.reserve(m_tokenLabels.size()+additionalSize);
+  m_tokenLabels.reserve(m_tokenLabels.size() + additionalSize);
   {
-    const std::string& m =iTag.label();
-    m_tokenLabels.insert(m_tokenLabels.end(),m.begin(),m.end());
+    const std::string& m = iTag.label();
+    m_tokenLabels.insert(m_tokenLabels.end(), m.begin(), m.end());
     m_tokenLabels.push_back('\0');
   }
   {
-    const std::string& m =iTag.instance();
-    m_tokenLabels.insert(m_tokenLabels.end(),m.begin(),m.end());
+    const std::string& m = iTag.instance();
+    m_tokenLabels.insert(m_tokenLabels.end(), m.begin(), m.end());
     m_tokenLabels.push_back('\0');
   }
   {
@@ -127,7 +124,7 @@ EDConsumerBase::recordConsumes(BranchType iBranch, TypeToGet const& iType, edm::
       containsCurrentProcessAlias_ = true;
     }
     if (!skipCurrentProcess) {
-      m_tokenLabels.insert(m_tokenLabels.end(),m.begin(),m.end());
+      m_tokenLabels.insert(m_tokenLabels.end(), m.begin(), m.end());
       m_tokenLabels.push_back('\0');
     } else {
       m_tokenLabels.push_back('\0');
@@ -136,55 +133,53 @@ EDConsumerBase::recordConsumes(BranchType iBranch, TypeToGet const& iType, edm::
   return index;
 }
 
-void
-EDConsumerBase::updateLookup(BranchType iBranchType,
-                             ProductResolverIndexHelper const& iHelper,
-                             bool iPrefetchMayGet)
-{
+void EDConsumerBase::updateLookup(BranchType iBranchType,
+                                  ProductResolverIndexHelper const& iHelper,
+                                  bool iPrefetchMayGet) {
   frozen_ = true;
   assert(!containsCurrentProcessAlias_);
   {
     auto itKind = m_tokenInfo.begin<kKind>();
     auto itLabels = m_tokenInfo.begin<kLabels>();
-    for(auto itInfo = m_tokenInfo.begin<kLookupInfo>(),itEnd = m_tokenInfo.end<kLookupInfo>();
-        itInfo != itEnd; ++itInfo,++itKind,++itLabels) {
-      if(itInfo->m_branchType == iBranchType) {
+    for (auto itInfo = m_tokenInfo.begin<kLookupInfo>(), itEnd = m_tokenInfo.end<kLookupInfo>(); itInfo != itEnd;
+         ++itInfo, ++itKind, ++itLabels) {
+      if (itInfo->m_branchType == iBranchType) {
         const unsigned int labelStart = itLabels->m_startOfModuleLabel;
         const char* moduleLabel = &(m_tokenLabels[labelStart]);
         itInfo->m_index = ProductResolverIndexAndSkipBit(iHelper.index(*itKind,
-                                                                     itInfo->m_type,
-                                                                     moduleLabel,
-                                                                     moduleLabel+itLabels->m_deltaToProductInstance,
-                                                                     moduleLabel+itLabels->m_deltaToProcessName),
-                                                       itInfo->m_index.skipCurrentProcess());
+                                                                       itInfo->m_type,
+                                                                       moduleLabel,
+                                                                       moduleLabel + itLabels->m_deltaToProductInstance,
+                                                                       moduleLabel + itLabels->m_deltaToProcessName),
+                                                         itInfo->m_index.skipCurrentProcess());
       }
     }
   }
 
   //now add resolved requests to get many to the end of our list
   // a get many will have an empty module label
-  for(size_t i=0, iEnd = m_tokenInfo.size(); i!=iEnd;++i) {
+  for (size_t i = 0, iEnd = m_tokenInfo.size(); i != iEnd; ++i) {
     //need to copy since pointer could be invalidated by emplace_back
     auto const info = m_tokenInfo.get<kLookupInfo>(i);
-    if(info.m_branchType == iBranchType &&
-       info.m_index.productResolverIndex() == ProductResolverIndexInvalid &&
-       m_tokenLabels[m_tokenInfo.get<kLabels>(i).m_startOfModuleLabel]=='\0') {
+    if (info.m_branchType == iBranchType && info.m_index.productResolverIndex() == ProductResolverIndexInvalid &&
+        m_tokenLabels[m_tokenInfo.get<kLabels>(i).m_startOfModuleLabel] == '\0') {
       //find all matching types
-      const auto kind=m_tokenInfo.get<kKind>(i);
-      auto matches = iHelper.relatedIndexes(kind,info.m_type);
+      const auto kind = m_tokenInfo.get<kKind>(i);
+      auto matches = iHelper.relatedIndexes(kind, info.m_type);
 
       //NOTE: This could be changed to contain the true labels for what is being
       // requested but for now I want to remember these are part of a get many
-      const LabelPlacement labels= m_tokenInfo.get<kLabels>(i);
+      const LabelPlacement labels = m_tokenInfo.get<kLabels>(i);
       bool alwaysGet = m_tokenInfo.get<kAlwaysGets>(i);
-      for(unsigned int j=0;j!=matches.numberOfMatches();++j) {
+      for (unsigned int j = 0; j != matches.numberOfMatches(); ++j) {
         //only keep the ones that are for a specific data item and not a collection
-        if(matches.isFullyResolved(j)) {
-          auto index =matches.index(j);
-          m_tokenInfo.emplace_back(TokenLookupInfo{info.m_type, index, info.m_index.skipCurrentProcess(), info.m_branchType},
-                                   alwaysGet,
-                                   labels,
-                                   kind);
+        if (matches.isFullyResolved(j)) {
+          auto index = matches.index(j);
+          m_tokenInfo.emplace_back(
+              TokenLookupInfo{info.m_type, index, info.m_index.skipCurrentProcess(), info.m_branchType},
+              alwaysGet,
+              labels,
+              kind);
         }
       }
     }
@@ -192,19 +187,81 @@ EDConsumerBase::updateLookup(BranchType iBranchType,
   m_tokenInfo.shrink_to_fit();
 
   itemsToGet(iBranchType, itemsToGetFromBranch_[iBranchType]);
-  if(iPrefetchMayGet) {
+  if (iPrefetchMayGet) {
     itemsMayGet(iBranchType, itemsToGetFromBranch_[iBranchType]);
   }
 }
 
+void EDConsumerBase::updateLookup(eventsetup::ESRecordsToProxyIndices const& iPI) {
+  unsigned int index = 0;
+  for (auto it = m_esTokenInfo.begin<kESLookupInfo>(); it != m_esTokenInfo.end<kESLookupInfo>(); ++it, ++index) {
+    auto indexInRecord = iPI.indexInRecord(it->m_record, it->m_key);
+    if (indexInRecord != eventsetup::ESRecordsToProxyIndices::missingProxyIndex()) {
+      const char* componentName = &(m_tokenLabels[it->m_startOfComponentName]);
+      if (*componentName) {
+        auto component = iPI.component(it->m_record, it->m_key);
+        if (component->label_.empty()) {
+          if (component->type_ != componentName) {
+            indexInRecord = eventsetup::ESRecordsToProxyIndices::missingProxyIndex();
+          }
+        } else if (component->label_ != componentName) {
+          indexInRecord = eventsetup::ESRecordsToProxyIndices::missingProxyIndex();
+        }
+      }
+    }
+    m_esTokenInfo.get<kESProxyIndex>(index) = indexInRecord;
+
+    int negIndex = -1 * (index + 1);
+    for (auto& items : esItemsToGetFromTransition_) {
+      for (auto& itemIndex : items) {
+        if (itemIndex.value() == negIndex) {
+          itemIndex = indexInRecord;
+          negIndex = 1;
+          break;
+        }
+      }
+      if (negIndex > 0) {
+        break;
+      }
+    }
+  }
+}
+
+ESTokenIndex EDConsumerBase::recordESConsumes(Transition iTrans,
+                                              eventsetup::EventSetupRecordKey const& iRecord,
+                                              eventsetup::heterocontainer::HCTypeTag const& iDataType,
+                                              edm::ESInputTag const& iTag) {
+  //m_tokenLabels first entry is a null. Since most ES data requests have
+  // empty labels we will assume we can reuse the first entry
+  unsigned int startOfComponentName = 0;
+  if (not iTag.module().empty()) {
+    startOfComponentName = m_tokenLabels.size();
+
+    m_tokenLabels.reserve(m_tokenLabels.size() + iTag.module().size() + 1);
+    {
+      const std::string& m = iTag.module();
+      m_tokenLabels.insert(m_tokenLabels.end(), m.begin(), m.end());
+      m_tokenLabels.push_back('\0');
+    }
+  }
+
+  auto index = static_cast<ESProxyIndex::Value_t>(m_esTokenInfo.size());
+  m_esTokenInfo.emplace_back(
+      ESTokenLookupInfo{iRecord, eventsetup::DataKey{iDataType, iTag.data().c_str()}, startOfComponentName},
+      ESProxyIndex{-1});
+  auto indexForToken = esItemsToGetFromTransition_[static_cast<unsigned int>(iTrans)].size();
+  esItemsToGetFromTransition_[static_cast<unsigned int>(iTrans)].push_back(ESProxyIndex{-1 * (index + 1)});
+  return ESTokenIndex{static_cast<ESTokenIndex::Value_t>(indexForToken)};
+}
+
 //
 // const member functions
 //
-ProductResolverIndexAndSkipBit
-EDConsumerBase::indexFrom(EDGetToken iToken, BranchType iBranch, TypeID const& iType) const
-{
-  if(UNLIKELY(iToken.index()>=m_tokenInfo.size())) {
-    throwBadToken(iType,iToken);
+ProductResolverIndexAndSkipBit EDConsumerBase::indexFrom(EDGetToken iToken,
+                                                         BranchType iBranch,
+                                                         TypeID const& iType) const {
+  if (UNLIKELY(iToken.index() >= m_tokenInfo.size())) {
+    throwBadToken(iType, iToken);
   }
   const auto& info = m_tokenInfo.get<kLookupInfo>(iToken.index());
   if (LIKELY(iBranch == info.m_branchType)) {
@@ -214,45 +271,39 @@ EDConsumerBase::indexFrom(EDGetToken iToken, BranchType iBranch, TypeID const& i
       throwTypeMismatch(iType, iToken);
     }
   } else {
-    throwBranchMismatch(iBranch,iToken);
+    throwBranchMismatch(iBranch, iToken);
   }
   return ProductResolverIndexAndSkipBit(edm::ProductResolverIndexInvalid, false);
 }
 
-ProductResolverIndexAndSkipBit
-EDConsumerBase::uncheckedIndexFrom(EDGetToken iToken) const {
+ProductResolverIndexAndSkipBit EDConsumerBase::uncheckedIndexFrom(EDGetToken iToken) const {
   return m_tokenInfo.get<kLookupInfo>(iToken.index()).m_index;
 }
 
-
-void
-EDConsumerBase::itemsToGet(BranchType iBranch, std::vector<ProductResolverIndexAndSkipBit>& oIndices) const
-{
+void EDConsumerBase::itemsToGet(BranchType iBranch, std::vector<ProductResolverIndexAndSkipBit>& oIndices) const {
   //how many are we adding?
-  unsigned int count=0;
+  unsigned int count = 0;
   {
     auto itAlwaysGet = m_tokenInfo.begin<kAlwaysGets>();
-    for(auto it = m_tokenInfo.begin<kLookupInfo>(),
-        itEnd = m_tokenInfo.end<kLookupInfo>();
-        it != itEnd; ++it,++itAlwaysGet) {
-      if(iBranch==it->m_branchType) {
+    for (auto it = m_tokenInfo.begin<kLookupInfo>(), itEnd = m_tokenInfo.end<kLookupInfo>(); it != itEnd;
+         ++it, ++itAlwaysGet) {
+      if (iBranch == it->m_branchType) {
         if (it->m_index.productResolverIndex() != ProductResolverIndexInvalid) {
-          if(*itAlwaysGet) {
+          if (*itAlwaysGet) {
             ++count;
           }
         }
       }
     }
   }
-  oIndices.reserve(oIndices.size()+count);
+  oIndices.reserve(oIndices.size() + count);
   {
     auto itAlwaysGet = m_tokenInfo.begin<kAlwaysGets>();
-    for(auto it = m_tokenInfo.begin<kLookupInfo>(),
-        itEnd = m_tokenInfo.end<kLookupInfo>();
-        it != itEnd; ++it,++itAlwaysGet) {
-      if(iBranch==it->m_branchType) {
+    for (auto it = m_tokenInfo.begin<kLookupInfo>(), itEnd = m_tokenInfo.end<kLookupInfo>(); it != itEnd;
+         ++it, ++itAlwaysGet) {
+      if (iBranch == it->m_branchType) {
         if (it->m_index.productResolverIndex() != ProductResolverIndexInvalid) {
-          if(*itAlwaysGet) {
+          if (*itAlwaysGet) {
             oIndices.push_back(it->m_index);
           }
         }
@@ -261,34 +312,30 @@ EDConsumerBase::itemsToGet(BranchType iBranch, std::vector<ProductResolverIndexA
   }
 }
 
-void
-EDConsumerBase::itemsMayGet(BranchType iBranch, std::vector<ProductResolverIndexAndSkipBit>& oIndices) const
-{
+void EDConsumerBase::itemsMayGet(BranchType iBranch, std::vector<ProductResolverIndexAndSkipBit>& oIndices) const {
   //how many are we adding?
-  unsigned int count=0;
+  unsigned int count = 0;
   {
     auto itAlwaysGet = m_tokenInfo.begin<kAlwaysGets>();
-    for(auto it = m_tokenInfo.begin<kLookupInfo>(),
-        itEnd = m_tokenInfo.end<kLookupInfo>();
-        it != itEnd; ++it,++itAlwaysGet) {
-      if(iBranch==it->m_branchType) {
+    for (auto it = m_tokenInfo.begin<kLookupInfo>(), itEnd = m_tokenInfo.end<kLookupInfo>(); it != itEnd;
+         ++it, ++itAlwaysGet) {
+      if (iBranch == it->m_branchType) {
         if (it->m_index.productResolverIndex() != ProductResolverIndexInvalid) {
-          if(not *itAlwaysGet) {
+          if (not*itAlwaysGet) {
             ++count;
           }
         }
       }
     }
   }
-  oIndices.reserve(oIndices.size()+count);
+  oIndices.reserve(oIndices.size() + count);
   {
     auto itAlwaysGet = m_tokenInfo.begin<kAlwaysGets>();
-    for(auto it = m_tokenInfo.begin<kLookupInfo>(),
-        itEnd = m_tokenInfo.end<kLookupInfo>();
-        it != itEnd; ++it,++itAlwaysGet) {
-      if(iBranch==it->m_branchType) {
+    for (auto it = m_tokenInfo.begin<kLookupInfo>(), itEnd = m_tokenInfo.end<kLookupInfo>(); it != itEnd;
+         ++it, ++itAlwaysGet) {
+      if (iBranch == it->m_branchType) {
         if (it->m_index.productResolverIndex() != ProductResolverIndexInvalid) {
-          if(not *itAlwaysGet) {
+          if (not*itAlwaysGet) {
             oIndices.push_back(it->m_index);
           }
         }
@@ -297,71 +344,65 @@ EDConsumerBase::itemsMayGet(BranchType iBranch, std::vector<ProductResolverIndex
   }
 }
 
-void
-EDConsumerBase::labelsForToken(EDGetToken iToken, Labels& oLabels) const
-{
+void EDConsumerBase::labelsForToken(EDGetToken iToken, Labels& oLabels) const {
   unsigned int index = iToken.index();
   auto labels = m_tokenInfo.get<kLabels>(index);
   unsigned int start = labels.m_startOfModuleLabel;
   oLabels.module = &(m_tokenLabels[start]);
-  oLabels.productInstance = oLabels.module+labels.m_deltaToProductInstance;
-  oLabels.process = oLabels.module+labels.m_deltaToProcessName;
+  oLabels.productInstance = oLabels.module + labels.m_deltaToProductInstance;
+  oLabels.process = oLabels.module + labels.m_deltaToProcessName;
 }
 
-bool
-EDConsumerBase::registeredToConsume(ProductResolverIndex iIndex, bool skipCurrentProcess, BranchType iBranch) const
-{
-  for(auto it = m_tokenInfo.begin<kLookupInfo>(),
-      itEnd = m_tokenInfo.end<kLookupInfo>();
-      it != itEnd; ++it) {
-    if(it->m_index.productResolverIndex() == iIndex and
-       it->m_index.skipCurrentProcess() == skipCurrentProcess and
-       it->m_branchType == iBranch) {
+bool EDConsumerBase::registeredToConsume(ProductResolverIndex iIndex,
+                                         bool skipCurrentProcess,
+                                         BranchType iBranch) const {
+  for (auto it = m_tokenInfo.begin<kLookupInfo>(), itEnd = m_tokenInfo.end<kLookupInfo>(); it != itEnd; ++it) {
+    if (it->m_index.productResolverIndex() == iIndex and it->m_index.skipCurrentProcess() == skipCurrentProcess and
+        it->m_branchType == iBranch) {
       return true;
     }
   }
   return false;
 }
 
-bool
-EDConsumerBase::registeredToConsumeMany(TypeID const& iType, BranchType iBranch) const
-{
-  for(auto it = m_tokenInfo.begin<kLookupInfo>(),
-      itEnd = m_tokenInfo.end<kLookupInfo>();
-      it != itEnd; ++it) {
+bool EDConsumerBase::registeredToConsumeMany(TypeID const& iType, BranchType iBranch) const {
+  for (auto it = m_tokenInfo.begin<kLookupInfo>(), itEnd = m_tokenInfo.end<kLookupInfo>(); it != itEnd; ++it) {
     //consumesMany entries do not have their index resolved
-    if(it->m_index.productResolverIndex() == ProductResolverIndexInvalid and
-       it->m_type == iType and
-       it->m_branchType == iBranch) {
+    if (it->m_index.productResolverIndex() == ProductResolverIndexInvalid and it->m_type == iType and
+        it->m_branchType == iBranch) {
       return true;
     }
   }
   return false;
-  
 }
 
-
-void
-EDConsumerBase::throwTypeMismatch(edm::TypeID const& iType, EDGetToken iToken) const
-{
-  throw cms::Exception("TypeMismatch")<<"A get using a EDGetToken used the C++ type '"<<iType.className()<<"' but the consumes call was for type '"<<m_tokenInfo.get<kLookupInfo>(iToken.index()).m_type.className()<<"'.\n Please modify either the consumes or get call so the types match.";
+void EDConsumerBase::throwTypeMismatch(edm::TypeID const& iType, EDGetToken iToken) const {
+  throw cms::Exception("TypeMismatch") << "A get using a EDGetToken used the C++ type '" << iType.className()
+                                       << "' but the consumes call was for type '"
+                                       << m_tokenInfo.get<kLookupInfo>(iToken.index()).m_type.className()
+                                       << "'.\n Please modify either the consumes or get call so the types match.";
 }
-void
-EDConsumerBase::throwBranchMismatch(BranchType iBranch, EDGetToken iToken) const {
-  throw cms::Exception("BranchTypeMismatch")<<"A get using a EDGetToken was done in "<<BranchTypeToString(iBranch)<<" but the consumes call was for "<<BranchTypeToString(m_tokenInfo.get<kLookupInfo>(iToken.index()).m_branchType)<<".\n Please modify the consumes call to use the correct branch type.";
+void EDConsumerBase::throwBranchMismatch(BranchType iBranch, EDGetToken iToken) const {
+  throw cms::Exception("BranchTypeMismatch")
+      << "A get using a EDGetToken was done in " << BranchTypeToString(iBranch) << " but the consumes call was for "
+      << BranchTypeToString(m_tokenInfo.get<kLookupInfo>(iToken.index()).m_branchType)
+      << ".\n Please modify the consumes call to use the correct branch type.";
 }
 
-void
-EDConsumerBase::throwBadToken(edm::TypeID const& iType, EDGetToken iToken) const
-{
-  if(iToken.isUninitialized()) {
-    throw cms::Exception("BadToken")<<"A get using a EDGetToken with the C++ type '"<<iType.className()<<"' was made using an uninitialized token.\n Please check that the variable is being initialized from a 'consumes' call.";
+void EDConsumerBase::throwBadToken(edm::TypeID const& iType, EDGetToken iToken) const {
+  if (iToken.isUninitialized()) {
+    throw cms::Exception("BadToken") << "A get using a EDGetToken with the C++ type '" << iType.className()
+                                     << "' was made using an uninitialized token.\n Please check that the variable is "
+                                        "being initialized from a 'consumes' call.";
   }
-  throw cms::Exception("BadToken")<<"A get using a EDGetToken with the C++ type '"<<iType.className()<<"' was made using a token with a value "<<iToken.index()<<" which is beyond the range used by this module.\n Please check that the variable is being initialized from a 'consumes' call from this module.\n You can not share EDGetToken values between modules.";
+  throw cms::Exception("BadToken")
+      << "A get using a EDGetToken with the C++ type '" << iType.className() << "' was made using a token with a value "
+      << iToken.index()
+      << " which is beyond the range used by this module.\n Please check that the variable is being initialized from a "
+         "'consumes' call from this module.\n You can not share EDGetToken values between modules.";
 }
 
-void
-EDConsumerBase::throwConsumesCallAfterFrozen(TypeToGet const& typeToGet, InputTag const& inputTag) const {
+void EDConsumerBase::throwConsumesCallAfterFrozen(TypeToGet const& typeToGet, InputTag const& inputTag) const {
   throw cms::Exception("LogicError") << "A module declared it consumes a product after its constructor.\n"
                                      << "This must be done in the contructor\n"
                                      << "The product type was: " << typeToGet.type() << "\n"
@@ -370,24 +411,21 @@ EDConsumerBase::throwConsumesCallAfterFrozen(TypeToGet const& typeToGet, InputTa
 
 namespace {
   struct CharStarComp {
-    bool operator()(const char* iLHS, const char* iRHS) const {
-      return strcmp(iLHS,iRHS) < 0;
-    }
+    bool operator()(const char* iLHS, const char* iRHS) const { return strcmp(iLHS, iRHS) < 0; }
   };
-}
+}  // namespace
 
 namespace {
-  void
-  insertFoundModuleLabel(const char* consumedModuleLabel,
-                         std::vector<ModuleDescription const*>& modules,
-                         std::set<std::string>& alreadyFound,
-                         std::map<std::string, ModuleDescription const*> const& labelsToDesc,
-                         ProductRegistry const& preg) {
+  void insertFoundModuleLabel(const char* consumedModuleLabel,
+                              std::vector<ModuleDescription const*>& modules,
+                              std::set<std::string>& alreadyFound,
+                              std::map<std::string, ModuleDescription const*> const& labelsToDesc,
+                              ProductRegistry const& preg) {
     // Convert from label string to module description, eliminate duplicates,
     // then insert into the vector of modules
     auto it = labelsToDesc.find(consumedModuleLabel);
-    if(it != labelsToDesc.end()) {
-      if(alreadyFound.insert(consumedModuleLabel).second) {
+    if (it != labelsToDesc.end()) {
+      if (alreadyFound.insert(consumedModuleLabel).second) {
         modules.push_back(it->second);
       }
       return;
@@ -396,12 +434,11 @@ namespace {
     std::vector<std::pair<std::string, std::string> > const& aliasToOriginal = preg.aliasToOriginal();
     std::pair<std::string, std::string> target(consumedModuleLabel, std::string());
     auto iter = std::lower_bound(aliasToOriginal.begin(), aliasToOriginal.end(), target);
-    if(iter != aliasToOriginal.end() && iter->first == consumedModuleLabel) {
-
+    if (iter != aliasToOriginal.end() && iter->first == consumedModuleLabel) {
       std::string const& originalModuleLabel = iter->second;
       auto iter2 = labelsToDesc.find(originalModuleLabel);
-      if(iter2 != labelsToDesc.end()) {
-        if(alreadyFound.insert(originalModuleLabel).second) {
+      if (iter2 != labelsToDesc.end()) {
+        if (alreadyFound.insert(originalModuleLabel).second) {
           modules.push_back(iter2->second);
         }
         return;
@@ -410,63 +447,55 @@ namespace {
     // Ignore the source products, we are only interested in module products.
     // As far as I know, it should never be anything else so throw if something
     // unknown gets passed in.
-    if(std::string(consumedModuleLabel) != "source") {
+    if (std::string(consumedModuleLabel) != "source") {
       throw cms::Exception("EDConsumerBase", "insertFoundModuleLabel")
-        << "Couldn't find ModuleDescription for the consumed module label: "
-        << std::string(consumedModuleLabel) << "\n";
+          << "Couldn't find ModuleDescription for the consumed module label: " << std::string(consumedModuleLabel)
+          << "\n";
     }
   }
-}
-
-void
-EDConsumerBase::modulesWhoseProductsAreConsumed(std::vector<ModuleDescription const*>& modules,
-                                                ProductRegistry const& preg,
-                                                std::map<std::string, ModuleDescription const*> const& labelsToDesc,
-                                                std::string const& processName) const {
+}  // namespace
 
+void EDConsumerBase::modulesWhoseProductsAreConsumed(std::vector<ModuleDescription const*>& modules,
+                                                     ProductRegistry const& preg,
+                                                     std::map<std::string, ModuleDescription const*> const& labelsToDesc,
+                                                     std::string const& processName) const {
   ProductResolverIndexHelper const& iHelper = *preg.productLookup(InEvent);
 
   std::set<std::string> alreadyFound;
 
   auto itKind = m_tokenInfo.begin<kKind>();
   auto itLabels = m_tokenInfo.begin<kLabels>();
-  for(auto itInfo = m_tokenInfo.begin<kLookupInfo>(),itEnd = m_tokenInfo.end<kLookupInfo>();
-      itInfo != itEnd; ++itInfo,++itKind,++itLabels) {
-
-    if(itInfo->m_branchType == InEvent and
-       (not itInfo->m_index.skipCurrentProcess())) {
-
+  for (auto itInfo = m_tokenInfo.begin<kLookupInfo>(), itEnd = m_tokenInfo.end<kLookupInfo>(); itInfo != itEnd;
+       ++itInfo, ++itKind, ++itLabels) {
+    if (itInfo->m_branchType == InEvent and (not itInfo->m_index.skipCurrentProcess())) {
       const unsigned int labelStart = itLabels->m_startOfModuleLabel;
       const char* consumedModuleLabel = &(m_tokenLabels[labelStart]);
-      const char* consumedProcessName = consumedModuleLabel+itLabels->m_deltaToProcessName;
+      const char* consumedProcessName = consumedModuleLabel + itLabels->m_deltaToProcessName;
 
-      if(*consumedModuleLabel != '\0') { // not a consumesMany
-        if(*consumedProcessName != '\0') { // process name is specified in consumes call
+      if (*consumedModuleLabel != '\0') {    // not a consumesMany
+        if (*consumedProcessName != '\0') {  // process name is specified in consumes call
           if (processName == consumedProcessName &&
               iHelper.index(*itKind,
                             itInfo->m_type,
                             consumedModuleLabel,
-                            consumedModuleLabel+itLabels->m_deltaToProductInstance,
-                            consumedModuleLabel+itLabels->m_deltaToProcessName) != ProductResolverIndexInvalid) {
+                            consumedModuleLabel + itLabels->m_deltaToProductInstance,
+                            consumedModuleLabel + itLabels->m_deltaToProcessName) != ProductResolverIndexInvalid) {
             insertFoundModuleLabel(consumedModuleLabel, modules, alreadyFound, labelsToDesc, preg);
           }
-        } else { // process name was empty
-          auto matches = iHelper.relatedIndexes(*itKind,
-                                                itInfo->m_type,
-                                                consumedModuleLabel,
-                                                consumedModuleLabel+itLabels->m_deltaToProductInstance);
-          for(unsigned int j = 0; j < matches.numberOfMatches(); ++j) {
-            if(processName == matches.processName(j)) {
+        } else {  // process name was empty
+          auto matches = iHelper.relatedIndexes(
+              *itKind, itInfo->m_type, consumedModuleLabel, consumedModuleLabel + itLabels->m_deltaToProductInstance);
+          for (unsigned int j = 0; j < matches.numberOfMatches(); ++j) {
+            if (processName == matches.processName(j)) {
               insertFoundModuleLabel(consumedModuleLabel, modules, alreadyFound, labelsToDesc, preg);
             }
           }
         }
-      // consumesMany case
-      } else if(itInfo->m_index.productResolverIndex() == ProductResolverIndexInvalid) {
-        auto matches = iHelper.relatedIndexes(*itKind,
-                                              itInfo->m_type);
-        for(unsigned int j = 0; j < matches.numberOfMatches(); ++j) {
-          if(processName == matches.processName(j)) {
+        // consumesMany case
+      } else if (itInfo->m_index.productResolverIndex() == ProductResolverIndexInvalid) {
+        auto matches = iHelper.relatedIndexes(*itKind, itInfo->m_type);
+        for (unsigned int j = 0; j < matches.numberOfMatches(); ++j) {
+          if (processName == matches.processName(j)) {
             insertFoundModuleLabel(matches.moduleLabel(j), modules, alreadyFound, labelsToDesc, preg);
           }
         }
@@ -475,9 +504,7 @@ EDConsumerBase::modulesWhoseProductsAreConsumed(std::vector<ModuleDescription co
   }
 }
 
-void
-EDConsumerBase::convertCurrentProcessAlias(std::string const& processName) {
-
+void EDConsumerBase::convertCurrentProcessAlias(std::string const& processName) {
   frozen_ = true;
 
   if (containsCurrentProcessAlias_) {
@@ -488,8 +515,7 @@ EDConsumerBase::convertCurrentProcessAlias(std::string const& processName) {
     // first calculate the size of the new vector and reserve memory for it
     std::vector<char>::size_type newSize = 0;
     std::string newProcessName;
-    for(auto iter = m_tokenInfo.begin<kLabels>(), itEnd = m_tokenInfo.end<kLabels>();
-        iter != itEnd; ++iter) {
+    for (auto iter = m_tokenInfo.begin<kLabels>(), itEnd = m_tokenInfo.end<kLabels>(); iter != itEnd; ++iter) {
       newProcessName = &m_tokenLabels[iter->m_startOfModuleLabel + iter->m_deltaToProcessName];
       if (newProcessName == InputTag::kCurrentProcess) {
         newProcessName = processName;
@@ -499,9 +525,7 @@ EDConsumerBase::convertCurrentProcessAlias(std::string const& processName) {
     newTokenLabels.reserve(newSize);
 
     unsigned int newStartOfModuleLabel = 0;
-    for(auto iter = m_tokenInfo.begin<kLabels>(), itEnd = m_tokenInfo.end<kLabels>();
-        iter != itEnd; ++iter) {
-
+    for (auto iter = m_tokenInfo.begin<kLabels>(), itEnd = m_tokenInfo.end<kLabels>(); iter != itEnd; ++iter) {
       unsigned int startOfModuleLabel = iter->m_startOfModuleLabel;
       unsigned short deltaToProcessName = iter->m_deltaToProcessName;
 
@@ -526,9 +550,7 @@ EDConsumerBase::convertCurrentProcessAlias(std::string const& processName) {
   }
 }
 
-std::vector<ConsumesInfo>
-EDConsumerBase::consumesInfo() const {
-
+std::vector<ConsumesInfo> EDConsumerBase::consumesInfo() const {
   // Use this to eliminate duplicate entries related
   // to consumesMany items where only the type was specified
   // and the there are multiple matches. In these cases the
@@ -539,17 +561,16 @@ EDConsumerBase::consumesInfo() const {
   auto itAlways = m_tokenInfo.begin<kAlwaysGets>();
   auto itKind = m_tokenInfo.begin<kKind>();
   auto itLabels = m_tokenInfo.begin<kLabels>();
-  for(auto itInfo = m_tokenInfo.begin<kLookupInfo>(),itEnd = m_tokenInfo.end<kLookupInfo>();
-      itInfo != itEnd; ++itInfo,++itKind,++itLabels, ++itAlways) {
-
+  for (auto itInfo = m_tokenInfo.begin<kLookupInfo>(), itEnd = m_tokenInfo.end<kLookupInfo>(); itInfo != itEnd;
+       ++itInfo, ++itKind, ++itLabels, ++itAlways) {
     const unsigned int labelStart = itLabels->m_startOfModuleLabel;
     const char* consumedModuleLabel = &(m_tokenLabels[labelStart]);
-    const char* consumedInstance = consumedModuleLabel+itLabels->m_deltaToProductInstance;
-    const char* consumedProcessName = consumedModuleLabel+itLabels->m_deltaToProcessName;
+    const char* consumedInstance = consumedModuleLabel + itLabels->m_deltaToProductInstance;
+    const char* consumedProcessName = consumedModuleLabel + itLabels->m_deltaToProcessName;
 
     // consumesMany case
-    if(*consumedModuleLabel == '\0') {
-      if(!alreadySeenTypes.insert(itInfo->m_type).second) {
+    if (*consumedModuleLabel == '\0') {
+      if (!alreadySeenTypes.insert(itInfo->m_type).second) {
         continue;
       }
     }
@@ -566,3 +587,7 @@ EDConsumerBase::consumesInfo() const {
   }
   return result;
 }
+
+const char* EDConsumerBase::labelFor(ESTokenIndex iIndex) const {
+  return m_esTokenInfo.get<kESLookupInfo>(iIndex.value()).m_key.name().value();
+}
diff --git a/FWCore/Framework/src/EDFilter.cc b/FWCore/Framework/src/EDFilter.cc
index 7f3e343cb7668..4882965509cdb 100644
--- a/FWCore/Framework/src/EDFilter.cc
+++ b/FWCore/Framework/src/EDFilter.cc
@@ -17,112 +17,97 @@
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 namespace edm {
-  
-  EDFilter::EDFilter() : ProducerBase() , moduleDescription_(),
-  previousParentage_(), previousParentageId_() {
-    SharedResourcesRegistry::instance()->registerSharedResource(
-                                                                SharedResourcesRegistry::kLegacyModuleResourceName);
-  }
 
-  EDFilter::~EDFilter() {
+  EDFilter::EDFilter() : ProducerBase(), moduleDescription_(), previousParentage_(), previousParentageId_() {
+    SharedResourcesRegistry::instance()->registerSharedResource(SharedResourcesRegistry::kLegacyModuleResourceName);
   }
 
-  bool
-  EDFilter::doEvent(EventPrincipal const& ep, EventSetupImpl const& c,
-                    ActivityRegistry* act,
-                    ModuleCallingContext const* mcc) {
+  EDFilter::~EDFilter() {}
+
+  bool EDFilter::doEvent(EventPrincipal const& ep,
+                         EventSetupImpl const& c,
+                         ActivityRegistry* act,
+                         ModuleCallingContext const* mcc) {
     bool rc = false;
     Event e(ep, moduleDescription_, mcc);
     e.setConsumer(this);
-    e.setProducer(this,&previousParentage_);
+    e.setProducer(this, &previousParentage_);
     e.setSharedResourcesAcquirer(&resourceAcquirer_);
-    EventSignalsSentry sentry(act,mcc);
-    rc = this->filter(e, EventSetup{c});
+    EventSignalsSentry sentry(act, mcc);
+    rc = this->filter(
+        e, EventSetup{c, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event)});
     commit_(e, &previousParentageId_);
     return rc;
   }
 
-  void 
-  EDFilter::doBeginJob() {
+  void EDFilter::doBeginJob() {
     std::vector<std::string> res = {SharedResourcesRegistry::kLegacyModuleResourceName};
     resourceAcquirer_ = SharedResourcesRegistry::instance()->createAcquirer(res);
 
     this->beginJob();
   }
-   
-  void EDFilter::doEndJob() { 
-    this->endJob();
-  }
 
-  void
-  EDFilter::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c,
-                       ModuleCallingContext const* mcc) {
-    Run r(rp, moduleDescription_, mcc,false);
+  void EDFilter::doEndJob() { this->endJob(); }
+
+  void EDFilter::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc) {
+    Run r(rp, moduleDescription_, mcc, false);
     r.setConsumer(this);
-    Run const& cnstR=r;
-    this->beginRun(cnstR, EventSetup{c});
+    Run const& cnstR = r;
+    this->beginRun(
+        cnstR, EventSetup{c, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun)});
     commit_(r);
     return;
   }
 
-  void
-  EDFilter::doEndRun(RunPrincipal const& rp, EventSetupImpl const& c,
-                     ModuleCallingContext const* mcc) {
-    Run r(rp, moduleDescription_, mcc,true);
+  void EDFilter::doEndRun(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc) {
+    Run r(rp, moduleDescription_, mcc, true);
     r.setConsumer(this);
-    Run const& cnstR=r;
-    this->endRun(cnstR, EventSetup{c});
+    Run const& cnstR = r;
+    this->endRun(cnstR,
+                 EventSetup{c, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun)});
     commit_(r);
     return;
   }
 
-  void
-  EDFilter::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& c,
-                                   ModuleCallingContext const* mcc) {
-    LuminosityBlock lb(lbp, moduleDescription_, mcc,false);
+  void EDFilter::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                        EventSetupImpl const& c,
+                                        ModuleCallingContext const* mcc) {
+    LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
     lb.setConsumer(this);
     LuminosityBlock const& cnstLb = lb;
-    this->beginLuminosityBlock(cnstLb, EventSetup{c});
+    this->beginLuminosityBlock(cnstLb,
+                               EventSetup{c,
+                                          static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                                          esGetTokenIndices(Transition::BeginLuminosityBlock)});
     commit_(lb);
   }
 
-  void
-  EDFilter::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& c,
-                                 ModuleCallingContext const* mcc) {
-    LuminosityBlock lb(lbp, moduleDescription_, mcc,true);
+  void EDFilter::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                      EventSetupImpl const& c,
+                                      ModuleCallingContext const* mcc) {
+    LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
     lb.setConsumer(this);
     LuminosityBlock const& cnstLb = lb;
-    this->endLuminosityBlock(cnstLb, EventSetup{c});
+    this->endLuminosityBlock(cnstLb,
+                             EventSetup{c,
+                                        static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                                        esGetTokenIndices(Transition::EndLuminosityBlock)});
     commit_(lb);
-    return ;
+    return;
   }
 
-  void
-  EDFilter::doRespondToOpenInputFile(FileBlock const& fb) {
-    respondToOpenInputFile(fb);
-  }
+  void EDFilter::doRespondToOpenInputFile(FileBlock const& fb) { respondToOpenInputFile(fb); }
 
-  void
-  EDFilter::doRespondToCloseInputFile(FileBlock const& fb) {
-    respondToCloseInputFile(fb);
-  }
+  void EDFilter::doRespondToCloseInputFile(FileBlock const& fb) { respondToCloseInputFile(fb); }
 
-  void
-  EDFilter::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void EDFilter::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     desc.setUnknown();
     descriptions.addDefault(desc);
   }
 
-  void
-  EDFilter::prevalidate(ConfigurationDescriptions& iConfig) {
-    edmodule_mightGet_config(iConfig);
-  }
-  
+  void EDFilter::prevalidate(ConfigurationDescriptions& iConfig) { edmodule_mightGet_config(iConfig); }
 
   static const std::string kBaseType("EDFilter");
-  const std::string&
-  EDFilter::baseType() {
-    return kBaseType;
-  }
-}
+  const std::string& EDFilter::baseType() { return kBaseType; }
+}  // namespace edm
diff --git a/FWCore/Framework/src/EDLooper.cc b/FWCore/Framework/src/EDLooper.cc
index 25d85f81bac66..ae2481384dfcc 100644
--- a/FWCore/Framework/src/EDLooper.cc
+++ b/FWCore/Framework/src/EDLooper.cc
@@ -2,18 +2,17 @@
 //
 // Package:     <package>
 // Module:      EDLooper
-// 
+//
 // Author:      Valentin Kuznetsov
 // Created:     Wed Jul  5 11:44:26 EDT 2006
 
 #include "FWCore/Framework/interface/EDLooper.h"
 namespace edm {
 
-  EDLooper::EDLooper() : EDLooperBase(){ }
-  EDLooper::~EDLooper() { }
+  EDLooper::EDLooper() : EDLooperBase() {}
+  EDLooper::~EDLooper() {}
 
-  EDLooperBase::Status 
-  EDLooper::duringLoop(Event const& iEvent, EventSetup const& iEventSetup, ProcessingController&) {
+  EDLooperBase::Status EDLooper::duringLoop(Event const& iEvent, EventSetup const& iEventSetup, ProcessingController&) {
     return duringLoop(iEvent, iEventSetup);
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/EDLooperBase.cc b/FWCore/Framework/src/EDLooperBase.cc
index baa42b0b3d2cc..285647c74edf1 100644
--- a/FWCore/Framework/src/EDLooperBase.cc
+++ b/FWCore/Framework/src/EDLooperBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     <package>
 // Module:      EDLooperBase
-// 
+//
 // Author:      Valentin Kuznetsov
 // Created:     Wed Jul  5 11:44:26 EDT 2006
 
@@ -29,21 +29,20 @@
 
 namespace edm {
 
-  EDLooperBase::EDLooperBase() : iCounter_(0), act_table_(nullptr), moduleChanger_(nullptr),
-                                 moduleDescription_("Looper", "looper"),
-                                 moduleCallingContext_(&moduleDescription_)
- { }
-  EDLooperBase::~EDLooperBase() noexcept(false) { }
-
-  void
-  EDLooperBase::doStartingNewLoop() {
-    startingNewLoop(iCounter_);
-  }
+  EDLooperBase::EDLooperBase()
+      : iCounter_(0),
+        act_table_(nullptr),
+        moduleChanger_(nullptr),
+        moduleDescription_("Looper", "looper"),
+        moduleCallingContext_(&moduleDescription_) {}
+  EDLooperBase::~EDLooperBase() noexcept(false) {}
 
-  EDLooperBase::Status
-  EDLooperBase::doDuringLoop(edm::EventPrincipal& eventPrincipal, const edm::EventSetupImpl& esi,
-                             edm::ProcessingController& ioController, StreamContext* streamContext) {
+  void EDLooperBase::doStartingNewLoop() { startingNewLoop(iCounter_); }
 
+  EDLooperBase::Status EDLooperBase::doDuringLoop(edm::EventPrincipal& eventPrincipal,
+                                                  const edm::EventSetupImpl& esi,
+                                                  edm::ProcessingController& ioController,
+                                                  StreamContext* streamContext) {
     streamContext->setTransition(StreamContext::Transition::kEvent);
     streamContext->setEventID(eventPrincipal.id());
     streamContext->setRunIndex(eventPrincipal.luminosityBlockPrincipal().runPrincipal().index());
@@ -55,72 +54,71 @@ namespace edm {
 
     Status status = kContinue;
     try {
-      const EventSetup es{esi};
+      const EventSetup es{esi, static_cast<unsigned int>(Transition::Event), nullptr};
       status = duringLoop(event, es, ioController);
-    }
-    catch(cms::Exception& e) {
+    } catch (cms::Exception& e) {
       e.addContext("Calling the 'duringLoop' method of a looper");
       exception_actions::ActionCodes action = (act_table_->find(e.category()));
       if (action != exception_actions::Rethrow) {
         edm::printCmsExceptionWarning("SkipEvent", e);
-      }
-      else {
+      } else {
         throw;
       }
     }
     return status;
   }
 
-  EDLooperBase::Status
-  EDLooperBase::doEndOfLoop(const edm::EventSetupImpl& esi) {
-    const EventSetup es{esi};
+  EDLooperBase::Status EDLooperBase::doEndOfLoop(const edm::EventSetupImpl& esi) {
+    const EventSetup es{esi, static_cast<unsigned int>(Transition::EndRun), nullptr};
     return endOfLoop(es, iCounter_);
   }
 
-  void
-  EDLooperBase::prepareForNextLoop(eventsetup::EventSetupProvider* esp) {
+  void EDLooperBase::prepareForNextLoop(eventsetup::EventSetupProvider* esp) {
     ++iCounter_;
 
     std::set<edm::eventsetup::EventSetupRecordKey> const& keys = modifyingRecords();
     for_all(keys,
-      std::bind(&eventsetup::EventSetupProvider::resetRecordPlusDependentRecords,
-                  esp, std::placeholders::_1));
+            std::bind(&eventsetup::EventSetupProvider::resetRecordPlusDependentRecords, esp, std::placeholders::_1));
   }
 
-  void EDLooperBase::beginOfJob(const edm::EventSetupImpl& iImpl) { beginOfJob(EventSetup{iImpl});}
-  void EDLooperBase::beginOfJob(const edm::EventSetup&) { beginOfJob();}
-  void EDLooperBase::beginOfJob() { }
+  void EDLooperBase::beginOfJob(const edm::EventSetupImpl& iImpl) {
+    beginOfJob(EventSetup{iImpl, static_cast<unsigned int>(Transition::BeginRun), nullptr});
+  }
+  void EDLooperBase::beginOfJob(const edm::EventSetup&) { beginOfJob(); }
+  void EDLooperBase::beginOfJob() {}
 
-  void EDLooperBase::endOfJob() { }
+  void EDLooperBase::endOfJob() {}
 
   void EDLooperBase::doBeginRun(RunPrincipal& iRP, EventSetupImpl const& iES, ProcessContext* processContext) {
-        GlobalContext globalContext(GlobalContext::Transition::kBeginRun,
-                                    LuminosityBlockID(iRP.run(), 0),
-                                    iRP.index(),
-                                    LuminosityBlockIndex::invalidLuminosityBlockIndex(),
-                                    iRP.beginTime(),
-                                    processContext);
-        ParentContext parentContext(&globalContext);
-        ModuleContextSentry moduleContextSentry(&moduleCallingContext_, parentContext);
-        Run run(iRP, moduleDescription_, &moduleCallingContext_, false);
-        const EventSetup es{iES};
-        beginRun(run,es);
+    GlobalContext globalContext(GlobalContext::Transition::kBeginRun,
+                                LuminosityBlockID(iRP.run(), 0),
+                                iRP.index(),
+                                LuminosityBlockIndex::invalidLuminosityBlockIndex(),
+                                iRP.beginTime(),
+                                processContext);
+    ParentContext parentContext(&globalContext);
+    ModuleContextSentry moduleContextSentry(&moduleCallingContext_, parentContext);
+    Run run(iRP, moduleDescription_, &moduleCallingContext_, false);
+    const EventSetup es{iES, static_cast<unsigned int>(Transition::BeginRun), nullptr};
+    beginRun(run, es);
   }
 
-  void EDLooperBase::doEndRun(RunPrincipal& iRP, EventSetupImpl const& iES, ProcessContext* processContext){
-        GlobalContext globalContext(GlobalContext::Transition::kEndRun,
-                                    LuminosityBlockID(iRP.run(), 0),
-                                    iRP.index(),
-                                    LuminosityBlockIndex::invalidLuminosityBlockIndex(),
-                                    iRP.endTime(),
-                                    processContext);
-        ParentContext parentContext(&globalContext);
-        ModuleContextSentry moduleContextSentry(&moduleCallingContext_, parentContext);
-        Run run(iRP, moduleDescription_, &moduleCallingContext_,true);
-        const EventSetup es{iES};
-        endRun(run,es);
+  void EDLooperBase::doEndRun(RunPrincipal& iRP, EventSetupImpl const& iES, ProcessContext* processContext) {
+    GlobalContext globalContext(GlobalContext::Transition::kEndRun,
+                                LuminosityBlockID(iRP.run(), 0),
+                                iRP.index(),
+                                LuminosityBlockIndex::invalidLuminosityBlockIndex(),
+                                iRP.endTime(),
+                                processContext);
+    ParentContext parentContext(&globalContext);
+    ModuleContextSentry moduleContextSentry(&moduleCallingContext_, parentContext);
+    Run run(iRP, moduleDescription_, &moduleCallingContext_, true);
+    const EventSetup es{iES, static_cast<unsigned int>(Transition::EndRun), nullptr};
+    endRun(run, es);
   }
-  void EDLooperBase::doBeginLuminosityBlock(LuminosityBlockPrincipal& iLB, EventSetupImpl const& iES, ProcessContext* processContext){
+  void EDLooperBase::doBeginLuminosityBlock(LuminosityBlockPrincipal& iLB,
+                                            EventSetupImpl const& iES,
+                                            ProcessContext* processContext) {
     GlobalContext globalContext(GlobalContext::Transition::kBeginLuminosityBlock,
                                 iLB.id(),
                                 iLB.runPrincipal().index(),
@@ -130,10 +128,12 @@ namespace edm {
     ParentContext parentContext(&globalContext);
     ModuleContextSentry moduleContextSentry(&moduleCallingContext_, parentContext);
     LuminosityBlock luminosityBlock(iLB, moduleDescription_, &moduleCallingContext_, false);
-    const EventSetup es{iES};
-    beginLuminosityBlock(luminosityBlock,es);
+    const EventSetup es{iES, static_cast<unsigned int>(Transition::BeginLuminosityBlock), nullptr};
+    beginLuminosityBlock(luminosityBlock, es);
   }
-  void EDLooperBase::doEndLuminosityBlock(LuminosityBlockPrincipal& iLB, EventSetupImpl const& iES, ProcessContext* processContext){
+  void EDLooperBase::doEndLuminosityBlock(LuminosityBlockPrincipal& iLB,
+                                          EventSetupImpl const& iES,
+                                          ProcessContext* processContext) {
     GlobalContext globalContext(GlobalContext::Transition::kEndLuminosityBlock,
                                 iLB.id(),
                                 iLB.runPrincipal().index(),
@@ -143,38 +143,25 @@ namespace edm {
     ParentContext parentContext(&globalContext);
     ModuleContextSentry moduleContextSentry(&moduleCallingContext_, parentContext);
     LuminosityBlock luminosityBlock(iLB, moduleDescription_, &moduleCallingContext_, true);
-    const EventSetup es{iES};
-    endLuminosityBlock(luminosityBlock,es);
+    const EventSetup es{iES, static_cast<unsigned int>(Transition::EndLuminosityBlock), nullptr};
+    endLuminosityBlock(luminosityBlock, es);
   }
 
-  void EDLooperBase::beginRun(Run const&, EventSetup const&){}
-  void EDLooperBase::endRun(Run const&, EventSetup const&){}
-  void EDLooperBase::beginLuminosityBlock(LuminosityBlock const&, EventSetup const&){}
-  void EDLooperBase::endLuminosityBlock(LuminosityBlock const&, EventSetup const&){}
+  void EDLooperBase::beginRun(Run const&, EventSetup const&) {}
+  void EDLooperBase::endRun(Run const&, EventSetup const&) {}
+  void EDLooperBase::beginLuminosityBlock(LuminosityBlock const&, EventSetup const&) {}
+  void EDLooperBase::endLuminosityBlock(LuminosityBlock const&, EventSetup const&) {}
 
-  void EDLooperBase::attachTo(ActivityRegistry&){}
-   
+  void EDLooperBase::attachTo(ActivityRegistry&) {}
 
-  std::set<eventsetup::EventSetupRecordKey> 
-  EDLooperBase::modifyingRecords() const
-  {
-    return std::set<eventsetup::EventSetupRecordKey> ();
-  }
-   
-  void 
-  EDLooperBase::copyInfo(const ScheduleInfo& iInfo){
-    scheduleInfo_ = std::make_unique<ScheduleInfo>(iInfo);
-  }
-  void 
-  EDLooperBase::setModuleChanger(ModuleChanger* iChanger) {
-    moduleChanger_ = iChanger;
+  std::set<eventsetup::EventSetupRecordKey> EDLooperBase::modifyingRecords() const {
+    return std::set<eventsetup::EventSetupRecordKey>();
   }
 
-  ModuleChanger* EDLooperBase::moduleChanger() {
-    return moduleChanger_;
-  }
-  const ScheduleInfo* EDLooperBase::scheduleInfo() const {
-    return scheduleInfo_.get();
-  }
-  
-}
+  void EDLooperBase::copyInfo(const ScheduleInfo& iInfo) { scheduleInfo_ = std::make_unique<ScheduleInfo>(iInfo); }
+  void EDLooperBase::setModuleChanger(ModuleChanger* iChanger) { moduleChanger_ = iChanger; }
+
+  ModuleChanger* EDLooperBase::moduleChanger() { return moduleChanger_; }
+  const ScheduleInfo* EDLooperBase::scheduleInfo() const { return scheduleInfo_.get(); }
+
+}  // namespace edm
diff --git a/FWCore/Framework/src/EDProducer.cc b/FWCore/Framework/src/EDProducer.cc
index 149f62981f29b..2a568f4671047 100644
--- a/FWCore/Framework/src/EDProducer.cc
+++ b/FWCore/Framework/src/EDProducer.cc
@@ -17,114 +17,92 @@
 #include "SharedResourcesRegistry.h"
 
 namespace edm {
-  EDProducer::EDProducer() :
-      ProducerBase(),
-      moduleDescription_(),
-      previousParentage_(),
-      previousParentageId_() {
-        SharedResourcesRegistry::instance()->registerSharedResource(
-                                                                    SharedResourcesRegistry::kLegacyModuleResourceName);
-      }
-
-  EDProducer::~EDProducer() { }
-
-  bool
-  EDProducer::doEvent(EventPrincipal const& ep, EventSetupImpl const& ci,
-                      ActivityRegistry* act,
-                      ModuleCallingContext const* mcc) {
+  EDProducer::EDProducer() : ProducerBase(), moduleDescription_(), previousParentage_(), previousParentageId_() {
+    SharedResourcesRegistry::instance()->registerSharedResource(SharedResourcesRegistry::kLegacyModuleResourceName);
+  }
+
+  EDProducer::~EDProducer() {}
+
+  bool EDProducer::doEvent(EventPrincipal const& ep,
+                           EventSetupImpl const& ci,
+                           ActivityRegistry* act,
+                           ModuleCallingContext const* mcc) {
     Event e(ep, moduleDescription_, mcc);
     e.setConsumer(this);
     e.setProducer(this, &previousParentage_);
     e.setSharedResourcesAcquirer(&resourceAcquirer_);
-    EventSignalsSentry sentry(act,mcc);
-    const EventSetup c{ci};
+    EventSignalsSentry sentry(act, mcc);
+    const EventSetup c{ci, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event)};
     this->produce(e, c);
     commit_(e, &previousParentageId_);
     return true;
   }
 
-  void 
-  EDProducer::doBeginJob() {
+  void EDProducer::doBeginJob() {
     std::vector<std::string> res = {SharedResourcesRegistry::kLegacyModuleResourceName};
     resourceAcquirer_ = SharedResourcesRegistry::instance()->createAcquirer(res);
     this->beginJob();
   }
-  
-  void 
-  EDProducer::doEndJob() {
-    this->endJob();
-  }
 
-  void
-  EDProducer::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                         ModuleCallingContext const* mcc) {
+  void EDProducer::doEndJob() { this->endJob(); }
+
+  void EDProducer::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
     Run r(rp, moduleDescription_, mcc, false);
     r.setConsumer(this);
     Run const& cnstR = r;
-    const EventSetup c{ci};
+    const EventSetup c{ci, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun)};
     this->beginRun(cnstR, c);
     commit_(r);
   }
 
-  void
-  EDProducer::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                       ModuleCallingContext const* mcc) {
-    Run r(rp, moduleDescription_, mcc,true);
+  void EDProducer::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
+    Run r(rp, moduleDescription_, mcc, true);
     r.setConsumer(this);
     Run const& cnstR = r;
-    const EventSetup c{ci};
+    const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun)};
     this->endRun(cnstR, c);
     commit_(r);
   }
 
-  void
-  EDProducer::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                     ModuleCallingContext const* mcc) {
-    LuminosityBlock lb(lbp, moduleDescription_, mcc,false);
+  void EDProducer::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                          EventSetupImpl const& ci,
+                                          ModuleCallingContext const* mcc) {
+    LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
     lb.setConsumer(this);
     LuminosityBlock const& cnstLb = lb;
-    const EventSetup c{ci};
+    const EventSetup c{ci,
+                       static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                       esGetTokenIndices(Transition::BeginLuminosityBlock)};
     this->beginLuminosityBlock(cnstLb, c);
     commit_(lb);
   }
 
-  void
-  EDProducer::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                   ModuleCallingContext const* mcc) {
-    LuminosityBlock lb(lbp, moduleDescription_, mcc,true);
+  void EDProducer::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                        EventSetupImpl const& ci,
+                                        ModuleCallingContext const* mcc) {
+    LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
     lb.setConsumer(this);
-    const EventSetup c{ci};
+    const EventSetup c{ci,
+                       static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                       esGetTokenIndices(Transition::EndLuminosityBlock)};
     LuminosityBlock const& cnstLb = lb;
     this->endLuminosityBlock(cnstLb, c);
     commit_(lb);
   }
 
-  void
-  EDProducer::doRespondToOpenInputFile(FileBlock const& fb) {
-    respondToOpenInputFile(fb);
-  }
+  void EDProducer::doRespondToOpenInputFile(FileBlock const& fb) { respondToOpenInputFile(fb); }
 
-  void
-  EDProducer::doRespondToCloseInputFile(FileBlock const& fb) {
-    respondToCloseInputFile(fb);
-  }
+  void EDProducer::doRespondToCloseInputFile(FileBlock const& fb) { respondToCloseInputFile(fb); }
 
-  void
-  EDProducer::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void EDProducer::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     desc.setUnknown();
     descriptions.addDefault(desc);
   }
-  
-  void
-  EDProducer::prevalidate(ConfigurationDescriptions& iConfig) {
-    edmodule_mightGet_config(iConfig);
-  }
-  
+
+  void EDProducer::prevalidate(ConfigurationDescriptions& iConfig) { edmodule_mightGet_config(iConfig); }
+
   static const std::string kBaseType("EDProducer");
-  
-  const std::string&
-  EDProducer::baseType() {
-    return kBaseType;
-  }
-}
+
+  const std::string& EDProducer::baseType() { return kBaseType; }
+}  // namespace edm
diff --git a/FWCore/Framework/src/ESHandle.cc b/FWCore/Framework/src/ESHandle.cc
index c0e4bd82db60e..92612252a9ec7 100644
--- a/FWCore/Framework/src/ESHandle.cc
+++ b/FWCore/Framework/src/ESHandle.cc
@@ -6,11 +6,10 @@
 
 namespace edm {
 
-  eventsetup::ComponentDescription const*
-  ESHandleBase::description() const {
-    if(!description_) {
-      throw edm::Exception(edm::errors::InvalidReference,"NullPointer");
+  eventsetup::ComponentDescription const* ESHandleBase::description() const {
+    if (!description_) {
+      throw edm::Exception(edm::errors::InvalidReference, "NullPointer");
     }
     return description_;
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/ESHandleExceptionFactory.cc b/FWCore/Framework/src/ESHandleExceptionFactory.cc
index ac05c1263d284..27f773b807430 100644
--- a/FWCore/Framework/src/ESHandleExceptionFactory.cc
+++ b/FWCore/Framework/src/ESHandleExceptionFactory.cc
@@ -8,10 +8,6 @@
 
 #include "FWCore/Framework/interface/ESHandleExceptionFactory.h"
 
-edm::ESHandleExceptionFactory::ESHandleExceptionFactory()
-{
-}
+edm::ESHandleExceptionFactory::ESHandleExceptionFactory() {}
 
-edm::ESHandleExceptionFactory::~ESHandleExceptionFactory()
-{
-}
+edm::ESHandleExceptionFactory::~ESHandleExceptionFactory() {}
diff --git a/FWCore/Framework/src/ESProducer.cc b/FWCore/Framework/src/ESProducer.cc
index b8aa6715e03f5..9b9bb5bba30a7 100644
--- a/FWCore/Framework/src/ESProducer.cc
+++ b/FWCore/Framework/src/ESProducer.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     ESProducer
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -14,53 +14,83 @@
 
 // user include files
 #include "FWCore/Framework/interface/ESProducer.h"
-
+#include "FWCore/Framework/interface/ESRecordsToProxyIndices.h"
 
 //
 // constants, enums and typedefs
 //
 namespace edm {
-//
-// static data member definitions
-//
+  //
+  // static data member definitions
+  //
 
-//
-// constructors and destructor
-//
-ESProducer::ESProducer()
-{
-}
+  //
+  // constructors and destructor
+  //
+  ESProducer::ESProducer() : consumesInfos_{} {}
 
-// ESProducer::ESProducer(const ESProducer& rhs)
-// {
-//    // do actual copying here;
-// }
+  // ESProducer::ESProducer(const ESProducer& rhs)
+  // {
+  //    // do actual copying here;
+  // }
 
-ESProducer::~ESProducer() noexcept(false)
-{
-}
+  ESProducer::~ESProducer() noexcept(false) {}
 
-//
-// assignment operators
-//
-// const ESProducer& ESProducer::operator=(const ESProducer& rhs)
-// {
-//   //An exception safe implementation is
-//   ESProducer temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
+  //
+  // assignment operators
+  //
+  // const ESProducer& ESProducer::operator=(const ESProducer& rhs)
+  // {
+  //   //An exception safe implementation is
+  //   ESProducer temp(rhs);
+  //   swap(rhs);
+  //
+  //   return *this;
+  // }
 
-//
-// member functions
-//
+  //
+  // member functions
+  //
+  void ESProducer::updateLookup(eventsetup::ESRecordsToProxyIndices const& iProxyToIndices) {
+    itemsToGetFromRecords_.reserve(consumesInfos_.size());
+    recordsUsedDuringGet_.reserve(consumesInfos_.size());
 
-//
-// const member functions
-//
+    for (auto& info : consumesInfos_) {
+      auto& items = itemsToGetFromRecords_.emplace_back();
+      items.reserve(info->size());
+      auto& records = recordsUsedDuringGet_.emplace_back();
+      records.reserve(info->size());
+      for (auto& proxyInfo : *info) {
+        auto index = iProxyToIndices.indexInRecord(std::get<0>(proxyInfo), std::get<1>(proxyInfo));
+        if (index != eventsetup::ESRecordsToProxyIndices::missingProxyIndex()) {
+          if (not std::get<2>(proxyInfo).empty()) {
+            auto component = iProxyToIndices.component(std::get<0>(proxyInfo), std::get<1>(proxyInfo));
+            if (nullptr == component) {
+              index = eventsetup::ESRecordsToProxyIndices::missingProxyIndex();
+            } else {
+              if (component->label_.empty()) {
+                if (component->type_ != std::get<2>(proxyInfo)) {
+                  index = eventsetup::ESRecordsToProxyIndices::missingProxyIndex();
+                }
+              } else if (component->label_ != std::get<2>(proxyInfo)) {
+                index = eventsetup::ESRecordsToProxyIndices::missingProxyIndex();
+              }
+            }
+          }
+        }
+        items.push_back(index);
+        if (index != eventsetup::ESRecordsToProxyIndices::missingProxyIndex()) {
+          records.push_back(iProxyToIndices.recordIndexFor(std::get<0>(proxyInfo)));
+        }
+      }
+    }
+  }
 
-//
-// static member functions
-//
-}
+  //
+  // const member functions
+  //
+
+  //
+  // static member functions
+  //
+}  // namespace edm
diff --git a/FWCore/Framework/src/ESProducerLooper.cc b/FWCore/Framework/src/ESProducerLooper.cc
index 122c0ae166bda..970e3e2f268d1 100644
--- a/FWCore/Framework/src/ESProducerLooper.cc
+++ b/FWCore/Framework/src/ESProducerLooper.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     ESProducerLooper
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -28,9 +28,7 @@ using namespace edm::eventsetup;
 //
 // constructors and destructor
 //
-ESProducerLooper::ESProducerLooper()
-{
-}
+ESProducerLooper::ESProducerLooper() {}
 
 // ESProducerLooper::ESProducerLooper(const ESProducerLooper& rhs)
 // {
@@ -56,29 +54,22 @@ ESProducerLooper::~ESProducerLooper()
 //
 // member functions
 //
-void 
-ESProducerLooper::setIntervalFor(const EventSetupRecordKey&,
-                                 const IOVSyncValue&, 
-                                 ValidityInterval& oInterval)
-{
+void ESProducerLooper::setIntervalFor(const EventSetupRecordKey&, const IOVSyncValue&, ValidityInterval& oInterval) {
   //since non of the dependent records are valid, I will create one that is valid
   // at the beginning of time BUT must also be checked every request
   //oInterval = ValidityInterval(IOVSyncValue::beginOfTime(),
   //                             IOVSyncValue::invalidIOVSyncValue());
- //   }
+  //   }
   //} else {
-    //Give one valid for all time
-    oInterval = ValidityInterval(IOVSyncValue::beginOfTime(),
-                                 IOVSyncValue::endOfTime());
+  //Give one valid for all time
+  oInterval = ValidityInterval(IOVSyncValue::beginOfTime(), IOVSyncValue::endOfTime());
   //}
 }
 
 //use this to 'snoop' on what records are being used by the Producer
-void 
-ESProducerLooper::registerFactoryWithKey(const eventsetup::EventSetupRecordKey& iRecord ,
-                                         std::unique_ptr<eventsetup::ProxyFactoryBase> iFactory,
-                                         const std::string& iLabel )
-{
+void ESProducerLooper::registerFactoryWithKey(const eventsetup::EventSetupRecordKey& iRecord,
+                                              std::unique_ptr<eventsetup::ProxyFactoryBase> iFactory,
+                                              const std::string& iLabel) {
   findingRecordWithKey(iRecord);
   ESProxyFactoryProducer::registerFactoryWithKey(iRecord, std::move(iFactory), iLabel);
 }
@@ -86,10 +77,7 @@ ESProducerLooper::registerFactoryWithKey(const eventsetup::EventSetupRecordKey&
 //
 // const member functions
 //
-std::set<eventsetup::EventSetupRecordKey>
-ESProducerLooper::modifyingRecords() const {
-  return findingForRecords();
-}
+std::set<eventsetup::EventSetupRecordKey> ESProducerLooper::modifyingRecords() const { return findingForRecords(); }
 //
 // static member functions
 //
diff --git a/FWCore/Framework/src/ESProxyFactoryProducer.cc b/FWCore/Framework/src/ESProxyFactoryProducer.cc
index 59953506b8af3..396b212bb5688 100644
--- a/FWCore/Framework/src/ESProxyFactoryProducer.cc
+++ b/FWCore/Framework/src/ESProxyFactoryProducer.cc
@@ -27,103 +27,86 @@
 using namespace edm::eventsetup;
 namespace edm {
 
-      typedef std::multimap< EventSetupRecordKey, FactoryInfo > Record2Factories;
-
-//
-// static data member definitions
-//
-
-//
-// constructors and destructor
-//
-ESProxyFactoryProducer::ESProxyFactoryProducer() : record2Factories_()
-{
-}
-
-// ESProxyFactoryProducer::ESProxyFactoryProducer(const ESProxyFactoryProducer& rhs)
-// {
-//    // do actual copying here;
-// }
-
-ESProxyFactoryProducer::~ESProxyFactoryProducer() noexcept(false)
-{
-}
-
-//
-// assignment operators
-//
-// const ESProxyFactoryProducer& ESProxyFactoryProducer::operator=(const ESProxyFactoryProducer& rhs)
-// {
-//   //An exception safe implementation is
-//   ESProxyFactoryProducer temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
-
-//
-// member functions
-//
-void
-ESProxyFactoryProducer::registerProxies(const EventSetupRecordKey& iRecord,
-                                       KeyedProxies& iProxies)
-{
-   typedef Record2Factories::iterator Iterator;
-   std::pair< Iterator, Iterator > range = record2Factories_.equal_range(iRecord);
-   for(Iterator it = range.first; it != range.second; ++it) {
-
+  typedef std::multimap<EventSetupRecordKey, FactoryInfo> Record2Factories;
+
+  //
+  // static data member definitions
+  //
+
+  //
+  // constructors and destructor
+  //
+  ESProxyFactoryProducer::ESProxyFactoryProducer() : record2Factories_() {}
+
+  // ESProxyFactoryProducer::ESProxyFactoryProducer(const ESProxyFactoryProducer& rhs)
+  // {
+  //    // do actual copying here;
+  // }
+
+  ESProxyFactoryProducer::~ESProxyFactoryProducer() noexcept(false) {}
+
+  //
+  // assignment operators
+  //
+  // const ESProxyFactoryProducer& ESProxyFactoryProducer::operator=(const ESProxyFactoryProducer& rhs)
+  // {
+  //   //An exception safe implementation is
+  //   ESProxyFactoryProducer temp(rhs);
+  //   swap(rhs);
+  //
+  //   return *this;
+  // }
+
+  //
+  // member functions
+  //
+  void ESProxyFactoryProducer::registerProxies(const EventSetupRecordKey& iRecord, KeyedProxies& iProxies) {
+    typedef Record2Factories::iterator Iterator;
+    std::pair<Iterator, Iterator> range = record2Factories_.equal_range(iRecord);
+    for (Iterator it = range.first; it != range.second; ++it) {
       std::shared_ptr<DataProxy> proxy(it->second.factory_->makeProxy().release());
-      if(nullptr != proxy.get()) {
-         iProxies.push_back(KeyedProxies::value_type((*it).second.key_,
-                                         proxy));
+      if (nullptr != proxy.get()) {
+        iProxies.push_back(KeyedProxies::value_type((*it).second.key_, proxy));
       }
-   }
-}
-
-void
-ESProxyFactoryProducer::registerFactoryWithKey(const EventSetupRecordKey& iRecord ,
-                                             std::unique_ptr<ProxyFactoryBase> iFactory,
-                                             const std::string& iLabel )
-{
-   if(nullptr == iFactory.get()) {
+    }
+  }
+
+  void ESProxyFactoryProducer::registerFactoryWithKey(const EventSetupRecordKey& iRecord,
+                                                      std::unique_ptr<ProxyFactoryBase> iFactory,
+                                                      const std::string& iLabel) {
+    if (nullptr == iFactory.get()) {
       assert(false && "Factor pointer was null");
       ::exit(1);
-   }
-
-   usingRecordWithKey(iRecord);
-
-   std::shared_ptr<ProxyFactoryBase> temp(iFactory.release());
-   FactoryInfo info(temp->makeKey(iLabel),
-                    temp);
-
-   //has this already been registered?
-   std::pair<Record2Factories::const_iterator,Record2Factories::const_iterator> range =
-      record2Factories_.equal_range(iRecord);
-   if(range.second != std::find_if(range.first,range.second,
-                                   [&info](const auto& r2f) {
-                                     return r2f.second.key_ == info.key_;
-                                   }
-                                   ) ) {
-      throw cms::Exception("IdenticalProducts")<<"Producer has been asked to produce "<<info.key_.type().name()
-      <<" \""<<info.key_.name().value()<<"\" multiple times.\n Please modify the code.";
-   }
-
-   record2Factories_.insert(Record2Factories::value_type(iRecord,
-                                                         std::move(info)));
-}
-
-void
-ESProxyFactoryProducer::newInterval(const EventSetupRecordKey& iRecordType,
-                                   const ValidityInterval& /*iInterval*/)
-{
-   invalidateProxies(iRecordType);
-}
-
-//
-// const member functions
-//
-
-//
-// static member functions
-//
-}
+    }
+
+    usingRecordWithKey(iRecord);
+
+    std::shared_ptr<ProxyFactoryBase> temp(iFactory.release());
+    FactoryInfo info(temp->makeKey(iLabel), temp);
+
+    //has this already been registered?
+    std::pair<Record2Factories::const_iterator, Record2Factories::const_iterator> range =
+        record2Factories_.equal_range(iRecord);
+    if (range.second !=
+        std::find_if(range.first, range.second, [&info](const auto& r2f) { return r2f.second.key_ == info.key_; })) {
+      throw cms::Exception("IdenticalProducts")
+          << "Producer has been asked to produce " << info.key_.type().name() << " \"" << info.key_.name().value()
+          << "\" multiple times.\n Please modify the code.";
+    }
+
+    record2Factories_.insert(Record2Factories::value_type(iRecord, std::move(info)));
+  }
+
+  void ESProxyFactoryProducer::newInterval(const EventSetupRecordKey& iRecordType,
+                                           const ValidityInterval& /*iInterval*/) {
+    invalidateProxies(iRecordType);
+  }
+
+  //
+  // const member functions
+  //
+
+  //
+  // static member functions
+  //
+}  // namespace edm
diff --git a/FWCore/Framework/src/ESRecordsToProxyIndices.cc b/FWCore/Framework/src/ESRecordsToProxyIndices.cc
new file mode 100644
index 0000000000000..7aa3c396ad896
--- /dev/null
+++ b/FWCore/Framework/src/ESRecordsToProxyIndices.cc
@@ -0,0 +1,94 @@
+// -*- C++ -*-
+//
+// Package:     Framework
+// Class  :     ESRecordsToProxyIndices
+//
+// Implementation:
+//     <Notes on implementation>
+//
+// Author:      Chris Jones
+// Created:     Thu Mar 31 14:31:13 EST 2005
+//
+
+// system include files
+#include <cassert>
+#include <algorithm>
+
+// user include files
+#include "FWCore/Framework/interface/ESRecordsToProxyIndices.h"
+
+//
+// constants, enums and typedefs
+//
+
+namespace edm::eventsetup {
+  ESRecordsToProxyIndices::ESRecordsToProxyIndices(std::vector<EventSetupRecordKey> iRecords)
+      : recordKeys_{std::move(iRecords)} {
+    assert(std::is_sorted(iRecords.begin(), iRecords.end()));
+    recordOffsets_.reserve(recordKeys_.size() + 1);
+    recordOffsets_.push_back(0);
+  }
+
+  unsigned int ESRecordsToProxyIndices::dataKeysInRecord(unsigned int iRecordIndex,
+                                                         EventSetupRecordKey const& iRecord,
+                                                         std::vector<DataKey> const& iDataKeys,
+                                                         std::vector<ComponentDescription const*> const& iComponents) {
+    assert(iRecord == recordKeys_[iRecordIndex]);
+    assert(iDataKeys.size() == iComponents.size());
+    assert(iRecordIndex + 1 == recordOffsets_.size());
+    dataKeys_.insert(dataKeys_.end(), iDataKeys.begin(), iDataKeys.end());
+    ++iRecordIndex;
+    components_.insert(components_.end(), iComponents.begin(), iComponents.end());
+    recordOffsets_.push_back(dataKeys_.size());
+    return iRecordIndex;
+  }
+
+  //
+  // const member functions
+  //
+  ESProxyIndex ESRecordsToProxyIndices::indexInRecord(EventSetupRecordKey const& iRK, DataKey const& iDK) const
+      noexcept {
+    auto it = std::lower_bound(recordKeys_.begin(), recordKeys_.end(), iRK);
+    if (it == recordKeys_.end() or *it != iRK) {
+      return missingProxyIndex();
+    }
+
+    auto beginOffset = recordOffsets_[std::distance(recordKeys_.begin(), it)];
+    ++it;
+    auto endOffset = recordOffsets_[std::distance(recordKeys_.begin(), it)];
+
+    auto itDK = std::lower_bound(dataKeys_.begin() + beginOffset, dataKeys_.begin() + endOffset, iDK);
+    if (itDK == dataKeys_.begin() + endOffset or *itDK != iDK) {
+      return missingProxyIndex();
+    }
+
+    return ESProxyIndex{static_cast<int>(std::distance(dataKeys_.begin() + beginOffset, itDK))};
+  }
+
+  ESRecordIndex ESRecordsToProxyIndices::recordIndexFor(EventSetupRecordKey const& iRK) const noexcept {
+    auto it = std::lower_bound(recordKeys_.begin(), recordKeys_.end(), iRK);
+    if (it == recordKeys_.end() or *it != iRK) {
+      return missingRecordIndex();
+    }
+    return ESRecordIndex{static_cast<ESRecordIndex::Value_t>(it - recordKeys_.begin())};
+  }
+
+  ComponentDescription const* ESRecordsToProxyIndices::component(EventSetupRecordKey const& iRK,
+                                                                 DataKey const& iDK) const noexcept {
+    auto it = std::lower_bound(recordKeys_.begin(), recordKeys_.end(), iRK);
+    if (it == recordKeys_.end() or *it != iRK) {
+      return nullptr;
+    }
+
+    auto beginOffset = recordOffsets_[std::distance(recordKeys_.begin(), it)];
+    ++it;
+    auto endOffset = recordOffsets_[std::distance(recordKeys_.begin(), it)];
+
+    auto itDK = std::lower_bound(dataKeys_.begin() + beginOffset, dataKeys_.begin() + endOffset, iDK);
+    if (itDK == dataKeys_.begin() + endOffset or *itDK != iDK) {
+      return nullptr;
+    }
+    return components_[std::distance(dataKeys_.begin(), itDK)];
+  }
+
+}  // namespace edm::eventsetup
diff --git a/FWCore/Framework/src/ESValidHandle.cc b/FWCore/Framework/src/ESValidHandle.cc
index e7eeff143c01f..f7653049978b2 100644
--- a/FWCore/Framework/src/ESValidHandle.cc
+++ b/FWCore/Framework/src/ESValidHandle.cc
@@ -2,10 +2,9 @@
 #include "FWCore/Utilities/interface/Exception.h"
 
 namespace edm::esvhhelper {
-  void
-  throwIfNotValid(const void* iProduct) noexcept(false) {
-    if(nullptr == iProduct) {
-      throw cms::Exception("Invalid Product")<<"Attempted to fill a edm::ESValidHandle with an invalid product";
+  void throwIfNotValid(const void* iProduct) noexcept(false) {
+    if (nullptr == iProduct) {
+      throw cms::Exception("Invalid Product") << "Attempted to fill a edm::ESValidHandle with an invalid product";
     }
   }
-}
+}  // namespace edm::esvhhelper
diff --git a/FWCore/Framework/src/EarlyDeleteHelper.cc b/FWCore/Framework/src/EarlyDeleteHelper.cc
index 07bcf61d02d58..c565aeef73b3f 100644
--- a/FWCore/Framework/src/EarlyDeleteHelper.cc
+++ b/FWCore/Framework/src/EarlyDeleteHelper.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     EarlyDeleteHelper
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -32,24 +32,19 @@ using namespace edm;
 //
 EarlyDeleteHelper::EarlyDeleteHelper(unsigned int* iBeginIndexItr,
                                      unsigned int* iEndIndexItr,
-                                     std::vector<BranchToCount>* iBranchCounts):
-pBeginIndex_(iBeginIndexItr),
-pEndIndex_(iEndIndexItr),
-pBranchCounts_(iBranchCounts),
-pathsLeftToComplete_(0),
-nPathsOn_(0)
-{
-}
+                                     std::vector<BranchToCount>* iBranchCounts)
+    : pBeginIndex_(iBeginIndexItr),
+      pEndIndex_(iEndIndexItr),
+      pBranchCounts_(iBranchCounts),
+      pathsLeftToComplete_(0),
+      nPathsOn_(0) {}
 
-EarlyDeleteHelper::EarlyDeleteHelper(const EarlyDeleteHelper& rhs):
-pBeginIndex_(rhs.pBeginIndex_),
-pEndIndex_(rhs.pEndIndex_),
-pBranchCounts_(rhs.pBranchCounts_),
-pathsLeftToComplete_(rhs.pathsLeftToComplete_.load()),
-nPathsOn_(rhs.nPathsOn_)
-{
-  
-}
+EarlyDeleteHelper::EarlyDeleteHelper(const EarlyDeleteHelper& rhs)
+    : pBeginIndex_(rhs.pBeginIndex_),
+      pEndIndex_(rhs.pEndIndex_),
+      pBranchCounts_(rhs.pBranchCounts_),
+      pathsLeftToComplete_(rhs.pathsLeftToComplete_.load()),
+      nPathsOn_(rhs.nPathsOn_) {}
 
 //EarlyDeleteHelper::~EarlyDeleteHelper()
 //{
@@ -70,26 +65,24 @@ nPathsOn_(rhs.nPathsOn_)
 //
 // member functions
 //
-void 
-EarlyDeleteHelper::moduleRan(EventPrincipal const& iEvent) {
-  pathsLeftToComplete_=0;
-  for(auto it = pBeginIndex_; it != pEndIndex_;++it) {
+void EarlyDeleteHelper::moduleRan(EventPrincipal const& iEvent) {
+  pathsLeftToComplete_ = 0;
+  for (auto it = pBeginIndex_; it != pEndIndex_; ++it) {
     auto& count = (*pBranchCounts_)[*it];
-    assert(count.count>0);
+    assert(count.count > 0);
     auto value = --(count.count);
-    if(value==0) {
+    if (value == 0) {
       iEvent.deleteProduct(count.branch);
     }
   }
 }
 
-void 
-EarlyDeleteHelper::pathFinished(EventPrincipal const& iEvent) {
+void EarlyDeleteHelper::pathFinished(EventPrincipal const& iEvent) {
   unsigned int value = pathsLeftToComplete_;
-  while(value > 0) {
-    if( pathsLeftToComplete_.compare_exchange_strong(value, value-1)) {
+  while (value > 0) {
+    if (pathsLeftToComplete_.compare_exchange_strong(value, value - 1)) {
       //we were the thread that changed the value
-      if( value == 1) {
+      if (value == 1) {
         //we can never reach this module now so declare it as run
         moduleRan(iEvent);
       }
@@ -98,16 +91,14 @@ EarlyDeleteHelper::pathFinished(EventPrincipal const& iEvent) {
   }
 }
 
-void
-EarlyDeleteHelper::appendIndex(unsigned int iIndex) {
-  *pEndIndex_=iIndex;
+void EarlyDeleteHelper::appendIndex(unsigned int iIndex) {
+  *pEndIndex_ = iIndex;
   ++pEndIndex_;
 }
 
-void
-EarlyDeleteHelper::shiftIndexPointers(unsigned int iShift) {
-  pEndIndex_ -=iShift;
-  pBeginIndex_ -=iShift;
+void EarlyDeleteHelper::shiftIndexPointers(unsigned int iShift) {
+  pEndIndex_ -= iShift;
+  pBeginIndex_ -= iShift;
 }
 
 //
diff --git a/FWCore/Framework/src/EarlyDeleteHelper.h b/FWCore/Framework/src/EarlyDeleteHelper.h
index 5b0ce90cbb728..16cc80906c9e4 100644
--- a/FWCore/Framework/src/EarlyDeleteHelper.h
+++ b/FWCore/Framework/src/EarlyDeleteHelper.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     EarlyDeleteHelper
-// 
+//
 /**\class EarlyDeleteHelper EarlyDeleteHelper.h FWCore/Framework/interface/EarlyDeleteHelper.h
 
  Description: [one line class summary]
@@ -27,57 +27,48 @@
 // forward declarations
 namespace edm {
   class EventPrincipal;
-  
+
   struct BranchToCount {
     edm::BranchID const branch;
     std::atomic<unsigned int> count;
-    
-    BranchToCount(edm::BranchID id, unsigned int count):
-    branch(id),
-    count(count) {}
-    
-    BranchToCount(BranchToCount const& iOther):
-    branch(iOther.branch),
-    count(iOther.count.load()) {}
+
+    BranchToCount(edm::BranchID id, unsigned int count) : branch(id), count(count) {}
+
+    BranchToCount(BranchToCount const& iOther) : branch(iOther.branch), count(iOther.count.load()) {}
   };
-  
-  class EarlyDeleteHelper
-  {
-    
+
+  class EarlyDeleteHelper {
   public:
     EarlyDeleteHelper(unsigned int* iBeginIndexItr,
                       unsigned int* iEndIndexItr,
                       std::vector<BranchToCount>* iBranchCounts);
     EarlyDeleteHelper(const EarlyDeleteHelper&);
-        EarlyDeleteHelper& operator=(const EarlyDeleteHelper&) = default;
+    EarlyDeleteHelper& operator=(const EarlyDeleteHelper&) = default;
     //virtual ~EarlyDeleteHelper();
-    
+
     // ---------- const member functions ---------------------
-    
+
     // ---------- static member functions --------------------
-    
+
     // ---------- member functions ---------------------------
-    void reset() {pathsLeftToComplete_ = nPathsOn_;}
+    void reset() { pathsLeftToComplete_ = nPathsOn_; }
     void moduleRan(EventPrincipal const&);
     void pathFinished(EventPrincipal const&);
-    void addedToPath() { ++nPathsOn_;}
+    void addedToPath() { ++nPathsOn_; }
     void appendIndex(unsigned int index);
     void shiftIndexPointers(unsigned int iShift);
-    
-    unsigned int* begin() { return pBeginIndex_;}
-    unsigned int* end() { return pEndIndex_;}
-    
+
+    unsigned int* begin() { return pBeginIndex_; }
+    unsigned int* end() { return pEndIndex_; }
+
   private:
-    
     // ---------- member data --------------------------------
     unsigned int* pBeginIndex_;
     unsigned int* pEndIndex_;
     std::vector<BranchToCount>* pBranchCounts_;
     std::atomic<unsigned int> pathsLeftToComplete_;
     unsigned int nPathsOn_;
-    
   };
-}
-
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/EndPathStatusInserter.cc b/FWCore/Framework/src/EndPathStatusInserter.cc
index a2cd318579697..292739efd9703 100644
--- a/FWCore/Framework/src/EndPathStatusInserter.cc
+++ b/FWCore/Framework/src/EndPathStatusInserter.cc
@@ -6,17 +6,11 @@
 
 #include <memory>
 
-namespace edm
-{
-  EndPathStatusInserter::EndPathStatusInserter(unsigned int):
-  token_{produces<EndPathStatus>()}
-  {
-  }
+namespace edm {
+  EndPathStatusInserter::EndPathStatusInserter(unsigned int) : token_{produces<EndPathStatus>()} {}
 
-  void
-  EndPathStatusInserter::produce(StreamID, edm::Event& event, edm::EventSetup const&) const
-  {
+  void EndPathStatusInserter::produce(StreamID, edm::Event& event, edm::EventSetup const&) const {
     //Puts a default constructed EndPathStatus
     event.emplace(token_);
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/EndPathStatusInserter.h b/FWCore/Framework/src/EndPathStatusInserter.h
index 8e77489ecb588..5feaebee6e064 100644
--- a/FWCore/Framework/src/EndPathStatusInserter.h
+++ b/FWCore/Framework/src/EndPathStatusInserter.h
@@ -13,12 +13,12 @@ namespace edm {
 
   class EndPathStatusInserter : public global::EDProducer<> {
   public:
-
     explicit EndPathStatusInserter(unsigned int numberOfStreams);
 
     void produce(StreamID, Event&, EventSetup const&) const final;
+
   private:
     EDPutTokenT<EndPathStatus> token_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/src/Event.cc b/FWCore/Framework/src/Event.cc
index 76b0a4d4790f6..fb8138a10debf 100644
--- a/FWCore/Framework/src/Event.cc
+++ b/FWCore/Framework/src/Event.cc
@@ -19,65 +19,57 @@ namespace edm {
 
   std::string const Event::emptyString_;
 
-  Event::Event(EventPrincipal const& ep, ModuleDescription const& md, ModuleCallingContext const* moduleCallingContext) :
-      provRecorder_(ep, md, true /*always at end*/),
-      aux_(ep.aux()),
-      luminosityBlock_(ep.luminosityBlockPrincipalPtrValid() ? new LuminosityBlock(ep.luminosityBlockPrincipal(), md, moduleCallingContext,false) : nullptr),
-      gotBranchIDs_(),
-      gotViews_(),
-      streamID_(ep.streamID()),
-      moduleCallingContext_(moduleCallingContext)
-  {
-  }
-
-  Event::~Event() {
-  }
-
-  Event::CacheIdentifier_t
-  Event::cacheIdentifier() const {
-    return eventPrincipal().cacheIdentifier();
-  }
-
-  void
-  Event::setConsumer(EDConsumerBase const* iConsumer) {
+  Event::Event(EventPrincipal const& ep, ModuleDescription const& md, ModuleCallingContext const* moduleCallingContext)
+      : provRecorder_(ep, md, true /*always at end*/),
+        aux_(ep.aux()),
+        luminosityBlock_(ep.luminosityBlockPrincipalPtrValid()
+                             ? new LuminosityBlock(ep.luminosityBlockPrincipal(), md, moduleCallingContext, false)
+                             : nullptr),
+        gotBranchIDs_(),
+        gotViews_(),
+        streamID_(ep.streamID()),
+        moduleCallingContext_(moduleCallingContext) {}
+
+  Event::~Event() {}
+
+  Event::CacheIdentifier_t Event::cacheIdentifier() const { return eventPrincipal().cacheIdentifier(); }
+
+  void Event::setConsumer(EDConsumerBase const* iConsumer) {
     provRecorder_.setConsumer(iConsumer);
     gotBranchIDs_.reserve(provRecorder_.numberOfProductsConsumed());
     const_cast<LuminosityBlock*>(luminosityBlock_.get())->setConsumer(iConsumer);
   }
-  
-  void
-  Event::setSharedResourcesAcquirer( SharedResourcesAcquirer* iResourceAcquirer) {
+
+  void Event::setSharedResourcesAcquirer(SharedResourcesAcquirer* iResourceAcquirer) {
     provRecorder_.setSharedResourcesAcquirer(iResourceAcquirer);
     const_cast<LuminosityBlock*>(luminosityBlock_.get())->setSharedResourcesAcquirer(iResourceAcquirer);
   }
 
-  void
-  Event::setProducerCommon(ProducerBase const* iProd,
-                           std::vector<BranchID>* previousParentage) {
-
+  void Event::setProducerCommon(ProducerBase const* iProd, std::vector<BranchID>* previousParentage) {
     provRecorder_.setProducer(iProd);
     //set appropriate size
-    putProducts_.resize(
-                        provRecorder_.putTokenIndexToProductResolverIndex().size());
-    previousBranchIDs_ =previousParentage;
+    putProducts_.resize(provRecorder_.putTokenIndexToProductResolverIndex().size());
+    previousBranchIDs_ = previousParentage;
   }
 
-  void
-  Event::setProducer(ProducerBase const* iProd,
-                     std::vector<BranchID>* previousParentage,
-                     std::vector<BranchID>* gotBranchIDsFromAcquire) {
+  void Event::setProducer(ProducerBase const* iProd,
+                          std::vector<BranchID>* previousParentage,
+                          std::vector<BranchID>* gotBranchIDsFromAcquire) {
     setProducerCommon(iProd, previousParentage);
-    if(previousParentage) {
+    if (previousParentage) {
       //are we supposed to record parentage for at least one item?
       bool record_parents = false;
-      for( auto v: provRecorder_.recordProvenanceList()) {
-        if (v) { record_parents = true; break;}
+      for (auto v : provRecorder_.recordProvenanceList()) {
+        if (v) {
+          record_parents = true;
+          break;
+        }
       }
-      if(not record_parents) {
+      if (not record_parents) {
         previousBranchIDs_ = nullptr;
         return;
       }
-      gotBranchIDsFromPrevious_.resize(previousParentage->size(),false);
+      gotBranchIDsFromPrevious_.resize(previousParentage->size(), false);
       if (gotBranchIDsFromAcquire) {
         for (auto const& branchID : *gotBranchIDsFromAcquire) {
           addToGotBranchIDs(branchID);
@@ -86,113 +78,86 @@ namespace edm {
     }
   }
 
-  void
-  Event::setProducerForAcquire(ProducerBase const* iProd,
-                               std::vector<BranchID>* previousParentage,
-                               std::vector<BranchID>& gotBranchIDsFromAcquire) {
+  void Event::setProducerForAcquire(ProducerBase const* iProd,
+                                    std::vector<BranchID>* previousParentage,
+                                    std::vector<BranchID>& gotBranchIDsFromAcquire) {
     setProducerCommon(iProd, previousParentage);
     gotBranchIDsFromAcquire_ = &gotBranchIDsFromAcquire;
     gotBranchIDsFromAcquire_->clear();
   }
 
-  EventPrincipal const&
-  Event::eventPrincipal() const {
+  EventPrincipal const& Event::eventPrincipal() const {
     return dynamic_cast<EventPrincipal const&>(provRecorder_.principal());
   }
 
-  EDProductGetter const&
-  Event::productGetter() const {
-    return provRecorder_.principal();
-  }
+  EDProductGetter const& Event::productGetter() const { return provRecorder_.principal(); }
 
-  ProductID
-  Event::makeProductID(BranchDescription const& desc) const {
+  ProductID Event::makeProductID(BranchDescription const& desc) const {
     return eventPrincipal().branchIDToProductID(desc.originalBranchID());
   }
 
-  Run const&
-  Event::getRun() const {
-    return getLuminosityBlock().getRun();
-  }
+  Run const& Event::getRun() const { return getLuminosityBlock().getRun(); }
 
-  EventSelectionIDVector const&
-  Event::eventSelectionIDs() const {
-    return eventPrincipal().eventSelectionIDs();
-  }
+  EventSelectionIDVector const& Event::eventSelectionIDs() const { return eventPrincipal().eventSelectionIDs(); }
 
-  ProcessHistoryID const&
-  Event::processHistoryID() const {
-    return eventPrincipal().processHistoryID();
-  }
+  ProcessHistoryID const& Event::processHistoryID() const { return eventPrincipal().processHistoryID(); }
 
-  Provenance
-  Event::getProvenance(BranchID const& bid) const {
+  Provenance Event::getProvenance(BranchID const& bid) const {
     return provRecorder_.principal().getProvenance(bid, moduleCallingContext_);
   }
 
-  Provenance
-  Event::getProvenance(ProductID const& pid) const {
+  Provenance Event::getProvenance(ProductID const& pid) const {
     return eventPrincipal().getProvenance(pid, moduleCallingContext_);
   }
 
-  void
-  Event::getAllProvenance(std::vector<Provenance const*>& provenances) const {
+  void Event::getAllProvenance(std::vector<Provenance const*>& provenances) const {
     provRecorder_.principal().getAllProvenance(provenances);
   }
 
-  void
-  Event::getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const {
+  void Event::getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const {
     provRecorder_.principal().getAllStableProvenance(provenances);
   }
 
-  bool
-  Event::getProcessParameterSet(std::string const& processName,
-                                ParameterSet& ps) const {
+  bool Event::getProcessParameterSet(std::string const& processName, ParameterSet& ps) const {
     ProcessConfiguration config;
     bool process_found = processHistory().getConfigurationForProcess(processName, config);
-    if(process_found) {
+    if (process_found) {
       pset::Registry::instance()->getMapped(config.parameterSetID(), ps);
       assert(!ps.empty());
     }
     return process_found;
   }
 
-  edm::ParameterSet const*
-  Event::parameterSet(edm::ParameterSetID const& psID) const{
+  edm::ParameterSet const* Event::parameterSet(edm::ParameterSetID const& psID) const {
     return parameterSetForID_(psID);
   }
-  
-  BasicHandle
-  Event::getByProductID_(ProductID const& oid) const {
-    return eventPrincipal().getByProductID(oid);
-  }
 
-  void
-  Event::commit_(std::vector<edm::ProductResolverIndex> const& iShouldPut, ParentageID* previousParentageId) {
+  BasicHandle Event::getByProductID_(ProductID const& oid) const { return eventPrincipal().getByProductID(oid); }
+
+  void Event::commit_(std::vector<edm::ProductResolverIndex> const& iShouldPut, ParentageID* previousParentageId) {
     size_t nPut = 0;
-    for(auto const& p: putProducts()) {
-      if(p) {
+    for (auto const& p : putProducts()) {
+      if (p) {
         ++nPut;
       }
     }
-    if(nPut > 0) {
+    if (nPut > 0) {
       commit_aux(putProducts(), previousParentageId);
     }
     auto sz = iShouldPut.size();
-    if(sz !=0 and sz != nPut) {
+    if (sz != 0 and sz != nPut) {
       //some were missed
       auto& p = provRecorder_.principal();
-      for(auto index: iShouldPut){
+      for (auto index : iShouldPut) {
         auto resolver = p.getProductResolverByIndex(index);
-        if(not resolver->productResolved()) {
+        if (not resolver->productResolved()) {
           resolver->putProduct(std::unique_ptr<WrapperBase>());
         }
       }
     }
   }
 
-  void
-  Event::commit_aux(Event::ProductPtrVec& products, ParentageID* previousParentageId) {
+  void Event::commit_aux(Event::ProductPtrVec& products, ParentageID* previousParentageId) {
     // fill in guts of provenance here
     auto& ep = eventPrincipal();
 
@@ -200,46 +165,44 @@ namespace edm {
     // avoid constantly recalculating the ParentageID which is a time consuming operation
     ParentageID const* presentParentageId;
 
-    if(previousBranchIDs_) {
+    if (previousBranchIDs_) {
       bool sameAsPrevious = gotBranchIDs_.empty();
-      if(sameAsPrevious) {
-        for(auto i: gotBranchIDsFromPrevious_) {
-          if(not i) {
+      if (sameAsPrevious) {
+        for (auto i : gotBranchIDsFromPrevious_) {
+          if (not i) {
             sameAsPrevious = false;
             break;
           }
         }
       }
-      if( not sameAsPrevious) {
-        std::vector<BranchID> gotBranchIDVector{gotBranchIDs_.begin(),
-          gotBranchIDs_.end()};
+      if (not sameAsPrevious) {
+        std::vector<BranchID> gotBranchIDVector{gotBranchIDs_.begin(), gotBranchIDs_.end()};
         //add items in common from previous
         auto n = gotBranchIDsFromPrevious_.size();
-        for(size_t i =0;  i < n;++i) {
-          if(gotBranchIDsFromPrevious_[i]) {
+        for (size_t i = 0; i < n; ++i) {
+          if (gotBranchIDsFromPrevious_[i]) {
             gotBranchIDVector.push_back((*previousBranchIDs_)[i]);
           }
         }
-        std::sort(gotBranchIDVector.begin(),gotBranchIDVector.end());
+        std::sort(gotBranchIDVector.begin(), gotBranchIDVector.end());
         previousBranchIDs_->assign(gotBranchIDVector.begin(), gotBranchIDVector.end());
-        
+
         Parentage p;
         p.setParents(std::move(gotBranchIDVector));
         *previousParentageId = p.id();
         ParentageRegistry::instance()->insertMapped(p);
-
       }
-      presentParentageId =previousParentageId;
+      presentParentageId = previousParentageId;
     } else {
       presentParentageId = &s_emptyParentage;
     }
 
     auto const& recordProv = provRecorder_.recordProvenanceList();
-    for(unsigned int i = 0; i< products.size();++i) {
+    for (unsigned int i = 0; i < products.size(); ++i) {
       auto& p = get_underlying_safe(products[i]);
       if (p) {
-        if(recordProv[i]) {
-          ep.put(provRecorder_.putTokenIndexToProductResolverIndex()[i],  std::move(p), *presentParentageId);
+        if (recordProv[i]) {
+          ep.put(provRecorder_.putTokenIndexToProductResolverIndex()[i], std::move(p), *presentParentageId);
         } else {
           ep.put(provRecorder_.putTokenIndexToProductResolverIndex()[i], std::move(p), s_emptyParentage);
         }
@@ -250,16 +213,12 @@ namespace edm {
     products.clear();
   }
 
-  void
-  Event::addToGotBranchIDs(Provenance const& prov) const {
-    addToGotBranchIDs(prov.originalBranchID());
-  }
+  void Event::addToGotBranchIDs(Provenance const& prov) const { addToGotBranchIDs(prov.originalBranchID()); }
 
-  void
-  Event::addToGotBranchIDs(BranchID const& branchID) const {
-    if(previousBranchIDs_) {
+  void Event::addToGotBranchIDs(BranchID const& branchID) const {
+    if (previousBranchIDs_) {
       auto range = std::equal_range(previousBranchIDs_->begin(), previousBranchIDs_->end(), branchID);
-      if(range.first ==range.second) {
+      if (range.first == range.second) {
         gotBranchIDs_.insert(branchID.id());
       } else {
         gotBranchIDsFromPrevious_[range.first - previousBranchIDs_->begin()] = true;
@@ -269,48 +228,42 @@ namespace edm {
     }
   }
 
-  ProcessHistory const&
-  Event::processHistory() const {
-    return provRecorder_.processHistory();
-  }
+  ProcessHistory const& Event::processHistory() const { return provRecorder_.processHistory(); }
 
-  size_t
-  Event::size() const {
-    return std::count_if(putProducts().begin(),putProducts().end(),[](auto const& i) {return bool(i);}) + provRecorder_.principal().size();
+  size_t Event::size() const {
+    return std::count_if(putProducts().begin(), putProducts().end(), [](auto const& i) { return bool(i); }) +
+           provRecorder_.principal().size();
   }
 
-  BasicHandle
-  Event::getByLabelImpl(std::type_info const&, std::type_info const& iProductType, const InputTag& iTag) const {
+  BasicHandle Event::getByLabelImpl(std::type_info const&,
+                                    std::type_info const& iProductType,
+                                    const InputTag& iTag) const {
     BasicHandle h = provRecorder_.getByLabel_(TypeID(iProductType), iTag, moduleCallingContext_);
-    if(h.isValid()) {
+    if (h.isValid()) {
       addToGotBranchIDs(*(h.provenance()));
     }
     return h;
   }
 
-  BasicHandle
-  Event::getImpl(std::type_info const&, ProductID const& pid) const {
+  BasicHandle Event::getImpl(std::type_info const&, ProductID const& pid) const {
     BasicHandle h = this->getByProductID_(pid);
-    if(h.isValid()) {
+    if (h.isValid()) {
       addToGotBranchIDs(*(h.provenance()));
     }
     return h;
   }
 
-  TriggerNames const&
-  Event::triggerNames(edm::TriggerResults const& triggerResults) const {
+  TriggerNames const& Event::triggerNames(edm::TriggerResults const& triggerResults) const {
     edm::TriggerNames const* names = triggerNames_(triggerResults);
-    if(names != nullptr) return *names;
+    if (names != nullptr)
+      return *names;
 
-    throw cms::Exception("TriggerNamesNotFound")
-      << "TriggerNames not found in ParameterSet registry";
+    throw cms::Exception("TriggerNamesNotFound") << "TriggerNames not found in ParameterSet registry";
     return *names;
   }
 
-  TriggerResultsByName
-  Event::triggerResultsByName(edm::TriggerResults const& triggerResults) const {
-
+  TriggerResultsByName Event::triggerResultsByName(edm::TriggerResults const& triggerResults) const {
     edm::TriggerNames const* names = triggerNames_(triggerResults);
     return TriggerResultsByName(&triggerResults, names);
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/EventAcquireSignalsSentry.h b/FWCore/Framework/src/EventAcquireSignalsSentry.h
index 19f76cb940bbc..9a7eb3c9e417e 100644
--- a/FWCore/Framework/src/EventAcquireSignalsSentry.h
+++ b/FWCore/Framework/src/EventAcquireSignalsSentry.h
@@ -27,23 +27,19 @@
 // forward declarations
 namespace edm {
   class EventAcquireSignalsSentry {
-
   public:
-    EventAcquireSignalsSentry(ActivityRegistry* iReg,
-                       ModuleCallingContext const * iContext) :
-      m_reg(iReg),
-      m_context(iContext)
-    { iReg->preModuleEventAcquireSignal_( *(iContext->getStreamContext()), *iContext);}
-
-    ~EventAcquireSignalsSentry() {
-      m_reg->postModuleEventAcquireSignal_( *(m_context->getStreamContext()), *m_context);
+    EventAcquireSignalsSentry(ActivityRegistry* iReg, ModuleCallingContext const* iContext)
+        : m_reg(iReg), m_context(iContext) {
+      iReg->preModuleEventAcquireSignal_(*(iContext->getStreamContext()), *iContext);
     }
 
+    ~EventAcquireSignalsSentry() { m_reg->postModuleEventAcquireSignal_(*(m_context->getStreamContext()), *m_context); }
+
   private:
     // ---------- member data --------------------------------
-    ActivityRegistry* m_reg; // We do not use propagate_const because the registry itself is mutable.
+    ActivityRegistry* m_reg;  // We do not use propagate_const because the registry itself is mutable.
     ModuleCallingContext const* m_context;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/EventForOutput.cc b/FWCore/Framework/src/EventForOutput.cc
index 42b5bcac78a96..4892ea83c994f 100644
--- a/FWCore/Framework/src/EventForOutput.cc
+++ b/FWCore/Framework/src/EventForOutput.cc
@@ -11,40 +11,33 @@
 
 namespace edm {
 
-  EventForOutput::EventForOutput(EventPrincipal const& ep, ModuleDescription const& md, ModuleCallingContext const* moduleCallingContext) :
-      OccurrenceForOutput(ep, md, moduleCallingContext, true /*always at end*/),
-      aux_(ep.aux()),
-      luminosityBlock_(ep.luminosityBlockPrincipalPtrValid() ? new LuminosityBlockForOutput(ep.luminosityBlockPrincipal(), md, moduleCallingContext,false /*not at end*/) : nullptr),
-      streamID_(ep.streamID())
-  {
-  }
-
-  EventForOutput::~EventForOutput() {
-  }
-
-  EventPrincipal const&
-  EventForOutput::eventPrincipal() const {
+  EventForOutput::EventForOutput(EventPrincipal const& ep,
+                                 ModuleDescription const& md,
+                                 ModuleCallingContext const* moduleCallingContext)
+      : OccurrenceForOutput(ep, md, moduleCallingContext, true /*always at end*/),
+        aux_(ep.aux()),
+        luminosityBlock_(ep.luminosityBlockPrincipalPtrValid()
+                             ? new LuminosityBlockForOutput(
+                                   ep.luminosityBlockPrincipal(), md, moduleCallingContext, false /*not at end*/)
+                             : nullptr),
+        streamID_(ep.streamID()) {}
+
+  EventForOutput::~EventForOutput() {}
+
+  EventPrincipal const& EventForOutput::eventPrincipal() const {
     return dynamic_cast<EventPrincipal const&>(principal());
   }
 
-  RunForOutput const&
-  EventForOutput::getRun() const {
-    return getLuminosityBlock().getRun();
-  }
+  RunForOutput const& EventForOutput::getRun() const { return getLuminosityBlock().getRun(); }
 
-  EventSelectionIDVector const&
-  EventForOutput::eventSelectionIDs() const {
+  EventSelectionIDVector const& EventForOutput::eventSelectionIDs() const {
     return eventPrincipal().eventSelectionIDs();
   }
 
-  ProductProvenanceRetriever const*
-  EventForOutput::productProvenanceRetrieverPtr() const {
-   return eventPrincipal().productProvenanceRetrieverPtr();
+  ProductProvenanceRetriever const* EventForOutput::productProvenanceRetrieverPtr() const {
+    return eventPrincipal().productProvenanceRetrieverPtr();
   }
 
-  BranchListIndexes const&
-  EventForOutput::branchListIndexes() const {
-    return eventPrincipal().branchListIndexes();
-  }
+  BranchListIndexes const& EventForOutput::branchListIndexes() const { return eventPrincipal().branchListIndexes(); }
 
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/EventPrincipal.cc b/FWCore/Framework/src/EventPrincipal.cc
index 26240aa0f393b..d6aff3d89ce98 100644
--- a/FWCore/Framework/src/EventPrincipal.cc
+++ b/FWCore/Framework/src/EventPrincipal.cc
@@ -27,29 +27,27 @@
 #include <memory>
 
 namespace edm {
-  EventPrincipal::EventPrincipal(
-        std::shared_ptr<ProductRegistry const> reg,
-        std::shared_ptr<BranchIDListHelper const> branchIDListHelper,
-        std::shared_ptr<ThinnedAssociationsHelper const> thinnedAssociationsHelper,
-        ProcessConfiguration const& pc,
-        HistoryAppender* historyAppender,
-        unsigned int streamIndex,
-        bool isForPrimaryProcess) :
-    Base(reg, reg->productLookup(InEvent), pc, InEvent, historyAppender,isForPrimaryProcess),
-          aux_(),
-          luminosityBlockPrincipal_(nullptr),
-          provRetrieverPtr_(new ProductProvenanceRetriever(streamIndex)),
-          eventSelectionIDs_(),
-          branchIDListHelper_(branchIDListHelper),
-          thinnedAssociationsHelper_(thinnedAssociationsHelper),
-          branchListIndexes_(),
-          branchListIndexToProcessIndex_(),
-          streamID_(streamIndex) {
+  EventPrincipal::EventPrincipal(std::shared_ptr<ProductRegistry const> reg,
+                                 std::shared_ptr<BranchIDListHelper const> branchIDListHelper,
+                                 std::shared_ptr<ThinnedAssociationsHelper const> thinnedAssociationsHelper,
+                                 ProcessConfiguration const& pc,
+                                 HistoryAppender* historyAppender,
+                                 unsigned int streamIndex,
+                                 bool isForPrimaryProcess)
+      : Base(reg, reg->productLookup(InEvent), pc, InEvent, historyAppender, isForPrimaryProcess),
+        aux_(),
+        luminosityBlockPrincipal_(nullptr),
+        provRetrieverPtr_(new ProductProvenanceRetriever(streamIndex)),
+        eventSelectionIDs_(),
+        branchIDListHelper_(branchIDListHelper),
+        thinnedAssociationsHelper_(thinnedAssociationsHelper),
+        branchListIndexes_(),
+        branchListIndexToProcessIndex_(),
+        streamID_(streamIndex) {
     assert(thinnedAssociationsHelper_);
   }
 
-  void
-  EventPrincipal::clearEventPrincipal() {
+  void EventPrincipal::clearEventPrincipal() {
     clearPrincipal();
     aux_ = EventAuxiliary();
     //do not clear luminosityBlockPrincipal_ since
@@ -58,14 +56,13 @@ namespace edm {
     branchListIndexToProcessIndex_.clear();
   }
 
-  void
-  EventPrincipal::fillEventPrincipal(EventAuxiliary const& aux,
-        ProcessHistoryRegistry const& processHistoryRegistry,
-        EventSelectionIDVector&& eventSelectionIDs,
-        BranchListIndexes&& branchListIndexes,
-        ProductProvenanceRetriever const& provRetriever,
-        DelayedReader* reader,
-        bool deepCopyRetriever) {
+  void EventPrincipal::fillEventPrincipal(EventAuxiliary const& aux,
+                                          ProcessHistoryRegistry const& processHistoryRegistry,
+                                          EventSelectionIDVector&& eventSelectionIDs,
+                                          BranchListIndexes&& branchListIndexes,
+                                          ProductProvenanceRetriever const& provRetriever,
+                                          DelayedReader* reader,
+                                          bool deepCopyRetriever) {
     eventSelectionIDs_ = eventSelectionIDs;
     if (deepCopyRetriever) {
       provRetrieverPtr_->deepCopy(provRetriever);
@@ -73,41 +70,39 @@ namespace edm {
       provRetrieverPtr_->mergeParentProcessRetriever(provRetriever);
     }
     branchListIndexes_ = branchListIndexes;
-    if(branchIDListHelper_->hasProducedProducts()) {
+    if (branchIDListHelper_->hasProducedProducts()) {
       // Add index into BranchIDListRegistry for products produced this process
       branchListIndexes_.push_back(branchIDListHelper_->producedBranchListIndex());
     }
-    fillEventPrincipal(aux,processHistoryRegistry,reader);
+    fillEventPrincipal(aux, processHistoryRegistry, reader);
   }
 
-  void
-  EventPrincipal::fillEventPrincipal(EventAuxiliary const& aux,
-                                     ProcessHistoryRegistry const& processHistoryRegistry,
-                                     EventSelectionIDVector&& eventSelectionIDs,
-                                     BranchListIndexes&& branchListIndexes) {
+  void EventPrincipal::fillEventPrincipal(EventAuxiliary const& aux,
+                                          ProcessHistoryRegistry const& processHistoryRegistry,
+                                          EventSelectionIDVector&& eventSelectionIDs,
+                                          BranchListIndexes&& branchListIndexes) {
     eventSelectionIDs_ = eventSelectionIDs;
     branchListIndexes_ = branchListIndexes;
-    if(branchIDListHelper_->hasProducedProducts()) {
+    if (branchIDListHelper_->hasProducedProducts()) {
       // Add index into BranchIDListRegistry for products produced this process
       branchListIndexes_.push_back(branchIDListHelper_->producedBranchListIndex());
     }
-    fillEventPrincipal(aux,processHistoryRegistry,nullptr);
+    fillEventPrincipal(aux, processHistoryRegistry, nullptr);
   }
 
-  void
-  EventPrincipal::fillEventPrincipal(EventAuxiliary const& aux,
-                                     ProcessHistoryRegistry const& processHistoryRegistry,
-                                     DelayedReader* reader) {
-    if(aux.event() == invalidEventNumber) {
-      throw Exception(errors::LogicError)
-        << "EventPrincipal::fillEventPrincipal, Invalid event number provided in EventAuxiliary, It is illegal for the event number to be 0\n";
+  void EventPrincipal::fillEventPrincipal(EventAuxiliary const& aux,
+                                          ProcessHistoryRegistry const& processHistoryRegistry,
+                                          DelayedReader* reader) {
+    if (aux.event() == invalidEventNumber) {
+      throw Exception(errors::LogicError) << "EventPrincipal::fillEventPrincipal, Invalid event number provided in "
+                                             "EventAuxiliary, It is illegal for the event number to be 0\n";
     }
 
     fillPrincipal(aux.processHistoryID(), processHistoryRegistry, reader);
     aux_ = aux;
     aux_.setProcessHistoryID(processHistoryID());
-    
-    if(branchListIndexes_.empty() and branchIDListHelper_->hasProducedProducts()) {
+
+    if (branchListIndexes_.empty() and branchIDListHelper_->hasProducedProducts()) {
       // Add index into BranchIDListRegistry for products produced this process
       //  if it hasn't already been filled in by the other fillEventPrincipal or by an earlier call to this function
       branchListIndexes_.push_back(branchIDListHelper_->producedBranchListIndex());
@@ -115,56 +110,45 @@ namespace edm {
 
     // Fill in helper map for Branch to ProductID mapping
     ProcessIndex pix = 0;
-    for(auto const& blindex : branchListIndexes_) {
+    for (auto const& blindex : branchListIndexes_) {
       branchListIndexToProcessIndex_.insert(std::make_pair(blindex, pix));
       ++pix;
     }
 
     // Fill in the product ID's in the product holders.
-    for(auto& prod : *this) {
+    for (auto& prod : *this) {
       if (prod->singleProduct()) {
         // If an alias is in the same process as the original then isAlias will be true.
         //  Under that condition, we want the ProductID to be the same as the original.
         //  If not, then we've internally changed the original BranchID to the alias BranchID
         //  in the ProductID lookup so we need the alias BranchID.
-        auto const & bd =prod->branchDescription();
+        auto const& bd = prod->branchDescription();
         prod->setProvenance(productProvenanceRetrieverPtr(),
                             processHistory(),
-                            branchIDToProductID(bd.isAlias()?bd.originalBranchID(): bd.branchID()));
+                            branchIDToProductID(bd.isAlias() ? bd.originalBranchID() : bd.branchID()));
       }
     }
   }
 
-  void
-  EventPrincipal::setLuminosityBlockPrincipal(LuminosityBlockPrincipal* lbp) {
-    luminosityBlockPrincipal_ = lbp;
-  }
+  void EventPrincipal::setLuminosityBlockPrincipal(LuminosityBlockPrincipal* lbp) { luminosityBlockPrincipal_ = lbp; }
 
-  void 
-  EventPrincipal::setRunAndLumiNumber(RunNumber_t run, LuminosityBlockNumber_t lumi) {
+  void EventPrincipal::setRunAndLumiNumber(RunNumber_t run, LuminosityBlockNumber_t lumi) {
     assert(run == luminosityBlockPrincipal_->run());
     assert(lumi == luminosityBlockPrincipal_->luminosityBlock());
     EventNumber_t event = aux_.id().event();
     aux_.id() = EventID(run, lumi, event);
   }
 
-  RunPrincipal const&
-  EventPrincipal::runPrincipal() const {
-    return luminosityBlockPrincipal().runPrincipal();
-  }
-
-  void
-  EventPrincipal::put(
-        BranchDescription const& bd,
-        std::unique_ptr<WrapperBase> edp,
-        ProductProvenance const& productProvenance) const {
+  RunPrincipal const& EventPrincipal::runPrincipal() const { return luminosityBlockPrincipal().runPrincipal(); }
 
+  void EventPrincipal::put(BranchDescription const& bd,
+                           std::unique_ptr<WrapperBase> edp,
+                           ProductProvenance const& productProvenance) const {
     // assert commented out for DaqSource.  When DaqSource no longer uses put(), the assert can be restored.
     //assert(produced());
-    if(edp.get() == nullptr) {
-      throw Exception(errors::InsertFailure, "Null Pointer")
-        << "put: Cannot put because ptr to product is null."
-        << "\n";
+    if (edp.get() == nullptr) {
+      throw Exception(errors::InsertFailure, "Null Pointer") << "put: Cannot put because ptr to product is null."
+                                                             << "\n";
     }
     productProvenanceRetrieverPtr()->insertIntoSet(productProvenance);
     auto phb = getExistingProduct(bd.branchID());
@@ -173,32 +157,24 @@ namespace edm {
     phb->putProduct(std::move(edp));
   }
 
-  void
-  EventPrincipal::put(
-             ProductResolverIndex index,
-             std::unique_ptr<WrapperBase> edp,
-             ParentageID parentage) const {
-    if(edp.get() == nullptr) {
-      throw Exception(errors::InsertFailure, "Null Pointer")
-      << "put: Cannot put because ptr to product is null."
-      << "\n";
+  void EventPrincipal::put(ProductResolverIndex index, std::unique_ptr<WrapperBase> edp, ParentageID parentage) const {
+    if (edp.get() == nullptr) {
+      throw Exception(errors::InsertFailure, "Null Pointer") << "put: Cannot put because ptr to product is null."
+                                                             << "\n";
     }
     auto phb = getProductResolverByIndex(index);
-    
-    productProvenanceRetrieverPtr()->insertIntoSet(ProductProvenance(phb->branchDescription().branchID(), std::move(parentage)));
+
+    productProvenanceRetrieverPtr()->insertIntoSet(
+        ProductProvenance(phb->branchDescription().branchID(), std::move(parentage)));
 
     assert(phb);
     // ProductResolver assumes ownership
     phb->putProduct(std::move(edp));
-
   }
 
-  void
-  EventPrincipal::putOnRead(
-        BranchDescription const& bd,
-        std::unique_ptr<WrapperBase> edp,
-        ProductProvenance const* productProvenance) const {
-
+  void EventPrincipal::putOnRead(BranchDescription const& bd,
+                                 std::unique_ptr<WrapperBase> edp,
+                                 ProductProvenance const* productProvenance) const {
     assert(!bd.produced());
     if (productProvenance) {
       productProvenanceRetrieverPtr()->insertIntoSet(*productProvenance);
@@ -209,128 +185,113 @@ namespace edm {
     phb->putProduct(std::move(edp));
   }
 
-  BranchID
-  EventPrincipal::pidToBid(ProductID const& pid) const {
-    if(!pid.isValid()) {
-      throw Exception(errors::ProductNotFound, "InvalidID")
-        << "get by product ID: invalid ProductID supplied\n";
+  BranchID EventPrincipal::pidToBid(ProductID const& pid) const {
+    if (!pid.isValid()) {
+      throw Exception(errors::ProductNotFound, "InvalidID") << "get by product ID: invalid ProductID supplied\n";
     }
     return productIDToBranchID(pid, branchIDListHelper_->branchIDLists(), branchListIndexes_);
   }
 
-  ProductID
-  EventPrincipal::branchIDToProductID(BranchID const& bid) const {
-    if(!bid.isValid()) {
-      throw Exception(errors::NotFound, "InvalidID")
-        << "branchIDToProductID: invalid BranchID supplied\n";
+  ProductID EventPrincipal::branchIDToProductID(BranchID const& bid) const {
+    if (!bid.isValid()) {
+      throw Exception(errors::NotFound, "InvalidID") << "branchIDToProductID: invalid BranchID supplied\n";
     }
     typedef BranchIDListHelper::BranchIDToIndexMap BIDToIndexMap;
     typedef BIDToIndexMap::const_iterator Iter;
     typedef std::pair<Iter, Iter> IndexRange;
 
     IndexRange range = branchIDListHelper_->branchIDToIndexMap().equal_range(bid);
-    for(Iter it = range.first; it != range.second; ++it) {
+    for (Iter it = range.first; it != range.second; ++it) {
       BranchListIndex blix = it->second.first;
       std::map<BranchListIndex, ProcessIndex>::const_iterator i = branchListIndexToProcessIndex_.find(blix);
-      if(i != branchListIndexToProcessIndex_.end()) {
+      if (i != branchListIndexToProcessIndex_.end()) {
         ProductIndex productIndex = it->second.second;
         ProcessIndex processIndex = i->second;
-        return ProductID(processIndex+1, productIndex+1);
+        return ProductID(processIndex + 1, productIndex + 1);
       }
     }
     // cannot throw, because some products may legitimately not have product ID's (e.g. pile-up).
     return ProductID();
   }
 
-  unsigned int
-  EventPrincipal::transitionIndex_() const {
-    return streamID_.value();
-  }
+  unsigned int EventPrincipal::transitionIndex_() const { return streamID_.value(); }
 
-  static void throwProductDeletedException(ProductID const& pid, edm::EventPrincipal::ConstProductResolverPtr const phb) {
+  static void throwProductDeletedException(ProductID const& pid,
+                                           edm::EventPrincipal::ConstProductResolverPtr const phb) {
     ProductDeletedException exception;
-    exception<<"get by product ID: The product with given id: "<<pid
-    <<"\ntype: "<<phb->productType()
-    <<"\nproduct instance name: "<<phb->productInstanceName()
-    <<"\nprocess name: "<<phb->processName()
-    <<"\nwas already deleted. This is a configuration error. Please change the configuration of the module which caused this exception to state it reads this data.";
-    throw exception;    
+    exception << "get by product ID: The product with given id: " << pid << "\ntype: " << phb->productType()
+              << "\nproduct instance name: " << phb->productInstanceName() << "\nprocess name: " << phb->processName()
+              << "\nwas already deleted. This is a configuration error. Please change the configuration of the module "
+                 "which caused this exception to state it reads this data.";
+    throw exception;
   }
-  
-  BasicHandle
-  EventPrincipal::getByProductID(ProductID const& pid) const {
+
+  BasicHandle EventPrincipal::getByProductID(ProductID const& pid) const {
     BranchID bid = pidToBid(pid);
     ConstProductResolverPtr const phb = getProductResolver(bid);
-    if(phb == nullptr) {
-      return BasicHandle(makeHandleExceptionFactory([pid]()->std::shared_ptr<cms::Exception> {
+    if (phb == nullptr) {
+      return BasicHandle(makeHandleExceptionFactory([pid]() -> std::shared_ptr<cms::Exception> {
         std::shared_ptr<cms::Exception> whyFailed(std::make_shared<Exception>(errors::ProductNotFound, "InvalidID"));
-        *whyFailed
-        << "get by product ID: no product with given id: " << pid << "\n";
+        *whyFailed << "get by product ID: no product with given id: " << pid << "\n";
         return whyFailed;
       }));
     }
 
     // Was this already deleted?
-    if(phb->productWasDeleted()) {
+    if (phb->productWasDeleted()) {
       throwProductDeletedException(pid, phb);
     }
     // Check for case where we tried on demand production and
     // it failed to produce the object
-    if(phb->unscheduledWasNotRun()) {
-      return BasicHandle(makeHandleExceptionFactory([pid]()->std::shared_ptr<cms::Exception> {
+    if (phb->unscheduledWasNotRun()) {
+      return BasicHandle(makeHandleExceptionFactory([pid]() -> std::shared_ptr<cms::Exception> {
         std::shared_ptr<cms::Exception> whyFailed(std::make_shared<Exception>(errors::ProductNotFound, "InvalidID"));
-        *whyFailed
-        << "get by ProductID: could not get product with id: " << pid << "\n"
-        << "Unscheduled execution not allowed to get via ProductID.\n";
+        *whyFailed << "get by ProductID: could not get product with id: " << pid << "\n"
+                   << "Unscheduled execution not allowed to get via ProductID.\n";
         return whyFailed;
       }));
     }
-    auto resolution = phb->resolveProduct(*this,false,nullptr,nullptr);
+    auto resolution = phb->resolveProduct(*this, false, nullptr, nullptr);
 
     auto data = resolution.data();
-    if(data) {
+    if (data) {
       return BasicHandle(data->wrapper(), &(data->provenance()));
     }
-    return BasicHandle(nullptr,nullptr);
-  }
-
-  WrapperBase const*
-  EventPrincipal::getIt(ProductID const& pid) const {
-    return getByProductID(pid).wrapper();
+    return BasicHandle(nullptr, nullptr);
   }
 
-  WrapperBase const*
-  EventPrincipal::getThinnedProduct(ProductID const& pid, unsigned int& key) const {
+  WrapperBase const* EventPrincipal::getIt(ProductID const& pid) const { return getByProductID(pid).wrapper(); }
 
+  WrapperBase const* EventPrincipal::getThinnedProduct(ProductID const& pid, unsigned int& key) const {
     BranchID parent = pidToBid(pid);
 
     // Loop over thinned containers which were made by selecting elements from the parent container
-    for(auto associatedBranches = thinnedAssociationsHelper_->parentBegin(parent),
-                           iEnd = thinnedAssociationsHelper_->parentEnd(parent);
-        associatedBranches != iEnd; ++associatedBranches) {
-
-      ThinnedAssociation const* thinnedAssociation =
-        getThinnedAssociation(associatedBranches->association());
-      if(thinnedAssociation == nullptr) continue;
+    for (auto associatedBranches = thinnedAssociationsHelper_->parentBegin(parent),
+              iEnd = thinnedAssociationsHelper_->parentEnd(parent);
+         associatedBranches != iEnd;
+         ++associatedBranches) {
+      ThinnedAssociation const* thinnedAssociation = getThinnedAssociation(associatedBranches->association());
+      if (thinnedAssociation == nullptr)
+        continue;
 
-      if(associatedBranches->parent() != pidToBid(thinnedAssociation->parentCollectionID())) {
+      if (associatedBranches->parent() != pidToBid(thinnedAssociation->parentCollectionID())) {
         continue;
       }
 
       unsigned int thinnedIndex = 0;
       // Does this thinned container have the element referenced by key?
       // If yes, thinnedIndex is set to point to it in the thinned container
-      if(!thinnedAssociation->hasParentIndex(key, thinnedIndex)) {
+      if (!thinnedAssociation->hasParentIndex(key, thinnedIndex)) {
         continue;
       }
       // Get the thinned container and return a pointer if we can find it
       ProductID const& thinnedCollectionPID = thinnedAssociation->thinnedCollectionID();
       BasicHandle bhThinned = getByProductID(thinnedCollectionPID);
-      if(!bhThinned.isValid()) {
+      if (!bhThinned.isValid()) {
         // Thinned container is not found, try looking recursively in thinned containers
         // which were made by selecting elements from this thinned container.
         WrapperBase const* wrapperBase = getThinnedProduct(thinnedCollectionPID, thinnedIndex);
-        if(wrapperBase != nullptr) {
+        if (wrapperBase != nullptr) {
           key = thinnedIndex;
           return wrapperBase;
         } else {
@@ -343,23 +304,21 @@ namespace edm {
     return nullptr;
   }
 
-  void
-  EventPrincipal::getThinnedProducts(ProductID const& pid,
-                                     std::vector<WrapperBase const*>& foundContainers,
-                                     std::vector<unsigned int>& keys) const {
-
+  void EventPrincipal::getThinnedProducts(ProductID const& pid,
+                                          std::vector<WrapperBase const*>& foundContainers,
+                                          std::vector<unsigned int>& keys) const {
     BranchID parent = pidToBid(pid);
 
     // Loop over thinned containers which were made by selecting elements from the parent container
-    for(auto associatedBranches = thinnedAssociationsHelper_->parentBegin(parent),
-                           iEnd = thinnedAssociationsHelper_->parentEnd(parent);
-        associatedBranches != iEnd; ++associatedBranches) {
-
-      ThinnedAssociation const* thinnedAssociation =
-        getThinnedAssociation(associatedBranches->association());
-      if(thinnedAssociation == nullptr) continue;
+    for (auto associatedBranches = thinnedAssociationsHelper_->parentBegin(parent),
+              iEnd = thinnedAssociationsHelper_->parentEnd(parent);
+         associatedBranches != iEnd;
+         ++associatedBranches) {
+      ThinnedAssociation const* thinnedAssociation = getThinnedAssociation(associatedBranches->association());
+      if (thinnedAssociation == nullptr)
+        continue;
 
-      if(associatedBranches->parent() != pidToBid(thinnedAssociation->parentCollectionID())) {
+      if (associatedBranches->parent() != pidToBid(thinnedAssociation->parentCollectionID())) {
         continue;
       }
 
@@ -367,37 +326,42 @@ namespace edm {
       unsigned int doNotLookForThisIndex = std::numeric_limits<unsigned int>::max();
       std::vector<unsigned int> thinnedIndexes(nKeys, doNotLookForThisIndex);
       bool hasAny = false;
-      for(unsigned k = 0; k < nKeys; ++k) {
+      for (unsigned k = 0; k < nKeys; ++k) {
         // Already found this one
-        if(foundContainers[k] != nullptr) continue;
+        if (foundContainers[k] != nullptr)
+          continue;
         // Already know this one is not in this thinned container
-        if(keys[k] == doNotLookForThisIndex) continue;
+        if (keys[k] == doNotLookForThisIndex)
+          continue;
         // Does the thinned container hold the entry of interest?
         // Modifies thinnedIndexes[k] only if it returns true and
         // sets it to the index in the thinned collection.
-        if(thinnedAssociation->hasParentIndex(keys[k], thinnedIndexes[k])) {
+        if (thinnedAssociation->hasParentIndex(keys[k], thinnedIndexes[k])) {
           hasAny = true;
         }
       }
-      if(!hasAny) {
+      if (!hasAny) {
         continue;
       }
       // Get the thinned container and set the pointers and indexes into
       // it (if we can find it)
       ProductID thinnedCollectionPID = thinnedAssociation->thinnedCollectionID();
       BasicHandle bhThinned = getByProductID(thinnedCollectionPID);
-      if(!bhThinned.isValid()) {
+      if (!bhThinned.isValid()) {
         // Thinned container is not found, try looking recursively in thinned containers
         // which were made by selecting elements from this thinned container.
         getThinnedProducts(thinnedCollectionPID, foundContainers, thinnedIndexes);
-        for(unsigned k = 0; k < nKeys; ++k) {
-          if(foundContainers[k] == nullptr) continue;
-          if(thinnedIndexes[k] == doNotLookForThisIndex) continue;
+        for (unsigned k = 0; k < nKeys; ++k) {
+          if (foundContainers[k] == nullptr)
+            continue;
+          if (thinnedIndexes[k] == doNotLookForThisIndex)
+            continue;
           keys[k] = thinnedIndexes[k];
         }
       } else {
-        for(unsigned k = 0; k < nKeys; ++k) {
-          if(thinnedIndexes[k] == doNotLookForThisIndex) continue;
+        for (unsigned k = 0; k < nKeys; ++k) {
+          if (thinnedIndexes[k] == doNotLookForThisIndex)
+            continue;
           keys[k] = thinnedIndexes[k];
           foundContainers[k] = bhThinned.wrapper();
         }
@@ -405,43 +369,34 @@ namespace edm {
     }
   }
 
-  Provenance
-  EventPrincipal::getProvenance(ProductID const& pid, ModuleCallingContext const* mcc) const {
+  Provenance EventPrincipal::getProvenance(ProductID const& pid, ModuleCallingContext const* mcc) const {
     BranchID bid = pidToBid(pid);
     return getProvenance(bid, mcc);
   }
 
-  EventSelectionIDVector const&
-  EventPrincipal::eventSelectionIDs() const {
-    return eventSelectionIDs_;
-  }
-
-  BranchListIndexes const&
-  EventPrincipal::branchListIndexes() const {
-    return branchListIndexes_;
-  }
+  EventSelectionIDVector const& EventPrincipal::eventSelectionIDs() const { return eventSelectionIDs_; }
 
-  edm::ThinnedAssociation const*
-  EventPrincipal::getThinnedAssociation(edm::BranchID const& branchID) const {
+  BranchListIndexes const& EventPrincipal::branchListIndexes() const { return branchListIndexes_; }
 
+  edm::ThinnedAssociation const* EventPrincipal::getThinnedAssociation(edm::BranchID const& branchID) const {
     ConstProductResolverPtr const phb = getProductResolver(branchID);
 
-    if(phb == nullptr) {
+    if (phb == nullptr) {
       throw Exception(errors::LogicError)
-        << "EventPrincipal::getThinnedAssociation, ThinnedAssociation ProductResolver cannot be found\n"
-        << "This should never happen. Contact a Framework developer";
+          << "EventPrincipal::getThinnedAssociation, ThinnedAssociation ProductResolver cannot be found\n"
+          << "This should never happen. Contact a Framework developer";
     }
-    ProductData const* productData = (phb->resolveProduct(*this,false,nullptr,nullptr)).data();
+    ProductData const* productData = (phb->resolveProduct(*this, false, nullptr, nullptr)).data();
     if (productData == nullptr) {
       return nullptr;
     }
     WrapperBase const* product = productData->wrapper();
-    if(!(typeid(edm::ThinnedAssociation) == product->dynamicTypeInfo())) {
+    if (!(typeid(edm::ThinnedAssociation) == product->dynamicTypeInfo())) {
       throw Exception(errors::LogicError)
-        << "EventPrincipal::getThinnedProduct, product has wrong type, not a ThinnedAssociation.\n";
+          << "EventPrincipal::getThinnedProduct, product has wrong type, not a ThinnedAssociation.\n";
     }
     Wrapper<ThinnedAssociation> const* wrapper = static_cast<Wrapper<ThinnedAssociation> const*>(product);
     return wrapper->product();
   }
 
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/EventProcessor.cc b/FWCore/Framework/src/EventProcessor.cc
index fed92c59a066c..fe9c7e28d63ad 100644
--- a/FWCore/Framework/src/EventProcessor.cc
+++ b/FWCore/Framework/src/EventProcessor.cc
@@ -28,6 +28,7 @@
 #include "FWCore/Framework/interface/ScheduleInfo.h"
 #include "FWCore/Framework/interface/SubProcess.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/ESRecordsToProxyIndices.h"
 #include "FWCore/Framework/src/Breakpoints.h"
 #include "FWCore/Framework/src/EventSetupsController.h"
 #include "FWCore/Framework/src/InputSourceFactory.h"
@@ -94,54 +95,48 @@ namespace {
   // calling completedSuccessfully().
   class SendSourceTerminationSignalIfException {
   public:
-    SendSourceTerminationSignalIfException(edm::ActivityRegistry* iReg):
-      reg_(iReg) {}
+    SendSourceTerminationSignalIfException(edm::ActivityRegistry* iReg) : reg_(iReg) {}
     ~SendSourceTerminationSignalIfException() {
-      if(reg_) {
+      if (reg_) {
         reg_->preSourceEarlyTerminationSignal_(edm::TerminationOrigin::ExceptionFromThisContext);
       }
     }
-    void completedSuccessfully() {
-      reg_ = nullptr;
-    }
+    void completedSuccessfully() { reg_ = nullptr; }
+
   private:
-    edm::ActivityRegistry* reg_; // We do not use propagate_const because the registry itself is mutable.
+    edm::ActivityRegistry* reg_;  // We do not use propagate_const because the registry itself is mutable.
   };
 
-}
+}  // namespace
 
 namespace edm {
 
   // ---------------------------------------------------------------
-  std::unique_ptr<InputSource>
-  makeInput(ParameterSet& params,
-            CommonParams const& common,
-            std::shared_ptr<ProductRegistry> preg,
-            std::shared_ptr<BranchIDListHelper> branchIDListHelper,
-            std::shared_ptr<ThinnedAssociationsHelper> thinnedAssociationsHelper,
-            std::shared_ptr<ActivityRegistry> areg,
-            std::shared_ptr<ProcessConfiguration const> processConfiguration,
-            PreallocationConfiguration const& allocations) {
+  std::unique_ptr<InputSource> makeInput(ParameterSet& params,
+                                         CommonParams const& common,
+                                         std::shared_ptr<ProductRegistry> preg,
+                                         std::shared_ptr<BranchIDListHelper> branchIDListHelper,
+                                         std::shared_ptr<ThinnedAssociationsHelper> thinnedAssociationsHelper,
+                                         std::shared_ptr<ActivityRegistry> areg,
+                                         std::shared_ptr<ProcessConfiguration const> processConfiguration,
+                                         PreallocationConfiguration const& allocations) {
     ParameterSet* main_input = params.getPSetForUpdate("@main_input");
-    if(main_input == nullptr) {
+    if (main_input == nullptr) {
       throw Exception(errors::Configuration)
-        << "There must be exactly one source in the configuration.\n"
-        << "It is missing (or there are sufficient syntax errors such that it is not recognized as the source)\n";
+          << "There must be exactly one source in the configuration.\n"
+          << "It is missing (or there are sufficient syntax errors such that it is not recognized as the source)\n";
     }
 
     std::string modtype(main_input->getParameter<std::string>("@module_type"));
 
     std::unique_ptr<ParameterSetDescriptionFillerBase> filler(
-                                                              ParameterSetDescriptionFillerPluginFactory::get()->create(modtype));
+        ParameterSetDescriptionFillerPluginFactory::get()->create(modtype));
     ConfigurationDescriptions descriptions(filler->baseType(), modtype);
     filler->fill(descriptions);
 
     try {
-      convertException::wrap([&]() {
-          descriptions.validate(*main_input, std::string("source"));
-        });
-    }
-    catch (cms::Exception & iException) {
+      convertException::wrap([&]() { descriptions.validate(*main_input, std::string("source")); });
+    } catch (cms::Exception& iException) {
       std::ostringstream ost;
       ost << "Validating configuration of input source of type " << modtype;
       iException.addContext(ost.str());
@@ -162,22 +157,27 @@ namespace edm {
                          processConfiguration.get(),
                          ModuleDescription::getUniqueID());
 
-    InputSourceDescription isdesc(md, preg, branchIDListHelper, thinnedAssociationsHelper, areg,
-                                  common.maxEventsInput_, common.maxLumisInput_,
-                                  common.maxSecondsUntilRampdown_, allocations);
+    InputSourceDescription isdesc(md,
+                                  preg,
+                                  branchIDListHelper,
+                                  thinnedAssociationsHelper,
+                                  areg,
+                                  common.maxEventsInput_,
+                                  common.maxLumisInput_,
+                                  common.maxSecondsUntilRampdown_,
+                                  allocations);
 
     areg->preSourceConstructionSignal_(md);
     std::unique_ptr<InputSource> input;
     try {
       //even if we have an exception, send the signal
-      std::shared_ptr<int> sentry(nullptr,[areg,&md](void*){areg->postSourceConstructionSignal_(md);});
+      std::shared_ptr<int> sentry(nullptr, [areg, &md](void*) { areg->postSourceConstructionSignal_(md); });
       convertException::wrap([&]() {
-          input = std::unique_ptr<InputSource>(InputSourceFactory::get()->makeInputSource(*main_input, isdesc).release());
-          input->preEventReadFromSourceSignal_.connect(std::cref(areg->preEventReadFromSourceSignal_));
-          input->postEventReadFromSourceSignal_.connect(std::cref(areg->postEventReadFromSourceSignal_));
-        });
-    }
-    catch (cms::Exception& iException) {
+        input = std::unique_ptr<InputSource>(InputSourceFactory::get()->makeInputSource(*main_input, isdesc).release());
+        input->preEventReadFromSourceSignal_.connect(std::cref(areg->preEventReadFromSourceSignal_));
+        input->postEventReadFromSourceSignal_.connect(std::cref(areg->postEventReadFromSourceSignal_));
+      });
+    } catch (cms::Exception& iException) {
       std::ostringstream ost;
       ost << "Constructing input source of type " << modtype;
       iException.addContext(ost.str());
@@ -187,105 +187,99 @@ namespace edm {
   }
 
   // ---------------------------------------------------------------
-  std::shared_ptr<EDLooperBase>
-  fillLooper(eventsetup::EventSetupsController& esController,
-             eventsetup::EventSetupProvider& cp,
-             ParameterSet& params) {
+  std::shared_ptr<EDLooperBase> fillLooper(eventsetup::EventSetupsController& esController,
+                                           eventsetup::EventSetupProvider& cp,
+                                           ParameterSet& params) {
     std::shared_ptr<EDLooperBase> vLooper;
 
     std::vector<std::string> loopers = params.getParameter<std::vector<std::string> >("@all_loopers");
 
-    if(loopers.empty()) {
+    if (loopers.empty()) {
       return vLooper;
     }
 
     assert(1 == loopers.size());
 
-    for(std::vector<std::string>::iterator itName = loopers.begin(), itNameEnd = loopers.end();
-        itName != itNameEnd;
-        ++itName) {
-
+    for (std::vector<std::string>::iterator itName = loopers.begin(), itNameEnd = loopers.end(); itName != itNameEnd;
+         ++itName) {
       ParameterSet* providerPSet = params.getPSetForUpdate(*itName);
       providerPSet->registerIt();
-      vLooper = eventsetup::LooperFactory::get()->addTo(esController,
-                                                        cp,
-                                                        *providerPSet);
+      vLooper = eventsetup::LooperFactory::get()->addTo(esController, cp, *providerPSet);
     }
     return vLooper;
   }
 
   // ---------------------------------------------------------------
-  EventProcessor::EventProcessor(std::unique_ptr<ParameterSet> parameterSet,//std::string const& config,
+  EventProcessor::EventProcessor(std::unique_ptr<ParameterSet> parameterSet,  //std::string const& config,
                                  ServiceToken const& iToken,
                                  serviceregistry::ServiceLegacy iLegacy,
                                  std::vector<std::string> const& defaultServices,
-                                 std::vector<std::string> const& forcedServices) :
-    actReg_(),
-    preg_(),
-    branchIDListHelper_(),
-    serviceToken_(),
-    input_(),
-    espController_(new eventsetup::EventSetupsController),
-    esp_(),
-    act_table_(),
-    processConfiguration_(),
-    schedule_(),
-    subProcesses_(),
-    historyAppender_(new HistoryAppender),
-    fb_(),
-    looper_(),
-    deferredExceptionPtrIsSet_(false),
-    sourceResourcesAcquirer_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().first),
-    sourceMutex_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().second),
-    principalCache_(),
-    beginJobCalled_(false),
-    shouldWeStop_(false),
-    fileModeNoMerge_(false),
-    exceptionMessageFiles_(),
-    exceptionMessageRuns_(),
-    exceptionMessageLumis_(false),
-    forceLooperToEnd_(false),
-    looperBeginJobRun_(false),
-    forceESCacheClearOnNewRun_(false),
-    eventSetupDataToExcludeFromPrefetching_() {
+                                 std::vector<std::string> const& forcedServices)
+      : actReg_(),
+        preg_(),
+        branchIDListHelper_(),
+        serviceToken_(),
+        input_(),
+        espController_(new eventsetup::EventSetupsController),
+        esp_(),
+        act_table_(),
+        processConfiguration_(),
+        schedule_(),
+        subProcesses_(),
+        historyAppender_(new HistoryAppender),
+        fb_(),
+        looper_(),
+        deferredExceptionPtrIsSet_(false),
+        sourceResourcesAcquirer_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().first),
+        sourceMutex_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().second),
+        principalCache_(),
+        beginJobCalled_(false),
+        shouldWeStop_(false),
+        fileModeNoMerge_(false),
+        exceptionMessageFiles_(),
+        exceptionMessageRuns_(),
+        exceptionMessageLumis_(false),
+        forceLooperToEnd_(false),
+        looperBeginJobRun_(false),
+        forceESCacheClearOnNewRun_(false),
+        eventSetupDataToExcludeFromPrefetching_() {
     auto processDesc = std::make_shared<ProcessDesc>(std::move(parameterSet));
     processDesc->addServices(defaultServices, forcedServices);
     init(processDesc, iToken, iLegacy);
   }
 
-  EventProcessor::EventProcessor(std::unique_ptr<ParameterSet> parameterSet,//std::string const& config,
+  EventProcessor::EventProcessor(std::unique_ptr<ParameterSet> parameterSet,  //std::string const& config,
                                  std::vector<std::string> const& defaultServices,
-                                 std::vector<std::string> const& forcedServices) :
-    actReg_(),
-    preg_(),
-    branchIDListHelper_(),
-    serviceToken_(),
-    input_(),
-    espController_(new eventsetup::EventSetupsController),
-    esp_(),
-    act_table_(),
-    processConfiguration_(),
-    schedule_(),
-    subProcesses_(),
-    historyAppender_(new HistoryAppender),
-    fb_(),
-    looper_(),
-    deferredExceptionPtrIsSet_(false),
-    sourceResourcesAcquirer_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().first),
-    sourceMutex_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().second),
-    principalCache_(),
-    beginJobCalled_(false),
-    shouldWeStop_(false),
-    fileModeNoMerge_(false),
-    exceptionMessageFiles_(),
-    exceptionMessageRuns_(),
-    exceptionMessageLumis_(false),
-    forceLooperToEnd_(false),
-    looperBeginJobRun_(false),
-    forceESCacheClearOnNewRun_(false),
-    asyncStopRequestedWhileProcessingEvents_(false),
-    eventSetupDataToExcludeFromPrefetching_()
-  {
+                                 std::vector<std::string> const& forcedServices)
+      : actReg_(),
+        preg_(),
+        branchIDListHelper_(),
+        serviceToken_(),
+        input_(),
+        espController_(new eventsetup::EventSetupsController),
+        esp_(),
+        act_table_(),
+        processConfiguration_(),
+        schedule_(),
+        subProcesses_(),
+        historyAppender_(new HistoryAppender),
+        fb_(),
+        looper_(),
+        deferredExceptionPtrIsSet_(false),
+        sourceResourcesAcquirer_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().first),
+        sourceMutex_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().second),
+        principalCache_(),
+        beginJobCalled_(false),
+        shouldWeStop_(false),
+        fileModeNoMerge_(false),
+        exceptionMessageFiles_(),
+        exceptionMessageRuns_(),
+        exceptionMessageLumis_(false),
+        forceLooperToEnd_(false),
+        looperBeginJobRun_(false),
+        forceESCacheClearOnNewRun_(false),
+        asyncStopRequestedWhileProcessingEvents_(false),
+        eventSetupDataToExcludeFromPrefetching_() {
     auto processDesc = std::make_shared<ProcessDesc>(std::move(parameterSet));
     processDesc->addServices(defaultServices, forcedServices);
     init(processDesc, ServiceToken(), serviceregistry::kOverlapIsError);
@@ -293,45 +287,42 @@ namespace edm {
 
   EventProcessor::EventProcessor(std::shared_ptr<ProcessDesc> processDesc,
                                  ServiceToken const& token,
-                                 serviceregistry::ServiceLegacy legacy) :
-    actReg_(),
-    preg_(),
-    branchIDListHelper_(),
-    serviceToken_(),
-    input_(),
-    espController_(new eventsetup::EventSetupsController),
-    esp_(),
-    act_table_(),
-    processConfiguration_(),
-    schedule_(),
-    subProcesses_(),
-    historyAppender_(new HistoryAppender),
-    fb_(),
-    looper_(),
-    deferredExceptionPtrIsSet_(false),
-    sourceResourcesAcquirer_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().first),
-    sourceMutex_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().second),
-    principalCache_(),
-    beginJobCalled_(false),
-    shouldWeStop_(false),
-    fileModeNoMerge_(false),
-    exceptionMessageFiles_(),
-    exceptionMessageRuns_(),
-    exceptionMessageLumis_(false),
-    forceLooperToEnd_(false),
-    looperBeginJobRun_(false),
-    forceESCacheClearOnNewRun_(false),
-    asyncStopRequestedWhileProcessingEvents_(false),
-    eventSetupDataToExcludeFromPrefetching_()
-  {
+                                 serviceregistry::ServiceLegacy legacy)
+      : actReg_(),
+        preg_(),
+        branchIDListHelper_(),
+        serviceToken_(),
+        input_(),
+        espController_(new eventsetup::EventSetupsController),
+        esp_(),
+        act_table_(),
+        processConfiguration_(),
+        schedule_(),
+        subProcesses_(),
+        historyAppender_(new HistoryAppender),
+        fb_(),
+        looper_(),
+        deferredExceptionPtrIsSet_(false),
+        sourceResourcesAcquirer_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().first),
+        sourceMutex_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().second),
+        principalCache_(),
+        beginJobCalled_(false),
+        shouldWeStop_(false),
+        fileModeNoMerge_(false),
+        exceptionMessageFiles_(),
+        exceptionMessageRuns_(),
+        exceptionMessageLumis_(false),
+        forceLooperToEnd_(false),
+        looperBeginJobRun_(false),
+        forceESCacheClearOnNewRun_(false),
+        asyncStopRequestedWhileProcessingEvents_(false),
+        eventSetupDataToExcludeFromPrefetching_() {
     init(processDesc, token, legacy);
   }
 
-  void
-  EventProcessor::init(std::shared_ptr<ProcessDesc>& processDesc,
-                       ServiceToken const& iToken,
-                       serviceregistry::ServiceLegacy iLegacy) {
-
+  void EventProcessor::init(std::shared_ptr<ProcessDesc>& processDesc,
+                            ServiceToken const& iToken,
+                            serviceregistry::ServiceLegacy iLegacy) {
     //std::cerr << processDesc->dump() << std::endl;
 
     // register the empty parentage vector , once and for all
@@ -355,9 +346,9 @@ namespace edm {
     ParameterSet const& optionsPset(parameterSet->getUntrackedParameterSet("options"));
     auto const& fileMode = optionsPset.getUntrackedParameter<std::string>("fileMode");
     if (fileMode != "NOMERGE" and fileMode != "FULLMERGE") {
-        throw Exception(errors::Configuration, "Illegal fileMode parameter value: ")
-        << fileMode << ".\n"
-        << "Legal values are 'NOMERGE' and 'FULLMERGE'.\n";
+      throw Exception(errors::Configuration, "Illegal fileMode parameter value: ")
+          << fileMode << ".\n"
+          << "Legal values are 'NOMERGE' and 'FULLMERGE'.\n";
     } else {
       fileModeNoMerge_ = (fileMode == "NOMERGE");
     }
@@ -375,14 +366,15 @@ namespace edm {
       nStreams = nThreads;
     }
     if (nThreads > 1 or nStreams > 1) {
-      edm::LogInfo("ThreadStreamSetup") <<"setting # threads "<<nThreads<<"\nsetting # streams "<<nStreams;
+      edm::LogInfo("ThreadStreamSetup") << "setting # threads " << nThreads << "\nsetting # streams " << nStreams;
     }
     unsigned int nConcurrentRuns = optionsPset.getUntrackedParameter<unsigned int>("numberOfConcurrentRuns");
     if (nConcurrentRuns != 1) {
       throw Exception(errors::Configuration, "Illegal value nConcurrentRuns : ")
-        << "Although the plan is to change this in the future, currently nConcurrentRuns must always be 1.\n";
+          << "Although the plan is to change this in the future, currently nConcurrentRuns must always be 1.\n";
     }
-    unsigned int nConcurrentLumis = optionsPset.getUntrackedParameter<unsigned int>("numberOfConcurrentLuminosityBlocks");
+    unsigned int nConcurrentLumis =
+        optionsPset.getUntrackedParameter<unsigned int>("numberOfConcurrentLuminosityBlocks");
     if (nConcurrentLumis == 0) {
       nConcurrentLumis = nConcurrentRuns;
     }
@@ -401,7 +393,7 @@ namespace edm {
     */
     IllegalParameters::setThrowAnException(optionsPset.getUntrackedParameter<bool>("throwIfIllegalParameter"));
 
-    printDependencies_ =  optionsPset.getUntrackedParameter<bool>("printDependencies");
+    printDependencies_ = optionsPset.getUntrackedParameter<bool>("printDependencies");
 
     // Now do general initialization
     ScheduleItems items;
@@ -414,7 +406,7 @@ namespace edm {
     //make the services available
     ServiceRegistry::Operate operate(serviceToken_);
 
-    if(nStreams>1) {
+    if (nStreams > 1) {
       edm::Service<RootHandlers> handler;
       handler->willBeUsingThreads();
     }
@@ -427,22 +419,22 @@ namespace edm {
 
     // initialize the looper, if any
     looper_ = fillLooper(*espController_, *esp_, *parameterSet);
-    if(looper_) {
+    if (looper_) {
       looper_->setActionTable(items.act_table_.get());
       looper_->attachTo(*items.actReg_);
 
       //For now loopers make us run only 1 transition at a time
-      nStreams=1;
-      nConcurrentLumis=1;
-      nConcurrentRuns=1;
+      nStreams = 1;
+      nConcurrentLumis = 1;
+      nConcurrentRuns = 1;
     }
 
-    preallocations_ = PreallocationConfiguration{nThreads,nStreams,nConcurrentLumis,nConcurrentRuns};
+    preallocations_ = PreallocationConfiguration{nThreads, nStreams, nConcurrentLumis, nConcurrentRuns};
 
     lumiQueue_ = std::make_unique<LimitedTaskQueue>(nConcurrentLumis);
     streamQueues_.resize(nStreams);
     streamLumiStatus_.resize(nStreams);
-    
+
     // initialize the input source
     input_ = makeInput(*parameterSet,
                        *common,
@@ -454,7 +446,7 @@ namespace edm {
                        preallocations_);
 
     // intialize the Schedule
-    schedule_ = items.initSchedule(*parameterSet,hasSubProcesses,preallocations_,&processContext_);
+    schedule_ = items.initSchedule(*parameterSet, hasSubProcesses, preallocations_, &processContext_);
 
     // set the data members
     act_table_ = std::move(items.act_table_);
@@ -470,22 +462,26 @@ namespace edm {
     FDEBUG(2) << parameterSet << std::endl;
 
     principalCache_.setNumberOfConcurrentPrincipals(preallocations_);
-    for(unsigned int index = 0; index<preallocations_.numberOfStreams(); ++index ) {
+    for (unsigned int index = 0; index < preallocations_.numberOfStreams(); ++index) {
       // Reusable event principal
-      auto ep = std::make_shared<EventPrincipal>(preg(), branchIDListHelper(),
-                                                 thinnedAssociationsHelper(), *processConfiguration_, historyAppender_.get(), index);
+      auto ep = std::make_shared<EventPrincipal>(preg(),
+                                                 branchIDListHelper(),
+                                                 thinnedAssociationsHelper(),
+                                                 *processConfiguration_,
+                                                 historyAppender_.get(),
+                                                 index);
       principalCache_.insert(std::move(ep));
     }
-    
-    for(unsigned int index =0; index < preallocations_.numberOfLuminosityBlocks(); ++index) {
-      auto lp = std::make_unique<LuminosityBlockPrincipal>(preg(), *processConfiguration_,
-                                                           historyAppender_.get(), index);
+
+    for (unsigned int index = 0; index < preallocations_.numberOfLuminosityBlocks(); ++index) {
+      auto lp =
+          std::make_unique<LuminosityBlockPrincipal>(preg(), *processConfiguration_, historyAppender_.get(), index);
       principalCache_.insert(std::move(lp));
     }
 
     // fill the subprocesses, if there are any
     subProcesses_.reserve(subProcessVParameterSet.size());
-    for(auto& subProcessPSet : subProcessVParameterSet) {
+    for (auto& subProcessPSet : subProcessVParameterSet) {
       subProcesses_.emplace_back(subProcessPSet,
                                  *parameterSet,
                                  preg(),
@@ -519,10 +515,10 @@ namespace edm {
     ParentageRegistry::instance()->clear();
   }
 
-  void
-  EventProcessor::beginJob() {
-    if(beginJobCalled_) return;
-    beginJobCalled_=true;
+  void EventProcessor::beginJob() {
+    if (beginJobCalled_)
+      return;
+    beginJobCalled_ = true;
     bk::beginJob();
 
     // StateSentry toerror(this); // should we add this ?
@@ -541,7 +537,7 @@ namespace edm {
     checkForModuleDependencyCorrectness(pathsAndConsumesOfModules_, printDependencies_);
     actReg_->preBeginJobSignal_(pathsAndConsumesOfModules_, processContext_);
 
-    if(preallocations_.numberOfLuminosityBlocks() > 1) {
+    if (preallocations_.numberOfLuminosityBlocks() > 1) {
       warnAboutModulesRequiringLuminosityBLockSynchronization();
     }
     //NOTE:  This implementation assumes 'Job' means one call
@@ -559,137 +555,108 @@ namespace edm {
     //   looper_->beginOfJob(es);
     //}
     try {
-      convertException::wrap([&]() {
-          input_->doBeginJob();
-        });
-    }
-    catch(cms::Exception& ex) {
+      convertException::wrap([&]() { input_->doBeginJob(); });
+    } catch (cms::Exception& ex) {
       ex.addContext("Calling beginJob for the source");
       throw;
     }
-    schedule_->beginJob(*preg_);
+    espController_->finishConfiguration();
+    schedule_->beginJob(*preg_, esp_->recordsToProxyIndices());
     // toerror.succeeded(); // should we add this?
-    for_all(subProcesses_, [](auto& subProcess){ subProcess.doBeginJob(); });
+    for_all(subProcesses_, [](auto& subProcess) { subProcess.doBeginJob(); });
     actReg_->postBeginJobSignal_();
 
-    for(unsigned int i=0; i<preallocations_.numberOfStreams();++i) {
+    for (unsigned int i = 0; i < preallocations_.numberOfStreams(); ++i) {
       schedule_->beginStream(i);
-      for_all(subProcesses_, [i](auto& subProcess){ subProcess.doBeginStream(i); });
+      for_all(subProcesses_, [i](auto& subProcess) { subProcess.doBeginStream(i); });
     }
   }
 
-  void
-  EventProcessor::endJob() {
+  void EventProcessor::endJob() {
     // Collects exceptions, so we don't throw before all operations are performed.
-    ExceptionCollector c("Multiple exceptions were thrown while executing endJob. An exception message follows for each.\n");
+    ExceptionCollector c(
+        "Multiple exceptions were thrown while executing endJob. An exception message follows for each.\n");
 
     //make the services available
     ServiceRegistry::Operate operate(serviceToken_);
 
     //NOTE: this really should go elsewhere in the future
-    for(unsigned int i=0; i<preallocations_.numberOfStreams();++i) {
-      c.call([this,i](){this->schedule_->endStream(i);});
-      for(auto& subProcess : subProcesses_) {
-        c.call([&subProcess,i](){ subProcess.doEndStream(i); } );
+    for (unsigned int i = 0; i < preallocations_.numberOfStreams(); ++i) {
+      c.call([this, i]() { this->schedule_->endStream(i); });
+      for (auto& subProcess : subProcesses_) {
+        c.call([&subProcess, i]() { subProcess.doEndStream(i); });
       }
     }
     auto actReg = actReg_.get();
-    c.call([actReg](){actReg->preEndJobSignal_();});
+    c.call([actReg]() { actReg->preEndJobSignal_(); });
     schedule_->endJob(c);
-    for(auto& subProcess : subProcesses_) {
+    for (auto& subProcess : subProcesses_) {
       c.call(std::bind(&SubProcess::doEndJob, &subProcess));
     }
     c.call(std::bind(&InputSource::doEndJob, input_.get()));
-    if(looper_) {
+    if (looper_) {
       c.call(std::bind(&EDLooperBase::endOfJob, looper()));
     }
-    c.call([actReg](){actReg->postEndJobSignal_();});
-    if(c.hasThrown()) {
+    c.call([actReg]() { actReg->postEndJobSignal_(); });
+    if (c.hasThrown()) {
       c.rethrow();
     }
   }
 
-  ServiceToken
-  EventProcessor::getToken() {
-    return serviceToken_;
-  }
+  ServiceToken EventProcessor::getToken() { return serviceToken_; }
 
-  std::vector<ModuleDescription const*>
-  EventProcessor::getAllModuleDescriptions() const {
+  std::vector<ModuleDescription const*> EventProcessor::getAllModuleDescriptions() const {
     return schedule_->getAllModuleDescriptions();
   }
 
-  int
-  EventProcessor::totalEvents() const {
-    return schedule_->totalEvents();
-  }
+  int EventProcessor::totalEvents() const { return schedule_->totalEvents(); }
 
-  int
-  EventProcessor::totalEventsPassed() const {
-    return schedule_->totalEventsPassed();
-  }
+  int EventProcessor::totalEventsPassed() const { return schedule_->totalEventsPassed(); }
 
-  int
-  EventProcessor::totalEventsFailed() const {
-    return schedule_->totalEventsFailed();
-  }
+  int EventProcessor::totalEventsFailed() const { return schedule_->totalEventsFailed(); }
 
-  void
-  EventProcessor::enableEndPaths(bool active) {
-    schedule_->enableEndPaths(active);
-  }
+  void EventProcessor::enableEndPaths(bool active) { schedule_->enableEndPaths(active); }
 
-  bool
-  EventProcessor::endPathsEnabled() const {
-    return schedule_->endPathsEnabled();
-  }
+  bool EventProcessor::endPathsEnabled() const { return schedule_->endPathsEnabled(); }
 
-  void
-  EventProcessor::getTriggerReport(TriggerReport& rep) const {
-    schedule_->getTriggerReport(rep);
-  }
+  void EventProcessor::getTriggerReport(TriggerReport& rep) const { schedule_->getTriggerReport(rep); }
 
-  void
-  EventProcessor::clearCounters() {
-    schedule_->clearCounters();
-  }
+  void EventProcessor::clearCounters() { schedule_->clearCounters(); }
 
   namespace {
 #include "TransitionProcessors.icc"
   }
 
-  bool
-  EventProcessor::checkForAsyncStopRequest(StatusCode& returnCode) {
+  bool EventProcessor::checkForAsyncStopRequest(StatusCode& returnCode) {
     bool returnValue = false;
 
     // Look for a shutdown signal
-    if(shutdown_flag.load(std::memory_order_acquire)) {
+    if (shutdown_flag.load(std::memory_order_acquire)) {
       returnValue = true;
       returnCode = epSignal;
     }
     return returnValue;
   }
 
-  InputSource::ItemType
-  EventProcessor::nextTransitionType() {
+  InputSource::ItemType EventProcessor::nextTransitionType() {
     if (deferredExceptionPtrIsSet_.load()) {
       lastSourceTransition_ = InputSource::IsStop;
       return InputSource::IsStop;
     }
-    
+
     SendSourceTerminationSignalIfException sentry(actReg_.get());
     InputSource::ItemType itemType;
     //For now, do nothing with InputSource::IsSynchronize
     do {
       itemType = input_->nextItemType();
-    } while( itemType == InputSource::IsSynchronize);
-    
+    } while (itemType == InputSource::IsSynchronize);
+
     lastSourceTransition_ = itemType;
     sentry.completedSuccessfully();
-    
-    StatusCode returnCode=epSuccess;
-    
-    if(checkForAsyncStopRequest(returnCode)) {
+
+    StatusCode returnCode = epSuccess;
+
+    if (checkForAsyncStopRequest(returnCode)) {
       actReg_->preSourceEarlyTerminationSignal_(TerminationOrigin::ExternalSignal);
       lastSourceTransition_ = InputSource::IsStop;
     }
@@ -697,65 +664,57 @@ namespace edm {
     return lastSourceTransition_;
   }
 
-  std::pair<edm::ProcessHistoryID, edm::RunNumber_t>
-  EventProcessor::nextRunID() {
+  std::pair<edm::ProcessHistoryID, edm::RunNumber_t> EventProcessor::nextRunID() {
     return std::make_pair(input_->reducedProcessHistoryID(), input_->run());
   }
-  
-  edm::LuminosityBlockNumber_t
-  EventProcessor::nextLuminosityBlockID() {
-    return input_->luminosityBlock();
-  }
 
-  EventProcessor::StatusCode
-  EventProcessor::runToCompletion() {
-    
-    StatusCode returnCode=epSuccess;
-    asyncStopStatusCodeFromProcessingEvents_=epSuccess;
+  edm::LuminosityBlockNumber_t EventProcessor::nextLuminosityBlockID() { return input_->luminosityBlock(); }
+
+  EventProcessor::StatusCode EventProcessor::runToCompletion() {
+    StatusCode returnCode = epSuccess;
+    asyncStopStatusCodeFromProcessingEvents_ = epSuccess;
     {
-      beginJob(); //make sure this was called
-      
+      beginJob();  //make sure this was called
+
       // make the services available
       ServiceRegistry::Operate operate(serviceToken_);
 
-      asyncStopRequestedWhileProcessingEvents_=false;
+      asyncStopRequestedWhileProcessingEvents_ = false;
       try {
         FilesProcessor fp(fileModeNoMerge_);
 
         convertException::wrap([&]() {
           bool firstTime = true;
           do {
-            if(not firstTime) {
+            if (not firstTime) {
               prepareForNextLoop();
               rewindInput();
             } else {
               firstTime = false;
             }
             startingNewLoop();
-            
+
             auto trans = fp.processFiles(*this);
-            
+
             fp.normalEnd();
-            
-            if(deferredExceptionPtrIsSet_.load()) {
+
+            if (deferredExceptionPtrIsSet_.load()) {
               std::rethrow_exception(deferredExceptionPtr_);
             }
-            if(trans != InputSource::IsStop) {
+            if (trans != InputSource::IsStop) {
               //problem with the source
               doErrorStuff();
-              
-              throw cms::Exception("BadTransition")
-              << "Unexpected transition change "
-              << trans;
 
+              throw cms::Exception("BadTransition") << "Unexpected transition change " << trans;
             }
-          } while(not endOfLoop());
-        }); // convertException::wrap
-        
-      } // Try block
-      catch (cms::Exception & e) {
+          } while (not endOfLoop());
+        });  // convertException::wrap
+
+      }  // Try block
+      catch (cms::Exception& e) {
         if (exceptionMessageLumis_) {
-          std::string message("Another exception was caught while trying to clean up lumis after the primary fatal exception.");
+          std::string message(
+              "Another exception was caught while trying to clean up lumis after the primary fatal exception.");
           e.addAdditionalInfo(message);
           if (e.alreadyPrinted()) {
             LogAbsolute("Additional Exceptions") << message;
@@ -776,7 +735,7 @@ namespace edm {
         throw;
       }
     }
-    
+
     return returnCode;
   }
 
@@ -788,12 +747,11 @@ namespace edm {
     principalCache_.preReadFile();
 
     fb_ = input_->readFile();
-    if(size < preg_->size()) {
+    if (size < preg_->size()) {
       principalCache_.adjustIndexesAfterProductRegistryAddition();
     }
     principalCache_.adjustEventsToNewProductRegistry(preg());
-    if(preallocations_.numberOfStreams()>1 and
-        preallocations_.numberOfThreads()>1) {
+    if (preallocations_.numberOfStreams() > 1 and preallocations_.numberOfThreads() > 1) {
       fb_->setNotFastClonable(FileBlock::ParallelProcesses);
     }
     sentry.completedSuccessfully();
@@ -811,7 +769,7 @@ namespace edm {
   void EventProcessor::openOutputFiles() {
     if (fb_.get() != nullptr) {
       schedule_->openOutputFiles(*fb_);
-      for_all(subProcesses_, [this](auto& subProcess){ subProcess.openOutputFiles(*fb_); });
+      for_all(subProcesses_, [this](auto& subProcess) { subProcess.openOutputFiles(*fb_); });
     }
     FDEBUG(1) << "\topenOutputFiles\n";
   }
@@ -819,13 +777,14 @@ namespace edm {
   void EventProcessor::closeOutputFiles() {
     if (fb_.get() != nullptr) {
       schedule_->closeOutputFiles();
-      for_all(subProcesses_, [](auto& subProcess){ subProcess.closeOutputFiles(); });
+      for_all(subProcesses_, [](auto& subProcess) { subProcess.closeOutputFiles(); });
     }
     FDEBUG(1) << "\tcloseOutputFiles\n";
   }
 
   void EventProcessor::respondToOpenInputFile() {
-    for_all(subProcesses_, [this](auto& subProcess){ subProcess.updateBranchIDListHelper(branchIDListHelper_->branchIDLists()); } );
+    for_all(subProcesses_,
+            [this](auto& subProcess) { subProcess.updateBranchIDListHelper(branchIDListHelper_->branchIDLists()); });
     if (fb_.get() != nullptr) {
       schedule_->respondToOpenInputFile(*fb_);
       for_all(subProcesses_, [this](auto& subProcess) { subProcess.respondToOpenInputFile(*fb_); });
@@ -836,7 +795,7 @@ namespace edm {
   void EventProcessor::respondToCloseInputFile() {
     if (fb_.get() != nullptr) {
       schedule_->respondToCloseInputFile(*fb_);
-      for_all(subProcesses_, [this](auto& subProcess){ subProcess.respondToCloseInputFile(*fb_); });
+      for_all(subProcesses_, [this](auto& subProcess) { subProcess.respondToCloseInputFile(*fb_); });
     }
     FDEBUG(1) << "\trespondToCloseInputFile\n";
   }
@@ -845,20 +804,22 @@ namespace edm {
     shouldWeStop_ = false;
     //NOTE: for first loop, need to delay calling 'doStartingNewLoop'
     // until after we've called beginOfJob
-    if(looper_ && looperBeginJobRun_) {
+    if (looper_ && looperBeginJobRun_) {
       looper_->doStartingNewLoop();
     }
     FDEBUG(1) << "\tstartingNewLoop\n";
   }
 
   bool EventProcessor::endOfLoop() {
-    if(looper_) {
-      ModuleChanger changer(schedule_.get(),preg_.get());
+    if (looper_) {
+      ModuleChanger changer(schedule_.get(), preg_.get(), esp_->recordsToProxyIndices());
       looper_->setModuleChanger(&changer);
       EDLooperBase::Status status = looper_->doEndOfLoop(esp_->eventSetup());
       looper_->setModuleChanger(nullptr);
-      if(status != EDLooperBase::kContinue || forceLooperToEnd_) return true;
-      else return false;
+      if (status != EDLooperBase::kContinue || forceLooperToEnd_)
+        return true;
+      else
+        return false;
     }
     FDEBUG(1) << "\tendOfLoop\n";
     return true;
@@ -877,9 +838,9 @@ namespace edm {
 
   bool EventProcessor::shouldWeCloseOutput() const {
     FDEBUG(1) << "\tshouldWeCloseOutput\n";
-    if(!subProcesses_.empty()) {
-      for(auto const& subProcess : subProcesses_) {
-        if(subProcess.shouldWeCloseOutput()) {
+    if (!subProcesses_.empty()) {
+      for (auto const& subProcess : subProcesses_) {
+        if (subProcess.shouldWeCloseOutput()) {
           return true;
         }
       }
@@ -890,15 +851,16 @@ namespace edm {
 
   void EventProcessor::doErrorStuff() {
     FDEBUG(1) << "\tdoErrorStuff\n";
-    LogError("StateMachine")
-      << "The EventProcessor state machine encountered an unexpected event\n"
-      << "and went to the error state\n"
-      << "Will attempt to terminate processing normally\n"
-      << "(IF using the looper the next loop will be attempted)\n"
-      << "This likely indicates a bug in an input module or corrupted input or both\n";
+    LogError("StateMachine") << "The EventProcessor state machine encountered an unexpected event\n"
+                             << "and went to the error state\n"
+                             << "Will attempt to terminate processing normally\n"
+                             << "(IF using the looper the next loop will be attempted)\n"
+                             << "This likely indicates a bug in an input module or corrupted input or both\n";
   }
-  
-  void EventProcessor::beginRun(ProcessHistoryID const& phid, RunNumber_t run, bool& globalBeginSucceeded,
+
+  void EventProcessor::beginRun(ProcessHistoryID const& phid,
+                                RunNumber_t run,
+                                bool& globalBeginSucceeded,
                                 bool& eventSetupForInstanceSucceeded) {
     globalBeginSucceeded = false;
     RunPrincipal& runPrincipal = principalCache_.runPrincipal(phid, run);
@@ -909,9 +871,8 @@ namespace edm {
       sentry.completedSuccessfully();
     }
 
-    IOVSyncValue ts(EventID(runPrincipal.run(), 0, 0),
-                    runPrincipal.beginTime());
-    if(forceESCacheClearOnNewRun_){
+    IOVSyncValue ts(EventID(runPrincipal.run(), 0, 0), runPrincipal.beginTime());
+    if (forceESCacheClearOnNewRun_) {
       espController_->forceCacheClear();
     }
     {
@@ -921,7 +882,7 @@ namespace edm {
       sentry.completedSuccessfully();
     }
     auto const& es = esp_->eventSetup();
-    if(looper_ && looperBeginJobRun_== false) {
+    if (looper_ && looperBeginJobRun_ == false) {
       looper_->copyInfo(ScheduleInfo(schedule_.get()));
       looper_->beginOfJob(es);
       looperBeginJobRun_ = true;
@@ -931,58 +892,55 @@ namespace edm {
       typedef OccurrenceTraits<RunPrincipal, BranchActionGlobalBegin> Traits;
       auto globalWaitTask = make_empty_waiting_task();
       globalWaitTask->increment_ref_count();
-      beginGlobalTransitionAsync<Traits>(WaitingTaskHolder(globalWaitTask.get()),
-                                         *schedule_,
-                                         runPrincipal,
-                                         ts,
-                                         es,
-                                         serviceToken_,
-                                         subProcesses_);
+      beginGlobalTransitionAsync<Traits>(
+          WaitingTaskHolder(globalWaitTask.get()), *schedule_, runPrincipal, ts, es, serviceToken_, subProcesses_);
       globalWaitTask->wait_for_all();
-      if(globalWaitTask->exceptionPtr() != nullptr) {
-        std::rethrow_exception(* (globalWaitTask->exceptionPtr()) );
+      if (globalWaitTask->exceptionPtr() != nullptr) {
+        std::rethrow_exception(*(globalWaitTask->exceptionPtr()));
       }
     }
     globalBeginSucceeded = true;
     FDEBUG(1) << "\tbeginRun " << run << "\n";
-    if(looper_) {
+    if (looper_) {
       looper_->doBeginRun(runPrincipal, es, &processContext_);
     }
     {
       //To wait, the ref count has to be 1+#streams
       auto streamLoopWaitTask = make_empty_waiting_task();
       streamLoopWaitTask->increment_ref_count();
-      
+
       typedef OccurrenceTraits<RunPrincipal, BranchActionStreamBegin> Traits;
-      
+
       beginStreamsTransitionAsync<Traits>(streamLoopWaitTask.get(),
-                                         *schedule_,
-                                         preallocations_.numberOfStreams(),
-                                         runPrincipal,
-                                         ts,
-                                         es,
-                                         serviceToken_,
-                                         subProcesses_);
+                                          *schedule_,
+                                          preallocations_.numberOfStreams(),
+                                          runPrincipal,
+                                          ts,
+                                          es,
+                                          serviceToken_,
+                                          subProcesses_);
 
       streamLoopWaitTask->wait_for_all();
-      if(streamLoopWaitTask->exceptionPtr() != nullptr) {
-        std::rethrow_exception(* (streamLoopWaitTask->exceptionPtr()) );
+      if (streamLoopWaitTask->exceptionPtr() != nullptr) {
+        std::rethrow_exception(*(streamLoopWaitTask->exceptionPtr()));
       }
     }
     FDEBUG(1) << "\tstreamBeginRun " << run << "\n";
-    if(looper_) {
+    if (looper_) {
       //looper_->doStreamBeginRun(schedule_->streamID(),runPrincipal, es);
     }
   }
 
-  void EventProcessor::endUnfinishedRun(ProcessHistoryID const& phid, RunNumber_t run,
-                                        bool globalBeginSucceeded, bool cleaningUpAfterException,
+  void EventProcessor::endUnfinishedRun(ProcessHistoryID const& phid,
+                                        RunNumber_t run,
+                                        bool globalBeginSucceeded,
+                                        bool cleaningUpAfterException,
                                         bool eventSetupForInstanceSucceeded) {
     if (eventSetupForInstanceSucceeded) {
       //If we skip empty runs, this would be called conditionally
       endRun(phid, run, globalBeginSucceeded, cleaningUpAfterException);
-    
-      if(globalBeginSucceeded) {
+
+      if (globalBeginSucceeded) {
         auto t = edm::make_empty_waiting_task();
         t->increment_ref_count();
         RunPrincipal& runPrincipal = principalCache_.runPrincipal(phid, run);
@@ -991,7 +949,7 @@ namespace edm {
         writeRunAsync(edm::WaitingTaskHolder{t.get()}, phid, run, mergeableRunProductMetadata);
         t->wait_for_all();
         mergeableRunProductMetadata->postWriteRun();
-        if(t->exceptionPtr()) {
+        if (t->exceptionPtr()) {
           std::rethrow_exception(*t->exceptionPtr());
         }
       }
@@ -999,42 +957,46 @@ namespace edm {
     deleteRunFromCache(phid, run);
   }
 
-  void EventProcessor::endRun(ProcessHistoryID const& phid, RunNumber_t run, bool globalBeginSucceeded, bool cleaningUpAfterException) {
+  void EventProcessor::endRun(ProcessHistoryID const& phid,
+                              RunNumber_t run,
+                              bool globalBeginSucceeded,
+                              bool cleaningUpAfterException) {
     RunPrincipal& runPrincipal = principalCache_.runPrincipal(phid, run);
     runPrincipal.setEndTime(input_->timestamp());
 
-    IOVSyncValue ts(EventID(runPrincipal.run(), LuminosityBlockID::maxLuminosityBlockNumber(), EventID::maxEventNumber()),
-                    runPrincipal.endTime());
+    IOVSyncValue ts(
+        EventID(runPrincipal.run(), LuminosityBlockID::maxLuminosityBlockNumber(), EventID::maxEventNumber()),
+        runPrincipal.endTime());
     {
       SendSourceTerminationSignalIfException sentry(actReg_.get());
       espController_->eventSetupForInstance(ts);
       sentry.completedSuccessfully();
     }
     auto const& es = esp_->eventSetup();
-    if(globalBeginSucceeded){
+    if (globalBeginSucceeded) {
       //To wait, the ref count has to be 1+#streams
       auto streamLoopWaitTask = make_empty_waiting_task();
       streamLoopWaitTask->increment_ref_count();
-      
+
       typedef OccurrenceTraits<RunPrincipal, BranchActionStreamEnd> Traits;
-      
+
       endStreamsTransitionAsync<Traits>(WaitingTaskHolder(streamLoopWaitTask.get()),
-                                       *schedule_,
-                                       preallocations_.numberOfStreams(),
-                                       runPrincipal,
-                                       ts,
-                                       es,
-                                       serviceToken_,
-                                       subProcesses_,
-                                       cleaningUpAfterException);
-      
+                                        *schedule_,
+                                        preallocations_.numberOfStreams(),
+                                        runPrincipal,
+                                        ts,
+                                        es,
+                                        serviceToken_,
+                                        subProcesses_,
+                                        cleaningUpAfterException);
+
       streamLoopWaitTask->wait_for_all();
-      if(streamLoopWaitTask->exceptionPtr() != nullptr) {
-        std::rethrow_exception(* (streamLoopWaitTask->exceptionPtr()) );
+      if (streamLoopWaitTask->exceptionPtr() != nullptr) {
+        std::rethrow_exception(*(streamLoopWaitTask->exceptionPtr()));
       }
     }
     FDEBUG(1) << "\tstreamEndRun " << run << "\n";
-    if(looper_) {
+    if (looper_) {
       //looper_->doStreamEndRun(schedule_->streamID(),runPrincipal, es);
     }
     {
@@ -1051,22 +1013,21 @@ namespace edm {
                                        subProcesses_,
                                        cleaningUpAfterException);
       globalWaitTask->wait_for_all();
-      if(globalWaitTask->exceptionPtr() != nullptr) {
-        std::rethrow_exception(* (globalWaitTask->exceptionPtr()) );
+      if (globalWaitTask->exceptionPtr() != nullptr) {
+        std::rethrow_exception(*(globalWaitTask->exceptionPtr()));
       }
     }
     FDEBUG(1) << "\tendRun " << run << "\n";
-    if(looper_) {
+    if (looper_) {
       looper_->doEndRun(runPrincipal, es, &processContext_);
     }
   }
- 
-  InputSource::ItemType
-  EventProcessor::processLumis(std::shared_ptr<void> const& iRunResource) {
+
+  InputSource::ItemType EventProcessor::processLumis(std::shared_ptr<void> const& iRunResource) {
     auto waitTask = make_empty_waiting_task();
     waitTask->increment_ref_count();
-    
-    if(streamLumiActive_> 0) {
+
+    if (streamLumiActive_ > 0) {
       assert(streamLumiActive_ == preallocations_.numberOfStreams());
       continueLumiAsync(WaitingTaskHolder{waitTask.get()});
     } else {
@@ -1076,23 +1037,26 @@ namespace edm {
                      WaitingTaskHolder{waitTask.get()});
     }
     waitTask->wait_for_all();
-    
-    if(waitTask->exceptionPtr() != nullptr) {
-      std::rethrow_exception(* (waitTask->exceptionPtr()) );
+
+    if (waitTask->exceptionPtr() != nullptr) {
+      std::rethrow_exception(*(waitTask->exceptionPtr()));
     }
     return lastTransitionType();
   }
-  
-  void
-  EventProcessor::beginLumiAsync(IOVSyncValue const& iSync,
-                                 std::shared_ptr<void> const& iRunResource, edm::WaitingTaskHolder iHolder) {
-    if(iHolder.taskHasFailed()) { return; }
-    
+
+  void EventProcessor::beginLumiAsync(IOVSyncValue const& iSync,
+                                      std::shared_ptr<void> const& iRunResource,
+                                      edm::WaitingTaskHolder iHolder) {
+    if (iHolder.taskHasFailed()) {
+      return;
+    }
+
     // We must be careful with the status object here and in code this function calls. IF we want
     // endRun to be called, then the status object must be destroyed before the things waiting on
     // iHolder are allowed to proceed. Otherwise, there will be race condition (possibly causing
     // endRun to be called much later than it should be, because it is holding iRunResource).
-    auto status= std::make_shared<LuminosityBlockProcessingStatus>(this, preallocations_.numberOfStreams(), iRunResource) ;
+    auto status =
+        std::make_shared<LuminosityBlockProcessingStatus>(this, preallocations_.numberOfStreams(), iRunResource);
 
     auto lumiWork = [this, iHolder, status = std::move(status)](edm::LimitedTaskQueue::Resumer iResumer) mutable {
       if (iHolder.taskHasFailed()) {
@@ -1118,99 +1082,92 @@ namespace edm {
           }
 
           Service<RandomNumberGenerator> rng;
-          if(rng.isAvailable()) {
+          if (rng.isAvailable()) {
             LuminosityBlock lb(lumiPrincipal, ModuleDescription(), nullptr, false);
             rng->preBeginLumi(lb);
           }
-          
+
           IOVSyncValue ts(EventID(lumiPrincipal.run(), lumiPrincipal.luminosityBlock(), 0), lumiPrincipal.beginTime());
 
           //Task to start the stream beginLumis
-          auto beginStreamsTask= make_waiting_task(tbb::task::allocate_root()
-                                                   ,[this, holder = iHolder, status = std::move(status), ts] (std::exception_ptr const* iPtr) mutable {
-            if (iPtr) {
-              status.reset();
-              holder.doneWaiting(*iPtr);
-            } else {
-
-              status->globalBeginDidSucceed();
-              auto const& es = esp_->eventSetup();
-              if(looper_) {
-                try {
-                  //make the services available
-                  ServiceRegistry::Operate operate(serviceToken_);
-                  looper_->doBeginLuminosityBlock(*(status->lumiPrincipal()), es, &processContext_);
-                }catch(...) {
+          auto beginStreamsTask = make_waiting_task(
+              tbb::task::allocate_root(),
+              [this, holder = iHolder, status = std::move(status), ts](std::exception_ptr const* iPtr) mutable {
+                if (iPtr) {
                   status.reset();
-                  holder.doneWaiting(std::current_exception());
-                  return;
-                }
-              }
-              typedef OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamBegin> Traits;
-              
-              for(unsigned int i=0; i<preallocations_.numberOfStreams();++i) {
-                streamQueues_[i].push([this,i,status,holder,ts,&es] () mutable {
-                  streamQueues_[i].pause();
-                  
-                  auto eventTask = edm::make_waiting_task(tbb::task::allocate_root(),
-                                                          [this,i,h = holder](std::exception_ptr const* iPtr) mutable
-                  {
-                    if(iPtr) {
-                      WaitingTaskHolder tmp(h);
-                      tmp.doneWaiting(*iPtr);
-                      streamEndLumiAsync(h, i, streamLumiStatus_[i]);
-                    } else {
-                      handleNextEventForStreamAsync(std::move(h), i);
+                  holder.doneWaiting(*iPtr);
+                } else {
+                  status->globalBeginDidSucceed();
+                  auto const& es = esp_->eventSetup();
+                  if (looper_) {
+                    try {
+                      //make the services available
+                      ServiceRegistry::Operate operate(serviceToken_);
+                      looper_->doBeginLuminosityBlock(*(status->lumiPrincipal()), es, &processContext_);
+                    } catch (...) {
+                      status.reset();
+                      holder.doneWaiting(std::current_exception());
+                      return;
                     }
-                  });
-                  auto& event = principalCache_.eventPrincipal(i);
-                  streamLumiStatus_[i] = status;
-                  ++streamLumiActive_;
-                  auto lp = status->lumiPrincipal();
-                  event.setLuminosityBlockPrincipal(lp.get());
-                  beginStreamTransitionAsync<Traits>(WaitingTaskHolder{eventTask},
-                                                     *schedule_,i,*lp,ts,es,
-                                                     serviceToken_,subProcesses_);
+                  }
+                  typedef OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamBegin> Traits;
+
+                  for (unsigned int i = 0; i < preallocations_.numberOfStreams(); ++i) {
+                    streamQueues_[i].push([this, i, status, holder, ts, &es]() mutable {
+                      streamQueues_[i].pause();
+
+                      auto eventTask = edm::make_waiting_task(
+                          tbb::task::allocate_root(), [this, i, h = holder](std::exception_ptr const* iPtr) mutable {
+                            if (iPtr) {
+                              WaitingTaskHolder tmp(h);
+                              tmp.doneWaiting(*iPtr);
+                              streamEndLumiAsync(h, i, streamLumiStatus_[i]);
+                            } else {
+                              handleNextEventForStreamAsync(std::move(h), i);
+                            }
+                          });
+                      auto& event = principalCache_.eventPrincipal(i);
+                      streamLumiStatus_[i] = status;
+                      ++streamLumiActive_;
+                      auto lp = status->lumiPrincipal();
+                      event.setLuminosityBlockPrincipal(lp.get());
+                      beginStreamTransitionAsync<Traits>(
+                          WaitingTaskHolder{eventTask}, *schedule_, i, *lp, ts, es, serviceToken_, subProcesses_);
+                      status.reset();
+                    });
+                  }
                   status.reset();
-                });
-              }
-              status.reset();
-            }
-          });  // beginStreamTask
+                }
+              });  // beginStreamTask
 
           //task to start the global begin lumi
           WaitingTaskHolder beginStreamsHolder{beginStreamsTask};
           auto const& es = esp_->eventSetup();
           {
             typedef OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalBegin> Traits;
-            beginGlobalTransitionAsync<Traits>(beginStreamsHolder,
-                                               *schedule_,
-                                               lumiPrincipal,
-                                               ts,
-                                               es,
-                                               serviceToken_,
-                                               subProcesses_);
+            beginGlobalTransitionAsync<Traits>(
+                beginStreamsHolder, *schedule_, lumiPrincipal, ts, es, serviceToken_, subProcesses_);
           }
-        } catch(...) {
+        } catch (...) {
           status.reset();
           iHolder.doneWaiting(std::current_exception());
         }
       });  // task in sourceResourcesAcquirer
-    };  // end lumiWork
-        
+    };     // end lumiWork
+
     //Safe to do check now since can not have multiple beginLumis at same time in this part of the code
     // because we do not attempt to read from the source again until we try to get the first event in a lumi
-    if(espController_->isWithinValidityInterval(iSync)) {
+    if (espController_->isWithinValidityInterval(iSync)) {
       iovQueue_.pause();
       lumiQueue_->pushAndPause(std::move(lumiWork));
     } else {
       //If EventSetup fails, need beginStreamsHolder in order to pass back exception
-      iovQueue_.push([this,iHolder,lumiWork,iSync]() mutable {
+      iovQueue_.push([this, iHolder, lumiWork, iSync]() mutable {
         try {
           SendSourceTerminationSignalIfException sentry(actReg_.get());
           espController_->eventSetupForInstance(iSync);
           sentry.completedSuccessfully();
-        } catch(...) {
+        } catch (...) {
           iHolder.doneWaiting(std::current_exception());
           return;
         }
@@ -1219,27 +1176,24 @@ namespace edm {
       });
     }
   }
-  
-  void
-  EventProcessor::continueLumiAsync(edm::WaitingTaskHolder iHolder) {
+
+  void EventProcessor::continueLumiAsync(edm::WaitingTaskHolder iHolder) {
     {
       //all streams are sharing the same status at the moment
-      auto status = streamLumiStatus_[0]; //read from streamLumiActive_ happened in calling routine
+      auto status = streamLumiStatus_[0];  //read from streamLumiActive_ happened in calling routine
       status->needToContinueLumi();
       status->startProcessingEvents();
     }
-    
+
     unsigned int streamIndex = 0;
-    for(; streamIndex< preallocations_.numberOfStreams()-1; ++streamIndex) {
-      tbb::task::enqueue( *edm::make_functor_task(tbb::task::allocate_root(),
-                                              [this,streamIndex,h = iHolder](){
+    for (; streamIndex < preallocations_.numberOfStreams() - 1; ++streamIndex) {
+      tbb::task::enqueue(*edm::make_functor_task(tbb::task::allocate_root(), [this, streamIndex, h = iHolder]() {
         handleNextEventForStreamAsync(std::move(h), streamIndex);
-      }) );
-
+      }));
     }
-    tbb::task::spawn( *edm::make_functor_task(tbb::task::allocate_root(),[this,streamIndex,h=std::move(iHolder)](){
-      handleNextEventForStreamAsync(std::move(h),streamIndex);
-    }) );
+    tbb::task::spawn(*edm::make_functor_task(tbb::task::allocate_root(), [this, streamIndex, h = std::move(iHolder)]() {
+      handleNextEventForStreamAsync(std::move(h), streamIndex);
+    }));
   }
 
   void EventProcessor::handleEndLumiExceptions(std::exception_ptr const* iPtr, WaitingTaskHolder& holder) {
@@ -1253,7 +1207,6 @@ namespace edm {
 
   void EventProcessor::globalEndLumiAsync(edm::WaitingTaskHolder iTask,
                                           std::shared_ptr<LuminosityBlockProcessingStatus> iLumiStatus) {
-
     // Get some needed info out of the status object before moving
     // it into finalTaskForThisLumi.
     auto& lp = *(iLumiStatus->lumiPrincipal());
@@ -1262,175 +1215,172 @@ namespace edm {
 
     auto finalTaskForThisLumi = edm::make_waiting_task(
         tbb::task::allocate_root(),
-        [status = std::move(iLumiStatus), iTask = std::move(iTask), this] (std::exception_ptr const* iPtr) mutable {
-
-      std::exception_ptr ptr;
-      if(iPtr) {
-        handleEndLumiExceptions(iPtr, iTask);
-      } else {
-        try {
-          ServiceRegistry::Operate operate(serviceToken_);
-          if(looper_) {
-            auto& lp = *(status->lumiPrincipal());
-            auto const& es = esp_->eventSetup();
-            looper_->doEndLuminosityBlock(lp, es, &processContext_);
+        [status = std::move(iLumiStatus), iTask = std::move(iTask), this](std::exception_ptr const* iPtr) mutable {
+          std::exception_ptr ptr;
+          if (iPtr) {
+            handleEndLumiExceptions(iPtr, iTask);
+          } else {
+            try {
+              ServiceRegistry::Operate operate(serviceToken_);
+              if (looper_) {
+                auto& lp = *(status->lumiPrincipal());
+                auto const& es = esp_->eventSetup();
+                looper_->doEndLuminosityBlock(lp, es, &processContext_);
+              }
+            } catch (...) {
+              ptr = std::current_exception();
+            }
           }
-        } catch(...) {
-          ptr = std::current_exception();
-        }
-      }
-      ServiceRegistry::Operate operate(serviceToken_);
+          ServiceRegistry::Operate operate(serviceToken_);
 
-      // Try hard to clean up resources so the
-      // process can terminate in a controlled
-      // fashion even after exceptions have occurred.
+          // Try hard to clean up resources so the
+          // process can terminate in a controlled
+          // fashion even after exceptions have occurred.
 
-      try {
-        deleteLumiFromCache(*status);
-      } catch(...) {
-        if (not ptr) {
-          ptr = std::current_exception();
-        }
-      }
+          try {
+            deleteLumiFromCache(*status);
+          } catch (...) {
+            if (not ptr) {
+              ptr = std::current_exception();
+            }
+          }
 
-      try {
-        //release our hold on the IOV
-        iovQueue_.resume();
-      } catch(...) {
-        if (not ptr) {
-          ptr = std::current_exception();
-        }
-      }
+          try {
+            //release our hold on the IOV
+            iovQueue_.resume();
+          } catch (...) {
+            if (not ptr) {
+              ptr = std::current_exception();
+            }
+          }
 
-      try {
-        status->resumeGlobalLumiQueue();
-      } catch(...) {
-        if (not ptr) {
-          ptr = std::current_exception();
-        }
-      }
+          try {
+            status->resumeGlobalLumiQueue();
+          } catch (...) {
+            if (not ptr) {
+              ptr = std::current_exception();
+            }
+          }
 
-      try {
-        // This call to status.reset() must occur before iTask is destroyed.
-        // Otherwise there will be a data race which could result in endRun
-        // being delayed until it is too late to successfully call it.
-        status.reset();
-      } catch(...) {
-        if (not ptr) {
-          ptr = std::current_exception();
-        }
-      }
+          try {
+            // This call to status.reset() must occur before iTask is destroyed.
+            // Otherwise there will be a data race which could result in endRun
+            // being delayed until it is too late to successfully call it.
+            status.reset();
+          } catch (...) {
+            if (not ptr) {
+              ptr = std::current_exception();
+            }
+          }
 
-      if (ptr) {
-        handleEndLumiExceptions(&ptr, iTask);
-      }
-    });
+          if (ptr) {
+            handleEndLumiExceptions(&ptr, iTask);
+          }
+        });
 
     auto writeT = edm::make_waiting_task(
         tbb::task::allocate_root(),
-        [this, didGlobalBeginSucceed, &lumiPrincipal = lp, task = WaitingTaskHolder(finalTaskForThisLumi)] (std::exception_ptr const* iExcept) mutable {
-
-      if(iExcept) {
-        task.doneWaiting(*iExcept);
-      } else {
-        //Only call writeLumi if beginLumi succeeded
-        if(didGlobalBeginSucceed) {
-          writeLumiAsync(std::move(task), lumiPrincipal);
-        }
-      }
-    });
-
-    IOVSyncValue ts(EventID(lp.run(), lp.luminosityBlock(), EventID::maxEventNumber()),
-                    lp.beginTime());
+        [this, didGlobalBeginSucceed, &lumiPrincipal = lp, task = WaitingTaskHolder(finalTaskForThisLumi)](
+            std::exception_ptr const* iExcept) mutable {
+          if (iExcept) {
+            task.doneWaiting(*iExcept);
+          } else {
+            //Only call writeLumi if beginLumi succeeded
+            if (didGlobalBeginSucceed) {
+              writeLumiAsync(std::move(task), lumiPrincipal);
+            }
+          }
+        });
 
+    IOVSyncValue ts(EventID(lp.run(), lp.luminosityBlock(), EventID::maxEventNumber()), lp.beginTime());
 
     typedef OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalEnd> Traits;
     auto const& es = esp_->eventSetup();
 
-    endGlobalTransitionAsync<Traits>(WaitingTaskHolder(writeT),
-                                     *schedule_,
-                                     lp,
-                                     ts,
-                                     es,
-                                     serviceToken_,
-                                     subProcesses_,
-                                     cleaningUpAfterException);
+    endGlobalTransitionAsync<Traits>(
+        WaitingTaskHolder(writeT), *schedule_, lp, ts, es, serviceToken_, subProcesses_, cleaningUpAfterException);
   }
 
   void EventProcessor::streamEndLumiAsync(edm::WaitingTaskHolder iTask,
                                           unsigned int iStreamIndex,
                                           std::shared_ptr<LuminosityBlockProcessingStatus> iLumiStatus) {
-    
-    auto t =edm::make_waiting_task(tbb::task::allocate_root(), [this, iStreamIndex, iTask](std::exception_ptr const* iPtr) mutable {
-      if(iPtr) {
-        handleEndLumiExceptions(iPtr, iTask);
-      }
-      auto status =streamLumiStatus_[iStreamIndex];
-      //reset status before releasing queue else get race condtion
-      streamLumiStatus_[iStreamIndex].reset();
-      --streamLumiActive_;
-      streamQueues_[iStreamIndex].resume();
-      
-      //are we the last one?
-      if( status->streamFinishedLumi()) {
-        globalEndLumiAsync(iTask, std::move(status));
-      } else {
-        status.reset();
-      }
-    });
+    auto t = edm::make_waiting_task(tbb::task::allocate_root(),
+                                    [this, iStreamIndex, iTask](std::exception_ptr const* iPtr) mutable {
+                                      if (iPtr) {
+                                        handleEndLumiExceptions(iPtr, iTask);
+                                      }
+                                      auto status = streamLumiStatus_[iStreamIndex];
+                                      //reset status before releasing queue else get race condtion
+                                      streamLumiStatus_[iStreamIndex].reset();
+                                      --streamLumiActive_;
+                                      streamQueues_[iStreamIndex].resume();
+
+                                      //are we the last one?
+                                      if (status->streamFinishedLumi()) {
+                                        globalEndLumiAsync(iTask, std::move(status));
+                                      } else {
+                                        status.reset();
+                                      }
+                                    });
 
     edm::WaitingTaskHolder lumiDoneTask{t};
-    
+
     iLumiStatus->setEndTime();
-    
-    if(iLumiStatus->didGlobalBeginSucceed()) {
-      auto & lumiPrincipal = *iLumiStatus->lumiPrincipal();
+
+    if (iLumiStatus->didGlobalBeginSucceed()) {
+      auto& lumiPrincipal = *iLumiStatus->lumiPrincipal();
       IOVSyncValue ts(EventID(lumiPrincipal.run(), lumiPrincipal.luminosityBlock(), EventID::maxEventNumber()),
                       lumiPrincipal.endTime());
       auto const& es = esp_->eventSetup();
 
       bool cleaningUpAfterException = iLumiStatus->cleaningUpAfterException();
-      
-      using Traits =  OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamEnd>;
+
+      using Traits = OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamEnd>;
       endStreamTransitionAsync<Traits>(std::move(lumiDoneTask),
-                                       *schedule_,iStreamIndex,
-                                       lumiPrincipal,ts,es,
+                                       *schedule_,
+                                       iStreamIndex,
+                                       lumiPrincipal,
+                                       ts,
+                                       es,
                                        serviceToken_,
-                                       subProcesses_,cleaningUpAfterException);
+                                       subProcesses_,
+                                       cleaningUpAfterException);
     }
     iLumiStatus.reset();
   }
 
-  
   void EventProcessor::endUnfinishedLumi() {
-    if(streamLumiActive_.load() > 0) {
+    if (streamLumiActive_.load() > 0) {
       auto globalWaitTask = make_empty_waiting_task();
       globalWaitTask->increment_ref_count();
       {
         WaitingTaskHolder globalTaskHolder{globalWaitTask.get()};
-        for(unsigned int i=0; i< preallocations_.numberOfStreams(); ++i) {
-          if(streamLumiStatus_[i]) {
+        for (unsigned int i = 0; i < preallocations_.numberOfStreams(); ++i) {
+          if (streamLumiStatus_[i]) {
             streamEndLumiAsync(globalTaskHolder, i, streamLumiStatus_[i]);
           }
         }
       }
       globalWaitTask->wait_for_all();
-      if(globalWaitTask->exceptionPtr() != nullptr) {
-        std::rethrow_exception(* (globalWaitTask->exceptionPtr()) );
+      if (globalWaitTask->exceptionPtr() != nullptr) {
+        std::rethrow_exception(*(globalWaitTask->exceptionPtr()));
       }
     }
   }
 
-  std::pair<ProcessHistoryID,RunNumber_t> EventProcessor::readRun() {
+  std::pair<ProcessHistoryID, RunNumber_t> EventProcessor::readRun() {
     if (principalCache_.hasRunPrincipal()) {
-      throw edm::Exception(edm::errors::LogicError)
-        << "EventProcessor::readRun\n"
-        << "Illegal attempt to insert run into cache\n"
-        << "Contact a Framework Developer\n";
-    }
-    auto rp = std::make_shared<RunPrincipal>(input_->runAuxiliary(), preg(),
-                                             *processConfiguration_, historyAppender_.get(),
-                                             0, true, &mergeableRunProductProcesses_);
+      throw edm::Exception(edm::errors::LogicError) << "EventProcessor::readRun\n"
+                                                    << "Illegal attempt to insert run into cache\n"
+                                                    << "Contact a Framework Developer\n";
+    }
+    auto rp = std::make_shared<RunPrincipal>(input_->runAuxiliary(),
+                                             preg(),
+                                             *processConfiguration_,
+                                             historyAppender_.get(),
+                                             0,
+                                             true,
+                                             &mergeableRunProductProcesses_);
     {
       SendSourceTerminationSignalIfException sentry(actReg_.get());
       input_->readRun(*rp, *historyAppender_);
@@ -1441,9 +1391,9 @@ namespace edm {
     return std::make_pair(rp->reducedProcessHistoryID(), input_->run());
   }
 
-  std::pair<ProcessHistoryID,RunNumber_t> EventProcessor::readAndMergeRun() {
+  std::pair<ProcessHistoryID, RunNumber_t> EventProcessor::readAndMergeRun() {
     principalCache_.merge(input_->runAuxiliary(), preg());
-    auto runPrincipal =principalCache_.runPrincipalPtr();
+    auto runPrincipal = principalCache_.runPrincipalPtr();
     {
       SendSourceTerminationSignalIfException sentry(actReg_.get());
       input_->readAndMergeRun(*runPrincipal);
@@ -1455,11 +1405,10 @@ namespace edm {
 
   void EventProcessor::readLuminosityBlock(LuminosityBlockProcessingStatus& iStatus) {
     if (!principalCache_.hasRunPrincipal()) {
-      throw edm::Exception(edm::errors::LogicError)
-        << "EventProcessor::readLuminosityBlock\n"
-        << "Illegal attempt to insert lumi into cache\n"
-        << "Run is invalid\n"
-        << "Contact a Framework Developer\n";
+      throw edm::Exception(edm::errors::LogicError) << "EventProcessor::readLuminosityBlock\n"
+                                                    << "Illegal attempt to insert lumi into cache\n"
+                                                    << "Run is invalid\n"
+                                                    << "Contact a Framework Developer\n";
     }
     auto lbp = principalCache_.getAvailableLumiPrincipalPtr();
     assert(lbp);
@@ -1476,7 +1425,9 @@ namespace edm {
   int EventProcessor::readAndMergeLumi(LuminosityBlockProcessingStatus& iStatus) {
     auto& lumiPrincipal = *iStatus.lumiPrincipal();
     assert(lumiPrincipal.aux().sameIdentity(*input_->luminosityBlockAuxiliary()) or
-           input_->processHistoryRegistry().reducedProcessHistoryID(lumiPrincipal.aux().processHistoryID()) == input_->processHistoryRegistry().reducedProcessHistoryID(input_->luminosityBlockAuxiliary()->processHistoryID()));
+           input_->processHistoryRegistry().reducedProcessHistoryID(lumiPrincipal.aux().processHistoryID()) ==
+               input_->processHistoryRegistry().reducedProcessHistoryID(
+                   input_->luminosityBlockAuxiliary()->processHistoryID()));
     bool lumiOK = lumiPrincipal.adjustToNewProductRegistry(*preg());
     assert(lumiOK);
     lumiPrincipal.mergeAuxiliary(*input_->luminosityBlockAuxiliary());
@@ -1488,41 +1439,48 @@ namespace edm {
     return input_->luminosityBlock();
   }
 
-  void EventProcessor::writeRunAsync(WaitingTaskHolder task, ProcessHistoryID const& phid, RunNumber_t run,
+  void EventProcessor::writeRunAsync(WaitingTaskHolder task,
+                                     ProcessHistoryID const& phid,
+                                     RunNumber_t run,
                                      MergeableRunProductMetadata const* mergeableRunProductMetadata) {
-    auto subsT = edm::make_waiting_task(tbb::task::allocate_root(), [this,phid,run,task,mergeableRunProductMetadata]
-                                                                    (std::exception_ptr const* iExcept) mutable {
-      if(iExcept) {
-        task.doneWaiting(*iExcept);
-      } else {
-        ServiceRegistry::Operate op(serviceToken_);
-        for(auto&s : subProcesses_) {
-          s.writeRunAsync(task,phid,run,mergeableRunProductMetadata);
-        }
-      }
-    });
+    auto subsT = edm::make_waiting_task(
+        tbb::task::allocate_root(),
+        [this, phid, run, task, mergeableRunProductMetadata](std::exception_ptr const* iExcept) mutable {
+          if (iExcept) {
+            task.doneWaiting(*iExcept);
+          } else {
+            ServiceRegistry::Operate op(serviceToken_);
+            for (auto& s : subProcesses_) {
+              s.writeRunAsync(task, phid, run, mergeableRunProductMetadata);
+            }
+          }
+        });
     ServiceRegistry::Operate op(serviceToken_);
-    schedule_->writeRunAsync(WaitingTaskHolder(subsT), principalCache_.runPrincipal(phid, run),
-                             &processContext_, actReg_.get(), mergeableRunProductMetadata);
+    schedule_->writeRunAsync(WaitingTaskHolder(subsT),
+                             principalCache_.runPrincipal(phid, run),
+                             &processContext_,
+                             actReg_.get(),
+                             mergeableRunProductMetadata);
   }
 
   void EventProcessor::deleteRunFromCache(ProcessHistoryID const& phid, RunNumber_t run) {
     principalCache_.deleteRun(phid, run);
-    for_all(subProcesses_, [run,phid](auto& subProcess){ subProcess.deleteRunFromCache(phid, run); });
+    for_all(subProcesses_, [run, phid](auto& subProcess) { subProcess.deleteRunFromCache(phid, run); });
     FDEBUG(1) << "\tdeleteRunFromCache " << run << "\n";
   }
 
   void EventProcessor::writeLumiAsync(WaitingTaskHolder task, LuminosityBlockPrincipal& lumiPrincipal) {
-    auto subsT = edm::make_waiting_task(tbb::task::allocate_root(), [this, task, &lumiPrincipal](std::exception_ptr const* iExcept) mutable {
-      if(iExcept) {
-        task.doneWaiting(*iExcept);
-      } else {
-        ServiceRegistry::Operate op(serviceToken_);
-        for(auto&s : subProcesses_) {
-          s.writeLumiAsync(task, lumiPrincipal);
-        }
-      }
-    });
+    auto subsT = edm::make_waiting_task(tbb::task::allocate_root(),
+                                        [this, task, &lumiPrincipal](std::exception_ptr const* iExcept) mutable {
+                                          if (iExcept) {
+                                            task.doneWaiting(*iExcept);
+                                          } else {
+                                            ServiceRegistry::Operate op(serviceToken_);
+                                            for (auto& s : subProcesses_) {
+                                              s.writeLumiAsync(task, lumiPrincipal);
+                                            }
+                                          }
+                                        });
     ServiceRegistry::Operate op(serviceToken_);
 
     lumiPrincipal.runPrincipal().mergeableRunProductMetadata()->writeLumi(lumiPrincipal.luminosityBlock());
@@ -1531,19 +1489,20 @@ namespace edm {
   }
 
   void EventProcessor::deleteLumiFromCache(LuminosityBlockProcessingStatus& iStatus) {
-    for(auto& s: subProcesses_) { s.deleteLumiFromCache(*iStatus.lumiPrincipal());}
+    for (auto& s : subProcesses_) {
+      s.deleteLumiFromCache(*iStatus.lumiPrincipal());
+    }
     iStatus.lumiPrincipal()->clearPrincipal();
     //FDEBUG(1) << "\tdeleteLumiFromCache " << run << "/" << lumi << "\n";
   }
 
-  bool EventProcessor::readNextEventForStream(unsigned int iStreamIndex,
-                                              LuminosityBlockProcessingStatus& iStatus) {
-    if(deferredExceptionPtrIsSet_.load(std::memory_order_acquire)) {
+  bool EventProcessor::readNextEventForStream(unsigned int iStreamIndex, LuminosityBlockProcessingStatus& iStatus) {
+    if (deferredExceptionPtrIsSet_.load(std::memory_order_acquire)) {
       iStatus.endLumi();
       return false;
     }
-    
-    if(iStatus.wasEventProcessingStopped()) {
+
+    if (iStatus.wasEventProcessingStopped()) {
       return false;
     }
 
@@ -1560,38 +1519,36 @@ namespace edm {
       // of delayed provenance reading and reading data in response to
       // edm::Refs etc
       std::lock_guard<std::recursive_mutex> guard(*(sourceMutex_.get()));
-      
-      auto itemType = iStatus.continuingLumi()? InputSource::IsLumi : nextTransitionType();
-      if(InputSource::IsLumi == itemType) {
+
+      auto itemType = iStatus.continuingLumi() ? InputSource::IsLumi : nextTransitionType();
+      if (InputSource::IsLumi == itemType) {
         iStatus.haveContinuedLumi();
-        while(itemType == InputSource::IsLumi and
-              iStatus.lumiPrincipal()->run() == input_->run() and
-              iStatus.lumiPrincipal()->luminosityBlock() == nextLuminosityBlockID()) {
+        while (itemType == InputSource::IsLumi and iStatus.lumiPrincipal()->run() == input_->run() and
+               iStatus.lumiPrincipal()->luminosityBlock() == nextLuminosityBlockID()) {
           readAndMergeLumi(iStatus);
           itemType = nextTransitionType();
         }
-        if(InputSource::IsLumi == itemType) {
+        if (InputSource::IsLumi == itemType) {
           iStatus.setNextSyncValue(IOVSyncValue(EventID(input_->run(), input_->luminosityBlock(), 0),
                                                 input_->luminosityBlockAuxiliary()->beginTime()));
         }
       }
-      if(InputSource::IsEvent != itemType) {
+      if (InputSource::IsEvent != itemType) {
         iStatus.stopProcessingEvents();
-        
+
         //IsFile may continue processing the lumi and
         // looper_ can cause the input source to declare a new IsRun which is actually
         // just a continuation of the previous run
-        if(InputSource::IsStop == itemType or
-           InputSource::IsLumi == itemType or
-           (InputSource::IsRun == itemType and iStatus.lumiPrincipal()->run() != input_->run())) {
+        if (InputSource::IsStop == itemType or InputSource::IsLumi == itemType or
+            (InputSource::IsRun == itemType and iStatus.lumiPrincipal()->run() != input_->run())) {
           iStatus.endLumi();
         }
         return false;
       }
       readEvent(iStreamIndex);
     } catch (...) {
-      bool expected =false;
-      if(deferredExceptionPtrIsSet_.compare_exchange_strong(expected,true)) {
+      bool expected = false;
+      if (deferredExceptionPtrIsSet_.compare_exchange_strong(expected, true)) {
         deferredExceptionPtr_ = std::current_exception();
         iStatus.endLumi();
       }
@@ -1599,60 +1556,59 @@ namespace edm {
     }
     return true;
   }
-  
-  void EventProcessor::handleNextEventForStreamAsync(WaitingTaskHolder iTask,
-                                                     unsigned int iStreamIndex)
-  {
-    sourceResourcesAcquirer_.serialQueueChain().push([this,iTask,iStreamIndex]() mutable {
-           ServiceRegistry::Operate operate(serviceToken_);
-           auto& status = streamLumiStatus_[iStreamIndex];
-           try {
-             if(readNextEventForStream(iStreamIndex, *status) ) {
-               auto recursionTask = make_waiting_task(tbb::task::allocate_root(), [this,iTask,iStreamIndex](std::exception_ptr const* iPtr) mutable {
-                 if(iPtr) {
-                   // Try to end the stream properly even if an exception was
-                   // thrown on an event.
-                   bool expected = false;
-                   if(deferredExceptionPtrIsSet_.compare_exchange_strong(expected,true)) {
-                     // This is the case where the exception in iPtr is the primary
-                     // exception and we want to see its message.
-                     deferredExceptionPtr_ = *iPtr;
-                     WaitingTaskHolder tempHolder(iTask);
-                     tempHolder.doneWaiting(*iPtr);
-                   }
-                   streamEndLumiAsync(std::move(iTask), iStreamIndex, streamLumiStatus_[iStreamIndex]);
-                   //the stream will stop now
-                   return;
-                 }
-                 handleNextEventForStreamAsync(std::move(iTask), iStreamIndex);
-               });
-
-               processEventAsync( WaitingTaskHolder(recursionTask), iStreamIndex);
-             } else {
-               //the stream will stop now
-               if(status->isLumiEnding()) {
-                 if(lastTransitionType() == InputSource::IsLumi and not status->haveStartedNextLumi()) {
-                   status->startNextLumi();
-                   beginLumiAsync(status->nextSyncValue(), status->runResource(), iTask);
-                 }
-                 streamEndLumiAsync(std::move(iTask),iStreamIndex, status);
-               } else {
-                 iTask.doneWaiting(std::exception_ptr{});
-               }
-             }
-           } catch(...) {
-             // It is unlikely we will ever get in here ...
-             // But if we do try to clean up and propagate the exception
-             if (streamLumiStatus_[iStreamIndex]) {
-               streamEndLumiAsync(iTask, iStreamIndex, streamLumiStatus_[iStreamIndex]);
-             }
-             bool expected = false;
-             if(deferredExceptionPtrIsSet_.compare_exchange_strong(expected,true)) {
-               auto e =std::current_exception();
-               deferredExceptionPtr_ = e;
-               iTask.doneWaiting(e);
-             }
-           }
+
+  void EventProcessor::handleNextEventForStreamAsync(WaitingTaskHolder iTask, unsigned int iStreamIndex) {
+    sourceResourcesAcquirer_.serialQueueChain().push([this, iTask, iStreamIndex]() mutable {
+      ServiceRegistry::Operate operate(serviceToken_);
+      auto& status = streamLumiStatus_[iStreamIndex];
+      try {
+        if (readNextEventForStream(iStreamIndex, *status)) {
+          auto recursionTask = make_waiting_task(
+              tbb::task::allocate_root(), [this, iTask, iStreamIndex](std::exception_ptr const* iPtr) mutable {
+                if (iPtr) {
+                  // Try to end the stream properly even if an exception was
+                  // thrown on an event.
+                  bool expected = false;
+                  if (deferredExceptionPtrIsSet_.compare_exchange_strong(expected, true)) {
+                    // This is the case where the exception in iPtr is the primary
+                    // exception and we want to see its message.
+                    deferredExceptionPtr_ = *iPtr;
+                    WaitingTaskHolder tempHolder(iTask);
+                    tempHolder.doneWaiting(*iPtr);
+                  }
+                  streamEndLumiAsync(std::move(iTask), iStreamIndex, streamLumiStatus_[iStreamIndex]);
+                  //the stream will stop now
+                  return;
+                }
+                handleNextEventForStreamAsync(std::move(iTask), iStreamIndex);
+              });
+
+          processEventAsync(WaitingTaskHolder(recursionTask), iStreamIndex);
+        } else {
+          //the stream will stop now
+          if (status->isLumiEnding()) {
+            if (lastTransitionType() == InputSource::IsLumi and not status->haveStartedNextLumi()) {
+              status->startNextLumi();
+              beginLumiAsync(status->nextSyncValue(), status->runResource(), iTask);
+            }
+            streamEndLumiAsync(std::move(iTask), iStreamIndex, status);
+          } else {
+            iTask.doneWaiting(std::exception_ptr{});
+          }
+        }
+      } catch (...) {
+        // It is unlikely we will ever get in here ...
+        // But if we do try to clean up and propagate the exception
+        if (streamLumiStatus_[iStreamIndex]) {
+          streamEndLumiAsync(iTask, iStreamIndex, streamLumiStatus_[iStreamIndex]);
+        }
+        bool expected = false;
+        if (deferredExceptionPtrIsSet_.compare_exchange_strong(expected, true)) {
+          auto e = std::current_exception();
+          deferredExceptionPtr_ = e;
+          iTask.doneWaiting(e);
+        }
+      }
     });
   }
 
@@ -1663,79 +1619,66 @@ namespace edm {
 
     SendSourceTerminationSignalIfException sentry(actReg_.get());
     input_->readEvent(event, streamContext);
-    
+
     streamLumiStatus_[iStreamIndex]->updateLastTimestamp(input_->timestamp());
     sentry.completedSuccessfully();
 
     FDEBUG(1) << "\treadEvent\n";
   }
 
-  void EventProcessor::processEventAsync(WaitingTaskHolder iHolder,
-                                         unsigned int iStreamIndex) {
-    tbb::task::spawn( *make_functor_task( tbb::task::allocate_root(), [=]() {
-      processEventAsyncImpl(iHolder, iStreamIndex);
-    }) );
+  void EventProcessor::processEventAsync(WaitingTaskHolder iHolder, unsigned int iStreamIndex) {
+    tbb::task::spawn(
+        *make_functor_task(tbb::task::allocate_root(), [=]() { processEventAsyncImpl(iHolder, iStreamIndex); }));
   }
-  
-  void EventProcessor::processEventAsyncImpl(WaitingTaskHolder iHolder,
-                                         unsigned int iStreamIndex) {
+
+  void EventProcessor::processEventAsyncImpl(WaitingTaskHolder iHolder, unsigned int iStreamIndex) {
     auto pep = &(principalCache_.eventPrincipal(iStreamIndex));
 
     ServiceRegistry::Operate operate(serviceToken_);
     Service<RandomNumberGenerator> rng;
-    if(rng.isAvailable()) {
+    if (rng.isAvailable()) {
       Event ev(*pep, ModuleDescription(), nullptr);
       rng->postEventRead(ev);
     }
-    
-    WaitingTaskHolder finalizeEventTask( make_waiting_task(
-                    tbb::task::allocate_root(),
-                    [this,pep,iHolder](std::exception_ptr const* iPtr) mutable
-             {
-
-               //NOTE: If we have a looper we only have one Stream
-               if(looper_) {
-                 ServiceRegistry::Operate operate(serviceToken_);
-                 processEventWithLooper(*pep);
-               }
-               
-               FDEBUG(1) << "\tprocessEvent\n";
-               pep->clearEventPrincipal();
-               if(iPtr) {
-                 iHolder.doneWaiting(*iPtr);
-               } else {
-                 iHolder.doneWaiting(std::exception_ptr());
-               }
-             }
-                                                           )
-                                        );
+
+    WaitingTaskHolder finalizeEventTask(
+        make_waiting_task(tbb::task::allocate_root(), [this, pep, iHolder](std::exception_ptr const* iPtr) mutable {
+          //NOTE: If we have a looper we only have one Stream
+          if (looper_) {
+            ServiceRegistry::Operate operate(serviceToken_);
+            processEventWithLooper(*pep);
+          }
+
+          FDEBUG(1) << "\tprocessEvent\n";
+          pep->clearEventPrincipal();
+          if (iPtr) {
+            iHolder.doneWaiting(*iPtr);
+          } else {
+            iHolder.doneWaiting(std::exception_ptr());
+          }
+        }));
     WaitingTaskHolder afterProcessTask;
-    if(subProcesses_.empty()) {
+    if (subProcesses_.empty()) {
       afterProcessTask = std::move(finalizeEventTask);
     } else {
       //Need to run SubProcesses after schedule has finished
       // with the event
-      afterProcessTask = WaitingTaskHolder(
-                   make_waiting_task(tbb::task::allocate_root(),
-                                     [this,pep,finalizeEventTask] (std::exception_ptr const* iPtr) mutable
-      {
-         if(not iPtr) {
-           //when run with 1 thread, we want to the order to be what
-           // it was before. This requires reversing the order since
-           // tasks are run last one in first one out
-           for(auto& subProcess: boost::adaptors::reverse(subProcesses_)) {
-             subProcess.doEventAsync(finalizeEventTask,*pep);
-           }
-         } else {
-           finalizeEventTask.doneWaiting(*iPtr);
-         }
-       })
-                                           );
-    }
-    
-    schedule_->processOneEventAsync(std::move(afterProcessTask),
-                                    iStreamIndex,*pep, esp_->eventSetup(), serviceToken_);
+      afterProcessTask = WaitingTaskHolder(make_waiting_task(
+          tbb::task::allocate_root(), [this, pep, finalizeEventTask](std::exception_ptr const* iPtr) mutable {
+            if (not iPtr) {
+              //when run with 1 thread, we want to the order to be what
+              // it was before. This requires reversing the order since
+              // tasks are run last one in first one out
+              for (auto& subProcess : boost::adaptors::reverse(subProcesses_)) {
+                subProcess.doEventAsync(finalizeEventTask, *pep);
+              }
+            } else {
+              finalizeEventTask.doneWaiting(*iPtr);
+            }
+          }));
+    }
 
+    schedule_->processOneEventAsync(std::move(afterProcessTask), iStreamIndex, *pep, esp_->eventSetup(), serviceToken_);
   }
 
   void EventProcessor::processEventWithLooper(EventPrincipal& iPrincipal) {
@@ -1743,36 +1686,35 @@ namespace edm {
     ProcessingController::ForwardState forwardState = input_->forwardState();
     ProcessingController::ReverseState reverseState = input_->reverseState();
     ProcessingController pc(forwardState, reverseState, randomAccess);
-    
+
     EDLooperBase::Status status = EDLooperBase::kContinue;
     do {
-      
       StreamContext streamContext(iPrincipal.streamID(), &processContext_);
       status = looper_->doDuringLoop(iPrincipal, esp_->eventSetup(), pc, &streamContext);
-      
+
       bool succeeded = true;
-      if(randomAccess) {
-        if(pc.requestedTransition() == ProcessingController::kToPreviousEvent) {
+      if (randomAccess) {
+        if (pc.requestedTransition() == ProcessingController::kToPreviousEvent) {
           input_->skipEvents(-2);
-        }
-        else if(pc.requestedTransition() == ProcessingController::kToSpecifiedEvent) {
+        } else if (pc.requestedTransition() == ProcessingController::kToSpecifiedEvent) {
           succeeded = input_->goToEvent(pc.specifiedEventTransition());
         }
       }
       pc.setLastOperationSucceeded(succeeded);
-    } while(!pc.lastOperationSucceeded());
-    if(status != EDLooperBase::kContinue) {
+    } while (!pc.lastOperationSucceeded());
+    if (status != EDLooperBase::kContinue) {
       shouldWeStop_ = true;
-      lastSourceTransition_=InputSource::IsStop;
+      lastSourceTransition_ = InputSource::IsStop;
     }
   }
 
   bool EventProcessor::shouldWeStop() const {
     FDEBUG(1) << "\tshouldWeStop\n";
-    if(shouldWeStop_) return true;
-    if(!subProcesses_.empty()) {
-      for(auto const& subProcess : subProcesses_) {
-        if(subProcess.terminate()) {
+    if (shouldWeStop_)
+      return true;
+    if (!subProcesses_.empty()) {
+      for (auto const& subProcess : subProcesses_) {
+        if (subProcess.terminate()) {
           return true;
         }
       }
@@ -1781,37 +1723,31 @@ namespace edm {
     return schedule_->terminate();
   }
 
-  void EventProcessor::setExceptionMessageFiles(std::string& message) {
-    exceptionMessageFiles_ = message;
-  }
+  void EventProcessor::setExceptionMessageFiles(std::string& message) { exceptionMessageFiles_ = message; }
 
-  void EventProcessor::setExceptionMessageRuns(std::string& message) {
-    exceptionMessageRuns_ = message;
-  }
+  void EventProcessor::setExceptionMessageRuns(std::string& message) { exceptionMessageRuns_ = message; }
 
-  void EventProcessor::setExceptionMessageLumis() {
-    exceptionMessageLumis_ = true;
-  }
+  void EventProcessor::setExceptionMessageLumis() { exceptionMessageLumis_ = true; }
 
   bool EventProcessor::setDeferredException(std::exception_ptr iException) {
-    bool expected =false;
-    if(deferredExceptionPtrIsSet_.compare_exchange_strong(expected,true)) {
+    bool expected = false;
+    if (deferredExceptionPtrIsSet_.compare_exchange_strong(expected, true)) {
       deferredExceptionPtr_ = iException;
       return true;
     }
     return false;
   }
-  
+
   void EventProcessor::warnAboutModulesRequiringLuminosityBLockSynchronization() const {
     std::unique_ptr<LogSystem> s;
-    for( auto worker: schedule_->allWorkers()) {
-      if( worker->wantsGlobalLuminosityBlocks() and worker->globalLuminosityBlocksQueue()) {
-        if(not s) {
+    for (auto worker : schedule_->allWorkers()) {
+      if (worker->wantsGlobalLuminosityBlocks() and worker->globalLuminosityBlocksQueue()) {
+        if (not s) {
           s = std::make_unique<LogSystem>("ModulesSynchingOnLumis");
-          (*s) <<"The following modules require synchronizing on LuminosityBlock boundaries:";
+          (*s) << "The following modules require synchronizing on LuminosityBlock boundaries:";
         }
-        (*s)<<"\n  "<<worker->description().moduleName()<<" "<<worker->description().moduleLabel();
+        (*s) << "\n  " << worker->description().moduleName() << " " << worker->description().moduleLabel();
       }
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/EventSelector.cc b/FWCore/Framework/src/EventSelector.cc
index 1b94b5a08fb60..0a232383ee7d7 100644
--- a/FWCore/Framework/src/EventSelector.cc
+++ b/FWCore/Framework/src/EventSelector.cc
@@ -31,7 +31,6 @@
 //                      EventSelector instance for each call (in static case)
 //
 
-
 #include "FWCore/Framework/interface/EventSelector.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Framework/interface/TriggerNamesService.h"
@@ -45,252 +44,233 @@
 #include <algorithm>
 #include <cassert>
 
-namespace edm
-{
+namespace edm {
   using Strings = EventSelector::Strings;
-  EventSelector::EventSelector(Strings const& pathspecs,
-			       Strings const& pathNames):
-    pathspecs_(initPathSpecs(pathspecs)),
-    results_from_current_process_(true),
-    accept_all_(initAcceptAll()),
-    absolute_acceptors_(),
-    conditional_acceptors_(),
-    exception_acceptors_(),
-    all_must_fail_(),
-    all_must_fail_noex_(),
-    psetID_(),
-    nPathNames_(0)
-  {
+  EventSelector::EventSelector(Strings const& pathspecs, Strings const& pathNames)
+      : pathspecs_(initPathSpecs(pathspecs)),
+        results_from_current_process_(true),
+        accept_all_(initAcceptAll()),
+        absolute_acceptors_(),
+        conditional_acceptors_(),
+        exception_acceptors_(),
+        all_must_fail_(),
+        all_must_fail_noex_(),
+        psetID_(),
+        nPathNames_(0) {
     initPathNames(pathNames);
   }
 
-  EventSelector::EventSelector(Strings const& pathspecs):
-    pathspecs_(initPathSpecs(pathspecs)),
-    results_from_current_process_(false),
-    accept_all_(initAcceptAll()),
-    absolute_acceptors_(),
-    conditional_acceptors_(),
-    exception_acceptors_(),
-    all_must_fail_(),
-    all_must_fail_noex_(),
-    psetID_(),
-    nPathNames_(0)
-  {
-  }
-
-  EventSelector::EventSelector(ParameterSet const& config, Strings const& pathNames):
-    pathspecs_(config.empty() ? Strings() : initPathSpecs(config.getParameter<Strings>("SelectEvents"))),
-    results_from_current_process_(true),
-    accept_all_(initAcceptAll()),
-    absolute_acceptors_(),
-    conditional_acceptors_(),
-    exception_acceptors_(),
-    all_must_fail_(),
-    all_must_fail_noex_(),
-    psetID_(),
-    nPathNames_(0)
-  {
+  EventSelector::EventSelector(Strings const& pathspecs)
+      : pathspecs_(initPathSpecs(pathspecs)),
+        results_from_current_process_(false),
+        accept_all_(initAcceptAll()),
+        absolute_acceptors_(),
+        conditional_acceptors_(),
+        exception_acceptors_(),
+        all_must_fail_(),
+        all_must_fail_noex_(),
+        psetID_(),
+        nPathNames_(0) {}
+
+  EventSelector::EventSelector(ParameterSet const& config, Strings const& pathNames)
+      : pathspecs_(config.empty() ? Strings() : initPathSpecs(config.getParameter<Strings>("SelectEvents"))),
+        results_from_current_process_(true),
+        accept_all_(initAcceptAll()),
+        absolute_acceptors_(),
+        conditional_acceptors_(),
+        exception_acceptors_(),
+        all_must_fail_(),
+        all_must_fail_noex_(),
+        psetID_(),
+        nPathNames_(0) {
     initPathNames(pathNames);
   }
 
-  Strings
-  EventSelector::initPathSpecs(Strings const& pathSpecs) {
+  Strings EventSelector::initPathSpecs(Strings const& pathSpecs) {
     Strings trimmedPathSpecs(pathSpecs);
-    for(auto& pathspecifier : trimmedPathSpecs) {
-      boost::erase_all(pathspecifier, " \t"); // whitespace eliminated
+    for (auto& pathspecifier : trimmedPathSpecs) {
+      boost::erase_all(pathspecifier, " \t");  // whitespace eliminated
     }
     // Return value optimization should avoid another copy;
     return trimmedPathSpecs;
   }
 
-  bool
-  EventSelector::initAcceptAll() {
+  bool EventSelector::initAcceptAll() {
     if (pathspecs_.empty()) {
       return true;
     }
     // The following are for the purpose of establishing accept_all_ by
     // virtue of an inclusive set of paths:
     bool unrestricted_star = false;
-    bool negated_star      = false;
-    bool exception_star    = false;
+    bool negated_star = false;
+    bool exception_star = false;
 
-    for(auto const& pathspecifier : pathspecs_) {
-      if (pathspecifier == "*")           unrestricted_star = true;
-      if (pathspecifier == "!*")          negated_star = true;
-      if (pathspecifier == "exception@*") exception_star = true;
+    for (auto const& pathspecifier : pathspecs_) {
+      if (pathspecifier == "*")
+        unrestricted_star = true;
+      if (pathspecifier == "!*")
+        negated_star = true;
+      if (pathspecifier == "exception@*")
+        exception_star = true;
     }
     return (unrestricted_star && negated_star && exception_star);
   }
 
-  void
-  EventSelector::initPathNames(Strings const& pathNames) {
-    if(accept_all_) {
+  void EventSelector::initPathNames(Strings const& pathNames) {
+    if (accept_all_) {
       return;
     }
     // std::cerr << "### init entered\n";
-    absolute_acceptors_.clear(),
-    conditional_acceptors_.clear(),
-    exception_acceptors_.clear(),
-    all_must_fail_.clear();
+    absolute_acceptors_.clear(), conditional_acceptors_.clear(), exception_acceptors_.clear(), all_must_fail_.clear();
     all_must_fail_noex_.clear();
     nPathNames_ = pathNames.size();
 
-    for(auto const& pathspecifier : pathspecs_) {
+    for (auto const& pathspecifier : pathspecs_) {
       std::string basePathSpec(pathspecifier);
       bool noex_demanded = false;
-      std::string::size_type
-	      and_noexception = pathspecifier.find("&noexception");
+      std::string::size_type and_noexception = pathspecifier.find("&noexception");
       if (and_noexception != std::string::npos) {
-	basePathSpec = pathspecifier.substr(0,and_noexception);
+        basePathSpec = pathspecifier.substr(0, and_noexception);
         noex_demanded = true;
       }
       std::string::size_type and_noex = pathspecifier.find("&noex");
       if (and_noex != std::string::npos) {
-	basePathSpec = pathspecifier.substr(0,and_noexception);
+        basePathSpec = pathspecifier.substr(0, and_noexception);
         noex_demanded = true;
       }
       and_noexception = basePathSpec.find("&noexception");
-      and_noex = basePathSpec.find("&noex");	
-      if (and_noexception != std::string::npos ||
-	   and_noex != std::string::npos)
-          throw edm::Exception(errors::Configuration)
-            << "EventSelector::init, An OutputModule is using SelectEvents\n"
-               "to request a trigger name, but specifying &noexceptions twice\n"
-            << "The improper trigger name is: " << pathspecifier << "\n";
+      and_noex = basePathSpec.find("&noex");
+      if (and_noexception != std::string::npos || and_noex != std::string::npos)
+        throw edm::Exception(errors::Configuration) << "EventSelector::init, An OutputModule is using SelectEvents\n"
+                                                       "to request a trigger name, but specifying &noexceptions twice\n"
+                                                    << "The improper trigger name is: " << pathspecifier << "\n";
 
       std::string realname(basePathSpec);
       bool negative_criterion = false;
       if (basePathSpec[0] == '!') {
-	negative_criterion = true;
-	realname = basePathSpec.substr(1,std::string::npos);
+        negative_criterion = true;
+        realname = basePathSpec.substr(1, std::string::npos);
       }
       bool exception_spec = false;
       if (realname.find("exception@") == 0) {
-	exception_spec = true;
-	realname = realname.substr(10, std::string::npos);
-	// strip off 10 chars, which is length of "exception@"
-      }	
-      if (negative_criterion &&  exception_spec)
-          throw edm::Exception(errors::Configuration)
-            << "EventSelector::init, An OutputModule is using SelectEvents\n"
-               "to request a trigger name starting with !exception@.\n"
-	       "This is not supported.\n"
-            << "The improper trigger name is: " << pathspecifier << "\n";
-      if (noex_demanded &&  exception_spec)
-          throw edm::Exception(errors::Configuration)
-            << "EventSelector::init, An OutputModule is using SelectEvents\n"
-               "to request a trigger name starting with exception@ "
-	       "and also demanding no &exceptions.\n"
-            << "The improper trigger name is: " << pathspecifier << "\n";
-
+        exception_spec = true;
+        realname = realname.substr(10, std::string::npos);
+        // strip off 10 chars, which is length of "exception@"
+      }
+      if (negative_criterion && exception_spec)
+        throw edm::Exception(errors::Configuration) << "EventSelector::init, An OutputModule is using SelectEvents\n"
+                                                       "to request a trigger name starting with !exception@.\n"
+                                                       "This is not supported.\n"
+                                                    << "The improper trigger name is: " << pathspecifier << "\n";
+      if (noex_demanded && exception_spec)
+        throw edm::Exception(errors::Configuration) << "EventSelector::init, An OutputModule is using SelectEvents\n"
+                                                       "to request a trigger name starting with exception@ "
+                                                       "and also demanding no &exceptions.\n"
+                                                    << "The improper trigger name is: " << pathspecifier << "\n";
 
       // instead of "see if the name can be found in the full list of paths"
-      // we want to find all paths that match this name.	
-      std::vector<Strings::const_iterator> matches =
-	      regexMatch(pathNames, realname);
+      // we want to find all paths that match this name.
+      std::vector<Strings::const_iterator> matches = regexMatch(pathNames, realname);
 
-      if (matches.empty() && !is_glob(realname))
-      {
-          throw edm::Exception(errors::Configuration)
-            << "EventSelector::init, An OutputModule is using SelectEvents\n"
-               "to request a trigger name that does not exist\n"
-            << "The unknown trigger name is: " << realname << "\n";
+      if (matches.empty() && !is_glob(realname)) {
+        throw edm::Exception(errors::Configuration) << "EventSelector::init, An OutputModule is using SelectEvents\n"
+                                                       "to request a trigger name that does not exist\n"
+                                                    << "The unknown trigger name is: " << realname << "\n";
       }
-      if (matches.empty() && is_glob(realname))
-      {
-          LogWarning("Configuration")
-            << "EventSelector::init, An OutputModule is using SelectEvents\n"
-               "to request a wildcarded trigger name that does not match any trigger \n"
-            << "The wildcarded trigger name is: " << realname << "\n";
+      if (matches.empty() && is_glob(realname)) {
+        LogWarning("Configuration") << "EventSelector::init, An OutputModule is using SelectEvents\n"
+                                       "to request a wildcarded trigger name that does not match any trigger \n"
+                                    << "The wildcarded trigger name is: " << realname << "\n";
       }
 
       if (!negative_criterion && !noex_demanded && !exception_spec) {
-	for (unsigned int t = 0; t != matches.size(); ++t) {
-	  BitInfo bi(distance(pathNames.begin(),matches[t]), true);
-	  absolute_acceptors_.push_back(bi);
-	}
+        for (unsigned int t = 0; t != matches.size(); ++t) {
+          BitInfo bi(distance(pathNames.begin(), matches[t]), true);
+          absolute_acceptors_.push_back(bi);
+        }
       } else if (!negative_criterion && noex_demanded) {
-	for (unsigned int t = 0; t != matches.size(); ++t) {
-	  BitInfo bi(distance(pathNames.begin(),matches[t]), true);
-	  conditional_acceptors_.push_back(bi);
-	}
+        for (unsigned int t = 0; t != matches.size(); ++t) {
+          BitInfo bi(distance(pathNames.begin(), matches[t]), true);
+          conditional_acceptors_.push_back(bi);
+        }
       } else if (exception_spec) {
-	for (unsigned int t = 0; t != matches.size(); ++t) {
-	  BitInfo bi(distance(pathNames.begin(),matches[t]), true);
-	  exception_acceptors_.push_back(bi);
-	}
+        for (unsigned int t = 0; t != matches.size(); ++t) {
+          BitInfo bi(distance(pathNames.begin(), matches[t]), true);
+          exception_acceptors_.push_back(bi);
+        }
       } else if (negative_criterion && !noex_demanded) {
-	if (matches.empty()) {
-            throw edm::Exception(errors::Configuration)
-            << "EventSelector::init, An OutputModule is using SelectEvents\n"
-               "to request all fails on a set of trigger names that do not exist\n"
-            << "The problematic name is: " << pathspecifier << "\n";
-
-	} else if (matches.size() == 1) {
-	  BitInfo bi(distance(pathNames.begin(),matches[0]), false);
-	  absolute_acceptors_.push_back(bi);
-	} else {
-	  Bits mustfail;
-	  for (unsigned int t = 0; t != matches.size(); ++t) {
-	    BitInfo bi(distance(pathNames.begin(),matches[t]), false);
-	    // We set this to false because that will demand bits are Fail.
-	    mustfail.push_back(bi);
-	  }
-	  all_must_fail_.push_back(mustfail);
-	} 	
+        if (matches.empty()) {
+          throw edm::Exception(errors::Configuration)
+              << "EventSelector::init, An OutputModule is using SelectEvents\n"
+                 "to request all fails on a set of trigger names that do not exist\n"
+              << "The problematic name is: " << pathspecifier << "\n";
+
+        } else if (matches.size() == 1) {
+          BitInfo bi(distance(pathNames.begin(), matches[0]), false);
+          absolute_acceptors_.push_back(bi);
+        } else {
+          Bits mustfail;
+          for (unsigned int t = 0; t != matches.size(); ++t) {
+            BitInfo bi(distance(pathNames.begin(), matches[t]), false);
+            // We set this to false because that will demand bits are Fail.
+            mustfail.push_back(bi);
+          }
+          all_must_fail_.push_back(mustfail);
+        }
       } else if (negative_criterion && noex_demanded) {
-	if (matches.empty()) {
-            throw edm::Exception(errors::Configuration)
-            << "EventSelector::init, An OutputModule is using SelectEvents\n"
-               "to request all fails on a set of trigger names that do not exist\n"
-            << "The problematic name is: " << pathspecifier << "\n";
-
-	} else if (matches.size() == 1) {
-	  BitInfo bi(distance(pathNames.begin(),matches[0]), false);
-	  conditional_acceptors_.push_back(bi);
-	} else {
-	  Bits mustfail;
-	  for (unsigned int t = 0; t != matches.size(); ++t) {
-	    BitInfo bi(distance(pathNames.begin(),matches[t]), false);
-	    mustfail.push_back(bi);
-	  }
-	  all_must_fail_noex_.push_back(mustfail);
-	}
+        if (matches.empty()) {
+          throw edm::Exception(errors::Configuration)
+              << "EventSelector::init, An OutputModule is using SelectEvents\n"
+                 "to request all fails on a set of trigger names that do not exist\n"
+              << "The problematic name is: " << pathspecifier << "\n";
+
+        } else if (matches.size() == 1) {
+          BitInfo bi(distance(pathNames.begin(), matches[0]), false);
+          conditional_acceptors_.push_back(bi);
+        } else {
+          Bits mustfail;
+          for (unsigned int t = 0; t != matches.size(); ++t) {
+            BitInfo bi(distance(pathNames.begin(), matches[t]), false);
+            mustfail.push_back(bi);
+          }
+          all_must_fail_noex_.push_back(mustfail);
+        }
       }
-    } // end of the for loop on pathspecs
+    }  // end of the for loop on pathspecs
 
     // std::cerr << "### init exited\n";
 
-  } // EventSelector::init
+  }  // EventSelector::init
 
   bool EventSelector::acceptEvent(TriggerResults const& tr) {
-    if (accept_all_) return true;
+    if (accept_all_)
+      return true;
 
     if (!results_from_current_process_) {
       // The path names for prior processes may be different in different runs.
       // Check for this, and modify the selector accordingly if necessary.
       if (!psetID_.isValid() || psetID_ != tr.parameterSetID()) {
-         Strings pathNames;
-         bool fromPSetRegistry = false;
-         Service<service::TriggerNamesService> tns;
-         if (tns->getTrigPaths(tr, pathNames, fromPSetRegistry)) {
-           initPathNames(pathNames);
-           if (fromPSetRegistry) {
-             psetID_ = tr.parameterSetID();
-           } else {
-             // This can only happen for very old data, when the path names were stored
-             // in TriggerResults itself, rather than in the parameter set registry.
-             psetID_.reset();
-           }
-         } else {
-           // This should never happen
-           throw edm::Exception(errors::Unknown)
-             << "EventSelector::acceptEvent cannot find the trigger names for\n"
-                "a process for which the configuration has requested that the\n"
-                "OutputModule use TriggerResults to select events from.  This should\n"
-                "be impossible, please send information to reproduce this problem to\n"
-                "the edm developers.\n"; 
-         }
+        Strings pathNames;
+        bool fromPSetRegistry = false;
+        Service<service::TriggerNamesService> tns;
+        if (tns->getTrigPaths(tr, pathNames, fromPSetRegistry)) {
+          initPathNames(pathNames);
+          if (fromPSetRegistry) {
+            psetID_ = tr.parameterSetID();
+          } else {
+            // This can only happen for very old data, when the path names were stored
+            // in TriggerResults itself, rather than in the parameter set registry.
+            psetID_.reset();
+          }
+        } else {
+          // This should never happen
+          throw edm::Exception(errors::Unknown)
+              << "EventSelector::acceptEvent cannot find the trigger names for\n"
+                 "a process for which the configuration has requested that the\n"
+                 "OutputModule use TriggerResults to select events from.  This should\n"
+                 "be impossible, please send information to reproduce this problem to\n"
+                 "the edm developers.\n";
+        }
       }
     }
 
@@ -299,31 +279,26 @@ namespace edm
 
     return selectionDecision(tr);
 
-  } // acceptEvent(TriggerResults const& tr)
-
-  bool
-  EventSelector::acceptEvent(unsigned char const* array_of_trigger_results,
-  			     int number_of_trigger_paths) const
-  {
+  }  // acceptEvent(TriggerResults const& tr)
 
+  bool EventSelector::acceptEvent(unsigned char const* array_of_trigger_results, int number_of_trigger_paths) const {
     // This should never occur unless someone uses this function in
     // an incorrect way ...
     if (!results_from_current_process_) {
-      throw edm::Exception(errors::Configuration)
-        << "\nEventSelector.cc::acceptEvent, you are attempting to\n"
-        << "use a bit array for trigger results instead of the\n"
-        << "TriggerResults object for a previous process.  This\n"
-        << "will not work and ought to be impossible\n";
+      throw edm::Exception(errors::Configuration) << "\nEventSelector.cc::acceptEvent, you are attempting to\n"
+                                                  << "use a bit array for trigger results instead of the\n"
+                                                  << "TriggerResults object for a previous process.  This\n"
+                                                  << "will not work and ought to be impossible\n";
     }
 
-    if (accept_all_) return true;
+    if (accept_all_)
+      return true;
 
     // Form HLTGlobalStatus object to represent the array_of_trigger_results
     HLTGlobalStatus tr(number_of_trigger_paths);
     int byteIndex = 0;
-    int subIndex  = 0;
-    for (int pathIndex = 0; pathIndex < number_of_trigger_paths; ++pathIndex)
-    {
+    int subIndex = 0;
+    for (int pathIndex = 0; pathIndex < number_of_trigger_paths; ++pathIndex) {
       int state = array_of_trigger_results[byteIndex] >> (subIndex * 2);
       state &= 0x3;
       HLTPathStatus pathStatus(static_cast<hlt::HLTState>(state));
@@ -340,32 +315,34 @@ namespace edm
 
     return selectionDecision(tr);
 
-  } // acceptEvent(array_of_trigger_results, number_of_trigger_paths)
+  }  // acceptEvent(array_of_trigger_results, number_of_trigger_paths)
 
-  bool
-  EventSelector::selectionDecision(HLTGlobalStatus const& tr) const
-  {
-    if (accept_all_) return true;
+  bool EventSelector::selectionDecision(HLTGlobalStatus const& tr) const {
+    if (accept_all_)
+      return true;
 
     bool exceptionPresent = false;
     bool exceptionsLookedFor = false;
 
-    if (acceptOneBit(absolute_acceptors_, tr)) return true;
+    if (acceptOneBit(absolute_acceptors_, tr))
+      return true;
     if (acceptOneBit(conditional_acceptors_, tr)) {
       exceptionPresent = containsExceptions(tr);
-      if (!exceptionPresent) return true;
+      if (!exceptionPresent)
+        return true;
       exceptionsLookedFor = true;
     }
-    if (acceptOneBit(exception_acceptors_, tr, hlt::Exception)) return true;
+    if (acceptOneBit(exception_acceptors_, tr, hlt::Exception))
+      return true;
 
-    for (auto const& bit : all_must_fail_)
-    {
-      if (acceptAllBits(bit, tr)) return true;
+    for (auto const& bit : all_must_fail_) {
+      if (acceptAllBits(bit, tr))
+        return true;
     }
-    for (auto const& bitn : all_must_fail_noex_)
-    {
+    for (auto const& bitn : all_must_fail_noex_) {
       if (acceptAllBits(bitn, tr)) {
-        if (!exceptionsLookedFor) exceptionPresent = containsExceptions(tr);
+        if (!exceptionsLookedFor)
+          exceptionPresent = containsExceptions(tr);
         return (!exceptionPresent);
       }
     }
@@ -377,46 +354,36 @@ namespace edm
 
   }  // selectionDecision()
 
-// Obsolete...
-  bool EventSelector::acceptTriggerPath(HLTPathStatus const& pathStatus,
-                                        BitInfo const& pathInfo) const
-  {
-    return (((pathStatus.state()==hlt::Pass) && (pathInfo.accept_state_)) ||
-            ((pathStatus.state()==hlt::Fail) && !(pathInfo.accept_state_)) ||
-            ((pathStatus.state()==hlt::Exception)));
+  // Obsolete...
+  bool EventSelector::acceptTriggerPath(HLTPathStatus const& pathStatus, BitInfo const& pathInfo) const {
+    return (((pathStatus.state() == hlt::Pass) && (pathInfo.accept_state_)) ||
+            ((pathStatus.state() == hlt::Fail) && !(pathInfo.accept_state_)) ||
+            ((pathStatus.state() == hlt::Exception)));
   }
 
   // Indicate if any bit in the trigger results matches the desired value
   // at that position, based on the Bits array.  If s is Exception, this
   // looks for a Exceptionmatch; otherwise, true-->Pass, false-->Fail.
-  bool
-  EventSelector::acceptOneBit(Bits const& b,
-    		       	       HLTGlobalStatus const& tr,
-    		               hlt::HLTState const& s) const
-  {
+  bool EventSelector::acceptOneBit(Bits const& b, HLTGlobalStatus const& tr, hlt::HLTState const& s) const {
     bool lookForException = (s == hlt::Exception);
-    for(auto const& bit : b) {
-      hlt::HLTState bstate =
-          lookForException ? hlt::Exception
-      			   : bit.accept_state_ ? hlt::Pass
-				               : hlt::Fail;
-      if (tr[bit.pos_].state() == bstate) return true;
+    for (auto const& bit : b) {
+      hlt::HLTState bstate = lookForException ? hlt::Exception : bit.accept_state_ ? hlt::Pass : hlt::Fail;
+      if (tr[bit.pos_].state() == bstate)
+        return true;
     }
     return false;
-  } // acceptOneBit			
+  }  // acceptOneBit
 
   // Indicate if *every* bit in the trigger results matches the desired value
   // at that position, based on the Bits array: true-->Pass, false-->Fail.
-  bool
-  EventSelector::acceptAllBits(Bits const& b,
-    		        	HLTGlobalStatus const& tr) const
-  {
-    for(auto const& bit : b) {
+  bool EventSelector::acceptAllBits(Bits const& b, HLTGlobalStatus const& tr) const {
+    for (auto const& bit : b) {
       hlt::HLTState bstate = bit.accept_state_ ? hlt::Pass : hlt::Fail;
-      if (tr[bit.pos_].state() != bstate) return false;
+      if (tr[bit.pos_].state() != bstate)
+        return false;
     }
     return true;
-  } // acceptAllBits			
+  }  // acceptAllBits
 
   /**
    * Tests if the specified trigger selection list (pathspecs) is valid
@@ -433,20 +400,16 @@ namespace edm
    * @param fullPathList The full list of path names (vector of string).
    * @return true if the selection list is valid, false otherwise.
    */
-  bool EventSelector::selectionIsValid(Strings const& pathspecs,
-                                       Strings const& fullPathList)
-  {
+  bool EventSelector::selectionIsValid(Strings const& pathspecs, Strings const& fullPathList) {
     // an empty selection list is not valid
     // (we default an empty "SelectEvents" parameter to {"*","!*"} in
     // the getEventSelectionVString method below to help avoid this)
-    if (pathspecs.empty())
-    {
+    if (pathspecs.empty()) {
       return false;
     }
 
     // loop over each element in the selection list
-    for (unsigned int idx = 0; idx < pathspecs.size(); idx++)
-    {
+    for (unsigned int idx = 0; idx < pathspecs.size(); idx++) {
       Strings workingList;
       workingList.push_back(pathspecs[idx]);
 
@@ -454,8 +417,7 @@ namespace edm
       // (and anywhere else) and mark those as failures.
       // The EventSelector constructor seems to do the work of
       // checking if the selection is outside the full trigger list.
-      try
-      {
+      try {
         // create an EventSelector instance for this selection
         EventSelector evtSelector(workingList, fullPathList);
 
@@ -466,16 +428,11 @@ namespace edm
 
         // loop over each path
         bool oneResultMatched = false;
-        for (unsigned int iPath = 0; iPath < fullPathCount; iPath++)
-        {
+        for (unsigned int iPath = 0; iPath < fullPathCount; iPath++) {
           // loop over the possible values for the path status
-          for (int iState = static_cast<int>(hlt::Pass);
-               iState <= static_cast<int>(hlt::Exception);
-               iState++)
-          {
+          for (int iState = static_cast<int>(hlt::Pass); iState <= static_cast<int>(hlt::Exception); iState++) {
             sampleResults[iPath] = HLTPathStatus(static_cast<hlt::HLTState>(iState), 0);
-            if (evtSelector.wantAll() || evtSelector.acceptEvent(sampleResults))
-            {
+            if (evtSelector.wantAll() || evtSelector.acceptEvent(sampleResults)) {
               oneResultMatched = true;
               break;
             }
@@ -483,31 +440,29 @@ namespace edm
             sampleResults.reset(iPath);
           }
 
-          if (oneResultMatched) break;
+          if (oneResultMatched)
+            break;
         }
 
-	// Finally, check in case the selection element was a wildcarded
-	// negative such as "!*":
-	
-        if (!oneResultMatched)  {
-	  for (unsigned int iPath = 0; iPath < fullPathCount; iPath++) {
+        // Finally, check in case the selection element was a wildcarded
+        // negative such as "!*":
+
+        if (!oneResultMatched) {
+          for (unsigned int iPath = 0; iPath < fullPathCount; iPath++) {
             sampleResults[iPath] = HLTPathStatus(hlt::Fail, 0);
           }
-	  if (evtSelector.acceptEvent(sampleResults)) {
-              oneResultMatched = true;
+          if (evtSelector.acceptEvent(sampleResults)) {
+            oneResultMatched = true;
           }
         }
-	
+
         // if none of the possible trigger results matched the
         // selection element, then we declare the whole selection
         // list invalid
-        if (!oneResultMatched)
-        {
+        if (!oneResultMatched) {
           return false;
         }
-      }
-      catch (edm::Exception const&)
-      {
+      } catch (edm::Exception const&) {
         return false;
       }
     }
@@ -517,7 +472,6 @@ namespace edm
     return true;
   }
 
-
   /**
    * Tests if the specified trigger selection lists (path specs) overlap,
    * where "overlap" means that a valid trigger result (given the full
@@ -528,24 +482,19 @@ namespace edm
    * @param fullPathList The full list of trigger names (vector of string).
    * @return OverlapResult which indicates the degree of overlap.
    */
-  evtSel::OverlapResult
-  EventSelector::testSelectionOverlap(Strings const& pathspec1,
-                                      Strings const& pathspec2,
-                                      Strings const& fullPathList)
-  {
+  evtSel::OverlapResult EventSelector::testSelectionOverlap(Strings const& pathspec1,
+                                                            Strings const& pathspec2,
+                                                            Strings const& fullPathList) {
     bool overlap = false;
 
     // first, test that the selection lists are valid
-    if (!selectionIsValid(pathspec1, fullPathList) ||
-        !selectionIsValid(pathspec2, fullPathList))
-    {
+    if (!selectionIsValid(pathspec1, fullPathList) || !selectionIsValid(pathspec2, fullPathList)) {
       return evtSel::InvalidSelection;
     }
 
     // catch exceptions from the EventSelector constructor
     // (and anywhere else) and mark those as failures
-    try
-    {
+    try {
       // create an EventSelector instance for each selection list
       EventSelector a(pathspec1, fullPathList);
       EventSelector b(pathspec2, fullPathList);
@@ -553,44 +502,32 @@ namespace edm
       unsigned int N = fullPathList.size();
 
       // create the expanded masks for the various decision lists in a and b
-      std::vector<bool>
-      	aPassAbs = expandDecisionList(a.absolute_acceptors_,true,N);
-      std::vector<bool>
-      	aPassCon = expandDecisionList(a.conditional_acceptors_,true,N);
-      std::vector<bool>
-      	aFailAbs = expandDecisionList(a.absolute_acceptors_,false,N);
-      std::vector<bool>
-      	aFailCon = expandDecisionList(a.conditional_acceptors_,false,N);
-      std::vector<bool>
-      	aExc = expandDecisionList(a.exception_acceptors_,true,N);
-      std::vector< std::vector<bool> > aMustFail;
+      std::vector<bool> aPassAbs = expandDecisionList(a.absolute_acceptors_, true, N);
+      std::vector<bool> aPassCon = expandDecisionList(a.conditional_acceptors_, true, N);
+      std::vector<bool> aFailAbs = expandDecisionList(a.absolute_acceptors_, false, N);
+      std::vector<bool> aFailCon = expandDecisionList(a.conditional_acceptors_, false, N);
+      std::vector<bool> aExc = expandDecisionList(a.exception_acceptors_, true, N);
+      std::vector<std::vector<bool> > aMustFail;
       for (unsigned int m = 0; m != a.all_must_fail_.size(); ++m) {
-        aMustFail.push_back(expandDecisionList(a.all_must_fail_[m],false,N));
+        aMustFail.push_back(expandDecisionList(a.all_must_fail_[m], false, N));
       }
-      std::vector< std::vector<bool> > aMustFailNoex;
+      std::vector<std::vector<bool> > aMustFailNoex;
       for (unsigned int m = 0; m != a.all_must_fail_noex_.size(); ++m) {
-        aMustFailNoex.push_back
-		(expandDecisionList(a.all_must_fail_noex_[m],false,N));
+        aMustFailNoex.push_back(expandDecisionList(a.all_must_fail_noex_[m], false, N));
       }
 
-      std::vector<bool>
-      	bPassAbs = expandDecisionList(b.absolute_acceptors_,true,N);
-      std::vector<bool>
-      	bPassCon = expandDecisionList(b.conditional_acceptors_,true,N);
-      std::vector<bool>
-      	bFailAbs = expandDecisionList(b.absolute_acceptors_,false,N);
-      std::vector<bool>
-      	bFailCon = expandDecisionList(b.conditional_acceptors_,false,N);
-      std::vector<bool>
-      	bExc = expandDecisionList(b.exception_acceptors_,true,N);
-      std::vector< std::vector<bool> > bMustFail;
+      std::vector<bool> bPassAbs = expandDecisionList(b.absolute_acceptors_, true, N);
+      std::vector<bool> bPassCon = expandDecisionList(b.conditional_acceptors_, true, N);
+      std::vector<bool> bFailAbs = expandDecisionList(b.absolute_acceptors_, false, N);
+      std::vector<bool> bFailCon = expandDecisionList(b.conditional_acceptors_, false, N);
+      std::vector<bool> bExc = expandDecisionList(b.exception_acceptors_, true, N);
+      std::vector<std::vector<bool> > bMustFail;
       for (unsigned int m = 0; m != b.all_must_fail_.size(); ++m) {
-        bMustFail.push_back(expandDecisionList(b.all_must_fail_[m],false,N));
+        bMustFail.push_back(expandDecisionList(b.all_must_fail_[m], false, N));
       }
-      std::vector< std::vector<bool> > bMustFailNoex;
+      std::vector<std::vector<bool> > bMustFailNoex;
       for (unsigned int m = 0; m != b.all_must_fail_noex_.size(); ++m) {
-        bMustFailNoex.push_back
-		(expandDecisionList(b.all_must_fail_noex_[m],false,N));
+        bMustFailNoex.push_back(expandDecisionList(b.all_must_fail_noex_[m], false, N));
       }
 
       std::vector<bool> aPass = combine(aPassAbs, aPassCon);
@@ -599,49 +536,53 @@ namespace edm
       std::vector<bool> bFail = combine(bFailAbs, bFailCon);
 
       // Check for overlap in the primary masks
-      overlap = overlapping(aPass, bPass) ||
-      		overlapping(aFail, bFail) ||
-     		overlapping(aExc, bExc);
-      if (overlap) return identical(a,b,N) ? evtSel::ExactMatch
-      					     : evtSel::PartialOverlap;
+      overlap = overlapping(aPass, bPass) || overlapping(aFail, bFail) || overlapping(aExc, bExc);
+      if (overlap)
+        return identical(a, b, N) ? evtSel::ExactMatch : evtSel::PartialOverlap;
 
       // Check for overlap of a primary fail mask with a must fail mask
       for (unsigned int f = 0; f != aMustFail.size(); ++f) {
         overlap = overlapping(aMustFail[f], bFail);
-	if (overlap) return evtSel::PartialOverlap;
-	for (unsigned int g = 0; g != bMustFail.size(); ++g) {
+        if (overlap)
+          return evtSel::PartialOverlap;
+        for (unsigned int g = 0; g != bMustFail.size(); ++g) {
           overlap = subset(aMustFail[f], bMustFail[g]);
-	  if (overlap) return evtSel::PartialOverlap;
-	}
-	for (unsigned int g = 0; g != bMustFailNoex.size(); ++g) {
+          if (overlap)
+            return evtSel::PartialOverlap;
+        }
+        for (unsigned int g = 0; g != bMustFailNoex.size(); ++g) {
           overlap = subset(aMustFail[f], bMustFailNoex[g]);
-	  if (overlap) return evtSel::PartialOverlap;
-	}
+          if (overlap)
+            return evtSel::PartialOverlap;
+        }
       }
       for (unsigned int f = 0; f != aMustFailNoex.size(); ++f) {
         overlap = overlapping(aMustFailNoex[f], bFail);
-	if (overlap) return evtSel::PartialOverlap;
-	for (unsigned int g = 0; g != bMustFail.size(); ++g) {
+        if (overlap)
+          return evtSel::PartialOverlap;
+        for (unsigned int g = 0; g != bMustFail.size(); ++g) {
           overlap = subset(aMustFailNoex[f], bMustFail[g]);
-	  if (overlap) return evtSel::PartialOverlap;
-	}
-	for (unsigned int g = 0; g != bMustFailNoex.size(); ++g) {
+          if (overlap)
+            return evtSel::PartialOverlap;
+        }
+        for (unsigned int g = 0; g != bMustFailNoex.size(); ++g) {
           overlap = subset(aMustFailNoex[f], bMustFailNoex[g]);
-	  if (overlap) return evtSel::PartialOverlap;
-	}
+          if (overlap)
+            return evtSel::PartialOverlap;
+        }
       }
       for (unsigned int g = 0; g != bMustFail.size(); ++g) {
         overlap = overlapping(bMustFail[g], aFail);
-	if (overlap) return evtSel::PartialOverlap;
+        if (overlap)
+          return evtSel::PartialOverlap;
       }
       for (unsigned int g = 0; g != bMustFailNoex.size(); ++g) {
         overlap = overlapping(bMustFail[g], aFail);
-	if (overlap) return evtSel::PartialOverlap;
+        if (overlap)
+          return evtSel::PartialOverlap;
       }
 
-    }
-    catch (edm::Exception const&)
-    {
+    } catch (edm::Exception const&) {
       return evtSel::InvalidSelection;
     }
 
@@ -649,7 +590,7 @@ namespace edm
 
     return evtSel::NoOverlap;
 
-  } // testSelectionOverlap
+  }  // testSelectionOverlap
 
 #ifdef REMOVE
   /**
@@ -662,15 +603,11 @@ namespace edm
    * @param fullPathList The full list of trigger names (vector of string).
    * @return OverlapResult which indicates the degree of overlap.
    */
-  evtSel::OverlapResult
-  EventSelector::testSelectionOverlap(Strings const& pathspec1,
-                                      Strings const& pathspec2,
-                                      Strings const& fullPathList)
-  {
+  evtSel::OverlapResult EventSelector::testSelectionOverlap(Strings const& pathspec1,
+                                                            Strings const& pathspec2,
+                                                            Strings const& fullPathList) {
     // first, test that the selection lists are valid
-    if (!selectionIsValid(pathspec1, fullPathList) ||
-        !selectionIsValid(pathspec2, fullPathList))
-    {
+    if (!selectionIsValid(pathspec1, fullPathList) || !selectionIsValid(pathspec2, fullPathList)) {
       return evtSel::InvalidSelection;
     }
 
@@ -680,8 +617,7 @@ namespace edm
 
     // catch exceptions from the EventSelector constructor
     // (and anywhere else) and mark those as failures
-    try
-    {
+    try {
       // create an EventSelector instance for each selection list
       EventSelector selector1(pathspec1, fullPathList);
       EventSelector selector2(pathspec2, fullPathList);
@@ -692,38 +628,31 @@ namespace edm
       TriggerResults sampleResults(hltGS, fullPathList);
 
       // loop over each path
-      for (unsigned int iPath = 0; iPath < fullPathCount; iPath++)
-      {
+      for (unsigned int iPath = 0; iPath < fullPathCount; iPath++) {
         // loop over the possible values for the path status
-        for (int iState = static_cast<int>(hlt::Pass);
-             iState <= static_cast<int>(hlt::Exception);
-             iState++)
-        {
-          sampleResults[iPath] =
-            HLTPathStatus(static_cast<hlt::HLTState>(iState), 0);
-          bool accept1 = selector1.wantAll() ||
-            selector1.acceptEvent(sampleResults);
-          bool accept2 = selector2.wantAll() ||
-            selector2.acceptEvent(sampleResults);
-          if (accept1 != accept2)
-          {
+        for (int iState = static_cast<int>(hlt::Pass); iState <= static_cast<int>(hlt::Exception); iState++) {
+          sampleResults[iPath] = HLTPathStatus(static_cast<hlt::HLTState>(iState), 0);
+          bool accept1 = selector1.wantAll() || selector1.acceptEvent(sampleResults);
+          bool accept2 = selector2.wantAll() || selector2.acceptEvent(sampleResults);
+          if (accept1 != accept2) {
             exactMatch = false;
           }
-          if (accept1 && accept2)
-          {
+          if (accept1 && accept2) {
             noOverlap = false;
           }
           sampleResults.reset(iPath);
         }
       }
-    }
-    catch (edm::Exception const& excpt)
-    {
+    } catch (edm::Exception const& excpt) {
       return evtSel::InvalidSelection;
     }
 
-    if (exactMatch) {return evtSel::ExactMatch;}
-    if (noOverlap) {return evtSel::NoOverlap;}
+    if (exactMatch) {
+      return evtSel::ExactMatch;
+    }
+    if (noOverlap) {
+      return evtSel::NoOverlap;
+    }
     return evtSel::PartialOverlap;
   }
 #endif
@@ -744,19 +673,15 @@ namespace edm
    *         if the trigger selection is invalid in the context of the
    *         full trigger list.
    */
-  std::shared_ptr<TriggerResults>
-  EventSelector::maskTriggerResults(TriggerResults const& inputResults)
-  {
+  std::shared_ptr<TriggerResults> EventSelector::maskTriggerResults(TriggerResults const& inputResults) {
     // fetch and validate the total number of paths
     unsigned int fullPathCount = nPathNames_;
     unsigned int N = fullPathCount;
-    if (fullPathCount != inputResults.size())
-    {
+    if (fullPathCount != inputResults.size()) {
       throw edm::Exception(errors::EventCorruption)
-        << "EventSelector::maskTriggerResults, the TriggerResults\n"
-        << "size (" << inputResults.size()
-        << ") does not match the number of paths in the\n"
-        << "full trigger list (" << fullPathCount << ").\n";
+          << "EventSelector::maskTriggerResults, the TriggerResults\n"
+          << "size (" << inputResults.size() << ") does not match the number of paths in the\n"
+          << "full trigger list (" << fullPathCount << ").\n";
     }
 
     // create a suitable global status object to work with, all in Ready state
@@ -764,67 +689,53 @@ namespace edm
 
     // Deal with must_fail acceptors that would cause selection
     for (unsigned int m = 0; m < this->all_must_fail_.size(); ++m) {
-      std::vector<bool>
-        f = expandDecisionList(this->all_must_fail_[m],false,N);
+      std::vector<bool> f = expandDecisionList(this->all_must_fail_[m], false, N);
       bool all_fail = true;
       for (unsigned int ipath = 0; ipath < N; ++ipath) {
-	if  ((f[ipath]) && (inputResults [ipath].state() != hlt::Fail)) {
-	  all_fail = false;
-	  break;
-	}
+        if ((f[ipath]) && (inputResults[ipath].state() != hlt::Fail)) {
+          all_fail = false;
+          break;
+        }
       }
       if (all_fail) {
-	for (unsigned int ipath = 0; ipath < N; ++ipath) {
-          if  (f[ipath]) {
-	    mask[ipath] = hlt::Fail;
-	  }
-	}
+        for (unsigned int ipath = 0; ipath < N; ++ipath) {
+          if (f[ipath]) {
+            mask[ipath] = hlt::Fail;
+          }
+        }
       }
     }
     for (unsigned int m = 0; m < this->all_must_fail_noex_.size(); ++m) {
-      std::vector<bool>
-        f = expandDecisionList(this->all_must_fail_noex_[m],false,N);
+      std::vector<bool> f = expandDecisionList(this->all_must_fail_noex_[m], false, N);
       bool all_fail = true;
       for (unsigned int ipath = 0; ipath < N; ++ipath) {
-	if ((f[ipath]) && (inputResults [ipath].state() != hlt::Fail)) {
-	  all_fail = false;
-	  break;
-	}
+        if ((f[ipath]) && (inputResults[ipath].state() != hlt::Fail)) {
+          all_fail = false;
+          break;
+        }
       }
       if (all_fail) {
-	for (unsigned int ipath = 0; ipath < N; ++ipath) {
-          if  (f[ipath]) {
-	    mask[ipath] = hlt::Fail;
-	  }
-	}
+        for (unsigned int ipath = 0; ipath < N; ++ipath) {
+          if (f[ipath]) {
+            mask[ipath] = hlt::Fail;
+          }
+        }
       }
-    } // factoring opportunity - work done for fail_noex_ is same as for fail_
+    }  // factoring opportunity - work done for fail_noex_ is same as for fail_
 
     // Deal with normal acceptors that would cause selection
-    std::vector<bool>
-      aPassAbs = expandDecisionList(this->absolute_acceptors_,true,N);
-    std::vector<bool>
-      aPassCon = expandDecisionList(this->conditional_acceptors_,true,N);
-    std::vector<bool>
-      aFailAbs = expandDecisionList(this->absolute_acceptors_,false,N);
-    std::vector<bool>
-      aFailCon = expandDecisionList(this->conditional_acceptors_,false,N);
-    std::vector<bool>
-      aExc = expandDecisionList(this->exception_acceptors_,true,N);
+    std::vector<bool> aPassAbs = expandDecisionList(this->absolute_acceptors_, true, N);
+    std::vector<bool> aPassCon = expandDecisionList(this->conditional_acceptors_, true, N);
+    std::vector<bool> aFailAbs = expandDecisionList(this->absolute_acceptors_, false, N);
+    std::vector<bool> aFailCon = expandDecisionList(this->conditional_acceptors_, false, N);
+    std::vector<bool> aExc = expandDecisionList(this->exception_acceptors_, true, N);
     for (unsigned int ipath = 0; ipath < N; ++ipath) {
-      hlt::HLTState s = inputResults [ipath].state();
-      if (((aPassAbs[ipath]) && (s == hlt::Pass))
-      		||
-	  ((aPassCon[ipath]) && (s == hlt::Pass))		
-      		||
-	  ((aFailAbs[ipath]) && (s == hlt::Fail))		
-      		||
-	  ((aFailCon[ipath]) && (s == hlt::Fail))
-	        ||
-	  ((aExc[ipath]) && (s == hlt::Exception)))
-      {
+      hlt::HLTState s = inputResults[ipath].state();
+      if (((aPassAbs[ipath]) && (s == hlt::Pass)) || ((aPassCon[ipath]) && (s == hlt::Pass)) ||
+          ((aFailAbs[ipath]) && (s == hlt::Fail)) || ((aFailCon[ipath]) && (s == hlt::Fail)) ||
+          ((aExc[ipath]) && (s == hlt::Exception))) {
         mask[ipath] = s;
-      }		
+      }
     }
 
     // Based on the global status for the mask, create and return a
@@ -833,10 +744,6 @@ namespace edm
     return maskedResults;
   }  // maskTriggerResults
 
-
-
-
-
 #ifdef REMOVE
   /**
    * Applies a trigger selection mask to a specified trigger result object.
@@ -856,27 +763,22 @@ namespace edm
    *         if the trigger selection is invalid in the context of the
    *         full trigger list.
    */
-  std::shared_ptr<TriggerResults>
-  EventSelector::maskTriggerResults(Strings const& pathspecs,
-                                    TriggerResults const& inputResults,
-                                    Strings const& fullPathList)
-  {
+  std::shared_ptr<TriggerResults> EventSelector::maskTriggerResults(Strings const& pathspecs,
+                                                                    TriggerResults const& inputResults,
+                                                                    Strings const& fullPathList) {
     // fetch and validate the total number of paths
     unsigned int fullPathCount = fullPathList.size();
-    if (fullPathCount != inputResults.size())
-    {
+    if (fullPathCount != inputResults.size()) {
       throw edm::Exception(errors::EventCorruption)
-        << "EventSelector::maskTriggerResults, the TriggerResults\n"
-        << "size (" << inputResults.size()
-        << ") does not match the number of paths in the\n"
-        << "full trigger list (" << fullPathCount << ").\n";
+          << "EventSelector::maskTriggerResults, the TriggerResults\n"
+          << "size (" << inputResults.size() << ") does not match the number of paths in the\n"
+          << "full trigger list (" << fullPathCount << ").\n";
     }
 
     // create a working copy of the TriggerResults object
     HLTGlobalStatus hltGS(fullPathCount);
     auto maskedResults = std::make_shared<TriggerResults>(hltGS, inputResults.parameterSetID());
-    for (unsigned int iPath = 0; iPath < fullPathCount; iPath++)
-    {
+    for (unsigned int iPath = 0; iPath < fullPathCount; iPath++) {
       (*maskedResults)[iPath] = inputResults[iPath];
     }
 
@@ -888,11 +790,9 @@ namespace edm
     TriggerResults sampleResults(hltGS2, fullPathList);
 
     // loop over each path and reset the path status if needed
-    for (unsigned int iPath = 0; iPath < fullPathCount; iPath++)
-    {
+    for (unsigned int iPath = 0; iPath < fullPathCount; iPath++) {
       sampleResults[iPath] = (*maskedResults)[iPath];
-      if (!selector.wantAll() && !selector.acceptEvent(sampleResults))
-      {
+      if (!selector.wantAll() && !selector.acceptEvent(sampleResults)) {
         maskedResults->reset(iPath);
       }
       sampleResults.reset(iPath);
@@ -909,9 +809,7 @@ namespace edm
    * @param pset The ParameterSet that contains the trigger selection.
    * @return the trigger selection list (vector of string).
    */
-  std::vector<std::string>
-  EventSelector::getEventSelectionVString(ParameterSet const& pset)
-  {
+  std::vector<std::string> EventSelector::getEventSelectionVString(ParameterSet const& pset) {
     // default the selection to everything (wildcard)
     Strings selection;
     selection.push_back("*");
@@ -920,11 +818,9 @@ namespace edm
 
     // the SelectEvents parameter is a ParameterSet within
     // a ParameterSet, so we have to pull it out twice
-    ParameterSet selectEventsParamSet =
-      pset.getUntrackedParameter("SelectEvents", ParameterSet());
+    ParameterSet selectEventsParamSet = pset.getUntrackedParameter("SelectEvents", ParameterSet());
     if (!selectEventsParamSet.empty()) {
-      Strings path_specs =
-        selectEventsParamSet.getParameter<Strings>("SelectEvents");
+      Strings path_specs = selectEventsParamSet.getParameter<Strings>("SelectEvents");
       if (!path_specs.empty()) {
         selection = path_specs;
       }
@@ -934,124 +830,117 @@ namespace edm
     return selection;
   }
 
-  bool EventSelector::containsExceptions(HLTGlobalStatus const& tr) const
-  {
+  bool EventSelector::containsExceptions(HLTGlobalStatus const& tr) const {
     unsigned int e = tr.size();
     for (unsigned int i = 0; i < e; ++i) {
-      if (tr[i].state() == hlt::Exception) return true;
+      if (tr[i].state() == hlt::Exception)
+        return true;
     }
     return false;
   }
 
   // The following routines are helpers for testSelectionOverlap
 
-  bool
-  EventSelector::identical(std::vector<bool> const& a,
-  			   std::vector<bool> const& b) {
-     unsigned int n = a.size();
-     if (n != b.size()) return false;
-     for (unsigned int i=0; i!=n; ++i) {
-       if (a[i] != b[i]) return false;
-     }
-     return true;
+  bool EventSelector::identical(std::vector<bool> const& a, std::vector<bool> const& b) {
+    unsigned int n = a.size();
+    if (n != b.size())
+      return false;
+    for (unsigned int i = 0; i != n; ++i) {
+      if (a[i] != b[i])
+        return false;
+    }
+    return true;
   }
 
-  bool
-  EventSelector::identical(EventSelector const& a,
-  			   EventSelector const& b,
-			   unsigned int N)
-  {
-        // create the expanded masks for the various decision lists in a and b
-    if (!identical(expandDecisionList(a.absolute_acceptors_,true,N),
-                   expandDecisionList(b.absolute_acceptors_,true,N)))
-		   return false;
-    if (!identical(expandDecisionList(a.conditional_acceptors_,true,N),
-                   expandDecisionList(b.conditional_acceptors_,true,N)))
-		   return false;
-    if (!identical(expandDecisionList(a.absolute_acceptors_,false,N),
-                   expandDecisionList(b.absolute_acceptors_,false,N)))
-		   return false;
-    if (!identical(expandDecisionList(a.conditional_acceptors_,false,N),
-                   expandDecisionList(b.conditional_acceptors_,false,N)))
-		   return false;
-    if (!identical(expandDecisionList(a.exception_acceptors_,true,N),
-                   expandDecisionList(b.exception_acceptors_,true,N)))
-		   return false;
-    if (a.all_must_fail_.size() != b.all_must_fail_.size()) return false;
-
-    std::vector< std::vector<bool> > aMustFail;
+  bool EventSelector::identical(EventSelector const& a, EventSelector const& b, unsigned int N) {
+    // create the expanded masks for the various decision lists in a and b
+    if (!identical(expandDecisionList(a.absolute_acceptors_, true, N),
+                   expandDecisionList(b.absolute_acceptors_, true, N)))
+      return false;
+    if (!identical(expandDecisionList(a.conditional_acceptors_, true, N),
+                   expandDecisionList(b.conditional_acceptors_, true, N)))
+      return false;
+    if (!identical(expandDecisionList(a.absolute_acceptors_, false, N),
+                   expandDecisionList(b.absolute_acceptors_, false, N)))
+      return false;
+    if (!identical(expandDecisionList(a.conditional_acceptors_, false, N),
+                   expandDecisionList(b.conditional_acceptors_, false, N)))
+      return false;
+    if (!identical(expandDecisionList(a.exception_acceptors_, true, N),
+                   expandDecisionList(b.exception_acceptors_, true, N)))
+      return false;
+    if (a.all_must_fail_.size() != b.all_must_fail_.size())
+      return false;
+
+    std::vector<std::vector<bool> > aMustFail;
     for (unsigned int m = 0; m != a.all_must_fail_.size(); ++m) {
-      aMustFail.push_back(expandDecisionList(a.all_must_fail_[m],false,N));
+      aMustFail.push_back(expandDecisionList(a.all_must_fail_[m], false, N));
     }
-    std::vector< std::vector<bool> > aMustFailNoex;
+    std::vector<std::vector<bool> > aMustFailNoex;
     for (unsigned int m = 0; m != a.all_must_fail_noex_.size(); ++m) {
-      aMustFailNoex.push_back
-	      (expandDecisionList(a.all_must_fail_noex_[m],false,N));
+      aMustFailNoex.push_back(expandDecisionList(a.all_must_fail_noex_[m], false, N));
     }
-    std::vector< std::vector<bool> > bMustFail;
+    std::vector<std::vector<bool> > bMustFail;
     for (unsigned int m = 0; m != b.all_must_fail_.size(); ++m) {
-      bMustFail.push_back(expandDecisionList(b.all_must_fail_[m],false,N));
+      bMustFail.push_back(expandDecisionList(b.all_must_fail_[m], false, N));
     }
-    std::vector< std::vector<bool> > bMustFailNoex;
+    std::vector<std::vector<bool> > bMustFailNoex;
     for (unsigned int m = 0; m != b.all_must_fail_noex_.size(); ++m) {
-      bMustFailNoex.push_back
-	      (expandDecisionList(b.all_must_fail_noex_[m],false,N));
+      bMustFailNoex.push_back(expandDecisionList(b.all_must_fail_noex_[m], false, N));
     }
 
     for (unsigned int m = 0; m != aMustFail.size(); ++m) {
       bool match = false;
       for (unsigned int k = 0; k != bMustFail.size(); ++k) {
-        if (identical(aMustFail[m],bMustFail[k])) {
+        if (identical(aMustFail[m], bMustFail[k])) {
           match = true;
-	  break;
-	}
+          break;
+        }
       }
-      if (!match) return false;
+      if (!match)
+        return false;
     }
     for (unsigned int m = 0; m != aMustFailNoex.size(); ++m) {
       bool match = false;
       for (unsigned int k = 0; k != bMustFailNoex.size(); ++k) {
-         if (identical(aMustFailNoex[m],bMustFailNoex[k])) {
+        if (identical(aMustFailNoex[m], bMustFailNoex[k])) {
           match = true;
-	  break;
-	}
+          break;
+        }
       }
-      if (!match) return false;
+      if (!match)
+        return false;
     }
 
     return true;
 
-  } // identical (EventSelector, EventSelector, N);
+  }  // identical (EventSelector, EventSelector, N);
 
-  std::vector<bool>
-  EventSelector::expandDecisionList(Bits const& b,
-				      bool PassOrFail,
-				      unsigned int n)
-  {
+  std::vector<bool> EventSelector::expandDecisionList(Bits const& b, bool PassOrFail, unsigned int n) {
     std::vector<bool> x(n, false);
     for (unsigned int i = 0; i != b.size(); ++i) {
-      if (b[i].accept_state_ == PassOrFail) x[b[i].pos_] = true;
+      if (b[i].accept_state_ == PassOrFail)
+        x[b[i].pos_] = true;
     }
     return x;
-  } // expandDecisionList	
+  }  // expandDecisionList
 
   // Determines whether a and b share a true bit at any position
-  bool EventSelector::overlapping(std::vector<bool> const& a,
-    			             std::vector<bool> const& b)
-  {
-    if (a.size() != b.size()) return false;
+  bool EventSelector::overlapping(std::vector<bool> const& a, std::vector<bool> const& b) {
+    if (a.size() != b.size())
+      return false;
     for (unsigned int i = 0; i != a.size(); ++i) {
-      if (a[i] && b[i]) return true;
+      if (a[i] && b[i])
+        return true;
     }
     return false;
-  } // overlapping
+  }  // overlapping
 
   // determines whether the true bits of a are a non-empty subset of those of b,
   // or vice-versa.  The subset need not be proper.
-  bool EventSelector::subset(std::vector<bool> const& a,
-    			       std::vector<bool> const& b)
-  {
-    if (a.size() != b.size()) return false;
+  bool EventSelector::subset(std::vector<bool> const& a, std::vector<bool> const& b) {
+    if (a.size() != b.size())
+      return false;
     // First test whether a is a non-empty subset of b
     bool aPresent = false;
     bool aSubset = true;
@@ -1059,13 +948,15 @@ namespace edm
       if (a[i]) {
         aPresent = true;
         if (!b[i]) {
-	  aSubset = false;
-	  break;
-	}
+          aSubset = false;
+          break;
+        }
       }
     }
-    if (!aPresent) return false;
-    if (aSubset) return true;
+    if (!aPresent)
+      return false;
+    if (aSubset)
+      return true;
 
     // Now test whether b is a non-empty subset of a
     bool bPresent = false;
@@ -1074,36 +965,34 @@ namespace edm
       if (b[i]) {
         bPresent = true;
         if (!a[i]) {
-	  bSubset = false;
-	  break;
-	}
+          bSubset = false;
+          break;
+        }
       }
     }
-    if (!bPresent) return false;
-    if (bSubset) return true;
+    if (!bPresent)
+      return false;
+    if (bSubset)
+      return true;
 
     return false;
-  } // subset
+  }  // subset
 
   // Creates a vector of bits which is the OR of a and b
-  std::vector<bool>
-  EventSelector::combine(std::vector<bool> const& a,
-    			  std::vector<bool> const& b)
-  {
+  std::vector<bool> EventSelector::combine(std::vector<bool> const& a, std::vector<bool> const& b) {
     assert(a.size() == b.size());
     std::vector<bool> x(a.size());
     for (unsigned int i = 0; i != a.size(); ++i) {
       x[i] = a[i] || b[i];
-    } // a really sharp compiler will optimize the hell out of this,
-      // exploiting word-size OR operations.
+    }  // a really sharp compiler will optimize the hell out of this,
+    // exploiting word-size OR operations.
     return x;
-  } // combine			   			
+  }  // combine
 
-  void
-  EventSelector::fillDescription(ParameterSetDescription& desc) {
+  void EventSelector::fillDescription(ParameterSetDescription& desc) {
     ParameterSetDescription selector;
     selector.addOptional<std::vector<std::string> >("SelectEvents");
     desc.addUntracked<ParameterSetDescription>("SelectEvents", selector);
   }
 
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/EventSetup.cc b/FWCore/Framework/src/EventSetup.cc
index e12da58212083..2e383113aa3e3 100644
--- a/FWCore/Framework/src/EventSetup.cc
+++ b/FWCore/Framework/src/EventSetup.cc
@@ -19,43 +19,43 @@
 #include "FWCore/Framework/interface/EventSetupRecord.h"
 
 namespace edm {
-//
-// constants, enums and typedefs
-//
-
-//
-// static data member definitions
-//
-
-//
-// constructors and destructor
-//
-
-// EventSetup::EventSetup(EventSetup const& rhs)
-// {
-//    // do actual copying here;
-// }
-
-//
-// assignment operators
-//
-// EventSetup const& EventSetup::operator=(EventSetup const& rhs)
-// {
-//   //An exception safe implementation is
-//   EventSetup temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
-
-//
-// member functions
-//
-//
-// const member functions
-//
-
-//
-// static member functions
-//
-}
+  //
+  // constants, enums and typedefs
+  //
+
+  //
+  // static data member definitions
+  //
+
+  //
+  // constructors and destructor
+  //
+
+  // EventSetup::EventSetup(EventSetup const& rhs)
+  // {
+  //    // do actual copying here;
+  // }
+
+  //
+  // assignment operators
+  //
+  // EventSetup const& EventSetup::operator=(EventSetup const& rhs)
+  // {
+  //   //An exception safe implementation is
+  //   EventSetup temp(rhs);
+  //   swap(rhs);
+  //
+  //   return *this;
+  // }
+
+  //
+  // member functions
+  //
+  //
+  // const member functions
+  //
+
+  //
+  // static member functions
+  //
+}  // namespace edm
diff --git a/FWCore/Framework/src/EventSetupImpl.cc b/FWCore/Framework/src/EventSetupImpl.cc
index 8aad3527f7c3e..16ba61962cf9e 100644
--- a/FWCore/Framework/src/EventSetupImpl.cc
+++ b/FWCore/Framework/src/EventSetupImpl.cc
@@ -23,93 +23,73 @@
 
 namespace edm {
 
-EventSetupImpl::EventSetupImpl(ActivityRegistry const* activityRegistry) :
-   activityRegistry_(activityRegistry)
-{
-}
+  EventSetupImpl::EventSetupImpl(ActivityRegistry const* activityRegistry) : activityRegistry_(activityRegistry) {}
 
-EventSetupImpl::~EventSetupImpl()
-{
-}
+  EventSetupImpl::~EventSetupImpl() {}
 
-void
-EventSetupImpl::insert(const eventsetup::EventSetupRecordKey& iKey,
-                const eventsetup::EventSetupRecordImpl* iRecord)
-{
-   auto lb = std::lower_bound(keysBegin_, keysEnd_, iKey);
-   if (lb == keysEnd_ || iKey != *lb) {
+  void EventSetupImpl::insert(const eventsetup::EventSetupRecordKey& iKey,
+                              const eventsetup::EventSetupRecordImpl* iRecord) {
+    auto lb = std::lower_bound(keysBegin_, keysEnd_, iKey);
+    if (lb == keysEnd_ || iKey != *lb) {
       throw cms::Exception("LogicError") << "EventSetupImpl::insert Could not find key\n"
                                          << "Should be impossible. Please contact Framework developer.\n";
-   }
-   auto index = std::distance(keysBegin_, lb);
-   recordImpls_[index] = iRecord;
-}
+    }
+    auto index = std::distance(keysBegin_, lb);
+    recordImpls_[index] = iRecord;
+  }
 
-void
-EventSetupImpl::clear()
-{
-  for (auto& ptr : recordImpls_) {
-     ptr = nullptr;
+  void EventSetupImpl::clear() {
+    for (auto& ptr : recordImpls_) {
+      ptr = nullptr;
+    }
   }
-}
 
-void
-EventSetupImpl::add(const eventsetup::EventSetupRecordImpl& iRecord)
-{
-   insert(iRecord.key(), &iRecord);
-}
+  void EventSetupImpl::add(const eventsetup::EventSetupRecordImpl& iRecord) { insert(iRecord.key(), &iRecord); }
 
-std::optional<eventsetup::EventSetupRecordGeneric>
-EventSetupImpl::find(const eventsetup::EventSetupRecordKey& iKey) const
-{
-   auto lb = std::lower_bound(keysBegin_, keysEnd_, iKey);
-   if (lb == keysEnd_ || iKey != *lb) {
+  std::optional<eventsetup::EventSetupRecordGeneric> EventSetupImpl::find(const eventsetup::EventSetupRecordKey& iKey,
+                                                                          unsigned int iTransitionID,
+                                                                          ESProxyIndex const* getTokenIndices) const {
+    auto lb = std::lower_bound(keysBegin_, keysEnd_, iKey);
+    if (lb == keysEnd_ || iKey != *lb) {
       return std::nullopt;
-   }
-   auto index = std::distance(keysBegin_, lb);
-   if (recordImpls_[index] == nullptr) {
+    }
+    auto index = std::distance(keysBegin_, lb);
+    if (recordImpls_[index] == nullptr) {
       return std::nullopt;
-   }
-   return eventsetup::EventSetupRecordGeneric(recordImpls_[index]);
-}
+    }
+    return eventsetup::EventSetupRecordGeneric(recordImpls_[index], iTransitionID, getTokenIndices);
+  }
 
-eventsetup::EventSetupRecordImpl const*
-EventSetupImpl::findImpl(const eventsetup::EventSetupRecordKey& iKey) const
-{
-   auto lb = std::lower_bound(keysBegin_, keysEnd_, iKey);
-   if (lb == keysEnd_ || iKey != *lb) {
+  eventsetup::EventSetupRecordImpl const* EventSetupImpl::findImpl(const eventsetup::EventSetupRecordKey& iKey) const {
+    auto lb = std::lower_bound(keysBegin_, keysEnd_, iKey);
+    if (lb == keysEnd_ || iKey != *lb) {
       return nullptr;
-   }
-   auto index = std::distance(keysBegin_, lb);
-   return recordImpls_[index];
-}
+    }
+    auto index = std::distance(keysBegin_, lb);
+    return recordImpls_[index];
+  }
 
-void
-EventSetupImpl::fillAvailableRecordKeys(std::vector<eventsetup::EventSetupRecordKey>& oToFill) const
-{
-  oToFill.clear();
-  oToFill.reserve(recordImpls_.size());
+  void EventSetupImpl::fillAvailableRecordKeys(std::vector<eventsetup::EventSetupRecordKey>& oToFill) const {
+    oToFill.clear();
+    oToFill.reserve(recordImpls_.size());
 
-  for (auto const& recordImpl : recordImpls_) { 
-    if (recordImpl != nullptr) {
-      oToFill.push_back(recordImpl->key());
+    for (auto const& recordImpl : recordImpls_) {
+      if (recordImpl != nullptr) {
+        oToFill.push_back(recordImpl->key());
+      }
     }
   }
-}
 
-bool
-EventSetupImpl::recordIsProvidedByAModule(eventsetup::EventSetupRecordKey const& iKey) const
-{
-   auto lb = std::lower_bound(keysBegin_, keysEnd_, iKey);
-   return lb != keysEnd_ && iKey == *lb;
-}
+  bool EventSetupImpl::recordIsProvidedByAModule(eventsetup::EventSetupRecordKey const& iKey) const {
+    auto lb = std::lower_bound(keysBegin_, keysEnd_, iKey);
+    return lb != keysEnd_ && iKey == *lb;
+  }
 
-void
-EventSetupImpl::setKeyIters(std::vector<eventsetup::EventSetupRecordKey>::const_iterator const& keysBegin,
-                            std::vector<eventsetup::EventSetupRecordKey>::const_iterator const& keysEnd) {
-   keysBegin_ = keysBegin;
-   keysEnd_ = keysEnd;
-   recordImpls_.resize(keysEnd_ - keysBegin_, nullptr);
-}
+  void EventSetupImpl::setKeyIters(std::vector<eventsetup::EventSetupRecordKey>::const_iterator const& keysBegin,
+                                   std::vector<eventsetup::EventSetupRecordKey>::const_iterator const& keysEnd) {
+    keysBegin_ = keysBegin;
+    keysEnd_ = keysEnd;
+    recordImpls_.resize(keysEnd_ - keysBegin_, nullptr);
+  }
 
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/EventSetupProvider.cc b/FWCore/Framework/src/EventSetupProvider.cc
index 418e9fc23a7d7..e1cc33dc286b2 100644
--- a/FWCore/Framework/src/EventSetupProvider.cc
+++ b/FWCore/Framework/src/EventSetupProvider.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Module:      EventSetupProvider
-// 
+//
 // Description: <one line class summary>
 //
 // Implementation:
@@ -24,751 +24,716 @@
 #include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
 #include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ParameterSetIDHolder.h"
+#include "FWCore/Framework/interface/ESRecordsToProxyIndices.h"
 #include "FWCore/Framework/src/EventSetupsController.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/Algorithms.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-
 namespace edm {
-   namespace eventsetup {
-
-EventSetupProvider::EventSetupProvider(ActivityRegistry* activityRegistry,
-                                       unsigned subProcessIndex,
-                                       const PreferredProviderInfo* iInfo) :
-eventSetup_(activityRegistry),
-mustFinishConfiguration_(true),
-subProcessIndex_(subProcessIndex),
-preferredProviderInfo_((nullptr!=iInfo) ? (new PreferredProviderInfo(*iInfo)): nullptr),
-finders_(new std::vector<std::shared_ptr<EventSetupRecordIntervalFinder> >() ),
-dataProviders_(new std::vector<std::shared_ptr<DataProxyProvider> >() ),
-referencedDataKeys_(new std::map<EventSetupRecordKey, std::map<DataKey, ComponentDescription const*> >),
-recordToFinders_(new std::map<EventSetupRecordKey, std::vector<std::shared_ptr<EventSetupRecordIntervalFinder> > >),
-psetIDToRecordKey_(new std::map<ParameterSetIDHolder, std::set<EventSetupRecordKey> >),
-recordToPreferred_(new std::map<EventSetupRecordKey, std::map<DataKey, ComponentDescription> >),
-recordsWithALooperProxy_(new std::set<EventSetupRecordKey>)
-{
-}
-
-EventSetupProvider::~EventSetupProvider()
-{
-  forceCacheClear();
-}
-
-std::shared_ptr<EventSetupRecordProvider>& EventSetupProvider::recordProvider(const EventSetupRecordKey& iKey) {
-   auto lb = std::lower_bound(recordKeys_.begin(), recordKeys_.end(), iKey);
-   if (lb == recordKeys_.end() || iKey != *lb) {
-      throw cms::Exception("LogicError") << "EventSetupProvider::recordProvider Could not find key\n"
-                                         << "Should be impossible. Please contact Framework developer.\n";
-   }
-   auto index = std::distance(recordKeys_.begin(), lb);
-   return recordProviders_[index];
-}
-
-EventSetupRecordProvider* EventSetupProvider::tryToGetRecordProvider(const EventSetupRecordKey& iKey) {
-   auto lb = std::lower_bound(recordKeys_.begin(), recordKeys_.end(), iKey);
-   if (lb == recordKeys_.end() || iKey != *lb) {
-      return nullptr;
-   }
-   auto index = std::distance(recordKeys_.begin(), lb);
-   return recordProviders_[index].get();
-}
-
-void 
-EventSetupProvider::insert(const EventSetupRecordKey& iKey, std::unique_ptr<EventSetupRecordProvider> iProvider)
-{
-   auto lb = std::lower_bound(recordKeys_.begin(), recordKeys_.end(), iKey);
-   auto index = std::distance(recordKeys_.begin(), lb);
-   if (lb == recordKeys_.end() || iKey != *lb) {     
-     recordKeys_.insert(lb, iKey);
-     recordProviders_.insert(recordProviders_.begin() + index, std::move(iProvider));
-   } else {
-     recordProviders_[index] = std::move(iProvider);
-   }
-}
-
-void 
-EventSetupProvider::add(std::shared_ptr<DataProxyProvider> iProvider)
-{
-   assert(iProvider.get() != nullptr);
-   dataProviders_->push_back(iProvider);
-}
-
-void 
-EventSetupProvider::replaceExisting(std::shared_ptr<DataProxyProvider> dataProxyProvider)
-{
-   ParameterSetIDHolder psetID(dataProxyProvider->description().pid_);
-   std::set<EventSetupRecordKey> const& keysForPSetID = (*psetIDToRecordKey_)[psetID];
-   for (auto const& key : keysForPSetID) {
-      recordProvider(key)->resetProxyProvider(psetID, dataProxyProvider);
-   }
-}
-
-void 
-EventSetupProvider::add(std::shared_ptr<EventSetupRecordIntervalFinder> iFinder)
-{
-   assert(iFinder.get() != nullptr);
-   finders_->push_back(iFinder);
-}
-
-using RecordProviders = std::vector<std::shared_ptr<EventSetupRecordProvider>>;
-using RecordToPreferred = std::map<EventSetupRecordKey, EventSetupRecordProvider::DataToPreferredProviderMap>;
-///find everything made by a DataProxyProvider and add it to the 'preferred' list
-static
-void 
-preferEverything(const ComponentDescription& iComponent,
-                 const RecordProviders& iRecordProviders,
-                 RecordToPreferred& iReturnValue)
-{
-   //need to get our hands on the actual DataProxyProvider
-   bool foundProxyProvider = false;
-   for (auto const& recordProvider : iRecordProviders) {
-      std::set<ComponentDescription> components = recordProvider->proxyProviderDescriptions();
-      if(components.find(iComponent)!= components.end()) {
-         std::shared_ptr<DataProxyProvider> proxyProv = 
-         recordProvider->proxyProvider(*(components.find(iComponent)));
-         assert(proxyProv.get());
-         
-         std::set<EventSetupRecordKey> records = proxyProv->usingRecords();
-         for(std::set<EventSetupRecordKey>::iterator itRecord = records.begin(),
-             itRecordEnd = records.end();
-             itRecord != itRecordEnd;
-             ++itRecord){
+  namespace eventsetup {
+
+    EventSetupProvider::EventSetupProvider(ActivityRegistry* activityRegistry,
+                                           unsigned subProcessIndex,
+                                           const PreferredProviderInfo* iInfo)
+        : eventSetup_(activityRegistry),
+          mustFinishConfiguration_(true),
+          subProcessIndex_(subProcessIndex),
+          preferredProviderInfo_((nullptr != iInfo) ? (new PreferredProviderInfo(*iInfo)) : nullptr),
+          finders_(new std::vector<std::shared_ptr<EventSetupRecordIntervalFinder>>()),
+          dataProviders_(new std::vector<std::shared_ptr<DataProxyProvider>>()),
+          referencedDataKeys_(new std::map<EventSetupRecordKey, std::map<DataKey, ComponentDescription const*>>),
+          recordToFinders_(
+              new std::map<EventSetupRecordKey, std::vector<std::shared_ptr<EventSetupRecordIntervalFinder>>>),
+          psetIDToRecordKey_(new std::map<ParameterSetIDHolder, std::set<EventSetupRecordKey>>),
+          recordToPreferred_(new std::map<EventSetupRecordKey, std::map<DataKey, ComponentDescription>>),
+          recordsWithALooperProxy_(new std::set<EventSetupRecordKey>) {}
+
+    EventSetupProvider::~EventSetupProvider() { forceCacheClear(); }
+
+    std::shared_ptr<EventSetupRecordProvider>& EventSetupProvider::recordProvider(const EventSetupRecordKey& iKey) {
+      auto lb = std::lower_bound(recordKeys_.begin(), recordKeys_.end(), iKey);
+      if (lb == recordKeys_.end() || iKey != *lb) {
+        throw cms::Exception("LogicError") << "EventSetupProvider::recordProvider Could not find key\n"
+                                           << "Should be impossible. Please contact Framework developer.\n";
+      }
+      auto index = std::distance(recordKeys_.begin(), lb);
+      return recordProviders_[index];
+    }
+
+    EventSetupRecordProvider* EventSetupProvider::tryToGetRecordProvider(const EventSetupRecordKey& iKey) {
+      auto lb = std::lower_bound(recordKeys_.begin(), recordKeys_.end(), iKey);
+      if (lb == recordKeys_.end() || iKey != *lb) {
+        return nullptr;
+      }
+      auto index = std::distance(recordKeys_.begin(), lb);
+      return recordProviders_[index].get();
+    }
+
+    void EventSetupProvider::insert(const EventSetupRecordKey& iKey,
+                                    std::unique_ptr<EventSetupRecordProvider> iProvider) {
+      auto lb = std::lower_bound(recordKeys_.begin(), recordKeys_.end(), iKey);
+      auto index = std::distance(recordKeys_.begin(), lb);
+      if (lb == recordKeys_.end() || iKey != *lb) {
+        recordKeys_.insert(lb, iKey);
+        recordProviders_.insert(recordProviders_.begin() + index, std::move(iProvider));
+      } else {
+        recordProviders_[index] = std::move(iProvider);
+      }
+    }
+
+    void EventSetupProvider::add(std::shared_ptr<DataProxyProvider> iProvider) {
+      assert(iProvider.get() != nullptr);
+      dataProviders_->push_back(iProvider);
+    }
+
+    void EventSetupProvider::replaceExisting(std::shared_ptr<DataProxyProvider> dataProxyProvider) {
+      ParameterSetIDHolder psetID(dataProxyProvider->description().pid_);
+      std::set<EventSetupRecordKey> const& keysForPSetID = (*psetIDToRecordKey_)[psetID];
+      for (auto const& key : keysForPSetID) {
+        recordProvider(key)->resetProxyProvider(psetID, dataProxyProvider);
+      }
+    }
+
+    void EventSetupProvider::add(std::shared_ptr<EventSetupRecordIntervalFinder> iFinder) {
+      assert(iFinder.get() != nullptr);
+      finders_->push_back(iFinder);
+    }
+
+    using RecordProviders = std::vector<std::shared_ptr<EventSetupRecordProvider>>;
+    using RecordToPreferred = std::map<EventSetupRecordKey, EventSetupRecordProvider::DataToPreferredProviderMap>;
+    ///find everything made by a DataProxyProvider and add it to the 'preferred' list
+    static void preferEverything(const ComponentDescription& iComponent,
+                                 const RecordProviders& iRecordProviders,
+                                 RecordToPreferred& iReturnValue) {
+      //need to get our hands on the actual DataProxyProvider
+      bool foundProxyProvider = false;
+      for (auto const& recordProvider : iRecordProviders) {
+        std::set<ComponentDescription> components = recordProvider->proxyProviderDescriptions();
+        if (components.find(iComponent) != components.end()) {
+          std::shared_ptr<DataProxyProvider> proxyProv = recordProvider->proxyProvider(*(components.find(iComponent)));
+          assert(proxyProv.get());
+
+          std::set<EventSetupRecordKey> records = proxyProv->usingRecords();
+          for (std::set<EventSetupRecordKey>::iterator itRecord = records.begin(), itRecordEnd = records.end();
+               itRecord != itRecordEnd;
+               ++itRecord) {
             const DataProxyProvider::KeyedProxies& keyedProxies = proxyProv->keyedProxies(*itRecord);
-            if(!keyedProxies.empty()){
-               //add them to our output
-               EventSetupRecordProvider::DataToPreferredProviderMap& dataToProviderMap =
-               iReturnValue[*itRecord];
-               
-               for(DataProxyProvider::KeyedProxies::const_iterator itProxy = keyedProxies.begin(),
-	           itProxyEnd = keyedProxies.end();
+            if (!keyedProxies.empty()) {
+              //add them to our output
+              EventSetupRecordProvider::DataToPreferredProviderMap& dataToProviderMap = iReturnValue[*itRecord];
+
+              for (DataProxyProvider::KeyedProxies::const_iterator itProxy = keyedProxies.begin(),
+                                                                   itProxyEnd = keyedProxies.end();
                    itProxy != itProxyEnd;
                    ++itProxy) {
-                  EventSetupRecordProvider::DataToPreferredProviderMap::iterator itFind =
-                  dataToProviderMap.find(itProxy->first);
-                  if(itFind != dataToProviderMap.end()){
-                     throw cms::Exception("ESPreferConflict") <<"Two providers have been set to be preferred for\n"
-                     <<itProxy->first.type().name()<<" \""<<itProxy->first.name().value()<<"\""
-                     <<"\n the providers are "
-                     <<"\n 1) type="<<itFind->second.type_<<" label=\""<<itFind->second.label_<<"\""
-                     <<"\n 2) type="<<iComponent.type_<<" label=\""<<iComponent.label_<<"\""
-                     <<"\nPlease modify configuration so only one is preferred";
-                  }
-                  dataToProviderMap.insert(std::make_pair(itProxy->first,iComponent));
-               }
+                EventSetupRecordProvider::DataToPreferredProviderMap::iterator itFind =
+                    dataToProviderMap.find(itProxy->first);
+                if (itFind != dataToProviderMap.end()) {
+                  throw cms::Exception("ESPreferConflict")
+                      << "Two providers have been set to be preferred for\n"
+                      << itProxy->first.type().name() << " \"" << itProxy->first.name().value() << "\""
+                      << "\n the providers are "
+                      << "\n 1) type=" << itFind->second.type_ << " label=\"" << itFind->second.label_ << "\""
+                      << "\n 2) type=" << iComponent.type_ << " label=\"" << iComponent.label_ << "\""
+                      << "\nPlease modify configuration so only one is preferred";
+                }
+                dataToProviderMap.insert(std::make_pair(itProxy->first, iComponent));
+              }
             }
-         }
-         foundProxyProvider=true;
-         break;
+          }
+          foundProxyProvider = true;
+          break;
+        }
+      }
+      if (!foundProxyProvider) {
+        throw cms::Exception("ESPreferNoProvider")
+            << "Could not make type=\"" << iComponent.type_ << "\" label=\"" << iComponent.label_
+            << "\" a preferred Provider."
+            << "\n  Please check spelling of name, or that it was loaded into the job.";
       }
-   }
-   if(!foundProxyProvider) {
-      throw cms::Exception("ESPreferNoProvider")<<"Could not make type=\""<<iComponent.type_
-      <<"\" label=\""<<iComponent.label_<<"\" a preferred Provider."<<
-      "\n  Please check spelling of name, or that it was loaded into the job.";
-   }
-}
-
-void
-EventSetupProvider::determinePreferred() {
-
-   using namespace edm::eventsetup;
-   if (preferredProviderInfo_) {
-      for (auto const& itInfo : *preferredProviderInfo_) {
-         if(itInfo.second.empty()) {
+    }
+
+    void EventSetupProvider::determinePreferred() {
+      using namespace edm::eventsetup;
+      if (preferredProviderInfo_) {
+        for (auto const& itInfo : *preferredProviderInfo_) {
+          if (itInfo.second.empty()) {
             //want everything
             preferEverything(itInfo.first, recordProviders_, *recordToPreferred_);
-         } else {
-            for(EventSetupProvider::RecordToDataMap::const_iterator itRecData = itInfo.second.begin(),
-                itRecDataEnd = itInfo.second.end();
-                itRecData != itRecDataEnd;
-                ++itRecData) {
-               std::string recordName= itRecData->first;
-               EventSetupRecordKey recordKey(eventsetup::EventSetupRecordKey::TypeTag::findType(recordName));
-               if(recordKey.type() == eventsetup::EventSetupRecordKey::TypeTag()) {
-                  throw cms::Exception("ESPreferUnknownRecord") <<"Unknown record \""<<recordName
-                  <<"\" used in es_prefer statement for type="
-                  <<itInfo.first.type_<<" label=\""<<itInfo.first.label_
-                  <<"\"\n Please check spelling.";
-                  //record not found
-               }
-               //See if the ProxyProvider provides something for this Record
-               EventSetupRecordProvider& recordProviderForKey = *recordProvider(recordKey);
-               
-               std::set<ComponentDescription> components = recordProviderForKey.proxyProviderDescriptions();
-               std::set<ComponentDescription>::iterator itProxyProv = components.find(itInfo.first);
-               if(itProxyProv == components.end()){
-                  throw cms::Exception("ESPreferWrongRecord")<<"The type="<<itInfo.first.type_<<" label=\""<<
-                  itInfo.first.label_<<"\" does not provide data for the Record "<<recordName;
-               }
-               //Does it data type exist?
-               eventsetup::TypeTag datumType = eventsetup::TypeTag::findType(itRecData->second.first);
-               if(datumType == eventsetup::TypeTag()) {
-                  //not found
-                  throw cms::Exception("ESPreferWrongDataType")<<"The es_prefer statement for type="<<itInfo.first.type_<<" label=\""<<
-                  itInfo.first.label_<<"\" has the unknown data type \""<<itRecData->second.first<<"\""
-                  <<"\n Please check spelling";
-               }
-               eventsetup::DataKey datumKey(datumType, itRecData->second.second.c_str());
-               
-               //Does the proxyprovider make this?
-               std::shared_ptr<DataProxyProvider> proxyProv = 
-                  recordProviderForKey.proxyProvider(*itProxyProv);
-               const DataProxyProvider::KeyedProxies& keyedProxies = proxyProv->keyedProxies(recordKey);
-               if(std::find_if(keyedProxies.begin(), keyedProxies.end(),
-                               [&datumKey](auto const& kp) { return kp.first == datumKey;}) ==
-                   keyedProxies.end()){
-                  throw cms::Exception("ESPreferWrongData")<<"The es_prefer statement for type="<<itInfo.first.type_<<" label=\""<<
-                  itInfo.first.label_<<"\" specifies the data item \n"
-                  <<"  type=\""<<itRecData->second.first<<"\" label=\""<<itRecData->second.second<<"\""
-                  <<"  which is not provided.  Please check spelling.";
-               }
-               
-               EventSetupRecordProvider::DataToPreferredProviderMap& dataToProviderMap
-                 = (*recordToPreferred_)[recordKey];
-               //has another provider already been specified?
-               if(dataToProviderMap.end() != dataToProviderMap.find(datumKey)) {
-                  EventSetupRecordProvider::DataToPreferredProviderMap::iterator itFind =
-                  dataToProviderMap.find(datumKey);
-                  throw cms::Exception("ESPreferConflict") <<"Two providers have been set to be preferred for\n"
-                  <<datumKey.type().name()<<" \""<<datumKey.name().value()<<"\""
-                  <<"\n the providers are "
-                  <<"\n 1) type="<<itFind->second.type_<<" label=\""<<itFind->second.label_<<"\""
-                  <<"\n 2) type="<<itProxyProv->type_<<" label=\""<<itProxyProv->label_<<"\""
-                  <<"\nPlease modify configuration so only one is preferred";
-               }
-               dataToProviderMap.insert(std::make_pair(datumKey,*itProxyProv));
+          } else {
+            for (EventSetupProvider::RecordToDataMap::const_iterator itRecData = itInfo.second.begin(),
+                                                                     itRecDataEnd = itInfo.second.end();
+                 itRecData != itRecDataEnd;
+                 ++itRecData) {
+              std::string recordName = itRecData->first;
+              EventSetupRecordKey recordKey(eventsetup::EventSetupRecordKey::TypeTag::findType(recordName));
+              if (recordKey.type() == eventsetup::EventSetupRecordKey::TypeTag()) {
+                throw cms::Exception("ESPreferUnknownRecord")
+                    << "Unknown record \"" << recordName
+                    << "\" used in es_prefer statement for type=" << itInfo.first.type_ << " label=\""
+                    << itInfo.first.label_ << "\"\n Please check spelling.";
+                //record not found
+              }
+              //See if the ProxyProvider provides something for this Record
+              EventSetupRecordProvider& recordProviderForKey = *recordProvider(recordKey);
+
+              std::set<ComponentDescription> components = recordProviderForKey.proxyProviderDescriptions();
+              std::set<ComponentDescription>::iterator itProxyProv = components.find(itInfo.first);
+              if (itProxyProv == components.end()) {
+                throw cms::Exception("ESPreferWrongRecord")
+                    << "The type=" << itInfo.first.type_ << " label=\"" << itInfo.first.label_
+                    << "\" does not provide data for the Record " << recordName;
+              }
+              //Does it data type exist?
+              eventsetup::TypeTag datumType = eventsetup::TypeTag::findType(itRecData->second.first);
+              if (datumType == eventsetup::TypeTag()) {
+                //not found
+                throw cms::Exception("ESPreferWrongDataType")
+                    << "The es_prefer statement for type=" << itInfo.first.type_ << " label=\"" << itInfo.first.label_
+                    << "\" has the unknown data type \"" << itRecData->second.first << "\""
+                    << "\n Please check spelling";
+              }
+              eventsetup::DataKey datumKey(datumType, itRecData->second.second.c_str());
+
+              //Does the proxyprovider make this?
+              std::shared_ptr<DataProxyProvider> proxyProv = recordProviderForKey.proxyProvider(*itProxyProv);
+              const DataProxyProvider::KeyedProxies& keyedProxies = proxyProv->keyedProxies(recordKey);
+              if (std::find_if(keyedProxies.begin(), keyedProxies.end(), [&datumKey](auto const& kp) {
+                    return kp.first == datumKey;
+                  }) == keyedProxies.end()) {
+                throw cms::Exception("ESPreferWrongData")
+                    << "The es_prefer statement for type=" << itInfo.first.type_ << " label=\"" << itInfo.first.label_
+                    << "\" specifies the data item \n"
+                    << "  type=\"" << itRecData->second.first << "\" label=\"" << itRecData->second.second << "\""
+                    << "  which is not provided.  Please check spelling.";
+              }
+
+              EventSetupRecordProvider::DataToPreferredProviderMap& dataToProviderMap =
+                  (*recordToPreferred_)[recordKey];
+              //has another provider already been specified?
+              if (dataToProviderMap.end() != dataToProviderMap.find(datumKey)) {
+                EventSetupRecordProvider::DataToPreferredProviderMap::iterator itFind =
+                    dataToProviderMap.find(datumKey);
+                throw cms::Exception("ESPreferConflict")
+                    << "Two providers have been set to be preferred for\n"
+                    << datumKey.type().name() << " \"" << datumKey.name().value() << "\""
+                    << "\n the providers are "
+                    << "\n 1) type=" << itFind->second.type_ << " label=\"" << itFind->second.label_ << "\""
+                    << "\n 2) type=" << itProxyProv->type_ << " label=\"" << itProxyProv->label_ << "\""
+                    << "\nPlease modify configuration so only one is preferred";
+              }
+              dataToProviderMap.insert(std::make_pair(datumKey, *itProxyProv));
             }
-         }
+          }
+        }
       }
-   }
-}
-
-void
-EventSetupProvider::finishConfiguration()
-{   
-   //we delayed adding finders to the system till here so that everything would be loaded first
-   recordToFinders_->clear();
-   for(std::vector<std::shared_ptr<EventSetupRecordIntervalFinder> >::iterator itFinder=finders_->begin(),
-       itEnd = finders_->end();
-       itFinder != itEnd;
-       ++itFinder) {
-      typedef std::set<EventSetupRecordKey> Keys;
-      const Keys recordsUsing = (*itFinder)->findingForRecords();
-
-      for (auto const& key : recordsUsing) {
-
-         (*recordToFinders_)[key].push_back(*itFinder);
+    }
 
-         EventSetupRecordProvider* recProvider = tryToGetRecordProvider(key);
-         if (recProvider == nullptr) {
+    void EventSetupProvider::finishConfiguration() {
+      //we delayed adding finders to the system till here so that everything would be loaded first
+      recordToFinders_->clear();
+      for (std::vector<std::shared_ptr<EventSetupRecordIntervalFinder>>::iterator itFinder = finders_->begin(),
+                                                                                  itEnd = finders_->end();
+           itFinder != itEnd;
+           ++itFinder) {
+        typedef std::set<EventSetupRecordKey> Keys;
+        const Keys recordsUsing = (*itFinder)->findingForRecords();
+
+        for (auto const& key : recordsUsing) {
+          (*recordToFinders_)[key].push_back(*itFinder);
+
+          EventSetupRecordProvider* recProvider = tryToGetRecordProvider(key);
+          if (recProvider == nullptr) {
             //create a provider for this record
             insert(key, std::make_unique<EventSetupRecordProvider>(key));
             recProvider = tryToGetRecordProvider(key);
-         }
-         recProvider->addFinder(*itFinder);
+          }
+          recProvider->addFinder(*itFinder);
+        }
       }
-   }
-   //we've transfered our ownership so this is no longer needed
-   finders_.reset();
-
-   //Now handle providers since sources can also be finders and the sources can delay registering
-   // their Records and therefore could delay setting up their Proxies
-   psetIDToRecordKey_->clear();
-   typedef std::set<EventSetupRecordKey> Keys;
-   for(std::vector<std::shared_ptr<DataProxyProvider> >::iterator itProvider=dataProviders_->begin(),
-       itEnd = dataProviders_->end();
-       itProvider != itEnd;
-       ++itProvider) {
-      
-      ParameterSetIDHolder psetID((*itProvider)->description().pid_);
-
-      const Keys recordsUsing = (*itProvider)->usingRecords();
-
-      for (auto const& key : recordsUsing) {
-
-         if ((*itProvider)->description().isLooper_) {
+      //we've transfered our ownership so this is no longer needed
+      finders_.reset();
+
+      //Now handle providers since sources can also be finders and the sources can delay registering
+      // their Records and therefore could delay setting up their Proxies
+      psetIDToRecordKey_->clear();
+      typedef std::set<EventSetupRecordKey> Keys;
+      for (std::vector<std::shared_ptr<DataProxyProvider>>::iterator itProvider = dataProviders_->begin(),
+                                                                     itEnd = dataProviders_->end();
+           itProvider != itEnd;
+           ++itProvider) {
+        ParameterSetIDHolder psetID((*itProvider)->description().pid_);
+
+        const Keys recordsUsing = (*itProvider)->usingRecords();
+
+        for (auto const& key : recordsUsing) {
+          if ((*itProvider)->description().isLooper_) {
             recordsWithALooperProxy_->insert(key);
-         }
+          }
 
-         (*psetIDToRecordKey_)[psetID].insert(key);
+          (*psetIDToRecordKey_)[psetID].insert(key);
 
-         EventSetupRecordProvider* recProvider = tryToGetRecordProvider(key);
-         if (recProvider == nullptr) {
+          EventSetupRecordProvider* recProvider = tryToGetRecordProvider(key);
+          if (recProvider == nullptr) {
             //create a provider for this record
             insert(key, std::make_unique<EventSetupRecordProvider>(key));
             recProvider = tryToGetRecordProvider(key);
-         }
-         recProvider->add(*itProvider);
+          }
+          recProvider->add(*itProvider);
+        }
       }
-   }
-   dataProviders_.reset();
-
-   eventSetup_.setKeyIters(recordKeys_.begin(), recordKeys_.end());
 
-   //used for the case where no preferred Providers have been specified for the Record
-   static const EventSetupRecordProvider::DataToPreferredProviderMap kEmptyMap;
-   
-   determinePreferred();
+      eventSetup_.setKeyIters(recordKeys_.begin(), recordKeys_.end());
 
-   //For each Provider, find all the Providers it depends on.  If a dependent Provider
-   // can not be found pass in an empty list
-   //CHANGE: now allow for missing Providers
-   for (auto& itRecordProvider : recordProviders_) {
+      //used for the case where no preferred Providers have been specified for the Record
+      static const EventSetupRecordProvider::DataToPreferredProviderMap kEmptyMap;
 
-      const EventSetupRecordProvider::DataToPreferredProviderMap* preferredInfo = &kEmptyMap;
-      RecordToPreferred::const_iterator itRecordFound = recordToPreferred_->find(itRecordProvider->key());
-      if(itRecordFound != recordToPreferred_->end()) {
-         preferredInfo = &(itRecordFound->second);
-      }
-      //Give it our list of preferred 
-      itRecordProvider->usePreferred(*preferredInfo);
-
-      std::set<EventSetupRecordKey> records = itRecordProvider->dependentRecords();
-      if(!records.empty()) {
-         std::string missingRecords;
-         std::vector<std::shared_ptr<EventSetupRecordProvider> > depProviders;
-         depProviders.reserve(records.size());
-         bool foundAllProviders = true;
-         for (auto const& key : records) {
+      determinePreferred();
+
+      //For each Provider, find all the Providers it depends on.  If a dependent Provider
+      // can not be found pass in an empty list
+      //CHANGE: now allow for missing Providers
+      for (auto& itRecordProvider : recordProviders_) {
+        const EventSetupRecordProvider::DataToPreferredProviderMap* preferredInfo = &kEmptyMap;
+        RecordToPreferred::const_iterator itRecordFound = recordToPreferred_->find(itRecordProvider->key());
+        if (itRecordFound != recordToPreferred_->end()) {
+          preferredInfo = &(itRecordFound->second);
+        }
+        //Give it our list of preferred
+        itRecordProvider->usePreferred(*preferredInfo);
+
+        std::set<EventSetupRecordKey> records = itRecordProvider->dependentRecords();
+        if (!records.empty()) {
+          std::string missingRecords;
+          std::vector<std::shared_ptr<EventSetupRecordProvider>> depProviders;
+          depProviders.reserve(records.size());
+          bool foundAllProviders = true;
+          for (auto const& key : records) {
             auto lb = std::lower_bound(recordKeys_.begin(), recordKeys_.end(), key);
             if (lb == recordKeys_.end() || key != *lb) {
-               foundAllProviders = false;
-               if(missingRecords.empty()) {
-                 missingRecords = key.name();
-               } else {
-                 missingRecords += ", ";
-                 missingRecords += key.name();
-               }
+              foundAllProviders = false;
+              if (missingRecords.empty()) {
+                missingRecords = key.name();
+              } else {
+                missingRecords += ", ";
+                missingRecords += key.name();
+              }
             } else {
-               auto index = std::distance(recordKeys_.begin(), lb);
-               depProviders.push_back(recordProviders_[index]);
+              auto index = std::distance(recordKeys_.begin(), lb);
+              depProviders.push_back(recordProviders_[index]);
             }
-         }
-         
-         if(!foundAllProviders) {
-            edm::LogInfo("EventSetupDependency")<<"The EventSetup record "<<itRecordProvider->key().name()
-            <<" depends on at least one Record \n ("<<missingRecords<<") which is not present in the job."
-           "\n This may lead to an exception begin thrown during event processing.\n If no exception occurs during the job than it is usually safe to ignore this message.";
+          }
+
+          if (!foundAllProviders) {
+            edm::LogInfo("EventSetupDependency")
+                << "The EventSetup record " << itRecordProvider->key().name() << " depends on at least one Record \n ("
+                << missingRecords
+                << ") which is not present in the job."
+                   "\n This may lead to an exception begin thrown during event processing.\n If no exception occurs "
+                   "during the job than it is usually safe to ignore this message.";
 
             //depProviders.clear();
-           //NOTE: should provide a warning
-         }
-          
-         itRecordProvider->setDependentProviders(depProviders);
+            //NOTE: should provide a warning
+          }
+
+          itRecordProvider->setDependentProviders(depProviders);
+        }
+      }
+
+      auto indices = recordsToProxyIndices();
+      for (auto& provider : *dataProviders_) {
+        provider->updateLookup(indices);
+      }
+      dataProviders_.reset();
+
+      mustFinishConfiguration_ = false;
+    }
+
+    using Itr = RecordProviders::iterator;
+    static void findDependents(const EventSetupRecordKey& iKey,
+                               Itr itBegin,
+                               Itr itEnd,
+                               std::vector<std::shared_ptr<EventSetupRecordProvider>>& oDependents) {
+      for (Itr it = itBegin; it != itEnd; ++it) {
+        //does it depend on the record in question?
+        const std::set<EventSetupRecordKey>& deps = (*it)->dependentRecords();
+        if (deps.end() != deps.find(iKey)) {
+          oDependents.push_back(*it);
+          //now see who is dependent on this record since they will be indirectly dependent on iKey
+          findDependents((*it)->key(), itBegin, itEnd, oDependents);
+        }
       }
-   }
-   mustFinishConfiguration_ = false;
-}
-
-using Itr = RecordProviders::iterator;
-static
-void
-findDependents(const EventSetupRecordKey& iKey,
-               Itr itBegin,
-               Itr itEnd,
-               std::vector<std::shared_ptr<EventSetupRecordProvider> >& oDependents)
-{
-  
-  for(Itr it = itBegin; it != itEnd; ++it) {
-    //does it depend on the record in question?
-    const std::set<EventSetupRecordKey>& deps = (*it)->dependentRecords();
-    if(deps.end() != deps.find(iKey)) {
-      oDependents.push_back(*it);
-      //now see who is dependent on this record since they will be indirectly dependent on iKey
-      findDependents((*it)->key(), itBegin, itEnd, oDependents);
     }
-  }
-}
-               
-void 
-EventSetupProvider::resetRecordPlusDependentRecords(const EventSetupRecordKey& iKey)
-{
-  EventSetupRecordProvider* recProvider = tryToGetRecordProvider(iKey);
-  if (recProvider == nullptr) {
-    return;
-  }
-
-  
-  std::vector<std::shared_ptr<EventSetupRecordProvider> > dependents;
-  findDependents(iKey, recordProviders_.begin(), recordProviders_.end(), dependents);
-
-  dependents.erase(std::unique(dependents.begin(),dependents.end()), dependents.end());
-  
-  recProvider->resetProxies();
-  for(auto& d: dependents) {
-    d->resetProxies();
-  }
-}
-
-void 
-EventSetupProvider::forceCacheClear()
-{
-   for (auto& recProvider : recordProviders_) {
-      if (recProvider) {
-         recProvider->resetProxies();
+
+    void EventSetupProvider::resetRecordPlusDependentRecords(const EventSetupRecordKey& iKey) {
+      EventSetupRecordProvider* recProvider = tryToGetRecordProvider(iKey);
+      if (recProvider == nullptr) {
+        return;
       }
-   }
-}
 
-void
-EventSetupProvider::checkESProducerSharing(EventSetupProvider& precedingESProvider,
-                                           std::set<ParameterSetIDHolder>& sharingCheckDone,
-                                           std::map<EventSetupRecordKey, std::vector<ComponentDescription const*> >& referencedESProducers,
-                                           EventSetupsController& esController) {
+      std::vector<std::shared_ptr<EventSetupRecordProvider>> dependents;
+      findDependents(iKey, recordProviders_.begin(), recordProviders_.end(), dependents);
+
+      dependents.erase(std::unique(dependents.begin(), dependents.end()), dependents.end());
 
-   edm::LogVerbatim("EventSetupSharing") << "EventSetupProvider::checkESProducerSharing: Checking processes with SubProcess Indexes "
-                                         << subProcessIndex() << " and " << precedingESProvider.subProcessIndex();
+      recProvider->resetProxies();
+      for (auto& d : dependents) {
+        d->resetProxies();
+      }
+    }
 
-   if (referencedESProducers.empty()) {
+    void EventSetupProvider::forceCacheClear() {
       for (auto& recProvider : recordProviders_) {
-         recProvider->getReferencedESProducers(referencedESProducers);
+        if (recProvider) {
+          recProvider->resetProxies();
+        }
       }
-   }
+    }
 
-   // This records whether the configurations of all the DataProxyProviders
-   // and finders matches for a particular pair of processes and
-   // a particular record and also the records it depends on.
-   std::map<EventSetupRecordKey, bool> allComponentsMatch;
+    void EventSetupProvider::checkESProducerSharing(
+        EventSetupProvider& precedingESProvider,
+        std::set<ParameterSetIDHolder>& sharingCheckDone,
+        std::map<EventSetupRecordKey, std::vector<ComponentDescription const*>>& referencedESProducers,
+        EventSetupsController& esController) {
+      edm::LogVerbatim("EventSetupSharing")
+          << "EventSetupProvider::checkESProducerSharing: Checking processes with SubProcess Indexes "
+          << subProcessIndex() << " and " << precedingESProvider.subProcessIndex();
+
+      if (referencedESProducers.empty()) {
+        for (auto& recProvider : recordProviders_) {
+          recProvider->getReferencedESProducers(referencedESProducers);
+        }
+      }
 
-   std::map<ParameterSetID, bool> candidateNotRejectedYet;
+      // This records whether the configurations of all the DataProxyProviders
+      // and finders matches for a particular pair of processes and
+      // a particular record and also the records it depends on.
+      std::map<EventSetupRecordKey, bool> allComponentsMatch;
 
-   // Loop over all the ESProducers which have a DataProxy
-   // referenced by any EventSetupRecord in this EventSetupProvider
-   for (auto const& iRecord : referencedESProducers) {
-      for (auto const& iComponent : iRecord.second) {
+      std::map<ParameterSetID, bool> candidateNotRejectedYet;
 
-         ParameterSetID const& psetID = iComponent->pid_;
-         ParameterSetIDHolder psetIDHolder(psetID);
-         if (sharingCheckDone.find(psetIDHolder) != sharingCheckDone.end()) continue;
+      // Loop over all the ESProducers which have a DataProxy
+      // referenced by any EventSetupRecord in this EventSetupProvider
+      for (auto const& iRecord : referencedESProducers) {
+        for (auto const& iComponent : iRecord.second) {
+          ParameterSetID const& psetID = iComponent->pid_;
+          ParameterSetIDHolder psetIDHolder(psetID);
+          if (sharingCheckDone.find(psetIDHolder) != sharingCheckDone.end())
+            continue;
 
-         bool firstProcessWithThisPSet = false;
-         bool precedingHasMatchingPSet = false;
+          bool firstProcessWithThisPSet = false;
+          bool precedingHasMatchingPSet = false;
 
-         esController.lookForMatches(psetID,
-                                     subProcessIndex_,
-                                     precedingESProvider.subProcessIndex_,
-                                     firstProcessWithThisPSet,
-                                     precedingHasMatchingPSet);
+          esController.lookForMatches(psetID,
+                                      subProcessIndex_,
+                                      precedingESProvider.subProcessIndex_,
+                                      firstProcessWithThisPSet,
+                                      precedingHasMatchingPSet);
 
-         if (firstProcessWithThisPSet) {
+          if (firstProcessWithThisPSet) {
             sharingCheckDone.insert(psetIDHolder);
             allComponentsMatch[iRecord.first] = false;
             continue;
-         }
+          }
 
-         if (!precedingHasMatchingPSet) {
+          if (!precedingHasMatchingPSet) {
             allComponentsMatch[iRecord.first] = false;
             continue;
-         }
-
-         // An ESProducer that survives to this point is a candidate.
-         // It was shared with some other process in the first pass where
-         // ESProducers were constructed and one of three possibilities exists:
-         //    1) It should not have been shared and a new ESProducer needs
-         //    to be created and the proper pointers set.
-         //    2) It should have been shared with a different preceding process
-         //    in which case some pointers need to be modified.
-         //    3) It was originally shared which the correct prior process
-         //    in which case nothing needs to be done, but we do need to
-         //    do some work to verify that.
-         // Make an entry in a map for each of these ESProducers. We
-         // will set the value to false if and when we determine
-         // the ESProducer cannot be shared between this pair of processes. 
-         auto iCandidateNotRejectedYet = candidateNotRejectedYet.find(psetID);
-         if (iCandidateNotRejectedYet == candidateNotRejectedYet.end()) {
+          }
+
+          // An ESProducer that survives to this point is a candidate.
+          // It was shared with some other process in the first pass where
+          // ESProducers were constructed and one of three possibilities exists:
+          //    1) It should not have been shared and a new ESProducer needs
+          //    to be created and the proper pointers set.
+          //    2) It should have been shared with a different preceding process
+          //    in which case some pointers need to be modified.
+          //    3) It was originally shared which the correct prior process
+          //    in which case nothing needs to be done, but we do need to
+          //    do some work to verify that.
+          // Make an entry in a map for each of these ESProducers. We
+          // will set the value to false if and when we determine
+          // the ESProducer cannot be shared between this pair of processes.
+          auto iCandidateNotRejectedYet = candidateNotRejectedYet.find(psetID);
+          if (iCandidateNotRejectedYet == candidateNotRejectedYet.end()) {
             candidateNotRejectedYet[psetID] = true;
             iCandidateNotRejectedYet = candidateNotRejectedYet.find(psetID);
-         }
-
-         // At this point we know that the two processes both
-         // have an ESProducer matching the type and label in
-         // iComponent and also with exactly the same configuration.
-         // And there was not an earlier preceding process
-         // where the same instance of the ESProducer could
-         // have been shared.  And this ESProducer was referenced
-         // by the later process's EventSetupRecord (prefered or
-         // or just the only thing that could have made the data).
-         // To determine if sharing is allowed, now we need to
-         // check if all the DataProxyProviders and all the
-         // finders are the same for this record and also for
-         // all records this record depends on. And even
-         // if this is true, we have to wait until the loop
-         // ends because some other DataProxy associated with
-         // the ESProducer could write to a different record where
-         // the same determination will need to be repeated. Only if
-         // all of the the DataProxy's can be shared, can the ESProducer
-         // instance be shared across processes.
-
-         if (iCandidateNotRejectedYet->second == true) {
-
+          }
+
+          // At this point we know that the two processes both
+          // have an ESProducer matching the type and label in
+          // iComponent and also with exactly the same configuration.
+          // And there was not an earlier preceding process
+          // where the same instance of the ESProducer could
+          // have been shared.  And this ESProducer was referenced
+          // by the later process's EventSetupRecord (prefered or
+          // or just the only thing that could have made the data).
+          // To determine if sharing is allowed, now we need to
+          // check if all the DataProxyProviders and all the
+          // finders are the same for this record and also for
+          // all records this record depends on. And even
+          // if this is true, we have to wait until the loop
+          // ends because some other DataProxy associated with
+          // the ESProducer could write to a different record where
+          // the same determination will need to be repeated. Only if
+          // all of the the DataProxy's can be shared, can the ESProducer
+          // instance be shared across processes.
+
+          if (iCandidateNotRejectedYet->second == true) {
             auto iAllComponentsMatch = allComponentsMatch.find(iRecord.first);
             if (iAllComponentsMatch == allComponentsMatch.end()) {
-
-               // We do not know the value in AllComponents yet and
-               // we need it now so we have to do the difficult calculation
-               // now.
-               bool match = doRecordsMatch(precedingESProvider,
-                                           iRecord.first,
-                                           allComponentsMatch,
-                                           esController);
-               allComponentsMatch[iRecord.first] = match;
-               iAllComponentsMatch = allComponentsMatch.find(iRecord.first);            
+              // We do not know the value in AllComponents yet and
+              // we need it now so we have to do the difficult calculation
+              // now.
+              bool match = doRecordsMatch(precedingESProvider, iRecord.first, allComponentsMatch, esController);
+              allComponentsMatch[iRecord.first] = match;
+              iAllComponentsMatch = allComponentsMatch.find(iRecord.first);
             }
             if (!iAllComponentsMatch->second) {
               iCandidateNotRejectedYet->second = false;
             }
-         }
-      }  // end loop over components used by record
-   } // end loop over records
-
-   // Loop over candidates
-   for (auto const& candidate : candidateNotRejectedYet) {
-      ParameterSetID const& psetID = candidate.first;
-      bool canBeShared = candidate.second;
-      if (canBeShared) {
-         ParameterSet const& pset = *esController.getESProducerPSet(psetID, subProcessIndex_);
-         logInfoWhenSharing(pset);
-         ParameterSetIDHolder psetIDHolder(psetID);
-         sharingCheckDone.insert(psetIDHolder);
-         if (esController.isFirstMatch(psetID,
-                                       subProcessIndex_,
-                                       precedingESProvider.subProcessIndex_)) {
+          }
+        }  // end loop over components used by record
+      }    // end loop over records
+
+      // Loop over candidates
+      for (auto const& candidate : candidateNotRejectedYet) {
+        ParameterSetID const& psetID = candidate.first;
+        bool canBeShared = candidate.second;
+        if (canBeShared) {
+          ParameterSet const& pset = *esController.getESProducerPSet(psetID, subProcessIndex_);
+          logInfoWhenSharing(pset);
+          ParameterSetIDHolder psetIDHolder(psetID);
+          sharingCheckDone.insert(psetIDHolder);
+          if (esController.isFirstMatch(psetID, subProcessIndex_, precedingESProvider.subProcessIndex_)) {
             continue;  // Proper sharing was already done. Nothing more to do.
-         }
+          }
 
-         // Need to reset the pointer from the EventSetupRecordProvider to the
-         // the DataProxyProvider so these two processes share an ESProducer.
+          // Need to reset the pointer from the EventSetupRecordProvider to the
+          // the DataProxyProvider so these two processes share an ESProducer.
 
-         std::shared_ptr<DataProxyProvider> dataProxyProvider;
-         std::set<EventSetupRecordKey> const& keysForPSetID1 = (*precedingESProvider.psetIDToRecordKey_)[psetIDHolder];
-         for (auto const& key : keysForPSetID1) {
+          std::shared_ptr<DataProxyProvider> dataProxyProvider;
+          std::set<EventSetupRecordKey> const& keysForPSetID1 = (*precedingESProvider.psetIDToRecordKey_)[psetIDHolder];
+          for (auto const& key : keysForPSetID1) {
             dataProxyProvider = precedingESProvider.recordProvider(key)->proxyProvider(psetIDHolder);
             assert(dataProxyProvider);
             break;
-         }
+          }
 
-         std::set<EventSetupRecordKey> const& keysForPSetID2 = (*psetIDToRecordKey_)[psetIDHolder];
-         for (auto const& key : keysForPSetID2) {
+          std::set<EventSetupRecordKey> const& keysForPSetID2 = (*psetIDToRecordKey_)[psetIDHolder];
+          for (auto const& key : keysForPSetID2) {
             recordProvider(key)->resetProxyProvider(psetIDHolder, dataProxyProvider);
-         }
-      } else {
-         if (esController.isLastMatch(psetID,
-                                      subProcessIndex_,
-                                      precedingESProvider.subProcessIndex_)) {
-            
-
+          }
+        } else {
+          if (esController.isLastMatch(psetID, subProcessIndex_, precedingESProvider.subProcessIndex_)) {
             ParameterSet const& pset = *esController.getESProducerPSet(psetID, subProcessIndex_);
-            ModuleFactory::get()->addTo(esController,
-                                        *this,
-                                        pset,
-                                        true);
+            ModuleFactory::get()->addTo(esController, *this, pset, true);
+          }
+        }
+      }
+    }
 
-         }
+    bool EventSetupProvider::doRecordsMatch(EventSetupProvider& precedingESProvider,
+                                            EventSetupRecordKey const& eventSetupRecordKey,
+                                            std::map<EventSetupRecordKey, bool>& allComponentsMatch,
+                                            EventSetupsController const& esController) {
+      // first check if this record matches. If not just return false
+
+      // then find the directly dependent records and iterate over them
+      // recursively call this function on them. If they return false
+      // set allComponentsMatch to false for them and return false.
+      // if they all return true then set allComponents to true
+      // and return true.
+
+      if (precedingESProvider.recordsWithALooperProxy_->find(eventSetupRecordKey) !=
+          precedingESProvider.recordsWithALooperProxy_->end()) {
+        return false;
       }
-   }
-}
-
-bool
-EventSetupProvider::doRecordsMatch(EventSetupProvider & precedingESProvider,
-                                   EventSetupRecordKey const& eventSetupRecordKey,
-                                   std::map<EventSetupRecordKey, bool> & allComponentsMatch,
-                                   EventSetupsController const& esController) {
-   // first check if this record matches. If not just return false
-
-   // then find the directly dependent records and iterate over them
-   // recursively call this function on them. If they return false
-   // set allComponentsMatch to false for them and return false.
-   // if they all return true then set allComponents to true
-   // and return true.
-
-   if (precedingESProvider.recordsWithALooperProxy_->find(eventSetupRecordKey) != precedingESProvider.recordsWithALooperProxy_->end()) {
-      return false;
-   }
-
-   if ((*recordToFinders_)[eventSetupRecordKey].size() != (*precedingESProvider.recordToFinders_)[eventSetupRecordKey].size()) {
-      return false;
-   }
-
-   for (auto const& finder : (*recordToFinders_)[eventSetupRecordKey]) {
-      ParameterSetID const& psetID = finder->descriptionForFinder().pid_;
-      bool itMatches = esController.isMatchingESSource(psetID,
-                                                       subProcessIndex_,
-                                                       precedingESProvider.subProcessIndex_);
-      if (!itMatches) {
-         return false;
+
+      if ((*recordToFinders_)[eventSetupRecordKey].size() !=
+          (*precedingESProvider.recordToFinders_)[eventSetupRecordKey].size()) {
+        return false;
       }
-   }
 
-   fillReferencedDataKeys(eventSetupRecordKey);
-   precedingESProvider.fillReferencedDataKeys(eventSetupRecordKey);
+      for (auto const& finder : (*recordToFinders_)[eventSetupRecordKey]) {
+        ParameterSetID const& psetID = finder->descriptionForFinder().pid_;
+        bool itMatches =
+            esController.isMatchingESSource(psetID, subProcessIndex_, precedingESProvider.subProcessIndex_);
+        if (!itMatches) {
+          return false;
+        }
+      }
 
-   std::map<DataKey, ComponentDescription const*> const& dataItems = (*referencedDataKeys_)[eventSetupRecordKey];
+      fillReferencedDataKeys(eventSetupRecordKey);
+      precedingESProvider.fillReferencedDataKeys(eventSetupRecordKey);
 
-   std::map<DataKey, ComponentDescription const*> const& precedingDataItems = (*precedingESProvider.referencedDataKeys_)[eventSetupRecordKey];
+      std::map<DataKey, ComponentDescription const*> const& dataItems = (*referencedDataKeys_)[eventSetupRecordKey];
 
-   if (dataItems.size() != precedingDataItems.size()) {
-      return false;
-   }
+      std::map<DataKey, ComponentDescription const*> const& precedingDataItems =
+          (*precedingESProvider.referencedDataKeys_)[eventSetupRecordKey];
 
-   for (auto const& dataItem : dataItems) {
-      auto precedingDataItem = precedingDataItems.find(dataItem.first);
-      if (precedingDataItem == precedingDataItems.end()) {
-         return false;
-      }
-      if (dataItem.second->pid_ != precedingDataItem->second->pid_) {
-         return false;
+      if (dataItems.size() != precedingDataItems.size()) {
+        return false;
       }
-      // Check that the configurations match exactly for the ESProducers
-      // (We already checked the ESSources above and there should not be
-      // any loopers)
-      if (!dataItem.second->isSource_ && !dataItem.second->isLooper_) {
-         bool itMatches = esController.isMatchingESProducer(dataItem.second->pid_,
-                                                            subProcessIndex_,
-                                                            precedingESProvider.subProcessIndex_);
-         if (!itMatches) {
+
+      for (auto const& dataItem : dataItems) {
+        auto precedingDataItem = precedingDataItems.find(dataItem.first);
+        if (precedingDataItem == precedingDataItems.end()) {
+          return false;
+        }
+        if (dataItem.second->pid_ != precedingDataItem->second->pid_) {
+          return false;
+        }
+        // Check that the configurations match exactly for the ESProducers
+        // (We already checked the ESSources above and there should not be
+        // any loopers)
+        if (!dataItem.second->isSource_ && !dataItem.second->isLooper_) {
+          bool itMatches = esController.isMatchingESProducer(
+              dataItem.second->pid_, subProcessIndex_, precedingESProvider.subProcessIndex_);
+          if (!itMatches) {
             return false;
-         }
+          }
+        }
       }
-   }
-   EventSetupRecordProvider* recProvider = tryToGetRecordProvider(eventSetupRecordKey);
-   if (recProvider != nullptr) {
-      std::set<EventSetupRecordKey> dependentRecords = recProvider->dependentRecords();
-      for (auto const& dependentRecord : dependentRecords) {
-         auto iter = allComponentsMatch.find(dependentRecord);
-         if (iter != allComponentsMatch.end()) {
+      EventSetupRecordProvider* recProvider = tryToGetRecordProvider(eventSetupRecordKey);
+      if (recProvider != nullptr) {
+        std::set<EventSetupRecordKey> dependentRecords = recProvider->dependentRecords();
+        for (auto const& dependentRecord : dependentRecords) {
+          auto iter = allComponentsMatch.find(dependentRecord);
+          if (iter != allComponentsMatch.end()) {
             if (iter->second) {
-               continue;
+              continue;
             } else {
-               return false;
+              return false;
             }
-         }
-         bool match = doRecordsMatch(precedingESProvider,
-                                     dependentRecord,
-                                     allComponentsMatch,
-                                     esController);            
-         allComponentsMatch[dependentRecord] = match;
-         if (!match) return false;
+          }
+          bool match = doRecordsMatch(precedingESProvider, dependentRecord, allComponentsMatch, esController);
+          allComponentsMatch[dependentRecord] = match;
+          if (!match)
+            return false;
+        }
       }
-   }
-   return true;
-}
-
-void
-EventSetupProvider::fillReferencedDataKeys(EventSetupRecordKey const& eventSetupRecordKey) {
-
-   if (referencedDataKeys_->find(eventSetupRecordKey) != referencedDataKeys_->end()) return;
-
-   EventSetupRecordProvider* recProvider = tryToGetRecordProvider(eventSetupRecordKey);
-   if (recProvider == nullptr) {
-      (*referencedDataKeys_)[eventSetupRecordKey];
-      return;
-   }
-   recProvider->fillReferencedDataKeys((*referencedDataKeys_)[eventSetupRecordKey]);
-}
-
-void
-EventSetupProvider::resetRecordToProxyPointers() {
-   for (auto const& recProvider : recordProviders_) {
-      static const EventSetupRecordProvider::DataToPreferredProviderMap kEmptyMap;
-      const EventSetupRecordProvider::DataToPreferredProviderMap* preferredInfo = &kEmptyMap;
-      RecordToPreferred::const_iterator itRecordFound = recordToPreferred_->find(recProvider->key());
-      if(itRecordFound != recordToPreferred_->end()) {
-         preferredInfo = &(itRecordFound->second);
+      return true;
+    }
+
+    void EventSetupProvider::fillReferencedDataKeys(EventSetupRecordKey const& eventSetupRecordKey) {
+      if (referencedDataKeys_->find(eventSetupRecordKey) != referencedDataKeys_->end())
+        return;
+
+      EventSetupRecordProvider* recProvider = tryToGetRecordProvider(eventSetupRecordKey);
+      if (recProvider == nullptr) {
+        (*referencedDataKeys_)[eventSetupRecordKey];
+        return;
       }
-      recProvider->resetRecordToProxyPointers(*preferredInfo);
-   }
-}
-
-void
-EventSetupProvider::clearInitializationData() {
-   preferredProviderInfo_.reset();
-   referencedDataKeys_.reset();
-   recordToFinders_.reset();
-   psetIDToRecordKey_.reset();
-   recordToPreferred_.reset();
-   recordsWithALooperProxy_.reset();
-}
-
-void
-EventSetupProvider::addRecordToEventSetup(EventSetupRecordImpl& iRecord) {
-   iRecord.setEventSetup(&eventSetup_);
-   eventSetup_.add(iRecord);
-}
-     
-void
-EventSetupProvider::insert(std::unique_ptr<EventSetupRecordProvider> iRecordProvider) {
-   auto key =iRecordProvider->key();
-   insert( key, std::move(iRecordProvider));
-}
+      recProvider->fillReferencedDataKeys((*referencedDataKeys_)[eventSetupRecordKey]);
+    }
 
-//
-// const member functions
-//
-EventSetupImpl const&
-EventSetupProvider::eventSetupForInstance(const IOVSyncValue& iValue)
-{
-   eventSetup_.clear();
-
-   // In a cmsRun job this does nothing because the EventSetupsController
-   // will have already called finishConfiguration, but some tests will
-   // call finishConfiguration here.
-   if(mustFinishConfiguration_) {
-      finishConfiguration();
-   }
-
-   for (auto const& recProvider : recordProviders_) {
-      recProvider->addRecordToIfValid(*this, iValue);
-   }
-   return eventSetup_;
-}
-
-std::set<ComponentDescription>
-EventSetupProvider::proxyProviderDescriptions() const
-{
-   typedef std::set<ComponentDescription> Set;
-   Set descriptions;
-
-   for(auto const& recProvider: recordProviders_) {
-     auto const& d = recProvider->proxyProviderDescriptions();
-     descriptions.insert(d.begin(),d.end());
-   }
-   if(dataProviders_.get()) {
-     for(auto const& p: *dataProviders_) {
-       descriptions.insert(p->description());
-     }
-   }
-                       
-   return descriptions;
-}
-
-bool
-EventSetupProvider::isWithinValidityInterval(IOVSyncValue const& iSync) const {
-  for( auto const& recProvider: recordProviders_) {
-    auto const& iov = recProvider->validityInterval();
-    if( (iov != ValidityInterval::invalidInterval()) and
-        (not recProvider->validityInterval().validFor(iSync)) ) {
-      return false;
+    void EventSetupProvider::resetRecordToProxyPointers() {
+      for (auto const& recProvider : recordProviders_) {
+        static const EventSetupRecordProvider::DataToPreferredProviderMap kEmptyMap;
+        const EventSetupRecordProvider::DataToPreferredProviderMap* preferredInfo = &kEmptyMap;
+        RecordToPreferred::const_iterator itRecordFound = recordToPreferred_->find(recProvider->key());
+        if (itRecordFound != recordToPreferred_->end()) {
+          preferredInfo = &(itRecordFound->second);
+        }
+        recProvider->resetRecordToProxyPointers(*preferredInfo);
+      }
     }
-  }
-  return true;
-}
-//
-// static member functions
-//
-void EventSetupProvider::logInfoWhenSharing(ParameterSet const& iConfiguration) {
 
-   std::string edmtype = iConfiguration.getParameter<std::string>("@module_edm_type");
-   std::string modtype = iConfiguration.getParameter<std::string>("@module_type");
-   std::string label = iConfiguration.getParameter<std::string>("@module_label");
-   edm::LogVerbatim("EventSetupSharing") << "Sharing " << edmtype << ": class=" << modtype << " label='" << label << "'";
-}
+    void EventSetupProvider::clearInitializationData() {
+      preferredProviderInfo_.reset();
+      referencedDataKeys_.reset();
+      recordToFinders_.reset();
+      psetIDToRecordKey_.reset();
+      recordToPreferred_.reset();
+      recordsWithALooperProxy_.reset();
+    }
+
+    void EventSetupProvider::addRecordToEventSetup(EventSetupRecordImpl& iRecord) {
+      iRecord.setEventSetup(&eventSetup_);
+      eventSetup_.add(iRecord);
+    }
 
-void EventSetupProvider::addRecord(const EventSetupRecordKey& iKey) {
-   insert(iKey, std::unique_ptr<EventSetupRecordProvider>());
-   eventSetup_.setKeyIters(recordKeys_.begin(), recordKeys_.end());
-}
+    void EventSetupProvider::insert(std::unique_ptr<EventSetupRecordProvider> iRecordProvider) {
+      auto key = iRecordProvider->key();
+      insert(key, std::move(iRecordProvider));
+    }
+
+    //
+    // const member functions
+    //
+    EventSetupImpl const& EventSetupProvider::eventSetupForInstance(const IOVSyncValue& iValue) {
+      eventSetup_.clear();
+
+      // In a cmsRun job this does nothing because the EventSetupsController
+      // will have already called finishConfiguration, but some tests will
+      // call finishConfiguration here.
+      if (mustFinishConfiguration_) {
+        finishConfiguration();
+      }
+
+      for (auto const& recProvider : recordProviders_) {
+        recProvider->addRecordToIfValid(*this, iValue);
+      }
+      return eventSetup_;
+    }
+
+    std::set<ComponentDescription> EventSetupProvider::proxyProviderDescriptions() const {
+      typedef std::set<ComponentDescription> Set;
+      Set descriptions;
+
+      for (auto const& recProvider : recordProviders_) {
+        auto const& d = recProvider->proxyProviderDescriptions();
+        descriptions.insert(d.begin(), d.end());
+      }
+      if (dataProviders_.get()) {
+        for (auto const& p : *dataProviders_) {
+          descriptions.insert(p->description());
+        }
+      }
+
+      return descriptions;
+    }
+
+    bool EventSetupProvider::isWithinValidityInterval(IOVSyncValue const& iSync) const {
+      for (auto const& recProvider : recordProviders_) {
+        auto const& iov = recProvider->validityInterval();
+        if ((iov != ValidityInterval::invalidInterval()) and (not recProvider->validityInterval().validFor(iSync))) {
+          return false;
+        }
+      }
+      return true;
+    }
+
+    ESRecordsToProxyIndices EventSetupProvider::recordsToProxyIndices() const {
+      ESRecordsToProxyIndices ret(recordKeys_);
+
+      unsigned int index = 0;
+      for (auto provider : recordProviders_) {
+        index = ret.dataKeysInRecord(
+            index, provider->key(), provider->registeredDataKeys(), provider->componentsForRegisteredDataKeys());
+      }
+
+      return ret;
+    }
+
+    //
+    // static member functions
+    //
+    void EventSetupProvider::logInfoWhenSharing(ParameterSet const& iConfiguration) {
+      std::string edmtype = iConfiguration.getParameter<std::string>("@module_edm_type");
+      std::string modtype = iConfiguration.getParameter<std::string>("@module_type");
+      std::string label = iConfiguration.getParameter<std::string>("@module_label");
+      edm::LogVerbatim("EventSetupSharing")
+          << "Sharing " << edmtype << ": class=" << modtype << " label='" << label << "'";
+    }
+
+    void EventSetupProvider::addRecord(const EventSetupRecordKey& iKey) {
+      insert(iKey, std::unique_ptr<EventSetupRecordProvider>());
+      eventSetup_.setKeyIters(recordKeys_.begin(), recordKeys_.end());
+    }
 
-   }
-}
+  }  // namespace eventsetup
+}  // namespace edm
diff --git a/FWCore/Framework/src/EventSetupProviderMaker.cc b/FWCore/Framework/src/EventSetupProviderMaker.cc
index 9e48c2e5cf141..d1ca8ab1ef4c3 100644
--- a/FWCore/Framework/src/EventSetupProviderMaker.cc
+++ b/FWCore/Framework/src/EventSetupProviderMaker.cc
@@ -21,13 +21,13 @@
 
 namespace edm {
   namespace eventsetup {
-  // ---------------------------------------------------------------
-    std::unique_ptr<EventSetupProvider>
-    makeEventSetupProvider(ParameterSet const& params, unsigned subProcessIndex, ActivityRegistry* activityRegistry) {
-      std::vector<std::string> prefers =
-        params.getParameter<std::vector<std::string> >("@all_esprefers");
+    // ---------------------------------------------------------------
+    std::unique_ptr<EventSetupProvider> makeEventSetupProvider(ParameterSet const& params,
+                                                               unsigned subProcessIndex,
+                                                               ActivityRegistry* activityRegistry) {
+      std::vector<std::string> prefers = params.getParameter<std::vector<std::string> >("@all_esprefers");
 
-      if(prefers.empty()) {
+      if (prefers.empty()) {
         return std::make_unique<EventSetupProvider>(activityRegistry, subProcessIndex);
       }
 
@@ -39,55 +39,45 @@ namespace edm {
       //preferInfo[ComponentDescription("DummyProxyProvider", "", false)]=
       //      recordToData;
 
-      for(std::vector<std::string>::iterator itName = prefers.begin(), itNameEnd = prefers.end();
-          itName != itNameEnd;
-          ++itName) {
+      for (std::vector<std::string>::iterator itName = prefers.begin(), itNameEnd = prefers.end(); itName != itNameEnd;
+           ++itName) {
         recordToData.clear();
         ParameterSet const& preferPSet = params.getParameterSet(*itName);
         std::vector<std::string> recordNames = preferPSet.getParameterNames();
-        for(std::vector<std::string>::iterator itRecordName = recordNames.begin(),
-            itRecordNameEnd = recordNames.end();
-            itRecordName != itRecordNameEnd;
-            ++itRecordName) {
-
-          if((*itRecordName)[0] == '@') {
+        for (std::vector<std::string>::iterator itRecordName = recordNames.begin(), itRecordNameEnd = recordNames.end();
+             itRecordName != itRecordNameEnd;
+             ++itRecordName) {
+          if ((*itRecordName)[0] == '@') {
             //this is a 'hidden parameter' so skip it
             continue;
           }
 
           //this should be a record name with its info
           try {
-            std::vector<std::string> dataInfo =
-              preferPSet.getParameter<std::vector<std::string> >(*itRecordName);
+            std::vector<std::string> dataInfo = preferPSet.getParameter<std::vector<std::string> >(*itRecordName);
 
-            if(dataInfo.empty()) {
+            if (dataInfo.empty()) {
               //FUTURE: empty should just mean all data
               throw Exception(errors::Configuration)
-                << "The record named "
-                << *itRecordName << " specifies no data items";
+                  << "The record named " << *itRecordName << " specifies no data items";
             }
             //FUTURE: 'any' should be a special name
-            for(std::vector<std::string>::iterator itDatum = dataInfo.begin(),
-                itDatumEnd = dataInfo.end();
-                itDatum != itDatumEnd;
-                ++itDatum){
+            for (std::vector<std::string>::iterator itDatum = dataInfo.begin(), itDatumEnd = dataInfo.end();
+                 itDatum != itDatumEnd;
+                 ++itDatum) {
               std::string datumName(*itDatum, 0, itDatum->find_first_of("/"));
               std::string labelName;
 
-              if(itDatum->size() != datumName.size()) {
+              if (itDatum->size() != datumName.size()) {
                 labelName = std::string(*itDatum, datumName.size() + 1);
               }
-              recordToData.insert(std::make_pair(std::string(*itRecordName),
-                                                 std::make_pair(datumName,
-                                                                labelName)));
+              recordToData.insert(std::make_pair(std::string(*itRecordName), std::make_pair(datumName, labelName)));
             }
-          } catch(cms::Exception const& iException) {
+          } catch (cms::Exception const& iException) {
             cms::Exception theError("ESPreferConfigurationError");
             theError << "While parsing the es_prefer statement for type="
-                     << preferPSet.getParameter<std::string>("@module_type")
-                     << " label=\""
-                     << preferPSet.getParameter<std::string>("@module_label")
-                     << "\" an error occurred.";
+                     << preferPSet.getParameter<std::string>("@module_type") << " label=\""
+                     << preferPSet.getParameter<std::string>("@module_label") << "\" an error occurred.";
             theError.append(iException);
             throw theError;
           }
@@ -100,41 +90,31 @@ namespace edm {
     }
 
     // ---------------------------------------------------------------
-    void
-    fillEventSetupProvider(EventSetupsController& esController,
-                           EventSetupProvider& cp,
-                           ParameterSet& params) {
-      std::vector<std::string> providers =
-        params.getParameter<std::vector<std::string> >("@all_esmodules");
-
-      for(std::vector<std::string>::iterator itName = providers.begin(), itNameEnd = providers.end();
-          itName != itNameEnd;
-          ++itName) {
+    void fillEventSetupProvider(EventSetupsController& esController, EventSetupProvider& cp, ParameterSet& params) {
+      std::vector<std::string> providers = params.getParameter<std::vector<std::string> >("@all_esmodules");
+
+      for (std::vector<std::string>::iterator itName = providers.begin(), itNameEnd = providers.end();
+           itName != itNameEnd;
+           ++itName) {
         ParameterSet* providerPSet = params.getPSetForUpdate(*itName);
         validateEventSetupParameters(*providerPSet);
         providerPSet->registerIt();
-        ModuleFactory::get()->addTo(esController,
-                                    cp,
-                                    *providerPSet);
+        ModuleFactory::get()->addTo(esController, cp, *providerPSet);
       }
 
-      std::vector<std::string> sources =
-        params.getParameter<std::vector<std::string> >("@all_essources");
+      std::vector<std::string> sources = params.getParameter<std::vector<std::string> >("@all_essources");
 
-      for(std::vector<std::string>::iterator itName = sources.begin(), itNameEnd = sources.end();
-          itName != itNameEnd;
-          ++itName) {
+      for (std::vector<std::string>::iterator itName = sources.begin(), itNameEnd = sources.end(); itName != itNameEnd;
+           ++itName) {
         ParameterSet* providerPSet = params.getPSetForUpdate(*itName);
         validateEventSetupParameters(*providerPSet);
         providerPSet->registerIt();
-        SourceFactory::get()->addTo(esController,
-                                    cp,
-                                    *providerPSet);
+        SourceFactory::get()->addTo(esController, cp, *providerPSet);
       }
     }
 
     // ---------------------------------------------------------------
-    void validateEventSetupParameters(ParameterSet & pset) {
+    void validateEventSetupParameters(ParameterSet& pset) {
       std::string modtype;
       std::string moduleLabel;
       modtype = pset.getParameter<std::string>("@module_type");
@@ -149,21 +129,18 @@ namespace edm {
       }
 
       std::unique_ptr<ParameterSetDescriptionFillerBase> filler(
-        ParameterSetDescriptionFillerPluginFactory::get()->create(modtype));
+          ParameterSetDescriptionFillerPluginFactory::get()->create(modtype));
       ConfigurationDescriptions descriptions(filler->baseType(), modtype);
       filler->fill(descriptions);
       try {
-        edm::convertException::wrap([&]() {
-          descriptions.validate(pset, moduleLabel);
-        });
-      }
-      catch (cms::Exception & iException) {
+        edm::convertException::wrap([&]() { descriptions.validate(pset, moduleLabel); });
+      } catch (cms::Exception& iException) {
         std::ostringstream ost;
-        ost << "Validating configuration of ESProducer or ESSource of type " << modtype
-            << " with label: '" << moduleLabel << "'";
+        ost << "Validating configuration of ESProducer or ESSource of type " << modtype << " with label: '"
+            << moduleLabel << "'";
         iException.addContext(ost.str());
         throw;
       }
     }
-  }
-}
+  }  // namespace eventsetup
+}  // namespace edm
diff --git a/FWCore/Framework/src/EventSetupRecord.cc b/FWCore/Framework/src/EventSetupRecord.cc
index 2189c23b9a032..24a3720eec365 100644
--- a/FWCore/Framework/src/EventSetupRecord.cc
+++ b/FWCore/Framework/src/EventSetupRecord.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     EventSetupRecord
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -26,103 +26,99 @@
 #include "FWCore/Utilities/interface/Exception.h"
 
 namespace edm {
-   namespace eventsetup {
-//
-// constants, enums and typedefs
-//
-      typedef std::map< DataKey , const DataProxy* > Proxies;
-//
-// static data member definitions
-//
+  namespace eventsetup {
+    //
+    // constants, enums and typedefs
+    //
+    typedef std::map<DataKey, const DataProxy*> Proxies;
+    //
+    // static data member definitions
+    //
 
-//
-// constructors and destructor
-//
-EventSetupRecord::EventSetupRecord()
-{
-}
+    //
+    // constructors and destructor
+    //
+    EventSetupRecord::EventSetupRecord() {}
 
-// EventSetupRecord::EventSetupRecord(const EventSetupRecord& rhs)
-// {
-//    // do actual copying here;
-// }
+    // EventSetupRecord::EventSetupRecord(const EventSetupRecord& rhs)
+    // {
+    //    // do actual copying here;
+    // }
 
-EventSetupRecord::~EventSetupRecord()
-{
-}
+    EventSetupRecord::~EventSetupRecord() {}
 
-//
-// assignment operators
-//
-// const EventSetupRecord& EventSetupRecord::operator=(const EventSetupRecord& rhs)
-// {
-//   //An exception safe implementation is
-//   EventSetupRecord temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
+    //
+    // assignment operators
+    //
+    // const EventSetupRecord& EventSetupRecord::operator=(const EventSetupRecord& rhs)
+    // {
+    //   //An exception safe implementation is
+    //   EventSetupRecord temp(rhs);
+    //   swap(rhs);
+    //
+    //   return *this;
+    // }
 
-//
-// member functions
-//
-//
-// const member functions
-//
-      
-bool
-EventSetupRecord::doGet(const DataKey& aKey, bool aGetTransiently) const {
-  return impl_->doGet(aKey,aGetTransiently);
-}
-
-bool 
-EventSetupRecord::wasGotten(const DataKey& aKey) const {
-  return impl_->wasGotten(aKey);
-}
-
-edm::eventsetup::ComponentDescription const* 
-EventSetupRecord::providerDescription(const DataKey& aKey) const {
-  return impl_->providerDescription(aKey);
-}
-
-void 
-EventSetupRecord::validate(const ComponentDescription* iDesc, const ESInputTag& iTag) const
-{
-   if(iDesc && !iTag.module().empty()) {
-      bool matched = false;
-      if(iDesc->label_.empty()) {
-         matched = iDesc->type_ == iTag.module();
-      } else {
-         matched = iDesc->label_ == iTag.module();
-      }
-      if(!matched) {
-         throw cms::Exception("EventSetupWrongModule") <<"EventSetup data was retrieved using an ESInputTag with the values\n"
-         <<"  moduleLabel = '"<<iTag.module()<<"'\n"
-         <<"  dataLabel = '"<<iTag.data()<<"'\n"
-         <<"but the data matching the C++ class type and dataLabel comes from module type="<<iDesc->type_<<" label='"<<iDesc->label_
-         <<"'.\n Please either change the ESInputTag's 'module' label to be "<<( iDesc->label_.empty()? iDesc->type_:iDesc->label_)
-         <<"\n or add the EventSetup module "<<iTag.module()<<" to the configuration.";
+    //
+    // member functions
+    //
+    //
+    // const member functions
+    //
+
+    bool EventSetupRecord::doGet(const DataKey& aKey, bool aGetTransiently) const {
+      return impl_->doGet(aKey, aGetTransiently);
+    }
+
+    bool EventSetupRecord::wasGotten(const DataKey& aKey) const { return impl_->wasGotten(aKey); }
+
+    edm::eventsetup::ComponentDescription const* EventSetupRecord::providerDescription(const DataKey& aKey) const {
+      return impl_->providerDescription(aKey);
+    }
+
+    void EventSetupRecord::validate(const ComponentDescription* iDesc, const ESInputTag& iTag) const {
+      if (iDesc && !iTag.module().empty()) {
+        bool matched = false;
+        if (iDesc->label_.empty()) {
+          matched = iDesc->type_ == iTag.module();
+        } else {
+          matched = iDesc->label_ == iTag.module();
+        }
+        if (!matched) {
+          throw cms::Exception("EventSetupWrongModule")
+              << "EventSetup data was retrieved using an ESInputTag with the values\n"
+              << "  moduleLabel = '" << iTag.module() << "'\n"
+              << "  dataLabel = '" << iTag.data() << "'\n"
+              << "but the data matching the C++ class type and dataLabel comes from module type=" << iDesc->type_
+              << " label='" << iDesc->label_ << "'.\n Please either change the ESInputTag's 'module' label to be "
+              << (iDesc->label_.empty() ? iDesc->type_ : iDesc->label_) << "\n or add the EventSetup module "
+              << iTag.module() << " to the configuration.";
+        }
       }
-   }
-}
-
-void 
-EventSetupRecord::addTraceInfoToCmsException(cms::Exception& iException, const char* iName, const ComponentDescription* iDescription, const DataKey& iKey) const
-{
-   std::ostringstream ost;
-   ost << "Using EventSetup component "
-       << iDescription->type_
-       << "/'" << iDescription->label_
-       << "' to make data "
-       << iKey.type().name() << "/'"
-       << iName
-       << "' in record "
-       << this->key().type().name();
-   iException.addContext(ost.str());
-}         
+    }
 
-//
-// static member functions
-//
-   }
-}
+    void EventSetupRecord::addTraceInfoToCmsException(cms::Exception& iException,
+                                                      const char* iName,
+                                                      const ComponentDescription* iDescription,
+                                                      const DataKey& iKey) const {
+      std::ostringstream ost;
+      ost << "Using EventSetup component " << iDescription->type_ << "/'" << iDescription->label_ << "' to make data "
+          << iKey.type().name() << "/'" << iName << "' in record " << this->key().type().name();
+      iException.addContext(ost.str());
+    }
+
+    std::exception_ptr EventSetupRecord::makeInvalidTokenException(EventSetupRecordKey const& iRecordKey,
+                                                                   TypeTag const& iDataKey) {
+      cms::Exception ex("InvalidESGetToken");
+      ex << "Attempted to get data using an invalid token of type ESGetToken<" << iDataKey.name() << ","
+         << iRecordKey.name()
+         << ">.\n"
+            "Please call consumes to properly initialize the token.";
+      return std::make_exception_ptr(ex);
+    }
+
+    //
+    // static member functions
+    //
+  }  // namespace eventsetup
+}  // namespace edm
diff --git a/FWCore/Framework/src/EventSetupRecordImpl.cc b/FWCore/Framework/src/EventSetupRecordImpl.cc
index ce8c18f8db76a..90500082110af 100644
--- a/FWCore/Framework/src/EventSetupRecordImpl.cc
+++ b/FWCore/Framework/src/EventSetupRecordImpl.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     EventSetupRecordImpl
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -26,259 +26,256 @@
 #include "FWCore/Utilities/interface/Exception.h"
 
 namespace edm {
-   namespace eventsetup {
-//
-// constants, enums and typedefs
-//
-      typedef std::map< DataKey , const DataProxy* > Proxies;
-//
-// static data member definitions
-//
+  namespace eventsetup {
+    //
+    // constants, enums and typedefs
+    //
 
-//
-// constructors and destructor
-//
-EventSetupRecordImpl::EventSetupRecordImpl(EventSetupRecordKey const& iKey) :
-validity_(),
-key_(iKey),
-proxies_(),
-eventSetup_(nullptr),
-cacheIdentifier_(1), //start with 1 since 0 means we haven't checked yet
-transientAccessRequested_(false)
-{
-}
+    //
+    // static data member definitions
+    //
 
-//
-// member functions
-//
-void
-EventSetupRecordImpl::set(const ValidityInterval& iInterval)
-{
-   validity_ = iInterval;
-}
-
-void
-EventSetupRecordImpl::getESProducers(std::vector<ComponentDescription const*>& esproducers) {
-   esproducers.clear();
-   esproducers.reserve(proxies_.size());
-   for (auto const& iData : proxies_) {
-      ComponentDescription const* componentDescription = iData->providerDescription();
-      if (!componentDescription->isLooper_ && !componentDescription->isSource_) {
-         esproducers.push_back(componentDescription);
+    //
+    // constructors and destructor
+    //
+    EventSetupRecordImpl::EventSetupRecordImpl(EventSetupRecordKey const& iKey)
+        : validity_(),
+          key_(iKey),
+          proxies_(),
+          eventSetup_(nullptr),
+          cacheIdentifier_(1),  //start with 1 since 0 means we haven't checked yet
+          transientAccessRequested_(false) {}
+
+    //
+    // member functions
+    //
+    void EventSetupRecordImpl::set(const ValidityInterval& iInterval) { validity_ = iInterval; }
+
+    void EventSetupRecordImpl::getESProducers(std::vector<ComponentDescription const*>& esproducers) {
+      esproducers.clear();
+      esproducers.reserve(proxies_.size());
+      for (auto const& iData : proxies_) {
+        ComponentDescription const* componentDescription = iData->providerDescription();
+        if (!componentDescription->isLooper_ && !componentDescription->isSource_) {
+          esproducers.push_back(componentDescription);
+        }
       }
-   }
-}
-
-void
-EventSetupRecordImpl::fillReferencedDataKeys(std::map<DataKey, ComponentDescription const*>& referencedDataKeys) {
-   referencedDataKeys.clear();
-   auto itProxies = proxies_.begin();
-   for (auto const& iData : keysForProxies_) {
-      referencedDataKeys.emplace(iData, (*itProxies)->providerDescription());
-      ++itProxies;
-   }
-}
-
-bool 
-EventSetupRecordImpl::add(const DataKey& iKey ,
-                    const DataProxy* iProxy)
-{
-   //
-   const DataProxy* proxy = find(iKey);
-   if (nullptr != proxy) {
-      //
-      // we already know the field exist, so do not need to check against end()
-      //
-      
-      // POLICY: If a Producer and a Source both claim to deliver the same data, the
-      //  Producer 'trumps' the Source. If two modules of the same type claim to deliver the
-      //  same data, this is an error unless the configuration specifically states which one
-      //  is to be chosen.  A Looper trumps both a Producer and a Source.
-
-      assert(proxy->providerDescription());
-      assert(iProxy->providerDescription());
-      if(iProxy->providerDescription()->isLooper_) {
-        proxies_[std::distance(keysForProxies_.begin(),
-                               std::lower_bound(keysForProxies_.begin(),
-                                                keysForProxies_.end(),
-                                                iKey))] = iProxy;
-         return true;
+    }
+
+    std::vector<ComponentDescription const*> EventSetupRecordImpl::componentsForRegisteredDataKeys() const {
+      std::vector<ComponentDescription const*> ret;
+      ret.reserve(proxies_.size());
+      for (auto const& proxy : proxies_) {
+        ret.push_back(proxy->providerDescription());
       }
-	 
-      if(proxy->providerDescription()->isSource_ == iProxy->providerDescription()->isSource_) {
-         //should lookup to see if there is a specified 'chosen' one and only if not, throw the exception
-         throw cms::Exception("EventSetupConflict") <<"two EventSetup "<< 
-         (proxy->providerDescription()->isSource_? "Sources":"Producers")
-         <<" want to deliver type=\""<< iKey.type().name() <<"\" label=\""<<iKey.name().value()<<"\"\n"
-         <<" from record "<<key().type().name() <<". The two providers are \n"
-         <<"1) type=\""<<proxy->providerDescription()->type_<<"\" label=\""<<proxy->providerDescription()->label_<<"\"\n"
-         <<"2) type=\""<<iProxy->providerDescription()->type_<<"\" label=\""<<iProxy->providerDescription()->label_<<"\"\n"
-         <<"Please either\n   remove one of these "<<(proxy->providerDescription()->isSource_?"Sources":"Producers")
-         <<"\n   or find a way of configuring one of them so it does not deliver this data"
-         <<"\n   or use an es_prefer statement in the configuration to choose one.";
-      } else if(proxy->providerDescription()->isSource_) {
-        proxies_[std::distance(keysForProxies_.begin(),
-                               std::lower_bound(keysForProxies_.begin(),
-                                                keysForProxies_.end(),
-                                                iKey) )] = iProxy;
+      return ret;
+    }
+
+    bool EventSetupRecordImpl::add(const DataKey& iKey, const DataProxy* iProxy) {
+      //
+      const DataProxy* proxy = find(iKey);
+      if (nullptr != proxy) {
+        //
+        // we already know the field exist, so do not need to check against end()
+        //
+
+        // POLICY: If a Producer and a Source both claim to deliver the same data, the
+        //  Producer 'trumps' the Source. If two modules of the same type claim to deliver the
+        //  same data, this is an error unless the configuration specifically states which one
+        //  is to be chosen.  A Looper trumps both a Producer and a Source.
+
+        assert(proxy->providerDescription());
+        assert(iProxy->providerDescription());
+        if (iProxy->providerDescription()->isLooper_) {
+          proxies_[std::distance(keysForProxies_.begin(),
+                                 std::lower_bound(keysForProxies_.begin(), keysForProxies_.end(), iKey))] = iProxy;
+          return true;
+        }
+
+        if (proxy->providerDescription()->isSource_ == iProxy->providerDescription()->isSource_) {
+          //should lookup to see if there is a specified 'chosen' one and only if not, throw the exception
+          throw cms::Exception("EventSetupConflict")
+              << "two EventSetup " << (proxy->providerDescription()->isSource_ ? "Sources" : "Producers")
+              << " want to deliver type=\"" << iKey.type().name() << "\" label=\"" << iKey.name().value() << "\"\n"
+              << " from record " << key().type().name() << ". The two providers are \n"
+              << "1) type=\"" << proxy->providerDescription()->type_ << "\" label=\""
+              << proxy->providerDescription()->label_ << "\"\n"
+              << "2) type=\"" << iProxy->providerDescription()->type_ << "\" label=\""
+              << iProxy->providerDescription()->label_ << "\"\n"
+              << "Please either\n   remove one of these "
+              << (proxy->providerDescription()->isSource_ ? "Sources" : "Producers")
+              << "\n   or find a way of configuring one of them so it does not deliver this data"
+              << "\n   or use an es_prefer statement in the configuration to choose one.";
+        } else if (proxy->providerDescription()->isSource_) {
+          proxies_[std::distance(keysForProxies_.begin(),
+                                 std::lower_bound(keysForProxies_.begin(), keysForProxies_.end(), iKey))] = iProxy;
+        } else {
+          return false;
+        }
       } else {
-         return false;
+        auto lb = std::lower_bound(keysForProxies_.begin(), keysForProxies_.end(), iKey);
+        auto index = std::distance(keysForProxies_.begin(), lb);
+        keysForProxies_.insert(lb, iKey);
+        proxies_.insert(proxies_.begin() + index, iProxy);
       }
-   }
-   else {
-      auto lb = std::lower_bound(keysForProxies_.begin(),keysForProxies_.end(), iKey);
-      auto index = std::distance(keysForProxies_.begin(), lb);
-      keysForProxies_.insert(lb, iKey);
-      proxies_.insert(proxies_.begin()+index, iProxy);
-   }
-   return true ;
-}
-
-void 
-EventSetupRecordImpl::clearProxies()
-{
-   keysForProxies_.clear();
-   proxies_.clear();
-}
-
-void 
-EventSetupRecordImpl::cacheReset()
-{
-   transientAccessRequested_ = false;
-   ++cacheIdentifier_;
-}
-
-bool
-EventSetupRecordImpl::transientReset()
-{
-   bool returnValue = transientAccessRequested_;
-   transientAccessRequested_=false;
-   return returnValue;
-}
-      
-//
-// const member functions
-//
-      
-const void* 
-EventSetupRecordImpl::getFromProxy(DataKey const & iKey ,
-                               const ComponentDescription*& iDesc,
-                               bool iTransientAccessOnly) const
-{
-   if(iTransientAccessOnly) { this->transientAccessRequested(); }
-
-   const DataProxy* proxy = this->find(iKey);
-   
-   const void* hold = nullptr;
-   
-   if(nullptr!=proxy) {
-      try {
-        convertException::wrap([&]() {
-            hold = proxy->get(*this, iKey,iTransientAccessOnly, eventSetup_->activityRegistry());
-            iDesc = proxy->providerDescription(); 
-        });
+      return true;
+    }
+
+    void EventSetupRecordImpl::clearProxies() {
+      keysForProxies_.clear();
+      proxies_.clear();
+    }
+
+    void EventSetupRecordImpl::cacheReset() {
+      transientAccessRequested_ = false;
+      ++cacheIdentifier_;
+    }
+
+    bool EventSetupRecordImpl::transientReset() {
+      bool returnValue = transientAccessRequested_;
+      transientAccessRequested_ = false;
+      return returnValue;
+    }
+
+    //
+    // const member functions
+    //
+
+    const void* EventSetupRecordImpl::getFromProxy(DataKey const& iKey,
+                                                   const ComponentDescription*& iDesc,
+                                                   bool iTransientAccessOnly) const {
+      if (iTransientAccessOnly) {
+        this->transientAccessRequested();
+      }
+
+      const DataProxy* proxy = this->find(iKey);
+
+      const void* hold = nullptr;
+
+      if (nullptr != proxy) {
+        try {
+          convertException::wrap([&]() {
+            hold = proxy->get(*this, iKey, iTransientAccessOnly, eventSetup_->activityRegistry());
+            iDesc = proxy->providerDescription();
+          });
+        } catch (cms::Exception& e) {
+          addTraceInfoToCmsException(e, iKey.name().value(), proxy->providerDescription(), iKey);
+          //NOTE: the above function can't do the 'throw' since it causes the C++ class type
+          // of the throw to be changed, a 'rethrow' does not have that problem
+          throw;
+        }
+      }
+      return hold;
+    }
+
+    const void* EventSetupRecordImpl::getFromProxy(ESProxyIndex iProxyIndex,
+                                                   bool iTransientAccessOnly,
+                                                   const ComponentDescription*& iDesc,
+                                                   DataKey const*& oGottenKey) const {
+      if (iProxyIndex.value() >= static_cast<ESProxyIndex::Value_t>(proxies_.size())) {
+        return nullptr;
       }
-      catch(cms::Exception& e) {
-         addTraceInfoToCmsException(e,iKey.name().value(),proxy->providerDescription(), iKey);
-         //NOTE: the above function can't do the 'throw' since it causes the C++ class type
-         // of the throw to be changed, a 'rethrow' does not have that problem
-         throw;
+      if (iTransientAccessOnly) {
+        this->transientAccessRequested();
       }
-   }
-   return hold;   
-}
-      
-const DataProxy* 
-EventSetupRecordImpl::find(const DataKey& iKey) const
-{
-   auto lb = std::lower_bound(keysForProxies_.begin(),keysForProxies_.end(), iKey);
-   if( (lb == keysForProxies_.end()) or (*lb != iKey)) {
-     return nullptr;
-   }
-   return proxies_[std::distance(keysForProxies_.begin(), lb)];
-}
-      
-bool 
-EventSetupRecordImpl::doGet(const DataKey& aKey, bool aGetTransiently) const {
-   const DataProxy* proxy = find(aKey);
-   if(nullptr != proxy) {
+
+      const DataProxy* proxy = proxies_[iProxyIndex.value()];
+      assert(nullptr != proxy);
+      iDesc = proxy->providerDescription();
+
+      const void* hold = nullptr;
+
+      auto const& key = keysForProxies_[iProxyIndex.value()];
+      oGottenKey = &key;
       try {
-         convertException::wrap([&]() {
-            proxy->doGet(*this, aKey, aGetTransiently, eventSetup_->activityRegistry());
-         });
+        convertException::wrap(
+            [&]() { hold = proxy->get(*this, key, iTransientAccessOnly, eventSetup_->activityRegistry()); });
+      } catch (cms::Exception& e) {
+        addTraceInfoToCmsException(e, key.name().value(), proxy->providerDescription(), key);
+        //NOTE: the above function can't do the 'throw' since it causes the C++ class type
+        // of the throw to be changed, a 'rethrow' does not have that problem
+        throw;
       }
-      catch( cms::Exception& e) {
-         addTraceInfoToCmsException(e,aKey.name().value(),proxy->providerDescription(), aKey);
-         //NOTE: the above function can't do the 'throw' since it causes the C++ class type
-         // of the throw to be changed, a 'rethrow' does not have that problem
-         throw;
+      return hold;
+    }
+
+    const DataProxy* EventSetupRecordImpl::find(const DataKey& iKey) const {
+      auto lb = std::lower_bound(keysForProxies_.begin(), keysForProxies_.end(), iKey);
+      if ((lb == keysForProxies_.end()) or (*lb != iKey)) {
+        return nullptr;
       }
-   }
-   return nullptr != proxy;
-}
-
-bool 
-EventSetupRecordImpl::wasGotten(const DataKey& aKey) const {
-   const DataProxy* proxy = find(aKey);
-   if(nullptr != proxy) {
-      return proxy->cacheIsValid();
-   }
-   return false;
-}
-
-edm::eventsetup::ComponentDescription const* 
-EventSetupRecordImpl::providerDescription(const DataKey& aKey) const {
-   const DataProxy* proxy = find(aKey);
-   if(nullptr != proxy) {
-      return proxy->providerDescription();
-   }
-   return nullptr;
-}
-
-void 
-EventSetupRecordImpl::fillRegisteredDataKeys(std::vector<DataKey>& oToFill) const
-{
-  oToFill = keysForProxies_;
-}
-
-void 
-EventSetupRecordImpl::validate(const ComponentDescription* iDesc, const ESInputTag& iTag) const
-{
-   if(iDesc && !iTag.module().empty()) {
-      bool matched = false;
-      if(iDesc->label_.empty()) {
-         matched = iDesc->type_ == iTag.module();
-      } else {
-         matched = iDesc->label_ == iTag.module();
+      return proxies_[std::distance(keysForProxies_.begin(), lb)];
+    }
+
+    bool EventSetupRecordImpl::doGet(const DataKey& aKey, bool aGetTransiently) const {
+      const DataProxy* proxy = find(aKey);
+      if (nullptr != proxy) {
+        try {
+          convertException::wrap(
+              [&]() { proxy->doGet(*this, aKey, aGetTransiently, eventSetup_->activityRegistry()); });
+        } catch (cms::Exception& e) {
+          addTraceInfoToCmsException(e, aKey.name().value(), proxy->providerDescription(), aKey);
+          //NOTE: the above function can't do the 'throw' since it causes the C++ class type
+          // of the throw to be changed, a 'rethrow' does not have that problem
+          throw;
+        }
       }
-      if(!matched) {
-         throw cms::Exception("EventSetupWrongModule") <<"EventSetup data was retrieved using an ESInputTag with the values\n"
-         <<"  moduleLabel = '"<<iTag.module()<<"'\n"
-         <<"  dataLabel = '"<<iTag.data()<<"'\n"
-         <<"but the data matching the C++ class type and dataLabel comes from module type="<<iDesc->type_<<" label='"<<iDesc->label_
-         <<"'.\n Please either change the ESInputTag's 'module' label to be "<<( iDesc->label_.empty()? iDesc->type_:iDesc->label_)
-         <<"\n or add the EventSetup module "<<iTag.module()<<" to the configuration.";
+      return nullptr != proxy;
+    }
+
+    bool EventSetupRecordImpl::wasGotten(const DataKey& aKey) const {
+      const DataProxy* proxy = find(aKey);
+      if (nullptr != proxy) {
+        return proxy->cacheIsValid();
       }
-   }
-}
-
-void 
-EventSetupRecordImpl::addTraceInfoToCmsException(cms::Exception& iException, const char* iName, const ComponentDescription* iDescription, const DataKey& iKey) const
-{
-   std::ostringstream ost;
-   ost << "Using EventSetup component "
-       << iDescription->type_
-       << "/'" << iDescription->label_
-       << "' to make data "
-       << iKey.type().name() << "/'"
-       << iName
-       << "' in record "
-       << this->key().type().name();
-   iException.addContext(ost.str());
-}         
+      return false;
+    }
 
-//
-// static member functions
-//
-   }
-}
+    edm::eventsetup::ComponentDescription const* EventSetupRecordImpl::providerDescription(const DataKey& aKey) const {
+      const DataProxy* proxy = find(aKey);
+      if (nullptr != proxy) {
+        return proxy->providerDescription();
+      }
+      return nullptr;
+    }
+
+    void EventSetupRecordImpl::fillRegisteredDataKeys(std::vector<DataKey>& oToFill) const {
+      oToFill = keysForProxies_;
+    }
+
+    void EventSetupRecordImpl::validate(const ComponentDescription* iDesc, const ESInputTag& iTag) const {
+      if (iDesc && !iTag.module().empty()) {
+        bool matched = false;
+        if (iDesc->label_.empty()) {
+          matched = iDesc->type_ == iTag.module();
+        } else {
+          matched = iDesc->label_ == iTag.module();
+        }
+        if (!matched) {
+          throw cms::Exception("EventSetupWrongModule")
+              << "EventSetup data was retrieved using an ESInputTag with the values\n"
+              << "  moduleLabel = '" << iTag.module() << "'\n"
+              << "  dataLabel = '" << iTag.data() << "'\n"
+              << "but the data matching the C++ class type and dataLabel comes from module type=" << iDesc->type_
+              << " label='" << iDesc->label_ << "'.\n Please either change the ESInputTag's 'module' label to be "
+              << (iDesc->label_.empty() ? iDesc->type_ : iDesc->label_) << "\n or add the EventSetup module "
+              << iTag.module() << " to the configuration.";
+        }
+      }
+    }
+
+    void EventSetupRecordImpl::addTraceInfoToCmsException(cms::Exception& iException,
+                                                          const char* iName,
+                                                          const ComponentDescription* iDescription,
+                                                          const DataKey& iKey) const {
+      std::ostringstream ost;
+      ost << "Using EventSetup component " << iDescription->type_ << "/'" << iDescription->label_ << "' to make data "
+          << iKey.type().name() << "/'" << iName << "' in record " << this->key().type().name();
+      iException.addContext(ost.str());
+    }
+
+    //
+    // static member functions
+    //
+  }  // namespace eventsetup
+}  // namespace edm
diff --git a/FWCore/Framework/src/EventSetupRecordIntervalFinder.cc b/FWCore/Framework/src/EventSetupRecordIntervalFinder.cc
index 2cc9e8489daa0..64e81475f6ccc 100644
--- a/FWCore/Framework/src/EventSetupRecordIntervalFinder.cc
+++ b/FWCore/Framework/src/EventSetupRecordIntervalFinder.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     EventSetupRecordIntervalFinder
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -21,85 +21,74 @@
 //
 using namespace edm::eventsetup;
 namespace edm {
-//
-// static data member definitions
-//
+  //
+  // static data member definitions
+  //
 
-//
-// constructors and destructor
-//
-//EventSetupRecordIntervalFinder::EventSetupRecordIntervalFinder()
-//{
-//}
+  //
+  // constructors and destructor
+  //
+  //EventSetupRecordIntervalFinder::EventSetupRecordIntervalFinder()
+  //{
+  //}
 
-// EventSetupRecordIntervalFinder::EventSetupRecordIntervalFinder(const EventSetupRecordIntervalFinder& rhs)
-// {
-//    // do actual copying here;
-// }
+  // EventSetupRecordIntervalFinder::EventSetupRecordIntervalFinder(const EventSetupRecordIntervalFinder& rhs)
+  // {
+  //    // do actual copying here;
+  // }
 
-EventSetupRecordIntervalFinder::~EventSetupRecordIntervalFinder() noexcept(false)
-{
-}
+  EventSetupRecordIntervalFinder::~EventSetupRecordIntervalFinder() noexcept(false) {}
 
-//
-// assignment operators
-//
-// const EventSetupRecordIntervalFinder& EventSetupRecordIntervalFinder::operator=(const EventSetupRecordIntervalFinder& rhs)
-// {
-//   //An exception safe implementation is
-//   EventSetupRecordIntervalFinder temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
+  //
+  // assignment operators
+  //
+  // const EventSetupRecordIntervalFinder& EventSetupRecordIntervalFinder::operator=(const EventSetupRecordIntervalFinder& rhs)
+  // {
+  //   //An exception safe implementation is
+  //   EventSetupRecordIntervalFinder temp(rhs);
+  //   swap(rhs);
+  //
+  //   return *this;
+  // }
 
-//
-// member functions
-//
-const ValidityInterval& 
-EventSetupRecordIntervalFinder::findIntervalFor(const EventSetupRecordKey& iKey,
-                                              const IOVSyncValue& iInstance)
-{
-   Intervals::iterator itFound = intervals_.find(iKey);
-   assert(itFound != intervals_.end()) ;
-   if(! itFound->second.validFor(iInstance)) {
+  //
+  // member functions
+  //
+  const ValidityInterval& EventSetupRecordIntervalFinder::findIntervalFor(const EventSetupRecordKey& iKey,
+                                                                          const IOVSyncValue& iInstance) {
+    Intervals::iterator itFound = intervals_.find(iKey);
+    assert(itFound != intervals_.end());
+    if (!itFound->second.validFor(iInstance)) {
       setIntervalFor(iKey, iInstance, itFound->second);
-   }
-   return itFound->second;
-}
+    }
+    return itFound->second;
+  }
 
-void 
-EventSetupRecordIntervalFinder::findingRecordWithKey(const EventSetupRecordKey& iKey) {
-   intervals_.insert(Intervals::value_type(iKey, ValidityInterval()));
-}
+  void EventSetupRecordIntervalFinder::findingRecordWithKey(const EventSetupRecordKey& iKey) {
+    intervals_.insert(Intervals::value_type(iKey, ValidityInterval()));
+  }
 
-void 
-EventSetupRecordIntervalFinder::delaySettingRecords()
-{
-}
+  void EventSetupRecordIntervalFinder::delaySettingRecords() {}
 
-//
-// const member functions
-//
-std::set<EventSetupRecordKey> 
-EventSetupRecordIntervalFinder::findingForRecords() const
-{
-   if(intervals_.empty()) {
+  //
+  // const member functions
+  //
+  std::set<EventSetupRecordKey> EventSetupRecordIntervalFinder::findingForRecords() const {
+    if (intervals_.empty()) {
       //we are delaying our reading
       const_cast<EventSetupRecordIntervalFinder*>(this)->delaySettingRecords();
-   }
-   
-   std::set<EventSetupRecordKey> returnValue;
-   
-   for(Intervals::const_iterator itEntry = intervals_.begin(), itEntryEnd = intervals_.end();
-       itEntry != itEntryEnd;
-       ++itEntry) {
+    }
+
+    std::set<EventSetupRecordKey> returnValue;
+
+    for (Intervals::const_iterator itEntry = intervals_.begin(), itEntryEnd = intervals_.end(); itEntry != itEntryEnd;
+         ++itEntry) {
       returnValue.insert(returnValue.end(), itEntry->first);
-   }
-   return returnValue;
-}
+    }
+    return returnValue;
+  }
 
-//
-// static member functions
-//
-}
+  //
+  // static member functions
+  //
+}  // namespace edm
diff --git a/FWCore/Framework/src/EventSetupRecordKey.cc b/FWCore/Framework/src/EventSetupRecordKey.cc
index 57b612c5c5f35..977c061f427b2 100644
--- a/FWCore/Framework/src/EventSetupRecordKey.cc
+++ b/FWCore/Framework/src/EventSetupRecordKey.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     EventSetupRecordKey
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -15,55 +15,52 @@
 // user include files
 #include "FWCore/Framework/interface/EventSetupRecordKey.h"
 
-
 //
 // constants, enums and typedefs
 //
 
 namespace edm {
-   namespace eventsetup {
-//
-// static data member definitions
-//
+  namespace eventsetup {
+    //
+    // static data member definitions
+    //
 
-//
-// constructors and destructor
-//
-EventSetupRecordKey::EventSetupRecordKey() : type_()
-{
-}
+    //
+    // constructors and destructor
+    //
+    EventSetupRecordKey::EventSetupRecordKey() : type_() {}
 
-// EventSetupRecordKey::EventSetupRecordKey(const EventSetupRecordKey& rhs)
-// {
-//    // do actual copying here;
-// }
+    // EventSetupRecordKey::EventSetupRecordKey(const EventSetupRecordKey& rhs)
+    // {
+    //    // do actual copying here;
+    // }
 
-//EventSetupRecordKey::~EventSetupRecordKey()
-//{
-//}
+    //EventSetupRecordKey::~EventSetupRecordKey()
+    //{
+    //}
 
-//
-// assignment operators
-//
-// const EventSetupRecordKey& EventSetupRecordKey::operator=(const EventSetupRecordKey& rhs)
-// {
-//   //An exception safe implementation is
-//   EventSetupRecordKey temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
+    //
+    // assignment operators
+    //
+    // const EventSetupRecordKey& EventSetupRecordKey::operator=(const EventSetupRecordKey& rhs)
+    // {
+    //   //An exception safe implementation is
+    //   EventSetupRecordKey temp(rhs);
+    //   swap(rhs);
+    //
+    //   return *this;
+    // }
 
-//
-// member functions
-//
+    //
+    // member functions
+    //
 
-//
-// const member functions
-//
+    //
+    // const member functions
+    //
 
-//
-// static member functions
-//
-   }
-}
+    //
+    // static member functions
+    //
+  }  // namespace eventsetup
+}  // namespace edm
diff --git a/FWCore/Framework/src/EventSetupRecordProvider.cc b/FWCore/Framework/src/EventSetupRecordProvider.cc
index e5441a148ee11..f027d4f202f99 100644
--- a/FWCore/Framework/src/EventSetupRecordProvider.cc
+++ b/FWCore/Framework/src/EventSetupRecordProvider.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     EventSetupRecordProvider
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -12,6 +12,7 @@
 
 // system include files
 #include <algorithm>
+#include <cassert>
 
 // user include files
 #include "FWCore/Framework/interface/EventSetupRecordProvider.h"
@@ -28,294 +29,272 @@
 #include "FWCore/Utilities/interface/Exception.h"
 #include "make_shared_noexcept_false.h"
 
-
-
-
 //
 // constants, enums and typedefs
 //
 
 namespace edm {
-   namespace eventsetup {
-//
-// static data member definitions
-//
-
-//
-// constructors and destructor
-//
-EventSetupRecordProvider::EventSetupRecordProvider(const EventSetupRecordKey& iKey) :
-    record_(iKey),
-    key_(iKey),
-    validityInterval_(), finder_(), providers_(),
-    multipleFinders_(new std::vector<edm::propagate_const<std::shared_ptr<EventSetupRecordIntervalFinder>>>()),
-    lastSyncWasBeginOfRun_(true)
-{
-}
-
-// EventSetupRecordProvider::EventSetupRecordProvider(const EventSetupRecordProvider& rhs)
-// {
-//    // do actual copying here;
-// }
-
-//
-// assignment operators
-//
-// const EventSetupRecordProvider& EventSetupRecordProvider::operator=(const EventSetupRecordProvider& rhs)
-// {
-//   //An exception safe implementation is
-//   EventSetupRecordProvider temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
-
-//
-// member functions
-//
-void 
-EventSetupRecordProvider::add(std::shared_ptr<DataProxyProvider> iProvider)
-{
-   assert(iProvider->isUsingRecord(key_));
-   edm::propagate_const<std::shared_ptr<DataProxyProvider>> pProvider(iProvider);
-   assert(!search_all(providers_, pProvider));
-   providers_.emplace_back(iProvider);
-}
-
-void 
-EventSetupRecordProvider::addFinder(std::shared_ptr<EventSetupRecordIntervalFinder> iFinder)
-{
-   auto oldFinder = finder();
-   finder_ = iFinder;
-   if (nullptr != multipleFinders_.get()) {
-     multipleFinders_->emplace_back(iFinder);
-   } else {
-     //dependent records set there finders after the multipleFinders_ has been released
-     // but they also have never had a finder set
-     if(nullptr != oldFinder.get()) {
-       cms::Exception("EventSetupMultipleSources")<<"An additional source has been added to the Record "
-       <<key_.name()<<"'\n"
-       <<"after all the other sources have been dealt with.  This is a logic error, please send email to the framework group.";
-     }
-   }
-}
-void
-EventSetupRecordProvider::setValidityInterval(const ValidityInterval& iInterval)
-{
-   validityInterval_ = iInterval;
-}
-
-void 
-EventSetupRecordProvider::setDependentProviders(const std::vector< std::shared_ptr<EventSetupRecordProvider> >& iProviders)
-{
-   using std::placeholders::_1;
-   std::shared_ptr<DependentRecordIntervalFinder> newFinder = make_shared_noexcept_false<DependentRecordIntervalFinder>(key());
-
-   std::shared_ptr<EventSetupRecordIntervalFinder> old = swapFinder(newFinder);
-
-   for(auto const& p: iProviders) { newFinder->addProviderWeAreDependentOn(p); };
-   //if a finder was already set, add it as a depedency.  This is done to ensure that the IOVs properly change even if the
-   // old finder does not update each time a dependent record does change
-   if(old.get() != nullptr) {
-      newFinder->setAlternateFinder(old);
-   }
-}
-void 
-EventSetupRecordProvider::usePreferred(const DataToPreferredProviderMap& iMap)
-{
-  using std::placeholders::_1;
-  for_all(providers_, std::bind(&EventSetupRecordProvider::addProxiesToRecordHelper,this,_1,iMap));
-  if (1 < multipleFinders_->size()) {
-     std::shared_ptr<IntersectingIOVRecordIntervalFinder> intFinder = make_shared_noexcept_false<IntersectingIOVRecordIntervalFinder>(key_);
-     intFinder->swapFinders(*multipleFinders_);
-     finder_ = intFinder;
-  }
-  //now we get rid of the temporary
-  multipleFinders_.reset(nullptr);
-}
-
-void 
-EventSetupRecordProvider::addProxiesToRecord(std::shared_ptr<DataProxyProvider> iProvider,
-                                const EventSetupRecordProvider::DataToPreferredProviderMap& iMap) {
-   typedef DataProxyProvider::KeyedProxies ProxyList ;
-   typedef EventSetupRecordProvider::DataToPreferredProviderMap PreferredMap;
-   
-   const ProxyList& keyedProxies(iProvider->keyedProxies(this->key())) ;
-   ProxyList::const_iterator finishedProxyList(keyedProxies.end()) ;
-   for (ProxyList::const_iterator keyedProxy(keyedProxies.begin()) ;
-        keyedProxy != finishedProxyList ;
-        ++keyedProxy) {
-      PreferredMap::const_iterator itFound = iMap.find(keyedProxy->first);
-      if(iMap.end() != itFound) {
-         if( itFound->second.type_ != keyedProxy->second->providerDescription()->type_ ||
-            itFound->second.label_ != keyedProxy->second->providerDescription()->label_ ) {
+  namespace eventsetup {
+    //
+    // static data member definitions
+    //
+
+    //
+    // constructors and destructor
+    //
+    EventSetupRecordProvider::EventSetupRecordProvider(const EventSetupRecordKey& iKey)
+        : record_(iKey),
+          key_(iKey),
+          validityInterval_(),
+          finder_(),
+          providers_(),
+          multipleFinders_(new std::vector<edm::propagate_const<std::shared_ptr<EventSetupRecordIntervalFinder>>>()),
+          lastSyncWasBeginOfRun_(true) {}
+
+    // EventSetupRecordProvider::EventSetupRecordProvider(const EventSetupRecordProvider& rhs)
+    // {
+    //    // do actual copying here;
+    // }
+
+    //
+    // assignment operators
+    //
+    // const EventSetupRecordProvider& EventSetupRecordProvider::operator=(const EventSetupRecordProvider& rhs)
+    // {
+    //   //An exception safe implementation is
+    //   EventSetupRecordProvider temp(rhs);
+    //   swap(rhs);
+    //
+    //   return *this;
+    // }
+
+    //
+    // member functions
+    //
+    void EventSetupRecordProvider::add(std::shared_ptr<DataProxyProvider> iProvider) {
+      assert(iProvider->isUsingRecord(key_));
+      edm::propagate_const<std::shared_ptr<DataProxyProvider>> pProvider(iProvider);
+      assert(!search_all(providers_, pProvider));
+      providers_.emplace_back(iProvider);
+    }
+
+    void EventSetupRecordProvider::addFinder(std::shared_ptr<EventSetupRecordIntervalFinder> iFinder) {
+      auto oldFinder = finder();
+      finder_ = iFinder;
+      if (nullptr != multipleFinders_.get()) {
+        multipleFinders_->emplace_back(iFinder);
+      } else {
+        //dependent records set there finders after the multipleFinders_ has been released
+        // but they also have never had a finder set
+        if (nullptr != oldFinder.get()) {
+          cms::Exception("EventSetupMultipleSources")
+              << "An additional source has been added to the Record " << key_.name() << "'\n"
+              << "after all the other sources have been dealt with.  This is a logic error, please send email to the "
+                 "framework group.";
+        }
+      }
+    }
+    void EventSetupRecordProvider::setValidityInterval(const ValidityInterval& iInterval) {
+      validityInterval_ = iInterval;
+    }
+
+    void EventSetupRecordProvider::setDependentProviders(
+        const std::vector<std::shared_ptr<EventSetupRecordProvider>>& iProviders) {
+      using std::placeholders::_1;
+      std::shared_ptr<DependentRecordIntervalFinder> newFinder =
+          make_shared_noexcept_false<DependentRecordIntervalFinder>(key());
+
+      std::shared_ptr<EventSetupRecordIntervalFinder> old = swapFinder(newFinder);
+
+      for (auto const& p : iProviders) {
+        newFinder->addProviderWeAreDependentOn(p);
+      };
+      //if a finder was already set, add it as a depedency.  This is done to ensure that the IOVs properly change even if the
+      // old finder does not update each time a dependent record does change
+      if (old.get() != nullptr) {
+        newFinder->setAlternateFinder(old);
+      }
+    }
+    void EventSetupRecordProvider::usePreferred(const DataToPreferredProviderMap& iMap) {
+      using std::placeholders::_1;
+      for_all(providers_, std::bind(&EventSetupRecordProvider::addProxiesToRecordHelper, this, _1, iMap));
+      if (1 < multipleFinders_->size()) {
+        std::shared_ptr<IntersectingIOVRecordIntervalFinder> intFinder =
+            make_shared_noexcept_false<IntersectingIOVRecordIntervalFinder>(key_);
+        intFinder->swapFinders(*multipleFinders_);
+        finder_ = intFinder;
+      }
+      //now we get rid of the temporary
+      multipleFinders_.reset(nullptr);
+    }
+
+    void EventSetupRecordProvider::addProxiesToRecord(std::shared_ptr<DataProxyProvider> iProvider,
+                                                      const EventSetupRecordProvider::DataToPreferredProviderMap& iMap) {
+      typedef DataProxyProvider::KeyedProxies ProxyList;
+      typedef EventSetupRecordProvider::DataToPreferredProviderMap PreferredMap;
+
+      const ProxyList& keyedProxies(iProvider->keyedProxies(this->key()));
+      ProxyList::const_iterator finishedProxyList(keyedProxies.end());
+      for (ProxyList::const_iterator keyedProxy(keyedProxies.begin()); keyedProxy != finishedProxyList; ++keyedProxy) {
+        PreferredMap::const_iterator itFound = iMap.find(keyedProxy->first);
+        if (iMap.end() != itFound) {
+          if (itFound->second.type_ != keyedProxy->second->providerDescription()->type_ ||
+              itFound->second.label_ != keyedProxy->second->providerDescription()->label_) {
             //this is not the preferred provider
             continue;
-         }
+          }
+        }
+        record_.add((*keyedProxy).first, (*keyedProxy).second.get());
       }
-      record_.add((*keyedProxy).first , (*keyedProxy).second.get()) ;
-   }
-}
-      
-void 
-EventSetupRecordProvider::addRecordTo(EventSetupProvider& iEventSetupProvider) {
-   record_.set(this->validityInterval());
-   iEventSetupProvider.addRecordToEventSetup(record_);
-}
-      
-//
-// const member functions
-//
-void 
-EventSetupRecordProvider::resetTransients()
-{
-
-   using std::placeholders::_1;
-   if(checkResetTransients())  {
-      for_all(providers_, std::bind(&DataProxyProvider::resetProxiesIfTransient,_1,key_)); 
-   }
-}
-
-      
-void 
-EventSetupRecordProvider::addRecordToIfValid(EventSetupProvider& iEventSetupProvider,
-                                          const IOVSyncValue& iTime)
-{
-   if(setValidityIntervalFor(iTime)) {
-      addRecordTo(iEventSetupProvider);
-   } 
-}
-
-bool 
-EventSetupRecordProvider::setValidityIntervalFor(const IOVSyncValue& iTime)
-{
-   //we want to wait until after the first event of a new run before
-   // we reset any transients just in case some modules get their data at beginRun or beginLumi
-   // and others wait till the first event
-   if(!lastSyncWasBeginOfRun_) {
-      resetTransients();
-   }
-   lastSyncWasBeginOfRun_=iTime.eventID().event() == 0;
-   
-   if(validityInterval_.validFor(iTime)) {
-      return true;
-   }
-   bool returnValue = false;
-   //need to see if we get a new interval
-   if(nullptr != finder_.get()) {
-      IOVSyncValue oldFirst(validityInterval_.first());
-      
-      validityInterval_ = finder_->findIntervalFor(key_, iTime);
-      //are we in a valid range?
-      if(validityInterval_.first() != IOVSyncValue::invalidIOVSyncValue()) {
-         returnValue = true;
-         //did we actually change?
-         if(oldFirst != validityInterval_.first()) {
+    }
+
+    void EventSetupRecordProvider::addRecordTo(EventSetupProvider& iEventSetupProvider) {
+      record_.set(this->validityInterval());
+      iEventSetupProvider.addRecordToEventSetup(record_);
+    }
+
+    //
+    // const member functions
+    //
+    void EventSetupRecordProvider::resetTransients() {
+      using std::placeholders::_1;
+      if (checkResetTransients()) {
+        for_all(providers_, std::bind(&DataProxyProvider::resetProxiesIfTransient, _1, key_));
+      }
+    }
+
+    void EventSetupRecordProvider::addRecordToIfValid(EventSetupProvider& iEventSetupProvider,
+                                                      const IOVSyncValue& iTime) {
+      if (setValidityIntervalFor(iTime)) {
+        addRecordTo(iEventSetupProvider);
+      }
+    }
+
+    bool EventSetupRecordProvider::setValidityIntervalFor(const IOVSyncValue& iTime) {
+      //we want to wait until after the first event of a new run before
+      // we reset any transients just in case some modules get their data at beginRun or beginLumi
+      // and others wait till the first event
+      if (!lastSyncWasBeginOfRun_) {
+        resetTransients();
+      }
+      lastSyncWasBeginOfRun_ = iTime.eventID().event() == 0;
+
+      if (validityInterval_.validFor(iTime)) {
+        return true;
+      }
+      bool returnValue = false;
+      //need to see if we get a new interval
+      if (nullptr != finder_.get()) {
+        IOVSyncValue oldFirst(validityInterval_.first());
+
+        validityInterval_ = finder_->findIntervalFor(key_, iTime);
+        //are we in a valid range?
+        if (validityInterval_.first() != IOVSyncValue::invalidIOVSyncValue()) {
+          returnValue = true;
+          //did we actually change?
+          if (oldFirst != validityInterval_.first()) {
             //tell all Providers to update
-            for(auto& provider : providers_) {
-               provider->newInterval(key_, validityInterval_);
+            for (auto& provider : providers_) {
+              provider->newInterval(key_, validityInterval_);
             }
             cacheReset();
-         }
+          }
+        }
       }
-   }
-   return returnValue;
-}
-
-void 
-EventSetupRecordProvider::resetProxies()
-{
-   using std::placeholders::_1;
-   cacheReset();
-   for_all(providers_, std::bind(&DataProxyProvider::resetProxies,_1,key_));
-   //some proxies only clear if they were accessed transiently,
-   // since resetProxies resets that flag, calling resetTransients
-   // will force a clear
-   for_all(providers_, std::bind(&DataProxyProvider::resetProxiesIfTransient,_1,key_)); 
-
-}
-
-void
-EventSetupRecordProvider::getReferencedESProducers(std::map<EventSetupRecordKey, std::vector<ComponentDescription const*> >& referencedESProducers) {
-   record().getESProducers(referencedESProducers[key_]);
-}
-
-void
-EventSetupRecordProvider::fillReferencedDataKeys(std::map<DataKey, ComponentDescription const*>& referencedDataKeys) {
-   record().fillReferencedDataKeys(referencedDataKeys);
-}
-
-void
-EventSetupRecordProvider::resetRecordToProxyPointers(DataToPreferredProviderMap const& iMap) {
-   using std::placeholders::_1;
-   record().clearProxies();
-   for_all(providers_, std::bind(&EventSetupRecordProvider::addProxiesToRecordHelper, this, _1, iMap));
-}
-
-void 
-EventSetupRecordProvider::cacheReset()
-{
-   record().cacheReset();
-}
-
-bool 
-EventSetupRecordProvider::checkResetTransients() 
-{
-   return record().transientReset();
-}
-      
-
-std::set<EventSetupRecordKey> 
-EventSetupRecordProvider::dependentRecords() const
-{
-  return dependencies(key());
-}
-
-std::set<ComponentDescription> 
-EventSetupRecordProvider::proxyProviderDescriptions() const
-{
-   using std::placeholders::_1;
-   std::set<ComponentDescription> descriptions;
-   std::transform(providers_.begin(), providers_.end(),
-                  std::inserter(descriptions,descriptions.end()),
-                  std::bind(&DataProxyProvider::description,_1));
-   return descriptions;
-}
-
-std::shared_ptr<DataProxyProvider> 
-EventSetupRecordProvider::proxyProvider(ComponentDescription const& iDesc) {
-   using std::placeholders::_1;
-   auto itFound = std::find_if(providers_.begin(),providers_.end(),
-                std::bind(std::equal_to<ComponentDescription>(), 
-                            iDesc, 
-                            std::bind(&DataProxyProvider::description,_1)));
-   if(itFound == providers_.end()){
-      return std::shared_ptr<DataProxyProvider>();
-   }
-   return get_underlying_safe(*itFound);
-}
-
-std::shared_ptr<DataProxyProvider> 
-EventSetupRecordProvider::proxyProvider(ParameterSetIDHolder const& psetID) {
-   for (auto& dataProxyProvider : providers_) {
-      if (dataProxyProvider->description().pid_ == psetID.psetID()) {
-         return get_underlying_safe(dataProxyProvider);
+      return returnValue;
+    }
+
+    void EventSetupRecordProvider::resetProxies() {
+      using std::placeholders::_1;
+      cacheReset();
+      for_all(providers_, std::bind(&DataProxyProvider::resetProxies, _1, key_));
+      //some proxies only clear if they were accessed transiently,
+      // since resetProxies resets that flag, calling resetTransients
+      // will force a clear
+      for_all(providers_, std::bind(&DataProxyProvider::resetProxiesIfTransient, _1, key_));
+    }
+
+    void EventSetupRecordProvider::getReferencedESProducers(
+        std::map<EventSetupRecordKey, std::vector<ComponentDescription const*>>& referencedESProducers) {
+      record().getESProducers(referencedESProducers[key_]);
+    }
+
+    void EventSetupRecordProvider::fillReferencedDataKeys(
+        std::map<DataKey, ComponentDescription const*>& referencedDataKeys) const {
+      std::vector<DataKey> keys;
+      record().fillRegisteredDataKeys(keys);
+      std::vector<ComponentDescription const*> components = record().componentsForRegisteredDataKeys();
+      auto itComponents = components.begin();
+      for (auto const& k : keys) {
+        referencedDataKeys.emplace(k, *itComponents);
+        ++itComponents;
       }
-   }
-   return std::shared_ptr<DataProxyProvider>();
-}
-
-void
-EventSetupRecordProvider::resetProxyProvider(ParameterSetIDHolder const& psetID, std::shared_ptr<DataProxyProvider> const& sharedDataProxyProvider) {
-   for (auto& dataProxyProvider : providers_) {
-      if (dataProxyProvider->description().pid_ == psetID.psetID()) {
-         dataProxyProvider = sharedDataProxyProvider;
+    }
+
+    void EventSetupRecordProvider::resetRecordToProxyPointers(DataToPreferredProviderMap const& iMap) {
+      using std::placeholders::_1;
+      record().clearProxies();
+      for_all(providers_, std::bind(&EventSetupRecordProvider::addProxiesToRecordHelper, this, _1, iMap));
+    }
+
+    void EventSetupRecordProvider::cacheReset() { record().cacheReset(); }
+
+    bool EventSetupRecordProvider::checkResetTransients() { return record().transientReset(); }
+
+    std::set<EventSetupRecordKey> EventSetupRecordProvider::dependentRecords() const { return dependencies(key()); }
+
+    std::set<ComponentDescription> EventSetupRecordProvider::proxyProviderDescriptions() const {
+      using std::placeholders::_1;
+      std::set<ComponentDescription> descriptions;
+      std::transform(providers_.begin(),
+                     providers_.end(),
+                     std::inserter(descriptions, descriptions.end()),
+                     std::bind(&DataProxyProvider::description, _1));
+      return descriptions;
+    }
+
+    std::shared_ptr<DataProxyProvider> EventSetupRecordProvider::proxyProvider(ComponentDescription const& iDesc) {
+      using std::placeholders::_1;
+      auto itFound = std::find_if(
+          providers_.begin(),
+          providers_.end(),
+          std::bind(std::equal_to<ComponentDescription>(), iDesc, std::bind(&DataProxyProvider::description, _1)));
+      if (itFound == providers_.end()) {
+        return std::shared_ptr<DataProxyProvider>();
       }
-   }
-}
-
-//
-// static member functions
-//
-   }
-}
+      return get_underlying_safe(*itFound);
+    }
+
+    std::shared_ptr<DataProxyProvider> EventSetupRecordProvider::proxyProvider(ParameterSetIDHolder const& psetID) {
+      for (auto& dataProxyProvider : providers_) {
+        if (dataProxyProvider->description().pid_ == psetID.psetID()) {
+          return get_underlying_safe(dataProxyProvider);
+        }
+      }
+      return std::shared_ptr<DataProxyProvider>();
+    }
+
+    void EventSetupRecordProvider::resetProxyProvider(
+        ParameterSetIDHolder const& psetID, std::shared_ptr<DataProxyProvider> const& sharedDataProxyProvider) {
+      for (auto& dataProxyProvider : providers_) {
+        if (dataProxyProvider->description().pid_ == psetID.psetID()) {
+          dataProxyProvider = sharedDataProxyProvider;
+        }
+      }
+    }
+
+    std::vector<DataKey> EventSetupRecordProvider::registeredDataKeys() const {
+      std::vector<DataKey> ret;
+      record_.fillRegisteredDataKeys(ret);
+      return ret;
+    }
+
+    std::vector<ComponentDescription const*> EventSetupRecordProvider::componentsForRegisteredDataKeys() const {
+      return record_.componentsForRegisteredDataKeys();
+    }
+
+    //
+    // static member functions
+    //
+  }  // namespace eventsetup
+}  // namespace edm
diff --git a/FWCore/Framework/src/EventSetupsController.cc b/FWCore/Framework/src/EventSetupsController.cc
index eb9b4574dfebe..288ec561a99a2 100644
--- a/FWCore/Framework/src/EventSetupsController.cc
+++ b/FWCore/Framework/src/EventSetupsController.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     EventSetupsController
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -25,29 +25,26 @@
 namespace edm {
   namespace eventsetup {
 
-    EventSetupsController::EventSetupsController() : mustFinishConfiguration_(true) {
-    }
-
-    std::shared_ptr<EventSetupProvider>
-    EventSetupsController::makeProvider(ParameterSet& iPSet, ActivityRegistry* activityRegistry) {
+    EventSetupsController::EventSetupsController() : mustFinishConfiguration_(true) {}
 
+    std::shared_ptr<EventSetupProvider> EventSetupsController::makeProvider(ParameterSet& iPSet,
+                                                                            ActivityRegistry* activityRegistry) {
       // Makes an EventSetupProvider
       // Also parses the prefer information from ParameterSets and puts
       // it in a map that is stored in the EventSetupProvider
-      std::shared_ptr<EventSetupProvider> returnValue(makeEventSetupProvider(iPSet, providers_.size(), activityRegistry) );
+      std::shared_ptr<EventSetupProvider> returnValue(
+          makeEventSetupProvider(iPSet, providers_.size(), activityRegistry));
 
       // Construct the ESProducers and ESSources
       // shared_ptrs to them are temporarily stored in this
       // EventSetupsController and in the EventSetupProvider
       fillEventSetupProvider(*this, *returnValue, iPSet);
-   
+
       providers_.push_back(returnValue);
       return returnValue;
     }
 
-    void
-    EventSetupsController::eventSetupForInstance(IOVSyncValue const& syncValue) {
-
+    void EventSetupsController::finishConfiguration() {
       if (mustFinishConfiguration_) {
         std::for_each(providers_.begin(), providers_.end(), [](std::shared_ptr<EventSetupProvider> const& esp) {
           esp->finishConfiguration();
@@ -56,38 +53,38 @@ namespace edm {
         // done which attempts to get component sharing between SubProcesses
         // correct, but in this pass only the configuration of the components
         // being shared are compared. This is not good enough for ESProducers.
-        // In the following function, all the other components that contribute 
+        // In the following function, all the other components that contribute
         // to the same record and also the records that record depends on are
         // also checked. The component sharing is appropriately fixed as necessary.
         checkESProducerSharing();
         clearComponents();
         mustFinishConfiguration_ = false;
       }
-
+    }
+    void EventSetupsController::eventSetupForInstance(IOVSyncValue const& syncValue) {
+      finishConfiguration();
       std::for_each(providers_.begin(), providers_.end(), [&syncValue](std::shared_ptr<EventSetupProvider> const& esp) {
         esp->eventSetupForInstance(syncValue);
       });
     }
 
-    void
-    EventSetupsController::forceCacheClear() const {
+    void EventSetupsController::forceCacheClear() const {
       std::for_each(providers_.begin(), providers_.end(), [](std::shared_ptr<EventSetupProvider> const& esp) {
         esp->forceCacheClear();
       });
     }
 
-    bool
-    EventSetupsController::isWithinValidityInterval(IOVSyncValue const& syncValue) const {
-      for(auto const& provider: providers_) {
-        if( not provider->isWithinValidityInterval(syncValue)) {
+    bool EventSetupsController::isWithinValidityInterval(IOVSyncValue const& syncValue) const {
+      for (auto const& provider : providers_) {
+        if (not provider->isWithinValidityInterval(syncValue)) {
           return false;
         }
       }
       return true;
     }
-    
-    std::shared_ptr<DataProxyProvider>
-    EventSetupsController::getESProducerAndRegisterProcess(ParameterSet const& pset, unsigned subProcessIndex) {
+
+    std::shared_ptr<DataProxyProvider> EventSetupsController::getESProducerAndRegisterProcess(
+        ParameterSet const& pset, unsigned subProcessIndex) {
       // Try to find a DataProxyProvider with a matching ParameterSet
       auto elements = esproducers_.equal_range(pset.id());
       for (auto it = elements.first; it != elements.second; ++it) {
@@ -103,16 +100,17 @@ namespace edm {
       return std::shared_ptr<DataProxyProvider>();
     }
 
-    void
-    EventSetupsController::putESProducer(ParameterSet const& pset, std::shared_ptr<DataProxyProvider> const& component, unsigned subProcessIndex) {
-      auto newElement = esproducers_.insert(std::pair<ParameterSetID, ESProducerInfo>(pset.id(), 
-                                                                                      ESProducerInfo(&pset, component)));
+    void EventSetupsController::putESProducer(ParameterSet const& pset,
+                                              std::shared_ptr<DataProxyProvider> const& component,
+                                              unsigned subProcessIndex) {
+      auto newElement =
+          esproducers_.insert(std::pair<ParameterSetID, ESProducerInfo>(pset.id(), ESProducerInfo(&pset, component)));
       // Register processes with an exact match
       newElement->second.subProcessIndexes().push_back(subProcessIndex);
     }
 
-    std::shared_ptr<EventSetupRecordIntervalFinder>
-    EventSetupsController::getESSourceAndRegisterProcess(ParameterSet const& pset, unsigned subProcessIndex) {
+    std::shared_ptr<EventSetupRecordIntervalFinder> EventSetupsController::getESSourceAndRegisterProcess(
+        ParameterSet const& pset, unsigned subProcessIndex) {
       // Try to find a EventSetupRecordIntervalFinder with a matching ParameterSet
       auto elements = essources_.equal_range(pset.id());
       for (auto it = elements.first; it != elements.second; ++it) {
@@ -128,30 +126,27 @@ namespace edm {
       return std::shared_ptr<EventSetupRecordIntervalFinder>();
     }
 
-    void
-    EventSetupsController::putESSource(ParameterSet const& pset, std::shared_ptr<EventSetupRecordIntervalFinder> const& component, unsigned subProcessIndex) {
-      auto newElement = essources_.insert(std::pair<ParameterSetID, ESSourceInfo>(pset.id(), 
-                                                                                  ESSourceInfo(&pset, component)));
+    void EventSetupsController::putESSource(ParameterSet const& pset,
+                                            std::shared_ptr<EventSetupRecordIntervalFinder> const& component,
+                                            unsigned subProcessIndex) {
+      auto newElement =
+          essources_.insert(std::pair<ParameterSetID, ESSourceInfo>(pset.id(), ESSourceInfo(&pset, component)));
       // Register processes with an exact match
       newElement->second.subProcessIndexes().push_back(subProcessIndex);
     }
 
-    void
-    EventSetupsController::clearComponents() {
+    void EventSetupsController::clearComponents() {
       esproducers_.clear();
       essources_.clear();
     }
 
-    void
-    EventSetupsController::lookForMatches(ParameterSetID const& psetID,
-                                          unsigned subProcessIndex,
-                                          unsigned precedingProcessIndex,
-                                          bool& firstProcessWithThisPSet,
-                                          bool& precedingHasMatchingPSet) const {
-
+    void EventSetupsController::lookForMatches(ParameterSetID const& psetID,
+                                               unsigned subProcessIndex,
+                                               unsigned precedingProcessIndex,
+                                               bool& firstProcessWithThisPSet,
+                                               bool& precedingHasMatchingPSet) const {
       auto elements = esproducers_.equal_range(psetID);
       for (auto it = elements.first; it != elements.second; ++it) {
-
         std::vector<unsigned> const& subProcessIndexes = it->second.subProcessIndexes();
 
         auto iFound = std::find(subProcessIndexes.begin(), subProcessIndexes.end(), subProcessIndex);
@@ -161,7 +156,7 @@ namespace edm {
 
         if (iFound == subProcessIndexes.begin()) {
           firstProcessWithThisPSet = true;
-          precedingHasMatchingPSet = false;      
+          precedingHasMatchingPSet = false;
         } else {
           auto iFoundPreceding = std::find(subProcessIndexes.begin(), iFound, precedingProcessIndex);
           if (iFoundPreceding == iFound) {
@@ -169,25 +164,21 @@ namespace edm {
             precedingHasMatchingPSet = false;
           } else {
             firstProcessWithThisPSet = false;
-            precedingHasMatchingPSet = true;    
+            precedingHasMatchingPSet = true;
           }
         }
         return;
       }
-      throw edm::Exception(edm::errors::LogicError)
-        << "EventSetupsController::lookForMatches\n"
-        << "Subprocess index not found. This should never happen\n"
-        << "Please report this to a Framework Developer\n";   
+      throw edm::Exception(edm::errors::LogicError) << "EventSetupsController::lookForMatches\n"
+                                                    << "Subprocess index not found. This should never happen\n"
+                                                    << "Please report this to a Framework Developer\n";
     }
 
-    bool
-    EventSetupsController::isFirstMatch(ParameterSetID const& psetID,
-                                        unsigned subProcessIndex,
-                                        unsigned precedingProcessIndex) const {
-
+    bool EventSetupsController::isFirstMatch(ParameterSetID const& psetID,
+                                             unsigned subProcessIndex,
+                                             unsigned precedingProcessIndex) const {
       auto elements = esproducers_.equal_range(psetID);
       for (auto it = elements.first; it != elements.second; ++it) {
-
         std::vector<unsigned> const& subProcessIndexes = it->second.subProcessIndexes();
 
         auto iFound = std::find(subProcessIndexes.begin(), subProcessIndexes.end(), subProcessIndex);
@@ -202,21 +193,17 @@ namespace edm {
           return iFoundPreceding == subProcessIndexes.begin();
         }
       }
-      throw edm::Exception(edm::errors::LogicError)
-        << "EventSetupsController::isFirstMatch\n"
-        << "Subprocess index not found. This should never happen\n"
-        << "Please report this to a Framework Developer\n";
+      throw edm::Exception(edm::errors::LogicError) << "EventSetupsController::isFirstMatch\n"
+                                                    << "Subprocess index not found. This should never happen\n"
+                                                    << "Please report this to a Framework Developer\n";
       return false;
     }
 
-    bool
-    EventSetupsController::isLastMatch(ParameterSetID const& psetID,
-                                       unsigned subProcessIndex,
-                                       unsigned precedingProcessIndex) const {
-
+    bool EventSetupsController::isLastMatch(ParameterSetID const& psetID,
+                                            unsigned subProcessIndex,
+                                            unsigned precedingProcessIndex) const {
       auto elements = esproducers_.equal_range(psetID);
       for (auto it = elements.first; it != elements.second; ++it) {
-
         std::vector<unsigned> const& subProcessIndexes = it->second.subProcessIndexes();
 
         auto iFound = std::find(subProcessIndexes.begin(), subProcessIndexes.end(), subProcessIndex);
@@ -231,20 +218,17 @@ namespace edm {
           return (++iFoundPreceding) == iFound;
         }
       }
-      throw edm::Exception(edm::errors::LogicError)
-        << "EventSetupsController::isLastMatch\n"
-        << "Subprocess index not found. This should never happen\n"
-        << "Please report this to a Framework Developer\n";
+      throw edm::Exception(edm::errors::LogicError) << "EventSetupsController::isLastMatch\n"
+                                                    << "Subprocess index not found. This should never happen\n"
+                                                    << "Please report this to a Framework Developer\n";
       return false;
     }
 
-    bool
-    EventSetupsController::isMatchingESSource(ParameterSetID const& psetID,
-                                              unsigned subProcessIndex,
-                                              unsigned precedingProcessIndex) const {
+    bool EventSetupsController::isMatchingESSource(ParameterSetID const& psetID,
+                                                   unsigned subProcessIndex,
+                                                   unsigned precedingProcessIndex) const {
       auto elements = essources_.equal_range(psetID);
       for (auto it = elements.first; it != elements.second; ++it) {
-
         std::vector<unsigned> const& subProcessIndexes = it->second.subProcessIndexes();
 
         auto iFound = std::find(subProcessIndexes.begin(), subProcessIndexes.end(), subProcessIndex);
@@ -256,23 +240,20 @@ namespace edm {
         if (iFoundPreceding == iFound) {
           return false;
         } else {
-          return true;    
+          return true;
         }
       }
-      throw edm::Exception(edm::errors::LogicError)
-        << "EventSetupsController::lookForMatchingESSource\n"
-        << "Subprocess index not found. This should never happen\n"
-        << "Please report this to a Framework Developer\n";
+      throw edm::Exception(edm::errors::LogicError) << "EventSetupsController::lookForMatchingESSource\n"
+                                                    << "Subprocess index not found. This should never happen\n"
+                                                    << "Please report this to a Framework Developer\n";
       return false;
     }
 
-    bool
-    EventSetupsController::isMatchingESProducer(ParameterSetID const& psetID,
-                                                unsigned subProcessIndex,
-                                                unsigned precedingProcessIndex) const {
+    bool EventSetupsController::isMatchingESProducer(ParameterSetID const& psetID,
+                                                     unsigned subProcessIndex,
+                                                     unsigned precedingProcessIndex) const {
       auto elements = esproducers_.equal_range(psetID);
       for (auto it = elements.first; it != elements.second; ++it) {
-
         std::vector<unsigned> const& subProcessIndexes = it->second.subProcessIndexes();
 
         auto iFound = std::find(subProcessIndexes.begin(), subProcessIndexes.end(), subProcessIndex);
@@ -284,23 +265,19 @@ namespace edm {
         if (iFoundPreceding == iFound) {
           return false;
         } else {
-          return true;    
+          return true;
         }
       }
-      throw edm::Exception(edm::errors::LogicError)
-        << "EventSetupsController::lookForMatchingESSource\n"
-        << "Subprocess index not found. This should never happen\n"
-        << "Please report this to a Framework Developer\n";
+      throw edm::Exception(edm::errors::LogicError) << "EventSetupsController::lookForMatchingESSource\n"
+                                                    << "Subprocess index not found. This should never happen\n"
+                                                    << "Please report this to a Framework Developer\n";
       return false;
     }
 
-    ParameterSet const*
-    EventSetupsController::getESProducerPSet(ParameterSetID const& psetID,
-                                             unsigned subProcessIndex) const {
-   
+    ParameterSet const* EventSetupsController::getESProducerPSet(ParameterSetID const& psetID,
+                                                                 unsigned subProcessIndex) const {
       auto elements = esproducers_.equal_range(psetID);
       for (auto it = elements.first; it != elements.second; ++it) {
-
         std::vector<unsigned> const& subProcessIndexes = it->second.subProcessIndexes();
 
         auto iFound = std::find(subProcessIndexes.begin(), subProcessIndexes.end(), subProcessIndex);
@@ -309,22 +286,19 @@ namespace edm {
         }
         return it->second.pset();
       }
-      throw edm::Exception(edm::errors::LogicError)
-        << "EventSetupsController::getESProducerPSet\n"
-        << "Subprocess index not found. This should never happen\n"
-        << "Please report this to a Framework Developer\n";
+      throw edm::Exception(edm::errors::LogicError) << "EventSetupsController::getESProducerPSet\n"
+                                                    << "Subprocess index not found. This should never happen\n"
+                                                    << "Please report this to a Framework Developer\n";
       return nullptr;
     }
 
-    void
-    EventSetupsController::checkESProducerSharing() {
-
+    void EventSetupsController::checkESProducerSharing() {
       // Loop over SubProcesses, skip the top level process.
       auto esProvider = providers_.begin();
-      auto esProviderEnd = providers_.end();
-      if (esProvider != esProviderEnd) ++esProvider;
-      for ( ; esProvider != esProviderEnd; ++esProvider) {
-
+      auto const esProviderEnd = providers_.end();
+      if (esProvider != esProviderEnd)
+        ++esProvider;
+      for (; esProvider != esProviderEnd; ++esProvider) {
         // An element is added to this set for each ESProducer
         // when we have determined which preceding process
         // this process can share that ESProducer with or
@@ -345,19 +319,16 @@ namespace edm {
         // EventSetupProviders from the preceding processes (the first
         // preceding process will be the top level process and the others
         // SubProcess's)
-        for (auto precedingESProvider = providers_.begin();
-             precedingESProvider != esProvider;
-             ++precedingESProvider) {
-
+        for (auto precedingESProvider = providers_.begin(); precedingESProvider != esProvider; ++precedingESProvider) {
           (*esProvider)->checkESProducerSharing(**precedingESProvider, sharingCheckDone, referencedESProducers, *this);
         }
 
         (*esProvider)->resetRecordToProxyPointers();
       }
       esProvider = providers_.begin();
-      for ( ; esProvider != esProviderEnd; ++esProvider) {
+      for (; esProvider != esProviderEnd; ++esProvider) {
         (*esProvider)->clearInitializationData();
       }
     }
-  }
-}
+  }  // namespace eventsetup
+}  // namespace edm
diff --git a/FWCore/Framework/src/EventSetupsController.h b/FWCore/Framework/src/EventSetupsController.h
index 9a03a110d07d4..df7811858e02e 100644
--- a/FWCore/Framework/src/EventSetupsController.h
+++ b/FWCore/Framework/src/EventSetupsController.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     EventSetupsController
-// 
+//
 /** \class edm::eventsetup::EventSetupsController
 
  Description: Manages a group of EventSetups which can share components
@@ -26,131 +26,130 @@
 
 namespace edm {
 
-   class ActivityRegistry;
-   class EventSetupRecordIntervalFinder;
-   class ParameterSet;
-   class IOVSyncValue;
-   
-   namespace eventsetup {
+  class ActivityRegistry;
+  class EventSetupRecordIntervalFinder;
+  class ParameterSet;
+  class IOVSyncValue;
 
-      class DataProxyProvider;
-      class EventSetupProvider;
+  namespace eventsetup {
 
-      class ESProducerInfo {
-      public:
-         ESProducerInfo(ParameterSet const* ps,
-                        std::shared_ptr<DataProxyProvider> const& pr) : 
-            pset_(ps), provider_(pr), subProcessIndexes_() { }
+    class DataProxyProvider;
+    class EventSetupProvider;
 
-         ParameterSet const* pset() const { return pset_; }
-         std::shared_ptr<DataProxyProvider> const& provider() const { return provider_; }
-         std::vector<unsigned>& subProcessIndexes() { return subProcessIndexes_; }
-         std::vector<unsigned> const& subProcessIndexes() const { return subProcessIndexes_; }
+    class ESProducerInfo {
+    public:
+      ESProducerInfo(ParameterSet const* ps, std::shared_ptr<DataProxyProvider> const& pr)
+          : pset_(ps), provider_(pr), subProcessIndexes_() {}
 
-      private:
-         ParameterSet const* pset_;
-         std::shared_ptr<DataProxyProvider> provider_;
-         std::vector<unsigned> subProcessIndexes_;
-      };
+      ParameterSet const* pset() const { return pset_; }
+      std::shared_ptr<DataProxyProvider> const& provider() const { return provider_; }
+      std::vector<unsigned>& subProcessIndexes() { return subProcessIndexes_; }
+      std::vector<unsigned> const& subProcessIndexes() const { return subProcessIndexes_; }
 
-      class ESSourceInfo {
-      public:
-         ESSourceInfo(ParameterSet const* ps,
-                      std::shared_ptr<EventSetupRecordIntervalFinder> const& fi) :
-            pset_(ps), finder_(fi), subProcessIndexes_() { }
+    private:
+      ParameterSet const* pset_;
+      std::shared_ptr<DataProxyProvider> provider_;
+      std::vector<unsigned> subProcessIndexes_;
+    };
 
-         ParameterSet const* pset() const { return pset_; }
-         std::shared_ptr<EventSetupRecordIntervalFinder> const& finder() const { return finder_; }
-         std::vector<unsigned>& subProcessIndexes() { return subProcessIndexes_; }
-         std::vector<unsigned> const& subProcessIndexes() const { return subProcessIndexes_; }
+    class ESSourceInfo {
+    public:
+      ESSourceInfo(ParameterSet const* ps, std::shared_ptr<EventSetupRecordIntervalFinder> const& fi)
+          : pset_(ps), finder_(fi), subProcessIndexes_() {}
 
-      private:
-         ParameterSet const* pset_;
-         std::shared_ptr<EventSetupRecordIntervalFinder> finder_;
-         std::vector<unsigned> subProcessIndexes_;
-      };
+      ParameterSet const* pset() const { return pset_; }
+      std::shared_ptr<EventSetupRecordIntervalFinder> const& finder() const { return finder_; }
+      std::vector<unsigned>& subProcessIndexes() { return subProcessIndexes_; }
+      std::vector<unsigned> const& subProcessIndexes() const { return subProcessIndexes_; }
 
-      class EventSetupsController {
-         
-      public:
-         EventSetupsController();
+    private:
+      ParameterSet const* pset_;
+      std::shared_ptr<EventSetupRecordIntervalFinder> finder_;
+      std::vector<unsigned> subProcessIndexes_;
+    };
 
-         std::shared_ptr<EventSetupProvider> makeProvider(ParameterSet&, ActivityRegistry*);
+    class EventSetupsController {
+    public:
+      EventSetupsController();
 
-         void eventSetupForInstance(IOVSyncValue const& syncValue);
+      std::shared_ptr<EventSetupProvider> makeProvider(ParameterSet&, ActivityRegistry*);
 
-         bool isWithinValidityInterval(IOVSyncValue const& syncValue) const;
-        
-         void forceCacheClear() const;
+      void eventSetupForInstance(IOVSyncValue const& syncValue);
 
-         std::shared_ptr<DataProxyProvider> getESProducerAndRegisterProcess(ParameterSet const& pset, unsigned subProcessIndex);
-         void putESProducer(ParameterSet const& pset, std::shared_ptr<DataProxyProvider> const& component, unsigned subProcessIndex);
+      bool isWithinValidityInterval(IOVSyncValue const& syncValue) const;
 
-         std::shared_ptr<EventSetupRecordIntervalFinder> getESSourceAndRegisterProcess(ParameterSet const& pset, unsigned subProcessIndex);
-         void putESSource(ParameterSet const& pset, std::shared_ptr<EventSetupRecordIntervalFinder> const& component, unsigned subProcessIndex);
+      void forceCacheClear() const;
 
-         void clearComponents();
+      std::shared_ptr<DataProxyProvider> getESProducerAndRegisterProcess(ParameterSet const& pset,
+                                                                         unsigned subProcessIndex);
+      void putESProducer(ParameterSet const& pset,
+                         std::shared_ptr<DataProxyProvider> const& component,
+                         unsigned subProcessIndex);
 
-         unsigned indexOfNextProcess() const { return providers_.size(); }
+      std::shared_ptr<EventSetupRecordIntervalFinder> getESSourceAndRegisterProcess(ParameterSet const& pset,
+                                                                                    unsigned subProcessIndex);
+      void putESSource(ParameterSet const& pset,
+                       std::shared_ptr<EventSetupRecordIntervalFinder> const& component,
+                       unsigned subProcessIndex);
 
-         void lookForMatches(ParameterSetID const& psetID,
-                             unsigned subProcessIndex,
-                             unsigned precedingProcessIndex,
-                             bool& firstProcessWithThisPSet,
-                             bool& precedingHasMatchingPSet) const;
+      void finishConfiguration();
+      void clearComponents();
 
-         bool isFirstMatch(ParameterSetID const& psetID,
-                           unsigned subProcessIndex,
-                           unsigned precedingProcessIndex) const;
+      unsigned indexOfNextProcess() const { return providers_.size(); }
 
-         bool isLastMatch(ParameterSetID const& psetID,
+      void lookForMatches(ParameterSetID const& psetID,
                           unsigned subProcessIndex,
-                          unsigned precedingProcessIndex) const;
-
-         bool isMatchingESSource(ParameterSetID const& psetID,
-                                 unsigned subProcessIndex,
-                                 unsigned precedingProcessIndex) const;
-
-         bool isMatchingESProducer(ParameterSetID const& psetID,
-                                   unsigned subProcessIndex,
-                                   unsigned precedingProcessIndex) const;
-
-         ParameterSet const* getESProducerPSet(ParameterSetID const& psetID,
-                                               unsigned subProcessIndex) const;
-
-         std::vector<std::shared_ptr<EventSetupProvider> > const& providers() const { return providers_; }
-
-         std::multimap<ParameterSetID, ESProducerInfo> const& esproducers() const { return esproducers_; }
-
-         std::multimap<ParameterSetID, ESSourceInfo> const& essources() const { return essources_; }
-
-         bool mustFinishConfiguration() const { return mustFinishConfiguration_; }
-
-      private:
-         EventSetupsController(EventSetupsController const&) = delete; // stop default
-         
-         EventSetupsController const& operator=(EventSetupsController const&) = delete; // stop default
-
-         void checkESProducerSharing();
-         
-         // ---------- member data --------------------------------
-         std::vector<std::shared_ptr<EventSetupProvider> > providers_;
-
-         // The following two multimaps have one entry for each unique
-         // ParameterSet. The ESProducerInfo or ESSourceInfo object
-         // contains a list of the processes that use that ParameterSet
-         // (0 for the top level process, then the SubProcesses are
-         // identified by counting their execution order starting at 1).
-         // There can be multiple entries for a single ParameterSetID because
-         // of a difference in untracked parameters. These are only
-         // used during initialization.  The Info objects also contain
-         // a pointer to the full validated ParameterSet and a shared_ptr
-         // to the component.
-         std::multimap<ParameterSetID, ESProducerInfo> esproducers_;
-         std::multimap<ParameterSetID, ESSourceInfo> essources_;
-
-         bool mustFinishConfiguration_;
-      };
-   }
-}
+                          unsigned precedingProcessIndex,
+                          bool& firstProcessWithThisPSet,
+                          bool& precedingHasMatchingPSet) const;
+
+      bool isFirstMatch(ParameterSetID const& psetID, unsigned subProcessIndex, unsigned precedingProcessIndex) const;
+
+      bool isLastMatch(ParameterSetID const& psetID, unsigned subProcessIndex, unsigned precedingProcessIndex) const;
+
+      bool isMatchingESSource(ParameterSetID const& psetID,
+                              unsigned subProcessIndex,
+                              unsigned precedingProcessIndex) const;
+
+      bool isMatchingESProducer(ParameterSetID const& psetID,
+                                unsigned subProcessIndex,
+                                unsigned precedingProcessIndex) const;
+
+      ParameterSet const* getESProducerPSet(ParameterSetID const& psetID, unsigned subProcessIndex) const;
+
+      std::vector<std::shared_ptr<EventSetupProvider> > const& providers() const { return providers_; }
+
+      std::multimap<ParameterSetID, ESProducerInfo> const& esproducers() const { return esproducers_; }
+
+      std::multimap<ParameterSetID, ESSourceInfo> const& essources() const { return essources_; }
+
+      bool mustFinishConfiguration() const { return mustFinishConfiguration_; }
+
+    private:
+      EventSetupsController(EventSetupsController const&) = delete;  // stop default
+
+      EventSetupsController const& operator=(EventSetupsController const&) = delete;  // stop default
+
+      void checkESProducerSharing();
+
+      // ---------- member data --------------------------------
+      std::vector<std::shared_ptr<EventSetupProvider> > providers_;
+
+      // The following two multimaps have one entry for each unique
+      // ParameterSet. The ESProducerInfo or ESSourceInfo object
+      // contains a list of the processes that use that ParameterSet
+      // (0 for the top level process, then the SubProcesses are
+      // identified by counting their execution order starting at 1).
+      // There can be multiple entries for a single ParameterSetID because
+      // of a difference in untracked parameters. These are only
+      // used during initialization.  The Info objects also contain
+      // a pointer to the full validated ParameterSet and a shared_ptr
+      // to the component.
+      std::multimap<ParameterSetID, ESProducerInfo> esproducers_;
+      std::multimap<ParameterSetID, ESSourceInfo> essources_;
+
+      bool mustFinishConfiguration_;
+    };
+  }  // namespace eventsetup
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/src/EventSignalsSentry.h b/FWCore/Framework/src/EventSignalsSentry.h
index dbfe5fae73c7b..e667db2875c78 100644
--- a/FWCore/Framework/src/EventSignalsSentry.h
+++ b/FWCore/Framework/src/EventSignalsSentry.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     EventSignalsSentry
-// 
+//
 /**\class edm::EventSignalsSentry EventSignalsSentry.h "EventSignalsSentry.h"
 
  Description: Guarantees that the pre/post module Event signals are sent
@@ -27,23 +27,19 @@
 // forward declarations
 namespace edm {
   class EventSignalsSentry {
-
   public:
-    EventSignalsSentry(ActivityRegistry* iReg,
-                       ModuleCallingContext const * iContext) :
-      m_reg(iReg),
-      m_context(iContext)
-    { iReg->preModuleEventSignal_( *(iContext->getStreamContext()), *iContext);}
-    
-    ~EventSignalsSentry() {
-      m_reg->postModuleEventSignal_( *(m_context->getStreamContext()), *m_context);
+    EventSignalsSentry(ActivityRegistry* iReg, ModuleCallingContext const* iContext)
+        : m_reg(iReg), m_context(iContext) {
+      iReg->preModuleEventSignal_(*(iContext->getStreamContext()), *iContext);
     }
-    
+
+    ~EventSignalsSentry() { m_reg->postModuleEventSignal_(*(m_context->getStreamContext()), *m_context); }
+
   private:
     // ---------- member data --------------------------------
-    ActivityRegistry* m_reg; // We do not use propagate_const because the registry itself is mutable.
+    ActivityRegistry* m_reg;  // We do not use propagate_const because the registry itself is mutable.
     ModuleCallingContext const* m_context;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/ExceptionActions.cc b/FWCore/Framework/src/ExceptionActions.cc
index 8de5f033e8344..77809cad85725 100644
--- a/FWCore/Framework/src/ExceptionActions.cc
+++ b/FWCore/Framework/src/ExceptionActions.cc
@@ -10,32 +10,30 @@ namespace edm {
   namespace exception_actions {
     namespace {
       struct ActionNames {
-	ActionNames():table_(LastCode + 1) {
-	  table_[IgnoreCompletely] = "IgnoreCompletely";
-	  table_[Rethrow] = "Rethrow";
-	  table_[SkipEvent] = "SkipEvent";
-	  table_[FailPath] = "FailPath";
-	}
-
-	typedef std::vector<char const*> Table;
-	Table table_;
-      };      
-    }
+        ActionNames() : table_(LastCode + 1) {
+          table_[IgnoreCompletely] = "IgnoreCompletely";
+          table_[Rethrow] = "Rethrow";
+          table_[SkipEvent] = "SkipEvent";
+          table_[FailPath] = "FailPath";
+        }
+
+        typedef std::vector<char const*> Table;
+        Table table_;
+      };
+    }  // namespace
 
     char const* actionName(ActionCodes code) {
       static ActionNames tab;
-      return static_cast<unsigned int>(code) < tab.table_.size() ?  tab.table_[code] : "UnknownAction";
+      return static_cast<unsigned int>(code) < tab.table_.size() ? tab.table_[code] : "UnknownAction";
     }
-  }
+  }  // namespace exception_actions
 
-  ExceptionToActionTable::ExceptionToActionTable() : map_() {
-    addDefaults();
-  }
+  ExceptionToActionTable::ExceptionToActionTable() : map_() { addDefaults(); }
 
   namespace {
     inline void install(exception_actions::ActionCodes code,
-			ExceptionToActionTable::ActionMap& out,
-			ParameterSet const& pset) {
+                        ExceptionToActionTable::ActionMap& out,
+                        ParameterSet const& pset) {
       typedef std::vector<std::string> vstring;
 
       // we cannot have parameters in the main process section so look
@@ -46,16 +44,15 @@ namespace edm {
       // exception type should be used so the catch can be more
       // specific.
 
-//	cerr << pset.toString() << std::endl;
+      //	cerr << pset.toString() << std::endl;
 
       ParameterSet const& opts = pset.getUntrackedParameterSet("options");
       //cerr << "looking for " << actionName(code) << std::endl;
-      for(auto const& v: opts.getUntrackedParameter<std::vector<std::string>>(actionName(code))) {
+      for (auto const& v : opts.getUntrackedParameter<std::vector<std::string>>(actionName(code))) {
         out[v] = code;
       }
-
-    }  
-  }
+    }
+  }  // namespace
 
   ExceptionToActionTable::ExceptionToActionTable(ParameterSet const& pset) : map_() {
     addDefaults();
@@ -70,17 +67,16 @@ namespace edm {
     // populate defaults that are not 'Rethrow'
     // (There are none as of CMSSW_3_4_X.)
     // 'Rethrow' is the default default.
-    if(2 <= debugit()) {
-	ActionMap::const_iterator ib(map_.begin()),ie(map_.end());
-	for(;ib != ie; ++ib) {
-	  std::cerr << ib->first << ',' << ib->second << '\n';
-	}
-	std::cerr << std::endl;
+    if (2 <= debugit()) {
+      ActionMap::const_iterator ib(map_.begin()), ie(map_.end());
+      for (; ib != ie; ++ib) {
+        std::cerr << ib->first << ',' << ib->second << '\n';
+      }
+      std::cerr << std::endl;
     }
   }
 
-  ExceptionToActionTable::~ExceptionToActionTable() {
-  }
+  ExceptionToActionTable::~ExceptionToActionTable() {}
 
   void ExceptionToActionTable::add(std::string const& category, exception_actions::ActionCodes code) {
     map_[category] = code;
@@ -91,4 +87,4 @@ namespace edm {
     return i != map_.end() ? i->second : exception_actions::Rethrow;
   }
 
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/ExceptionHelpers.cc b/FWCore/Framework/src/ExceptionHelpers.cc
index 3894a21c3e490..ff0427962b217 100644
--- a/FWCore/Framework/src/ExceptionHelpers.cc
+++ b/FWCore/Framework/src/ExceptionHelpers.cc
@@ -8,23 +8,19 @@
 
 namespace edm {
 
-  void
-  addContextAndPrintException(char const* context,
-                              cms::Exception& ex,
-                              bool disablePrint) {
+  void addContextAndPrintException(char const* context, cms::Exception& ex, bool disablePrint) {
     if (context != nullptr && strlen(context) != 0U) {
       ex.addContext(context);
     }
     if (!disablePrint) {
       Service<JobReport> jobReportSvc;
       if (jobReportSvc.isAvailable()) {
-        JobReport *jobRep = jobReportSvc.operator->();
+        JobReport* jobRep = jobReportSvc.operator->();
         edm::printCmsException(ex, jobRep, ex.returnCode());
-      }
-      else {
+      } else {
         edm::printCmsException(ex);
       }
       ex.setAlreadyPrinted(true);
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/Factory.cc b/FWCore/Framework/src/Factory.cc
index 0c66ef49ec73d..f3568e0b5c9d1 100644
--- a/FWCore/Framework/src/Factory.cc
+++ b/FWCore/Framework/src/Factory.cc
@@ -6,81 +6,67 @@
 
 #include <iostream>
 
-EDM_REGISTER_PLUGINFACTORY(edm::MakerPluginFactory,"CMS EDM Framework Module");
+EDM_REGISTER_PLUGINFACTORY(edm::MakerPluginFactory, "CMS EDM Framework Module");
 namespace edm {
 
-  static void cleanup(const Factory::MakerMap::value_type& v)
-  {
-    delete v.second.get();
-  }
+  static void cleanup(const Factory::MakerMap::value_type& v) { delete v.second.get(); }
 
   Factory const Factory::singleInstance_;
-  
-  Factory::~Factory()
-  {
-    for_all(makers_, cleanup);
-  }
 
-  Factory::Factory(): makers_()
+  Factory::~Factory() { for_all(makers_, cleanup); }
 
-  {
-  }
+  Factory::Factory()
+      : makers_()
 
-  Factory const* Factory::get()
-  {
-    return &singleInstance_;
-  }
+  {}
+
+  Factory const* Factory::get() { return &singleInstance_; }
 
-  Maker* Factory::findMaker(const MakeModuleParams& p) const
-  {
+  Maker* Factory::findMaker(const MakeModuleParams& p) const {
     std::string modtype = p.pset_->getParameter<std::string>("@module_type");
     FDEBUG(1) << "Factory: module_type = " << modtype << std::endl;
     MakerMap::iterator it = makers_.find(modtype);
-    
-    if(it == makers_.end())
-    {
+
+    if (it == makers_.end()) {
       std::unique_ptr<Maker> wm(MakerPluginFactory::get()->create(modtype));
-      
-      if(wm.get()==nullptr)
-        throw edm::Exception(errors::Configuration,"UnknownModule")
-        << "Module " << modtype
-        << " with version " << p.processConfiguration_->releaseVersion()
-        << " was not registered.\n"
-        << "Perhaps your module type is misspelled or is not a "
-        << "framework plugin.\n"
-        << "Try running EdmPluginDump to obtain a list of "
-        << "available Plugins.";
-      
+
+      if (wm.get() == nullptr)
+        throw edm::Exception(errors::Configuration, "UnknownModule")
+            << "Module " << modtype << " with version " << p.processConfiguration_->releaseVersion()
+            << " was not registered.\n"
+            << "Perhaps your module type is misspelled or is not a "
+            << "framework plugin.\n"
+            << "Try running EdmPluginDump to obtain a list of "
+            << "available Plugins.";
+
       FDEBUG(1) << "Factory:  created worker of type " << modtype << std::endl;
-      
-      std::pair<MakerMap::iterator,bool> ret =
-      makers_.insert(std::pair<std::string,Maker*>(modtype,wm.get()));
-      
+
+      std::pair<MakerMap::iterator, bool> ret = makers_.insert(std::pair<std::string, Maker*>(modtype, wm.get()));
+
       //	if(ret.second==false)
       //	  throw runtime_error("Worker Factory map insert failed");
-      
+
       it = ret.first;
       wm.release();
     }
     return it->second;
   }
-  
-  std::shared_ptr<maker::ModuleHolder> Factory::makeModule(const MakeModuleParams& p,
-                                            signalslot::Signal<void(const ModuleDescription&)>& pre,
-                                            signalslot::Signal<void(const ModuleDescription&)>& post) const
-  {
+
+  std::shared_ptr<maker::ModuleHolder> Factory::makeModule(
+      const MakeModuleParams& p,
+      signalslot::Signal<void(const ModuleDescription&)>& pre,
+      signalslot::Signal<void(const ModuleDescription&)>& post) const {
     auto maker = findMaker(p);
-    auto mod(maker->makeModule(p,pre,post));
+    auto mod(maker->makeModule(p, pre, post));
     return mod;
   }
 
-  std::shared_ptr<maker::ModuleHolder> Factory::makeReplacementModule(const edm::ParameterSet& p) const
-  {
+  std::shared_ptr<maker::ModuleHolder> Factory::makeReplacementModule(const edm::ParameterSet& p) const {
     std::string modtype = p.getParameter<std::string>("@module_type");
     MakerMap::iterator it = makers_.find(modtype);
-    if(it != makers_.end()) {
+    if (it != makers_.end()) {
       return it->second->makeReplacementModule(p);
     }
     return std::shared_ptr<maker::ModuleHolder>{};
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/Factory.h b/FWCore/Framework/src/Factory.h
index e678067ffcad2..88b01043ed3ff 100644
--- a/FWCore/Framework/src/Factory.h
+++ b/FWCore/Framework/src/Factory.h
@@ -13,10 +13,9 @@
 #include "FWCore/Utilities/interface/propagate_const.h"
 
 namespace edm {
-  typedef edmplugin::PluginFactory<Maker* ()> MakerPluginFactory;
-  
-  class Factory  
-  {
+  typedef edmplugin::PluginFactory<Maker*()> MakerPluginFactory;
+
+  class Factory {
   public:
     typedef std::map<std::string, edm::propagate_const<Maker*>> MakerMap;
 
@@ -30,7 +29,6 @@ namespace edm {
 
     std::shared_ptr<maker::ModuleHolder> makeReplacementModule(const edm::ParameterSet&) const;
 
-
   private:
     Factory();
     Maker* findMaker(const MakeModuleParams& p) const;
@@ -38,5 +36,5 @@ namespace edm {
     mutable MakerMap makers_;
   };
 
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/src/GenericHandle.cc b/FWCore/Framework/src/GenericHandle.cc
index af1d6bee2e9ab..49319fc63cac4 100644
--- a/FWCore/Framework/src/GenericHandle.cc
+++ b/FWCore/Framework/src/GenericHandle.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     GenericHandle
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -16,67 +16,61 @@
 #include "FWCore/Framework/interface/GenericHandle.h"
 
 namespace edm {
-void convert_handle(BasicHandle && orig,
-                    Handle<GenericObject>& result)
-{
-  if(orig.failedToGet()) {
-    result.setWhyFailedFactory(orig.whyFailedFactory());
-    return;
-  }
-  WrapperBase const* originalWrap = orig.wrapper();
-  if(originalWrap == nullptr) {
-    throw Exception(errors::InvalidReference,"NullPointer")
-      << "edm::BasicHandle has null pointer to Wrapper";
-  }
-  
-  ObjectWithDict wrap(originalWrap->wrappedTypeInfo(), const_cast<WrapperBase*>(originalWrap));
-  assert(bool(wrap));
-  
-  ObjectWithDict product(wrap.get("obj"));
-  if(!product){
-    throw Exception(errors::LogicError)<<"GenericObject could not find 'obj' member";
-  }
-  if(product.typeOf() != result.type()) {
-    throw Exception(errors::LogicError) << "GenericObject asked for " << result.type().name()
-      << " but was given a " << product.typeOf().name();
-  }
-  
-  Handle<GenericObject> h(product, orig.provenance(), orig.id());
-  h.swap(result);
-}
+  void convert_handle(BasicHandle&& orig, Handle<GenericObject>& result) {
+    if (orig.failedToGet()) {
+      result.setWhyFailedFactory(orig.whyFailedFactory());
+      return;
+    }
+    WrapperBase const* originalWrap = orig.wrapper();
+    if (originalWrap == nullptr) {
+      throw Exception(errors::InvalidReference, "NullPointer") << "edm::BasicHandle has null pointer to Wrapper";
+    }
 
-///Specialize the getByLabel method to work with a Handle<GenericObject>
-template<>
-bool
-edm::Event::getByLabel<GenericObject>(std::string const& label,
-                                      std::string const& productInstanceName,
-                                      Handle<GenericObject>& result) const
-{
-  BasicHandle bh = provRecorder_.getByLabel_(TypeID(result.type().typeInfo()), label, productInstanceName, std::string(), moduleCallingContext_);
-  convert_handle(std::move(bh), result);  // throws on conversion error
-  if(!result.failedToGet()) {
-    addToGotBranchIDs(*bh.provenance());
-    return true;
+    ObjectWithDict wrap(originalWrap->wrappedTypeInfo(), const_cast<WrapperBase*>(originalWrap));
+    assert(bool(wrap));
+
+    ObjectWithDict product(wrap.get("obj"));
+    if (!product) {
+      throw Exception(errors::LogicError) << "GenericObject could not find 'obj' member";
+    }
+    if (product.typeOf() != result.type()) {
+      throw Exception(errors::LogicError)
+          << "GenericObject asked for " << result.type().name() << " but was given a " << product.typeOf().name();
+    }
+
+    Handle<GenericObject> h(product, orig.provenance(), orig.id());
+    h.swap(result);
   }
-  return false;
-}
 
-template<>
-bool
-edm::Event::getByLabel<GenericObject>(edm::InputTag const& tag,
-                                             Handle<GenericObject>& result) const
-{
-  if (tag.process().empty()) {
-    return this->getByLabel(tag.label(), tag.instance(), result);
-  } else {
-    BasicHandle bh = provRecorder_.getByLabel_(TypeID(result.type().typeInfo()), tag.label(), tag.instance(),tag.process(), moduleCallingContext_);
+  ///Specialize the getByLabel method to work with a Handle<GenericObject>
+  template <>
+  bool edm::Event::getByLabel<GenericObject>(std::string const& label,
+                                             std::string const& productInstanceName,
+                                             Handle<GenericObject>& result) const {
+    BasicHandle bh = provRecorder_.getByLabel_(
+        TypeID(result.type().typeInfo()), label, productInstanceName, std::string(), moduleCallingContext_);
     convert_handle(std::move(bh), result);  // throws on conversion error
-    if(!result.failedToGet()) {
+    if (!result.failedToGet()) {
       addToGotBranchIDs(*bh.provenance());
       return true;
     }
+    return false;
+  }
+
+  template <>
+  bool edm::Event::getByLabel<GenericObject>(edm::InputTag const& tag, Handle<GenericObject>& result) const {
+    if (tag.process().empty()) {
+      return this->getByLabel(tag.label(), tag.instance(), result);
+    } else {
+      BasicHandle bh = provRecorder_.getByLabel_(
+          TypeID(result.type().typeInfo()), tag.label(), tag.instance(), tag.process(), moduleCallingContext_);
+      convert_handle(std::move(bh), result);  // throws on conversion error
+      if (!result.failedToGet()) {
+        addToGotBranchIDs(*bh.provenance());
+        return true;
+      }
+    }
+    return false;
   }
-  return false;
-}
 
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/GlobalSchedule.cc b/FWCore/Framework/src/GlobalSchedule.cc
index 21a48403f2bc0..501f4443011e9 100644
--- a/FWCore/Framework/src/GlobalSchedule.cc
+++ b/FWCore/Framework/src/GlobalSchedule.cc
@@ -12,7 +12,6 @@
 #include "FWCore/Utilities/interface/Algorithms.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-
 #include <algorithm>
 #include <cassert>
 #include <cstdlib>
@@ -20,89 +19,85 @@
 #include <map>
 
 namespace edm {
-  GlobalSchedule::GlobalSchedule(std::shared_ptr<TriggerResultInserter> inserter,
-                                 std::vector<edm::propagate_const<std::shared_ptr<PathStatusInserter>>>& pathStatusInserters,
-                                 std::vector<edm::propagate_const<std::shared_ptr<EndPathStatusInserter>>>& endPathStatusInserters,
-                                 std::shared_ptr<ModuleRegistry> modReg,
-                                 std::vector<std::string> const& iModulesToUse,
-                                 ParameterSet& proc_pset,
-                                 ProductRegistry& pregistry,
-                                 PreallocationConfiguration const& prealloc,
-                                 ExceptionToActionTable const& actions,
-                                 std::shared_ptr<ActivityRegistry> areg,
-                                 std::shared_ptr<ProcessConfiguration> processConfiguration,
-                                 ProcessContext const* processContext) :
-    actReg_(areg),
-    processContext_(processContext)
-  {
+  GlobalSchedule::GlobalSchedule(
+      std::shared_ptr<TriggerResultInserter> inserter,
+      std::vector<edm::propagate_const<std::shared_ptr<PathStatusInserter>>>& pathStatusInserters,
+      std::vector<edm::propagate_const<std::shared_ptr<EndPathStatusInserter>>>& endPathStatusInserters,
+      std::shared_ptr<ModuleRegistry> modReg,
+      std::vector<std::string> const& iModulesToUse,
+      ParameterSet& proc_pset,
+      ProductRegistry& pregistry,
+      PreallocationConfiguration const& prealloc,
+      ExceptionToActionTable const& actions,
+      std::shared_ptr<ActivityRegistry> areg,
+      std::shared_ptr<ProcessConfiguration> processConfiguration,
+      ProcessContext const* processContext)
+      : actReg_(areg), processContext_(processContext) {
     workerManagers_.reserve(prealloc.numberOfLuminosityBlocks());
-    for(unsigned int i = 0; i<prealloc.numberOfLuminosityBlocks(); ++i) {
-      workerManagers_.emplace_back(modReg,areg,actions);
+    for (unsigned int i = 0; i < prealloc.numberOfLuminosityBlocks(); ++i) {
+      workerManagers_.emplace_back(modReg, areg, actions);
     }
     for (auto const& moduleLabel : iModulesToUse) {
       bool isTracked;
       ParameterSet* modpset = proc_pset.getPSetForUpdate(moduleLabel, isTracked);
-      if (modpset != nullptr) { // It will be null for PathStatusInserters, it should
-                                // be impossible to be null for anything else
+      if (modpset != nullptr) {  // It will be null for PathStatusInserters, it should
+                                 // be impossible to be null for anything else
         assert(isTracked);
 
         //side effect keeps this module around
-        for(auto& wm: workerManagers_) {
-          wm.addToAllWorkers(wm.getWorker(*modpset, pregistry, &prealloc,processConfiguration, moduleLabel));
+        for (auto& wm : workerManagers_) {
+          wm.addToAllWorkers(wm.getWorker(*modpset, pregistry, &prealloc, processConfiguration, moduleLabel));
         }
       }
     }
-    if(inserter) {
+    if (inserter) {
       inserter->doPreallocate(prealloc);
-      for(auto& wm: workerManagers_) {
-        auto results_inserter = WorkerPtr(new edm::WorkerT<TriggerResultInserter::ModuleType>(inserter, inserter->moduleDescription(), &actions)); // propagate_const<T> has no reset() function
+      for (auto& wm : workerManagers_) {
+        auto results_inserter = WorkerPtr(new edm::WorkerT<TriggerResultInserter::ModuleType>(
+            inserter, inserter->moduleDescription(), &actions));  // propagate_const<T> has no reset() function
         results_inserter->setActivityRegistry(actReg_);
         wm.addToAllWorkers(results_inserter.get());
         extraWorkers_.emplace_back(std::move(results_inserter));
       }
     }
 
-    for(auto & pathStatusInserter : pathStatusInserters) {
+    for (auto& pathStatusInserter : pathStatusInserters) {
       std::shared_ptr<PathStatusInserter> inserterPtr = get_underlying(pathStatusInserter);
       inserterPtr->doPreallocate(prealloc);
-      
-      for(auto& wm: workerManagers_) {
-        WorkerPtr workerPtr(new edm::WorkerT<PathStatusInserter::ModuleType>(inserterPtr,
-                                                                             inserterPtr->moduleDescription(),
-                                                                             &actions));
+
+      for (auto& wm : workerManagers_) {
+        WorkerPtr workerPtr(
+            new edm::WorkerT<PathStatusInserter::ModuleType>(inserterPtr, inserterPtr->moduleDescription(), &actions));
         workerPtr->setActivityRegistry(actReg_);
         wm.addToAllWorkers(workerPtr.get());
         extraWorkers_.emplace_back(std::move(workerPtr));
       }
     }
 
-    for(auto & endPathStatusInserter : endPathStatusInserters) {
+    for (auto& endPathStatusInserter : endPathStatusInserters) {
       std::shared_ptr<EndPathStatusInserter> inserterPtr = get_underlying(endPathStatusInserter);
       inserterPtr->doPreallocate(prealloc);
-      for(auto& wm: workerManagers_) {
-        WorkerPtr workerPtr(new edm::WorkerT<EndPathStatusInserter::ModuleType>(inserterPtr,
-                                                                                inserterPtr->moduleDescription(),
-                                                                                &actions));
+      for (auto& wm : workerManagers_) {
+        WorkerPtr workerPtr(new edm::WorkerT<EndPathStatusInserter::ModuleType>(
+            inserterPtr, inserterPtr->moduleDescription(), &actions));
         workerPtr->setActivityRegistry(actReg_);
         wm.addToAllWorkers(workerPtr.get());
         extraWorkers_.emplace_back(std::move(workerPtr));
       }
     }
 
-  } // GlobalSchedule::GlobalSchedule
+  }  // GlobalSchedule::GlobalSchedule
 
-  void GlobalSchedule::endJob(ExceptionCollector & collector) {
-    workerManagers_[0].endJob(collector);
-  }
+  void GlobalSchedule::endJob(ExceptionCollector& collector) { workerManagers_[0].endJob(collector); }
 
-  void GlobalSchedule::beginJob(ProductRegistry const& iRegistry) {
-    workerManagers_[0].beginJob(iRegistry);
+  void GlobalSchedule::beginJob(ProductRegistry const& iRegistry,
+                                eventsetup::ESRecordsToProxyIndices const& iESIndices) {
+    workerManagers_[0].beginJob(iRegistry, iESIndices);
   }
-  
-  void GlobalSchedule::replaceModule(maker::ModuleHolder* iMod,
-                                     std::string const& iLabel) {
+
+  void GlobalSchedule::replaceModule(maker::ModuleHolder* iMod, std::string const& iLabel) {
     Worker* found = nullptr;
-    for(auto& wm: workerManagers_) {
+    for (auto& wm : workerManagers_) {
       for (auto const& worker : wm.allWorkers()) {
         if (worker->description().moduleLabel() == iLabel) {
           found = worker;
@@ -112,14 +107,13 @@ namespace edm {
       if (nullptr == found) {
         return;
       }
-      
+
       iMod->replaceModuleFor(found);
       found->beginJob();
     }
   }
 
-  std::vector<ModuleDescription const*>
-  GlobalSchedule::getAllModuleDescriptions() const {
+  std::vector<ModuleDescription const*> GlobalSchedule::getAllModuleDescriptions() const {
     std::vector<ModuleDescription const*> result;
     result.reserve(allWorkers().size());
 
@@ -129,4 +123,4 @@ namespace edm {
     }
     return result;
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/GlobalSchedule.h b/FWCore/Framework/src/GlobalSchedule.h
index 7fa508d3749fe..2cfca88c090c1 100644
--- a/FWCore/Framework/src/GlobalSchedule.h
+++ b/FWCore/Framework/src/GlobalSchedule.h
@@ -30,37 +30,37 @@
 #include <sstream>
 #include "boost/range/adaptor/reversed.hpp"
 
-
 namespace edm {
 
   namespace {
     template <typename T>
     class GlobalScheduleSignalSentry {
     public:
-      GlobalScheduleSignalSentry(ActivityRegistry* a, typename T::Context const* context) :
-        a_(a), context_(context),
-        allowThrow_(false) {
-        if (a_) T::preScheduleSignal(a_, context_);
+      GlobalScheduleSignalSentry(ActivityRegistry* a, typename T::Context const* context)
+          : a_(a), context_(context), allowThrow_(false) {
+        if (a_)
+          T::preScheduleSignal(a_, context_);
       }
       ~GlobalScheduleSignalSentry() noexcept(false) {
         try {
-          if (a_) T::postScheduleSignal(a_, context_);
-        } catch(...) {
-          if(allowThrow_) {throw;}
+          if (a_)
+            T::postScheduleSignal(a_, context_);
+        } catch (...) {
+          if (allowThrow_) {
+            throw;
+          }
         }
       }
 
-      void allowThrow() {
-        allowThrow_ = true;
-      }
+      void allowThrow() { allowThrow_ = true; }
 
     private:
       // We own none of these resources.
-      ActivityRegistry* a_; // We do not use propagate_const because the registry itself is mutable.
+      ActivityRegistry* a_;  // We do not use propagate_const because the registry itself is mutable.
       typename T::Context const* context_;
       bool allowThrow_;
     };
-  }
+  }  // namespace
 
   class ActivityRegistry;
   class EventSetupImpl;
@@ -71,7 +71,7 @@ namespace edm {
   class TriggerResultInserter;
   class PathStatusInserter;
   class EndPathStatusInserter;
-  
+
   class GlobalSchedule {
   public:
     typedef std::vector<std::string> vstring;
@@ -100,9 +100,9 @@ namespace edm {
                                ServiceToken const& token,
                                bool cleaningUpAfterException = false);
 
-    void beginJob(ProductRegistry const&);
-    void endJob(ExceptionCollector & collector);
-    
+    void beginJob(ProductRegistry const&, eventsetup::ESRecordsToProxyIndices const&);
+    void endJob(ExceptionCollector& collector);
+
     /// Return a vector allowing const access to all the
     /// ModuleDescriptions for this GlobalSchedule.
 
@@ -122,9 +122,7 @@ namespace edm {
     void replaceModule(maker::ModuleHolder* iMod, std::string const& iLabel);
 
     /// returns the collection of pointers to workers
-    AllWorkers const& allWorkers() const {
-      return workerManagers_[0].allWorkers();
-    }
+    AllWorkers const& allWorkers() const { return workerManagers_[0].allWorkers(); }
 
   private:
     //Sentry class to only send a signal if an
@@ -133,107 +131,99 @@ namespace edm {
     // calling completedSuccessfully().
     class SendTerminationSignalIfException {
     public:
-      SendTerminationSignalIfException(edm::ActivityRegistry* iReg, edm::GlobalContext const* iContext):
-      reg_(iReg),
-      context_(iContext){}
+      SendTerminationSignalIfException(edm::ActivityRegistry* iReg, edm::GlobalContext const* iContext)
+          : reg_(iReg), context_(iContext) {}
       ~SendTerminationSignalIfException() {
-        if(reg_) {
-          reg_->preGlobalEarlyTerminationSignal_(*context_,TerminationOrigin::ExceptionFromThisContext);
+        if (reg_) {
+          reg_->preGlobalEarlyTerminationSignal_(*context_, TerminationOrigin::ExceptionFromThisContext);
         }
       }
-      void completedSuccessfully() {
-        reg_ = nullptr;
-      }
+      void completedSuccessfully() { reg_ = nullptr; }
+
     private:
-      edm::ActivityRegistry* reg_; // We do not use propagate_const because the registry itself is mutable.
+      edm::ActivityRegistry* reg_;  // We do not use propagate_const because the registry itself is mutable.
       GlobalContext const* context_;
     };
 
     /// returns the action table
-    ExceptionToActionTable const& actionTable() const {
-      return workerManagers_[0].actionTable();
-    }
-    
-    std::vector<WorkerManager>            workerManagers_;
-    std::shared_ptr<ActivityRegistry>     actReg_; // We do not use propagate_const because the registry itself is mutable.
+    ExceptionToActionTable const& actionTable() const { return workerManagers_[0].actionTable(); }
+
+    std::vector<WorkerManager> workerManagers_;
+    std::shared_ptr<ActivityRegistry> actReg_;  // We do not use propagate_const because the registry itself is mutable.
     std::vector<edm::propagate_const<WorkerPtr>> extraWorkers_;
-    ProcessContext const*                 processContext_;
+    ProcessContext const* processContext_;
   };
 
-
   template <typename T>
-  void
-  GlobalSchedule::processOneGlobalAsync(WaitingTaskHolder iHolder,
-                                        typename T::MyPrincipal& ep,
-                                        EventSetupImpl const& es,
-                                        ServiceToken const& token,
-                                        bool cleaningUpAfterException) {
+  void GlobalSchedule::processOneGlobalAsync(WaitingTaskHolder iHolder,
+                                             typename T::MyPrincipal& ep,
+                                             EventSetupImpl const& es,
+                                             ServiceToken const& token,
+                                             bool cleaningUpAfterException) {
     try {
       //need the doneTask to own the memory
       auto globalContext = std::make_shared<GlobalContext>(T::makeGlobalContext(ep, processContext_));
-      
-      if(actReg_) {
+
+      if (actReg_) {
         //Services may depend upon each other
         ServiceRegistry::Operate op(token);
         T::preScheduleSignal(actReg_.get(), globalContext.get());
       }
-      
-      auto doneTask = make_waiting_task(tbb::task::allocate_root(),
-                                        [this,iHolder, cleaningUpAfterException, globalContext, token](std::exception_ptr const* iPtr) mutable
-                                        {
-                                          std::exception_ptr excpt;
-                                          if(iPtr) {
-                                            excpt = *iPtr;
-                                            //add context information to the exception and print message
-                                            try {
-                                              convertException::wrap([&]() {
-                                                std::rethrow_exception(excpt);
-                                              });
-                                            } catch(cms::Exception& ex) {
-                                              //TODO: should add the transition type info
-                                              std::ostringstream ost;
-                                              if(ex.context().empty()) {
-                                                ost<<"Processing "<<T::transitionName()<<" ";
-                                              }
-                                              ServiceRegistry::Operate op(token);
-                                              addContextAndPrintException(ost.str().c_str(), ex, cleaningUpAfterException);
-                                              excpt = std::current_exception();
-                                            }
-                                            if(actReg_) {
-                                              ServiceRegistry::Operate op(token);
-                                              actReg_->preGlobalEarlyTerminationSignal_(*globalContext,TerminationOrigin::ExceptionFromThisContext);
-                                            }
-                                          }
-                                          if(actReg_) {
-                                            try {
-                                              ServiceRegistry::Operate op(token);
-                                              T::postScheduleSignal(actReg_.get(), globalContext.get());
-                                            } catch(...) {
-                                              if(not excpt) {
-                                                excpt = std::current_exception();
-                                              }
-                                            }
-                                          }
-                                          iHolder.doneWaiting(excpt);
-                                          
-                                        });
+
+      auto doneTask = make_waiting_task(
+          tbb::task::allocate_root(),
+          [this, iHolder, cleaningUpAfterException, globalContext, token](std::exception_ptr const* iPtr) mutable {
+            std::exception_ptr excpt;
+            if (iPtr) {
+              excpt = *iPtr;
+              //add context information to the exception and print message
+              try {
+                convertException::wrap([&]() { std::rethrow_exception(excpt); });
+              } catch (cms::Exception& ex) {
+                //TODO: should add the transition type info
+                std::ostringstream ost;
+                if (ex.context().empty()) {
+                  ost << "Processing " << T::transitionName() << " ";
+                }
+                ServiceRegistry::Operate op(token);
+                addContextAndPrintException(ost.str().c_str(), ex, cleaningUpAfterException);
+                excpt = std::current_exception();
+              }
+              if (actReg_) {
+                ServiceRegistry::Operate op(token);
+                actReg_->preGlobalEarlyTerminationSignal_(*globalContext, TerminationOrigin::ExceptionFromThisContext);
+              }
+            }
+            if (actReg_) {
+              try {
+                ServiceRegistry::Operate op(token);
+                T::postScheduleSignal(actReg_.get(), globalContext.get());
+              } catch (...) {
+                if (not excpt) {
+                  excpt = std::current_exception();
+                }
+              }
+            }
+            iHolder.doneWaiting(excpt);
+          });
       workerManagers_[ep.index()].resetAll();
-      
+
       ParentContext parentContext(globalContext.get());
       //make sure the ProductResolvers know about their
       // workers to allow proper data dependency handling
-      workerManagers_[ep.index()].setupOnDemandSystem(ep,es);
-      
+      workerManagers_[ep.index()].setupOnDemandSystem(ep, es);
+
       //make sure the task doesn't get run until all workers have beens started
       WaitingTaskHolder holdForLoop(doneTask);
       auto& aw = workerManagers_[ep.index()].allWorkers();
-      for(Worker* worker: boost::adaptors::reverse(aw) ) {
-        worker->doWorkAsync<T>(doneTask,ep,es,token, StreamID::invalidStreamID(),parentContext,globalContext.get());
+      for (Worker* worker : boost::adaptors::reverse(aw)) {
+        worker->doWorkAsync<T>(
+            doneTask, ep, es, token, StreamID::invalidStreamID(), parentContext, globalContext.get());
       }
-    } catch(...) {
+    } catch (...) {
       iHolder.doneWaiting(std::current_exception());
     }
   }
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/HCTypeTag.cc b/FWCore/Framework/src/HCTypeTag.cc
index 3ef2bc8d255be..10550b46ecac2 100644
--- a/FWCore/Framework/src/HCTypeTag.cc
+++ b/FWCore/Framework/src/HCTypeTag.cc
@@ -4,7 +4,7 @@
 //
 // Package:     HeteroContainer
 // Module:      HCTypeTag
-// 
+//
 // Description: <one line class summary>
 //
 // Implementation:
@@ -67,73 +67,68 @@
 // constants, enums and typedefs
 //
 namespace edm {
-   namespace eventsetup {
-      namespace heterocontainer {
-         
-         //
-         // static data member definitions
-         //
-                  
-         //
-         // constructors and destructor
-         //
-         //HCTypeTag::HCTypeTag()
-         //{
-         //}
-         
-         // HCTypeTag::HCTypeTag(const HCTypeTag& rhs)
-         // {
-         //    // do actual copying here; if you implemented
-         //    // operator= correctly, you may be able to use just say      
-         //    *this = rhs;
-         // }
-         
-         //HCTypeTag::~HCTypeTag()
-         //{
-         //}
-         
-         //
-         // assignment operators
-         //
-         // const HCTypeTag& HCTypeTag::operator=(const HCTypeTag& rhs)
-         // {
-         //   if(this != &rhs) {
-         //      // do actual copying here, plus:
-         //      // "SuperClass"::operator=(rhs);
-         //   }
-         //
-         //   return *this;
-         // }
-         
-         //
-         // member functions
-         //
-         
-         //
-         // const member functions
-         //
-         
-         //
-         // static member functions
-         //
-         HCTypeTag
-         HCTypeTag::findType(const std::string& iTypeName) {
-            return HCTypeTag::findType(iTypeName.c_str());
-         }
-         
-         HCTypeTag
-         HCTypeTag::findType(const char* iTypeName)
-         {
-            std::pair<const char*,const std::type_info*> p = typelookup::findType(iTypeName);
-            
-            if(nullptr == p.second) {
-               return HCTypeTag();
-            }
-            //need to take name from the 'findType' since that address is guaranteed to be long lived
-            return HCTypeTag(*p.second, p.first);
-         }         
+  namespace eventsetup {
+    namespace heterocontainer {
+
+      //
+      // static data member definitions
+      //
+
+      //
+      // constructors and destructor
+      //
+      //HCTypeTag::HCTypeTag()
+      //{
+      //}
+
+      // HCTypeTag::HCTypeTag(const HCTypeTag& rhs)
+      // {
+      //    // do actual copying here; if you implemented
+      //    // operator= correctly, you may be able to use just say
+      //    *this = rhs;
+      // }
+
+      //HCTypeTag::~HCTypeTag()
+      //{
+      //}
+
+      //
+      // assignment operators
+      //
+      // const HCTypeTag& HCTypeTag::operator=(const HCTypeTag& rhs)
+      // {
+      //   if(this != &rhs) {
+      //      // do actual copying here, plus:
+      //      // "SuperClass"::operator=(rhs);
+      //   }
+      //
+      //   return *this;
+      // }
+
+      //
+      // member functions
+      //
+
+      //
+      // const member functions
+      //
+
+      //
+      // static member functions
+      //
+      HCTypeTag HCTypeTag::findType(const std::string& iTypeName) { return HCTypeTag::findType(iTypeName.c_str()); }
+
+      HCTypeTag HCTypeTag::findType(const char* iTypeName) {
+        std::pair<const char*, const std::type_info*> p = typelookup::findType(iTypeName);
+
+        if (nullptr == p.second) {
+          return HCTypeTag();
+        }
+        //need to take name from the 'findType' since that address is guaranteed to be long lived
+        return HCTypeTag(*p.second, p.first);
       }
-   }
-}
+    }  // namespace heterocontainer
+  }    // namespace eventsetup
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/HistoryAppender.cc b/FWCore/Framework/src/HistoryAppender.cc
index da9464cc4ba1f..87b127b1b0c5e 100644
--- a/FWCore/Framework/src/HistoryAppender.cc
+++ b/FWCore/Framework/src/HistoryAppender.cc
@@ -12,32 +12,27 @@ namespace {
     tmp.setProcessHistoryID();
     return tmp;
   }
-}
+}  // namespace
 static const edm::ProcessHistory s_emptyHistory = initializeEmpty();
 
 namespace edm {
 
-  HistoryAppender::HistoryAppender()
-  {
-  }
+  HistoryAppender::HistoryAppender() {}
 
-  std::shared_ptr<ProcessHistory const>
-  HistoryAppender::appendToProcessHistory(ProcessHistoryID const& inputPHID,
-                                          ProcessHistory const* iInputProcessHistory,
-                                          ProcessConfiguration const& pc)  {
+  std::shared_ptr<ProcessHistory const> HistoryAppender::appendToProcessHistory(
+      ProcessHistoryID const& inputPHID, ProcessHistory const* iInputProcessHistory, ProcessConfiguration const& pc) {
     assert((iInputProcessHistory) == nullptr or (inputPHID == iInputProcessHistory->id()));
-    if (m_cachedHistory.get() != nullptr and inputPHID==m_cachedInputPHID) {
+    if (m_cachedHistory.get() != nullptr and inputPHID == m_cachedInputPHID) {
       return m_cachedHistory;
     }
 
-    ProcessHistory const* inputProcessHistory = iInputProcessHistory? iInputProcessHistory : &s_emptyHistory;
+    ProcessHistory const* inputProcessHistory = iInputProcessHistory ? iInputProcessHistory : &s_emptyHistory;
 
     if (inputPHID.isValid()) {
       if (iInputProcessHistory == nullptr) {
-        throw Exception(errors::LogicError)
-          << "HistoryAppender::appendToProcessHistory\n"
-          << "Input ProcessHistory has valid ID but is nullptr\n"
-          << "Contact a Framework developer\n";
+        throw Exception(errors::LogicError) << "HistoryAppender::appendToProcessHistory\n"
+                                            << "Input ProcessHistory has valid ID but is nullptr\n"
+                                            << "Contact a Framework developer\n";
       }
     }
 
@@ -47,21 +42,19 @@ namespace edm {
     newProcessHistory->push_back(pc);
     //force it to create the ID
     newProcessHistory->setProcessHistoryID();
-    m_cachedInputPHID =inputPHID;
+    m_cachedInputPHID = inputPHID;
     m_cachedHistory = newProcessHistory;
     return m_cachedHistory;
   }
 
-  void
-  HistoryAppender::checkProcessHistory(ProcessHistory const& ph,
-                                       ProcessConfiguration const& pc) const {
+  void HistoryAppender::checkProcessHistory(ProcessHistory const& ph, ProcessConfiguration const& pc) const {
     std::string const& processName = pc.processName();
     for (auto const& process : ph) {
       if (processName == process.processName()) {
         throw edm::Exception(errors::Configuration, "Duplicate Process.")
-          << "The process name " << processName << " was already in the ProcessHistory.\n"
-          << "Please modify the configuration file to use a distinct process name.\n";
+            << "The process name " << processName << " was already in the ProcessHistory.\n"
+            << "Please modify the configuration file to use a distinct process name.\n";
       }
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/IOVSyncValue.cc b/FWCore/Framework/src/IOVSyncValue.cc
index 0ae8e99fe5edd..4a1273b6c93a0 100644
--- a/FWCore/Framework/src/IOVSyncValue.cc
+++ b/FWCore/Framework/src/IOVSyncValue.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     IOVSyncValue
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -22,86 +22,71 @@
 //
 namespace edm {
 
-//
-// static data member definitions
-//
+  //
+  // static data member definitions
+  //
 
+  //
+  // constructors and destructor
+  //
+  IOVSyncValue::IOVSyncValue() : eventID_(), time_(), haveID_(true), haveTime_(true) {}
 
-//
-// constructors and destructor
-//
-IOVSyncValue::IOVSyncValue(): eventID_(), time_(),
-haveID_(true), haveTime_(true)
-{
-}
+  IOVSyncValue::IOVSyncValue(const EventID& iID) : eventID_(iID), time_(), haveID_(true), haveTime_(false) {}
 
-IOVSyncValue::IOVSyncValue(const EventID& iID) : eventID_(iID), time_(),
-haveID_(true), haveTime_(false)
-{
-}
+  IOVSyncValue::IOVSyncValue(const Timestamp& iTime) : eventID_(), time_(iTime), haveID_(false), haveTime_(true) {}
 
-IOVSyncValue::IOVSyncValue(const Timestamp& iTime) : eventID_(), time_(iTime),
-haveID_(false), haveTime_(true)
-{
-}
+  IOVSyncValue::IOVSyncValue(const EventID& iID, const Timestamp& iTime)
+      : eventID_(iID), time_(iTime), haveID_(true), haveTime_(true) {}
 
-IOVSyncValue::IOVSyncValue(const EventID& iID, const Timestamp& iTime) :
-eventID_(iID), time_(iTime),
-haveID_(true), haveTime_(true)
-{
-}
+  // IOVSyncValue::IOVSyncValue(const IOVSyncValue& rhs)
+  // {
+  //    // do actual copying here;
+  // }
 
-// IOVSyncValue::IOVSyncValue(const IOVSyncValue& rhs)
-// {
-//    // do actual copying here;
-// }
+  //IOVSyncValue::~IOVSyncValue()
+  //{
+  //}
 
-//IOVSyncValue::~IOVSyncValue()
-//{
-//}
+  //
+  // assignment operators
+  //
+  // const IOVSyncValue& IOVSyncValue::operator=(const IOVSyncValue& rhs)
+  // {
+  //   //An exception safe implementation is
+  //   IOVSyncValue temp(rhs);
+  //   swap(rhs);
+  //
+  //   return *this;
+  // }
 
-//
-// assignment operators
-//
-// const IOVSyncValue& IOVSyncValue::operator=(const IOVSyncValue& rhs)
-// {
-//   //An exception safe implementation is
-//   IOVSyncValue temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
+  //
+  // member functions
+  //
 
-//
-// member functions
-//
+  //
+  // const member functions
+  //
+  void IOVSyncValue::throwInvalidComparison() const {
+    throw cms::Exception("InvalidIOVSyncValueComparison")
+        << "Attempted to compare a time-only and a run/lumi/event-only IOVSyncValue. Please report this error to the "
+           "framework experts.";
+  }
 
-//
-// const member functions
-//
-void 
-IOVSyncValue::throwInvalidComparison() const {
-  throw cms::Exception("InvalidIOVSyncValueComparison")
-    <<"Attempted to compare a time-only and a run/lumi/event-only IOVSyncValue. Please report this error to the framework experts.";
-}
-
-//
-// static member functions
-//
-const IOVSyncValue&
-IOVSyncValue::invalidIOVSyncValue() {
-   static const IOVSyncValue s_invalid;
-   return s_invalid;
-}
-const IOVSyncValue&
-IOVSyncValue::endOfTime() {
-   static const IOVSyncValue s_endOfTime(EventID(0xFFFFFFFFUL, LuminosityBlockID::maxLuminosityBlockNumber(), EventID::maxEventNumber()),
-                                   Timestamp::endOfTime());
-   return s_endOfTime;
-}
-const IOVSyncValue&
-IOVSyncValue::beginOfTime() {
-   static const IOVSyncValue s_beginOfTime(EventID(1,0,0), Timestamp::beginOfTime());
-   return s_beginOfTime;
-}
-}
+  //
+  // static member functions
+  //
+  const IOVSyncValue& IOVSyncValue::invalidIOVSyncValue() {
+    static const IOVSyncValue s_invalid;
+    return s_invalid;
+  }
+  const IOVSyncValue& IOVSyncValue::endOfTime() {
+    static const IOVSyncValue s_endOfTime(
+        EventID(0xFFFFFFFFUL, LuminosityBlockID::maxLuminosityBlockNumber(), EventID::maxEventNumber()),
+        Timestamp::endOfTime());
+    return s_endOfTime;
+  }
+  const IOVSyncValue& IOVSyncValue::beginOfTime() {
+    static const IOVSyncValue s_beginOfTime(EventID(1, 0, 0), Timestamp::beginOfTime());
+    return s_beginOfTime;
+  }
+}  // namespace edm
diff --git a/FWCore/Framework/src/InputSource.cc b/FWCore/Framework/src/InputSource.cc
index 4a2d12e4e8b39..dd736b78da2ff 100644
--- a/FWCore/Framework/src/InputSource.cc
+++ b/FWCore/Framework/src/InputSource.cc
@@ -27,46 +27,47 @@
 namespace edm {
 
   namespace {
-        std::string const& suffix(int count) {
-          static std::string const st("st");
-          static std::string const nd("nd");
-          static std::string const rd("rd");
-          static std::string const th("th");
-          // *0, *4 - *9 use "th".
-          int lastDigit = count % 10;
-          if(lastDigit >= 4 || lastDigit == 0) return th;
-          // *11, *12, or *13 use "th".
-          if(count % 100 - lastDigit == 10) return th;
-          return (lastDigit == 1 ? st : (lastDigit == 2 ? nd : rd));
-        }
-  }
-
-  InputSource::InputSource(ParameterSet const& pset, InputSourceDescription const& desc) :
-      actReg_(desc.actReg_),
-      maxEvents_(desc.maxEvents_),
-      remainingEvents_(maxEvents_),
-      maxLumis_(desc.maxLumis_),
-      remainingLumis_(maxLumis_),
-      readCount_(0),
-      maxSecondsUntilRampdown_(desc.maxSecondsUntilRampdown_),
-      processingMode_(RunsLumisAndEvents),
-      moduleDescription_(desc.moduleDescription_),
-      productRegistry_(desc.productRegistry_),
-      processHistoryRegistry_(new ProcessHistoryRegistry),
-      branchIDListHelper_(desc.branchIDListHelper_),
-      thinnedAssociationsHelper_(desc.thinnedAssociationsHelper_),
-      processGUID_(createGlobalIdentifier()),
-      time_(),
-      newRun_(true),
-      newLumi_(true),
-      eventCached_(false),
-      state_(IsInvalid),
-      runAuxiliary_(),
-      lumiAuxiliary_(),
-      statusFileName_(),
-      numberOfEventsBeforeBigSkip_(0) {
-
-    if(pset.getUntrackedParameter<bool>("writeStatusFile", false)) {
+    std::string const& suffix(int count) {
+      static std::string const st("st");
+      static std::string const nd("nd");
+      static std::string const rd("rd");
+      static std::string const th("th");
+      // *0, *4 - *9 use "th".
+      int lastDigit = count % 10;
+      if (lastDigit >= 4 || lastDigit == 0)
+        return th;
+      // *11, *12, or *13 use "th".
+      if (count % 100 - lastDigit == 10)
+        return th;
+      return (lastDigit == 1 ? st : (lastDigit == 2 ? nd : rd));
+    }
+  }  // namespace
+
+  InputSource::InputSource(ParameterSet const& pset, InputSourceDescription const& desc)
+      : actReg_(desc.actReg_),
+        maxEvents_(desc.maxEvents_),
+        remainingEvents_(maxEvents_),
+        maxLumis_(desc.maxLumis_),
+        remainingLumis_(maxLumis_),
+        readCount_(0),
+        maxSecondsUntilRampdown_(desc.maxSecondsUntilRampdown_),
+        processingMode_(RunsLumisAndEvents),
+        moduleDescription_(desc.moduleDescription_),
+        productRegistry_(desc.productRegistry_),
+        processHistoryRegistry_(new ProcessHistoryRegistry),
+        branchIDListHelper_(desc.branchIDListHelper_),
+        thinnedAssociationsHelper_(desc.thinnedAssociationsHelper_),
+        processGUID_(createGlobalIdentifier()),
+        time_(),
+        newRun_(true),
+        newLumi_(true),
+        eventCached_(false),
+        state_(IsInvalid),
+        runAuxiliary_(),
+        lumiAuxiliary_(),
+        statusFileName_(),
+        numberOfEventsBeforeBigSkip_(0) {
+    if (pset.getUntrackedParameter<bool>("writeStatusFile", false)) {
       std::ostringstream statusfilename;
       statusfilename << "source_" << getpid();
       statusFileName_ = statusfilename.str();
@@ -85,47 +86,41 @@ namespace edm {
     // input sources have defined descriptions, the defaults in the getUntrackedParameterSet function
     // calls can and should be deleted from the code.
     std::string processingMode = pset.getUntrackedParameter<std::string>("processingMode", defaultMode);
-    if(processingMode == runMode) {
+    if (processingMode == runMode) {
       processingMode_ = Runs;
-    } else if(processingMode == runLumiMode) {
+    } else if (processingMode == runLumiMode) {
       processingMode_ = RunsAndLumis;
-    } else if(processingMode != defaultMode) {
+    } else if (processingMode != defaultMode) {
       throw Exception(errors::Configuration)
-        << "InputSource::InputSource()\n"
-        << "The 'processingMode' parameter for sources has an illegal value '" << processingMode << "'\n"
-        << "Legal values are '" << defaultMode << "', '" << runLumiMode << "', or '" << runMode << "'.\n";
+          << "InputSource::InputSource()\n"
+          << "The 'processingMode' parameter for sources has an illegal value '" << processingMode << "'\n"
+          << "Legal values are '" << defaultMode << "', '" << runLumiMode << "', or '" << runMode << "'.\n";
     }
   }
 
   InputSource::~InputSource() noexcept(false) {}
 
-  void
-  InputSource::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void InputSource::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     desc.setUnknown();
     descriptions.addDefault(desc);
   }
 
-  void
-  InputSource::prevalidate(ConfigurationDescriptions& ) {
-  }
-  
+  void InputSource::prevalidate(ConfigurationDescriptions&) {}
 
   static std::string const kBaseType("Source");
 
-  std::string const&
-  InputSource::baseType() {
-    return kBaseType;
-  }
+  std::string const& InputSource::baseType() { return kBaseType; }
 
-  void
-  InputSource::fillDescription(ParameterSetDescription& desc) {
+  void InputSource::fillDescription(ParameterSetDescription& desc) {
     std::string defaultString("RunsLumisAndEvents");
-    desc.addUntracked<std::string>("processingMode", defaultString)->setComment(
-    "'RunsLumisAndEvents': process runs, lumis, and events.\n"
-    "'RunsAndLumis':       process runs and lumis (not events).\n"
-    "'Runs':               process runs (not lumis or events).");
-    desc.addUntracked<bool>("writeStatusFile", false)->setComment("Write a status file. Intended for use by workflow management.");
+    desc.addUntracked<std::string>("processingMode", defaultString)
+        ->setComment(
+            "'RunsLumisAndEvents': process runs, lumis, and events.\n"
+            "'RunsAndLumis':       process runs and lumis (not events).\n"
+            "'Runs':               process runs (not lumis or events).");
+    desc.addUntracked<bool>("writeStatusFile", false)
+        ->setComment("Write a status file. Intended for use by workflow management.");
   }
 
   // This next function is to guarantee that "runs only" mode does not return events or lumis,
@@ -136,36 +131,35 @@ namespace edm {
   // implement the skipping internally, so that the performance gain is realized.
   // If this is done for a source, the 'if' blocks in this function will never be entered
   // for that source.
-  InputSource::ItemType
-  InputSource::nextItemType_() {
-    ItemType itemType = callWithTryCatchAndPrint<ItemType>( [this](){ return getNextItemType(); }, "Calling InputSource::getNextItemType" );
+  InputSource::ItemType InputSource::nextItemType_() {
+    ItemType itemType = callWithTryCatchAndPrint<ItemType>([this]() { return getNextItemType(); },
+                                                           "Calling InputSource::getNextItemType");
 
-    if(itemType == IsEvent && processingMode() != RunsLumisAndEvents) {
+    if (itemType == IsEvent && processingMode() != RunsLumisAndEvents) {
       skipEvents(1);
       return nextItemType_();
     }
-    if(itemType == IsLumi && processingMode() == Runs) {
+    if (itemType == IsLumi && processingMode() == Runs) {
       // QQQ skipLuminosityBlock_();
       return nextItemType_();
     }
     return itemType;
   }
 
-  InputSource::ItemType
-  InputSource::nextItemType() {
+  InputSource::ItemType InputSource::nextItemType() {
     ItemType oldState = state_;
-    if(eventLimitReached()) {
+    if (eventLimitReached()) {
       // If the maximum event limit has been reached, stop.
       state_ = IsStop;
-    } else if(lumiLimitReached()) {
+    } else if (lumiLimitReached()) {
       // If the maximum lumi limit has been reached, stop
       // when reaching a new file, run, or lumi.
-      if(oldState == IsInvalid || oldState == IsFile || oldState == IsRun || processingMode() != RunsLumisAndEvents) {
+      if (oldState == IsInvalid || oldState == IsFile || oldState == IsRun || processingMode() != RunsLumisAndEvents) {
         state_ = IsStop;
       } else {
         ItemType newState = nextItemType_();
-        if(newState == IsEvent) {
-          assert (processingMode() == RunsLumisAndEvents);
+        if (newState == IsEvent) {
+          assert(processingMode() == RunsLumisAndEvents);
           state_ = IsEvent;
         } else {
           state_ = IsStop;
@@ -173,155 +167,134 @@ namespace edm {
       }
     } else {
       ItemType newState = nextItemType_();
-      if(newState == IsStop) {
+      if (newState == IsStop) {
         state_ = IsStop;
-      } else if(newState == IsSynchronize) {
+      } else if (newState == IsSynchronize) {
         state_ = IsSynchronize;
-      } else if(newState == IsFile || oldState == IsInvalid) {
+      } else if (newState == IsFile || oldState == IsInvalid) {
         state_ = IsFile;
-      } else if(newState == IsRun || oldState == IsFile) {
+      } else if (newState == IsRun || oldState == IsFile) {
         runAuxiliary_ = readRunAuxiliary();
         state_ = IsRun;
-      } else if(newState == IsLumi || oldState == IsRun) {
-        assert (processingMode() != Runs);
+      } else if (newState == IsLumi || oldState == IsRun) {
+        assert(processingMode() != Runs);
         lumiAuxiliary_ = readLuminosityBlockAuxiliary();
         state_ = IsLumi;
       } else {
-        assert (processingMode() == RunsLumisAndEvents);
+        assert(processingMode() == RunsLumisAndEvents);
         state_ = IsEvent;
       }
     }
-    if(state_ == IsStop) {
+    if (state_ == IsStop) {
       lumiAuxiliary_.reset();
       runAuxiliary_.reset();
     }
     return state_;
   }
 
-  std::shared_ptr<LuminosityBlockAuxiliary>
-  InputSource::readLuminosityBlockAuxiliary() {
-    return callWithTryCatchAndPrint<std::shared_ptr<LuminosityBlockAuxiliary> >( [this](){ return readLuminosityBlockAuxiliary_(); },
-                                                                                   "Calling InputSource::readLuminosityBlockAuxiliary_" );
+  std::shared_ptr<LuminosityBlockAuxiliary> InputSource::readLuminosityBlockAuxiliary() {
+    return callWithTryCatchAndPrint<std::shared_ptr<LuminosityBlockAuxiliary> >(
+        [this]() { return readLuminosityBlockAuxiliary_(); }, "Calling InputSource::readLuminosityBlockAuxiliary_");
   }
 
-  std::shared_ptr<RunAuxiliary>
-  InputSource::readRunAuxiliary() {
-    return callWithTryCatchAndPrint<std::shared_ptr<RunAuxiliary> >( [this](){ return readRunAuxiliary_(); },
-                                                                       "Calling InputSource::readRunAuxiliary_" );
+  std::shared_ptr<RunAuxiliary> InputSource::readRunAuxiliary() {
+    return callWithTryCatchAndPrint<std::shared_ptr<RunAuxiliary> >([this]() { return readRunAuxiliary_(); },
+                                                                    "Calling InputSource::readRunAuxiliary_");
   }
 
-  void
-  InputSource::doBeginJob() {
-    this->beginJob();
-  }
+  void InputSource::doBeginJob() { this->beginJob(); }
 
-  void
-  InputSource::doEndJob() {
-    endJob();
-  }
+  void InputSource::doEndJob() { endJob(); }
 
-  std::pair<SharedResourcesAcquirer*,std::recursive_mutex*>
-  InputSource::resourceSharedWithDelayedReader() {
+  std::pair<SharedResourcesAcquirer*, std::recursive_mutex*> InputSource::resourceSharedWithDelayedReader() {
     return resourceSharedWithDelayedReader_();
   }
 
-  std::pair<SharedResourcesAcquirer*,std::recursive_mutex*>
-  InputSource::resourceSharedWithDelayedReader_() {
-    return std::pair<SharedResourcesAcquirer*,std::recursive_mutex*>(nullptr,nullptr);
+  std::pair<SharedResourcesAcquirer*, std::recursive_mutex*> InputSource::resourceSharedWithDelayedReader_() {
+    return std::pair<SharedResourcesAcquirer*, std::recursive_mutex*>(nullptr, nullptr);
   }
 
-  void
-  InputSource::registerProducts() {
-  }
+  void InputSource::registerProducts() {}
 
   // Return a dummy file block.
-  std::unique_ptr<FileBlock>
-  InputSource::readFile() {
+  std::unique_ptr<FileBlock> InputSource::readFile() {
     assert(state_ == IsFile);
     assert(!limitReached());
-    return callWithTryCatchAndPrint<std::unique_ptr<FileBlock> >( [this](){ return readFile_(); },
-                                                                  "Calling InputSource::readFile_" );
+    return callWithTryCatchAndPrint<std::unique_ptr<FileBlock> >([this]() { return readFile_(); },
+                                                                 "Calling InputSource::readFile_");
   }
 
-  void
-  InputSource::closeFile(FileBlock* fb, bool cleaningUpAfterException) {
-    if(fb != nullptr) fb->close();
-    callWithTryCatchAndPrint<void>( [this](){ closeFile_(); },
-                                    "Calling InputSource::closeFile_",
-                                    cleaningUpAfterException );
+  void InputSource::closeFile(FileBlock* fb, bool cleaningUpAfterException) {
+    if (fb != nullptr)
+      fb->close();
+    callWithTryCatchAndPrint<void>(
+        [this]() { closeFile_(); }, "Calling InputSource::closeFile_", cleaningUpAfterException);
     return;
   }
 
   // Return a dummy file block.
   // This function must be overridden for any input source that reads a file
   // containing Products.
-  std::unique_ptr<FileBlock>
-  InputSource::readFile_() {
-    return std::make_unique<FileBlock>();
-  }
+  std::unique_ptr<FileBlock> InputSource::readFile_() { return std::make_unique<FileBlock>(); }
 
-  void
-  InputSource::readRun(RunPrincipal& runPrincipal, HistoryAppender& ) {
+  void InputSource::readRun(RunPrincipal& runPrincipal, HistoryAppender&) {
     RunSourceSentry sentry(*this, runPrincipal.index());
-    callWithTryCatchAndPrint<void>( [this,&runPrincipal](){ readRun_(runPrincipal); }, "Calling InputSource::readRun_" );
+    callWithTryCatchAndPrint<void>([this, &runPrincipal]() { readRun_(runPrincipal); },
+                                   "Calling InputSource::readRun_");
   }
 
-  void
-  InputSource::readAndMergeRun(RunPrincipal& rp) {
+  void InputSource::readAndMergeRun(RunPrincipal& rp) {
     RunSourceSentry sentry(*this, rp.index());
-    callWithTryCatchAndPrint<void>( [this,&rp](){ readRun_(rp); }, "Calling InputSource::readRun_" );
+    callWithTryCatchAndPrint<void>([this, &rp]() { readRun_(rp); }, "Calling InputSource::readRun_");
   }
 
-  void
-  InputSource::readLuminosityBlock(LuminosityBlockPrincipal& lumiPrincipal, HistoryAppender& ) {
+  void InputSource::readLuminosityBlock(LuminosityBlockPrincipal& lumiPrincipal, HistoryAppender&) {
     LumiSourceSentry sentry(*this, lumiPrincipal.index());
-    callWithTryCatchAndPrint<void>( [this,&lumiPrincipal](){ readLuminosityBlock_(lumiPrincipal); }, "Calling InputSource::readLuminosityBlock_" );
-    if(remainingLumis_ > 0) {
+    callWithTryCatchAndPrint<void>([this, &lumiPrincipal]() { readLuminosityBlock_(lumiPrincipal); },
+                                   "Calling InputSource::readLuminosityBlock_");
+    if (remainingLumis_ > 0) {
       --remainingLumis_;
     }
   }
 
-  void
-  InputSource::readAndMergeLumi(LuminosityBlockPrincipal& lbp) {
+  void InputSource::readAndMergeLumi(LuminosityBlockPrincipal& lbp) {
     LumiSourceSentry sentry(*this, lbp.index());
-    callWithTryCatchAndPrint<void>( [this,&lbp](){ readLuminosityBlock_(lbp); }, "Calling InputSource::readLuminosityBlock_" );
-    if(remainingLumis_ > 0) {
+    callWithTryCatchAndPrint<void>([this, &lbp]() { readLuminosityBlock_(lbp); },
+                                   "Calling InputSource::readLuminosityBlock_");
+    if (remainingLumis_ > 0) {
       --remainingLumis_;
     }
   }
 
-  void
-  InputSource::readRun_(RunPrincipal& runPrincipal) {
+  void InputSource::readRun_(RunPrincipal& runPrincipal) {
     // Note: For the moment, we do not support saving and restoring the state of the
     // random number generator if random numbers are generated during processing of runs
     // (e.g. beginRun(), endRun())
     runPrincipal.fillRunPrincipal(processHistoryRegistry());
   }
 
-  void
-  InputSource::readLuminosityBlock_(LuminosityBlockPrincipal& lumiPrincipal) {
+  void InputSource::readLuminosityBlock_(LuminosityBlockPrincipal& lumiPrincipal) {
     lumiPrincipal.fillLuminosityBlockPrincipal(processHistoryRegistry());
   }
 
-  void
-  InputSource::readEvent(EventPrincipal& ep, StreamContext& streamContext) {
+  void InputSource::readEvent(EventPrincipal& ep, StreamContext& streamContext) {
     assert(state_ == IsEvent);
     assert(!eventLimitReached());
     {
       // block scope, in order to issue the PostSourceEvent signal before calling postRead and issueReports
       EventSourceSentry sentry(*this, streamContext);
 
-      callWithTryCatchAndPrint<void>( [this,&ep](){ readEvent_(ep); }, "Calling InputSource::readEvent_" );
+      callWithTryCatchAndPrint<void>([this, &ep]() { readEvent_(ep); }, "Calling InputSource::readEvent_");
     }
 
-    if(remainingEvents_ > 0) --remainingEvents_;
+    if (remainingEvents_ > 0)
+      --remainingEvents_;
     ++readCount_;
     setTimestamp(ep.time());
     issueReports(ep.id(), ep.streamID());
   }
 
-  bool
-  InputSource::readEvent(EventPrincipal& ep, EventID const& eventID, StreamContext& streamContext) {
+  bool InputSource::readEvent(EventPrincipal& ep, EventID const& eventID, StreamContext& streamContext) {
     bool result = false;
 
     if (not limitReached()) {
@@ -332,7 +305,8 @@ namespace edm {
       result = readIt(eventID, ep, streamContext);
 
       if (result) {
-        if(remainingEvents_ > 0) --remainingEvents_;
+        if (remainingEvents_ > 0)
+          --remainingEvents_;
         ++readCount_;
         issueReports(ep.id(), ep.streamID());
       }
@@ -340,37 +314,32 @@ namespace edm {
     return result;
   }
 
-  void
-  InputSource::skipEvents(int offset) {
-    callWithTryCatchAndPrint<void>( [this,&offset](){ skip(offset); }, "Calling InputSource::skip" );
+  void InputSource::skipEvents(int offset) {
+    callWithTryCatchAndPrint<void>([this, &offset]() { skip(offset); }, "Calling InputSource::skip");
   }
 
-  bool
-  InputSource::goToEvent(EventID const& eventID) {
-    return callWithTryCatchAndPrint<bool>( [this,&eventID](){ return goToEvent_(eventID); }, "Calling InputSource::goToEvent_" );
+  bool InputSource::goToEvent(EventID const& eventID) {
+    return callWithTryCatchAndPrint<bool>([this, &eventID]() { return goToEvent_(eventID); },
+                                          "Calling InputSource::goToEvent_");
   }
 
-  void
-  InputSource::rewind() {
+  void InputSource::rewind() {
     state_ = IsInvalid;
     remainingEvents_ = maxEvents_;
     setNewRun();
     setNewLumi();
     resetEventCached();
-    callWithTryCatchAndPrint<void>( [this](){ rewind_(); }, "Calling InputSource::rewind_" );
-  }
-
-  void
-  InputSource::issueReports(EventID const& eventID, StreamID streamID) {
-    if(isInfoEnabled()) {
-      LogVerbatim("FwkReport") << "Begin processing the " << readCount_
-                               << suffix(readCount_) << " record. Run " << eventID.run()
-                               << ", Event " << eventID.event()
-                               << ", LumiSection " << eventID.luminosityBlock()
-                               << " on stream "<<streamID.value()
-                               << " at " << std::setprecision(3) << TimeOfDay();
+    callWithTryCatchAndPrint<void>([this]() { rewind_(); }, "Calling InputSource::rewind_");
+  }
+
+  void InputSource::issueReports(EventID const& eventID, StreamID streamID) {
+    if (isInfoEnabled()) {
+      LogVerbatim("FwkReport") << "Begin processing the " << readCount_ << suffix(readCount_) << " record. Run "
+                               << eventID.run() << ", Event " << eventID.event() << ", LumiSection "
+                               << eventID.luminosityBlock() << " on stream " << streamID.value() << " at "
+                               << std::setprecision(3) << TimeOfDay();
     }
-    if(!statusFileName_.empty()) {
+    if (!statusFileName_.empty()) {
       std::ofstream statusFile(statusFileName_.c_str());
       statusFile << eventID << " time: " << std::setprecision(3) << TimeOfDay() << '\n';
       statusFile.close();
@@ -379,188 +348,133 @@ namespace edm {
     // At some point we may want to initiate checkpointing here
   }
 
-  bool
-  InputSource::readIt(EventID const&, EventPrincipal&, StreamContext&) {
-    throw Exception(errors::LogicError)
-      << "InputSource::readIt()\n"
-      << "Random access is not implemented for this type of Input Source\n"
-      << "Contact a Framework Developer\n";
+  bool InputSource::readIt(EventID const&, EventPrincipal&, StreamContext&) {
+    throw Exception(errors::LogicError) << "InputSource::readIt()\n"
+                                        << "Random access is not implemented for this type of Input Source\n"
+                                        << "Contact a Framework Developer\n";
   }
 
-  void
-  InputSource::setRun(RunNumber_t) {
-    throw Exception(errors::LogicError)
-      << "InputSource::setRun()\n"
-      << "Run number cannot be modified for this type of Input Source\n"
-      << "Contact a Framework Developer\n";
+  void InputSource::setRun(RunNumber_t) {
+    throw Exception(errors::LogicError) << "InputSource::setRun()\n"
+                                        << "Run number cannot be modified for this type of Input Source\n"
+                                        << "Contact a Framework Developer\n";
   }
 
-  void
-  InputSource::setLumi(LuminosityBlockNumber_t) {
-    throw Exception(errors::LogicError)
-      << "InputSource::setLumi()\n"
-      << "Luminosity Block ID cannot be modified for this type of Input Source\n"
-      << "Contact a Framework Developer\n";
+  void InputSource::setLumi(LuminosityBlockNumber_t) {
+    throw Exception(errors::LogicError) << "InputSource::setLumi()\n"
+                                        << "Luminosity Block ID cannot be modified for this type of Input Source\n"
+                                        << "Contact a Framework Developer\n";
   }
 
-  void
-  InputSource::skip(int) {
-    throw Exception(errors::LogicError)
-      << "InputSource::skip()\n"
-      << "Random access are not implemented for this type of Input Source\n"
-      << "Contact a Framework Developer\n";
+  void InputSource::skip(int) {
+    throw Exception(errors::LogicError) << "InputSource::skip()\n"
+                                        << "Random access are not implemented for this type of Input Source\n"
+                                        << "Contact a Framework Developer\n";
   }
 
-  bool
-  InputSource::goToEvent_(EventID const&) {
-    throw Exception(errors::LogicError)
-      << "InputSource::goToEvent_()\n"
-      << "Random access is not implemented for this type of Input Source\n"
-      << "Contact a Framework Developer\n";
+  bool InputSource::goToEvent_(EventID const&) {
+    throw Exception(errors::LogicError) << "InputSource::goToEvent_()\n"
+                                        << "Random access is not implemented for this type of Input Source\n"
+                                        << "Contact a Framework Developer\n";
     return true;
   }
 
-  void
-  InputSource::rewind_() {
-    throw Exception(errors::LogicError)
-      << "InputSource::rewind()\n"
-      << "Random access are not implemented for this type of Input Source\n"
-      << "Contact a Framework Developer\n";
+  void InputSource::rewind_() {
+    throw Exception(errors::LogicError) << "InputSource::rewind()\n"
+                                        << "Random access are not implemented for this type of Input Source\n"
+                                        << "Contact a Framework Developer\n";
   }
 
-  void
-  InputSource::decreaseRemainingEventsBy(int iSkipped) {
-    if(-1 == remainingEvents_) {
+  void InputSource::decreaseRemainingEventsBy(int iSkipped) {
+    if (-1 == remainingEvents_) {
       return;
     }
-    if(iSkipped < remainingEvents_) {
+    if (iSkipped < remainingEvents_) {
       remainingEvents_ -= iSkipped;
     } else {
       remainingEvents_ = 0;
     }
   }
 
-  void
-  InputSource::doBeginRun(RunPrincipal& rp, ProcessContext const* ) {
-  }
+  void InputSource::doBeginRun(RunPrincipal& rp, ProcessContext const*) {}
 
-  void
-  InputSource::doBeginLumi(LuminosityBlockPrincipal& lbp, ProcessContext const* ) {
-  }
+  void InputSource::doBeginLumi(LuminosityBlockPrincipal& lbp, ProcessContext const*) {}
 
-  bool
-  InputSource::randomAccess() const {
-    return callWithTryCatchAndPrint<bool>( [this](){ return randomAccess_(); },
-                                           "Calling InputSource::randomAccess_" );
+  bool InputSource::randomAccess() const {
+    return callWithTryCatchAndPrint<bool>([this]() { return randomAccess_(); }, "Calling InputSource::randomAccess_");
   }
 
-  ProcessingController::ForwardState
-  InputSource::forwardState() const {
-    return callWithTryCatchAndPrint<ProcessingController::ForwardState>( [this](){ return forwardState_(); },
-                                                                         "Calling InputSource::forwardState_" );
+  ProcessingController::ForwardState InputSource::forwardState() const {
+    return callWithTryCatchAndPrint<ProcessingController::ForwardState>([this]() { return forwardState_(); },
+                                                                        "Calling InputSource::forwardState_");
   }
 
-  ProcessingController::ReverseState
-  InputSource::reverseState() const {
-    return callWithTryCatchAndPrint<ProcessingController::ReverseState>( [this](){ return reverseState_(); },
-                                                                         "Calling InputSource::reverseState__" );
+  ProcessingController::ReverseState InputSource::reverseState() const {
+    return callWithTryCatchAndPrint<ProcessingController::ReverseState>([this]() { return reverseState_(); },
+                                                                        "Calling InputSource::reverseState__");
   }
 
-  void
-  InputSource::beginJob() {}
+  void InputSource::beginJob() {}
 
-  void
-  InputSource::endJob() {}
+  void InputSource::endJob() {}
 
-  bool
-  InputSource::randomAccess_() const {
-    return false;
-  }
+  bool InputSource::randomAccess_() const { return false; }
 
-  ProcessingController::ForwardState
-  InputSource::forwardState_() const {
+  ProcessingController::ForwardState InputSource::forwardState_() const {
     return ProcessingController::kUnknownForward;
   }
 
-  ProcessingController::ReverseState
-  InputSource::reverseState_() const {
+  ProcessingController::ReverseState InputSource::reverseState_() const {
     return ProcessingController::kUnknownReverse;
   }
 
-  ProcessHistoryID const&
-  InputSource::reducedProcessHistoryID() const {
+  ProcessHistoryID const& InputSource::reducedProcessHistoryID() const {
     assert(runAuxiliary());
     return processHistoryRegistry_->reducedProcessHistoryID(runAuxiliary()->processHistoryID());
   }
 
-  RunNumber_t
-  InputSource::run() const {
+  RunNumber_t InputSource::run() const {
     assert(runAuxiliary());
     return runAuxiliary()->run();
   }
 
-  LuminosityBlockNumber_t
-  InputSource::luminosityBlock() const {
+  LuminosityBlockNumber_t InputSource::luminosityBlock() const {
     assert(luminosityBlockAuxiliary());
     return luminosityBlockAuxiliary()->luminosityBlock();
   }
 
-  InputSource::EventSourceSentry::EventSourceSentry(InputSource const& source, StreamContext & sc) :
-    source_(source),
-    sc_(sc)
-  {
+  InputSource::EventSourceSentry::EventSourceSentry(InputSource const& source, StreamContext& sc)
+      : source_(source), sc_(sc) {
     source.actReg()->preSourceSignal_(sc_.streamID());
   }
 
-  InputSource::EventSourceSentry::~EventSourceSentry() {
-    source_.actReg()->postSourceSignal_(sc_.streamID());
-  }
+  InputSource::EventSourceSentry::~EventSourceSentry() { source_.actReg()->postSourceSignal_(sc_.streamID()); }
 
-  InputSource::LumiSourceSentry::LumiSourceSentry(InputSource const& source, LuminosityBlockIndex index) :
-    source_(source),
-    index_(index)
-  {
+  InputSource::LumiSourceSentry::LumiSourceSentry(InputSource const& source, LuminosityBlockIndex index)
+      : source_(source), index_(index) {
     source_.actReg()->preSourceLumiSignal_(index_);
   }
 
-  InputSource::LumiSourceSentry::~LumiSourceSentry() {
-    source_.actReg()->postSourceLumiSignal_(index_);
-  }
+  InputSource::LumiSourceSentry::~LumiSourceSentry() { source_.actReg()->postSourceLumiSignal_(index_); }
 
-  InputSource::RunSourceSentry::RunSourceSentry(InputSource const& source, RunIndex index) :
-    source_(source),
-    index_(index)
-  {
+  InputSource::RunSourceSentry::RunSourceSentry(InputSource const& source, RunIndex index)
+      : source_(source), index_(index) {
     source_.actReg()->preSourceRunSignal_(index_);
   }
 
-  InputSource::RunSourceSentry::~RunSourceSentry() {
-    source_.actReg()->postSourceRunSignal_(index_);
-  }
+  InputSource::RunSourceSentry::~RunSourceSentry() { source_.actReg()->postSourceRunSignal_(index_); }
 
-  InputSource::FileOpenSentry::FileOpenSentry(InputSource const& source,
-                                              std::string const& lfn,
-                                              bool usedFallback) :
-    post_(source.actReg()->postOpenFileSignal_),
-    lfn_(lfn),
-    usedFallback_(usedFallback) {
-     source.actReg()->preOpenFileSignal_(lfn, usedFallback);
+  InputSource::FileOpenSentry::FileOpenSentry(InputSource const& source, std::string const& lfn, bool usedFallback)
+      : post_(source.actReg()->postOpenFileSignal_), lfn_(lfn), usedFallback_(usedFallback) {
+    source.actReg()->preOpenFileSignal_(lfn, usedFallback);
   }
 
-  InputSource::FileOpenSentry::~FileOpenSentry() {
-    post_(lfn_, usedFallback_);
-  }
+  InputSource::FileOpenSentry::~FileOpenSentry() { post_(lfn_, usedFallback_); }
 
-  InputSource::FileCloseSentry::FileCloseSentry(InputSource const& source,
-                                                std::string const& lfn,
-                                                bool usedFallback) :
-    post_(source.actReg()->postCloseFileSignal_),
-    lfn_(lfn),
-    usedFallback_(usedFallback) {
+  InputSource::FileCloseSentry::FileCloseSentry(InputSource const& source, std::string const& lfn, bool usedFallback)
+      : post_(source.actReg()->postCloseFileSignal_), lfn_(lfn), usedFallback_(usedFallback) {
     source.actReg()->preCloseFileSignal_(lfn, usedFallback);
   }
 
-  InputSource::FileCloseSentry::~FileCloseSentry() {
-    post_(lfn_, usedFallback_);
-  }
-}
+  InputSource::FileCloseSentry::~FileCloseSentry() { post_(lfn_, usedFallback_); }
+}  // namespace edm
diff --git a/FWCore/Framework/src/InputSourceFactory.cc b/FWCore/Framework/src/InputSourceFactory.cc
index d7f9b4c11fe04..e39689cfdcd56 100644
--- a/FWCore/Framework/src/InputSourceFactory.cc
+++ b/FWCore/Framework/src/InputSourceFactory.cc
@@ -6,22 +6,16 @@
 
 #include <iostream>
 
-EDM_REGISTER_PLUGINFACTORY(edm::InputSourcePluginFactory,"CMS EDM Framework InputSource");
+EDM_REGISTER_PLUGINFACTORY(edm::InputSourcePluginFactory, "CMS EDM Framework InputSource");
 namespace edm {
 
+  InputSourceFactory::~InputSourceFactory() {}
 
-  InputSourceFactory::~InputSourceFactory()
-  {
-  }
-
-  InputSourceFactory::InputSourceFactory() 
-  {
-  }
+  InputSourceFactory::InputSourceFactory() {}
 
   InputSourceFactory const InputSourceFactory::singleInstance_;
 
-  InputSourceFactory const* InputSourceFactory::get()
-  {
+  InputSourceFactory const* InputSourceFactory::get() {
     // will not work with plugin factories
     //static InputSourceFactory f;
     //return &f;
@@ -29,31 +23,28 @@ namespace edm {
     return &singleInstance_;
   }
 
-  std::unique_ptr<InputSource>
-  InputSourceFactory::makeInputSource(ParameterSet const& conf,
-					InputSourceDescription const& desc) const
-    
+  std::unique_ptr<InputSource> InputSourceFactory::makeInputSource(ParameterSet const& conf,
+                                                                   InputSourceDescription const& desc) const
+
   {
     std::string modtype = conf.getParameter<std::string>("@module_type");
     FDEBUG(1) << "InputSourceFactory: module_type = " << modtype << std::endl;
-    std::unique_ptr<InputSource> wm = std::unique_ptr<InputSource>(InputSourcePluginFactory::get()->create(modtype,conf,desc));
-    
-    if(wm.get() == nullptr) {
-	throw edm::Exception(errors::Configuration,"NoSourceModule")
-	  << "InputSource Factory:\n"
-	  << "Cannot find source type from ParameterSet: "
-	  << modtype << "\n"
-	  << "Perhaps your source type is misspelled or is not an EDM Plugin?\n"
-	  << "Try running EdmPluginDump to obtain a list of available Plugins.";
+    std::unique_ptr<InputSource> wm =
+        std::unique_ptr<InputSource>(InputSourcePluginFactory::get()->create(modtype, conf, desc));
+
+    if (wm.get() == nullptr) {
+      throw edm::Exception(errors::Configuration, "NoSourceModule")
+          << "InputSource Factory:\n"
+          << "Cannot find source type from ParameterSet: " << modtype << "\n"
+          << "Perhaps your source type is misspelled or is not an EDM Plugin?\n"
+          << "Try running EdmPluginDump to obtain a list of available Plugins.";
     }
 
     wm->registerProducts();
 
-    FDEBUG(1) << "InputSourceFactory: created input source "
-	      << modtype
-	      << std::endl;
+    FDEBUG(1) << "InputSourceFactory: created input source " << modtype << std::endl;
 
     return wm;
   }
 
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/InputSourceFactory.h b/FWCore/Framework/src/InputSourceFactory.h
index e5526afedfb6c..ba0f90e63e31a 100644
--- a/FWCore/Framework/src/InputSourceFactory.h
+++ b/FWCore/Framework/src/InputSourceFactory.h
@@ -9,7 +9,7 @@
 
 namespace edm {
 
-  typedef InputSource* (ISFunc)(ParameterSet const&, InputSourceDescription const&);
+  typedef InputSource*(ISFunc)(ParameterSet const&, InputSourceDescription const&);
 
   typedef edmplugin::PluginFactory<ISFunc> InputSourcePluginFactory;
 
@@ -19,15 +19,12 @@ namespace edm {
 
     static InputSourceFactory const* get();
 
-    std::unique_ptr<InputSource>
-      makeInputSource(ParameterSet const&,
-		       InputSourceDescription const&) const;
-    
+    std::unique_ptr<InputSource> makeInputSource(ParameterSet const&, InputSourceDescription const&) const;
 
   private:
     InputSourceFactory();
     static InputSourceFactory const singleInstance_;
   };
 
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/src/IntersectingIOVRecordIntervalFinder.cc b/FWCore/Framework/src/IntersectingIOVRecordIntervalFinder.cc
index 090ba2e4775a1..cbe3b82a58187 100644
--- a/FWCore/Framework/src/IntersectingIOVRecordIntervalFinder.cc
+++ b/FWCore/Framework/src/IntersectingIOVRecordIntervalFinder.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     IntersectingIOVRecordIntervalFinder
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -15,103 +15,97 @@
 // user include files
 #include "FWCore/Framework/src/IntersectingIOVRecordIntervalFinder.h"
 namespace edm {
-   namespace eventsetup {
+  namespace eventsetup {
 
-//
-// constants, enums and typedefs
-//
+    //
+    // constants, enums and typedefs
+    //
 
-//
-// static data member definitions
-//
+    //
+    // static data member definitions
+    //
 
-//
-// constructors and destructor
-//
-IntersectingIOVRecordIntervalFinder::IntersectingIOVRecordIntervalFinder(const EventSetupRecordKey& iKey)
-{
-   findingRecordWithKey(iKey);
-}
+    //
+    // constructors and destructor
+    //
+    IntersectingIOVRecordIntervalFinder::IntersectingIOVRecordIntervalFinder(const EventSetupRecordKey& iKey) {
+      findingRecordWithKey(iKey);
+    }
 
-// IntersectingIOVRecordIntervalFinder::IntersectingIOVRecordIntervalFinder(const IntersectingIOVRecordIntervalFinder& rhs)
-// {
-//    // do actual copying here;
-// }
+    // IntersectingIOVRecordIntervalFinder::IntersectingIOVRecordIntervalFinder(const IntersectingIOVRecordIntervalFinder& rhs)
+    // {
+    //    // do actual copying here;
+    // }
 
-IntersectingIOVRecordIntervalFinder::~IntersectingIOVRecordIntervalFinder()
-{
-}
+    IntersectingIOVRecordIntervalFinder::~IntersectingIOVRecordIntervalFinder() {}
 
-//
-// assignment operators
-//
-// const IntersectingIOVRecordIntervalFinder& IntersectingIOVRecordIntervalFinder::operator=(const IntersectingIOVRecordIntervalFinder& rhs)
-// {
-//   //An exception safe implementation is
-//   IntersectingIOVRecordIntervalFinder temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
+    //
+    // assignment operators
+    //
+    // const IntersectingIOVRecordIntervalFinder& IntersectingIOVRecordIntervalFinder::operator=(const IntersectingIOVRecordIntervalFinder& rhs)
+    // {
+    //   //An exception safe implementation is
+    //   IntersectingIOVRecordIntervalFinder temp(rhs);
+    //   swap(rhs);
+    //
+    //   return *this;
+    // }
 
-//
-// member functions
-//
-void 
-IntersectingIOVRecordIntervalFinder::swapFinders(std::vector<edm::propagate_const<std::shared_ptr<EventSetupRecordIntervalFinder>>>& iFinders)
-{
-   finders_.swap(iFinders);
-}
+    //
+    // member functions
+    //
+    void IntersectingIOVRecordIntervalFinder::swapFinders(
+        std::vector<edm::propagate_const<std::shared_ptr<EventSetupRecordIntervalFinder>>>& iFinders) {
+      finders_.swap(iFinders);
+    }
 
-void 
-IntersectingIOVRecordIntervalFinder::setIntervalFor(const EventSetupRecordKey& iKey,
-                                                    const IOVSyncValue& iTime, 
-                                                    ValidityInterval& oInterval)
-{
-   if(finders_.empty()) {
-      oInterval = ValidityInterval::invalidInterval();
-      return;
-   }
-   
-   bool haveAValidRecord = false;
-   bool haveUnknownEnding = false;
-   ValidityInterval newInterval(IOVSyncValue::beginOfTime(), IOVSyncValue::endOfTime());
+    void IntersectingIOVRecordIntervalFinder::setIntervalFor(const EventSetupRecordKey& iKey,
+                                                             const IOVSyncValue& iTime,
+                                                             ValidityInterval& oInterval) {
+      if (finders_.empty()) {
+        oInterval = ValidityInterval::invalidInterval();
+        return;
+      }
 
-   for(auto& finder : finders_) {
-      ValidityInterval test = finder->findIntervalFor(iKey, iTime);
-      if ( test != ValidityInterval::invalidInterval() ) {
-         haveAValidRecord =true;
-         if(newInterval.first() < test.first()) {
+      bool haveAValidRecord = false;
+      bool haveUnknownEnding = false;
+      ValidityInterval newInterval(IOVSyncValue::beginOfTime(), IOVSyncValue::endOfTime());
+
+      for (auto& finder : finders_) {
+        ValidityInterval test = finder->findIntervalFor(iKey, iTime);
+        if (test != ValidityInterval::invalidInterval()) {
+          haveAValidRecord = true;
+          if (newInterval.first() < test.first()) {
             newInterval.setFirst(test.first());
-         }
-         if(newInterval.last() > test.last()) {
+          }
+          if (newInterval.last() > test.last()) {
             newInterval.setLast(test.last());
-         }
-         if(test.last() == IOVSyncValue::invalidIOVSyncValue()) {
-            haveUnknownEnding=true;
-         }
-      } else {
-         //if it is invalid then we must check on each new IOVSyncValue so that 
-         // we can find the time when it is valid
-         haveUnknownEnding=true;
+          }
+          if (test.last() == IOVSyncValue::invalidIOVSyncValue()) {
+            haveUnknownEnding = true;
+          }
+        } else {
+          //if it is invalid then we must check on each new IOVSyncValue so that
+          // we can find the time when it is valid
+          haveUnknownEnding = true;
+        }
       }
-   }
-   
-   if(!haveAValidRecord) {
-      //If no Finder has a valid time, then this record is also invalid for this time
-      newInterval = ValidityInterval::invalidInterval();
-   } else if(haveUnknownEnding) {
-      newInterval.setLast(IOVSyncValue::invalidIOVSyncValue());
-   }
-   oInterval = newInterval;
-}
 
-//
-// const member functions
-//
+      if (!haveAValidRecord) {
+        //If no Finder has a valid time, then this record is also invalid for this time
+        newInterval = ValidityInterval::invalidInterval();
+      } else if (haveUnknownEnding) {
+        newInterval.setLast(IOVSyncValue::invalidIOVSyncValue());
+      }
+      oInterval = newInterval;
+    }
 
-//
-// static member functions
-//
-   }
-}
+    //
+    // const member functions
+    //
+
+    //
+    // static member functions
+    //
+  }  // namespace eventsetup
+}  // namespace edm
diff --git a/FWCore/Framework/src/IntersectingIOVRecordIntervalFinder.h b/FWCore/Framework/src/IntersectingIOVRecordIntervalFinder.h
index e93be8ed11844..fb1c095099f65 100644
--- a/FWCore/Framework/src/IntersectingIOVRecordIntervalFinder.h
+++ b/FWCore/Framework/src/IntersectingIOVRecordIntervalFinder.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     IntersectingIOVRecordIntervalFinder
-// 
+//
 /**\class IntersectingIOVRecordIntervalFinder IntersectingIOVRecordIntervalFinder.h FWCore/Framework/interface/IntersectingIOVRecordIntervalFinder.h
 
  Description: A RecordIntervalFinder which determines IOVs by taking the intersection of IOVs of other RecordIntervalFinders
@@ -28,34 +28,33 @@
 
 // forward declarations
 namespace edm {
-   namespace eventsetup {
-
-      class IntersectingIOVRecordIntervalFinder : public EventSetupRecordIntervalFinder {
-         
-      public:
-         explicit IntersectingIOVRecordIntervalFinder(const EventSetupRecordKey&);
-         ~IntersectingIOVRecordIntervalFinder() override;
-         
-         // ---------- const member functions ---------------------
-         
-         // ---------- static member functions --------------------
-         
-         // ---------- member functions ---------------------------
-         void swapFinders(std::vector<edm::propagate_const<std::shared_ptr<EventSetupRecordIntervalFinder>>>&);
-      protected:
-         void setIntervalFor(const EventSetupRecordKey&,
-                                     const IOVSyncValue& , 
-                                     ValidityInterval&) override;
-         
-      private:
-         IntersectingIOVRecordIntervalFinder(const IntersectingIOVRecordIntervalFinder&) = delete; // stop default
-         
-         const IntersectingIOVRecordIntervalFinder& operator=(const IntersectingIOVRecordIntervalFinder&) = delete; // stop default
-         
-         // ---------- member data --------------------------------
-         std::vector<edm::propagate_const<std::shared_ptr<EventSetupRecordIntervalFinder>>> finders_;
-      };
-   }
-}
+  namespace eventsetup {
+
+    class IntersectingIOVRecordIntervalFinder : public EventSetupRecordIntervalFinder {
+    public:
+      explicit IntersectingIOVRecordIntervalFinder(const EventSetupRecordKey&);
+      ~IntersectingIOVRecordIntervalFinder() override;
+
+      // ---------- const member functions ---------------------
+
+      // ---------- static member functions --------------------
+
+      // ---------- member functions ---------------------------
+      void swapFinders(std::vector<edm::propagate_const<std::shared_ptr<EventSetupRecordIntervalFinder>>>&);
+
+    protected:
+      void setIntervalFor(const EventSetupRecordKey&, const IOVSyncValue&, ValidityInterval&) override;
+
+    private:
+      IntersectingIOVRecordIntervalFinder(const IntersectingIOVRecordIntervalFinder&) = delete;  // stop default
+
+      const IntersectingIOVRecordIntervalFinder& operator=(const IntersectingIOVRecordIntervalFinder&) =
+          delete;  // stop default
+
+      // ---------- member data --------------------------------
+      std::vector<edm::propagate_const<std::shared_ptr<EventSetupRecordIntervalFinder>>> finders_;
+    };
+  }  // namespace eventsetup
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/LooperFactory.cc b/FWCore/Framework/src/LooperFactory.cc
index 10894931eabaf..c5f5fda69f281 100644
--- a/FWCore/Framework/src/LooperFactory.cc
+++ b/FWCore/Framework/src/LooperFactory.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     LooperFactory
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -19,28 +19,24 @@
 // static member functions
 //
 namespace edm {
-   namespace eventsetup {
-      std::string LooperMakerTraits::name() { return "CMS EDM Framework EDLooper"; }
-      
-      void 
-      LooperMakerTraits::replaceExisting(EventSetupProvider&, std::shared_ptr<EDLooperBase>) {
-         throw edm::Exception(edm::errors::LogicError)
-            << "LooperMakerTraits::replaceExisting\n"
-            << "This function is not implemented and should never be called.\n"
-            << "Please report this to a Framework Developer\n";
-      }
+  namespace eventsetup {
+    std::string LooperMakerTraits::name() { return "CMS EDM Framework EDLooper"; }
+
+    void LooperMakerTraits::replaceExisting(EventSetupProvider&, std::shared_ptr<EDLooperBase>) {
+      throw edm::Exception(edm::errors::LogicError) << "LooperMakerTraits::replaceExisting\n"
+                                                    << "This function is not implemented and should never be called.\n"
+                                                    << "Please report this to a Framework Developer\n";
+    }
 
-      std::shared_ptr<LooperMakerTraits::base_type>
-      LooperMakerTraits::getComponentAndRegisterProcess(EventSetupsController&,
-                                                        ParameterSet const&) {
-        return std::shared_ptr<LooperMakerTraits::base_type>();
-      }
+    std::shared_ptr<LooperMakerTraits::base_type> LooperMakerTraits::getComponentAndRegisterProcess(
+        EventSetupsController&, ParameterSet const&) {
+      return std::shared_ptr<LooperMakerTraits::base_type>();
+    }
 
-      void LooperMakerTraits::putComponent(EventSetupsController&,
-                                           ParameterSet const&,
-                                           std::shared_ptr<base_type> const&) {
-      }
-   }
-}
+    void LooperMakerTraits::putComponent(EventSetupsController&,
+                                         ParameterSet const&,
+                                         std::shared_ptr<base_type> const&) {}
+  }  // namespace eventsetup
+}  // namespace edm
 
 COMPONENTFACTORY_GET(edm::eventsetup::LooperMakerTraits);
diff --git a/FWCore/Framework/src/LuminosityBlock.cc b/FWCore/Framework/src/LuminosityBlock.cc
index 0b8f8cd32658e..4c65044868ae6 100644
--- a/FWCore/Framework/src/LuminosityBlock.cc
+++ b/FWCore/Framework/src/LuminosityBlock.cc
@@ -9,84 +9,72 @@ namespace edm {
 
   std::string const LuminosityBlock::emptyString_;
 
-  LuminosityBlock::LuminosityBlock(LuminosityBlockPrincipal const& lbp, ModuleDescription const& md,
-                                   ModuleCallingContext const* moduleCallingContext, bool isAtEnd) :
-        provRecorder_(lbp, md,isAtEnd),
+  LuminosityBlock::LuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                   ModuleDescription const& md,
+                                   ModuleCallingContext const* moduleCallingContext,
+                                   bool isAtEnd)
+      : provRecorder_(lbp, md, isAtEnd),
         aux_(lbp.aux()),
-        run_(new Run(lbp.runPrincipal(), md, moduleCallingContext,false)),
-        moduleCallingContext_(moduleCallingContext) {
-  }
+        run_(new Run(lbp.runPrincipal(), md, moduleCallingContext, false)),
+        moduleCallingContext_(moduleCallingContext) {}
 
-  LuminosityBlock::~LuminosityBlock() {
-  }
+  LuminosityBlock::~LuminosityBlock() {}
 
-  LuminosityBlockIndex
-  LuminosityBlock::index() const {
-    return luminosityBlockPrincipal().index();
-  }
+  LuminosityBlockIndex LuminosityBlock::index() const { return luminosityBlockPrincipal().index(); }
 
-  LuminosityBlock::CacheIdentifier_t
-  LuminosityBlock::cacheIdentifier() const {return luminosityBlockPrincipal().cacheIdentifier();}
+  LuminosityBlock::CacheIdentifier_t LuminosityBlock::cacheIdentifier() const {
+    return luminosityBlockPrincipal().cacheIdentifier();
+  }
 
-  
-  void
-  LuminosityBlock::setConsumer(EDConsumerBase const* iConsumer) {
+  void LuminosityBlock::setConsumer(EDConsumerBase const* iConsumer) {
     provRecorder_.setConsumer(iConsumer);
-    if(run_) {
+    if (run_) {
       const_cast<Run*>(run_.get())->setConsumer(iConsumer);
     }
   }
-  
-  void
-  LuminosityBlock::setSharedResourcesAcquirer( SharedResourcesAcquirer* iResourceAcquirer) {
+
+  void LuminosityBlock::setSharedResourcesAcquirer(SharedResourcesAcquirer* iResourceAcquirer) {
     provRecorder_.setSharedResourcesAcquirer(iResourceAcquirer);
     const_cast<Run*>(run_.get())->setSharedResourcesAcquirer(iResourceAcquirer);
   }
 
-  void
-  LuminosityBlock::setProducer(ProducerBase const* iProducer) {
+  void LuminosityBlock::setProducer(ProducerBase const* iProducer) {
     provRecorder_.setProducer(iProducer);
     //set appropriate size
-    putProducts_.resize(
-            provRecorder_.putTokenIndexToProductResolverIndex().size());
+    putProducts_.resize(provRecorder_.putTokenIndexToProductResolverIndex().size());
   }
 
-
-  LuminosityBlockPrincipal const&
-  LuminosityBlock::luminosityBlockPrincipal() const {
+  LuminosityBlockPrincipal const& LuminosityBlock::luminosityBlockPrincipal() const {
     return dynamic_cast<LuminosityBlockPrincipal const&>(provRecorder_.principal());
   }
 
-  Provenance
-  LuminosityBlock::getProvenance(BranchID const& bid) const {
+  Provenance LuminosityBlock::getProvenance(BranchID const& bid) const {
     return luminosityBlockPrincipal().getProvenance(bid, moduleCallingContext_);
   }
 
-  void
-  LuminosityBlock::getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const {
+  void LuminosityBlock::getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const {
     luminosityBlockPrincipal().getAllStableProvenance(provenances);
   }
 
-  void
-  LuminosityBlock::commit_(std::vector<edm::ProductResolverIndex> const& iShouldPut) {
+  void LuminosityBlock::commit_(std::vector<edm::ProductResolverIndex> const& iShouldPut) {
     LuminosityBlockPrincipal const& lbp = luminosityBlockPrincipal();
     size_t nPut = 0;
-    for(size_t i = 0; i < putProducts().size();++i) {
+    for (size_t i = 0; i < putProducts().size(); ++i) {
       auto& p = get_underlying_safe(putProducts()[i]);
-      if(p) {
-        lbp.put(provRecorder_.putTokenIndexToProductResolverIndex()[i],  std::move(p));
+      if (p) {
+        lbp.put(provRecorder_.putTokenIndexToProductResolverIndex()[i], std::move(p));
         ++nPut;
       }
     }
-    
+
     auto sz = iShouldPut.size();
-    if(sz !=0 and sz != nPut) {
+    if (sz != 0 and sz != nPut) {
       //some were missed
       auto& p = provRecorder_.principal();
-      for(auto index: iShouldPut){
+      for (auto index : iShouldPut) {
         auto resolver = p.getProductResolverByIndex(index);
-        if(not resolver->productResolved() and
-           isEndTransition(provRecorder_.transition()) == resolver->branchDescription().availableOnlyAtEndTransition()) {
+        if (not resolver->productResolved() and isEndTransition(provRecorder_.transition()) ==
+                                                    resolver->branchDescription().availableOnlyAtEndTransition()) {
           resolver->putProduct(std::unique_ptr<WrapperBase>());
         }
       }
@@ -96,19 +84,16 @@ namespace edm {
     putProducts().clear();
   }
 
-  ProcessHistoryID const&
-  LuminosityBlock::processHistoryID() const {
+  ProcessHistoryID const& LuminosityBlock::processHistoryID() const {
     return luminosityBlockPrincipal().processHistoryID();
   }
 
-  ProcessHistory const&
-  LuminosityBlock::processHistory() const {
-    return provRecorder_.processHistory();
-  }
+  ProcessHistory const& LuminosityBlock::processHistory() const { return provRecorder_.processHistory(); }
 
-  BasicHandle
-  LuminosityBlock::getByLabelImpl(std::type_info const&, std::type_info const& iProductType, const InputTag& iTag) const {
+  BasicHandle LuminosityBlock::getByLabelImpl(std::type_info const&,
+                                              std::type_info const& iProductType,
+                                              const InputTag& iTag) const {
     BasicHandle h = provRecorder_.getByLabel_(TypeID(iProductType), iTag, moduleCallingContext_);
     return h;
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/LuminosityBlockForOutput.cc b/FWCore/Framework/src/LuminosityBlockForOutput.cc
index 74c664a21e613..c59eea4e6fc3f 100644
--- a/FWCore/Framework/src/LuminosityBlockForOutput.cc
+++ b/FWCore/Framework/src/LuminosityBlockForOutput.cc
@@ -7,25 +7,22 @@
 
 namespace edm {
 
-  LuminosityBlockForOutput::LuminosityBlockForOutput(LuminosityBlockPrincipal const& lbp, ModuleDescription const& md,
-                                   ModuleCallingContext const* moduleCallingContext, bool isAtEnd) :
-        OccurrenceForOutput(lbp, md, moduleCallingContext, isAtEnd),
+  LuminosityBlockForOutput::LuminosityBlockForOutput(LuminosityBlockPrincipal const& lbp,
+                                                     ModuleDescription const& md,
+                                                     ModuleCallingContext const* moduleCallingContext,
+                                                     bool isAtEnd)
+      : OccurrenceForOutput(lbp, md, moduleCallingContext, isAtEnd),
         aux_(lbp.aux()),
-        run_(new RunForOutput(lbp.runPrincipal(), md, moduleCallingContext, false)) {
-  }
+        run_(new RunForOutput(lbp.runPrincipal(), md, moduleCallingContext, false)) {}
 
-  LuminosityBlockForOutput::~LuminosityBlockForOutput() {
-  }
+  LuminosityBlockForOutput::~LuminosityBlockForOutput() {}
 
-  LuminosityBlockPrincipal const&
-  LuminosityBlockForOutput::luminosityBlockPrincipal() const {
+  LuminosityBlockPrincipal const& LuminosityBlockForOutput::luminosityBlockPrincipal() const {
     return dynamic_cast<LuminosityBlockPrincipal const&>(principal());
   }
-  
+
   /**\return Reusable index which can be used to separate data for different simultaneous LuminosityBlocks.
    */
-  LuminosityBlockIndex LuminosityBlockForOutput::index() const {
-    return luminosityBlockPrincipal().index();
-  }
+  LuminosityBlockIndex LuminosityBlockForOutput::index() const { return luminosityBlockPrincipal().index(); }
 
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/LuminosityBlockPrincipal.cc b/FWCore/Framework/src/LuminosityBlockPrincipal.cc
index 589954cdcbe53..37f3fccf4620c 100644
--- a/FWCore/Framework/src/LuminosityBlockPrincipal.cc
+++ b/FWCore/Framework/src/LuminosityBlockPrincipal.cc
@@ -4,45 +4,33 @@
 
 namespace edm {
 
-  LuminosityBlockPrincipal::LuminosityBlockPrincipal(
-      std::shared_ptr<ProductRegistry const> reg,
-      ProcessConfiguration const& pc,
-      HistoryAppender* historyAppender,
-      unsigned int index,
-      bool isForPrimaryProcess) :
-    Base(reg, reg->productLookup(InLumi), pc, InLumi, historyAppender, isForPrimaryProcess),
+  LuminosityBlockPrincipal::LuminosityBlockPrincipal(std::shared_ptr<ProductRegistry const> reg,
+                                                     ProcessConfiguration const& pc,
+                                                     HistoryAppender* historyAppender,
+                                                     unsigned int index,
+                                                     bool isForPrimaryProcess)
+      : Base(reg, reg->productLookup(InLumi), pc, InLumi, historyAppender, isForPrimaryProcess),
         runPrincipal_(),
-        index_(index) {
-  }
+        index_(index) {}
 
-  void
-  LuminosityBlockPrincipal::fillLuminosityBlockPrincipal(
-      ProcessHistoryRegistry const& processHistoryRegistry,
-      DelayedReader* reader) {
+  void LuminosityBlockPrincipal::fillLuminosityBlockPrincipal(ProcessHistoryRegistry const& processHistoryRegistry,
+                                                              DelayedReader* reader) {
     fillPrincipal(aux_.processHistoryID(), processHistoryRegistry, reader);
 
-    for(auto& prod : *this) {
+    for (auto& prod : *this) {
       prod->setProcessHistory(processHistory());
     }
   }
 
-  void
-  LuminosityBlockPrincipal::put(
-        BranchDescription const& bd,
-        std::unique_ptr<WrapperBase> edp) const {
-    putOrMerge(bd,std::move(edp));
+  void LuminosityBlockPrincipal::put(BranchDescription const& bd, std::unique_ptr<WrapperBase> edp) const {
+    putOrMerge(bd, std::move(edp));
   }
 
-  void
-  LuminosityBlockPrincipal::put(ProductResolverIndex index,
-                                std::unique_ptr<WrapperBase> edp) const {
+  void LuminosityBlockPrincipal::put(ProductResolverIndex index, std::unique_ptr<WrapperBase> edp) const {
     auto phb = getProductResolverByIndex(index);
     phb->putOrMergeProduct(std::move(edp));
   }
 
-  unsigned int
-  LuminosityBlockPrincipal::transitionIndex_() const {
-    return index().value();
-  }
+  unsigned int LuminosityBlockPrincipal::transitionIndex_() const { return index().value(); }
 
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/LuminosityBlockProcessingStatus.cc b/FWCore/Framework/src/LuminosityBlockProcessingStatus.cc
index 99a4eaae45cf2..504f3c679cf69 100644
--- a/FWCore/Framework/src/LuminosityBlockProcessingStatus.cc
+++ b/FWCore/Framework/src/LuminosityBlockProcessingStatus.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     LuminosityBlockProcessingStatus
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -18,16 +18,17 @@
 
 namespace edm {
   void LuminosityBlockProcessingStatus::setEndTime() {
-    if(2 != endTimeSetStatus_) {
+    if (2 != endTimeSetStatus_) {
       //not already set
       char expected = 0;
-      if(endTimeSetStatus_.compare_exchange_strong(expected,1)) {
+      if (endTimeSetStatus_.compare_exchange_strong(expected, 1)) {
         lumiPrincipal_->setEndTime(endTime_);
         endTimeSetStatus_.store(2);
       } else {
         //wait until time is set
-        while( 2 != endTimeSetStatus_.load()) {}
+        while (2 != endTimeSetStatus_.load()) {
+        }
       }
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/LuminosityBlockProcessingStatus.h b/FWCore/Framework/src/LuminosityBlockProcessingStatus.h
index 5168134cbd334..ed0fc872a1abb 100644
--- a/FWCore/Framework/src/LuminosityBlockProcessingStatus.h
+++ b/FWCore/Framework/src/LuminosityBlockProcessingStatus.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     LuminosityBlockProcessingStatus
-// 
+//
 /**\class LuminosityBlockProcessingStatus LuminosityBlockProcessingStatus.h "LuminosityBlockProcessingStatus.h"
 
  Description: Keep status information about one LuminosityBlock transition
@@ -36,83 +36,77 @@ namespace edm {
   class LuminosityBlockProcessingStatus;
 #endif
 
-class LuminosityBlockProcessingStatus
-{
-
+  class LuminosityBlockProcessingStatus {
   public:
-  LuminosityBlockProcessingStatus(EventProcessor* iEP, unsigned int iNStreams, std::shared_ptr<void> iRunResource):
-  run_(std::move(iRunResource)) , eventProcessor_(iEP), nStreamsStillProcessingLumi_(iNStreams){}
-
-  std::shared_ptr<LuminosityBlockPrincipal>& lumiPrincipal() { return lumiPrincipal_;}
-
-  void setResumer( LimitedTaskQueue::Resumer iResumer ) {
-    globalLumiQueueResumer_ = std::move(iResumer);
-  }
-  void resumeGlobalLumiQueue() {
-    //free lumi for next usage
-    lumiPrincipal_.reset();
-    globalLumiQueueResumer_.resume();
-  }
-  
-  bool streamFinishedLumi() {
-    return 0 == (--nStreamsStillProcessingLumi_);
-  }
-  
-  bool wasEventProcessingStopped() const { return stopProcessingEvents_;}
-  void stopProcessingEvents() { stopProcessingEvents_ = true;}
-  void startProcessingEvents() { stopProcessingEvents_ = false;}
-  
-  bool isLumiEnding() const {return lumiEnding_;}
-  void endLumi() { lumiEnding_ = true;}
-  
-  bool continuingLumi() const { return continuingLumi_;}
-  void haveContinuedLumi() { continuingLumi_ = false; }
-  void needToContinueLumi() { continuingLumi_ = true;}
-
-  bool haveStartedNextLumi() const { return startedNextLumi_;}
-  void startNextLumi() { startedNextLumi_ = true;}
-  
-  bool didGlobalBeginSucceed() const {return globalBeginSucceeded_;}
-  void globalBeginDidSucceed() { globalBeginSucceeded_ = true;}
-
-  void noExceptionHappened() { cleaningUpAfterException_ = false; }
-  bool cleaningUpAfterException() const { return cleaningUpAfterException_;}
-
-  //These should only be called while in the InputSource's task queue
-  void updateLastTimestamp( edm::Timestamp const& iTime) {
-    if (iTime> endTime_) { endTime_ = iTime;}
-  }
-  edm::Timestamp const& lastTimestamp() const { return endTime_;}
-  
-  void setNextSyncValue(IOVSyncValue iValue) {
-    nextSyncValue_ = std::move(iValue);
-  }
-  
-  const IOVSyncValue nextSyncValue() const { return nextSyncValue_;}
-  
-  std::shared_ptr<void> const& runResource() const {return run_;}
-  
-  //Called once all events in Lumi have been processed
-  void setEndTime();
+    LuminosityBlockProcessingStatus(EventProcessor* iEP, unsigned int iNStreams, std::shared_ptr<void> iRunResource)
+        : run_(std::move(iRunResource)), eventProcessor_(iEP), nStreamsStillProcessingLumi_(iNStreams) {}
+
+    std::shared_ptr<LuminosityBlockPrincipal>& lumiPrincipal() { return lumiPrincipal_; }
+
+    void setResumer(LimitedTaskQueue::Resumer iResumer) { globalLumiQueueResumer_ = std::move(iResumer); }
+    void resumeGlobalLumiQueue() {
+      //free lumi for next usage
+      lumiPrincipal_.reset();
+      globalLumiQueueResumer_.resume();
+    }
+
+    bool streamFinishedLumi() { return 0 == (--nStreamsStillProcessingLumi_); }
+
+    bool wasEventProcessingStopped() const { return stopProcessingEvents_; }
+    void stopProcessingEvents() { stopProcessingEvents_ = true; }
+    void startProcessingEvents() { stopProcessingEvents_ = false; }
+
+    bool isLumiEnding() const { return lumiEnding_; }
+    void endLumi() { lumiEnding_ = true; }
+
+    bool continuingLumi() const { return continuingLumi_; }
+    void haveContinuedLumi() { continuingLumi_ = false; }
+    void needToContinueLumi() { continuingLumi_ = true; }
+
+    bool haveStartedNextLumi() const { return startedNextLumi_; }
+    void startNextLumi() { startedNextLumi_ = true; }
+
+    bool didGlobalBeginSucceed() const { return globalBeginSucceeded_; }
+    void globalBeginDidSucceed() { globalBeginSucceeded_ = true; }
+
+    void noExceptionHappened() { cleaningUpAfterException_ = false; }
+    bool cleaningUpAfterException() const { return cleaningUpAfterException_; }
+
+    //These should only be called while in the InputSource's task queue
+    void updateLastTimestamp(edm::Timestamp const& iTime) {
+      if (iTime > endTime_) {
+        endTime_ = iTime;
+      }
+    }
+    edm::Timestamp const& lastTimestamp() const { return endTime_; }
+
+    void setNextSyncValue(IOVSyncValue iValue) { nextSyncValue_ = std::move(iValue); }
+
+    const IOVSyncValue nextSyncValue() const { return nextSyncValue_; }
+
+    std::shared_ptr<void> const& runResource() const { return run_; }
+
+    //Called once all events in Lumi have been processed
+    void setEndTime();
+
   private:
-  // ---------- member data --------------------------------
-  std::shared_ptr<LuminosityBlockPrincipal> lumiPrincipal_;
-  std::shared_ptr<void> run_;
-  LimitedTaskQueue::Resumer globalLumiQueueResumer_;
-  EventProcessor* eventProcessor_ = nullptr;
-  IOVSyncValue nextSyncValue_;
-  std::atomic<unsigned int> nStreamsStillProcessingLumi_{0}; //read/write as streams finish lumi so must be atomic
-  edm::Timestamp endTime_{};
-  std::atomic<char> endTimeSetStatus_{0};
-  bool stopProcessingEvents_{false}; //read/write in m_sourceQueue OR from main thread when no tasks running
-  bool lumiEnding_{false}; //read/write in m_sourceQueue NOTE: This is a useful cache instead of recalculating each call
-  bool continuingLumi_{false}; //read/write in m_sourceQueue OR from main thread when no tasks running
-  bool startedNextLumi_{false}; //read/write in m_sourceQueue
-  bool globalBeginSucceeded_{false};
-  bool cleaningUpAfterException_{true};
-
-
-};
-}
+    // ---------- member data --------------------------------
+    std::shared_ptr<LuminosityBlockPrincipal> lumiPrincipal_;
+    std::shared_ptr<void> run_;
+    LimitedTaskQueue::Resumer globalLumiQueueResumer_;
+    EventProcessor* eventProcessor_ = nullptr;
+    IOVSyncValue nextSyncValue_;
+    std::atomic<unsigned int> nStreamsStillProcessingLumi_{0};  //read/write as streams finish lumi so must be atomic
+    edm::Timestamp endTime_{};
+    std::atomic<char> endTimeSetStatus_{0};
+    bool stopProcessingEvents_{false};  //read/write in m_sourceQueue OR from main thread when no tasks running
+    bool lumiEnding_{
+        false};  //read/write in m_sourceQueue NOTE: This is a useful cache instead of recalculating each call
+    bool continuingLumi_{false};   //read/write in m_sourceQueue OR from main thread when no tasks running
+    bool startedNextLumi_{false};  //read/write in m_sourceQueue
+    bool globalBeginSucceeded_{false};
+    bool cleaningUpAfterException_{true};
+  };
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/MakeDataException.cc b/FWCore/Framework/src/MakeDataException.cc
index d24e29d2d27b0..ee5eb4819e38d 100644
--- a/FWCore/Framework/src/MakeDataException.cc
+++ b/FWCore/Framework/src/MakeDataException.cc
@@ -2,27 +2,19 @@
 
 // forward declarations
 namespace edm {
-   namespace eventsetup {
+  namespace eventsetup {
 
-MakeDataException::MakeDataException( const EventSetupRecordKey& iRecordKey, const DataKey& iDataKey) : 
-cms::Exception("MakeDataException"),
-message_(standardMessage(iRecordKey,iDataKey))
-{
-  this->append(myMessage());
-}
+    MakeDataException::MakeDataException(const EventSetupRecordKey& iRecordKey, const DataKey& iDataKey)
+        : cms::Exception("MakeDataException"), message_(standardMessage(iRecordKey, iDataKey)) {
+      this->append(myMessage());
+    }
 
-      // ---------- static member functions --------------------
-std::string MakeDataException::standardMessage( const EventSetupRecordKey& iRecordKey, const DataKey& iDataKey) 
-{
- std::string returnValue = std::string("Error while making data \"") 
-   + iDataKey.type().name()
-   + "\" \""
-   + iDataKey.name().value()
-   + "\" in Record "
-   + iRecordKey.type().name();
-   return returnValue;
-}
-   
+    // ---------- static member functions --------------------
+    std::string MakeDataException::standardMessage(const EventSetupRecordKey& iRecordKey, const DataKey& iDataKey) {
+      std::string returnValue = std::string("Error while making data \"") + iDataKey.type().name() + "\" \"" +
+                                iDataKey.name().value() + "\" in Record " + iRecordKey.type().name();
+      return returnValue;
+    }
 
-   }
-}
+  }  // namespace eventsetup
+}  // namespace edm
diff --git a/FWCore/Framework/src/MakeModuleHelper.h b/FWCore/Framework/src/MakeModuleHelper.h
index f3d4dc0f9b89b..af44a9bff53e4 100644
--- a/FWCore/Framework/src/MakeModuleHelper.h
+++ b/FWCore/Framework/src/MakeModuleHelper.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     MakeModuleHelper
-// 
+//
 /**\class edm::MakeModuleHelper MakeModuleHelper.h "MakeModuleHelper.h"
 
  Description: A template class which can be specialized to create a module from a user type
@@ -26,23 +26,20 @@
 namespace edm {
   class ParameterSet;
 
-  template<typename Base>
-  class MakeModuleHelper
-  {
-    
+  template <typename Base>
+  class MakeModuleHelper {
   public:
     MakeModuleHelper() = delete;
-    MakeModuleHelper(const MakeModuleHelper&) = delete; // stop default
-    
-    const MakeModuleHelper& operator=(const MakeModuleHelper&) = delete; // stop default
+    MakeModuleHelper(const MakeModuleHelper&) = delete;  // stop default
+
+    const MakeModuleHelper& operator=(const MakeModuleHelper&) = delete;  // stop default
 
-    template<typename T>
+    template <typename T>
     static std::unique_ptr<Base> makeModule(ParameterSet const& pset) {
       auto module = std::make_unique<T>(pset);
       return std::unique_ptr<Base>(module.release());
     }
   };
-}
-
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/MakeModuleParams.h b/FWCore/Framework/src/MakeModuleParams.h
index e9e59331457aa..ee28917289d72 100644
--- a/FWCore/Framework/src/MakeModuleParams.h
+++ b/FWCore/Framework/src/MakeModuleParams.h
@@ -19,24 +19,19 @@ namespace edm {
   class PreallocationConfiguration;
 
   struct MakeModuleParams {
-    MakeModuleParams() :
-      pset_(nullptr), reg_(nullptr), preallocate_(nullptr), processConfiguration_()
-      {}
+    MakeModuleParams() : pset_(nullptr), reg_(nullptr), preallocate_(nullptr), processConfiguration_() {}
 
     MakeModuleParams(ParameterSet* pset,
                      ProductRegistry& reg,
                      PreallocationConfiguration const* prealloc,
-                     std::shared_ptr<ProcessConfiguration const> processConfiguration) :
-      pset_(pset),
-      reg_(&reg),
-      preallocate_(prealloc),
-      processConfiguration_(processConfiguration) {}
+                     std::shared_ptr<ProcessConfiguration const> processConfiguration)
+        : pset_(pset), reg_(&reg), preallocate_(prealloc), processConfiguration_(processConfiguration) {}
 
     ParameterSet* pset_;
     ProductRegistry* reg_;
     PreallocationConfiguration const* preallocate_;
     std::shared_ptr<ProcessConfiguration const> processConfiguration_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/MergeableRunProductMetadata.cc b/FWCore/Framework/src/MergeableRunProductMetadata.cc
index 8eb63f804d737..910b7547055de 100644
--- a/FWCore/Framework/src/MergeableRunProductMetadata.cc
+++ b/FWCore/Framework/src/MergeableRunProductMetadata.cc
@@ -11,39 +11,29 @@
 
 namespace edm {
 
-  MergeableRunProductMetadata::
-  MergeableRunProductMetadata(MergeableRunProductProcesses const& mergeableRunProductProcesses) :
-    mergeableRunProductProcesses_(&mergeableRunProductProcesses),
-    metadataForProcesses_(mergeableRunProductProcesses.size()) {
-  }
+  MergeableRunProductMetadata::MergeableRunProductMetadata(
+      MergeableRunProductProcesses const& mergeableRunProductProcesses)
+      : mergeableRunProductProcesses_(&mergeableRunProductProcesses),
+        metadataForProcesses_(mergeableRunProductProcesses.size()) {}
 
-  MergeableRunProductMetadata::~MergeableRunProductMetadata() {
-  }
+  MergeableRunProductMetadata::~MergeableRunProductMetadata() {}
 
-  void MergeableRunProductMetadata::preReadFile() {
-    mergeLumisFromIndexIntoFile();
-  }
+  void MergeableRunProductMetadata::preReadFile() { mergeLumisFromIndexIntoFile(); }
 
   void MergeableRunProductMetadata::readRun(
-    long long inputRunEntry,
-    StoredMergeableRunProductMetadata const& inputStoredMergeableRunProductMetadata,
-    IndexIntoFileItrHolder const& inputIndexIntoFileItr) {
-
-    unsigned int processIndex {0};
-    for (auto & metadataForProcess : metadataForProcesses_) {
-
+      long long inputRunEntry,
+      StoredMergeableRunProductMetadata const& inputStoredMergeableRunProductMetadata,
+      IndexIntoFileItrHolder const& inputIndexIntoFileItr) {
+    unsigned int processIndex{0};
+    for (auto& metadataForProcess : metadataForProcesses_) {
       bool valid = true;
       std::vector<LuminosityBlockNumber_t>::const_iterator lumisInRunBeingReadBegin;
       std::vector<LuminosityBlockNumber_t>::const_iterator lumisInRunBeingReadEnd;
 
       std::string const& processName = mergeableRunProductProcesses_->processesWithMergeableRunProducts()[processIndex];
 
-      if (inputStoredMergeableRunProductMetadata.getLumiContent(inputRunEntry,
-                                                                processName,
-                                                                valid,
-                                                                lumisInRunBeingReadBegin,
-                                                                lumisInRunBeingReadEnd)) {
-
+      if (inputStoredMergeableRunProductMetadata.getLumiContent(
+              inputRunEntry, processName, valid, lumisInRunBeingReadBegin, lumisInRunBeingReadEnd)) {
         // This is a reference to the container accumulating the luminosity
         // block numbers for the run entries read associated with the current
         // run being processed that correspond to the luminosity block content
@@ -62,7 +52,7 @@ namespace edm {
         std::vector<LuminosityBlockNumber_t>::const_iterator end1 = lumis.end();
         std::vector<LuminosityBlockNumber_t>::const_iterator end2 = lumisInRunBeingReadEnd;
         for (std::vector<LuminosityBlockNumber_t>::const_iterator iter1 = lumis.begin(),
-             iter2 = lumisInRunBeingReadBegin;
+                                                                  iter2 = lumisInRunBeingReadBegin;
              iter1 != end1 || iter2 != end2;) {
           if (iter1 == end1) {
             temp.push_back(*iter2);
@@ -111,7 +101,6 @@ namespace edm {
         }
 
       } else {
-
         metadataForProcess.setMergeDecision(MERGE);
         if (!valid) {
           metadataForProcess.setValid(false);
@@ -123,11 +112,10 @@ namespace edm {
         }
       }
       ++processIndex;
-    } // end of loop over processes
-  } // end of readRun function
+    }  // end of loop over processes
+  }    // end of readRun function
 
   void MergeableRunProductMetadata::writeLumi(LuminosityBlockNumber_t lumi) {
-
     if (metadataForProcesses_.empty()) {
       return;
     }
@@ -135,7 +123,6 @@ namespace edm {
   }
 
   void MergeableRunProductMetadata::preWriteRun() {
-
     if (metadataForProcesses_.empty()) {
       return;
     }
@@ -157,28 +144,22 @@ namespace edm {
     std::sort(lumisProcessed.begin(), lumisProcessed.end());
     auto uniqueEnd = std::unique(lumisProcessed.begin(), lumisProcessed.end());
 
-    for (auto & metadataForProcess : metadataForProcesses_) {
-
+    for (auto& metadataForProcess : metadataForProcesses_) {
       // Did we process all the lumis in this process that were processed
       // in the process that created the mergeable run products.
-      metadataForProcess.setAllLumisProcessed(
-        std::includes(lumisProcessed.begin(), uniqueEnd,
-                      metadataForProcess.lumis().begin(),
-                      metadataForProcess.lumis().end()));
+      metadataForProcess.setAllLumisProcessed(std::includes(
+          lumisProcessed.begin(), uniqueEnd, metadataForProcess.lumis().begin(), metadataForProcess.lumis().end()));
     }
   }
 
   void MergeableRunProductMetadata::postWriteRun() {
-
     lumisProcessed_.clear();
-    for (auto & metadataForProcess : metadataForProcesses_) {
+    for (auto& metadataForProcess : metadataForProcesses_) {
       metadataForProcess.reset();
     }
   }
 
-  void MergeableRunProductMetadata::
-  addEntryToStoredMetadata(StoredMergeableRunProductMetadata& storedMetadata) const {
-
+  void MergeableRunProductMetadata::addEntryToStoredMetadata(StoredMergeableRunProductMetadata& storedMetadata) const {
     if (metadataForProcesses_.empty()) {
       return;
     }
@@ -191,14 +172,10 @@ namespace edm {
     unsigned long long beginProcess = storedMetadata.singleRunEntryAndProcesses().size();
     unsigned long long endProcess = beginProcess;
 
-
     std::vector<std::string> const& processesWithMergeableRunProducts =
-      mergeableRunProductProcesses_->processesWithMergeableRunProducts();
-
-    for (unsigned int storedProcessIndex = 0;
-         storedProcessIndex < storedProcesses.size();
-         ++storedProcessIndex) {
+        mergeableRunProductProcesses_->processesWithMergeableRunProducts();
 
+    for (unsigned int storedProcessIndex = 0; storedProcessIndex < storedProcesses.size(); ++storedProcessIndex) {
       // Look for a matching process. It is intentional that no process
       // is added when there is no match. storedProcesses only contains
       // processes which created mergeable run products selected by the
@@ -207,16 +184,12 @@ namespace edm {
       // read from the input data files. Note storedProcesses may be
       // missing processes because the output module dropped products.
       // The other vector may be missing processes because of SubProcesses.
-      for (unsigned int transientProcessIndex = 0;
-           transientProcessIndex < processesWithMergeableRunProducts.size();
+      for (unsigned int transientProcessIndex = 0; transientProcessIndex < processesWithMergeableRunProducts.size();
            ++transientProcessIndex) {
-
         // This string comparison could be optimized away by storing an index mapping in
         // OutputModuleBase calculated once early in a job. (? Given how rare
         // mergeable run products are this optimization may not be worth doing)
-        if (processesWithMergeableRunProducts[transientProcessIndex] ==
-            storedProcesses[storedProcessIndex]) {
-
+        if (processesWithMergeableRunProducts[transientProcessIndex] == storedProcesses[storedProcessIndex]) {
           if (addProcess(storedMetadata,
                          metadataForProcesses_.at(transientProcessIndex),
                          storedProcessIndex,
@@ -231,15 +204,12 @@ namespace edm {
     storedMetadata.singleRunEntries().emplace_back(beginProcess, endProcess);
   }
 
-  bool MergeableRunProductMetadata::
-  addProcess(StoredMergeableRunProductMetadata& storedMetadata,
-             MetadataForProcess const& metadataForProcess,
-             unsigned int storedProcessIndex,
-             unsigned long long beginProcess,
-             unsigned long long endProcess) const {
-
-    if (metadataForProcess.valid() &&
-        metadataForProcess.allLumisProcessed()) {
+  bool MergeableRunProductMetadata::addProcess(StoredMergeableRunProductMetadata& storedMetadata,
+                                               MetadataForProcess const& metadataForProcess,
+                                               unsigned int storedProcessIndex,
+                                               unsigned long long beginProcess,
+                                               unsigned long long endProcess) const {
+    if (metadataForProcess.valid() && metadataForProcess.allLumisProcessed()) {
       return false;
     }
 
@@ -262,15 +232,12 @@ namespace edm {
       // the only thing that can happen is more lumi numbers appear
       // at steps where a run was only partially processed.
       bool found = false;
-      for (unsigned long long kProcess = beginProcess;
-           kProcess < endProcess;
-           ++kProcess) {
+      for (unsigned long long kProcess = beginProcess; kProcess < endProcess; ++kProcess) {
         StoredMergeableRunProductMetadata::SingleRunEntryAndProcess const& storedSingleRunEntryAndProcess =
-          storedMetadata.singleRunEntryAndProcesses().at(kProcess);
+            storedMetadata.singleRunEntryAndProcesses().at(kProcess);
 
         if (metadataForProcess.lumis().size() ==
             (storedSingleRunEntryAndProcess.endLumi() - storedSingleRunEntryAndProcess.beginLumi())) {
-
           iBeginLumi = storedSingleRunEntryAndProcess.beginLumi();
           iEndLumi = storedSingleRunEntryAndProcess.endLumi();
           found = true;
@@ -281,35 +248,28 @@ namespace edm {
         std::vector<LuminosityBlockNumber_t>& storedLumis = storedMetadata.lumis();
         std::vector<LuminosityBlockNumber_t> const& metdataLumis = metadataForProcess.lumis();
         iBeginLumi = storedLumis.size();
-        storedLumis.insert( storedLumis.end(), metdataLumis.begin(), metdataLumis.end() );
+        storedLumis.insert(storedLumis.end(), metdataLumis.begin(), metdataLumis.end());
         iEndLumi = storedLumis.size();
       }
     }
-    storedMetadata.singleRunEntryAndProcesses().emplace_back(iBeginLumi,
-                                                             iEndLumi,
-                                                             storedProcessIndex,
-                                                             metadataForProcess.valid(),
-                                                             metadataForProcess.allLumisProcessed());
+    storedMetadata.singleRunEntryAndProcesses().emplace_back(
+        iBeginLumi, iEndLumi, storedProcessIndex, metadataForProcess.valid(), metadataForProcess.allLumisProcessed());
     return true;
   }
 
-  MergeableRunProductMetadata::MergeDecision
-  MergeableRunProductMetadata::getMergeDecision(std::string const& processThatCreatedProduct) const {
-
+  MergeableRunProductMetadata::MergeDecision MergeableRunProductMetadata::getMergeDecision(
+      std::string const& processThatCreatedProduct) const {
     MetadataForProcess const* metadataForProcess = metadataForOneProcess(processThatCreatedProduct);
     if (metadataForProcess) {
       return metadataForProcess->mergeDecision();
     }
-    throw Exception(errors::LogicError)
-      << "MergeableRunProductMetadata::getMergeDecision could not find process.\n"
-      << "It should not be possible for this error to occur.\n"
-      << "Contact a Framework developer\n";
+    throw Exception(errors::LogicError) << "MergeableRunProductMetadata::getMergeDecision could not find process.\n"
+                                        << "It should not be possible for this error to occur.\n"
+                                        << "Contact a Framework developer\n";
     return MERGE;
   }
 
-  bool
-  MergeableRunProductMetadata::knownImproperlyMerged(std::string const& processThatCreatedProduct) const {
-
+  bool MergeableRunProductMetadata::knownImproperlyMerged(std::string const& processThatCreatedProduct) const {
     MetadataForProcess const* metadataForProcess = metadataForOneProcess(processThatCreatedProduct);
     if (metadataForProcess) {
       return !metadataForProcess->valid();
@@ -325,8 +285,8 @@ namespace edm {
     allLumisProcessed_ = false;
   }
 
-  MergeableRunProductMetadata::MetadataForProcess const*
-  MergeableRunProductMetadata::metadataForOneProcess(std::string const& processName) const {
+  MergeableRunProductMetadata::MetadataForProcess const* MergeableRunProductMetadata::metadataForOneProcess(
+      std::string const& processName) const {
     unsigned int processIndex = 0;
     for (auto const& metadataForProcess : metadataForProcesses_) {
       // This string comparison could be optimized away by storing an index in
@@ -340,8 +300,7 @@ namespace edm {
   }
 
   void MergeableRunProductMetadata::mergeLumisFromIndexIntoFile() {
-
-    for (auto & metadataForProcess : metadataForProcesses_) {
+    for (auto& metadataForProcess : metadataForProcesses_) {
       if (metadataForProcess.useIndexIntoFile()) {
         metadataForProcess.setUseIndexIntoFile(false);
 
@@ -350,7 +309,7 @@ namespace edm {
         std::vector<LuminosityBlockNumber_t>::const_iterator end1 = metadataForProcess.lumis().end();
         std::vector<LuminosityBlockNumber_t>::const_iterator end2 = lumisFromIndexIntoFile_.end();
         for (std::vector<LuminosityBlockNumber_t>::const_iterator iter1 = metadataForProcess.lumis().begin(),
-             iter2 = lumisFromIndexIntoFile_.begin();
+                                                                  iter2 = lumisFromIndexIntoFile_.begin();
              iter1 != end1 || iter2 != end2;) {
           if (iter1 == end1) {
             temp.push_back(*iter2);
@@ -379,4 +338,4 @@ namespace edm {
     lumisFromIndexIntoFile_.clear();
     gotLumisFromIndexIntoFile_ = false;
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/MergeableRunProductProcesses.cc b/FWCore/Framework/src/MergeableRunProductProcesses.cc
index e4385b10e77c4..7811e4223bc3e 100644
--- a/FWCore/Framework/src/MergeableRunProductProcesses.cc
+++ b/FWCore/Framework/src/MergeableRunProductProcesses.cc
@@ -13,7 +13,7 @@
 
 namespace edm {
 
-  MergeableRunProductProcesses::MergeableRunProductProcesses() { }
+  MergeableRunProductProcesses::MergeableRunProductProcesses() {}
 
   void MergeableRunProductProcesses::setProcessesWithMergeableRunProducts(ProductRegistry const& productRegistry) {
     TClass* wrapperBaseTClass = TypeWithDict::byName("edm::WrapperBase").getClass();
@@ -32,4 +32,4 @@ namespace edm {
     }
     processesWithMergeableRunProducts_.assign(processSet.begin(), processSet.end());
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/MessageForParent.h b/FWCore/Framework/src/MessageForParent.h
index 72d8e49129c14..bd6233553fe8c 100644
--- a/FWCore/Framework/src/MessageForParent.h
+++ b/FWCore/Framework/src/MessageForParent.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     MessageForParent
-// 
+//
 /**\class MessageForSource MessageForParent.h FWCore/Framework/interface/MessageForParent.h
 
  Description: Information passed from parent to source when doing multicore processing
@@ -27,35 +27,30 @@
 // forward declarations
 
 namespace edm {
-   namespace multicore {
-      class MessageForParent
-      {
-      public:
-         MessageForParent(): m_dummy(0) {}
-         
-         //virtual ~MessageForSource();
-         
-         // ---------- const member functions ---------------------
-         
-         // ---------- static member functions --------------------
-         static size_t sizeForBuffer() {
-           return sizeof(MessageForParent);
-         }
-
-      public:
-         // ---------- member functions ---------------------------
-         
-
-         //MessageForSource(const MessageForSource&); // allow default
-         
-         //const MessageForSource& operator=(const MessageForSource&); // allow default
-         
-         // ---------- member data --------------------------------
-         int m_dummy;
-
-      };
-
-   }
-}
+  namespace multicore {
+    class MessageForParent {
+    public:
+      MessageForParent() : m_dummy(0) {}
+
+      //virtual ~MessageForSource();
+
+      // ---------- const member functions ---------------------
+
+      // ---------- static member functions --------------------
+      static size_t sizeForBuffer() { return sizeof(MessageForParent); }
+
+    public:
+      // ---------- member functions ---------------------------
+
+      //MessageForSource(const MessageForSource&); // allow default
+
+      //const MessageForSource& operator=(const MessageForSource&); // allow default
+
+      // ---------- member data --------------------------------
+      int m_dummy;
+    };
+
+  }  // namespace multicore
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/MessageForSource.h b/FWCore/Framework/src/MessageForSource.h
index f46fea0b52366..0cc3f61eaeb25 100644
--- a/FWCore/Framework/src/MessageForSource.h
+++ b/FWCore/Framework/src/MessageForSource.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     MessageForSource
-// 
+//
 /**\class MessageForSource MessageForSource.h FWCore/Framework/interface/MessageForSource.h
 
  Description: Information passed from controller to source when doing multicore processing
@@ -31,37 +31,30 @@
 // forward declarations
 
 namespace edm {
-   namespace multicore {
-      class MessageForSource
-      {
-         
-      public:
-         MessageForSource():
-          startIndex(0),
-          nIndices(0) {}
-         
-         //virtual ~MessageForSource();
-         
-         // ---------- const member functions ---------------------
-         
-         // ---------- static member functions --------------------
-         static size_t sizeForBuffer() {
-            return sizeof(MessageForSource);
-         }
-         
-         // ---------- member functions ---------------------------
-         
-      public:
-         //MessageForSource(const MessageForSource&); // allow default
-         
-         //const MessageForSource& operator=(const MessageForSource&); // allow default
-         
-         // ---------- member data --------------------------------
-         unsigned long startIndex; //which event index to start processing for this 'block'
-         unsigned long nIndices; //number of consecutive indicies in the block
+  namespace multicore {
+    class MessageForSource {
+    public:
+      MessageForSource() : startIndex(0), nIndices(0) {}
+
+      //virtual ~MessageForSource();
+
+      // ---------- const member functions ---------------------
+
+      // ---------- static member functions --------------------
+      static size_t sizeForBuffer() { return sizeof(MessageForSource); }
+
+      // ---------- member functions ---------------------------
+
+    public:
+      //MessageForSource(const MessageForSource&); // allow default
+
+      //const MessageForSource& operator=(const MessageForSource&); // allow default
 
-      };
-   }
-}
+      // ---------- member data --------------------------------
+      unsigned long startIndex;  //which event index to start processing for this 'block'
+      unsigned long nIndices;    //number of consecutive indicies in the block
+    };
+  }  // namespace multicore
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/ModuleChanger.cc b/FWCore/Framework/src/ModuleChanger.cc
index 510dc83ec8738..104a3f31da0cc 100644
--- a/FWCore/Framework/src/ModuleChanger.cc
+++ b/FWCore/Framework/src/ModuleChanger.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     ModuleChanger
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -28,20 +28,17 @@ using namespace edm;
 //
 // constructors and destructor
 //
-ModuleChanger::ModuleChanger(Schedule* iSchedule, ProductRegistry const* iRegistry):
-schedule_(iSchedule),
-registry_(iRegistry)
-{
-}
+ModuleChanger::ModuleChanger(Schedule* iSchedule,
+                             ProductRegistry const* iRegistry,
+                             eventsetup::ESRecordsToProxyIndices iIndices)
+    : schedule_(iSchedule), registry_(iRegistry), indices_(std::move(iIndices)) {}
 
 // ModuleChanger::ModuleChanger(const ModuleChanger& rhs)
 // {
 //    // do actual copying here;
 // }
 
-ModuleChanger::~ModuleChanger()
-{
-}
+ModuleChanger::~ModuleChanger() {}
 
 //
 // assignment operators
@@ -59,11 +56,8 @@ ModuleChanger::~ModuleChanger()
 // member functions
 //
 
-bool 
-ModuleChanger::changeModule(const std::string& iLabel,
-                            const ParameterSet& iPSet)
-{
-   return schedule_->changeModule(iLabel,iPSet, *registry_);
+bool ModuleChanger::changeModule(const std::string& iLabel, const ParameterSet& iPSet) {
+  return schedule_->changeModule(iLabel, iPSet, *registry_, indices_);
 }
 
 //
diff --git a/FWCore/Framework/src/ModuleFactory.cc b/FWCore/Framework/src/ModuleFactory.cc
index fe82b68d834c3..9f9505f05f6c4 100644
--- a/FWCore/Framework/src/ModuleFactory.cc
+++ b/FWCore/Framework/src/ModuleFactory.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     ModuleFactory
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -21,36 +21,34 @@
 // constants, enums and typedefs
 //
 namespace edm {
-   namespace eventsetup {
+  namespace eventsetup {
 
-//
-// static member functions
-//
-      std::string ModuleMakerTraits::name() { return "CMS EDM Framework ESModule"; }
-      void ModuleMakerTraits::addTo(EventSetupProvider& iProvider,
-                                    std::shared_ptr<DataProxyProvider> iComponent,
-                                    ParameterSet const&,
-                                    bool) 
-      {
-         iProvider.add(iComponent);
-      }
+    //
+    // static member functions
+    //
+    std::string ModuleMakerTraits::name() { return "CMS EDM Framework ESModule"; }
+    void ModuleMakerTraits::addTo(EventSetupProvider& iProvider,
+                                  std::shared_ptr<DataProxyProvider> iComponent,
+                                  ParameterSet const&,
+                                  bool) {
+      iProvider.add(iComponent);
+    }
 
-      void ModuleMakerTraits::replaceExisting(EventSetupProvider& iProvider, std::shared_ptr<DataProxyProvider> iComponent) 
-      {
-         iProvider.replaceExisting(iComponent);
-      }
+    void ModuleMakerTraits::replaceExisting(EventSetupProvider& iProvider,
+                                            std::shared_ptr<DataProxyProvider> iComponent) {
+      iProvider.replaceExisting(iComponent);
+    }
 
-      std::shared_ptr<ModuleMakerTraits::base_type>
-      ModuleMakerTraits::getComponentAndRegisterProcess(EventSetupsController& esController,
-                                                        ParameterSet const& iConfiguration) {
-         return esController.getESProducerAndRegisterProcess(iConfiguration, esController.indexOfNextProcess());
-      }
+    std::shared_ptr<ModuleMakerTraits::base_type> ModuleMakerTraits::getComponentAndRegisterProcess(
+        EventSetupsController& esController, ParameterSet const& iConfiguration) {
+      return esController.getESProducerAndRegisterProcess(iConfiguration, esController.indexOfNextProcess());
+    }
 
-      void ModuleMakerTraits::putComponent(EventSetupsController& esController,
-                                           ParameterSet const& iConfiguration,
-                                           std::shared_ptr<base_type> const& component) {
-         esController.putESProducer(iConfiguration, component, esController.indexOfNextProcess());
-      }
-   }
-}
+    void ModuleMakerTraits::putComponent(EventSetupsController& esController,
+                                         ParameterSet const& iConfiguration,
+                                         std::shared_ptr<base_type> const& component) {
+      esController.putESProducer(iConfiguration, component, esController.indexOfNextProcess());
+    }
+  }  // namespace eventsetup
+}  // namespace edm
 COMPONENTFACTORY_GET(edm::eventsetup::ModuleMakerTraits);
diff --git a/FWCore/Framework/src/ModuleHolder.cc b/FWCore/Framework/src/ModuleHolder.cc
index 5b1b3d5e19a7e..22f25d038faeb 100644
--- a/FWCore/Framework/src/ModuleHolder.cc
+++ b/FWCore/Framework/src/ModuleHolder.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     ModuleHolder
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -16,12 +16,10 @@
 #include "FWCore/Framework/src/ModuleHolder.h"
 #include "FWCore/Framework/src/WorkerMaker.h"
 
-
 namespace edm {
   namespace maker {
-    std::unique_ptr<Worker>
-    ModuleHolder::makeWorker(ExceptionToActionTable const* iActions) const {
-      return m_maker->makeWorker(iActions,this);
+    std::unique_ptr<Worker> ModuleHolder::makeWorker(ExceptionToActionTable const* iActions) const {
+      return m_maker->makeWorker(iActions, this);
     }
-  }
-}
\ No newline at end of file
+  }  // namespace maker
+}  // namespace edm
\ No newline at end of file
diff --git a/FWCore/Framework/src/ModuleHolder.h b/FWCore/Framework/src/ModuleHolder.h
index 0c565ad31265c..9aead896b929b 100644
--- a/FWCore/Framework/src/ModuleHolder.h
+++ b/FWCore/Framework/src/ModuleHolder.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     ModuleHolder
-// 
+//
 /**\class edm::maker::ModuleHolder ModuleHolder.h "FWCore/Framework/src/ModuleHolder.h"
 
  Description: Base class used to own a module for the framework
@@ -36,56 +36,49 @@ namespace edm {
   namespace maker {
     class ModuleHolder {
     public:
-      ModuleHolder(Maker const* iMaker):
-      m_maker(iMaker){}
+      ModuleHolder(Maker const* iMaker) : m_maker(iMaker) {}
       virtual ~ModuleHolder() {}
       std::unique_ptr<Worker> makeWorker(ExceptionToActionTable const* actions) const;
-      
+
       virtual ModuleDescription const& moduleDescription() const = 0;
       virtual void setModuleDescription(ModuleDescription const& iDesc) = 0;
-      virtual void preallocate(PreallocationConfiguration const& ) = 0;
-      virtual void registerProductsAndCallbacks(ProductRegistry*)=0;
+      virtual void preallocate(PreallocationConfiguration const&) = 0;
+      virtual void registerProductsAndCallbacks(ProductRegistry*) = 0;
       virtual void replaceModuleFor(Worker*) const = 0;
 
       virtual std::unique_ptr<OutputModuleCommunicator> createOutputModuleCommunicator() = 0;
+
     protected:
       Maker const* m_maker;
     };
-    
-    template<typename T>
+
+    template <typename T>
     class ModuleHolderT : public ModuleHolder {
     public:
-      ModuleHolderT(std::shared_ptr<T> iModule, Maker const* iMaker) :ModuleHolder(iMaker), m_mod(iModule) {}
+      ModuleHolderT(std::shared_ptr<T> iModule, Maker const* iMaker) : ModuleHolder(iMaker), m_mod(iModule) {}
       ~ModuleHolderT() override {}
       std::shared_ptr<T> module() const { return m_mod; }
       void replaceModuleFor(Worker* iWorker) const override {
         auto w = dynamic_cast<WorkerT<T>*>(iWorker);
-        assert(nullptr!=w);
+        assert(nullptr != w);
         w->setModule(m_mod);
       }
-      ModuleDescription const& moduleDescription() const override {
-        return m_mod->moduleDescription();
-      }
-      void setModuleDescription(ModuleDescription const& iDesc) override {
-        m_mod->setModuleDescription(iDesc);
-      }
-      void preallocate(PreallocationConfiguration const& iPrealloc) override {
-        m_mod->doPreallocate(iPrealloc);
-      }
+      ModuleDescription const& moduleDescription() const override { return m_mod->moduleDescription(); }
+      void setModuleDescription(ModuleDescription const& iDesc) override { m_mod->setModuleDescription(iDesc); }
+      void preallocate(PreallocationConfiguration const& iPrealloc) override { m_mod->doPreallocate(iPrealloc); }
 
       void registerProductsAndCallbacks(ProductRegistry* iReg) override {
-        m_mod->registerProductsAndCallbacks(module().get(),iReg);
+        m_mod->registerProductsAndCallbacks(module().get(), iReg);
       }
-      
-      std::unique_ptr<OutputModuleCommunicator>
-      createOutputModuleCommunicator() override {
+
+      std::unique_ptr<OutputModuleCommunicator> createOutputModuleCommunicator() override {
         return std::move(OutputModuleCommunicatorT<T>::createIfNeeded(m_mod.get()));
       }
+
     private:
       std::shared_ptr<T> m_mod;
-
     };
-  }
-}
+  }  // namespace maker
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/ModuleRegistry.cc b/FWCore/Framework/src/ModuleRegistry.cc
index 62f31bda510a5..289cd55ff0235 100644
--- a/FWCore/Framework/src/ModuleRegistry.cc
+++ b/FWCore/Framework/src/ModuleRegistry.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::ModuleRegistry
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -16,36 +16,32 @@
 #include "FWCore/Framework/src/ModuleRegistry.h"
 #include "FWCore/Framework/src/Factory.h"
 
-
 namespace edm {
-  std::shared_ptr<maker::ModuleHolder>
-  ModuleRegistry::getModule(MakeModuleParams const& p,
-                            std::string const& moduleLabel,
-                            signalslot::Signal<void(ModuleDescription const&)>& iPre,
-                            signalslot::Signal<void(ModuleDescription const&)>& iPost) {
+  std::shared_ptr<maker::ModuleHolder> ModuleRegistry::getModule(
+      MakeModuleParams const& p,
+      std::string const& moduleLabel,
+      signalslot::Signal<void(ModuleDescription const&)>& iPre,
+      signalslot::Signal<void(ModuleDescription const&)>& iPost) {
     auto modItr = labelToModule_.find(moduleLabel);
-    if(modItr == labelToModule_.end()) {
-      auto modPtr=
-      Factory::get()->makeModule(p,iPre,iPost);
-      
+    if (modItr == labelToModule_.end()) {
+      auto modPtr = Factory::get()->makeModule(p, iPre, iPost);
+
       // Transfer ownership of worker to the registry
       labelToModule_[moduleLabel] = modPtr;
       return modPtr;
     }
     return get_underlying_safe(modItr->second);
   }
-  
-  maker::ModuleHolder*
-  ModuleRegistry::replaceModule(std::string const& iModuleLabel,
-                                edm::ParameterSet const& iPSet,
-                                edm::PreallocationConfiguration const& iPrealloc) {
+
+  maker::ModuleHolder* ModuleRegistry::replaceModule(std::string const& iModuleLabel,
+                                                     edm::ParameterSet const& iPSet,
+                                                     edm::PreallocationConfiguration const& iPrealloc) {
     auto modItr = labelToModule_.find(iModuleLabel);
     if (modItr == labelToModule_.end()) {
       return nullptr;
     }
-    
-    auto modPtr=
-    Factory::get()->makeReplacementModule(iPSet);
+
+    auto modPtr = Factory::get()->makeReplacementModule(iPSet);
     modPtr->setModuleDescription(modItr->second->moduleDescription());
     modPtr->preallocate(iPrealloc);
 
@@ -53,4 +49,4 @@ namespace edm {
     modItr->second = modPtr;
     return modItr->second.get();
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/ModuleRegistry.h b/FWCore/Framework/src/ModuleRegistry.h
index 5d2512bde2c54..2f9aa80d3bf29 100644
--- a/FWCore/Framework/src/ModuleRegistry.h
+++ b/FWCore/Framework/src/ModuleRegistry.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     ModuleRegistry
-// 
+//
 /**\class edm::ModuleRegistry ModuleRegistry.h "FWCore/Framework/src/ModuleRegistry.h"
 
  Description: Constructs and owns framework modules
@@ -36,30 +36,29 @@ namespace edm {
   namespace maker {
     class ModuleHolder;
   }
-  
-  class ModuleRegistry
-  {
+
+  class ModuleRegistry {
   public:
     std::shared_ptr<maker::ModuleHolder> getModule(MakeModuleParams const& p,
                                                    std::string const& moduleLabel,
                                                    signalslot::Signal<void(ModuleDescription const&)>& iPre,
                                                    signalslot::Signal<void(ModuleDescription const&)>& iPost);
-    
+
     maker::ModuleHolder* replaceModule(std::string const& iModuleLabel,
                                        edm::ParameterSet const& iPSet,
                                        edm::PreallocationConfiguration const&);
-    
+
     template <typename F>
     void forAllModuleHolders(F iFunc) {
-      for(auto& labelMod: labelToModule_) {
+      for (auto& labelMod : labelToModule_) {
         maker::ModuleHolder* t = labelMod.second.get();
         iFunc(t);
       }
     }
+
   private:
     std::map<std::string, edm::propagate_const<std::shared_ptr<maker::ModuleHolder>>> labelToModule_;
   };
-}
-
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/NoDataException.cc b/FWCore/Framework/src/NoDataException.cc
index d63a3a821f568..2b498b4fbb6e9 100644
--- a/FWCore/Framework/src/NoDataException.cc
+++ b/FWCore/Framework/src/NoDataException.cc
@@ -3,52 +3,45 @@
 namespace edm {
   namespace eventsetup {
 
-     NoDataExceptionBase::NoDataExceptionBase(const EventSetupRecordKey& iRecordKey,
-                                              const DataKey& iDataKey,
-                                              const char* category_name) :
-     cms::Exception(category_name),
-     record_(iRecordKey),
-     dataKey_(iDataKey)
-     {
-     }
-     
-     NoDataExceptionBase::~NoDataExceptionBase() noexcept {}
-     
-     const DataKey& NoDataExceptionBase::dataKey() const { return dataKey_; }
-     
-     std::string NoDataExceptionBase::providerButNoDataMessage(const EventSetupRecordKey& iKey) {
-        return std::string(" A provider for this data exists, but it's unable to deliver the data for this \"")
-        +iKey.name()
-        +"\" record.\n Perhaps no valid data exists for this IOV? Please check the data's interval of validity.\n";
-     }
-     
-     std::string NoDataExceptionBase::noProxyMessage() {
-        return std::string("Please add an ESSource or ESProducer to your job which can deliver this data.\n");
-     }
-     
-     void NoDataExceptionBase::beginDataTypeMessage(std::string& oString) const
-     {
-        oString+= std::string("No data of type \"");
-     }
-     
-     void NoDataExceptionBase::endDataTypeMessage(std::string& oString) const
-     {
-        oString += "\" with label \"";
-        oString += this->dataKey_.name().value();
-        oString += "\" in record \"";
-        oString += this->record_.name();
-        oString += "\"";
-     }
-     
-     void NoDataExceptionBase::constructMessage(const char* iClassName, const std::string& iExtraInfo)
-     {
-        std::string message;
-        beginDataTypeMessage(message);
-        message += iClassName;
-        endDataTypeMessage(message);
-        this->append(message+std::string("\n "));
-        this->append(iExtraInfo);
-     }
-     
-  }
-}
+    NoDataExceptionBase::NoDataExceptionBase(const EventSetupRecordKey& iRecordKey,
+                                             const DataKey& iDataKey,
+                                             const char* category_name)
+        : cms::Exception(category_name), record_(iRecordKey), dataKey_(iDataKey) {}
+
+    NoDataExceptionBase::~NoDataExceptionBase() noexcept {}
+
+    const DataKey& NoDataExceptionBase::dataKey() const { return dataKey_; }
+
+    std::string NoDataExceptionBase::providerButNoDataMessage(const EventSetupRecordKey& iKey) {
+      return std::string(" A provider for this data exists, but it's unable to deliver the data for this \"") +
+             iKey.name() +
+             "\" record.\n Perhaps no valid data exists for this IOV? Please check the data's interval of validity.\n";
+    }
+
+    std::string NoDataExceptionBase::noProxyMessage() {
+      return std::string("Please add an ESSource or ESProducer to your job which can deliver this data.\n");
+    }
+
+    void NoDataExceptionBase::beginDataTypeMessage(std::string& oString) const {
+      oString += std::string("No data of type \"");
+    }
+
+    void NoDataExceptionBase::endDataTypeMessage(std::string& oString) const {
+      oString += "\" with label \"";
+      oString += this->dataKey_.name().value();
+      oString += "\" in record \"";
+      oString += this->record_.name();
+      oString += "\"";
+    }
+
+    void NoDataExceptionBase::constructMessage(const char* iClassName, const std::string& iExtraInfo) {
+      std::string message;
+      beginDataTypeMessage(message);
+      message += iClassName;
+      endDataTypeMessage(message);
+      this->append(message + std::string("\n "));
+      this->append(iExtraInfo);
+    }
+
+  }  // namespace eventsetup
+}  // namespace edm
diff --git a/FWCore/Framework/src/NoRecordException.cc b/FWCore/Framework/src/NoRecordException.cc
index f428c1c474e2d..8d72b2540a9b4 100644
--- a/FWCore/Framework/src/NoRecordException.cc
+++ b/FWCore/Framework/src/NoRecordException.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     NoRecordException
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -19,24 +19,21 @@
 #include "FWCore/Framework/interface/EventSetupImpl.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-bool
-edm::eventsetup::recordDoesExist( EventSetupImpl const& iES, EventSetupRecordKey const& iKey) {
+bool edm::eventsetup::recordDoesExist(EventSetupImpl const& iES, EventSetupRecordKey const& iKey) {
   return iES.recordIsProvidedByAModule(iKey);
 }
 
-
-void
-edm::eventsetup::no_record_exception_message_builder(cms::Exception& oException, const char* iName, bool iKnownRecord) {
-   oException
-   << "No \"" 
-   << iName
-   << "\" record found in the EventSetup.n";
-  if(iKnownRecord) {
-   oException<<"\n The Record is delivered by an ESSource or ESProducer but there is no valid IOV for the synchronizatio value.\n"
-    " Please check \n"
-    "   a) if the synchronization value is reasonable and report to the hypernews if it is not.\n"
-    "   b) else check that all ESSources have been properly configured. \n";
+void edm::eventsetup::no_record_exception_message_builder(cms::Exception& oException,
+                                                          const char* iName,
+                                                          bool iKnownRecord) {
+  oException << "No \"" << iName << "\" record found in the EventSetup.n";
+  if (iKnownRecord) {
+    oException << "\n The Record is delivered by an ESSource or ESProducer but there is no valid IOV for the "
+                  "synchronizatio value.\n"
+                  " Please check \n"
+                  "   a) if the synchronization value is reasonable and report to the hypernews if it is not.\n"
+                  "   b) else check that all ESSources have been properly configured. \n";
   } else {
-   oException <<"\n Please add an ESSource or ESProducer that delivers such a record.\n";
+    oException << "\n Please add an ESSource or ESProducer that delivers such a record.\n";
   }
 }
diff --git a/FWCore/Framework/src/OccurrenceForOutput.cc b/FWCore/Framework/src/OccurrenceForOutput.cc
index 99e18d2ac59cb..1462ee25bb5bd 100644
--- a/FWCore/Framework/src/OccurrenceForOutput.cc
+++ b/FWCore/Framework/src/OccurrenceForOutput.cc
@@ -12,65 +12,44 @@
 
 namespace edm {
 
-  OccurrenceForOutput::OccurrenceForOutput(Principal const& p, ModuleDescription const& md, ModuleCallingContext const* moduleCallingContext, bool isAtEnd) :
-      provRecorder_(p, md, isAtEnd),
-      moduleCallingContext_(moduleCallingContext)
-  {
-  }
+  OccurrenceForOutput::OccurrenceForOutput(Principal const& p,
+                                           ModuleDescription const& md,
+                                           ModuleCallingContext const* moduleCallingContext,
+                                           bool isAtEnd)
+      : provRecorder_(p, md, isAtEnd), moduleCallingContext_(moduleCallingContext) {}
 
-  OccurrenceForOutput::~OccurrenceForOutput() {
-  }
+  OccurrenceForOutput::~OccurrenceForOutput() {}
 
-  void
-  OccurrenceForOutput::setConsumer(EDConsumerBase const* iConsumer) {
-    provRecorder_.setConsumer(iConsumer);
-  }
+  void OccurrenceForOutput::setConsumer(EDConsumerBase const* iConsumer) { provRecorder_.setConsumer(iConsumer); }
 
-  Principal const&
-  OccurrenceForOutput::principal() const {
-    return provRecorder_.principal();
-  }
+  Principal const& OccurrenceForOutput::principal() const { return provRecorder_.principal(); }
 
-  ProcessHistoryID const&
-  OccurrenceForOutput::processHistoryID() const {
-    return principal().processHistoryID();
-  }
+  ProcessHistoryID const& OccurrenceForOutput::processHistoryID() const { return principal().processHistoryID(); }
 
-  Provenance
-  OccurrenceForOutput::getProvenance(BranchID const& bid) const {
+  Provenance OccurrenceForOutput::getProvenance(BranchID const& bid) const {
     return provRecorder_.principal().getProvenance(bid, moduleCallingContext_);
   }
 
-  void
-  OccurrenceForOutput::getAllProvenance(std::vector<Provenance const*>& provenances) const {
+  void OccurrenceForOutput::getAllProvenance(std::vector<Provenance const*>& provenances) const {
     provRecorder_.principal().getAllProvenance(provenances);
   }
 
-  void
-  OccurrenceForOutput::getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const {
+  void OccurrenceForOutput::getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const {
     provRecorder_.principal().getAllStableProvenance(provenances);
   }
 
-  ProcessHistory const&
-  OccurrenceForOutput::processHistory() const {
-    return provRecorder_.processHistory();
-  }
+  ProcessHistory const& OccurrenceForOutput::processHistory() const { return provRecorder_.processHistory(); }
 
-  size_t
-  OccurrenceForOutput::size() const {
-    return provRecorder_.principal().size();
-  }
+  size_t OccurrenceForOutput::size() const { return provRecorder_.principal().size(); }
 
-  BasicHandle
-  OccurrenceForOutput::getByToken(EDGetToken token, TypeID const& typeID) const {
+  BasicHandle OccurrenceForOutput::getByToken(EDGetToken token, TypeID const& typeID) const {
     auto result = provRecorder_.getByToken_(typeID, PRODUCT_TYPE, token, moduleCallingContext_);
     if (result.failedToGet()) {
       return result;
     }
-    if(!provRecorder_.isComplete() && result.wrapper()->isMergeable()) {
+    if (!provRecorder_.isComplete() && result.wrapper()->isMergeable()) {
       principal_get_adapter_detail::throwOnPrematureRead("RunOrLumi", typeID, token);
     }
     return result;
   }
-}
-
+}  // namespace edm
diff --git a/FWCore/Framework/src/OutputModule.cc b/FWCore/Framework/src/OutputModule.cc
index 3dba187a229e4..0df610f258eeb 100644
--- a/FWCore/Framework/src/OutputModule.cc
+++ b/FWCore/Framework/src/OutputModule.cc
@@ -37,46 +37,39 @@
 namespace edm {
 
   // -------------------------------------------------------
-  OutputModule::OutputModule(ParameterSet const& pset) :
-    maxEvents_(-1),
-    remainingEvents_(maxEvents_),
-    keptProducts_(),
-    hasNewlyDroppedBranch_(),
-    process_name_(),
-    productSelectorRules_(pset, "outputCommands", "OutputModule"),
-    productSelector_(),
-    moduleDescription_(),
-    wantAllEvents_(false),
-    selectors_(),
-    selector_config_id_(),
-    droppedBranchIDToKeptBranchID_(),
-    branchIDLists_(new BranchIDLists),
-    origBranchIDLists_(nullptr),
-    thinnedAssociationsHelper_(new ThinnedAssociationsHelper) {
-
+  OutputModule::OutputModule(ParameterSet const& pset)
+      : maxEvents_(-1),
+        remainingEvents_(maxEvents_),
+        keptProducts_(),
+        hasNewlyDroppedBranch_(),
+        process_name_(),
+        productSelectorRules_(pset, "outputCommands", "OutputModule"),
+        productSelector_(),
+        moduleDescription_(),
+        wantAllEvents_(false),
+        selectors_(),
+        selector_config_id_(),
+        droppedBranchIDToKeptBranchID_(),
+        branchIDLists_(new BranchIDLists),
+        origBranchIDLists_(nullptr),
+        thinnedAssociationsHelper_(new ThinnedAssociationsHelper) {
     hasNewlyDroppedBranch_.fill(false);
 
     Service<service::TriggerNamesService> tns;
     process_name_ = tns->getProcessName();
 
-    selectEvents_ =
-      pset.getUntrackedParameterSet("SelectEvents", ParameterSet());
+    selectEvents_ = pset.getUntrackedParameterSet("SelectEvents", ParameterSet());
 
-    selectEvents_.registerIt(); // Just in case this PSet is not registered
+    selectEvents_.registerIt();  // Just in case this PSet is not registered
 
     selector_config_id_ = selectEvents_.id();
     selectors_.resize(1);
     //need to set wantAllEvents_ in constructor
     // we will make the remaining selectors once we know how many streams
-    wantAllEvents_ = detail::configureEventSelector(selectEvents_,
-                                                          process_name_,
-                                                          getAllTriggerNames(),
-                                                          selectors_[0],
-                                                          consumesCollector());
-
-    SharedResourcesRegistry::instance()->registerSharedResource(
-                                                                SharedResourcesRegistry::kLegacyModuleResourceName);
+    wantAllEvents_ = detail::configureEventSelector(
+        selectEvents_, process_name_, getAllTriggerNames(), selectors_[0], consumesCollector());
 
+    SharedResourcesRegistry::instance()->registerSharedResource(SharedResourcesRegistry::kLegacyModuleResourceName);
   }
 
   void OutputModule::configure(OutputModuleDescription const& desc) {
@@ -86,7 +79,8 @@ namespace edm {
 
   void OutputModule::selectProducts(ProductRegistry const& preg,
                                     ThinnedAssociationsHelper const& thinnedAssociationsHelper) {
-    if(productSelector_.initialized()) return;
+    if (productSelector_.initialized())
+      return;
     productSelector_.initialize(productSelectorRules_, preg.allBranchDescriptions());
 
     // TODO: See if we can collapse keptProducts_ and productSelector_ into a
@@ -98,19 +92,18 @@ namespace edm {
     std::set<BranchID> keptProductsInEvent;
     std::set<std::string> processesWithSelectedMergeableRunProducts;
 
-    for(auto const& it : preg.productList()) {
+    for (auto const& it : preg.productList()) {
       BranchDescription const& desc = it.second;
-      if(desc.transient()) {
+      if (desc.transient()) {
         // if the class of the branch is marked transient, output nothing
-      } else if(!desc.present() && !desc.produced()) {
+      } else if (!desc.present() && !desc.produced()) {
         // else if the branch containing the product has been previously dropped,
         // output nothing
-      } else if(desc.unwrappedType() == typeid(ThinnedAssociation)) {
+      } else if (desc.unwrappedType() == typeid(ThinnedAssociation)) {
         associationDescriptions.push_back(&desc);
-      } else if(selected(desc)) {
+      } else if (selected(desc)) {
         keepThisBranch(desc, trueBranchIDToKeptBranchDesc, keptProductsInEvent);
-        insertSelectedProcesses(desc,
-                                processesWithSelectedMergeableRunProducts);
+        insertSelectedProcesses(desc, processesWithSelectedMergeableRunProducts);
       } else {
         // otherwise, output nothing,
         // and mark the fact that there is a newly dropped branch of this type.
@@ -120,12 +113,10 @@ namespace edm {
 
     setProcessesWithSelectedMergeableRunProducts(processesWithSelectedMergeableRunProducts);
 
-    thinnedAssociationsHelper.selectAssociationProducts(associationDescriptions,
-                                                        keptProductsInEvent,
-                                                        keepAssociation_);
+    thinnedAssociationsHelper.selectAssociationProducts(associationDescriptions, keptProductsInEvent, keepAssociation_);
 
-    for(auto association : associationDescriptions) {
-      if(keepAssociation_[association->branchID()]) {
+    for (auto association : associationDescriptions) {
+      if (keepAssociation_[association->branchID()]) {
         keepThisBranch(*association, trueBranchIDToKeptBranchDesc, keptProductsInEvent);
       } else {
         hasNewlyDroppedBranch_[association->branchType()] = true;
@@ -135,15 +126,14 @@ namespace edm {
     // Now fill in a mapping needed in the case that a branch was dropped while its EDAlias was kept.
     ProductSelector::fillDroppedToKept(preg, trueBranchIDToKeptBranchDesc, droppedBranchIDToKeptBranchID_);
 
-    thinnedAssociationsHelper_->updateFromParentProcess(thinnedAssociationsHelper, keepAssociation_, droppedBranchIDToKeptBranchID_);
+    thinnedAssociationsHelper_->updateFromParentProcess(
+        thinnedAssociationsHelper, keepAssociation_, droppedBranchIDToKeptBranchID_);
   }
 
   void OutputModule::keepThisBranch(BranchDescription const& desc,
                                     std::map<BranchID, BranchDescription const*>& trueBranchIDToKeptBranchDesc,
                                     std::set<BranchID>& keptProductsInEvent) {
-
-    ProductSelector::checkForDuplicateKeptBranch(desc,
-                                                 trueBranchIDToKeptBranchDesc);
+    ProductSelector::checkForDuplicateKeptBranch(desc, trueBranchIDToKeptBranchDesc);
 
     EDGetToken token;
 
@@ -154,63 +144,49 @@ namespace edm {
     }
 
     switch (desc.branchType()) {
-    case InEvent:
-      {
-        if(desc.produced()) {
+      case InEvent: {
+        if (desc.produced()) {
           keptProductsInEvent.insert(desc.originalBranchID());
         } else {
           keptProductsInEvent.insert(desc.branchID());
         }
-        token = consumes(TypeToGet{desc.unwrappedTypeID(),PRODUCT_TYPE},
-                     InputTag{desc.moduleLabel(),
-                     desc.productInstanceName(),
-                     desc.processName()});
+        token = consumes(TypeToGet{desc.unwrappedTypeID(), PRODUCT_TYPE},
+                         InputTag{desc.moduleLabel(), desc.productInstanceName(), desc.processName()});
         break;
       }
-    case InLumi:
-      {
-        token = consumes<InLumi>(TypeToGet{desc.unwrappedTypeID(),PRODUCT_TYPE},
-                                  InputTag(desc.moduleLabel(),
-                                  desc.productInstanceName(),
-                                  desc.processName()));
+      case InLumi: {
+        token = consumes<InLumi>(TypeToGet{desc.unwrappedTypeID(), PRODUCT_TYPE},
+                                 InputTag(desc.moduleLabel(), desc.productInstanceName(), desc.processName()));
         break;
       }
-    case InRun:
-      {
-        token = consumes<InRun>(TypeToGet{desc.unwrappedTypeID(),PRODUCT_TYPE},
-                                 InputTag(desc.moduleLabel(),
-                                 desc.productInstanceName(),
-                                 desc.processName()));
+      case InRun: {
+        token = consumes<InRun>(TypeToGet{desc.unwrappedTypeID(), PRODUCT_TYPE},
+                                InputTag(desc.moduleLabel(), desc.productInstanceName(), desc.processName()));
         break;
       }
-    default:
-      assert(false);
-      break;
+      default:
+        assert(false);
+        break;
     }
     // Now put it in the list of selected branches.
     keptProducts_[desc.branchType()].push_back(std::make_pair(&desc, token));
   }
 
-  OutputModule::~OutputModule() { }
+  OutputModule::~OutputModule() {}
 
   void OutputModule::doPreallocate(PreallocationConfiguration const& iPC) {
     auto nstreams = iPC.numberOfStreams();
     selectors_.resize(nstreams);
 
     bool seenFirst = false;
-    for(auto& s : selectors_) {
-      if(seenFirst) {
-        detail::configureEventSelector(selectEvents_,
-                                       process_name_,
-                                       getAllTriggerNames(),
-                                       s,
-                                       consumesCollector());
+    for (auto& s : selectors_) {
+      if (seenFirst) {
+        detail::configureEventSelector(selectEvents_, process_name_, getAllTriggerNames(), s, consumesCollector());
       }
       seenFirst = true;
     }
   }
 
-  
   void OutputModule::doBeginJob() {
     std::vector<std::string> res = {SharedResourcesRegistry::kLegacyModuleResourceName};
     resourceAcquirer_ = SharedResourcesRegistry::instance()->createAcquirer(res);
@@ -218,10 +194,7 @@ namespace edm {
     this->beginJob();
   }
 
-  void OutputModule::doEndJob() {
-    endJob();
-  }
-
+  void OutputModule::doEndJob() { endJob(); }
 
   Trig OutputModule::getTriggerResults(EDGetTokenT<TriggerResults> const& token, EventForOutput const& e) const {
     //This cast is safe since we only call const functions of the EventForOutputafter this point
@@ -229,162 +202,141 @@ namespace edm {
     e.getByToken<TriggerResults>(token, result);
     return result;
   }
-  
-  bool OutputModule::needToRunSelection() const {
-    return !wantAllEvents_;
-  }
-  
-  std::vector<ProductResolverIndexAndSkipBit>
-  OutputModule::productsUsedBySelection() const {
+
+  bool OutputModule::needToRunSelection() const { return !wantAllEvents_; }
+
+  std::vector<ProductResolverIndexAndSkipBit> OutputModule::productsUsedBySelection() const {
     std::vector<ProductResolverIndexAndSkipBit> returnValue;
     auto const& s = selectors_[0];
     auto const n = s.numberOfTokens();
     returnValue.reserve(n);
-    
-    for(unsigned int i=0; i< n;++i) {
+
+    for (unsigned int i = 0; i < n; ++i) {
       returnValue.emplace_back(uncheckedIndexFrom(s.token(i)));
     }
     return returnValue;
   }
 
   bool OutputModule::prePrefetchSelection(StreamID id, EventPrincipal const& ep, ModuleCallingContext const* mcc) {
-    if(wantAllEvents_) return true;
+    if (wantAllEvents_)
+      return true;
     auto& s = selectors_[id.value()];
     EventForOutput e(ep, moduleDescription_, mcc);
     e.setConsumer(this);
     return s.wantEvent(e);
   }
 
-  bool
-  OutputModule::doEvent(EventPrincipal const& ep,
-                        EventSetupImpl const&,
-                        ActivityRegistry* act,
-                        ModuleCallingContext const* mcc) {
-
+  bool OutputModule::doEvent(EventPrincipal const& ep,
+                             EventSetupImpl const&,
+                             ActivityRegistry* act,
+                             ModuleCallingContext const* mcc) {
     FDEBUG(2) << "writeEvent called\n";
 
     {
       EventForOutput e(ep, moduleDescription_, mcc);
       e.setConsumer(this);
-      EventSignalsSentry sentry(act,mcc);
+      EventSignalsSentry sentry(act, mcc);
       write(e);
     }
-    if(remainingEvents_ > 0) {
+    if (remainingEvents_ > 0) {
       --remainingEvents_;
     }
     return true;
   }
 
-//   bool OutputModule::wantEvent(EventForOutput const& ev)
-//   {
-//     getTriggerResults(ev);
-//     bool eventAccepted = false;
-
-//     typedef std::vector<NamedEventSelector>::const_iterator iter;
-//     for(iter i = selectResult_.begin(), e = selectResult_.end();
-//          !eventAccepted && i != e; ++i)
-//       {
-//         eventAccepted = i->acceptEvent(*prods_);
-//       }
-
-//     FDEBUG(2) << "Accept event " << ep.id() << " " << eventAccepted << "\n";
-//     return eventAccepted;
-//   }
-
-  bool
-  OutputModule::doBeginRun(RunPrincipal const& rp,
-                           EventSetupImpl const&,
-                           ModuleCallingContext const* mcc) {
+  //   bool OutputModule::wantEvent(EventForOutput const& ev)
+  //   {
+  //     getTriggerResults(ev);
+  //     bool eventAccepted = false;
+
+  //     typedef std::vector<NamedEventSelector>::const_iterator iter;
+  //     for(iter i = selectResult_.begin(), e = selectResult_.end();
+  //          !eventAccepted && i != e; ++i)
+  //       {
+  //         eventAccepted = i->acceptEvent(*prods_);
+  //       }
+
+  //     FDEBUG(2) << "Accept event " << ep.id() << " " << eventAccepted << "\n";
+  //     return eventAccepted;
+  //   }
+
+  bool OutputModule::doBeginRun(RunPrincipal const& rp, EventSetupImpl const&, ModuleCallingContext const* mcc) {
     FDEBUG(2) << "beginRun called\n";
-    RunForOutput r(rp, moduleDescription_, mcc,false);
+    RunForOutput r(rp, moduleDescription_, mcc, false);
     r.setConsumer(this);
     beginRun(r);
     return true;
   }
 
-  bool
-  OutputModule::doEndRun(RunPrincipal const& rp,
-                         EventSetupImpl const&,
-                         ModuleCallingContext const* mcc) {
+  bool OutputModule::doEndRun(RunPrincipal const& rp, EventSetupImpl const&, ModuleCallingContext const* mcc) {
     FDEBUG(2) << "endRun called\n";
-    RunForOutput r(rp, moduleDescription_, mcc,true);
+    RunForOutput r(rp, moduleDescription_, mcc, true);
     r.setConsumer(this);
     endRun(r);
     return true;
   }
 
-  void
-  OutputModule::doWriteRun(RunPrincipal const& rp,
-                           ModuleCallingContext const* mcc,
-                           MergeableRunProductMetadata const* mrpm) {
+  void OutputModule::doWriteRun(RunPrincipal const& rp,
+                                ModuleCallingContext const* mcc,
+                                MergeableRunProductMetadata const* mrpm) {
     FDEBUG(2) << "writeRun called\n";
-    RunForOutput r(rp, moduleDescription_, mcc,true, mrpm);
+    RunForOutput r(rp, moduleDescription_, mcc, true, mrpm);
     r.setConsumer(this);
     writeRun(r);
   }
 
-  bool
-  OutputModule::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
-                                       EventSetupImpl const&,
-                                       ModuleCallingContext const* mcc) {
+  bool OutputModule::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                            EventSetupImpl const&,
+                                            ModuleCallingContext const* mcc) {
     FDEBUG(2) << "beginLuminosityBlock called\n";
-    LuminosityBlockForOutput lb(lbp, moduleDescription_, mcc,false);
+    LuminosityBlockForOutput lb(lbp, moduleDescription_, mcc, false);
     lb.setConsumer(this);
     beginLuminosityBlock(lb);
     return true;
   }
 
-  bool
-  OutputModule::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
-                                     EventSetupImpl const&,
-                                     ModuleCallingContext const* mcc) {
+  bool OutputModule::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                          EventSetupImpl const&,
+                                          ModuleCallingContext const* mcc) {
     FDEBUG(2) << "endLuminosityBlock called\n";
-    LuminosityBlockForOutput lb(lbp, moduleDescription_, mcc,true);
+    LuminosityBlockForOutput lb(lbp, moduleDescription_, mcc, true);
     lb.setConsumer(this);
     endLuminosityBlock(lb);
     return true;
   }
 
-  void OutputModule::doWriteLuminosityBlock(LuminosityBlockPrincipal const& lbp,
-                                            ModuleCallingContext const* mcc) {
+  void OutputModule::doWriteLuminosityBlock(LuminosityBlockPrincipal const& lbp, ModuleCallingContext const* mcc) {
     FDEBUG(2) << "writeLuminosityBlock called\n";
-    LuminosityBlockForOutput lb(lbp, moduleDescription_, mcc,true);
+    LuminosityBlockForOutput lb(lbp, moduleDescription_, mcc, true);
     lb.setConsumer(this);
     writeLuminosityBlock(lb);
   }
 
-  void OutputModule::doOpenFile(FileBlock const& fb) {
-    openFile(fb);
-  }
+  void OutputModule::doOpenFile(FileBlock const& fb) { openFile(fb); }
 
-  void OutputModule::doRespondToOpenInputFile(FileBlock const& fb) {
-    respondToOpenInputFile(fb);
-  }
+  void OutputModule::doRespondToOpenInputFile(FileBlock const& fb) { respondToOpenInputFile(fb); }
 
-  void OutputModule::doRespondToCloseInputFile(FileBlock const& fb) {
-    respondToCloseInputFile(fb);
-  }
+  void OutputModule::doRespondToCloseInputFile(FileBlock const& fb) { respondToCloseInputFile(fb); }
 
   void OutputModule::doCloseFile() {
-    if(isFileOpen()) {
+    if (isFileOpen()) {
       reallyCloseFile();
     }
   }
 
-  void OutputModule::reallyCloseFile() {
-  }
+  void OutputModule::reallyCloseFile() {}
 
-  BranchIDLists const*
-  OutputModule::branchIDLists() {
-    if(!droppedBranchIDToKeptBranchID_.empty()) {
+  BranchIDLists const* OutputModule::branchIDLists() {
+    if (!droppedBranchIDToKeptBranchID_.empty()) {
       // Make a private copy of the BranchIDLists.
       *branchIDLists_ = *origBranchIDLists_;
       // Check for branches dropped while an EDAlias was kept.
-      for(BranchIDList& branchIDList : *branchIDLists_) {
-        for(BranchID::value_type& branchID : branchIDList) {
+      for (BranchIDList& branchIDList : *branchIDLists_) {
+        for (BranchID::value_type& branchID : branchIDList) {
           // Replace BranchID of each dropped branch with that of the kept alias, so the alias branch will have the product ID of the original branch.
-          std::map<BranchID::value_type, BranchID::value_type>::const_iterator iter = droppedBranchIDToKeptBranchID_.find(branchID);
-          if(iter != droppedBranchIDToKeptBranchID_.end()) {
+          std::map<BranchID::value_type, BranchID::value_type>::const_iterator iter =
+              droppedBranchIDToKeptBranchID_.find(branchID);
+          if (iter != droppedBranchIDToKeptBranchID_.end()) {
             branchID = iter->second;
           }
         }
@@ -394,51 +346,37 @@ namespace edm {
     return origBranchIDLists_;
   }
 
-  ThinnedAssociationsHelper const*
-  OutputModule::thinnedAssociationsHelper() const {
+  ThinnedAssociationsHelper const* OutputModule::thinnedAssociationsHelper() const {
     return thinnedAssociationsHelper_.get();
   }
 
-  ModuleDescription const&
-  OutputModule::description() const {
-    return moduleDescription_;
-  }
+  ModuleDescription const& OutputModule::description() const { return moduleDescription_; }
 
-  bool
-  OutputModule::selected(BranchDescription const& desc) const {
-    return productSelector_.selected(desc);
-  }
+  bool OutputModule::selected(BranchDescription const& desc) const { return productSelector_.selected(desc); }
 
-  void
-  OutputModule::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void OutputModule::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     desc.setUnknown();
     descriptions.addDefault(desc);
   }
-  
-  void
-  OutputModule::fillDescription(ParameterSetDescription& desc, std::vector<std::string> const& defaultOutputCommands) {
-    ProductSelectorRules::fillDescription(desc, "outputCommands",defaultOutputCommands);
+
+  void OutputModule::fillDescription(ParameterSetDescription& desc,
+                                     std::vector<std::string> const& defaultOutputCommands) {
+    ProductSelectorRules::fillDescription(desc, "outputCommands", defaultOutputCommands);
     EventSelector::fillDescription(desc);
   }
-  
-  void
-  OutputModule::prevalidate(ConfigurationDescriptions& ) {
-  }
-  
+
+  void OutputModule::prevalidate(ConfigurationDescriptions&) {}
 
   static const std::string kBaseType("OutputModule");
-  const std::string&
-  OutputModule::baseType() {
-    return kBaseType;
-  }
-  
-  void
-  OutputModule::setEventSelectionInfo(std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
-                                      bool anyProductProduced) {
+  const std::string& OutputModule::baseType() { return kBaseType; }
+
+  void OutputModule::setEventSelectionInfo(
+      std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
+      bool anyProductProduced) {
     selector_config_id_ = detail::registerProperSelectionInfo(getParameterSet(selector_config_id_),
-                                      description().moduleLabel(),
-                                                      outputModulePathPositions,
-                                                      anyProductProduced);
+                                                              description().moduleLabel(),
+                                                              outputModulePathPositions,
+                                                              anyProductProduced);
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/OutputModuleCommunicator.cc b/FWCore/Framework/src/OutputModuleCommunicator.cc
index 04ee6c3a56782..3fe8b89951498 100644
--- a/FWCore/Framework/src/OutputModuleCommunicator.cc
+++ b/FWCore/Framework/src/OutputModuleCommunicator.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Package
 // Class  :     OutputModuleCommunicator
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -17,6 +17,4 @@
 
 using namespace edm;
 
-OutputModuleCommunicator::~OutputModuleCommunicator()
-{
-}
+OutputModuleCommunicator::~OutputModuleCommunicator() {}
diff --git a/FWCore/Framework/src/OutputModuleCommunicator.h b/FWCore/Framework/src/OutputModuleCommunicator.h
index f9ebc384c9293..3c33a1d105982 100644
--- a/FWCore/Framework/src/OutputModuleCommunicator.h
+++ b/FWCore/Framework/src/OutputModuleCommunicator.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     OutputModuleCommunicator
-// 
+//
 /**\class edm::OutputModuleCommunicator OutputModuleCommunicator.h "FWCore/Framework/interface/OutputModuleCommunicator.h"
 
  Description: Base class used by the framework to communicate with an OutputModule
@@ -36,56 +36,54 @@ namespace edm {
   class ThinnedAssociationsHelper;
   class WaitingTaskHolder;
 
-  class OutputModuleCommunicator
-  {
-    
+  class OutputModuleCommunicator {
   public:
     OutputModuleCommunicator() = default;
     virtual ~OutputModuleCommunicator();
-    
+
     virtual void closeFile() = 0;
-    
+
     ///\return true if output module wishes to close its file
     virtual bool shouldWeCloseFile() const = 0;
-    
+
     ///\return true if no event filtering is applied to OutputModule
     virtual bool wantAllEvents() const = 0;
-    
+
     virtual void openFile(FileBlock const& fb) = 0;
-    
+
     virtual void writeRunAsync(WaitingTaskHolder iTask,
                                RunPrincipal const& rp,
                                ProcessContext const*,
                                ActivityRegistry*,
                                MergeableRunProductMetadata const*) = 0;
-    
+
     virtual void writeLumiAsync(WaitingTaskHolder iTask,
                                 LuminosityBlockPrincipal const& lbp,
                                 ProcessContext const*,
                                 ActivityRegistry*) = 0;
-    
+
     ///\return true if OutputModule has reached its limit on maximum number of events it wants to see
     virtual bool limitReached() const = 0;
-    
+
     virtual void configure(OutputModuleDescription const& desc) = 0;
-    
+
     virtual SelectedProductsForBranchType const& keptProducts() const = 0;
-    
+
     virtual void selectProducts(ProductRegistry const& preg, ThinnedAssociationsHelper const&) = 0;
-    
-    virtual void setEventSelectionInfo(std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
-                                       bool anyProductProduced) = 0;
+
+    virtual void setEventSelectionInfo(
+        std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
+        bool anyProductProduced) = 0;
 
     virtual ModuleDescription const& description() const = 0;
-    
+
   private:
-    OutputModuleCommunicator(const OutputModuleCommunicator&) = delete; // stop default
-    
-    const OutputModuleCommunicator& operator=(const OutputModuleCommunicator&) = delete; // stop default
-    
+    OutputModuleCommunicator(const OutputModuleCommunicator&) = delete;  // stop default
+
+    const OutputModuleCommunicator& operator=(const OutputModuleCommunicator&) = delete;  // stop default
+
     // ---------- member data --------------------------------
-    
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/OutputModuleCommunicatorT.cc b/FWCore/Framework/src/OutputModuleCommunicatorT.cc
index b0b11e234ac1f..f0b83859b83ba 100644
--- a/FWCore/Framework/src/OutputModuleCommunicatorT.cc
+++ b/FWCore/Framework/src/OutputModuleCommunicatorT.cc
@@ -24,54 +24,50 @@
 
 namespace {
   template <typename F>
-  void async( edm::OutputModule& iMod, F&& iFunc ) {
+  void async(edm::OutputModule& iMod, F&& iFunc) {
     iMod.sharedResourcesAcquirer().serialQueueChain().push(std::move(iFunc));
   }
-  
+
   template <typename F>
-  void async( edm::one::OutputModuleBase& iMod, F&& iFunc ) {
+  void async(edm::one::OutputModuleBase& iMod, F&& iFunc) {
     iMod.sharedResourcesAcquirer().serialQueueChain().push(std::move(iFunc));
   }
-  
+
   template <typename F>
-  void async( edm::limited::OutputModuleBase& iMod, F&& iFunc ) {
+  void async(edm::limited::OutputModuleBase& iMod, F&& iFunc) {
     iMod.queue().push(std::move(iFunc));
   }
-  
+
   template <typename F>
-  void async( edm::global::OutputModuleBase&, F iFunc ) {
+  void async(edm::global::OutputModuleBase&, F iFunc) {
     auto t = edm::make_functor_task(tbb::task::allocate_root(), iFunc);
     tbb::task::spawn(*t);
   }
-}
+}  // namespace
 
 namespace edm {
 
-  template<typename T>
-  void
-  OutputModuleCommunicatorT<T>::closeFile() {
+  template <typename T>
+  void OutputModuleCommunicatorT<T>::closeFile() {
     module().doCloseFile();
   }
 
-  template<typename T>
-  bool
-  OutputModuleCommunicatorT<T>::shouldWeCloseFile() const {
+  template <typename T>
+  bool OutputModuleCommunicatorT<T>::shouldWeCloseFile() const {
     return module().shouldWeCloseFile();
   }
 
-  template<typename T>
-  void
-  OutputModuleCommunicatorT<T>::openFile(edm::FileBlock const& fb) {
+  template <typename T>
+  void OutputModuleCommunicatorT<T>::openFile(edm::FileBlock const& fb) {
     module().doOpenFile(fb);
   }
 
-  template<typename T>
-  void
-  OutputModuleCommunicatorT<T>::writeRunAsync(WaitingTaskHolder iTask,
-                                              edm::RunPrincipal const& rp,
-                                              ProcessContext const* processContext,
-                                              ActivityRegistry* activityRegistry,
-                                              MergeableRunProductMetadata const* mergeableRunProductMetadata) {
+  template <typename T>
+  void OutputModuleCommunicatorT<T>::writeRunAsync(WaitingTaskHolder iTask,
+                                                   edm::RunPrincipal const& rp,
+                                                   ProcessContext const* processContext,
+                                                   ActivityRegistry* activityRegistry,
+                                                   MergeableRunProductMetadata const* mergeableRunProductMetadata) {
     auto token = ServiceRegistry::instance().presentToken();
     GlobalContext globalContext(GlobalContext::Transition::kWriteRun,
                                 LuminosityBlockID(rp.run(), 0),
@@ -79,7 +75,14 @@ namespace edm {
                                 LuminosityBlockIndex::invalidLuminosityBlockIndex(),
                                 rp.endTime(),
                                 processContext);
-    auto t = [&mod = module(), &rp, globalContext, token, desc = &description(), activityRegistry, mergeableRunProductMetadata, iTask]() mutable {
+    auto t = [& mod = module(),
+              &rp,
+              globalContext,
+              token,
+              desc = &description(),
+              activityRegistry,
+              mergeableRunProductMetadata,
+              iTask]() mutable {
       std::exception_ptr ex;
       try {
         ServiceRegistry::Operate op(token);
@@ -87,12 +90,11 @@ namespace edm {
         ModuleCallingContext mcc(desc);
         ModuleContextSentry moduleContextSentry(&mcc, parentContext);
         activityRegistry->preModuleWriteRunSignal_(globalContext, mcc);
-        auto sentry( make_sentry(activityRegistry,
-                               [&globalContext, &mcc](ActivityRegistry* activityRegistry) {
-                                 activityRegistry->postModuleWriteRunSignal_(globalContext, mcc);
-                               }));
+        auto sentry(make_sentry(activityRegistry, [&globalContext, &mcc](ActivityRegistry* activityRegistry) {
+          activityRegistry->postModuleWriteRunSignal_(globalContext, mcc);
+        }));
         mod.doWriteRun(rp, &mcc, mergeableRunProductMetadata);
-      } catch(...) {
+      } catch (...) {
         ex = std::current_exception();
       }
       iTask.doneWaiting(ex);
@@ -100,12 +102,11 @@ namespace edm {
     async(module(), std::move(t));
   }
 
-  template<typename T>
-  void
-  OutputModuleCommunicatorT<T>::writeLumiAsync(WaitingTaskHolder iTask,
-                                               edm::LuminosityBlockPrincipal const& lbp,
-                                               ProcessContext const* processContext,
-                                               ActivityRegistry* activityRegistry) {
+  template <typename T>
+  void OutputModuleCommunicatorT<T>::writeLumiAsync(WaitingTaskHolder iTask,
+                                                    edm::LuminosityBlockPrincipal const& lbp,
+                                                    ProcessContext const* processContext,
+                                                    ActivityRegistry* activityRegistry) {
     auto token = ServiceRegistry::instance().presentToken();
     GlobalContext globalContext(GlobalContext::Transition::kWriteLuminosityBlock,
                                 lbp.id(),
@@ -113,7 +114,7 @@ namespace edm {
                                 lbp.index(),
                                 lbp.beginTime(),
                                 processContext);
-    auto t=[&mod = module(), &lbp, activityRegistry, token, globalContext,desc = &description(),iTask]() mutable {
+    auto t = [& mod = module(), &lbp, activityRegistry, token, globalContext, desc = &description(), iTask]() mutable {
       std::exception_ptr ex;
       try {
         ServiceRegistry::Operate op(token);
@@ -122,12 +123,11 @@ namespace edm {
         ModuleCallingContext mcc(desc);
         ModuleContextSentry moduleContextSentry(&mcc, parentContext);
         activityRegistry->preModuleWriteLumiSignal_(globalContext, mcc);
-        auto sentry( make_sentry(activityRegistry,
-                               [&globalContext, &mcc](ActivityRegistry* activityRegistry) {
-                                 activityRegistry->postModuleWriteLumiSignal_(globalContext, mcc);
-                               }));
+        auto sentry(make_sentry(activityRegistry, [&globalContext, &mcc](ActivityRegistry* activityRegistry) {
+          activityRegistry->postModuleWriteLumiSignal_(globalContext, mcc);
+        }));
         mod.doWriteLuminosityBlock(lbp, &mcc);
-      } catch(...) {
+      } catch (...) {
         ex = std::current_exception();
       }
       iTask.doneWaiting(ex);
@@ -135,58 +135,66 @@ namespace edm {
     async(module(), std::move(t));
   }
 
-  template<typename T>
-  bool OutputModuleCommunicatorT<T>::wantAllEvents() const {return module().wantAllEvents();}
+  template <typename T>
+  bool OutputModuleCommunicatorT<T>::wantAllEvents() const {
+    return module().wantAllEvents();
+  }
 
-  template<typename T>
-  bool OutputModuleCommunicatorT<T>::limitReached() const {return module().limitReached();}
+  template <typename T>
+  bool OutputModuleCommunicatorT<T>::limitReached() const {
+    return module().limitReached();
+  }
 
-  template<typename T>
-  void OutputModuleCommunicatorT<T>::configure(OutputModuleDescription const& desc) {module().configure(desc);}
+  template <typename T>
+  void OutputModuleCommunicatorT<T>::configure(OutputModuleDescription const& desc) {
+    module().configure(desc);
+  }
 
-  template<typename T>
+  template <typename T>
   edm::SelectedProductsForBranchType const& OutputModuleCommunicatorT<T>::keptProducts() const {
     return module().keptProducts();
   }
 
-  template<typename T>
-  void OutputModuleCommunicatorT<T>::selectProducts(edm::ProductRegistry const& preg, ThinnedAssociationsHelper const& helper) {
+  template <typename T>
+  void OutputModuleCommunicatorT<T>::selectProducts(edm::ProductRegistry const& preg,
+                                                    ThinnedAssociationsHelper const& helper) {
     module().selectProducts(preg, helper);
   }
 
-  template<typename T>
-  void OutputModuleCommunicatorT<T>::setEventSelectionInfo(std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
-                                                    bool anyProductProduced) {
+  template <typename T>
+  void OutputModuleCommunicatorT<T>::setEventSelectionInfo(
+      std::map<std::string, std::vector<std::pair<std::string, int>>> const& outputModulePathPositions,
+      bool anyProductProduced) {
     module().setEventSelectionInfo(outputModulePathPositions, anyProductProduced);
   }
 
-  template<typename T>
+  template <typename T>
   ModuleDescription const& OutputModuleCommunicatorT<T>::description() const {
     return module().description();
   }
 
   namespace impl {
-    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(void *) {
+    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(void*) {
       return std::unique_ptr<edm::OutputModuleCommunicator>{};
     }
-    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(::edm::OutputModule * iMod){
+    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(::edm::OutputModule* iMod) {
       return std::make_unique<OutputModuleCommunicatorT<edm::OutputModule>>(iMod);
     }
-    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(::edm::global::OutputModuleBase * iMod){
+    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(::edm::global::OutputModuleBase* iMod) {
       return std::make_unique<OutputModuleCommunicatorT<edm::global::OutputModuleBase>>(iMod);
     }
-    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(::edm::one::OutputModuleBase * iMod){
+    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(::edm::one::OutputModuleBase* iMod) {
       return std::make_unique<OutputModuleCommunicatorT<edm::one::OutputModuleBase>>(iMod);
     }
-    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(::edm::limited::OutputModuleBase * iMod){
+    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(::edm::limited::OutputModuleBase* iMod) {
       return std::make_unique<OutputModuleCommunicatorT<edm::limited::OutputModuleBase>>(iMod);
     }
-  }
-}
+  }  // namespace impl
+}  // namespace edm
 
 namespace edm {
   template class OutputModuleCommunicatorT<OutputModule>;
   template class OutputModuleCommunicatorT<one::OutputModuleBase>;
   template class OutputModuleCommunicatorT<global::OutputModuleBase>;
   template class OutputModuleCommunicatorT<limited::OutputModuleBase>;
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/OutputModuleCommunicatorT.h b/FWCore/Framework/src/OutputModuleCommunicatorT.h
index 9e91f1ddf42d3..a13291e06227f 100644
--- a/FWCore/Framework/src/OutputModuleCommunicatorT.h
+++ b/FWCore/Framework/src/OutputModuleCommunicatorT.h
@@ -22,52 +22,52 @@ namespace edm {
     class OutputModuleBase;
   }
   namespace impl {
-    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(void *);
-    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(::edm::OutputModule *);
-    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(::edm::one::OutputModuleBase *);
-    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(::edm::global::OutputModuleBase *);
-    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(::edm::limited::OutputModuleBase *);
-  }
-  
+    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(void*);
+    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(::edm::OutputModule*);
+    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(::edm::one::OutputModuleBase*);
+    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(::edm::global::OutputModuleBase*);
+    std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(::edm::limited::OutputModuleBase*);
+  }  // namespace impl
+
   template <typename T>
-  
+
   class OutputModuleCommunicatorT : public edm::OutputModuleCommunicator {
   public:
-    OutputModuleCommunicatorT(T* iModule):
-    module_(iModule){}
+    OutputModuleCommunicatorT(T* iModule) : module_(iModule) {}
     void closeFile() override;
-    
+
     ///\return true if output module wishes to close its file
     bool shouldWeCloseFile() const override;
-    
+
     ///\return true if no event filtering is applied to OutputModule
     bool wantAllEvents() const override;
-    
+
     void openFile(edm::FileBlock const& fb) override;
-    
+
     void writeRunAsync(WaitingTaskHolder iTask,
                        edm::RunPrincipal const& rp,
                        ProcessContext const*,
                        ActivityRegistry*,
                        MergeableRunProductMetadata const*) override;
-    
+
     void writeLumiAsync(WaitingTaskHolder iTask,
                         edm::LuminosityBlockPrincipal const& lbp,
                         ProcessContext const*,
                         ActivityRegistry*) override;
-    
+
     ///\return true if OutputModule has reached its limit on maximum number of events it wants to see
     bool limitReached() const override;
-    
+
     void configure(edm::OutputModuleDescription const& desc) override;
-    
+
     edm::SelectedProductsForBranchType const& keptProducts() const override;
-    
+
     void selectProducts(edm::ProductRegistry const& preg, ThinnedAssociationsHelper const&) override;
-    
-    void setEventSelectionInfo(std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
-                                       bool anyProductProduced) override;
-    
+
+    void setEventSelectionInfo(
+        std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
+        bool anyProductProduced) override;
+
     ModuleDescription const& description() const override;
 
     static std::unique_ptr<edm::OutputModuleCommunicator> createIfNeeded(T* iMod) {
@@ -75,8 +75,8 @@ namespace edm {
     }
 
   private:
-    inline T& module() const { return *module_;}
+    inline T& module() const { return *module_; }
     T* module_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/src/Path.cc b/FWCore/Framework/src/Path.cc
index 2a5da8f1f6128..6a3f09cb5dfc4 100644
--- a/FWCore/Framework/src/Path.cc
+++ b/FWCore/Framework/src/Path.cc
@@ -12,116 +12,114 @@
 #include <algorithm>
 
 namespace edm {
-  Path::Path(int bitpos, std::string const& path_name,
+  Path::Path(int bitpos,
+             std::string const& path_name,
              WorkersInPath const& workers,
              TrigResPtr trptr,
              ExceptionToActionTable const& actions,
              std::shared_ptr<ActivityRegistry> areg,
              StreamContext const* streamContext,
              std::atomic<bool>* stopProcessingEvent,
-             PathContext::PathType pathType) :
-    timesRun_(),
-    timesPassed_(),
-    timesFailed_(),
-    timesExcept_(),
-    state_(hlt::Ready),
-    bitpos_(bitpos),
-    trptr_(trptr),
-    actReg_(areg),
-    act_table_(&actions),
-    workers_(workers),
-    pathContext_(path_name, streamContext, bitpos, pathType),
-    stopProcessingEvent_(stopProcessingEvent),
-    pathStatusInserter_(nullptr),
-    pathStatusInserterWorker_(nullptr) {
-
+             PathContext::PathType pathType)
+      : timesRun_(),
+        timesPassed_(),
+        timesFailed_(),
+        timesExcept_(),
+        state_(hlt::Ready),
+        bitpos_(bitpos),
+        trptr_(trptr),
+        actReg_(areg),
+        act_table_(&actions),
+        workers_(workers),
+        pathContext_(path_name, streamContext, bitpos, pathType),
+        stopProcessingEvent_(stopProcessingEvent),
+        pathStatusInserter_(nullptr),
+        pathStatusInserterWorker_(nullptr) {
     for (auto& workerInPath : workers_) {
       workerInPath.setPathContext(&pathContext_);
     }
   }
 
-  Path::Path(Path const& r) :
-    timesRun_(r.timesRun_),
-    timesPassed_(r.timesPassed_),
-    timesFailed_(r.timesFailed_),
-    timesExcept_(r.timesExcept_),
-    state_(r.state_),
-    bitpos_(r.bitpos_),
-    trptr_(r.trptr_),
-    actReg_(r.actReg_),
-    act_table_(r.act_table_),
-    workers_(r.workers_),
-    earlyDeleteHelpers_(r.earlyDeleteHelpers_),
-    pathContext_(r.pathContext_),
-    stopProcessingEvent_(r.stopProcessingEvent_),
-    pathStatusInserter_(r.pathStatusInserter_),
-    pathStatusInserterWorker_(r.pathStatusInserterWorker_) {
-
+  Path::Path(Path const& r)
+      : timesRun_(r.timesRun_),
+        timesPassed_(r.timesPassed_),
+        timesFailed_(r.timesFailed_),
+        timesExcept_(r.timesExcept_),
+        state_(r.state_),
+        bitpos_(r.bitpos_),
+        trptr_(r.trptr_),
+        actReg_(r.actReg_),
+        act_table_(r.act_table_),
+        workers_(r.workers_),
+        earlyDeleteHelpers_(r.earlyDeleteHelpers_),
+        pathContext_(r.pathContext_),
+        stopProcessingEvent_(r.stopProcessingEvent_),
+        pathStatusInserter_(r.pathStatusInserter_),
+        pathStatusInserterWorker_(r.pathStatusInserterWorker_) {
     for (auto& workerInPath : workers_) {
       workerInPath.setPathContext(&pathContext_);
     }
   }
 
-
-  bool
-  Path::handleWorkerFailure(cms::Exception & e,
-			    int nwrwue,
-                            bool isEvent,
-                            bool begin,
-                            BranchType branchType,
-                            ModuleDescription const& desc,
-                            std::string const& id) {
-    if(e.context().empty()) {
+  bool Path::handleWorkerFailure(cms::Exception& e,
+                                 int nwrwue,
+                                 bool isEvent,
+                                 bool begin,
+                                 BranchType branchType,
+                                 ModuleDescription const& desc,
+                                 std::string const& id) {
+    if (e.context().empty()) {
       exceptionContext(e, isEvent, begin, branchType, desc, id, pathContext_);
     }
     bool should_continue = true;
 
     // there is no support as of yet for specific paths having
     // different exception behavior
-    
+
     // If not processing an event, always rethrow.
     exception_actions::ActionCodes action = (isEvent ? act_table_->find(e.category()) : exception_actions::Rethrow);
-    switch(action) {
+    switch (action) {
       case exception_actions::FailPath: {
-	  should_continue = false;
-          edm::printCmsExceptionWarning("FailPath", e);
-	  break;
+        should_continue = false;
+        edm::printCmsExceptionWarning("FailPath", e);
+        break;
       }
       case exception_actions::SkipEvent: {
         //Need the other Paths to stop as soon as possible
-        if(stopProcessingEvent_) {
+        if (stopProcessingEvent_) {
           *stopProcessingEvent_ = true;
         }
       }
       default: {
-	  if (isEvent) ++timesExcept_;
-	  state_ = hlt::Exception;
-	  recordStatus(nwrwue, isEvent);
-	  if (action == exception_actions::Rethrow) {
-	    std::string pNF = Exception::codeToString(errors::ProductNotFound);
-            if (e.category() == pNF) {
-	      std::ostringstream ost;
-              ost <<  "If you wish to continue processing events after a " << pNF << " exception,\n" <<
-	      "add \"SkipEvent = cms.untracked.vstring('ProductNotFound')\" to the \"options\" PSet in the configuration.\n";
-              e.addAdditionalInfo(ost.str());
-            }
-	  }
-          //throw will copy which will slice the object
-          e.raise();
+        if (isEvent)
+          ++timesExcept_;
+        state_ = hlt::Exception;
+        recordStatus(nwrwue, isEvent);
+        if (action == exception_actions::Rethrow) {
+          std::string pNF = Exception::codeToString(errors::ProductNotFound);
+          if (e.category() == pNF) {
+            std::ostringstream ost;
+            ost << "If you wish to continue processing events after a " << pNF << " exception,\n"
+                << "add \"SkipEvent = cms.untracked.vstring('ProductNotFound')\" to the \"options\" PSet in the "
+                   "configuration.\n";
+            e.addAdditionalInfo(ost.str());
+          }
+        }
+        //throw will copy which will slice the object
+        e.raise();
       }
     }
 
     return should_continue;
   }
 
-  void
-  Path::exceptionContext(cms::Exception & ex,
-                         bool isEvent,
-                         bool begin,
-                         BranchType branchType,
-                         ModuleDescription const& desc,
-                         std::string const& id,
-                         PathContext const& pathContext) {
+  void Path::exceptionContext(cms::Exception& ex,
+                              bool isEvent,
+                              bool begin,
+                              BranchType branchType,
+                              ModuleDescription const& desc,
+                              std::string const& id,
+                              PathContext const& pathContext) {
     std::ostringstream ost;
     ost << "Running path '" << pathContext.pathName() << "'";
     ex.addContext(ost.str());
@@ -131,17 +129,13 @@ namespace edm {
     // added the necessary module context to the exception
     if (begin && branchType == InRun) {
       ost << "stream begin Run";
-    }
-    else if (begin && branchType == InLumi) {
+    } else if (begin && branchType == InLumi) {
       ost << "stream begin LuminosityBlock ";
-    }
-    else if (!begin && branchType == InLumi) {
+    } else if (!begin && branchType == InLumi) {
       ost << "stream end LuminosityBlock ";
-    }
-    else if (!begin && branchType == InRun) {
+    } else if (!begin && branchType == InRun) {
       ost << "stream end Run ";
-    }
-    else if (isEvent) {
+    } else if (isEvent) {
       // It should be impossible to get here ...
       ost << "Event ";
     }
@@ -149,93 +143,88 @@ namespace edm {
     ex.addContext(ost.str());
   }
 
-  void
-  Path::recordStatus(int nwrwue, bool isEvent) {
-    if(isEvent && trptr_) {
-      (*trptr_)[bitpos_]=HLTPathStatus(state_, nwrwue);    
+  void Path::recordStatus(int nwrwue, bool isEvent) {
+    if (isEvent && trptr_) {
+      (*trptr_)[bitpos_] = HLTPathStatus(state_, nwrwue);
     }
   }
 
-  void
-  Path::updateCounters(bool success, bool isEvent) {
+  void Path::updateCounters(bool success, bool isEvent) {
     if (success) {
-      if (isEvent) ++timesPassed_;
+      if (isEvent)
+        ++timesPassed_;
       state_ = hlt::Pass;
     } else {
-      if(isEvent) ++timesFailed_;
+      if (isEvent)
+        ++timesFailed_;
       state_ = hlt::Fail;
     }
   }
 
-  void
-  Path::clearCounters() {
+  void Path::clearCounters() {
     using std::placeholders::_1;
     timesRun_ = timesPassed_ = timesFailed_ = timesExcept_ = 0;
     for_all(workers_, std::bind(&WorkerInPath::clearCounters, _1));
   }
 
-  void 
-  Path::setEarlyDeleteHelpers(std::map<const Worker*,EarlyDeleteHelper*> const& iWorkerToDeleter) {
+  void Path::setEarlyDeleteHelpers(std::map<const Worker*, EarlyDeleteHelper*> const& iWorkerToDeleter) {
     //we use a temp so we can overset the size but then when moving to earlyDeleteHelpers we only
     // have to use the space necessary
     std::vector<EarlyDeleteHelper*> temp;
     temp.reserve(iWorkerToDeleter.size());
-    for(unsigned int index=0; index !=size();++index) {
+    for (unsigned int index = 0; index != size(); ++index) {
       auto found = iWorkerToDeleter.find(getWorker(index));
-      if(found != iWorkerToDeleter.end()) {
+      if (found != iWorkerToDeleter.end()) {
         temp.push_back(found->second);
         found->second->addedToPath();
       }
     }
-    std::vector<EarlyDeleteHelper*> tempCorrectSize(temp.begin(),temp.end());
+    std::vector<EarlyDeleteHelper*> tempCorrectSize(temp.begin(), temp.end());
     earlyDeleteHelpers_.swap(tempCorrectSize);
   }
 
-  void
-  Path::setPathStatusInserter(PathStatusInserter* pathStatusInserter,
-                              Worker* pathStatusInserterWorker) {
+  void Path::setPathStatusInserter(PathStatusInserter* pathStatusInserter, Worker* pathStatusInserterWorker) {
     pathStatusInserter_ = pathStatusInserter;
     pathStatusInserterWorker_ = pathStatusInserterWorker;
   }
 
-  void
-  Path::handleEarlyFinish(EventPrincipal const& iEvent) {
-    for(auto helper: earlyDeleteHelpers_) {
+  void Path::handleEarlyFinish(EventPrincipal const& iEvent) {
+    for (auto helper : earlyDeleteHelpers_) {
       helper->pathFinished(iEvent);
     }
   }
 
-  void
-  Path::processOneOccurrenceAsync(WaitingTask* iTask,
-                                  EventPrincipal const& iEP,
-                                  EventSetupImpl const& iES,
-                                  ServiceToken const& iToken,
-                                  StreamID const& iStreamID,
-                                  StreamContext const* iStreamContext) {
+  void Path::processOneOccurrenceAsync(WaitingTask* iTask,
+                                       EventPrincipal const& iEP,
+                                       EventSetupImpl const& iES,
+                                       ServiceToken const& iToken,
+                                       StreamID const& iStreamID,
+                                       StreamContext const* iStreamContext) {
     waitingTasks_.reset();
     ++timesRun_;
     waitingTasks_.add(iTask);
-    if(actReg_) {
+    if (actReg_) {
       ServiceRegistry::Operate guard(iToken);
       actReg_->prePathEventSignal_(*iStreamContext, pathContext_);
     }
     state_ = hlt::Ready;
-    
-    if(workers_.empty()) {
+
+    if (workers_.empty()) {
       ServiceRegistry::Operate guard(iToken);
       finished(-1, true, std::exception_ptr(), iStreamContext, iEP, iES, iStreamID);
       return;
     }
-    
-    runNextWorkerAsync(0,iEP,iES, iToken, iStreamID, iStreamContext);
+
+    runNextWorkerAsync(0, iEP, iES, iToken, iStreamID, iStreamContext);
   }
 
-  void
-  Path::workerFinished(std::exception_ptr const* iException,
-                       unsigned int iModuleIndex,
-                       EventPrincipal const& iEP, EventSetupImpl const& iES,
-                       ServiceToken const& iToken,
-                       StreamID const& iID, StreamContext const* iContext) {
+  void Path::workerFinished(std::exception_ptr const* iException,
+                            unsigned int iModuleIndex,
+                            EventPrincipal const& iEP,
+                            EventSetupImpl const& iES,
+                            ServiceToken const& iToken,
+                            StreamID const& iID,
+                            StreamContext const* iContext) {
     ServiceRegistry::Operate guard(iToken);
 
     //This call also allows the WorkerInPath to update statistics
@@ -243,22 +232,27 @@ namespace edm {
     auto& worker = workers_[iModuleIndex];
     bool shouldContinue = worker.checkResultsOfRunWorker(true);
     std::exception_ptr finalException;
-    if(iException) {
+    if (iException) {
       std::unique_ptr<cms::Exception> pEx;
       try {
         std::rethrow_exception(*iException);
-      } catch(cms::Exception& oldEx) {
+      } catch (cms::Exception& oldEx) {
         pEx = std::unique_ptr<cms::Exception>(oldEx.clone());
       }
       try {
         std::ostringstream ost;
         ost << iEP.id();
-        shouldContinue = handleWorkerFailure(*pEx, iModuleIndex, /*isEvent*/ true, /*isBegin*/ true, InEvent,
-                                              worker.getWorker()->description(), ost.str());
+        shouldContinue = handleWorkerFailure(*pEx,
+                                             iModuleIndex,
+                                             /*isEvent*/ true,
+                                             /*isBegin*/ true,
+                                             InEvent,
+                                             worker.getWorker()->description(),
+                                             ost.str());
         //If we didn't rethrow, then we effectively skipped
         worker.skipWorker(iEP);
         finalException = std::exception_ptr();
-      } catch(...) {
+      } catch (...) {
         shouldContinue = false;
         finalException = std::current_exception();
         //set the exception early to avoid case where another Path is waiting
@@ -268,78 +262,71 @@ namespace edm {
         waitingTasks_.presetTaskAsFailed(finalException);
       }
     }
-    if(stopProcessingEvent_ and *stopProcessingEvent_) {
+    if (stopProcessingEvent_ and *stopProcessingEvent_) {
       shouldContinue = false;
     }
-    auto const nextIndex = iModuleIndex +1;
+    auto const nextIndex = iModuleIndex + 1;
     if (shouldContinue and nextIndex < workers_.size()) {
       runNextWorkerAsync(nextIndex, iEP, iES, iToken, iID, iContext);
       return;
     }
-    
+
     if (not shouldContinue) {
       //we are leaving the path early
-      for(auto it = workers_.begin()+nextIndex, itEnd=workers_.end();
-          it != itEnd; ++it) {
+      for (auto it = workers_.begin() + nextIndex, itEnd = workers_.end(); it != itEnd; ++it) {
         it->skipWorker(iEP);
       }
       handleEarlyFinish(iEP);
     }
-    finished(iModuleIndex, shouldContinue, finalException, iContext, iEP, iES,iID);
+    finished(iModuleIndex, shouldContinue, finalException, iContext, iEP, iES, iID);
   }
-  
-  void
-  Path::finished(int iModuleIndex, bool iSucceeded, std::exception_ptr iException, StreamContext const* iContext,
-                 EventPrincipal const& iEP,
-                 EventSetupImpl const& iES,
-                 StreamID const& streamID) {
-    
-    if(not iException) {
+
+  void Path::finished(int iModuleIndex,
+                      bool iSucceeded,
+                      std::exception_ptr iException,
+                      StreamContext const* iContext,
+                      EventPrincipal const& iEP,
+                      EventSetupImpl const& iES,
+                      StreamID const& streamID) {
+    if (not iException) {
       updateCounters(iSucceeded, true);
       recordStatus(iModuleIndex, true);
     }
     try {
       HLTPathStatus status(state_, iModuleIndex);
 
-      if (pathStatusInserter_) { // pathStatusInserter is null for EndPaths
+      if (pathStatusInserter_) {  // pathStatusInserter is null for EndPaths
         pathStatusInserter_->setPathStatus(streamID, status);
       }
       std::exception_ptr jException =
-        pathStatusInserterWorker_->runModuleDirectly<OccurrenceTraits<EventPrincipal,
-                                                                      BranchActionStreamBegin>>(
-          iEP, iES, streamID, ParentContext(iContext), iContext
-        );
-      if(jException && not iException) {
+          pathStatusInserterWorker_->runModuleDirectly<OccurrenceTraits<EventPrincipal, BranchActionStreamBegin>>(
+              iEP, iES, streamID, ParentContext(iContext), iContext);
+      if (jException && not iException) {
         iException = jException;
       }
       actReg_->postPathEventSignal_(*iContext, pathContext_, status);
-    } catch(...) {
-      if(not iException) {
+    } catch (...) {
+      if (not iException) {
         iException = std::current_exception();
       }
     }
     waitingTasks_.doneWaiting(iException);
   }
-  
-  void
-  Path::runNextWorkerAsync(unsigned int iNextModuleIndex,
-                           EventPrincipal const& iEP, EventSetupImpl const& iES,
-                           ServiceToken const& iToken,
-                           StreamID const& iID, StreamContext const* iContext) {
-    
-    auto nextTask = make_waiting_task( tbb::task::allocate_root(),
-                                      [this, iNextModuleIndex, &iEP,&iES, iID, iContext, token=iToken](std::exception_ptr const* iException)
-    {
-      this->workerFinished(iException, iNextModuleIndex, iEP,iES,token,iID,iContext);
-    });
-    
-    workers_[iNextModuleIndex].runWorkerAsync<
-    OccurrenceTraits<EventPrincipal, BranchActionStreamBegin>>(nextTask,
-                                                                iEP,
-                                                                iES,
-                                                                iToken,
-                                                                iID,
-                                                                iContext);
+
+  void Path::runNextWorkerAsync(unsigned int iNextModuleIndex,
+                                EventPrincipal const& iEP,
+                                EventSetupImpl const& iES,
+                                ServiceToken const& iToken,
+                                StreamID const& iID,
+                                StreamContext const* iContext) {
+    auto nextTask = make_waiting_task(
+        tbb::task::allocate_root(),
+        [this, iNextModuleIndex, &iEP, &iES, iID, iContext, token = iToken](std::exception_ptr const* iException) {
+          this->workerFinished(iException, iNextModuleIndex, iEP, iES, token, iID, iContext);
+        });
+
+    workers_[iNextModuleIndex].runWorkerAsync<OccurrenceTraits<EventPrincipal, BranchActionStreamBegin>>(
+        nextTask, iEP, iES, iToken, iID, iContext);
   }
 
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/Path.h b/FWCore/Framework/src/Path.h
index a12a4ddf98ad2..284ee457f4e74 100644
--- a/FWCore/Framework/src/Path.h
+++ b/FWCore/Framework/src/Path.h
@@ -46,10 +46,11 @@ namespace edm {
     typedef hlt::HLTState State;
 
     typedef std::vector<WorkerInPath> WorkersInPath;
-    typedef WorkersInPath::size_type        size_type;
+    typedef WorkersInPath::size_type size_type;
     typedef std::shared_ptr<HLTGlobalStatus> TrigResPtr;
 
-    Path(int bitpos, std::string const& path_name,
+    Path(int bitpos,
+         std::string const& path_name,
          WorkersInPath const& workers,
          TrigResPtr trptr,
          ExceptionToActionTable const& actions,
@@ -63,14 +64,18 @@ namespace edm {
     template <typename T>
     void runAllModulesAsync(WaitingTask*,
                             typename T::MyPrincipal const&,
-                            EventSetupImpl  const&,
+                            EventSetupImpl const&,
                             ServiceToken const&,
                             StreamID const&,
                             typename T::Context const*);
 
-    void processOneOccurrenceAsync(WaitingTask*, EventPrincipal const&, EventSetupImpl const&,
-                                   ServiceToken const&, StreamID const&, StreamContext const*);
-    
+    void processOneOccurrenceAsync(WaitingTask*,
+                                   EventPrincipal const&,
+                                   EventSetupImpl const&,
+                                   ServiceToken const&,
+                                   StreamID const&,
+                                   StreamContext const*);
+
     int bitPosition() const { return bitpos_; }
     std::string const& name() const { return pathContext_.pathName(); }
 
@@ -85,21 +90,19 @@ namespace edm {
 
     size_type size() const { return workers_.size(); }
     int timesVisited(size_type i) const { return workers_.at(i).timesVisited(); }
-    int timesPassed (size_type i) const { return workers_.at(i).timesPassed() ; }
-    int timesFailed (size_type i) const { return workers_.at(i).timesFailed() ; }
-    int timesExcept (size_type i) const { return workers_.at(i).timesExcept() ; }
+    int timesPassed(size_type i) const { return workers_.at(i).timesPassed(); }
+    int timesFailed(size_type i) const { return workers_.at(i).timesFailed(); }
+    int timesExcept(size_type i) const { return workers_.at(i).timesExcept(); }
     Worker const* getWorker(size_type i) const { return workers_.at(i).getWorker(); }
-    
-    void setEarlyDeleteHelpers(std::map<const Worker*,EarlyDeleteHelper*> const&);
 
-    void setPathStatusInserter(PathStatusInserter* pathStatusInserter,
-                               Worker* pathStatusInserterWorker);
+    void setEarlyDeleteHelpers(std::map<const Worker*, EarlyDeleteHelper*> const&);
 
-  private:
+    void setPathStatusInserter(PathStatusInserter* pathStatusInserter, Worker* pathStatusInserterWorker);
 
+  private:
     // If you define this be careful about the pointer in the
     // PlaceInPathContext object in the contained WorkerInPath objects.
-    Path const& operator=(Path const&) = delete; // stop default
+    Path const& operator=(Path const&) = delete;  // stop default
 
     int timesRun_;
     int timesPassed_;
@@ -110,7 +113,7 @@ namespace edm {
 
     int bitpos_;
     TrigResPtr trptr_;
-    std::shared_ptr<ActivityRegistry> actReg_; // We do not use propagate_const because the registry itself is mutable.
+    std::shared_ptr<ActivityRegistry> actReg_;  // We do not use propagate_const because the registry itself is mutable.
     ExceptionToActionTable const* act_table_;
 
     WorkersInPath workers_;
@@ -125,14 +128,14 @@ namespace edm {
 
     // Helper functions
     // nwrwue = numWorkersRunWithoutUnhandledException (really!)
-    bool handleWorkerFailure(cms::Exception & e,
+    bool handleWorkerFailure(cms::Exception& e,
                              int nwrwue,
                              bool isEvent,
                              bool begin,
                              BranchType branchType,
                              ModuleDescription const&,
                              std::string const& id);
-    static void exceptionContext(cms::Exception & ex,
+    static void exceptionContext(cms::Exception& ex,
                                  bool isEvent,
                                  bool begin,
                                  BranchType branchType,
@@ -141,8 +144,10 @@ namespace edm {
                                  PathContext const&);
     void recordStatus(int nwrwue, bool isEvent);
     void updateCounters(bool succeed, bool isEvent);
-    
-    void finished(int iModuleIndex, bool iSucceeded, std::exception_ptr,
+
+    void finished(int iModuleIndex,
+                  bool iSucceeded,
+                  std::exception_ptr,
                   StreamContext const*,
                   EventPrincipal const& iEP,
                   EventSetupImpl const& iES,
@@ -151,55 +156,61 @@ namespace edm {
     void handleEarlyFinish(EventPrincipal const&);
     void handleEarlyFinish(RunPrincipal const&) {}
     void handleEarlyFinish(LuminosityBlockPrincipal const&) {}
-    
+
     //Handle asynchronous processing
     void workerFinished(std::exception_ptr const* iException,
                         unsigned int iModuleIndex,
-                        EventPrincipal const& iEP, EventSetupImpl const& iES,
+                        EventPrincipal const& iEP,
+                        EventSetupImpl const& iES,
                         ServiceToken const& iToken,
-                        StreamID const& iID, StreamContext const* iContext);
+                        StreamID const& iID,
+                        StreamContext const* iContext);
     void runNextWorkerAsync(unsigned int iNextModuleIndex,
-                            EventPrincipal const&, EventSetupImpl const&,
+                            EventPrincipal const&,
+                            EventSetupImpl const&,
                             ServiceToken const&,
-                            StreamID const&, StreamContext const*);
-
+                            StreamID const&,
+                            StreamContext const*);
   };
 
   namespace {
     template <typename T>
     class PathSignalSentry {
     public:
-      PathSignalSentry(ActivityRegistry *a,
+      PathSignalSentry(ActivityRegistry* a,
                        int const& nwrwue,
                        hlt::HLTState const& state,
-                       PathContext const* pathContext) :
-        a_(a), nwrwue_(nwrwue), state_(state), pathContext_(pathContext) {
-        if (a_) T::prePathSignal(a_, pathContext_);
+                       PathContext const* pathContext)
+          : a_(a), nwrwue_(nwrwue), state_(state), pathContext_(pathContext) {
+        if (a_)
+          T::prePathSignal(a_, pathContext_);
       }
       ~PathSignalSentry() {
         HLTPathStatus status(state_, nwrwue_);
-        if(a_) T::postPathSignal(a_, status, pathContext_);
+        if (a_)
+          T::postPathSignal(a_, status, pathContext_);
       }
+
     private:
-      ActivityRegistry* a_; // We do not use propagate_const because the registry itself is mutable.
+      ActivityRegistry* a_;  // We do not use propagate_const because the registry itself is mutable.
       int const& nwrwue_;
       hlt::HLTState const& state_;
       PathContext const* pathContext_;
     };
-  }
+  }  // namespace
 
   template <typename T>
   void Path::runAllModulesAsync(WaitingTask* task,
                                 typename T::MyPrincipal const& p,
-                                EventSetupImpl  const& es,
+                                EventSetupImpl const& es,
                                 ServiceToken const& token,
                                 StreamID const& streamID,
                                 typename T::Context const* context) {
-    for(auto& worker: workers_) {
-      worker.runWorkerAsync<T>(task,p,es,token,streamID,context);
+    for (auto& worker : workers_) {
+      worker.runWorkerAsync<T>(task, p, es, token, streamID, context);
     }
   }
 
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/PathStatusInserter.cc b/FWCore/Framework/src/PathStatusInserter.cc
index ef0ab17808b1d..8a9d9e61e0e24 100644
--- a/FWCore/Framework/src/PathStatusInserter.cc
+++ b/FWCore/Framework/src/PathStatusInserter.cc
@@ -5,23 +5,15 @@
 
 #include <memory>
 
-namespace edm
-{
-  PathStatusInserter::PathStatusInserter(unsigned int numberOfStreams) :
-    hltPathStatus_(numberOfStreams),
-    token_{produces<HLTPathStatus>()}
-  {
-  }
+namespace edm {
+  PathStatusInserter::PathStatusInserter(unsigned int numberOfStreams)
+      : hltPathStatus_(numberOfStreams), token_{produces<HLTPathStatus>()} {}
 
-  void
-  PathStatusInserter::setPathStatus(StreamID const& streamID,
-                                    HLTPathStatus const& hltPathStatus) {
+  void PathStatusInserter::setPathStatus(StreamID const& streamID, HLTPathStatus const& hltPathStatus) {
     hltPathStatus_[streamID.value()] = hltPathStatus;
   }
 
-  void
-  PathStatusInserter::produce(StreamID streamID, edm::Event& event, edm::EventSetup const&) const
-  {
-    event.emplace(token_,hltPathStatus_[streamID.value()]);
+  void PathStatusInserter::produce(StreamID streamID, edm::Event& event, edm::EventSetup const&) const {
+    event.emplace(token_, hltPathStatus_[streamID.value()]);
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/PathStatusInserter.h b/FWCore/Framework/src/PathStatusInserter.h
index 50cae58932171..06729f722f709 100644
--- a/FWCore/Framework/src/PathStatusInserter.h
+++ b/FWCore/Framework/src/PathStatusInserter.h
@@ -14,7 +14,6 @@ namespace edm {
 
   class PathStatusInserter : public global::EDProducer<> {
   public:
-
     PathStatusInserter(unsigned int numberOfStreams);
 
     void setPathStatus(StreamID const&, HLTPathStatus const&);
@@ -22,9 +21,8 @@ namespace edm {
     void produce(StreamID, Event&, EventSetup const&) const final;
 
   private:
-
     std::vector<HLTPathStatus> hltPathStatus_;
     EDPutTokenT<HLTPathStatus> token_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/src/PathsAndConsumesOfModules.cc b/FWCore/Framework/src/PathsAndConsumesOfModules.cc
index ff465c797e58c..b5fef40c5981f 100644
--- a/FWCore/Framework/src/PathsAndConsumesOfModules.cc
+++ b/FWCore/Framework/src/PathsAndConsumesOfModules.cc
@@ -9,11 +9,9 @@
 #include <algorithm>
 namespace edm {
 
-  PathsAndConsumesOfModules::~PathsAndConsumesOfModules() {
-  }
+  PathsAndConsumesOfModules::~PathsAndConsumesOfModules() {}
 
   void PathsAndConsumesOfModules::initialize(Schedule const* schedule, std::shared_ptr<ProductRegistry const> preg) {
-
     schedule_ = schedule;
     preg_ = preg;
 
@@ -26,74 +24,68 @@ namespace edm {
     modulesOnPaths_.resize(paths_.size());
     unsigned int i = 0;
     unsigned int hint = 0;
-    for(auto const& path : paths_) {
+    for (auto const& path : paths_) {
       schedule->moduleDescriptionsInPath(path, modulesOnPaths_.at(i), hint);
-      if(!modulesOnPaths_.at(i).empty()) ++hint;
+      if (!modulesOnPaths_.at(i).empty())
+        ++hint;
       ++i;
     }
 
     modulesOnEndPaths_.resize(endPaths_.size());
     i = 0;
     hint = 0;
-    for(auto const& endpath : endPaths_) {
+    for (auto const& endpath : endPaths_) {
       schedule->moduleDescriptionsInEndPath(endpath, modulesOnEndPaths_.at(i), hint);
-      if(!modulesOnEndPaths_.at(i).empty()) ++hint;
+      if (!modulesOnEndPaths_.at(i).empty())
+        ++hint;
       ++i;
     }
 
-    schedule->fillModuleAndConsumesInfo(allModuleDescriptions_,
-                                        moduleIDToIndex_,
-                                        modulesWhoseProductsAreConsumedBy_,
-                                        *preg);
+    schedule->fillModuleAndConsumesInfo(
+        allModuleDescriptions_, moduleIDToIndex_, modulesWhoseProductsAreConsumedBy_, *preg);
   }
 
-  ModuleDescription const*
-  PathsAndConsumesOfModules::doModuleDescription(unsigned int moduleID) const {
+  ModuleDescription const* PathsAndConsumesOfModules::doModuleDescription(unsigned int moduleID) const {
     unsigned int dummy = 0;
     auto target = std::make_pair(moduleID, dummy);
-    std::vector<std::pair<unsigned int, unsigned int> >::const_iterator iter =
-      std::lower_bound(moduleIDToIndex_.begin(), moduleIDToIndex_.end(), target);
+    std::vector<std::pair<unsigned int, unsigned int>>::const_iterator iter =
+        std::lower_bound(moduleIDToIndex_.begin(), moduleIDToIndex_.end(), target);
     if (iter == moduleIDToIndex_.end() || iter->first != moduleID) {
-      throw Exception(errors::LogicError)
-        << "PathsAndConsumesOfModules::moduleDescription: Unknown moduleID\n";
+      throw Exception(errors::LogicError) << "PathsAndConsumesOfModules::moduleDescription: Unknown moduleID\n";
     }
     return allModuleDescriptions_.at(iter->second);
   }
 
-  std::vector<ModuleDescription const*> const&
-  PathsAndConsumesOfModules::doModulesOnPath(unsigned int pathIndex) const {
+  std::vector<ModuleDescription const*> const& PathsAndConsumesOfModules::doModulesOnPath(unsigned int pathIndex) const {
     return modulesOnPaths_.at(pathIndex);
   }
 
-  std::vector<ModuleDescription const*> const&
-  PathsAndConsumesOfModules::doModulesOnEndPath(unsigned int endPathIndex) const {
+  std::vector<ModuleDescription const*> const& PathsAndConsumesOfModules::doModulesOnEndPath(
+      unsigned int endPathIndex) const {
     return modulesOnEndPaths_.at(endPathIndex);
   }
 
-  std::vector<ModuleDescription const*> const&
-  PathsAndConsumesOfModules::doModulesWhoseProductsAreConsumedBy(unsigned int moduleID) const {
+  std::vector<ModuleDescription const*> const& PathsAndConsumesOfModules::doModulesWhoseProductsAreConsumedBy(
+      unsigned int moduleID) const {
     return modulesWhoseProductsAreConsumedBy_.at(moduleIndex(moduleID));
   }
 
-  std::vector<ConsumesInfo> 
-  PathsAndConsumesOfModules::doConsumesInfo(unsigned int moduleID) const {
+  std::vector<ConsumesInfo> PathsAndConsumesOfModules::doConsumesInfo(unsigned int moduleID) const {
     Worker const* worker = schedule_->allWorkers().at(moduleIndex(moduleID));
     return worker->consumesInfo();
   }
 
-  unsigned int
-  PathsAndConsumesOfModules::moduleIndex(unsigned int moduleID) const {
+  unsigned int PathsAndConsumesOfModules::moduleIndex(unsigned int moduleID) const {
     unsigned int dummy = 0;
     auto target = std::make_pair(moduleID, dummy);
-    std::vector<std::pair<unsigned int, unsigned int> >::const_iterator iter =
-      std::lower_bound(moduleIDToIndex_.begin(), moduleIDToIndex_.end(), target);
+    std::vector<std::pair<unsigned int, unsigned int>>::const_iterator iter =
+        std::lower_bound(moduleIDToIndex_.begin(), moduleIDToIndex_.end(), target);
     if (iter == moduleIDToIndex_.end() || iter->first != moduleID) {
-      throw Exception(errors::LogicError)
-        << "PathsAndConsumesOfModules::moduleIndex: Unknown moduleID\n";
+      throw Exception(errors::LogicError) << "PathsAndConsumesOfModules::moduleIndex: Unknown moduleID\n";
     }
     return iter->second;
   }
-  
+
   //====================================
   // checkForCorrectness algorithm
   //
@@ -134,10 +126,8 @@ namespace edm {
   //  Cycle: A consumes B, B consumes C, C consumes A
   //  Since this cycle has 0 path only edges it is unrunnable.
   //====================================
-  
 
-  void checkForModuleDependencyCorrectness(edm::PathsAndConsumesOfModulesBase const& iPnC,
-                                           bool iPrintDependencies) {
+  void checkForModuleDependencyCorrectness(edm::PathsAndConsumesOfModulesBase const& iPnC, bool iPrintDependencies) {
     using namespace edm::graph;
     //Need to lookup ids to names quickly
     std::unordered_map<unsigned int, std::string> moduleIndexToNames;
@@ -151,21 +141,19 @@ namespace edm {
     unsigned int kTriggerResultsIndex = kInvalidIndex;
     unsigned int largestIndex = 0;
     unsigned int kPathToTriggerResultsDependencyLastIndex = kInvalidIndex;
-    for(auto const& description: iPnC.allModules()) {
-      moduleIndexToNames.insert(std::make_pair(description->id(),
-                                               description->moduleLabel()));
-      if(kTriggerResults == description->moduleLabel()) {
+    for (auto const& description : iPnC.allModules()) {
+      moduleIndexToNames.insert(std::make_pair(description->id(), description->moduleLabel()));
+      if (kTriggerResults == description->moduleLabel()) {
         kTriggerResultsIndex = description->id();
       }
-      if(description->id() > largestIndex) {
+      if (description->id() > largestIndex) {
         largestIndex = description->id();
       }
-      if(description->moduleName() == kPathStatusInserter || description->moduleName() == kEndPathStatusInserter) {
+      if (description->moduleName() == kPathStatusInserter || description->moduleName() == kEndPathStatusInserter) {
         pathStatusInserterModuleLabelToModuleID[description->moduleLabel()] = description->id();
       }
     }
-    kPathToTriggerResultsDependencyLastIndex = largestIndex ;
-
+    kPathToTriggerResultsDependencyLastIndex = largestIndex;
 
     /*
     {
@@ -221,130 +209,130 @@ namespace edm {
 
     const std::string kPathEnded("@PathEnded");
     const std::string kEndPathStart("@EndPathStart");
-    
+
     //The finished processing depends on all paths and end paths
     const std::string kFinishedProcessing("@FinishedProcessing");
     const unsigned int kFinishedProcessingIndex{0};
-    moduleIndexToNames.insert(std::make_pair(kFinishedProcessingIndex,
-                                             kFinishedProcessing));
-
+    moduleIndexToNames.insert(std::make_pair(kFinishedProcessingIndex, kFinishedProcessing));
 
     pathNames.insert(pathNames.end(), iPnC.endPaths().begin(), iPnC.endPaths().end());
     std::vector<std::vector<unsigned int>> pathIndexToModuleIndexOrder(pathNames.size());
     {
-      
-      for(unsigned int pathIndex = 0; pathIndex != pathNames.size(); ++pathIndex) {
+      for (unsigned int pathIndex = 0; pathIndex != pathNames.size(); ++pathIndex) {
         std::set<unsigned int> alreadySeenIndex;
-        
+
         std::vector<ModuleDescription const*> const* moduleDescriptions;
-        if(pathIndex < kFirstEndPathIndex) {
-          moduleDescriptions= &(iPnC.modulesOnPath(pathIndex));
+        if (pathIndex < kFirstEndPathIndex) {
+          moduleDescriptions = &(iPnC.modulesOnPath(pathIndex));
         } else {
-          moduleDescriptions= &(iPnC.modulesOnEndPath(pathIndex-kFirstEndPathIndex));
+          moduleDescriptions = &(iPnC.modulesOnEndPath(pathIndex - kFirstEndPathIndex));
         }
         unsigned int lastModuleIndex = kInvalidIndex;
-        auto& pathOrder =pathIndexToModuleIndexOrder[pathIndex];
+        auto& pathOrder = pathIndexToModuleIndexOrder[pathIndex];
         pathOrder.reserve(moduleDescriptions->size() + 1);
-        for(auto const& description: *moduleDescriptions) {
+        for (auto const& description : *moduleDescriptions) {
           auto found = alreadySeenIndex.insert(description->id());
-          if(found.second) {
+          if (found.second) {
             //first time for this path
             unsigned int const moduleIndex = description->id();
             pathOrder.push_back(moduleIndex);
-            auto& paths =moduleIndexToPathIndex[moduleIndex];
+            auto& paths = moduleIndexToPathIndex[moduleIndex];
             paths.push_back(pathIndex);
-            if(lastModuleIndex  != kInvalidIndex ) {
-              edgeToPathMap[std::make_pair(moduleIndex,lastModuleIndex)].push_back(pathIndex);
+            if (lastModuleIndex != kInvalidIndex) {
+              edgeToPathMap[std::make_pair(moduleIndex, lastModuleIndex)].push_back(pathIndex);
             }
             lastModuleIndex = moduleIndex;
           }
         }
-        //Have TriggerResults depend on the end of all paths 
+        //Have TriggerResults depend on the end of all paths
         // Have all EndPaths depend on TriggerResults
         auto labelToID = pathStatusInserterModuleLabelToModuleID.find(pathNames[pathIndex]);
-        if(labelToID == pathStatusInserterModuleLabelToModuleID.end()) {
+        if (labelToID == pathStatusInserterModuleLabelToModuleID.end()) {
           // should never happen
           throw Exception(errors::LogicError)
-            << "PathsAndConsumesOfModules::moduleDescription:checkForModuleDependencyCorrectness Could not find PathStatusInserter\n";
+              << "PathsAndConsumesOfModules::moduleDescription:checkForModuleDependencyCorrectness Could not find "
+                 "PathStatusInserter\n";
         }
         unsigned int pathStatusInserterModuleID = labelToID->second;
-        if( pathIndex < kFirstEndPathIndex) {
-          if( (lastModuleIndex  != kInvalidIndex) ) {
+        if (pathIndex < kFirstEndPathIndex) {
+          if ((lastModuleIndex != kInvalidIndex)) {
             edgeToPathMap[std::make_pair(pathStatusInserterModuleID, lastModuleIndex)].push_back(pathIndex);
-            moduleIndexToNames.insert(std::make_pair(pathStatusInserterModuleID,
-                                                     kPathEnded));
+            moduleIndexToNames.insert(std::make_pair(pathStatusInserterModuleID, kPathEnded));
             if (kTriggerResultsIndex != kInvalidIndex) {
-              edgeToPathMap[std::make_pair(kTriggerResultsIndex, pathStatusInserterModuleID)].push_back(kDataDependencyIndex);
+              edgeToPathMap[std::make_pair(kTriggerResultsIndex, pathStatusInserterModuleID)].push_back(
+                  kDataDependencyIndex);
             }
             //Need to make dependency for finished process
-            edgeToPathMap[std::make_pair(kFinishedProcessingIndex, pathStatusInserterModuleID)].push_back(kDataDependencyIndex);
+            edgeToPathMap[std::make_pair(kFinishedProcessingIndex, pathStatusInserterModuleID)].push_back(
+                kDataDependencyIndex);
             pathOrder.push_back(pathStatusInserterModuleID);
           }
         } else {
-          if( (not moduleDescriptions->empty()) ) {
+          if ((not moduleDescriptions->empty())) {
             if (kTriggerResultsIndex != kInvalidIndex) {
               ++kPathToTriggerResultsDependencyLastIndex;
-              edgeToPathMap[std::make_pair(moduleDescriptions->front()->id(),kPathToTriggerResultsDependencyLastIndex)].push_back(pathIndex);
-              moduleIndexToNames.insert(std::make_pair(kPathToTriggerResultsDependencyLastIndex,
-                                                       kEndPathStart));
-              edgeToPathMap[std::make_pair(kPathToTriggerResultsDependencyLastIndex,kTriggerResultsIndex)].push_back(kDataDependencyIndex);
-              pathOrder.insert(pathOrder.begin(),kPathToTriggerResultsDependencyLastIndex);
+              edgeToPathMap[std::make_pair(moduleDescriptions->front()->id(), kPathToTriggerResultsDependencyLastIndex)]
+                  .push_back(pathIndex);
+              moduleIndexToNames.insert(std::make_pair(kPathToTriggerResultsDependencyLastIndex, kEndPathStart));
+              edgeToPathMap[std::make_pair(kPathToTriggerResultsDependencyLastIndex, kTriggerResultsIndex)].push_back(
+                  kDataDependencyIndex);
+              pathOrder.insert(pathOrder.begin(), kPathToTriggerResultsDependencyLastIndex);
             }
             //Need to make dependency for finished process
             ++kPathToTriggerResultsDependencyLastIndex;
             edgeToPathMap[std::make_pair(pathStatusInserterModuleID, lastModuleIndex)].push_back(pathIndex);
-            moduleIndexToNames.insert(std::make_pair(pathStatusInserterModuleID,
-                                                     kPathEnded));
-            edgeToPathMap[std::make_pair(kFinishedProcessingIndex, pathStatusInserterModuleID)].push_back(kDataDependencyIndex);
+            moduleIndexToNames.insert(std::make_pair(pathStatusInserterModuleID, kPathEnded));
+            edgeToPathMap[std::make_pair(kFinishedProcessingIndex, pathStatusInserterModuleID)].push_back(
+                kDataDependencyIndex);
             pathOrder.push_back(pathStatusInserterModuleID);
           }
         }
       }
     }
     {
-
       //determine the data dependencies
-      for(auto const& description: iPnC.allModules()) {
+      for (auto const& description : iPnC.allModules()) {
         unsigned int const moduleIndex = description->id();
         auto const& dependentModules = iPnC.modulesWhoseProductsAreConsumedBy(moduleIndex);
-        for(auto const& depDescription: dependentModules) {
-          if(iPrintDependencies) {
-            edm::LogAbsolute("ModuleDependency") << "ModuleDependency '" << description->moduleLabel() <<
-            "' depends on data products from module '" << depDescription->moduleLabel()<<"'";
+        for (auto const& depDescription : dependentModules) {
+          if (iPrintDependencies) {
+            edm::LogAbsolute("ModuleDependency")
+                << "ModuleDependency '" << description->moduleLabel() << "' depends on data products from module '"
+                << depDescription->moduleLabel() << "'";
           }
           //see if all paths containing this module also contain the dependent module earlier in the path
           // if it does, then treat this only as a path dependency and not a data dependency as this
           // simplifies the circular dependency checking logic
-          auto depID =depDescription->id();
+          auto depID = depDescription->id();
           auto itPathsFound = moduleIndexToPathIndex.find(moduleIndex);
           bool keepDataDependency = true;
-          auto itDepsPathsFound =moduleIndexToPathIndex.find(depID);
-          if(itPathsFound != moduleIndexToPathIndex.end() and itDepsPathsFound != moduleIndexToPathIndex.end()) {
+          auto itDepsPathsFound = moduleIndexToPathIndex.find(depID);
+          if (itPathsFound != moduleIndexToPathIndex.end() and itDepsPathsFound != moduleIndexToPathIndex.end()) {
             keepDataDependency = false;
-            for(auto const pathIndex: itPathsFound->second) {
-              for(auto idToCheck: pathIndexToModuleIndexOrder[pathIndex]) {
-                if(idToCheck == depID) {
+            for (auto const pathIndex : itPathsFound->second) {
+              for (auto idToCheck : pathIndexToModuleIndexOrder[pathIndex]) {
+                if (idToCheck == depID) {
                   //found dependent module first so check next path
                   break;
                 }
-                if(idToCheck == moduleIndex) {
+                if (idToCheck == moduleIndex) {
                   //did not find dependent module earlier on path so
                   // must keep data dependency
                   keepDataDependency = true;
                   break;
                 }
               }
-              if(keepDataDependency) {
+              if (keepDataDependency) {
                 break;
               }
             }
           }
-          if(keepDataDependency) {
+          if (keepDataDependency) {
             edgeToPathMap[std::make_pair(moduleIndex, depID)].push_back(kDataDependencyIndex);
           }
         }
       }
     }
-    graph::throwIfImproperDependencies(edgeToPathMap,pathIndexToModuleIndexOrder,pathNames,moduleIndexToNames);
+    graph::throwIfImproperDependencies(edgeToPathMap, pathIndexToModuleIndexOrder, pathNames, moduleIndexToNames);
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/PreallocationConfiguration.h b/FWCore/Framework/src/PreallocationConfiguration.h
index d30e4116aa4e1..6358520bc87e5 100644
--- a/FWCore/Framework/src/PreallocationConfiguration.h
+++ b/FWCore/Framework/src/PreallocationConfiguration.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     PreallocationConfiguration
-// 
+//
 /**\class edm::PreallocationConfiguration PreallocationConfiguration.h "PreallocationConfiguration.h"
 
  Description: Holds number of simultaneous Streams, LuminosityBlocks and Runs the job will allow.
@@ -24,39 +24,29 @@
 
 // forward declarations
 namespace edm {
-  class PreallocationConfiguration
-  {
-    
+  class PreallocationConfiguration {
   public:
-    PreallocationConfiguration():
-    PreallocationConfiguration(1,1,1,1) {}
-    PreallocationConfiguration(unsigned int iNThreads,
-                               unsigned int iNStreams,
-                               unsigned int iNLumis,
-                               unsigned int iNRuns ):
-    m_nthreads(iNThreads),
-    m_nStreams(iNStreams),
-    m_nLumis(iNLumis),
-    m_nRuns(iNRuns) {}
-    
+    PreallocationConfiguration() : PreallocationConfiguration(1, 1, 1, 1) {}
+    PreallocationConfiguration(unsigned int iNThreads, unsigned int iNStreams, unsigned int iNLumis, unsigned int iNRuns)
+        : m_nthreads(iNThreads), m_nStreams(iNStreams), m_nLumis(iNLumis), m_nRuns(iNRuns) {}
+
     // ---------- const member functions ---------------------
-    unsigned int numberOfThreads() const {return m_nthreads;}
-    unsigned int numberOfStreams() const {return m_nStreams;}
-    unsigned int numberOfLuminosityBlocks() const {return m_nLumis;}
-    unsigned int numberOfRuns() const {return m_nRuns;}
-    
+    unsigned int numberOfThreads() const { return m_nthreads; }
+    unsigned int numberOfStreams() const { return m_nStreams; }
+    unsigned int numberOfLuminosityBlocks() const { return m_nLumis; }
+    unsigned int numberOfRuns() const { return m_nRuns; }
+
   private:
     //PreallocationConfiguration(const PreallocationConfiguration&) = delete; // stop default
-    
+
     //const PreallocationConfiguration& operator=(const PreallocationConfiguration&) = delete; // stop default
-    
+
     // ---------- member data --------------------------------
     unsigned int m_nthreads;
     unsigned int m_nStreams;
     unsigned int m_nLumis;
     unsigned int m_nRuns;
   };
-}
-
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/Principal.cc b/FWCore/Framework/src/Principal.cc
index f7653b8761d50..39a62805c9e71 100644
--- a/FWCore/Framework/src/Principal.cc
+++ b/FWCore/Framework/src/Principal.cc
@@ -33,8 +33,8 @@ namespace edm {
 
   static ProcessHistory const s_emptyProcessHistory;
 
-  static
-  std::string appendCurrentProcessIfAlias(std::string const& processFromInputTag, std::string const& currentProcess) {
+  static std::string appendCurrentProcessIfAlias(std::string const& processFromInputTag,
+                                                 std::string const& currentProcess) {
     if (processFromInputTag == InputTag::kCurrentProcess) {
       std::string returnValue = processFromInputTag;
       returnValue += " (";
@@ -45,41 +45,49 @@ namespace edm {
     return processFromInputTag;
   }
 
-  static
-  void
-  throwProductNotFoundException(char const* where, errors::ErrorCodes error, BranchID const& bid) {
-    throw Exception(error, "InvalidID")
-      << "Principal::" << where << ": no product with given branch id: "<< bid << "\n";
+  static void throwProductNotFoundException(char const* where, errors::ErrorCodes error, BranchID const& bid) {
+    throw Exception(error, "InvalidID") << "Principal::" << where << ": no product with given branch id: " << bid
+                                        << "\n";
   }
 
-  static
-  std::shared_ptr<cms::Exception>
-  makeNotFoundException(char const* where, KindOfType kindOfType,
-                        TypeID const& productType, std::string const& label, std::string const& instance, std::string const& process) {
+  static std::shared_ptr<cms::Exception> makeNotFoundException(char const* where,
+                                                               KindOfType kindOfType,
+                                                               TypeID const& productType,
+                                                               std::string const& label,
+                                                               std::string const& instance,
+                                                               std::string const& process) {
     std::shared_ptr<cms::Exception> exception = std::make_shared<Exception>(errors::ProductNotFound);
     if (kindOfType == PRODUCT_TYPE) {
-      *exception << "Principal::" << where << ": Found zero products matching all criteria\nLooking for type: " << productType << "\n"
-                 << "Looking for module label: " << label << "\n" << "Looking for productInstanceName: " << instance << "\n"
+      *exception << "Principal::" << where
+                 << ": Found zero products matching all criteria\nLooking for type: " << productType << "\n"
+                 << "Looking for module label: " << label << "\n"
+                 << "Looking for productInstanceName: " << instance << "\n"
                  << (process.empty() ? "" : "Looking for process: ") << process << "\n";
     } else {
-      *exception << "Principal::" << where << ": Found zero products matching all criteria\nLooking for a container with elements of type: " << productType << "\n"
-                 << "Looking for module label: " << label << "\n" << "Looking for productInstanceName: " << instance << "\n"
+      *exception << "Principal::" << where
+                 << ": Found zero products matching all criteria\nLooking for a container with elements of type: "
+                 << productType << "\n"
+                 << "Looking for module label: " << label << "\n"
+                 << "Looking for productInstanceName: " << instance << "\n"
                  << (process.empty() ? "" : "Looking for process: ") << process << "\n";
     }
     return exception;
   }
 
-  static
-  void
-  throwAmbiguousException(const char* where, TypeID const& productType,std::string const& label, std::string const& instance, std::string const& process) {
+  static void throwAmbiguousException(const char* where,
+                                      TypeID const& productType,
+                                      std::string const& label,
+                                      std::string const& instance,
+                                      std::string const& process) {
     cms::Exception exception("AmbiguousProduct");
-    exception << "Principal::" << where << ": More than 1 product matches all criteria\nLooking for type: " << productType << "\n"
-    << "Looking for module label: " << label << "\n" << "Looking for productInstanceName: " << instance << "\n"
-    << (process.empty() ? "" : "Looking for process: ") << process << "\n"
-    << "This can only occur with get function calls using a Handle<View> argument.\n"
-    << "Try a get not using a View or change the instance name of one of the products";
+    exception << "Principal::" << where
+              << ": More than 1 product matches all criteria\nLooking for type: " << productType << "\n"
+              << "Looking for module label: " << label << "\n"
+              << "Looking for productInstanceName: " << instance << "\n"
+              << (process.empty() ? "" : "Looking for process: ") << process << "\n"
+              << "This can only occur with get function calls using a Handle<View> argument.\n"
+              << "Try a get not using a View or change the instance name of one of the products";
     throw exception;
-    
   }
 
   namespace {
@@ -89,7 +97,7 @@ namespace edm {
                 << " without a corresponding consumesMany being called for this module. \n";
       throw exception;
     }
-    
+
     void failedToRegisterConsumes(KindOfType kindOfType,
                                   TypeID const& productType,
                                   std::string const& moduleLabel,
@@ -99,38 +107,37 @@ namespace edm {
       exception << "::getByLabel without corresponding call to consumes or mayConsumes for this module.\n"
                 << (kindOfType == PRODUCT_TYPE ? "  type: " : " type: edm::View<") << productType
                 << (kindOfType == PRODUCT_TYPE ? "\n  module label: " : ">\n  module label: ") << moduleLabel
-                <<"\n  product instance name: '" << productInstanceName
-                <<"'\n  process name: '" << processName << "'\n";
+                << "\n  product instance name: '" << productInstanceName << "'\n  process name: '" << processName
+                << "'\n";
       throw exception;
     }
-}
+  }  // namespace
 
   //0 means unset
   static std::atomic<Principal::CacheIdentifier_t> s_nextIdentifier{1};
   static inline Principal::CacheIdentifier_t nextIdentifier() {
-    return s_nextIdentifier.fetch_add(1,std::memory_order_acq_rel);
+    return s_nextIdentifier.fetch_add(1, std::memory_order_acq_rel);
   }
-  
+
   Principal::Principal(std::shared_ptr<ProductRegistry const> reg,
                        std::shared_ptr<ProductResolverIndexHelper const> productLookup,
                        ProcessConfiguration const& pc,
                        BranchType bt,
                        HistoryAppender* historyAppender,
-                       bool isForPrimaryProcess) :
-    EDProductGetter(),
-    processHistoryPtr_(),
-    processHistoryID_(),
-    processHistoryIDBeforeConfig_(),
-    processConfiguration_(&pc),
-    productResolvers_(),
-    preg_(reg),
-    productLookup_(productLookup),
-    lookupProcessOrder_(productLookup->lookupProcessNames().size(), 0),
-    reader_(),
-    branchType_(bt),
-    historyAppender_(historyAppender),
-    cacheIdentifier_(nextIdentifier())
-  {
+                       bool isForPrimaryProcess)
+      : EDProductGetter(),
+        processHistoryPtr_(),
+        processHistoryID_(),
+        processHistoryIDBeforeConfig_(),
+        processConfiguration_(&pc),
+        productResolvers_(),
+        preg_(reg),
+        productLookup_(productLookup),
+        lookupProcessOrder_(productLookup->lookupProcessNames().size(), 0),
+        reader_(),
+        branchType_(bt),
+        historyAppender_(historyAppender),
+        cacheIdentifier_(nextIdentifier()) {
     productResolvers_.resize(reg->getNextIndexValue(bt));
     //Now that these have been set, we can create the list of Branches we need.
     std::string const source("source");
@@ -140,20 +147,20 @@ namespace edm {
     // Therefore, on this first pass, skip current EDAliases.
     bool hasAliases = false;
     bool hasSwitchAliases = false;
-    for(auto const& prod : prodsList) {
+    for (auto const& prod : prodsList) {
       BranchDescription const& bd = prod.second;
-      if(bd.branchType() == branchType_) {
-        if(isForPrimaryProcess or bd.processName() == pc.processName()) {
-          if(bd.isAlias()) {
+      if (bd.branchType() == branchType_) {
+        if (isForPrimaryProcess or bd.processName() == pc.processName()) {
+          if (bd.isAlias()) {
             hasAliases = true;
-          } else if(bd.isSwitchAlias()) {
+          } else if (bd.isSwitchAlias()) {
             hasSwitchAliases = true;
           } else {
             auto cbd = std::make_shared<BranchDescription const>(bd);
-            if(bd.produced()) {
-              if(bd.moduleLabel() == source) {
+            if (bd.produced()) {
+              if (bd.moduleLabel() == source) {
                 addSourceProduct(cbd);
-              } else if(bd.onDemand()) {
+              } else if (bd.onDemand()) {
                 assert(branchType_ == InEvent);
                 addUnscheduledProduct(cbd);
               } else {
@@ -165,25 +172,25 @@ namespace edm {
           }
         } else {
           //We are in a SubProcess and this branch is from the parent
-          auto cbd =std::make_shared<BranchDescription const>(bd);
+          auto cbd = std::make_shared<BranchDescription const>(bd);
           addParentProcessProduct(cbd);
         }
       }
     }
     // Now process any EDAliases
-    if(hasAliases) {
-      for(auto const& prod : prodsList) {
+    if (hasAliases) {
+      for (auto const& prod : prodsList) {
         BranchDescription const& bd = prod.second;
-        if(bd.isAlias() && bd.branchType() == branchType_) {
+        if (bd.isAlias() && bd.branchType() == branchType_) {
           addAliasedProduct(std::make_shared<BranchDescription const>(bd));
         }
       }
     }
     // Finally process any SwitchProducer aliases
-    if(hasSwitchAliases) {
-      for(auto const& prod : prodsList) {
+    if (hasSwitchAliases) {
+      for (auto const& prod : prodsList) {
         BranchDescription const& bd = prod.second;
-        if(bd.isSwitchAlias() && bd.branchType() == branchType_) {
+        if (bd.isSwitchAlias() && bd.branchType() == branchType_) {
           assert(branchType_ == InEvent);
           auto cbd = std::make_shared<BranchDescription const>(bd);
           // Need different implementation for SwitchProducers not
@@ -191,10 +198,9 @@ namespace edm {
           // to prevent the switch-aliased-for EDProducers from
           // being run when the SwitchProducer is in a Path after a
           // failing EDFilter.
-          if(bd.onDemand()) {
+          if (bd.onDemand()) {
             addSwitchAliasProduct(cbd);
-          }
-          else {
+          } else {
             addSwitchProducerProduct(cbd);
           }
         }
@@ -214,36 +220,36 @@ namespace edm {
     std::vector<char> const& processNamesCharArray = productLookup_->processNames();
 
     unsigned int numberOfMatches = 0;
-    ProductResolverIndex lastMatchIndex =ProductResolverIndexInvalid;
+    ProductResolverIndex lastMatchIndex = ProductResolverIndexInvalid;
     if (!sortedTypeIDs.empty()) {
       ProductResolverIndex productResolverIndex = ProductResolverIndexInvalid;
-      for(unsigned int k = 0, kEnd = sortedTypeIDs.size(); k < kEnd; ++k) {
+      for (unsigned int k = 0, kEnd = sortedTypeIDs.size(); k < kEnd; ++k) {
         ProductResolverIndexHelper::Range const& range = ranges.at(k);
         for (unsigned int i = range.begin(); i < range.end(); ++i) {
           ProductResolverIndexHelper::IndexAndNames const& product = indexAndNames.at(i);
           if (product.startInProcessNames() == 0) {
             if (productResolverIndex != ProductResolverIndexInvalid) {
-              if ((numberOfMatches == 1) and
-                  (lastMatchIndex != ProductResolverIndexAmbiguous)) {
+              if ((numberOfMatches == 1) and (lastMatchIndex != ProductResolverIndexAmbiguous)) {
                 //only one choice so use a special resolver
-                productResolvers_.at(productResolverIndex) = std::make_shared<SingleChoiceNoProcessProductResolver>(lastMatchIndex);
+                productResolvers_.at(productResolverIndex) =
+                    std::make_shared<SingleChoiceNoProcessProductResolver>(lastMatchIndex);
               } else {
                 bool productMadeAtEnd = false;
                 //Need to know if the product from this processes is added at end of transition
-                for(unsigned int i=0; i< matchingHolders.size();++i) {
-                  if( (not ambiguous[i]) and
-                     ProductResolverIndexInvalid != matchingHolders[i] and
-                     productResolvers_[matchingHolders[i]]->branchDescription().availableOnlyAtEndTransition()) {
+                for (unsigned int i = 0; i < matchingHolders.size(); ++i) {
+                  if ((not ambiguous[i]) and ProductResolverIndexInvalid != matchingHolders[i] and
+                      productResolvers_[matchingHolders[i]]->branchDescription().availableOnlyAtEndTransition()) {
                     productMadeAtEnd = true;
                     break;
                   }
                 }
-                std::shared_ptr<ProductResolverBase> newHolder = std::make_shared<NoProcessProductResolver>(matchingHolders, ambiguous, productMadeAtEnd);
+                std::shared_ptr<ProductResolverBase> newHolder =
+                    std::make_shared<NoProcessProductResolver>(matchingHolders, ambiguous, productMadeAtEnd);
                 productResolvers_.at(productResolverIndex) = newHolder;
               }
               matchingHolders.assign(lookupProcessNames.size(), ProductResolverIndexInvalid);
               ambiguous.assign(lookupProcessNames.size(), false);
-              numberOfMatches= 0;
+              numberOfMatches = 0;
               lastMatchIndex = ProductResolverIndexInvalid;
             }
             productResolverIndex = product.index();
@@ -265,40 +271,36 @@ namespace edm {
         }
       }
       //Need to know if the product from this processes is added at end of transition
-      if ((numberOfMatches == 1) and
-          (lastMatchIndex != ProductResolverIndexAmbiguous)) {
+      if ((numberOfMatches == 1) and (lastMatchIndex != ProductResolverIndexAmbiguous)) {
         //only one choice so use a special resolver
-        productResolvers_.at(productResolverIndex) = std::make_shared<SingleChoiceNoProcessProductResolver>(lastMatchIndex);
+        productResolvers_.at(productResolverIndex) =
+            std::make_shared<SingleChoiceNoProcessProductResolver>(lastMatchIndex);
       } else {
         bool productMadeAtEnd = false;
-        for(unsigned int i=0; i< matchingHolders.size();++i) {
-          if( (not ambiguous[i]) and
-             ProductResolverIndexInvalid != matchingHolders[i] and
-             productResolvers_[matchingHolders[i]]->branchDescription().availableOnlyAtEndTransition()) {
+        for (unsigned int i = 0; i < matchingHolders.size(); ++i) {
+          if ((not ambiguous[i]) and ProductResolverIndexInvalid != matchingHolders[i] and
+              productResolvers_[matchingHolders[i]]->branchDescription().availableOnlyAtEndTransition()) {
             productMadeAtEnd = true;
             break;
           }
         }
-        std::shared_ptr<ProductResolverBase> newHolder = std::make_shared<NoProcessProductResolver>(matchingHolders, ambiguous, productMadeAtEnd);
+        std::shared_ptr<ProductResolverBase> newHolder =
+            std::make_shared<NoProcessProductResolver>(matchingHolders, ambiguous, productMadeAtEnd);
         productResolvers_.at(productResolverIndex) = newHolder;
       }
     }
   }
 
-  Principal::~Principal() {
-  }
+  Principal::~Principal() {}
 
   // Number of products in the Principal.
   // For products in an input file and not yet read in due to delayed read,
   // this routine assumes a real product is there.
-  size_t
-  Principal::size() const {
+  size_t Principal::size() const {
     size_t size = 0U;
-    for(auto const& prod : *this) {
-      if(prod->singleProduct() && // Not a NoProcessProductResolver
-         !prod->productUnavailable() &&
-         !prod->unscheduledWasNotRun() &&
-         !prod->branchDescription().dropped()) {
+    for (auto const& prod : *this) {
+      if (prod->singleProduct() &&  // Not a NoProcessProductResolver
+          !prod->productUnavailable() && !prod->unscheduledWasNotRun() && !prod->branchDescription().dropped()) {
         ++size;
       }
     }
@@ -306,16 +308,15 @@ namespace edm {
   }
 
   // adjust provenance for input products after new input file has been merged
-  bool
-  Principal::adjustToNewProductRegistry(ProductRegistry const& reg) {
+  bool Principal::adjustToNewProductRegistry(ProductRegistry const& reg) {
     ProductRegistry::ProductList const& prodsList = reg.productList();
-    for(auto const& prod : prodsList) {
+    for (auto const& prod : prodsList) {
       BranchDescription const& bd = prod.second;
-      if(!bd.produced() && (bd.branchType() == branchType_)) {
+      if (!bd.produced() && (bd.branchType() == branchType_)) {
         auto cbd = std::make_shared<BranchDescription const>(bd);
         auto phb = getExistingProduct(cbd->branchID());
-        if(phb == nullptr || phb->branchDescription().branchName() != cbd->branchName()) {
-            return false;
+        if (phb == nullptr || phb->branchDescription().branchName() != cbd->branchName()) {
+          return false;
         }
         phb->resetBranchDescription(cbd);
       }
@@ -323,122 +324,105 @@ namespace edm {
     return true;
   }
 
-  void
-  Principal::addScheduledProduct(std::shared_ptr<BranchDescription const> bd) {
+  void Principal::addScheduledProduct(std::shared_ptr<BranchDescription const> bd) {
     auto phb = std::make_unique<PuttableProductResolver>(std::move(bd));
     addProductOrThrow(std::move(phb));
   }
 
-  void
-  Principal::addSourceProduct(std::shared_ptr<BranchDescription const> bd) {
+  void Principal::addSourceProduct(std::shared_ptr<BranchDescription const> bd) {
     auto phb = std::make_unique<PuttableProductResolver>(std::move(bd));
     addProductOrThrow(std::move(phb));
   }
 
-  void
-  Principal::addInputProduct(std::shared_ptr<BranchDescription const> bd) {
+  void Principal::addInputProduct(std::shared_ptr<BranchDescription const> bd) {
     addProductOrThrow(std::make_unique<InputProductResolver>(std::move(bd)));
   }
 
-  void
-  Principal::addUnscheduledProduct(std::shared_ptr<BranchDescription const> bd) {
+  void Principal::addUnscheduledProduct(std::shared_ptr<BranchDescription const> bd) {
     addProductOrThrow(std::make_unique<UnscheduledProductResolver>(std::move(bd)));
   }
 
-  void
-  Principal::addAliasedProduct(std::shared_ptr<BranchDescription const> bd) {
+  void Principal::addAliasedProduct(std::shared_ptr<BranchDescription const> bd) {
     ProductResolverIndex index = preg_->indexFrom(bd->originalBranchID());
     assert(index != ProductResolverIndexInvalid);
 
-    addProductOrThrow(std::make_unique<AliasProductResolver>(std::move(bd), dynamic_cast<DataManagingOrAliasProductResolver&>(*productResolvers_[index])));
+    addProductOrThrow(std::make_unique<AliasProductResolver>(
+        std::move(bd), dynamic_cast<DataManagingOrAliasProductResolver&>(*productResolvers_[index])));
   }
 
-  void
-  Principal::addSwitchProducerProduct(std::shared_ptr<BranchDescription const> bd) {
+  void Principal::addSwitchProducerProduct(std::shared_ptr<BranchDescription const> bd) {
     ProductResolverIndex index = preg_->indexFrom(bd->switchAliasForBranchID());
     assert(index != ProductResolverIndexInvalid);
 
-    addProductOrThrow(std::make_unique<SwitchProducerProductResolver>(std::move(bd), dynamic_cast<DataManagingOrAliasProductResolver&>(*productResolvers_[index])));
+    addProductOrThrow(std::make_unique<SwitchProducerProductResolver>(
+        std::move(bd), dynamic_cast<DataManagingOrAliasProductResolver&>(*productResolvers_[index])));
   }
 
-  void
-  Principal::addSwitchAliasProduct(std::shared_ptr<BranchDescription const> bd) {
+  void Principal::addSwitchAliasProduct(std::shared_ptr<BranchDescription const> bd) {
     ProductResolverIndex index = preg_->indexFrom(bd->switchAliasForBranchID());
     assert(index != ProductResolverIndexInvalid);
 
-    addProductOrThrow(std::make_unique<SwitchAliasProductResolver>(std::move(bd), dynamic_cast<DataManagingOrAliasProductResolver&>(*productResolvers_[index])));
+    addProductOrThrow(std::make_unique<SwitchAliasProductResolver>(
+        std::move(bd), dynamic_cast<DataManagingOrAliasProductResolver&>(*productResolvers_[index])));
   }
 
-  void
-  Principal::addParentProcessProduct(std::shared_ptr<BranchDescription const> bd) {
+  void Principal::addParentProcessProduct(std::shared_ptr<BranchDescription const> bd) {
     addProductOrThrow(std::make_unique<ParentProcessProductResolver>(std::move(bd)));
   }
 
   // "Zero" the principal so it can be reused for another Event.
-  void
-  Principal::clearPrincipal() {
+  void Principal::clearPrincipal() {
     //We do not clear the product history information
     // because it rarely changes and recalculating takes
     // time.
     reader_ = nullptr;
-    for(auto& prod : *this) {
+    for (auto& prod : *this) {
       prod->resetProductData();
     }
   }
 
-  void
-  Principal::deleteProduct(BranchID const& id) const {
+  void Principal::deleteProduct(BranchID const& id) const {
     auto phb = getExistingProduct(id);
     assert(nullptr != phb);
     phb->unsafe_deleteProduct();
   }
-  
-  void
-  Principal::setupUnscheduled(UnscheduledConfigurator const& iConfigure) {
-    applyToResolvers([&iConfigure](ProductResolverBase* iResolver) {
-      iResolver->setupUnscheduled(iConfigure);
-    });
+
+  void Principal::setupUnscheduled(UnscheduledConfigurator const& iConfigure) {
+    applyToResolvers([&iConfigure](ProductResolverBase* iResolver) { iResolver->setupUnscheduled(iConfigure); });
   }
-  
 
   // Set the principal for the Event, Lumi, or Run.
-  void
-  Principal::fillPrincipal(ProcessHistoryID const& hist,
-                           ProcessHistoryRegistry const& processHistoryRegistry,
-                           DelayedReader* reader) {
+  void Principal::fillPrincipal(ProcessHistoryID const& hist,
+                                ProcessHistoryRegistry const& processHistoryRegistry,
+                                DelayedReader* reader) {
     //increment identifier here since clearPrincipal isn't called for Run/Lumi
-    cacheIdentifier_=nextIdentifier();
-    if(reader) {
+    cacheIdentifier_ = nextIdentifier();
+    if (reader) {
       reader_ = reader;
     }
 
     if (historyAppender_ && productRegistry().anyProductProduced()) {
-      if( (not processHistoryPtr_) || (processHistoryIDBeforeConfig_ != hist) ) {
-        processHistoryPtr_ =
-          historyAppender_->appendToProcessHistory(hist,
-                                                   processHistoryRegistry.  getMapped(hist),
-                                                   *processConfiguration_);
+      if ((not processHistoryPtr_) || (processHistoryIDBeforeConfig_ != hist)) {
+        processHistoryPtr_ = historyAppender_->appendToProcessHistory(
+            hist, processHistoryRegistry.getMapped(hist), *processConfiguration_);
         processHistoryID_ = processHistoryPtr_->id();
         processHistoryIDBeforeConfig_ = hist;
       }
-    }
-    else {
+    } else {
       std::shared_ptr<ProcessHistory const> inputProcessHistory;
-      if( (not processHistoryPtr_) || (processHistoryIDBeforeConfig_ != hist) ) {
+      if ((not processHistoryPtr_) || (processHistoryIDBeforeConfig_ != hist)) {
         if (hist.isValid()) {
           //does not own the pointer
-          auto noDel =[](void const*){};
-          inputProcessHistory =
-          std::shared_ptr<ProcessHistory const>(processHistoryRegistry.getMapped(hist),noDel);
+          auto noDel = [](void const*) {};
+          inputProcessHistory = std::shared_ptr<ProcessHistory const>(processHistoryRegistry.getMapped(hist), noDel);
           if (inputProcessHistory.get() == nullptr) {
-            throw Exception(errors::LogicError)
-              << "Principal::fillPrincipal\n"
-              << "Input ProcessHistory not found in registry\n"
-              << "Contact a Framework developer\n";
+            throw Exception(errors::LogicError) << "Principal::fillPrincipal\n"
+                                                << "Input ProcessHistory not found in registry\n"
+                                                << "Contact a Framework developer\n";
           }
         } else {
           //Since this is static we don't want it deleted
-          inputProcessHistory = std::shared_ptr<ProcessHistory const>(&s_emptyProcessHistory,[](void const*){});
+          inputProcessHistory = std::shared_ptr<ProcessHistory const>(&s_emptyProcessHistory, [](void const*) {});
           //no need to do any ordering since it is empty
           orderProcessHistoryID_ = hist;
         }
@@ -461,7 +445,8 @@ namespace edm {
       // The current process might be needed but not be in the process
       // history if all the products produced in the current process are
       // transient.
-      auto nameIter = std::find(lookupProcessNames.begin(), lookupProcessNames.end(), processConfiguration_->processName());
+      auto nameIter =
+          std::find(lookupProcessNames.begin(), lookupProcessNames.end(), processConfiguration_->processName());
       if (nameIter != lookupProcessNames.end()) {
         lookupProcessOrder_.at(k) = nameIter - lookupProcessNames.begin();
         ++k;
@@ -486,28 +471,27 @@ namespace edm {
     }
   }
 
-  ProductResolverBase*
-  Principal::getExistingProduct(BranchID const& branchID) {
-    return const_cast<ProductResolverBase*>( const_cast<const Principal*>(this)->getExistingProduct(branchID));
+  ProductResolverBase* Principal::getExistingProduct(BranchID const& branchID) {
+    return const_cast<ProductResolverBase*>(const_cast<const Principal*>(this)->getExistingProduct(branchID));
   }
 
-  ProductResolverBase const*
-  Principal::getExistingProduct(BranchID const& branchID) const {
+  ProductResolverBase const* Principal::getExistingProduct(BranchID const& branchID) const {
     ProductResolverIndex index = preg_->indexFrom(branchID);
     assert(index != ProductResolverIndexInvalid);
     return productResolvers_.at(index).get();
   }
 
-  ProductResolverBase const*
-  Principal::getExistingProduct(ProductResolverBase const& productResolver) const {
+  ProductResolverBase const* Principal::getExistingProduct(ProductResolverBase const& productResolver) const {
     auto phb = getExistingProduct(productResolver.branchDescription().branchID());
-    if(nullptr != phb && BranchKey(productResolver.branchDescription()) != BranchKey(phb->branchDescription())) {
+    if (nullptr != phb && BranchKey(productResolver.branchDescription()) != BranchKey(phb->branchDescription())) {
       BranchDescription const& newProduct = phb->branchDescription();
       BranchDescription const& existing = productResolver.branchDescription();
-      if(newProduct.branchName() != existing.branchName() && newProduct.branchID() == existing.branchID()) {
-        throw cms::Exception("HashCollision") << "Principal::getExistingProduct\n" <<
-          " Branch " << newProduct.branchName() << " has same branch ID as branch " << existing.branchName() << "\n" <<
-          "Workaround: change process name or product instance name of " << newProduct.branchName() << "\n";
+      if (newProduct.branchName() != existing.branchName() && newProduct.branchID() == existing.branchID()) {
+        throw cms::Exception("HashCollision")
+            << "Principal::getExistingProduct\n"
+            << " Branch " << newProduct.branchName() << " has same branch ID as branch " << existing.branchName()
+            << "\n"
+            << "Workaround: change process name or product instance name of " << newProduct.branchName() << "\n";
       } else {
         assert(nullptr == phb || BranchKey(productResolver.branchDescription()) == BranchKey(phb->branchDescription()));
       }
@@ -515,13 +499,12 @@ namespace edm {
     return phb;
   }
 
-  void
-  Principal::addProduct_(std::unique_ptr<ProductResolverBase> productResolver) {
+  void Principal::addProduct_(std::unique_ptr<ProductResolverBase> productResolver) {
     BranchDescription const& bd = productResolver->branchDescription();
-    assert (!bd.className().empty());
-    assert (!bd.friendlyClassName().empty());
-    assert (!bd.moduleLabel().empty());
-    assert (!bd.processName().empty());
+    assert(!bd.className().empty());
+    assert(!bd.friendlyClassName().empty());
+    assert(!bd.moduleLabel().empty());
+    assert(!bd.processName().empty());
     SharedProductPtr phb(productResolver.release());
 
     ProductResolverIndex index = preg_->indexFrom(bd.branchID());
@@ -529,96 +512,88 @@ namespace edm {
     productResolvers_[index] = phb;
   }
 
-  void
-  Principal::addProductOrThrow(std::unique_ptr<ProductResolverBase> productResolver) {
+  void Principal::addProductOrThrow(std::unique_ptr<ProductResolverBase> productResolver) {
     ProductResolverBase const* phb = getExistingProduct(*productResolver);
-    if(phb != nullptr) {
+    if (phb != nullptr) {
       BranchDescription const& bd = productResolver->branchDescription();
       throw Exception(errors::InsertFailure, "AlreadyPresent")
           << "addProductOrThrow: Problem found while adding product, "
-          << "product already exists for ("
-          << bd.friendlyClassName() << ","
-          << bd.moduleLabel() << ","
-          << bd.productInstanceName() << ","
-          << bd.processName()
-          << ")\n";
+          << "product already exists for (" << bd.friendlyClassName() << "," << bd.moduleLabel() << ","
+          << bd.productInstanceName() << "," << bd.processName() << ")\n";
     }
     addProduct_(std::move(productResolver));
   }
 
-  Principal::ConstProductResolverPtr
-  Principal::getProductResolver(BranchID const& bid) const {
+  Principal::ConstProductResolverPtr Principal::getProductResolver(BranchID const& bid) const {
     ProductResolverIndex index = preg_->indexFrom(bid);
-    if(index == ProductResolverIndexInvalid){
-       return ConstProductResolverPtr();
+    if (index == ProductResolverIndexInvalid) {
+      return ConstProductResolverPtr();
     }
     return getProductResolverByIndex(index);
   }
 
-  Principal::ConstProductResolverPtr
-  Principal::getProductResolverByIndex(ProductResolverIndex const& index) const {
-
+  Principal::ConstProductResolverPtr Principal::getProductResolverByIndex(ProductResolverIndex const& index) const {
     ConstProductResolverPtr const phb = productResolvers_[index].get();
     return phb;
   }
 
-  BasicHandle
-  Principal::getByLabel(KindOfType kindOfType,
-                        TypeID const& typeID,
-                        InputTag const& inputTag,
-                        EDConsumerBase const* consumer,
-                        SharedResourcesAcquirer* sra,
-                        ModuleCallingContext const* mcc) const {
-
+  BasicHandle Principal::getByLabel(KindOfType kindOfType,
+                                    TypeID const& typeID,
+                                    InputTag const& inputTag,
+                                    EDConsumerBase const* consumer,
+                                    SharedResourcesAcquirer* sra,
+                                    ModuleCallingContext const* mcc) const {
     ProductData const* result = findProductByLabel(kindOfType, typeID, inputTag, consumer, sra, mcc);
-    if(result == nullptr) {
-      return BasicHandle(makeHandleExceptionFactory([=]()->std::shared_ptr<cms::Exception> {
-        return makeNotFoundException("getByLabel", kindOfType, typeID, inputTag.label(), inputTag.instance(),
-                                     appendCurrentProcessIfAlias(inputTag.process(), processConfiguration_->processName()));
+    if (result == nullptr) {
+      return BasicHandle(makeHandleExceptionFactory([=]() -> std::shared_ptr<cms::Exception> {
+        return makeNotFoundException(
+            "getByLabel",
+            kindOfType,
+            typeID,
+            inputTag.label(),
+            inputTag.instance(),
+            appendCurrentProcessIfAlias(inputTag.process(), processConfiguration_->processName()));
       }));
     }
     return BasicHandle(result->wrapper(), &(result->provenance()));
   }
 
-  BasicHandle
-  Principal::getByLabel(KindOfType kindOfType,
-                        TypeID const& typeID,
-                        std::string const& label,
-                        std::string const& instance,
-                        std::string const& process,
-                        EDConsumerBase const* consumer,
-                        SharedResourcesAcquirer* sra,
-                        ModuleCallingContext const* mcc) const {
-
-    ProductData const* result = findProductByLabel(kindOfType, typeID, label, instance, process,consumer, sra, mcc);
-    if(result == nullptr) {
-      return BasicHandle(makeHandleExceptionFactory([=]()->std::shared_ptr<cms::Exception> {
+  BasicHandle Principal::getByLabel(KindOfType kindOfType,
+                                    TypeID const& typeID,
+                                    std::string const& label,
+                                    std::string const& instance,
+                                    std::string const& process,
+                                    EDConsumerBase const* consumer,
+                                    SharedResourcesAcquirer* sra,
+                                    ModuleCallingContext const* mcc) const {
+    ProductData const* result = findProductByLabel(kindOfType, typeID, label, instance, process, consumer, sra, mcc);
+    if (result == nullptr) {
+      return BasicHandle(makeHandleExceptionFactory([=]() -> std::shared_ptr<cms::Exception> {
         return makeNotFoundException("getByLabel", kindOfType, typeID, label, instance, process);
       }));
     }
     return BasicHandle(result->wrapper(), &(result->provenance()));
   }
 
-  BasicHandle
-  Principal::getByToken(KindOfType,
-                        TypeID const&,
-                        ProductResolverIndex index,
-                        bool skipCurrentProcess,
-                        bool& ambiguous,
-                        SharedResourcesAcquirer* sra,
-                        ModuleCallingContext const* mcc) const {
-    assert(index !=ProductResolverIndexInvalid);
+  BasicHandle Principal::getByToken(KindOfType,
+                                    TypeID const&,
+                                    ProductResolverIndex index,
+                                    bool skipCurrentProcess,
+                                    bool& ambiguous,
+                                    SharedResourcesAcquirer* sra,
+                                    ModuleCallingContext const* mcc) const {
+    assert(index != ProductResolverIndexInvalid);
     auto& productResolver = productResolvers_[index];
-    assert(nullptr!=productResolver.get());
+    assert(nullptr != productResolver.get());
     auto resolution = productResolver->resolveProduct(*this, skipCurrentProcess, sra, mcc);
-    if(resolution.isAmbiguous()) {
+    if (resolution.isAmbiguous()) {
       ambiguous = true;
       //The caller is looking explicitly for this case
       // and uses the extra data at the caller to setup the exception
       return BasicHandle::makeInvalid();
     }
     auto productData = resolution.data();
-    if(productData == nullptr) {
+    if (productData == nullptr) {
       //The caller is looking explicitly for this case
       // and uses the extra data at the caller to setup the exception
       return BasicHandle::makeInvalid();
@@ -626,33 +601,29 @@ namespace edm {
     return BasicHandle(productData->wrapper(), &(productData->provenance()));
   }
 
-  void
-  Principal::prefetchAsync(WaitingTask * task,
-                      ProductResolverIndex index,
-                      bool skipCurrentProcess,
-                      ServiceToken const& token,
-                      ModuleCallingContext const* mcc) const {
+  void Principal::prefetchAsync(WaitingTask* task,
+                                ProductResolverIndex index,
+                                bool skipCurrentProcess,
+                                ServiceToken const& token,
+                                ModuleCallingContext const* mcc) const {
     auto const& productResolver = productResolvers_.at(index);
-    assert(nullptr!=productResolver.get());
-    productResolver->prefetchAsync(task,*this, skipCurrentProcess,token, nullptr,mcc);
+    assert(nullptr != productResolver.get());
+    productResolver->prefetchAsync(task, *this, skipCurrentProcess, token, nullptr, mcc);
   }
 
-  void
-  Principal::getManyByType(TypeID const& typeID,
-                           BasicHandleVec& results,
-                           EDConsumerBase const* consumer,
-                           SharedResourcesAcquirer* sra,
-                           ModuleCallingContext const* mcc) const {
-
+  void Principal::getManyByType(TypeID const& typeID,
+                                BasicHandleVec& results,
+                                EDConsumerBase const* consumer,
+                                SharedResourcesAcquirer* sra,
+                                ModuleCallingContext const* mcc) const {
     assert(results.empty());
 
-    if(UNLIKELY(consumer and (not consumer->registeredToConsumeMany(typeID,branchType())))) {
+    if (UNLIKELY(consumer and (not consumer->registeredToConsumeMany(typeID, branchType())))) {
       failedToRegisterConsumesMany(typeID);
     }
 
     // This finds the indexes to all the ProductResolver's matching the type
-    ProductResolverIndexHelper::Matches matches =
-      productLookup().relatedIndexes(PRODUCT_TYPE, typeID);
+    ProductResolverIndexHelper::Matches matches = productLookup().relatedIndexes(PRODUCT_TYPE, typeID);
 
     if (matches.numberOfMatches() == 0) {
       return;
@@ -681,16 +652,15 @@ namespace edm {
     // a label and instance. We do not need these for getManyByType and
     // skip them. In addition to skipping them, we make use of the fact
     // that they mark the beginning of each subset of holders with the same
-    // label and instance. They tell us when to call findProducts. 
+    // label and instance. They tell us when to call findProducts.
 
     std::vector<ProductResolverBase const*> holders;
 
-    for(unsigned int i = 0; i < matches.numberOfMatches(); ++i) {
-
+    for (unsigned int i = 0; i < matches.numberOfMatches(); ++i) {
       ProductResolverIndex index = matches.index(i);
 
-      if(!matches.isFullyResolved(i)) {
-        if(!holders.empty()) {
+      if (!matches.isFullyResolved(i)) {
+        if (!holders.empty()) {
           // Process the ones with a particular module label and instance
           findProducts(holders, typeID, results, sra, mcc);
           holders.clear();
@@ -702,34 +672,29 @@ namespace edm {
       }
     }
     // Do not miss the last subset of products
-    if(!holders.empty()) {
+    if (!holders.empty()) {
       findProducts(holders, typeID, results, sra, mcc);
     }
     return;
   }
 
-  void
-  Principal::findProducts(std::vector<ProductResolverBase const*> const& holders,
-                          TypeID const&,
-                          BasicHandleVec& results,
-                          SharedResourcesAcquirer* sra,
-                          ModuleCallingContext const* mcc) const {
-
-    for (auto iter = processHistoryPtr_->rbegin(),
-              iEnd = processHistoryPtr_->rend();
-         iter != iEnd; ++iter) {
+  void Principal::findProducts(std::vector<ProductResolverBase const*> const& holders,
+                               TypeID const&,
+                               BasicHandleVec& results,
+                               SharedResourcesAcquirer* sra,
+                               ModuleCallingContext const* mcc) const {
+    for (auto iter = processHistoryPtr_->rbegin(), iEnd = processHistoryPtr_->rend(); iter != iEnd; ++iter) {
       std::string const& process = iter->processName();
       for (auto productResolver : holders) {
         BranchDescription const& bd = productResolver->branchDescription();
         if (process == bd.processName()) {
-
           // Ignore aliases to avoid matching the same product multiple times.
-          if(bd.isAnyAlias()) {
+          if (bd.isAnyAlias()) {
             continue;
           }
 
-          ProductData const* productData = productResolver->resolveProduct(*this,false, sra, mcc).data();
-          if(productData) {
+          ProductData const* productData = productResolver->resolveProduct(*this, false, sra, mcc).data();
+          if (productData) {
             // Skip product if not available.
             results.emplace_back(productData->wrapper(), &(productData->provenance()));
           }
@@ -738,20 +703,17 @@ namespace edm {
     }
   }
 
-  ProductData const*
-  Principal::findProductByLabel(KindOfType kindOfType,
-                                TypeID const& typeID,
-                                InputTag const& inputTag,
-                                EDConsumerBase const* consumer,
-                                SharedResourcesAcquirer* sra,
-                                ModuleCallingContext const* mcc) const {
-
+  ProductData const* Principal::findProductByLabel(KindOfType kindOfType,
+                                                   TypeID const& typeID,
+                                                   InputTag const& inputTag,
+                                                   EDConsumerBase const* consumer,
+                                                   SharedResourcesAcquirer* sra,
+                                                   ModuleCallingContext const* mcc) const {
     bool skipCurrentProcess = inputTag.willSkipCurrentProcess();
 
     ProductResolverIndex index = inputTag.indexFor(typeID, branchType(), &productRegistry());
 
     if (index == ProductResolverIndexInvalid) {
-
       char const* processName = inputTag.process().c_str();
       if (skipCurrentProcess) {
         processName = "\0";
@@ -759,93 +721,86 @@ namespace edm {
         processName = processConfiguration_->processName().c_str();
       }
 
-      index = productLookup().index(kindOfType,
-                                    typeID,
-                                    inputTag.label().c_str(),
-                                    inputTag.instance().c_str(),
-                                    processName);
+      index =
+          productLookup().index(kindOfType, typeID, inputTag.label().c_str(), inputTag.instance().c_str(), processName);
 
-      if(index == ProductResolverIndexAmbiguous) {
-        throwAmbiguousException("findProductByLabel", typeID, inputTag.label(), inputTag.instance(),
+      if (index == ProductResolverIndexAmbiguous) {
+        throwAmbiguousException("findProductByLabel",
+                                typeID,
+                                inputTag.label(),
+                                inputTag.instance(),
                                 appendCurrentProcessIfAlias(inputTag.process(), processConfiguration_->processName()));
       } else if (index == ProductResolverIndexInvalid) {
         return nullptr;
       }
       inputTag.tryToCacheIndex(index, typeID, branchType(), &productRegistry());
     }
-    if(UNLIKELY( consumer and (not consumer->registeredToConsume(index, skipCurrentProcess, branchType())))) {
-      failedToRegisterConsumes(kindOfType,typeID,inputTag.label(),inputTag.instance(),
+    if (UNLIKELY(consumer and (not consumer->registeredToConsume(index, skipCurrentProcess, branchType())))) {
+      failedToRegisterConsumes(kindOfType,
+                               typeID,
+                               inputTag.label(),
+                               inputTag.instance(),
                                appendCurrentProcessIfAlias(inputTag.process(), processConfiguration_->processName()));
     }
 
-    
     auto const& productResolver = productResolvers_[index];
 
     auto resolution = productResolver->resolveProduct(*this, skipCurrentProcess, sra, mcc);
-    if(resolution.isAmbiguous()) {
-      throwAmbiguousException("findProductByLabel", typeID, inputTag.label(), inputTag.instance(),
+    if (resolution.isAmbiguous()) {
+      throwAmbiguousException("findProductByLabel",
+                              typeID,
+                              inputTag.label(),
+                              inputTag.instance(),
                               appendCurrentProcessIfAlias(inputTag.process(), processConfiguration_->processName()));
     }
     return resolution.data();
   }
 
-  ProductData const*
-  Principal::findProductByLabel(KindOfType kindOfType,
-                                TypeID const& typeID,
-                                std::string const& label,
-                                std::string const& instance,
-                                std::string const& process,
-                                EDConsumerBase const* consumer,
-                                SharedResourcesAcquirer* sra,
-                                ModuleCallingContext const* mcc) const {
+  ProductData const* Principal::findProductByLabel(KindOfType kindOfType,
+                                                   TypeID const& typeID,
+                                                   std::string const& label,
+                                                   std::string const& instance,
+                                                   std::string const& process,
+                                                   EDConsumerBase const* consumer,
+                                                   SharedResourcesAcquirer* sra,
+                                                   ModuleCallingContext const* mcc) const {
+    ProductResolverIndex index =
+        productLookup().index(kindOfType, typeID, label.c_str(), instance.c_str(), process.c_str());
 
-    ProductResolverIndex index = productLookup().index(kindOfType,
-                                                     typeID,
-                                                     label.c_str(),
-                                                     instance.c_str(),
-                                                     process.c_str());
-   
-    if(index == ProductResolverIndexAmbiguous) {
+    if (index == ProductResolverIndexAmbiguous) {
       throwAmbiguousException("findProductByLabel", typeID, label, instance, process);
     } else if (index == ProductResolverIndexInvalid) {
       return nullptr;
     }
-    
-    if(UNLIKELY( consumer and (not consumer->registeredToConsume(index, false, branchType())))) {
-      failedToRegisterConsumes(kindOfType,typeID,label,instance,process);
+
+    if (UNLIKELY(consumer and (not consumer->registeredToConsume(index, false, branchType())))) {
+      failedToRegisterConsumes(kindOfType, typeID, label, instance, process);
     }
-    
+
     auto const& productResolver = productResolvers_[index];
 
     auto resolution = productResolver->resolveProduct(*this, false, sra, mcc);
-    if(resolution.isAmbiguous()) {
+    if (resolution.isAmbiguous()) {
       throwAmbiguousException("findProductByLabel", typeID, label, instance, process);
     }
     return resolution.data();
   }
 
-  ProductData const*
-  Principal::findProductByTag(TypeID const& typeID, InputTag const& tag, ModuleCallingContext const* mcc) const {
-    ProductData const* productData =
-      findProductByLabel(PRODUCT_TYPE,
-                         typeID,
-                         tag,
-                         nullptr,
-                         nullptr,
-                         mcc);
+  ProductData const* Principal::findProductByTag(TypeID const& typeID,
+                                                 InputTag const& tag,
+                                                 ModuleCallingContext const* mcc) const {
+    ProductData const* productData = findProductByLabel(PRODUCT_TYPE, typeID, tag, nullptr, nullptr, mcc);
     return productData;
   }
 
-  Provenance
-  Principal::getProvenance(BranchID const& bid,
-                           ModuleCallingContext const* mcc) const {
+  Provenance Principal::getProvenance(BranchID const& bid, ModuleCallingContext const* mcc) const {
     ConstProductResolverPtr const phb = getProductResolver(bid);
-    if(phb == nullptr) {
+    if (phb == nullptr) {
       throwProductNotFoundException("getProvenance", errors::ProductNotFound, bid);
     }
 
-    if(phb->unscheduledWasNotRun()) {
-      if(not phb->resolveProduct(*this,false, nullptr, mcc).data() ) {
+    if (phb->unscheduledWasNotRun()) {
+      if (not phb->resolveProduct(*this, false, nullptr, mcc).data()) {
         throwProductNotFoundException("getProvenance(onDemand)", errors::ProductNotFound, bid);
       }
     }
@@ -855,15 +810,15 @@ namespace edm {
   // This one is mostly for test printout purposes
   // No attempt to trigger on demand execution
   // Skips provenance when the EDProduct is not there
-  void
-  Principal::getAllProvenance(std::vector<Provenance const*>& provenances) const {
+  void Principal::getAllProvenance(std::vector<Provenance const*>& provenances) const {
     provenances.clear();
-    for(auto const& productResolver : *this) {
-      if(productResolver->singleProduct() && productResolver->provenanceAvailable() && !productResolver->branchDescription().isAnyAlias()) {
+    for (auto const& productResolver : *this) {
+      if (productResolver->singleProduct() && productResolver->provenanceAvailable() &&
+          !productResolver->branchDescription().isAnyAlias()) {
         // We do not attempt to get the event/lumi/run status from the provenance,
         // because the per event provenance may have been dropped.
-        if(productResolver->provenance()->branchDescription().present()) {
-           provenances.push_back(productResolver->provenance());
+        if (productResolver->provenance()->branchDescription().present()) {
+          provenances.push_back(productResolver->provenance());
         }
       }
     }
@@ -872,60 +827,53 @@ namespace edm {
   // This one is also mostly for test printout purposes
   // No attempt to trigger on demand execution
   // Skips provenance for dropped branches.
-  void
-  Principal::getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const {
+  void Principal::getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const {
     provenances.clear();
-    for(auto const& productResolver : *this) {
-      if(productResolver->singleProduct() && !productResolver->branchDescription().isAnyAlias()) {
-        if(productResolver->stableProvenance()->branchDescription().present()) {
-           provenances.push_back(productResolver->stableProvenance());
+    for (auto const& productResolver : *this) {
+      if (productResolver->singleProduct() && !productResolver->branchDescription().isAnyAlias()) {
+        if (productResolver->stableProvenance()->branchDescription().present()) {
+          provenances.push_back(productResolver->stableProvenance());
         }
       }
     }
   }
- 
-  void
-  Principal::recombine(Principal& other, std::vector<BranchID> const& bids) {
-    for(auto& prod : bids) {
-      ProductResolverIndex index= preg_->indexFrom(prod);
-      assert(index!=ProductResolverIndexInvalid);
+
+  void Principal::recombine(Principal& other, std::vector<BranchID> const& bids) {
+    for (auto& prod : bids) {
+      ProductResolverIndex index = preg_->indexFrom(prod);
+      assert(index != ProductResolverIndexInvalid);
       ProductResolverIndex indexO = other.preg_->indexFrom(prod);
-      assert(indexO!=ProductResolverIndexInvalid);
+      assert(indexO != ProductResolverIndexInvalid);
       get_underlying_safe(productResolvers_[index]).swap(get_underlying_safe(other.productResolvers_[indexO]));
     }
     reader_->mergeReaders(other.reader());
   }
 
-  WrapperBase const*
-  Principal::getIt(ProductID const&) const {
+  WrapperBase const* Principal::getIt(ProductID const&) const {
     assert(false);
     return nullptr;
   }
 
-  WrapperBase const*
-  Principal::getThinnedProduct(ProductID const&, unsigned int&) const {
+  WrapperBase const* Principal::getThinnedProduct(ProductID const&, unsigned int&) const {
     assert(false);
     return nullptr;
   }
 
-  void
-  Principal::getThinnedProducts(ProductID const&,
-                                  std::vector<WrapperBase const*>&,
-                                  std::vector<unsigned int>&) const {
+  void Principal::getThinnedProducts(ProductID const&,
+                                     std::vector<WrapperBase const*>&,
+                                     std::vector<unsigned int>&) const {
     assert(false);
   }
 
-  void
-  Principal::putOrMerge(std::unique_ptr<WrapperBase> prod, ProductResolverBase const* phb) const {
+  void Principal::putOrMerge(std::unique_ptr<WrapperBase> prod, ProductResolverBase const* phb) const {
     phb->putOrMergeProduct(std::move(prod));
   }
 
-  void
-  Principal::putOrMerge(BranchDescription const& bd, std::unique_ptr<WrapperBase>  edp) const {
-    if(edp.get() == nullptr) {
-      throw edm::Exception(edm::errors::InsertFailure,"Null Pointer")
-      << "put: Cannot put because unique_ptr to product is null."
-      << "\n";
+  void Principal::putOrMerge(BranchDescription const& bd, std::unique_ptr<WrapperBase> edp) const {
+    if (edp.get() == nullptr) {
+      throw edm::Exception(edm::errors::InsertFailure, "Null Pointer")
+          << "put: Cannot put because unique_ptr to product is null."
+          << "\n";
     }
     auto phb = getExistingProduct(bd.branchID());
     assert(phb);
@@ -933,17 +881,15 @@ namespace edm {
     putOrMerge(std::move(edp), phb);
   }
 
-
-  void
-  Principal::adjustIndexesAfterProductRegistryAddition() {
-    if(preg_->getNextIndexValue(branchType_) != productResolvers_.size()) {
+  void Principal::adjustIndexesAfterProductRegistryAddition() {
+    if (preg_->getNextIndexValue(branchType_) != productResolvers_.size()) {
       productResolvers_.resize(preg_->getNextIndexValue(branchType_));
-      for(auto const& prod : preg_->productList()) {
+      for (auto const& prod : preg_->productList()) {
         BranchDescription const& bd = prod.second;
-        if(bd.branchType() == branchType_) {
+        if (bd.branchType() == branchType_) {
           ProductResolverIndex index = preg_->indexFrom(bd.branchID());
           assert(index != ProductResolverIndexInvalid);
-          if(!productResolvers_[index]) {
+          if (!productResolvers_[index]) {
             // no product holder.  Must add one. The new entry must be an input product holder.
             assert(!bd.produced());
             auto cbd = std::make_shared<BranchDescription const>(bd);
@@ -954,13 +900,14 @@ namespace edm {
     }
     assert(preg_->getNextIndexValue(branchType_) == productResolvers_.size());
   }
-  
-  void
-  Principal::readAllFromSourceAndMergeImmediately(MergeableRunProductMetadata const* mergeableRunProductMetadata) {
-    if(not reader()) {return;}
-    
-    for(auto & prod : *this) {
+
+  void Principal::readAllFromSourceAndMergeImmediately(MergeableRunProductMetadata const* mergeableRunProductMetadata) {
+    if (not reader()) {
+      return;
+    }
+
+    for (auto& prod : *this) {
       prod->retrieveAndMerge(*this, mergeableRunProductMetadata);
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/PrincipalCache.cc b/FWCore/Framework/src/PrincipalCache.cc
index 06f19bb9064a1..706c9252b0f22 100644
--- a/FWCore/Framework/src/PrincipalCache.cc
+++ b/FWCore/Framework/src/PrincipalCache.cc
@@ -9,82 +9,69 @@
 
 namespace edm {
 
-  PrincipalCache::PrincipalCache() :
-    run_(0U),
-    lumi_(0U) {
-  }
+  PrincipalCache::PrincipalCache() : run_(0U), lumi_(0U) {}
 
-  PrincipalCache::~PrincipalCache() { }
+  PrincipalCache::~PrincipalCache() {}
 
-  
-  void PrincipalCache::setNumberOfConcurrentPrincipals(PreallocationConfiguration const& iConfig)
-  {
+  void PrincipalCache::setNumberOfConcurrentPrincipals(PreallocationConfiguration const& iConfig) {
     eventPrincipals_.resize(iConfig.numberOfStreams());
   }
 
-  RunPrincipal&
-  PrincipalCache::runPrincipal(ProcessHistoryID const& phid, RunNumber_t run) const {
-    if (phid != reducedInputProcessHistoryID_ ||
-        run != run_ ||
-        runPrincipal_.get() == nullptr) {
+  RunPrincipal& PrincipalCache::runPrincipal(ProcessHistoryID const& phid, RunNumber_t run) const {
+    if (phid != reducedInputProcessHistoryID_ || run != run_ || runPrincipal_.get() == nullptr) {
       throwRunMissing();
     }
     return *runPrincipal_.get();
   }
 
-  std::shared_ptr<RunPrincipal> const&
-  PrincipalCache::runPrincipalPtr(ProcessHistoryID const& phid, RunNumber_t run) const {
-    if (phid != reducedInputProcessHistoryID_ ||
-        run != run_ ||
-        runPrincipal_.get() == nullptr) {
+  std::shared_ptr<RunPrincipal> const& PrincipalCache::runPrincipalPtr(ProcessHistoryID const& phid,
+                                                                       RunNumber_t run) const {
+    if (phid != reducedInputProcessHistoryID_ || run != run_ || runPrincipal_.get() == nullptr) {
       throwRunMissing();
     }
     return runPrincipal_;
   }
 
-  RunPrincipal&
-  PrincipalCache::runPrincipal() const {
+  RunPrincipal& PrincipalCache::runPrincipal() const {
     if (runPrincipal_.get() == nullptr) {
       throwRunMissing();
     }
     return *runPrincipal_.get();
   }
 
-  std::shared_ptr<RunPrincipal> const&
-  PrincipalCache::runPrincipalPtr() const {
+  std::shared_ptr<RunPrincipal> const& PrincipalCache::runPrincipalPtr() const {
     if (runPrincipal_.get() == nullptr) {
       throwRunMissing();
     }
     return runPrincipal_;
   }
 
-  std::shared_ptr<LuminosityBlockPrincipal>
-  PrincipalCache::getAvailableLumiPrincipalPtr() { return lumiHolder_.tryToGet();}
+  std::shared_ptr<LuminosityBlockPrincipal> PrincipalCache::getAvailableLumiPrincipalPtr() {
+    return lumiHolder_.tryToGet();
+  }
 
   void PrincipalCache::merge(std::shared_ptr<RunAuxiliary> aux, std::shared_ptr<ProductRegistry const> reg) {
     if (runPrincipal_.get() == nullptr) {
-      throw edm::Exception(edm::errors::LogicError)
-        << "PrincipalCache::merge\n"
-        << "Illegal attempt to merge run into cache\n"
-        << "There is no run in cache to merge with\n"
-        << "Contact a Framework Developer\n";
+      throw edm::Exception(edm::errors::LogicError) << "PrincipalCache::merge\n"
+                                                    << "Illegal attempt to merge run into cache\n"
+                                                    << "There is no run in cache to merge with\n"
+                                                    << "Contact a Framework Developer\n";
     }
     if (inputProcessHistoryID_ != aux->processHistoryID()) {
       if (reducedInputProcessHistoryID_ != processHistoryRegistry_->reducedProcessHistoryID(aux->processHistoryID())) {
         throw edm::Exception(edm::errors::LogicError)
-          << "PrincipalCache::merge\n"
-          << "Illegal attempt to merge run into cache\n"
-          << "Reduced ProcessHistoryID inconsistent with the one already in cache\n"
-          << "Contact a Framework Developer\n";
+            << "PrincipalCache::merge\n"
+            << "Illegal attempt to merge run into cache\n"
+            << "Reduced ProcessHistoryID inconsistent with the one already in cache\n"
+            << "Contact a Framework Developer\n";
       }
       inputProcessHistoryID_ = aux->processHistoryID();
     }
     if (aux->run() != run_) {
-      throw edm::Exception(edm::errors::LogicError)
-        << "PrincipalCache::merge\n"
-        << "Illegal attempt to merge run into cache\n"
-        << "Run number inconsistent with run number already in cache\n"
-        << "Contact a Framework Developer\n";
+      throw edm::Exception(edm::errors::LogicError) << "PrincipalCache::merge\n"
+                                                    << "Illegal attempt to merge run into cache\n"
+                                                    << "Run number inconsistent with run number already in cache\n"
+                                                    << "Contact a Framework Developer\n";
     }
     bool runOK = runPrincipal_->adjustToNewProductRegistry(*reg);
     assert(runOK);
@@ -93,22 +80,19 @@ namespace edm {
 
   void PrincipalCache::insert(std::shared_ptr<RunPrincipal> rp) {
     if (runPrincipal_.get() != nullptr) {
-      throw edm::Exception(edm::errors::LogicError)
-        << "PrincipalCache::insert\n"
-        << "Illegal attempt to insert run into cache\n"
-        << "Contact a Framework Developer\n";
+      throw edm::Exception(edm::errors::LogicError) << "PrincipalCache::insert\n"
+                                                    << "Illegal attempt to insert run into cache\n"
+                                                    << "Contact a Framework Developer\n";
     }
     if (inputProcessHistoryID_ != rp->aux().processHistoryID()) {
       reducedInputProcessHistoryID_ = processHistoryRegistry_->reducedProcessHistoryID(rp->aux().processHistoryID());
       inputProcessHistoryID_ = rp->aux().processHistoryID();
     }
     run_ = rp->run();
-    runPrincipal_ = rp; 
+    runPrincipal_ = rp;
   }
 
-  void PrincipalCache::insert(std::unique_ptr<LuminosityBlockPrincipal> lbp) {
-    lumiHolder_.add(std::move(lbp));
-  }
+  void PrincipalCache::insert(std::unique_ptr<LuminosityBlockPrincipal> lbp) { lumiHolder_.add(std::move(lbp)); }
 
   void PrincipalCache::insert(std::shared_ptr<EventPrincipal> ep) {
     unsigned int iStreamIndex = ep->streamID().value();
@@ -118,25 +102,23 @@ namespace edm {
 
   void PrincipalCache::deleteRun(ProcessHistoryID const& phid, RunNumber_t run) {
     if (runPrincipal_.get() == nullptr) {
-      throw edm::Exception(edm::errors::LogicError)
-        << "PrincipalCache::deleteRun\n"
-        << "Illegal attempt to delete run from cache\n"
-        << "There is no run in cache to delete\n"
-        << "Contact a Framework Developer\n";
+      throw edm::Exception(edm::errors::LogicError) << "PrincipalCache::deleteRun\n"
+                                                    << "Illegal attempt to delete run from cache\n"
+                                                    << "There is no run in cache to delete\n"
+                                                    << "Contact a Framework Developer\n";
     }
-    if (reducedInputProcessHistoryID_ != phid ||
-        run != run_) {
+    if (reducedInputProcessHistoryID_ != phid || run != run_) {
       throw edm::Exception(edm::errors::LogicError)
-        << "PrincipalCache::deleteRun\n"
-        << "Illegal attempt to delete run from cache\n"
-        << "Run number or reduced ProcessHistoryID inconsistent with those in cache\n"
-        << "Contact a Framework Developer\n";
+          << "PrincipalCache::deleteRun\n"
+          << "Illegal attempt to delete run from cache\n"
+          << "Run number or reduced ProcessHistoryID inconsistent with those in cache\n"
+          << "Contact a Framework Developer\n";
     }
     runPrincipal_.reset();
   }
 
   void PrincipalCache::adjustEventsToNewProductRegistry(std::shared_ptr<ProductRegistry const> reg) {
-    for(auto &eventPrincipal : eventPrincipals_) {
+    for (auto& eventPrincipal : eventPrincipals_) {
       if (eventPrincipal) {
         eventPrincipal->adjustIndexesAfterProductRegistryAddition();
         bool eventOK = eventPrincipal->adjustToNewProductRegistry(*reg);
@@ -144,39 +126,35 @@ namespace edm {
       }
     }
   }
-  
+
   void PrincipalCache::adjustIndexesAfterProductRegistryAddition() {
     if (runPrincipal_) {
       runPrincipal_->adjustIndexesAfterProductRegistryAddition();
     }
     //Need to temporarily hold all the lumis to clear out the lumiHolder_
     std::vector<std::shared_ptr<LuminosityBlockPrincipal>> temp;
-    while(auto p = lumiHolder_.tryToGet()) {
+    while (auto p = lumiHolder_.tryToGet()) {
       p->adjustIndexesAfterProductRegistryAddition();
       temp.emplace_back(std::move(p));
     }
   }
 
-  void
-  PrincipalCache::preReadFile() {
+  void PrincipalCache::preReadFile() {
     if (runPrincipal_) {
       runPrincipal_->preReadFile();
     }
   }
 
-  void
-  PrincipalCache::throwRunMissing() const {
-    throw edm::Exception(edm::errors::LogicError)
-      << "PrincipalCache::runPrincipal\n"
-      << "Requested a run that is not in the cache (should never happen)\n"
-      << "Contact a Framework Developer\n";
+  void PrincipalCache::throwRunMissing() const {
+    throw edm::Exception(edm::errors::LogicError) << "PrincipalCache::runPrincipal\n"
+                                                  << "Requested a run that is not in the cache (should never happen)\n"
+                                                  << "Contact a Framework Developer\n";
   }
 
-  void
-  PrincipalCache::throwLumiMissing() const {
+  void PrincipalCache::throwLumiMissing() const {
     throw edm::Exception(edm::errors::LogicError)
-      << "PrincipalCache::lumiPrincipal or PrincipalCache::lumiPrincipalPtr\n"
-      << "Requested a luminosity block that is not in the cache (should never happen)\n"
-      << "Contact a Framework Developer\n";
+        << "PrincipalCache::lumiPrincipal or PrincipalCache::lumiPrincipalPtr\n"
+        << "Requested a luminosity block that is not in the cache (should never happen)\n"
+        << "Contact a Framework Developer\n";
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/PrincipalCache.h b/FWCore/Framework/src/PrincipalCache.h
index 7b46bbc7372bd..2c431415a5267 100644
--- a/FWCore/Framework/src/PrincipalCache.h
+++ b/FWCore/Framework/src/PrincipalCache.h
@@ -46,7 +46,6 @@ namespace edm {
 
   class PrincipalCache {
   public:
-
     PrincipalCache();
     ~PrincipalCache();
     PrincipalCache(PrincipalCache&&) = default;
@@ -55,7 +54,7 @@ namespace edm {
     std::shared_ptr<RunPrincipal> const& runPrincipalPtr(ProcessHistoryID const& phid, RunNumber_t run) const;
     RunPrincipal& runPrincipal() const;
     std::shared_ptr<RunPrincipal> const& runPrincipalPtr() const;
-    bool hasRunPrincipal() const {return bool(runPrincipal_);}
+    bool hasRunPrincipal() const { return bool(runPrincipal_); }
 
     std::shared_ptr<LuminosityBlockPrincipal> getAvailableLumiPrincipalPtr();
 
@@ -74,12 +73,11 @@ namespace edm {
 
     void adjustIndexesAfterProductRegistryAddition();
 
-    void setProcessHistoryRegistry(ProcessHistoryRegistry const& phr) {processHistoryRegistry_ = &phr;}
+    void setProcessHistoryRegistry(ProcessHistoryRegistry const& phr) { processHistoryRegistry_ = &phr; }
 
     void preReadFile();
 
   private:
-
     void throwRunMissing() const;
     void throwLumiMissing() const;
 
@@ -89,8 +87,8 @@ namespace edm {
     edm::ReusableObjectHolder<LuminosityBlockPrincipal> lumiHolder_;
     std::vector<std::shared_ptr<EventPrincipal>> eventPrincipals_;
 
-    // This is just an accessor to the registry owned by the input source. 
-    ProcessHistoryRegistry const* processHistoryRegistry_; // We don't own this
+    // This is just an accessor to the registry owned by the input source.
+    ProcessHistoryRegistry const* processHistoryRegistry_;  // We don't own this
 
     // These are intentionally not cleared so that when inserting
     // the next principal the conversion from full ProcessHistoryID_
@@ -104,6 +102,6 @@ namespace edm {
     RunNumber_t run_;
     LuminosityBlockNumber_t lumi_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/PrincipalGetAdapter.cc b/FWCore/Framework/src/PrincipalGetAdapter.cc
index 7b121a621d6bc..0531a40d3e2ff 100644
--- a/FWCore/Framework/src/PrincipalGetAdapter.cc
+++ b/FWCore/Framework/src/PrincipalGetAdapter.cc
@@ -19,319 +19,257 @@
 
 namespace edm {
 
-  PrincipalGetAdapter::PrincipalGetAdapter(Principal const& pcpl,
-	ModuleDescription const& md, bool isComplete)  :
-    //putProducts_(),
-    principal_(pcpl),
-    md_(md),
-    consumer_(nullptr),
-    resourcesAcquirer_(nullptr),
-    isComplete_(isComplete)
-  {
-  }
+  PrincipalGetAdapter::PrincipalGetAdapter(Principal const& pcpl, ModuleDescription const& md, bool isComplete)
+      :  //putProducts_(),
+        principal_(pcpl),
+        md_(md),
+        consumer_(nullptr),
+        resourcesAcquirer_(nullptr),
+        isComplete_(isComplete) {}
 
-  PrincipalGetAdapter::~PrincipalGetAdapter() {
-  }
+  PrincipalGetAdapter::~PrincipalGetAdapter() {}
 
-  void
-  principal_get_adapter_detail::throwOnPutOfNullProduct(
-	char const* principalType,
-	TypeID const& productType,
-	std::string const& productInstanceName) {
-      throw Exception(errors::NullPointerError)
-	<< principalType
-	<< "::put: A null unique_ptr was passed to 'put'.\n"
-	<< "The pointer is of type "
-	<< productType
-        << ".\nThe specified productInstanceName was '"
-	<< productInstanceName
-        << "'.\n";
+  void principal_get_adapter_detail::throwOnPutOfNullProduct(char const* principalType,
+                                                             TypeID const& productType,
+                                                             std::string const& productInstanceName) {
+    throw Exception(errors::NullPointerError)
+        << principalType << "::put: A null unique_ptr was passed to 'put'.\n"
+        << "The pointer is of type " << productType << ".\nThe specified productInstanceName was '"
+        << productInstanceName << "'.\n";
   }
 
-  void
-  principal_get_adapter_detail::throwOnPutOfUninitializedToken(char const* principalType, std::type_info const& type) {
+  void principal_get_adapter_detail::throwOnPutOfUninitializedToken(char const* principalType,
+                                                                    std::type_info const& type) {
     TypeID productType{type};
-    throw Exception(errors::LogicError)
-    << principalType
-    << "::put: An uninitialized EDPutToken was passed to 'put'.\n"
-    << "The pointer is of type "
-    << productType
-    << ".\n";
+    throw Exception(errors::LogicError) << principalType << "::put: An uninitialized EDPutToken was passed to 'put'.\n"
+                                        << "The pointer is of type " << productType << ".\n";
   }
 
-  void
-  principal_get_adapter_detail::throwOnPutOfWrongType(std::type_info const& wrongType, TypeID const& rightType) {
+  void principal_get_adapter_detail::throwOnPutOfWrongType(std::type_info const& wrongType, TypeID const& rightType) {
     TypeID wrongTypeID{wrongType};
-    throw Exception(errors::LogicError)
-    << "The registered type for an EDPutToken does not match the put type.\n"
-    << "The expected type "
-    << rightType
-    << "\nThe put type "
-    << wrongTypeID
-    << ".\n";
+    throw Exception(errors::LogicError) << "The registered type for an EDPutToken does not match the put type.\n"
+                                        << "The expected type " << rightType << "\nThe put type " << wrongTypeID
+                                        << ".\n";
   }
 
-  void
-  principal_get_adapter_detail::throwOnPrematureRead(
-	char const* principalType,
-	TypeID const& productType,
-	std::string const& moduleLabel,
-	std::string const& productInstanceName) {
-      //throw Exception(errors::LogicError)
-      LogWarning("LogicError")
-	<< "::getByLabel: An attempt was made to read a "
-	<< principalType
-        << " product before end"
-	<< principalType
-        << "() was called.\n"
-	<< "The product is of type '"
-	<< productType
-        << "'.\nThe specified ModuleLabel was '"
-	<< moduleLabel
-        << "'.\nThe specified productInstanceName was '"
-	<< productInstanceName
-        << "'.\n";
+  void principal_get_adapter_detail::throwOnPrematureRead(char const* principalType,
+                                                          TypeID const& productType,
+                                                          std::string const& moduleLabel,
+                                                          std::string const& productInstanceName) {
+    //throw Exception(errors::LogicError)
+    LogWarning("LogicError") << "::getByLabel: An attempt was made to read a " << principalType << " product before end"
+                             << principalType << "() was called.\n"
+                             << "The product is of type '" << productType << "'.\nThe specified ModuleLabel was '"
+                             << moduleLabel << "'.\nThe specified productInstanceName was '" << productInstanceName
+                             << "'.\n";
   }
 
-  void
-  principal_get_adapter_detail::throwOnPrematureRead(
-	char const* principalType,
-	TypeID const& productType) {
-      //throw Exception(errors::LogicError)
-      LogWarning("LogicError")
-	<< "::getManyByType: An attempt was made to read a "
-	<< principalType
-        << " product before end"
-	<< principalType
-        << "() was called.\n"
-	<< "The product is of type '"
-	<< productType
-        << "'.\n";
+  void principal_get_adapter_detail::throwOnPrematureRead(char const* principalType, TypeID const& productType) {
+    //throw Exception(errors::LogicError)
+    LogWarning("LogicError") << "::getManyByType: An attempt was made to read a " << principalType
+                             << " product before end" << principalType << "() was called.\n"
+                             << "The product is of type '" << productType << "'.\n";
   }
-  
-  void
-  principal_get_adapter_detail::throwOnPrematureRead(
-                                                     char const* principalType,
-                                                     TypeID const& productType,
-                                                     EDGetToken token) {
-    throw Exception(errors::LogicError)
-    << "::getByToken: An attempt was made to read a "
-    << principalType
-    << " product before end"
-    << principalType
-    << "() was called.\n"
-    << "The index of the token was "<<token.index()<<".\n";
-  }
-  
-  size_t
-  PrincipalGetAdapter::numberOfProductsConsumed() const {
-    return consumer_->itemsToGetFrom(InEvent).size();
+
+  void principal_get_adapter_detail::throwOnPrematureRead(char const* principalType,
+                                                          TypeID const& productType,
+                                                          EDGetToken token) {
+    throw Exception(errors::LogicError) << "::getByToken: An attempt was made to read a " << principalType
+                                        << " product before end" << principalType << "() was called.\n"
+                                        << "The index of the token was " << token.index() << ".\n";
   }
 
-  void
-  PrincipalGetAdapter::labelsForToken(EDGetToken const& iToken, ProductLabels& oLabels) const {
-    consumer_->labelsForToken(iToken,oLabels);
+  size_t PrincipalGetAdapter::numberOfProductsConsumed() const { return consumer_->itemsToGetFrom(InEvent).size(); }
+
+  void PrincipalGetAdapter::labelsForToken(EDGetToken const& iToken, ProductLabels& oLabels) const {
+    consumer_->labelsForToken(iToken, oLabels);
   }
 
-  BasicHandle
-  PrincipalGetAdapter::makeFailToGetException(KindOfType kindOfType,
-                                              TypeID const& productType,
-                                              EDGetToken token) const {
+  BasicHandle PrincipalGetAdapter::makeFailToGetException(KindOfType kindOfType,
+                                                          TypeID const& productType,
+                                                          EDGetToken token) const {
     EDConsumerBase::Labels labels;
-    consumer_->labelsForToken(token,labels);
+    consumer_->labelsForToken(token, labels);
     //no need to copy memory since the exception will no occur after the
     // const char* have been deleted
-    return BasicHandle(makeHandleExceptionFactory([labels,kindOfType,productType]()->std::shared_ptr<cms::Exception> {
-      std::shared_ptr<cms::Exception> exception(std::make_shared<Exception>(errors::ProductNotFound));
-      if (kindOfType == PRODUCT_TYPE) {
-        *exception << "Principal::getByToken: Found zero products matching all criteria\nLooking for type: " << productType << "\n"
-        << "Looking for module label: " << labels.module << "\n" << "Looking for productInstanceName: " << labels.productInstance << "\n"
-        << (0==labels.process[0] ? "" : "Looking for process: ") << labels.process << "\n";
-      } else {
-        *exception << "Principal::getByToken: Found zero products matching all criteria\nLooking for a container with elements of type: " << productType << "\n"
-        << "Looking for module label: " << labels.module << "\n" << "Looking for productInstanceName: " << labels.productInstance << "\n"
-        << (0==labels.process[0] ? "" : "Looking for process: ") << labels.process << "\n";
-      }
-      return exception;
-    }));
+    return BasicHandle(
+        makeHandleExceptionFactory([labels, kindOfType, productType]() -> std::shared_ptr<cms::Exception> {
+          std::shared_ptr<cms::Exception> exception(std::make_shared<Exception>(errors::ProductNotFound));
+          if (kindOfType == PRODUCT_TYPE) {
+            *exception << "Principal::getByToken: Found zero products matching all criteria\nLooking for type: "
+                       << productType << "\n"
+                       << "Looking for module label: " << labels.module << "\n"
+                       << "Looking for productInstanceName: " << labels.productInstance << "\n"
+                       << (0 == labels.process[0] ? "" : "Looking for process: ") << labels.process << "\n";
+          } else {
+            *exception << "Principal::getByToken: Found zero products matching all criteria\nLooking for a container "
+                          "with elements of type: "
+                       << productType << "\n"
+                       << "Looking for module label: " << labels.module << "\n"
+                       << "Looking for productInstanceName: " << labels.productInstance << "\n"
+                       << (0 == labels.process[0] ? "" : "Looking for process: ") << labels.process << "\n";
+          }
+          return exception;
+        }));
   }
 
-  void
-  PrincipalGetAdapter::throwAmbiguousException(TypeID const& productType,
-                                               EDGetToken token) const {
+  void PrincipalGetAdapter::throwAmbiguousException(TypeID const& productType, EDGetToken token) const {
     EDConsumerBase::Labels labels;
-    consumer_->labelsForToken(token,labels);
+    consumer_->labelsForToken(token, labels);
     cms::Exception exception("AmbiguousProduct");
-    exception << "Principal::getByToken: More than 1 product matches all criteria\nLooking for a container with elements of type: " << productType << "\n"
-    << "Looking for module label: " << labels.module << "\n" << "Looking for productInstanceName: " << labels.productInstance << "\n"
-    << (0==labels.process[0] ? "" : "Looking for process: ") << labels.process << "\n"
-    << "This can only occur with get function calls using a Handle<View> argument.\n"
-    << "Try a get not using a View or change the instance name of one of the products";
-    throw exception;    
+    exception << "Principal::getByToken: More than 1 product matches all criteria\nLooking for a container with "
+                 "elements of type: "
+              << productType << "\n"
+              << "Looking for module label: " << labels.module << "\n"
+              << "Looking for productInstanceName: " << labels.productInstance << "\n"
+              << (0 == labels.process[0] ? "" : "Looking for process: ") << labels.process << "\n"
+              << "This can only occur with get function calls using a Handle<View> argument.\n"
+              << "Try a get not using a View or change the instance name of one of the products";
+    throw exception;
   }
 
-  BranchType const&
-  PrincipalGetAdapter::branchType() const {
-    return principal_.branchType();
-  }
+  BranchType const& PrincipalGetAdapter::branchType() const { return principal_.branchType(); }
 
-  BasicHandle
-  PrincipalGetAdapter::getByLabel_(TypeID const& typeID,
-                                   InputTag const& tag,
-                                   ModuleCallingContext const* mcc) const {
+  BasicHandle PrincipalGetAdapter::getByLabel_(TypeID const& typeID,
+                                               InputTag const& tag,
+                                               ModuleCallingContext const* mcc) const {
     return principal_.getByLabel(PRODUCT_TYPE, typeID, tag, consumer_, resourcesAcquirer_, mcc);
   }
 
-  BasicHandle
-  PrincipalGetAdapter::getByLabel_(TypeID const& typeID,
-                                   std::string const& label,
-  	                           std::string const& instance,
-  	                           std::string const& process,
-                                   ModuleCallingContext const* mcc) const {
+  BasicHandle PrincipalGetAdapter::getByLabel_(TypeID const& typeID,
+                                               std::string const& label,
+                                               std::string const& instance,
+                                               std::string const& process,
+                                               ModuleCallingContext const* mcc) const {
     return principal_.getByLabel(PRODUCT_TYPE, typeID, label, instance, process, consumer_, resourcesAcquirer_, mcc);
   }
-  
-  BasicHandle
-  PrincipalGetAdapter::getByToken_(TypeID const& id, KindOfType kindOfType, EDGetToken token,
-                                   ModuleCallingContext const* mcc) const {
-    ProductResolverIndexAndSkipBit indexAndBit = consumer_->indexFrom(token,branchType(),id);
+
+  BasicHandle PrincipalGetAdapter::getByToken_(TypeID const& id,
+                                               KindOfType kindOfType,
+                                               EDGetToken token,
+                                               ModuleCallingContext const* mcc) const {
+    ProductResolverIndexAndSkipBit indexAndBit = consumer_->indexFrom(token, branchType(), id);
     ProductResolverIndex index = indexAndBit.productResolverIndex();
     bool skipCurrentProcess = indexAndBit.skipCurrentProcess();
-    if( UNLIKELY(index == ProductResolverIndexInvalid)) {
-      return makeFailToGetException(kindOfType,id,token);
-    } else if( UNLIKELY(index == ProductResolverIndexAmbiguous)) {
+    if (UNLIKELY(index == ProductResolverIndexInvalid)) {
+      return makeFailToGetException(kindOfType, id, token);
+    } else if (UNLIKELY(index == ProductResolverIndexAmbiguous)) {
       // This deals with ambiguities where the process is specified
       throwAmbiguousException(id, token);
     }
     bool ambiguous = false;
-    BasicHandle h = principal_.getByToken(kindOfType, id, index, skipCurrentProcess, ambiguous, resourcesAcquirer_, mcc);
+    BasicHandle h =
+        principal_.getByToken(kindOfType, id, index, skipCurrentProcess, ambiguous, resourcesAcquirer_, mcc);
     if (ambiguous) {
       // This deals with ambiguities where the process is not specified
       throwAmbiguousException(id, token);
-    } else if(!h.isValid()) {
-      return makeFailToGetException(kindOfType,id,token);
+    } else if (!h.isValid()) {
+      return makeFailToGetException(kindOfType, id, token);
     }
     return h;
   }
 
-  BasicHandle
-  PrincipalGetAdapter::getMatchingSequenceByLabel_(TypeID const& typeID,
-                                                   InputTag const& tag,
-                                                   ModuleCallingContext const* mcc) const {
+  BasicHandle PrincipalGetAdapter::getMatchingSequenceByLabel_(TypeID const& typeID,
+                                                               InputTag const& tag,
+                                                               ModuleCallingContext const* mcc) const {
     return principal_.getByLabel(ELEMENT_TYPE, typeID, tag, consumer_, resourcesAcquirer_, mcc);
   }
 
-  BasicHandle
-  PrincipalGetAdapter::getMatchingSequenceByLabel_(TypeID const& typeID,
-                                                   std::string const& label,
-                                                   std::string const& instance,
-                                                   std::string const& process,
-                                                   ModuleCallingContext const* mcc) const {
-    auto h= principal_.getByLabel(ELEMENT_TYPE,
-                                  typeID,
-                                  label,
-                                  instance,
-                                  process,
-                                  consumer_,
-                                  resourcesAcquirer_,
-                                  mcc);
+  BasicHandle PrincipalGetAdapter::getMatchingSequenceByLabel_(TypeID const& typeID,
+                                                               std::string const& label,
+                                                               std::string const& instance,
+                                                               std::string const& process,
+                                                               ModuleCallingContext const* mcc) const {
+    auto h = principal_.getByLabel(ELEMENT_TYPE, typeID, label, instance, process, consumer_, resourcesAcquirer_, mcc);
     return h;
   }
 
-  void
-  PrincipalGetAdapter::getManyByType_(TypeID const& tid,
-                                      BasicHandleVec& results,
-                                      ModuleCallingContext const* mcc) const {
+  void PrincipalGetAdapter::getManyByType_(TypeID const& tid,
+                                           BasicHandleVec& results,
+                                           ModuleCallingContext const* mcc) const {
     principal_.getManyByType(tid, results, consumer_, resourcesAcquirer_, mcc);
   }
 
-  ProcessHistory const&
-  PrincipalGetAdapter::processHistory() const {
-    return principal_.processHistory();
-  }
+  ProcessHistory const& PrincipalGetAdapter::processHistory() const { return principal_.processHistory(); }
 
-  void
-  PrincipalGetAdapter::throwUnregisteredPutException(TypeID const& type,
-                                                     std::string const& productInstanceName) const {
+  void PrincipalGetAdapter::throwUnregisteredPutException(TypeID const& type,
+                                                          std::string const& productInstanceName) const {
     std::ostringstream str;
-    for(auto branchDescription: principal_.productRegistry().allBranchDescriptions()) {
-      if (branchDescription->moduleLabel() == md_.moduleLabel() and branchDescription->processName() == md_.processName()) {
-        str << *branchDescription<< "-----\n";
+    for (auto branchDescription : principal_.productRegistry().allBranchDescriptions()) {
+      if (branchDescription->moduleLabel() == md_.moduleLabel() and
+          branchDescription->processName() == md_.processName()) {
+        str << *branchDescription << "-----\n";
       }
     }
     throw edm::Exception(edm::errors::InsertFailure)
-    << "Illegal attempt to 'put' an unregistered product.\n"
-    << "No product is registered for\n"
-    << "  product friendly class name: '" << type.friendlyClassName() << "'\n"
-    << "  module label:                '" << md_.moduleLabel() << "'\n"
-    << "  product instance name:       '" << productInstanceName << "'\n"
-    << "  process name:                '" << md_.processName() << "'\n"
-    
-    << "The following data products are registered for production by "<<md_.moduleLabel()<<":\n"
-    << str.str()
-    << '\n'
-    << "To correct the problem:\n"
-    "   1) make sure the proper 'produce' call is being made in the module's constructor,\n"
-    "   2) if 'produce' exists and uses a product instance name make sure that same name is used during the 'put' call.";
+        << "Illegal attempt to 'put' an unregistered product.\n"
+        << "No product is registered for\n"
+        << "  product friendly class name: '" << type.friendlyClassName() << "'\n"
+        << "  module label:                '" << md_.moduleLabel() << "'\n"
+        << "  product instance name:       '" << productInstanceName << "'\n"
+        << "  process name:                '" << md_.processName() << "'\n"
+
+        << "The following data products are registered for production by " << md_.moduleLabel() << ":\n"
+        << str.str() << '\n'
+        << "To correct the problem:\n"
+           "   1) make sure the proper 'produce' call is being made in the module's constructor,\n"
+           "   2) if 'produce' exists and uses a product instance name make sure that same name is used during the "
+           "'put' call.";
   }
 
-  BranchDescription const&
-  PrincipalGetAdapter::getBranchDescription(TypeID const& type,
-                                            std::string const& productInstanceName) const {
+  BranchDescription const& PrincipalGetAdapter::getBranchDescription(TypeID const& type,
+                                                                     std::string const& productInstanceName) const {
     ProductResolverIndexHelper const& productResolverIndexHelper = principal_.productLookup();
-    ProductResolverIndex index = productResolverIndexHelper.index(PRODUCT_TYPE, type, md_.moduleLabel().c_str(),productInstanceName.c_str(), md_.processName().c_str());
-    if(UNLIKELY(index == ProductResolverIndexInvalid)) {
+    ProductResolverIndex index = productResolverIndexHelper.index(
+        PRODUCT_TYPE, type, md_.moduleLabel().c_str(), productInstanceName.c_str(), md_.processName().c_str());
+    if (UNLIKELY(index == ProductResolverIndexInvalid)) {
       throwUnregisteredPutException(type, productInstanceName);
     }
-    ProductResolverBase const*  phb = principal_.getProductResolverByIndex(index);
+    ProductResolverBase const* phb = principal_.getProductResolverByIndex(index);
     assert(phb != nullptr);
     return phb->branchDescription();
   }
-  
-  BranchDescription const&
-  PrincipalGetAdapter::getBranchDescription(unsigned int iPutTokenIndex) const {
+
+  BranchDescription const& PrincipalGetAdapter::getBranchDescription(unsigned int iPutTokenIndex) const {
     auto index = prodBase_->putTokenIndexToProductResolverIndex()[iPutTokenIndex];
-    ProductResolverBase const*  phb = principal_.getProductResolverByIndex(index);
+    ProductResolverBase const* phb = principal_.getProductResolverByIndex(index);
     assert(phb != nullptr);
     return phb->branchDescription();
   }
 
-  ProductID const&
-  PrincipalGetAdapter::getProductID(unsigned int iPutTokenIndex) const {
+  ProductID const& PrincipalGetAdapter::getProductID(unsigned int iPutTokenIndex) const {
     auto index = prodBase_->putTokenIndexToProductResolverIndex()[iPutTokenIndex];
-    ProductResolverBase const*  phb = principal_.getProductResolverByIndex(index);
+    ProductResolverBase const* phb = principal_.getProductResolverByIndex(index);
     assert(phb != nullptr);
     auto prov = phb->stableProvenance();
     assert(prov != nullptr);
     return prov->productID();
   }
 
-  Transition
-  PrincipalGetAdapter::transition() const {
-    if(LIKELY(principal().branchType() == InEvent)) {
+  Transition PrincipalGetAdapter::transition() const {
+    if (LIKELY(principal().branchType() == InEvent)) {
       return Transition::Event;
     }
-    if(principal().branchType() == InRun) {
-      if(isComplete()) {
+    if (principal().branchType() == InRun) {
+      if (isComplete()) {
         return Transition::EndRun;
       } else {
         return Transition::BeginRun;
       }
     }
-    if(isComplete()) {
+    if (isComplete()) {
       return Transition::EndLuminosityBlock;
     }
     return Transition::BeginLuminosityBlock;
     //Must be lumi
   }
 
-  EDPutToken::value_type
-  PrincipalGetAdapter::getPutTokenIndex(TypeID const& type, std::string const& productInstanceName) const {
+  EDPutToken::value_type PrincipalGetAdapter::getPutTokenIndex(TypeID const& type,
+                                                               std::string const& productInstanceName) const {
     auto tran = transition();
     size_t index = 0;
-    for(auto const& tl : prodBase_->typeLabelList()) {
-      if((tran == tl.transition_) and (type == tl.typeID_)
-         and (productInstanceName == tl.productInstanceName_)) {
+    for (auto const& tl : prodBase_->typeLabelList()) {
+      if ((tran == tl.transition_) and (type == tl.typeID_) and (productInstanceName == tl.productInstanceName_)) {
         return index;
       }
       ++index;
@@ -340,31 +278,21 @@ namespace edm {
     return std::numeric_limits<unsigned int>::max();
   }
 
-  
-  std::string const&
-  PrincipalGetAdapter::productInstanceLabel(EDPutToken iToken) const {
+  std::string const& PrincipalGetAdapter::productInstanceLabel(EDPutToken iToken) const {
     return prodBase_->typeLabelList()[iToken.index()].productInstanceName_;
   }
-  
-  TypeID const&
-  PrincipalGetAdapter::getTypeIDForPutTokenIndex(EDPutToken::value_type index) const {
+
+  TypeID const& PrincipalGetAdapter::getTypeIDForPutTokenIndex(EDPutToken::value_type index) const {
     return prodBase_->typeLabelList()[index].typeID_;
   }
 
-
-  std::vector<edm::ProductResolverIndex> const&
-  PrincipalGetAdapter::putTokenIndexToProductResolverIndex() const {
+  std::vector<edm::ProductResolverIndex> const& PrincipalGetAdapter::putTokenIndexToProductResolverIndex() const {
     return prodBase_->putTokenIndexToProductResolverIndex();
   }
 
-  std::vector<bool> const&
-  PrincipalGetAdapter::recordProvenanceList() const {
+  std::vector<bool> const& PrincipalGetAdapter::recordProvenanceList() const {
     return prodBase_->recordProvenanceList();
   }
 
-  
-  EDProductGetter const*
-  PrincipalGetAdapter::prodGetter() const{
-    return principal_.prodGetter();
-  }
-}
+  EDProductGetter const* PrincipalGetAdapter::prodGetter() const { return principal_.prodGetter(); }
+}  // namespace edm
diff --git a/FWCore/Framework/src/ProcessingController.cc b/FWCore/Framework/src/ProcessingController.cc
index 71a7d46d54259..49c900eea6fc1 100644
--- a/FWCore/Framework/src/ProcessingController.cc
+++ b/FWCore/Framework/src/ProcessingController.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     ProcessingController
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -27,15 +27,13 @@ using namespace edm;
 //
 // constructors and destructor
 //
-ProcessingController::ProcessingController(ForwardState forwardState, ReverseState reverseState, bool iCanRandomAccess) :
-forwardState_(forwardState),
-reverseState_(reverseState),
-transition_(kToNextEvent),
-specifiedEvent_(),
-canRandomAccess_(iCanRandomAccess),
-lastOperationSucceeded_(true)
-{
-}
+ProcessingController::ProcessingController(ForwardState forwardState, ReverseState reverseState, bool iCanRandomAccess)
+    : forwardState_(forwardState),
+      reverseState_(reverseState),
+      transition_(kToNextEvent),
+      specifiedEvent_(),
+      canRandomAccess_(iCanRandomAccess),
+      lastOperationSucceeded_(true) {}
 
 // ProcessingController::ProcessingController(const ProcessingController& rhs)
 // {
@@ -61,67 +59,28 @@ lastOperationSucceeded_(true)
 //
 // member functions
 //
-void 
-ProcessingController::setTransitionToNextEvent()
-{
-   transition_ = kToNextEvent;
-}
+void ProcessingController::setTransitionToNextEvent() { transition_ = kToNextEvent; }
 
-void 
-ProcessingController::setTransitionToPreviousEvent()
-{
-   transition_ = kToPreviousEvent;
-}
+void ProcessingController::setTransitionToPreviousEvent() { transition_ = kToPreviousEvent; }
 
-void 
-ProcessingController::setTransitionToEvent( edm::EventID const& iID)
-{
-   transition_ = kToSpecifiedEvent;
-   specifiedEvent_ =iID;
+void ProcessingController::setTransitionToEvent(edm::EventID const& iID) {
+  transition_ = kToSpecifiedEvent;
+  specifiedEvent_ = iID;
 }
 
-void
-ProcessingController::setLastOperationSucceeded(bool value)
-{
-  lastOperationSucceeded_ = value;
-}
+void ProcessingController::setLastOperationSucceeded(bool value) { lastOperationSucceeded_ = value; }
 
 //
 // const member functions
 //
-ProcessingController::ForwardState 
-ProcessingController::forwardState() const
-{
-   return forwardState_;
-}
+ProcessingController::ForwardState ProcessingController::forwardState() const { return forwardState_; }
 
-ProcessingController::ReverseState 
-ProcessingController::reverseState() const
-{
-   return reverseState_;
-}
-
-bool 
-ProcessingController::canRandomAccess() const
-{
-   return canRandomAccess_;
-}
+ProcessingController::ReverseState ProcessingController::reverseState() const { return reverseState_; }
 
-ProcessingController::Transition 
-ProcessingController::requestedTransition() const
-{
-   return transition_;
-}
+bool ProcessingController::canRandomAccess() const { return canRandomAccess_; }
 
+ProcessingController::Transition ProcessingController::requestedTransition() const { return transition_; }
 
-edm::EventID 
-ProcessingController::specifiedEventTransition() const
-{
-   return specifiedEvent_;
-}
+edm::EventID ProcessingController::specifiedEventTransition() const { return specifiedEvent_; }
 
-bool
-ProcessingController::lastOperationSucceeded() const
-{
-  return lastOperationSucceeded_;
-}
+bool ProcessingController::lastOperationSucceeded() const { return lastOperationSucceeded_; }
diff --git a/FWCore/Framework/src/ProcessingTask.h b/FWCore/Framework/src/ProcessingTask.h
index d4d051112eb81..fcbd659b37388 100644
--- a/FWCore/Framework/src/ProcessingTask.h
+++ b/FWCore/Framework/src/ProcessingTask.h
@@ -3,8 +3,7 @@
 
 #include <string>
 
-namespace edm
-{
+namespace edm {
   typedef std::string ProcessingTask;
 }
 
diff --git a/FWCore/Framework/src/ProducerBase.cc b/FWCore/Framework/src/ProducerBase.cc
index bb7ea090fef0a..3ff6113bf264a 100644
--- a/FWCore/Framework/src/ProducerBase.cc
+++ b/FWCore/Framework/src/ProducerBase.cc
@@ -13,91 +13,83 @@
 
 namespace edm {
   ProducerBase::ProducerBase() : ProductRegistryHelper(), callWhenNewProductsRegistered_() {}
-  ProducerBase::~ProducerBase() noexcept(false) { }
+  ProducerBase::~ProducerBase() noexcept(false) {}
 
-   std::function<void(BranchDescription const&)> ProducerBase::registrationCallback() const {
-      return callWhenNewProductsRegistered_;
-   }
+  std::function<void(BranchDescription const&)> ProducerBase::registrationCallback() const {
+    return callWhenNewProductsRegistered_;
+  }
 
+  namespace {
+    class CallbackWrapper {
+    public:
+      CallbackWrapper(ProductRegistryHelper* iProd,
+                      std::function<void(BranchDescription const&)> iCallback,
+                      ProductRegistry* iReg,
+                      const ModuleDescription& iDesc)
+          : prod_(iProd), callback_(iCallback), reg_(iReg), mdesc_(iDesc), lastSize_(iProd->typeLabelList().size()) {}
 
-   namespace {
-     class CallbackWrapper {
-       public:  
-        CallbackWrapper(ProductRegistryHelper* iProd,
-                        std::function<void(BranchDescription const&)> iCallback,
-                        ProductRegistry* iReg,
-                        const ModuleDescription& iDesc):
-        prod_(iProd), callback_(iCallback), reg_(iReg), mdesc_(iDesc),
-        lastSize_(iProd->typeLabelList().size()) {}
-        
-        void operator()(BranchDescription const& iDesc) {
-           callback_(iDesc);
-           addToRegistry();
-        }
-        
-        void addToRegistry() {
-           ProducerBase::TypeLabelList const& plist = prod_->typeLabelList();
-           
-           if(lastSize_!=plist.size()){
-              ProducerBase::TypeLabelList::const_iterator pStart = plist.begin();
-              advance(pStart, lastSize_);
-              ProductRegistryHelper::addToRegistry(pStart, plist.end() ,mdesc_, *reg_, prod_);
-              lastSize_ = plist.size();
-           }
-        }
+      void operator()(BranchDescription const& iDesc) {
+        callback_(iDesc);
+        addToRegistry();
+      }
 
-      private:
-        ProductRegistryHelper* prod_;
-        std::function<void(BranchDescription const&)> callback_;
-        ProductRegistry* reg_;
-        ModuleDescription mdesc_;
-        unsigned int lastSize_;
-         
-     };
-  }
+      void addToRegistry() {
+        ProducerBase::TypeLabelList const& plist = prod_->typeLabelList();
 
+        if (lastSize_ != plist.size()) {
+          ProducerBase::TypeLabelList::const_iterator pStart = plist.begin();
+          advance(pStart, lastSize_);
+          ProductRegistryHelper::addToRegistry(pStart, plist.end(), mdesc_, *reg_, prod_);
+          lastSize_ = plist.size();
+        }
+      }
+
+    private:
+      ProductRegistryHelper* prod_;
+      std::function<void(BranchDescription const&)> callback_;
+      ProductRegistry* reg_;
+      ModuleDescription mdesc_;
+      unsigned int lastSize_;
+    };
+  }  // namespace
 
-  void ProducerBase::registerProducts(ProducerBase* producer,
-				ProductRegistry* iReg,
-				ModuleDescription const& md)
-  {
+  void ProducerBase::registerProducts(ProducerBase* producer, ProductRegistry* iReg, ModuleDescription const& md) {
     if (typeLabelList().empty() && !registrationCallback()) {
       return;
     }
     //If we have a callback, first tell the callback about all the entries already in the
-    // product registry, then add any items this producer wants to add to the registry 
+    // product registry, then add any items this producer wants to add to the registry
     // and only after that do we register the callback. This is done so the callback does not
     // get called for items registered by this producer (avoids circular reference problems)
     bool isListener = false;
-    if(registrationCallback()) {
-       isListener=true;
-       iReg->callForEachBranch(registrationCallback());
+    if (registrationCallback()) {
+      isListener = true;
+      iReg->callForEachBranch(registrationCallback());
     }
     TypeLabelList const& plist = typeLabelList();
 
     ProductRegistryHelper::addToRegistry(plist.begin(), plist.end(), md, *(iReg), this, isListener);
-    if(registrationCallback()) {
-       Service<ConstProductRegistry> regService;
-       regService->watchProductAdditions(CallbackWrapper(producer, registrationCallback(), iReg, md));
+    if (registrationCallback()) {
+      Service<ConstProductRegistry> regService;
+      regService->watchProductAdditions(CallbackWrapper(producer, registrationCallback(), iReg, md));
     }
   }
-  
+
   void ProducerBase::resolvePutIndicies(BranchType iBranchType,
-                          ModuleToResolverIndicies const& iIndicies,
-                          std::string const& moduleLabel) {
+                                        ModuleToResolverIndicies const& iIndicies,
+                                        std::string const& moduleLabel) {
     auto const& plist = typeLabelList();
-    if(putTokenToResolverIndex_.size() != plist.size()) {
-      putTokenToResolverIndex_.resize(plist.size(),std::numeric_limits<unsigned int>::max());
+    if (putTokenToResolverIndex_.size() != plist.size()) {
+      putTokenToResolverIndex_.resize(plist.size(), std::numeric_limits<unsigned int>::max());
     }
     auto range = iIndicies.equal_range(moduleLabel);
     putIndicies_[iBranchType].reserve(iIndicies.count(moduleLabel));
-    for(auto it = range.first; it != range.second;++it) {
+    for (auto it = range.first; it != range.second; ++it) {
       putIndicies_[iBranchType].push_back(std::get<2>(it->second));
       unsigned int i = 0;
-      for(auto const& tl: plist) {
-        if(convertToBranchType(tl.transition_) == iBranchType and
-           (tl.typeID_ == *std::get<0>(it->second)) and
-           (tl.productInstanceName_ == std::get<1>(it->second)) ) {
+      for (auto const& tl : plist) {
+        if (convertToBranchType(tl.transition_) == iBranchType and (tl.typeID_ == *std::get<0>(it->second)) and
+            (tl.productInstanceName_ == std::get<1>(it->second))) {
           putTokenToResolverIndex_[i] = std::get<2>(it->second);
           //NOTE: The ExternalLHEProducer puts the 'same' product in at
           // both beginRun and endRun. Therefore we can get multiple matches.
@@ -108,4 +100,4 @@ namespace edm {
       }
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/ProductDeletedException.cc b/FWCore/Framework/src/ProductDeletedException.cc
index ead3830cd478f..6d3ee4299d138 100644
--- a/FWCore/Framework/src/ProductDeletedException.cc
+++ b/FWCore/Framework/src/ProductDeletedException.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     ProductDeletedException
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -15,7 +15,6 @@
 // user include files
 #include "FWCore/Framework/interface/ProductDeletedException.h"
 
-
 using namespace edm;
 
 //
@@ -29,7 +28,4 @@ using namespace edm;
 //
 // constructors and destructor
 //
-ProductDeletedException::ProductDeletedException():
-cms::Exception("ProductDeleted")
-{
-}
+ProductDeletedException::ProductDeletedException() : cms::Exception("ProductDeleted") {}
diff --git a/FWCore/Framework/src/ProductRegistryHelper.cc b/FWCore/Framework/src/ProductRegistryHelper.cc
index bf7cff5dfcb16..8cfa195409c9a 100644
--- a/FWCore/Framework/src/ProductRegistryHelper.cc
+++ b/FWCore/Framework/src/ProductRegistryHelper.cc
@@ -15,42 +15,34 @@
 #include <typeindex>
 
 namespace edm {
-  ProductRegistryHelper::~ProductRegistryHelper() noexcept(false) { }
+  ProductRegistryHelper::~ProductRegistryHelper() noexcept(false) {}
 
-  ProductRegistryHelper::TypeLabelList const& ProductRegistryHelper::typeLabelList() const {
-    return typeLabelList_;
-  }
+  ProductRegistryHelper::TypeLabelList const& ProductRegistryHelper::typeLabelList() const { return typeLabelList_; }
 
   namespace {
-    void throwProducesWithoutAbility(const char* runOrLumi,
-                                     std::string const& productTypeName) {
-
+    void throwProducesWithoutAbility(const char* runOrLumi, std::string const& productTypeName) {
       throw edm::Exception(edm::errors::LogicError)
-        << "Module declares it can produce a product of type \'" << productTypeName
-        << "\'\nin a " << runOrLumi << ", but does not have the ability to produce in "
-        << runOrLumi << "s.\n"
-        << "You must add a template parameter of type Begin" << runOrLumi << "Producer\n"
-        << "or End" << runOrLumi << "Producer to the EDProducer or EDFilter base class\n"
-        << "of the module. Or you could remove the call to the function \'produces\'\n"
-        << "(Note legacy modules are not ever allowed to produce in Runs or Lumis)\n";
+          << "Module declares it can produce a product of type \'" << productTypeName << "\'\nin a " << runOrLumi
+          << ", but does not have the ability to produce in " << runOrLumi << "s.\n"
+          << "You must add a template parameter of type Begin" << runOrLumi << "Producer\n"
+          << "or End" << runOrLumi << "Producer to the EDProducer or EDFilter base class\n"
+          << "of the module. Or you could remove the call to the function \'produces\'\n"
+          << "(Note legacy modules are not ever allowed to produce in Runs or Lumis)\n";
     }
-  }
-
-  void
-  ProductRegistryHelper::addToRegistry(TypeLabelList::const_iterator const& iBegin,
-                                       TypeLabelList::const_iterator const& iEnd,
-                                       ModuleDescription const& iDesc,
-                                       ProductRegistry& iReg,
-                                       ProductRegistryHelper* iProd,
-                                       bool iIsListener) {
+  }  // namespace
 
+  void ProductRegistryHelper::addToRegistry(TypeLabelList::const_iterator const& iBegin,
+                                            TypeLabelList::const_iterator const& iEnd,
+                                            ModuleDescription const& iDesc,
+                                            ProductRegistry& iReg,
+                                            ProductRegistryHelper* iProd,
+                                            bool iIsListener) {
     std::vector<std::string> missingDictionaries;
     std::vector<std::string> producedTypes;
-    std::set<std::tuple<BranchType,std::type_index,std::string>> registeredProducts;
+    std::set<std::tuple<BranchType, std::type_index, std::string>> registeredProducts;
 
-    for(TypeLabelList::const_iterator p = iBegin; p != iEnd; ++p) {
-      if (p->transition_ == Transition::BeginRun ||
-          p->transition_ == Transition::EndRun) {
+    for (TypeLabelList::const_iterator p = iBegin; p != iEnd; ++p) {
+      if (p->transition_ == Transition::BeginRun || p->transition_ == Transition::EndRun) {
         if (not iProd->hasAbilityToProduceInRuns()) {
           throwProducesWithoutAbility("Run", p->typeID_.userClassName());
         }
@@ -66,9 +58,10 @@ namespace edm {
         continue;
       }
       auto branchType = convertToBranchType(p->transition_);
-      if(branchType != InEvent) {
-        std::tuple<BranchType, std::type_index, std::string> entry{ branchType,p->typeID_.typeInfo(),p->productInstanceName_};
-        if(registeredProducts.end() != registeredProducts.find(entry) ) {
+      if (branchType != InEvent) {
+        std::tuple<BranchType, std::type_index, std::string> entry{
+            branchType, p->typeID_.typeInfo(), p->productInstanceName_};
+        if (registeredProducts.end() != registeredProducts.find(entry)) {
           //ignore registration of items if in both begin and end transitions for now
           // This is to work around ExternalLHEProducer
           continue;
@@ -89,10 +82,11 @@ namespace edm {
                               type,
                               true,
                               isEndTransition(p->transition_));
-      if(p->aliasType_ == TypeLabelItem::AliasType::kSwitchAlias) {
-        if(p->branchAlias_.empty()) {
-          throw edm::Exception(edm::errors::LogicError) << "Branch alias type has been set to SwitchAlias, but the alias content is empty.\n"
-                                                        << "Please report this error to the FWCore developers";
+      if (p->aliasType_ == TypeLabelItem::AliasType::kSwitchAlias) {
+        if (p->branchAlias_.empty()) {
+          throw edm::Exception(edm::errors::LogicError)
+              << "Branch alias type has been set to SwitchAlias, but the alias content is empty.\n"
+              << "Please report this error to the FWCore developers";
         }
         pdesc.setSwitchAliasModuleLabel(p->branchAlias_);
       }
@@ -113,7 +107,8 @@ namespace edm {
           continue;
         }
       }
-      if (!p->branchAlias_.empty()) pdesc.insertBranchAlias(p->branchAlias_);
+      if (!p->branchAlias_.empty())
+        pdesc.insertBranchAlias(p->branchAlias_);
       iReg.addProduct(pdesc, iIsListener);
     }
 
@@ -122,4 +117,4 @@ namespace edm {
       throwMissingDictionariesException(missingDictionaries, context, producedTypes);
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/ProductResolverBase.cc b/FWCore/Framework/src/ProductResolverBase.cc
index 0d0e92fc5bc33..981a5f7dca4ce 100644
--- a/FWCore/Framework/src/ProductResolverBase.cc
+++ b/FWCore/Framework/src/ProductResolverBase.cc
@@ -15,11 +15,10 @@ namespace edm {
 
   ProductResolverBase::~ProductResolverBase() {}
 
-  bool
-  ProductResolverBase::provenanceAvailable() const {
+  bool ProductResolverBase::provenanceAvailable() const {
     // If this product is from a the current process,
     // the provenance is available if and only if a product has been put.
-    if(branchDescription().produced()) {
+    if (branchDescription().produced()) {
       return productResolved();
     }
     // If this product is from a prior process, the provenance is available,
@@ -27,33 +26,20 @@ namespace edm {
     return true;
   }
 
-  TypeID
-  ProductResolverBase::productType() const {
-    return TypeID(branchDescription().wrappedTypeID());
-  }
+  TypeID ProductResolverBase::productType() const { return TypeID(branchDescription().wrappedTypeID()); }
 
-  Provenance const*
-  ProductResolverBase::provenance() const {
-    return provenance_();
-  }
+  Provenance const* ProductResolverBase::provenance() const { return provenance_(); }
 
-  void
-  ProductResolverBase::retrieveAndMerge_(Principal const&, MergeableRunProductMetadata const*) const {
-  }
+  void ProductResolverBase::retrieveAndMerge_(Principal const&, MergeableRunProductMetadata const*) const {}
 
-  void
-  ProductResolverBase::setMergeableRunProductMetadata_(MergeableRunProductMetadata const*) {
-  }
+  void ProductResolverBase::setMergeableRunProductMetadata_(MergeableRunProductMetadata const*) {}
 
-  void
-  ProductResolverBase::write(std::ostream& os) const {
+  void ProductResolverBase::write(std::ostream& os) const {
     // This is grossly inadequate. It is also not critical for the
     // first pass.
-    os << std::string("ProductResolver for product with ID: ")
-       << productID();
+    os << std::string("ProductResolver for product with ID: ") << productID();
   }
-  
-  void
-  ProductResolverBase::setupUnscheduled(UnscheduledConfigurator const&) {}
-  
-}
+
+  void ProductResolverBase::setupUnscheduled(UnscheduledConfigurator const&) {}
+
+}  // namespace edm
diff --git a/FWCore/Framework/src/ProductResolvers.cc b/FWCore/Framework/src/ProductResolvers.cc
index 2dd24438d65aa..7f7192f8c80a3 100644
--- a/FWCore/Framework/src/ProductResolvers.cc
+++ b/FWCore/Framework/src/ProductResolvers.cc
@@ -31,45 +31,42 @@ namespace edm {
   void DataManagingProductResolver::throwProductDeletedException() const {
     ProductDeletedException exception;
     exception << "ProductResolverBase::resolveProduct_: The product matching all criteria was already deleted\n"
-    << "Looking for type: " << branchDescription().unwrappedTypeID() << "\n"
-    << "Looking for module label: " << moduleLabel() << "\n"
-    << "Looking for productInstanceName: " << productInstanceName() << "\n"
-    << (processName().empty() ? "" : "Looking for process: ") << processName() << "\n"
-    << "This means there is a configuration error.\n"
-    << "The module which is asking for this data must be configured to state that it will read this data.";
+              << "Looking for type: " << branchDescription().unwrappedTypeID() << "\n"
+              << "Looking for module label: " << moduleLabel() << "\n"
+              << "Looking for productInstanceName: " << productInstanceName() << "\n"
+              << (processName().empty() ? "" : "Looking for process: ") << processName() << "\n"
+              << "This means there is a configuration error.\n"
+              << "The module which is asking for this data must be configured to state that it will read this data.";
     throw exception;
-    
   }
 
   //This is a templated function in order to avoid calling another virtual function
   template <bool callResolver, typename FUNC>
-  ProductResolverBase::Resolution
-  DataManagingProductResolver::resolveProductImpl(FUNC resolver) const {
-    
-    if(productWasDeleted()) {
+  ProductResolverBase::Resolution DataManagingProductResolver::resolveProductImpl(FUNC resolver) const {
+    if (productWasDeleted()) {
       throwProductDeletedException();
     }
     auto presentStatus = status();
-    
-    if(callResolver && presentStatus == ProductStatus::ResolveNotRun) {
+
+    if (callResolver && presentStatus == ProductStatus::ResolveNotRun) {
       //if resolver fails because of exception or not setting product
       // make sure the status goes to failed
       auto failedStatusSetter = [this](ProductStatus* presentStatus) {
-        if(this->status() == ProductStatus::ResolveNotRun) {
+        if (this->status() == ProductStatus::ResolveNotRun) {
           this->setFailedStatus();
         }
         *presentStatus = this->status();
       };
-      std::unique_ptr<ProductStatus, decltype(failedStatusSetter)> failedStatusGuard(&presentStatus, failedStatusSetter);
+      std::unique_ptr<ProductStatus, decltype(failedStatusSetter)> failedStatusGuard(&presentStatus,
+                                                                                     failedStatusSetter);
 
       //If successful, this will call setProduct
       resolver();
     }
-    
-    
+
     if (presentStatus == ProductStatus::ProductSet) {
       auto pd = &getProductData();
-      if(pd->wrapper()->isPresent()) {
+      if (pd->wrapper()->isPresent()) {
         return Resolution(pd);
       }
     }
@@ -77,9 +74,8 @@ namespace edm {
     return Resolution(nullptr);
   }
 
-  void
-  DataManagingProductResolver::mergeProduct(std::unique_ptr<WrapperBase> iFrom, MergeableRunProductMetadata const* mergeableRunProductMetadata) const {
-
+  void DataManagingProductResolver::mergeProduct(std::unique_ptr<WrapperBase> iFrom,
+                                                 MergeableRunProductMetadata const* mergeableRunProductMetadata) const {
     // if its not mergeable and the previous read failed, go ahead and use this one
     if (status() == ProductStatus::ResolveFailed) {
       setProduct(std::move(iFrom));
@@ -87,26 +83,30 @@ namespace edm {
     }
 
     assert(status() == ProductStatus::ProductSet);
-    if(not iFrom) { return;}
-    
+    if (not iFrom) {
+      return;
+    }
+
     checkType(*iFrom);
-    
-    auto original =getProductData().unsafe_wrapper();
+
+    auto original = getProductData().unsafe_wrapper();
     if (original->isMergeable()) {
       if (original->isPresent() != iFrom->isPresent()) {
         throw Exception(errors::MismatchedInputFiles)
-          << "Merge of Run or Lumi product failed for branch " << branchDescription().branchName() << "\n"
-          << "Was trying to merge objects where one product had been put in the input file and the other had not been." << "\n"
-          << "The solution is to drop the branch on input. Or better do not create inconsistent files\n"
-          << "that need to be merged in the first place.\n";
+            << "Merge of Run or Lumi product failed for branch " << branchDescription().branchName() << "\n"
+            << "Was trying to merge objects where one product had been put in the input file and the other had not "
+               "been."
+            << "\n"
+            << "The solution is to drop the branch on input. Or better do not create inconsistent files\n"
+            << "that need to be merged in the first place.\n";
       }
       if (original->isPresent()) {
-
         BranchDescription const& desc = branchDescription_();
         if (mergeableRunProductMetadata == nullptr || desc.branchType() != InRun) {
           original->mergeProduct(iFrom.get());
         } else {
-          MergeableRunProductMetadata::MergeDecision decision = mergeableRunProductMetadata->getMergeDecision(desc.processName());
+          MergeableRunProductMetadata::MergeDecision decision =
+              mergeableRunProductMetadata->getMergeDecision(desc.processName());
           if (decision == MergeableRunProductMetadata::MERGE) {
             original->mergeProduct(iFrom.get());
           } else if (decision == MergeableRunProductMetadata::REPLACE) {
@@ -123,18 +123,18 @@ namespace edm {
       }
       // If both have isPresent false, do nothing
 
-    } else if(original->hasIsProductEqual()) {
+    } else if (original->hasIsProductEqual()) {
       if (original->isPresent() && iFrom->isPresent()) {
-        if(!original->isProductEqual(iFrom.get())) {
+        if (!original->isProductEqual(iFrom.get())) {
           auto const& bd = branchDescription();
           edm::LogError("RunLumiMerging")
-            << "ProductResolver::mergeTheProduct\n"
-            << "Two run/lumi products for the same run/lumi which should be equal are not\n"
-            << "Using the first, ignoring the second\n"
-            << "className = " << bd.className() << "\n"
-            << "moduleLabel = " << bd.moduleLabel() << "\n"
-            << "instance = " << bd.productInstanceName() << "\n"
-            << "process = " << bd.processName() << "\n";
+              << "ProductResolver::mergeTheProduct\n"
+              << "Two run/lumi products for the same run/lumi which should be equal are not\n"
+              << "Using the first, ignoring the second\n"
+              << "className = " << bd.className() << "\n"
+              << "moduleLabel = " << bd.moduleLabel() << "\n"
+              << "instance = " << bd.productInstanceName() << "\n"
+              << "process = " << bd.processName() << "\n";
         }
       } else if (!original->isPresent() && iFrom->isPresent()) {
         setProduct(std::move(iFrom));
@@ -142,14 +142,13 @@ namespace edm {
       // if not iFrom->isPresent(), do nothing
     } else {
       auto const& bd = branchDescription();
-      edm::LogWarning("RunLumiMerging")
-        << "ProductResolver::mergeTheProduct\n"
-        << "Run/lumi product has neither a mergeProduct nor isProductEqual function\n"
-        << "Using the first, ignoring the second in merge\n"
-        << "className = " << bd.className() << "\n"
-        << "moduleLabel = " << bd.moduleLabel() << "\n"
-        << "instance = " << bd.productInstanceName() << "\n"
-        << "process = " << bd.processName() << "\n";
+      edm::LogWarning("RunLumiMerging") << "ProductResolver::mergeTheProduct\n"
+                                        << "Run/lumi product has neither a mergeProduct nor isProductEqual function\n"
+                                        << "Using the first, ignoring the second in merge\n"
+                                        << "className = " << bd.className() << "\n"
+                                        << "moduleLabel = " << bd.moduleLabel() << "\n"
+                                        << "instance = " << bd.productInstanceName() << "\n"
+                                        << "process = " << bd.processName() << "\n";
       if (!original->isPresent() && iFrom->isPresent()) {
         setProduct(std::move(iFrom));
       }
@@ -157,50 +156,46 @@ namespace edm {
     }
   }
 
-  ProductResolverBase::Resolution
-  InputProductResolver::resolveProduct_(Principal const& principal,
-                                        bool,
-                                        SharedResourcesAcquirer* ,
-                                        ModuleCallingContext const* mcc) const {
-    return resolveProductImpl<true>([this,&principal,mcc]() {
+  ProductResolverBase::Resolution InputProductResolver::resolveProduct_(Principal const& principal,
+                                                                        bool,
+                                                                        SharedResourcesAcquirer*,
+                                                                        ModuleCallingContext const* mcc) const {
+    return resolveProductImpl<true>([this, &principal, mcc]() {
       auto branchType = principal.branchType();
-      if(branchType != InEvent) {
+      if (branchType != InEvent) {
         //delayed get has not been allowed with Run or Lumis
         // The file may already be closed so the reader is invalid
         return;
       }
-      if(mcc and (branchType == InEvent) and aux_) {
-        aux_->preModuleDelayedGetSignal_.emit(*(mcc->getStreamContext()),*mcc);
+      if (mcc and (branchType == InEvent) and aux_) {
+        aux_->preModuleDelayedGetSignal_.emit(*(mcc->getStreamContext()), *mcc);
       }
 
-      auto sentry( make_sentry(mcc,
-                               [this, branchType](ModuleCallingContext const* iContext){
-                                 if(branchType == InEvent and aux_) {
-                                   aux_->postModuleDelayedGetSignal_.emit(*(iContext->getStreamContext()), *iContext); }
-                               }));
+      auto sentry(make_sentry(mcc, [this, branchType](ModuleCallingContext const* iContext) {
+        if (branchType == InEvent and aux_) {
+          aux_->postModuleDelayedGetSignal_.emit(*(iContext->getStreamContext()), *iContext);
+        }
+      }));
 
-      if(auto reader=principal.reader()) {
+      if (auto reader = principal.reader()) {
         std::unique_lock<std::recursive_mutex> guard;
-        if(auto sr = reader->sharedResources().second) {
-          guard =std::unique_lock<std::recursive_mutex>(*sr);
+        if (auto sr = reader->sharedResources().second) {
+          guard = std::unique_lock<std::recursive_mutex>(*sr);
         }
-        if ( not productResolved()) {
+        if (not productResolved()) {
           //another thread could have beaten us here
-          putProduct( reader->getProduct(branchDescription().branchID(), &principal, mcc));
+          putProduct(reader->getProduct(branchDescription().branchID(), &principal, mcc));
         }
       }
     });
-                              
   }
 
-  void
-  InputProductResolver::retrieveAndMerge_(Principal const& principal, MergeableRunProductMetadata const* mergeableRunProductMetadata) const {
-
-    if(auto reader = principal.reader()) {
-
+  void InputProductResolver::retrieveAndMerge_(Principal const& principal,
+                                               MergeableRunProductMetadata const* mergeableRunProductMetadata) const {
+    if (auto reader = principal.reader()) {
       std::unique_lock<std::recursive_mutex> guard;
-      if(auto sr = reader->sharedResources().second) {
-        guard =std::unique_lock<std::recursive_mutex>(*sr);
+      if (auto sr = reader->sharedResources().second) {
+        guard = std::unique_lock<std::recursive_mutex>(*sr);
       }
 
       //Can't use resolveProductImpl since it first checks to see
@@ -210,39 +205,41 @@ namespace edm {
       if (edp.get() != nullptr) {
         if (edp->isMergeable() && branchDescription().branchType() == InRun && !edp->hasSwap()) {
           throw Exception(errors::LogicError)
-            << "Missing definition of member function swap for branch name " << branchDescription().branchName() << "\n"
-            << "Mergeable data types written to a Run must have the swap member function defined" << "\n";
+              << "Missing definition of member function swap for branch name " << branchDescription().branchName()
+              << "\n"
+              << "Mergeable data types written to a Run must have the swap member function defined"
+              << "\n";
         }
-        if (status() == defaultStatus() ||
-            status() == ProductStatus::ProductSet ||
+        if (status() == defaultStatus() || status() == ProductStatus::ProductSet ||
             (status() == ProductStatus::ResolveFailed && !branchDescription().isMergeable())) {
           putOrMergeProduct(std::move(edp), mergeableRunProductMetadata);
-        } else { // status() == ResolveFailed && branchDescription().isMergeable()
+        } else {  // status() == ResolveFailed && branchDescription().isMergeable()
           throw Exception(errors::MismatchedInputFiles)
-            << "Merge of Run or Lumi product failed for branch " << branchDescription().branchName() << "\n"
-            << "The product branch was dropped in the first run or lumi fragment and present in a later one" << "\n"
-            << "The solution is to drop the branch on input. Or better do not create inconsistent files\n"
-            << "that need to be merged in the first place.\n";
+              << "Merge of Run or Lumi product failed for branch " << branchDescription().branchName() << "\n"
+              << "The product branch was dropped in the first run or lumi fragment and present in a later one"
+              << "\n"
+              << "The solution is to drop the branch on input. Or better do not create inconsistent files\n"
+              << "that need to be merged in the first place.\n";
         }
       } else if (status() == defaultStatus()) {
         setFailedStatus();
-      } else if ( status() != ProductStatus::ResolveFailed && branchDescription().isMergeable()) {
+      } else if (status() != ProductStatus::ResolveFailed && branchDescription().isMergeable()) {
         throw Exception(errors::MismatchedInputFiles)
-          << "Merge of Run or Lumi product failed for branch " << branchDescription().branchName() << "\n"
-          << "The product branch was present in first run or lumi fragment and dropped in a later one" << "\n"
-          << "The solution is to drop the branch on input. Or better do not create inconsistent files\n"
-          << "that need to be merged in the first place.\n";
+            << "Merge of Run or Lumi product failed for branch " << branchDescription().branchName() << "\n"
+            << "The product branch was present in first run or lumi fragment and dropped in a later one"
+            << "\n"
+            << "The solution is to drop the branch on input. Or better do not create inconsistent files\n"
+            << "that need to be merged in the first place.\n";
       }
       // Do nothing in other case. status is ResolveFailed already or
       // it is not mergeable and the status is ProductSet
     }
   }
 
-  void
-  InputProductResolver::setMergeableRunProductMetadata_(MergeableRunProductMetadata const* mrpm) {
+  void InputProductResolver::setMergeableRunProductMetadata_(MergeableRunProductMetadata const* mrpm) {
     setMergeableRunProductMetadataInProductData(mrpm);
   }
-  
+
   void InputProductResolver::prefetchAsync_(WaitingTask* waitTask,
                                             Principal const& principal,
                                             bool skipCurrentProcess,
@@ -250,78 +247,70 @@ namespace edm {
                                             SharedResourcesAcquirer* sra,
                                             ModuleCallingContext const* mcc) const {
     m_waitingTasks.add(waitTask);
-    
+
     bool expected = false;
-    if( m_prefetchRequested.compare_exchange_strong(expected, true) ) {
-      
-      auto workToDo = [this, mcc, &principal, token] () {
+    if (m_prefetchRequested.compare_exchange_strong(expected, true)) {
+      auto workToDo = [this, mcc, &principal, token]() {
         //need to make sure Service system is activated on the reading thread
         ServiceRegistry::Operate guard(token);
         try {
-          resolveProductImpl<true>([this,&principal,mcc]() {
-            if(principal.branchType() != InEvent) { return; }
-            if(auto reader = principal.reader()) {
+          resolveProductImpl<true>([this, &principal, mcc]() {
+            if (principal.branchType() != InEvent) {
+              return;
+            }
+            if (auto reader = principal.reader()) {
               std::unique_lock<std::recursive_mutex> guard;
-              if(auto sr = reader->sharedResources().second) {
-                guard =std::unique_lock<std::recursive_mutex>(*sr);
+              if (auto sr = reader->sharedResources().second) {
+                guard = std::unique_lock<std::recursive_mutex>(*sr);
               }
-              if ( not productResolved()) {
+              if (not productResolved()) {
                 //another thread could have finished this while we were waiting
-                putProduct( reader->getProduct(branchDescription().branchID(), &principal, mcc));
+                putProduct(reader->getProduct(branchDescription().branchID(), &principal, mcc));
               }
             }
           });
-        } catch(...) {
+        } catch (...) {
           this->m_waitingTasks.doneWaiting(std::current_exception());
           return;
         }
         this->m_waitingTasks.doneWaiting(nullptr);
       };
-      
+
       SerialTaskQueueChain* queue = nullptr;
-      if(auto reader = principal.reader()) {
+      if (auto reader = principal.reader()) {
         if (auto shared_res = reader->sharedResources().first) {
           queue = &(shared_res->serialQueueChain());
         }
       }
-      if(queue) {
+      if (queue) {
         queue->push(workToDo);
       } else {
         //Have to create a new task
-        auto t = make_functor_task(tbb::task::allocate_root(),
-                                   workToDo);
+        auto t = make_functor_task(tbb::task::allocate_root(), workToDo);
         tbb::task::spawn(*t);
       }
     }
   }
 
-  void
-  InputProductResolver::resetProductData_(bool deleteEarly) {
+  void InputProductResolver::resetProductData_(bool deleteEarly) {
     m_prefetchRequested = false;
     m_waitingTasks.reset();
     DataManagingProductResolver::resetProductData_(deleteEarly);
   }
 
-  void
-  InputProductResolver::setupUnscheduled(UnscheduledConfigurator const& iConfigure) {
+  void InputProductResolver::setupUnscheduled(UnscheduledConfigurator const& iConfigure) {
     aux_ = iConfigure.auxiliary();
   }
 
-  
-  bool
-  InputProductResolver::isFromCurrentProcess() const {
-    return false;
-  }
+  bool InputProductResolver::isFromCurrentProcess() const { return false; }
 
-  
-  ProductResolverBase::Resolution
-  PuttableProductResolver::resolveProduct_(Principal const&,
-                                           bool skipCurrentProcess,
-                                           SharedResourcesAcquirer*,
-                                           ModuleCallingContext const*) const {
+  ProductResolverBase::Resolution PuttableProductResolver::resolveProduct_(Principal const&,
+                                                                           bool skipCurrentProcess,
+                                                                           SharedResourcesAcquirer*,
+                                                                           ModuleCallingContext const*) const {
     if (!skipCurrentProcess) {
       //'false' means never call the lambda function
-      return resolveProductImpl<false>([](){return;});
+      return resolveProductImpl<false>([]() { return; });
     }
     return Resolution(nullptr);
   }
@@ -332,220 +321,185 @@ namespace edm {
                                                ServiceToken const& token,
                                                SharedResourcesAcquirer* sra,
                                                ModuleCallingContext const* mcc) const {
-    if(not skipCurrentProcess) {
-      if(branchDescription().availableOnlyAtEndTransition() and mcc ) {
-        if( not mcc->parent().isAtEndTransition() ) {
+    if (not skipCurrentProcess) {
+      if (branchDescription().availableOnlyAtEndTransition() and mcc) {
+        if (not mcc->parent().isAtEndTransition()) {
           return;
         }
       }
       m_waitingTasks.add(waitTask);
-      
+
       bool expected = false;
-      if(worker_ and prefetchRequested_.compare_exchange_strong(expected,true)) {
+      if (worker_ and prefetchRequested_.compare_exchange_strong(expected, true)) {
         //using a waiting task to do a callback guarantees that
         // the m_waitingTasks list will be released from waiting even
         // if the module does not put this data product or the
         // module has an exception while running
-        
-        auto waiting = make_waiting_task(tbb::task::allocate_root(),
-                                         [this](std::exception_ptr const *  iException) {
-                                           if(nullptr != iException) {
-                                             m_waitingTasks.doneWaiting(*iException);
-                                           } else {
-                                             m_waitingTasks.doneWaiting(std::exception_ptr());
-                                           }
-                                         });
+
+        auto waiting = make_waiting_task(tbb::task::allocate_root(), [this](std::exception_ptr const* iException) {
+          if (nullptr != iException) {
+            m_waitingTasks.doneWaiting(*iException);
+          } else {
+            m_waitingTasks.doneWaiting(std::exception_ptr());
+          }
+        });
         worker_->callWhenDoneAsync(waiting);
       }
     }
   }
-  
-  void
-  PuttableProductResolver::putProduct_(std::unique_ptr<WrapperBase> edp) const {
+
+  void PuttableProductResolver::putProduct_(std::unique_ptr<WrapperBase> edp) const {
     ProducedProductResolver::putProduct_(std::move(edp));
     bool expected = false;
-    if(prefetchRequested_.compare_exchange_strong(expected,true)) {
+    if (prefetchRequested_.compare_exchange_strong(expected, true)) {
       m_waitingTasks.doneWaiting(std::exception_ptr());
     }
   }
 
-  
-  void
-  PuttableProductResolver::resetProductData_(bool deleteEarly) {
+  void PuttableProductResolver::resetProductData_(bool deleteEarly) {
     m_waitingTasks.reset();
     DataManagingProductResolver::resetProductData_(deleteEarly);
     prefetchRequested_ = false;
   }
 
-  void
-  PuttableProductResolver::setupUnscheduled(UnscheduledConfigurator const& iConfigure) {
+  void PuttableProductResolver::setupUnscheduled(UnscheduledConfigurator const& iConfigure) {
     worker_ = iConfigure.findWorker(branchDescription().moduleLabel());
   }
 
-  
-  void
-  UnscheduledProductResolver::setupUnscheduled(UnscheduledConfigurator const& iConfigure) {
+  void UnscheduledProductResolver::setupUnscheduled(UnscheduledConfigurator const& iConfigure) {
     aux_ = iConfigure.auxiliary();
     worker_ = iConfigure.findWorker(branchDescription().moduleLabel());
     assert(worker_ != nullptr);
-    
-  }  
-  
-  ProductResolverBase::Resolution
-  UnscheduledProductResolver::resolveProduct_(Principal const& principal,
-                                              bool skipCurrentProcess,
-                                              SharedResourcesAcquirer* sra,
-                                              ModuleCallingContext const* mcc) const {
-    if (!skipCurrentProcess and worker_) {
-      return resolveProductImpl<true>(
-        [&principal,this,sra,mcc]() {
-          try {
-            auto const& event = static_cast<EventPrincipal const&>(principal);
-            ParentContext parentContext(mcc);
-            aux_->preModuleDelayedGetSignal_.emit(*(mcc->getStreamContext()),*mcc);
-
-            auto workCall = [this,&event,&parentContext,mcc] () {
-              auto sentry( make_sentry(mcc,[this](ModuleCallingContext const* iContext){aux_->postModuleDelayedGetSignal_.emit(*(iContext->getStreamContext()), *iContext); }));
-              
-              worker_->doWork<OccurrenceTraits<EventPrincipal, BranchActionStreamBegin> >(
-                                           event,
-                                           *(aux_->eventSetup()),
-                                           event.streamID(),
-                                           parentContext,
-                                           mcc->getStreamContext());
-            };
-            
-            if (sra) {
-              assert(false);
-            } else {
-              workCall();
-            }
+  }
 
+  ProductResolverBase::Resolution UnscheduledProductResolver::resolveProduct_(Principal const& principal,
+                                                                              bool skipCurrentProcess,
+                                                                              SharedResourcesAcquirer* sra,
+                                                                              ModuleCallingContext const* mcc) const {
+    if (!skipCurrentProcess and worker_) {
+      return resolveProductImpl<true>([&principal, this, sra, mcc]() {
+        try {
+          auto const& event = static_cast<EventPrincipal const&>(principal);
+          ParentContext parentContext(mcc);
+          aux_->preModuleDelayedGetSignal_.emit(*(mcc->getStreamContext()), *mcc);
+
+          auto workCall = [this, &event, &parentContext, mcc]() {
+            auto sentry(make_sentry(mcc, [this](ModuleCallingContext const* iContext) {
+              aux_->postModuleDelayedGetSignal_.emit(*(iContext->getStreamContext()), *iContext);
+            }));
+
+            worker_->doWork<OccurrenceTraits<EventPrincipal, BranchActionStreamBegin> >(
+                event, *(aux_->eventSetup()), event.streamID(), parentContext, mcc->getStreamContext());
+          };
+
+          if (sra) {
+            assert(false);
+          } else {
+            workCall();
           }
-          catch (cms::Exception & ex) {
-            std::ostringstream ost;
-            ost << "Calling produce method for unscheduled module "
-            << worker_->description().moduleName() << "/'"
-            << worker_->description().moduleLabel() << "'";
-            ex.addContext(ost.str());
-            throw;
-          }
-        });
+
+        } catch (cms::Exception& ex) {
+          std::ostringstream ost;
+          ost << "Calling produce method for unscheduled module " << worker_->description().moduleName() << "/'"
+              << worker_->description().moduleLabel() << "'";
+          ex.addContext(ost.str());
+          throw;
+        }
+      });
     }
     return Resolution(nullptr);
   }
-  
-  void
-  UnscheduledProductResolver::prefetchAsync_(WaitingTask* waitTask,
-                                             Principal const& principal,
-                                             bool skipCurrentProcess,
-                                             ServiceToken const& token,
-                                             SharedResourcesAcquirer* sra,
-                                             ModuleCallingContext const* mcc) const
-  {
-    if(skipCurrentProcess) { return; }
+
+  void UnscheduledProductResolver::prefetchAsync_(WaitingTask* waitTask,
+                                                  Principal const& principal,
+                                                  bool skipCurrentProcess,
+                                                  ServiceToken const& token,
+                                                  SharedResourcesAcquirer* sra,
+                                                  ModuleCallingContext const* mcc) const {
+    if (skipCurrentProcess) {
+      return;
+    }
     waitingTasks_.add(waitTask);
     bool expected = false;
-    if(prefetchRequested_.compare_exchange_strong(expected, true)) {
-      
+    if (prefetchRequested_.compare_exchange_strong(expected, true)) {
       //Have to create a new task which will make sure the state for UnscheduledProductResolver
       // is properly set after the module has run
-      auto t = make_waiting_task(tbb::task::allocate_root(),
-                                 [this](std::exception_ptr const* iPtr)
-      {
+      auto t = make_waiting_task(tbb::task::allocate_root(), [this](std::exception_ptr const* iPtr) {
         //The exception is being rethrown because resolveProductImpl sets the ProductResolver to a failed
         // state for the case where an exception occurs during the call to the function.
         try {
           resolveProductImpl<true>([iPtr]() {
-            if ( iPtr) {
+            if (iPtr) {
               std::rethrow_exception(*iPtr);
             }
           });
-        } catch(...) {
+        } catch (...) {
           waitingTasks_.doneWaiting(std::current_exception());
           return;
         }
         waitingTasks_.doneWaiting(nullptr);
-      } );
+      });
       auto const& event = static_cast<EventPrincipal const&>(principal);
       ParentContext parentContext(mcc);
 
-      worker_->doWorkAsync<OccurrenceTraits<EventPrincipal, BranchActionStreamBegin> >(t,
-                                                                                       event,
-                                                                                       *(aux_->eventSetup()),
-                                                                                       token,
-                                                                                       event.streamID(),
-                                                                                       parentContext,
-                                                                                       mcc->getStreamContext());
+      worker_->doWorkAsync<OccurrenceTraits<EventPrincipal, BranchActionStreamBegin> >(
+          t, event, *(aux_->eventSetup()), token, event.streamID(), parentContext, mcc->getStreamContext());
     }
   }
-  
-  void
-  UnscheduledProductResolver::resetProductData_(bool deleteEarly) {
+
+  void UnscheduledProductResolver::resetProductData_(bool deleteEarly) {
     prefetchRequested_ = false;
     waitingTasks_.reset();
     DataManagingProductResolver::resetProductData_(deleteEarly);
   }
 
-
-  void
-  ProducedProductResolver::putProduct_(std::unique_ptr<WrapperBase> edp) const {
-    if(status() != defaultStatus()) {
+  void ProducedProductResolver::putProduct_(std::unique_ptr<WrapperBase> edp) const {
+    if (status() != defaultStatus()) {
       throw Exception(errors::InsertFailure)
           << "Attempt to insert more than one product on branch " << branchDescription().branchName() << "\n";
     }
-    
+
     setProduct(std::move(edp));  // ProductResolver takes ownership
   }
 
-  void
-  InputProductResolver::putProduct_(std::unique_ptr<WrapperBase> edp) const {
-    if ( not productResolved()) {
+  void InputProductResolver::putProduct_(std::unique_ptr<WrapperBase> edp) const {
+    if (not productResolved()) {
       //Another thread could have set this
       setProduct(std::move(edp));
     }
   }
-  
-  bool
-  ProducedProductResolver::isFromCurrentProcess() const {
-    return true;
-  }
-  
-  void
-  DataManagingProductResolver::connectTo(ProductResolverBase const& iOther, Principal const*) {
-    assert(false);
-  }
-  
-  void
-  DataManagingProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> prod, MergeableRunProductMetadata const* mergeableRunProductMetadata) const {
-    if(not prod) {return;}
-    if(status() == defaultStatus()) {
+
+  bool ProducedProductResolver::isFromCurrentProcess() const { return true; }
+
+  void DataManagingProductResolver::connectTo(ProductResolverBase const& iOther, Principal const*) { assert(false); }
+
+  void DataManagingProductResolver::putOrMergeProduct_(
+      std::unique_ptr<WrapperBase> prod, MergeableRunProductMetadata const* mergeableRunProductMetadata) const {
+    if (not prod) {
+      return;
+    }
+    if (status() == defaultStatus()) {
       //resolveProduct has not been called or it failed
       putProduct(std::move(prod));
     } else {
       mergeProduct(std::move(prod), mergeableRunProductMetadata);
     }
   }
-  
 
-  
-  void
-  DataManagingProductResolver::checkType(WrapperBase const& prod) const {
+  void DataManagingProductResolver::checkType(WrapperBase const& prod) const {
     // Check if the types match.
     TypeID typeID(prod.dynamicTypeInfo());
-    if(typeID !=TypeID{branchDescription().unwrappedType().unvalidatedTypeInfo()}) {
+    if (typeID != TypeID{branchDescription().unwrappedType().unvalidatedTypeInfo()}) {
       // Types do not match.
       throw Exception(errors::EventCorruption)
-      << "Product on branch " << branchDescription().branchName() << " is of wrong type.\n"
-      << "It is supposed to be of type " << branchDescription().className() << ".\n"
-      << "It is actually of type " << typeID.className() << ".\n";
+          << "Product on branch " << branchDescription().branchName() << " is of wrong type.\n"
+          << "It is supposed to be of type " << branchDescription().className() << ".\n"
+          << "It is actually of type " << typeID.className() << ".\n";
     }
   }
-  
 
-  void
-  DataManagingProductResolver::setProduct(std::unique_ptr<WrapperBase> edp) const {
-    if(edp) {
+  void DataManagingProductResolver::setProduct(std::unique_ptr<WrapperBase> edp) const {
+    if (edp) {
       checkType(*edp);
       productData_.unsafe_setWrapper(std::move(edp));
       theStatus_ = ProductStatus::ProductSet;
@@ -556,112 +510,97 @@ namespace edm {
   // This routine returns true if it is known that currently there is no real product.
   // If there is a real product, it returns false.
   // If it is not known if there is a real product, it returns false.
-  bool
-  DataManagingProductResolver::productUnavailable_() const {
+  bool DataManagingProductResolver::productUnavailable_() const {
     auto presentStatus = status();
-    if(presentStatus == ProductStatus::ProductSet) {
+    if (presentStatus == ProductStatus::ProductSet) {
       return !(getProductData().wrapper()->isPresent());
     }
     return presentStatus != ProductStatus::ResolveNotRun;
   }
-    
-  bool
-  DataManagingProductResolver::productResolved_() const {
+
+  bool DataManagingProductResolver::productResolved_() const {
     auto s = status();
-    return (s != defaultStatus() ) or (s == ProductStatus::ProductDeleted);
+    return (s != defaultStatus()) or (s == ProductStatus::ProductDeleted);
   }
 
-  
   // This routine returns true if the product was deleted early in order to save memory
-  bool
-  DataManagingProductResolver::productWasDeleted_() const {
-    return status() == ProductStatus::ProductDeleted;
-  }
-  
-  bool
-  DataManagingProductResolver::productWasFetchedAndIsValid_(bool iSkipCurrentProcess) const {
-    if (iSkipCurrentProcess and isFromCurrentProcess() ) {
+  bool DataManagingProductResolver::productWasDeleted_() const { return status() == ProductStatus::ProductDeleted; }
+
+  bool DataManagingProductResolver::productWasFetchedAndIsValid_(bool iSkipCurrentProcess) const {
+    if (iSkipCurrentProcess and isFromCurrentProcess()) {
       return false;
     }
     if (status() == ProductStatus::ProductSet) {
-      if(getProductData().wrapper()->isPresent()) {
+      if (getProductData().wrapper()->isPresent()) {
         return true;
       }
     }
     return false;
   }
 
-  
-  void DataManagingProductResolver::setProvenance_(ProductProvenanceRetriever const* provRetriever, ProcessHistory const& ph, ProductID const& pid) {
-    productData_.setProvenance(provRetriever,ph,pid);
+  void DataManagingProductResolver::setProvenance_(ProductProvenanceRetriever const* provRetriever,
+                                                   ProcessHistory const& ph,
+                                                   ProductID const& pid) {
+    productData_.setProvenance(provRetriever, ph, pid);
   }
 
-  void DataManagingProductResolver::setMergeableRunProductMetadataInProductData(MergeableRunProductMetadata const* mrpm) {
+  void DataManagingProductResolver::setMergeableRunProductMetadataInProductData(
+      MergeableRunProductMetadata const* mrpm) {
     productData_.setMergeableRunProductMetadata(mrpm);
   }
 
-  void DataManagingProductResolver::setProcessHistory_(ProcessHistory const& ph) {
-    productData_.setProcessHistory(ph);
-  }
-  
+  void DataManagingProductResolver::setProcessHistory_(ProcessHistory const& ph) { productData_.setProcessHistory(ph); }
+
   ProductProvenance const* DataManagingProductResolver::productProvenancePtr_() const {
     return provenance()->productProvenance();
   }
-  
+
   void DataManagingProductResolver::resetProductData_(bool deleteEarly) {
-    if(theStatus_ == ProductStatus::ProductSet) {
+    if (theStatus_ == ProductStatus::ProductSet) {
       productData_.resetProductData();
     }
-    if(deleteEarly) {
+    if (deleteEarly) {
       theStatus_ = ProductStatus::ProductDeleted;
     } else {
       resetStatus();
     }
   }
-  
-  bool DataManagingProductResolver::singleProduct_() const {
-    return true;
-  }
 
-  void AliasProductResolver::setProvenance_(ProductProvenanceRetriever const* provRetriever, ProcessHistory const& ph, ProductID const& pid) {
-    realProduct_.setProvenance(provRetriever,ph,pid);
-  }
+  bool DataManagingProductResolver::singleProduct_() const { return true; }
 
-  void AliasProductResolver::setProcessHistory_(ProcessHistory const& ph) {
-    realProduct_.setProcessHistory(ph);
+  void AliasProductResolver::setProvenance_(ProductProvenanceRetriever const* provRetriever,
+                                            ProcessHistory const& ph,
+                                            ProductID const& pid) {
+    realProduct_.setProvenance(provRetriever, ph, pid);
   }
 
+  void AliasProductResolver::setProcessHistory_(ProcessHistory const& ph) { realProduct_.setProcessHistory(ph); }
+
   ProductProvenance const* AliasProductResolver::productProvenancePtr_() const {
     return provenance()->productProvenance();
   }
 
-  void AliasProductResolver::resetProductData_(bool deleteEarly) {
-    realProduct_.resetProductData_(deleteEarly);
-  }
+  void AliasProductResolver::resetProductData_(bool deleteEarly) { realProduct_.resetProductData_(deleteEarly); }
 
-  bool AliasProductResolver::singleProduct_() const {
-    return true;
-  }
-  
-  void AliasProductResolver::putProduct_(std::unique_ptr<WrapperBase> ) const {
+  bool AliasProductResolver::singleProduct_() const { return true; }
+
+  void AliasProductResolver::putProduct_(std::unique_ptr<WrapperBase>) const {
     throw Exception(errors::LogicError)
-    << "AliasProductResolver::putProduct_() not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+        << "AliasProductResolver::putProduct_() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
-  
-  void AliasProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp, MergeableRunProductMetadata const*) const {
+
+  void AliasProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp,
+                                                MergeableRunProductMetadata const*) const {
     throw Exception(errors::LogicError)
-    << "AliasProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp, MergeableRunProductMetadata const*) not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+        << "AliasProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp, MergeableRunProductMetadata "
+           "const*) not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
-  
 
-  SwitchBaseProductResolver::SwitchBaseProductResolver(std::shared_ptr<BranchDescription const> bd, DataManagingOrAliasProductResolver& realProduct):
-    realProduct_(realProduct),
-    productData_(std::move(bd)),
-    prefetchRequested_(false),
-    status_(defaultStatus_)
-  {
+  SwitchBaseProductResolver::SwitchBaseProductResolver(std::shared_ptr<BranchDescription const> bd,
+                                                       DataManagingOrAliasProductResolver& realProduct)
+      : realProduct_(realProduct), productData_(std::move(bd)), prefetchRequested_(false), status_(defaultStatus_) {
     // Parentage of this branch is always the same by construction, so we can compute the ID just "once" here.
     Parentage p;
     p.setParents(std::vector<BranchID>{realProduct.branchDescription().originalBranchID()});
@@ -669,19 +608,18 @@ namespace edm {
     ParentageRegistry::instance()->insertMapped(p);
   }
 
-  void SwitchBaseProductResolver::connectTo(ProductResolverBase const& iOther, Principal const *iParentPrincipal) {
+  void SwitchBaseProductResolver::connectTo(ProductResolverBase const& iOther, Principal const* iParentPrincipal) {
     throw Exception(errors::LogicError)
-    << "SwitchBaseProductResolver::connectTo() not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+        << "SwitchBaseProductResolver::connectTo() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
 
   void SwitchBaseProductResolver::setupUnscheduled(UnscheduledConfigurator const& iConfigure) {
     worker_ = iConfigure.findWorker(branchDescription().moduleLabel());
   }
 
-  ProductResolverBase::Resolution
-  SwitchBaseProductResolver::resolveProductImpl(Resolution res) const {
-    if(res.data() == nullptr)
+  ProductResolverBase::Resolution SwitchBaseProductResolver::resolveProductImpl(Resolution res) const {
+    if (res.data() == nullptr)
       return res;
     // Use the Wrapper of the pointed-to resolver, but the provenance of this resolver
     productData_.unsafe_setWrapper(res.data()->sharedConstWrapper());
@@ -697,135 +635,140 @@ namespace edm {
   }
 
   void SwitchBaseProductResolver::putProduct_(std::unique_ptr<WrapperBase> edp) const {
-    if(status_ != defaultStatus_) {
-      throw Exception(errors::InsertFailure) << "Attempt to insert more than one product for a branch " << branchDescription().branchName() << "This makes no sense for SwitchBaseProductResolver.\nContact a Framework developer";
+    if (status_ != defaultStatus_) {
+      throw Exception(errors::InsertFailure)
+          << "Attempt to insert more than one product for a branch " << branchDescription().branchName()
+          << "This makes no sense for SwitchBaseProductResolver.\nContact a Framework developer";
     }
     // Let's use ResolveFailed to signal that produce() was called, as
     // there is no real product in this resolver
     status_ = ProductStatus::ResolveFailed;
     bool expected = false;
-    if(prefetchRequested_.compare_exchange_strong(expected, true)) {
+    if (prefetchRequested_.compare_exchange_strong(expected, true)) {
       waitingTasks_.doneWaiting(std::exception_ptr());
     }
   }
 
-  void SwitchBaseProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp, MergeableRunProductMetadata const*) const {
+  void SwitchBaseProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp,
+                                                     MergeableRunProductMetadata const*) const {
     throw Exception(errors::LogicError)
-    << "SwitchBaseProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp, MergeableRunProductMetadata const*) not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+        << "SwitchBaseProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp, "
+           "MergeableRunProductMetadata const*) not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
 
-  void SwitchBaseProductResolver::setProvenance_(ProductProvenanceRetriever const* provRetriever, ProcessHistory const& ph, ProductID const& pid) {
+  void SwitchBaseProductResolver::setProvenance_(ProductProvenanceRetriever const* provRetriever,
+                                                 ProcessHistory const& ph,
+                                                 ProductID const& pid) {
     // insertIntoSet is const, so let's exploit that to fake the getting of the "input" product
     provRetriever->insertIntoSet(ProductProvenance(branchDescription().branchID(), parentageID_));
-    productData_.setProvenance(provRetriever,ph,pid);
+    productData_.setProvenance(provRetriever, ph, pid);
   }
 
   void SwitchBaseProductResolver::resetProductData_(bool deleteEarly) {
     productData_.resetProductData();
     realProduct_.resetProductData_(deleteEarly);
-    if(not deleteEarly) {
+    if (not deleteEarly) {
       status_ = defaultStatus_;
     }
   }
 
-  ProductResolverBase::Resolution
-  SwitchProducerProductResolver::resolveProduct_(Principal const& principal,
-                                                bool skipCurrentProcess,
-                                                SharedResourcesAcquirer* sra,
-                                                ModuleCallingContext const* mcc) const {
-    if(status() == ProductStatus::ResolveFailed) {
+  ProductResolverBase::Resolution SwitchProducerProductResolver::resolveProduct_(Principal const& principal,
+                                                                                 bool skipCurrentProcess,
+                                                                                 SharedResourcesAcquirer* sra,
+                                                                                 ModuleCallingContext const* mcc) const {
+    if (status() == ProductStatus::ResolveFailed) {
       return resolveProductImpl(realProduct().resolveProduct(principal, skipCurrentProcess, sra, mcc));
     }
     return Resolution(nullptr);
   }
 
   void SwitchProducerProductResolver::prefetchAsync_(WaitingTask* waitTask,
-                                                    Principal const& principal,
-                                                    bool skipCurrentProcess,
-                                                    ServiceToken const& token,
-                                                    SharedResourcesAcquirer* sra,
-                                                    ModuleCallingContext const* mcc) const {
-    if(skipCurrentProcess) { return; }
-    if(branchDescription().availableOnlyAtEndTransition() and mcc and not mcc->parent().isAtEndTransition()) {
+                                                     Principal const& principal,
+                                                     bool skipCurrentProcess,
+                                                     ServiceToken const& token,
+                                                     SharedResourcesAcquirer* sra,
+                                                     ModuleCallingContext const* mcc) const {
+    if (skipCurrentProcess) {
+      return;
+    }
+    if (branchDescription().availableOnlyAtEndTransition() and mcc and not mcc->parent().isAtEndTransition()) {
       return;
     }
     waitingTasks().add(waitTask);
 
     bool expected = false;
-    if(prefetchRequested().compare_exchange_strong(expected, true)) {
+    if (prefetchRequested().compare_exchange_strong(expected, true)) {
       //using a waiting task to do a callback guarantees that
       // the waitingTasks() list will be released from waiting even
       // if the module does not put this data product or the
       // module has an exception while running
-      auto waiting = make_waiting_task(tbb::task::allocate_root(),
-                                       [this](std::exception_ptr const *iException) {
-                                         if(nullptr != iException) {
-                                           waitingTasks().doneWaiting(*iException);
-                                         }
-                                         else {
-                                           waitingTasks().doneWaiting(std::exception_ptr());
-                                         }
-                                       });
+      auto waiting = make_waiting_task(tbb::task::allocate_root(), [this](std::exception_ptr const* iException) {
+        if (nullptr != iException) {
+          waitingTasks().doneWaiting(*iException);
+        } else {
+          waitingTasks().doneWaiting(std::exception_ptr());
+        }
+      });
       worker()->callWhenDoneAsync(waiting);
     }
   }
 
   bool SwitchProducerProductResolver::productUnavailable_() const {
     // if produce() was run (ResolveFailed), ask from the real resolver
-    if(status() == ProductStatus::ResolveFailed) {
+    if (status() == ProductStatus::ResolveFailed) {
       return realProduct().productUnavailable();
     }
     return true;
   }
 
-  ProductResolverBase::Resolution
-  SwitchAliasProductResolver::resolveProduct_(Principal const& principal,
-                                              bool skipCurrentProcess,
-                                              SharedResourcesAcquirer* sra,
-                                              ModuleCallingContext const* mcc) const {
+  ProductResolverBase::Resolution SwitchAliasProductResolver::resolveProduct_(Principal const& principal,
+                                                                              bool skipCurrentProcess,
+                                                                              SharedResourcesAcquirer* sra,
+                                                                              ModuleCallingContext const* mcc) const {
     return resolveProductImpl(realProduct().resolveProduct(principal, skipCurrentProcess, sra, mcc));
   }
 
   void SwitchAliasProductResolver::prefetchAsync_(WaitingTask* waitTask,
-                                                    Principal const& principal,
-                                                    bool skipCurrentProcess,
-                                                    ServiceToken const& token,
-                                                    SharedResourcesAcquirer* sra,
-                                                    ModuleCallingContext const* mcc) const {
-    if(skipCurrentProcess) { return; }
+                                                  Principal const& principal,
+                                                  bool skipCurrentProcess,
+                                                  ServiceToken const& token,
+                                                  SharedResourcesAcquirer* sra,
+                                                  ModuleCallingContext const* mcc) const {
+    if (skipCurrentProcess) {
+      return;
+    }
     realProduct().prefetchAsync(waitTask, principal, skipCurrentProcess, token, sra, mcc);
   }
-  
-  
-  void ParentProcessProductResolver::setProvenance_(ProductProvenanceRetriever const* provRetriever, ProcessHistory const& ph, ProductID const& pid) {
+
+  void ParentProcessProductResolver::setProvenance_(ProductProvenanceRetriever const* provRetriever,
+                                                    ProcessHistory const& ph,
+                                                    ProductID const& pid) {
     provRetriever_ = provRetriever;
   }
-  
-  void ParentProcessProductResolver::setProcessHistory_(ProcessHistory const& ph) {
-  }
-  
+
+  void ParentProcessProductResolver::setProcessHistory_(ProcessHistory const& ph) {}
+
   ProductProvenance const* ParentProcessProductResolver::productProvenancePtr_() const {
-    return provRetriever_? provRetriever_->branchIDToProvenance(bd_->originalBranchID()): nullptr;
-  }
-  
-  void ParentProcessProductResolver::resetProductData_(bool deleteEarly) {
-  }
-  
-  bool ParentProcessProductResolver::singleProduct_() const {
-    return true;
+    return provRetriever_ ? provRetriever_->branchIDToProvenance(bd_->originalBranchID()) : nullptr;
   }
 
-  void ParentProcessProductResolver::putProduct_(std::unique_ptr<WrapperBase> ) const {
+  void ParentProcessProductResolver::resetProductData_(bool deleteEarly) {}
+
+  bool ParentProcessProductResolver::singleProduct_() const { return true; }
+
+  void ParentProcessProductResolver::putProduct_(std::unique_ptr<WrapperBase>) const {
     throw Exception(errors::LogicError)
-    << "ParentProcessProductResolver::putProduct_() not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+        << "ParentProcessProductResolver::putProduct_() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
-  
-  void ParentProcessProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp, MergeableRunProductMetadata const*) const {
+
+  void ParentProcessProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp,
+                                                        MergeableRunProductMetadata const*) const {
     throw Exception(errors::LogicError)
-    << "ParentProcessProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp, MergeableRunProductMetadata const*) not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+        << "ParentProcessProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp, "
+           "MergeableRunProductMetadata const*) not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
 
   void ParentProcessProductResolver::throwNullRealProduct() const {
@@ -845,119 +788,113 @@ namespace edm {
     // be addressed someday is how ProductResolvers for non-kept branches are
     // connected to earlier SubProcesses.
     throw Exception(errors::LogicError)
-      << "ParentProcessProductResolver::throwNullRealProduct RealProduct pointer not set in this context.\n"
-      << "Contact a Framework developer\n";
-  }
-
-  NoProcessProductResolver::
-  NoProcessProductResolver(std::vector<ProductResolverIndex> const&  matchingHolders,
-                           std::vector<bool> const& ambiguous,
-                           bool madeAtEnd) :
-  matchingHolders_(matchingHolders),
-  ambiguous_(ambiguous),
-  lastCheckIndex_(ambiguous_.size() + kUnsetOffset),
-  lastSkipCurrentCheckIndex_(lastCheckIndex_.load()),
-  prefetchRequested_(false),
-  skippingPrefetchRequested_(false),
-  madeAtEnd_{madeAtEnd}
-  {
+        << "ParentProcessProductResolver::throwNullRealProduct RealProduct pointer not set in this context.\n"
+        << "Contact a Framework developer\n";
+  }
+
+  NoProcessProductResolver::NoProcessProductResolver(std::vector<ProductResolverIndex> const& matchingHolders,
+                                                     std::vector<bool> const& ambiguous,
+                                                     bool madeAtEnd)
+      : matchingHolders_(matchingHolders),
+        ambiguous_(ambiguous),
+        lastCheckIndex_(ambiguous_.size() + kUnsetOffset),
+        lastSkipCurrentCheckIndex_(lastCheckIndex_.load()),
+        prefetchRequested_(false),
+        skippingPrefetchRequested_(false),
+        madeAtEnd_{madeAtEnd} {
     assert(ambiguous_.size() == matchingHolders_.size());
   }
-  
-  ProductResolverBase::Resolution
-  NoProcessProductResolver::tryResolver(unsigned int index,
-                                        Principal const& principal,
-                                        bool skipCurrentProcess,
-                                        SharedResourcesAcquirer* sra,
-                                        ModuleCallingContext const* mcc) const {
+
+  ProductResolverBase::Resolution NoProcessProductResolver::tryResolver(unsigned int index,
+                                                                        Principal const& principal,
+                                                                        bool skipCurrentProcess,
+                                                                        SharedResourcesAcquirer* sra,
+                                                                        ModuleCallingContext const* mcc) const {
     ProductResolverBase const* productResolver = principal.getProductResolverByIndex(matchingHolders_[index]);
     return productResolver->resolveProduct(principal, skipCurrentProcess, sra, mcc);
   }
-  
-  
-  ProductResolverBase::Resolution
-  NoProcessProductResolver::resolveProduct_(Principal const& principal,
-                                            bool skipCurrentProcess,
-                                            SharedResourcesAcquirer* sra,
-                                            ModuleCallingContext const* mcc) const {
+
+  ProductResolverBase::Resolution NoProcessProductResolver::resolveProduct_(Principal const& principal,
+                                                                            bool skipCurrentProcess,
+                                                                            SharedResourcesAcquirer* sra,
+                                                                            ModuleCallingContext const* mcc) const {
     //See if we've already cached which Resolver we should call or if
     // we know it is ambiguous
     const unsigned int choiceSize = ambiguous_.size();
 
     //madeAtEnd_==true and not at end transition is the same as skipping the current process
-    if( (not skipCurrentProcess) and (madeAtEnd_ and mcc)) {
+    if ((not skipCurrentProcess) and (madeAtEnd_ and mcc)) {
       skipCurrentProcess = not mcc->parent().isAtEndTransition();
     }
 
-    unsigned int checkCacheIndex = skipCurrentProcess? lastSkipCurrentCheckIndex_.load() : lastCheckIndex_.load();
-    if( checkCacheIndex != choiceSize +kUnsetOffset) {
-      if (checkCacheIndex == choiceSize+kAmbiguousOffset) {
+    unsigned int checkCacheIndex = skipCurrentProcess ? lastSkipCurrentCheckIndex_.load() : lastCheckIndex_.load();
+    if (checkCacheIndex != choiceSize + kUnsetOffset) {
+      if (checkCacheIndex == choiceSize + kAmbiguousOffset) {
         return ProductResolverBase::Resolution::makeAmbiguous();
-      } else if(checkCacheIndex == choiceSize+kMissingOffset) {
+      } else if (checkCacheIndex == choiceSize + kMissingOffset) {
         return Resolution(nullptr);
       }
-      return tryResolver(checkCacheIndex, principal, skipCurrentProcess,
-                         sra,mcc);
+      return tryResolver(checkCacheIndex, principal, skipCurrentProcess, sra, mcc);
     }
 
-    std::atomic<unsigned int>& updateCacheIndex = skipCurrentProcess? lastSkipCurrentCheckIndex_ : lastCheckIndex_;
+    std::atomic<unsigned int>& updateCacheIndex = skipCurrentProcess ? lastSkipCurrentCheckIndex_ : lastCheckIndex_;
 
     std::vector<unsigned int> const& lookupProcessOrder = principal.lookupProcessOrder();
-    for(unsigned int k : lookupProcessOrder) {
+    for (unsigned int k : lookupProcessOrder) {
       assert(k < ambiguous_.size());
-      if(k == 0) break; // Done
-      if(ambiguous_[k]) {
+      if (k == 0)
+        break;  // Done
+      if (ambiguous_[k]) {
         updateCacheIndex = choiceSize + kAmbiguousOffset;
         return ProductResolverBase::Resolution::makeAmbiguous();
       }
       if (matchingHolders_[k] != ProductResolverIndexInvalid) {
-        auto resolution = tryResolver(k,principal, skipCurrentProcess, sra,mcc);
-        if(resolution.data() != nullptr) {
+        auto resolution = tryResolver(k, principal, skipCurrentProcess, sra, mcc);
+        if (resolution.data() != nullptr) {
           updateCacheIndex = k;
           return resolution;
         }
       }
     }
-    
+
     updateCacheIndex = choiceSize + kMissingOffset;
     return Resolution(nullptr);
   }
-  
-  void
-  NoProcessProductResolver::prefetchAsync_(WaitingTask* waitTask,
-                                           Principal const& principal,
-                                           bool skipCurrentProcess,
-                                           ServiceToken const& token,
-                                           SharedResourcesAcquirer* sra,
-                                           ModuleCallingContext const* mcc) const {
+
+  void NoProcessProductResolver::prefetchAsync_(WaitingTask* waitTask,
+                                                Principal const& principal,
+                                                bool skipCurrentProcess,
+                                                ServiceToken const& token,
+                                                SharedResourcesAcquirer* sra,
+                                                ModuleCallingContext const* mcc) const {
     bool timeToMakeAtEnd = true;
-    if(madeAtEnd_ and mcc) {
+    if (madeAtEnd_ and mcc) {
       timeToMakeAtEnd = mcc->parent().isAtEndTransition();
     }
 
     //If timeToMakeAtEnd is false, then it is equivalent to skipping the current process
-    if(not skipCurrentProcess and timeToMakeAtEnd) {
+    if (not skipCurrentProcess and timeToMakeAtEnd) {
       waitingTasks_.add(waitTask);
-      
+
       bool expected = false;
-      if( prefetchRequested_.compare_exchange_strong(expected,true)) {
+      if (prefetchRequested_.compare_exchange_strong(expected, true)) {
         //we are the first thread to request
         tryPrefetchResolverAsync(0, principal, false, sra, mcc, token);
       }
     } else {
       skippingWaitingTasks_.add(waitTask);
       bool expected = false;
-      if( skippingPrefetchRequested_.compare_exchange_strong(expected,true)) {
-      //we are the first thread to request
+      if (skippingPrefetchRequested_.compare_exchange_strong(expected, true)) {
+        //we are the first thread to request
         tryPrefetchResolverAsync(0, principal, true, sra, mcc, token);
       }
     }
   }
-  
-  void NoProcessProductResolver::setCache(bool iSkipCurrentProcess, 
-                                          ProductResolverIndex iIndex, 
+
+  void NoProcessProductResolver::setCache(bool iSkipCurrentProcess,
+                                          ProductResolverIndex iIndex,
                                           std::exception_ptr iExceptPtr) const {
-    if( not iSkipCurrentProcess) {
+    if (not iSkipCurrentProcess) {
       lastCheckIndex_ = iIndex;
       waitingTasks_.doneWaiting(iExceptPtr);
     } else {
@@ -969,39 +906,34 @@ namespace edm {
   namespace {
     class TryNextResolverWaitingTask : public edm::WaitingTask {
     public:
-      
       TryNextResolverWaitingTask(NoProcessProductResolver const* iResolver,
                                  unsigned int iResolverIndex,
                                  Principal const* iPrincipal,
                                  SharedResourcesAcquirer* iSRA,
                                  ModuleCallingContext const* iMCC,
                                  bool iSkipCurrentProcess,
-                                 ServiceToken iToken) :
-      resolver_(iResolver),
-      principal_(iPrincipal),
-      sra_(iSRA),
-      mcc_(iMCC),
-      serviceToken_(iToken),
-      index_(iResolverIndex),
-      skipCurrentProcess_(iSkipCurrentProcess){}
-      
+                                 ServiceToken iToken)
+          : resolver_(iResolver),
+            principal_(iPrincipal),
+            sra_(iSRA),
+            mcc_(iMCC),
+            serviceToken_(iToken),
+            index_(iResolverIndex),
+            skipCurrentProcess_(iSkipCurrentProcess) {}
+
       tbb::task* execute() override {
-        auto exceptPtr =exceptionPtr();
-        if(exceptPtr) {
+        auto exceptPtr = exceptionPtr();
+        if (exceptPtr) {
           resolver_->prefetchFailed(index_, *principal_, skipCurrentProcess_, *exceptPtr);
         } else {
-          if(not resolver_->dataValidFromResolver(index_, *principal_, skipCurrentProcess_)) {
-            resolver_->tryPrefetchResolverAsync(index_+1,
-                                                *principal_,
-                                                skipCurrentProcess_,
-                                                sra_,
-                                                mcc_,
-                                                serviceToken_);
+          if (not resolver_->dataValidFromResolver(index_, *principal_, skipCurrentProcess_)) {
+            resolver_->tryPrefetchResolverAsync(
+                index_ + 1, *principal_, skipCurrentProcess_, sra_, mcc_, serviceToken_);
           }
         }
         return nullptr;
       }
-      
+
     private:
       NoProcessProductResolver const* resolver_;
       Principal const* principal_;
@@ -1011,83 +943,66 @@ namespace edm {
       unsigned int index_;
       bool skipCurrentProcess_;
     };
-  }
+  }  // namespace
 
-  void
-  NoProcessProductResolver::prefetchFailed(unsigned int iProcessingIndex,
-                                           Principal const& principal,
-                                           bool iSkipCurrentProcess,
-                                           std::exception_ptr iExceptPtr) const {
+  void NoProcessProductResolver::prefetchFailed(unsigned int iProcessingIndex,
+                                                Principal const& principal,
+                                                bool iSkipCurrentProcess,
+                                                std::exception_ptr iExceptPtr) const {
     std::vector<unsigned int> const& lookupProcessOrder = principal.lookupProcessOrder();
     auto k = lookupProcessOrder[iProcessingIndex];
 
     setCache(iSkipCurrentProcess, k, iExceptPtr);
   }
 
-  
-  bool
-  NoProcessProductResolver::dataValidFromResolver(unsigned int iProcessingIndex,
-                                                  Principal const& principal,
-                                                  bool iSkipCurrentProcess) const {
+  bool NoProcessProductResolver::dataValidFromResolver(unsigned int iProcessingIndex,
+                                                       Principal const& principal,
+                                                       bool iSkipCurrentProcess) const {
     std::vector<unsigned int> const& lookupProcessOrder = principal.lookupProcessOrder();
     auto k = lookupProcessOrder[iProcessingIndex];
     ProductResolverBase const* productResolver = principal.getProductResolverByIndex(matchingHolders_[k]);
 
-    if(productResolver->productWasFetchedAndIsValid(iSkipCurrentProcess)) {
-
+    if (productResolver->productWasFetchedAndIsValid(iSkipCurrentProcess)) {
       setCache(iSkipCurrentProcess, k, nullptr);
       return true;
     }
     return false;
   }
 
-  
-  void
-  NoProcessProductResolver::tryPrefetchResolverAsync(unsigned int iProcessingIndex,
-                                                     Principal const& principal,
-                                                     bool skipCurrentProcess,
-                                                     SharedResourcesAcquirer* sra,
-                                                     ModuleCallingContext const* mcc,
-                                                     ServiceToken token) const {
+  void NoProcessProductResolver::tryPrefetchResolverAsync(unsigned int iProcessingIndex,
+                                                          Principal const& principal,
+                                                          bool skipCurrentProcess,
+                                                          SharedResourcesAcquirer* sra,
+                                                          ModuleCallingContext const* mcc,
+                                                          ServiceToken token) const {
     std::vector<unsigned int> const& lookupProcessOrder = principal.lookupProcessOrder();
     auto index = iProcessingIndex;
 
     const unsigned int choiceSize = ambiguous_.size();
     unsigned int newCacheIndex = choiceSize + kMissingOffset;
-    while(index < lookupProcessOrder.size()) {
+    while (index < lookupProcessOrder.size()) {
       auto k = lookupProcessOrder[index];
-      if(k==0) {
+      if (k == 0) {
         break;
       }
       assert(k < ambiguous_.size());
-      if(ambiguous_[k]) {
+      if (ambiguous_[k]) {
         newCacheIndex = choiceSize + kAmbiguousOffset;
         break;
       }
       if (matchingHolders_[k] != ProductResolverIndexInvalid) {
         //make new task
-        
-        auto task = new (tbb::task::allocate_root()) TryNextResolverWaitingTask(
-                                                                                this,
-                                                                                index,
-                                                                                &principal,
-                                                                                sra,
-                                                                                mcc,
-                                                                                skipCurrentProcess,
-                                                                                token
-                                                                                );
+
+        auto task = new (tbb::task::allocate_root())
+            TryNextResolverWaitingTask(this, index, &principal, sra, mcc, skipCurrentProcess, token);
         task->increment_ref_count();
         ProductResolverBase const* productResolver = principal.getProductResolverByIndex(matchingHolders_[k]);
 
         //Make sure the Services are available on this thread
         ServiceRegistry::Operate guard(token);
 
-        productResolver->prefetchAsync(task,
-                                       principal,
-                                       skipCurrentProcess,
-                                       token,
-                                       sra, mcc);
-        if(0 == task->decrement_ref_count()) {
+        productResolver->prefetchAsync(task, principal, skipCurrentProcess, token, sra, mcc);
+        if (0 == task->decrement_ref_count()) {
           tbb::task::spawn(*task);
         }
         return;
@@ -1097,18 +1012,16 @@ namespace edm {
     //data product unavailable
     setCache(skipCurrentProcess, newCacheIndex, nullptr);
   }
-  
-  void NoProcessProductResolver::setProvenance_(ProductProvenanceRetriever const* , ProcessHistory const& , ProductID const& ) {
-  }
 
-  void NoProcessProductResolver::setProcessHistory_(ProcessHistory const& ) {
-  }
+  void NoProcessProductResolver::setProvenance_(ProductProvenanceRetriever const*,
+                                                ProcessHistory const&,
+                                                ProductID const&) {}
 
-  ProductProvenance const* NoProcessProductResolver::productProvenancePtr_() const {
-    return nullptr;
-  }
+  void NoProcessProductResolver::setProcessHistory_(ProcessHistory const&) {}
+
+  ProductProvenance const* NoProcessProductResolver::productProvenancePtr_() const { return nullptr; }
 
-  inline unsigned int NoProcessProductResolver::unsetIndexValue() const { return ambiguous_.size()+kUnsetOffset; }
+  inline unsigned int NoProcessProductResolver::unsetIndexValue() const { return ambiguous_.size() + kUnsetOffset; }
 
   void NoProcessProductResolver::resetProductData_(bool) {
     const auto resetValue = unsetIndexValue();
@@ -1120,91 +1033,88 @@ namespace edm {
     skippingWaitingTasks_.reset();
   }
 
-  bool NoProcessProductResolver::singleProduct_() const {
-    return false;
-  }
+  bool NoProcessProductResolver::singleProduct_() const { return false; }
 
   bool NoProcessProductResolver::unscheduledWasNotRun_() const {
     throw Exception(errors::LogicError)
-      << "NoProcessProductResolver::unscheduledWasNotRun_() not implemented and should never be called.\n"
-      << "Contact a Framework developer\n";
+        << "NoProcessProductResolver::unscheduledWasNotRun_() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
 
   bool NoProcessProductResolver::productUnavailable_() const {
     throw Exception(errors::LogicError)
-      << "NoProcessProductResolver::productUnavailable_() not implemented and should never be called.\n"
-      << "Contact a Framework developer\n";
+        << "NoProcessProductResolver::productUnavailable_() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
 
   bool NoProcessProductResolver::productResolved_() const {
     throw Exception(errors::LogicError)
-    << "NoProcessProductResolver::productResolved_() not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+        << "NoProcessProductResolver::productResolved_() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
 
   bool NoProcessProductResolver::productWasDeleted_() const {
     throw Exception(errors::LogicError)
-      << "NoProcessProductResolver::productWasDeleted_() not implemented and should never be called.\n"
-      << "Contact a Framework developer\n";
+        << "NoProcessProductResolver::productWasDeleted_() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
 
   bool NoProcessProductResolver::productWasFetchedAndIsValid_(bool /*iSkipCurrentProcess*/) const {
     throw Exception(errors::LogicError)
-    << "NoProcessProductResolver::productWasFetchedAndIsValid_() not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+        << "NoProcessProductResolver::productWasFetchedAndIsValid_() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
 
-  void NoProcessProductResolver::putProduct_(std::unique_ptr<WrapperBase> ) const {
+  void NoProcessProductResolver::putProduct_(std::unique_ptr<WrapperBase>) const {
     throw Exception(errors::LogicError)
-      << "NoProcessProductResolver::putProduct_() not implemented and should never be called.\n"
-      << "Contact a Framework developer\n";
+        << "NoProcessProductResolver::putProduct_() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
 
-  void NoProcessProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp, MergeableRunProductMetadata const*) const {
+  void NoProcessProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp,
+                                                    MergeableRunProductMetadata const*) const {
     throw Exception(errors::LogicError)
-      << "NoProcessProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp, MergeableRunProductMetadata const*) not implemented and should never be called.\n"
-      << "Contact a Framework developer\n";
+        << "NoProcessProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp, MergeableRunProductMetadata "
+           "const*) not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
 
   BranchDescription const& NoProcessProductResolver::branchDescription_() const {
     throw Exception(errors::LogicError)
-      << "NoProcessProductResolver::branchDescription_() not implemented and should never be called.\n"
-      << "Contact a Framework developer\n";
+        << "NoProcessProductResolver::branchDescription_() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
 
   void NoProcessProductResolver::resetBranchDescription_(std::shared_ptr<BranchDescription const>) {
     throw Exception(errors::LogicError)
-      << "NoProcessProductResolver::resetBranchDescription_() not implemented and should never be called.\n"
-      << "Contact a Framework developer\n";
+        << "NoProcessProductResolver::resetBranchDescription_() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
 
   Provenance const* NoProcessProductResolver::provenance_() const {
     throw Exception(errors::LogicError)
-    << "NoProcessProductResolver::provenance_() not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+        << "NoProcessProductResolver::provenance_() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
 
   void NoProcessProductResolver::connectTo(ProductResolverBase const&, Principal const*) {
     throw Exception(errors::LogicError)
-    << "NoProcessProductResolver::connectTo() not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
-    
+        << "NoProcessProductResolver::connectTo() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
-  
+
   //---- SingleChoiceNoProcessProductResolver ----------------
   ProductResolverBase::Resolution SingleChoiceNoProcessProductResolver::resolveProduct_(
-                                             Principal const& principal,
-                                             bool skipCurrentProcess,
-                                             SharedResourcesAcquirer* sra,
-                                             ModuleCallingContext const* mcc) const
-  {
+      Principal const& principal,
+      bool skipCurrentProcess,
+      SharedResourcesAcquirer* sra,
+      ModuleCallingContext const* mcc) const {
     //NOTE: Have to lookup the other ProductResolver each time rather than cache
     // it's pointer since it appears the pointer can change at some later stage
     return principal.getProductResolverByIndex(realResolverIndex_)
-      ->resolveProduct(principal,
-                       skipCurrentProcess, sra, mcc);
+        ->resolveProduct(principal, skipCurrentProcess, sra, mcc);
   }
-  
+
   void SingleChoiceNoProcessProductResolver::prefetchAsync_(WaitingTask* waitTask,
                                                             Principal const& principal,
                                                             bool skipCurrentProcess,
@@ -1212,93 +1122,87 @@ namespace edm {
                                                             SharedResourcesAcquirer* sra,
                                                             ModuleCallingContext const* mcc) const {
     principal.getProductResolverByIndex(realResolverIndex_)
-    ->prefetchAsync(waitTask,principal,
-                    skipCurrentProcess, token, sra, mcc);
-  }
-  
-  void SingleChoiceNoProcessProductResolver::setProvenance_(ProductProvenanceRetriever const* , ProcessHistory const& , ProductID const& ) {
+        ->prefetchAsync(waitTask, principal, skipCurrentProcess, token, sra, mcc);
   }
-  
-  void SingleChoiceNoProcessProductResolver::setProcessHistory_(ProcessHistory const& ) {
-  }
-  
-  ProductProvenance const* SingleChoiceNoProcessProductResolver::productProvenancePtr_() const {
-    return nullptr;
-  }
-  
-  void SingleChoiceNoProcessProductResolver::resetProductData_(bool) {
-  }
-  
-  bool SingleChoiceNoProcessProductResolver::singleProduct_() const {
-    return false;
-  }
-  
+
+  void SingleChoiceNoProcessProductResolver::setProvenance_(ProductProvenanceRetriever const*,
+                                                            ProcessHistory const&,
+                                                            ProductID const&) {}
+
+  void SingleChoiceNoProcessProductResolver::setProcessHistory_(ProcessHistory const&) {}
+
+  ProductProvenance const* SingleChoiceNoProcessProductResolver::productProvenancePtr_() const { return nullptr; }
+
+  void SingleChoiceNoProcessProductResolver::resetProductData_(bool) {}
+
+  bool SingleChoiceNoProcessProductResolver::singleProduct_() const { return false; }
+
   bool SingleChoiceNoProcessProductResolver::unscheduledWasNotRun_() const {
     throw Exception(errors::LogicError)
-    << "SingleChoiceNoProcessProductResolver::unscheduledWasNotRun_() not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+        << "SingleChoiceNoProcessProductResolver::unscheduledWasNotRun_() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
-  
+
   bool SingleChoiceNoProcessProductResolver::productUnavailable_() const {
     throw Exception(errors::LogicError)
-    << "SingleChoiceNoProcessProductResolver::productUnavailable_() not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+        << "SingleChoiceNoProcessProductResolver::productUnavailable_() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
-  
+
   bool SingleChoiceNoProcessProductResolver::productResolved_() const {
     throw Exception(errors::LogicError)
-    << "SingleChoiceNoProcessProductResolver::productResolved_() not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+        << "SingleChoiceNoProcessProductResolver::productResolved_() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
-  
+
   bool SingleChoiceNoProcessProductResolver::productWasDeleted_() const {
     throw Exception(errors::LogicError)
-    << "SingleChoiceNoProcessProductResolver::productWasDeleted_() not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+        << "SingleChoiceNoProcessProductResolver::productWasDeleted_() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
-  
+
   bool SingleChoiceNoProcessProductResolver::productWasFetchedAndIsValid_(bool /*iSkipCurrentProcess*/) const {
-    throw Exception(errors::LogicError)
-    << "SingleChoiceNoProcessProductResolver::productWasFetchedAndIsValid_() not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+    throw Exception(errors::LogicError) << "SingleChoiceNoProcessProductResolver::productWasFetchedAndIsValid_() not "
+                                           "implemented and should never be called.\n"
+                                        << "Contact a Framework developer\n";
   }
 
-  
-  void SingleChoiceNoProcessProductResolver::putProduct_(std::unique_ptr<WrapperBase> ) const {
+  void SingleChoiceNoProcessProductResolver::putProduct_(std::unique_ptr<WrapperBase>) const {
     throw Exception(errors::LogicError)
-    << "SingleChoiceNoProcessProductResolver::putProduct_() not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+        << "SingleChoiceNoProcessProductResolver::putProduct_() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
-  
-  void SingleChoiceNoProcessProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp, MergeableRunProductMetadata const*) const {
+
+  void SingleChoiceNoProcessProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp,
+                                                                MergeableRunProductMetadata const*) const {
     throw Exception(errors::LogicError)
-    << "SingleChoiceNoProcessProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp, MergeableRunProductMetadata const*) not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+        << "SingleChoiceNoProcessProductResolver::putOrMergeProduct_(std::unique_ptr<WrapperBase> edp, "
+           "MergeableRunProductMetadata const*) not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
-  
+
   BranchDescription const& SingleChoiceNoProcessProductResolver::branchDescription_() const {
     throw Exception(errors::LogicError)
-    << "SingleChoiceNoProcessProductResolver::branchDescription_() not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+        << "SingleChoiceNoProcessProductResolver::branchDescription_() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
-  
+
   void SingleChoiceNoProcessProductResolver::resetBranchDescription_(std::shared_ptr<BranchDescription const>) {
-    throw Exception(errors::LogicError)
-    << "SingleChoiceNoProcessProductResolver::resetBranchDescription_() not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+    throw Exception(errors::LogicError) << "SingleChoiceNoProcessProductResolver::resetBranchDescription_() not "
+                                           "implemented and should never be called.\n"
+                                        << "Contact a Framework developer\n";
   }
-  
+
   Provenance const* SingleChoiceNoProcessProductResolver::provenance_() const {
     throw Exception(errors::LogicError)
-    << "SingleChoiceNoProcessProductResolver::provenance_() not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
+        << "SingleChoiceNoProcessProductResolver::provenance_() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
-  
+
   void SingleChoiceNoProcessProductResolver::connectTo(ProductResolverBase const&, Principal const*) {
     throw Exception(errors::LogicError)
-    << "SingleChoiceNoProcessProductResolver::connectTo() not implemented and should never be called.\n"
-    << "Contact a Framework developer\n";
-    
+        << "SingleChoiceNoProcessProductResolver::connectTo() not implemented and should never be called.\n"
+        << "Contact a Framework developer\n";
   }
 
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/ProductResolvers.h b/FWCore/Framework/src/ProductResolvers.h
index 9ed23f3e6cd3c..00b8f06c81295 100644
--- a/FWCore/Framework/src/ProductResolvers.h
+++ b/FWCore/Framework/src/ProductResolvers.h
@@ -33,9 +33,9 @@ namespace edm {
   class Worker;
   class ServiceToken;
 
-  class DataManagingOrAliasProductResolver: public ProductResolverBase {
+  class DataManagingOrAliasProductResolver : public ProductResolverBase {
   public:
-    DataManagingOrAliasProductResolver(): ProductResolverBase{} {}
+    DataManagingOrAliasProductResolver() : ProductResolverBase{} {}
 
     // Give AliasProductResolver and SwitchBaseProductResolver access by moving this method to public
     void resetProductData_(bool deleteEarly) override = 0;
@@ -43,56 +43,55 @@ namespace edm {
 
   class DataManagingProductResolver : public DataManagingOrAliasProductResolver {
   public:
-    enum class ProductStatus {
-      ProductSet,
-      NotPut,
-      ResolveFailed,
-      ResolveNotRun,
-      ProductDeleted
-    };
+    enum class ProductStatus { ProductSet, NotPut, ResolveFailed, ResolveNotRun, ProductDeleted };
 
-    DataManagingProductResolver(std::shared_ptr<BranchDescription const> bd,ProductStatus iDefaultStatus): DataManagingOrAliasProductResolver(),
-    productData_(bd),
-    theStatus_(iDefaultStatus),
-    defaultStatus_(iDefaultStatus){}
+    DataManagingProductResolver(std::shared_ptr<BranchDescription const> bd, ProductStatus iDefaultStatus)
+        : DataManagingOrAliasProductResolver(),
+          productData_(bd),
+          theStatus_(iDefaultStatus),
+          defaultStatus_(iDefaultStatus) {}
 
     void connectTo(ProductResolverBase const&, Principal const*) final;
 
-    void resetStatus() {theStatus_ = defaultStatus_;}
+    void resetStatus() { theStatus_ = defaultStatus_; }
 
     void resetProductData_(bool deleteEarly) override;
 
   protected:
     void setProduct(std::unique_ptr<WrapperBase> edp) const;
-    ProductStatus status() const { return theStatus_;}
+    ProductStatus status() const { return theStatus_; }
     ProductStatus defaultStatus() const { return defaultStatus_; }
     void setFailedStatus() const { theStatus_ = ProductStatus::ResolveFailed; }
     //Handle the boilerplate code needed for resolveProduct_
     template <bool callResolver, typename FUNC>
-    Resolution resolveProductImpl( FUNC resolver) const;
+    Resolution resolveProductImpl(FUNC resolver) const;
     void setMergeableRunProductMetadataInProductData(MergeableRunProductMetadata const*);
 
   private:
-
     void throwProductDeletedException() const;
     void checkType(WrapperBase const& prod) const;
-    ProductData const& getProductData() const {return productData_;}
+    ProductData const& getProductData() const { return productData_; }
     virtual bool isFromCurrentProcess() const = 0;
     // merges the product with the pre-existing product
     void mergeProduct(std::unique_ptr<WrapperBase> edp, MergeableRunProductMetadata const*) const;
 
-    void putOrMergeProduct_(std::unique_ptr<WrapperBase> prod, MergeableRunProductMetadata const* mergeableRunProductMetadata) const final;
+    void putOrMergeProduct_(std::unique_ptr<WrapperBase> prod,
+                            MergeableRunProductMetadata const* mergeableRunProductMetadata) const final;
     bool productUnavailable_() const final;
     bool productResolved_() const final;
     bool productWasDeleted_() const final;
-    bool productWasFetchedAndIsValid_( bool iSkipCurrentProcess) const final;
+    bool productWasFetchedAndIsValid_(bool iSkipCurrentProcess) const final;
 
-    BranchDescription const& branchDescription_() const final {return *getProductData().branchDescription();}
-    void resetBranchDescription_(std::shared_ptr<BranchDescription const> bd) final {productData_.resetBranchDescription(bd);}
-    Provenance const* provenance_() const final {return &productData_.provenance();}
+    BranchDescription const& branchDescription_() const final { return *getProductData().branchDescription(); }
+    void resetBranchDescription_(std::shared_ptr<BranchDescription const> bd) final {
+      productData_.resetBranchDescription(bd);
+    }
+    Provenance const* provenance_() const final { return &productData_.provenance(); }
 
-    std::string const& resolvedModuleLabel_() const final {return moduleLabel();}
-    void setProvenance_(ProductProvenanceRetriever const* provRetriever, ProcessHistory const& ph, ProductID const& pid) final;
+    std::string const& resolvedModuleLabel_() const final { return moduleLabel(); }
+    void setProvenance_(ProductProvenanceRetriever const* provRetriever,
+                        ProcessHistory const& ph,
+                        ProductID const& pid) final;
     void setProcessHistory_(ProcessHistory const& ph) final;
     ProductProvenance const* productProvenancePtr_() const final;
     bool singleProduct_() const final;
@@ -103,74 +102,74 @@ namespace edm {
   };
 
   class InputProductResolver : public DataManagingProductResolver {
-    public:
-    explicit InputProductResolver(std::shared_ptr<BranchDescription const> bd) :
-      DataManagingProductResolver(bd, ProductStatus::ResolveNotRun),
-      m_prefetchRequested{ false },
-      aux_{nullptr} {}
+  public:
+    explicit InputProductResolver(std::shared_ptr<BranchDescription const> bd)
+        : DataManagingProductResolver(bd, ProductStatus::ResolveNotRun), m_prefetchRequested{false}, aux_{nullptr} {}
 
     void setupUnscheduled(UnscheduledConfigurator const&) final;
 
-    private:
-      bool isFromCurrentProcess() const final;
-
-
-      Resolution resolveProduct_(Principal const& principal,
-                                 bool skipCurrentProcess,
-                                 SharedResourcesAcquirer* sra,
-                                 ModuleCallingContext const* mcc) const override;
-     void prefetchAsync_(WaitingTask* waitTask,
-                         Principal const& principal,
-                         bool skipCurrentProcess,
-                         ServiceToken const& token,
-                         SharedResourcesAcquirer* sra,
-                         ModuleCallingContext const* mcc) const override;
-      void putProduct_(std::unique_ptr<WrapperBase> edp) const override;
-
-      void retrieveAndMerge_(Principal const& principal, MergeableRunProductMetadata const* mergeableRunProductMetadata) const override;
+  private:
+    bool isFromCurrentProcess() const final;
 
-      void setMergeableRunProductMetadata_(MergeableRunProductMetadata const*) override;
+    Resolution resolveProduct_(Principal const& principal,
+                               bool skipCurrentProcess,
+                               SharedResourcesAcquirer* sra,
+                               ModuleCallingContext const* mcc) const override;
+    void prefetchAsync_(WaitingTask* waitTask,
+                        Principal const& principal,
+                        bool skipCurrentProcess,
+                        ServiceToken const& token,
+                        SharedResourcesAcquirer* sra,
+                        ModuleCallingContext const* mcc) const override;
+    void putProduct_(std::unique_ptr<WrapperBase> edp) const override;
 
-      bool unscheduledWasNotRun_() const final {return false;}
+    void retrieveAndMerge_(Principal const& principal,
+                           MergeableRunProductMetadata const* mergeableRunProductMetadata) const override;
 
-      void resetProductData_(bool deleteEarly) override;
+    void setMergeableRunProductMetadata_(MergeableRunProductMetadata const*) override;
 
-      mutable std::atomic<bool> m_prefetchRequested;
-      mutable WaitingTaskList m_waitingTasks;
-      UnscheduledAuxiliary const* aux_; //provides access to the delayedGet signals
+    bool unscheduledWasNotRun_() const final { return false; }
 
+    void resetProductData_(bool deleteEarly) override;
 
+    mutable std::atomic<bool> m_prefetchRequested;
+    mutable WaitingTaskList m_waitingTasks;
+    UnscheduledAuxiliary const* aux_;  //provides access to the delayedGet signals
   };
 
   class ProducedProductResolver : public DataManagingProductResolver {
-    public:
-      ProducedProductResolver(std::shared_ptr<BranchDescription const> bd, ProductStatus iDefaultStatus) : DataManagingProductResolver(bd, iDefaultStatus) {assert(bd->produced());}
+  public:
+    ProducedProductResolver(std::shared_ptr<BranchDescription const> bd, ProductStatus iDefaultStatus)
+        : DataManagingProductResolver(bd, iDefaultStatus) {
+      assert(bd->produced());
+    }
 
-    protected:
-      void putProduct_(std::unique_ptr<WrapperBase> edp) const override;
-    private:
-      bool isFromCurrentProcess() const final;
+  protected:
+    void putProduct_(std::unique_ptr<WrapperBase> edp) const override;
 
+  private:
+    bool isFromCurrentProcess() const final;
   };
 
   class PuttableProductResolver : public ProducedProductResolver {
   public:
-    explicit PuttableProductResolver(std::shared_ptr<BranchDescription const> bd) : ProducedProductResolver(bd, ProductStatus::NotPut), worker_(nullptr), prefetchRequested_(false) {}
+    explicit PuttableProductResolver(std::shared_ptr<BranchDescription const> bd)
+        : ProducedProductResolver(bd, ProductStatus::NotPut), worker_(nullptr), prefetchRequested_(false) {}
 
     void setupUnscheduled(UnscheduledConfigurator const&) final;
 
   private:
     Resolution resolveProduct_(Principal const& principal,
-                                       bool skipCurrentProcess,
-                                       SharedResourcesAcquirer* sra,
-                                       ModuleCallingContext const* mcc) const override;
-     void prefetchAsync_(WaitingTask* waitTask,
-                                 Principal const& principal,
-                                 bool skipCurrentProcess,
-                         ServiceToken const& token,
-                                 SharedResourcesAcquirer* sra,
-                                 ModuleCallingContext const* mcc) const override;
-    bool unscheduledWasNotRun_() const override {return false;}
+                               bool skipCurrentProcess,
+                               SharedResourcesAcquirer* sra,
+                               ModuleCallingContext const* mcc) const override;
+    void prefetchAsync_(WaitingTask* waitTask,
+                        Principal const& principal,
+                        bool skipCurrentProcess,
+                        ServiceToken const& token,
+                        SharedResourcesAcquirer* sra,
+                        ModuleCallingContext const* mcc) const override;
+    bool unscheduledWasNotRun_() const override { return false; }
 
     void putProduct_(std::unique_ptr<WrapperBase> edp) const override;
     void resetProductData_(bool deleteEarly) override;
@@ -178,120 +177,133 @@ namespace edm {
     mutable WaitingTaskList m_waitingTasks;
     Worker* worker_;
     mutable std::atomic<bool> prefetchRequested_;
-
   };
 
   class UnscheduledProductResolver : public ProducedProductResolver {
-    public:
-      explicit UnscheduledProductResolver(std::shared_ptr<BranchDescription const> bd) :
-       ProducedProductResolver(bd,ProductStatus::ResolveNotRun),
-       aux_(nullptr),
-       prefetchRequested_(false){}
-
-      void setupUnscheduled(UnscheduledConfigurator const&) final;
-
-    private:
-      Resolution resolveProduct_(Principal const& principal,
-                                         bool skipCurrentProcess,
-                                         SharedResourcesAcquirer* sra,
-                                         ModuleCallingContext const* mcc) const override;
-       void prefetchAsync_(WaitingTask* waitTask,
-                           Principal const& principal,
-                           bool skipCurrentProcess,
-                           ServiceToken const& token,
-                           SharedResourcesAcquirer* sra,
-                           ModuleCallingContext const* mcc) const override;
-      bool unscheduledWasNotRun_() const override {return status() == ProductStatus::ResolveNotRun;}
+  public:
+    explicit UnscheduledProductResolver(std::shared_ptr<BranchDescription const> bd)
+        : ProducedProductResolver(bd, ProductStatus::ResolveNotRun), aux_(nullptr), prefetchRequested_(false) {}
+
+    void setupUnscheduled(UnscheduledConfigurator const&) final;
+
+  private:
+    Resolution resolveProduct_(Principal const& principal,
+                               bool skipCurrentProcess,
+                               SharedResourcesAcquirer* sra,
+                               ModuleCallingContext const* mcc) const override;
+    void prefetchAsync_(WaitingTask* waitTask,
+                        Principal const& principal,
+                        bool skipCurrentProcess,
+                        ServiceToken const& token,
+                        SharedResourcesAcquirer* sra,
+                        ModuleCallingContext const* mcc) const override;
+    bool unscheduledWasNotRun_() const override { return status() == ProductStatus::ResolveNotRun; }
 
-      void resetProductData_(bool deleteEarly) override;
+    void resetProductData_(bool deleteEarly) override;
 
-      mutable WaitingTaskList waitingTasks_;
-      UnscheduledAuxiliary const* aux_;
-      Worker* worker_;
-      mutable std::atomic<bool> prefetchRequested_;
+    mutable WaitingTaskList waitingTasks_;
+    UnscheduledAuxiliary const* aux_;
+    Worker* worker_;
+    mutable std::atomic<bool> prefetchRequested_;
   };
 
   class AliasProductResolver : public DataManagingOrAliasProductResolver {
-    public:
-      typedef ProducedProductResolver::ProductStatus ProductStatus;
-      explicit AliasProductResolver(std::shared_ptr<BranchDescription const> bd, DataManagingOrAliasProductResolver& realProduct) : DataManagingOrAliasProductResolver(), realProduct_(realProduct), bd_(bd) {}
-
-      void connectTo(ProductResolverBase const& iOther, Principal const* iParentPrincipal) final {
-        realProduct_.connectTo(iOther, iParentPrincipal );
-      };
-
-    private:
-      Resolution resolveProduct_(Principal const& principal,
-                                 bool skipCurrentProcess,
-                                 SharedResourcesAcquirer* sra,
-                                 ModuleCallingContext const* mcc) const override {
-        return realProduct_.resolveProduct(principal, skipCurrentProcess, sra, mcc);}
-       void prefetchAsync_(WaitingTask* waitTask,
-                           Principal const& principal,
-                           bool skipCurrentProcess,
-                           ServiceToken const& token,
-                           SharedResourcesAcquirer* sra,
-                           ModuleCallingContext const* mcc) const override {
-        realProduct_.prefetchAsync(waitTask, principal, skipCurrentProcess, token, sra, mcc);
-      }
-      bool unscheduledWasNotRun_() const override {return realProduct_.unscheduledWasNotRun();}
-      bool productUnavailable_() const override {return realProduct_.productUnavailable();}
-      bool productResolved_() const final {
-          return realProduct_.productResolved(); }
-      bool productWasDeleted_() const override {return realProduct_.productWasDeleted();}
-      bool productWasFetchedAndIsValid_(bool iSkipCurrentProcess) const final {
-        return realProduct_.productWasFetchedAndIsValid(iSkipCurrentProcess);
-      }
-
-      void putProduct_(std::unique_ptr<WrapperBase> edp) const override;
-      void putOrMergeProduct_(std::unique_ptr<WrapperBase> prod, MergeableRunProductMetadata const* mergeableRunProductMetadata) const final;
-      BranchDescription const& branchDescription_() const override {return *bd_;}
-      void resetBranchDescription_(std::shared_ptr<BranchDescription const> bd) override {bd_ = bd;}
-      Provenance const* provenance_() const final { return realProduct_.provenance(); }
-
-      std::string const& resolvedModuleLabel_() const override {return realProduct_.moduleLabel();}
-      void setProvenance_(ProductProvenanceRetriever const* provRetriever, ProcessHistory const& ph, ProductID const& pid) override;
-      void setProcessHistory_(ProcessHistory const& ph) override;
-      ProductProvenance const* productProvenancePtr_() const override;
-      void resetProductData_(bool deleteEarly) override;
-      bool singleProduct_() const override;
-
-      DataManagingOrAliasProductResolver& realProduct_;
-      std::shared_ptr<BranchDescription const> bd_;
+  public:
+    typedef ProducedProductResolver::ProductStatus ProductStatus;
+    explicit AliasProductResolver(std::shared_ptr<BranchDescription const> bd,
+                                  DataManagingOrAliasProductResolver& realProduct)
+        : DataManagingOrAliasProductResolver(), realProduct_(realProduct), bd_(bd) {}
+
+    void connectTo(ProductResolverBase const& iOther, Principal const* iParentPrincipal) final {
+      realProduct_.connectTo(iOther, iParentPrincipal);
+    };
+
+  private:
+    Resolution resolveProduct_(Principal const& principal,
+                               bool skipCurrentProcess,
+                               SharedResourcesAcquirer* sra,
+                               ModuleCallingContext const* mcc) const override {
+      return realProduct_.resolveProduct(principal, skipCurrentProcess, sra, mcc);
+    }
+    void prefetchAsync_(WaitingTask* waitTask,
+                        Principal const& principal,
+                        bool skipCurrentProcess,
+                        ServiceToken const& token,
+                        SharedResourcesAcquirer* sra,
+                        ModuleCallingContext const* mcc) const override {
+      realProduct_.prefetchAsync(waitTask, principal, skipCurrentProcess, token, sra, mcc);
+    }
+    bool unscheduledWasNotRun_() const override { return realProduct_.unscheduledWasNotRun(); }
+    bool productUnavailable_() const override { return realProduct_.productUnavailable(); }
+    bool productResolved_() const final { return realProduct_.productResolved(); }
+    bool productWasDeleted_() const override { return realProduct_.productWasDeleted(); }
+    bool productWasFetchedAndIsValid_(bool iSkipCurrentProcess) const final {
+      return realProduct_.productWasFetchedAndIsValid(iSkipCurrentProcess);
+    }
+
+    void putProduct_(std::unique_ptr<WrapperBase> edp) const override;
+    void putOrMergeProduct_(std::unique_ptr<WrapperBase> prod,
+                            MergeableRunProductMetadata const* mergeableRunProductMetadata) const final;
+    BranchDescription const& branchDescription_() const override { return *bd_; }
+    void resetBranchDescription_(std::shared_ptr<BranchDescription const> bd) override { bd_ = bd; }
+    Provenance const* provenance_() const final { return realProduct_.provenance(); }
+
+    std::string const& resolvedModuleLabel_() const override { return realProduct_.moduleLabel(); }
+    void setProvenance_(ProductProvenanceRetriever const* provRetriever,
+                        ProcessHistory const& ph,
+                        ProductID const& pid) override;
+    void setProcessHistory_(ProcessHistory const& ph) override;
+    ProductProvenance const* productProvenancePtr_() const override;
+    void resetProductData_(bool deleteEarly) override;
+    bool singleProduct_() const override;
+
+    DataManagingOrAliasProductResolver& realProduct_;
+    std::shared_ptr<BranchDescription const> bd_;
   };
 
   // Switch is a mixture of DataManaging (for worker and provenance) and Alias (for product)
-  class SwitchBaseProductResolver: public DataManagingOrAliasProductResolver {
+  class SwitchBaseProductResolver : public DataManagingOrAliasProductResolver {
   public:
     using ProductStatus = DataManagingProductResolver::ProductStatus;
-    SwitchBaseProductResolver(std::shared_ptr<BranchDescription const> bd, DataManagingOrAliasProductResolver& realProduct);
+    SwitchBaseProductResolver(std::shared_ptr<BranchDescription const> bd,
+                              DataManagingOrAliasProductResolver& realProduct);
 
-    void connectTo(ProductResolverBase const& iOther, Principal const *iParentPrincipal) final;
+    void connectTo(ProductResolverBase const& iOther, Principal const* iParentPrincipal) final;
     void setupUnscheduled(UnscheduledConfigurator const& iConfigure) final;
 
   protected:
     Resolution resolveProductImpl(Resolution) const;
-    WaitingTaskList& waitingTasks() const {return waitingTasks_;}
-    Worker *worker() const {return worker_;}
-    ProductStatus status() const {return status_;}
-    DataManagingOrAliasProductResolver const& realProduct() const {return realProduct_;}
-    std::atomic<bool>& prefetchRequested() const {return prefetchRequested_;}
-    
+    WaitingTaskList& waitingTasks() const { return waitingTasks_; }
+    Worker* worker() const { return worker_; }
+    ProductStatus status() const { return status_; }
+    DataManagingOrAliasProductResolver const& realProduct() const { return realProduct_; }
+    std::atomic<bool>& prefetchRequested() const { return prefetchRequested_; }
+
   private:
     bool productResolved_() const final;
     bool productWasDeleted_() const final { return realProduct_.productWasDeleted(); }
-    bool productWasFetchedAndIsValid_(bool iSkipCurrentProcess) const final { return realProduct_.productWasFetchedAndIsValid(iSkipCurrentProcess); }
+    bool productWasFetchedAndIsValid_(bool iSkipCurrentProcess) const final {
+      return realProduct_.productWasFetchedAndIsValid(iSkipCurrentProcess);
+    }
     void putProduct_(std::unique_ptr<WrapperBase> edp) const final;
-    void putOrMergeProduct_(std::unique_ptr<WrapperBase> edp, MergeableRunProductMetadata const* mergeableRunProductMetadata) const final;
-    BranchDescription const& branchDescription_() const final {return *productData_.branchDescription();;}
-    void resetBranchDescription_(std::shared_ptr<BranchDescription const> bd) final {productData_.resetBranchDescription(bd);}
-    Provenance const* provenance_() const final {return &productData_.provenance();}
-    std::string const& resolvedModuleLabel_() const final {return moduleLabel();}
-    void setProvenance_(ProductProvenanceRetriever const* provRetriever, ProcessHistory const& ph, ProductID const& pid) final;
-    void setProcessHistory_(ProcessHistory const& ph) final {productData_.setProcessHistory(ph);}
-    ProductProvenance const* productProvenancePtr_() const final {return provenance()->productProvenance();}
+    void putOrMergeProduct_(std::unique_ptr<WrapperBase> edp,
+                            MergeableRunProductMetadata const* mergeableRunProductMetadata) const final;
+    BranchDescription const& branchDescription_() const final {
+      return *productData_.branchDescription();
+      ;
+    }
+    void resetBranchDescription_(std::shared_ptr<BranchDescription const> bd) final {
+      productData_.resetBranchDescription(bd);
+    }
+    Provenance const* provenance_() const final { return &productData_.provenance(); }
+    std::string const& resolvedModuleLabel_() const final { return moduleLabel(); }
+    void setProvenance_(ProductProvenanceRetriever const* provRetriever,
+                        ProcessHistory const& ph,
+                        ProductID const& pid) final;
+    void setProcessHistory_(ProcessHistory const& ph) final { productData_.setProcessHistory(ph); }
+    ProductProvenance const* productProvenancePtr_() const final { return provenance()->productProvenance(); }
     void resetProductData_(bool deleteEarly) final;
-    bool singleProduct_() const final {return true;}
+    bool singleProduct_() const final { return true; }
 
     constexpr static const ProductStatus defaultStatus_ = ProductStatus::NotPut;
 
@@ -299,7 +311,7 @@ namespace edm {
     DataManagingOrAliasProductResolver& realProduct_;
     // for "product" view
     ProductData productData_;
-    Worker *worker_ = nullptr;
+    Worker* worker_ = nullptr;
     mutable WaitingTaskList waitingTasks_;
     mutable std::atomic<bool> prefetchRequested_;
     // for provenance
@@ -309,10 +321,12 @@ namespace edm {
   };
 
   // For the case when SwitchProducer is on a Path
-  class SwitchProducerProductResolver: public SwitchBaseProductResolver {
+  class SwitchProducerProductResolver : public SwitchBaseProductResolver {
   public:
-    SwitchProducerProductResolver(std::shared_ptr<BranchDescription const> bd, DataManagingOrAliasProductResolver& realProduct):
-      SwitchBaseProductResolver(std::move(bd), realProduct) {}
+    SwitchProducerProductResolver(std::shared_ptr<BranchDescription const> bd,
+                                  DataManagingOrAliasProductResolver& realProduct)
+        : SwitchBaseProductResolver(std::move(bd), realProduct) {}
+
   private:
     Resolution resolveProduct_(Principal const& principal,
                                bool skipCurrentProcess,
@@ -329,10 +343,12 @@ namespace edm {
   };
 
   // For the case when SwitchProducer is not on any Path
-  class SwitchAliasProductResolver: public SwitchBaseProductResolver {
+  class SwitchAliasProductResolver : public SwitchBaseProductResolver {
   public:
-    SwitchAliasProductResolver(std::shared_ptr<BranchDescription const> bd, DataManagingOrAliasProductResolver& realProduct):
-      SwitchBaseProductResolver(std::move(bd), realProduct) {}
+    SwitchAliasProductResolver(std::shared_ptr<BranchDescription const> bd,
+                               DataManagingOrAliasProductResolver& realProduct)
+        : SwitchBaseProductResolver(std::move(bd), realProduct) {}
+
   private:
     Resolution resolveProduct_(Principal const& principal,
                                bool skipCurrentProcess,
@@ -344,14 +360,15 @@ namespace edm {
                         ServiceToken const& token,
                         SharedResourcesAcquirer* sra,
                         ModuleCallingContext const* mcc) const final;
-    bool unscheduledWasNotRun_() const final {return realProduct().unscheduledWasNotRun();}
-    bool productUnavailable_() const final {return realProduct().productUnavailable();}
+    bool unscheduledWasNotRun_() const final { return realProduct().unscheduledWasNotRun(); }
+    bool productUnavailable_() const final { return realProduct().productUnavailable(); }
   };
 
   class ParentProcessProductResolver : public ProductResolverBase {
   public:
     typedef ProducedProductResolver::ProductStatus ProductStatus;
-    explicit ParentProcessProductResolver(std::shared_ptr<BranchDescription const> bd) : ProductResolverBase(), realProduct_(nullptr), bd_(bd), provRetriever_(nullptr), parentPrincipal_(nullptr) {}
+    explicit ParentProcessProductResolver(std::shared_ptr<BranchDescription const> bd)
+        : ProductResolverBase(), realProduct_(nullptr), bd_(bd), provRetriever_(nullptr), parentPrincipal_(nullptr) {}
 
     void connectTo(ProductResolverBase const& iOther, Principal const* iParentPrincipal) final {
       realProduct_ = &iOther;
@@ -366,36 +383,39 @@ namespace edm {
       skipCurrentProcess = false;
       return realProduct_->resolveProduct(*parentPrincipal_, skipCurrentProcess, sra, mcc);
     }
-     void prefetchAsync_(WaitingTask* waitTask,
-                         Principal const& principal,
-                         bool skipCurrentProcess,
-                         ServiceToken const& token,
-                         SharedResourcesAcquirer* sra,
-                         ModuleCallingContext const* mcc) const override {
+    void prefetchAsync_(WaitingTask* waitTask,
+                        Principal const& principal,
+                        bool skipCurrentProcess,
+                        ServiceToken const& token,
+                        SharedResourcesAcquirer* sra,
+                        ModuleCallingContext const* mcc) const override {
       skipCurrentProcess = false;
-      realProduct_->prefetchAsync( waitTask, *parentPrincipal_, skipCurrentProcess, token, sra, mcc);
+      realProduct_->prefetchAsync(waitTask, *parentPrincipal_, skipCurrentProcess, token, sra, mcc);
     }
     bool unscheduledWasNotRun_() const override {
-      if (realProduct_) return realProduct_->unscheduledWasNotRun();
+      if (realProduct_)
+        return realProduct_->unscheduledWasNotRun();
       throwNullRealProduct();
       return false;
     }
-    bool productUnavailable_() const override {return realProduct_->productUnavailable();}
+    bool productUnavailable_() const override { return realProduct_->productUnavailable(); }
     bool productResolved_() const final { return realProduct_->productResolved(); }
-    bool productWasDeleted_() const override {return realProduct_->productWasDeleted();}
+    bool productWasDeleted_() const override { return realProduct_->productWasDeleted(); }
     bool productWasFetchedAndIsValid_(bool iSkipCurrentProcess) const override {
       iSkipCurrentProcess = false;
       return realProduct_->productWasFetchedAndIsValid(iSkipCurrentProcess);
     }
 
     void putProduct_(std::unique_ptr<WrapperBase> edp) const override;
-    void putOrMergeProduct_(std::unique_ptr<WrapperBase> prod, MergeableRunProductMetadata const* mergeableRunProductMetadata) const final;
-    BranchDescription const& branchDescription_() const override {return *bd_;}
-    void resetBranchDescription_(std::shared_ptr<BranchDescription const> bd) override {bd_ = bd;}
-    Provenance const* provenance_() const final {return realProduct_->provenance();
-    }
-    std::string const& resolvedModuleLabel_() const override {return realProduct_->moduleLabel();}
-    void setProvenance_(ProductProvenanceRetriever const* provRetriever, ProcessHistory const& ph, ProductID const& pid) override;
+    void putOrMergeProduct_(std::unique_ptr<WrapperBase> prod,
+                            MergeableRunProductMetadata const* mergeableRunProductMetadata) const final;
+    BranchDescription const& branchDescription_() const override { return *bd_; }
+    void resetBranchDescription_(std::shared_ptr<BranchDescription const> bd) override { bd_ = bd; }
+    Provenance const* provenance_() const final { return realProduct_->provenance(); }
+    std::string const& resolvedModuleLabel_() const override { return realProduct_->moduleLabel(); }
+    void setProvenance_(ProductProvenanceRetriever const* provRetriever,
+                        ProcessHistory const& ph,
+                        ProductID const& pid) override;
     void setProcessHistory_(ProcessHistory const& ph) override;
     ProductProvenance const* productProvenancePtr_() const override;
     void resetProductData_(bool deleteEarly) override;
@@ -409,12 +429,13 @@ namespace edm {
   };
 
   class NoProcessProductResolver : public ProductResolverBase {
-    public:
-      typedef ProducedProductResolver::ProductStatus ProductStatus;
-      NoProcessProductResolver(std::vector<ProductResolverIndex> const& matchingHolders,
-                             std::vector<bool> const& ambiguous, bool madeAtEnd);
+  public:
+    typedef ProducedProductResolver::ProductStatus ProductStatus;
+    NoProcessProductResolver(std::vector<ProductResolverIndex> const& matchingHolders,
+                             std::vector<bool> const& ambiguous,
+                             bool madeAtEnd);
 
-    void connectTo(ProductResolverBase const& iOther, Principal const*) final ;
+    void connectTo(ProductResolverBase const& iOther, Principal const*) final;
 
     void tryPrefetchResolverAsync(unsigned int iProcessingIndex,
                                   Principal const& principal,
@@ -431,75 +452,79 @@ namespace edm {
                         Principal const& principal,
                         bool iSkipCurrentProcess,
                         std::exception_ptr iExceptPtr) const;
-    private:
-      unsigned int unsetIndexValue() const;
-      Resolution resolveProduct_(Principal const& principal,
-                                 bool skipCurrentProcess,
-                                 SharedResourcesAcquirer* sra,
-                                 ModuleCallingContext const* mcc) const override;
-       void prefetchAsync_(WaitingTask* waitTask,
+
+  private:
+    unsigned int unsetIndexValue() const;
+    Resolution resolveProduct_(Principal const& principal,
+                               bool skipCurrentProcess,
+                               SharedResourcesAcquirer* sra,
+                               ModuleCallingContext const* mcc) const override;
+    void prefetchAsync_(WaitingTask* waitTask,
+                        Principal const& principal,
+                        bool skipCurrentProcess,
+                        ServiceToken const& token,
+                        SharedResourcesAcquirer* sra,
+                        ModuleCallingContext const* mcc) const override;
+    bool unscheduledWasNotRun_() const override;
+    bool productUnavailable_() const override;
+    bool productWasDeleted_() const override;
+    bool productResolved_() const final;
+    bool productWasFetchedAndIsValid_(bool iSkipCurrentProcess) const override;
+
+    void putProduct_(std::unique_ptr<WrapperBase> edp) const override;
+    void putOrMergeProduct_(std::unique_ptr<WrapperBase> prod,
+                            MergeableRunProductMetadata const* mergeableRunProductMetadata) const final;
+    BranchDescription const& branchDescription_() const override;
+    void resetBranchDescription_(std::shared_ptr<BranchDescription const> bd) override;
+    Provenance const* provenance_() const override;
+
+    std::string const& resolvedModuleLabel_() const override { return moduleLabel(); }
+    void setProvenance_(ProductProvenanceRetriever const* provRetriever,
+                        ProcessHistory const& ph,
+                        ProductID const& pid) override;
+    void setProcessHistory_(ProcessHistory const& ph) override;
+    ProductProvenance const* productProvenancePtr_() const override;
+    void resetProductData_(bool deleteEarly) override;
+    bool singleProduct_() const override;
+
+    Resolution tryResolver(unsigned int index,
                            Principal const& principal,
                            bool skipCurrentProcess,
-                           ServiceToken const& token,
                            SharedResourcesAcquirer* sra,
-                           ModuleCallingContext const* mcc) const override;
-      bool unscheduledWasNotRun_() const override;
-      bool productUnavailable_() const override;
-      bool productWasDeleted_() const override;
-      bool productResolved_() const final;
-      bool productWasFetchedAndIsValid_(bool iSkipCurrentProcess) const override;
-
-      void putProduct_(std::unique_ptr<WrapperBase> edp) const override;
-      void putOrMergeProduct_(std::unique_ptr<WrapperBase> prod, MergeableRunProductMetadata const* mergeableRunProductMetadata) const final;
-      BranchDescription const& branchDescription_() const override;
-      void resetBranchDescription_(std::shared_ptr<BranchDescription const> bd) override;
-      Provenance const* provenance_() const override;
-
-      std::string const& resolvedModuleLabel_() const override {return moduleLabel();}
-      void setProvenance_(ProductProvenanceRetriever const* provRetriever, ProcessHistory const& ph, ProductID const& pid) override;
-      void setProcessHistory_(ProcessHistory const& ph) override;
-      ProductProvenance const* productProvenancePtr_() const override;
-      void resetProductData_(bool deleteEarly) override;
-      bool singleProduct_() const override;
-
-      Resolution tryResolver(unsigned int index,
-                             Principal const& principal,
-                             bool skipCurrentProcess,
-                             SharedResourcesAcquirer* sra,
-                             ModuleCallingContext const* mcc) const;
-
-      void setCache(bool skipCurrentProcess, ProductResolverIndex index, std::exception_ptr exceptionPtr) const;
-
-      std::vector<ProductResolverIndex> matchingHolders_;
-      std::vector<bool> ambiguous_;
-      mutable WaitingTaskList waitingTasks_;
-      mutable WaitingTaskList skippingWaitingTasks_;
-      mutable std::atomic<unsigned int> lastCheckIndex_;
-      mutable std::atomic<unsigned int> lastSkipCurrentCheckIndex_;
-      mutable std::atomic<bool> prefetchRequested_;
-      mutable std::atomic<bool> skippingPrefetchRequested_;
-      const bool madeAtEnd_;
+                           ModuleCallingContext const* mcc) const;
+
+    void setCache(bool skipCurrentProcess, ProductResolverIndex index, std::exception_ptr exceptionPtr) const;
+
+    std::vector<ProductResolverIndex> matchingHolders_;
+    std::vector<bool> ambiguous_;
+    mutable WaitingTaskList waitingTasks_;
+    mutable WaitingTaskList skippingWaitingTasks_;
+    mutable std::atomic<unsigned int> lastCheckIndex_;
+    mutable std::atomic<unsigned int> lastSkipCurrentCheckIndex_;
+    mutable std::atomic<bool> prefetchRequested_;
+    mutable std::atomic<bool> skippingPrefetchRequested_;
+    const bool madeAtEnd_;
   };
 
   class SingleChoiceNoProcessProductResolver : public ProductResolverBase {
   public:
     typedef ProducedProductResolver::ProductStatus ProductStatus;
-    SingleChoiceNoProcessProductResolver(ProductResolverIndex iChoice):
-    ProductResolverBase(), realResolverIndex_(iChoice) {}
+    SingleChoiceNoProcessProductResolver(ProductResolverIndex iChoice)
+        : ProductResolverBase(), realResolverIndex_(iChoice) {}
 
-    void connectTo(ProductResolverBase const& iOther, Principal const*) final ;
+    void connectTo(ProductResolverBase const& iOther, Principal const*) final;
 
   private:
     Resolution resolveProduct_(Principal const& principal,
                                bool skipCurrentProcess,
                                SharedResourcesAcquirer* sra,
                                ModuleCallingContext const* mcc) const override;
-     void prefetchAsync_(WaitingTask* waitTask,
-                         Principal const& principal,
-                         bool skipCurrentProcess,
-                         ServiceToken const& token,
-                         SharedResourcesAcquirer* sra,
-                         ModuleCallingContext const* mcc) const override;
+    void prefetchAsync_(WaitingTask* waitTask,
+                        Principal const& principal,
+                        bool skipCurrentProcess,
+                        ServiceToken const& token,
+                        SharedResourcesAcquirer* sra,
+                        ModuleCallingContext const* mcc) const override;
     bool unscheduledWasNotRun_() const override;
     bool productUnavailable_() const override;
     bool productWasDeleted_() const override;
@@ -507,13 +532,16 @@ namespace edm {
     bool productWasFetchedAndIsValid_(bool iSkipCurrentProcess) const override;
 
     void putProduct_(std::unique_ptr<WrapperBase> edp) const override;
-    void putOrMergeProduct_(std::unique_ptr<WrapperBase> prod, MergeableRunProductMetadata const* mergeableRunProductMetadata) const final;
+    void putOrMergeProduct_(std::unique_ptr<WrapperBase> prod,
+                            MergeableRunProductMetadata const* mergeableRunProductMetadata) const final;
     BranchDescription const& branchDescription_() const override;
     void resetBranchDescription_(std::shared_ptr<BranchDescription const> bd) override;
     Provenance const* provenance_() const override;
 
-    std::string const& resolvedModuleLabel_() const override {return moduleLabel();}
-    void setProvenance_(ProductProvenanceRetriever const* provRetriever, ProcessHistory const& ph, ProductID const& pid) override;
+    std::string const& resolvedModuleLabel_() const override { return moduleLabel(); }
+    void setProvenance_(ProductProvenanceRetriever const* provRetriever,
+                        ProcessHistory const& ph,
+                        ProductID const& pid) override;
     void setProcessHistory_(ProcessHistory const& ph) override;
     ProductProvenance const* productProvenancePtr_() const override;
     void resetProductData_(bool deleteEarly) override;
@@ -522,6 +550,6 @@ namespace edm {
     ProductResolverIndex realResolverIndex_;
   };
 
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/ProductSelector.cc b/FWCore/Framework/src/ProductSelector.cc
index 4807efb2381d8..ccb622ca1573b 100644
--- a/FWCore/Framework/src/ProductSelector.cc
+++ b/FWCore/Framework/src/ProductSelector.cc
@@ -10,16 +10,14 @@
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/Utilities/interface/Algorithms.h"
 
-
 namespace edm {
-// The following typedef is used only in this implementation file, in
-// order to shorten several lines of code.
+  // The following typedef is used only in this implementation file, in
+  // order to shorten several lines of code.
   typedef std::vector<edm::BranchDescription const*> VCBDP;
 
   ProductSelector::ProductSelector() : productsToSelect_(), initialized_(false) {}
 
-  void
-  ProductSelector::initialize(ProductSelectorRules const& rules, VCBDP const& branchDescriptions) {
+  void ProductSelector::initialize(ProductSelectorRules const& rules, VCBDP const& branchDescriptions) {
     typedef ProductSelectorRules::BranchSelectState BranchSelectState;
 
     // Get a BranchSelectState for each branch, containing the branch
@@ -27,10 +25,11 @@ namespace edm {
     std::vector<BranchSelectState> branchstates;
     {
       branchstates.reserve(branchDescriptions.size());
-      
+
       VCBDP::const_iterator it = branchDescriptions.begin();
       VCBDP::const_iterator end = branchDescriptions.end();
-      for (; it != end; ++it) branchstates.emplace_back(*it);
+      for (; it != end; ++it)
+        branchstates.emplace_back(*it);
     }
 
     // Now  apply the rules to  the branchstates, in order.  Each rule
@@ -45,7 +44,8 @@ namespace edm {
       std::vector<BranchSelectState>::const_iterator it = branchstates.begin();
       std::vector<BranchSelectState>::const_iterator end = branchstates.end();
       for (; it != end; ++it) {
-	  if (it->selectMe) productsToSelect_.push_back(it->desc->branchName());
+        if (it->selectMe)
+          productsToSelect_.push_back(it->desc->branchName());
       }
       sort_all(productsToSelect_);
     }
@@ -54,46 +54,40 @@ namespace edm {
 
   bool ProductSelector::selected(BranchDescription const& desc) const {
     if (!initialized_) {
-      throw edm::Exception(edm::errors::LogicError)
-        << "ProductSelector::selected() called prematurely\n"
-        << "before the product registry has been frozen.\n";
+      throw edm::Exception(edm::errors::LogicError) << "ProductSelector::selected() called prematurely\n"
+                                                    << "before the product registry has been frozen.\n";
     }
     // We are to select this 'branch' if its name is one of the ones we
     // have been told to select.
     return binary_search_all(productsToSelect_, desc.branchName());
   }
 
-  void
-  ProductSelector::print(std::ostream& os) const {
-    os << "ProductSelector at: "
-       << static_cast<void const*>(this)
-       << " has "
-       << productsToSelect_.size()
-       << " products to select:\n";      
+  void ProductSelector::print(std::ostream& os) const {
+    os << "ProductSelector at: " << static_cast<void const*>(this) << " has " << productsToSelect_.size()
+       << " products to select:\n";
     copy_all(productsToSelect_, std::ostream_iterator<std::string>(os, "\n"));
   }
 
-  void
-  ProductSelector::checkForDuplicateKeptBranch(BranchDescription const& desc,
-                                               std::map<BranchID, BranchDescription const*>& trueBranchIDToKeptBranchDesc) {
+  void ProductSelector::checkForDuplicateKeptBranch(
+      BranchDescription const& desc, std::map<BranchID, BranchDescription const*>& trueBranchIDToKeptBranchDesc) {
     // Check if an equivalent branch has already been selected due to an EDAlias.
     // We only need the check for products produced in this process.
-    if(desc.produced()) {
+    if (desc.produced()) {
       auto check = [&](BranchID const& branchID) {
         auto iter = trueBranchIDToKeptBranchDesc.find(branchID);
-        if(iter != trueBranchIDToKeptBranchDesc.end()) {
+        if (iter != trueBranchIDToKeptBranchDesc.end()) {
           throw edm::Exception(errors::Configuration, "Duplicate Output Selection")
-            << "Two (or more) equivalent branches have been selected for output.\n"
-            << "#1: " << BranchKey(desc) << "\n"
-            << "#2: " << BranchKey(*iter->second) << "\n"
-            << "Please drop at least one of them.\n";
+              << "Two (or more) equivalent branches have been selected for output.\n"
+              << "#1: " << BranchKey(desc) << "\n"
+              << "#2: " << BranchKey(*iter->second) << "\n"
+              << "Please drop at least one of them.\n";
         }
       };
       BranchID const& trueBranchID = desc.originalBranchID();
       check(trueBranchID);
       // In case of SwitchProducer, we have to check also the
       // aliased-for BranchID for the case that the chosen case is an EDAlias
-      if(desc.isSwitchAlias()) {
+      if (desc.isSwitchAlias()) {
         check(desc.switchAliasForBranchID());
       }
 
@@ -102,19 +96,20 @@ namespace edm {
   }
 
   // Fills in a mapping needed in the case that a branch was dropped while its EDAlias was kept.
-  void
-  ProductSelector::fillDroppedToKept(ProductRegistry const& preg,
-                                     std::map<BranchID, BranchDescription const*> const& trueBranchIDToKeptBranchDesc,
-                                     std::map<BranchID::value_type, BranchID::value_type>& droppedBranchIDToKeptBranchID_) {
-    for(auto const& it : preg.productList()) {
+  void ProductSelector::fillDroppedToKept(
+      ProductRegistry const& preg,
+      std::map<BranchID, BranchDescription const*> const& trueBranchIDToKeptBranchDesc,
+      std::map<BranchID::value_type, BranchID::value_type>& droppedBranchIDToKeptBranchID_) {
+    for (auto const& it : preg.productList()) {
       BranchDescription const& desc = it.second;
-      if(!desc.produced() || desc.isAlias()) continue;
+      if (!desc.produced() || desc.isAlias())
+        continue;
       BranchID const& branchID = desc.branchID();
       std::map<BranchID, BranchDescription const*>::const_iterator iter = trueBranchIDToKeptBranchDesc.find(branchID);
-      if(iter != trueBranchIDToKeptBranchDesc.end()) {
+      if (iter != trueBranchIDToKeptBranchDesc.end()) {
         // This branch, produced in this process, or an alias of it, was persisted.
         BranchID const& keptBranchID = iter->second->branchID();
-        if(keptBranchID != branchID) {
+        if (keptBranchID != branchID) {
           // An EDAlias branch was persisted.
           droppedBranchIDToKeptBranchID_.insert(std::make_pair(branchID.id(), keptBranchID.id()));
         }
@@ -122,16 +117,13 @@ namespace edm {
     }
   }
 
-
   //--------------------------------------------------
   //
   // Associated free functions
   //
-  std::ostream&
-  operator<< (std::ostream& os, const ProductSelector& gs)
-  {
+  std::ostream& operator<<(std::ostream& os, const ProductSelector& gs) {
     gs.print(os);
     return os;
   }
-  
-}
+
+}  // namespace edm
diff --git a/FWCore/Framework/src/ProductSelectorRules.cc b/FWCore/Framework/src/ProductSelectorRules.cc
index 5feffbe6c7e69..651767e883b2c 100644
--- a/FWCore/Framework/src/ProductSelectorRules.cc
+++ b/FWCore/Framework/src/ProductSelectorRules.cc
@@ -12,26 +12,21 @@
 #include "FWCore/Utilities/interface/EDMException.h"
 
 namespace edm {
-// The following typedef is used only in this implementation file, in
-// order to shorten several lines of code.
-typedef std::vector<edm::BranchDescription const*> VCBDP;
+  // The following typedef is used only in this implementation file, in
+  // order to shorten several lines of code.
+  typedef std::vector<edm::BranchDescription const*> VCBDP;
+
+  namespace {
 
-  namespace 
-  {
-  
     //--------------------------------------------------
     // function partial_match is a helper for Rule. It encodes the
     // matching of std::strings, and knows about wildcarding rules.
-    inline
-    bool
-    partial_match(const std::regex& regularExpression,
-  		  const std::string& branchstring)
-    {
+    inline bool partial_match(const std::regex& regularExpression, const std::string& branchstring) {
       return std::regex_match(branchstring, regularExpression);
     }
-  }
+  }  // namespace
 
-  //--------------------------------------------------  
+  //--------------------------------------------------
   // Class Rule is used to determine whether or not a given branch
   // (really a ProductResolver, as described by the BranchDescription object
   // that specifies that ProductResolver) matches a 'rule' specified by the
@@ -59,67 +54,59 @@ typedef std::vector<edm::BranchDescription const*> VCBDP;
   // This class has much room for optimization. This should be
   // revisited as soon as profiling data are available.
 
-  ProductSelectorRules::Rule::Rule(std::string const& s, std::string const& parameterName, std::string const& owner) :
-    selectflag_(),
-    productType_(),
-    moduleLabel_(),
-    instanceName_(),
-    processName_()
-  {
+  ProductSelectorRules::Rule::Rule(std::string const& s, std::string const& parameterName, std::string const& owner)
+      : selectflag_(), productType_(), moduleLabel_(), instanceName_(), processName_() {
     if (s.size() < 6)
       throw edm::Exception(edm::errors::Configuration)
-        << "Invalid statement in configuration file\n"
-        << "In " << owner << " parameter named '" << parameterName << "'\n"
-        << "Rule must have at least 6 characters because it must\n"
-        << "specify 'keep ' or 'drop ' and also supply a pattern.\n"
-	<< "This is the invalid output configuration rule:\n" 
-	<< "    " << s << "\n"
-        << "Exception thrown from ProductSelectorRules::Rule\n";
-
-    if (s.substr(0,4) == "keep")
+          << "Invalid statement in configuration file\n"
+          << "In " << owner << " parameter named '" << parameterName << "'\n"
+          << "Rule must have at least 6 characters because it must\n"
+          << "specify 'keep ' or 'drop ' and also supply a pattern.\n"
+          << "This is the invalid output configuration rule:\n"
+          << "    " << s << "\n"
+          << "Exception thrown from ProductSelectorRules::Rule\n";
+
+    if (s.substr(0, 4) == "keep")
       selectflag_ = true;
-    else if (s.substr(0,4) == "drop")
+    else if (s.substr(0, 4) == "drop")
       selectflag_ = false;
     else
       throw edm::Exception(edm::errors::Configuration)
-        << "Invalid statement in configuration file\n"
-        << "In " << owner << " parameter named '" << parameterName << "'\n"
-        << "Rule must specify 'keep ' or 'drop ' and also supply a pattern.\n"
-	<< "This is the invalid output configuration rule:\n" 
-	<< "    " << s << "\n"
-        << "Exception thrown from ProductSelectorRules::Rule\n";
-
-    if ( !std::isspace(s[4]) ) {
-
+          << "Invalid statement in configuration file\n"
+          << "In " << owner << " parameter named '" << parameterName << "'\n"
+          << "Rule must specify 'keep ' or 'drop ' and also supply a pattern.\n"
+          << "This is the invalid output configuration rule:\n"
+          << "    " << s << "\n"
+          << "Exception thrown from ProductSelectorRules::Rule\n";
+
+    if (!std::isspace(s[4])) {
       throw edm::Exception(edm::errors::Configuration)
-        << "Invalid statement in configuration file\n"
-        << "In " << owner << " parameter named '" << parameterName << "'\n"
-        << "In each rule, 'keep' or 'drop' must be followed by a space\n"
-	<< "This is the invalid output configuration rule:\n" 
-	<< "    " << s << "\n"
-        << "Exception thrown from ProductSelectorRules::Rule\n";
+          << "Invalid statement in configuration file\n"
+          << "In " << owner << " parameter named '" << parameterName << "'\n"
+          << "In each rule, 'keep' or 'drop' must be followed by a space\n"
+          << "This is the invalid output configuration rule:\n"
+          << "    " << s << "\n"
+          << "Exception thrown from ProductSelectorRules::Rule\n";
     }
 
     // Now pull apart the std::string to get at the bits and pieces of the
     // specification...
-    
+
     // Grab from after 'keep/drop ' (note the space!) to the end of
     // the std::string...
-    std::string spec(s.begin()+5, s.end());
+    std::string spec(s.begin() + 5, s.end());
 
     // Trim any leading and trailing whitespace from spec
     boost::trim(spec);
 
-    if (spec == "*") // special case for wildcard
+    if (spec == "*")  // special case for wildcard
     {
-      productType_  = ".*";
-      moduleLabel_  = ".*";
+      productType_ = ".*";
+      moduleLabel_ = ".*";
       instanceName_ = ".*";
-      processName_  = ".*";
+      processName_ = ".*";
       return;
-    }
-    else
-    {
+    } else {
       std::vector<std::string> parts;
       boost::split(parts, spec, boost::is_any_of("_"));
 
@@ -129,13 +116,12 @@ typedef std::vector<edm::BranchDescription const*> VCBDP;
 
       // Require all the std::strings to contain only alphanumberic
       // characters or "*" or "?"
-      if (good) 
-      {
+      if (good) {
         for (int i = 0; i < 4; ++i) {
-	  std::string& field = parts[i];
+          std::string& field = parts[i];
           int size = field.size();
           for (int j = 0; j < size; ++j) {
-            if ( !(isalnum(field[j]) || field[j] == '*' || field[j] == '?') ) {
+            if (!(isalnum(field[j]) || field[j] == '*' || field[j] == '?')) {
               good = false;
             }
           }
@@ -149,109 +135,97 @@ typedef std::vector<edm::BranchDescription const*> VCBDP;
         }
       }
 
-      if (!good)
-      {
-      throw edm::Exception(edm::errors::Configuration)
-        << "Invalid statement in configuration file\n"
-        << "In " << owner << " parameter named '" << parameterName << "'\n"
-        << "In each rule, after 'keep ' or 'drop ' there must\n"
-        << "be a branch specification of the form 'type_label_instance_process'\n"
-        << "There must be 4 fields separated by underscores\n"
-        << "The fields can only contain alphanumeric characters and the wildcards * or ?\n"
-        << "Alternately, a single * is also allowed for the branch specification\n"
-	<< "This is the invalid output configuration rule:\n" 
-	<< "    " << s << "\n"
-        << "Exception thrown from ProductSelectorRules::Rule\n";
+      if (!good) {
+        throw edm::Exception(edm::errors::Configuration)
+            << "Invalid statement in configuration file\n"
+            << "In " << owner << " parameter named '" << parameterName << "'\n"
+            << "In each rule, after 'keep ' or 'drop ' there must\n"
+            << "be a branch specification of the form 'type_label_instance_process'\n"
+            << "There must be 4 fields separated by underscores\n"
+            << "The fields can only contain alphanumeric characters and the wildcards * or ?\n"
+            << "Alternately, a single * is also allowed for the branch specification\n"
+            << "This is the invalid output configuration rule:\n"
+            << "    " << s << "\n"
+            << "Exception thrown from ProductSelectorRules::Rule\n";
       }
 
-      productType_  = parts[0];
-      moduleLabel_  = parts[1];
+      productType_ = parts[0];
+      moduleLabel_ = parts[1];
       instanceName_ = parts[2];
-      processName_  = parts[3];
+      processName_ = parts[3];
     }
   }
 
-  void
-  ProductSelectorRules::Rule::applyToAll(std::vector<BranchSelectState>& branchstates) const {
+  void ProductSelectorRules::Rule::applyToAll(std::vector<BranchSelectState>& branchstates) const {
     std::vector<BranchSelectState>::iterator it = branchstates.begin();
     std::vector<BranchSelectState>::iterator end = branchstates.end();
-    for (; it != end; ++it) applyToOne(it->desc, it->selectMe);
+    for (; it != end; ++it)
+      applyToOne(it->desc, it->selectMe);
   }
 
-  void
-  ProductSelectorRules::applyToAll(std::vector<BranchSelectState>& branchstates) const {
+  void ProductSelectorRules::applyToAll(std::vector<BranchSelectState>& branchstates) const {
     std::vector<Rule>::const_iterator it = rules_.begin();
     std::vector<Rule>::const_iterator end = rules_.end();
-    for (; it != end; ++it) it->applyToAll(branchstates);
+    for (; it != end; ++it)
+      it->applyToAll(branchstates);
   }
 
-//   bool
-//   Rule::applyToOne(edm::BranchDescription const* branch) const
-//   {
-//     bool match = 
-//       partial_match(productType_, branch->friendlyClassName()) && 
-//       partial_match(moduleLabel_, branch->moduleLabel()) &&
-//       partial_match(instanceName_, branch->productInstanceName()) &&
-//       partial_match(processName_, branch->processName());
-
-//     return match ? selectflag_ : !selectflag_;      
-//   }
-
-  void
-  ProductSelectorRules::Rule::applyToOne(edm::BranchDescription const* branch,
-		   bool& result) const
-  {
-    if (this->appliesTo(branch)) result = selectflag_;    
+  //   bool
+  //   Rule::applyToOne(edm::BranchDescription const* branch) const
+  //   {
+  //     bool match =
+  //       partial_match(productType_, branch->friendlyClassName()) &&
+  //       partial_match(moduleLabel_, branch->moduleLabel()) &&
+  //       partial_match(instanceName_, branch->productInstanceName()) &&
+  //       partial_match(processName_, branch->processName());
+
+  //     return match ? selectflag_ : !selectflag_;
+  //   }
+
+  void ProductSelectorRules::Rule::applyToOne(edm::BranchDescription const* branch, bool& result) const {
+    if (this->appliesTo(branch))
+      result = selectflag_;
   }
 
-  bool
-  ProductSelectorRules::Rule::appliesTo(edm::BranchDescription const* branch) const
-  {
-    return
-      partial_match(productType_, branch->friendlyClassName()) && 
-      partial_match(moduleLabel_, branch->moduleLabel()) &&
-      partial_match(instanceName_, branch->productInstanceName()) &&
-      partial_match(processName_, branch->processName());
+  bool ProductSelectorRules::Rule::appliesTo(edm::BranchDescription const* branch) const {
+    return partial_match(productType_, branch->friendlyClassName()) &&
+           partial_match(moduleLabel_, branch->moduleLabel()) &&
+           partial_match(instanceName_, branch->productInstanceName()) &&
+           partial_match(processName_, branch->processName());
   }
 
-  const std::vector<std::string>&
-  ProductSelectorRules::defaultSelectionStrings() {
+  const std::vector<std::string>& ProductSelectorRules::defaultSelectionStrings() {
     static const std::vector<std::string> s_defaultStrings(1U, std::string("keep *"));
     return s_defaultStrings;
   }
 
-  void
-  ProductSelectorRules::fillDescription(ParameterSetDescription& desc, char const* parameterName, std::vector<std::string> const& defaultStrings) {
+  void ProductSelectorRules::fillDescription(ParameterSetDescription& desc,
+                                             char const* parameterName,
+                                             std::vector<std::string> const& defaultStrings) {
     ;
     desc.addUntracked<std::vector<std::string> >(parameterName, defaultStrings)
         ->setComment("Specifies which branches are kept or dropped.");
   }
 
   ProductSelectorRules::ProductSelectorRules(ParameterSet const& pset,
-			       std::string const& parameterName,
-			       std::string const& parameterOwnerName) :
-  rules_(),
-  parameterName_(parameterName),
-  parameterOwnerName_(parameterOwnerName)
-  {
+                                             std::string const& parameterName,
+                                             std::string const& parameterOwnerName)
+      : rules_(), parameterName_(parameterName), parameterOwnerName_(parameterOwnerName) {
     // Fill the rules.
     // If there is no parameter whose name is parameterName_ in the
     // ParameterSet we are given, we use the following default.
     std::vector<std::string> defaultCommands(1U, std::string("keep *"));
 
-    std::vector<std::string> commands = 
-      pset.getUntrackedParameter<std::vector<std::string> >(parameterName,
-						    defaultCommands);
+    std::vector<std::string> commands =
+        pset.getUntrackedParameter<std::vector<std::string> >(parameterName, defaultCommands);
     if (commands.empty()) {
       commands.push_back(defaultCommands[0]);
     }
     rules_.reserve(commands.size());
-    for(std::vector<std::string>::const_iterator it = commands.begin(), end = commands.end();
-        it != end; ++it) {
+    for (std::vector<std::string>::const_iterator it = commands.begin(), end = commands.end(); it != end; ++it) {
       rules_.push_back(Rule(*it, parameterName, parameterOwnerName));
     }
     keepAll_ = commands.size() == 1 && commands[0] == defaultCommands[0];
   }
 
-
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/RecordDependencyRegister.cc b/FWCore/Framework/src/RecordDependencyRegister.cc
index c1095f3f8139d..4cf57ce71cfb6 100644
--- a/FWCore/Framework/src/RecordDependencyRegister.cc
+++ b/FWCore/Framework/src/RecordDependencyRegister.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     RecordDependencyRegister
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -11,41 +11,34 @@
 //
 
 // system include files
- #include "tbb/concurrent_unordered_map.h"
+#include "tbb/concurrent_unordered_map.h"
 
 // user include files
 #include "FWCore/Framework/interface/RecordDependencyRegister.h"
 
 namespace edm {
   namespace eventsetup {
-namespace {
-  struct KeyHash {
-    std::size_t operator()(EventSetupRecordKey const& iKey) const {
-      return iKey.type().value().hash_code();
+    namespace {
+      struct KeyHash {
+        std::size_t operator()(EventSetupRecordKey const& iKey) const { return iKey.type().value().hash_code(); }
+      };
+
+      tbb::concurrent_unordered_map<EventSetupRecordKey, DepFunction, KeyHash>& getMap() {
+        static tbb::concurrent_unordered_map<EventSetupRecordKey, DepFunction, KeyHash> s_map;
+        return s_map;
+      }
+    }  // namespace
+
+    std::set<EventSetupRecordKey> dependencies(EventSetupRecordKey const& iKey) {
+      auto& map = getMap();
+      auto itFind = map.find(iKey);
+      if (itFind != map.end()) {
+        return itFind->second();
+      }
+      return std::set<EventSetupRecordKey>();
     }
-  };
-  
-  tbb::concurrent_unordered_map<EventSetupRecordKey, DepFunction, KeyHash>& getMap() {
-    static tbb::concurrent_unordered_map<EventSetupRecordKey, DepFunction, KeyHash> s_map;
-    return s_map;
-  }
-}
-
-
-std::set<EventSetupRecordKey> dependencies(EventSetupRecordKey const& iKey) {
-  auto& map = getMap();
-  auto itFind = map.find(iKey);
-  if(itFind != map.end()) {
-    return itFind->second();
-  }
-  return std::set<EventSetupRecordKey>();
-}
-
-void addDependencyFunction(EventSetupRecordKey iKey, DepFunction iFunction) {
-  getMap().emplace(iKey,iFunction);
-}
 
-    
-  }
-}
+    void addDependencyFunction(EventSetupRecordKey iKey, DepFunction iFunction) { getMap().emplace(iKey, iFunction); }
 
+  }  // namespace eventsetup
+}  // namespace edm
diff --git a/FWCore/Framework/src/Run.cc b/FWCore/Framework/src/Run.cc
index 5c4b0dcd41105..649e0f44f6b76 100644
--- a/FWCore/Framework/src/Run.cc
+++ b/FWCore/Framework/src/Run.cc
@@ -8,37 +8,29 @@ namespace edm {
 
   std::string const Run::emptyString_;
 
-  Run::Run(RunPrincipal const& rp, ModuleDescription const& md,
-           ModuleCallingContext const* moduleCallingContext, bool isAtEnd) :
-        provRecorder_(rp, md, isAtEnd),
-        aux_(rp.aux()),
-        moduleCallingContext_(moduleCallingContext)  {
-  }
+  Run::Run(RunPrincipal const& rp,
+           ModuleDescription const& md,
+           ModuleCallingContext const* moduleCallingContext,
+           bool isAtEnd)
+      : provRecorder_(rp, md, isAtEnd), aux_(rp.aux()), moduleCallingContext_(moduleCallingContext) {}
 
-  Run::~Run() {
-  }
+  Run::~Run() {}
 
-  Run::CacheIdentifier_t
-  Run::cacheIdentifier() const {return runPrincipal().cacheIdentifier();}
+  Run::CacheIdentifier_t Run::cacheIdentifier() const { return runPrincipal().cacheIdentifier(); }
 
-  RunIndex Run::index() const { return runPrincipal().index();}
-  
-  RunPrincipal const&
-  Run::runPrincipal() const {
-    return dynamic_cast<RunPrincipal const&>(provRecorder_.principal());
-  }
+  RunIndex Run::index() const { return runPrincipal().index(); }
+
+  RunPrincipal const& Run::runPrincipal() const { return dynamic_cast<RunPrincipal const&>(provRecorder_.principal()); }
 
-  Provenance
-  Run::getProvenance(BranchID const& bid) const {
+  Provenance Run::getProvenance(BranchID const& bid) const {
     return runPrincipal().getProvenance(bid, moduleCallingContext_);
   }
 
-  void
-  Run::getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const {
+  void Run::getAllStableProvenance(std::vector<StableProvenance const*>& provenances) const {
     runPrincipal().getAllStableProvenance(provenances);
   }
 
-/* Not yet fully implemented
+  /* Not yet fully implemented
   bool
   Run::getProcessParameterSet(std::string const& processName, std::vector<ParameterSet>& psets) const {
     // Get the relevant ProcessHistoryIDs
@@ -75,56 +67,48 @@ namespace edm {
   }
 */
 
-  void
-  Run::setProducer(ProducerBase const* iProducer) {
+  void Run::setProducer(ProducerBase const* iProducer) {
     provRecorder_.setProducer(iProducer);
     //set appropriate size
-    putProducts_.resize(
-                        provRecorder_.putTokenIndexToProductResolverIndex().size());
+    putProducts_.resize(provRecorder_.putTokenIndexToProductResolverIndex().size());
   }
 
-  void
-  Run::commit_(std::vector<edm::ProductResolverIndex> const& iShouldPut) {
+  void Run::commit_(std::vector<edm::ProductResolverIndex> const& iShouldPut) {
     RunPrincipal const& rp = runPrincipal();
     size_t nPut = 0;
-    for(size_t i = 0; i < putProducts().size();++i) {
+    for (size_t i = 0; i < putProducts().size(); ++i) {
       auto& p = get_underlying_safe(putProducts()[i]);
-      if(p) {
-        rp.put(provRecorder_.putTokenIndexToProductResolverIndex()[i],  std::move(p));
+      if (p) {
+        rp.put(provRecorder_.putTokenIndexToProductResolverIndex()[i], std::move(p));
         ++nPut;
       }
     }
-    
+
     auto sz = iShouldPut.size();
-    if(sz !=0 and sz != nPut) {
+    if (sz != 0 and sz != nPut) {
       //some were missed
       auto& p = provRecorder_.principal();
-      for(auto index: iShouldPut){
+      for (auto index : iShouldPut) {
         auto resolver = p.getProductResolverByIndex(index);
-        if(not resolver->productResolved() and
-           isEndTransition(provRecorder_.transition()) == resolver->branchDescription().availableOnlyAtEndTransition()) {
+        if (not resolver->productResolved() and isEndTransition(provRecorder_.transition()) ==
+                                                    resolver->branchDescription().availableOnlyAtEndTransition()) {
           resolver->putProduct(std::unique_ptr<WrapperBase>());
         }
       }
     }
-    
+
     // the cleanup is all or none
     putProducts().clear();
   }
 
-  ProcessHistoryID const&
-  Run::processHistoryID() const {
-    return runPrincipal().processHistoryID();
-  }
+  ProcessHistoryID const& Run::processHistoryID() const { return runPrincipal().processHistoryID(); }
 
-  ProcessHistory const&
-  Run::processHistory() const {
-    return provRecorder_.processHistory();
-  }
+  ProcessHistory const& Run::processHistory() const { return provRecorder_.processHistory(); }
 
-  BasicHandle
-  Run::getByLabelImpl(std::type_info const&, std::type_info const& iProductType, const InputTag& iTag) const {
+  BasicHandle Run::getByLabelImpl(std::type_info const&,
+                                  std::type_info const& iProductType,
+                                  const InputTag& iTag) const {
     BasicHandle h = provRecorder_.getByLabel_(TypeID(iProductType), iTag, moduleCallingContext_);
     return h;
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/RunForOutput.cc b/FWCore/Framework/src/RunForOutput.cc
index 587b8fad029c3..06b6eae55c368 100644
--- a/FWCore/Framework/src/RunForOutput.cc
+++ b/FWCore/Framework/src/RunForOutput.cc
@@ -6,19 +6,16 @@
 
 namespace edm {
 
-  RunForOutput::RunForOutput(RunPrincipal const& rp, ModuleDescription const& md,
-                             ModuleCallingContext const* moduleCallingContext, bool isAtEnd,
-                             MergeableRunProductMetadata const* mrpm) :
-        OccurrenceForOutput(rp, md, moduleCallingContext, isAtEnd), 
+  RunForOutput::RunForOutput(RunPrincipal const& rp,
+                             ModuleDescription const& md,
+                             ModuleCallingContext const* moduleCallingContext,
+                             bool isAtEnd,
+                             MergeableRunProductMetadata const* mrpm)
+      : OccurrenceForOutput(rp, md, moduleCallingContext, isAtEnd),
         aux_(rp.aux()),
-        mergeableRunProductMetadata_(mrpm) {
-  }
+        mergeableRunProductMetadata_(mrpm) {}
 
-  RunForOutput::~RunForOutput() {
-  }
+  RunForOutput::~RunForOutput() {}
 
-  RunPrincipal const&
-  RunForOutput::runPrincipal() const {
-    return dynamic_cast<RunPrincipal const&>(principal());
-  }
-}
+  RunPrincipal const& RunForOutput::runPrincipal() const { return dynamic_cast<RunPrincipal const&>(principal()); }
+}  // namespace edm
diff --git a/FWCore/Framework/src/RunPrincipal.cc b/FWCore/Framework/src/RunPrincipal.cc
index 2b3503237ee5e..397cea9a9037f 100644
--- a/FWCore/Framework/src/RunPrincipal.cc
+++ b/FWCore/Framework/src/RunPrincipal.cc
@@ -6,59 +6,48 @@
 #include "FWCore/Framework/interface/MergeableRunProductMetadata.h"
 
 namespace edm {
-  RunPrincipal::RunPrincipal(
-    std::shared_ptr<RunAuxiliary> aux,
-    std::shared_ptr<ProductRegistry const> reg,
-    ProcessConfiguration const& pc,
-    HistoryAppender* historyAppender,
-    unsigned int iRunIndex,
-    bool isForPrimaryProcess,
-    MergeableRunProductProcesses const* mergeableRunProductProcesses) :
-    Base(reg, reg->productLookup(InRun), pc, InRun, historyAppender, isForPrimaryProcess),
-    aux_(aux), index_(iRunIndex) {
-
-    if (mergeableRunProductProcesses) { // primary RunPrincipals of EventProcessor
+  RunPrincipal::RunPrincipal(std::shared_ptr<RunAuxiliary> aux,
+                             std::shared_ptr<ProductRegistry const> reg,
+                             ProcessConfiguration const& pc,
+                             HistoryAppender* historyAppender,
+                             unsigned int iRunIndex,
+                             bool isForPrimaryProcess,
+                             MergeableRunProductProcesses const* mergeableRunProductProcesses)
+      : Base(reg, reg->productLookup(InRun), pc, InRun, historyAppender, isForPrimaryProcess),
+        aux_(aux),
+        index_(iRunIndex) {
+    if (mergeableRunProductProcesses) {  // primary RunPrincipals of EventProcessor
       mergeableRunProductMetadataPtr_ = (std::make_unique<MergeableRunProductMetadata>(*mergeableRunProductProcesses));
     }
   }
 
   RunPrincipal::~RunPrincipal() {}
 
-  void
-  RunPrincipal::fillRunPrincipal(ProcessHistoryRegistry const& processHistoryRegistry, DelayedReader* reader) {
+  void RunPrincipal::fillRunPrincipal(ProcessHistoryRegistry const& processHistoryRegistry, DelayedReader* reader) {
     m_reducedHistoryID = processHistoryRegistry.reducedProcessHistoryID(aux_->processHistoryID());
     fillPrincipal(aux_->processHistoryID(), processHistoryRegistry, reader);
 
-    for(auto& prod : *this) {
+    for (auto& prod : *this) {
       prod->setProcessHistory(processHistory());
       prod->setMergeableRunProductMetadata(mergeableRunProductMetadataPtr_.get());
     }
   }
 
-  void
-  RunPrincipal::put(
-        BranchDescription const& bd,
-        std::unique_ptr<WrapperBase>  edp) const {
-    putOrMerge(bd,std::move(edp));
+  void RunPrincipal::put(BranchDescription const& bd, std::unique_ptr<WrapperBase> edp) const {
+    putOrMerge(bd, std::move(edp));
   }
 
-  void
-  RunPrincipal::put(ProductResolverIndex index,
-                    std::unique_ptr<WrapperBase> edp) const {
+  void RunPrincipal::put(ProductResolverIndex index, std::unique_ptr<WrapperBase> edp) const {
     auto phb = getProductResolverByIndex(index);
     phb->putOrMergeProduct(std::move(edp));
   }
-  
-  unsigned int
-  RunPrincipal::transitionIndex_() const {
-    return index().value();
-  }
 
-  void
-  RunPrincipal::preReadFile() {
+  unsigned int RunPrincipal::transitionIndex_() const { return index().value(); }
+
+  void RunPrincipal::preReadFile() {
     if (mergeableRunProductMetadataPtr_) {
       mergeableRunProductMetadataPtr_->preReadFile();
     }
   }
 
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/Schedule.cc b/FWCore/Framework/src/Schedule.cc
index 581e3a8d7c84a..cb42d1fad1b17 100644
--- a/FWCore/Framework/src/Schedule.cc
+++ b/FWCore/Framework/src/Schedule.cc
@@ -33,8 +33,6 @@
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 #include "FWCore/Utilities/interface/TypeID.h"
 
-
-
 #include <algorithm>
 #include <cassert>
 #include <cstdlib>
@@ -48,7 +46,6 @@
 
 #include "make_shared_noexcept_false.h"
 
-
 namespace edm {
 
   class Maker;
@@ -63,14 +60,12 @@ namespace edm {
     // Here we make the trigger results inserter directly.  This should
     // probably be a utility in the WorkerRegistry or elsewhere.
 
-    std::shared_ptr<TriggerResultInserter>
-    makeInserter(ParameterSet& proc_pset,
-                 PreallocationConfiguration const& iPrealloc,
-                 ProductRegistry& preg,
-                 ExceptionToActionTable const& actions,
-                 std::shared_ptr<ActivityRegistry> areg,
-                 std::shared_ptr<ProcessConfiguration> processConfiguration) {
-
+    std::shared_ptr<TriggerResultInserter> makeInserter(ParameterSet& proc_pset,
+                                                        PreallocationConfiguration const& iPrealloc,
+                                                        ProductRegistry& preg,
+                                                        ExceptionToActionTable const& actions,
+                                                        std::shared_ptr<ActivityRegistry> areg,
+                                                        std::shared_ptr<ProcessConfiguration> processConfiguration) {
       ParameterSet* trig_pset = proc_pset.getPSetForUpdate("@trigger_paths");
       trig_pset->registerIt();
 
@@ -85,20 +80,20 @@ namespace edm {
       bool postCalled = false;
       std::shared_ptr<TriggerResultInserter> returnValue;
       try {
-        maker::ModuleHolderT<TriggerResultInserter> holder(make_shared_noexcept_false<TriggerResultInserter>(*trig_pset, iPrealloc.numberOfStreams()),static_cast<Maker const*>(nullptr));
+        maker::ModuleHolderT<TriggerResultInserter> holder(
+            make_shared_noexcept_false<TriggerResultInserter>(*trig_pset, iPrealloc.numberOfStreams()),
+            static_cast<Maker const*>(nullptr));
         holder.setModuleDescription(md);
         holder.registerProductsAndCallbacks(&preg);
-        returnValue =holder.module();
+        returnValue = holder.module();
         postCalled = true;
         // if exception then post will be called in the catch block
         areg->postModuleConstructionSignal_(md);
-      }
-      catch (...) {
-        if(!postCalled) {
+      } catch (...) {
+        if (!postCalled) {
           try {
             areg->postModuleConstructionSignal_(md);
-          }
-          catch (...) {
+          } catch (...) {
             // If post throws an exception ignore it because we are already handling another exception
           }
         }
@@ -108,15 +103,13 @@ namespace edm {
     }
 
     template <typename T>
-    void
-    makePathStatusInserters(std::vector<edm::propagate_const<std::shared_ptr<T>>>& pathStatusInserters,
-                            std::vector<std::string> const& pathNames,
-                            PreallocationConfiguration const& iPrealloc,
-                            ProductRegistry& preg,
-                            std::shared_ptr<ActivityRegistry> areg,
-                            std::shared_ptr<ProcessConfiguration> processConfiguration,
-                            std::string const& moduleTypeName) {
-
+    void makePathStatusInserters(std::vector<edm::propagate_const<std::shared_ptr<T>>>& pathStatusInserters,
+                                 std::vector<std::string> const& pathNames,
+                                 PreallocationConfiguration const& iPrealloc,
+                                 ProductRegistry& preg,
+                                 std::shared_ptr<ActivityRegistry> areg,
+                                 std::shared_ptr<ProcessConfiguration> processConfiguration,
+                                 std::string const& moduleTypeName) {
       ParameterSet pset;
       pset.addParameter<std::string>("@module_type", moduleTypeName);
       pset.addParameter<std::string>("@module_edm_type", "EDProducer");
@@ -125,12 +118,8 @@ namespace edm {
       pathStatusInserters.reserve(pathNames.size());
 
       for (auto const& pathName : pathNames) {
-
-        ModuleDescription md(pset.id(),
-                             moduleTypeName,
-                             pathName,
-                             processConfiguration.get(),
-                             ModuleDescription::getUniqueID());
+        ModuleDescription md(
+            pset.id(), moduleTypeName, pathName, processConfiguration.get(), ModuleDescription::getUniqueID());
 
         areg->preModuleConstructionSignal_(md);
         bool postCalled = false;
@@ -144,13 +133,11 @@ namespace edm {
           postCalled = true;
           // if exception then post will be called in the catch block
           areg->postModuleConstructionSignal_(md);
-        }
-        catch (...) {
-          if(!postCalled) {
+        } catch (...) {
+          if (!postCalled) {
             try {
               areg->postModuleConstructionSignal_(md);
-            }
-            catch (...) {
+            } catch (...) {
               // If post throws an exception ignore it because we are already handling another exception
             }
           }
@@ -159,69 +146,71 @@ namespace edm {
       }
     }
 
-    void
-    checkAndInsertAlias(std::string const& friendlyClassName,
-                        std::string const& moduleLabel,
-                        std::string const& productInstanceName,
-                        std::string const& processName,
-                        std::string const& alias,
-                        std::string const& instanceAlias,
-                        ProductRegistry const& preg,
-                        std::multimap<BranchKey, BranchKey>& aliasMap,
-                        std::map<BranchKey, BranchKey>& aliasKeys) {
+    void checkAndInsertAlias(std::string const& friendlyClassName,
+                             std::string const& moduleLabel,
+                             std::string const& productInstanceName,
+                             std::string const& processName,
+                             std::string const& alias,
+                             std::string const& instanceAlias,
+                             ProductRegistry const& preg,
+                             std::multimap<BranchKey, BranchKey>& aliasMap,
+                             std::map<BranchKey, BranchKey>& aliasKeys) {
       std::string const star("*");
 
       BranchKey key(friendlyClassName, moduleLabel, productInstanceName, processName);
-      if(preg.productList().find(key) == preg.productList().end()) {
+      if (preg.productList().find(key) == preg.productList().end()) {
         // No product was found matching the alias.
         // We throw an exception only if a module with the specified module label was created in this process.
-        for(auto const& product : preg.productList()) {
-          if(moduleLabel == product.first.moduleLabel() && processName == product.first.processName()) {
+        for (auto const& product : preg.productList()) {
+          if (moduleLabel == product.first.moduleLabel() && processName == product.first.processName()) {
             throw Exception(errors::Configuration, "EDAlias does not match data\n")
-              << "There are no products of type '" << friendlyClassName << "'\n"
-              << "with module label '" << moduleLabel << "' and instance name '" << productInstanceName << "'.\n";
+                << "There are no products of type '" << friendlyClassName << "'\n"
+                << "with module label '" << moduleLabel << "' and instance name '" << productInstanceName << "'.\n";
           }
         }
       }
 
-      if(auto iter = aliasMap.find(key); iter != aliasMap.end()) {
+      if (auto iter = aliasMap.find(key); iter != aliasMap.end()) {
         // If the same EDAlias defines multiple products pointing to the same product, throw
-        if(iter->second.moduleLabel() == alias) {
+        if (iter->second.moduleLabel() == alias) {
           throw Exception(errors::Configuration, "EDAlias conflict\n")
-            << "The module label alias '" << alias << "' is used for multiple products of type '"
-            << friendlyClassName << "' with module label '" << moduleLabel << "' and instance name '"
-            << productInstanceName << "'. One alias has the instance name '" << iter->first.productInstanceName()
-            << "' and the other has the instance name '" << instanceAlias << "'.";
+              << "The module label alias '" << alias << "' is used for multiple products of type '" << friendlyClassName
+              << "' with module label '" << moduleLabel << "' and instance name '" << productInstanceName
+              << "'. One alias has the instance name '" << iter->first.productInstanceName()
+              << "' and the other has the instance name '" << instanceAlias << "'.";
         }
       }
 
       std::string const& theInstanceAlias(instanceAlias == star ? productInstanceName : instanceAlias);
       BranchKey aliasKey(friendlyClassName, alias, theInstanceAlias, processName);
-      if(preg.productList().find(aliasKey) != preg.productList().end()) {
+      if (preg.productList().find(aliasKey) != preg.productList().end()) {
         throw Exception(errors::Configuration, "EDAlias conflicts with data\n")
-          << "A product of type '" << friendlyClassName << "'\n"
-          << "with module label '" << alias << "' and instance name '" << theInstanceAlias << "'\n"
-          << "already exists.\n";
+            << "A product of type '" << friendlyClassName << "'\n"
+            << "with module label '" << alias << "' and instance name '" << theInstanceAlias << "'\n"
+            << "already exists.\n";
       }
       auto iter = aliasKeys.find(aliasKey);
-      if(iter != aliasKeys.end()) {
+      if (iter != aliasKeys.end()) {
         // The alias matches a previous one.  If the same alias is used for different product, throw.
-        if(iter->second != key) {
+        if (iter->second != key) {
           throw Exception(errors::Configuration, "EDAlias conflict\n")
-            << "The module label alias '" << alias << "' and product instance alias '" << theInstanceAlias << "'\n"
-            << "are used for multiple products of type '" << friendlyClassName << "'\n"
-            << "One has module label '" << moduleLabel << "' and product instance name '" << productInstanceName << "',\n"
-            << "the other has module label '" << iter->second.moduleLabel() << "' and product instance name '" << iter->second.productInstanceName() << "'.\n";
+              << "The module label alias '" << alias << "' and product instance alias '" << theInstanceAlias << "'\n"
+              << "are used for multiple products of type '" << friendlyClassName << "'\n"
+              << "One has module label '" << moduleLabel << "' and product instance name '" << productInstanceName
+              << "',\n"
+              << "the other has module label '" << iter->second.moduleLabel() << "' and product instance name '"
+              << iter->second.productInstanceName() << "'.\n";
         }
       } else {
         auto prodIter = preg.productList().find(key);
-        if(prodIter != preg.productList().end()) {
+        if (prodIter != preg.productList().end()) {
           if (!prodIter->second.produced()) {
             throw Exception(errors::Configuration, "EDAlias\n")
-              << "The module label alias '" << alias << "' and product instance alias '" << theInstanceAlias << "'\n"
-              << "are used for a product of type '" << friendlyClassName << "'\n"
-              << "with module label '" << moduleLabel << "' and product instance name '" << productInstanceName << "',\n"
-              << "An EDAlias can only be used for products produced in the current process. This one is not.\n";
+                << "The module label alias '" << alias << "' and product instance alias '" << theInstanceAlias << "'\n"
+                << "are used for a product of type '" << friendlyClassName << "'\n"
+                << "with module label '" << moduleLabel << "' and product instance name '" << productInstanceName
+                << "',\n"
+                << "An EDAlias can only be used for products produced in the current process. This one is not.\n";
           }
           aliasMap.insert(std::make_pair(key, aliasKey));
           aliasKeys.insert(std::make_pair(aliasKey, key));
@@ -229,10 +218,9 @@ namespace edm {
       }
     }
 
-    void
-    processEDAliases(ParameterSet const& proc_pset, std::string const& processName, ProductRegistry& preg) {
-      std::vector<std::string> aliases = proc_pset.getParameter<std::vector<std::string> >("@all_aliases");
-      if(aliases.empty()) {
+    void processEDAliases(ParameterSet const& proc_pset, std::string const& processName, ProductRegistry& preg) {
+      std::vector<std::string> aliases = proc_pset.getParameter<std::vector<std::string>>("@all_aliases");
+      if (aliases.empty()) {
         return;
       }
       std::string const star("*");
@@ -244,53 +232,69 @@ namespace edm {
 
       std::multimap<BranchKey, BranchKey> aliasMap;
 
-      std::map<BranchKey, BranchKey> aliasKeys; // Used to search for duplicates or clashes.
+      std::map<BranchKey, BranchKey> aliasKeys;  // Used to search for duplicates or clashes.
 
       // Now, loop over the alias information and store it in aliasMap.
-      for(std::string const& alias : aliases) {
+      for (std::string const& alias : aliases) {
         ParameterSet const& aliasPSet = proc_pset.getParameterSet(alias);
         std::vector<std::string> vPSetNames = aliasPSet.getParameterNamesForType<VParameterSet>();
-        for(std::string const& moduleLabel : vPSetNames) {
+        for (std::string const& moduleLabel : vPSetNames) {
           VParameterSet vPSet = aliasPSet.getParameter<VParameterSet>(moduleLabel);
-          for(ParameterSet& pset : vPSet) {
+          for (ParameterSet& pset : vPSet) {
             desc.validate(pset);
             std::string friendlyClassName = pset.getParameter<std::string>("type");
             std::string productInstanceName = pset.getParameter<std::string>("fromProductInstance");
             std::string instanceAlias = pset.getParameter<std::string>("toProductInstance");
-            if(productInstanceName == star) {
+            if (productInstanceName == star) {
               bool match = false;
               BranchKey lowerBound(friendlyClassName, moduleLabel, empty, empty);
-              for(ProductRegistry::ProductList::const_iterator it = preg.productList().lower_bound(lowerBound);
-                  it != preg.productList().end() && it->first.friendlyClassName() == friendlyClassName && it->first.moduleLabel() == moduleLabel;
-                  ++it) {
-                if(it->first.processName() != processName) {
+              for (ProductRegistry::ProductList::const_iterator it = preg.productList().lower_bound(lowerBound);
+                   it != preg.productList().end() && it->first.friendlyClassName() == friendlyClassName &&
+                   it->first.moduleLabel() == moduleLabel;
+                   ++it) {
+                if (it->first.processName() != processName) {
                   continue;
                 }
                 match = true;
 
-                checkAndInsertAlias(friendlyClassName, moduleLabel, it->first.productInstanceName(), processName, alias, instanceAlias, preg, aliasMap, aliasKeys);
+                checkAndInsertAlias(friendlyClassName,
+                                    moduleLabel,
+                                    it->first.productInstanceName(),
+                                    processName,
+                                    alias,
+                                    instanceAlias,
+                                    preg,
+                                    aliasMap,
+                                    aliasKeys);
               }
-              if(!match) {
+              if (!match) {
                 // No product was found matching the alias.
                 // We throw an exception only if a module with the specified module label was created in this process.
-                for(auto const& product : preg.productList()) {
-                  if(moduleLabel == product.first.moduleLabel() && processName == product.first.processName()) {
+                for (auto const& product : preg.productList()) {
+                  if (moduleLabel == product.first.moduleLabel() && processName == product.first.processName()) {
                     throw Exception(errors::Configuration, "EDAlias parameter set mismatch\n")
-                       << "There are no products of type '" << friendlyClassName << "'\n"
-                       << "with module label '" << moduleLabel << "'.\n";
+                        << "There are no products of type '" << friendlyClassName << "'\n"
+                        << "with module label '" << moduleLabel << "'.\n";
                   }
                 }
               }
             } else {
-              checkAndInsertAlias(friendlyClassName, moduleLabel, productInstanceName, processName, alias, instanceAlias, preg, aliasMap, aliasKeys);
+              checkAndInsertAlias(friendlyClassName,
+                                  moduleLabel,
+                                  productInstanceName,
+                                  processName,
+                                  alias,
+                                  instanceAlias,
+                                  preg,
+                                  aliasMap,
+                                  aliasKeys);
             }
           }
         }
       }
 
-
       // Now add the new alias entries to the product registry.
-      for(auto const& aliasEntry : aliasMap) {
+      for (auto const& aliasEntry : aliasMap) {
         ProductRegistry::ProductList::const_iterator it = preg.productList().find(aliasEntry.first);
         assert(it != preg.productList().end());
         preg.addLabelAlias(it->second, aliasEntry.second.moduleLabel(), aliasEntry.second.productInstanceName());
@@ -302,58 +306,59 @@ namespace edm {
     void processSwitchProducers(ParameterSet const& proc_pset, std::string const& processName, ProductRegistry& preg) {
       // Update Switch BranchDescriptions for the chosen case
       struct BranchesCases {
-        BranchesCases(std::vector<std::string> cases): caseLabels{std::move(cases)} {}
+        BranchesCases(std::vector<std::string> cases) : caseLabels{std::move(cases)} {}
         std::vector<BranchKey> chosenBranches;
         std::vector<std::string> caseLabels;
       };
       std::map<std::string, BranchesCases> switchMap;
-      for(auto& prod: preg.productListUpdator()) {
-        if(prod.second.isSwitchAlias()) {
+      for (auto& prod : preg.productListUpdator()) {
+        if (prod.second.isSwitchAlias()) {
           auto it = switchMap.find(prod.second.moduleLabel());
-          if(it == switchMap.end())  {
+          if (it == switchMap.end()) {
             auto const& switchPSet = proc_pset.getParameter<edm::ParameterSet>(prod.second.moduleLabel());
-            auto inserted = switchMap.emplace(prod.second.moduleLabel(), switchPSet.getParameter<std::vector<std::string>>("@all_cases"));
+            auto inserted = switchMap.emplace(prod.second.moduleLabel(),
+                                              switchPSet.getParameter<std::vector<std::string>>("@all_cases"));
             assert(inserted.second);
             it = inserted.first;
           }
 
-          for(auto const& item: preg.productList()) {
-            if(item.second.branchType() == prod.second.branchType() and
-               item.second.unwrappedTypeID().typeInfo() == prod.second.unwrappedTypeID().typeInfo() and
-               item.first.moduleLabel() == prod.second.switchAliasModuleLabel() and
-               item.first.productInstanceName() == prod.second.productInstanceName()
-               ) {
-              if(item.first.processName() != processName) {
+          for (auto const& item : preg.productList()) {
+            if (item.second.branchType() == prod.second.branchType() and
+                item.second.unwrappedTypeID().typeInfo() == prod.second.unwrappedTypeID().typeInfo() and
+                item.first.moduleLabel() == prod.second.switchAliasModuleLabel() and
+                item.first.productInstanceName() == prod.second.productInstanceName()) {
+              if (item.first.processName() != processName) {
                 throw Exception(errors::LogicError)
-                  << "Encountered a BranchDescription that is aliased-for by SwitchProducer, and whose processName " << item.first.processName() << " differs from current process " << processName
-                  << ". Module label is " << item.first.moduleLabel() << ".\nPlease contact a framework developer.";
+                    << "Encountered a BranchDescription that is aliased-for by SwitchProducer, and whose processName "
+                    << item.first.processName() << " differs from current process " << processName
+                    << ". Module label is " << item.first.moduleLabel() << ".\nPlease contact a framework developer.";
               }
               prod.second.setSwitchAliasForBranch(item.second);
-              it->second.chosenBranches.push_back(prod.first); // with moduleLabel of the Switch
+              it->second.chosenBranches.push_back(prod.first);  // with moduleLabel of the Switch
             }
           }
         }
       }
-      if(switchMap.empty())
+      if (switchMap.empty())
         return;
 
-      for(auto& elem: switchMap) {
+      for (auto& elem : switchMap) {
         std::sort(elem.second.chosenBranches.begin(), elem.second.chosenBranches.end());
       }
 
       // Check that non-chosen cases declare exactly the same branches
       // Also set the alias-for branches to transient
       std::vector<bool> foundBranches;
-      for(auto const& switchItem: switchMap) {
+      for (auto const& switchItem : switchMap) {
         auto const& switchLabel = switchItem.first;
         auto const& chosenBranches = switchItem.second.chosenBranches;
         auto const& caseLabels = switchItem.second.caseLabels;
         foundBranches.resize(chosenBranches.size());
-        for(auto const& caseLabel: caseLabels) {
+        for (auto const& caseLabel : caseLabels) {
           std::fill(foundBranches.begin(), foundBranches.end(), false);
-          for(auto& nonConstItem: preg.productListUpdator()) {
+          for (auto& nonConstItem : preg.productListUpdator()) {
             auto const& item = nonConstItem;
-            if(item.first.moduleLabel() == caseLabel) {
+            if (item.first.moduleLabel() == caseLabel) {
               // Set the alias-for branch as transient so it gets fully ignored in output.
               // I tried first to implicitly drop all branches with
               // '@' in ProductSelector, but that gave problems on
@@ -364,22 +369,30 @@ namespace edm {
               // SwitchProducer branches are not alias branches)
               nonConstItem.second.setTransient(true);
 
-              auto range = std::equal_range(chosenBranches.begin(), chosenBranches.end(), BranchKey(item.first.friendlyClassName(),
-                                                                                                    switchLabel,
-                                                                                                    item.first.productInstanceName(),
-                                                                                                    item.first.processName()));
-              if(range.first == range.second) {
+              auto range = std::equal_range(chosenBranches.begin(),
+                                            chosenBranches.end(),
+                                            BranchKey(item.first.friendlyClassName(),
+                                                      switchLabel,
+                                                      item.first.productInstanceName(),
+                                                      item.first.processName()));
+              if (range.first == range.second) {
                 throw Exception(errors::Configuration)
-                  << "SwitchProducer " << switchLabel << " has a case " << caseLabel << " with a product " << item.first << " that is not produced by the chosen case " << proc_pset.getParameter<edm::ParameterSet>(switchLabel).getUntrackedParameter<std::string>("@chosen_case");
+                    << "SwitchProducer " << switchLabel << " has a case " << caseLabel << " with a product "
+                    << item.first << " that is not produced by the chosen case "
+                    << proc_pset.getParameter<edm::ParameterSet>(switchLabel)
+                           .getUntrackedParameter<std::string>("@chosen_case");
               }
               assert(std::distance(range.first, range.second) == 1);
               foundBranches[std::distance(chosenBranches.begin(), range.first)] = true;
 
               // Check that there are no BranchAliases for any of the cases
               auto const& bd = item.second;
-              if(not bd.branchAliases().empty()) {
-                auto ex = Exception(errors::UnimplementedFeature) << "SwitchProducer does not support ROOT branch aliases. Got the following ROOT branch aliases for SwitchProducer with label " << switchLabel << " for case " << caseLabel << ":";
-                for(auto const& item: bd.branchAliases()) {
+              if (not bd.branchAliases().empty()) {
+                auto ex = Exception(errors::UnimplementedFeature)
+                          << "SwitchProducer does not support ROOT branch aliases. Got the following ROOT branch "
+                             "aliases for SwitchProducer with label "
+                          << switchLabel << " for case " << caseLabel << ":";
+                for (auto const& item : bd.branchAliases()) {
                   ex << " " << item;
                 }
                 throw ex;
@@ -387,10 +400,13 @@ namespace edm {
             }
           }
 
-          for(size_t i=0; i<chosenBranches.size(); i++) {
-            if(not foundBranches[i]) {
+          for (size_t i = 0; i < chosenBranches.size(); i++) {
+            if (not foundBranches[i]) {
               throw Exception(errors::Configuration)
-                << "SwitchProducer " << switchLabel << " has a case " << caseLabel << " that does not produce a product " << chosenBranches[i] << " that is produced by the chosen case " << proc_pset.getParameter<edm::ParameterSet>(switchLabel).getUntrackedParameter<std::string>("@chosen_case");
+                  << "SwitchProducer " << switchLabel << " has a case " << caseLabel
+                  << " that does not produce a product " << chosenBranches[i] << " that is produced by the chosen case "
+                  << proc_pset.getParameter<edm::ParameterSet>(switchLabel)
+                         .getUntrackedParameter<std::string>("@chosen_case");
             }
           }
         }
@@ -401,7 +417,7 @@ namespace edm {
                             vstring const& end_path_name_list,
                             vstring& modulesInConfig,
                             std::set<std::string> const& usedModuleLabels,
-                            std::map<std::string, std::vector<std::pair<std::string, int> > >& outputModulePathPositions) {
+                            std::map<std::string, std::vector<std::pair<std::string, int>>>& outputModulePathPositions) {
       // Before calculating the ParameterSetID of the top level ParameterSet or
       // saving it in the registry drop from the top level ParameterSet all
       // OutputModules and EDAnalyzers not on trigger paths. If unscheduled
@@ -428,15 +444,15 @@ namespace edm {
       vstring scheduledPaths = proc_pset.getParameter<vstring>("@paths");
       std::set<std::string> modulesOnPaths;
       {
-        std::set<std::string> noEndPaths(scheduledPaths.begin(),scheduledPaths.end());
-        for(auto const& endPath: end_path_name_list) {
+        std::set<std::string> noEndPaths(scheduledPaths.begin(), scheduledPaths.end());
+        for (auto const& endPath : end_path_name_list) {
           noEndPaths.erase(endPath);
         }
         {
           vstring labels;
-          for(auto const& path: noEndPaths) {
+          for (auto const& path : noEndPaths) {
             labels = proc_pset.getParameter<vstring>(path);
-            modulesOnPaths.insert(labels.begin(),labels.end());
+            modulesOnPaths.insert(labels.begin(), labels.end());
           }
         }
       }
@@ -444,12 +460,14 @@ namespace edm {
       // the configuration but which are not being used by the system
       std::vector<std::string> labelsToBeDropped;
       labelsToBeDropped.reserve(modulesInConfigSet.size());
-      std::set_difference(modulesInConfigSet.begin(),modulesInConfigSet.end(),
-                          usedModuleLabels.begin(),usedModuleLabels.end(),
+      std::set_difference(modulesInConfigSet.begin(),
+                          modulesInConfigSet.end(),
+                          usedModuleLabels.begin(),
+                          usedModuleLabels.end(),
                           std::back_inserter(labelsToBeDropped));
 
       const unsigned int sizeBeforeOutputModules = labelsToBeDropped.size();
-      for (auto const& modLabel: usedModuleLabels) {
+      for (auto const& modLabel : usedModuleLabels) {
         // Do nothing for modules that do not have a ParameterSet. Modules of type
         // PathStatusInserter and EndPathStatusInserter will not have a ParameterSet.
         if (proc_pset.existsAs<ParameterSet>(modLabel)) {
@@ -458,23 +476,25 @@ namespace edm {
             outputModuleLabels.push_back(modLabel);
             labelsToBeDropped.push_back(modLabel);
           }
-          if(edmType == edAnalyzer) {
-            if(modulesOnPaths.end()==modulesOnPaths.find(modLabel)) {
+          if (edmType == edAnalyzer) {
+            if (modulesOnPaths.end() == modulesOnPaths.find(modLabel)) {
               labelsToBeDropped.push_back(modLabel);
             }
           }
         }
       }
       //labelsToBeDropped must be sorted
-      std::inplace_merge(labelsToBeDropped.begin(),
-                         labelsToBeDropped.begin()+sizeBeforeOutputModules,
-                         labelsToBeDropped.end());
+      std::inplace_merge(
+          labelsToBeDropped.begin(), labelsToBeDropped.begin() + sizeBeforeOutputModules, labelsToBeDropped.end());
 
       // drop the parameter sets used to configure the modules
       for_all(labelsToBeDropped, std::bind(&ParameterSet::eraseOrSetUntrackedParameterSet, std::ref(proc_pset), _1));
 
       // drop the labels from @all_modules
-      vstring::iterator endAfterRemove = std::remove_if(modulesInConfig.begin(), modulesInConfig.end(), std::bind(binary_search_string, std::ref(labelsToBeDropped), _1));
+      vstring::iterator endAfterRemove =
+          std::remove_if(modulesInConfig.begin(),
+                         modulesInConfig.end(),
+                         std::bind(binary_search_string, std::ref(labelsToBeDropped), _1));
       modulesInConfig.erase(endAfterRemove, modulesInConfig.end());
       proc_pset.addParameter<vstring>(std::string("@all_modules"), modulesInConfig);
 
@@ -488,8 +508,7 @@ namespace edm {
         vstring::iterator iSave = labels.begin();
         vstring::iterator iBegin = labels.begin();
 
-        for (vstring::iterator iLabel = labels.begin(), iEnd = labels.end();
-             iLabel != iEnd; ++iLabel) {
+        for (vstring::iterator iLabel = labels.begin(), iEnd = labels.end(); iLabel != iEnd; ++iLabel) {
           if (binary_search_string(labelsToBeDropped, *iLabel)) {
             if (binary_search_string(outputModuleLabels, *iLabel)) {
               outputModulePathPositions[*iLabel].emplace_back(*iEndPath, iSave - iBegin);
@@ -513,23 +532,26 @@ namespace edm {
       sort_all(endPathsToBeDropped);
 
       // remove empty end paths from @paths
-      endAfterRemove = std::remove_if(scheduledPaths.begin(), scheduledPaths.end(), std::bind(binary_search_string, std::ref(endPathsToBeDropped), _1));
+      endAfterRemove = std::remove_if(scheduledPaths.begin(),
+                                      scheduledPaths.end(),
+                                      std::bind(binary_search_string, std::ref(endPathsToBeDropped), _1));
       scheduledPaths.erase(endAfterRemove, scheduledPaths.end());
       proc_pset.addParameter<vstring>(std::string("@paths"), scheduledPaths);
 
       // remove empty end paths from @end_paths
       vstring scheduledEndPaths = proc_pset.getParameter<vstring>("@end_paths");
-      endAfterRemove = std::remove_if(scheduledEndPaths.begin(), scheduledEndPaths.end(), std::bind(binary_search_string, std::ref(endPathsToBeDropped), _1));
+      endAfterRemove = std::remove_if(scheduledEndPaths.begin(),
+                                      scheduledEndPaths.end(),
+                                      std::bind(binary_search_string, std::ref(endPathsToBeDropped), _1));
       scheduledEndPaths.erase(endAfterRemove, scheduledEndPaths.end());
       proc_pset.addParameter<vstring>(std::string("@end_paths"), scheduledEndPaths);
-
     }
 
     class RngEDConsumer : public EDConsumerBase {
     public:
       explicit RngEDConsumer(std::set<TypeID>& typesConsumed) {
         Service<RandomNumberGenerator> rng;
-        if(rng.isAvailable()) {
+        if (rng.isAvailable()) {
           rng->consumes(consumesCollector());
           for (auto const& consumesInfo : this->consumesInfo()) {
             typesConsumed.emplace(consumesInfo.type());
@@ -537,7 +559,7 @@ namespace edm {
         }
       }
     };
-  }
+  }  // namespace
   // -----------------------------
 
   typedef std::vector<std::string> vstring;
@@ -555,17 +577,18 @@ namespace edm {
                      std::shared_ptr<ProcessConfiguration> processConfiguration,
                      bool hasSubprocesses,
                      PreallocationConfiguration const& prealloc,
-                     ProcessContext const* processContext) :
-  //Only create a resultsInserter if there is a trigger path
-  resultsInserter_{tns.getTrigPaths().empty()? std::shared_ptr<TriggerResultInserter>{} :makeInserter(proc_pset,prealloc,preg,actions,areg,processConfiguration)},
-    moduleRegistry_(new ModuleRegistry()),
-    all_output_communicators_(),
-    preallocConfig_(prealloc),
-    pathNames_(&tns.getTrigPaths()),
-    endPathNames_(&tns.getEndPaths()),
-    wantSummary_(tns.wantSummary()),
-    endpathsAreActive_(true)
-  {
+                     ProcessContext const* processContext)
+      :  //Only create a resultsInserter if there is a trigger path
+        resultsInserter_{tns.getTrigPaths().empty()
+                             ? std::shared_ptr<TriggerResultInserter>{}
+                             : makeInserter(proc_pset, prealloc, preg, actions, areg, processConfiguration)},
+        moduleRegistry_(new ModuleRegistry()),
+        all_output_communicators_(),
+        preallocConfig_(prealloc),
+        pathNames_(&tns.getTrigPaths()),
+        endPathNames_(&tns.getEndPaths()),
+        wantSummary_(tns.wantSummary()),
+        endpathsAreActive_(true) {
     makePathStatusInserters(pathStatusInserters_,
                             *pathNames_,
                             prealloc,
@@ -582,20 +605,24 @@ namespace edm {
                             processConfiguration,
                             std::string("EndPathStatusInserter"));
 
-    assert(0<prealloc.numberOfStreams());
+    assert(0 < prealloc.numberOfStreams());
     streamSchedules_.reserve(prealloc.numberOfStreams());
-    for(unsigned int i=0; i<prealloc.numberOfStreams();++i) {
-      streamSchedules_.emplace_back(make_shared_noexcept_false<StreamSchedule>(
-        resultsInserter(),
-        pathStatusInserters_,
-        endPathStatusInserters_,
-        moduleRegistry(),
-        proc_pset,tns,prealloc,preg,
-        branchIDListHelper,actions,
-        areg,processConfiguration,
-        !hasSubprocesses,
-        StreamID{i},
-        processContext));
+    for (unsigned int i = 0; i < prealloc.numberOfStreams(); ++i) {
+      streamSchedules_.emplace_back(make_shared_noexcept_false<StreamSchedule>(resultsInserter(),
+                                                                               pathStatusInserters_,
+                                                                               endPathStatusInserters_,
+                                                                               moduleRegistry(),
+                                                                               proc_pset,
+                                                                               tns,
+                                                                               prealloc,
+                                                                               preg,
+                                                                               branchIDListHelper,
+                                                                               actions,
+                                                                               areg,
+                                                                               processConfiguration,
+                                                                               !hasSubprocesses,
+                                                                               StreamID{i},
+                                                                               processContext));
     }
 
     //TriggerResults are injected automatically by StreamSchedules and are
@@ -603,51 +630,53 @@ namespace edm {
     const std::string kTriggerResults("TriggerResults");
     std::vector<std::string> modulesToUse;
     modulesToUse.reserve(streamSchedules_[0]->allWorkers().size());
-    for(auto const& worker : streamSchedules_[0]->allWorkers()) {
-      if(worker->description().moduleLabel() != kTriggerResults) {
+    for (auto const& worker : streamSchedules_[0]->allWorkers()) {
+      if (worker->description().moduleLabel() != kTriggerResults) {
         modulesToUse.push_back(worker->description().moduleLabel());
       }
     }
     //The unscheduled modules are at the end of the list, but we want them at the front
     unsigned int const nUnscheduledModules = streamSchedules_[0]->numberOfUnscheduledModules();
-    if(nUnscheduledModules>0) {
+    if (nUnscheduledModules > 0) {
       std::vector<std::string> temp;
       temp.reserve(modulesToUse.size());
-      auto itBeginUnscheduled = modulesToUse.begin()+modulesToUse.size()-nUnscheduledModules;
-      std::copy(itBeginUnscheduled,modulesToUse.end(),
-                std::back_inserter(temp));
-      std::copy(modulesToUse.begin(),itBeginUnscheduled,std::back_inserter(temp));
+      auto itBeginUnscheduled = modulesToUse.begin() + modulesToUse.size() - nUnscheduledModules;
+      std::copy(itBeginUnscheduled, modulesToUse.end(), std::back_inserter(temp));
+      std::copy(modulesToUse.begin(), itBeginUnscheduled, std::back_inserter(temp));
       temp.swap(modulesToUse);
     }
 
     // propagate_const<T> has no reset() function
-    globalSchedule_ = std::make_unique<GlobalSchedule>(
-      resultsInserter(),
-      pathStatusInserters_,
-      endPathStatusInserters_,
-      moduleRegistry(),
-      modulesToUse,
-      proc_pset, preg, prealloc,
-      actions,areg,processConfiguration,processContext);
+    globalSchedule_ = std::make_unique<GlobalSchedule>(resultsInserter(),
+                                                       pathStatusInserters_,
+                                                       endPathStatusInserters_,
+                                                       moduleRegistry(),
+                                                       modulesToUse,
+                                                       proc_pset,
+                                                       preg,
+                                                       prealloc,
+                                                       actions,
+                                                       areg,
+                                                       processConfiguration,
+                                                       processContext);
 
     //TriggerResults is not in the top level ParameterSet so the call to
     // reduceParameterSet would fail to find it. Just remove it up front.
     std::set<std::string> usedModuleLabels;
-    for(auto const& worker: allWorkers()) {
-      if(worker->description().moduleLabel() != kTriggerResults) {
+    for (auto const& worker : allWorkers()) {
+      if (worker->description().moduleLabel() != kTriggerResults) {
         usedModuleLabels.insert(worker->description().moduleLabel());
       }
     }
-    std::vector<std::string> modulesInConfig(proc_pset.getParameter<std::vector<std::string> >("@all_modules"));
-    std::map<std::string, std::vector<std::pair<std::string, int> > > outputModulePathPositions;
-    reduceParameterSet(proc_pset, tns.getEndPaths(), modulesInConfig, usedModuleLabels,
-                       outputModulePathPositions);
+    std::vector<std::string> modulesInConfig(proc_pset.getParameter<std::vector<std::string>>("@all_modules"));
+    std::map<std::string, std::vector<std::pair<std::string, int>>> outputModulePathPositions;
+    reduceParameterSet(proc_pset, tns.getEndPaths(), modulesInConfig, usedModuleLabels, outputModulePathPositions);
     processEDAliases(proc_pset, processConfiguration->processName(), preg);
 
     // At this point all BranchDescriptions are created. Mark now the
     // ones of unscheduled workers to be on-demand.
-    if(nUnscheduledModules > 0) {
-      std::set<std::string> unscheduledModules(modulesToUse.begin(), modulesToUse.begin()+nUnscheduledModules);
+    if (nUnscheduledModules > 0) {
+      std::set<std::string> unscheduledModules(modulesToUse.begin(), modulesToUse.begin() + nUnscheduledModules);
       preg.setUnscheduledProducts(unscheduledModules);
     }
 
@@ -660,7 +689,7 @@ namespace edm {
     // modifications alter the number of workers at a later date.
     size_t all_workers_count = allWorkers().size();
 
-    moduleRegistry_->forAllModuleHolders([this](maker::ModuleHolder* iHolder){
+    moduleRegistry_->forAllModuleHolders([this](maker::ModuleHolder* iHolder) {
       auto comm = iHolder->createOutputModuleCommunicator();
       if (comm) {
         all_output_communicators_.emplace_back(std::shared_ptr<OutputModuleCommunicator>{comm.release()});
@@ -671,11 +700,11 @@ namespace edm {
 
     // Sanity check: make sure nobody has added a worker after we've
     // already relied on the WorkerManager being full.
-    assert (all_workers_count == allWorkers().size());
+    assert(all_workers_count == allWorkers().size());
 
     branchIDListHelper.updateFromRegistry(preg);
 
-    for(auto const& worker : streamSchedules_[0]->allWorkers()) {
+    for (auto const& worker : streamSchedules_[0]->allWorkers()) {
       worker->registerThinnedAssociations(preg, thinnedAssociationsHelper);
     }
     thinnedAssociationsHelper.sort();
@@ -686,7 +715,7 @@ namespace edm {
       c->selectProducts(preg, thinnedAssociationsHelper);
     }
 
-    for(auto & product : preg.productListUpdator()) {
+    for (auto& product : preg.productListUpdator()) {
       setIsMergeable(product.second);
     }
 
@@ -705,13 +734,11 @@ namespace edm {
         }
       }
       // The SubProcess class is not a module, yet it may consume.
-      if(hasSubprocesses) {
+      if (hasSubprocesses) {
         productTypesConsumed.emplace(typeid(TriggerResults));
       }
       // The RandomNumberGeneratorService is not a module, yet it consumes.
-      {
-         RngEDConsumer rngConsumer = RngEDConsumer(productTypesConsumed);
-      }
+      { RngEDConsumer rngConsumer = RngEDConsumer(productTypesConsumed); }
       preg.setFrozen(productTypesConsumed, elementTypesConsumed, processConfiguration->processName());
     }
 
@@ -719,23 +746,18 @@ namespace edm {
       c->setEventSelectionInfo(outputModulePathPositions, preg.anyProductProduced());
     }
 
-    if(wantSummary_) {
+    if (wantSummary_) {
       std::vector<const ModuleDescription*> modDesc;
       const auto& workers = allWorkers();
       modDesc.reserve(workers.size());
 
-      std::transform(workers.begin(),workers.end(),
+      std::transform(workers.begin(),
+                     workers.end(),
                      std::back_inserter(modDesc),
-                     [](const Worker* iWorker) -> const ModuleDescription* {
-                       return iWorker->descPtr();
-                     });
+                     [](const Worker* iWorker) -> const ModuleDescription* { return iWorker->descPtr(); });
 
       // propagate_const<T> has no reset() function
-      summaryTimeKeeper_ = std::make_unique<SystemTimeKeeper>(
-                                                    prealloc.numberOfStreams(),
-                                                    modDesc,
-                                                    tns,
-                                                    processContext);
+      summaryTimeKeeper_ = std::make_unique<SystemTimeKeeper>(prealloc.numberOfStreams(), modDesc, tns, processContext);
       auto timeKeeperPtr = summaryTimeKeeper_.get();
 
       areg->watchPreModuleEvent(timeKeeperPtr, &SystemTimeKeeper::startModuleEvent);
@@ -743,7 +765,7 @@ namespace edm {
       areg->watchPreModuleEventAcquire(timeKeeperPtr, &SystemTimeKeeper::restartModuleEvent);
       areg->watchPostModuleEventAcquire(timeKeeperPtr, &SystemTimeKeeper::stopModuleEvent);
       areg->watchPreModuleEventDelayedGet(timeKeeperPtr, &SystemTimeKeeper::pauseModuleEvent);
-      areg->watchPostModuleEventDelayedGet(timeKeeperPtr,&SystemTimeKeeper::restartModuleEvent);
+      areg->watchPostModuleEventDelayedGet(timeKeeperPtr, &SystemTimeKeeper::restartModuleEvent);
 
       areg->watchPreSourceEvent(timeKeeperPtr, &SystemTimeKeeper::startEvent);
       areg->watchPostEvent(timeKeeperPtr, &SystemTimeKeeper::stopEvent);
@@ -758,13 +780,11 @@ namespace edm {
       //});
     }
 
-  } // Schedule::Schedule
-
+  }  // Schedule::Schedule
 
-  void
-  Schedule::limitOutput(ParameterSet const& proc_pset,
-                        BranchIDLists const& branchIDLists,
-                        SubProcessParentageHelper const* subProcessParentageHelper) {
+  void Schedule::limitOutput(ParameterSet const& proc_pset,
+                             BranchIDLists const& branchIDLists,
+                             SubProcessParentageHelper const* subProcessParentageHelper) {
     std::string const output("output");
 
     ParameterSet const& maxEventsPSet = proc_pset.getUntrackedParameterSet("maxEvents");
@@ -784,8 +804,8 @@ namespace edm {
     }
 
     if (maxEventSpecs > 1) {
-      throw Exception(errors::Configuration) <<
-        "\nAt most, one form of 'output' may appear in the 'maxEvents' parameter set";
+      throw Exception(errors::Configuration)
+          << "\nAt most, one form of 'output' may appear in the 'maxEvents' parameter set";
     }
 
     for (auto& c : all_output_communicators_) {
@@ -795,8 +815,8 @@ namespace edm {
         try {
           desc.maxEvents_ = vMaxEventsOut->getUntrackedParameter<int>(moduleLabel);
         } catch (Exception const&) {
-          throw Exception(errors::Configuration) <<
-            "\nNo entry in 'maxEvents' for output module label '" << moduleLabel << "'.\n";
+          throw Exception(errors::Configuration)
+              << "\nNo entry in 'maxEvents' for output module label '" << moduleLabel << "'.\n";
         }
       }
       c->configure(desc);
@@ -813,19 +833,19 @@ namespace edm {
         return false;
       }
     }
-    LogInfo("SuccessfulTermination")
-      << "The job is terminating successfully because each output module\n"
-      << "has reached its configured limit.\n";
+    LogInfo("SuccessfulTermination") << "The job is terminating successfully because each output module\n"
+                                     << "has reached its configured limit.\n";
     return true;
   }
 
-  void Schedule::endJob(ExceptionCollector & collector) {
+  void Schedule::endJob(ExceptionCollector& collector) {
     globalSchedule_->endJob(collector);
     if (collector.hasThrown()) {
       return;
     }
 
-    if (wantSummary_ == false) return;
+    if (wantSummary_ == false)
+      return;
     {
       TriggerReport tr;
       getTriggerReport(tr);
@@ -833,41 +853,40 @@ namespace edm {
       // The trigger report (pass/fail etc.):
 
       LogVerbatim("FwkSummary") << "";
-      if(streamSchedules_[0]->context().processContext()->isSubProcess()) {
-        LogVerbatim("FwkSummary") << "TrigReport Process: "<<streamSchedules_[0]->context().processContext()->processName();
+      if (streamSchedules_[0]->context().processContext()->isSubProcess()) {
+        LogVerbatim("FwkSummary") << "TrigReport Process: "
+                                  << streamSchedules_[0]->context().processContext()->processName();
       }
-      LogVerbatim("FwkSummary") << "TrigReport " << "---------- Event  Summary ------------";
-      if(!tr.trigPathSummaries.empty()) {
+      LogVerbatim("FwkSummary") << "TrigReport "
+                                << "---------- Event  Summary ------------";
+      if (!tr.trigPathSummaries.empty()) {
         LogVerbatim("FwkSummary") << "TrigReport"
-        << " Events total = " << tr.eventSummary.totalEvents
-        << " passed = " << tr.eventSummary.totalEventsPassed
-        << " failed = " << tr.eventSummary.totalEventsFailed
-        << "";
+                                  << " Events total = " << tr.eventSummary.totalEvents
+                                  << " passed = " << tr.eventSummary.totalEventsPassed
+                                  << " failed = " << tr.eventSummary.totalEventsFailed << "";
       } else {
         LogVerbatim("FwkSummary") << "TrigReport"
-        << " Events total = " << tr.eventSummary.totalEvents
-        << " passed = " << tr.eventSummary.totalEvents
-        << " failed = 0";
+                                  << " Events total = " << tr.eventSummary.totalEvents
+                                  << " passed = " << tr.eventSummary.totalEvents << " failed = 0";
       }
 
       LogVerbatim("FwkSummary") << "";
-      LogVerbatim("FwkSummary") << "TrigReport " << "---------- Path   Summary ------------";
       LogVerbatim("FwkSummary") << "TrigReport "
-      << std::right << std::setw(10) << "Trig Bit#" << " "
-      << std::right << std::setw(10) << "Executed" << " "
-      << std::right << std::setw(10) << "Passed" << " "
-      << std::right << std::setw(10) << "Failed" << " "
-      << std::right << std::setw(10) << "Error" << " "
-      << "Name" << "";
-      for (auto const& p: tr.trigPathSummaries) {
-        LogVerbatim("FwkSummary") << "TrigReport "
-        << std::right << std::setw(5) << 1
-        << std::right << std::setw(5) << p.bitPosition << " "
-        << std::right << std::setw(10) << p.timesRun << " "
-        << std::right << std::setw(10) << p.timesPassed << " "
-        << std::right << std::setw(10) << p.timesFailed << " "
-        << std::right << std::setw(10) << p.timesExcept << " "
-        << p.name << "";
+                                << "---------- Path   Summary ------------";
+      LogVerbatim("FwkSummary") << "TrigReport " << std::right << std::setw(10) << "Trig Bit#"
+                                << " " << std::right << std::setw(10) << "Executed"
+                                << " " << std::right << std::setw(10) << "Passed"
+                                << " " << std::right << std::setw(10) << "Failed"
+                                << " " << std::right << std::setw(10) << "Error"
+                                << " "
+                                << "Name"
+                                << "";
+      for (auto const& p : tr.trigPathSummaries) {
+        LogVerbatim("FwkSummary") << "TrigReport " << std::right << std::setw(5) << 1 << std::right << std::setw(5)
+                                  << p.bitPosition << " " << std::right << std::setw(10) << p.timesRun << " "
+                                  << std::right << std::setw(10) << p.timesPassed << " " << std::right << std::setw(10)
+                                  << p.timesFailed << " " << std::right << std::setw(10) << p.timesExcept << " "
+                                  << p.name << "";
       }
 
       /*
@@ -888,92 +907,89 @@ namespace edm {
        */
 
       LogVerbatim("FwkSummary") << "";
-      LogVerbatim("FwkSummary") << "TrigReport " << "-------End-Path   Summary ------------";
       LogVerbatim("FwkSummary") << "TrigReport "
-      << std::right << std::setw(10) << "Trig Bit#" << " "
-      << std::right << std::setw(10) << "Executed" << " "
-      << std::right << std::setw(10) << "Passed" << " "
-      << std::right << std::setw(10) << "Failed" << " "
-      << std::right << std::setw(10) << "Error" << " "
-      << "Name" << "";
-      for (auto const& p: tr.endPathSummaries) {
-        LogVerbatim("FwkSummary") << "TrigReport "
-        << std::right << std::setw(5) << 0
-        << std::right << std::setw(5) << p.bitPosition << " "
-        << std::right << std::setw(10) << p.timesRun << " "
-        << std::right << std::setw(10) << p.timesPassed << " "
-        << std::right << std::setw(10) << p.timesFailed << " "
-        << std::right << std::setw(10) << p.timesExcept << " "
-        << p.name << "";
+                                << "-------End-Path   Summary ------------";
+      LogVerbatim("FwkSummary") << "TrigReport " << std::right << std::setw(10) << "Trig Bit#"
+                                << " " << std::right << std::setw(10) << "Executed"
+                                << " " << std::right << std::setw(10) << "Passed"
+                                << " " << std::right << std::setw(10) << "Failed"
+                                << " " << std::right << std::setw(10) << "Error"
+                                << " "
+                                << "Name"
+                                << "";
+      for (auto const& p : tr.endPathSummaries) {
+        LogVerbatim("FwkSummary") << "TrigReport " << std::right << std::setw(5) << 0 << std::right << std::setw(5)
+                                  << p.bitPosition << " " << std::right << std::setw(10) << p.timesRun << " "
+                                  << std::right << std::setw(10) << p.timesPassed << " " << std::right << std::setw(10)
+                                  << p.timesFailed << " " << std::right << std::setw(10) << p.timesExcept << " "
+                                  << p.name << "";
       }
 
-      for (auto const& p: tr.trigPathSummaries) {
+      for (auto const& p : tr.trigPathSummaries) {
         LogVerbatim("FwkSummary") << "";
-        LogVerbatim("FwkSummary") << "TrigReport " << "---------- Modules in Path: " << p.name << " ------------";
         LogVerbatim("FwkSummary") << "TrigReport "
-        << std::right << std::setw(10) << "Trig Bit#" << " "
-        << std::right << std::setw(10) << "Visited" << " "
-        << std::right << std::setw(10) << "Passed" << " "
-        << std::right << std::setw(10) << "Failed" << " "
-        << std::right << std::setw(10) << "Error" << " "
-        << "Name" << "";
+                                  << "---------- Modules in Path: " << p.name << " ------------";
+        LogVerbatim("FwkSummary") << "TrigReport " << std::right << std::setw(10) << "Trig Bit#"
+                                  << " " << std::right << std::setw(10) << "Visited"
+                                  << " " << std::right << std::setw(10) << "Passed"
+                                  << " " << std::right << std::setw(10) << "Failed"
+                                  << " " << std::right << std::setw(10) << "Error"
+                                  << " "
+                                  << "Name"
+                                  << "";
 
         unsigned int bitpos = 0;
-        for (auto const& mod: p.moduleInPathSummaries) {
-          LogVerbatim("FwkSummary") << "TrigReport "
-          << std::right << std::setw(5) << 1
-          << std::right << std::setw(5) << bitpos << " "
-          << std::right << std::setw(10) << mod.timesVisited << " "
-          << std::right << std::setw(10) << mod.timesPassed << " "
-          << std::right << std::setw(10) << mod.timesFailed << " "
-          << std::right << std::setw(10) << mod.timesExcept << " "
-          << mod.moduleLabel << "";
+        for (auto const& mod : p.moduleInPathSummaries) {
+          LogVerbatim("FwkSummary") << "TrigReport " << std::right << std::setw(5) << 1 << std::right << std::setw(5)
+                                    << bitpos << " " << std::right << std::setw(10) << mod.timesVisited << " "
+                                    << std::right << std::setw(10) << mod.timesPassed << " " << std::right
+                                    << std::setw(10) << mod.timesFailed << " " << std::right << std::setw(10)
+                                    << mod.timesExcept << " " << mod.moduleLabel << "";
           ++bitpos;
         }
       }
 
-      for (auto const& p: tr.endPathSummaries) {
+      for (auto const& p : tr.endPathSummaries) {
         LogVerbatim("FwkSummary") << "";
-        LogVerbatim("FwkSummary") << "TrigReport " << "------ Modules in End-Path: " << p.name << " ------------";
         LogVerbatim("FwkSummary") << "TrigReport "
-        << std::right << std::setw(10) << "Trig Bit#" << " "
-        << std::right << std::setw(10) << "Visited" << " "
-        << std::right << std::setw(10) << "Passed" << " "
-        << std::right << std::setw(10) << "Failed" << " "
-        << std::right << std::setw(10) << "Error" << " "
-        << "Name" << "";
-
-        unsigned int bitpos=0;
-        for (auto const& mod: p.moduleInPathSummaries) {
-          LogVerbatim("FwkSummary") << "TrigReport "
-          << std::right << std::setw(5) << 0
-          << std::right << std::setw(5) << bitpos << " "
-          << std::right << std::setw(10) << mod.timesVisited << " "
-          << std::right << std::setw(10) << mod.timesPassed << " "
-          << std::right << std::setw(10) << mod.timesFailed << " "
-          << std::right << std::setw(10) << mod.timesExcept << " "
-          << mod.moduleLabel << "";
+                                  << "------ Modules in End-Path: " << p.name << " ------------";
+        LogVerbatim("FwkSummary") << "TrigReport " << std::right << std::setw(10) << "Trig Bit#"
+                                  << " " << std::right << std::setw(10) << "Visited"
+                                  << " " << std::right << std::setw(10) << "Passed"
+                                  << " " << std::right << std::setw(10) << "Failed"
+                                  << " " << std::right << std::setw(10) << "Error"
+                                  << " "
+                                  << "Name"
+                                  << "";
+
+        unsigned int bitpos = 0;
+        for (auto const& mod : p.moduleInPathSummaries) {
+          LogVerbatim("FwkSummary") << "TrigReport " << std::right << std::setw(5) << 0 << std::right << std::setw(5)
+                                    << bitpos << " " << std::right << std::setw(10) << mod.timesVisited << " "
+                                    << std::right << std::setw(10) << mod.timesPassed << " " << std::right
+                                    << std::setw(10) << mod.timesFailed << " " << std::right << std::setw(10)
+                                    << mod.timesExcept << " " << mod.moduleLabel << "";
           ++bitpos;
         }
       }
 
       LogVerbatim("FwkSummary") << "";
-      LogVerbatim("FwkSummary") << "TrigReport " << "---------- Module Summary ------------";
       LogVerbatim("FwkSummary") << "TrigReport "
-      << std::right << std::setw(10) << "Visited" << " "
-      << std::right << std::setw(10) << "Executed" << " "
-      << std::right << std::setw(10) << "Passed" << " "
-      << std::right << std::setw(10) << "Failed" << " "
-      << std::right << std::setw(10) << "Error" << " "
-      << "Name" << "";
+                                << "---------- Module Summary ------------";
+      LogVerbatim("FwkSummary") << "TrigReport " << std::right << std::setw(10) << "Visited"
+                                << " " << std::right << std::setw(10) << "Executed"
+                                << " " << std::right << std::setw(10) << "Passed"
+                                << " " << std::right << std::setw(10) << "Failed"
+                                << " " << std::right << std::setw(10) << "Error"
+                                << " "
+                                << "Name"
+                                << "";
       for (auto const& worker : tr.workerSummaries) {
-        LogVerbatim("FwkSummary") << "TrigReport "
-        << std::right << std::setw(10) << worker.timesVisited << " "
-        << std::right << std::setw(10) << worker.timesRun << " "
-        << std::right << std::setw(10) << worker.timesPassed << " "
-        << std::right << std::setw(10) << worker.timesFailed << " "
-        << std::right << std::setw(10) << worker.timesExcept << " "
-        << worker.moduleLabel << "";
+        LogVerbatim("FwkSummary") << "TrigReport " << std::right << std::setw(10) << worker.timesVisited << " "
+                                  << std::right << std::setw(10) << worker.timesRun << " " << std::right
+                                  << std::setw(10) << worker.timesPassed << " " << std::right << std::setw(10)
+                                  << worker.timesFailed << " " << std::right << std::setw(10) << worker.timesExcept
+                                  << " " << worker.moduleLabel << "";
       }
       LogVerbatim("FwkSummary") << "";
     }
@@ -983,127 +999,123 @@ namespace edm {
 
     const int totalEvents = std::max(1, tr.eventSummary.totalEvents);
 
-    LogVerbatim("FwkSummary") << "TimeReport " << "---------- Event  Summary ---[sec]----";
-    LogVerbatim("FwkSummary") << "TimeReport"
-                              << std::setprecision(6) << std::fixed
-                              << "       event loop CPU/event = " << tr.eventSummary.cpuTime/totalEvents;
-    LogVerbatim("FwkSummary") << "TimeReport"
-                              << std::setprecision(6) << std::fixed
-                              << "      event loop Real/event = " << tr.eventSummary.realTime/totalEvents;
-    LogVerbatim("FwkSummary") << "TimeReport"
-                              << std::setprecision(6) << std::fixed
-                              << "     sum Streams Real/event = " << tr.eventSummary.sumStreamRealTime/totalEvents;
-    LogVerbatim("FwkSummary") << "TimeReport"
-                              << std::setprecision(6) << std::fixed
-                              << " efficiency CPU/Real/thread = " << tr.eventSummary.cpuTime/tr.eventSummary.realTime/preallocConfig_.numberOfThreads();
+    LogVerbatim("FwkSummary") << "TimeReport "
+                              << "---------- Event  Summary ---[sec]----";
+    LogVerbatim("FwkSummary") << "TimeReport" << std::setprecision(6) << std::fixed
+                              << "       event loop CPU/event = " << tr.eventSummary.cpuTime / totalEvents;
+    LogVerbatim("FwkSummary") << "TimeReport" << std::setprecision(6) << std::fixed
+                              << "      event loop Real/event = " << tr.eventSummary.realTime / totalEvents;
+    LogVerbatim("FwkSummary") << "TimeReport" << std::setprecision(6) << std::fixed
+                              << "     sum Streams Real/event = " << tr.eventSummary.sumStreamRealTime / totalEvents;
+    LogVerbatim("FwkSummary") << "TimeReport" << std::setprecision(6) << std::fixed << " efficiency CPU/Real/thread = "
+                              << tr.eventSummary.cpuTime / tr.eventSummary.realTime / preallocConfig_.numberOfThreads();
 
     constexpr int kColumn1Size = 10;
     constexpr int kColumn2Size = 12;
     constexpr int kColumn3Size = 12;
     LogVerbatim("FwkSummary") << "";
-    LogVerbatim("FwkSummary") << "TimeReport " << "---------- Path   Summary ---[Real sec]----";
     LogVerbatim("FwkSummary") << "TimeReport "
-                              << std::right << std::setw(kColumn1Size) << "per event"<<" "
-                              << std::right << std::setw(kColumn2Size) << "per exec"
+                              << "---------- Path   Summary ---[Real sec]----";
+    LogVerbatim("FwkSummary") << "TimeReport " << std::right << std::setw(kColumn1Size) << "per event"
+                              << " " << std::right << std::setw(kColumn2Size) << "per exec"
                               << "  Name";
-    for (auto const& p: tr.trigPathSummaries) {
+    for (auto const& p : tr.trigPathSummaries) {
       const int timesRun = std::max(1, p.timesRun);
-      LogVerbatim("FwkSummary") << "TimeReport "
-                                << std::setprecision(6) << std::fixed
-                                << std::right << std::setw(kColumn1Size) << p.realTime/totalEvents << " "
-                                << std::right << std::setw(kColumn2Size) << p.realTime/timesRun << "  "
-                                << p.name << "";
+      LogVerbatim("FwkSummary") << "TimeReport " << std::setprecision(6) << std::fixed << std::right
+                                << std::setw(kColumn1Size) << p.realTime / totalEvents << " " << std::right
+                                << std::setw(kColumn2Size) << p.realTime / timesRun << "  " << p.name << "";
     }
-    LogVerbatim("FwkSummary") << "TimeReport "
-                              << std::right << std::setw(kColumn1Size) << "per event"<<" "
-                              << std::right << std::setw(kColumn2Size) << "per exec"
-                              << "  Name" << "";
+    LogVerbatim("FwkSummary") << "TimeReport " << std::right << std::setw(kColumn1Size) << "per event"
+                              << " " << std::right << std::setw(kColumn2Size) << "per exec"
+                              << "  Name"
+                              << "";
 
     LogVerbatim("FwkSummary") << "";
-    LogVerbatim("FwkSummary") << "TimeReport " << "-------End-Path   Summary ---[Real sec]----";
     LogVerbatim("FwkSummary") << "TimeReport "
-                              << std::right << std::setw(kColumn1Size) << "per event" <<" "
-                              << std::right << std::setw(kColumn2Size) << "per exec"
-                              << "  Name" << "";
-    for (auto const& p: tr.endPathSummaries) {
+                              << "-------End-Path   Summary ---[Real sec]----";
+    LogVerbatim("FwkSummary") << "TimeReport " << std::right << std::setw(kColumn1Size) << "per event"
+                              << " " << std::right << std::setw(kColumn2Size) << "per exec"
+                              << "  Name"
+                              << "";
+    for (auto const& p : tr.endPathSummaries) {
       const int timesRun = std::max(1, p.timesRun);
 
-      LogVerbatim("FwkSummary") << "TimeReport "
-                                << std::setprecision(6) << std::fixed
-                                << std::right << std::setw(kColumn1Size) << p.realTime/totalEvents << " "
-                                << std::right << std::setw(kColumn2Size) << p.realTime/timesRun << "  "
-                                << p.name << "";
+      LogVerbatim("FwkSummary") << "TimeReport " << std::setprecision(6) << std::fixed << std::right
+                                << std::setw(kColumn1Size) << p.realTime / totalEvents << " " << std::right
+                                << std::setw(kColumn2Size) << p.realTime / timesRun << "  " << p.name << "";
     }
-    LogVerbatim("FwkSummary") << "TimeReport "
-                              << std::right << std::setw(kColumn1Size) << "per event" <<" "
-                              << std::right << std::setw(kColumn2Size) << "per exec"
-                              << "  Name" << "";
+    LogVerbatim("FwkSummary") << "TimeReport " << std::right << std::setw(kColumn1Size) << "per event"
+                              << " " << std::right << std::setw(kColumn2Size) << "per exec"
+                              << "  Name"
+                              << "";
 
-    for (auto const& p: tr.trigPathSummaries) {
+    for (auto const& p : tr.trigPathSummaries) {
       LogVerbatim("FwkSummary") << "";
-      LogVerbatim("FwkSummary") << "TimeReport " << "---------- Modules in Path: " << p.name << " ---[Real sec]----";
       LogVerbatim("FwkSummary") << "TimeReport "
-                                << std::right << std::setw(kColumn1Size) << "per event" <<" "
-                                << std::right << std::setw(kColumn2Size) << "per visit"
-                                << "  Name" << "";
-      for (auto const& mod: p.moduleInPathSummaries) {
-        LogVerbatim("FwkSummary") << "TimeReport "
-                                  << std::setprecision(6) << std::fixed
-                                  << std::right << std::setw(kColumn1Size) << mod.realTime/totalEvents << " "
-                                  << std::right << std::setw(kColumn2Size) << mod.realTime/std::max(1, mod.timesVisited) << "  "
+                                << "---------- Modules in Path: " << p.name << " ---[Real sec]----";
+      LogVerbatim("FwkSummary") << "TimeReport " << std::right << std::setw(kColumn1Size) << "per event"
+                                << " " << std::right << std::setw(kColumn2Size) << "per visit"
+                                << "  Name"
+                                << "";
+      for (auto const& mod : p.moduleInPathSummaries) {
+        LogVerbatim("FwkSummary") << "TimeReport " << std::setprecision(6) << std::fixed << std::right
+                                  << std::setw(kColumn1Size) << mod.realTime / totalEvents << " " << std::right
+                                  << std::setw(kColumn2Size) << mod.realTime / std::max(1, mod.timesVisited) << "  "
                                   << mod.moduleLabel << "";
       }
     }
-    if(not tr.trigPathSummaries.empty()) {
-      LogVerbatim("FwkSummary") << "TimeReport "
-                                << std::right << std::setw(kColumn1Size) << "per event" <<" "
-                                << std::right << std::setw(kColumn2Size) << "per visit"
-                                << "  Name" << "";
+    if (not tr.trigPathSummaries.empty()) {
+      LogVerbatim("FwkSummary") << "TimeReport " << std::right << std::setw(kColumn1Size) << "per event"
+                                << " " << std::right << std::setw(kColumn2Size) << "per visit"
+                                << "  Name"
+                                << "";
     }
-    for (auto const& p: tr.endPathSummaries) {
+    for (auto const& p : tr.endPathSummaries) {
       LogVerbatim("FwkSummary") << "";
-      LogVerbatim("FwkSummary") << "TimeReport " << "------ Modules in End-Path: " << p.name << " ---[Real sec]----";
       LogVerbatim("FwkSummary") << "TimeReport "
-                                << std::right << std::setw(kColumn1Size) << "per event" <<" "
-                                << std::right << std::setw(kColumn2Size) << "per visit"
-                                << "  Name" << "";
-      for (auto const& mod: p.moduleInPathSummaries) {
-        LogVerbatim("FwkSummary") << "TimeReport "
-                                  << std::setprecision(6) << std::fixed
-                                  << std::right << std::setw(kColumn1Size) << mod.realTime/totalEvents << " "
-                                  << std::right << std::setw(kColumn2Size) << mod.realTime/std::max(1, mod.timesVisited) << "  "
+                                << "------ Modules in End-Path: " << p.name << " ---[Real sec]----";
+      LogVerbatim("FwkSummary") << "TimeReport " << std::right << std::setw(kColumn1Size) << "per event"
+                                << " " << std::right << std::setw(kColumn2Size) << "per visit"
+                                << "  Name"
+                                << "";
+      for (auto const& mod : p.moduleInPathSummaries) {
+        LogVerbatim("FwkSummary") << "TimeReport " << std::setprecision(6) << std::fixed << std::right
+                                  << std::setw(kColumn1Size) << mod.realTime / totalEvents << " " << std::right
+                                  << std::setw(kColumn2Size) << mod.realTime / std::max(1, mod.timesVisited) << "  "
                                   << mod.moduleLabel << "";
       }
     }
-    if(not tr.endPathSummaries.empty()) {
-      LogVerbatim("FwkSummary") << "TimeReport "
-                                << std::right << std::setw(kColumn1Size) << "per event" <<" "
-                                << std::right << std::setw(kColumn2Size) << "per visit"
-                                << "  Name" << "";
+    if (not tr.endPathSummaries.empty()) {
+      LogVerbatim("FwkSummary") << "TimeReport " << std::right << std::setw(kColumn1Size) << "per event"
+                                << " " << std::right << std::setw(kColumn2Size) << "per visit"
+                                << "  Name"
+                                << "";
     }
     LogVerbatim("FwkSummary") << "";
-    LogVerbatim("FwkSummary") << "TimeReport " << "---------- Module Summary ---[Real sec]----";
     LogVerbatim("FwkSummary") << "TimeReport "
-                              << std::right << std::setw(kColumn1Size) << "per event" <<" "
-                              << std::right << std::setw(kColumn2Size) << "per exec" <<" "
-                              << std::right << std::setw(kColumn3Size) << "per visit"
-                              << "  Name" << "";
+                              << "---------- Module Summary ---[Real sec]----";
+    LogVerbatim("FwkSummary") << "TimeReport " << std::right << std::setw(kColumn1Size) << "per event"
+                              << " " << std::right << std::setw(kColumn2Size) << "per exec"
+                              << " " << std::right << std::setw(kColumn3Size) << "per visit"
+                              << "  Name"
+                              << "";
     for (auto const& worker : tr.workerSummaries) {
-      LogVerbatim("FwkSummary") << "TimeReport "
-                                << std::setprecision(6) << std::fixed
-                                << std::right << std::setw(kColumn1Size) << worker.realTime/totalEvents << " "
-                                << std::right << std::setw(kColumn2Size) << worker.realTime/std::max(1, worker.timesRun) << " "
-                                << std::right << std::setw(kColumn3Size) << worker.realTime/std::max(1, worker.timesVisited) << "  "
-                                << worker.moduleLabel << "";
+      LogVerbatim("FwkSummary") << "TimeReport " << std::setprecision(6) << std::fixed << std::right
+                                << std::setw(kColumn1Size) << worker.realTime / totalEvents << " " << std::right
+                                << std::setw(kColumn2Size) << worker.realTime / std::max(1, worker.timesRun) << " "
+                                << std::right << std::setw(kColumn3Size)
+                                << worker.realTime / std::max(1, worker.timesVisited) << "  " << worker.moduleLabel
+                                << "";
     }
-    LogVerbatim("FwkSummary") << "TimeReport "
-                              << std::right << std::setw(kColumn1Size) << "per event" <<" "
-                              << std::right << std::setw(kColumn2Size) << "per exec" <<" "
-                              << std::right << std::setw(kColumn3Size) << "per visit"
-                              << "  Name" << "";
+    LogVerbatim("FwkSummary") << "TimeReport " << std::right << std::setw(kColumn1Size) << "per event"
+                              << " " << std::right << std::setw(kColumn2Size) << "per exec"
+                              << " " << std::right << std::setw(kColumn3Size) << "per visit"
+                              << "  Name"
+                              << "";
 
     LogVerbatim("FwkSummary") << "";
-    LogVerbatim("FwkSummary") << "T---Report end!" << "";
+    LogVerbatim("FwkSummary") << "T---Report end!"
+                              << "";
     LogVerbatim("FwkSummary") << "";
   }
 
@@ -1122,7 +1134,7 @@ namespace edm {
                                ProcessContext const* processContext,
                                ActivityRegistry* activityRegistry,
                                MergeableRunProductMetadata const* mergeableRunProductMetadata) {
-    for(auto& c: all_output_communicators_) {
+    for (auto& c : all_output_communicators_) {
       c->writeRunAsync(task, rp, processContext, activityRegistry, mergeableRunProductMetadata);
     }
   }
@@ -1131,7 +1143,7 @@ namespace edm {
                                 LuminosityBlockPrincipal const& lbp,
                                 ProcessContext const* processContext,
                                 ActivityRegistry* activityRegistry) {
-    for(auto& c: all_output_communicators_) {
+    for (auto& c : all_output_communicators_) {
       c->writeLumiAsync(task, lbp, processContext, activityRegistry);
     }
   }
@@ -1139,9 +1151,10 @@ namespace edm {
   bool Schedule::shouldWeCloseOutput() const {
     using std::placeholders::_1;
     // Return true iff at least one output module returns true.
-    return (std::find_if (all_output_communicators_.begin(), all_output_communicators_.end(),
-                     std::bind(&OutputModuleCommunicator::shouldWeCloseFile, _1))
-                     != all_output_communicators_.end());
+    return (std::find_if(all_output_communicators_.begin(),
+                         all_output_communicators_.end(),
+                         std::bind(&OutputModuleCommunicator::shouldWeCloseFile, _1)) !=
+            all_output_communicators_.end());
   }
 
   void Schedule::respondToOpenInputFile(FileBlock const& fb) {
@@ -1154,32 +1167,33 @@ namespace edm {
     for_all(allWorkers(), std::bind(&Worker::respondToCloseInputFile, _1, std::cref(fb)));
   }
 
-  void Schedule::beginJob(ProductRegistry const& iRegistry) {
-    globalSchedule_->beginJob(iRegistry);
+  void Schedule::beginJob(ProductRegistry const& iRegistry, eventsetup::ESRecordsToProxyIndices const& iESIndices) {
+    globalSchedule_->beginJob(iRegistry, iESIndices);
   }
 
   void Schedule::beginStream(unsigned int iStreamID) {
-    assert(iStreamID<streamSchedules_.size());
+    assert(iStreamID < streamSchedules_.size());
     streamSchedules_[iStreamID]->beginStream();
   }
 
   void Schedule::endStream(unsigned int iStreamID) {
-    assert(iStreamID<streamSchedules_.size());
+    assert(iStreamID < streamSchedules_.size());
     streamSchedules_[iStreamID]->endStream();
   }
-  
+
   void Schedule::processOneEventAsync(WaitingTaskHolder iTask,
                                       unsigned int iStreamID,
                                       EventPrincipal& ep,
                                       EventSetupImpl const& es,
                                       ServiceToken const& token) {
-    assert(iStreamID<streamSchedules_.size());
-    streamSchedules_[iStreamID]->processOneEventAsync(std::move(iTask),ep,es,token,pathStatusInserters_);
+    assert(iStreamID < streamSchedules_.size());
+    streamSchedules_[iStreamID]->processOneEventAsync(std::move(iTask), ep, es, token, pathStatusInserters_);
   }
-  
+
   bool Schedule::changeModule(std::string const& iLabel,
                               ParameterSet const& iPSet,
-                              const ProductRegistry& iRegistry) {
+                              const ProductRegistry& iRegistry,
+                              eventsetup::ESRecordsToProxyIndices const& iIndices) {
     Worker* found = nullptr;
     for (auto const& worker : allWorkers()) {
       if (worker->description().moduleLabel() == iLabel) {
@@ -1191,12 +1205,12 @@ namespace edm {
       return false;
     }
 
-    auto newMod = moduleRegistry_->replaceModule(iLabel,iPSet,preallocConfig_);
+    auto newMod = moduleRegistry_->replaceModule(iLabel, iPSet, preallocConfig_);
 
-    globalSchedule_->replaceModule(newMod,iLabel);
+    globalSchedule_->replaceModule(newMod, iLabel);
 
-    for(auto& s: streamSchedules_) {
-      s->replaceModule(newMod,iLabel);
+    for (auto& s : streamSchedules_) {
+      s->replaceModule(newMod, iLabel);
     }
 
     {
@@ -1204,26 +1218,24 @@ namespace edm {
       auto const runLookup = iRegistry.productLookup(InRun);
       auto const lumiLookup = iRegistry.productLookup(InLumi);
       auto const eventLookup = iRegistry.productLookup(InEvent);
-      found->updateLookup(InRun,*runLookup);
-      found->updateLookup(InLumi,*lumiLookup);
-      found->updateLookup(InEvent,*eventLookup);
-      
+      found->updateLookup(InRun, *runLookup);
+      found->updateLookup(InLumi, *lumiLookup);
+      found->updateLookup(InEvent, *eventLookup);
+      found->updateLookup(iIndices);
+
       auto const& processName = newMod->moduleDescription().processName();
       auto const& runModuleToIndicies = runLookup->indiciesForModulesInProcess(processName);
       auto const& lumiModuleToIndicies = lumiLookup->indiciesForModulesInProcess(processName);
       auto const& eventModuleToIndicies = eventLookup->indiciesForModulesInProcess(processName);
-      found->resolvePutIndicies(InRun,runModuleToIndicies);
-      found->resolvePutIndicies(InLumi,lumiModuleToIndicies);
-      found->resolvePutIndicies(InEvent,eventModuleToIndicies);
-
-
+      found->resolvePutIndicies(InRun, runModuleToIndicies);
+      found->resolvePutIndicies(InLumi, lumiModuleToIndicies);
+      found->resolvePutIndicies(InEvent, eventModuleToIndicies);
     }
 
     return true;
   }
 
-  std::vector<ModuleDescription const*>
-  Schedule::getAllModuleDescriptions() const {
+  std::vector<ModuleDescription const*> Schedule::getAllModuleDescriptions() const {
     std::vector<ModuleDescription const*> result;
     result.reserve(allWorkers().size());
 
@@ -1234,10 +1246,7 @@ namespace edm {
     return result;
   }
 
-  Schedule::AllWorkers const&
-  Schedule::allWorkers() const {
-    return globalSchedule_->allWorkers();
-  }
+  Schedule::AllWorkers const& Schedule::allWorkers() const { return globalSchedule_->allWorkers(); }
 
   void Schedule::convertCurrentProcessAlias(std::string const& processName) {
     for (auto const& worker : allWorkers()) {
@@ -1245,47 +1254,35 @@ namespace edm {
     }
   }
 
-  void
-  Schedule::availablePaths(std::vector<std::string>& oLabelsToFill) const {
+  void Schedule::availablePaths(std::vector<std::string>& oLabelsToFill) const {
     streamSchedules_[0]->availablePaths(oLabelsToFill);
   }
 
-  void
-  Schedule::triggerPaths(std::vector<std::string>& oLabelsToFill) const {
-    oLabelsToFill = *pathNames_;
-
-  }
+  void Schedule::triggerPaths(std::vector<std::string>& oLabelsToFill) const { oLabelsToFill = *pathNames_; }
 
-  void
-  Schedule::endPaths(std::vector<std::string>& oLabelsToFill) const {
-    oLabelsToFill = *endPathNames_;
-  }
+  void Schedule::endPaths(std::vector<std::string>& oLabelsToFill) const { oLabelsToFill = *endPathNames_; }
 
-  void
-  Schedule::modulesInPath(std::string const& iPathLabel,
-                          std::vector<std::string>& oLabelsToFill) const {
-    streamSchedules_[0]->modulesInPath(iPathLabel,oLabelsToFill);
+  void Schedule::modulesInPath(std::string const& iPathLabel, std::vector<std::string>& oLabelsToFill) const {
+    streamSchedules_[0]->modulesInPath(iPathLabel, oLabelsToFill);
   }
 
-  void
-  Schedule::moduleDescriptionsInPath(std::string const& iPathLabel,
-                                     std::vector<ModuleDescription const*>& descriptions,
-                                     unsigned int hint) const {
+  void Schedule::moduleDescriptionsInPath(std::string const& iPathLabel,
+                                          std::vector<ModuleDescription const*>& descriptions,
+                                          unsigned int hint) const {
     streamSchedules_[0]->moduleDescriptionsInPath(iPathLabel, descriptions, hint);
   }
 
-  void
-  Schedule::moduleDescriptionsInEndPath(std::string const& iEndPathLabel,
-                                        std::vector<ModuleDescription const*>& descriptions,
-                                        unsigned int hint) const {
+  void Schedule::moduleDescriptionsInEndPath(std::string const& iEndPathLabel,
+                                             std::vector<ModuleDescription const*>& descriptions,
+                                             unsigned int hint) const {
     streamSchedules_[0]->moduleDescriptionsInEndPath(iEndPathLabel, descriptions, hint);
   }
 
-  void
-  Schedule::fillModuleAndConsumesInfo(std::vector<ModuleDescription const*>& allModuleDescriptions,
-                                      std::vector<std::pair<unsigned int, unsigned int> >& moduleIDToIndex,
-                                      std::vector<std::vector<ModuleDescription const*> >& modulesWhoseProductsAreConsumedBy,
-                                      ProductRegistry const& preg) const {
+  void Schedule::fillModuleAndConsumesInfo(
+      std::vector<ModuleDescription const*>& allModuleDescriptions,
+      std::vector<std::pair<unsigned int, unsigned int>>& moduleIDToIndex,
+      std::vector<std::vector<ModuleDescription const*>>& modulesWhoseProductsAreConsumedBy,
+      ProductRegistry const& preg) const {
     allModuleDescriptions.clear();
     moduleIDToIndex.clear();
     modulesWhoseProductsAreConsumedBy.clear();
@@ -1313,70 +1310,59 @@ namespace edm {
     }
   }
 
-  void
-  Schedule::enableEndPaths(bool active) {
+  void Schedule::enableEndPaths(bool active) {
     endpathsAreActive_ = active;
-    for(auto& s : streamSchedules_) {
+    for (auto& s : streamSchedules_) {
       s->enableEndPaths(active);
     }
   }
 
-  bool
-  Schedule::endPathsEnabled() const {
-    return endpathsAreActive_;
-  }
+  bool Schedule::endPathsEnabled() const { return endpathsAreActive_; }
 
-  void
-  Schedule::getTriggerReport(TriggerReport& rep) const {
+  void Schedule::getTriggerReport(TriggerReport& rep) const {
     rep.eventSummary.totalEvents = 0;
     rep.eventSummary.totalEventsPassed = 0;
     rep.eventSummary.totalEventsFailed = 0;
-    for(auto& s: streamSchedules_) {
+    for (auto& s : streamSchedules_) {
       s->getTriggerReport(rep);
     }
     sort_all(rep.workerSummaries);
   }
 
-  void
-  Schedule::getTriggerTimingReport(TriggerTimingReport& rep) const {
+  void Schedule::getTriggerTimingReport(TriggerTimingReport& rep) const {
     rep.eventSummary.totalEvents = 0;
     rep.eventSummary.cpuTime = 0.;
     rep.eventSummary.realTime = 0.;
     summaryTimeKeeper_->fillTriggerTimingReport(rep);
   }
 
-  int
-  Schedule::totalEvents() const {
+  int Schedule::totalEvents() const {
     int returnValue = 0;
-    for(auto& s: streamSchedules_) {
+    for (auto& s : streamSchedules_) {
       returnValue += s->totalEvents();
     }
     return returnValue;
   }
 
-  int
-  Schedule::totalEventsPassed() const {
+  int Schedule::totalEventsPassed() const {
     int returnValue = 0;
-    for(auto& s: streamSchedules_) {
+    for (auto& s : streamSchedules_) {
       returnValue += s->totalEventsPassed();
     }
     return returnValue;
   }
 
-  int
-  Schedule::totalEventsFailed() const {
+  int Schedule::totalEventsFailed() const {
     int returnValue = 0;
-    for(auto& s: streamSchedules_) {
+    for (auto& s : streamSchedules_) {
       returnValue += s->totalEventsFailed();
     }
     return returnValue;
   }
 
-
-  void
-  Schedule::clearCounters() {
-    for(auto& s: streamSchedules_) {
+  void Schedule::clearCounters() {
+    for (auto& s : streamSchedules_) {
       s->clearCounters();
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/ScheduleInfo.cc b/FWCore/Framework/src/ScheduleInfo.cc
index 11bfc38fd58fb..0a12b08102503 100644
--- a/FWCore/Framework/src/ScheduleInfo.cc
+++ b/FWCore/Framework/src/ScheduleInfo.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     ScheduleInfo
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -33,19 +33,14 @@ using namespace edm;
 //
 // constructors and destructor
 //
-ScheduleInfo::ScheduleInfo(const Schedule* iSchedule):
-schedule_(iSchedule)
-{
-}
+ScheduleInfo::ScheduleInfo(const Schedule* iSchedule) : schedule_(iSchedule) {}
 
 // ScheduleInfo::ScheduleInfo(const ScheduleInfo& rhs)
 // {
 //    // do actual copying here;
 // }
 
-ScheduleInfo::~ScheduleInfo()
-{
-}
+ScheduleInfo::~ScheduleInfo() {}
 
 //
 // assignment operators
@@ -66,46 +61,35 @@ ScheduleInfo::~ScheduleInfo()
 //
 // const member functions
 //
-void 
-ScheduleInfo::availableModuleLabels(std::vector<std::string>& oLabelsToFill) const
-{
-   using std::placeholders::_1;
-   std::vector<ModuleDescription const*> desc = schedule_->getAllModuleDescriptions();
-   
-   oLabelsToFill.reserve(oLabelsToFill.size()+desc.size());
-   std::transform(desc.begin(),desc.end(),
-                  std::back_inserter(oLabelsToFill),
-                  std::bind(&ModuleDescription::moduleLabel,_1));
+void ScheduleInfo::availableModuleLabels(std::vector<std::string>& oLabelsToFill) const {
+  using std::placeholders::_1;
+  std::vector<ModuleDescription const*> desc = schedule_->getAllModuleDescriptions();
+
+  oLabelsToFill.reserve(oLabelsToFill.size() + desc.size());
+  std::transform(
+      desc.begin(), desc.end(), std::back_inserter(oLabelsToFill), std::bind(&ModuleDescription::moduleLabel, _1));
 }
 
-const ParameterSet*
-ScheduleInfo::parametersForModule(const std::string& iLabel) const 
-{
-   using std::placeholders::_1;
-   std::vector<ModuleDescription const*> desc = schedule_->getAllModuleDescriptions();
-   
-   std::vector<ModuleDescription const*>::iterator itFound = std::find_if(desc.begin(),
-                                                                          desc.end(),
-                                                                          std::bind(std::equal_to<std::string>(),
-                                                                                      iLabel,
-                                                                                      std::bind(&ModuleDescription::moduleLabel,_1)));
-   if (itFound == desc.end()) {
-      return nullptr;
-   }
-   return pset::Registry::instance()->getMapped((*itFound)->parameterSetID());
+const ParameterSet* ScheduleInfo::parametersForModule(const std::string& iLabel) const {
+  using std::placeholders::_1;
+  std::vector<ModuleDescription const*> desc = schedule_->getAllModuleDescriptions();
+
+  std::vector<ModuleDescription const*>::iterator itFound =
+      std::find_if(desc.begin(),
+                   desc.end(),
+                   std::bind(std::equal_to<std::string>(), iLabel, std::bind(&ModuleDescription::moduleLabel, _1)));
+  if (itFound == desc.end()) {
+    return nullptr;
+  }
+  return pset::Registry::instance()->getMapped((*itFound)->parameterSetID());
 }
 
-void 
-ScheduleInfo::availablePaths(std::vector<std::string>& oLabelsToFill) const
-{
-   schedule_->availablePaths(oLabelsToFill);
+void ScheduleInfo::availablePaths(std::vector<std::string>& oLabelsToFill) const {
+  schedule_->availablePaths(oLabelsToFill);
 }
 
-void 
-ScheduleInfo::modulesInPath(const std::string& iPathLabel,
-                            std::vector<std::string>& oLabelsToFill) const
-{
-   schedule_->modulesInPath(iPathLabel, oLabelsToFill);
+void ScheduleInfo::modulesInPath(const std::string& iPathLabel, std::vector<std::string>& oLabelsToFill) const {
+  schedule_->modulesInPath(iPathLabel, oLabelsToFill);
 }
 
 //
diff --git a/FWCore/Framework/src/ScheduleItems.cc b/FWCore/Framework/src/ScheduleItems.cc
index 5f8731d666d0d..0d43a58809180 100644
--- a/FWCore/Framework/src/ScheduleItems.cc
+++ b/FWCore/Framework/src/ScheduleItems.cc
@@ -23,26 +23,24 @@
 #include <set>
 
 namespace edm {
-  ScheduleItems::ScheduleItems() :
-      actReg_(std::make_shared<ActivityRegistry>()),
-      preg_(std::make_shared<SignallingProductRegistry>()),
-      branchIDListHelper_(std::make_shared<BranchIDListHelper>()),
-      thinnedAssociationsHelper_(std::make_shared<ThinnedAssociationsHelper>()),
-      subProcessParentageHelper_(),
-      act_table_(),
-      processConfiguration_() {
-  }
-
-  ScheduleItems::ScheduleItems(ProductRegistry const& preg, SubProcess const& om) :
-      actReg_(std::make_shared<ActivityRegistry>()),
-      preg_(std::make_shared<SignallingProductRegistry>(preg)),
-      branchIDListHelper_(std::make_shared<BranchIDListHelper>()),
-      thinnedAssociationsHelper_(std::make_shared<ThinnedAssociationsHelper>()),
-      subProcessParentageHelper_(std::make_shared<SubProcessParentageHelper>()),
-      act_table_(),
-      processConfiguration_() {
-
-    for(auto& item : preg_->productListUpdator()) {
+  ScheduleItems::ScheduleItems()
+      : actReg_(std::make_shared<ActivityRegistry>()),
+        preg_(std::make_shared<SignallingProductRegistry>()),
+        branchIDListHelper_(std::make_shared<BranchIDListHelper>()),
+        thinnedAssociationsHelper_(std::make_shared<ThinnedAssociationsHelper>()),
+        subProcessParentageHelper_(),
+        act_table_(),
+        processConfiguration_() {}
+
+  ScheduleItems::ScheduleItems(ProductRegistry const& preg, SubProcess const& om)
+      : actReg_(std::make_shared<ActivityRegistry>()),
+        preg_(std::make_shared<SignallingProductRegistry>(preg)),
+        branchIDListHelper_(std::make_shared<BranchIDListHelper>()),
+        thinnedAssociationsHelper_(std::make_shared<ThinnedAssociationsHelper>()),
+        subProcessParentageHelper_(std::make_shared<SubProcessParentageHelper>()),
+        act_table_(),
+        processConfiguration_() {
+    for (auto& item : preg_->productListUpdator()) {
       BranchDescription& prod = item.second;
       prod.setOnDemand(false);
       prod.setProduced(false);
@@ -51,41 +49,39 @@ namespace edm {
     // Mark dropped branches as dropped in the product registry.
     std::set<BranchID> keptBranches;
     SelectedProducts const& keptVectorR = om.keptProducts()[InRun];
-    for(auto const& item : keptVectorR) {
+    for (auto const& item : keptVectorR) {
       BranchDescription const& desc = *item.first;
       keptBranches.insert(desc.branchID());
     }
     SelectedProducts const& keptVectorL = om.keptProducts()[InLumi];
-    for(auto const& item : keptVectorL) {
+    for (auto const& item : keptVectorL) {
       BranchDescription const& desc = *item.first;
       keptBranches.insert(desc.branchID());
     }
     SelectedProducts const& keptVectorE = om.keptProducts()[InEvent];
-    for(auto const& item : keptVectorE) {
+    for (auto const& item : keptVectorE) {
       BranchDescription const& desc = *item.first;
       keptBranches.insert(desc.branchID());
     }
-    for(auto& item : preg_->productListUpdator()) {
+    for (auto& item : preg_->productListUpdator()) {
       BranchDescription& prod = item.second;
-      if(keptBranches.find(prod.branchID()) == keptBranches.end()) {
+      if (keptBranches.find(prod.branchID()) == keptBranches.end()) {
         prod.setDropped(true);
       }
     }
   }
 
-  ServiceToken
-  ScheduleItems::initServices(std::vector<ParameterSet>& pServiceSets,
-                             ParameterSet& parameterSet,
-                             ServiceToken const& iToken,
-                             serviceregistry::ServiceLegacy iLegacy,
-                             bool associate) {
-
+  ServiceToken ScheduleItems::initServices(std::vector<ParameterSet>& pServiceSets,
+                                           ParameterSet& parameterSet,
+                                           ServiceToken const& iToken,
+                                           serviceregistry::ServiceLegacy iLegacy,
+                                           bool associate) {
     //create the services
     ServiceToken token(ServiceRegistry::createSet(pServiceSets, iToken, iLegacy, associate));
 
     //see if any of the Services have to have their PSets stored
-    for(auto const& item : pServiceSets) {
-      if(item.exists("@save_config")) {
+    for (auto const& item : pServiceSets) {
+      if (item.exists("@save_config")) {
         parameterSet.addParameter(item.getParameter<std::string>("@service_type"), item);
       }
     }
@@ -95,15 +91,11 @@ namespace edm {
     return token;
   }
 
-  ServiceToken
-  ScheduleItems::addCPRandTNS(ParameterSet const& parameterSet, ServiceToken const& token) {
-
+  ServiceToken ScheduleItems::addCPRandTNS(ParameterSet const& parameterSet, ServiceToken const& token) {
     //add the ProductRegistry as a service ONLY for the construction phase
     typedef serviceregistry::ServiceWrapper<ConstProductRegistry> w_CPR;
     auto reg = std::make_shared<w_CPR>(std::make_unique<ConstProductRegistry>(*preg_));
-    ServiceToken tempToken(ServiceRegistry::createContaining(reg,
-                                                             token,
-                                                             serviceregistry::kOverlapIsError));
+    ServiceToken tempToken(ServiceRegistry::createContaining(reg, token, serviceregistry::kOverlapIsError));
 
     // the next thing is ugly: pull out the trigger path pset and
     // create a service and extra token for it
@@ -113,48 +105,40 @@ namespace edm {
 
     auto tnsptr = std::make_shared<w_TNS>(std::make_unique<TNS>(parameterSet));
 
-    return ServiceRegistry::createContaining(tnsptr,
-                                             tempToken,
-                                             serviceregistry::kOverlapIsError);
+    return ServiceRegistry::createContaining(tnsptr, tempToken, serviceregistry::kOverlapIsError);
   }
 
-  std::shared_ptr<CommonParams>
-  ScheduleItems::initMisc(ParameterSet& parameterSet) {
+  std::shared_ptr<CommonParams> ScheduleItems::initMisc(ParameterSet& parameterSet) {
     act_table_.reset(new ExceptionToActionTable(parameterSet));
     std::string processName = parameterSet.getParameter<std::string>("@process_name");
-    processConfiguration_ = std::make_shared<ProcessConfiguration>(processName, getReleaseVersion(), getPassID()); // propagate_const<T> has no reset() function
+    processConfiguration_ = std::make_shared<ProcessConfiguration>(
+        processName, getReleaseVersion(), getPassID());  // propagate_const<T> has no reset() function
     auto common = std::make_shared<CommonParams>(
-                                parameterSet.getUntrackedParameterSet(
-                                   "maxEvents").getUntrackedParameter<int>("input"),
-                                parameterSet.getUntrackedParameterSet(
-                                   "maxLuminosityBlocks").getUntrackedParameter<int>("input"),
-                                parameterSet.getUntrackedParameterSet(
-                                   "maxSecondsUntilRampdown").getUntrackedParameter<int>("input"));
+        parameterSet.getUntrackedParameterSet("maxEvents").getUntrackedParameter<int>("input"),
+        parameterSet.getUntrackedParameterSet("maxLuminosityBlocks").getUntrackedParameter<int>("input"),
+        parameterSet.getUntrackedParameterSet("maxSecondsUntilRampdown").getUntrackedParameter<int>("input"));
     return common;
   }
 
-  std::unique_ptr<Schedule>
-  ScheduleItems::initSchedule(ParameterSet& parameterSet,
-                              bool hasSubprocesses,
-                              PreallocationConfiguration const& config,
-                              ProcessContext const* processContext) {
-    return std::make_unique<Schedule>(
-                     parameterSet,
-                     ServiceRegistry::instance().get<service::TriggerNamesService>(),
-                     *preg_,
-                     *branchIDListHelper_,
-                     *thinnedAssociationsHelper_,
-                     subProcessParentageHelper_ ? subProcessParentageHelper_.get() : nullptr,
-                     *act_table_,
-                     actReg_,
-                     processConfiguration(),
-                     hasSubprocesses,
-                     config,
-                     processContext);
+  std::unique_ptr<Schedule> ScheduleItems::initSchedule(ParameterSet& parameterSet,
+                                                        bool hasSubprocesses,
+                                                        PreallocationConfiguration const& config,
+                                                        ProcessContext const* processContext) {
+    return std::make_unique<Schedule>(parameterSet,
+                                      ServiceRegistry::instance().get<service::TriggerNamesService>(),
+                                      *preg_,
+                                      *branchIDListHelper_,
+                                      *thinnedAssociationsHelper_,
+                                      subProcessParentageHelper_ ? subProcessParentageHelper_.get() : nullptr,
+                                      *act_table_,
+                                      actReg_,
+                                      processConfiguration(),
+                                      hasSubprocesses,
+                                      config,
+                                      processContext);
   }
 
-  void
-  ScheduleItems::clear() {
+  void ScheduleItems::clear() {
     // propagate_const<T> has no reset() function
     actReg_ = nullptr;
     preg_ = nullptr;
@@ -162,4 +146,4 @@ namespace edm {
     thinnedAssociationsHelper_ = nullptr;
     processConfiguration_ = nullptr;
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/SharedResourcesRegistry.cc b/FWCore/Framework/src/SharedResourcesRegistry.cc
index cea8ccb71aafe..3d14598fb5937 100644
--- a/FWCore/Framework/src/SharedResourcesRegistry.cc
+++ b/FWCore/Framework/src/SharedResourcesRegistry.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     SharedResourcesRegistry
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -21,25 +21,21 @@
 namespace edm {
 
   const std::string SharedResourcesRegistry::kLegacyModuleResourceName{"__legacy__"};
-  
-  SharedResourcesRegistry*
-  SharedResourcesRegistry::instance() {
+
+  SharedResourcesRegistry* SharedResourcesRegistry::instance() {
     static SharedResourcesRegistry s_instance;
     return &s_instance;
   }
 
-  SharedResourcesRegistry::SharedResourcesRegistry() : nLegacy_(0) {
-  }
-
-  void
-  SharedResourcesRegistry::registerSharedResource(const std::string& resourceName){
+  SharedResourcesRegistry::SharedResourcesRegistry() : nLegacy_(0) {}
 
+  void SharedResourcesRegistry::registerSharedResource(const std::string& resourceName) {
     auto& queueAndCounter = resourceMap_[resourceName];
 
-    if(resourceName == kLegacyModuleResourceName) {
+    if (resourceName == kLegacyModuleResourceName) {
       ++nLegacy_;
-      for(auto & resource : resourceMap_) {
-        if(!resource.second.first) {
+      for (auto& resource : resourceMap_) {
+        if (!resource.second.first) {
           resource.second.first = std::make_shared<SerialTaskQueue>();
         }
         ++resource.second.second;
@@ -49,16 +45,16 @@ namespace edm {
       ++queueAndCounter.second;
 
       // When first registering a nonlegacy resource, we have to
-      // account for any legacy resource registrations already made. 
-      if(queueAndCounter.second == 1) {
-        if(nLegacy_ > 0U) {
+      // account for any legacy resource registrations already made.
+      if (queueAndCounter.second == 1) {
+        if (nLegacy_ > 0U) {
           queueAndCounter.first = std::make_shared<SerialTaskQueue>();
           queueAndCounter.second += nLegacy_;
         }
-      // If registering a nonlegacy resource the second time and
-      // the legacy resource has not been registered yet,
-      // we know we will need the queue so go ahead and create it.
-      } else if(queueAndCounter.second == 2) {
+        // If registering a nonlegacy resource the second time and
+        // the legacy resource has not been registered yet,
+        // we know we will need the queue so go ahead and create it.
+      } else if (queueAndCounter.second == 2) {
         queueAndCounter.first = std::make_shared<SerialTaskQueue>();
       }
     }
@@ -66,18 +62,17 @@ namespace edm {
 
   std::pair<SharedResourcesAcquirer, std::shared_ptr<std::recursive_mutex>>
   SharedResourcesRegistry::createAcquirerForSourceDelayedReader() {
-    if(not resourceForDelayedReader_) {
-      resourceForDelayedReader_ = std::make_shared<std::recursive_mutex>(); // propagate_const<T> has no reset() function
+    if (not resourceForDelayedReader_) {
+      resourceForDelayedReader_ =
+          std::make_shared<std::recursive_mutex>();  // propagate_const<T> has no reset() function
       queueForDelayedReader_ = std::make_shared<SerialTaskQueue>();
     }
 
     std::vector<std::shared_ptr<SerialTaskQueue>> queues = {get_underlying(queueForDelayedReader_)};
-    return std::make_pair(SharedResourcesAcquirer(std::move(queues)),get_underlying(resourceForDelayedReader_));
+    return std::make_pair(SharedResourcesAcquirer(std::move(queues)), get_underlying(resourceForDelayedReader_));
   }
-  
-  SharedResourcesAcquirer
-  SharedResourcesRegistry::createAcquirer(std::vector<std::string> const& resourceNames) const {
 
+  SharedResourcesAcquirer SharedResourcesRegistry::createAcquirer(std::vector<std::string> const& resourceNames) const {
     // The acquirer will acquire the shared resources declared by a module
     // so that only it can use those resources while it runs. The other
     // modules using the same resource will not be run until the module
@@ -94,41 +89,43 @@ namespace edm {
     std::map<std::pair<unsigned int, std::string>, std::shared_ptr<SerialTaskQueue>> sortedResources;
 
     // Is this acquirer for a module that depends on the legacy shared resource?
-    if(std::find(resourceNames.begin(), resourceNames.end(), kLegacyModuleResourceName) != resourceNames.end()) {
-
-      for(auto const& resource : resourceMap_) {
+    if (std::find(resourceNames.begin(), resourceNames.end(), kLegacyModuleResourceName) != resourceNames.end()) {
+      for (auto const& resource : resourceMap_) {
         // It's redundant to declare legacy if the legacy modules
         // all declare all the other resources, so just skip it.
         // But if the only shared resource is the legacy resource don't skip it.
-        if(resource.first == kLegacyModuleResourceName && resourceMap_.size() > 1) continue;
+        if (resource.first == kLegacyModuleResourceName && resourceMap_.size() > 1)
+          continue;
         //If only one module wants it, it really isn't shared
-        if(resource.second.second > 1) {
-          sortedResources.insert(std::make_pair(std::make_pair(resource.second.second, resource.first),resource.second.first));
+        if (resource.second.second > 1) {
+          sortedResources.insert(
+              std::make_pair(std::make_pair(resource.second.second, resource.first), resource.second.first));
         }
       }
-    // Handle cases where the module does not declare the legacy resource
+      // Handle cases where the module does not declare the legacy resource
     } else {
-      for(auto const& name : resourceNames) {
+      for (auto const& name : resourceNames) {
         auto resource = resourceMap_.find(name);
         assert(resource != resourceMap_.end());
         //If only one module wants it, it really isn't shared
-        if(resource->second.second > 1) {
-          sortedResources.insert(std::make_pair(std::make_pair(resource->second.second, resource->first),resource->second.first));
+        if (resource->second.second > 1) {
+          sortedResources.insert(
+              std::make_pair(std::make_pair(resource->second.second, resource->first), resource->second.first));
         }
       }
     }
 
     std::vector<std::shared_ptr<SerialTaskQueue>> queues;
     queues.reserve(sortedResources.size());
-    for(auto const& resource: sortedResources) {
+    for (auto const& resource : sortedResources) {
       queues.push_back(resource.second);
     }
-    if(queues.empty()) {
+    if (queues.empty()) {
       //Calling code is depending on there being at least one shared queue
       queues.reserve(1);
       queues.push_back(std::make_shared<SerialTaskQueue>());
     }
-    
+
     return SharedResourcesAcquirer(std::move(queues));
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/SharedResourcesRegistry.h b/FWCore/Framework/src/SharedResourcesRegistry.h
index 9b04012fd5f35..cd2c24c7618b6 100644
--- a/FWCore/Framework/src/SharedResourcesRegistry.h
+++ b/FWCore/Framework/src/SharedResourcesRegistry.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     SharedResourcesRegistry
-// 
+//
 /**\class SharedResourcesRegistry SharedResourcesRegistry.h "SharedResourcesRegistry.h"
 
  Description: Manages the Acquirers used to take temporary control of a resource shared between modules
@@ -35,51 +35,51 @@ class testSharedResourcesRegistry;
 
 namespace edm {
   class SharedResourcesAcquirer;
-  
-  class SharedResourcesRegistry
-  {
-    
+
+  class SharedResourcesRegistry {
   public:
     //needed for testing
     friend class ::testSharedResourcesRegistry;
-    
+
     // ---------- const member functions ---------------------
     SharedResourcesAcquirer createAcquirer(std::vector<std::string> const&) const;
-    
+
     std::pair<SharedResourcesAcquirer, std::shared_ptr<std::recursive_mutex>> createAcquirerForSourceDelayedReader();
-    
+
     // ---------- static member functions --------------------
     static SharedResourcesRegistry* instance();
-    
+
     ///All legacy modules share this resource
     static const std::string kLegacyModuleResourceName;
-    
+
     // ---------- member functions ---------------------------
     ///A resource name must be registered before it can be used in the createAcquirer call
     void registerSharedResource(const std::string&);
 
 #ifdef SHAREDRESOURCETESTACCESSORS
     // The next function is intended to be used only in a unit test
-    std::map<std::string, std::pair<std::shared_ptr<SerialTaskQueue>,unsigned int>> const& resourceMap() const { return resourceMap_; }
+    std::map<std::string, std::pair<std::shared_ptr<SerialTaskQueue>, unsigned int>> const& resourceMap() const {
+      return resourceMap_;
+    }
 #endif
 
   private:
     SharedResourcesRegistry();
-    ~SharedResourcesRegistry()=default;
+    ~SharedResourcesRegistry() = default;
+
+    SharedResourcesRegistry(const SharedResourcesRegistry&) = delete;  // stop default
+
+    const SharedResourcesRegistry& operator=(const SharedResourcesRegistry&) = delete;  // stop default
 
-    SharedResourcesRegistry(const SharedResourcesRegistry&) = delete; // stop default
-    
-    const SharedResourcesRegistry& operator=(const SharedResourcesRegistry&) = delete; // stop default
-    
     // ---------- member data --------------------------------
-    std::map<std::string, std::pair<std::shared_ptr<SerialTaskQueue>,unsigned int>> resourceMap_;
-    
+    std::map<std::string, std::pair<std::shared_ptr<SerialTaskQueue>, unsigned int>> resourceMap_;
+
     edm::propagate_const<std::shared_ptr<std::recursive_mutex>> resourceForDelayedReader_;
-    
+
     edm::propagate_const<std::shared_ptr<SerialTaskQueue>> queueForDelayedReader_;
 
     unsigned int nLegacy_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/SignallingProductRegistry.cc b/FWCore/Framework/src/SignallingProductRegistry.cc
index e7f9d1d4de09b..acf2c13b29f89 100644
--- a/FWCore/Framework/src/SignallingProductRegistry.cc
+++ b/FWCore/Framework/src/SignallingProductRegistry.cc
@@ -21,40 +21,37 @@ using namespace edm;
 // member functions
 //
 namespace {
-   struct StackGuard {
-      StackGuard(std::string const& iTypeName, std::map<std::string, unsigned int>& ioStack, bool iFromListener) :
-          numType_(++ioStack[iTypeName]), itr_(ioStack.find(iTypeName)), fromListener_(iFromListener) {
-        if(iFromListener) {++(itr_->second);}
+  struct StackGuard {
+    StackGuard(std::string const& iTypeName, std::map<std::string, unsigned int>& ioStack, bool iFromListener)
+        : numType_(++ioStack[iTypeName]), itr_(ioStack.find(iTypeName)), fromListener_(iFromListener) {
+      if (iFromListener) {
+        ++(itr_->second);
       }
+    }
 
-      ~StackGuard() {
-         --(itr_->second);
-         if(fromListener_) {
-            --(itr_->second);
-         }
+    ~StackGuard() {
+      --(itr_->second);
+      if (fromListener_) {
+        --(itr_->second);
       }
+    }
 
-      unsigned int numType_;
-      std::map<std::string, unsigned int>::iterator itr_;
-      bool fromListener_;
-   };
-}
+    unsigned int numType_;
+    std::map<std::string, unsigned int>::iterator itr_;
+    bool fromListener_;
+  };
+}  // namespace
 
 void SignallingProductRegistry::addCalled(BranchDescription const& iProd, bool iFromListener) {
-   StackGuard guard(iProd.className(), typeAddedStack_, iFromListener);
-   if(guard.numType_ > 2) {
-     throw cms::Exception("CircularReference")
-       << "Attempted to register the production of "
-       << iProd.className()
-       << " from module "
-       << iProd.moduleLabel()
-       << " with product instance \""
-       << iProd.productInstanceName()
-       << "\"\n"
-       << "However, this was in reaction to a registration of a production for the same type \n"
-       << "from another module who was also listening to product registrations.\n"
-       << "This can lead to circular Event::get* calls.\n"
-       << "Please reconfigure job so it does not contain both of the modules.";
-   }
-   productAddedSignal_(iProd);
+  StackGuard guard(iProd.className(), typeAddedStack_, iFromListener);
+  if (guard.numType_ > 2) {
+    throw cms::Exception("CircularReference")
+        << "Attempted to register the production of " << iProd.className() << " from module " << iProd.moduleLabel()
+        << " with product instance \"" << iProd.productInstanceName() << "\"\n"
+        << "However, this was in reaction to a registration of a production for the same type \n"
+        << "from another module who was also listening to product registrations.\n"
+        << "This can lead to circular Event::get* calls.\n"
+        << "Please reconfigure job so it does not contain both of the modules.";
+  }
+  productAddedSignal_(iProd);
 }
diff --git a/FWCore/Framework/src/SignallingProductRegistry.h b/FWCore/Framework/src/SignallingProductRegistry.h
index 8ea52897e2105..46e65cf31b655 100644
--- a/FWCore/Framework/src/SignallingProductRegistry.h
+++ b/FWCore/Framework/src/SignallingProductRegistry.h
@@ -29,21 +29,21 @@
 
 // forward declarations
 namespace edm {
-   class SignallingProductRegistry : public ProductRegistry {
-
-   public:
-      SignallingProductRegistry() : ProductRegistry(), productAddedSignal_(), typeAddedStack_() {}
-      explicit SignallingProductRegistry(ProductRegistry const& preg) : ProductRegistry(preg.productList(), false), productAddedSignal_(), typeAddedStack_() {}
-      signalslot::Signal<void(BranchDescription const&)> productAddedSignal_;
-
-      SignallingProductRegistry(SignallingProductRegistry const&) = delete; // Disallow copying and moving
-      SignallingProductRegistry& operator=(SignallingProductRegistry const&) = delete; // Disallow copying and moving
-
-   private:
-      void addCalled(BranchDescription const&, bool) override;
-      // ---------- member data --------------------------------
-      std::map<std::string, unsigned int> typeAddedStack_;
-   };
-}
+  class SignallingProductRegistry : public ProductRegistry {
+  public:
+    SignallingProductRegistry() : ProductRegistry(), productAddedSignal_(), typeAddedStack_() {}
+    explicit SignallingProductRegistry(ProductRegistry const& preg)
+        : ProductRegistry(preg.productList(), false), productAddedSignal_(), typeAddedStack_() {}
+    signalslot::Signal<void(BranchDescription const&)> productAddedSignal_;
+
+    SignallingProductRegistry(SignallingProductRegistry const&) = delete;             // Disallow copying and moving
+    SignallingProductRegistry& operator=(SignallingProductRegistry const&) = delete;  // Disallow copying and moving
+
+  private:
+    void addCalled(BranchDescription const&, bool) override;
+    // ---------- member data --------------------------------
+    std::map<std::string, unsigned int> typeAddedStack_;
+  };
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/SourceFactory.cc b/FWCore/Framework/src/SourceFactory.cc
index 12c2f10f07b5f..81b8c93e782e8 100644
--- a/FWCore/Framework/src/SourceFactory.cc
+++ b/FWCore/Framework/src/SourceFactory.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     SourceFactory
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -23,38 +23,35 @@
 // static member functions
 //
 namespace edm {
-   namespace eventsetup {
-
-      std::string SourceMakerTraits::name() { return "CMS EDM Framework ESSource"; }
-
-      void 
-      SourceMakerTraits::replaceExisting(EventSetupProvider&, std::shared_ptr<EventSetupRecordIntervalFinder> ) {
-         throw edm::Exception(edm::errors::LogicError)
-            << "SourceMakerTraits::replaceExisting\n"
-            << "This function is not implemented and should never be called.\n"
-            << "Please report this to a Framework Developer\n";
-      }
-
-      std::shared_ptr<SourceMakerTraits::base_type>
-      SourceMakerTraits::getComponentAndRegisterProcess(EventSetupsController& esController,
-                                                        ParameterSet const& iConfiguration) {
-         return esController.getESSourceAndRegisterProcess(iConfiguration, esController.indexOfNextProcess());
-      }
-
-      void SourceMakerTraits::putComponent(EventSetupsController& esController,
-                                           ParameterSet const& iConfiguration,
-                                           std::shared_ptr<base_type> const& component) {
-         esController.putESSource(iConfiguration, component, esController.indexOfNextProcess());
-      }
-
-      void SourceMakerTraits::logInfoWhenSharing(ParameterSet const& iConfiguration) {
-
-         std::string edmtype = iConfiguration.getParameter<std::string>("@module_edm_type");
-         std::string modtype = iConfiguration.getParameter<std::string>("@module_type");
-         std::string label = iConfiguration.getParameter<std::string>("@module_label");
-         edm::LogVerbatim("EventSetupSharing") << "Sharing " << edmtype << ": class=" << modtype << " label='" << label << "'";
-      }
-   }
-}
+  namespace eventsetup {
+
+    std::string SourceMakerTraits::name() { return "CMS EDM Framework ESSource"; }
+
+    void SourceMakerTraits::replaceExisting(EventSetupProvider&, std::shared_ptr<EventSetupRecordIntervalFinder>) {
+      throw edm::Exception(edm::errors::LogicError) << "SourceMakerTraits::replaceExisting\n"
+                                                    << "This function is not implemented and should never be called.\n"
+                                                    << "Please report this to a Framework Developer\n";
+    }
+
+    std::shared_ptr<SourceMakerTraits::base_type> SourceMakerTraits::getComponentAndRegisterProcess(
+        EventSetupsController& esController, ParameterSet const& iConfiguration) {
+      return esController.getESSourceAndRegisterProcess(iConfiguration, esController.indexOfNextProcess());
+    }
+
+    void SourceMakerTraits::putComponent(EventSetupsController& esController,
+                                         ParameterSet const& iConfiguration,
+                                         std::shared_ptr<base_type> const& component) {
+      esController.putESSource(iConfiguration, component, esController.indexOfNextProcess());
+    }
+
+    void SourceMakerTraits::logInfoWhenSharing(ParameterSet const& iConfiguration) {
+      std::string edmtype = iConfiguration.getParameter<std::string>("@module_edm_type");
+      std::string modtype = iConfiguration.getParameter<std::string>("@module_type");
+      std::string label = iConfiguration.getParameter<std::string>("@module_label");
+      edm::LogVerbatim("EventSetupSharing")
+          << "Sharing " << edmtype << ": class=" << modtype << " label='" << label << "'";
+    }
+  }  // namespace eventsetup
+}  // namespace edm
 
 COMPONENTFACTORY_GET(edm::eventsetup::SourceMakerTraits);
diff --git a/FWCore/Framework/src/StreamSchedule.cc b/FWCore/Framework/src/StreamSchedule.cc
index 8cb503384a10f..a2e32ec92c430 100644
--- a/FWCore/Framework/src/StreamSchedule.cc
+++ b/FWCore/Framework/src/StreamSchedule.cc
@@ -45,10 +45,9 @@ namespace edm {
     // should take a const_reference to the 'input', and write to a
     // reference to the 'output'.
     template <typename InputIterator, typename ForwardIterator, typename Func>
-    void
-    transform_into(InputIterator begin, InputIterator end,
-                   ForwardIterator out, Func func) {
-      for (; begin != end; ++begin, ++out) func(*begin, *out);
+    void transform_into(InputIterator begin, InputIterator end, ForwardIterator out, Func func) {
+      for (; begin != end; ++begin, ++out)
+        func(*begin, *out);
     }
 
     // Function template that takes a sequence 'from', a sequence
@@ -57,9 +56,8 @@ namespace edm {
     // calcuated by the callable object, taking care to fill the
     // outupt only if all calls succeed.
     template <typename FROM, typename TO, typename FUNC>
-    void
-    fill_summary(FROM const& from, TO& to, FUNC func) {
-      if(to.size()!=from.size()) {
+    void fill_summary(FROM const& from, TO& to, FUNC func) {
+      if (to.size() != from.size()) {
         TO temp(from.size());
         transform_into(from.begin(), from.end(), temp.begin(), func);
         to.swap(temp);
@@ -73,60 +71,62 @@ namespace edm {
     // Here we make the trigger results inserter directly.  This should
     // probably be a utility in the WorkerRegistry or elsewhere.
 
-    StreamSchedule::WorkerPtr
-    makeInserter(ExceptionToActionTable const& actions,
-                 std::shared_ptr<ActivityRegistry> areg,
-                 std::shared_ptr<TriggerResultInserter> inserter) {
-      StreamSchedule::WorkerPtr ptr(new edm::WorkerT<TriggerResultInserter::ModuleType>(inserter, inserter->moduleDescription(), &actions));
+    StreamSchedule::WorkerPtr makeInserter(ExceptionToActionTable const& actions,
+                                           std::shared_ptr<ActivityRegistry> areg,
+                                           std::shared_ptr<TriggerResultInserter> inserter) {
+      StreamSchedule::WorkerPtr ptr(
+          new edm::WorkerT<TriggerResultInserter::ModuleType>(inserter, inserter->moduleDescription(), &actions));
       ptr->setActivityRegistry(areg);
       return ptr;
     }
 
-    void
-    initializeBranchToReadingWorker(ParameterSet const& opts,
-                                    ProductRegistry const& preg,
-                                    std::multimap<std::string,Worker*>& branchToReadingWorker)
-    {
+    void initializeBranchToReadingWorker(ParameterSet const& opts,
+                                         ProductRegistry const& preg,
+                                         std::multimap<std::string, Worker*>& branchToReadingWorker) {
       // See if any data has been marked to be deleted early (removing any duplicates)
       auto vBranchesToDeleteEarly = opts.getUntrackedParameter<std::vector<std::string>>("canDeleteEarly");
-      if(not vBranchesToDeleteEarly.empty()) {
-        std::sort(vBranchesToDeleteEarly.begin(),vBranchesToDeleteEarly.end(),std::less<std::string>());
-        vBranchesToDeleteEarly.erase(std::unique(vBranchesToDeleteEarly.begin(),vBranchesToDeleteEarly.end()),
+      if (not vBranchesToDeleteEarly.empty()) {
+        std::sort(vBranchesToDeleteEarly.begin(), vBranchesToDeleteEarly.end(), std::less<std::string>());
+        vBranchesToDeleteEarly.erase(std::unique(vBranchesToDeleteEarly.begin(), vBranchesToDeleteEarly.end()),
                                      vBranchesToDeleteEarly.end());
-        
+
         // Are the requested items in the product registry?
         auto allBranchNames = preg.allBranchNames();
         //the branch names all end with a period, which we do not want to compare with
-        for(auto & b:allBranchNames) {
-          b.resize(b.size()-1);
+        for (auto& b : allBranchNames) {
+          b.resize(b.size() - 1);
         }
-        std::sort(allBranchNames.begin(),allBranchNames.end(),std::less<std::string>());
+        std::sort(allBranchNames.begin(), allBranchNames.end(), std::less<std::string>());
         std::vector<std::string> temp;
-        temp.reserve(vBranchesToDeleteEarly.size());  
-        
-        std::set_intersection(vBranchesToDeleteEarly.begin(),vBranchesToDeleteEarly.end(),
-                              allBranchNames.begin(),allBranchNames.end(),
+        temp.reserve(vBranchesToDeleteEarly.size());
+
+        std::set_intersection(vBranchesToDeleteEarly.begin(),
+                              vBranchesToDeleteEarly.end(),
+                              allBranchNames.begin(),
+                              allBranchNames.end(),
                               std::back_inserter(temp));
         vBranchesToDeleteEarly.swap(temp);
-        if(temp.size() != vBranchesToDeleteEarly.size()) {
+        if (temp.size() != vBranchesToDeleteEarly.size()) {
           std::vector<std::string> missingProducts;
-          std::set_difference(temp.begin(),temp.end(),
-                              vBranchesToDeleteEarly.begin(),vBranchesToDeleteEarly.end(),
+          std::set_difference(temp.begin(),
+                              temp.end(),
+                              vBranchesToDeleteEarly.begin(),
+                              vBranchesToDeleteEarly.end(),
                               std::back_inserter(missingProducts));
           LogInfo l("MissingProductsForCanDeleteEarly");
-          l<<"The following products in the 'canDeleteEarly' list are not available in this job and will be ignored.";
-          for(auto const& n:missingProducts){
-            l<<"\n "<<n;
+          l << "The following products in the 'canDeleteEarly' list are not available in this job and will be ignored.";
+          for (auto const& n : missingProducts) {
+            l << "\n " << n;
           }
         }
         //set placeholder for the branch, we will remove the nullptr if a
         // module actually wants the branch.
-        for(auto const& branch:vBranchesToDeleteEarly) {
+        for (auto const& branch : vBranchesToDeleteEarly) {
           branchToReadingWorker.insert(std::make_pair(branch, static_cast<Worker*>(nullptr)));
         }
       }
     }
-  }
+  }  // namespace
 
   // -----------------------------
 
@@ -134,35 +134,35 @@ namespace edm {
 
   // -----------------------------
 
-  StreamSchedule::StreamSchedule(std::shared_ptr<TriggerResultInserter> inserter,
-                                 std::vector<edm::propagate_const<std::shared_ptr<PathStatusInserter>>>& pathStatusInserters,
-                                 std::vector<edm::propagate_const<std::shared_ptr<EndPathStatusInserter>>>& endPathStatusInserters,
-                                 std::shared_ptr<ModuleRegistry> modReg,
-                                 ParameterSet& proc_pset,
-                                 service::TriggerNamesService const& tns,
-                                 PreallocationConfiguration const& prealloc,
-                                 ProductRegistry& preg,
-                                 BranchIDListHelper& branchIDListHelper,
-                                 ExceptionToActionTable const& actions,
-                                 std::shared_ptr<ActivityRegistry> areg,
-                                 std::shared_ptr<ProcessConfiguration> processConfiguration,
-                                 bool allowEarlyDelete,
-                                 StreamID streamID,
-                                 ProcessContext const* processContext) :
-    workerManager_(modReg,areg, actions),
-    actReg_(areg),
-    results_(new HLTGlobalStatus(tns.getTrigPaths().size())),
-    results_inserter_(),
-    trig_paths_(),
-    end_paths_(),
-    total_events_(),
-    total_passed_(),
-    number_of_unscheduled_modules_(0),
-    streamID_(streamID),
-    streamContext_(streamID_, processContext),
-    endpathsAreActive_(true),
-    skippingEvent_(false){
-
+  StreamSchedule::StreamSchedule(
+      std::shared_ptr<TriggerResultInserter> inserter,
+      std::vector<edm::propagate_const<std::shared_ptr<PathStatusInserter>>>& pathStatusInserters,
+      std::vector<edm::propagate_const<std::shared_ptr<EndPathStatusInserter>>>& endPathStatusInserters,
+      std::shared_ptr<ModuleRegistry> modReg,
+      ParameterSet& proc_pset,
+      service::TriggerNamesService const& tns,
+      PreallocationConfiguration const& prealloc,
+      ProductRegistry& preg,
+      BranchIDListHelper& branchIDListHelper,
+      ExceptionToActionTable const& actions,
+      std::shared_ptr<ActivityRegistry> areg,
+      std::shared_ptr<ProcessConfiguration> processConfiguration,
+      bool allowEarlyDelete,
+      StreamID streamID,
+      ProcessContext const* processContext)
+      : workerManager_(modReg, areg, actions),
+        actReg_(areg),
+        results_(new HLTGlobalStatus(tns.getTrigPaths().size())),
+        results_inserter_(),
+        trig_paths_(),
+        end_paths_(),
+        total_events_(),
+        total_passed_(),
+        number_of_unscheduled_modules_(0),
+        streamID_(streamID),
+        streamContext_(streamID_, processContext),
+        endpathsAreActive_(true),
+        skippingEvent_(false) {
     ParameterSet const& opts = proc_pset.getUntrackedParameterSet("options", ParameterSet());
     bool hasPath = false;
     std::vector<std::string> const& pathNames = tns.getTrigPaths();
@@ -199,14 +199,16 @@ namespace edm {
     for (auto const& worker : allWorkers()) {
       usedWorkerLabels.insert(worker->description().moduleLabel());
     }
-    std::vector<std::string> modulesInConfig(proc_pset.getParameter<std::vector<std::string> >("@all_modules"));
+    std::vector<std::string> modulesInConfig(proc_pset.getParameter<std::vector<std::string>>("@all_modules"));
     std::set<std::string> modulesInConfigSet(modulesInConfig.begin(), modulesInConfig.end());
     std::vector<std::string> unusedLabels;
-    set_difference(modulesInConfigSet.begin(), modulesInConfigSet.end(),
-                   usedWorkerLabels.begin(), usedWorkerLabels.end(),
+    set_difference(modulesInConfigSet.begin(),
+                   modulesInConfigSet.end(),
+                   usedWorkerLabels.begin(),
+                   usedWorkerLabels.end(),
                    back_inserter(unusedLabels));
     std::set<std::string> unscheduledLabels;
-    std::vector<std::string>  shouldBeUsedLabels;
+    std::vector<std::string> shouldBeUsedLabels;
     if (!unusedLabels.empty()) {
       //Need to
       // 1) create worker
@@ -217,93 +219,92 @@ namespace edm {
         ParameterSet* modulePSet(proc_pset.getPSetForUpdate(label, isTracked));
         assert(isTracked);
         assert(modulePSet != nullptr);
-        workerManager_.addToUnscheduledWorkers(*modulePSet, preg, &prealloc, processConfiguration, label, unscheduledLabels, shouldBeUsedLabels);
+        workerManager_.addToUnscheduledWorkers(
+            *modulePSet, preg, &prealloc, processConfiguration, label, unscheduledLabels, shouldBeUsedLabels);
       }
       if (!shouldBeUsedLabels.empty()) {
         std::ostringstream unusedStream;
         unusedStream << "'" << shouldBeUsedLabels.front() << "'";
         for (std::vector<std::string>::iterator itLabel = shouldBeUsedLabels.begin() + 1,
-              itLabelEnd = shouldBeUsedLabels.end();
-            itLabel != itLabelEnd;
-            ++itLabel) {
+                                                itLabelEnd = shouldBeUsedLabels.end();
+             itLabel != itLabelEnd;
+             ++itLabel) {
           unusedStream << ",'" << *itLabel << "'";
         }
-        LogInfo("path")
-          << "The following module labels are not assigned to any path:\n"
-          << unusedStream.str()
-          << "\n";
+        LogInfo("path") << "The following module labels are not assigned to any path:\n" << unusedStream.str() << "\n";
       }
     }
     number_of_unscheduled_modules_ = unscheduledLabels.size();
 
-    initializeEarlyDelete(*modReg, opts,preg,allowEarlyDelete);
-    
-  } // StreamSchedule::StreamSchedule
+    initializeEarlyDelete(*modReg, opts, preg, allowEarlyDelete);
+
+  }  // StreamSchedule::StreamSchedule
 
-  
-  void StreamSchedule::initializeEarlyDelete(ModuleRegistry & modReg,
-                                             edm::ParameterSet const& opts, edm::ProductRegistry const& preg,
-                                       bool allowEarlyDelete) {
+  void StreamSchedule::initializeEarlyDelete(ModuleRegistry& modReg,
+                                             edm::ParameterSet const& opts,
+                                             edm::ProductRegistry const& preg,
+                                             bool allowEarlyDelete) {
     //for now, if have a subProcess, don't allow early delete
     // In the future we should use the SubProcess's 'keep list' to decide what can be kept
-    if(not allowEarlyDelete)  return;
+    if (not allowEarlyDelete)
+      return;
 
     //see if 'canDeleteEarly' was set and if so setup the list with those products actually
     // registered for this job
-    std::multimap<std::string,Worker*> branchToReadingWorker;
-    initializeBranchToReadingWorker(opts,preg,branchToReadingWorker);
-    
+    std::multimap<std::string, Worker*> branchToReadingWorker;
+    initializeBranchToReadingWorker(opts, preg, branchToReadingWorker);
+
     //If no delete early items have been specified we don't have to do anything
-    if(branchToReadingWorker.empty()) {
+    if (branchToReadingWorker.empty()) {
       return;
     }
     const std::vector<std::string> kEmpty;
-    std::map<Worker*,unsigned int> reserveSizeForWorker;
-    unsigned int upperLimitOnReadingWorker =0;
+    std::map<Worker*, unsigned int> reserveSizeForWorker;
+    unsigned int upperLimitOnReadingWorker = 0;
     unsigned int upperLimitOnIndicies = 0;
-    unsigned int nUniqueBranchesToDelete=branchToReadingWorker.size();
-    
+    unsigned int nUniqueBranchesToDelete = branchToReadingWorker.size();
+
     //talk with output modules first
-    modReg.forAllModuleHolders([&branchToReadingWorker,&nUniqueBranchesToDelete](maker::ModuleHolder* iHolder){
+    modReg.forAllModuleHolders([&branchToReadingWorker, &nUniqueBranchesToDelete](maker::ModuleHolder* iHolder) {
       auto comm = iHolder->createOutputModuleCommunicator();
       if (comm) {
-        if(!branchToReadingWorker.empty()) {
+        if (!branchToReadingWorker.empty()) {
           //If an OutputModule needs a product, we can't delete it early
           // so we should remove it from our list
           SelectedProductsForBranchType const& kept = comm->keptProducts();
-          for(auto const& item: kept[InEvent]) {
+          for (auto const& item : kept[InEvent]) {
             BranchDescription const& desc = *item.first;
             auto found = branchToReadingWorker.equal_range(desc.branchName());
-            if(found.first !=found.second) {
+            if (found.first != found.second) {
               --nUniqueBranchesToDelete;
-              branchToReadingWorker.erase(found.first,found.second);
+              branchToReadingWorker.erase(found.first, found.second);
             }
           }
         }
       }
     });
-    
-    if(branchToReadingWorker.empty()) {
+
+    if (branchToReadingWorker.empty()) {
       return;
     }
-    
-    for (auto w :allWorkers()) {
+
+    for (auto w : allWorkers()) {
       //determine if this module could read a branch we want to delete early
       auto pset = pset::Registry::instance()->getMapped(w->description().parameterSetID());
-      if(nullptr!=pset) {
-        auto branches = pset->getUntrackedParameter<std::vector<std::string>>("mightGet",kEmpty);
-        if(not branches.empty()) {
+      if (nullptr != pset) {
+        auto branches = pset->getUntrackedParameter<std::vector<std::string>>("mightGet", kEmpty);
+        if (not branches.empty()) {
           ++upperLimitOnReadingWorker;
         }
-        for(auto const& branch:branches){
+        for (auto const& branch : branches) {
           auto found = branchToReadingWorker.equal_range(branch);
-          if(found.first != found.second) {
+          if (found.first != found.second) {
             ++upperLimitOnIndicies;
             ++reserveSizeForWorker[w];
-            if(nullptr == found.first->second) {
+            if (nullptr == found.first->second) {
               found.first->second = w;
             } else {
-              branchToReadingWorker.insert(make_pair(found.first->first,w));
+              branchToReadingWorker.insert(make_pair(found.first->first, w));
             }
           }
         }
@@ -312,8 +313,8 @@ namespace edm {
     {
       auto it = branchToReadingWorker.begin();
       std::vector<std::string> unusedBranches;
-      while(it !=branchToReadingWorker.end()) {
-        if(it->second == nullptr) {
+      while (it != branchToReadingWorker.end()) {
+        if (it->second == nullptr) {
           unusedBranches.push_back(it->first);
           //erasing the object invalidates the iterator so must advance it first
           auto temp = it;
@@ -323,74 +324,72 @@ namespace edm {
           ++it;
         }
       }
-      if(not unusedBranches.empty()) {
+      if (not unusedBranches.empty()) {
         LogWarning l("UnusedProductsForCanDeleteEarly");
-        l<<"The following products in the 'canDeleteEarly' list are not used in this job and will be ignored.\n"
-        " If possible, remove the producer from the job or add the product to the producer's own 'mightGet' list.";
-        for(auto const& n:unusedBranches){
-          l<<"\n "<<n;
+        l << "The following products in the 'canDeleteEarly' list are not used in this job and will be ignored.\n"
+             " If possible, remove the producer from the job or add the product to the producer's own 'mightGet' list.";
+        for (auto const& n : unusedBranches) {
+          l << "\n " << n;
         }
       }
-    }  
-    if(!branchToReadingWorker.empty()) {
+    }
+    if (!branchToReadingWorker.empty()) {
       earlyDeleteHelpers_.reserve(upperLimitOnReadingWorker);
-      earlyDeleteHelperToBranchIndicies_.resize(upperLimitOnIndicies,0);
+      earlyDeleteHelperToBranchIndicies_.resize(upperLimitOnIndicies, 0);
       earlyDeleteBranchToCount_.reserve(nUniqueBranchesToDelete);
-      std::map<const Worker*,EarlyDeleteHelper*> alreadySeenWorkers;
+      std::map<const Worker*, EarlyDeleteHelper*> alreadySeenWorkers;
       std::string lastBranchName;
       size_t nextOpenIndex = 0;
       unsigned int* beginAddress = &(earlyDeleteHelperToBranchIndicies_.front());
-      for(auto& branchAndWorker:branchToReadingWorker) {
-        if(lastBranchName != branchAndWorker.first) {
+      for (auto& branchAndWorker : branchToReadingWorker) {
+        if (lastBranchName != branchAndWorker.first) {
           //have to put back the period we removed earlier in order to get the proper name
-          BranchID bid(branchAndWorker.first+".");
-          earlyDeleteBranchToCount_.emplace_back(bid,0U);
+          BranchID bid(branchAndWorker.first + ".");
+          earlyDeleteBranchToCount_.emplace_back(bid, 0U);
           lastBranchName = branchAndWorker.first;
         }
         auto found = alreadySeenWorkers.find(branchAndWorker.second);
-        if(alreadySeenWorkers.end() == found) {
+        if (alreadySeenWorkers.end() == found) {
           //NOTE: we will set aside enough space in earlyDeleteHelperToBranchIndicies_ to accommodate
           // all the branches that might be read by this worker. However, initially we will only tell the
           // EarlyDeleteHelper about the first one. As additional branches are added via 'appendIndex' the
           // EarlyDeleteHelper will automatically advance its internal end pointer.
           size_t index = nextOpenIndex;
           size_t nIndices = reserveSizeForWorker[branchAndWorker.second];
-          earlyDeleteHelperToBranchIndicies_[index]=earlyDeleteBranchToCount_.size()-1;
-          earlyDeleteHelpers_.emplace_back(beginAddress+index,
-                                           beginAddress+index+1,
-                                           &earlyDeleteBranchToCount_);
+          earlyDeleteHelperToBranchIndicies_[index] = earlyDeleteBranchToCount_.size() - 1;
+          earlyDeleteHelpers_.emplace_back(beginAddress + index, beginAddress + index + 1, &earlyDeleteBranchToCount_);
           branchAndWorker.second->setEarlyDeleteHelper(&(earlyDeleteHelpers_.back()));
-          alreadySeenWorkers.insert(std::make_pair(branchAndWorker.second,&(earlyDeleteHelpers_.back())));
-          nextOpenIndex +=nIndices;
+          alreadySeenWorkers.insert(std::make_pair(branchAndWorker.second, &(earlyDeleteHelpers_.back())));
+          nextOpenIndex += nIndices;
         } else {
-          found->second->appendIndex(earlyDeleteBranchToCount_.size()-1);
+          found->second->appendIndex(earlyDeleteBranchToCount_.size() - 1);
         }
       }
-      
+
       //Now we can compactify the earlyDeleteHelperToBranchIndicies_ since we may have over estimated the
       // space needed for each module
       auto itLast = earlyDeleteHelpers_.begin();
-      for(auto it = earlyDeleteHelpers_.begin()+1;it != earlyDeleteHelpers_.end();++it) {
-        if(itLast->end() != it->begin()) {
+      for (auto it = earlyDeleteHelpers_.begin() + 1; it != earlyDeleteHelpers_.end(); ++it) {
+        if (itLast->end() != it->begin()) {
           //figure the offset for next Worker since it hasn't been moved yet so it has the original address
-          unsigned int delta = it->begin()- itLast->end();
+          unsigned int delta = it->begin() - itLast->end();
           it->shiftIndexPointers(delta);
-          
-          earlyDeleteHelperToBranchIndicies_.erase(earlyDeleteHelperToBranchIndicies_.begin()+
-                                                   (itLast->end()-beginAddress),
-                                                   earlyDeleteHelperToBranchIndicies_.begin()+
-                                                   (it->begin()-beginAddress));
+
+          earlyDeleteHelperToBranchIndicies_.erase(
+              earlyDeleteHelperToBranchIndicies_.begin() + (itLast->end() - beginAddress),
+              earlyDeleteHelperToBranchIndicies_.begin() + (it->begin() - beginAddress));
         }
         itLast = it;
       }
-      earlyDeleteHelperToBranchIndicies_.erase(earlyDeleteHelperToBranchIndicies_.begin()+(itLast->end()-beginAddress),
-                                               earlyDeleteHelperToBranchIndicies_.end());
-      
+      earlyDeleteHelperToBranchIndicies_.erase(
+          earlyDeleteHelperToBranchIndicies_.begin() + (itLast->end() - beginAddress),
+          earlyDeleteHelperToBranchIndicies_.end());
+
       //now tell the paths about the deleters
-      for(auto& p : trig_paths_) {
+      for (auto& p : trig_paths_) {
         p.setEarlyDeleteHelpers(alreadySeenWorkers);
       }
-      for(auto& p : end_paths_) {
+      for (auto& p : end_paths_) {
         p.setEarlyDeleteHelpers(alreadySeenWorkers);
       }
       resetEarlyDelete();
@@ -410,13 +409,15 @@ namespace edm {
 
     unsigned int placeInPath = 0;
     for (auto const& name : modnames) {
-
       WorkerInPath::FilterAction filterAction = WorkerInPath::Normal;
-      if (name[0] == '!')       filterAction = WorkerInPath::Veto;
-      else if (name[0] == '-')  filterAction = WorkerInPath::Ignore;
+      if (name[0] == '!')
+        filterAction = WorkerInPath::Veto;
+      else if (name[0] == '-')
+        filterAction = WorkerInPath::Ignore;
 
       std::string moduleLabel = name;
-      if (filterAction != WorkerInPath::Normal) moduleLabel.erase(0, 1);
+      if (filterAction != WorkerInPath::Normal)
+        moduleLabel.erase(0, 1);
 
       bool isTracked;
       ParameterSet* modpset = proc_pset.getPSetForUpdate(moduleLabel, isTracked);
@@ -425,26 +426,26 @@ namespace edm {
         if (!search_all(endPathNames, pathName)) {
           pathType = std::string("path");
         }
-        throw Exception(errors::Configuration) <<
-          "The unknown module label \"" << moduleLabel <<
-          "\" appears in " << pathType << " \"" << pathName <<
-          "\"\n please check spelling or remove that label from the path.";
+        throw Exception(errors::Configuration)
+            << "The unknown module label \"" << moduleLabel << "\" appears in " << pathType << " \"" << pathName
+            << "\"\n please check spelling or remove that label from the path.";
       }
       assert(isTracked);
 
       Worker* worker = workerManager_.getWorker(*modpset, preg, prealloc, processConfiguration, moduleLabel);
-      if (ignoreFilters && filterAction != WorkerInPath::Ignore && worker->moduleType()==Worker::kFilter) {
+      if (ignoreFilters && filterAction != WorkerInPath::Ignore && worker->moduleType() == Worker::kFilter) {
         // We have a filter on an end path, and the filter is not explicitly ignored.
         // See if the filter is allowed.
         std::vector<std::string> allowed_filters = proc_pset.getUntrackedParameter<vstring>("@filters_on_endpaths");
         if (!search_all(allowed_filters, worker->description().moduleName())) {
           // Filter is not allowed. Ignore the result, and issue a warning.
           filterAction = WorkerInPath::Ignore;
-          LogWarning("FilterOnEndPath")
-            << "The EDFilter '" << worker->description().moduleName() << "' with module label '" << moduleLabel << "' appears on EndPath '" << pathName << "'.\n"
-            << "The return value of the filter will be ignored.\n"
-            << "To suppress this warning, either remove the filter from the endpath,\n"
-            << "or explicitly ignore it in the configuration by using cms.ignore().\n";
+          LogWarning("FilterOnEndPath") << "The EDFilter '" << worker->description().moduleName()
+                                        << "' with module label '" << moduleLabel << "' appears on EndPath '"
+                                        << pathName << "'.\n"
+                                        << "The return value of the filter will be ignored.\n"
+                                        << "To suppress this warning, either remove the filter from the endpath,\n"
+                                        << "or explicitly ignore it in the configuration by using cms.ignore().\n";
         }
       }
       tmpworkers.emplace_back(worker, filterAction, placeInPath);
@@ -458,14 +459,24 @@ namespace edm {
                                     ProductRegistry& preg,
                                     PreallocationConfiguration const* prealloc,
                                     std::shared_ptr<ProcessConfiguration const> processConfiguration,
-                                    int bitpos, std::string const& name, TrigResPtr trptr,
+                                    int bitpos,
+                                    std::string const& name,
+                                    TrigResPtr trptr,
                                     std::vector<std::string> const& endPathNames) {
     PathWorkers tmpworkers;
     fillWorkers(proc_pset, preg, prealloc, processConfiguration, name, false, tmpworkers, endPathNames);
 
     // an empty path will cause an extra bit that is not used
     if (!tmpworkers.empty()) {
-      trig_paths_.emplace_back(bitpos, name, tmpworkers, trptr, actionTable(), actReg_, &streamContext_, &skippingEvent_, PathContext::PathType::kPath);
+      trig_paths_.emplace_back(bitpos,
+                               name,
+                               tmpworkers,
+                               trptr,
+                               actionTable(),
+                               actReg_,
+                               &streamContext_,
+                               &skippingEvent_,
+                               PathContext::PathType::kPath);
     } else {
       empty_trig_paths_.push_back(bitpos);
     }
@@ -478,14 +489,23 @@ namespace edm {
                                    ProductRegistry& preg,
                                    PreallocationConfiguration const* prealloc,
                                    std::shared_ptr<ProcessConfiguration const> processConfiguration,
-                                   int bitpos, std::string const& name,
+                                   int bitpos,
+                                   std::string const& name,
                                    std::vector<std::string> const& endPathNames) {
     PathWorkers tmpworkers;
     fillWorkers(proc_pset, preg, prealloc, processConfiguration, name, true, tmpworkers, endPathNames);
 
     if (!tmpworkers.empty()) {
       //EndPaths are not supposed to stop if SkipEvent type exception happens
-      end_paths_.emplace_back(bitpos, name, tmpworkers, TrigResPtr(), actionTable(), actReg_, &streamContext_, nullptr, PathContext::PathType::kEndPath);
+      end_paths_.emplace_back(bitpos,
+                              name,
+                              tmpworkers,
+                              TrigResPtr(),
+                              actionTable(),
+                              actReg_,
+                              &streamContext_,
+                              nullptr,
+                              PathContext::PathType::kEndPath);
     } else {
       empty_end_paths_.push_back(bitpos);
     }
@@ -494,16 +514,11 @@ namespace edm {
     }
   }
 
-  void StreamSchedule::beginStream() {
-    workerManager_.beginStream(streamID_, streamContext_);
-  }
-  
-  void StreamSchedule::endStream() {
-    workerManager_.endStream(streamID_, streamContext_);
-  }
+  void StreamSchedule::beginStream() { workerManager_.beginStream(streamID_, streamContext_); }
 
-  void StreamSchedule::replaceModule(maker::ModuleHolder* iMod,
-                                    std::string const& iLabel) {
+  void StreamSchedule::endStream() { workerManager_.endStream(streamID_, streamContext_); }
+
+  void StreamSchedule::replaceModule(maker::ModuleHolder* iMod, std::string const& iLabel) {
     Worker* found = nullptr;
     for (auto const& worker : allWorkers()) {
       if (worker->description().moduleLabel() == iLabel) {
@@ -516,11 +531,10 @@ namespace edm {
     }
 
     iMod->replaceModuleFor(found);
-    found->beginStream(streamID_,streamContext_);
+    found->beginStream(streamID_, streamContext_);
   }
 
-  std::vector<ModuleDescription const*>
-  StreamSchedule::getAllModuleDescriptions() const {
+  std::vector<ModuleDescription const*> StreamSchedule::getAllModuleDescriptions() const {
     std::vector<ModuleDescription const*> result;
     result.reserve(allWorkers().size());
 
@@ -530,17 +544,18 @@ namespace edm {
     }
     return result;
   }
-  
-  void StreamSchedule::processOneEventAsync(WaitingTaskHolder iTask,
-                                            EventPrincipal& ep,
-                                            EventSetupImpl const& es,
-                                            ServiceToken const& serviceToken,
-                                            std::vector<edm::propagate_const<std::shared_ptr<PathStatusInserter>>>& pathStatusInserters) {
+
+  void StreamSchedule::processOneEventAsync(
+      WaitingTaskHolder iTask,
+      EventPrincipal& ep,
+      EventSetupImpl const& es,
+      ServiceToken const& serviceToken,
+      std::vector<edm::propagate_const<std::shared_ptr<PathStatusInserter>>>& pathStatusInserters) {
     try {
       this->resetAll();
 
       using Traits = OccurrenceTraits<EventPrincipal, BranchActionStreamBegin>;
-      
+
       Traits::setStreamContext(streamContext_, ep);
       //a service may want to communicate with another service
       ServiceRegistry::Operate guard(serviceToken);
@@ -550,119 +565,114 @@ namespace edm {
       for (int empty_trig_path : empty_trig_paths_) {
         results_->at(empty_trig_path) = hltPathStatus;
         pathStatusInserters[empty_trig_path]->setPathStatus(streamID_, hltPathStatus);
-        std::exception_ptr except = pathStatusInserterWorkers_[empty_trig_path]->runModuleDirectly<OccurrenceTraits<EventPrincipal, BranchActionStreamBegin>>(
-            ep, es, streamID_, ParentContext(&streamContext_), &streamContext_
-        );
+        std::exception_ptr except = pathStatusInserterWorkers_[empty_trig_path]
+                                        ->runModuleDirectly<OccurrenceTraits<EventPrincipal, BranchActionStreamBegin>>(
+                                            ep, es, streamID_, ParentContext(&streamContext_), &streamContext_);
         if (except) {
           iTask.doneWaiting(except);
           return;
         }
       }
       for (int empty_end_path : empty_end_paths_) {
-        std::exception_ptr except = endPathStatusInserterWorkers_[empty_end_path]->runModuleDirectly<OccurrenceTraits<EventPrincipal, BranchActionStreamBegin>>(
-            ep, es, streamID_, ParentContext(&streamContext_), &streamContext_
-        );
+        std::exception_ptr except = endPathStatusInserterWorkers_[empty_end_path]
+                                        ->runModuleDirectly<OccurrenceTraits<EventPrincipal, BranchActionStreamBegin>>(
+                                            ep, es, streamID_, ParentContext(&streamContext_), &streamContext_);
         if (except) {
           iTask.doneWaiting(except);
           return;
         }
       }
-      
+
       // This call takes care of the unscheduled processing.
-      workerManager_.setupOnDemandSystem(ep,es);
-      
+      workerManager_.setupOnDemandSystem(ep, es);
+
       ++total_events_;
 
       //use to give priorities on an error to ones from Paths
       auto pathErrorHolder = std::make_unique<std::atomic<std::exception_ptr*>>(nullptr);
       auto pathErrorPtr = pathErrorHolder.get();
-      auto allPathsDone = make_waiting_task(tbb::task::allocate_root(),
-                                            [iTask,this,serviceToken,pathError=std::move(pathErrorHolder)](std::exception_ptr const* iPtr) mutable
-                                            {
-                                              ServiceRegistry::Operate operate(serviceToken);
-                                              
-                                              std::exception_ptr ptr;
-                                              if(pathError->load()) {
-                                                ptr = *pathError->load();
-                                                delete pathError->load();
-                                              } 
-                                              if( (not ptr) and iPtr) {
-                                                ptr = *iPtr;
-                                              }
-                                              iTask.doneWaiting(finishProcessOneEvent(ptr));
-                                            });
+      auto allPathsDone = make_waiting_task(
+          tbb::task::allocate_root(),
+          [iTask, this, serviceToken, pathError = std::move(pathErrorHolder)](std::exception_ptr const* iPtr) mutable {
+            ServiceRegistry::Operate operate(serviceToken);
+
+            std::exception_ptr ptr;
+            if (pathError->load()) {
+              ptr = *pathError->load();
+              delete pathError->load();
+            }
+            if ((not ptr) and iPtr) {
+              ptr = *iPtr;
+            }
+            iTask.doneWaiting(finishProcessOneEvent(ptr));
+          });
       //The holder guarantees that if the paths finish before the loop ends
       // that we do not start too soon. It also guarantees that the task will
       // run under that condition.
       WaitingTaskHolder allPathsHolder(allPathsDone);
 
-      auto pathsDone = make_waiting_task(tbb::task::allocate_root(),
-                                         [allPathsHolder,pathErrorPtr,&ep, &es, this,serviceToken](std::exception_ptr const* iPtr) mutable
-                                            {
-                                              ServiceRegistry::Operate operate(serviceToken);
-
-                                              if(iPtr) {
-                                                //this is used to prioritize this error over one
-                                                // that happens in EndPath or Accumulate
-                                                pathErrorPtr->store( new std::exception_ptr(*iPtr) );
-                                              }
-                                              finishedPaths(*pathErrorPtr, std::move(allPathsHolder), ep, es);
-                                            });
-      
+      auto pathsDone = make_waiting_task(
+          tbb::task::allocate_root(),
+          [allPathsHolder, pathErrorPtr, &ep, &es, this, serviceToken](std::exception_ptr const* iPtr) mutable {
+            ServiceRegistry::Operate operate(serviceToken);
+
+            if (iPtr) {
+              //this is used to prioritize this error over one
+              // that happens in EndPath or Accumulate
+              pathErrorPtr->store(new std::exception_ptr(*iPtr));
+            }
+            finishedPaths(*pathErrorPtr, std::move(allPathsHolder), ep, es);
+          });
+
       //The holder guarantees that if the paths finish before the loop ends
       // that we do not start too soon. It also guarantees that the task will
       // run under that condition.
       WaitingTaskHolder taskHolder(pathsDone);
 
       //start end paths first so on single threaded the paths will run first
-      for(auto it = end_paths_.rbegin(), itEnd = end_paths_.rend();
-          it != itEnd; ++it) {
-        it->processOneOccurrenceAsync(allPathsDone,ep, es, serviceToken, streamID_, &streamContext_);
+      for (auto it = end_paths_.rbegin(), itEnd = end_paths_.rend(); it != itEnd; ++it) {
+        it->processOneOccurrenceAsync(allPathsDone, ep, es, serviceToken, streamID_, &streamContext_);
       }
 
-      for(auto it = trig_paths_.rbegin(), itEnd = trig_paths_.rend();
-          it != itEnd; ++ it) {
-        it->processOneOccurrenceAsync(pathsDone,ep, es, serviceToken, streamID_, &streamContext_);
+      for (auto it = trig_paths_.rbegin(), itEnd = trig_paths_.rend(); it != itEnd; ++it) {
+        it->processOneOccurrenceAsync(pathsDone, ep, es, serviceToken, streamID_, &streamContext_);
       }
 
       ParentContext parentContext(&streamContext_);
       workerManager_.processAccumulatorsAsync<OccurrenceTraits<EventPrincipal, BranchActionStreamBegin>>(
-        allPathsDone, ep, es, serviceToken, streamID_, parentContext, &streamContext_);
-    }catch (...) {
+          allPathsDone, ep, es, serviceToken, streamID_, parentContext, &streamContext_);
+    } catch (...) {
       iTask.doneWaiting(std::current_exception());
     }
   }
-  
-  void
-  StreamSchedule::finishedPaths(std::atomic<std::exception_ptr*>& iExcept, WaitingTaskHolder iWait, EventPrincipal& ep,
-                                EventSetupImpl const& es) {
-    
-    if(iExcept) {
+
+  void StreamSchedule::finishedPaths(std::atomic<std::exception_ptr*>& iExcept,
+                                     WaitingTaskHolder iWait,
+                                     EventPrincipal& ep,
+                                     EventSetupImpl const& es) {
+    if (iExcept) {
       try {
         std::rethrow_exception(*(iExcept.load()));
-      }
-      catch(cms::Exception& e) {
+      } catch (cms::Exception& e) {
         exception_actions::ActionCodes action = actionTable().find(e.category());
-        assert (action != exception_actions::IgnoreCompletely);
-        assert (action != exception_actions::FailPath);
+        assert(action != exception_actions::IgnoreCompletely);
+        assert(action != exception_actions::FailPath);
         if (action == exception_actions::SkipEvent) {
           edm::printCmsExceptionWarning("SkipEvent", e);
           *(iExcept.load()) = std::exception_ptr();
         } else {
           *(iExcept.load()) = std::current_exception();
         }
-      }
-      catch(...) {
+      } catch (...) {
         *(iExcept.load()) = std::current_exception();
       }
     }
 
-    
-    if((not iExcept) and results_->accept()) {
+    if ((not iExcept) and results_->accept()) {
       ++total_passed_;
     }
 
-    if(nullptr != results_inserter_.get()) {
+    if (nullptr != results_inserter_.get()) {
       try {
         //Even if there was an exception, we need to allow results inserter
         // to run since some module may be waiting on its results.
@@ -670,42 +680,36 @@ namespace edm {
         using Traits = OccurrenceTraits<EventPrincipal, BranchActionStreamBegin>;
 
         results_inserter_->doWork<Traits>(ep, es, streamID_, parentContext, &streamContext_);
-      }
-      catch (cms::Exception & ex) {
+      } catch (cms::Exception& ex) {
         if (not iExcept) {
-          if(ex.context().empty()) {
+          if (ex.context().empty()) {
             std::ostringstream ost;
             ost << "Processing Event " << ep.id();
             ex.addContext(ost.str());
           }
-          iExcept.store( new std::exception_ptr(std::current_exception()));
+          iExcept.store(new std::exception_ptr(std::current_exception()));
         }
-      }
-      catch(...) {
+      } catch (...) {
         if (not iExcept) {
           iExcept.store(new std::exception_ptr(std::current_exception()));
         }
       }
     }
     std::exception_ptr ptr;
-    if(iExcept) {
+    if (iExcept) {
       ptr = *iExcept.load();
     }
     iWait.doneWaiting(ptr);
   }
 
-  
-  std::exception_ptr
-  StreamSchedule::finishProcessOneEvent(std::exception_ptr iExcept) {
+  std::exception_ptr StreamSchedule::finishProcessOneEvent(std::exception_ptr iExcept) {
     using Traits = OccurrenceTraits<EventPrincipal, BranchActionStreamBegin>;
 
-    if(iExcept) {
+    if (iExcept) {
       //add context information to the exception and print message
       try {
-        convertException::wrap([&]() {
-          std::rethrow_exception(iExcept);
-        });
-      } catch(cms::Exception& ex) {
+        convertException::wrap([&]() { std::rethrow_exception(iExcept); });
+      } catch (cms::Exception& ex) {
         bool const cleaningUpAfterException = false;
         if (ex.context().empty()) {
           addContextAndPrintException("Calling function StreamSchedule::processOneEvent", ex, cleaningUpAfterException);
@@ -715,25 +719,24 @@ namespace edm {
         iExcept = std::current_exception();
       }
 
-      actReg_->preStreamEarlyTerminationSignal_(streamContext_,TerminationOrigin::ExceptionFromThisContext);
+      actReg_->preStreamEarlyTerminationSignal_(streamContext_, TerminationOrigin::ExceptionFromThisContext);
     }
-    
+
     try {
       Traits::postScheduleSignal(actReg_.get(), &streamContext_);
-    } catch(...) {
-      if(not iExcept) {
+    } catch (...) {
+      if (not iExcept) {
         iExcept = std::current_exception();
       }
     }
-    if(not iExcept ) {
+    if (not iExcept) {
       resetEarlyDelete();
     }
-    
+
     return iExcept;
   }
 
-  void
-  StreamSchedule::availablePaths(std::vector<std::string>& oLabelsToFill) const {
+  void StreamSchedule::availablePaths(std::vector<std::string>& oLabelsToFill) const {
     oLabelsToFill.reserve(trig_paths_.size());
     std::transform(trig_paths_.begin(),
                    trig_paths_.end(),
@@ -741,16 +744,12 @@ namespace edm {
                    std::bind(&Path::name, std::placeholders::_1));
   }
 
-  void
-  StreamSchedule::modulesInPath(std::string const& iPathLabel,
-                          std::vector<std::string>& oLabelsToFill) const {
-    TrigPaths::const_iterator itFound =
-    std::find_if (trig_paths_.begin(),
-                 trig_paths_.end(),
-                 std::bind(std::equal_to<std::string>(),
-                             iPathLabel,
-                             std::bind(&Path::name, std::placeholders::_1)));
-    if (itFound!=trig_paths_.end()) {
+  void StreamSchedule::modulesInPath(std::string const& iPathLabel, std::vector<std::string>& oLabelsToFill) const {
+    TrigPaths::const_iterator itFound = std::find_if(
+        trig_paths_.begin(),
+        trig_paths_.end(),
+        std::bind(std::equal_to<std::string>(), iPathLabel, std::bind(&Path::name, std::placeholders::_1)));
+    if (itFound != trig_paths_.end()) {
       oLabelsToFill.reserve(itFound->size());
       for (size_t i = 0; i < itFound->size(); ++i) {
         oLabelsToFill.push_back(itFound->getWorker(i)->description().moduleLabel());
@@ -758,26 +757,26 @@ namespace edm {
     }
   }
 
-  void
-  StreamSchedule::moduleDescriptionsInPath(std::string const& iPathLabel,
-                                           std::vector<ModuleDescription const*>& descriptions,
-                                           unsigned int hint) const {
+  void StreamSchedule::moduleDescriptionsInPath(std::string const& iPathLabel,
+                                                std::vector<ModuleDescription const*>& descriptions,
+                                                unsigned int hint) const {
     descriptions.clear();
     bool found = false;
     TrigPaths::const_iterator itFound;
 
-    if(hint < trig_paths_.size()) {
+    if (hint < trig_paths_.size()) {
       itFound = trig_paths_.begin() + hint;
-      if(itFound->name() == iPathLabel) found = true;
+      if (itFound->name() == iPathLabel)
+        found = true;
     }
-    if(!found) {
+    if (!found) {
       // if the hint did not work, do it the slow way
-      itFound = std::find_if (trig_paths_.begin(),
-                              trig_paths_.end(),
-                              std::bind(std::equal_to<std::string>(),
-                                        iPathLabel,
-                                        std::bind(&Path::name, std::placeholders::_1)));
-      if (itFound != trig_paths_.end()) found = true;
+      itFound = std::find_if(
+          trig_paths_.begin(),
+          trig_paths_.end(),
+          std::bind(std::equal_to<std::string>(), iPathLabel, std::bind(&Path::name, std::placeholders::_1)));
+      if (itFound != trig_paths_.end())
+        found = true;
     }
     if (found) {
       descriptions.reserve(itFound->size());
@@ -787,26 +786,26 @@ namespace edm {
     }
   }
 
-  void
-  StreamSchedule::moduleDescriptionsInEndPath(std::string const& iEndPathLabel,
-                                              std::vector<ModuleDescription const*>& descriptions,
-                                              unsigned int hint) const {
+  void StreamSchedule::moduleDescriptionsInEndPath(std::string const& iEndPathLabel,
+                                                   std::vector<ModuleDescription const*>& descriptions,
+                                                   unsigned int hint) const {
     descriptions.clear();
     bool found = false;
     TrigPaths::const_iterator itFound;
 
-    if(hint < end_paths_.size()) {
+    if (hint < end_paths_.size()) {
       itFound = end_paths_.begin() + hint;
-      if(itFound->name() == iEndPathLabel) found = true;
+      if (itFound->name() == iEndPathLabel)
+        found = true;
     }
-    if(!found) {
+    if (!found) {
       // if the hint did not work, do it the slow way
-      itFound = std::find_if (end_paths_.begin(),
-                              end_paths_.end(),
-                              std::bind(std::equal_to<std::string>(),
-                                        iEndPathLabel,
-                                        std::bind(&Path::name, std::placeholders::_1)));
-      if (itFound != end_paths_.end()) found = true;
+      itFound = std::find_if(
+          end_paths_.begin(),
+          end_paths_.end(),
+          std::bind(std::equal_to<std::string>(), iEndPathLabel, std::bind(&Path::name, std::placeholders::_1)));
+      if (itFound != end_paths_.end())
+        found = true;
     }
     if (found) {
       descriptions.reserve(itFound->size());
@@ -816,38 +815,28 @@ namespace edm {
     }
   }
 
-  void
-  StreamSchedule::enableEndPaths(bool active) {
-    endpathsAreActive_ = active;
-  }
+  void StreamSchedule::enableEndPaths(bool active) { endpathsAreActive_ = active; }
 
-  bool
-  StreamSchedule::endPathsEnabled() const {
-    return endpathsAreActive_;
-  }
+  bool StreamSchedule::endPathsEnabled() const { return endpathsAreActive_; }
 
-  static void
-  fillModuleInPathSummary(Path const& path,
-                          size_t which,
-                          ModuleInPathSummary& sum) {
+  static void fillModuleInPathSummary(Path const& path, size_t which, ModuleInPathSummary& sum) {
     sum.timesVisited += path.timesVisited(which);
-    sum.timesPassed  += path.timesPassed(which);
-    sum.timesFailed  += path.timesFailed(which);
-    sum.timesExcept  += path.timesExcept(which);
-    sum.moduleLabel  = path.getWorker(which)->description().moduleLabel();
+    sum.timesPassed += path.timesPassed(which);
+    sum.timesFailed += path.timesFailed(which);
+    sum.timesExcept += path.timesExcept(which);
+    sum.moduleLabel = path.getWorker(which)->description().moduleLabel();
   }
 
-  static void
-  fillPathSummary(Path const& path, PathSummary& sum) {
-    sum.name        = path.name();
+  static void fillPathSummary(Path const& path, PathSummary& sum) {
+    sum.name = path.name();
     sum.bitPosition = path.bitPosition();
-    sum.timesRun    += path.timesRun();
+    sum.timesRun += path.timesRun();
     sum.timesPassed += path.timesPassed();
     sum.timesFailed += path.timesFailed();
     sum.timesExcept += path.timesExcept();
-    
+
     Path::size_type sz = path.size();
-    if(sum.moduleInPathSummaries.empty()) {
+    if (sum.moduleInPathSummaries.empty()) {
       std::vector<ModuleInPathSummary> temp(sz);
       for (size_t i = 0; i != sz; ++i) {
         fillModuleInPathSummary(path, i, temp[i]);
@@ -861,34 +850,28 @@ namespace edm {
     }
   }
 
-  static void
-  fillWorkerSummaryAux(Worker const& w, WorkerSummary& sum) {
+  static void fillWorkerSummaryAux(Worker const& w, WorkerSummary& sum) {
     sum.timesVisited += w.timesVisited();
-    sum.timesRun     += w.timesRun();
-    sum.timesPassed  += w.timesPassed();
-    sum.timesFailed  += w.timesFailed();
-    sum.timesExcept  += w.timesExcept();
-    sum.moduleLabel  = w.description().moduleLabel();
+    sum.timesRun += w.timesRun();
+    sum.timesPassed += w.timesPassed();
+    sum.timesFailed += w.timesFailed();
+    sum.timesExcept += w.timesExcept();
+    sum.moduleLabel = w.description().moduleLabel();
   }
 
-  static void
-  fillWorkerSummary(Worker const* pw, WorkerSummary& sum) {
-    fillWorkerSummaryAux(*pw, sum);
-  }
+  static void fillWorkerSummary(Worker const* pw, WorkerSummary& sum) { fillWorkerSummaryAux(*pw, sum); }
 
-  void
-  StreamSchedule::getTriggerReport(TriggerReport& rep) const {
+  void StreamSchedule::getTriggerReport(TriggerReport& rep) const {
     rep.eventSummary.totalEvents += totalEvents();
     rep.eventSummary.totalEventsPassed += totalEventsPassed();
     rep.eventSummary.totalEventsFailed += totalEventsFailed();
 
-    fill_summary(trig_paths_,  rep.trigPathSummaries, &fillPathSummary);
-    fill_summary(end_paths_,   rep.endPathSummaries,  &fillPathSummary);
-    fill_summary(allWorkers(), rep.workerSummaries,   &fillWorkerSummary);
+    fill_summary(trig_paths_, rep.trigPathSummaries, &fillPathSummary);
+    fill_summary(end_paths_, rep.endPathSummaries, &fillPathSummary);
+    fill_summary(allWorkers(), rep.workerSummaries, &fillWorkerSummary);
   }
 
-  void
-  StreamSchedule::clearCounters() {
+  void StreamSchedule::clearCounters() {
     using std::placeholders::_1;
     total_events_ = total_passed_ = 0;
     for_all(trig_paths_, std::bind(&Path::clearCounters, _1));
@@ -896,46 +879,38 @@ namespace edm {
     for_all(allWorkers(), std::bind(&Worker::clearCounters, _1));
   }
 
-  void
-  StreamSchedule::resetAll() {
+  void StreamSchedule::resetAll() {
     skippingEvent_ = false;
     results_->reset();
   }
 
-  void
-  StreamSchedule::addToAllWorkers(Worker* w) {
-    workerManager_.addToAllWorkers(w);
-  }
+  void StreamSchedule::addToAllWorkers(Worker* w) { workerManager_.addToAllWorkers(w); }
 
-  void 
-  StreamSchedule::resetEarlyDelete() {
+  void StreamSchedule::resetEarlyDelete() {
     //must be sure we have cleared the count first
-    for(auto& count:earlyDeleteBranchToCount_) {
+    for (auto& count : earlyDeleteBranchToCount_) {
       count.count = 0;
     }
     //now reset based on how many helpers use that branch
-    for(auto& index: earlyDeleteHelperToBranchIndicies_) {
+    for (auto& index : earlyDeleteHelperToBranchIndicies_) {
       ++(earlyDeleteBranchToCount_[index].count);
     }
-    for(auto& helper: earlyDeleteHelpers_) {
+    for (auto& helper : earlyDeleteHelpers_) {
       helper.reset();
     }
   }
 
-  void
-  StreamSchedule::makePathStatusInserters(
+  void StreamSchedule::makePathStatusInserters(
       std::vector<edm::propagate_const<std::shared_ptr<PathStatusInserter>>>& pathStatusInserters,
       std::vector<edm::propagate_const<std::shared_ptr<EndPathStatusInserter>>>& endPathStatusInserters,
       ExceptionToActionTable const& actions) {
-
     int bitpos = 0;
     unsigned int indexEmpty = 0;
     unsigned int indexOfPath = 0;
-    for(auto & pathStatusInserter : pathStatusInserters) {
+    for (auto& pathStatusInserter : pathStatusInserters) {
       std::shared_ptr<PathStatusInserter> inserterPtr = get_underlying(pathStatusInserter);
-      WorkerPtr workerPtr(new edm::WorkerT<PathStatusInserter::ModuleType>(inserterPtr,
-                                                                           inserterPtr->moduleDescription(),
-                                                                           &actions));
+      WorkerPtr workerPtr(
+          new edm::WorkerT<PathStatusInserter::ModuleType>(inserterPtr, inserterPtr->moduleDescription(), &actions));
       pathStatusInserterWorkers_.emplace_back(workerPtr);
       workerPtr->setActivityRegistry(actReg_);
       addToAllWorkers(workerPtr.get());
@@ -946,8 +921,7 @@ namespace edm {
       if (indexEmpty < empty_trig_paths_.size() && bitpos == empty_trig_paths_.at(indexEmpty)) {
         ++indexEmpty;
       } else {
-        trig_paths_.at(indexOfPath).setPathStatusInserter(inserterPtr.get(),
-                                                          workerPtr.get());
+        trig_paths_.at(indexOfPath).setPathStatusInserter(inserterPtr.get(), workerPtr.get());
         ++indexOfPath;
       }
       ++bitpos;
@@ -956,11 +930,10 @@ namespace edm {
     bitpos = 0;
     indexEmpty = 0;
     indexOfPath = 0;
-    for(auto & endPathStatusInserter : endPathStatusInserters) {
+    for (auto& endPathStatusInserter : endPathStatusInserters) {
       std::shared_ptr<EndPathStatusInserter> inserterPtr = get_underlying(endPathStatusInserter);
-      WorkerPtr workerPtr(new edm::WorkerT<EndPathStatusInserter::ModuleType>(inserterPtr,
-                                                                              inserterPtr->moduleDescription(),
-                                                                              &actions));
+      WorkerPtr workerPtr(
+          new edm::WorkerT<EndPathStatusInserter::ModuleType>(inserterPtr, inserterPtr->moduleDescription(), &actions));
       endPathStatusInserterWorkers_.emplace_back(workerPtr);
       workerPtr->setActivityRegistry(actReg_);
       addToAllWorkers(workerPtr.get());
@@ -971,11 +944,10 @@ namespace edm {
       if (indexEmpty < empty_end_paths_.size() && bitpos == empty_end_paths_.at(indexEmpty)) {
         ++indexEmpty;
       } else {
-        end_paths_.at(indexOfPath).setPathStatusInserter(nullptr,
-                                                         workerPtr.get());
+        end_paths_.at(indexOfPath).setPathStatusInserter(nullptr, workerPtr.get());
         ++indexOfPath;
       }
       ++bitpos;
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/StreamSchedule.h b/FWCore/Framework/src/StreamSchedule.h
index 8412d20875856..d062eab3d87c9 100644
--- a/FWCore/Framework/src/StreamSchedule.h
+++ b/FWCore/Framework/src/StreamSchedule.h
@@ -120,30 +120,33 @@ namespace edm {
     template <typename T>
     class StreamScheduleSignalSentry {
     public:
-      StreamScheduleSignalSentry(ActivityRegistry* a, typename T::Context const* context) :
-        a_(a), context_(context), allowThrow_(false) {
-        if (a_) T::preScheduleSignal(a_, context_);
+      StreamScheduleSignalSentry(ActivityRegistry* a, typename T::Context const* context)
+          : a_(a), context_(context), allowThrow_(false) {
+        if (a_)
+          T::preScheduleSignal(a_, context_);
       }
       ~StreamScheduleSignalSentry() noexcept(false) {
         try {
-          if (a_) { T::postScheduleSignal(a_, context_); }
-        } catch(...) {
-          if(allowThrow_) {throw;}
+          if (a_) {
+            T::postScheduleSignal(a_, context_);
+          }
+        } catch (...) {
+          if (allowThrow_) {
+            throw;
+          }
         }
       }
-      
-      void allowThrow() {
-        allowThrow_ = true;
-      }
+
+      void allowThrow() { allowThrow_ = true; }
 
     private:
       // We own none of these resources.
-      ActivityRegistry* a_; // We do not use propagate_const because the registry itself is mutable.
+      ActivityRegistry* a_;  // We do not use propagate_const because the registry itself is mutable.
       typename T::Context const* context_;
       bool allowThrow_;
     };
-  }
-  
+  }  // namespace
+
   class StreamSchedule {
   public:
     typedef std::vector<std::string> vstring;
@@ -173,14 +176,15 @@ namespace edm {
                    bool allowEarlyDelete,
                    StreamID streamID,
                    ProcessContext const* processContext);
-    
+
     StreamSchedule(StreamSchedule const&) = delete;
 
-    void processOneEventAsync(WaitingTaskHolder iTask,
-                              EventPrincipal& ep,
-                              EventSetupImpl const& es,
-                              ServiceToken const& token,
-                              std::vector<edm::propagate_const<std::shared_ptr<PathStatusInserter>>>& pathStatusInserters);
+    void processOneEventAsync(
+        WaitingTaskHolder iTask,
+        EventPrincipal& ep,
+        EventSetupImpl const& es,
+        ServiceToken const& token,
+        std::vector<edm::propagate_const<std::shared_ptr<PathStatusInserter>>>& pathStatusInserters);
 
     template <typename T>
     void processOneStreamAsync(WaitingTaskHolder iTask,
@@ -193,7 +197,7 @@ namespace edm {
     void endStream();
 
     StreamID streamID() const { return streamID_; }
-    
+
     /// Return a vector allowing const access to all the
     /// ModuleDescriptions for this StreamSchedule.
 
@@ -206,8 +210,7 @@ namespace edm {
     void availablePaths(std::vector<std::string>& oLabelsToFill) const;
 
     ///adds to oLabelsToFill in execution order the labels of all modules in path iPathLabel
-    void modulesInPath(std::string const& iPathLabel,
-                       std::vector<std::string>& oLabelsToFill) const;
+    void modulesInPath(std::string const& iPathLabel, std::vector<std::string>& oLabelsToFill) const;
 
     void moduleDescriptionsInPath(std::string const& iPathLabel,
                                   std::vector<ModuleDescription const*>& descriptions,
@@ -220,21 +223,15 @@ namespace edm {
     /// Return the number of events this StreamSchedule has tried to process
     /// (inclues both successes and failures, including failures due
     /// to exceptions during processing).
-    int totalEvents() const {
-      return total_events_;
-    }
+    int totalEvents() const { return total_events_; }
 
     /// Return the number of events which have been passed by one or
     /// more trigger paths.
-    int totalEventsPassed() const {
-      return total_passed_;
-    }
+    int totalEventsPassed() const { return total_passed_; }
 
     /// Return the number of events that have not passed any trigger.
     /// (N.B. totalEventsFailed() + totalEventsPassed() == totalEvents()
-    int totalEventsFailed() const {
-      return totalEvents() - totalEventsPassed();
-    }
+    int totalEventsFailed() const { return totalEvents() - totalEventsPassed(); }
 
     /// Turn end_paths "off" if "active" is false;
     /// turn end_paths "on" if "active" is true.
@@ -255,15 +252,12 @@ namespace edm {
     void replaceModule(maker::ModuleHolder* iMod, std::string const& iLabel);
 
     /// returns the collection of pointers to workers
-    AllWorkers const& allWorkers() const {
-      return workerManager_.allWorkers();
-    }
-    
-    unsigned int numberOfUnscheduledModules() const {
-      return number_of_unscheduled_modules_;
-    }
-    
-    StreamContext const& context() const { return streamContext_;}
+    AllWorkers const& allWorkers() const { return workerManager_.allWorkers(); }
+
+    unsigned int numberOfUnscheduledModules() const { return number_of_unscheduled_modules_; }
+
+    StreamContext const& context() const { return streamContext_; }
+
   private:
     //Sentry class to only send a signal if an
     // exception occurs. An exception is identified
@@ -271,84 +265,86 @@ namespace edm {
     // calling completedSuccessfully().
     class SendTerminationSignalIfException {
     public:
-      SendTerminationSignalIfException(edm::ActivityRegistry* iReg, edm::StreamContext const* iContext):
-      reg_(iReg),
-      context_(iContext){}
+      SendTerminationSignalIfException(edm::ActivityRegistry* iReg, edm::StreamContext const* iContext)
+          : reg_(iReg), context_(iContext) {}
       ~SendTerminationSignalIfException() {
-        if(reg_) {
-          reg_->preStreamEarlyTerminationSignal_(*context_,TerminationOrigin::ExceptionFromThisContext);
+        if (reg_) {
+          reg_->preStreamEarlyTerminationSignal_(*context_, TerminationOrigin::ExceptionFromThisContext);
         }
       }
-      void completedSuccessfully() {
-        reg_ = nullptr;
-      }
+      void completedSuccessfully() { reg_ = nullptr; }
+
     private:
-      edm::ActivityRegistry* reg_; // We do not use propagate_const because the registry itself is mutable.
+      edm::ActivityRegistry* reg_;  // We do not use propagate_const because the registry itself is mutable.
       StreamContext const* context_;
     };
 
     /// returns the action table
-    ExceptionToActionTable const& actionTable() const {
-      return workerManager_.actionTable();
-    }
-    
+    ExceptionToActionTable const& actionTable() const { return workerManager_.actionTable(); }
 
     void resetAll();
 
-    void finishedPaths(std::atomic<std::exception_ptr*>&, WaitingTaskHolder,
-                       EventPrincipal& ep, EventSetupImpl const& es);
+    void finishedPaths(std::atomic<std::exception_ptr*>&,
+                       WaitingTaskHolder,
+                       EventPrincipal& ep,
+                       EventSetupImpl const& es);
     std::exception_ptr finishProcessOneEvent(std::exception_ptr);
-    
+
     void reportSkipped(EventPrincipal const& ep) const;
 
     void fillWorkers(ParameterSet& proc_pset,
                      ProductRegistry& preg,
                      PreallocationConfiguration const* prealloc,
                      std::shared_ptr<ProcessConfiguration const> processConfiguration,
-                     std::string const& name, bool ignoreFilters, PathWorkers& out,
+                     std::string const& name,
+                     bool ignoreFilters,
+                     PathWorkers& out,
                      std::vector<std::string> const& endPathNames);
     void fillTrigPath(ParameterSet& proc_pset,
                       ProductRegistry& preg,
                       PreallocationConfiguration const* prealloc,
                       std::shared_ptr<ProcessConfiguration const> processConfiguration,
-                      int bitpos, std::string const& name, TrigResPtr,
+                      int bitpos,
+                      std::string const& name,
+                      TrigResPtr,
                       std::vector<std::string> const& endPathNames);
     void fillEndPath(ParameterSet& proc_pset,
                      ProductRegistry& preg,
                      PreallocationConfiguration const* prealloc,
                      std::shared_ptr<ProcessConfiguration const> processConfiguration,
-                     int bitpos, std::string const& name,
+                     int bitpos,
+                     std::string const& name,
                      std::vector<std::string> const& endPathNames);
 
     void addToAllWorkers(Worker* w);
-    
+
     void resetEarlyDelete();
-    void initializeEarlyDelete(ModuleRegistry & modReg,
+    void initializeEarlyDelete(ModuleRegistry& modReg,
                                edm::ParameterSet const& opts,
-                               edm::ProductRegistry const& preg, 
+                               edm::ProductRegistry const& preg,
                                bool allowEarlyDelete);
 
-    TrigResConstPtr results() const {return get_underlying_safe(results_);}
-    TrigResPtr& results() {return get_underlying_safe(results_);}
+    TrigResConstPtr results() const { return get_underlying_safe(results_); }
+    TrigResPtr& results() { return get_underlying_safe(results_); }
 
     void makePathStatusInserters(
-      std::vector<edm::propagate_const<std::shared_ptr<PathStatusInserter>>>& pathStatusInserters,
-      std::vector<edm::propagate_const<std::shared_ptr<EndPathStatusInserter>>>& endPathStatusInserters,
-      ExceptionToActionTable const& actions);
+        std::vector<edm::propagate_const<std::shared_ptr<PathStatusInserter>>>& pathStatusInserters,
+        std::vector<edm::propagate_const<std::shared_ptr<EndPathStatusInserter>>>& endPathStatusInserters,
+        ExceptionToActionTable const& actions);
+
+    WorkerManager workerManager_;
+    std::shared_ptr<ActivityRegistry> actReg_;  // We do not use propagate_const because the registry itself is mutable.
 
-    WorkerManager            workerManager_;
-    std::shared_ptr<ActivityRegistry> actReg_; // We do not use propagate_const because the registry itself is mutable.
-    
     edm::propagate_const<TrigResPtr> results_;
 
     edm::propagate_const<WorkerPtr> results_inserter_;
     std::vector<edm::propagate_const<WorkerPtr>> pathStatusInserterWorkers_;
     std::vector<edm::propagate_const<WorkerPtr>> endPathStatusInserterWorkers_;
 
-    TrigPaths                trig_paths_;
-    TrigPaths                end_paths_;
-    std::vector<int>         empty_trig_paths_;
-    std::vector<int>         empty_end_paths_;
+    TrigPaths trig_paths_;
+    TrigPaths end_paths_;
+    std::vector<int> empty_trig_paths_;
+    std::vector<int> empty_end_paths_;
 
     //For each branch that has been marked for early deletion
     // keep track of how many modules are left that read this data but have
@@ -358,26 +354,24 @@ namespace edm {
     // but putting it into one vector makes for better allocation as well as
     // faster iteration when used to reset the earlyDeleteBranchToCount_
     // Each EarlyDeleteHelper hold a begin and end range into this vector. The values
-    // of this vector correspond to indexes into earlyDeleteBranchToCount_ so 
+    // of this vector correspond to indexes into earlyDeleteBranchToCount_ so
     // tell which EarlyDeleteHelper is associated with which BranchIDs.
     std::vector<unsigned int> earlyDeleteHelperToBranchIndicies_;
     //There is one EarlyDeleteHelper per Module which are reading data that
     // has been marked for early deletion
     std::vector<EarlyDeleteHelper> earlyDeleteHelpers_;
 
-    int                            total_events_;
-    int                            total_passed_;
-    unsigned int                   number_of_unscheduled_modules_;
-    
-    StreamID                streamID_;
-    StreamContext           streamContext_;
-    volatile bool           endpathsAreActive_;
-    std::atomic<bool>       skippingEvent_;
+    int total_events_;
+    int total_passed_;
+    unsigned int number_of_unscheduled_modules_;
+
+    StreamID streamID_;
+    StreamContext streamContext_;
+    volatile bool endpathsAreActive_;
+    std::atomic<bool> skippingEvent_;
   };
 
-  void
-  inline
-  StreamSchedule::reportSkipped(EventPrincipal const& ep) const {
+  void inline StreamSchedule::reportSkipped(EventPrincipal const& ep) const {
     Service<JobReport> reportSvc;
     reportSvc->reportSkippedEvent(ep.id().run(), ep.id().event());
   }
@@ -391,76 +385,74 @@ namespace edm {
     T::setStreamContext(streamContext_, ep);
 
     auto id = ep.id();
-    auto doneTask = make_waiting_task(tbb::task::allocate_root(),
-                                      [this,iHolder, id,cleaningUpAfterException,token](std::exception_ptr const* iPtr) mutable
-    {
-      std::exception_ptr excpt;
-      if(iPtr) {
-        excpt = *iPtr;
-        //add context information to the exception and print message
-        try {
-          convertException::wrap([&]() {
-            std::rethrow_exception(excpt);
-          });
-        } catch(cms::Exception& ex) {
-          //TODO: should add the transition type info
-          std::ostringstream ost;
-          if(ex.context().empty()) {
-            ost<<"Processing "<<T::transitionName()<<" "<<id;
+    auto doneTask = make_waiting_task(
+        tbb::task::allocate_root(),
+        [this, iHolder, id, cleaningUpAfterException, token](std::exception_ptr const* iPtr) mutable {
+          std::exception_ptr excpt;
+          if (iPtr) {
+            excpt = *iPtr;
+            //add context information to the exception and print message
+            try {
+              convertException::wrap([&]() { std::rethrow_exception(excpt); });
+            } catch (cms::Exception& ex) {
+              //TODO: should add the transition type info
+              std::ostringstream ost;
+              if (ex.context().empty()) {
+                ost << "Processing " << T::transitionName() << " " << id;
+              }
+              ServiceRegistry::Operate op(token);
+              addContextAndPrintException(ost.str().c_str(), ex, cleaningUpAfterException);
+              excpt = std::current_exception();
+            }
+
+            ServiceRegistry::Operate op(token);
+            actReg_->preStreamEarlyTerminationSignal_(streamContext_, TerminationOrigin::ExceptionFromThisContext);
           }
-          ServiceRegistry::Operate op(token);
-          addContextAndPrintException(ost.str().c_str(), ex, cleaningUpAfterException);
-          excpt = std::current_exception();
-        }
-        
-        ServiceRegistry::Operate op(token);
-        actReg_->preStreamEarlyTerminationSignal_(streamContext_,TerminationOrigin::ExceptionFromThisContext);
-      }
-      
-      try {
-        ServiceRegistry::Operate op(token);
-        T::postScheduleSignal(actReg_.get(), &streamContext_);
-      } catch(...) {
-        if(not excpt) {
-          excpt = std::current_exception();
-        }
-      }
-      iHolder.doneWaiting(excpt);
-      
-    });
-    
-    auto task = make_functor_task(tbb::task::allocate_root(), [this,doneTask, h =WaitingTaskHolder(doneTask) ,&ep,&es,token] () mutable {
-      ServiceRegistry::Operate op(token);
-      try {
-        T::preScheduleSignal(actReg_.get(), &streamContext_);
-
-        workerManager_.resetAll();
-      }catch(...) {
-        h.doneWaiting(std::current_exception());
-        return;
-      }
 
-      for(auto& p : end_paths_) {
-        p.runAllModulesAsync<T>(doneTask, ep, es, token, streamID_, &streamContext_);
-      }
-
-      for(auto& p : trig_paths_) {
-        p.runAllModulesAsync<T>(doneTask, ep, es, token, streamID_, &streamContext_);
-      }
-      
-      workerManager_.processOneOccurrenceAsync<T>(doneTask,
-                                                  ep, es, token, streamID_, &streamContext_, &streamContext_);
-    });
-    
-    if(streamID_.value() == 0) {
+          try {
+            ServiceRegistry::Operate op(token);
+            T::postScheduleSignal(actReg_.get(), &streamContext_);
+          } catch (...) {
+            if (not excpt) {
+              excpt = std::current_exception();
+            }
+          }
+          iHolder.doneWaiting(excpt);
+        });
+
+    auto task = make_functor_task(tbb::task::allocate_root(),
+                                  [this, doneTask, h = WaitingTaskHolder(doneTask), &ep, &es, token]() mutable {
+                                    ServiceRegistry::Operate op(token);
+                                    try {
+                                      T::preScheduleSignal(actReg_.get(), &streamContext_);
+
+                                      workerManager_.resetAll();
+                                    } catch (...) {
+                                      h.doneWaiting(std::current_exception());
+                                      return;
+                                    }
+
+                                    for (auto& p : end_paths_) {
+                                      p.runAllModulesAsync<T>(doneTask, ep, es, token, streamID_, &streamContext_);
+                                    }
+
+                                    for (auto& p : trig_paths_) {
+                                      p.runAllModulesAsync<T>(doneTask, ep, es, token, streamID_, &streamContext_);
+                                    }
+
+                                    workerManager_.processOneOccurrenceAsync<T>(
+                                        doneTask, ep, es, token, streamID_, &streamContext_, &streamContext_);
+                                  });
+
+    if (streamID_.value() == 0) {
       //Enqueueing will start another thread if there is only
       // one thread in the job. Having stream == 0 use spawn
       // avoids starting up another thread when there is only one stream.
-      tbb::task::spawn( *task);
+      tbb::task::spawn(*task);
     } else {
-      tbb::task::enqueue( *task);
+      tbb::task::enqueue(*task);
     }
   }
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/SubProcess.cc b/FWCore/Framework/src/SubProcess.cc
index 118ff76894960..792677da9dd26 100644
--- a/FWCore/Framework/src/SubProcess.cc
+++ b/FWCore/Framework/src/SubProcess.cc
@@ -26,6 +26,7 @@
 #include "FWCore/Framework/src/PreallocationConfiguration.h"
 #include "FWCore/Framework/src/streamTransitionAsync.h"
 #include "FWCore/Framework/src/globalTransitionAsync.h"
+#include "FWCore/Framework/interface/ESRecordsToProxyIndices.h"
 #include "FWCore/ParameterSet/interface/IllegalParameters.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/validateTopLevelParameterSets.h"
@@ -53,45 +54,38 @@ namespace edm {
                          ServiceToken const& token,
                          serviceregistry::ServiceLegacy iLegacy,
                          PreallocationConfiguration const& preallocConfig,
-                         ProcessContext const* parentProcessContext) :
-    EDConsumerBase(),
-    serviceToken_(),
-    parentPreg_(parentProductRegistry),
-    preg_(),
-    branchIDListHelper_(),
-    act_table_(),
-    processConfiguration_(),
-    historyLumiOffset_(preallocConfig.numberOfStreams()),
-    historyRunOffset_(historyLumiOffset_+preallocConfig.numberOfLuminosityBlocks()),
-    processHistoryRegistries_(historyRunOffset_+ preallocConfig.numberOfRuns()),
-    historyAppenders_(historyRunOffset_+preallocConfig.numberOfRuns()),
-    principalCache_(),
-    esp_(),
-    schedule_(),
-    parentToChildPhID_(),
-    subProcesses_(),
-    processParameterSet_(),
-    productSelectorRules_(parameterSet, "outputCommands", "OutputModule"),
-    productSelector_(),
-    wantAllEvents_(true) {
-
+                         ProcessContext const* parentProcessContext)
+      : EDConsumerBase(),
+        serviceToken_(),
+        parentPreg_(parentProductRegistry),
+        preg_(),
+        branchIDListHelper_(),
+        act_table_(),
+        processConfiguration_(),
+        historyLumiOffset_(preallocConfig.numberOfStreams()),
+        historyRunOffset_(historyLumiOffset_ + preallocConfig.numberOfLuminosityBlocks()),
+        processHistoryRegistries_(historyRunOffset_ + preallocConfig.numberOfRuns()),
+        historyAppenders_(historyRunOffset_ + preallocConfig.numberOfRuns()),
+        principalCache_(),
+        esp_(),
+        schedule_(),
+        parentToChildPhID_(),
+        subProcesses_(),
+        processParameterSet_(),
+        productSelectorRules_(parameterSet, "outputCommands", "OutputModule"),
+        productSelector_(),
+        wantAllEvents_(true) {
     //Setup the event selection
     Service<service::TriggerNamesService> tns;
 
-    ParameterSet selectevents =
-      parameterSet.getUntrackedParameterSet("SelectEvents", ParameterSet());
-
-    selectevents.registerIt(); // Just in case this PSet is not registered
-    wantAllEvents_ = detail::configureEventSelector(selectevents,
-                                                    tns->getProcessName(),
-                                                    getAllTriggerNames(),
-                                                    selectors_,
-                                                    consumesCollector());
-    std::map<std::string, std::vector<std::pair<std::string, int> > > outputModulePathPositions;
-    selector_config_id_ = detail::registerProperSelectionInfo(selectevents,
-                                                              "",
-                                                              outputModulePathPositions,
-                                                              parentProductRegistry->anyProductProduced());
+    ParameterSet selectevents = parameterSet.getUntrackedParameterSet("SelectEvents", ParameterSet());
+
+    selectevents.registerIt();  // Just in case this PSet is not registered
+    wantAllEvents_ = detail::configureEventSelector(
+        selectevents, tns->getProcessName(), getAllTriggerNames(), selectors_, consumesCollector());
+    std::map<std::string, std::vector<std::pair<std::string, int>>> outputModulePathPositions;
+    selector_config_id_ = detail::registerProperSelectionInfo(
+        selectevents, "", outputModulePathPositions, parentProductRegistry->anyProductProduced());
 
     std::map<BranchID, bool> keepAssociation;
     selectProducts(*parentProductRegistry, parentThinnedAssociationsHelper, keepAssociation);
@@ -100,22 +94,25 @@ namespace edm {
     std::string const maxLumis("maxLuminosityBlocks");
 
     // propagate_const<T> has no reset() function
-    processParameterSet_ = std::unique_ptr<ParameterSet>(parameterSet.popParameterSet(std::string("process")).release());
+    processParameterSet_ =
+        std::unique_ptr<ParameterSet>(parameterSet.popParameterSet(std::string("process")).release());
 
     // if this process has a maxEvents or maxLuminosityBlocks parameter set, remove them.
-    if(processParameterSet_->exists(maxEvents)) {
+    if (processParameterSet_->exists(maxEvents)) {
       processParameterSet_->popParameterSet(maxEvents);
     }
-    if(processParameterSet_->exists(maxLumis)) {
+    if (processParameterSet_->exists(maxLumis)) {
       processParameterSet_->popParameterSet(maxLumis);
     }
 
     // if the top level process has a maxEvents or maxLuminosityBlocks parameter set, add them to this process.
-    if(topLevelParameterSet.exists(maxEvents)) {
-      processParameterSet_->addUntrackedParameter<ParameterSet>(maxEvents, topLevelParameterSet.getUntrackedParameterSet(maxEvents));
+    if (topLevelParameterSet.exists(maxEvents)) {
+      processParameterSet_->addUntrackedParameter<ParameterSet>(
+          maxEvents, topLevelParameterSet.getUntrackedParameterSet(maxEvents));
     }
-    if(topLevelParameterSet.exists(maxLumis)) {
-      processParameterSet_->addUntrackedParameter<ParameterSet>(maxLumis, topLevelParameterSet.getUntrackedParameterSet(maxLumis));
+    if (topLevelParameterSet.exists(maxLumis)) {
+      processParameterSet_->addUntrackedParameter<ParameterSet>(
+          maxLumis, topLevelParameterSet.getUntrackedParameterSet(maxLumis));
     }
 
     // If there are subprocesses, pop the subprocess parameter sets out of the process parameter set
@@ -140,7 +137,6 @@ namespace edm {
     parentActReg.connectToSubProcess(*items.actReg_);
     serviceToken_ = items.addCPRandTNS(*processParameterSet_, newToken);
 
-
     //make the services available
     ServiceRegistry::Operate operate(serviceToken_);
 
@@ -154,10 +150,11 @@ namespace edm {
     updateBranchIDListHelper(parentBranchIDListHelper->branchIDLists());
 
     thinnedAssociationsHelper_ = items.thinnedAssociationsHelper();
-    thinnedAssociationsHelper_->updateFromParentProcess(parentThinnedAssociationsHelper, keepAssociation, droppedBranchIDToKeptBranchID_);
+    thinnedAssociationsHelper_->updateFromParentProcess(
+        parentThinnedAssociationsHelper, keepAssociation, droppedBranchIDToKeptBranchID_);
 
     // intialize the Schedule
-    schedule_ = items.initSchedule(*processParameterSet_,hasSubProcesses,preallocConfig,&processContext_);
+    schedule_ = items.initSchedule(*processParameterSet_, hasSubProcesses, preallocConfig, &processContext_);
 
     // set the items
     act_table_ = std::move(items.act_table_);
@@ -171,13 +168,12 @@ namespace edm {
     // another thread. We really need to change how this is done in the PrincipalCache.
     principalCache_.setProcessHistoryRegistry(processHistoryRegistries_[historyRunOffset_]);
 
-
     processConfiguration_ = items.processConfiguration();
     processContext_.setProcessConfiguration(processConfiguration_.get());
     processContext_.setParentProcessContext(parentProcessContext);
 
     principalCache_.setNumberOfConcurrentPrincipals(preallocConfig);
-    for(unsigned int index = 0; index < preallocConfig.numberOfStreams(); ++index) {
+    for (unsigned int index = 0; index < preallocConfig.numberOfStreams(); ++index) {
       auto ep = std::make_shared<EventPrincipal>(preg_,
                                                  branchIDListHelper(),
                                                  thinnedAssociationsHelper(),
@@ -187,15 +183,16 @@ namespace edm {
                                                  false /*not primary process*/);
       principalCache_.insert(ep);
     }
-    for(unsigned int index = 0; index < preallocConfig.numberOfLuminosityBlocks(); ++ index) {
-      auto lbpp = std::make_unique<LuminosityBlockPrincipal>(preg_, *processConfiguration_, &(historyAppenders_[historyLumiOffset_+index]),index,false);
+    for (unsigned int index = 0; index < preallocConfig.numberOfLuminosityBlocks(); ++index) {
+      auto lbpp = std::make_unique<LuminosityBlockPrincipal>(
+          preg_, *processConfiguration_, &(historyAppenders_[historyLumiOffset_ + index]), index, false);
       principalCache_.insert(std::move(lbpp));
     }
-      
+
     inUseLumiPrincipals_.resize(preallocConfig.numberOfLuminosityBlocks());
 
     subProcesses_.reserve(subProcessVParameterSet.size());
-    for(auto& subProcessPSet : subProcessVParameterSet) {
+    for (auto& subProcessPSet : subProcessVParameterSet) {
       subProcesses_.emplace_back(subProcessPSet,
                                  topLevelParameterSet,
                                  preg_,
@@ -213,26 +210,18 @@ namespace edm {
 
   SubProcess::~SubProcess() {}
 
-  void
-  SubProcess::doBeginJob() {
-    this->beginJob();
-  }
+  void SubProcess::doBeginJob() { this->beginJob(); }
 
-  void
-  SubProcess::doEndJob() {
-    endJob();
-  }
+  void SubProcess::doEndJob() { endJob(); }
 
-
-  void
-  SubProcess::beginJob() {
+  void SubProcess::beginJob() {
     // If event selection is being used, the SubProcess class reads TriggerResults
     // object(s) in the parent process from the event. This next call is needed for
     // getByToken to work properly. Normally, this is done by the worker, but since
     // a SubProcess is not a module, it has no worker.
-    updateLookup(InEvent, *parentPreg_->productLookup(InEvent),false);
+    updateLookup(InEvent, *parentPreg_->productLookup(InEvent), false);
 
-    if(!droppedBranchIDToKeptBranchID().empty()) {
+    if (!droppedBranchIDToKeptBranchID().empty()) {
       fixBranchIDListsForEDAliases(droppedBranchIDToKeptBranchID());
     }
     ServiceRegistry::Operate operate(serviceToken_);
@@ -241,28 +230,28 @@ namespace edm {
     //NOTE: this may throw
     checkForModuleDependencyCorrectness(pathsAndConsumesOfModules_, false);
     actReg_->preBeginJobSignal_(pathsAndConsumesOfModules_, processContext_);
-    schedule_->beginJob(*preg_);
-    for_all(subProcesses_, [](auto& subProcess){ subProcess.doBeginJob(); });
+    schedule_->beginJob(*preg_, esp_->recordsToProxyIndices());
+    for_all(subProcesses_, [](auto& subProcess) { subProcess.doBeginJob(); });
   }
 
-  void
-  SubProcess::endJob() {
+  void SubProcess::endJob() {
     ServiceRegistry::Operate operate(serviceToken_);
-    ExceptionCollector c("Multiple exceptions were thrown while executing endJob. An exception message follows for each.");
+    ExceptionCollector c(
+        "Multiple exceptions were thrown while executing endJob. An exception message follows for each.");
     schedule_->endJob(c);
-    for(auto& subProcess : subProcesses_) {
-      c.call([&subProcess](){ subProcess.doEndJob();});
+    for (auto& subProcess : subProcesses_) {
+      c.call([&subProcess]() { subProcess.doEndJob(); });
     }
-    if(c.hasThrown()) {
+    if (c.hasThrown()) {
       c.rethrow();
     }
   }
 
-  void
-  SubProcess::selectProducts(ProductRegistry const& preg,
-                             ThinnedAssociationsHelper const& parentThinnedAssociationsHelper,
-                             std::map<BranchID, bool>& keepAssociation) {
-    if(productSelector_.initialized()) return;
+  void SubProcess::selectProducts(ProductRegistry const& preg,
+                                  ThinnedAssociationsHelper const& parentThinnedAssociationsHelper,
+                                  std::map<BranchID, bool>& keepAssociation) {
+    if (productSelector_.initialized())
+      return;
     productSelector_.initialize(productSelectorRules_, preg.allBranchDescriptions());
 
     // TODO: See if we can collapse keptProducts_ and productSelector_ into a
@@ -273,26 +262,25 @@ namespace edm {
     std::vector<BranchDescription const*> associationDescriptions;
     std::set<BranchID> keptProductsInEvent;
 
-    for(auto const& it : preg.productList()) {
+    for (auto const& it : preg.productList()) {
       BranchDescription const& desc = it.second;
-      if(desc.transient()) {
+      if (desc.transient()) {
         // if the class of the branch is marked transient, output nothing
-      } else if(!desc.present() && !desc.produced()) {
+      } else if (!desc.present() && !desc.produced()) {
         // else if the branch containing the product has been previously dropped,
         // output nothing
-      } else if(desc.unwrappedType() == typeid(ThinnedAssociation)) {
+      } else if (desc.unwrappedType() == typeid(ThinnedAssociation)) {
         associationDescriptions.push_back(&desc);
-      } else if(productSelector_.selected(desc)) {
+      } else if (productSelector_.selected(desc)) {
         keepThisBranch(desc, trueBranchIDToKeptBranchDesc, keptProductsInEvent);
       }
     }
 
-    parentThinnedAssociationsHelper.selectAssociationProducts(associationDescriptions,
-                                                              keptProductsInEvent,
-                                                              keepAssociation);
+    parentThinnedAssociationsHelper.selectAssociationProducts(
+        associationDescriptions, keptProductsInEvent, keepAssociation);
 
-    for(auto association : associationDescriptions) {
-      if(keepAssociation[association->branchID()]) {
+    for (auto association : associationDescriptions) {
+      if (keepAssociation[association->branchID()]) {
         keepThisBranch(*association, trueBranchIDToKeptBranchDesc, keptProductsInEvent);
       }
     }
@@ -304,153 +292,141 @@ namespace edm {
   void SubProcess::keepThisBranch(BranchDescription const& desc,
                                   std::map<BranchID, BranchDescription const*>& trueBranchIDToKeptBranchDesc,
                                   std::set<BranchID>& keptProductsInEvent) {
+    ProductSelector::checkForDuplicateKeptBranch(desc, trueBranchIDToKeptBranchDesc);
 
-    ProductSelector::checkForDuplicateKeptBranch(desc,
-                                                 trueBranchIDToKeptBranchDesc);
-
-    if(desc.branchType() == InEvent) {
-      if(desc.produced()) {
+    if (desc.branchType() == InEvent) {
+      if (desc.produced()) {
         keptProductsInEvent.insert(desc.originalBranchID());
       } else {
         keptProductsInEvent.insert(desc.branchID());
       }
     }
-    EDGetToken token = consumes(TypeToGet{desc.unwrappedTypeID(),PRODUCT_TYPE},
-                                InputTag{desc.moduleLabel(),
-                                    desc.productInstanceName(),
-                                    desc.processName()});
+    EDGetToken token = consumes(TypeToGet{desc.unwrappedTypeID(), PRODUCT_TYPE},
+                                InputTag{desc.moduleLabel(), desc.productInstanceName(), desc.processName()});
 
     // Now put it in the list of selected branches.
     keptProducts_[desc.branchType()].push_back(std::make_pair(&desc, token));
   }
 
-  void
-  SubProcess::fixBranchIDListsForEDAliases(std::map<BranchID::value_type, BranchID::value_type> const& droppedBranchIDToKeptBranchID) {
+  void SubProcess::fixBranchIDListsForEDAliases(
+      std::map<BranchID::value_type, BranchID::value_type> const& droppedBranchIDToKeptBranchID) {
     // Check for branches dropped while an EDAlias was kept.
     // Replace BranchID of each dropped branch with that of the kept alias.
-    for(BranchIDList& branchIDList : branchIDListHelper_->mutableBranchIDLists()) {
-      for(BranchID::value_type& branchID : branchIDList) {
-        std::map<BranchID::value_type, BranchID::value_type>::const_iterator iter = droppedBranchIDToKeptBranchID.find(branchID);
-        if(iter != droppedBranchIDToKeptBranchID.end()) {
+    for (BranchIDList& branchIDList : branchIDListHelper_->mutableBranchIDLists()) {
+      for (BranchID::value_type& branchID : branchIDList) {
+        std::map<BranchID::value_type, BranchID::value_type>::const_iterator iter =
+            droppedBranchIDToKeptBranchID.find(branchID);
+        if (iter != droppedBranchIDToKeptBranchID.end()) {
           branchID = iter->second;
         }
       }
     }
-    for_all(subProcesses_, [&droppedBranchIDToKeptBranchID](auto& subProcess){ subProcess.fixBranchIDListsForEDAliases(droppedBranchIDToKeptBranchID); });
+    for_all(subProcesses_, [&droppedBranchIDToKeptBranchID](auto& subProcess) {
+      subProcess.fixBranchIDListsForEDAliases(droppedBranchIDToKeptBranchID);
+    });
   }
 
-  void
-  SubProcess::doEventAsync(WaitingTaskHolder iHolder,
-                           EventPrincipal const& ep) {
+  void SubProcess::doEventAsync(WaitingTaskHolder iHolder, EventPrincipal const& ep) {
     ServiceRegistry::Operate operate(serviceToken_);
     /* BEGIN relevant bits from OutputModule::doEvent */
-    if(!wantAllEvents_) {
+    if (!wantAllEvents_) {
       EventForOutput e(ep, ModuleDescription(), nullptr);
       e.setConsumer(this);
-      if(!selectors_.wantEvent(e)) {
+      if (!selectors_.wantEvent(e)) {
         return;
       }
     }
-    processAsync(std::move(iHolder),ep);
+    processAsync(std::move(iHolder), ep);
     /* END relevant bits from OutputModule::doEvent */
   }
 
-  void
-  SubProcess::processAsync(WaitingTaskHolder iHolder,
-                           EventPrincipal const& principal) {
+  void SubProcess::processAsync(WaitingTaskHolder iHolder, EventPrincipal const& principal) {
     EventAuxiliary aux(principal.aux());
     aux.setProcessHistoryID(principal.processHistoryID());
-    
+
     EventSelectionIDVector esids{principal.eventSelectionIDs()};
     if (principal.productRegistry().anyProductProduced() || !wantAllEvents_) {
       esids.push_back(selector_config_id_);
     }
-    
+
     EventPrincipal& ep = principalCache_.eventPrincipal(principal.streamID().value());
-    auto & processHistoryRegistry = processHistoryRegistries_[principal.streamID().value()];
+    auto& processHistoryRegistry = processHistoryRegistries_[principal.streamID().value()];
     processHistoryRegistry.registerProcessHistory(principal.processHistory());
     BranchListIndexes bli(principal.branchListIndexes());
     branchIDListHelper_->fixBranchListIndexes(bli);
     bool deepCopyRetriever = false;
-    ep.fillEventPrincipal(aux,
-                          processHistoryRegistry,
-                          std::move(esids),
-                          std::move(bli),
-                          *(principal.productProvenanceRetrieverPtr()),//NOTE: this transfers the per product provenance
-                          principal.reader(),
-                          deepCopyRetriever);
+    ep.fillEventPrincipal(
+        aux,
+        processHistoryRegistry,
+        std::move(esids),
+        std::move(bli),
+        *(principal.productProvenanceRetrieverPtr()),  //NOTE: this transfers the per product provenance
+        principal.reader(),
+        deepCopyRetriever);
     ep.setLuminosityBlockPrincipal(inUseLumiPrincipals_[principal.luminosityBlockPrincipal().index()].get());
     propagateProducts(InEvent, principal, ep);
-    
-    WaitingTaskHolder finalizeEventTask( make_waiting_task(tbb::task::allocate_root(),
-                                                           [&ep,iHolder](std::exception_ptr const* iPtr) mutable
-      {
-        ep.clearEventPrincipal();
-        if(iPtr) {
-          iHolder.doneWaiting(*iPtr);
-        } else {
-          iHolder.doneWaiting(std::exception_ptr());
-        }
-      }
-                                                           )
-                                        );
+
+    WaitingTaskHolder finalizeEventTask(
+        make_waiting_task(tbb::task::allocate_root(), [&ep, iHolder](std::exception_ptr const* iPtr) mutable {
+          ep.clearEventPrincipal();
+          if (iPtr) {
+            iHolder.doneWaiting(*iPtr);
+          } else {
+            iHolder.doneWaiting(std::exception_ptr());
+          }
+        }));
     WaitingTaskHolder afterProcessTask;
-    if(subProcesses_.empty()) {
+    if (subProcesses_.empty()) {
       afterProcessTask = std::move(finalizeEventTask);
     } else {
-      afterProcessTask = WaitingTaskHolder(
-                                           make_waiting_task(tbb::task::allocate_root(),
-                                                             [this,&ep,finalizeEventTask] (std::exception_ptr const* iPtr) mutable{
-        if(not iPtr) {
-          for(auto& subProcess: boost::adaptors::reverse(subProcesses_)) {
-            subProcess.doEventAsync(finalizeEventTask,ep);
-          }
-        } else {
-          finalizeEventTask.doneWaiting(*iPtr);
-        }
-      })
-                                           );
+      afterProcessTask = WaitingTaskHolder(make_waiting_task(
+          tbb::task::allocate_root(), [this, &ep, finalizeEventTask](std::exception_ptr const* iPtr) mutable {
+            if (not iPtr) {
+              for (auto& subProcess : boost::adaptors::reverse(subProcesses_)) {
+                subProcess.doEventAsync(finalizeEventTask, ep);
+              }
+            } else {
+              finalizeEventTask.doneWaiting(*iPtr);
+            }
+          }));
     }
-    
-    schedule_->processOneEventAsync(std::move(afterProcessTask),
-                                    ep.streamID().value(),ep, esp_->eventSetup(),serviceToken_);
+
+    schedule_->processOneEventAsync(
+        std::move(afterProcessTask), ep.streamID().value(), ep, esp_->eventSetup(), serviceToken_);
   }
 
-  void
-  SubProcess::doBeginRunAsync(WaitingTaskHolder iHolder, RunPrincipal const& principal, IOVSyncValue const& ts) {
+  void SubProcess::doBeginRunAsync(WaitingTaskHolder iHolder, RunPrincipal const& principal, IOVSyncValue const& ts) {
     ServiceRegistry::Operate operate(serviceToken_);
 
     auto aux = std::make_shared<RunAuxiliary>(principal.aux());
     aux->setProcessHistoryID(principal.processHistoryID());
-    auto rpp = std::make_shared<RunPrincipal>(aux, preg_, *processConfiguration_, &(historyAppenders_[historyRunOffset_+principal.index()]),principal.index(),false);
-    auto & processHistoryRegistry = processHistoryRegistries_[historyRunOffset_+principal.index()];
+    auto rpp = std::make_shared<RunPrincipal>(aux,
+                                              preg_,
+                                              *processConfiguration_,
+                                              &(historyAppenders_[historyRunOffset_ + principal.index()]),
+                                              principal.index(),
+                                              false);
+    auto& processHistoryRegistry = processHistoryRegistries_[historyRunOffset_ + principal.index()];
     processHistoryRegistry.registerProcessHistory(principal.processHistory());
     rpp->fillRunPrincipal(processHistoryRegistry, principal.reader());
     principalCache_.insert(rpp);
-    
+
     ProcessHistoryID const& parentInputReducedPHID = principal.reducedProcessHistoryID();
-    ProcessHistoryID const& inputReducedPHID       = rpp->reducedProcessHistoryID();
-    
-    parentToChildPhID_.insert(std::make_pair(parentInputReducedPHID,inputReducedPHID));
-    
+    ProcessHistoryID const& inputReducedPHID = rpp->reducedProcessHistoryID();
+
+    parentToChildPhID_.insert(std::make_pair(parentInputReducedPHID, inputReducedPHID));
+
     RunPrincipal& rp = *principalCache_.runPrincipalPtr();
     propagateProducts(InRun, principal, rp);
     typedef OccurrenceTraits<RunPrincipal, BranchActionGlobalBegin> Traits;
-    beginGlobalTransitionAsync<Traits>(std::move(iHolder),
-                                       *schedule_,
-                                       rp,
-                                       ts,
-                                       esp_->eventSetup(),
-                                       serviceToken_,
-                                       subProcesses_);
+    beginGlobalTransitionAsync<Traits>(
+        std::move(iHolder), *schedule_, rp, ts, esp_->eventSetup(), serviceToken_, subProcesses_);
   }
 
-  
-  void
-  SubProcess::doEndRunAsync(WaitingTaskHolder iHolder,
-                            RunPrincipal const& principal,
-                            IOVSyncValue const& ts,
-                            bool cleaningUpAfterException) {
+  void SubProcess::doEndRunAsync(WaitingTaskHolder iHolder,
+                                 RunPrincipal const& principal,
+                                 IOVSyncValue const& ts,
+                                 bool cleaningUpAfterException) {
     RunPrincipal& rp = *principalCache_.runPrincipalPtr();
     propagateProducts(InRun, principal, rp);
     typedef OccurrenceTraits<RunPrincipal, BranchActionGlobalEnd> Traits;
@@ -464,46 +440,53 @@ namespace edm {
                                      cleaningUpAfterException);
   }
 
-  void
-  SubProcess::writeRunAsync(edm::WaitingTaskHolder task, ProcessHistoryID const& parentPhID, int runNumber,
-                            MergeableRunProductMetadata const* mergeableRunProductMetadata) {
+  void SubProcess::writeRunAsync(edm::WaitingTaskHolder task,
+                                 ProcessHistoryID const& parentPhID,
+                                 int runNumber,
+                                 MergeableRunProductMetadata const* mergeableRunProductMetadata) {
     ServiceRegistry::Operate operate(serviceToken_);
     std::map<ProcessHistoryID, ProcessHistoryID>::const_iterator it = parentToChildPhID_.find(parentPhID);
     assert(it != parentToChildPhID_.end());
     auto const& childPhID = it->second;
-    
-    auto subTasks = edm::make_waiting_task(tbb::task::allocate_root(), [this,childPhID,runNumber, task, mergeableRunProductMetadata](std::exception_ptr const* iExcept) mutable {
-      if( iExcept) {
-        task.doneWaiting(*iExcept);
-      } else {
-        ServiceRegistry::Operate operate(serviceToken_);
-        for(auto& s: subProcesses_) {
-          s.writeRunAsync(task, childPhID, runNumber, mergeableRunProductMetadata);
-        }
-      }
-    });
-    schedule_->writeRunAsync(WaitingTaskHolder(subTasks),principalCache_.runPrincipal(childPhID, runNumber),
-                             &processContext_, actReg_.get(), mergeableRunProductMetadata);
+
+    auto subTasks = edm::make_waiting_task(
+        tbb::task::allocate_root(),
+        [this, childPhID, runNumber, task, mergeableRunProductMetadata](std::exception_ptr const* iExcept) mutable {
+          if (iExcept) {
+            task.doneWaiting(*iExcept);
+          } else {
+            ServiceRegistry::Operate operate(serviceToken_);
+            for (auto& s : subProcesses_) {
+              s.writeRunAsync(task, childPhID, runNumber, mergeableRunProductMetadata);
+            }
+          }
+        });
+    schedule_->writeRunAsync(WaitingTaskHolder(subTasks),
+                             principalCache_.runPrincipal(childPhID, runNumber),
+                             &processContext_,
+                             actReg_.get(),
+                             mergeableRunProductMetadata);
   }
 
-  void
-  SubProcess::deleteRunFromCache(ProcessHistoryID const& parentPhID, int runNumber) {
+  void SubProcess::deleteRunFromCache(ProcessHistoryID const& parentPhID, int runNumber) {
     std::map<ProcessHistoryID, ProcessHistoryID>::const_iterator it = parentToChildPhID_.find(parentPhID);
     assert(it != parentToChildPhID_.end());
     auto const& childPhID = it->second;
     principalCache_.deleteRun(childPhID, runNumber);
-    for_all(subProcesses_, [&childPhID, runNumber](auto& subProcess){ subProcess.deleteRunFromCache(childPhID, runNumber); });
+    for_all(subProcesses_,
+            [&childPhID, runNumber](auto& subProcess) { subProcess.deleteRunFromCache(childPhID, runNumber); });
   }
 
-  void
-  SubProcess::doBeginLuminosityBlockAsync(WaitingTaskHolder iHolder, LuminosityBlockPrincipal const& principal, IOVSyncValue const& ts) {
+  void SubProcess::doBeginLuminosityBlockAsync(WaitingTaskHolder iHolder,
+                                               LuminosityBlockPrincipal const& principal,
+                                               IOVSyncValue const& ts) {
     ServiceRegistry::Operate operate(serviceToken_);
 
     auto aux = principal.aux();
     aux.setProcessHistoryID(principal.processHistoryID());
     auto lbpp = principalCache_.getAvailableLumiPrincipalPtr();
     lbpp->setAux(aux);
-    auto & processHistoryRegistry = processHistoryRegistries_[historyLumiOffset_+lbpp->index()];
+    auto& processHistoryRegistry = processHistoryRegistries_[historyLumiOffset_ + lbpp->index()];
     inUseLumiPrincipals_[principal.index()] = lbpp;
     processHistoryRegistry.registerProcessHistory(principal.processHistory());
     lbpp->fillLuminosityBlockPrincipal(processHistoryRegistry, principal.reader());
@@ -511,18 +494,14 @@ namespace edm {
     LuminosityBlockPrincipal& lbp = *lbpp;
     propagateProducts(InLumi, principal, lbp);
     typedef OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalBegin> Traits;
-    beginGlobalTransitionAsync<Traits>(std::move(iHolder),
-                                       *schedule_,
-                                       lbp,
-                                       ts,
-                                       esp_->eventSetup(),
-                                       serviceToken_,
-                                       subProcesses_);
+    beginGlobalTransitionAsync<Traits>(
+        std::move(iHolder), *schedule_, lbp, ts, esp_->eventSetup(), serviceToken_, subProcesses_);
   }
 
-  void
-  SubProcess::doEndLuminosityBlockAsync(WaitingTaskHolder iHolder,LuminosityBlockPrincipal const& principal, IOVSyncValue const& ts, bool cleaningUpAfterException) {
-    
+  void SubProcess::doEndLuminosityBlockAsync(WaitingTaskHolder iHolder,
+                                             LuminosityBlockPrincipal const& principal,
+                                             IOVSyncValue const& ts,
+                                             bool cleaningUpAfterException) {
     LuminosityBlockPrincipal& lbp = *inUseLumiPrincipals_[principal.index()];
     propagateProducts(InLumi, principal, lbp);
     typedef OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalEnd> Traits;
@@ -536,130 +515,114 @@ namespace edm {
                                      cleaningUpAfterException);
   }
 
-  
-  void
-  SubProcess::writeLumiAsync(WaitingTaskHolder task, LuminosityBlockPrincipal& principal) {
+  void SubProcess::writeLumiAsync(WaitingTaskHolder task, LuminosityBlockPrincipal& principal) {
     ServiceRegistry::Operate operate(serviceToken_);
 
-    auto l =inUseLumiPrincipals_[principal.index()];
-    auto subTasks = edm::make_waiting_task(tbb::task::allocate_root(), [this,l, task](std::exception_ptr const* iExcept) mutable {
-      if( iExcept) {
-        task.doneWaiting(*iExcept);
-      } else {
-        ServiceRegistry::Operate operate(serviceToken_);
-        for(auto& s: subProcesses_) {
-          s.writeLumiAsync(task, *l);
-        }
-      }
-    });
-    schedule_->writeLumiAsync(WaitingTaskHolder(subTasks),*l, &processContext_, actReg_.get());
+    auto l = inUseLumiPrincipals_[principal.index()];
+    auto subTasks =
+        edm::make_waiting_task(tbb::task::allocate_root(), [this, l, task](std::exception_ptr const* iExcept) mutable {
+          if (iExcept) {
+            task.doneWaiting(*iExcept);
+          } else {
+            ServiceRegistry::Operate operate(serviceToken_);
+            for (auto& s : subProcesses_) {
+              s.writeLumiAsync(task, *l);
+            }
+          }
+        });
+    schedule_->writeLumiAsync(WaitingTaskHolder(subTasks), *l, &processContext_, actReg_.get());
   }
 
-  void
-  SubProcess::deleteLumiFromCache(LuminosityBlockPrincipal& principal) {
+  void SubProcess::deleteLumiFromCache(LuminosityBlockPrincipal& principal) {
     //release from list but stay around till end of routine
     auto lb = std::move(inUseLumiPrincipals_[principal.index()]);
-    for(auto& s: subProcesses_) {
+    for (auto& s : subProcesses_) {
       s.deleteLumiFromCache(*lb);
     }
     lb->clearPrincipal();
   }
 
-  void
-  SubProcess::doBeginStream(unsigned int iID) {
+  void SubProcess::doBeginStream(unsigned int iID) {
     ServiceRegistry::Operate operate(serviceToken_);
     schedule_->beginStream(iID);
-    for_all(subProcesses_, [iID](auto& subProcess){ subProcess.doBeginStream(iID); });
+    for_all(subProcesses_, [iID](auto& subProcess) { subProcess.doBeginStream(iID); });
   }
 
-  void
-  SubProcess::doEndStream(unsigned int iID) {
+  void SubProcess::doEndStream(unsigned int iID) {
     ServiceRegistry::Operate operate(serviceToken_);
     schedule_->endStream(iID);
-    for_all(subProcesses_, [iID](auto& subProcess){ subProcess.doEndStream(iID); });
+    for_all(subProcesses_, [iID](auto& subProcess) { subProcess.doEndStream(iID); });
   }
 
-  void
-  SubProcess::doStreamBeginRunAsync(WaitingTaskHolder iHolder,
-                                    unsigned int id, RunPrincipal const& principal, IOVSyncValue const& ts) {
+  void SubProcess::doStreamBeginRunAsync(WaitingTaskHolder iHolder,
+                                         unsigned int id,
+                                         RunPrincipal const& principal,
+                                         IOVSyncValue const& ts) {
     typedef OccurrenceTraits<RunPrincipal, BranchActionStreamBegin> Traits;
 
     RunPrincipal& rp = *principalCache_.runPrincipalPtr();
 
-    beginStreamTransitionAsync<Traits>(std::move(iHolder),
-                                       *schedule_,
-                                       id,
-                                       rp,
-                                       ts,
-                                       esp_->eventSetup(),
-                                       serviceToken_,
-                                       subProcesses_);
-    
+    beginStreamTransitionAsync<Traits>(
+        std::move(iHolder), *schedule_, id, rp, ts, esp_->eventSetup(), serviceToken_, subProcesses_);
   }
 
-  
-  void
-  SubProcess::doStreamEndRunAsync(WaitingTaskHolder iHolder,
-                                  unsigned int id, RunPrincipal const& principal, IOVSyncValue const& ts, bool cleaningUpAfterException) {
+  void SubProcess::doStreamEndRunAsync(WaitingTaskHolder iHolder,
+                                       unsigned int id,
+                                       RunPrincipal const& principal,
+                                       IOVSyncValue const& ts,
+                                       bool cleaningUpAfterException) {
     RunPrincipal& rp = *principalCache_.runPrincipalPtr();
     typedef OccurrenceTraits<RunPrincipal, BranchActionStreamEnd> Traits;
-    
+
     endStreamTransitionAsync<Traits>(std::move(iHolder),
-                                      *schedule_,
-                                       id,
-                                       rp,
-                                       ts,
-                                       esp_->eventSetup(),
-                                       serviceToken_,
-                                       subProcesses_,
+                                     *schedule_,
+                                     id,
+                                     rp,
+                                     ts,
+                                     esp_->eventSetup(),
+                                     serviceToken_,
+                                     subProcesses_,
                                      cleaningUpAfterException);
   }
 
-  void
-  SubProcess::doStreamBeginLuminosityBlockAsync(WaitingTaskHolder iHolder,
-                                                unsigned int id, LuminosityBlockPrincipal const& principal, IOVSyncValue const& ts) {
+  void SubProcess::doStreamBeginLuminosityBlockAsync(WaitingTaskHolder iHolder,
+                                                     unsigned int id,
+                                                     LuminosityBlockPrincipal const& principal,
+                                                     IOVSyncValue const& ts) {
     typedef OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamBegin> Traits;
-    
+
     LuminosityBlockPrincipal& lbp = *inUseLumiPrincipals_[principal.index()];
-    
-    beginStreamTransitionAsync<Traits>(std::move(iHolder),
-                                       *schedule_,
-                                       id,
-                                       lbp,
-                                       ts,
-                                       esp_->eventSetup(),
-                                       serviceToken_,
-                                       subProcesses_);
+
+    beginStreamTransitionAsync<Traits>(
+        std::move(iHolder), *schedule_, id, lbp, ts, esp_->eventSetup(), serviceToken_, subProcesses_);
   }
 
-  
-  
-  void
-  SubProcess::doStreamEndLuminosityBlockAsync(WaitingTaskHolder iHolder,
-                                              unsigned int id, LuminosityBlockPrincipal const& principal, IOVSyncValue const& ts, bool cleaningUpAfterException) {
+  void SubProcess::doStreamEndLuminosityBlockAsync(WaitingTaskHolder iHolder,
+                                                   unsigned int id,
+                                                   LuminosityBlockPrincipal const& principal,
+                                                   IOVSyncValue const& ts,
+                                                   bool cleaningUpAfterException) {
     LuminosityBlockPrincipal& lbp = *inUseLumiPrincipals_[principal.index()];
     typedef OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamEnd> Traits;
     endStreamTransitionAsync<Traits>(std::move(iHolder),
-                                       *schedule_,
-                                       id,
-                                       lbp,
-                                       ts,
-                                       esp_->eventSetup(),
-                                       serviceToken_,
-                                       subProcesses_,
-                                       cleaningUpAfterException);
+                                     *schedule_,
+                                     id,
+                                     lbp,
+                                     ts,
+                                     esp_->eventSetup(),
+                                     serviceToken_,
+                                     subProcesses_,
+                                     cleaningUpAfterException);
   }
 
-
-  void
-  SubProcess::propagateProducts(BranchType type, Principal const& parentPrincipal, Principal& principal) const {
+  void SubProcess::propagateProducts(BranchType type, Principal const& parentPrincipal, Principal& principal) const {
     SelectedProducts const& keptVector = keptProducts()[type];
-    for(auto const& item : keptVector) {
+    for (auto const& item : keptVector) {
       BranchDescription const& desc = *item.first;
       ProductResolverBase const* parentProductResolver = parentPrincipal.getProductResolver(desc.branchID());
-      if(parentProductResolver != nullptr) {
+      if (parentProductResolver != nullptr) {
         ProductResolverBase* productResolver = principal.getModifiableProductResolver(desc.branchID());
-        if(productResolver != nullptr) {
+        if (productResolver != nullptr) {
           //Propagate the per event(run)(lumi) data for this product to the subprocess.
           //First, the product itself.
           productResolver->connectTo(*parentProductResolver, &parentPrincipal);
@@ -670,24 +633,24 @@ namespace edm {
 
   void SubProcess::updateBranchIDListHelper(BranchIDLists const& branchIDLists) {
     branchIDListHelper_->updateFromParent(branchIDLists);
-    for_all(subProcesses_, [this](auto& subProcess){ subProcess.updateBranchIDListHelper(branchIDListHelper_->branchIDLists()); });
+    for_all(subProcesses_,
+            [this](auto& subProcess) { subProcess.updateBranchIDListHelper(branchIDListHelper_->branchIDLists()); });
   }
 
   // Call respondToOpenInputFile() on all Modules
-  void
-  SubProcess::respondToOpenInputFile(FileBlock const& fb) {
+  void SubProcess::respondToOpenInputFile(FileBlock const& fb) {
     ServiceRegistry::Operate operate(serviceToken_);
     schedule_->respondToOpenInputFile(fb);
-    for_all(subProcesses_, [&fb](auto& subProcess){ subProcess.respondToOpenInputFile(fb); });
+    for_all(subProcesses_, [&fb](auto& subProcess) { subProcess.respondToOpenInputFile(fb); });
   }
 
   // free function
-  std::vector<ParameterSet>
-  popSubProcessVParameterSet(ParameterSet& parameterSet) {
-    std::vector<std::string> subProcesses = parameterSet.getUntrackedParameter<std::vector<std::string>>("@all_subprocesses");
-    if(!subProcesses.empty()) {
+  std::vector<ParameterSet> popSubProcessVParameterSet(ParameterSet& parameterSet) {
+    std::vector<std::string> subProcesses =
+        parameterSet.getUntrackedParameter<std::vector<std::string>>("@all_subprocesses");
+    if (!subProcesses.empty()) {
       return parameterSet.popVParameterSet("subProcesses");
     }
     return {};
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/SystemTimeKeeper.cc b/FWCore/Framework/src/SystemTimeKeeper.cc
index bcd8251c55f28..e7d662cf4c7eb 100644
--- a/FWCore/Framework/src/SystemTimeKeeper.cc
+++ b/FWCore/Framework/src/SystemTimeKeeper.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     SystemTimeKeeper
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -41,85 +41,75 @@ using namespace edm;
 SystemTimeKeeper::SystemTimeKeeper(unsigned int iNumStreams,
                                    std::vector<const ModuleDescription*> const& iModules,
                                    service::TriggerNamesService const& iNamesService,
-                                   ProcessContext const* iProcessContext):
-m_streamEventTimer(iNumStreams),
-m_streamPathTiming(iNumStreams),
-m_modules(iModules),
-m_processContext(iProcessContext),
-m_minModuleID(0),
-m_numberOfEvents(0)
-{
-  std::sort(m_modules.begin(),m_modules.end(),
-            [] (const ModuleDescription* iLHS,
-                      const ModuleDescription* iRHS) -> bool {
-              return iLHS->id() < iRHS->id();
-            });
-  if(not m_modules.empty()) {
+                                   ProcessContext const* iProcessContext)
+    : m_streamEventTimer(iNumStreams),
+      m_streamPathTiming(iNumStreams),
+      m_modules(iModules),
+      m_processContext(iProcessContext),
+      m_minModuleID(0),
+      m_numberOfEvents(0) {
+  std::sort(
+      m_modules.begin(), m_modules.end(), [](const ModuleDescription* iLHS, const ModuleDescription* iRHS) -> bool {
+        return iLHS->id() < iRHS->id();
+      });
+  if (not m_modules.empty()) {
     m_minModuleID = m_modules.front()->id();
     unsigned int numModuleSlots = m_modules.back()->id() - m_minModuleID + 1;
     m_streamModuleTiming.resize(iNumStreams);
-    for(auto& stream: m_streamModuleTiming) {
+    for (auto& stream : m_streamModuleTiming) {
       stream.resize(numModuleSlots);
     }
   }
-  
-  
+
   std::vector<unsigned int> numModulesInPath;
   std::vector<unsigned int> numModulesInEndPath;
-  
+
   const unsigned int numPaths = iNamesService.getTrigPaths().size();
   const unsigned int numEndPaths = iNamesService.getEndPaths().size();
-  m_pathNames.reserve(numPaths+numEndPaths);
-  std::copy(iNamesService.getTrigPaths().begin(),
-            iNamesService.getTrigPaths().end(),
-            std::back_inserter(m_pathNames));
-  std::copy(iNamesService.getEndPaths().begin(),
-            iNamesService.getEndPaths().end(),
-            std::back_inserter(m_pathNames));
-  
+  m_pathNames.reserve(numPaths + numEndPaths);
+  std::copy(iNamesService.getTrigPaths().begin(), iNamesService.getTrigPaths().end(), std::back_inserter(m_pathNames));
+  std::copy(iNamesService.getEndPaths().begin(), iNamesService.getEndPaths().end(), std::back_inserter(m_pathNames));
+
   numModulesInPath.reserve(numPaths);
   numModulesInEndPath.reserve(numEndPaths);
-  
-  m_modulesOnPaths.reserve(numPaths+numEndPaths);
-  
-  for(unsigned int i =0; i<numPaths;++i) {
+
+  m_modulesOnPaths.reserve(numPaths + numEndPaths);
+
+  for (unsigned int i = 0; i < numPaths; ++i) {
     numModulesInPath.push_back(iNamesService.getTrigPathModules(i).size());
     m_modulesOnPaths.push_back(iNamesService.getTrigPathModules(i));
   }
-  for(unsigned int i =0; i<numEndPaths;++i) {
+  for (unsigned int i = 0; i < numEndPaths; ++i) {
     numModulesInEndPath.push_back(iNamesService.getEndPathModules(i).size());
     m_modulesOnPaths.push_back(iNamesService.getEndPathModules(i));
   }
-  
-  m_endPathOffset =numModulesInPath.size();
 
-  for( auto& stream: m_streamPathTiming) {
+  m_endPathOffset = numModulesInPath.size();
+
+  for (auto& stream : m_streamPathTiming) {
     unsigned int index = 0;
-    stream.resize(numModulesInPath.size()+numModulesInEndPath.size());
-    for(unsigned int numMods : numModulesInPath) {
+    stream.resize(numModulesInPath.size() + numModulesInEndPath.size());
+    for (unsigned int numMods : numModulesInPath) {
       stream[index].m_moduleTiming.resize(numMods);
       ++index;
     }
-    for(unsigned int numMods : numModulesInEndPath) {
+    for (unsigned int numMods : numModulesInEndPath) {
       stream[index].m_moduleTiming.resize(numMods);
       ++index;
     }
-    
   }
 }
 
 //
 // member functions
 //
-SystemTimeKeeper::PathTiming&
-SystemTimeKeeper::pathTiming(StreamContext const& iStream,
-                             PathContext const& iPath) {
+SystemTimeKeeper::PathTiming& SystemTimeKeeper::pathTiming(StreamContext const& iStream, PathContext const& iPath) {
   unsigned int offset = 0;
-  if(iPath.isEndPath()) {
+  if (iPath.isEndPath()) {
     offset = m_endPathOffset;
   }
-  assert(iPath.pathID()+offset < m_streamPathTiming[iStream.streamID().value()].size());
-  return m_streamPathTiming[iStream.streamID().value()][iPath.pathID()+offset];
+  assert(iPath.pathID() + offset < m_streamPathTiming[iStream.streamID().value()].size());
+  return m_streamPathTiming[iStream.streamID().value()][iPath.pathID() + offset];
 }
 
 //NOTE: Have to check bounds rather than ProcessContext on the
@@ -127,137 +117,108 @@ SystemTimeKeeper::pathTiming(StreamContext const& iStream,
 // SubProcess which requested an usncheduled execution of a
 // module in a parent process. In that case the ProcessContext
 // is for the SubProcess but the module is is for the parent process.
-inline bool
-SystemTimeKeeper::checkBounds(unsigned int id) const {
-  return id >= m_minModuleID and id <m_streamModuleTiming.front().size()+ m_minModuleID;
+inline bool SystemTimeKeeper::checkBounds(unsigned int id) const {
+  return id >= m_minModuleID and id < m_streamModuleTiming.front().size() + m_minModuleID;
 }
 
-
-
-void
-SystemTimeKeeper::startEvent(StreamID iID) {
+void SystemTimeKeeper::startEvent(StreamID iID) {
   m_numberOfEvents++;
   m_streamEventTimer[iID.value()].start();
 }
 
-void
-SystemTimeKeeper::stopEvent(StreamContext const& iContext) {
+void SystemTimeKeeper::stopEvent(StreamContext const& iContext) {
   m_streamEventTimer[iContext.streamID().value()].stop();
 }
 
-void
-SystemTimeKeeper::startPath(StreamContext const& iStream,
-                            PathContext const& iPath) {
-  if(m_processContext == iStream.processContext()) {
-    auto& timing = pathTiming(iStream,iPath);
+void SystemTimeKeeper::startPath(StreamContext const& iStream, PathContext const& iPath) {
+  if (m_processContext == iStream.processContext()) {
+    auto& timing = pathTiming(iStream, iPath);
     timing.m_timer.start();
   }
 }
 
-void
-SystemTimeKeeper::stopPath(StreamContext const& iStream,
-                           PathContext const& iPath,
-                           HLTPathStatus const& iStatus) {
-  if(m_processContext == iStream.processContext()) {
-
-    auto& timing = pathTiming(iStream,iPath);
+void SystemTimeKeeper::stopPath(StreamContext const& iStream, PathContext const& iPath, HLTPathStatus const& iStatus) {
+  if (m_processContext == iStream.processContext()) {
+    auto& timing = pathTiming(iStream, iPath);
     timing.m_timer.stop();
-    
+
     //mark all modules up to and including the decision module as being visited
     auto& modsOnPath = timing.m_moduleTiming;
-    for(unsigned int i = 0; i< iStatus.index()+1;++i) {
+    for (unsigned int i = 0; i < iStatus.index() + 1; ++i) {
       ++modsOnPath[i].m_timesVisited;
     }
   }
 }
 
-
-void
-SystemTimeKeeper::startModuleEvent(StreamContext const& iStream, ModuleCallingContext const& iModule) {
-  if(checkBounds(iModule.moduleDescription()->id())) {
-    auto& mod =
-    m_streamModuleTiming[iStream.streamID().value()][iModule.moduleDescription()->id()-m_minModuleID];
+void SystemTimeKeeper::startModuleEvent(StreamContext const& iStream, ModuleCallingContext const& iModule) {
+  if (checkBounds(iModule.moduleDescription()->id())) {
+    auto& mod = m_streamModuleTiming[iStream.streamID().value()][iModule.moduleDescription()->id() - m_minModuleID];
     mod.m_timer.start();
     ++(mod.m_timesRun);
   }
 }
-void SystemTimeKeeper::stopModuleEvent(StreamContext const& iStream,
-                                       ModuleCallingContext const& iModule) {
-  if(checkBounds(iModule.moduleDescription()->id())) {
-    auto& mod =
-    m_streamModuleTiming[iStream.streamID().value()][iModule.moduleDescription()->id()-m_minModuleID];
+void SystemTimeKeeper::stopModuleEvent(StreamContext const& iStream, ModuleCallingContext const& iModule) {
+  if (checkBounds(iModule.moduleDescription()->id())) {
+    auto& mod = m_streamModuleTiming[iStream.streamID().value()][iModule.moduleDescription()->id() - m_minModuleID];
     auto times = mod.m_timer.stop();
-    
-    if(iModule.type() == ParentContext::Type::kPlaceInPath ) {
+
+    if (iModule.type() == ParentContext::Type::kPlaceInPath) {
       auto place = iModule.placeInPathContext();
-      
-      auto& modTiming = pathTiming(iStream,*(place->pathContext())).m_moduleTiming[place->placeInPath()];
+
+      auto& modTiming = pathTiming(iStream, *(place->pathContext())).m_moduleTiming[place->placeInPath()];
       modTiming.m_realTime += times;
     }
   }
 }
-void SystemTimeKeeper::pauseModuleEvent(StreamContext const& iStream,
-                                        ModuleCallingContext const& iModule) {
-  if(checkBounds(iModule.moduleDescription()->id())) {
-    auto& mod =
-    m_streamModuleTiming[iStream.streamID().value()][iModule.moduleDescription()->id()-m_minModuleID];
+void SystemTimeKeeper::pauseModuleEvent(StreamContext const& iStream, ModuleCallingContext const& iModule) {
+  if (checkBounds(iModule.moduleDescription()->id())) {
+    auto& mod = m_streamModuleTiming[iStream.streamID().value()][iModule.moduleDescription()->id() - m_minModuleID];
     auto times = mod.m_timer.stop();
-    
-    if(iModule.type() == ParentContext::Type::kPlaceInPath ) {
+
+    if (iModule.type() == ParentContext::Type::kPlaceInPath) {
       auto place = iModule.placeInPathContext();
-      
-      auto& modTiming = pathTiming(iStream,*(place->pathContext())).m_moduleTiming[place->placeInPath()];
+
+      auto& modTiming = pathTiming(iStream, *(place->pathContext())).m_moduleTiming[place->placeInPath()];
       modTiming.m_realTime += times;
     }
   }
 }
-void
-SystemTimeKeeper::restartModuleEvent(StreamContext const& iStream,
-                                     ModuleCallingContext const& iModule) {
-  if(checkBounds(iModule.moduleDescription()->id())) {
-    auto& mod =
-    m_streamModuleTiming[iStream.streamID().value()][iModule.moduleDescription()->id()-m_minModuleID];
+void SystemTimeKeeper::restartModuleEvent(StreamContext const& iStream, ModuleCallingContext const& iModule) {
+  if (checkBounds(iModule.moduleDescription()->id())) {
+    auto& mod = m_streamModuleTiming[iStream.streamID().value()][iModule.moduleDescription()->id() - m_minModuleID];
     mod.m_timer.start();
   }
 }
 
-void
-SystemTimeKeeper::startProcessingLoop() {
-  m_processingLoopTimer.start();
-}
+void SystemTimeKeeper::startProcessingLoop() { m_processingLoopTimer.start(); }
 
-void
-SystemTimeKeeper::stopProcessingLoop() {
-  m_processingLoopTimer.stop();
-}
+void SystemTimeKeeper::stopProcessingLoop() { m_processingLoopTimer.stop(); }
 
+static void fillPathSummary(unsigned int iStartIndex,
+                            unsigned int iEndIndex,
+                            std::vector<std::string> const& iPathNames,
+                            std::vector<std::vector<std::string>> const& iModulesOnPaths,
+                            std::vector<std::vector<SystemTimeKeeper::PathTiming>> const& iPathTimings,
+                            std::vector<PathTimingSummary>& iSummary) {
+  iSummary.resize(iEndIndex - iStartIndex);
 
-static void
-fillPathSummary(unsigned int iStartIndex,
-                unsigned int iEndIndex,
-                std::vector<std::string> const& iPathNames,
-                std::vector<std::vector<std::string>> const& iModulesOnPaths,
-                std::vector<std::vector<SystemTimeKeeper::PathTiming>> const& iPathTimings,
-                std::vector<PathTimingSummary>& iSummary) {
-  iSummary.resize(iEndIndex-iStartIndex);
-
-  for(auto const& stream: iPathTimings) {
+  for (auto const& stream : iPathTimings) {
     auto it = iSummary.begin();
-    for(unsigned int index = iStartIndex; index < iEndIndex; ++index, ++it) {
+    for (unsigned int index = iStartIndex; index < iEndIndex; ++index, ++it) {
       auto const& pathTiming = stream[index];
       it->name = iPathNames[index];
-      it->bitPosition = index-iStartIndex;
-      if(not pathTiming.m_moduleTiming.empty()) {
+      it->bitPosition = index - iStartIndex;
+      if (not pathTiming.m_moduleTiming.empty()) {
         it->timesRun += pathTiming.m_moduleTiming[0].m_timesVisited;
       }
       it->realTime += pathTiming.m_timer.realTime();
-      if(it->moduleInPathSummaries.empty()) {
+      if (it->moduleInPathSummaries.empty()) {
         it->moduleInPathSummaries.resize(pathTiming.m_moduleTiming.size());
       }
-      for(unsigned int modIndex=0; modIndex < pathTiming.m_moduleTiming.size(); ++modIndex) {
-        auto const& modTiming =pathTiming.m_moduleTiming[modIndex];
-        auto& modSummary =it->moduleInPathSummaries[modIndex];
-        if(modSummary.moduleLabel.empty()) {
+      for (unsigned int modIndex = 0; modIndex < pathTiming.m_moduleTiming.size(); ++modIndex) {
+        auto const& modTiming = pathTiming.m_moduleTiming[modIndex];
+        auto& modSummary = it->moduleInPathSummaries[modIndex];
+        if (modSummary.moduleLabel.empty()) {
           modSummary.moduleLabel = iModulesOnPaths[index][modIndex];
         }
         modSummary.timesVisited += modTiming.m_timesVisited;
@@ -267,30 +228,29 @@ fillPathSummary(unsigned int iStartIndex,
   }
 }
 
-void
-SystemTimeKeeper::fillTriggerTimingReport(TriggerTimingReport& rep) const {
+void SystemTimeKeeper::fillTriggerTimingReport(TriggerTimingReport& rep) const {
   {
     rep.eventSummary.totalEvents = m_numberOfEvents;
     double sumEventTime = 0.;
-    for(auto const& stream: m_streamEventTimer) {
+    for (auto const& stream : m_streamEventTimer) {
       sumEventTime += stream.realTime();
     }
     rep.eventSummary.realTime = m_processingLoopTimer.realTime();
     rep.eventSummary.cpuTime = m_processingLoopTimer.cpuTime();
     rep.eventSummary.sumStreamRealTime = sumEventTime;
   }
-  
+
   //Per module summary
   {
     auto& summary = rep.workerSummaries;
     summary.resize(m_modules.size());
     //Figure out how often a module was visited
-    std::map<std::string,unsigned int> visited;
-    for(auto const& stream: m_streamPathTiming) {
+    std::map<std::string, unsigned int> visited;
+    for (auto const& stream : m_streamPathTiming) {
       unsigned int pathIndex = 0;
-      for(auto const& path: stream) {
+      for (auto const& path : stream) {
         unsigned int modIndex = 0;
-        for(auto const& mod: path.m_moduleTiming) {
+        for (auto const& mod : path.m_moduleTiming) {
           visited[m_modulesOnPaths[pathIndex][modIndex]] += mod.m_timesVisited;
           ++modIndex;
         }
@@ -298,35 +258,39 @@ SystemTimeKeeper::fillTriggerTimingReport(TriggerTimingReport& rep) const {
       }
     }
 
-    unsigned int modIndex=0;
-    for(auto const& mod: m_modules) {
+    unsigned int modIndex = 0;
+    for (auto const& mod : m_modules) {
       auto& outMod = summary[modIndex];
       outMod.moduleLabel = mod->moduleLabel();
       outMod.realTime = 0.;
-      
-      auto moduleId =mod->id()-m_minModuleID;
-      for(auto const& stream: m_streamModuleTiming) {
+
+      auto moduleId = mod->id() - m_minModuleID;
+      for (auto const& stream : m_streamModuleTiming) {
         auto const& timing = stream[moduleId];
         outMod.realTime += timing.m_timer.realTime();
         outMod.timesRun += timing.m_timesRun;
       }
       outMod.timesVisited = visited[mod->moduleLabel()];
-      if(0 == outMod.timesVisited) {
+      if (0 == outMod.timesVisited) {
         outMod.timesVisited = outMod.timesRun;
       }
       ++modIndex;
     }
   }
   sort_all(rep.workerSummaries);
-  
+
   //Per path summary
   {
     fillPathSummary(0, m_endPathOffset, m_pathNames, m_modulesOnPaths, m_streamPathTiming, rep.trigPathSummaries);
-    fillPathSummary(m_endPathOffset, m_streamPathTiming[0].size(), m_pathNames, m_modulesOnPaths, m_streamPathTiming, rep.endPathSummaries);
+    fillPathSummary(m_endPathOffset,
+                    m_streamPathTiming[0].size(),
+                    m_pathNames,
+                    m_modulesOnPaths,
+                    m_streamPathTiming,
+                    rep.endPathSummaries);
   }
 }
 
-
 //
 // const member functions
 //
diff --git a/FWCore/Framework/src/SystemTimeKeeper.h b/FWCore/Framework/src/SystemTimeKeeper.h
index 4a99ae1960e46..645744d9ebebd 100644
--- a/FWCore/Framework/src/SystemTimeKeeper.h
+++ b/FWCore/Framework/src/SystemTimeKeeper.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     SystemTimeKeeper
-// 
+//
 /**\class SystemTimeKeeper SystemTimeKeeper.h "SystemTimeKeeper.h"
 
  Description: Runs timers for system components
@@ -42,35 +42,33 @@ namespace edm {
   namespace service {
     class TriggerNamesService;
   }
-  
-  class SystemTimeKeeper
-  {
-    
+
+  class SystemTimeKeeper {
   public:
     SystemTimeKeeper(unsigned int iNumStreams,
                      std::vector<const ModuleDescription*> const& iModules,
                      service::TriggerNamesService const& iNameService,
                      ProcessContext const* iProcessContext);
-    
+
     // ---------- const member functions ---------------------
-    
+
     // ---------- static member functions --------------------
-    
+
     // ---------- member functions ---------------------------
     void startProcessingLoop();
     void stopProcessingLoop();
-    
+
     void startEvent(StreamID);
     void stopEvent(StreamContext const&);
-    
+
     void startPath(StreamContext const&, PathContext const&);
     void stopPath(StreamContext const&, PathContext const&, HLTPathStatus const&);
-    
+
     void startModuleEvent(StreamContext const&, ModuleCallingContext const&);
     void stopModuleEvent(StreamContext const&, ModuleCallingContext const&);
     void pauseModuleEvent(StreamContext const&, ModuleCallingContext const&);
     void restartModuleEvent(StreamContext const&, ModuleCallingContext const&);
-    
+
     struct ModuleInPathTiming {
       double m_realTime = 0.;
       unsigned int m_timesVisited = 0;
@@ -82,38 +80,37 @@ namespace edm {
 
     struct ModuleTiming {
       WallclockTimer m_timer;
-      unsigned int m_timesRun =0;
+      unsigned int m_timesRun = 0;
     };
 
     void fillTriggerTimingReport(TriggerTimingReport& rep) const;
+
   private:
-    SystemTimeKeeper(const SystemTimeKeeper&) = delete; // stop default
-    
-    const SystemTimeKeeper& operator=(const SystemTimeKeeper&) = delete; // stop default
-    
+    SystemTimeKeeper(const SystemTimeKeeper&) = delete;  // stop default
+
+    const SystemTimeKeeper& operator=(const SystemTimeKeeper&) = delete;  // stop default
+
     PathTiming& pathTiming(StreamContext const&, PathContext const&);
     bool checkBounds(unsigned int id) const;
-    
+
     // ---------- member data --------------------------------
     std::vector<WallclockTimer> m_streamEventTimer;
-    
+
     std::vector<std::vector<PathTiming>> m_streamPathTiming;
-    
+
     std::vector<std::vector<ModuleTiming>> m_streamModuleTiming;
-    
-    std::vector<const ModuleDescription*>  m_modules;
+
+    std::vector<const ModuleDescription*> m_modules;
     std::vector<std::string> m_pathNames;
     std::vector<std::vector<std::string>> m_modulesOnPaths;
 
     CPUTimer m_processingLoopTimer;
     ProcessContext const* m_processContext;
-    
+
     unsigned int m_minModuleID;
     unsigned int m_endPathOffset;
     std::atomic<unsigned int> m_numberOfEvents;
-
   };
-}
-
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/TriggerNamesService.cc b/FWCore/Framework/src/TriggerNamesService.cc
index 8433c1fac067d..6fb82a7b2d934 100644
--- a/FWCore/Framework/src/TriggerNamesService.cc
+++ b/FWCore/Framework/src/TriggerNamesService.cc
@@ -12,66 +12,58 @@
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/Utilities/interface/Algorithms.h"
 
-
 namespace edm {
   namespace service {
 
     TriggerNamesService::TriggerNamesService(const ParameterSet& pset) {
-
-      trigger_pset_ = 
-	pset.getParameterSet("@trigger_paths");
+      trigger_pset_ = pset.getParameterSet("@trigger_paths");
 
       trignames_ = trigger_pset_.getParameter<Strings>("@trigger_paths");
       end_names_ = pset.getParameter<Strings>("@end_paths");
 
       ParameterSet defopts;
-      ParameterSet const& opts = 
-	pset.getUntrackedParameterSet("options", defopts);
-      wantSummary_ =
-	opts.getUntrackedParameter("wantSummary", false);
+      ParameterSet const& opts = pset.getUntrackedParameterSet("options", defopts);
+      wantSummary_ = opts.getUntrackedParameter("wantSummary", false);
 
       process_name_ = pset.getParameter<std::string>("@process_name");
 
-      loadPosMap(trigpos_,trignames_);
-      loadPosMap(end_pos_,end_names_);
+      loadPosMap(trigpos_, trignames_);
+      loadPosMap(end_pos_, end_names_);
 
       const unsigned int n(trignames_.size());
-      for(unsigned int i = 0; i != n; ++i) {
+      for (unsigned int i = 0; i != n; ++i) {
         modulenames_.push_back(pset.getParameter<Strings>(trignames_[i]));
       }
-      for(unsigned int i = 0; i != end_names_.size(); ++i) {
+      for (unsigned int i = 0; i != end_names_.size(); ++i) {
         end_modulenames_.push_back(pset.getParameter<Strings>(end_names_[i]));
       }
     }
 
-    bool
-    TriggerNamesService::getTrigPaths(TriggerResults const& triggerResults,
-                                      Strings& trigPaths,
-                                      bool& fromPSetRegistry) {
-
+    bool TriggerNamesService::getTrigPaths(TriggerResults const& triggerResults,
+                                           Strings& trigPaths,
+                                           bool& fromPSetRegistry) {
       // Get the parameter set containing the trigger names from the parameter set registry
       // using the ID from TriggerResults as the key used to find it.
       ParameterSet const* pset = nullptr;
       pset::Registry const* psetRegistry = pset::Registry::instance();
       if (nullptr != (pset = psetRegistry->getMapped(triggerResults.parameterSetID()))) {
-
         // Check to make sure the parameter set contains
         // a Strings parameter named "trigger_paths".
         // We do not want to throw an exception if it is not there
         // for reasons of backward compatibility
         Strings const& psetNames = pset->getParameterNamesForType<Strings>();
         std::string name("@trigger_paths");
-	if (search_all(psetNames, name)) {
+        if (search_all(psetNames, name)) {
           // It is there, get it
           trigPaths = pset->getParameter<Strings>("@trigger_paths");
 
           // This should never happen
           if (trigPaths.size() != triggerResults.size()) {
             throw edm::Exception(edm::errors::Unknown)
-              << "TriggerNamesService::getTrigPaths, Trigger names vector and\n"
-                 "TriggerResults are different sizes.  This should be impossible,\n"
-                 "please send information to reproduce this problem to\n"
-                 "the edm developers.\n";
+                << "TriggerNamesService::getTrigPaths, Trigger names vector and\n"
+                   "TriggerResults are different sizes.  This should be impossible,\n"
+                   "please send information to reproduce this problem to\n"
+                   "the edm developers.\n";
           }
 
           fromPSetRegistry = true;
@@ -92,11 +84,9 @@ namespace edm {
       return false;
     }
 
-    bool
-    TriggerNamesService::getTrigPaths(TriggerResults const& triggerResults,
-                                      Strings& trigPaths) {
+    bool TriggerNamesService::getTrigPaths(TriggerResults const& triggerResults, Strings& trigPaths) {
       bool dummy;
       return getTrigPaths(triggerResults, trigPaths, dummy);
     }
-  }
-}
+  }  // namespace service
+}  // namespace edm
diff --git a/FWCore/Framework/src/TriggerResultInserter.cc b/FWCore/Framework/src/TriggerResultInserter.cc
index c165d4f343217..0460b610efa70 100644
--- a/FWCore/Framework/src/TriggerResultInserter.cc
+++ b/FWCore/Framework/src/TriggerResultInserter.cc
@@ -6,22 +6,15 @@
 
 #include <memory>
 
-namespace edm
-{
-  TriggerResultInserter::TriggerResultInserter(const ParameterSet& pset, unsigned int iNStreams) :
-  resultsPerStream_(iNStreams),
-  pset_id_(pset.id()),
-  token_{produces<TriggerResults>()}
-  {
-  }
+namespace edm {
+  TriggerResultInserter::TriggerResultInserter(const ParameterSet& pset, unsigned int iNStreams)
+      : resultsPerStream_(iNStreams), pset_id_(pset.id()), token_{produces<TriggerResults>()} {}
 
-  void
-  TriggerResultInserter::setTrigResultForStream(unsigned int iStreamIndex, const TrigResPtr& trptr) {
-    resultsPerStream_[iStreamIndex] =trptr;
+  void TriggerResultInserter::setTrigResultForStream(unsigned int iStreamIndex, const TrigResPtr& trptr) {
+    resultsPerStream_[iStreamIndex] = trptr;
   }
 
-  void TriggerResultInserter::produce(StreamID id, edm::Event& e, edm::EventSetup const&) const
-  {
-    e.emplace(token_,*resultsPerStream_[id.value()], pset_id_);
+  void TriggerResultInserter::produce(StreamID id, edm::Event& e, edm::EventSetup const&) const {
+    e.emplace(token_, *resultsPerStream_[id.value()], pset_id_);
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/TriggerResultInserter.h b/FWCore/Framework/src/TriggerResultInserter.h
index e437ec21eefa1..dfe4520b27c87 100644
--- a/FWCore/Framework/src/TriggerResultInserter.h
+++ b/FWCore/Framework/src/TriggerResultInserter.h
@@ -20,18 +20,15 @@
 
 #include <memory>
 
-namespace edm
-{
+namespace edm {
   class ParameterSet;
   class Event;
   class EventSetup;
   class HLTGlobalStatus;
   class TriggerResults;
 
-  class TriggerResultInserter : public edm::global::EDProducer<>
-  {
+  class TriggerResultInserter : public edm::global::EDProducer<> {
   public:
-
     typedef std::shared_ptr<HLTGlobalStatus> TrigResPtr;
 
     // standard constructor not supported for this module
@@ -40,8 +37,7 @@ namespace edm
     // the pset needed here is the one that defines the trigger path names
     TriggerResultInserter(edm::ParameterSet const& ps, unsigned int iNStreams);
 
-    void setTrigResultForStream(unsigned int iStreamIndex,
-                                const TrigResPtr& trptr);
+    void setTrigResultForStream(unsigned int iStreamIndex, const TrigResPtr& trptr);
     void produce(StreamID id, edm::Event& e, edm::EventSetup const& c) const final;
 
   private:
@@ -50,5 +46,5 @@ namespace edm
     ParameterSetID pset_id_;
     EDPutTokenT<TriggerResults> token_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/src/TriggerResultsBasedEventSelector.cc b/FWCore/Framework/src/TriggerResultsBasedEventSelector.cc
index fde73b2f1b79f..cb7f2dd48c394 100644
--- a/FWCore/Framework/src/TriggerResultsBasedEventSelector.cc
+++ b/FWCore/Framework/src/TriggerResultsBasedEventSelector.cc
@@ -28,18 +28,16 @@ namespace {
   // optional), return a parsed_path_spec_t containing "a" and "b".
 
   typedef std::pair<std::string, std::string> parsed_path_spec_t;
-  void parse_path_spec(std::string const& path_spec,
-                       parsed_path_spec_t& output) {
+  void parse_path_spec(std::string const& path_spec, parsed_path_spec_t& output) {
     std::string trimmed_path_spec(path_spec);
     remove_whitespace(trimmed_path_spec);
 
     std::string::size_type colon = trimmed_path_spec.find(":");
-    if(colon == std::string::npos) {
+    if (colon == std::string::npos) {
       output.first = trimmed_path_spec;
     } else {
-      output.first  = trimmed_path_spec.substr(0, colon);
-      output.second = trimmed_path_spec.substr(colon + 1,
-                                               trimmed_path_spec.size());
+      output.first = trimmed_path_spec.substr(0, colon);
+      output.second = trimmed_path_spec.substr(colon + 1, trimmed_path_spec.size());
     }
   }
 
@@ -52,34 +50,32 @@ namespace {
     paths.push_back("eee:  p4  ");
 
     std::vector<parsed_path_spec_t> parsed(paths.size());
-    for(size_t i = 0; i < paths.size(); ++i) {
+    for (size_t i = 0; i < paths.size(); ++i) {
       parse_path_spec(paths[i], parsed[i]);
     }
 
-    assert(parsed[0].first  == "a");
+    assert(parsed[0].first == "a");
     assert(parsed[0].second == "p1");
-    assert(parsed[1].first  == "b");
+    assert(parsed[1].first == "b");
     assert(parsed[1].second == "p2");
-    assert(parsed[2].first  == "c");
-    assert(parsed[2].second == "");
-    assert(parsed[3].first  == "ddd");
+    assert(parsed[2].first == "c");
+    assert(parsed[2].second.empty());
+    assert(parsed[3].first == "ddd");
     assert(parsed[3].second == "p3");
-    assert(parsed[4].first  == "eee");
+    assert(parsed[4].first == "eee");
     assert(parsed[4].second == "p4");
   }
-}
+}  // namespace
 
-namespace edm
-{
+namespace edm {
   namespace test {
     void run_all_output_module_tests() {
       test_remove_whitespace();
       test_parse_path_spec();
     }
-  }
+  }  // namespace test
 
-  namespace detail
-  {
+  namespace detail {
 
     bool configureEventSelector(edm::ParameterSet const& iPSet,
                                 std::string const& iProcessName,
@@ -90,15 +86,14 @@ namespace edm
       // all events, or one which contains a vstrig 'SelectEvents' that
       // is empty, we are to write all events. We have no need for any
       // EventSelectors.
-      if(iPSet.empty()) {
+      if (iPSet.empty()) {
         oSelector.setupDefault();
         return true;
       }
 
-      std::vector<std::string> path_specs =
-      iPSet.getParameter<std::vector<std::string> >("SelectEvents");
+      std::vector<std::string> path_specs = iPSet.getParameter<std::vector<std::string> >("SelectEvents");
 
-      if(path_specs.empty()) {
+      if (path_specs.empty()) {
         oSelector.setupDefault();
         return true;
       }
@@ -106,7 +101,7 @@ namespace edm
       // If we get here, we have the possibility of having to deal with
       // path_specs that look at more than one process.
       std::vector<parsed_path_spec_t> parsed_paths(path_specs.size());
-      for(size_t i = 0; i < path_specs.size(); ++i) {
+      for (size_t i = 0; i < path_specs.size(); ++i) {
         parse_path_spec(path_specs[i], parsed_paths[i]);
       }
       oSelector.setup(parsed_paths, iAllTriggerNames, iProcessName, std::move(iC));
@@ -116,30 +111,22 @@ namespace edm
 
     // typedef detail::NamedEventSelector NES;
 
-    TriggerResultsBasedEventSelector::TriggerResultsBasedEventSelector() :
-      selectors_(),
-      wantAllEvents_(false)
-    { }
+    TriggerResultsBasedEventSelector::TriggerResultsBasedEventSelector() : selectors_(), wantAllEvents_(false) {}
 
-    void
-    TriggerResultsBasedEventSelector::setupDefault() {
-      wantAllEvents_ = true;
-    }
+    void TriggerResultsBasedEventSelector::setupDefault() { wantAllEvents_ = true; }
 
-    void
-    TriggerResultsBasedEventSelector::setup(std::vector<parsed_path_spec_t> const& path_specs,
-                          std::vector<std::string> const& triggernames,
-                          std::string const& process_name,
-                          ConsumesCollector&& iC) {
+    void TriggerResultsBasedEventSelector::setup(std::vector<parsed_path_spec_t> const& path_specs,
+                                                 std::vector<std::string> const& triggernames,
+                                                 std::string const& process_name,
+                                                 ConsumesCollector&& iC) {
       // paths_for_process maps each PROCESS names to a sequence of
       // PATH names
       std::map<std::string, std::vector<std::string> > paths_for_process;
       for (auto const& path_spec : path_specs) {
         // Default to current process if none specified
-        if (path_spec.second == "") {
+        if (path_spec.second.empty()) {
           paths_for_process[process_name].push_back(path_spec.first);
-        }
-        else {
+        } else {
           paths_for_process[path_spec.second].push_back(path_spec.first);
         }
       }
@@ -158,27 +145,26 @@ namespace edm
       }
     }
 
-    bool
-    TriggerResultsBasedEventSelector::wantEvent(EventForOutput const& ev) {
-      if(wantAllEvents_) {
+    bool TriggerResultsBasedEventSelector::wantEvent(EventForOutput const& ev) {
+      if (wantAllEvents_) {
         return true;
       }
-      for(auto& selector : selectors_) {
+      for (auto& selector : selectors_) {
         Handle<TriggerResults> handle;
         ev.getByToken<TriggerResults>(selector.token(), handle);
         bool match = selector.match(*handle);
-        if(match) {
+        if (match) {
           return true;
         }
       }
       return false;
     }
 
-    ParameterSetID
-    registerProperSelectionInfo(edm::ParameterSet const& iInitial,
-                                std::string const& iLabel,
-                                std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
-                                bool anyProductProduced) {
+    ParameterSetID registerProperSelectionInfo(
+        edm::ParameterSet const& iInitial,
+        std::string const& iLabel,
+        std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
+        bool anyProductProduced) {
       ParameterSet selectEventsInfo;
       selectEventsInfo.copyForModify(iInitial);
       selectEventsInfo.addParameter<bool>("InProcessHistory", anyProductProduced);
@@ -188,9 +174,10 @@ namespace edm
       // The label will be empty if and only if this is a SubProcess
       // SubProcess's do not appear on any end path
       if (!iLabel.empty()) {
-        std::map<std::string, std::vector<std::pair<std::string, int> > >::const_iterator iter = outputModulePathPositions.find(iLabel);
+        std::map<std::string, std::vector<std::pair<std::string, int> > >::const_iterator iter =
+            outputModulePathPositions.find(iLabel);
         assert(iter != outputModulePathPositions.end());
-        for(auto const& item : iter->second) {
+        for (auto const& item : iter->second) {
           endPaths.push_back(item.first);
           endPathPositions.push_back(item.second);
         }
@@ -205,5 +192,5 @@ namespace edm
       return selectEventsInfo.id();
     }
 
-  } // namespace detail
-} // namespace edm
+  }  // namespace detail
+}  // namespace edm
diff --git a/FWCore/Framework/src/UnscheduledAuxiliary.cc b/FWCore/Framework/src/UnscheduledAuxiliary.cc
index ce470e387d772..94679bb5de21a 100644
--- a/FWCore/Framework/src/UnscheduledAuxiliary.cc
+++ b/FWCore/Framework/src/UnscheduledAuxiliary.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Subsystem/Package
 // Class  :     UnscheduledAuxiliary
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -15,7 +15,6 @@
 // user include files
 #include "UnscheduledAuxiliary.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -28,7 +27,6 @@
 // constructors and destructor
 //
 
-
 //
 // member functions
 //
diff --git a/FWCore/Framework/src/UnscheduledAuxiliary.h b/FWCore/Framework/src/UnscheduledAuxiliary.h
index b64ba463af37a..0b150a1d00593 100644
--- a/FWCore/Framework/src/UnscheduledAuxiliary.h
+++ b/FWCore/Framework/src/UnscheduledAuxiliary.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     UnscheduledAuxiliary
-// 
+//
 /**\class UnscheduledAuxiliary UnscheduledAuxiliary.h "UnscheduledAuxiliary.h"
 
  Description: Holds auxiliary information needed for unscheduled calls to EDProducers
@@ -29,32 +29,26 @@ namespace edm {
   class EventSetupImpl;
   class ModuleCallingContext;
   class StreamContext;
-  
-  class UnscheduledAuxiliary
-  {
 
+  class UnscheduledAuxiliary {
   public:
-    UnscheduledAuxiliary(): m_eventSetup(nullptr) {}
+    UnscheduledAuxiliary() : m_eventSetup(nullptr) {}
 
     // ---------- const member functions ---------------------
-    EventSetupImpl const* eventSetup() const { return m_eventSetup;}
-    
+    EventSetupImpl const* eventSetup() const { return m_eventSetup; }
+
     // ---------- static member functions --------------------
 
     // ---------- member functions ---------------------------
-    void setEventSetup( EventSetupImpl const* iSetup) {
-      m_eventSetup = iSetup;
-    }
+    void setEventSetup(EventSetupImpl const* iSetup) { m_eventSetup = iSetup; }
 
     signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> preModuleDelayedGetSignal_;
     signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> postModuleDelayedGetSignal_;
-  private:
 
+  private:
     // ---------- member data --------------------------------
-    EventSetupImpl const * m_eventSetup;
-
+    EventSetupImpl const* m_eventSetup;
   };
-}
-
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/UnscheduledConfigurator.h b/FWCore/Framework/src/UnscheduledConfigurator.h
index bcd7534cb38f5..bc75404270a10 100644
--- a/FWCore/Framework/src/UnscheduledConfigurator.h
+++ b/FWCore/Framework/src/UnscheduledConfigurator.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     UnscheduledConfigurator
-// 
+//
 /**\class UnscheduledConfigurator UnscheduledConfigurator.h "UnscheduledConfigurator.h"
 
  Description: [one line class summary]
@@ -28,41 +28,36 @@
 namespace edm {
   class Worker;
   class UnscheduledAuxiliary;
-  
-  class UnscheduledConfigurator
-  {
-   public:
-      template<typename IT>
-      UnscheduledConfigurator(IT iBegin,
-                              IT iEnd,
-                              UnscheduledAuxiliary const* iAux):
-    m_aux(iAux) {
-      for(auto it = iBegin; it != iEnd; ++it) {
-        m_labelToWorker.emplace((*it)->description().moduleLabel(),*it);
+
+  class UnscheduledConfigurator {
+  public:
+    template <typename IT>
+    UnscheduledConfigurator(IT iBegin, IT iEnd, UnscheduledAuxiliary const* iAux) : m_aux(iAux) {
+      for (auto it = iBegin; it != iEnd; ++it) {
+        m_labelToWorker.emplace((*it)->description().moduleLabel(), *it);
       }
     }
 
     // ---------- const member functions ---------------------
     Worker* findWorker(std::string const& iLabel) const {
       auto itFound = m_labelToWorker.find(iLabel);
-      if(itFound != m_labelToWorker.end()) {
+      if (itFound != m_labelToWorker.end()) {
         return itFound->second;
       }
       return nullptr;
     }
 
     UnscheduledAuxiliary const* auxiliary() const { return m_aux; }
-   private:
-      UnscheduledConfigurator(const UnscheduledConfigurator&) = delete; // stop default
 
-  const UnscheduledConfigurator& operator=(const UnscheduledConfigurator&) = delete; // stop default
+  private:
+    UnscheduledConfigurator(const UnscheduledConfigurator&) = delete;  // stop default
 
-      // ---------- member data --------------------------------
+    const UnscheduledConfigurator& operator=(const UnscheduledConfigurator&) = delete;  // stop default
+
+    // ---------- member data --------------------------------
     std::unordered_map<std::string, Worker*> m_labelToWorker;
     UnscheduledAuxiliary const* m_aux;
-    
   };
-}
-
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/ValidityInterval.cc b/FWCore/Framework/src/ValidityInterval.cc
index dc25ba5f248d7..ecb3d0b29d99e 100644
--- a/FWCore/Framework/src/ValidityInterval.cc
+++ b/FWCore/Framework/src/ValidityInterval.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     ValidityInterval
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -16,71 +16,61 @@
 #include "FWCore/Framework/interface/ValidityInterval.h"
 
 namespace edm {
-//
-// constants, enums and typedefs
-//
+  //
+  // constants, enums and typedefs
+  //
 
-//
-// static data member definitions
-//
+  //
+  // static data member definitions
+  //
 
-//
-// constructors and destructor
-//
-   ValidityInterval::ValidityInterval() :
-   first_(IOVSyncValue::invalidIOVSyncValue()),
-   last_(IOVSyncValue::invalidIOVSyncValue())
-{
-}
+  //
+  // constructors and destructor
+  //
+  ValidityInterval::ValidityInterval()
+      : first_(IOVSyncValue::invalidIOVSyncValue()), last_(IOVSyncValue::invalidIOVSyncValue()) {}
 
-ValidityInterval::ValidityInterval(const IOVSyncValue& iFirst,
-                                   const IOVSyncValue& iLast) :
-first_(iFirst), last_(iLast)
-{
-}
+  ValidityInterval::ValidityInterval(const IOVSyncValue& iFirst, const IOVSyncValue& iLast)
+      : first_(iFirst), last_(iLast) {}
 
-// ValidityInterval::ValidityInterval(const ValidityInterval& rhs)
-// {
-//    // do actual copying here;
-// }
+  // ValidityInterval::ValidityInterval(const ValidityInterval& rhs)
+  // {
+  //    // do actual copying here;
+  // }
 
-//ValidityInterval::~ValidityInterval()
-//{
-//}
+  //ValidityInterval::~ValidityInterval()
+  //{
+  //}
 
-//
-// assignment operators
-//
-// const ValidityInterval& ValidityInterval::operator=(const ValidityInterval& rhs)
-// {
-//   //An exception safe implementation is
-//   ValidityInterval temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
+  //
+  // assignment operators
+  //
+  // const ValidityInterval& ValidityInterval::operator=(const ValidityInterval& rhs)
+  // {
+  //   //An exception safe implementation is
+  //   ValidityInterval temp(rhs);
+  //   swap(rhs);
+  //
+  //   return *this;
+  // }
 
-//
-// member functions
-//
+  //
+  // member functions
+  //
 
-//
-// const member functions
-//
-bool
-ValidityInterval::validFor(const IOVSyncValue& iInstance) const
-{
-   return first_ <= iInstance && iInstance <= last_;
-}
-   
-//
-// static member functions
-//
-const ValidityInterval& 
-ValidityInterval::invalidInterval()
-{
-   static const ValidityInterval s_invalid;
-   return s_invalid;
-}
+  //
+  // const member functions
+  //
+  bool ValidityInterval::validFor(const IOVSyncValue& iInstance) const {
+    return first_ <= iInstance && iInstance <= last_;
+  }
+
+  //
+  // static member functions
+  //
+  const ValidityInterval& ValidityInterval::invalidInterval() {
+    static const ValidityInterval s_invalid;
+    return s_invalid;
+  }
 
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/Worker.cc b/FWCore/Framework/src/Worker.cc
index 0414c97aa77d8..629cdd3ff9232 100644
--- a/FWCore/Framework/src/Worker.cc
+++ b/FWCore/Framework/src/Worker.cc
@@ -11,110 +11,108 @@
 namespace edm {
   namespace {
     class ModuleBeginJobSignalSentry {
-public:
-      ModuleBeginJobSignalSentry(ActivityRegistry* a, ModuleDescription const& md):a_(a), md_(&md) {
-        if(a_) a_->preModuleBeginJobSignal_(*md_);
+    public:
+      ModuleBeginJobSignalSentry(ActivityRegistry* a, ModuleDescription const& md) : a_(a), md_(&md) {
+        if (a_)
+          a_->preModuleBeginJobSignal_(*md_);
       }
       ~ModuleBeginJobSignalSentry() {
-        if(a_) a_->postModuleBeginJobSignal_(*md_);
+        if (a_)
+          a_->postModuleBeginJobSignal_(*md_);
       }
-private:
-      ActivityRegistry* a_; // We do not use propagate_const because the registry itself is mutable.
+
+    private:
+      ActivityRegistry* a_;  // We do not use propagate_const because the registry itself is mutable.
       ModuleDescription const* md_;
     };
 
     class ModuleEndJobSignalSentry {
-public:
-      ModuleEndJobSignalSentry(ActivityRegistry* a, ModuleDescription const& md):a_(a), md_(&md) {
-        if(a_) a_->preModuleEndJobSignal_(*md_);
+    public:
+      ModuleEndJobSignalSentry(ActivityRegistry* a, ModuleDescription const& md) : a_(a), md_(&md) {
+        if (a_)
+          a_->preModuleEndJobSignal_(*md_);
       }
       ~ModuleEndJobSignalSentry() {
-        if(a_) a_->postModuleEndJobSignal_(*md_);
+        if (a_)
+          a_->postModuleEndJobSignal_(*md_);
       }
-private:
-      ActivityRegistry* a_; // We do not use propagate_const because the registry itself is mutable.
+
+    private:
+      ActivityRegistry* a_;  // We do not use propagate_const because the registry itself is mutable.
       ModuleDescription const* md_;
     };
 
     class ModuleBeginStreamSignalSentry {
     public:
-      ModuleBeginStreamSignalSentry(ActivityRegistry* a,
-                                    StreamContext const& sc,
-                                    ModuleCallingContext const& mcc) : a_(a), sc_(sc), mcc_(mcc) {
-        if(a_) a_->preModuleBeginStreamSignal_(sc_, mcc_);
+      ModuleBeginStreamSignalSentry(ActivityRegistry* a, StreamContext const& sc, ModuleCallingContext const& mcc)
+          : a_(a), sc_(sc), mcc_(mcc) {
+        if (a_)
+          a_->preModuleBeginStreamSignal_(sc_, mcc_);
       }
       ~ModuleBeginStreamSignalSentry() {
-        if(a_) a_->postModuleBeginStreamSignal_(sc_, mcc_);
+        if (a_)
+          a_->postModuleBeginStreamSignal_(sc_, mcc_);
       }
+
     private:
-      ActivityRegistry* a_; // We do not use propagate_const because the registry itself is mutable.
+      ActivityRegistry* a_;  // We do not use propagate_const because the registry itself is mutable.
       StreamContext const& sc_;
       ModuleCallingContext const& mcc_;
     };
 
     class ModuleEndStreamSignalSentry {
     public:
-      ModuleEndStreamSignalSentry(ActivityRegistry* a,
-                                  StreamContext const& sc,
-                                  ModuleCallingContext const& mcc) : a_(a), sc_(sc), mcc_(mcc) {
-        if(a_) a_->preModuleEndStreamSignal_(sc_, mcc_);
+      ModuleEndStreamSignalSentry(ActivityRegistry* a, StreamContext const& sc, ModuleCallingContext const& mcc)
+          : a_(a), sc_(sc), mcc_(mcc) {
+        if (a_)
+          a_->preModuleEndStreamSignal_(sc_, mcc_);
       }
       ~ModuleEndStreamSignalSentry() {
-        if(a_) a_->postModuleEndStreamSignal_(sc_, mcc_);
+        if (a_)
+          a_->postModuleEndStreamSignal_(sc_, mcc_);
       }
+
     private:
-      ActivityRegistry* a_; // We do not use propagate_const because the registry itself is mutable.
+      ActivityRegistry* a_;  // We do not use propagate_const because the registry itself is mutable.
       StreamContext const& sc_;
       ModuleCallingContext const& mcc_;
     };
 
-  }
+  }  // namespace
 
-  Worker::Worker(ModuleDescription const& iMD, 
-		 ExceptionToActionTable const* iActions) :
-    timesRun_(0),
-    timesVisited_(0),
-    timesPassed_(0),
-    timesFailed_(0),
-    timesExcept_(0),
-    state_(Ready),
-    numberOfPathsOn_(0),
-    numberOfPathsLeftToRun_(0),
-    moduleCallingContext_(&iMD),
-    actions_(iActions),
-    cached_exception_(),
-    actReg_(),
-    earlyDeleteHelper_(nullptr),
-    workStarted_(false),
-    ranAcquireWithoutException_(false)
-  {
-  }
+  Worker::Worker(ModuleDescription const& iMD, ExceptionToActionTable const* iActions)
+      : timesRun_(0),
+        timesVisited_(0),
+        timesPassed_(0),
+        timesFailed_(0),
+        timesExcept_(0),
+        state_(Ready),
+        numberOfPathsOn_(0),
+        numberOfPathsLeftToRun_(0),
+        moduleCallingContext_(&iMD),
+        actions_(iActions),
+        cached_exception_(),
+        actReg_(),
+        earlyDeleteHelper_(nullptr),
+        workStarted_(false),
+        ranAcquireWithoutException_(false) {}
 
-  Worker::~Worker() {
-  }
+  Worker::~Worker() {}
 
-  void Worker::setActivityRegistry(std::shared_ptr<ActivityRegistry> areg) {
-    actReg_ = areg;
-  }
+  void Worker::setActivityRegistry(std::shared_ptr<ActivityRegistry> areg) { actReg_ = areg; }
 
-  
-  void Worker::exceptionContext(
-                        cms::Exception& ex,
-                        ModuleCallingContext const* mcc) {
-    
+  void Worker::exceptionContext(cms::Exception& ex, ModuleCallingContext const* mcc) {
     ModuleCallingContext const* imcc = mcc;
-    while( (imcc->type() == ParentContext::Type::kModule) or
-          (imcc->type()  == ParentContext::Type::kInternal) ) {
+    while ((imcc->type() == ParentContext::Type::kModule) or (imcc->type() == ParentContext::Type::kInternal)) {
       std::ostringstream iost;
-      if( imcc->state() == ModuleCallingContext::State::kPrefetching ) {
+      if (imcc->state() == ModuleCallingContext::State::kPrefetching) {
         iost << "Prefetching for module ";
       } else {
         iost << "Calling method for module ";
       }
-      iost << imcc->moduleDescription()->moduleName() << "/'"
-      << imcc->moduleDescription()->moduleLabel() << "'";
+      iost << imcc->moduleDescription()->moduleName() << "/'" << imcc->moduleDescription()->moduleLabel() << "'";
 
-      if(imcc->type() == ParentContext::Type::kInternal) {
+      if (imcc->type() == ParentContext::Type::kInternal) {
         iost << " (probably inside some kind of mixing module)";
         imcc = imcc->internalContext()->moduleCallingContext();
       } else {
@@ -123,34 +121,33 @@ namespace edm {
       ex.addContext(iost.str());
     }
     std::ostringstream ost;
-    if( imcc->state() == ModuleCallingContext::State::kPrefetching ) {
+    if (imcc->state() == ModuleCallingContext::State::kPrefetching) {
       ost << "Prefetching for module ";
     } else {
       ost << "Calling method for module ";
     }
-    ost << imcc->moduleDescription()->moduleName() << "/'"
-    << imcc->moduleDescription()->moduleLabel() << "'";
+    ost << imcc->moduleDescription()->moduleName() << "/'" << imcc->moduleDescription()->moduleLabel() << "'";
     ex.addContext(ost.str());
-    
+
     if (imcc->type() == ParentContext::Type::kPlaceInPath) {
       ost.str("");
       ost << "Running path '";
       ost << imcc->placeInPathContext()->pathContext()->pathName() << "'";
       ex.addContext(ost.str());
-      auto streamContext =imcc->placeInPathContext()->pathContext()->streamContext();
-      if(streamContext) {
+      auto streamContext = imcc->placeInPathContext()->pathContext()->streamContext();
+      if (streamContext) {
         ost.str("");
-        edm::exceptionContext(ost,*streamContext);
+        edm::exceptionContext(ost, *streamContext);
         ex.addContext(ost.str());
       }
     } else {
       if (imcc->type() == ParentContext::Type::kStream) {
         ost.str("");
-        edm::exceptionContext(ost, *(imcc->streamContext()) );
+        edm::exceptionContext(ost, *(imcc->streamContext()));
         ex.addContext(ost.str());
-      } else if(imcc->type() == ParentContext::Type::kGlobal) {
+      } else if (imcc->type() == ParentContext::Type::kGlobal) {
         ost.str("");
-        edm::exceptionContext(ost, *(imcc->globalContext()) );
+        edm::exceptionContext(ost, *(imcc->globalContext()));
         ex.addContext(ost.str());
       }
     }
@@ -160,42 +157,38 @@ namespace edm {
                                       ParentContext const& parentContext,
                                       bool isEvent,
                                       TransitionIDValueBase const& iID) const {
-    
     // NOTE: the warning printed as a result of ignoring or failing
     // a module will only be printed during the full true processing
     // pass of this module
-    
+
     // Get the action corresponding to this exception.  However, if processing
     // something other than an event (e.g. run, lumi) always rethrow.
-    if(not isEvent) {
+    if (not isEvent) {
       return true;
     }
     try {
-      convertException::wrap([&]() {
-        std::rethrow_exception(iPtr);
-      });
-    } catch(cms::Exception &ex) {
+      convertException::wrap([&]() { std::rethrow_exception(iPtr); });
+    } catch (cms::Exception& ex) {
       exception_actions::ActionCodes action = actions_->find(ex.category());
-    
-      if(action == exception_actions::Rethrow) {
+
+      if (action == exception_actions::Rethrow) {
         return true;
       }
-    
-      ModuleCallingContext tempContext(&description(),ModuleCallingContext::State::kInvalid, parentContext, nullptr);
-      
+
+      ModuleCallingContext tempContext(&description(), ModuleCallingContext::State::kInvalid, parentContext, nullptr);
+
       // If we are processing an endpath and the module was scheduled, treat SkipEvent or FailPath
       // as IgnoreCompletely, so any subsequent OutputModules are still run.
       // For unscheduled modules only treat FailPath as IgnoreCompletely but still allow SkipEvent to throw
       ModuleCallingContext const* top_mcc = tempContext.getTopModuleCallingContext();
-      if(top_mcc->type() == ParentContext::Type::kPlaceInPath &&
-         top_mcc->placeInPathContext()->pathContext()->isEndPath()) {
-        
+      if (top_mcc->type() == ParentContext::Type::kPlaceInPath &&
+          top_mcc->placeInPathContext()->pathContext()->isEndPath()) {
         if ((action == exception_actions::SkipEvent && tempContext.type() == ParentContext::Type::kPlaceInPath) ||
             action == exception_actions::FailPath) {
           action = exception_actions::IgnoreCompletely;
         }
       }
-      if(action == exception_actions::IgnoreCompletely) {
+      if (action == exception_actions::IgnoreCompletely) {
         edm::printCmsExceptionWarning("IgnoreCompletely", ex);
         return false;
       }
@@ -203,85 +196,87 @@ namespace edm {
     return true;
   }
 
-  
-  void Worker::prefetchAsync(WaitingTask* iTask, ServiceToken const& token, ParentContext const& parentContext, Principal const& iPrincipal) {
+  void Worker::prefetchAsync(WaitingTask* iTask,
+                             ServiceToken const& token,
+                             ParentContext const& parentContext,
+                             Principal const& iPrincipal) {
     // Prefetch products the module declares it consumes (not including the products it maybe consumes)
     std::vector<ProductResolverIndexAndSkipBit> const& items = itemsToGetFrom(iPrincipal.branchType());
 
-    moduleCallingContext_.setContext(ModuleCallingContext::State::kPrefetching,parentContext,nullptr);
-    
-    if(iPrincipal.branchType()==InEvent) {
-      actReg_->preModuleEventPrefetchingSignal_.emit(*moduleCallingContext_.getStreamContext(),moduleCallingContext_);
+    moduleCallingContext_.setContext(ModuleCallingContext::State::kPrefetching, parentContext, nullptr);
+
+    if (iPrincipal.branchType() == InEvent) {
+      actReg_->preModuleEventPrefetchingSignal_.emit(*moduleCallingContext_.getStreamContext(), moduleCallingContext_);
     }
 
     //Need to be sure the ref count isn't set to 0 immediately
     iTask->increment_ref_count();
-    for(auto const& item : items) {
+    for (auto const& item : items) {
       ProductResolverIndex productResolverIndex = item.productResolverIndex();
       bool skipCurrentProcess = item.skipCurrentProcess();
-      if(productResolverIndex != ProductResolverIndexAmbiguous) {
-        iPrincipal.prefetchAsync(iTask,productResolverIndex, skipCurrentProcess, token, &moduleCallingContext_);
+      if (productResolverIndex != ProductResolverIndexAmbiguous) {
+        iPrincipal.prefetchAsync(iTask, productResolverIndex, skipCurrentProcess, token, &moduleCallingContext_);
       }
     }
-    
-    if(iPrincipal.branchType()==InEvent) {
-      preActionBeforeRunEventAsync(iTask,moduleCallingContext_,iPrincipal);
+
+    if (iPrincipal.branchType() == InEvent) {
+      preActionBeforeRunEventAsync(iTask, moduleCallingContext_, iPrincipal);
     }
-    
-    if(0 == iTask->decrement_ref_count()) {
+
+    if (0 == iTask->decrement_ref_count()) {
       //if everything finishes before we leave this routine, we need to launch the task
       tbb::task::spawn(*iTask);
     }
   }
-  
+
   void Worker::prePrefetchSelectionAsync(WaitingTask* successTask,
                                          ServiceToken const& token,
-                                 StreamID id,
-                                 EventPrincipal const* iPrincipal) {
+                                         StreamID id,
+                                         EventPrincipal const* iPrincipal) {
     successTask->increment_ref_count();
 
-    auto choiceTask = edm::make_waiting_task(tbb::task::allocate_root(),
-     [id,successTask,iPrincipal,this,token](std::exception_ptr const*) {
-       ServiceRegistry::Operate guard(token);
-       try {
-         if( not implDoPrePrefetchSelection(id,*iPrincipal,&moduleCallingContext_) ) {
-           timesRun_.fetch_add(1,std::memory_order_relaxed);
-           setPassed<true>();
-           waitingTasks_.doneWaiting(nullptr);
-           //TBB requires that destroyed tasks have count 0
-           if ( 0 == successTask->decrement_ref_count() ) {
-             tbb::task::destroy(*successTask);
-           }
-           return;
-         }
-       } catch(...) {}
-       if(0 == successTask->decrement_ref_count()) {
-         tbb::task::spawn(*successTask);
-       }
-     });
-    
+    auto choiceTask = edm::make_waiting_task(
+        tbb::task::allocate_root(), [id, successTask, iPrincipal, this, token](std::exception_ptr const*) {
+          ServiceRegistry::Operate guard(token);
+          try {
+            if (not implDoPrePrefetchSelection(id, *iPrincipal, &moduleCallingContext_)) {
+              timesRun_.fetch_add(1, std::memory_order_relaxed);
+              setPassed<true>();
+              waitingTasks_.doneWaiting(nullptr);
+              //TBB requires that destroyed tasks have count 0
+              if (0 == successTask->decrement_ref_count()) {
+                tbb::task::destroy(*successTask);
+              }
+              return;
+            }
+          } catch (...) {
+          }
+          if (0 == successTask->decrement_ref_count()) {
+            tbb::task::spawn(*successTask);
+          }
+        });
+
     WaitingTaskHolder choiceHolder{choiceTask};
 
     std::vector<ProductResolverIndexAndSkipBit> items;
     itemsToGetForSelection(items);
-    
-    for(auto const& item : items) {
+
+    for (auto const& item : items) {
       ProductResolverIndex productResolverIndex = item.productResolverIndex();
       bool skipCurrentProcess = item.skipCurrentProcess();
-      if(productResolverIndex != ProductResolverIndexAmbiguous) {
-        iPrincipal->prefetchAsync(choiceTask,productResolverIndex, skipCurrentProcess, token, &moduleCallingContext_);
+      if (productResolverIndex != ProductResolverIndexAmbiguous) {
+        iPrincipal->prefetchAsync(choiceTask, productResolverIndex, skipCurrentProcess, token, &moduleCallingContext_);
       }
     }
     choiceHolder.doneWaiting(std::exception_ptr{});
   }
 
-  
-  void Worker::setEarlyDeleteHelper(EarlyDeleteHelper* iHelper) {
-    earlyDeleteHelper_=iHelper;
-  }
-  
+  void Worker::setEarlyDeleteHelper(EarlyDeleteHelper* iHelper) { earlyDeleteHelper_ = iHelper; }
+
   void Worker::resetModuleDescription(ModuleDescription const* iDesc) {
-    ModuleCallingContext temp(iDesc,moduleCallingContext_.state(),moduleCallingContext_.parent(),
+    ModuleCallingContext temp(iDesc,
+                              moduleCallingContext_.state(),
+                              moduleCallingContext_.parent(),
                               moduleCallingContext_.previousModuleOnThread());
     moduleCallingContext_ = temp;
   }
@@ -292,8 +287,7 @@ namespace edm {
         ModuleBeginJobSignalSentry cpp(actReg_.get(), description());
         implBeginJob();
       });
-    }
-    catch(cms::Exception& ex) {
+    } catch (cms::Exception& ex) {
       state_ = Exception;
       std::ostringstream ost;
       ost << "Calling beginJob for module " << description().moduleName() << "/'" << description().moduleLabel() << "'";
@@ -301,15 +295,14 @@ namespace edm {
       throw;
     }
   }
-  
+
   void Worker::endJob() {
     try {
       convertException::wrap([&]() {
         ModuleEndJobSignalSentry cpp(actReg_.get(), description());
         implEndJob();
       });
-    }
-    catch(cms::Exception& ex) {
+    } catch (cms::Exception& ex) {
       state_ = Exception;
       std::ostringstream ost;
       ost << "Calling endJob for module " << description().moduleName() << "/'" << description().moduleLabel() << "'";
@@ -332,16 +325,16 @@ namespace edm {
         ModuleBeginStreamSignalSentry beginSentry(actReg_.get(), streamContext, moduleCallingContext_);
         implBeginStream(id);
       });
-    }
-    catch(cms::Exception& ex) {
+    } catch (cms::Exception& ex) {
       state_ = Exception;
       std::ostringstream ost;
-      ost << "Calling beginStream for module " << description().moduleName() << "/'" << description().moduleLabel() << "'";
+      ost << "Calling beginStream for module " << description().moduleName() << "/'" << description().moduleLabel()
+          << "'";
       ex.addContext(ost.str());
       throw;
     }
   }
-  
+
   void Worker::endStream(StreamID id, StreamContext& streamContext) {
     try {
       convertException::wrap([&]() {
@@ -356,24 +349,24 @@ namespace edm {
         ModuleEndStreamSignalSentry endSentry(actReg_.get(), streamContext, moduleCallingContext_);
         implEndStream(id);
       });
-    }
-    catch(cms::Exception& ex) {
+    } catch (cms::Exception& ex) {
       state_ = Exception;
       std::ostringstream ost;
-      ost << "Calling endStream for module " << description().moduleName() << "/'" << description().moduleLabel() << "'";
+      ost << "Calling endStream for module " << description().moduleName() << "/'" << description().moduleLabel()
+          << "'";
       ex.addContext(ost.str());
       throw;
     }
   }
-  
+
   void Worker::skipOnPath() {
-    if( 0 == --numberOfPathsLeftToRun_) {
+    if (0 == --numberOfPathsLeftToRun_) {
       waitingTasks_.doneWaiting(cached_exception_);
     }
   }
 
   void Worker::postDoEvent(EventPrincipal const& iEvent) {
-    if(earlyDeleteHelper_) {
+    if (earlyDeleteHelper_) {
       earlyDeleteHelper_->moduleRan(iEvent);
     }
   }
@@ -382,18 +375,14 @@ namespace edm {
                           EventSetupImpl const& es,
                           ParentContext const& parentContext,
                           WaitingTaskWithArenaHolder& holder) {
-
     ModuleContextSentry moduleContextSentry(&moduleCallingContext_, parentContext);
     try {
-      convertException::wrap([&]()
-      {
-        this->implDoAcquire(ep, es, &moduleCallingContext_, holder);
-      });
-    } catch(cms::Exception& ex) {
+      convertException::wrap([&]() { this->implDoAcquire(ep, es, &moduleCallingContext_, holder); });
+    } catch (cms::Exception& ex) {
       exceptionContext(ex, &moduleCallingContext_);
       TransitionIDValue<EventPrincipal> idValue(ep);
-      if(shouldRethrowException(std::current_exception(), parentContext, true, idValue)) {
-        timesRun_.fetch_add(1,std::memory_order_relaxed);
+      if (shouldRethrowException(std::current_exception(), parentContext, true, idValue)) {
+        timesRun_.fetch_add(1, std::memory_order_relaxed);
         throw;
       }
     }
@@ -406,18 +395,18 @@ namespace edm {
                                             WaitingTaskWithArenaHolder holder) {
     ranAcquireWithoutException_ = false;
     std::exception_ptr exceptionPtr;
-    if(iEPtr) {
+    if (iEPtr) {
       assert(*iEPtr);
       TransitionIDValue<EventPrincipal> idValue(ep);
-      if(shouldRethrowException(*iEPtr, parentContext, true, idValue)) {
+      if (shouldRethrowException(*iEPtr, parentContext, true, idValue)) {
         exceptionPtr = *iEPtr;
       }
-      moduleCallingContext_.setContext(ModuleCallingContext::State::kInvalid,ParentContext(),nullptr);
+      moduleCallingContext_.setContext(ModuleCallingContext::State::kInvalid, ParentContext(), nullptr);
     } else {
       try {
         runAcquire(ep, es, parentContext, holder);
         ranAcquireWithoutException_ = true;
-      } catch(...) {
+      } catch (...) {
         exceptionPtr = std::current_exception();
       }
     }
@@ -429,10 +418,8 @@ namespace edm {
                                                          ParentContext const& parentContext) {
     if (ranAcquireWithoutException_) {
       try {
-        convertException::wrap([iEPtr]() {
-          std::rethrow_exception(*iEPtr);
-        });
-      } catch(cms::Exception &ex) {
+        convertException::wrap([iEPtr]() { std::rethrow_exception(*iEPtr); });
+      } catch (cms::Exception& ex) {
         ModuleContextSentry moduleContextSentry(&moduleCallingContext_, parentContext);
         exceptionContext(ex, &moduleCallingContext_);
         return std::current_exception();
@@ -441,28 +428,21 @@ namespace edm {
     return *iEPtr;
   }
 
-  Worker::HandleExternalWorkExceptionTask::
-  HandleExternalWorkExceptionTask(Worker* worker,
-                                  WaitingTask* runModuleTask,
-                                  ParentContext const& parentContext) :
-    m_worker(worker),
-    m_runModuleTask(runModuleTask),
-    m_parentContext(parentContext) {
-  }
-
-  tbb::task*
-  Worker::HandleExternalWorkExceptionTask::execute() {
+  Worker::HandleExternalWorkExceptionTask::HandleExternalWorkExceptionTask(Worker* worker,
+                                                                           WaitingTask* runModuleTask,
+                                                                           ParentContext const& parentContext)
+      : m_worker(worker), m_runModuleTask(runModuleTask), m_parentContext(parentContext) {}
 
+  tbb::task* Worker::HandleExternalWorkExceptionTask::execute() {
     auto excptr = exceptionPtr();
     if (excptr) {
       // increment the ref count so the holder will not spawn it
       m_runModuleTask->set_ref_count(1);
       WaitingTaskHolder holder(m_runModuleTask);
-      holder.doneWaiting(m_worker->handleExternalWorkException(excptr,
-                                                               m_parentContext));
+      holder.doneWaiting(m_worker->handleExternalWorkException(excptr, m_parentContext));
     }
     m_runModuleTask->set_ref_count(0);
     // Depend on TBB Scheduler Bypass to run the next task
     return m_runModuleTask;
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/Worker.h b/FWCore/Framework/src/Worker.h
index 487dc3355d079..f3f28257d5673 100644
--- a/FWCore/Framework/src/Worker.h
+++ b/FWCore/Framework/src/Worker.h
@@ -73,26 +73,30 @@ namespace edm {
   class ThinnedAssociationsHelper;
 
   namespace workerhelper {
-    template< typename O> class CallImpl;
+    template <typename O>
+    class CallImpl;
+  }
+  namespace eventsetup {
+    class ESRecordsToProxyIndices;
   }
 
   class Worker {
   public:
     enum State { Ready, Pass, Fail, Exception };
-    enum Types { kAnalyzer, kFilter, kProducer, kOutputModule};
+    enum Types { kAnalyzer, kFilter, kProducer, kOutputModule };
     struct TaskQueueAdaptor {
       SerialTaskQueueChain* serial_ = nullptr;
       LimitedTaskQueue* limited_ = nullptr;
-      
+
       TaskQueueAdaptor() = default;
-      TaskQueueAdaptor(SerialTaskQueueChain* iChain): serial_(iChain) {}
-      TaskQueueAdaptor(LimitedTaskQueue* iLimited): limited_(iLimited) {}
-      
+      TaskQueueAdaptor(SerialTaskQueueChain* iChain) : serial_(iChain) {}
+      TaskQueueAdaptor(LimitedTaskQueue* iLimited) : limited_(iLimited) {}
+
       operator bool() { return serial_ != nullptr or limited_ != nullptr; }
-      
+
       template <class F>
       void push(F&& iF) {
-        if(serial_) {
+        if (serial_) {
           serial_->push(iF);
         } else {
           limited_->push(iF);
@@ -100,49 +104,47 @@ namespace edm {
       }
       template <class F>
       void pushAndWait(F&& iF) {
-        if(serial_) {
+        if (serial_) {
           serial_->pushAndWait(iF);
         } else {
           limited_->pushAndWait(iF);
         }
       }
-      
     };
 
     Worker(ModuleDescription const& iMD, ExceptionToActionTable const* iActions);
     virtual ~Worker();
 
-    Worker(Worker const&) = delete; // Disallow copying and moving
-    Worker& operator=(Worker const&) = delete; // Disallow copying and moving
+    Worker(Worker const&) = delete;             // Disallow copying and moving
+    Worker& operator=(Worker const&) = delete;  // Disallow copying and moving
 
     virtual bool wantsGlobalRuns() const = 0;
     virtual bool wantsGlobalLuminosityBlocks() const = 0;
     virtual bool wantsStreamRuns() const = 0;
     virtual bool wantsStreamLuminosityBlocks() const = 0;
-    
+
     virtual SerialTaskQueue* globalRunsQueue() = 0;
     virtual SerialTaskQueue* globalLuminosityBlocksQueue() = 0;
 
     template <typename T>
-    bool doWork(typename T::MyPrincipal const&, EventSetupImpl const& c,
+    bool doWork(typename T::MyPrincipal const&,
+                EventSetupImpl const& c,
                 StreamID stream,
                 ParentContext const& parentContext,
                 typename T::Context const* context);
-    
-    void prePrefetchSelectionAsync(WaitingTask* task,
-                                   ServiceToken const&,
-                                      StreamID stream,
-                                      EventPrincipal const*);
 
-    void prePrefetchSelectionAsync(WaitingTask* task,
-                                   ServiceToken const&,
-                                   StreamID stream,
-                                   void const*) {assert(false);}
+    void prePrefetchSelectionAsync(WaitingTask* task, ServiceToken const&, StreamID stream, EventPrincipal const*);
+
+    void prePrefetchSelectionAsync(WaitingTask* task, ServiceToken const&, StreamID stream, void const*) {
+      assert(false);
+    }
 
     template <typename T>
     void doWorkAsync(WaitingTask* task,
-                     typename T::MyPrincipal const&, EventSetupImpl const& c,
-                     ServiceToken const& token, StreamID stream,
+                     typename T::MyPrincipal const&,
+                     EventSetupImpl const& c,
+                     ServiceToken const& token,
+                     StreamID stream,
                      ParentContext const& parentContext,
                      typename T::Context const* context);
 
@@ -162,18 +164,18 @@ namespace edm {
                                          ParentContext const& parentContext,
                                          typename T::Context const* context);
 
-    void callWhenDoneAsync(WaitingTask* task) {
-      waitingTasks_.add(task);
-    }
+    void callWhenDoneAsync(WaitingTask* task) { waitingTasks_.add(task); }
     void skipOnPath();
-    void beginJob() ;
+    void beginJob();
     void endJob();
     void beginStream(StreamID id, StreamContext& streamContext);
     void endStream(StreamID id, StreamContext& streamContext);
-    void respondToOpenInputFile(FileBlock const& fb) {implRespondToOpenInputFile(fb);}
-    void respondToCloseInputFile(FileBlock const& fb) {implRespondToCloseInputFile(fb);}
+    void respondToOpenInputFile(FileBlock const& fb) { implRespondToOpenInputFile(fb); }
+    void respondToCloseInputFile(FileBlock const& fb) { implRespondToCloseInputFile(fb); }
 
-    void registerThinnedAssociations(ProductRegistry const& registry, ThinnedAssociationsHelper& helper) { implRegisterThinnedAssociations(registry, helper); }
+    void registerThinnedAssociations(ProductRegistry const& registry, ThinnedAssociationsHelper& helper) {
+      implRegisterThinnedAssociations(registry, helper);
+    }
 
     void reset() {
       cached_exception_ = std::exception_ptr();
@@ -185,8 +187,8 @@ namespace edm {
 
     void postDoEvent(EventPrincipal const&);
 
-    ModuleDescription const& description() const {return *(moduleCallingContext_.moduleDescription());}
-    ModuleDescription const* descPtr() const {return moduleCallingContext_.moduleDescription(); }
+    ModuleDescription const& description() const { return *(moduleCallingContext_.moduleDescription()); }
+    ModuleDescription const* descPtr() const { return moduleCallingContext_.moduleDescription(); }
     ///The signals are required to live longer than the last call to 'doWork'
     /// this was done to improve performance based on profiling
     void setActivityRegistry(std::shared_ptr<ActivityRegistry> areg);
@@ -194,32 +196,33 @@ namespace edm {
     void setEarlyDeleteHelper(EarlyDeleteHelper* iHelper);
 
     //Used to make EDGetToken work
-    virtual void updateLookup(BranchType iBranchType,
-                      ProductResolverIndexHelper const&) = 0;
-    virtual void resolvePutIndicies(BranchType iBranchType,
-                                    std::unordered_multimap<std::string, std::tuple<TypeID const*, const char*, edm::ProductResolverIndex>> const& iIndicies) = 0;
-
-    virtual void modulesWhoseProductsAreConsumed(std::vector<ModuleDescription const*>& modules,
-                                                 ProductRegistry const& preg,
-                                                 std::map<std::string, ModuleDescription const*> const& labelsToDesc) const = 0;
+    virtual void updateLookup(BranchType iBranchType, ProductResolverIndexHelper const&) = 0;
+    virtual void updateLookup(eventsetup::ESRecordsToProxyIndices const&) = 0;
+    virtual void resolvePutIndicies(
+        BranchType iBranchType,
+        std::unordered_multimap<std::string, std::tuple<TypeID const*, const char*, edm::ProductResolverIndex>> const&
+            iIndicies) = 0;
+
+    virtual void modulesWhoseProductsAreConsumed(
+        std::vector<ModuleDescription const*>& modules,
+        ProductRegistry const& preg,
+        std::map<std::string, ModuleDescription const*> const& labelsToDesc) const = 0;
 
     virtual void convertCurrentProcessAlias(std::string const& processName) = 0;
 
     virtual std::vector<ConsumesInfo> consumesInfo() const = 0;
 
-    virtual Types moduleType() const =0;
+    virtual Types moduleType() const = 0;
 
     void clearCounters() {
-      timesRun_.store(0,std::memory_order_release);
-      timesVisited_.store(0,std::memory_order_release);
-      timesPassed_.store(0,std::memory_order_release);
-      timesFailed_.store(0,std::memory_order_release);
-      timesExcept_.store(0,std::memory_order_release);
+      timesRun_.store(0, std::memory_order_release);
+      timesVisited_.store(0, std::memory_order_release);
+      timesPassed_.store(0, std::memory_order_release);
+      timesFailed_.store(0, std::memory_order_release);
+      timesExcept_.store(0, std::memory_order_release);
     }
 
-    void addedToPath() {
-      ++numberOfPathsOn_;
-    }
+    void addedToPath() { ++numberOfPathsOn_; }
     //NOTE: calling state() is done to force synchronization across threads
     int timesRun() const { return timesRun_.load(std::memory_order_acquire); }
     int timesVisited() const { return timesVisited_.load(std::memory_order_acquire); }
@@ -228,41 +231,48 @@ namespace edm {
     int timesExcept() const { return timesExcept_.load(std::memory_order_acquire); }
     State state() const { return state_; }
 
-    int timesPass() const { return timesPassed(); } // for backward compatibility only - to be removed soon
+    int timesPass() const { return timesPassed(); }  // for backward compatibility only - to be removed soon
 
     virtual bool hasAccumulator() const = 0;
 
   protected:
-    template<typename O> friend class workerhelper::CallImpl;
+    template <typename O>
+    friend class workerhelper::CallImpl;
     virtual std::string workerType() const = 0;
-    virtual bool implDo(EventPrincipal const&, EventSetupImpl const& c,
-                        ModuleCallingContext const* mcc) = 0;
+    virtual bool implDo(EventPrincipal const&, EventSetupImpl const& c, ModuleCallingContext const* mcc) = 0;
 
     virtual void itemsToGetForSelection(std::vector<ProductResolverIndexAndSkipBit>&) const = 0;
     virtual bool implNeedToRunSelection() const = 0;
 
-    virtual void implDoAcquire(EventPrincipal const&, EventSetupImpl const& c,
+    virtual void implDoAcquire(EventPrincipal const&,
+                               EventSetupImpl const& c,
                                ModuleCallingContext const* mcc,
                                WaitingTaskWithArenaHolder& holder) = 0;
 
-    virtual bool implDoPrePrefetchSelection(StreamID id,
-                                            EventPrincipal const& ep,
-                                            ModuleCallingContext const* mcc) = 0;
-    virtual bool implDoBegin(RunPrincipal const& rp, EventSetupImpl const& c,
-                             ModuleCallingContext const* mcc) = 0;
-    virtual bool implDoStreamBegin(StreamID id, RunPrincipal const& rp, EventSetupImpl const& c,
+    virtual bool implDoPrePrefetchSelection(StreamID id, EventPrincipal const& ep, ModuleCallingContext const* mcc) = 0;
+    virtual bool implDoBegin(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc) = 0;
+    virtual bool implDoStreamBegin(StreamID id,
+                                   RunPrincipal const& rp,
+                                   EventSetupImpl const& c,
                                    ModuleCallingContext const* mcc) = 0;
-    virtual bool implDoStreamEnd(StreamID id, RunPrincipal const& rp, EventSetupImpl const& c,
+    virtual bool implDoStreamEnd(StreamID id,
+                                 RunPrincipal const& rp,
+                                 EventSetupImpl const& c,
                                  ModuleCallingContext const* mcc) = 0;
-    virtual bool implDoEnd(RunPrincipal const& rp, EventSetupImpl const& c,
-                           ModuleCallingContext const* mcc) = 0;
-    virtual bool implDoBegin(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& c,
+    virtual bool implDoEnd(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc) = 0;
+    virtual bool implDoBegin(LuminosityBlockPrincipal const& lbp,
+                             EventSetupImpl const& c,
                              ModuleCallingContext const* mcc) = 0;
-    virtual bool implDoStreamBegin(StreamID id, LuminosityBlockPrincipal const& lbp, EventSetupImpl const& c,
+    virtual bool implDoStreamBegin(StreamID id,
+                                   LuminosityBlockPrincipal const& lbp,
+                                   EventSetupImpl const& c,
                                    ModuleCallingContext const* mcc) = 0;
-    virtual bool implDoStreamEnd(StreamID id, LuminosityBlockPrincipal const& lbp, EventSetupImpl const& c,
+    virtual bool implDoStreamEnd(StreamID id,
+                                 LuminosityBlockPrincipal const& lbp,
+                                 EventSetupImpl const& c,
                                  ModuleCallingContext const* mcc) = 0;
-    virtual bool implDoEnd(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& c,
+    virtual bool implDoEnd(LuminosityBlockPrincipal const& lbp,
+                           EventSetupImpl const& c,
                            ModuleCallingContext const* mcc) = 0;
     virtual void implBeginJob() = 0;
     virtual void implEndJob() = 0;
@@ -274,33 +284,33 @@ namespace edm {
     ActivityRegistry* activityRegistry() { return actReg_.get(); }
 
   private:
-    
     template <typename T>
-    bool runModule(typename T::MyPrincipal const&, EventSetupImpl const& c,
-                StreamID stream,
-                ParentContext const& parentContext,
-                typename T::Context const* context);
+    bool runModule(typename T::MyPrincipal const&,
+                   EventSetupImpl const& c,
+                   StreamID stream,
+                   ParentContext const& parentContext,
+                   typename T::Context const* context);
 
     virtual void itemsToGet(BranchType, std::vector<ProductResolverIndexAndSkipBit>&) const = 0;
     virtual void itemsMayGet(BranchType, std::vector<ProductResolverIndexAndSkipBit>&) const = 0;
 
     virtual std::vector<ProductResolverIndexAndSkipBit> const& itemsToGetFrom(BranchType) const = 0;
 
-
     virtual std::vector<ProductResolverIndex> const& itemsShouldPutInEvent() const = 0;
 
-    virtual void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& moduleCallingContext, Principal const& iPrincipal) const = 0;
-    
+    virtual void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                              ModuleCallingContext const& moduleCallingContext,
+                                              Principal const& iPrincipal) const = 0;
+
     virtual void implRespondToOpenInputFile(FileBlock const& fb) = 0;
     virtual void implRespondToCloseInputFile(FileBlock const& fb) = 0;
 
     virtual void implRegisterThinnedAssociations(ProductRegistry const&, ThinnedAssociationsHelper&) = 0;
-    
+
     virtual TaskQueueAdaptor serializeRunModule() = 0;
-    
-    static void exceptionContext(cms::Exception& ex,
-                                 ModuleCallingContext const* mcc);
-    
+
+    static void exceptionContext(cms::Exception& ex, ModuleCallingContext const* mcc);
+
     /*This base class is used to hide the differences between the ID used
      for Event, LuminosityBlock and Run. Using the base class allows us
      to only convert the ID to string form if it is actually needed in
@@ -311,67 +321,64 @@ namespace edm {
       virtual std::string value() const = 0;
       virtual ~TransitionIDValueBase() {}
     };
-    
-    template< typename T>
+
+    template <typename T>
     class TransitionIDValue : public TransitionIDValueBase {
     public:
-      TransitionIDValue(T const& iP): p_(iP) {}
+      TransitionIDValue(T const& iP) : p_(iP) {}
       std::string value() const override {
         std::ostringstream iost;
-        iost<<p_.id();
+        iost << p_.id();
         return iost.str();
       }
-      private:
-        T const& p_;
-        
+
+    private:
+      T const& p_;
     };
-    
+
     bool shouldRethrowException(std::exception_ptr iPtr,
                                 ParentContext const& parentContext,
                                 bool isEvent,
                                 TransitionIDValueBase const& iID) const;
 
-    template<bool IS_EVENT>
+    template <bool IS_EVENT>
     bool setPassed() {
-      if(IS_EVENT) {
-        timesPassed_.fetch_add(1,std::memory_order_relaxed);
+      if (IS_EVENT) {
+        timesPassed_.fetch_add(1, std::memory_order_relaxed);
       }
       state_ = Pass;
       return true;
     }
 
-    template<bool IS_EVENT>
+    template <bool IS_EVENT>
     bool setFailed() {
-      if(IS_EVENT) {
-        timesFailed_.fetch_add(1,std::memory_order_relaxed);
+      if (IS_EVENT) {
+        timesFailed_.fetch_add(1, std::memory_order_relaxed);
       }
       state_ = Fail;
       return false;
     }
 
-    template<bool IS_EVENT>
+    template <bool IS_EVENT>
     std::exception_ptr setException(std::exception_ptr iException) {
       if (IS_EVENT) {
-        timesExcept_.fetch_add(1,std::memory_order_relaxed);
+        timesExcept_.fetch_add(1, std::memory_order_relaxed);
       }
-      cached_exception_ = iException; // propagate_const<T> has no reset() function
+      cached_exception_ = iException;  // propagate_const<T> has no reset() function
       state_ = Exception;
       return cached_exception_;
     }
-        
-    void prefetchAsync(WaitingTask*,
-                       ServiceToken const&,
-                       ParentContext const& parentContext,
-                       Principal const& );
-        
+
+    void prefetchAsync(WaitingTask*, ServiceToken const&, ParentContext const& parentContext, Principal const&);
+
     void emitPostModuleEventPrefetchingSignal() {
-      actReg_->postModuleEventPrefetchingSignal_.emit(*moduleCallingContext_.getStreamContext(),moduleCallingContext_);
+      actReg_->postModuleEventPrefetchingSignal_.emit(*moduleCallingContext_.getStreamContext(), moduleCallingContext_);
     }
 
     virtual bool hasAcquire() const = 0;
 
-    template<typename T>
-    std::exception_ptr runModuleAfterAsyncPrefetch(std::exception_ptr const * iEPtr,
+    template <typename T>
+    std::exception_ptr runModuleAfterAsyncPrefetch(std::exception_ptr const* iEPtr,
                                                    typename T::MyPrincipal const& ep,
                                                    EventSetupImpl const& es,
                                                    StreamID streamID,
@@ -389,10 +396,9 @@ namespace edm {
                                       ParentContext const& parentContext,
                                       WaitingTaskWithArenaHolder holder);
 
-    std::exception_ptr handleExternalWorkException(std::exception_ptr const* iEPtr,
-                                                   ParentContext const& parentContext);
+    std::exception_ptr handleExternalWorkException(std::exception_ptr const* iEPtr, ParentContext const& parentContext);
 
-    template< typename T>
+    template <typename T>
     class RunModuleTask : public WaitingTask {
     public:
       RunModuleTask(Worker* worker,
@@ -401,23 +407,27 @@ namespace edm {
                     ServiceToken const& token,
                     StreamID streamID,
                     ParentContext const& parentContext,
-                    typename T::Context const* context):
-      m_worker(worker),
-      m_principal(ep),
-      m_es(es),
-      m_streamID(streamID),
-      m_parentContext(parentContext),
-      m_context(context),
-      m_serviceToken(token) {}
-      
+                    typename T::Context const* context)
+          : m_worker(worker),
+            m_principal(ep),
+            m_es(es),
+            m_streamID(streamID),
+            m_parentContext(parentContext),
+            m_context(context),
+            m_serviceToken(token) {}
+
       struct EnableQueueGuard {
         SerialTaskQueue* queue_;
-        EnableQueueGuard(SerialTaskQueue* iQueue): queue_{iQueue} {}
+        EnableQueueGuard(SerialTaskQueue* iQueue) : queue_{iQueue} {}
         EnableQueueGuard(EnableQueueGuard const&) = delete;
         EnableQueueGuard& operator=(EnableQueueGuard const&) = delete;
         EnableQueueGuard& operator=(EnableQueueGuard&&) = delete;
-        EnableQueueGuard(EnableQueueGuard&& iGuard): queue_{iGuard.queue_} {iGuard.queue_ = nullptr;}
-        ~EnableQueueGuard() { if(queue_) {queue_->resume();} }
+        EnableQueueGuard(EnableQueueGuard&& iGuard) : queue_{iGuard.queue_} { iGuard.queue_ = nullptr; }
+        ~EnableQueueGuard() {
+          if (queue_) {
+            queue_->resume();
+          }
+        }
       };
 
       tbb::task* execute() override {
@@ -428,64 +438,57 @@ namespace edm {
         // to hold the exception_ptr
         std::exception_ptr temp_excptr;
         auto excptr = exceptionPtr();
-        if(T::isEvent_ && !m_worker->hasAcquire()) {
+        if (T::isEvent_ && !m_worker->hasAcquire()) {
           try {
             //pre was called in prefetchAsync
             m_worker->emitPostModuleEventPrefetchingSignal();
-          }catch(...) {
+          } catch (...) {
             temp_excptr = std::current_exception();
-            if(not excptr) {
+            if (not excptr) {
               excptr = &temp_excptr;
             }
           }
         }
 
-        if( not excptr) {
-          if(auto queue = m_worker->serializeRunModule()) {
-            auto const & principal = m_principal;
+        if (not excptr) {
+          if (auto queue = m_worker->serializeRunModule()) {
+            auto const& principal = m_principal;
             auto& es = m_es;
-            auto f = [worker = m_worker, &principal,
-                      &es, streamID = m_streamID,
+            auto f = [worker = m_worker,
+                      &principal,
+                      &es,
+                      streamID = m_streamID,
                       parentContext = m_parentContext,
-                      sContext = m_context, serviceToken = m_serviceToken]()
-            {
+                      sContext = m_context,
+                      serviceToken = m_serviceToken]() {
               //Need to make the services available
               ServiceRegistry::Operate guard(serviceToken);
-              
+
               //If needed, we pause the queue in begin transition and resume it
               // at the end transition. This guarantees that the module
               // only processes one transition at a time
-              EnableQueueGuard enableQueueGuard{ workerhelper::CallImpl<T>::enableGlobalQueue(worker)};
+              EnableQueueGuard enableQueueGuard{workerhelper::CallImpl<T>::enableGlobalQueue(worker)};
               std::exception_ptr* ptr = nullptr;
-              worker->template runModuleAfterAsyncPrefetch<T>(ptr,
-                                                     principal,
-                                                     es,
-                                                     streamID,
-                                                     parentContext,
-                                                     sContext);
+              worker->template runModuleAfterAsyncPrefetch<T>(ptr, principal, es, streamID, parentContext, sContext);
             };
             //keep another global transition from running if necessary
             auto gQueue = workerhelper::CallImpl<T>::pauseGlobalQueue(m_worker);
-            if(gQueue) {
-              gQueue->push( [queue,gQueue, f]() mutable {
+            if (gQueue) {
+              gQueue->push([queue, gQueue, f]() mutable {
                 gQueue->pause();
-                queue.push(std::move(f));} );
+                queue.push(std::move(f));
+              });
             } else {
-              queue.push( std::move(f) );
+              queue.push(std::move(f));
             }
             return nullptr;
           }
         }
 
-        m_worker->runModuleAfterAsyncPrefetch<T>(excptr,
-                                                 m_principal,
-                                                 m_es,
-                                                 m_streamID,
-                                                 m_parentContext,
-                                                 m_context);
+        m_worker->runModuleAfterAsyncPrefetch<T>(excptr, m_principal, m_es, m_streamID, m_parentContext, m_context);
         return nullptr;
       }
-      
+
     private:
       Worker* m_worker;
       typename T::MyPrincipal const& m_principal;
@@ -520,13 +523,13 @@ namespace edm {
                   EventSetupImpl const& es,
                   ServiceToken const& token,
                   ParentContext const& parentContext,
-                  WaitingTaskWithArenaHolder holder):
-      m_worker(worker),
-      m_principal(ep),
-      m_es(es),
-      m_parentContext(parentContext),
-        m_holder(std::move(holder)),
-      m_serviceToken(token) {}
+                  WaitingTaskWithArenaHolder holder)
+          : m_worker(worker),
+            m_principal(ep),
+            m_es(es),
+            m_parentContext(parentContext),
+            m_holder(std::move(holder)),
+            m_serviceToken(token) {}
 
       tbb::task* execute() override {
         //Need to make the services available early so other services can see them
@@ -539,40 +542,34 @@ namespace edm {
         try {
           //pre was called in prefetchAsync
           m_worker->emitPostModuleEventPrefetchingSignal();
-        } catch(...) {
+        } catch (...) {
           temp_excptr = std::current_exception();
-          if(not excptr) {
+          if (not excptr) {
             excptr = &temp_excptr;
           }
         }
 
-        if( not excptr) {
-          if(auto queue = m_worker->serializeRunModule()) {
-            auto const & principal = m_principal;
+        if (not excptr) {
+          if (auto queue = m_worker->serializeRunModule()) {
+            auto const& principal = m_principal;
             auto& es = m_es;
-            queue.push( [worker = m_worker, &principal,
-                         &es, parentContext = m_parentContext,
-                         serviceToken = m_serviceToken, holder = m_holder]()
-            {
+            queue.push([worker = m_worker,
+                        &principal,
+                        &es,
+                        parentContext = m_parentContext,
+                        serviceToken = m_serviceToken,
+                        holder = m_holder]() {
               //Need to make the services available
               ServiceRegistry::Operate guard(serviceToken);
 
               std::exception_ptr* ptr = nullptr;
-              worker->runAcquireAfterAsyncPrefetch(ptr,
-                                                   principal,
-                                                   es,
-                                                   parentContext,
-                                                   holder);
+              worker->runAcquireAfterAsyncPrefetch(ptr, principal, es, parentContext, holder);
             });
             return nullptr;
           }
         }
 
-        m_worker->runAcquireAfterAsyncPrefetch(excptr,
-                                               m_principal,
-                                               m_es,
-                                               m_parentContext,
-                                               std::move(m_holder));
+        m_worker->runAcquireAfterAsyncPrefetch(excptr, m_principal, m_es, m_parentContext, std::move(m_holder));
         return nullptr;
       }
 
@@ -590,10 +587,7 @@ namespace edm {
     // exception to a CMS exception and adding context to the exception.
     class HandleExternalWorkExceptionTask : public WaitingTask {
     public:
-
-      HandleExternalWorkExceptionTask(Worker* worker,
-                                      WaitingTask* runModuleTask,
-                                      ParentContext const& parentContext);
+      HandleExternalWorkExceptionTask(Worker* worker, WaitingTask* runModuleTask, ParentContext const& parentContext);
 
       tbb::task* execute() override;
 
@@ -611,16 +605,16 @@ namespace edm {
     std::atomic<State> state_;
     int numberOfPathsOn_;
     std::atomic<int> numberOfPathsLeftToRun_;
-        
+
     ModuleCallingContext moduleCallingContext_;
 
-    ExceptionToActionTable const* actions_; // memory assumed to be managed elsewhere
-    CMS_THREAD_GUARD(state_) std::exception_ptr cached_exception_; // if state is 'exception'
+    ExceptionToActionTable const* actions_;                         // memory assumed to be managed elsewhere
+    CMS_THREAD_GUARD(state_) std::exception_ptr cached_exception_;  // if state is 'exception'
 
-    std::shared_ptr<ActivityRegistry> actReg_; // We do not use propagate_const because the registry itself is mutable.
+    std::shared_ptr<ActivityRegistry> actReg_;  // We do not use propagate_const because the registry itself is mutable.
 
     edm::propagate_const<EarlyDeleteHelper*> earlyDeleteHelper_;
-    
+
     edm::WaitingTaskList waitingTasks_;
     std::atomic<bool> workStarted_;
     bool ranAcquireWithoutException_;
@@ -630,223 +624,204 @@ namespace edm {
     template <typename T>
     class ModuleSignalSentry {
     public:
-      ModuleSignalSentry(ActivityRegistry *a,
+      ModuleSignalSentry(ActivityRegistry* a,
                          typename T::Context const* context,
-                         ModuleCallingContext const* moduleCallingContext) :
-        a_(a), context_(context), moduleCallingContext_(moduleCallingContext) {
-
-	if(a_) T::preModuleSignal(a_, context, moduleCallingContext_);
+                         ModuleCallingContext const* moduleCallingContext)
+          : a_(a), context_(context), moduleCallingContext_(moduleCallingContext) {
+        if (a_)
+          T::preModuleSignal(a_, context, moduleCallingContext_);
       }
 
       ~ModuleSignalSentry() {
-	if(a_) T::postModuleSignal(a_, context_, moduleCallingContext_);
+        if (a_)
+          T::postModuleSignal(a_, context_, moduleCallingContext_);
       }
 
     private:
-      ActivityRegistry* a_; // We do not use propagate_const because the registry itself is mutable.
+      ActivityRegistry* a_;  // We do not use propagate_const because the registry itself is mutable.
       typename T::Context const* context_;
       ModuleCallingContext const* moduleCallingContext_;
     };
 
-  }
+  }  // namespace
 
   namespace workerhelper {
-    template<>
+    template <>
     class CallImpl<OccurrenceTraits<EventPrincipal, BranchActionStreamBegin>> {
     public:
       typedef OccurrenceTraits<EventPrincipal, BranchActionStreamBegin> Arg;
-      static bool call(Worker* iWorker, StreamID,
-                       EventPrincipal const& ep, EventSetupImpl const& es,
+      static bool call(Worker* iWorker,
+                       StreamID,
+                       EventPrincipal const& ep,
+                       EventSetupImpl const& es,
                        ActivityRegistry* /* actReg */,
                        ModuleCallingContext const* mcc,
                        Arg::Context const* /* context*/) {
         //Signal sentry is handled by the module
-        return iWorker->implDo(ep,es, mcc);
-      }
-      static bool wantsTransition(Worker const* iWorker) {
-        return true;
-      }      
-      static bool needToRunSelection( Worker const* iWorker) {
-        return iWorker->implNeedToRunSelection();
+        return iWorker->implDo(ep, es, mcc);
       }
-      
-      static SerialTaskQueue* pauseGlobalQueue(Worker*) { return nullptr;}
-      static SerialTaskQueue* enableGlobalQueue(Worker*) { return nullptr;}
+      static bool wantsTransition(Worker const* iWorker) { return true; }
+      static bool needToRunSelection(Worker const* iWorker) { return iWorker->implNeedToRunSelection(); }
+
+      static SerialTaskQueue* pauseGlobalQueue(Worker*) { return nullptr; }
+      static SerialTaskQueue* enableGlobalQueue(Worker*) { return nullptr; }
     };
 
-    template<>
-    class CallImpl<OccurrenceTraits<RunPrincipal, BranchActionGlobalBegin>>{
+    template <>
+    class CallImpl<OccurrenceTraits<RunPrincipal, BranchActionGlobalBegin>> {
     public:
       typedef OccurrenceTraits<RunPrincipal, BranchActionGlobalBegin> Arg;
-      static bool call(Worker* iWorker,StreamID,
-                       RunPrincipal const& ep, EventSetupImpl const& es,
+      static bool call(Worker* iWorker,
+                       StreamID,
+                       RunPrincipal const& ep,
+                       EventSetupImpl const& es,
                        ActivityRegistry* actReg,
                        ModuleCallingContext const* mcc,
                        Arg::Context const* context) {
         ModuleSignalSentry<Arg> cpp(actReg, context, mcc);
-        return iWorker->implDoBegin(ep,es, mcc);
-      }
-      static bool wantsTransition(Worker const* iWorker) {
-        return iWorker->wantsGlobalRuns();
+        return iWorker->implDoBegin(ep, es, mcc);
       }
-      static bool needToRunSelection( Worker const* iWorker) {
-        return false;
-      }
-      static SerialTaskQueue* pauseGlobalQueue(Worker* iWorker) { return iWorker->globalRunsQueue();}
-      static SerialTaskQueue* enableGlobalQueue(Worker*) { return nullptr;}
-
+      static bool wantsTransition(Worker const* iWorker) { return iWorker->wantsGlobalRuns(); }
+      static bool needToRunSelection(Worker const* iWorker) { return false; }
+      static SerialTaskQueue* pauseGlobalQueue(Worker* iWorker) { return iWorker->globalRunsQueue(); }
+      static SerialTaskQueue* enableGlobalQueue(Worker*) { return nullptr; }
     };
-    template<>
-    class CallImpl<OccurrenceTraits<RunPrincipal, BranchActionStreamBegin>>{
+    template <>
+    class CallImpl<OccurrenceTraits<RunPrincipal, BranchActionStreamBegin>> {
     public:
       typedef OccurrenceTraits<RunPrincipal, BranchActionStreamBegin> Arg;
-      static bool call(Worker* iWorker,StreamID id,
-                       RunPrincipal const & ep, EventSetupImpl const& es,
+      static bool call(Worker* iWorker,
+                       StreamID id,
+                       RunPrincipal const& ep,
+                       EventSetupImpl const& es,
                        ActivityRegistry* actReg,
                        ModuleCallingContext const* mcc,
                        Arg::Context const* context) {
         ModuleSignalSentry<Arg> cpp(actReg, context, mcc);
-        return iWorker->implDoStreamBegin(id,ep,es, mcc);
-      }
-      static bool wantsTransition(Worker const* iWorker) {
-        return iWorker->wantsStreamRuns();
+        return iWorker->implDoStreamBegin(id, ep, es, mcc);
       }
-      static bool needToRunSelection( Worker const* iWorker) {
-        return false;
-      }
-      static SerialTaskQueue* pauseGlobalQueue(Worker* iWorker) { return nullptr;}
-      static SerialTaskQueue* enableGlobalQueue(Worker*) { return nullptr;}
-
+      static bool wantsTransition(Worker const* iWorker) { return iWorker->wantsStreamRuns(); }
+      static bool needToRunSelection(Worker const* iWorker) { return false; }
+      static SerialTaskQueue* pauseGlobalQueue(Worker* iWorker) { return nullptr; }
+      static SerialTaskQueue* enableGlobalQueue(Worker*) { return nullptr; }
     };
-    template<>
-    class CallImpl<OccurrenceTraits<RunPrincipal, BranchActionGlobalEnd>>{
+    template <>
+    class CallImpl<OccurrenceTraits<RunPrincipal, BranchActionGlobalEnd>> {
     public:
       typedef OccurrenceTraits<RunPrincipal, BranchActionGlobalEnd> Arg;
-      static bool call(Worker* iWorker,StreamID,
-                       RunPrincipal const& ep, EventSetupImpl const& es,
+      static bool call(Worker* iWorker,
+                       StreamID,
+                       RunPrincipal const& ep,
+                       EventSetupImpl const& es,
                        ActivityRegistry* actReg,
                        ModuleCallingContext const* mcc,
                        Arg::Context const* context) {
         ModuleSignalSentry<Arg> cpp(actReg, context, mcc);
-        return iWorker->implDoEnd(ep,es, mcc);
+        return iWorker->implDoEnd(ep, es, mcc);
       }
-      static bool wantsTransition(Worker const* iWorker) {
-        return iWorker->wantsGlobalRuns();
-      }
-      static bool needToRunSelection( Worker const* iWorker) {
-        return false;
-      }
-      static SerialTaskQueue* pauseGlobalQueue(Worker* iWorker) { return nullptr;}
-      static SerialTaskQueue* enableGlobalQueue(Worker* iWorker) { return iWorker->globalRunsQueue();}
+      static bool wantsTransition(Worker const* iWorker) { return iWorker->wantsGlobalRuns(); }
+      static bool needToRunSelection(Worker const* iWorker) { return false; }
+      static SerialTaskQueue* pauseGlobalQueue(Worker* iWorker) { return nullptr; }
+      static SerialTaskQueue* enableGlobalQueue(Worker* iWorker) { return iWorker->globalRunsQueue(); }
     };
-    template<>
-    class CallImpl<OccurrenceTraits<RunPrincipal, BranchActionStreamEnd>>{
+    template <>
+    class CallImpl<OccurrenceTraits<RunPrincipal, BranchActionStreamEnd>> {
     public:
       typedef OccurrenceTraits<RunPrincipal, BranchActionStreamEnd> Arg;
-      static bool call(Worker* iWorker,StreamID id,
-                       RunPrincipal const& ep, EventSetupImpl const& es,
+      static bool call(Worker* iWorker,
+                       StreamID id,
+                       RunPrincipal const& ep,
+                       EventSetupImpl const& es,
                        ActivityRegistry* actReg,
                        ModuleCallingContext const* mcc,
                        Arg::Context const* context) {
         ModuleSignalSentry<Arg> cpp(actReg, context, mcc);
-        return iWorker->implDoStreamEnd(id,ep,es, mcc);
-      }
-      static bool wantsTransition(Worker const* iWorker) {
-        return iWorker->wantsStreamRuns();
+        return iWorker->implDoStreamEnd(id, ep, es, mcc);
       }
-      static bool needToRunSelection( Worker const* iWorker) {
-        return false;
-      }
-      static SerialTaskQueue* pauseGlobalQueue(Worker* iWorker) { return nullptr;}
-      static SerialTaskQueue* enableGlobalQueue(Worker*) { return nullptr;}
+      static bool wantsTransition(Worker const* iWorker) { return iWorker->wantsStreamRuns(); }
+      static bool needToRunSelection(Worker const* iWorker) { return false; }
+      static SerialTaskQueue* pauseGlobalQueue(Worker* iWorker) { return nullptr; }
+      static SerialTaskQueue* enableGlobalQueue(Worker*) { return nullptr; }
     };
 
-    template<>
-    class CallImpl<OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalBegin>>{
+    template <>
+    class CallImpl<OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalBegin>> {
     public:
       typedef OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalBegin> Arg;
-      static bool call(Worker* iWorker,StreamID,
-                       LuminosityBlockPrincipal const& ep, EventSetupImpl const& es,
+      static bool call(Worker* iWorker,
+                       StreamID,
+                       LuminosityBlockPrincipal const& ep,
+                       EventSetupImpl const& es,
                        ActivityRegistry* actReg,
                        ModuleCallingContext const* mcc,
                        Arg::Context const* context) {
         ModuleSignalSentry<Arg> cpp(actReg, context, mcc);
-        return iWorker->implDoBegin(ep,es, mcc);
-      }
-      static bool wantsTransition(Worker const* iWorker) {
-        return iWorker->wantsGlobalLuminosityBlocks();
+        return iWorker->implDoBegin(ep, es, mcc);
       }
-      static bool needToRunSelection( Worker const* iWorker) {
-        return false;
-      }
-      static SerialTaskQueue* pauseGlobalQueue(Worker* iWorker) { return iWorker->globalLuminosityBlocksQueue();}
-      static SerialTaskQueue* enableGlobalQueue(Worker*) { return nullptr;}
+      static bool wantsTransition(Worker const* iWorker) { return iWorker->wantsGlobalLuminosityBlocks(); }
+      static bool needToRunSelection(Worker const* iWorker) { return false; }
+      static SerialTaskQueue* pauseGlobalQueue(Worker* iWorker) { return iWorker->globalLuminosityBlocksQueue(); }
+      static SerialTaskQueue* enableGlobalQueue(Worker*) { return nullptr; }
     };
-    template<>
-    class CallImpl<OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamBegin>>{
+    template <>
+    class CallImpl<OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamBegin>> {
     public:
       typedef OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamBegin> Arg;
-      static bool call(Worker* iWorker,StreamID id,
-                       LuminosityBlockPrincipal const& ep, EventSetupImpl const& es,
+      static bool call(Worker* iWorker,
+                       StreamID id,
+                       LuminosityBlockPrincipal const& ep,
+                       EventSetupImpl const& es,
                        ActivityRegistry* actReg,
                        ModuleCallingContext const* mcc,
                        Arg::Context const* context) {
         ModuleSignalSentry<Arg> cpp(actReg, context, mcc);
-        return iWorker->implDoStreamBegin(id,ep,es, mcc);
+        return iWorker->implDoStreamBegin(id, ep, es, mcc);
       }
-      static bool wantsTransition(Worker const* iWorker) {
-        return iWorker->wantsStreamLuminosityBlocks();
-      }
-      static bool needToRunSelection( Worker const* iWorker) {
-        return false;
-      }
-      static SerialTaskQueue* pauseGlobalQueue(Worker* iWorker) { return nullptr;}
-      static SerialTaskQueue* enableGlobalQueue(Worker*) { return nullptr;}
-};
+      static bool wantsTransition(Worker const* iWorker) { return iWorker->wantsStreamLuminosityBlocks(); }
+      static bool needToRunSelection(Worker const* iWorker) { return false; }
+      static SerialTaskQueue* pauseGlobalQueue(Worker* iWorker) { return nullptr; }
+      static SerialTaskQueue* enableGlobalQueue(Worker*) { return nullptr; }
+    };
 
-    template<>
-    class CallImpl<OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalEnd>>{
+    template <>
+    class CallImpl<OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalEnd>> {
     public:
       typedef OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalEnd> Arg;
-      static bool call(Worker* iWorker,StreamID,
-                       LuminosityBlockPrincipal const& ep, EventSetupImpl const& es,
+      static bool call(Worker* iWorker,
+                       StreamID,
+                       LuminosityBlockPrincipal const& ep,
+                       EventSetupImpl const& es,
                        ActivityRegistry* actReg,
                        ModuleCallingContext const* mcc,
                        Arg::Context const* context) {
         ModuleSignalSentry<Arg> cpp(actReg, context, mcc);
-        return iWorker->implDoEnd(ep,es, mcc);
-      }
-      static bool wantsTransition(Worker const* iWorker) {
-        return iWorker->wantsGlobalLuminosityBlocks();
+        return iWorker->implDoEnd(ep, es, mcc);
       }
-      static bool needToRunSelection( Worker const* iWorker) {
-        return false;
-      }
-      static SerialTaskQueue* pauseGlobalQueue(Worker* iWorker) { return nullptr;}
-      static SerialTaskQueue* enableGlobalQueue(Worker* iWorker) { return iWorker->globalLuminosityBlocksQueue();}
+      static bool wantsTransition(Worker const* iWorker) { return iWorker->wantsGlobalLuminosityBlocks(); }
+      static bool needToRunSelection(Worker const* iWorker) { return false; }
+      static SerialTaskQueue* pauseGlobalQueue(Worker* iWorker) { return nullptr; }
+      static SerialTaskQueue* enableGlobalQueue(Worker* iWorker) { return iWorker->globalLuminosityBlocksQueue(); }
     };
-    template<>
-    class CallImpl<OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamEnd>>{
+    template <>
+    class CallImpl<OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamEnd>> {
     public:
       typedef OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamEnd> Arg;
-      static bool call(Worker* iWorker,StreamID id,
-                       LuminosityBlockPrincipal const& ep, EventSetupImpl const& es,
+      static bool call(Worker* iWorker,
+                       StreamID id,
+                       LuminosityBlockPrincipal const& ep,
+                       EventSetupImpl const& es,
                        ActivityRegistry* actReg,
                        ModuleCallingContext const* mcc,
                        Arg::Context const* context) {
         ModuleSignalSentry<Arg> cpp(actReg, context, mcc);
-        return iWorker->implDoStreamEnd(id,ep,es, mcc);
-      }
-      static bool wantsTransition(Worker const* iWorker) {
-        return iWorker->wantsStreamLuminosityBlocks();
-       }
-      static bool needToRunSelection( Worker const* iWorker) {
-        return false;
+        return iWorker->implDoStreamEnd(id, ep, es, mcc);
       }
-      static SerialTaskQueue* pauseGlobalQueue(Worker* iWorker) { return nullptr;}
-      static SerialTaskQueue* enableGlobalQueue(Worker*) { return nullptr;}
+      static bool wantsTransition(Worker const* iWorker) { return iWorker->wantsStreamLuminosityBlocks(); }
+      static bool needToRunSelection(Worker const* iWorker) { return false; }
+      static SerialTaskQueue* pauseGlobalQueue(Worker* iWorker) { return nullptr; }
+      static SerialTaskQueue* enableGlobalQueue(Worker*) { return nullptr; }
     };
-  }
+  }  // namespace workerhelper
 
   template <typename T>
   void Worker::doWorkAsync(WaitingTask* task,
@@ -861,33 +836,32 @@ namespace edm {
     }
 
     waitingTasks_.add(task);
-    if(T::isEvent_) {
-      timesVisited_.fetch_add(1,std::memory_order_relaxed);
+    if (T::isEvent_) {
+      timesVisited_.fetch_add(1, std::memory_order_relaxed);
     }
 
     bool expected = false;
-    if(workStarted_.compare_exchange_strong(expected,true)) {
-      moduleCallingContext_.setContext(ModuleCallingContext::State::kPrefetching,parentContext,nullptr);
+    if (workStarted_.compare_exchange_strong(expected, true)) {
+      moduleCallingContext_.setContext(ModuleCallingContext::State::kPrefetching, parentContext, nullptr);
 
       //if have TriggerResults based selection we want to reject the event before doing prefetching
-      if(workerhelper::CallImpl<T>::needToRunSelection(this)) {
+      if (workerhelper::CallImpl<T>::needToRunSelection(this)) {
         //We need to run the selection in a different task so that
         // we can prefetch the data needed for the selection
-        auto runTask = new (tbb::task::allocate_root()) RunModuleTask<T>(
-                                                                         this, ep,es,token,streamID,parentContext,context);
+        auto runTask =
+            new (tbb::task::allocate_root()) RunModuleTask<T>(this, ep, es, token, streamID, parentContext, context);
 
         //make sure the task is either run or destroyed
         struct DestroyTask {
-        DestroyTask(edm::WaitingTask* iTask):
-          m_task(iTask) {}
-          
+          DestroyTask(edm::WaitingTask* iTask) : m_task(iTask) {}
+
           ~DestroyTask() {
             auto p = m_task.load();
-            if(p) {
+            if (p) {
               tbb::task::destroy(*p);
             }
           }
-          
+
           edm::WaitingTask* release() {
             auto t = m_task.load();
             m_task.store(nullptr);
@@ -898,30 +872,28 @@ namespace edm {
         };
 
         auto ownRunTask = std::make_shared<DestroyTask>(runTask);
-        auto selectionTask = make_waiting_task(tbb::task::allocate_root(), [ownRunTask,parentContext,&ep,token, this] (std::exception_ptr const* ) mutable {
-          
-          ServiceRegistry::Operate guard(token);
-          prefetchAsync(ownRunTask->release(), token, parentContext, ep);
-        });
-        prePrefetchSelectionAsync(selectionTask,token,streamID, &ep);
+        auto selectionTask =
+            make_waiting_task(tbb::task::allocate_root(),
+                              [ownRunTask, parentContext, &ep, token, this](std::exception_ptr const*) mutable {
+                                ServiceRegistry::Operate guard(token);
+                                prefetchAsync(ownRunTask->release(), token, parentContext, ep);
+                              });
+        prePrefetchSelectionAsync(selectionTask, token, streamID, &ep);
       } else {
-        WaitingTask* moduleTask = new (tbb::task::allocate_root()) RunModuleTask<T>(
-          this, ep, es, token, streamID, parentContext, context);
+        WaitingTask* moduleTask =
+            new (tbb::task::allocate_root()) RunModuleTask<T>(this, ep, es, token, streamID, parentContext, context);
         if (T::isEvent_ && hasAcquire()) {
           WaitingTaskWithArenaHolder runTaskHolder(
-            new (tbb::task::allocate_root())
-              HandleExternalWorkExceptionTask(this,
-                                              moduleTask,
-                                              parentContext));
-          moduleTask = new (tbb::task::allocate_root()) AcquireTask<T>(
-            this, ep, es, token, parentContext, std::move(runTaskHolder));
+              new (tbb::task::allocate_root()) HandleExternalWorkExceptionTask(this, moduleTask, parentContext));
+          moduleTask = new (tbb::task::allocate_root())
+              AcquireTask<T>(this, ep, es, token, parentContext, std::move(runTaskHolder));
         }
         prefetchAsync(moduleTask, token, parentContext, ep);
       }
     }
   }
 
-  template<typename T>
+  template <typename T>
   std::exception_ptr Worker::runModuleAfterAsyncPrefetch(std::exception_ptr const* iEPtr,
                                                          typename T::MyPrincipal const& ep,
                                                          EventSetupImpl const& es,
@@ -929,20 +901,20 @@ namespace edm {
                                                          ParentContext const& parentContext,
                                                          typename T::Context const* context) {
     std::exception_ptr exceptionPtr;
-    if(iEPtr) {
+    if (iEPtr) {
       assert(*iEPtr);
       TransitionIDValue<typename T::MyPrincipal> idValue(ep);
-      if(shouldRethrowException(*iEPtr, parentContext, T::isEvent_, idValue)) {
+      if (shouldRethrowException(*iEPtr, parentContext, T::isEvent_, idValue)) {
         exceptionPtr = *iEPtr;
         setException<T::isEvent_>(exceptionPtr);
       } else {
         setPassed<T::isEvent_>();
       }
-      moduleCallingContext_.setContext(ModuleCallingContext::State::kInvalid,ParentContext(),nullptr);
+      moduleCallingContext_.setContext(ModuleCallingContext::State::kInvalid, ParentContext(), nullptr);
     } else {
       try {
-        runModule<T>(ep,es,streamID,parentContext,context);
-      } catch(...) {
+        runModule<T>(ep, es, streamID, parentContext, context);
+      } catch (...) {
         exceptionPtr = std::current_exception();
       }
     }
@@ -952,40 +924,34 @@ namespace edm {
 
   template <typename T>
   void Worker::doWorkNoPrefetchingAsync(WaitingTask* task,
-                           typename T::MyPrincipal const& principal,
-                           EventSetupImpl const& es,
-                           ServiceToken const& serviceToken,
-                           StreamID streamID,
-                           ParentContext const& parentContext,
-                           typename T::Context const* context) {
+                                        typename T::MyPrincipal const& principal,
+                                        EventSetupImpl const& es,
+                                        ServiceToken const& serviceToken,
+                                        StreamID streamID,
+                                        ParentContext const& parentContext,
+                                        typename T::Context const* context) {
     if (not workerhelper::CallImpl<T>::wantsTransition(this)) {
       return;
     }
     waitingTasks_.add(task);
     bool expected = false;
-    if(workStarted_.compare_exchange_strong(expected,true)) {
-      
-      auto toDo =[this, &principal, &es, streamID,parentContext,context, serviceToken]()
-      {
+    if (workStarted_.compare_exchange_strong(expected, true)) {
+      auto toDo = [this, &principal, &es, streamID, parentContext, context, serviceToken]() {
         std::exception_ptr exceptionPtr;
         try {
           //Need to make the services available
           ServiceRegistry::Operate guard(serviceToken);
-            
-          this->runModule<T>(principal,
-                               es,
-                               streamID,
-                               parentContext,
-                               context);
-        } catch( ... ) {
+
+          this->runModule<T>(principal, es, streamID, parentContext, context);
+        } catch (...) {
           exceptionPtr = std::current_exception();
         }
         this->waitingTasks_.doneWaiting(exceptionPtr);
       };
-      if(auto queue = this->serializeRunModule()) {
-        queue.push( toDo);
+      if (auto queue = this->serializeRunModule()) {
+        queue.push(toDo);
       } else {
-        auto task = make_functor_task( tbb::task::allocate_root(), toDo);
+        auto task = make_functor_task(tbb::task::allocate_root(), toDo);
         tbb::task::spawn(*task);
       }
     }
@@ -997,35 +963,40 @@ namespace edm {
                       StreamID streamID,
                       ParentContext const& parentContext,
                       typename T::Context const* context) {
-
     if (T::isEvent_) {
-      timesVisited_.fetch_add(1,std::memory_order_relaxed);
+      timesVisited_.fetch_add(1, std::memory_order_relaxed);
     }
     bool rc = false;
 
-    switch(state_) {
-      case Ready: break;
-      case Pass: return true;
-      case Fail: return false;
+    switch (state_) {
+      case Ready:
+        break;
+      case Pass:
+        return true;
+      case Fail:
+        return false;
       case Exception: {
         std::rethrow_exception(cached_exception_);
       }
     }
-    
+
     bool expected = false;
-    if(not workStarted_.compare_exchange_strong(expected, true) ) {
+    if (not workStarted_.compare_exchange_strong(expected, true)) {
       //another thread beat us here
       auto waitTask = edm::make_empty_waiting_task();
       waitTask->increment_ref_count();
-      
+
       waitingTasks_.add(waitTask.get());
-      
+
       waitTask->wait_for_all();
-      
-      switch(state_) {
-        case Ready: assert(false);
-        case Pass: return true;
-        case Fail: return false;
+
+      switch (state_) {
+        case Ready:
+          assert(false);
+        case Pass:
+          return true;
+        case Fail:
+          return false;
         case Exception: {
           std::rethrow_exception(cached_exception_);
         }
@@ -1033,23 +1004,23 @@ namespace edm {
     }
 
     //Need the context to be set until after any exception is resolved
-    moduleCallingContext_.setContext(ModuleCallingContext::State::kPrefetching,parentContext,nullptr);
+    moduleCallingContext_.setContext(ModuleCallingContext::State::kPrefetching, parentContext, nullptr);
 
-    auto resetContext = [](ModuleCallingContext* iContext) {iContext->setContext(ModuleCallingContext::State::kInvalid,ParentContext(),nullptr); };
-    std::unique_ptr<ModuleCallingContext, decltype(resetContext)> prefetchSentry(&moduleCallingContext_,resetContext);
+    auto resetContext = [](ModuleCallingContext* iContext) {
+      iContext->setContext(ModuleCallingContext::State::kInvalid, ParentContext(), nullptr);
+    };
+    std::unique_ptr<ModuleCallingContext, decltype(resetContext)> prefetchSentry(&moduleCallingContext_, resetContext);
 
     if (T::isEvent_) {
       //if have TriggerResults based selection we want to reject the event before doing prefetching
-      if ( workerhelper::CallImpl<T>::needToRunSelection(this)) {
+      if (workerhelper::CallImpl<T>::needToRunSelection(this)) {
         auto waitTask = edm::make_empty_waiting_task();
         waitTask->set_ref_count(2);
-        prePrefetchSelectionAsync(waitTask.get(),
-                                  ServiceRegistry::instance().presentToken(),
-                                  streamID, &ep);
+        prePrefetchSelectionAsync(waitTask.get(), ServiceRegistry::instance().presentToken(), streamID, &ep);
         waitTask->decrement_ref_count();
         waitTask->wait_for_all();
-        
-        if(state() != Ready) {
+
+        if (state() != Ready) {
           //The selection must have rejected this event
           return true;
         }
@@ -1059,21 +1030,19 @@ namespace edm {
         //Make sure signal is sent once the prefetching is done
         // [the 'pre' signal was sent in prefetchAsync]
         //The purpose of this block is to send the signal after wait_for_all
-        auto sentryFunc = [this](void*) {
-          emitPostModuleEventPrefetchingSignal();
-        };
-        std::unique_ptr<ActivityRegistry, decltype(sentryFunc)> signalSentry(actReg_.get(),sentryFunc);
-        
+        auto sentryFunc = [this](void*) { emitPostModuleEventPrefetchingSignal(); };
+        std::unique_ptr<ActivityRegistry, decltype(sentryFunc)> signalSentry(actReg_.get(), sentryFunc);
+
         //set count to 2 since wait_for_all requires value to not go to 0
         waitTask->set_ref_count(2);
-        
-        prefetchAsync(waitTask.get(),ServiceRegistry::instance().presentToken(), parentContext, ep);
+
+        prefetchAsync(waitTask.get(), ServiceRegistry::instance().presentToken(), parentContext, ep);
         waitTask->decrement_ref_count();
         waitTask->wait_for_all();
       }
-      if(waitTask->exceptionPtr() != nullptr) {
+      if (waitTask->exceptionPtr() != nullptr) {
         TransitionIDValue<typename T::MyPrincipal> idValue(ep);
-        if(shouldRethrowException(*waitTask->exceptionPtr(), parentContext, T::isEvent_, idValue)) {
+        if (shouldRethrowException(*waitTask->exceptionPtr(), parentContext, T::isEvent_, idValue)) {
           setException<T::isEvent_>(*waitTask->exceptionPtr());
           waitingTasks_.doneWaiting(cached_exception_);
           std::rethrow_exception(cached_exception_);
@@ -1084,66 +1053,64 @@ namespace edm {
         }
       }
     }
-    
+
     //successful prefetch so no reset necessary
     prefetchSentry.release();
-    if(auto queue = serializeRunModule()) {
+    if (auto queue = serializeRunModule()) {
       auto serviceToken = ServiceRegistry::instance().presentToken();
       queue.pushAndWait([&]() {
         //Need to make the services available
         ServiceRegistry::Operate guard(serviceToken);
         try {
-          rc = runModule<T>(ep,es,streamID,parentContext,context);
-        } catch(...) {
+          rc = runModule<T>(ep, es, streamID, parentContext, context);
+        } catch (...) {
         }
       });
     } else {
       try {
-        rc = runModule<T>(ep,es,streamID,parentContext,context);
-      } catch(...) {
+        rc = runModule<T>(ep, es, streamID, parentContext, context);
+      } catch (...) {
       }
     }
-    if(state_ == Exception) {
+    if (state_ == Exception) {
       waitingTasks_.doneWaiting(cached_exception_);
       std::rethrow_exception(cached_exception_);
     }
-    
+
     waitingTasks_.doneWaiting(nullptr);
     return rc;
   }
-  
-  
+
   template <typename T>
   bool Worker::runModule(typename T::MyPrincipal const& ep,
-                      EventSetupImpl const& es,
-                      StreamID streamID,
-                      ParentContext const& parentContext,
-                      typename T::Context const* context) {
+                         EventSetupImpl const& es,
+                         StreamID streamID,
+                         ParentContext const& parentContext,
+                         typename T::Context const* context) {
     //unscheduled producers should advance this
     //if (T::isEvent_) {
     //  ++timesVisited_;
     //}
     ModuleContextSentry moduleContextSentry(&moduleCallingContext_, parentContext);
     if (T::isEvent_) {
-      timesRun_.fetch_add(1,std::memory_order_relaxed);
+      timesRun_.fetch_add(1, std::memory_order_relaxed);
     }
 
     bool rc = true;
     try {
-      convertException::wrap([&]()
-      {
-        rc = workerhelper::CallImpl<T>::call(this,streamID,ep,es, actReg_.get(), &moduleCallingContext_, context);
-        
+      convertException::wrap([&]() {
+        rc = workerhelper::CallImpl<T>::call(this, streamID, ep, es, actReg_.get(), &moduleCallingContext_, context);
+
         if (rc) {
           setPassed<T::isEvent_>();
         } else {
           setFailed<T::isEvent_>();
         }
       });
-    } catch(cms::Exception& ex) {
+    } catch (cms::Exception& ex) {
       exceptionContext(ex, &moduleCallingContext_);
       TransitionIDValue<typename T::MyPrincipal> idValue(ep);
-      if(shouldRethrowException(std::current_exception(), parentContext, T::isEvent_, idValue)) {
+      if (shouldRethrowException(std::current_exception(), parentContext, T::isEvent_, idValue)) {
         assert(not cached_exception_);
         setException<T::isEvent_>(std::current_exception());
         std::rethrow_exception(cached_exception_);
@@ -1151,7 +1118,7 @@ namespace edm {
         rc = setPassed<T::isEvent_>();
       }
     }
-    
+
     return rc;
   }
 
@@ -1161,10 +1128,9 @@ namespace edm {
                                                StreamID streamID,
                                                ParentContext const& parentContext,
                                                typename T::Context const* context) {
-
-    timesVisited_.fetch_add(1,std::memory_order_relaxed);
-    std::exception_ptr const* prefetchingException = nullptr; // null because there was no prefetching to do
+    timesVisited_.fetch_add(1, std::memory_order_relaxed);
+    std::exception_ptr const* prefetchingException = nullptr;  // null because there was no prefetching to do
     return runModuleAfterAsyncPrefetch<T>(prefetchingException, ep, es, streamID, parentContext, context);
   }
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/src/WorkerInPath.cc b/FWCore/Framework/src/WorkerInPath.cc
index 27a04dcff207d..ae6d88f0a462a 100644
--- a/FWCore/Framework/src/WorkerInPath.cc
+++ b/FWCore/Framework/src/WorkerInPath.cc
@@ -3,16 +3,15 @@
 #include "FWCore/Framework/src/WorkerInPath.h"
 
 namespace edm {
-  WorkerInPath::WorkerInPath(Worker* w, FilterAction theFilterAction, unsigned int placeInPath):
-    timesVisited_(),
-    timesPassed_(),
-    timesFailed_(),
-    timesExcept_(),
-    filterAction_(theFilterAction),
-    worker_(w),
-    placeInPathContext_(placeInPath)
-  {
+  WorkerInPath::WorkerInPath(Worker* w, FilterAction theFilterAction, unsigned int placeInPath)
+      : timesVisited_(),
+        timesPassed_(),
+        timesFailed_(),
+        timesExcept_(),
+        filterAction_(theFilterAction),
+        worker_(w),
+        placeInPathContext_(placeInPath) {
     w->addedToPath();
   }
 
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/WorkerInPath.h b/FWCore/Framework/src/WorkerInPath.h
index 66a1eedaa654b..39d27da94edea 100644
--- a/FWCore/Framework/src/WorkerInPath.h
+++ b/FWCore/Framework/src/WorkerInPath.h
@@ -24,30 +24,26 @@ namespace edm {
 
   class WorkerInPath {
   public:
-    enum FilterAction { Normal=0, Ignore, Veto };
+    enum FilterAction { Normal = 0, Ignore, Veto };
 
     WorkerInPath(Worker*, FilterAction theAction, unsigned int placeInPath);
 
     template <typename T>
     void runWorkerAsync(WaitingTask* iTask,
-                        typename T::MyPrincipal const&, EventSetupImpl const&,
+                        typename T::MyPrincipal const&,
+                        EventSetupImpl const&,
                         ServiceToken const&,
                         StreamID streamID,
                         typename T::Context const* context);
 
-    
     bool checkResultsOfRunWorker(bool wasEvent);
-    
-    void skipWorker(EventPrincipal const& iPrincipal) {
-      worker_->skipOnPath();
-    }
+
+    void skipWorker(EventPrincipal const& iPrincipal) { worker_->skipOnPath(); }
     void skipWorker(RunPrincipal const&) {}
     void skipWorker(LuminosityBlockPrincipal const&) {}
-    
-    void clearCounters() {
-      timesVisited_ = timesPassed_ = timesFailed_ = timesExcept_ = 0;
-    }
-    
+
+    void clearCounters() { timesVisited_ = timesPassed_ = timesFailed_ = timesExcept_ = 0; }
+
     int timesVisited() const { return timesVisited_; }
     int timesPassed() const { return timesPassed_; }
     int timesFailed() const { return timesFailed_; }
@@ -63,65 +59,63 @@ namespace edm {
     int timesPassed_;
     int timesFailed_;
     int timesExcept_;
-    
+
     FilterAction filterAction_;
     Worker* worker_;
 
     PlaceInPathContext placeInPathContext_;
   };
-  
+
   inline bool WorkerInPath::checkResultsOfRunWorker(bool wasEvent) {
-    if(not wasEvent) {
+    if (not wasEvent) {
       return true;
     }
     auto state = worker_->state();
     bool rc = true;
     switch (state) {
-      case Worker::Fail:
-      {
+      case Worker::Fail: {
         rc = false;
         break;
       }
       case Worker::Pass:
         break;
-      case Worker::Exception:
-      {
+      case Worker::Exception: {
         ++timesExcept_;
         return true;
       }
-        
+
       default:
         assert(false);
     }
-    
-    if(Ignore == filterAction()) {
+
+    if (Ignore == filterAction()) {
       rc = true;
-    } else if(Veto == filterAction()) {
+    } else if (Veto == filterAction()) {
       rc = !rc;
     }
-    
-    if(rc) {
+
+    if (rc) {
       ++timesPassed_;
     } else {
       ++timesFailed_;
     }
     return rc;
-    
   }
 
   template <typename T>
   void WorkerInPath::runWorkerAsync(WaitingTask* iTask,
-                                    typename T::MyPrincipal const& ep, EventSetupImpl const & es,
+                                    typename T::MyPrincipal const& ep,
+                                    EventSetupImpl const& es,
                                     ServiceToken const& token,
                                     StreamID streamID,
                                     typename T::Context const* context) {
     if (T::isEvent_) {
       ++timesVisited_;
     }
-    
-    if(T::isEvent_) {
+
+    if (T::isEvent_) {
       ParentContext parentContext(&placeInPathContext_);
-      worker_->doWorkAsync<T>(iTask,ep, es, token, streamID, parentContext, context);
+      worker_->doWorkAsync<T>(iTask, ep, es, token, streamID, parentContext, context);
     } else {
       ParentContext parentContext(context);
 
@@ -130,10 +124,9 @@ namespace edm {
       // into the runs or lumis in stream transitions, so there can be
       // no data dependencies which require prefetching. Prefetching is
       // needed for global transitions, but they are run elsewhere.
-      worker_->doWorkNoPrefetchingAsync<T>(iTask,ep, es,token, streamID, parentContext, context);
+      worker_->doWorkNoPrefetchingAsync<T>(iTask, ep, es, token, streamID, parentContext, context);
     }
-  }  
-}
+  }
+}  // namespace edm
 
 #endif
-
diff --git a/FWCore/Framework/src/WorkerMaker.cc b/FWCore/Framework/src/WorkerMaker.cc
index cfe10ed036615..79324e9de58b0 100644
--- a/FWCore/Framework/src/WorkerMaker.cc
+++ b/FWCore/Framework/src/WorkerMaker.cc
@@ -11,12 +11,10 @@
 #include <sstream>
 #include <exception>
 namespace edm {
-  
-  Maker::~Maker() {
-  }
-  
-  ModuleDescription
-  Maker::createModuleDescription(MakeModuleParams const &p) const {
+
+  Maker::~Maker() {}
+
+  ModuleDescription Maker::createModuleDescription(MakeModuleParams const& p) const {
     ParameterSet const& conf = *p.pset_;
     ModuleDescription md(conf.id(),
                          conf.getParameter<std::string>("@module_type"),
@@ -25,46 +23,40 @@ namespace edm {
                          ModuleDescription::getUniqueID());
     return md;
   }
-  
-  void
-  Maker::throwValidationException(MakeModuleParams const& p,
-                                  cms::Exception & iException) const {
+
+  void Maker::throwValidationException(MakeModuleParams const& p, cms::Exception& iException) const {
     ParameterSet const& conf = *p.pset_;
     std::string moduleName = conf.getParameter<std::string>("@module_type");
     std::string moduleLabel = conf.getParameter<std::string>("@module_label");
-    
+
     std::ostringstream ost;
-    ost << "Validating configuration of module: class=" << moduleName
-    << " label='" << moduleLabel << "'";
+    ost << "Validating configuration of module: class=" << moduleName << " label='" << moduleLabel << "'";
     iException.addContext(ost.str());
     throw;
   }
-  
-  void
-  Maker::throwConfigurationException(ModuleDescription const& md,
-                                     cms::Exception & iException) const {
+
+  void Maker::throwConfigurationException(ModuleDescription const& md, cms::Exception& iException) const {
     std::ostringstream ost;
     ost << "Constructing module: class=" << md.moduleName() << " label='" << md.moduleLabel() << "'";
     iException.addContext(ost.str());
     throw;
   }
-  
-  void
-  Maker::validateEDMType(std::string const& edmType, MakeModuleParams const& p) const {
+
+  void Maker::validateEDMType(std::string const& edmType, MakeModuleParams const& p) const {
     std::string expected = p.pset_->getParameter<std::string>("@module_edm_type");
     if (edmType != expected) {
       throw Exception(errors::Configuration)
-      << "The base type in the python configuration is " << expected << ", but the base type\n"
-      << "for the module's C++ class is " << edmType << ". "
-      << "Please fix the configuration.\n"
-      << "It must use the same base type as the C++ class.\n";
+          << "The base type in the python configuration is " << expected << ", but the base type\n"
+          << "for the module's C++ class is " << edmType << ". "
+          << "Please fix the configuration.\n"
+          << "It must use the same base type as the C++ class.\n";
     }
   }
-  
-  std::shared_ptr<maker::ModuleHolder>
-  Maker::makeModule(MakeModuleParams const& p,
-                    signalslot::Signal<void(ModuleDescription const&)>& pre,
-                    signalslot::Signal<void(ModuleDescription const&)>& post) const {
+
+  std::shared_ptr<maker::ModuleHolder> Maker::makeModule(
+      MakeModuleParams const& p,
+      signalslot::Signal<void(ModuleDescription const&)>& pre,
+      signalslot::Signal<void(ModuleDescription const&)>& post) const {
     ConfigurationDescriptions descriptions(baseType(), p.pset_->getParameter<std::string>("@module_type"));
     fillDescriptions(descriptions);
     try {
@@ -72,8 +64,7 @@ namespace edm {
         descriptions.validate(*p.pset_, p.pset_->getParameter<std::string>("@module_label"));
         validateEDMType(baseType(), p);
       });
-    }
-    catch (cms::Exception & iException) {
+    } catch (cms::Exception& iException) {
       throwValidationException(p, iException);
     }
     p.pset_->registerIt();
@@ -83,8 +74,8 @@ namespace edm {
     //NOTE: a better implementation would be to change ParameterSet::registerIt
     // but that would require rebuilding much more code so will be done at
     // a later date.
-    edm::pset::Registry::instance()->insertMapped(*(p.pset_),true);
-    
+    edm::pset::Registry::instance()->insertMapped(*(p.pset_), true);
+
     ModuleDescription md = createModuleDescription(p);
     std::shared_ptr<maker::ModuleHolder> module;
     bool postCalled = false;
@@ -99,13 +90,11 @@ namespace edm {
         postCalled = true;
         post(md);
       });
-    }
-    catch(cms::Exception & iException){
-      if(!postCalled) {
+    } catch (cms::Exception& iException) {
+      if (!postCalled) {
         try {
           post(md);
-        }
-        catch (...) {
+        } catch (...) {
           // If post throws an exception ignore it because we are already handling another exception
         }
       }
@@ -113,12 +102,10 @@ namespace edm {
     }
     return module;
   }
-  
-  std::unique_ptr<Worker> 
-  Maker::makeWorker(ExceptionToActionTable const* actions,
-                    maker::ModuleHolder const* mod) const {
-    
-    return makeWorker(actions,mod->moduleDescription(),mod);
+
+  std::unique_ptr<Worker> Maker::makeWorker(ExceptionToActionTable const* actions,
+                                            maker::ModuleHolder const* mod) const {
+    return makeWorker(actions, mod->moduleDescription(), mod);
   }
-  
-} // end of edm::
+
+}  // namespace edm
diff --git a/FWCore/Framework/src/WorkerMaker.h b/FWCore/Framework/src/WorkerMaker.h
index 0efdf675705cb..6ab378994eb59 100644
--- a/FWCore/Framework/src/WorkerMaker.h
+++ b/FWCore/Framework/src/WorkerMaker.h
@@ -12,62 +12,60 @@
 
 #include "FWCore/Utilities/interface/Signal.h"
 
-
 namespace edm {
   class ConfigurationDescriptions;
   class ModuleDescription;
   class ParameterSet;
   class Maker;
   class ExceptionToActionTable;
-  
+
   class Maker {
   public:
     virtual ~Maker();
     std::shared_ptr<maker::ModuleHolder> makeModule(MakeModuleParams const&,
-                                       signalslot::Signal<void(ModuleDescription const&)>& iPre,
-                                       signalslot::Signal<void(ModuleDescription const&)>& iPost) const;
-    std::unique_ptr<Worker> makeWorker(ExceptionToActionTable const*,
-                                       maker::ModuleHolder const*) const;
-
-    std::shared_ptr<maker::ModuleHolder> makeReplacementModule(edm::ParameterSet const& p) const { return makeModule(p);}
-protected:
-      
+                                                    signalslot::Signal<void(ModuleDescription const&)>& iPre,
+                                                    signalslot::Signal<void(ModuleDescription const&)>& iPost) const;
+    std::unique_ptr<Worker> makeWorker(ExceptionToActionTable const*, maker::ModuleHolder const*) const;
+
+    std::shared_ptr<maker::ModuleHolder> makeReplacementModule(edm::ParameterSet const& p) const {
+      return makeModule(p);
+    }
+
+  protected:
     ModuleDescription createModuleDescription(MakeModuleParams const& p) const;
 
-    void throwConfigurationException(ModuleDescription const& md,
-                                     cms::Exception & iException) const;
+    void throwConfigurationException(ModuleDescription const& md, cms::Exception& iException) const;
 
-    void throwValidationException(MakeModuleParams const& p,
-				  cms::Exception & iException) const;
+    void throwValidationException(MakeModuleParams const& p, cms::Exception& iException) const;
 
     void validateEDMType(std::string const& edmType, MakeModuleParams const& p) const;
 
   private:
     virtual void fillDescriptions(ConfigurationDescriptions& iDesc) const = 0;
-    virtual std::shared_ptr<maker::ModuleHolder> makeModule(edm::ParameterSet const& p) const  = 0;
+    virtual std::shared_ptr<maker::ModuleHolder> makeModule(edm::ParameterSet const& p) const = 0;
     virtual std::unique_ptr<Worker> makeWorker(ExceptionToActionTable const* actions,
-                                             ModuleDescription const& md,
+                                               ModuleDescription const& md,
                                                maker::ModuleHolder const* mod) const = 0;
-    virtual const std::string& baseType() const =0;
+    virtual const std::string& baseType() const = 0;
   };
-  
-  
 
   template <class T>
   class WorkerMaker : public Maker {
   public:
     //typedef T worker_type;
     explicit WorkerMaker();
+
   private:
     void fillDescriptions(ConfigurationDescriptions& iDesc) const override;
-    std::unique_ptr<Worker> makeWorker(ExceptionToActionTable const* actions, ModuleDescription const& md, maker::ModuleHolder const* mod) const override;
+    std::unique_ptr<Worker> makeWorker(ExceptionToActionTable const* actions,
+                                       ModuleDescription const& md,
+                                       maker::ModuleHolder const* mod) const override;
     std::shared_ptr<maker::ModuleHolder> makeModule(edm::ParameterSet const& p) const override;
     const std::string& baseType() const override;
   };
 
   template <class T>
-  WorkerMaker<T>::WorkerMaker() {
-  }
+  WorkerMaker<T>::WorkerMaker() {}
 
   template <class T>
   void WorkerMaker<T>::fillDescriptions(ConfigurationDescriptions& iDesc) const {
@@ -75,18 +73,19 @@ namespace edm {
     T::prevalidate(iDesc);
   }
 
-  template<class T>
-  std::shared_ptr<maker::ModuleHolder> WorkerMaker<T>::makeModule(edm::ParameterSet const& p) const
-  {
+  template <class T>
+  std::shared_ptr<maker::ModuleHolder> WorkerMaker<T>::makeModule(edm::ParameterSet const& p) const {
     typedef T UserType;
     typedef typename UserType::ModuleType ModuleType;
     typedef MakeModuleHelper<ModuleType> MakerHelperType;
-    
-    return std::shared_ptr<maker::ModuleHolder>(std::make_shared<maker::ModuleHolderT<ModuleType> >(MakerHelperType::template makeModule<UserType>(p),this));
+
+    return std::shared_ptr<maker::ModuleHolder>(
+        std::make_shared<maker::ModuleHolderT<ModuleType> >(MakerHelperType::template makeModule<UserType>(p), this));
   }
-  
+
   template <class T>
-  std::unique_ptr<Worker> WorkerMaker<T>::makeWorker(ExceptionToActionTable const* actions, ModuleDescription const& md,
+  std::unique_ptr<Worker> WorkerMaker<T>::makeWorker(ExceptionToActionTable const* actions,
+                                                     ModuleDescription const& md,
                                                      maker::ModuleHolder const* mod) const {
     typedef T UserType;
     typedef typename UserType::ModuleType ModuleType;
@@ -95,13 +94,12 @@ namespace edm {
     maker::ModuleHolderT<ModuleType> const* h = dynamic_cast<maker::ModuleHolderT<ModuleType> const*>(mod);
     return std::make_unique<WorkerType>(h->module(), md, actions);
   }
-  
 
-  template<class T>
+  template <class T>
   const std::string& WorkerMaker<T>::baseType() const {
     return T::baseType();
   }
-  
-}
+
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/WorkerManager.cc b/FWCore/Framework/src/WorkerManager.cc
index c0b179b9fdc27..d880746d18bc7 100644
--- a/FWCore/Framework/src/WorkerManager.cc
+++ b/FWCore/Framework/src/WorkerManager.cc
@@ -14,32 +14,27 @@ static const std::string kProducerType("EDProducer");
 namespace edm {
   // -----------------------------
 
-  WorkerManager::WorkerManager(std::shared_ptr<ActivityRegistry> areg, ExceptionToActionTable const& actions) :
-    workerReg_(areg),
-    actionTable_(&actions),
-    allWorkers_(),
-    unscheduled_(*areg),
-    lastSetupEventPrincipal_(nullptr)
-  {
-
-  } // WorkerManager::WorkerManager
+  WorkerManager::WorkerManager(std::shared_ptr<ActivityRegistry> areg, ExceptionToActionTable const& actions)
+      : workerReg_(areg),
+        actionTable_(&actions),
+        allWorkers_(),
+        unscheduled_(*areg),
+        lastSetupEventPrincipal_(nullptr) {}  // WorkerManager::WorkerManager
 
   WorkerManager::WorkerManager(std::shared_ptr<ModuleRegistry> modReg,
                                std::shared_ptr<ActivityRegistry> areg,
-                               ExceptionToActionTable const& actions) :
-  workerReg_(areg,modReg),
-  actionTable_(&actions),
-  allWorkers_(),
-  unscheduled_(*areg),
-  lastSetupEventPrincipal_(nullptr)
-  {
-  } // WorkerManager::WorkerManager
+                               ExceptionToActionTable const& actions)
+      : workerReg_(areg, modReg),
+        actionTable_(&actions),
+        allWorkers_(),
+        unscheduled_(*areg),
+        lastSetupEventPrincipal_(nullptr) {}  // WorkerManager::WorkerManager
 
   Worker* WorkerManager::getWorker(ParameterSet& pset,
                                    ProductRegistry& preg,
                                    PreallocationConfiguration const* prealloc,
                                    std::shared_ptr<ProcessConfiguration const> processConfiguration,
-                                   std::string const & label) {
+                                   std::string const& label) {
     WorkerParams params(&pset, preg, prealloc, processConfiguration, *actionTable_);
     return workerReg_.getWorker(params, label);
   }
@@ -55,7 +50,7 @@ namespace edm {
     // 1) create worker
     // 2) if it is a WorkerT<EDProducer>, add it to our list
     auto modType = pset.getParameter<std::string>("@module_edm_type");
-    if(modType == kProducerType || modType == kFilterType) {
+    if (modType == kProducerType || modType == kFilterType) {
       Worker* newWorker = getWorker(pset, preg, prealloc, processConfiguration, label);
       assert(newWorker->moduleType() == Worker::kProducer || newWorker->moduleType() == Worker::kFilter);
       unscheduledLabels.insert(label);
@@ -68,82 +63,73 @@ namespace edm {
   }
 
   void WorkerManager::endJob() {
-    for(auto& worker : allWorkers_) {
+    for (auto& worker : allWorkers_) {
       worker->endJob();
     }
   }
 
   void WorkerManager::endJob(ExceptionCollector& collector) {
-    for(auto& worker : allWorkers_) {
+    for (auto& worker : allWorkers_) {
       try {
-        convertException::wrap([&]() {
-          worker->endJob();
-        });
-      }
-      catch (cms::Exception const& ex) {
+        convertException::wrap([&]() { worker->endJob(); });
+      } catch (cms::Exception const& ex) {
         collector.addException(ex);
       }
     }
   }
 
-
-  void WorkerManager::beginJob(ProductRegistry const& iRegistry) {
+  void WorkerManager::beginJob(ProductRegistry const& iRegistry,
+                               eventsetup::ESRecordsToProxyIndices const& iESIndices) {
     auto const runLookup = iRegistry.productLookup(InRun);
     auto const lumiLookup = iRegistry.productLookup(InLumi);
     auto const eventLookup = iRegistry.productLookup(InEvent);
-    if(!allWorkers_.empty()) {
+    if (!allWorkers_.empty()) {
       auto const& processName = allWorkers_[0]->description().processName();
       auto runModuleToIndicies = runLookup->indiciesForModulesInProcess(processName);
       auto lumiModuleToIndicies = lumiLookup->indiciesForModulesInProcess(processName);
       auto eventModuleToIndicies = eventLookup->indiciesForModulesInProcess(processName);
-      for(auto& worker : allWorkers_) {
-        worker->updateLookup(InRun,*runLookup);
-        worker->updateLookup(InLumi,*lumiLookup);
-        worker->updateLookup(InEvent,*eventLookup);
-        worker->resolvePutIndicies(InRun,runModuleToIndicies);
-        worker->resolvePutIndicies(InLumi,lumiModuleToIndicies);
-        worker->resolvePutIndicies(InEvent,eventModuleToIndicies);
+      for (auto& worker : allWorkers_) {
+        worker->updateLookup(InRun, *runLookup);
+        worker->updateLookup(InLumi, *lumiLookup);
+        worker->updateLookup(InEvent, *eventLookup);
+        worker->updateLookup(iESIndices);
+        worker->resolvePutIndicies(InRun, runModuleToIndicies);
+        worker->resolvePutIndicies(InLumi, lumiModuleToIndicies);
+        worker->resolvePutIndicies(InEvent, eventModuleToIndicies);
       }
-      
+
       for_all(allWorkers_, std::bind(&Worker::beginJob, std::placeholders::_1));
     }
   }
 
-  void
-  WorkerManager::beginStream(StreamID iID, StreamContext& streamContext) {
-    for(auto& worker: allWorkers_) {
+  void WorkerManager::beginStream(StreamID iID, StreamContext& streamContext) {
+    for (auto& worker : allWorkers_) {
       worker->beginStream(iID, streamContext);
     }
   }
 
-  void
-  WorkerManager::endStream(StreamID iID, StreamContext& streamContext) {
-    for(auto& worker: allWorkers_) {
+  void WorkerManager::endStream(StreamID iID, StreamContext& streamContext) {
+    for (auto& worker : allWorkers_) {
       worker->endStream(iID, streamContext);
     }
   }
 
-  void
-  WorkerManager::resetAll() {
-    for_all(allWorkers_, std::bind(&Worker::reset, std::placeholders::_1));
-  }
+  void WorkerManager::resetAll() { for_all(allWorkers_, std::bind(&Worker::reset, std::placeholders::_1)); }
 
-  void
-  WorkerManager::addToAllWorkers(Worker* w) {
-    if(!search_all(allWorkers_, w)) {
+  void WorkerManager::addToAllWorkers(Worker* w) {
+    if (!search_all(allWorkers_, w)) {
       allWorkers_.push_back(w);
     }
   }
 
-  void
-  WorkerManager::setupOnDemandSystem(Principal& ep, EventSetupImpl const& es) {
+  void WorkerManager::setupOnDemandSystem(Principal& ep, EventSetupImpl const& es) {
     this->resetAll();
     unscheduled_.setEventSetup(es);
-    if(&ep != lastSetupEventPrincipal_) {
-      UnscheduledConfigurator config( allWorkers_.begin(), allWorkers_.end(), &(unscheduled_.auxiliary()));
+    if (&ep != lastSetupEventPrincipal_) {
+      UnscheduledConfigurator config(allWorkers_.begin(), allWorkers_.end(), &(unscheduled_.auxiliary()));
       ep.setupUnscheduled(config);
       lastSetupEventPrincipal_ = &ep;
     }
   }
-  
-}
+
+}  // namespace edm
diff --git a/FWCore/Framework/src/WorkerParams.h b/FWCore/Framework/src/WorkerParams.h
index fa8fd6c688629..bfdbefa1eff62 100644
--- a/FWCore/Framework/src/WorkerParams.h
+++ b/FWCore/Framework/src/WorkerParams.h
@@ -20,20 +20,18 @@ namespace edm {
   class PreallocationConfiguration;
 
   struct WorkerParams {
-    WorkerParams() :
-      pset_(nullptr), reg_(nullptr), preallocate_(nullptr),processConfiguration_(), actions_(nullptr)
-      {}
+    WorkerParams() : pset_(nullptr), reg_(nullptr), preallocate_(nullptr), processConfiguration_(), actions_(nullptr) {}
 
     WorkerParams(ParameterSet* pset,
                  ProductRegistry& reg,
                  PreallocationConfiguration const* prealloc,
                  std::shared_ptr<ProcessConfiguration const> processConfiguration,
-                 ExceptionToActionTable const& actions) :
-      pset_(pset),
-      reg_(&reg),
-      preallocate_(prealloc),
-      processConfiguration_(processConfiguration),
-      actions_(&actions) {}
+                 ExceptionToActionTable const& actions)
+        : pset_(pset),
+          reg_(&reg),
+          preallocate_(prealloc),
+          processConfiguration_(processConfiguration),
+          actions_(&actions) {}
 
     ParameterSet* pset_;
     ProductRegistry* reg_;
@@ -41,6 +39,6 @@ namespace edm {
     std::shared_ptr<ProcessConfiguration const> processConfiguration_;
     ExceptionToActionTable const* actions_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/WorkerRegistry.cc b/FWCore/Framework/src/WorkerRegistry.cc
index 5f053b6848a52..285e149c238f5 100644
--- a/FWCore/Framework/src/WorkerRegistry.cc
+++ b/FWCore/Framework/src/WorkerRegistry.cc
@@ -14,47 +14,34 @@
 #include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"
 
 namespace edm {
-  
-  WorkerRegistry::WorkerRegistry(std::shared_ptr<ActivityRegistry> areg) :
-    modRegistry_(new ModuleRegistry),
-    m_workerMap(),
-    actReg_(areg)
-  {
-  }
-  
-  WorkerRegistry::WorkerRegistry(std::shared_ptr<ActivityRegistry> areg,
-                                 std::shared_ptr<ModuleRegistry> modReg):
-  modRegistry_(modReg),
-  m_workerMap(),
-  actReg_(areg)
-  {
-  }
 
-  WorkerRegistry:: ~WorkerRegistry() {
-  }
+  WorkerRegistry::WorkerRegistry(std::shared_ptr<ActivityRegistry> areg)
+      : modRegistry_(new ModuleRegistry), m_workerMap(), actReg_(areg) {}
 
-  void WorkerRegistry::clear() {
-    m_workerMap.clear();
-  }
+  WorkerRegistry::WorkerRegistry(std::shared_ptr<ActivityRegistry> areg, std::shared_ptr<ModuleRegistry> modReg)
+      : modRegistry_(modReg), m_workerMap(), actReg_(areg) {}
 
-  Worker* WorkerRegistry::getWorker(WorkerParams const& p, std::string const& moduleLabel) {
+  WorkerRegistry::~WorkerRegistry() {}
 
+  void WorkerRegistry::clear() { m_workerMap.clear(); }
+
+  Worker* WorkerRegistry::getWorker(WorkerParams const& p, std::string const& moduleLabel) {
     WorkerMap::iterator workerIt = m_workerMap.find(moduleLabel);
-  
+
     // if the worker is not there, make it
-    if (workerIt == m_workerMap.end()){
-      MakeModuleParams mmp(p.pset_,*p.reg_,p.preallocate_,p.processConfiguration_);
-      auto modulePtr = modRegistry_->getModule(mmp,moduleLabel,
-                                               actReg_->preModuleConstructionSignal_,
-                                               actReg_->postModuleConstructionSignal_);
-      auto workerPtr= modulePtr->makeWorker(p.actions_);
-    
+    if (workerIt == m_workerMap.end()) {
+      MakeModuleParams mmp(p.pset_, *p.reg_, p.preallocate_, p.processConfiguration_);
+      auto modulePtr = modRegistry_->getModule(
+          mmp, moduleLabel, actReg_->preModuleConstructionSignal_, actReg_->postModuleConstructionSignal_);
+      auto workerPtr = modulePtr->makeWorker(p.actions_);
+
       workerPtr->setActivityRegistry(actReg_);
 
       // Transfer ownership of worker to the registry
-      m_workerMap[moduleLabel] = std::shared_ptr<Worker>(workerPtr.release()); // propagate_const<T> has no reset() function
-      return m_workerMap[moduleLabel].get(); 
-    } 
+      m_workerMap[moduleLabel] =
+          std::shared_ptr<Worker>(workerPtr.release());  // propagate_const<T> has no reset() function
+      return m_workerMap[moduleLabel].get();
+    }
     return (workerIt->second.get());
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/WorkerRegistry.h b/FWCore/Framework/src/WorkerRegistry.h
index de50ad05bb5e6..94ede53871a85 100644
--- a/FWCore/Framework/src/WorkerRegistry.h
+++ b/FWCore/Framework/src/WorkerRegistry.h
@@ -36,17 +36,14 @@ namespace edm {
   */
 
   class WorkerRegistry {
-
   public:
-
     explicit WorkerRegistry(std::shared_ptr<ActivityRegistry> areg);
-    WorkerRegistry(std::shared_ptr<ActivityRegistry> areg,
-                   std::shared_ptr<ModuleRegistry> iModReg);
+    WorkerRegistry(std::shared_ptr<ActivityRegistry> areg, std::shared_ptr<ModuleRegistry> iModReg);
     ~WorkerRegistry();
 
     WorkerRegistry(WorkerRegistry&&) = default;
-    WorkerRegistry(WorkerRegistry const&) = delete; // Disallow copying and moving
-    WorkerRegistry& operator=(WorkerRegistry const&) = delete; // Disallow copying and moving
+    WorkerRegistry(WorkerRegistry const&) = delete;             // Disallow copying and moving
+    WorkerRegistry& operator=(WorkerRegistry const&) = delete;  // Disallow copying and moving
 
     /// Retrieve the particular instance of the worker
     /** If the worker with that set of parameters does not exist,
@@ -54,21 +51,19 @@ namespace edm {
         @note Workers are owned by this class, do not delete them*/
     Worker* getWorker(WorkerParams const& p, std::string const& moduleLabel);
     void clear();
-    
+
   private:
     /// the container of workers
     typedef std::map<std::string, edm::propagate_const<std::shared_ptr<Worker>>> WorkerMap;
 
     edm::propagate_const<std::shared_ptr<ModuleRegistry>> modRegistry_;
-    
+
     /// internal map of registered workers (owned).
     WorkerMap m_workerMap;
-    std::shared_ptr<ActivityRegistry> actReg_; // We do not use propagate_const because the registry itself is mutable.
-     
-  }; // WorkerRegistry
-
+    std::shared_ptr<ActivityRegistry> actReg_;  // We do not use propagate_const because the registry itself is mutable.
 
-} // edm
+  };  // WorkerRegistry
 
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/WorkerT.cc b/FWCore/Framework/src/WorkerT.cc
index 0b55f27208fc7..4bcd613b3e651 100644
--- a/FWCore/Framework/src/WorkerT.cc
+++ b/FWCore/Framework/src/WorkerT.cc
@@ -25,631 +25,636 @@
 
 #include <type_traits>
 
-namespace edm{
+namespace edm {
   namespace workerimpl {
-    template<typename T>
+    template <typename T>
     struct has_stream_functions {
       static bool constexpr value = false;
     };
 
-    template<>
+    template <>
     struct has_stream_functions<edm::global::EDProducerBase> {
       static bool constexpr value = true;
     };
 
-    template<>
+    template <>
     struct has_stream_functions<edm::global::EDFilterBase> {
       static bool constexpr value = true;
     };
 
-    template<>
+    template <>
     struct has_stream_functions<edm::global::EDAnalyzerBase> {
       static bool constexpr value = true;
     };
 
-    template<>
+    template <>
     struct has_stream_functions<edm::limited::EDProducerBase> {
       static bool constexpr value = true;
     };
-    
-    template<>
+
+    template <>
     struct has_stream_functions<edm::limited::EDFilterBase> {
       static bool constexpr value = true;
     };
-    
-    template<>
+
+    template <>
     struct has_stream_functions<edm::limited::EDAnalyzerBase> {
       static bool constexpr value = true;
     };
 
-    template<>
+    template <>
     struct has_stream_functions<edm::stream::EDProducerAdaptorBase> {
       static bool constexpr value = true;
     };
 
-    template<>
+    template <>
     struct has_stream_functions<edm::stream::EDFilterAdaptorBase> {
       static bool constexpr value = true;
     };
 
-    template<>
+    template <>
     struct has_stream_functions<edm::stream::EDAnalyzerAdaptorBase> {
       static bool constexpr value = true;
     };
 
     struct DoNothing {
-      template< typename... T>
+      template <typename... T>
       inline void operator()(const T&...) {}
     };
 
-    template<typename T>
+    template <typename T>
     struct DoBeginStream {
-      inline void operator()(WorkerT<T>* iWorker, StreamID id) {
-        iWorker->callWorkerBeginStream(0,id);
-      }
+      inline void operator()(WorkerT<T>* iWorker, StreamID id) { iWorker->callWorkerBeginStream(0, id); }
     };
 
-    template<typename T>
+    template <typename T>
     struct DoEndStream {
-      inline void operator()(WorkerT<T>* iWorker, StreamID id) {
-        iWorker->callWorkerEndStream(0,id);
-      }
+      inline void operator()(WorkerT<T>* iWorker, StreamID id) { iWorker->callWorkerEndStream(0, id); }
     };
 
-    template<typename T, typename P>
+    template <typename T, typename P>
     struct DoStreamBeginTrans {
-      inline void operator() (WorkerT<T>* iWorker, StreamID id, P const& rp,
-                              EventSetupImpl const& c,
-                              ModuleCallingContext const* mcc) {
-        iWorker->callWorkerStreamBegin(0,id,rp,c, mcc);
+      inline void operator()(
+          WorkerT<T>* iWorker, StreamID id, P const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc) {
+        iWorker->callWorkerStreamBegin(0, id, rp, c, mcc);
       }
     };
 
-    template<typename T, typename P>
+    template <typename T, typename P>
     struct DoStreamEndTrans {
-      inline void operator() (WorkerT<T>* iWorker, StreamID id, P const& rp,
-                              EventSetupImpl const& c,
-                              ModuleCallingContext const* mcc) {
-        iWorker->callWorkerStreamEnd(0,id,rp,c, mcc);
+      inline void operator()(
+          WorkerT<T>* iWorker, StreamID id, P const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc) {
+        iWorker->callWorkerStreamEnd(0, id, rp, c, mcc);
       }
     };
-  }
+  }  // namespace workerimpl
 
-  template<typename T>
-  inline
-  WorkerT<T>::WorkerT(std::shared_ptr<T> ed, ModuleDescription const& md, ExceptionToActionTable const* actions) :
-    Worker(md, actions),
-    module_(ed) {
+  template <typename T>
+  inline WorkerT<T>::WorkerT(std::shared_ptr<T> ed, ModuleDescription const& md, ExceptionToActionTable const* actions)
+      : Worker(md, actions), module_(ed) {
     assert(module_ != nullptr);
   }
 
-  template<typename T>
-  WorkerT<T>::~WorkerT() {
-  }
+  template <typename T>
+  WorkerT<T>::~WorkerT() {}
 
-  
-  template<typename T>
+  template <typename T>
   bool WorkerT<T>::wantsGlobalRuns() const {
     return module_->wantsGlobalRuns();
   }
-  
-  template<typename T>
+
+  template <typename T>
   bool WorkerT<T>::wantsGlobalLuminosityBlocks() const {
     return module_->wantsGlobalLuminosityBlocks();
   }
 
-  template<typename T>
+  template <typename T>
   bool WorkerT<T>::wantsStreamRuns() const {
     return module_->wantsStreamRuns();
   }
-  
-  template<typename T>
+
+  template <typename T>
   bool WorkerT<T>::wantsStreamLuminosityBlocks() const {
     return module_->wantsStreamLuminosityBlocks();
   }
 
-  template<typename T>
+  template <typename T>
   SerialTaskQueue* WorkerT<T>::globalRunsQueue() {
     return nullptr;
   }
-  template<typename T>
+  template <typename T>
   SerialTaskQueue* WorkerT<T>::globalLuminosityBlocksQueue() {
     return nullptr;
   }
-  template<>
+  template <>
   SerialTaskQueue* WorkerT<EDProducer>::globalRunsQueue() {
     return module_->globalRunsQueue();
   }
-  template<>
+  template <>
   SerialTaskQueue* WorkerT<EDProducer>::globalLuminosityBlocksQueue() {
     return module_->globalLuminosityBlocksQueue();
   }
-  template<>
+  template <>
   SerialTaskQueue* WorkerT<EDFilter>::globalRunsQueue() {
     return module_->globalRunsQueue();
   }
-  template<>
+  template <>
   SerialTaskQueue* WorkerT<EDFilter>::globalLuminosityBlocksQueue() {
     return module_->globalLuminosityBlocksQueue();
   }
-  template<>
+  template <>
   SerialTaskQueue* WorkerT<EDAnalyzer>::globalRunsQueue() {
     return module_->globalRunsQueue();
   }
-  template<>
+  template <>
   SerialTaskQueue* WorkerT<EDAnalyzer>::globalLuminosityBlocksQueue() {
     return module_->globalLuminosityBlocksQueue();
   }
-  template<>
+  template <>
   SerialTaskQueue* WorkerT<OutputModule>::globalRunsQueue() {
     return module_->globalRunsQueue();
   }
-  template<>
+  template <>
   SerialTaskQueue* WorkerT<OutputModule>::globalLuminosityBlocksQueue() {
     return module_->globalLuminosityBlocksQueue();
   }
   //one
-  template<>
+  template <>
   SerialTaskQueue* WorkerT<one::EDProducerBase>::globalRunsQueue() {
     return module_->globalRunsQueue();
   }
-  template<>
+  template <>
   SerialTaskQueue* WorkerT<one::EDProducerBase>::globalLuminosityBlocksQueue() {
     return module_->globalLuminosityBlocksQueue();
   }
-  template<>
+  template <>
   SerialTaskQueue* WorkerT<one::EDFilterBase>::globalRunsQueue() {
     return module_->globalRunsQueue();
   }
-  template<>
+  template <>
   SerialTaskQueue* WorkerT<one::EDFilterBase>::globalLuminosityBlocksQueue() {
     return module_->globalLuminosityBlocksQueue();
   }
-  template<>
+  template <>
   SerialTaskQueue* WorkerT<one::EDAnalyzerBase>::globalRunsQueue() {
     return module_->globalRunsQueue();
   }
-  template<>
+  template <>
   SerialTaskQueue* WorkerT<one::EDAnalyzerBase>::globalLuminosityBlocksQueue() {
     return module_->globalLuminosityBlocksQueue();
   }
-  template<>
+  template <>
   SerialTaskQueue* WorkerT<one::OutputModuleBase>::globalRunsQueue() {
     return module_->globalRunsQueue();
   }
-  template<>
+  template <>
   SerialTaskQueue* WorkerT<one::OutputModuleBase>::globalLuminosityBlocksQueue() {
     return module_->globalLuminosityBlocksQueue();
   }
 
-  
-  template<typename T>
-  inline
-  bool
-  WorkerT<T>::implDo(EventPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const* mcc) {
-    std::shared_ptr<Worker> sentry(this,[&ep](Worker* obj) {obj->postDoEvent(ep);});
+  template <typename T>
+  inline bool WorkerT<T>::implDo(EventPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const* mcc) {
+    std::shared_ptr<Worker> sentry(this, [&ep](Worker* obj) { obj->postDoEvent(ep); });
     return module_->doEvent(ep, c, activityRegistry(), mcc);
   }
 
-  template<typename T>
-  inline
-  void
-  WorkerT<T>::implDoAcquire(EventPrincipal const&, EventSetupImpl const&,
-                            ModuleCallingContext const*,
-                            WaitingTaskWithArenaHolder&) {
-  }
+  template <typename T>
+  inline void WorkerT<T>::implDoAcquire(EventPrincipal const&,
+                                        EventSetupImpl const&,
+                                        ModuleCallingContext const*,
+                                        WaitingTaskWithArenaHolder&) {}
 
-  template<>
-  inline
-  void
-  WorkerT<global::EDProducerBase>::implDoAcquire(EventPrincipal const& ep, EventSetupImpl const& c,
-                                                 ModuleCallingContext const* mcc,
-                                                 WaitingTaskWithArenaHolder& holder) {
+  template <>
+  inline void WorkerT<global::EDProducerBase>::implDoAcquire(EventPrincipal const& ep,
+                                                             EventSetupImpl const& c,
+                                                             ModuleCallingContext const* mcc,
+                                                             WaitingTaskWithArenaHolder& holder) {
     module_->doAcquire(ep, c, activityRegistry(), mcc, holder);
   }
 
-  template<>
-  inline
-  void
-  WorkerT<global::EDFilterBase>::implDoAcquire(EventPrincipal const& ep, EventSetupImpl const& c,
-                                               ModuleCallingContext const* mcc,
-                                               WaitingTaskWithArenaHolder& holder) {
+  template <>
+  inline void WorkerT<global::EDFilterBase>::implDoAcquire(EventPrincipal const& ep,
+                                                           EventSetupImpl const& c,
+                                                           ModuleCallingContext const* mcc,
+                                                           WaitingTaskWithArenaHolder& holder) {
     module_->doAcquire(ep, c, activityRegistry(), mcc, holder);
   }
 
-  template<>
-  inline
-  void
-  WorkerT<stream::EDProducerAdaptorBase>::implDoAcquire(EventPrincipal const& ep, EventSetupImpl const& c,
-                                                        ModuleCallingContext const* mcc,
-                                                        WaitingTaskWithArenaHolder& holder) {
+  template <>
+  inline void WorkerT<stream::EDProducerAdaptorBase>::implDoAcquire(EventPrincipal const& ep,
+                                                                    EventSetupImpl const& c,
+                                                                    ModuleCallingContext const* mcc,
+                                                                    WaitingTaskWithArenaHolder& holder) {
     module_->doAcquire(ep, c, activityRegistry(), mcc, holder);
   }
 
-  template<>
-  inline
-  void
-  WorkerT<stream::EDFilterAdaptorBase>::implDoAcquire(EventPrincipal const& ep, EventSetupImpl const& c,
-                                                      ModuleCallingContext const* mcc,
-                                                      WaitingTaskWithArenaHolder& holder) {
+  template <>
+  inline void WorkerT<stream::EDFilterAdaptorBase>::implDoAcquire(EventPrincipal const& ep,
+                                                                  EventSetupImpl const& c,
+                                                                  ModuleCallingContext const* mcc,
+                                                                  WaitingTaskWithArenaHolder& holder) {
     module_->doAcquire(ep, c, activityRegistry(), mcc, holder);
   }
 
-  template<typename T>
-  inline
-  bool
-  WorkerT<T>::implNeedToRunSelection() const { return false;}
+  template <typename T>
+  inline bool WorkerT<T>::implNeedToRunSelection() const {
+    return false;
+  }
 
-  template<typename T>
-  inline
-  bool
-  WorkerT<T>::implDoPrePrefetchSelection(StreamID id,
-                                         EventPrincipal const& ep,
-                                         ModuleCallingContext const* mcc) {
+  template <typename T>
+  inline bool WorkerT<T>::implDoPrePrefetchSelection(StreamID id,
+                                                     EventPrincipal const& ep,
+                                                     ModuleCallingContext const* mcc) {
     return true;
   }
-  template<typename T>
-  inline
-  void
-  WorkerT<T>::itemsToGetForSelection(std::vector<ProductResolverIndexAndSkipBit>&) const {}
-
-
-  template<>
-  inline
-  bool
-  WorkerT<OutputModule>::implNeedToRunSelection() const { return true;}
-  template<>
-  inline
-  bool
-  WorkerT<OutputModule>::implDoPrePrefetchSelection(StreamID id,
-                                                    EventPrincipal const& ep,
-                                                    ModuleCallingContext const* mcc) {
-    return module_->prePrefetchSelection(id,ep,mcc);
-  }
-  template<>
-  inline
-  void
-  WorkerT<OutputModule>::itemsToGetForSelection(std::vector<ProductResolverIndexAndSkipBit>& iItems) const {
+  template <typename T>
+  inline void WorkerT<T>::itemsToGetForSelection(std::vector<ProductResolverIndexAndSkipBit>&) const {}
+
+  template <>
+  inline bool WorkerT<OutputModule>::implNeedToRunSelection() const {
+    return true;
+  }
+  template <>
+  inline bool WorkerT<OutputModule>::implDoPrePrefetchSelection(StreamID id,
+                                                                EventPrincipal const& ep,
+                                                                ModuleCallingContext const* mcc) {
+    return module_->prePrefetchSelection(id, ep, mcc);
+  }
+  template <>
+  inline void WorkerT<OutputModule>::itemsToGetForSelection(std::vector<ProductResolverIndexAndSkipBit>& iItems) const {
     iItems = module_->productsUsedBySelection();
   }
 
-  template<>
-  inline
-  bool
-  WorkerT<edm::one::OutputModuleBase>::implNeedToRunSelection() const { return true;}
+  template <>
+  inline bool WorkerT<edm::one::OutputModuleBase>::implNeedToRunSelection() const {
+    return true;
+  }
 
-  template<>
-  inline
-  bool
-  WorkerT<edm::one::OutputModuleBase>::implDoPrePrefetchSelection(StreamID id,
-                                                                  EventPrincipal const& ep,
-                                                                  ModuleCallingContext const* mcc) {
-    return module_->prePrefetchSelection(id,ep,mcc);
+  template <>
+  inline bool WorkerT<edm::one::OutputModuleBase>::implDoPrePrefetchSelection(StreamID id,
+                                                                              EventPrincipal const& ep,
+                                                                              ModuleCallingContext const* mcc) {
+    return module_->prePrefetchSelection(id, ep, mcc);
   }
-  template<>
-  inline
-  void
-  WorkerT<edm::one::OutputModuleBase>::itemsToGetForSelection(std::vector<ProductResolverIndexAndSkipBit>& iItems) const {
+  template <>
+  inline void WorkerT<edm::one::OutputModuleBase>::itemsToGetForSelection(
+      std::vector<ProductResolverIndexAndSkipBit>& iItems) const {
     iItems = module_->productsUsedBySelection();
   }
 
-  template<>
-  inline
-  bool
-  WorkerT<edm::global::OutputModuleBase>::implNeedToRunSelection() const { return true;}
-  template<>
-  inline
-  bool
-  WorkerT<edm::global::OutputModuleBase>::implDoPrePrefetchSelection(StreamID id,
-                                                                     EventPrincipal const& ep,
-                                                                     ModuleCallingContext const* mcc) {
-    return module_->prePrefetchSelection(id,ep,mcc);
-  }
-  template<>
-  inline
-  void
-  WorkerT<edm::global::OutputModuleBase>::itemsToGetForSelection(std::vector<ProductResolverIndexAndSkipBit>& iItems) const {
+  template <>
+  inline bool WorkerT<edm::global::OutputModuleBase>::implNeedToRunSelection() const {
+    return true;
+  }
+  template <>
+  inline bool WorkerT<edm::global::OutputModuleBase>::implDoPrePrefetchSelection(StreamID id,
+                                                                                 EventPrincipal const& ep,
+                                                                                 ModuleCallingContext const* mcc) {
+    return module_->prePrefetchSelection(id, ep, mcc);
+  }
+  template <>
+  inline void WorkerT<edm::global::OutputModuleBase>::itemsToGetForSelection(
+      std::vector<ProductResolverIndexAndSkipBit>& iItems) const {
     iItems = module_->productsUsedBySelection();
   }
 
-  template<>
-  inline
-  bool
-  WorkerT<edm::limited::OutputModuleBase>::implNeedToRunSelection() const { return true;}
-  template<>
-  inline
-  bool
-  WorkerT<edm::limited::OutputModuleBase>::implDoPrePrefetchSelection(StreamID id,
-                                                                     EventPrincipal const& ep,
-                                                                     ModuleCallingContext const* mcc) {
-    return module_->prePrefetchSelection(id,ep,mcc);
-  }
-  template<>
-  inline
-  void
-  WorkerT<edm::limited::OutputModuleBase>::itemsToGetForSelection(std::vector<ProductResolverIndexAndSkipBit>& iItems) const {
+  template <>
+  inline bool WorkerT<edm::limited::OutputModuleBase>::implNeedToRunSelection() const {
+    return true;
+  }
+  template <>
+  inline bool WorkerT<edm::limited::OutputModuleBase>::implDoPrePrefetchSelection(StreamID id,
+                                                                                  EventPrincipal const& ep,
+                                                                                  ModuleCallingContext const* mcc) {
+    return module_->prePrefetchSelection(id, ep, mcc);
+  }
+  template <>
+  inline void WorkerT<edm::limited::OutputModuleBase>::itemsToGetForSelection(
+      std::vector<ProductResolverIndexAndSkipBit>& iItems) const {
     iItems = module_->productsUsedBySelection();
   }
 
-  template<typename T>
-  inline
-  bool
-  WorkerT<T>::implDoBegin(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc) {
+  template <typename T>
+  inline bool WorkerT<T>::implDoBegin(RunPrincipal const& rp,
+                                      EventSetupImpl const& c,
+                                      ModuleCallingContext const* mcc) {
     module_->doBeginRun(rp, c, mcc);
     return true;
   }
 
-  template<typename T>
-  template<typename D>
-  void
-  WorkerT<T>::callWorkerStreamBegin(D, StreamID id, RunPrincipal const& rp,
-                                    EventSetupImpl const& c,
-                                    ModuleCallingContext const* mcc) {
+  template <typename T>
+  template <typename D>
+  void WorkerT<T>::callWorkerStreamBegin(
+      D, StreamID id, RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc) {
     module_->doStreamBeginRun(id, rp, c, mcc);
   }
 
-  template<typename T>
-  template<typename D>
-  void
-  WorkerT<T>::callWorkerStreamEnd(D, StreamID id, RunPrincipal const& rp,
-                                  EventSetupImpl const& c,
-                                  ModuleCallingContext const* mcc) {
+  template <typename T>
+  template <typename D>
+  void WorkerT<T>::callWorkerStreamEnd(
+      D, StreamID id, RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc) {
     module_->doStreamEndRun(id, rp, c, mcc);
   }
 
-
-  template<typename T>
-  inline
-  bool
-  WorkerT<T>::implDoStreamBegin(StreamID id, RunPrincipal const& rp, EventSetupImpl const& c,
-                                ModuleCallingContext const* mcc) {
+  template <typename T>
+  inline bool WorkerT<T>::implDoStreamBegin(StreamID id,
+                                            RunPrincipal const& rp,
+                                            EventSetupImpl const& c,
+                                            ModuleCallingContext const* mcc) {
     std::conditional_t<workerimpl::has_stream_functions<T>::value,
-                       workerimpl::DoStreamBeginTrans<T,RunPrincipal const>,
-                       workerimpl::DoNothing> might_call;
-    might_call(this,id,rp,c, mcc);
+                       workerimpl::DoStreamBeginTrans<T, RunPrincipal const>,
+                       workerimpl::DoNothing>
+        might_call;
+    might_call(this, id, rp, c, mcc);
     return true;
   }
 
-  template<typename T>
-  inline
-  bool
-  WorkerT<T>::implDoStreamEnd(StreamID id, RunPrincipal const& rp, EventSetupImpl const& c,
-                              ModuleCallingContext const* mcc) {
+  template <typename T>
+  inline bool WorkerT<T>::implDoStreamEnd(StreamID id,
+                                          RunPrincipal const& rp,
+                                          EventSetupImpl const& c,
+                                          ModuleCallingContext const* mcc) {
     std::conditional_t<workerimpl::has_stream_functions<T>::value,
-                       workerimpl::DoStreamEndTrans<T,RunPrincipal const>,
-                       workerimpl::DoNothing> might_call;
-    might_call(this,id,rp,c, mcc);
+                       workerimpl::DoStreamEndTrans<T, RunPrincipal const>,
+                       workerimpl::DoNothing>
+        might_call;
+    might_call(this, id, rp, c, mcc);
     return true;
   }
 
-  template<typename T>
-  inline
-  bool
-  WorkerT<T>::implDoEnd(RunPrincipal const& rp, EventSetupImpl const& c,
-                        ModuleCallingContext const* mcc) {
+  template <typename T>
+  inline bool WorkerT<T>::implDoEnd(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc) {
     module_->doEndRun(rp, c, mcc);
     return true;
   }
 
-  template<typename T>
-  inline
-  bool
-  WorkerT<T>::implDoBegin(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& c,
-                          ModuleCallingContext const* mcc) {
+  template <typename T>
+  inline bool WorkerT<T>::implDoBegin(LuminosityBlockPrincipal const& lbp,
+                                      EventSetupImpl const& c,
+                                      ModuleCallingContext const* mcc) {
     module_->doBeginLuminosityBlock(lbp, c, mcc);
     return true;
   }
 
-  template<typename T>
-  template<typename D>
-  void
-  WorkerT<T>::callWorkerStreamBegin(D, StreamID id, LuminosityBlockPrincipal const& rp,
-                                    EventSetupImpl const& c,
-                                    ModuleCallingContext const* mcc) {
+  template <typename T>
+  template <typename D>
+  void WorkerT<T>::callWorkerStreamBegin(
+      D, StreamID id, LuminosityBlockPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc) {
     module_->doStreamBeginLuminosityBlock(id, rp, c, mcc);
   }
 
-  template<typename T>
-  template<typename D>
-  void
-  WorkerT<T>::callWorkerStreamEnd(D, StreamID id, LuminosityBlockPrincipal const& rp,
-                                  EventSetupImpl const& c,
-                                  ModuleCallingContext const* mcc) {
+  template <typename T>
+  template <typename D>
+  void WorkerT<T>::callWorkerStreamEnd(
+      D, StreamID id, LuminosityBlockPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc) {
     module_->doStreamEndLuminosityBlock(id, rp, c, mcc);
   }
 
-
-  template<typename T>
-  inline
-  bool
-  WorkerT<T>::implDoStreamBegin(StreamID id, LuminosityBlockPrincipal const& lbp, EventSetupImpl const& c,
-                                ModuleCallingContext const* mcc) {
+  template <typename T>
+  inline bool WorkerT<T>::implDoStreamBegin(StreamID id,
+                                            LuminosityBlockPrincipal const& lbp,
+                                            EventSetupImpl const& c,
+                                            ModuleCallingContext const* mcc) {
     std::conditional_t<workerimpl::has_stream_functions<T>::value,
-                       workerimpl::DoStreamBeginTrans<T,LuminosityBlockPrincipal>,
-                       workerimpl::DoNothing> might_call;
-    might_call(this,id,lbp,c, mcc);
+                       workerimpl::DoStreamBeginTrans<T, LuminosityBlockPrincipal>,
+                       workerimpl::DoNothing>
+        might_call;
+    might_call(this, id, lbp, c, mcc);
     return true;
   }
 
-  template<typename T>
-  inline
-  bool
-  WorkerT<T>::implDoStreamEnd(StreamID id, LuminosityBlockPrincipal const& lbp, EventSetupImpl const& c,
-                              ModuleCallingContext const* mcc) {
+  template <typename T>
+  inline bool WorkerT<T>::implDoStreamEnd(StreamID id,
+                                          LuminosityBlockPrincipal const& lbp,
+                                          EventSetupImpl const& c,
+                                          ModuleCallingContext const* mcc) {
     std::conditional_t<workerimpl::has_stream_functions<T>::value,
-                       workerimpl::DoStreamEndTrans<T,LuminosityBlockPrincipal>,
-                       workerimpl::DoNothing> might_call;
-    might_call(this,id,lbp,c,mcc);
+                       workerimpl::DoStreamEndTrans<T, LuminosityBlockPrincipal>,
+                       workerimpl::DoNothing>
+        might_call;
+    might_call(this, id, lbp, c, mcc);
 
     return true;
   }
 
-  template<typename T>
-  inline
-  bool
-  WorkerT<T>::implDoEnd(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& c,
-                        ModuleCallingContext const* mcc) {
+  template <typename T>
+  inline bool WorkerT<T>::implDoEnd(LuminosityBlockPrincipal const& lbp,
+                                    EventSetupImpl const& c,
+                                    ModuleCallingContext const* mcc) {
     module_->doEndLuminosityBlock(lbp, c, mcc);
     return true;
   }
 
-  template<typename T>
-  inline
-  std::string
-  WorkerT<T>::workerType() const {
+  template <typename T>
+  inline std::string WorkerT<T>::workerType() const {
     return module_->workerType();
   }
 
-  template<typename T>
-  inline
-  void
-  WorkerT<T>::implBeginJob() {
+  template <typename T>
+  inline void WorkerT<T>::implBeginJob() {
     module_->doBeginJob();
   }
 
-  template<typename T>
-  inline
-  void
-  WorkerT<T>::implEndJob() {
+  template <typename T>
+  inline void WorkerT<T>::implEndJob() {
     module_->doEndJob();
   }
 
-  template<typename T>
-  template<typename D>
+  template <typename T>
+  template <typename D>
   void WorkerT<T>::callWorkerBeginStream(D, StreamID id) {
     module_->doBeginStream(id);
   }
 
-  template<typename T>
-  inline
-  void
-  WorkerT<T>::implBeginStream(StreamID id) {
-    std::conditional_t<workerimpl::has_stream_functions<T>::value,
-                       workerimpl::DoBeginStream<T>,
-                       workerimpl::DoNothing> might_call;
-    might_call(this,id);
+  template <typename T>
+  inline void WorkerT<T>::implBeginStream(StreamID id) {
+    std::conditional_t<workerimpl::has_stream_functions<T>::value, workerimpl::DoBeginStream<T>, workerimpl::DoNothing>
+        might_call;
+    might_call(this, id);
   }
 
-  template<typename T>
-  template<typename D>
+  template <typename T>
+  template <typename D>
   void WorkerT<T>::callWorkerEndStream(D, StreamID id) {
     module_->doEndStream(id);
   }
 
-  template<typename T>
-  inline
-  void
-  WorkerT<T>::implEndStream(StreamID id) {
-    std::conditional_t<workerimpl::has_stream_functions<T>::value,
-                       workerimpl::DoEndStream<T>,
-                       workerimpl::DoNothing> might_call;
-    might_call(this,id);
+  template <typename T>
+  inline void WorkerT<T>::implEndStream(StreamID id) {
+    std::conditional_t<workerimpl::has_stream_functions<T>::value, workerimpl::DoEndStream<T>, workerimpl::DoNothing>
+        might_call;
+    might_call(this, id);
   }
 
-  template<typename T>
-  inline
-  void
-  WorkerT<T>::implRespondToOpenInputFile(FileBlock const& fb) {
+  template <typename T>
+  inline void WorkerT<T>::implRespondToOpenInputFile(FileBlock const& fb) {
     module_->doRespondToOpenInputFile(fb);
   }
 
-  template<typename T>
-  inline
-  void
-  WorkerT<T>::implRespondToCloseInputFile(FileBlock const& fb) {
+  template <typename T>
+  inline void WorkerT<T>::implRespondToCloseInputFile(FileBlock const& fb) {
     module_->doRespondToCloseInputFile(fb);
   }
 
-  template<typename T>
-  inline
-  void
-  WorkerT<T>::implRegisterThinnedAssociations(ProductRegistry const& registry,
-                                              ThinnedAssociationsHelper& helper) {
+  template <typename T>
+  inline void WorkerT<T>::implRegisterThinnedAssociations(ProductRegistry const& registry,
+                                                          ThinnedAssociationsHelper& helper) {
     module_->doRegisterThinnedAssociations(registry, helper);
   }
 
-  template<typename T>
-  inline
-  Worker::TaskQueueAdaptor WorkerT<T>::serializeRunModule() {
+  template <typename T>
+  inline Worker::TaskQueueAdaptor WorkerT<T>::serializeRunModule() {
     return Worker::TaskQueueAdaptor{};
   }
-  template<> Worker::TaskQueueAdaptor WorkerT<EDAnalyzer>::serializeRunModule() {
+  template <>
+  Worker::TaskQueueAdaptor WorkerT<EDAnalyzer>::serializeRunModule() {
     return &(module_->sharedResourcesAcquirer().serialQueueChain());
   }
-  template<> Worker::TaskQueueAdaptor WorkerT<EDFilter>::serializeRunModule() {
+  template <>
+  Worker::TaskQueueAdaptor WorkerT<EDFilter>::serializeRunModule() {
     return &(module_->sharedResourcesAcquirer().serialQueueChain());
   }
-  template<> Worker::TaskQueueAdaptor WorkerT<EDProducer>::serializeRunModule() {
+  template <>
+  Worker::TaskQueueAdaptor WorkerT<EDProducer>::serializeRunModule() {
     return &(module_->sharedResourcesAcquirer().serialQueueChain());
   }
-  template<> Worker::TaskQueueAdaptor WorkerT<OutputModule>::serializeRunModule() {
+  template <>
+  Worker::TaskQueueAdaptor WorkerT<OutputModule>::serializeRunModule() {
     return &(module_->sharedResourcesAcquirer().serialQueueChain());
   }
-  template<> Worker::TaskQueueAdaptor WorkerT<one::EDAnalyzerBase>::serializeRunModule() {
+  template <>
+  Worker::TaskQueueAdaptor WorkerT<one::EDAnalyzerBase>::serializeRunModule() {
     return &(module_->sharedResourcesAcquirer().serialQueueChain());
   }
-  template<> Worker::TaskQueueAdaptor WorkerT<one::EDFilterBase>::serializeRunModule() {
+  template <>
+  Worker::TaskQueueAdaptor WorkerT<one::EDFilterBase>::serializeRunModule() {
     return &(module_->sharedResourcesAcquirer().serialQueueChain());
   }
-  template<> Worker::TaskQueueAdaptor WorkerT<one::EDProducerBase>::serializeRunModule() {
+  template <>
+  Worker::TaskQueueAdaptor WorkerT<one::EDProducerBase>::serializeRunModule() {
     return &(module_->sharedResourcesAcquirer().serialQueueChain());
   }
-  template<> Worker::TaskQueueAdaptor WorkerT<one::OutputModuleBase>::serializeRunModule() {
+  template <>
+  Worker::TaskQueueAdaptor WorkerT<one::OutputModuleBase>::serializeRunModule() {
     return &(module_->sharedResourcesAcquirer().serialQueueChain());
   }
-  template<> Worker::TaskQueueAdaptor WorkerT<limited::EDAnalyzerBase>::serializeRunModule() {
+  template <>
+  Worker::TaskQueueAdaptor WorkerT<limited::EDAnalyzerBase>::serializeRunModule() {
     return &(module_->queue());
   }
-  template<> Worker::TaskQueueAdaptor WorkerT<limited::EDFilterBase>::serializeRunModule() {
+  template <>
+  Worker::TaskQueueAdaptor WorkerT<limited::EDFilterBase>::serializeRunModule() {
     return &(module_->queue());
   }
-  template<> Worker::TaskQueueAdaptor WorkerT<limited::EDProducerBase>::serializeRunModule() {
+  template <>
+  Worker::TaskQueueAdaptor WorkerT<limited::EDProducerBase>::serializeRunModule() {
     return &(module_->queue());
   }
-  template<> Worker::TaskQueueAdaptor WorkerT<limited::OutputModuleBase>::serializeRunModule() {
+  template <>
+  Worker::TaskQueueAdaptor WorkerT<limited::OutputModuleBase>::serializeRunModule() {
     return &(module_->queue());
   }
 
-
   namespace {
-    template <typename T> bool mustPrefetchMayGet();
+    template <typename T>
+    bool mustPrefetchMayGet();
+
+    template <>
+    bool mustPrefetchMayGet<EDAnalyzer>() {
+      return true;
+    }
+    template <>
+    bool mustPrefetchMayGet<EDProducer>() {
+      return true;
+    }
+    template <>
+    bool mustPrefetchMayGet<EDFilter>() {
+      return true;
+    }
+    template <>
+    bool mustPrefetchMayGet<OutputModule>() {
+      return true;
+    }
 
-    template<> bool mustPrefetchMayGet<EDAnalyzer>() { return true;}
-    template<> bool mustPrefetchMayGet<EDProducer>() { return true;}
-    template<> bool mustPrefetchMayGet<EDFilter>() { return true;}
-    template<> bool mustPrefetchMayGet<OutputModule>() { return true;}
+    template <>
+    bool mustPrefetchMayGet<edm::one::EDProducerBase>() {
+      return true;
+    }
+    template <>
+    bool mustPrefetchMayGet<edm::one::EDFilterBase>() {
+      return true;
+    }
+    template <>
+    bool mustPrefetchMayGet<edm::one::EDAnalyzerBase>() {
+      return true;
+    }
+    template <>
+    bool mustPrefetchMayGet<edm::one::OutputModuleBase>() {
+      return true;
+    }
 
-    template<> bool mustPrefetchMayGet<edm::one::EDProducerBase>() { return true;}
-    template<> bool mustPrefetchMayGet<edm::one::EDFilterBase>() { return true;}
-    template<> bool mustPrefetchMayGet<edm::one::EDAnalyzerBase>() { return true;}
-    template<> bool mustPrefetchMayGet<edm::one::OutputModuleBase>() { return true;}
+    template <>
+    bool mustPrefetchMayGet<edm::global::EDProducerBase>() {
+      return true;
+    }
+    template <>
+    bool mustPrefetchMayGet<edm::global::EDFilterBase>() {
+      return true;
+    }
+    template <>
+    bool mustPrefetchMayGet<edm::global::EDAnalyzerBase>() {
+      return true;
+    }
+    template <>
+    bool mustPrefetchMayGet<edm::global::OutputModuleBase>() {
+      return true;
+    }
 
-    template<> bool mustPrefetchMayGet<edm::global::EDProducerBase>() { return true;}
-    template<> bool mustPrefetchMayGet<edm::global::EDFilterBase>() { return true;}
-    template<> bool mustPrefetchMayGet<edm::global::EDAnalyzerBase>() { return true;}
-    template<> bool mustPrefetchMayGet<edm::global::OutputModuleBase>() { return true;}
+    template <>
+    bool mustPrefetchMayGet<edm::limited::EDProducerBase>() {
+      return true;
+    }
+    template <>
+    bool mustPrefetchMayGet<edm::limited::EDFilterBase>() {
+      return true;
+    }
+    template <>
+    bool mustPrefetchMayGet<edm::limited::EDAnalyzerBase>() {
+      return true;
+    }
+    template <>
+    bool mustPrefetchMayGet<edm::limited::OutputModuleBase>() {
+      return true;
+    }
 
-    template<> bool mustPrefetchMayGet<edm::limited::EDProducerBase>() { return true;}
-    template<> bool mustPrefetchMayGet<edm::limited::EDFilterBase>() { return true;}
-    template<> bool mustPrefetchMayGet<edm::limited::EDAnalyzerBase>() { return true;}
-    template<> bool mustPrefetchMayGet<edm::limited::OutputModuleBase>() { return true;}
+    template <>
+    bool mustPrefetchMayGet<edm::stream::EDProducerAdaptorBase>() {
+      return true;
+    }
+    template <>
+    bool mustPrefetchMayGet<edm::stream::EDFilterAdaptorBase>() {
+      return true;
+    }
+    template <>
+    bool mustPrefetchMayGet<edm::stream::EDAnalyzerAdaptorBase>() {
+      return true;
+    }
 
-    template<> bool mustPrefetchMayGet<edm::stream::EDProducerAdaptorBase>() { return true;}
-    template<> bool mustPrefetchMayGet<edm::stream::EDFilterAdaptorBase>() { return true;}
-    template<> bool mustPrefetchMayGet<edm::stream::EDAnalyzerAdaptorBase>() { return true;}
+  }  // namespace
 
+  template <typename T>
+  void WorkerT<T>::updateLookup(BranchType iBranchType, ProductResolverIndexHelper const& iHelper) {
+    module_->updateLookup(iBranchType, iHelper, mustPrefetchMayGet<T>());
   }
 
-
-  template<typename T>
-  void WorkerT<T>::updateLookup(BranchType iBranchType,
-                                ProductResolverIndexHelper const& iHelper) {
-    module_->updateLookup(iBranchType,iHelper,mustPrefetchMayGet<T>());
+  template <typename T>
+  void WorkerT<T>::updateLookup(eventsetup::ESRecordsToProxyIndices const& iPI) {
+    module_->updateLookup(iPI);
   }
 
   namespace {
-    using ModuleToResolverIndicies = std::unordered_multimap<std::string,
-    std::tuple<edm::TypeID const*, const char*, edm::ProductResolverIndex>>;
+    using ModuleToResolverIndicies =
+        std::unordered_multimap<std::string, std::tuple<edm::TypeID const*, const char*, edm::ProductResolverIndex>>;
     void resolvePutIndiciesImpl(void*,
                                 BranchType iBranchType,
                                 ModuleToResolverIndicies const& iIndicies,
@@ -679,9 +684,7 @@ namespace edm{
 
     std::vector<ProductResolverIndex> s_emptyIndexList;
 
-    std::vector<ProductResolverIndex> const& itemsShouldPutInEventImpl(void const*) {
-      return s_emptyIndexList;
-    }
+    std::vector<ProductResolverIndex> const& itemsShouldPutInEventImpl(void const*) { return s_emptyIndexList; }
 
     std::vector<ProductResolverIndex> const& itemsShouldPutInEventImpl(ProducerBase const* iProd) {
       return iProd->indiciesForPutProducts(edm::InEvent);
@@ -695,65 +698,100 @@ namespace edm{
       return iProd->indiciesForPutProducts(edm::InEvent);
     }
 
+  }  // namespace
+
+  template <typename T>
+  void WorkerT<T>::resolvePutIndicies(
+      BranchType iBranchType,
+      std::unordered_multimap<std::string, std::tuple<TypeID const*, const char*, edm::ProductResolverIndex>> const&
+          iIndicies) {
+    resolvePutIndiciesImpl(&module(), iBranchType, iIndicies, description().moduleLabel());
   }
 
-  template<typename T>
-  void WorkerT<T>::resolvePutIndicies(BranchType iBranchType,
-                                      std::unordered_multimap<std::string,
-                                      std::tuple<TypeID const*, const char*, edm::ProductResolverIndex>> const& iIndicies) {
-    resolvePutIndiciesImpl(&module(), iBranchType,iIndicies, description().moduleLabel());
+  template <typename T>
+  std::vector<ProductResolverIndex> const& WorkerT<T>::itemsShouldPutInEvent() const {
+    return itemsShouldPutInEventImpl(&module());
   }
 
+  template <>
+  Worker::Types WorkerT<EDAnalyzer>::moduleType() const {
+    return Worker::kAnalyzer;
+  }
+  template <>
+  Worker::Types WorkerT<EDProducer>::moduleType() const {
+    return Worker::kProducer;
+  }
+  template <>
+  Worker::Types WorkerT<EDFilter>::moduleType() const {
+    return Worker::kFilter;
+  }
+  template <>
+  Worker::Types WorkerT<OutputModule>::moduleType() const {
+    return Worker::kOutputModule;
+  }
+  template <>
+  Worker::Types WorkerT<edm::one::EDProducerBase>::moduleType() const {
+    return Worker::kProducer;
+  }
+  template <>
+  Worker::Types WorkerT<edm::one::EDFilterBase>::moduleType() const {
+    return Worker::kFilter;
+  }
+  template <>
+  Worker::Types WorkerT<edm::one::EDAnalyzerBase>::moduleType() const {
+    return Worker::kAnalyzer;
+  }
+  template <>
+  Worker::Types WorkerT<edm::one::OutputModuleBase>::moduleType() const {
+    return Worker::kOutputModule;
+  }
 
-  template<typename T>
-  std::vector<ProductResolverIndex> const&
-  WorkerT<T>::itemsShouldPutInEvent() const {
-    return itemsShouldPutInEventImpl(&module());
+  template <>
+  Worker::Types WorkerT<edm::global::EDProducerBase>::moduleType() const {
+    return Worker::kProducer;
+  }
+  template <>
+  Worker::Types WorkerT<edm::global::EDFilterBase>::moduleType() const {
+    return Worker::kFilter;
+  }
+  template <>
+  Worker::Types WorkerT<edm::global::EDAnalyzerBase>::moduleType() const {
+    return Worker::kAnalyzer;
+  }
+  template <>
+  Worker::Types WorkerT<edm::global::OutputModuleBase>::moduleType() const {
+    return Worker::kOutputModule;
   }
 
+  template <>
+  Worker::Types WorkerT<edm::limited::EDProducerBase>::moduleType() const {
+    return Worker::kProducer;
+  }
+  template <>
+  Worker::Types WorkerT<edm::limited::EDFilterBase>::moduleType() const {
+    return Worker::kFilter;
+  }
+  template <>
+  Worker::Types WorkerT<edm::limited::EDAnalyzerBase>::moduleType() const {
+    return Worker::kAnalyzer;
+  }
+  template <>
+  Worker::Types WorkerT<edm::limited::OutputModuleBase>::moduleType() const {
+    return Worker::kOutputModule;
+  }
 
-  template<>
-  Worker::Types WorkerT<EDAnalyzer>::moduleType() const { return Worker::kAnalyzer;}
-  template<>
-  Worker::Types WorkerT<EDProducer>::moduleType() const { return Worker::kProducer;}
-  template<>
-  Worker::Types WorkerT<EDFilter>::moduleType() const { return Worker::kFilter;}
-  template<>
-  Worker::Types WorkerT<OutputModule>::moduleType() const { return Worker::kOutputModule;}
-  template<>
-  Worker::Types WorkerT<edm::one::EDProducerBase>::moduleType() const { return Worker::kProducer;}
-  template<>
-  Worker::Types WorkerT<edm::one::EDFilterBase>::moduleType() const { return Worker::kFilter;}
-  template<>
-  Worker::Types WorkerT<edm::one::EDAnalyzerBase>::moduleType() const { return Worker::kAnalyzer;}
-  template<>
-  Worker::Types WorkerT<edm::one::OutputModuleBase>::moduleType() const { return Worker::kOutputModule;}
-
-  template<>
-  Worker::Types WorkerT<edm::global::EDProducerBase>::moduleType() const { return Worker::kProducer;}
-  template<>
-  Worker::Types WorkerT<edm::global::EDFilterBase>::moduleType() const { return Worker::kFilter;}
-  template<>
-  Worker::Types WorkerT<edm::global::EDAnalyzerBase>::moduleType() const { return Worker::kAnalyzer;}
-  template<>
-  Worker::Types WorkerT<edm::global::OutputModuleBase>::moduleType() const { return Worker::kOutputModule;}
-
-  template<>
-  Worker::Types WorkerT<edm::limited::EDProducerBase>::moduleType() const { return Worker::kProducer;}
-  template<>
-  Worker::Types WorkerT<edm::limited::EDFilterBase>::moduleType() const { return Worker::kFilter;}
-  template<>
-  Worker::Types WorkerT<edm::limited::EDAnalyzerBase>::moduleType() const { return Worker::kAnalyzer;}
-  template<>
-  Worker::Types WorkerT<edm::limited::OutputModuleBase>::moduleType() const { return Worker::kOutputModule;}
-
-
-  template<>
-  Worker::Types WorkerT<edm::stream::EDProducerAdaptorBase>::moduleType() const { return Worker::kProducer;}
-  template<>
-  Worker::Types WorkerT<edm::stream::EDFilterAdaptorBase>::moduleType() const { return Worker::kFilter;}
-  template<>
-  Worker::Types WorkerT<edm::stream::EDAnalyzerAdaptorBase>::moduleType() const { return Worker::kAnalyzer;}
+  template <>
+  Worker::Types WorkerT<edm::stream::EDProducerAdaptorBase>::moduleType() const {
+    return Worker::kProducer;
+  }
+  template <>
+  Worker::Types WorkerT<edm::stream::EDFilterAdaptorBase>::moduleType() const {
+    return Worker::kFilter;
+  }
+  template <>
+  Worker::Types WorkerT<edm::stream::EDAnalyzerAdaptorBase>::moduleType() const {
+    return Worker::kAnalyzer;
+  }
 
   //Explicitly instantiate our needed templates to avoid having the compiler
   // instantiate them in all of our libraries
@@ -776,4 +814,4 @@ namespace edm{
   template class WorkerT<limited::EDFilterBase>;
   template class WorkerT<limited::EDAnalyzerBase>;
   template class WorkerT<limited::OutputModuleBase>;
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/WorkerT.h b/FWCore/Framework/src/WorkerT.h
index eb36848c146c9..3c0b8ea2857c1 100644
--- a/FWCore/Framework/src/WorkerT.h
+++ b/FWCore/Framework/src/WorkerT.h
@@ -27,24 +27,22 @@ namespace edm {
   class ThinnedAssociationsHelper;
   class WaitingTaskWithArenaHolder;
 
-  template<typename T>
+  template <typename T>
   class WorkerT : public Worker {
   public:
     typedef T ModuleType;
     typedef WorkerT<T> WorkerType;
-    WorkerT(std::shared_ptr<T>,
-            ModuleDescription const&,
-            ExceptionToActionTable const* actions);
+    WorkerT(std::shared_ptr<T>, ModuleDescription const&, ExceptionToActionTable const* actions);
 
     ~WorkerT() override;
 
-    void setModule( std::shared_ptr<T> iModule) {
+    void setModule(std::shared_ptr<T> iModule) {
       module_ = iModule;
       resetModuleDescription(&(module_->moduleDescription()));
     }
-    
+
     Types moduleType() const override;
-    
+
     bool wantsGlobalRuns() const final;
     bool wantsGlobalLuminosityBlocks() const final;
     bool wantsStreamRuns() const final;
@@ -53,67 +51,70 @@ namespace edm {
     SerialTaskQueue* globalRunsQueue() final;
     SerialTaskQueue* globalLuminosityBlocksQueue() final;
 
+    void updateLookup(BranchType iBranchType, ProductResolverIndexHelper const&) final;
+    void updateLookup(eventsetup::ESRecordsToProxyIndices const&) final;
+    void resolvePutIndicies(
+        BranchType iBranchType,
+        std::unordered_multimap<std::string, std::tuple<TypeID const*, const char*, edm::ProductResolverIndex>> const&
+            iIndicies) final;
 
-    void updateLookup(BranchType iBranchType,
-                              ProductResolverIndexHelper const&) override;
-    void resolvePutIndicies(BranchType iBranchType,
-                                    std::unordered_multimap<std::string, std::tuple<TypeID const*, const char*, edm::ProductResolverIndex>> const& iIndicies) override;
-
-    template<typename D>
+    template <typename D>
     void callWorkerBeginStream(D, StreamID);
-    template<typename D>
+    template <typename D>
     void callWorkerEndStream(D, StreamID);
-    template<typename D>
-    void callWorkerStreamBegin(D, StreamID id, RunPrincipal const& rp,
-                               EventSetupImpl const& c,
-                               ModuleCallingContext const* mcc);
-    template<typename D>
-    void callWorkerStreamEnd(D, StreamID id, RunPrincipal const& rp,
-                             EventSetupImpl const& c,
-                             ModuleCallingContext const* mcc);
-    template<typename D>
-    void callWorkerStreamBegin(D, StreamID id, LuminosityBlockPrincipal const& rp,
-                               EventSetupImpl const& c,
-                               ModuleCallingContext const* mcc);
-    template<typename D>
-    void callWorkerStreamEnd(D, StreamID id, LuminosityBlockPrincipal const& rp,
-                             EventSetupImpl const& c,
-                             ModuleCallingContext const* mcc);
-    
+    template <typename D>
+    void callWorkerStreamBegin(
+        D, StreamID id, RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc);
+    template <typename D>
+    void callWorkerStreamEnd(
+        D, StreamID id, RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc);
+    template <typename D>
+    void callWorkerStreamBegin(
+        D, StreamID id, LuminosityBlockPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc);
+    template <typename D>
+    void callWorkerStreamEnd(
+        D, StreamID id, LuminosityBlockPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc);
+
   protected:
-    T& module() {return *module_;}
-    T const& module() const {return *module_;}
+    T& module() { return *module_; }
+    T const& module() const { return *module_; }
 
   private:
-    bool implDo(EventPrincipal const& ep, EventSetupImpl const& c,
-                        ModuleCallingContext const* mcc) override;
+    bool implDo(EventPrincipal const& ep, EventSetupImpl const& c, ModuleCallingContext const* mcc) override;
 
     void itemsToGetForSelection(std::vector<ProductResolverIndexAndSkipBit>&) const final;
     bool implNeedToRunSelection() const final;
 
-    void implDoAcquire(EventPrincipal const& ep, EventSetupImpl const& c,
+    void implDoAcquire(EventPrincipal const& ep,
+                       EventSetupImpl const& c,
                        ModuleCallingContext const* mcc,
                        WaitingTaskWithArenaHolder& holder) final;
 
-    bool implDoPrePrefetchSelection(StreamID id,
-                                            EventPrincipal const& ep,
-                                            ModuleCallingContext const* mcc) override;
-    bool implDoBegin(RunPrincipal const& rp, EventSetupImpl const& c,
-                             ModuleCallingContext const* mcc) override;
-    bool implDoStreamBegin(StreamID id, RunPrincipal const& rp, EventSetupImpl const& c,
-                                   ModuleCallingContext const* mcc) override;
-    bool implDoStreamEnd(StreamID id, RunPrincipal const& rp, EventSetupImpl const& c,
-                                 ModuleCallingContext const* mcc) override;
-    bool implDoEnd(RunPrincipal const& rp, EventSetupImpl const& c,
+    bool implDoPrePrefetchSelection(StreamID id, EventPrincipal const& ep, ModuleCallingContext const* mcc) override;
+    bool implDoBegin(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc) override;
+    bool implDoStreamBegin(StreamID id,
+                           RunPrincipal const& rp,
+                           EventSetupImpl const& c,
                            ModuleCallingContext const* mcc) override;
-    bool implDoBegin(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& c,
-                             ModuleCallingContext const* mcc) override;
-    bool implDoStreamBegin(StreamID id, LuminosityBlockPrincipal const& lbp, EventSetupImpl const& c,
-                                   ModuleCallingContext const* mcc) override;
-    bool implDoStreamEnd(StreamID id, LuminosityBlockPrincipal const& lbp, EventSetupImpl const& c,
-                                 ModuleCallingContext const* mcc) override;
-    bool implDoEnd(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& c,
+    bool implDoStreamEnd(StreamID id,
+                         RunPrincipal const& rp,
+                         EventSetupImpl const& c,
+                         ModuleCallingContext const* mcc) override;
+    bool implDoEnd(RunPrincipal const& rp, EventSetupImpl const& c, ModuleCallingContext const* mcc) override;
+    bool implDoBegin(LuminosityBlockPrincipal const& lbp,
+                     EventSetupImpl const& c,
+                     ModuleCallingContext const* mcc) override;
+    bool implDoStreamBegin(StreamID id,
+                           LuminosityBlockPrincipal const& lbp,
+                           EventSetupImpl const& c,
                            ModuleCallingContext const* mcc) override;
+    bool implDoStreamEnd(StreamID id,
+                         LuminosityBlockPrincipal const& lbp,
+                         EventSetupImpl const& c,
+                         ModuleCallingContext const* mcc) override;
+    bool implDoEnd(LuminosityBlockPrincipal const& lbp,
+                   EventSetupImpl const& c,
+                   ModuleCallingContext const* mcc) override;
     void implBeginJob() override;
     void implEndJob() override;
     void implBeginStream(StreamID) override;
@@ -124,10 +125,10 @@ namespace edm {
     std::string workerType() const override;
     TaskQueueAdaptor serializeRunModule() override;
 
-
-    void modulesWhoseProductsAreConsumed(std::vector<ModuleDescription const*>& modules,
-                                                 ProductRegistry const& preg,
-                                                 std::map<std::string, ModuleDescription const*> const& labelsToDesc) const override {
+    void modulesWhoseProductsAreConsumed(
+        std::vector<ModuleDescription const*>& modules,
+        ProductRegistry const& preg,
+        std::map<std::string, ModuleDescription const*> const& labelsToDesc) const override {
       module_->modulesWhoseProductsAreConsumed(modules, preg, labelsToDesc, module_->moduleDescription().processName());
     }
 
@@ -135,9 +136,7 @@ namespace edm {
       module_->convertCurrentProcessAlias(processName);
     }
 
-    std::vector<ConsumesInfo> consumesInfo() const override {
-      return module_->consumesInfo();
-    }
+    std::vector<ConsumesInfo> consumesInfo() const override { return module_->consumesInfo(); }
 
     void itemsToGet(BranchType branchType, std::vector<ProductResolverIndexAndSkipBit>& indexes) const override {
       module_->itemsToGet(branchType, indexes);
@@ -147,25 +146,25 @@ namespace edm {
       module_->itemsMayGet(branchType, indexes);
     }
 
-    std::vector<ProductResolverIndexAndSkipBit> const& itemsToGetFrom(BranchType iType) const final { return module_->itemsToGetFrom(iType); }
-    
+    std::vector<ProductResolverIndexAndSkipBit> const& itemsToGetFrom(BranchType iType) const final {
+      return module_->itemsToGetFrom(iType);
+    }
+
     std::vector<ProductResolverIndex> const& itemsShouldPutInEvent() const override;
 
-    void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const override {
-      module_->preActionBeforeRunEventAsync(iTask,iModuleCallingContext,iPrincipal);
+    void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                      ModuleCallingContext const& iModuleCallingContext,
+                                      Principal const& iPrincipal) const override {
+      module_->preActionBeforeRunEventAsync(iTask, iModuleCallingContext, iPrincipal);
     }
 
-    bool hasAcquire() const override {
-      return module_->hasAcquire();
-    }
+    bool hasAcquire() const override { return module_->hasAcquire(); }
 
-    bool hasAccumulator() const override {
-      return module_->hasAccumulator();
-    }
+    bool hasAccumulator() const override { return module_->hasAccumulator(); }
 
     edm::propagate_const<std::shared_ptr<T>> module_;
   };
 
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/defaultCmsRunServices.cc b/FWCore/Framework/src/defaultCmsRunServices.cc
index 6dd93cb5ff2fa..f0b63301b87c0 100644
--- a/FWCore/Framework/src/defaultCmsRunServices.cc
+++ b/FWCore/Framework/src/defaultCmsRunServices.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Function:    defaultCmsRunServices
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -16,17 +16,17 @@
 #include "FWCore/Framework/interface/defaultCmsRunServices.h"
 
 namespace edm {
-   std::vector<std::string> defaultCmsRunServices() {
-      std::vector<std::string> returnValue = {"MessageLogger",
-                                              "InitRootHandlers",
-                                              "UnixSignalService",
-                                              "AdaptorConfig",
-                                              "SiteLocalConfigService",
-                                              "StatisticsSenderService",
-                                              "CondorStatusService",
-                                              "XrdAdaptor::XrdStatisticsService"};
+  std::vector<std::string> defaultCmsRunServices() {
+    std::vector<std::string> returnValue = {"MessageLogger",
+                                            "InitRootHandlers",
+                                            "UnixSignalService",
+                                            "AdaptorConfig",
+                                            "SiteLocalConfigService",
+                                            "StatisticsSenderService",
+                                            "CondorStatusService",
+                                            "XrdAdaptor::XrdStatisticsService"};
+
+    return returnValue;
+  }
 
-      return returnValue;
-   }
-   
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/edmodule_mightGet_config.cc b/FWCore/Framework/src/edmodule_mightGet_config.cc
index dbbb3285600b3..65afe690cd2d2 100644
--- a/FWCore/Framework/src/edmodule_mightGet_config.cc
+++ b/FWCore/Framework/src/edmodule_mightGet_config.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     edmodule_mightGet_config
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -17,7 +17,6 @@
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/Framework/src/edmodule_mightGet_config.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -27,28 +26,26 @@
 //
 
 static const std::string kMightGet("mightGet");
-static const char* const kComment=
-"List contains the branch names for the EDProducts which might be requested by the module.\n"
-"The format for identifying the EDProduct is the same as the one used for OutputModules, "
-"except no wild cards are allowed. E.g.\n"
-"Foos_foomodule_whichFoo_RECO";
+static const char* const kComment =
+    "List contains the branch names for the EDProducts which might be requested by the module.\n"
+    "The format for identifying the EDProduct is the same as the one used for OutputModules, "
+    "except no wild cards are allowed. E.g.\n"
+    "Foos_foomodule_whichFoo_RECO";
 
 namespace edm {
   void edmodule_mightGet_config(ConfigurationDescriptions& iDesc) {
     //NOTE: by not giving a default, we are intentionally not having 'mightGet' added
     // to any cfi files. This was done intentionally to avoid problems with HLT. If requested,
     // the appropriate default would be an empty vector.
-    if(iDesc.defaultDescription()) {
+    if (iDesc.defaultDescription()) {
       if (iDesc.defaultDescription()->isLabelUnused(kMightGet)) {
-        iDesc.defaultDescription()->addOptionalUntracked<std::vector<std::string> >(kMightGet)
-        ->setComment(kComment);
+        iDesc.defaultDescription()->addOptionalUntracked<std::vector<std::string> >(kMightGet)->setComment(kComment);
       }
     }
-    for(auto& v: iDesc) {
+    for (auto& v : iDesc) {
       if (v.second.isLabelUnused(kMightGet)) {
         v.second.addOptionalUntracked<std::vector<std::string> >(kMightGet)->setComment(kComment);
       }
     }
-    
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/edmodule_mightGet_config.h b/FWCore/Framework/src/edmodule_mightGet_config.h
index 5217c2006320c..43fad88034bab 100644
--- a/FWCore/Framework/src/edmodule_mightGet_config.h
+++ b/FWCore/Framework/src/edmodule_mightGet_config.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     edmodule_mightGet_config
-// 
+//
 /**\class edmodule_mightGet_config edmodule_mightGet_config.h FWCore/Framework/interface/edmodule_mightGet_config.h
 
  Description: Injects 'mightGet' PSet into all ed module configurations
@@ -25,5 +25,5 @@
 namespace edm {
   class ConfigurationDescriptions;
   void edmodule_mightGet_config(ConfigurationDescriptions&);
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/src/getAllTriggerNames.cc b/FWCore/Framework/src/getAllTriggerNames.cc
index b4f2eee6733a8..1663c7f4bf766 100644
--- a/FWCore/Framework/src/getAllTriggerNames.cc
+++ b/FWCore/Framework/src/getAllTriggerNames.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Package
 // Class  :     getAllTriggerNames
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -17,11 +17,10 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Framework/interface/TriggerNamesService.h"
 
-
 namespace edm {
-  
+
   std::vector<std::string> const& getAllTriggerNames() {
     Service<service::TriggerNamesService> tns;
     return tns->getTrigPaths();
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/getProducerParameterSet.cc b/FWCore/Framework/src/getProducerParameterSet.cc
index 0df305ad01d42..b713e4c838a84 100644
--- a/FWCore/Framework/src/getProducerParameterSet.cc
+++ b/FWCore/Framework/src/getProducerParameterSet.cc
@@ -13,11 +13,8 @@
 
 namespace edm {
 
-  ParameterSet const*
-  getProducerParameterSet(Provenance const& provenance) {
-
-    const std::shared_ptr<BranchDescription const>& branchDescription =
-      provenance.constBranchDescriptionPtr();
+  ParameterSet const* getProducerParameterSet(Provenance const& provenance) {
+    const std::shared_ptr<BranchDescription const>& branchDescription = provenance.constBranchDescriptionPtr();
 
     if (branchDescription) {
       std::string const& process = branchDescription->processName();
@@ -38,8 +35,7 @@ namespace edm {
       }
     }
     // This should never happen
-    throw cms::Exception("LogicError")
-      << "getProducerParameterSet failed";
+    throw cms::Exception("LogicError") << "getProducerParameterSet failed";
     return nullptr;
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/global/EDAnalyzerBase.cc b/FWCore/Framework/src/global/EDAnalyzerBase.cc
index b2b288740d587..fe7cc283c9bd1 100644
--- a/FWCore/Framework/src/global/EDAnalyzerBase.cc
+++ b/FWCore/Framework/src/global/EDAnalyzerBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     global::EDAnalyzerBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -22,7 +22,6 @@
 #include "FWCore/Framework/src/PreallocationConfiguration.h"
 #include "FWCore/Framework/src/EventSignalsSentry.h"
 
-
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
@@ -31,7 +30,6 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Framework/interface/ConstProductRegistry.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -40,208 +38,177 @@ namespace edm {
     //
     // static data member definitions
     //
-    
+
     //
     // constructors and destructor
     //
-    EDAnalyzerBase::EDAnalyzerBase():
-    moduleDescription_() { }
-    
-    EDAnalyzerBase::~EDAnalyzerBase()
-    {
-    }
-    
-    bool
-    EDAnalyzerBase::doEvent(EventPrincipal const& ep, EventSetupImpl const& ci,
-                            ActivityRegistry* act,
-                            ModuleCallingContext const* mcc) {
+    EDAnalyzerBase::EDAnalyzerBase() : moduleDescription_() {}
+
+    EDAnalyzerBase::~EDAnalyzerBase() {}
+
+    bool EDAnalyzerBase::doEvent(EventPrincipal const& ep,
+                                 EventSetupImpl const& ci,
+                                 ActivityRegistry* act,
+                                 ModuleCallingContext const* mcc) {
       Event e(ep, moduleDescription_, mcc);
       e.setConsumer(this);
-      EventSignalsSentry sentry(act,mcc);
-      const EventSetup c{ci};
+      EventSignalsSentry sentry(act, mcc);
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event)};
       this->analyze(e.streamID(), e, c);
       return true;
     }
-    
-    void
-    EDAnalyzerBase::doPreallocate(PreallocationConfiguration const& iPrealloc) {
+
+    void EDAnalyzerBase::doPreallocate(PreallocationConfiguration const& iPrealloc) {
       preallocStreams(iPrealloc.numberOfStreams());
       preallocLumis(iPrealloc.numberOfLuminosityBlocks());
       preallocate(iPrealloc);
     }
 
-    void
-    EDAnalyzerBase::doBeginJob() {
-      this->beginJob();
-    }
-    
-    void
-    EDAnalyzerBase::doEndJob() {
-      this->endJob();
-    }
-    
-    void
-    EDAnalyzerBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                               ModuleCallingContext const* mcc) {
-      
+    void EDAnalyzerBase::doBeginJob() { this->beginJob(); }
+
+    void EDAnalyzerBase::doEndJob() { this->endJob(); }
+
+    void EDAnalyzerBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, false);
       r.setConsumer(this);
       Run const& cnstR = r;
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun)};
       this->doBeginRun_(cnstR, c);
       this->doBeginRunSummary_(cnstR, c);
     }
-    
-    void
-    EDAnalyzerBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                             ModuleCallingContext const* mcc) {
+
+    void EDAnalyzerBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, true);
       r.setConsumer(this);
       Run const& cnstR = r;
-      const EventSetup c{ci};
-      this->doEndRunSummary_(r,c);
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun)};
+      this->doEndRunSummary_(r, c);
       this->doEndRun_(cnstR, c);
     }
-    
-    void
-    EDAnalyzerBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                           ModuleCallingContext const* mcc) {
+
+    void EDAnalyzerBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                                EventSetupImpl const& ci,
+                                                ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
       lb.setConsumer(this);
       LuminosityBlock const& cnstLb = lb;
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                         esGetTokenIndices(Transition::BeginLuminosityBlock)};
       this->doBeginLuminosityBlock_(cnstLb, c);
       this->doBeginLuminosityBlockSummary_(cnstLb, c);
     }
-    
-    void
-    EDAnalyzerBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                         ModuleCallingContext const* mcc) {
+
+    void EDAnalyzerBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                              EventSetupImpl const& ci,
+                                              ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
       LuminosityBlock const& cnstLb = lb;
-      const EventSetup c{ci};
-      this->doEndLuminosityBlockSummary_(cnstLb,c);
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                         esGetTokenIndices(Transition::EndLuminosityBlock)};
+      this->doEndLuminosityBlockSummary_(cnstLb, c);
       this->doEndLuminosityBlock_(cnstLb, c);
     }
-    
-    void
-    EDAnalyzerBase::doBeginStream(StreamID id) {
-      doBeginStream_(id);
-    }
-    void
-    EDAnalyzerBase::doEndStream(StreamID id) {
-      doEndStream_(id);
-    }
-    void
-    EDAnalyzerBase::doStreamBeginRun(StreamID id,
-                                     RunPrincipal const& rp,
-                                     EventSetupImpl const& ci,
-                                     ModuleCallingContext const* mcc)
-    {
+
+    void EDAnalyzerBase::doBeginStream(StreamID id) { doBeginStream_(id); }
+    void EDAnalyzerBase::doEndStream(StreamID id) { doEndStream_(id); }
+    void EDAnalyzerBase::doStreamBeginRun(StreamID id,
+                                          RunPrincipal const& rp,
+                                          EventSetupImpl const& ci,
+                                          ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, false);
       r.setConsumer(this);
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun)};
       this->doStreamBeginRun_(id, r, c);
     }
-    void
-    EDAnalyzerBase::doStreamEndRun(StreamID id,
-                                   RunPrincipal const& rp,
-                                   EventSetupImpl const& ci,
-                                   ModuleCallingContext const* mcc) {
+    void EDAnalyzerBase::doStreamEndRun(StreamID id,
+                                        RunPrincipal const& rp,
+                                        EventSetupImpl const& ci,
+                                        ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, true);
       r.setConsumer(this);
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun)};
       this->doStreamEndRun_(id, r, c);
       this->doStreamEndRunSummary_(id, r, c);
     }
-    void
-    EDAnalyzerBase::doStreamBeginLuminosityBlock(StreamID id,
-                                                 LuminosityBlockPrincipal const& lbp,
-                                                 EventSetupImpl const& ci,
-                                                 ModuleCallingContext const* mcc) {
+    void EDAnalyzerBase::doStreamBeginLuminosityBlock(StreamID id,
+                                                      LuminosityBlockPrincipal const& lbp,
+                                                      EventSetupImpl const& ci,
+                                                      ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
       lb.setConsumer(this);
-      const EventSetup c{ci};
-      this->doStreamBeginLuminosityBlock_(id,lb, c);
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                         esGetTokenIndices(Transition::BeginLuminosityBlock)};
+      this->doStreamBeginLuminosityBlock_(id, lb, c);
     }
-    
-    void
-    EDAnalyzerBase::doStreamEndLuminosityBlock(StreamID id,
-                                               LuminosityBlockPrincipal const& lbp,
-                                               EventSetupImpl const& ci,
-                                               ModuleCallingContext const* mcc) {
+
+    void EDAnalyzerBase::doStreamEndLuminosityBlock(StreamID id,
+                                                    LuminosityBlockPrincipal const& lbp,
+                                                    EventSetupImpl const& ci,
+                                                    ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
-      const EventSetup c{ci};
-      this->doStreamEndLuminosityBlock_(id,lb, c);
-      this->doStreamEndLuminosityBlockSummary_(id,lb, c);
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                         esGetTokenIndices(Transition::EndLuminosityBlock)};
+      this->doStreamEndLuminosityBlock_(id, lb, c);
+      this->doStreamEndLuminosityBlockSummary_(id, lb, c);
     }
-    
-    
-    
-    void
-    EDAnalyzerBase::doRespondToOpenInputFile(FileBlock const& fb) {
+
+    void EDAnalyzerBase::doRespondToOpenInputFile(FileBlock const& fb) {
       //respondToOpenInputFile(fb);
     }
-    
-    void
-    EDAnalyzerBase::doRespondToCloseInputFile(FileBlock const& fb) {
+
+    void EDAnalyzerBase::doRespondToCloseInputFile(FileBlock const& fb) {
       //respondToCloseInputFile(fb);
     }
-    
+
     void EDAnalyzerBase::preallocStreams(unsigned int) {}
     void EDAnalyzerBase::preallocLumis(unsigned int) {}
     void EDAnalyzerBase::preallocate(PreallocationConfiguration const&) {}
-    void EDAnalyzerBase::doBeginStream_(StreamID id){}
+    void EDAnalyzerBase::doBeginStream_(StreamID id) {}
     void EDAnalyzerBase::doEndStream_(StreamID id) {}
     void EDAnalyzerBase::doStreamBeginRun_(StreamID id, Run const& rp, EventSetup const& c) {}
     void EDAnalyzerBase::doStreamEndRun_(StreamID id, Run const& rp, EventSetup const& c) {}
     void EDAnalyzerBase::doStreamEndRunSummary_(StreamID id, Run const& rp, EventSetup const& c) {}
     void EDAnalyzerBase::doStreamBeginLuminosityBlock_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDAnalyzerBase::doStreamEndLuminosityBlock_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) {}
-    void EDAnalyzerBase::doStreamEndLuminosityBlockSummary_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) {}
-    
-    
+    void EDAnalyzerBase::doStreamEndLuminosityBlockSummary_(StreamID id,
+                                                            LuminosityBlock const& lbp,
+                                                            EventSetup const& c) {}
+
     void EDAnalyzerBase::doBeginRun_(Run const& rp, EventSetup const& c) {}
     void EDAnalyzerBase::doEndRun_(Run const& rp, EventSetup const& c) {}
     void EDAnalyzerBase::doBeginRunSummary_(Run const& rp, EventSetup const& c) {}
     void EDAnalyzerBase::doEndRunSummary_(Run const& rp, EventSetup const& c) {}
-    
+
     void EDAnalyzerBase::doBeginLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDAnalyzerBase::doEndLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDAnalyzerBase::doBeginLuminosityBlockSummary_(LuminosityBlock const& rp, EventSetup const& c) {}
     void EDAnalyzerBase::doEndLuminosityBlockSummary_(LuminosityBlock const& lb, EventSetup const& c) {}
-    
-    void
-    EDAnalyzerBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
+
+    void EDAnalyzerBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
       ParameterSetDescription desc;
       desc.setUnknown();
       descriptions.addDefault(desc);
     }
-    
-    void
-    EDAnalyzerBase::prevalidate(ConfigurationDescriptions& iConfig) {
-      edmodule_mightGet_config(iConfig);
-    }
-    
-    void
-    EDAnalyzerBase::registerProductsAndCallbacks(EDAnalyzerBase*, ProductRegistry* reg) {
-      
+
+    void EDAnalyzerBase::prevalidate(ConfigurationDescriptions& iConfig) { edmodule_mightGet_config(iConfig); }
+
+    void EDAnalyzerBase::registerProductsAndCallbacks(EDAnalyzerBase*, ProductRegistry* reg) {
       if (callWhenNewProductsRegistered_) {
-        
         reg->callForEachBranch(callWhenNewProductsRegistered_);
-        
+
         Service<ConstProductRegistry> regService;
         regService->watchProductAdditions(callWhenNewProductsRegistered_);
       }
     }
     static const std::string kBaseType("EDAnalyzer");
-    
-    const std::string&
-    EDAnalyzerBase::baseType() {
-      return kBaseType;
-    }
 
-  }
-}
+    const std::string& EDAnalyzerBase::baseType() { return kBaseType; }
+
+  }  // namespace global
+}  // namespace edm
diff --git a/FWCore/Framework/src/global/EDFilterBase.cc b/FWCore/Framework/src/global/EDFilterBase.cc
index 917dd10ba5f5c..fa0be6d0e6677 100644
--- a/FWCore/Framework/src/global/EDFilterBase.cc
+++ b/FWCore/Framework/src/global/EDFilterBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     global::EDFilterBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -26,7 +26,6 @@
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -38,56 +37,47 @@ namespace edm {
     //
     // static data member definitions
     //
-    
+
     //
     // constructors and destructor
     //
-    EDFilterBase::EDFilterBase():
-    ProducerBase(),
-    moduleDescription_(),
-    previousParentages_(),
-    previousParentageIds_() { }
-    
-    EDFilterBase::~EDFilterBase()
-    {
-    }
-    
-    bool
-    EDFilterBase::doEvent(EventPrincipal const& ep, EventSetupImpl const& ci,
-                          ActivityRegistry* act,
-                          ModuleCallingContext const* mcc) {
+    EDFilterBase::EDFilterBase()
+        : ProducerBase(), moduleDescription_(), previousParentages_(), previousParentageIds_() {}
+
+    EDFilterBase::~EDFilterBase() {}
+
+    bool EDFilterBase::doEvent(EventPrincipal const& ep,
+                               EventSetupImpl const& ci,
+                               ActivityRegistry* act,
+                               ModuleCallingContext const* mcc) {
       Event e(ep, moduleDescription_, mcc);
       e.setConsumer(this);
-      const auto streamIndex =e.streamID().value();
-      e.setProducer(this,
-                    &previousParentages_[streamIndex],
-                    hasAcquire() ? &gotBranchIDsFromAcquire_[streamIndex] : nullptr);
-      EventSignalsSentry sentry(act,mcc);
-      const EventSetup c{ci};
+      const auto streamIndex = e.streamID().value();
+      e.setProducer(
+          this, &previousParentages_[streamIndex], hasAcquire() ? &gotBranchIDsFromAcquire_[streamIndex] : nullptr);
+      EventSignalsSentry sentry(act, mcc);
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event)};
       bool returnValue = this->filter(e.streamID(), e, c);
       commit_(e, &previousParentageIds_[streamIndex]);
       return returnValue;
     }
-    
-    void
-    EDFilterBase::doAcquire(EventPrincipal const& ep, EventSetupImpl const& ci,
-                            ActivityRegistry* act,
-                            ModuleCallingContext const* mcc,
-                            WaitingTaskWithArenaHolder& holder) {
+
+    void EDFilterBase::doAcquire(EventPrincipal const& ep,
+                                 EventSetupImpl const& ci,
+                                 ActivityRegistry* act,
+                                 ModuleCallingContext const* mcc,
+                                 WaitingTaskWithArenaHolder& holder) {
       Event e(ep, moduleDescription_, mcc);
       e.setConsumer(this);
       const auto streamIndex = e.streamID().value();
-      e.setProducerForAcquire(this,
-                              nullptr,
-                              gotBranchIDsFromAcquire_[streamIndex]);
-      EventAcquireSignalsSentry sentry(act,mcc);
-      const EventSetup c{ci};
+      e.setProducerForAcquire(this, nullptr, gotBranchIDsFromAcquire_[streamIndex]);
+      EventAcquireSignalsSentry sentry(act, mcc);
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event)};
       this->doAcquire_(e.streamID(), e, c, holder);
     }
 
-    void
-    EDFilterBase::doPreallocate(PreallocationConfiguration const& iPrealloc) {
-      const auto nStreams =iPrealloc.numberOfStreams();
+    void EDFilterBase::doPreallocate(PreallocationConfiguration const& iPrealloc) {
+      const auto nStreams = iPrealloc.numberOfStreams();
       previousParentages_.reset(new std::vector<BranchID>[nStreams]);
       if (hasAcquire()) {
         gotBranchIDsFromAcquire_.reset(new std::vector<BranchID>[nStreams]);
@@ -98,160 +88,144 @@ namespace edm {
       preallocate(iPrealloc);
     }
 
-    void
-    EDFilterBase::doBeginJob() {
-      this->beginJob();
-    }
-    
-    void
-    EDFilterBase::doEndJob() {
-      this->endJob();
-    }
-    
-    void
-    EDFilterBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                             ModuleCallingContext const* mcc) {
+    void EDFilterBase::doBeginJob() { this->beginJob(); }
+
+    void EDFilterBase::doEndJob() { this->endJob(); }
+
+    void EDFilterBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, false);
       r.setConsumer(this);
       Run const& cnstR = r;
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun)};
       this->doBeginRun_(cnstR, c);
       this->doBeginRunSummary_(cnstR, c);
       r.setProducer(this);
-      this->doBeginRunProduce_(r,c);
+      this->doBeginRunProduce_(r, c);
       commit_(r);
     }
-    
-    void
-    EDFilterBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                           ModuleCallingContext const* mcc) {
+
+    void EDFilterBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, true);
       r.setConsumer(this);
       r.setProducer(this);
       Run const& cnstR = r;
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun)};
       this->doEndRunProduce_(r, c);
-      this->doEndRunSummary_(r,c);
+      this->doEndRunSummary_(r, c);
       this->doEndRun_(cnstR, c);
       commit_(r);
     }
-    
-    void
-    EDFilterBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                         ModuleCallingContext const* mcc) {
+
+    void EDFilterBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                              EventSetupImpl const& ci,
+                                              ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
       lb.setConsumer(this);
       LuminosityBlock const& cnstLb = lb;
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                         esGetTokenIndices(Transition::BeginLuminosityBlock)};
       this->doBeginLuminosityBlock_(cnstLb, c);
       this->doBeginLuminosityBlockSummary_(cnstLb, c);
       lb.setProducer(this);
       this->doBeginLuminosityBlockProduce_(lb, c);
       commit_(lb);
     }
-    
-    void
-    EDFilterBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                       ModuleCallingContext const* mcc) {
+
+    void EDFilterBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                            EventSetupImpl const& ci,
+                                            ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
       lb.setProducer(this);
       LuminosityBlock const& cnstLb = lb;
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                         esGetTokenIndices(Transition::EndLuminosityBlock)};
       this->doEndLuminosityBlockProduce_(lb, c);
-      this->doEndLuminosityBlockSummary_(cnstLb,c);
+      this->doEndLuminosityBlockSummary_(cnstLb, c);
       this->doEndLuminosityBlock_(cnstLb, c);
       commit_(lb);
     }
-    
-    void
-    EDFilterBase::doBeginStream(StreamID id) {
-      doBeginStream_(id);
-    }
-    void
-    EDFilterBase::doEndStream(StreamID id) {
-      doEndStream_(id);
-    }
-    void
-    EDFilterBase::doStreamBeginRun(StreamID id,
-                                     RunPrincipal const& rp,
-                                     EventSetupImpl const& ci,
-                                     ModuleCallingContext const* mcc)
-    {
+
+    void EDFilterBase::doBeginStream(StreamID id) { doBeginStream_(id); }
+    void EDFilterBase::doEndStream(StreamID id) { doEndStream_(id); }
+    void EDFilterBase::doStreamBeginRun(StreamID id,
+                                        RunPrincipal const& rp,
+                                        EventSetupImpl const& ci,
+                                        ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, false);
       r.setConsumer(this);
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun)};
       this->doStreamBeginRun_(id, r, c);
     }
-    void
-    EDFilterBase::doStreamEndRun(StreamID id,
-                                   RunPrincipal const& rp,
-                                   EventSetupImpl const& ci,
-                                   ModuleCallingContext const* mcc) {
+    void EDFilterBase::doStreamEndRun(StreamID id,
+                                      RunPrincipal const& rp,
+                                      EventSetupImpl const& ci,
+                                      ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, true);
       r.setConsumer(this);
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun)};
       this->doStreamEndRun_(id, r, c);
       this->doStreamEndRunSummary_(id, r, c);
     }
-    void
-    EDFilterBase::doStreamBeginLuminosityBlock(StreamID id,
-                                                 LuminosityBlockPrincipal const& lbp,
-                                                 EventSetupImpl const& ci,
-                                                 ModuleCallingContext const* mcc) {
-      LuminosityBlock lb(lbp, moduleDescription_, mcc, false );
+    void EDFilterBase::doStreamBeginLuminosityBlock(StreamID id,
+                                                    LuminosityBlockPrincipal const& lbp,
+                                                    EventSetupImpl const& ci,
+                                                    ModuleCallingContext const* mcc) {
+      LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
       lb.setConsumer(this);
-      const EventSetup c{ci};
-      this->doStreamBeginLuminosityBlock_(id,lb, c);
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                         esGetTokenIndices(Transition::BeginLuminosityBlock)};
+      this->doStreamBeginLuminosityBlock_(id, lb, c);
     }
-    
-    void
-    EDFilterBase::doStreamEndLuminosityBlock(StreamID id,
-                                               LuminosityBlockPrincipal const& lbp,
-                                               EventSetupImpl const& ci,
-                                               ModuleCallingContext const* mcc) {
+
+    void EDFilterBase::doStreamEndLuminosityBlock(StreamID id,
+                                                  LuminosityBlockPrincipal const& lbp,
+                                                  EventSetupImpl const& ci,
+                                                  ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
-      const EventSetup c{ci};
-      this->doStreamEndLuminosityBlock_(id,lb, c);
-      this->doStreamEndLuminosityBlockSummary_(id,lb, c);
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                         esGetTokenIndices(Transition::EndLuminosityBlock)};
+      this->doStreamEndLuminosityBlock_(id, lb, c);
+      this->doStreamEndLuminosityBlockSummary_(id, lb, c);
     }
-    
-    
-    
-    void
-    EDFilterBase::doRespondToOpenInputFile(FileBlock const& fb) {
+
+    void EDFilterBase::doRespondToOpenInputFile(FileBlock const& fb) {
       //respondToOpenInputFile(fb);
     }
-    
-    void
-    EDFilterBase::doRespondToCloseInputFile(FileBlock const& fb) {
+
+    void EDFilterBase::doRespondToCloseInputFile(FileBlock const& fb) {
       //respondToCloseInputFile(fb);
     }
-    
+
     void EDFilterBase::preallocStreams(unsigned int) {}
     void EDFilterBase::preallocLumis(unsigned int) {}
     void EDFilterBase::preallocate(PreallocationConfiguration const&) {}
-    void EDFilterBase::doBeginStream_(StreamID id){}
+    void EDFilterBase::doBeginStream_(StreamID id) {}
     void EDFilterBase::doEndStream_(StreamID id) {}
     void EDFilterBase::doStreamBeginRun_(StreamID id, Run const& rp, EventSetup const& c) {}
     void EDFilterBase::doStreamEndRun_(StreamID id, Run const& rp, EventSetup const& c) {}
     void EDFilterBase::doStreamEndRunSummary_(StreamID id, Run const& rp, EventSetup const& c) {}
     void EDFilterBase::doStreamBeginLuminosityBlock_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDFilterBase::doStreamEndLuminosityBlock_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) {}
-    void EDFilterBase::doStreamEndLuminosityBlockSummary_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) {}
-    
-    
+    void EDFilterBase::doStreamEndLuminosityBlockSummary_(StreamID id,
+                                                          LuminosityBlock const& lbp,
+                                                          EventSetup const& c) {}
+
     void EDFilterBase::doBeginRun_(Run const& rp, EventSetup const& c) {}
     void EDFilterBase::doEndRun_(Run const& rp, EventSetup const& c) {}
     void EDFilterBase::doBeginRunSummary_(Run const& rp, EventSetup const& c) {}
     void EDFilterBase::doEndRunSummary_(Run const& rp, EventSetup const& c) {}
-    
+
     void EDFilterBase::doBeginLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDFilterBase::doEndLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDFilterBase::doBeginLuminosityBlockSummary_(LuminosityBlock const& rp, EventSetup const& c) {}
     void EDFilterBase::doEndLuminosityBlockSummary_(LuminosityBlock const& lb, EventSetup const& c) {}
-    
+
     void EDFilterBase::doBeginRunProduce_(Run& rp, EventSetup const& c) {}
     void EDFilterBase::doEndRunProduce_(Run& rp, EventSetup const& c) {}
     void EDFilterBase::doBeginLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c) {}
@@ -259,24 +233,17 @@ namespace edm {
 
     void EDFilterBase::doAcquire_(StreamID, Event const&, EventSetup const&, WaitingTaskWithArenaHolder&) {}
 
-    void
-    EDFilterBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
+    void EDFilterBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
       ParameterSetDescription desc;
       desc.setUnknown();
       descriptions.addDefault(desc);
     }
-    
-    void
-    EDFilterBase::prevalidate(ConfigurationDescriptions& iConfig) {
-      edmodule_mightGet_config(iConfig);
-    }
-    
+
+    void EDFilterBase::prevalidate(ConfigurationDescriptions& iConfig) { edmodule_mightGet_config(iConfig); }
+
     static const std::string kBaseType("EDFilter");
-    
-    const std::string&
-    EDFilterBase::baseType() {
-      return kBaseType;
-    }
 
-  }
-}
+    const std::string& EDFilterBase::baseType() { return kBaseType; }
+
+  }  // namespace global
+}  // namespace edm
diff --git a/FWCore/Framework/src/global/EDProducerBase.cc b/FWCore/Framework/src/global/EDProducerBase.cc
index 03c05d461d204..e6b40cb39ec43 100644
--- a/FWCore/Framework/src/global/EDProducerBase.cc
+++ b/FWCore/Framework/src/global/EDProducerBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     global::EDProducerBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -26,7 +26,6 @@
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -38,218 +37,203 @@ namespace edm {
     //
     // static data member definitions
     //
-    
+
     //
     // constructors and destructor
     //
-    EDProducerBase::EDProducerBase():
-    ProducerBase(),
-    moduleDescription_(),
-    previousParentages_(),
-    gotBranchIDsFromAcquire_(),
-    previousParentageIds_() { }
-    
-    EDProducerBase::~EDProducerBase()
-    {
-    }
-    
-    bool
-    EDProducerBase::doEvent(EventPrincipal const& ep, EventSetupImpl const& c,
-                            ActivityRegistry* act,
-                            ModuleCallingContext const* mcc) {
+    EDProducerBase::EDProducerBase()
+        : ProducerBase(),
+          moduleDescription_(),
+          previousParentages_(),
+          gotBranchIDsFromAcquire_(),
+          previousParentageIds_() {}
+
+    EDProducerBase::~EDProducerBase() {}
+
+    bool EDProducerBase::doEvent(EventPrincipal const& ep,
+                                 EventSetupImpl const& c,
+                                 ActivityRegistry* act,
+                                 ModuleCallingContext const* mcc) {
       Event e(ep, moduleDescription_, mcc);
       e.setConsumer(this);
       const auto streamIndex = e.streamID().value();
-      e.setProducer(this,
-                    &previousParentages_[streamIndex],
-                    hasAcquire() ? &gotBranchIDsFromAcquire_[streamIndex] : nullptr);
-      EventSignalsSentry sentry(act,mcc);
-      this->produce(e.streamID(), e, EventSetup{c});
+      e.setProducer(
+          this, &previousParentages_[streamIndex], hasAcquire() ? &gotBranchIDsFromAcquire_[streamIndex] : nullptr);
+      EventSignalsSentry sentry(act, mcc);
+      this->produce(e.streamID(),
+                    e,
+                    EventSetup{c, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event)});
       commit_(e, &previousParentageIds_[streamIndex]);
       return true;
     }
 
-    void
-    EDProducerBase::doAcquire(EventPrincipal const& ep, EventSetupImpl const& ci,
-                              ActivityRegistry* act,
-                              ModuleCallingContext const* mcc,
-                              WaitingTaskWithArenaHolder& holder) {
+    void EDProducerBase::doAcquire(EventPrincipal const& ep,
+                                   EventSetupImpl const& ci,
+                                   ActivityRegistry* act,
+                                   ModuleCallingContext const* mcc,
+                                   WaitingTaskWithArenaHolder& holder) {
       Event e(ep, moduleDescription_, mcc);
       e.setConsumer(this);
       const auto streamIndex = e.streamID().value();
-      e.setProducerForAcquire(this,
-                              nullptr,
-                              gotBranchIDsFromAcquire_[streamIndex]);
-      EventAcquireSignalsSentry sentry(act,mcc);
-      const EventSetup c{ci};
+      e.setProducerForAcquire(this, nullptr, gotBranchIDsFromAcquire_[streamIndex]);
+      EventAcquireSignalsSentry sentry(act, mcc);
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event)};
       this->doAcquire_(e.streamID(), e, c, holder);
     }
 
-    void
-    EDProducerBase::doPreallocate(PreallocationConfiguration const& iPrealloc) {
+    void EDProducerBase::doPreallocate(PreallocationConfiguration const& iPrealloc) {
       auto const nStreams = iPrealloc.numberOfStreams();
       previousParentages_.reset(new std::vector<BranchID>[nStreams]);
       if (hasAcquire()) {
         gotBranchIDsFromAcquire_.reset(new std::vector<BranchID>[nStreams]);
       }
-      previousParentageIds_.reset( new ParentageID[nStreams]);
+      previousParentageIds_.reset(new ParentageID[nStreams]);
       preallocStreams(nStreams);
       preallocLumis(iPrealloc.numberOfLuminosityBlocks());
       preallocate(iPrealloc);
     }
-    
-    void
-    EDProducerBase::doBeginJob() {
-      this->beginJob();
-    }
-    
-    void
-    EDProducerBase::doEndJob() {
-      this->endJob();
-    }
-    
-    void
-    EDProducerBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                               ModuleCallingContext const* mcc) {
+
+    void EDProducerBase::doBeginJob() { this->beginJob(); }
+
+    void EDProducerBase::doEndJob() { this->endJob(); }
+
+    void EDProducerBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, false);
       r.setConsumer(this);
       Run const& cnstR = r;
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun)};
       this->doBeginRun_(cnstR, c);
       this->doBeginRunSummary_(cnstR, c);
       r.setProducer(this);
-      this->doBeginRunProduce_(r,c);
+      this->doBeginRunProduce_(r, c);
       commit_(r);
     }
-    
-    void
-    EDProducerBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                             ModuleCallingContext const* mcc) {
+
+    void EDProducerBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, true);
       r.setConsumer(this);
       r.setProducer(this);
       Run const& cnstR = r;
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun)};
       this->doEndRunProduce_(r, c);
-      this->doEndRunSummary_(r,c);
+      this->doEndRunSummary_(r, c);
       this->doEndRun_(cnstR, c);
       commit_(r);
     }
-    
-    void
-    EDProducerBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                           ModuleCallingContext const* mcc) {
+
+    void EDProducerBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                                EventSetupImpl const& ci,
+                                                ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
       lb.setConsumer(this);
       LuminosityBlock const& cnstLb = lb;
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                         esGetTokenIndices(Transition::BeginLuminosityBlock)};
       this->doBeginLuminosityBlock_(cnstLb, c);
       this->doBeginLuminosityBlockSummary_(cnstLb, c);
       lb.setProducer(this);
       this->doBeginLuminosityBlockProduce_(lb, c);
       commit_(lb);
     }
-    
-    void
-    EDProducerBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                         ModuleCallingContext const* mcc) {
+
+    void EDProducerBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                              EventSetupImpl const& ci,
+                                              ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
       lb.setProducer(this);
       LuminosityBlock const& cnstLb = lb;
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                         esGetTokenIndices(Transition::EndLuminosityBlock)};
       this->doEndLuminosityBlockProduce_(lb, c);
-      this->doEndLuminosityBlockSummary_(cnstLb,c);
+      this->doEndLuminosityBlockSummary_(cnstLb, c);
       this->doEndLuminosityBlock_(cnstLb, c);
       commit_(lb);
     }
-    
-    void
-    EDProducerBase::doBeginStream(StreamID id) {
-      doBeginStream_(id);
-    }
-    void
-    EDProducerBase::doEndStream(StreamID id) {
-      doEndStream_(id);
-    }
-    void
-    EDProducerBase::doStreamBeginRun(StreamID id,
-                                     RunPrincipal const& rp,
-                                     EventSetupImpl const& c,
-                                     ModuleCallingContext const* mcc)
-    {
+
+    void EDProducerBase::doBeginStream(StreamID id) { doBeginStream_(id); }
+    void EDProducerBase::doEndStream(StreamID id) { doEndStream_(id); }
+    void EDProducerBase::doStreamBeginRun(StreamID id,
+                                          RunPrincipal const& rp,
+                                          EventSetupImpl const& c,
+                                          ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, false);
       r.setConsumer(this);
-      this->doStreamBeginRun_(id, r, EventSetup{c});
+      this->doStreamBeginRun_(
+          id,
+          r,
+          EventSetup{c, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun)});
     }
-    void
-    EDProducerBase::doStreamEndRun(StreamID id,
-                                   RunPrincipal const& rp,
-                                   EventSetupImpl const& ci,
-                                   ModuleCallingContext const* mcc) {
+    void EDProducerBase::doStreamEndRun(StreamID id,
+                                        RunPrincipal const& rp,
+                                        EventSetupImpl const& ci,
+                                        ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, true);
       r.setConsumer(this);
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun)};
       this->doStreamEndRun_(id, r, c);
       this->doStreamEndRunSummary_(id, r, c);
     }
-    void
-    EDProducerBase::doStreamBeginLuminosityBlock(StreamID id,
-                                                 LuminosityBlockPrincipal const& lbp,
-                                                 EventSetupImpl const& c,
-                                                 ModuleCallingContext const* mcc) {
+    void EDProducerBase::doStreamBeginLuminosityBlock(StreamID id,
+                                                      LuminosityBlockPrincipal const& lbp,
+                                                      EventSetupImpl const& c,
+                                                      ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
       lb.setConsumer(this);
-      this->doStreamBeginLuminosityBlock_(id,lb, EventSetup{c});
+      this->doStreamBeginLuminosityBlock_(id,
+                                          lb,
+                                          EventSetup{c,
+                                                     static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                                                     esGetTokenIndices(Transition::BeginLuminosityBlock)});
     }
-    
-    void
-    EDProducerBase::doStreamEndLuminosityBlock(StreamID id,
-                                               LuminosityBlockPrincipal const& lbp,
-                                               EventSetupImpl const& ci,
-                                               ModuleCallingContext const* mcc) {
+
+    void EDProducerBase::doStreamEndLuminosityBlock(StreamID id,
+                                                    LuminosityBlockPrincipal const& lbp,
+                                                    EventSetupImpl const& ci,
+                                                    ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
-      const EventSetup c{ci};
-      this->doStreamEndLuminosityBlock_(id,lb, c);
-      this->doStreamEndLuminosityBlockSummary_(id,lb, c);
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                         esGetTokenIndices(Transition::EndLuminosityBlock)};
+      this->doStreamEndLuminosityBlock_(id, lb, c);
+      this->doStreamEndLuminosityBlockSummary_(id, lb, c);
     }
-    
-    
-    
-    void
-    EDProducerBase::doRespondToOpenInputFile(FileBlock const& fb) {
+
+    void EDProducerBase::doRespondToOpenInputFile(FileBlock const& fb) {
       //respondToOpenInputFile(fb);
     }
-    
-    void
-    EDProducerBase::doRespondToCloseInputFile(FileBlock const& fb) {
+
+    void EDProducerBase::doRespondToCloseInputFile(FileBlock const& fb) {
       //respondToCloseInputFile(fb);
     }
-    
+
     void EDProducerBase::preallocStreams(unsigned int) {}
     void EDProducerBase::preallocLumis(unsigned int) {}
     void EDProducerBase::preallocate(PreallocationConfiguration const&) {}
-    void EDProducerBase::doBeginStream_(StreamID id){}
+    void EDProducerBase::doBeginStream_(StreamID id) {}
     void EDProducerBase::doEndStream_(StreamID id) {}
     void EDProducerBase::doStreamBeginRun_(StreamID id, Run const& rp, EventSetup const& c) {}
     void EDProducerBase::doStreamEndRun_(StreamID id, Run const& rp, EventSetup const& c) {}
     void EDProducerBase::doStreamEndRunSummary_(StreamID id, Run const& rp, EventSetup const& c) {}
     void EDProducerBase::doStreamBeginLuminosityBlock_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDProducerBase::doStreamEndLuminosityBlock_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) {}
-    void EDProducerBase::doStreamEndLuminosityBlockSummary_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) {}
-    
-    
+    void EDProducerBase::doStreamEndLuminosityBlockSummary_(StreamID id,
+                                                            LuminosityBlock const& lbp,
+                                                            EventSetup const& c) {}
+
     void EDProducerBase::doBeginRun_(Run const& rp, EventSetup const& c) {}
     void EDProducerBase::doEndRun_(Run const& rp, EventSetup const& c) {}
     void EDProducerBase::doBeginRunSummary_(Run const& rp, EventSetup const& c) {}
     void EDProducerBase::doEndRunSummary_(Run const& rp, EventSetup const& c) {}
-    
+
     void EDProducerBase::doBeginLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDProducerBase::doEndLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDProducerBase::doBeginLuminosityBlockSummary_(LuminosityBlock const& rp, EventSetup const& c) {}
     void EDProducerBase::doEndLuminosityBlockSummary_(LuminosityBlock const& lb, EventSetup const& c) {}
-    
+
     void EDProducerBase::doBeginRunProduce_(Run& rp, EventSetup const& c) {}
     void EDProducerBase::doEndRunProduce_(Run& rp, EventSetup const& c) {}
     void EDProducerBase::doBeginLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c) {}
@@ -257,24 +241,17 @@ namespace edm {
 
     void EDProducerBase::doAcquire_(StreamID, Event const&, EventSetup const&, WaitingTaskWithArenaHolder&) {}
 
-    void
-    EDProducerBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
+    void EDProducerBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
       ParameterSetDescription desc;
       desc.setUnknown();
       descriptions.addDefault(desc);
     }
-    
-    void
-    EDProducerBase::prevalidate(ConfigurationDescriptions& iConfig) {
-      edmodule_mightGet_config(iConfig);
-    }
-    
+
+    void EDProducerBase::prevalidate(ConfigurationDescriptions& iConfig) { edmodule_mightGet_config(iConfig); }
+
     static const std::string kBaseType("EDProducer");
-    
-    const std::string&
-    EDProducerBase::baseType() {
-      return kBaseType;
-    }
 
-  }
-}
+    const std::string& EDProducerBase::baseType() { return kBaseType; }
+
+  }  // namespace global
+}  // namespace edm
diff --git a/FWCore/Framework/src/global/OutputModuleBase.cc b/FWCore/Framework/src/global/OutputModuleBase.cc
index ffc1e5f8b3630..dbb6e4200b261 100644
--- a/FWCore/Framework/src/global/OutputModuleBase.cc
+++ b/FWCore/Framework/src/global/OutputModuleBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     OutputModuleBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -35,83 +35,76 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/DebugMacros.h"
 
-
 namespace edm {
   namespace global {
 
     // -------------------------------------------------------
-    OutputModuleBase::OutputModuleBase(ParameterSet const& pset) :
-    maxEvents_(-1),
-    remainingEvents_(maxEvents_),
-    keptProducts_(),
-    hasNewlyDroppedBranch_(),
-    process_name_(),
-    productSelectorRules_(pset, "outputCommands", "OutputModule"),
-    productSelector_(),
-    moduleDescription_(),
-    wantAllEvents_(false),
-    selectors_(),
-    selector_config_id_(),
-    droppedBranchIDToKeptBranchID_(),
-    branchIDLists_(new BranchIDLists),
-    origBranchIDLists_(nullptr),
-    thinnedAssociationsHelper_(new ThinnedAssociationsHelper) {
-      
+    OutputModuleBase::OutputModuleBase(ParameterSet const& pset)
+        : maxEvents_(-1),
+          remainingEvents_(maxEvents_),
+          keptProducts_(),
+          hasNewlyDroppedBranch_(),
+          process_name_(),
+          productSelectorRules_(pset, "outputCommands", "OutputModule"),
+          productSelector_(),
+          moduleDescription_(),
+          wantAllEvents_(false),
+          selectors_(),
+          selector_config_id_(),
+          droppedBranchIDToKeptBranchID_(),
+          branchIDLists_(new BranchIDLists),
+          origBranchIDLists_(nullptr),
+          thinnedAssociationsHelper_(new ThinnedAssociationsHelper) {
       hasNewlyDroppedBranch_.fill(false);
-      
+
       Service<service::TriggerNamesService> tns;
       process_name_ = tns->getProcessName();
-      
-      selectEvents_ =
-      pset.getUntrackedParameterSet("SelectEvents", ParameterSet());
-      
-      selectEvents_.registerIt(); // Just in case this PSet is not registered
-      
+
+      selectEvents_ = pset.getUntrackedParameterSet("SelectEvents", ParameterSet());
+
+      selectEvents_.registerIt();  // Just in case this PSet is not registered
+
       selector_config_id_ = selectEvents_.id();
-      
+
       //need to set wantAllEvents_ in constructor
       // we will make the remaining selectors once we know how many streams
       selectors_.resize(1);
-      wantAllEvents_ = detail::configureEventSelector(selectEvents_,
-                                                      process_name_,
-                                                      getAllTriggerNames(),
-                                                      selectors_[0],
-                                                      consumesCollector());
-
+      wantAllEvents_ = detail::configureEventSelector(
+          selectEvents_, process_name_, getAllTriggerNames(), selectors_[0], consumesCollector());
     }
-    
+
     void OutputModuleBase::configure(OutputModuleDescription const& desc) {
       remainingEvents_ = maxEvents_ = desc.maxEvents_;
       origBranchIDLists_ = desc.branchIDLists_;
     }
-    
+
     void OutputModuleBase::selectProducts(ProductRegistry const& preg,
                                           ThinnedAssociationsHelper const& thinnedAssociationsHelper) {
-      if(productSelector_.initialized()) return;
+      if (productSelector_.initialized())
+        return;
       productSelector_.initialize(productSelectorRules_, preg.allBranchDescriptions());
-      
+
       // TODO: See if we can collapse keptProducts_ and productSelector_ into a
       // single object. See the notes in the header for ProductSelector
       // for more information.
-      
+
       std::map<BranchID, BranchDescription const*> trueBranchIDToKeptBranchDesc;
       std::vector<BranchDescription const*> associationDescriptions;
       std::set<BranchID> keptProductsInEvent;
       std::set<std::string> processesWithSelectedMergeableRunProducts;
 
-      for(auto const& it : preg.productList()) {
+      for (auto const& it : preg.productList()) {
         BranchDescription const& desc = it.second;
-        if(desc.transient()) {
+        if (desc.transient()) {
           // if the class of the branch is marked transient, output nothing
-        } else if(!desc.present() && !desc.produced()) {
+        } else if (!desc.present() && !desc.produced()) {
           // else if the branch containing the product has been previously dropped,
           // output nothing
-        } else if(desc.unwrappedType() == typeid(ThinnedAssociation)) {
+        } else if (desc.unwrappedType() == typeid(ThinnedAssociation)) {
           associationDescriptions.push_back(&desc);
-        } else if(selected(desc)) {
+        } else if (selected(desc)) {
           keepThisBranch(desc, trueBranchIDToKeptBranchDesc, keptProductsInEvent);
-          insertSelectedProcesses(desc,
-                                  processesWithSelectedMergeableRunProducts);
+          insertSelectedProcesses(desc, processesWithSelectedMergeableRunProducts);
         } else {
           // otherwise, output nothing,
           // and mark the fact that there is a newly dropped branch of this type.
@@ -121,12 +114,11 @@ namespace edm {
 
       setProcessesWithSelectedMergeableRunProducts(processesWithSelectedMergeableRunProducts);
 
-      thinnedAssociationsHelper.selectAssociationProducts(associationDescriptions,
-                                                          keptProductsInEvent,
-                                                          keepAssociation_);
+      thinnedAssociationsHelper.selectAssociationProducts(
+          associationDescriptions, keptProductsInEvent, keepAssociation_);
 
-      for(auto association : associationDescriptions) {
-        if(keepAssociation_[association->branchID()]) {
+      for (auto association : associationDescriptions) {
+        if (keepAssociation_[association->branchID()]) {
           keepThisBranch(*association, trueBranchIDToKeptBranchDesc, keptProductsInEvent);
         } else {
           hasNewlyDroppedBranch_[association->branchType()] = true;
@@ -136,20 +128,22 @@ namespace edm {
       // Now fill in a mapping needed in the case that a branch was dropped while its EDAlias was kept.
       ProductSelector::fillDroppedToKept(preg, trueBranchIDToKeptBranchDesc, droppedBranchIDToKeptBranchID_);
 
-      thinnedAssociationsHelper_->updateFromParentProcess(thinnedAssociationsHelper, keepAssociation_, droppedBranchIDToKeptBranchID_);
+      thinnedAssociationsHelper_->updateFromParentProcess(
+          thinnedAssociationsHelper, keepAssociation_, droppedBranchIDToKeptBranchID_);
     }
 
     void OutputModuleBase::updateBranchIDListsWithKeptAliases() {
-      if(!droppedBranchIDToKeptBranchID_.empty()) {
+      if (!droppedBranchIDToKeptBranchID_.empty()) {
         // Make a private copy of the BranchIDLists.
         *branchIDLists_ = *origBranchIDLists_;
         // Check for branches dropped while an EDAlias was kept.
-        for(BranchIDList& branchIDList : *branchIDLists_) {
-          for(BranchID::value_type& branchID : branchIDList) {
+        for (BranchIDList& branchIDList : *branchIDLists_) {
+          for (BranchID::value_type& branchID : branchIDList) {
             // Replace BranchID of each dropped branch with that of the kept
             // alias, so the alias branch will have the product ID of the original branch.
-            std::map<BranchID::value_type, BranchID::value_type>::const_iterator iter = droppedBranchIDToKeptBranchID_.find(branchID);
-            if(iter != droppedBranchIDToKeptBranchID_.end()) {
+            std::map<BranchID::value_type, BranchID::value_type>::const_iterator iter =
+                droppedBranchIDToKeptBranchID_.find(branchID);
+            if (iter != droppedBranchIDToKeptBranchID_.end()) {
               branchID = iter->second;
             }
           }
@@ -158,65 +152,50 @@ namespace edm {
     }
 
     void OutputModuleBase::keepThisBranch(BranchDescription const& desc,
-                        std::map<BranchID, BranchDescription const*>& trueBranchIDToKeptBranchDesc,
-                        std::set<BranchID>& keptProductsInEvent) {
-
-      ProductSelector::checkForDuplicateKeptBranch(desc,
-                                                   trueBranchIDToKeptBranchDesc);
+                                          std::map<BranchID, BranchDescription const*>& trueBranchIDToKeptBranchDesc,
+                                          std::set<BranchID>& keptProductsInEvent) {
+      ProductSelector::checkForDuplicateKeptBranch(desc, trueBranchIDToKeptBranchDesc);
 
       EDGetToken token;
       switch (desc.branchType()) {
-      case InEvent:
-        {
-          if(desc.produced()) {
+        case InEvent: {
+          if (desc.produced()) {
             keptProductsInEvent.insert(desc.originalBranchID());
           } else {
             keptProductsInEvent.insert(desc.branchID());
           }
-          token = consumes(TypeToGet{desc.unwrappedTypeID(),PRODUCT_TYPE},
-                       InputTag{desc.moduleLabel(),
-                       desc.productInstanceName(),
-                       desc.processName()});
+          token = consumes(TypeToGet{desc.unwrappedTypeID(), PRODUCT_TYPE},
+                           InputTag{desc.moduleLabel(), desc.productInstanceName(), desc.processName()});
           break;
         }
-      case InLumi:
-        {
-          token = consumes<InLumi>(TypeToGet{desc.unwrappedTypeID(),PRODUCT_TYPE},
-                                    InputTag(desc.moduleLabel(),
-                                    desc.productInstanceName(),
-                                    desc.processName()));
+        case InLumi: {
+          token = consumes<InLumi>(TypeToGet{desc.unwrappedTypeID(), PRODUCT_TYPE},
+                                   InputTag(desc.moduleLabel(), desc.productInstanceName(), desc.processName()));
           break;
         }
-      case InRun:
-        {
-          token = consumes<InRun>(TypeToGet{desc.unwrappedTypeID(),PRODUCT_TYPE},
-                                   InputTag(desc.moduleLabel(),
-                                   desc.productInstanceName(),
-                                   desc.processName()));
+        case InRun: {
+          token = consumes<InRun>(TypeToGet{desc.unwrappedTypeID(), PRODUCT_TYPE},
+                                  InputTag(desc.moduleLabel(), desc.productInstanceName(), desc.processName()));
           break;
         }
-      default:
-        assert(false);
-        break;
+        default:
+          assert(false);
+          break;
       }
       // Now put it in the list of selected branches.
       keptProducts_[desc.branchType()].push_back(std::make_pair(&desc, token));
     }
 
-    OutputModuleBase::~OutputModuleBase() { }
-    
+    OutputModuleBase::~OutputModuleBase() {}
+
     void OutputModuleBase::doPreallocate(PreallocationConfiguration const& iPC) {
       auto nstreams = iPC.numberOfStreams();
       selectors_.resize(nstreams);
-      
+
       bool seenFirst = false;
-      for(auto& s : selectors_) {
-        if(seenFirst) {
-          detail::configureEventSelector(selectEvents_,
-                                         process_name_,
-                                         getAllTriggerNames(),
-                                         s,
-                                         consumesCollector());
+      for (auto& s : selectors_) {
+        if (seenFirst) {
+          detail::configureEventSelector(selectEvents_, process_name_, getAllTriggerNames(), s, consumesCollector());
         } else {
           seenFirst = true;
         }
@@ -226,58 +205,52 @@ namespace edm {
       preallocate(iPC);
     }
 
-    void OutputModuleBase::doBeginJob() {
-      this->beginJob();
-    }
-    
-    void OutputModuleBase::doEndJob() {
-      endJob();
-    }
-    
-    bool OutputModuleBase::needToRunSelection() const {
-      return !wantAllEvents_;
-    }
+    void OutputModuleBase::doBeginJob() { this->beginJob(); }
 
-    std::vector<ProductResolverIndexAndSkipBit>
-    OutputModuleBase::productsUsedBySelection() const {
+    void OutputModuleBase::doEndJob() { endJob(); }
+
+    bool OutputModuleBase::needToRunSelection() const { return !wantAllEvents_; }
+
+    std::vector<ProductResolverIndexAndSkipBit> OutputModuleBase::productsUsedBySelection() const {
       std::vector<ProductResolverIndexAndSkipBit> returnValue;
       auto const& s = selectors_[0];
       auto const n = s.numberOfTokens();
       returnValue.reserve(n);
-      
-      for(unsigned int i=0; i< n;++i) {
+
+      for (unsigned int i = 0; i < n; ++i) {
         returnValue.emplace_back(uncheckedIndexFrom(s.token(i)));
       }
       return returnValue;
     }
-    
-    bool OutputModuleBase::prePrefetchSelection(StreamID id, EventPrincipal const& ep, ModuleCallingContext const* mcc) {
-      if(wantAllEvents_) return true;
+
+    bool OutputModuleBase::prePrefetchSelection(StreamID id,
+                                                EventPrincipal const& ep,
+                                                ModuleCallingContext const* mcc) {
+      if (wantAllEvents_)
+        return true;
       auto& s = selectors_[id.value()];
       EventForOutput e(ep, moduleDescription_, mcc);
       e.setConsumer(this);
       return s.wantEvent(e);
     }
-    
-    bool
-    OutputModuleBase::doEvent(EventPrincipal const& ep,
-                              EventSetupImpl const&,
-                              ActivityRegistry* act,
-                              ModuleCallingContext const* mcc) {
-      
+
+    bool OutputModuleBase::doEvent(EventPrincipal const& ep,
+                                   EventSetupImpl const&,
+                                   ActivityRegistry* act,
+                                   ModuleCallingContext const* mcc) {
       {
-          EventForOutput e(ep, moduleDescription_, mcc);
-          e.setConsumer(this);
-          EventSignalsSentry sentry(act,mcc);
-          write(e);
+        EventForOutput e(ep, moduleDescription_, mcc);
+        e.setConsumer(this);
+        EventSignalsSentry sentry(act, mcc);
+        write(e);
       }
 
       auto remainingEvents = remainingEvents_.load();
       bool keepTrying = remainingEvents > 0;
-      while(keepTrying) {
+      while (keepTrying) {
         auto newValue = remainingEvents - 1;
         keepTrying = !remainingEvents_.compare_exchange_strong(remainingEvents, newValue);
-        if(keepTrying) { 
+        if (keepTrying) {
           // the exchange failed because the value was changed by another thread.
           // remainingEvents was changed to be the new value of remainingEvents_;
           keepTrying = remainingEvents > 0;
@@ -286,138 +259,108 @@ namespace edm {
       return true;
     }
 
-    bool
-    OutputModuleBase::doBeginRun(RunPrincipal const& rp,
-                                 EventSetupImpl const&,
-                                 ModuleCallingContext const* mcc) {
+    bool OutputModuleBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const&, ModuleCallingContext const* mcc) {
       RunForOutput r(rp, moduleDescription_, mcc, false);
       r.setConsumer(this);
       doBeginRun_(r);
       return true;
     }
-    
-    bool
-    OutputModuleBase::doEndRun(RunPrincipal const& rp,
-                               EventSetupImpl const&,
-                               ModuleCallingContext const* mcc) {
+
+    bool OutputModuleBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const&, ModuleCallingContext const* mcc) {
       RunForOutput r(rp, moduleDescription_, mcc, true);
       r.setConsumer(this);
       doEndRun_(r);
       return true;
     }
-    
-    void
-    OutputModuleBase::doWriteRun(RunPrincipal const& rp,
-                                 ModuleCallingContext const* mcc,
-                                 MergeableRunProductMetadata const* mrpm) {
+
+    void OutputModuleBase::doWriteRun(RunPrincipal const& rp,
+                                      ModuleCallingContext const* mcc,
+                                      MergeableRunProductMetadata const* mrpm) {
       RunForOutput r(rp, moduleDescription_, mcc, true, mrpm);
       r.setConsumer(this);
       writeRun(r);
     }
-    
-    bool
-    OutputModuleBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
-                                             EventSetupImpl const&,
-                                             ModuleCallingContext const* mcc) {
+
+    bool OutputModuleBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                                  EventSetupImpl const&,
+                                                  ModuleCallingContext const* mcc) {
       LuminosityBlockForOutput lb(lbp, moduleDescription_, mcc, false);
       lb.setConsumer(this);
       doBeginLuminosityBlock_(lb);
       return true;
     }
-    
-    bool
-    OutputModuleBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
-                                           EventSetupImpl const&,
-                                           ModuleCallingContext const* mcc) {
+
+    bool OutputModuleBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                                EventSetupImpl const&,
+                                                ModuleCallingContext const* mcc) {
       LuminosityBlockForOutput lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
       doEndLuminosityBlock_(lb);
       return true;
     }
-    
+
     void OutputModuleBase::doWriteLuminosityBlock(LuminosityBlockPrincipal const& lbp,
                                                   ModuleCallingContext const* mcc) {
       LuminosityBlockForOutput lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
       writeLuminosityBlock(lb);
     }
-    
-    void OutputModuleBase::doOpenFile(FileBlock const& fb) {
-      openFile(fb);
-    }
+
+    void OutputModuleBase::doOpenFile(FileBlock const& fb) { openFile(fb); }
 
     void OutputModuleBase::doRespondToOpenInputFile(FileBlock const& fb) {
       updateBranchIDListsWithKeptAliases();
       doRespondToOpenInputFile_(fb);
     }
-    
-    void OutputModuleBase::doRespondToCloseInputFile(FileBlock const& fb) {
-      doRespondToCloseInputFile_(fb);
-    }
-        
+
+    void OutputModuleBase::doRespondToCloseInputFile(FileBlock const& fb) { doRespondToCloseInputFile_(fb); }
+
     void OutputModuleBase::doCloseFile() {
-      if(isFileOpen()) {
+      if (isFileOpen()) {
         reallyCloseFile();
       }
     }
-    
-    void OutputModuleBase::reallyCloseFile() {
-    }
-    
-    BranchIDLists const*
-    OutputModuleBase::branchIDLists() const {
-      if(!droppedBranchIDToKeptBranchID_.empty()) {
+
+    void OutputModuleBase::reallyCloseFile() {}
+
+    BranchIDLists const* OutputModuleBase::branchIDLists() const {
+      if (!droppedBranchIDToKeptBranchID_.empty()) {
         return branchIDLists_.get();
       }
       return origBranchIDLists_;
     }
-    
-    ThinnedAssociationsHelper const*
-    OutputModuleBase::thinnedAssociationsHelper() const {
+
+    ThinnedAssociationsHelper const* OutputModuleBase::thinnedAssociationsHelper() const {
       return thinnedAssociationsHelper_.get();
     }
 
-    ModuleDescription const&
-    OutputModuleBase::description() const {
-      return moduleDescription_;
-    }
-    
-    bool
-    OutputModuleBase::selected(BranchDescription const& desc) const {
-      return productSelector_.selected(desc);
-    }
-    
-    void
-    OutputModuleBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
+    ModuleDescription const& OutputModuleBase::description() const { return moduleDescription_; }
+
+    bool OutputModuleBase::selected(BranchDescription const& desc) const { return productSelector_.selected(desc); }
+
+    void OutputModuleBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
       ParameterSetDescription desc;
       desc.setUnknown();
       descriptions.addDefault(desc);
     }
-    
-    void
-    OutputModuleBase::fillDescription(ParameterSetDescription& desc) {
+
+    void OutputModuleBase::fillDescription(ParameterSetDescription& desc) {
       ProductSelectorRules::fillDescription(desc, "outputCommands");
       EventSelector::fillDescription(desc);
     }
-    
-    void
-    OutputModuleBase::prevalidate(ConfigurationDescriptions& ) {
-    }
-    
-    
+
+    void OutputModuleBase::prevalidate(ConfigurationDescriptions&) {}
+
     static const std::string kBaseType("OutputModule");
-    const std::string&
-    OutputModuleBase::baseType() {
-      return kBaseType;
-    }
-    
-    void
-    OutputModuleBase::setEventSelectionInfo(std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
-                                        bool anyProductProduced) {
+    const std::string& OutputModuleBase::baseType() { return kBaseType; }
+
+    void OutputModuleBase::setEventSelectionInfo(
+        std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
+        bool anyProductProduced) {
       selector_config_id_ = detail::registerProperSelectionInfo(getParameterSet(selector_config_id_),
                                                                 description().moduleLabel(),
                                                                 outputModulePathPositions,
                                                                 anyProductProduced);
     }
-  }
-}
+  }  // namespace global
+}  // namespace edm
diff --git a/FWCore/Framework/src/global/filterImplementors.cc b/FWCore/Framework/src/global/filterImplementors.cc
index d1d1dd04cdaf9..7a71bdf4a7dc5 100644
--- a/FWCore/Framework/src/global/filterImplementors.cc
+++ b/FWCore/Framework/src/global/filterImplementors.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Package
 // Class  :     filterImplementors
-// 
+//
 // Implementation:
 //     Explicitly instantiate implementor templates for EDFilterBase
 //
@@ -24,6 +24,6 @@ namespace edm {
       template class BeginLuminosityBlockProducer<edm::global::EDFilterBase>;
       template class EndLuminosityBlockProducer<edm::global::EDFilterBase>;
       template class ExternalWork<edm::global::EDFilterBase>;
-    }
-  }
-}
+    }  // namespace impl
+  }    // namespace global
+}  // namespace edm
diff --git a/FWCore/Framework/src/global/implementorsMethods.h b/FWCore/Framework/src/global/implementorsMethods.h
index 252560b205167..3bdb7d281b5cd 100644
--- a/FWCore/Framework/src/global/implementorsMethods.h
+++ b/FWCore/Framework/src/global/implementorsMethods.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // File  :     implementorsMethods
-// 
+//
 /**\file implementorsMethods.h "FWCore/Framework/src/global/implementorsMethods.h"
 
  Description: [one line class summary]
@@ -29,33 +29,35 @@
 namespace edm {
   namespace global {
     namespace impl {
-      template< typename T>
+      template <typename T>
       void BeginRunProducer<T>::doBeginRunProduce_(Run& rp, EventSetup const& c) {
-        this->globalBeginRunProduce(rp,c);
+        this->globalBeginRunProduce(rp, c);
       }
 
-      template< typename T>
+      template <typename T>
       void EndRunProducer<T>::doEndRunProduce_(Run& rp, EventSetup const& c) {
-        this->globalEndRunProduce(rp,c);
+        this->globalEndRunProduce(rp, c);
       }
 
-      template< typename T>
+      template <typename T>
       void BeginLuminosityBlockProducer<T>::doBeginLuminosityBlockProduce_(LuminosityBlock& rp, EventSetup const& c) {
-        this->globalBeginLuminosityBlockProduce(rp,c);
+        this->globalBeginLuminosityBlockProduce(rp, c);
       }
-      
-      template< typename T>
+
+      template <typename T>
       void EndLuminosityBlockProducer<T>::doEndLuminosityBlockProduce_(LuminosityBlock& rp, EventSetup const& c) {
-        this->globalEndLuminosityBlockProduce(rp,c);
+        this->globalEndLuminosityBlockProduce(rp, c);
       }
 
-      template< typename T>
-      void ExternalWork<T>::doAcquire_(StreamID s, Event const& ev, edm::EventSetup const& es, WaitingTaskWithArenaHolder& holder) {
+      template <typename T>
+      void ExternalWork<T>::doAcquire_(StreamID s,
+                                       Event const& ev,
+                                       edm::EventSetup const& es,
+                                       WaitingTaskWithArenaHolder& holder) {
         this->acquire(s, ev, es, holder);
       }
-    }
-  }
-}
-
+    }  // namespace impl
+  }    // namespace global
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/global/outputmoduleImplementors.cc b/FWCore/Framework/src/global/outputmoduleImplementors.cc
index 0a5f2f9091440..e06fb4afadc54 100644
--- a/FWCore/Framework/src/global/outputmoduleImplementors.cc
+++ b/FWCore/Framework/src/global/outputmoduleImplementors.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     outputmoduleImplementors
-// 
+//
 // Implementation:
 //     Explicitly instantiate implementor templates for OutputModuleBase
 //
@@ -20,14 +20,8 @@ namespace edm {
 
   namespace global {
     namespace outputmodule {
-      void InputFileWatcher::doRespondToOpenInputFile_(FileBlock const& iB)
-      {
-        respondToOpenInputFile(iB);
-      }
-      void InputFileWatcher::doRespondToCloseInputFile_(FileBlock const& iB)
-      {
-        respondToCloseInputFile(iB);
-      }
-    }
-  }
-}
+      void InputFileWatcher::doRespondToOpenInputFile_(FileBlock const& iB) { respondToOpenInputFile(iB); }
+      void InputFileWatcher::doRespondToCloseInputFile_(FileBlock const& iB) { respondToCloseInputFile(iB); }
+    }  // namespace outputmodule
+  }    // namespace global
+}  // namespace edm
diff --git a/FWCore/Framework/src/global/producerImplementors.cc b/FWCore/Framework/src/global/producerImplementors.cc
index 6ba93954abb51..e35473a036580 100644
--- a/FWCore/Framework/src/global/producerImplementors.cc
+++ b/FWCore/Framework/src/global/producerImplementors.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Package
 // Class  :     producerImplementors
-// 
+//
 // Implementation:
 //     Explicitly instantiate implementor templates for EDProducerBase
 //
@@ -24,6 +24,6 @@ namespace edm {
       template class BeginLuminosityBlockProducer<edm::global::EDProducerBase>;
       template class EndLuminosityBlockProducer<edm::global::EDProducerBase>;
       template class ExternalWork<edm::global::EDProducerBase>;
-    }
-  }
-}
+    }  // namespace impl
+  }    // namespace global
+}  // namespace edm
diff --git a/FWCore/Framework/src/globalTransitionAsync.h b/FWCore/Framework/src/globalTransitionAsync.h
index 35cc50f6e1e3b..c6b69ef19d5b7 100644
--- a/FWCore/Framework/src/globalTransitionAsync.h
+++ b/FWCore/Framework/src/globalTransitionAsync.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Function:    globalTransitionAsync
-// 
+//
 /**\function globalTransitionAsync globalTransitionAsync.h "globalTransitionAsync.h"
 
  Description: Helper functions for handling asynchronous global transitions
@@ -33,90 +33,104 @@ namespace edm {
   class EventSetupImpl;
   class LuminosityBlockPrincipal;
   class RunPrincipal;
-  
+
   //This is code in common between beginStreamRun and beginGlobalLuminosityBlock
-  inline void subProcessDoGlobalBeginTransitionAsync(WaitingTaskHolder iHolder,SubProcess& iSubProcess, LuminosityBlockPrincipal& iPrincipal, IOVSyncValue const& iTS) {
-    iSubProcess.doBeginLuminosityBlockAsync(std::move(iHolder),iPrincipal, iTS);
+  inline void subProcessDoGlobalBeginTransitionAsync(WaitingTaskHolder iHolder,
+                                                     SubProcess& iSubProcess,
+                                                     LuminosityBlockPrincipal& iPrincipal,
+                                                     IOVSyncValue const& iTS) {
+    iSubProcess.doBeginLuminosityBlockAsync(std::move(iHolder), iPrincipal, iTS);
   }
-  
-  inline void subProcessDoGlobalBeginTransitionAsync(WaitingTaskHolder iHolder, SubProcess& iSubProcess, RunPrincipal& iPrincipal, IOVSyncValue const& iTS) {
-    iSubProcess.doBeginRunAsync(std::move(iHolder),iPrincipal, iTS);
+
+  inline void subProcessDoGlobalBeginTransitionAsync(WaitingTaskHolder iHolder,
+                                                     SubProcess& iSubProcess,
+                                                     RunPrincipal& iPrincipal,
+                                                     IOVSyncValue const& iTS) {
+    iSubProcess.doBeginRunAsync(std::move(iHolder), iPrincipal, iTS);
   }
-  
-  inline void subProcessDoGlobalEndTransitionAsync(WaitingTaskHolder iHolder, SubProcess& iSubProcess, LuminosityBlockPrincipal& iPrincipal, IOVSyncValue const& iTS, bool cleaningUpAfterException) {
-    iSubProcess.doEndLuminosityBlockAsync(std::move(iHolder),iPrincipal, iTS,cleaningUpAfterException);
+
+  inline void subProcessDoGlobalEndTransitionAsync(WaitingTaskHolder iHolder,
+                                                   SubProcess& iSubProcess,
+                                                   LuminosityBlockPrincipal& iPrincipal,
+                                                   IOVSyncValue const& iTS,
+                                                   bool cleaningUpAfterException) {
+    iSubProcess.doEndLuminosityBlockAsync(std::move(iHolder), iPrincipal, iTS, cleaningUpAfterException);
   }
-  
-  inline void subProcessDoGlobalEndTransitionAsync(WaitingTaskHolder iHolder, SubProcess& iSubProcess, RunPrincipal& iPrincipal, IOVSyncValue const& iTS, bool cleaningUpAfterException) {
+
+  inline void subProcessDoGlobalEndTransitionAsync(WaitingTaskHolder iHolder,
+                                                   SubProcess& iSubProcess,
+                                                   RunPrincipal& iPrincipal,
+                                                   IOVSyncValue const& iTS,
+                                                   bool cleaningUpAfterException) {
     iSubProcess.doEndRunAsync(std::move(iHolder), iPrincipal, iTS, cleaningUpAfterException);
   }
 
-  template<typename Traits, typename P, typename SC >
+  template <typename Traits, typename P, typename SC>
   void beginGlobalTransitionAsync(WaitingTaskHolder iWait,
                                   Schedule& iSchedule,
                                   P& iPrincipal,
-                                  IOVSyncValue const & iTS,
+                                  IOVSyncValue const& iTS,
                                   EventSetupImpl const& iES,
                                   ServiceToken const& token,
                                   SC& iSubProcesses) {
-
     //When we are done processing the global for this process,
     // we need to run the global for all SubProcesses
-    auto subs = make_waiting_task(tbb::task::allocate_root(), [&iSubProcesses, iWait,&iPrincipal,iTS](std::exception_ptr const* iPtr) mutable {
-      if(iPtr) {
-        auto excpt = *iPtr;
-        auto delayError = make_waiting_task(tbb::task::allocate_root(), [iWait,excpt](std::exception_ptr const* ) mutable {
-          iWait.doneWaiting(excpt);
+    auto subs = make_waiting_task(
+        tbb::task::allocate_root(), [&iSubProcesses, iWait, &iPrincipal, iTS](std::exception_ptr const* iPtr) mutable {
+          if (iPtr) {
+            auto excpt = *iPtr;
+            auto delayError =
+                make_waiting_task(tbb::task::allocate_root(),
+                                  [iWait, excpt](std::exception_ptr const*) mutable { iWait.doneWaiting(excpt); });
+            WaitingTaskHolder h(delayError);
+            for (auto& subProcess : iSubProcesses) {
+              subProcessDoGlobalBeginTransitionAsync(h, subProcess, iPrincipal, iTS);
+            }
+          } else {
+            for (auto& subProcess : iSubProcesses) {
+              subProcessDoGlobalBeginTransitionAsync(iWait, subProcess, iPrincipal, iTS);
+            }
+          }
         });
-        WaitingTaskHolder h(delayError);
-        for(auto& subProcess: iSubProcesses) {
-          subProcessDoGlobalBeginTransitionAsync(h,subProcess,iPrincipal, iTS);
-        }
-      } else {
-        for(auto& subProcess:iSubProcesses){
-          subProcessDoGlobalBeginTransitionAsync(iWait,subProcess,iPrincipal, iTS);
-        }
-      }
-    });
-    
+
     WaitingTaskHolder h(subs);
-    iSchedule.processOneGlobalAsync<Traits>(std::move(h),iPrincipal, iES,token);
+    iSchedule.processOneGlobalAsync<Traits>(std::move(h), iPrincipal, iES, token);
   }
 
-  
-  template<typename Traits, typename P, typename SC >
+  template <typename Traits, typename P, typename SC>
   void endGlobalTransitionAsync(WaitingTaskHolder iWait,
                                 Schedule& iSchedule,
                                 P& iPrincipal,
-                                IOVSyncValue const & iTS,
+                                IOVSyncValue const& iTS,
                                 EventSetupImpl const& iES,
                                 ServiceToken const& token,
                                 SC& iSubProcesses,
-                                bool cleaningUpAfterException)
-  {
+                                bool cleaningUpAfterException) {
     //When we are done processing the global for this process,
     // we need to run the global for all SubProcesses
-    auto subs = make_waiting_task(tbb::task::allocate_root(), [&iSubProcesses, iWait,&iPrincipal,iTS,cleaningUpAfterException](std::exception_ptr const* iPtr) mutable {
-      if(iPtr) {
-        auto excpt = *iPtr;
-        auto delayError = make_waiting_task(tbb::task::allocate_root(), [iWait,excpt](std::exception_ptr const* ) mutable {
-          iWait.doneWaiting(excpt);
+    auto subs = make_waiting_task(
+        tbb::task::allocate_root(),
+        [&iSubProcesses, iWait, &iPrincipal, iTS, cleaningUpAfterException](std::exception_ptr const* iPtr) mutable {
+          if (iPtr) {
+            auto excpt = *iPtr;
+            auto delayError =
+                make_waiting_task(tbb::task::allocate_root(),
+                                  [iWait, excpt](std::exception_ptr const*) mutable { iWait.doneWaiting(excpt); });
+            WaitingTaskHolder h(delayError);
+            for (auto& subProcess : iSubProcesses) {
+              subProcessDoGlobalEndTransitionAsync(h, subProcess, iPrincipal, iTS, cleaningUpAfterException);
+            }
+          } else {
+            for (auto& subProcess : iSubProcesses) {
+              subProcessDoGlobalEndTransitionAsync(iWait, subProcess, iPrincipal, iTS, cleaningUpAfterException);
+            }
+          }
         });
-        WaitingTaskHolder h(delayError);
-        for(auto& subProcess: iSubProcesses){
-          subProcessDoGlobalEndTransitionAsync(h,subProcess,iPrincipal, iTS,cleaningUpAfterException);
-        }
-      } else {
-        for(auto& subProcess: iSubProcesses){
-          subProcessDoGlobalEndTransitionAsync(iWait,subProcess,iPrincipal, iTS,cleaningUpAfterException);
-        }
-      }
-    });
-    
+
     WaitingTaskHolder h(subs);
-    iSchedule.processOneGlobalAsync<Traits>(std::move(h),iPrincipal, iES,token,cleaningUpAfterException);
+    iSchedule.processOneGlobalAsync<Traits>(std::move(h), iPrincipal, iES, token, cleaningUpAfterException);
   }
 
-};
+};  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/insertSelectedProcesses.cc b/FWCore/Framework/src/insertSelectedProcesses.cc
index 1f7e59e40c35e..5b95d9c7c9d9a 100644
--- a/FWCore/Framework/src/insertSelectedProcesses.cc
+++ b/FWCore/Framework/src/insertSelectedProcesses.cc
@@ -12,12 +12,9 @@
 
 namespace edm {
 
-  void insertSelectedProcesses(BranchDescription const& desc,
-                               std::set<std::string>& processes) {
-
+  void insertSelectedProcesses(BranchDescription const& desc, std::set<std::string>& processes) {
     // Select input processes in which mergeable run products were produced
     if (desc.branchType() == InRun && !desc.produced()) {
-
       // Determine if the product is "mergeable"
       TClass* tClass = desc.wrappedType().getClass();
       void* p = tClass->New();
@@ -30,4 +27,4 @@ namespace edm {
       }
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/Framework/src/limited/EDAnalyzerBase.cc b/FWCore/Framework/src/limited/EDAnalyzerBase.cc
index 2206c1169e366..f1792a163a5c4 100644
--- a/FWCore/Framework/src/limited/EDAnalyzerBase.cc
+++ b/FWCore/Framework/src/limited/EDAnalyzerBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     limited::EDAnalyzerBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -22,7 +22,6 @@
 #include "FWCore/Framework/src/PreallocationConfiguration.h"
 #include "FWCore/Framework/src/EventSignalsSentry.h"
 
-
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
@@ -31,7 +30,6 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Framework/interface/ConstProductRegistry.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -40,209 +38,178 @@ namespace edm {
     //
     // static data member definitions
     //
-    
+
     //
     // constructors and destructor
     //
-    EDAnalyzerBase::EDAnalyzerBase(ParameterSet const& pset):
-    moduleDescription_(),
-    queue_(pset.getUntrackedParameter<unsigned int>("concurrencyLimit")) { }
-    
-    EDAnalyzerBase::~EDAnalyzerBase()
-    {
-    }
-    
-    bool
-    EDAnalyzerBase::doEvent(EventPrincipal const& ep, EventSetupImpl const& ci,
-                            ActivityRegistry* act,
-                            ModuleCallingContext const* mcc) {
+    EDAnalyzerBase::EDAnalyzerBase(ParameterSet const& pset)
+        : moduleDescription_(), queue_(pset.getUntrackedParameter<unsigned int>("concurrencyLimit")) {}
+
+    EDAnalyzerBase::~EDAnalyzerBase() {}
+
+    bool EDAnalyzerBase::doEvent(EventPrincipal const& ep,
+                                 EventSetupImpl const& ci,
+                                 ActivityRegistry* act,
+                                 ModuleCallingContext const* mcc) {
       Event e(ep, moduleDescription_, mcc);
       e.setConsumer(this);
-      EventSignalsSentry sentry(act,mcc);
-      const EventSetup c{ci};
+      EventSignalsSentry sentry(act, mcc);
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event)};
       this->analyze(e.streamID(), e, c);
       return true;
     }
-    
-    void
-    EDAnalyzerBase::doPreallocate(PreallocationConfiguration const& iPrealloc) {
+
+    void EDAnalyzerBase::doPreallocate(PreallocationConfiguration const& iPrealloc) {
       preallocStreams(iPrealloc.numberOfStreams());
       preallocLumis(iPrealloc.numberOfLuminosityBlocks());
       preallocate(iPrealloc);
     }
 
-    void
-    EDAnalyzerBase::doBeginJob() {
-      this->beginJob();
-    }
-    
-    void
-    EDAnalyzerBase::doEndJob() {
-      this->endJob();
-    }
-    
-    void
-    EDAnalyzerBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                               ModuleCallingContext const* mcc) {
-      
+    void EDAnalyzerBase::doBeginJob() { this->beginJob(); }
+
+    void EDAnalyzerBase::doEndJob() { this->endJob(); }
+
+    void EDAnalyzerBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, false);
       r.setConsumer(this);
       Run const& cnstR = r;
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun)};
       this->doBeginRun_(cnstR, c);
       this->doBeginRunSummary_(cnstR, c);
     }
-    
-    void
-    EDAnalyzerBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                             ModuleCallingContext const* mcc) {
+
+    void EDAnalyzerBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, true);
       r.setConsumer(this);
       Run const& cnstR = r;
-      const EventSetup c{ci};
-      this->doEndRunSummary_(r,c);
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun)};
+      this->doEndRunSummary_(r, c);
       this->doEndRun_(cnstR, c);
     }
-    
-    void
-    EDAnalyzerBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                           ModuleCallingContext const* mcc) {
+
+    void EDAnalyzerBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                                EventSetupImpl const& ci,
+                                                ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
       lb.setConsumer(this);
       LuminosityBlock const& cnstLb = lb;
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                         esGetTokenIndices(Transition::BeginLuminosityBlock)};
       this->doBeginLuminosityBlock_(cnstLb, c);
       this->doBeginLuminosityBlockSummary_(cnstLb, c);
     }
-    
-    void
-    EDAnalyzerBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                         ModuleCallingContext const* mcc) {
+
+    void EDAnalyzerBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                              EventSetupImpl const& ci,
+                                              ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
       LuminosityBlock const& cnstLb = lb;
-      const EventSetup c{ci};
-      this->doEndLuminosityBlockSummary_(cnstLb,c);
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                         esGetTokenIndices(Transition::EndLuminosityBlock)};
+      this->doEndLuminosityBlockSummary_(cnstLb, c);
       this->doEndLuminosityBlock_(cnstLb, c);
     }
-    
-    void
-    EDAnalyzerBase::doBeginStream(StreamID id) {
-      doBeginStream_(id);
-    }
-    void
-    EDAnalyzerBase::doEndStream(StreamID id) {
-      doEndStream_(id);
-    }
-    void
-    EDAnalyzerBase::doStreamBeginRun(StreamID id,
-                                     RunPrincipal const& rp,
-                                     EventSetupImpl const& ci,
-                                     ModuleCallingContext const* mcc)
-    {
+
+    void EDAnalyzerBase::doBeginStream(StreamID id) { doBeginStream_(id); }
+    void EDAnalyzerBase::doEndStream(StreamID id) { doEndStream_(id); }
+    void EDAnalyzerBase::doStreamBeginRun(StreamID id,
+                                          RunPrincipal const& rp,
+                                          EventSetupImpl const& ci,
+                                          ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, false);
       r.setConsumer(this);
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun)};
       this->doStreamBeginRun_(id, r, c);
     }
-    void
-    EDAnalyzerBase::doStreamEndRun(StreamID id,
-                                   RunPrincipal const& rp,
-                                   EventSetupImpl const& ci,
-                                   ModuleCallingContext const* mcc) {
+    void EDAnalyzerBase::doStreamEndRun(StreamID id,
+                                        RunPrincipal const& rp,
+                                        EventSetupImpl const& ci,
+                                        ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, true);
       r.setConsumer(this);
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun)};
       this->doStreamEndRun_(id, r, c);
       this->doStreamEndRunSummary_(id, r, c);
     }
-    void
-    EDAnalyzerBase::doStreamBeginLuminosityBlock(StreamID id,
-                                                 LuminosityBlockPrincipal const& lbp,
-                                                 EventSetupImpl const& ci,
-                                                 ModuleCallingContext const* mcc) {
+    void EDAnalyzerBase::doStreamBeginLuminosityBlock(StreamID id,
+                                                      LuminosityBlockPrincipal const& lbp,
+                                                      EventSetupImpl const& ci,
+                                                      ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
       lb.setConsumer(this);
-      const EventSetup c{ci};
-      this->doStreamBeginLuminosityBlock_(id,lb, c);
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                         esGetTokenIndices(Transition::BeginLuminosityBlock)};
+      this->doStreamBeginLuminosityBlock_(id, lb, c);
     }
-    
-    void
-    EDAnalyzerBase::doStreamEndLuminosityBlock(StreamID id,
-                                               LuminosityBlockPrincipal const& lbp,
-                                               EventSetupImpl const& ci,
-                                               ModuleCallingContext const* mcc) {
+
+    void EDAnalyzerBase::doStreamEndLuminosityBlock(StreamID id,
+                                                    LuminosityBlockPrincipal const& lbp,
+                                                    EventSetupImpl const& ci,
+                                                    ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
-      const EventSetup c{ci};
-      this->doStreamEndLuminosityBlock_(id,lb, c);
-      this->doStreamEndLuminosityBlockSummary_(id,lb, c);
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                         esGetTokenIndices(Transition::EndLuminosityBlock)};
+      this->doStreamEndLuminosityBlock_(id, lb, c);
+      this->doStreamEndLuminosityBlockSummary_(id, lb, c);
     }
-    
-    
-    
-    void
-    EDAnalyzerBase::doRespondToOpenInputFile(FileBlock const& fb) {
+
+    void EDAnalyzerBase::doRespondToOpenInputFile(FileBlock const& fb) {
       //respondToOpenInputFile(fb);
     }
-    
-    void
-    EDAnalyzerBase::doRespondToCloseInputFile(FileBlock const& fb) {
+
+    void EDAnalyzerBase::doRespondToCloseInputFile(FileBlock const& fb) {
       //respondToCloseInputFile(fb);
     }
-    
+
     void EDAnalyzerBase::preallocStreams(unsigned int) {}
     void EDAnalyzerBase::preallocLumis(unsigned int) {}
     void EDAnalyzerBase::preallocate(PreallocationConfiguration const&) {}
-    void EDAnalyzerBase::doBeginStream_(StreamID id){}
+    void EDAnalyzerBase::doBeginStream_(StreamID id) {}
     void EDAnalyzerBase::doEndStream_(StreamID id) {}
     void EDAnalyzerBase::doStreamBeginRun_(StreamID id, Run const& rp, EventSetup const& c) {}
     void EDAnalyzerBase::doStreamEndRun_(StreamID id, Run const& rp, EventSetup const& c) {}
     void EDAnalyzerBase::doStreamEndRunSummary_(StreamID id, Run const& rp, EventSetup const& c) {}
     void EDAnalyzerBase::doStreamBeginLuminosityBlock_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDAnalyzerBase::doStreamEndLuminosityBlock_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) {}
-    void EDAnalyzerBase::doStreamEndLuminosityBlockSummary_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) {}
-    
-    
+    void EDAnalyzerBase::doStreamEndLuminosityBlockSummary_(StreamID id,
+                                                            LuminosityBlock const& lbp,
+                                                            EventSetup const& c) {}
+
     void EDAnalyzerBase::doBeginRun_(Run const& rp, EventSetup const& c) {}
     void EDAnalyzerBase::doEndRun_(Run const& rp, EventSetup const& c) {}
     void EDAnalyzerBase::doBeginRunSummary_(Run const& rp, EventSetup const& c) {}
     void EDAnalyzerBase::doEndRunSummary_(Run const& rp, EventSetup const& c) {}
-    
+
     void EDAnalyzerBase::doBeginLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDAnalyzerBase::doEndLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDAnalyzerBase::doBeginLuminosityBlockSummary_(LuminosityBlock const& rp, EventSetup const& c) {}
     void EDAnalyzerBase::doEndLuminosityBlockSummary_(LuminosityBlock const& lb, EventSetup const& c) {}
-    
-    void
-    EDAnalyzerBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
+
+    void EDAnalyzerBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
       ParameterSetDescription desc;
       desc.setUnknown();
       descriptions.addDefault(desc);
     }
-    
-    void
-    EDAnalyzerBase::prevalidate(ConfigurationDescriptions& iConfig) {
-      edmodule_mightGet_config(iConfig);
-    }
-    
-    void
-    EDAnalyzerBase::registerProductsAndCallbacks(EDAnalyzerBase*, ProductRegistry* reg) {
-      
+
+    void EDAnalyzerBase::prevalidate(ConfigurationDescriptions& iConfig) { edmodule_mightGet_config(iConfig); }
+
+    void EDAnalyzerBase::registerProductsAndCallbacks(EDAnalyzerBase*, ProductRegistry* reg) {
       if (callWhenNewProductsRegistered_) {
-        
         reg->callForEachBranch(callWhenNewProductsRegistered_);
-        
+
         Service<ConstProductRegistry> regService;
         regService->watchProductAdditions(callWhenNewProductsRegistered_);
       }
     }
     static const std::string kBaseType("EDAnalyzer");
-    
-    const std::string&
-    EDAnalyzerBase::baseType() {
-      return kBaseType;
-    }
 
-  }
-}
+    const std::string& EDAnalyzerBase::baseType() { return kBaseType; }
+
+  }  // namespace limited
+}  // namespace edm
diff --git a/FWCore/Framework/src/limited/EDFilterBase.cc b/FWCore/Framework/src/limited/EDFilterBase.cc
index b4ce095642424..ba5f1643d3172 100644
--- a/FWCore/Framework/src/limited/EDFilterBase.cc
+++ b/FWCore/Framework/src/limited/EDFilterBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     limited::EDFilterBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -25,7 +25,6 @@
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -34,39 +33,36 @@ namespace edm {
     //
     // static data member definitions
     //
-    
+
     //
     // constructors and destructor
     //
-    EDFilterBase::EDFilterBase(ParameterSet const& pset):
-    ProducerBase(),
-    moduleDescription_(),
-    previousParentages_(),
-    previousParentageIds_(),
-    queue_(pset.getUntrackedParameter<unsigned int>("concurrencyLimit")) { }
-    
-    EDFilterBase::~EDFilterBase()
-    {
-    }
-    
-    bool
-    EDFilterBase::doEvent(EventPrincipal const& ep, EventSetupImpl const& ci,
-                          ActivityRegistry* act,
-                          ModuleCallingContext const* mcc) {
+    EDFilterBase::EDFilterBase(ParameterSet const& pset)
+        : ProducerBase(),
+          moduleDescription_(),
+          previousParentages_(),
+          previousParentageIds_(),
+          queue_(pset.getUntrackedParameter<unsigned int>("concurrencyLimit")) {}
+
+    EDFilterBase::~EDFilterBase() {}
+
+    bool EDFilterBase::doEvent(EventPrincipal const& ep,
+                               EventSetupImpl const& ci,
+                               ActivityRegistry* act,
+                               ModuleCallingContext const* mcc) {
       Event e(ep, moduleDescription_, mcc);
       e.setConsumer(this);
-      const auto streamIndex =e.streamID().value();
+      const auto streamIndex = e.streamID().value();
       e.setProducer(this, &previousParentages_[streamIndex]);
-      const EventSetup c{ci};
-      EventSignalsSentry sentry(act,mcc);
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event)};
+      EventSignalsSentry sentry(act, mcc);
       bool returnValue = this->filter(e.streamID(), e, c);
       commit_(e, &previousParentageIds_[streamIndex]);
       return returnValue;
     }
-    
-    void
-    EDFilterBase::doPreallocate(PreallocationConfiguration const& iPrealloc) {
-      const auto nStreams =iPrealloc.numberOfStreams();
+
+    void EDFilterBase::doPreallocate(PreallocationConfiguration const& iPrealloc) {
+      const auto nStreams = iPrealloc.numberOfStreams();
       previousParentages_.reset(new std::vector<BranchID>[nStreams]);
       previousParentageIds_.reset(new ParentageID[nStreams]);
       preallocStreams(nStreams);
@@ -74,183 +70,160 @@ namespace edm {
       preallocate(iPrealloc);
     }
 
-    void
-    EDFilterBase::doBeginJob() {
-      this->beginJob();
-    }
-    
-    void
-    EDFilterBase::doEndJob() {
-      this->endJob();
-    }
-    
-    void
-    EDFilterBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                             ModuleCallingContext const* mcc) {
+    void EDFilterBase::doBeginJob() { this->beginJob(); }
+
+    void EDFilterBase::doEndJob() { this->endJob(); }
+
+    void EDFilterBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, false);
       r.setConsumer(this);
       Run const& cnstR = r;
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun)};
       this->doBeginRun_(cnstR, c);
       this->doBeginRunSummary_(cnstR, c);
       r.setProducer(this);
-      this->doBeginRunProduce_(r,c);
+      this->doBeginRunProduce_(r, c);
       commit_(r);
     }
-    
-    void
-    EDFilterBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                           ModuleCallingContext const* mcc) {
+
+    void EDFilterBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, true);
       r.setConsumer(this);
       r.setProducer(this);
       Run const& cnstR = r;
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun)};
       this->doEndRunProduce_(r, c);
-      this->doEndRunSummary_(r,c);
+      this->doEndRunSummary_(r, c);
       this->doEndRun_(cnstR, c);
       commit_(r);
     }
-    
-    void
-    EDFilterBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                         ModuleCallingContext const* mcc) {
+
+    void EDFilterBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                              EventSetupImpl const& ci,
+                                              ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
       lb.setConsumer(this);
       LuminosityBlock const& cnstLb = lb;
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                         esGetTokenIndices(Transition::BeginLuminosityBlock)};
       this->doBeginLuminosityBlock_(cnstLb, c);
       this->doBeginLuminosityBlockSummary_(cnstLb, c);
       lb.setProducer(this);
       this->doBeginLuminosityBlockProduce_(lb, c);
       commit_(lb);
     }
-    
-    void
-    EDFilterBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                       ModuleCallingContext const* mcc) {
+
+    void EDFilterBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                            EventSetupImpl const& ci,
+                                            ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
       lb.setProducer(this);
       LuminosityBlock const& cnstLb = lb;
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                         esGetTokenIndices(Transition::EndLuminosityBlock)};
       this->doEndLuminosityBlockProduce_(lb, c);
-      this->doEndLuminosityBlockSummary_(cnstLb,c);
+      this->doEndLuminosityBlockSummary_(cnstLb, c);
       this->doEndLuminosityBlock_(cnstLb, c);
       commit_(lb);
     }
-    
-    void
-    EDFilterBase::doBeginStream(StreamID id) {
-      doBeginStream_(id);
-    }
-    void
-    EDFilterBase::doEndStream(StreamID id) {
-      doEndStream_(id);
-    }
-    void
-    EDFilterBase::doStreamBeginRun(StreamID id,
-                                     RunPrincipal const& rp,
-                                     EventSetupImpl const& ci,
-                                     ModuleCallingContext const* mcc)
-    {
+
+    void EDFilterBase::doBeginStream(StreamID id) { doBeginStream_(id); }
+    void EDFilterBase::doEndStream(StreamID id) { doEndStream_(id); }
+    void EDFilterBase::doStreamBeginRun(StreamID id,
+                                        RunPrincipal const& rp,
+                                        EventSetupImpl const& ci,
+                                        ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, false);
       r.setConsumer(this);
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun)};
       this->doStreamBeginRun_(id, r, c);
     }
-    void
-    EDFilterBase::doStreamEndRun(StreamID id,
-                                   RunPrincipal const& rp,
-                                   EventSetupImpl const& ci,
-                                   ModuleCallingContext const* mcc) {
+    void EDFilterBase::doStreamEndRun(StreamID id,
+                                      RunPrincipal const& rp,
+                                      EventSetupImpl const& ci,
+                                      ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, true);
       r.setConsumer(this);
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun)};
       this->doStreamEndRun_(id, r, c);
       this->doStreamEndRunSummary_(id, r, c);
     }
-    void
-    EDFilterBase::doStreamBeginLuminosityBlock(StreamID id,
-                                                 LuminosityBlockPrincipal const& lbp,
-                                                 EventSetupImpl const& ci,
-                                                 ModuleCallingContext const* mcc) {
+    void EDFilterBase::doStreamBeginLuminosityBlock(StreamID id,
+                                                    LuminosityBlockPrincipal const& lbp,
+                                                    EventSetupImpl const& ci,
+                                                    ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                         esGetTokenIndices(Transition::BeginLuminosityBlock)};
       lb.setConsumer(this);
-      this->doStreamBeginLuminosityBlock_(id,lb, c);
+      this->doStreamBeginLuminosityBlock_(id, lb, c);
     }
-    
-    void
-    EDFilterBase::doStreamEndLuminosityBlock(StreamID id,
-                                               LuminosityBlockPrincipal const& lbp,
-                                               EventSetupImpl const& ci,
-                                               ModuleCallingContext const* mcc) {
+
+    void EDFilterBase::doStreamEndLuminosityBlock(StreamID id,
+                                                  LuminosityBlockPrincipal const& lbp,
+                                                  EventSetupImpl const& ci,
+                                                  ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
-      const EventSetup c{ci};
-      this->doStreamEndLuminosityBlock_(id,lb, c);
-      this->doStreamEndLuminosityBlockSummary_(id,lb, c);
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                         esGetTokenIndices(Transition::EndLuminosityBlock)};
+      this->doStreamEndLuminosityBlock_(id, lb, c);
+      this->doStreamEndLuminosityBlockSummary_(id, lb, c);
     }
-    
-    
-    
-    void
-    EDFilterBase::doRespondToOpenInputFile(FileBlock const& fb) {
+
+    void EDFilterBase::doRespondToOpenInputFile(FileBlock const& fb) {
       //respondToOpenInputFile(fb);
     }
-    
-    void
-    EDFilterBase::doRespondToCloseInputFile(FileBlock const& fb) {
+
+    void EDFilterBase::doRespondToCloseInputFile(FileBlock const& fb) {
       //respondToCloseInputFile(fb);
     }
-    
+
     void EDFilterBase::preallocStreams(unsigned int) {}
     void EDFilterBase::preallocLumis(unsigned int) {}
     void EDFilterBase::preallocate(PreallocationConfiguration const&) {}
-    void EDFilterBase::doBeginStream_(StreamID id){}
+    void EDFilterBase::doBeginStream_(StreamID id) {}
     void EDFilterBase::doEndStream_(StreamID id) {}
     void EDFilterBase::doStreamBeginRun_(StreamID id, Run const& rp, EventSetup const& c) {}
     void EDFilterBase::doStreamEndRun_(StreamID id, Run const& rp, EventSetup const& c) {}
     void EDFilterBase::doStreamEndRunSummary_(StreamID id, Run const& rp, EventSetup const& c) {}
     void EDFilterBase::doStreamBeginLuminosityBlock_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDFilterBase::doStreamEndLuminosityBlock_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) {}
-    void EDFilterBase::doStreamEndLuminosityBlockSummary_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) {}
-    
-    
+    void EDFilterBase::doStreamEndLuminosityBlockSummary_(StreamID id,
+                                                          LuminosityBlock const& lbp,
+                                                          EventSetup const& c) {}
+
     void EDFilterBase::doBeginRun_(Run const& rp, EventSetup const& c) {}
     void EDFilterBase::doEndRun_(Run const& rp, EventSetup const& c) {}
     void EDFilterBase::doBeginRunSummary_(Run const& rp, EventSetup const& c) {}
     void EDFilterBase::doEndRunSummary_(Run const& rp, EventSetup const& c) {}
-    
+
     void EDFilterBase::doBeginLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDFilterBase::doEndLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDFilterBase::doBeginLuminosityBlockSummary_(LuminosityBlock const& rp, EventSetup const& c) {}
     void EDFilterBase::doEndLuminosityBlockSummary_(LuminosityBlock const& lb, EventSetup const& c) {}
-    
+
     void EDFilterBase::doBeginRunProduce_(Run& rp, EventSetup const& c) {}
     void EDFilterBase::doEndRunProduce_(Run& rp, EventSetup const& c) {}
     void EDFilterBase::doBeginLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c) {}
     void EDFilterBase::doEndLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c) {}
-    
-    void
-    EDFilterBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
+
+    void EDFilterBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
       ParameterSetDescription desc;
       desc.setUnknown();
       descriptions.addDefault(desc);
     }
-    
-    void
-    EDFilterBase::prevalidate(ConfigurationDescriptions& iConfig) {
-      edmodule_mightGet_config(iConfig);
-    }
-    
+
+    void EDFilterBase::prevalidate(ConfigurationDescriptions& iConfig) { edmodule_mightGet_config(iConfig); }
+
     static const std::string kBaseType("EDFilter");
-    
-    const std::string&
-    EDFilterBase::baseType() {
-      return kBaseType;
-    }
 
-  }
-}
+    const std::string& EDFilterBase::baseType() { return kBaseType; }
+
+  }  // namespace limited
+}  // namespace edm
diff --git a/FWCore/Framework/src/limited/EDProducerBase.cc b/FWCore/Framework/src/limited/EDProducerBase.cc
index 9d69e0e0a831e..64816e80a5a85 100644
--- a/FWCore/Framework/src/limited/EDProducerBase.cc
+++ b/FWCore/Framework/src/limited/EDProducerBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     limited::EDProducerBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -25,7 +25,6 @@
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -34,223 +33,197 @@ namespace edm {
     //
     // static data member definitions
     //
-    
+
     //
     // constructors and destructor
     //
-    EDProducerBase::EDProducerBase(ParameterSet const& pset):
-    ProducerBase(),
-    moduleDescription_(),
-    previousParentages_(),
-    previousParentageIds_(),
-    queue_(pset.getUntrackedParameter<unsigned int>("concurrencyLimit")){ }
-    
-    EDProducerBase::~EDProducerBase()
-    {
-    }
-    
-    bool
-    EDProducerBase::doEvent(EventPrincipal const& ep, EventSetupImpl const& ci,
-                            ActivityRegistry* act,
-                            ModuleCallingContext const* mcc) {
+    EDProducerBase::EDProducerBase(ParameterSet const& pset)
+        : ProducerBase(),
+          moduleDescription_(),
+          previousParentages_(),
+          previousParentageIds_(),
+          queue_(pset.getUntrackedParameter<unsigned int>("concurrencyLimit")) {}
+
+    EDProducerBase::~EDProducerBase() {}
+
+    bool EDProducerBase::doEvent(EventPrincipal const& ep,
+                                 EventSetupImpl const& ci,
+                                 ActivityRegistry* act,
+                                 ModuleCallingContext const* mcc) {
       Event e(ep, moduleDescription_, mcc);
       e.setConsumer(this);
       const auto streamIndex = e.streamID().value();
-      e.setProducer(this,&previousParentages_[streamIndex]);
-      EventSignalsSentry sentry(act,mcc);
-      const EventSetup c{ci};
+      e.setProducer(this, &previousParentages_[streamIndex]);
+      EventSignalsSentry sentry(act, mcc);
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event)};
       this->produce(e.streamID(), e, c);
       commit_(e, &previousParentageIds_[streamIndex]);
       return true;
     }
 
-    void
-    EDProducerBase::doPreallocate(PreallocationConfiguration const& iPrealloc) {
+    void EDProducerBase::doPreallocate(PreallocationConfiguration const& iPrealloc) {
       auto const nStreams = iPrealloc.numberOfStreams();
       previousParentages_.reset(new std::vector<BranchID>[nStreams]);
-      previousParentageIds_.reset( new ParentageID[nStreams]);
+      previousParentageIds_.reset(new ParentageID[nStreams]);
       preallocStreams(nStreams);
       preallocLumis(iPrealloc.numberOfLuminosityBlocks());
       preallocate(iPrealloc);
     }
-    
-    void
-    EDProducerBase::doBeginJob() {
-      this->beginJob();
-    }
-    
-    void
-    EDProducerBase::doEndJob() {
-      this->endJob();
-    }
-    
-    void
-    EDProducerBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                               ModuleCallingContext const* mcc) {
+
+    void EDProducerBase::doBeginJob() { this->beginJob(); }
+
+    void EDProducerBase::doEndJob() { this->endJob(); }
+
+    void EDProducerBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, false);
       r.setConsumer(this);
       Run const& cnstR = r;
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun)};
       this->doBeginRun_(cnstR, c);
       this->doBeginRunSummary_(cnstR, c);
       r.setProducer(this);
-      this->doBeginRunProduce_(r,c);
+      this->doBeginRunProduce_(r, c);
       commit_(r);
     }
-    
-    void
-    EDProducerBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                             ModuleCallingContext const* mcc) {
+
+    void EDProducerBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, true);
       r.setConsumer(this);
       r.setProducer(this);
       Run const& cnstR = r;
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun)};
       this->doEndRunProduce_(r, c);
-      this->doEndRunSummary_(r,c);
+      this->doEndRunSummary_(r, c);
       this->doEndRun_(cnstR, c);
       commit_(r);
     }
-    
-    void
-    EDProducerBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                           ModuleCallingContext const* mcc) {
+
+    void EDProducerBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                                EventSetupImpl const& ci,
+                                                ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
       lb.setConsumer(this);
       LuminosityBlock const& cnstLb = lb;
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                         esGetTokenIndices(Transition::BeginLuminosityBlock)};
       this->doBeginLuminosityBlock_(cnstLb, c);
       this->doBeginLuminosityBlockSummary_(cnstLb, c);
       lb.setProducer(this);
       this->doBeginLuminosityBlockProduce_(lb, c);
       commit_(lb);
     }
-    
-    void
-    EDProducerBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                         ModuleCallingContext const* mcc) {
+
+    void EDProducerBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                              EventSetupImpl const& ci,
+                                              ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
       lb.setProducer(this);
       LuminosityBlock const& cnstLb = lb;
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                         esGetTokenIndices(Transition::EndLuminosityBlock)};
       this->doEndLuminosityBlockProduce_(lb, c);
-      this->doEndLuminosityBlockSummary_(cnstLb,c);
+      this->doEndLuminosityBlockSummary_(cnstLb, c);
       this->doEndLuminosityBlock_(cnstLb, c);
       commit_(lb);
     }
-    
-    void
-    EDProducerBase::doBeginStream(StreamID id) {
-      doBeginStream_(id);
-    }
-    void
-    EDProducerBase::doEndStream(StreamID id) {
-      doEndStream_(id);
-    }
-    void
-    EDProducerBase::doStreamBeginRun(StreamID id,
-                                     RunPrincipal const& rp,
-                                     EventSetupImpl const& ci,
-                                     ModuleCallingContext const* mcc)
-    {
+
+    void EDProducerBase::doBeginStream(StreamID id) { doBeginStream_(id); }
+    void EDProducerBase::doEndStream(StreamID id) { doEndStream_(id); }
+    void EDProducerBase::doStreamBeginRun(StreamID id,
+                                          RunPrincipal const& rp,
+                                          EventSetupImpl const& ci,
+                                          ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, false);
       r.setConsumer(this);
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun)};
       this->doStreamBeginRun_(id, r, c);
     }
-    void
-    EDProducerBase::doStreamEndRun(StreamID id,
-                                   RunPrincipal const& rp,
-                                   EventSetupImpl const& ci,
-                                   ModuleCallingContext const* mcc) {
+    void EDProducerBase::doStreamEndRun(StreamID id,
+                                        RunPrincipal const& rp,
+                                        EventSetupImpl const& ci,
+                                        ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, true);
       r.setConsumer(this);
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun)};
       this->doStreamEndRun_(id, r, c);
       this->doStreamEndRunSummary_(id, r, c);
     }
-    void
-    EDProducerBase::doStreamBeginLuminosityBlock(StreamID id,
-                                                 LuminosityBlockPrincipal const& lbp,
-                                                 EventSetupImpl const& ci,
-                                                 ModuleCallingContext const* mcc) {
+    void EDProducerBase::doStreamBeginLuminosityBlock(StreamID id,
+                                                      LuminosityBlockPrincipal const& lbp,
+                                                      EventSetupImpl const& ci,
+                                                      ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
       lb.setConsumer(this);
-      const EventSetup c{ci};
-      this->doStreamBeginLuminosityBlock_(id,lb, c);
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                         esGetTokenIndices(Transition::BeginLuminosityBlock)};
+      this->doStreamBeginLuminosityBlock_(id, lb, c);
     }
-    
-    void
-    EDProducerBase::doStreamEndLuminosityBlock(StreamID id,
-                                               LuminosityBlockPrincipal const& lbp,
-                                               EventSetupImpl const& ci,
-                                               ModuleCallingContext const* mcc) {
+
+    void EDProducerBase::doStreamEndLuminosityBlock(StreamID id,
+                                                    LuminosityBlockPrincipal const& lbp,
+                                                    EventSetupImpl const& ci,
+                                                    ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
-      const EventSetup c{ci};
-      this->doStreamEndLuminosityBlock_(id,lb, c);
-      this->doStreamEndLuminosityBlockSummary_(id,lb, c);
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                         esGetTokenIndices(Transition::EndLuminosityBlock)};
+      this->doStreamEndLuminosityBlock_(id, lb, c);
+      this->doStreamEndLuminosityBlockSummary_(id, lb, c);
     }
-    
-    
-    
-    void
-    EDProducerBase::doRespondToOpenInputFile(FileBlock const& fb) {
+
+    void EDProducerBase::doRespondToOpenInputFile(FileBlock const& fb) {
       //respondToOpenInputFile(fb);
     }
-    
-    void
-    EDProducerBase::doRespondToCloseInputFile(FileBlock const& fb) {
+
+    void EDProducerBase::doRespondToCloseInputFile(FileBlock const& fb) {
       //respondToCloseInputFile(fb);
     }
-    
+
     void EDProducerBase::preallocStreams(unsigned int) {}
     void EDProducerBase::preallocLumis(unsigned int) {}
     void EDProducerBase::preallocate(PreallocationConfiguration const&) {}
-    void EDProducerBase::doBeginStream_(StreamID id){}
+    void EDProducerBase::doBeginStream_(StreamID id) {}
     void EDProducerBase::doEndStream_(StreamID id) {}
     void EDProducerBase::doStreamBeginRun_(StreamID id, Run const& rp, EventSetup const& c) {}
     void EDProducerBase::doStreamEndRun_(StreamID id, Run const& rp, EventSetup const& c) {}
     void EDProducerBase::doStreamEndRunSummary_(StreamID id, Run const& rp, EventSetup const& c) {}
     void EDProducerBase::doStreamBeginLuminosityBlock_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDProducerBase::doStreamEndLuminosityBlock_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) {}
-    void EDProducerBase::doStreamEndLuminosityBlockSummary_(StreamID id, LuminosityBlock const& lbp, EventSetup const& c) {}
-    
-    
+    void EDProducerBase::doStreamEndLuminosityBlockSummary_(StreamID id,
+                                                            LuminosityBlock const& lbp,
+                                                            EventSetup const& c) {}
+
     void EDProducerBase::doBeginRun_(Run const& rp, EventSetup const& c) {}
     void EDProducerBase::doEndRun_(Run const& rp, EventSetup const& c) {}
     void EDProducerBase::doBeginRunSummary_(Run const& rp, EventSetup const& c) {}
     void EDProducerBase::doEndRunSummary_(Run const& rp, EventSetup const& c) {}
-    
+
     void EDProducerBase::doBeginLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDProducerBase::doEndLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDProducerBase::doBeginLuminosityBlockSummary_(LuminosityBlock const& rp, EventSetup const& c) {}
     void EDProducerBase::doEndLuminosityBlockSummary_(LuminosityBlock const& lb, EventSetup const& c) {}
-    
+
     void EDProducerBase::doBeginRunProduce_(Run& rp, EventSetup const& c) {}
     void EDProducerBase::doEndRunProduce_(Run& rp, EventSetup const& c) {}
     void EDProducerBase::doBeginLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c) {}
     void EDProducerBase::doEndLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c) {}
-    
-    void
-    EDProducerBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
+
+    void EDProducerBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
       ParameterSetDescription desc;
       desc.setUnknown();
       descriptions.addDefault(desc);
     }
-    
-    void
-    EDProducerBase::prevalidate(ConfigurationDescriptions& iConfig) {
-      edmodule_mightGet_config(iConfig);
-    }
-    
+
+    void EDProducerBase::prevalidate(ConfigurationDescriptions& iConfig) { edmodule_mightGet_config(iConfig); }
+
     static const std::string kBaseType("EDProducer");
-    
-    const std::string&
-    EDProducerBase::baseType() {
-      return kBaseType;
-    }
 
-  }
-}
+    const std::string& EDProducerBase::baseType() { return kBaseType; }
+
+  }  // namespace limited
+}  // namespace edm
diff --git a/FWCore/Framework/src/limited/OutputModuleBase.cc b/FWCore/Framework/src/limited/OutputModuleBase.cc
index d575b96a0fc55..46e5d20201e3b 100644
--- a/FWCore/Framework/src/limited/OutputModuleBase.cc
+++ b/FWCore/Framework/src/limited/OutputModuleBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     OutputModuleBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -35,84 +35,77 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/DebugMacros.h"
 
-
 namespace edm {
   namespace limited {
 
     // -------------------------------------------------------
-    OutputModuleBase::OutputModuleBase(ParameterSet const& pset) :
-    maxEvents_(-1),
-    remainingEvents_(maxEvents_),
-    keptProducts_(),
-    hasNewlyDroppedBranch_(),
-    process_name_(),
-    productSelectorRules_(pset, "outputCommands", "OutputModule"),
-    productSelector_(),
-    moduleDescription_(),
-    wantAllEvents_(false),
-    selectors_(),
-    selector_config_id_(),
-    droppedBranchIDToKeptBranchID_(),
-    branchIDLists_(new BranchIDLists),
-    origBranchIDLists_(nullptr),
-    thinnedAssociationsHelper_(new ThinnedAssociationsHelper),
-    queue_(pset.getUntrackedParameter<unsigned int>("concurrencyLimit")) {
-      
+    OutputModuleBase::OutputModuleBase(ParameterSet const& pset)
+        : maxEvents_(-1),
+          remainingEvents_(maxEvents_),
+          keptProducts_(),
+          hasNewlyDroppedBranch_(),
+          process_name_(),
+          productSelectorRules_(pset, "outputCommands", "OutputModule"),
+          productSelector_(),
+          moduleDescription_(),
+          wantAllEvents_(false),
+          selectors_(),
+          selector_config_id_(),
+          droppedBranchIDToKeptBranchID_(),
+          branchIDLists_(new BranchIDLists),
+          origBranchIDLists_(nullptr),
+          thinnedAssociationsHelper_(new ThinnedAssociationsHelper),
+          queue_(pset.getUntrackedParameter<unsigned int>("concurrencyLimit")) {
       hasNewlyDroppedBranch_.fill(false);
-      
+
       Service<service::TriggerNamesService> tns;
       process_name_ = tns->getProcessName();
-      
-      selectEvents_ =
-      pset.getUntrackedParameterSet("SelectEvents", ParameterSet());
-      
-      selectEvents_.registerIt(); // Just in case this PSet is not registered
-      
+
+      selectEvents_ = pset.getUntrackedParameterSet("SelectEvents", ParameterSet());
+
+      selectEvents_.registerIt();  // Just in case this PSet is not registered
+
       selector_config_id_ = selectEvents_.id();
-      
+
       //need to set wantAllEvents_ in constructor
       // we will make the remaining selectors once we know how many streams
       selectors_.resize(1);
-      wantAllEvents_ = detail::configureEventSelector(selectEvents_,
-                                                      process_name_,
-                                                      getAllTriggerNames(),
-                                                      selectors_[0],
-                                                      consumesCollector());
-
+      wantAllEvents_ = detail::configureEventSelector(
+          selectEvents_, process_name_, getAllTriggerNames(), selectors_[0], consumesCollector());
     }
-    
+
     void OutputModuleBase::configure(OutputModuleDescription const& desc) {
       remainingEvents_ = maxEvents_ = desc.maxEvents_;
       origBranchIDLists_ = desc.branchIDLists_;
     }
-    
+
     void OutputModuleBase::selectProducts(ProductRegistry const& preg,
                                           ThinnedAssociationsHelper const& thinnedAssociationsHelper) {
-      if(productSelector_.initialized()) return;
+      if (productSelector_.initialized())
+        return;
       productSelector_.initialize(productSelectorRules_, preg.allBranchDescriptions());
-      
+
       // TODO: See if we can collapse keptProducts_ and productSelector_ into a
       // single object. See the notes in the header for ProductSelector
       // for more information.
-      
+
       std::map<BranchID, BranchDescription const*> trueBranchIDToKeptBranchDesc;
       std::vector<BranchDescription const*> associationDescriptions;
       std::set<BranchID> keptProductsInEvent;
       std::set<std::string> processesWithSelectedMergeableRunProducts;
 
-      for(auto const& it : preg.productList()) {
+      for (auto const& it : preg.productList()) {
         BranchDescription const& desc = it.second;
-        if(desc.transient()) {
+        if (desc.transient()) {
           // if the class of the branch is marked transient, output nothing
-        } else if(!desc.present() && !desc.produced()) {
+        } else if (!desc.present() && !desc.produced()) {
           // else if the branch containing the product has been previously dropped,
           // output nothing
-        } else if(desc.unwrappedType() == typeid(ThinnedAssociation)) {
+        } else if (desc.unwrappedType() == typeid(ThinnedAssociation)) {
           associationDescriptions.push_back(&desc);
-        } else if(selected(desc)) {
+        } else if (selected(desc)) {
           keepThisBranch(desc, trueBranchIDToKeptBranchDesc, keptProductsInEvent);
-          insertSelectedProcesses(desc,
-                                  processesWithSelectedMergeableRunProducts);
+          insertSelectedProcesses(desc, processesWithSelectedMergeableRunProducts);
         } else {
           // otherwise, output nothing,
           // and mark the fact that there is a newly dropped branch of this type.
@@ -122,12 +115,11 @@ namespace edm {
 
       setProcessesWithSelectedMergeableRunProducts(processesWithSelectedMergeableRunProducts);
 
-      thinnedAssociationsHelper.selectAssociationProducts(associationDescriptions,
-                                                          keptProductsInEvent,
-                                                          keepAssociation_);
+      thinnedAssociationsHelper.selectAssociationProducts(
+          associationDescriptions, keptProductsInEvent, keepAssociation_);
 
-      for(auto association : associationDescriptions) {
-        if(keepAssociation_[association->branchID()]) {
+      for (auto association : associationDescriptions) {
+        if (keepAssociation_[association->branchID()]) {
           keepThisBranch(*association, trueBranchIDToKeptBranchDesc, keptProductsInEvent);
         } else {
           hasNewlyDroppedBranch_[association->branchType()] = true;
@@ -137,20 +129,22 @@ namespace edm {
       // Now fill in a mapping needed in the case that a branch was dropped while its EDAlias was kept.
       ProductSelector::fillDroppedToKept(preg, trueBranchIDToKeptBranchDesc, droppedBranchIDToKeptBranchID_);
 
-      thinnedAssociationsHelper_->updateFromParentProcess(thinnedAssociationsHelper, keepAssociation_, droppedBranchIDToKeptBranchID_);
+      thinnedAssociationsHelper_->updateFromParentProcess(
+          thinnedAssociationsHelper, keepAssociation_, droppedBranchIDToKeptBranchID_);
     }
 
     void OutputModuleBase::updateBranchIDListsWithKeptAliases() {
-      if(!droppedBranchIDToKeptBranchID_.empty()) {
+      if (!droppedBranchIDToKeptBranchID_.empty()) {
         // Make a private copy of the BranchIDLists.
         *branchIDLists_ = *origBranchIDLists_;
         // Check for branches dropped while an EDAlias was kept.
-        for(BranchIDList& branchIDList : *branchIDLists_) {
-          for(BranchID::value_type& branchID : branchIDList) {
+        for (BranchIDList& branchIDList : *branchIDLists_) {
+          for (BranchID::value_type& branchID : branchIDList) {
             // Replace BranchID of each dropped branch with that of the kept
             // alias, so the alias branch will have the product ID of the original branch.
-            std::map<BranchID::value_type, BranchID::value_type>::const_iterator iter = droppedBranchIDToKeptBranchID_.find(branchID);
-            if(iter != droppedBranchIDToKeptBranchID_.end()) {
+            std::map<BranchID::value_type, BranchID::value_type>::const_iterator iter =
+                droppedBranchIDToKeptBranchID_.find(branchID);
+            if (iter != droppedBranchIDToKeptBranchID_.end()) {
               branchID = iter->second;
             }
           }
@@ -159,65 +153,50 @@ namespace edm {
     }
 
     void OutputModuleBase::keepThisBranch(BranchDescription const& desc,
-                        std::map<BranchID, BranchDescription const*>& trueBranchIDToKeptBranchDesc,
-                        std::set<BranchID>& keptProductsInEvent) {
-
-      ProductSelector::checkForDuplicateKeptBranch(desc,
-                                                   trueBranchIDToKeptBranchDesc);
+                                          std::map<BranchID, BranchDescription const*>& trueBranchIDToKeptBranchDesc,
+                                          std::set<BranchID>& keptProductsInEvent) {
+      ProductSelector::checkForDuplicateKeptBranch(desc, trueBranchIDToKeptBranchDesc);
 
       EDGetToken token;
       switch (desc.branchType()) {
-      case InEvent:
-        {
-          if(desc.produced()) {
+        case InEvent: {
+          if (desc.produced()) {
             keptProductsInEvent.insert(desc.originalBranchID());
           } else {
             keptProductsInEvent.insert(desc.branchID());
           }
-          token = consumes(TypeToGet{desc.unwrappedTypeID(),PRODUCT_TYPE},
-                       InputTag{desc.moduleLabel(),
-                       desc.productInstanceName(),
-                       desc.processName()});
+          token = consumes(TypeToGet{desc.unwrappedTypeID(), PRODUCT_TYPE},
+                           InputTag{desc.moduleLabel(), desc.productInstanceName(), desc.processName()});
           break;
         }
-      case InLumi:
-        {
-          token = consumes<InLumi>(TypeToGet{desc.unwrappedTypeID(),PRODUCT_TYPE},
-                                    InputTag(desc.moduleLabel(),
-                                    desc.productInstanceName(),
-                                    desc.processName()));
+        case InLumi: {
+          token = consumes<InLumi>(TypeToGet{desc.unwrappedTypeID(), PRODUCT_TYPE},
+                                   InputTag(desc.moduleLabel(), desc.productInstanceName(), desc.processName()));
           break;
         }
-      case InRun:
-        {
-          token = consumes<InRun>(TypeToGet{desc.unwrappedTypeID(),PRODUCT_TYPE},
-                                   InputTag(desc.moduleLabel(),
-                                   desc.productInstanceName(),
-                                   desc.processName()));
+        case InRun: {
+          token = consumes<InRun>(TypeToGet{desc.unwrappedTypeID(), PRODUCT_TYPE},
+                                  InputTag(desc.moduleLabel(), desc.productInstanceName(), desc.processName()));
           break;
         }
-      default:
-        assert(false);
-        break;
+        default:
+          assert(false);
+          break;
       }
       // Now put it in the list of selected branches.
       keptProducts_[desc.branchType()].push_back(std::make_pair(&desc, token));
     }
 
-    OutputModuleBase::~OutputModuleBase() { }
-    
+    OutputModuleBase::~OutputModuleBase() {}
+
     void OutputModuleBase::doPreallocate(PreallocationConfiguration const& iPC) {
       auto nstreams = iPC.numberOfStreams();
       selectors_.resize(nstreams);
-      
+
       bool seenFirst = false;
-      for(auto& s : selectors_) {
-        if(seenFirst) {
-          detail::configureEventSelector(selectEvents_,
-                                         process_name_,
-                                         getAllTriggerNames(),
-                                         s,
-                                         consumesCollector());
+      for (auto& s : selectors_) {
+        if (seenFirst) {
+          detail::configureEventSelector(selectEvents_, process_name_, getAllTriggerNames(), s, consumesCollector());
         } else {
           seenFirst = true;
         }
@@ -227,58 +206,52 @@ namespace edm {
       preallocate(iPC);
     }
 
-    void OutputModuleBase::doBeginJob() {
-      this->beginJob();
-    }
-    
-    void OutputModuleBase::doEndJob() {
-      endJob();
-    }
-    
-    bool OutputModuleBase::needToRunSelection() const {
-      return !wantAllEvents_;
-    }
+    void OutputModuleBase::doBeginJob() { this->beginJob(); }
+
+    void OutputModuleBase::doEndJob() { endJob(); }
+
+    bool OutputModuleBase::needToRunSelection() const { return !wantAllEvents_; }
 
-    std::vector<ProductResolverIndexAndSkipBit>
-    OutputModuleBase::productsUsedBySelection() const {
+    std::vector<ProductResolverIndexAndSkipBit> OutputModuleBase::productsUsedBySelection() const {
       std::vector<ProductResolverIndexAndSkipBit> returnValue;
       auto const& s = selectors_[0];
       auto const n = s.numberOfTokens();
       returnValue.reserve(n);
-      
-      for(unsigned int i=0; i< n;++i) {
+
+      for (unsigned int i = 0; i < n; ++i) {
         returnValue.emplace_back(uncheckedIndexFrom(s.token(i)));
       }
       return returnValue;
     }
 
-    bool OutputModuleBase::prePrefetchSelection(StreamID id, EventPrincipal const& ep, ModuleCallingContext const* mcc) {
-      if(wantAllEvents_) return true;
+    bool OutputModuleBase::prePrefetchSelection(StreamID id,
+                                                EventPrincipal const& ep,
+                                                ModuleCallingContext const* mcc) {
+      if (wantAllEvents_)
+        return true;
       auto& s = selectors_[id.value()];
       EventForOutput e(ep, moduleDescription_, mcc);
       e.setConsumer(this);
       return s.wantEvent(e);
     }
-    
-    bool
-    OutputModuleBase::doEvent(EventPrincipal const& ep,
-                              EventSetupImpl const&,
-                              ActivityRegistry* act,
-                              ModuleCallingContext const* mcc) {
-      
+
+    bool OutputModuleBase::doEvent(EventPrincipal const& ep,
+                                   EventSetupImpl const&,
+                                   ActivityRegistry* act,
+                                   ModuleCallingContext const* mcc) {
       {
-          EventForOutput e(ep, moduleDescription_, mcc);
-          e.setConsumer(this);
-          EventSignalsSentry sentry(act,mcc);
-          write(e);
+        EventForOutput e(ep, moduleDescription_, mcc);
+        e.setConsumer(this);
+        EventSignalsSentry sentry(act, mcc);
+        write(e);
       }
 
       auto remainingEvents = remainingEvents_.load();
       bool keepTrying = remainingEvents > 0;
-      while(keepTrying) {
+      while (keepTrying) {
         auto newValue = remainingEvents - 1;
         keepTrying = !remainingEvents_.compare_exchange_strong(remainingEvents, newValue);
-        if(keepTrying) { 
+        if (keepTrying) {
           // the exchange failed because the value was changed by another thread.
           // remainingEvents was changed to be the new value of remainingEvents_;
           keepTrying = remainingEvents > 0;
@@ -287,139 +260,109 @@ namespace edm {
       return true;
     }
 
-    bool
-    OutputModuleBase::doBeginRun(RunPrincipal const& rp,
-                                 EventSetupImpl const&,
-                                 ModuleCallingContext const* mcc) {
+    bool OutputModuleBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const&, ModuleCallingContext const* mcc) {
       RunForOutput r(rp, moduleDescription_, mcc, false);
       r.setConsumer(this);
       doBeginRun_(r);
       return true;
     }
-    
-    bool
-    OutputModuleBase::doEndRun(RunPrincipal const& rp,
-                               EventSetupImpl const&,
-                               ModuleCallingContext const* mcc) {
+
+    bool OutputModuleBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const&, ModuleCallingContext const* mcc) {
       RunForOutput r(rp, moduleDescription_, mcc, true);
       r.setConsumer(this);
       doEndRun_(r);
       return true;
     }
-    
-    void
-    OutputModuleBase::doWriteRun(RunPrincipal const& rp,
-                                 ModuleCallingContext const* mcc,
-                                 MergeableRunProductMetadata const* mrpm) {
+
+    void OutputModuleBase::doWriteRun(RunPrincipal const& rp,
+                                      ModuleCallingContext const* mcc,
+                                      MergeableRunProductMetadata const* mrpm) {
       RunForOutput r(rp, moduleDescription_, mcc, true, mrpm);
       r.setConsumer(this);
       writeRun(r);
     }
-    
-    bool
-    OutputModuleBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
-                                             EventSetupImpl const&,
-                                             ModuleCallingContext const* mcc) {
+
+    bool OutputModuleBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                                  EventSetupImpl const&,
+                                                  ModuleCallingContext const* mcc) {
       LuminosityBlockForOutput lb(lbp, moduleDescription_, mcc, false);
       lb.setConsumer(this);
       doBeginLuminosityBlock_(lb);
       return true;
     }
-    
-    bool
-    OutputModuleBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
-                                           EventSetupImpl const&,
-                                           ModuleCallingContext const* mcc) {
+
+    bool OutputModuleBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                                EventSetupImpl const&,
+                                                ModuleCallingContext const* mcc) {
       LuminosityBlockForOutput lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
       doEndLuminosityBlock_(lb);
       return true;
     }
-    
+
     void OutputModuleBase::doWriteLuminosityBlock(LuminosityBlockPrincipal const& lbp,
                                                   ModuleCallingContext const* mcc) {
       LuminosityBlockForOutput lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
       writeLuminosityBlock(lb);
     }
-    
-    void OutputModuleBase::doOpenFile(FileBlock const& fb) {
-      openFile(fb);
-    }
+
+    void OutputModuleBase::doOpenFile(FileBlock const& fb) { openFile(fb); }
 
     void OutputModuleBase::doRespondToOpenInputFile(FileBlock const& fb) {
       updateBranchIDListsWithKeptAliases();
       doRespondToOpenInputFile_(fb);
     }
-    
-    void OutputModuleBase::doRespondToCloseInputFile(FileBlock const& fb) {
-      doRespondToCloseInputFile_(fb);
-    }
-        
+
+    void OutputModuleBase::doRespondToCloseInputFile(FileBlock const& fb) { doRespondToCloseInputFile_(fb); }
+
     void OutputModuleBase::doCloseFile() {
-      if(isFileOpen()) {
+      if (isFileOpen()) {
         reallyCloseFile();
       }
     }
-    
-    void OutputModuleBase::reallyCloseFile() {
-    }
-    
-    BranchIDLists const*
-    OutputModuleBase::branchIDLists() const {
-      if(!droppedBranchIDToKeptBranchID_.empty()) {
+
+    void OutputModuleBase::reallyCloseFile() {}
+
+    BranchIDLists const* OutputModuleBase::branchIDLists() const {
+      if (!droppedBranchIDToKeptBranchID_.empty()) {
         return branchIDLists_.get();
       }
       return origBranchIDLists_;
     }
-    
-    ThinnedAssociationsHelper const*
-    OutputModuleBase::thinnedAssociationsHelper() const {
+
+    ThinnedAssociationsHelper const* OutputModuleBase::thinnedAssociationsHelper() const {
       return thinnedAssociationsHelper_.get();
     }
 
-    ModuleDescription const&
-    OutputModuleBase::description() const {
-      return moduleDescription_;
-    }
-    
-    bool
-    OutputModuleBase::selected(BranchDescription const& desc) const {
-      return productSelector_.selected(desc);
-    }
-    
-    void
-    OutputModuleBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
+    ModuleDescription const& OutputModuleBase::description() const { return moduleDescription_; }
+
+    bool OutputModuleBase::selected(BranchDescription const& desc) const { return productSelector_.selected(desc); }
+
+    void OutputModuleBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
       ParameterSetDescription desc;
       desc.setUnknown();
       descriptions.addDefault(desc);
     }
-    
-    void
-    OutputModuleBase::fillDescription(ParameterSetDescription& desc) {
+
+    void OutputModuleBase::fillDescription(ParameterSetDescription& desc) {
       ProductSelectorRules::fillDescription(desc, "outputCommands");
       EventSelector::fillDescription(desc);
-      desc.addUntracked<unsigned int>("concurrencyLimit",1);
-    }
-    
-    void
-    OutputModuleBase::prevalidate(ConfigurationDescriptions& ) {
+      desc.addUntracked<unsigned int>("concurrencyLimit", 1);
     }
-    
-    
+
+    void OutputModuleBase::prevalidate(ConfigurationDescriptions&) {}
+
     static const std::string kBaseType("OutputModule");
-    const std::string&
-    OutputModuleBase::baseType() {
-      return kBaseType;
-    }
-    
-    void
-    OutputModuleBase::setEventSelectionInfo(std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
-                                        bool anyProductProduced) {
+    const std::string& OutputModuleBase::baseType() { return kBaseType; }
+
+    void OutputModuleBase::setEventSelectionInfo(
+        std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
+        bool anyProductProduced) {
       selector_config_id_ = detail::registerProperSelectionInfo(getParameterSet(selector_config_id_),
                                                                 description().moduleLabel(),
                                                                 outputModulePathPositions,
                                                                 anyProductProduced);
     }
-  }
-}
+  }  // namespace limited
+}  // namespace edm
diff --git a/FWCore/Framework/src/limited/filterImplementors.cc b/FWCore/Framework/src/limited/filterImplementors.cc
index aa4152a720e88..a36c09e6934cf 100644
--- a/FWCore/Framework/src/limited/filterImplementors.cc
+++ b/FWCore/Framework/src/limited/filterImplementors.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Package
 // Class  :     filterImplementors
-// 
+//
 // Implementation:
 //     Explicitly instantiate implementor templates for EDFilterBase
 //
@@ -23,6 +23,6 @@ namespace edm {
       template class EndRunProducer<edm::limited::EDFilterBase>;
       template class BeginLuminosityBlockProducer<edm::limited::EDFilterBase>;
       template class EndLuminosityBlockProducer<edm::limited::EDFilterBase>;
-    }
-  }
-}
+    }  // namespace impl
+  }    // namespace limited
+}  // namespace edm
diff --git a/FWCore/Framework/src/limited/implementorsMethods.h b/FWCore/Framework/src/limited/implementorsMethods.h
index f7791bab30d56..49da2e04151b5 100644
--- a/FWCore/Framework/src/limited/implementorsMethods.h
+++ b/FWCore/Framework/src/limited/implementorsMethods.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // File  :     implementorsMethods
-// 
+//
 /**\file implementorsMethods.h "FWCore/Framework/src/limited/implementorsMethods.h"
 
  Description: [one line class summary]
@@ -28,28 +28,27 @@
 namespace edm {
   namespace limited {
     namespace impl {
-      template< typename T>
+      template <typename T>
       void BeginRunProducer<T>::doBeginRunProduce_(Run& rp, EventSetup const& c) {
-        this->globalBeginRunProduce(rp,c);
+        this->globalBeginRunProduce(rp, c);
       }
 
-      template< typename T>
+      template <typename T>
       void EndRunProducer<T>::doEndRunProduce_(Run& rp, EventSetup const& c) {
-        this->globalEndRunProduce(rp,c);
+        this->globalEndRunProduce(rp, c);
       }
 
-      template< typename T>
+      template <typename T>
       void BeginLuminosityBlockProducer<T>::doBeginLuminosityBlockProduce_(LuminosityBlock& rp, EventSetup const& c) {
-        this->globalBeginLuminosityBlockProduce(rp,c);
+        this->globalBeginLuminosityBlockProduce(rp, c);
       }
-      
-      template< typename T>
+
+      template <typename T>
       void EndLuminosityBlockProducer<T>::doEndLuminosityBlockProduce_(LuminosityBlock& rp, EventSetup const& c) {
-        this->globalEndLuminosityBlockProduce(rp,c);
+        this->globalEndLuminosityBlockProduce(rp, c);
       }
-    }
-  }
-}
-
+    }  // namespace impl
+  }    // namespace limited
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/limited/outputmoduleImplementors.cc b/FWCore/Framework/src/limited/outputmoduleImplementors.cc
index 109181ecbf0c0..425d69eca980d 100644
--- a/FWCore/Framework/src/limited/outputmoduleImplementors.cc
+++ b/FWCore/Framework/src/limited/outputmoduleImplementors.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     outputmoduleImplementors
-// 
+//
 // Implementation:
 //     Explicitly instantiate implementor templates for OutputModuleBase
 //
@@ -20,14 +20,8 @@ namespace edm {
 
   namespace limited {
     namespace outputmodule {
-      void InputFileWatcher::doRespondToOpenInputFile_(FileBlock const& iB)
-      {
-        respondToOpenInputFile(iB);
-      }
-      void InputFileWatcher::doRespondToCloseInputFile_(FileBlock const& iB)
-      {
-        respondToCloseInputFile(iB);
-      }
-    }
-  }
-}
+      void InputFileWatcher::doRespondToOpenInputFile_(FileBlock const& iB) { respondToOpenInputFile(iB); }
+      void InputFileWatcher::doRespondToCloseInputFile_(FileBlock const& iB) { respondToCloseInputFile(iB); }
+    }  // namespace outputmodule
+  }    // namespace limited
+}  // namespace edm
diff --git a/FWCore/Framework/src/limited/producerImplementors.cc b/FWCore/Framework/src/limited/producerImplementors.cc
index 3a242d46f9947..e93b17de86efa 100644
--- a/FWCore/Framework/src/limited/producerImplementors.cc
+++ b/FWCore/Framework/src/limited/producerImplementors.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Package
 // Class  :     producerImplementors
-// 
+//
 // Implementation:
 //     Explicitly instantiate implementor templates for EDProducerBase
 //
@@ -23,6 +23,6 @@ namespace edm {
       template class EndRunProducer<edm::limited::EDProducerBase>;
       template class BeginLuminosityBlockProducer<edm::limited::EDProducerBase>;
       template class EndLuminosityBlockProducer<edm::limited::EDProducerBase>;
-    }
-  }
-}
+    }  // namespace impl
+  }    // namespace limited
+}  // namespace edm
diff --git a/FWCore/Framework/src/make_shared_noexcept_false.h b/FWCore/Framework/src/make_shared_noexcept_false.h
index cd85327abf804..9dd277c53c2db 100644
--- a/FWCore/Framework/src/make_shared_noexcept_false.h
+++ b/FWCore/Framework/src/make_shared_noexcept_false.h
@@ -2,15 +2,15 @@
 #define FWCore_Framework_make_shared_noexcept_false_h
 #include <memory>
 namespace edm {
-template<typename T, typename ... Args>
-std::shared_ptr<T> make_shared_noexcept_false(Args&& ... args) {
+  template <typename T, typename... Args>
+  std::shared_ptr<T> make_shared_noexcept_false(Args&&... args) {
 #if defined(__APPLE__)
-// libc++ from Apple Clang does not allow non-default destructors 
-// in some cases the destructor uses noexcept(false).
-return std::shared_ptr<T>( new T(std::forward<Args>(args)... ));
+    // libc++ from Apple Clang does not allow non-default destructors
+    // in some cases the destructor uses noexcept(false).
+    return std::shared_ptr<T>(new T(std::forward<Args>(args)...));
 #else
-return std::make_shared<T>(std::forward<Args>(args)... );
+    return std::make_shared<T>(std::forward<Args>(args)...);
 #endif
-} 
-}
+  }
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/src/one/EDAnalyzerBase.cc b/FWCore/Framework/src/one/EDAnalyzerBase.cc
index ff8efe86e68f1..0d7d84b9f3199 100644
--- a/FWCore/Framework/src/one/EDAnalyzerBase.cc
+++ b/FWCore/Framework/src/one/EDAnalyzerBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     one::EDAnalyzerBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -28,7 +28,6 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Framework/interface/ConstProductRegistry.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -37,146 +36,125 @@ namespace edm {
     //
     // static data member definitions
     //
-    
+
     //
     // constructors and destructor
     //
-    EDAnalyzerBase::EDAnalyzerBase():
-    moduleDescription_() { }
+    EDAnalyzerBase::EDAnalyzerBase() : moduleDescription_() {}
 
-    EDAnalyzerBase::~EDAnalyzerBase()
-    {
-    }
+    EDAnalyzerBase::~EDAnalyzerBase() {}
 
-    void
-    EDAnalyzerBase::callWhenNewProductsRegistered(std::function<void(BranchDescription const&)> const& func) {
+    void EDAnalyzerBase::callWhenNewProductsRegistered(std::function<void(BranchDescription const&)> const& func) {
       callWhenNewProductsRegistered_ = func;
     }
 
-    bool
-    EDAnalyzerBase::doEvent(EventPrincipal const& ep, EventSetupImpl const& ci,
-                            ActivityRegistry* act,
-                            ModuleCallingContext const* mcc) {
+    bool EDAnalyzerBase::doEvent(EventPrincipal const& ep,
+                                 EventSetupImpl const& ci,
+                                 ActivityRegistry* act,
+                                 ModuleCallingContext const* mcc) {
       Event e(ep, moduleDescription_, mcc);
       e.setConsumer(this);
       e.setSharedResourcesAcquirer(&resourcesAcquirer_);
-      EventSignalsSentry sentry(act,mcc);
-      const EventSetup c{ci};
+      EventSignalsSentry sentry(act, mcc);
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event)};
       this->analyze(e, c);
       return true;
     }
-    
+
     SharedResourcesAcquirer EDAnalyzerBase::createAcquirer() {
       return SharedResourcesAcquirer{
-        std::vector<std::shared_ptr<SerialTaskQueue>>(1, std::make_shared<SerialTaskQueue>())};
+          std::vector<std::shared_ptr<SerialTaskQueue>>(1, std::make_shared<SerialTaskQueue>())};
     }
-    
-    SerialTaskQueue* EDAnalyzerBase::globalRunsQueue() {return nullptr;}
-    SerialTaskQueue* EDAnalyzerBase::globalLuminosityBlocksQueue() {return nullptr;};
-    
-    void
-    EDAnalyzerBase::doBeginJob() {
+
+    SerialTaskQueue* EDAnalyzerBase::globalRunsQueue() { return nullptr; }
+    SerialTaskQueue* EDAnalyzerBase::globalLuminosityBlocksQueue() { return nullptr; };
+
+    void EDAnalyzerBase::doBeginJob() {
       resourcesAcquirer_ = createAcquirer();
-      
+
       this->beginJob();
     }
-    
-    void
-    EDAnalyzerBase::doEndJob() {
-      this->endJob();
-    }
-    
-    void
-    EDAnalyzerBase::doPreallocate(PreallocationConfiguration const&iPrealloc) {
+
+    void EDAnalyzerBase::doEndJob() { this->endJob(); }
+
+    void EDAnalyzerBase::doPreallocate(PreallocationConfiguration const& iPrealloc) {
       preallocLumis(iPrealloc.numberOfLuminosityBlocks());
     }
-    void EDAnalyzerBase::preallocLumis(unsigned int) {};
+    void EDAnalyzerBase::preallocLumis(unsigned int){};
 
-    void
-    EDAnalyzerBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                               ModuleCallingContext const* mcc) {
+    void EDAnalyzerBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, false);
       r.setConsumer(this);
       Run const& cnstR = r;
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun)};
       this->doBeginRun_(cnstR, c);
     }
-    
-    void
-    EDAnalyzerBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                             ModuleCallingContext const* mcc) {
+
+    void EDAnalyzerBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, true);
       r.setConsumer(this);
       Run const& cnstR = r;
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun)};
       this->doEndRun_(cnstR, c);
     }
-    
-    void
-    EDAnalyzerBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                           ModuleCallingContext const* mcc) {
+
+    void EDAnalyzerBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                                EventSetupImpl const& ci,
+                                                ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
       lb.setConsumer(this);
       LuminosityBlock const& cnstLb = lb;
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                         esGetTokenIndices(Transition::BeginLuminosityBlock)};
       this->doBeginLuminosityBlock_(cnstLb, c);
     }
-    
-    void
-    EDAnalyzerBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                         ModuleCallingContext const* mcc) {
+
+    void EDAnalyzerBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                              EventSetupImpl const& ci,
+                                              ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
       LuminosityBlock const& cnstLb = lb;
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                         esGetTokenIndices(Transition::EndLuminosityBlock)};
       this->doEndLuminosityBlock_(cnstLb, c);
     }
-    
-    void
-    EDAnalyzerBase::doRespondToOpenInputFile(FileBlock const& fb) {
+
+    void EDAnalyzerBase::doRespondToOpenInputFile(FileBlock const& fb) {
       //respondToOpenInputFile(fb);
     }
-    
-    void
-    EDAnalyzerBase::doRespondToCloseInputFile(FileBlock const& fb) {
+
+    void EDAnalyzerBase::doRespondToCloseInputFile(FileBlock const& fb) {
       //respondToCloseInputFile(fb);
     }
-    
+
     void EDAnalyzerBase::doBeginRun_(Run const& rp, EventSetup const& c) {}
     void EDAnalyzerBase::doEndRun_(Run const& rp, EventSetup const& c) {}
     void EDAnalyzerBase::doBeginLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c) {}
     void EDAnalyzerBase::doEndLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c) {}
 
-    void
-    EDAnalyzerBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
+    void EDAnalyzerBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
       ParameterSetDescription desc;
       desc.setUnknown();
       descriptions.addDefault(desc);
     }
-    
-    void
-    EDAnalyzerBase::prevalidate(ConfigurationDescriptions& iConfig) {
-      edmodule_mightGet_config(iConfig);
-    }
-    
+
+    void EDAnalyzerBase::prevalidate(ConfigurationDescriptions& iConfig) { edmodule_mightGet_config(iConfig); }
+
     static const std::string kBaseType("EDAnalyzer");
-    
-    const std::string&
-    EDAnalyzerBase::baseType() {
-      return kBaseType;
-    }
 
-    void
-    EDAnalyzerBase::registerProductsAndCallbacks(EDAnalyzerBase const*, ProductRegistry* reg) {
-      
+    const std::string& EDAnalyzerBase::baseType() { return kBaseType; }
+
+    void EDAnalyzerBase::registerProductsAndCallbacks(EDAnalyzerBase const*, ProductRegistry* reg) {
       if (callWhenNewProductsRegistered_) {
-        
         reg->callForEachBranch(callWhenNewProductsRegistered_);
-        
+
         Service<ConstProductRegistry> regService;
         regService->watchProductAdditions(callWhenNewProductsRegistered_);
       }
     }
 
-  }
-}
+  }  // namespace one
+}  // namespace edm
diff --git a/FWCore/Framework/src/one/EDFilterBase.cc b/FWCore/Framework/src/one/EDFilterBase.cc
index 2c765ae6fb0b9..8cf3bdff66989 100644
--- a/FWCore/Framework/src/one/EDFilterBase.cc
+++ b/FWCore/Framework/src/one/EDFilterBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     one::EDFilterBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -25,7 +25,6 @@
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -36,126 +35,113 @@ namespace edm {
     //
     // static data member definitions
     //
-    
+
     //
     // constructors and destructor
     //
-    EDFilterBase::EDFilterBase():
-    ProducerBase(),
-    moduleDescription_(),
-    previousParentage_(),
-    previousParentageId_() { }
-    
-    EDFilterBase::~EDFilterBase()
-    {
-    }
-    
-    bool
-    EDFilterBase::doEvent(EventPrincipal const& ep, EventSetupImpl const& ci,
-                          ActivityRegistry* act,
-                          ModuleCallingContext const* mcc) {
+    EDFilterBase::EDFilterBase() : ProducerBase(), moduleDescription_(), previousParentage_(), previousParentageId_() {}
+
+    EDFilterBase::~EDFilterBase() {}
+
+    bool EDFilterBase::doEvent(EventPrincipal const& ep,
+                               EventSetupImpl const& ci,
+                               ActivityRegistry* act,
+                               ModuleCallingContext const* mcc) {
       Event e(ep, moduleDescription_, mcc);
       e.setConsumer(this);
-      e.setProducer(this,&previousParentage_);
-      bool returnValue =true;
+      e.setProducer(this, &previousParentage_);
+      bool returnValue = true;
       e.setSharedResourcesAcquirer(&resourcesAcquirer_);
-      EventSignalsSentry sentry(act,mcc);
-      const EventSetup c{ci};
+      EventSignalsSentry sentry(act, mcc);
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event)};
       returnValue = this->filter(e, c);
       commit_(e, &previousParentageId_);
       return returnValue;
     }
-    
+
     SharedResourcesAcquirer EDFilterBase::createAcquirer() {
       return SharedResourcesAcquirer{
-        std::vector<std::shared_ptr<SerialTaskQueue>>(1, std::make_shared<SerialTaskQueue>())};
+          std::vector<std::shared_ptr<SerialTaskQueue>>(1, std::make_shared<SerialTaskQueue>())};
     }
 
-    SerialTaskQueue* EDFilterBase::globalRunsQueue() {return nullptr;}
-    SerialTaskQueue* EDFilterBase::globalLuminosityBlocksQueue() {return nullptr;};
+    SerialTaskQueue* EDFilterBase::globalRunsQueue() { return nullptr; }
+    SerialTaskQueue* EDFilterBase::globalLuminosityBlocksQueue() { return nullptr; };
 
-    void
-    EDFilterBase::doBeginJob() {
+    void EDFilterBase::doBeginJob() {
       resourcesAcquirer_ = createAcquirer();
 
       this->beginJob();
     }
-    
-    void
-    EDFilterBase::doEndJob() {
-      this->endJob();
-    }
-    
-    void
-    EDFilterBase::doPreallocate(PreallocationConfiguration const&iPrealloc) {
+
+    void EDFilterBase::doEndJob() { this->endJob(); }
+
+    void EDFilterBase::doPreallocate(PreallocationConfiguration const& iPrealloc) {
       auto const nThreads = iPrealloc.numberOfThreads();
       preallocThreads(nThreads);
       preallocLumis(iPrealloc.numberOfLuminosityBlocks());
     }
-    void EDFilterBase::preallocLumis(unsigned int) {};
+    void EDFilterBase::preallocLumis(unsigned int){};
 
-    void
-    EDFilterBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                             ModuleCallingContext const* mcc) {
+    void EDFilterBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, false);
       r.setConsumer(this);
       Run const& cnstR = r;
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun)};
       this->doBeginRun_(cnstR, c);
       r.setProducer(this);
-      this->doBeginRunProduce_(r,c);
+      this->doBeginRunProduce_(r, c);
       commit_(r);
     }
-    
-    void
-    EDFilterBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                           ModuleCallingContext const* mcc) {
+
+    void EDFilterBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, true);
       r.setConsumer(this);
       Run const& cnstR = r;
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun)};
       this->doEndRun_(cnstR, c);
       r.setProducer(this);
       this->doEndRunProduce_(r, c);
       commit_(r);
     }
-    
-    void
-    EDFilterBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                         ModuleCallingContext const* mcc) {
+
+    void EDFilterBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                              EventSetupImpl const& ci,
+                                              ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
       lb.setConsumer(this);
       LuminosityBlock const& cnstLb = lb;
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                         esGetTokenIndices(Transition::BeginLuminosityBlock)};
       this->doBeginLuminosityBlock_(cnstLb, c);
       lb.setProducer(this);
       this->doBeginLuminosityBlockProduce_(lb, c);
       commit_(lb);
     }
-    
-    void
-    EDFilterBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                       ModuleCallingContext const* mcc) {
+
+    void EDFilterBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                            EventSetupImpl const& ci,
+                                            ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
       LuminosityBlock const& cnstLb = lb;
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                         esGetTokenIndices(Transition::EndLuminosityBlock)};
       this->doEndLuminosityBlock_(cnstLb, c);
       lb.setProducer(this);
       this->doEndLuminosityBlockProduce_(lb, c);
       commit_(lb);
     }
-    
-    void
-    EDFilterBase::doRespondToOpenInputFile(FileBlock const& fb) {
+
+    void EDFilterBase::doRespondToOpenInputFile(FileBlock const& fb) {
       //respondToOpenInputFile(fb);
     }
-    
-    void
-    EDFilterBase::doRespondToCloseInputFile(FileBlock const& fb) {
+
+    void EDFilterBase::doRespondToCloseInputFile(FileBlock const& fb) {
       //respondToCloseInputFile(fb);
     }
-    
+
     void EDFilterBase::doBeginRun_(Run const& rp, EventSetup const& c) {}
     void EDFilterBase::doEndRun_(Run const& rp, EventSetup const& c) {}
     void EDFilterBase::doBeginLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c) {}
@@ -165,25 +151,18 @@ namespace edm {
     void EDFilterBase::doEndRunProduce_(Run& rp, EventSetup const& c) {}
     void EDFilterBase::doBeginLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c) {}
     void EDFilterBase::doEndLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c) {}
-    
-    void
-    EDFilterBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
+
+    void EDFilterBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
       ParameterSetDescription desc;
       desc.setUnknown();
       descriptions.addDefault(desc);
     }
-    
-    void
-    EDFilterBase::prevalidate(ConfigurationDescriptions& iConfig) {
-      edmodule_mightGet_config(iConfig);
-    }
-    
+
+    void EDFilterBase::prevalidate(ConfigurationDescriptions& iConfig) { edmodule_mightGet_config(iConfig); }
+
     static const std::string kBaseType("EDFilter");
-    
-    const std::string&
-    EDFilterBase::baseType() {
-      return kBaseType;
-    }
 
-  }
-}
+    const std::string& EDFilterBase::baseType() { return kBaseType; }
+
+  }  // namespace one
+}  // namespace edm
diff --git a/FWCore/Framework/src/one/EDProducerBase.cc b/FWCore/Framework/src/one/EDProducerBase.cc
index 78ba719f053b7..65fef9ba022d9 100644
--- a/FWCore/Framework/src/one/EDProducerBase.cc
+++ b/FWCore/Framework/src/one/EDProducerBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     one::EDProducerBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -25,7 +25,6 @@
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -35,127 +34,114 @@ namespace edm {
     //
     // static data member definitions
     //
-    
+
     //
     // constructors and destructor
     //
-    EDProducerBase::EDProducerBase():
-    ProducerBase(),
-    moduleDescription_(),
-    previousParentage_(),
-    previousParentageId_() { }
-    
-    EDProducerBase::~EDProducerBase()
-    {
-    }
-    
-    bool
-    EDProducerBase::doEvent(EventPrincipal const& ep, EventSetupImpl const& ci,
-                            ActivityRegistry* act,
-                            ModuleCallingContext const* mcc) {
+    EDProducerBase::EDProducerBase()
+        : ProducerBase(), moduleDescription_(), previousParentage_(), previousParentageId_() {}
+
+    EDProducerBase::~EDProducerBase() {}
+
+    bool EDProducerBase::doEvent(EventPrincipal const& ep,
+                                 EventSetupImpl const& ci,
+                                 ActivityRegistry* act,
+                                 ModuleCallingContext const* mcc) {
       Event e(ep, moduleDescription_, mcc);
       e.setConsumer(this);
       e.setProducer(this, &previousParentage_);
       e.setSharedResourcesAcquirer(&resourcesAcquirer_);
-      EventSignalsSentry sentry(act,mcc);
-      const EventSetup c{ci};
+      EventSignalsSentry sentry(act, mcc);
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::Event), esGetTokenIndices(Transition::Event)};
       this->produce(e, c);
       commit_(e, &previousParentageId_);
       return true;
     }
-    
+
     SharedResourcesAcquirer EDProducerBase::createAcquirer() {
       return SharedResourcesAcquirer{
-        std::vector<std::shared_ptr<SerialTaskQueue>>(1, std::make_shared<SerialTaskQueue>())};
+          std::vector<std::shared_ptr<SerialTaskQueue>>(1, std::make_shared<SerialTaskQueue>())};
     }
 
-    SerialTaskQueue* EDProducerBase::globalRunsQueue() {return nullptr;}
-    SerialTaskQueue* EDProducerBase::globalLuminosityBlocksQueue() {return nullptr;};
+    SerialTaskQueue* EDProducerBase::globalRunsQueue() { return nullptr; }
+    SerialTaskQueue* EDProducerBase::globalLuminosityBlocksQueue() { return nullptr; };
 
-    void
-    EDProducerBase::doBeginJob() {
+    void EDProducerBase::doBeginJob() {
       resourcesAcquirer_ = createAcquirer();
-      
+
       this->beginJob();
     }
-    
-    void
-    EDProducerBase::doEndJob() {
-      this->endJob();
-    }
-    
-    void
-    EDProducerBase::doPreallocate(PreallocationConfiguration const& iPrealloc) {
+
+    void EDProducerBase::doEndJob() { this->endJob(); }
+
+    void EDProducerBase::doPreallocate(PreallocationConfiguration const& iPrealloc) {
       auto const nThreads = iPrealloc.numberOfThreads();
       preallocThreads(nThreads);
       preallocLumis(iPrealloc.numberOfLuminosityBlocks());
     }
-    
-    void EDProducerBase::preallocLumis(unsigned int) {};
 
-   
-    void
-    EDProducerBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                               ModuleCallingContext const* mcc) {
+    void EDProducerBase::preallocLumis(unsigned int){};
+
+    void EDProducerBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, false);
       r.setConsumer(this);
       Run const& cnstR = r;
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::BeginRun), esGetTokenIndices(Transition::BeginRun)};
       this->doBeginRun_(cnstR, c);
       r.setProducer(this);
-      this->doBeginRunProduce_(r,c);
+      this->doBeginRunProduce_(r, c);
       commit_(r);
     }
-    
-    void
-    EDProducerBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci,
-                             ModuleCallingContext const* mcc) {
+
+    void EDProducerBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const& ci, ModuleCallingContext const* mcc) {
       Run r(rp, moduleDescription_, mcc, true);
       r.setConsumer(this);
       Run const& cnstR = r;
       r.setProducer(this);
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), esGetTokenIndices(Transition::EndRun)};
       this->doEndRunProduce_(r, c);
       this->doEndRun_(cnstR, c);
       commit_(r);
     }
-    
-    void
-    EDProducerBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                           ModuleCallingContext const* mcc) {
+
+    void EDProducerBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                                EventSetupImpl const& ci,
+                                                ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
       lb.setConsumer(this);
       LuminosityBlock const& cnstLb = lb;
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                         esGetTokenIndices(Transition::BeginLuminosityBlock)};
       this->doBeginLuminosityBlock_(cnstLb, c);
       lb.setProducer(this);
       this->doBeginLuminosityBlockProduce_(lb, c);
       commit_(lb);
     }
-    
-    void
-    EDProducerBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp, EventSetupImpl const& ci,
-                                         ModuleCallingContext const* mcc) {
+
+    void EDProducerBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                              EventSetupImpl const& ci,
+                                              ModuleCallingContext const* mcc) {
       LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
       lb.setProducer(this);
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                         esGetTokenIndices(Transition::EndLuminosityBlock)};
       this->doEndLuminosityBlockProduce_(lb, c);
       LuminosityBlock const& cnstLb = lb;
       this->doEndLuminosityBlock_(cnstLb, c);
       commit_(lb);
     }
-    
-    void
-    EDProducerBase::doRespondToOpenInputFile(FileBlock const& fb) {
+
+    void EDProducerBase::doRespondToOpenInputFile(FileBlock const& fb) {
       //respondToOpenInputFile(fb);
     }
-    
-    void
-    EDProducerBase::doRespondToCloseInputFile(FileBlock const& fb) {
+
+    void EDProducerBase::doRespondToCloseInputFile(FileBlock const& fb) {
       //respondToCloseInputFile(fb);
     }
-    
+
     void EDProducerBase::doBeginRun_(Run const& rp, EventSetup const& c) {}
     void EDProducerBase::doEndRun_(Run const& rp, EventSetup const& c) {}
     void EDProducerBase::doBeginLuminosityBlock_(LuminosityBlock const& lbp, EventSetup const& c) {}
@@ -165,25 +151,18 @@ namespace edm {
     void EDProducerBase::doEndRunProduce_(Run& rp, EventSetup const& c) {}
     void EDProducerBase::doBeginLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c) {}
     void EDProducerBase::doEndLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c) {}
-    
-    void
-    EDProducerBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
+
+    void EDProducerBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
       ParameterSetDescription desc;
       desc.setUnknown();
       descriptions.addDefault(desc);
     }
-    
-    void
-    EDProducerBase::prevalidate(ConfigurationDescriptions& iConfig) {
-      edmodule_mightGet_config(iConfig);
-    }
-    
+
+    void EDProducerBase::prevalidate(ConfigurationDescriptions& iConfig) { edmodule_mightGet_config(iConfig); }
+
     static const std::string kBaseType("EDProducer");
-    
-    const std::string&
-    EDProducerBase::baseType() {
-      return kBaseType;
-    }
 
-  }
-}
+    const std::string& EDProducerBase::baseType() { return kBaseType; }
+
+  }  // namespace one
+}  // namespace edm
diff --git a/FWCore/Framework/src/one/OutputModuleBase.cc b/FWCore/Framework/src/one/OutputModuleBase.cc
index 4a95640b33676..96bbf923305d6 100644
--- a/FWCore/Framework/src/one/OutputModuleBase.cc
+++ b/FWCore/Framework/src/one/OutputModuleBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     OutputModuleBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -42,79 +42,73 @@ namespace edm {
   namespace one {
 
     // -------------------------------------------------------
-    OutputModuleBase::OutputModuleBase(ParameterSet const& pset) :
-    maxEvents_(-1),
-    remainingEvents_(maxEvents_),
-    keptProducts_(),
-    hasNewlyDroppedBranch_(),
-    process_name_(),
-    productSelectorRules_(pset, "outputCommands", "OutputModule"),
-    productSelector_(),
-    moduleDescription_(),
-    wantAllEvents_(false),
-    selectors_(),
-    selector_config_id_(),
-    droppedBranchIDToKeptBranchID_(),
-    branchIDLists_(new BranchIDLists),
-    origBranchIDLists_(nullptr),
-    thinnedAssociationsHelper_(new ThinnedAssociationsHelper) {
-      
+    OutputModuleBase::OutputModuleBase(ParameterSet const& pset)
+        : maxEvents_(-1),
+          remainingEvents_(maxEvents_),
+          keptProducts_(),
+          hasNewlyDroppedBranch_(),
+          process_name_(),
+          productSelectorRules_(pset, "outputCommands", "OutputModule"),
+          productSelector_(),
+          moduleDescription_(),
+          wantAllEvents_(false),
+          selectors_(),
+          selector_config_id_(),
+          droppedBranchIDToKeptBranchID_(),
+          branchIDLists_(new BranchIDLists),
+          origBranchIDLists_(nullptr),
+          thinnedAssociationsHelper_(new ThinnedAssociationsHelper) {
       hasNewlyDroppedBranch_.fill(false);
-      
+
       Service<service::TriggerNamesService> tns;
       process_name_ = tns->getProcessName();
-      
-      selectEvents_ =
-      pset.getUntrackedParameterSet("SelectEvents", ParameterSet());
-      
-      selectEvents_.registerIt(); // Just in case this PSet is not registered
-      
+
+      selectEvents_ = pset.getUntrackedParameterSet("SelectEvents", ParameterSet());
+
+      selectEvents_.registerIt();  // Just in case this PSet is not registered
+
       selector_config_id_ = selectEvents_.id();
-      
+
       //need to set wantAllEvents_ in constructor
       // we will make the remaining selectors once we know how many streams
       selectors_.resize(1);
-      wantAllEvents_ = detail::configureEventSelector(selectEvents_,
-                                                      process_name_,
-                                                      getAllTriggerNames(),
-                                                      selectors_[0],
-                                                      consumesCollector());
-
+      wantAllEvents_ = detail::configureEventSelector(
+          selectEvents_, process_name_, getAllTriggerNames(), selectors_[0], consumesCollector());
     }
-    
+
     void OutputModuleBase::configure(OutputModuleDescription const& desc) {
       remainingEvents_ = maxEvents_ = desc.maxEvents_;
       origBranchIDLists_ = desc.branchIDLists_;
       subProcessParentageHelper_ = desc.subProcessParentageHelper_;
     }
-    
+
     void OutputModuleBase::selectProducts(ProductRegistry const& preg,
                                           ThinnedAssociationsHelper const& thinnedAssociationsHelper) {
-      if(productSelector_.initialized()) return;
+      if (productSelector_.initialized())
+        return;
       productSelector_.initialize(productSelectorRules_, preg.allBranchDescriptions());
-      
+
       // TODO: See if we can collapse keptProducts_ and productSelector_ into a
       // single object. See the notes in the header for ProductSelector
       // for more information.
-      
+
       std::map<BranchID, BranchDescription const*> trueBranchIDToKeptBranchDesc;
       std::vector<BranchDescription const*> associationDescriptions;
       std::set<BranchID> keptProductsInEvent;
       std::set<std::string> processesWithSelectedMergeableRunProducts;
 
-      for(auto const& it : preg.productList()) {
+      for (auto const& it : preg.productList()) {
         BranchDescription const& desc = it.second;
-        if(desc.transient()) {
+        if (desc.transient()) {
           // if the class of the branch is marked transient, output nothing
-        } else if(!desc.present() && !desc.produced()) {
+        } else if (!desc.present() && !desc.produced()) {
           // else if the branch containing the product has been previously dropped,
           // output nothing
-        } else if(desc.unwrappedType() == typeid(ThinnedAssociation)) {
+        } else if (desc.unwrappedType() == typeid(ThinnedAssociation)) {
           associationDescriptions.push_back(&desc);
-        } else if(selected(desc)) {
+        } else if (selected(desc)) {
           keepThisBranch(desc, trueBranchIDToKeptBranchDesc, keptProductsInEvent);
-          insertSelectedProcesses(desc,
-                                  processesWithSelectedMergeableRunProducts);
+          insertSelectedProcesses(desc, processesWithSelectedMergeableRunProducts);
         } else {
           // otherwise, output nothing,
           // and mark the fact that there is a newly dropped branch of this type.
@@ -124,12 +118,11 @@ namespace edm {
 
       setProcessesWithSelectedMergeableRunProducts(processesWithSelectedMergeableRunProducts);
 
-      thinnedAssociationsHelper.selectAssociationProducts(associationDescriptions,
-                                                          keptProductsInEvent,
-                                                          keepAssociation_);
+      thinnedAssociationsHelper.selectAssociationProducts(
+          associationDescriptions, keptProductsInEvent, keepAssociation_);
 
-      for(auto association : associationDescriptions) {
-        if(keepAssociation_[association->branchID()]) {
+      for (auto association : associationDescriptions) {
+        if (keepAssociation_[association->branchID()]) {
           keepThisBranch(*association, trueBranchIDToKeptBranchDesc, keptProductsInEvent);
         } else {
           hasNewlyDroppedBranch_[association->branchType()] = true;
@@ -139,15 +132,14 @@ namespace edm {
       // Now fill in a mapping needed in the case that a branch was dropped while its EDAlias was kept.
       ProductSelector::fillDroppedToKept(preg, trueBranchIDToKeptBranchDesc, droppedBranchIDToKeptBranchID_);
 
-      thinnedAssociationsHelper_->updateFromParentProcess(thinnedAssociationsHelper, keepAssociation_, droppedBranchIDToKeptBranchID_);
+      thinnedAssociationsHelper_->updateFromParentProcess(
+          thinnedAssociationsHelper, keepAssociation_, droppedBranchIDToKeptBranchID_);
     }
 
     void OutputModuleBase::keepThisBranch(BranchDescription const& desc,
-                        std::map<BranchID, BranchDescription const*>& trueBranchIDToKeptBranchDesc,
-                        std::set<BranchID>& keptProductsInEvent) {
-
-      ProductSelector::checkForDuplicateKeptBranch(desc,
-                                                   trueBranchIDToKeptBranchDesc);
+                                          std::map<BranchID, BranchDescription const*>& trueBranchIDToKeptBranchDesc,
+                                          std::set<BranchID>& keptProductsInEvent) {
+      ProductSelector::checkForDuplicateKeptBranch(desc, trueBranchIDToKeptBranchDesc);
 
       EDGetToken token;
 
@@ -158,213 +150,180 @@ namespace edm {
       }
 
       switch (desc.branchType()) {
-      case InEvent:
-        {
-          if(desc.produced()) {
+        case InEvent: {
+          if (desc.produced()) {
             keptProductsInEvent.insert(desc.originalBranchID());
           } else {
             keptProductsInEvent.insert(desc.branchID());
           }
-          token = consumes(TypeToGet{desc.unwrappedTypeID(),PRODUCT_TYPE},
-                       InputTag{desc.moduleLabel(),
-                       desc.productInstanceName(),
-                       desc.processName()});
+          token = consumes(TypeToGet{desc.unwrappedTypeID(), PRODUCT_TYPE},
+                           InputTag{desc.moduleLabel(), desc.productInstanceName(), desc.processName()});
           break;
         }
-      case InLumi:
-        {
-          token = consumes<InLumi>(TypeToGet{desc.unwrappedTypeID(),PRODUCT_TYPE},
-                                    InputTag(desc.moduleLabel(),
-                                    desc.productInstanceName(),
-                                    desc.processName()));
+        case InLumi: {
+          token = consumes<InLumi>(TypeToGet{desc.unwrappedTypeID(), PRODUCT_TYPE},
+                                   InputTag(desc.moduleLabel(), desc.productInstanceName(), desc.processName()));
           break;
         }
-      case InRun:
-        {
-          token = consumes<InRun>(TypeToGet{desc.unwrappedTypeID(),PRODUCT_TYPE},
-                                   InputTag(desc.moduleLabel(),
-                                   desc.productInstanceName(),
-                                   desc.processName()));
+        case InRun: {
+          token = consumes<InRun>(TypeToGet{desc.unwrappedTypeID(), PRODUCT_TYPE},
+                                  InputTag(desc.moduleLabel(), desc.productInstanceName(), desc.processName()));
           break;
         }
-      default:
-        assert(false);
-        break;
+        default:
+          assert(false);
+          break;
       }
       // Now put it in the list of selected branches.
       keptProducts_[desc.branchType()].push_back(std::make_pair(&desc, token));
     }
 
-    OutputModuleBase::~OutputModuleBase() { }
-    
+    OutputModuleBase::~OutputModuleBase() {}
+
     SharedResourcesAcquirer OutputModuleBase::createAcquirer() {
       return SharedResourcesAcquirer{
-        std::vector<std::shared_ptr<SerialTaskQueue>>(1, std::make_shared<SerialTaskQueue>())};
+          std::vector<std::shared_ptr<SerialTaskQueue>>(1, std::make_shared<SerialTaskQueue>())};
     }
-    
+
     void OutputModuleBase::doPreallocate(PreallocationConfiguration const& iPC) {
       auto nstreams = iPC.numberOfStreams();
       selectors_.resize(nstreams);
 
       preallocLumis(iPC.numberOfLuminosityBlocks());
-      
+
       bool seenFirst = false;
-      for(auto& s : selectors_) {
-        if(seenFirst) {
-          detail::configureEventSelector(selectEvents_,
-                                         process_name_,
-                                         getAllTriggerNames(),
-                                         s,
-                                         consumesCollector());
+      for (auto& s : selectors_) {
+        if (seenFirst) {
+          detail::configureEventSelector(selectEvents_, process_name_, getAllTriggerNames(), s, consumesCollector());
         } else {
           seenFirst = true;
         }
       }
     }
 
-    void OutputModuleBase::preallocLumis(unsigned int ) {}
+    void OutputModuleBase::preallocLumis(unsigned int) {}
 
     void OutputModuleBase::doBeginJob() {
       resourcesAcquirer_ = createAcquirer();
       this->beginJob();
     }
-    
-    void OutputModuleBase::doEndJob() {
-      endJob();
-    }
-    
-    bool OutputModuleBase::needToRunSelection() const {
-      return !wantAllEvents_;
-    }
 
-    std::vector<ProductResolverIndexAndSkipBit>
-    OutputModuleBase::productsUsedBySelection() const {
+    void OutputModuleBase::doEndJob() { endJob(); }
+
+    bool OutputModuleBase::needToRunSelection() const { return !wantAllEvents_; }
+
+    std::vector<ProductResolverIndexAndSkipBit> OutputModuleBase::productsUsedBySelection() const {
       std::vector<ProductResolverIndexAndSkipBit> returnValue;
       auto const& s = selectors_[0];
       auto const n = s.numberOfTokens();
       returnValue.reserve(n);
-      
-      for(unsigned int i=0; i< n;++i) {
+
+      for (unsigned int i = 0; i < n; ++i) {
         returnValue.emplace_back(uncheckedIndexFrom(s.token(i)));
       }
       return returnValue;
     }
-    
-    bool OutputModuleBase::prePrefetchSelection(StreamID id, EventPrincipal const& ep, ModuleCallingContext const* mcc) {
-      if(wantAllEvents_) return true;
+
+    bool OutputModuleBase::prePrefetchSelection(StreamID id,
+                                                EventPrincipal const& ep,
+                                                ModuleCallingContext const* mcc) {
+      if (wantAllEvents_)
+        return true;
       auto& s = selectors_[id.value()];
       EventForOutput e(ep, moduleDescription_, mcc);
       e.setConsumer(this);
       return s.wantEvent(e);
     }
-    
-    bool
-    OutputModuleBase::doEvent(EventPrincipal const& ep,
-                              EventSetupImpl const&,
-                              ActivityRegistry* act,
-                              ModuleCallingContext const* mcc) {
-      
+
+    bool OutputModuleBase::doEvent(EventPrincipal const& ep,
+                                   EventSetupImpl const&,
+                                   ActivityRegistry* act,
+                                   ModuleCallingContext const* mcc) {
       {
         EventForOutput e(ep, moduleDescription_, mcc);
         e.setConsumer(this);
-        EventSignalsSentry sentry(act,mcc);
+        EventSignalsSentry sentry(act, mcc);
         write(e);
       }
-      if(remainingEvents_ > 0) {
+      if (remainingEvents_ > 0) {
         --remainingEvents_;
       }
       return true;
     }
-    
-    bool
-    OutputModuleBase::doBeginRun(RunPrincipal const& rp,
-                                 EventSetupImpl const&,
-                                 ModuleCallingContext const* mcc) {
+
+    bool OutputModuleBase::doBeginRun(RunPrincipal const& rp, EventSetupImpl const&, ModuleCallingContext const* mcc) {
       RunForOutput r(rp, moduleDescription_, mcc, false);
       r.setConsumer(this);
       doBeginRun_(r);
       return true;
     }
-    
-    bool
-    OutputModuleBase::doEndRun(RunPrincipal const& rp,
-                               EventSetupImpl const&,
-                               ModuleCallingContext const* mcc) {
+
+    bool OutputModuleBase::doEndRun(RunPrincipal const& rp, EventSetupImpl const&, ModuleCallingContext const* mcc) {
       RunForOutput r(rp, moduleDescription_, mcc, true);
       r.setConsumer(this);
       doEndRun_(r);
       return true;
     }
-    
-    void
-    OutputModuleBase::doWriteRun(RunPrincipal const& rp,
-                                 ModuleCallingContext const* mcc,
-                                 MergeableRunProductMetadata const* mrpm) {
+
+    void OutputModuleBase::doWriteRun(RunPrincipal const& rp,
+                                      ModuleCallingContext const* mcc,
+                                      MergeableRunProductMetadata const* mrpm) {
       RunForOutput r(rp, moduleDescription_, mcc, true, mrpm);
       r.setConsumer(this);
       writeRun(r);
     }
-    
-    bool
-    OutputModuleBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
-                                             EventSetupImpl const&,
-                                             ModuleCallingContext const* mcc) {
+
+    bool OutputModuleBase::doBeginLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                                  EventSetupImpl const&,
+                                                  ModuleCallingContext const* mcc) {
       LuminosityBlockForOutput lb(lbp, moduleDescription_, mcc, false);
       lb.setConsumer(this);
       doBeginLuminosityBlock_(lb);
       return true;
     }
-    
-    bool
-    OutputModuleBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
-                                           EventSetupImpl const&,
-                                           ModuleCallingContext const* mcc) {
+
+    bool OutputModuleBase::doEndLuminosityBlock(LuminosityBlockPrincipal const& lbp,
+                                                EventSetupImpl const&,
+                                                ModuleCallingContext const* mcc) {
       LuminosityBlockForOutput lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
       doEndLuminosityBlock_(lb);
 
       return true;
     }
-    
+
     void OutputModuleBase::doWriteLuminosityBlock(LuminosityBlockPrincipal const& lbp,
                                                   ModuleCallingContext const* mcc) {
       LuminosityBlockForOutput lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(this);
       writeLuminosityBlock(lb);
     }
-    
-    void OutputModuleBase::doOpenFile(FileBlock const& fb) {
-      openFile(fb);
-    }
-    
-    void OutputModuleBase::doRespondToOpenInputFile(FileBlock const& fb) {
-      doRespondToOpenInputFile_(fb);
-    }
-    
-    void OutputModuleBase::doRespondToCloseInputFile(FileBlock const& fb) {
-      doRespondToCloseInputFile_(fb);
-    }
-    
+
+    void OutputModuleBase::doOpenFile(FileBlock const& fb) { openFile(fb); }
+
+    void OutputModuleBase::doRespondToOpenInputFile(FileBlock const& fb) { doRespondToOpenInputFile_(fb); }
+
+    void OutputModuleBase::doRespondToCloseInputFile(FileBlock const& fb) { doRespondToCloseInputFile_(fb); }
+
     void OutputModuleBase::doCloseFile() {
-      if(isFileOpen()) {
+      if (isFileOpen()) {
         reallyCloseFile();
       }
     }
-    
-    void OutputModuleBase::reallyCloseFile() {
-    }
-    
-    BranchIDLists const*
-    OutputModuleBase::branchIDLists() {
-      if(!droppedBranchIDToKeptBranchID_.empty()) {
+
+    void OutputModuleBase::reallyCloseFile() {}
+
+    BranchIDLists const* OutputModuleBase::branchIDLists() {
+      if (!droppedBranchIDToKeptBranchID_.empty()) {
         // Make a private copy of the BranchIDLists.
         *branchIDLists_ = *origBranchIDLists_;
         // Check for branches dropped while an EDAlias was kept.
-        for(BranchIDList& branchIDList : *branchIDLists_) {
-          for(BranchID::value_type& branchID : branchIDList) {
+        for (BranchIDList& branchIDList : *branchIDLists_) {
+          for (BranchID::value_type& branchID : branchIDList) {
             // Replace BranchID of each dropped branch with that of the kept alias, so the alias branch will have the product ID of the original branch.
-            std::map<BranchID::value_type, BranchID::value_type>::const_iterator iter = droppedBranchIDToKeptBranchID_.find(branchID);
-            if(iter != droppedBranchIDToKeptBranchID_.end()) {
+            std::map<BranchID::value_type, BranchID::value_type>::const_iterator iter =
+                droppedBranchIDToKeptBranchID_.find(branchID);
+            if (iter != droppedBranchIDToKeptBranchID_.end()) {
               branchID = iter->second;
             }
           }
@@ -373,53 +332,38 @@ namespace edm {
       }
       return origBranchIDLists_;
     }
-    
-    ThinnedAssociationsHelper const*
-    OutputModuleBase::thinnedAssociationsHelper() const {
+
+    ThinnedAssociationsHelper const* OutputModuleBase::thinnedAssociationsHelper() const {
       return thinnedAssociationsHelper_.get();
     }
 
-    ModuleDescription const&
-    OutputModuleBase::description() const {
-      return moduleDescription_;
-    }
-    
-    bool
-    OutputModuleBase::selected(BranchDescription const& desc) const {
-      return productSelector_.selected(desc);
-    }
-    
-    void
-    OutputModuleBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
+    ModuleDescription const& OutputModuleBase::description() const { return moduleDescription_; }
+
+    bool OutputModuleBase::selected(BranchDescription const& desc) const { return productSelector_.selected(desc); }
+
+    void OutputModuleBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
       ParameterSetDescription desc;
       desc.setUnknown();
       descriptions.addDefault(desc);
     }
-    
-    void
-    OutputModuleBase::fillDescription(ParameterSetDescription& desc) {
+
+    void OutputModuleBase::fillDescription(ParameterSetDescription& desc) {
       ProductSelectorRules::fillDescription(desc, "outputCommands");
       EventSelector::fillDescription(desc);
     }
-    
-    void
-    OutputModuleBase::prevalidate(ConfigurationDescriptions& ) {
-    }
-    
-    
+
+    void OutputModuleBase::prevalidate(ConfigurationDescriptions&) {}
+
     static const std::string kBaseType("OutputModule");
-    const std::string&
-    OutputModuleBase::baseType() {
-      return kBaseType;
-    }
-    
-    void
-    OutputModuleBase::setEventSelectionInfo(std::map<std::string, std::vector<std::pair<std::string, int> > > const& outputModulePathPositions,
-                                        bool anyProductProduced) {
+    const std::string& OutputModuleBase::baseType() { return kBaseType; }
+
+    void OutputModuleBase::setEventSelectionInfo(
+        std::map<std::string, std::vector<std::pair<std::string, int>>> const& outputModulePathPositions,
+        bool anyProductProduced) {
       selector_config_id_ = detail::registerProperSelectionInfo(getParameterSet(selector_config_id_),
                                                                 description().moduleLabel(),
                                                                 outputModulePathPositions,
                                                                 anyProductProduced);
     }
-  }
-}
+  }  // namespace one
+}  // namespace edm
diff --git a/FWCore/Framework/src/one/analyzerImplementors.cc b/FWCore/Framework/src/one/analyzerImplementors.cc
index 2a55dc4325503..f52c560b76988 100644
--- a/FWCore/Framework/src/one/analyzerImplementors.cc
+++ b/FWCore/Framework/src/one/analyzerImplementors.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     analyzerImplementors
-// 
+//
 // Implementation:
 //     Explicitly instantiate implementor templates for EDAnalyzerBase
 //
@@ -22,6 +22,6 @@ namespace edm {
       template class SharedResourcesUser<edm::one::EDAnalyzerBase>;
       template class RunWatcher<edm::one::EDAnalyzerBase>;
       template class LuminosityBlockWatcher<edm::one::EDAnalyzerBase>;
-    }
-  }
-}
+    }  // namespace impl
+  }    // namespace one
+}  // namespace edm
diff --git a/FWCore/Framework/src/one/filterImplementors.cc b/FWCore/Framework/src/one/filterImplementors.cc
index fbd21a91fe8b2..950b28e7bc847 100644
--- a/FWCore/Framework/src/one/filterImplementors.cc
+++ b/FWCore/Framework/src/one/filterImplementors.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Package
 // Class  :     producerImplementors
-// 
+//
 // Implementation:
 //     Explicitly instantiate implementor templates for EDFilterBase
 //
@@ -26,6 +26,6 @@ namespace edm {
       template class EndRunProducer<edm::one::EDFilterBase>;
       template class BeginLuminosityBlockProducer<edm::one::EDFilterBase>;
       template class EndLuminosityBlockProducer<edm::one::EDFilterBase>;
-    }
-  }
-}
+    }  // namespace impl
+  }    // namespace one
+}  // namespace edm
diff --git a/FWCore/Framework/src/one/implementorsMethods.h b/FWCore/Framework/src/one/implementorsMethods.h
index 8998dfbdfe220..71c7e50a4c25a 100644
--- a/FWCore/Framework/src/one/implementorsMethods.h
+++ b/FWCore/Framework/src/one/implementorsMethods.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // File  :     implementorsMethods
-// 
+//
 /**\file implementorsMethods.h "FWCore/Framework/src/one/implementorsMethods.h"
 
  Description: [one line class summary]
@@ -30,65 +30,61 @@
 namespace edm {
   namespace one {
     namespace impl {
-      template<typename T>
+      template <typename T>
       void SharedResourcesUser<T>::usesResource(std::string const& iName) {
         resourceNames_.insert(iName);
         SharedResourcesRegistry::instance()->registerSharedResource(iName);
       }
-      template<typename T>
+      template <typename T>
       void SharedResourcesUser<T>::usesResource() {
         this->usesResource(SharedResourcesRegistry::kLegacyModuleResourceName);
-
       }
-      
-      template<typename T>
+
+      template <typename T>
       SharedResourcesAcquirer SharedResourcesUser<T>::createAcquirer() {
-        std::vector<std::string> v(resourceNames_.begin(),resourceNames_.end());
+        std::vector<std::string> v(resourceNames_.begin(), resourceNames_.end());
         return SharedResourcesRegistry::instance()->createAcquirer(v);
       }
-      
-      
-      template< typename T>
+
+      template <typename T>
       void RunWatcher<T>::doBeginRun_(Run const& rp, EventSetup const& c) {
-        this->beginRun(rp,c);
+        this->beginRun(rp, c);
       }
-      template< typename T>
+      template <typename T>
       void RunWatcher<T>::doEndRun_(Run const& rp, EventSetup const& c) {
-        this->endRun(rp,c);
+        this->endRun(rp, c);
       }
 
-      
-      template< typename T>
+      template <typename T>
       void LuminosityBlockWatcher<T>::doBeginLuminosityBlock_(LuminosityBlock const& rp, EventSetup const& c) {
-        this->beginLuminosityBlock(rp,c);
+        this->beginLuminosityBlock(rp, c);
       }
-      template< typename T>
+      template <typename T>
       void LuminosityBlockWatcher<T>::doEndLuminosityBlock_(LuminosityBlock const& rp, EventSetup const& c) {
-        this->endLuminosityBlock(rp,c);
+        this->endLuminosityBlock(rp, c);
       }
 
-      template< typename T>
+      template <typename T>
       void BeginRunProducer<T>::doBeginRunProduce_(Run& rp, EventSetup const& c) {
-        this->beginRunProduce(rp,c);
+        this->beginRunProduce(rp, c);
       }
 
-      template< typename T>
+      template <typename T>
       void EndRunProducer<T>::doEndRunProduce_(Run& rp, EventSetup const& c) {
-        this->endRunProduce(rp,c);
+        this->endRunProduce(rp, c);
       }
 
-      template< typename T>
+      template <typename T>
       void BeginLuminosityBlockProducer<T>::doBeginLuminosityBlockProduce_(LuminosityBlock& rp, EventSetup const& c) {
-        this->beginLuminosityBlockProduce(rp,c);
+        this->beginLuminosityBlockProduce(rp, c);
       }
-      
-      template< typename T>
+
+      template <typename T>
       void EndLuminosityBlockProducer<T>::doEndLuminosityBlockProduce_(LuminosityBlock& rp, EventSetup const& c) {
-        this->endLuminosityBlockProduce(rp,c);
+        this->endLuminosityBlockProduce(rp, c);
       }
-    }
-  }
-}
-
+    }  // namespace impl
+  }    // namespace one
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/one/outputmoduleImplementors.cc b/FWCore/Framework/src/one/outputmoduleImplementors.cc
index f2d6212cef8d8..577a6cd43fdb4 100644
--- a/FWCore/Framework/src/one/outputmoduleImplementors.cc
+++ b/FWCore/Framework/src/one/outputmoduleImplementors.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     outputmoduleImplementors
-// 
+//
 // Implementation:
 //     Explicitly instantiate implementor templates for OutputModuleBase
 //
@@ -25,27 +25,15 @@ namespace edm {
       template class SharedResourcesUser<edm::one::OutputModuleBase>;
     }
     namespace outputmodule {
-      void RunWatcher::doBeginRun_(RunForOutput const& r) {
-        beginRun(r);
-      }
-      void RunWatcher::doEndRun_(RunForOutput const& r) {
-        endRun(r);
-      }
-      
+      void RunWatcher::doBeginRun_(RunForOutput const& r) { beginRun(r); }
+      void RunWatcher::doEndRun_(RunForOutput const& r) { endRun(r); }
+
       void LuminosityBlockWatcher::doBeginLuminosityBlock_(LuminosityBlockForOutput const& lb) {
         beginLuminosityBlock(lb);
       }
-      void LuminosityBlockWatcher::doEndLuminosityBlock_(LuminosityBlockForOutput const& lb) {
-        endLuminosityBlock(lb);
-      }
-      void InputFileWatcher::doRespondToOpenInputFile_(FileBlock const& iB)
-      {
-        respondToOpenInputFile(iB);
-      }
-      void InputFileWatcher::doRespondToCloseInputFile_(FileBlock const& iB)
-      {
-        respondToCloseInputFile(iB);
-      }
-    }
-  }
-}
+      void LuminosityBlockWatcher::doEndLuminosityBlock_(LuminosityBlockForOutput const& lb) { endLuminosityBlock(lb); }
+      void InputFileWatcher::doRespondToOpenInputFile_(FileBlock const& iB) { respondToOpenInputFile(iB); }
+      void InputFileWatcher::doRespondToCloseInputFile_(FileBlock const& iB) { respondToCloseInputFile(iB); }
+    }  // namespace outputmodule
+  }    // namespace one
+}  // namespace edm
diff --git a/FWCore/Framework/src/one/producerImplementors.cc b/FWCore/Framework/src/one/producerImplementors.cc
index 324f3fbd441af..aebb7195aa7f2 100644
--- a/FWCore/Framework/src/one/producerImplementors.cc
+++ b/FWCore/Framework/src/one/producerImplementors.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Package
 // Class  :     producerImplementors
-// 
+//
 // Implementation:
 //     Explicitly instantiate implementor templates for EDProducerBase
 //
@@ -26,6 +26,6 @@ namespace edm {
       template class EndRunProducer<edm::one::EDProducerBase>;
       template class BeginLuminosityBlockProducer<edm::one::EDProducerBase>;
       template class EndLuminosityBlockProducer<edm::one::EDProducerBase>;
-    }
-  }
-}
+    }  // namespace impl
+  }    // namespace one
+}  // namespace edm
diff --git a/FWCore/Framework/src/stream/EDAnalyzerAdaptorBase.cc b/FWCore/Framework/src/stream/EDAnalyzerAdaptorBase.cc
index 5a9b7459dcc20..01725bf881819 100644
--- a/FWCore/Framework/src/stream/EDAnalyzerAdaptorBase.cc
+++ b/FWCore/Framework/src/stream/EDAnalyzerAdaptorBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::stream::EDAnalyzerAdaptorBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -39,18 +39,15 @@ using namespace edm::stream;
 //
 // constructors and destructor
 //
-EDAnalyzerAdaptorBase::EDAnalyzerAdaptorBase()
-{
-}
+EDAnalyzerAdaptorBase::EDAnalyzerAdaptorBase() {}
 
 // EDAnalyzerAdaptorBase::EDAnalyzerAdaptorBase(const EDAnalyzerAdaptorBase& rhs)
 // {
 //    // do actual copying here;
 // }
 
-EDAnalyzerAdaptorBase::~EDAnalyzerAdaptorBase()
-{
-  for(auto m: m_streamModules) {
+EDAnalyzerAdaptorBase::~EDAnalyzerAdaptorBase() {
+  for (auto m : m_streamModules) {
     delete m;
   }
 }
@@ -70,165 +67,142 @@ EDAnalyzerAdaptorBase::~EDAnalyzerAdaptorBase()
 //
 // member functions
 //
-void
-EDAnalyzerAdaptorBase::doPreallocate(PreallocationConfiguration const& iPrealloc) {
-  m_streamModules.resize(iPrealloc.numberOfStreams(),
-                         static_cast<stream::EDAnalyzerBase*>(nullptr));
+void EDAnalyzerAdaptorBase::doPreallocate(PreallocationConfiguration const& iPrealloc) {
+  m_streamModules.resize(iPrealloc.numberOfStreams(), static_cast<stream::EDAnalyzerBase*>(nullptr));
   setupStreamModules();
   preallocLumis(iPrealloc.numberOfLuminosityBlocks());
 }
 
-void
-EDAnalyzerAdaptorBase::registerProductsAndCallbacks(EDAnalyzerAdaptorBase const*, ProductRegistry* reg) {
-  for(auto mod : m_streamModules) {
+void EDAnalyzerAdaptorBase::registerProductsAndCallbacks(EDAnalyzerAdaptorBase const*, ProductRegistry* reg) {
+  for (auto mod : m_streamModules) {
     mod->registerProductsAndCallbacks(mod, reg);
   }
 }
 
-void
-EDAnalyzerAdaptorBase::itemsToGet(BranchType iType, std::vector<ProductResolverIndexAndSkipBit>& iIndices) const {
+void EDAnalyzerAdaptorBase::itemsToGet(BranchType iType, std::vector<ProductResolverIndexAndSkipBit>& iIndices) const {
   assert(not m_streamModules.empty());
-  m_streamModules[0]->itemsToGet(iType,iIndices);
+  m_streamModules[0]->itemsToGet(iType, iIndices);
 }
-void
-EDAnalyzerAdaptorBase::itemsMayGet(BranchType iType, std::vector<ProductResolverIndexAndSkipBit>& iIndices) const {
+void EDAnalyzerAdaptorBase::itemsMayGet(BranchType iType, std::vector<ProductResolverIndexAndSkipBit>& iIndices) const {
   assert(not m_streamModules.empty());
-  m_streamModules[0]->itemsMayGet(iType,iIndices);  
+  m_streamModules[0]->itemsMayGet(iType, iIndices);
 }
 
-std::vector<edm::ProductResolverIndexAndSkipBit> const&
-EDAnalyzerAdaptorBase::itemsToGetFrom(BranchType iType) const {
+std::vector<edm::ProductResolverIndexAndSkipBit> const& EDAnalyzerAdaptorBase::itemsToGetFrom(BranchType iType) const {
   assert(not m_streamModules.empty());
   return m_streamModules[0]->itemsToGetFrom(iType);
 }
 
-void
-EDAnalyzerAdaptorBase::updateLookup(BranchType iType,
-                                    ProductResolverIndexHelper const& iHelper,
-                                    bool iPrefetchMayGet) {
-  for(auto mod: m_streamModules) {
-    mod->updateLookup(iType,iHelper,iPrefetchMayGet);
+void EDAnalyzerAdaptorBase::updateLookup(BranchType iType,
+                                         ProductResolverIndexHelper const& iHelper,
+                                         bool iPrefetchMayGet) {
+  for (auto mod : m_streamModules) {
+    mod->updateLookup(iType, iHelper, iPrefetchMayGet);
   }
 }
 
-const edm::EDConsumerBase*
-EDAnalyzerAdaptorBase::consumer() const {
-  return m_streamModules[0];
+void EDAnalyzerAdaptorBase::updateLookup(eventsetup::ESRecordsToProxyIndices const& iPI) {
+  for (auto mod : m_streamModules) {
+    mod->updateLookup(iPI);
+  }
 }
 
-void
-EDAnalyzerAdaptorBase::modulesWhoseProductsAreConsumed(std::vector<ModuleDescription const*>& modules,
-                                                       ProductRegistry const& preg,
-                                                       std::map<std::string, ModuleDescription const*> const& labelsToDesc,
-                                                       std::string const& processName) const {
+const edm::EDConsumerBase* EDAnalyzerAdaptorBase::consumer() const { return m_streamModules[0]; }
+
+void EDAnalyzerAdaptorBase::modulesWhoseProductsAreConsumed(
+    std::vector<ModuleDescription const*>& modules,
+    ProductRegistry const& preg,
+    std::map<std::string, ModuleDescription const*> const& labelsToDesc,
+    std::string const& processName) const {
   assert(not m_streamModules.empty());
   return m_streamModules[0]->modulesWhoseProductsAreConsumed(modules, preg, labelsToDesc, processName);
 }
 
-void
-EDAnalyzerAdaptorBase::convertCurrentProcessAlias(std::string const& processName) {
-  for(auto mod: m_streamModules) {
+void EDAnalyzerAdaptorBase::convertCurrentProcessAlias(std::string const& processName) {
+  for (auto mod : m_streamModules) {
     mod->convertCurrentProcessAlias(processName);
   }
 }
 
-std::vector<edm::ConsumesInfo>
-EDAnalyzerAdaptorBase::consumesInfo() const {
+std::vector<edm::ConsumesInfo> EDAnalyzerAdaptorBase::consumesInfo() const {
   assert(not m_streamModules.empty());
   return m_streamModules[0]->consumesInfo();
 }
 
-bool
-EDAnalyzerAdaptorBase::doEvent(EventPrincipal const& ep, EventSetupImpl const& ci,
-                               ActivityRegistry* act,
-                               ModuleCallingContext const* mcc) {
-  assert(ep.streamID()<m_streamModules.size());
+bool EDAnalyzerAdaptorBase::doEvent(EventPrincipal const& ep,
+                                    EventSetupImpl const& ci,
+                                    ActivityRegistry* act,
+                                    ModuleCallingContext const* mcc) {
+  assert(ep.streamID() < m_streamModules.size());
   auto mod = m_streamModules[ep.streamID()];
   Event e(ep, moduleDescription_, mcc);
   e.setConsumer(mod);
-  const EventSetup c{ci};
-  EventSignalsSentry sentry(act,mcc);
+  const EventSetup c{ci, static_cast<unsigned int>(Transition::Event), mod->esGetTokenIndices(Transition::Event)};
+  EventSignalsSentry sentry(act, mcc);
   mod->analyze(e, c);
   return true;
 }
-void
-EDAnalyzerAdaptorBase::doBeginJob() {
-  
-}
+void EDAnalyzerAdaptorBase::doBeginJob() {}
 
-void
-EDAnalyzerAdaptorBase::doBeginStream(StreamID id) {
-  m_streamModules[id]->beginStream(id);
-}
-void
-EDAnalyzerAdaptorBase::doEndStream(StreamID id) {
-  m_streamModules[id]->endStream();
-}
+void EDAnalyzerAdaptorBase::doBeginStream(StreamID id) { m_streamModules[id]->beginStream(id); }
+void EDAnalyzerAdaptorBase::doEndStream(StreamID id) { m_streamModules[id]->endStream(); }
 
-void
-EDAnalyzerAdaptorBase::doStreamBeginRun(StreamID id,
-                                        RunPrincipal const& rp,
-                                        EventSetupImpl const& ci,
-                                        ModuleCallingContext const* mcc)
-{
+void EDAnalyzerAdaptorBase::doStreamBeginRun(StreamID id,
+                                             RunPrincipal const& rp,
+                                             EventSetupImpl const& ci,
+                                             ModuleCallingContext const* mcc) {
   auto mod = m_streamModules[id];
   setupRun(mod, rp.index());
-  
+
   Run r(rp, moduleDescription_, mcc, false);
-  const EventSetup c{ci};
+  const EventSetup c{ci, static_cast<unsigned int>(Transition::BeginRun), mod->esGetTokenIndices(Transition::BeginRun)};
   r.setConsumer(mod);
   mod->beginRun(r, c);
-
 }
 
-void
-EDAnalyzerAdaptorBase::doStreamEndRun(StreamID id,
-                    RunPrincipal const& rp,
-                    EventSetupImpl const& ci,
-                    ModuleCallingContext const* mcc)
-{
+void EDAnalyzerAdaptorBase::doStreamEndRun(StreamID id,
+                                           RunPrincipal const& rp,
+                                           EventSetupImpl const& ci,
+                                           ModuleCallingContext const* mcc) {
   auto mod = m_streamModules[id];
   Run r(rp, moduleDescription_, mcc, true);
   r.setConsumer(mod);
-  const EventSetup c{ci};
+  const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), mod->esGetTokenIndices(Transition::EndRun)};
   mod->endRun(r, c);
-  streamEndRunSummary(mod,r,c);
+  streamEndRunSummary(mod, r, c);
 }
 
-void
-EDAnalyzerAdaptorBase::doStreamBeginLuminosityBlock(StreamID id,
-                                                    LuminosityBlockPrincipal const& lbp,
-                                                    EventSetupImpl const& ci,
-                                                    ModuleCallingContext const* mcc) {
+void EDAnalyzerAdaptorBase::doStreamBeginLuminosityBlock(StreamID id,
+                                                         LuminosityBlockPrincipal const& lbp,
+                                                         EventSetupImpl const& ci,
+                                                         ModuleCallingContext const* mcc) {
   auto mod = m_streamModules[id];
-  setupLuminosityBlock(mod,lbp.index());
-  
+  setupLuminosityBlock(mod, lbp.index());
+
   LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
   lb.setConsumer(mod);
-  const EventSetup c{ci};
+  const EventSetup c{ci,
+                     static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                     mod->esGetTokenIndices(Transition::BeginLuminosityBlock)};
   mod->beginLuminosityBlock(lb, c);
 }
-void
-EDAnalyzerAdaptorBase::doStreamEndLuminosityBlock(StreamID id,
-                                LuminosityBlockPrincipal const& lbp,
-                                EventSetupImpl const& ci,
-                                ModuleCallingContext const* mcc)
-{
+void EDAnalyzerAdaptorBase::doStreamEndLuminosityBlock(StreamID id,
+                                                       LuminosityBlockPrincipal const& lbp,
+                                                       EventSetupImpl const& ci,
+                                                       ModuleCallingContext const* mcc) {
   auto mod = m_streamModules[id];
   LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
   lb.setConsumer(mod);
-  const EventSetup c{ci};
+  const EventSetup c{ci,
+                     static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                     mod->esGetTokenIndices(Transition::EndLuminosityBlock)};
   mod->endLuminosityBlock(lb, c);
-  streamEndLuminosityBlockSummary(mod,lb, c);
-
+  streamEndLuminosityBlockSummary(mod, lb, c);
 }
 
-void
-EDAnalyzerAdaptorBase::doRespondToOpenInputFile(FileBlock const&){}
-void
-EDAnalyzerAdaptorBase::doRespondToCloseInputFile(FileBlock const&){}
+void EDAnalyzerAdaptorBase::doRespondToOpenInputFile(FileBlock const&) {}
+void EDAnalyzerAdaptorBase::doRespondToCloseInputFile(FileBlock const&) {}
 
-void
-EDAnalyzerAdaptorBase::setModuleDescriptionPtr(EDAnalyzerBase* m) {
+void EDAnalyzerAdaptorBase::setModuleDescriptionPtr(EDAnalyzerBase* m) {
   m->setModuleDescriptionPtr(&moduleDescription_);
 }
diff --git a/FWCore/Framework/src/stream/EDAnalyzerBase.cc b/FWCore/Framework/src/stream/EDAnalyzerBase.cc
index 4ffbca468eed7..3a8576fcc0463 100644
--- a/FWCore/Framework/src/stream/EDAnalyzerBase.cc
+++ b/FWCore/Framework/src/stream/EDAnalyzerBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::stream::EDAnalyzerBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -34,18 +34,14 @@ using namespace edm::stream;
 //
 // constructors and destructor
 //
-EDAnalyzerBase::EDAnalyzerBase(): moduleDescriptionPtr_(nullptr)
-{
-}
+EDAnalyzerBase::EDAnalyzerBase() : moduleDescriptionPtr_(nullptr) {}
 
 // EDAnalyzerBase::EDAnalyzerBase(const EDAnalyzerBase& rhs)
 // {
 //    // do actual copying here;
 // }
 
-EDAnalyzerBase::~EDAnalyzerBase()
-{
-}
+EDAnalyzerBase::~EDAnalyzerBase() {}
 
 //
 // assignment operators
@@ -62,18 +58,14 @@ EDAnalyzerBase::~EDAnalyzerBase()
 //
 // member functions
 //
-void
-EDAnalyzerBase::callWhenNewProductsRegistered(std::function<void(BranchDescription const&)> const& func) {
+void EDAnalyzerBase::callWhenNewProductsRegistered(std::function<void(BranchDescription const&)> const& func) {
   callWhenNewProductsRegistered_ = func;
 }
 
-void
-EDAnalyzerBase::registerProductsAndCallbacks(EDAnalyzerBase const*, ProductRegistry* reg) {
-  
+void EDAnalyzerBase::registerProductsAndCallbacks(EDAnalyzerBase const*, ProductRegistry* reg) {
   if (callWhenNewProductsRegistered_) {
-    
     reg->callForEachBranch(callWhenNewProductsRegistered_);
-    
+
     Service<ConstProductRegistry> regService;
     regService->watchProductAdditions(callWhenNewProductsRegistered_);
   }
@@ -86,21 +78,14 @@ EDAnalyzerBase::registerProductsAndCallbacks(EDAnalyzerBase const*, ProductRegis
 //
 // static member functions
 //
-void
-EDAnalyzerBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
+void EDAnalyzerBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
   ParameterSetDescription desc;
   desc.setUnknown();
   descriptions.addDefault(desc);
 }
 
-void
-EDAnalyzerBase::prevalidate(ConfigurationDescriptions& iConfig) {
-  edmodule_mightGet_config(iConfig);
-}
+void EDAnalyzerBase::prevalidate(ConfigurationDescriptions& iConfig) { edmodule_mightGet_config(iConfig); }
 
 static const std::string kBaseType("EDAnalyzer");
 
-const std::string&
-EDAnalyzerBase::baseType() {
-  return kBaseType;
-}
+const std::string& EDAnalyzerBase::baseType() { return kBaseType; }
diff --git a/FWCore/Framework/src/stream/EDFilterAdaptorBase.cc b/FWCore/Framework/src/stream/EDFilterAdaptorBase.cc
index 240b568732bce..16dc0214ac19e 100644
--- a/FWCore/Framework/src/stream/EDFilterAdaptorBase.cc
+++ b/FWCore/Framework/src/stream/EDFilterAdaptorBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::stream::EDFilterAdaptorBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -26,62 +26,54 @@
 #include "FWCore/Framework/src/EventSignalsSentry.h"
 #include "FWCore/Framework/src/stream/ProducingModuleAdaptorBase.cc"
 
-
-
 using namespace edm::stream;
 namespace edm {
   namespace stream {
-    
+
     //
     // constants, enums and typedefs
     //
-    
+
     //
     // static data member definitions
     //
-    
+
     //
     // constructors and destructor
     //
-    EDFilterAdaptorBase::EDFilterAdaptorBase()
-    {
-    }
-    
-    bool
-    EDFilterAdaptorBase::doEvent(EventPrincipal const& ep, EventSetupImpl const& ci,
-                                 ActivityRegistry* act,
-                                 ModuleCallingContext const* mcc) {
-      assert(ep.streamID()<m_streamModules.size());
+    EDFilterAdaptorBase::EDFilterAdaptorBase() {}
+
+    bool EDFilterAdaptorBase::doEvent(EventPrincipal const& ep,
+                                      EventSetupImpl const& ci,
+                                      ActivityRegistry* act,
+                                      ModuleCallingContext const* mcc) {
+      assert(ep.streamID() < m_streamModules.size());
       auto mod = m_streamModules[ep.streamID()];
       Event e(ep, moduleDescription(), mcc);
       e.setConsumer(mod);
-      e.setProducer(mod,
-                    &mod->previousParentage_,
-                    &mod->gotBranchIDsFromAcquire_);
-      EventSignalsSentry sentry(act,mcc);
-      const EventSetup c{ci};
+      e.setProducer(mod, &mod->previousParentage_, &mod->gotBranchIDsFromAcquire_);
+      EventSignalsSentry sentry(act, mcc);
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::Event), mod->esGetTokenIndices(Transition::Event)};
       bool result = mod->filter(e, c);
       commit(e, &mod->previousParentageId_);
       return result;
     }
-    
-    void
-    EDFilterAdaptorBase::doAcquire(EventPrincipal const& ep, EventSetupImpl const& ci,
-                                   ActivityRegistry* act,
-                                   ModuleCallingContext const* mcc,
-                                   WaitingTaskWithArenaHolder& holder) {
-      assert(ep.streamID()<m_streamModules.size());
+
+    void EDFilterAdaptorBase::doAcquire(EventPrincipal const& ep,
+                                        EventSetupImpl const& ci,
+                                        ActivityRegistry* act,
+                                        ModuleCallingContext const* mcc,
+                                        WaitingTaskWithArenaHolder& holder) {
+      assert(ep.streamID() < m_streamModules.size());
       auto mod = m_streamModules[ep.streamID()];
       Event e(ep, moduleDescription(), mcc);
       e.setConsumer(mod);
-      e.setProducerForAcquire(mod,
-                              nullptr,
-                              mod->gotBranchIDsFromAcquire_);
-      EventAcquireSignalsSentry sentry(act,mcc);
-      const EventSetup c{ci};
+      e.setProducerForAcquire(mod, nullptr, mod->gotBranchIDsFromAcquire_);
+      EventAcquireSignalsSentry sentry(act, mcc);
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::Event), mod->esGetTokenIndices(Transition::Event)};
       mod->doAcquire_(e, c, holder);
     }
 
     template class edm::stream::ProducingModuleAdaptorBase<edm::stream::EDFilterBase>;
-  }
-}
+  }  // namespace stream
+}  // namespace edm
diff --git a/FWCore/Framework/src/stream/EDFilterBase.cc b/FWCore/Framework/src/stream/EDFilterBase.cc
index a953a7d868124..ed88c8c15852c 100644
--- a/FWCore/Framework/src/stream/EDFilterBase.cc
+++ b/FWCore/Framework/src/stream/EDFilterBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::stream::EDFilterBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -31,18 +31,14 @@ using namespace edm::stream;
 //
 // constructors and destructor
 //
-EDFilterBase::EDFilterBase(): moduleDescriptionPtr_(nullptr)
-{
-}
+EDFilterBase::EDFilterBase() : moduleDescriptionPtr_(nullptr) {}
 
 // EDFilterBase::EDFilterBase(const EDFilterBase& rhs)
 // {
 //    // do actual copying here;
 // }
 
-EDFilterBase::~EDFilterBase()
-{
-}
+EDFilterBase::~EDFilterBase() {}
 
 //
 // assignment operators
@@ -67,21 +63,14 @@ EDFilterBase::~EDFilterBase()
 //
 // static member functions
 //
-void
-EDFilterBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
+void EDFilterBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
   ParameterSetDescription desc;
   desc.setUnknown();
   descriptions.addDefault(desc);
 }
 
-void
-EDFilterBase::prevalidate(ConfigurationDescriptions& iConfig) {
-  edmodule_mightGet_config(iConfig);
-}
+void EDFilterBase::prevalidate(ConfigurationDescriptions& iConfig) { edmodule_mightGet_config(iConfig); }
 
 static const std::string kBaseType("EDFilter");
 
-const std::string&
-EDFilterBase::baseType() {
-  return kBaseType;
-}
+const std::string& EDFilterBase::baseType() { return kBaseType; }
diff --git a/FWCore/Framework/src/stream/EDProducerAdaptorBase.cc b/FWCore/Framework/src/stream/EDProducerAdaptorBase.cc
index a061260180507..c9c18fb383023 100644
--- a/FWCore/Framework/src/stream/EDProducerAdaptorBase.cc
+++ b/FWCore/Framework/src/stream/EDProducerAdaptorBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::stream::EDProducerAdaptorBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -26,63 +26,54 @@
 #include "FWCore/Framework/src/EventSignalsSentry.h"
 #include "FWCore/Framework/src/stream/ProducingModuleAdaptorBase.cc"
 
-
-
 using namespace edm::stream;
 namespace edm {
   namespace stream {
-    
+
     //
     // constants, enums and typedefs
     //
-    
+
     //
     // static data member definitions
     //
-    
+
     //
     // constructors and destructor
     //
-    EDProducerAdaptorBase::EDProducerAdaptorBase()
-    {
-    }
-    
-    bool
-    EDProducerAdaptorBase::doEvent(EventPrincipal const& ep, EventSetupImpl const& ci,
-                                   ActivityRegistry* act,
-                                   ModuleCallingContext const* mcc) {
-      assert(ep.streamID()<m_streamModules.size());
+    EDProducerAdaptorBase::EDProducerAdaptorBase() {}
+
+    bool EDProducerAdaptorBase::doEvent(EventPrincipal const& ep,
+                                        EventSetupImpl const& ci,
+                                        ActivityRegistry* act,
+                                        ModuleCallingContext const* mcc) {
+      assert(ep.streamID() < m_streamModules.size());
       auto mod = m_streamModules[ep.streamID()];
       Event e(ep, moduleDescription(), mcc);
       e.setConsumer(mod);
-      e.setProducer(mod,
-                    &mod->previousParentage_,
-                    &mod->gotBranchIDsFromAcquire_);
-      EventSignalsSentry sentry(act,mcc);
-      const EventSetup c{ci};
+      e.setProducer(mod, &mod->previousParentage_, &mod->gotBranchIDsFromAcquire_);
+      EventSignalsSentry sentry(act, mcc);
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::Event), mod->esGetTokenIndices(Transition::Event)};
       mod->produce(e, c);
       commit(e, &mod->previousParentageId_);
       return true;
     }
 
-    void
-    EDProducerAdaptorBase::doAcquire(EventPrincipal const& ep, EventSetupImpl const& ci,
-                                     ActivityRegistry* act,
-                                     ModuleCallingContext const* mcc,
-                                     WaitingTaskWithArenaHolder& holder) {
-      assert(ep.streamID()<m_streamModules.size());
+    void EDProducerAdaptorBase::doAcquire(EventPrincipal const& ep,
+                                          EventSetupImpl const& ci,
+                                          ActivityRegistry* act,
+                                          ModuleCallingContext const* mcc,
+                                          WaitingTaskWithArenaHolder& holder) {
+      assert(ep.streamID() < m_streamModules.size());
       auto mod = m_streamModules[ep.streamID()];
       Event e(ep, moduleDescription(), mcc);
       e.setConsumer(mod);
-      e.setProducerForAcquire(mod,
-                              nullptr,
-                              mod->gotBranchIDsFromAcquire_);
-      EventAcquireSignalsSentry sentry(act,mcc);
-      const EventSetup c{ci};
+      e.setProducerForAcquire(mod, nullptr, mod->gotBranchIDsFromAcquire_);
+      EventAcquireSignalsSentry sentry(act, mcc);
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::Event), mod->esGetTokenIndices(Transition::Event)};
       mod->doAcquire_(e, c, holder);
     }
 
     template class edm::stream::ProducingModuleAdaptorBase<edm::stream::EDProducerBase>;
-  }
-}
-
+  }  // namespace stream
+}  // namespace edm
diff --git a/FWCore/Framework/src/stream/EDProducerBase.cc b/FWCore/Framework/src/stream/EDProducerBase.cc
index 7d0060b0c79c5..c3bc96be3d9dd 100644
--- a/FWCore/Framework/src/stream/EDProducerBase.cc
+++ b/FWCore/Framework/src/stream/EDProducerBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::stream::EDProducerBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -31,18 +31,14 @@ using namespace edm::stream;
 //
 // constructors and destructor
 //
-EDProducerBase::EDProducerBase(): moduleDescriptionPtr_(nullptr)
-{
-}
+EDProducerBase::EDProducerBase() : moduleDescriptionPtr_(nullptr) {}
 
 // EDProducerBase::EDProducerBase(const EDProducerBase& rhs)
 // {
 //    // do actual copying here;
 // }
 
-EDProducerBase::~EDProducerBase()
-{
-}
+EDProducerBase::~EDProducerBase() {}
 
 //
 // assignment operators
@@ -67,21 +63,14 @@ EDProducerBase::~EDProducerBase()
 //
 // static member functions
 //
-void
-EDProducerBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
+void EDProducerBase::fillDescriptions(ConfigurationDescriptions& descriptions) {
   ParameterSetDescription desc;
   desc.setUnknown();
   descriptions.addDefault(desc);
 }
 
-void
-EDProducerBase::prevalidate(ConfigurationDescriptions& iConfig) {
-  edmodule_mightGet_config(iConfig);
-}
+void EDProducerBase::prevalidate(ConfigurationDescriptions& iConfig) { edmodule_mightGet_config(iConfig); }
 
 static const std::string kBaseType("EDProducer");
 
-const std::string&
-EDProducerBase::baseType() {
-  return kBaseType;
-}
+const std::string& EDProducerBase::baseType() { return kBaseType; }
diff --git a/FWCore/Framework/src/stream/ProducingModuleAdaptorBase.cc b/FWCore/Framework/src/stream/ProducingModuleAdaptorBase.cc
index 0e4ad40c6a39b..ad842b5f62cce 100644
--- a/FWCore/Framework/src/stream/ProducingModuleAdaptorBase.cc
+++ b/FWCore/Framework/src/stream/ProducingModuleAdaptorBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Class  :     edm::stream::ProducingModuleAdaptorBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -35,222 +35,206 @@
 //
 namespace edm {
   namespace stream {
-    template< typename T>
-    ProducingModuleAdaptorBase<T>::ProducingModuleAdaptorBase()
-    {
-    }
-    
-    template< typename T>
-    ProducingModuleAdaptorBase<T>::~ProducingModuleAdaptorBase()
-    {
-      for(auto m: m_streamModules) {
+    template <typename T>
+    ProducingModuleAdaptorBase<T>::ProducingModuleAdaptorBase() {}
+
+    template <typename T>
+    ProducingModuleAdaptorBase<T>::~ProducingModuleAdaptorBase() {
+      for (auto m : m_streamModules) {
         delete m;
       }
     }
-    
+
     //
     // member functions
     //
-    
-    template< typename T>
-    void
-    ProducingModuleAdaptorBase<T>::doPreallocate(PreallocationConfiguration const& iPrealloc) {
-      m_streamModules.resize(iPrealloc.numberOfStreams(),
-                             static_cast<T*>(nullptr));
+
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::doPreallocate(PreallocationConfiguration const& iPrealloc) {
+      m_streamModules.resize(iPrealloc.numberOfStreams(), static_cast<T*>(nullptr));
       setupStreamModules();
       preallocLumis(iPrealloc.numberOfLuminosityBlocks());
     }
 
-    
-    template< typename T>
-    void
-    ProducingModuleAdaptorBase<T>::registerProductsAndCallbacks(ProducingModuleAdaptorBase const*, ProductRegistry* reg) {
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::registerProductsAndCallbacks(ProducingModuleAdaptorBase const*,
+                                                                     ProductRegistry* reg) {
       auto firstMod = m_streamModules[0];
-      if(firstMod->registrationCallback() and m_streamModules.size()>1) {
+      if (firstMod->registrationCallback() and m_streamModules.size() > 1) {
         //we have a callback so we will collect all callbacks and create a new callback which calls them all.
-        
+
         std::vector<std::function<void(BranchDescription const&)>> callbacks;
         callbacks.reserve(m_streamModules.size());
-        
-        for(auto mod: m_streamModules) {
+
+        for (auto mod : m_streamModules) {
           callbacks.push_back(mod->registrationCallback());
         }
         //Since only the first module will actually do the registration
         // we will change its callback to call all the callbacks
         firstMod->callWhenNewProductsRegistered([callbacks](BranchDescription const& iBD) {
-          for(auto c: callbacks) {
+          for (auto c : callbacks) {
             c(iBD);
           }
         });
       }
-      firstMod->registerProducts(firstMod,reg,moduleDescription_);
+      firstMod->registerProducts(firstMod, reg, moduleDescription_);
     }
-    
-    template< typename T>
-    void
-    ProducingModuleAdaptorBase<T>::itemsToGet(BranchType iType, std::vector<ProductResolverIndexAndSkipBit>& iIndices) const {
+
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::itemsToGet(BranchType iType,
+                                                   std::vector<ProductResolverIndexAndSkipBit>& iIndices) const {
       assert(not m_streamModules.empty());
-      m_streamModules[0]->itemsToGet(iType,iIndices);
+      m_streamModules[0]->itemsToGet(iType, iIndices);
     }
-    
-    template< typename T>
-    void
-    ProducingModuleAdaptorBase<T>::itemsMayGet(BranchType iType, std::vector<ProductResolverIndexAndSkipBit>& iIndices) const {
+
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::itemsMayGet(BranchType iType,
+                                                    std::vector<ProductResolverIndexAndSkipBit>& iIndices) const {
       assert(not m_streamModules.empty());
-      m_streamModules[0]->itemsMayGet(iType,iIndices);
+      m_streamModules[0]->itemsMayGet(iType, iIndices);
     }
 
-    template<typename T>
-    std::vector<edm::ProductResolverIndexAndSkipBit> const&
-    ProducingModuleAdaptorBase<T>::itemsToGetFrom(BranchType iType) const {
+    template <typename T>
+    std::vector<edm::ProductResolverIndexAndSkipBit> const& ProducingModuleAdaptorBase<T>::itemsToGetFrom(
+        BranchType iType) const {
       assert(not m_streamModules.empty());
       return m_streamModules[0]->itemsToGetFrom(iType);
     }
 
-    template< typename T>
-    void
-    ProducingModuleAdaptorBase<T>::modulesWhoseProductsAreConsumed(std::vector<ModuleDescription const*>& modules,
-                                                                   ProductRegistry const& preg,
-                                                                   std::map<std::string, ModuleDescription const*> const& labelsToDesc,
-                                                                   std::string const& processName) const {
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::modulesWhoseProductsAreConsumed(
+        std::vector<ModuleDescription const*>& modules,
+        ProductRegistry const& preg,
+        std::map<std::string, ModuleDescription const*> const& labelsToDesc,
+        std::string const& processName) const {
       assert(not m_streamModules.empty());
       return m_streamModules[0]->modulesWhoseProductsAreConsumed(modules, preg, labelsToDesc, processName);
     }
 
-    template< typename T>
-    void
-    ProducingModuleAdaptorBase<T>::convertCurrentProcessAlias(std::string const& processName) {
-      for(auto mod: m_streamModules) {
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::convertCurrentProcessAlias(std::string const& processName) {
+      for (auto mod : m_streamModules) {
         mod->convertCurrentProcessAlias(processName);
       }
     }
 
-    template< typename T>
-    std::vector<edm::ConsumesInfo>
-    ProducingModuleAdaptorBase<T>::consumesInfo() const {
+    template <typename T>
+    std::vector<edm::ConsumesInfo> ProducingModuleAdaptorBase<T>::consumesInfo() const {
       assert(not m_streamModules.empty());
       return m_streamModules[0]->consumesInfo();
     }
 
-    template< typename T>
-    void
-    ProducingModuleAdaptorBase<T>::updateLookup(BranchType iType,
-                                                ProductResolverIndexHelper const& iHelper,
-                                                bool iPrefetchMayGet) {
-      for(auto mod: m_streamModules) {
-        mod->updateLookup(iType,iHelper,iPrefetchMayGet);
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::updateLookup(BranchType iType,
+                                                     ProductResolverIndexHelper const& iHelper,
+                                                     bool iPrefetchMayGet) {
+      for (auto mod : m_streamModules) {
+        mod->updateLookup(iType, iHelper, iPrefetchMayGet);
       }
     }
-
-    template< typename T>
-    void
-    ProducingModuleAdaptorBase<T>::resolvePutIndicies(BranchType iBranchType,
-                            ModuleToResolverIndicies const& iIndicies,
-                            std::string const& moduleLabel) {
-      for(auto mod: m_streamModules) {
-        mod->resolvePutIndicies(iBranchType,iIndicies,moduleLabel);
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::updateLookup(eventsetup::ESRecordsToProxyIndices const& iPI) {
+      for (auto mod : m_streamModules) {
+        mod->updateLookup(iPI);
       }
     }
 
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::resolvePutIndicies(BranchType iBranchType,
+                                                           ModuleToResolverIndicies const& iIndicies,
+                                                           std::string const& moduleLabel) {
+      for (auto mod : m_streamModules) {
+        mod->resolvePutIndicies(iBranchType, iIndicies, moduleLabel);
+      }
+    }
 
-    template< typename T>
-    std::vector<edm::ProductResolverIndex> const&
-    ProducingModuleAdaptorBase<T>::indiciesForPutProducts(BranchType iBranchType) const {
+    template <typename T>
+    std::vector<edm::ProductResolverIndex> const& ProducingModuleAdaptorBase<T>::indiciesForPutProducts(
+        BranchType iBranchType) const {
       return m_streamModules[0]->indiciesForPutProducts(iBranchType);
     }
 
-    template< typename T>
-    void
-    ProducingModuleAdaptorBase<T>::doBeginJob() {
-      
-    }
-    
-    template< typename T>
-    void
-    ProducingModuleAdaptorBase<T>::doBeginStream(StreamID id) {
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::doBeginJob() {}
+
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::doBeginStream(StreamID id) {
       m_streamModules[id]->beginStream(id);
     }
-    template< typename T>
-    void
-    ProducingModuleAdaptorBase<T>::doEndStream(StreamID id) {
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::doEndStream(StreamID id) {
       m_streamModules[id]->endStream();
     }
-    
-    template< typename T>
-    void
-    ProducingModuleAdaptorBase<T>::doStreamBeginRun(StreamID id,
-                                                    RunPrincipal const& rp,
-                                                    EventSetupImpl const& ci,
-                                                    ModuleCallingContext const* mcc)
-    {
+
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::doStreamBeginRun(StreamID id,
+                                                         RunPrincipal const& rp,
+                                                         EventSetupImpl const& ci,
+                                                         ModuleCallingContext const* mcc) {
       auto mod = m_streamModules[id];
       setupRun(mod, rp.index());
-      
+
       Run r(rp, moduleDescription_, mcc, false);
       r.setConsumer(mod);
-      const EventSetup c{ci};
+      const EventSetup c{
+          ci, static_cast<unsigned int>(Transition::BeginRun), mod->esGetTokenIndices(Transition::BeginRun)};
       mod->beginRun(r, c);
-      
-    }    
-    template< typename T>
-    void
-    ProducingModuleAdaptorBase<T>::doStreamEndRun(StreamID id,
-                                                  RunPrincipal const& rp,
-                                                  EventSetupImpl const& ci,
-                                                  ModuleCallingContext const* mcc)
-    {
+    }
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::doStreamEndRun(StreamID id,
+                                                       RunPrincipal const& rp,
+                                                       EventSetupImpl const& ci,
+                                                       ModuleCallingContext const* mcc) {
       auto mod = m_streamModules[id];
       Run r(rp, moduleDescription_, mcc, true);
       r.setConsumer(mod);
-      const EventSetup c{ci};
+      const EventSetup c{ci, static_cast<unsigned int>(Transition::EndRun), mod->esGetTokenIndices(Transition::EndRun)};
       mod->endRun(r, c);
-      streamEndRunSummary(mod,r,c);
+      streamEndRunSummary(mod, r, c);
     }
-    
-    template< typename T>
-    void
-    ProducingModuleAdaptorBase<T>::doStreamBeginLuminosityBlock(StreamID id,
-                                                                LuminosityBlockPrincipal const& lbp,
-                                                                EventSetupImpl const& ci,
-                                                                ModuleCallingContext const* mcc) {
+
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::doStreamBeginLuminosityBlock(StreamID id,
+                                                                     LuminosityBlockPrincipal const& lbp,
+                                                                     EventSetupImpl const& ci,
+                                                                     ModuleCallingContext const* mcc) {
       auto mod = m_streamModules[id];
-      setupLuminosityBlock(mod,lbp.index());
-      
+      setupLuminosityBlock(mod, lbp.index());
+
       LuminosityBlock lb(lbp, moduleDescription_, mcc, false);
       lb.setConsumer(mod);
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::BeginLuminosityBlock),
+                         mod->esGetTokenIndices(Transition::BeginLuminosityBlock)};
       mod->beginLuminosityBlock(lb, c);
     }
-    
-    template< typename T>
-    void
-    ProducingModuleAdaptorBase<T>::doStreamEndLuminosityBlock(StreamID id,
-                                                              LuminosityBlockPrincipal const& lbp,
-                                                              EventSetupImpl const& ci,
-                                                              ModuleCallingContext const* mcc)
-    {
+
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::doStreamEndLuminosityBlock(StreamID id,
+                                                                   LuminosityBlockPrincipal const& lbp,
+                                                                   EventSetupImpl const& ci,
+                                                                   ModuleCallingContext const* mcc) {
       auto mod = m_streamModules[id];
       LuminosityBlock lb(lbp, moduleDescription_, mcc, true);
       lb.setConsumer(mod);
-      const EventSetup c{ci};
+      const EventSetup c{ci,
+                         static_cast<unsigned int>(Transition::EndLuminosityBlock),
+                         mod->esGetTokenIndices(Transition::EndLuminosityBlock)};
       mod->endLuminosityBlock(lb, c);
-      streamEndLuminosityBlockSummary(mod,lb, c);
+      streamEndLuminosityBlockSummary(mod, lb, c);
     }
-    
-    template< typename T>
-    void
-    ProducingModuleAdaptorBase<T>::doRespondToOpenInputFile(FileBlock const&){}
-    template< typename T>
-    void
-    ProducingModuleAdaptorBase<T>::doRespondToCloseInputFile(FileBlock const&){}
 
-    template< typename T>
-    void
-    ProducingModuleAdaptorBase<T>::doRegisterThinnedAssociations(ProductRegistry const& registry,
-                                                                 ThinnedAssociationsHelper& helper) {
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::doRespondToOpenInputFile(FileBlock const&) {}
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::doRespondToCloseInputFile(FileBlock const&) {}
+
+    template <typename T>
+    void ProducingModuleAdaptorBase<T>::doRegisterThinnedAssociations(ProductRegistry const& registry,
+                                                                      ThinnedAssociationsHelper& helper) {
       assert(not m_streamModules.empty());
       auto mod = m_streamModules[0];
       mod->registerThinnedAssociations(registry, helper);
     }
-  }
-}
+  }  // namespace stream
+}  // namespace edm
diff --git a/FWCore/Framework/src/stream/ProducingModuleHelper.cc b/FWCore/Framework/src/stream/ProducingModuleHelper.cc
index d6e3cda8d1586..ddff4d0cc2c34 100644
--- a/FWCore/Framework/src/stream/ProducingModuleHelper.cc
+++ b/FWCore/Framework/src/stream/ProducingModuleHelper.cc
@@ -19,10 +19,6 @@ namespace edm {
       base->acquire(ev, es, holder);
     }
 
-    void doAcquireIfNeeded(void*,
-                           Event const&,
-                           EventSetup const&,
-                           WaitingTaskWithArenaHolder&) {
-    }
-  }
-}
+    void doAcquireIfNeeded(void*, Event const&, EventSetup const&, WaitingTaskWithArenaHolder&) {}
+  }  // namespace stream
+}  // namespace edm
diff --git a/FWCore/Framework/src/streamTransitionAsync.h b/FWCore/Framework/src/streamTransitionAsync.h
index 94e8d3464b2e0..62055032eae14 100644
--- a/FWCore/Framework/src/streamTransitionAsync.h
+++ b/FWCore/Framework/src/streamTransitionAsync.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Function:    streamTransitionAsync
-// 
+//
 /**\function streamTransitionAsync streamTransitionAsync.h "streamTransitionAsync.h"
 
  Description: Helper functions for handling asynchronous stream transitions
@@ -33,129 +33,148 @@ namespace edm {
   class EventSetupImpl;
   class LuminosityBlockPrincipal;
   class RunPrincipal;
-  
+
   //This is code in common between beginStreamRun and beginStreamLuminosityBlock
-  inline void subProcessDoStreamBeginTransitionAsync(WaitingTaskHolder iHolder,SubProcess& iSubProcess, unsigned int i, LuminosityBlockPrincipal& iPrincipal, IOVSyncValue const& iTS) {
-    iSubProcess.doStreamBeginLuminosityBlockAsync(std::move(iHolder),i,iPrincipal, iTS);
+  inline void subProcessDoStreamBeginTransitionAsync(WaitingTaskHolder iHolder,
+                                                     SubProcess& iSubProcess,
+                                                     unsigned int i,
+                                                     LuminosityBlockPrincipal& iPrincipal,
+                                                     IOVSyncValue const& iTS) {
+    iSubProcess.doStreamBeginLuminosityBlockAsync(std::move(iHolder), i, iPrincipal, iTS);
   }
-  
-  inline void subProcessDoStreamBeginTransitionAsync(WaitingTaskHolder iHolder, SubProcess& iSubProcess, unsigned int i, RunPrincipal& iPrincipal, IOVSyncValue const& iTS) {
-    iSubProcess.doStreamBeginRunAsync(std::move(iHolder),i,iPrincipal, iTS);
-  }
-  
-  inline void subProcessDoStreamEndTransitionAsync(WaitingTaskHolder iHolder, SubProcess& iSubProcess, unsigned int i, LuminosityBlockPrincipal& iPrincipal, IOVSyncValue const& iTS, bool cleaningUpAfterException) {
-    iSubProcess.doStreamEndLuminosityBlockAsync(std::move(iHolder),i,iPrincipal, iTS,cleaningUpAfterException);
+
+  inline void subProcessDoStreamBeginTransitionAsync(WaitingTaskHolder iHolder,
+                                                     SubProcess& iSubProcess,
+                                                     unsigned int i,
+                                                     RunPrincipal& iPrincipal,
+                                                     IOVSyncValue const& iTS) {
+    iSubProcess.doStreamBeginRunAsync(std::move(iHolder), i, iPrincipal, iTS);
   }
-  
-  inline void subProcessDoStreamEndTransitionAsync(WaitingTaskHolder iHolder, SubProcess& iSubProcess, unsigned int i, RunPrincipal& iPrincipal, IOVSyncValue const& iTS, bool cleaningUpAfterException) {
-    iSubProcess.doStreamEndRunAsync(std::move(iHolder), i ,iPrincipal, iTS, cleaningUpAfterException);
+
+  inline void subProcessDoStreamEndTransitionAsync(WaitingTaskHolder iHolder,
+                                                   SubProcess& iSubProcess,
+                                                   unsigned int i,
+                                                   LuminosityBlockPrincipal& iPrincipal,
+                                                   IOVSyncValue const& iTS,
+                                                   bool cleaningUpAfterException) {
+    iSubProcess.doStreamEndLuminosityBlockAsync(std::move(iHolder), i, iPrincipal, iTS, cleaningUpAfterException);
   }
 
+  inline void subProcessDoStreamEndTransitionAsync(WaitingTaskHolder iHolder,
+                                                   SubProcess& iSubProcess,
+                                                   unsigned int i,
+                                                   RunPrincipal& iPrincipal,
+                                                   IOVSyncValue const& iTS,
+                                                   bool cleaningUpAfterException) {
+    iSubProcess.doStreamEndRunAsync(std::move(iHolder), i, iPrincipal, iTS, cleaningUpAfterException);
+  }
 
-  template<typename Traits, typename P, typename SC >
+  template <typename Traits, typename P, typename SC>
   void beginStreamTransitionAsync(WaitingTaskHolder iWait,
                                   Schedule& iSchedule,
                                   unsigned int iStreamIndex,
                                   P& iPrincipal,
-                                  IOVSyncValue const & iTS,
+                                  IOVSyncValue const& iTS,
                                   EventSetupImpl const& iES,
                                   ServiceToken const& token,
                                   SC& iSubProcesses) {
     //When we are done processing the stream for this process,
     // we need to run the stream for all SubProcesses
     //NOTE: The subprocesses set their own service tokens
-    auto subs = make_waiting_task(tbb::task::allocate_root(), [&iSubProcesses, iWait,iStreamIndex,&iPrincipal,iTS](std::exception_ptr const* iPtr) mutable {
-      if(iPtr) {
-        auto excpt = *iPtr;
-        auto delayError = make_waiting_task(tbb::task::allocate_root(), [iWait,excpt](std::exception_ptr const* ) mutable {
-          iWait.doneWaiting(excpt);
+    auto subs = make_waiting_task(
+        tbb::task::allocate_root(),
+        [&iSubProcesses, iWait, iStreamIndex, &iPrincipal, iTS](std::exception_ptr const* iPtr) mutable {
+          if (iPtr) {
+            auto excpt = *iPtr;
+            auto delayError =
+                make_waiting_task(tbb::task::allocate_root(),
+                                  [iWait, excpt](std::exception_ptr const*) mutable { iWait.doneWaiting(excpt); });
+            WaitingTaskHolder h(delayError);
+            for (auto& subProcess : iSubProcesses) {
+              subProcessDoStreamBeginTransitionAsync(h, subProcess, iStreamIndex, iPrincipal, iTS);
+            };
+          } else {
+            for (auto& subProcess : iSubProcesses) {
+              subProcessDoStreamBeginTransitionAsync(iWait, subProcess, iStreamIndex, iPrincipal, iTS);
+            };
+          }
         });
-        WaitingTaskHolder h(delayError);
-        for(auto& subProcess: iSubProcesses){
-          subProcessDoStreamBeginTransitionAsync(h,subProcess,iStreamIndex,iPrincipal, iTS);
-          
-        };
-      } else {
-        for(auto& subProcess: iSubProcesses){
-          subProcessDoStreamBeginTransitionAsync(iWait,subProcess,iStreamIndex,iPrincipal, iTS);
-        };
-      }
-    });
-    
+
     WaitingTaskHolder h(subs);
-    iSchedule.processOneStreamAsync<Traits>(std::move(h), iStreamIndex,iPrincipal, iES,token);
+    iSchedule.processOneStreamAsync<Traits>(std::move(h), iStreamIndex, iPrincipal, iES, token);
   }
 
-  
-  template<typename Traits, typename P, typename SC >
+  template <typename Traits, typename P, typename SC>
   void beginStreamsTransitionAsync(WaitingTask* iWait,
-                                  Schedule& iSchedule,
-                                  unsigned int iNStreams,
-                                  P& iPrincipal,
-                                  IOVSyncValue const & iTS,
-                                  EventSetupImpl const& iES,
-                                  ServiceToken const& token,
-                                  SC& iSubProcesses)
-  {
+                                   Schedule& iSchedule,
+                                   unsigned int iNStreams,
+                                   P& iPrincipal,
+                                   IOVSyncValue const& iTS,
+                                   EventSetupImpl const& iES,
+                                   ServiceToken const& token,
+                                   SC& iSubProcesses) {
     WaitingTaskHolder holdUntilAllStreamsCalled(iWait);
-    for(unsigned int i=0; i<iNStreams;++i) {
-      beginStreamTransitionAsync<Traits>(WaitingTaskHolder(iWait), iSchedule,i,iPrincipal,iTS,iES,token, iSubProcesses);
+    for (unsigned int i = 0; i < iNStreams; ++i) {
+      beginStreamTransitionAsync<Traits>(
+          WaitingTaskHolder(iWait), iSchedule, i, iPrincipal, iTS, iES, token, iSubProcesses);
     }
   }
-  
-  template<typename Traits, typename P, typename SC >
+
+  template <typename Traits, typename P, typename SC>
   void endStreamTransitionAsync(WaitingTaskHolder iWait,
                                 Schedule& iSchedule,
                                 unsigned int iStreamIndex,
                                 P& iPrincipal,
-                                IOVSyncValue const & iTS,
+                                IOVSyncValue const& iTS,
                                 EventSetupImpl const& iES,
                                 ServiceToken const& token,
                                 SC& iSubProcesses,
-                                bool cleaningUpAfterException)
-  {
+                                bool cleaningUpAfterException) {
     //When we are done processing the stream for this process,
     // we need to run the stream for all SubProcesses
     //NOTE: The subprocesses set their own service tokens
 
-    auto subs = make_waiting_task(tbb::task::allocate_root(), [&iSubProcesses, iWait,iStreamIndex,&iPrincipal,iTS,cleaningUpAfterException](std::exception_ptr const* iPtr) mutable {
-      if(iPtr) {
-        auto excpt = *iPtr;
-        auto delayError = make_waiting_task(tbb::task::allocate_root(), [iWait,excpt](std::exception_ptr const* ) mutable {
-          iWait.doneWaiting(excpt);
-        });
-        WaitingTaskHolder h(delayError);
-        for(auto& subProcess: iSubProcesses) {
-          subProcessDoStreamEndTransitionAsync(h,subProcess,iStreamIndex,iPrincipal, iTS,cleaningUpAfterException);
-        }
-      } else {
-        for(auto& subProcess: iSubProcesses) {
-          subProcessDoStreamEndTransitionAsync(iWait,subProcess,iStreamIndex,iPrincipal, iTS,cleaningUpAfterException);
-        }
-      }
-    });
-    
-    iSchedule.processOneStreamAsync<Traits>(WaitingTaskHolder(subs), iStreamIndex,iPrincipal, iES, token, cleaningUpAfterException);
+    auto subs =
+        make_waiting_task(tbb::task::allocate_root(),
+                          [&iSubProcesses, iWait, iStreamIndex, &iPrincipal, iTS, cleaningUpAfterException](
+                              std::exception_ptr const* iPtr) mutable {
+                            if (iPtr) {
+                              auto excpt = *iPtr;
+                              auto delayError = make_waiting_task(
+                                  tbb::task::allocate_root(),
+                                  [iWait, excpt](std::exception_ptr const*) mutable { iWait.doneWaiting(excpt); });
+                              WaitingTaskHolder h(delayError);
+                              for (auto& subProcess : iSubProcesses) {
+                                subProcessDoStreamEndTransitionAsync(
+                                    h, subProcess, iStreamIndex, iPrincipal, iTS, cleaningUpAfterException);
+                              }
+                            } else {
+                              for (auto& subProcess : iSubProcesses) {
+                                subProcessDoStreamEndTransitionAsync(
+                                    iWait, subProcess, iStreamIndex, iPrincipal, iTS, cleaningUpAfterException);
+                              }
+                            }
+                          });
+
+    iSchedule.processOneStreamAsync<Traits>(
+        WaitingTaskHolder(subs), iStreamIndex, iPrincipal, iES, token, cleaningUpAfterException);
   }
 
-  template<typename Traits, typename P, typename SC >
+  template <typename Traits, typename P, typename SC>
   void endStreamsTransitionAsync(WaitingTaskHolder iWait,
                                  Schedule& iSchedule,
                                  unsigned int iNStreams,
                                  P& iPrincipal,
-                                 IOVSyncValue const & iTS,
+                                 IOVSyncValue const& iTS,
                                  EventSetupImpl const& iES,
                                  ServiceToken const& iToken,
                                  SC& iSubProcesses,
-                                 bool cleaningUpAfterException)
-  {
-    for(unsigned int i=0; i<iNStreams;++i) {
-      endStreamTransitionAsync<Traits>(iWait,
-                                       iSchedule,i,
-                                       iPrincipal,iTS,iES, iToken,
-                                       iSubProcesses,cleaningUpAfterException);
+                                 bool cleaningUpAfterException) {
+    for (unsigned int i = 0; i < iNStreams; ++i) {
+      endStreamTransitionAsync<Traits>(
+          iWait, iSchedule, i, iPrincipal, iTS, iES, iToken, iSubProcesses, cleaningUpAfterException);
     }
   }
-};
+};  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/src/throwIfImproperDependencies.cc b/FWCore/Framework/src/throwIfImproperDependencies.cc
index 88c8f748b22a2..21a44fe9e6213 100644
--- a/FWCore/Framework/src/throwIfImproperDependencies.cc
+++ b/FWCore/Framework/src/throwIfImproperDependencies.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Framework
 // Function:    throwIfImproperDependencies
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -16,7 +16,6 @@
 #include "FWCore/Framework/src/throwIfImproperDependencies.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 
-
 #include "boost/graph/graph_traits.hpp"
 #include "boost/graph/adjacency_list.hpp"
 #include "boost/graph/depth_first_search.hpp"
@@ -63,101 +62,99 @@ namespace {
   //  Cycle: A consumes B, B consumes C, C consumes A
   //  Since this cycle has 0 path only edges it is unrunnable.
   //====================================
-  
+
   typedef std::pair<unsigned int, unsigned int> SimpleEdge;
   typedef std::map<SimpleEdge, std::vector<unsigned int>> EdgeToPathMap;
-  
+
   typedef boost::adjacency_list<boost::vecS, boost::vecS, boost::bidirectionalS> Graph;
-  
+
   typedef boost::graph_traits<Graph>::edge_descriptor Edge;
-  
-  template<typename T>
+
+  template <typename T>
   std::unordered_set<T> intersect(std::unordered_set<T> const& iLHS, std::unordered_set<T> const& iRHS) {
     std::unordered_set<T> result;
-    if(iLHS.size() < iRHS.size()) {
+    if (iLHS.size() < iRHS.size()) {
       result.reserve(iLHS.size());
-      for(auto const& l: iLHS) {
-        if(iRHS.find(l) != iRHS.end()) {
+      for (auto const& l : iLHS) {
+        if (iRHS.find(l) != iRHS.end()) {
           result.insert(l);
         }
       }
       return result;
     }
     result.reserve(iRHS.size());
-    for(auto const& r: iRHS) {
-      if(iLHS.find(r) != iLHS.end()) {
+    for (auto const& r : iRHS) {
+      if (iLHS.find(r) != iLHS.end()) {
         result.insert(r);
       }
     }
     return result;
   }
-  
+
   struct cycle_detector : public boost::dfs_visitor<> {
-    
-    static const unsigned int kRootVertexIndex=0;
-    
+    static const unsigned int kRootVertexIndex = 0;
+
     cycle_detector(EdgeToPathMap const& iEdgeToPathMap,
                    std::vector<std::vector<unsigned int>> const& iPathIndexToModuleIndexOrder,
                    std::vector<std::string> const& iPathNames,
-                   std::unordered_map<unsigned int,std::string> const& iModuleIndexToNames):
-    m_edgeToPathMap(iEdgeToPathMap),
-    m_pathIndexToModuleIndexOrder(iPathIndexToModuleIndexOrder),
-    m_pathNames(iPathNames),
-    m_indexToNames(iModuleIndexToNames){}
-    
-    bool compare(Edge const& iLHS, Edge const& iRHS)  const;
-    
+                   std::unordered_map<unsigned int, std::string> const& iModuleIndexToNames)
+        : m_edgeToPathMap(iEdgeToPathMap),
+          m_pathIndexToModuleIndexOrder(iPathIndexToModuleIndexOrder),
+          m_pathNames(iPathNames),
+          m_indexToNames(iModuleIndexToNames) {}
+
+    bool compare(Edge const& iLHS, Edge const& iRHS) const;
+
     void tree_edge(Edge const& iEdge, Graph const& iGraph) {
       auto const& index = get(boost::vertex_index, iGraph);
-      
-      auto in = index[source(iEdge,iGraph)];
-      for( auto it = m_stack.begin(); it != m_stack.end(); ++it) {
-        if(in ==index[source(*it,iGraph)]) {
+
+      auto in = index[source(iEdge, iGraph)];
+      for (auto it = m_stack.begin(); it != m_stack.end(); ++it) {
+        if (in == index[source(*it, iGraph)]) {
           //this vertex is now being used to probe a new edge
           // so we should drop the rest of the tree
           m_stack.erase(it, m_stack.end());
           break;
         }
       }
-      
+
       m_stack.push_back(iEdge);
     }
-    
+
     void finish_vertex(unsigned int iVertex, Graph const& iGraph) {
-      if(not m_stack.empty()) {
+      if (not m_stack.empty()) {
         auto const& index = get(boost::vertex_index, iGraph);
 
-        if (iVertex ==index[source(m_stack.back(),iGraph)]) {
+        if (iVertex == index[source(m_stack.back(), iGraph)]) {
           m_stack.pop_back();
         }
       }
     }
-    
+
     //Called if a cycle happens
     void back_edge(Edge const& iEdge, Graph const& iGraph) {
-      
       auto const& index = get(boost::vertex_index, iGraph);
 
-      if(kRootVertexIndex != index[source(m_stack.front(),iGraph)]) {
+      if (kRootVertexIndex != index[source(m_stack.front(), iGraph)]) {
         //this part of the graph is not connected to data processing
         return;
       }
 
       m_stack.push_back(iEdge);
-      
+
       auto pop_stack = [](std::vector<Edge>* stack) { stack->pop_back(); };
-      std::unique_ptr<std::vector<Edge>,decltype(pop_stack)> guard(&m_stack,pop_stack);
+      std::unique_ptr<std::vector<Edge>, decltype(pop_stack)> guard(&m_stack, pop_stack);
 
       //This edge has not been added to the stack yet
       // making a copy allows us to add it in but not worry
       // about removing it at the end of the routine
       std::vector<Edge> tempStack;
-      
-      tempStack= findMinimumCycle(m_stack,iGraph);
-      checkCycleForProblem(tempStack,iGraph);
-      for(auto const& edge: tempStack) {
-        unsigned int in =index[source(edge,iGraph)];
-        unsigned int out =index[target(edge,iGraph)];
+
+      tempStack = findMinimumCycle(m_stack, iGraph);
+      checkCycleForProblem(tempStack, iGraph);
+      for (auto const& edge : tempStack) {
+        unsigned int in = index[source(edge, iGraph)];
+        unsigned int out = index[target(edge, iGraph)];
 
         m_verticiesInFundamentalCycles.insert(in);
         m_verticiesInFundamentalCycles.insert(out);
@@ -167,38 +164,36 @@ namespace {
       // which may not be part of the cycle
       m_fundamentalCycles.emplace_back(std::move(tempStack));
     }
-    
-    void forward_or_cross_edge(Edge iEdge, Graph const& iGraph)
-    {
 
+    void forward_or_cross_edge(Edge iEdge, Graph const& iGraph) {
       typedef typename boost::property_map<Graph, boost::vertex_index_t>::type IndexMap;
       IndexMap const& index = get(boost::vertex_index, iGraph);
 
-      if(kRootVertexIndex != index[source(m_stack.front(),iGraph)]) {
+      if (kRootVertexIndex != index[source(m_stack.front(), iGraph)]) {
         //this part of the graph is not connected to data processing
         return;
       }
 
-      const unsigned int out =index[target(iEdge,iGraph)];
-      
+      const unsigned int out = index[target(iEdge, iGraph)];
+
       //If this is a crossing edge whose out vertex is part of a fundamental cycle
       // then this path is also part of a cycle
-      if(m_verticiesInFundamentalCycles.end() == m_verticiesInFundamentalCycles.find(out)) {
+      if (m_verticiesInFundamentalCycles.end() == m_verticiesInFundamentalCycles.find(out)) {
         return;
       }
-      
-      for(auto const& cycle: m_fundamentalCycles) {
+
+      for (auto const& cycle : m_fundamentalCycles) {
         //Is the out vertex in this cycle?
         auto itStartMatch = cycle.end();
-        for(auto it =cycle.begin(); it!= cycle.end(); ++it) {
-          unsigned int inCycle =index[source(*it,iGraph)];
+        for (auto it = cycle.begin(); it != cycle.end(); ++it) {
+          unsigned int inCycle = index[source(*it, iGraph)];
 
-          if(out == inCycle) {
+          if (out == inCycle) {
             itStartMatch = it;
             break;
           }
         }
-        if(itStartMatch == cycle.end()) {
+        if (itStartMatch == cycle.end()) {
           //this cycle isn't the one which uses the vertex from the stack
           continue;
         }
@@ -207,115 +202,108 @@ namespace {
         // search if module to index ordering had been different
         m_stack.push_back(iEdge);
         auto pop_stack = [](std::vector<Edge>* stack) { stack->pop_back(); };
-        std::unique_ptr<std::vector<Edge>,decltype(pop_stack)> guard(&m_stack,pop_stack);
-        auto tempStack= findMinimumCycle(m_stack,iGraph);
-        
+        std::unique_ptr<std::vector<Edge>, decltype(pop_stack)> guard(&m_stack, pop_stack);
+        auto tempStack = findMinimumCycle(m_stack, iGraph);
+
         //the set of 'in' verticies presently in the stack is used to find where an 'out'
         // vertex from the fundamental cycle connects into the present stack
         std::set<unsigned int> verticiesInStack;
-        for(auto const& edge: tempStack) {
-          verticiesInStack.insert(index[source(edge,iGraph)]);
+        for (auto const& edge : tempStack) {
+          verticiesInStack.insert(index[source(edge, iGraph)]);
         }
 
-
-
         //Now find place in the fundamental cycle that attaches to the stack
         // First see if that happens later in the stack
         auto itLastMatch = cycle.end();
-        for(auto it=itStartMatch; it != cycle.end(); ++it) {
-          unsigned int outCycle =index[target(*it,iGraph)];
-          if(verticiesInStack.end() != verticiesInStack.find(outCycle)) {
+        for (auto it = itStartMatch; it != cycle.end(); ++it) {
+          unsigned int outCycle = index[target(*it, iGraph)];
+          if (verticiesInStack.end() != verticiesInStack.find(outCycle)) {
             itLastMatch = it;
             break;
           }
         }
-        if(itLastMatch==cycle.end()) {
+        if (itLastMatch == cycle.end()) {
           //See if we can find the attachment to the stack earlier in the cycle
-          tempStack.insert(tempStack.end(),itStartMatch,cycle.end());
-          for(auto it=cycle.begin(); it != itStartMatch;++it) {
-            unsigned int outCycle =index[target(*it,iGraph)];
-            if(verticiesInStack.end() != verticiesInStack.find(outCycle)) {
+          tempStack.insert(tempStack.end(), itStartMatch, cycle.end());
+          for (auto it = cycle.begin(); it != itStartMatch; ++it) {
+            unsigned int outCycle = index[target(*it, iGraph)];
+            if (verticiesInStack.end() != verticiesInStack.find(outCycle)) {
               itLastMatch = it;
               break;
             }
           }
-          if( itLastMatch==cycle.end()) {
+          if (itLastMatch == cycle.end()) {
             //need to use the full cycle
             //NOTE: this should just retest the same cycle but starting
             // from a different position. If everything is correct, then
             // this should also pass so in principal we could return here.
             //However, as long as this isn't a performance problem, having
             // this additional check could catch problems in the algorithm.
-            tempStack.insert(tempStack.end(),cycle.begin(),itStartMatch);
+            tempStack.insert(tempStack.end(), cycle.begin(), itStartMatch);
           } else {
-            tempStack.insert(tempStack.end(),cycle.begin(),itLastMatch+1);
+            tempStack.insert(tempStack.end(), cycle.begin(), itLastMatch + 1);
           }
         } else {
-          if( (itStartMatch == cycle.begin()) and (cycle.end() == (itLastMatch+1)) ) {
+          if ((itStartMatch == cycle.begin()) and (cycle.end() == (itLastMatch + 1))) {
             //This is just the entire cycle starting where we've already started
             // before. Given the cycle was OK before, it would also be OK this time
             return;
           }
-          tempStack.insert(tempStack.end(),itStartMatch,itLastMatch+1);
+          tempStack.insert(tempStack.end(), itStartMatch, itLastMatch + 1);
         }
-        
-        tempStack= findMinimumCycle(tempStack,iGraph);
-        checkCycleForProblem(tempStack,iGraph);
+
+        tempStack = findMinimumCycle(tempStack, iGraph);
+        checkCycleForProblem(tempStack, iGraph);
       }
-      
     }
+
   private:
-    std::string const& pathName(unsigned int iIndex) const {
-      return m_pathNames[iIndex];
-    }
-    
+    std::string const& pathName(unsigned int iIndex) const { return m_pathNames[iIndex]; }
+
     std::string const& moduleName(unsigned int iIndex) const {
-      auto itFound =m_indexToNames.find(iIndex);
+      auto itFound = m_indexToNames.find(iIndex);
       assert(itFound != m_indexToNames.end());
       return itFound->second;
     }
-    
-    void
-    throwOnError(std::vector<Edge>const& iEdges,
-                 boost::property_map<Graph, boost::vertex_index_t>::type const& iIndex,
-                 Graph const& iGraph) const {
+
+    void throwOnError(std::vector<Edge> const& iEdges,
+                      boost::property_map<Graph, boost::vertex_index_t>::type const& iIndex,
+                      Graph const& iGraph) const {
       std::stringstream oStream;
-      oStream <<"Module run order problem found: \n";
+      oStream << "Module run order problem found: \n";
       bool first_edge = true;
-      for(auto const& edge: iEdges) {
-        unsigned int in =iIndex[source(edge,iGraph)];
-        unsigned int out =iIndex[target(edge,iGraph)];
-        
-        if(first_edge) {
+      for (auto const& edge : iEdges) {
+        unsigned int in = iIndex[source(edge, iGraph)];
+        unsigned int out = iIndex[target(edge, iGraph)];
+
+        if (first_edge) {
           first_edge = false;
         } else {
-          oStream<<", ";
+          oStream << ", ";
         }
-        oStream <<moduleName(in);
-        
-        auto iFound = m_edgeToPathMap.find(SimpleEdge(in,out));
+        oStream << moduleName(in);
+
+        auto iFound = m_edgeToPathMap.find(SimpleEdge(in, out));
         bool pathDependencyOnly = true;
-        for(auto dependency : iFound->second) {
+        for (auto dependency : iFound->second) {
           if (dependency == edm::graph::kDataDependencyIndex) {
             pathDependencyOnly = false;
             break;
           }
         }
         if (pathDependencyOnly) {
-          oStream <<" after "<<moduleName(out)<<" [path "<<pathName(iFound->second[0])<<"]";
+          oStream << " after " << moduleName(out) << " [path " << pathName(iFound->second[0]) << "]";
         } else {
-          oStream <<" consumes "<<moduleName(out);
+          oStream << " consumes " << moduleName(out);
         }
       }
-      oStream<<"\n Running in the threaded framework would lead to indeterminate results."
-      "\n Please change order of modules in mentioned Path(s) to avoid inconsistent module ordering.";
-      
-      throw edm::Exception(edm::errors::ScheduleExecutionFailure, "Unrunnable schedule\n")
-      << oStream.str() << "\n";
+      oStream << "\n Running in the threaded framework would lead to indeterminate results."
+                 "\n Please change order of modules in mentioned Path(s) to avoid inconsistent module ordering.";
+
+      throw edm::Exception(edm::errors::ScheduleExecutionFailure, "Unrunnable schedule\n") << oStream.str() << "\n";
     }
-    
-    std::vector<Edge> findMinimumCycle(std::vector<Edge> const& iCycleEdges,
-                                       Graph const& iGraph) const {
+
+    std::vector<Edge> findMinimumCycle(std::vector<Edge> const& iCycleEdges, Graph const& iGraph) const {
       //Remove unnecessary edges
       // The graph library scans the verticies so we have edges in the list which are
       // not part of the cycle but are associated to a vertex contributes to the cycle.
@@ -323,22 +311,22 @@ namespace {
       // where the 'in' on the previous edge is not the 'out' for the next edge. When this
       // happens we know that there are additional edges for that same 'in' which can be
       // removed.
-      
+
       typedef typename boost::property_map<Graph, boost::vertex_index_t>::type IndexMap;
       IndexMap const& index = get(boost::vertex_index, iGraph);
 
       std::vector<Edge> reducedEdges;
       reducedEdges.reserve(iCycleEdges.size());
       reducedEdges.push_back(iCycleEdges.back());
-      unsigned int lastIn = index[source(iCycleEdges.back(),iGraph)];
-      const unsigned int finalVertex = index[target(iCycleEdges.back(),iGraph)];
-      for( auto it = iCycleEdges.rbegin()+1; it != iCycleEdges.rend(); ++it) {
-        unsigned int in =index[source(*it,iGraph)];
-        unsigned int out =index[target(*it,iGraph)];
-        if(lastIn == out) {
+      unsigned int lastIn = index[source(iCycleEdges.back(), iGraph)];
+      const unsigned int finalVertex = index[target(iCycleEdges.back(), iGraph)];
+      for (auto it = iCycleEdges.rbegin() + 1; it != iCycleEdges.rend(); ++it) {
+        unsigned int in = index[source(*it, iGraph)];
+        unsigned int out = index[target(*it, iGraph)];
+        if (lastIn == out) {
           reducedEdges.push_back(*it);
           lastIn = in;
-          if(in == finalVertex) {
+          if (in == finalVertex) {
             break;
           }
         }
@@ -347,31 +335,30 @@ namespace {
 
       return reducedEdges;
     }
-    
-    void checkCycleForProblem(std::vector<Edge> const& iCycleEdges,
-                              Graph const& iGraph) {
+
+    void checkCycleForProblem(std::vector<Edge> const& iCycleEdges, Graph const& iGraph) {
       //For a real problem, we need at least one data dependency
       // we already know we originate from a path because all tests
       // require starting from the root node which connects to all paths
-      bool hasDataDependency =false;
+      bool hasDataDependency = false;
       //Since we are dealing with a circle, we initialize the 'last' info with the end of the graph
       typedef typename boost::property_map<Graph, boost::vertex_index_t>::type IndexMap;
       IndexMap const& index = get(boost::vertex_index, iGraph);
 
-      unsigned int lastIn =index[source(iCycleEdges.back(),iGraph)];
-      unsigned int lastOut = index[target(iCycleEdges.back(),iGraph)];
+      unsigned int lastIn = index[source(iCycleEdges.back(), iGraph)];
+      unsigned int lastOut = index[target(iCycleEdges.back(), iGraph)];
       bool lastEdgeHasDataDepencency = false;
-      
+
       std::unordered_set<unsigned int> lastPathsSeen;
-      
+
       //If a data dependency appears to make us jump off a path but that module actually
       // appears on the path that was left, we need to see if we later come back to that
       // path somewhere before that module. If not than it is a false cycle
       std::unordered_multimap<unsigned int, unsigned int> pathToModulesWhichMustAppearLater;
       bool moduleAppearedEarlierInPath = false;
-      
-      for(auto dependency: m_edgeToPathMap.find(SimpleEdge(lastIn,lastOut))->second) {
-        if(dependency !=edm::graph::kDataDependencyIndex) {
+
+      for (auto dependency : m_edgeToPathMap.find(SimpleEdge(lastIn, lastOut))->second) {
+        if (dependency != edm::graph::kDataDependencyIndex) {
           lastPathsSeen.insert(dependency);
         } else {
           lastEdgeHasDataDepencency = true;
@@ -381,85 +368,85 @@ namespace {
       bool minimumInitialPathsSet = false;
       std::unordered_set<unsigned int> initialPaths(lastPathsSeen);
       std::unordered_set<unsigned int> sharedPaths;
-      for(auto const& edge: iCycleEdges) {
-        unsigned int in =index[source(edge,iGraph)];
-        unsigned int out =index[target(edge,iGraph)];
-        
-        auto iFound = m_edgeToPathMap.find(SimpleEdge(in,out));
+      for (auto const& edge : iCycleEdges) {
+        unsigned int in = index[source(edge, iGraph)];
+        unsigned int out = index[target(edge, iGraph)];
+
+        auto iFound = m_edgeToPathMap.find(SimpleEdge(in, out));
         std::unordered_set<unsigned int> pathsOnEdge;
         bool edgeHasDataDependency = false;
-        for(auto dependency : iFound->second) {
+        for (auto dependency : iFound->second) {
           if (dependency == edm::graph::kDataDependencyIndex) {
             //need to count only if this moves us to a new path
             hasDataDependency = true;
             edgeHasDataDependency = true;
           } else {
             pathsOnEdge.insert(dependency);
-            
+
             auto const& pathIndicies = m_pathIndexToModuleIndexOrder[dependency];
             auto pathToCheckRange = pathToModulesWhichMustAppearLater.equal_range(dependency);
-            for(auto it = pathToCheckRange.first; it != pathToCheckRange.second; ) {
+            for (auto it = pathToCheckRange.first; it != pathToCheckRange.second;) {
               auto moduleIDToCheck = it->second;
-              if(moduleIDToCheck == in or moduleIDToCheck==out) {
+              if (moduleIDToCheck == in or moduleIDToCheck == out) {
                 auto toErase = it;
                 ++it;
                 pathToModulesWhichMustAppearLater.erase(toErase);
                 continue;
               }
               bool alreadyAdvanced = false;
-              for(auto index : pathIndicies) {
-                if(index == out) {
+              for (auto index : pathIndicies) {
+                if (index == out) {
                   //we must have skipped over the module so the earlier worry about the
                   // module being called on the path was wrong
                   auto toErase = it;
                   ++it;
-                  alreadyAdvanced =true;
+                  alreadyAdvanced = true;
                   pathToModulesWhichMustAppearLater.erase(toErase);
                   break;
                 }
-                if(index == moduleIDToCheck) {
+                if (index == moduleIDToCheck) {
                   //module still earlier on the path
                   break;
                 }
               }
-              if(not alreadyAdvanced) {
+              if (not alreadyAdvanced) {
                 ++it;
               }
             }
           }
         }
-        sharedPaths = intersect(pathsOnEdge,lastPathsSeen);
-        if(sharedPaths.empty() ) {
+        sharedPaths = intersect(pathsOnEdge, lastPathsSeen);
+        if (sharedPaths.empty()) {
           minimumInitialPathsSet = true;
-          if((not edgeHasDataDependency) and (not lastEdgeHasDataDepencency) and (not lastPathsSeen.empty())) {
+          if ((not edgeHasDataDependency) and (not lastEdgeHasDataDepencency) and (not lastPathsSeen.empty())) {
             //If we jumped from one path to another without a data dependency
             // than the cycle is just because two independent modules were
             // scheduled in different arbitrary order on different paths
             return;
           }
-          if(edgeHasDataDependency and not lastPathsSeen.empty()) {
+          if (edgeHasDataDependency and not lastPathsSeen.empty()) {
             //If the paths we were on had this module we are going to earlier
             // on their paths than we do not have a real cycle
             bool atLeastOnePathFailed = false;
             std::vector<unsigned int> pathsToWatch;
             pathsToWatch.reserve(lastPathsSeen.size());
-            for(auto seenPath: lastPathsSeen) {
-              if(pathsOnEdge.end() == pathsOnEdge.find(seenPath)) {
+            for (auto seenPath : lastPathsSeen) {
+              if (pathsOnEdge.end() == pathsOnEdge.find(seenPath)) {
                 //we left this path so we now need to see if the module 'out'
                 // is on this path ahead of the module 'in'
                 bool foundOut = false;
-                for(auto index: m_pathIndexToModuleIndexOrder[seenPath]) {
-                  if(index == out) {
+                for (auto index : m_pathIndexToModuleIndexOrder[seenPath]) {
+                  if (index == out) {
                     foundOut = true;
                     pathsToWatch.push_back(seenPath);
                   }
-                  if(index == lastOut) {
-                    if(not foundOut) {
+                  if (index == lastOut) {
+                    if (not foundOut) {
                       atLeastOnePathFailed = true;
                     }
                     break;
                   }
-                  if(atLeastOnePathFailed) {
+                  if (atLeastOnePathFailed) {
                     break;
                   }
                 }
@@ -468,10 +455,10 @@ namespace {
             //If all the paths have the module earlier in their paths
             // then there was no need to jump between paths to get it
             // and this breaks the data cycle
-            if(not atLeastOnePathFailed) {
+            if (not atLeastOnePathFailed) {
               moduleAppearedEarlierInPath = true;
-              for(auto p: pathsToWatch) {
-                pathToModulesWhichMustAppearLater.emplace(p,out);
+              for (auto p : pathsToWatch) {
+                pathToModulesWhichMustAppearLater.emplace(p, out);
               }
             }
           }
@@ -483,54 +470,48 @@ namespace {
           }
         }
         lastOut = out;
-        lastEdgeHasDataDepencency =edgeHasDataDependency;
+        lastEdgeHasDataDepencency = edgeHasDataDependency;
       }
-      if(moduleAppearedEarlierInPath and not pathToModulesWhichMustAppearLater.empty()) {
+      if (moduleAppearedEarlierInPath and not pathToModulesWhichMustAppearLater.empty()) {
         return;
       }
-      if(not hasDataDependency) {
+      if (not hasDataDependency) {
         return;
       }
-      if( (not initialPaths.empty()) and intersect(initialPaths,sharedPaths).empty() ) {
+      if ((not initialPaths.empty()) and intersect(initialPaths, sharedPaths).empty()) {
         //The effective start and end paths for the first graph
         // node do not match. This can happen if the node
         // appears on multiple paths
         return;
       }
-      throwOnError(iCycleEdges,index,iGraph);
-
+      throwOnError(iCycleEdges, index, iGraph);
     }
-    
-    
+
     EdgeToPathMap const& m_edgeToPathMap;
     std::vector<std::vector<unsigned int>> const& m_pathIndexToModuleIndexOrder;
     std::vector<std::string> const& m_pathNames;
-    std::unordered_map<unsigned int,std::string> m_indexToNames;
+    std::unordered_map<unsigned int, std::string> m_indexToNames;
     std::unordered_map<unsigned int, std::vector<unsigned int>> m_pathToModuleIndex;
-    
+
     std::vector<Edge> m_stack;
     std::vector<std::vector<Edge>> m_fundamentalCycles;
     std::set<unsigned int> m_verticiesInFundamentalCycles;
   };
-}
-
-
-
-void
-edm::graph::throwIfImproperDependencies(EdgeToPathMap const& iEdgeToPathMap,
-                                        std::vector<std::vector<unsigned int>> const& iPathIndexToModuleIndexOrder,
-                                        std::vector<std::string> const& iPathNames,
-                                        std::unordered_map<unsigned int, std::string> const& iModuleIndexToNames) {
+}  // namespace
 
+void edm::graph::throwIfImproperDependencies(EdgeToPathMap const& iEdgeToPathMap,
+                                             std::vector<std::vector<unsigned int>> const& iPathIndexToModuleIndexOrder,
+                                             std::vector<std::string> const& iPathNames,
+                                             std::unordered_map<unsigned int, std::string> const& iModuleIndexToNames) {
   //Now use boost graph library to find cycles in the dependencies
   std::vector<SimpleEdge> outList;
   outList.reserve(iEdgeToPathMap.size());
-  for(auto const& edgeInfo: iEdgeToPathMap) {
+  for (auto const& edgeInfo : iEdgeToPathMap) {
     outList.push_back(edgeInfo.first);
   }
 
-  Graph g(outList.begin(),outList.end(), iModuleIndexToNames.size());
+  Graph g(outList.begin(), outList.end(), iModuleIndexToNames.size());
 
-  cycle_detector detector(iEdgeToPathMap,iPathIndexToModuleIndexOrder,iPathNames,iModuleIndexToNames);
-  boost::depth_first_search(g,boost::visitor(detector));
+  cycle_detector detector(iEdgeToPathMap, iPathIndexToModuleIndexOrder, iPathNames, iModuleIndexToNames);
+  boost::depth_first_search(g, boost::visitor(detector));
 }
diff --git a/FWCore/Framework/src/throwIfImproperDependencies.h b/FWCore/Framework/src/throwIfImproperDependencies.h
index c8d44b77dd737..6912577710bc8 100644
--- a/FWCore/Framework/src/throwIfImproperDependencies.h
+++ b/FWCore/Framework/src/throwIfImproperDependencies.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Framework
 // Function:    throwIfImproperDependencies
-// 
+//
 /**\function throwIfImproperDependencies throwIfImproperDependencies.h "throwIfImproperDependencies.h"
 
  Description: Function which uses the graph of dependencies to determine if there are any cycles
@@ -35,15 +35,15 @@ namespace edm {
     //This index is used as the Path index for the case where we are
     // describing a data dependency and not a dependency on a Path
     constexpr auto kDataDependencyIndex = std::numeric_limits<unsigned int>::max();
-    
-    using SimpleEdge =  std::pair<unsigned int, unsigned int>;
+
+    using SimpleEdge = std::pair<unsigned int, unsigned int>;
     using EdgeToPathMap = std::map<SimpleEdge, std::vector<unsigned int>>;
-  
+
     void throwIfImproperDependencies(EdgeToPathMap const&,
                                      std::vector<std::vector<unsigned int>> const& iPathIndexToModuleIndexOrder,
                                      std::vector<std::string> const& iPathNames,
-                                     std::unordered_map<unsigned int,std::string> const& iModuleIndexToNames);
-  }
-};
+                                     std::unordered_map<unsigned int, std::string> const& iModuleIndexToNames);
+  }  // namespace graph
+};   // namespace edm
 
 #endif
diff --git a/FWCore/Framework/test/DepOn2Record.cc b/FWCore/Framework/test/DepOn2Record.cc
index 1faf6e260d475..bbe8d21bf2e16 100644
--- a/FWCore/Framework/test/DepOn2Record.cc
+++ b/FWCore/Framework/test/DepOn2Record.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     DepOn2Record
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -18,4 +18,3 @@
 #include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
 
 EVENTSETUP_RECORD_REG(DepOn2Record);
-
diff --git a/FWCore/Framework/test/DepOn2Record.h b/FWCore/Framework/test/DepOn2Record.h
index c7a9068a3d389..64018e5cb22d9 100644
--- a/FWCore/Framework/test/DepOn2Record.h
+++ b/FWCore/Framework/test/DepOn2Record.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     DepOn2Record
-// 
+//
 /**\class DepOn2Record DepOn2Record.h FWCore/Framework/test/DepOn2Record.h
 
  Description: A test Record that is dependent on DummyRecord and Dummy2Record
@@ -28,9 +28,8 @@
 #include "FWCore/Framework/test/DummyRecord.h"
 #include "FWCore/Framework/test/Dummy2Record.h"
 
-class DepOn2Record 
-: public edm::eventsetup::DependentRecordImplementation<DepOn2Record, boost::mpl::vector<DummyRecord,Dummy2Record> >
-{
-};
+class DepOn2Record
+    : public edm::eventsetup::DependentRecordImplementation<DepOn2Record,
+                                                            boost::mpl::vector<DummyRecord, Dummy2Record> > {};
 
 #endif
diff --git a/FWCore/Framework/test/DepRecord.cc b/FWCore/Framework/test/DepRecord.cc
index 9b942f1d56db1..c4417b2727325 100644
--- a/FWCore/Framework/test/DepRecord.cc
+++ b/FWCore/Framework/test/DepRecord.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     DepRecord
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -18,4 +18,3 @@
 #include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
 
 EVENTSETUP_RECORD_REG(DepRecord);
-
diff --git a/FWCore/Framework/test/DepRecord.h b/FWCore/Framework/test/DepRecord.h
index 7d7abe4905f35..318918f620242 100644
--- a/FWCore/Framework/test/DepRecord.h
+++ b/FWCore/Framework/test/DepRecord.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     DepRecord
-// 
+//
 /**\class DepRecord DepRecord.h FWCore/Framework/test/DepRecord.h
 
  Description: A test Record that is dependent on DummyRecord
@@ -27,9 +27,6 @@
 #include "FWCore/Framework/interface/DependentRecordImplementation.h"
 #include "FWCore/Framework/test/DummyRecord.h"
 
-class DepRecord 
-: public edm::eventsetup::DependentRecordImplementation<DepRecord, boost::mpl::vector<DummyRecord> >
-{
-};
+class DepRecord : public edm::eventsetup::DependentRecordImplementation<DepRecord, boost::mpl::vector<DummyRecord> > {};
 
 #endif
diff --git a/FWCore/Framework/test/DummyData.h b/FWCore/Framework/test/DummyData.h
index c81a4920c8fd6..542e5b716cfd3 100644
--- a/FWCore/Framework/test/DummyData.h
+++ b/FWCore/Framework/test/DummyData.h
@@ -12,11 +12,12 @@
 #include "FWCore/Framework/test/DummyRecord.h"
 
 namespace edm::eventsetup::test {
-  struct DummyData { int value_;
-    DummyData(int iValue=0) : value_(iValue) {}
-    void dummy() {} // Just to suppress compilation warning message
+  struct DummyData {
+    int value_;
+    DummyData(int iValue = 0) : value_(iValue) {}
+    void dummy() {}  // Just to suppress compilation warning message
   };
-}
+}  // namespace edm::eventsetup::test
 
 #include "FWCore/Framework/interface/data_default_record_trait.h"
 EVENTSETUP_DATA_DEFAULT_RECORD(edm::eventsetup::test::DummyData, DummyRecord)
diff --git a/FWCore/Framework/test/DummyEventSetupData.h b/FWCore/Framework/test/DummyEventSetupData.h
index 46fc3c4e609eb..3dd94e40ffd4a 100644
--- a/FWCore/Framework/test/DummyEventSetupData.h
+++ b/FWCore/Framework/test/DummyEventSetupData.h
@@ -12,11 +12,11 @@
 #include "FWCore/Framework/test/DummyEventSetupRecord.h"
 
 namespace edm {
-   struct DummyEventSetupData { 
-      DummyEventSetupData(int iValue) : value_(iValue) {}
-      int value_; 
-   };
-}
+  struct DummyEventSetupData {
+    DummyEventSetupData(int iValue) : value_(iValue) {}
+    int value_;
+  };
+}  // namespace edm
 
 #include "FWCore/Framework/interface/data_default_record_trait.h"
 EVENTSETUP_DATA_DEFAULT_RECORD(edm::DummyEventSetupData, edm::DummyEventSetupRecord)
@@ -27,4 +27,3 @@ EVENTSETUP_DATA_DEFAULT_RECORD(edm::DummyEventSetupData, edm::DummyEventSetupRec
 TYPELOOKUP_DATA_REG(edm::DummyEventSetupData);
 #endif
 #endif
-
diff --git a/FWCore/Framework/test/DummyEventSetupRecord.h b/FWCore/Framework/test/DummyEventSetupRecord.h
index 5dffc0b735c80..59d1c63e45163 100644
--- a/FWCore/Framework/test/DummyEventSetupRecord.h
+++ b/FWCore/Framework/test/DummyEventSetupRecord.h
@@ -11,9 +11,8 @@
 #include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
 
 namespace edm {
-   class DummyEventSetupRecord : 
-     public edm::eventsetup::EventSetupRecordImplementation<DummyEventSetupRecord> {};
-}
+  class DummyEventSetupRecord : public edm::eventsetup::EventSetupRecordImplementation<DummyEventSetupRecord> {};
+}  // namespace edm
 
 #if !defined(TEST_EXCLUDE_DEF)
 //NOTE: the following should really go into a DummyEventSetupRecord.cc file
diff --git a/FWCore/Framework/test/DummyEventSetupRecordRetriever.h b/FWCore/Framework/test/DummyEventSetupRecordRetriever.h
index 92610e8d58600..4630adbe610a1 100644
--- a/FWCore/Framework/test/DummyEventSetupRecordRetriever.h
+++ b/FWCore/Framework/test/DummyEventSetupRecordRetriever.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     DummyEventSetupRecordRetriever
-// 
+//
 /**\class DummyEventSetupRecordRetriever DummyEventSetupRecordRetriever.h FWCore/Framework/interface/DummyEventSetupRecordRetriever.h
 
  Description: <one line class summary>
@@ -29,36 +29,30 @@
 
 // forward declarations
 namespace edm {
-   class DummyEventSetupRecordRetriever :
-     public EventSetupRecordIntervalFinder, 
-     public ESProducer
-   {
-   
-   public:
-      DummyEventSetupRecordRetriever() {
-         this->findingRecord<DummyEventSetupRecord>();
-         setWhatProduced(this);
-      }
-      
-      std::unique_ptr<DummyEventSetupData> produce(const DummyEventSetupRecord&) {
-         return std::make_unique<DummyEventSetupData>(1);
-      }
-   protected:
-
-      virtual void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
-                                   const edm::IOVSyncValue& /*iTime*/, 
-                                   edm::ValidityInterval& iInterval) {
-         iInterval = edm::ValidityInterval(IOVSyncValue::beginOfTime(),
-                                            IOVSyncValue::endOfTime());
-      }
-
-   private:
-      DummyEventSetupRecordRetriever(const DummyEventSetupRecordRetriever&); // stop default
-
-      const DummyEventSetupRecordRetriever& operator=(const DummyEventSetupRecordRetriever&); // stop default
-
-      // ---------- member data --------------------------------
-
-};
-}
+  class DummyEventSetupRecordRetriever : public EventSetupRecordIntervalFinder, public ESProducer {
+  public:
+    DummyEventSetupRecordRetriever() {
+      this->findingRecord<DummyEventSetupRecord>();
+      setWhatProduced(this);
+    }
+
+    std::unique_ptr<DummyEventSetupData> produce(const DummyEventSetupRecord&) {
+      return std::make_unique<DummyEventSetupData>(1);
+    }
+
+  protected:
+    virtual void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
+                                const edm::IOVSyncValue& /*iTime*/,
+                                edm::ValidityInterval& iInterval) {
+      iInterval = edm::ValidityInterval(IOVSyncValue::beginOfTime(), IOVSyncValue::endOfTime());
+    }
+
+  private:
+    DummyEventSetupRecordRetriever(const DummyEventSetupRecordRetriever&);  // stop default
+
+    const DummyEventSetupRecordRetriever& operator=(const DummyEventSetupRecordRetriever&);  // stop default
+
+    // ---------- member data --------------------------------
+  };
+}  // namespace edm
 #endif
diff --git a/FWCore/Framework/test/DummyFinder.h b/FWCore/Framework/test/DummyFinder.h
index aa0901628af6f..bfd9f0bbdb2e8 100644
--- a/FWCore/Framework/test/DummyFinder.h
+++ b/FWCore/Framework/test/DummyFinder.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework
 // Class  :     DummyFinder
-// 
+//
 /**\class DummyFinder DummyFinder.h FWCore/Framework/interface/DummyFinder.h
 
  Description: <one line class summary>
@@ -28,32 +28,28 @@
 
 class DummyFinder : public edm::EventSetupRecordIntervalFinder {
 public:
-   DummyFinder() :edm::EventSetupRecordIntervalFinder(), interval_() {
-      this->findingRecord<DummyRecord>();
-   }
-   
-   void setInterval(const edm::ValidityInterval& iInterval) {
-      interval_ = iInterval;
-   }
+  DummyFinder() : edm::EventSetupRecordIntervalFinder(), interval_() { this->findingRecord<DummyRecord>(); }
+
+  void setInterval(const edm::ValidityInterval& iInterval) { interval_ = iInterval; }
+
 protected:
-   virtual void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
-                                const edm::IOVSyncValue& iTime, 
-                                edm::ValidityInterval& iInterval) {
-      if(interval_.validFor(iTime)) {
-         iInterval = interval_;
+  virtual void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
+                              const edm::IOVSyncValue& iTime,
+                              edm::ValidityInterval& iInterval) {
+    if (interval_.validFor(iTime)) {
+      iInterval = interval_;
+    } else {
+      if (interval_.last() == edm::IOVSyncValue::invalidIOVSyncValue() &&
+          interval_.first() != edm::IOVSyncValue::invalidIOVSyncValue() && interval_.first() <= iTime) {
+        iInterval = interval_;
       } else {
-         if(interval_.last() == edm::IOVSyncValue::invalidIOVSyncValue() &&
-             interval_.first() != edm::IOVSyncValue::invalidIOVSyncValue() &&
-             interval_.first() <= iTime) {
-            iInterval = interval_;
-         }else {
-            iInterval = edm::ValidityInterval();
-         }
+        iInterval = edm::ValidityInterval();
       }
-   }
+    }
+  }
+
 private:
-   edm::ValidityInterval interval_;   
+  edm::ValidityInterval interval_;
 };
 
-
 #endif
diff --git a/FWCore/Framework/test/DummyProxyProvider.h b/FWCore/Framework/test/DummyProxyProvider.h
index 2e7d845844991..56a4596f65503 100644
--- a/FWCore/Framework/test/DummyProxyProvider.h
+++ b/FWCore/Framework/test/DummyProxyProvider.h
@@ -19,7 +19,7 @@
 //
 
 // system include files
-#include<memory>
+#include <memory>
 
 // user include files
 #include "FWCore/Framework/test/DummyRecord.h"
@@ -35,26 +35,20 @@ namespace edm::eventsetup::test {
     WorkingDummyProxy(const DummyData* iDummy) : data_(iDummy) {}
 
   protected:
-    const value_type* make(const record_type&, const DataKey&) {
-      return data_ ;
-    }
-    void invalidateCache() {
-    }
+    const value_type* make(const record_type&, const DataKey&) { return data_; }
+    void invalidateCache() {}
 
   private:
     const DummyData* data_;
   };
 
-
   class DummyProxyProvider : public edm::eventsetup::DataProxyProvider {
   public:
-    DummyProxyProvider(const DummyData& iData=DummyData()): dummy_(iData) {
-      usingRecord<DummyRecord>();
-    }
-    void newInterval(const eventsetup::EventSetupRecordKey& /*iRecordType*/,
-                     const ValidityInterval& /*iInterval*/) {
+    DummyProxyProvider(const DummyData& iData = DummyData()) : dummy_(iData) { usingRecord<DummyRecord>(); }
+    void newInterval(const eventsetup::EventSetupRecordKey& /*iRecordType*/, const ValidityInterval& /*iInterval*/) {
       //do nothing
     }
+
   protected:
     void registerProxies(const eventsetup::EventSetupRecordKey&, KeyedProxies& iProxies) {
       std::shared_ptr<WorkingDummyProxy> pProxy = std::make_shared<WorkingDummyProxy>(&dummy_);
@@ -65,5 +59,5 @@ namespace edm::eventsetup::test {
     DummyData dummy_;
   };
 
-}
+}  // namespace edm::eventsetup::test
 #endif
diff --git a/FWCore/Framework/test/EventSelExc_t.cpp b/FWCore/Framework/test/EventSelExc_t.cpp
index 67af0f53a57ba..0ee2643bbea8c 100644
--- a/FWCore/Framework/test/EventSelExc_t.cpp
+++ b/FWCore/Framework/test/EventSelExc_t.cpp
@@ -14,7 +14,6 @@
 //    12 - Specific and wildcarded exceptions
 //    13 - Everything - also tests that it accepts all Ready
 
-
 #include "FWCore/Framework/interface/EventSelector.h"
 #include "DataFormats/Common/interface/TriggerResults.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -33,7 +32,7 @@
 
 using namespace edm;
 
-typedef std::vector< std::vector<bool> > Answers;
+typedef std::vector<std::vector<bool> > Answers;
 
 typedef std::vector<std::string> Strings;
 typedef std::vector<Strings> VStrings;
@@ -44,38 +43,52 @@ typedef std::vector<Bools> VBools;
 // bits.
 
 size_t const num_trig_paths = 8;
-std::array<char const*, num_trig_paths> cpaths = 
-      {{      
-              "ap1", "ap2", "aq1", "aq2", 
-              "bp1", "bp2", "bq1", "bq2",
-      }};
-Strings trigger_path_names(cpaths.begin(),cpaths.end());
-
+std::array<char const*, num_trig_paths> cpaths = {{
+    "ap1",
+    "ap2",
+    "aq1",
+    "aq2",
+    "bp1",
+    "bp2",
+    "bq1",
+    "bq2",
+}};
+Strings trigger_path_names(cpaths.begin(), cpaths.end());
 
 struct PathSpecifiers {
   Strings path;
-  PathSpecifiers (std::string const & s0,
-  		  std::string const & s1 = "",
-  		  std::string const & s2 = "",
-  		  std::string const & s3 = "",
-  		  std::string const & s4 = "",
-  		  std::string const & s5 = "",
-  		  std::string const & s6 = "",
-  		  std::string const & s7 = "",
-  		  std::string const & s8 = "",
-  		  std::string const & s9 = "" ) : path()
-  {
-    if (s0 != "") path.push_back(s0);
-    if (s1 != "") path.push_back(s1);
-    if (s2 != "") path.push_back(s2);
-    if (s3 != "") path.push_back(s3);
-    if (s4 != "") path.push_back(s4);
-    if (s5 != "") path.push_back(s5);
-    if (s6 != "") path.push_back(s6);
-    if (s7 != "") path.push_back(s7);
-    if (s8 != "") path.push_back(s8);
-    if (s9 != "") path.push_back(s9);
-  }		  
+  PathSpecifiers(std::string const& s0,
+                 std::string const& s1 = "",
+                 std::string const& s2 = "",
+                 std::string const& s3 = "",
+                 std::string const& s4 = "",
+                 std::string const& s5 = "",
+                 std::string const& s6 = "",
+                 std::string const& s7 = "",
+                 std::string const& s8 = "",
+                 std::string const& s9 = "")
+      : path() {
+    if (s0 != "")
+      path.push_back(s0);
+    if (s1 != "")
+      path.push_back(s1);
+    if (s2 != "")
+      path.push_back(s2);
+    if (s3 != "")
+      path.push_back(s3);
+    if (s4 != "")
+      path.push_back(s4);
+    if (s5 != "")
+      path.push_back(s5);
+    if (s6 != "")
+      path.push_back(s6);
+    if (s7 != "")
+      path.push_back(s7);
+    if (s8 != "")
+      path.push_back(s8);
+    if (s9 != "")
+      path.push_back(s9);
+  }
 };
 
 const HLTPathStatus pass = HLTPathStatus(edm::hlt::Pass);
@@ -84,129 +97,129 @@ const HLTPathStatus excp = HLTPathStatus(edm::hlt::Exception);
 const HLTPathStatus redy = HLTPathStatus(edm::hlt::Ready);
 
 struct TrigResults {
-  std::vector <HLTPathStatus> bit;
-  TrigResults ( HLTPathStatus const & b0,
-  		HLTPathStatus const & b1, 
-  		HLTPathStatus const & b2, 
-  		HLTPathStatus const & b3, 
-  		HLTPathStatus const & b4, 
-  		HLTPathStatus const & b5, 
-  		HLTPathStatus const & b6, 
-  		HLTPathStatus const & b7 ) : bit (8) 
-  {
-    bit[0] = b0;  bit[1] = b1;  bit[2] = b2;  bit[3] = b3;  
-    bit[4] = b4;  bit[5] = b5;  bit[6] = b6;  bit[7] = b7;  
-    assert ( bit.size() == num_trig_paths );
+  std::vector<HLTPathStatus> bit;
+  TrigResults(HLTPathStatus const& b0,
+              HLTPathStatus const& b1,
+              HLTPathStatus const& b2,
+              HLTPathStatus const& b3,
+              HLTPathStatus const& b4,
+              HLTPathStatus const& b5,
+              HLTPathStatus const& b6,
+              HLTPathStatus const& b7)
+      : bit(8) {
+    bit[0] = b0;
+    bit[1] = b1;
+    bit[2] = b2;
+    bit[3] = b3;
+    bit[4] = b4;
+    bit[5] = b5;
+    bit[6] = b6;
+    bit[7] = b7;
+    assert(bit.size() == num_trig_paths);
   }
-  void set    ( HLTPathStatus const & b0,
-  		HLTPathStatus const & b1, 
-  		HLTPathStatus const & b2, 
-  		HLTPathStatus const & b3, 
-  		HLTPathStatus const & b4, 
-  		HLTPathStatus const & b5, 
-  		HLTPathStatus const & b6, 
-  		HLTPathStatus const & b7 ) 
-  {
-    bit[0] = b0;  bit[1] = b1;  bit[2] = b2;  bit[3] = b3;  
-    bit[4] = b4;  bit[5] = b5;  bit[6] = b6;  bit[7] = b7;  
+  void set(HLTPathStatus const& b0,
+           HLTPathStatus const& b1,
+           HLTPathStatus const& b2,
+           HLTPathStatus const& b3,
+           HLTPathStatus const& b4,
+           HLTPathStatus const& b5,
+           HLTPathStatus const& b6,
+           HLTPathStatus const& b7) {
+    bit[0] = b0;
+    bit[1] = b1;
+    bit[2] = b2;
+    bit[3] = b3;
+    bit[4] = b4;
+    bit[5] = b5;
+    bit[6] = b6;
+    bit[7] = b7;
   }
 };
 
-
-
-std::ostream& operator<<(std::ostream& ost, const Strings& s)
-{
-  for(Strings::const_iterator i(s.begin()),e(s.end());i!=e;++i)
-    {
-      ost << *i << " ";
-    }
+std::ostream& operator<<(std::ostream& ost, const Strings& s) {
+  for (Strings::const_iterator i(s.begin()), e(s.end()); i != e; ++i) {
+    ost << *i << " ";
+  }
   return ost;
 }
 
-std::ostream& operator<<(std::ostream& ost, const Bools& b)
-{
-  for(unsigned int i=0;i<b.size();++i)
-    {
-      ost << b[i] << " ";
-    }
+std::ostream& operator<<(std::ostream& ost, const Bools& b) {
+  for (unsigned int i = 0; i < b.size(); ++i) {
+    ost << b[i] << " ";
+  }
   return ost;
 }
 
-std::ostream& operator<<(std::ostream& ost, const TrigResults &tr)
-{
-  for(unsigned int i=0;i<tr.bit.size();++i)
-    {
-      HLTPathStatus b = tr.bit[i];
-      if (b.state() == edm::hlt::Ready) ost << "ready ";
-      if (b.state() == edm::hlt::Pass) ost << "pass  ";
-      if (b.state() == edm::hlt::Fail) ost << "fail  ";
-      if (b.state() == edm::hlt::Exception) ost << "excp  ";
-    }
+std::ostream& operator<<(std::ostream& ost, const TrigResults& tr) {
+  for (unsigned int i = 0; i < tr.bit.size(); ++i) {
+    HLTPathStatus b = tr.bit[i];
+    if (b.state() == edm::hlt::Ready)
+      ost << "ready ";
+    if (b.state() == edm::hlt::Pass)
+      ost << "pass  ";
+    if (b.state() == edm::hlt::Fail)
+      ost << "fail  ";
+    if (b.state() == edm::hlt::Exception)
+      ost << "excp  ";
+  }
   return ost;
 }
 
 template <size_t nb>
-Bools toBools( std::array<bool,nb> const & t ) 
-{
+Bools toBools(std::array<bool, nb> const& t) {
   Bools b;
-  b.insert (b.end(), t.begin(), t.end());
+  b.insert(b.end(), t.begin(), t.end());
   return b;
 }
 
-void evSelTest (PathSpecifiers const & ps, TrigResults const & tr, bool ans) 
-{
+void evSelTest(PathSpecifiers const& ps, TrigResults const& tr, bool ans) {
   ParameterSet pset;
-  pset.addParameter<Strings>("SelectEvents",ps.path);
+  pset.addParameter<Strings>("SelectEvents", ps.path);
   pset.registerIt();
 
   // There are 3 different ways to build the EventSelector.  All
   // should give the same result.  We exercise all 3 here.
   EventSelector select_based_on_pset(pset, trigger_path_names);
-  EventSelector select_based_on_path_specifiers_and_names 
-  					(ps.path, trigger_path_names);
+  EventSelector select_based_on_path_specifiers_and_names(ps.path, trigger_path_names);
   EventSelector select_based_on_path_specifiers_only(ps.path);
 
   int number_of_trigger_paths = 0;
   std::vector<unsigned char> bitArray;
 
   HLTGlobalStatus bm(tr.bit.size());
-  for(unsigned int b=0;b<tr.bit.size();++b) {
+  for (unsigned int b = 0; b < tr.bit.size(); ++b) {
     bm[b] = (tr.bit[b]);
     // There is an alternate version of the function acceptEvent
     // that takes an array of characters as an argument instead
     // of a TriggerResults object.  These next few lines build
     // that array so we can test that also.
-    if ( (number_of_trigger_paths % 4) == 0) bitArray.push_back(0);
+    if ((number_of_trigger_paths % 4) == 0)
+      bitArray.push_back(0);
     int byteIndex = number_of_trigger_paths / 4;
     int subIndex = number_of_trigger_paths % 4;
     bitArray[byteIndex] |= (static_cast<unsigned char>(bm[b].state())) << (subIndex * 2);
     ++number_of_trigger_paths;
   }
 
-  TriggerResults results(bm,trigger_path_names);
+  TriggerResults results(bm, trigger_path_names);
 
-  bool a  = select_based_on_pset.acceptEvent(results);
-  bool b  = select_based_on_path_specifiers_and_names.acceptEvent(results);
-  bool c  = select_based_on_path_specifiers_only.acceptEvent(results);
-  bool ab = select_based_on_pset.acceptEvent(&(bitArray[0]), 
-  		number_of_trigger_paths);
-  bool bb = select_based_on_path_specifiers_and_names.acceptEvent
-  		(&(bitArray[0]), number_of_trigger_paths);
-  // select_based_on_path_specifiers_only.acceptEvent(&(bitArray[0]), 
+  bool a = select_based_on_pset.acceptEvent(results);
+  bool b = select_based_on_path_specifiers_and_names.acceptEvent(results);
+  bool c = select_based_on_path_specifiers_only.acceptEvent(results);
+  bool ab = select_based_on_pset.acceptEvent(&(bitArray[0]), number_of_trigger_paths);
+  bool bb = select_based_on_path_specifiers_and_names.acceptEvent(&(bitArray[0]), number_of_trigger_paths);
+  // select_based_on_path_specifiers_only.acceptEvent(&(bitArray[0]),
   //                                     number_of_trigger_paths);
   // is not a valid way to use acceptEvent.
 
-  if (a  != ans || b  != ans || c != ans || 
-      ab != ans || bb != ans  )
-    {
-      std::cerr << "failed to compare path specifiers with trigger results: "
-	   << "correct=" << ans << " "
-	   << "results=" << a  << "  " << b  << "  " << c  << "  " 
-	                 << ab << "  " << bb <<  "\n"
-	   << "pathspecs = " << ps.path << "\n"
-	   << "trigger results = " << tr << "\n";
-      abort();
-    }
+  if (a != ans || b != ans || c != ans || ab != ans || bb != ans) {
+    std::cerr << "failed to compare path specifiers with trigger results: "
+              << "correct=" << ans << " "
+              << "results=" << a << "  " << b << "  " << c << "  " << ab << "  " << bb << "\n"
+              << "pathspecs = " << ps.path << "\n"
+              << "trigger results = " << tr << "\n";
+    abort();
+  }
 
   // Repeat putting the list of trigger names in the pset
   // registry
@@ -221,24 +234,18 @@ void evSelTest (PathSpecifiers const & ps, TrigResults const & tr, bool ans)
   bool y = select_based_on_path_specifiers_and_names.acceptEvent(results_id);
   bool z = select_based_on_path_specifiers_only.acceptEvent(results_id);
 
-  if (x != ans || y != ans || z != ans)
-    {
-      std::cerr << "failed to compare pathspecs with trigger results using pset ID: "
-	   << "correct=" << ans << " "
-	   << "results=" << x << "  " << y << "  " << z << "\n"
-	   << "pathspecs =" << ps.path << "\n"
-	   << "trigger results = " << tr << "\n";
-      abort();
-    }
-
+  if (x != ans || y != ans || z != ans) {
+    std::cerr << "failed to compare pathspecs with trigger results using pset ID: "
+              << "correct=" << ans << " "
+              << "results=" << x << "  " << y << "  " << z << "\n"
+              << "pathspecs =" << ps.path << "\n"
+              << "trigger results = " << tr << "\n";
+    abort();
+  }
 }
 
-
-
-int main()
-try {
-
- // We want to create the TriggerNamesService because it is used in 
+int main() try {
+  // We want to create the TriggerNamesService because it is used in
   // the tests.  We do that here, but first we need to build a minimal
   // parameter set to pass to its constructor.  Then we build the
   // service and setup the service system.
@@ -273,258 +280,188 @@ try {
   //make the services available
   ServiceRegistry::Operate operate(serviceToken_);
 
-
   // We are ready to run some tests
 
-
   //    01 - Non-wildcard positives, exception accepted
-  PathSpecifiers ps_a ( "ap2" );
-  TrigResults tr_01 ( fail, pass, fail, fail,
-                      fail, fail, excp, fail ); 
-  evSelTest ( ps_a, tr_01, true );
-  tr_01.set (fail, pass, fail, fail,
-             fail, fail, fail, fail );
-  evSelTest ( ps_a, tr_01, true );
-  tr_01.set (pass, fail, pass, pass,
-             fail, fail, fail, pass );
-  evSelTest ( ps_a, tr_01, false );
-  tr_01.set (pass, excp, pass, pass,
-             fail, fail, fail, pass );
-  evSelTest ( ps_a, tr_01, false );
-  tr_01.set (pass, redy, pass, pass,
-             fail, fail, fail, pass );
-  evSelTest ( ps_a, tr_01, false );
+  PathSpecifiers ps_a("ap2");
+  TrigResults tr_01(fail, pass, fail, fail, fail, fail, excp, fail);
+  evSelTest(ps_a, tr_01, true);
+  tr_01.set(fail, pass, fail, fail, fail, fail, fail, fail);
+  evSelTest(ps_a, tr_01, true);
+  tr_01.set(pass, fail, pass, pass, fail, fail, fail, pass);
+  evSelTest(ps_a, tr_01, false);
+  tr_01.set(pass, excp, pass, pass, fail, fail, fail, pass);
+  evSelTest(ps_a, tr_01, false);
+  tr_01.set(pass, redy, pass, pass, fail, fail, fail, pass);
+  evSelTest(ps_a, tr_01, false);
 
   //    02 - Non-wildcard negatives, exception accepted
-  PathSpecifiers ps_b ( "!aq2" );
-  TrigResults tr_02 ( pass, pass, pass, fail,
-                      pass, pass, excp, pass ); 
-  evSelTest ( ps_b, tr_02, true );
-  tr_02.set (pass, pass, pass, fail,
-             pass, pass, pass, pass );
-  evSelTest ( ps_b, tr_02, true );
-  tr_02.set (pass, pass, pass, pass,
-             pass, pass, pass, pass );
-  evSelTest ( ps_b, tr_01, false );
-  tr_02.set (pass, pass, pass, excp,
-             pass, pass, pass, pass );
-  evSelTest ( ps_b, tr_01, false );
-  tr_02.set (pass, pass, pass, redy,
-             pass, pass, pass, pass );
-  evSelTest ( ps_b, tr_01, false );
+  PathSpecifiers ps_b("!aq2");
+  TrigResults tr_02(pass, pass, pass, fail, pass, pass, excp, pass);
+  evSelTest(ps_b, tr_02, true);
+  tr_02.set(pass, pass, pass, fail, pass, pass, pass, pass);
+  evSelTest(ps_b, tr_02, true);
+  tr_02.set(pass, pass, pass, pass, pass, pass, pass, pass);
+  evSelTest(ps_b, tr_01, false);
+  tr_02.set(pass, pass, pass, excp, pass, pass, pass, pass);
+  evSelTest(ps_b, tr_01, false);
+  tr_02.set(pass, pass, pass, redy, pass, pass, pass, pass);
+  evSelTest(ps_b, tr_01, false);
 
   //    03 - Non-wildcard positives and negatives mixed, exception accepted
-  PathSpecifiers ps_c ( "bp1", "!aq1", "!bq2" );
-  TrigResults tr_03 ( pass, pass, pass, pass,
-                      fail, pass, pass, pass ); 
-  evSelTest ( ps_c, tr_03, false );
-  tr_03.set ( excp, pass, pass, pass,
-              pass, pass, pass, pass );
-  evSelTest ( ps_c, tr_03, true );
-  tr_03.set ( excp, pass, fail, pass,
-              fail, pass, pass, pass );
-  evSelTest ( ps_c, tr_03, true );
-  tr_03.set ( excp, pass, pass, pass,
-              fail, pass, pass, fail );
-  evSelTest ( ps_c, tr_03, true );
-  tr_03.set ( redy, pass, pass, pass,
-              pass, pass, pass, fail );
-  evSelTest ( ps_c, tr_03, true );
+  PathSpecifiers ps_c("bp1", "!aq1", "!bq2");
+  TrigResults tr_03(pass, pass, pass, pass, fail, pass, pass, pass);
+  evSelTest(ps_c, tr_03, false);
+  tr_03.set(excp, pass, pass, pass, pass, pass, pass, pass);
+  evSelTest(ps_c, tr_03, true);
+  tr_03.set(excp, pass, fail, pass, fail, pass, pass, pass);
+  evSelTest(ps_c, tr_03, true);
+  tr_03.set(excp, pass, pass, pass, fail, pass, pass, fail);
+  evSelTest(ps_c, tr_03, true);
+  tr_03.set(redy, pass, pass, pass, pass, pass, pass, fail);
+  evSelTest(ps_c, tr_03, true);
 
   //    04 - Non-wildcard positives, exception not accepted
-  PathSpecifiers ps_d ( "ap2&noexception" );
-  TrigResults tr_04 ( fail, pass, fail, fail,
-                      fail, fail, excp, fail ); 
-  evSelTest ( ps_d, tr_04, false );
-  tr_04.set (fail, pass, fail, fail,
-             fail, fail, fail, fail );
-  evSelTest ( ps_d, tr_04, true );
-  tr_04.set (pass, fail, pass, pass,
-             fail, fail, fail, pass );
-  evSelTest ( ps_d, tr_04, false );
-  tr_04.set (pass, excp, pass, pass,
-             fail, fail, fail, pass );
-  evSelTest ( ps_d, tr_04, false );
-  tr_04.set (pass, pass, pass, pass,
-             fail, fail, redy, pass );
-  evSelTest ( ps_d, tr_04, true );
+  PathSpecifiers ps_d("ap2&noexception");
+  TrigResults tr_04(fail, pass, fail, fail, fail, fail, excp, fail);
+  evSelTest(ps_d, tr_04, false);
+  tr_04.set(fail, pass, fail, fail, fail, fail, fail, fail);
+  evSelTest(ps_d, tr_04, true);
+  tr_04.set(pass, fail, pass, pass, fail, fail, fail, pass);
+  evSelTest(ps_d, tr_04, false);
+  tr_04.set(pass, excp, pass, pass, fail, fail, fail, pass);
+  evSelTest(ps_d, tr_04, false);
+  tr_04.set(pass, pass, pass, pass, fail, fail, redy, pass);
+  evSelTest(ps_d, tr_04, true);
 
   //    05 - Non-wildcard negatives, exception not accepted, mixed with 01 case
-  PathSpecifiers ps_e ( "bp1", "!aq1&noexception", "!bq2" );
-  TrigResults tr_05 ( pass, pass, pass, pass,
-                      fail, pass, pass, pass ); 
-  evSelTest ( ps_e, tr_05, false );
-  tr_05.set ( excp, pass, pass, pass,
-              pass, pass, pass, pass );
-  evSelTest ( ps_e, tr_05, true );
-  tr_05.set ( pass, pass, fail, pass,
-              fail, pass, pass, pass );
-  evSelTest ( ps_e, tr_05, true );
-  tr_05.set ( pass, pass, fail, pass,
-              fail, pass, excp, pass );
-  evSelTest ( ps_e, tr_05, false );
+  PathSpecifiers ps_e("bp1", "!aq1&noexception", "!bq2");
+  TrigResults tr_05(pass, pass, pass, pass, fail, pass, pass, pass);
+  evSelTest(ps_e, tr_05, false);
+  tr_05.set(excp, pass, pass, pass, pass, pass, pass, pass);
+  evSelTest(ps_e, tr_05, true);
+  tr_05.set(pass, pass, fail, pass, fail, pass, pass, pass);
+  evSelTest(ps_e, tr_05, true);
+  tr_05.set(pass, pass, fail, pass, fail, pass, excp, pass);
+  evSelTest(ps_e, tr_05, false);
 
   //    06 - Wildcard positives, exception accepted
-  PathSpecifiers ps_f ( "a*2", "?p2" );
-  TrigResults tr_06 ( fail, pass, fail, fail,
-                      fail, fail, excp, fail ); 
-  evSelTest ( ps_f, tr_06, true );
-  tr_06.set (fail, fail, fail, pass,
-             fail, fail, fail, fail );
-  evSelTest ( ps_f, tr_06, true );
-  tr_06.set (pass, fail, pass, fail,
-             fail, pass, excp, excp );
-  evSelTest ( ps_f, tr_06, true );
-  tr_06.set (pass, fail, pass, fail,
-             pass, fail, pass, pass );
-  evSelTest ( ps_f, tr_06, false );
-  
+  PathSpecifiers ps_f("a*2", "?p2");
+  TrigResults tr_06(fail, pass, fail, fail, fail, fail, excp, fail);
+  evSelTest(ps_f, tr_06, true);
+  tr_06.set(fail, fail, fail, pass, fail, fail, fail, fail);
+  evSelTest(ps_f, tr_06, true);
+  tr_06.set(pass, fail, pass, fail, fail, pass, excp, excp);
+  evSelTest(ps_f, tr_06, true);
+  tr_06.set(pass, fail, pass, fail, pass, fail, pass, pass);
+  evSelTest(ps_f, tr_06, false);
+
   //    07 - Wildcard negatives, exception accepted
-  PathSpecifiers ps_g ( "!*2", "!ap?" );
-  TrigResults tr_07 ( fail, pass, fail, fail,
-                      fail, fail, fail, fail ); 
-  evSelTest ( ps_g, tr_07, false );
-  tr_07.set (pass, fail, pass, fail,
-             excp, fail, pass, fail );
-  evSelTest ( ps_g, tr_07, true );
-  tr_07.set (fail, fail, pass, pass,
-             fail, pass, excp, excp );
-  evSelTest ( ps_g, tr_07, true );
-  tr_07.set (pass, fail, fail, fail,
-             fail, fail, fail, redy );
-  evSelTest ( ps_g, tr_07, false );
-  
-  
+  PathSpecifiers ps_g("!*2", "!ap?");
+  TrigResults tr_07(fail, pass, fail, fail, fail, fail, fail, fail);
+  evSelTest(ps_g, tr_07, false);
+  tr_07.set(pass, fail, pass, fail, excp, fail, pass, fail);
+  evSelTest(ps_g, tr_07, true);
+  tr_07.set(fail, fail, pass, pass, fail, pass, excp, excp);
+  evSelTest(ps_g, tr_07, true);
+  tr_07.set(pass, fail, fail, fail, fail, fail, fail, redy);
+  evSelTest(ps_g, tr_07, false);
+
   //    08 - Wildcard positives, exception not accepted
-  PathSpecifiers ps_h ( "a*2&noexception", "?p2" );
-  TrigResults tr_08 ( fail, pass, fail, fail,
-                      fail, fail, excp, fail ); 
-  evSelTest ( ps_h, tr_08, true );
-  tr_08.set (fail, fail, fail, pass,
-             fail, fail, excp, fail );
-  evSelTest ( ps_h, tr_08, false );
-  tr_08.set (pass, fail, pass, fail,
-             fail, pass, excp, excp );
-  evSelTest ( ps_h, tr_08, true );
-  tr_08.set (pass, fail, pass, fail,
-             pass, fail, pass, pass );
-  evSelTest ( ps_h, tr_08, false );
-  tr_08.set (excp, fail, pass, pass,
-             pass, fail, pass, pass );
-  evSelTest ( ps_h, tr_08, false );
-  
+  PathSpecifiers ps_h("a*2&noexception", "?p2");
+  TrigResults tr_08(fail, pass, fail, fail, fail, fail, excp, fail);
+  evSelTest(ps_h, tr_08, true);
+  tr_08.set(fail, fail, fail, pass, fail, fail, excp, fail);
+  evSelTest(ps_h, tr_08, false);
+  tr_08.set(pass, fail, pass, fail, fail, pass, excp, excp);
+  evSelTest(ps_h, tr_08, true);
+  tr_08.set(pass, fail, pass, fail, pass, fail, pass, pass);
+  evSelTest(ps_h, tr_08, false);
+  tr_08.set(excp, fail, pass, pass, pass, fail, pass, pass);
+  evSelTest(ps_h, tr_08, false);
+
   //    09 - Wildcard negatives, exception not accepted
-  PathSpecifiers ps_i ( "!*2&noexception" );
-  TrigResults tr_09 ( fail, pass, fail, fail,
-                      fail, fail, fail, fail ); 
-  evSelTest ( ps_i, tr_09, false );
-  tr_09.set (pass, fail, pass, fail,
-             excp, fail, pass, fail );
-  evSelTest ( ps_i, tr_09, false );
-  tr_09.set (fail, fail, pass, pass,
-             fail, pass, excp, excp );
-  evSelTest ( ps_i, tr_09, false );
-  tr_09.set (pass, fail, fail, fail,
-             fail, fail, fail, redy );
-  evSelTest ( ps_i, tr_09, false );
-  tr_09.set (fail, fail, pass, fail,
-             fail, fail, pass, fail );
-  evSelTest ( ps_i, tr_09, true );
+  PathSpecifiers ps_i("!*2&noexception");
+  TrigResults tr_09(fail, pass, fail, fail, fail, fail, fail, fail);
+  evSelTest(ps_i, tr_09, false);
+  tr_09.set(pass, fail, pass, fail, excp, fail, pass, fail);
+  evSelTest(ps_i, tr_09, false);
+  tr_09.set(fail, fail, pass, pass, fail, pass, excp, excp);
+  evSelTest(ps_i, tr_09, false);
+  tr_09.set(pass, fail, fail, fail, fail, fail, fail, redy);
+  evSelTest(ps_i, tr_09, false);
+  tr_09.set(fail, fail, pass, fail, fail, fail, pass, fail);
+  evSelTest(ps_i, tr_09, true);
 
   //    10 - Everything except exceptions
-  PathSpecifiers ps_j ( "*&noexception", "!*&noexception" );
-  TrigResults tr_10 ( fail, pass, fail, fail,
-                      fail, fail, fail, fail ); 
-  evSelTest ( ps_j, tr_10, true );
-  tr_10.set (pass, fail, pass, fail,
-             excp, fail, pass, fail );
-  evSelTest ( ps_j, tr_10, false );
-  tr_10.set (fail, fail, pass, pass,
-             fail, pass, excp, excp );
-  evSelTest ( ps_j, tr_10, false );
-  tr_10.set (fail, fail, fail, fail,
-             fail, fail, fail, redy );
-  evSelTest ( ps_j, tr_10, false );
-   tr_10.set (fail, fail, fail, fail,
-             fail, fail, fail, fail );
-  evSelTest ( ps_j, tr_10, true );
-  tr_10.set (pass, pass, pass, pass,
-             pass, pass, pass, pass );
-  evSelTest ( ps_j, tr_10, true );
-  tr_10.set (redy, redy, redy, redy,
-             redy, redy, redy, redy );
-  evSelTest ( ps_j, tr_10, false );  // rejected because all Ready fails !* 
-  
+  PathSpecifiers ps_j("*&noexception", "!*&noexception");
+  TrigResults tr_10(fail, pass, fail, fail, fail, fail, fail, fail);
+  evSelTest(ps_j, tr_10, true);
+  tr_10.set(pass, fail, pass, fail, excp, fail, pass, fail);
+  evSelTest(ps_j, tr_10, false);
+  tr_10.set(fail, fail, pass, pass, fail, pass, excp, excp);
+  evSelTest(ps_j, tr_10, false);
+  tr_10.set(fail, fail, fail, fail, fail, fail, fail, redy);
+  evSelTest(ps_j, tr_10, false);
+  tr_10.set(fail, fail, fail, fail, fail, fail, fail, fail);
+  evSelTest(ps_j, tr_10, true);
+  tr_10.set(pass, pass, pass, pass, pass, pass, pass, pass);
+  evSelTest(ps_j, tr_10, true);
+  tr_10.set(redy, redy, redy, redy, redy, redy, redy, redy);
+  evSelTest(ps_j, tr_10, false);  // rejected because all Ready fails !*
+
   //    11 - Exception demanded
-  PathSpecifiers ps_k ( "exception@*" );
-  TrigResults tr_11 ( fail, pass, fail, fail,
-                      fail, fail, fail, fail ); 
-  evSelTest ( ps_k, tr_11, false );
-  tr_11.set (pass, fail, pass, fail,
-             excp, fail, pass, fail );
-  evSelTest ( ps_k, tr_11, true );
-  tr_11.set (redy, redy, redy, redy,
-             redy, redy, redy, excp );
-  evSelTest ( ps_k, tr_11, true );
-  tr_11.set (pass, pass, pass, pass,
-             pass, pass, pass, excp );
-  evSelTest ( ps_k, tr_11, true );
-  tr_11.set (redy, redy, redy, redy,
-             redy, redy, redy, redy );
-  evSelTest ( ps_k, tr_11, false );
-  tr_11.set (pass, fail, fail, fail,
-             fail, fail, fail, excp );
-  evSelTest ( ps_k, tr_11, true );
+  PathSpecifiers ps_k("exception@*");
+  TrigResults tr_11(fail, pass, fail, fail, fail, fail, fail, fail);
+  evSelTest(ps_k, tr_11, false);
+  tr_11.set(pass, fail, pass, fail, excp, fail, pass, fail);
+  evSelTest(ps_k, tr_11, true);
+  tr_11.set(redy, redy, redy, redy, redy, redy, redy, excp);
+  evSelTest(ps_k, tr_11, true);
+  tr_11.set(pass, pass, pass, pass, pass, pass, pass, excp);
+  evSelTest(ps_k, tr_11, true);
+  tr_11.set(redy, redy, redy, redy, redy, redy, redy, redy);
+  evSelTest(ps_k, tr_11, false);
+  tr_11.set(pass, fail, fail, fail, fail, fail, fail, excp);
+  evSelTest(ps_k, tr_11, true);
 
   //    12 - Specific and wildcarded exceptions
-  PathSpecifiers ps_m ( "exception@a*", "exception@bp1"  );
-  TrigResults tr_12 ( fail, pass, fail, fail,
-                      fail, fail, fail, fail ); 
-  evSelTest ( ps_m, tr_12, false );
-  tr_12.set (pass, fail, pass, fail,
-             excp, fail, pass, fail );
-  evSelTest ( ps_m, tr_12, true );
-  tr_12.set (redy, redy, excp, redy,
-             redy, redy, redy, excp );
-  evSelTest ( ps_m, tr_12, true );
-  tr_12.set (pass, pass, pass, pass,
-             pass, pass, pass, excp );
-  evSelTest ( ps_m, tr_12, false );
+  PathSpecifiers ps_m("exception@a*", "exception@bp1");
+  TrigResults tr_12(fail, pass, fail, fail, fail, fail, fail, fail);
+  evSelTest(ps_m, tr_12, false);
+  tr_12.set(pass, fail, pass, fail, excp, fail, pass, fail);
+  evSelTest(ps_m, tr_12, true);
+  tr_12.set(redy, redy, excp, redy, redy, redy, redy, excp);
+  evSelTest(ps_m, tr_12, true);
+  tr_12.set(pass, pass, pass, pass, pass, pass, pass, excp);
+  evSelTest(ps_m, tr_12, false);
 
   //    13 - Everything - also tests that it accepts all Ready
-  PathSpecifiers ps_n ( "*", "!*", "exception@*" );
-  TrigResults tr_13 ( fail, pass, fail, fail,
-                      fail, fail, fail, fail ); 
-  evSelTest ( ps_n, tr_13, true );
-  tr_13.set (pass, pass, pass, pass,
-             pass, pass, pass, pass );
-  evSelTest ( ps_n, tr_13, true );
-  tr_13.set (redy, redy, redy, redy,
-             redy, redy, redy, excp );
-  evSelTest ( ps_n, tr_13, true );
-  tr_13.set (redy, redy, redy, redy,
-             redy, redy, redy, redy );
-  evSelTest ( ps_n, tr_13, true );
-  tr_13.set (pass, pass, pass, pass,
-             pass, pass, pass, excp );
-  evSelTest ( ps_n, tr_13, true );
-  tr_13.set (excp, excp, excp, excp,
-             excp, excp, excp, excp );
-  evSelTest ( ps_n, tr_13, true );
-  tr_13.set (fail, redy, redy, redy,
-             redy, redy, redy, redy );
-  evSelTest ( ps_n, tr_13, true );
-  tr_13.set (fail, fail, fail, fail,
-             fail, fail, fail, fail );
-  evSelTest ( ps_n, tr_13, true );
+  PathSpecifiers ps_n("*", "!*", "exception@*");
+  TrigResults tr_13(fail, pass, fail, fail, fail, fail, fail, fail);
+  evSelTest(ps_n, tr_13, true);
+  tr_13.set(pass, pass, pass, pass, pass, pass, pass, pass);
+  evSelTest(ps_n, tr_13, true);
+  tr_13.set(redy, redy, redy, redy, redy, redy, redy, excp);
+  evSelTest(ps_n, tr_13, true);
+  tr_13.set(redy, redy, redy, redy, redy, redy, redy, redy);
+  evSelTest(ps_n, tr_13, true);
+  tr_13.set(pass, pass, pass, pass, pass, pass, pass, excp);
+  evSelTest(ps_n, tr_13, true);
+  tr_13.set(excp, excp, excp, excp, excp, excp, excp, excp);
+  evSelTest(ps_n, tr_13, true);
+  tr_13.set(fail, redy, redy, redy, redy, redy, redy, redy);
+  evSelTest(ps_n, tr_13, true);
+  tr_13.set(fail, fail, fail, fail, fail, fail, fail, fail);
+  evSelTest(ps_n, tr_13, true);
 
   // Now test testSelectionOverlap
 
   return 0;
-} catch(cms::Exception const& e) {
+} catch (cms::Exception const& e) {
   std::cerr << e.explainSelf() << std::endl;
   return 1;
-} catch(std::exception const& e) {
+} catch (std::exception const& e) {
   std::cerr << e.what() << std::endl;
   return 1;
 }
diff --git a/FWCore/Framework/test/EventSelOverlap_t.cpp b/FWCore/Framework/test/EventSelOverlap_t.cpp
index d041deb56db51..ae49791cfc2f2 100644
--- a/FWCore/Framework/test/EventSelOverlap_t.cpp
+++ b/FWCore/Framework/test/EventSelOverlap_t.cpp
@@ -1,5 +1,5 @@
 // This tests:
-//   Behavior of EventSelector functions testSelectionOverlap and 
+//   Behavior of EventSelector functions testSelectionOverlap and
 //   maskTriggerResults
 
 // Note - work in progress - only very cursory testing is done right now!
@@ -22,7 +22,7 @@
 
 using namespace edm;
 
-typedef std::vector< std::vector<bool> > Answers;
+typedef std::vector<std::vector<bool> > Answers;
 
 typedef std::vector<std::string> Strings;
 typedef std::vector<Strings> VStrings;
@@ -33,38 +33,52 @@ typedef std::vector<Bools> VBools;
 // bits.
 
 size_t const num_trig_paths = 8;
-std::array<char const*, num_trig_paths> cpaths = 
-      {{      
-              "ap1", "ap2", "aq1", "aq2", 
-              "bp1", "bp2", "bq1", "bq2",
-      }};
-Strings trigger_path_names(cpaths.begin(),cpaths.end());
-
+std::array<char const*, num_trig_paths> cpaths = {{
+    "ap1",
+    "ap2",
+    "aq1",
+    "aq2",
+    "bp1",
+    "bp2",
+    "bq1",
+    "bq2",
+}};
+Strings trigger_path_names(cpaths.begin(), cpaths.end());
 
 struct PathSpecifiers {
   Strings path;
-  PathSpecifiers (std::string const & s0,
-  		  std::string const & s1 = "",
-  		  std::string const & s2 = "",
-  		  std::string const & s3 = "",
-  		  std::string const & s4 = "",
-  		  std::string const & s5 = "",
-  		  std::string const & s6 = "",
-  		  std::string const & s7 = "",
-  		  std::string const & s8 = "",
-  		  std::string const & s9 = "" ) : path()
-  {
-    if (s0 != "") path.push_back(s0);
-    if (s1 != "") path.push_back(s1);
-    if (s2 != "") path.push_back(s2);
-    if (s3 != "") path.push_back(s3);
-    if (s4 != "") path.push_back(s4);
-    if (s5 != "") path.push_back(s5);
-    if (s6 != "") path.push_back(s6);
-    if (s7 != "") path.push_back(s7);
-    if (s8 != "") path.push_back(s8);
-    if (s9 != "") path.push_back(s9);
-  }		  
+  PathSpecifiers(std::string const& s0,
+                 std::string const& s1 = "",
+                 std::string const& s2 = "",
+                 std::string const& s3 = "",
+                 std::string const& s4 = "",
+                 std::string const& s5 = "",
+                 std::string const& s6 = "",
+                 std::string const& s7 = "",
+                 std::string const& s8 = "",
+                 std::string const& s9 = "")
+      : path() {
+    if (s0 != "")
+      path.push_back(s0);
+    if (s1 != "")
+      path.push_back(s1);
+    if (s2 != "")
+      path.push_back(s2);
+    if (s3 != "")
+      path.push_back(s3);
+    if (s4 != "")
+      path.push_back(s4);
+    if (s5 != "")
+      path.push_back(s5);
+    if (s6 != "")
+      path.push_back(s6);
+    if (s7 != "")
+      path.push_back(s7);
+    if (s8 != "")
+      path.push_back(s8);
+    if (s9 != "")
+      path.push_back(s9);
+  }
 };
 
 const HLTPathStatus pass = HLTPathStatus(edm::hlt::Pass);
@@ -73,130 +87,124 @@ const HLTPathStatus excp = HLTPathStatus(edm::hlt::Exception);
 const HLTPathStatus redy = HLTPathStatus(edm::hlt::Ready);
 
 struct TrigResults {
-  std::vector <HLTPathStatus> bit;
-  TrigResults ( HLTPathStatus const & b0,
-  		HLTPathStatus const & b1, 
-  		HLTPathStatus const & b2, 
-  		HLTPathStatus const & b3, 
-  		HLTPathStatus const & b4, 
-  		HLTPathStatus const & b5, 
-  		HLTPathStatus const & b6, 
-  		HLTPathStatus const & b7 ) : bit (8) 
-  {
-    bit[0] = b0;  bit[1] = b1;  bit[2] = b2;  bit[3] = b3;  
-    bit[4] = b4;  bit[5] = b5;  bit[6] = b6;  bit[7] = b7;  
-    assert ( bit.size() == num_trig_paths );
+  std::vector<HLTPathStatus> bit;
+  TrigResults(HLTPathStatus const& b0,
+              HLTPathStatus const& b1,
+              HLTPathStatus const& b2,
+              HLTPathStatus const& b3,
+              HLTPathStatus const& b4,
+              HLTPathStatus const& b5,
+              HLTPathStatus const& b6,
+              HLTPathStatus const& b7)
+      : bit(8) {
+    bit[0] = b0;
+    bit[1] = b1;
+    bit[2] = b2;
+    bit[3] = b3;
+    bit[4] = b4;
+    bit[5] = b5;
+    bit[6] = b6;
+    bit[7] = b7;
+    assert(bit.size() == num_trig_paths);
   }
-  void set    ( HLTPathStatus const & b0,
-  		HLTPathStatus const & b1, 
-  		HLTPathStatus const & b2, 
-  		HLTPathStatus const & b3, 
-  		HLTPathStatus const & b4, 
-  		HLTPathStatus const & b5, 
-  		HLTPathStatus const & b6, 
-  		HLTPathStatus const & b7 ) 
-  {
-    bit[0] = b0;  bit[1] = b1;  bit[2] = b2;  bit[3] = b3;  
-    bit[4] = b4;  bit[5] = b5;  bit[6] = b6;  bit[7] = b7;  
+  void set(HLTPathStatus const& b0,
+           HLTPathStatus const& b1,
+           HLTPathStatus const& b2,
+           HLTPathStatus const& b3,
+           HLTPathStatus const& b4,
+           HLTPathStatus const& b5,
+           HLTPathStatus const& b6,
+           HLTPathStatus const& b7) {
+    bit[0] = b0;
+    bit[1] = b1;
+    bit[2] = b2;
+    bit[3] = b3;
+    bit[4] = b4;
+    bit[5] = b5;
+    bit[6] = b6;
+    bit[7] = b7;
   }
 };
 
-
-
-std::ostream& operator<<(std::ostream& ost, const Strings& s)
-{
-  for(Strings::const_iterator i(s.begin()),e(s.end());i!=e;++i)
-    {
-      ost << *i << " ";
-    }
+std::ostream& operator<<(std::ostream& ost, const Strings& s) {
+  for (Strings::const_iterator i(s.begin()), e(s.end()); i != e; ++i) {
+    ost << *i << " ";
+  }
   return ost;
 }
 
-std::ostream& operator<<(std::ostream& ost, const Bools& b)
-{
-  for(unsigned int i=0;i<b.size();++i)
-    {
-      ost << b[i] << " ";
-    }
+std::ostream& operator<<(std::ostream& ost, const Bools& b) {
+  for (unsigned int i = 0; i < b.size(); ++i) {
+    ost << b[i] << " ";
+  }
   return ost;
 }
 
-std::ostream& operator<<(std::ostream& ost, const TrigResults &tr)
-{
-  for(unsigned int i=0;i<tr.bit.size();++i)
-    {
-      HLTPathStatus b = tr.bit[i];
-      if (b.state() == edm::hlt::Ready) ost << "ready ";
-      if (b.state() == edm::hlt::Pass) ost << "pass  ";
-      if (b.state() == edm::hlt::Fail) ost << "fail  ";
-      if (b.state() == edm::hlt::Exception) ost << "excp  ";
-    }
+std::ostream& operator<<(std::ostream& ost, const TrigResults& tr) {
+  for (unsigned int i = 0; i < tr.bit.size(); ++i) {
+    HLTPathStatus b = tr.bit[i];
+    if (b.state() == edm::hlt::Ready)
+      ost << "ready ";
+    if (b.state() == edm::hlt::Pass)
+      ost << "pass  ";
+    if (b.state() == edm::hlt::Fail)
+      ost << "fail  ";
+    if (b.state() == edm::hlt::Exception)
+      ost << "excp  ";
+  }
   return ost;
 }
 
 template <size_t nb>
-Bools toBools( std::array<bool,nb> const & t ) 
-{
+Bools toBools(std::array<bool, nb> const& t) {
   Bools b;
-  b.insert (b.end(), t.begin(), t.end());
+  b.insert(b.end(), t.begin(), t.end());
   return b;
 }
 
-
-void maskTest ( PathSpecifiers const & ps, 
-		TrigResults const & tr,
-		TrigResults const & ans ) 
-{
+void maskTest(PathSpecifiers const& ps, TrigResults const& tr, TrigResults const& ans) {
   // Prepare a TriggerResults from the simpler tr
 
   HLTGlobalStatus bm(tr.bit.size());
-  for(unsigned int b=0;b<tr.bit.size();++b) {
+  for (unsigned int b = 0; b < tr.bit.size(); ++b) {
     bm[b] = (tr.bit[b]);
   }
 
-  TriggerResults results(bm,trigger_path_names);
+  TriggerResults results(bm, trigger_path_names);
 
   // obtain the answer from maskTriggerResults
-   
-  EventSelector selector (ps.path, trigger_path_names);
-  std::shared_ptr<TriggerResults> sptr =
-    selector.maskTriggerResults (results);
+
+  EventSelector selector(ps.path, trigger_path_names);
+  std::shared_ptr<TriggerResults> sptr = selector.maskTriggerResults(results);
   TriggerResults maskTR = *sptr;
-  
+
   // Extract the HLTPathStatus "bits" from the results.  A TriggerResults is
   // an HLTGlobalStatus, so this is straightforward:
-  
-  TrigResults mask(maskTR[0], maskTR[1], maskTR[2], maskTR[3], 
-  		   maskTR[4], maskTR[5], maskTR[6], maskTR[7]);
-  
+
+  TrigResults mask(maskTR[0], maskTR[1], maskTR[2], maskTR[3], maskTR[4], maskTR[5], maskTR[6], maskTR[7]);
+
   // Check correctness
-  
+
   bool ok = true;
-  for (size_t i=0; i != num_trig_paths; ++i) {
-//    HLTPathStatus mbi = mask.bit[i];
-//    HLTPathStatus abi =  ans.bit[i];
-    if (mask.bit[i].state() != ans.bit[i].state()) ok = false; 
-  }
-  
-  if (!ok) 
-  {
-      std::cerr << "failed to compare mask trigger results with expected answer\n"
-	   << "correct=" << ans  << "\n"
-	   << "results=" << mask << "\n"
-	   << "pathspecs = " << ps.path << "\n"
-	   << "trigger results = " << tr << "\n";
-      abort();
+  for (size_t i = 0; i != num_trig_paths; ++i) {
+    //    HLTPathStatus mbi = mask.bit[i];
+    //    HLTPathStatus abi =  ans.bit[i];
+    if (mask.bit[i].state() != ans.bit[i].state())
+      ok = false;
   }
 
-
+  if (!ok) {
+    std::cerr << "failed to compare mask trigger results with expected answer\n"
+              << "correct=" << ans << "\n"
+              << "results=" << mask << "\n"
+              << "pathspecs = " << ps.path << "\n"
+              << "trigger results = " << tr << "\n";
+    abort();
+  }
 }
 
-
-
-int main()
-try {
-
- // We want to create the TriggerNamesService because it is used in 
+int main() try {
+  // We want to create the TriggerNamesService because it is used in
   // the tests.  We do that here, but first we need to build a minimal
   // parameter set to pass to its constructor.  Then we build the
   // service and setup the service system.
@@ -231,59 +239,45 @@ try {
   //make the services available
   ServiceRegistry::Operate operate(serviceToken_);
 
-
   // We are ready to run some tests.  First, for maskTriggerResults:
-  
-  PathSpecifiers ps_01 ( "ap1", "ap2", "bp1" );
-  TrigResults tr_01 ( fail, pass, pass, fail,
-                      pass, fail, excp, pass ); 
-  TrigResults ans_01 ( redy, pass, redy, redy,
-                       pass, redy, redy, redy );
-  maskTest ( ps_01, tr_01, ans_01 );
-  
-  
-  PathSpecifiers ps_02 ( "!ap1", "ap2", "!bp2" );
-  TrigResults tr_02 ( fail, pass, pass, fail,
-                      pass, fail, excp, pass ); 
-  TrigResults ans_02 ( fail, pass, redy, redy,
-                       redy, fail, redy, redy );
-  maskTest ( ps_02, tr_02, ans_02 );
-  
+
+  PathSpecifiers ps_01("ap1", "ap2", "bp1");
+  TrigResults tr_01(fail, pass, pass, fail, pass, fail, excp, pass);
+  TrigResults ans_01(redy, pass, redy, redy, pass, redy, redy, redy);
+  maskTest(ps_01, tr_01, ans_01);
+
+  PathSpecifiers ps_02("!ap1", "ap2", "!bp2");
+  TrigResults tr_02(fail, pass, pass, fail, pass, fail, excp, pass);
+  TrigResults ans_02(fail, pass, redy, redy, redy, fail, redy, redy);
+  maskTest(ps_02, tr_02, ans_02);
+
   // TODO - test involving exception, test involving neg wildcard
-  
+
   // Now test testSelectionOverlap
   // TODO - pull out the testing part of this, as for maskTest
   // TODO - more extensive tests
-  
-  PathSpecifiers ps_01a ( "ap1", "ap2", "bp1" );
-  PathSpecifiers ps_01b ( "aq1", "aq2", "bq1" );
-  evtSel::OverlapResult ores = 
-    EventSelector::testSelectionOverlap(ps_01a.path , 
-    				        ps_01b.path , 
-					trigger_path_names);
-  if (ores !=  evtSel::NoOverlap) 
-  {
-      std::cerr << "testSelectionOverlap 1\n";
-      abort();
+
+  PathSpecifiers ps_01a("ap1", "ap2", "bp1");
+  PathSpecifiers ps_01b("aq1", "aq2", "bq1");
+  evtSel::OverlapResult ores = EventSelector::testSelectionOverlap(ps_01a.path, ps_01b.path, trigger_path_names);
+  if (ores != evtSel::NoOverlap) {
+    std::cerr << "testSelectionOverlap 1\n";
+    abort();
   }
-  
-  PathSpecifiers ps_02a ( "ap1", "ap2", "bp1" );
-  PathSpecifiers ps_02b ( "bp1", "aq2", "bq1" );
-  ores = 
-    EventSelector::testSelectionOverlap(ps_02a.path , 
-    				        ps_02b.path , 
-					trigger_path_names);
-  if (ores !=  evtSel::PartialOverlap) 
-  {
-      std::cerr << "testSelectionOverlap 2\n";
-      abort();
+
+  PathSpecifiers ps_02a("ap1", "ap2", "bp1");
+  PathSpecifiers ps_02b("bp1", "aq2", "bq1");
+  ores = EventSelector::testSelectionOverlap(ps_02a.path, ps_02b.path, trigger_path_names);
+  if (ores != evtSel::PartialOverlap) {
+    std::cerr << "testSelectionOverlap 2\n";
+    abort();
   }
-  
+
   return 0;
-} catch(cms::Exception const& e) {
+} catch (cms::Exception const& e) {
   std::cerr << e.explainSelf() << std::endl;
   return 1;
-} catch(std::exception const& e) {
+} catch (std::exception const& e) {
   std::cerr << e.what() << std::endl;
   return 1;
 }
diff --git a/FWCore/Framework/test/EventSelWildcard_t.cpp b/FWCore/Framework/test/EventSelWildcard_t.cpp
index 07fd916f0f1d2..aba3082b865ca 100644
--- a/FWCore/Framework/test/EventSelWildcard_t.cpp
+++ b/FWCore/Framework/test/EventSelWildcard_t.cpp
@@ -16,51 +16,41 @@
 
 using namespace edm;
 
-size_t const numBits = 12;  // There must be a better way than this but I choose to 
-		 	    // avoid modifying a whole slew of code using the array 
-			    // instead of push_back()s.
+size_t const numBits = 12;  // There must be a better way than this but I choose to
+                            // avoid modifying a whole slew of code using the array
+                            // instead of push_back()s.
 
-typedef std::vector< std::vector<bool> > Answers;
+typedef std::vector<std::vector<bool> > Answers;
 
 typedef std::vector<std::string> Strings;
 typedef std::vector<Strings> VStrings;
 typedef std::vector<bool> Bools;
 typedef std::vector<Bools> VBools;
 
-std::ostream& operator<<(std::ostream& ost, const Strings& s)
-{
-  for(Strings::const_iterator i(s.begin()),e(s.end());i!=e;++i)
-    {
-      ost << *i << " ";
-    }
+std::ostream& operator<<(std::ostream& ost, const Strings& s) {
+  for (Strings::const_iterator i(s.begin()), e(s.end()); i != e; ++i) {
+    ost << *i << " ";
+  }
   return ost;
 }
 
-std::ostream& operator<<(std::ostream& ost, const Bools& b)
-{
-  for(unsigned int i=0;i<b.size();++i)
-    {
-      ost << b[i] << " ";
-    }
+std::ostream& operator<<(std::ostream& ost, const Bools& b) {
+  for (unsigned int i = 0; i < b.size(); ++i) {
+    ost << b[i] << " ";
+  }
   return ost;
 }
 
 template <size_t nb>
-Bools toBools(std::array<bool, nb> const & t ) 
-{
+Bools toBools(std::array<bool, nb> const& t) {
   Bools b;
-  b.insert (b.end(), t.begin(), t.end());
+  b.insert(b.end(), t.begin(), t.end());
   return b;
 }
 
-void testone(const Strings& paths,
-	     const Strings& pattern,
-	     const Bools& mask,
-	     bool answer,
-             int jmask)
-{
-  ParameterSet pset; //, parent;
-  pset.addParameter<Strings>("SelectEvents",pattern);
+void testone(const Strings& paths, const Strings& pattern, const Bools& mask, bool answer, int jmask) {
+  ParameterSet pset;  //, parent;
+  pset.addParameter<Strings>("SelectEvents", pattern);
   pset.registerIt();
   //parent.addUntrackedParameter<ParameterSet>("SelectEvents",pset);
   //parent.registerIt();
@@ -75,21 +65,22 @@ void testone(const Strings& paths,
   std::vector<unsigned char> bitArray;
 
   HLTGlobalStatus bm(mask.size());
-  const HLTPathStatus pass  = HLTPathStatus(edm::hlt::Pass);
-  const HLTPathStatus fail  = HLTPathStatus(edm::hlt::Fail);
-  const HLTPathStatus ex    = HLTPathStatus(edm::hlt::Exception);
+  const HLTPathStatus pass = HLTPathStatus(edm::hlt::Pass);
+  const HLTPathStatus fail = HLTPathStatus(edm::hlt::Fail);
+  const HLTPathStatus ex = HLTPathStatus(edm::hlt::Exception);
   const HLTPathStatus ready = HLTPathStatus(edm::hlt::Ready);
-  for(unsigned int b=0;b<mask.size();++b) {
-    bm[b] = (mask[b]? pass : fail);
+  for (unsigned int b = 0; b < mask.size(); ++b) {
+    bm[b] = (mask[b] ? pass : fail);
 
     // There is an alternate version of the function acceptEvent
     // that takes an array of characters as an argument instead
     // of a TriggerResults object.  These next few lines build
     // that array so we can test that also.
-    if ( (number_of_trigger_paths % 4) == 0) bitArray.push_back(0);
+    if ((number_of_trigger_paths % 4) == 0)
+      bitArray.push_back(0);
     int byteIndex = number_of_trigger_paths / 4;
     int subIndex = number_of_trigger_paths % 4;
-    bitArray[byteIndex] |= (mask[b]? edm::hlt::Pass : edm::hlt::Fail) << (subIndex * 2);
+    bitArray[byteIndex] |= (mask[b] ? edm::hlt::Pass : edm::hlt::Fail) << (subIndex * 2);
     ++number_of_trigger_paths;
   }
 
@@ -100,31 +91,26 @@ void testone(const Strings& paths,
     bitArray[1] = (bitArray[1] & 0xfc) | edm::hlt::Exception;
   }
 
-  TriggerResults results(bm,paths);
+  TriggerResults results(bm, paths);
 
-  bool a  = select_based_on_pset.acceptEvent(results);
-  bool b  = select_based_on_pattern_paths.acceptEvent(results);
-  bool c  = select_based_on_pattern.acceptEvent(results);
-  bool ab = select_based_on_pset.acceptEvent(&(bitArray[0]), 
-  		number_of_trigger_paths);
-  bool bb = select_based_on_pattern_paths.acceptEvent(&(bitArray[0]), 
-  		number_of_trigger_paths);
-  // select_based_on_pattern.acceptEvent(&(bitArray[0]), 
+  bool a = select_based_on_pset.acceptEvent(results);
+  bool b = select_based_on_pattern_paths.acceptEvent(results);
+  bool c = select_based_on_pattern.acceptEvent(results);
+  bool ab = select_based_on_pset.acceptEvent(&(bitArray[0]), number_of_trigger_paths);
+  bool bb = select_based_on_pattern_paths.acceptEvent(&(bitArray[0]), number_of_trigger_paths);
+  // select_based_on_pattern.acceptEvent(&(bitArray[0]),
   //                                     number_of_trigger_paths);
   // is not a valid way to use acceptEvent.
 
-  if (a  != answer || b  != answer || c != answer || 
-      ab != answer || bb != answer  )
-    {
-      std::cerr << "failed to compare pattern with mask: "
-	   << "correct=" << answer << " "
-	   << "results=" << a  << "  " << b  << "  " << c  << "  " 
-	                 << ab << "  " << bb <<  "\n"
-	   << "pattern=" << pattern << "\n"
-	   << "mask=" << mask << "\n"
-           << "jmask = " << jmask << "\n"; 
-      abort();
-    }
+  if (a != answer || b != answer || c != answer || ab != answer || bb != answer) {
+    std::cerr << "failed to compare pattern with mask: "
+              << "correct=" << answer << " "
+              << "results=" << a << "  " << b << "  " << c << "  " << ab << "  " << bb << "\n"
+              << "pattern=" << pattern << "\n"
+              << "mask=" << mask << "\n"
+              << "jmask = " << jmask << "\n";
+    abort();
+  }
 
   // Repeat putting the list of trigger names in the pset
   // registry
@@ -139,288 +125,281 @@ void testone(const Strings& paths,
   bool y = select_based_on_pattern_paths.acceptEvent(results_id);
   bool z = select_based_on_pattern.acceptEvent(results_id);
 
-  if (x != answer || y != answer || z != answer)
-    {
-      std::cerr << "failed to compare pattern with mask using pset ID: "
-	   << "correct=" << answer << " "
-	   << "results=" << x << "  " << y << "  " << z << "\n"
-	   << "pattern=" << pattern << "\n"
-	   << "mask=" << mask << "\n"
-           << "jmask = " << jmask << "\n"; 
-      abort();
-    }
+  if (x != answer || y != answer || z != answer) {
+    std::cerr << "failed to compare pattern with mask using pset ID: "
+              << "correct=" << answer << " "
+              << "results=" << x << "  " << y << "  " << z << "\n"
+              << "pattern=" << pattern << "\n"
+              << "mask=" << mask << "\n"
+              << "jmask = " << jmask << "\n";
+    abort();
+  }
 }
 
-void testall(const Strings& paths,
-	     const VStrings& patterns,
-	     const VBools& masks,
-	     const Answers& answers)
-{
-  for(unsigned int i=0;i<patterns.size();++i)
-    {
-      for(unsigned int j=0;j<masks.size();++j)
-	{
-	  testone(paths,patterns[i],masks[j],answers[i][j],j);
-	}
+void testall(const Strings& paths, const VStrings& patterns, const VBools& masks, const Answers& answers) {
+  for (unsigned int i = 0; i < patterns.size(); ++i) {
+    for (unsigned int j = 0; j < masks.size(); ++j) {
+      testone(paths, patterns[i], masks[j], answers[i][j], j);
     }
+  }
 }
 
-
-int main()
-try {
-
+int main() try {
   // Name all our paths. We have as many paths as there are trigger
   // bits.
 
-  std::array<char const*, numBits> cpaths = 
-  	{{	
-		"HLTx1",   "HLTx2",   "HLTy1",   "HLTy2", 
-		"CALIBx1", "CALIBx2", "CALIBy1", "CALIBy2",
-		"DEBUGx1", "DEBUGx2", "DEBUGy1", "DEBUGy2",
-	}};
-  Strings paths(cpaths.begin(),cpaths.end());
+  std::array<char const*, numBits> cpaths = {{
+      "HLTx1",
+      "HLTx2",
+      "HLTy1",
+      "HLTy2",
+      "CALIBx1",
+      "CALIBx2",
+      "CALIBy1",
+      "CALIBy2",
+      "DEBUGx1",
+      "DEBUGx2",
+      "DEBUGy1",
+      "DEBUGy2",
+  }};
+  Strings paths(cpaths.begin(), cpaths.end());
 
   // Create our test patterns.  Each of these will be tested against each mask.
 
   VStrings patterns;
 
-  Strings criteria_star; criteria_star.push_back("*"); 
+  Strings criteria_star;
+  criteria_star.push_back("*");
   patterns.push_back(criteria_star);
-  Strings criteria_notstar; criteria_notstar.push_back("!*"); 
+  Strings criteria_notstar;
+  criteria_notstar.push_back("!*");
   patterns.push_back(criteria_notstar);
-  Strings criteria0; criteria0.push_back("HLTx1"); criteria0.push_back("HLTy1"); 
+  Strings criteria0;
+  criteria0.push_back("HLTx1");
+  criteria0.push_back("HLTy1");
   patterns.push_back(criteria0);
-  Strings criteria1; criteria1.push_back("CALIBx2"); criteria1.push_back("!HLTx2"); 
+  Strings criteria1;
+  criteria1.push_back("CALIBx2");
+  criteria1.push_back("!HLTx2");
   patterns.push_back(criteria1);
-  Strings criteria2; criteria2.push_back("HLT*"); 
+  Strings criteria2;
+  criteria2.push_back("HLT*");
   patterns.push_back(criteria2);
-  Strings criteria3; criteria3.push_back("!HLT*"); 
+  Strings criteria3;
+  criteria3.push_back("!HLT*");
   patterns.push_back(criteria3);
-  Strings criteria4; criteria4.push_back("DEBUG*1"); criteria4.push_back("HLT?2"); 
+  Strings criteria4;
+  criteria4.push_back("DEBUG*1");
+  criteria4.push_back("HLT?2");
   patterns.push_back(criteria4);
-  Strings criteria5; criteria5.push_back("D*x1"); criteria5.push_back("CALIBx*"); 
+  Strings criteria5;
+  criteria5.push_back("D*x1");
+  criteria5.push_back("CALIBx*");
   patterns.push_back(criteria5);
-  Strings criteria6; criteria6.push_back("HL*1"); criteria6.push_back("C?LIB*2"); 
+  Strings criteria6;
+  criteria6.push_back("HL*1");
+  criteria6.push_back("C?LIB*2");
   patterns.push_back(criteria6);
-  Strings criteria7; criteria7.push_back("H*x1");  
+  Strings criteria7;
+  criteria7.push_back("H*x1");
   patterns.push_back(criteria7);
-  Strings criteria8; criteria8.push_back("!H*x1"); 
+  Strings criteria8;
+  criteria8.push_back("!H*x1");
   patterns.push_back(criteria8);
-  Strings criteria9; criteria9.push_back("C?LIB*2"); 
+  Strings criteria9;
+  criteria9.push_back("C?LIB*2");
   patterns.push_back(criteria9);
 
-
-  // Create our test trigger masks. 
+  // Create our test trigger masks.
 
   VBools testmasks;
-    
-  std::array<bool,numBits> t0 = {{ false, false, false, false, 
-  				     false, false, false, false, 
-				     false, false, false, false }};
+
+  std::array<bool, numBits> t0 = {{false, false, false, false, false, false, false, false, false, false, false, false}};
   testmasks.push_back(toBools(t0));
-  std::array<bool,numBits> t1 = {{ true,  true,  true,  true,  
-  				     true,  true,  true,  true,  
-				     true,  true,  true,  true }};
+  std::array<bool, numBits> t1 = {{true, true, true, true, true, true, true, true, true, true, true, true}};
   testmasks.push_back(toBools(t1));
-  std::array<bool,numBits> t2 = {{ true,  false, false, false, 
-  				     false, false, false, false, 
-				     false, false, false, false }};
+  std::array<bool, numBits> t2 = {{true, false, false, false, false, false, false, false, false, false, false, false}};
   testmasks.push_back(toBools(t2));
-  std::array<bool,numBits> t3 = {{ false, true,  false, false, 
-  				     false, false, false, false, 
-				     false, false, false, false }};
+  std::array<bool, numBits> t3 = {{false, true, false, false, false, false, false, false, false, false, false, false}};
   testmasks.push_back(toBools(t3));
-  
-  std::array<bool,numBits> t4 = {{ false, false, false, false, 
-  				     false, false, false, false, 
-				     true,  false, false, false }};
+
+  std::array<bool, numBits> t4 = {{false, false, false, false, false, false, false, false, true, false, false, false}};
   testmasks.push_back(toBools(t4));
-  std::array<bool,numBits> t5 = {{ true,  true,  true,  true,  
-  				     false, false, true,  false, 
-				     false,  false, false, false }};
+  std::array<bool, numBits> t5 = {{true, true, true, true, false, false, true, false, false, false, false, false}};
   testmasks.push_back(toBools(t5));
-  std::array<bool,numBits> t6 = {{ false, false, false, false,   
-  				     false, true,  false, false, 
-				     false, false, true,  false }};
+  std::array<bool, numBits> t6 = {{false, false, false, false, false, true, false, false, false, false, true, false}};
   testmasks.push_back(toBools(t6));
-  std::array<bool,numBits> t7 = {{ true,  false, true,  false,  
-  				     false, true,  true,  false, 
-				     false, true,  false, true  }};
+  std::array<bool, numBits> t7 = {{true, false, true, false, false, true, true, false, false, true, false, true}};
   testmasks.push_back(toBools(t7));
-  std::array<bool,numBits> t8 = {{ false, false, false, false,  
-  				     false, true,  false, false,
-				     true,  true,  true,  true  }};
-  testmasks.push_back(toBools(t8)); // For j=8 only, the first HLTx1 (false) is 
-  				    // reset to ready and the fifth CALIBx2 (true) 
-				    // is reset to exception.
- 
-  // Create the answers                                                                              
+  std::array<bool, numBits> t8 = {{false, false, false, false, false, true, false, false, true, true, true, true}};
+  testmasks.push_back(toBools(t8));  // For j=8 only, the first HLTx1 (false) is
+                                     // reset to ready and the fifth CALIBx2 (true)
+                                     // is reset to exception.
+
+  // Create the answers
 
   Answers ans;
-  
-  std::vector<bool> ansstar;  	// Answers for criteria star: {{ "*" }}; 
-  ansstar.push_back (false);	// f f f f f f f f f f f f
-  ansstar.push_back (true);	// t t t t t t t t t t t t
-  ansstar.push_back (true);	// t f f f f f f f f f f f
-  ansstar.push_back (true);	// f t f f f f f f f f f f
-  ansstar.push_back (true);	// f f f f f f f f t f f f
-  ansstar.push_back (true);	// t t t t f f t f f f f f
-  ansstar.push_back (true);	// f f f f f t f f f f t f
-  ansstar.push_back (true);	// t f f f f t t f f t f t
-  ansstar.push_back (true);	// r f f f e t f f t t t t
+
+  std::vector<bool> ansstar;  // Answers for criteria star: {{ "*" }};
+  ansstar.push_back(false);   // f f f f f f f f f f f f
+  ansstar.push_back(true);    // t t t t t t t t t t t t
+  ansstar.push_back(true);    // t f f f f f f f f f f f
+  ansstar.push_back(true);    // f t f f f f f f f f f f
+  ansstar.push_back(true);    // f f f f f f f f t f f f
+  ansstar.push_back(true);    // t t t t f f t f f f f f
+  ansstar.push_back(true);    // f f f f f t f f f f t f
+  ansstar.push_back(true);    // t f f f f t t f f t f t
+  ansstar.push_back(true);    // r f f f e t f f t t t t
 
   ans.push_back(ansstar);
-  
-  std::vector<bool> ansnotstar;	// Answers for criteria notstar: {{ "!*" }}; 
-  ansnotstar.push_back (true);	// f f f f f f f f f f f f
-  ansnotstar.push_back (false);	// t t t t t t t t t t t t
-  ansnotstar.push_back (false);	// t f f f f f f f f f f f
-  ansnotstar.push_back (false);	// f t f f f f f f f f f f
-  ansnotstar.push_back (false);	// f f f f f f f f t f f f
-  ansnotstar.push_back (false);	// t t t t f f t f f f f f
-  ansnotstar.push_back (false);	// f f f f f t f f f f t f
-  ansnotstar.push_back (false);	// t f f f f t t f f t f t
-  ansnotstar.push_back (false);	// r f f f e t f f t t t t
+
+  std::vector<bool> ansnotstar;  // Answers for criteria notstar: {{ "!*" }};
+  ansnotstar.push_back(true);    // f f f f f f f f f f f f
+  ansnotstar.push_back(false);   // t t t t t t t t t t t t
+  ansnotstar.push_back(false);   // t f f f f f f f f f f f
+  ansnotstar.push_back(false);   // f t f f f f f f f f f f
+  ansnotstar.push_back(false);   // f f f f f f f f t f f f
+  ansnotstar.push_back(false);   // t t t t f f t f f f f f
+  ansnotstar.push_back(false);   // f f f f f t f f f f t f
+  ansnotstar.push_back(false);   // t f f f f t t f f t f t
+  ansnotstar.push_back(false);   // r f f f e t f f t t t t
 
   ans.push_back(ansnotstar);
-  
-  std::vector<bool> ans0;  	// Answers for criteria 0:{{ "HLTx1", "HLTy1" }};
-  ans0.push_back (false);	// f f f f f f f f f f f f
-  ans0.push_back (true);	// t t t t t t t t t t t t
-  ans0.push_back (true);	// t f f f f f f f f f f f
-  ans0.push_back (false);	// f t f f f f f f f f f f
-  ans0.push_back (false);	// f f f f f f f f t f f f
-  ans0.push_back (true);	// t t t t f f t f f f f f
-  ans0.push_back (false);	// f f f f f t f f f f t f
-  ans0.push_back (true);	// t f f f f t t f f t f t
-  ans0.push_back (false);	// r f f f e t f f t t t t
+
+  std::vector<bool> ans0;  // Answers for criteria 0:{{ "HLTx1", "HLTy1" }};
+  ans0.push_back(false);   // f f f f f f f f f f f f
+  ans0.push_back(true);    // t t t t t t t t t t t t
+  ans0.push_back(true);    // t f f f f f f f f f f f
+  ans0.push_back(false);   // f t f f f f f f f f f f
+  ans0.push_back(false);   // f f f f f f f f t f f f
+  ans0.push_back(true);    // t t t t f f t f f f f f
+  ans0.push_back(false);   // f f f f f t f f f f t f
+  ans0.push_back(true);    // t f f f f t t f f t f t
+  ans0.push_back(false);   // r f f f e t f f t t t t
 
   ans.push_back(ans0);
-  
-  std::vector<bool> ans1;  	// Answers for criteria 1:{{"CALIBx2","!HLTx2"}};
-  ans1.push_back (true);	// f f f f f f f f f f f f
-  ans1.push_back (true);	// t t t t t t t t t t t t
-  ans1.push_back (true);	// t f f f f f f f f f f f
-  ans1.push_back (false);	// f t f f f f f f f f f f
-  ans1.push_back (true);	// f f f f f f f f t f f f
-  ans1.push_back (false);	// t t t t f f t f f f f f
-  ans1.push_back (true);	// f f f f f t f f f f t f
-  ans1.push_back (true);	// t f f f f t t f f t f t
-  ans1.push_back (true);	// r f f f e t f f t t t t
+
+  std::vector<bool> ans1;  // Answers for criteria 1:{{"CALIBx2","!HLTx2"}};
+  ans1.push_back(true);    // f f f f f f f f f f f f
+  ans1.push_back(true);    // t t t t t t t t t t t t
+  ans1.push_back(true);    // t f f f f f f f f f f f
+  ans1.push_back(false);   // f t f f f f f f f f f f
+  ans1.push_back(true);    // f f f f f f f f t f f f
+  ans1.push_back(false);   // t t t t f f t f f f f f
+  ans1.push_back(true);    // f f f f f t f f f f t f
+  ans1.push_back(true);    // t f f f f t t f f t f t
+  ans1.push_back(true);    // r f f f e t f f t t t t
 
   ans.push_back(ans1);
-  
-  std::vector<bool> ans2;  	// Answers for criteria 2:{{ "HLT*" }};
-  ans2.push_back (false);	// f f f f f f f f f f f f
-  ans2.push_back (true);	// t t t t t t t t t t t t
-  ans2.push_back (true);	// t f f f f f f f f f f f
-  ans2.push_back (true);	// f t f f f f f f f f f f
-  ans2.push_back (false);	// f f f f f f f f t f f f
-  ans2.push_back (true);	// t t t t f f t f f f f f
-  ans2.push_back (false);	// f f f f f t f f f f t f
-  ans2.push_back (true);	// t f f f f t t f f t f t
-  ans2.push_back (false);	// r f f f e t f f t t t t
+
+  std::vector<bool> ans2;  // Answers for criteria 2:{{ "HLT*" }};
+  ans2.push_back(false);   // f f f f f f f f f f f f
+  ans2.push_back(true);    // t t t t t t t t t t t t
+  ans2.push_back(true);    // t f f f f f f f f f f f
+  ans2.push_back(true);    // f t f f f f f f f f f f
+  ans2.push_back(false);   // f f f f f f f f t f f f
+  ans2.push_back(true);    // t t t t f f t f f f f f
+  ans2.push_back(false);   // f f f f f t f f f f t f
+  ans2.push_back(true);    // t f f f f t t f f t f t
+  ans2.push_back(false);   // r f f f e t f f t t t t
 
   ans.push_back(ans2);
-  
-  std::vector<bool> ans3;  	// Answers for criteria 3:{{ "!HLT*" }};
-  ans3.push_back (true);	// f f f f f f f f f f f f
-  ans3.push_back (false);	// t t t t t t t t t t t t
-  ans3.push_back (false);	// t f f f f f f f f f f f
-  ans3.push_back (false);	// f t f f f f f f f f f f
-  ans3.push_back (true);	// f f f f f f f f t f f f
-  ans3.push_back (false);	// t t t t f f t f f f f f
-  ans3.push_back (true);	// f f f f f t f f f f t f
-  ans3.push_back (false);	// t f f f f t t f f t f t
-  ans3.push_back (false);	// r f f f e t f f t t t t // ready is not fail
+
+  std::vector<bool> ans3;  // Answers for criteria 3:{{ "!HLT*" }};
+  ans3.push_back(true);    // f f f f f f f f f f f f
+  ans3.push_back(false);   // t t t t t t t t t t t t
+  ans3.push_back(false);   // t f f f f f f f f f f f
+  ans3.push_back(false);   // f t f f f f f f f f f f
+  ans3.push_back(true);    // f f f f f f f f t f f f
+  ans3.push_back(false);   // t t t t f f t f f f f f
+  ans3.push_back(true);    // f f f f f t f f f f t f
+  ans3.push_back(false);   // t f f f f t t f f t f t
+  ans3.push_back(false);   // r f f f e t f f t t t t // ready is not fail
 
   ans.push_back(ans3);
-  
-  
-  std::vector<bool> ans4;  	// Answers for criteria 4:{{"DEBUG*1","HLT?2"}};
-  ans4.push_back (false);	// f f f f f f f f f f f f
-  ans4.push_back (true);	// t t t t t t t t t t t t
-  ans4.push_back (false);	// t f f f f f f f f f f f
-  ans4.push_back (true);	// f t f f f f f f f f f f
-  ans4.push_back (true);	// f f f f f f f f t f f f
-  ans4.push_back (true);	// t t t t f f t f f f f f
-  ans4.push_back (true);	// f f f f f t f f f f t f
-  ans4.push_back (false);	// t f f f f t t f f t f t
-  ans4.push_back (true);	// r f f f e t f f t t t t
+
+  std::vector<bool> ans4;  // Answers for criteria 4:{{"DEBUG*1","HLT?2"}};
+  ans4.push_back(false);   // f f f f f f f f f f f f
+  ans4.push_back(true);    // t t t t t t t t t t t t
+  ans4.push_back(false);   // t f f f f f f f f f f f
+  ans4.push_back(true);    // f t f f f f f f f f f f
+  ans4.push_back(true);    // f f f f f f f f t f f f
+  ans4.push_back(true);    // t t t t f f t f f f f f
+  ans4.push_back(true);    // f f f f f t f f f f t f
+  ans4.push_back(false);   // t f f f f t t f f t f t
+  ans4.push_back(true);    // r f f f e t f f t t t t
 
   ans.push_back(ans4);
-  
-  
-  std::vector<bool> ans5;  	// Answers for criteria 5:{{ "D*x1", "CALIBx*" }};
-  ans5.push_back (false);	// f f f f f f f f f f f f
-  ans5.push_back (true);	// t t t t t t t t t t t t
-  ans5.push_back (false);	// t f f f f f f f f f f f
-  ans5.push_back (false);	// f t f f f f f f f f f f
-  ans5.push_back (true);	// f f f f f f f f t f f f
-  ans5.push_back (false);	// t t t t f f t f f f f f
-  ans5.push_back (true);	// f f f f f t f f f f t f
-  ans5.push_back (true);	// t f f f f t t f f t f t
-  ans5.push_back (true);	// r f f f e t f f t t t t
+
+  std::vector<bool> ans5;  // Answers for criteria 5:{{ "D*x1", "CALIBx*" }};
+  ans5.push_back(false);   // f f f f f f f f f f f f
+  ans5.push_back(true);    // t t t t t t t t t t t t
+  ans5.push_back(false);   // t f f f f f f f f f f f
+  ans5.push_back(false);   // f t f f f f f f f f f f
+  ans5.push_back(true);    // f f f f f f f f t f f f
+  ans5.push_back(false);   // t t t t f f t f f f f f
+  ans5.push_back(true);    // f f f f f t f f f f t f
+  ans5.push_back(true);    // t f f f f t t f f t f t
+  ans5.push_back(true);    // r f f f e t f f t t t t
 
   ans.push_back(ans5);
-  
-  std::vector<bool> ans6;  	// Answers for criteria 6:{{ "HL*1", "C?LIB*2" }};
-  ans6.push_back (false);	// f f f f f f f f f f f f
-  ans6.push_back (true);	// t t t t t t t t t t t t
-  ans6.push_back (true);	// t f f f f f f f f f f f
-  ans6.push_back (false);	// f t f f f f f f f f f f
-  ans6.push_back (false);	// f f f f f f f f t f f f
-  ans6.push_back (true);	// t t t t f f t f f f f f
-  ans6.push_back (true);	// f f f f f t f f f f t f
-  ans6.push_back (true);	// t f f f f t t f f t f t
-  ans6.push_back (true);	// r f f f e t f f t t t t
+
+  std::vector<bool> ans6;  // Answers for criteria 6:{{ "HL*1", "C?LIB*2" }};
+  ans6.push_back(false);   // f f f f f f f f f f f f
+  ans6.push_back(true);    // t t t t t t t t t t t t
+  ans6.push_back(true);    // t f f f f f f f f f f f
+  ans6.push_back(false);   // f t f f f f f f f f f f
+  ans6.push_back(false);   // f f f f f f f f t f f f
+  ans6.push_back(true);    // t t t t f f t f f f f f
+  ans6.push_back(true);    // f f f f f t f f f f t f
+  ans6.push_back(true);    // t f f f f t t f f t f t
+  ans6.push_back(true);    // r f f f e t f f t t t t
 
   ans.push_back(ans6);
- 
-  std::vector<bool> ans7;  	// Answers for criteria7:{{ "H*x1" }};
-  ans7.push_back (false);	// f f f f f f f f f f f f
-  ans7.push_back (true);	// t t t t t t t t t t t t
-  ans7.push_back (true);	// t f f f f f f f f f f f
-  ans7.push_back (false);	// f t f f f f f f f f f f
-  ans7.push_back (false);	// f f f f f f f f t f f f
-  ans7.push_back (true);	// t t t t f f t f f f f f
-  ans7.push_back (false);	// f f f f f t f f f f t f
-  ans7.push_back (true);	// t f f f f t t f f t f t
-  ans7.push_back (false);	// r f f f e t f f t t t t
+
+  std::vector<bool> ans7;  // Answers for criteria7:{{ "H*x1" }};
+  ans7.push_back(false);   // f f f f f f f f f f f f
+  ans7.push_back(true);    // t t t t t t t t t t t t
+  ans7.push_back(true);    // t f f f f f f f f f f f
+  ans7.push_back(false);   // f t f f f f f f f f f f
+  ans7.push_back(false);   // f f f f f f f f t f f f
+  ans7.push_back(true);    // t t t t f f t f f f f f
+  ans7.push_back(false);   // f f f f f t f f f f t f
+  ans7.push_back(true);    // t f f f f t t f f t f t
+  ans7.push_back(false);   // r f f f e t f f t t t t
 
   ans.push_back(ans7);
- 
-  std::vector<bool> ans8;  	// Answers for criteria8:{{ "!H*x1" }};
-  ans8.push_back (true);	// f f f f f f f f f f f f
-  ans8.push_back (false);	// t t t t t t t t t t t t
-  ans8.push_back (false);	// t f f f f f f f f f f f
-  ans8.push_back (true);	// f t f f f f f f f f f f
-  ans8.push_back (true);	// f f f f f f f f t f f f
-  ans8.push_back (false);	// t t t t f f t f f f f f
-  ans8.push_back (true);	// f f f f f t f f f f t f
-  ans8.push_back (false);	// t f f f f t t f f t f t
-  ans8.push_back (false);	// r f f f e t f f t t t t -- false because ready does not
-  			 	//			      itself cause an accept
+
+  std::vector<bool> ans8;  // Answers for criteria8:{{ "!H*x1" }};
+  ans8.push_back(true);    // f f f f f f f f f f f f
+  ans8.push_back(false);   // t t t t t t t t t t t t
+  ans8.push_back(false);   // t f f f f f f f f f f f
+  ans8.push_back(true);    // f t f f f f f f f f f f
+  ans8.push_back(true);    // f f f f f f f f t f f f
+  ans8.push_back(false);   // t t t t f f t f f f f f
+  ans8.push_back(true);    // f f f f f t f f f f t f
+  ans8.push_back(false);   // t f f f f t t f f t f t
+  ans8.push_back(false);   // r f f f e t f f t t t t -- false because ready does not
+                           //			      itself cause an accept
 
   ans.push_back(ans8);
 
-  std::vector<bool> ans9;  	// Answers for criteria 9:{{ "C?LIB*2" }};
-  ans9.push_back (false);	// f f f f f f f f f f f f
-  ans9.push_back (true);	// t t t t t t t t t t t t
-  ans9.push_back (false);	// t f f f f f f f f f f f
-  ans9.push_back (false);	// f t f f f f f f f f f f
-  ans9.push_back (false);	// f f f f f f f f t f f f
-  ans9.push_back (false);	// t t t t f f t f f f f f
-  ans9.push_back (true);	// f f f f f t f f f f t f
-  ans9.push_back (true);	// t f f f f t t f f t f t
-  ans9.push_back (true);	// r f f f e t f f t t t t
+  std::vector<bool> ans9;  // Answers for criteria 9:{{ "C?LIB*2" }};
+  ans9.push_back(false);   // f f f f f f f f f f f f
+  ans9.push_back(true);    // t t t t t t t t t t t t
+  ans9.push_back(false);   // t f f f f f f f f f f f
+  ans9.push_back(false);   // f t f f f f f f f f f f
+  ans9.push_back(false);   // f f f f f f f f t f f f
+  ans9.push_back(false);   // t t t t f f t f f f f f
+  ans9.push_back(true);    // f f f f f t f f f f t f
+  ans9.push_back(true);    // t f f f f t t f f t f t
+  ans9.push_back(true);    // r f f f e t f f t t t t
 
   ans.push_back(ans9);
- 
- 
+
   // The following code is identical to that in EventSelector_t.cpp:
-  
-  // We want to create the TriggerNamesService because it is used in 
+
+  // We want to create the TriggerNamesService because it is used in
   // the tests.  We do that here, but first we need to build a minimal
   // parameter set to pass to its constructor.  Then we build the
   // service and setup the service system.
@@ -455,15 +434,14 @@ try {
   //make the services available
   ServiceRegistry::Operate operate(serviceToken_);
 
-
   // We are ready to run some tests
 
   testall(paths, patterns, testmasks, ans);
   return 0;
-} catch(cms::Exception const& e) {
+} catch (cms::Exception const& e) {
   std::cerr << e.explainSelf() << std::endl;
   return 1;
-} catch(std::exception const& e) {
+} catch (std::exception const& e) {
   std::cerr << e.what() << std::endl;
   return 1;
 }
diff --git a/FWCore/Framework/test/EventSelector_t.cpp b/FWCore/Framework/test/EventSelector_t.cpp
index a659d8709d698..d26b0ae46093f 100644
--- a/FWCore/Framework/test/EventSelector_t.cpp
+++ b/FWCore/Framework/test/EventSelector_t.cpp
@@ -26,31 +26,22 @@ typedef std::vector<Strings> VStrings;
 typedef std::vector<bool> Bools;
 typedef std::vector<Bools> VBools;
 
-std::ostream& operator<<(std::ostream& ost, const Strings& s)
-{
-  for(Strings::const_iterator i(s.begin()),e(s.end());i!=e;++i)
-    {
-      ost << *i << " ";
-    }
+std::ostream& operator<<(std::ostream& ost, const Strings& s) {
+  for (Strings::const_iterator i(s.begin()), e(s.end()); i != e; ++i) {
+    ost << *i << " ";
+  }
   return ost;
 }
 
-std::ostream& operator<<(std::ostream& ost, const Bools& b)
-{
-  for(unsigned int i=0;i<b.size();++i)
-    {
-      ost << b[i] << " ";
-    }
+std::ostream& operator<<(std::ostream& ost, const Bools& b) {
+  for (unsigned int i = 0; i < b.size(); ++i) {
+    ost << b[i] << " ";
+  }
   return ost;
 }
 
-void testone(const Strings& paths,
-	     const Strings& pattern,
-	     const Bools& mask,
-	     bool answer,
-             int jmask)
-{
-  ParameterSet pset; //, parent;
+void testone(const Strings& paths, const Strings& pattern, const Bools& mask, bool answer, int jmask) {
+  ParameterSet pset;  //, parent;
   pset.addParameter<Strings>("SelectEvents", pattern);
   //parent.addUntrackedParameter<ParameterSet>("SelectEvents",pset);
   pset.registerIt();
@@ -65,21 +56,22 @@ void testone(const Strings& paths,
   std::vector<unsigned char> bitArray;
 
   HLTGlobalStatus bm(mask.size());
-  const HLTPathStatus pass  = HLTPathStatus(edm::hlt::Pass);
-  const HLTPathStatus fail  = HLTPathStatus(edm::hlt::Fail);
-  const HLTPathStatus ex    = HLTPathStatus(edm::hlt::Exception);
+  const HLTPathStatus pass = HLTPathStatus(edm::hlt::Pass);
+  const HLTPathStatus fail = HLTPathStatus(edm::hlt::Fail);
+  const HLTPathStatus ex = HLTPathStatus(edm::hlt::Exception);
   const HLTPathStatus ready = HLTPathStatus(edm::hlt::Ready);
-  for(unsigned int b=0;b<mask.size();++b) {
-    bm[b] = (mask[b]? pass : fail);
+  for (unsigned int b = 0; b < mask.size(); ++b) {
+    bm[b] = (mask[b] ? pass : fail);
 
     // There is an alternate version of the function acceptEvent
     // that takes an array of characters as an argument instead
     // of a TriggerResults object.  These next few lines build
     // that array so we can test that also.
-    if ( (number_of_trigger_paths % 4) == 0) bitArray.push_back(0);
+    if ((number_of_trigger_paths % 4) == 0)
+      bitArray.push_back(0);
     int byteIndex = number_of_trigger_paths / 4;
     int subIndex = number_of_trigger_paths % 4;
-    bitArray[byteIndex] |= (mask[b]? edm::hlt::Pass : edm::hlt::Fail) << (subIndex * 2);
+    bitArray[byteIndex] |= (mask[b] ? edm::hlt::Pass : edm::hlt::Fail) << (subIndex * 2);
     ++number_of_trigger_paths;
   }
 
@@ -90,33 +82,31 @@ void testone(const Strings& paths,
     bitArray[1] = (bitArray[1] & 0xfc) | edm::hlt::Exception;
   }
 
-  TriggerResults results(bm,paths);
+  TriggerResults results(bm, paths);
 
-//        std::cerr << "pattern=" << pattern 
-//	 	  << "mask=" << mask << "\n";  // DBG
+  //        std::cerr << "pattern=" << pattern
+  //	 	  << "mask=" << mask << "\n";  // DBG
 
-//  	std:: cerr << "a \n";
+  //  	std:: cerr << "a \n";
   bool a = select.acceptEvent(results);
-//  	std:: cerr << "a1 \n";
+  //  	std:: cerr << "a1 \n";
   bool a1 = select1.acceptEvent(results);
-//  	std:: cerr << "a2 \n";
+  //  	std:: cerr << "a2 \n";
   bool a2 = select2.acceptEvent(results);
-//  	std:: cerr << "b2 \n";
+  //  	std:: cerr << "b2 \n";
   bool b2 = select2.acceptEvent(results);
-//  	std:: cerr << "c1 \n";
+  //  	std:: cerr << "c1 \n";
   bool c1 = select1.acceptEvent(&(bitArray[0]), number_of_trigger_paths);
 
-  if (a!=answer || a1 != answer || a2 != answer || b2 != answer || c1 != answer)
-    {
-      std::cerr << "failed to compare pattern with mask: "
-	   << "correct=" << answer << " "
-	   << "results=" << a << "  " << a1 << "  " << a2 
-	   		      << "  " << b2 << "  " << c1 << "\n"
-	   << "pattern=" << pattern << "\n"
-	   << "mask=" << mask << "\n"
-           << "jmask = " << jmask << "\n"; 
-      abort();
-    }
+  if (a != answer || a1 != answer || a2 != answer || b2 != answer || c1 != answer) {
+    std::cerr << "failed to compare pattern with mask: "
+              << "correct=" << answer << " "
+              << "results=" << a << "  " << a1 << "  " << a2 << "  " << b2 << "  " << c1 << "\n"
+              << "pattern=" << pattern << "\n"
+              << "mask=" << mask << "\n"
+              << "jmask = " << jmask << "\n";
+    abort();
+  }
 
   // Repeat putting the list of trigger names in the pset
   // registry
@@ -127,116 +117,105 @@ void testone(const Strings& paths,
 
   TriggerResults results_id(bm, trigger_pset.id());
 
-//  	std:: cerr << "a11 \n";
+  //  	std:: cerr << "a11 \n";
   bool a11 = select.acceptEvent(results_id);
-//  	std:: cerr << "a12 \n";
+  //  	std:: cerr << "a12 \n";
   bool a12 = select1.acceptEvent(results_id);
-//  	std:: cerr << "a13 \n";
+  //  	std:: cerr << "a13 \n";
   bool a13 = select2.acceptEvent(results_id);
-//  	std:: cerr << "a14 \n";
+  //  	std:: cerr << "a14 \n";
   bool a14 = select2.acceptEvent(results_id);
 
-  if (a11 != answer || a12 != answer || a13 != answer || a14 != answer)
-    {
-      std::cerr << "failed to compare pattern with mask using pset ID: "
-	   << "correct=" << answer << " "
-	   << "results=" << a11 << "  " << a12 << "  " << a13 << "  " << a14 << "\n"
-	   << "pattern=" << pattern << "\n"
-	   << "mask=" << mask << "\n"
-           << "jmask = " << jmask << "\n"; 
-      abort();
-    }
+  if (a11 != answer || a12 != answer || a13 != answer || a14 != answer) {
+    std::cerr << "failed to compare pattern with mask using pset ID: "
+              << "correct=" << answer << " "
+              << "results=" << a11 << "  " << a12 << "  " << a13 << "  " << a14 << "\n"
+              << "pattern=" << pattern << "\n"
+              << "mask=" << mask << "\n"
+              << "jmask = " << jmask << "\n";
+    abort();
+  }
 }
 
-void testall(const Strings& paths,
-	     const VStrings& patterns,
-	     const VBools& masks,
-	     const Answers& answers)
-{
-  for(unsigned int i=0;i<patterns.size();++i)
-    {
-      for(unsigned int j=0;j<masks.size();++j)
-	{
-	  testone(paths,patterns[i],masks[j],answers[i][j],j);
-	}
+void testall(const Strings& paths, const VStrings& patterns, const VBools& masks, const Answers& answers) {
+  for (unsigned int i = 0; i < patterns.size(); ++i) {
+    for (unsigned int j = 0; j < masks.size(); ++j) {
+      testone(paths, patterns[i], masks[j], answers[i][j], j);
     }
+  }
 }
 
-
-int main()
-try {
-
+int main() try {
   // Name all our paths. We have as many paths as there are trigger
   // bits.
-  std::array<char const*, numBits> cpaths = {{"a1","a2","a3","a4","a5"}};
-  Strings paths(cpaths.begin(),cpaths.end());
-
-  // 
-
-  std::array<char const*, 2> cw1 = {{ "a1","a2" }};
-  std::array<char const*, 2> cw2 = {{ "!a1","!a2" }};
-  std::array<char const*, 2> cw3 = {{ "a1","!a2" }};
-  std::array<char const*, 1> cw4 = {{ "*" }};
-  std::array<char const*, 1> cw5 = {{ "!*" }};
-  std::array<char const*, 2> cw6 = {{ "*","!*" }};
-  std::array<char const*, 2> cw7 = {{ "*","!a2" }};
-  std::array<char const*, 2> cw8 = {{ "!*","a2" }};
-  std::array<char const*, 3> cw9 = {{ "a1","a2","a5" }};
-  std::array<char const*, 2> cwA = {{ "a3","a4" }};
-  std::array<char const*, 1> cwB = {{ "!a5" }};
+  std::array<char const*, numBits> cpaths = {{"a1", "a2", "a3", "a4", "a5"}};
+  Strings paths(cpaths.begin(), cpaths.end());
+
+  //
+
+  std::array<char const*, 2> cw1 = {{"a1", "a2"}};
+  std::array<char const*, 2> cw2 = {{"!a1", "!a2"}};
+  std::array<char const*, 2> cw3 = {{"a1", "!a2"}};
+  std::array<char const*, 1> cw4 = {{"*"}};
+  std::array<char const*, 1> cw5 = {{"!*"}};
+  std::array<char const*, 2> cw6 = {{"*", "!*"}};
+  std::array<char const*, 2> cw7 = {{"*", "!a2"}};
+  std::array<char const*, 2> cw8 = {{"!*", "a2"}};
+  std::array<char const*, 3> cw9 = {{"a1", "a2", "a5"}};
+  std::array<char const*, 2> cwA = {{"a3", "a4"}};
+  std::array<char const*, 1> cwB = {{"!a5"}};
 
   VStrings patterns(numPatterns);
-  patterns[0].insert(patterns[0].end(),cw1.begin(),cw1.end());
-  patterns[1].insert(patterns[1].end(),cw2.begin(),cw2.end());
-  patterns[2].insert(patterns[2].end(),cw3.begin(),cw3.end());
-  patterns[3].insert(patterns[3].end(),cw4.begin(),cw4.end());
-  patterns[4].insert(patterns[4].end(),cw5.begin(),cw5.end());
-  patterns[5].insert(patterns[5].end(),cw6.begin(),cw6.end());
-  patterns[6].insert(patterns[6].end(),cw7.begin(),cw7.end());
-  patterns[7].insert(patterns[7].end(),cw8.begin(),cw8.end());
-  patterns[8].insert(patterns[8].end(),cw9.begin(),cw9.end());
-  patterns[9].insert(patterns[9].end(),cwA.begin(),cwA.end());
-  patterns[10].insert(patterns[10].end(),cwB.begin(),cwB.end());
-
-  std::array<bool,numBits> t1 = {{ true,  false, true,  false, true  }};
-  std::array<bool,numBits> t2 = {{ false, true,  true,  false, true  }};
-  std::array<bool,numBits> t3 = {{ true,  true,  true,  false, true  }};
-  std::array<bool,numBits> t4 = {{ false, false, true,  false, true  }};
-  std::array<bool,numBits> t5 = {{ false, false, false, false, false }};
-  std::array<bool,numBits> t6 = {{ true,  true,  true,  true,  true  }};
-  std::array<bool,numBits> t7 = {{ true,  true,  true,  true,  false }};
-  std::array<bool,numBits> t8 = {{ false, false, false, false, true  }};
-  std::array<bool,numBits> t9 = {{ false, false, false, false, false }};  // for t9 only, above the
-                                                                            // first is reset to ready
-                                                                            // last is reset to exception
-                                                                              
+  patterns[0].insert(patterns[0].end(), cw1.begin(), cw1.end());
+  patterns[1].insert(patterns[1].end(), cw2.begin(), cw2.end());
+  patterns[2].insert(patterns[2].end(), cw3.begin(), cw3.end());
+  patterns[3].insert(patterns[3].end(), cw4.begin(), cw4.end());
+  patterns[4].insert(patterns[4].end(), cw5.begin(), cw5.end());
+  patterns[5].insert(patterns[5].end(), cw6.begin(), cw6.end());
+  patterns[6].insert(patterns[6].end(), cw7.begin(), cw7.end());
+  patterns[7].insert(patterns[7].end(), cw8.begin(), cw8.end());
+  patterns[8].insert(patterns[8].end(), cw9.begin(), cw9.end());
+  patterns[9].insert(patterns[9].end(), cwA.begin(), cwA.end());
+  patterns[10].insert(patterns[10].end(), cwB.begin(), cwB.end());
+
+  std::array<bool, numBits> t1 = {{true, false, true, false, true}};
+  std::array<bool, numBits> t2 = {{false, true, true, false, true}};
+  std::array<bool, numBits> t3 = {{true, true, true, false, true}};
+  std::array<bool, numBits> t4 = {{false, false, true, false, true}};
+  std::array<bool, numBits> t5 = {{false, false, false, false, false}};
+  std::array<bool, numBits> t6 = {{true, true, true, true, true}};
+  std::array<bool, numBits> t7 = {{true, true, true, true, false}};
+  std::array<bool, numBits> t8 = {{false, false, false, false, true}};
+  std::array<bool, numBits> t9 = {{false, false, false, false, false}};  // for t9 only, above the
+                                                                         // first is reset to ready
+                                                                         // last is reset to exception
 
   VBools testmasks(numMasks);
-  testmasks[0].insert(testmasks[0].end(),t1.begin(),t1.end());
-  testmasks[1].insert(testmasks[1].end(),t2.begin(),t2.end());
-  testmasks[2].insert(testmasks[2].end(),t3.begin(),t3.end());
-  testmasks[3].insert(testmasks[3].end(),t4.begin(),t4.end());
-  testmasks[4].insert(testmasks[4].end(),t5.begin(),t5.end());
-  testmasks[5].insert(testmasks[5].end(),t6.begin(),t6.end());
-  testmasks[6].insert(testmasks[6].end(),t7.begin(),t7.end());
-  testmasks[7].insert(testmasks[7].end(),t8.begin(),t8.end());
-  testmasks[8].insert(testmasks[8].end(),t9.begin(),t9.end());
-
-  Answers ans = { {true, true,  true,  false, false, true,  true,  false, false },
-		  {true, true,  false, true,  true,  false, false, true,  true  },
-		  {true, false, true,  true,  true,  true , true,  true,  true  },
-		  {true, true,  true,  true,  false, true,  true,  true,  false }, // last column changed due to treatment of excp
-		  {false,false, false, false, true,  false, false, false, false },
-		  {true, true,  true,  true,  true,  true,  true,  true,  false }, // last column changed due to treatment of excp
-		  {true, true,  true,  true,  true,  true,  true,  true,  true  },
-		  {false,true,  true,  false, true,  true,  true,  false, false },
-		  {true, true,  true,  true,  false, true,  true,  true,  false }, // last column changed due to treatment of excp
-		  {true, true,  true,  true,  false, true,  true,  false, false },
-		  {false,false, false, false, true,  false, true,  false, false }  // last column changed due to treatment of excp
+  testmasks[0].insert(testmasks[0].end(), t1.begin(), t1.end());
+  testmasks[1].insert(testmasks[1].end(), t2.begin(), t2.end());
+  testmasks[2].insert(testmasks[2].end(), t3.begin(), t3.end());
+  testmasks[3].insert(testmasks[3].end(), t4.begin(), t4.end());
+  testmasks[4].insert(testmasks[4].end(), t5.begin(), t5.end());
+  testmasks[5].insert(testmasks[5].end(), t6.begin(), t6.end());
+  testmasks[6].insert(testmasks[6].end(), t7.begin(), t7.end());
+  testmasks[7].insert(testmasks[7].end(), t8.begin(), t8.end());
+  testmasks[8].insert(testmasks[8].end(), t9.begin(), t9.end());
+
+  Answers ans = {
+      {true, true, true, false, false, true, true, false, false},
+      {true, true, false, true, true, false, false, true, true},
+      {true, false, true, true, true, true, true, true, true},
+      {true, true, true, true, false, true, true, true, false},  // last column changed due to treatment of excp
+      {false, false, false, false, true, false, false, false, false},
+      {true, true, true, true, true, true, true, true, false},  // last column changed due to treatment of excp
+      {true, true, true, true, true, true, true, true, true},
+      {false, true, true, false, true, true, true, false, false},
+      {true, true, true, true, false, true, true, true, false},  // last column changed due to treatment of excp
+      {true, true, true, true, false, true, true, false, false},
+      {false, false, false, false, true, false, true, false, false}  // last column changed due to treatment of excp
   };
 
-
-  // We want to create the TriggerNamesService because it is used in 
+  // We want to create the TriggerNamesService because it is used in
   // the tests.  We do that here, but first we need to build a minimal
   // parameter set to pass to its constructor.  Then we build the
   // service and setup the service system.
@@ -271,15 +250,14 @@ try {
   //make the services available
   ServiceRegistry::Operate operate(serviceToken_);
 
-
   // We are ready to run some tests
 
   testall(paths, patterns, testmasks, ans);
   return 0;
-} catch(cms::Exception const& e) {
+} catch (cms::Exception const& e) {
   std::cerr << e.explainSelf() << std::endl;
   return 1;
-} catch(std::exception const& e) {
+} catch (std::exception const& e) {
   std::cerr << e.what() << std::endl;
   return 1;
 }
diff --git a/FWCore/Framework/test/Event_t.cpp b/FWCore/Framework/test/Event_t.cpp
index 4f75b0dfa042a..39da34285f8e4 100644
--- a/FWCore/Framework/test/Event_t.cpp
+++ b/FWCore/Framework/test/Event_t.cpp
@@ -59,30 +59,29 @@ using namespace edm;
 // This is a gross hack, to allow us to test the event
 namespace {
   struct IntConsumer : public EDConsumerBase {
-    IntConsumer( std::vector<InputTag> const& iTags) {
+    IntConsumer(std::vector<InputTag> const& iTags) {
       m_tokens.reserve(iTags.size());
       for (auto const& tag : iTags) {
-        m_tokens.push_back( consumes<int>(tag));
+        m_tokens.push_back(consumes<int>(tag));
       }
     }
-    
+
     std::vector<EDGetTokenT<int>> m_tokens;
   };
 
   struct IntProductConsumer : public EDConsumerBase {
-    IntProductConsumer( std::vector<InputTag> const& iTags) {
+    IntProductConsumer(std::vector<InputTag> const& iTags) {
       m_tokens.reserve(iTags.size());
       for (auto const& tag : iTags) {
-        m_tokens.push_back( consumes<edmtest::IntProduct>(tag));
+        m_tokens.push_back(consumes<edmtest::IntProduct>(tag));
       }
     }
-    
+
     std::vector<EDGetTokenT<edmtest::IntProduct>> m_tokens;
   };
-}
+}  // namespace
 
-
-class testEvent: public CppUnit::TestFixture {
+class testEvent : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testEvent);
   CPPUNIT_TEST(emptyEvent);
   CPPUNIT_TEST(getByLabelFromEmpty);
@@ -104,7 +103,7 @@ class testEvent: public CppUnit::TestFixture {
   CPPUNIT_TEST(deleteProduct);
   CPPUNIT_TEST_SUITE_END();
 
- public:
+public:
   testEvent();
   ~testEvent();
   void setUp();
@@ -128,8 +127,7 @@ class testEvent: public CppUnit::TestFixture {
   void printHistory();
   void deleteProduct();
 
- private:
-
+private:
   template <class T>
   void registerProduct(std::string const& tag,
                        std::string const& moduleLabel,
@@ -143,57 +141,55 @@ class testEvent: public CppUnit::TestFixture {
                        std::string const& moduleClassName,
                        std::string const& processName) {
     std::string productInstanceName;
-    registerProduct<T>(tag, moduleLabel, moduleClassName, processName,
-                       productInstanceName);
+    registerProduct<T>(tag, moduleLabel, moduleClassName, processName, productInstanceName);
   }
 
   template <class T>
   ProductID addProduct(std::unique_ptr<T> product,
                        std::string const& tag,
                        std::string const& productLabel = std::string());
-  
+
   template <class T>
   std::unique_ptr<ProducerBase> putProduct(std::unique_ptr<T> product,
-                  std::string const& productInstanceLabel,
-                                           bool doCommit=true);
+                                           std::string const& productInstanceLabel,
+                                           bool doCommit = true);
   template <class T>
   std::unique_ptr<ProducerBase> putProductUsingToken(std::unique_ptr<T> product,
                                                      std::string const& productInstanceLabel,
-                                                     bool doCommit=true);
+                                                     bool doCommit = true);
   template <class T>
   std::unique_ptr<ProducerBase> emplaceProduct(T product,
                                                std::string const& productInstanceLabel,
-                                               bool doCommit=true);
+                                               bool doCommit = true);
 
-  std::shared_ptr<ProductRegistry>   availableProducts_;
+  std::shared_ptr<ProductRegistry> availableProducts_;
   std::shared_ptr<BranchIDListHelper> branchIDListHelper_;
   std::shared_ptr<ThinnedAssociationsHelper> thinnedAssociationsHelper_;
   std::shared_ptr<edm::LuminosityBlockPrincipal> lbp_;
-  std::shared_ptr<EventPrincipal>    principal_;
-  std::shared_ptr<Event>             currentEvent_;
+  std::shared_ptr<EventPrincipal> principal_;
+  std::shared_ptr<Event> currentEvent_;
   std::shared_ptr<ModuleDescription> currentModuleDescription_;
   typedef std::map<std::string, ModuleDescription> modCache_t;
   typedef modCache_t::iterator iterator_t;
 
   modCache_t moduleDescriptions_;
   ProcessHistoryRegistry processHistoryRegistry_;
-  std::vector<std::shared_ptr<ProcessConfiguration> > processConfigurations_;
+  std::vector<std::shared_ptr<ProcessConfiguration>> processConfigurations_;
   HistoryAppender historyAppender_;
 };
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testEvent);
 
-EventID   make_id() { return EventID(2112, 1, 25); }
+EventID make_id() { return EventID(2112, 1, 25); }
 Timestamp make_timestamp() { return Timestamp(1); }
 
 template <class T>
-void
-testEvent::registerProduct(std::string const& tag,
-                           std::string const& moduleLabel,
-                            std::string const& moduleClassName,
-                            std::string const& processName,
-                           std::string const& productInstanceName) {
+void testEvent::registerProduct(std::string const& tag,
+                                std::string const& moduleLabel,
+                                std::string const& moduleClassName,
+                                std::string const& processName,
+                                std::string const& productInstanceName) {
   if (!availableProducts_)
     availableProducts_.reset(new ProductRegistry());
 
@@ -222,39 +218,33 @@ testEvent::registerProduct(std::string const& tag,
                            productInstanceName,
                            moduleClassName,
                            moduleParams.id(),
-                           product_type
-                        );
+                           product_type);
 
-  moduleDescriptions_[tag] = ModuleDescription(moduleParams.id(), moduleClassName, moduleLabel, processX.get(),ModuleDescription::getUniqueID());
+  moduleDescriptions_[tag] = ModuleDescription(
+      moduleParams.id(), moduleClassName, moduleLabel, processX.get(), ModuleDescription::getUniqueID());
   availableProducts_->addProduct(branch);
 }
 
 // Add the given product, of type T, to the current event,
 // as if it came from the module specified by the given tag.
 template <class T>
-ProductID
-testEvent::addProduct(std::unique_ptr<T> product,
-                      std::string const& tag,
-                      std::string const& productLabel) {
+ProductID testEvent::addProduct(std::unique_ptr<T> product, std::string const& tag, std::string const& productLabel) {
   iterator_t description = moduleDescriptions_.find(tag);
   if (description == moduleDescriptions_.end())
-    throw edm::Exception(errors::LogicError)
-      << "Failed to find a module description for tag: "
-      << tag << '\n';
+    throw edm::Exception(errors::LogicError) << "Failed to find a module description for tag: " << tag << '\n';
 
   ModuleCallingContext mcc(&description->second);
   Event temporaryEvent(*principal_, description->second, &mcc);
   ProducerBase prod;
   prod.produces<T>(productLabel);
-  const_cast<std::vector<edm::ProductResolverIndex>&>(prod.putTokenIndexToProductResolverIndex()).push_back(
-       principal_->productLookup().index(PRODUCT_TYPE,
-                                         edm::TypeID(typeid(T)),
-                                         description->second.moduleLabel().c_str(),
-                                         productLabel.c_str(),
-                                         description->second.processName().c_str())
-  );
-
-  temporaryEvent.setProducer(&prod,nullptr);
+  const_cast<std::vector<edm::ProductResolverIndex>&>(prod.putTokenIndexToProductResolverIndex())
+      .push_back(principal_->productLookup().index(PRODUCT_TYPE,
+                                                   edm::TypeID(typeid(T)),
+                                                   description->second.moduleLabel().c_str(),
+                                                   productLabel.c_str(),
+                                                   description->second.processName().c_str()));
+
+  temporaryEvent.setProducer(&prod, nullptr);
   OrphanHandle<T> h = temporaryEvent.put(std::move(product), productLabel);
   ProductID id = h.id();
   temporaryEvent.commit_(std::vector<ProductResolverIndex>());
@@ -262,93 +252,88 @@ testEvent::addProduct(std::unique_ptr<T> product,
 }
 
 template <class T>
-std::unique_ptr<ProducerBase>
-testEvent::putProduct(std::unique_ptr<T> product,
-                      std::string const& productInstanceLabel,
-                      bool doCommit) {
+std::unique_ptr<ProducerBase> testEvent::putProduct(std::unique_ptr<T> product,
+                                                    std::string const& productInstanceLabel,
+                                                    bool doCommit) {
   auto prod = std::make_unique<ProducerBase>();
   prod->produces<edmtest::IntProduct>(productInstanceLabel);
-  auto index =principal_->productLookup().index(PRODUCT_TYPE,
-                                                edm::TypeID(typeid(T)),
-                                                currentModuleDescription_->moduleLabel().c_str(),
-                                                productInstanceLabel.c_str(),
-                                                currentModuleDescription_->processName().c_str());
+  auto index = principal_->productLookup().index(PRODUCT_TYPE,
+                                                 edm::TypeID(typeid(T)),
+                                                 currentModuleDescription_->moduleLabel().c_str(),
+                                                 productInstanceLabel.c_str(),
+                                                 currentModuleDescription_->processName().c_str());
   CPPUNIT_ASSERT(index != std::numeric_limits<unsigned int>::max());
   const_cast<std::vector<edm::ProductResolverIndex>&>(prod->putTokenIndexToProductResolverIndex()).push_back(index);
-  currentEvent_->setProducer(prod.get(),nullptr);
+  currentEvent_->setProducer(prod.get(), nullptr);
   currentEvent_->put(std::move(product), productInstanceLabel);
-  if(doCommit) {
+  if (doCommit) {
     currentEvent_->commit_(std::vector<ProductResolverIndex>());
   }
   return prod;
 }
 
 template <class T>
-std::unique_ptr<ProducerBase>
-testEvent::putProductUsingToken(std::unique_ptr<T> product,
-                                std::string const& productInstanceLabel,
-                                bool doCommit) {
+std::unique_ptr<ProducerBase> testEvent::putProductUsingToken(std::unique_ptr<T> product,
+                                                              std::string const& productInstanceLabel,
+                                                              bool doCommit) {
   auto prod = std::make_unique<ProducerBase>();
   EDPutTokenT<edmtest::IntProduct> token = prod->produces<edmtest::IntProduct>(productInstanceLabel);
-  auto index =principal_->productLookup().index(PRODUCT_TYPE,
-                                                edm::TypeID(typeid(T)),
-                                                currentModuleDescription_->moduleLabel().c_str(),
-                                                productInstanceLabel.c_str(),
-                                                currentModuleDescription_->processName().c_str());
+  auto index = principal_->productLookup().index(PRODUCT_TYPE,
+                                                 edm::TypeID(typeid(T)),
+                                                 currentModuleDescription_->moduleLabel().c_str(),
+                                                 productInstanceLabel.c_str(),
+                                                 currentModuleDescription_->processName().c_str());
   CPPUNIT_ASSERT(index != std::numeric_limits<unsigned int>::max());
   const_cast<std::vector<edm::ProductResolverIndex>&>(prod->putTokenIndexToProductResolverIndex()).push_back(index);
-  currentEvent_->setProducer(prod.get(),nullptr);
-  currentEvent_->put(token,std::move(product));
-  if(doCommit) {
+  currentEvent_->setProducer(prod.get(), nullptr);
+  currentEvent_->put(token, std::move(product));
+  if (doCommit) {
     currentEvent_->commit_(std::vector<ProductResolverIndex>());
   }
   return prod;
 }
 
 template <class T>
-std::unique_ptr<ProducerBase>
-testEvent::emplaceProduct(T product,
-                          std::string const& productInstanceLabel,
-                          bool doCommit) {
+std::unique_ptr<ProducerBase> testEvent::emplaceProduct(T product,
+                                                        std::string const& productInstanceLabel,
+                                                        bool doCommit) {
   auto prod = std::make_unique<ProducerBase>();
   EDPutTokenT<edmtest::IntProduct> token = prod->produces<edmtest::IntProduct>(productInstanceLabel);
-  auto index =principal_->productLookup().index(PRODUCT_TYPE,
-                                                edm::TypeID(typeid(T)),
-                                                currentModuleDescription_->moduleLabel().c_str(),
-                                                productInstanceLabel.c_str(),
-                                                currentModuleDescription_->processName().c_str());
+  auto index = principal_->productLookup().index(PRODUCT_TYPE,
+                                                 edm::TypeID(typeid(T)),
+                                                 currentModuleDescription_->moduleLabel().c_str(),
+                                                 productInstanceLabel.c_str(),
+                                                 currentModuleDescription_->processName().c_str());
   CPPUNIT_ASSERT(index != std::numeric_limits<unsigned int>::max());
   const_cast<std::vector<edm::ProductResolverIndex>&>(prod->putTokenIndexToProductResolverIndex()).push_back(index);
-  currentEvent_->setProducer(prod.get(),nullptr);
-  currentEvent_->emplace(token,std::move(product));
-  if(doCommit) {
+  currentEvent_->setProducer(prod.get(), nullptr);
+  currentEvent_->emplace(token, std::move(product));
+  if (doCommit) {
     currentEvent_->commit_(std::vector<ProductResolverIndex>());
   }
   return prod;
 }
 
-
-testEvent::testEvent() :
-  availableProducts_(new ProductRegistry()),
-  branchIDListHelper_(new BranchIDListHelper()),
-  thinnedAssociationsHelper_(new ThinnedAssociationsHelper()),
-  principal_(),
-  currentEvent_(),
-  currentModuleDescription_(),
-  moduleDescriptions_(),
-  processHistoryRegistry_(),
-  processConfigurations_() {
-
+testEvent::testEvent()
+    : availableProducts_(new ProductRegistry()),
+      branchIDListHelper_(new BranchIDListHelper()),
+      thinnedAssociationsHelper_(new ThinnedAssociationsHelper()),
+      principal_(),
+      currentEvent_(),
+      currentModuleDescription_(),
+      moduleDescriptions_(),
+      processHistoryRegistry_(),
+      processConfigurations_() {
   typedef edmtest::IntProduct prod_t;
   typedef std::vector<edmtest::Thing> vec_t;
 
-  registerProduct<prod_t>("nolabel_tag",   "modOne",   "IntProducer",   "EARLY");
-  registerProduct<prod_t>("int1_tag",      "modMulti", "IntProducer",   "EARLY", "int1");
-  registerProduct<prod_t>("int1_tag_late", "modMulti", "IntProducer",   "LATE",  "int1");
-  registerProduct<prod_t>("int2_tag",      "modMulti", "IntProducer",   "EARLY", "int2");
-  registerProduct<prod_t>("int3_tag",      "modMulti", "IntProducer",   "EARLY");
-  registerProduct<vec_t>("thing",          "modthing", "ThingProducer", "LATE");
-  registerProduct<vec_t>("thing2",         "modthing", "ThingProducer", "LATE",  "inst2");
+  registerProduct<prod_t>("nolabel_tag", "modOne", "IntProducer", "EARLY");
+  registerProduct<prod_t>("int1_tag", "modMulti", "IntProducer", "EARLY", "int1");
+  registerProduct<prod_t>("int1_tag_late", "modMulti", "IntProducer", "LATE", "int1");
+  registerProduct<prod_t>("int2_tag", "modMulti", "IntProducer", "EARLY", "int2");
+  registerProduct<prod_t>("int3_tag", "modMulti", "IntProducer", "EARLY");
+  registerProduct<vec_t>("thing", "modthing", "ThingProducer", "LATE");
+  registerProduct<vec_t>("thing2", "modthing", "ThingProducer", "LATE", "inst2");
 
   // Fake up the production of a single IntProduct from an IntProducer
   // module, run in the 'CURRENT' process.
@@ -371,7 +356,8 @@ testEvent::testEvent() :
 
   auto processX = std::make_shared<ProcessConfiguration>(process);
   processConfigurations_.push_back(processX);
-  currentModuleDescription_.reset(new ModuleDescription(moduleParams.id(), moduleClassName, moduleLabel, processX.get(),ModuleDescription::getUniqueID()));
+  currentModuleDescription_.reset(new ModuleDescription(
+      moduleParams.id(), moduleClassName, moduleLabel, processX.get(), ModuleDescription::getUniqueID()));
 
   std::string productInstanceName("int1");
 
@@ -383,8 +369,7 @@ testEvent::testEvent() :
                            productInstanceName,
                            moduleClassName,
                            moduleParams.id(),
-                           product_type
-                        );
+                           product_type);
 
   availableProducts_->addProduct(branch);
 
@@ -393,11 +378,9 @@ testEvent::testEvent() :
   branchIDListHelper_->updateFromRegistry(*availableProducts_);
 }
 
-testEvent::~testEvent() {
-}
+testEvent::~testEvent() {}
 
 void testEvent::setUp() {
-
   // First build a fake process history, that says there
   // were previous processes named "EARLY" and "LATE".
   // This takes several lines of code but other than
@@ -462,21 +445,21 @@ void testEvent::setUp() {
   EventID id = make_id();
   ProcessConfiguration const& pc = currentModuleDescription_->processConfiguration();
   auto runAux = std::make_shared<RunAuxiliary>(id.run(), time, time);
-  auto rp = std::make_shared<RunPrincipal>(runAux, preg, pc, &historyAppender_,0);
-  lbp_ = std::make_shared<LuminosityBlockPrincipal>(preg, pc, &historyAppender_,0);
+  auto rp = std::make_shared<RunPrincipal>(runAux, preg, pc, &historyAppender_, 0);
+  lbp_ = std::make_shared<LuminosityBlockPrincipal>(preg, pc, &historyAppender_, 0);
   lbp_->setAux(LuminosityBlockAuxiliary(rp->run(), 1, time, time));
   lbp_->setRunPrincipal(rp);
   EventAuxiliary eventAux(id, uuid, time, true);
-  const_cast<ProcessHistoryID &>(eventAux.processHistoryID()) = processHistoryID;
-  principal_.reset(new edm::EventPrincipal(preg, branchIDListHelper_, thinnedAssociationsHelper_, pc, &historyAppender_,edm::StreamID::invalidStreamID()));
+  const_cast<ProcessHistoryID&>(eventAux.processHistoryID()) = processHistoryID;
+  principal_.reset(new edm::EventPrincipal(
+      preg, branchIDListHelper_, thinnedAssociationsHelper_, pc, &historyAppender_, edm::StreamID::invalidStreamID()));
   principal_->fillEventPrincipal(eventAux, processHistoryRegistry_);
   principal_->setLuminosityBlockPrincipal(lbp_.get());
   ModuleCallingContext mcc(currentModuleDescription_.get());
   currentEvent_.reset(new Event(*principal_, *currentModuleDescription_, &mcc));
 }
 
-void
-testEvent::tearDown() {
+void testEvent::tearDown() {
   currentEvent_.reset();
   principal_.reset();
 }
@@ -500,10 +483,10 @@ void testEvent::getByLabelFromEmpty() {
 
 void testEvent::getByTokenFromEmpty() {
   InputTag inputTag("moduleLabel", "instanceName");
-  
-  IntConsumer consumer( std::vector<InputTag>{1,inputTag});
-  consumer.updateLookup(InEvent, principal_->productLookup(),false);
-  assert(1==consumer.m_tokens.size());
+
+  IntConsumer consumer(std::vector<InputTag>{1, inputTag});
+  consumer.updateLookup(InEvent, principal_->productLookup(), false);
+  assert(1 == consumer.m_tokens.size());
   currentEvent_->setConsumer(&consumer);
   Handle<int> nonesuch;
   CPPUNIT_ASSERT(!nonesuch.isValid());
@@ -515,13 +498,13 @@ void testEvent::getByTokenFromEmpty() {
 
 void testEvent::getHandleFromEmpty() {
   InputTag inputTag("moduleLabel", "instanceName");
-  
-  IntConsumer consumer( std::vector<InputTag>{1,inputTag});
-  consumer.updateLookup(InEvent, principal_->productLookup(),false);
-  assert(1==consumer.m_tokens.size());
+
+  IntConsumer consumer(std::vector<InputTag>{1, inputTag});
+  consumer.updateLookup(InEvent, principal_->productLookup(), false);
+  assert(1 == consumer.m_tokens.size());
   currentEvent_->setConsumer(&consumer);
   Handle<int> nonesuch;
-  CPPUNIT_ASSERT(!(nonesuch=currentEvent_->getHandle(consumer.m_tokens[0])));
+  CPPUNIT_ASSERT(!(nonesuch = currentEvent_->getHandle(consumer.m_tokens[0])));
   CPPUNIT_ASSERT(!nonesuch.isValid());
   CPPUNIT_ASSERT(nonesuch.failedToGet());
   CPPUNIT_ASSERT_THROW(*nonesuch, cms::Exception);
@@ -529,25 +512,24 @@ void testEvent::getHandleFromEmpty() {
 
 void testEvent::getFromEmpty() {
   InputTag inputTag("moduleLabel", "instanceName");
-  
-  IntConsumer consumer( std::vector<InputTag>{1,inputTag});
-  consumer.updateLookup(InEvent, principal_->productLookup(),false);
-  assert(1==consumer.m_tokens.size());
+
+  IntConsumer consumer(std::vector<InputTag>{1, inputTag});
+  consumer.updateLookup(InEvent, principal_->productLookup(), false);
+  assert(1 == consumer.m_tokens.size());
   currentEvent_->setConsumer(&consumer);
-  CPPUNIT_ASSERT_THROW( (void) currentEvent_->get(consumer.m_tokens[0]), cms::Exception);
+  CPPUNIT_ASSERT_THROW((void)currentEvent_->get(consumer.m_tokens[0]), cms::Exception);
 }
 
 void testEvent::putAnIntProduct() {
-  
-  auto p = putProduct(std::make_unique<edmtest::IntProduct>(3),"int1",false);
+  auto p = putProduct(std::make_unique<edmtest::IntProduct>(3), "int1", false);
   CPPUNIT_ASSERT(currentEvent_->size() == 1);
   currentEvent_->commit_(std::vector<ProductResolverIndex>());
   CPPUNIT_ASSERT(currentEvent_->size() == 1);
 }
 
 void testEvent::putAndGetAnIntProduct() {
-  auto p = putProduct(std::make_unique<edmtest::IntProduct>(4),"int1");
-  
+  auto p = putProduct(std::make_unique<edmtest::IntProduct>(4), "int1");
+
   InputTag should_match("modMulti", "int1", "CURRENT");
   InputTag should_not_match("modMulti", "int1", "NONESUCH");
   Handle<edmtest::IntProduct> h;
@@ -559,8 +541,8 @@ void testEvent::putAndGetAnIntProduct() {
 }
 
 void testEvent::putAndGetAnIntProductByToken() {
-  auto p = putProductUsingToken(std::make_unique<edmtest::IntProduct>(4),"int1");
-  
+  auto p = putProductUsingToken(std::make_unique<edmtest::IntProduct>(4), "int1");
+
   InputTag should_match("modMulti", "int1", "CURRENT");
   InputTag should_not_match("modMulti", "int1", "NONESUCH");
   Handle<edmtest::IntProduct> h;
@@ -572,8 +554,8 @@ void testEvent::putAndGetAnIntProductByToken() {
 }
 
 void testEvent::emplaceAndGetAnIntProductByToken() {
-  auto p = emplaceProduct(edmtest::IntProduct{4},"int1");
-  
+  auto p = emplaceProduct(edmtest::IntProduct{4}, "int1");
+
   InputTag should_match("modMulti", "int1", "CURRENT");
   InputTag should_not_match("modMulti", "int1", "NONESUCH");
   Handle<edmtest::IntProduct> h;
@@ -585,10 +567,9 @@ void testEvent::emplaceAndGetAnIntProductByToken() {
 }
 
 void testEvent::getByProductID() {
-
   typedef edmtest::IntProduct product_t;
   typedef std::unique_ptr<product_t> ap_t;
-  typedef Handle<product_t>  handle_t;
+  typedef Handle<product_t> handle_t;
 
   ProductID wanted;
 
@@ -646,7 +627,7 @@ void testEvent::transaction() {
     typedef std::unique_ptr<product_t> ap_t;
 
     ap_t three(new product_t(3));
-    auto p = putProduct(std::move(three),"int1",false);
+    auto p = putProduct(std::move(three), "int1", false);
 
     CPPUNIT_ASSERT(principal_->size() == 0);
     CPPUNIT_ASSERT(currentEvent_->size() == 1);
@@ -667,10 +648,10 @@ void testEvent::getByLabel() {
   ap_t two(new product_t(2));
   ap_t three(new product_t(3));
   ap_t four(new product_t(4));
-  addProduct(std::move(one),   "int1_tag", "int1");
-  addProduct(std::move(two),   "int2_tag", "int2");
+  addProduct(std::move(one), "int1_tag", "int1");
+  addProduct(std::move(two), "int2_tag", "int2");
   addProduct(std::move(three), "int3_tag");
-  addProduct(std::move(four),  "nolabel_tag");
+  addProduct(std::move(four), "nolabel_tag");
 
   auto ap_vthing = std::make_unique<std::vector<edmtest::Thing>>();
   addProduct(std::move(ap_vthing), "thing", "");
@@ -679,7 +660,7 @@ void testEvent::getByLabel() {
   addProduct(std::move(oneHundred), "int1_tag_late", "int1");
 
   auto twoHundred = std::make_unique<edmtest::IntProduct>(200);
-  putProduct(std::move(twoHundred),"int1");
+  putProduct(std::move(twoHundred), "int1");
 
   CPPUNIT_ASSERT(currentEvent_->size() == 7);
 
@@ -729,16 +710,18 @@ void testEvent::getByLabel() {
     edm::EventBase* baseEvent = currentEvent_.get();
     CPPUNIT_ASSERT(baseEvent->getByLabel(inputTag, h));
     CPPUNIT_ASSERT(h->value == 200);
-
   }
 
-  BasicHandle bh = principal_->getByLabel(PRODUCT_TYPE, TypeID(typeid(edmtest::IntProduct)), "modMulti", "int1", "LATE",nullptr, nullptr, nullptr);
+  BasicHandle bh = principal_->getByLabel(
+      PRODUCT_TYPE, TypeID(typeid(edmtest::IntProduct)), "modMulti", "int1", "LATE", nullptr, nullptr, nullptr);
   h = convert_handle<product_t>(std::move(bh));
   CPPUNIT_ASSERT(h->value == 100);
-  BasicHandle bh2(principal_->getByLabel(PRODUCT_TYPE, TypeID(typeid(edmtest::IntProduct)), "modMulti", "int1", "nomatch",nullptr, nullptr, nullptr));
+  BasicHandle bh2(principal_->getByLabel(
+      PRODUCT_TYPE, TypeID(typeid(edmtest::IntProduct)), "modMulti", "int1", "nomatch", nullptr, nullptr, nullptr));
   CPPUNIT_ASSERT(!bh2.isValid());
 
-  std::shared_ptr<Wrapper<edmtest::IntProduct> const> ptr = getProductByTag<edmtest::IntProduct>(*principal_, inputTag, nullptr);
+  std::shared_ptr<Wrapper<edmtest::IntProduct> const> ptr =
+      getProductByTag<edmtest::IntProduct>(*principal_, inputTag, nullptr);
   CPPUNIT_ASSERT(ptr->product()->value == 200);
 }
 
@@ -746,41 +729,39 @@ void testEvent::getByToken() {
   typedef edmtest::IntProduct product_t;
   typedef std::unique_ptr<product_t> ap_t;
   typedef Handle<product_t> handle_t;
-  
+
   ap_t one(new product_t(1));
   ap_t two(new product_t(2));
   ap_t three(new product_t(3));
   ap_t four(new product_t(4));
-  addProduct(std::move(one),   "int1_tag", "int1");
-  addProduct(std::move(two),   "int2_tag", "int2");
+  addProduct(std::move(one), "int1_tag", "int1");
+  addProduct(std::move(two), "int2_tag", "int2");
   addProduct(std::move(three), "int3_tag");
-  addProduct(std::move(four),  "nolabel_tag");
-  
+  addProduct(std::move(four), "nolabel_tag");
+
   auto ap_vthing = std::make_unique<std::vector<edmtest::Thing>>();
   addProduct(std::move(ap_vthing), "thing", "");
-  
+
   ap_t oneHundred(new product_t(100));
   addProduct(std::move(oneHundred), "int1_tag_late", "int1");
-  
+
   auto twoHundred = std::make_unique<edmtest::IntProduct>(200);
   putProduct(std::move(twoHundred), "int1");
-  
+
   CPPUNIT_ASSERT(currentEvent_->size() == 7);
 
-  IntProductConsumer consumer(std::vector<InputTag> {
-    InputTag("modMulti"),
-    InputTag("modMulti","int1"),
-    InputTag("modMulti", "nomatch"),
-    InputTag("modMulti", "int1", "EARLY"),
-    InputTag("modMulti", "int1", "LATE"),
-    InputTag("modMulti", "int1", "CURRENT"),
-    InputTag("modMulti", "int2", "EARLY"),
-    InputTag("modOne")
-  });
-  consumer.updateLookup(InEvent, principal_->productLookup(),false);
+  IntProductConsumer consumer(std::vector<InputTag>{InputTag("modMulti"),
+                                                    InputTag("modMulti", "int1"),
+                                                    InputTag("modMulti", "nomatch"),
+                                                    InputTag("modMulti", "int1", "EARLY"),
+                                                    InputTag("modMulti", "int1", "LATE"),
+                                                    InputTag("modMulti", "int1", "CURRENT"),
+                                                    InputTag("modMulti", "int2", "EARLY"),
+                                                    InputTag("modOne")});
+  consumer.updateLookup(InEvent, principal_->productLookup(), false);
 
   currentEvent_->setConsumer(&consumer);
-  
+
   const auto modMultiToken = consumer.m_tokens[0];
   const auto modMultiInt1Token = consumer.m_tokens[1];
   const auto modMultinomatchToken = consumer.m_tokens[2];
@@ -789,77 +770,74 @@ void testEvent::getByToken() {
   const auto modMultiInt1CurrentToken = consumer.m_tokens[5];
   const auto modMultiInt2EarlyToken = consumer.m_tokens[6];
   const auto modOneToken = consumer.m_tokens[7];
-  
+
   handle_t h;
   CPPUNIT_ASSERT(currentEvent_->getByToken(modMultiToken, h));
   CPPUNIT_ASSERT(h->value == 3);
-  
+
   CPPUNIT_ASSERT(currentEvent_->getByToken(modMultiInt1Token, h));
   CPPUNIT_ASSERT(h->value == 200);
-  
+
   CPPUNIT_ASSERT(!currentEvent_->getByToken(modMultinomatchToken, h));
   CPPUNIT_ASSERT(!h.isValid());
   CPPUNIT_ASSERT_THROW(*h, cms::Exception);
-  
+
   CPPUNIT_ASSERT(currentEvent_->getByToken(modMultiInt1Token, h));
   CPPUNIT_ASSERT(h->value == 200);
-  
+
   CPPUNIT_ASSERT(currentEvent_->getByToken(modMultiInt1EarlyToken, h));
   CPPUNIT_ASSERT(h->value == 1);
-  
+
   CPPUNIT_ASSERT(currentEvent_->getByToken(modMultiInt1LateToken, h));
   CPPUNIT_ASSERT(h->value == 100);
-  
+
   CPPUNIT_ASSERT(currentEvent_->getByToken(modMultiInt1CurrentToken, h));
   CPPUNIT_ASSERT(h->value == 200);
-  
+
   CPPUNIT_ASSERT(currentEvent_->getByToken(modMultiInt2EarlyToken, h));
   CPPUNIT_ASSERT(h->value == 2);
-  
+
   CPPUNIT_ASSERT(currentEvent_->getByToken(modOneToken, h));
   CPPUNIT_ASSERT(h->value == 4);
-  
 }
 
 void testEvent::getHandle() {
   typedef edmtest::IntProduct product_t;
   typedef std::unique_ptr<product_t> ap_t;
   typedef Handle<product_t> handle_t;
-  
+
   ap_t one(new product_t(1));
   ap_t two(new product_t(2));
   ap_t three(new product_t(3));
   ap_t four(new product_t(4));
-  addProduct(std::move(one),   "int1_tag", "int1");
-  addProduct(std::move(two),   "int2_tag", "int2");
+  addProduct(std::move(one), "int1_tag", "int1");
+  addProduct(std::move(two), "int2_tag", "int2");
   addProduct(std::move(three), "int3_tag");
-  addProduct(std::move(four),  "nolabel_tag");
-  
+  addProduct(std::move(four), "nolabel_tag");
+
   auto ap_vthing = std::make_unique<std::vector<edmtest::Thing>>();
   addProduct(std::move(ap_vthing), "thing", "");
-  
+
   ap_t oneHundred(new product_t(100));
   addProduct(std::move(oneHundred), "int1_tag_late", "int1");
-  
+
   auto twoHundred = std::make_unique<edmtest::IntProduct>(200);
   putProduct(std::move(twoHundred), "int1");
-  
+
   CPPUNIT_ASSERT(currentEvent_->size() == 7);
-  
-  IntProductConsumer consumer(std::vector<InputTag> {
-    InputTag("modMulti"),
-    InputTag("modMulti","int1"),
-    InputTag("modMulti", "nomatch"),
-    InputTag("modMulti", "int1", "EARLY"),
-    InputTag("modMulti", "int1", "LATE"),
-    InputTag("modMulti", "int1", "CURRENT"),
-    InputTag("modMulti", "int2", "EARLY"),
-    InputTag("modOne")
-  });
-  consumer.updateLookup(InEvent, principal_->productLookup(),false);
-  
+
+  IntProductConsumer consumer(std::vector<InputTag>{InputTag("modMulti"),
+                                                    InputTag("modMulti", "int1"),
+                                                    InputTag("modMulti", "nomatch"),
+                                                    InputTag("modMulti", "int1", "EARLY"),
+                                                    InputTag("modMulti", "int1", "LATE"),
+                                                    InputTag("modMulti", "int1", "CURRENT"),
+                                                    InputTag("modMulti", "int2", "EARLY"),
+                                                    InputTag("modOne")});
+  consumer.updateLookup(InEvent, principal_->productLookup(), false);
+
   currentEvent_->setConsumer(&consumer);
-  
+
   const auto modMultiToken = consumer.m_tokens[0];
   const auto modMultiInt1Token = consumer.m_tokens[1];
   const auto modMultinomatchToken = consumer.m_tokens[2];
@@ -868,77 +846,74 @@ void testEvent::getHandle() {
   const auto modMultiInt1CurrentToken = consumer.m_tokens[5];
   const auto modMultiInt2EarlyToken = consumer.m_tokens[6];
   const auto modOneToken = consumer.m_tokens[7];
-  
+
   handle_t h;
-  CPPUNIT_ASSERT(h=currentEvent_->getHandle(modMultiToken));
+  CPPUNIT_ASSERT(h = currentEvent_->getHandle(modMultiToken));
   CPPUNIT_ASSERT(h->value == 3);
-  
-  CPPUNIT_ASSERT(h=currentEvent_->getHandle(modMultiInt1Token));
+
+  CPPUNIT_ASSERT(h = currentEvent_->getHandle(modMultiInt1Token));
   CPPUNIT_ASSERT(h->value == 200);
-  
-  CPPUNIT_ASSERT(!(h=currentEvent_->getHandle(modMultinomatchToken)));
+
+  CPPUNIT_ASSERT(!(h = currentEvent_->getHandle(modMultinomatchToken)));
   CPPUNIT_ASSERT(!h.isValid());
   CPPUNIT_ASSERT_THROW(*h, cms::Exception);
-  
-  CPPUNIT_ASSERT(h=currentEvent_->getHandle(modMultiInt1Token));
+
+  CPPUNIT_ASSERT(h = currentEvent_->getHandle(modMultiInt1Token));
   CPPUNIT_ASSERT(h->value == 200);
-  
-  CPPUNIT_ASSERT(h=currentEvent_->getHandle(modMultiInt1EarlyToken));
+
+  CPPUNIT_ASSERT(h = currentEvent_->getHandle(modMultiInt1EarlyToken));
   CPPUNIT_ASSERT(h->value == 1);
-  
-  CPPUNIT_ASSERT(h=currentEvent_->getHandle(modMultiInt1LateToken));
+
+  CPPUNIT_ASSERT(h = currentEvent_->getHandle(modMultiInt1LateToken));
   CPPUNIT_ASSERT(h->value == 100);
-  
-  CPPUNIT_ASSERT(h=currentEvent_->getHandle(modMultiInt1CurrentToken));
+
+  CPPUNIT_ASSERT(h = currentEvent_->getHandle(modMultiInt1CurrentToken));
   CPPUNIT_ASSERT(h->value == 200);
-  
-  CPPUNIT_ASSERT(h=currentEvent_->getHandle(modMultiInt2EarlyToken));
+
+  CPPUNIT_ASSERT(h = currentEvent_->getHandle(modMultiInt2EarlyToken));
   CPPUNIT_ASSERT(h->value == 2);
-  
-  CPPUNIT_ASSERT(h=currentEvent_->getHandle(modOneToken));
+
+  CPPUNIT_ASSERT(h = currentEvent_->getHandle(modOneToken));
   CPPUNIT_ASSERT(h->value == 4);
-  
 }
 
 void testEvent::get_product() {
   typedef edmtest::IntProduct product_t;
   typedef std::unique_ptr<product_t> ap_t;
   typedef Handle<product_t> handle_t;
-  
+
   ap_t one(new product_t(1));
   ap_t two(new product_t(2));
   ap_t three(new product_t(3));
   ap_t four(new product_t(4));
-  addProduct(std::move(one),   "int1_tag", "int1");
-  addProduct(std::move(two),   "int2_tag", "int2");
+  addProduct(std::move(one), "int1_tag", "int1");
+  addProduct(std::move(two), "int2_tag", "int2");
   addProduct(std::move(three), "int3_tag");
-  addProduct(std::move(four),  "nolabel_tag");
-  
+  addProduct(std::move(four), "nolabel_tag");
+
   auto ap_vthing = std::make_unique<std::vector<edmtest::Thing>>();
   addProduct(std::move(ap_vthing), "thing", "");
-  
+
   ap_t oneHundred(new product_t(100));
   addProduct(std::move(oneHundred), "int1_tag_late", "int1");
-  
+
   auto twoHundred = std::make_unique<edmtest::IntProduct>(200);
   putProduct(std::move(twoHundred), "int1");
-  
+
   CPPUNIT_ASSERT(currentEvent_->size() == 7);
-  
-  IntProductConsumer consumer(std::vector<InputTag> {
-    InputTag("modMulti"),
-    InputTag("modMulti","int1"),
-    InputTag("modMulti", "nomatch"),
-    InputTag("modMulti", "int1", "EARLY"),
-    InputTag("modMulti", "int1", "LATE"),
-    InputTag("modMulti", "int1", "CURRENT"),
-    InputTag("modMulti", "int2", "EARLY"),
-    InputTag("modOne")
-  });
-  consumer.updateLookup(InEvent, principal_->productLookup(),false);
-  
+
+  IntProductConsumer consumer(std::vector<InputTag>{InputTag("modMulti"),
+                                                    InputTag("modMulti", "int1"),
+                                                    InputTag("modMulti", "nomatch"),
+                                                    InputTag("modMulti", "int1", "EARLY"),
+                                                    InputTag("modMulti", "int1", "LATE"),
+                                                    InputTag("modMulti", "int1", "CURRENT"),
+                                                    InputTag("modMulti", "int2", "EARLY"),
+                                                    InputTag("modOne")});
+  consumer.updateLookup(InEvent, principal_->productLookup(), false);
+
   currentEvent_->setConsumer(&consumer);
-  
+
   const auto modMultiToken = consumer.m_tokens[0];
   const auto modMultiInt1Token = consumer.m_tokens[1];
   const auto modMultinomatchToken = consumer.m_tokens[2];
@@ -947,25 +922,24 @@ void testEvent::get_product() {
   const auto modMultiInt1CurrentToken = consumer.m_tokens[5];
   const auto modMultiInt2EarlyToken = consumer.m_tokens[6];
   const auto modOneToken = consumer.m_tokens[7];
-  
-  CPPUNIT_ASSERT(currentEvent_->get(modMultiToken).value==3);
-  
+
+  CPPUNIT_ASSERT(currentEvent_->get(modMultiToken).value == 3);
+
   CPPUNIT_ASSERT(currentEvent_->get(modMultiInt1Token).value == 200);
-  
+
   CPPUNIT_ASSERT_THROW(currentEvent_->get(modMultinomatchToken), cms::Exception);
-  
+
   CPPUNIT_ASSERT(currentEvent_->get(modMultiInt1Token).value == 200);
-  
+
   CPPUNIT_ASSERT(currentEvent_->get(modMultiInt1EarlyToken).value == 1);
-  
+
   CPPUNIT_ASSERT(currentEvent_->get(modMultiInt1LateToken).value == 100);
-  
+
   CPPUNIT_ASSERT(currentEvent_->get(modMultiInt1CurrentToken).value == 200);
-  
+
   CPPUNIT_ASSERT(currentEvent_->get(modMultiInt2EarlyToken).value == 2);
-  
+
   CPPUNIT_ASSERT(currentEvent_->get(modOneToken).value == 4);
-  
 }
 
 void testEvent::getManyByType() {
@@ -978,10 +952,10 @@ void testEvent::getManyByType() {
   ap_t two(new product_t(2));
   ap_t three(new product_t(3));
   ap_t four(new product_t(4));
-  addProduct(std::move(one),   "int1_tag", "int1");
-  addProduct(std::move(two),   "int2_tag", "int2");
+  addProduct(std::move(one), "int1_tag", "int1");
+  addProduct(std::move(two), "int2_tag", "int2");
   addProduct(std::move(three), "int3_tag");
-  addProduct(std::move(four),  "nolabel_tag");
+  addProduct(std::move(four), "nolabel_tag");
 
   auto ap_vthing = std::make_unique<std::vector<edmtest::Thing>>();
   addProduct(std::move(ap_vthing), "thing", "");
@@ -1001,7 +975,8 @@ void testEvent::getManyByType() {
   currentEvent_->getManyByType(handles);
   CPPUNIT_ASSERT(handles.size() == 6);
   int sum = 0;
-  for (int k = 0; k < 6; ++k) sum += handles[k]->value;
+  for (int k = 0; k < 6; ++k)
+    sum += handles[k]->value;
   CPPUNIT_ASSERT(sum == 310);
 }
 
@@ -1013,25 +988,24 @@ void testEvent::printHistory() {
 }
 
 void testEvent::deleteProduct() {
-  
   typedef edmtest::IntProduct product_t;
   typedef std::unique_ptr<product_t> ap_t;
-  
+
   ap_t one(new product_t(1));
-  addProduct(std::move(one),   "int1_tag", "int1");
-  
+  addProduct(std::move(one), "int1_tag", "int1");
+
   BranchID id;
-  
-  availableProducts_->callForEachBranch([&id](const BranchDescription& iDesc){ 
-    if(iDesc.moduleLabel()=="modMulti" && iDesc.productInstanceName()=="int1") {
+
+  availableProducts_->callForEachBranch([&id](const BranchDescription& iDesc) {
+    if (iDesc.moduleLabel() == "modMulti" && iDesc.productInstanceName() == "int1") {
       id = iDesc.branchID();
-    }});
+    }
+  });
 
   const ProductResolverBase* phb = principal_->getProductResolver(id);
   CPPUNIT_ASSERT(phb != nullptr);
-  
-  CPPUNIT_ASSERT(!phb->productWasDeleted());  
+
+  CPPUNIT_ASSERT(!phb->productWasDeleted());
   principal_->deleteProduct(id);
   CPPUNIT_ASSERT(phb->productWasDeleted());
-  
 }
diff --git a/FWCore/Framework/test/MockEventProcessor.cc b/FWCore/Framework/test/MockEventProcessor.cc
index a73ef3296db87..4a6cc2c2105b3 100644
--- a/FWCore/Framework/test/MockEventProcessor.cc
+++ b/FWCore/Framework/test/MockEventProcessor.cc
@@ -16,27 +16,27 @@ namespace {
   };
 
   std::istream& operator>>(std::istream& is, token& t) {
-    if(is >> t.id) is >> t.value;
+    if (is >> t.id)
+      is >> t.value;
     return is;
   }
-  
+
   //The TransitionProcessors.icc uses the class name
   // EventProcessor (with no namespace) as the type
   // to which it interacts.
   using EventProcessor = edm::MockEventProcessor;
-  
-  
+
   class WaitingTaskHolder;
-}
+}  // namespace
 
 namespace edm {
-class LuminosityBlockPrincipal {
-public:
-  LuminosityBlockPrincipal(int iRun,int iLumi): run_(iRun),lumi_(iLumi){}
-  int run_;
-  int lumi_;
-};
-}
+  class LuminosityBlockPrincipal {
+  public:
+    LuminosityBlockPrincipal(int iRun, int iLumi) : run_(iRun), lumi_(iLumi) {}
+    int run_;
+    int lumi_;
+  };
+}  // namespace edm
 
 #define TEST_NO_FWD_DECL
 #include "FWCore/Framework/src/LuminosityBlockProcessingStatus.h"
@@ -47,196 +47,167 @@ namespace {
 
 namespace edm {
 
-  MockEventProcessor::MockEventProcessor(std::string const& mockData,
-                                         std::ostream& output,
-                                         bool iDoNotMerge) :
-    mockData_(mockData),
-    output_(output),
-    input_(mockData_),
-    run_(0),
-    lumi_(0),
-    doNotMerge_(iDoNotMerge),
-    shouldWeCloseOutput_(true),
-    shouldWeEndLoop_(true),
-    shouldWeStop_(false),
-    eventProcessed_(false),
-    reachedEndOfInput_(false),
-    shouldThrow_(false)
-  {
-  }
-
-  InputSource::ItemType
-  MockEventProcessor::nextTransitionType()
-  {
+  MockEventProcessor::MockEventProcessor(std::string const& mockData, std::ostream& output, bool iDoNotMerge)
+      : mockData_(mockData),
+        output_(output),
+        input_(mockData_),
+        run_(0),
+        lumi_(0),
+        doNotMerge_(iDoNotMerge),
+        shouldWeCloseOutput_(true),
+        shouldWeEndLoop_(true),
+        shouldWeStop_(false),
+        eventProcessed_(false),
+        reachedEndOfInput_(false),
+        shouldThrow_(false) {}
+
+  InputSource::ItemType MockEventProcessor::nextTransitionType() {
     token t;
-    if( not (input_ >> t)) {
+    if (not(input_ >> t)) {
       reachedEndOfInput_ = true;
-      return lastTransition_=InputSource::IsStop;
+      return lastTransition_ = InputSource::IsStop;
     }
 
     char ch = t.id;
 
     eventProcessed_ = false;
-    if(ch == 'r') {
+    if (ch == 'r') {
       output_ << "    *** nextItemType: Run " << t.value << " ***\n";
       run_ = t.value;
-      return lastTransition_=InputSource::IsRun;
-    } else if(ch == 'l') {
+      return lastTransition_ = InputSource::IsRun;
+    } else if (ch == 'l') {
       output_ << "    *** nextItemType: Lumi " << t.value << " ***\n";
       lumi_ = t.value;
-      return lastTransition_=InputSource::IsLumi;
-    } else if(ch == 'e') {
+      return lastTransition_ = InputSource::IsLumi;
+    } else if (ch == 'e') {
       output_ << "    *** nextItemType: Event ***\n";
       // a special value for test purposes only
-      if(t.value == 7) {
+      if (t.value == 7) {
         shouldWeStop_ = true;
         output_ << "    *** shouldWeStop will return true this event ***\n";
       } else {
         shouldWeStop_ = false;
       }
-      return lastTransition_=InputSource::IsEvent;
-    } else if(ch == 'f') {
+      return lastTransition_ = InputSource::IsEvent;
+    } else if (ch == 'f') {
       output_ << "    *** nextItemType: File " << t.value << " ***\n";
       // a special value for test purposes only
-      if(t.value == 0) shouldWeCloseOutput_ = false;
-      else shouldWeCloseOutput_ = true;
-      return lastTransition_=InputSource::IsFile;
-    } else if(ch == 's') {
+      if (t.value == 0)
+        shouldWeCloseOutput_ = false;
+      else
+        shouldWeCloseOutput_ = true;
+      return lastTransition_ = InputSource::IsFile;
+    } else if (ch == 's') {
       output_ << "    *** nextItemType: Stop " << t.value << " ***\n";
       // a special value for test purposes only
-      if(t.value == 0) shouldWeEndLoop_ = false;
-      else shouldWeEndLoop_ = true;
-      return lastTransition_=InputSource::IsStop;
-    } else if(ch == 'x') {
+      if (t.value == 0)
+        shouldWeEndLoop_ = false;
+      else
+        shouldWeEndLoop_ = true;
+      return lastTransition_ = InputSource::IsStop;
+    } else if (ch == 'x') {
       output_ << "    *** nextItemType: Restart " << t.value << " ***\n";
       shouldWeEndLoop_ = t.value;
-      return lastTransition_=InputSource::IsStop;
-    } else if(ch == 't') {
+      return lastTransition_ = InputSource::IsStop;
+    } else if (ch == 't') {
       output_ << "    *** nextItemType: Throw " << t.value << " ***\n";
       shouldThrow_ = true;
       return nextTransitionType();
     }
-    return lastTransition_=InputSource::IsInvalid;
+    return lastTransition_ = InputSource::IsInvalid;
   }
-  
-  InputSource::ItemType
-  MockEventProcessor::lastTransitionType() const {
-    return lastTransition_;
-  }
-  
-  std::pair<edm::ProcessHistoryID, edm::RunNumber_t>
-  MockEventProcessor::nextRunID() {
+
+  InputSource::ItemType MockEventProcessor::lastTransitionType() const { return lastTransition_; }
+
+  std::pair<edm::ProcessHistoryID, edm::RunNumber_t> MockEventProcessor::nextRunID() {
     return std::make_pair(edm::ProcessHistoryID{}, run_);
   }
 
-  edm::LuminosityBlockNumber_t
-  MockEventProcessor::nextLuminosityBlockID() {
-    return lumi_;
-  }
-  
-  InputSource::ItemType
-  MockEventProcessor::readAndProcessEvents() {
+  edm::LuminosityBlockNumber_t MockEventProcessor::nextLuminosityBlockID() { return lumi_; }
+
+  InputSource::ItemType MockEventProcessor::readAndProcessEvents() {
     bool first = true;
     do {
-      if(first) {
+      if (first) {
         first = false;
       } else {
         shouldWeStop();
       }
       readAndProcessEvent();
-      if(shouldWeStop()) {
+      if (shouldWeStop()) {
         return InputSource::IsEvent;
       }
-    }while(nextTransitionType() == InputSource::IsEvent);
-    
+    } while (nextTransitionType() == InputSource::IsEvent);
+
     return lastTransitionType();
   }
 
-
-  void
-  MockEventProcessor::runToCompletion() {
-
+  void MockEventProcessor::runToCompletion() {
     do {
       FilesProcessor fp(doNotMerge_);
 
       bool firstTime = true;
       do {
-        if(not firstTime) {
+        if (not firstTime) {
           prepareForNextLoop();
           rewindInput();
         } else {
           firstTime = false;
         }
         startingNewLoop();
-        
+
         auto trans = fp.processFiles(*this);
-        
+
         fp.normalEnd();
-        
-        if(trans != InputSource::IsStop) {
+
+        if (trans != InputSource::IsStop) {
           //problem with the source
           doErrorStuff();
           break;
         }
-      } while(not endOfLoop());
-      output_ <<"Left processing loop.\n";
-    } while(not reachedEndOfInput_ and not input_.eof());
-      
+      } while (not endOfLoop());
+      output_ << "Left processing loop.\n";
+    } while (not reachedEndOfInput_ and not input_.eof());
+
     return;
   }
-  
+
   void MockEventProcessor::readFile() {
     output_ << " \treadFile\n";
     throwIfNeeded();
   }
 
-  void MockEventProcessor::closeInputFile(bool /*cleaningUpAfterException*/) {
-    output_ << "\tcloseInputFile\n";
-  }
+  void MockEventProcessor::closeInputFile(bool /*cleaningUpAfterException*/) { output_ << "\tcloseInputFile\n"; }
 
-  void MockEventProcessor::openOutputFiles() {
-    output_ << "\topenOutputFiles\n";
-  }
+  void MockEventProcessor::openOutputFiles() { output_ << "\topenOutputFiles\n"; }
 
-  void MockEventProcessor::closeOutputFiles() {
-    output_ << "\tcloseOutputFiles\n";
-  }
+  void MockEventProcessor::closeOutputFiles() { output_ << "\tcloseOutputFiles\n"; }
 
-  void MockEventProcessor::respondToOpenInputFile() {
-    output_ << "\trespondToOpenInputFile\n";
-  }
+  void MockEventProcessor::respondToOpenInputFile() { output_ << "\trespondToOpenInputFile\n"; }
 
-  void MockEventProcessor::respondToCloseInputFile() {
-    output_ << "\trespondToCloseInputFile\n";
-  }
+  void MockEventProcessor::respondToCloseInputFile() { output_ << "\trespondToCloseInputFile\n"; }
 
-  void MockEventProcessor::startingNewLoop() {
-    output_ << "\tstartingNewLoop\n";
-  }
+  void MockEventProcessor::startingNewLoop() { output_ << "\tstartingNewLoop\n"; }
 
   bool MockEventProcessor::endOfLoop() {
     output_ << "\tendOfLoop\n";
     return shouldWeEndLoop_;
   }
 
-  void MockEventProcessor::rewindInput() {
-    output_ << "\trewind\n";
-  }
+  void MockEventProcessor::rewindInput() { output_ << "\trewind\n"; }
 
-  void MockEventProcessor::prepareForNextLoop() {
-    output_ << "\tprepareForNextLoop\n";
-  }
+  void MockEventProcessor::prepareForNextLoop() { output_ << "\tprepareForNextLoop\n"; }
 
   bool MockEventProcessor::shouldWeCloseOutput() const {
     output_ << "\tshouldWeCloseOutput\n";
     return shouldWeCloseOutput_;
   }
 
-  void MockEventProcessor::doErrorStuff() {
-    output_ << "\tdoErrorStuff\n";
-  }
+  void MockEventProcessor::doErrorStuff() { output_ << "\tdoErrorStuff\n"; }
 
-  void MockEventProcessor::beginRun(ProcessHistoryID const& phid, RunNumber_t run, bool& globalTransitionSucceeded,
+  void MockEventProcessor::beginRun(ProcessHistoryID const& phid,
+                                    RunNumber_t run,
+                                    bool& globalTransitionSucceeded,
                                     bool& eventSetupForInstanceSucceeded) {
     output_ << "\tbeginRun " << run << "\n";
     eventSetupForInstanceSucceeded = true;
@@ -244,47 +215,49 @@ namespace edm {
     globalTransitionSucceeded = true;
   }
 
-  void MockEventProcessor::endRun(ProcessHistoryID const& phid, RunNumber_t run, bool globalTransitionSucceeded, bool /*cleaningUpAfterException*/ ) {
-    auto postfix = globalTransitionSucceeded? "\n" : " global failed\n";
+  void MockEventProcessor::endRun(ProcessHistoryID const& phid,
+                                  RunNumber_t run,
+                                  bool globalTransitionSucceeded,
+                                  bool /*cleaningUpAfterException*/) {
+    auto postfix = globalTransitionSucceeded ? "\n" : " global failed\n";
     output_ << "\tendRun " << run << postfix;
   }
 
-  void MockEventProcessor::endUnfinishedRun(ProcessHistoryID const& phid, RunNumber_t run,
-                                            bool globalTransitionSucceeded, bool cleaningUpAfterException,
-                                            bool eventSetupForInstanceSucceeded ) {
+  void MockEventProcessor::endUnfinishedRun(ProcessHistoryID const& phid,
+                                            RunNumber_t run,
+                                            bool globalTransitionSucceeded,
+                                            bool cleaningUpAfterException,
+                                            bool eventSetupForInstanceSucceeded) {
     if (eventSetupForInstanceSucceeded) {
-      endRun(phid,run,globalTransitionSucceeded,cleaningUpAfterException);
-      if(globalTransitionSucceeded) {
-        writeRun(phid,run);
+      endRun(phid, run, globalTransitionSucceeded, cleaningUpAfterException);
+      if (globalTransitionSucceeded) {
+        writeRun(phid, run);
       }
     }
-    deleteRunFromCache(phid,run);
+    deleteRunFromCache(phid, run);
   }
 
   InputSource::ItemType MockEventProcessor::processLumis(std::shared_ptr<void> iRunResource) {
-    
-    if(lumiStatus_ and
-       lumiStatus_->runResource() == iRunResource and
-       lumiStatus_->lumiPrincipal()->lumi_ == lumi_) {
+    if (lumiStatus_ and lumiStatus_->runResource() == iRunResource and lumiStatus_->lumiPrincipal()->lumi_ == lumi_) {
       readAndMergeLumi(*lumiStatus_);
-      
-      if(nextTransitionType() == InputSource::IsEvent) {
+
+      if (nextTransitionType() == InputSource::IsEvent) {
         readAndProcessEvents();
-        if(shouldWeStop()) {
+        if (shouldWeStop()) {
           return edm::InputSource::IsStop;
         }
       }
     } else {
       endUnfinishedLumi();
-      lumiStatus_ = std::make_shared<LuminosityBlockProcessingStatus>(this,1,iRunResource);
+      lumiStatus_ = std::make_shared<LuminosityBlockProcessingStatus>(this, 1, iRunResource);
       auto lumi = readLuminosityBlock(*lumiStatus_);
       output_ << "\tbeginLumi " << run_ << "/" << lumi << "\n";
       throwIfNeeded();
       lumiStatus_->globalBeginDidSucceed();
       //Need to do event processing here
-      if(nextTransitionType() == InputSource::IsEvent) {
+      if (nextTransitionType() == InputSource::IsEvent) {
         readAndProcessEvents();
-        if(shouldWeStop()) {
+        if (shouldWeStop()) {
           return edm::InputSource::IsStop;
         }
       }
@@ -293,35 +266,36 @@ namespace edm {
   }
 
   void MockEventProcessor::endUnfinishedLumi() {
-    if(lumiStatus_) {
+    if (lumiStatus_) {
       auto tmp = lumiStatus_;
       endLumi();
-      if(tmp->didGlobalBeginSucceed()) {
+      if (tmp->didGlobalBeginSucceed()) {
         writeLumi(*tmp);
       }
       deleteLumiFromCache(*tmp);
     }
   }
-  
+
   void MockEventProcessor::endLumi() {
-    auto postfix = lumiStatus_->didGlobalBeginSucceed()? "\n" : " global failed\n";
-    output_ << "\tendLumi " << lumiStatus_->lumiPrincipal()->run_ << "/" << lumiStatus_->lumiPrincipal()->lumi_ << postfix;
+    auto postfix = lumiStatus_->didGlobalBeginSucceed() ? "\n" : " global failed\n";
+    output_ << "\tendLumi " << lumiStatus_->lumiPrincipal()->run_ << "/" << lumiStatus_->lumiPrincipal()->lumi_
+            << postfix;
     lumiStatus_.reset();
   }
 
-  std::pair<ProcessHistoryID,RunNumber_t> MockEventProcessor::readRun() {
+  std::pair<ProcessHistoryID, RunNumber_t> MockEventProcessor::readRun() {
     output_ << "\treadRun " << run_ << "\n";
     return std::make_pair(ProcessHistoryID(), run_);
   }
 
-  std::pair<ProcessHistoryID,RunNumber_t> MockEventProcessor::readAndMergeRun() {
+  std::pair<ProcessHistoryID, RunNumber_t> MockEventProcessor::readAndMergeRun() {
     output_ << "\treadAndMergeRun " << run_ << "\n";
     return std::make_pair(ProcessHistoryID(), run_);
   }
 
   int MockEventProcessor::readLuminosityBlock(LuminosityBlockProcessingStatus& iStatus) {
     output_ << "\treadLuminosityBlock " << lumi_ << "\n";
-    iStatus.lumiPrincipal() = std::make_shared<LuminosityBlockPrincipal>(run_,lumi_);
+    iStatus.lumiPrincipal() = std::make_shared<LuminosityBlockPrincipal>(run_, lumi_);
     return lumi_;
   }
 
@@ -343,7 +317,8 @@ namespace edm {
   }
 
   void MockEventProcessor::deleteLumiFromCache(LuminosityBlockProcessingStatus& iStatus) {
-    output_ << "\tdeleteLumiFromCache " << iStatus.lumiPrincipal()->run_ << "/" << iStatus.lumiPrincipal()->lumi_ << "\n";
+    output_ << "\tdeleteLumiFromCache " << iStatus.lumiPrincipal()->run_ << "/" << iStatus.lumiPrincipal()->lumi_
+            << "\n";
   }
 
   void MockEventProcessor::readAndProcessEvent() {
@@ -359,17 +334,17 @@ namespace edm {
   }
 
   void MockEventProcessor::throwIfNeeded() {
-    if(shouldThrow_) {
+    if (shouldThrow_) {
       shouldThrow_ = false;
-      output_ <<"\tthrowing\n";
+      output_ << "\tthrowing\n";
       throw TestException();
     }
   }
-  
+
   void MockEventProcessor::setExceptionMessageFiles(std::string&) {}
   void MockEventProcessor::setExceptionMessageRuns(std::string&) {}
   void MockEventProcessor::setExceptionMessageLumis() {}
 
-  bool MockEventProcessor::setDeferredException(std::exception_ptr) { return true;}
+  bool MockEventProcessor::setDeferredException(std::exception_ptr) { return true; }
 
-}
+}  // namespace edm
diff --git a/FWCore/Framework/test/MockEventProcessor.h b/FWCore/Framework/test/MockEventProcessor.h
index 53bdba2a64367..c69ad0fc7f718 100644
--- a/FWCore/Framework/test/MockEventProcessor.h
+++ b/FWCore/Framework/test/MockEventProcessor.h
@@ -18,18 +18,15 @@ Original Authors: W. David Dagenhart, Marc Paterno
 
 namespace edm {
   class LuminosityBlockProcessingStatus;
-  
+
   class MockEventProcessor {
   public:
     class TestException : public std::exception {
     public:
-      TestException() noexcept
-      :std::exception() {}
+      TestException() noexcept : std::exception() {}
     };
-    
-    MockEventProcessor(std::string const& mockData,
-                       std::ostream& output,
-                       bool iDoNotMerge);
+
+    MockEventProcessor(std::string const& mockData, std::ostream& output, bool iDoNotMerge);
 
     void runToCompletion();
 
@@ -54,20 +51,27 @@ namespace edm {
 
     void doErrorStuff();
 
-    void beginRun(ProcessHistoryID const& phid, RunNumber_t run, bool& globalTransitionSucceeded,
+    void beginRun(ProcessHistoryID const& phid,
+                  RunNumber_t run,
+                  bool& globalTransitionSucceeded,
                   bool& eventSetupForInstanceSucceeded);
-    void endUnfinishedRun(ProcessHistoryID const& phid, RunNumber_t run,
-                          bool globalTranstitionSucceeded, bool cleaningUpAfterException,
+    void endUnfinishedRun(ProcessHistoryID const& phid,
+                          RunNumber_t run,
+                          bool globalTranstitionSucceeded,
+                          bool cleaningUpAfterException,
                           bool eventSetupForInstanceSucceeded);
 
-    void endRun(ProcessHistoryID const& phid, RunNumber_t run, bool globalTranstitionSucceeded, bool cleaningUpAfterException);
+    void endRun(ProcessHistoryID const& phid,
+                RunNumber_t run,
+                bool globalTranstitionSucceeded,
+                bool cleaningUpAfterException);
 
     InputSource::ItemType processLumis(std::shared_ptr<void>);
     void endUnfinishedLumi();
 
-    std::pair<ProcessHistoryID,RunNumber_t> readRun();
-    std::pair<ProcessHistoryID,RunNumber_t> readAndMergeRun();
-    int readLuminosityBlock(LuminosityBlockProcessingStatus& );
+    std::pair<ProcessHistoryID, RunNumber_t> readRun();
+    std::pair<ProcessHistoryID, RunNumber_t> readAndMergeRun();
+    int readLuminosityBlock(LuminosityBlockProcessingStatus&);
     int readAndMergeLumi(LuminosityBlockProcessingStatus&);
     void writeRun(ProcessHistoryID const& phid, RunNumber_t run);
     void deleteRunFromCache(ProcessHistoryID const& phid, RunNumber_t run);
@@ -80,7 +84,6 @@ namespace edm {
     void setExceptionMessageRuns(std::string& message);
     void setExceptionMessageLumis();
 
-
     bool setDeferredException(std::exception_ptr);
 
   private:
@@ -90,12 +93,12 @@ namespace edm {
     void endLumi();
 
     std::string mockData_;
-    std::ostream & output_;
+    std::ostream& output_;
     std::istringstream input_;
-    
+
     std::shared_ptr<LuminosityBlockProcessingStatus> lumiStatus_;
     InputSource::ItemType lastTransition_;
-    
+
     int run_;
     int lumi_;
 
@@ -107,6 +110,6 @@ namespace edm {
     bool reachedEndOfInput_;
     bool shouldThrow_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Framework/test/OutputModuleUtilities_t.cpp b/FWCore/Framework/test/OutputModuleUtilities_t.cpp
index 34b1a2351a332..b3181316bfaad 100644
--- a/FWCore/Framework/test/OutputModuleUtilities_t.cpp
+++ b/FWCore/Framework/test/OutputModuleUtilities_t.cpp
@@ -1,14 +1,8 @@
-namespace edm 
-{
-  namespace test 
-  {
+namespace edm {
+  namespace test {
     // Implemented in OutputModule.cc
     void run_all_output_module_tests();
-  }
-}
+  }  // namespace test
+}  // namespace edm
 
-int main()
-{
-  edm::test::run_all_output_module_tests();
-}
-  
+int main() { edm::test::run_all_output_module_tests(); }
diff --git a/FWCore/Framework/test/ProductSelector_t.cpp b/FWCore/Framework/test/ProductSelector_t.cpp
index 15dc8a227303a..e4bd27d4a2c26 100644
--- a/FWCore/Framework/test/ProductSelector_t.cpp
+++ b/FWCore/Framework/test/ProductSelector_t.cpp
@@ -16,35 +16,30 @@
 
 typedef std::vector<edm::BranchDescription const*> VCBDP;
 
-void apply_gs(edm::ProductSelector const& gs,
-              VCBDP const&  allbranches,
-              std::vector<bool>& results) {
-
-  VCBDP::const_iterator it  = allbranches.begin();
+void apply_gs(edm::ProductSelector const& gs, VCBDP const& allbranches, std::vector<bool>& results) {
+  VCBDP::const_iterator it = allbranches.begin();
   VCBDP::const_iterator end = allbranches.end();
-  for (; it != end; ++it) results.push_back(gs.selected(**it));
+  for (; it != end; ++it)
+    results.push_back(gs.selected(**it));
 }
 
 int doTest(edm::ParameterSet const& params,
-             char const* testname,
-             VCBDP const&  allbranches,
-             std::vector<bool>& expected) {
-
+           char const* testname,
+           VCBDP const& allbranches,
+           std::vector<bool>& expected) {
   edm::ProductSelectorRules gsr(params, "outputCommands", testname);
   edm::ProductSelector gs;
   gs.initialize(gsr, allbranches);
-  std::cout << "ProductSelector from "
-            << testname
-            << ": "
-            << gs
-            << std::endl;
+  std::cout << "ProductSelector from " << testname << ": " << gs << std::endl;
 
   std::vector<bool> results;
   apply_gs(gs, allbranches, results);
 
   int rc = 0;
-  if (expected != results) rc = 1;
-  if (rc == 1) std::cerr << "FAILURE: " << testname << '\n';
+  if (expected != results)
+    rc = 1;
+  if (rc == 1)
+    std::cerr << "FAILURE: " << testname << '\n';
   std::cout << "---" << std::endl;
   return rc;
 }
@@ -69,10 +64,10 @@ int work() {
   modAparams.registerIt();
   psetsA.insert(modAparams.id());
 
-  edm::BranchDescription b1(edm::InEvent, "modA", "PROD", "UglyProdTypeA", "ProdTypeA", "i1",
-                            "", pset.id(), dummyTypeWithDict);
-  edm::BranchDescription b2(edm::InEvent, "modA", "PROD", "UglyProdTypeA", "ProdTypeA", "i2",
-                            "", pset.id(), dummyTypeWithDict);
+  edm::BranchDescription b1(
+      edm::InEvent, "modA", "PROD", "UglyProdTypeA", "ProdTypeA", "i1", "", pset.id(), dummyTypeWithDict);
+  edm::BranchDescription b2(
+      edm::InEvent, "modA", "PROD", "UglyProdTypeA", "ProdTypeA", "i2", "", pset.id(), dummyTypeWithDict);
 
   // Our second pretend module has only one product, and gives it no
   // instance name.
@@ -82,31 +77,31 @@ int work() {
   modBparams.registerIt();
   psetsB.insert(modBparams.id());
 
-  edm::BranchDescription b3(edm::InEvent, "modB", "HLT", "UglyProdTypeB", "ProdTypeB", "",
-                            "", pset.id(), dummyTypeWithDict);
+  edm::BranchDescription b3(
+      edm::InEvent, "modB", "HLT", "UglyProdTypeB", "ProdTypeB", "", "", pset.id(), dummyTypeWithDict);
 
   // Our third pretend is like modA, except it hass processName_ of
   // "USER"
 
-  edm::BranchDescription b4(edm::InEvent, "modA", "USER", "UglyProdTypeA",
-                            "ProdTypeA", "i1", "", pset.id(), dummyTypeWithDict);
-  edm::BranchDescription b5(edm::InEvent, "modA", "USER", "UglyProdTypeA",
-                            "ProdTypeA", "i2", "", pset.id(), dummyTypeWithDict);
+  edm::BranchDescription b4(
+      edm::InEvent, "modA", "USER", "UglyProdTypeA", "ProdTypeA", "i1", "", pset.id(), dummyTypeWithDict);
+  edm::BranchDescription b5(
+      edm::InEvent, "modA", "USER", "UglyProdTypeA", "ProdTypeA", "i2", "", pset.id(), dummyTypeWithDict);
 
   // These are pointers to all the branches that are available. In a
   // framework program, these would come from the ProductRegistry
   // which is used to initialze the OutputModule being configured.
   VCBDP allbranches;
-  allbranches.push_back(&b1); // ProdTypeA_modA_i1. (PROD)
-  allbranches.push_back(&b2); // ProdTypeA_modA_i2. (PROD)
-  allbranches.push_back(&b3); // ProdTypeB_modB_HLT. (no instance name)
-  allbranches.push_back(&b4); // ProdTypeA_modA_i1_USER.
-  allbranches.push_back(&b5); // ProdTypeA_modA_i2_USER.
+  allbranches.push_back(&b1);  // ProdTypeA_modA_i1. (PROD)
+  allbranches.push_back(&b2);  // ProdTypeA_modA_i2. (PROD)
+  allbranches.push_back(&b3);  // ProdTypeB_modB_HLT. (no instance name)
+  allbranches.push_back(&b4);  // ProdTypeA_modA_i1_USER.
+  allbranches.push_back(&b5);  // ProdTypeA_modA_i2_USER.
 
   // Test default parameters
   {
-    bool wanted[] = { true, true, true, true, true };
-    std::vector<bool> expected(wanted, wanted+sizeof(wanted)/sizeof(bool));
+    bool wanted[] = {true, true, true, true, true};
+    std::vector<bool> expected(wanted, wanted + sizeof(wanted) / sizeof(bool));
     edm::ParameterSet noparams;
 
     rc += doTest(noparams, "default parameters", allbranches, expected);
@@ -114,8 +109,8 @@ int work() {
 
   // Keep all branches with instance name i2.
   {
-    bool wanted[] = { false, true, false, false, true };
-    std::vector<bool> expected(wanted, wanted+sizeof(wanted)/sizeof(bool));
+    bool wanted[] = {false, true, false, false, true};
+    std::vector<bool> expected(wanted, wanted + sizeof(wanted) / sizeof(bool));
 
     edm::ParameterSet keep_i2;
     std::string const keep_i2_rule = "keep *_*_i2_*";
@@ -129,8 +124,8 @@ int work() {
 
   // Drop all branches with instance name i2.
   {
-    bool wanted[] = { true, false, true, true, false };
-    std::vector<bool> expected(wanted, wanted+sizeof(wanted)/sizeof(bool));
+    bool wanted[] = {true, false, true, true, false};
+    std::vector<bool> expected(wanted, wanted + sizeof(wanted) / sizeof(bool));
 
     edm::ParameterSet drop_i2;
     std::string const drop_i2_rule1 = "keep *";
@@ -147,11 +142,11 @@ int work() {
   // Now try dropping all branches with product type "foo". There are
   // none, so all branches should be written.
   {
-    bool wanted[] = { true, true, true, true, true };
-    std::vector<bool> expected(wanted, wanted+sizeof(wanted)/sizeof(bool));
+    bool wanted[] = {true, true, true, true, true};
+    std::vector<bool> expected(wanted, wanted + sizeof(wanted) / sizeof(bool));
 
     edm::ParameterSet drop_foo;
-    std::string const drop_foo_rule1 = "keep *_*_*_*"; // same as "keep *"
+    std::string const drop_foo_rule1 = "keep *_*_*_*";  // same as "keep *"
     std::string const drop_foo_rule2 = "drop foo_*_*_*";
     std::vector<std::string> cmds;
     cmds.push_back(drop_foo_rule1);
@@ -164,8 +159,8 @@ int work() {
 
   // Now try dropping all branches with product type "ProdTypeA".
   {
-    bool wanted[] = { false, false, true, false, false };
-    std::vector<bool> expected(wanted, wanted+sizeof(wanted)/sizeof(bool));
+    bool wanted[] = {false, false, true, false, false};
+    std::vector<bool> expected(wanted, wanted + sizeof(wanted) / sizeof(bool));
 
     edm::ParameterSet drop_ProdTypeA;
     std::string const drop_ProdTypeA_rule1 = "keep *";
@@ -176,15 +171,13 @@ int work() {
     drop_ProdTypeA.addUntrackedParameter<std::vector<std::string> >("outputCommands", cmds);
     drop_ProdTypeA.registerIt();
 
-    rc += doTest(drop_ProdTypeA,
-                 "drop_ProdTypeA",
-                 allbranches, expected);
+    rc += doTest(drop_ProdTypeA, "drop_ProdTypeA", allbranches, expected);
   }
 
   // Keep only branches with instance name 'i1', from Production.
   {
-    bool wanted[] = { true, false, false, false, false };
-    std::vector<bool> expected(wanted, wanted+sizeof(wanted)/sizeof(bool));
+    bool wanted[] = {true, false, false, false, false};
+    std::vector<bool> expected(wanted, wanted + sizeof(wanted) / sizeof(bool));
 
     edm::ParameterSet keep_i1prod;
     std::string const keep_i1prod_rule = "keep *_*_i1_PROD";
@@ -193,16 +186,14 @@ int work() {
     keep_i1prod.addUntrackedParameter<std::vector<std::string> >("outputCommands", cmds);
     keep_i1prod.registerIt();
 
-    rc += doTest(keep_i1prod,
-                 "keep_i1prod",
-                 allbranches, expected);
+    rc += doTest(keep_i1prod, "keep_i1prod", allbranches, expected);
   }
 
   // First say to keep everything,  then  to drop everything, then  to
   // keep it again. The end result should be to keep everything.
   {
-    bool wanted[] = { true, true, true, true, true };
-    std::vector<bool> expected(wanted, wanted+sizeof(wanted)/sizeof(bool));
+    bool wanted[] = {true, true, true, true, true};
+    std::vector<bool> expected(wanted, wanted + sizeof(wanted) / sizeof(bool));
 
     edm::ParameterSet indecisive;
     std::string const indecisive_rule1 = "keep *";
@@ -215,16 +206,14 @@ int work() {
     indecisive.addUntrackedParameter<std::vector<std::string> >("outputCommands", cmds);
     indecisive.registerIt();
 
-    rc += doTest(indecisive,
-                 "indecisive",
-                 allbranches, expected);
+    rc += doTest(indecisive, "indecisive", allbranches, expected);
   }
 
   // Keep all things, bu drop all things from modA, but later keep all
   // things from USER.
   {
-    bool wanted[] = { false, false, true, true, true };
-    std::vector<bool> expected(wanted, wanted+sizeof(wanted)/sizeof(bool));
+    bool wanted[] = {false, false, true, true, true};
+    std::vector<bool> expected(wanted, wanted + sizeof(wanted) / sizeof(bool));
 
     edm::ParameterSet params;
     std::string const rule1 = "keep *";
@@ -237,15 +226,13 @@ int work() {
     params.addUntrackedParameter<std::vector<std::string> >("outputCommands", cmds);
     params.registerIt();
 
-    rc += doTest(params,
-                 "drop_modA_keep_user",
-                 allbranches, expected);
+    rc += doTest(params, "drop_modA_keep_user", allbranches, expected);
   }
 
   // Exercise the wildcards * and ?
   {
-    bool wanted[] = { true, true, true, false, false };
-    std::vector<bool> expected(wanted, wanted+sizeof(wanted)/sizeof(bool));
+    bool wanted[] = {true, true, true, false, false};
+    std::vector<bool> expected(wanted, wanted + sizeof(wanted) / sizeof(bool));
 
     edm::ParameterSet params;
     std::string const rule1 = "drop *";
@@ -258,33 +245,29 @@ int work() {
     params.addUntrackedParameter<std::vector<std::string> >("outputCommands", cmds);
     params.registerIt();
 
-    rc += doTest(params,
-                 "excercise wildcards1",
-                 allbranches, expected);
+    rc += doTest(params, "excercise wildcards1", allbranches, expected);
   }
 
   {
     // Now try an illegal specification: not starting with 'keep' or 'drop'
     try {
-        edm::ParameterSet bad;
-        std::string const bad_rule = "beep *_*_i2_*";
-        std::vector<std::string> cmds;
-        cmds.push_back(bad_rule);
-        bad.addUntrackedParameter<std::vector<std::string> >("outputCommands", cmds);
-        bad.registerIt();
-        edm::ProductSelectorRules gsr(bad, "outputCommands", "ProductSelectorTest");
-        edm::ProductSelector gs;
-        gs.initialize(gsr, allbranches);
-        std::cerr << "Failed to throw required exception\n";
-        rc += 1;
-    }
-    catch (edm::Exception const& x) {
-        // OK, we should be here... now check exception type
-        assert (x.categoryCode() == edm::errors::Configuration);
-    }
-    catch (...) {
-        std::cerr << "Wrong exception type\n";
-        rc += 1;
+      edm::ParameterSet bad;
+      std::string const bad_rule = "beep *_*_i2_*";
+      std::vector<std::string> cmds;
+      cmds.push_back(bad_rule);
+      bad.addUntrackedParameter<std::vector<std::string> >("outputCommands", cmds);
+      bad.registerIt();
+      edm::ProductSelectorRules gsr(bad, "outputCommands", "ProductSelectorTest");
+      edm::ProductSelector gs;
+      gs.initialize(gsr, allbranches);
+      std::cerr << "Failed to throw required exception\n";
+      rc += 1;
+    } catch (edm::Exception const& x) {
+      // OK, we should be here... now check exception type
+      assert(x.categoryCode() == edm::errors::Configuration);
+    } catch (...) {
+      std::cerr << "Wrong exception type\n";
+      rc += 1;
     }
   }
   return rc;
@@ -293,15 +276,13 @@ int work() {
 int main() {
   int rc = 0;
   try {
-      rc = work();
-  }
-  catch (edm::Exception& x) {
-      std::cerr << "edm::Exception caught:\n" << x << '\n';
-      rc = 1;
-  }
-  catch (...) {
-      std::cerr << "Unknown exception caught\n";
-      rc = 2;
+    rc = work();
+  } catch (edm::Exception& x) {
+    std::cerr << "edm::Exception caught:\n" << x << '\n';
+    rc = 1;
+  } catch (...) {
+    std::cerr << "Unknown exception caught\n";
+    rc = 2;
   }
   return rc;
 }
diff --git a/FWCore/Framework/test/RegistryTemplate_t.cpp b/FWCore/Framework/test/RegistryTemplate_t.cpp
index 2b88ca5ef89d4..fb67de88a400c 100644
--- a/FWCore/Framework/test/RegistryTemplate_t.cpp
+++ b/FWCore/Framework/test/RegistryTemplate_t.cpp
@@ -1,10 +1,8 @@
 #include <cassert>
 #include "FWCore/ParameterSet/interface/Registry.h"
 
-int main()
-{
-  edm::pset::Registry* psreg = 
-    edm::pset::Registry::instance();
+int main() {
+  edm::pset::Registry* psreg = edm::pset::Registry::instance();
 
-  assert( psreg );
+  assert(psreg);
 }
diff --git a/FWCore/Framework/test/View_t.cpp b/FWCore/Framework/test/View_t.cpp
index 4f3da20ddde7b..1c13361ea7f87 100644
--- a/FWCore/Framework/test/View_t.cpp
+++ b/FWCore/Framework/test/View_t.cpp
@@ -3,8 +3,7 @@
 
 #include "DataFormats/Common/interface/View.h"
 
-class testView: public CppUnit::TestFixture
-{
+class testView : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testView);
   CPPUNIT_TEST(basic);
   CPPUNIT_TEST(createFromArray);
@@ -15,7 +14,7 @@ class testView: public CppUnit::TestFixture
   CPPUNIT_TEST(ptrs);
   CPPUNIT_TEST_SUITE_END();
 
- public:
+public:
   testView() {}
   ~testView() {}
   void setUp() {}
@@ -29,8 +28,8 @@ class testView: public CppUnit::TestFixture
   void cloning();
   void ptrs();
 
- private:
-  typedef int  value_type;
+private:
+  typedef int value_type;
   typedef edm::View<value_type> View;
   typedef View::const_iterator const_iterator;
   typedef View::const_reverse_iterator const_reverse_iterator;
@@ -41,107 +40,96 @@ class testView: public CppUnit::TestFixture
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testView);
 
-void testView::basic()
-{
+void testView::basic() {
   View v1;
   CPPUNIT_ASSERT(v1.size() == 0);
   CPPUNIT_ASSERT(v1.empty());
   View v2(v1);
-  CPPUNIT_ASSERT(v1==v2);
+  CPPUNIT_ASSERT(v1 == v2);
   View v3;
   v3 = v1;
-  CPPUNIT_ASSERT(v3==v1);
+  CPPUNIT_ASSERT(v3 == v1);
 
-  CPPUNIT_ASSERT(! (v1 < v2));
+  CPPUNIT_ASSERT(!(v1 < v2));
   CPPUNIT_ASSERT(v1 <= v2);
-  CPPUNIT_ASSERT(! (v1 > v2));
+  CPPUNIT_ASSERT(!(v1 > v2));
   CPPUNIT_ASSERT(v1 >= v2);
-  CPPUNIT_ASSERT(! (v1 != v2));
+  CPPUNIT_ASSERT(!(v1 != v2));
 }
 
-void testView::createFromArray()
-{
-  value_type vals[] = { 1, 2, 3, 4, 5 };
-  size_t sz = sizeof(vals)/sizeof(value_type);
+void testView::createFromArray() {
+  value_type vals[] = {1, 2, 3, 4, 5};
+  size_t sz = sizeof(vals) / sizeof(value_type);
 
   View v1;
-  edm::View<int>::fill_from_range(vals, vals+sz, v1);
+  edm::View<int>::fill_from_range(vals, vals + sz, v1);
   CPPUNIT_ASSERT(v1.size() == 5);
   View v2;
-  edm::View<int>::fill_from_range(vals, vals+sz, v2);
-  CPPUNIT_ASSERT(v1==v2);
+  edm::View<int>::fill_from_range(vals, vals + sz, v2);
+  CPPUNIT_ASSERT(v1 == v2);
 }
 
-void testView::directAccess()
-{
-  value_type vals[] = { 1, 2, 3, 4, 5 };
-  size_t sz = sizeof(vals)/sizeof(value_type);
+void testView::directAccess() {
+  value_type vals[] = {1, 2, 3, 4, 5};
+  size_t sz = sizeof(vals) / sizeof(value_type);
 
   View v1;
-  edm::View<int>::fill_from_range(vals, vals+sz, v1);
-  for (size_type i = 0; i < v1.size(); ++i)
-    {
-      CPPUNIT_ASSERT(v1[i] == vals[i]);
-    }  
+  edm::View<int>::fill_from_range(vals, vals + sz, v1);
+  for (size_type i = 0; i < v1.size(); ++i) {
+    CPPUNIT_ASSERT(v1[i] == vals[i]);
+  }
 }
 
-void testView::iterateForward()
-{
-  value_type vals[] = { 1, 2, 3, 4, 5 };
-  size_t sz = sizeof(vals)/sizeof(value_type);
+void testView::iterateForward() {
+  value_type vals[] = {1, 2, 3, 4, 5};
+  size_t sz = sizeof(vals) / sizeof(value_type);
 
   View v1;
-  edm::View<int>::fill_from_range(vals, vals+sz, v1);
+  edm::View<int>::fill_from_range(vals, vals + sz, v1);
 
   const_iterator i = v1.begin();
-  CPPUNIT_ASSERT( *i == 1 );
+  CPPUNIT_ASSERT(*i == 1);
   ++i;
-  CPPUNIT_ASSERT( *i == 2 );
+  CPPUNIT_ASSERT(*i == 2);
 }
 
-void testView::iterateBackward()
-{
-  value_type vals[] = { 1, 2, 3, 4, 5 };
-  size_t sz = sizeof(vals)/sizeof(value_type);
+void testView::iterateBackward() {
+  value_type vals[] = {1, 2, 3, 4, 5};
+  size_t sz = sizeof(vals) / sizeof(value_type);
 
   View v1;
-  edm::View<int>::fill_from_range(vals, vals+sz, v1);
+  edm::View<int>::fill_from_range(vals, vals + sz, v1);
 
   const_reverse_iterator i = v1.rbegin();
-  CPPUNIT_ASSERT( *i == 5 );
+  CPPUNIT_ASSERT(*i == 5);
   ++i;
-  CPPUNIT_ASSERT( *i == 4 );  
+  CPPUNIT_ASSERT(*i == 4);
 }
 
-void testView::cloning()
-{
-
-  value_type vals[] = { 1, 2, 3, 4, 5 };
-  size_t sz = sizeof(vals)/sizeof(value_type);
+void testView::cloning() {
+  value_type vals[] = {1, 2, 3, 4, 5};
+  size_t sz = sizeof(vals) / sizeof(value_type);
 
   View v1;
-  edm::View<int>::fill_from_range(vals, vals+sz, v1);
-  
+  edm::View<int>::fill_from_range(vals, vals + sz, v1);
+
   auto base = v1.clone();
   CPPUNIT_ASSERT(base);
   edm::View<int>* view = dynamic_cast<edm::View<int>*>(base.get());
   CPPUNIT_ASSERT(view);
-  if(view) {
+  if (view) {
     CPPUNIT_ASSERT(*view == v1);
   }
 }
 
-void testView::ptrs()
-{
-  value_type vals[] = { 1, 2, 3, 4, 5 };
-  size_t sz = sizeof(vals)/sizeof(value_type);
-  
+void testView::ptrs() {
+  value_type vals[] = {1, 2, 3, 4, 5};
+  size_t sz = sizeof(vals) / sizeof(value_type);
+
   View v1;
-  edm::View<int>::fill_from_range(vals, vals+sz, v1);
-  size_t i=0;
-  for(auto ptr : v1.ptrs())
-  {
+  edm::View<int>::fill_from_range(vals, vals + sz, v1);
+  size_t i = 0;
+  for (auto ptr : v1.ptrs()) {
     CPPUNIT_ASSERT(*ptr == vals[i++]);
   }
 }
-
diff --git a/FWCore/Framework/test/callback_t.cppunit.cc b/FWCore/Framework/test/callback_t.cppunit.cc
index cbfd64ae4829f..28fa1b137128f 100644
--- a/FWCore/Framework/test/callback_t.cppunit.cc
+++ b/FWCore/Framework/test/callback_t.cppunit.cc
@@ -14,79 +14,78 @@
 #include <cassert>
 
 namespace callbacktest {
-   struct Data {
-      Data() : value_(0) {}
-      Data(int iValue) : value_(iValue) {}
-      virtual ~Data() {}
-      int value_;
-   };
-   
-   struct Double {
-      Double() : value_(0) {}
-      Double(double iValue) : value_(iValue) {}
-      virtual ~Double() {}
-      double value_;
-   };
-
-   struct Record { };
-   
-   struct ConstPtrProd {
-      ConstPtrProd() : data_() {}
-      const Data* method(const Record&) {
-         ++data_.value_;
-         return &data_;
-      }      
-      Data data_;
-   };
-
-   struct UniquePtrProd {
-      UniquePtrProd() : value_(0) {}
-      std::unique_ptr<Data> method(const Record&) {
-         return std::make_unique<Data>(++value_);
-      }
-      
-      int value_;
-   };
-
-   struct SharedPtrProd {
-      SharedPtrProd() : ptr_(new Data()) {}
-      std::shared_ptr<Data> method(const Record&) {
-         ++ptr_->value_;
-         return ptr_;
-      }      
-      std::shared_ptr<Data> ptr_;
-   };
-   
-   struct PtrProductsProd {
-      PtrProductsProd() : data_(), double_() {}
-      edm::ESProducts<std::shared_ptr<Data>, std::shared_ptr<Double>> method(const Record&) {
-         using namespace edm::es;
-         auto dataT = std::shared_ptr<Data>(&data_, edm::do_nothing_deleter());;
-         auto doubleT = std::shared_ptr<Double>(&double_, edm::do_nothing_deleter());
-         ++data_.value_;
-         ++double_.value_;
-         return products(dataT, doubleT);
-      }
-      Data data_;
-      Double double_;
-   };
-}
+  struct Data {
+    Data() : value_(0) {}
+    Data(int iValue) : value_(iValue) {}
+    virtual ~Data() {}
+    int value_;
+  };
+
+  struct Double {
+    Double() : value_(0) {}
+    Double(double iValue) : value_(iValue) {}
+    virtual ~Double() {}
+    double value_;
+  };
+
+  struct Record {};
+
+  struct ConstPtrProd {
+    ConstPtrProd() : data_() {}
+    const Data* method(const Record&) {
+      ++data_.value_;
+      return &data_;
+    }
+    Data data_;
+  };
+
+  struct UniquePtrProd {
+    UniquePtrProd() : value_(0) {}
+    std::unique_ptr<Data> method(const Record&) { return std::make_unique<Data>(++value_); }
+
+    int value_;
+  };
+
+  struct SharedPtrProd {
+    SharedPtrProd() : ptr_(new Data()) {}
+    std::shared_ptr<Data> method(const Record&) {
+      ++ptr_->value_;
+      return ptr_;
+    }
+    std::shared_ptr<Data> ptr_;
+  };
+
+  struct PtrProductsProd {
+    PtrProductsProd() : data_(), double_() {}
+    edm::ESProducts<std::shared_ptr<Data>, std::shared_ptr<Double>> method(const Record&) {
+      using namespace edm::es;
+      auto dataT = std::shared_ptr<Data>(&data_, edm::do_nothing_deleter());
+      ;
+      auto doubleT = std::shared_ptr<Double>(&double_, edm::do_nothing_deleter());
+      ++data_.value_;
+      ++double_.value_;
+      return products(dataT, doubleT);
+    }
+    Data data_;
+    Double double_;
+  };
+}  // namespace callbacktest
 
 using namespace callbacktest;
 using namespace edm::eventsetup;
 
-class testCallback: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(testCallback);
+class testCallback : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testCallback);
+
+  CPPUNIT_TEST(uniquePtrTest);
+  CPPUNIT_TEST(sharedPtrTest);
+  CPPUNIT_TEST(ptrProductsTest);
 
-CPPUNIT_TEST(uniquePtrTest);
-CPPUNIT_TEST(sharedPtrTest);
-CPPUNIT_TEST(ptrProductsTest);
+  CPPUNIT_TEST_SUITE_END();
 
-CPPUNIT_TEST_SUITE_END();
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void uniquePtrTest();
   void sharedPtrTest();
@@ -98,101 +97,94 @@ CPPUNIT_TEST_SUITE_REGISTRATION(testCallback);
 
 typedef Callback<UniquePtrProd, std::unique_ptr<Data>, Record> UniquePtrCallback;
 
-void testCallback::uniquePtrTest()
-{
-   UniquePtrProd prod;
-   
-   UniquePtrCallback callback(&prod, &UniquePtrProd::method);
-   std::unique_ptr<Data> handle;
-   
-   
-   callback.holdOntoPointer(&handle);
-   
-   Record record;
-   callback.newRecordComing();
-   callback(record);
-   CPPUNIT_ASSERT(0 != handle.get());
-   CPPUNIT_ASSERT(prod.value_ == 1);
-   assert(0 != handle.get());
-   CPPUNIT_ASSERT(prod.value_ == handle->value_);
-   
-   //since haven't cleared, should not have changed
-   callback(record);
-   CPPUNIT_ASSERT(prod.value_ == 1);
-   CPPUNIT_ASSERT(prod.value_ == handle->value_);
-   
-   handle.release();
-
-   callback.newRecordComing();
-   
-   callback(record);
-   CPPUNIT_ASSERT(0 != handle.get());
-   CPPUNIT_ASSERT(prod.value_ == 2);
-   assert(0 != handle.get());
-   CPPUNIT_ASSERT(prod.value_ == handle->value_);
-   
+void testCallback::uniquePtrTest() {
+  UniquePtrProd prod;
+
+  UniquePtrCallback callback(&prod, &UniquePtrProd::method, 0);
+  std::unique_ptr<Data> handle;
+
+  callback.holdOntoPointer(&handle);
+
+  Record record;
+  callback.newRecordComing();
+  callback(record);
+  CPPUNIT_ASSERT(0 != handle.get());
+  CPPUNIT_ASSERT(prod.value_ == 1);
+  assert(0 != handle.get());
+  CPPUNIT_ASSERT(prod.value_ == handle->value_);
+
+  //since haven't cleared, should not have changed
+  callback(record);
+  CPPUNIT_ASSERT(prod.value_ == 1);
+  CPPUNIT_ASSERT(prod.value_ == handle->value_);
+
+  handle.release();
+
+  callback.newRecordComing();
+
+  callback(record);
+  CPPUNIT_ASSERT(0 != handle.get());
+  CPPUNIT_ASSERT(prod.value_ == 2);
+  assert(0 != handle.get());
+  CPPUNIT_ASSERT(prod.value_ == handle->value_);
 }
 
 typedef Callback<SharedPtrProd, std::shared_ptr<Data>, Record> SharedPtrCallback;
 
-void testCallback::sharedPtrTest()
-{
-   SharedPtrProd prod;
-   
-   SharedPtrCallback callback(&prod, &SharedPtrProd::method);
-   std::shared_ptr<Data> handle;
-   
-   
-   callback.holdOntoPointer(&handle);
-   
-   Record record;
-   callback.newRecordComing();
-   callback(record);
-   CPPUNIT_ASSERT(handle.get() == prod.ptr_.get());
-   CPPUNIT_ASSERT(prod.ptr_->value_ == 1);
-   
-   //since haven't cleared, should not have changed
-   callback(record);
-   CPPUNIT_ASSERT(handle.get() == prod.ptr_.get());
-   CPPUNIT_ASSERT(prod.ptr_->value_ == 1);
-   
-   handle.reset() ;
-   callback.newRecordComing();
-   
-   callback(record);
-   CPPUNIT_ASSERT(handle.get() == prod.ptr_.get());
-   CPPUNIT_ASSERT(prod.ptr_->value_ == 2);
-   
+void testCallback::sharedPtrTest() {
+  SharedPtrProd prod;
+
+  SharedPtrCallback callback(&prod, &SharedPtrProd::method, 0);
+  std::shared_ptr<Data> handle;
+
+  callback.holdOntoPointer(&handle);
+
+  Record record;
+  callback.newRecordComing();
+  callback(record);
+  CPPUNIT_ASSERT(handle.get() == prod.ptr_.get());
+  CPPUNIT_ASSERT(prod.ptr_->value_ == 1);
+
+  //since haven't cleared, should not have changed
+  callback(record);
+  CPPUNIT_ASSERT(handle.get() == prod.ptr_.get());
+  CPPUNIT_ASSERT(prod.ptr_->value_ == 1);
+
+  handle.reset();
+  callback.newRecordComing();
+
+  callback(record);
+  CPPUNIT_ASSERT(handle.get() == prod.ptr_.get());
+  CPPUNIT_ASSERT(prod.ptr_->value_ == 2);
 }
 
-typedef Callback<PtrProductsProd, edm::ESProducts<std::shared_ptr<Data>, std::shared_ptr<Double>>, Record> PtrProductsCallback;
-
-void testCallback::ptrProductsTest()
-{
-   PtrProductsProd prod;
-   
-   PtrProductsCallback callback(&prod, &PtrProductsProd::method);
-   std::shared_ptr<Data> handle;
-   std::shared_ptr<Double> doubleHandle;
-   
-   callback.holdOntoPointer(&handle);
-   callback.holdOntoPointer(&doubleHandle);
-   
-   Record record;
-   callback.newRecordComing();
-   callback(record);
-   CPPUNIT_ASSERT(handle.get() == &(prod.data_));
-   CPPUNIT_ASSERT(prod.data_.value_ == 1);
-   
-   //since haven't cleared, should not have changed
-   callback(record);
-   CPPUNIT_ASSERT(handle.get() == &(prod.data_));
-   CPPUNIT_ASSERT(prod.data_.value_ == 1);
-   
-   callback.newRecordComing();
-   
-   callback(record);
-   CPPUNIT_ASSERT(handle.get() == &(prod.data_));
-   CPPUNIT_ASSERT(prod.data_.value_ == 2);
-   
+typedef Callback<PtrProductsProd, edm::ESProducts<std::shared_ptr<Data>, std::shared_ptr<Double>>, Record>
+    PtrProductsCallback;
+
+void testCallback::ptrProductsTest() {
+  PtrProductsProd prod;
+
+  PtrProductsCallback callback(&prod, &PtrProductsProd::method, 0);
+  std::shared_ptr<Data> handle;
+  std::shared_ptr<Double> doubleHandle;
+
+  callback.holdOntoPointer(&handle);
+  callback.holdOntoPointer(&doubleHandle);
+
+  Record record;
+  callback.newRecordComing();
+  callback(record);
+  CPPUNIT_ASSERT(handle.get() == &(prod.data_));
+  CPPUNIT_ASSERT(prod.data_.value_ == 1);
+
+  //since haven't cleared, should not have changed
+  callback(record);
+  CPPUNIT_ASSERT(handle.get() == &(prod.data_));
+  CPPUNIT_ASSERT(prod.data_.value_ == 1);
+
+  callback.newRecordComing();
+
+  callback(record);
+  CPPUNIT_ASSERT(handle.get() == &(prod.data_));
+  CPPUNIT_ASSERT(prod.data_.value_ == 2);
 }
diff --git a/FWCore/Framework/test/datakey_t.cppunit.cc b/FWCore/Framework/test/datakey_t.cppunit.cc
index c60f4aad3d410..243a9f15528d6 100644
--- a/FWCore/Framework/test/datakey_t.cppunit.cc
+++ b/FWCore/Framework/test/datakey_t.cppunit.cc
@@ -14,8 +14,7 @@
 using namespace edm;
 using namespace edm::eventsetup;
 
-class testDataKey: public CppUnit::TestFixture {
-
+class testDataKey : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testDataKey);
 
   CPPUNIT_TEST(nametagConstructionTest);
@@ -29,9 +28,9 @@ class testDataKey: public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE_END();
 
 public:
-  void setUp(){}
-  void tearDown(){}
-  
+  void setUp() {}
+  void tearDown() {}
+
   void nametagConstructionTest();
   void nametagComparisonTest();
   void nametagCopyTest();
@@ -39,129 +38,121 @@ class testDataKey: public CppUnit::TestFixture {
   void ComparisonTest();
   void CopyTest();
   void nocopyConstructionTest();
-}; 
+};
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testDataKey);
 
+void testDataKey::nametagConstructionTest() {
+  const NameTag defaultTag;
+  CPPUNIT_ASSERT(0 == std::strcmp("", defaultTag.value()));
 
-void testDataKey::nametagConstructionTest()
-{
-   const NameTag defaultTag;
-   CPPUNIT_ASSERT(0 == std::strcmp("", defaultTag.value()));
-   
-   const NameTag namedTag("fred");
-   CPPUNIT_ASSERT(0 == std::strcmp("fred", namedTag.value()));
+  const NameTag namedTag("fred");
+  CPPUNIT_ASSERT(0 == std::strcmp("fred", namedTag.value()));
 }
 
-void testDataKey::nametagComparisonTest()
-{
-   const NameTag defaultTag;
-   CPPUNIT_ASSERT(defaultTag == defaultTag);
-   
-   const NameTag fredTag("fred");
-   CPPUNIT_ASSERT(fredTag == fredTag);
-   
-   CPPUNIT_ASSERT(! (defaultTag == fredTag));
-   
-   const NameTag barneyTag("barney");
-   
-   CPPUNIT_ASSERT(barneyTag < fredTag);
+void testDataKey::nametagComparisonTest() {
+  const NameTag defaultTag;
+  CPPUNIT_ASSERT(defaultTag == defaultTag);
+
+  const NameTag fredTag("fred");
+  CPPUNIT_ASSERT(fredTag == fredTag);
+
+  CPPUNIT_ASSERT(!(defaultTag == fredTag));
+
+  const NameTag barneyTag("barney");
+
+  CPPUNIT_ASSERT(barneyTag < fredTag);
 }
 
-void testDataKey::nametagCopyTest()
-{
-   const NameTag defaultTag;
-   NameTag tester(defaultTag);
-   CPPUNIT_ASSERT(tester == defaultTag);
-   
-   const NameTag fredTag("fred");
-   tester = fredTag;
-   CPPUNIT_ASSERT(tester == fredTag);
+void testDataKey::nametagCopyTest() {
+  const NameTag defaultTag;
+  NameTag tester(defaultTag);
+  CPPUNIT_ASSERT(tester == defaultTag);
+
+  const NameTag fredTag("fred");
+  tester = fredTag;
+  CPPUNIT_ASSERT(tester == fredTag);
 }
 
 namespace datakey_t {
-   class Dummy {};
-   class Dummy2 {};
-}
+  class Dummy {};
+  class Dummy2 {};
+}  // namespace datakey_t
 using datakey_t::Dummy;
 using datakey_t::Dummy2;
 
 HCTYPETAG_HELPER_METHODS(Dummy)
 HCTYPETAG_HELPER_METHODS(Dummy2)
 
-void testDataKey::ConstructionTest()
-{
-   DataKey defaultKey;
-   CPPUNIT_ASSERT(TypeTag() == defaultKey.type());
-   CPPUNIT_ASSERT(0 == std::strcmp("", defaultKey.name().value()));
+void testDataKey::ConstructionTest() {
+  DataKey defaultKey;
+  CPPUNIT_ASSERT(TypeTag() == defaultKey.type());
+  CPPUNIT_ASSERT(0 == std::strcmp("", defaultKey.name().value()));
 
-   DataKey dummyKey(DataKey::makeTypeTag<Dummy>(), "");
-   CPPUNIT_ASSERT(DataKey::makeTypeTag<Dummy>() == dummyKey.type());
-   CPPUNIT_ASSERT(0 == std::strcmp("", dummyKey.name().value()));
+  DataKey dummyKey(DataKey::makeTypeTag<Dummy>(), "");
+  CPPUNIT_ASSERT(DataKey::makeTypeTag<Dummy>() == dummyKey.type());
+  CPPUNIT_ASSERT(0 == std::strcmp("", dummyKey.name().value()));
 
-   DataKey namedDummyKey(DataKey::makeTypeTag<Dummy>(), "fred");
-   CPPUNIT_ASSERT(DataKey::makeTypeTag<Dummy>() == namedDummyKey.type());
-   CPPUNIT_ASSERT(0 == std::strcmp("fred", namedDummyKey.name().value()));
+  DataKey namedDummyKey(DataKey::makeTypeTag<Dummy>(), "fred");
+  CPPUNIT_ASSERT(DataKey::makeTypeTag<Dummy>() == namedDummyKey.type());
+  CPPUNIT_ASSERT(0 == std::strcmp("fred", namedDummyKey.name().value()));
 }
 
-void testDataKey::ComparisonTest()
-{
-   const DataKey defaultKey;
-   CPPUNIT_ASSERT(defaultKey == defaultKey);
-   CPPUNIT_ASSERT(!(defaultKey < defaultKey));
-   
-   const DataKey dummyKey(DataKey::makeTypeTag<Dummy>(), "");
-   const DataKey fredDummyKey(DataKey::makeTypeTag<Dummy>(), "fred");
-   const DataKey barneyDummyKey(DataKey::makeTypeTag<Dummy>(), "barney");
-
-   CPPUNIT_ASSERT(! (defaultKey == dummyKey));
-   CPPUNIT_ASSERT(dummyKey == dummyKey);
-   CPPUNIT_ASSERT(! (dummyKey == fredDummyKey));
-   
-   CPPUNIT_ASSERT(barneyDummyKey == barneyDummyKey);
-   CPPUNIT_ASSERT(barneyDummyKey < fredDummyKey);
-   CPPUNIT_ASSERT(!(fredDummyKey < barneyDummyKey));
-   CPPUNIT_ASSERT(!(barneyDummyKey == fredDummyKey));
-   
-   const DataKey dummy2Key(DataKey::makeTypeTag<Dummy2>(), "");
-
-   CPPUNIT_ASSERT(! (dummy2Key == dummyKey));
+void testDataKey::ComparisonTest() {
+  const DataKey defaultKey;
+  CPPUNIT_ASSERT(defaultKey == defaultKey);
+  CPPUNIT_ASSERT(!(defaultKey < defaultKey));
+
+  const DataKey dummyKey(DataKey::makeTypeTag<Dummy>(), "");
+  const DataKey fredDummyKey(DataKey::makeTypeTag<Dummy>(), "fred");
+  const DataKey barneyDummyKey(DataKey::makeTypeTag<Dummy>(), "barney");
+
+  CPPUNIT_ASSERT(!(defaultKey == dummyKey));
+  CPPUNIT_ASSERT(dummyKey == dummyKey);
+  CPPUNIT_ASSERT(!(dummyKey == fredDummyKey));
+
+  CPPUNIT_ASSERT(barneyDummyKey == barneyDummyKey);
+  CPPUNIT_ASSERT(barneyDummyKey < fredDummyKey);
+  CPPUNIT_ASSERT(!(fredDummyKey < barneyDummyKey));
+  CPPUNIT_ASSERT(!(barneyDummyKey == fredDummyKey));
+
+  const DataKey dummy2Key(DataKey::makeTypeTag<Dummy2>(), "");
+
+  CPPUNIT_ASSERT(!(dummy2Key == dummyKey));
 }
 
-void testDataKey::CopyTest()
-{
-   const DataKey defaultKey;
-   DataKey tester(defaultKey);
-   CPPUNIT_ASSERT(tester == defaultKey);
-   
-   const DataKey dummyKey(DataKey::makeTypeTag<Dummy>(), "");
-   tester = dummyKey;
-   CPPUNIT_ASSERT(tester == dummyKey);
-   const DataKey fredDummyKey(DataKey::makeTypeTag<Dummy>(), "fred");
-   tester = fredDummyKey;
-   CPPUNIT_ASSERT(tester == fredDummyKey);
-
-   DataKey tester2(fredDummyKey);
-   CPPUNIT_ASSERT(tester2 == fredDummyKey);
+void testDataKey::CopyTest() {
+  const DataKey defaultKey;
+  DataKey tester(defaultKey);
+  CPPUNIT_ASSERT(tester == defaultKey);
+
+  const DataKey dummyKey(DataKey::makeTypeTag<Dummy>(), "");
+  tester = dummyKey;
+  CPPUNIT_ASSERT(tester == dummyKey);
+  const DataKey fredDummyKey(DataKey::makeTypeTag<Dummy>(), "fred");
+  tester = fredDummyKey;
+  CPPUNIT_ASSERT(tester == fredDummyKey);
+
+  DataKey tester2(fredDummyKey);
+  CPPUNIT_ASSERT(tester2 == fredDummyKey);
 }
 
-void testDataKey::nocopyConstructionTest()
-{
-   const DataKey fredDummyKey(DataKey::makeTypeTag<Dummy>(), "fred");
-   const DataKey noCopyFredDummyKey(DataKey::makeTypeTag<Dummy>(), "fred", DataKey::kDoNotCopyMemory);
-
-   CPPUNIT_ASSERT(fredDummyKey == noCopyFredDummyKey);
-   
-   const DataKey copyFredDummyKey(noCopyFredDummyKey);
-   CPPUNIT_ASSERT(copyFredDummyKey == noCopyFredDummyKey);
-   
-   DataKey copy2FredDummyKey;
-   copy2FredDummyKey = noCopyFredDummyKey;
-   CPPUNIT_ASSERT(copy2FredDummyKey == noCopyFredDummyKey);
-   
-   DataKey noCopyBarneyDummyKey(DataKey::makeTypeTag<Dummy>(), "barney", DataKey::kDoNotCopyMemory);
-
-   noCopyBarneyDummyKey = noCopyFredDummyKey;
-   CPPUNIT_ASSERT(noCopyBarneyDummyKey == noCopyFredDummyKey);
+void testDataKey::nocopyConstructionTest() {
+  const DataKey fredDummyKey(DataKey::makeTypeTag<Dummy>(), "fred");
+  const DataKey noCopyFredDummyKey(DataKey::makeTypeTag<Dummy>(), "fred", DataKey::kDoNotCopyMemory);
+
+  CPPUNIT_ASSERT(fredDummyKey == noCopyFredDummyKey);
+
+  const DataKey copyFredDummyKey(noCopyFredDummyKey);
+  CPPUNIT_ASSERT(copyFredDummyKey == noCopyFredDummyKey);
+
+  DataKey copy2FredDummyKey;
+  copy2FredDummyKey = noCopyFredDummyKey;
+  CPPUNIT_ASSERT(copy2FredDummyKey == noCopyFredDummyKey);
+
+  DataKey noCopyBarneyDummyKey(DataKey::makeTypeTag<Dummy>(), "barney", DataKey::kDoNotCopyMemory);
+
+  noCopyBarneyDummyKey = noCopyFredDummyKey;
+  CPPUNIT_ASSERT(noCopyBarneyDummyKey == noCopyFredDummyKey);
 }
diff --git a/FWCore/Framework/test/dependentrecord_t.cppunit.cc b/FWCore/Framework/test/dependentrecord_t.cppunit.cc
index a817f33dcd0e2..829e4b7ce5c6f 100644
--- a/FWCore/Framework/test/dependentrecord_t.cppunit.cc
+++ b/FWCore/Framework/test/dependentrecord_t.cppunit.cc
@@ -14,42 +14,49 @@
 #include "FWCore/Framework/test/DepRecord.h"
 #include "FWCore/Framework/test/DepOn2Record.h"
 #include "FWCore/Framework/test/DummyFinder.h"
+#include "FWCore/Framework/test/DummyData.h"
+#include "FWCore/Framework/test/DummyProxyProvider.h"
 #include "FWCore/Framework/interface/DependentRecordIntervalFinder.h"
 #include "FWCore/Framework/interface/EventSetupProvider.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/DataProxyProvider.h"
+#include "FWCore/Framework/interface/DataProxyTemplate.h"
 #include "FWCore/Framework/interface/EventSetupRecordProvider.h"
+#include "FWCore/Framework/interface/ESRecordsToProxyIndices.h"
 #include "FWCore/Framework/interface/NoRecordException.h"
 #include "FWCore/Framework/interface/print_eventsetup_record_dependencies.h"
+#include "FWCore/Framework/interface/EDConsumerBase.h"
 #include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "cppunit/extensions/HelperMacros.h"
 #include <cstring>
 
-
 using namespace edm::eventsetup;
 
-class testdependentrecord: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(testdependentrecord);
-
-CPPUNIT_TEST(dependentConstructorTest);
-CPPUNIT_TEST(dependentFinder1Test);
-CPPUNIT_TEST(dependentFinder2Test);
-CPPUNIT_TEST(timeAndRunTest);
-CPPUNIT_TEST(dependentSetproviderTest);
-CPPUNIT_TEST(getTest);
-CPPUNIT_TEST(oneOfTwoRecordTest);
-CPPUNIT_TEST(resetTest);
-CPPUNIT_TEST(alternateFinderTest);
-CPPUNIT_TEST(invalidRecordTest);
-CPPUNIT_TEST(extendIOVTest);
-
-  
-CPPUNIT_TEST_SUITE_END();
-public:
+class testdependentrecord : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testdependentrecord);
+
+  CPPUNIT_TEST(dependentConstructorTest);
+  CPPUNIT_TEST(dependentFinder1Test);
+  CPPUNIT_TEST(dependentFinder2Test);
+  CPPUNIT_TEST(timeAndRunTest);
+  CPPUNIT_TEST(dependentSetproviderTest);
+  CPPUNIT_TEST(getTest);
+  CPPUNIT_TEST(getDataWithESGetTokenTest);
+  CPPUNIT_TEST(getHandleWithESGetTokenTest);
+  CPPUNIT_TEST(getTransientHandleWithESGetTokenTest);
+  CPPUNIT_TEST(oneOfTwoRecordTest);
+  CPPUNIT_TEST(resetTest);
+  CPPUNIT_TEST(alternateFinderTest);
+  CPPUNIT_TEST(invalidRecordTest);
+  CPPUNIT_TEST(extendIOVTest);
+
+  CPPUNIT_TEST_SUITE_END();
 
-  void setUp(){}
-  void tearDown(){}
+public:
+  void setUp() {}
+  void tearDown() {}
 
   void dependentConstructorTest();
   void dependentFinder1Test();
@@ -57,13 +64,16 @@ CPPUNIT_TEST_SUITE_END();
   void timeAndRunTest();
   void dependentSetproviderTest();
   void getTest();
+  void getDataWithESGetTokenTest();
+  void getHandleWithESGetTokenTest();
+  void getTransientHandleWithESGetTokenTest();
   void oneOfTwoRecordTest();
   void resetTest();
   void alternateFinderTest();
   void invalidRecordTest();
   void extendIOVTest();
-  
-}; //Cppunit class declaration over
+
+};  //Cppunit class declaration over
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testdependentrecord);
@@ -77,844 +87,1240 @@ CPPUNIT_TEST_SUITE_REGISTRATION(testdependentrecord);
 
 namespace {
 
-edm::ActivityRegistry activityRegistry;
+  edm::ActivityRegistry activityRegistry;
 
-class DummyProxyProvider : public edm::eventsetup::DataProxyProvider {
-public:
-   DummyProxyProvider() {
-      usingRecord<DummyRecord>();
-   }
-   void newInterval(const edm::eventsetup::EventSetupRecordKey& /*iRecordType*/,
+  class DummyProxyProvider : public edm::eventsetup::DataProxyProvider {
+  public:
+    DummyProxyProvider() { usingRecord<DummyRecord>(); }
+    void newInterval(const edm::eventsetup::EventSetupRecordKey& /*iRecordType*/,
                      const edm::ValidityInterval& /*iInterval*/) {
       //do nothing
-   }
-protected:
-   void registerProxies(const edm::eventsetup::EventSetupRecordKey&, KeyedProxies& /*iHolder*/) {
-   }
-   
-};
-
-class DepRecordProxyProvider : public edm::eventsetup::DataProxyProvider {
-public:
-   DepRecordProxyProvider() {
+    }
+
+  protected:
+    void registerProxies(const edm::eventsetup::EventSetupRecordKey&, KeyedProxies& /*iHolder*/) {}
+  };
+
+  class DepRecordProxyProvider : public edm::eventsetup::DataProxyProvider {
+  public:
+    DepRecordProxyProvider() { usingRecord<DepRecord>(); }
+    void newInterval(const edm::eventsetup::EventSetupRecordKey& /*iRecordType*/,
+                     const edm::ValidityInterval& /*iInterval*/) {
+      //do nothing
+    }
+
+  protected:
+    void registerProxies(const edm::eventsetup::EventSetupRecordKey&, KeyedProxies& /*iHolder*/) {}
+  };
+
+  class WorkingDepRecordProxy : public edm::eventsetup::DataProxyTemplate<DepRecord, edm::eventsetup::test::DummyData> {
+  public:
+    WorkingDepRecordProxy(const edm::eventsetup::test::DummyData* iDummy) : data_(iDummy) {}
+
+  protected:
+    const value_type* make(const record_type&, const DataKey&) { return data_; }
+    void invalidateCache() {}
+
+  private:
+    const edm::eventsetup::test::DummyData* data_;
+  };
+
+  class DepRecordProxyProviderWithData : public edm::eventsetup::DataProxyProvider {
+  public:
+    DepRecordProxyProviderWithData(const edm::eventsetup::test::DummyData& iData = edm::eventsetup::test::DummyData())
+        : dummy_(iData) {
       usingRecord<DepRecord>();
-   }
-   void newInterval(const edm::eventsetup::EventSetupRecordKey& /*iRecordType*/,
+    }
+    void newInterval(const edm::eventsetup::EventSetupRecordKey& /*iRecordType*/,
                      const edm::ValidityInterval& /*iInterval*/) {
       //do nothing
-   }
-protected:
-   void registerProxies(const edm::eventsetup::EventSetupRecordKey&, KeyedProxies& /*iHolder*/) {
-   }
-   
-};
+    }
 
+  protected:
+    void registerProxies(const edm::eventsetup::EventSetupRecordKey&, KeyedProxies& iProxies) {
+      std::shared_ptr<WorkingDepRecordProxy> pProxy = std::make_shared<WorkingDepRecordProxy>(&dummy_);
+      insertProxy(iProxies, pProxy);
+    }
 
-class DepOn2RecordProxyProvider : public edm::eventsetup::DataProxyProvider {
-public:
-  DepOn2RecordProxyProvider() {
-    usingRecord<DepOn2Record>();
+  private:
+    edm::eventsetup::test::DummyData dummy_;
+  };
+
+  class DepOn2RecordProxyProvider : public edm::eventsetup::DataProxyProvider {
+  public:
+    DepOn2RecordProxyProvider() { usingRecord<DepOn2Record>(); }
+    void newInterval(const edm::eventsetup::EventSetupRecordKey& /*iRecordType*/,
+                     const edm::ValidityInterval& /*iInterval*/) {
+      //do nothing
+    }
+
+  protected:
+    void registerProxies(const edm::eventsetup::EventSetupRecordKey&, KeyedProxies& /*iHolder*/) {}
+  };
+
+  class DepRecordFinder : public edm::EventSetupRecordIntervalFinder {
+  public:
+    DepRecordFinder() : edm::EventSetupRecordIntervalFinder(), interval_() { this->findingRecord<DepRecord>(); }
+
+    void setInterval(const edm::ValidityInterval& iInterval) { interval_ = iInterval; }
+
+  protected:
+    virtual void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
+                                const edm::IOVSyncValue& iTime,
+                                edm::ValidityInterval& iInterval) {
+      if (interval_.validFor(iTime)) {
+        iInterval = interval_;
+      } else {
+        if (interval_.last() == edm::IOVSyncValue::invalidIOVSyncValue() &&
+            interval_.first() != edm::IOVSyncValue::invalidIOVSyncValue() && interval_.first() <= iTime) {
+          iInterval = interval_;
+        } else {
+          iInterval = edm::ValidityInterval();
+        }
+      }
+    }
+
+  private:
+    edm::ValidityInterval interval_;
+  };
+
+  class Dummy2RecordFinder : public edm::EventSetupRecordIntervalFinder {
+  public:
+    Dummy2RecordFinder() : edm::EventSetupRecordIntervalFinder(), interval_() { this->findingRecord<Dummy2Record>(); }
+
+    void setInterval(const edm::ValidityInterval& iInterval) { interval_ = iInterval; }
+
+  protected:
+    virtual void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
+                                const edm::IOVSyncValue& iTime,
+                                edm::ValidityInterval& iInterval) {
+      if (interval_.validFor(iTime)) {
+        iInterval = interval_;
+      } else {
+        if (interval_.last() == edm::IOVSyncValue::invalidIOVSyncValue() &&
+            interval_.first() != edm::IOVSyncValue::invalidIOVSyncValue() && interval_.first() <= iTime) {
+          iInterval = interval_;
+        } else {
+          iInterval = edm::ValidityInterval();
+        }
+      }
+    }
+
+  private:
+    edm::ValidityInterval interval_;
+  };
+}  // namespace
+
+using namespace edm::eventsetup;
+void testdependentrecord::dependentConstructorTest() {
+  EventSetupRecordProvider depProvider(DepRecord::keyForClass());
+
+  CPPUNIT_ASSERT(1 == depProvider.dependentRecords().size());
+  CPPUNIT_ASSERT(*(depProvider.dependentRecords().begin()) == DummyRecord::keyForClass());
+
+  edm::print_eventsetup_record_dependencies<DepRecord>(std::cout);
+}
+
+void testdependentrecord::dependentFinder1Test() {
+  auto dummyProvider = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
+  const edm::EventID eID_1(1, 1, 1);
+  const edm::IOVSyncValue sync_1(eID_1);
+  const edm::EventID eID_3(1, 1, 3);
+  const edm::ValidityInterval definedInterval(sync_1, edm::IOVSyncValue(eID_3));
+  std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
+  dummyFinder->setInterval(definedInterval);
+  dummyProvider->addFinder(dummyFinder);
+
+  const EventSetupRecordKey depRecordKey = DepRecord::keyForClass();
+  DependentRecordIntervalFinder finder(depRecordKey);
+  finder.addProviderWeAreDependentOn(dummyProvider);
+
+  CPPUNIT_ASSERT(definedInterval == finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 2))));
+
+  dummyFinder->setInterval(edm::ValidityInterval::invalidInterval());
+  CPPUNIT_ASSERT(edm::ValidityInterval::invalidInterval() ==
+                 finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 4))));
+
+  const edm::EventID eID_5(1, 1, 5);
+  const edm::IOVSyncValue sync_5(eID_5);
+  const edm::ValidityInterval unknownedEndInterval(sync_5, edm::IOVSyncValue::invalidIOVSyncValue());
+  dummyFinder->setInterval(unknownedEndInterval);
+
+  CPPUNIT_ASSERT(unknownedEndInterval ==
+                 finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 5))));
+}
+
+void testdependentrecord::dependentFinder2Test() {
+  auto dummyProvider1 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
+
+  const edm::EventID eID_1(1, 1, 1);
+  const edm::IOVSyncValue sync_1(eID_1);
+  const edm::ValidityInterval definedInterval1(sync_1, edm::IOVSyncValue(edm::EventID(1, 1, 5)));
+  dummyProvider1->setValidityInterval(definedInterval1);
+
+  auto dummyProvider2 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
+
+  const edm::EventID eID_2(1, 1, 2);
+  const edm::IOVSyncValue sync_2(eID_2);
+  const edm::ValidityInterval definedInterval2(sync_2, edm::IOVSyncValue(edm::EventID(1, 1, 6)));
+  dummyProvider2->setValidityInterval(definedInterval2);
+
+  const edm::ValidityInterval overlapInterval(std::max(definedInterval1.first(), definedInterval2.first()),
+                                              std::min(definedInterval1.last(), definedInterval2.last()));
+
+  const EventSetupRecordKey depRecordKey = DepRecord::keyForClass();
+
+  DependentRecordIntervalFinder finder(depRecordKey);
+  finder.addProviderWeAreDependentOn(dummyProvider1);
+  finder.addProviderWeAreDependentOn(dummyProvider2);
+
+  CPPUNIT_ASSERT(overlapInterval == finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 4))));
+}
+
+void testdependentrecord::timeAndRunTest() {
+  //test case where we have two providers, one synching on time the other on run/lumi/event
+  auto dummyProvider1 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
+
+  const edm::EventID eID_1(1, 1, 1);
+  const edm::IOVSyncValue sync_1(eID_1);
+  const edm::ValidityInterval definedInterval1(sync_1, edm::IOVSyncValue(edm::EventID(1, 1, 5)));
+  dummyProvider1->setValidityInterval(definedInterval1);
+
+  auto dummyProvider2 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
+
+  const edm::Timestamp time_1(1);
+  const edm::IOVSyncValue sync_2(time_1);
+  const edm::ValidityInterval definedInterval2(sync_2, edm::IOVSyncValue(edm::Timestamp(6)));
+  dummyProvider2->setValidityInterval(definedInterval2);
+
+  const edm::ValidityInterval overlapInterval(definedInterval2.first(), edm::IOVSyncValue::invalidIOVSyncValue());
+
+  const EventSetupRecordKey depRecordKey = DepRecord::keyForClass();
+
+  DependentRecordIntervalFinder finder(depRecordKey);
+  finder.addProviderWeAreDependentOn(dummyProvider1);
+  finder.addProviderWeAreDependentOn(dummyProvider2);
+
+  CPPUNIT_ASSERT(overlapInterval ==
+                 finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 4), edm::Timestamp(3))));
+
+  //should give back same interval
+  CPPUNIT_ASSERT(overlapInterval ==
+                 finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 4), edm::Timestamp(4))));
+
+  //should give back same interval
+  CPPUNIT_ASSERT(overlapInterval ==
+                 finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 2), edm::Timestamp(3))));
+
+  //should give back same interval
+  CPPUNIT_ASSERT(overlapInterval ==
+                 finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 1), edm::Timestamp(2))));
+
+  //Change only run/lumi/event based provider
+  const edm::ValidityInterval definedInterval3(edm::IOVSyncValue(edm::EventID(1, 1, 6)),
+                                               edm::IOVSyncValue(edm::EventID(1, 1, 10)));
+  dummyProvider1->setValidityInterval(definedInterval3);
+
+  const edm::ValidityInterval overlapInterval2(definedInterval3.first(), edm::IOVSyncValue::invalidIOVSyncValue());
+
+  CPPUNIT_ASSERT(overlapInterval2 ==
+                 finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 6), edm::Timestamp(5))));
+
+  //Change only time based provider
+  const edm::ValidityInterval definedInterval4(edm::IOVSyncValue(edm::Timestamp(7)),
+                                               edm::IOVSyncValue(edm::Timestamp(10)));
+  dummyProvider2->setValidityInterval(definedInterval4);
+
+  const edm::ValidityInterval overlapInterval3(definedInterval4.first(), edm::IOVSyncValue::invalidIOVSyncValue());
+
+  CPPUNIT_ASSERT(overlapInterval3 ==
+                 finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 7), edm::Timestamp(7))));
+  //Change both but make run/lumi/event 'closer' by having same lumi
+  {
+    const edm::ValidityInterval runLumiInterval(edm::IOVSyncValue(edm::EventID(1, 2, 11)),
+                                                edm::IOVSyncValue(edm::EventID(1, 3, 20)));
+    dummyProvider1->setValidityInterval(runLumiInterval);
+
+    const edm::ValidityInterval timeInterval(edm::IOVSyncValue(edm::Timestamp(1ULL << 32)),
+                                             edm::IOVSyncValue(edm::Timestamp(5ULL << 32)));
+    dummyProvider2->setValidityInterval(timeInterval);
+
+    const edm::ValidityInterval overlapInterval(runLumiInterval.first(), edm::IOVSyncValue::invalidIOVSyncValue());
+
+    CPPUNIT_ASSERT(
+        overlapInterval ==
+        finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 2, 12), edm::Timestamp(3ULL << 32))));
   }
-  void newInterval(const edm::eventsetup::EventSetupRecordKey& /*iRecordType*/,
-  const edm::ValidityInterval& /*iInterval*/) {
-    //do nothing
+
+  //Change both but make time 'closer'
+  {
+    const edm::ValidityInterval runLumiInterval(edm::IOVSyncValue(edm::EventID(1, 3, 21)),
+                                                edm::IOVSyncValue(edm::EventID(1, 10, 40)));
+    dummyProvider1->setValidityInterval(runLumiInterval);
+
+    const edm::ValidityInterval timeInterval(edm::IOVSyncValue(edm::Timestamp(7ULL << 32)),
+                                             edm::IOVSyncValue(edm::Timestamp(10ULL << 32)));
+    dummyProvider2->setValidityInterval(timeInterval);
+
+    const edm::ValidityInterval overlapInterval(timeInterval.first(), edm::IOVSyncValue::invalidIOVSyncValue());
+
+    CPPUNIT_ASSERT(
+        overlapInterval ==
+        finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 4, 30), edm::Timestamp(8ULL << 32))));
   }
-protected:
-void registerProxies(const edm::eventsetup::EventSetupRecordKey&, KeyedProxies& /*iHolder*/) {
-}
 
-};
+  //Change both but make run/lumi/event 'closer'
+  {
+    const edm::ValidityInterval runLumiInterval(edm::IOVSyncValue(edm::EventID(1, 11, 41)),
+                                                edm::IOVSyncValue(edm::EventID(1, 20, 60)));
+    dummyProvider1->setValidityInterval(runLumiInterval);
 
-class DepRecordFinder : public edm::EventSetupRecordIntervalFinder {
-public:
-  DepRecordFinder() :edm::EventSetupRecordIntervalFinder(), interval_() {
-    this->findingRecord<DepRecord>();
+    const edm::ValidityInterval timeInterval(edm::IOVSyncValue(edm::Timestamp(11ULL << 32)),
+                                             edm::IOVSyncValue(edm::Timestamp(100ULL << 32)));
+    dummyProvider2->setValidityInterval(timeInterval);
+
+    const edm::ValidityInterval overlapInterval(runLumiInterval.first(), edm::IOVSyncValue::invalidIOVSyncValue());
+
+    CPPUNIT_ASSERT(
+        overlapInterval ==
+        finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 12, 50), edm::Timestamp(70ULL << 32))));
   }
-  
-  void setInterval(const edm::ValidityInterval& iInterval) {
-    interval_ = iInterval;
+
+  //Change both and make it ambiguous because of different run #
+  {
+    const edm::ValidityInterval runLumiInterval(edm::IOVSyncValue(edm::EventID(2, 1, 0)),
+                                                edm::IOVSyncValue(edm::EventID(6, 0, 0)));
+    dummyProvider1->setValidityInterval(runLumiInterval);
+
+    const edm::ValidityInterval timeInterval(edm::IOVSyncValue(edm::Timestamp(200ULL << 32)),
+                                             edm::IOVSyncValue(edm::Timestamp(500ULL << 32)));
+    dummyProvider2->setValidityInterval(timeInterval);
+
+    const edm::ValidityInterval overlapInterval(timeInterval.first(), edm::IOVSyncValue::invalidIOVSyncValue());
+
+    CPPUNIT_ASSERT(
+        overlapInterval ==
+        finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(4, 12, 50), edm::Timestamp(400ULL << 32))));
   }
-protected:
-  virtual void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
-                              const edm::IOVSyncValue& iTime, 
-                              edm::ValidityInterval& iInterval) {
-    if(interval_.validFor(iTime)) {
-      iInterval = interval_;
-    } else {
-      if(interval_.last() == edm::IOVSyncValue::invalidIOVSyncValue() &&
-         interval_.first() != edm::IOVSyncValue::invalidIOVSyncValue() &&
-         interval_.first() <= iTime) {
-        iInterval = interval_;
-      }else {
-        iInterval = edm::ValidityInterval();
-      }
-    }
+
+  //First reset back to the state expected by the following tests
+  dummyProvider1->setValidityInterval(definedInterval3);
+  dummyProvider2->setValidityInterval(definedInterval4);
+  CPPUNIT_ASSERT(overlapInterval3 ==
+                 finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 7), edm::Timestamp(7))));
+
+  //check with invalid intervals
+  const edm::ValidityInterval invalid(edm::IOVSyncValue::invalidIOVSyncValue(),
+                                      edm::IOVSyncValue::invalidIOVSyncValue());
+  dummyProvider1->setValidityInterval(invalid);
+  CPPUNIT_ASSERT(overlapInterval3 ==
+                 finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 11), edm::Timestamp(8))));
+
+  const edm::ValidityInterval definedInterval5(edm::IOVSyncValue(edm::EventID(1, 1, 12)),
+                                               edm::IOVSyncValue(edm::EventID(1, 1, 20)));
+  dummyProvider1->setValidityInterval(definedInterval5);
+  dummyProvider2->setValidityInterval(invalid);
+  const edm::ValidityInterval overlapInterval4(definedInterval5.first(), edm::IOVSyncValue::invalidIOVSyncValue());
+
+  CPPUNIT_ASSERT(overlapInterval4 ==
+                 finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 13), edm::Timestamp(11))));
+
+  {
+    //check for bug which only happens the first time we synchronize
+    // have the second one invalid
+    auto dummyProvider1 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
+
+    const edm::EventID eID_1(1, 1, 1);
+    const edm::IOVSyncValue sync_1(eID_1);
+    const edm::ValidityInterval definedInterval1(sync_1, edm::IOVSyncValue(edm::EventID(1, 1, 6)));
+    dummyProvider1->setValidityInterval(definedInterval1);
+
+    auto dummyProvider2 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
+
+    dummyProvider2->setValidityInterval(invalid);
+
+    const edm::ValidityInterval overlapInterval(definedInterval1.first(), edm::IOVSyncValue::invalidIOVSyncValue());
+
+    const EventSetupRecordKey depRecordKey = DepRecord::keyForClass();
+
+    DependentRecordIntervalFinder finder(depRecordKey);
+    finder.addProviderWeAreDependentOn(dummyProvider1);
+    finder.addProviderWeAreDependentOn(dummyProvider2);
+
+    CPPUNIT_ASSERT(overlapInterval ==
+                   finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 4), edm::Timestamp(1))));
+
+    const edm::Timestamp time_1(2);
+    const edm::IOVSyncValue sync_2(time_1);
+    const edm::ValidityInterval definedInterval2(sync_2, edm::IOVSyncValue(edm::Timestamp(6)));
+    dummyProvider2->setValidityInterval(definedInterval2);
+
+    const edm::ValidityInterval overlapInterval2(definedInterval2.first(), edm::IOVSyncValue::invalidIOVSyncValue());
+
+    CPPUNIT_ASSERT(overlapInterval2 ==
+                   finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 5), edm::Timestamp(3))));
   }
-private:
-  edm::ValidityInterval interval_;   
-};
+  {
+    //check for bug which only happens the first time we synchronize
+    // have the  first one invalid
 
+    auto dummyProvider1 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
 
-class Dummy2RecordFinder : public edm::EventSetupRecordIntervalFinder {
-public:
-  Dummy2RecordFinder() :edm::EventSetupRecordIntervalFinder(), interval_() {
-    this->findingRecord<Dummy2Record>();
+    dummyProvider1->setValidityInterval(invalid);
+
+    auto dummyProvider2 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
+
+    const edm::Timestamp time_1(1);
+    const edm::IOVSyncValue sync_2(time_1);
+    const edm::ValidityInterval definedInterval2(sync_2, edm::IOVSyncValue(edm::Timestamp(6)));
+    dummyProvider2->setValidityInterval(definedInterval2);
+
+    const edm::ValidityInterval overlapInterval(definedInterval2.first(), edm::IOVSyncValue::invalidIOVSyncValue());
+
+    const EventSetupRecordKey depRecordKey = DepRecord::keyForClass();
+
+    DependentRecordIntervalFinder finder(depRecordKey);
+    finder.addProviderWeAreDependentOn(dummyProvider1);
+    finder.addProviderWeAreDependentOn(dummyProvider2);
+
+    CPPUNIT_ASSERT(overlapInterval ==
+                   finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 4), edm::Timestamp(3))));
+
+    const edm::EventID eID_1(1, 1, 5);
+    const edm::IOVSyncValue sync_1(eID_1);
+    const edm::ValidityInterval definedInterval1(sync_1, edm::IOVSyncValue(edm::EventID(1, 1, 10)));
+    dummyProvider1->setValidityInterval(definedInterval1);
+
+    const edm::ValidityInterval overlapInterval2(definedInterval2.first(), edm::IOVSyncValue::invalidIOVSyncValue());
+
+    CPPUNIT_ASSERT(overlapInterval2 ==
+                   finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 5), edm::Timestamp(4))));
   }
-  
-  void setInterval(const edm::ValidityInterval& iInterval) {
-    interval_ = iInterval;
+
+  {
+    //check that going all the way through EventSetup works properly
+    edm::eventsetup::EventSetupProvider provider(&activityRegistry);
+    std::shared_ptr<edm::eventsetup::DataProxyProvider> dummyProv = std::make_shared<DummyProxyProvider>();
+    provider.add(dummyProv);
+
+    std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
+    dummyFinder->setInterval(
+        edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(1, 1, 1)), edm::IOVSyncValue(edm::EventID(1, 1, 5))));
+    provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>(dummyFinder));
+
+    std::shared_ptr<edm::eventsetup::DataProxyProvider> depProv = std::make_shared<DepOn2RecordProxyProvider>();
+    provider.add(depProv);
+
+    std::shared_ptr<Dummy2RecordFinder> dummy2Finder = std::make_shared<Dummy2RecordFinder>();
+    dummy2Finder->setInterval(
+        edm::ValidityInterval(edm::IOVSyncValue(edm::Timestamp(1)), edm::IOVSyncValue(edm::Timestamp(5))));
+    provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>(dummy2Finder));
+    {
+      const edm::EventSetup eventSetup1{
+          provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1), edm::Timestamp(1))), 0, nullptr};
+      long long id1 = eventSetup1.get<DepOn2Record>().cacheIdentifier();
+
+      const edm::EventSetup eventSetup2{
+          provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1), edm::Timestamp(2))), 0, nullptr};
+      long long id2 = eventSetup2.get<DepOn2Record>().cacheIdentifier();
+      CPPUNIT_ASSERT(id1 == id2);
+
+      const edm::EventSetup eventSetup3{
+          provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 2), edm::Timestamp(2))), 0, nullptr};
+      long long id3 = eventSetup3.get<DepOn2Record>().cacheIdentifier();
+      CPPUNIT_ASSERT(id1 == id3);
+
+      dummy2Finder->setInterval(
+          edm::ValidityInterval(edm::IOVSyncValue(edm::Timestamp(6)), edm::IOVSyncValue(edm::Timestamp(10))));
+
+      const edm::EventSetup eventSetup4{
+          provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 4), edm::Timestamp(7))), 0, nullptr};
+      long long id4 = eventSetup4.get<DepOn2Record>().cacheIdentifier();
+      CPPUNIT_ASSERT(id1 != id4);
+
+      dummyFinder->setInterval(
+          edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(1, 1, 6)), edm::IOVSyncValue(edm::EventID(1, 1, 10))));
+
+      const edm::EventSetup eventSetup5{
+          provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 7), edm::Timestamp(8))), 0, nullptr};
+      long long id5 = eventSetup5.get<DepOn2Record>().cacheIdentifier();
+      CPPUNIT_ASSERT(id4 != id5);
+    }
   }
-protected:
-  virtual void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
-                              const edm::IOVSyncValue& iTime, 
-                              edm::ValidityInterval& iInterval) {
-    if(interval_.validFor(iTime)) {
-      iInterval = interval_;
-    } else {
-      if(interval_.last() == edm::IOVSyncValue::invalidIOVSyncValue() &&
-         interval_.first() != edm::IOVSyncValue::invalidIOVSyncValue() &&
-         interval_.first() <= iTime) {
-        iInterval = interval_;
-      }else {
-        iInterval = edm::ValidityInterval();
-      }
+
+  {
+    //check that going all the way through EventSetup works properly
+    // using two records with open ended IOVs
+    edm::eventsetup::EventSetupProvider provider(&activityRegistry);
+    std::shared_ptr<edm::eventsetup::DataProxyProvider> dummyProv = std::make_shared<DummyProxyProvider>();
+    provider.add(dummyProv);
+
+    std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
+    dummyFinder->setInterval(
+        edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(1, 1, 1)), edm::IOVSyncValue::invalidIOVSyncValue()));
+    provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>(dummyFinder));
+
+    std::shared_ptr<edm::eventsetup::DataProxyProvider> depProv = std::make_shared<DepOn2RecordProxyProvider>();
+    provider.add(depProv);
+
+    std::shared_ptr<Dummy2RecordFinder> dummy2Finder = std::make_shared<Dummy2RecordFinder>();
+    dummy2Finder->setInterval(
+        edm::ValidityInterval(edm::IOVSyncValue(edm::Timestamp(1)), edm::IOVSyncValue::invalidIOVSyncValue()));
+    provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>(dummy2Finder));
+    {
+      const edm::EventSetup eventSetup1{
+          provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1), edm::Timestamp(1))), 0, nullptr};
+      long long id1 = eventSetup1.get<DepOn2Record>().cacheIdentifier();
+
+      const edm::EventSetup eventSetup2{
+          provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1), edm::Timestamp(2))), 0, nullptr};
+      long long id2 = eventSetup2.get<DepOn2Record>().cacheIdentifier();
+      CPPUNIT_ASSERT(id1 == id2);
+
+      const edm::EventSetup eventSetup3{
+          provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 2), edm::Timestamp(2))), 0, nullptr};
+      long long id3 = eventSetup3.get<DepOn2Record>().cacheIdentifier();
+      CPPUNIT_ASSERT(id1 == id3);
+
+      dummy2Finder->setInterval(
+          edm::ValidityInterval(edm::IOVSyncValue(edm::Timestamp(6)), edm::IOVSyncValue::invalidIOVSyncValue()));
+
+      const edm::EventSetup eventSetup4{
+          provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 4), edm::Timestamp(7))), 0, nullptr};
+      long long id4 = eventSetup4.get<DepOn2Record>().cacheIdentifier();
+      CPPUNIT_ASSERT(id1 != id4);
+
+      dummyFinder->setInterval(
+          edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(1, 1, 6)), edm::IOVSyncValue::invalidIOVSyncValue()));
+
+      const edm::EventSetup eventSetup5{
+          provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 7), edm::Timestamp(8))), 0, nullptr};
+      long long id5 = eventSetup5.get<DepOn2Record>().cacheIdentifier();
+      CPPUNIT_ASSERT(id4 != id5);
     }
   }
-private:
-  edm::ValidityInterval interval_;   
-};
 }
 
-using namespace edm::eventsetup;
-void testdependentrecord::dependentConstructorTest()
-{
-   EventSetupRecordProvider depProvider(DepRecord::keyForClass());
-   
-   CPPUNIT_ASSERT(1 == depProvider.dependentRecords().size());
-   CPPUNIT_ASSERT(*(depProvider.dependentRecords().begin()) == DummyRecord::keyForClass());
-   
-   edm::print_eventsetup_record_dependencies<DepRecord>(std::cout);
-}
+void testdependentrecord::dependentSetproviderTest() {
+  auto depProvider = std::make_unique<EventSetupRecordProvider>(DepRecord::keyForClass());
+
+  auto dummyProvider = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
 
+  std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
+  dummyFinder->setInterval(
+      edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(1, 1, 1)), edm::IOVSyncValue(edm::EventID(1, 1, 3))));
+  dummyProvider->addFinder(dummyFinder);
 
-void testdependentrecord::dependentFinder1Test()
-{
-   auto dummyProvider = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
-   const edm::EventID eID_1(1, 1, 1);
-   const edm::IOVSyncValue sync_1(eID_1);
-   const edm::EventID eID_3(1, 1, 3);
-   const edm::ValidityInterval definedInterval(sync_1, 
-                                                edm::IOVSyncValue(eID_3));
-   std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
-   dummyFinder->setInterval(definedInterval);
-   dummyProvider->addFinder(dummyFinder);
-   
-   const EventSetupRecordKey depRecordKey = DepRecord::keyForClass();
-   DependentRecordIntervalFinder finder(depRecordKey);
-   finder.addProviderWeAreDependentOn(dummyProvider);
-   
-   CPPUNIT_ASSERT(definedInterval == finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 2)))); 
-
-   dummyFinder->setInterval(edm::ValidityInterval::invalidInterval());
-   CPPUNIT_ASSERT(edm::ValidityInterval::invalidInterval() == finder.findIntervalFor(depRecordKey, 
-                                                                                     edm::IOVSyncValue(edm::EventID(1, 1, 4))));
-   
-   const edm::EventID eID_5(1, 1, 5);
-   const edm::IOVSyncValue sync_5(eID_5);
-   const edm::ValidityInterval unknownedEndInterval(sync_5 ,
-                                                     edm::IOVSyncValue::invalidIOVSyncValue());
-   dummyFinder->setInterval(unknownedEndInterval);
-
-   CPPUNIT_ASSERT(unknownedEndInterval == finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 5))));
+  CPPUNIT_ASSERT(*(depProvider->dependentRecords().begin()) == dummyProvider->key());
 
+  std::vector<std::shared_ptr<EventSetupRecordProvider> > providers;
+  providers.push_back(dummyProvider);
+  depProvider->setDependentProviders(providers);
 }
 
-void testdependentrecord::dependentFinder2Test()
-{
-   auto dummyProvider1 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
-   
-   const edm::EventID eID_1(1, 1, 1);
-   const edm::IOVSyncValue sync_1(eID_1);
-   const edm::ValidityInterval definedInterval1(sync_1, 
-                                                 edm::IOVSyncValue(edm::EventID(1, 1, 5)));
-   dummyProvider1->setValidityInterval(definedInterval1);
-   
-   auto dummyProvider2 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
-   
-   const edm::EventID eID_2(1, 1, 2);
-   const edm::IOVSyncValue sync_2(eID_2);
-   const edm::ValidityInterval definedInterval2(sync_2, 
-                                                 edm::IOVSyncValue(edm::EventID(1, 1, 6)));
-   dummyProvider2->setValidityInterval(definedInterval2);
-
-   const edm::ValidityInterval overlapInterval(std::max(definedInterval1.first(), definedInterval2.first()),
-                                                std::min(definedInterval1.last(), definedInterval2.last()));
-   
-   const EventSetupRecordKey depRecordKey = DepRecord::keyForClass();
-                                                     
-   DependentRecordIntervalFinder finder(depRecordKey);
-   finder.addProviderWeAreDependentOn(dummyProvider1);
-   finder.addProviderWeAreDependentOn(dummyProvider2);
-   
-   CPPUNIT_ASSERT(overlapInterval == finder.findIntervalFor(depRecordKey, 
-                                                            edm::IOVSyncValue(edm::EventID(1, 1, 4))));
+void testdependentrecord::getTest() {
+  edm::eventsetup::EventSetupProvider provider(&activityRegistry);
+  std::shared_ptr<edm::eventsetup::DataProxyProvider> dummyProv = std::make_shared<DummyProxyProvider>();
+  provider.add(dummyProv);
+
+  std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
+  dummyFinder->setInterval(
+      edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(1, 1, 1)), edm::IOVSyncValue(edm::EventID(1, 1, 3))));
+  provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>(dummyFinder));
+
+  std::shared_ptr<edm::eventsetup::DataProxyProvider> depProv = std::make_shared<DepRecordProxyProvider>();
+  provider.add(depProv);
+  {
+    const edm::EventSetup eventSetup{
+        provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1))), 0, nullptr};
+    const DepRecord& depRecord = eventSetup.get<DepRecord>();
+
+    depRecord.getRecord<DummyRecord>();
+
+    auto dr = depRecord.tryToGetRecord<DummyRecord>();
+    CPPUNIT_ASSERT(dr.has_value());
+  }
+  {
+    const edm::EventSetup eventSetup{
+        provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 4))), 0, nullptr};
+    CPPUNIT_ASSERT_THROW(eventSetup.get<DepRecord>(), edm::eventsetup::NoRecordException<DepRecord>);
+  }
 }
 
+namespace {
+  template <typename RECORD>
+  struct DummyDataConsumer : public edm::EDConsumerBase {
+    explicit DummyDataConsumer(edm::ESInputTag const& iTag)
+        : m_token{esConsumes<edm::eventsetup::test::DummyData, RECORD>(iTag)} {}
+
+    edm::ESGetToken<edm::eventsetup::test::DummyData, RECORD> m_token;
+  };
+
+  template <typename RECORD1, typename RECORD2>
+  struct DummyDataConsumer2 : public edm::EDConsumerBase {
+    explicit DummyDataConsumer2(edm::ESInputTag const& iTag1, edm::ESInputTag const& iTag2)
+        : m_token1{esConsumes<edm::eventsetup::test::DummyData, RECORD1>(iTag1)},
+          m_token2{esConsumes<edm::eventsetup::test::DummyData, RECORD2>(iTag2)} {}
+
+    edm::ESGetToken<edm::eventsetup::test::DummyData, RECORD1> m_token1;
+    edm::ESGetToken<edm::eventsetup::test::DummyData, RECORD2> m_token2;
+  };
+}  // namespace
+
+void testdependentrecord::getDataWithESGetTokenTest() {
+  using edm::eventsetup::test::DummyData;
+  using edm::eventsetup::test::DummyProxyProvider;
+  DummyData kGood{1};
+  DummyData kBad{0};
 
-void testdependentrecord::timeAndRunTest()
-{
-  //test case where we have two providers, one synching on time the other on run/lumi/event
-   auto dummyProvider1 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
-   
-   const edm::EventID eID_1(1, 1, 1);
-   const edm::IOVSyncValue sync_1(eID_1);
-   const edm::ValidityInterval definedInterval1(sync_1, 
-                                                 edm::IOVSyncValue(edm::EventID(1, 1, 5)));
-   dummyProvider1->setValidityInterval(definedInterval1);
-   
-   auto dummyProvider2 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
-
-   
-   const edm::Timestamp time_1(1);
-   const edm::IOVSyncValue sync_2(time_1);
-   const edm::ValidityInterval definedInterval2(sync_2, 
-						edm::IOVSyncValue(edm::Timestamp(6)));
-   dummyProvider2->setValidityInterval(definedInterval2);
-
-   const edm::ValidityInterval overlapInterval(definedInterval2.first(),
-					       edm::IOVSyncValue::invalidIOVSyncValue());
-   
-   const EventSetupRecordKey depRecordKey = DepRecord::keyForClass();
-                                                     
-   DependentRecordIntervalFinder finder(depRecordKey);
-   finder.addProviderWeAreDependentOn(dummyProvider1);
-   finder.addProviderWeAreDependentOn(dummyProvider2);
-   
-   CPPUNIT_ASSERT(overlapInterval == finder.findIntervalFor(depRecordKey, 
-                                                            edm::IOVSyncValue(edm::EventID(1, 1, 4),edm::Timestamp(3))));
-
-   //should give back same interval
-   CPPUNIT_ASSERT(overlapInterval == finder.findIntervalFor(depRecordKey, 
-                                                            edm::IOVSyncValue(edm::EventID(1, 1, 4),edm::Timestamp(4))));
-
-   //should give back same interval
-   CPPUNIT_ASSERT(overlapInterval == finder.findIntervalFor(depRecordKey, 
-                                                            edm::IOVSyncValue(edm::EventID(1, 1, 2),edm::Timestamp(3))));
-
-   //should give back same interval
-   CPPUNIT_ASSERT(overlapInterval == finder.findIntervalFor(depRecordKey, 
-                                                            edm::IOVSyncValue(edm::EventID(1, 1, 1),edm::Timestamp(2))));
-
-   //Change only run/lumi/event based provider
-   const edm::ValidityInterval definedInterval3( edm::IOVSyncValue(edm::EventID(1,1,6)), 
-                                                 edm::IOVSyncValue(edm::EventID(1, 1, 10)));
-   dummyProvider1->setValidityInterval(definedInterval3);
-
-   const edm::ValidityInterval overlapInterval2(definedInterval3.first(),
-					       edm::IOVSyncValue::invalidIOVSyncValue());
-
-   CPPUNIT_ASSERT(overlapInterval2 == finder.findIntervalFor(depRecordKey, 
-                                                            edm::IOVSyncValue(edm::EventID(1, 1, 6),edm::Timestamp(5))));
-
-   //Change only time based provider
-   const edm::ValidityInterval definedInterval4(edm::IOVSyncValue(edm::Timestamp(7)), 
-						edm::IOVSyncValue(edm::Timestamp(10)));
-   dummyProvider2->setValidityInterval(definedInterval4);
-
-   const edm::ValidityInterval overlapInterval3(definedInterval4.first(),
-					       edm::IOVSyncValue::invalidIOVSyncValue());
-
-   CPPUNIT_ASSERT(overlapInterval3 == finder.findIntervalFor(depRecordKey, 
-                                                            edm::IOVSyncValue(edm::EventID(1, 1, 7),edm::Timestamp(7))));
-   //Change both but make run/lumi/event 'closer' by having same lumi
-   {
-      const edm::ValidityInterval runLumiInterval( edm::IOVSyncValue(edm::EventID(1,2,11)), 
-                                                   edm::IOVSyncValue(edm::EventID(1, 3, 20)));
-      dummyProvider1->setValidityInterval(runLumiInterval);
-      
-      const edm::ValidityInterval timeInterval(edm::IOVSyncValue(edm::Timestamp(1ULL<<32)), 
-                                                   edm::IOVSyncValue(edm::Timestamp(5ULL<<32)));
-      dummyProvider2->setValidityInterval(timeInterval);
-
-      const edm::ValidityInterval overlapInterval(runLumiInterval.first(),
-                                                   edm::IOVSyncValue::invalidIOVSyncValue());
-      
-      CPPUNIT_ASSERT(overlapInterval == finder.findIntervalFor(depRecordKey, 
-                                                                edm::IOVSyncValue(edm::EventID(1, 2, 12),edm::Timestamp(3ULL<<32))));
-      
-   }
-
-   //Change both but make time 'closer'
-   {
-      const edm::ValidityInterval runLumiInterval( edm::IOVSyncValue(edm::EventID(1,3,21)), 
-                                                  edm::IOVSyncValue(edm::EventID(1, 10, 40)));
-      dummyProvider1->setValidityInterval(runLumiInterval);
-      
-      const edm::ValidityInterval timeInterval(edm::IOVSyncValue(edm::Timestamp(7ULL<<32)), 
-                                               edm::IOVSyncValue(edm::Timestamp(10ULL<<32)));
-      dummyProvider2->setValidityInterval(timeInterval);
-      
-      const edm::ValidityInterval overlapInterval(timeInterval.first(),
-                                                  edm::IOVSyncValue::invalidIOVSyncValue());
-      
-      CPPUNIT_ASSERT(overlapInterval == finder.findIntervalFor(depRecordKey, 
-                                                               edm::IOVSyncValue(edm::EventID(1, 4, 30),edm::Timestamp(8ULL<<32))));
-   }
-
-   //Change both but make run/lumi/event 'closer'
-   {
-      const edm::ValidityInterval runLumiInterval( edm::IOVSyncValue(edm::EventID(1,11,41)), 
-                                                  edm::IOVSyncValue(edm::EventID(1, 20, 60)));
-      dummyProvider1->setValidityInterval(runLumiInterval);
-      
-      const edm::ValidityInterval timeInterval(edm::IOVSyncValue(edm::Timestamp(11ULL<<32)), 
-                                               edm::IOVSyncValue(edm::Timestamp(100ULL<<32)));
-      dummyProvider2->setValidityInterval(timeInterval);
-      
-      const edm::ValidityInterval overlapInterval(runLumiInterval.first(),
-                                                  edm::IOVSyncValue::invalidIOVSyncValue());
-      
-      CPPUNIT_ASSERT(overlapInterval == finder.findIntervalFor(depRecordKey, 
-                                                               edm::IOVSyncValue(edm::EventID(1, 12, 50),edm::Timestamp(70ULL<<32))));
-   }
-
-   //Change both and make it ambiguous because of different run #
-   {
-      const edm::ValidityInterval runLumiInterval( edm::IOVSyncValue(edm::EventID(2,1,0)), 
-                                                  edm::IOVSyncValue(edm::EventID(6, 0, 0)));
-      dummyProvider1->setValidityInterval(runLumiInterval);
-      
-      const edm::ValidityInterval timeInterval(edm::IOVSyncValue(edm::Timestamp(200ULL<<32)), 
-                                               edm::IOVSyncValue(edm::Timestamp(500ULL<<32)));
-      dummyProvider2->setValidityInterval(timeInterval);
-      
-      const edm::ValidityInterval overlapInterval(timeInterval.first(),
-                                                  edm::IOVSyncValue::invalidIOVSyncValue());
-      
-      CPPUNIT_ASSERT(overlapInterval == finder.findIntervalFor(depRecordKey, 
-                                                               edm::IOVSyncValue(edm::EventID(4, 12, 50),edm::Timestamp(400ULL<<32))));
-   }
-   
-   //First reset back to the state expected by the following tests
-   dummyProvider1->setValidityInterval(definedInterval3);
-   dummyProvider2->setValidityInterval(definedInterval4);   
-   CPPUNIT_ASSERT(overlapInterval3 == finder.findIntervalFor(depRecordKey, 
-                                                             edm::IOVSyncValue(edm::EventID(1, 1, 7),edm::Timestamp(7))));
-   
-   //check with invalid intervals
-   const edm::ValidityInterval invalid(edm::IOVSyncValue::invalidIOVSyncValue(),edm::IOVSyncValue::invalidIOVSyncValue());
-   dummyProvider1->setValidityInterval(invalid);
-   CPPUNIT_ASSERT(overlapInterval3 == finder.findIntervalFor(depRecordKey, 
-                                                            edm::IOVSyncValue(edm::EventID(1, 1, 11),edm::Timestamp(8))));
-   
-   const edm::ValidityInterval definedInterval5( edm::IOVSyncValue(edm::EventID(1,1,12)), 
-                                                edm::IOVSyncValue(edm::EventID(1, 1, 20)));
-   dummyProvider1->setValidityInterval(definedInterval5);
-   dummyProvider2->setValidityInterval(invalid);
-   const edm::ValidityInterval overlapInterval4(definedInterval5.first(),
-					       edm::IOVSyncValue::invalidIOVSyncValue());
-
-   CPPUNIT_ASSERT(overlapInterval4 == finder.findIntervalFor(depRecordKey, 
-                                                            edm::IOVSyncValue(edm::EventID(1, 1, 13),edm::Timestamp(11))));
-   
-   {
-      //check for bug which only happens the first time we synchronize
-      // have the second one invalid
-      auto dummyProvider1 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
-
-      const edm::EventID eID_1(1, 1, 1);
-      const edm::IOVSyncValue sync_1(eID_1);
-      const edm::ValidityInterval definedInterval1(sync_1, 
-                                                    edm::IOVSyncValue(edm::EventID(1, 1, 6)));
-      dummyProvider1->setValidityInterval(definedInterval1);
-
-      auto dummyProvider2 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
-
-      dummyProvider2->setValidityInterval(invalid);
-
-      const edm::ValidityInterval overlapInterval(definedInterval1.first(),
-   					       edm::IOVSyncValue::invalidIOVSyncValue());
-
-      const EventSetupRecordKey depRecordKey = DepRecord::keyForClass();
-
-      DependentRecordIntervalFinder finder(depRecordKey);
-      finder.addProviderWeAreDependentOn(dummyProvider1);
-      finder.addProviderWeAreDependentOn(dummyProvider2);
-
-      CPPUNIT_ASSERT(overlapInterval == finder.findIntervalFor(depRecordKey, 
-                                                               edm::IOVSyncValue(edm::EventID(1, 1, 4),edm::Timestamp(1))));
-
-      const edm::Timestamp time_1(2);
-      const edm::IOVSyncValue sync_2(time_1);
-      const edm::ValidityInterval definedInterval2(sync_2, 
-   						edm::IOVSyncValue(edm::Timestamp(6)));
-      dummyProvider2->setValidityInterval(definedInterval2);
-
-      const edm::ValidityInterval overlapInterval2(definedInterval2.first(),
-   					       edm::IOVSyncValue::invalidIOVSyncValue());
-
-      CPPUNIT_ASSERT(overlapInterval2 == finder.findIntervalFor(depRecordKey, 
-                                                                edm::IOVSyncValue(edm::EventID(1, 1, 5),edm::Timestamp(3))));
-                     
-   }
-   {
-      //check for bug which only happens the first time we synchronize
-      // have the  first one invalid
-      
-      auto dummyProvider1 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
-
-      dummyProvider1->setValidityInterval(invalid);
-
-      auto dummyProvider2 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
-
-      const edm::Timestamp time_1(1);
-      const edm::IOVSyncValue sync_2(time_1);
-      const edm::ValidityInterval definedInterval2(sync_2, 
-   						edm::IOVSyncValue(edm::Timestamp(6)));
-      dummyProvider2->setValidityInterval(definedInterval2);
-
-      const edm::ValidityInterval overlapInterval(definedInterval2.first(),
-   					       edm::IOVSyncValue::invalidIOVSyncValue());
-
-      const EventSetupRecordKey depRecordKey = DepRecord::keyForClass();
-
-      DependentRecordIntervalFinder finder(depRecordKey);
-      finder.addProviderWeAreDependentOn(dummyProvider1);
-      finder.addProviderWeAreDependentOn(dummyProvider2);
-
-      CPPUNIT_ASSERT(overlapInterval == finder.findIntervalFor(depRecordKey, 
-                                                               edm::IOVSyncValue(edm::EventID(1, 1, 4),edm::Timestamp(3))));
-                                                               
-      const edm::EventID eID_1(1, 1, 5);
-      const edm::IOVSyncValue sync_1(eID_1);
-      const edm::ValidityInterval definedInterval1(sync_1, 
-                                                    edm::IOVSyncValue(edm::EventID(1, 1, 10)));
-      dummyProvider1->setValidityInterval(definedInterval1);
-      
-      const edm::ValidityInterval overlapInterval2(definedInterval2.first(),
-   					       edm::IOVSyncValue::invalidIOVSyncValue());
-
-      CPPUNIT_ASSERT(overlapInterval2 == finder.findIntervalFor(depRecordKey, 
-                                                               edm::IOVSyncValue(edm::EventID(1, 1, 5),edm::Timestamp(4))));
-      
-   }
-
-   {
-     //check that going all the way through EventSetup works properly
-     edm::eventsetup::EventSetupProvider provider(&activityRegistry);
-     std::shared_ptr<edm::eventsetup::DataProxyProvider> dummyProv = std::make_shared<DummyProxyProvider>();
-     provider.add(dummyProv);
-     
-     std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
-     dummyFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(1, 1, 1)), 
-						    edm::IOVSyncValue(edm::EventID(1, 1, 5))));
-     provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>(dummyFinder));
-     
-     std::shared_ptr<edm::eventsetup::DataProxyProvider> depProv = std::make_shared<DepOn2RecordProxyProvider>();
-     provider.add(depProv);
-
-     std::shared_ptr<Dummy2RecordFinder> dummy2Finder = std::make_shared<Dummy2RecordFinder>();
-     dummy2Finder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(edm::Timestamp( 1)), 
-						    edm::IOVSyncValue(edm::Timestamp( 5))));
-     provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>(dummy2Finder));
-     {
-       const auto&  eventSetup1 = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1), edm::Timestamp(1)));
-       long long id1 = eventSetup1.get<DepOn2Record>().cacheIdentifier();
-       
-
-       const auto&  eventSetup2 = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1), edm::Timestamp(2)));
-       long long id2 = eventSetup2.get<DepOn2Record>().cacheIdentifier();
-       CPPUNIT_ASSERT(id1 == id2);
-
-       const auto&  eventSetup3 = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 2), edm::Timestamp(2)));
-       long long id3 = eventSetup3.get<DepOn2Record>().cacheIdentifier();
-       CPPUNIT_ASSERT(id1 == id3);
-
-       dummy2Finder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(edm::Timestamp( 6)), 
-						       edm::IOVSyncValue(edm::Timestamp( 10))));
-
-       const auto&  eventSetup4 = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 4), edm::Timestamp(7)));
-       long long id4 = eventSetup4.get<DepOn2Record>().cacheIdentifier();
-       CPPUNIT_ASSERT(id1 != id4);
-
-       dummyFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(1, 1, 6)), 
-						      edm::IOVSyncValue(edm::EventID(1, 1, 10))));
-
-       const auto&  eventSetup5 = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 7), edm::Timestamp(8)));
-       long long id5 = eventSetup5.get<DepOn2Record>().cacheIdentifier();
-       CPPUNIT_ASSERT(id4 != id5);
-     }
-   }
-   
-   {
-      //check that going all the way through EventSetup works properly
-      // using two records with open ended IOVs
-      edm::eventsetup::EventSetupProvider provider(&activityRegistry);
-      std::shared_ptr<edm::eventsetup::DataProxyProvider> dummyProv = std::make_shared<DummyProxyProvider>();
+  edm::eventsetup::EventSetupProvider provider(&activityRegistry);
+  try {
+    {
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "testOne", true);
+      edm::ParameterSet ps;
+      ps.addParameter<std::string>("name", "test11");
+      ps.registerIt();
+      description.pid_ = ps.id();
+      auto dummyProv = std::make_shared<DummyProxyProvider>(kBad);
+      dummyProv->setDescription(description);
       provider.add(dummyProv);
-      
-      std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
-      dummyFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(1, 1, 1)), 
-                                                     edm::IOVSyncValue::invalidIOVSyncValue()));
-      provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>(dummyFinder));
-      
-      std::shared_ptr<edm::eventsetup::DataProxyProvider> depProv = std::make_shared<DepOn2RecordProxyProvider>();
-      provider.add(depProv);
-      
-      std::shared_ptr<Dummy2RecordFinder> dummy2Finder = std::make_shared<Dummy2RecordFinder>();
-      dummy2Finder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(edm::Timestamp( 1)), 
-                                                      edm::IOVSyncValue::invalidIOVSyncValue()));
-      provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>(dummy2Finder));
-      {
-         const auto&  eventSetup1 = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1), edm::Timestamp(1)));
-         long long id1 = eventSetup1.get<DepOn2Record>().cacheIdentifier();
-         
-         
-         const auto&  eventSetup2 = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1), edm::Timestamp(2)));
-         long long id2 = eventSetup2.get<DepOn2Record>().cacheIdentifier();
-         CPPUNIT_ASSERT(id1 == id2);
-         
-         const auto&  eventSetup3 = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 2), edm::Timestamp(2)));
-         long long id3 = eventSetup3.get<DepOn2Record>().cacheIdentifier();
-         CPPUNIT_ASSERT(id1 == id3);
-         
-         dummy2Finder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(edm::Timestamp( 6)), 
-                                                         edm::IOVSyncValue::invalidIOVSyncValue()));
-         
-         const auto&  eventSetup4 = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 4), edm::Timestamp(7)));
-         long long id4 = eventSetup4.get<DepOn2Record>().cacheIdentifier();
-         CPPUNIT_ASSERT(id1 != id4);
-         
-         dummyFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(1, 1, 6)), 
-                                                        edm::IOVSyncValue::invalidIOVSyncValue()));
-         
-         const auto&  eventSetup5 = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 7), edm::Timestamp(8)));
-         long long id5 = eventSetup5.get<DepOn2Record>().cacheIdentifier();
-         CPPUNIT_ASSERT(id4 != id5);
-      }
-   }
-   
+    }
+    {
+      edm::eventsetup::ComponentDescription description("DepRecordProxyProviderWithData", "testTwo", true);
+      edm::ParameterSet ps;
+      ps.addParameter<std::string>("name", "test22");
+      ps.addParameter<std::string>("appendToDataLabel", "blah");
+      ps.registerIt();
+      description.pid_ = ps.id();
+      auto dummyProv = std::make_shared<DepRecordProxyProviderWithData>(kGood);
+      dummyProv->setDescription(description);
+      dummyProv->setAppendToDataLabel(ps);
+      provider.add(dummyProv);
+    }
+    provider.finishConfiguration();
+
+    auto const& eventSetupImpl = provider.eventSetupForInstance(edm::IOVSyncValue::invalidIOVSyncValue());
+    {
+      DummyDataConsumer<DepRecord> consumer{edm::ESInputTag{"", "blah"}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& data = eventSetup.getData(consumer.m_token);
+      CPPUNIT_ASSERT(kGood.value_ == data.value_);
+    }
+    {
+      DummyDataConsumer<DummyRecord> consumer{edm::ESInputTag{"", ""}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& data = eventSetup.getData(consumer.m_token);
+      CPPUNIT_ASSERT(kBad.value_ == data.value_);
+    }
+    {
+      DummyDataConsumer<DepRecord> consumer{edm::ESInputTag{"", "blah"}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& depRecord = eventSetup.get<DepRecord>();
+      auto const& data = depRecord.get(consumer.m_token);
+      CPPUNIT_ASSERT(kGood.value_ == data.value_);
+    }
+    {
+      DummyDataConsumer<DummyRecord> consumer{edm::ESInputTag{"", ""}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& depRecord = eventSetup.get<DepRecord>();
+
+      auto const& data = depRecord.get(consumer.m_token);
+      CPPUNIT_ASSERT(kBad.value_ == data.value_);
+    }
+    {
+      DummyDataConsumer<DepRecord> consumer{edm::ESInputTag{"", "blah"}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& depRecord = eventSetup.get<DepRecord>();
+
+      auto const& data = depRecord.get(consumer.m_token);
+      CPPUNIT_ASSERT(kGood.value_ == data.value_);
+    }
+    {
+      DummyDataConsumer2<DummyRecord, DepRecord> consumer{edm::ESInputTag{"", ""}, edm::ESInputTag{"", "blah"}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& depRecord = eventSetup.get<DepRecord>();
+
+      auto const& data1 = depRecord.get(consumer.m_token1);
+      CPPUNIT_ASSERT(kBad.value_ == data1.value_);
+
+      auto const& data2 = depRecord.get(consumer.m_token2);
+      CPPUNIT_ASSERT(kGood.value_ == data2.value_);
+    }
+    {
+      DummyDataConsumer<DummyRecord> consumer{edm::ESInputTag{"DoesNotExist", ""}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& depRecord = eventSetup.get<DepRecord>();
+
+      CPPUNIT_ASSERT_THROW(depRecord.get(consumer.m_token), cms::Exception);
+    }
+    {
+      DummyDataConsumer<DepRecord> consumer{edm::ESInputTag{"DoesNotExist", "blah"}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& depRecord = eventSetup.get<DepRecord>();
+
+      CPPUNIT_ASSERT_THROW(depRecord.get(consumer.m_token), cms::Exception);
+    }
+  } catch (const cms::Exception& iException) {
+    std::cout << "caught " << iException.explainSelf() << std::endl;
+    throw;
+  }
 }
 
+void testdependentrecord::getHandleWithESGetTokenTest() {
+  using edm::eventsetup::test::DummyData;
+  using edm::eventsetup::test::DummyProxyProvider;
+  DummyData kGood{1};
+  DummyData kBad{0};
 
-void testdependentrecord::dependentSetproviderTest()
-{
-   auto depProvider = std::make_unique<EventSetupRecordProvider>(DepRecord::keyForClass());
-   
-   auto dummyProvider = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
-
-   std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
-   dummyFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(1, 1, 1)),
-                                                   edm::IOVSyncValue(edm::EventID(1, 1, 3))));
-   dummyProvider->addFinder(dummyFinder);
-   
-   CPPUNIT_ASSERT(*(depProvider->dependentRecords().begin()) == dummyProvider->key());
-   
-   std::vector< std::shared_ptr<EventSetupRecordProvider> > providers;
-   providers.push_back(dummyProvider);
-   depProvider->setDependentProviders(providers);
+  edm::eventsetup::EventSetupProvider provider(&activityRegistry);
+  try {
+    {
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "testOne", true);
+      edm::ParameterSet ps;
+      ps.addParameter<std::string>("name", "test11");
+      ps.registerIt();
+      description.pid_ = ps.id();
+      auto dummyProv = std::make_shared<DummyProxyProvider>(kBad);
+      dummyProv->setDescription(description);
+      provider.add(dummyProv);
+    }
+    {
+      edm::eventsetup::ComponentDescription description("DepRecordProxyProviderWithData", "testTwo", true);
+      edm::ParameterSet ps;
+      ps.addParameter<std::string>("name", "test22");
+      ps.addParameter<std::string>("appendToDataLabel", "blah");
+      ps.registerIt();
+      description.pid_ = ps.id();
+      auto dummyProv = std::make_shared<DepRecordProxyProviderWithData>(kGood);
+      dummyProv->setDescription(description);
+      dummyProv->setAppendToDataLabel(ps);
+      provider.add(dummyProv);
+    }
+    provider.finishConfiguration();
+
+    auto const& eventSetupImpl = provider.eventSetupForInstance(edm::IOVSyncValue::invalidIOVSyncValue());
+    {
+      DummyDataConsumer<DepRecord> consumer{edm::ESInputTag{"", "blah"}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      edm::ESHandle<DummyData> data = eventSetup.getHandle(consumer.m_token);
+      CPPUNIT_ASSERT(kGood.value_ == data->value_);
+      const edm::eventsetup::ComponentDescription* desc = data.description();
+      CPPUNIT_ASSERT(desc->label_ == "testTwo");
+    }
+    {
+      DummyDataConsumer<DummyRecord> consumer{edm::ESInputTag{"", ""}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      edm::ESHandle<DummyData> data = eventSetup.getHandle(consumer.m_token);
+      CPPUNIT_ASSERT(kBad.value_ == data->value_);
+      const edm::eventsetup::ComponentDescription* desc = data.description();
+      CPPUNIT_ASSERT(desc->label_ == "testOne");
+    }
+    {
+      DummyDataConsumer<DepRecord> consumer{edm::ESInputTag{"", "blah"}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& depRecord = eventSetup.get<DepRecord>();
+
+      edm::ESHandle<DummyData> data = depRecord.getHandle(consumer.m_token);
+      CPPUNIT_ASSERT(kGood.value_ == data->value_);
+      const edm::eventsetup::ComponentDescription* desc = data.description();
+      CPPUNIT_ASSERT(desc->label_ == "testTwo");
+    }
+    {
+      DummyDataConsumer<DummyRecord> consumer{edm::ESInputTag{"", ""}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& depRecord = eventSetup.get<DepRecord>();
+
+      edm::ESHandle<DummyData> data = depRecord.getHandle(consumer.m_token);
+      CPPUNIT_ASSERT(kBad.value_ == data->value_);
+      const edm::eventsetup::ComponentDescription* desc = data.description();
+      CPPUNIT_ASSERT(desc->label_ == "testOne");
+    }
+    {
+      DummyDataConsumer<DepRecord> consumer{edm::ESInputTag{"", "blah"}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& depRecord = eventSetup.get<DepRecord>();
+
+      edm::ESHandle<DummyData> data = depRecord.getHandle(consumer.m_token);
+      CPPUNIT_ASSERT(kGood.value_ == data->value_);
+      const edm::eventsetup::ComponentDescription* desc = data.description();
+      CPPUNIT_ASSERT(desc->label_ == "testTwo");
+    }
+    {
+      DummyDataConsumer2<DummyRecord, DepRecord> consumer{edm::ESInputTag{"", ""}, edm::ESInputTag{"", "blah"}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& depRecord = eventSetup.get<DepRecord>();
+
+      edm::ESHandle<DummyData> data1 = depRecord.getHandle(consumer.m_token1);
+      CPPUNIT_ASSERT(kBad.value_ == data1->value_);
+      const edm::eventsetup::ComponentDescription* desc = data1.description();
+      CPPUNIT_ASSERT(desc->label_ == "testOne");
+
+      edm::ESHandle<DummyData> data2 = depRecord.getHandle(consumer.m_token2);
+      CPPUNIT_ASSERT(kGood.value_ == data2->value_);
+      desc = data2.description();
+      CPPUNIT_ASSERT(desc->label_ == "testTwo");
+    }
+    {
+      DummyDataConsumer<DummyRecord> consumer{edm::ESInputTag{"DoesNotExist", ""}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& depRecord = eventSetup.get<DepRecord>();
+
+      CPPUNIT_ASSERT(not depRecord.getHandle(consumer.m_token));
+      CPPUNIT_ASSERT_THROW(*depRecord.getHandle(consumer.m_token), cms::Exception);
+    }
+    {
+      DummyDataConsumer<DepRecord> consumer{edm::ESInputTag{"DoesNotExist", "blah"}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& depRecord = eventSetup.get<DepRecord>();
+
+      CPPUNIT_ASSERT(not depRecord.getHandle(consumer.m_token));
+      CPPUNIT_ASSERT_THROW(*depRecord.getHandle(consumer.m_token), cms::Exception);
+    }
+  } catch (const cms::Exception& iException) {
+    std::cout << "caught " << iException.explainSelf() << std::endl;
+    throw;
+  }
 }
 
-void testdependentrecord::getTest()
-{
-   edm::eventsetup::EventSetupProvider provider(&activityRegistry);
-   std::shared_ptr<edm::eventsetup::DataProxyProvider> dummyProv = std::make_shared<DummyProxyProvider>();
-   provider.add(dummyProv);
-
-   std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
-   dummyFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(1, 1, 1)), 
-                                                   edm::IOVSyncValue(edm::EventID(1, 1, 3))));
-   provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>(dummyFinder));
-   
-   std::shared_ptr<edm::eventsetup::DataProxyProvider> depProv = std::make_shared<DepRecordProxyProvider>();
-   provider.add(depProv);
-   {
-      const auto&  eventSetup = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1)));
-      const DepRecord& depRecord = eventSetup.get<DepRecord>();
-
-      depRecord.getRecord<DummyRecord>();
-
-      auto dr = depRecord.tryToGetRecord<DummyRecord>();
-      CPPUNIT_ASSERT(dr.has_value());
-   }
-   {
-      const auto&  eventSetup = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 4)));
-      CPPUNIT_ASSERT_THROW(eventSetup.get<DepRecord>(),edm::eventsetup::NoRecordException<DepRecord>);
-   }
-   
+void testdependentrecord::getTransientHandleWithESGetTokenTest() {
+  using edm::eventsetup::test::DummyData;
+  using edm::eventsetup::test::DummyProxyProvider;
+  DummyData kGood{1};
+  DummyData kBad{0};
+
+  edm::eventsetup::EventSetupProvider provider(&activityRegistry);
+  try {
+    {
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "testOne", true);
+      edm::ParameterSet ps;
+      ps.addParameter<std::string>("name", "test11");
+      ps.registerIt();
+      description.pid_ = ps.id();
+      auto dummyProv = std::make_shared<DummyProxyProvider>(kBad);
+      dummyProv->setDescription(description);
+      provider.add(dummyProv);
+    }
+    {
+      edm::eventsetup::ComponentDescription description("DepRecordProxyProviderWithData", "testTwo", true);
+      edm::ParameterSet ps;
+      ps.addParameter<std::string>("name", "test22");
+      ps.addParameter<std::string>("appendToDataLabel", "blah");
+      ps.registerIt();
+      description.pid_ = ps.id();
+      auto dummyProv = std::make_shared<DepRecordProxyProviderWithData>(kGood);
+      dummyProv->setDescription(description);
+      dummyProv->setAppendToDataLabel(ps);
+      provider.add(dummyProv);
+    }
+    provider.finishConfiguration();
+
+    auto const& eventSetupImpl = provider.eventSetupForInstance(edm::IOVSyncValue::invalidIOVSyncValue());
+    {
+      DummyDataConsumer<DepRecord> consumer{edm::ESInputTag{"", "blah"}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      edm::ESTransientHandle<DummyData> data = eventSetup.getTransientHandle(consumer.m_token);
+      CPPUNIT_ASSERT(kGood.value_ == data->value_);
+      const edm::eventsetup::ComponentDescription* desc = data.description();
+      CPPUNIT_ASSERT(desc->label_ == "testTwo");
+    }
+    {
+      DummyDataConsumer<DummyRecord> consumer{edm::ESInputTag{"", ""}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      edm::ESTransientHandle<DummyData> data = eventSetup.getTransientHandle(consumer.m_token);
+      CPPUNIT_ASSERT(kBad.value_ == data->value_);
+      const edm::eventsetup::ComponentDescription* desc = data.description();
+      CPPUNIT_ASSERT(desc->label_ == "testOne");
+    }
+    {
+      DummyDataConsumer<DepRecord> consumer{edm::ESInputTag{"", "blah"}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& depRecord = eventSetup.get<DepRecord>();
+
+      edm::ESTransientHandle<DummyData> data = depRecord.getTransientHandle(consumer.m_token);
+      CPPUNIT_ASSERT(kGood.value_ == data->value_);
+      const edm::eventsetup::ComponentDescription* desc = data.description();
+      CPPUNIT_ASSERT(desc->label_ == "testTwo");
+    }
+    {
+      DummyDataConsumer<DummyRecord> consumer{edm::ESInputTag{"", ""}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& depRecord = eventSetup.get<DepRecord>();
+
+      edm::ESTransientHandle<DummyData> data = depRecord.getTransientHandle(consumer.m_token);
+      CPPUNIT_ASSERT(kBad.value_ == data->value_);
+      const edm::eventsetup::ComponentDescription* desc = data.description();
+      CPPUNIT_ASSERT(desc->label_ == "testOne");
+    }
+    {
+      DummyDataConsumer<DepRecord> consumer{edm::ESInputTag{"", "blah"}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& depRecord = eventSetup.get<DepRecord>();
+
+      edm::ESTransientHandle<DummyData> data = depRecord.getTransientHandle(consumer.m_token);
+      CPPUNIT_ASSERT(kGood.value_ == data->value_);
+      const edm::eventsetup::ComponentDescription* desc = data.description();
+      CPPUNIT_ASSERT(desc->label_ == "testTwo");
+    }
+    {
+      DummyDataConsumer2<DummyRecord, DepRecord> consumer{edm::ESInputTag{"", ""}, edm::ESInputTag{"", "blah"}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& depRecord = eventSetup.get<DepRecord>();
+
+      edm::ESTransientHandle<DummyData> data1 = depRecord.getTransientHandle(consumer.m_token1);
+      CPPUNIT_ASSERT(kBad.value_ == data1->value_);
+      const edm::eventsetup::ComponentDescription* desc = data1.description();
+      CPPUNIT_ASSERT(desc->label_ == "testOne");
+
+      edm::ESTransientHandle<DummyData> data2 = depRecord.getTransientHandle(consumer.m_token2);
+      CPPUNIT_ASSERT(kGood.value_ == data2->value_);
+      desc = data2.description();
+      CPPUNIT_ASSERT(desc->label_ == "testTwo");
+    }
+    {
+      DummyDataConsumer<DummyRecord> consumer{edm::ESInputTag{"DoesNotExist", ""}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& depRecord = eventSetup.get<DepRecord>();
+
+      edm::ESTransientHandle<DummyData> data = depRecord.getTransientHandle(consumer.m_token);
+      CPPUNIT_ASSERT(not data);
+      CPPUNIT_ASSERT_THROW(*data, cms::Exception);
+    }
+    {
+      DummyDataConsumer<DepRecord> consumer{edm::ESInputTag{"DoesNotExist", "blah"}};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      edm::EventSetup eventSetup{eventSetupImpl,
+                                 static_cast<unsigned int>(edm::Transition::Event),
+                                 consumer.esGetTokenIndices(edm::Transition::Event)};
+      auto const& depRecord = eventSetup.get<DepRecord>();
+
+      edm::ESTransientHandle<DummyData> data = depRecord.getTransientHandle(consumer.m_token);
+      CPPUNIT_ASSERT(not data);
+      CPPUNIT_ASSERT_THROW(*data, cms::Exception);
+    }
+  } catch (const cms::Exception& iException) {
+    std::cout << "caught " << iException.explainSelf() << std::endl;
+    throw;
+  }
 }
 
-void testdependentrecord::oneOfTwoRecordTest()
-{
+void testdependentrecord::oneOfTwoRecordTest() {
   edm::eventsetup::EventSetupProvider provider(&activityRegistry);
   std::shared_ptr<edm::eventsetup::DataProxyProvider> dummyProv = std::make_shared<DummyProxyProvider>();
   provider.add(dummyProv);
-  
+
   std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
-  dummyFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(1, 1, 1)), 
-                                                 edm::IOVSyncValue(edm::EventID(1, 1, 3))));
+  dummyFinder->setInterval(
+      edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(1, 1, 1)), edm::IOVSyncValue(edm::EventID(1, 1, 3))));
   provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>(dummyFinder));
-  
+
   std::shared_ptr<edm::eventsetup::DataProxyProvider> depProv = std::make_shared<DepOn2RecordProxyProvider>();
   provider.add(depProv);
   {
-    const auto&  eventSetup = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1)));
+    const edm::EventSetup eventSetup{
+        provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1))), 0, nullptr};
     const DepOn2Record& depRecord = eventSetup.get<DepOn2Record>();
-    
+
     depRecord.getRecord<DummyRecord>();
-    CPPUNIT_ASSERT_THROW(depRecord.getRecord<Dummy2Record>(),edm::eventsetup::NoRecordException<Dummy2Record>);
+    CPPUNIT_ASSERT_THROW(depRecord.getRecord<Dummy2Record>(), edm::eventsetup::NoRecordException<Dummy2Record>);
 
     try {
       depRecord.getRecord<Dummy2Record>();
-    } catch(edm::eventsetup::NoRecordException<Dummy2Record>& e) {
-       //make sure that the record name appears in the error message.
-       CPPUNIT_ASSERT(0!=strstr(e.what(), "DepOn2Record"));
-       CPPUNIT_ASSERT(0!=strstr(e.what(), "Dummy2Record"));
-       //	std::cout<<e.what()<<std::endl;
+    } catch (edm::eventsetup::NoRecordException<Dummy2Record>& e) {
+      //make sure that the record name appears in the error message.
+      CPPUNIT_ASSERT(0 != strstr(e.what(), "DepOn2Record"));
+      CPPUNIT_ASSERT(0 != strstr(e.what(), "Dummy2Record"));
+      //	std::cout<<e.what()<<std::endl;
     }
   }
 }
-void testdependentrecord::resetTest()
-{
+void testdependentrecord::resetTest() {
   edm::eventsetup::EventSetupProvider provider(&activityRegistry);
   std::shared_ptr<edm::eventsetup::DataProxyProvider> dummyProv = std::make_shared<DummyProxyProvider>();
   provider.add(dummyProv);
-  
+
   std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
-  dummyFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(1, 1, 1)), 
-                                                 edm::IOVSyncValue(edm::EventID(1, 1, 3))));
+  dummyFinder->setInterval(
+      edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(1, 1, 1)), edm::IOVSyncValue(edm::EventID(1, 1, 3))));
   provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>(dummyFinder));
-  
+
   std::shared_ptr<edm::eventsetup::DataProxyProvider> depProv = std::make_shared<DepRecordProxyProvider>();
   provider.add(depProv);
   {
-    const auto&  eventSetup = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1)));
+    const edm::EventSetup eventSetup{
+        provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1))), 0, nullptr};
     const DepRecord& depRecord = eventSetup.get<DepRecord>();
     unsigned long long depCacheID = depRecord.cacheIdentifier();
     const DummyRecord& dummyRecord = depRecord.getRecord<DummyRecord>();
     unsigned long long dummyCacheID = dummyRecord.cacheIdentifier();
-    
+
     provider.resetRecordPlusDependentRecords(dummyRecord.key());
     CPPUNIT_ASSERT(dummyCacheID != dummyRecord.cacheIdentifier());
     CPPUNIT_ASSERT(depCacheID != depRecord.cacheIdentifier());
   }
 }
-void testdependentrecord::alternateFinderTest()
-{
-   auto dummyProvider = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
-   
+void testdependentrecord::alternateFinderTest() {
+  auto dummyProvider = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
+
   const edm::EventID eID_1(1, 1, 1);
   const edm::IOVSyncValue sync_1(eID_1);
   const edm::EventID eID_3(1, 1, 3);
   const edm::IOVSyncValue sync_3(eID_3);
   const edm::EventID eID_4(1, 1, 4);
-  const edm::ValidityInterval definedInterval(sync_1, 
-                                              edm::IOVSyncValue(eID_4));
+  const edm::ValidityInterval definedInterval(sync_1, edm::IOVSyncValue(eID_4));
   std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
   dummyFinder->setInterval(definedInterval);
   dummyProvider->addFinder(dummyFinder);
-  
+
   std::shared_ptr<DepRecordFinder> depFinder = std::make_shared<DepRecordFinder>();
   const edm::EventID eID_2(1, 1, 2);
   const edm::IOVSyncValue sync_2(eID_2);
-  const edm::ValidityInterval depInterval(sync_1, 
-                                          sync_2);
+  const edm::ValidityInterval depInterval(sync_1, sync_2);
   depFinder->setInterval(depInterval);
-  
+
   const EventSetupRecordKey depRecordKey = DepRecord::keyForClass();
   DependentRecordIntervalFinder finder(depRecordKey);
   finder.setAlternateFinder(depFinder);
   finder.addProviderWeAreDependentOn(dummyProvider);
-  
-  CPPUNIT_ASSERT(depInterval == finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 1)))); 
-  
-  const edm::ValidityInterval dep2Interval(sync_3, 
-                                           edm::IOVSyncValue(eID_4));
+
+  CPPUNIT_ASSERT(depInterval == finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 1))));
+
+  const edm::ValidityInterval dep2Interval(sync_3, edm::IOVSyncValue(eID_4));
   depFinder->setInterval(dep2Interval);
   /*const edm::ValidityInterval tempIOV = */ finder.findIntervalFor(depRecordKey, sync_3);
   //std::cout <<  tempIOV.first().eventID()<<" to "<<tempIOV.last().eventID() <<std::endl;
-  CPPUNIT_ASSERT(dep2Interval == finder.findIntervalFor(depRecordKey, sync_3)); 
-  
+  CPPUNIT_ASSERT(dep2Interval == finder.findIntervalFor(depRecordKey, sync_3));
+
   dummyFinder->setInterval(edm::ValidityInterval::invalidInterval());
   depFinder->setInterval(edm::ValidityInterval::invalidInterval());
-  CPPUNIT_ASSERT(edm::ValidityInterval::invalidInterval() == finder.findIntervalFor(depRecordKey, 
-                                                                                    edm::IOVSyncValue(edm::EventID(1, 1, 5))));
-  
+  CPPUNIT_ASSERT(edm::ValidityInterval::invalidInterval() ==
+                 finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 5))));
+
   const edm::EventID eID_6(1, 1, 6);
   const edm::IOVSyncValue sync_6(eID_6);
-  const edm::ValidityInterval unknownedEndInterval(sync_6 ,
-                                                   edm::IOVSyncValue::invalidIOVSyncValue());
+  const edm::ValidityInterval unknownedEndInterval(sync_6, edm::IOVSyncValue::invalidIOVSyncValue());
   dummyFinder->setInterval(unknownedEndInterval);
-  
+
   const edm::EventID eID_7(1, 1, 7);
   const edm::IOVSyncValue sync_7(eID_7);
-  const edm::ValidityInterval iov6_7(sync_6,sync_7);
+  const edm::ValidityInterval iov6_7(sync_6, sync_7);
   depFinder->setInterval(iov6_7);
-  
+
   CPPUNIT_ASSERT(unknownedEndInterval == finder.findIntervalFor(depRecordKey, sync_6));
-  
+
   //see if dependent record can override the finder
   dummyFinder->setInterval(depInterval);
   depFinder->setInterval(definedInterval);
-  CPPUNIT_ASSERT(depInterval == finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 1)))); 
+  CPPUNIT_ASSERT(depInterval == finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 1))));
 
   dummyFinder->setInterval(dep2Interval);
-  CPPUNIT_ASSERT(dep2Interval == finder.findIntervalFor(depRecordKey, sync_3)); 
+  CPPUNIT_ASSERT(dep2Interval == finder.findIntervalFor(depRecordKey, sync_3));
 }
 
-void testdependentrecord::invalidRecordTest()
-{
-   auto dummyProvider1 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
+void testdependentrecord::invalidRecordTest() {
+  auto dummyProvider1 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
 
-   const edm::ValidityInterval invalid( edm::IOVSyncValue::invalidIOVSyncValue(),
-					edm::IOVSyncValue::invalidIOVSyncValue());
+  const edm::ValidityInterval invalid(edm::IOVSyncValue::invalidIOVSyncValue(),
+                                      edm::IOVSyncValue::invalidIOVSyncValue());
 
-   dummyProvider1->setValidityInterval(invalid);
-   
-   auto dummyProvider2 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
-   dummyProvider2->setValidityInterval(invalid);
+  dummyProvider1->setValidityInterval(invalid);
 
-   const EventSetupRecordKey depRecordKey = DepRecord::keyForClass();
-   DependentRecordIntervalFinder finder(depRecordKey);
-   finder.addProviderWeAreDependentOn(dummyProvider1);
-   finder.addProviderWeAreDependentOn(dummyProvider2);
+  auto dummyProvider2 = std::make_shared<EventSetupRecordProvider>(DummyRecord::keyForClass());
+  dummyProvider2->setValidityInterval(invalid);
 
-   CPPUNIT_ASSERT(invalid == finder.findIntervalFor(depRecordKey, 
-						    edm::IOVSyncValue(edm::EventID(1, 1, 2))));
+  const EventSetupRecordKey depRecordKey = DepRecord::keyForClass();
+  DependentRecordIntervalFinder finder(depRecordKey);
+  finder.addProviderWeAreDependentOn(dummyProvider1);
+  finder.addProviderWeAreDependentOn(dummyProvider2);
 
+  CPPUNIT_ASSERT(invalid == finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 2))));
 
-   const edm::EventID eID_1(1, 1, 5);
-   const edm::IOVSyncValue sync_1(eID_1);
-   const edm::ValidityInterval definedInterval1(sync_1, 
-                                                 edm::IOVSyncValue(edm::EventID(1, 1, 10))); 
-   const edm::EventID eID_2(1, 1, 2);
-   const edm::IOVSyncValue sync_2(eID_2);
-   const edm::ValidityInterval definedInterval2(sync_2, 
-                                                 edm::IOVSyncValue(edm::EventID(1, 1, 6)));
-   dummyProvider2->setValidityInterval(definedInterval2);
- 
-   const edm::ValidityInterval openEnded1(definedInterval2.first(),
-					       edm::IOVSyncValue::invalidIOVSyncValue());
-  
-                                                     
-   
-   CPPUNIT_ASSERT(openEnded1 == finder.findIntervalFor(depRecordKey, 
-						       edm::IOVSyncValue(edm::EventID(1, 1, 4))));
+  const edm::EventID eID_1(1, 1, 5);
+  const edm::IOVSyncValue sync_1(eID_1);
+  const edm::ValidityInterval definedInterval1(sync_1, edm::IOVSyncValue(edm::EventID(1, 1, 10)));
+  const edm::EventID eID_2(1, 1, 2);
+  const edm::IOVSyncValue sync_2(eID_2);
+  const edm::ValidityInterval definedInterval2(sync_2, edm::IOVSyncValue(edm::EventID(1, 1, 6)));
+  dummyProvider2->setValidityInterval(definedInterval2);
 
+  const edm::ValidityInterval openEnded1(definedInterval2.first(), edm::IOVSyncValue::invalidIOVSyncValue());
 
-   dummyProvider1->setValidityInterval(definedInterval1);
+  CPPUNIT_ASSERT(openEnded1 == finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 4))));
 
-   const edm::ValidityInterval overlapInterval(std::max(definedInterval1.first(), definedInterval2.first()),
-                                                std::min(definedInterval1.last(), definedInterval2.last()));
+  dummyProvider1->setValidityInterval(definedInterval1);
 
-   CPPUNIT_ASSERT(overlapInterval == finder.findIntervalFor(depRecordKey, 
-							    edm::IOVSyncValue(edm::EventID(1, 1, 5))));
+  const edm::ValidityInterval overlapInterval(std::max(definedInterval1.first(), definedInterval2.first()),
+                                              std::min(definedInterval1.last(), definedInterval2.last()));
 
+  CPPUNIT_ASSERT(overlapInterval == finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 5))));
 
-   dummyProvider2->setValidityInterval(invalid);
-   const edm::ValidityInterval openEnded2(definedInterval1.first(),
-					       edm::IOVSyncValue::invalidIOVSyncValue());
+  dummyProvider2->setValidityInterval(invalid);
+  const edm::ValidityInterval openEnded2(definedInterval1.first(), edm::IOVSyncValue::invalidIOVSyncValue());
 
-   CPPUNIT_ASSERT(openEnded2 == finder.findIntervalFor(depRecordKey, 
-						       edm::IOVSyncValue(edm::EventID(1, 1, 7))));
+  CPPUNIT_ASSERT(openEnded2 == finder.findIntervalFor(depRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 7))));
 }
 
-void testdependentrecord::extendIOVTest()
-{
-   edm::eventsetup::EventSetupProvider provider(&activityRegistry);
-   std::shared_ptr<edm::eventsetup::DataProxyProvider> dummyProv = std::make_shared<DummyProxyProvider>();
-   provider.add(dummyProv);
-   
-   std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
-   
-   edm::IOVSyncValue startSyncValue{edm::EventID{1, 1, 1}};
-   dummyFinder->setInterval(edm::ValidityInterval{startSyncValue, 
-                                                  edm::IOVSyncValue{edm::EventID{1, 1, 5}}});
-   provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>{dummyFinder});
-   
-   std::shared_ptr<edm::eventsetup::DataProxyProvider> depProv = std::make_shared<DepOn2RecordProxyProvider>();
-   provider.add(depProv);
-   
-   std::shared_ptr<Dummy2RecordFinder> dummy2Finder = std::make_shared<Dummy2RecordFinder>();
-   dummy2Finder->setInterval(edm::ValidityInterval{startSyncValue, 
-                                                   edm::IOVSyncValue{edm::EventID{1, 1, 6}}});
-   provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>(dummy2Finder));
-   {
-      const auto&  eventSetup1 = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1), edm::Timestamp(1)));
-      unsigned long long id1 = eventSetup1.get<DepOn2Record>().cacheIdentifier();
-      CPPUNIT_ASSERT(id1 == eventSetup1.get<DummyRecord>().cacheIdentifier());
-      CPPUNIT_ASSERT(id1 == eventSetup1.get<Dummy2Record>().cacheIdentifier());
-      
-      {
-         const auto&  eventSetup = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 5), edm::Timestamp(2)));
-         unsigned long long id = eventSetup.get<DepOn2Record>().cacheIdentifier();
-         CPPUNIT_ASSERT(id1 == id);
-         CPPUNIT_ASSERT(id1 == eventSetup.get<DummyRecord>().cacheIdentifier());
-         CPPUNIT_ASSERT(id1 == eventSetup.get<Dummy2Record>().cacheIdentifier());
-      }
-      //extend the IOV DummyRecord while Dummy2Record still covers this range
-      dummyFinder->setInterval(edm::ValidityInterval{startSyncValue, 
-                                                     edm::IOVSyncValue{edm::EventID{1, 1, 7}}});
-      {
-         const auto&  eventSetup = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 6), edm::Timestamp(7)));
-         unsigned long long id = eventSetup.get<DepOn2Record>().cacheIdentifier();
-         CPPUNIT_ASSERT(id1 == id);
-         CPPUNIT_ASSERT(id1 == eventSetup.get<DummyRecord>().cacheIdentifier());
-         CPPUNIT_ASSERT(id1 == eventSetup.get<Dummy2Record>().cacheIdentifier());
-      }
-      
-      //extend the IOV Dummy2Record while DummyRecord still covers this range
-      dummy2Finder->setInterval(edm::ValidityInterval{startSyncValue, 
-         edm::IOVSyncValue{edm::EventID{1, 1, 7}}});
-
-      {
-         const auto&  eventSetup = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 7), edm::Timestamp(7)));
-         unsigned long long id = eventSetup.get<DepOn2Record>().cacheIdentifier();
-         CPPUNIT_ASSERT(id1 == id);
-         CPPUNIT_ASSERT(id1 == eventSetup.get<DummyRecord>().cacheIdentifier());
-         CPPUNIT_ASSERT(id1 == eventSetup.get<Dummy2Record>().cacheIdentifier());
-      }
-      //extend the both IOVs
-      dummy2Finder->setInterval(edm::ValidityInterval{startSyncValue, 
-                                                      edm::IOVSyncValue{edm::EventID{1, 1, 8}}});
-      
-      dummyFinder->setInterval(edm::ValidityInterval{startSyncValue, 
-         edm::IOVSyncValue{edm::EventID{1, 1, 8}}});
-      {
-         const auto&  eventSetup = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 8), edm::Timestamp(7)));
-         unsigned long long id = eventSetup.get<DepOn2Record>().cacheIdentifier();
-         CPPUNIT_ASSERT(id1 == id);
-         CPPUNIT_ASSERT(id1 == eventSetup.get<DummyRecord>().cacheIdentifier());
-         CPPUNIT_ASSERT(id1 == eventSetup.get<Dummy2Record>().cacheIdentifier());
-      }
-      //extend only one and create a new IOV for the other
-      dummy2Finder->setInterval(edm::ValidityInterval{startSyncValue, 
-                                                      edm::IOVSyncValue{edm::EventID{1, 1, 9}}});
-      
-      dummyFinder->setInterval(edm::ValidityInterval{edm::IOVSyncValue{edm::EventID{1, 1, 9}}, 
-                                                     edm::IOVSyncValue{edm::EventID{1, 1, 9}}});
-      {
-         const auto&  eventSetup = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 9), edm::Timestamp(7)));
-         unsigned long long id = eventSetup.get<DepOn2Record>().cacheIdentifier();
-         CPPUNIT_ASSERT(id1+1 == id);
-         CPPUNIT_ASSERT(id1+1 == eventSetup.get<DummyRecord>().cacheIdentifier());
-         CPPUNIT_ASSERT(id1 == eventSetup.get<Dummy2Record>().cacheIdentifier());
-      }
-      //extend the otherone and create a new IOV for the other
-      dummy2Finder->setInterval(edm::ValidityInterval{edm::IOVSyncValue{edm::EventID{1, 1, 10}}, 
-                                                      edm::IOVSyncValue{edm::EventID{1, 1, 10}} });
-      
-      dummyFinder->setInterval(edm::ValidityInterval{edm::IOVSyncValue{edm::EventID{1, 1, 9}}, 
-                                                     edm::IOVSyncValue{edm::EventID{1, 1, 10}} });
-      
-      {
-         const auto&  eventSetup = provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 10), edm::Timestamp(7)));
-         unsigned long long id = eventSetup.get<DepOn2Record>().cacheIdentifier();
-         CPPUNIT_ASSERT(id1+2 == id);
-         CPPUNIT_ASSERT(id1+1 == eventSetup.get<DummyRecord>().cacheIdentifier());
-         CPPUNIT_ASSERT(id1+1 == eventSetup.get<Dummy2Record>().cacheIdentifier());
-      }
-      
-   }
+void testdependentrecord::extendIOVTest() {
+  edm::eventsetup::EventSetupProvider provider(&activityRegistry);
+  std::shared_ptr<edm::eventsetup::DataProxyProvider> dummyProv = std::make_shared<DummyProxyProvider>();
+  provider.add(dummyProv);
 
+  std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
+
+  edm::IOVSyncValue startSyncValue{edm::EventID{1, 1, 1}};
+  dummyFinder->setInterval(edm::ValidityInterval{startSyncValue, edm::IOVSyncValue{edm::EventID{1, 1, 5}}});
+  provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>{dummyFinder});
+
+  std::shared_ptr<edm::eventsetup::DataProxyProvider> depProv = std::make_shared<DepOn2RecordProxyProvider>();
+  provider.add(depProv);
+
+  std::shared_ptr<Dummy2RecordFinder> dummy2Finder = std::make_shared<Dummy2RecordFinder>();
+  dummy2Finder->setInterval(edm::ValidityInterval{startSyncValue, edm::IOVSyncValue{edm::EventID{1, 1, 6}}});
+  provider.add(std::shared_ptr<edm::EventSetupRecordIntervalFinder>(dummy2Finder));
+  {
+    const edm::EventSetup eventSetup1{
+        provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 1), edm::Timestamp(1))), 0, nullptr};
+    unsigned long long id1 = eventSetup1.get<DepOn2Record>().cacheIdentifier();
+    CPPUNIT_ASSERT(id1 == eventSetup1.get<DummyRecord>().cacheIdentifier());
+    CPPUNIT_ASSERT(id1 == eventSetup1.get<Dummy2Record>().cacheIdentifier());
+
+    {
+      const edm::EventSetup eventSetup{
+          provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 5), edm::Timestamp(2))), 0, nullptr};
+      unsigned long long id = eventSetup.get<DepOn2Record>().cacheIdentifier();
+      CPPUNIT_ASSERT(id1 == id);
+      CPPUNIT_ASSERT(id1 == eventSetup.get<DummyRecord>().cacheIdentifier());
+      CPPUNIT_ASSERT(id1 == eventSetup.get<Dummy2Record>().cacheIdentifier());
+    }
+    //extend the IOV DummyRecord while Dummy2Record still covers this range
+    dummyFinder->setInterval(edm::ValidityInterval{startSyncValue, edm::IOVSyncValue{edm::EventID{1, 1, 7}}});
+    {
+      const edm::EventSetup eventSetup{
+          provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 6), edm::Timestamp(7))), 0, nullptr};
+      unsigned long long id = eventSetup.get<DepOn2Record>().cacheIdentifier();
+      CPPUNIT_ASSERT(id1 == id);
+      CPPUNIT_ASSERT(id1 == eventSetup.get<DummyRecord>().cacheIdentifier());
+      CPPUNIT_ASSERT(id1 == eventSetup.get<Dummy2Record>().cacheIdentifier());
+    }
+
+    //extend the IOV Dummy2Record while DummyRecord still covers this range
+    dummy2Finder->setInterval(edm::ValidityInterval{startSyncValue, edm::IOVSyncValue{edm::EventID{1, 1, 7}}});
+
+    {
+      const edm::EventSetup eventSetup{
+          provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 7), edm::Timestamp(7))), 0, nullptr};
+      unsigned long long id = eventSetup.get<DepOn2Record>().cacheIdentifier();
+      CPPUNIT_ASSERT(id1 == id);
+      CPPUNIT_ASSERT(id1 == eventSetup.get<DummyRecord>().cacheIdentifier());
+      CPPUNIT_ASSERT(id1 == eventSetup.get<Dummy2Record>().cacheIdentifier());
+    }
+    //extend the both IOVs
+    dummy2Finder->setInterval(edm::ValidityInterval{startSyncValue, edm::IOVSyncValue{edm::EventID{1, 1, 8}}});
+
+    dummyFinder->setInterval(edm::ValidityInterval{startSyncValue, edm::IOVSyncValue{edm::EventID{1, 1, 8}}});
+    {
+      const edm::EventSetup eventSetup{
+          provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 8), edm::Timestamp(7))), 0, nullptr};
+      unsigned long long id = eventSetup.get<DepOn2Record>().cacheIdentifier();
+      CPPUNIT_ASSERT(id1 == id);
+      CPPUNIT_ASSERT(id1 == eventSetup.get<DummyRecord>().cacheIdentifier());
+      CPPUNIT_ASSERT(id1 == eventSetup.get<Dummy2Record>().cacheIdentifier());
+    }
+    //extend only one and create a new IOV for the other
+    dummy2Finder->setInterval(edm::ValidityInterval{startSyncValue, edm::IOVSyncValue{edm::EventID{1, 1, 9}}});
+
+    dummyFinder->setInterval(
+        edm::ValidityInterval{edm::IOVSyncValue{edm::EventID{1, 1, 9}}, edm::IOVSyncValue{edm::EventID{1, 1, 9}}});
+    {
+      const edm::EventSetup eventSetup{
+          provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 9), edm::Timestamp(7))), 0, nullptr};
+      unsigned long long id = eventSetup.get<DepOn2Record>().cacheIdentifier();
+      CPPUNIT_ASSERT(id1 + 1 == id);
+      CPPUNIT_ASSERT(id1 + 1 == eventSetup.get<DummyRecord>().cacheIdentifier());
+      CPPUNIT_ASSERT(id1 == eventSetup.get<Dummy2Record>().cacheIdentifier());
+    }
+    //extend the otherone and create a new IOV for the other
+    dummy2Finder->setInterval(
+        edm::ValidityInterval{edm::IOVSyncValue{edm::EventID{1, 1, 10}}, edm::IOVSyncValue{edm::EventID{1, 1, 10}}});
+
+    dummyFinder->setInterval(
+        edm::ValidityInterval{edm::IOVSyncValue{edm::EventID{1, 1, 9}}, edm::IOVSyncValue{edm::EventID{1, 1, 10}}});
+
+    {
+      const edm::EventSetup eventSetup{
+          provider.eventSetupForInstance(edm::IOVSyncValue(edm::EventID(1, 1, 10), edm::Timestamp(7))), 0, nullptr};
+      unsigned long long id = eventSetup.get<DepOn2Record>().cacheIdentifier();
+      CPPUNIT_ASSERT(id1 + 2 == id);
+      CPPUNIT_ASSERT(id1 + 1 == eventSetup.get<DummyRecord>().cacheIdentifier());
+      CPPUNIT_ASSERT(id1 + 1 == eventSetup.get<Dummy2Record>().cacheIdentifier());
+    }
+  }
 }
diff --git a/FWCore/Framework/test/edconsumerbase_t.cppunit.cc b/FWCore/Framework/test/edconsumerbase_t.cppunit.cc
index ef2ba9a0447fc..3eebc95e56890 100644
--- a/FWCore/Framework/test/edconsumerbase_t.cppunit.cc
+++ b/FWCore/Framework/test/edconsumerbase_t.cppunit.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Package
 // Class  :     edconsumerbase_t
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -31,7 +31,6 @@
 
 #include "DataFormats/Common/interface/View.h"
 
-
 class TestEDConsumerBase : public CppUnit::TestFixture {
 public:
   CPPUNIT_TEST_SUITE(TestEDConsumerBase);
@@ -42,110 +41,101 @@ class TestEDConsumerBase : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE_END();
 
 public:
-  
   void setUp();
-  void tearDown() { }
+  void tearDown() {}
 
   void testRegularType();
   void testViewType();
   void testMany();
   void testMay();
-
 };
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(TestEDConsumerBase);
 
-void TestEDConsumerBase::setUp() {
-}
+void TestEDConsumerBase::setUp() {}
 
 namespace {
   class IntsConsumer : public edm::EDConsumerBase {
-    public:
+  public:
     IntsConsumer(std::vector<edm::InputTag> const& iTags) {
       m_tokens.reserve(iTags.size());
-      for(auto const& tag : iTags) {
+      for (auto const& tag : iTags) {
         m_tokens.push_back(consumes<std::vector<int>>(tag));
       }
     }
-    
+
     std::vector<edm::EDGetTokenT<std::vector<int>>> m_tokens;
   };
 
   class IntsMayConsumer : public edm::EDConsumerBase {
   public:
-    IntsMayConsumer(std::vector<edm::InputTag> const& iTags,
-                    std::vector<edm::InputTag> const& iMayTags) {
+    IntsMayConsumer(std::vector<edm::InputTag> const& iTags, std::vector<edm::InputTag> const& iMayTags) {
       m_tokens.reserve(iTags.size());
       m_mayTokens.reserve(iMayTags.size());
-      for(auto const& tag : iTags) {
+      for (auto const& tag : iTags) {
         m_tokens.push_back(consumes<std::vector<int>>(tag));
       }
-      for(auto const& tag : iMayTags) {
+      for (auto const& tag : iMayTags) {
         m_mayTokens.push_back(mayConsume<std::vector<int>>(tag));
       }
     }
-    
+
     std::vector<edm::EDGetTokenT<std::vector<int>>> m_tokens;
     std::vector<edm::EDGetTokenT<std::vector<int>>> m_mayTokens;
   };
 
-  
-  
   class TypeToGetConsumer : public edm::EDConsumerBase {
   public:
-    TypeToGetConsumer(std::vector<std::pair<edm::TypeToGet,edm::InputTag>> const& iTags) {
+    TypeToGetConsumer(std::vector<std::pair<edm::TypeToGet, edm::InputTag>> const& iTags) {
       m_tokens.reserve(iTags.size());
-      for(auto const& typeTag : iTags) {
-        m_tokens.push_back(consumes(typeTag.first,typeTag.second));
+      for (auto const& typeTag : iTags) {
+        m_tokens.push_back(consumes(typeTag.first, typeTag.second));
       }
     }
-    
-    std::vector<edm::EDGetToken> m_tokens;  
+
+    std::vector<edm::EDGetToken> m_tokens;
   };
-  
+
   class IntsConsumesCollectorConsumer : public edm::EDConsumerBase {
   public:
     IntsConsumesCollectorConsumer(std::vector<edm::InputTag> const& iTags) {
       m_tokens.reserve(iTags.size());
-      edm::ConsumesCollector c{ consumesCollector() };
-      for(auto const& tag : iTags) {
+      edm::ConsumesCollector c{consumesCollector()};
+      for (auto const& tag : iTags) {
         m_tokens.push_back(c.consumes<std::vector<int>>(tag));
       }
     }
-    
+
     std::vector<edm::EDGetTokenT<std::vector<int>>> m_tokens;
   };
 
-}
+}  // namespace
 
-void
-TestEDConsumerBase::testRegularType()
-{
-  
+void TestEDConsumerBase::testRegularType() {
   edm::ProductResolverIndexHelper helper;
-  
+
   edm::TypeID typeIDProductID(typeid(edm::ProductID));
   edm::TypeID typeIDEventID(typeid(edm::EventID));
   edm::TypeID typeIDVectorInt(typeid(std::vector<int>));
   edm::TypeID typeIDSetInt(typeid(std::set<int>));
   edm::TypeID typeIDVSimpleDerived(typeid(std::vector<edmtest::SimpleDerived>));
-  
-  helper.insert(typeIDVectorInt, "labelC", "instanceC", "processC"); // 0, 1, 2
-  helper.insert(typeIDVectorInt, "label",  "instance",  "process");  // 3, 4, 5
-  helper.insert(typeIDEventID, "labelB", "instanceB", "processB");   // 6, 7
-  helper.insert(typeIDEventID, "label",  "instanceB", "processB");   // 8, 9
-  helper.insert(typeIDEventID, "labelX", "instanceB", "processB");   // 10, 11
-  helper.insert(typeIDEventID, "labelB", "instance",  "processB");   // 12, 13
-  helper.insert(typeIDEventID, "labelB", "instanceX", "processB");   // 14, 15
-  helper.insert(typeIDEventID, "labelB", "instanceB", "processB1");  // 16, 5
-  helper.insert(typeIDEventID, "labelB", "instanceB", "processB3");  // 17, 5
-  helper.insert(typeIDEventID, "labelB", "instanceB", "processB2");  // 18, 5
-  helper.insert(typeIDProductID, "label",  "instance",  "process");  // 19, 20
-  helper.insert(typeIDEventID, "label",  "instance",  "process");    // 21, 22
-  helper.insert(typeIDProductID, "labelA", "instanceA", "processA"); // 23, 24
-  helper.insert(typeIDSetInt, "labelC", "instanceC", "processC"); // 25, 26
-  helper.insert(typeIDVSimpleDerived, "labelC", "instanceC", "processC"); // 27, 28, 29, 30
+
+  helper.insert(typeIDVectorInt, "labelC", "instanceC", "processC");       // 0, 1, 2
+  helper.insert(typeIDVectorInt, "label", "instance", "process");          // 3, 4, 5
+  helper.insert(typeIDEventID, "labelB", "instanceB", "processB");         // 6, 7
+  helper.insert(typeIDEventID, "label", "instanceB", "processB");          // 8, 9
+  helper.insert(typeIDEventID, "labelX", "instanceB", "processB");         // 10, 11
+  helper.insert(typeIDEventID, "labelB", "instance", "processB");          // 12, 13
+  helper.insert(typeIDEventID, "labelB", "instanceX", "processB");         // 14, 15
+  helper.insert(typeIDEventID, "labelB", "instanceB", "processB1");        // 16, 5
+  helper.insert(typeIDEventID, "labelB", "instanceB", "processB3");        // 17, 5
+  helper.insert(typeIDEventID, "labelB", "instanceB", "processB2");        // 18, 5
+  helper.insert(typeIDProductID, "label", "instance", "process");          // 19, 20
+  helper.insert(typeIDEventID, "label", "instance", "process");            // 21, 22
+  helper.insert(typeIDProductID, "labelA", "instanceA", "processA");       // 23, 24
+  helper.insert(typeIDSetInt, "labelC", "instanceC", "processC");          // 25, 26
+  helper.insert(typeIDVSimpleDerived, "labelC", "instanceC", "processC");  // 27, 28, 29, 30
 
   helper.setFrozen();
 
@@ -153,184 +143,202 @@ TestEDConsumerBase::testRegularType()
   const auto vint_c = helper.index(edm::PRODUCT_TYPE, typeID_vint, "labelC", "instanceC", "processC");
   const auto vint_c_no_proc = helper.index(edm::PRODUCT_TYPE, typeID_vint, "labelC", "instanceC", 0);
   const auto vint_blank = helper.index(edm::PRODUCT_TYPE, typeID_vint, "label", "instance", "process");
-  const auto vint_blank_no_proc = helper.index(edm::PRODUCT_TYPE, typeID_vint, "label", "instance",0);
+  const auto vint_blank_no_proc = helper.index(edm::PRODUCT_TYPE, typeID_vint, "label", "instance", 0);
   {
-    std::vector<edm::InputTag> vTags={ {"label","instance","process"}, {"labelC","instanceC","processC"} };
+    std::vector<edm::InputTag> vTags = {{"label", "instance", "process"}, {"labelC", "instanceC", "processC"}};
     IntsConsumer intConsumer{vTags};
-    intConsumer.updateLookup(edm::InEvent,helper,false);
-  
-    CPPUNIT_ASSERT(intConsumer.m_tokens[0].index()==0);
-    CPPUNIT_ASSERT(intConsumer.m_tokens[1].index()==1);
-
-    CPPUNIT_ASSERT(vint_c == intConsumer.indexFrom(intConsumer.m_tokens[1],edm::InEvent,typeID_vint).productResolverIndex());
-    CPPUNIT_ASSERT(vint_blank == intConsumer.indexFrom(intConsumer.m_tokens[0],edm::InEvent,typeID_vint).productResolverIndex());
-    
+    intConsumer.updateLookup(edm::InEvent, helper, false);
+
+    CPPUNIT_ASSERT(intConsumer.m_tokens[0].index() == 0);
+    CPPUNIT_ASSERT(intConsumer.m_tokens[1].index() == 1);
+
+    CPPUNIT_ASSERT(vint_c ==
+                   intConsumer.indexFrom(intConsumer.m_tokens[1], edm::InEvent, typeID_vint).productResolverIndex());
+    CPPUNIT_ASSERT(vint_blank ==
+                   intConsumer.indexFrom(intConsumer.m_tokens[0], edm::InEvent, typeID_vint).productResolverIndex());
+
     std::vector<edm::ProductResolverIndexAndSkipBit> indices;
-    intConsumer.itemsToGet(edm::InEvent,indices);
-    
+    intConsumer.itemsToGet(edm::InEvent, indices);
+
     CPPUNIT_ASSERT(2 == indices.size());
-    CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),indices.end(), edm::ProductResolverIndexAndSkipBit(vint_c, false)));
-    CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),indices.end(), edm::ProductResolverIndexAndSkipBit(vint_blank, false)));
+    CPPUNIT_ASSERT(indices.end() !=
+                   std::find(indices.begin(), indices.end(), edm::ProductResolverIndexAndSkipBit(vint_c, false)));
+    CPPUNIT_ASSERT(indices.end() !=
+                   std::find(indices.begin(), indices.end(), edm::ProductResolverIndexAndSkipBit(vint_blank, false)));
 
     std::vector<edm::ProductResolverIndexAndSkipBit> indicesMay;
-    intConsumer.itemsMayGet(edm::InEvent,indicesMay);
+    intConsumer.itemsMayGet(edm::InEvent, indicesMay);
     CPPUNIT_ASSERT(0 == indicesMay.size());
-
   }
   {
-    std::vector<edm::InputTag> vTags={ {"label","instance","process"}, {"labelC","instanceC","processC"} };
+    std::vector<edm::InputTag> vTags = {{"label", "instance", "process"}, {"labelC", "instanceC", "processC"}};
     IntsConsumesCollectorConsumer intConsumer{vTags};
-    intConsumer.updateLookup(edm::InEvent,helper,false);
-    
-    CPPUNIT_ASSERT(intConsumer.m_tokens[0].index()==0);
-    CPPUNIT_ASSERT(intConsumer.m_tokens[1].index()==1);
-
-    CPPUNIT_ASSERT(vint_c == intConsumer.indexFrom(intConsumer.m_tokens[1],edm::InEvent,typeID_vint).productResolverIndex());
-    CPPUNIT_ASSERT(vint_blank == intConsumer.indexFrom(intConsumer.m_tokens[0],edm::InEvent,typeID_vint).productResolverIndex());
-    
+    intConsumer.updateLookup(edm::InEvent, helper, false);
+
+    CPPUNIT_ASSERT(intConsumer.m_tokens[0].index() == 0);
+    CPPUNIT_ASSERT(intConsumer.m_tokens[1].index() == 1);
+
+    CPPUNIT_ASSERT(vint_c ==
+                   intConsumer.indexFrom(intConsumer.m_tokens[1], edm::InEvent, typeID_vint).productResolverIndex());
+    CPPUNIT_ASSERT(vint_blank ==
+                   intConsumer.indexFrom(intConsumer.m_tokens[0], edm::InEvent, typeID_vint).productResolverIndex());
+
     std::vector<edm::ProductResolverIndexAndSkipBit> indices;
-    intConsumer.itemsToGet(edm::InEvent,indices);
-    
+    intConsumer.itemsToGet(edm::InEvent, indices);
+
     CPPUNIT_ASSERT(2 == indices.size());
-    CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),indices.end(), edm::ProductResolverIndexAndSkipBit(vint_c, false)));
-    CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),indices.end(), edm::ProductResolverIndexAndSkipBit(vint_blank, false)));
-    
+    CPPUNIT_ASSERT(indices.end() !=
+                   std::find(indices.begin(), indices.end(), edm::ProductResolverIndexAndSkipBit(vint_c, false)));
+    CPPUNIT_ASSERT(indices.end() !=
+                   std::find(indices.begin(), indices.end(), edm::ProductResolverIndexAndSkipBit(vint_blank, false)));
+
     std::vector<edm::ProductResolverIndexAndSkipBit> indicesMay;
-    intConsumer.itemsMayGet(edm::InEvent,indicesMay);
+    intConsumer.itemsMayGet(edm::InEvent, indicesMay);
     CPPUNIT_ASSERT(0 == indicesMay.size());
-    
   }
   {
-    std::vector<edm::InputTag> vTagsRev={ {"labelC","instanceC","processC"},{"label","instance","process"} };
+    std::vector<edm::InputTag> vTagsRev = {{"labelC", "instanceC", "processC"}, {"label", "instance", "process"}};
     IntsConsumer intConsumerRev{vTagsRev};
-    intConsumerRev.updateLookup(edm::InEvent,helper,false);
+    intConsumerRev.updateLookup(edm::InEvent, helper, false);
 
-    CPPUNIT_ASSERT(intConsumerRev.m_tokens[0].index()==0);
-    CPPUNIT_ASSERT(intConsumerRev.m_tokens[1].index()==1);
+    CPPUNIT_ASSERT(intConsumerRev.m_tokens[0].index() == 0);
+    CPPUNIT_ASSERT(intConsumerRev.m_tokens[1].index() == 1);
 
-    CPPUNIT_ASSERT(vint_c == intConsumerRev.indexFrom(intConsumerRev.m_tokens[0],edm::InEvent,typeID_vint).productResolverIndex());
-    CPPUNIT_ASSERT(vint_blank == intConsumerRev.indexFrom(intConsumerRev.m_tokens[1],edm::InEvent,typeID_vint).productResolverIndex());
+    CPPUNIT_ASSERT(
+        vint_c ==
+        intConsumerRev.indexFrom(intConsumerRev.m_tokens[0], edm::InEvent, typeID_vint).productResolverIndex());
+    CPPUNIT_ASSERT(
+        vint_blank ==
+        intConsumerRev.indexFrom(intConsumerRev.m_tokens[1], edm::InEvent, typeID_vint).productResolverIndex());
 
     std::vector<edm::ProductResolverIndexAndSkipBit> indices;
-    intConsumerRev.itemsToGet(edm::InEvent,indices);
-    
+    intConsumerRev.itemsToGet(edm::InEvent, indices);
+
     CPPUNIT_ASSERT(2 == indices.size());
-    CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),indices.end(), edm::ProductResolverIndexAndSkipBit(vint_c, false)));
-    CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),indices.end(), edm::ProductResolverIndexAndSkipBit(vint_blank, false)));
-    
+    CPPUNIT_ASSERT(indices.end() !=
+                   std::find(indices.begin(), indices.end(), edm::ProductResolverIndexAndSkipBit(vint_c, false)));
+    CPPUNIT_ASSERT(indices.end() !=
+                   std::find(indices.begin(), indices.end(), edm::ProductResolverIndexAndSkipBit(vint_blank, false)));
+
     std::vector<edm::ProductResolverIndexAndSkipBit> indicesMay;
-    intConsumerRev.itemsMayGet(edm::InEvent,indicesMay);
+    intConsumerRev.itemsMayGet(edm::InEvent, indicesMay);
     CPPUNIT_ASSERT(0 == indicesMay.size());
   }
   {
-    std::vector<edm::InputTag> vTagsRev={ {"labelC","instanceC","processC"},{"label","instance","process"} };
+    std::vector<edm::InputTag> vTagsRev = {{"labelC", "instanceC", "processC"}, {"label", "instance", "process"}};
     IntsConsumesCollectorConsumer intConsumerRev{vTagsRev};
-    intConsumerRev.updateLookup(edm::InEvent,helper,false);
-    
-    CPPUNIT_ASSERT(intConsumerRev.m_tokens[0].index()==0);
-    CPPUNIT_ASSERT(intConsumerRev.m_tokens[1].index()==1);
+    intConsumerRev.updateLookup(edm::InEvent, helper, false);
+
+    CPPUNIT_ASSERT(intConsumerRev.m_tokens[0].index() == 0);
+    CPPUNIT_ASSERT(intConsumerRev.m_tokens[1].index() == 1);
 
     CPPUNIT_ASSERT(edm::ProductResolverIndexAndSkipBit(vint_c, false) ==
-                   intConsumerRev.indexFrom(intConsumerRev.m_tokens[0],edm::InEvent,typeID_vint));
+                   intConsumerRev.indexFrom(intConsumerRev.m_tokens[0], edm::InEvent, typeID_vint));
     CPPUNIT_ASSERT(edm::ProductResolverIndexAndSkipBit(vint_blank, false) ==
-                   intConsumerRev.indexFrom(intConsumerRev.m_tokens[1],edm::InEvent,typeID_vint));
-    
+                   intConsumerRev.indexFrom(intConsumerRev.m_tokens[1], edm::InEvent, typeID_vint));
+
     std::vector<edm::ProductResolverIndexAndSkipBit> indices;
-    intConsumerRev.itemsToGet(edm::InEvent,indices);
-    
+    intConsumerRev.itemsToGet(edm::InEvent, indices);
+
     CPPUNIT_ASSERT(2 == indices.size());
-    CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),indices.end(), edm::ProductResolverIndexAndSkipBit(vint_c, false)));
-    CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),indices.end(), edm::ProductResolverIndexAndSkipBit(vint_blank, false)));
-    
+    CPPUNIT_ASSERT(indices.end() !=
+                   std::find(indices.begin(), indices.end(), edm::ProductResolverIndexAndSkipBit(vint_c, false)));
+    CPPUNIT_ASSERT(indices.end() !=
+                   std::find(indices.begin(), indices.end(), edm::ProductResolverIndexAndSkipBit(vint_blank, false)));
+
     std::vector<edm::ProductResolverIndexAndSkipBit> indicesMay;
-    intConsumerRev.itemsMayGet(edm::InEvent,indicesMay);
+    intConsumerRev.itemsMayGet(edm::InEvent, indicesMay);
     CPPUNIT_ASSERT(0 == indicesMay.size());
   }
   {
     //test default process
-    std::vector<edm::InputTag> vTags={ {"label","instance"}, {"labelC","instanceC","@skipCurrentProcess"} };
+    std::vector<edm::InputTag> vTags = {{"label", "instance"}, {"labelC", "instanceC", "@skipCurrentProcess"}};
     IntsConsumer intConsumer{vTags};
-    intConsumer.updateLookup(edm::InEvent,helper,false);
-    
-    CPPUNIT_ASSERT(intConsumer.m_tokens[0].index()==0);
-    CPPUNIT_ASSERT(intConsumer.m_tokens[1].index()==1);
+    intConsumer.updateLookup(edm::InEvent, helper, false);
+
+    CPPUNIT_ASSERT(intConsumer.m_tokens[0].index() == 0);
+    CPPUNIT_ASSERT(intConsumer.m_tokens[1].index() == 1);
 
     CPPUNIT_ASSERT(edm::ProductResolverIndexAndSkipBit(vint_c_no_proc, true) ==
-                   intConsumer.indexFrom(intConsumer.m_tokens[1],edm::InEvent,typeID_vint));
+                   intConsumer.indexFrom(intConsumer.m_tokens[1], edm::InEvent, typeID_vint));
     CPPUNIT_ASSERT(edm::ProductResolverIndexAndSkipBit(vint_blank_no_proc, false) ==
-                   intConsumer.indexFrom(intConsumer.m_tokens[0],edm::InEvent,typeID_vint));
+                   intConsumer.indexFrom(intConsumer.m_tokens[0], edm::InEvent, typeID_vint));
 
     std::vector<edm::ProductResolverIndexAndSkipBit> indices;
-    intConsumer.itemsToGet(edm::InEvent,indices);
-    
+    intConsumer.itemsToGet(edm::InEvent, indices);
+
     CPPUNIT_ASSERT(2 == indices.size());
-    CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),indices.end(), edm::ProductResolverIndexAndSkipBit(vint_c_no_proc, true)));
-    CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),indices.end(), edm::ProductResolverIndexAndSkipBit(vint_blank_no_proc, false)));
-    
+    CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),
+                                              indices.end(),
+                                              edm::ProductResolverIndexAndSkipBit(vint_c_no_proc, true)));
+    CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),
+                                              indices.end(),
+                                              edm::ProductResolverIndexAndSkipBit(vint_blank_no_proc, false)));
+
     std::vector<edm::ProductResolverIndexAndSkipBit> indicesMay;
-    intConsumer.itemsMayGet(edm::InEvent,indicesMay);
+    intConsumer.itemsMayGet(edm::InEvent, indicesMay);
     CPPUNIT_ASSERT(0 == indicesMay.size());
   }
   {
     //Ask for something that doesn't exist
-    std::vector<edm::InputTag> vTags={ {"notHere"} };
+    std::vector<edm::InputTag> vTags = {{"notHere"}};
     IntsConsumer intConsumer{vTags};
-    intConsumer.updateLookup(edm::InEvent,helper,false);
-    
-    CPPUNIT_ASSERT(intConsumer.m_tokens[0].index()==0);
-    CPPUNIT_ASSERT(edm::ProductResolverIndexInvalid == intConsumer.indexFrom(intConsumer.m_tokens[0],edm::InEvent,typeID_vint).productResolverIndex());
+    intConsumer.updateLookup(edm::InEvent, helper, false);
+
+    CPPUNIT_ASSERT(intConsumer.m_tokens[0].index() == 0);
+    CPPUNIT_ASSERT(edm::ProductResolverIndexInvalid ==
+                   intConsumer.indexFrom(intConsumer.m_tokens[0], edm::InEvent, typeID_vint).productResolverIndex());
 
     std::vector<edm::ProductResolverIndexAndSkipBit> indices;
-    intConsumer.itemsToGet(edm::InEvent,indices);
+    intConsumer.itemsToGet(edm::InEvent, indices);
     //nothing to get since not here
     CPPUNIT_ASSERT(0 == indices.size());
   }
 
   {
     //Use an empty tag
-    std::vector<edm::InputTag> vTags={ {} };
+    std::vector<edm::InputTag> vTags = {{}};
     IntsConsumer intConsumer{vTags};
-    intConsumer.updateLookup(edm::InEvent,helper,false);
-    
-    CPPUNIT_ASSERT(intConsumer.m_tokens[0].index()==0);
-    CPPUNIT_ASSERT(edm::ProductResolverIndexInvalid == intConsumer.indexFrom(intConsumer.m_tokens[0],edm::InEvent,typeID_vint).productResolverIndex());
-    
+    intConsumer.updateLookup(edm::InEvent, helper, false);
+
+    CPPUNIT_ASSERT(intConsumer.m_tokens[0].index() == 0);
+    CPPUNIT_ASSERT(edm::ProductResolverIndexInvalid ==
+                   intConsumer.indexFrom(intConsumer.m_tokens[0], edm::InEvent, typeID_vint).productResolverIndex());
+
     std::vector<edm::ProductResolverIndexAndSkipBit> indices;
-    intConsumer.itemsToGet(edm::InEvent,indices);
+    intConsumer.itemsToGet(edm::InEvent, indices);
     //nothing to get since not here
     CPPUNIT_ASSERT(0 == indices.size());
   }
 }
 
-void
-TestEDConsumerBase::testViewType()
-{
+void TestEDConsumerBase::testViewType() {
   edm::ProductResolverIndexHelper helper;
-  
+
   edm::TypeID typeIDProductID(typeid(edm::ProductID));
   edm::TypeID typeIDEventID(typeid(edm::EventID));
   edm::TypeID typeIDVectorInt(typeid(std::vector<int>));
   edm::TypeID typeIDSetInt(typeid(std::set<int>));
   edm::TypeID typeIDVSimpleDerived(typeid(std::vector<edmtest::SimpleDerived>));
-  
-  helper.insert(typeIDVectorInt, "labelC", "instanceC", "processC"); // 0, 1, 2
-  helper.insert(typeIDVectorInt, "label",  "instance",  "process");  // 3, 4, 5
-  helper.insert(typeIDEventID, "labelB", "instanceB", "processB");   // 6, 7
-  helper.insert(typeIDEventID, "label",  "instanceB", "processB");   // 8, 9
-  helper.insert(typeIDEventID, "labelX", "instanceB", "processB");   // 10, 11
-  helper.insert(typeIDEventID, "labelB", "instance",  "processB");   // 12, 13
-  helper.insert(typeIDEventID, "labelB", "instanceX", "processB");   // 14, 15
-  helper.insert(typeIDEventID, "labelB", "instanceB", "processB1");  // 16, 5
-  helper.insert(typeIDEventID, "labelB", "instanceB", "processB3");  // 17, 5
-  helper.insert(typeIDEventID, "labelB", "instanceB", "processB2");  // 18, 5
-  helper.insert(typeIDProductID, "label",  "instance",  "process");  // 19, 20
-  helper.insert(typeIDEventID, "label",  "instance",  "process");    // 21, 22
-  helper.insert(typeIDProductID, "labelA", "instanceA", "processA"); // 23, 24
-  helper.insert(typeIDSetInt, "labelC", "instanceC", "processC"); // 25, 26
-  helper.insert(typeIDVSimpleDerived, "labelC", "instanceC", "processC"); // 27, 28, 29, 30
-  
+
+  helper.insert(typeIDVectorInt, "labelC", "instanceC", "processC");       // 0, 1, 2
+  helper.insert(typeIDVectorInt, "label", "instance", "process");          // 3, 4, 5
+  helper.insert(typeIDEventID, "labelB", "instanceB", "processB");         // 6, 7
+  helper.insert(typeIDEventID, "label", "instanceB", "processB");          // 8, 9
+  helper.insert(typeIDEventID, "labelX", "instanceB", "processB");         // 10, 11
+  helper.insert(typeIDEventID, "labelB", "instance", "processB");          // 12, 13
+  helper.insert(typeIDEventID, "labelB", "instanceX", "processB");         // 14, 15
+  helper.insert(typeIDEventID, "labelB", "instanceB", "processB1");        // 16, 5
+  helper.insert(typeIDEventID, "labelB", "instanceB", "processB3");        // 17, 5
+  helper.insert(typeIDEventID, "labelB", "instanceB", "processB2");        // 18, 5
+  helper.insert(typeIDProductID, "label", "instance", "process");          // 19, 20
+  helper.insert(typeIDEventID, "label", "instance", "process");            // 21, 22
+  helper.insert(typeIDProductID, "labelA", "instanceA", "processA");       // 23, 24
+  helper.insert(typeIDSetInt, "labelC", "instanceC", "processC");          // 25, 26
+  helper.insert(typeIDVSimpleDerived, "labelC", "instanceC", "processC");  // 27, 28, 29, 30
+
   helper.setFrozen();
-  
+
   edm::TypeID typeID_int(typeid(int));
   edm::TypeID typeID_Simple(typeid(edmtest::Simple));
 
@@ -341,73 +349,77 @@ TestEDConsumerBase::testViewType()
   const auto v_simple_no_proc = helper.index(edm::ELEMENT_TYPE, typeID_Simple, "labelC", "instanceC");
 
   {
-    std::vector<std::pair<edm::TypeToGet,edm::InputTag>> vT = {
-      {edm::TypeToGet::make<edm::View<int>>(),{"label",  "instance",  "process"}},
-      {edm::TypeToGet::make<edm::View<edmtest::Simple>>(),{"labelC", "instanceC", "processC"}}
-    };
+    std::vector<std::pair<edm::TypeToGet, edm::InputTag>> vT = {
+        {edm::TypeToGet::make<edm::View<int>>(), {"label", "instance", "process"}},
+        {edm::TypeToGet::make<edm::View<edmtest::Simple>>(), {"labelC", "instanceC", "processC"}}};
     TypeToGetConsumer consumer{vT};
-    
-    consumer.updateLookup(edm::InEvent,helper,false);
+
+    consumer.updateLookup(edm::InEvent, helper, false);
     CPPUNIT_ASSERT(edm::ProductResolverIndexAndSkipBit(v_int, false) ==
-                   consumer.indexFrom(consumer.m_tokens[0],edm::InEvent,typeID_int));
+                   consumer.indexFrom(consumer.m_tokens[0], edm::InEvent, typeID_int));
     CPPUNIT_ASSERT(edm::ProductResolverIndexAndSkipBit(v_simple, false) ==
-                   consumer.indexFrom(consumer.m_tokens[1],edm::InEvent,typeID_Simple));
+                   consumer.indexFrom(consumer.m_tokens[1], edm::InEvent, typeID_Simple));
 
     {
       std::vector<edm::ProductResolverIndexAndSkipBit> indices;
-      consumer.itemsToGet(edm::InEvent,indices);
-    
+      consumer.itemsToGet(edm::InEvent, indices);
+
       CPPUNIT_ASSERT(2 == indices.size());
-      CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),indices.end(), edm::ProductResolverIndexAndSkipBit(v_int, false)));
-      CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),indices.end(), edm::ProductResolverIndexAndSkipBit(v_simple, false)));
+      CPPUNIT_ASSERT(indices.end() !=
+                     std::find(indices.begin(), indices.end(), edm::ProductResolverIndexAndSkipBit(v_int, false)));
+      CPPUNIT_ASSERT(indices.end() !=
+                     std::find(indices.begin(), indices.end(), edm::ProductResolverIndexAndSkipBit(v_simple, false)));
 
       std::vector<edm::ProductResolverIndexAndSkipBit> indicesMay;
-      consumer.itemsMayGet(edm::InEvent,indicesMay);
+      consumer.itemsMayGet(edm::InEvent, indicesMay);
       CPPUNIT_ASSERT(0 == indicesMay.size());
     }
   }
 
   {
-    std::vector<std::pair<edm::TypeToGet,edm::InputTag>> vT = {
-      {edm::TypeToGet::make<edm::View<int>>(),{"label",  "instance"}},
-      {edm::TypeToGet::make<edm::View<edmtest::Simple>>(),{"labelC", "instanceC","@skipCurrentProcess"}}
-    };
+    std::vector<std::pair<edm::TypeToGet, edm::InputTag>> vT = {
+        {edm::TypeToGet::make<edm::View<int>>(), {"label", "instance"}},
+        {edm::TypeToGet::make<edm::View<edmtest::Simple>>(), {"labelC", "instanceC", "@skipCurrentProcess"}}};
     TypeToGetConsumer consumer{vT};
 
-    consumer.updateLookup(edm::InEvent,helper,false);
+    consumer.updateLookup(edm::InEvent, helper, false);
 
     CPPUNIT_ASSERT(edm::ProductResolverIndexAndSkipBit(v_int_no_proc, false) ==
-                   consumer.indexFrom(consumer.m_tokens[0],edm::InEvent,typeID_int));
+                   consumer.indexFrom(consumer.m_tokens[0], edm::InEvent, typeID_int));
     CPPUNIT_ASSERT(edm::ProductResolverIndexAndSkipBit(v_simple_no_proc, true) ==
-                   consumer.indexFrom(consumer.m_tokens[1],edm::InEvent,typeID_Simple));
+                   consumer.indexFrom(consumer.m_tokens[1], edm::InEvent, typeID_Simple));
     {
       std::vector<edm::ProductResolverIndexAndSkipBit> indices;
-      consumer.itemsToGet(edm::InEvent,indices);
-      
+      consumer.itemsToGet(edm::InEvent, indices);
+
       CPPUNIT_ASSERT(2 == indices.size());
-      CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),indices.end(), edm::ProductResolverIndexAndSkipBit(v_int_no_proc, false)));
-      CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),indices.end(), edm::ProductResolverIndexAndSkipBit(v_simple_no_proc, true)));
-      
+      CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),
+                                                indices.end(),
+                                                edm::ProductResolverIndexAndSkipBit(v_int_no_proc, false)));
+      CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),
+                                                indices.end(),
+                                                edm::ProductResolverIndexAndSkipBit(v_simple_no_proc, true)));
+
       std::vector<edm::ProductResolverIndexAndSkipBit> indicesMay;
-      consumer.itemsMayGet(edm::InEvent,indicesMay);
+      consumer.itemsMayGet(edm::InEvent, indicesMay);
       CPPUNIT_ASSERT(0 == indicesMay.size());
     }
   }
 
   {
     //Ask for something that doesn't exist
-    std::vector<std::pair<edm::TypeToGet,edm::InputTag>> vT = {
-      {edm::TypeToGet::make<edm::View<int>>(),{"notHere",  ""}}
-    };
+    std::vector<std::pair<edm::TypeToGet, edm::InputTag>> vT = {
+        {edm::TypeToGet::make<edm::View<int>>(), {"notHere", ""}}};
     TypeToGetConsumer consumer{vT};
-    consumer.updateLookup(edm::InEvent,helper,false);
-    
-    CPPUNIT_ASSERT(consumer.m_tokens[0].index()==0);
-    CPPUNIT_ASSERT(edm::ProductResolverIndexInvalid == consumer.indexFrom(consumer.m_tokens[0],edm::InEvent,typeID_int).productResolverIndex());
+    consumer.updateLookup(edm::InEvent, helper, false);
+
+    CPPUNIT_ASSERT(consumer.m_tokens[0].index() == 0);
+    CPPUNIT_ASSERT(edm::ProductResolverIndexInvalid ==
+                   consumer.indexFrom(consumer.m_tokens[0], edm::InEvent, typeID_int).productResolverIndex());
     {
       std::vector<edm::ProductResolverIndexAndSkipBit> indices;
-      consumer.itemsToGet(edm::InEvent,indices);
-      
+      consumer.itemsToGet(edm::InEvent, indices);
+
       CPPUNIT_ASSERT(0 == indices.size());
     }
   }
@@ -416,40 +428,35 @@ TestEDConsumerBase::testViewType()
 namespace {
   class ManyEventIDConsumer : public edm::EDConsumerBase {
   public:
-    ManyEventIDConsumer() {
-      consumesMany<edm::EventID>();
-    }
+    ManyEventIDConsumer() { consumesMany<edm::EventID>(); }
   };
-}
+}  // namespace
 
-void
-TestEDConsumerBase::testMany()
-{
-  
+void TestEDConsumerBase::testMany() {
   edm::ProductResolverIndexHelper helper;
-  
+
   edm::TypeID typeIDProductID(typeid(edm::ProductID));
   edm::TypeID typeIDEventID(typeid(edm::EventID));
   edm::TypeID typeIDVectorInt(typeid(std::vector<int>));
   edm::TypeID typeIDSetInt(typeid(std::set<int>));
   edm::TypeID typeIDVSimpleDerived(typeid(std::vector<edmtest::SimpleDerived>));
-  
-  helper.insert(typeIDVectorInt, "labelC", "instanceC", "processC"); // 0, 1, 2
-  helper.insert(typeIDVectorInt, "label",  "instance",  "process");  // 3, 4, 5
-  helper.insert(typeIDEventID, "labelB", "instanceB", "processB");   // 6, 7
-  helper.insert(typeIDEventID, "label",  "instanceB", "processB");   // 8, 9
-  helper.insert(typeIDEventID, "labelX", "instanceB", "processB");   // 10, 11
-  helper.insert(typeIDEventID, "labelB", "instance",  "processB");   // 12, 13
-  helper.insert(typeIDEventID, "labelB", "instanceX", "processB");   // 14, 15
-  helper.insert(typeIDEventID, "labelB", "instanceB", "processB1");  // 16, 5
-  helper.insert(typeIDEventID, "labelB", "instanceB", "processB3");  // 17, 5
-  helper.insert(typeIDEventID, "labelB", "instanceB", "processB2");  // 18, 5
-  helper.insert(typeIDProductID, "label",  "instance",  "process");  // 19, 20
-  helper.insert(typeIDEventID, "label",  "instance",  "process");    // 21, 22
-  helper.insert(typeIDProductID, "labelA", "instanceA", "processA"); // 23, 24
-  helper.insert(typeIDSetInt, "labelC", "instanceC", "processC"); // 25, 26
-  helper.insert(typeIDVSimpleDerived, "labelC", "instanceC", "processC"); // 27, 28, 29, 30
-  
+
+  helper.insert(typeIDVectorInt, "labelC", "instanceC", "processC");       // 0, 1, 2
+  helper.insert(typeIDVectorInt, "label", "instance", "process");          // 3, 4, 5
+  helper.insert(typeIDEventID, "labelB", "instanceB", "processB");         // 6, 7
+  helper.insert(typeIDEventID, "label", "instanceB", "processB");          // 8, 9
+  helper.insert(typeIDEventID, "labelX", "instanceB", "processB");         // 10, 11
+  helper.insert(typeIDEventID, "labelB", "instance", "processB");          // 12, 13
+  helper.insert(typeIDEventID, "labelB", "instanceX", "processB");         // 14, 15
+  helper.insert(typeIDEventID, "labelB", "instanceB", "processB1");        // 16, 5
+  helper.insert(typeIDEventID, "labelB", "instanceB", "processB3");        // 17, 5
+  helper.insert(typeIDEventID, "labelB", "instanceB", "processB2");        // 18, 5
+  helper.insert(typeIDProductID, "label", "instance", "process");          // 19, 20
+  helper.insert(typeIDEventID, "label", "instance", "process");            // 21, 22
+  helper.insert(typeIDProductID, "labelA", "instanceA", "processA");       // 23, 24
+  helper.insert(typeIDSetInt, "labelC", "instanceC", "processC");          // 25, 26
+  helper.insert(typeIDVSimpleDerived, "labelC", "instanceC", "processC");  // 27, 28, 29, 30
+
   helper.setFrozen();
 
   edm::TypeID typeID_EventID(typeid(edm::EventID));
@@ -458,141 +465,150 @@ TestEDConsumerBase::testMany()
 
   {
     ManyEventIDConsumer consumer{};
-    consumer.updateLookup(edm::InEvent,helper,false);
+    consumer.updateLookup(edm::InEvent, helper, false);
 
     std::vector<edm::ProductResolverIndexAndSkipBit> indices;
-    consumer.itemsToGet(edm::InEvent,indices);
+    consumer.itemsToGet(edm::InEvent, indices);
 
     CPPUNIT_ASSERT(9 == indices.size());
-    CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),indices.end(), edm::ProductResolverIndexAndSkipBit(productIndex, false)));
+    CPPUNIT_ASSERT(indices.end() !=
+                   std::find(indices.begin(), indices.end(), edm::ProductResolverIndexAndSkipBit(productIndex, false)));
   }
 }
 
-void
-TestEDConsumerBase::testMay()
-{
- 
+void TestEDConsumerBase::testMay() {
   edm::ProductResolverIndexHelper helper;
-  
+
   edm::TypeID typeIDProductID(typeid(edm::ProductID));
   edm::TypeID typeIDEventID(typeid(edm::EventID));
   edm::TypeID typeIDVectorInt(typeid(std::vector<int>));
   edm::TypeID typeIDSetInt(typeid(std::set<int>));
   edm::TypeID typeIDVSimpleDerived(typeid(std::vector<edmtest::SimpleDerived>));
-  
-  helper.insert(typeIDVectorInt, "labelC", "instanceC", "processC"); // 0, 1, 2
-  helper.insert(typeIDVectorInt, "label",  "instance",  "process");  // 3, 4, 5
-  helper.insert(typeIDEventID, "labelB", "instanceB", "processB");   // 6, 7
-  helper.insert(typeIDEventID, "label",  "instanceB", "processB");   // 8, 9
-  helper.insert(typeIDEventID, "labelX", "instanceB", "processB");   // 10, 11
-  helper.insert(typeIDEventID, "labelB", "instance",  "processB");   // 12, 13
-  helper.insert(typeIDEventID, "labelB", "instanceX", "processB");   // 14, 15
-  helper.insert(typeIDEventID, "labelB", "instanceB", "processB1");  // 16, 5
-  helper.insert(typeIDEventID, "labelB", "instanceB", "processB3");  // 17, 5
-  helper.insert(typeIDEventID, "labelB", "instanceB", "processB2");  // 18, 5
-  helper.insert(typeIDProductID, "label",  "instance",  "process");  // 19, 20
-  helper.insert(typeIDEventID, "label",  "instance",  "process");    // 21, 22
-  helper.insert(typeIDProductID, "labelA", "instanceA", "processA"); // 23, 24
-  helper.insert(typeIDSetInt, "labelC", "instanceC", "processC"); // 25, 26
-  helper.insert(typeIDVSimpleDerived, "labelC", "instanceC", "processC"); // 27, 28, 29, 30
-  
+
+  helper.insert(typeIDVectorInt, "labelC", "instanceC", "processC");       // 0, 1, 2
+  helper.insert(typeIDVectorInt, "label", "instance", "process");          // 3, 4, 5
+  helper.insert(typeIDEventID, "labelB", "instanceB", "processB");         // 6, 7
+  helper.insert(typeIDEventID, "label", "instanceB", "processB");          // 8, 9
+  helper.insert(typeIDEventID, "labelX", "instanceB", "processB");         // 10, 11
+  helper.insert(typeIDEventID, "labelB", "instance", "processB");          // 12, 13
+  helper.insert(typeIDEventID, "labelB", "instanceX", "processB");         // 14, 15
+  helper.insert(typeIDEventID, "labelB", "instanceB", "processB1");        // 16, 5
+  helper.insert(typeIDEventID, "labelB", "instanceB", "processB3");        // 17, 5
+  helper.insert(typeIDEventID, "labelB", "instanceB", "processB2");        // 18, 5
+  helper.insert(typeIDProductID, "label", "instance", "process");          // 19, 20
+  helper.insert(typeIDEventID, "label", "instance", "process");            // 21, 22
+  helper.insert(typeIDProductID, "labelA", "instanceA", "processA");       // 23, 24
+  helper.insert(typeIDSetInt, "labelC", "instanceC", "processC");          // 25, 26
+  helper.insert(typeIDVSimpleDerived, "labelC", "instanceC", "processC");  // 27, 28, 29, 30
+
   helper.setFrozen();
   edm::TypeID typeID_vint(typeid(std::vector<int>));
   const auto vint_c = helper.index(edm::PRODUCT_TYPE, typeID_vint, "labelC", "instanceC", "processC");
   const auto vint_c_no_proc = helper.index(edm::PRODUCT_TYPE, typeID_vint, "labelC", "instanceC", 0);
   const auto vint_blank = helper.index(edm::PRODUCT_TYPE, typeID_vint, "label", "instance", "process");
-  const auto vint_blank_no_proc = helper.index(edm::PRODUCT_TYPE, typeID_vint, "label", "instance",0);
+  const auto vint_blank_no_proc = helper.index(edm::PRODUCT_TYPE, typeID_vint, "label", "instance", 0);
   {
-    std::vector<edm::InputTag> vTags={ {"label","instance","process"}, {"labelC","instanceC","processC"} };
+    std::vector<edm::InputTag> vTags = {{"label", "instance", "process"}, {"labelC", "instanceC", "processC"}};
     std::vector<edm::InputTag> vMayTags;
-    IntsMayConsumer consumer{vTags,vMayTags};
-    consumer.updateLookup(edm::InEvent,helper,false);
-    
-    CPPUNIT_ASSERT(consumer.m_tokens[0].index()==0);
-    CPPUNIT_ASSERT(consumer.m_tokens[1].index()==1);
-    CPPUNIT_ASSERT(consumer.m_mayTokens.size()==0);
+    IntsMayConsumer consumer{vTags, vMayTags};
+    consumer.updateLookup(edm::InEvent, helper, false);
+
+    CPPUNIT_ASSERT(consumer.m_tokens[0].index() == 0);
+    CPPUNIT_ASSERT(consumer.m_tokens[1].index() == 1);
+    CPPUNIT_ASSERT(consumer.m_mayTokens.size() == 0);
 
     CPPUNIT_ASSERT(edm::ProductResolverIndexAndSkipBit(vint_c, false) ==
-                   consumer.indexFrom(consumer.m_tokens[1],edm::InEvent,typeID_vint));
+                   consumer.indexFrom(consumer.m_tokens[1], edm::InEvent, typeID_vint));
     CPPUNIT_ASSERT(edm::ProductResolverIndexAndSkipBit(vint_blank, false) ==
-                   consumer.indexFrom(consumer.m_tokens[0],edm::InEvent,typeID_vint));
+                   consumer.indexFrom(consumer.m_tokens[0], edm::InEvent, typeID_vint));
 
     std::vector<edm::ProductResolverIndexAndSkipBit> indices;
-    consumer.itemsToGet(edm::InEvent,indices);
-    
+    consumer.itemsToGet(edm::InEvent, indices);
+
     CPPUNIT_ASSERT(2 == indices.size());
-    CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),indices.end(), edm::ProductResolverIndexAndSkipBit(vint_c, false)));
-    CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),indices.end(), edm::ProductResolverIndexAndSkipBit(vint_blank, false)));
-    
+    CPPUNIT_ASSERT(indices.end() !=
+                   std::find(indices.begin(), indices.end(), edm::ProductResolverIndexAndSkipBit(vint_c, false)));
+    CPPUNIT_ASSERT(indices.end() !=
+                   std::find(indices.begin(), indices.end(), edm::ProductResolverIndexAndSkipBit(vint_blank, false)));
+
     std::vector<edm::ProductResolverIndexAndSkipBit> indicesMay;
-    consumer.itemsMayGet(edm::InEvent,indicesMay);
+    consumer.itemsMayGet(edm::InEvent, indicesMay);
     CPPUNIT_ASSERT(0 == indicesMay.size());
   }
 
   {
     std::vector<edm::InputTag> vTags;
-    std::vector<edm::InputTag> vMayTags={ {"label","instance","process"}, {"labelC","instanceC","processC"} };
-    IntsMayConsumer consumer{vTags,vMayTags};
-    consumer.updateLookup(edm::InEvent,helper,false);
-    
-    CPPUNIT_ASSERT(consumer.m_mayTokens.size()==2);
-    CPPUNIT_ASSERT(consumer.m_mayTokens[0].index()==0);
-    CPPUNIT_ASSERT(consumer.m_mayTokens[1].index()==1);
-    CPPUNIT_ASSERT(consumer.m_tokens.size()==0);
-
-    CPPUNIT_ASSERT(vint_c == consumer.indexFrom(consumer.m_mayTokens[1],edm::InEvent,typeID_vint).productResolverIndex());
-    CPPUNIT_ASSERT(vint_blank == consumer.indexFrom(consumer.m_mayTokens[0],edm::InEvent,typeID_vint).productResolverIndex());
-    
+    std::vector<edm::InputTag> vMayTags = {{"label", "instance", "process"}, {"labelC", "instanceC", "processC"}};
+    IntsMayConsumer consumer{vTags, vMayTags};
+    consumer.updateLookup(edm::InEvent, helper, false);
+
+    CPPUNIT_ASSERT(consumer.m_mayTokens.size() == 2);
+    CPPUNIT_ASSERT(consumer.m_mayTokens[0].index() == 0);
+    CPPUNIT_ASSERT(consumer.m_mayTokens[1].index() == 1);
+    CPPUNIT_ASSERT(consumer.m_tokens.size() == 0);
+
+    CPPUNIT_ASSERT(vint_c ==
+                   consumer.indexFrom(consumer.m_mayTokens[1], edm::InEvent, typeID_vint).productResolverIndex());
+    CPPUNIT_ASSERT(vint_blank ==
+                   consumer.indexFrom(consumer.m_mayTokens[0], edm::InEvent, typeID_vint).productResolverIndex());
+
     std::vector<edm::ProductResolverIndexAndSkipBit> indices;
-    consumer.itemsToGet(edm::InEvent,indices);
+    consumer.itemsToGet(edm::InEvent, indices);
     CPPUNIT_ASSERT(0 == indices.size());
-    
+
     std::vector<edm::ProductResolverIndexAndSkipBit> indicesMay;
-    consumer.itemsMayGet(edm::InEvent,indicesMay);
+    consumer.itemsMayGet(edm::InEvent, indicesMay);
     CPPUNIT_ASSERT(2 == indicesMay.size());
-    CPPUNIT_ASSERT(indicesMay.end() != std::find(indicesMay.begin(),indicesMay.end(), edm::ProductResolverIndexAndSkipBit(vint_c, false)));
-    CPPUNIT_ASSERT(indicesMay.end() != std::find(indicesMay.begin(),indicesMay.end(), edm::ProductResolverIndexAndSkipBit(vint_blank, false)));
+    CPPUNIT_ASSERT(indicesMay.end() !=
+                   std::find(indicesMay.begin(), indicesMay.end(), edm::ProductResolverIndexAndSkipBit(vint_c, false)));
+    CPPUNIT_ASSERT(indicesMay.end() != std::find(indicesMay.begin(),
+                                                 indicesMay.end(),
+                                                 edm::ProductResolverIndexAndSkipBit(vint_blank, false)));
   }
 
   {
-    std::vector<edm::InputTag> vTags={ {"label","instance","process"} };
-    std::vector<edm::InputTag> vMayTags={{"labelC","instanceC","processC"} };
-    IntsMayConsumer consumer{vTags,vMayTags};
-    consumer.updateLookup(edm::InEvent,helper,false);
-    
-    CPPUNIT_ASSERT(consumer.m_mayTokens.size()==1);
-    CPPUNIT_ASSERT(consumer.m_tokens.size()==1);
-    CPPUNIT_ASSERT(consumer.m_tokens[0].index()==0);
-    CPPUNIT_ASSERT(consumer.m_mayTokens[0].index()==1);
-
-    CPPUNIT_ASSERT(vint_c == consumer.indexFrom(consumer.m_mayTokens[0],edm::InEvent,typeID_vint).productResolverIndex());
-    CPPUNIT_ASSERT(vint_blank == consumer.indexFrom(consumer.m_tokens[0],edm::InEvent,typeID_vint).productResolverIndex());
-    
+    std::vector<edm::InputTag> vTags = {{"label", "instance", "process"}};
+    std::vector<edm::InputTag> vMayTags = {{"labelC", "instanceC", "processC"}};
+    IntsMayConsumer consumer{vTags, vMayTags};
+    consumer.updateLookup(edm::InEvent, helper, false);
+
+    CPPUNIT_ASSERT(consumer.m_mayTokens.size() == 1);
+    CPPUNIT_ASSERT(consumer.m_tokens.size() == 1);
+    CPPUNIT_ASSERT(consumer.m_tokens[0].index() == 0);
+    CPPUNIT_ASSERT(consumer.m_mayTokens[0].index() == 1);
+
+    CPPUNIT_ASSERT(vint_c ==
+                   consumer.indexFrom(consumer.m_mayTokens[0], edm::InEvent, typeID_vint).productResolverIndex());
+    CPPUNIT_ASSERT(vint_blank ==
+                   consumer.indexFrom(consumer.m_tokens[0], edm::InEvent, typeID_vint).productResolverIndex());
+
     std::vector<edm::ProductResolverIndexAndSkipBit> indices;
-    consumer.itemsToGet(edm::InEvent,indices);
-    
+    consumer.itemsToGet(edm::InEvent, indices);
+
     CPPUNIT_ASSERT(1 == indices.size());
-    CPPUNIT_ASSERT(indices.end() != std::find(indices.begin(),indices.end(), edm::ProductResolverIndexAndSkipBit(vint_blank, false)));
-    
+    CPPUNIT_ASSERT(indices.end() !=
+                   std::find(indices.begin(), indices.end(), edm::ProductResolverIndexAndSkipBit(vint_blank, false)));
+
     std::vector<edm::ProductResolverIndexAndSkipBit> indicesMay;
-    consumer.itemsMayGet(edm::InEvent,indicesMay);
+    consumer.itemsMayGet(edm::InEvent, indicesMay);
     CPPUNIT_ASSERT(1 == indicesMay.size());
-    CPPUNIT_ASSERT(indicesMay.end() != std::find(indicesMay.begin(),indicesMay.end(), edm::ProductResolverIndexAndSkipBit(vint_c, false)));
+    CPPUNIT_ASSERT(indicesMay.end() !=
+                   std::find(indicesMay.begin(), indicesMay.end(), edm::ProductResolverIndexAndSkipBit(vint_c, false)));
   }
   {
     std::vector<edm::InputTag> vTags;
-    std::vector<edm::InputTag> vMayTags={ {"label","instance",""}, {"labelC","instanceC","@skipCurrentProcess"} };
-    IntsMayConsumer consumer{vTags,vMayTags};
-    consumer.updateLookup(edm::InEvent,helper,false);
-    
-    CPPUNIT_ASSERT(consumer.m_mayTokens.size()==2);
-    CPPUNIT_ASSERT(consumer.m_mayTokens[0].index()==0);
-    CPPUNIT_ASSERT(consumer.m_mayTokens[1].index()==1);
-    CPPUNIT_ASSERT(consumer.m_tokens.size()==0);
+    std::vector<edm::InputTag> vMayTags = {{"label", "instance", ""}, {"labelC", "instanceC", "@skipCurrentProcess"}};
+    IntsMayConsumer consumer{vTags, vMayTags};
+    consumer.updateLookup(edm::InEvent, helper, false);
+
+    CPPUNIT_ASSERT(consumer.m_mayTokens.size() == 2);
+    CPPUNIT_ASSERT(consumer.m_mayTokens[0].index() == 0);
+    CPPUNIT_ASSERT(consumer.m_mayTokens[1].index() == 1);
+    CPPUNIT_ASSERT(consumer.m_tokens.size() == 0);
 
     CPPUNIT_ASSERT(edm::ProductResolverIndexAndSkipBit(vint_c_no_proc, true) ==
-                   consumer.indexFrom(consumer.m_mayTokens[1],edm::InEvent,typeID_vint));
+                   consumer.indexFrom(consumer.m_mayTokens[1], edm::InEvent, typeID_vint));
     CPPUNIT_ASSERT(edm::ProductResolverIndexAndSkipBit(vint_blank_no_proc, false) ==
-                   consumer.indexFrom(consumer.m_mayTokens[0],edm::InEvent,typeID_vint));
+                   consumer.indexFrom(consumer.m_mayTokens[0], edm::InEvent, typeID_vint));
   }
 }
diff --git a/FWCore/Framework/test/edproducer_productregistry_callback.cc b/FWCore/Framework/test/edproducer_productregistry_callback.cc
index 258edc93eee12..87ec7f75f0da7 100644
--- a/FWCore/Framework/test/edproducer_productregistry_callback.cc
+++ b/FWCore/Framework/test/edproducer_productregistry_callback.cc
@@ -6,7 +6,6 @@
    \date 21 July 2005
 */
 
-
 #include <iostream>
 #include "cppunit/extensions/HelperMacros.h"
 #include <memory>
@@ -30,22 +29,21 @@
 #include "FWCore/ServiceRegistry/interface/ServiceRegistry.h"
 #include "FWCore/Utilities/interface/TypeID.h"
 
-class testEDProducerProductRegistryCallback: public CppUnit::TestFixture {
-   CPPUNIT_TEST_SUITE(testEDProducerProductRegistryCallback);
+class testEDProducerProductRegistryCallback : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testEDProducerProductRegistryCallback);
 
-   CPPUNIT_TEST_EXCEPTION(testCircularRef,cms::Exception);
-   CPPUNIT_TEST_EXCEPTION(testCircularRef2,cms::Exception);
-   CPPUNIT_TEST(testTwoListeners);
+  CPPUNIT_TEST_EXCEPTION(testCircularRef, cms::Exception);
+  CPPUNIT_TEST_EXCEPTION(testCircularRef2, cms::Exception);
+  CPPUNIT_TEST(testTwoListeners);
 
-CPPUNIT_TEST_SUITE_END();
+  CPPUNIT_TEST_SUITE_END();
 
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
   void testCircularRef();
   void testCircularRef2();
   void testTwoListeners();
-
 };
 
 ///registration of the test so that the runner can find it
@@ -54,288 +52,288 @@ CPPUNIT_TEST_SUITE_REGISTRATION(testEDProducerProductRegistryCallback);
 using namespace edm;
 
 namespace {
-   class TestMod : public EDProducer {
-     public:
-      explicit TestMod(ParameterSet const& p);
-      
-      void produce(Event& e, EventSetup const&);
-      
-      void listen(BranchDescription const&);
-   };
-   
-   TestMod::TestMod(ParameterSet const&)
-   { produces<int>();}
-   
-   void TestMod::produce(Event&, EventSetup const&) {
-   }
-
-   class ListenMod : public EDProducer {
-     public:
-      explicit ListenMod(ParameterSet const&);
-      void produce(Event& e, EventSetup const&);
-      void listen(BranchDescription const&);
-   };
-   
-   ListenMod::ListenMod(ParameterSet const&) {
-     callWhenNewProductsRegistered([this](BranchDescription const& branchDescription){this->listen(branchDescription);});
-   }
-   void ListenMod::produce(Event&, EventSetup const&) {
-   }
-   
-   void ListenMod::listen(BranchDescription const& iDesc) {
-      edm::TypeID intType(typeid(int));
-      //std::cout << "see class " << iDesc.typeName() << std::endl;
-      if(iDesc.friendlyClassName() == intType.friendlyClassName()) {
-         produces<int>(iDesc.moduleLabel() + "-" + iDesc.productInstanceName());
-         //std::cout << iDesc.moduleLabel() << "-" << iDesc.productInstanceName() << std::endl;
-      }
-   }
-
-   class ListenFloatMod : public EDProducer {
-public:
-      explicit ListenFloatMod(ParameterSet const&);
-      void produce(Event& e, EventSetup const&);
-      void listen(BranchDescription const&);
-   };
-   
-   ListenFloatMod::ListenFloatMod(ParameterSet const&) {
-      callWhenNewProductsRegistered([this](BranchDescription const& branchDescription){this->listen(branchDescription);});
-   }
-   void ListenFloatMod::produce(Event&, EventSetup const&) {
-   }
-   
-   void ListenFloatMod::listen(BranchDescription const& iDesc) {
-      edm::TypeID intType(typeid(int));
-      //std::cout <<"see class "<<iDesc.typeName()<<std::endl;
-      if(iDesc.friendlyClassName() == intType.friendlyClassName()) {
-         produces<float>(iDesc.moduleLabel()+"-"+iDesc.productInstanceName());
-         //std::cout <<iDesc.moduleLabel()<<"-"<<iDesc.productInstanceName()<<std::endl;
-      }
-   }
-}
+  class TestMod : public EDProducer {
+  public:
+    explicit TestMod(ParameterSet const& p);
+
+    void produce(Event& e, EventSetup const&);
+
+    void listen(BranchDescription const&);
+  };
+
+  TestMod::TestMod(ParameterSet const&) { produces<int>(); }
+
+  void TestMod::produce(Event&, EventSetup const&) {}
+
+  class ListenMod : public EDProducer {
+  public:
+    explicit ListenMod(ParameterSet const&);
+    void produce(Event& e, EventSetup const&);
+    void listen(BranchDescription const&);
+  };
+
+  ListenMod::ListenMod(ParameterSet const&) {
+    callWhenNewProductsRegistered(
+        [this](BranchDescription const& branchDescription) { this->listen(branchDescription); });
+  }
+  void ListenMod::produce(Event&, EventSetup const&) {}
+
+  void ListenMod::listen(BranchDescription const& iDesc) {
+    edm::TypeID intType(typeid(int));
+    //std::cout << "see class " << iDesc.typeName() << std::endl;
+    if (iDesc.friendlyClassName() == intType.friendlyClassName()) {
+      produces<int>(iDesc.moduleLabel() + "-" + iDesc.productInstanceName());
+      //std::cout << iDesc.moduleLabel() << "-" << iDesc.productInstanceName() << std::endl;
+    }
+  }
+
+  class ListenFloatMod : public EDProducer {
+  public:
+    explicit ListenFloatMod(ParameterSet const&);
+    void produce(Event& e, EventSetup const&);
+    void listen(BranchDescription const&);
+  };
+
+  ListenFloatMod::ListenFloatMod(ParameterSet const&) {
+    callWhenNewProductsRegistered(
+        [this](BranchDescription const& branchDescription) { this->listen(branchDescription); });
+  }
+  void ListenFloatMod::produce(Event&, EventSetup const&) {}
+
+  void ListenFloatMod::listen(BranchDescription const& iDesc) {
+    edm::TypeID intType(typeid(int));
+    //std::cout <<"see class "<<iDesc.typeName()<<std::endl;
+    if (iDesc.friendlyClassName() == intType.friendlyClassName()) {
+      produces<float>(iDesc.moduleLabel() + "-" + iDesc.productInstanceName());
+      //std::cout <<iDesc.moduleLabel()<<"-"<<iDesc.productInstanceName()<<std::endl;
+    }
+  }
+}  // namespace
+
+void testEDProducerProductRegistryCallback::testCircularRef() {
+  using namespace edm;
+
+  SignallingProductRegistry preg;
+
+  //Need access to the ConstProductRegistry service
+  auto cReg = std::make_unique<ConstProductRegistry>(preg);
+  ServiceToken token = ServiceRegistry::createContaining(std::move(cReg));
+  ServiceRegistry::Operate startServices(token);
+
+  std::unique_ptr<Maker> f = std::make_unique<WorkerMaker<TestMod>>();
+
+  ParameterSet p1;
+  p1.addParameter("@module_type", std::string("TestMod"));
+  p1.addParameter("@module_label", std::string("t1"));
+  p1.addParameter("@module_edm_type", std::string("EDProducer"));
+  p1.registerIt();
+
+  ParameterSet p2;
+  p2.addParameter("@module_type", std::string("TestMod"));
+  p2.addParameter("@module_label", std::string("t2"));
+  p2.addParameter("@module_edm_type", std::string("EDProducer"));
+  p2.registerIt();
+
+  edm::ExceptionToActionTable table;
+  edm::PreallocationConfiguration prealloc;
+
+  edm::ParameterSet dummyProcessPset;
+  dummyProcessPset.registerIt();
+  auto pc =
+      std::make_shared<ProcessConfiguration>("PROD", dummyProcessPset.id(), edm::getReleaseVersion(), edm::getPassID());
+
+  edm::MakeModuleParams params1(&p1, preg, &prealloc, pc);
+  edm::MakeModuleParams params2(&p2, preg, &prealloc, pc);
+
+  std::unique_ptr<Maker> lM = std::make_unique<WorkerMaker<ListenMod>>();
+  ParameterSet l1;
+  l1.addParameter("@module_type", std::string("ListenMod"));
+  l1.addParameter("@module_label", std::string("l1"));
+  l1.addParameter("@module_edm_type", std::string("EDProducer"));
+  l1.registerIt();
+
+  ParameterSet l2;
+  l2.addParameter("@module_type", std::string("ListenMod"));
+  l2.addParameter("@module_label", std::string("l2"));
+  l2.addParameter("@module_edm_type", std::string("EDProducer"));
+  l2.registerIt();
+
+  edm::MakeModuleParams paramsl1(&l1, preg, &prealloc, pc);
+  edm::MakeModuleParams paramsl2(&l2, preg, &prealloc, pc);
+
+  signalslot::Signal<void(const ModuleDescription&)> aSignal;
 
-void  testEDProducerProductRegistryCallback::testCircularRef() {
-   using namespace edm;
-   
-   SignallingProductRegistry preg;
-
-   //Need access to the ConstProductRegistry service
-   auto cReg = std::make_unique<ConstProductRegistry>(preg);
-   ServiceToken token = ServiceRegistry::createContaining(std::move(cReg));
-   ServiceRegistry::Operate startServices(token);
-   
-   std::unique_ptr<Maker> f = std::make_unique<WorkerMaker<TestMod>>();
-   
-   ParameterSet p1;
-   p1.addParameter("@module_type",std::string("TestMod") );
-   p1.addParameter("@module_label",std::string("t1") );
-   p1.addParameter("@module_edm_type",std::string("EDProducer") );
-   p1.registerIt();
-   
-   ParameterSet p2;
-   p2.addParameter("@module_type",std::string("TestMod") );
-   p2.addParameter("@module_label",std::string("t2") );
-   p2.addParameter("@module_edm_type",std::string("EDProducer") );
-   p2.registerIt();
-   
-   edm::ExceptionToActionTable table;
-   edm::PreallocationConfiguration prealloc;
-  
-   edm::ParameterSet dummyProcessPset;
-   dummyProcessPset.registerIt();
-   auto pc = std::make_shared<ProcessConfiguration>("PROD", dummyProcessPset.id(), edm::getReleaseVersion(), edm::getPassID());
-
-   edm::MakeModuleParams params1(&p1, preg, &prealloc, pc);
-   edm::MakeModuleParams params2(&p2, preg, &prealloc, pc);
-   
-   std::unique_ptr<Maker> lM = std::make_unique<WorkerMaker<ListenMod>>();
-   ParameterSet l1;
-   l1.addParameter("@module_type",std::string("ListenMod") );
-   l1.addParameter("@module_label",std::string("l1") );
-   l1.addParameter("@module_edm_type",std::string("EDProducer") );
-   l1.registerIt();
-   
-   ParameterSet l2;
-   l2.addParameter("@module_type",std::string("ListenMod") );
-   l2.addParameter("@module_label",std::string("l2") );
-   l2.addParameter("@module_edm_type",std::string("EDProducer") );
-   l2.registerIt();
-
-   edm::MakeModuleParams paramsl1(&l1, preg, &prealloc, pc);
-   edm::MakeModuleParams paramsl2(&l2, preg, &prealloc, pc);
-
-   signalslot::Signal<void(const ModuleDescription&)> aSignal;
-
-   auto m1 = f->makeModule(params1,aSignal,aSignal);
-   std::unique_ptr<Worker> w1 = m1->makeWorker(&table);
-   auto ml1 = lM->makeModule(paramsl1,aSignal,aSignal);
-   std::unique_ptr<Worker> wl1 = ml1->makeWorker(&table);
-   auto ml2 = lM->makeModule(paramsl2,aSignal,aSignal);
-   std::unique_ptr<Worker> wl2 = ml2->makeWorker(&table);
-   auto m2 = f->makeModule(params2,aSignal,aSignal);
-   std::unique_ptr<Worker> w2 = m2->makeWorker(&table);
-
-   //Should be 5 products
-   // 1 from the module 't1'
-   //    1 from 'l1' in response
-   //       1 from 'l2' in response to 'l1'
-   //    1 from 'l2' in response to 't1'
-   //       1 from 'l1' in response to 'l2'
-   // 1 from the module 't2'
-   //    1 from 'l1' in response
-   //       1 from 'l2' in response to 'l1'
-   //    1 from 'l2' in response to 't2'
-   //       1 from 'l1' in response to 'l2'
-   //std::cout <<"# products "<<preg.size()<<std::endl;
-   CPPUNIT_ASSERT(10 == preg.size());
+  auto m1 = f->makeModule(params1, aSignal, aSignal);
+  std::unique_ptr<Worker> w1 = m1->makeWorker(&table);
+  auto ml1 = lM->makeModule(paramsl1, aSignal, aSignal);
+  std::unique_ptr<Worker> wl1 = ml1->makeWorker(&table);
+  auto ml2 = lM->makeModule(paramsl2, aSignal, aSignal);
+  std::unique_ptr<Worker> wl2 = ml2->makeWorker(&table);
+  auto m2 = f->makeModule(params2, aSignal, aSignal);
+  std::unique_ptr<Worker> w2 = m2->makeWorker(&table);
+
+  //Should be 5 products
+  // 1 from the module 't1'
+  //    1 from 'l1' in response
+  //       1 from 'l2' in response to 'l1'
+  //    1 from 'l2' in response to 't1'
+  //       1 from 'l1' in response to 'l2'
+  // 1 from the module 't2'
+  //    1 from 'l1' in response
+  //       1 from 'l2' in response to 'l1'
+  //    1 from 'l2' in response to 't2'
+  //       1 from 'l1' in response to 'l2'
+  //std::cout <<"# products "<<preg.size()<<std::endl;
+  CPPUNIT_ASSERT(10 == preg.size());
 }
 
-void  testEDProducerProductRegistryCallback::testCircularRef2() {
-   using namespace edm;
-   
-   SignallingProductRegistry preg;
-   
-   //Need access to the ConstProductRegistry service
-   auto cReg = std::make_unique<ConstProductRegistry>(preg);
-   ServiceToken token = ServiceRegistry::createContaining(std::move(cReg));
-   ServiceRegistry::Operate startServices(token);
-   
-   std::unique_ptr<Maker> f = std::make_unique<WorkerMaker<TestMod>>();
-   
-   ParameterSet p1;
-   p1.addParameter("@module_type",std::string("TestMod") );
-   p1.addParameter("@module_label",std::string("t1") );
-   p1.addParameter("@module_edm_type",std::string("EDProducer") );
-   p1.registerIt();
-   
-   ParameterSet p2;
-   p2.addParameter("@module_type",std::string("TestMod") );
-   p2.addParameter("@module_label",std::string("t2") );
-   p2.addParameter("@module_edm_type",std::string("EDProducer") );
-   p2.registerIt();
-   
-   edm::ExceptionToActionTable table;
-   edm::PreallocationConfiguration prealloc;
-  
-   edm::ParameterSet dummyProcessPset;
-   dummyProcessPset.registerIt();
-   auto pc = std::make_shared<ProcessConfiguration>("PROD", dummyProcessPset.id(), edm::getReleaseVersion(), edm::getPassID());
-
-   edm::MakeModuleParams params1(&p1, preg, &prealloc, pc);
-   edm::MakeModuleParams params2(&p2, preg, &prealloc, pc);
-   
-   std::unique_ptr<Maker> lM = std::make_unique<WorkerMaker<ListenMod>>();
-   ParameterSet l1;
-   l1.addParameter("@module_type",std::string("ListenMod") );
-   l1.addParameter("@module_label",std::string("l1") );
-   l1.addParameter("@module_edm_type",std::string("EDProducer") );
-   l1.registerIt();
-   
-   ParameterSet l2;
-   l2.addParameter("@module_type",std::string("ListenMod") );
-   l2.addParameter("@module_label",std::string("l2") );
-   l2.addParameter("@module_edm_type",std::string("EDProducer") );
-   l2.registerIt();
-   
-   edm::MakeModuleParams paramsl1(&l1, preg, &prealloc, pc);
-   edm::MakeModuleParams paramsl2(&l2, preg, &prealloc, pc);
-   
-   signalslot::Signal<void(const ModuleDescription&)> aSignal;
-   auto ml1 = lM->makeModule(paramsl1,aSignal,aSignal);
-   std::unique_ptr<Worker> wl1 = ml1->makeWorker(&table);
-   auto ml2 = lM->makeModule(paramsl2,aSignal,aSignal);
-   std::unique_ptr<Worker> wl2 = ml2->makeWorker(&table);
-   auto m1 = f->makeModule(params1,aSignal,aSignal);
-   std::unique_ptr<Worker> w1 = m1->makeWorker(&table);
-   auto m2 = f->makeModule(params2,aSignal,aSignal);
-   std::unique_ptr<Worker> w2 = m2->makeWorker(&table);
-   
-   //Would be 10 products
-   // 1 from the module 't1'
-   //    1 from 'l1' in response
-   //       1 from 'l2' in response to 'l1' <-- circular 
-   //    1 from 'l2' in response to 't1'                  | 
-   //       1 from 'l1' in response to 'l2' <-- circular / 
-   // 1 from the module 't2'
-   //    1 from 'l1' in response
-   //       1 from 'l2' in response to 'l1'
-   //    1 from 'l2' in response to 't2'
-   //       1 from 'l1' in response to 'l2'
-   //std::cout <<"# products "<<preg.size()<<std::endl;
-   CPPUNIT_ASSERT(10 == preg.size());
+void testEDProducerProductRegistryCallback::testCircularRef2() {
+  using namespace edm;
+
+  SignallingProductRegistry preg;
+
+  //Need access to the ConstProductRegistry service
+  auto cReg = std::make_unique<ConstProductRegistry>(preg);
+  ServiceToken token = ServiceRegistry::createContaining(std::move(cReg));
+  ServiceRegistry::Operate startServices(token);
+
+  std::unique_ptr<Maker> f = std::make_unique<WorkerMaker<TestMod>>();
+
+  ParameterSet p1;
+  p1.addParameter("@module_type", std::string("TestMod"));
+  p1.addParameter("@module_label", std::string("t1"));
+  p1.addParameter("@module_edm_type", std::string("EDProducer"));
+  p1.registerIt();
+
+  ParameterSet p2;
+  p2.addParameter("@module_type", std::string("TestMod"));
+  p2.addParameter("@module_label", std::string("t2"));
+  p2.addParameter("@module_edm_type", std::string("EDProducer"));
+  p2.registerIt();
+
+  edm::ExceptionToActionTable table;
+  edm::PreallocationConfiguration prealloc;
+
+  edm::ParameterSet dummyProcessPset;
+  dummyProcessPset.registerIt();
+  auto pc =
+      std::make_shared<ProcessConfiguration>("PROD", dummyProcessPset.id(), edm::getReleaseVersion(), edm::getPassID());
+
+  edm::MakeModuleParams params1(&p1, preg, &prealloc, pc);
+  edm::MakeModuleParams params2(&p2, preg, &prealloc, pc);
+
+  std::unique_ptr<Maker> lM = std::make_unique<WorkerMaker<ListenMod>>();
+  ParameterSet l1;
+  l1.addParameter("@module_type", std::string("ListenMod"));
+  l1.addParameter("@module_label", std::string("l1"));
+  l1.addParameter("@module_edm_type", std::string("EDProducer"));
+  l1.registerIt();
+
+  ParameterSet l2;
+  l2.addParameter("@module_type", std::string("ListenMod"));
+  l2.addParameter("@module_label", std::string("l2"));
+  l2.addParameter("@module_edm_type", std::string("EDProducer"));
+  l2.registerIt();
+
+  edm::MakeModuleParams paramsl1(&l1, preg, &prealloc, pc);
+  edm::MakeModuleParams paramsl2(&l2, preg, &prealloc, pc);
+
+  signalslot::Signal<void(const ModuleDescription&)> aSignal;
+  auto ml1 = lM->makeModule(paramsl1, aSignal, aSignal);
+  std::unique_ptr<Worker> wl1 = ml1->makeWorker(&table);
+  auto ml2 = lM->makeModule(paramsl2, aSignal, aSignal);
+  std::unique_ptr<Worker> wl2 = ml2->makeWorker(&table);
+  auto m1 = f->makeModule(params1, aSignal, aSignal);
+  std::unique_ptr<Worker> w1 = m1->makeWorker(&table);
+  auto m2 = f->makeModule(params2, aSignal, aSignal);
+  std::unique_ptr<Worker> w2 = m2->makeWorker(&table);
+
+  //Would be 10 products
+  // 1 from the module 't1'
+  //    1 from 'l1' in response
+  //       1 from 'l2' in response to 'l1' <-- circular
+  //    1 from 'l2' in response to 't1'                  |
+  //       1 from 'l1' in response to 'l2' <-- circular /
+  // 1 from the module 't2'
+  //    1 from 'l1' in response
+  //       1 from 'l2' in response to 'l1'
+  //    1 from 'l2' in response to 't2'
+  //       1 from 'l1' in response to 'l2'
+  //std::cout <<"# products "<<preg.size()<<std::endl;
+  CPPUNIT_ASSERT(10 == preg.size());
 }
 
-void  testEDProducerProductRegistryCallback::testTwoListeners(){
-   using namespace edm;
-   
-   SignallingProductRegistry preg;
-   
-   //Need access to the ConstProductRegistry service
-   auto cReg = std::make_unique<ConstProductRegistry>(preg);
-   ServiceToken token = ServiceRegistry::createContaining(std::move(cReg));
-   ServiceRegistry::Operate startServices(token);
-   
-   std::unique_ptr<Maker> f = std::make_unique<WorkerMaker<TestMod>>();
-   
-   ParameterSet p1;
-   p1.addParameter("@module_type",std::string("TestMod") );
-   p1.addParameter("@module_label",std::string("t1") );
-   p1.addParameter("@module_edm_type",std::string("EDProducer") );
-   p1.registerIt();
-   
-   ParameterSet p2;
-   p2.addParameter("@module_type",std::string("TestMod") );
-   p2.addParameter("@module_label",std::string("t2") );
-   p2.addParameter("@module_edm_type",std::string("EDProducer") );
-   p2.registerIt();
-   
-   edm::ExceptionToActionTable table;
-   edm::PreallocationConfiguration prealloc;
-  
-   edm::ParameterSet dummyProcessPset;
-   dummyProcessPset.registerIt();
-   auto pc = std::make_shared<ProcessConfiguration>("PROD", dummyProcessPset.id(), edm::getReleaseVersion(), edm::getPassID());
-
-   edm::MakeModuleParams params1(&p1, preg, &prealloc, pc);
-   edm::MakeModuleParams params2(&p2, preg, &prealloc, pc);
-   
-   std::unique_ptr<Maker> lM = std::make_unique<WorkerMaker<ListenMod>>();
-   ParameterSet l1;
-   l1.addParameter("@module_type",std::string("ListenMod") );
-   l1.addParameter("@module_label",std::string("l1") );
-   l1.addParameter("@module_edm_type",std::string("EDProducer") );
-   l1.registerIt();
-   
-   std::unique_ptr<Maker> lFM = std::make_unique<WorkerMaker<ListenFloatMod>>();
-   ParameterSet l2;
-   l2.addParameter("@module_type",std::string("ListenMod") );
-   l2.addParameter("@module_label",std::string("l2") );
-   l2.addParameter("@module_edm_type",std::string("EDProducer") );
-   l2.registerIt();
-   
-   edm::MakeModuleParams paramsl1(&l1, preg, &prealloc, pc);
-   edm::MakeModuleParams paramsl2(&l2, preg, &prealloc, pc);
-   
-   
-   signalslot::Signal<void(const ModuleDescription&)> aSignal;
-   auto m1 = f->makeModule(params1,aSignal,aSignal);
-   std::unique_ptr<Worker> w1 = m1->makeWorker(&table);
-   auto ml1 = lM->makeModule(paramsl1,aSignal,aSignal);
-   std::unique_ptr<Worker> wl1 = ml1->makeWorker(&table);
-   auto ml2 = lFM->makeModule(paramsl2,aSignal,aSignal);
-   std::unique_ptr<Worker> wl2 = ml2->makeWorker(&table);
-   auto m2 = f->makeModule(params2,aSignal,aSignal);
-   std::unique_ptr<Worker> w2 = m2->makeWorker(&table);
-
-   //Should be 8 products
-   // 1 from the module 't1'
-   //    1 from 'l1' in response
-   //       1 from 'l2' in response to 'l1'
-   //    1 from 'l2' in response to 't1'
-   // 1 from the module 't2'
-   //    1 from 'l1' in response
-   //       1 from 'l2' in response to 'l1'
-   //    1 from 'l2' in response to 't2'
-   //std::cout <<"# products "<<preg.size()<<std::endl;
-   CPPUNIT_ASSERT(8 == preg.size());
+void testEDProducerProductRegistryCallback::testTwoListeners() {
+  using namespace edm;
+
+  SignallingProductRegistry preg;
+
+  //Need access to the ConstProductRegistry service
+  auto cReg = std::make_unique<ConstProductRegistry>(preg);
+  ServiceToken token = ServiceRegistry::createContaining(std::move(cReg));
+  ServiceRegistry::Operate startServices(token);
+
+  std::unique_ptr<Maker> f = std::make_unique<WorkerMaker<TestMod>>();
+
+  ParameterSet p1;
+  p1.addParameter("@module_type", std::string("TestMod"));
+  p1.addParameter("@module_label", std::string("t1"));
+  p1.addParameter("@module_edm_type", std::string("EDProducer"));
+  p1.registerIt();
+
+  ParameterSet p2;
+  p2.addParameter("@module_type", std::string("TestMod"));
+  p2.addParameter("@module_label", std::string("t2"));
+  p2.addParameter("@module_edm_type", std::string("EDProducer"));
+  p2.registerIt();
+
+  edm::ExceptionToActionTable table;
+  edm::PreallocationConfiguration prealloc;
+
+  edm::ParameterSet dummyProcessPset;
+  dummyProcessPset.registerIt();
+  auto pc =
+      std::make_shared<ProcessConfiguration>("PROD", dummyProcessPset.id(), edm::getReleaseVersion(), edm::getPassID());
+
+  edm::MakeModuleParams params1(&p1, preg, &prealloc, pc);
+  edm::MakeModuleParams params2(&p2, preg, &prealloc, pc);
+
+  std::unique_ptr<Maker> lM = std::make_unique<WorkerMaker<ListenMod>>();
+  ParameterSet l1;
+  l1.addParameter("@module_type", std::string("ListenMod"));
+  l1.addParameter("@module_label", std::string("l1"));
+  l1.addParameter("@module_edm_type", std::string("EDProducer"));
+  l1.registerIt();
+
+  std::unique_ptr<Maker> lFM = std::make_unique<WorkerMaker<ListenFloatMod>>();
+  ParameterSet l2;
+  l2.addParameter("@module_type", std::string("ListenMod"));
+  l2.addParameter("@module_label", std::string("l2"));
+  l2.addParameter("@module_edm_type", std::string("EDProducer"));
+  l2.registerIt();
+
+  edm::MakeModuleParams paramsl1(&l1, preg, &prealloc, pc);
+  edm::MakeModuleParams paramsl2(&l2, preg, &prealloc, pc);
+
+  signalslot::Signal<void(const ModuleDescription&)> aSignal;
+  auto m1 = f->makeModule(params1, aSignal, aSignal);
+  std::unique_ptr<Worker> w1 = m1->makeWorker(&table);
+  auto ml1 = lM->makeModule(paramsl1, aSignal, aSignal);
+  std::unique_ptr<Worker> wl1 = ml1->makeWorker(&table);
+  auto ml2 = lFM->makeModule(paramsl2, aSignal, aSignal);
+  std::unique_ptr<Worker> wl2 = ml2->makeWorker(&table);
+  auto m2 = f->makeModule(params2, aSignal, aSignal);
+  std::unique_ptr<Worker> w2 = m2->makeWorker(&table);
+
+  //Should be 8 products
+  // 1 from the module 't1'
+  //    1 from 'l1' in response
+  //       1 from 'l2' in response to 'l1'
+  //    1 from 'l2' in response to 't1'
+  // 1 from the module 't2'
+  //    1 from 'l1' in response
+  //       1 from 'l2' in response to 'l1'
+  //    1 from 'l2' in response to 't2'
+  //std::cout <<"# products "<<preg.size()<<std::endl;
+  CPPUNIT_ASSERT(8 == preg.size());
 }
diff --git a/FWCore/Framework/test/esproducer_t.cppunit.cc b/FWCore/Framework/test/esproducer_t.cppunit.cc
index 692800c6cb61e..d015d2d5599e2 100644
--- a/FWCore/Framework/test/esproducer_t.cppunit.cc
+++ b/FWCore/Framework/test/esproducer_t.cppunit.cc
@@ -12,6 +12,7 @@
 #include "FWCore/Framework/test/DummyFinder.h"
 #include "FWCore/Framework/test/DepRecord.h"
 #include "FWCore/Framework/interface/EventSetupProvider.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducts.h"
 #include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"
@@ -28,8 +29,7 @@ namespace {
   edm::ActivityRegistry activityRegistry;
 }
 
-class testEsproducer: public CppUnit::TestFixture
-{
+class testEsproducer : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testEsproducer);
 
   CPPUNIT_TEST(registerTest);
@@ -40,13 +40,14 @@ class testEsproducer: public CppUnit::TestFixture
   CPPUNIT_TEST(decoratorTest);
   CPPUNIT_TEST(dependsOnTest);
   CPPUNIT_TEST(labelTest);
-  CPPUNIT_TEST_EXCEPTION(failMultipleRegistration,cms::Exception);
+  CPPUNIT_TEST_EXCEPTION(failMultipleRegistration, cms::Exception);
   CPPUNIT_TEST(forceCacheClearTest);
 
   CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void registerTest();
   void getFromTest();
@@ -62,26 +63,24 @@ class testEsproducer: public CppUnit::TestFixture
 private:
   class Test1Producer : public ESProducer {
   public:
-    Test1Producer() {
-      setWhatProduced(this);
-    }
+    Test1Producer() { setWhatProduced(this); }
     std::shared_ptr<DummyData> produce(const DummyRecord& /*iRecord*/) {
       ++data_.value_;
-      return std::shared_ptr<DummyData>(&data_,edm::do_nothing_deleter{});
+      return std::shared_ptr<DummyData>(&data_, edm::do_nothing_deleter{});
     }
+
   private:
     DummyData data_{0};
   };
 
   class OptionalProducer : public ESProducer {
   public:
-    OptionalProducer() {
-      setWhatProduced(this);
-    }
+    OptionalProducer() { setWhatProduced(this); }
     std::optional<DummyData> produce(const DummyRecord& /*iRecord*/) {
       ++data_.value_;
       return data_;
     }
+
   private:
     DummyData data_{0};
   };
@@ -95,43 +94,42 @@ class testEsproducer: public CppUnit::TestFixture
     std::shared_ptr<DummyData> produce(const DummyRecord& /*iRecord*/) {
       return std::shared_ptr<DummyData>(&data_, edm::do_nothing_deleter{});
     }
+
   private:
     DummyData data_{0};
   };
 
   class ShareProducer : public ESProducer {
   public:
-    ShareProducer() {
-      setWhatProduced(this);
-    }
+    ShareProducer() { setWhatProduced(this); }
     std::shared_ptr<DummyData> produce(const DummyRecord& /*iRecord*/) {
       ++ptr_->value_;
       return ptr_;
     }
+
   private:
     std::shared_ptr<DummyData> ptr_{std::make_shared<DummyData>(0)};
   };
 
   class UniqueProducer : public ESProducer {
   public:
-    UniqueProducer() {
-      setWhatProduced(this);
-    }
+    UniqueProducer() { setWhatProduced(this); }
     std::unique_ptr<DummyData> produce(const DummyRecord&) {
       ++data_.value_;
       return std::make_unique<DummyData>(data_);
     }
+
   private:
     DummyData data_;
   };
 
   class LabelledProducer : public ESProducer {
   public:
-    enum {kFi, kFum};
-    typedef edm::ESProducts< edm::es::L<DummyData,kFi>, edm::es::L<DummyData,kFum> > ReturnProducts;
+    enum { kFi, kFum };
+    typedef edm::ESProducts<edm::es::L<DummyData, kFi>, edm::es::L<DummyData, kFum> > ReturnProducts;
     LabelledProducer() {
-      setWhatProduced(this,"foo");
-      setWhatProduced(this, &LabelledProducer::produceMore, edm::es::label("fi",kFi)("fum",kFum));
+      setWhatProduced(this, &LabelledProducer::produceMore, edm::es::label("fi", kFi)("fum", kFum));
+      setWhatProduced(this, "foo");
     }
 
     std::shared_ptr<DummyData> produce(const DummyRecord& /*iRecord*/) {
@@ -139,51 +137,47 @@ class testEsproducer: public CppUnit::TestFixture
       return ptr_;
     }
 
-    ReturnProducts produceMore(const DummyRecord&){
+    ReturnProducts produceMore(const DummyRecord&) {
       using edm::es::L;
       using namespace edm;
       ++fi_->value_;
 
-      L<DummyData,kFum> fum( std::make_shared<DummyData>());
+      L<DummyData, kFum> fum(std::make_shared<DummyData>());
       fum->value_ = fi_->value_;
 
-      return edm::es::products(fum, es::l<kFi>(fi_) );
+      return edm::es::products(fum, es::l<kFi>(fi_));
     }
+
   private:
     std::shared_ptr<DummyData> ptr_{std::make_shared<DummyData>(0)};
     std::shared_ptr<DummyData> fi_{std::make_shared<DummyData>(0)};
   };
-
 };
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testEsproducer);
 
-
-void testEsproducer::registerTest()
-{
+void testEsproducer::registerTest() {
   Test1Producer testProd;
   EventSetupRecordKey dummyRecordKey = EventSetupRecordKey::makeKey<DummyRecord>();
   CPPUNIT_ASSERT(testProd.isUsingRecord(dummyRecordKey));
 
-  const DataProxyProvider::KeyedProxies& keyedProxies =
-    testProd.keyedProxies(dummyRecordKey);
+  const DataProxyProvider::KeyedProxies& keyedProxies = testProd.keyedProxies(dummyRecordKey);
 
   CPPUNIT_ASSERT(keyedProxies.size() == 1);
 }
 
-void testEsproducer::getFromTest()
-{
+void testEsproducer::getFromTest() {
   EventSetupProvider provider(&activityRegistry);
   provider.add(std::make_shared<Test1Producer>());
 
   auto pFinder = std::make_shared<DummyFinder>();
   provider.add(std::shared_ptr<EventSetupRecordIntervalFinder>(pFinder));
 
-  for(int iTime=1; iTime != 6; ++iTime) {
+  for (int iTime = 1; iTime != 6; ++iTime) {
     const edm::Timestamp time(iTime);
-    pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time) , edm::IOVSyncValue(time)));
-    const auto&  eventSetup = provider.eventSetupForInstance(edm::IOVSyncValue(time));
+    pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time), edm::IOVSyncValue(time)));
+    const edm::EventSetup eventSetup{provider.eventSetupForInstance(edm::IOVSyncValue(time)), 0, nullptr};
     edm::ESHandle<DummyData> pDummy;
     eventSetup.get<DummyRecord>().get(pDummy);
     CPPUNIT_ASSERT(0 != pDummy.product());
@@ -191,8 +185,7 @@ void testEsproducer::getFromTest()
   }
 }
 
-void testEsproducer::getfromShareTest()
-{
+void testEsproducer::getfromShareTest() {
   EventSetupProvider provider(&activityRegistry);
 
   std::shared_ptr<DataProxyProvider> pProxyProv = std::make_shared<ShareProducer>();
@@ -201,10 +194,10 @@ void testEsproducer::getfromShareTest()
   auto pFinder = std::make_shared<DummyFinder>();
   provider.add(std::shared_ptr<EventSetupRecordIntervalFinder>(pFinder));
 
-  for(int iTime=1; iTime != 6; ++iTime) {
+  for (int iTime = 1; iTime != 6; ++iTime) {
     const edm::Timestamp time(iTime);
-    pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time) , edm::IOVSyncValue(time)));
-    const auto&  eventSetup = provider.eventSetupForInstance(edm::IOVSyncValue(time));
+    pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time), edm::IOVSyncValue(time)));
+    const edm::EventSetup eventSetup{provider.eventSetupForInstance(edm::IOVSyncValue(time)), 0, nullptr};
     edm::ESHandle<DummyData> pDummy;
     eventSetup.get<DummyRecord>().get(pDummy);
     CPPUNIT_ASSERT(0 != pDummy.product());
@@ -212,8 +205,7 @@ void testEsproducer::getfromShareTest()
   }
 }
 
-void testEsproducer::getfromUniqueTest()
-{
+void testEsproducer::getfromUniqueTest() {
   EventSetupProvider provider(&activityRegistry);
 
   std::shared_ptr<DataProxyProvider> pProxyProv = std::make_shared<UniqueProducer>();
@@ -222,10 +214,10 @@ void testEsproducer::getfromUniqueTest()
   auto pFinder = std::make_shared<DummyFinder>();
   provider.add(std::shared_ptr<EventSetupRecordIntervalFinder>(pFinder));
 
-  for(int iTime=1; iTime != 6; ++iTime) {
+  for (int iTime = 1; iTime != 6; ++iTime) {
     const edm::Timestamp time(iTime);
-    pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time) , edm::IOVSyncValue(time)));
-    const auto&  eventSetup = provider.eventSetupForInstance(edm::IOVSyncValue(time));
+    pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time), edm::IOVSyncValue(time)));
+    const edm::EventSetup eventSetup{provider.eventSetupForInstance(edm::IOVSyncValue(time)), 0, nullptr};
     edm::ESHandle<DummyData> pDummy;
     eventSetup.get<DummyRecord>().get(pDummy);
     CPPUNIT_ASSERT(0 != pDummy.product());
@@ -233,18 +225,17 @@ void testEsproducer::getfromUniqueTest()
   }
 }
 
-void testEsproducer::getfromOptionalTest()
-{
+void testEsproducer::getfromOptionalTest() {
   EventSetupProvider provider(&activityRegistry);
   provider.add(std::make_shared<OptionalProducer>());
 
   auto pFinder = std::make_shared<DummyFinder>();
   provider.add(std::shared_ptr<EventSetupRecordIntervalFinder>(pFinder));
 
-  for(int iTime=1; iTime != 6; ++iTime) {
+  for (int iTime = 1; iTime != 6; ++iTime) {
     const edm::Timestamp time(iTime);
-    pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time) , edm::IOVSyncValue(time)));
-    const auto&  eventSetup = provider.eventSetupForInstance(edm::IOVSyncValue(time));
+    pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time), edm::IOVSyncValue(time)));
+    const edm::EventSetup eventSetup{provider.eventSetupForInstance(edm::IOVSyncValue(time)), 0, nullptr};
     edm::ESHandle<DummyData> pDummy;
     eventSetup.get<DummyRecord>().get(pDummy);
     CPPUNIT_ASSERT(0 != pDummy.product());
@@ -252,8 +243,7 @@ void testEsproducer::getfromOptionalTest()
   }
 }
 
-void testEsproducer::labelTest()
-{
+void testEsproducer::labelTest() {
   try {
     EventSetupProvider provider(&activityRegistry);
 
@@ -263,25 +253,25 @@ void testEsproducer::labelTest()
     auto pFinder = std::make_shared<DummyFinder>();
     provider.add(std::shared_ptr<EventSetupRecordIntervalFinder>(pFinder));
 
-    for(int iTime=1; iTime != 6; ++iTime) {
+    for (int iTime = 1; iTime != 6; ++iTime) {
       const edm::Timestamp time(iTime);
-      pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time) , edm::IOVSyncValue(time)));
-      const auto&  eventSetup = provider.eventSetupForInstance(edm::IOVSyncValue(time));
+      pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time), edm::IOVSyncValue(time)));
+      const edm::EventSetup eventSetup{provider.eventSetupForInstance(edm::IOVSyncValue(time)), 0, nullptr};
       edm::ESHandle<DummyData> pDummy;
-      eventSetup.get<DummyRecord>().get("foo",pDummy);
+      eventSetup.get<DummyRecord>().get("foo", pDummy);
       CPPUNIT_ASSERT(0 != pDummy.product());
       CPPUNIT_ASSERT(iTime == pDummy->value_);
 
-      eventSetup.get<DummyRecord>().get("fi",pDummy);
+      eventSetup.get<DummyRecord>().get("fi", pDummy);
       CPPUNIT_ASSERT(0 != pDummy.product());
       CPPUNIT_ASSERT(iTime == pDummy->value_);
 
-      eventSetup.get<DummyRecord>().get("fum",pDummy);
+      eventSetup.get<DummyRecord>().get("fum", pDummy);
       CPPUNIT_ASSERT(0 != pDummy.product());
       CPPUNIT_ASSERT(iTime == pDummy->value_);
     }
-  } catch(const cms::Exception& iException) {
-    std::cout <<"caught exception "<<iException.explainSelf()<<std::endl;
+  } catch (const cms::Exception& iException) {
+    std::cout << "caught exception " << iException.explainSelf() << std::endl;
     throw;
   }
 }
@@ -290,13 +280,9 @@ struct TestDecorator {
   static int s_pre;
   static int s_post;
 
-  void pre(const DummyRecord&) {
-    ++s_pre;
-  }
+  void pre(const DummyRecord&) { ++s_pre; }
 
-  void post(const DummyRecord&) {
-    ++s_post;
-  }
+  void post(const DummyRecord&) { ++s_post; }
 };
 
 int TestDecorator::s_pre = 0;
@@ -304,29 +290,27 @@ int TestDecorator::s_post = 0;
 
 class DecoratorProducer : public ESProducer {
 public:
-  DecoratorProducer() {
-    setWhatProduced(this, TestDecorator{});
-  }
+  DecoratorProducer() { setWhatProduced(this, TestDecorator{}); }
   std::shared_ptr<DummyData> produce(const DummyRecord& /*iRecord*/) {
     ++ptr_->value_;
     return ptr_;
   }
+
 private:
   std::shared_ptr<DummyData> ptr_{std::make_shared<DummyData>(0)};
 };
 
-void testEsproducer::decoratorTest()
-{
+void testEsproducer::decoratorTest() {
   EventSetupProvider provider(&activityRegistry);
   provider.add(std::make_shared<DecoratorProducer>());
 
   auto pFinder = std::make_shared<DummyFinder>();
   provider.add(std::shared_ptr<EventSetupRecordIntervalFinder>(pFinder));
 
-  for(int iTime=1; iTime != 6; ++iTime) {
+  for (int iTime = 1; iTime != 6; ++iTime) {
     const edm::Timestamp time(iTime);
     pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time), edm::IOVSyncValue(time)));
-    const auto&  eventSetup = provider.eventSetupForInstance(edm::IOVSyncValue(time));
+    const edm::EventSetup eventSetup{provider.eventSetupForInstance(edm::IOVSyncValue(time)), 0, nullptr};
     edm::ESHandle<DummyData> pDummy;
 
     CPPUNIT_ASSERT(iTime - 1 == TestDecorator::s_pre);
@@ -342,54 +326,42 @@ void testEsproducer::decoratorTest()
 class DepProducer : public ESProducer {
 public:
   DepProducer() {
-    setWhatProduced(this , dependsOn(&DepProducer::callWhenDummyChanges,
-                                     &DepProducer::callWhenDummyChanges2,
-                                     &DepProducer::callWhenDummyChanges3));
-  }
-  std::shared_ptr<DummyData> produce(const DepRecord& /*iRecord*/) {
-    return ptr_;
-  }
-  void callWhenDummyChanges(const DummyRecord&) {
-    ++ptr_->value_;
-  }
-  void callWhenDummyChanges2(const DummyRecord&) {
-    ++ptr_->value_;
-  }
-  void callWhenDummyChanges3(const DummyRecord&) {
-    ++ptr_->value_;
+    setWhatProduced(this,
+                    dependsOn(&DepProducer::callWhenDummyChanges,
+                              &DepProducer::callWhenDummyChanges2,
+                              &DepProducer::callWhenDummyChanges3));
   }
+  std::shared_ptr<DummyData> produce(const DepRecord& /*iRecord*/) { return ptr_; }
+  void callWhenDummyChanges(const DummyRecord&) { ++ptr_->value_; }
+  void callWhenDummyChanges2(const DummyRecord&) { ++ptr_->value_; }
+  void callWhenDummyChanges3(const DummyRecord&) { ++ptr_->value_; }
 
 private:
   std::shared_ptr<DummyData> ptr_{std::make_shared<DummyData>(0)};
 };
 
-void testEsproducer::dependsOnTest()
-{
+void testEsproducer::dependsOnTest() {
   EventSetupProvider provider(&activityRegistry);
   provider.add(std::make_shared<DepProducer>());
 
   auto pFinder = std::make_shared<DummyFinder>();
   provider.add(std::shared_ptr<EventSetupRecordIntervalFinder>(pFinder));
 
-  for(int iTime=1; iTime != 6; ++iTime) {
+  for (int iTime = 1; iTime != 6; ++iTime) {
     const edm::Timestamp time(iTime);
     pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time), edm::IOVSyncValue(time)));
-    const auto&  eventSetup = provider.eventSetupForInstance(edm::IOVSyncValue(time));
+    const edm::EventSetup eventSetup{provider.eventSetupForInstance(edm::IOVSyncValue(time)), 0, nullptr};
     edm::ESHandle<DummyData> pDummy;
 
     eventSetup.get<DepRecord>().get(pDummy);
     CPPUNIT_ASSERT(0 != pDummy.product());
-    CPPUNIT_ASSERT(3*iTime == pDummy->value_);
+    CPPUNIT_ASSERT(3 * iTime == pDummy->value_);
   }
 }
 
-void testEsproducer::failMultipleRegistration()
-{
-  MultiRegisterProducer dummy;
-}
+void testEsproducer::failMultipleRegistration() { MultiRegisterProducer dummy; }
 
-void testEsproducer::forceCacheClearTest()
-{
+void testEsproducer::forceCacheClearTest() {
   EventSetupProvider provider(&activityRegistry);
   provider.add(std::make_shared<Test1Producer>());
 
@@ -397,8 +369,8 @@ void testEsproducer::forceCacheClearTest()
   provider.add(std::shared_ptr<EventSetupRecordIntervalFinder>(pFinder));
 
   const edm::Timestamp time(1);
-  pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time) , edm::IOVSyncValue(time)));
-  const auto&  eventSetup = provider.eventSetupForInstance(edm::IOVSyncValue(time));
+  pFinder->setInterval(edm::ValidityInterval(edm::IOVSyncValue(time), edm::IOVSyncValue(time)));
+  const edm::EventSetup eventSetup{provider.eventSetupForInstance(edm::IOVSyncValue(time)), 0, nullptr};
   {
     edm::ESHandle<DummyData> pDummy;
     eventSetup.get<DummyRecord>().get(pDummy);
diff --git a/FWCore/Framework/test/esproducts_t.cppunit.cc b/FWCore/Framework/test/esproducts_t.cppunit.cc
index d2b1cdf116b9f..54e477a6ab5f9 100644
--- a/FWCore/Framework/test/esproducts_t.cppunit.cc
+++ b/FWCore/Framework/test/esproducts_t.cppunit.cc
@@ -13,17 +13,17 @@
 using edm::ESProducts;
 using edm::es::products;
 
-class testEsproducts: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(testEsproducts);
-CPPUNIT_TEST(constPtrTest);
-CPPUNIT_TEST(uniquePtrTest);
-CPPUNIT_TEST(sharedPtrTest);
-CPPUNIT_TEST(manyTest);
-CPPUNIT_TEST_SUITE_END();
+class testEsproducts : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testEsproducts);
+  CPPUNIT_TEST(constPtrTest);
+  CPPUNIT_TEST(uniquePtrTest);
+  CPPUNIT_TEST(sharedPtrTest);
+  CPPUNIT_TEST(manyTest);
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
   void constPtrTest();
   void uniquePtrTest();
   void sharedPtrTest();
@@ -33,95 +33,82 @@ CPPUNIT_TEST_SUITE_END();
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testEsproducts);
 
-
-ESProducts<const int*, const float*>
-returnPointers(const int* iInt, const float* iFloat)
-{
-   return products(iInt, iFloat);
+ESProducts<const int*, const float*> returnPointers(const int* iInt, const float* iFloat) {
+  return products(iInt, iFloat);
 }
 
-void testEsproducts::constPtrTest()
-{
-   int int_ = 0;
-   float float_ = 0;
-   
-   ESProducts<const int*, const float*> product = 
-      returnPointers(&int_, &float_);
-   
-   const int* readInt = 0;
-   const float* readFloat = 0;
-
-   product.moveTo(readInt);
-   product.moveTo(readFloat);
-   
-   CPPUNIT_ASSERT(readInt == &int_);
-   CPPUNIT_ASSERT(readFloat == &float_);
+void testEsproducts::constPtrTest() {
+  int int_ = 0;
+  float float_ = 0;
+
+  ESProducts<const int*, const float*> product = returnPointers(&int_, &float_);
+
+  const int* readInt = 0;
+  const float* readFloat = 0;
+
+  product.moveTo(readInt);
+  product.moveTo(readFloat);
+
+  CPPUNIT_ASSERT(readInt == &int_);
+  CPPUNIT_ASSERT(readFloat == &float_);
 }
 
-void testEsproducts::uniquePtrTest()
-{
+void testEsproducts::uniquePtrTest() {
   constexpr int kInt = 5;
   auto int_ = std::make_unique<int>(kInt);
   constexpr float kFloat = 3.1;
   auto float_ = std::make_unique<float>(kFloat);
-  
+
   ESProducts<std::unique_ptr<int>, std::unique_ptr<float>> product = products(std::move(int_), std::move(float_));
-  
+
   std::unique_ptr<int> readInt;
   std::unique_ptr<float> readFloat;
-  
+
   product.moveTo(readInt);
   product.moveTo(readFloat);
-  
+
   CPPUNIT_ASSERT(*readInt == kInt);
   CPPUNIT_ASSERT(*readFloat == kFloat);
 }
 
-void testEsproducts::sharedPtrTest()
-{
+void testEsproducts::sharedPtrTest() {
   auto int_ = std::make_shared<int>(5);
   auto float_ = std::make_shared<float>(3.1);
-  
-  ESProducts<std::shared_ptr<int>, std::shared_ptr<float>> product =
-  products(int_,float_);
-  
+
+  ESProducts<std::shared_ptr<int>, std::shared_ptr<float>> product = products(int_, float_);
+
   std::shared_ptr<int> readInt;
   std::shared_ptr<float> readFloat;
-  
+
   product.moveTo(readInt);
   product.moveTo(readFloat);
-  
+
   CPPUNIT_ASSERT(readInt.get() == int_.get());
   CPPUNIT_ASSERT(readFloat.get() == float_.get());
 }
 
-
-ESProducts<const int*, const float*, const double*>
-returnManyPointers(const int* iInt, const float* iFloat, const double* iDouble)
-{
-   return edm::es::products(iInt, iFloat,  iDouble);
+ESProducts<const int*, const float*, const double*> returnManyPointers(const int* iInt,
+                                                                       const float* iFloat,
+                                                                       const double* iDouble) {
+  return edm::es::products(iInt, iFloat, iDouble);
 }
 
-void testEsproducts::manyTest()
-{
-   int int_ = 0;
-   float float_ = 0;
-   double double_ = 0;
-   
-   ESProducts<const int*, const float*, const double*> product = 
-      returnManyPointers(&int_, &float_,&double_);
-   
-   const int* readInt = 0;
-   const float* readFloat = 0;
-   const double* readDouble = 0;
-   
-   product.moveTo(readInt);
-   product.moveTo(readFloat);
-   product.moveTo(readDouble);
-   
-   CPPUNIT_ASSERT(readInt == &int_);
-   CPPUNIT_ASSERT(readFloat == &float_);
-   CPPUNIT_ASSERT(readDouble == &double_);
-}
+void testEsproducts::manyTest() {
+  int int_ = 0;
+  float float_ = 0;
+  double double_ = 0;
 
-   
+  ESProducts<const int*, const float*, const double*> product = returnManyPointers(&int_, &float_, &double_);
+
+  const int* readInt = 0;
+  const float* readFloat = 0;
+  const double* readDouble = 0;
+
+  product.moveTo(readInt);
+  product.moveTo(readFloat);
+  product.moveTo(readDouble);
+
+  CPPUNIT_ASSERT(readInt == &int_);
+  CPPUNIT_ASSERT(readFloat == &float_);
+  CPPUNIT_ASSERT(readDouble == &double_);
+}
diff --git a/FWCore/Framework/test/event_getrefbeforeput_t.cppunit.cc b/FWCore/Framework/test/event_getrefbeforeput_t.cppunit.cc
index d08e92c5c2f22..3a977be29b68c 100644
--- a/FWCore/Framework/test/event_getrefbeforeput_t.cppunit.cc
+++ b/FWCore/Framework/test/event_getrefbeforeput_t.cppunit.cc
@@ -39,17 +39,18 @@ Test of the EventPrincipal class.
 
 #include "FWCore/Framework/interface/Event.h"
 
-class testEventGetRefBeforePut: public CppUnit::TestFixture {
-CPPUNIT_TEST_SUITE(testEventGetRefBeforePut);
-CPPUNIT_TEST(failGetProductNotRegisteredTest);
-CPPUNIT_TEST(getRefTest);
-CPPUNIT_TEST_SUITE_END();
+class testEventGetRefBeforePut : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testEventGetRefBeforePut);
+  CPPUNIT_TEST(failGetProductNotRegisteredTest);
+  CPPUNIT_TEST(getRefTest);
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){
-  }
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
   void failGetProductNotRegisteredTest();
   void getRefTest();
+
 private:
   edm::HistoryAppender historyAppender_;
 };
@@ -58,7 +59,6 @@ CPPUNIT_TEST_SUITE_END();
 CPPUNIT_TEST_SUITE_REGISTRATION(testEventGetRefBeforePut);
 
 void testEventGetRefBeforePut::failGetProductNotRegisteredTest() {
-
   auto preg = std::make_unique<edm::ProductRegistry>();
   preg->setFrozen();
   auto branchIDListHelper = std::make_shared<edm::BranchIDListHelper>();
@@ -70,56 +70,55 @@ void testEventGetRefBeforePut::failGetProductNotRegisteredTest() {
   edm::ProcessConfiguration pc("PROD", edm::ParameterSetID(), edm::getReleaseVersion(), edm::getPassID());
   std::shared_ptr<edm::ProductRegistry const> pregc(preg.release());
   auto runAux = std::make_shared<edm::RunAuxiliary>(col.run(), fakeTime, fakeTime);
-  auto rp = std::make_shared<edm::RunPrincipal>(runAux, pregc, pc, &historyAppender_,0);
+  auto rp = std::make_shared<edm::RunPrincipal>(runAux, pregc, pc, &historyAppender_, 0);
   edm::LuminosityBlockAuxiliary lumiAux(rp->run(), 1, fakeTime, fakeTime);
-  auto lbp = std::make_shared<edm::LuminosityBlockPrincipal>(pregc, pc, &historyAppender_,0);
+  auto lbp = std::make_shared<edm::LuminosityBlockPrincipal>(pregc, pc, &historyAppender_, 0);
   lbp->setAux(lumiAux);
   lbp->setRunPrincipal(rp);
   edm::EventAuxiliary eventAux(col, uuid, fakeTime, true);
-  edm::EventPrincipal ep(pregc, branchIDListHelper, thinnedAssociationsHelper, pc, &historyAppender_,edm::StreamID::invalidStreamID());
+  edm::EventPrincipal ep(
+      pregc, branchIDListHelper, thinnedAssociationsHelper, pc, &historyAppender_, edm::StreamID::invalidStreamID());
   edm::ProcessHistoryRegistry phr;
   ep.fillEventPrincipal(eventAux, phr);
   ep.setLuminosityBlockPrincipal(lbp.get());
   try {
-     edm::ParameterSet pset;
-     pset.registerIt();
-     auto processConfiguration = std::make_shared<edm::ProcessConfiguration>();
-     edm::ModuleDescription modDesc(pset.id(), "Blah", "blahs", processConfiguration.get(), edm::ModuleDescription::getUniqueID());
-     edm::Event event(ep, modDesc, nullptr);
-     edm::ProducerBase prod;
-     event.setProducer(&prod,nullptr);
-
-     std::string label("this does not exist");
-     edm::RefProd<edmtest::DummyProduct> ref = event.getRefBeforePut<edmtest::DummyProduct>(label);
-     CPPUNIT_ASSERT("Failed to throw required exception" == 0);
-  }
-  catch (edm::Exception& x) {
+    edm::ParameterSet pset;
+    pset.registerIt();
+    auto processConfiguration = std::make_shared<edm::ProcessConfiguration>();
+    edm::ModuleDescription modDesc(
+        pset.id(), "Blah", "blahs", processConfiguration.get(), edm::ModuleDescription::getUniqueID());
+    edm::Event event(ep, modDesc, nullptr);
+    edm::ProducerBase prod;
+    event.setProducer(&prod, nullptr);
+
+    std::string label("this does not exist");
+    edm::RefProd<edmtest::DummyProduct> ref = event.getRefBeforePut<edmtest::DummyProduct>(label);
+    CPPUNIT_ASSERT("Failed to throw required exception" == 0);
+  } catch (edm::Exception& x) {
     // nothing to do
-  }
-  catch (...) {
+  } catch (...) {
     CPPUNIT_ASSERT("Threw wrong kind of exception" == 0);
   }
-  
+
   try {
     edm::ParameterSet pset;
     pset.registerIt();
     auto processConfiguration = std::make_shared<edm::ProcessConfiguration>();
-    edm::ModuleDescription modDesc(pset.id(), "Blah", "blahs", processConfiguration.get(), edm::ModuleDescription::getUniqueID());
+    edm::ModuleDescription modDesc(
+        pset.id(), "Blah", "blahs", processConfiguration.get(), edm::ModuleDescription::getUniqueID());
     edm::Event event(ep, modDesc, nullptr);
     edm::ProducerBase prod;
-    event.setProducer(&prod,nullptr);
-    
+    event.setProducer(&prod, nullptr);
+
     std::string label("this does not exist");
-    edm::RefProd<edmtest::DummyProduct> ref = event.getRefBeforePut<edmtest::DummyProduct>(edm::EDPutTokenT<edmtest::DummyProduct>{});
+    edm::RefProd<edmtest::DummyProduct> ref =
+        event.getRefBeforePut<edmtest::DummyProduct>(edm::EDPutTokenT<edmtest::DummyProduct>{});
     CPPUNIT_ASSERT("Failed to throw required exception" == 0);
-  }
-  catch (edm::Exception& x) {
+  } catch (edm::Exception& x) {
     // nothing to do
-  }
-  catch (...) {
+  } catch (...) {
     CPPUNIT_ASSERT("Threw wrong kind of exception" == 0);
   }
-
 }
 
 void testEventGetRefBeforePut::getRefTest() {
@@ -148,8 +147,7 @@ void testEventGetRefBeforePut::getRefTest() {
                                  productInstanceName,
                                  "",
                                  pset.id(),
-                                 dummytype
-                              );
+                                 dummytype);
 
   product.init();
 
@@ -162,17 +160,19 @@ void testEventGetRefBeforePut::getRefTest() {
   edm::EventID col(1L, 1L, 1L);
   std::string uuid = edm::createGlobalIdentifier();
   edm::Timestamp fakeTime;
-  auto pcPtr = std::make_shared<edm::ProcessConfiguration>(processName, dummyProcessPset.id(), edm::getReleaseVersion(), edm::getPassID());
+  auto pcPtr = std::make_shared<edm::ProcessConfiguration>(
+      processName, dummyProcessPset.id(), edm::getReleaseVersion(), edm::getPassID());
   edm::ProcessConfiguration& pc = *pcPtr;
   std::shared_ptr<edm::ProductRegistry const> pregc(preg.release());
   auto runAux = std::make_shared<edm::RunAuxiliary>(col.run(), fakeTime, fakeTime);
-  auto rp = std::make_shared<edm::RunPrincipal>(runAux, pregc, pc, &historyAppender_,0);
+  auto rp = std::make_shared<edm::RunPrincipal>(runAux, pregc, pc, &historyAppender_, 0);
   edm::LuminosityBlockAuxiliary lumiAux(rp->run(), 1, fakeTime, fakeTime);
-  auto lbp = std::make_shared<edm::LuminosityBlockPrincipal>(pregc, pc, &historyAppender_,0);
+  auto lbp = std::make_shared<edm::LuminosityBlockPrincipal>(pregc, pc, &historyAppender_, 0);
   lbp->setAux(lumiAux);
   lbp->setRunPrincipal(rp);
   edm::EventAuxiliary eventAux(col, uuid, fakeTime, true);
-  edm::EventPrincipal ep(pregc, branchIDListHelper, thinnedAssociationsHelper, pc, &historyAppender_,edm::StreamID::invalidStreamID());
+  edm::EventPrincipal ep(
+      pregc, branchIDListHelper, thinnedAssociationsHelper, pc, &historyAppender_, edm::StreamID::invalidStreamID());
   edm::ProcessHistoryRegistry phr;
   ep.fillEventPrincipal(eventAux, phr);
   ep.setLuminosityBlockPrincipal(lbp.get());
@@ -185,26 +185,22 @@ void testEventGetRefBeforePut::getRefTest() {
     edm::ProducerBase prod;
     prod.produces<edmtest::IntProduct>(productInstanceName);
     const_cast<std::vector<edm::ProductResolverIndex>&>(prod.putTokenIndexToProductResolverIndex()).push_back(0);
-    event.setProducer(&prod,nullptr);
+    event.setProducer(&prod, nullptr);
     auto pr = std::make_unique<edmtest::IntProduct>();
     pr->value = 10;
 
     refToProd = event.getRefBeforePut<edmtest::IntProduct>(productInstanceName);
-    event.put(std::move(pr),productInstanceName);
+    event.put(std::move(pr), productInstanceName);
     event.commit_(std::vector<edm::ProductResolverIndex>());
-  }
-  catch (cms::Exception& x) {
-    std::cerr << x.explainSelf()<< std::endl;
+  } catch (cms::Exception& x) {
+    std::cerr << x.explainSelf() << std::endl;
     CPPUNIT_ASSERT("Threw exception unexpectedly" == 0);
-  }
-  catch(std::exception& x){
-     std::cerr <<x.what()<<std::endl;
-     CPPUNIT_ASSERT("threw std::exception"==0);
-  }
-  catch (...) {
+  } catch (std::exception& x) {
+    std::cerr << x.what() << std::endl;
+    CPPUNIT_ASSERT("threw std::exception" == 0);
+  } catch (...) {
     std::cerr << "Unknown exception type\n";
     CPPUNIT_ASSERT("Threw exception unexpectedly" == 0);
   }
   CPPUNIT_ASSERT(refToProd->value == 10);
 }
-
diff --git a/FWCore/Framework/test/eventprincipal_t.cppunit.cc b/FWCore/Framework/test/eventprincipal_t.cppunit.cc
index 693e6c8b01563..86bbded2fe8be 100644
--- a/FWCore/Framework/test/eventprincipal_t.cppunit.cc
+++ b/FWCore/Framework/test/eventprincipal_t.cppunit.cc
@@ -42,7 +42,7 @@ Test of the EventPrincipal class.
 #include <string>
 #include <typeinfo>
 
-class test_ep: public CppUnit::TestFixture {
+class test_ep : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(test_ep);
   CPPUNIT_TEST(failgetbyIdTest);
   CPPUNIT_TEST(failgetbyLabelTest);
@@ -50,6 +50,7 @@ class test_ep: public CppUnit::TestFixture {
   CPPUNIT_TEST(failgetbyInvalidIdTest);
   CPPUNIT_TEST(failgetProvenanceTest);
   CPPUNIT_TEST_SUITE_END();
+
 public:
   void setUp();
   void tearDown();
@@ -60,26 +61,23 @@ class test_ep: public CppUnit::TestFixture {
   void failgetProvenanceTest();
 
 private:
-
-  std::shared_ptr<edm::ProcessConfiguration>
-  fake_single_module_process(std::string const& tag,
-                             std::string const& processName,
-                             edm::ParameterSet const& moduleParams,
-                             std::string const& release = edm::getReleaseVersion(),
-                             std::string const& pass = edm::getPassID());
-  std::shared_ptr<edm::BranchDescription>
-  fake_single_process_branch(std::string const& tag,
-                             std::string const& processName,
-                             std::string const& productInstanceName = std::string());
-
-  std::map<std::string, std::shared_ptr<edm::BranchDescription> >    branchDescriptions_;
+  std::shared_ptr<edm::ProcessConfiguration> fake_single_module_process(
+      std::string const& tag,
+      std::string const& processName,
+      edm::ParameterSet const& moduleParams,
+      std::string const& release = edm::getReleaseVersion(),
+      std::string const& pass = edm::getPassID());
+  std::shared_ptr<edm::BranchDescription> fake_single_process_branch(
+      std::string const& tag, std::string const& processName, std::string const& productInstanceName = std::string());
+
+  std::map<std::string, std::shared_ptr<edm::BranchDescription> > branchDescriptions_;
   std::map<std::string, std::shared_ptr<edm::ProcessConfiguration> > processConfigurations_;
 
-  std::shared_ptr<edm::ProductRegistry>   pProductRegistry_;
+  std::shared_ptr<edm::ProductRegistry> pProductRegistry_;
   std::shared_ptr<edm::LuminosityBlockPrincipal> lbp_;
-  std::shared_ptr<edm::EventPrincipal>    pEvent_;
+  std::shared_ptr<edm::EventPrincipal> pEvent_;
 
-  edm::EventID               eventID_;
+  edm::EventID eventID_;
 
   edm::HistoryAppender historyAppender_;
 };
@@ -91,16 +89,14 @@ CPPUNIT_TEST_SUITE_REGISTRATION(test_ep);
 
 //----------------------------------------------------------------------
 
-std::shared_ptr<edm::ProcessConfiguration>
-test_ep::fake_single_module_process(std::string const& tag,
-                                    std::string const& processName,
-                                    edm::ParameterSet const& moduleParams,
-                                    std::string const& release,
-                                    std::string const& pass) {
+std::shared_ptr<edm::ProcessConfiguration> test_ep::fake_single_module_process(std::string const& tag,
+                                                                               std::string const& processName,
+                                                                               edm::ParameterSet const& moduleParams,
+                                                                               std::string const& release,
+                                                                               std::string const& pass) {
   edm::ParameterSet processParams;
   processParams.addParameter(processName, moduleParams);
-  processParams.addParameter<std::string>("@process_name",
-                                          processName);
+  processParams.addParameter<std::string>("@process_name", processName);
 
   processParams.registerIt();
   auto result = std::make_shared<edm::ProcessConfiguration>(processName, processParams.id(), release, pass);
@@ -108,10 +104,9 @@ test_ep::fake_single_module_process(std::string const& tag,
   return result;
 }
 
-std::shared_ptr<edm::BranchDescription>
-test_ep::fake_single_process_branch(std::string const& tag,
-                                    std::string const& processName,
-                                    std::string const& productInstanceName) {
+std::shared_ptr<edm::BranchDescription> test_ep::fake_single_process_branch(std::string const& tag,
+                                                                            std::string const& processName,
+                                                                            std::string const& productInstanceName) {
   std::string moduleLabel = processName + "dummyMod";
   std::string moduleClass("DummyModule");
   edm::TypeWithDict dummyType(typeid(edmtest::DummyProduct));
@@ -123,29 +118,27 @@ test_ep::fake_single_process_branch(std::string const& tag,
   modParams.registerIt();
   std::shared_ptr<edm::ProcessConfiguration> process(fake_single_module_process(tag, processName, modParams));
 
-  auto result = std::make_shared<edm::BranchDescription>(
-                               edm::InEvent,
-                               moduleLabel,
-                               processName,
-                               productClassName,
-                               friendlyProductClassName,
-                               productInstanceName,
-                               moduleClass,
-                               modParams.id(),
-                               dummyType);
+  auto result = std::make_shared<edm::BranchDescription>(edm::InEvent,
+                                                         moduleLabel,
+                                                         processName,
+                                                         productClassName,
+                                                         friendlyProductClassName,
+                                                         productInstanceName,
+                                                         moduleClass,
+                                                         modParams.id(),
+                                                         dummyType);
   branchDescriptions_[tag] = result;
   return result;
 }
 
 void test_ep::setUp() {
-
   // Making a functional EventPrincipal is not trivial, so we do it
   // all here.
   eventID_ = edm::EventID(101, 1, 20);
 
   // We can only insert products registered in the ProductRegistry.
   pProductRegistry_.reset(new edm::ProductRegistry);
-  pProductRegistry_->addProduct(*fake_single_process_branch("hlt",  "HLT"));
+  pProductRegistry_->addProduct(*fake_single_process_branch("hlt", "HLT"));
   pProductRegistry_->addProduct(*fake_single_process_branch("prod", "PROD"));
   pProductRegistry_->addProduct(*fake_single_process_branch("test", "TEST"));
   pProductRegistry_->addProduct(*fake_single_process_branch("user", "USER"));
@@ -157,7 +150,6 @@ void test_ep::setUp() {
 
   // Put products we'll look for into the EventPrincipal.
   {
-
     typedef edmtest::DummyProduct PRODUCT_TYPE;
     typedef edm::Wrapper<PRODUCT_TYPE> WDP;
 
@@ -183,13 +175,18 @@ void test_ep::setUp() {
     std::string uuid = edm::createGlobalIdentifier();
     edm::Timestamp now(1234567UL);
     auto runAux = std::make_shared<edm::RunAuxiliary>(eventID_.run(), now, now);
-    auto rp = std::make_shared<edm::RunPrincipal>(runAux, pProductRegistry_, *process, &historyAppender_,0);
+    auto rp = std::make_shared<edm::RunPrincipal>(runAux, pProductRegistry_, *process, &historyAppender_, 0);
     edm::LuminosityBlockAuxiliary lumiAux(rp->run(), 1, now, now);
-    lbp_ = std::make_shared<edm::LuminosityBlockPrincipal>(pProductRegistry_, *process, &historyAppender_,0);
+    lbp_ = std::make_shared<edm::LuminosityBlockPrincipal>(pProductRegistry_, *process, &historyAppender_, 0);
     lbp_->setAux(lumiAux);
     lbp_->setRunPrincipal(rp);
     edm::EventAuxiliary eventAux(eventID_, uuid, now, true);
-    pEvent_.reset(new edm::EventPrincipal(pProductRegistry_, branchIDListHelper, thinnedAssociationsHelper, *process, &historyAppender_,edm::StreamID::invalidStreamID()));
+    pEvent_.reset(new edm::EventPrincipal(pProductRegistry_,
+                                          branchIDListHelper,
+                                          thinnedAssociationsHelper,
+                                          *process,
+                                          &historyAppender_,
+                                          edm::StreamID::invalidStreamID()));
     edm::ProcessHistoryRegistry phr;
     pEvent_->fillEventPrincipal(eventAux, phr);
     pEvent_->setLuminosityBlockPrincipal(lbp_.get());
@@ -205,14 +202,12 @@ void clear_map(MAP& m) {
 }
 
 void test_ep::tearDown() {
-
   clear_map(branchDescriptions_);
   clear_map(processConfigurations_);
 
   pEvent_.reset();
 
   pProductRegistry_.reset();
-
 }
 
 //----------------------------------------------------------------------
@@ -234,14 +229,15 @@ void test_ep::failgetbyLabelTest() {
 
   std::string label("this does not exist");
 
-  edm::BasicHandle h(pEvent_->getByLabel(edm::PRODUCT_TYPE, tid, label, std::string(), std::string(), nullptr, nullptr, nullptr));
+  edm::BasicHandle h(
+      pEvent_->getByLabel(edm::PRODUCT_TYPE, tid, label, std::string(), std::string(), nullptr, nullptr, nullptr));
   CPPUNIT_ASSERT(h.failedToGet());
 }
 
 void test_ep::failgetManybyTypeTest() {
   edmtest::IntProduct dummy;
   edm::TypeID tid(dummy);
-  std::vector<edm::BasicHandle > handles;
+  std::vector<edm::BasicHandle> handles;
 
   pEvent_->getManyByType(tid, handles, nullptr, nullptr, nullptr);
   CPPUNIT_ASSERT(handles.empty());
diff --git a/FWCore/Framework/test/eventprocessor2_t.cppunit.cc b/FWCore/Framework/test/eventprocessor2_t.cppunit.cc
index 86039da40861a..d711d59c54558 100644
--- a/FWCore/Framework/test/eventprocessor2_t.cppunit.cc
+++ b/FWCore/Framework/test/eventprocessor2_t.cppunit.cc
@@ -2,7 +2,7 @@
 
 Test of the EventProcessor class.
 
-----------------------------------------------------------------------*/  
+----------------------------------------------------------------------*/
 #include <exception>
 #include <iostream>
 #include <string>
@@ -17,38 +17,34 @@ Test of the EventProcessor class.
 
 // to be called also by the other cppunit...
 void doInit() {
-   static bool firstTime=true;
-   if(firstTime) {
-      //std::cout << "common init" << std::endl;
-      if(not edmplugin::PluginManager::isAvailable()) {
-        edmplugin::PluginManager::configure(edmplugin::standard::config());
-     }
-      firstTime = false;
-   }
+  static bool firstTime = true;
+  if (firstTime) {
+    //std::cout << "common init" << std::endl;
+    if (not edmplugin::PluginManager::isAvailable()) {
+      edmplugin::PluginManager::configure(edmplugin::standard::config());
+    }
+    firstTime = false;
+  }
 }
 
+class testeventprocessor2 : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testeventprocessor2);
+  CPPUNIT_TEST(eventprocessor2Test);
+  CPPUNIT_TEST_SUITE_END();
 
-class testeventprocessor2: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(testeventprocessor2);
-CPPUNIT_TEST(eventprocessor2Test);
-CPPUNIT_TEST_SUITE_END();
 public:
-  void setUp(){
-      //std::cout << "setting up testeventprocessor2" << std::endl;
-      doInit();
+  void setUp() {
+    //std::cout << "setting up testeventprocessor2" << std::endl;
+    doInit();
   }
-  void tearDown(){}
+  void tearDown() {}
   void eventprocessor2Test();
 };
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testeventprocessor2);
 
-
-
-void work()
-{
+void work() {
   //std::cout << "work in testeventprocessor2" << std::endl;
   std::string configuration(
       "import FWCore.ParameterSet.Config as cms\n"
@@ -70,21 +66,17 @@ void work()
   proc.endJob();
 }
 
-void testeventprocessor2::eventprocessor2Test()
-{
-  try { work();}
-  catch (cms::Exception& e) {
-      std::cerr << "CMS exception caught: "
-		<< e.explainSelf() << std::endl;
-      CPPUNIT_ASSERT("cms Exception caught in testeventprocessor2::eventprocessor2Test"==0);
-  }
-  catch (std::runtime_error& e) {
-      std::cerr << "Standard library exception caught: "
-		<< e.what() << std::endl;
-      CPPUNIT_ASSERT("std Exception caught in testeventprocessor2::eventprocessor2Test"==0);
-  }
-  catch (...) {
-      std::cerr << "Unknown exception caught" << std::endl;
-      CPPUNIT_ASSERT("unkown Exception caught in testeventprocessor2::eventprocessor2Test"==0);
+void testeventprocessor2::eventprocessor2Test() {
+  try {
+    work();
+  } catch (cms::Exception& e) {
+    std::cerr << "CMS exception caught: " << e.explainSelf() << std::endl;
+    CPPUNIT_ASSERT("cms Exception caught in testeventprocessor2::eventprocessor2Test" == 0);
+  } catch (std::runtime_error& e) {
+    std::cerr << "Standard library exception caught: " << e.what() << std::endl;
+    CPPUNIT_ASSERT("std Exception caught in testeventprocessor2::eventprocessor2Test" == 0);
+  } catch (...) {
+    std::cerr << "Unknown exception caught" << std::endl;
+    CPPUNIT_ASSERT("unkown Exception caught in testeventprocessor2::eventprocessor2Test" == 0);
   }
 }
diff --git a/FWCore/Framework/test/eventprocessor_t.cppunit.cc b/FWCore/Framework/test/eventprocessor_t.cppunit.cc
index 1bcbdf30e8001..391c099b61d64 100644
--- a/FWCore/Framework/test/eventprocessor_t.cppunit.cc
+++ b/FWCore/Framework/test/eventprocessor_t.cppunit.cc
@@ -33,7 +33,7 @@ Test of the EventProcessor class.
 // defined in the other cppunit
 void doInit();
 
-class testeventprocessor: public CppUnit::TestFixture {
+class testeventprocessor : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testeventprocessor);
   CPPUNIT_TEST(parseTest);
   CPPUNIT_TEST(beginEndTest);
@@ -44,12 +44,11 @@ class testeventprocessor: public CppUnit::TestFixture {
   CPPUNIT_TEST(moduleFailureTest);
   CPPUNIT_TEST_SUITE_END();
 
- public:
-
+public:
   void setUp() {
     //std::cout << "setting up testeventprocessor" << std::endl;
     doInit();
-    m_handler = std::make_unique<edm::AssertHandler>(); // propagate_const<T> has no reset() function
+    m_handler = std::make_unique<edm::AssertHandler>();  // propagate_const<T> has no reset() function
     sleep_secs_ = 0;
   }
 
@@ -62,21 +61,21 @@ class testeventprocessor: public CppUnit::TestFixture {
   void endpathTest();
   void serviceConfigSaveTest();
 
- private:
+private:
   edm::propagate_const<std::unique_ptr<edm::AssertHandler>> m_handler;
   void work() {
     //std::cout << "work in testeventprocessor" << std::endl;
     std::string configuration(
-      "import FWCore.ParameterSet.Config as cms\n"
-      "process = cms.Process('p')\n"
-      "process.maxEvents = cms.untracked.PSet(\n"
-      "    input = cms.untracked.int32(5))\n"
-      "process.source = cms.Source('EmptySource')\n"
-      "process.m1 = cms.EDProducer('TestMod',\n"
-      "    ivalue = cms.int32(10))\n"
-      "process.m2 = cms.EDProducer('TestMod',\n"
-      "    ivalue = cms.int32(-3))\n"
-      "process.p1 = cms.Path(process.m1*process.m2)\n");
+        "import FWCore.ParameterSet.Config as cms\n"
+        "process = cms.Process('p')\n"
+        "process.maxEvents = cms.untracked.PSet(\n"
+        "    input = cms.untracked.int32(5))\n"
+        "process.source = cms.Source('EmptySource')\n"
+        "process.m1 = cms.EDProducer('TestMod',\n"
+        "    ivalue = cms.int32(10))\n"
+        "process.m2 = cms.EDProducer('TestMod',\n"
+        "    ivalue = cms.int32(-3))\n"
+        "process.p1 = cms.Path(process.m1*process.m2)\n");
     edm::EventProcessor proc(edm::getPSetFromConfig(configuration));
     proc.beginJob();
     proc.run();
@@ -89,19 +88,16 @@ class testeventprocessor: public CppUnit::TestFixture {
 CPPUNIT_TEST_SUITE_REGISTRATION(testeventprocessor);
 
 void testeventprocessor::parseTest() {
-  try { work();}
-  catch (cms::Exception& e) {
-      std::cerr << "cms exception caught: "
-                << e.explainSelf() << std::endl;
-      CPPUNIT_ASSERT("Caught cms::Exception " == 0);
-  }
-  catch (std::exception& e) {
-      std::cerr << "Standard library exception caught: "
-                << e.what() << std::endl;
-      CPPUNIT_ASSERT("Caught std::exception " == 0);
-  }
-  catch (...) {
-      CPPUNIT_ASSERT("Caught unknown exception " == 0);
+  try {
+    work();
+  } catch (cms::Exception& e) {
+    std::cerr << "cms exception caught: " << e.explainSelf() << std::endl;
+    CPPUNIT_ASSERT("Caught cms::Exception " == 0);
+  } catch (std::exception& e) {
+    std::cerr << "Standard library exception caught: " << e.what() << std::endl;
+    CPPUNIT_ASSERT("Caught std::exception " == 0);
+  } catch (...) {
+    CPPUNIT_ASSERT("Caught unknown exception " == 0);
   }
 }
 
@@ -134,9 +130,9 @@ void testeventprocessor::beginEndTest() {
     CPPUNIT_ASSERT(0 == proc.totalEvents());
 
     proc.beginJob();
- 
+
     //std::cout << "beginEndTest 1 af" << std::endl;
- 
+
     CPPUNIT_ASSERT(TestBeginEndJobAnalyzer::control().beginJobCalled);
     CPPUNIT_ASSERT(!TestBeginEndJobAnalyzer::control().endJobCalled);
     CPPUNIT_ASSERT(!TestBeginEndJobAnalyzer::control().beginRunCalled);
@@ -155,7 +151,7 @@ void testeventprocessor::beginEndTest() {
     CPPUNIT_ASSERT(!TestBeginEndJobAnalyzer::control().endLumiCalled);
     CPPUNIT_ASSERT(0 == proc.totalEvents());
 
-     CPPUNIT_ASSERT(not edm::pset::Registry::instance()->empty());
+    CPPUNIT_ASSERT(not edm::pset::Registry::instance()->empty());
   }
   CPPUNIT_ASSERT(edm::pset::Registry::instance()->empty());
 
@@ -238,13 +234,12 @@ void testeventprocessor::beginEndTest() {
     CPPUNIT_ASSERT(TestBeginEndJobAnalyzer::control().beginLumiCalled);
     CPPUNIT_ASSERT(TestBeginEndJobAnalyzer::control().endLumiCalled);
     CPPUNIT_ASSERT(10 == proc.totalEvents());
-    
+
     proc.endJob();
-    
+
     // Check that these are not called again
     TestBeginEndJobAnalyzer::control().endRunCalled = false;
     TestBeginEndJobAnalyzer::control().endLumiCalled = false;
-
   }
   CPPUNIT_ASSERT(!TestBeginEndJobAnalyzer::control().endRunCalled);
   CPPUNIT_ASSERT(!TestBeginEndJobAnalyzer::control().endLumiCalled);
@@ -315,9 +310,8 @@ void testeventprocessor::beginEndTest() {
   CPPUNIT_ASSERT(TestBeginEndJobAnalyzer::control().endLumiCalled);
 }
 
-void testeventprocessor::cleanupJobTest()
-{
-  //std::cout << "cleanup " << std::endl; 
+void testeventprocessor::cleanupJobTest() {
+  //std::cout << "cleanup " << std::endl;
   std::string configuration(
       "import FWCore.ParameterSet.Config as cms\n"
       "process = cms.Process('p')\n"
@@ -327,7 +321,7 @@ void testeventprocessor::cleanupJobTest()
       "process.m1 = cms.EDAnalyzer('TestBeginEndJobAnalyzer')\n"
       "process.p1 = cms.Path(process.m1)\n");
   {
-      //std::cout << "cleanup 1" << std::endl;
+    //std::cout << "cleanup 1" << std::endl;
 
     TestBeginEndJobAnalyzer::control().destructorCalled = false;
     edm::EventProcessor proc(edm::getPSetFromConfig(configuration));
@@ -340,7 +334,7 @@ void testeventprocessor::cleanupJobTest()
   }
   CPPUNIT_ASSERT(TestBeginEndJobAnalyzer::control().destructorCalled);
   {
-      //std::cout << "cleanup 2" << std::endl;
+    //std::cout << "cleanup 2" << std::endl;
 
     TestBeginEndJobAnalyzer::control().destructorCalled = false;
     edm::EventProcessor proc(edm::getPSetFromConfig(configuration));
@@ -349,44 +343,37 @@ void testeventprocessor::cleanupJobTest()
     proc.run();
     CPPUNIT_ASSERT(2 == proc.totalEvents());
     CPPUNIT_ASSERT(!TestBeginEndJobAnalyzer::control().destructorCalled);
-
   }
   CPPUNIT_ASSERT(TestBeginEndJobAnalyzer::control().destructorCalled);
 }
 
 namespace {
-  struct Listener{
-    Listener(edm::ActivityRegistry& iAR) :
-      postBeginJob_(0),
-      postEndJob_(0),
-      preEventProcessing_(0),
-      postEventProcessing_(0),
-      preModule_(0),
-      postModule_(0) {
-        iAR.watchPostBeginJob(this, &Listener::postBeginJob);
-        iAR.watchPostEndJob(this, &Listener::postEndJob);
-
-        iAR.watchPreEvent(this, &Listener::preEventProcessing);
-        iAR.watchPostEvent(this, &Listener::postEventProcessing);
-
-        iAR.watchPreModuleEvent(this, &Listener::preModule);
-        iAR.watchPostModuleEvent(this, &Listener::postModule);
-      }
+  struct Listener {
+    Listener(edm::ActivityRegistry& iAR)
+        : postBeginJob_(0),
+          postEndJob_(0),
+          preEventProcessing_(0),
+          postEventProcessing_(0),
+          preModule_(0),
+          postModule_(0) {
+      iAR.watchPostBeginJob(this, &Listener::postBeginJob);
+      iAR.watchPostEndJob(this, &Listener::postEndJob);
+
+      iAR.watchPreEvent(this, &Listener::preEventProcessing);
+      iAR.watchPostEvent(this, &Listener::postEventProcessing);
+
+      iAR.watchPreModuleEvent(this, &Listener::preModule);
+      iAR.watchPostModuleEvent(this, &Listener::postModule);
+    }
 
-    void postBeginJob() {++postBeginJob_;}
-    void postEndJob() {++postEndJob_;}
+    void postBeginJob() { ++postBeginJob_; }
+    void postEndJob() { ++postEndJob_; }
 
-    void preEventProcessing(edm::StreamContext const&) {
-      ++preEventProcessing_;}
-    void postEventProcessing(edm::StreamContext const&) {
-      ++postEventProcessing_;}
+    void preEventProcessing(edm::StreamContext const&) { ++preEventProcessing_; }
+    void postEventProcessing(edm::StreamContext const&) { ++postEventProcessing_; }
 
-    void preModule(edm::StreamContext const&, edm::ModuleCallingContext const&) {
-      ++preModule_;
-    }
-    void postModule(edm::StreamContext const&, edm::ModuleCallingContext const&) {
-      ++postModule_;
-    }
+    void preModule(edm::StreamContext const&, edm::ModuleCallingContext const&) { ++preModule_; }
+    void postModule(edm::StreamContext const&, edm::ModuleCallingContext const&) { ++postModule_; }
 
     unsigned int postBeginJob_;
     unsigned int postEndJob_;
@@ -395,10 +382,9 @@ namespace {
     unsigned int preModule_;
     unsigned int postModule_;
   };
-}
+}  // namespace
 
-void
-testeventprocessor::activityRegistryTest() {
+void testeventprocessor::activityRegistryTest() {
   std::string configuration(
       "import FWCore.ParameterSet.Config as cms\n"
       "process = cms.Process('p')\n"
@@ -437,11 +423,9 @@ testeventprocessor::activityRegistryTest() {
 
   typedef std::vector<edm::ModuleDescription const*> ModuleDescs;
   ModuleDescs allModules = proc.getAllModuleDescriptions();
-  CPPUNIT_ASSERT(3 == allModules.size()); // TestMod & TriggerResults
+  CPPUNIT_ASSERT(3 == allModules.size());  // TestMod & TriggerResults
   //std::cout << "\nModuleDescriptions in testeventprocessor::activityRegistryTest()---\n";
-  for (ModuleDescs::const_iterator i = allModules.begin(), e = allModules.end();
-       i != e ;
-       ++i) {
+  for (ModuleDescs::const_iterator i = allModules.begin(), e = allModules.end(); i != e; ++i) {
     CPPUNIT_ASSERT(*i != 0);
     //std::cout << **i << '\n';
   }
@@ -451,38 +435,34 @@ testeventprocessor::activityRegistryTest() {
   CPPUNIT_ASSERT(5 == proc.totalEventsPassed());
 }
 
-static
-bool
-findModuleName(std::string const& iMessage) {
+static bool findModuleName(std::string const& iMessage) {
   static std::regex const expr("TestFailuresAnalyzer");
   return regex_search(iMessage, expr);
 }
 
-void
-testeventprocessor::moduleFailureTest() {
+void testeventprocessor::moduleFailureTest() {
   try {
-
     std::string const preC(
-      "import FWCore.ParameterSet.Config as cms\n"
-      "process = cms.Process('p')\n"
-      "process.maxEvents = cms.untracked.PSet(\n"
-      "    input = cms.untracked.int32(2))\n"
-      "process.source = cms.Source('EmptySource')\n"
-      "process.m1 = cms.EDAnalyzer('TestFailuresAnalyzer',\n"
-      "    whichFailure = cms.int32(");
+        "import FWCore.ParameterSet.Config as cms\n"
+        "process = cms.Process('p')\n"
+        "process.maxEvents = cms.untracked.PSet(\n"
+        "    input = cms.untracked.int32(2))\n"
+        "process.source = cms.Source('EmptySource')\n"
+        "process.m1 = cms.EDAnalyzer('TestFailuresAnalyzer',\n"
+        "    whichFailure = cms.int32(");
 
     std::string const postC(
-      "))\n"
-      "process.p1 = cms.Path(process.m1)\n");
+        "))\n"
+        "process.p1 = cms.Path(process.m1)\n");
 
     {
-      std::string const configuration = preC +"0"+postC;
+      std::string const configuration = preC + "0" + postC;
       bool threw = true;
       try {
         edm::EventProcessor proc(edm::getPSetFromConfig(configuration));
         threw = false;
-      } catch(cms::Exception const& iException) {
-        if(!findModuleName(iException.explainSelf())) {
+      } catch (cms::Exception const& iException) {
+        if (!findModuleName(iException.explainSelf())) {
           std::cout << iException.explainSelf() << std::endl;
           CPPUNIT_ASSERT(0 == "module name not in exception message");
         }
@@ -490,15 +470,15 @@ testeventprocessor::moduleFailureTest() {
       CPPUNIT_ASSERT(threw && 0 != "exception never thrown");
     }
     {
-      std::string const configuration = preC +"1"+postC;
+      std::string const configuration = preC + "1" + postC;
       bool threw = true;
       edm::EventProcessor proc(edm::getPSetFromConfig(configuration));
 
       try {
         proc.beginJob();
         threw = false;
-      } catch(cms::Exception const& iException) {
-        if(!findModuleName(iException.explainSelf())) {
+      } catch (cms::Exception const& iException) {
+        if (!findModuleName(iException.explainSelf())) {
           std::cout << iException.explainSelf() << std::endl;
           CPPUNIT_ASSERT(0 == "module name not in exception message");
         }
@@ -507,7 +487,7 @@ testeventprocessor::moduleFailureTest() {
     }
 
     {
-      std::string const configuration = preC +"2"+postC;
+      std::string const configuration = preC + "2" + postC;
       bool threw = true;
       edm::EventProcessor proc(edm::getPSetFromConfig(configuration));
 
@@ -515,8 +495,8 @@ testeventprocessor::moduleFailureTest() {
       try {
         proc.run();
         threw = false;
-      } catch(cms::Exception const& iException) {
-        if(!findModuleName(iException.explainSelf())) {
+      } catch (cms::Exception const& iException) {
+        if (!findModuleName(iException.explainSelf())) {
           std::cout << iException.explainSelf() << std::endl;
           CPPUNIT_ASSERT(0 == "module name not in exception message");
         }
@@ -525,7 +505,7 @@ testeventprocessor::moduleFailureTest() {
       proc.endJob();
     }
     {
-      std::string const configuration = preC +"3"+postC;
+      std::string const configuration = preC + "3" + postC;
       bool threw = true;
       edm::EventProcessor proc(edm::getPSetFromConfig(configuration));
 
@@ -533,8 +513,8 @@ testeventprocessor::moduleFailureTest() {
       try {
         proc.endJob();
         threw = false;
-      } catch(cms::Exception const& iException) {
-        if(!findModuleName(iException.explainSelf())) {
+      } catch (cms::Exception const& iException) {
+        if (!findModuleName(iException.explainSelf())) {
           std::cout << iException.explainSelf() << std::endl;
           CPPUNIT_ASSERT(0 == "module name not in exception message");
         }
@@ -546,49 +526,46 @@ testeventprocessor::moduleFailureTest() {
       bool threw = true;
       try {
         std::string configuration(
-          "import FWCore.ParameterSet.Config as cms\n"
-          "process = cms.Process('p')\n"
-          "process.maxEvents = cms.untracked.PSet(\n"
-          "    input = cms.untracked.int32(2))\n"
-          "process.source = cms.Source('EmptySource')\n"
-          "process.p1 = cms.Path(process.m1)\n");
+            "import FWCore.ParameterSet.Config as cms\n"
+            "process = cms.Process('p')\n"
+            "process.maxEvents = cms.untracked.PSet(\n"
+            "    input = cms.untracked.int32(2))\n"
+            "process.source = cms.Source('EmptySource')\n"
+            "process.p1 = cms.Path(process.m1)\n");
         edm::EventProcessor proc(edm::getPSetFromConfig(configuration));
 
         threw = false;
-      } catch(cms::Exception const& iException) {
+      } catch (cms::Exception const& iException) {
         static std::regex const expr("m1");
-        if(!regex_search(iException.explainSelf(), expr)) {
+        if (!regex_search(iException.explainSelf(), expr)) {
           std::cout << iException.explainSelf() << std::endl;
           CPPUNIT_ASSERT(0 == "module name not in exception message");
         }
       }
       CPPUNIT_ASSERT(threw && 0 != "exception never thrown");
     }
-  } catch(cms::Exception const& iException) {
+  } catch (cms::Exception const& iException) {
     std::cout << "Unexpected exception " << iException.explainSelf() << std::endl;
     throw;
   }
 }
 
-void
-testeventprocessor::serviceConfigSaveTest() {
-   std::string configuration(
-                             "import FWCore.ParameterSet.Config as cms\n"
-                             "process = cms.Process('p')\n"
-                             "process.add_(cms.Service('DummyStoreConfigService'))\n"
-                             "process.maxEvents = cms.untracked.PSet(\n"
-                             "    input = cms.untracked.int32(5))\n"
-                             "process.source = cms.Source('EmptySource')\n"
-                             "process.m1 = cms.EDProducer('TestMod',\n"
-                             "   ivalue = cms.int32(-3))\n"
-                             "process.p1 = cms.Path(process.m1)\n");
-
-   edm::EventProcessor proc(edm::getPSetFromConfig(configuration));
-   edm::ProcessConfiguration const& processConfiguration = proc.processConfiguration();
-   edm::ParameterSet const& topPset(edm::getParameterSet(processConfiguration.parameterSetID()));
-   CPPUNIT_ASSERT(topPset.existsAs<edm::ParameterSet>("DummyStoreConfigService", true));
-}
+void testeventprocessor::serviceConfigSaveTest() {
+  std::string configuration(
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('p')\n"
+      "process.add_(cms.Service('DummyStoreConfigService'))\n"
+      "process.maxEvents = cms.untracked.PSet(\n"
+      "    input = cms.untracked.int32(5))\n"
+      "process.source = cms.Source('EmptySource')\n"
+      "process.m1 = cms.EDProducer('TestMod',\n"
+      "   ivalue = cms.int32(-3))\n"
+      "process.p1 = cms.Path(process.m1)\n");
 
-void
-testeventprocessor::endpathTest() {
+  edm::EventProcessor proc(edm::getPSetFromConfig(configuration));
+  edm::ProcessConfiguration const& processConfiguration = proc.processConfiguration();
+  edm::ParameterSet const& topPset(edm::getParameterSet(processConfiguration.parameterSetID()));
+  CPPUNIT_ASSERT(topPset.existsAs<edm::ParameterSet>("DummyStoreConfigService", true));
 }
+
+void testeventprocessor::endpathTest() {}
diff --git a/FWCore/Framework/test/eventsetup_dataget_check_compile_time_error_t.cpp b/FWCore/Framework/test/eventsetup_dataget_check_compile_time_error_t.cpp
index 7113ce758a24b..fba9a922c50bb 100644
--- a/FWCore/Framework/test/eventsetup_dataget_check_compile_time_error_t.cpp
+++ b/FWCore/Framework/test/eventsetup_dataget_check_compile_time_error_t.cpp
@@ -15,12 +15,12 @@ using namespace edm;
 class DataWithNoDefaultRecord {};
 
 int main() {
-   eventsetup::EventSetupProvider provider;
-   auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue(0));
-   //This should cause a compile time failure since DataWithNoDefaultRecord
-   /// does not have a default record assigned
-   ESHandle<DataWithNoDefaultRecord> pData;
-   eventSetup.getData(pData);
-   
-   return 0;
+  eventsetup::EventSetupProvider provider;
+  auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue(0));
+  //This should cause a compile time failure since DataWithNoDefaultRecord
+  /// does not have a default record assigned
+  ESHandle<DataWithNoDefaultRecord> pData;
+  eventSetup.getData(pData);
+
+  return 0;
 }
diff --git a/FWCore/Framework/test/eventsetup_get_check_compile_time_error_t.cpp b/FWCore/Framework/test/eventsetup_get_check_compile_time_error_t.cpp
index fe747c90d3629..edc413f26f953 100644
--- a/FWCore/Framework/test/eventsetup_get_check_compile_time_error_t.cpp
+++ b/FWCore/Framework/test/eventsetup_get_check_compile_time_error_t.cpp
@@ -6,7 +6,6 @@
  *
  */
 
-
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/EventSetupProvider.h"
 #include "FWCore/Framework/interface/IOVSyncValue.h"
@@ -15,11 +14,11 @@ using namespace edm;
 class NotAGoodRecord {};
 
 int main() {
-   eventsetup::EventSetupProvider provider;
-   auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue(0));
-   //This should cause a compile time failure since NotAGoodRecord
-   /// does not inherit from edm::eventsetup::EventSetupRecord
-   eventSetup.get<NotAGoodRecord>();
-   
-   return 0;
+  eventsetup::EventSetupProvider provider;
+  auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue(0));
+  //This should cause a compile time failure since NotAGoodRecord
+  /// does not inherit from edm::eventsetup::EventSetupRecord
+  eventSetup.get<NotAGoodRecord>();
+
+  return 0;
 }
diff --git a/FWCore/Framework/test/eventsetup_t.cppunit.cc b/FWCore/Framework/test/eventsetup_t.cppunit.cc
index 7d6de0d977269..2115d2a931930 100644
--- a/FWCore/Framework/test/eventsetup_t.cppunit.cc
+++ b/FWCore/Framework/test/eventsetup_t.cppunit.cc
@@ -15,13 +15,14 @@
 
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ESTransientHandle.h"
 #include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
 #include "FWCore/Framework/interface/EventSetupProvider.h"
 #include "FWCore/Framework/interface/EventSetupRecordProvider.h"
 #include "FWCore/Framework/interface/IOVSyncValue.h"
 #include "FWCore/Framework/interface/EDConsumerBase.h"
 #include "FWCore/Framework/interface/IOVSyncValue.h"
-
+#include "FWCore/Framework/interface/ESRecordsToProxyIndices.h"
 
 #include "FWCore/Framework/test/DummyRecord.h"
 #include "FWCore/Framework/test/DummyProxyProvider.h"
@@ -36,31 +37,29 @@
 
 using namespace edm;
 namespace {
-  bool non_null(const void* iPtr) {
-    return iPtr != nullptr;
-  }
-}
+  bool non_null(const void* iPtr) { return iPtr != nullptr; }
+}  // namespace
 
-class testEventsetup: public CppUnit::TestFixture
-{
+class testEventsetup : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testEventsetup);
 
   CPPUNIT_TEST(constructTest);
   CPPUNIT_TEST(getTest);
   CPPUNIT_TEST(tryToGetTest);
-  CPPUNIT_TEST_EXCEPTION(getExcTest,edm::eventsetup::NoRecordException<DummyRecord>);
+  CPPUNIT_TEST_EXCEPTION(getExcTest, edm::eventsetup::NoRecordException<DummyRecord>);
   CPPUNIT_TEST(recordProviderTest);
   CPPUNIT_TEST(provenanceTest);
   CPPUNIT_TEST(getDataWithLabelTest);
   CPPUNIT_TEST(getDataWithESInputTagTest);
   CPPUNIT_TEST(getDataWithESGetTokenTest);
   CPPUNIT_TEST(getHandleWithESGetTokenTest);
-  CPPUNIT_TEST_EXCEPTION(recordValidityTest,edm::eventsetup::NoRecordException<DummyRecord>);
-  CPPUNIT_TEST_EXCEPTION(recordValidityExcTest,edm::eventsetup::NoRecordException<DummyRecord>);
+  CPPUNIT_TEST(getTransientHandleWithESGetTokenTest);
+  CPPUNIT_TEST_EXCEPTION(recordValidityTest, edm::eventsetup::NoRecordException<DummyRecord>);
+  CPPUNIT_TEST_EXCEPTION(recordValidityExcTest, edm::eventsetup::NoRecordException<DummyRecord>);
   CPPUNIT_TEST(proxyProviderTest);
 
-  CPPUNIT_TEST_EXCEPTION(producerConflictTest,cms::Exception);
-  CPPUNIT_TEST_EXCEPTION(sourceConflictTest,cms::Exception);
+  CPPUNIT_TEST_EXCEPTION(producerConflictTest, cms::Exception);
+  CPPUNIT_TEST_EXCEPTION(sourceConflictTest, cms::Exception);
   CPPUNIT_TEST(twoSourceTest);
   CPPUNIT_TEST(sourceProducerResolutionTest);
   CPPUNIT_TEST(preferTest);
@@ -70,9 +69,10 @@ class testEventsetup: public CppUnit::TestFixture
   CPPUNIT_TEST(iovExtentionTest);
 
   CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void constructTest();
   void getTest();
@@ -87,6 +87,7 @@ class testEventsetup: public CppUnit::TestFixture
   void getDataWithESInputTagTest();
   void getDataWithESGetTokenTest();
   void getHandleWithESGetTokenTest();
+  void getTransientHandleWithESGetTokenTest();
 
   void producerConflictTest();
   void sourceConflictTest();
@@ -97,7 +98,6 @@ class testEventsetup: public CppUnit::TestFixture
   void introspectionTest();
 
   void iovExtentionTest();
-
 };
 
 ///registration of the test so that the runner can find it
@@ -107,22 +107,20 @@ namespace {
   edm::ActivityRegistry activityRegistry;
 }
 
-void testEventsetup::constructTest()
-{
+void testEventsetup::constructTest() {
   eventsetup::EventSetupProvider provider(&activityRegistry);
   const Timestamp time(1);
   const IOVSyncValue timestamp(time);
-  auto const& eventSetup = provider.eventSetupForInstance(timestamp);
+  EventSetup const eventSetup{provider.eventSetupForInstance(timestamp), 0, nullptr};
   CPPUNIT_ASSERT(non_null(&eventSetup));
 }
 
-void testEventsetup::getTest()
-{
+void testEventsetup::getTest() {
   eventsetup::EventSetupProvider provider(&activityRegistry);
-  auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
+  EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue()), 0, nullptr};
   CPPUNIT_ASSERT(non_null(&eventSetup));
 
-  eventsetup::EventSetupRecordImpl dummyRecord{ eventsetup::EventSetupRecordKey::makeKey<DummyRecord>() };
+  eventsetup::EventSetupRecordImpl dummyRecord{eventsetup::EventSetupRecordKey::makeKey<DummyRecord>()};
   provider.addRecord(eventsetup::EventSetupRecordKey::makeKey<DummyRecord>());
   provider.addRecordToEventSetup(dummyRecord);
   const DummyRecord& gottenRecord = eventSetup.get<DummyRecord>();
@@ -130,13 +128,12 @@ void testEventsetup::getTest()
   CPPUNIT_ASSERT(&dummyRecord == gottenRecord.impl_);
 }
 
-void testEventsetup::tryToGetTest()
-{
+void testEventsetup::tryToGetTest() {
   eventsetup::EventSetupProvider provider(&activityRegistry);
-  auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
+  EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue()), 0, nullptr};
   CPPUNIT_ASSERT(non_null(&eventSetup));
 
-  eventsetup::EventSetupRecordImpl dummyRecord{ eventsetup::EventSetupRecordKey::makeKey<DummyRecord>() };
+  eventsetup::EventSetupRecordImpl dummyRecord{eventsetup::EventSetupRecordKey::makeKey<DummyRecord>()};
   provider.addRecord(eventsetup::EventSetupRecordKey::makeKey<DummyRecord>());
   provider.addRecordToEventSetup(dummyRecord);
   auto gottenRecord = eventSetup.tryToGet<DummyRecord>();
@@ -144,28 +141,24 @@ void testEventsetup::tryToGetTest()
   CPPUNIT_ASSERT(&dummyRecord == gottenRecord->impl_);
 }
 
-void testEventsetup::getExcTest()
-{
+void testEventsetup::getExcTest() {
   eventsetup::EventSetupProvider provider(&activityRegistry);
-  auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
+  EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue()), 0, nullptr};
   CPPUNIT_ASSERT(non_null(&eventSetup));
   eventSetup.get<DummyRecord>();
 }
 
-
 class DummyEventSetupProvider : public edm::eventsetup::EventSetupProvider {
 public:
+  DummyEventSetupProvider(ActivityRegistry* activityRegistry) : EventSetupProvider(activityRegistry) {}
 
-  DummyEventSetupProvider(ActivityRegistry* activityRegistry) : EventSetupProvider(activityRegistry) { }
-
-  template<class T>
+  template <class T>
   void insert(std::unique_ptr<T> iRecord) {
     edm::eventsetup::EventSetupProvider::insert(std::move(iRecord));
   }
 };
 
-void testEventsetup::recordProviderTest()
-{
+void testEventsetup::recordProviderTest() {
   DummyEventSetupProvider provider(&activityRegistry);
   typedef eventsetup::EventSetupRecordProvider DummyRecordProvider;
   provider.insert(std::make_unique<DummyRecordProvider>(DummyRecord::keyForClass()));
@@ -175,38 +168,33 @@ void testEventsetup::recordProviderTest()
   //       Since the EventSetup::get<> will only retrieve a Record if its
   //       interval of validity is 'valid' for the present 'instance'
   //       this is a 'hack' to have the 'get' succeed
-  auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
+  EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue()), 0, nullptr};
   const DummyRecord& gottenRecord = eventSetup.get<DummyRecord>();
   CPPUNIT_ASSERT(non_null(&gottenRecord));
 }
 
-
 class DummyFinder : public EventSetupRecordIntervalFinder {
 public:
-  DummyFinder() : EventSetupRecordIntervalFinder(), interval_()  {
-    this->findingRecord<DummyRecord>();
-  }
+  DummyFinder() : EventSetupRecordIntervalFinder(), interval_() { this->findingRecord<DummyRecord>(); }
+
+  void setInterval(const ValidityInterval& iInterval) { interval_ = iInterval; }
 
-  void setInterval(const ValidityInterval& iInterval) {
-    interval_ = iInterval;
-  }
 protected:
   virtual void setIntervalFor(const eventsetup::EventSetupRecordKey&,
                               const IOVSyncValue& iTime,
                               ValidityInterval& iInterval) {
-    if(interval_.validFor(iTime)) {
+    if (interval_.validFor(iTime)) {
       iInterval = interval_;
     } else {
       iInterval = ValidityInterval();
     }
   }
+
 private:
   ValidityInterval interval_;
 };
 
-
-void testEventsetup::recordValidityTest()
-{
+void testEventsetup::recordValidityTest() {
   DummyEventSetupProvider provider(&activityRegistry);
   typedef eventsetup::EventSetupRecordProvider DummyRecordProvider;
   auto dummyRecordProvider = std::make_unique<DummyRecordProvider>(DummyRecord::keyForClass());
@@ -223,23 +211,20 @@ void testEventsetup::recordValidityTest()
   const Timestamp time_2(2);
   finder->setInterval(ValidityInterval(IOVSyncValue(time_2), IOVSyncValue(Timestamp(3))));
   {
-    auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue(time_2));
+    EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue(time_2)), 0, nullptr};
     eventSetup.get<DummyRecord>();
   }
   {
-    auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue(Timestamp(3)));
+    EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue(Timestamp(3))), 0, nullptr};
     eventSetup.get<DummyRecord>();
   }
   {
-    auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue(Timestamp(4)));
+    EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue(Timestamp(4))), 0, nullptr};
     eventSetup.get<DummyRecord>();
   }
-
-
 }
 
-void testEventsetup::recordValidityExcTest()
-{
+void testEventsetup::recordValidityExcTest() {
   DummyEventSetupProvider provider(&activityRegistry);
   typedef eventsetup::EventSetupRecordProvider DummyRecordProvider;
   auto dummyRecordProvider = std::make_unique<DummyRecordProvider>(DummyRecord::keyForClass());
@@ -248,43 +233,36 @@ void testEventsetup::recordValidityExcTest()
   provider.insert(std::move(dummyRecordProvider));
 
   {
-    auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue(Timestamp(1)));
+    EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue(Timestamp(1))), 0, nullptr};
     eventSetup.get<DummyRecord>();
   }
-
 }
 
 class DummyProxyProvider : public eventsetup::DataProxyProvider {
 public:
-  DummyProxyProvider() {
-    usingRecord<DummyRecord>();
-  }
-  void newInterval(const eventsetup::EventSetupRecordKey& /*iRecordType*/,
-                   const ValidityInterval& /*iInterval*/) {
+  DummyProxyProvider() { usingRecord<DummyRecord>(); }
+  void newInterval(const eventsetup::EventSetupRecordKey& /*iRecordType*/, const ValidityInterval& /*iInterval*/) {
     //do nothing
   }
-protected:
-  void registerProxies(const eventsetup::EventSetupRecordKey&, KeyedProxies& /*iHolder*/) {
-  }
 
+protected:
+  void registerProxies(const eventsetup::EventSetupRecordKey&, KeyedProxies& /*iHolder*/) {}
 };
 
 //create an instance of the register
 static eventsetup::RecordDependencyRegister<DummyRecord> s_factory;
 
-void testEventsetup::proxyProviderTest()
-{
+void testEventsetup::proxyProviderTest() {
   eventsetup::EventSetupProvider provider(&activityRegistry);
   provider.add(std::make_shared<DummyProxyProvider>());
 
-  auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
+  EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue()), 0, nullptr};
   const DummyRecord& gottenRecord = eventSetup.get<DummyRecord>();
   CPPUNIT_ASSERT(non_null(&gottenRecord));
 }
 
-void testEventsetup::producerConflictTest()
-{
-  edm::eventsetup::ComponentDescription description("DummyProxyProvider","",false);
+void testEventsetup::producerConflictTest() {
+  edm::eventsetup::ComponentDescription description("DummyProxyProvider", "", false);
   using edm::eventsetup::test::DummyProxyProvider;
   eventsetup::EventSetupProvider provider(&activityRegistry);
   {
@@ -298,12 +276,10 @@ void testEventsetup::producerConflictTest()
     provider.add(dummyProv);
   }
   //checking for conflicts is now delayed until first time EventSetup is requested
-  /*auto const& eventSetup = */ provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
-
+  /*EventSetup const eventSetup = */ provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
 }
-void testEventsetup::sourceConflictTest()
-{
-  edm::eventsetup::ComponentDescription description("DummyProxyProvider","",true);
+void testEventsetup::sourceConflictTest() {
+  edm::eventsetup::ComponentDescription description("DummyProxyProvider", "", true);
   using edm::eventsetup::test::DummyProxyProvider;
   eventsetup::EventSetupProvider provider(&activityRegistry);
   {
@@ -317,14 +293,12 @@ void testEventsetup::sourceConflictTest()
     provider.add(dummyProv);
   }
   //checking for conflicts is now delayed until first time EventSetup is requested
-  /*auto const& eventSetup = */ provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
-
+  /*EventSetup const eventSetup = */ provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
 }
 //#define TEST_EXCLUDE_DEF
 
-void testEventsetup::twoSourceTest()
-{
-  edm::eventsetup::ComponentDescription description("DummyProxyProvider","",true);
+void testEventsetup::twoSourceTest() {
+  edm::eventsetup::ComponentDescription description("DummyProxyProvider", "", true);
   using edm::eventsetup::test::DummyProxyProvider;
   eventsetup::EventSetupProvider provider(&activityRegistry);
   {
@@ -336,26 +310,24 @@ void testEventsetup::twoSourceTest()
     auto dummyProv = std::make_shared<edm::DummyEventSetupRecordRetriever>();
     std::shared_ptr<eventsetup::DataProxyProvider> providerPtr(dummyProv);
     std::shared_ptr<edm::EventSetupRecordIntervalFinder> finderPtr(dummyProv);
-    edm::eventsetup::ComponentDescription description2("DummyEventSetupRecordRetriever","",true);
+    edm::eventsetup::ComponentDescription description2("DummyEventSetupRecordRetriever", "", true);
     dummyProv->setDescription(description2);
     provider.add(providerPtr);
     provider.add(finderPtr);
   }
   //checking for conflicts is now delayed until first time EventSetup is requested
-  /*auto const& eventSetup = */ provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
-
+  /*EventSetup const eventSetup = */ provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
 }
-void testEventsetup::provenanceTest()
-{
-  using edm::eventsetup::test::DummyProxyProvider;
+void testEventsetup::provenanceTest() {
   using edm::eventsetup::test::DummyData;
+  using edm::eventsetup::test::DummyProxyProvider;
   DummyData kGood{1};
   DummyData kBad{0};
 
   eventsetup::EventSetupProvider provider(&activityRegistry);
   try {
     {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider","",true);
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "", true);
       edm::ParameterSet ps;
       ps.addParameter<std::string>("name", "test11");
       ps.registerIt();
@@ -365,7 +337,7 @@ void testEventsetup::provenanceTest()
       provider.add(dummyProv);
     }
     {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider","testLabel",false);
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "testLabel", false);
       edm::ParameterSet ps;
       ps.addParameter<std::string>("name", "test22");
       ps.registerIt();
@@ -374,29 +346,28 @@ void testEventsetup::provenanceTest()
       dummyProv->setDescription(description);
       provider.add(dummyProv);
     }
-    auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
+    EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue()), 0, nullptr};
     edm::ESHandle<DummyData> data;
     eventSetup.getData(data);
-    CPPUNIT_ASSERT(kGood.value_==data->value_);
+    CPPUNIT_ASSERT(kGood.value_ == data->value_);
     const edm::eventsetup::ComponentDescription* desc = data.description();
-    CPPUNIT_ASSERT( desc->label_ == "testLabel");
+    CPPUNIT_ASSERT(desc->label_ == "testLabel");
   } catch (const cms::Exception& iException) {
-    std::cout <<"caught "<<iException.explainSelf()<<std::endl;
+    std::cout << "caught " << iException.explainSelf() << std::endl;
     throw;
   }
 }
 
-void testEventsetup::getDataWithLabelTest()
-{
-  using edm::eventsetup::test::DummyProxyProvider;
+void testEventsetup::getDataWithLabelTest() {
   using edm::eventsetup::test::DummyData;
+  using edm::eventsetup::test::DummyProxyProvider;
   DummyData kGood{1};
   DummyData kBad{0};
 
   eventsetup::EventSetupProvider provider(&activityRegistry);
   try {
     {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider","",true);
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "", true);
       edm::ParameterSet ps;
       ps.addParameter<std::string>("name", "test11");
       ps.registerIt();
@@ -406,10 +377,10 @@ void testEventsetup::getDataWithLabelTest()
       provider.add(dummyProv);
     }
     {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider","testLabel",false);
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "testLabel", false);
       edm::ParameterSet ps;
       ps.addParameter<std::string>("name", "test22");
-      ps.addParameter<std::string>("appendToDataLabel","blah");
+      ps.addParameter<std::string>("appendToDataLabel", "blah");
       ps.registerIt();
       description.pid_ = ps.id();
       auto dummyProv = std::make_shared<DummyProxyProvider>(kGood);
@@ -417,29 +388,28 @@ void testEventsetup::getDataWithLabelTest()
       dummyProv->setAppendToDataLabel(ps);
       provider.add(dummyProv);
     }
-    auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
+    EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue()), 0, nullptr};
     edm::ESHandle<DummyData> data;
-    eventSetup.getData("blah",data);
-    CPPUNIT_ASSERT(kGood.value_==data->value_);
+    eventSetup.getData("blah", data);
+    CPPUNIT_ASSERT(kGood.value_ == data->value_);
     const edm::eventsetup::ComponentDescription* desc = data.description();
-    CPPUNIT_ASSERT( desc->label_ == "testLabel");
+    CPPUNIT_ASSERT(desc->label_ == "testLabel");
   } catch (const cms::Exception& iException) {
-    std::cout <<"caught "<<iException.explainSelf()<<std::endl;
+    std::cout << "caught " << iException.explainSelf() << std::endl;
     throw;
   }
 }
 
-void testEventsetup::getDataWithESInputTagTest()
-{
-  using edm::eventsetup::test::DummyProxyProvider;
+void testEventsetup::getDataWithESInputTagTest() {
   using edm::eventsetup::test::DummyData;
+  using edm::eventsetup::test::DummyProxyProvider;
   DummyData kGood{1};
   DummyData kBad{0};
 
   eventsetup::EventSetupProvider provider(&activityRegistry);
   try {
     {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider","testOne",true);
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "testOne", true);
       edm::ParameterSet ps;
       ps.addParameter<std::string>("name", "test11");
       ps.registerIt();
@@ -449,10 +419,10 @@ void testEventsetup::getDataWithESInputTagTest()
       provider.add(dummyProv);
     }
     {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider","testTwo",false);
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "testTwo", false);
       edm::ParameterSet ps;
       ps.addParameter<std::string>("name", "test22");
-      ps.addParameter<std::string>("appendToDataLabel","blah");
+      ps.addParameter<std::string>("appendToDataLabel", "blah");
       ps.registerIt();
       description.pid_ = ps.id();
       auto dummyProv = std::make_shared<DummyProxyProvider>(kGood);
@@ -460,68 +430,65 @@ void testEventsetup::getDataWithESInputTagTest()
       dummyProv->setAppendToDataLabel(ps);
       provider.add(dummyProv);
     }
-    auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
+    EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue()), 0, nullptr};
     {
       edm::ESHandle<DummyData> data;
-      edm::ESInputTag blahTag("","blah");
-      eventSetup.getData(blahTag,data);
-      CPPUNIT_ASSERT(kGood.value_==data->value_);
+      edm::ESInputTag blahTag("", "blah");
+      eventSetup.getData(blahTag, data);
+      CPPUNIT_ASSERT(kGood.value_ == data->value_);
       const edm::eventsetup::ComponentDescription* desc = data.description();
-      CPPUNIT_ASSERT( desc->label_ == "testTwo");
+      CPPUNIT_ASSERT(desc->label_ == "testTwo");
     }
 
     {
       edm::ESHandle<DummyData> data;
-      edm::ESInputTag nullTag("","");
-      eventSetup.getData(nullTag,data);
-      CPPUNIT_ASSERT(kBad.value_==data->value_);
+      edm::ESInputTag nullTag("", "");
+      eventSetup.getData(nullTag, data);
+      CPPUNIT_ASSERT(kBad.value_ == data->value_);
       const edm::eventsetup::ComponentDescription* desc = data.description();
-      CPPUNIT_ASSERT( desc->label_ == "testOne");
+      CPPUNIT_ASSERT(desc->label_ == "testOne");
     }
 
     {
       edm::ESHandle<DummyData> data;
-      edm::ESInputTag blahTag("testTwo","blah");
-      eventSetup.getData(blahTag,data);
-      CPPUNIT_ASSERT(kGood.value_==data->value_);
+      edm::ESInputTag blahTag("testTwo", "blah");
+      eventSetup.getData(blahTag, data);
+      CPPUNIT_ASSERT(kGood.value_ == data->value_);
       const edm::eventsetup::ComponentDescription* desc = data.description();
-      CPPUNIT_ASSERT( desc->label_ == "testTwo");
+      CPPUNIT_ASSERT(desc->label_ == "testTwo");
     }
 
     {
       edm::ESHandle<DummyData> data;
-      edm::ESInputTag badTag("DoesNotExist","blah");
+      edm::ESInputTag badTag("DoesNotExist", "blah");
       CPPUNIT_ASSERT_THROW(eventSetup.getData(badTag, data), cms::Exception);
     }
 
-
   } catch (const cms::Exception& iException) {
-    std::cout <<"caught "<<iException.explainSelf()<<std::endl;
+    std::cout << "caught " << iException.explainSelf() << std::endl;
     throw;
   }
 }
 
 namespace {
   struct DummyDataConsumer : public EDConsumerBase {
-    explicit DummyDataConsumer( ESInputTag const& iTag):
-    m_token{esConsumes<edm::eventsetup::test::DummyData, edm::DefaultRecord>(iTag)}
-    {}
-    
+    explicit DummyDataConsumer(ESInputTag const& iTag)
+        : m_token{esConsumes<edm::eventsetup::test::DummyData, edm::DefaultRecord>(iTag)} {}
+
     ESGetToken<edm::eventsetup::test::DummyData, edm::DefaultRecord> m_token;
   };
-}
+}  // namespace
 
-void testEventsetup::getDataWithESGetTokenTest()
-{
-  using edm::eventsetup::test::DummyProxyProvider;
+void testEventsetup::getDataWithESGetTokenTest() {
   using edm::eventsetup::test::DummyData;
+  using edm::eventsetup::test::DummyProxyProvider;
   DummyData kGood{1};
   DummyData kBad{0};
-  
+
   eventsetup::EventSetupProvider provider(&activityRegistry);
   try {
     {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider","testOne",true);
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "testOne", true);
       edm::ParameterSet ps;
       ps.addParameter<std::string>("name", "test11");
       ps.registerIt();
@@ -531,10 +498,10 @@ void testEventsetup::getDataWithESGetTokenTest()
       provider.add(dummyProv);
     }
     {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider","testTwo",false);
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "testTwo", false);
       edm::ParameterSet ps;
       ps.addParameter<std::string>("name", "test22");
-      ps.addParameter<std::string>("appendToDataLabel","blah");
+      ps.addParameter<std::string>("appendToDataLabel", "blah");
       ps.registerIt();
       description.pid_ = ps.id();
       auto dummyProv = std::make_shared<DummyProxyProvider>(kGood);
@@ -542,50 +509,64 @@ void testEventsetup::getDataWithESGetTokenTest()
       dummyProv->setAppendToDataLabel(ps);
       provider.add(dummyProv);
     }
+    provider.finishConfiguration();
+
     auto const& eventSetupImpl = provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
-    EventSetup eventSetup{eventSetupImpl};
     {
-      DummyDataConsumer consumer{edm::ESInputTag("","blah")};
-      
+      DummyDataConsumer consumer{edm::ESInputTag("", "blah")};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      EventSetup eventSetup{eventSetupImpl,
+                            static_cast<unsigned int>(edm::Transition::Event),
+                            consumer.esGetTokenIndices(edm::Transition::Event)};
       auto const& data = eventSetup.getData(consumer.m_token);
-      CPPUNIT_ASSERT(kGood.value_==data.value_);
+      CPPUNIT_ASSERT(kGood.value_ == data.value_);
     }
-    
+
     {
-      DummyDataConsumer consumer{edm::ESInputTag("","")};
+      DummyDataConsumer consumer{edm::ESInputTag("", "")};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      EventSetup eventSetup{eventSetupImpl,
+                            static_cast<unsigned int>(edm::Transition::Event),
+                            consumer.esGetTokenIndices(edm::Transition::Event)};
       const DummyData& data = eventSetup.getData(consumer.m_token);
-      CPPUNIT_ASSERT(kBad.value_==data.value_);
+      CPPUNIT_ASSERT(kBad.value_ == data.value_);
     }
-    
+
     {
-      DummyDataConsumer consumer{edm::ESInputTag("testTwo","blah")};
+      DummyDataConsumer consumer{edm::ESInputTag("testTwo", "blah")};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      EventSetup eventSetup{eventSetupImpl,
+                            static_cast<unsigned int>(edm::Transition::Event),
+                            consumer.esGetTokenIndices(edm::Transition::Event)};
       auto const& data = eventSetup.getData(consumer.m_token);
-      CPPUNIT_ASSERT(kGood.value_==data.value_);
+      CPPUNIT_ASSERT(kGood.value_ == data.value_);
     }
-    
+
     {
-      DummyDataConsumer consumer{edm::ESInputTag("DoesNotExist","blah")};
+      DummyDataConsumer consumer{edm::ESInputTag("DoesNotExist", "blah")};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      EventSetup eventSetup{eventSetupImpl,
+                            static_cast<unsigned int>(edm::Transition::Event),
+                            consumer.esGetTokenIndices(edm::Transition::Event)};
       CPPUNIT_ASSERT_THROW(eventSetup.getData(consumer.m_token), cms::Exception);
     }
-    
-    
+
   } catch (const cms::Exception& iException) {
-    std::cout <<"caught "<<iException.explainSelf()<<std::endl;
+    std::cout << "caught " << iException.explainSelf() << std::endl;
     throw;
   }
 }
 
-void testEventsetup::getHandleWithESGetTokenTest()
-{
-  using edm::eventsetup::test::DummyProxyProvider;
+void testEventsetup::getHandleWithESGetTokenTest() {
   using edm::eventsetup::test::DummyData;
+  using edm::eventsetup::test::DummyProxyProvider;
   DummyData kGood{1};
   DummyData kBad{0};
-  
+
   eventsetup::EventSetupProvider provider(&activityRegistry);
   try {
     {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider","testOne",true);
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "testOne", true);
       edm::ParameterSet ps;
       ps.addParameter<std::string>("name", "test11");
       ps.registerIt();
@@ -595,10 +576,10 @@ void testEventsetup::getHandleWithESGetTokenTest()
       provider.add(dummyProv);
     }
     {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider","testTwo",false);
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "testTwo", false);
       edm::ParameterSet ps;
       ps.addParameter<std::string>("name", "test22");
-      ps.addParameter<std::string>("appendToDataLabel","blah");
+      ps.addParameter<std::string>("appendToDataLabel", "blah");
       ps.registerIt();
       description.pid_ = ps.id();
       auto dummyProv = std::make_shared<DummyProxyProvider>(kGood);
@@ -606,62 +587,165 @@ void testEventsetup::getHandleWithESGetTokenTest()
       dummyProv->setAppendToDataLabel(ps);
       provider.add(dummyProv);
     }
+    provider.finishConfiguration();
+
     auto const& eventSetupImpl = provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
-    EventSetup eventSetup{eventSetupImpl};
     {
-      DummyDataConsumer consumer{edm::ESInputTag("","blah")};
-      
+      DummyDataConsumer consumer{edm::ESInputTag("", "blah")};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+
+      EventSetup eventSetup{eventSetupImpl,
+                            static_cast<unsigned int>(edm::Transition::Event),
+                            consumer.esGetTokenIndices(edm::Transition::Event)};
       edm::ESHandle<DummyData> data = eventSetup.getHandle(consumer.m_token);
-      CPPUNIT_ASSERT(kGood.value_==data->value_);
+      CPPUNIT_ASSERT(kGood.value_ == data->value_);
       const edm::eventsetup::ComponentDescription* desc = data.description();
-      CPPUNIT_ASSERT( desc->label_ == "testTwo");
+      CPPUNIT_ASSERT(desc->label_ == "testTwo");
     }
-    
+
     {
-      DummyDataConsumer consumer{edm::ESInputTag("","")};
+      DummyDataConsumer consumer{edm::ESInputTag("", "")};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      EventSetup eventSetup{eventSetupImpl,
+                            static_cast<unsigned int>(edm::Transition::Event),
+                            consumer.esGetTokenIndices(edm::Transition::Event)};
       edm::ESHandle<DummyData> data = eventSetup.getHandle(consumer.m_token);
-      CPPUNIT_ASSERT(kBad.value_==data->value_);
+      CPPUNIT_ASSERT(kBad.value_ == data->value_);
       const edm::eventsetup::ComponentDescription* desc = data.description();
-      CPPUNIT_ASSERT( desc->label_ == "testOne");
+      CPPUNIT_ASSERT(desc->label_ == "testOne");
     }
-    
+
     {
-      DummyDataConsumer consumer{edm::ESInputTag("testTwo","blah")};
+      DummyDataConsumer consumer{edm::ESInputTag("testTwo", "blah")};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      EventSetup eventSetup{eventSetupImpl,
+                            static_cast<unsigned int>(edm::Transition::Event),
+                            consumer.esGetTokenIndices(edm::Transition::Event)};
       edm::ESHandle<DummyData> data = eventSetup.getHandle(consumer.m_token);
-      CPPUNIT_ASSERT(kGood.value_==data->value_);
+      CPPUNIT_ASSERT(kGood.value_ == data->value_);
       const edm::eventsetup::ComponentDescription* desc = data.description();
-      CPPUNIT_ASSERT( desc->label_ == "testTwo");
+      CPPUNIT_ASSERT(desc->label_ == "testTwo");
     }
-    
+
     {
-      DummyDataConsumer consumer{edm::ESInputTag("DoesNotExist","blah")};
-      CPPUNIT_ASSERT_THROW(eventSetup.getHandle(consumer.m_token), cms::Exception);
+      DummyDataConsumer consumer{edm::ESInputTag("DoesNotExist", "blah")};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      EventSetup eventSetup{eventSetupImpl,
+                            static_cast<unsigned int>(edm::Transition::Event),
+                            consumer.esGetTokenIndices(edm::Transition::Event)};
+      CPPUNIT_ASSERT(not eventSetup.getHandle(consumer.m_token));
+      CPPUNIT_ASSERT_THROW(*eventSetup.getHandle(consumer.m_token), cms::Exception);
     }
-    
-    
+
   } catch (const cms::Exception& iException) {
-    std::cout <<"caught "<<iException.explainSelf()<<std::endl;
+    std::cout << "caught " << iException.explainSelf() << std::endl;
     throw;
   }
 }
 
-void testEventsetup::sourceProducerResolutionTest()
-{
+void testEventsetup::getTransientHandleWithESGetTokenTest() {
+  using edm::eventsetup::test::DummyData;
   using edm::eventsetup::test::DummyProxyProvider;
+  DummyData kGood{1};
+  DummyData kBad{0};
+
+  eventsetup::EventSetupProvider provider(&activityRegistry);
+  try {
+    {
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "testOne", true);
+      edm::ParameterSet ps;
+      ps.addParameter<std::string>("name", "test11");
+      ps.registerIt();
+      description.pid_ = ps.id();
+      auto dummyProv = std::make_shared<DummyProxyProvider>(kBad);
+      dummyProv->setDescription(description);
+      provider.add(dummyProv);
+    }
+    {
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "testTwo", false);
+      edm::ParameterSet ps;
+      ps.addParameter<std::string>("name", "test22");
+      ps.addParameter<std::string>("appendToDataLabel", "blah");
+      ps.registerIt();
+      description.pid_ = ps.id();
+      auto dummyProv = std::make_shared<DummyProxyProvider>(kGood);
+      dummyProv->setDescription(description);
+      dummyProv->setAppendToDataLabel(ps);
+      provider.add(dummyProv);
+    }
+    provider.finishConfiguration();
+
+    auto const& eventSetupImpl = provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
+    {
+      DummyDataConsumer consumer{edm::ESInputTag("", "blah")};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+
+      EventSetup eventSetup{eventSetupImpl,
+                            static_cast<unsigned int>(edm::Transition::Event),
+                            consumer.esGetTokenIndices(edm::Transition::Event)};
+      edm::ESTransientHandle<DummyData> data = eventSetup.getTransientHandle(consumer.m_token);
+      CPPUNIT_ASSERT(kGood.value_ == data->value_);
+      const edm::eventsetup::ComponentDescription* desc = data.description();
+      CPPUNIT_ASSERT(desc->label_ == "testTwo");
+    }
+
+    {
+      DummyDataConsumer consumer{edm::ESInputTag("", "")};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      EventSetup eventSetup{eventSetupImpl,
+                            static_cast<unsigned int>(edm::Transition::Event),
+                            consumer.esGetTokenIndices(edm::Transition::Event)};
+      edm::ESTransientHandle<DummyData> data = eventSetup.getTransientHandle(consumer.m_token);
+      CPPUNIT_ASSERT(kBad.value_ == data->value_);
+      const edm::eventsetup::ComponentDescription* desc = data.description();
+      CPPUNIT_ASSERT(desc->label_ == "testOne");
+    }
+
+    {
+      DummyDataConsumer consumer{edm::ESInputTag("testTwo", "blah")};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      EventSetup eventSetup{eventSetupImpl,
+                            static_cast<unsigned int>(edm::Transition::Event),
+                            consumer.esGetTokenIndices(edm::Transition::Event)};
+      edm::ESTransientHandle<DummyData> data = eventSetup.getTransientHandle(consumer.m_token);
+      CPPUNIT_ASSERT(kGood.value_ == data->value_);
+      const edm::eventsetup::ComponentDescription* desc = data.description();
+      CPPUNIT_ASSERT(desc->label_ == "testTwo");
+    }
+
+    {
+      DummyDataConsumer consumer{edm::ESInputTag("DoesNotExist", "blah")};
+      consumer.updateLookup(provider.recordsToProxyIndices());
+      EventSetup eventSetup{eventSetupImpl,
+                            static_cast<unsigned int>(edm::Transition::Event),
+                            consumer.esGetTokenIndices(edm::Transition::Event)};
+      edm::ESTransientHandle<DummyData> data = eventSetup.getTransientHandle(consumer.m_token);
+      CPPUNIT_ASSERT(not data);
+      CPPUNIT_ASSERT_THROW(*data, cms::Exception);
+    }
+
+  } catch (const cms::Exception& iException) {
+    std::cout << "caught " << iException.explainSelf() << std::endl;
+    throw;
+  }
+}
+
+void testEventsetup::sourceProducerResolutionTest() {
   using edm::eventsetup::test::DummyData;
+  using edm::eventsetup::test::DummyProxyProvider;
   DummyData kGood{1};
   DummyData kBad{0};
 
   {
     eventsetup::EventSetupProvider provider(&activityRegistry);
     {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider","",true);
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "", true);
       auto dummyProv = std::make_shared<DummyProxyProvider>(kBad);
       dummyProv->setDescription(description);
       provider.add(dummyProv);
     }
     {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider","",false);
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "", false);
       auto dummyProv = std::make_shared<DummyProxyProvider>(kGood);
       dummyProv->setDescription(description);
       provider.add(dummyProv);
@@ -671,23 +755,23 @@ void testEventsetup::sourceProducerResolutionTest()
     //       Since the EventSetup::get<> will only retrieve a Record if its
     //       interval of validity is 'valid' for the present 'instance'
     //       this is a 'hack' to have the 'get' succeed
-    auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
+    EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue()), 0, nullptr};
     edm::ESHandle<DummyData> data;
     eventSetup.getData(data);
-    CPPUNIT_ASSERT(kGood.value_==data->value_);
+    CPPUNIT_ASSERT(kGood.value_ == data->value_);
   }
 
   //reverse order
   {
     eventsetup::EventSetupProvider provider(&activityRegistry);
     {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider","",false);
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "", false);
       auto dummyProv = std::make_shared<DummyProxyProvider>(kGood);
       dummyProv->setDescription(description);
       provider.add(dummyProv);
     }
     {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider","",true);
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "", true);
       auto dummyProv = std::make_shared<DummyProxyProvider>(kBad);
       dummyProv->setDescription(description);
       provider.add(dummyProv);
@@ -697,20 +781,17 @@ void testEventsetup::sourceProducerResolutionTest()
     //       Since the EventSetup::get<> will only retrieve a Record if its
     //       interval of validity is 'valid' for the present 'instance'
     //       this is a 'hack' to have the 'get' succeed
-    auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
+    EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue()), 0, nullptr};
     edm::ESHandle<DummyData> data;
     eventSetup.getData(data);
-    CPPUNIT_ASSERT(kGood.value_==data->value_);
+    CPPUNIT_ASSERT(kGood.value_ == data->value_);
   }
-
 }
 
-
-void testEventsetup::preferTest()
-{
+void testEventsetup::preferTest() {
   try {
-    using edm::eventsetup::test::DummyProxyProvider;
     using edm::eventsetup::test::DummyData;
+    using edm::eventsetup::test::DummyProxyProvider;
     DummyData kGood{1};
     DummyData kBad{0};
 
@@ -719,17 +800,17 @@ void testEventsetup::preferTest()
       EventSetupProvider::PreferredProviderInfo preferInfo;
       EventSetupProvider::RecordToDataMap recordToData;
       //default means use all proxies
-      preferInfo[ComponentDescription("DummyProxyProvider","",false)]=recordToData;
+      preferInfo[ComponentDescription("DummyProxyProvider", "", false)] = recordToData;
 
       eventsetup::EventSetupProvider provider(&activityRegistry, 0U, &preferInfo);
       {
-        edm::eventsetup::ComponentDescription description("DummyProxyProvider","bad",false);
+        edm::eventsetup::ComponentDescription description("DummyProxyProvider", "bad", false);
         auto dummyProv = std::make_shared<DummyProxyProvider>(kBad);
         dummyProv->setDescription(description);
         provider.add(dummyProv);
       }
       {
-        edm::eventsetup::ComponentDescription description("DummyProxyProvider","",false);
+        edm::eventsetup::ComponentDescription description("DummyProxyProvider", "", false);
         auto dummyProv = std::make_shared<DummyProxyProvider>(kGood);
         dummyProv->setDescription(description);
         provider.add(dummyProv);
@@ -739,10 +820,10 @@ void testEventsetup::preferTest()
       //       Since the EventSetup::get<> will only retrieve a Record if its
       //       interval of validity is 'valid' for the present 'instance'
       //       this is a 'hack' to have the 'get' succeed
-      auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
+      EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue()), 0, nullptr};
       edm::ESHandle<DummyData> data;
       eventSetup.getData(data);
-      CPPUNIT_ASSERT(kGood.value_==data->value_);
+      CPPUNIT_ASSERT(kGood.value_ == data->value_);
     }
 
     //sources
@@ -751,16 +832,16 @@ void testEventsetup::preferTest()
       EventSetupProvider::PreferredProviderInfo preferInfo;
       EventSetupProvider::RecordToDataMap recordToData;
       //default means use all proxies
-      preferInfo[ComponentDescription("DummyProxyProvider","",false)]=recordToData;
+      preferInfo[ComponentDescription("DummyProxyProvider", "", false)] = recordToData;
       eventsetup::EventSetupProvider provider(&activityRegistry, 0U, &preferInfo);
       {
-        edm::eventsetup::ComponentDescription description("DummyProxyProvider","",true);
+        edm::eventsetup::ComponentDescription description("DummyProxyProvider", "", true);
         auto dummyProv = std::make_shared<DummyProxyProvider>(kGood);
         dummyProv->setDescription(description);
         provider.add(dummyProv);
       }
       {
-        edm::eventsetup::ComponentDescription description("DummyProxyProvider","bad",true);
+        edm::eventsetup::ComponentDescription description("DummyProxyProvider", "bad", true);
         auto dummyProv = std::make_shared<DummyProxyProvider>(kBad);
         dummyProv->setDescription(description);
         provider.add(dummyProv);
@@ -770,10 +851,10 @@ void testEventsetup::preferTest()
       //       Since the EventSetup::get<> will only retrieve a Record if its
       //       interval of validity is 'valid' for the present 'instance'
       //       this is a 'hack' to have the 'get' succeed
-      auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
+      EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue()), 0, nullptr};
       edm::ESHandle<DummyData> data;
       eventSetup.getData(data);
-      CPPUNIT_ASSERT(kGood.value_==data->value_);
+      CPPUNIT_ASSERT(kGood.value_ == data->value_);
     }
 
     //specific name
@@ -781,18 +862,18 @@ void testEventsetup::preferTest()
       using namespace edm::eventsetup;
       EventSetupProvider::PreferredProviderInfo preferInfo;
       EventSetupProvider::RecordToDataMap recordToData;
-      recordToData.insert(std::make_pair(std::string("DummyRecord"),
-                                         std::make_pair(std::string("DummyData"),std::string())));
-      preferInfo[ComponentDescription("DummyProxyProvider","",false)]=recordToData;
+      recordToData.insert(
+          std::make_pair(std::string("DummyRecord"), std::make_pair(std::string("DummyData"), std::string())));
+      preferInfo[ComponentDescription("DummyProxyProvider", "", false)] = recordToData;
       eventsetup::EventSetupProvider provider(&activityRegistry, 0U, &preferInfo);
       {
-        edm::eventsetup::ComponentDescription description("DummyProxyProvider","",true);
+        edm::eventsetup::ComponentDescription description("DummyProxyProvider", "", true);
         auto dummyProv = std::make_shared<DummyProxyProvider>(kGood);
         dummyProv->setDescription(description);
         provider.add(dummyProv);
       }
       {
-        edm::eventsetup::ComponentDescription description("DummyProxyProvider","bad",true);
+        edm::eventsetup::ComponentDescription description("DummyProxyProvider", "bad", true);
         auto dummyProv = std::make_shared<DummyProxyProvider>(kBad);
         dummyProv->setDescription(description);
         provider.add(dummyProv);
@@ -802,29 +883,28 @@ void testEventsetup::preferTest()
       //       Since the EventSetup::get<> will only retrieve a Record if its
       //       interval of validity is 'valid' for the present 'instance'
       //       this is a 'hack' to have the 'get' succeed
-      auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
+      EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue()), 0, nullptr};
       edm::ESHandle<DummyData> data;
       eventSetup.getData(data);
-      CPPUNIT_ASSERT(kGood.value_==data->value_);
+      CPPUNIT_ASSERT(kGood.value_ == data->value_);
     }
 
-  }catch(const cms::Exception& iException) {
-    std::cout <<"caught "<<iException.explainSelf()<<std::endl;
+  } catch (const cms::Exception& iException) {
+    std::cout << "caught " << iException.explainSelf() << std::endl;
     throw;
   }
 }
 
-void testEventsetup::introspectionTest()
-{
-  using edm::eventsetup::test::DummyProxyProvider;
+void testEventsetup::introspectionTest() {
   using edm::eventsetup::test::DummyData;
+  using edm::eventsetup::test::DummyProxyProvider;
   DummyData kGood{1};
   DummyData kBad{0};
 
   eventsetup::EventSetupProvider provider(&activityRegistry);
   try {
     {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider","",true);
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "", true);
       edm::ParameterSet ps;
       ps.addParameter<std::string>("name", "test11");
       ps.registerIt();
@@ -834,7 +914,7 @@ void testEventsetup::introspectionTest()
       provider.add(dummyProv);
     }
     {
-      edm::eventsetup::ComponentDescription description("DummyProxyProvider","",false);
+      edm::eventsetup::ComponentDescription description("DummyProxyProvider", "", false);
       edm::ParameterSet ps;
       ps.addParameter<std::string>("name", "test22");
       ps.registerIt();
@@ -843,21 +923,20 @@ void testEventsetup::introspectionTest()
       dummyProv->setDescription(description);
       provider.add(dummyProv);
     }
-    auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue());
+    EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue::invalidIOVSyncValue()), 0, nullptr};
 
     std::vector<edm::eventsetup::EventSetupRecordKey> recordKeys;
     eventSetup.fillAvailableRecordKeys(recordKeys);
-    CPPUNIT_ASSERT(1==recordKeys.size());
+    CPPUNIT_ASSERT(1 == recordKeys.size());
     auto record = eventSetup.find(recordKeys[0]);
     CPPUNIT_ASSERT(record.has_value());
   } catch (const cms::Exception& iException) {
-    std::cout <<"caught "<<iException.explainSelf()<<std::endl;
+    std::cout << "caught " << iException.explainSelf() << std::endl;
     throw;
   }
 }
 
-void testEventsetup::iovExtentionTest()
-{
+void testEventsetup::iovExtentionTest() {
   DummyEventSetupProvider provider(&activityRegistry);
   typedef eventsetup::EventSetupRecordProvider DummyRecordProvider;
   auto dummyRecordProvider = std::make_unique<DummyRecordProvider>(DummyRecord::keyForClass());
@@ -870,26 +949,25 @@ void testEventsetup::iovExtentionTest()
   const Timestamp time_2(2);
   finder->setInterval(ValidityInterval(IOVSyncValue{time_2}, IOVSyncValue{Timestamp{3}}));
   {
-    auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue{time_2});
-    CPPUNIT_ASSERT(2==eventSetup.get<DummyRecord>().cacheIdentifier());
+    EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue{time_2}), 0, nullptr};
+    CPPUNIT_ASSERT(2 == eventSetup.get<DummyRecord>().cacheIdentifier());
   }
   {
-    auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue{Timestamp{3}});
+    EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue{Timestamp{3}}), 0, nullptr};
     eventSetup.get<DummyRecord>();
-    CPPUNIT_ASSERT(2==eventSetup.get<DummyRecord>().cacheIdentifier());
+    CPPUNIT_ASSERT(2 == eventSetup.get<DummyRecord>().cacheIdentifier());
   }
   //extending the IOV should not cause the cache to be reset
   finder->setInterval(ValidityInterval(IOVSyncValue{time_2}, IOVSyncValue{Timestamp{4}}));
   {
-    auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue{Timestamp{4}});
-    CPPUNIT_ASSERT(2==eventSetup.get<DummyRecord>().cacheIdentifier());
+    EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue{Timestamp{4}}), 0, nullptr};
+    CPPUNIT_ASSERT(2 == eventSetup.get<DummyRecord>().cacheIdentifier());
   }
 
   //this is a new IOV so should get cache reset
   finder->setInterval(ValidityInterval(IOVSyncValue{Timestamp{5}}, IOVSyncValue{Timestamp{6}}));
   {
-    auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue{Timestamp{5}});
-    CPPUNIT_ASSERT(3==eventSetup.get<DummyRecord>().cacheIdentifier());
+    EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue{Timestamp{5}}), 0, nullptr};
+    CPPUNIT_ASSERT(3 == eventSetup.get<DummyRecord>().cacheIdentifier());
   }
-
 }
diff --git a/FWCore/Framework/test/eventsetupplugin_t.cppunit.cc b/FWCore/Framework/test/eventsetupplugin_t.cppunit.cc
index 0fccc81721b86..6c4670b9e88ef 100644
--- a/FWCore/Framework/test/eventsetupplugin_t.cppunit.cc
+++ b/FWCore/Framework/test/eventsetupplugin_t.cppunit.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     eventsetup_plugin_t
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -30,16 +30,16 @@ namespace {
   edm::ActivityRegistry activityRegistry;
 }
 
-class testEventsetupplugin: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(testEventsetupplugin);
+class testEventsetupplugin : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testEventsetupplugin);
+
+  CPPUNIT_TEST(finderTest);
 
-CPPUNIT_TEST(finderTest);
+  CPPUNIT_TEST_SUITE_END();
 
-CPPUNIT_TEST_SUITE_END();
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void finderTest();
 };
@@ -48,56 +48,52 @@ CPPUNIT_TEST_SUITE_END();
 CPPUNIT_TEST_SUITE_REGISTRATION(testEventsetupplugin);
 
 static void doInit() {
-   static bool firstTime=true;
-   if(firstTime) {
-      if(not edmplugin::PluginManager::isAvailable()) {
-        edmplugin::PluginManager::configure(edmplugin::standard::config());
-     }
-      firstTime = false;
-   }
+  static bool firstTime = true;
+  if (firstTime) {
+    if (not edmplugin::PluginManager::isAvailable()) {
+      edmplugin::PluginManager::configure(edmplugin::standard::config());
+    }
+    firstTime = false;
+  }
 }
 
 void testEventsetupplugin::finderTest()
 
 {
-   doInit();
-   EventSetupsController esController;
-   EventSetupProvider provider(&activityRegistry);
-   
-   edm::ParameterSet dummyFinderPSet;
-   dummyFinderPSet.addParameter("@module_type", std::string("LoadableDummyFinder"));
-   dummyFinderPSet.addParameter("@module_label", std::string(""));
-   dummyFinderPSet.registerIt();
-   SourceFactory::get()->addTo(esController, provider, dummyFinderPSet);
-
-   
-   ComponentDescription descFinder("LoadableDummyFinder","",true);
-   std::set<ComponentDescription> descriptions(provider.proxyProviderDescriptions());
-   //should not be found since not a provider
-   CPPUNIT_ASSERT(descriptions.find(descFinder) == descriptions.end());
-
-   
-   edm::ParameterSet dummyProviderPSet;
-   dummyProviderPSet.addParameter("@module_type",  std::string("LoadableDummyProvider"));
-   dummyProviderPSet.addParameter("@module_label", std::string(""));
-   dummyProviderPSet.registerIt();
-   ModuleFactory::get()->addTo(esController, provider, dummyProviderPSet);
-
-   ComponentDescription desc("LoadableDummyProvider","",false);
-   descriptions = provider.proxyProviderDescriptions();
-   CPPUNIT_ASSERT(descriptions.find(desc) != descriptions.end());
-   CPPUNIT_ASSERT(*(descriptions.find(desc)) == desc);
-
-   
-   edm::ParameterSet dummySourcePSet;
-   dummySourcePSet.addParameter("@module_type",  std::string("LoadableDummyESSource"));
-   dummySourcePSet.addParameter("@module_label", std::string(""));
-   dummySourcePSet.registerIt();
-   SourceFactory::get()->addTo(esController, provider, dummySourcePSet);
-   
-   ComponentDescription descSource("LoadableDummyESSource","",true);
-   descriptions = provider.proxyProviderDescriptions();
-   CPPUNIT_ASSERT(descriptions.find(descSource) != descriptions.end());
-   CPPUNIT_ASSERT(*(descriptions.find(descSource)) == descSource);
-   
+  doInit();
+  EventSetupsController esController;
+  EventSetupProvider provider(&activityRegistry);
+
+  edm::ParameterSet dummyFinderPSet;
+  dummyFinderPSet.addParameter("@module_type", std::string("LoadableDummyFinder"));
+  dummyFinderPSet.addParameter("@module_label", std::string(""));
+  dummyFinderPSet.registerIt();
+  SourceFactory::get()->addTo(esController, provider, dummyFinderPSet);
+
+  ComponentDescription descFinder("LoadableDummyFinder", "", true);
+  std::set<ComponentDescription> descriptions(provider.proxyProviderDescriptions());
+  //should not be found since not a provider
+  CPPUNIT_ASSERT(descriptions.find(descFinder) == descriptions.end());
+
+  edm::ParameterSet dummyProviderPSet;
+  dummyProviderPSet.addParameter("@module_type", std::string("LoadableDummyProvider"));
+  dummyProviderPSet.addParameter("@module_label", std::string(""));
+  dummyProviderPSet.registerIt();
+  ModuleFactory::get()->addTo(esController, provider, dummyProviderPSet);
+
+  ComponentDescription desc("LoadableDummyProvider", "", false);
+  descriptions = provider.proxyProviderDescriptions();
+  CPPUNIT_ASSERT(descriptions.find(desc) != descriptions.end());
+  CPPUNIT_ASSERT(*(descriptions.find(desc)) == desc);
+
+  edm::ParameterSet dummySourcePSet;
+  dummySourcePSet.addParameter("@module_type", std::string("LoadableDummyESSource"));
+  dummySourcePSet.addParameter("@module_label", std::string(""));
+  dummySourcePSet.registerIt();
+  SourceFactory::get()->addTo(esController, provider, dummySourcePSet);
+
+  ComponentDescription descSource("LoadableDummyESSource", "", true);
+  descriptions = provider.proxyProviderDescriptions();
+  CPPUNIT_ASSERT(descriptions.find(descSource) != descriptions.end());
+  CPPUNIT_ASSERT(*(descriptions.find(descSource)) == descSource);
 }
diff --git a/FWCore/Framework/test/eventsetuprecord_t.cppunit.cc b/FWCore/Framework/test/eventsetuprecord_t.cppunit.cc
index 017a42057deb9..dac7a4c60addf 100644
--- a/FWCore/Framework/test/eventsetuprecord_t.cppunit.cc
+++ b/FWCore/Framework/test/eventsetuprecord_t.cppunit.cc
@@ -9,6 +9,7 @@
 #include "cppunit/extensions/HelperMacros.h"
 
 #include "FWCore/Framework/interface/EventSetupProvider.h"
+#include "FWCore/Framework/interface/ESRecordsToProxyIndices.h"
 #include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
 #include "FWCore/Framework/interface/EventSetupRecordProvider.h"
 #include "FWCore/Framework/interface/RecordDependencyRegister.h"
@@ -34,12 +35,13 @@ namespace {
 using namespace edm;
 using namespace edm::eventsetup;
 namespace eventsetuprecord_t {
-class DummyRecord : public edm::eventsetup::EventSetupRecordImplementation<DummyRecord> { public:
-   const DataProxy* find(const edm::eventsetup::DataKey& iKey) const {
+  class DummyRecord : public edm::eventsetup::EventSetupRecordImplementation<DummyRecord> {
+  public:
+    const DataProxy* find(const edm::eventsetup::DataKey& iKey) const {
       return edm::eventsetup::EventSetupRecord::find(iKey);
-   }
-};
-}
+    }
+  };
+}  // namespace eventsetuprecord_t
 //HCMethods<T, T, EventSetup, EventSetupRecordKey, EventSetupRecordKey::IdTag >
 HCTYPETAG_HELPER_METHODS(eventsetuprecord_t::DummyRecord)
 
@@ -47,34 +49,34 @@ HCTYPETAG_HELPER_METHODS(eventsetuprecord_t::DummyRecord)
 static eventsetup::RecordDependencyRegister<eventsetuprecord_t::DummyRecord> const s_factory;
 
 namespace eventsetuprecord_t {
-class Dummy {};
-}
+  class Dummy {};
+}  // namespace eventsetuprecord_t
 using eventsetuprecord_t::Dummy;
 using eventsetuprecord_t::DummyRecord;
 typedef edm::eventsetup::MakeDataException ExceptionType;
 typedef edm::eventsetup::NoDataException<Dummy> NoDataExceptionType;
 
-class testEventsetupRecord: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(testEventsetupRecord);
+class testEventsetupRecord : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testEventsetupRecord);
 
-CPPUNIT_TEST(proxyTest);
-CPPUNIT_TEST(getTest);
-CPPUNIT_TEST(getHandleTest);
-CPPUNIT_TEST(getWithTokenTest);
-CPPUNIT_TEST(doGetTest);
-CPPUNIT_TEST(proxyResetTest);
-CPPUNIT_TEST(introspectionTest);
-CPPUNIT_TEST(transientTest);
+  CPPUNIT_TEST(proxyTest);
+  CPPUNIT_TEST(getTest);
+  CPPUNIT_TEST(getHandleTest);
+  CPPUNIT_TEST(getWithTokenTest);
+  CPPUNIT_TEST(doGetTest);
+  CPPUNIT_TEST(proxyResetTest);
+  CPPUNIT_TEST(introspectionTest);
+  CPPUNIT_TEST(transientTest);
 
-CPPUNIT_TEST_EXCEPTION(getNodataExpTest,NoDataExceptionType);
-CPPUNIT_TEST_EXCEPTION(getExepTest,ExceptionType);
-CPPUNIT_TEST_EXCEPTION(doGetExepTest,ExceptionType);
+  CPPUNIT_TEST_EXCEPTION(getNodataExpTest, NoDataExceptionType);
+  CPPUNIT_TEST_EXCEPTION(getExepTest, ExceptionType);
+  CPPUNIT_TEST_EXCEPTION(doGetExepTest, ExceptionType);
+
+  CPPUNIT_TEST_SUITE_END();
 
-CPPUNIT_TEST_SUITE_END();
 public:
   void setUp();
-  void tearDown(){}
+  void tearDown() {}
 
   void proxyTest();
   void getTest();
@@ -84,7 +86,7 @@ CPPUNIT_TEST_SUITE_END();
   void proxyResetTest();
   void introspectionTest();
   void transientTest();
-  
+
   void getNodataExpTest();
   void getExepTest();
   void doGetExepTest();
@@ -99,403 +101,439 @@ HCTYPETAG_HELPER_METHODS(Dummy)
 
 class FailingDummyProxy : public eventsetup::DataProxyTemplate<DummyRecord, Dummy> {
 protected:
-   const value_type* make(const record_type&, const DataKey&) {
-      return 0 ;
-   }
-   void invalidateCache() {
-   }   
+  const value_type* make(const record_type&, const DataKey&) { return 0; }
+  void invalidateCache() {}
 };
 
 class WorkingDummyProxy : public eventsetup::DataProxyTemplate<DummyRecord, Dummy> {
 public:
-   WorkingDummyProxy(const Dummy* iDummy) : data_(iDummy), invalidateCalled_(false),
-  invalidateTransientCalled_(false){}
+  WorkingDummyProxy(const Dummy* iDummy) : data_(iDummy), invalidateCalled_(false), invalidateTransientCalled_(false) {}
 
-   bool invalidateCalled() const {
-      return invalidateCalled_;
-  }
-  
-  bool invalidateTransientCalled() const {
-    return invalidateTransientCalled_;
+  bool invalidateCalled() const { return invalidateCalled_; }
+
+  bool invalidateTransientCalled() const { return invalidateTransientCalled_; }
+
+  void set(Dummy* iDummy) { data_ = iDummy; }
+
+protected:
+  const value_type* make(const record_type&, const DataKey&) {
+    invalidateCalled_ = false;
+    invalidateTransientCalled_ = false;
+    return data_;
   }
-   
-  void set(Dummy* iDummy) {
-    data_ = iDummy;
+  void invalidateCache() { invalidateCalled_ = true; }
+
+  void invalidateTransientCache() {
+    invalidateTransientCalled_ = true;
+    //check default behavior
+    eventsetup::DataProxyTemplate<DummyRecord, Dummy>::invalidateTransientCache();
   }
-protected:
-   
-   const value_type* make(const record_type&, const DataKey&) {
-      invalidateCalled_=false;
-      invalidateTransientCalled_=false;
-      return data_ ;
-   }
-   void invalidateCache() {
-      invalidateCalled_=true;
-   }
-  
-   void invalidateTransientCache() {
-     invalidateTransientCalled_=true;
-     //check default behavior
-     eventsetup::DataProxyTemplate<DummyRecord, Dummy>::invalidateTransientCache();
-   }
-  
-private:
-   const Dummy* data_;
-   bool invalidateCalled_;
-   bool invalidateTransientCalled_;
 
+private:
+  const Dummy* data_;
+  bool invalidateCalled_;
+  bool invalidateTransientCalled_;
 };
 
-void testEventsetupRecord::setUp() {
-  dummyRecordKey_ = EventSetupRecordKey::makeKey<DummyRecord>();
-}
+void testEventsetupRecord::setUp() { dummyRecordKey_ = EventSetupRecordKey::makeKey<DummyRecord>(); }
 
 class WorkingDummyProvider : public edm::eventsetup::DataProxyProvider {
 public:
-  WorkingDummyProvider( const edm::eventsetup::DataKey& iKey, std::shared_ptr<WorkingDummyProxy> iProxy) :
-  m_key(iKey),
-  m_proxy(iProxy) {
+  WorkingDummyProvider(const edm::eventsetup::DataKey& iKey, std::shared_ptr<WorkingDummyProxy> iProxy)
+      : m_key(iKey), m_proxy(iProxy) {
     usingRecord<DummyRecord>();
   }
-  
-  virtual void newInterval(const EventSetupRecordKey&,
-                           const ValidityInterval&) {}
+
+  virtual void newInterval(const EventSetupRecordKey&, const ValidityInterval&) {}
 
 protected:
-  virtual void registerProxies(const EventSetupRecordKey&,
-                               KeyedProxies& aProxyList) {
+  virtual void registerProxies(const EventSetupRecordKey&, KeyedProxies& aProxyList) {
     aProxyList.emplace_back(m_key, m_proxy);
   }
+
 private:
   edm::eventsetup::DataKey m_key;
   std::shared_ptr<WorkingDummyProxy> m_proxy;
-
 };
 
-void testEventsetupRecord::proxyTest()
-{
-   eventsetup::EventSetupRecordImpl dummyRecord{dummyRecordKey_};
-   FailingDummyProxy dummyProxy;
-   
-   const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(),
-                              "");
-   
-   CPPUNIT_ASSERT(0 == dummyRecord.find(dummyDataKey));
-
-   
-   dummyRecord.add(dummyDataKey,
-                    &dummyProxy);
-   
-   CPPUNIT_ASSERT(&dummyProxy == dummyRecord.find(dummyDataKey));
-
-   const DataKey dummyFredDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(),
-                                  "fred");
-   CPPUNIT_ASSERT(0 == dummyRecord.find(dummyFredDataKey));
+void testEventsetupRecord::proxyTest() {
+  eventsetup::EventSetupRecordImpl dummyRecord{dummyRecordKey_};
+  FailingDummyProxy dummyProxy;
+
+  const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(), "");
+
+  CPPUNIT_ASSERT(0 == dummyRecord.find(dummyDataKey));
+
+  dummyRecord.add(dummyDataKey, &dummyProxy);
+
+  CPPUNIT_ASSERT(&dummyProxy == dummyRecord.find(dummyDataKey));
 
+  const DataKey dummyFredDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(), "fred");
+  CPPUNIT_ASSERT(0 == dummyRecord.find(dummyFredDataKey));
 }
 
-void testEventsetupRecord::getTest()
-{
-   eventsetup::EventSetupProvider provider(&activityRegistry);
-   eventsetup::EventSetupRecordImpl dummyRecordImpl{dummyRecordKey_};
-   provider.addRecord(dummyRecordKey_);
-   provider.addRecordToEventSetup(dummyRecordImpl);
-
-   FailingDummyProxy dummyProxy;
-
-   const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(),
-                              "");
-
-   DummyRecord dummyRecord;
-   dummyRecord.setImpl(&dummyRecordImpl);
-   ESHandle<Dummy> dummyPtr;
-   CPPUNIT_ASSERT(not dummyRecord.get(dummyPtr));
-   CPPUNIT_ASSERT(not dummyPtr.isValid());
-   CPPUNIT_ASSERT(not dummyPtr);
-   CPPUNIT_ASSERT(dummyPtr.failedToGet());
-   CPPUNIT_ASSERT_THROW(*dummyPtr, NoDataExceptionType) ;
-   CPPUNIT_ASSERT_THROW(makeESValid(dummyPtr), cms::Exception) ;
-   //CDJ do this replace
-   //CPPUNIT_ASSERT_THROW(dummyRecord.get(dummyPtr),NoDataExceptionType);
-
-   dummyRecordImpl.add(dummyDataKey,
-                    &dummyProxy);
-
-   //dummyRecord.get(dummyPtr);
-   CPPUNIT_ASSERT_THROW(dummyRecord.get(dummyPtr), ExceptionType);
-
-   Dummy myDummy;
-   WorkingDummyProxy workingProxy(&myDummy);
-   ComponentDescription cd;
-   cd.label_ = "";
-   cd.type_ = "DummyProd";
-   workingProxy.setProviderDescription(&cd);
-   
-   const DataKey workingDataKey(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(),
-                              "working");
-
-   dummyRecordImpl.add(workingDataKey,
-                    &workingProxy);
-
-   dummyRecord.get("working",dummyPtr);
-   CPPUNIT_ASSERT(!dummyPtr.failedToGet());
-   CPPUNIT_ASSERT(dummyPtr.isValid());
-   CPPUNIT_ASSERT(dummyPtr);
-   (void) makeESValid(dummyPtr);
-
-   CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
-
-   const std::string workingString("working");
-   dummyRecord.get(workingString,dummyPtr);
-   CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
-   
-   edm::ESInputTag it_working("","working");
-   dummyRecord.get(it_working,dummyPtr);
-   CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
-   
-   edm::ESInputTag it_prov("DummyProd","working");
-   dummyRecord.get(it_prov,dummyPtr);
-   CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
-
-   edm::ESInputTag it_bad("SmartProd","working");
-   CPPUNIT_ASSERT_THROW(dummyRecord.get(it_bad,dummyPtr), cms::Exception);
-   
-   //check if label is set
-   cd.label_ = "foo";
-   edm::ESInputTag it_label("foo","working");
-   dummyRecord.get(it_label,dummyPtr);
-   CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
-
-   edm::ESInputTag it_prov_bad("DummyProd","working");
-   CPPUNIT_ASSERT_THROW(dummyRecord.get(it_prov_bad,dummyPtr), cms::Exception);
+void testEventsetupRecord::getTest() {
+  eventsetup::EventSetupProvider provider(&activityRegistry);
+  eventsetup::EventSetupRecordImpl dummyRecordImpl{dummyRecordKey_};
+  provider.addRecord(dummyRecordKey_);
+  provider.addRecordToEventSetup(dummyRecordImpl);
+
+  FailingDummyProxy dummyProxy;
+
+  const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(), "");
+
+  DummyRecord dummyRecord;
+  dummyRecord.setImpl(&dummyRecordImpl, 0, nullptr);
+  ESHandle<Dummy> dummyPtr;
+  CPPUNIT_ASSERT(not dummyRecord.get(dummyPtr));
+  CPPUNIT_ASSERT(not dummyPtr.isValid());
+  CPPUNIT_ASSERT(not dummyPtr);
+  CPPUNIT_ASSERT(dummyPtr.failedToGet());
+  CPPUNIT_ASSERT_THROW(*dummyPtr, NoDataExceptionType);
+  CPPUNIT_ASSERT_THROW(makeESValid(dummyPtr), cms::Exception);
+  //CDJ do this replace
+  //CPPUNIT_ASSERT_THROW(dummyRecord.get(dummyPtr),NoDataExceptionType);
+
+  dummyRecordImpl.add(dummyDataKey, &dummyProxy);
+
+  //dummyRecord.get(dummyPtr);
+  CPPUNIT_ASSERT_THROW(dummyRecord.get(dummyPtr), ExceptionType);
+
+  Dummy myDummy;
+  WorkingDummyProxy workingProxy(&myDummy);
+  ComponentDescription cd;
+  cd.label_ = "";
+  cd.type_ = "DummyProd";
+  workingProxy.setProviderDescription(&cd);
+
+  const DataKey workingDataKey(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(), "working");
+
+  dummyRecordImpl.add(workingDataKey, &workingProxy);
+
+  dummyRecord.get("working", dummyPtr);
+  CPPUNIT_ASSERT(!dummyPtr.failedToGet());
+  CPPUNIT_ASSERT(dummyPtr.isValid());
+  CPPUNIT_ASSERT(dummyPtr);
+  (void)makeESValid(dummyPtr);
+
+  CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
+
+  const std::string workingString("working");
+  dummyRecord.get(workingString, dummyPtr);
+  CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
+
+  edm::ESInputTag it_working("", "working");
+  dummyRecord.get(it_working, dummyPtr);
+  CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
+
+  edm::ESInputTag it_prov("DummyProd", "working");
+  dummyRecord.get(it_prov, dummyPtr);
+  CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
+
+  edm::ESInputTag it_bad("SmartProd", "working");
+  CPPUNIT_ASSERT_THROW(dummyRecord.get(it_bad, dummyPtr), cms::Exception);
+
+  //check if label is set
+  cd.label_ = "foo";
+  edm::ESInputTag it_label("foo", "working");
+  dummyRecord.get(it_label, dummyPtr);
+  CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
+
+  edm::ESInputTag it_prov_bad("DummyProd", "working");
+  CPPUNIT_ASSERT_THROW(dummyRecord.get(it_prov_bad, dummyPtr), cms::Exception);
 }
 
 namespace {
-   struct DummyDataConsumer : public EDConsumerBase {
-      explicit DummyDataConsumer( ESInputTag const& iTag):
-      m_token{esConsumes<Dummy, DummyRecord>(iTag)}
-      {}
-      
-      ESGetToken<Dummy, DummyRecord> m_token;
-   };
+  struct DummyDataConsumer : public EDConsumerBase {
+    explicit DummyDataConsumer(ESInputTag const& iTag) : m_token{esConsumes<Dummy, DummyRecord>(iTag)} {}
+
+    ESGetToken<Dummy, DummyRecord> m_token;
+  };
+}  // namespace
+
+namespace {
+  struct SetupRecord {
+    eventsetup::EventSetupProvider provider;
+
+    eventsetup::EventSetupRecordImpl dummyRecordImpl;
+    DummyDataConsumer& consumer;
+    //we need the DataKeys to stick around since references are being kept to them
+    std::vector<std::pair<edm::eventsetup::DataKey, edm::eventsetup::DataProxy*>> proxies;
+
+    SetupRecord(DummyDataConsumer& iConsumer,
+                EventSetupRecordKey const& iKey,
+                ActivityRegistry* iRegistry,
+                std::vector<std::pair<edm::eventsetup::DataKey, edm::eventsetup::DataProxy*>> iProxies)
+        : provider(iRegistry), dummyRecordImpl(iKey), consumer(iConsumer), proxies(std::move(iProxies)) {
+      provider.addRecord(iKey);
+      provider.addRecordToEventSetup(dummyRecordImpl);
+
+      for (auto const& d : proxies) {
+        dummyRecordImpl.add(d.first, d.second);
+      }
+
+      ESRecordsToProxyIndices proxyIndices({iKey});
+      std::vector<DataKey> dataKeys;
+      dummyRecordImpl.fillRegisteredDataKeys(dataKeys);
+
+      (void)proxyIndices.dataKeysInRecord(0, iKey, dataKeys, dummyRecordImpl.componentsForRegisteredDataKeys());
+
+      iConsumer.updateLookup(proxyIndices);
+    }
+
+    DummyRecord makeRecord() {
+      DummyRecord ret;
+      ret.setImpl(&dummyRecordImpl, 0, consumer.esGetTokenIndices(edm::Transition::Event));
+      return ret;
+    }
+  };
+}  // namespace
+
+void testEventsetupRecord::getHandleTest() {
+  FailingDummyProxy dummyProxy;
+
+  const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(), "");
+
+  ESHandle<Dummy> dummyPtr;
+  {
+    DummyDataConsumer consumer{edm::ESInputTag("", "")};
+
+    SetupRecord sr{consumer, dummyRecordKey_, &activityRegistry, {}};
+    DummyRecord dummyRecord = sr.makeRecord();
+
+    CPPUNIT_ASSERT(not dummyRecord.getHandle(consumer.m_token));
+    dummyPtr = dummyRecord.getHandle(consumer.m_token);
+    CPPUNIT_ASSERT(not dummyPtr.isValid());
+    CPPUNIT_ASSERT(not dummyPtr);
+    CPPUNIT_ASSERT(dummyPtr.failedToGet());
+    CPPUNIT_ASSERT_THROW(*dummyPtr, NoDataExceptionType);
+    CPPUNIT_ASSERT_THROW(makeESValid(dummyPtr), cms::Exception);
+  }
+
+  {
+    DummyDataConsumer consumer{edm::ESInputTag("", "")};
+
+    SetupRecord sr{consumer, dummyRecordKey_, &activityRegistry, {{dummyDataKey, &dummyProxy}}};
+
+    DummyRecord dummyRecord = sr.makeRecord();
+    CPPUNIT_ASSERT_THROW(dummyRecord.getHandle(consumer.m_token), ExceptionType);
+  }
+  Dummy myDummy;
+  WorkingDummyProxy workingProxy(&myDummy);
+  ComponentDescription cd;
+  cd.label_ = "";
+  cd.type_ = "DummyProd";
+  workingProxy.setProviderDescription(&cd);
+
+  const DataKey workingDataKey(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(), "working");
+
+  {
+    DummyDataConsumer consumer{edm::ESInputTag("", "working")};
+    SetupRecord sr{
+        consumer, dummyRecordKey_, &activityRegistry, {{dummyDataKey, &dummyProxy}, {workingDataKey, &workingProxy}}};
+
+    DummyRecord dummyRecord = sr.makeRecord();
+
+    dummyPtr = dummyRecord.getHandle(consumer.m_token);
+    CPPUNIT_ASSERT(!dummyPtr.failedToGet());
+    CPPUNIT_ASSERT(dummyPtr.isValid());
+    CPPUNIT_ASSERT(dummyPtr);
+
+    CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
+  }
+  {
+    DummyDataConsumer consumer{edm::ESInputTag("DummyProd", "working")};
+    SetupRecord sr{
+        consumer, dummyRecordKey_, &activityRegistry, {{dummyDataKey, &dummyProxy}, {workingDataKey, &workingProxy}}};
+
+    DummyRecord dummyRecord = sr.makeRecord();
+
+    dummyPtr = dummyRecord.getHandle(consumer.m_token);
+    CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
+  }
+  {
+    DummyDataConsumer consumer{edm::ESInputTag("SmartProd", "working")};
+    SetupRecord sr{
+        consumer, dummyRecordKey_, &activityRegistry, {{dummyDataKey, &dummyProxy}, {workingDataKey, &workingProxy}}};
+
+    DummyRecord dummyRecord = sr.makeRecord();
+
+    CPPUNIT_ASSERT(not dummyRecord.getHandle(consumer.m_token));
+    CPPUNIT_ASSERT_THROW(*dummyRecord.getHandle(consumer.m_token), cms::Exception);
+  }
+  //check if label is set
+  cd.label_ = "foo";
+  {
+    DummyDataConsumer consumer{edm::ESInputTag("foo", "working")};
+    SetupRecord sr{
+        consumer, dummyRecordKey_, &activityRegistry, {{dummyDataKey, &dummyProxy}, {workingDataKey, &workingProxy}}};
+
+    DummyRecord dummyRecord = sr.makeRecord();
+
+    dummyPtr = dummyRecord.getHandle(consumer.m_token);
+    CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
+  }
+  {
+    DummyDataConsumer consumer{edm::ESInputTag("DummyProd", "working")};
+    SetupRecord sr{
+        consumer, dummyRecordKey_, &activityRegistry, {{dummyDataKey, &dummyProxy}, {workingDataKey, &workingProxy}}};
+
+    DummyRecord dummyRecord = sr.makeRecord();
+
+    CPPUNIT_ASSERT(not dummyRecord.getHandle(consumer.m_token));
+    CPPUNIT_ASSERT_THROW(*dummyRecord.getHandle(consumer.m_token), cms::Exception);
+  }
 }
 
-void testEventsetupRecord::getHandleTest()
-{
-   eventsetup::EventSetupProvider provider(&activityRegistry);
-   eventsetup::EventSetupRecordImpl dummyRecordImpl{dummyRecordKey_};
-   provider.addRecord(dummyRecordKey_);
-   provider.addRecordToEventSetup(dummyRecordImpl);
-   
-   FailingDummyProxy dummyProxy;
-   
-   const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(),
-                              "");
-   
-   
-   DummyRecord dummyRecord;
-   dummyRecord.setImpl(&dummyRecordImpl);
-   ESHandle<Dummy> dummyPtr;
-   {
-      DummyDataConsumer consumer{edm::ESInputTag("","")};
-
-      CPPUNIT_ASSERT(not dummyRecord.getHandle(consumer.m_token));
-      dummyPtr = dummyRecord.getHandle(consumer.m_token);
-      CPPUNIT_ASSERT(not dummyPtr.isValid());
-      CPPUNIT_ASSERT(not dummyPtr);
-      CPPUNIT_ASSERT(dummyPtr.failedToGet());
-      CPPUNIT_ASSERT_THROW(*dummyPtr, NoDataExceptionType) ;
-      CPPUNIT_ASSERT_THROW(makeESValid(dummyPtr), cms::Exception) ;
-   }
-   dummyRecordImpl.add(dummyDataKey,
-                       &dummyProxy);
-   
-   {
-      DummyDataConsumer consumer{edm::ESInputTag("","")};
-      CPPUNIT_ASSERT_THROW(dummyRecord.getHandle(consumer.m_token), ExceptionType);
-   }
-   Dummy myDummy;
-   WorkingDummyProxy workingProxy(&myDummy);
-   ComponentDescription cd;
-   cd.label_ = "";
-   cd.type_ = "DummyProd";
-   workingProxy.setProviderDescription(&cd);
-   
-   const DataKey workingDataKey(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(),
-                                "working");
-   
-   dummyRecordImpl.add(workingDataKey,
-                       &workingProxy);
-   {
-      DummyDataConsumer consumer{edm::ESInputTag("","working")};
-      dummyPtr = dummyRecord.getHandle(consumer.m_token);
-      CPPUNIT_ASSERT(!dummyPtr.failedToGet());
-      CPPUNIT_ASSERT(dummyPtr.isValid());
-      CPPUNIT_ASSERT(dummyPtr);
-   
-      CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
-   }
-   {
-      DummyDataConsumer consumer{edm::ESInputTag("DummyProd","working")};
-      dummyPtr = dummyRecord.getHandle(consumer.m_token);
-      CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
-   }
-   {
-      DummyDataConsumer consumer{edm::ESInputTag("SmartProd","working")};
-      CPPUNIT_ASSERT_THROW(dummyRecord.getHandle(consumer.m_token), cms::Exception);
-   }
-   //check if label is set
-   cd.label_ = "foo";
-   {
-      DummyDataConsumer consumer{edm::ESInputTag("foo","working")};
-      dummyPtr = dummyRecord.getHandle(consumer.m_token);
-      CPPUNIT_ASSERT(&(*dummyPtr) == &myDummy);
-   }
-   {
-      DummyDataConsumer consumer{edm::ESInputTag("DummyProd","working")};
-      CPPUNIT_ASSERT_THROW(dummyRecord.getHandle(consumer.m_token), cms::Exception);
-   }
+void testEventsetupRecord::getWithTokenTest() {
+  FailingDummyProxy dummyProxy;
+
+  const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(), "");
+
+  {
+    DummyDataConsumer consumer{edm::ESInputTag("", "")};
+
+    SetupRecord sr{consumer, dummyRecordKey_, &activityRegistry, {}};
+
+    DummyRecord dummyRecord = sr.makeRecord();
+
+    CPPUNIT_ASSERT_THROW(dummyRecord.get(consumer.m_token), NoDataExceptionType);
+  }
+
+  {
+    DummyDataConsumer consumer{edm::ESInputTag("", "")};
+
+    SetupRecord sr{consumer, dummyRecordKey_, &activityRegistry, {{dummyDataKey, &dummyProxy}}};
+
+    DummyRecord dummyRecord = sr.makeRecord();
+    CPPUNIT_ASSERT_THROW(dummyRecord.get(consumer.m_token), ExceptionType);
+  }
+  Dummy myDummy;
+  WorkingDummyProxy workingProxy(&myDummy);
+  ComponentDescription cd;
+  cd.label_ = "";
+  cd.type_ = "DummyProd";
+  workingProxy.setProviderDescription(&cd);
+
+  const DataKey workingDataKey(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(), "working");
+
+  {
+    DummyDataConsumer consumer{edm::ESInputTag("", "working")};
+    SetupRecord sr{
+        consumer, dummyRecordKey_, &activityRegistry, {{dummyDataKey, &dummyProxy}, {workingDataKey, &workingProxy}}};
+
+    DummyRecord dummyRecord = sr.makeRecord();
+    auto const& dummyData = dummyRecord.get(consumer.m_token);
+
+    CPPUNIT_ASSERT(&dummyData == &myDummy);
+  }
+  {
+    DummyDataConsumer consumer{edm::ESInputTag("DummyProd", "working")};
+    SetupRecord sr{
+        consumer, dummyRecordKey_, &activityRegistry, {{dummyDataKey, &dummyProxy}, {workingDataKey, &workingProxy}}};
+
+    DummyRecord dummyRecord = sr.makeRecord();
+    auto const& dummyData = dummyRecord.get(consumer.m_token);
+    CPPUNIT_ASSERT(&dummyData == &myDummy);
+  }
+  {
+    DummyDataConsumer consumer{edm::ESInputTag("SmartProd", "working")};
+    SetupRecord sr{
+        consumer, dummyRecordKey_, &activityRegistry, {{dummyDataKey, &dummyProxy}, {workingDataKey, &workingProxy}}};
+
+    DummyRecord dummyRecord = sr.makeRecord();
+    CPPUNIT_ASSERT_THROW(dummyRecord.get(consumer.m_token), cms::Exception);
+  }
+  //check if label is set
+  cd.label_ = "foo";
+  {
+    DummyDataConsumer consumer{edm::ESInputTag("foo", "working")};
+    SetupRecord sr{
+        consumer, dummyRecordKey_, &activityRegistry, {{dummyDataKey, &dummyProxy}, {workingDataKey, &workingProxy}}};
+
+    DummyRecord dummyRecord = sr.makeRecord();
+    auto const& dummyData = dummyRecord.get(consumer.m_token);
+    CPPUNIT_ASSERT(&dummyData == &myDummy);
+  }
+  {
+    DummyDataConsumer consumer{edm::ESInputTag("DummyProd", "working")};
+    SetupRecord sr{
+        consumer, dummyRecordKey_, &activityRegistry, {{dummyDataKey, &dummyProxy}, {workingDataKey, &workingProxy}}};
+
+    DummyRecord dummyRecord = sr.makeRecord();
+    CPPUNIT_ASSERT_THROW(dummyRecord.get(consumer.m_token), cms::Exception);
+  }
 }
 
-void testEventsetupRecord::getWithTokenTest()
-{
-   eventsetup::EventSetupProvider provider(&activityRegistry);
-   eventsetup::EventSetupRecordImpl dummyRecordImpl{dummyRecordKey_};
-   provider.addRecord(dummyRecordKey_);
-   provider.addRecordToEventSetup(dummyRecordImpl);
-   
-   FailingDummyProxy dummyProxy;
-   
-   const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(),
-                              "");
-   
-   
-   DummyRecord dummyRecord;
-   dummyRecord.setImpl(&dummyRecordImpl);
-   {
-      DummyDataConsumer consumer{edm::ESInputTag("","")};
-      
-      CPPUNIT_ASSERT_THROW(dummyRecord.get(consumer.m_token), NoDataExceptionType);
-   }
-   dummyRecordImpl.add(dummyDataKey,
-                       &dummyProxy);
-   
-   {
-      DummyDataConsumer consumer{edm::ESInputTag("","")};
-      CPPUNIT_ASSERT_THROW(dummyRecord.get(consumer.m_token), ExceptionType);
-   }
-   Dummy myDummy;
-   WorkingDummyProxy workingProxy(&myDummy);
-   ComponentDescription cd;
-   cd.label_ = "";
-   cd.type_ = "DummyProd";
-   workingProxy.setProviderDescription(&cd);
-   
-   const DataKey workingDataKey(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(),
-                                "working");
-   
-   dummyRecordImpl.add(workingDataKey,
-                       &workingProxy);
-   {
-      DummyDataConsumer consumer{edm::ESInputTag("","working")};
-      auto const& dummyData = dummyRecord.get(consumer.m_token);
-      
-      CPPUNIT_ASSERT(&dummyData == &myDummy);
-   }
-   {
-      DummyDataConsumer consumer{edm::ESInputTag("DummyProd","working")};
-      auto const& dummyData = dummyRecord.get(consumer.m_token);
-      CPPUNIT_ASSERT(&dummyData == &myDummy);
-   }
-   {
-      DummyDataConsumer consumer{edm::ESInputTag("SmartProd","working")};
-      CPPUNIT_ASSERT_THROW(dummyRecord.get(consumer.m_token), cms::Exception);
-   }
-   //check if label is set
-   cd.label_ = "foo";
-   {
-      DummyDataConsumer consumer{edm::ESInputTag("foo","working")};
-      auto const& dummyData = dummyRecord.get(consumer.m_token);
-      CPPUNIT_ASSERT(&dummyData == &myDummy);
-   }
-   {
-      DummyDataConsumer consumer{edm::ESInputTag("DummyProd","working")};
-      CPPUNIT_ASSERT_THROW(dummyRecord.get(consumer.m_token), cms::Exception);
-   }
+void testEventsetupRecord::getNodataExpTest() {
+  EventSetupRecordImpl recImpl(DummyRecord::keyForClass());
+  DummyRecord dummyRecord;
+  dummyRecord.setImpl(&recImpl, 0, nullptr);
+  FailingDummyProxy dummyProxy;
+
+  const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(), "");
+  ESHandle<Dummy> dummyPtr;
+  dummyRecord.get(dummyPtr);
+  *dummyPtr;
+  //CPPUNIT_ASSERT_THROW(dummyRecord.get(dummyPtr), NoDataExceptionType) ;
 }
 
-void testEventsetupRecord::getNodataExpTest()
-{
-   EventSetupRecordImpl recImpl(DummyRecord::keyForClass());
-   DummyRecord dummyRecord;
-   dummyRecord.setImpl(&recImpl);
-   FailingDummyProxy dummyProxy;
+void testEventsetupRecord::getExepTest() {
+  eventsetup::EventSetupProvider provider(&activityRegistry);
+  eventsetup::EventSetupRecordImpl dummyRecordImpl{dummyRecordKey_};
+  provider.addRecord(dummyRecordKey_);
+  provider.addRecordToEventSetup(dummyRecordImpl);
+  FailingDummyProxy dummyProxy;
 
-   const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(),"");
-   ESHandle<Dummy> dummyPtr;
-   dummyRecord.get(dummyPtr);
-   *dummyPtr;
-   //CPPUNIT_ASSERT_THROW(dummyRecord.get(dummyPtr), NoDataExceptionType) ;
+  const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(), "");
 
+  ESHandle<Dummy> dummyPtr;
+
+  dummyRecordImpl.add(dummyDataKey, &dummyProxy);
+
+  DummyRecord dummyRecord;
+  dummyRecord.setImpl(&dummyRecordImpl, 0, nullptr);
+  dummyRecord.get(dummyPtr);
+  //CPPUNIT_ASSERT_THROW(dummyRecord.get(dummyPtr), ExceptionType);
 }
 
-void testEventsetupRecord::getExepTest()
-{
-   eventsetup::EventSetupProvider provider(&activityRegistry);
-   eventsetup::EventSetupRecordImpl dummyRecordImpl{dummyRecordKey_};
-   provider.addRecord(dummyRecordKey_);
-   provider.addRecordToEventSetup(dummyRecordImpl);
-   FailingDummyProxy dummyProxy;
+void testEventsetupRecord::doGetTest() {
+  eventsetup::EventSetupProvider provider(&activityRegistry);
+  eventsetup::EventSetupRecordImpl dummyRecordImpl{dummyRecordKey_};
+  provider.addRecord(dummyRecordKey_);
+  provider.addRecordToEventSetup(dummyRecordImpl);
 
-   const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(),"");
+  FailingDummyProxy dummyProxy;
 
-   ESHandle<Dummy> dummyPtr;
-   
-   dummyRecordImpl.add(dummyDataKey,&dummyProxy);
+  const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(), "");
 
-   DummyRecord dummyRecord;
-   dummyRecord.setImpl(&dummyRecordImpl);
-   dummyRecord.get(dummyPtr);
-   //CPPUNIT_ASSERT_THROW(dummyRecord.get(dummyPtr), ExceptionType);
-}
+  DummyRecord dummyRecord;
+  dummyRecord.setImpl(&dummyRecordImpl, 0, nullptr);
+  CPPUNIT_ASSERT(!dummyRecord.doGet(dummyDataKey));
+
+  dummyRecordImpl.add(dummyDataKey, &dummyProxy);
+
+  //dummyRecord.doGet(dummyDataKey);
+  CPPUNIT_ASSERT_THROW(dummyRecord.doGet(dummyDataKey), ExceptionType);
+
+  Dummy myDummy;
+  WorkingDummyProxy workingProxy(&myDummy);
+
+  const DataKey workingDataKey(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(), "working");
+
+  dummyRecordImpl.add(workingDataKey, &workingProxy);
 
-void testEventsetupRecord::doGetTest()
-{
-   eventsetup::EventSetupProvider provider(&activityRegistry);
-   eventsetup::EventSetupRecordImpl dummyRecordImpl{dummyRecordKey_};
-   provider.addRecord(dummyRecordKey_);
-   provider.addRecordToEventSetup(dummyRecordImpl);
-
-   FailingDummyProxy dummyProxy;
-   
-   const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(),
-                              "");
-   
-   DummyRecord dummyRecord;
-   dummyRecord.setImpl(&dummyRecordImpl);
-   CPPUNIT_ASSERT(!dummyRecord.doGet(dummyDataKey)) ;
-   
-   dummyRecordImpl.add(dummyDataKey,
-                       &dummyProxy);
-   
-   //dummyRecord.doGet(dummyDataKey);
-   CPPUNIT_ASSERT_THROW(dummyRecord.doGet(dummyDataKey), ExceptionType);
-   
-   Dummy myDummy;
-   WorkingDummyProxy workingProxy(&myDummy);
-   
-   const DataKey workingDataKey(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(),
-                                "working");
-   
-   dummyRecordImpl.add(workingDataKey,
-                   &workingProxy);
-   
-   CPPUNIT_ASSERT(dummyRecord.doGet(workingDataKey));
-   
+  CPPUNIT_ASSERT(dummyRecord.doGet(workingDataKey));
 }
 
-void testEventsetupRecord::introspectionTest()
-{
+namespace {
+  ComponentDescription const* find(std::vector<DataKey> const& iKeys,
+                                   std::vector<ComponentDescription const*> const& iComp,
+                                   DataKey const& iKey) {
+    return iComp[std::lower_bound(iKeys.begin(), iKeys.end(), iKey) - iKeys.begin()];
+  }
+}  // namespace
+void testEventsetupRecord::introspectionTest() {
   eventsetup::EventSetupRecordImpl dummyRecordImpl{dummyRecordKey_};
   FailingDummyProxy dummyProxy;
 
@@ -506,27 +544,27 @@ void testEventsetupRecord::introspectionTest()
   cd1.isLooper_ = false;
   dummyProxy.setProviderDescription(&cd1);
 
-  const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(),
-                             "");
+  const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(), "");
 
   std::vector<edm::eventsetup::DataKey> keys;
   dummyRecordImpl.fillRegisteredDataKeys(keys);
-  CPPUNIT_ASSERT(keys.empty()) ;
+  CPPUNIT_ASSERT(keys.empty());
 
   DummyRecord dummyRecord;
-  dummyRecord.setImpl(&dummyRecordImpl);
-  
+  dummyRecord.setImpl(&dummyRecordImpl, 0, nullptr);
+
   std::vector<ComponentDescription const*> esproducers;
   dummyRecordImpl.getESProducers(esproducers);
-  CPPUNIT_ASSERT(esproducers.empty()) ;
+  CPPUNIT_ASSERT(esproducers.empty());
+
+  std::vector<DataKey> referencedDataKeys;
+  dummyRecordImpl.fillRegisteredDataKeys(referencedDataKeys);
+  auto referencedComponents = dummyRecordImpl.componentsForRegisteredDataKeys();
+  CPPUNIT_ASSERT(referencedDataKeys.empty());
+  CPPUNIT_ASSERT(referencedComponents.empty());
 
-  std::map<DataKey, ComponentDescription const*> referencedDataKeys;
-  dummyRecordImpl.fillReferencedDataKeys(referencedDataKeys);
-  CPPUNIT_ASSERT(referencedDataKeys.empty()) ;  
+  dummyRecordImpl.add(dummyDataKey, &dummyProxy);
 
-  dummyRecordImpl.add(dummyDataKey,
-                  &dummyProxy);
-  
   dummyRecord.fillRegisteredDataKeys(keys);
   CPPUNIT_ASSERT(1 == keys.size());
 
@@ -534,9 +572,12 @@ void testEventsetupRecord::introspectionTest()
   CPPUNIT_ASSERT(esproducers.size() == 1);
   CPPUNIT_ASSERT(esproducers[0] == &cd1);
 
-  dummyRecordImpl.fillReferencedDataKeys(referencedDataKeys);
-  CPPUNIT_ASSERT(referencedDataKeys.size() == 1);  
-  CPPUNIT_ASSERT(referencedDataKeys[dummyDataKey] == &cd1);  
+  dummyRecordImpl.fillRegisteredDataKeys(referencedDataKeys);
+  referencedComponents = dummyRecordImpl.componentsForRegisteredDataKeys();
+  CPPUNIT_ASSERT(referencedDataKeys.size() == 1);
+  CPPUNIT_ASSERT(referencedComponents.size() == 1);
+  CPPUNIT_ASSERT(referencedComponents[0] == &cd1);
+  CPPUNIT_ASSERT(find(referencedDataKeys, referencedComponents, dummyDataKey) == &cd1);
 
   Dummy myDummy;
   WorkingDummyProxy workingProxy(&myDummy);
@@ -548,21 +589,21 @@ void testEventsetupRecord::introspectionTest()
   cd2.isLooper_ = false;
   workingProxy.setProviderDescription(&cd2);
 
-  const DataKey workingDataKey(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(),
-                               "working");
-  
-  dummyRecordImpl.add(workingDataKey,
-                  &workingProxy);
-  
+  const DataKey workingDataKey(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(), "working");
+
+  dummyRecordImpl.add(workingDataKey, &workingProxy);
+
   dummyRecord.fillRegisteredDataKeys(keys);
   CPPUNIT_ASSERT(2 == keys.size());
 
   dummyRecordImpl.getESProducers(esproducers);
   CPPUNIT_ASSERT(esproducers.size() == 1);
 
-  dummyRecordImpl.fillReferencedDataKeys(referencedDataKeys);
-  CPPUNIT_ASSERT(referencedDataKeys.size() == 2);  
-  CPPUNIT_ASSERT(referencedDataKeys[workingDataKey] == &cd2);  
+  dummyRecordImpl.fillRegisteredDataKeys(referencedDataKeys);
+  referencedComponents = dummyRecordImpl.componentsForRegisteredDataKeys();
+  CPPUNIT_ASSERT(referencedDataKeys.size() == 2);
+  CPPUNIT_ASSERT(referencedComponents.size() == 2);
+  CPPUNIT_ASSERT(find(referencedDataKeys, referencedComponents, workingDataKey) == &cd2);
 
   Dummy myDummy3;
   WorkingDummyProxy workingProxy3(&myDummy3);
@@ -574,18 +615,18 @@ void testEventsetupRecord::introspectionTest()
   cd3.isLooper_ = true;
   workingProxy3.setProviderDescription(&cd3);
 
-  const DataKey workingDataKey3(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(),
-                                "working3");
+  const DataKey workingDataKey3(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(), "working3");
+
+  dummyRecordImpl.add(workingDataKey3, &workingProxy3);
 
-  dummyRecordImpl.add(workingDataKey3,
-                  &workingProxy3);
-  
   dummyRecordImpl.getESProducers(esproducers);
   CPPUNIT_ASSERT(esproducers.size() == 1);
 
-  dummyRecordImpl.fillReferencedDataKeys(referencedDataKeys);
-  CPPUNIT_ASSERT(referencedDataKeys.size() == 3);  
-  CPPUNIT_ASSERT(referencedDataKeys[workingDataKey3] == &cd3);  
+  dummyRecordImpl.fillRegisteredDataKeys(referencedDataKeys);
+  referencedComponents = dummyRecordImpl.componentsForRegisteredDataKeys();
+  CPPUNIT_ASSERT(referencedDataKeys.size() == 3);
+  CPPUNIT_ASSERT(referencedComponents.size() == 3);
+  CPPUNIT_ASSERT(find(referencedDataKeys, referencedComponents, workingDataKey3) == &cd3);
 
   Dummy myDummy4;
   WorkingDummyProxy workingProxy4(&myDummy4);
@@ -597,53 +638,48 @@ void testEventsetupRecord::introspectionTest()
   cd4.isLooper_ = false;
   workingProxy4.setProviderDescription(&cd4);
 
-  const DataKey workingDataKey4(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(),
-                                "working4");
+  const DataKey workingDataKey4(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(), "working4");
+
+  dummyRecordImpl.add(workingDataKey4, &workingProxy4);
 
-  dummyRecordImpl.add(workingDataKey4,
-                  &workingProxy4);
-  
   dummyRecordImpl.getESProducers(esproducers);
   CPPUNIT_ASSERT(esproducers.size() == 2);
   CPPUNIT_ASSERT(esproducers[1] == &cd4);
 
-  dummyRecordImpl.fillReferencedDataKeys(referencedDataKeys);
-  CPPUNIT_ASSERT(referencedDataKeys.size() == 4);  
-  CPPUNIT_ASSERT(referencedDataKeys[workingDataKey4] == &cd4);  
+  dummyRecordImpl.fillRegisteredDataKeys(referencedDataKeys);
+  referencedComponents = dummyRecordImpl.componentsForRegisteredDataKeys();
+  CPPUNIT_ASSERT(referencedDataKeys.size() == 4);
+  CPPUNIT_ASSERT(referencedComponents.size() == 4);
+  CPPUNIT_ASSERT(find(referencedDataKeys, referencedComponents, workingDataKey4) == &cd4);
 
   dummyRecordImpl.clearProxies();
   dummyRecord.fillRegisteredDataKeys(keys);
   CPPUNIT_ASSERT(0 == keys.size());
 }
 
-void testEventsetupRecord::doGetExepTest()
-{
-   eventsetup::EventSetupProvider provider(&activityRegistry);
-   eventsetup::EventSetupRecordImpl dummyRecordImpl{dummyRecordKey_};
-   provider.addRecord(dummyRecordKey_);
-   provider.addRecordToEventSetup(dummyRecordImpl);
-   FailingDummyProxy dummyProxy;
-   
-   const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(),
-                              "");
-  
-   DummyRecord dummyRecord;
-   dummyRecord.setImpl(&dummyRecordImpl);
-   CPPUNIT_ASSERT(!dummyRecord.doGet(dummyDataKey)) ;
-   
-   dummyRecordImpl.add(dummyDataKey,
-                       &dummyProxy);
-   
-   //typedef edm::eventsetup::MakeDataException<DummyRecord,Dummy> ExceptionType;
-   dummyRecord.doGet(dummyDataKey);
-   //CPPUNIT_ASSERT_THROW(dummyRecord.doGet(dummyDataKey), ExceptionType);
-   
+void testEventsetupRecord::doGetExepTest() {
+  eventsetup::EventSetupProvider provider(&activityRegistry);
+  eventsetup::EventSetupRecordImpl dummyRecordImpl{dummyRecordKey_};
+  provider.addRecord(dummyRecordKey_);
+  provider.addRecordToEventSetup(dummyRecordImpl);
+  FailingDummyProxy dummyProxy;
+
+  const DataKey dummyDataKey(DataKey::makeTypeTag<FailingDummyProxy::value_type>(), "");
+
+  DummyRecord dummyRecord;
+  dummyRecord.setImpl(&dummyRecordImpl, 0, nullptr);
+  CPPUNIT_ASSERT(!dummyRecord.doGet(dummyDataKey));
+
+  dummyRecordImpl.add(dummyDataKey, &dummyProxy);
+
+  //typedef edm::eventsetup::MakeDataException<DummyRecord,Dummy> ExceptionType;
+  dummyRecord.doGet(dummyDataKey);
+  //CPPUNIT_ASSERT_THROW(dummyRecord.doGet(dummyDataKey), ExceptionType);
 }
 
-void testEventsetupRecord::proxyResetTest()
-{
-   auto dummyProvider = std::make_unique<EventSetupRecordProvider>(DummyRecord::keyForClass());
-  
+void testEventsetupRecord::proxyResetTest() {
+  auto dummyProvider = std::make_unique<EventSetupRecordProvider>(DummyRecord::keyForClass());
+
   auto const constProv = dummyProvider.get();
 
   eventsetup::EventSetupProvider provider(&activityRegistry);
@@ -651,24 +687,24 @@ void testEventsetupRecord::proxyResetTest()
   dummyProvider->addRecordTo(provider);
 
   DummyRecord dummyRecord;
-  dummyRecord.setImpl(&constProv->record());
+  dummyRecord.setImpl(&constProv->record(), 0, nullptr);
 
   unsigned long long cacheID = dummyRecord.cacheIdentifier();
   Dummy myDummy;
   std::shared_ptr<WorkingDummyProxy> workingProxy = std::make_shared<WorkingDummyProxy>(&myDummy);
-  
-  const DataKey workingDataKey(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(),
-                               "");
+
+  const DataKey workingDataKey(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(), "");
 
   std::shared_ptr<WorkingDummyProvider> wdProv = std::make_shared<WorkingDummyProvider>(workingDataKey, workingProxy);
   CPPUNIT_ASSERT(0 != wdProv.get());
-  if(wdProv.get() == 0) return; // To silence Coverity
-  dummyProvider->add( wdProv );
+  if (wdProv.get() == 0)
+    return;  // To silence Coverity
+  dummyProvider->add(wdProv);
 
   //this causes the proxies to actually be placed in the Record
   edm::eventsetup::EventSetupRecordProvider::DataToPreferredProviderMap pref;
   dummyProvider->usePreferred(pref);
-  
+
   CPPUNIT_ASSERT(dummyRecord.doGet(workingDataKey));
 
   edm::ESHandle<Dummy> hDummy;
@@ -676,7 +712,7 @@ void testEventsetupRecord::proxyResetTest()
 
   CPPUNIT_ASSERT(&myDummy == &(*hDummy));
   CPPUNIT_ASSERT(cacheID == dummyRecord.cacheIdentifier());
-  
+
   Dummy myDummy2;
   workingProxy->set(&myDummy2);
 
@@ -691,107 +727,100 @@ void testEventsetupRecord::proxyResetTest()
   CPPUNIT_ASSERT(cacheID != dummyRecord.cacheIdentifier());
 }
 
-void testEventsetupRecord::transientTest()
-{
-   auto dummyProvider = std::make_unique<EventSetupRecordProvider>(DummyRecord::keyForClass());
-   
-   eventsetup::EventSetupProvider provider(&activityRegistry);
-   provider.addRecord(dummyRecordKey_);
-   dummyProvider->addRecordTo(provider);
-   
-   const auto* constProv = dummyProvider.get();
-   DummyRecord dummyRecordNoConst;
-   dummyRecordNoConst.setImpl( & constProv->record() );
-   EventSetupRecord const& dummyRecord = dummyRecordNoConst;
-
-   eventsetup::EventSetupRecordImpl& nonConstDummyRecord = *const_cast<EventSetupRecordImpl*>(dummyRecord.impl_);
-   
-   unsigned long long cacheID = dummyRecord.cacheIdentifier();
-   Dummy myDummy;
-   std::shared_ptr<WorkingDummyProxy> workingProxy = std::make_shared<WorkingDummyProxy>(&myDummy);
-   
-   const DataKey workingDataKey(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(),
-                                "");
-   
-   std::shared_ptr<WorkingDummyProvider> wdProv = std::make_shared<WorkingDummyProvider>(workingDataKey, workingProxy);
-   dummyProvider->add( wdProv );
-   
-   //this causes the proxies to actually be placed in the Record
-   edm::eventsetup::EventSetupRecordProvider::DataToPreferredProviderMap pref;
-   dummyProvider->usePreferred(pref);
-   
-   //do a transient access to see if it clears properly
-   edm::ESTransientHandle<Dummy> hTDummy;
-   CPPUNIT_ASSERT(hTDummy.transientAccessOnly);
-   dummyRecord.get(hTDummy);
-   
-   CPPUNIT_ASSERT(&myDummy == &(*hTDummy));
-   CPPUNIT_ASSERT(cacheID == dummyRecord.cacheIdentifier());
-   CPPUNIT_ASSERT(workingProxy->invalidateCalled()==false);
-   CPPUNIT_ASSERT(workingProxy->invalidateTransientCalled()==false);
-
-   CPPUNIT_ASSERT(nonConstDummyRecord.transientReset());
-   wdProv->resetProxiesIfTransient(dummyRecord.key());//   workingProxy->resetIfTransient();
-   CPPUNIT_ASSERT(workingProxy->invalidateCalled());
-   CPPUNIT_ASSERT(workingProxy->invalidateTransientCalled());
-
-
-   Dummy myDummy2;
-   workingProxy->set(&myDummy2);
-   
-   //do non-transient access to make sure nothing resets now
-   edm::ESHandle<Dummy> hDummy;
-   dummyRecord.get(hDummy);
-   
-
-   dummyRecord.get(hDummy);
-   CPPUNIT_ASSERT(&myDummy2 == &(*hDummy));
-   CPPUNIT_ASSERT(not nonConstDummyRecord.transientReset());
-   wdProv->resetProxiesIfTransient(dummyRecord.key());//workingProxy->resetIfTransient();
-   CPPUNIT_ASSERT(workingProxy->invalidateCalled()==false);
-   CPPUNIT_ASSERT(workingProxy->invalidateTransientCalled()==false);
-
-   //do another transient access which should not do a reset since we have a non-transient access outstanding
-   dummyRecord.get(hDummy);
-   dummyRecord.get(hTDummy);
-
-   CPPUNIT_ASSERT(nonConstDummyRecord.transientReset());
-   wdProv->resetProxiesIfTransient(dummyRecord.key());//workingProxy->resetIfTransient();
-   CPPUNIT_ASSERT(workingProxy->invalidateCalled()==false);
-   CPPUNIT_ASSERT(workingProxy->invalidateTransientCalled()==false);
-
-  
-   //Ask for a transient then a non transient to be sure we don't have an ordering problem
-   {
-     dummyProvider->resetProxies();
-     Dummy myDummy3;
-     workingProxy->set(&myDummy3);
-     
-     dummyRecord.get(hTDummy);
-     dummyRecord.get(hDummy);
-
-     CPPUNIT_ASSERT(&myDummy3 == &(*hDummy));
-     CPPUNIT_ASSERT(&myDummy3 == &(*hTDummy));
-     CPPUNIT_ASSERT(nonConstDummyRecord.transientReset());
-     wdProv->resetProxiesIfTransient(dummyRecord.key());//workingProxy->resetIfTransient();
-     CPPUNIT_ASSERT(workingProxy->invalidateCalled()==false);
-     CPPUNIT_ASSERT(workingProxy->invalidateTransientCalled()==false);
-
-   }
-   //system should wait until the second event of a run before invalidating the transients
-   // need to do 'resetProxies' in order to force the Record to reset since we do not have a Finder
-   // associated with the record provider
-   dummyProvider->resetProxies();
-   workingProxy->set(&myDummy);
-   dummyRecord.get(hTDummy);
-   CPPUNIT_ASSERT(&myDummy == &(*hTDummy));
-   dummyProvider->setValidityIntervalFor(edm::IOVSyncValue(edm::EventID(1,0,0)));
-   CPPUNIT_ASSERT(workingProxy->invalidateCalled()==false);
-   dummyProvider->setValidityIntervalFor(edm::IOVSyncValue(edm::EventID(1,1,0)));
-   CPPUNIT_ASSERT(workingProxy->invalidateCalled()==false);
-   dummyProvider->setValidityIntervalFor(edm::IOVSyncValue(edm::EventID(1,1,1)));
-   CPPUNIT_ASSERT(workingProxy->invalidateCalled()==false);
-   dummyProvider->setValidityIntervalFor(edm::IOVSyncValue(edm::EventID(1,1,2)));
-   CPPUNIT_ASSERT(workingProxy->invalidateCalled()==true);
-   
+void testEventsetupRecord::transientTest() {
+  auto dummyProvider = std::make_unique<EventSetupRecordProvider>(DummyRecord::keyForClass());
+
+  eventsetup::EventSetupProvider provider(&activityRegistry);
+  provider.addRecord(dummyRecordKey_);
+  dummyProvider->addRecordTo(provider);
+
+  const auto* constProv = dummyProvider.get();
+  DummyRecord dummyRecordNoConst;
+  dummyRecordNoConst.setImpl(&constProv->record(), 0, nullptr);
+  EventSetupRecord const& dummyRecord = dummyRecordNoConst;
+
+  eventsetup::EventSetupRecordImpl& nonConstDummyRecord = *const_cast<EventSetupRecordImpl*>(dummyRecord.impl_);
+
+  unsigned long long cacheID = dummyRecord.cacheIdentifier();
+  Dummy myDummy;
+  std::shared_ptr<WorkingDummyProxy> workingProxy = std::make_shared<WorkingDummyProxy>(&myDummy);
+
+  const DataKey workingDataKey(DataKey::makeTypeTag<WorkingDummyProxy::value_type>(), "");
+
+  std::shared_ptr<WorkingDummyProvider> wdProv = std::make_shared<WorkingDummyProvider>(workingDataKey, workingProxy);
+  dummyProvider->add(wdProv);
+
+  //this causes the proxies to actually be placed in the Record
+  edm::eventsetup::EventSetupRecordProvider::DataToPreferredProviderMap pref;
+  dummyProvider->usePreferred(pref);
+
+  //do a transient access to see if it clears properly
+  edm::ESTransientHandle<Dummy> hTDummy;
+  CPPUNIT_ASSERT(hTDummy.transientAccessOnly);
+  dummyRecord.get(hTDummy);
+
+  CPPUNIT_ASSERT(&myDummy == &(*hTDummy));
+  CPPUNIT_ASSERT(cacheID == dummyRecord.cacheIdentifier());
+  CPPUNIT_ASSERT(workingProxy->invalidateCalled() == false);
+  CPPUNIT_ASSERT(workingProxy->invalidateTransientCalled() == false);
+
+  CPPUNIT_ASSERT(nonConstDummyRecord.transientReset());
+  wdProv->resetProxiesIfTransient(dummyRecord.key());  //   workingProxy->resetIfTransient();
+  CPPUNIT_ASSERT(workingProxy->invalidateCalled());
+  CPPUNIT_ASSERT(workingProxy->invalidateTransientCalled());
+
+  Dummy myDummy2;
+  workingProxy->set(&myDummy2);
+
+  //do non-transient access to make sure nothing resets now
+  edm::ESHandle<Dummy> hDummy;
+  dummyRecord.get(hDummy);
+
+  dummyRecord.get(hDummy);
+  CPPUNIT_ASSERT(&myDummy2 == &(*hDummy));
+  CPPUNIT_ASSERT(not nonConstDummyRecord.transientReset());
+  wdProv->resetProxiesIfTransient(dummyRecord.key());  //workingProxy->resetIfTransient();
+  CPPUNIT_ASSERT(workingProxy->invalidateCalled() == false);
+  CPPUNIT_ASSERT(workingProxy->invalidateTransientCalled() == false);
+
+  //do another transient access which should not do a reset since we have a non-transient access outstanding
+  dummyRecord.get(hDummy);
+  dummyRecord.get(hTDummy);
+
+  CPPUNIT_ASSERT(nonConstDummyRecord.transientReset());
+  wdProv->resetProxiesIfTransient(dummyRecord.key());  //workingProxy->resetIfTransient();
+  CPPUNIT_ASSERT(workingProxy->invalidateCalled() == false);
+  CPPUNIT_ASSERT(workingProxy->invalidateTransientCalled() == false);
+
+  //Ask for a transient then a non transient to be sure we don't have an ordering problem
+  {
+    dummyProvider->resetProxies();
+    Dummy myDummy3;
+    workingProxy->set(&myDummy3);
+
+    dummyRecord.get(hTDummy);
+    dummyRecord.get(hDummy);
+
+    CPPUNIT_ASSERT(&myDummy3 == &(*hDummy));
+    CPPUNIT_ASSERT(&myDummy3 == &(*hTDummy));
+    CPPUNIT_ASSERT(nonConstDummyRecord.transientReset());
+    wdProv->resetProxiesIfTransient(dummyRecord.key());  //workingProxy->resetIfTransient();
+    CPPUNIT_ASSERT(workingProxy->invalidateCalled() == false);
+    CPPUNIT_ASSERT(workingProxy->invalidateTransientCalled() == false);
+  }
+  //system should wait until the second event of a run before invalidating the transients
+  // need to do 'resetProxies' in order to force the Record to reset since we do not have a Finder
+  // associated with the record provider
+  dummyProvider->resetProxies();
+  workingProxy->set(&myDummy);
+  dummyRecord.get(hTDummy);
+  CPPUNIT_ASSERT(&myDummy == &(*hTDummy));
+  dummyProvider->setValidityIntervalFor(edm::IOVSyncValue(edm::EventID(1, 0, 0)));
+  CPPUNIT_ASSERT(workingProxy->invalidateCalled() == false);
+  dummyProvider->setValidityIntervalFor(edm::IOVSyncValue(edm::EventID(1, 1, 0)));
+  CPPUNIT_ASSERT(workingProxy->invalidateCalled() == false);
+  dummyProvider->setValidityIntervalFor(edm::IOVSyncValue(edm::EventID(1, 1, 1)));
+  CPPUNIT_ASSERT(workingProxy->invalidateCalled() == false);
+  dummyProvider->setValidityIntervalFor(edm::IOVSyncValue(edm::EventID(1, 1, 2)));
+  CPPUNIT_ASSERT(workingProxy->invalidateCalled() == true);
 }
diff --git a/FWCore/Framework/test/eventsetupscontroller_t.cppunit.cc b/FWCore/Framework/test/eventsetupscontroller_t.cppunit.cc
index a6ee8471ab79b..8743b7a37e776 100644
--- a/FWCore/Framework/test/eventsetupscontroller_t.cppunit.cc
+++ b/FWCore/Framework/test/eventsetupscontroller_t.cppunit.cc
@@ -18,11 +18,10 @@
 #include <vector>
 
 namespace {
-edm::ActivityRegistry activityRegistry;
+  edm::ActivityRegistry activityRegistry;
 }
 
-class TestEventSetupsController: public CppUnit::TestFixture
-{
+class TestEventSetupsController : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(TestEventSetupsController);
 
   CPPUNIT_TEST(constructorTest);
@@ -30,9 +29,10 @@ class TestEventSetupsController: public CppUnit::TestFixture
   CPPUNIT_TEST(esSourceGetAndPutTest);
 
   CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void constructorTest();
   void esProducerGetAndPutTest();
@@ -43,12 +43,11 @@ class TestEventSetupsController: public CppUnit::TestFixture
 CPPUNIT_TEST_SUITE_REGISTRATION(TestEventSetupsController);
 
 void TestEventSetupsController::constructorTest() {
-
   edm::eventsetup::EventSetupsController esController;
-  
-  CPPUNIT_ASSERT(esController.providers().empty());   
-  CPPUNIT_ASSERT(esController.esproducers().empty());   
-  CPPUNIT_ASSERT(esController.essources().empty());   
+
+  CPPUNIT_ASSERT(esController.providers().empty());
+  CPPUNIT_ASSERT(esController.esproducers().empty());
+  CPPUNIT_ASSERT(esController.essources().empty());
   CPPUNIT_ASSERT(esController.mustFinishConfiguration() == true);
 
   edm::ParameterSet pset;
@@ -72,24 +71,28 @@ void TestEventSetupsController::esProducerGetAndPutTest() {
 
   edm::ParameterSet pset1;
   pset1.registerIt();
-  std::shared_ptr<edm::eventsetup::test::DummyProxyProvider> proxyProvider1 = std::make_shared<edm::eventsetup::test::DummyProxyProvider>();
+  std::shared_ptr<edm::eventsetup::test::DummyProxyProvider> proxyProvider1 =
+      std::make_shared<edm::eventsetup::test::DummyProxyProvider>();
 
   edm::ParameterSet pset2;
-  pset2.addUntrackedParameter<int>("p1", 1); 
+  pset2.addUntrackedParameter<int>("p1", 1);
   pset2.registerIt();
-  std::shared_ptr<edm::eventsetup::test::DummyProxyProvider> proxyProvider2 = std::make_shared<edm::eventsetup::test::DummyProxyProvider>();
+  std::shared_ptr<edm::eventsetup::test::DummyProxyProvider> proxyProvider2 =
+      std::make_shared<edm::eventsetup::test::DummyProxyProvider>();
   CPPUNIT_ASSERT(pset2.id() == pset1.id());
 
   edm::ParameterSet pset3;
-  pset3.addUntrackedParameter<int>("p1", 2); 
+  pset3.addUntrackedParameter<int>("p1", 2);
   pset3.registerIt();
-  std::shared_ptr<edm::eventsetup::test::DummyProxyProvider> proxyProvider3 = std::make_shared<edm::eventsetup::test::DummyProxyProvider>();
+  std::shared_ptr<edm::eventsetup::test::DummyProxyProvider> proxyProvider3 =
+      std::make_shared<edm::eventsetup::test::DummyProxyProvider>();
   CPPUNIT_ASSERT(pset3.id() == pset1.id());
 
   edm::ParameterSet pset4;
-  pset4.addParameter<int>("p1", 1); 
+  pset4.addParameter<int>("p1", 1);
   pset4.registerIt();
-  std::shared_ptr<edm::eventsetup::test::DummyProxyProvider> proxyProvider4 = std::make_shared<edm::eventsetup::test::DummyProxyProvider>();
+  std::shared_ptr<edm::eventsetup::test::DummyProxyProvider> proxyProvider4 =
+      std::make_shared<edm::eventsetup::test::DummyProxyProvider>();
   CPPUNIT_ASSERT(pset4.id() != pset1.id());
 
   edm::eventsetup::ParameterSetIDHolder psetIDHolder1(pset1.id());
@@ -100,7 +103,8 @@ void TestEventSetupsController::esProducerGetAndPutTest() {
   CPPUNIT_ASSERT(!(psetIDHolder1 == psetIDHolder4));
   CPPUNIT_ASSERT((pset1.id() < pset4.id()) == (psetIDHolder1 < psetIDHolder4));
 
-  std::shared_ptr<edm::eventsetup::DataProxyProvider> ptrFromGet = esController.getESProducerAndRegisterProcess(pset1, 0);
+  std::shared_ptr<edm::eventsetup::DataProxyProvider> ptrFromGet =
+      esController.getESProducerAndRegisterProcess(pset1, 0);
   CPPUNIT_ASSERT(!ptrFromGet);
   esController.putESProducer(pset1, proxyProvider1, 0);
 
@@ -141,7 +145,7 @@ void TestEventSetupsController::esProducerGetAndPutTest() {
   bool isPresent2 = false;
   bool isPresent3 = false;
   bool isPresent4 = false;
-  
+
   CPPUNIT_ASSERT(esproducers.size() == 4);
   for (auto esproducer : esproducers) {
     auto const& esproducer1 = esproducer;
@@ -196,37 +200,21 @@ void TestEventSetupsController::esProducerGetAndPutTest() {
   bool firstProcessWithThisPSet = false;
   bool precedingHasMatchingPSet = false;
 
-  esController.lookForMatches(pset4.id(),
-                              0,
-                              0,
-                              firstProcessWithThisPSet,
-                              precedingHasMatchingPSet);
+  esController.lookForMatches(pset4.id(), 0, 0, firstProcessWithThisPSet, precedingHasMatchingPSet);
   CPPUNIT_ASSERT(firstProcessWithThisPSet == true);
   CPPUNIT_ASSERT(precedingHasMatchingPSet == false);
 
-  esController.lookForMatches(pset4.id(),
-                              4,
-                              0,
-                              firstProcessWithThisPSet,
-                              precedingHasMatchingPSet);
+  esController.lookForMatches(pset4.id(), 4, 0, firstProcessWithThisPSet, precedingHasMatchingPSet);
   CPPUNIT_ASSERT(firstProcessWithThisPSet == false);
   CPPUNIT_ASSERT(precedingHasMatchingPSet == true);
 
-  esController.lookForMatches(pset4.id(),
-                              4,
-                              1,
-                              firstProcessWithThisPSet,
-                              precedingHasMatchingPSet);
+  esController.lookForMatches(pset4.id(), 4, 1, firstProcessWithThisPSet, precedingHasMatchingPSet);
   CPPUNIT_ASSERT(firstProcessWithThisPSet == false);
   CPPUNIT_ASSERT(precedingHasMatchingPSet == false);
 
-
-  CPPUNIT_ASSERT_THROW(esController.lookForMatches(pset4.id(),
-                                                   6,
-                                                   0,
-                                                   firstProcessWithThisPSet,
-                                                   precedingHasMatchingPSet),
-                       cms::Exception);
+  CPPUNIT_ASSERT_THROW(
+      esController.lookForMatches(pset4.id(), 6, 0, firstProcessWithThisPSet, precedingHasMatchingPSet),
+      cms::Exception);
 
   CPPUNIT_ASSERT(esController.isFirstMatch(pset4.id(), 5, 0));
   CPPUNIT_ASSERT(!esController.isFirstMatch(pset4.id(), 5, 4));
@@ -255,7 +243,6 @@ void TestEventSetupsController::esProducerGetAndPutTest() {
 }
 
 void TestEventSetupsController::esSourceGetAndPutTest() {
-
   edm::eventsetup::EventSetupsController esController;
 
   edm::ParameterSet pset1;
@@ -263,25 +250,25 @@ void TestEventSetupsController::esSourceGetAndPutTest() {
   std::shared_ptr<DummyFinder> finder1 = std::make_shared<DummyFinder>();
 
   edm::ParameterSet pset2;
-  pset2.addUntrackedParameter<int>("p1", 1); 
+  pset2.addUntrackedParameter<int>("p1", 1);
   pset2.registerIt();
   std::shared_ptr<DummyFinder> finder2 = std::make_shared<DummyFinder>();
   CPPUNIT_ASSERT(pset2.id() == pset1.id());
 
   edm::ParameterSet pset3;
-  pset3.addUntrackedParameter<int>("p1", 2); 
+  pset3.addUntrackedParameter<int>("p1", 2);
   pset3.registerIt();
   std::shared_ptr<DummyFinder> finder3 = std::make_shared<DummyFinder>();
   CPPUNIT_ASSERT(pset3.id() == pset1.id());
 
   edm::ParameterSet pset4;
-  pset4.addParameter<int>("p1", 1); 
+  pset4.addParameter<int>("p1", 1);
   pset4.registerIt();
   std::shared_ptr<DummyFinder> finder4 = std::make_shared<DummyFinder>();
   CPPUNIT_ASSERT(pset4.id() != pset1.id());
 
-
-  std::shared_ptr<edm::EventSetupRecordIntervalFinder> ptrFromGet = esController.getESSourceAndRegisterProcess(pset1, 0);
+  std::shared_ptr<edm::EventSetupRecordIntervalFinder> ptrFromGet =
+      esController.getESSourceAndRegisterProcess(pset1, 0);
   CPPUNIT_ASSERT(!ptrFromGet);
   esController.putESSource(pset1, finder1, 0);
 
@@ -322,7 +309,7 @@ void TestEventSetupsController::esSourceGetAndPutTest() {
   bool isPresent2 = false;
   bool isPresent3 = false;
   bool isPresent4 = false;
-  
+
   CPPUNIT_ASSERT(essources.size() == 4);
   for (auto essource : essources) {
     auto const& essource1 = essource;
diff --git a/FWCore/Framework/test/fullchain_t.cppunit.cc b/FWCore/Framework/test/fullchain_t.cppunit.cc
index 57c80a6daee86..ffe7121a3655c 100644
--- a/FWCore/Framework/test/fullchain_t.cppunit.cc
+++ b/FWCore/Framework/test/fullchain_t.cppunit.cc
@@ -24,19 +24,19 @@ using namespace edm::eventsetup;
 using namespace edm::eventsetup::test;
 
 namespace {
-edm::ActivityRegistry activityRegistry;
+  edm::ActivityRegistry activityRegistry;
 }
 
-class testfullChain: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(testfullChain);
+class testfullChain : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testfullChain);
 
-CPPUNIT_TEST(getfromDataproxyproviderTest);
+  CPPUNIT_TEST(getfromDataproxyproviderTest);
+
+  CPPUNIT_TEST_SUITE_END();
 
-CPPUNIT_TEST_SUITE_END();
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void getfromDataproxyproviderTest();
 };
@@ -44,28 +44,27 @@ CPPUNIT_TEST_SUITE_END();
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testfullChain);
 
-void testfullChain::getfromDataproxyproviderTest()
-{
-   eventsetup::EventSetupProvider provider(&activityRegistry);
+void testfullChain::getfromDataproxyproviderTest() {
+  eventsetup::EventSetupProvider provider(&activityRegistry);
+
+  std::shared_ptr<DataProxyProvider> pProxyProv = std::make_shared<DummyProxyProvider>();
+  provider.add(pProxyProv);
+
+  std::shared_ptr<DummyFinder> pFinder = std::make_shared<DummyFinder>();
+  provider.add(std::shared_ptr<EventSetupRecordIntervalFinder>(pFinder));
+
+  const Timestamp time_1(1);
+  const IOVSyncValue sync_1(time_1);
+  pFinder->setInterval(ValidityInterval(sync_1, IOVSyncValue(Timestamp(5))));
+  for (unsigned int iTime = 1; iTime != 6; ++iTime) {
+    const Timestamp time(iTime);
+    EventSetup const eventSetup{provider.eventSetupForInstance(IOVSyncValue(time)), 0, nullptr};
+    ESHandle<DummyData> pDummy;
+    eventSetup.get<DummyRecord>().get(pDummy);
+    CPPUNIT_ASSERT(0 != pDummy.product());
 
-   std::shared_ptr<DataProxyProvider> pProxyProv = std::make_shared<DummyProxyProvider>();
-   provider.add(pProxyProv);
-   
-   std::shared_ptr<DummyFinder> pFinder = std::make_shared<DummyFinder>();
-   provider.add(std::shared_ptr<EventSetupRecordIntervalFinder>(pFinder));
+    eventSetup.getData(pDummy);
 
-   const Timestamp time_1(1);
-   const IOVSyncValue sync_1(time_1);
-   pFinder->setInterval(ValidityInterval(sync_1, IOVSyncValue(Timestamp(5))));
-   for(unsigned int iTime=1; iTime != 6; ++iTime) {
-      const Timestamp time(iTime);
-      auto const& eventSetup = provider.eventSetupForInstance(IOVSyncValue(time));
-      ESHandle<DummyData> pDummy;
-      eventSetup.get<DummyRecord>().get(pDummy);
-      CPPUNIT_ASSERT(0 != pDummy.product());
-      
-      eventSetup.getData(pDummy);
-   
-      CPPUNIT_ASSERT(0 != pDummy.product());
-   }
+    CPPUNIT_ASSERT(0 != pDummy.product());
+  }
 }
diff --git a/FWCore/Framework/test/generichandle_t.cppunit.cc b/FWCore/Framework/test/generichandle_t.cppunit.cc
index 1607bf66dcbe5..118a1ff928c35 100644
--- a/FWCore/Framework/test/generichandle_t.cppunit.cc
+++ b/FWCore/Framework/test/generichandle_t.cppunit.cc
@@ -35,22 +35,22 @@ Test of GenericHandle class.
 
 // This is a gross hack, to allow us to test the event
 namespace edm {
-   class ProducerBase {
-      public:
-         static void commitEvent(Event& e) { e.commit_(std::vector<ProductResolverIndex>()); }
-   };
-}
+  class ProducerBase {
+  public:
+    static void commitEvent(Event& e) { e.commit_(std::vector<ProductResolverIndex>()); }
+  };
+}  // namespace edm
 
 class testGenericHandle : public CppUnit::TestFixture {
-CPPUNIT_TEST_SUITE(testGenericHandle);
-CPPUNIT_TEST(failgetbyLabelTest);
-CPPUNIT_TEST(getbyLabelTest);
-CPPUNIT_TEST(failWrongType);
-CPPUNIT_TEST_SUITE_END();
+  CPPUNIT_TEST_SUITE(testGenericHandle);
+  CPPUNIT_TEST(failgetbyLabelTest);
+  CPPUNIT_TEST(getbyLabelTest);
+  CPPUNIT_TEST(failWrongType);
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){
-  }
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
   void failgetbyLabelTest();
   void failWrongType();
   void getbyLabelTest();
@@ -62,20 +62,17 @@ CPPUNIT_TEST_SUITE_END();
 CPPUNIT_TEST_SUITE_REGISTRATION(testGenericHandle);
 
 void testGenericHandle::failWrongType() {
-   try {
-      //intentionally misspelled type
-      edm::GenericHandle h("edmtest::DmmyProduct");
-      CPPUNIT_ASSERT("Failed to throw" == nullptr);
-   }
-   catch (cms::Exception& x) {
-      // nothing to do
-   }
-   catch (...) {
-      CPPUNIT_ASSERT("Threw wrong kind of exception" == nullptr);
-   }
+  try {
+    //intentionally misspelled type
+    edm::GenericHandle h("edmtest::DmmyProduct");
+    CPPUNIT_ASSERT("Failed to throw" == nullptr);
+  } catch (cms::Exception& x) {
+    // nothing to do
+  } catch (...) {
+    CPPUNIT_ASSERT("Threw wrong kind of exception" == nullptr);
+  }
 }
 void testGenericHandle::failgetbyLabelTest() {
-
   edm::EventID id = edm::EventID::firstValidEvent();
   edm::Timestamp time;
   std::string uuid = edm::createGlobalIdentifier();
@@ -83,45 +80,42 @@ void testGenericHandle::failgetbyLabelTest() {
   auto preg = std::make_shared<edm::ProductRegistry>();
   preg->setFrozen();
   auto runAux = std::make_shared<edm::RunAuxiliary>(id.run(), time, time);
-  auto rp = std::make_shared<edm::RunPrincipal>(runAux, preg, pc, &historyAppender_,0);
-  auto lbp = std::make_shared<edm::LuminosityBlockPrincipal>(preg, pc, &historyAppender_,0);
+  auto rp = std::make_shared<edm::RunPrincipal>(runAux, preg, pc, &historyAppender_, 0);
+  auto lbp = std::make_shared<edm::LuminosityBlockPrincipal>(preg, pc, &historyAppender_, 0);
   lbp->setAux(edm::LuminosityBlockAuxiliary(rp->run(), 1, time, time));
   lbp->setRunPrincipal(rp);
   auto branchIDListHelper = std::make_shared<edm::BranchIDListHelper>();
   branchIDListHelper->updateFromRegistry(*preg);
   auto thinnedAssociationsHelper = std::make_shared<edm::ThinnedAssociationsHelper>();
   edm::EventAuxiliary eventAux(id, uuid, time, true);
-  edm::EventPrincipal ep(preg, branchIDListHelper, thinnedAssociationsHelper, pc, &historyAppender_,edm::StreamID::invalidStreamID());
-  edm::ProcessHistoryRegistry phr; 
+  edm::EventPrincipal ep(
+      preg, branchIDListHelper, thinnedAssociationsHelper, pc, &historyAppender_, edm::StreamID::invalidStreamID());
+  edm::ProcessHistoryRegistry phr;
   ep.fillEventPrincipal(eventAux, phr);
   ep.setLuminosityBlockPrincipal(lbp.get());
   edm::GenericHandle h("edmtest::DummyProduct");
-  bool didThrow=true;
+  bool didThrow = true;
   try {
-     edm::ParameterSet pset;
-     pset.registerIt();
-     edm::ModuleDescription modDesc(pset.id(), "Blah", "blahs");
-     edm::Event event(ep, modDesc, nullptr);
-
-     std::string label("this does not exist");
-     event.getByLabel(label,h);
-     *h;
-     didThrow=false;
-  }
-  catch (cms::Exception& x) {
+    edm::ParameterSet pset;
+    pset.registerIt();
+    edm::ModuleDescription modDesc(pset.id(), "Blah", "blahs");
+    edm::Event event(ep, modDesc, nullptr);
+
+    std::string label("this does not exist");
+    event.getByLabel(label, h);
+    *h;
+    didThrow = false;
+  } catch (cms::Exception& x) {
     // nothing to do
-  }
-  catch (std::exception& x) {
-    std::cout <<"caught std exception "<<x.what()<<std::endl;
+  } catch (std::exception& x) {
+    std::cout << "caught std exception " << x.what() << std::endl;
     CPPUNIT_ASSERT("Threw std::exception!" == nullptr);
-  }
-  catch (...) {
+  } catch (...) {
     CPPUNIT_ASSERT("Threw wrong kind of exception" == nullptr);
   }
   if (!didThrow) {
     CPPUNIT_ASSERT("Failed to throw required exception" == nullptr);
   }
-
 }
 
 void testGenericHandle::getbyLabelTest() {
@@ -154,8 +148,7 @@ void testGenericHandle::getbyLabelTest() {
                                  productInstanceName,
                                  "",
                                  pset.id(),
-                                 dummytype
-                              );
+                                 dummytype);
 
   product.init();
 
@@ -176,13 +169,14 @@ void testGenericHandle::getbyLabelTest() {
   edm::ProcessConfiguration pc("PROD", dummyProcessPset.id(), edm::getReleaseVersion(), edm::getPassID());
   std::shared_ptr<edm::ProductRegistry const> pregc(preg.release());
   auto runAux = std::make_shared<edm::RunAuxiliary>(col.run(), fakeTime, fakeTime);
-  auto rp = std::make_shared<edm::RunPrincipal>(runAux, pregc, pc, &historyAppender_,0);
-  auto lbp = std::make_shared<edm::LuminosityBlockPrincipal>(pregc, pc, &historyAppender_,0);
+  auto rp = std::make_shared<edm::RunPrincipal>(runAux, pregc, pc, &historyAppender_, 0);
+  auto lbp = std::make_shared<edm::LuminosityBlockPrincipal>(pregc, pc, &historyAppender_, 0);
   lbp->setAux(edm::LuminosityBlockAuxiliary(rp->run(), 1, fakeTime, fakeTime));
   lbp->setRunPrincipal(rp);
   edm::EventAuxiliary eventAux(col, uuid, fakeTime, true);
-  edm::EventPrincipal ep(pregc, branchIDListHelper, thinnedAssociationsHelper, pc, &historyAppender_,edm::StreamID::invalidStreamID());
-  edm::ProcessHistoryRegistry phr; 
+  edm::EventPrincipal ep(
+      pregc, branchIDListHelper, thinnedAssociationsHelper, pc, &historyAppender_, edm::StreamID::invalidStreamID());
+  edm::ProcessHistoryRegistry phr;
   ep.fillEventPrincipal(eventAux, phr);
   ep.setLuminosityBlockPrincipal(lbp.get());
   edm::BranchDescription const& branchFromRegistry = it->second;
@@ -200,20 +194,18 @@ void testGenericHandle::getbyLabelTest() {
 
     edm::ParameterSet pset;
     pset.registerIt();
-    edm::ModuleDescription modDesc(pset.id(), "Blah", "blahs", processConfiguration.get(),edm::ModuleDescription::getUniqueID());
+    edm::ModuleDescription modDesc(
+        pset.id(), "Blah", "blahs", processConfiguration.get(), edm::ModuleDescription::getUniqueID());
     edm::Event event(ep, modDesc, nullptr);
 
-    event.getByLabel(label, productInstanceName,h);
-  }
-  catch (cms::Exception& x) {
-    std::cerr << x.explainSelf()<< std::endl;
+    event.getByLabel(label, productInstanceName, h);
+  } catch (cms::Exception& x) {
+    std::cerr << x.explainSelf() << std::endl;
     CPPUNIT_ASSERT("Threw cms::Exception unexpectedly" == nullptr);
-  }
-  catch(std::exception& x){
-     std::cerr <<x.what()<<std::endl;
-     CPPUNIT_ASSERT("threw std::exception" == nullptr);
-  }
-  catch (...) {
+  } catch (std::exception& x) {
+    std::cerr << x.what() << std::endl;
+    CPPUNIT_ASSERT("threw std::exception" == nullptr);
+  } catch (...) {
     std::cerr << "Unknown exception type\n";
     CPPUNIT_ASSERT("Threw exception unexpectedly" == nullptr);
   }
diff --git a/FWCore/Framework/test/global_module_t.cppunit.cc b/FWCore/Framework/test/global_module_t.cppunit.cc
index c97eea5e024b0..eabcb3118075c 100644
--- a/FWCore/Framework/test/global_module_t.cppunit.cc
+++ b/FWCore/Framework/test/global_module_t.cppunit.cc
@@ -25,15 +25,13 @@
 #include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"
 #include "FWCore/Utilities/interface/GlobalIdentifier.h"
 
-
 #include "FWCore/Utilities/interface/Exception.h"
 
 #include "cppunit/extensions/HelperMacros.h"
 
-class testGlobalModule: public CppUnit::TestFixture 
-{
+class testGlobalModule : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testGlobalModule);
-  
+
   CPPUNIT_TEST(basicTest);
   CPPUNIT_TEST(streamTest);
   CPPUNIT_TEST(runTest);
@@ -46,13 +44,14 @@ class testGlobalModule: public CppUnit::TestFixture
   CPPUNIT_TEST(endLumiProdTest);
   CPPUNIT_TEST(endRunSummaryProdTest);
   CPPUNIT_TEST(endLumiSummaryProdTest);
-  
+
   CPPUNIT_TEST_SUITE_END();
+
 public:
   testGlobalModule();
-  
-  void setUp(){}
-  void tearDown(){}
+
+  void setUp() {}
+  void tearDown() {}
 
   void basicTest();
   void streamTest();
@@ -86,10 +85,8 @@ class testGlobalModule: public CppUnit::TestFixture
   typedef std::vector<Trans> Expectations;
 
 private:
+  std::map<Trans, std::function<void(edm::Worker*)>> m_transToFunc;
 
-  
-  std::map<Trans,std::function<void(edm::Worker*)>> m_transToFunc;
-  
   edm::ProcessConfiguration m_procConfig;
   edm::PreallocationConfiguration m_preallocConfig;
   std::shared_ptr<edm::ProductRegistry> m_prodReg;
@@ -99,122 +96,105 @@ class testGlobalModule: public CppUnit::TestFixture
   edm::HistoryAppender historyAppender_;
   std::shared_ptr<edm::LuminosityBlockPrincipal> m_lbp;
   std::shared_ptr<edm::RunPrincipal> m_rp;
-  std::shared_ptr<edm::ActivityRegistry> m_actReg; // We do not use propagate_const because the registry itself is mutable.
+  std::shared_ptr<edm::ActivityRegistry>
+      m_actReg;  // We do not use propagate_const because the registry itself is mutable.
   edm::EventSetupImpl* m_es = nullptr;
-  edm::ModuleDescription m_desc = {"Dummy","dummy"};
-  
-  template<typename T>
+  edm::ModuleDescription m_desc = {"Dummy", "dummy"};
+
+  template <typename T>
   void testTransitions(std::shared_ptr<T> iMod, Expectations const& iExpect);
-  
+
   class BasicProd : public edm::global::EDProducer<> {
   public:
-    mutable unsigned int m_count = 0; //[[cms-thread-safe]]
-    
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
+    mutable unsigned int m_count = 0;  //[[cms-thread-safe]]
+
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
   };
   class StreamProd : public edm::global::EDProducer<edm::StreamCache<int>> {
   public:
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
+
     std::unique_ptr<int> beginStream(edm::StreamID) const override {
       ++m_count;
       return std::unique_ptr<int>{};
     }
-    
-    virtual void streamBeginRun(edm::StreamID, edm::Run const&, edm::EventSetup const&) const  override{
-      ++m_count;
-    }
-    virtual void streamBeginLuminosityBlock(edm::StreamID, edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    virtual void streamEndLuminosityBlock(edm::StreamID, edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    virtual void streamEndRun(edm::StreamID, edm::Run const&, edm::EventSetup const&) const override {
+
+    virtual void streamBeginRun(edm::StreamID, edm::Run const&, edm::EventSetup const&) const override { ++m_count; }
+    virtual void streamBeginLuminosityBlock(edm::StreamID,
+                                            edm::LuminosityBlock const&,
+                                            edm::EventSetup const&) const override {
       ++m_count;
     }
-    void endStream(edm::StreamID) const override {
+    virtual void streamEndLuminosityBlock(edm::StreamID,
+                                          edm::LuminosityBlock const&,
+                                          edm::EventSetup const&) const override {
       ++m_count;
     }
+    virtual void streamEndRun(edm::StreamID, edm::Run const&, edm::EventSetup const&) const override { ++m_count; }
+    void endStream(edm::StreamID) const override { ++m_count; }
   };
-  
+
   class RunProd : public edm::global::EDProducer<edm::RunCache<int>> {
   public:
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
+
     std::shared_ptr<int> globalBeginRun(edm::Run const&, edm::EventSetup const&) const override {
       ++m_count;
       return std::shared_ptr<int>{};
     }
 
-    void globalEndRun(edm::Run const&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
+    void globalEndRun(edm::Run const&, edm::EventSetup const&) const override { ++m_count; }
   };
 
-
   class LumiProd : public edm::global::EDProducer<edm::LuminosityBlockCache<int>> {
   public:
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    
-    std::shared_ptr<int> globalBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const override {
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
+
+    std::shared_ptr<int> globalBeginLuminosityBlock(edm::LuminosityBlock const&,
+                                                    edm::EventSetup const&) const override {
       ++m_count;
       return std::shared_ptr<int>{};
     }
-    
-    void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
+
+    void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const override { ++m_count; }
   };
-  
+
   class RunSummaryProd : public edm::global::EDProducer<edm::RunSummaryCache<int>> {
   public:
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
+
     std::shared_ptr<int> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&) const override {
       ++m_count;
       return std::shared_ptr<int>{};
     }
-    
-    void streamEndRunSummary(edm::StreamID, edm::Run const&, edm::EventSetup const&, int*) const override {
-      ++m_count;
-    }
-    
-    void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, int*) const override {
-      ++m_count;
-    }
+
+    void streamEndRunSummary(edm::StreamID, edm::Run const&, edm::EventSetup const&, int*) const override { ++m_count; }
+
+    void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, int*) const override { ++m_count; }
   };
 
   class LumiSummaryProd : public edm::global::EDProducer<edm::LuminosityBlockSummaryCache<int>> {
   public:
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    
-    std::shared_ptr<int> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&) const override {
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
+
+    std::shared_ptr<int> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                           edm::EventSetup const&) const override {
       ++m_count;
       return std::shared_ptr<int>{};
     }
-    
-    void streamEndLuminosityBlockSummary(edm::StreamID, edm::LuminosityBlock const&, edm::EventSetup const&, int*) const override {
+
+    void streamEndLuminosityBlockSummary(edm::StreamID,
+                                         edm::LuminosityBlock const&,
+                                         edm::EventSetup const&,
+                                         int*) const override {
       ++m_count;
     }
-    
+
     void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, int*) const override {
       ++m_count;
     }
@@ -223,93 +203,71 @@ class testGlobalModule: public CppUnit::TestFixture
   class BeginRunProd : public edm::global::EDProducer<edm::BeginRunProducer> {
   public:
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
 
-    void globalBeginRunProduce(edm::Run&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
+    void globalBeginRunProduce(edm::Run&, edm::EventSetup const&) const override { ++m_count; }
   };
 
   class BeginLumiProd : public edm::global::EDProducer<edm::BeginLuminosityBlockProducer> {
   public:
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    
-    void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
+
+    void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override { ++m_count; }
   };
 
   class EndRunProd : public edm::global::EDProducer<edm::EndRunProducer> {
   public:
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    
-    void globalEndRunProduce(edm::Run&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
+
+    void globalEndRunProduce(edm::Run&, edm::EventSetup const&) const override { ++m_count; }
   };
-  
+
   class EndLumiProd : public edm::global::EDProducer<edm::EndLuminosityBlockProducer> {
   public:
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    
-    void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-  };
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
 
+    void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override { ++m_count; }
+  };
 
   class EndRunSummaryProd : public edm::global::EDProducer<edm::EndRunProducer, edm::RunSummaryCache<int>> {
   public:
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
+
     std::shared_ptr<int> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&) const override {
       ++m_count;
       return std::shared_ptr<int>{};
     }
-    
-    void streamEndRunSummary(edm::StreamID, edm::Run const&, edm::EventSetup const&, int*) const override {
-      ++m_count;
-    }
-    
-    void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, int*) const override {
-      ++m_count;
-    }
 
-    void globalEndRunProduce(edm::Run&, edm::EventSetup const&, int const*) const override {
-      ++m_count;
-    }
+    void streamEndRunSummary(edm::StreamID, edm::Run const&, edm::EventSetup const&, int*) const override { ++m_count; }
+
+    void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, int*) const override { ++m_count; }
+
+    void globalEndRunProduce(edm::Run&, edm::EventSetup const&, int const*) const override { ++m_count; }
   };
-  
-  class EndLumiSummaryProd : public edm::global::EDProducer<edm::EndLuminosityBlockProducer, edm::LuminosityBlockSummaryCache<int>> {
+
+  class EndLumiSummaryProd
+      : public edm::global::EDProducer<edm::EndLuminosityBlockProducer, edm::LuminosityBlockSummaryCache<int>> {
   public:
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
 
-    std::shared_ptr<int> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&) const override {
+    std::shared_ptr<int> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                           edm::EventSetup const&) const override {
       ++m_count;
       return std::shared_ptr<int>{};
     }
-    
-    void streamEndLuminosityBlockSummary(edm::StreamID, edm::LuminosityBlock const&, edm::EventSetup const&, int*) const override {
+
+    void streamEndLuminosityBlockSummary(edm::StreamID,
+                                         edm::LuminosityBlock const&,
+                                         edm::EventSetup const&,
+                                         int*) const override {
       ++m_count;
     }
-    
+
     void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, int*) const override {
       ++m_count;
     }
@@ -322,16 +280,16 @@ class testGlobalModule: public CppUnit::TestFixture
 
 namespace {
   struct ShadowStreamID {
-    constexpr ShadowStreamID():value(0){}
+    constexpr ShadowStreamID() : value(0) {}
     unsigned int value;
   };
-  
+
   union IDUnion {
-    IDUnion(): m_shadow() {}
+    IDUnion() : m_shadow() {}
     ShadowStreamID m_shadow;
     edm::StreamID m_id;
   };
-}
+}  // namespace
 static edm::StreamID makeID() {
   IDUnion u;
   assert(u.m_id.value() == 0);
@@ -339,221 +297,229 @@ static edm::StreamID makeID() {
 }
 static const edm::StreamID s_streamID0 = makeID();
 
-
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testGlobalModule);
 
-testGlobalModule::testGlobalModule():
-m_preallocConfig{},
-m_prodReg(new edm::ProductRegistry{}),
-m_idHelper(new edm::BranchIDListHelper{}),
-m_associationsHelper(new edm::ThinnedAssociationsHelper{}),
-m_ep()
-{
+testGlobalModule::testGlobalModule()
+    : m_preallocConfig{},
+      m_prodReg(new edm::ProductRegistry{}),
+      m_idHelper(new edm::BranchIDListHelper{}),
+      m_associationsHelper(new edm::ThinnedAssociationsHelper{}),
+      m_ep() {
   //Setup the principals
   m_prodReg->setFrozen();
   m_idHelper->updateFromRegistry(*m_prodReg);
   edm::EventID eventID = edm::EventID::firstValidEvent();
-  
+
   std::string uuid = edm::createGlobalIdentifier();
   edm::Timestamp now(1234567UL);
   auto runAux = std::make_shared<edm::RunAuxiliary>(eventID.run(), now, now);
-  m_rp.reset(new edm::RunPrincipal(runAux, m_prodReg, m_procConfig, &historyAppender_,0));
+  m_rp.reset(new edm::RunPrincipal(runAux, m_prodReg, m_procConfig, &historyAppender_, 0));
   auto lumiAux = std::make_shared<edm::LuminosityBlockAuxiliary>(m_rp->run(), 1, now, now);
-  m_lbp.reset(new edm::LuminosityBlockPrincipal(m_prodReg, m_procConfig, &historyAppender_,0));
+  m_lbp.reset(new edm::LuminosityBlockPrincipal(m_prodReg, m_procConfig, &historyAppender_, 0));
   m_lbp->setAux(*lumiAux);
   m_lbp->setRunPrincipal(m_rp);
   edm::EventAuxiliary eventAux(eventID, uuid, now, true);
 
-  m_ep.reset(new edm::EventPrincipal(m_prodReg,
-                                     m_idHelper,
-                                     m_associationsHelper,
-                                     m_procConfig,nullptr));
+  m_ep.reset(new edm::EventPrincipal(m_prodReg, m_idHelper, m_associationsHelper, m_procConfig, nullptr));
   edm::ProcessHistoryRegistry phr;
   m_ep->fillEventPrincipal(eventAux, phr);
   m_ep->setLuminosityBlockPrincipal(m_lbp.get());
   m_actReg.reset(new edm::ActivityRegistry);
 
-
   //For each transition, bind a lambda which will call the proper method of the Worker
   m_transToFunc[Trans::kBeginStream] = [](edm::Worker* iBase) {
     edm::StreamContext streamContext(s_streamID0, nullptr);
-    iBase->beginStream(s_streamID0, streamContext); };
+    iBase->beginStream(s_streamID0, streamContext);
+  };
 
-  
   m_transToFunc[Trans::kGlobalBeginRun] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::RunPrincipal, edm::BranchActionGlobalBegin> Traits;
     edm::ParentContext nullParentContext;
-    iBase->doWork<Traits>(*m_rp,*m_es, s_streamID0, nullParentContext, nullptr); };
+    iBase->doWork<Traits>(*m_rp, *m_es, s_streamID0, nullParentContext, nullptr);
+  };
   m_transToFunc[Trans::kStreamBeginRun] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::RunPrincipal, edm::BranchActionStreamBegin> Traits;
     edm::ParentContext nullParentContext;
-    iBase->doWork<Traits>(*m_rp,*m_es, s_streamID0, nullParentContext, nullptr); };
-  
+    iBase->doWork<Traits>(*m_rp, *m_es, s_streamID0, nullParentContext, nullptr);
+  };
+
   m_transToFunc[Trans::kGlobalBeginLuminosityBlock] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::LuminosityBlockPrincipal, edm::BranchActionGlobalBegin> Traits;
     edm::ParentContext nullParentContext;
-    iBase->doWork<Traits>(*m_lbp,*m_es, s_streamID0, nullParentContext, nullptr); };
+    iBase->doWork<Traits>(*m_lbp, *m_es, s_streamID0, nullParentContext, nullptr);
+  };
   m_transToFunc[Trans::kStreamBeginLuminosityBlock] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::LuminosityBlockPrincipal, edm::BranchActionStreamBegin> Traits;
     edm::ParentContext nullParentContext;
-    iBase->doWork<Traits>(*m_lbp,*m_es, s_streamID0, nullParentContext, nullptr); };
-  
+    iBase->doWork<Traits>(*m_lbp, *m_es, s_streamID0, nullParentContext, nullptr);
+  };
+
   m_transToFunc[Trans::kEvent] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::EventPrincipal, edm::BranchActionStreamBegin> Traits;
     edm::StreamContext streamContext(s_streamID0, nullptr);
     edm::ParentContext nullParentContext(&streamContext);
     iBase->setActivityRegistry(m_actReg);
-    iBase->doWork<Traits>(*m_ep,*m_es, s_streamID0, nullParentContext, nullptr); };
+    iBase->doWork<Traits>(*m_ep, *m_es, s_streamID0, nullParentContext, nullptr);
+  };
 
   m_transToFunc[Trans::kStreamEndLuminosityBlock] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::LuminosityBlockPrincipal, edm::BranchActionStreamEnd> Traits;
     edm::ParentContext nullParentContext;
-    iBase->doWork<Traits>(*m_lbp,*m_es, s_streamID0, nullParentContext, nullptr); };
+    iBase->doWork<Traits>(*m_lbp, *m_es, s_streamID0, nullParentContext, nullptr);
+  };
   m_transToFunc[Trans::kGlobalEndLuminosityBlock] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::LuminosityBlockPrincipal, edm::BranchActionGlobalEnd> Traits;
     edm::ParentContext nullParentContext;
-    iBase->doWork<Traits>(*m_lbp,*m_es, s_streamID0, nullParentContext, nullptr); };
+    iBase->doWork<Traits>(*m_lbp, *m_es, s_streamID0, nullParentContext, nullptr);
+  };
 
   m_transToFunc[Trans::kStreamEndRun] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::RunPrincipal, edm::BranchActionStreamEnd> Traits;
     edm::ParentContext nullParentContext;
-    iBase->doWork<Traits>(*m_rp,*m_es, s_streamID0, nullParentContext, nullptr); };
+    iBase->doWork<Traits>(*m_rp, *m_es, s_streamID0, nullParentContext, nullptr);
+  };
   m_transToFunc[Trans::kGlobalEndRun] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::RunPrincipal, edm::BranchActionGlobalEnd> Traits;
     edm::ParentContext nullParentContext;
-    iBase->doWork<Traits>(*m_rp,*m_es, s_streamID0, nullParentContext, nullptr); };
+    iBase->doWork<Traits>(*m_rp, *m_es, s_streamID0, nullParentContext, nullptr);
+  };
 
   m_transToFunc[Trans::kEndStream] = [](edm::Worker* iBase) {
     edm::StreamContext streamContext(s_streamID0, nullptr);
-    iBase->endStream(s_streamID0, streamContext); };
-
+    iBase->endStream(s_streamID0, streamContext);
+  };
 }
 
-
 namespace {
-  template<typename T>
-  void
-  testTransition(std::shared_ptr<T> iMod, edm::Worker* iWorker, testGlobalModule::Trans iTrans, testGlobalModule::Expectations const& iExpect, std::function<void(edm::Worker*)> iFunc) {
-    assert(0==iMod->m_count);
+  template <typename T>
+  void testTransition(std::shared_ptr<T> iMod,
+                      edm::Worker* iWorker,
+                      testGlobalModule::Trans iTrans,
+                      testGlobalModule::Expectations const& iExpect,
+                      std::function<void(edm::Worker*)> iFunc) {
+    assert(0 == iMod->m_count);
     iFunc(iWorker);
-    auto count = std::count(iExpect.begin(),iExpect.end(),iTrans);
-    if(count != iMod->m_count) {
-      std::cout<<"For trans " <<static_cast<std::underlying_type<testGlobalModule::Trans>::type >(iTrans)<< " expected "<<count<<" and got "<<iMod->m_count<<std::endl;
+    auto count = std::count(iExpect.begin(), iExpect.end(), iTrans);
+    if (count != iMod->m_count) {
+      std::cout << "For trans " << static_cast<std::underlying_type<testGlobalModule::Trans>::type>(iTrans)
+                << " expected " << count << " and got " << iMod->m_count << std::endl;
     }
     CPPUNIT_ASSERT(iMod->m_count == count);
     iMod->m_count = 0;
     iWorker->reset();
   }
-}
+}  // namespace
 
-template<typename T>
-void
-testGlobalModule::testTransitions(std::shared_ptr<T> iMod, Expectations const& iExpect) {
-  edm::maker::ModuleHolderT<edm::global::EDProducerBase> h(iMod,nullptr);
+template <typename T>
+void testGlobalModule::testTransitions(std::shared_ptr<T> iMod, Expectations const& iExpect) {
+  edm::maker::ModuleHolderT<edm::global::EDProducerBase> h(iMod, nullptr);
   h.preallocate(edm::PreallocationConfiguration{});
 
-  edm::WorkerT<edm::global::EDProducerBase> w{iMod,m_desc,nullptr};
-  for(auto& keyVal: m_transToFunc) {
-    testTransition(iMod,&w,keyVal.first,iExpect,keyVal.second);
+  edm::WorkerT<edm::global::EDProducerBase> w{iMod, m_desc, nullptr};
+  for (auto& keyVal : m_transToFunc) {
+    testTransition(iMod, &w, keyVal.first, iExpect, keyVal.second);
   }
 }
 
-
-void testGlobalModule::basicTest()
-{
+void testGlobalModule::basicTest() {
   auto testProd = std::make_shared<BasicProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
   testTransitions(testProd, {Trans::kEvent});
 }
 
-void testGlobalModule::streamTest()
-{
+void testGlobalModule::streamTest() {
   auto testProd = std::make_shared<StreamProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kBeginStream, Trans::kStreamBeginRun, Trans::kStreamBeginLuminosityBlock, Trans::kEvent,
-    Trans::kStreamEndLuminosityBlock,Trans::kStreamEndRun,Trans::kEndStream});
+  testTransitions(testProd,
+                  {Trans::kBeginStream,
+                   Trans::kStreamBeginRun,
+                   Trans::kStreamBeginLuminosityBlock,
+                   Trans::kEvent,
+                   Trans::kStreamEndLuminosityBlock,
+                   Trans::kStreamEndRun,
+                   Trans::kEndStream});
 }
 
-void testGlobalModule::runTest()
-{
+void testGlobalModule::runTest() {
   auto testProd = std::make_shared<RunProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
   testTransitions(testProd, {Trans::kGlobalBeginRun, Trans::kEvent, Trans::kGlobalEndRun});
 }
 
-void testGlobalModule::runSummaryTest()
-{
+void testGlobalModule::runSummaryTest() {
   auto testProd = std::make_shared<RunSummaryProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
   testTransitions(testProd, {Trans::kGlobalBeginRun, Trans::kEvent, Trans::kStreamEndRun, Trans::kGlobalEndRun});
 }
 
-void testGlobalModule::lumiTest()
-{
+void testGlobalModule::lumiTest() {
   auto testProd = std::make_shared<LumiProd>();
 
   CPPUNIT_ASSERT(0 == testProd->m_count);
   testTransitions(testProd, {Trans::kGlobalBeginLuminosityBlock, Trans::kEvent, Trans::kGlobalEndLuminosityBlock});
 }
 
-void testGlobalModule::lumiSummaryTest()
-{
+void testGlobalModule::lumiSummaryTest() {
   auto testProd = std::make_shared<LumiSummaryProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kGlobalBeginLuminosityBlock, Trans::kEvent, Trans::kStreamEndLuminosityBlock, Trans::kGlobalEndLuminosityBlock});
+  testTransitions(testProd,
+                  {Trans::kGlobalBeginLuminosityBlock,
+                   Trans::kEvent,
+                   Trans::kStreamEndLuminosityBlock,
+                   Trans::kGlobalEndLuminosityBlock});
 }
 
-void testGlobalModule::beginRunProdTest()
-{
+void testGlobalModule::beginRunProdTest() {
   auto testProd = std::make_shared<BeginRunProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
   testTransitions(testProd, {Trans::kGlobalBeginRun, Trans::kEvent});
 }
 
-void testGlobalModule::beginLumiProdTest()
-{
+void testGlobalModule::beginLumiProdTest() {
   auto testProd = std::make_shared<BeginLumiProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
   testTransitions(testProd, {Trans::kGlobalBeginLuminosityBlock, Trans::kEvent});
 }
 
-void testGlobalModule::endRunProdTest()
-{
+void testGlobalModule::endRunProdTest() {
   auto testProd = std::make_shared<EndRunProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
   testTransitions(testProd, {Trans::kGlobalEndRun, Trans::kEvent});
 }
 
-void testGlobalModule::endLumiProdTest()
-{
+void testGlobalModule::endLumiProdTest() {
   auto testProd = std::make_shared<EndLumiProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
   testTransitions(testProd, {Trans::kGlobalEndLuminosityBlock, Trans::kEvent});
 }
 
-void testGlobalModule::endRunSummaryProdTest()
-{
+void testGlobalModule::endRunSummaryProdTest() {
   auto testProd = std::make_shared<EndRunSummaryProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kGlobalEndRun, Trans::kEvent, Trans::kGlobalBeginRun, Trans::kStreamEndRun, Trans::kGlobalEndRun});
+  testTransitions(
+      testProd,
+      {Trans::kGlobalEndRun, Trans::kEvent, Trans::kGlobalBeginRun, Trans::kStreamEndRun, Trans::kGlobalEndRun});
 }
 
-void testGlobalModule::endLumiSummaryProdTest()
-{
+void testGlobalModule::endLumiSummaryProdTest() {
   auto testProd = std::make_shared<EndLumiSummaryProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kGlobalEndLuminosityBlock, Trans::kEvent, Trans::kGlobalBeginLuminosityBlock, Trans::kStreamEndLuminosityBlock, Trans::kGlobalEndLuminosityBlock}); 
+  testTransitions(testProd,
+                  {Trans::kGlobalEndLuminosityBlock,
+                   Trans::kEvent,
+                   Trans::kGlobalBeginLuminosityBlock,
+                   Trans::kStreamEndLuminosityBlock,
+                   Trans::kGlobalEndLuminosityBlock});
 }
-
diff --git a/FWCore/Framework/test/global_outputmodule_t.cppunit.cc b/FWCore/Framework/test/global_outputmodule_t.cppunit.cc
index 69d340db05e8c..76fcb750afc7e 100644
--- a/FWCore/Framework/test/global_outputmodule_t.cppunit.cc
+++ b/FWCore/Framework/test/global_outputmodule_t.cppunit.cc
@@ -27,7 +27,6 @@
 #include "FWCore/Framework/src/PreallocationConfiguration.h"
 #include "FWCore/Concurrency/interface/WaitingTaskHolder.h"
 
-
 #include "FWCore/Utilities/interface/Exception.h"
 
 #include "cppunit/extensions/HelperMacros.h"
@@ -36,19 +35,19 @@ namespace edm {
   class ModuleCallingContext;
 }
 
-class testGlobalOutputModule: public CppUnit::TestFixture 
-{
+class testGlobalOutputModule : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testGlobalOutputModule);
-  
+
   CPPUNIT_TEST(basicTest);
   CPPUNIT_TEST(fileTest);
-  
+
   CPPUNIT_TEST_SUITE_END();
+
 public:
   testGlobalOutputModule();
-  
-  void setUp(){}
-  void tearDown(){}
+
+  void setUp() {}
+  void tearDown() {}
 
   void basicTest();
   void fileTest();
@@ -65,13 +64,12 @@ class testGlobalOutputModule: public CppUnit::TestFixture
     kGlobalCloseInputFile,
     kEndJob
   };
-  
+
   typedef std::vector<Trans> Expectations;
 
 private:
+  std::map<Trans, std::function<void(edm::Worker*, edm::OutputModuleCommunicator*)>> m_transToFunc;
 
-  std::map<Trans,std::function<void(edm::Worker*,edm::OutputModuleCommunicator*)>> m_transToFunc;
-  
   edm::ProcessConfiguration m_procConfig;
   edm::PreallocationConfiguration m_preallocConfig;
   std::shared_ptr<edm::ProductRegistry> m_prodReg;
@@ -81,61 +79,46 @@ class testGlobalOutputModule: public CppUnit::TestFixture
   edm::HistoryAppender historyAppender_;
   std::shared_ptr<edm::LuminosityBlockPrincipal> m_lbp;
   std::shared_ptr<edm::RunPrincipal> m_rp;
-  std::shared_ptr<edm::ActivityRegistry> m_actReg; // We do not use propagate_const because the registry itself is mutable.
+  std::shared_ptr<edm::ActivityRegistry>
+      m_actReg;  // We do not use propagate_const because the registry itself is mutable.
   edm::EventSetupImpl* m_es = nullptr;
-  edm::ModuleDescription m_desc = {"Dummy","dummy"};
+  edm::ModuleDescription m_desc = {"Dummy", "dummy"};
   edm::WorkerParams m_params;
-  
+
   typedef edm::service::TriggerNamesService TNS;
   typedef edm::serviceregistry::ServiceWrapper<TNS> w_TNS;
   std::shared_ptr<w_TNS> tnsptr_;
   edm::ServiceToken serviceToken_;
-  
-  template<typename T>
+
+  template <typename T>
   void testTransitions(std::shared_ptr<T> iMod, Expectations const& iExpect);
-  
+
   class BasicOutputModule : public edm::global::OutputModule<> {
   public:
     using edm::global::OutputModuleBase::doPreallocate;
-    BasicOutputModule(edm::ParameterSet const& iPSet): edm::global::OutputModuleBase(iPSet),edm::global::OutputModule<>(iPSet){}
+    BasicOutputModule(edm::ParameterSet const& iPSet)
+        : edm::global::OutputModuleBase(iPSet), edm::global::OutputModule<>(iPSet) {}
     unsigned int m_count = 0;
-    
-    void write(edm::EventForOutput const&) override {
-      ++m_count;
-    }
-    void writeRun(edm::RunForOutput const&) override {
-      ++m_count;
-    }
-    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override {
-      ++m_count;
-    }
 
+    void write(edm::EventForOutput const&) override { ++m_count; }
+    void writeRun(edm::RunForOutput const&) override { ++m_count; }
+    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override { ++m_count; }
   };
-  
+
   class FileOutputModule : public edm::global::OutputModule<edm::WatchInputFiles> {
   public:
     using edm::global::OutputModuleBase::doPreallocate;
-    FileOutputModule(edm::ParameterSet const& iPSet) : edm::global::OutputModuleBase(iPSet), edm::global::OutputModule<edm::WatchInputFiles>(iPSet) {}
+    FileOutputModule(edm::ParameterSet const& iPSet)
+        : edm::global::OutputModuleBase(iPSet), edm::global::OutputModule<edm::WatchInputFiles>(iPSet) {}
     unsigned int m_count = 0;
-    void write(edm::EventForOutput const&) override {
-      ++m_count;
-    }
-    void writeRun(edm::RunForOutput const&) override {
-      ++m_count;
-    }
-    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override {
-      ++m_count;
-    }
-    
-    void respondToOpenInputFile(edm::FileBlock const&)  override {
-      ++m_count;
-    }
-    
-    void respondToCloseInputFile(edm::FileBlock const&) override {
-      ++m_count;
-    }
+    void write(edm::EventForOutput const&) override { ++m_count; }
+    void writeRun(edm::RunForOutput const&) override { ++m_count; }
+    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override { ++m_count; }
+
+    void respondToOpenInputFile(edm::FileBlock const&) override { ++m_count; }
+
+    void respondToCloseInputFile(edm::FileBlock const&) override { ++m_count; }
   };
-  
 };
 
 namespace {
@@ -143,16 +126,16 @@ namespace {
   edm::ActivityRegistry activityRegistry;
 
   struct ShadowStreamID {
-    constexpr ShadowStreamID():value(0){}
+    constexpr ShadowStreamID() : value(0) {}
     unsigned int value;
   };
-  
+
   union IDUnion {
-    IDUnion(): m_shadow() {}
+    IDUnion() : m_shadow() {}
     ShadowStreamID m_shadow;
     edm::StreamID m_id;
   };
-}
+}  // namespace
 static edm::StreamID makeID() {
   IDUnion u;
   assert(u.m_id.value() == 0);
@@ -163,31 +146,27 @@ static const edm::StreamID s_streamID0 = makeID();
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testGlobalOutputModule);
 
-testGlobalOutputModule::testGlobalOutputModule():
-m_prodReg(new edm::ProductRegistry{}),
-m_idHelper(new edm::BranchIDListHelper{}),
-m_associationsHelper(new edm::ThinnedAssociationsHelper{}),
-m_ep()
-{
+testGlobalOutputModule::testGlobalOutputModule()
+    : m_prodReg(new edm::ProductRegistry{}),
+      m_idHelper(new edm::BranchIDListHelper{}),
+      m_associationsHelper(new edm::ThinnedAssociationsHelper{}),
+      m_ep() {
   //Setup the principals
   m_prodReg->setFrozen();
   m_idHelper->updateFromRegistry(*m_prodReg);
   edm::EventID eventID = edm::EventID::firstValidEvent();
-  
+
   std::string uuid = edm::createGlobalIdentifier();
   edm::Timestamp now(1234567UL);
   auto runAux = std::make_shared<edm::RunAuxiliary>(eventID.run(), now, now);
-  m_rp.reset(new edm::RunPrincipal(runAux, m_prodReg, m_procConfig, &historyAppender_,0));
+  m_rp.reset(new edm::RunPrincipal(runAux, m_prodReg, m_procConfig, &historyAppender_, 0));
   edm::LuminosityBlockAuxiliary lumiAux(m_rp->run(), 1, now, now);
-  m_lbp.reset(new edm::LuminosityBlockPrincipal(m_prodReg, m_procConfig, &historyAppender_,0));
+  m_lbp.reset(new edm::LuminosityBlockPrincipal(m_prodReg, m_procConfig, &historyAppender_, 0));
   m_lbp->setAux(lumiAux);
   m_lbp->setRunPrincipal(m_rp);
   edm::EventAuxiliary eventAux(eventID, uuid, now, true);
 
-  m_ep.reset(new edm::EventPrincipal(m_prodReg,
-                                     m_idHelper,
-                                     m_associationsHelper,
-                                     m_procConfig,nullptr));
+  m_ep.reset(new edm::EventPrincipal(m_prodReg, m_idHelper, m_associationsHelper, m_procConfig, nullptr));
   edm::ProcessHistoryRegistry phr;
   m_ep->fillEventPrincipal(eventAux, phr);
   m_ep->setLuminosityBlockPrincipal(m_lbp.get());
@@ -199,33 +178,35 @@ m_ep()
     iBase->respondToOpenInputFile(fb);
   };
 
-
   m_transToFunc[Trans::kGlobalBeginRun] = [this](edm::Worker* iBase, edm::OutputModuleCommunicator*) {
     typedef edm::OccurrenceTraits<edm::RunPrincipal, edm::BranchActionGlobalBegin> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_rp,*m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr); };
-  
+    iBase->doWork<Traits>(*m_rp, *m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr);
+  };
+
   m_transToFunc[Trans::kGlobalBeginLuminosityBlock] = [this](edm::Worker* iBase, edm::OutputModuleCommunicator*) {
     typedef edm::OccurrenceTraits<edm::LuminosityBlockPrincipal, edm::BranchActionGlobalBegin> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_lbp,*m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr); };
-  
+    iBase->doWork<Traits>(*m_lbp, *m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr);
+  };
+
   m_transToFunc[Trans::kEvent] = [this](edm::Worker* iBase, edm::OutputModuleCommunicator*) {
     typedef edm::OccurrenceTraits<edm::EventPrincipal, edm::BranchActionStreamBegin> Traits;
     edm::StreamContext streamContext(s_streamID0, nullptr);
     edm::ParentContext parentContext(&streamContext);
     iBase->setActivityRegistry(m_actReg);
-    iBase->doWork<Traits>(*m_ep,*m_es, s_streamID0, parentContext, nullptr); };
+    iBase->doWork<Traits>(*m_ep, *m_es, s_streamID0, parentContext, nullptr);
+  };
 
   m_transToFunc[Trans::kGlobalEndLuminosityBlock] = [this](edm::Worker* iBase, edm::OutputModuleCommunicator* iComm) {
     typedef edm::OccurrenceTraits<edm::LuminosityBlockPrincipal, edm::BranchActionGlobalEnd> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_lbp,*m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr);
+    iBase->doWork<Traits>(*m_lbp, *m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr);
     auto t = edm::make_empty_waiting_task();
     t->increment_ref_count();
     iComm->writeLumiAsync(edm::WaitingTaskHolder(t.get()), *m_lbp, nullptr, &activityRegistry);
     t->wait_for_all();
-    if(t->exceptionPtr() != nullptr) {
+    if (t->exceptionPtr() != nullptr) {
       std::rethrow_exception(*t->exceptionPtr());
     }
   };
@@ -233,97 +214,98 @@ m_ep()
   m_transToFunc[Trans::kGlobalEndRun] = [this](edm::Worker* iBase, edm::OutputModuleCommunicator* iComm) {
     typedef edm::OccurrenceTraits<edm::RunPrincipal, edm::BranchActionGlobalEnd> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_rp,*m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr);
+    iBase->doWork<Traits>(*m_rp, *m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr);
     auto t = edm::make_empty_waiting_task();
     t->increment_ref_count();
     iComm->writeRunAsync(edm::WaitingTaskHolder(t.get()), *m_rp, nullptr, &activityRegistry, nullptr);
     t->wait_for_all();
-    if(t->exceptionPtr() != nullptr) {
+    if (t->exceptionPtr() != nullptr) {
       std::rethrow_exception(*t->exceptionPtr());
     }
   };
-  
+
   m_transToFunc[Trans::kGlobalCloseInputFile] = [](edm::Worker* iBase, edm::OutputModuleCommunicator*) {
     edm::FileBlock fb;
     iBase->respondToCloseInputFile(fb);
   };
 
-
   // We want to create the TriggerNamesService because it is used in
   // the tests.  We do that here, but first we need to build a minimal
   // parameter set to pass to its constructor.  Then we build the
   // service and setup the service system.
   edm::ParameterSet proc_pset;
-  
+
   std::string processName("HLT");
   proc_pset.addParameter<std::string>("@process_name", processName);
-  
+
   std::vector<std::string> paths;
   edm::ParameterSet trigPaths;
   trigPaths.addParameter<std::vector<std::string>>("@trigger_paths", paths);
   proc_pset.addParameter<edm::ParameterSet>("@trigger_paths", trigPaths);
-  
+
   std::vector<std::string> endPaths;
   proc_pset.addParameter<std::vector<std::string>>("@end_paths", endPaths);
 
   // Now create and setup the service
   tnsptr_.reset(new w_TNS(std::make_unique<TNS>(proc_pset)));
-  
-  serviceToken_ = edm::ServiceRegistry::createContaining(tnsptr_);
-  
 
+  serviceToken_ = edm::ServiceRegistry::createContaining(tnsptr_);
 }
 
-
 namespace {
-  template<typename T>
-  void
-  testTransition(std::shared_ptr<T> iMod, edm::Worker* iWorker, edm::OutputModuleCommunicator* iComm, testGlobalOutputModule::Trans iTrans, testGlobalOutputModule::Expectations const& iExpect, std::function<void(edm::Worker*, edm::OutputModuleCommunicator*)> iFunc) {
-    assert(0==iMod->m_count);
-    iFunc(iWorker,iComm);
-    auto count = std::count(iExpect.begin(),iExpect.end(),iTrans);
-    if(count != iMod->m_count) {
-      std::cout<<"For trans " <<static_cast<std::underlying_type<testGlobalOutputModule::Trans>::type >(iTrans)<< " expected "<<count<<" and got "<<iMod->m_count<<std::endl;
+  template <typename T>
+  void testTransition(std::shared_ptr<T> iMod,
+                      edm::Worker* iWorker,
+                      edm::OutputModuleCommunicator* iComm,
+                      testGlobalOutputModule::Trans iTrans,
+                      testGlobalOutputModule::Expectations const& iExpect,
+                      std::function<void(edm::Worker*, edm::OutputModuleCommunicator*)> iFunc) {
+    assert(0 == iMod->m_count);
+    iFunc(iWorker, iComm);
+    auto count = std::count(iExpect.begin(), iExpect.end(), iTrans);
+    if (count != iMod->m_count) {
+      std::cout << "For trans " << static_cast<std::underlying_type<testGlobalOutputModule::Trans>::type>(iTrans)
+                << " expected " << count << " and got " << iMod->m_count << std::endl;
     }
     CPPUNIT_ASSERT(iMod->m_count == count);
     iMod->m_count = 0;
     iWorker->reset();
   }
-}
+}  // namespace
 
-template<typename T>
-void
-testGlobalOutputModule::testTransitions(std::shared_ptr<T> iMod, Expectations const& iExpect) {
+template <typename T>
+void testGlobalOutputModule::testTransitions(std::shared_ptr<T> iMod, Expectations const& iExpect) {
   iMod->doPreallocate(m_preallocConfig);
-  edm::WorkerT<edm::global::OutputModuleBase> w{iMod,m_desc,m_params.actions_};
+  edm::WorkerT<edm::global::OutputModuleBase> w{iMod, m_desc, m_params.actions_};
   edm::OutputModuleCommunicatorT<edm::global::OutputModuleBase> comm(iMod.get());
-  for(auto& keyVal: m_transToFunc) {
-    testTransition(iMod,&w,&comm,keyVal.first,iExpect,keyVal.second);
+  for (auto& keyVal : m_transToFunc) {
+    testTransition(iMod, &w, &comm, keyVal.first, iExpect, keyVal.second);
   }
 }
 
-
-void testGlobalOutputModule::basicTest()
-{
+void testGlobalOutputModule::basicTest() {
   //make the services available
   edm::ServiceRegistry::Operate operate(serviceToken_);
 
   edm::ParameterSet pset;
   auto testProd = std::make_shared<BasicOutputModule>(pset);
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kEvent,Trans::kGlobalEndLuminosityBlock, Trans::kGlobalEndRun});
+  testTransitions(testProd, {Trans::kEvent, Trans::kGlobalEndLuminosityBlock, Trans::kGlobalEndRun});
 }
 
-void testGlobalOutputModule::fileTest()
-{
+void testGlobalOutputModule::fileTest() {
   //make the services available
   edm::ServiceRegistry::Operate operate(serviceToken_);
-  
+
   edm::ParameterSet pset;
   auto testProd = std::make_shared<FileOutputModule>(pset);
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kGlobalOpenInputFile, Trans::kEvent, Trans::kGlobalEndLuminosityBlock, Trans::kGlobalEndRun, Trans::kGlobalCloseInputFile});
+  testTransitions(testProd,
+                  {Trans::kGlobalOpenInputFile,
+                   Trans::kEvent,
+                   Trans::kGlobalEndLuminosityBlock,
+                   Trans::kGlobalEndRun,
+                   Trans::kGlobalCloseInputFile});
 }
-
diff --git a/FWCore/Framework/test/intersectingiovrecordintervalfinder_t.cppunit.cc b/FWCore/Framework/test/intersectingiovrecordintervalfinder_t.cppunit.cc
index 58821e3e48d27..65e6153ec7bfd 100644
--- a/FWCore/Framework/test/intersectingiovrecordintervalfinder_t.cppunit.cc
+++ b/FWCore/Framework/test/intersectingiovrecordintervalfinder_t.cppunit.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Framework
 // Class  :     intersectingiovrecordintervalfinder_t_cppunit
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -20,204 +20,189 @@
 #include "cppunit/extensions/HelperMacros.h"
 using namespace edm::eventsetup;
 
-class testintersectingiovrecordintervalfinder: public CppUnit::TestFixture
-{
-   CPPUNIT_TEST_SUITE(testintersectingiovrecordintervalfinder);
-   
-   CPPUNIT_TEST(constructorTest);
-   CPPUNIT_TEST(intersectionTest);
-   
-   CPPUNIT_TEST_SUITE_END();
+class testintersectingiovrecordintervalfinder : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testintersectingiovrecordintervalfinder);
+
+  CPPUNIT_TEST(constructorTest);
+  CPPUNIT_TEST(intersectionTest);
+
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-   
-   void setUp(){}
-   void tearDown(){}
-   
-   void constructorTest();
-   void intersectionTest();
-   
-}; //Cppunit class declaration over
+  void setUp() {}
+  void tearDown() {}
+
+  void constructorTest();
+  void intersectionTest();
+
+};  //Cppunit class declaration over
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testintersectingiovrecordintervalfinder);
-namespace  {
-   class DepRecordFinder : public edm::EventSetupRecordIntervalFinder {
-   public:
-      DepRecordFinder() :edm::EventSetupRecordIntervalFinder(), interval_() {
-         this->findingRecord<DummyRecord>();
-      }
-      
-      void setInterval(const edm::ValidityInterval& iInterval) {
-         interval_ = iInterval;
-      }
-   protected:
-      virtual void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
-                                  const edm::IOVSyncValue& iTime, 
-                                  edm::ValidityInterval& iInterval) {
-         if(interval_.validFor(iTime)) {
-            iInterval = interval_;
-         } else {
-            if(interval_.last() == edm::IOVSyncValue::invalidIOVSyncValue() &&
-               interval_.first() != edm::IOVSyncValue::invalidIOVSyncValue() &&
-               interval_.first() <= iTime) {
-               iInterval = interval_;
-            }else {
-               iInterval = edm::ValidityInterval();
-            }
-         }
+namespace {
+  class DepRecordFinder : public edm::EventSetupRecordIntervalFinder {
+  public:
+    DepRecordFinder() : edm::EventSetupRecordIntervalFinder(), interval_() { this->findingRecord<DummyRecord>(); }
+
+    void setInterval(const edm::ValidityInterval& iInterval) { interval_ = iInterval; }
+
+  protected:
+    virtual void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
+                                const edm::IOVSyncValue& iTime,
+                                edm::ValidityInterval& iInterval) {
+      if (interval_.validFor(iTime)) {
+        iInterval = interval_;
+      } else {
+        if (interval_.last() == edm::IOVSyncValue::invalidIOVSyncValue() &&
+            interval_.first() != edm::IOVSyncValue::invalidIOVSyncValue() && interval_.first() <= iTime) {
+          iInterval = interval_;
+        } else {
+          iInterval = edm::ValidityInterval();
+        }
       }
-   private:
-      edm::ValidityInterval interval_;   
-   };   
-}
+    }
 
-void 
-testintersectingiovrecordintervalfinder::constructorTest()
-{
-   IntersectingIOVRecordIntervalFinder finder(DummyRecord::keyForClass());
-   CPPUNIT_ASSERT(finder.findingForRecords().size() == 1);
-   std::set<EventSetupRecordKey> s = finder.findingForRecords();
-   CPPUNIT_ASSERT(s.find(DummyRecord::keyForClass()) != s.end());
+  private:
+    edm::ValidityInterval interval_;
+  };
+}  // namespace
+
+void testintersectingiovrecordintervalfinder::constructorTest() {
+  IntersectingIOVRecordIntervalFinder finder(DummyRecord::keyForClass());
+  CPPUNIT_ASSERT(finder.findingForRecords().size() == 1);
+  std::set<EventSetupRecordKey> s = finder.findingForRecords();
+  CPPUNIT_ASSERT(s.find(DummyRecord::keyForClass()) != s.end());
 }
 
-void 
-testintersectingiovrecordintervalfinder::intersectionTest()
-{
-   const EventSetupRecordKey dummyRecordKey = DummyRecord::keyForClass();
-
-   IntersectingIOVRecordIntervalFinder intFinder(dummyRecordKey);
-   std::vector<edm::propagate_const<std::shared_ptr<edm::EventSetupRecordIntervalFinder>>> finders;
-   std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
-   {
-      const edm::EventID eID_1(1, 1, 1);
-      const edm::IOVSyncValue sync_1(eID_1);
-      const edm::EventID eID_3(1, 1, 3);
-      const edm::ValidityInterval definedInterval(sync_1, 
-                                                  edm::IOVSyncValue(eID_3));
-      finders.push_back(dummyFinder);
-      dummyFinder->setInterval(definedInterval);
-      intFinder.swapFinders(finders);
-      
-      CPPUNIT_ASSERT(definedInterval == intFinder.findIntervalFor(dummyRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 2)))); 
-   }
-
-   {
-      const edm::EventID eID_5(1, 1, 5);
-      const edm::IOVSyncValue sync_5(eID_5);
-      const edm::ValidityInterval unknownedEndInterval(sync_5 ,
-                                                       edm::IOVSyncValue::invalidIOVSyncValue());
-      dummyFinder->setInterval(unknownedEndInterval);
-   
-      CPPUNIT_ASSERT(unknownedEndInterval == intFinder.findIntervalFor(dummyRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 5))));
-   }
-   
-   {
-      finders.clear();
-      
-      const edm::EventID eID_1(1, 1, 1);
-      const edm::IOVSyncValue sync_1(eID_1);
-      const edm::EventID eID_3(1, 1, 3);
-      const edm::IOVSyncValue sync_3(eID_3);
-      const edm::EventID eID_4(1, 1, 4);
-      const edm::IOVSyncValue sync_4(eID_4);
-      const edm::EventID eID_5(1, 1, 5);
-      const edm::IOVSyncValue sync_5(eID_5);
-      const edm::ValidityInterval definedInterval(sync_1, 
-                                                  sync_4);
-      dummyFinder->setInterval(definedInterval);
-      finders.push_back(dummyFinder);
-
-      std::shared_ptr<DummyFinder> dummyFinder2 = std::make_shared<DummyFinder>();
-      dummyFinder2->setInterval(edm::ValidityInterval(sync_3, sync_5));
-      finders.push_back(dummyFinder2);
-      IntersectingIOVRecordIntervalFinder intFinder(dummyRecordKey);
-      intFinder.swapFinders(finders);
-
-      CPPUNIT_ASSERT(edm::ValidityInterval(sync_3,sync_4) ==
-                     intFinder.findIntervalFor(dummyRecordKey, sync_3));
-   }
-   
-   {
-      finders.clear();
-      const edm::EventID eID_1(1, 1, 1);
-      const edm::IOVSyncValue sync_1(eID_1);
-      const edm::EventID eID_3(1, 1, 3);
-      const edm::IOVSyncValue sync_3(eID_3);
-      const edm::EventID eID_4(1, 1, 4);
-      const edm::IOVSyncValue sync_4(eID_4);
-      const edm::EventID eID_5(1, 1, 5);
-      const edm::IOVSyncValue sync_5(eID_5);
-      const edm::ValidityInterval definedInterval(sync_1, 
-                                                  sync_4);
-      dummyFinder->setInterval(definedInterval);
-      finders.push_back(dummyFinder);
-      
-      std::shared_ptr<DummyFinder> dummyFinder2 = std::make_shared<DummyFinder>();
-      dummyFinder2->setInterval(edm::ValidityInterval::invalidInterval());
-      finders.push_back(dummyFinder2);
-      IntersectingIOVRecordIntervalFinder intFinder(dummyRecordKey);
-      intFinder.swapFinders(finders);
-      
-      CPPUNIT_ASSERT(edm::ValidityInterval::invalidInterval() ==
-                     dummyFinder2->findIntervalFor(dummyRecordKey,sync_3));
-      
-      CPPUNIT_ASSERT(edm::ValidityInterval(sync_1,edm::IOVSyncValue::invalidIOVSyncValue()) ==
-                     intFinder.findIntervalFor(dummyRecordKey, sync_3));
-   }
-   
-   {
-      finders.clear();
-      const edm::EventID eID_1(1, 1, 1);
-      const edm::IOVSyncValue sync_1(eID_1);
-      const edm::EventID eID_3(1, 1, 3);
-      const edm::IOVSyncValue sync_3(eID_3);
-      const edm::EventID eID_4(1, 1, 4);
-      const edm::IOVSyncValue sync_4(eID_4);
-      const edm::ValidityInterval definedInterval(sync_1, 
-                                                  sync_4);
-      dummyFinder->setInterval(definedInterval);
-      finders.push_back(dummyFinder);
-      
-      std::shared_ptr<DummyFinder> dummyFinder2 = std::make_shared<DummyFinder>();
-      dummyFinder2->setInterval(edm::ValidityInterval(sync_3, edm::IOVSyncValue::invalidIOVSyncValue()));
-      finders.push_back(dummyFinder2);
-      IntersectingIOVRecordIntervalFinder intFinder(dummyRecordKey);
-      intFinder.swapFinders(finders);
-      
-      CPPUNIT_ASSERT(edm::ValidityInterval(sync_3,edm::IOVSyncValue::invalidIOVSyncValue()) ==
-                     dummyFinder2->findIntervalFor(dummyRecordKey,sync_3));
-      
-      CPPUNIT_ASSERT(edm::ValidityInterval(sync_3,edm::IOVSyncValue::invalidIOVSyncValue()) ==
-                     intFinder.findIntervalFor(dummyRecordKey, sync_3));
-   }
-
-   {
-      //reverse order so invalid ending is first in list
-      finders.clear();
-      const edm::EventID eID_1(1, 1, 1);
-      const edm::IOVSyncValue sync_1(eID_1);
-      const edm::EventID eID_3(1, 1, 3);
-      const edm::IOVSyncValue sync_3(eID_3);
-      const edm::EventID eID_4(1, 1, 4);
-      const edm::IOVSyncValue sync_4(eID_4);
-      const edm::ValidityInterval definedInterval(sync_1, 
-                                                  sync_4);
-      
-      std::shared_ptr<DummyFinder> dummyFinder2 = std::make_shared<DummyFinder>();
-      dummyFinder2->setInterval(edm::ValidityInterval(sync_3, edm::IOVSyncValue::invalidIOVSyncValue()));
-      finders.push_back(dummyFinder2);
-
-      dummyFinder->setInterval(definedInterval);
-      finders.push_back(dummyFinder);
-
-      IntersectingIOVRecordIntervalFinder intFinder(dummyRecordKey);
-      intFinder.swapFinders(finders);
-      
-      CPPUNIT_ASSERT(edm::ValidityInterval(sync_3,edm::IOVSyncValue::invalidIOVSyncValue()) ==
-                     dummyFinder2->findIntervalFor(dummyRecordKey,sync_3));
-      
-      CPPUNIT_ASSERT(edm::ValidityInterval(sync_3,edm::IOVSyncValue::invalidIOVSyncValue()) ==
-                     intFinder.findIntervalFor(dummyRecordKey, sync_3));
-   }
-   
+void testintersectingiovrecordintervalfinder::intersectionTest() {
+  const EventSetupRecordKey dummyRecordKey = DummyRecord::keyForClass();
+
+  IntersectingIOVRecordIntervalFinder intFinder(dummyRecordKey);
+  std::vector<edm::propagate_const<std::shared_ptr<edm::EventSetupRecordIntervalFinder>>> finders;
+  std::shared_ptr<DummyFinder> dummyFinder = std::make_shared<DummyFinder>();
+  {
+    const edm::EventID eID_1(1, 1, 1);
+    const edm::IOVSyncValue sync_1(eID_1);
+    const edm::EventID eID_3(1, 1, 3);
+    const edm::ValidityInterval definedInterval(sync_1, edm::IOVSyncValue(eID_3));
+    finders.push_back(dummyFinder);
+    dummyFinder->setInterval(definedInterval);
+    intFinder.swapFinders(finders);
+
+    CPPUNIT_ASSERT(definedInterval ==
+                   intFinder.findIntervalFor(dummyRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 2))));
+  }
+
+  {
+    const edm::EventID eID_5(1, 1, 5);
+    const edm::IOVSyncValue sync_5(eID_5);
+    const edm::ValidityInterval unknownedEndInterval(sync_5, edm::IOVSyncValue::invalidIOVSyncValue());
+    dummyFinder->setInterval(unknownedEndInterval);
+
+    CPPUNIT_ASSERT(unknownedEndInterval ==
+                   intFinder.findIntervalFor(dummyRecordKey, edm::IOVSyncValue(edm::EventID(1, 1, 5))));
+  }
+
+  {
+    finders.clear();
+
+    const edm::EventID eID_1(1, 1, 1);
+    const edm::IOVSyncValue sync_1(eID_1);
+    const edm::EventID eID_3(1, 1, 3);
+    const edm::IOVSyncValue sync_3(eID_3);
+    const edm::EventID eID_4(1, 1, 4);
+    const edm::IOVSyncValue sync_4(eID_4);
+    const edm::EventID eID_5(1, 1, 5);
+    const edm::IOVSyncValue sync_5(eID_5);
+    const edm::ValidityInterval definedInterval(sync_1, sync_4);
+    dummyFinder->setInterval(definedInterval);
+    finders.push_back(dummyFinder);
+
+    std::shared_ptr<DummyFinder> dummyFinder2 = std::make_shared<DummyFinder>();
+    dummyFinder2->setInterval(edm::ValidityInterval(sync_3, sync_5));
+    finders.push_back(dummyFinder2);
+    IntersectingIOVRecordIntervalFinder intFinder(dummyRecordKey);
+    intFinder.swapFinders(finders);
+
+    CPPUNIT_ASSERT(edm::ValidityInterval(sync_3, sync_4) == intFinder.findIntervalFor(dummyRecordKey, sync_3));
+  }
+
+  {
+    finders.clear();
+    const edm::EventID eID_1(1, 1, 1);
+    const edm::IOVSyncValue sync_1(eID_1);
+    const edm::EventID eID_3(1, 1, 3);
+    const edm::IOVSyncValue sync_3(eID_3);
+    const edm::EventID eID_4(1, 1, 4);
+    const edm::IOVSyncValue sync_4(eID_4);
+    const edm::EventID eID_5(1, 1, 5);
+    const edm::IOVSyncValue sync_5(eID_5);
+    const edm::ValidityInterval definedInterval(sync_1, sync_4);
+    dummyFinder->setInterval(definedInterval);
+    finders.push_back(dummyFinder);
+
+    std::shared_ptr<DummyFinder> dummyFinder2 = std::make_shared<DummyFinder>();
+    dummyFinder2->setInterval(edm::ValidityInterval::invalidInterval());
+    finders.push_back(dummyFinder2);
+    IntersectingIOVRecordIntervalFinder intFinder(dummyRecordKey);
+    intFinder.swapFinders(finders);
+
+    CPPUNIT_ASSERT(edm::ValidityInterval::invalidInterval() == dummyFinder2->findIntervalFor(dummyRecordKey, sync_3));
+
+    CPPUNIT_ASSERT(edm::ValidityInterval(sync_1, edm::IOVSyncValue::invalidIOVSyncValue()) ==
+                   intFinder.findIntervalFor(dummyRecordKey, sync_3));
+  }
+
+  {
+    finders.clear();
+    const edm::EventID eID_1(1, 1, 1);
+    const edm::IOVSyncValue sync_1(eID_1);
+    const edm::EventID eID_3(1, 1, 3);
+    const edm::IOVSyncValue sync_3(eID_3);
+    const edm::EventID eID_4(1, 1, 4);
+    const edm::IOVSyncValue sync_4(eID_4);
+    const edm::ValidityInterval definedInterval(sync_1, sync_4);
+    dummyFinder->setInterval(definedInterval);
+    finders.push_back(dummyFinder);
+
+    std::shared_ptr<DummyFinder> dummyFinder2 = std::make_shared<DummyFinder>();
+    dummyFinder2->setInterval(edm::ValidityInterval(sync_3, edm::IOVSyncValue::invalidIOVSyncValue()));
+    finders.push_back(dummyFinder2);
+    IntersectingIOVRecordIntervalFinder intFinder(dummyRecordKey);
+    intFinder.swapFinders(finders);
+
+    CPPUNIT_ASSERT(edm::ValidityInterval(sync_3, edm::IOVSyncValue::invalidIOVSyncValue()) ==
+                   dummyFinder2->findIntervalFor(dummyRecordKey, sync_3));
+
+    CPPUNIT_ASSERT(edm::ValidityInterval(sync_3, edm::IOVSyncValue::invalidIOVSyncValue()) ==
+                   intFinder.findIntervalFor(dummyRecordKey, sync_3));
+  }
+
+  {
+    //reverse order so invalid ending is first in list
+    finders.clear();
+    const edm::EventID eID_1(1, 1, 1);
+    const edm::IOVSyncValue sync_1(eID_1);
+    const edm::EventID eID_3(1, 1, 3);
+    const edm::IOVSyncValue sync_3(eID_3);
+    const edm::EventID eID_4(1, 1, 4);
+    const edm::IOVSyncValue sync_4(eID_4);
+    const edm::ValidityInterval definedInterval(sync_1, sync_4);
+
+    std::shared_ptr<DummyFinder> dummyFinder2 = std::make_shared<DummyFinder>();
+    dummyFinder2->setInterval(edm::ValidityInterval(sync_3, edm::IOVSyncValue::invalidIOVSyncValue()));
+    finders.push_back(dummyFinder2);
+
+    dummyFinder->setInterval(definedInterval);
+    finders.push_back(dummyFinder);
+
+    IntersectingIOVRecordIntervalFinder intFinder(dummyRecordKey);
+    intFinder.swapFinders(finders);
+
+    CPPUNIT_ASSERT(edm::ValidityInterval(sync_3, edm::IOVSyncValue::invalidIOVSyncValue()) ==
+                   dummyFinder2->findIntervalFor(dummyRecordKey, sync_3));
+
+    CPPUNIT_ASSERT(edm::ValidityInterval(sync_3, edm::IOVSyncValue::invalidIOVSyncValue()) ==
+                   intFinder.findIntervalFor(dummyRecordKey, sync_3));
+  }
 }
diff --git a/FWCore/Framework/test/interval_t.cppunit.cc b/FWCore/Framework/test/interval_t.cppunit.cc
index 5bf4e28125621..4e4fbd8f6a2d1 100644
--- a/FWCore/Framework/test/interval_t.cppunit.cc
+++ b/FWCore/Framework/test/interval_t.cppunit.cc
@@ -11,22 +11,22 @@
 #include "FWCore/Framework/interface/ValidityInterval.h"
 #include "cppunit/extensions/HelperMacros.h"
 
-using edm::Timestamp;
 using edm::IOVSyncValue;
+using edm::Timestamp;
 using edm::ValidityInterval;
 
-class testinterval: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(testinterval);
+class testinterval : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testinterval);
+
+  CPPUNIT_TEST(comparisonTest);
+  CPPUNIT_TEST(timestampAssignmentTest);
+  CPPUNIT_TEST(intervalAssignmentTest);
 
-CPPUNIT_TEST(comparisonTest);
-CPPUNIT_TEST(timestampAssignmentTest);
-CPPUNIT_TEST(intervalAssignmentTest);
+  CPPUNIT_TEST_SUITE_END();
 
-CPPUNIT_TEST_SUITE_END();
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void comparisonTest();
   void timestampAssignmentTest();
@@ -36,56 +36,52 @@ CPPUNIT_TEST_SUITE_END();
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testinterval);
 
+void testinterval::comparisonTest() {
+  const IOVSyncValue invalid(IOVSyncValue::invalidIOVSyncValue());
+
+  const Timestamp t_1(1);
+  const IOVSyncValue one(t_1);
+  const Timestamp t_2(2);
+  const IOVSyncValue two(t_2);
+
+  CPPUNIT_ASSERT(invalid == IOVSyncValue::invalidIOVSyncValue());
+  CPPUNIT_ASSERT(one == IOVSyncValue(t_1));
+
+  CPPUNIT_ASSERT(invalid != one);
 
-void testinterval::comparisonTest()
-{
-   const IOVSyncValue invalid(IOVSyncValue::invalidIOVSyncValue());
-   
-   const Timestamp t_1(1);
-   const IOVSyncValue one(t_1);
-   const Timestamp t_2(2);
-   const IOVSyncValue two(t_2);
-   
-   CPPUNIT_ASSERT(invalid == IOVSyncValue::invalidIOVSyncValue());
-   CPPUNIT_ASSERT(one == IOVSyncValue(t_1));
-   
-   CPPUNIT_ASSERT(invalid != one);
-
-   CPPUNIT_ASSERT(one < two);
-   CPPUNIT_ASSERT(!(one > two));
-   CPPUNIT_ASSERT(two > one);
-   CPPUNIT_ASSERT(!(two < one));
-   
-   CPPUNIT_ASSERT(one != two);
-   CPPUNIT_ASSERT(! (one == two));
-
-   CPPUNIT_ASSERT(one <= two);
-   CPPUNIT_ASSERT(one <= one);
-   CPPUNIT_ASSERT(one >= one);
-   CPPUNIT_ASSERT(!(one >= two));
+  CPPUNIT_ASSERT(one < two);
+  CPPUNIT_ASSERT(!(one > two));
+  CPPUNIT_ASSERT(two > one);
+  CPPUNIT_ASSERT(!(two < one));
+
+  CPPUNIT_ASSERT(one != two);
+  CPPUNIT_ASSERT(!(one == two));
+
+  CPPUNIT_ASSERT(one <= two);
+  CPPUNIT_ASSERT(one <= one);
+  CPPUNIT_ASSERT(one >= one);
+  CPPUNIT_ASSERT(!(one >= two));
 }
 
-void testinterval::timestampAssignmentTest()
-{
-   const Timestamp t_1(1);
-   const IOVSyncValue one(t_1);
-   
-   IOVSyncValue temp(IOVSyncValue::invalidIOVSyncValue());
-   CPPUNIT_ASSERT(temp != one);
-   temp = one;
-   CPPUNIT_ASSERT(temp == one);
+void testinterval::timestampAssignmentTest() {
+  const Timestamp t_1(1);
+  const IOVSyncValue one(t_1);
+
+  IOVSyncValue temp(IOVSyncValue::invalidIOVSyncValue());
+  CPPUNIT_ASSERT(temp != one);
+  temp = one;
+  CPPUNIT_ASSERT(temp == one);
 }
 
-void testinterval::intervalAssignmentTest()
-{
-   ValidityInterval temp;
-   const Timestamp t_1(1);
-   const IOVSyncValue s_1(t_1);
-   const ValidityInterval oneAndTwo(s_1, IOVSyncValue(Timestamp(2)));
-   
-   CPPUNIT_ASSERT(temp != oneAndTwo);
-   CPPUNIT_ASSERT(! (temp == oneAndTwo));
-   
-   temp = oneAndTwo;
-   CPPUNIT_ASSERT(temp == oneAndTwo);
+void testinterval::intervalAssignmentTest() {
+  ValidityInterval temp;
+  const Timestamp t_1(1);
+  const IOVSyncValue s_1(t_1);
+  const ValidityInterval oneAndTwo(s_1, IOVSyncValue(Timestamp(2)));
+
+  CPPUNIT_ASSERT(temp != oneAndTwo);
+  CPPUNIT_ASSERT(!(temp == oneAndTwo));
+
+  temp = oneAndTwo;
+  CPPUNIT_ASSERT(temp == oneAndTwo);
 }
diff --git a/FWCore/Framework/test/iovsyncvalue_t.cppunit.cc b/FWCore/Framework/test/iovsyncvalue_t.cppunit.cc
index 857fbb4fee537..6755b208f8275 100644
--- a/FWCore/Framework/test/iovsyncvalue_t.cppunit.cc
+++ b/FWCore/Framework/test/iovsyncvalue_t.cppunit.cc
@@ -13,171 +13,160 @@
 
 using namespace edm;
 
-class testIOVSyncValue: public CppUnit::TestFixture
-{
-   CPPUNIT_TEST_SUITE(testIOVSyncValue);
-   
-   CPPUNIT_TEST(constructTest);
-   CPPUNIT_TEST(constructTimeTest);
-   CPPUNIT_TEST(comparisonTest);
-   CPPUNIT_TEST(comparisonTimeTest);
-   CPPUNIT_TEST(invalidComparisonTest);
-   
-   CPPUNIT_TEST_SUITE_END();
+class testIOVSyncValue : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testIOVSyncValue);
+
+  CPPUNIT_TEST(constructTest);
+  CPPUNIT_TEST(constructTimeTest);
+  CPPUNIT_TEST(comparisonTest);
+  CPPUNIT_TEST(comparisonTimeTest);
+  CPPUNIT_TEST(invalidComparisonTest);
+
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-      void setUp(){}
-   void tearDown(){}
-   
-   void constructTest();
-   void comparisonTest();
-   void constructTimeTest();
-   void comparisonTimeTest();
-   void invalidComparisonTest();
+  void setUp() {}
+  void tearDown() {}
+
+  void constructTest();
+  void comparisonTest();
+  void constructTimeTest();
+  void comparisonTimeTest();
+  void invalidComparisonTest();
 };
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testIOVSyncValue);
 
+void testIOVSyncValue::constructTest() {
+  {
+    const EventID t(2, 0, 0);
 
-void testIOVSyncValue::constructTest()
-{
-   {
-      const EventID t(2,0,0);
-      
-      IOVSyncValue temp(t);
-      
-      CPPUNIT_ASSERT(temp.eventID() == t);
-      
-      
-      CPPUNIT_ASSERT(IOVSyncValue::invalidIOVSyncValue() != temp);
-      CPPUNIT_ASSERT(!(IOVSyncValue::invalidIOVSyncValue() == temp));
-      CPPUNIT_ASSERT(IOVSyncValue::beginOfTime() < temp);
-      CPPUNIT_ASSERT(IOVSyncValue::endOfTime() > temp);
-   }
-   CPPUNIT_ASSERT(IOVSyncValue::invalidIOVSyncValue() < IOVSyncValue::beginOfTime());
-   CPPUNIT_ASSERT(IOVSyncValue::beginOfTime() < IOVSyncValue::endOfTime());
-
-   {
-      const EventID t(2,3,1);
-      
-      IOVSyncValue temp(t);
-      
-      CPPUNIT_ASSERT(temp.eventID() == t);
-      CPPUNIT_ASSERT(temp.luminosityBlockNumber() == 3);
-      
-      CPPUNIT_ASSERT(IOVSyncValue::invalidIOVSyncValue() != temp);
-      CPPUNIT_ASSERT(!(IOVSyncValue::invalidIOVSyncValue() == temp));
-      CPPUNIT_ASSERT(IOVSyncValue::beginOfTime() < temp);
-      CPPUNIT_ASSERT(IOVSyncValue::endOfTime() > temp);
-   }
-   
-}
+    IOVSyncValue temp(t);
 
-void testIOVSyncValue::constructTimeTest()
-{
-   const Timestamp t(2);
-   
-   IOVSyncValue temp(t);
-   
-   CPPUNIT_ASSERT(temp.time() == t);
-   
-   CPPUNIT_ASSERT(IOVSyncValue::invalidIOVSyncValue() < IOVSyncValue::beginOfTime());
-   CPPUNIT_ASSERT(IOVSyncValue::beginOfTime() < IOVSyncValue::endOfTime());
-   
-   CPPUNIT_ASSERT(IOVSyncValue::invalidIOVSyncValue() != temp);
-   CPPUNIT_ASSERT(!(IOVSyncValue::invalidIOVSyncValue() == temp));
-   CPPUNIT_ASSERT(IOVSyncValue::beginOfTime() < temp);
-   CPPUNIT_ASSERT(IOVSyncValue::endOfTime() > temp);
-}
+    CPPUNIT_ASSERT(temp.eventID() == t);
+
+    CPPUNIT_ASSERT(IOVSyncValue::invalidIOVSyncValue() != temp);
+    CPPUNIT_ASSERT(!(IOVSyncValue::invalidIOVSyncValue() == temp));
+    CPPUNIT_ASSERT(IOVSyncValue::beginOfTime() < temp);
+    CPPUNIT_ASSERT(IOVSyncValue::endOfTime() > temp);
+  }
+  CPPUNIT_ASSERT(IOVSyncValue::invalidIOVSyncValue() < IOVSyncValue::beginOfTime());
+  CPPUNIT_ASSERT(IOVSyncValue::beginOfTime() < IOVSyncValue::endOfTime());
+
+  {
+    const EventID t(2, 3, 1);
 
-void testIOVSyncValue::comparisonTest()
-{
-   {
-      const IOVSyncValue small(EventID(1,1,1));
-      const IOVSyncValue med(EventID(2,1,2));
-      
-      CPPUNIT_ASSERT(small.comparable(med));
-      CPPUNIT_ASSERT(small < med);
-      CPPUNIT_ASSERT(small <= med);
-      CPPUNIT_ASSERT(!(small == med));
-      CPPUNIT_ASSERT(small != med);
-      CPPUNIT_ASSERT(!(small > med));
-      CPPUNIT_ASSERT(!(small >= med));
-   }
-   {
-      const IOVSyncValue small(EventID(2,1,1));
-      const IOVSyncValue med(EventID(2,1,2));
-      
-      CPPUNIT_ASSERT(small < med);
-      CPPUNIT_ASSERT(small <= med);
-      CPPUNIT_ASSERT(!(small == med));
-      CPPUNIT_ASSERT(small != med);
-      CPPUNIT_ASSERT(!(small > med));
-      CPPUNIT_ASSERT(!(small >= med));
-   }
-   {
-      const IOVSyncValue small(EventID(2,1,2));
-      const IOVSyncValue med(EventID(3,1,1));
-      
-      CPPUNIT_ASSERT(small < med);
-      CPPUNIT_ASSERT(small <= med);
-      CPPUNIT_ASSERT(!(small == med));
-      CPPUNIT_ASSERT(small != med);
-      CPPUNIT_ASSERT(!(small > med));
-      CPPUNIT_ASSERT(!(small >= med));
-   }
-   {
-      const IOVSyncValue small(EventID(2,2,1));
-      const IOVSyncValue med(EventID(2,2,2));
-      
-      CPPUNIT_ASSERT(small < med);
-      CPPUNIT_ASSERT(small <= med);
-      CPPUNIT_ASSERT(!(small == med));
-      CPPUNIT_ASSERT(small != med);
-      CPPUNIT_ASSERT(!(small > med));
-      CPPUNIT_ASSERT(!(small >= med));
-   }
-   {
-      const IOVSyncValue small(EventID(2,1,3));
-      const IOVSyncValue med(EventID(2,2,2));
-      
-      CPPUNIT_ASSERT(small < med);
-      CPPUNIT_ASSERT(small <= med);
-      CPPUNIT_ASSERT(!(small == med));
-      CPPUNIT_ASSERT(small != med);
-      CPPUNIT_ASSERT(!(small > med));
-      CPPUNIT_ASSERT(!(small >= med));
-   }
+    IOVSyncValue temp(t);
+
+    CPPUNIT_ASSERT(temp.eventID() == t);
+    CPPUNIT_ASSERT(temp.luminosityBlockNumber() == 3);
+
+    CPPUNIT_ASSERT(IOVSyncValue::invalidIOVSyncValue() != temp);
+    CPPUNIT_ASSERT(!(IOVSyncValue::invalidIOVSyncValue() == temp));
+    CPPUNIT_ASSERT(IOVSyncValue::beginOfTime() < temp);
+    CPPUNIT_ASSERT(IOVSyncValue::endOfTime() > temp);
+  }
 }
 
+void testIOVSyncValue::constructTimeTest() {
+  const Timestamp t(2);
+
+  IOVSyncValue temp(t);
+
+  CPPUNIT_ASSERT(temp.time() == t);
 
-void testIOVSyncValue::comparisonTimeTest()
-{
-   const IOVSyncValue small(Timestamp(1));
-   const IOVSyncValue med(Timestamp(2));
+  CPPUNIT_ASSERT(IOVSyncValue::invalidIOVSyncValue() < IOVSyncValue::beginOfTime());
+  CPPUNIT_ASSERT(IOVSyncValue::beginOfTime() < IOVSyncValue::endOfTime());
 
-   CPPUNIT_ASSERT(small.comparable(med));
-   CPPUNIT_ASSERT(small < med);
-   CPPUNIT_ASSERT(small <= med);
-   CPPUNIT_ASSERT(!(small == med));
-   CPPUNIT_ASSERT(small != med);
-   CPPUNIT_ASSERT(!(small > med));
-   CPPUNIT_ASSERT(!(small >= med));
+  CPPUNIT_ASSERT(IOVSyncValue::invalidIOVSyncValue() != temp);
+  CPPUNIT_ASSERT(!(IOVSyncValue::invalidIOVSyncValue() == temp));
+  CPPUNIT_ASSERT(IOVSyncValue::beginOfTime() < temp);
+  CPPUNIT_ASSERT(IOVSyncValue::endOfTime() > temp);
+}
+
+void testIOVSyncValue::comparisonTest() {
+  {
+    const IOVSyncValue small(EventID(1, 1, 1));
+    const IOVSyncValue med(EventID(2, 1, 2));
+
+    CPPUNIT_ASSERT(small.comparable(med));
+    CPPUNIT_ASSERT(small < med);
+    CPPUNIT_ASSERT(small <= med);
+    CPPUNIT_ASSERT(!(small == med));
+    CPPUNIT_ASSERT(small != med);
+    CPPUNIT_ASSERT(!(small > med));
+    CPPUNIT_ASSERT(!(small >= med));
+  }
+  {
+    const IOVSyncValue small(EventID(2, 1, 1));
+    const IOVSyncValue med(EventID(2, 1, 2));
+
+    CPPUNIT_ASSERT(small < med);
+    CPPUNIT_ASSERT(small <= med);
+    CPPUNIT_ASSERT(!(small == med));
+    CPPUNIT_ASSERT(small != med);
+    CPPUNIT_ASSERT(!(small > med));
+    CPPUNIT_ASSERT(!(small >= med));
+  }
+  {
+    const IOVSyncValue small(EventID(2, 1, 2));
+    const IOVSyncValue med(EventID(3, 1, 1));
+
+    CPPUNIT_ASSERT(small < med);
+    CPPUNIT_ASSERT(small <= med);
+    CPPUNIT_ASSERT(!(small == med));
+    CPPUNIT_ASSERT(small != med);
+    CPPUNIT_ASSERT(!(small > med));
+    CPPUNIT_ASSERT(!(small >= med));
+  }
+  {
+    const IOVSyncValue small(EventID(2, 2, 1));
+    const IOVSyncValue med(EventID(2, 2, 2));
+
+    CPPUNIT_ASSERT(small < med);
+    CPPUNIT_ASSERT(small <= med);
+    CPPUNIT_ASSERT(!(small == med));
+    CPPUNIT_ASSERT(small != med);
+    CPPUNIT_ASSERT(!(small > med));
+    CPPUNIT_ASSERT(!(small >= med));
+  }
+  {
+    const IOVSyncValue small(EventID(2, 1, 3));
+    const IOVSyncValue med(EventID(2, 2, 2));
+
+    CPPUNIT_ASSERT(small < med);
+    CPPUNIT_ASSERT(small <= med);
+    CPPUNIT_ASSERT(!(small == med));
+    CPPUNIT_ASSERT(small != med);
+    CPPUNIT_ASSERT(!(small > med));
+    CPPUNIT_ASSERT(!(small >= med));
+  }
+}
 
+void testIOVSyncValue::comparisonTimeTest() {
+  const IOVSyncValue small(Timestamp(1));
+  const IOVSyncValue med(Timestamp(2));
+
+  CPPUNIT_ASSERT(small.comparable(med));
+  CPPUNIT_ASSERT(small < med);
+  CPPUNIT_ASSERT(small <= med);
+  CPPUNIT_ASSERT(!(small == med));
+  CPPUNIT_ASSERT(small != med);
+  CPPUNIT_ASSERT(!(small > med));
+  CPPUNIT_ASSERT(!(small >= med));
 }
 
-void 
-testIOVSyncValue::invalidComparisonTest()
-{
+void testIOVSyncValue::invalidComparisonTest() {
   const IOVSyncValue timeBased(Timestamp(1));
-  const IOVSyncValue eventBased(EventID(3,2,1));
-
-  CPPUNIT_ASSERT(! timeBased.comparable(eventBased));
-  CPPUNIT_ASSERT(! eventBased.comparable(timeBased));
-  CPPUNIT_ASSERT_THROW( [&](){return timeBased < eventBased;}()  , cms::Exception);
-  CPPUNIT_ASSERT_THROW( [&](){return timeBased <= eventBased;}() , cms::Exception);
-  CPPUNIT_ASSERT( !(timeBased == eventBased));
-  CPPUNIT_ASSERT( timeBased != eventBased);
-  CPPUNIT_ASSERT_THROW( [&]() {return timeBased > eventBased;}()  , cms::Exception);
-  CPPUNIT_ASSERT_THROW( [&]() {return timeBased >= eventBased;}() , cms::Exception);
+  const IOVSyncValue eventBased(EventID(3, 2, 1));
+
+  CPPUNIT_ASSERT(!timeBased.comparable(eventBased));
+  CPPUNIT_ASSERT(!eventBased.comparable(timeBased));
+  CPPUNIT_ASSERT_THROW([&]() { return timeBased < eventBased; }(), cms::Exception);
+  CPPUNIT_ASSERT_THROW([&]() { return timeBased <= eventBased; }(), cms::Exception);
+  CPPUNIT_ASSERT(!(timeBased == eventBased));
+  CPPUNIT_ASSERT(timeBased != eventBased);
+  CPPUNIT_ASSERT_THROW([&]() { return timeBased > eventBased; }(), cms::Exception);
+  CPPUNIT_ASSERT_THROW([&]() { return timeBased >= eventBased; }(), cms::Exception);
 }
diff --git a/FWCore/Framework/test/limited_module_t.cppunit.cc b/FWCore/Framework/test/limited_module_t.cppunit.cc
index 16722938a39c3..75acbf56cf0ff 100644
--- a/FWCore/Framework/test/limited_module_t.cppunit.cc
+++ b/FWCore/Framework/test/limited_module_t.cppunit.cc
@@ -25,7 +25,6 @@
 #include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"
 #include "FWCore/Utilities/interface/GlobalIdentifier.h"
 
-
 #include "FWCore/Utilities/interface/Exception.h"
 
 #include "cppunit/extensions/HelperMacros.h"
@@ -34,17 +33,16 @@ namespace {
   edm::ParameterSet makePSet() {
     edm::ParameterSet pset;
     const unsigned int kLimit = 1;
-    pset.addUntrackedParameter("concurrencyLimit",kLimit);
+    pset.addUntrackedParameter("concurrencyLimit", kLimit);
     return pset;
   }
-  
+
   const edm::ParameterSet s_pset = makePSet();
-}
+}  // namespace
 
-class testLimitedModule: public CppUnit::TestFixture 
-{
+class testLimitedModule : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testLimitedModule);
-  
+
   CPPUNIT_TEST(basicTest);
   CPPUNIT_TEST(streamTest);
   CPPUNIT_TEST(runTest);
@@ -57,13 +55,14 @@ class testLimitedModule: public CppUnit::TestFixture
   CPPUNIT_TEST(endLumiProdTest);
   CPPUNIT_TEST(endRunSummaryProdTest);
   CPPUNIT_TEST(endLumiSummaryProdTest);
-  
+
   CPPUNIT_TEST_SUITE_END();
+
 public:
   testLimitedModule();
-  
-  void setUp(){}
-  void tearDown(){}
+
+  void setUp() {}
+  void tearDown() {}
 
   void basicTest();
   void streamTest();
@@ -97,10 +96,8 @@ class testLimitedModule: public CppUnit::TestFixture
   typedef std::vector<Trans> Expectations;
 
 private:
+  std::map<Trans, std::function<void(edm::Worker*)>> m_transToFunc;
 
-  
-  std::map<Trans,std::function<void(edm::Worker*)>> m_transToFunc;
-  
   edm::ProcessConfiguration m_procConfig;
   std::shared_ptr<edm::ProductRegistry> m_prodReg;
   std::shared_ptr<edm::BranchIDListHelper> m_idHelper;
@@ -109,128 +106,115 @@ class testLimitedModule: public CppUnit::TestFixture
   edm::HistoryAppender historyAppender_;
   std::shared_ptr<edm::LuminosityBlockPrincipal> m_lbp;
   std::shared_ptr<edm::RunPrincipal> m_rp;
-  std::shared_ptr<edm::ActivityRegistry> m_actReg; // We do not use propagate_const because the registry itself is mutable.
+  std::shared_ptr<edm::ActivityRegistry>
+      m_actReg;  // We do not use propagate_const because the registry itself is mutable.
   edm::EventSetupImpl* m_es = nullptr;
-  edm::ModuleDescription m_desc = {"Dummy","dummy"};
-  
-  template<typename T>
+  edm::ModuleDescription m_desc = {"Dummy", "dummy"};
+
+  template <typename T>
   void testTransitions(std::shared_ptr<T> iMod, Expectations const& iExpect);
-  
+
   class BasicProd : public edm::limited::EDProducer<> {
   public:
-    BasicProd(): edm::limited::EDProducerBase(s_pset), edm::limited::EDProducer<>(s_pset)  {}
-    mutable unsigned int m_count = 0; //[[cms-thread-safe]]
-    
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
+    BasicProd() : edm::limited::EDProducerBase(s_pset), edm::limited::EDProducer<>(s_pset) {}
+    mutable unsigned int m_count = 0;  //[[cms-thread-safe]]
+
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
   };
   class StreamProd : public edm::limited::EDProducer<edm::StreamCache<int>> {
   public:
-    StreamProd(): edm::limited::EDProducerBase(s_pset), edm::limited::EDProducer<edm::StreamCache<int>>(s_pset) {}
+    StreamProd() : edm::limited::EDProducerBase(s_pset), edm::limited::EDProducer<edm::StreamCache<int>>(s_pset) {}
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
+
     std::unique_ptr<int> beginStream(edm::StreamID) const override {
       ++m_count;
       return std::unique_ptr<int>{};
     }
-    
-    virtual void streamBeginRun(edm::StreamID, edm::Run const&, edm::EventSetup const&) const  override{
-      ++m_count;
-    }
-    virtual void streamBeginLuminosityBlock(edm::StreamID, edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    virtual void streamEndLuminosityBlock(edm::StreamID, edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    virtual void streamEndRun(edm::StreamID, edm::Run const&, edm::EventSetup const&) const override {
+
+    virtual void streamBeginRun(edm::StreamID, edm::Run const&, edm::EventSetup const&) const override { ++m_count; }
+    virtual void streamBeginLuminosityBlock(edm::StreamID,
+                                            edm::LuminosityBlock const&,
+                                            edm::EventSetup const&) const override {
       ++m_count;
     }
-    void endStream(edm::StreamID) const override {
+    virtual void streamEndLuminosityBlock(edm::StreamID,
+                                          edm::LuminosityBlock const&,
+                                          edm::EventSetup const&) const override {
       ++m_count;
     }
+    virtual void streamEndRun(edm::StreamID, edm::Run const&, edm::EventSetup const&) const override { ++m_count; }
+    void endStream(edm::StreamID) const override { ++m_count; }
   };
-  
+
   class RunProd : public edm::limited::EDProducer<edm::RunCache<int>> {
   public:
-    RunProd(): edm::limited::EDProducerBase(s_pset), edm::limited::EDProducer<edm::RunCache<int>>(s_pset) {}
+    RunProd() : edm::limited::EDProducerBase(s_pset), edm::limited::EDProducer<edm::RunCache<int>>(s_pset) {}
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
+
     std::shared_ptr<int> globalBeginRun(edm::Run const&, edm::EventSetup const&) const override {
       ++m_count;
       return std::shared_ptr<int>{};
     }
 
-    void globalEndRun(edm::Run const&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
+    void globalEndRun(edm::Run const&, edm::EventSetup const&) const override { ++m_count; }
   };
 
-
   class LumiProd : public edm::limited::EDProducer<edm::LuminosityBlockCache<int>> {
   public:
-    LumiProd(): edm::limited::EDProducerBase(s_pset), edm::limited::EDProducer<edm::LuminosityBlockCache<int>>(s_pset) {}
+    LumiProd()
+        : edm::limited::EDProducerBase(s_pset), edm::limited::EDProducer<edm::LuminosityBlockCache<int>>(s_pset) {}
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    
-    std::shared_ptr<int> globalBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const override {
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
+
+    std::shared_ptr<int> globalBeginLuminosityBlock(edm::LuminosityBlock const&,
+                                                    edm::EventSetup const&) const override {
       ++m_count;
       return std::shared_ptr<int>{};
     }
-    
-    void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
+
+    void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const override { ++m_count; }
   };
-  
+
   class RunSummaryProd : public edm::limited::EDProducer<edm::RunSummaryCache<int>> {
   public:
-    RunSummaryProd() : edm::limited::EDProducerBase(s_pset), edm::limited::EDProducer<edm::RunSummaryCache<int>>(s_pset){}
+    RunSummaryProd()
+        : edm::limited::EDProducerBase(s_pset), edm::limited::EDProducer<edm::RunSummaryCache<int>>(s_pset) {}
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
+
     std::shared_ptr<int> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&) const override {
       ++m_count;
       return std::shared_ptr<int>{};
     }
-    
-    void streamEndRunSummary(edm::StreamID, edm::Run const&, edm::EventSetup const&, int*) const override {
-      ++m_count;
-    }
-    
-    void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, int*) const override {
-      ++m_count;
-    }
+
+    void streamEndRunSummary(edm::StreamID, edm::Run const&, edm::EventSetup const&, int*) const override { ++m_count; }
+
+    void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, int*) const override { ++m_count; }
   };
 
   class LumiSummaryProd : public edm::limited::EDProducer<edm::LuminosityBlockSummaryCache<int>> {
   public:
-    LumiSummaryProd() : edm::limited::EDProducerBase(s_pset), edm::limited::EDProducer<edm::LuminosityBlockSummaryCache<int>>(s_pset) {}
+    LumiSummaryProd()
+        : edm::limited::EDProducerBase(s_pset),
+          edm::limited::EDProducer<edm::LuminosityBlockSummaryCache<int>>(s_pset) {}
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    
-    std::shared_ptr<int> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&) const override {
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
+
+    std::shared_ptr<int> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                           edm::EventSetup const&) const override {
       ++m_count;
       return std::shared_ptr<int>{};
     }
-    
-    void streamEndLuminosityBlockSummary(edm::StreamID, edm::LuminosityBlock const&, edm::EventSetup const&, int*) const override {
+
+    void streamEndLuminosityBlockSummary(edm::StreamID,
+                                         edm::LuminosityBlock const&,
+                                         edm::EventSetup const&,
+                                         int*) const override {
       ++m_count;
     }
-    
+
     void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, int*) const override {
       ++m_count;
     }
@@ -240,102 +224,82 @@ class testLimitedModule: public CppUnit::TestFixture
   public:
     BeginRunProd() : edm::limited::EDProducerBase(s_pset), edm::limited::EDProducer<edm::BeginRunProducer>(s_pset) {}
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
 
-    void globalBeginRunProduce(edm::Run&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
+    void globalBeginRunProduce(edm::Run&, edm::EventSetup const&) const override { ++m_count; }
   };
 
   class BeginLumiProd : public edm::limited::EDProducer<edm::BeginLuminosityBlockProducer> {
   public:
-    BeginLumiProd() : edm::limited::EDProducerBase(s_pset), edm::limited::EDProducer<edm::BeginLuminosityBlockProducer>(s_pset) {}
+    BeginLumiProd()
+        : edm::limited::EDProducerBase(s_pset), edm::limited::EDProducer<edm::BeginLuminosityBlockProducer>(s_pset) {}
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    
-    void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
+
+    void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override { ++m_count; }
   };
 
   class EndRunProd : public edm::limited::EDProducer<edm::EndRunProducer> {
   public:
     EndRunProd() : edm::limited::EDProducerBase(s_pset), edm::limited::EDProducer<edm::EndRunProducer>(s_pset) {}
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    
-    void globalEndRunProduce(edm::Run&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
+
+    void globalEndRunProduce(edm::Run&, edm::EventSetup const&) const override { ++m_count; }
   };
-  
+
   class EndLumiProd : public edm::limited::EDProducer<edm::EndLuminosityBlockProducer> {
   public:
-    EndLumiProd() : edm::limited::EDProducerBase(s_pset), edm::limited::EDProducer<edm::EndLuminosityBlockProducer>(s_pset) {}
+    EndLumiProd()
+        : edm::limited::EDProducerBase(s_pset), edm::limited::EDProducer<edm::EndLuminosityBlockProducer>(s_pset) {}
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    
-    void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-  };
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
 
+    void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override { ++m_count; }
+  };
 
   class EndRunSummaryProd : public edm::limited::EDProducer<edm::EndRunProducer, edm::RunSummaryCache<int>> {
   public:
     EndRunSummaryProd()
-    : edm::limited::EDProducerBase(s_pset),
-      edm::limited::EDProducer<edm::EndRunProducer, edm::RunSummaryCache<int>>(s_pset) {}
+        : edm::limited::EDProducerBase(s_pset),
+          edm::limited::EDProducer<edm::EndRunProducer, edm::RunSummaryCache<int>>(s_pset) {}
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-    
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
+
     std::shared_ptr<int> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&) const override {
       ++m_count;
       return std::shared_ptr<int>{};
     }
-    
-    void streamEndRunSummary(edm::StreamID, edm::Run const&, edm::EventSetup const&, int*) const override {
-      ++m_count;
-    }
-    
-    void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, int*) const override {
-      ++m_count;
-    }
 
-    void globalEndRunProduce(edm::Run&, edm::EventSetup const&, int const*) const override {
-      ++m_count;
-    }
+    void streamEndRunSummary(edm::StreamID, edm::Run const&, edm::EventSetup const&, int*) const override { ++m_count; }
+
+    void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, int*) const override { ++m_count; }
+
+    void globalEndRunProduce(edm::Run&, edm::EventSetup const&, int const*) const override { ++m_count; }
   };
-  
-  class EndLumiSummaryProd : public edm::limited::EDProducer<edm::EndLuminosityBlockProducer, edm::LuminosityBlockSummaryCache<int>> {
+
+  class EndLumiSummaryProd
+      : public edm::limited::EDProducer<edm::EndLuminosityBlockProducer, edm::LuminosityBlockSummaryCache<int>> {
   public:
     EndLumiSummaryProd()
-    : edm::limited::EDProducerBase(s_pset) ,
-      edm::limited::EDProducer<edm::EndLuminosityBlockProducer, edm::LuminosityBlockSummaryCache<int>>(s_pset){}
+        : edm::limited::EDProducerBase(s_pset),
+          edm::limited::EDProducer<edm::EndLuminosityBlockProducer, edm::LuminosityBlockSummaryCache<int>>(s_pset) {}
     mutable unsigned int m_count = 0;
-    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
+    void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override { ++m_count; }
 
-    std::shared_ptr<int> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&) const override {
+    std::shared_ptr<int> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                           edm::EventSetup const&) const override {
       ++m_count;
       return std::shared_ptr<int>{};
     }
-    
-    void streamEndLuminosityBlockSummary(edm::StreamID, edm::LuminosityBlock const&, edm::EventSetup const&, int*) const override {
+
+    void streamEndLuminosityBlockSummary(edm::StreamID,
+                                         edm::LuminosityBlock const&,
+                                         edm::EventSetup const&,
+                                         int*) const override {
       ++m_count;
     }
-    
+
     void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, int*) const override {
       ++m_count;
     }
@@ -348,16 +312,16 @@ class testLimitedModule: public CppUnit::TestFixture
 
 namespace {
   struct ShadowStreamID {
-    constexpr ShadowStreamID():value(0){}
+    constexpr ShadowStreamID() : value(0) {}
     unsigned int value;
   };
-  
+
   union IDUnion {
-    IDUnion(): m_shadow() {}
+    IDUnion() : m_shadow() {}
     ShadowStreamID m_shadow;
     edm::StreamID m_id;
   };
-}
+}  // namespace
 static edm::StreamID makeID() {
   IDUnion u;
   assert(u.m_id.value() == 0);
@@ -365,219 +329,227 @@ static edm::StreamID makeID() {
 }
 static const edm::StreamID s_streamID0 = makeID();
 
-
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testLimitedModule);
 
-testLimitedModule::testLimitedModule():
-m_prodReg(new edm::ProductRegistry{}),
-m_idHelper(new edm::BranchIDListHelper{}),
-m_associationsHelper(new edm::ThinnedAssociationsHelper{}),
-m_ep()
-{
+testLimitedModule::testLimitedModule()
+    : m_prodReg(new edm::ProductRegistry{}),
+      m_idHelper(new edm::BranchIDListHelper{}),
+      m_associationsHelper(new edm::ThinnedAssociationsHelper{}),
+      m_ep() {
   //Setup the principals
   m_prodReg->setFrozen();
   m_idHelper->updateFromRegistry(*m_prodReg);
   edm::EventID eventID = edm::EventID::firstValidEvent();
-  
+
   std::string uuid = edm::createGlobalIdentifier();
   edm::Timestamp now(1234567UL);
   auto runAux = std::make_shared<edm::RunAuxiliary>(eventID.run(), now, now);
-  m_rp.reset(new edm::RunPrincipal(runAux, m_prodReg, m_procConfig, &historyAppender_,0));
+  m_rp.reset(new edm::RunPrincipal(runAux, m_prodReg, m_procConfig, &historyAppender_, 0));
   edm::LuminosityBlockAuxiliary lumiAux(m_rp->run(), 1, now, now);
-  m_lbp.reset(new edm::LuminosityBlockPrincipal(m_prodReg, m_procConfig, &historyAppender_,0));
+  m_lbp.reset(new edm::LuminosityBlockPrincipal(m_prodReg, m_procConfig, &historyAppender_, 0));
   m_lbp->setAux(lumiAux);
   m_lbp->setRunPrincipal(m_rp);
   edm::EventAuxiliary eventAux(eventID, uuid, now, true);
 
-  m_ep.reset(new edm::EventPrincipal(m_prodReg,
-                                     m_idHelper,
-                                     m_associationsHelper,
-                                     m_procConfig,nullptr));
+  m_ep.reset(new edm::EventPrincipal(m_prodReg, m_idHelper, m_associationsHelper, m_procConfig, nullptr));
   edm::ProcessHistoryRegistry phr;
   m_ep->fillEventPrincipal(eventAux, phr);
   m_ep->setLuminosityBlockPrincipal(m_lbp.get());
   m_actReg.reset(new edm::ActivityRegistry);
 
-
   //For each transition, bind a lambda which will call the proper method of the Worker
   m_transToFunc[Trans::kBeginStream] = [](edm::Worker* iBase) {
     edm::StreamContext streamContext(s_streamID0, nullptr);
-    iBase->beginStream(s_streamID0, streamContext); };
+    iBase->beginStream(s_streamID0, streamContext);
+  };
 
-  
   m_transToFunc[Trans::kGlobalBeginRun] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::RunPrincipal, edm::BranchActionGlobalBegin> Traits;
     edm::ParentContext nullParentContext;
-    iBase->doWork<Traits>(*m_rp,*m_es, s_streamID0, nullParentContext, nullptr); };
+    iBase->doWork<Traits>(*m_rp, *m_es, s_streamID0, nullParentContext, nullptr);
+  };
   m_transToFunc[Trans::kStreamBeginRun] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::RunPrincipal, edm::BranchActionStreamBegin> Traits;
     edm::ParentContext nullParentContext;
-    iBase->doWork<Traits>(*m_rp,*m_es, s_streamID0, nullParentContext, nullptr); };
-  
+    iBase->doWork<Traits>(*m_rp, *m_es, s_streamID0, nullParentContext, nullptr);
+  };
+
   m_transToFunc[Trans::kGlobalBeginLuminosityBlock] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::LuminosityBlockPrincipal, edm::BranchActionGlobalBegin> Traits;
     edm::ParentContext nullParentContext;
-    iBase->doWork<Traits>(*m_lbp,*m_es, s_streamID0, nullParentContext, nullptr); };
+    iBase->doWork<Traits>(*m_lbp, *m_es, s_streamID0, nullParentContext, nullptr);
+  };
   m_transToFunc[Trans::kStreamBeginLuminosityBlock] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::LuminosityBlockPrincipal, edm::BranchActionStreamBegin> Traits;
     edm::ParentContext nullParentContext;
-    iBase->doWork<Traits>(*m_lbp,*m_es, s_streamID0, nullParentContext, nullptr); };
-  
+    iBase->doWork<Traits>(*m_lbp, *m_es, s_streamID0, nullParentContext, nullptr);
+  };
+
   m_transToFunc[Trans::kEvent] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::EventPrincipal, edm::BranchActionStreamBegin> Traits;
     edm::StreamContext streamContext(s_streamID0, nullptr);
     edm::ParentContext nullParentContext(&streamContext);
     iBase->setActivityRegistry(m_actReg);
-    iBase->doWork<Traits>(*m_ep,*m_es, s_streamID0, nullParentContext, nullptr); };
+    iBase->doWork<Traits>(*m_ep, *m_es, s_streamID0, nullParentContext, nullptr);
+  };
 
   m_transToFunc[Trans::kStreamEndLuminosityBlock] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::LuminosityBlockPrincipal, edm::BranchActionStreamEnd> Traits;
     edm::ParentContext nullParentContext;
-    iBase->doWork<Traits>(*m_lbp,*m_es, s_streamID0, nullParentContext, nullptr); };
+    iBase->doWork<Traits>(*m_lbp, *m_es, s_streamID0, nullParentContext, nullptr);
+  };
   m_transToFunc[Trans::kGlobalEndLuminosityBlock] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::LuminosityBlockPrincipal, edm::BranchActionGlobalEnd> Traits;
     edm::ParentContext nullParentContext;
-    iBase->doWork<Traits>(*m_lbp,*m_es, s_streamID0, nullParentContext, nullptr); };
+    iBase->doWork<Traits>(*m_lbp, *m_es, s_streamID0, nullParentContext, nullptr);
+  };
 
   m_transToFunc[Trans::kStreamEndRun] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::RunPrincipal, edm::BranchActionStreamEnd> Traits;
     edm::ParentContext nullParentContext;
-    iBase->doWork<Traits>(*m_rp,*m_es, s_streamID0, nullParentContext, nullptr); };
+    iBase->doWork<Traits>(*m_rp, *m_es, s_streamID0, nullParentContext, nullptr);
+  };
   m_transToFunc[Trans::kGlobalEndRun] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::RunPrincipal, edm::BranchActionGlobalEnd> Traits;
     edm::ParentContext nullParentContext;
-    iBase->doWork<Traits>(*m_rp,*m_es, s_streamID0, nullParentContext, nullptr); };
+    iBase->doWork<Traits>(*m_rp, *m_es, s_streamID0, nullParentContext, nullptr);
+  };
 
   m_transToFunc[Trans::kEndStream] = [](edm::Worker* iBase) {
     edm::StreamContext streamContext(s_streamID0, nullptr);
-    iBase->endStream(s_streamID0, streamContext); };
-
+    iBase->endStream(s_streamID0, streamContext);
+  };
 }
 
-
 namespace {
-  template<typename T>
-  void
-  testTransition(std::shared_ptr<T> iMod, edm::Worker* iWorker, testLimitedModule::Trans iTrans, testLimitedModule::Expectations const& iExpect, std::function<void(edm::Worker*)> iFunc) {
-    assert(0==iMod->m_count);
+  template <typename T>
+  void testTransition(std::shared_ptr<T> iMod,
+                      edm::Worker* iWorker,
+                      testLimitedModule::Trans iTrans,
+                      testLimitedModule::Expectations const& iExpect,
+                      std::function<void(edm::Worker*)> iFunc) {
+    assert(0 == iMod->m_count);
     iFunc(iWorker);
-    auto count = std::count(iExpect.begin(),iExpect.end(),iTrans);
-    if(count != iMod->m_count) {
-      std::cout<<"For trans " <<static_cast<std::underlying_type<testLimitedModule::Trans>::type >(iTrans)<< " expected "<<count<<" and got "<<iMod->m_count<<std::endl;
+    auto count = std::count(iExpect.begin(), iExpect.end(), iTrans);
+    if (count != iMod->m_count) {
+      std::cout << "For trans " << static_cast<std::underlying_type<testLimitedModule::Trans>::type>(iTrans)
+                << " expected " << count << " and got " << iMod->m_count << std::endl;
     }
     CPPUNIT_ASSERT(iMod->m_count == count);
     iMod->m_count = 0;
     iWorker->reset();
   }
-}
+}  // namespace
 
-template<typename T>
-void
-testLimitedModule::testTransitions(std::shared_ptr<T> iMod, Expectations const& iExpect) {
-  edm::maker::ModuleHolderT<edm::limited::EDProducerBase> h(iMod,nullptr);
+template <typename T>
+void testLimitedModule::testTransitions(std::shared_ptr<T> iMod, Expectations const& iExpect) {
+  edm::maker::ModuleHolderT<edm::limited::EDProducerBase> h(iMod, nullptr);
   h.preallocate(edm::PreallocationConfiguration{});
-  edm::WorkerT<edm::limited::EDProducerBase> w{iMod,m_desc,nullptr};
-  for(auto& keyVal: m_transToFunc) {
-    testTransition(iMod,&w,keyVal.first,iExpect,keyVal.second);
+  edm::WorkerT<edm::limited::EDProducerBase> w{iMod, m_desc, nullptr};
+  for (auto& keyVal : m_transToFunc) {
+    testTransition(iMod, &w, keyVal.first, iExpect, keyVal.second);
   }
 }
 
-
-void testLimitedModule::basicTest()
-{
+void testLimitedModule::basicTest() {
   auto testProd = std::make_shared<BasicProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
   testTransitions(testProd, {Trans::kEvent});
 }
 
-void testLimitedModule::streamTest()
-{
+void testLimitedModule::streamTest() {
   auto testProd = std::make_shared<StreamProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kBeginStream, Trans::kStreamBeginRun, Trans::kStreamBeginLuminosityBlock, Trans::kEvent,
-    Trans::kStreamEndLuminosityBlock,Trans::kStreamEndRun,Trans::kEndStream});
+  testTransitions(testProd,
+                  {Trans::kBeginStream,
+                   Trans::kStreamBeginRun,
+                   Trans::kStreamBeginLuminosityBlock,
+                   Trans::kEvent,
+                   Trans::kStreamEndLuminosityBlock,
+                   Trans::kStreamEndRun,
+                   Trans::kEndStream});
 }
 
-void testLimitedModule::runTest()
-{
+void testLimitedModule::runTest() {
   auto testProd = std::make_shared<RunProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
   testTransitions(testProd, {Trans::kGlobalBeginRun, Trans::kEvent, Trans::kGlobalEndRun});
 }
 
-void testLimitedModule::runSummaryTest()
-{
+void testLimitedModule::runSummaryTest() {
   auto testProd = std::make_shared<RunSummaryProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
   testTransitions(testProd, {Trans::kGlobalBeginRun, Trans::kEvent, Trans::kStreamEndRun, Trans::kGlobalEndRun});
 }
 
-void testLimitedModule::lumiTest()
-{
+void testLimitedModule::lumiTest() {
   auto testProd = std::make_shared<LumiProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
   testTransitions(testProd, {Trans::kGlobalBeginLuminosityBlock, Trans::kEvent, Trans::kGlobalEndLuminosityBlock});
 }
 
-void testLimitedModule::lumiSummaryTest()
-{
+void testLimitedModule::lumiSummaryTest() {
   auto testProd = std::make_shared<LumiSummaryProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kGlobalBeginLuminosityBlock, Trans::kEvent, Trans::kStreamEndLuminosityBlock, Trans::kGlobalEndLuminosityBlock});
+  testTransitions(testProd,
+                  {Trans::kGlobalBeginLuminosityBlock,
+                   Trans::kEvent,
+                   Trans::kStreamEndLuminosityBlock,
+                   Trans::kGlobalEndLuminosityBlock});
 }
 
-void testLimitedModule::beginRunProdTest()
-{
+void testLimitedModule::beginRunProdTest() {
   auto testProd = std::make_shared<BeginRunProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
   testTransitions(testProd, {Trans::kGlobalBeginRun, Trans::kEvent});
 }
 
-void testLimitedModule::beginLumiProdTest()
-{
+void testLimitedModule::beginLumiProdTest() {
   auto testProd = std::make_shared<BeginLumiProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
   testTransitions(testProd, {Trans::kGlobalBeginLuminosityBlock, Trans::kEvent});
 }
 
-void testLimitedModule::endRunProdTest()
-{
+void testLimitedModule::endRunProdTest() {
   auto testProd = std::make_shared<EndRunProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
   testTransitions(testProd, {Trans::kGlobalEndRun, Trans::kEvent});
 }
 
-void testLimitedModule::endLumiProdTest()
-{
+void testLimitedModule::endLumiProdTest() {
   auto testProd = std::make_shared<EndLumiProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
   testTransitions(testProd, {Trans::kGlobalEndLuminosityBlock, Trans::kEvent});
 }
 
-void testLimitedModule::endRunSummaryProdTest()
-{
+void testLimitedModule::endRunSummaryProdTest() {
   auto testProd = std::make_shared<EndRunSummaryProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kGlobalEndRun, Trans::kEvent, Trans::kGlobalBeginRun, Trans::kStreamEndRun, Trans::kGlobalEndRun});
+  testTransitions(
+      testProd,
+      {Trans::kGlobalEndRun, Trans::kEvent, Trans::kGlobalBeginRun, Trans::kStreamEndRun, Trans::kGlobalEndRun});
 }
 
-void testLimitedModule::endLumiSummaryProdTest()
-{
+void testLimitedModule::endLumiSummaryProdTest() {
   auto testProd = std::make_shared<EndLumiSummaryProd>();
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kGlobalEndLuminosityBlock, Trans::kEvent, Trans::kGlobalBeginLuminosityBlock, Trans::kStreamEndLuminosityBlock, Trans::kGlobalEndLuminosityBlock}); 
+  testTransitions(testProd,
+                  {Trans::kGlobalEndLuminosityBlock,
+                   Trans::kEvent,
+                   Trans::kGlobalBeginLuminosityBlock,
+                   Trans::kStreamEndLuminosityBlock,
+                   Trans::kGlobalEndLuminosityBlock});
 }
-
diff --git a/FWCore/Framework/test/limited_outputmodule_t.cppunit.cc b/FWCore/Framework/test/limited_outputmodule_t.cppunit.cc
index 51526fed995a1..c7b0c682dd974 100644
--- a/FWCore/Framework/test/limited_outputmodule_t.cppunit.cc
+++ b/FWCore/Framework/test/limited_outputmodule_t.cppunit.cc
@@ -27,7 +27,6 @@
 #include "FWCore/Framework/src/PreallocationConfiguration.h"
 #include "FWCore/Concurrency/interface/WaitingTaskHolder.h"
 
-
 #include "FWCore/Utilities/interface/Exception.h"
 
 #include "cppunit/extensions/HelperMacros.h"
@@ -36,19 +35,19 @@ namespace edm {
   class ModuleCallingContext;
 }
 
-class testLimitedOutputModule: public CppUnit::TestFixture 
-{
+class testLimitedOutputModule : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testLimitedOutputModule);
-  
+
   CPPUNIT_TEST(basicTest);
   CPPUNIT_TEST(fileTest);
-  
+
   CPPUNIT_TEST_SUITE_END();
+
 public:
   testLimitedOutputModule();
-  
-  void setUp(){}
-  void tearDown(){}
+
+  void setUp() {}
+  void tearDown() {}
 
   void basicTest();
   void fileTest();
@@ -65,13 +64,12 @@ class testLimitedOutputModule: public CppUnit::TestFixture
     kGlobalCloseInputFile,
     kEndJob
   };
-  
+
   typedef std::vector<Trans> Expectations;
 
 private:
+  std::map<Trans, std::function<void(edm::Worker*, edm::OutputModuleCommunicator*)>> m_transToFunc;
 
-  std::map<Trans,std::function<void(edm::Worker*,edm::OutputModuleCommunicator*)>> m_transToFunc;
-  
   edm::ProcessConfiguration m_procConfig;
   edm::PreallocationConfiguration m_preallocConfig;
   std::shared_ptr<edm::ProductRegistry> m_prodReg;
@@ -81,61 +79,46 @@ class testLimitedOutputModule: public CppUnit::TestFixture
   edm::HistoryAppender historyAppender_;
   std::shared_ptr<edm::LuminosityBlockPrincipal> m_lbp;
   std::shared_ptr<edm::RunPrincipal> m_rp;
-  std::shared_ptr<edm::ActivityRegistry> m_actReg; // We do not use propagate_const because the registry itself is mutable.
+  std::shared_ptr<edm::ActivityRegistry>
+      m_actReg;  // We do not use propagate_const because the registry itself is mutable.
   edm::EventSetupImpl* m_es = nullptr;
-  edm::ModuleDescription m_desc = {"Dummy","dummy"};
+  edm::ModuleDescription m_desc = {"Dummy", "dummy"};
   edm::WorkerParams m_params;
-  
+
   typedef edm::service::TriggerNamesService TNS;
   typedef edm::serviceregistry::ServiceWrapper<TNS> w_TNS;
   std::shared_ptr<w_TNS> tnsptr_;
   edm::ServiceToken serviceToken_;
-  
-  template<typename T>
+
+  template <typename T>
   void testTransitions(std::shared_ptr<T> iMod, Expectations const& iExpect);
-  
+
   class BasicOutputModule : public edm::limited::OutputModule<> {
   public:
     using edm::limited::OutputModuleBase::doPreallocate;
-    BasicOutputModule(edm::ParameterSet const& iPSet): edm::limited::OutputModuleBase(iPSet),edm::limited::OutputModule<>(iPSet){}
+    BasicOutputModule(edm::ParameterSet const& iPSet)
+        : edm::limited::OutputModuleBase(iPSet), edm::limited::OutputModule<>(iPSet) {}
     std::atomic<unsigned int> m_count{0};
-    
-    void write(edm::EventForOutput const&) override {
-      ++m_count;
-    }
-    void writeRun(edm::RunForOutput const&) override {
-      ++m_count;
-    }
-    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override {
-      ++m_count;
-    }
 
+    void write(edm::EventForOutput const&) override { ++m_count; }
+    void writeRun(edm::RunForOutput const&) override { ++m_count; }
+    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override { ++m_count; }
   };
-  
+
   class FileOutputModule : public edm::limited::OutputModule<edm::WatchInputFiles> {
   public:
     using edm::limited::OutputModuleBase::doPreallocate;
-    FileOutputModule(edm::ParameterSet const& iPSet) : edm::limited::OutputModuleBase(iPSet), edm::limited::OutputModule<edm::WatchInputFiles>(iPSet) {}
+    FileOutputModule(edm::ParameterSet const& iPSet)
+        : edm::limited::OutputModuleBase(iPSet), edm::limited::OutputModule<edm::WatchInputFiles>(iPSet) {}
     std::atomic<unsigned int> m_count{0};
-    void write(edm::EventForOutput const&) override {
-      ++m_count;
-    }
-    void writeRun(edm::RunForOutput const&) override {
-      ++m_count;
-    }
-    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override {
-      ++m_count;
-    }
-    
-    void respondToOpenInputFile(edm::FileBlock const&)  override {
-      ++m_count;
-    }
-    
-    void respondToCloseInputFile(edm::FileBlock const&) override {
-      ++m_count;
-    }
+    void write(edm::EventForOutput const&) override { ++m_count; }
+    void writeRun(edm::RunForOutput const&) override { ++m_count; }
+    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override { ++m_count; }
+
+    void respondToOpenInputFile(edm::FileBlock const&) override { ++m_count; }
+
+    void respondToCloseInputFile(edm::FileBlock const&) override { ++m_count; }
   };
-  
 };
 
 namespace {
@@ -143,16 +126,16 @@ namespace {
   edm::ActivityRegistry activityRegistry;
 
   struct ShadowStreamID {
-    constexpr ShadowStreamID():value(0){}
+    constexpr ShadowStreamID() : value(0) {}
     unsigned int value;
   };
-  
+
   union IDUnion {
-    IDUnion(): m_shadow() {}
+    IDUnion() : m_shadow() {}
     ShadowStreamID m_shadow;
     edm::StreamID m_id;
   };
-}
+}  // namespace
 static edm::StreamID makeID() {
   IDUnion u;
   assert(u.m_id.value() == 0);
@@ -163,30 +146,26 @@ static const edm::StreamID s_streamID0 = makeID();
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testLimitedOutputModule);
 
-testLimitedOutputModule::testLimitedOutputModule():
-m_prodReg(new edm::ProductRegistry{}),
-m_idHelper(new edm::BranchIDListHelper{}),
-m_associationsHelper(new edm::ThinnedAssociationsHelper{}),
-m_ep()
-{
+testLimitedOutputModule::testLimitedOutputModule()
+    : m_prodReg(new edm::ProductRegistry{}),
+      m_idHelper(new edm::BranchIDListHelper{}),
+      m_associationsHelper(new edm::ThinnedAssociationsHelper{}),
+      m_ep() {
   //Setup the principals
   m_prodReg->setFrozen();
   m_idHelper->updateFromRegistry(*m_prodReg);
   edm::EventID eventID = edm::EventID::firstValidEvent();
-  
+
   std::string uuid = edm::createGlobalIdentifier();
   edm::Timestamp now(1234567UL);
   auto runAux = std::make_shared<edm::RunAuxiliary>(eventID.run(), now, now);
-  m_rp.reset(new edm::RunPrincipal(runAux, m_prodReg, m_procConfig, &historyAppender_,0));
-  m_lbp.reset(new edm::LuminosityBlockPrincipal(m_prodReg, m_procConfig, &historyAppender_,0));
+  m_rp.reset(new edm::RunPrincipal(runAux, m_prodReg, m_procConfig, &historyAppender_, 0));
+  m_lbp.reset(new edm::LuminosityBlockPrincipal(m_prodReg, m_procConfig, &historyAppender_, 0));
   m_lbp->setAux(edm::LuminosityBlockAuxiliary(m_rp->run(), 1, now, now));
   m_lbp->setRunPrincipal(m_rp);
   edm::EventAuxiliary eventAux(eventID, uuid, now, true);
 
-  m_ep.reset(new edm::EventPrincipal(m_prodReg,
-                                     m_idHelper,
-                                     m_associationsHelper,
-                                     m_procConfig,nullptr));
+  m_ep.reset(new edm::EventPrincipal(m_prodReg, m_idHelper, m_associationsHelper, m_procConfig, nullptr));
   edm::ProcessHistoryRegistry phr;
   m_ep->fillEventPrincipal(eventAux, phr);
   m_ep->setLuminosityBlockPrincipal(m_lbp.get());
@@ -198,33 +177,35 @@ m_ep()
     iBase->respondToOpenInputFile(fb);
   };
 
-
   m_transToFunc[Trans::kGlobalBeginRun] = [this](edm::Worker* iBase, edm::OutputModuleCommunicator*) {
     typedef edm::OccurrenceTraits<edm::RunPrincipal, edm::BranchActionGlobalBegin> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_rp,*m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr); };
-  
+    iBase->doWork<Traits>(*m_rp, *m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr);
+  };
+
   m_transToFunc[Trans::kGlobalBeginLuminosityBlock] = [this](edm::Worker* iBase, edm::OutputModuleCommunicator*) {
     typedef edm::OccurrenceTraits<edm::LuminosityBlockPrincipal, edm::BranchActionGlobalBegin> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_lbp,*m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr); };
-  
+    iBase->doWork<Traits>(*m_lbp, *m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr);
+  };
+
   m_transToFunc[Trans::kEvent] = [this](edm::Worker* iBase, edm::OutputModuleCommunicator*) {
     typedef edm::OccurrenceTraits<edm::EventPrincipal, edm::BranchActionStreamBegin> Traits;
     edm::StreamContext streamContext(s_streamID0, nullptr);
     edm::ParentContext parentContext(&streamContext);
     iBase->setActivityRegistry(m_actReg);
-    iBase->doWork<Traits>(*m_ep,*m_es, s_streamID0, parentContext, nullptr); };
+    iBase->doWork<Traits>(*m_ep, *m_es, s_streamID0, parentContext, nullptr);
+  };
 
   m_transToFunc[Trans::kGlobalEndLuminosityBlock] = [this](edm::Worker* iBase, edm::OutputModuleCommunicator* iComm) {
     typedef edm::OccurrenceTraits<edm::LuminosityBlockPrincipal, edm::BranchActionGlobalEnd> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_lbp,*m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr);
+    iBase->doWork<Traits>(*m_lbp, *m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr);
     auto t = edm::make_empty_waiting_task();
     t->increment_ref_count();
     iComm->writeLumiAsync(edm::WaitingTaskHolder(t.get()), *m_lbp, nullptr, &activityRegistry);
     t->wait_for_all();
-    if(t->exceptionPtr() != nullptr) {
+    if (t->exceptionPtr() != nullptr) {
       std::rethrow_exception(*t->exceptionPtr());
     }
   };
@@ -232,101 +213,102 @@ m_ep()
   m_transToFunc[Trans::kGlobalEndRun] = [this](edm::Worker* iBase, edm::OutputModuleCommunicator* iComm) {
     typedef edm::OccurrenceTraits<edm::RunPrincipal, edm::BranchActionGlobalEnd> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_rp,*m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr);
+    iBase->doWork<Traits>(*m_rp, *m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr);
     auto t = edm::make_empty_waiting_task();
     t->increment_ref_count();
     iComm->writeRunAsync(edm::WaitingTaskHolder(t.get()), *m_rp, nullptr, &activityRegistry, nullptr);
     t->wait_for_all();
-    if(t->exceptionPtr() != nullptr) {
+    if (t->exceptionPtr() != nullptr) {
       std::rethrow_exception(*t->exceptionPtr());
     }
   };
-  
+
   m_transToFunc[Trans::kGlobalCloseInputFile] = [](edm::Worker* iBase, edm::OutputModuleCommunicator*) {
     edm::FileBlock fb;
     iBase->respondToCloseInputFile(fb);
   };
 
-
   // We want to create the TriggerNamesService because it is used in
   // the tests.  We do that here, but first we need to build a minimal
   // parameter set to pass to its constructor.  Then we build the
   // service and setup the service system.
   edm::ParameterSet proc_pset;
-  
+
   std::string processName("HLT");
   proc_pset.addParameter<std::string>("@process_name", processName);
-  
+
   std::vector<std::string> paths;
   edm::ParameterSet trigPaths;
   trigPaths.addParameter<std::vector<std::string>>("@trigger_paths", paths);
   proc_pset.addParameter<edm::ParameterSet>("@trigger_paths", trigPaths);
-  
+
   std::vector<std::string> endPaths;
   proc_pset.addParameter<std::vector<std::string>>("@end_paths", endPaths);
 
   // Now create and setup the service
   tnsptr_.reset(new w_TNS(std::make_unique<TNS>(proc_pset)));
-  
-  serviceToken_ = edm::ServiceRegistry::createContaining(tnsptr_);
-  
 
+  serviceToken_ = edm::ServiceRegistry::createContaining(tnsptr_);
 }
 
-
 namespace {
-  template<typename T>
-  void
-  testTransition(std::shared_ptr<T> iMod, edm::Worker* iWorker, edm::OutputModuleCommunicator* iComm, testLimitedOutputModule::Trans iTrans, testLimitedOutputModule::Expectations const& iExpect, std::function<void(edm::Worker*, edm::OutputModuleCommunicator*)> iFunc) {
-    assert(0==iMod->m_count);
-    iFunc(iWorker,iComm);
-    auto count = std::count(iExpect.begin(),iExpect.end(),iTrans);
-    if(count != iMod->m_count) {
-      std::cout<<"For trans " <<static_cast<std::underlying_type<testLimitedOutputModule::Trans>::type >(iTrans)<< " expected "<<count<<" and got "<<iMod->m_count<<std::endl;
+  template <typename T>
+  void testTransition(std::shared_ptr<T> iMod,
+                      edm::Worker* iWorker,
+                      edm::OutputModuleCommunicator* iComm,
+                      testLimitedOutputModule::Trans iTrans,
+                      testLimitedOutputModule::Expectations const& iExpect,
+                      std::function<void(edm::Worker*, edm::OutputModuleCommunicator*)> iFunc) {
+    assert(0 == iMod->m_count);
+    iFunc(iWorker, iComm);
+    auto count = std::count(iExpect.begin(), iExpect.end(), iTrans);
+    if (count != iMod->m_count) {
+      std::cout << "For trans " << static_cast<std::underlying_type<testLimitedOutputModule::Trans>::type>(iTrans)
+                << " expected " << count << " and got " << iMod->m_count << std::endl;
     }
     CPPUNIT_ASSERT(iMod->m_count == count);
     iMod->m_count = 0;
     iWorker->reset();
   }
-}
+}  // namespace
 
-template<typename T>
-void
-testLimitedOutputModule::testTransitions(std::shared_ptr<T> iMod, Expectations const& iExpect) {
+template <typename T>
+void testLimitedOutputModule::testTransitions(std::shared_ptr<T> iMod, Expectations const& iExpect) {
   iMod->doPreallocate(m_preallocConfig);
-  edm::WorkerT<edm::limited::OutputModuleBase> w{iMod,m_desc,m_params.actions_};
+  edm::WorkerT<edm::limited::OutputModuleBase> w{iMod, m_desc, m_params.actions_};
   edm::OutputModuleCommunicatorT<edm::limited::OutputModuleBase> comm(iMod.get());
-  for(auto& keyVal: m_transToFunc) {
-    testTransition(iMod,&w,&comm,keyVal.first,iExpect,keyVal.second);
+  for (auto& keyVal : m_transToFunc) {
+    testTransition(iMod, &w, &comm, keyVal.first, iExpect, keyVal.second);
   }
 }
 
-
-void testLimitedOutputModule::basicTest()
-{
+void testLimitedOutputModule::basicTest() {
   //make the services available
   edm::ServiceRegistry::Operate operate(serviceToken_);
 
   edm::ParameterSet pset;
   const unsigned int kLimit = 1;
-  pset.addUntrackedParameter("concurrencyLimit",kLimit);
+  pset.addUntrackedParameter("concurrencyLimit", kLimit);
   auto testProd = std::make_shared<BasicOutputModule>(pset);
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kEvent,Trans::kGlobalEndLuminosityBlock, Trans::kGlobalEndRun});
+  testTransitions(testProd, {Trans::kEvent, Trans::kGlobalEndLuminosityBlock, Trans::kGlobalEndRun});
 }
 
-void testLimitedOutputModule::fileTest()
-{
+void testLimitedOutputModule::fileTest() {
   //make the services available
   edm::ServiceRegistry::Operate operate(serviceToken_);
-  
+
   edm::ParameterSet pset;
   const unsigned int kLimit = 1;
-  pset.addUntrackedParameter("concurrencyLimit",kLimit);
+  pset.addUntrackedParameter("concurrencyLimit", kLimit);
   auto testProd = std::make_shared<FileOutputModule>(pset);
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kGlobalOpenInputFile, Trans::kEvent, Trans::kGlobalEndLuminosityBlock, Trans::kGlobalEndRun, Trans::kGlobalCloseInputFile});
+  testTransitions(testProd,
+                  {Trans::kGlobalOpenInputFile,
+                   Trans::kEvent,
+                   Trans::kGlobalEndLuminosityBlock,
+                   Trans::kGlobalEndRun,
+                   Trans::kGlobalCloseInputFile});
 }
-
diff --git a/FWCore/Framework/test/maker2_t.cppunit.cc b/FWCore/Framework/test/maker2_t.cppunit.cc
index 5778aa50087ca..cca1dd12f942f 100644
--- a/FWCore/Framework/test/maker2_t.cppunit.cc
+++ b/FWCore/Framework/test/maker2_t.cppunit.cc
@@ -20,30 +20,26 @@
 
 using namespace edm;
 
-class TestMod : public EDProducer
-{
- public:
+class TestMod : public EDProducer {
+public:
   explicit TestMod(ParameterSet const& p);
 
   void produce(Event& e, EventSetup const&);
 };
 
-TestMod::TestMod(ParameterSet const&)
-{ produces<int>();}
+TestMod::TestMod(ParameterSet const&) { produces<int>(); }
 
-void TestMod::produce(Event&, EventSetup const&)
-{
-}
+void TestMod::produce(Event&, EventSetup const&) {}
 
 // ----------------------------------------------
-class testmaker2: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(testmaker2);
-CPPUNIT_TEST(maker2Test);
-CPPUNIT_TEST_SUITE_END();
+class testmaker2 : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testmaker2);
+  CPPUNIT_TEST(maker2Test);
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
   void maker2Test();
 };
 
@@ -56,30 +52,31 @@ void testmaker2::maker2Test()
   std::unique_ptr<Maker> f = std::make_unique<WorkerMaker<TestMod>>();
 
   ParameterSet p1;
-  p1.addParameter("@module_type",std::string("TestMod") );
-  p1.addParameter("@module_label",std::string("t1") );
-  p1.addParameter("@module_edm_type",std::string("EDProducer") );
+  p1.addParameter("@module_type", std::string("TestMod"));
+  p1.addParameter("@module_label", std::string("t1"));
+  p1.addParameter("@module_edm_type", std::string("EDProducer"));
   p1.registerIt();
 
   ParameterSet p2;
-  p2.addParameter("@module_type",std::string("TestMod") );
-  p2.addParameter("@module_label",std::string("t2") );
-  p2.addParameter("@module_edm_type",std::string("EDProducer") );
+  p2.addParameter("@module_type", std::string("TestMod"));
+  p2.addParameter("@module_label", std::string("t2"));
+  p2.addParameter("@module_edm_type", std::string("EDProducer"));
   p2.registerIt();
 
   edm::ExceptionToActionTable table;
 
   edm::ProductRegistry preg;
   edm::PreallocationConfiguration prealloc;
-  auto pc = std::make_shared<ProcessConfiguration>("PROD", edm::ParameterSetID(), edm::getReleaseVersion(), edm::getPassID());
+  auto pc =
+      std::make_shared<ProcessConfiguration>("PROD", edm::ParameterSetID(), edm::getReleaseVersion(), edm::getPassID());
   edm::MakeModuleParams params1(&p1, preg, &prealloc, pc);
   edm::MakeModuleParams params2(&p2, preg, &prealloc, pc);
 
   signalslot::Signal<void(const ModuleDescription&)> aSignal;
-  auto m1 = f->makeModule(params1,aSignal,aSignal);
+  auto m1 = f->makeModule(params1, aSignal, aSignal);
   std::unique_ptr<Worker> w1 = m1->makeWorker(&table);
-  auto m2 = f->makeModule(params2,aSignal,aSignal);
+  auto m2 = f->makeModule(params2, aSignal, aSignal);
   std::unique_ptr<Worker> w2 = m2->makeWorker(&table);
 
-//  return 0;
+  //  return 0;
 }
diff --git a/FWCore/Framework/test/maker_t.cppunit.cc b/FWCore/Framework/test/maker_t.cppunit.cc
index 0b52d0a0943ea..440b4951b99df 100644
--- a/FWCore/Framework/test/maker_t.cppunit.cc
+++ b/FWCore/Framework/test/maker_t.cppunit.cc
@@ -1,18 +1,17 @@
 
 #include <iostream>
 
-
 #include "cppunit/extensions/HelperMacros.h"
 
 // ----------------------------------------------
-class testmaker: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(testmaker);
-CPPUNIT_TEST(makerTest);
-CPPUNIT_TEST_SUITE_END();
+class testmaker : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testmaker);
+  CPPUNIT_TEST(makerTest);
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
   void makerTest();
 };
 
@@ -22,14 +21,14 @@ CPPUNIT_TEST_SUITE_REGISTRATION(testmaker);
 void testmaker::makerTest()
 //int main()
 {
-  std::string param1 = 
-    "string module_type = \"TestMod\"\n "
-    " string module_label = \"t1\"";
-
-  std::string param2 = 
-    "string module_type = \"TestMod\" "
-    "string module_label = \"t2\"";
-    
+  std::string param1 =
+      "string module_type = \"TestMod\"\n "
+      " string module_label = \"t1\"";
+
+  std::string param2 =
+      "string module_type = \"TestMod\" "
+      "string module_label = \"t2\"";
+
   /*try {
 
     edmplugin::PluginManager::configure(edmplugin::standard::config());
diff --git a/FWCore/Framework/test/one_outputmodule_t.cppunit.cc b/FWCore/Framework/test/one_outputmodule_t.cppunit.cc
index 8e989a8033fc5..f99ca94123cf3 100644
--- a/FWCore/Framework/test/one_outputmodule_t.cppunit.cc
+++ b/FWCore/Framework/test/one_outputmodule_t.cppunit.cc
@@ -37,10 +37,9 @@ namespace edm {
   class ModuleCallingContext;
 }
 
-class testOneOutputModule: public CppUnit::TestFixture 
-{
+class testOneOutputModule : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testOneOutputModule);
-  
+
   CPPUNIT_TEST(basicTest);
   CPPUNIT_TEST(runTest);
   CPPUNIT_TEST(runCacheTest);
@@ -48,13 +47,14 @@ class testOneOutputModule: public CppUnit::TestFixture
   CPPUNIT_TEST(lumiCacheTest);
   CPPUNIT_TEST(fileTest);
   CPPUNIT_TEST(resourceTest);
-  
+
   CPPUNIT_TEST_SUITE_END();
+
 public:
   testOneOutputModule();
-  
-  void setUp(){}
-  void tearDown(){}
+
+  void setUp() {}
+  void tearDown() {}
 
   void basicTest();
   void runTest();
@@ -76,13 +76,12 @@ class testOneOutputModule: public CppUnit::TestFixture
     kGlobalCloseInputFile,
     kEndJob
   };
-  
+
   typedef std::vector<Trans> Expectations;
 
 private:
+  std::map<Trans, std::function<void(edm::Worker*, edm::OutputModuleCommunicator*)>> m_transToFunc;
 
-  std::map<Trans,std::function<void(edm::Worker*,edm::OutputModuleCommunicator*)>> m_transToFunc;
-  
   edm::ProcessConfiguration m_procConfig;
   edm::PreallocationConfiguration m_preallocConfig;
   std::shared_ptr<edm::ProductRegistry> m_prodReg;
@@ -92,184 +91,128 @@ class testOneOutputModule: public CppUnit::TestFixture
   edm::HistoryAppender historyAppender_;
   std::shared_ptr<edm::LuminosityBlockPrincipal> m_lbp;
   std::shared_ptr<edm::RunPrincipal> m_rp;
-  std::shared_ptr<edm::ActivityRegistry> m_actReg; // We do not use propagate_const because the registry itself is mutable.
+  std::shared_ptr<edm::ActivityRegistry>
+      m_actReg;  // We do not use propagate_const because the registry itself is mutable.
   edm::EventSetupImpl* m_es = nullptr;
-  edm::ModuleDescription m_desc = {"Dummy","dummy"};
+  edm::ModuleDescription m_desc = {"Dummy", "dummy"};
   edm::WorkerParams m_params;
-  
+
   typedef edm::service::TriggerNamesService TNS;
   typedef edm::serviceregistry::ServiceWrapper<TNS> w_TNS;
   std::shared_ptr<w_TNS> tnsptr_;
   edm::ServiceToken serviceToken_;
-  
-  template<typename T>
+
+  template <typename T>
   void testTransitions(std::shared_ptr<T> iMod, Expectations const& iExpect);
-  
+
   class BasicOutputModule : public edm::one::OutputModule<> {
   public:
     using edm::one::OutputModuleBase::doPreallocate;
-    BasicOutputModule(edm::ParameterSet const& iPSet): edm::one::OutputModuleBase(iPSet),edm::one::OutputModule<>(iPSet){}
+    BasicOutputModule(edm::ParameterSet const& iPSet)
+        : edm::one::OutputModuleBase(iPSet), edm::one::OutputModule<>(iPSet) {}
     unsigned int m_count = 0;
-    
-    void write(edm::EventForOutput const&) override {
-      ++m_count;
-    }
-    void writeRun(edm::RunForOutput const&) override {
-      ++m_count;
-    }
-    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override {
-      ++m_count;
-    }
 
+    void write(edm::EventForOutput const&) override { ++m_count; }
+    void writeRun(edm::RunForOutput const&) override { ++m_count; }
+    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override { ++m_count; }
   };
-  
+
   class RunOutputModule : public edm::one::OutputModule<edm::one::WatchRuns> {
   public:
     using edm::one::OutputModuleBase::doPreallocate;
-    RunOutputModule(edm::ParameterSet const& iPSet) : edm::one::OutputModuleBase(iPSet), edm::one::OutputModule<edm::one::WatchRuns>(iPSet) {}
+    RunOutputModule(edm::ParameterSet const& iPSet)
+        : edm::one::OutputModuleBase(iPSet), edm::one::OutputModule<edm::one::WatchRuns>(iPSet) {}
     unsigned int m_count = 0;
-    void write(edm::EventForOutput const&) override {
-      ++m_count;
-    }
-    void writeRun(edm::RunForOutput const&) override {
-      ++m_count;
-    }
-    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override {
-      ++m_count;
-    }
-    
-    void beginRun(edm::RunForOutput const&)  override {
-      ++m_count;
-    }
+    void write(edm::EventForOutput const&) override { ++m_count; }
+    void writeRun(edm::RunForOutput const&) override { ++m_count; }
+    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override { ++m_count; }
 
-    void endRun(edm::RunForOutput const&)  override {
-      ++m_count;
-    }
+    void beginRun(edm::RunForOutput const&) override { ++m_count; }
+
+    void endRun(edm::RunForOutput const&) override { ++m_count; }
   };
 
   class LumiOutputModule : public edm::one::OutputModule<edm::one::WatchLuminosityBlocks> {
   public:
     using edm::one::OutputModuleBase::doPreallocate;
-    LumiOutputModule(edm::ParameterSet const& iPSet) : edm::one::OutputModuleBase(iPSet), edm::one::OutputModule<edm::one::WatchLuminosityBlocks>(iPSet) {}
+    LumiOutputModule(edm::ParameterSet const& iPSet)
+        : edm::one::OutputModuleBase(iPSet), edm::one::OutputModule<edm::one::WatchLuminosityBlocks>(iPSet) {}
     unsigned int m_count = 0;
-    void write(edm::EventForOutput const&) override {
-      ++m_count;
-    }
-    void writeRun(edm::RunForOutput const&) override {
-      ++m_count;
-    }
-    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override {
-      ++m_count;
-    }
-    
-    
-    void beginLuminosityBlock(edm::LuminosityBlockForOutput const&)  override {
-      ++m_count;
-    }
-    
-    void endLuminosityBlock(edm::LuminosityBlockForOutput const&) override {
-      ++m_count;
-    }
+    void write(edm::EventForOutput const&) override { ++m_count; }
+    void writeRun(edm::RunForOutput const&) override { ++m_count; }
+    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override { ++m_count; }
+
+    void beginLuminosityBlock(edm::LuminosityBlockForOutput const&) override { ++m_count; }
+
+    void endLuminosityBlock(edm::LuminosityBlockForOutput const&) override { ++m_count; }
   };
 
   struct DummyCache {};
-  
+
   class RunCacheOutputModule : public edm::one::OutputModule<edm::RunCache<DummyCache>> {
   public:
     using edm::one::OutputModuleBase::doPreallocate;
-    RunCacheOutputModule(edm::ParameterSet const& iPSet) : edm::one::OutputModuleBase(iPSet), edm::one::OutputModule<edm::RunCache<DummyCache>>(iPSet) {}
+    RunCacheOutputModule(edm::ParameterSet const& iPSet)
+        : edm::one::OutputModuleBase(iPSet), edm::one::OutputModule<edm::RunCache<DummyCache>>(iPSet) {}
     mutable unsigned int m_count = 0;
-    void write(edm::EventForOutput const&) override {
-      ++m_count;
-    }
-    void writeRun(edm::RunForOutput const&) override {
-      ++m_count;
-    }
-    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override {
-      ++m_count;
-    }
-    
+    void write(edm::EventForOutput const&) override { ++m_count; }
+    void writeRun(edm::RunForOutput const&) override { ++m_count; }
+    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override { ++m_count; }
+
     std::shared_ptr<DummyCache> globalBeginRun(edm::RunForOutput const&) const override {
       ++m_count;
       return std::shared_ptr<DummyCache>{};
     }
 
-    void globalEndRun(edm::RunForOutput const&)  override {
-      ++m_count;
-    }
+    void globalEndRun(edm::RunForOutput const&) override { ++m_count; }
   };
 
   class LumiCacheOutputModule : public edm::one::OutputModule<edm::LuminosityBlockCache<DummyCache>> {
   public:
     using edm::one::OutputModuleBase::doPreallocate;
-    LumiCacheOutputModule(edm::ParameterSet const& iPSet) : edm::one::OutputModuleBase(iPSet), edm::one::OutputModule<edm::LuminosityBlockCache<DummyCache>>(iPSet) {}
+    LumiCacheOutputModule(edm::ParameterSet const& iPSet)
+        : edm::one::OutputModuleBase(iPSet), edm::one::OutputModule<edm::LuminosityBlockCache<DummyCache>>(iPSet) {}
     mutable unsigned int m_count = 0;
-    void write(edm::EventForOutput const&) override {
-      ++m_count;
-    }
-    void writeRun(edm::RunForOutput const&) override {
-      ++m_count;
-    }
-    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override {
-      ++m_count;
-    }
-    
-    
+    void write(edm::EventForOutput const&) override { ++m_count; }
+    void writeRun(edm::RunForOutput const&) override { ++m_count; }
+    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override { ++m_count; }
+
     std::shared_ptr<DummyCache> globalBeginLuminosityBlock(edm::LuminosityBlockForOutput const&) const override {
       ++m_count;
       return std::shared_ptr<DummyCache>{};
     }
-    
-    void globalEndLuminosityBlock(edm::LuminosityBlockForOutput const&) override {
-      ++m_count;
-    }
+
+    void globalEndLuminosityBlock(edm::LuminosityBlockForOutput const&) override { ++m_count; }
   };
 
   class FileOutputModule : public edm::one::OutputModule<edm::WatchInputFiles> {
   public:
     using edm::one::OutputModuleBase::doPreallocate;
-    FileOutputModule(edm::ParameterSet const& iPSet) : edm::one::OutputModuleBase(iPSet), edm::one::OutputModule<edm::WatchInputFiles>(iPSet) {}
+    FileOutputModule(edm::ParameterSet const& iPSet)
+        : edm::one::OutputModuleBase(iPSet), edm::one::OutputModule<edm::WatchInputFiles>(iPSet) {}
     unsigned int m_count = 0;
-    void write(edm::EventForOutput const&) override {
-      ++m_count;
-    }
-    void writeRun(edm::RunForOutput const&) override {
-      ++m_count;
-    }
-    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override {
-      ++m_count;
-    }
-    
-    void respondToOpenInputFile(edm::FileBlock const&)  override {
-      ++m_count;
-    }
-    
-    void respondToCloseInputFile(edm::FileBlock const&) override {
-      ++m_count;
-    }
+    void write(edm::EventForOutput const&) override { ++m_count; }
+    void writeRun(edm::RunForOutput const&) override { ++m_count; }
+    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override { ++m_count; }
+
+    void respondToOpenInputFile(edm::FileBlock const&) override { ++m_count; }
+
+    void respondToCloseInputFile(edm::FileBlock const&) override { ++m_count; }
   };
-  
+
   class ResourceOutputModule : public edm::one::OutputModule<edm::one::SharedResources> {
   public:
     using edm::one::OutputModuleBase::doPreallocate;
-    ResourceOutputModule(edm::ParameterSet const& iPSet): edm::one::OutputModuleBase(iPSet),edm::one::OutputModule<edm::one::SharedResources>(iPSet){
+    ResourceOutputModule(edm::ParameterSet const& iPSet)
+        : edm::one::OutputModuleBase(iPSet), edm::one::OutputModule<edm::one::SharedResources>(iPSet) {
       usesResource();
     }
     unsigned int m_count = 0;
-    
-    void write(edm::EventForOutput const&) override {
-      ++m_count;
-    }
-    void writeRun(edm::RunForOutput const&) override {
-      ++m_count;
-    }
-    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override {
-      ++m_count;
-    }
-    
-  };
-
 
+    void write(edm::EventForOutput const&) override { ++m_count; }
+    void writeRun(edm::RunForOutput const&) override { ++m_count; }
+    void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override { ++m_count; }
+  };
 };
 
 namespace {
@@ -277,16 +220,16 @@ namespace {
   edm::ActivityRegistry activityRegistry;
 
   struct ShadowStreamID {
-    constexpr ShadowStreamID():value(0){}
+    constexpr ShadowStreamID() : value(0) {}
     unsigned int value;
   };
-  
+
   union IDUnion {
-    IDUnion(): m_shadow() {}
+    IDUnion() : m_shadow() {}
     ShadowStreamID m_shadow;
     edm::StreamID m_id;
   };
-}
+}  // namespace
 static edm::StreamID makeID() {
   IDUnion u;
   assert(u.m_id.value() == 0);
@@ -297,31 +240,27 @@ static const edm::StreamID s_streamID0 = makeID();
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testOneOutputModule);
 
-testOneOutputModule::testOneOutputModule():
-m_prodReg(new edm::ProductRegistry{}),
-m_idHelper(new edm::BranchIDListHelper{}),
-m_associationsHelper(new edm::ThinnedAssociationsHelper{}),
-m_ep()
-{
+testOneOutputModule::testOneOutputModule()
+    : m_prodReg(new edm::ProductRegistry{}),
+      m_idHelper(new edm::BranchIDListHelper{}),
+      m_associationsHelper(new edm::ThinnedAssociationsHelper{}),
+      m_ep() {
   //Setup the principals
   m_prodReg->setFrozen();
   m_idHelper->updateFromRegistry(*m_prodReg);
   edm::EventID eventID = edm::EventID::firstValidEvent();
-  
+
   std::string uuid = edm::createGlobalIdentifier();
   edm::Timestamp now(1234567UL);
   auto runAux = std::make_shared<edm::RunAuxiliary>(eventID.run(), now, now);
-  m_rp.reset(new edm::RunPrincipal(runAux, m_prodReg, m_procConfig, &historyAppender_,0));
+  m_rp.reset(new edm::RunPrincipal(runAux, m_prodReg, m_procConfig, &historyAppender_, 0));
   edm::LuminosityBlockAuxiliary lumiAux(m_rp->run(), 1, now, now);
-  m_lbp.reset(new edm::LuminosityBlockPrincipal(m_prodReg, m_procConfig, &historyAppender_,0));
+  m_lbp.reset(new edm::LuminosityBlockPrincipal(m_prodReg, m_procConfig, &historyAppender_, 0));
   m_lbp->setAux(lumiAux);
   m_lbp->setRunPrincipal(m_rp);
   edm::EventAuxiliary eventAux(eventID, uuid, now, true);
 
-  m_ep.reset(new edm::EventPrincipal(m_prodReg,
-                                     m_idHelper,
-                                     m_associationsHelper,
-                                     m_procConfig,nullptr));
+  m_ep.reset(new edm::EventPrincipal(m_prodReg, m_idHelper, m_associationsHelper, m_procConfig, nullptr));
   edm::ProcessHistoryRegistry phr;
   m_ep->fillEventPrincipal(eventAux, phr);
   m_ep->setLuminosityBlockPrincipal(m_lbp.get());
@@ -333,33 +272,35 @@ m_ep()
     iBase->respondToOpenInputFile(fb);
   };
 
-
   m_transToFunc[Trans::kGlobalBeginRun] = [this](edm::Worker* iBase, edm::OutputModuleCommunicator*) {
     typedef edm::OccurrenceTraits<edm::RunPrincipal, edm::BranchActionGlobalBegin> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_rp,*m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr); };
-  
+    iBase->doWork<Traits>(*m_rp, *m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr);
+  };
+
   m_transToFunc[Trans::kGlobalBeginLuminosityBlock] = [this](edm::Worker* iBase, edm::OutputModuleCommunicator*) {
     typedef edm::OccurrenceTraits<edm::LuminosityBlockPrincipal, edm::BranchActionGlobalBegin> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_lbp,*m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr); };
-  
+    iBase->doWork<Traits>(*m_lbp, *m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr);
+  };
+
   m_transToFunc[Trans::kEvent] = [this](edm::Worker* iBase, edm::OutputModuleCommunicator*) {
     typedef edm::OccurrenceTraits<edm::EventPrincipal, edm::BranchActionStreamBegin> Traits;
     edm::StreamContext streamContext(s_streamID0, nullptr);
     edm::ParentContext parentContext(&streamContext);
     iBase->setActivityRegistry(m_actReg);
-    iBase->doWork<Traits>(*m_ep,*m_es, s_streamID0, parentContext, nullptr); };
+    iBase->doWork<Traits>(*m_ep, *m_es, s_streamID0, parentContext, nullptr);
+  };
 
   m_transToFunc[Trans::kGlobalEndLuminosityBlock] = [this](edm::Worker* iBase, edm::OutputModuleCommunicator* iComm) {
     typedef edm::OccurrenceTraits<edm::LuminosityBlockPrincipal, edm::BranchActionGlobalEnd> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_lbp,*m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr);
+    iBase->doWork<Traits>(*m_lbp, *m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr);
     auto t = edm::make_empty_waiting_task();
     t->increment_ref_count();
     iComm->writeLumiAsync(edm::WaitingTaskHolder(t.get()), *m_lbp, nullptr, &activityRegistry);
     t->wait_for_all();
-    if(t->exceptionPtr() != nullptr) {
+    if (t->exceptionPtr() != nullptr) {
       std::rethrow_exception(*t->exceptionPtr());
     }
   };
@@ -367,158 +308,174 @@ m_ep()
   m_transToFunc[Trans::kGlobalEndRun] = [this](edm::Worker* iBase, edm::OutputModuleCommunicator* iComm) {
     typedef edm::OccurrenceTraits<edm::RunPrincipal, edm::BranchActionGlobalEnd> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_rp,*m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr);
+    iBase->doWork<Traits>(*m_rp, *m_es, edm::StreamID::invalidStreamID(), parentContext, nullptr);
     auto t = edm::make_empty_waiting_task();
     t->increment_ref_count();
     iComm->writeRunAsync(edm::WaitingTaskHolder(t.get()), *m_rp, nullptr, &activityRegistry, nullptr);
     t->wait_for_all();
-    if(t->exceptionPtr() != nullptr) {
+    if (t->exceptionPtr() != nullptr) {
       std::rethrow_exception(*t->exceptionPtr());
     }
   };
-  
+
   m_transToFunc[Trans::kGlobalCloseInputFile] = [](edm::Worker* iBase, edm::OutputModuleCommunicator*) {
     edm::FileBlock fb;
     iBase->respondToCloseInputFile(fb);
   };
 
-
   // We want to create the TriggerNamesService because it is used in
   // the tests.  We do that here, but first we need to build a minimal
   // parameter set to pass to its constructor.  Then we build the
   // service and setup the service system.
   edm::ParameterSet proc_pset;
-  
+
   std::string processName("HLT");
   proc_pset.addParameter<std::string>("@process_name", processName);
-  
+
   std::vector<std::string> paths;
   edm::ParameterSet trigPaths;
   trigPaths.addParameter<std::vector<std::string>>("@trigger_paths", paths);
   proc_pset.addParameter<edm::ParameterSet>("@trigger_paths", trigPaths);
-  
+
   std::vector<std::string> endPaths;
   proc_pset.addParameter<std::vector<std::string>>("@end_paths", endPaths);
 
   // Now create and setup the service
   tnsptr_.reset(new w_TNS(std::make_unique<TNS>(proc_pset)));
-  
-  serviceToken_ = edm::ServiceRegistry::createContaining(tnsptr_);
-  
 
+  serviceToken_ = edm::ServiceRegistry::createContaining(tnsptr_);
 }
 
-
 namespace {
-  template<typename T>
-  void
-  testTransition(std::shared_ptr<T> iMod, edm::Worker* iWorker, edm::OutputModuleCommunicator* iComm, testOneOutputModule::Trans iTrans, testOneOutputModule::Expectations const& iExpect, std::function<void(edm::Worker*, edm::OutputModuleCommunicator*)> iFunc) {
-    assert(0==iMod->m_count);
-    iFunc(iWorker,iComm);
-    auto count = std::count(iExpect.begin(),iExpect.end(),iTrans);
-    if(count != iMod->m_count) {
-      std::cout<<"For trans " <<static_cast<std::underlying_type<testOneOutputModule::Trans>::type >(iTrans)<< " expected "<<count<<" and got "<<iMod->m_count<<std::endl;
+  template <typename T>
+  void testTransition(std::shared_ptr<T> iMod,
+                      edm::Worker* iWorker,
+                      edm::OutputModuleCommunicator* iComm,
+                      testOneOutputModule::Trans iTrans,
+                      testOneOutputModule::Expectations const& iExpect,
+                      std::function<void(edm::Worker*, edm::OutputModuleCommunicator*)> iFunc) {
+    assert(0 == iMod->m_count);
+    iFunc(iWorker, iComm);
+    auto count = std::count(iExpect.begin(), iExpect.end(), iTrans);
+    if (count != iMod->m_count) {
+      std::cout << "For trans " << static_cast<std::underlying_type<testOneOutputModule::Trans>::type>(iTrans)
+                << " expected " << count << " and got " << iMod->m_count << std::endl;
     }
     CPPUNIT_ASSERT(iMod->m_count == count);
     iMod->m_count = 0;
     iWorker->reset();
   }
-}
+}  // namespace
 
-template<typename T>
-void
-testOneOutputModule::testTransitions(std::shared_ptr<T> iMod, Expectations const& iExpect) {
+template <typename T>
+void testOneOutputModule::testTransitions(std::shared_ptr<T> iMod, Expectations const& iExpect) {
   iMod->doPreallocate(m_preallocConfig);
-  edm::WorkerT<edm::one::OutputModuleBase> w{iMod,m_desc,m_params.actions_};
+  edm::WorkerT<edm::one::OutputModuleBase> w{iMod, m_desc, m_params.actions_};
   w.beginJob();
   edm::OutputModuleCommunicatorT<edm::one::OutputModuleBase> comm(iMod.get());
-  for(auto& keyVal: m_transToFunc) {
-    testTransition(iMod,&w,&comm,keyVal.first,iExpect,keyVal.second);
+  for (auto& keyVal : m_transToFunc) {
+    testTransition(iMod, &w, &comm, keyVal.first, iExpect, keyVal.second);
   }
 }
 
-
-void testOneOutputModule::basicTest()
-{
+void testOneOutputModule::basicTest() {
   //make the services available
   edm::ServiceRegistry::Operate operate(serviceToken_);
 
   edm::ParameterSet pset;
   auto testProd = std::make_shared<BasicOutputModule>(pset);
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kEvent,Trans::kGlobalEndLuminosityBlock, Trans::kGlobalEndRun});
+  testTransitions(testProd, {Trans::kEvent, Trans::kGlobalEndLuminosityBlock, Trans::kGlobalEndRun});
 }
 
-void testOneOutputModule::runTest()
-{
+void testOneOutputModule::runTest() {
   //make the services available
   edm::ServiceRegistry::Operate operate(serviceToken_);
 
   edm::ParameterSet pset;
   auto testProd = std::make_shared<RunOutputModule>(pset);
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kGlobalBeginRun, Trans::kEvent, Trans::kGlobalEndLuminosityBlock, Trans::kGlobalEndRun, Trans::kGlobalEndRun});
+  testTransitions(testProd,
+                  {Trans::kGlobalBeginRun,
+                   Trans::kEvent,
+                   Trans::kGlobalEndLuminosityBlock,
+                   Trans::kGlobalEndRun,
+                   Trans::kGlobalEndRun});
 }
 
-void testOneOutputModule::lumiTest()
-{
+void testOneOutputModule::lumiTest() {
   //make the services available
   edm::ServiceRegistry::Operate operate(serviceToken_);
 
   edm::ParameterSet pset;
   auto testProd = std::make_shared<LumiOutputModule>(pset);
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kGlobalBeginLuminosityBlock, Trans::kEvent, Trans::kGlobalEndLuminosityBlock, Trans::kGlobalEndLuminosityBlock, Trans::kGlobalEndRun});
+  testTransitions(testProd,
+                  {Trans::kGlobalBeginLuminosityBlock,
+                   Trans::kEvent,
+                   Trans::kGlobalEndLuminosityBlock,
+                   Trans::kGlobalEndLuminosityBlock,
+                   Trans::kGlobalEndRun});
 }
 
-void testOneOutputModule::runCacheTest()
-{
+void testOneOutputModule::runCacheTest() {
   //make the services available
   edm::ServiceRegistry::Operate operate(serviceToken_);
 
   edm::ParameterSet pset;
   auto testProd = std::make_shared<RunCacheOutputModule>(pset);
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kGlobalBeginRun, Trans::kEvent, Trans::kGlobalEndLuminosityBlock, Trans::kGlobalEndRun, Trans::kGlobalEndRun});
+  testTransitions(testProd,
+                  {Trans::kGlobalBeginRun,
+                   Trans::kEvent,
+                   Trans::kGlobalEndLuminosityBlock,
+                   Trans::kGlobalEndRun,
+                   Trans::kGlobalEndRun});
 }
 
-void testOneOutputModule::lumiCacheTest()
-{
+void testOneOutputModule::lumiCacheTest() {
   //make the services available
   edm::ServiceRegistry::Operate operate(serviceToken_);
 
   edm::ParameterSet pset;
   auto testProd = std::make_shared<LumiCacheOutputModule>(pset);
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kGlobalBeginLuminosityBlock, Trans::kEvent, Trans::kGlobalEndLuminosityBlock, Trans::kGlobalEndLuminosityBlock, Trans::kGlobalEndRun});
+  testTransitions(testProd,
+                  {Trans::kGlobalBeginLuminosityBlock,
+                   Trans::kEvent,
+                   Trans::kGlobalEndLuminosityBlock,
+                   Trans::kGlobalEndLuminosityBlock,
+                   Trans::kGlobalEndRun});
 }
 
-void testOneOutputModule::fileTest()
-{
+void testOneOutputModule::fileTest() {
   //make the services available
   edm::ServiceRegistry::Operate operate(serviceToken_);
-  
+
   edm::ParameterSet pset;
   auto testProd = std::make_shared<FileOutputModule>(pset);
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kGlobalOpenInputFile, Trans::kEvent, Trans::kGlobalEndLuminosityBlock, Trans::kGlobalEndRun, Trans::kGlobalCloseInputFile});
+  testTransitions(testProd,
+                  {Trans::kGlobalOpenInputFile,
+                   Trans::kEvent,
+                   Trans::kGlobalEndLuminosityBlock,
+                   Trans::kGlobalEndRun,
+                   Trans::kGlobalCloseInputFile});
 }
 
-void testOneOutputModule::resourceTest()
-{
+void testOneOutputModule::resourceTest() {
   //make the services available
   edm::ServiceRegistry::Operate operate(serviceToken_);
-  
+
   edm::ParameterSet pset;
   auto testProd = std::make_shared<ResourceOutputModule>(pset);
-  
+
   CPPUNIT_ASSERT(0 == testProd->m_count);
-  testTransitions(testProd, {Trans::kEvent,Trans::kGlobalEndLuminosityBlock, Trans::kGlobalEndRun});
+  testTransitions(testProd, {Trans::kEvent, Trans::kGlobalEndLuminosityBlock, Trans::kGlobalEndRun});
 }
-
diff --git a/FWCore/Framework/test/productregistry.cppunit.cc b/FWCore/Framework/test/productregistry.cppunit.cc
index 9b02f61d603e1..f5816df6cf20c 100644
--- a/FWCore/Framework/test/productregistry.cppunit.cc
+++ b/FWCore/Framework/test/productregistry.cppunit.cc
@@ -6,7 +6,6 @@
    \date 21 July 2005
 */
 
-
 #include "DataFormats/Provenance/interface/BranchDescription.h"
 #include "DataFormats/Provenance/interface/ProcessConfiguration.h"
 #include "FWCore/Framework/interface/ConstProductRegistry.h"
@@ -24,17 +23,17 @@
 
 #include <iostream>
 
-class testProductRegistry: public CppUnit::TestFixture {
-CPPUNIT_TEST_SUITE(testProductRegistry);
+class testProductRegistry : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testProductRegistry);
 
-CPPUNIT_TEST(testSignal);
-CPPUNIT_TEST(testWatch);
-CPPUNIT_TEST_EXCEPTION(testCircular,cms::Exception);
+  CPPUNIT_TEST(testSignal);
+  CPPUNIT_TEST(testWatch);
+  CPPUNIT_TEST_EXCEPTION(testCircular, cms::Exception);
 
-CPPUNIT_TEST(testProductRegistration);
-CPPUNIT_TEST(testAddAlias);
+  CPPUNIT_TEST(testProductRegistration);
+  CPPUNIT_TEST(testAddAlias);
 
-CPPUNIT_TEST_SUITE_END();
+  CPPUNIT_TEST_SUITE_END();
 
 public:
   testProductRegistry();
@@ -46,7 +45,7 @@ CPPUNIT_TEST_SUITE_END();
   void testProductRegistration();
   void testAddAlias();
 
- private:
+private:
   std::shared_ptr<edm::BranchDescription> intBranch_;
   std::shared_ptr<edm::BranchDescription> floatBranch_;
 };
@@ -55,48 +54,40 @@ CPPUNIT_TEST_SUITE_END();
 CPPUNIT_TEST_SUITE_REGISTRATION(testProductRegistry);
 
 namespace {
-   struct Listener {
-      int* heard_;
-      Listener(int& hear) : heard_(&hear) {}
-      void operator()(edm::BranchDescription const&) {
-         ++(*heard_);
-      }
-   };
-
-   struct Responder {
-      std::string name_;
-      edm::ProductRegistry* reg_;
-      Responder(std::string const& iName,
-                edm::ConstProductRegistry& iConstReg,
-                edm::ProductRegistry& iReg) : name_(iName),reg_(&iReg) {
-        iConstReg.watchProductAdditions(this, &Responder::respond);
-      }
-      void respond(edm::BranchDescription const& iDesc) {
-         edm::ParameterSet dummyProcessPset;
-         dummyProcessPset.registerIt();
-         auto pc = std::make_shared<edm::ProcessConfiguration>();
-         pc->setParameterSetID(dummyProcessPset.id());
-
-         edm::BranchDescription prod(iDesc.branchType(),
-                                     name_,
-                                     iDesc.processName(),
-                                     iDesc.fullClassName(),
-                                     iDesc.friendlyClassName(),
-                                     iDesc.productInstanceName() + "-" + name_,
-                                     "",
-                                     iDesc.parameterSetID(),
-                                     iDesc.unwrappedType()
-                                    );
-         reg_->addProduct(prod);
-      }
-   };
-}
-
-testProductRegistry::testProductRegistry() :
-  intBranch_(),
-  floatBranch_() {
-}
-
+  struct Listener {
+    int* heard_;
+    Listener(int& hear) : heard_(&hear) {}
+    void operator()(edm::BranchDescription const&) { ++(*heard_); }
+  };
+
+  struct Responder {
+    std::string name_;
+    edm::ProductRegistry* reg_;
+    Responder(std::string const& iName, edm::ConstProductRegistry& iConstReg, edm::ProductRegistry& iReg)
+        : name_(iName), reg_(&iReg) {
+      iConstReg.watchProductAdditions(this, &Responder::respond);
+    }
+    void respond(edm::BranchDescription const& iDesc) {
+      edm::ParameterSet dummyProcessPset;
+      dummyProcessPset.registerIt();
+      auto pc = std::make_shared<edm::ProcessConfiguration>();
+      pc->setParameterSetID(dummyProcessPset.id());
+
+      edm::BranchDescription prod(iDesc.branchType(),
+                                  name_,
+                                  iDesc.processName(),
+                                  iDesc.fullClassName(),
+                                  iDesc.friendlyClassName(),
+                                  iDesc.productInstanceName() + "-" + name_,
+                                  "",
+                                  iDesc.parameterSetID(),
+                                  iDesc.unwrappedType());
+      reg_->addProduct(prod);
+    }
+  };
+}  // namespace
+
+testProductRegistry::testProductRegistry() : intBranch_(), floatBranch_() {}
 
 void testProductRegistry::setUp() {
   edm::ParameterSet dummyProcessPset;
@@ -106,99 +97,97 @@ void testProductRegistry::setUp() {
 
   edm::ParameterSet pset;
   pset.registerIt();
-  intBranch_.reset(new edm::BranchDescription(edm::InEvent, "labeli", "PROD",
-                                          "int", "int", "int",
-                                          "", pset.id(),
-                                          edm::TypeWithDict(typeid(int))));
-
-  floatBranch_.reset(new edm::BranchDescription(edm::InEvent, "labelf", "PROD",
-                                            "float", "float", "float",
-                                            "", pset.id(),
-                                            edm::TypeWithDict(typeid(float))));
+  intBranch_.reset(new edm::BranchDescription(
+      edm::InEvent, "labeli", "PROD", "int", "int", "int", "", pset.id(), edm::TypeWithDict(typeid(int))));
 
+  floatBranch_.reset(new edm::BranchDescription(
+      edm::InEvent, "labelf", "PROD", "float", "float", "float", "", pset.id(), edm::TypeWithDict(typeid(float))));
 }
 
 namespace {
-  template <class T> void kill_and_clear(std::shared_ptr<T>& p) { p.reset(); }
-}
+  template <class T>
+  void kill_and_clear(std::shared_ptr<T>& p) {
+    p.reset();
+  }
+}  // namespace
 
 void testProductRegistry::tearDown() {
   kill_and_clear(floatBranch_);
   kill_and_clear(intBranch_);
 }
 
-void testProductRegistry:: testSignal() {
-   using namespace edm;
-   SignallingProductRegistry reg;
+void testProductRegistry::testSignal() {
+  using namespace edm;
+  SignallingProductRegistry reg;
 
-   int hear=0;
-   Listener listening(hear);
-   reg.productAddedSignal_.connect(listening);
+  int hear = 0;
+  Listener listening(hear);
+  reg.productAddedSignal_.connect(listening);
 
-   //BranchDescription prod(InEvent, "label", "PROD", "int", "int", "int", md);
+  //BranchDescription prod(InEvent, "label", "PROD", "int", "int", "int", md);
 
-   //   reg.addProduct(prod);
-   reg.addProduct(*intBranch_);
-   CPPUNIT_ASSERT(1 == hear);
+  //   reg.addProduct(prod);
+  reg.addProduct(*intBranch_);
+  CPPUNIT_ASSERT(1 == hear);
 }
 
-void testProductRegistry:: testWatch() {
-   using namespace edm;
-   SignallingProductRegistry reg;
-   ConstProductRegistry constReg(reg);
-
-   int hear=0;
-   Listener listening(hear);
-   constReg.watchProductAdditions(listening);
-   constReg.watchProductAdditions(listening, &Listener::operator());
-
-   Responder one("one",constReg, reg);
-
-   //BranchDescription prod(InEvent, "label", "PROD", "int", "int", "int");
-   //reg.addProduct(prod);
-   reg.addProduct(*intBranch_);
-
-   //BranchDescription prod2(InEvent, "label", "PROD", "float", "float", "float");
-   //   reg.addProduct(prod2);
-   reg.addProduct(*floatBranch_);
-
-   //Should be 4 products
-   // 1 from the 'int' in this routine
-   // 1 from 'one' responding to this call
-   // 1 from the 'float'
-   // 1 from 'one' responding to the original call
-   CPPUNIT_ASSERT(4 * 2 == hear);
-   CPPUNIT_ASSERT(4 == reg.size());
+void testProductRegistry::testWatch() {
+  using namespace edm;
+  SignallingProductRegistry reg;
+  ConstProductRegistry constReg(reg);
+
+  int hear = 0;
+  Listener listening(hear);
+  constReg.watchProductAdditions(listening);
+  constReg.watchProductAdditions(listening, &Listener::operator());
+
+  Responder one("one", constReg, reg);
+
+  //BranchDescription prod(InEvent, "label", "PROD", "int", "int", "int");
+  //reg.addProduct(prod);
+  reg.addProduct(*intBranch_);
+
+  //BranchDescription prod2(InEvent, "label", "PROD", "float", "float", "float");
+  //   reg.addProduct(prod2);
+  reg.addProduct(*floatBranch_);
+
+  //Should be 4 products
+  // 1 from the 'int' in this routine
+  // 1 from 'one' responding to this call
+  // 1 from the 'float'
+  // 1 from 'one' responding to the original call
+  CPPUNIT_ASSERT(4 * 2 == hear);
+  CPPUNIT_ASSERT(4 == reg.size());
 }
-void testProductRegistry:: testCircular() {
-   using namespace edm;
-   SignallingProductRegistry reg;
-   ConstProductRegistry constReg(reg);
-
-   int hear=0;
-   Listener listening(hear);
-   constReg.watchProductAdditions(listening);
-   constReg.watchProductAdditions(listening, &Listener::operator());
-
-   Responder one("one", constReg, reg);
-   Responder two("two", constReg, reg);
-
-   //BranchDescription prod(InEvent, "label","PROD","int","int","int");
-   //reg.addProduct(prod);
-   reg.addProduct(*intBranch_);
-
-   //Should be 5 products
-   // 1 from the original 'add' in this routine
-   // 1 from 'one' responding to this call
-   // 1 from 'two' responding to 'one'
-   // 1 from 'two' responding to the original call
-   // 1 from 'one' responding to 'two'
-   CPPUNIT_ASSERT(5 * 2 == hear);
-   CPPUNIT_ASSERT(5 == reg.size());
+void testProductRegistry::testCircular() {
+  using namespace edm;
+  SignallingProductRegistry reg;
+  ConstProductRegistry constReg(reg);
+
+  int hear = 0;
+  Listener listening(hear);
+  constReg.watchProductAdditions(listening);
+  constReg.watchProductAdditions(listening, &Listener::operator());
+
+  Responder one("one", constReg, reg);
+  Responder two("two", constReg, reg);
+
+  //BranchDescription prod(InEvent, "label","PROD","int","int","int");
+  //reg.addProduct(prod);
+  reg.addProduct(*intBranch_);
+
+  //Should be 5 products
+  // 1 from the original 'add' in this routine
+  // 1 from 'one' responding to this call
+  // 1 from 'two' responding to 'one'
+  // 1 from 'two' responding to the original call
+  // 1 from 'one' responding to 'two'
+  CPPUNIT_ASSERT(5 * 2 == hear);
+  CPPUNIT_ASSERT(5 == reg.size());
 }
 
-void testProductRegistry:: testProductRegistration() {
-   edm::AssertHandler ah;
+void testProductRegistry::testProductRegistration() {
+  edm::AssertHandler ah;
 
   std::string configuration(
       "import FWCore.ParameterSet.Config as cms\n"
@@ -211,7 +200,7 @@ void testProductRegistry:: testProductRegistration() {
       "process.p = cms.Path(process.m1*process.m2)\n");
   try {
     edm::EventProcessor proc(edm::getPSetFromConfig(configuration));
-  } catch(cms::Exception const& iException) {
+  } catch (cms::Exception const& iException) {
     std::cout << "caught " << iException.explainSelf() << std::endl;
     throw;
   }
@@ -228,8 +217,6 @@ void testProductRegistry::testAddAlias() {
 
   reg.setFrozen(false);
   std::vector<std::pair<std::string, std::string> > const& v = reg.aliasToOriginal();
-  CPPUNIT_ASSERT(v.at(0).first == "aliasf" &&
-                 v.at(0).second == "labelf" &&
-                 v.at(1).first == "aliasi" &&
+  CPPUNIT_ASSERT(v.at(0).first == "aliasf" && v.at(0).second == "labelf" && v.at(1).first == "aliasi" &&
                  v.at(1).second == "labeli");
 }
diff --git a/FWCore/Framework/test/proxyfactoryproducer_t.cppunit.cc b/FWCore/Framework/test/proxyfactoryproducer_t.cppunit.cc
index 7c475fcc694aa..7f2ccc8efab78 100644
--- a/FWCore/Framework/test/proxyfactoryproducer_t.cppunit.cc
+++ b/FWCore/Framework/test/proxyfactoryproducer_t.cppunit.cc
@@ -21,42 +21,37 @@ using edm::ESProxyFactoryProducer;
 
 class DummyProxy : public DataProxyTemplate<DummyRecord, DummyData> {
 public:
-   DummyProxy() {}
+  DummyProxy() {}
+
 protected:
-   const value_type* make(const record_type&, const DataKey&) {
-      return static_cast<const value_type*>(nullptr) ;
-   }
-   void invalidateCache() {
-   }   
+  const value_type* make(const record_type&, const DataKey&) { return static_cast<const value_type*>(nullptr); }
+  void invalidateCache() {}
+
 private:
 };
 
 class Test1Producer : public ESProxyFactoryProducer {
 public:
-   Test1Producer() {
-      registerFactory(std::make_unique<ProxyFactoryTemplate<DummyProxy>>());
-   }
+  Test1Producer() { registerFactory(std::make_unique<ProxyFactoryTemplate<DummyProxy>>()); }
 };
 
 class TestLabelProducer : public ESProxyFactoryProducer {
 public:
-   TestLabelProducer() {
-      registerFactory(std::make_unique<ProxyFactoryTemplate<DummyProxy>>(), "fred");
-   }
+  TestLabelProducer() { registerFactory(std::make_unique<ProxyFactoryTemplate<DummyProxy>>(), "fred"); }
 };
 
-class testProxyfactor: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(testProxyfactor);
+class testProxyfactor : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testProxyfactor);
+
+  CPPUNIT_TEST(registerProxyfactorytemplateTest);
+  CPPUNIT_TEST(labelTest);
+  CPPUNIT_TEST(appendLabelTest);
 
-CPPUNIT_TEST(registerProxyfactorytemplateTest);
-CPPUNIT_TEST(labelTest);
-CPPUNIT_TEST(appendLabelTest);
+  CPPUNIT_TEST_SUITE_END();
 
-CPPUNIT_TEST_SUITE_END();
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void registerProxyfactorytemplateTest();
   void appendLabelTest();
@@ -66,50 +61,43 @@ CPPUNIT_TEST_SUITE_END();
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testProxyfactor);
 
-void testProxyfactor::registerProxyfactorytemplateTest()
-{
-   Test1Producer testProd;
-   EventSetupRecordKey dummyRecordKey = EventSetupRecordKey::makeKey<DummyRecord>();
-   CPPUNIT_ASSERT(testProd.isUsingRecord(dummyRecordKey));
+void testProxyfactor::registerProxyfactorytemplateTest() {
+  Test1Producer testProd;
+  EventSetupRecordKey dummyRecordKey = EventSetupRecordKey::makeKey<DummyRecord>();
+  CPPUNIT_ASSERT(testProd.isUsingRecord(dummyRecordKey));
 
-   const DataProxyProvider::KeyedProxies& keyedProxies =
-      testProd.keyedProxies(dummyRecordKey);
+  const DataProxyProvider::KeyedProxies& keyedProxies = testProd.keyedProxies(dummyRecordKey);
 
-   CPPUNIT_ASSERT(keyedProxies.size() == 1);
-   CPPUNIT_ASSERT(nullptr != dynamic_cast<DummyProxy const*>(&(*(keyedProxies.front().second))));
+  CPPUNIT_ASSERT(keyedProxies.size() == 1);
+  CPPUNIT_ASSERT(nullptr != dynamic_cast<DummyProxy const*>(&(*(keyedProxies.front().second))));
 }
 
-void testProxyfactor::labelTest()
-{
-   TestLabelProducer testProd;
-   EventSetupRecordKey dummyRecordKey = EventSetupRecordKey::makeKey<DummyRecord>();
-   CPPUNIT_ASSERT(testProd.isUsingRecord(dummyRecordKey));
-   
-   const DataProxyProvider::KeyedProxies& keyedProxies =
-      testProd.keyedProxies(dummyRecordKey);
-   
-   CPPUNIT_ASSERT(keyedProxies.size() == 1);
-   CPPUNIT_ASSERT(nullptr != dynamic_cast<DummyProxy const*>(&(*(keyedProxies.front().second))));
-   const std::string kFred("fred");
-   CPPUNIT_ASSERT(kFred == keyedProxies.front().first.name().value());
+void testProxyfactor::labelTest() {
+  TestLabelProducer testProd;
+  EventSetupRecordKey dummyRecordKey = EventSetupRecordKey::makeKey<DummyRecord>();
+  CPPUNIT_ASSERT(testProd.isUsingRecord(dummyRecordKey));
+
+  const DataProxyProvider::KeyedProxies& keyedProxies = testProd.keyedProxies(dummyRecordKey);
+
+  CPPUNIT_ASSERT(keyedProxies.size() == 1);
+  CPPUNIT_ASSERT(nullptr != dynamic_cast<DummyProxy const*>(&(*(keyedProxies.front().second))));
+  const std::string kFred("fred");
+  CPPUNIT_ASSERT(kFred == keyedProxies.front().first.name().value());
 }
 
-void testProxyfactor::appendLabelTest()
-{
+void testProxyfactor::appendLabelTest() {
   edm::ParameterSet pset;
   std::string kToAppend("Barney");
-  pset.addParameter("appendToDataLabel",
-                    kToAppend);
+  pset.addParameter("appendToDataLabel", kToAppend);
   pset.registerIt();
   {
     TestLabelProducer testProd;
     testProd.setAppendToDataLabel(pset);
     EventSetupRecordKey dummyRecordKey = EventSetupRecordKey::makeKey<DummyRecord>();
     CPPUNIT_ASSERT(testProd.isUsingRecord(dummyRecordKey));
-  
-    const DataProxyProvider::KeyedProxies& keyedProxies =
-      testProd.keyedProxies(dummyRecordKey);
-    
+
+    const DataProxyProvider::KeyedProxies& keyedProxies = testProd.keyedProxies(dummyRecordKey);
+
     CPPUNIT_ASSERT(keyedProxies.size() == 1);
     CPPUNIT_ASSERT(nullptr != dynamic_cast<DummyProxy const*>(&(*(keyedProxies.front().second))));
     const std::string kFredBarney("fredBarney");
@@ -120,13 +108,11 @@ void testProxyfactor::appendLabelTest()
   testProd.setAppendToDataLabel(pset);
   EventSetupRecordKey dummyRecordKey = EventSetupRecordKey::makeKey<DummyRecord>();
   CPPUNIT_ASSERT(testProd.isUsingRecord(dummyRecordKey));
-  
-  const DataProxyProvider::KeyedProxies& keyedProxies =
-    testProd.keyedProxies(dummyRecordKey);
-  
+
+  const DataProxyProvider::KeyedProxies& keyedProxies = testProd.keyedProxies(dummyRecordKey);
+
   CPPUNIT_ASSERT(keyedProxies.size() == 1);
   CPPUNIT_ASSERT(nullptr != dynamic_cast<DummyProxy const*>(&(*(keyedProxies.front().second))));
   const std::string kBarney("Barney");
   CPPUNIT_ASSERT(kBarney == keyedProxies.front().first.name().value());
-  
 }
diff --git a/FWCore/Framework/test/sharedresourcesregistry_t.cppunit.cc b/FWCore/Framework/test/sharedresourcesregistry_t.cppunit.cc
index 302985ce5785f..00fdad3479e54 100644
--- a/FWCore/Framework/test/sharedresourcesregistry_t.cppunit.cc
+++ b/FWCore/Framework/test/sharedresourcesregistry_t.cppunit.cc
@@ -14,30 +14,28 @@
 
 using namespace edm;
 
-class testSharedResourcesRegistry: public CppUnit::TestFixture
-{
-   CPPUNIT_TEST_SUITE(testSharedResourcesRegistry);
-   
-   CPPUNIT_TEST(oneTest);
-   CPPUNIT_TEST(legacyTest);
-   CPPUNIT_TEST(multipleTest);
-  
-   CPPUNIT_TEST_SUITE_END();
+class testSharedResourcesRegistry : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testSharedResourcesRegistry);
+
+  CPPUNIT_TEST(oneTest);
+  CPPUNIT_TEST(legacyTest);
+  CPPUNIT_TEST(multipleTest);
+
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-      void setUp(){}
-   void tearDown(){}
-   
-   void oneTest();
-   void legacyTest();
-   void multipleTest();
+  void setUp() {}
+  void tearDown() {}
+
+  void oneTest();
+  void legacyTest();
+  void multipleTest();
 };
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testSharedResourcesRegistry);
 
-
-void testSharedResourcesRegistry::oneTest()
-{
+void testSharedResourcesRegistry::oneTest() {
   edm::SharedResourcesRegistry reg;
 
   CPPUNIT_ASSERT(reg.resourceMap().size() == 0);
@@ -47,25 +45,24 @@ void testSharedResourcesRegistry::oneTest()
   reg.registerSharedResource("zoo");
 
   {
-    std::vector<std::string> res{"foo","bar","zoo"};
+    std::vector<std::string> res{"foo", "bar", "zoo"};
     auto tester = reg.createAcquirer(res);
-    
+
     CPPUNIT_ASSERT(1 == tester.numberOfResources());
   }
   {
     std::vector<std::string> res{"foo"};
     auto tester = reg.createAcquirer(res);
-    
+
     CPPUNIT_ASSERT(1 == tester.numberOfResources());
   }
 }
 
-void testSharedResourcesRegistry::legacyTest()
-{
+void testSharedResourcesRegistry::legacyTest() {
   std::vector<std::string> res{edm::SharedResourcesRegistry::kLegacyModuleResourceName};
   {
     edm::SharedResourcesRegistry reg;
-    
+
     reg.registerSharedResource(edm::SharedResourcesRegistry::kLegacyModuleResourceName);
     auto tester = reg.createAcquirer(res);
 
@@ -73,14 +70,13 @@ void testSharedResourcesRegistry::legacyTest()
   }
   {
     edm::SharedResourcesRegistry reg;
-    
+
     reg.registerSharedResource(edm::SharedResourcesRegistry::kLegacyModuleResourceName);
     reg.registerSharedResource(edm::SharedResourcesRegistry::kLegacyModuleResourceName);
 
     auto tester = reg.createAcquirer(res);
-    
+
     CPPUNIT_ASSERT(1 == tester.numberOfResources());
-    
   }
   {
     edm::SharedResourcesRegistry reg;
@@ -119,11 +115,10 @@ void testSharedResourcesRegistry::legacyTest()
   }
 }
 
-void testSharedResourcesRegistry::multipleTest()
-{
+void testSharedResourcesRegistry::multipleTest() {
   edm::SharedResourcesRegistry reg;
   auto const& resourceMap = reg.resourceMap();
-  
+
   reg.registerSharedResource("foo");
   reg.registerSharedResource("bar");
   reg.registerSharedResource("zoo");
@@ -140,22 +135,21 @@ void testSharedResourcesRegistry::multipleTest()
   CPPUNIT_ASSERT(resourceMap.size() == 3);
 
   {
-    std::vector<std::string> res{"foo","bar","zoo"};
+    std::vector<std::string> res{"foo", "bar", "zoo"};
     auto tester = reg.createAcquirer(res);
-    
+
     CPPUNIT_ASSERT(2 == tester.numberOfResources());
   }
   {
     std::vector<std::string> res{"foo"};
     auto tester = reg.createAcquirer(res);
-    
+
     CPPUNIT_ASSERT(1 == tester.numberOfResources());
   }
   {
     std::vector<std::string> res{"bar"};
     auto tester = reg.createAcquirer(res);
-    
+
     CPPUNIT_ASSERT(1 == tester.numberOfResources());
   }
-
 }
diff --git a/FWCore/Framework/test/statemachine_t.cc b/FWCore/Framework/test/statemachine_t.cc
index 4d04d797ef1cd..b663541ac4a17 100644
--- a/FWCore/Framework/test/statemachine_t.cc
+++ b/FWCore/Framework/test/statemachine_t.cc
@@ -2,7 +2,7 @@
 
 Test of the statemachine classes.
 
-----------------------------------------------------------------------*/  
+----------------------------------------------------------------------*/
 
 #include "FWCore/Framework/test/MockEventProcessor.h"
 
@@ -12,7 +12,6 @@ Test of the statemachine classes.
 #include <iostream>
 #include <fstream>
 
-
 int main(int argc, char* argv[]) try {
   std::cout << "Running test in statemachine_t.cc\n";
 
@@ -20,10 +19,10 @@ int main(int argc, char* argv[]) try {
   std::string inputFile;
   std::string outputFile;
   boost::program_options::options_description desc("Allowed options");
-  desc.add_options()
-    ("help,h", "produce help message")
-    ("inputFile,i", boost::program_options::value<std::string>(&inputFile)->default_value(""))
-    ("outputFile,o", boost::program_options::value<std::string>(&outputFile)->default_value("statemachine_test_output.txt"));
+  desc.add_options()("help,h", "produce help message")(
+      "inputFile,i", boost::program_options::value<std::string>(&inputFile)->default_value(""))(
+      "outputFile,o",
+      boost::program_options::value<std::string>(&outputFile)->default_value("statemachine_test_output.txt"));
   boost::program_options::variables_map vm;
   boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), vm);
   boost::program_options::notify(vm);
@@ -47,8 +46,7 @@ int main(int argc, char* argv[]) try {
     std::ifstream input;
     input.open(inputFile.c_str());
     if (input.fail()) {
-      std::cerr << "Error, Unable to open mock input file named " 
-                << inputFile << "\n";
+      std::cerr << "Error, Unable to open mock input file named " << inputFile << "\n";
       return 1;
     }
     std::getline(input, mockData, '.');
@@ -60,25 +58,24 @@ int main(int argc, char* argv[]) try {
   fileModes.push_back(true);
   fileModes.push_back(false);
 
-  for (auto mode: fileModes) {
-
+  for (auto mode : fileModes) {
     output << "\nMachine parameters:  ";
-    if (mode) output << "mode = NOMERGE";
-    else output << "mode = FULLMERGE";
+    if (mode)
+      output << "mode = NOMERGE";
+    else
+      output << "mode = FULLMERGE";
 
     output << "\n";
 
-    edm::MockEventProcessor mockEventProcessor(mockData,
-                                               output,
-                                               mode);
+    edm::MockEventProcessor mockEventProcessor(mockData, output, mode);
     try {
       mockEventProcessor.runToCompletion();
-    } catch(edm::MockEventProcessor::TestException const& e) {
-      output <<"caught test exception\n";
+    } catch (edm::MockEventProcessor::TestException const& e) {
+      output << "caught test exception\n";
     }
   }
   return 0;
-} catch(std::exception const& e) {
+} catch (std::exception const& e) {
   std::cerr << e.what() << std::endl;
   return 1;
 }
diff --git a/FWCore/Framework/test/stream_module_t.cppunit.cc b/FWCore/Framework/test/stream_module_t.cppunit.cc
index 0e80794748c03..f5f7ea8f6e480 100644
--- a/FWCore/Framework/test/stream_module_t.cppunit.cc
+++ b/FWCore/Framework/test/stream_module_t.cppunit.cc
@@ -25,15 +25,13 @@
 #include "FWCore/ServiceRegistry/interface/StreamContext.h"
 #include "FWCore/Utilities/interface/GlobalIdentifier.h"
 
-
 #include "FWCore/Utilities/interface/Exception.h"
 
 #include "cppunit/extensions/HelperMacros.h"
 
-class testStreamModule: public CppUnit::TestFixture 
-{
+class testStreamModule : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testStreamModule);
-  
+
   CPPUNIT_TEST(basicTest);
   CPPUNIT_TEST(globalTest);
   CPPUNIT_TEST(runTest);
@@ -46,13 +44,14 @@ class testStreamModule: public CppUnit::TestFixture
   CPPUNIT_TEST(endLumiProdTest);
   CPPUNIT_TEST(endRunSummaryProdTest);
   CPPUNIT_TEST(endLumiSummaryProdTest);
-  
+
   CPPUNIT_TEST_SUITE_END();
+
 public:
   testStreamModule();
-  
-  void setUp(){}
-  void tearDown(){}
+
+  void setUp() {}
+  void tearDown() {}
 
   void basicTest();
   void globalTest();
@@ -68,27 +67,26 @@ class testStreamModule: public CppUnit::TestFixture
   void endLumiSummaryProdTest();
 
   enum class Trans {
-    kBeginJob, //0
-    kBeginStream, //1
-    kGlobalBeginRun, //2
-    kStreamBeginRun, //3
-    kGlobalBeginLuminosityBlock, //4
-    kStreamBeginLuminosityBlock, //5
-    kEvent, //6
-    kStreamEndLuminosityBlock, //7
-    kGlobalEndLuminosityBlock, //8
-    kStreamEndRun, //9
-    kGlobalEndRun, //10
-    kEndStream, //11
-    kEndJob //12
+    kBeginJob,                    //0
+    kBeginStream,                 //1
+    kGlobalBeginRun,              //2
+    kStreamBeginRun,              //3
+    kGlobalBeginLuminosityBlock,  //4
+    kStreamBeginLuminosityBlock,  //5
+    kEvent,                       //6
+    kStreamEndLuminosityBlock,    //7
+    kGlobalEndLuminosityBlock,    //8
+    kStreamEndRun,                //9
+    kGlobalEndRun,                //10
+    kEndStream,                   //11
+    kEndJob                       //12
   };
-  
+
   typedef std::vector<Trans> Expectations;
 
 private:
+  std::map<Trans, std::function<void(edm::Worker*)>> m_transToFunc;
 
-  std::map<Trans,std::function<void(edm::Worker*)>> m_transToFunc;
-  
   edm::ProcessConfiguration m_procConfig;
   std::shared_ptr<edm::ProductRegistry> m_prodReg;
   std::shared_ptr<edm::BranchIDListHelper> m_idHelper;
@@ -97,123 +95,111 @@ class testStreamModule: public CppUnit::TestFixture
   edm::HistoryAppender historyAppender_;
   std::shared_ptr<edm::LuminosityBlockPrincipal> m_lbp;
   std::shared_ptr<edm::RunPrincipal> m_rp;
-  std::shared_ptr<edm::ActivityRegistry> m_actReg; // We do not use propagate_const because the registry itself is mutable.
+  std::shared_ptr<edm::ActivityRegistry>
+      m_actReg;  // We do not use propagate_const because the registry itself is mutable.
   edm::EventSetupImpl* m_es = nullptr;
-  edm::ModuleDescription m_desc = {"Dummy","dummy"};
-  
-  template<typename T, typename U>
+  edm::ModuleDescription m_desc = {"Dummy", "dummy"};
+
+  template <typename T, typename U>
   void testTransitions(std::shared_ptr<U> iMod, Expectations const& iExpect);
-  
-  template<typename T>
+
+  template <typename T>
   void runTest(Expectations const& iExpect);
-  
+
   class BasicProd : public edm::stream::EDProducer<> {
   public:
     static unsigned int m_count;
-    
+
     BasicProd(edm::ParameterSet const&) {}
-    
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-    }
+
+    void produce(edm::Event&, edm::EventSetup const&) override { ++m_count; }
   };
-  
+
   class GlobalProd : public edm::stream::EDProducer<edm::GlobalCache<int>> {
   public:
     static unsigned int m_count;
-    
-    static std::unique_ptr<int> initializeGlobalCache(edm::ParameterSet const&) {
-      return std::make_unique<int>(1);
-    }
+
+    static std::unique_ptr<int> initializeGlobalCache(edm::ParameterSet const&) { return std::make_unique<int>(1); }
     GlobalProd(edm::ParameterSet const&, const int* iGlobal) { CPPUNIT_ASSERT(*iGlobal == 1); }
-    
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-    }
-    
+
+    void produce(edm::Event&, edm::EventSetup const&) override { ++m_count; }
+
     static void globalEndJob(int* iGlobal) {
-      CPPUNIT_ASSERT(1==*iGlobal);
+      CPPUNIT_ASSERT(1 == *iGlobal);
       ++m_count;
     }
-    
   };
   class RunProd : public edm::stream::EDProducer<edm::RunCache<int>> {
   public:
     static unsigned int m_count;
     RunProd(edm::ParameterSet const&) {}
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-    }
-    
+    void produce(edm::Event&, edm::EventSetup const&) override { ++m_count; }
+
     static std::shared_ptr<int> globalBeginRun(edm::Run const&, edm::EventSetup const&, GlobalCache const*) {
       ++m_count;
       return std::shared_ptr<int>{};
     }
 
-    static void globalEndRun(edm::Run const&, edm::EventSetup const&, RunProd::RunContext const*) {
-      ++m_count;
-    }
+    static void globalEndRun(edm::Run const&, edm::EventSetup const&, RunProd::RunContext const*) { ++m_count; }
   };
 
-
   class LumiProd : public edm::stream::EDProducer<edm::LuminosityBlockCache<int>> {
   public:
     static unsigned int m_count;
     LumiProd(edm::ParameterSet const&) {}
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-    }
-    
-    static std::shared_ptr<int> globalBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&, RunContext const*) {
+    void produce(edm::Event&, edm::EventSetup const&) override { ++m_count; }
+
+    static std::shared_ptr<int> globalBeginLuminosityBlock(edm::LuminosityBlock const&,
+                                                           edm::EventSetup const&,
+                                                           RunContext const*) {
       ++m_count;
       return std::shared_ptr<int>{};
     }
-    
-    static void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&, LuminosityBlockContext const*) {
+
+    static void globalEndLuminosityBlock(edm::LuminosityBlock const&,
+                                         edm::EventSetup const&,
+                                         LuminosityBlockContext const*) {
       ++m_count;
     }
   };
-  
+
   class RunSummaryProd : public edm::stream::EDProducer<edm::RunSummaryCache<int>> {
   public:
     static unsigned int m_count;
     RunSummaryProd(edm::ParameterSet const&) {}
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-    }
-    
+    void produce(edm::Event&, edm::EventSetup const&) override { ++m_count; }
+
     static std::shared_ptr<int> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&, GlobalCache const*) {
       ++m_count;
       return std::shared_ptr<int>{};
     }
-    
-    void endRunSummary(edm::Run const&, edm::EventSetup const&, int*) const override {
-      ++m_count;
-    }
-    
-    static void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, RunContext const*, int*){
-      ++m_count;
-    }
+
+    void endRunSummary(edm::Run const&, edm::EventSetup const&, int*) const override { ++m_count; }
+
+    static void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, RunContext const*, int*) { ++m_count; }
   };
 
   class LumiSummaryProd : public edm::stream::EDProducer<edm::LuminosityBlockSummaryCache<int>> {
   public:
     static unsigned int m_count;
     LumiSummaryProd(edm::ParameterSet const&) {}
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-    }
-    
-    static std::shared_ptr<int> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, LuminosityBlockContext const*){
+    void produce(edm::Event&, edm::EventSetup const&) override { ++m_count; }
+
+    static std::shared_ptr<int> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                                  edm::EventSetup const&,
+                                                                  LuminosityBlockContext const*) {
       ++m_count;
       return std::shared_ptr<int>{};
     }
-    
+
     void endLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, int*) const override {
       ++m_count;
     }
-    
-    static void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, LuminosityBlockContext const*, int*){
+
+    static void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                edm::EventSetup const&,
+                                                LuminosityBlockContext const*,
+                                                int*) {
       ++m_count;
     }
   };
@@ -223,13 +209,9 @@ class testStreamModule: public CppUnit::TestFixture
     static unsigned int m_count;
     BeginRunProd(edm::ParameterSet const&) {}
 
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-    }
+    void produce(edm::Event&, edm::EventSetup const&) override { ++m_count; }
 
-    static void globalBeginRunProduce(edm::Run&, edm::EventSetup const&, RunContext const*) {
-      ++m_count;
-    }
+    static void globalBeginRunProduce(edm::Run&, edm::EventSetup const&, RunContext const*) { ++m_count; }
   };
 
   class BeginLumiProd : public edm::stream::EDProducer<edm::BeginLuminosityBlockProducer> {
@@ -237,11 +219,11 @@ class testStreamModule: public CppUnit::TestFixture
     static unsigned int m_count;
     BeginLumiProd(edm::ParameterSet const&) {}
 
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-    }
-    
-    static void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&, LuminosityBlockContext const*) {
+    void produce(edm::Event&, edm::EventSetup const&) override { ++m_count; }
+
+    static void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&,
+                                                  edm::EventSetup const&,
+                                                  LuminosityBlockContext const*) {
       ++m_count;
     }
   };
@@ -251,84 +233,77 @@ class testStreamModule: public CppUnit::TestFixture
     static unsigned int m_count;
     EndRunProd(edm::ParameterSet const&) {}
 
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-    }
-    
-    static void globalEndRunProduce(edm::Run&, edm::EventSetup const&, RunContext const*) {
-      ++m_count;
-    }
+    void produce(edm::Event&, edm::EventSetup const&) override { ++m_count; }
+
+    static void globalEndRunProduce(edm::Run&, edm::EventSetup const&, RunContext const*) { ++m_count; }
   };
-  
+
   class EndLumiProd : public edm::stream::EDProducer<edm::EndLuminosityBlockProducer> {
   public:
     static unsigned int m_count;
     EndLumiProd(edm::ParameterSet const&) {}
 
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-    }
-    
-    static void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&, LuminosityBlockContext const*) {
+    void produce(edm::Event&, edm::EventSetup const&) override { ++m_count; }
+
+    static void globalEndLuminosityBlockProduce(edm::LuminosityBlock&,
+                                                edm::EventSetup const&,
+                                                LuminosityBlockContext const*) {
       ++m_count;
     }
   };
 
-
   class EndRunSummaryProd : public edm::stream::EDProducer<edm::EndRunProducer, edm::RunSummaryCache<int>> {
   public:
     static unsigned int m_count;
     EndRunSummaryProd(edm::ParameterSet const&) {}
 
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-    }
-    
+    void produce(edm::Event&, edm::EventSetup const&) override { ++m_count; }
+
     static std::shared_ptr<int> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&, RunContext const*) {
       ++m_count;
       return std::shared_ptr<int>{};
     }
-    
-    void endRunSummary(edm::Run const&, edm::EventSetup const&, int*) const override {
-      ++m_count;
-    }
-    
-    static void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, RunContext const*, int*) {
-      ++m_count;
-    }
 
-    static void globalEndRunProduce(edm::Run&, edm::EventSetup const&, RunContext const*, int const*) {
-      ++m_count;
-    }
+    void endRunSummary(edm::Run const&, edm::EventSetup const&, int*) const override { ++m_count; }
+
+    static void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, RunContext const*, int*) { ++m_count; }
+
+    static void globalEndRunProduce(edm::Run&, edm::EventSetup const&, RunContext const*, int const*) { ++m_count; }
   };
-  
-  class EndLumiSummaryProd : public edm::stream::EDProducer<edm::EndLuminosityBlockProducer, edm::LuminosityBlockSummaryCache<int>> {
+
+  class EndLumiSummaryProd
+      : public edm::stream::EDProducer<edm::EndLuminosityBlockProducer, edm::LuminosityBlockSummaryCache<int>> {
   public:
     static unsigned int m_count;
     EndLumiSummaryProd(edm::ParameterSet const&) {}
 
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-    }
+    void produce(edm::Event&, edm::EventSetup const&) override { ++m_count; }
 
-    static std::shared_ptr<int> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, LuminosityBlockContext const*) {
+    static std::shared_ptr<int> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                                  edm::EventSetup const&,
+                                                                  LuminosityBlockContext const*) {
       ++m_count;
       return std::shared_ptr<int>{};
     }
-    
+
     void endLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, int*) const override {
       ++m_count;
     }
-    
-    static void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, LuminosityBlockContext const*, int*) {
+
+    static void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                edm::EventSetup const&,
+                                                LuminosityBlockContext const*,
+                                                int*) {
       ++m_count;
     }
 
-    static void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&, LuminosityBlockContext const*, int const*) {
+    static void globalEndLuminosityBlockProduce(edm::LuminosityBlock&,
+                                                edm::EventSetup const&,
+                                                LuminosityBlockContext const*,
+                                                int const*) {
       ++m_count;
     }
   };
-   
 };
 unsigned int testStreamModule::BasicProd::m_count = 0;
 unsigned int testStreamModule::GlobalProd::m_count = 0;
@@ -347,16 +322,16 @@ CPPUNIT_TEST_SUITE_REGISTRATION(testStreamModule);
 
 namespace {
   struct ShadowStreamID {
-    constexpr ShadowStreamID():value(0){}
+    constexpr ShadowStreamID() : value(0) {}
     unsigned int value;
   };
-  
+
   union IDUnion {
-    IDUnion(): m_shadow() {}
+    IDUnion() : m_shadow() {}
     ShadowStreamID m_shadow;
     edm::StreamID m_id;
   };
-}
+}  // namespace
 static edm::StreamID makeID() {
   IDUnion u;
   assert(u.m_id.value() == 0);
@@ -364,24 +339,22 @@ static edm::StreamID makeID() {
 }
 static const edm::StreamID s_streamID0 = makeID();
 
-
-testStreamModule::testStreamModule():
-m_prodReg(new edm::ProductRegistry{}),
-m_idHelper(new edm::BranchIDListHelper{}),
-m_associationsHelper(new edm::ThinnedAssociationsHelper{}),
-m_ep()
-{
+testStreamModule::testStreamModule()
+    : m_prodReg(new edm::ProductRegistry{}),
+      m_idHelper(new edm::BranchIDListHelper{}),
+      m_associationsHelper(new edm::ThinnedAssociationsHelper{}),
+      m_ep() {
   //Setup the principals
   m_prodReg->setFrozen();
   m_idHelper->updateFromRegistry(*m_prodReg);
   edm::EventID eventID = edm::EventID::firstValidEvent();
-  
+
   std::string uuid = edm::createGlobalIdentifier();
   edm::Timestamp now(1234567UL);
   auto runAux = std::make_shared<edm::RunAuxiliary>(eventID.run(), now, now);
-  m_rp.reset(new edm::RunPrincipal(runAux, m_prodReg, m_procConfig, &historyAppender_,0));
+  m_rp.reset(new edm::RunPrincipal(runAux, m_prodReg, m_procConfig, &historyAppender_, 0));
   auto lumiAux = std::make_shared<edm::LuminosityBlockAuxiliary>(m_rp->run(), 1, now, now);
-  m_lbp.reset(new edm::LuminosityBlockPrincipal(m_prodReg, m_procConfig, &historyAppender_,0));
+  m_lbp.reset(new edm::LuminosityBlockPrincipal(m_prodReg, m_procConfig, &historyAppender_, 0));
   m_lbp->setAux(*lumiAux);
   m_lbp->setRunPrincipal(m_rp);
   edm::EventAuxiliary eventAux(eventID, uuid, now, true);
@@ -391,170 +364,159 @@ m_ep()
   shadowID.value = 0;
   edm::StreamID* pID = reinterpret_cast<edm::StreamID*>(&shadowID);
   assert(pID->value() == 0);
-  
-  m_ep.reset(new edm::EventPrincipal(m_prodReg,
-                                     m_idHelper,
-                                     m_associationsHelper,
-                                     m_procConfig,nullptr,*pID));
+
+  m_ep.reset(new edm::EventPrincipal(m_prodReg, m_idHelper, m_associationsHelper, m_procConfig, nullptr, *pID));
   edm::ProcessHistoryRegistry phr;
   m_ep->fillEventPrincipal(eventAux, phr);
   m_ep->setLuminosityBlockPrincipal(m_lbp.get());
   m_actReg.reset(new edm::ActivityRegistry);
 
-
   //For each transition, bind a lambda which will call the proper method of the Worker
   m_transToFunc[Trans::kBeginStream] = [](edm::Worker* iBase) {
     edm::StreamContext streamContext(s_streamID0, nullptr);
-    iBase->beginStream(s_streamID0, streamContext); };
-  
+    iBase->beginStream(s_streamID0, streamContext);
+  };
+
   m_transToFunc[Trans::kGlobalBeginRun] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::RunPrincipal, edm::BranchActionGlobalBegin> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_rp,*m_es, s_streamID0, parentContext, nullptr); };
+    iBase->doWork<Traits>(*m_rp, *m_es, s_streamID0, parentContext, nullptr);
+  };
   m_transToFunc[Trans::kStreamBeginRun] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::RunPrincipal, edm::BranchActionStreamBegin> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_rp,*m_es, s_streamID0, parentContext, nullptr); };
-  
+    iBase->doWork<Traits>(*m_rp, *m_es, s_streamID0, parentContext, nullptr);
+  };
+
   m_transToFunc[Trans::kGlobalBeginLuminosityBlock] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::LuminosityBlockPrincipal, edm::BranchActionGlobalBegin> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_lbp,*m_es, s_streamID0, parentContext, nullptr); };
+    iBase->doWork<Traits>(*m_lbp, *m_es, s_streamID0, parentContext, nullptr);
+  };
   m_transToFunc[Trans::kStreamBeginLuminosityBlock] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::LuminosityBlockPrincipal, edm::BranchActionStreamBegin> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_lbp,*m_es, s_streamID0, parentContext, nullptr); };
-  
+    iBase->doWork<Traits>(*m_lbp, *m_es, s_streamID0, parentContext, nullptr);
+  };
+
   m_transToFunc[Trans::kEvent] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::EventPrincipal, edm::BranchActionStreamBegin> Traits;
     edm::StreamContext streamContext(s_streamID0, nullptr);
     edm::ParentContext parentContext(&streamContext);
     iBase->setActivityRegistry(m_actReg);
-    iBase->doWork<Traits>(*m_ep,*m_es, s_streamID0, parentContext, nullptr); };
+    iBase->doWork<Traits>(*m_ep, *m_es, s_streamID0, parentContext, nullptr);
+  };
 
   m_transToFunc[Trans::kStreamEndLuminosityBlock] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::LuminosityBlockPrincipal, edm::BranchActionStreamEnd> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_lbp,*m_es, s_streamID0, parentContext, nullptr); };
+    iBase->doWork<Traits>(*m_lbp, *m_es, s_streamID0, parentContext, nullptr);
+  };
   m_transToFunc[Trans::kGlobalEndLuminosityBlock] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::LuminosityBlockPrincipal, edm::BranchActionGlobalEnd> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_lbp,*m_es, s_streamID0, parentContext, nullptr); };
+    iBase->doWork<Traits>(*m_lbp, *m_es, s_streamID0, parentContext, nullptr);
+  };
 
   m_transToFunc[Trans::kStreamEndRun] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::RunPrincipal, edm::BranchActionStreamEnd> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_rp,*m_es, s_streamID0, parentContext, nullptr); };
+    iBase->doWork<Traits>(*m_rp, *m_es, s_streamID0, parentContext, nullptr);
+  };
   m_transToFunc[Trans::kGlobalEndRun] = [this](edm::Worker* iBase) {
     typedef edm::OccurrenceTraits<edm::RunPrincipal, edm::BranchActionGlobalEnd> Traits;
     edm::ParentContext parentContext;
-    iBase->doWork<Traits>(*m_rp,*m_es, s_streamID0, parentContext, nullptr); };
+    iBase->doWork<Traits>(*m_rp, *m_es, s_streamID0, parentContext, nullptr);
+  };
 
   m_transToFunc[Trans::kEndStream] = [](edm::Worker* iBase) {
     edm::StreamContext streamContext(s_streamID0, nullptr);
-    iBase->endStream(s_streamID0, streamContext); };
-
+    iBase->endStream(s_streamID0, streamContext);
+  };
 }
 
-
 namespace {
-  template<typename T>
+  template <typename T>
   std::shared_ptr<edm::stream::EDProducerAdaptorBase> createModule() {
     edm::ParameterSet pset;
-    std::shared_ptr<edm::stream::EDProducerAdaptorBase> retValue = std::make_shared<edm::stream::EDProducerAdaptor<T>>(pset);
-    edm::maker::ModuleHolderT<edm::stream::EDProducerAdaptorBase> h(retValue,nullptr);
+    std::shared_ptr<edm::stream::EDProducerAdaptorBase> retValue =
+        std::make_shared<edm::stream::EDProducerAdaptor<T>>(pset);
+    edm::maker::ModuleHolderT<edm::stream::EDProducerAdaptorBase> h(retValue, nullptr);
     h.preallocate(edm::PreallocationConfiguration{});
     return retValue;
   }
-  template<typename T>
-  void
-  testTransition(edm::Worker* iWorker, testStreamModule::Trans iTrans, testStreamModule::Expectations const& iExpect, std::function<void(edm::Worker*)> iFunc) {
-    assert(0==T::m_count);
+  template <typename T>
+  void testTransition(edm::Worker* iWorker,
+                      testStreamModule::Trans iTrans,
+                      testStreamModule::Expectations const& iExpect,
+                      std::function<void(edm::Worker*)> iFunc) {
+    assert(0 == T::m_count);
     iFunc(iWorker);
-    auto count = std::count(iExpect.begin(),iExpect.end(),iTrans);
-    if(count != T::m_count) {
-      std::cout<<"For trans " <<static_cast<std::underlying_type<testStreamModule::Trans>::type >(iTrans)<< " expected "<<count<<" and got "<<T::m_count<<std::endl;
+    auto count = std::count(iExpect.begin(), iExpect.end(), iTrans);
+    if (count != T::m_count) {
+      std::cout << "For trans " << static_cast<std::underlying_type<testStreamModule::Trans>::type>(iTrans)
+                << " expected " << count << " and got " << T::m_count << std::endl;
     }
     CPPUNIT_ASSERT(T::m_count == count);
     T::m_count = 0;
     iWorker->reset();
   }
-}
+}  // namespace
 
-template<typename T, typename U>
-void
-testStreamModule::testTransitions(std::shared_ptr<U> iMod, Expectations const& iExpect) {
-  edm::WorkerT<edm::stream::EDProducerAdaptorBase> w{iMod,m_desc,nullptr};
-  for(auto& keyVal: m_transToFunc) {
-    testTransition<T>(&w,keyVal.first,iExpect,keyVal.second);
+template <typename T, typename U>
+void testStreamModule::testTransitions(std::shared_ptr<U> iMod, Expectations const& iExpect) {
+  edm::WorkerT<edm::stream::EDProducerAdaptorBase> w{iMod, m_desc, nullptr};
+  for (auto& keyVal : m_transToFunc) {
+    testTransition<T>(&w, keyVal.first, iExpect, keyVal.second);
   }
 }
-template<typename T>
-void
-testStreamModule::runTest(Expectations const& iExpect) {
+template <typename T>
+void testStreamModule::runTest(Expectations const& iExpect) {
   auto mod = createModule<T>();
   CPPUNIT_ASSERT(0 == T::m_count);
-  testTransitions<T>(mod,iExpect);
+  testTransitions<T>(mod, iExpect);
 }
 
+void testStreamModule::basicTest() { runTest<BasicProd>({Trans::kEvent}); }
 
-void testStreamModule::basicTest()
-{
-  runTest<BasicProd>({Trans::kEvent} );
-}
+void testStreamModule::globalTest() { runTest<GlobalProd>({Trans::kBeginJob, Trans::kEvent, Trans::kEndJob}); }
 
-void testStreamModule::globalTest()
-{
-  runTest<GlobalProd>({Trans::kBeginJob, Trans::kEvent, Trans::kEndJob} );
-}
+void testStreamModule::runTest() { runTest<RunProd>({Trans::kGlobalBeginRun, Trans::kEvent, Trans::kGlobalEndRun}); }
 
-void testStreamModule::runTest()
-{
-  runTest<RunProd>({Trans::kGlobalBeginRun, Trans::kEvent, Trans::kGlobalEndRun} );
+void testStreamModule::runSummaryTest() {
+  runTest<RunSummaryProd>({Trans::kGlobalBeginRun, Trans::kEvent, Trans::kStreamEndRun, Trans::kGlobalEndRun});
 }
 
-void testStreamModule::runSummaryTest()
-{
-  runTest<RunSummaryProd>({Trans::kGlobalBeginRun, Trans::kEvent, Trans::kStreamEndRun, Trans::kGlobalEndRun} );
+void testStreamModule::lumiTest() {
+  runTest<LumiProd>({Trans::kGlobalBeginLuminosityBlock, Trans::kEvent, Trans::kGlobalEndLuminosityBlock});
 }
 
-void testStreamModule::lumiTest()
-{
-  runTest<LumiProd>({Trans::kGlobalBeginLuminosityBlock, Trans::kEvent, Trans::kGlobalEndLuminosityBlock} );
+void testStreamModule::lumiSummaryTest() {
+  runTest<LumiSummaryProd>({Trans::kGlobalBeginLuminosityBlock,
+                            Trans::kEvent,
+                            Trans::kStreamEndLuminosityBlock,
+                            Trans::kGlobalEndLuminosityBlock});
 }
 
-void testStreamModule::lumiSummaryTest()
-{
-  runTest<LumiSummaryProd>({Trans::kGlobalBeginLuminosityBlock, Trans::kEvent, Trans::kStreamEndLuminosityBlock, Trans::kGlobalEndLuminosityBlock} );
-}
-
-void testStreamModule::beginRunProdTest()
-{
-  runTest<BeginRunProd>({Trans::kGlobalBeginRun, Trans::kEvent} );
-}
+void testStreamModule::beginRunProdTest() { runTest<BeginRunProd>({Trans::kGlobalBeginRun, Trans::kEvent}); }
 
-void testStreamModule::beginLumiProdTest()
-{
-  runTest<BeginLumiProd>({Trans::kGlobalBeginLuminosityBlock, Trans::kEvent} );
+void testStreamModule::beginLumiProdTest() {
+  runTest<BeginLumiProd>({Trans::kGlobalBeginLuminosityBlock, Trans::kEvent});
 }
 
-void testStreamModule::endRunProdTest()
-{
-  runTest<EndRunProd>({Trans::kGlobalEndRun, Trans::kEvent} );
-}
+void testStreamModule::endRunProdTest() { runTest<EndRunProd>({Trans::kGlobalEndRun, Trans::kEvent}); }
 
-void testStreamModule::endLumiProdTest()
-{
-  runTest<EndLumiProd>({Trans::kGlobalEndLuminosityBlock, Trans::kEvent} );
-}
+void testStreamModule::endLumiProdTest() { runTest<EndLumiProd>({Trans::kGlobalEndLuminosityBlock, Trans::kEvent}); }
 
-void testStreamModule::endRunSummaryProdTest()
-{
-  runTest<EndRunSummaryProd>({Trans::kGlobalEndRun, Trans::kEvent, Trans::kGlobalBeginRun, Trans::kStreamEndRun, Trans::kGlobalEndRun} );
+void testStreamModule::endRunSummaryProdTest() {
+  runTest<EndRunSummaryProd>(
+      {Trans::kGlobalEndRun, Trans::kEvent, Trans::kGlobalBeginRun, Trans::kStreamEndRun, Trans::kGlobalEndRun});
 }
 
-void testStreamModule::endLumiSummaryProdTest()
-{
-  runTest<EndLumiSummaryProd>({Trans::kGlobalEndLuminosityBlock, Trans::kEvent, Trans::kGlobalBeginLuminosityBlock, Trans::kStreamEndLuminosityBlock, Trans::kGlobalEndLuminosityBlock} );
+void testStreamModule::endLumiSummaryProdTest() {
+  runTest<EndLumiSummaryProd>({Trans::kGlobalEndLuminosityBlock,
+                               Trans::kEvent,
+                               Trans::kGlobalBeginLuminosityBlock,
+                               Trans::kStreamEndLuminosityBlock,
+                               Trans::kGlobalEndLuminosityBlock});
 }
-
diff --git a/FWCore/Framework/test/stubs/DeleteEarlyModules.cc b/FWCore/Framework/test/stubs/DeleteEarlyModules.cc
index 06a0a3c283bde..18129bff06bf0 100644
--- a/FWCore/Framework/test/stubs/DeleteEarlyModules.cc
+++ b/FWCore/Framework/test/stubs/DeleteEarlyModules.cc
@@ -2,7 +2,7 @@
 //
 // Package:     test
 // Class  :     DeleteEarlyModules
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -24,62 +24,54 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/Event.h"
 
-
 namespace edmtest {
-  class DeleteEarlyProducer: public edm::EDProducer {
+  class DeleteEarlyProducer : public edm::EDProducer {
   public:
-    DeleteEarlyProducer(edm::ParameterSet const& pset) {
-      produces<DeleteEarly>();
-    }
-    
+    DeleteEarlyProducer(edm::ParameterSet const& pset) { produces<DeleteEarly>(); }
+
     virtual void beginJob() {
       // Needed because DeleteEarly objects may be allocated and deleted in initialization
       edmtest::DeleteEarly::resetDeleteCount();
     }
 
-    virtual void produce(edm::Event& e, edm::EventSetup const& ){
-      e.put(std::make_unique<DeleteEarly>());
-    }
-
+    virtual void produce(edm::Event& e, edm::EventSetup const&) { e.put(std::make_unique<DeleteEarly>()); }
   };
-  
-  class DeleteEarlyReader: public edm::EDAnalyzer {
+
+  class DeleteEarlyReader : public edm::EDAnalyzer {
   public:
-    DeleteEarlyReader(edm::ParameterSet const& pset):
-    m_tag(pset.getUntrackedParameter<edm::InputTag>("tag"))
-    {
+    DeleteEarlyReader(edm::ParameterSet const& pset) : m_tag(pset.getUntrackedParameter<edm::InputTag>("tag")) {
       consumes<DeleteEarly>(m_tag);
     }
-    
-    virtual void analyze(edm::Event const& e, edm::EventSetup const& ) {
+
+    virtual void analyze(edm::Event const& e, edm::EventSetup const&) {
       edm::Handle<DeleteEarly> h;
-      e.getByLabel(m_tag,h);
+      e.getByLabel(m_tag, h);
     }
+
   private:
     edm::InputTag m_tag;
   };
-  
+
   class DeleteEarlyCheckDeleteAnalyzer : public edm::EDAnalyzer {
   public:
-    DeleteEarlyCheckDeleteAnalyzer(edm::ParameterSet const& pset):
-    m_expectedValues(pset.getUntrackedParameter<std::vector<unsigned int>>("expectedValues")),
-    m_index(0)
-    {}
-    
+    DeleteEarlyCheckDeleteAnalyzer(edm::ParameterSet const& pset)
+        : m_expectedValues(pset.getUntrackedParameter<std::vector<unsigned int>>("expectedValues")), m_index(0) {}
+
     virtual void analyze(edm::Event const&, edm::EventSetup const&) {
       if (DeleteEarly::nDeletes() != m_expectedValues.at(m_index)) {
-        throw cms::Exception("DeleteEarlyError")<<"On index "<<m_index<<" we expected "<<m_expectedValues[m_index]<<" deletes but we see "<<DeleteEarly::nDeletes();
+        throw cms::Exception("DeleteEarlyError")
+            << "On index " << m_index << " we expected " << m_expectedValues[m_index] << " deletes but we see "
+            << DeleteEarly::nDeletes();
       }
       ++m_index;
     }
 
-  private: 
+  private:
     std::vector<unsigned int> m_expectedValues;
     unsigned int m_index;
   };
-}
+}  // namespace edmtest
 using namespace edmtest;
 DEFINE_FWK_MODULE(DeleteEarlyProducer);
 DEFINE_FWK_MODULE(DeleteEarlyReader);
 DEFINE_FWK_MODULE(DeleteEarlyCheckDeleteAnalyzer);
-
diff --git a/FWCore/Framework/test/stubs/DummyLooper.cc b/FWCore/Framework/test/stubs/DummyLooper.cc
index fdba06d953563..76f0aee0832ed 100644
--- a/FWCore/Framework/test/stubs/DummyLooper.cc
+++ b/FWCore/Framework/test/stubs/DummyLooper.cc
@@ -2,7 +2,7 @@
 //
 // Package:    DummyLooper
 // Class:      DummyLooper
-// 
+//
 /**\class DummyLooper DummyLooper.h FWCore/DummyLooper/interface/DummyLooper.h
 
  Description: <one line class summary>
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -34,34 +33,31 @@
 using namespace edm::eventsetup::test;
 
 class DummyLooper : public edm::ESProducerLooper {
-   public:
-      DummyLooper(const edm::ParameterSet&);
-      ~DummyLooper();
-
-      typedef std::shared_ptr<DummyData> ReturnType;
-      typedef std::shared_ptr<DummyData const> ConstReturnType;
-
-      ReturnType produce(const DummyRecord&);
-      
-      void startingNewLoop(unsigned int ) {
-      
-      }
-      Status duringLoop(const edm::Event&, const edm::EventSetup&) {
-        return issueStop_? kStop : kContinue;
-      }
-      Status endOfLoop(const edm::EventSetup&, unsigned int) {
-         (data_->value_)++;
-         ++counter_;
-         return counter_==2 ? kStop : kContinue;
-      }
-   private:
-      // ----------member data ---------------------------
-      ConstReturnType data() const {return get_underlying_safe(data_);}
-      ReturnType& data() {return get_underlying_safe(data_);}
-
-      edm::propagate_const<ReturnType> data_;
-      int counter_;
-      bool issueStop_;
+public:
+  DummyLooper(const edm::ParameterSet&);
+  ~DummyLooper();
+
+  typedef std::shared_ptr<DummyData> ReturnType;
+  typedef std::shared_ptr<DummyData const> ConstReturnType;
+
+  ReturnType produce(const DummyRecord&);
+
+  void startingNewLoop(unsigned int) {}
+  Status duringLoop(const edm::Event&, const edm::EventSetup&) { return issueStop_ ? kStop : kContinue; }
+  Status endOfLoop(const edm::EventSetup&, unsigned int) {
+    (data_->value_)++;
+    ++counter_;
+    return counter_ == 2 ? kStop : kContinue;
+  }
+
+private:
+  // ----------member data ---------------------------
+  ConstReturnType data() const { return get_underlying_safe(data_); }
+  ReturnType& data() { return get_underlying_safe(data_); }
+
+  edm::propagate_const<ReturnType> data_;
+  int counter_;
+  bool issueStop_;
 };
 
 //
@@ -76,36 +72,27 @@ class DummyLooper : public edm::ESProducerLooper {
 // constructors and destructor
 //
 DummyLooper::DummyLooper(const edm::ParameterSet& iConfig)
-            : data_(new DummyData(iConfig.getUntrackedParameter<int>("value"))), counter_(0),
-issueStop_(iConfig.getUntrackedParameter<bool>("issueStop",false))
-{
-   //the following line is needed to tell the framework what
-   // data is being produced
-   setWhatProduced(this);
-
-   //now do what ever other initialization is needed
+    : data_(new DummyData(iConfig.getUntrackedParameter<int>("value"))),
+      counter_(0),
+      issueStop_(iConfig.getUntrackedParameter<bool>("issueStop", false)) {
+  //the following line is needed to tell the framework what
+  // data is being produced
+  setWhatProduced(this);
+
+  //now do what ever other initialization is needed
 }
 
-
-DummyLooper::~DummyLooper()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+DummyLooper::~DummyLooper() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-DummyLooper::ReturnType
-DummyLooper::produce(const DummyRecord&)
-{
-   return data();
-}
+DummyLooper::ReturnType DummyLooper::produce(const DummyRecord&) { return data(); }
 
 //define this as a plug-in
 DEFINE_FWK_LOOPER(DummyLooper);
diff --git a/FWCore/Framework/test/stubs/HistoryAnalyzer.cc b/FWCore/Framework/test/stubs/HistoryAnalyzer.cc
index e568f650c45ce..8a49cef06ae21 100644
--- a/FWCore/Framework/test/stubs/HistoryAnalyzer.cc
+++ b/FWCore/Framework/test/stubs/HistoryAnalyzer.cc
@@ -29,13 +29,11 @@ namespace edmtest {
 
   class HistoryAnalyzer : public edm::EDAnalyzer {
   public:
-
     explicit HistoryAnalyzer(edm::ParameterSet const& params);
     void analyze(edm::Event const& event, edm::EventSetup const&);
     void endJob();
 
   private:
-
     typedef std::vector<std::string> vstring;
 
     int expectedSize_;
@@ -50,25 +48,22 @@ namespace edmtest {
     vstring expectedDroppedModules_;
     vstring expectedDropFromProcPSet_;
     edm::ParameterSet expectedModulesOnEndPaths_;
- };
-
-  HistoryAnalyzer::HistoryAnalyzer(edm::ParameterSet const& params) :
-    expectedSize_(params.getParameter<int>("expectedSize")),
-    eventCount_(0),
-    expectedCount_(params.getParameter<int>("expectedCount")),
-    expectedSelectEventsInfo_(params.getParameter<std::vector<edm::ParameterSet> >("expectedSelectEventsInfo")),
-    expectedPaths_(params.getParameter<vstring>("expectedPaths")),
-    expectedEndPaths_(params.getParameter<vstring>("expectedEndPaths")),
-    expectedModules_(params.getParameter<vstring>("expectedModules")),
-    expectedDroppedEndPaths_(params.getParameter<vstring>("expectedDroppedEndPaths")),
-    expectedDroppedModules_(params.getParameter<vstring>("expectedDroppedModules")),
-    expectedDropFromProcPSet_(params.getParameter<vstring>("expectedDropFromProcPSet")),
-    expectedModulesOnEndPaths_(params.getParameter<edm::ParameterSet>("expectedModulesOnEndPaths")) {
-  }
-
-  void
-  HistoryAnalyzer::analyze(edm::Event const& event, edm::EventSetup const&)
-  {
+  };
+
+  HistoryAnalyzer::HistoryAnalyzer(edm::ParameterSet const& params)
+      : expectedSize_(params.getParameter<int>("expectedSize")),
+        eventCount_(0),
+        expectedCount_(params.getParameter<int>("expectedCount")),
+        expectedSelectEventsInfo_(params.getParameter<std::vector<edm::ParameterSet> >("expectedSelectEventsInfo")),
+        expectedPaths_(params.getParameter<vstring>("expectedPaths")),
+        expectedEndPaths_(params.getParameter<vstring>("expectedEndPaths")),
+        expectedModules_(params.getParameter<vstring>("expectedModules")),
+        expectedDroppedEndPaths_(params.getParameter<vstring>("expectedDroppedEndPaths")),
+        expectedDroppedModules_(params.getParameter<vstring>("expectedDroppedModules")),
+        expectedDropFromProcPSet_(params.getParameter<vstring>("expectedDropFromProcPSet")),
+        expectedModulesOnEndPaths_(params.getParameter<edm::ParameterSet>("expectedModulesOnEndPaths")) {}
+
+  void HistoryAnalyzer::analyze(edm::Event const& event, edm::EventSetup const&) {
     edm::EventSelectionIDVector const& esv = event.eventSelectionIDs();
     assert(esv.size() == static_cast<size_t>(expectedSize_));
 
@@ -84,7 +79,7 @@ namespace edmtest {
 
     if (eventCount_ == 0) {
       edm::ParameterSet proc_pset;
-      event.getProcessParameterSet(event.processHistory().rbegin()->processName(),proc_pset);
+      event.getProcessParameterSet(event.processHistory().rbegin()->processName(), proc_pset);
 
       {
         // test the function getProcessParameterSetContainingModule this is a
@@ -103,8 +98,7 @@ namespace edmtest {
         vstring paths = proc_pset.getParameter<vstring>("@paths");
         assert(paths == expectedPaths_);
 
-        for (vstring::const_iterator i = paths.begin(), iEnd = paths.end();
-             i != iEnd; ++i) {
+        for (vstring::const_iterator i = paths.begin(), iEnd = paths.end(); i != iEnd; ++i) {
           vstring modulesOnPath = proc_pset.getParameter<std::vector<std::string> >(*i);
           assert(!modulesOnPath.empty());
         }
@@ -114,15 +108,17 @@ namespace edmtest {
         vstring end_paths = proc_pset.getParameter<vstring>("@end_paths");
         assert(end_paths == expectedEndPaths_);
 
-        for (vstring::const_iterator i = end_paths.begin(), iEnd = end_paths.end();
-             i != iEnd; ++i) {
+        for (vstring::const_iterator i = end_paths.begin(), iEnd = end_paths.end(); i != iEnd; ++i) {
           vstring modulesOnEndPath = proc_pset.getParameter<vstring>(*i);
           assert(!modulesOnEndPath.empty());
           vstring expectedModulesOnEndPath = expectedModulesOnEndPaths_.getParameter<vstring>(*i);
           if (expectedModulesOnEndPath != modulesOnEndPath) {
-            std::copy(expectedModulesOnEndPath.begin(), expectedModulesOnEndPath.end(), std::ostream_iterator<std::string>(std::cout, " "));
+            std::copy(expectedModulesOnEndPath.begin(),
+                      expectedModulesOnEndPath.end(),
+                      std::ostream_iterator<std::string>(std::cout, " "));
             std::cout << std::endl;
-            std::copy(modulesOnEndPath.begin(), modulesOnEndPath.end(), std::ostream_iterator<std::string>(std::cout, " "));
+            std::copy(
+                modulesOnEndPath.begin(), modulesOnEndPath.end(), std::ostream_iterator<std::string>(std::cout, " "));
             std::cout << std::endl;
             assert(expectedModulesOnEndPath == modulesOnEndPath);
           }
@@ -135,47 +131,48 @@ namespace edmtest {
         if (all_modules != expectedModules_) {
           std::copy(all_modules.begin(), all_modules.end(), std::ostream_iterator<std::string>(std::cout, " "));
           std::cout << std::endl;
-          std::copy(expectedModules_.begin(), expectedModules_.end(), std::ostream_iterator<std::string>(std::cout, " "));
+          std::copy(
+              expectedModules_.begin(), expectedModules_.end(), std::ostream_iterator<std::string>(std::cout, " "));
           std::cout << std::endl;
           assert(all_modules == expectedModules_);
         }
-        for (vstring::const_iterator i = all_modules.begin(), iEnd = all_modules.end();
-             i != iEnd; ++i) {
+        for (vstring::const_iterator i = all_modules.begin(), iEnd = all_modules.end(); i != iEnd; ++i) {
           // Make sure the ParameterSet for the module is also present
           edm::ParameterSet const& pset = proc_pset.getParameterSet(*i);
-          // This is probably overkill, but also check it can be retrieved by ID from the registry 
+          // This is probably overkill, but also check it can be retrieved by ID from the registry
           edm::ParameterSetID id = pset.id();
-	  edm::ParameterSet const* result = reg->getMapped(id);
+          edm::ParameterSet const* result = reg->getMapped(id);
           assert(result != 0);
         }
       }
 
       for (vstring::const_iterator i = expectedDroppedEndPaths_.begin(), iEnd = expectedDroppedEndPaths_.end();
-           i != iEnd; ++i) {
+           i != iEnd;
+           ++i) {
         assert(!proc_pset.exists(*i));
       }
 
-      for (vstring::const_iterator i = expectedDroppedModules_.begin(), iEnd = expectedDroppedModules_.end();
-           i != iEnd; ++i) {
+      for (vstring::const_iterator i = expectedDroppedModules_.begin(), iEnd = expectedDroppedModules_.end(); i != iEnd;
+           ++i) {
         assert(!proc_pset.exists(*i));
 
-        for (edm::pset::Registry::const_iterator j = reg->begin(), jEnd = reg->end();
-             j != jEnd; ++j) {
+        for (edm::pset::Registry::const_iterator j = reg->begin(), jEnd = reg->end(); j != jEnd; ++j) {
           if (j->second.exists("@module_label")) {
-	    assert(j->second.getParameter<std::string>("@module_label") != *i);
-	  }
+            assert(j->second.getParameter<std::string>("@module_label") != *i);
+          }
         }
       }
       for (vstring::const_iterator i = expectedDropFromProcPSet_.begin(), iEnd = expectedDropFromProcPSet_.end();
-           i != iEnd; ++i) {
-        assert(!proc_pset.existsAs<edm::ParameterSet>(*i,true));
-        assert(proc_pset.existsAs<edm::ParameterSet>(*i,false));
+           i != iEnd;
+           ++i) {
+        assert(!proc_pset.existsAs<edm::ParameterSet>(*i, true));
+        assert(proc_pset.existsAs<edm::ParameterSet>(*i, false));
         bool isInRegistry = false;
-        for (edm::pset::Registry::const_iterator j = reg->begin(), jEnd = reg->end();
-             j != jEnd; ++j) {
+        for (edm::pset::Registry::const_iterator j = reg->begin(), jEnd = reg->end(); j != jEnd; ++j) {
           if (j->second.exists("@module_label")) {
-            if (j->second.getParameter<std::string>("@module_label") == *i) isInRegistry = true;
-	  }
+            if (j->second.getParameter<std::string>("@module_label") == *i)
+              isInRegistry = true;
+          }
         }
         assert(isInRegistry);
       }
@@ -183,14 +180,12 @@ namespace edmtest {
     ++eventCount_;
   }
 
-  void
-  HistoryAnalyzer::endJob()
-  {
+  void HistoryAnalyzer::endJob() {
     // std::cout << "Expected count is: " << expectedCount_ << std::endl;
     // std::cout << "Event count is:    " << eventCount_ << std::endl;
     assert(eventCount_ == expectedCount_);
   }
-}
+}  // namespace edmtest
 
 using edmtest::HistoryAnalyzer;
 DEFINE_FWK_MODULE(HistoryAnalyzer);
diff --git a/FWCore/Framework/test/stubs/LoadableDummyESSource.cc b/FWCore/Framework/test/stubs/LoadableDummyESSource.cc
index 8e5f21bafc569..b5491d5527005 100644
--- a/FWCore/Framework/test/stubs/LoadableDummyESSource.cc
+++ b/FWCore/Framework/test/stubs/LoadableDummyESSource.cc
@@ -2,7 +2,7 @@
 //
 // Package:     test
 // Class  :     LoadableDummyESSource
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -18,26 +18,22 @@
 #include "FWCore/Framework/test/DummyFinder.h"
 #include "FWCore/Framework/interface/SourceFactory.h"
 
-
 namespace edm {
-   class ParameterSet;
+  class ParameterSet;
 }
 
-class LoadableDummyESSource : public edm::eventsetup::test::DummyProxyProvider, public DummyFinder
-{
+class LoadableDummyESSource : public edm::eventsetup::test::DummyProxyProvider, public DummyFinder {
 public:
-   LoadableDummyESSource(const edm::ParameterSet& iPSet)
-   : DummyProxyProvider( edm::eventsetup::test::DummyData(iPSet.getUntrackedParameter<int>("value",2))){
-     unsigned int startRun = iPSet.getUntrackedParameter<unsigned int>("startRunForIOV",0);
-     if ( 0 == startRun ) {
-       setInterval(edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(),
-                                         edm::IOVSyncValue::endOfTime()));
-     } else {
-       setInterval(edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(startRun,0,0)),
-                                         edm::IOVSyncValue::endOfTime()));
-       
-     }
-   }
+  LoadableDummyESSource(const edm::ParameterSet& iPSet)
+      : DummyProxyProvider(edm::eventsetup::test::DummyData(iPSet.getUntrackedParameter<int>("value", 2))) {
+    unsigned int startRun = iPSet.getUntrackedParameter<unsigned int>("startRunForIOV", 0);
+    if (0 == startRun) {
+      setInterval(edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime()));
+    } else {
+      setInterval(
+          edm::ValidityInterval(edm::IOVSyncValue(edm::EventID(startRun, 0, 0)), edm::IOVSyncValue::endOfTime()));
+    }
+  }
 };
 
 DEFINE_FWK_EVENTSETUP_SOURCE(LoadableDummyESSource);
diff --git a/FWCore/Framework/test/stubs/LoadableDummyEventSetupRecordRetriever.cc b/FWCore/Framework/test/stubs/LoadableDummyEventSetupRecordRetriever.cc
index 72734cc85212a..9ce7b6069b204 100644
--- a/FWCore/Framework/test/stubs/LoadableDummyEventSetupRecordRetriever.cc
+++ b/FWCore/Framework/test/stubs/LoadableDummyEventSetupRecordRetriever.cc
@@ -18,13 +18,12 @@
 #include "FWCore/Framework/interface/SourceFactory.h"
 
 namespace edm {
-   class ParameterSet;
+  class ParameterSet;
 }
 
 class LoadableDummyEventSetupRecordRetriever : public edm::DummyEventSetupRecordRetriever {
 public:
-  LoadableDummyEventSetupRecordRetriever(edm::ParameterSet const&) {
-   }
+  LoadableDummyEventSetupRecordRetriever(edm::ParameterSet const&) {}
 };
 
 DEFINE_FWK_EVENTSETUP_SOURCE(LoadableDummyEventSetupRecordRetriever);
diff --git a/FWCore/Framework/test/stubs/LoadableDummyFinder.cc b/FWCore/Framework/test/stubs/LoadableDummyFinder.cc
index ab72d04949d95..124f7a8fe4787 100644
--- a/FWCore/Framework/test/stubs/LoadableDummyFinder.cc
+++ b/FWCore/Framework/test/stubs/LoadableDummyFinder.cc
@@ -2,7 +2,7 @@
 //
 // Package:     test
 // Class  :     DummyFinder
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -17,11 +17,11 @@
 #include "FWCore/Framework/interface/SourceFactory.h"
 
 namespace edm {
-   class ParameterSet;
+  class ParameterSet;
 }
 class LoadableDummyFinder : public DummyFinder {
 public:
-   LoadableDummyFinder(const edm::ParameterSet&) {}
+  LoadableDummyFinder(const edm::ParameterSet&) {}
 };
 
 DEFINE_FWK_EVENTSETUP_SOURCE(LoadableDummyFinder);
diff --git a/FWCore/Framework/test/stubs/LoadableDummyProvider.cc b/FWCore/Framework/test/stubs/LoadableDummyProvider.cc
index fd3beb6e60b3b..26236ca34d9cd 100644
--- a/FWCore/Framework/test/stubs/LoadableDummyProvider.cc
+++ b/FWCore/Framework/test/stubs/LoadableDummyProvider.cc
@@ -2,7 +2,7 @@
 //
 // Package:     test
 // Class  :     LoadableDummyProvider
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -18,12 +18,12 @@
 #include "FWCore/Framework/interface/ModuleFactory.h"
 
 namespace edm {
-   class ParameterSet;
+  class ParameterSet;
 }
 class LoadableDummyProvider : public edm::eventsetup::test::DummyProxyProvider {
 public:
-   LoadableDummyProvider(const edm::ParameterSet& iPSet) 
-   :DummyProxyProvider( edm::eventsetup::test::DummyData(iPSet.getUntrackedParameter<int>("value",1))) {}
+  LoadableDummyProvider(const edm::ParameterSet& iPSet)
+      : DummyProxyProvider(edm::eventsetup::test::DummyData(iPSet.getUntrackedParameter<int>("value", 1))) {}
 };
 
 DEFINE_FWK_EVENTSETUP_MODULE(LoadableDummyProvider);
diff --git a/FWCore/Framework/test/stubs/RunLumiEventAnalyzer.cc b/FWCore/Framework/test/stubs/RunLumiEventAnalyzer.cc
index 6c62ca253963a..475c819044543 100644
--- a/FWCore/Framework/test/stubs/RunLumiEventAnalyzer.cc
+++ b/FWCore/Framework/test/stubs/RunLumiEventAnalyzer.cc
@@ -16,46 +16,44 @@
 
 namespace edmtest {
 
-  RunLumiEventAnalyzer::RunLumiEventAnalyzer(edm::ParameterSet const& pset) :
-    expectedRunLumisEvents0_(),
-    expectedRunLumisEvents1_(),
-    expectedRunLumisEvents_(&expectedRunLumisEvents0_),
-    index_(0),
-    verbose_(pset.getUntrackedParameter<bool>("verbose", false)),
-    dumpTriggerResults_(pset.getUntrackedParameter<bool>("dumpTriggerResults", false)),
-    expectedEndingIndex0_(pset.getUntrackedParameter<int>("expectedEndingIndex", -1)),
-    expectedEndingIndex1_(pset.getUntrackedParameter<int>("expectedEndingIndex1", -1)),
-    expectedEndingIndex_(expectedEndingIndex0_) {
-
-    if(pset.existsAs<std::vector<unsigned int> >("expectedRunLumiEvents", false)) {
+  RunLumiEventAnalyzer::RunLumiEventAnalyzer(edm::ParameterSet const& pset)
+      : expectedRunLumisEvents0_(),
+        expectedRunLumisEvents1_(),
+        expectedRunLumisEvents_(&expectedRunLumisEvents0_),
+        index_(0),
+        verbose_(pset.getUntrackedParameter<bool>("verbose", false)),
+        dumpTriggerResults_(pset.getUntrackedParameter<bool>("dumpTriggerResults", false)),
+        expectedEndingIndex0_(pset.getUntrackedParameter<int>("expectedEndingIndex", -1)),
+        expectedEndingIndex1_(pset.getUntrackedParameter<int>("expectedEndingIndex1", -1)),
+        expectedEndingIndex_(expectedEndingIndex0_) {
+    if (pset.existsAs<std::vector<unsigned int> >("expectedRunLumiEvents", false)) {
       std::vector<unsigned int> temp = pset.getUntrackedParameter<std::vector<unsigned int> >("expectedRunLumiEvents");
       expectedRunLumisEvents0_.assign(temp.begin(), temp.end());
     } else {
-      expectedRunLumisEvents0_ = pset.getUntrackedParameter<std::vector<unsigned long long> >("expectedRunLumiEvents", std::vector<unsigned long long>());
+      expectedRunLumisEvents0_ = pset.getUntrackedParameter<std::vector<unsigned long long> >(
+          "expectedRunLumiEvents", std::vector<unsigned long long>());
     }
 
-    if(pset.existsAs<std::vector<unsigned int> >("expectedRunLumiEvents1", false)) {
+    if (pset.existsAs<std::vector<unsigned int> >("expectedRunLumiEvents1", false)) {
       std::vector<unsigned int> temp = pset.getUntrackedParameter<std::vector<unsigned int> >("expectedRunLumiEvents1");
       expectedRunLumisEvents1_.assign(temp.begin(), temp.end());
     } else {
-      expectedRunLumisEvents1_ = pset.getUntrackedParameter<std::vector<unsigned long long> >("expectedRunLumiEvents1", std::vector<unsigned long long>());
+      expectedRunLumisEvents1_ = pset.getUntrackedParameter<std::vector<unsigned long long> >(
+          "expectedRunLumiEvents1", std::vector<unsigned long long>());
     }
-    if(dumpTriggerResults_) {
+    if (dumpTriggerResults_) {
       triggerResultsToken_ = consumes<edm::TriggerResults>(edm::InputTag("TriggerResults"));
     }
   }
 
   void RunLumiEventAnalyzer::analyze(edm::Event const& event, edm::EventSetup const&) {
-
-    if(verbose_) {
-      edm::LogAbsolute("RunLumiEvent") << "RUN_LUMI_EVENT "
-                                       << event.run() << ", " 
-                                       << event.luminosityBlock() << ", "
+    if (verbose_) {
+      edm::LogAbsolute("RunLumiEvent") << "RUN_LUMI_EVENT " << event.run() << ", " << event.luminosityBlock() << ", "
                                        << event.id().event();
     }
 
-    if(dumpTriggerResults_) {
-      if( auto triggerResults=event.getHandle(triggerResultsToken_)) {
+    if (dumpTriggerResults_) {
+      if (auto triggerResults = event.getHandle(triggerResultsToken_)) {
         edm::LogAbsolute("RunLumiEvent") << "TestFailuresAnalyzer dumping TriggerResults";
         edm::LogAbsolute("RunLumiEvent") << *triggerResults;
       } else {
@@ -63,7 +61,7 @@ namespace edmtest {
       }
     }
 
-    if((index_ + 2U) < expectedRunLumisEvents_->size()) {
+    if ((index_ + 2U) < expectedRunLumisEvents_->size()) {
       assert(expectedRunLumisEvents_->at(index_) == event.run());
       ++index_;
       assert(expectedRunLumisEvents_->at(index_) == event.luminosityBlock());
@@ -74,15 +72,11 @@ namespace edmtest {
   }
 
   void RunLumiEventAnalyzer::beginRun(edm::Run const& run, edm::EventSetup const&) {
-
-    if(verbose_) {
-      edm::LogAbsolute("RunLumiEvent") << "RUN_LUMI_EVENT "
-                                       << run.run() << ", " 
-                                       << 0 << ", "
-                                       << 0;
+    if (verbose_) {
+      edm::LogAbsolute("RunLumiEvent") << "RUN_LUMI_EVENT " << run.run() << ", " << 0 << ", " << 0;
     }
 
-    if((index_ + 2U) < expectedRunLumisEvents_->size()) {
+    if ((index_ + 2U) < expectedRunLumisEvents_->size()) {
       assert(expectedRunLumisEvents_->at(index_) == run.run());
       ++index_;
       assert(expectedRunLumisEvents_->at(index_) == 0);
@@ -93,49 +87,39 @@ namespace edmtest {
   }
 
   void RunLumiEventAnalyzer::endRun(edm::Run const& run, edm::EventSetup const&) {
-
-    if(verbose_) {
-      edm::LogAbsolute("RunLumiEvent") << "RUN_LUMI_EVENT "
-                                       << run.run() << ", " 
-                                       << 0 << ", "
-                                       << 0;
+    if (verbose_) {
+      edm::LogAbsolute("RunLumiEvent") << "RUN_LUMI_EVENT " << run.run() << ", " << 0 << ", " << 0;
     }
 
-    if((index_ + 2U) < expectedRunLumisEvents_->size()) {
-      if(!(expectedRunLumisEvents_->at(index_) == run.run())) {
-        throw cms::Exception("UnexpectedRun")
-        << "RunLumiEventAnalyzer::endRun unexpected run\n"
-           "  expected "<<expectedRunLumisEvents_->at(index_)
-        << "  found    "<<run.run();
+    if ((index_ + 2U) < expectedRunLumisEvents_->size()) {
+      if (!(expectedRunLumisEvents_->at(index_) == run.run())) {
+        throw cms::Exception("UnexpectedRun") << "RunLumiEventAnalyzer::endRun unexpected run\n"
+                                                 "  expected "
+                                              << expectedRunLumisEvents_->at(index_) << "  found    " << run.run();
       }
       ++index_;
-      if(!(expectedRunLumisEvents_->at(index_) == 0)) {
-        throw cms::Exception("UnexpectedLumi")
-        << "RunLumiEventAnalyzer::endRun unexpected lumi\n"
-           "  expected "<<expectedRunLumisEvents_->at(index_)
-        << "  found    0";
+      if (!(expectedRunLumisEvents_->at(index_) == 0)) {
+        throw cms::Exception("UnexpectedLumi") << "RunLumiEventAnalyzer::endRun unexpected lumi\n"
+                                                  "  expected "
+                                               << expectedRunLumisEvents_->at(index_) << "  found    0";
       }
       ++index_;
-      if(!(expectedRunLumisEvents_->at(index_) == 0)) {
-        throw cms::Exception("UnexpectedEvent")
-        << "RunLumiEventAnalyzer::endRun unexpected event\n"
-           "  expected "<<expectedRunLumisEvents_->at(index_)
-        << "  found    0";
+      if (!(expectedRunLumisEvents_->at(index_) == 0)) {
+        throw cms::Exception("UnexpectedEvent") << "RunLumiEventAnalyzer::endRun unexpected event\n"
+                                                   "  expected "
+                                                << expectedRunLumisEvents_->at(index_) << "  found    0";
       }
       ++index_;
     }
   }
 
   void RunLumiEventAnalyzer::beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const&) {
-
-    if(verbose_) {
-      edm::LogAbsolute("RunLumiEvent") << "RUN_LUMI_EVENT "
-                                       << lumi.run() << ", " 
-                                       << lumi.luminosityBlock() << ", "
+    if (verbose_) {
+      edm::LogAbsolute("RunLumiEvent") << "RUN_LUMI_EVENT " << lumi.run() << ", " << lumi.luminosityBlock() << ", "
                                        << 0;
     }
 
-    if((index_ + 2U) < expectedRunLumisEvents_->size()) {
+    if ((index_ + 2U) < expectedRunLumisEvents_->size()) {
       assert(expectedRunLumisEvents_->at(index_) == lumi.run());
       ++index_;
       assert(expectedRunLumisEvents_->at(index_) == lumi.luminosityBlock());
@@ -146,46 +130,41 @@ namespace edmtest {
   }
 
   void RunLumiEventAnalyzer::endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const&) {
-
-    if(verbose_) {
-      edm::LogAbsolute("RunLumiEvent") << "RUN_LUMI_EVENT "
-                                       << lumi.run() << ", " 
-                                       << lumi.luminosityBlock() << ", "
+    if (verbose_) {
+      edm::LogAbsolute("RunLumiEvent") << "RUN_LUMI_EVENT " << lumi.run() << ", " << lumi.luminosityBlock() << ", "
                                        << 0;
     }
 
-    if((index_ + 2U) < expectedRunLumisEvents_->size()) {
-      if(!(expectedRunLumisEvents_->at(index_) == lumi.run())) {
-        throw cms::Exception("UnexpectedRun")
-        << "RunLumiEventAnalyzer::endLuminosityBlock unexpected run\n"
-           "  expected "<<expectedRunLumisEvents_->at(index_)
-        << "  found    "<<lumi.run();
+    if ((index_ + 2U) < expectedRunLumisEvents_->size()) {
+      if (!(expectedRunLumisEvents_->at(index_) == lumi.run())) {
+        throw cms::Exception("UnexpectedRun") << "RunLumiEventAnalyzer::endLuminosityBlock unexpected run\n"
+                                                 "  expected "
+                                              << expectedRunLumisEvents_->at(index_) << "  found    " << lumi.run();
       }
       ++index_;
-      if(!(expectedRunLumisEvents_->at(index_) == lumi.luminosityBlock())) {
+      if (!(expectedRunLumisEvents_->at(index_) == lumi.luminosityBlock())) {
         throw cms::Exception("UnexpectedLumi")
-        << "RunLumiEventAnalyzer::endLuminosityBlock unexpected lumi"
-           "  expected "<<expectedRunLumisEvents_->at(index_)
-        << "  found    "<<lumi.luminosityBlock();
+            << "RunLumiEventAnalyzer::endLuminosityBlock unexpected lumi"
+               "  expected "
+            << expectedRunLumisEvents_->at(index_) << "  found    " << lumi.luminosityBlock();
       }
       ++index_;
-      if(!(expectedRunLumisEvents_->at(index_) == 0)) {
-        throw cms::Exception("UnexpectedEvent")
-        << "RunLumiEventAnalyzer::endLuminosityBlock unexpected event"
-           "  expected "<<expectedRunLumisEvents_->at(index_)
-        << "  found    0";
+      if (!(expectedRunLumisEvents_->at(index_) == 0)) {
+        throw cms::Exception("UnexpectedEvent") << "RunLumiEventAnalyzer::endLuminosityBlock unexpected event"
+                                                   "  expected "
+                                                << expectedRunLumisEvents_->at(index_) << "  found    0";
       }
       ++index_;
     }
   }
 
-  void
-  RunLumiEventAnalyzer::endJob() {
-    if(expectedEndingIndex_ != -1 && index_ != expectedEndingIndex_) {
-      throw cms::Exception("UnexpectedEvent", "RunLumiEventAnalyzer::endJob. Unexpected number of runs, lumis, and events");
+  void RunLumiEventAnalyzer::endJob() {
+    if (expectedEndingIndex_ != -1 && index_ != expectedEndingIndex_) {
+      throw cms::Exception("UnexpectedEvent",
+                           "RunLumiEventAnalyzer::endJob. Unexpected number of runs, lumis, and events");
     }
   }
 
-}
+}  // namespace edmtest
 using edmtest::RunLumiEventAnalyzer;
 DEFINE_FWK_MODULE(RunLumiEventAnalyzer);
diff --git a/FWCore/Framework/test/stubs/RunLumiEventAnalyzer.h b/FWCore/Framework/test/stubs/RunLumiEventAnalyzer.h
index eb33112a88006..481e003144946 100644
--- a/FWCore/Framework/test/stubs/RunLumiEventAnalyzer.h
+++ b/FWCore/Framework/test/stubs/RunLumiEventAnalyzer.h
@@ -16,7 +16,6 @@ namespace edmtest {
 
   class RunLumiEventAnalyzer : public edm::EDAnalyzer {
   public:
-
     explicit RunLumiEventAnalyzer(edm::ParameterSet const& pset);
 
     virtual ~RunLumiEventAnalyzer() {}
@@ -29,7 +28,6 @@ namespace edmtest {
     virtual void endJob();
 
   private:
-
     std::vector<unsigned long long> expectedRunLumisEvents0_;
     std::vector<unsigned long long> expectedRunLumisEvents1_;
     edm::propagate_const<std::vector<unsigned long long>*> expectedRunLumisEvents_;
@@ -41,6 +39,6 @@ namespace edmtest {
     int expectedEndingIndex_;
     edm::EDGetTokenT<edm::TriggerResults> triggerResultsToken_;
   };
-}
+}  // namespace edmtest
 
 #endif
diff --git a/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.cc b/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.cc
index 511a023c85506..dafc9257b0e3e 100644
--- a/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.cc
+++ b/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.cc
@@ -2,7 +2,7 @@
 //
 // Package:    TestBeginEndJobAnalyzer
 // Class:      TestBeginEndJobAnalyzer
-// 
+//
 /**\class TestBeginEndJobAnalyzer TestBeginEndJobAnalyzer.cc stubs/TestBeginEndJobAnalyzer/src/TestBeginEndJobAnalyzer.cc
 
  Description: <one line class summary>
@@ -16,64 +16,47 @@
 //
 //
 
-
 #include "FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include <memory>
 #include <iostream>
 
-void hello(const char * hi) {
+void hello(const char* hi) {
   //std::cout << "IN " << hi << std::endl;
 }
 
-TestBeginEndJobAnalyzer::Control & 
-TestBeginEndJobAnalyzer::control() {
+TestBeginEndJobAnalyzer::Control& TestBeginEndJobAnalyzer::control() {
   static Control l;
   return l;
 }
 
-TestBeginEndJobAnalyzer::TestBeginEndJobAnalyzer(const edm::ParameterSet& /* iConfig */) {
-   hello("constr");
-}
+TestBeginEndJobAnalyzer::TestBeginEndJobAnalyzer(const edm::ParameterSet& /* iConfig */) { hello("constr"); }
 
 TestBeginEndJobAnalyzer::~TestBeginEndJobAnalyzer() {
-     hello("destr");
+  hello("destr");
   control().destructorCalled = true;
 }
 
-
-void 
-TestBeginEndJobAnalyzer::beginJob() {
-     hello("bjob");
+void TestBeginEndJobAnalyzer::beginJob() {
+  hello("bjob");
   control().beginJobCalled = true;
 }
 
-void 
-TestBeginEndJobAnalyzer::endJob() {
-   hello("ejob");
+void TestBeginEndJobAnalyzer::endJob() {
+  hello("ejob");
   control().endJobCalled = true;
 }
 
-void
-TestBeginEndJobAnalyzer::beginRun(edm::Run const&, edm::EventSetup const&) {
-  control().beginRunCalled = true;
-}
+void TestBeginEndJobAnalyzer::beginRun(edm::Run const&, edm::EventSetup const&) { control().beginRunCalled = true; }
 
-void
-TestBeginEndJobAnalyzer::endRun(edm::Run const&, edm::EventSetup const&) {
-  control().endRunCalled = true;
-}
+void TestBeginEndJobAnalyzer::endRun(edm::Run const&, edm::EventSetup const&) { control().endRunCalled = true; }
 
-void
-TestBeginEndJobAnalyzer::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {
+void TestBeginEndJobAnalyzer::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {
   control().beginLumiCalled = true;
 }
 
-void
-TestBeginEndJobAnalyzer::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {
+void TestBeginEndJobAnalyzer::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {
   control().endLumiCalled = true;
 }
 
-void
-TestBeginEndJobAnalyzer::analyze(const edm::Event& /* iEvent */, const edm::EventSetup& /* iSetup */) {
-}
+void TestBeginEndJobAnalyzer::analyze(const edm::Event& /* iEvent */, const edm::EventSetup& /* iSetup */) {}
diff --git a/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.h b/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.h
index 0e13fb66e718c..4d0d81edbd898 100644
--- a/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.h
+++ b/FWCore/Framework/test/stubs/TestBeginEndJobAnalyzer.h
@@ -4,7 +4,7 @@
 //
 // Package:     test
 // Class  :     TestBeginEndJobAnalyzer
-// 
+//
 /**\class TestBeginEndJobAnalyzer TestBeginEndJobAnalyzer.h Framework/test/interface/TestBeginEndJobAnalyzer.h
 
  Description: <one line class summary>
@@ -26,37 +26,32 @@
 // forward declarations
 class TestBeginEndJobAnalyzer : public edm::EDAnalyzer {
 public:
-   explicit TestBeginEndJobAnalyzer(const edm::ParameterSet&);
-   ~TestBeginEndJobAnalyzer();
-   
-   
-   virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
-   
-   virtual void beginJob() override;
-   virtual void endJob() override;
-   virtual void beginRun(edm::Run const&, edm::EventSetup const&) override;
-   virtual void endRun(edm::Run const&, edm::EventSetup const&) override;
-   virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
-   virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
-
-   
-
-   struct Control {
-      bool beginJobCalled = false;
-      bool endJobCalled = false;
-      bool beginRunCalled = false;
-      bool endRunCalled = false;
-      bool beginLumiCalled = false;
-      bool endLumiCalled = false;
-      bool destructorCalled = false;
-   };
-
-   static Control & control();
-
+  explicit TestBeginEndJobAnalyzer(const edm::ParameterSet&);
+  ~TestBeginEndJobAnalyzer();
+
+  virtual void analyze(const edm::Event&, const edm::EventSetup&) override;
+
+  virtual void beginJob() override;
+  virtual void endJob() override;
+  virtual void beginRun(edm::Run const&, edm::EventSetup const&) override;
+  virtual void endRun(edm::Run const&, edm::EventSetup const&) override;
+  virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
+  virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
+
+  struct Control {
+    bool beginJobCalled = false;
+    bool endJobCalled = false;
+    bool beginRunCalled = false;
+    bool endRunCalled = false;
+    bool beginLumiCalled = false;
+    bool endLumiCalled = false;
+    bool destructorCalled = false;
+  };
+
+  static Control& control();
 
 private:
-      // ----------member data ---------------------------
+  // ----------member data ---------------------------
 };
 
-
 #endif /* test_TestBeginEndJobAnalyzer_h */
diff --git a/FWCore/Framework/test/stubs/TestESDummyDataAnalyzer.cc b/FWCore/Framework/test/stubs/TestESDummyDataAnalyzer.cc
index 068c9a7899e4a..4bb4756c980e9 100644
--- a/FWCore/Framework/test/stubs/TestESDummyDataAnalyzer.cc
+++ b/FWCore/Framework/test/stubs/TestESDummyDataAnalyzer.cc
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -45,46 +44,43 @@ class TestESDummyDataAnalyzer : public edm::EDAnalyzer {
   int m_counter{};
   int m_totalCounter{};
   int const m_totalNEvents;
+  // At the moment the begin run token is not used to get anything,
+  // but just its existence tests the indexing used in the esConsumes
+  // function call
+  edm::ESGetToken<edm::eventsetup::test::DummyData, edm::DefaultRecord> const m_esTokenBeginRun;
   edm::ESGetToken<edm::eventsetup::test::DummyData, edm::DefaultRecord> const m_esToken;
 };
 
-TestESDummyDataAnalyzer::TestESDummyDataAnalyzer(const edm::ParameterSet& iConfig) :
-  m_expectedValue{iConfig.getParameter<int>("expected")},
-  m_nEventsValue{iConfig.getUntrackedParameter<int>("nEvents",0)},
-  m_totalNEvents{iConfig.getUntrackedParameter<int>("totalNEvents",-1)},
-  m_esToken{esConsumes<edm::eventsetup::test::DummyData, edm::DefaultRecord>()}
-{}
-
+TestESDummyDataAnalyzer::TestESDummyDataAnalyzer(const edm::ParameterSet& iConfig)
+    : m_expectedValue{iConfig.getParameter<int>("expected")},
+      m_nEventsValue{iConfig.getUntrackedParameter<int>("nEvents", 0)},
+      m_totalNEvents{iConfig.getUntrackedParameter<int>("totalNEvents", -1)},
+      m_esTokenBeginRun{esConsumes<edm::eventsetup::test::DummyData, edm::DefaultRecord, edm::Transition::BeginRun>()},
+      m_esToken{esConsumes<edm::eventsetup::test::DummyData, edm::DefaultRecord>()} {}
 
-void
-TestESDummyDataAnalyzer::analyze(const edm::Event&, const edm::EventSetup& iSetup)
-{
+void TestESDummyDataAnalyzer::analyze(const edm::Event&, const edm::EventSetup& iSetup) {
   using namespace edm;
 
   ++m_totalCounter;
-  if(m_nEventsValue) {
+  if (m_nEventsValue) {
     ++m_counter;
-    if(m_nEventsValue<m_counter) {
+    if (m_nEventsValue < m_counter) {
       ++m_expectedValue;
-      m_counter=0;
+      m_counter = 0;
     }
   }
 
   ESHandle<edm::eventsetup::test::DummyData> pData = iSetup.getHandle(m_esToken);
 
-  if(m_expectedValue != pData->value_) {
-    throw cms::Exception("WrongValue")<<"got value "<<pData->value_<<" but expected "<<m_expectedValue;
+  if (m_expectedValue != pData->value_) {
+    throw cms::Exception("WrongValue") << "got value " << pData->value_ << " but expected " << m_expectedValue;
   }
-
 }
 
-void
-TestESDummyDataAnalyzer::endJob()
-{
-  if (-1 != m_totalNEvents &&
-      m_totalNEvents != m_totalCounter) {
-    throw cms::Exception("WrongNumberOfEvents")<<"expected "<<m_totalNEvents<<" but instead saw "<<m_totalCounter
-                                               <<"\n";
+void TestESDummyDataAnalyzer::endJob() {
+  if (-1 != m_totalNEvents && m_totalNEvents != m_totalCounter) {
+    throw cms::Exception("WrongNumberOfEvents")
+        << "expected " << m_totalNEvents << " but instead saw " << m_totalCounter << "\n";
   }
 }
 
diff --git a/FWCore/Framework/test/stubs/TestFailuresAnalyzer.cc b/FWCore/Framework/test/stubs/TestFailuresAnalyzer.cc
index b55eb48d053c4..b6112d2870a74 100644
--- a/FWCore/Framework/test/stubs/TestFailuresAnalyzer.cc
+++ b/FWCore/Framework/test/stubs/TestFailuresAnalyzer.cc
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -43,71 +42,51 @@
 // static data member definitions
 //
 
-enum {
-   kConstructor,
-   kBeginOfJob,
-   kEvent,
-   kEndOfJob,
-   kBeginOfJobBadXML,
-   kEventCorruption
-};
+enum { kConstructor, kBeginOfJob, kEvent, kEndOfJob, kBeginOfJobBadXML, kEventCorruption };
 //
 // constructors and destructor
 //
 TestFailuresAnalyzer::TestFailuresAnalyzer(const edm::ParameterSet& iConfig)
-  : whichFailure_(iConfig.getParameter<int>("whichFailure")),
-    eventToThrow_(iConfig.getUntrackedParameter<unsigned long long>("eventToThrow", 2U))
-{
-   //now do what ever initialization is needed
-   if(whichFailure_ == kConstructor){
-      throw cms::Exception("Test")<<" constructor";
-   }
+    : whichFailure_(iConfig.getParameter<int>("whichFailure")),
+      eventToThrow_(iConfig.getUntrackedParameter<unsigned long long>("eventToThrow", 2U)) {
+  //now do what ever initialization is needed
+  if (whichFailure_ == kConstructor) {
+    throw cms::Exception("Test") << " constructor";
+  }
 }
 
-
-TestFailuresAnalyzer::~TestFailuresAnalyzer()
-{
-
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+TestFailuresAnalyzer::~TestFailuresAnalyzer() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-TestFailuresAnalyzer::beginJob()
-{
-   if(whichFailure_ == kBeginOfJob){
-      throw cms::Exception("Test") <<" beginJob";
-   }
-   if(whichFailure_ == kBeginOfJobBadXML){
-      throw cms::Exception("Test") <<" beginJob with <BAD> >XML<";
-   }
+void TestFailuresAnalyzer::beginJob() {
+  if (whichFailure_ == kBeginOfJob) {
+    throw cms::Exception("Test") << " beginJob";
+  }
+  if (whichFailure_ == kBeginOfJobBadXML) {
+    throw cms::Exception("Test") << " beginJob with <BAD> >XML<";
+  }
 }
 
-void
-TestFailuresAnalyzer::endJob()
-{
-   if(whichFailure_ == kEndOfJob){
-      throw cms::Exception("Test") <<" endJob";
-   }
+void TestFailuresAnalyzer::endJob() {
+  if (whichFailure_ == kEndOfJob) {
+    throw cms::Exception("Test") << " endJob";
+  }
 }
 
-
-void
-TestFailuresAnalyzer::analyze(const edm::Event& e /* iEvent */, const edm::EventSetup& /* iSetup */)
-{
-   if(whichFailure_ == kEvent){
-      throw cms::Exception("Test") <<" event";
-   }
-   if(whichFailure_ == kEventCorruption && eventToThrow_ == e.eventAuxiliary().event()) {
-      throw edm::Exception(edm::errors::EventCorruption, "testing exception handling");
-   }
+void TestFailuresAnalyzer::analyze(const edm::Event& e /* iEvent */, const edm::EventSetup& /* iSetup */) {
+  if (whichFailure_ == kEvent) {
+    throw cms::Exception("Test") << " event";
+  }
+  if (whichFailure_ == kEventCorruption && eventToThrow_ == e.eventAuxiliary().event()) {
+    throw edm::Exception(edm::errors::EventCorruption, "testing exception handling");
+  }
 }
 
 //define this as a plug-in
diff --git a/FWCore/Framework/test/stubs/TestFailuresAnalyzer.h b/FWCore/Framework/test/stubs/TestFailuresAnalyzer.h
index fa7621f24792c..7995b731a8054 100644
--- a/FWCore/Framework/test/stubs/TestFailuresAnalyzer.h
+++ b/FWCore/Framework/test/stubs/TestFailuresAnalyzer.h
@@ -4,7 +4,7 @@
 //
 // Package:     test
 // Class  :     TestFailuresAnalyzer
-// 
+//
 /**\class TestFailuresAnalyzer TestFailuresAnalyzer.h Framework/test/interface/TestFailuresAnalyzer.h
 
  Description: <one line class summary>
@@ -25,20 +25,18 @@
 // forward declarations
 class TestFailuresAnalyzer : public edm::EDAnalyzer {
 public:
-   explicit TestFailuresAnalyzer(const edm::ParameterSet&);
-   ~TestFailuresAnalyzer();
-   
-   
-   virtual void analyze(const edm::Event&, const edm::EventSetup&);
-   
-   virtual void beginJob();
-   virtual void endJob();
-   
+  explicit TestFailuresAnalyzer(const edm::ParameterSet&);
+  ~TestFailuresAnalyzer();
+
+  virtual void analyze(const edm::Event&, const edm::EventSetup&);
+
+  virtual void beginJob();
+  virtual void endJob();
+
 private:
-      // ----------member data ---------------------------
-      int whichFailure_;
-      unsigned long long eventToThrow_;
+  // ----------member data ---------------------------
+  int whichFailure_;
+  unsigned long long eventToThrow_;
 };
 
-
 #endif /* test_TestFailuresAnalyzer_h */
diff --git a/FWCore/Framework/test/stubs/TestFilterModule.cc b/FWCore/Framework/test/stubs/TestFilterModule.cc
index a6e9637d30bc8..49c4444e3e0bf 100644
--- a/FWCore/Framework/test/stubs/TestFilterModule.cc
+++ b/FWCore/Framework/test/stubs/TestFilterModule.cc
@@ -27,11 +27,9 @@ namespace edm {
   class ModuleCallingContext;
 }
 
-namespace edmtest
-{
+namespace edmtest {
 
-  class TestResultAnalyzer : public edm::one::EDAnalyzer<>
-  {
+  class TestResultAnalyzer : public edm::one::EDAnalyzer<> {
   public:
     explicit TestResultAnalyzer(edm::ParameterSet const&);
     virtual ~TestResultAnalyzer();
@@ -40,26 +38,24 @@ namespace edmtest
     void endJob() override;
 
   private:
-    int    passed_;
-    int    failed_;
+    int passed_;
+    int failed_;
     std::string name_;
-    int    numbits_;
+    int numbits_;
   };
 
-  class TestContextAnalyzer : public edm::global::EDAnalyzer<>
-  {
+  class TestContextAnalyzer : public edm::global::EDAnalyzer<> {
   public:
-    explicit TestContextAnalyzer( edm::ParameterSet const&);
-    
+    explicit TestContextAnalyzer(edm::ParameterSet const&);
+
     virtual void analyze(edm::StreamID, edm::Event const& e, edm::EventSetup const& c) const override;
-    std::string expected_pathname_; // if empty, we don't know
-    std::string expected_modulelabel_; // if empty, we don't know
+    std::string expected_pathname_;     // if empty, we don't know
+    std::string expected_modulelabel_;  // if empty, we don't know
   };
 
   // -------
 
-  class TestFilterModule : public edm::one::EDFilter<>
-  {
+  class TestFilterModule : public edm::one::EDFilter<> {
   public:
     explicit TestFilterModule(edm::ParameterSet const&);
     virtual ~TestFilterModule();
@@ -69,19 +65,19 @@ namespace edmtest
 
   private:
     int count_;
-    int accept_rate_; // how many out of 100 will be accepted?
+    int accept_rate_;  // how many out of 100 will be accepted?
     bool onlyOne_;
   };
 
   // -------
 
-  class SewerModule : public edm::one::OutputModule<>
-  {
+  class SewerModule : public edm::one::OutputModule<> {
   public:
     explicit SewerModule(edm::ParameterSet const&);
     virtual ~SewerModule();
 
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
+
   private:
     virtual void write(edm::EventForOutput const& e) override;
     virtual void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override {}
@@ -95,151 +91,124 @@ namespace edmtest
 
   // -----------------------------------------------------------------
 
-  TestResultAnalyzer::TestResultAnalyzer(edm::ParameterSet const& ps):
-    passed_(),
-    failed_(),
-    name_(ps.getUntrackedParameter<std::string>("name","DEFAULT")),
-    numbits_(ps.getUntrackedParameter<int>("numbits",-1))
-  {
+  TestResultAnalyzer::TestResultAnalyzer(edm::ParameterSet const& ps)
+      : passed_(),
+        failed_(),
+        name_(ps.getUntrackedParameter<std::string>("name", "DEFAULT")),
+        numbits_(ps.getUntrackedParameter<int>("numbits", -1)) {
     consumesMany<edm::TriggerResults>();
   }
-    
-  TestResultAnalyzer::~TestResultAnalyzer()
-  {
-  }
 
-  void TestResultAnalyzer::analyze(edm::Event const& e,edm::EventSetup const&)
-  {
+  TestResultAnalyzer::~TestResultAnalyzer() {}
+
+  void TestResultAnalyzer::analyze(edm::Event const& e, edm::EventSetup const&) {
     typedef std::vector<edm::Handle<edm::TriggerResults> > Trig;
     Trig prod;
     e.getManyByType(prod);
 
-    if(prod.size() == 0) return;
-    if(prod.size() > 1) {
-      std::cerr << "More than one trigger result in the event, using first one"
-	   << std::endl;
+    if (prod.size() == 0)
+      return;
+    if (prod.size() > 1) {
+      std::cerr << "More than one trigger result in the event, using first one" << std::endl;
     }
 
-    if (prod[0]->accept()) ++passed_; else ++failed_;
+    if (prod[0]->accept())
+      ++passed_;
+    else
+      ++failed_;
 
-    if(numbits_ < 0) return;
+    if (numbits_ < 0)
+      return;
 
     unsigned int numbits = numbits_;
-    if(numbits != prod[0]->size()) {
-      std::cerr << "TestResultAnalyzer named: " << name_
-	   << " should have " << numbits
-	   << ", got " << prod[0]->size() << " in TriggerResults\n";
+    if (numbits != prod[0]->size()) {
+      std::cerr << "TestResultAnalyzer named: " << name_ << " should have " << numbits << ", got " << prod[0]->size()
+                << " in TriggerResults\n";
       abort();
     }
   }
 
-  void TestResultAnalyzer::endJob()
-  {
+  void TestResultAnalyzer::endJob() {
     std::cerr << "TESTRESULTANALYZER " << name_ << ": "
-	 << "passed=" << passed_ << " failed=" << failed_ << "\n";
+              << "passed=" << passed_ << " failed=" << failed_ << "\n";
   }
 
   // ---------
 
-  
-  TestContextAnalyzer::TestContextAnalyzer(edm::ParameterSet const& ps):
-  expected_pathname_(ps.getUntrackedParameter<std::string>("pathname", "")),
-  expected_modulelabel_(ps.getUntrackedParameter<std::string>("modlabel", ""))
-  {
-  }
-  
-  void TestContextAnalyzer::analyze(edm::StreamID, edm::Event const& e,edm::EventSetup const&) const
-  {
+  TestContextAnalyzer::TestContextAnalyzer(edm::ParameterSet const& ps)
+      : expected_pathname_(ps.getUntrackedParameter<std::string>("pathname", "")),
+        expected_modulelabel_(ps.getUntrackedParameter<std::string>("modlabel", "")) {}
+
+  void TestContextAnalyzer::analyze(edm::StreamID, edm::Event const& e, edm::EventSetup const&) const {
     assert(e.moduleCallingContext()->moduleDescription()->moduleLabel() == moduleDescription().moduleLabel());
-    
-    if( !expected_pathname_.empty() ) {
-      assert( expected_pathname_ == e.moduleCallingContext()->placeInPathContext()->pathContext()->pathName());
+
+    if (!expected_pathname_.empty()) {
+      assert(expected_pathname_ == e.moduleCallingContext()->placeInPathContext()->pathContext()->pathName());
     }
-    
-    if( !expected_modulelabel_.empty() ) {
+
+    if (!expected_modulelabel_.empty()) {
       assert(expected_modulelabel_ == moduleDescription().moduleLabel());
     }
   }
 
   // ---------
 
-  TestFilterModule::TestFilterModule(edm::ParameterSet const& ps):
-    count_(),
-    accept_rate_(ps.getUntrackedParameter<int>("acceptValue",1)),
-    onlyOne_(ps.getUntrackedParameter<bool>("onlyOne",false))
-  {
-  }
-    
-  TestFilterModule::~TestFilterModule()
-  {
-  }
+  TestFilterModule::TestFilterModule(edm::ParameterSet const& ps)
+      : count_(),
+        accept_rate_(ps.getUntrackedParameter<int>("acceptValue", 1)),
+        onlyOne_(ps.getUntrackedParameter<bool>("onlyOne", false)) {}
+
+  TestFilterModule::~TestFilterModule() {}
 
-  bool TestFilterModule::filter(edm::Event& e, edm::EventSetup const&)
-  {
+  bool TestFilterModule::filter(edm::Event& e, edm::EventSetup const&) {
     assert(e.moduleCallingContext()->moduleDescription()->moduleLabel() == moduleDescription().moduleLabel());
 
     ++count_;
-    if(onlyOne_)
-      return count_ % accept_rate_ ==0;
+    if (onlyOne_)
+      return count_ % accept_rate_ == 0;
     else
       return count_ % 100 <= accept_rate_;
   }
 
-  void TestFilterModule::endJob()
-  {
-  }
+  void TestFilterModule::endJob() {}
 
   // ---------
 
-  SewerModule::SewerModule(edm::ParameterSet const& ps):
-    edm::one::OutputModuleBase::OutputModuleBase(ps),
-    edm::one::OutputModule<>(ps),
-    name_(ps.getParameter<std::string>("name")),
-    num_pass_(ps.getParameter<int>("shouldPass")),
-    total_()
-  {
-  }
-    
-  SewerModule::~SewerModule()
-  {
-  }
+  SewerModule::SewerModule(edm::ParameterSet const& ps)
+      : edm::one::OutputModuleBase::OutputModuleBase(ps),
+        edm::one::OutputModule<>(ps),
+        name_(ps.getParameter<std::string>("name")),
+        num_pass_(ps.getParameter<int>("shouldPass")),
+        total_() {}
 
-  void SewerModule::write(edm::EventForOutput const&)
-  {
-    ++total_;
-  }
+  SewerModule::~SewerModule() {}
+
+  void SewerModule::write(edm::EventForOutput const&) { ++total_; }
 
-  void SewerModule::endJob()
-  {
-    std::cerr << "SEWERMODULE " << name_ << ": should pass " << num_pass_
-	 << ", did pass " << total_ << "\n";
-
-    if(total_!=num_pass_)
-      {
-	std::cerr << "number passed should be " << num_pass_
-	     << ", but got " << total_ << "\n";
-	abort();
-      }
+  void SewerModule::endJob() {
+    std::cerr << "SEWERMODULE " << name_ << ": should pass " << num_pass_ << ", did pass " << total_ << "\n";
+
+    if (total_ != num_pass_) {
+      std::cerr << "number passed should be " << num_pass_ << ", but got " << total_ << "\n";
+      abort();
+    }
   }
-  
-  void
-  SewerModule::fillDescriptions(ConfigurationDescriptions& descriptions) {
+
+  void SewerModule::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     desc.setComment("Tracks number of times the write method is called.");
-    desc.add<std::string>("name")
-    ->setComment("name used in printout");
-    desc.add<int>("shouldPass")
-    ->setComment("number of times write should be called");
+    desc.add<std::string>("name")->setComment("name used in printout");
+    desc.add<int>("shouldPass")->setComment("number of times write should be called");
     edm::OutputModule::fillDescription(desc, std::vector<std::string>(1U, std::string("drop *")));
     descriptions.add("sewerModule", desc);
   }
 
-}
+}  // namespace edmtest
 
-using edmtest::TestFilterModule;
-using edmtest::TestResultAnalyzer;
 using edmtest::SewerModule;
 using edmtest::TestContextAnalyzer;
+using edmtest::TestFilterModule;
+using edmtest::TestResultAnalyzer;
 
 DEFINE_FWK_MODULE(TestFilterModule);
 DEFINE_FWK_MODULE(TestResultAnalyzer);
diff --git a/FWCore/Framework/test/stubs/TestGetPathStatus.cc b/FWCore/Framework/test/stubs/TestGetPathStatus.cc
index 149f1795a5e21..908ef7d7422f1 100644
--- a/FWCore/Framework/test/stubs/TestGetPathStatus.cc
+++ b/FWCore/Framework/test/stubs/TestGetPathStatus.cc
@@ -13,20 +13,18 @@
 namespace edm {
   class EventSetup;
   class StreamID;
-}
+}  // namespace edm
 
 namespace edmtest {
 
   class TestGetPathStatus : public edm::global::EDAnalyzer<> {
   public:
-
     explicit TestGetPathStatus(edm::ParameterSet const& pset);
     virtual ~TestGetPathStatus() {}
 
     void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const override;
 
-private:
-
+  private:
     std::vector<int> expectedStates_;
     std::vector<unsigned int> expectedIndexes_;
 
@@ -34,16 +32,13 @@ namespace edmtest {
     edm::EDGetTokenT<edm::EndPathStatus> tokenEndPathStatus_;
   };
 
-  TestGetPathStatus::TestGetPathStatus(edm::ParameterSet const& pset) :
-    expectedStates_(pset.getParameter<std::vector<int>>("expectedStates")),
-    expectedIndexes_(pset.getParameter<std::vector<unsigned int>>("expectedIndexes")),
-    tokenPathStatus_(consumes<edm::PathStatus>(pset.getParameter<edm::InputTag>("pathStatusTag"))),
-    tokenEndPathStatus_(consumes<edm::EndPathStatus>(pset.getParameter<edm::InputTag>("endPathStatusTag"))){
-  }
-
-  void
-  TestGetPathStatus::analyze(edm::StreamID, edm::Event const& event, edm::EventSetup const&) const {
+  TestGetPathStatus::TestGetPathStatus(edm::ParameterSet const& pset)
+      : expectedStates_(pset.getParameter<std::vector<int>>("expectedStates")),
+        expectedIndexes_(pset.getParameter<std::vector<unsigned int>>("expectedIndexes")),
+        tokenPathStatus_(consumes<edm::PathStatus>(pset.getParameter<edm::InputTag>("pathStatusTag"))),
+        tokenEndPathStatus_(consumes<edm::EndPathStatus>(pset.getParameter<edm::InputTag>("endPathStatusTag"))) {}
 
+  void TestGetPathStatus::analyze(edm::StreamID, edm::Event const& event, edm::EventSetup const&) const {
     auto const& pathStatus = event.get(tokenPathStatus_);
 
     unsigned int eventID = event.id().event();
@@ -51,14 +46,13 @@ namespace edmtest {
       std::cerr << "TestGetPathStatus::analyze unexpected path status state" << std::endl;
       abort();
     }
-    if (eventID < expectedIndexes_.size() &&
-        expectedIndexes_[eventID] != pathStatus.index()) {
+    if (eventID < expectedIndexes_.size() && expectedIndexes_[eventID] != pathStatus.index()) {
       std::cerr << "TestGetPathStatus::analyze unexpected path status index " << std::endl;
       abort();
     }
 
-    (void) event.get(tokenEndPathStatus_);
+    (void)event.get(tokenEndPathStatus_);
   }
-}
+}  // namespace edmtest
 using edmtest::TestGetPathStatus;
 DEFINE_FWK_MODULE(TestGetPathStatus);
diff --git a/FWCore/Framework/test/stubs/TestGlobalAnalyzers.cc b/FWCore/Framework/test/stubs/TestGlobalAnalyzers.cc
index 78424f1c2d7ce..20ea676bdb34d 100644
--- a/FWCore/Framework/test/stubs/TestGlobalAnalyzers.cc
+++ b/FWCore/Framework/test/stubs/TestGlobalAnalyzers.cc
@@ -26,288 +26,275 @@ for testing purposes only.
 #include "DataFormats/Provenance/interface/BranchDescription.h"
 
 namespace edmtest {
-namespace global {
-
-namespace {
-struct Cache { 
-   Cache():value(0) {}
-   //Using mutable since we want to update the value.
-   mutable std::atomic<unsigned int> value;
-};
-
-struct UnsafeCache {
-   UnsafeCache():value(0) {}
-   unsigned int value;
-};
-
-} //end anonymous namespace
-
-  class StreamIntAnalyzer: public edm::global::EDAnalyzer<edm::StreamCache<UnsafeCache>> {
-  public:
-    explicit StreamIntAnalyzer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions"))
-    {
-      callWhenNewProductsRegistered([](edm::BranchDescription const& desc)
-        { std::cout << "global::StreamIntAnalyzer " << desc.moduleLabel() << std::endl; });
-    }
-    const unsigned int trans_;
-    mutable std::atomic<unsigned int> m_count{0};
-    
-    std::unique_ptr<UnsafeCache> beginStream(edm::StreamID iID) const override {
-      ++m_count;
-      auto pCache = std::make_unique<UnsafeCache>();
-      pCache->value = iID.value();
-      return pCache;
-    }
-    
-    void streamBeginRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const  override{
-      ++m_count;
-      if ( (streamCache(iID))->value != iID.value() ) {
+  namespace global {
+
+    namespace {
+      struct Cache {
+        Cache() : value(0) {}
+        //Using mutable since we want to update the value.
+        mutable std::atomic<unsigned int> value;
+      };
+
+      struct UnsafeCache {
+        UnsafeCache() : value(0) {}
+        unsigned int value;
+      };
+
+    }  //end anonymous namespace
+
+    class StreamIntAnalyzer : public edm::global::EDAnalyzer<edm::StreamCache<UnsafeCache>> {
+    public:
+      explicit StreamIntAnalyzer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        callWhenNewProductsRegistered([](edm::BranchDescription const& desc) {
+          std::cout << "global::StreamIntAnalyzer " << desc.moduleLabel() << std::endl;
+        });
+      }
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID iID) const override {
+        ++m_count;
+        auto pCache = std::make_unique<UnsafeCache>();
+        pCache->value = iID.value();
+        return pCache;
+      }
+
+      void streamBeginRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        if ((streamCache(iID))->value != iID.value()) {
           throw cms::Exception("cache value")
-          << "StreamIntAnalyzer cache value "
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
+              << "StreamIntAnalyzer cache value " << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
       }
-    }
 
-    void streamBeginLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      if ( (streamCache(iID))->value != iID.value() ) {
+      void streamBeginLuminosityBlock(edm::StreamID iID,
+                                      edm::LuminosityBlock const&,
+                                      edm::EventSetup const&) const override {
+        ++m_count;
+        if ((streamCache(iID))->value != iID.value()) {
           throw cms::Exception("cache value")
-          << "StreamIntAnalyzer cache value "
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
+              << "StreamIntAnalyzer cache value " << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
       }
-     }
 
-    void analyze(edm::StreamID iID, const edm::Event&, const edm::EventSetup&) const override {
-      ++m_count;
-      if ( (streamCache(iID))->value != iID.value() ) {
+      void analyze(edm::StreamID iID, const edm::Event&, const edm::EventSetup&) const override {
+        ++m_count;
+        if ((streamCache(iID))->value != iID.value()) {
           throw cms::Exception("cache value")
-          << "StreamIntAnalyzer cache value "
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
-      }       
-    }
-
-    void streamEndLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      if ( (streamCache(iID))->value != iID.value() ) {
+              << "StreamIntAnalyzer cache value " << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+      }
+
+      void streamEndLuminosityBlock(edm::StreamID iID,
+                                    edm::LuminosityBlock const&,
+                                    edm::EventSetup const&) const override {
+        ++m_count;
+        if ((streamCache(iID))->value != iID.value()) {
           throw cms::Exception("cache value")
-          << "StreamIntAnalyzer cache value "
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
+              << "StreamIntAnalyzer cache value " << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
       }
-    }
 
-    void streamEndRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const override {
-      ++m_count;
-      if ( (streamCache(iID))->value != iID.value() ) {
+      void streamEndRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        if ((streamCache(iID))->value != iID.value()) {
           throw cms::Exception("cache value")
-          << "StreamIntAnalyzer cache value "
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
+              << "StreamIntAnalyzer cache value " << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+      }
+
+      void endStream(edm::StreamID iID) const override {
+        ++m_count;
+        if ((streamCache(iID))->value != iID.value()) {
+          throw cms::Exception("cache value")
+              << "StreamIntAnalyzer cache value " << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+      }
+
+      ~StreamIntAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "StreamIntAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class RunIntAnalyzer : public edm::global::EDAnalyzer<edm::RunCache<Cache>> {
+    public:
+      explicit RunIntAnalyzer(edm::ParameterSet const& p)
+          : trans_(p.getParameter<int>("transitions")), cvalue_(p.getParameter<int>("cachevalue")) {}
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::shared_ptr<Cache> globalBeginRun(edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        return std::make_shared<Cache>();
+      }
+
+      void analyze(edm::StreamID iID, const edm::Event& iEvent, const edm::EventSetup&) const override {
+        ++m_count;
+        ++((runCache(iEvent.getRun().index()))->value);
+      }
+
+      void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
+        ++m_count;
+        if ((runCache(iRun.index()))->value != cvalue_) {
+          throw cms::Exception("cache value") << "RunIntAnalyzer cache value " << (runCache(iRun.index()))->value
+                                              << " but it was supposed to be " << cvalue_;
+        }
+      }
+
+      ~RunIntAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "RunIntAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiIntAnalyzer : public edm::global::EDAnalyzer<edm::LuminosityBlockCache<Cache>> {
+    public:
+      explicit LumiIntAnalyzer(edm::ParameterSet const& p)
+          : trans_(p.getParameter<int>("transitions")), cvalue_(p.getParameter<int>("cachevalue")) {}
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const&,
+                                                        edm::EventSetup const&) const override {
+        ++m_count;
+        return std::make_shared<Cache>();
+      }
+
+      void analyze(edm::StreamID, const edm::Event& iEvent, const edm::EventSetup&) const override {
+        ++m_count;
+        ++(luminosityBlockCache(iEvent.getLuminosityBlock().index())->value);
       }
-    }
 
-    void endStream(edm::StreamID iID ) const override {
-      ++m_count;
-      if ( (streamCache(iID))->value != iID.value() ) {
+      void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
+        ++m_count;
+        if ((luminosityBlockCache(iLB.index()))->value != cvalue_) {
           throw cms::Exception("cache value")
-          << "StreamIntAnalyzer cache value "
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
+              << "LumiIntAnalyzer cache value " << (luminosityBlockCache(iLB.index()))->value
+              << " but it was supposed to be " << cvalue_;
+        }
       }
-    } 
 
-    ~StreamIntAnalyzer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "StreamIntAnalyzer transitions "
-          << m_count<< " but it was supposed to be " << trans_;
+      ~LumiIntAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "LumiIntAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
       }
-    }
-  };
-  
-  class RunIntAnalyzer: public edm::global::EDAnalyzer<edm::RunCache<Cache>> {
-  public:
-    explicit RunIntAnalyzer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions"))
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {}
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    
-    std::shared_ptr<Cache> globalBeginRun(edm::Run const&, edm::EventSetup const&) const override {
-      ++m_count;
-      return std::make_shared<Cache>();
-    }
-
-    void analyze(edm::StreamID iID, const edm::Event& iEvent, const edm::EventSetup&) const override {
-      ++m_count;
-      ++((runCache(iEvent.getRun().index()))->value);
-       
-    }
-
-    void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-      ++m_count;
-      if ( (runCache(iRun.index()))->value != cvalue_ ) {
+    };
+
+    class RunSummaryIntAnalyzer
+        : public edm::global::EDAnalyzer<edm::StreamCache<UnsafeCache>, edm::RunSummaryCache<UnsafeCache>> {
+    public:
+      explicit RunSummaryIntAnalyzer(edm::ParameterSet const& p)
+          : trans_(p.getParameter<int>("transitions")), cvalue_(p.getParameter<int>("cachevalue")) {}
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override {
+        ++m_count;
+        return std::make_unique<UnsafeCache>();
+      }
+
+      std::shared_ptr<UnsafeCache> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        return std::make_shared<UnsafeCache>();
+      }
+
+      void analyze(edm::StreamID iID, const edm::Event&, const edm::EventSetup&) const override {
+        ++m_count;
+        ++((streamCache(iID))->value);
+      }
+
+      void streamEndRunSummary(edm::StreamID iID,
+                               edm::Run const&,
+                               edm::EventSetup const&,
+                               UnsafeCache* gCache) const override {
+        ++m_count;
+        gCache->value += (streamCache(iID))->value;
+        (streamCache(iID))->value = 0;
+      }
+
+      void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->value != cvalue_) {
           throw cms::Exception("cache value")
-          << "RunIntAnalyzer cache value "
-          << (runCache(iRun.index()))->value << " but it was supposed to be " << cvalue_;
+              << "RunSummaryIntAnalyzer cache value " << gCache->value << " but it was supposed to be " << cvalue_;
+        }
       }
-    }
 
-    ~RunIntAnalyzer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "RunIntAnalyzer transitions "
-          << m_count<< " but it was supposed to be " << trans_;
+      ~RunSummaryIntAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "RunSummaryIntAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
       }
-    }
-  };
-
-
-  class LumiIntAnalyzer: public edm::global::EDAnalyzer<edm::LuminosityBlockCache<Cache>> {
-  public:
-    explicit LumiIntAnalyzer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {}
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-   
-    std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      return std::make_shared<Cache>();
-    }
-
-    void analyze(edm::StreamID, const edm::Event& iEvent, const edm::EventSetup&) const override {
-      ++m_count;
-      ++(luminosityBlockCache(iEvent.getLuminosityBlock().index())->value);
-       
-    }
-     
-    void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      ++m_count;
-      if( (luminosityBlockCache(iLB.index()))->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << "LumiIntAnalyzer cache value "
-          << (luminosityBlockCache(iLB.index()))->value << " but it was supposed to be " << cvalue_;
+    };
+
+    class LumiSummaryIntAnalyzer
+        : public edm::global::EDAnalyzer<edm::StreamCache<UnsafeCache>, edm::LuminosityBlockSummaryCache<UnsafeCache>> {
+    public:
+      explicit LumiSummaryIntAnalyzer(edm::ParameterSet const& p)
+          : trans_(p.getParameter<int>("transitions")), cvalue_(p.getParameter<int>("cachevalue")) {}
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override {
+        ++m_count;
+        return std::make_unique<UnsafeCache>();
+      }
+
+      std::shared_ptr<UnsafeCache> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                                     edm::EventSetup const&) const override {
+        ++m_count;
+        return std::make_shared<UnsafeCache>();
       }
-    }
 
-    ~LumiIntAnalyzer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "LumiIntAnalyzer transitions "
-          << m_count<< " but it was supposed to be " << trans_;
+      void analyze(edm::StreamID iID, const edm::Event& iEvent, const edm::EventSetup&) const override {
+        ++m_count;
+        ++((streamCache(iID))->value);
       }
-    }
-  };
-  
-  class RunSummaryIntAnalyzer: public edm::global::EDAnalyzer<edm::StreamCache<UnsafeCache>,edm::RunSummaryCache<UnsafeCache>> {
-  public:
-    explicit RunSummaryIntAnalyzer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {}
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-
-    std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override {
-      ++m_count;
-      return std::make_unique<UnsafeCache>();
-    }
-
-    std::shared_ptr<UnsafeCache> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&) const override {
-      ++m_count;
-      return std::make_shared<UnsafeCache>();
-    }
-  
-    void analyze(edm::StreamID iID, const edm::Event&, const edm::EventSetup&) const override {
-      ++m_count;
-      ++((streamCache(iID))->value);
-       
-    }
-  
-    void streamEndRunSummary(edm::StreamID iID, edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      gCache->value += (streamCache(iID))->value;
-      (streamCache(iID))->value = 0;
-    }
-    
-    void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if( gCache->value  != cvalue_) {
-        throw cms::Exception("cache value")
-          << "RunSummaryIntAnalyzer cache value "
-          << gCache->value << " but it was supposed to be " << cvalue_;
-      } 
-    }
-
-    ~RunSummaryIntAnalyzer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "RunSummaryIntAnalyzer transitions "
-          << m_count<< " but it was supposed to be " << trans_;
+
+      void streamEndLuminosityBlockSummary(edm::StreamID iID,
+                                           edm::LuminosityBlock const& iLumiBlock,
+                                           edm::EventSetup const&,
+                                           UnsafeCache* gCache) const override {
+        ++m_count;
+        gCache->value += (streamCache(iID))->value;
+        (streamCache(iID))->value = 0;
       }
-    }
-  };
-
-  class LumiSummaryIntAnalyzer: public edm::global::EDAnalyzer<edm::StreamCache<UnsafeCache>,edm::LuminosityBlockSummaryCache<UnsafeCache>> {
-  public:
-    explicit LumiSummaryIntAnalyzer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {}
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-
-    std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override {
-      ++m_count;
-      return std::make_unique<UnsafeCache>();
-    }
-
-    std::shared_ptr<UnsafeCache> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      return std::make_shared<UnsafeCache>();
-    }
-    
-    void analyze(edm::StreamID iID, const edm::Event& iEvent, const edm::EventSetup&) const override {
-      ++m_count;
-      ++((streamCache(iID))->value);
-       
-    }
-
-    void streamEndLuminosityBlockSummary(edm::StreamID iID, edm::LuminosityBlock const& iLumiBlock, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      gCache->value += (streamCache(iID))->value;
-      (streamCache(iID))->value = 0;
-    }
- 
-    void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if( gCache->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << "LumiSummaryIntAnalyzer cache value "
-          << gCache->value << " but it was supposed to be " << cvalue_;
+
+      void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                           edm::EventSetup const&,
+                                           UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->value != cvalue_) {
+          throw cms::Exception("cache value")
+              << "LumiSummaryIntAnalyzer cache value " << gCache->value << " but it was supposed to be " << cvalue_;
+        }
       }
-    }
 
-    ~LumiSummaryIntAnalyzer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "LumiSummaryIntAnalyzer transitions "
-          << m_count<< " but it was supposed to be " << trans_;
+      ~LumiSummaryIntAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "LumiSummaryIntAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
       }
-    }
-  };
+    };
 
-}
-}
+  }  // namespace global
+}  // namespace edmtest
 
 DEFINE_FWK_MODULE(edmtest::global::StreamIntAnalyzer);
 DEFINE_FWK_MODULE(edmtest::global::RunIntAnalyzer);
 DEFINE_FWK_MODULE(edmtest::global::LumiIntAnalyzer);
 DEFINE_FWK_MODULE(edmtest::global::RunSummaryIntAnalyzer);
 DEFINE_FWK_MODULE(edmtest::global::LumiSummaryIntAnalyzer);
-
diff --git a/FWCore/Framework/test/stubs/TestGlobalFilters.cc b/FWCore/Framework/test/stubs/TestGlobalFilters.cc
index f802f09119452..21aebad396bce 100644
--- a/FWCore/Framework/test/stubs/TestGlobalFilters.cc
+++ b/FWCore/Framework/test/stubs/TestGlobalFilters.cc
@@ -24,587 +24,553 @@ for testing purposes only.
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 
+namespace edmtest {
+  namespace global {
+
+    namespace {
+      struct Cache {
+        Cache() : value(0), run(0), lumi(0), strm(0), work(0) {}
+        //Using mutable since we want to update the value.
+        mutable std::atomic<unsigned int> value;
+        mutable std::atomic<unsigned int> run;
+        mutable std::atomic<unsigned int> lumi;
+        mutable std::atomic<unsigned int> strm;
+        mutable std::atomic<unsigned int> work;
+      };
+
+      struct UnsafeCache {
+        UnsafeCache() : value(0), run(0), lumi(0), strm(0), work(0) {}
+        unsigned int value;
+        unsigned int run;
+        unsigned int lumi;
+        unsigned int strm;
+        unsigned int work;
+      };
+
+      struct Dummy {};
+
+    }  //end anonymous namespace
+
+    class StreamIntFilter : public edm::global::EDFilter<edm::StreamCache<UnsafeCache>> {
+    public:
+      explicit StreamIntFilter(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+      }
 
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
 
-namespace edmtest {
-namespace global {
-
-namespace {
-struct Cache { 
-   Cache():value(0),run(0),lumi(0),strm(0),work(0) {}
-   //Using mutable since we want to update the value.
-   mutable std::atomic<unsigned int> value;
-   mutable std::atomic<unsigned int> run;
-   mutable std::atomic<unsigned int> lumi;
-   mutable std::atomic<unsigned int> strm;
-   mutable std::atomic<unsigned int> work;
-};
-
-struct UnsafeCache {
-   UnsafeCache():value(0),run(0),lumi(0),strm(0),work(0) {}
-   unsigned int value;
-   unsigned int run;
-   unsigned int lumi;
-   unsigned int strm;
-   unsigned int work;
-};
-
-struct Dummy {
-};
-
-} //end anonymous namespace
-
-
-  class StreamIntFilter : public edm::global::EDFilter<edm::StreamCache<UnsafeCache>> {
-  public:
-    explicit StreamIntFilter(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) 
-    {
-    produces<unsigned int>();
-    }
-
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-   
-    std::unique_ptr<UnsafeCache> beginStream(edm::StreamID iID) const override {
-      ++m_count;
-      auto sCache = std::make_unique<UnsafeCache>();
-      ++(sCache->strm);
-      sCache->value = iID.value();
-      return sCache;
-    }
-    
-    void streamBeginRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const  override{
-      ++m_count;
-      auto sCache = streamCache(iID);
-      if ( sCache->value != iID.value() ) {
-          throw cms::Exception("cache value")
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
-      }
-      if ( sCache->run != 0 || sCache->lumi !=0 || sCache->work !=0 || sCache->strm !=1 ) {
-        throw cms::Exception("out of sequence")
-          << "streamBeginRun out of sequence in Stream " << iID.value();
-      }      
-      ++(sCache->run);
-     }
-
-    void streamBeginLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      if ( sCache->value != iID.value() ) {
-          throw cms::Exception("cache value")
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
-      }
-      if ( sCache->lumi != 0 || sCache->work != 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamBeginLuminosityBlock out of sequence in Stream " << iID.value();
-      }      
-       ++(sCache->lumi);
-     }
-
-    bool filter(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      if ( sCache->value != iID.value() ) {
-          throw cms::Exception("cache value")
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
-      }
-      ++(sCache->work);
-      if ( sCache->lumi == 0 && sCache->run == 0) {
-        throw cms::Exception("out of sequence")
-          << "produce out of sequence in Stream " << iID.value();
-      }       
-       
-      return true;
-    }
- 
-    void streamEndLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      if ( sCache->value != iID.value() ) {
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID iID) const override {
+        ++m_count;
+        auto sCache = std::make_unique<UnsafeCache>();
+        ++(sCache->strm);
+        sCache->value = iID.value();
+        return sCache;
+      }
+
+      void streamBeginRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        if (sCache->value != iID.value()) {
+          throw cms::Exception("cache value") << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+        if (sCache->run != 0 || sCache->lumi != 0 || sCache->work != 0 || sCache->strm != 1) {
+          throw cms::Exception("out of sequence") << "streamBeginRun out of sequence in Stream " << iID.value();
+        }
+        ++(sCache->run);
+      }
+
+      void streamBeginLuminosityBlock(edm::StreamID iID,
+                                      edm::LuminosityBlock const&,
+                                      edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        if (sCache->value != iID.value()) {
+          throw cms::Exception("cache value") << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+        if (sCache->lumi != 0 || sCache->work != 0) {
+          throw cms::Exception("out of sequence")
+              << "streamBeginLuminosityBlock out of sequence in Stream " << iID.value();
+        }
+        ++(sCache->lumi);
+      }
+
+      bool filter(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        if (sCache->value != iID.value()) {
+          throw cms::Exception("cache value") << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+        ++(sCache->work);
+        if (sCache->lumi == 0 && sCache->run == 0) {
+          throw cms::Exception("out of sequence") << "produce out of sequence in Stream " << iID.value();
+        }
+
+        return true;
+      }
+
+      void streamEndLuminosityBlock(edm::StreamID iID,
+                                    edm::LuminosityBlock const&,
+                                    edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        if (sCache->value != iID.value()) {
+          throw cms::Exception("cache value") << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+        --(sCache->lumi);
+        sCache->work = 0;
+        if (sCache->lumi != 0 || sCache->run == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamEndLuminosityBlock out of sequence in Stream " << iID.value();
+        }
+      }
+
+      void streamEndRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        if (sCache->value != iID.value()) {
+          throw cms::Exception("cache value") << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+        --(sCache->run);
+        sCache->work = 0;
+        if (sCache->run != 0 || sCache->lumi != 0) {
+          throw cms::Exception("out of sequence") << "streamEndRun out of sequence in Stream " << iID.value();
+        }
+      }
+
+      void endStream(edm::StreamID iID) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        --(sCache->strm);
+        if (sCache->value != iID.value()) {
+          throw cms::Exception("cache value") << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+        if (sCache->strm != 0 || sCache->run != 0 || sCache->lumi != 0) {
+          throw cms::Exception("out of sequence") << "endStream out of sequence in Stream " << iID.value();
+        }
+      }
+
+      ~StreamIntFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "StreamIntFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class RunIntFilter : public edm::global::EDFilter<edm::StreamCache<UnsafeCache>, edm::RunCache<Cache>> {
+    public:
+      explicit RunIntFilter(edm::ParameterSet const& p)
+          : trans_(p.getParameter<int>("transitions")), cvalue_(p.getParameter<int>("cachevalue")) {
+        produces<unsigned int>();
+      }
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::shared_ptr<Cache> globalBeginRun(edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        auto rCache = std::make_shared<Cache>();
+        ++(rCache->run);
+        return rCache;
+      }
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override { return std::make_unique<UnsafeCache>(); }
+
+      void streamBeginRun(edm::StreamID iID, edm::Run const& iRun, edm::EventSetup const&) const override {
+        auto rCache = runCache(iRun.index());
+        if (rCache->run == 0) {
+          throw cms::Exception("out of sequence") << "streamBeginRun before globalBeginRun in Stream " << iID.value();
+        }
+      }
+
+      bool filter(edm::StreamID, edm::Event& iEvent, edm::EventSetup const&) const override {
+        ++m_count;
+        auto rCache = runCache(iEvent.getRun().index());
+        ++(rCache->value);
+
+        return true;
+      }
+
+      void streamEndRun(edm::StreamID iID, edm::Run const& iRun, edm::EventSetup const&) const override {
+        auto rCache = runCache(iRun.index());
+        if (rCache->run == 0) {
+          throw cms::Exception("out of sequence") << "streamEndRun after globalEndRun in Stream " << iID.value();
+        }
+      }
+
+      void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
+        ++m_count;
+        auto rCache = runCache(iRun.index());
+        if (rCache->value != cvalue_) {
           throw cms::Exception("cache value")
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
-      }
-      --(sCache->lumi);
-      sCache->work = 0;
-      if ( sCache->lumi != 0 || sCache->run == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndLuminosityBlock out of sequence in Stream " << iID.value();
-      }      
-     }
-
-    void streamEndRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      if ( sCache->value != iID.value() ) {
+              << "RunIntFilter cache value " << rCache->value << " but it was supposed to be " << cvalue_;
+        }
+        --(rCache->run);
+      }
+
+      ~RunIntFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "RunIntFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiIntFilter
+        : public edm::global::EDFilter<edm::StreamCache<UnsafeCache>, edm::LuminosityBlockCache<Cache>> {
+    public:
+      explicit LumiIntFilter(edm::ParameterSet const& p)
+          : trans_(p.getParameter<int>("transitions")), cvalue_(p.getParameter<int>("cachevalue")) {
+        produces<unsigned int>();
+      }
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const&,
+                                                        edm::EventSetup const&) const override {
+        ++m_count;
+        auto lCache = std::make_shared<Cache>();
+        ++(lCache->lumi);
+        return lCache;
+      }
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID iID) const override {
+        return std::make_unique<UnsafeCache>();
+      }
+
+      void streamBeginLuminosityBlock(edm::StreamID iID,
+                                      edm::LuminosityBlock const& iLB,
+                                      edm::EventSetup const&) const override {
+        auto lCache = luminosityBlockCache(iLB.index());
+        if (lCache->lumi == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamBeginLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+      }
+
+      bool filter(edm::StreamID, edm::Event& iEvent, edm::EventSetup const&) const override {
+        ++m_count;
+        ++(luminosityBlockCache(iEvent.getLuminosityBlock().index())->value);
+        return true;
+      }
+
+      void streamEndLuminosityBlock(edm::StreamID iID,
+                                    edm::LuminosityBlock const& iLB,
+                                    edm::EventSetup const&) const override {
+        auto lCache = luminosityBlockCache(iLB.index());
+        if (lCache->lumi == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamEndLuminosityBlock seen before globalEndLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+      }
+
+      void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
+        ++m_count;
+        auto lCache = luminosityBlockCache(iLB.index());
+        --(lCache->lumi);
+        if (lCache->lumi != 0) {
+          throw cms::Exception("end out of sequence")
+              << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+        if (lCache->value != cvalue_) {
           throw cms::Exception("cache value")
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
-      }
-      --(sCache->run);
-      sCache->work = 0;
-      if ( sCache->run != 0 || sCache->lumi != 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndRun out of sequence in Stream " << iID.value();
-      }      
-    }
-
-    void endStream(edm::StreamID iID) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      --(sCache->strm);
-      if ( sCache->value != iID.value() ) {
+              << "LumiIntFilter cache value " << lCache->value << " but it was supposed to be " << cvalue_;
+        }
+      }
+
+      ~LumiIntFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "LumiIntFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class RunSummaryIntFilter
+        : public edm::global::EDFilter<edm::StreamCache<Cache>, edm::RunSummaryCache<UnsafeCache>> {
+    public:
+      explicit RunSummaryIntFilter(edm::ParameterSet const& p)
+          : trans_(p.getParameter<int>("transitions")), cvalue_(p.getParameter<int>("cachevalue")) {
+        produces<unsigned int>();
+      }
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::unique_ptr<Cache> beginStream(edm::StreamID) const override {
+        ++m_count;
+        return std::make_unique<Cache>();
+      }
+
+      std::shared_ptr<UnsafeCache> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        auto gCache = std::make_shared<UnsafeCache>();
+        ++(gCache->run);
+        return gCache;
+      }
+
+      bool filter(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
+        ++m_count;
+        ++((streamCache(iID))->value);
+
+        return true;
+      }
+
+      void streamEndRunSummary(edm::StreamID iID,
+                               edm::Run const&,
+                               edm::EventSetup const&,
+                               UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->run == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamEndRunSummary after globalEndRunSummary in Stream " << iID.value();
+        }
+        auto sCache = streamCache(iID);
+        gCache->value += sCache->value;
+        sCache->value = 0;
+      }
+
+      void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->value != cvalue_) {
           throw cms::Exception("cache value")
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
-      }
-      if ( sCache->strm != 0 || sCache->run != 0 || sCache->lumi != 0 ) {
-        throw cms::Exception("out of sequence")
-          << "endStream out of sequence in Stream " << iID.value();
-      }      
-   }
-
-    ~StreamIntFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "StreamIntFilter transitions "
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-  
-  class RunIntFilter : public edm::global::EDFilter<edm::StreamCache<UnsafeCache>,edm::RunCache<Cache>> {
-  public:
-    explicit RunIntFilter(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {    
-    produces<unsigned int>();
-    }
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    
-    std::shared_ptr<Cache> globalBeginRun(edm::Run const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto rCache = std::make_shared<Cache>();
-      ++(rCache->run);
-      return rCache;
-    }
- 
-    std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override {
-      return std::make_unique<UnsafeCache>();
-    }
-
-    void streamBeginRun(edm::StreamID iID, edm::Run const& iRun, edm::EventSetup const&) const  override {
-      auto rCache = runCache(iRun.index());
-      if ( rCache->run == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamBeginRun before globalBeginRun in Stream " << iID.value();
-      }      
-    }
- 
-    bool filter(edm::StreamID, edm::Event& iEvent, edm::EventSetup const&) const override {
-      ++m_count;
-      auto rCache = runCache(iEvent.getRun().index());
-      ++(rCache->value);
-       
-      return true;
-    }
-
-    void streamEndRun(edm::StreamID iID, edm::Run const& iRun, edm::EventSetup const&) const override {
-      auto rCache = runCache(iRun.index());
-      if ( rCache->run == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndRun after globalEndRun in Stream " << iID.value();
-      }      
-    }
-
-
-    void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-      ++m_count;
-      auto rCache = runCache(iRun.index());
-      if ( rCache->value != cvalue_ ) {
+              << "RunSummaryIntFilter cache value " << gCache->value << " but it was supposed to be " << cvalue_;
+        }
+        --(gCache->run);
+      }
+
+      ~RunSummaryIntFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "RunSummaryIntFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiSummaryIntFilter
+        : public edm::global::EDFilter<edm::StreamCache<Cache>, edm::LuminosityBlockSummaryCache<UnsafeCache>> {
+    public:
+      explicit LumiSummaryIntFilter(edm::ParameterSet const& p)
+          : trans_(p.getParameter<int>("transitions")), cvalue_(p.getParameter<int>("cachevalue")) {
+        produces<unsigned int>();
+      }
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::unique_ptr<Cache> beginStream(edm::StreamID) const override {
+        ++m_count;
+        return std::make_unique<Cache>();
+      }
+
+      std::shared_ptr<UnsafeCache> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                                     edm::EventSetup const&) const override {
+        ++m_count;
+        auto gCache = std::make_shared<UnsafeCache>();
+        ++(gCache->lumi);
+        return gCache;
+      }
+
+      bool filter(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
+        ++m_count;
+        ++((streamCache(iID))->value);
+        return true;
+      }
+
+      void streamEndLuminosityBlockSummary(edm::StreamID iID,
+                                           edm::LuminosityBlock const&,
+                                           edm::EventSetup const&,
+                                           UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->lumi == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamEndLuminosityBlockSummary after globalEndLuminosityBlockSummary in Stream " << iID.value();
+        }
+        auto sCache = streamCache(iID);
+        gCache->value += sCache->value;
+        sCache->value = 0;
+      }
+
+      void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                           edm::EventSetup const&,
+                                           UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->value != cvalue_) {
           throw cms::Exception("cache value")
-          << "RunIntFilter cache value "
-          << rCache->value << " but it was supposed to be " << cvalue_;
-      }
-     --(rCache->run);
-    }
-
-    ~RunIntFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "RunIntFilter transitions "     
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-
-  class LumiIntFilter : public edm::global::EDFilter<edm::StreamCache<UnsafeCache>,edm::LuminosityBlockCache<Cache>> {
-  public:
-    explicit LumiIntFilter(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {    
-    produces<unsigned int>();
-    }
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    
-    std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto lCache = std::make_shared<Cache>();
-      ++(lCache->lumi);  
-      return lCache;
-    }
-
-   std::unique_ptr<UnsafeCache> beginStream(edm::StreamID iID) const override {
-      return std::make_unique<UnsafeCache>();
-    }
-
-   void streamBeginLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      auto lCache = luminosityBlockCache(iLB.index()); 
-      if ( lCache->lumi == 0) {
-        throw cms::Exception("out of sequence")
-          << "streamBeginLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-       }
-   }
-
-
-    bool filter(edm::StreamID, edm::Event& iEvent, edm::EventSetup const&) const override {
-      ++m_count;
-      ++(luminosityBlockCache(iEvent.getLuminosityBlock().index())->value);
-      return true;
-    }
- 
-   void streamEndLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      auto lCache = luminosityBlockCache(iLB.index()); 
-      if ( lCache->lumi == 0) {
-        throw cms::Exception("out of sequence")
-          << "streamEndLuminosityBlock seen before globalEndLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-       }
-    }
- 
-    
-    void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      ++m_count;
-      auto lCache = luminosityBlockCache(iLB.index());
-      --(lCache->lumi); 
-      if ( lCache->lumi != 0 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-      }
-      if( lCache->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << "LumiIntFilter cache value "
-          << lCache->value << " but it was supposed to be " << cvalue_;
-      }
-    }
-
-    ~LumiIntFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "LumiIntFilter transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-  
-  class RunSummaryIntFilter : public edm::global::EDFilter<edm::StreamCache<Cache>,edm::RunSummaryCache<UnsafeCache>> {
-  public:
-    explicit RunSummaryIntFilter(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {
-    produces<unsigned int>();
-      
-    }
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-
-    std::unique_ptr<Cache> beginStream(edm::StreamID) const override {
-      ++m_count;
-      return std::make_unique<Cache>();
-    }
-    
-    std::shared_ptr<UnsafeCache> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto gCache = std::make_shared<UnsafeCache>();
-      ++(gCache->run);
-      return gCache;
-    }
-    
-    bool filter(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-      ++((streamCache(iID))->value);
-       
-      return true;
-    }
-    
-    void streamEndRunSummary(edm::StreamID iID, edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if ( gCache->run == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndRunSummary after globalEndRunSummary in Stream " << iID.value();
-      }      
-      auto sCache = streamCache(iID);
-      gCache->value += sCache->value;
-      sCache->value = 0;
-    }
-    
-    void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if( gCache->value  != cvalue_) {
-        throw cms::Exception("cache value")
-          << "RunSummaryIntFilter cache value "
-          << gCache->value << " but it was supposed to be " << cvalue_;
-      }
-      --(gCache->run);
-    }
-
-    ~RunSummaryIntFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "RunSummaryIntFilter transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class LumiSummaryIntFilter : public edm::global::EDFilter<edm::StreamCache<Cache>,edm::LuminosityBlockSummaryCache<UnsafeCache>> {
-  public:
-    explicit LumiSummaryIntFilter(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {	
-    produces<unsigned int>();
-      
-    }
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-
-    std::unique_ptr<Cache> beginStream(edm::StreamID) const override {
-      ++m_count;
-      return std::make_unique<Cache>();
-    }
-  
-    std::shared_ptr<UnsafeCache> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto gCache = std::make_shared<UnsafeCache>();
-      ++(gCache->lumi);
-      return gCache;
-    }
-
-    bool filter(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-      ++((streamCache(iID))->value);
-      return true;
-    }
-    
-    void streamEndLuminosityBlockSummary(edm::StreamID iID, edm::LuminosityBlock const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if ( gCache->lumi == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndLuminosityBlockSummary after globalEndLuminosityBlockSummary in Stream " << iID.value();
-      }
-      auto sCache = streamCache(iID);
-      gCache->value += sCache->value;
-      sCache->value = 0;
-    }
-    
-    void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if( gCache->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << "LumiSummaryIntFilter cache value "
-          << gCache->value << " but it was supposed to be " << cvalue_;
-      }
-      --(gCache->lumi);
-    }
-
-    ~LumiSummaryIntFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "LumiSummaryIntFilter transitions "     
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestBeginRunFilter : public edm::global::EDFilter<edm::RunCache<Dummy>,edm::BeginRunProducer> {
-  public:
-    explicit TestBeginRunFilter(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {
-    produces<unsigned int>();
-    produces<unsigned int, edm::Transition::BeginRun>("a");
-    }
-
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    mutable std::atomic<bool> brp{false}; 
-
-    std::shared_ptr<Dummy> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-      brp = false;
-      return std::shared_ptr<Dummy>();
-    }
- 
-    void globalBeginRunProduce(edm::Run&, edm::EventSetup const&) const override {
-      ++m_count;
-      brp = true;
-     }
-
-    bool filter(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      if ( !brp ) {
-        throw cms::Exception("out of sequence")
-          << "filter before globalBeginRunProduce in Stream " << iID.value();
-      }
-      return true;
-    }
-
-    void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-    }
-
-    ~TestBeginRunFilter() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestBeginRunFilter transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestEndRunFilter : public edm::global::EDFilter<edm::RunCache<Dummy>,edm::EndRunProducer> {
-  public:
-    explicit TestEndRunFilter(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {
-    produces<unsigned int>();
-    produces<unsigned int, edm::Transition::EndRun>("a");
-    }
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    mutable std::atomic<bool> p{false}; 
-
-    std::shared_ptr<Dummy> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-      p = false;
-      return std::shared_ptr<Dummy>();
-    }
-
-
-    bool filter(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      p = true;
-      return true;
-    }
-
-    void globalEndRunProduce(edm::Run&, edm::EventSetup const&) const override {
-      if ( !p ) {
-        throw cms::Exception("out of sequence")
-          << "endRunProduce before produce";
-      }
-       ++m_count;
-    }
-
-    void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-    }
-
-    ~TestEndRunFilter() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestEndRunFilter transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestBeginLumiBlockFilter : public edm::global::EDFilter<edm::LuminosityBlockCache<Dummy>,edm::BeginLuminosityBlockProducer> {
-  public:
-    explicit TestBeginLumiBlockFilter(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {
-    produces<unsigned int>();
-    produces<unsigned int, edm::Transition::BeginLuminosityBlock>("a");
-    }
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    mutable std::atomic<bool> gblp{false}; 
-
-    std::shared_ptr<Dummy> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      gblp = false;
-      return std::shared_ptr<Dummy>();
-    }
-
-
-    void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
-      ++m_count;
-      gblp = true;
-    }
-
-    bool filter(edm::StreamID iID, edm::Event&, const edm::EventSetup&) const override{
-      if ( !gblp ) {
-        throw cms::Exception("out of sequence")
-          << "filter before globalBeginLuminosityBlockProduce in Stream " << iID.value();
-      }
-      return true;
-    }
-
-    void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-    }
-
-    ~TestBeginLumiBlockFilter() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestBeginLumiBlockFilter transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestEndLumiBlockFilter : public edm::global::EDFilter<edm::LuminosityBlockCache<Dummy>,edm::EndLuminosityBlockProducer> {
-  public:
-    explicit TestEndLumiBlockFilter(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {
-    produces<unsigned int>();
-    produces<unsigned int, edm::Transition::EndLuminosityBlock>("a");
-    }
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    mutable std::atomic<bool> p{false}; 
-
-    std::shared_ptr<Dummy> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      p = false;
-      return std::shared_ptr<Dummy>();
-    }
-
-
-    bool filter(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      p = true;
-      return true;
-    }
-
-    void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
-      if ( !p ) {
-        throw cms::Exception("out of sequence")
-          << "endLumiBlockProduce before produce";
-      }
-      ++m_count;
-    }
-
-    void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-    }
-
-    ~TestEndLumiBlockFilter() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestEndLumiBlockFilter transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-
-}
-}
+              << "LumiSummaryIntFilter cache value " << gCache->value << " but it was supposed to be " << cvalue_;
+        }
+        --(gCache->lumi);
+      }
+
+      ~LumiSummaryIntFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "LumiSummaryIntFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestBeginRunFilter : public edm::global::EDFilter<edm::RunCache<Dummy>, edm::BeginRunProducer> {
+    public:
+      explicit TestBeginRunFilter(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::BeginRun>("a");
+      }
+
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+      mutable std::atomic<bool> brp{false};
+
+      std::shared_ptr<Dummy> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
+        brp = false;
+        return std::shared_ptr<Dummy>();
+      }
+
+      void globalBeginRunProduce(edm::Run&, edm::EventSetup const&) const override {
+        ++m_count;
+        brp = true;
+      }
+
+      bool filter(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
+        if (!brp) {
+          throw cms::Exception("out of sequence") << "filter before globalBeginRunProduce in Stream " << iID.value();
+        }
+        return true;
+      }
+
+      void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {}
+
+      ~TestBeginRunFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestBeginRunFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestEndRunFilter : public edm::global::EDFilter<edm::RunCache<Dummy>, edm::EndRunProducer> {
+    public:
+      explicit TestEndRunFilter(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::EndRun>("a");
+      }
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+      mutable std::atomic<bool> p{false};
+
+      std::shared_ptr<Dummy> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
+        p = false;
+        return std::shared_ptr<Dummy>();
+      }
+
+      bool filter(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
+        p = true;
+        return true;
+      }
+
+      void globalEndRunProduce(edm::Run&, edm::EventSetup const&) const override {
+        if (!p) {
+          throw cms::Exception("out of sequence") << "endRunProduce before produce";
+        }
+        ++m_count;
+      }
+
+      void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {}
+
+      ~TestEndRunFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestEndRunFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestBeginLumiBlockFilter
+        : public edm::global::EDFilter<edm::LuminosityBlockCache<Dummy>, edm::BeginLuminosityBlockProducer> {
+    public:
+      explicit TestBeginLumiBlockFilter(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::BeginLuminosityBlock>("a");
+      }
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+      mutable std::atomic<bool> gblp{false};
+
+      std::shared_ptr<Dummy> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                        edm::EventSetup const&) const override {
+        gblp = false;
+        return std::shared_ptr<Dummy>();
+      }
+
+      void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
+        ++m_count;
+        gblp = true;
+      }
+
+      bool filter(edm::StreamID iID, edm::Event&, const edm::EventSetup&) const override {
+        if (!gblp) {
+          throw cms::Exception("out of sequence")
+              << "filter before globalBeginLuminosityBlockProduce in Stream " << iID.value();
+        }
+        return true;
+      }
+
+      void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {}
+
+      ~TestBeginLumiBlockFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestBeginLumiBlockFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestEndLumiBlockFilter
+        : public edm::global::EDFilter<edm::LuminosityBlockCache<Dummy>, edm::EndLuminosityBlockProducer> {
+    public:
+      explicit TestEndLumiBlockFilter(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::EndLuminosityBlock>("a");
+      }
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+      mutable std::atomic<bool> p{false};
+
+      std::shared_ptr<Dummy> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                        edm::EventSetup const&) const override {
+        p = false;
+        return std::shared_ptr<Dummy>();
+      }
+
+      bool filter(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
+        p = true;
+        return true;
+      }
+
+      void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
+        if (!p) {
+          throw cms::Exception("out of sequence") << "endLumiBlockProduce before produce";
+        }
+        ++m_count;
+      }
+
+      void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {}
+
+      ~TestEndLumiBlockFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestEndLumiBlockFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+  }  // namespace global
+}  // namespace edmtest
 
 DEFINE_FWK_MODULE(edmtest::global::StreamIntFilter);
 DEFINE_FWK_MODULE(edmtest::global::RunIntFilter);
@@ -615,4 +581,3 @@ DEFINE_FWK_MODULE(edmtest::global::TestBeginRunFilter);
 DEFINE_FWK_MODULE(edmtest::global::TestBeginLumiBlockFilter);
 DEFINE_FWK_MODULE(edmtest::global::TestEndRunFilter);
 DEFINE_FWK_MODULE(edmtest::global::TestEndLumiBlockFilter);
-
diff --git a/FWCore/Framework/test/stubs/TestGlobalProducers.cc b/FWCore/Framework/test/stubs/TestGlobalProducers.cc
index 07f4349a2c0d3..84bbbd8b3292a 100644
--- a/FWCore/Framework/test/stubs/TestGlobalProducers.cc
+++ b/FWCore/Framework/test/stubs/TestGlobalProducers.cc
@@ -26,579 +26,534 @@ for testing purposes only.
 #include "DataFormats/Provenance/interface/BranchDescription.h"
 
 namespace edmtest {
-namespace global {
-
-namespace {
-struct Cache { 
-   Cache():value(0),run(0),lumi(0),strm(0),work(0) {}
-   //Using mutable since we want to update the value.
-   mutable std::atomic<unsigned int> value;
-   mutable std::atomic<unsigned int> run;
-   mutable std::atomic<unsigned int> lumi;
-   mutable std::atomic<unsigned int> strm;
-   mutable std::atomic<unsigned int> work;
-};
-
-struct UnsafeCache {
-   UnsafeCache():value(0),run(0),lumi(0),strm(0),work(0) {}
-   unsigned int value;
-   unsigned int run;
-   unsigned int lumi;
-   unsigned int strm;
-   unsigned int work;
-};
-
-struct Dummy {
-};
-
-} //end anonymous namespace
-
-  class StreamIntProducer : public edm::global::EDProducer<edm::StreamCache<UnsafeCache>> {
-  public:
-    explicit StreamIntProducer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) 
-    {
-      callWhenNewProductsRegistered([](edm::BranchDescription const& desc)
-        { std::cout << "global::StreamIntProducer " << desc.moduleLabel() << std::endl; });
-      produces<unsigned int>();
-    }
-
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-
-   std::unique_ptr<UnsafeCache> beginStream(edm::StreamID iID) const override {
-      ++m_count;
-      auto sCache = std::make_unique<UnsafeCache>();
-      ++(sCache->strm);
-      sCache->value = iID.value();
-      return sCache;
-    }
-    
-    void streamBeginRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const  override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      if ( sCache->value != iID.value() ) {
+  namespace global {
+
+    namespace {
+      struct Cache {
+        Cache() : value(0), run(0), lumi(0), strm(0), work(0) {}
+        //Using mutable since we want to update the value.
+        mutable std::atomic<unsigned int> value;
+        mutable std::atomic<unsigned int> run;
+        mutable std::atomic<unsigned int> lumi;
+        mutable std::atomic<unsigned int> strm;
+        mutable std::atomic<unsigned int> work;
+      };
+
+      struct UnsafeCache {
+        UnsafeCache() : value(0), run(0), lumi(0), strm(0), work(0) {}
+        unsigned int value;
+        unsigned int run;
+        unsigned int lumi;
+        unsigned int strm;
+        unsigned int work;
+      };
+
+      struct Dummy {};
+
+    }  //end anonymous namespace
+
+    class StreamIntProducer : public edm::global::EDProducer<edm::StreamCache<UnsafeCache>> {
+    public:
+      explicit StreamIntProducer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        callWhenNewProductsRegistered([](edm::BranchDescription const& desc) {
+          std::cout << "global::StreamIntProducer " << desc.moduleLabel() << std::endl;
+        });
+        produces<unsigned int>();
+      }
+
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID iID) const override {
+        ++m_count;
+        auto sCache = std::make_unique<UnsafeCache>();
+        ++(sCache->strm);
+        sCache->value = iID.value();
+        return sCache;
+      }
+
+      void streamBeginRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        if (sCache->value != iID.value()) {
+          throw cms::Exception("cache value")
+              << "StreamIntAnalyzer cache value " << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+        if (sCache->run != 0 || sCache->lumi != 0 || sCache->work != 0 || sCache->strm != 1) {
+          throw cms::Exception("out of sequence") << "streamBeginRun out of sequence in Stream " << iID.value();
+        }
+        ++(sCache->run);
+      }
+
+      void streamBeginLuminosityBlock(edm::StreamID iID,
+                                      edm::LuminosityBlock const&,
+                                      edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        if (sCache->lumi != 0 || sCache->work != 0) {
+          throw cms::Exception("out of sequence")
+              << "streamBeginLuminosityBlock out of sequence in Stream " << iID.value();
+        }
+        ++(sCache->lumi);
+      }
+
+      void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        ++(sCache->work);
+        if (sCache->lumi == 0 && sCache->run == 0) {
+          throw cms::Exception("out of sequence") << "produce out of sequence in Stream " << iID.value();
+        }
+      }
+
+      void streamEndLuminosityBlock(edm::StreamID iID,
+                                    edm::LuminosityBlock const&,
+                                    edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        --(sCache->lumi);
+        sCache->work = 0;
+        if (sCache->lumi != 0 || sCache->run == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamEndLuminosityBlock out of sequence in Stream " << iID.value();
+        }
+      }
+
+      void streamEndRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        --(sCache->run);
+        sCache->work = 0;
+        if (sCache->run != 0 || sCache->lumi != 0) {
+          throw cms::Exception("out of sequence") << "streamEndRun out of sequence in Stream " << iID.value();
+        }
+      }
+
+      void endStream(edm::StreamID iID) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        --(sCache->strm);
+        if (sCache->strm != 0 || sCache->run != 0 || sCache->lumi != 0) {
+          throw cms::Exception("out of sequence") << "endStream out of sequence in Stream " << iID.value();
+        }
+      }
+
+      ~StreamIntProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "StreamIntProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class RunIntProducer : public edm::global::EDProducer<edm::StreamCache<UnsafeCache>, edm::RunCache<Cache>> {
+    public:
+      explicit RunIntProducer(edm::ParameterSet const& p)
+          : trans_(p.getParameter<int>("transitions")), cvalue_(p.getParameter<int>("cachevalue")) {
+        produces<unsigned int>();
+      }
+
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
+        ++m_count;
+        auto rCache = std::make_shared<Cache>();
+        ++(rCache->run);
+        return rCache;
+      }
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override { return std::make_unique<UnsafeCache>(); }
+
+      void streamBeginRun(edm::StreamID iID, edm::Run const& iRun, edm::EventSetup const&) const override {
+        auto rCache = runCache(iRun.index());
+        if (rCache->run == 0) {
+          throw cms::Exception("out of sequence") << "streamBeginRun before globalBeginRun in Stream " << iID.value();
+        }
+      }
+
+      void produce(edm::StreamID iID, edm::Event& iEvent, edm::EventSetup const&) const override {
+        auto rCache = runCache(iEvent.getRun().index());
+        ++(rCache->value);
+      }
+
+      void streamEndRun(edm::StreamID iID, edm::Run const& iRun, edm::EventSetup const&) const override {
+        auto rCache = runCache(iRun.index());
+        if (rCache->run == 0) {
+          throw cms::Exception("out of sequence") << "streamEndRun after globalEndRun in Stream " << iID.value();
+        }
+      }
+
+      void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
+        ++m_count;
+        auto rCache = runCache(iRun.index());
+        if (rCache->value != cvalue_) {
+          throw cms::Exception("cache value")
+              << "RunIntProducer cache value " << rCache->value << " but it was supposed to be " << cvalue_;
+        }
+        --(rCache->run);
+      }
+
+      ~RunIntProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "RunIntProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiIntProducer
+        : public edm::global::EDProducer<edm::StreamCache<UnsafeCache>, edm::LuminosityBlockCache<Cache>> {
+    public:
+      explicit LumiIntProducer(edm::ParameterSet const& p)
+          : trans_(p.getParameter<int>("transitions")), cvalue_(p.getParameter<int>("cachevalue")) {
+        produces<unsigned int>();
+      }
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                        edm::EventSetup const&) const override {
+        ++m_count;
+        auto lCache = std::make_shared<Cache>();
+        ++(lCache->lumi);
+        return lCache;
+      }
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override { return std::make_unique<UnsafeCache>(); }
+
+      void streamBeginLuminosityBlock(edm::StreamID iID,
+                                      edm::LuminosityBlock const& iLB,
+                                      edm::EventSetup const&) const override {
+        auto lCache = luminosityBlockCache(iLB.index());
+        if (lCache->lumi == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamBeginLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+      }
+
+      void produce(edm::StreamID, edm::Event& iEvent, edm::EventSetup const&) const override {
+        auto lCache = luminosityBlockCache(iEvent.getLuminosityBlock().index());
+        ++(lCache->value);
+      }
+
+      void streamEndLuminosityBlock(edm::StreamID iID,
+                                    edm::LuminosityBlock const& iLB,
+                                    edm::EventSetup const&) const override {
+        auto lCache = luminosityBlockCache(iLB.index());
+        if (lCache->lumi == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamEndLuminosityBlock seen before globalEndLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+      }
+
+      void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
+        ++m_count;
+        auto lCache = luminosityBlockCache(iLB.index());
+        --(lCache->lumi);
+        if (lCache->lumi != 0) {
+          throw cms::Exception("end out of sequence")
+              << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+        if (lCache->value != cvalue_) {
+          throw cms::Exception("cache value")
+              << "LumiIntProducer cache value " << lCache->value << " but it was supposed to be " << cvalue_;
+        }
+      }
+
+      ~LumiIntProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "LumiIntProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class RunSummaryIntProducer
+        : public edm::global::EDProducer<edm::StreamCache<UnsafeCache>, edm::RunSummaryCache<UnsafeCache>> {
+    public:
+      explicit RunSummaryIntProducer(edm::ParameterSet const& p)
+          : trans_(p.getParameter<int>("transitions")), cvalue_(p.getParameter<int>("cachevalue")) {
+        produces<unsigned int>();
+      }
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override { return std::make_unique<UnsafeCache>(); }
+
+      std::shared_ptr<UnsafeCache> globalBeginRunSummary(edm::Run const& iRun, edm::EventSetup const&) const override {
+        ++m_count;
+        auto gCache = std::make_shared<UnsafeCache>();
+        ++(gCache->run);
+        return gCache;
+      }
+
+      void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
+        auto sCache = streamCache(iID);
+        ++(sCache->value);
+      }
+
+      void streamEndRunSummary(edm::StreamID iID,
+                               edm::Run const&,
+                               edm::EventSetup const&,
+                               UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->run == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamEndRunSummary after globalEndRunSummary in Stream " << iID.value();
+        }
+        auto sCache = streamCache(iID);
+        gCache->value += sCache->value;
+        sCache->value = 0;
+      }
+
+      void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->value != cvalue_) {
           throw cms::Exception("cache value")
-          << "StreamIntAnalyzer cache value "
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
-      }
-      if ( sCache->run != 0 || sCache->lumi !=0 || sCache->work !=0 || sCache->strm !=1 ) {
-        throw cms::Exception("out of sequence")
-          << "streamBeginRun out of sequence in Stream " << iID.value();
-      }      
-      ++(sCache->run);
-    }
-
-    void streamBeginLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      if ( sCache->lumi != 0 || sCache->work != 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamBeginLuminosityBlock out of sequence in Stream " << iID.value();
-      }      
-       ++(sCache->lumi);
-    }
-
-    void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      ++(sCache->work);
-      if ( sCache->lumi == 0 && sCache->run == 0) {
-        throw cms::Exception("out of sequence")
-          << "produce out of sequence in Stream " << iID.value();
-      }       
-       
-    }
-    
- 
-    void streamEndLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      --(sCache->lumi);
-      sCache->work = 0;
-      if ( sCache->lumi != 0 || sCache->run == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndLuminosityBlock out of sequence in Stream " << iID.value();
-      }      
-     }
-
-    void streamEndRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      --(sCache->run);
-      sCache->work = 0;
-      if ( sCache->run != 0 || sCache->lumi != 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndRun out of sequence in Stream " << iID.value();
-      }      
-     }
-
-    void endStream(edm::StreamID iID) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      --(sCache->strm);
-      if ( sCache->strm != 0 || sCache->run != 0 || sCache->lumi != 0 ) {
-        throw cms::Exception("out of sequence")
-          << "endStream out of sequence in Stream " << iID.value();
-      }      
-    }
-
-    ~StreamIntProducer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "StreamIntProducer transitions " 
-          << m_count << " but it was supposed to be " << trans_;
-      }
-    }
-  };
-  
-  class RunIntProducer : public edm::global::EDProducer<edm::StreamCache<UnsafeCache>,edm::RunCache<Cache>> {
-  public:
-    explicit RunIntProducer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {
-    produces<unsigned int>();
-    }
-
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-
-    std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-      ++m_count;
-      auto rCache = std::make_shared<Cache>();
-      ++(rCache->run);
-      return rCache;
-    }
-
-    std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override {
-      return std::make_unique<UnsafeCache>();
-    }
-    
-    void streamBeginRun(edm::StreamID iID, edm::Run const& iRun, edm::EventSetup const&) const  override {
-      auto rCache = runCache(iRun.index());
-      if ( rCache->run == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamBeginRun before globalBeginRun in Stream " << iID.value();
-      }      
-    }
-
-
-    void produce(edm::StreamID iID, edm::Event& iEvent, edm::EventSetup const&) const override {
-      auto rCache = runCache(iEvent.getRun().index());
-      ++(rCache->value);
-       
-    }
-
-    void streamEndRun(edm::StreamID iID, edm::Run const& iRun, edm::EventSetup const&) const override {
-      auto rCache = runCache(iRun.index());
-      if ( rCache->run == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndRun after globalEndRun in Stream " << iID.value();
-      }      
-    }
-
-    void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-      ++m_count;
-      auto rCache = runCache(iRun.index());
-      if ( rCache->value != cvalue_ ) {
+              << "RunSummaryIntProducer cache value " << gCache->value << " but it was supposed to be " << cvalue_;
+        }
+        --(gCache->run);
+      }
+
+      ~RunSummaryIntProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "RunSummaryIntProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiSummaryIntProducer
+        : public edm::global::EDProducer<edm::StreamCache<UnsafeCache>, edm::LuminosityBlockSummaryCache<UnsafeCache>> {
+    public:
+      explicit LumiSummaryIntProducer(edm::ParameterSet const& p)
+          : trans_(p.getParameter<int>("transitions")), cvalue_(p.getParameter<int>("cachevalue")) {
+        produces<unsigned int>();
+      }
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override { return std::make_unique<UnsafeCache>(); }
+
+      std::shared_ptr<UnsafeCache> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const& iLB,
+                                                                     edm::EventSetup const&) const override {
+        ++m_count;
+        auto gCache = std::make_shared<UnsafeCache>();
+        ++(gCache->lumi);
+        return gCache;
+      }
+
+      void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
+        auto sCache = streamCache(iID);
+        ++(sCache->value);
+      }
+
+      void streamEndLuminosityBlockSummary(edm::StreamID iID,
+                                           edm::LuminosityBlock const&,
+                                           edm::EventSetup const&,
+                                           UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->lumi == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamEndLuminosityBlockSummary after globalEndLuminosityBlockSummary in Stream " << iID.value();
+        }
+        auto sCache = streamCache(iID);
+        gCache->value += sCache->value;
+        sCache->value = 0;
+      }
+
+      void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                           edm::EventSetup const&,
+                                           UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->value != cvalue_) {
           throw cms::Exception("cache value")
-          << "RunIntProducer cache value "
-          << rCache->value << " but it was supposed to be " << cvalue_;
-      }
-     --(rCache->run);
-    }
-
-
-    ~RunIntProducer() {
-       if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "RunIntProducer transitions " 
-          << m_count << " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-
-  class LumiIntProducer : public edm::global::EDProducer<edm::StreamCache<UnsafeCache>,edm::LuminosityBlockCache<Cache>> {
-  public:
-    explicit LumiIntProducer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {
-    produces<unsigned int>();
-    }
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    
-    std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      ++m_count;
-      auto lCache = std::make_shared<Cache>();
-      ++(lCache->lumi);  
-      return lCache;
-    }
-
-   std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override {
-      return std::make_unique<UnsafeCache>();
-    }
-
-    void streamBeginLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      auto lCache = luminosityBlockCache(iLB.index()); 
-      if ( lCache->lumi == 0) {
-        throw cms::Exception("out of sequence")
-          << "streamBeginLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-       }
-   }
-
-
-    void produce(edm::StreamID, edm::Event& iEvent, edm::EventSetup const&) const override {
-      auto lCache = luminosityBlockCache(iEvent.getLuminosityBlock().index());
-      ++(lCache->value);
-       
-    }
-
-    void streamEndLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      auto lCache = luminosityBlockCache(iLB.index()); 
-      if ( lCache->lumi == 0) {
-        throw cms::Exception("out of sequence")
-          << "streamEndLuminosityBlock seen before globalEndLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-       }
-    }
-  
-    void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      ++m_count;
-      auto lCache = luminosityBlockCache(iLB.index());
-      --(lCache->lumi); 
-      if ( lCache->lumi != 0 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-      }
-      if( lCache->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << "LumiIntProducer cache value "
-          << lCache->value << " but it was supposed to be " << cvalue_;
-      }
-     }
-
-
-    ~LumiIntProducer() {
-       if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "LumiIntProducer transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-       }
-    }
-  };
-  
-  class RunSummaryIntProducer : public edm::global::EDProducer<edm::StreamCache<UnsafeCache>,edm::RunSummaryCache<UnsafeCache>> {
-  public:
-    explicit RunSummaryIntProducer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {
-    produces<unsigned int>();
-      
-    }
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-   
-    std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override {
-      return std::make_unique<UnsafeCache>();
-    }
-
-    std::shared_ptr<UnsafeCache> globalBeginRunSummary(edm::Run const& iRun, edm::EventSetup const&) const override {
-      ++m_count;
-      auto gCache = std::make_shared<UnsafeCache>();
-      ++(gCache->run);
-      return gCache;
-    }
-
-    void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      auto sCache = streamCache(iID);
-      ++(sCache->value);
-       
-    }
-     
-    void streamEndRunSummary(edm::StreamID iID, edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if ( gCache->run == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndRunSummary after globalEndRunSummary in Stream " << iID.value();
-      }      
-      auto sCache = streamCache(iID);
-      gCache->value += sCache->value;
-      sCache->value = 0;
-    }
-    
-    void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if( gCache->value  != cvalue_) {
-        throw cms::Exception("cache value")
-          << "RunSummaryIntProducer cache value "
-          << gCache->value << " but it was supposed to be " << cvalue_;
-      }
-      --(gCache->run);
-    }
-
-
-    ~RunSummaryIntProducer() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "RunSummaryIntProducer transitions "
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class LumiSummaryIntProducer : public edm::global::EDProducer<edm::StreamCache<UnsafeCache>,edm::LuminosityBlockSummaryCache<UnsafeCache>> {
-  public:
-    explicit LumiSummaryIntProducer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {	
-    produces<unsigned int>();
-      
-    }
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-  
-    std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override {
-      return std::make_unique<UnsafeCache>();
-    }
-
-    std::shared_ptr<UnsafeCache> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      ++m_count;
-      auto gCache = std::make_shared<UnsafeCache>();
-      ++(gCache->lumi);
-       return gCache;
-    }
-
-    void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      auto sCache = streamCache(iID);
-      ++(sCache->value);
-       
-    }
-      
-    void streamEndLuminosityBlockSummary(edm::StreamID iID, edm::LuminosityBlock const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if ( gCache->lumi == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndLuminosityBlockSummary after globalEndLuminosityBlockSummary in Stream " << iID.value();
-      }
-      auto sCache = streamCache(iID);
-      gCache->value += sCache->value;
-      sCache->value = 0;
-    }
-    
-    void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if( gCache->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << "LumiSummaryIntProducer cache value "
-          << gCache->value << " but it was supposed to be " << cvalue_;
-      }
-      --(gCache->lumi);
-    }
-
-    ~LumiSummaryIntProducer() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "LumiSummaryIntProducer transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestBeginRunProducer : public edm::global::EDProducer<edm::RunCache<Dummy>,edm::BeginRunProducer> {
-  public:
-    explicit TestBeginRunProducer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {	
-    produces<unsigned int>();
-    produces<unsigned int, edm::Transition::BeginRun>("a");
-    }
-
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    mutable std::atomic<bool> brp{false}; 
- 
-    std::shared_ptr<Dummy> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-      brp = false;
-      return std::shared_ptr<Dummy>();
-    }
-
-    void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      if (!brp) {
-        throw cms::Exception("out of sequence")
-          << "produce before globalBeginRunProduce in Stream " << iID.value();      }
-    }
-
-    void globalBeginRunProduce(edm::Run&, edm::EventSetup const&) const override {
-      ++m_count;
-      brp = true;
-    }
-
-    void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-    }
-
-    ~TestBeginRunProducer() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestBeginRunProducer transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-
-  };
-
-  class TestEndRunProducer : public edm::global::EDProducer<edm::RunCache<Dummy>,edm::EndRunProducer> {
-  public:
-    explicit TestEndRunProducer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {	
-    produces<unsigned int>();
-    produces<unsigned int, edm::Transition::EndRun>("a");
-    }
-    const unsigned int trans_;
-    mutable std::atomic<unsigned int> m_count{0};
-    mutable std::atomic<bool> p{false}; 
-
-    std::shared_ptr<Dummy> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-      p = false;
-      return std::shared_ptr<Dummy>();
-    }
-
-    void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      p = true;
-    }
-
-    void globalEndRunProduce(edm::Run&, edm::EventSetup const&) const override {
-      if ( !p ) {
-        throw cms::Exception("out of sequence")
-          << "endRunProduce before produce";
-      }
-      ++m_count;
-    }
-
-    void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-    }
-
-    ~TestEndRunProducer() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestEndRunProducer transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestBeginLumiBlockProducer : public edm::global::EDProducer<edm::LuminosityBlockCache<void>,edm::BeginLuminosityBlockProducer> {
-  public:
-    explicit TestBeginLumiBlockProducer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {	
-    produces<unsigned int>();
-    produces<unsigned int, edm::Transition::BeginLuminosityBlock>("a");
-    }
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    mutable std::atomic<bool> gblp{false}; 
-
-    std::shared_ptr<void> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      gblp = false;
-      return std::shared_ptr<void>();
-    }
-
-    void produce(edm::StreamID iID, edm::Event&, const edm::EventSetup&) const override{
-      if ( !gblp ) {
-        throw cms::Exception("out of sequence")
-          << "produce before globalBeginLuminosityBlockProduce in Stream " << iID.value();
-      }
-    }
-
-    void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
-      ++m_count;
-      gblp = true;
-    }
-
-    void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-    }
-
-    ~TestBeginLumiBlockProducer() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestBeginLumiBlockProducer transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestEndLumiBlockProducer : public edm::global::EDProducer<edm::LuminosityBlockCache<void>,edm::EndLuminosityBlockProducer> {
-  public:
-    explicit TestEndLumiBlockProducer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {	
-    produces<unsigned int>();
-    produces<unsigned int, edm::Transition::EndLuminosityBlock>("a");
-    }
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    mutable std::atomic<bool> p{false}; 
-
-    std::shared_ptr<void> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      p = false;
-      return std::shared_ptr<void>();
-    }
-
-
-    void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      p = true;    
-    }
-
-    void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
-      if ( !p ) {
-        throw cms::Exception("out of sequence")
-          << "endLumiBlockProduce before produce";
-      }
-      ++m_count;
-    }
-
-    void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-    }
-
-    ~TestEndLumiBlockProducer() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestEndLumiBlockProducer transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestAccumulator : public edm::global::EDProducer<edm::Accumulator> {
-  public:
-
-    explicit TestAccumulator(edm::ParameterSet const& p) :
-      m_expectedCount(p.getParameter<unsigned int>("expectedCount")) {
-    }
-
-    void accumulate(edm::StreamID iID, edm::Event const&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-
-    ~TestAccumulator() {
-      if (m_count.load() != m_expectedCount) {
-        throw cms::Exception("TestCount")
-          << "TestAccumulator counter was "
-          << m_count << " but it was supposed to be " << m_expectedCount;
-      }
-    }
-
-    mutable std::atomic<unsigned int> m_count{0};
-    const unsigned int m_expectedCount;
-  };
-}
-}
+              << "LumiSummaryIntProducer cache value " << gCache->value << " but it was supposed to be " << cvalue_;
+        }
+        --(gCache->lumi);
+      }
+
+      ~LumiSummaryIntProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "LumiSummaryIntProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestBeginRunProducer : public edm::global::EDProducer<edm::RunCache<Dummy>, edm::BeginRunProducer> {
+    public:
+      explicit TestBeginRunProducer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::BeginRun>("a");
+      }
+
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+      mutable std::atomic<bool> brp{false};
+
+      std::shared_ptr<Dummy> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
+        brp = false;
+        return std::shared_ptr<Dummy>();
+      }
+
+      void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
+        if (!brp) {
+          throw cms::Exception("out of sequence") << "produce before globalBeginRunProduce in Stream " << iID.value();
+        }
+      }
+
+      void globalBeginRunProduce(edm::Run&, edm::EventSetup const&) const override {
+        ++m_count;
+        brp = true;
+      }
+
+      void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {}
+
+      ~TestBeginRunProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestBeginRunProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestEndRunProducer : public edm::global::EDProducer<edm::RunCache<Dummy>, edm::EndRunProducer> {
+    public:
+      explicit TestEndRunProducer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::EndRun>("a");
+      }
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+      mutable std::atomic<bool> p{false};
+
+      std::shared_ptr<Dummy> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
+        p = false;
+        return std::shared_ptr<Dummy>();
+      }
+
+      void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override { p = true; }
+
+      void globalEndRunProduce(edm::Run&, edm::EventSetup const&) const override {
+        if (!p) {
+          throw cms::Exception("out of sequence") << "endRunProduce before produce";
+        }
+        ++m_count;
+      }
+
+      void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {}
+
+      ~TestEndRunProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestEndRunProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestBeginLumiBlockProducer
+        : public edm::global::EDProducer<edm::LuminosityBlockCache<void>, edm::BeginLuminosityBlockProducer> {
+    public:
+      explicit TestBeginLumiBlockProducer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::BeginLuminosityBlock>("a");
+      }
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+      mutable std::atomic<bool> gblp{false};
+
+      std::shared_ptr<void> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                       edm::EventSetup const&) const override {
+        gblp = false;
+        return std::shared_ptr<void>();
+      }
+
+      void produce(edm::StreamID iID, edm::Event&, const edm::EventSetup&) const override {
+        if (!gblp) {
+          throw cms::Exception("out of sequence")
+              << "produce before globalBeginLuminosityBlockProduce in Stream " << iID.value();
+        }
+      }
+
+      void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
+        ++m_count;
+        gblp = true;
+      }
+
+      void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {}
+
+      ~TestBeginLumiBlockProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestBeginLumiBlockProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestEndLumiBlockProducer
+        : public edm::global::EDProducer<edm::LuminosityBlockCache<void>, edm::EndLuminosityBlockProducer> {
+    public:
+      explicit TestEndLumiBlockProducer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::EndLuminosityBlock>("a");
+      }
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+      mutable std::atomic<bool> p{false};
+
+      std::shared_ptr<void> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                       edm::EventSetup const&) const override {
+        p = false;
+        return std::shared_ptr<void>();
+      }
+
+      void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override { p = true; }
+
+      void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
+        if (!p) {
+          throw cms::Exception("out of sequence") << "endLumiBlockProduce before produce";
+        }
+        ++m_count;
+      }
+
+      void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {}
+
+      ~TestEndLumiBlockProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestEndLumiBlockProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestAccumulator : public edm::global::EDProducer<edm::Accumulator> {
+    public:
+      explicit TestAccumulator(edm::ParameterSet const& p)
+          : m_expectedCount(p.getParameter<unsigned int>("expectedCount")) {}
+
+      void accumulate(edm::StreamID iID, edm::Event const&, edm::EventSetup const&) const override { ++m_count; }
+
+      ~TestAccumulator() {
+        if (m_count.load() != m_expectedCount) {
+          throw cms::Exception("TestCount")
+              << "TestAccumulator counter was " << m_count << " but it was supposed to be " << m_expectedCount;
+        }
+      }
+
+      mutable std::atomic<unsigned int> m_count{0};
+      const unsigned int m_expectedCount;
+    };
+  }  // namespace global
+}  // namespace edmtest
 
 DEFINE_FWK_MODULE(edmtest::global::StreamIntProducer);
 DEFINE_FWK_MODULE(edmtest::global::RunIntProducer);
@@ -610,4 +565,3 @@ DEFINE_FWK_MODULE(edmtest::global::TestEndRunProducer);
 DEFINE_FWK_MODULE(edmtest::global::TestBeginLumiBlockProducer);
 DEFINE_FWK_MODULE(edmtest::global::TestEndLumiBlockProducer);
 DEFINE_FWK_MODULE(edmtest::global::TestAccumulator);
-
diff --git a/FWCore/Framework/test/stubs/TestLimitedAnalyzers.cc b/FWCore/Framework/test/stubs/TestLimitedAnalyzers.cc
index afdde4232ac0f..cb161dc42b8ff 100644
--- a/FWCore/Framework/test/stubs/TestLimitedAnalyzers.cc
+++ b/FWCore/Framework/test/stubs/TestLimitedAnalyzers.cc
@@ -26,298 +26,290 @@ for testing purposes only.
 #include "DataFormats/Provenance/interface/BranchDescription.h"
 
 namespace edmtest {
-namespace limited {
-
-namespace {
-struct Cache { 
-   Cache():value(0) {}
-   //Using mutable since we want to update the value.
-   mutable std::atomic<unsigned int> value;
-};
-
-struct UnsafeCache {
-   UnsafeCache():value(0) {}
-   unsigned int value;
-};
-
-} //end anonymous namespace
-
-  class StreamIntAnalyzer: public edm::limited::EDAnalyzer<edm::StreamCache<UnsafeCache>> {
-  public:
-    explicit StreamIntAnalyzer(edm::ParameterSet const& p) :
-    edm::limited::EDAnalyzerBase(p),
-    edm::limited::EDAnalyzer<edm::StreamCache<UnsafeCache>>(p),
-	trans_(p.getParameter<int>("transitions"))
-    {
-      callWhenNewProductsRegistered([](edm::BranchDescription const& desc)
-        { std::cout << "limited::StreamIntAnalyzer " << desc.moduleLabel() << std::endl; });
-    }
-    const unsigned int trans_;
-    mutable std::atomic<unsigned int> m_count{0};
-    
-    std::unique_ptr<UnsafeCache> beginStream(edm::StreamID iID) const override {
-      ++m_count;
-      auto pCache = std::make_unique<UnsafeCache>();
-      pCache->value = iID.value();
-      return pCache;
-    }
-    
-    void streamBeginRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const  override{
-      ++m_count;
-      if ( (streamCache(iID))->value != iID.value() ) {
+  namespace limited {
+
+    namespace {
+      struct Cache {
+        Cache() : value(0) {}
+        //Using mutable since we want to update the value.
+        mutable std::atomic<unsigned int> value;
+      };
+
+      struct UnsafeCache {
+        UnsafeCache() : value(0) {}
+        unsigned int value;
+      };
+
+    }  //end anonymous namespace
+
+    class StreamIntAnalyzer : public edm::limited::EDAnalyzer<edm::StreamCache<UnsafeCache>> {
+    public:
+      explicit StreamIntAnalyzer(edm::ParameterSet const& p)
+          : edm::limited::EDAnalyzerBase(p),
+            edm::limited::EDAnalyzer<edm::StreamCache<UnsafeCache>>(p),
+            trans_(p.getParameter<int>("transitions")) {
+        callWhenNewProductsRegistered([](edm::BranchDescription const& desc) {
+          std::cout << "limited::StreamIntAnalyzer " << desc.moduleLabel() << std::endl;
+        });
+      }
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID iID) const override {
+        ++m_count;
+        auto pCache = std::make_unique<UnsafeCache>();
+        pCache->value = iID.value();
+        return pCache;
+      }
+
+      void streamBeginRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        if ((streamCache(iID))->value != iID.value()) {
           throw cms::Exception("cache value")
-          << "StreamIntAnalyzer cache value "
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
+              << "StreamIntAnalyzer cache value " << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
       }
-    }
 
-    void streamBeginLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      if ( (streamCache(iID))->value != iID.value() ) {
+      void streamBeginLuminosityBlock(edm::StreamID iID,
+                                      edm::LuminosityBlock const&,
+                                      edm::EventSetup const&) const override {
+        ++m_count;
+        if ((streamCache(iID))->value != iID.value()) {
           throw cms::Exception("cache value")
-          << "StreamIntAnalyzer cache value "
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
+              << "StreamIntAnalyzer cache value " << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
       }
-     }
 
-    void analyze(edm::StreamID iID, const edm::Event&, const edm::EventSetup&) const override {
-      ++m_count;
-      if ( (streamCache(iID))->value != iID.value() ) {
+      void analyze(edm::StreamID iID, const edm::Event&, const edm::EventSetup&) const override {
+        ++m_count;
+        if ((streamCache(iID))->value != iID.value()) {
           throw cms::Exception("cache value")
-          << "StreamIntAnalyzer cache value "
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
-      }       
-    }
-
-    void streamEndLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      if ( (streamCache(iID))->value != iID.value() ) {
+              << "StreamIntAnalyzer cache value " << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+      }
+
+      void streamEndLuminosityBlock(edm::StreamID iID,
+                                    edm::LuminosityBlock const&,
+                                    edm::EventSetup const&) const override {
+        ++m_count;
+        if ((streamCache(iID))->value != iID.value()) {
           throw cms::Exception("cache value")
-          << "StreamIntAnalyzer cache value "
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
+              << "StreamIntAnalyzer cache value " << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
       }
-    }
 
-    void streamEndRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const override {
-      ++m_count;
-      if ( (streamCache(iID))->value != iID.value() ) {
+      void streamEndRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        if ((streamCache(iID))->value != iID.value()) {
           throw cms::Exception("cache value")
-          << "StreamIntAnalyzer cache value "
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
+              << "StreamIntAnalyzer cache value " << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+      }
+
+      void endStream(edm::StreamID iID) const override {
+        ++m_count;
+        if ((streamCache(iID))->value != iID.value()) {
+          throw cms::Exception("cache value")
+              << "StreamIntAnalyzer cache value " << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+      }
+
+      ~StreamIntAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "StreamIntAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class RunIntAnalyzer : public edm::limited::EDAnalyzer<edm::RunCache<Cache>> {
+    public:
+      explicit RunIntAnalyzer(edm::ParameterSet const& p)
+          : edm::limited::EDAnalyzerBase(p),
+            edm::limited::EDAnalyzer<edm::RunCache<Cache>>(p),
+            trans_(p.getParameter<int>("transitions")),
+            cvalue_(p.getParameter<int>("cachevalue")) {}
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::shared_ptr<Cache> globalBeginRun(edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        return std::make_shared<Cache>();
+      }
+
+      void analyze(edm::StreamID iID, const edm::Event& iEvent, const edm::EventSetup&) const override {
+        ++m_count;
+        ++((runCache(iEvent.getRun().index()))->value);
+      }
+
+      void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
+        ++m_count;
+        if ((runCache(iRun.index()))->value != cvalue_) {
+          throw cms::Exception("cache value") << "RunIntAnalyzer cache value " << (runCache(iRun.index()))->value
+                                              << " but it was supposed to be " << cvalue_;
+        }
+      }
+
+      ~RunIntAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "RunIntAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiIntAnalyzer : public edm::limited::EDAnalyzer<edm::LuminosityBlockCache<Cache>> {
+    public:
+      explicit LumiIntAnalyzer(edm::ParameterSet const& p)
+          : edm::limited::EDAnalyzerBase(p),
+            edm::limited::EDAnalyzer<edm::LuminosityBlockCache<Cache>>(p),
+            trans_(p.getParameter<int>("transitions")),
+            cvalue_(p.getParameter<int>("cachevalue")) {}
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const&,
+                                                        edm::EventSetup const&) const override {
+        ++m_count;
+        return std::make_shared<Cache>();
+      }
+
+      void analyze(edm::StreamID, const edm::Event& iEvent, const edm::EventSetup&) const override {
+        ++m_count;
+        ++(luminosityBlockCache(iEvent.getLuminosityBlock().index())->value);
       }
-    }
 
-    void endStream(edm::StreamID iID ) const override {
-      ++m_count;
-      if ( (streamCache(iID))->value != iID.value() ) {
+      void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
+        ++m_count;
+        if ((luminosityBlockCache(iLB.index()))->value != cvalue_) {
           throw cms::Exception("cache value")
-          << "StreamIntAnalyzer cache value "
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
+              << "LumiIntAnalyzer cache value " << (luminosityBlockCache(iLB.index()))->value
+              << " but it was supposed to be " << cvalue_;
+        }
       }
-    } 
 
-    ~StreamIntAnalyzer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "StreamIntAnalyzer transitions "
-          << m_count<< " but it was supposed to be " << trans_;
+      ~LumiIntAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "LumiIntAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
       }
-    }
-  };
-  
-  class RunIntAnalyzer: public edm::limited::EDAnalyzer<edm::RunCache<Cache>> {
-  public:
-    explicit RunIntAnalyzer(edm::ParameterSet const& p) :
-    edm::limited::EDAnalyzerBase(p),
-    edm::limited::EDAnalyzer<edm::RunCache<Cache>>(p),
-	trans_(p.getParameter<int>("transitions"))
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {}
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    
-    std::shared_ptr<Cache> globalBeginRun(edm::Run const&, edm::EventSetup const&) const override {
-      ++m_count;
-      return std::make_shared<Cache>();
-    }
-
-    void analyze(edm::StreamID iID, const edm::Event& iEvent, const edm::EventSetup&) const override {
-      ++m_count;
-      ++((runCache(iEvent.getRun().index()))->value);
-       
-    }
-
-    void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-      ++m_count;
-      if ( (runCache(iRun.index()))->value != cvalue_ ) {
+    };
+
+    class RunSummaryIntAnalyzer
+        : public edm::limited::EDAnalyzer<edm::StreamCache<UnsafeCache>, edm::RunSummaryCache<UnsafeCache>> {
+    public:
+      explicit RunSummaryIntAnalyzer(edm::ParameterSet const& p)
+          : edm::limited::EDAnalyzerBase(p),
+            edm::limited::EDAnalyzer<edm::StreamCache<UnsafeCache>, edm::RunSummaryCache<UnsafeCache>>(p),
+            trans_(p.getParameter<int>("transitions")),
+            cvalue_(p.getParameter<int>("cachevalue")) {}
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override {
+        ++m_count;
+        return std::make_unique<UnsafeCache>();
+      }
+
+      std::shared_ptr<UnsafeCache> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        return std::make_shared<UnsafeCache>();
+      }
+
+      void analyze(edm::StreamID iID, const edm::Event&, const edm::EventSetup&) const override {
+        ++m_count;
+        ++((streamCache(iID))->value);
+      }
+
+      void streamEndRunSummary(edm::StreamID iID,
+                               edm::Run const&,
+                               edm::EventSetup const&,
+                               UnsafeCache* gCache) const override {
+        ++m_count;
+        gCache->value += (streamCache(iID))->value;
+        (streamCache(iID))->value = 0;
+      }
+
+      void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->value != cvalue_) {
           throw cms::Exception("cache value")
-          << "RunIntAnalyzer cache value "
-          << (runCache(iRun.index()))->value << " but it was supposed to be " << cvalue_;
+              << "RunSummaryIntAnalyzer cache value " << gCache->value << " but it was supposed to be " << cvalue_;
+        }
       }
-    }
 
-    ~RunIntAnalyzer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "RunIntAnalyzer transitions "
-          << m_count<< " but it was supposed to be " << trans_;
+      ~RunSummaryIntAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "RunSummaryIntAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
       }
-    }
-  };
-
-
-  class LumiIntAnalyzer: public edm::limited::EDAnalyzer<edm::LuminosityBlockCache<Cache>> {
-  public:
-    explicit LumiIntAnalyzer(edm::ParameterSet const& p) :
-    edm::limited::EDAnalyzerBase(p),
-    edm::limited::EDAnalyzer<edm::LuminosityBlockCache<Cache>>(p),
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {}
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-   
-    std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      return std::make_shared<Cache>();
-    }
-
-    void analyze(edm::StreamID, const edm::Event& iEvent, const edm::EventSetup&) const override {
-      ++m_count;
-      ++(luminosityBlockCache(iEvent.getLuminosityBlock().index())->value);
-       
-    }
-     
-    void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      ++m_count;
-      if( (luminosityBlockCache(iLB.index()))->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << "LumiIntAnalyzer cache value "
-          << (luminosityBlockCache(iLB.index()))->value << " but it was supposed to be " << cvalue_;
+    };
+
+    class LumiSummaryIntAnalyzer
+        : public edm::limited::EDAnalyzer<edm::StreamCache<UnsafeCache>, edm::LuminosityBlockSummaryCache<UnsafeCache>> {
+    public:
+      explicit LumiSummaryIntAnalyzer(edm::ParameterSet const& p)
+          : edm::limited::EDAnalyzerBase(p),
+            edm::limited::EDAnalyzer<edm::StreamCache<UnsafeCache>, edm::LuminosityBlockSummaryCache<UnsafeCache>>(p),
+            trans_(p.getParameter<int>("transitions")),
+            cvalue_(p.getParameter<int>("cachevalue")) {}
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override {
+        ++m_count;
+        return std::make_unique<UnsafeCache>();
+      }
+
+      std::shared_ptr<UnsafeCache> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                                     edm::EventSetup const&) const override {
+        ++m_count;
+        return std::make_shared<UnsafeCache>();
       }
-    }
 
-    ~LumiIntAnalyzer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "LumiIntAnalyzer transitions "
-          << m_count<< " but it was supposed to be " << trans_;
+      void analyze(edm::StreamID iID, const edm::Event& iEvent, const edm::EventSetup&) const override {
+        ++m_count;
+        ++((streamCache(iID))->value);
       }
-    }
-  };
-  
-  class RunSummaryIntAnalyzer: public edm::limited::EDAnalyzer<edm::StreamCache<UnsafeCache>,edm::RunSummaryCache<UnsafeCache>> {
-  public:
-    explicit RunSummaryIntAnalyzer(edm::ParameterSet const& p) :
-    edm::limited::EDAnalyzerBase(p),
-    edm::limited::EDAnalyzer<edm::StreamCache<UnsafeCache>,edm::RunSummaryCache<UnsafeCache>>(p),
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {}
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-
-    std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override {
-      ++m_count;
-      return std::make_unique<UnsafeCache>();
-    }
-
-    std::shared_ptr<UnsafeCache> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&) const override {
-      ++m_count;
-      return std::make_shared<UnsafeCache>();
-    }
-  
-    void analyze(edm::StreamID iID, const edm::Event&, const edm::EventSetup&) const override {
-      ++m_count;
-      ++((streamCache(iID))->value);
-       
-    }
-  
-    void streamEndRunSummary(edm::StreamID iID, edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      gCache->value += (streamCache(iID))->value;
-      (streamCache(iID))->value = 0;
-    }
-    
-    void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if( gCache->value  != cvalue_) {
-        throw cms::Exception("cache value")
-          << "RunSummaryIntAnalyzer cache value "
-          << gCache->value << " but it was supposed to be " << cvalue_;
-      } 
-    }
-
-    ~RunSummaryIntAnalyzer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "RunSummaryIntAnalyzer transitions "
-          << m_count<< " but it was supposed to be " << trans_;
+
+      void streamEndLuminosityBlockSummary(edm::StreamID iID,
+                                           edm::LuminosityBlock const& iLumiBlock,
+                                           edm::EventSetup const&,
+                                           UnsafeCache* gCache) const override {
+        ++m_count;
+        gCache->value += (streamCache(iID))->value;
+        (streamCache(iID))->value = 0;
       }
-    }
-  };
-
-  class LumiSummaryIntAnalyzer: public edm::limited::EDAnalyzer<edm::StreamCache<UnsafeCache>,edm::LuminosityBlockSummaryCache<UnsafeCache>> {
-  public:
-    explicit LumiSummaryIntAnalyzer(edm::ParameterSet const& p) :
-    edm::limited::EDAnalyzerBase(p),
-    edm::limited::EDAnalyzer<edm::StreamCache<UnsafeCache>,edm::LuminosityBlockSummaryCache<UnsafeCache>>(p),
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {}
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-
-    std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override {
-      ++m_count;
-      return std::make_unique<UnsafeCache>();
-    }
-
-    std::shared_ptr<UnsafeCache> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      return std::make_shared<UnsafeCache>();
-    }
-    
-    void analyze(edm::StreamID iID, const edm::Event& iEvent, const edm::EventSetup&) const override {
-      ++m_count;
-      ++((streamCache(iID))->value);
-       
-    }
-
-    void streamEndLuminosityBlockSummary(edm::StreamID iID, edm::LuminosityBlock const& iLumiBlock, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      gCache->value += (streamCache(iID))->value;
-      (streamCache(iID))->value = 0;
-    }
- 
-    void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if( gCache->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << "LumiSummaryIntAnalyzer cache value "
-          << gCache->value << " but it was supposed to be " << cvalue_;
+
+      void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                           edm::EventSetup const&,
+                                           UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->value != cvalue_) {
+          throw cms::Exception("cache value")
+              << "LumiSummaryIntAnalyzer cache value " << gCache->value << " but it was supposed to be " << cvalue_;
+        }
       }
-    }
 
-    ~LumiSummaryIntAnalyzer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "LumiSummaryIntAnalyzer transitions "
-          << m_count<< " but it was supposed to be " << trans_;
+      ~LumiSummaryIntAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "LumiSummaryIntAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
       }
-    }
-  };
+    };
 
-}
-}
+  }  // namespace limited
+}  // namespace edmtest
 
 DEFINE_FWK_MODULE(edmtest::limited::StreamIntAnalyzer);
 DEFINE_FWK_MODULE(edmtest::limited::RunIntAnalyzer);
 DEFINE_FWK_MODULE(edmtest::limited::LumiIntAnalyzer);
 DEFINE_FWK_MODULE(edmtest::limited::RunSummaryIntAnalyzer);
 DEFINE_FWK_MODULE(edmtest::limited::LumiSummaryIntAnalyzer);
-
diff --git a/FWCore/Framework/test/stubs/TestLimitedFilters.cc b/FWCore/Framework/test/stubs/TestLimitedFilters.cc
index 27cc9768bd69e..63f9811178697 100644
--- a/FWCore/Framework/test/stubs/TestLimitedFilters.cc
+++ b/FWCore/Framework/test/stubs/TestLimitedFilters.cc
@@ -24,605 +24,580 @@ for testing purposes only.
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 
+namespace edmtest {
+  namespace limited {
+
+    namespace {
+      struct Cache {
+        Cache() : value(0), run(0), lumi(0), strm(0), work(0) {}
+        //Using mutable since we want to update the value.
+        mutable std::atomic<unsigned int> value;
+        mutable std::atomic<unsigned int> run;
+        mutable std::atomic<unsigned int> lumi;
+        mutable std::atomic<unsigned int> strm;
+        mutable std::atomic<unsigned int> work;
+      };
+
+      struct UnsafeCache {
+        UnsafeCache() : value(0), run(0), lumi(0), strm(0), work(0) {}
+        unsigned int value;
+        unsigned int run;
+        unsigned int lumi;
+        unsigned int strm;
+        unsigned int work;
+      };
+
+      struct Dummy {};
+
+    }  //end anonymous namespace
+
+    class StreamIntFilter : public edm::limited::EDFilter<edm::StreamCache<UnsafeCache>> {
+    public:
+      explicit StreamIntFilter(edm::ParameterSet const& p)
+          : edm::limited::EDFilterBase(p),
+            edm::limited::EDFilter<edm::StreamCache<UnsafeCache>>(p),
+            trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+      }
 
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
 
-namespace edmtest {
-namespace limited {
-
-namespace {
-struct Cache { 
-   Cache():value(0),run(0),lumi(0),strm(0),work(0) {}
-   //Using mutable since we want to update the value.
-   mutable std::atomic<unsigned int> value;
-   mutable std::atomic<unsigned int> run;
-   mutable std::atomic<unsigned int> lumi;
-   mutable std::atomic<unsigned int> strm;
-   mutable std::atomic<unsigned int> work;
-};
-
-struct UnsafeCache {
-   UnsafeCache():value(0),run(0),lumi(0),strm(0),work(0) {}
-   unsigned int value;
-   unsigned int run;
-   unsigned int lumi;
-   unsigned int strm;
-   unsigned int work;
-};
-
-struct Dummy {
-};
-
-} //end anonymous namespace
-
-
-  class StreamIntFilter : public edm::limited::EDFilter<edm::StreamCache<UnsafeCache>> {
-  public:
-    explicit StreamIntFilter(edm::ParameterSet const& p) :
-    edm::limited::EDFilterBase(p),
-    edm::limited::EDFilter<edm::StreamCache<UnsafeCache>>(p),
-	trans_(p.getParameter<int>("transitions"))
-    {
-    produces<unsigned int>();
-    }
-
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-   
-    std::unique_ptr<UnsafeCache> beginStream(edm::StreamID iID) const override {
-      ++m_count;
-      auto sCache = std::make_unique<UnsafeCache>();
-      ++(sCache->strm);
-      sCache->value = iID.value();
-      return sCache;
-    }
-    
-    void streamBeginRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const  override{
-      ++m_count;
-      auto sCache = streamCache(iID);
-      if ( sCache->value != iID.value() ) {
-          throw cms::Exception("cache value")
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
-      }
-      if ( sCache->run != 0 || sCache->lumi !=0 || sCache->work !=0 || sCache->strm !=1 ) {
-        throw cms::Exception("out of sequence")
-          << "streamBeginRun out of sequence in Stream " << iID.value();
-      }      
-      ++(sCache->run);
-     }
-
-    void streamBeginLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      if ( sCache->value != iID.value() ) {
-          throw cms::Exception("cache value")
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
-      }
-      if ( sCache->lumi != 0 || sCache->work != 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamBeginLuminosityBlock out of sequence in Stream " << iID.value();
-      }      
-       ++(sCache->lumi);
-     }
-
-    bool filter(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      if ( sCache->value != iID.value() ) {
-          throw cms::Exception("cache value")
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
-      }
-      ++(sCache->work);
-      if ( sCache->lumi == 0 && sCache->run == 0) {
-        throw cms::Exception("out of sequence")
-          << "produce out of sequence in Stream " << iID.value();
-      }       
-       
-      return true;
-    }
- 
-    void streamEndLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      if ( sCache->value != iID.value() ) {
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID iID) const override {
+        ++m_count;
+        auto sCache = std::make_unique<UnsafeCache>();
+        ++(sCache->strm);
+        sCache->value = iID.value();
+        return sCache;
+      }
+
+      void streamBeginRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        if (sCache->value != iID.value()) {
+          throw cms::Exception("cache value") << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+        if (sCache->run != 0 || sCache->lumi != 0 || sCache->work != 0 || sCache->strm != 1) {
+          throw cms::Exception("out of sequence") << "streamBeginRun out of sequence in Stream " << iID.value();
+        }
+        ++(sCache->run);
+      }
+
+      void streamBeginLuminosityBlock(edm::StreamID iID,
+                                      edm::LuminosityBlock const&,
+                                      edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        if (sCache->value != iID.value()) {
+          throw cms::Exception("cache value") << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+        if (sCache->lumi != 0 || sCache->work != 0) {
+          throw cms::Exception("out of sequence")
+              << "streamBeginLuminosityBlock out of sequence in Stream " << iID.value();
+        }
+        ++(sCache->lumi);
+      }
+
+      bool filter(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        if (sCache->value != iID.value()) {
+          throw cms::Exception("cache value") << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+        ++(sCache->work);
+        if (sCache->lumi == 0 && sCache->run == 0) {
+          throw cms::Exception("out of sequence") << "produce out of sequence in Stream " << iID.value();
+        }
+
+        return true;
+      }
+
+      void streamEndLuminosityBlock(edm::StreamID iID,
+                                    edm::LuminosityBlock const&,
+                                    edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        if (sCache->value != iID.value()) {
+          throw cms::Exception("cache value") << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+        --(sCache->lumi);
+        sCache->work = 0;
+        if (sCache->lumi != 0 || sCache->run == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamEndLuminosityBlock out of sequence in Stream " << iID.value();
+        }
+      }
+
+      void streamEndRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        if (sCache->value != iID.value()) {
+          throw cms::Exception("cache value") << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+        --(sCache->run);
+        sCache->work = 0;
+        if (sCache->run != 0 || sCache->lumi != 0) {
+          throw cms::Exception("out of sequence") << "streamEndRun out of sequence in Stream " << iID.value();
+        }
+      }
+
+      void endStream(edm::StreamID iID) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        --(sCache->strm);
+        if (sCache->value != iID.value()) {
+          throw cms::Exception("cache value") << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+        if (sCache->strm != 0 || sCache->run != 0 || sCache->lumi != 0) {
+          throw cms::Exception("out of sequence") << "endStream out of sequence in Stream " << iID.value();
+        }
+      }
+
+      ~StreamIntFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "StreamIntFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class RunIntFilter : public edm::limited::EDFilter<edm::StreamCache<UnsafeCache>, edm::RunCache<Cache>> {
+    public:
+      explicit RunIntFilter(edm::ParameterSet const& p)
+          : edm::limited::EDFilterBase(p),
+            edm::limited::EDFilter<edm::StreamCache<UnsafeCache>, edm::RunCache<Cache>>(p),
+            trans_(p.getParameter<int>("transitions")),
+            cvalue_(p.getParameter<int>("cachevalue")) {
+        produces<unsigned int>();
+      }
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::shared_ptr<Cache> globalBeginRun(edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        auto rCache = std::make_shared<Cache>();
+        ++(rCache->run);
+        return rCache;
+      }
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override { return std::make_unique<UnsafeCache>(); }
+
+      void streamBeginRun(edm::StreamID iID, edm::Run const& iRun, edm::EventSetup const&) const override {
+        auto rCache = runCache(iRun.index());
+        if (rCache->run == 0) {
+          throw cms::Exception("out of sequence") << "streamBeginRun before globalBeginRun in Stream " << iID.value();
+        }
+      }
+
+      bool filter(edm::StreamID, edm::Event& iEvent, edm::EventSetup const&) const override {
+        ++m_count;
+        auto rCache = runCache(iEvent.getRun().index());
+        ++(rCache->value);
+
+        return true;
+      }
+
+      void streamEndRun(edm::StreamID iID, edm::Run const& iRun, edm::EventSetup const&) const override {
+        auto rCache = runCache(iRun.index());
+        if (rCache->run == 0) {
+          throw cms::Exception("out of sequence") << "streamEndRun after globalEndRun in Stream " << iID.value();
+        }
+      }
+
+      void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
+        ++m_count;
+        auto rCache = runCache(iRun.index());
+        if (rCache->value != cvalue_) {
           throw cms::Exception("cache value")
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
-      }
-      --(sCache->lumi);
-      sCache->work = 0;
-      if ( sCache->lumi != 0 || sCache->run == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndLuminosityBlock out of sequence in Stream " << iID.value();
-      }      
-     }
-
-    void streamEndRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      if ( sCache->value != iID.value() ) {
+              << "RunIntFilter cache value " << rCache->value << " but it was supposed to be " << cvalue_;
+        }
+        --(rCache->run);
+      }
+
+      ~RunIntFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "RunIntFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiIntFilter
+        : public edm::limited::EDFilter<edm::StreamCache<UnsafeCache>, edm::LuminosityBlockCache<Cache>> {
+    public:
+      explicit LumiIntFilter(edm::ParameterSet const& p)
+          : edm::limited::EDFilterBase(p),
+            edm::limited::EDFilter<edm::StreamCache<UnsafeCache>, edm::LuminosityBlockCache<Cache>>(p),
+            trans_(p.getParameter<int>("transitions")),
+            cvalue_(p.getParameter<int>("cachevalue")) {
+        produces<unsigned int>();
+      }
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const&,
+                                                        edm::EventSetup const&) const override {
+        ++m_count;
+        auto lCache = std::make_shared<Cache>();
+        ++(lCache->lumi);
+        return lCache;
+      }
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID iID) const override {
+        return std::make_unique<UnsafeCache>();
+      }
+
+      void streamBeginLuminosityBlock(edm::StreamID iID,
+                                      edm::LuminosityBlock const& iLB,
+                                      edm::EventSetup const&) const override {
+        auto lCache = luminosityBlockCache(iLB.index());
+        if (lCache->lumi == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamBeginLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+      }
+
+      bool filter(edm::StreamID, edm::Event& iEvent, edm::EventSetup const&) const override {
+        ++m_count;
+        ++(luminosityBlockCache(iEvent.getLuminosityBlock().index())->value);
+        return true;
+      }
+
+      void streamEndLuminosityBlock(edm::StreamID iID,
+                                    edm::LuminosityBlock const& iLB,
+                                    edm::EventSetup const&) const override {
+        auto lCache = luminosityBlockCache(iLB.index());
+        if (lCache->lumi == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamEndLuminosityBlock seen before globalEndLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+      }
+
+      void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
+        ++m_count;
+        auto lCache = luminosityBlockCache(iLB.index());
+        --(lCache->lumi);
+        if (lCache->lumi != 0) {
+          throw cms::Exception("end out of sequence")
+              << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+        if (lCache->value != cvalue_) {
           throw cms::Exception("cache value")
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
-      }
-      --(sCache->run);
-      sCache->work = 0;
-      if ( sCache->run != 0 || sCache->lumi != 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndRun out of sequence in Stream " << iID.value();
-      }      
-    }
-
-    void endStream(edm::StreamID iID) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      --(sCache->strm);
-      if ( sCache->value != iID.value() ) {
+              << "LumiIntFilter cache value " << lCache->value << " but it was supposed to be " << cvalue_;
+        }
+      }
+
+      ~LumiIntFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "LumiIntFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class RunSummaryIntFilter
+        : public edm::limited::EDFilter<edm::StreamCache<Cache>, edm::RunSummaryCache<UnsafeCache>> {
+    public:
+      explicit RunSummaryIntFilter(edm::ParameterSet const& p)
+          : edm::limited::EDFilterBase(p),
+            edm::limited::EDFilter<edm::StreamCache<Cache>, edm::RunSummaryCache<UnsafeCache>>(p),
+            trans_(p.getParameter<int>("transitions")),
+            cvalue_(p.getParameter<int>("cachevalue")) {
+        produces<unsigned int>();
+      }
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::unique_ptr<Cache> beginStream(edm::StreamID) const override {
+        ++m_count;
+        return std::make_unique<Cache>();
+      }
+
+      std::shared_ptr<UnsafeCache> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        auto gCache = std::make_shared<UnsafeCache>();
+        ++(gCache->run);
+        return gCache;
+      }
+
+      bool filter(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
+        ++m_count;
+        ++((streamCache(iID))->value);
+
+        return true;
+      }
+
+      void streamEndRunSummary(edm::StreamID iID,
+                               edm::Run const&,
+                               edm::EventSetup const&,
+                               UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->run == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamEndRunSummary after globalEndRunSummary in Stream " << iID.value();
+        }
+        auto sCache = streamCache(iID);
+        gCache->value += sCache->value;
+        sCache->value = 0;
+      }
+
+      void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->value != cvalue_) {
           throw cms::Exception("cache value")
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
-      }
-      if ( sCache->strm != 0 || sCache->run != 0 || sCache->lumi != 0 ) {
-        throw cms::Exception("out of sequence")
-          << "endStream out of sequence in Stream " << iID.value();
-      }      
-   }
-
-    ~StreamIntFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "StreamIntFilter transitions "
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-  
-  class RunIntFilter : public edm::limited::EDFilter<edm::StreamCache<UnsafeCache>,edm::RunCache<Cache>> {
-  public:
-    explicit RunIntFilter(edm::ParameterSet const& p) :
-    edm::limited::EDFilterBase(p),
-    edm::limited::EDFilter<edm::StreamCache<UnsafeCache>,edm::RunCache<Cache>>(p),
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {    
-    produces<unsigned int>();
-    }
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    
-    std::shared_ptr<Cache> globalBeginRun(edm::Run const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto rCache = std::make_shared<Cache>();
-      ++(rCache->run);
-      return rCache;
-    }
- 
-    std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override {
-      return std::make_unique<UnsafeCache>();
-    }
-
-    void streamBeginRun(edm::StreamID iID, edm::Run const& iRun, edm::EventSetup const&) const  override {
-      auto rCache = runCache(iRun.index());
-      if ( rCache->run == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamBeginRun before globalBeginRun in Stream " << iID.value();
-      }      
-    }
- 
-    bool filter(edm::StreamID, edm::Event& iEvent, edm::EventSetup const&) const override {
-      ++m_count;
-      auto rCache = runCache(iEvent.getRun().index());
-      ++(rCache->value);
-       
-      return true;
-    }
-
-    void streamEndRun(edm::StreamID iID, edm::Run const& iRun, edm::EventSetup const&) const override {
-      auto rCache = runCache(iRun.index());
-      if ( rCache->run == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndRun after globalEndRun in Stream " << iID.value();
-      }      
-    }
-
-
-    void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-      ++m_count;
-      auto rCache = runCache(iRun.index());
-      if ( rCache->value != cvalue_ ) {
+              << "RunSummaryIntFilter cache value " << gCache->value << " but it was supposed to be " << cvalue_;
+        }
+        --(gCache->run);
+      }
+
+      ~RunSummaryIntFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "RunSummaryIntFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiSummaryIntFilter
+        : public edm::limited::EDFilter<edm::StreamCache<Cache>, edm::LuminosityBlockSummaryCache<UnsafeCache>> {
+    public:
+      explicit LumiSummaryIntFilter(edm::ParameterSet const& p)
+          : edm::limited::EDFilterBase(p),
+            edm::limited::EDFilter<edm::StreamCache<Cache>, edm::LuminosityBlockSummaryCache<UnsafeCache>>(p),
+            trans_(p.getParameter<int>("transitions")),
+            cvalue_(p.getParameter<int>("cachevalue")) {
+        produces<unsigned int>();
+      }
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::unique_ptr<Cache> beginStream(edm::StreamID) const override {
+        ++m_count;
+        return std::make_unique<Cache>();
+      }
+
+      std::shared_ptr<UnsafeCache> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                                     edm::EventSetup const&) const override {
+        ++m_count;
+        auto gCache = std::make_shared<UnsafeCache>();
+        ++(gCache->lumi);
+        return gCache;
+      }
+
+      bool filter(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
+        ++m_count;
+        ++((streamCache(iID))->value);
+        return true;
+      }
+
+      void streamEndLuminosityBlockSummary(edm::StreamID iID,
+                                           edm::LuminosityBlock const&,
+                                           edm::EventSetup const&,
+                                           UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->lumi == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamEndLuminosityBlockSummary after globalEndLuminosityBlockSummary in Stream " << iID.value();
+        }
+        auto sCache = streamCache(iID);
+        gCache->value += sCache->value;
+        sCache->value = 0;
+      }
+
+      void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                           edm::EventSetup const&,
+                                           UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->value != cvalue_) {
           throw cms::Exception("cache value")
-          << "RunIntFilter cache value "
-          << rCache->value << " but it was supposed to be " << cvalue_;
-      }
-     --(rCache->run);
-    }
-
-    ~RunIntFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "RunIntFilter transitions "     
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-
-  class LumiIntFilter : public edm::limited::EDFilter<edm::StreamCache<UnsafeCache>,edm::LuminosityBlockCache<Cache>> {
-  public:
-    explicit LumiIntFilter(edm::ParameterSet const& p) :
-    edm::limited::EDFilterBase(p),
-    edm::limited::EDFilter<edm::StreamCache<UnsafeCache>,edm::LuminosityBlockCache<Cache>>(p),
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {    
-    produces<unsigned int>();
-    }
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    
-    std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto lCache = std::make_shared<Cache>();
-      ++(lCache->lumi);  
-      return lCache;
-    }
-
-   std::unique_ptr<UnsafeCache> beginStream(edm::StreamID iID) const override {
-      return std::make_unique<UnsafeCache>();
-    }
-
-   void streamBeginLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      auto lCache = luminosityBlockCache(iLB.index()); 
-      if ( lCache->lumi == 0) {
-        throw cms::Exception("out of sequence")
-          << "streamBeginLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-       }
-   }
-
-
-    bool filter(edm::StreamID, edm::Event& iEvent, edm::EventSetup const&) const override {
-      ++m_count;
-      ++(luminosityBlockCache(iEvent.getLuminosityBlock().index())->value);
-      return true;
-    }
- 
-   void streamEndLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      auto lCache = luminosityBlockCache(iLB.index()); 
-      if ( lCache->lumi == 0) {
-        throw cms::Exception("out of sequence")
-          << "streamEndLuminosityBlock seen before globalEndLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-       }
-    }
- 
-    
-    void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      ++m_count;
-      auto lCache = luminosityBlockCache(iLB.index());
-      --(lCache->lumi); 
-      if ( lCache->lumi != 0 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-      }
-      if( lCache->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << "LumiIntFilter cache value "
-          << lCache->value << " but it was supposed to be " << cvalue_;
-      }
-    }
-
-    ~LumiIntFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "LumiIntFilter transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-  
-  class RunSummaryIntFilter : public edm::limited::EDFilter<edm::StreamCache<Cache>,edm::RunSummaryCache<UnsafeCache>> {
-  public:
-    explicit RunSummaryIntFilter(edm::ParameterSet const& p) :
-    edm::limited::EDFilterBase(p),
-    edm::limited::EDFilter<edm::StreamCache<Cache>,edm::RunSummaryCache<UnsafeCache>>(p),
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {
-    produces<unsigned int>();
-      
-    }
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-
-    std::unique_ptr<Cache> beginStream(edm::StreamID) const override {
-      ++m_count;
-      return std::make_unique<Cache>();
-    }
-    
-    std::shared_ptr<UnsafeCache> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto gCache = std::make_shared<UnsafeCache>();
-      ++(gCache->run);
-      return gCache;
-    }
-    
-    bool filter(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-      ++((streamCache(iID))->value);
-       
-      return true;
-    }
-    
-    void streamEndRunSummary(edm::StreamID iID, edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if ( gCache->run == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndRunSummary after globalEndRunSummary in Stream " << iID.value();
-      }      
-      auto sCache = streamCache(iID);
-      gCache->value += sCache->value;
-      sCache->value = 0;
-    }
-    
-    void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if( gCache->value  != cvalue_) {
-        throw cms::Exception("cache value")
-          << "RunSummaryIntFilter cache value "
-          << gCache->value << " but it was supposed to be " << cvalue_;
-      }
-      --(gCache->run);
-    }
-
-    ~RunSummaryIntFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "RunSummaryIntFilter transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class LumiSummaryIntFilter : public edm::limited::EDFilter<edm::StreamCache<Cache>,edm::LuminosityBlockSummaryCache<UnsafeCache>> {
-  public:
-    explicit LumiSummaryIntFilter(edm::ParameterSet const& p) :
-    edm::limited::EDFilterBase(p),
-    edm::limited::EDFilter<edm::StreamCache<Cache>,edm::LuminosityBlockSummaryCache<UnsafeCache>>(p),
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {	
-    produces<unsigned int>();
-      
-    }
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-
-    std::unique_ptr<Cache> beginStream(edm::StreamID) const override {
-      ++m_count;
-      return std::make_unique<Cache>();
-    }
-  
-    std::shared_ptr<UnsafeCache> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto gCache = std::make_shared<UnsafeCache>();
-      ++(gCache->lumi);
-      return gCache;
-    }
-
-    bool filter(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-      ++((streamCache(iID))->value);
-      return true;
-    }
-    
-    void streamEndLuminosityBlockSummary(edm::StreamID iID, edm::LuminosityBlock const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if ( gCache->lumi == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndLuminosityBlockSummary after globalEndLuminosityBlockSummary in Stream " << iID.value();
-      }
-      auto sCache = streamCache(iID);
-      gCache->value += sCache->value;
-      sCache->value = 0;
-    }
-    
-    void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if( gCache->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << "LumiSummaryIntFilter cache value "
-          << gCache->value << " but it was supposed to be " << cvalue_;
-      }
-      --(gCache->lumi);
-    }
-
-    ~LumiSummaryIntFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "LumiSummaryIntFilter transitions "     
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestBeginRunFilter : public edm::limited::EDFilter<edm::RunCache<Dummy>,edm::BeginRunProducer> {
-  public:
-    explicit TestBeginRunFilter(edm::ParameterSet const& p) :
-    edm::limited::EDFilterBase(p),
-    edm::limited::EDFilter<edm::RunCache<Dummy>,edm::BeginRunProducer>(p),
-	trans_(p.getParameter<int>("transitions")) {
-    produces<unsigned int>();
-    produces<unsigned int, edm::Transition::BeginRun>("a");
-    }
-
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    mutable std::atomic<bool> brp{false}; 
-
-    std::shared_ptr<Dummy> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-      brp = false;
-      return std::shared_ptr<Dummy>();
-    }
- 
-    void globalBeginRunProduce(edm::Run&, edm::EventSetup const&) const override {
-      ++m_count;
-      brp = true;
-     }
-
-    bool filter(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      if ( !brp ) {
-        throw cms::Exception("out of sequence")
-          << "filter before globalBeginRunProduce in Stream " << iID.value();
-      }
-      return true;
-    }
-
-    void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-    }
-
-    ~TestBeginRunFilter() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestBeginRunFilter transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestEndRunFilter : public edm::limited::EDFilter<edm::RunCache<Dummy>,edm::EndRunProducer> {
-  public:
-    explicit TestEndRunFilter(edm::ParameterSet const& p) :
-    edm::limited::EDFilterBase(p),
-    edm::limited::EDFilter<edm::RunCache<Dummy>,edm::EndRunProducer>(p),
-	trans_(p.getParameter<int>("transitions")) {
-    produces<unsigned int>();
-    produces<unsigned int, edm::Transition::EndRun>("a");
-    }
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    mutable std::atomic<bool> p{false}; 
-
-    std::shared_ptr<Dummy> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-      p = false;
-      return std::shared_ptr<Dummy>();
-    }
-
-
-    bool filter(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      p = true;
-      return true;
-    }
-
-    void globalEndRunProduce(edm::Run&, edm::EventSetup const&) const override {
-      if ( !p ) {
-        throw cms::Exception("out of sequence")
-          << "endRunProduce before produce";
-      }
-       ++m_count;
-    }
-
-    void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-    }
-
-    ~TestEndRunFilter() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestEndRunFilter transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestBeginLumiBlockFilter : public edm::limited::EDFilter<edm::LuminosityBlockCache<Dummy>,edm::BeginLuminosityBlockProducer> {
-  public:
-    explicit TestBeginLumiBlockFilter(edm::ParameterSet const& p) :
-    edm::limited::EDFilterBase(p),
-    edm::limited::EDFilter<edm::LuminosityBlockCache<Dummy>,edm::BeginLuminosityBlockProducer>(p),
-	trans_(p.getParameter<int>("transitions")) {
-    produces<unsigned int>();
-    produces<unsigned int, edm::Transition::BeginLuminosityBlock>("a");
-    }
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    mutable std::atomic<bool> gblp{false}; 
-
-    std::shared_ptr<Dummy> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      gblp = false;
-      return std::shared_ptr<Dummy>();
-    }
-
-
-    void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
-      ++m_count;
-      gblp = true;
-    }
-
-    bool filter(edm::StreamID iID, edm::Event&, const edm::EventSetup&) const override{
-      if ( !gblp ) {
-        throw cms::Exception("out of sequence")
-          << "filter before globalBeginLuminosityBlockProduce in Stream " << iID.value();
-      }
-      return true;
-    }
-
-    void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-    }
-
-    ~TestBeginLumiBlockFilter() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestBeginLumiBlockFilter transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestEndLumiBlockFilter : public edm::limited::EDFilter<edm::LuminosityBlockCache<Dummy>,edm::EndLuminosityBlockProducer> {
-  public:
-    explicit TestEndLumiBlockFilter(edm::ParameterSet const& p) :
-    edm::limited::EDFilterBase(p),
-    edm::limited::EDFilter<edm::LuminosityBlockCache<Dummy>,edm::EndLuminosityBlockProducer>(p),
-	trans_(p.getParameter<int>("transitions")) {
-    produces<unsigned int>();
-    produces<unsigned int, edm::Transition::EndLuminosityBlock>("a");
-    }
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    mutable std::atomic<bool> p{false}; 
-
-    std::shared_ptr<Dummy> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      p = false;
-      return std::shared_ptr<Dummy>();
-    }
-
-
-    bool filter(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
-      p = true;
-      return true;
-    }
-
-    void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
-      if ( !p ) {
-        throw cms::Exception("out of sequence")
-          << "endLumiBlockProduce before produce";
-      }
-      ++m_count;
-    }
-
-    void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-    }
-
-    ~TestEndLumiBlockFilter() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestEndLumiBlockFilter transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-
-}
-}
+              << "LumiSummaryIntFilter cache value " << gCache->value << " but it was supposed to be " << cvalue_;
+        }
+        --(gCache->lumi);
+      }
+
+      ~LumiSummaryIntFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "LumiSummaryIntFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestBeginRunFilter : public edm::limited::EDFilter<edm::RunCache<Dummy>, edm::BeginRunProducer> {
+    public:
+      explicit TestBeginRunFilter(edm::ParameterSet const& p)
+          : edm::limited::EDFilterBase(p),
+            edm::limited::EDFilter<edm::RunCache<Dummy>, edm::BeginRunProducer>(p),
+            trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::BeginRun>("a");
+      }
+
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+      mutable std::atomic<bool> brp{false};
+
+      std::shared_ptr<Dummy> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
+        brp = false;
+        return std::shared_ptr<Dummy>();
+      }
+
+      void globalBeginRunProduce(edm::Run&, edm::EventSetup const&) const override {
+        ++m_count;
+        brp = true;
+      }
+
+      bool filter(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
+        if (!brp) {
+          throw cms::Exception("out of sequence") << "filter before globalBeginRunProduce in Stream " << iID.value();
+        }
+        return true;
+      }
+
+      void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {}
+
+      ~TestBeginRunFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestBeginRunFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestEndRunFilter : public edm::limited::EDFilter<edm::RunCache<Dummy>, edm::EndRunProducer> {
+    public:
+      explicit TestEndRunFilter(edm::ParameterSet const& p)
+          : edm::limited::EDFilterBase(p),
+            edm::limited::EDFilter<edm::RunCache<Dummy>, edm::EndRunProducer>(p),
+            trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::EndRun>("a");
+      }
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+      mutable std::atomic<bool> p{false};
+
+      std::shared_ptr<Dummy> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
+        p = false;
+        return std::shared_ptr<Dummy>();
+      }
+
+      bool filter(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
+        p = true;
+        return true;
+      }
+
+      void globalEndRunProduce(edm::Run&, edm::EventSetup const&) const override {
+        if (!p) {
+          throw cms::Exception("out of sequence") << "endRunProduce before produce";
+        }
+        ++m_count;
+      }
+
+      void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {}
+
+      ~TestEndRunFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestEndRunFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestBeginLumiBlockFilter
+        : public edm::limited::EDFilter<edm::LuminosityBlockCache<Dummy>, edm::BeginLuminosityBlockProducer> {
+    public:
+      explicit TestBeginLumiBlockFilter(edm::ParameterSet const& p)
+          : edm::limited::EDFilterBase(p),
+            edm::limited::EDFilter<edm::LuminosityBlockCache<Dummy>, edm::BeginLuminosityBlockProducer>(p),
+            trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::BeginLuminosityBlock>("a");
+      }
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+      mutable std::atomic<bool> gblp{false};
+
+      std::shared_ptr<Dummy> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                        edm::EventSetup const&) const override {
+        gblp = false;
+        return std::shared_ptr<Dummy>();
+      }
+
+      void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
+        ++m_count;
+        gblp = true;
+      }
+
+      bool filter(edm::StreamID iID, edm::Event&, const edm::EventSetup&) const override {
+        if (!gblp) {
+          throw cms::Exception("out of sequence")
+              << "filter before globalBeginLuminosityBlockProduce in Stream " << iID.value();
+        }
+        return true;
+      }
+
+      void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {}
+
+      ~TestBeginLumiBlockFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestBeginLumiBlockFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestEndLumiBlockFilter
+        : public edm::limited::EDFilter<edm::LuminosityBlockCache<Dummy>, edm::EndLuminosityBlockProducer> {
+    public:
+      explicit TestEndLumiBlockFilter(edm::ParameterSet const& p)
+          : edm::limited::EDFilterBase(p),
+            edm::limited::EDFilter<edm::LuminosityBlockCache<Dummy>, edm::EndLuminosityBlockProducer>(p),
+            trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::EndLuminosityBlock>("a");
+      }
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+      mutable std::atomic<bool> p{false};
+
+      std::shared_ptr<Dummy> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                        edm::EventSetup const&) const override {
+        p = false;
+        return std::shared_ptr<Dummy>();
+      }
+
+      bool filter(edm::StreamID, edm::Event&, edm::EventSetup const&) const override {
+        p = true;
+        return true;
+      }
+
+      void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
+        if (!p) {
+          throw cms::Exception("out of sequence") << "endLumiBlockProduce before produce";
+        }
+        ++m_count;
+      }
+
+      void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {}
+
+      ~TestEndLumiBlockFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestEndLumiBlockFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+  }  // namespace limited
+}  // namespace edmtest
 
 DEFINE_FWK_MODULE(edmtest::limited::StreamIntFilter);
 DEFINE_FWK_MODULE(edmtest::limited::RunIntFilter);
@@ -633,4 +608,3 @@ DEFINE_FWK_MODULE(edmtest::limited::TestBeginRunFilter);
 DEFINE_FWK_MODULE(edmtest::limited::TestBeginLumiBlockFilter);
 DEFINE_FWK_MODULE(edmtest::limited::TestEndRunFilter);
 DEFINE_FWK_MODULE(edmtest::limited::TestEndLumiBlockFilter);
-
diff --git a/FWCore/Framework/test/stubs/TestLimitedProducers.cc b/FWCore/Framework/test/stubs/TestLimitedProducers.cc
index 4aab19281493b..328ab8defef11 100644
--- a/FWCore/Framework/test/stubs/TestLimitedProducers.cc
+++ b/FWCore/Framework/test/stubs/TestLimitedProducers.cc
@@ -24,600 +24,561 @@ for testing purposes only.
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 
+namespace edmtest {
+  namespace limited {
+
+    namespace {
+      struct Cache {
+        Cache() : value(0), run(0), lumi(0), strm(0), work(0) {}
+        //Using mutable since we want to update the value.
+        mutable std::atomic<unsigned int> value;
+        mutable std::atomic<unsigned int> run;
+        mutable std::atomic<unsigned int> lumi;
+        mutable std::atomic<unsigned int> strm;
+        mutable std::atomic<unsigned int> work;
+      };
+
+      struct UnsafeCache {
+        UnsafeCache() : value(0), run(0), lumi(0), strm(0), work(0) {}
+        unsigned int value;
+        unsigned int run;
+        unsigned int lumi;
+        unsigned int strm;
+        unsigned int work;
+      };
+
+      struct Dummy {};
+
+    }  //end anonymous namespace
+
+    class StreamIntProducer : public edm::limited::EDProducer<edm::StreamCache<UnsafeCache>> {
+    public:
+      explicit StreamIntProducer(edm::ParameterSet const& p)
+          : edm::limited::EDProducerBase(p),
+            edm::limited::EDProducer<edm::StreamCache<UnsafeCache>>(p),
+            trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+      }
 
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
 
-namespace edmtest {
-namespace limited {
-
-namespace {
-struct Cache { 
-   Cache():value(0),run(0),lumi(0),strm(0),work(0) {}
-   //Using mutable since we want to update the value.
-   mutable std::atomic<unsigned int> value;
-   mutable std::atomic<unsigned int> run;
-   mutable std::atomic<unsigned int> lumi;
-   mutable std::atomic<unsigned int> strm;
-   mutable std::atomic<unsigned int> work;
-};
-
-struct UnsafeCache {
-   UnsafeCache():value(0),run(0),lumi(0),strm(0),work(0) {}
-   unsigned int value;
-   unsigned int run;
-   unsigned int lumi;
-   unsigned int strm;
-   unsigned int work;
-};
-
-struct Dummy {
-};
-
-} //end anonymous namespace
-
-  class StreamIntProducer : public edm::limited::EDProducer<edm::StreamCache<UnsafeCache>> {
-  public:
-    explicit StreamIntProducer(edm::ParameterSet const& p) :
-    edm::limited::EDProducerBase(p),
-    edm::limited::EDProducer<edm::StreamCache<UnsafeCache>>(p),
-	trans_(p.getParameter<int>("transitions")) 
-    {
-    produces<unsigned int>();
-    }
-
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-
-   std::unique_ptr<UnsafeCache> beginStream(edm::StreamID iID) const override {
-      ++m_count;
-      auto sCache = std::make_unique<UnsafeCache>();
-      ++(sCache->strm);
-      sCache->value = iID.value();
-      return sCache;
-    }
-    
-    void streamBeginRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const  override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      if ( sCache->value != iID.value() ) {
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID iID) const override {
+        ++m_count;
+        auto sCache = std::make_unique<UnsafeCache>();
+        ++(sCache->strm);
+        sCache->value = iID.value();
+        return sCache;
+      }
+
+      void streamBeginRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        if (sCache->value != iID.value()) {
+          throw cms::Exception("cache value")
+              << "StreamIntAnalyzer cache value " << (streamCache(iID))->value << " but it was supposed to be " << iID;
+        }
+        if (sCache->run != 0 || sCache->lumi != 0 || sCache->work != 0 || sCache->strm != 1) {
+          throw cms::Exception("out of sequence") << "streamBeginRun out of sequence in Stream " << iID.value();
+        }
+        ++(sCache->run);
+      }
+
+      void streamBeginLuminosityBlock(edm::StreamID iID,
+                                      edm::LuminosityBlock const&,
+                                      edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        if (sCache->lumi != 0 || sCache->work != 0) {
+          throw cms::Exception("out of sequence")
+              << "streamBeginLuminosityBlock out of sequence in Stream " << iID.value();
+        }
+        ++(sCache->lumi);
+      }
+
+      void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        ++(sCache->work);
+        if (sCache->lumi == 0 && sCache->run == 0) {
+          throw cms::Exception("out of sequence") << "produce out of sequence in Stream " << iID.value();
+        }
+      }
+
+      void streamEndLuminosityBlock(edm::StreamID iID,
+                                    edm::LuminosityBlock const&,
+                                    edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        --(sCache->lumi);
+        sCache->work = 0;
+        if (sCache->lumi != 0 || sCache->run == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamEndLuminosityBlock out of sequence in Stream " << iID.value();
+        }
+      }
+
+      void streamEndRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        --(sCache->run);
+        sCache->work = 0;
+        if (sCache->run != 0 || sCache->lumi != 0) {
+          throw cms::Exception("out of sequence") << "streamEndRun out of sequence in Stream " << iID.value();
+        }
+      }
+
+      void endStream(edm::StreamID iID) const override {
+        ++m_count;
+        auto sCache = streamCache(iID);
+        --(sCache->strm);
+        if (sCache->strm != 0 || sCache->run != 0 || sCache->lumi != 0) {
+          throw cms::Exception("out of sequence") << "endStream out of sequence in Stream " << iID.value();
+        }
+      }
+
+      ~StreamIntProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "StreamIntProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class RunIntProducer : public edm::limited::EDProducer<edm::StreamCache<UnsafeCache>, edm::RunCache<Cache>> {
+    public:
+      explicit RunIntProducer(edm::ParameterSet const& p)
+          : edm::limited::EDProducerBase(p),
+            edm::limited::EDProducer<edm::StreamCache<UnsafeCache>, edm::RunCache<Cache>>(p),
+            trans_(p.getParameter<int>("transitions")),
+            cvalue_(p.getParameter<int>("cachevalue")) {
+        produces<unsigned int>();
+      }
+
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
+        ++m_count;
+        auto rCache = std::make_shared<Cache>();
+        ++(rCache->run);
+        return rCache;
+      }
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override { return std::make_unique<UnsafeCache>(); }
+
+      void streamBeginRun(edm::StreamID iID, edm::Run const& iRun, edm::EventSetup const&) const override {
+        auto rCache = runCache(iRun.index());
+        if (rCache->run == 0) {
+          throw cms::Exception("out of sequence") << "streamBeginRun before globalBeginRun in Stream " << iID.value();
+        }
+      }
+
+      void produce(edm::StreamID iID, edm::Event& iEvent, edm::EventSetup const&) const override {
+        auto rCache = runCache(iEvent.getRun().index());
+        ++(rCache->value);
+      }
+
+      void streamEndRun(edm::StreamID iID, edm::Run const& iRun, edm::EventSetup const&) const override {
+        auto rCache = runCache(iRun.index());
+        if (rCache->run == 0) {
+          throw cms::Exception("out of sequence") << "streamEndRun after globalEndRun in Stream " << iID.value();
+        }
+      }
+
+      void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
+        ++m_count;
+        auto rCache = runCache(iRun.index());
+        if (rCache->value != cvalue_) {
+          throw cms::Exception("cache value")
+              << "RunIntProducer cache value " << rCache->value << " but it was supposed to be " << cvalue_;
+        }
+        --(rCache->run);
+      }
+
+      ~RunIntProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "RunIntProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiIntProducer
+        : public edm::limited::EDProducer<edm::StreamCache<UnsafeCache>, edm::LuminosityBlockCache<Cache>> {
+    public:
+      explicit LumiIntProducer(edm::ParameterSet const& p)
+          : edm::limited::EDProducerBase(p),
+            edm::limited::EDProducer<edm::StreamCache<UnsafeCache>, edm::LuminosityBlockCache<Cache>>(p),
+            trans_(p.getParameter<int>("transitions")),
+            cvalue_(p.getParameter<int>("cachevalue")) {
+        produces<unsigned int>();
+      }
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                        edm::EventSetup const&) const override {
+        ++m_count;
+        auto lCache = std::make_shared<Cache>();
+        ++(lCache->lumi);
+        return lCache;
+      }
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override { return std::make_unique<UnsafeCache>(); }
+
+      void streamBeginLuminosityBlock(edm::StreamID iID,
+                                      edm::LuminosityBlock const& iLB,
+                                      edm::EventSetup const&) const override {
+        auto lCache = luminosityBlockCache(iLB.index());
+        if (lCache->lumi == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamBeginLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+      }
+
+      void produce(edm::StreamID, edm::Event& iEvent, edm::EventSetup const&) const override {
+        auto lCache = luminosityBlockCache(iEvent.getLuminosityBlock().index());
+        ++(lCache->value);
+      }
+
+      void streamEndLuminosityBlock(edm::StreamID iID,
+                                    edm::LuminosityBlock const& iLB,
+                                    edm::EventSetup const&) const override {
+        auto lCache = luminosityBlockCache(iLB.index());
+        if (lCache->lumi == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamEndLuminosityBlock seen before globalEndLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+      }
+
+      void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
+        ++m_count;
+        auto lCache = luminosityBlockCache(iLB.index());
+        --(lCache->lumi);
+        if (lCache->lumi != 0) {
+          throw cms::Exception("end out of sequence")
+              << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+        if (lCache->value != cvalue_) {
+          throw cms::Exception("cache value")
+              << "LumiIntProducer cache value " << lCache->value << " but it was supposed to be " << cvalue_;
+        }
+      }
+
+      ~LumiIntProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "LumiIntProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class RunSummaryIntProducer
+        : public edm::limited::EDProducer<edm::StreamCache<UnsafeCache>, edm::RunSummaryCache<UnsafeCache>> {
+    public:
+      explicit RunSummaryIntProducer(edm::ParameterSet const& p)
+          : edm::limited::EDProducerBase(p),
+            edm::limited::EDProducer<edm::StreamCache<UnsafeCache>, edm::RunSummaryCache<UnsafeCache>>(p),
+            trans_(p.getParameter<int>("transitions")),
+            cvalue_(p.getParameter<int>("cachevalue")) {
+        produces<unsigned int>();
+      }
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override { return std::make_unique<UnsafeCache>(); }
+
+      std::shared_ptr<UnsafeCache> globalBeginRunSummary(edm::Run const& iRun, edm::EventSetup const&) const override {
+        ++m_count;
+        auto gCache = std::make_shared<UnsafeCache>();
+        ++(gCache->run);
+        return gCache;
+      }
+
+      void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
+        auto sCache = streamCache(iID);
+        ++(sCache->value);
+      }
+
+      void streamEndRunSummary(edm::StreamID iID,
+                               edm::Run const&,
+                               edm::EventSetup const&,
+                               UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->run == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamEndRunSummary after globalEndRunSummary in Stream " << iID.value();
+        }
+        auto sCache = streamCache(iID);
+        gCache->value += sCache->value;
+        sCache->value = 0;
+      }
+
+      void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->value != cvalue_) {
           throw cms::Exception("cache value")
-          << "StreamIntAnalyzer cache value "
-          << (streamCache(iID))->value << " but it was supposed to be " << iID;
-      }
-      if ( sCache->run != 0 || sCache->lumi !=0 || sCache->work !=0 || sCache->strm !=1 ) {
-        throw cms::Exception("out of sequence")
-          << "streamBeginRun out of sequence in Stream " << iID.value();
-      }      
-      ++(sCache->run);
-    }
-
-    void streamBeginLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      if ( sCache->lumi != 0 || sCache->work != 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamBeginLuminosityBlock out of sequence in Stream " << iID.value();
-      }      
-       ++(sCache->lumi);
-    }
-
-    void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      ++(sCache->work);
-      if ( sCache->lumi == 0 && sCache->run == 0) {
-        throw cms::Exception("out of sequence")
-          << "produce out of sequence in Stream " << iID.value();
-      }       
-       
-    }
-    
- 
-    void streamEndLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      --(sCache->lumi);
-      sCache->work = 0;
-      if ( sCache->lumi != 0 || sCache->run == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndLuminosityBlock out of sequence in Stream " << iID.value();
-      }      
-     }
-
-    void streamEndRun(edm::StreamID iID, edm::Run const&, edm::EventSetup const&) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      --(sCache->run);
-      sCache->work = 0;
-      if ( sCache->run != 0 || sCache->lumi != 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndRun out of sequence in Stream " << iID.value();
-      }      
-     }
-
-    void endStream(edm::StreamID iID) const override {
-      ++m_count;
-      auto sCache = streamCache(iID);
-      --(sCache->strm);
-      if ( sCache->strm != 0 || sCache->run != 0 || sCache->lumi != 0 ) {
-        throw cms::Exception("out of sequence")
-          << "endStream out of sequence in Stream " << iID.value();
-      }      
-    }
-
-    ~StreamIntProducer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "StreamIntProducer transitions " 
-          << m_count << " but it was supposed to be " << trans_;
-      }
-    }
-  };
-  
-  class RunIntProducer : public edm::limited::EDProducer<edm::StreamCache<UnsafeCache>,edm::RunCache<Cache>> {
-  public:
-    explicit RunIntProducer(edm::ParameterSet const& p) :
-    edm::limited::EDProducerBase(p),
-    edm::limited::EDProducer<edm::StreamCache<UnsafeCache>,edm::RunCache<Cache>>(p),
-	trans_(p.getParameter<int>("transitions"))
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {
-    produces<unsigned int>();
-    }
-
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-
-    std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-      ++m_count;
-      auto rCache = std::make_shared<Cache>();
-      ++(rCache->run);
-      return rCache;
-    }
-
-    std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override {
-      return std::make_unique<UnsafeCache>();
-    }
-    
-    void streamBeginRun(edm::StreamID iID, edm::Run const& iRun, edm::EventSetup const&) const  override {
-      auto rCache = runCache(iRun.index());
-      if ( rCache->run == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamBeginRun before globalBeginRun in Stream " << iID.value();
-      }      
-    }
-
-
-    void produce(edm::StreamID iID, edm::Event& iEvent, edm::EventSetup const&) const override {
-      auto rCache = runCache(iEvent.getRun().index());
-      ++(rCache->value);
-       
-    }
-
-    void streamEndRun(edm::StreamID iID, edm::Run const& iRun, edm::EventSetup const&) const override {
-      auto rCache = runCache(iRun.index());
-      if ( rCache->run == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndRun after globalEndRun in Stream " << iID.value();
-      }      
-    }
-
-    void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-      ++m_count;
-      auto rCache = runCache(iRun.index());
-      if ( rCache->value != cvalue_ ) {
+              << "RunSummaryIntProducer cache value " << gCache->value << " but it was supposed to be " << cvalue_;
+        }
+        --(gCache->run);
+      }
+
+      ~RunSummaryIntProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "RunSummaryIntProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiSummaryIntProducer
+        : public edm::limited::EDProducer<edm::StreamCache<UnsafeCache>, edm::LuminosityBlockSummaryCache<UnsafeCache>> {
+    public:
+      explicit LumiSummaryIntProducer(edm::ParameterSet const& p)
+          : edm::limited::EDProducerBase(p),
+            edm::limited::EDProducer<edm::StreamCache<UnsafeCache>, edm::LuminosityBlockSummaryCache<UnsafeCache>>(p),
+            trans_(p.getParameter<int>("transitions")),
+            cvalue_(p.getParameter<int>("cachevalue")) {
+        produces<unsigned int>();
+      }
+      const unsigned int trans_;
+      const unsigned int cvalue_;
+      mutable std::atomic<unsigned int> m_count{0};
+
+      std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override { return std::make_unique<UnsafeCache>(); }
+
+      std::shared_ptr<UnsafeCache> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const& iLB,
+                                                                     edm::EventSetup const&) const override {
+        ++m_count;
+        auto gCache = std::make_shared<UnsafeCache>();
+        ++(gCache->lumi);
+        return gCache;
+      }
+
+      void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
+        auto sCache = streamCache(iID);
+        ++(sCache->value);
+      }
+
+      void streamEndLuminosityBlockSummary(edm::StreamID iID,
+                                           edm::LuminosityBlock const&,
+                                           edm::EventSetup const&,
+                                           UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->lumi == 0) {
+          throw cms::Exception("out of sequence")
+              << "streamEndLuminosityBlockSummary after globalEndLuminosityBlockSummary in Stream " << iID.value();
+        }
+        auto sCache = streamCache(iID);
+        gCache->value += sCache->value;
+        sCache->value = 0;
+      }
+
+      void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                           edm::EventSetup const&,
+                                           UnsafeCache* gCache) const override {
+        ++m_count;
+        if (gCache->value != cvalue_) {
           throw cms::Exception("cache value")
-          << "RunIntProducer cache value "
-          << rCache->value << " but it was supposed to be " << cvalue_;
-      }
-     --(rCache->run);
-    }
-
-
-    ~RunIntProducer() {
-       if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "RunIntProducer transitions " 
-          << m_count << " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-
-  class LumiIntProducer : public edm::limited::EDProducer<edm::StreamCache<UnsafeCache>,edm::LuminosityBlockCache<Cache>> {
-  public:
-    explicit LumiIntProducer(edm::ParameterSet const& p) :
-    edm::limited::EDProducerBase(p),
-    edm::limited::EDProducer<edm::StreamCache<UnsafeCache>,edm::LuminosityBlockCache<Cache>>(p),
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {
-    produces<unsigned int>();
-    }
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    
-    std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      ++m_count;
-      auto lCache = std::make_shared<Cache>();
-      ++(lCache->lumi);  
-      return lCache;
-    }
-
-   std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override {
-      return std::make_unique<UnsafeCache>();
-    }
-
-    void streamBeginLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      auto lCache = luminosityBlockCache(iLB.index()); 
-      if ( lCache->lumi == 0) {
-        throw cms::Exception("out of sequence")
-          << "streamBeginLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-       }
-   }
-
-
-    void produce(edm::StreamID, edm::Event& iEvent, edm::EventSetup const&) const override {
-      auto lCache = luminosityBlockCache(iEvent.getLuminosityBlock().index());
-      ++(lCache->value);
-       
-    }
-
-    void streamEndLuminosityBlock(edm::StreamID iID, edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      auto lCache = luminosityBlockCache(iLB.index()); 
-      if ( lCache->lumi == 0) {
-        throw cms::Exception("out of sequence")
-          << "streamEndLuminosityBlock seen before globalEndLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-       }
-    }
-  
-    void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      ++m_count;
-      auto lCache = luminosityBlockCache(iLB.index());
-      --(lCache->lumi); 
-      if ( lCache->lumi != 0 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-      }
-      if( lCache->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << "LumiIntProducer cache value "
-          << lCache->value << " but it was supposed to be " << cvalue_;
-      }
-     }
-
-
-    ~LumiIntProducer() {
-       if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "LumiIntProducer transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-       }
-    }
-  };
-  
-  class RunSummaryIntProducer : public edm::limited::EDProducer<edm::StreamCache<UnsafeCache>,edm::RunSummaryCache<UnsafeCache>> {
-  public:
-    explicit RunSummaryIntProducer(edm::ParameterSet const& p) :
-    edm::limited::EDProducerBase(p),
-    edm::limited::EDProducer<edm::StreamCache<UnsafeCache>,edm::RunSummaryCache<UnsafeCache>>(p),
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {
-    produces<unsigned int>();
-      
-    }
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-   
-    std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override {
-      return std::make_unique<UnsafeCache>();
-    }
-
-    std::shared_ptr<UnsafeCache> globalBeginRunSummary(edm::Run const& iRun, edm::EventSetup const&) const override {
-      ++m_count;
-      auto gCache = std::make_shared<UnsafeCache>();
-      ++(gCache->run);
-      return gCache;
-    }
-
-    void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      auto sCache = streamCache(iID);
-      ++(sCache->value);
-       
-    }
-     
-    void streamEndRunSummary(edm::StreamID iID, edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if ( gCache->run == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndRunSummary after globalEndRunSummary in Stream " << iID.value();
-      }      
-      auto sCache = streamCache(iID);
-      gCache->value += sCache->value;
-      sCache->value = 0;
-    }
-    
-    void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if( gCache->value  != cvalue_) {
-        throw cms::Exception("cache value")
-          << "RunSummaryIntProducer cache value "
-          << gCache->value << " but it was supposed to be " << cvalue_;
-      }
-      --(gCache->run);
-    }
-
-
-    ~RunSummaryIntProducer() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "RunSummaryIntProducer transitions "
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class LumiSummaryIntProducer : public edm::limited::EDProducer<edm::StreamCache<UnsafeCache>,edm::LuminosityBlockSummaryCache<UnsafeCache>> {
-  public:
-    explicit LumiSummaryIntProducer(edm::ParameterSet const& p) :
-    edm::limited::EDProducerBase(p),
-    edm::limited::EDProducer<edm::StreamCache<UnsafeCache>,edm::LuminosityBlockSummaryCache<UnsafeCache>>(p),
-	trans_(p.getParameter<int>("transitions")) 
-        ,cvalue_(p.getParameter<int>("cachevalue")) 
-    {	
-    produces<unsigned int>();
-      
-    }
-    const unsigned int trans_; 
-    const unsigned int cvalue_; 
-    mutable std::atomic<unsigned int> m_count{0};
-  
-    std::unique_ptr<UnsafeCache> beginStream(edm::StreamID) const override {
-      return std::make_unique<UnsafeCache>();
-    }
-
-    std::shared_ptr<UnsafeCache> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      ++m_count;
-      auto gCache = std::make_shared<UnsafeCache>();
-      ++(gCache->lumi);
-       return gCache;
-    }
-
-    void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      auto sCache = streamCache(iID);
-      ++(sCache->value);
-       
-    }
-      
-    void streamEndLuminosityBlockSummary(edm::StreamID iID, edm::LuminosityBlock const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if ( gCache->lumi == 0 ) {
-        throw cms::Exception("out of sequence")
-          << "streamEndLuminosityBlockSummary after globalEndLuminosityBlockSummary in Stream " << iID.value();
-      }
-      auto sCache = streamCache(iID);
-      gCache->value += sCache->value;
-      sCache->value = 0;
-    }
-    
-    void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_count;
-      if( gCache->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << "LumiSummaryIntProducer cache value "
-          << gCache->value << " but it was supposed to be " << cvalue_;
-      }
-      --(gCache->lumi);
-    }
-
-    ~LumiSummaryIntProducer() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "LumiSummaryIntProducer transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestBeginRunProducer : public edm::limited::EDProducer<edm::RunCache<Dummy>,edm::BeginRunProducer> {
-  public:
-    explicit TestBeginRunProducer(edm::ParameterSet const& p) :
-    edm::limited::EDProducerBase(p),
-    edm::limited::EDProducer<edm::RunCache<Dummy>,edm::BeginRunProducer>(p),
-	trans_(p.getParameter<int>("transitions")) {	
-    produces<unsigned int>();
-    produces<unsigned int, edm::Transition::BeginRun>("a");
-    }
-
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    mutable std::atomic<bool> brp{false}; 
- 
-    std::shared_ptr<Dummy> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-      brp = false;
-      return std::shared_ptr<Dummy>();
-    }
-
-    void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      if (!brp) {
-        throw cms::Exception("out of sequence")
-          << "produce before globalBeginRunProduce in Stream " << iID.value();      }
-    }
-
-    void globalBeginRunProduce(edm::Run&, edm::EventSetup const&) const override {
-      ++m_count;
-      brp = true;
-    }
-
-    void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-    }
-
-    ~TestBeginRunProducer() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestBeginRunProducer transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-
-  };
-
-  class TestEndRunProducer : public edm::limited::EDProducer<edm::RunCache<Dummy>,edm::EndRunProducer> {
-  public:
-    explicit TestEndRunProducer(edm::ParameterSet const& p) :
-    edm::limited::EDProducerBase(p),
-    edm::limited::EDProducer<edm::RunCache<Dummy>,edm::EndRunProducer>(p),
-	trans_(p.getParameter<int>("transitions")) {	
-    produces<unsigned int>();
-    produces<unsigned int, edm::Transition::EndRun>("a");
-    }
-    const unsigned int trans_;
-    mutable std::atomic<unsigned int> m_count{0};
-    mutable std::atomic<bool> p{false}; 
-
-    std::shared_ptr<Dummy> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-      p = false;
-      return std::shared_ptr<Dummy>();
-    }
-
-    void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      p = true;
-    }
-
-    void globalEndRunProduce(edm::Run&, edm::EventSetup const&) const override {
-      if ( !p ) {
-        throw cms::Exception("out of sequence")
-          << "endRunProduce before produce";
-      }
-      ++m_count;
-    }
-
-    void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {
-    }
-
-    ~TestEndRunProducer() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestEndRunProducer transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestBeginLumiBlockProducer : public edm::limited::EDProducer<edm::LuminosityBlockCache<void>,edm::BeginLuminosityBlockProducer> {
-  public:
-    explicit TestBeginLumiBlockProducer(edm::ParameterSet const& p) :
-    edm::limited::EDProducerBase(p),
-    edm::limited::EDProducer<edm::LuminosityBlockCache<void>,edm::BeginLuminosityBlockProducer>(p),
-	trans_(p.getParameter<int>("transitions")) {	
-    produces<unsigned int>();
-    produces<unsigned int, edm::Transition::BeginLuminosityBlock>("a");
-    }
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    mutable std::atomic<bool> gblp{false}; 
-
-    std::shared_ptr<void> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      gblp = false;
-      return std::shared_ptr<void>();
-    }
-
-    void produce(edm::StreamID iID, edm::Event&, const edm::EventSetup&) const override{
-      if ( !gblp ) {
-        throw cms::Exception("out of sequence")
-          << "produce before globalBeginLuminosityBlockProduce in Stream " << iID.value();
-      }
-    }
-
-    void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
-      ++m_count;
-      gblp = true;
-    }
-
-    void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-    }
-
-    ~TestBeginLumiBlockProducer() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestBeginLumiBlockProducer transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestEndLumiBlockProducer : public edm::limited::EDProducer<edm::LuminosityBlockCache<void>,edm::EndLuminosityBlockProducer> {
-  public:
-    explicit TestEndLumiBlockProducer(edm::ParameterSet const& p) :
-    edm::limited::EDProducerBase(p),
-    edm::limited::EDProducer<edm::LuminosityBlockCache<void>,edm::EndLuminosityBlockProducer>(p),
-	trans_(p.getParameter<int>("transitions")) {	
-    produces<unsigned int>();
-    produces<unsigned int, edm::Transition::EndLuminosityBlock>("a");
-    }
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    mutable std::atomic<bool> p{false}; 
-
-    std::shared_ptr<void> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-      p = false;
-      return std::shared_ptr<void>();
-    }
-
-
-    void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
-      p = true;    
-    }
-
-    void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
-      if ( !p ) {
-        throw cms::Exception("out of sequence")
-          << "endLumiBlockProduce before produce";
-      }
-      ++m_count;
-    }
-
-    void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {
-    }
-
-    ~TestEndLumiBlockProducer() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestEndLumiBlockProducer transitions "
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestAccumulator : public edm::limited::EDProducer<edm::Accumulator> {
-  public:
-
-    explicit TestAccumulator(edm::ParameterSet const& p) :
-      edm::limited::EDProducerBase(p),
-      edm::limited::EDProducer<edm::Accumulator>(p),
-      m_expectedCount(p.getParameter<unsigned int>("expectedCount")) {
-    }
-
-    void accumulate(edm::StreamID iID, edm::Event const&, edm::EventSetup const&) const override {
-      ++m_count;
-    }
-
-    ~TestAccumulator() {
-      if (m_count.load() != m_expectedCount) {
-        throw cms::Exception("TestCount")
-          << "TestAccumulator counter was "
-          << m_count << " but it was supposed to be " << m_expectedCount;
-      }
-    }
-
-    mutable std::atomic<unsigned int> m_count{0};
-    const unsigned int m_expectedCount;
-  };
-}
-}
+              << "LumiSummaryIntProducer cache value " << gCache->value << " but it was supposed to be " << cvalue_;
+        }
+        --(gCache->lumi);
+      }
+
+      ~LumiSummaryIntProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "LumiSummaryIntProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestBeginRunProducer : public edm::limited::EDProducer<edm::RunCache<Dummy>, edm::BeginRunProducer> {
+    public:
+      explicit TestBeginRunProducer(edm::ParameterSet const& p)
+          : edm::limited::EDProducerBase(p),
+            edm::limited::EDProducer<edm::RunCache<Dummy>, edm::BeginRunProducer>(p),
+            trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::BeginRun>("a");
+      }
+
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+      mutable std::atomic<bool> brp{false};
+
+      std::shared_ptr<Dummy> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
+        brp = false;
+        return std::shared_ptr<Dummy>();
+      }
+
+      void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override {
+        if (!brp) {
+          throw cms::Exception("out of sequence") << "produce before globalBeginRunProduce in Stream " << iID.value();
+        }
+      }
+
+      void globalBeginRunProduce(edm::Run&, edm::EventSetup const&) const override {
+        ++m_count;
+        brp = true;
+      }
+
+      void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {}
+
+      ~TestBeginRunProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestBeginRunProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestEndRunProducer : public edm::limited::EDProducer<edm::RunCache<Dummy>, edm::EndRunProducer> {
+    public:
+      explicit TestEndRunProducer(edm::ParameterSet const& p)
+          : edm::limited::EDProducerBase(p),
+            edm::limited::EDProducer<edm::RunCache<Dummy>, edm::EndRunProducer>(p),
+            trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::EndRun>("a");
+      }
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+      mutable std::atomic<bool> p{false};
+
+      std::shared_ptr<Dummy> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const override {
+        p = false;
+        return std::shared_ptr<Dummy>();
+      }
+
+      void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override { p = true; }
+
+      void globalEndRunProduce(edm::Run&, edm::EventSetup const&) const override {
+        if (!p) {
+          throw cms::Exception("out of sequence") << "endRunProduce before produce";
+        }
+        ++m_count;
+      }
+
+      void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const override {}
+
+      ~TestEndRunProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestEndRunProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestBeginLumiBlockProducer
+        : public edm::limited::EDProducer<edm::LuminosityBlockCache<void>, edm::BeginLuminosityBlockProducer> {
+    public:
+      explicit TestBeginLumiBlockProducer(edm::ParameterSet const& p)
+          : edm::limited::EDProducerBase(p),
+            edm::limited::EDProducer<edm::LuminosityBlockCache<void>, edm::BeginLuminosityBlockProducer>(p),
+            trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::BeginLuminosityBlock>("a");
+      }
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+      mutable std::atomic<bool> gblp{false};
+
+      std::shared_ptr<void> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                       edm::EventSetup const&) const override {
+        gblp = false;
+        return std::shared_ptr<void>();
+      }
+
+      void produce(edm::StreamID iID, edm::Event&, const edm::EventSetup&) const override {
+        if (!gblp) {
+          throw cms::Exception("out of sequence")
+              << "produce before globalBeginLuminosityBlockProduce in Stream " << iID.value();
+        }
+      }
+
+      void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
+        ++m_count;
+        gblp = true;
+      }
+
+      void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {}
+
+      ~TestBeginLumiBlockProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestBeginLumiBlockProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestEndLumiBlockProducer
+        : public edm::limited::EDProducer<edm::LuminosityBlockCache<void>, edm::EndLuminosityBlockProducer> {
+    public:
+      explicit TestEndLumiBlockProducer(edm::ParameterSet const& p)
+          : edm::limited::EDProducerBase(p),
+            edm::limited::EDProducer<edm::LuminosityBlockCache<void>, edm::EndLuminosityBlockProducer>(p),
+            trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::EndLuminosityBlock>("a");
+      }
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+      mutable std::atomic<bool> p{false};
+
+      std::shared_ptr<void> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                       edm::EventSetup const&) const override {
+        p = false;
+        return std::shared_ptr<void>();
+      }
+
+      void produce(edm::StreamID iID, edm::Event&, edm::EventSetup const&) const override { p = true; }
+
+      void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) const override {
+        if (!p) {
+          throw cms::Exception("out of sequence") << "endLumiBlockProduce before produce";
+        }
+        ++m_count;
+      }
+
+      void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&) const override {}
+
+      ~TestEndLumiBlockProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestEndLumiBlockProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestAccumulator : public edm::limited::EDProducer<edm::Accumulator> {
+    public:
+      explicit TestAccumulator(edm::ParameterSet const& p)
+          : edm::limited::EDProducerBase(p),
+            edm::limited::EDProducer<edm::Accumulator>(p),
+            m_expectedCount(p.getParameter<unsigned int>("expectedCount")) {}
+
+      void accumulate(edm::StreamID iID, edm::Event const&, edm::EventSetup const&) const override { ++m_count; }
+
+      ~TestAccumulator() {
+        if (m_count.load() != m_expectedCount) {
+          throw cms::Exception("TestCount")
+              << "TestAccumulator counter was " << m_count << " but it was supposed to be " << m_expectedCount;
+        }
+      }
+
+      mutable std::atomic<unsigned int> m_count{0};
+      const unsigned int m_expectedCount;
+    };
+  }  // namespace limited
+}  // namespace edmtest
 
 DEFINE_FWK_MODULE(edmtest::limited::StreamIntProducer);
 DEFINE_FWK_MODULE(edmtest::limited::RunIntProducer);
@@ -629,4 +590,3 @@ DEFINE_FWK_MODULE(edmtest::limited::TestEndRunProducer);
 DEFINE_FWK_MODULE(edmtest::limited::TestBeginLumiBlockProducer);
 DEFINE_FWK_MODULE(edmtest::limited::TestEndLumiBlockProducer);
 DEFINE_FWK_MODULE(edmtest::limited::TestAccumulator);
-
diff --git a/FWCore/Framework/test/stubs/TestMergeResults.cc b/FWCore/Framework/test/stubs/TestMergeResults.cc
index 5dc72ed6ceba9..d9b8a52516e89 100644
--- a/FWCore/Framework/test/stubs/TestMergeResults.cc
+++ b/FWCore/Framework/test/stubs/TestMergeResults.cc
@@ -43,7 +43,6 @@ namespace edmtest {
 
   class TestMergeResults : public edm::EDAnalyzer {
   public:
-
     explicit TestMergeResults(edm::ParameterSet const&);
     virtual ~TestMergeResults();
 
@@ -57,7 +56,6 @@ namespace edmtest {
     void endJob();
 
   private:
-
     void checkExpectedLumiProducts(unsigned int index,
                                    std::vector<int> const& expectedValues,
                                    edm::InputTag const& tag,
@@ -72,8 +70,12 @@ namespace edmtest {
                                   edm::Run const& run,
                                   std::vector<int> const& expectedValueImproperlyMerged);
 
-    void abortWithMessage(char const* whichFunction, char const* type, edm::InputTag const& tag,
-                          int expectedValue, int actualValue, bool unexpectedImproperlyMergedValue = false) const;
+    void abortWithMessage(char const* whichFunction,
+                          char const* type,
+                          edm::InputTag const& tag,
+                          int expectedValue,
+                          int actualValue,
+                          bool unexpectedImproperlyMergedValue = false) const;
 
     std::vector<int> default_;
     std::vector<std::string> defaultvstring_;
@@ -122,44 +124,47 @@ namespace edmtest {
 
   // -----------------------------------------------------------------
 
-  TestMergeResults::TestMergeResults(edm::ParameterSet const& ps):
-    default_(),
-    defaultvstring_(),
-    expectedBeginRunProd_(ps.getUntrackedParameter<std::vector<int> >("expectedBeginRunProd", default_)),
-    expectedEndRunProd_(ps.getUntrackedParameter<std::vector<int> >("expectedEndRunProd", default_)),
-    expectedBeginLumiProd_(ps.getUntrackedParameter<std::vector<int> >("expectedBeginLumiProd", default_)),
-    expectedEndLumiProd_(ps.getUntrackedParameter<std::vector<int> >("expectedEndLumiProd", default_)),
-
-    expectedBeginRunNew_(ps.getUntrackedParameter<std::vector<int> >("expectedBeginRunNew", default_)),
-    expectedEndRunNew_(ps.getUntrackedParameter<std::vector<int> >("expectedEndRunNew", default_)),
-    expectedBeginLumiNew_(ps.getUntrackedParameter<std::vector<int> >("expectedBeginLumiNew", default_)),
-    expectedEndLumiNew_(ps.getUntrackedParameter<std::vector<int> >("expectedEndLumiNew", default_)),
-
-    expectedEndRunProdImproperlyMerged_(ps.getUntrackedParameter<std::vector<int> >("expectedEndRunProdImproperlyMerged", default_)),
-    expectedEndLumiProdImproperlyMerged_(ps.getUntrackedParameter<std::vector<int> >("expectedEndLumiProdImproperlyMerged", default_)),
-
-    expectedParents_(ps.getUntrackedParameter<std::vector<std::string> >("expectedParents", defaultvstring_)),
-    expectedProcessHistoryInRuns_(ps.getUntrackedParameter<std::vector<std::string> >("expectedProcessHistoryInRuns", defaultvstring_)),
-
-    expectedDroppedEvent_(ps.getUntrackedParameter<std::vector<int> >("expectedDroppedEvent", default_)),
-    expectedDroppedEvent1_(ps.getUntrackedParameter<std::vector<int> >("expectedDroppedEvent1", default_)),
-
-    nRespondToOpenInputFile_(0),
-    nRespondToCloseInputFile_(0),
-    expectedRespondToOpenInputFile_(ps.getUntrackedParameter<int>("expectedRespondToOpenInputFile", -1)),
-    expectedRespondToCloseInputFile_(ps.getUntrackedParameter<int>("expectedRespondToCloseInputFile", -1)),
-
-    expectedInputFileNames_(ps.getUntrackedParameter<std::vector<std::string> >("expectedInputFileNames", defaultvstring_)),
-
-    verbose_(ps.getUntrackedParameter<bool>("verbose", false)),
-
-    indexRun_(0),
-    indexLumi_(0),
-    parentIndex_(0),
-    droppedIndex1_(0),
-    processHistoryIndex_(0),
-    testAlias_(ps.getUntrackedParameter<bool>("testAlias", false)) {
-
+  TestMergeResults::TestMergeResults(edm::ParameterSet const& ps)
+      : default_(),
+        defaultvstring_(),
+        expectedBeginRunProd_(ps.getUntrackedParameter<std::vector<int> >("expectedBeginRunProd", default_)),
+        expectedEndRunProd_(ps.getUntrackedParameter<std::vector<int> >("expectedEndRunProd", default_)),
+        expectedBeginLumiProd_(ps.getUntrackedParameter<std::vector<int> >("expectedBeginLumiProd", default_)),
+        expectedEndLumiProd_(ps.getUntrackedParameter<std::vector<int> >("expectedEndLumiProd", default_)),
+
+        expectedBeginRunNew_(ps.getUntrackedParameter<std::vector<int> >("expectedBeginRunNew", default_)),
+        expectedEndRunNew_(ps.getUntrackedParameter<std::vector<int> >("expectedEndRunNew", default_)),
+        expectedBeginLumiNew_(ps.getUntrackedParameter<std::vector<int> >("expectedBeginLumiNew", default_)),
+        expectedEndLumiNew_(ps.getUntrackedParameter<std::vector<int> >("expectedEndLumiNew", default_)),
+
+        expectedEndRunProdImproperlyMerged_(
+            ps.getUntrackedParameter<std::vector<int> >("expectedEndRunProdImproperlyMerged", default_)),
+        expectedEndLumiProdImproperlyMerged_(
+            ps.getUntrackedParameter<std::vector<int> >("expectedEndLumiProdImproperlyMerged", default_)),
+
+        expectedParents_(ps.getUntrackedParameter<std::vector<std::string> >("expectedParents", defaultvstring_)),
+        expectedProcessHistoryInRuns_(
+            ps.getUntrackedParameter<std::vector<std::string> >("expectedProcessHistoryInRuns", defaultvstring_)),
+
+        expectedDroppedEvent_(ps.getUntrackedParameter<std::vector<int> >("expectedDroppedEvent", default_)),
+        expectedDroppedEvent1_(ps.getUntrackedParameter<std::vector<int> >("expectedDroppedEvent1", default_)),
+
+        nRespondToOpenInputFile_(0),
+        nRespondToCloseInputFile_(0),
+        expectedRespondToOpenInputFile_(ps.getUntrackedParameter<int>("expectedRespondToOpenInputFile", -1)),
+        expectedRespondToCloseInputFile_(ps.getUntrackedParameter<int>("expectedRespondToCloseInputFile", -1)),
+
+        expectedInputFileNames_(
+            ps.getUntrackedParameter<std::vector<std::string> >("expectedInputFileNames", defaultvstring_)),
+
+        verbose_(ps.getUntrackedParameter<bool>("verbose", false)),
+
+        indexRun_(0),
+        indexLumi_(0),
+        parentIndex_(0),
+        droppedIndex1_(0),
+        processHistoryIndex_(0),
+        testAlias_(ps.getUntrackedParameter<bool>("testAlias", false)) {
     auto ap_thing = std::make_unique<edmtest::Thing>();
     edm::Wrapper<edmtest::Thing> w_thing(std::move(ap_thing));
     assert(!w_thing.isMergeable());
@@ -178,124 +183,123 @@ namespace edmtest {
     assert(w_thingWithIsEqual.hasIsProductEqual());
     assert(!w_thingWithIsEqual.hasSwap());
 
-    if(expectedDroppedEvent_.size() > 0) {
+    if (expectedDroppedEvent_.size() > 0) {
       consumes<edmtest::ThingWithIsEqual>(edm::InputTag{"makeThingToBeDropped", "event", "PROD"});
       consumes<edmtest::ThingWithMerge>(edm::InputTag{"makeThingToBeDropped", "event", "PROD"});
 
-      consumes<edmtest::ThingWithIsEqual,edm::InRun>(edm::InputTag{"makeThingToBeDropped", "beginRun", "PROD"});
+      consumes<edmtest::ThingWithIsEqual, edm::InRun>(edm::InputTag{"makeThingToBeDropped", "beginRun", "PROD"});
     }
-    for(auto const& parent : expectedParents_) {
-      mayConsume<edmtest::Thing>(edm::InputTag{parent,"event","PROD"});
+    for (auto const& parent : expectedParents_) {
+      mayConsume<edmtest::Thing>(edm::InputTag{parent, "event", "PROD"});
     }
-    if(expectedDroppedEvent1_.size() > droppedIndex1_) {
+    if (expectedDroppedEvent1_.size() > droppedIndex1_) {
       consumes<edmtest::ThingWithIsEqual>(edm::InputTag{"makeThingToBeDropped1", "event", "PROD"});
     }
     consumes<edmtest::Thing>(edm::InputTag{"thingWithMergeProducer", "event", "PROD"});
 
-    if(testAlias_){
+    if (testAlias_) {
       consumes<edmtest::Thing>(edm::InputTag{"aliasForThingToBeDropped2", "instance2"});
-      consumes<edmtest::Thing>(edm::InputTag{"aliasForThingToBeDropped2", "instance2","PROD"});
+      consumes<edmtest::Thing>(edm::InputTag{"aliasForThingToBeDropped2", "instance2", "PROD"});
     }
 
     {
       edm::InputTag tag("thingWithMergeProducer", "beginRun", "PROD");
-      consumes<edmtest::Thing,edm::InRun>(tag);
-      consumes<edmtest::ThingWithMerge,edm::InRun>(tag);
-      consumes<edmtest::ThingWithIsEqual,edm::InRun>(tag);
+      consumes<edmtest::Thing, edm::InRun>(tag);
+      consumes<edmtest::ThingWithMerge, edm::InRun>(tag);
+      consumes<edmtest::ThingWithIsEqual, edm::InRun>(tag);
     }
 
     {
       edm::InputTag tag("thingWithMergeProducer", "beginRun");
-      consumes<edmtest::Thing,edm::InRun>(tag);
-      consumes<edmtest::ThingWithMerge,edm::InRun>(tag);
-      consumes<edmtest::ThingWithIsEqual,edm::InRun>(tag);
+      consumes<edmtest::Thing, edm::InRun>(tag);
+      consumes<edmtest::ThingWithMerge, edm::InRun>(tag);
+      consumes<edmtest::ThingWithIsEqual, edm::InRun>(tag);
     }
 
     {
       edm::InputTag tag("thingWithMergeProducer", "endRun", "PROD");
-      consumes<edmtest::Thing,edm::InRun>(tag);
-      consumes<edmtest::ThingWithMerge,edm::InRun>(tag);
-      consumes<edmtest::ThingWithIsEqual,edm::InRun>(tag);
+      consumes<edmtest::Thing, edm::InRun>(tag);
+      consumes<edmtest::ThingWithMerge, edm::InRun>(tag);
+      consumes<edmtest::ThingWithIsEqual, edm::InRun>(tag);
     }
 
     {
       edm::InputTag tag("thingWithMergeProducer", "endRun");
-      consumes<edmtest::Thing,edm::InRun>(tag);
-      consumes<edmtest::ThingWithMerge,edm::InRun>(tag);
-      consumes<edmtest::ThingWithIsEqual,edm::InRun>(tag);
+      consumes<edmtest::Thing, edm::InRun>(tag);
+      consumes<edmtest::ThingWithMerge, edm::InRun>(tag);
+      consumes<edmtest::ThingWithIsEqual, edm::InRun>(tag);
     }
 
-    if(expectedDroppedEvent_.size() > 2) {
+    if (expectedDroppedEvent_.size() > 2) {
       edm::InputTag tag("makeThingToBeDropped", "endRun", "PROD");
-      consumes<edmtest::ThingWithMerge,edm::InRun>(tag);
-      consumes<edmtest::ThingWithIsEqual,edm::InRun>(tag);
+      consumes<edmtest::ThingWithMerge, edm::InRun>(tag);
+      consumes<edmtest::ThingWithIsEqual, edm::InRun>(tag);
     }
-    
+
     if (testAlias_) {
-      consumes<edmtest::Thing,edm::InRun>(edm::InputTag{"aliasForThingToBeDropped2", "endRun2"});
-      edm::InputTag tag("aliasForThingToBeDropped2", "endRun2","PROD");
-      consumes<edmtest::Thing,edm::InRun>(tag);
+      consumes<edmtest::Thing, edm::InRun>(edm::InputTag{"aliasForThingToBeDropped2", "endRun2"});
+      edm::InputTag tag("aliasForThingToBeDropped2", "endRun2", "PROD");
+      consumes<edmtest::Thing, edm::InRun>(tag);
     }
-  
-    if(expectedDroppedEvent_.size() > 3) {
+
+    if (expectedDroppedEvent_.size() > 3) {
       edm::InputTag tag("makeThingToBeDropped", "beginLumi", "PROD");
-      consumes<edmtest::ThingWithIsEqual,edm::InLumi>(tag);
+      consumes<edmtest::ThingWithIsEqual, edm::InLumi>(tag);
     }
     {
       edm::InputTag tag("thingWithMergeProducer", "endLumi", "PROD");
-      consumes<edmtest::Thing,edm::InLumi>(tag);
-      consumes<edmtest::ThingWithMerge,edm::InLumi>(tag);
-      consumes<edmtest::ThingWithIsEqual,edm::InLumi>(tag);
+      consumes<edmtest::Thing, edm::InLumi>(tag);
+      consumes<edmtest::ThingWithMerge, edm::InLumi>(tag);
+      consumes<edmtest::ThingWithIsEqual, edm::InLumi>(tag);
     }
 
     {
       edm::InputTag tag("thingWithMergeProducer", "endLumi");
-      consumes<edmtest::Thing,edm::InLumi>(tag);
-      consumes<edmtest::ThingWithMerge,edm::InLumi>(tag);
-      consumes<edmtest::ThingWithIsEqual,edm::InLumi>(tag);
+      consumes<edmtest::Thing, edm::InLumi>(tag);
+      consumes<edmtest::ThingWithMerge, edm::InLumi>(tag);
+      consumes<edmtest::ThingWithIsEqual, edm::InLumi>(tag);
     }
 
     {
       edm::InputTag tag("thingWithMergeProducer", "beginLumi", "PROD");
-      consumes<edmtest::Thing,edm::InLumi>(tag);
-      consumes<edmtest::ThingWithMerge,edm::InLumi>(tag);
-      consumes<edmtest::ThingWithIsEqual,edm::InLumi>(tag);
+      consumes<edmtest::Thing, edm::InLumi>(tag);
+      consumes<edmtest::ThingWithMerge, edm::InLumi>(tag);
+      consumes<edmtest::ThingWithIsEqual, edm::InLumi>(tag);
     }
 
     {
       edm::InputTag tag("thingWithMergeProducer", "beginLumi");
-      consumes<edmtest::Thing,edm::InLumi>(tag);
-      consumes<edmtest::ThingWithMerge,edm::InLumi>(tag);
-      consumes<edmtest::ThingWithIsEqual,edm::InLumi>(tag);
+      consumes<edmtest::Thing, edm::InLumi>(tag);
+      consumes<edmtest::ThingWithMerge, edm::InLumi>(tag);
+      consumes<edmtest::ThingWithIsEqual, edm::InLumi>(tag);
     }
 
-    if(expectedDroppedEvent_.size() > 4) {
+    if (expectedDroppedEvent_.size() > 4) {
       edm::InputTag tag("makeThingToBeDropped", "endLumi", "PROD");
-      consumes<edmtest::ThingWithIsEqual,edm::InLumi>(tag);
-      consumes<edmtest::ThingWithMerge,edm::InLumi>(tag);
+      consumes<edmtest::ThingWithIsEqual, edm::InLumi>(tag);
+      consumes<edmtest::ThingWithMerge, edm::InLumi>(tag);
     }
 
     if (testAlias_) {
-      consumes<edmtest::Thing,edm::InLumi>(edm::InputTag{"aliasForThingToBeDropped2", "endLumi2"});
-      edm::InputTag tag("aliasForThingToBeDropped2", "endLumi2","PROD");
-      consumes<edmtest::Thing,edm::InLumi>(tag);
+      consumes<edmtest::Thing, edm::InLumi>(edm::InputTag{"aliasForThingToBeDropped2", "endLumi2"});
+      edm::InputTag tag("aliasForThingToBeDropped2", "endLumi2", "PROD");
+      consumes<edmtest::Thing, edm::InLumi>(tag);
     }
   }
 
   // -----------------------------------------------------------------
 
-  TestMergeResults::~TestMergeResults() {
-  }
+  TestMergeResults::~TestMergeResults() {}
 
   // -----------------------------------------------------------------
 
-  void TestMergeResults::analyze(edm::Event const& e,edm::EventSetup const&) {
-
+  void TestMergeResults::analyze(edm::Event const& e, edm::EventSetup const&) {
     assert(e.processHistory().id() == e.processHistoryID());
 
-    if(verbose_) edm::LogInfo("TestMergeResults") << "analyze";
+    if (verbose_)
+      edm::LogInfo("TestMergeResults") << "analyze";
 
-    if(expectedDroppedEvent_.size() > 0) {
+    if (expectedDroppedEvent_.size() > 0) {
       edm::InputTag tag("makeThingToBeDropped", "event", "PROD");
       e.getByLabel(tag, h_thingWithIsEqual);
       assert(h_thingWithIsEqual->a == expectedDroppedEvent_[0]);
@@ -306,13 +310,12 @@ namespace edmtest {
 
     // This one is used to test the merging step when a specific product
     // has been dropped or not created in some of the input files.
-    if(expectedDroppedEvent1_.size() > droppedIndex1_) {
+    if (expectedDroppedEvent1_.size() > droppedIndex1_) {
       edm::InputTag tag("makeThingToBeDropped1", "event", "PROD");
       e.getByLabel(tag, h_thingWithIsEqual);
-      if(expectedDroppedEvent1_[droppedIndex1_] == -1) {
+      if (expectedDroppedEvent1_[droppedIndex1_] == -1) {
         assert(!h_thingWithIsEqual.isValid());
-      }
-      else {
+      } else {
         assert(h_thingWithIsEqual.isValid());
         assert(h_thingWithIsEqual->a == expectedDroppedEvent1_[droppedIndex1_]);
       }
@@ -326,8 +329,7 @@ namespace edmtest {
     // in the Event rather than deleting it or writing a complete new test ...
     // It is actually convenient here, so maybe it is OK even if the module name
     // has nothing to do with this test.
-    if(parentIndex_ < expectedParents_.size()) {
-
+    if (parentIndex_ < expectedParents_.size()) {
       edm::InputTag tag("thingWithMergeProducer", "event", "PROD");
       e.getByLabel(tag, h_thing);
       std::string expectedParent = expectedParents_[parentIndex_];
@@ -347,7 +349,7 @@ namespace edmtest {
     if (testAlias_) {
       e.getByLabel("aliasForThingToBeDropped2", "instance2", h_thing);
       assert(h_thing->a == 11);
-      edm::InputTag inputTag("aliasForThingToBeDropped2", "instance2","PROD");
+      edm::InputTag inputTag("aliasForThingToBeDropped2", "instance2", "PROD");
       e.getByLabel(inputTag, h_thing);
       assert(h_thing->a == 11);
 
@@ -355,8 +357,9 @@ namespace edmtest {
       bool foundOriginalInRegistry = false;
       edm::Service<edm::ConstProductRegistry> reg;
       // Loop over provenance of products in registry.
-      for (edm::ProductRegistry::ProductList::const_iterator it =  reg->productList().begin();
-           it != reg->productList().end(); ++it) {
+      for (edm::ProductRegistry::ProductList::const_iterator it = reg->productList().begin();
+           it != reg->productList().end();
+           ++it) {
         edm::BranchDescription const& desc = it->second;
         if (desc.branchID() == originalBranchID) {
           foundOriginalInRegistry = true;
@@ -368,10 +371,10 @@ namespace edmtest {
   }
 
   void TestMergeResults::beginRun(edm::Run const& run, edm::EventSetup const&) {
+    if (verbose_)
+      edm::LogInfo("TestMergeResults") << "beginRun";
 
-    if(verbose_) edm::LogInfo("TestMergeResults") << "beginRun";
-
-    if(expectedDroppedEvent_.size() > 1) {
+    if (expectedDroppedEvent_.size() > 1) {
       edm::InputTag tagd("makeThingToBeDropped", "beginRun", "PROD");
       run.getByLabel(tagd, h_thingWithIsEqual);
       assert(h_thingWithIsEqual->a == expectedDroppedEvent_[1]);
@@ -379,19 +382,18 @@ namespace edmtest {
   }
 
   void TestMergeResults::endRun(edm::Run const& run, edm::EventSetup const&) {
-
     assert(run.processHistory().id() == run.processHistoryID());
 
     edm::ProcessHistory const& ph = run.processHistory();
-    for (edm::ProcessHistory::const_iterator iter = ph.begin(), iEnd = ph.end();
-         iter != iEnd; ++iter) {
+    for (edm::ProcessHistory::const_iterator iter = ph.begin(), iEnd = ph.end(); iter != iEnd; ++iter) {
       if (processHistoryIndex_ < expectedProcessHistoryInRuns_.size()) {
         assert(expectedProcessHistoryInRuns_[processHistoryIndex_] == iter->processName());
         ++processHistoryIndex_;
       }
     }
 
-    if(verbose_) edm::LogInfo("TestMergeResults") << "endRun";
+    if (verbose_)
+      edm::LogInfo("TestMergeResults") << "endRun";
 
     std::vector<int> emptyDummy;
 
@@ -407,7 +409,7 @@ namespace edmtest {
     edm::InputTag tagbnew("thingWithMergeProducer", "beginRun");
     checkExpectedRunProducts(indexRun_, expectedBeginRunNew_, tagbnew, "endRun", run, emptyDummy);
 
-    if(expectedDroppedEvent_.size() > 2) {
+    if (expectedDroppedEvent_.size() > 2) {
       edm::InputTag tagd("makeThingToBeDropped", "endRun", "PROD");
       run.getByLabel(tagd, h_thingWithIsEqual);
       assert(h_thingWithIsEqual->a == expectedDroppedEvent_[2]);
@@ -419,7 +421,7 @@ namespace edmtest {
     if (testAlias_) {
       run.getByLabel("aliasForThingToBeDropped2", "endRun2", h_thing);
       assert(h_thing->a == 100001);
-      edm::InputTag inputTag("aliasForThingToBeDropped2", "endRun2","PROD");
+      edm::InputTag inputTag("aliasForThingToBeDropped2", "endRun2", "PROD");
       run.getByLabel(inputTag, h_thing);
       assert(h_thing->a == 100001);
 
@@ -427,8 +429,9 @@ namespace edmtest {
       bool foundOriginalInRegistry = false;
       edm::Service<edm::ConstProductRegistry> reg;
       // Loop over provenance of products in registry.
-      for (edm::ProductRegistry::ProductList::const_iterator it =  reg->productList().begin();
-           it != reg->productList().end(); ++it) {
+      for (edm::ProductRegistry::ProductList::const_iterator it = reg->productList().begin();
+           it != reg->productList().end();
+           ++it) {
         edm::BranchDescription const& desc = it->second;
         if (desc.branchID() == originalBranchID) {
           foundOriginalInRegistry = true;
@@ -442,10 +445,10 @@ namespace edmtest {
   }
 
   void TestMergeResults::beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const&) {
+    if (verbose_)
+      edm::LogInfo("TestMergeResults") << "beginLuminosityBlock";
 
-    if(verbose_) edm::LogInfo("TestMergeResults") << "beginLuminosityBlock";
-
-    if(expectedDroppedEvent_.size() > 3) {
+    if (expectedDroppedEvent_.size() > 3) {
       edm::InputTag tagd("makeThingToBeDropped", "beginLumi", "PROD");
       lumi.getByLabel(tagd, h_thingWithIsEqual);
       assert(h_thingWithIsEqual->a == expectedDroppedEvent_[3]);
@@ -453,15 +456,16 @@ namespace edmtest {
   }
 
   void TestMergeResults::endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const&) {
-
     assert(lumi.processHistory().id() == lumi.processHistoryID());
 
-    if(verbose_) edm::LogInfo("TestMergeResults") << "endLuminosityBlock";
+    if (verbose_)
+      edm::LogInfo("TestMergeResults") << "endLuminosityBlock";
 
     std::vector<int> emptyDummy;
 
     edm::InputTag tag("thingWithMergeProducer", "endLumi", "PROD");
-    checkExpectedLumiProducts(indexLumi_, expectedEndLumiProd_, tag, "endLumi", lumi, expectedEndLumiProdImproperlyMerged_);
+    checkExpectedLumiProducts(
+        indexLumi_, expectedEndLumiProd_, tag, "endLumi", lumi, expectedEndLumiProdImproperlyMerged_);
 
     edm::InputTag tagnew("thingWithMergeProducer", "endLumi");
     checkExpectedLumiProducts(indexLumi_, expectedEndLumiNew_, tagnew, "endLumi", lumi, emptyDummy);
@@ -472,7 +476,7 @@ namespace edmtest {
     edm::InputTag tagbnew("thingWithMergeProducer", "beginLumi");
     checkExpectedLumiProducts(indexLumi_, expectedBeginLumiNew_, tagbnew, "endLumi", lumi, emptyDummy);
 
-    if(expectedDroppedEvent_.size() > 4) {
+    if (expectedDroppedEvent_.size() > 4) {
       edm::InputTag tagd("makeThingToBeDropped", "endLumi", "PROD");
       lumi.getByLabel(tagd, h_thingWithIsEqual);
       assert(h_thingWithIsEqual->a == expectedDroppedEvent_[4]);
@@ -484,7 +488,7 @@ namespace edmtest {
     if (testAlias_) {
       lumi.getByLabel("aliasForThingToBeDropped2", "endLumi2", h_thing);
       assert(h_thing->a == 1001);
-      edm::InputTag inputTag("aliasForThingToBeDropped2", "endLumi2","PROD");
+      edm::InputTag inputTag("aliasForThingToBeDropped2", "endLumi2", "PROD");
       lumi.getByLabel(inputTag, h_thing);
       assert(h_thing->a == 1001);
 
@@ -492,8 +496,9 @@ namespace edmtest {
       bool foundOriginalInRegistry = false;
       edm::Service<edm::ConstProductRegistry> reg;
       // Loop over provenance of products in registry.
-      for (edm::ProductRegistry::ProductList::const_iterator it =  reg->productList().begin();
-           it != reg->productList().end(); ++it) {
+      for (edm::ProductRegistry::ProductList::const_iterator it = reg->productList().begin();
+           it != reg->productList().end();
+           ++it) {
         edm::BranchDescription const& desc = it->second;
         if (desc.branchID() == originalBranchID) {
           foundOriginalInRegistry = true;
@@ -506,11 +511,11 @@ namespace edmtest {
   }
 
   void TestMergeResults::respondToOpenInputFile(edm::FileBlock const& fb) {
+    if (verbose_)
+      edm::LogInfo("TestMergeResults") << "respondToOpenInputFile";
 
-    if(verbose_) edm::LogInfo("TestMergeResults") << "respondToOpenInputFile";
-
-    if(!expectedInputFileNames_.empty()) {
-      if(expectedInputFileNames_.size() <= static_cast<unsigned>(nRespondToOpenInputFile_) ||
+    if (!expectedInputFileNames_.empty()) {
+      if (expectedInputFileNames_.size() <= static_cast<unsigned>(nRespondToOpenInputFile_) ||
           expectedInputFileNames_[nRespondToOpenInputFile_] != fb.fileName()) {
         std::cerr << "Error while testing merging of run/lumi products in TestMergeResults.cc\n"
                   << "Unexpected input filename, expected name = " << expectedInputFileNames_[nRespondToOpenInputFile_]
@@ -522,41 +527,40 @@ namespace edmtest {
   }
 
   void TestMergeResults::respondToCloseInputFile(edm::FileBlock const&) {
-    if(verbose_) edm::LogInfo("TestMergeResults") << "respondToCloseInputFile";
+    if (verbose_)
+      edm::LogInfo("TestMergeResults") << "respondToCloseInputFile";
     ++nRespondToCloseInputFile_;
     ++droppedIndex1_;
   }
 
   void TestMergeResults::endJob() {
-    if(verbose_) edm::LogInfo("TestMergeResults") << "endJob";
+    if (verbose_)
+      edm::LogInfo("TestMergeResults") << "endJob";
 
-    if(expectedRespondToOpenInputFile_ > -1 && nRespondToOpenInputFile_ != expectedRespondToOpenInputFile_) {
+    if (expectedRespondToOpenInputFile_ > -1 && nRespondToOpenInputFile_ != expectedRespondToOpenInputFile_) {
       std::cerr << "Error while testing merging of run/lumi products in TestMergeResults.cc\n"
                 << "Unexpected number of calls to the function respondToOpenInputFile" << std::endl;
       abort();
     }
 
-    if(expectedRespondToCloseInputFile_ > -1 && nRespondToCloseInputFile_ != expectedRespondToCloseInputFile_) {
+    if (expectedRespondToCloseInputFile_ > -1 && nRespondToCloseInputFile_ != expectedRespondToCloseInputFile_) {
       std::cerr << "Error while testing merging of run/lumi products in TestMergeResults.cc\n"
                 << "Unexpected number of calls to the function respondToCloseInputFile" << std::endl;
       abort();
     }
   }
 
-  void
-  TestMergeResults::checkExpectedRunProducts(unsigned int index,
-                                             std::vector<int> const& expectedValues,
-                                             edm::InputTag const& tag,
-                                             char const* functionName,
-                                             edm::Run const& run,
-                                             std::vector<int> const& expectedValueImproperlyMerged) {
-
-    if((index + 2) < expectedValues.size()) {
-
+  void TestMergeResults::checkExpectedRunProducts(unsigned int index,
+                                                  std::vector<int> const& expectedValues,
+                                                  edm::InputTag const& tag,
+                                                  char const* functionName,
+                                                  edm::Run const& run,
+                                                  std::vector<int> const& expectedValueImproperlyMerged) {
+    if ((index + 2) < expectedValues.size()) {
       int expected = expectedValues[index];
-      if(expected != 0) {
+      if (expected != 0) {
         run.getByLabel(tag, h_thing);
-        if(h_thing->a != expected) {
+        if (h_thing->a != expected) {
           abortWithMessage(functionName, "Thing", tag, expected, h_thing->a);
         }
         if (index < expectedValueImproperlyMerged.size()) {
@@ -567,13 +571,14 @@ namespace edmtest {
       }
 
       expected = expectedValues[index + 1];
-      if(expected != 0) {
+      if (expected != 0) {
         run.getByLabel(tag, h_thingWithMerge);
-        if(h_thingWithMerge->a != expected) {
+        if (h_thingWithMerge->a != expected) {
           abortWithMessage(functionName, "ThingWithMerge", tag, expected, h_thingWithMerge->a);
         }
         if (index + 1 < expectedValueImproperlyMerged.size()) {
-          if ((expectedValueImproperlyMerged[index + 1] != 0) != h_thingWithMerge.provenance()->knownImproperlyMerged()) {
+          if ((expectedValueImproperlyMerged[index + 1] != 0) !=
+              h_thingWithMerge.provenance()->knownImproperlyMerged()) {
             abortWithMessage(functionName, "ThingWithMerge", tag, 0, 0, true);
           }
         }
@@ -585,13 +590,14 @@ namespace edmtest {
       }
 
       expected = expectedValues[index + 2];
-      if(expected != 0) {
+      if (expected != 0) {
         run.getByLabel(tag, h_thingWithIsEqual);
-        if(h_thingWithIsEqual->a != expected) {
+        if (h_thingWithIsEqual->a != expected) {
           abortWithMessage(functionName, "ThingWithIsEqual", tag, expected, h_thingWithIsEqual->a);
         }
         if (index + 2 < expectedValueImproperlyMerged.size()) {
-          if ((expectedValueImproperlyMerged[index + 2] != 0) != h_thingWithIsEqual.provenance()->knownImproperlyMerged()) {
+          if ((expectedValueImproperlyMerged[index + 2] != 0) !=
+              h_thingWithIsEqual.provenance()->knownImproperlyMerged()) {
             abortWithMessage(functionName, "ThingWithIsEqual", tag, 0, 0, true);
           }
         }
@@ -604,20 +610,17 @@ namespace edmtest {
     }
   }
 
-  void
-  TestMergeResults::checkExpectedLumiProducts(unsigned int index,
-                                              std::vector<int> const& expectedValues,
-                                              edm::InputTag const& tag,
-                                              char const* functionName,
-                                              edm::LuminosityBlock const& lumi,
-                                              std::vector<int> const& expectedValueImproperlyMerged) {
-
-    if((index + 2) < expectedValues.size()) {
-
+  void TestMergeResults::checkExpectedLumiProducts(unsigned int index,
+                                                   std::vector<int> const& expectedValues,
+                                                   edm::InputTag const& tag,
+                                                   char const* functionName,
+                                                   edm::LuminosityBlock const& lumi,
+                                                   std::vector<int> const& expectedValueImproperlyMerged) {
+    if ((index + 2) < expectedValues.size()) {
       int expected = expectedValues[index];
-      if(expected != 0) {
+      if (expected != 0) {
         lumi.getByLabel(tag, h_thing);
-        if(h_thing->a != expected) {
+        if (h_thing->a != expected) {
           abortWithMessage(functionName, "Thing", tag, expected, h_thing->a);
         }
         if (index < expectedValueImproperlyMerged.size()) {
@@ -628,13 +631,14 @@ namespace edmtest {
       }
 
       expected = expectedValues[index + 1];
-      if(expected != 0) {
+      if (expected != 0) {
         lumi.getByLabel(tag, h_thingWithMerge);
-        if(h_thingWithMerge->a != expected) {
+        if (h_thingWithMerge->a != expected) {
           abortWithMessage(functionName, "ThingWithMerge", tag, expected, h_thingWithMerge->a);
         }
         if (index + 1 < expectedValueImproperlyMerged.size()) {
-          if ((expectedValueImproperlyMerged[index + 1] != 0) != h_thingWithMerge.provenance()->knownImproperlyMerged()) {
+          if ((expectedValueImproperlyMerged[index + 1] != 0) !=
+              h_thingWithMerge.provenance()->knownImproperlyMerged()) {
             abortWithMessage(functionName, "ThingWithMerge", tag, 0, 0, true);
           }
         }
@@ -646,13 +650,14 @@ namespace edmtest {
       }
 
       expected = expectedValues[index + 2];
-      if(expected != 0) {
+      if (expected != 0) {
         lumi.getByLabel(tag, h_thingWithIsEqual);
-        if(h_thingWithIsEqual->a != expected) {
+        if (h_thingWithIsEqual->a != expected) {
           abortWithMessage(functionName, "ThingWithIsEqual", tag, expected, h_thingWithIsEqual->a);
         }
         if (index + 2 < expectedValueImproperlyMerged.size()) {
-          if ((expectedValueImproperlyMerged[index + 2] != 0) != h_thingWithIsEqual.provenance()->knownImproperlyMerged()) {
+          if ((expectedValueImproperlyMerged[index + 2] != 0) !=
+              h_thingWithIsEqual.provenance()->knownImproperlyMerged()) {
             abortWithMessage(functionName, "ThingWithIsEqual", tag, 0, 0, true);
           }
         }
@@ -665,8 +670,12 @@ namespace edmtest {
     }
   }
 
-  void TestMergeResults::abortWithMessage(char const* whichFunction, char const* type, edm::InputTag const& tag,
-                                          int expectedValue, int actualValue, bool unexpectedImproperlyMergedValue) const {
+  void TestMergeResults::abortWithMessage(char const* whichFunction,
+                                          char const* type,
+                                          edm::InputTag const& tag,
+                                          int expectedValue,
+                                          int actualValue,
+                                          bool unexpectedImproperlyMergedValue) const {
     std::cerr << "Error while testing merging of run/lumi products in TestMergeResults.cc\n"
               << "In function " << whichFunction << " looking for product of type " << type << "\n"
               << tag << std::endl;
@@ -677,7 +686,7 @@ namespace edmtest {
     }
     abort();
   }
-}
+}  // namespace edmtest
 
 using edmtest::TestMergeResults;
 
diff --git a/FWCore/Framework/test/stubs/TestMod.cc b/FWCore/Framework/test/stubs/TestMod.cc
index ef409330400f5..b4cb26a426149 100644
--- a/FWCore/Framework/test/stubs/TestMod.cc
+++ b/FWCore/Framework/test/stubs/TestMod.cc
@@ -8,23 +8,20 @@
 
 using namespace edm;
 
-class TestMod : public EDProducer
-{
- public:
+class TestMod : public EDProducer {
+public:
   explicit TestMod(ParameterSet const& p);
 
   void produce(Event& e, EventSetup const&);
 };
 
-TestMod::TestMod(ParameterSet const& p)
-{
-  produces<int>(); // We don't really produce anything.
+TestMod::TestMod(ParameterSet const& p) {
+  produces<int>();  // We don't really produce anything.
   //std::cerr << "TestMod instance created: " << p.getParameter<std::string>("@module_label")
-	//    << std::endl;
+  //    << std::endl;
 }
 
-void TestMod::produce(Event&, EventSetup const&)
-{
+void TestMod::produce(Event&, EventSetup const&) {
   //std::cerr << "Hi" << std::endl;
 }
 
diff --git a/FWCore/Framework/test/stubs/TestModuleChangeLooper.cc b/FWCore/Framework/test/stubs/TestModuleChangeLooper.cc
index b724f91aad471..6224f9b98f565 100644
--- a/FWCore/Framework/test/stubs/TestModuleChangeLooper.cc
+++ b/FWCore/Framework/test/stubs/TestModuleChangeLooper.cc
@@ -32,37 +32,36 @@
 //
 
 class TestModuleChangeLooper : public edm::EDLooper {
-   public:
-      TestModuleChangeLooper(edm::ParameterSet const&);
-      ~TestModuleChangeLooper();
-
-      void startingNewLoop(unsigned int) {
-
-      }
-      Status duringLoop(edm::Event const& iEvent, edm::EventSetup const&) {
-         edm::Handle<edmtest::IntProduct> handle;
-         iEvent.getByLabel(m_tag, handle);
-         if(handle->value != m_expectedValue) {
-            throw cms::Exception("WrongValue") << "expected value " << m_expectedValue << " but got " << handle->value;
-         }
-         return kContinue;
-      }
-      Status endOfLoop(edm::EventSetup const&,  unsigned int iCount) {
-         //modify the module
-         edm::ParameterSet const* pset = scheduleInfo()->parametersForModule(m_tag.label());
-         assert(0 != pset);
-
-         edm::ParameterSet newPSet(*pset);
-         newPSet.addParameter<int>("ivalue", ++m_expectedValue);
-
-         assert(moduleChanger()->changeModule(m_tag.label(), newPSet));
-
-         return iCount == 2 ? kStop : kContinue;
-      }
-   private:
-      // ----------member data ---------------------------
-   int m_expectedValue;
-   edm::InputTag m_tag;
+public:
+  TestModuleChangeLooper(edm::ParameterSet const&);
+  ~TestModuleChangeLooper();
+
+  void startingNewLoop(unsigned int) {}
+  Status duringLoop(edm::Event const& iEvent, edm::EventSetup const&) {
+    edm::Handle<edmtest::IntProduct> handle;
+    iEvent.getByLabel(m_tag, handle);
+    if (handle->value != m_expectedValue) {
+      throw cms::Exception("WrongValue") << "expected value " << m_expectedValue << " but got " << handle->value;
+    }
+    return kContinue;
+  }
+  Status endOfLoop(edm::EventSetup const&, unsigned int iCount) {
+    //modify the module
+    edm::ParameterSet const* pset = scheduleInfo()->parametersForModule(m_tag.label());
+    assert(0 != pset);
+
+    edm::ParameterSet newPSet(*pset);
+    newPSet.addParameter<int>("ivalue", ++m_expectedValue);
+
+    assert(moduleChanger()->changeModule(m_tag.label(), newPSet));
+
+    return iCount == 2 ? kStop : kContinue;
+  }
+
+private:
+  // ----------member data ---------------------------
+  int m_expectedValue;
+  edm::InputTag m_tag;
 };
 
 //
@@ -77,16 +76,14 @@ class TestModuleChangeLooper : public edm::EDLooper {
 // constructors and destructor
 //
 TestModuleChangeLooper::TestModuleChangeLooper(edm::ParameterSet const& iConfig)
-            : m_expectedValue(iConfig.getUntrackedParameter<int>("startingValue")),
-              m_tag(iConfig.getUntrackedParameter<edm::InputTag>("tag")) {
-
-   //now do what ever other initialization is needed
+    : m_expectedValue(iConfig.getUntrackedParameter<int>("startingValue")),
+      m_tag(iConfig.getUntrackedParameter<edm::InputTag>("tag")) {
+  //now do what ever other initialization is needed
 }
 
 TestModuleChangeLooper::~TestModuleChangeLooper() {
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
 //
diff --git a/FWCore/Framework/test/stubs/TestNThreadsChecker.cc b/FWCore/Framework/test/stubs/TestNThreadsChecker.cc
index 4f104946e5538..2c868f5395b33 100644
--- a/FWCore/Framework/test/stubs/TestNThreadsChecker.cc
+++ b/FWCore/Framework/test/stubs/TestNThreadsChecker.cc
@@ -2,7 +2,7 @@
 //
 // Package:    Framework
 // Class:      TestNThreadsChecker
-// 
+//
 /**\class TestNThreadsChecker TestNThreadsChecker.cc FWCore/Framework/test/stubs/TestNThreadsChecker.cc
 
  Description: <one line class summary>
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <atomic>
@@ -37,11 +36,10 @@
 
 class TestNThreadsChecker {
 public:
-  explicit TestNThreadsChecker(const edm::ParameterSet&, edm::ActivityRegistry& );
+  explicit TestNThreadsChecker(const edm::ParameterSet&, edm::ActivityRegistry&);
 
 private:
-
-      // ----------member data ---------------------------
+  // ----------member data ---------------------------
   unsigned int m_nExpectedThreads;
 };
 
@@ -56,20 +54,20 @@ class TestNThreadsChecker {
 //
 // constructors and destructor
 //
-TestNThreadsChecker::TestNThreadsChecker(const edm::ParameterSet& iConfig, edm::ActivityRegistry& iReg) :
-m_nExpectedThreads(iConfig.getUntrackedParameter<unsigned int>("nExpectedThreads"))
-{
-   unsigned int expectedThreads =m_nExpectedThreads;
-   if(expectedThreads == 0 ) {
-      expectedThreads =tbb::task_scheduler_init::default_num_threads();
-   }
-   
-   //now do what ever initialization is needed
-   iReg.watchPreallocate([expectedThreads](edm::service::SystemBounds const& iBounds) {
-      if(expectedThreads != iBounds.maxNumberOfThreads()) {
-         throw cms::Exception("UnexpectedNumberOfThreads")<<"Expected "<<expectedThreads<<" threads but actual value is "<<iBounds.maxNumberOfThreads();
-      }
-   });
+TestNThreadsChecker::TestNThreadsChecker(const edm::ParameterSet& iConfig, edm::ActivityRegistry& iReg)
+    : m_nExpectedThreads(iConfig.getUntrackedParameter<unsigned int>("nExpectedThreads")) {
+  unsigned int expectedThreads = m_nExpectedThreads;
+  if (expectedThreads == 0) {
+    expectedThreads = tbb::task_scheduler_init::default_num_threads();
+  }
+
+  //now do what ever initialization is needed
+  iReg.watchPreallocate([expectedThreads](edm::service::SystemBounds const& iBounds) {
+    if (expectedThreads != iBounds.maxNumberOfThreads()) {
+      throw cms::Exception("UnexpectedNumberOfThreads")
+          << "Expected " << expectedThreads << " threads but actual value is " << iBounds.maxNumberOfThreads();
+    }
+  });
 }
 
 //define this as a plug-in
diff --git a/FWCore/Framework/test/stubs/TestOneAnalyzers.cc b/FWCore/Framework/test/stubs/TestOneAnalyzers.cc
index a232756818f3d..e3726d10720a5 100644
--- a/FWCore/Framework/test/stubs/TestOneAnalyzers.cc
+++ b/FWCore/Framework/test/stubs/TestOneAnalyzers.cc
@@ -25,238 +25,210 @@ for testing purposes only.
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "DataFormats/Provenance/interface/BranchDescription.h"
 
-
 namespace edmtest {
-namespace one {
-
-
-  class SharedResourcesAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResources> {
-  public:
-    explicit SharedResourcesAnalyzer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {
-      usesResource();
-      callWhenNewProductsRegistered([](edm::BranchDescription const& desc)
-        { std::cout << "one::SharedResourcesAnalyzer " << desc.moduleLabel() << std::endl; });
-    }
-    const unsigned int trans_; 
-    unsigned int m_count = 0;
-
-    void analyze(edm::Event const&, edm::EventSetup const&) override {
-      ++m_count;
-       
-    }
-    
-   ~SharedResourcesAnalyzer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "SharedResourcesAnalyzer transitions "
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-  
-  class WatchRunsAnalyzer: public edm::one::EDAnalyzer<edm::one::WatchRuns> {
-  public:
-    explicit WatchRunsAnalyzer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {
-    }
-    bool br = false;
-    bool er = false;
-    const unsigned int trans_; 
-    unsigned int m_count = 0;
-
-    void analyze(edm::Event const&, edm::EventSetup const&) override {
-      ++m_count;
-      if ( !br  || er ) {
-          throw cms::Exception("out of sequence")
-          << " produce before beginRun or after endRun";
-      }       
-    }
-
-    void beginRun(edm::Run const&, edm::EventSetup const&) override {
-      ++m_count;
-      if ( br ) {
-        throw cms::Exception("out of sequence")
-          << " beginRun seen multiple times";    
-      }
-      br = true;
-      er = false;
-    }
-
-    void endRun(edm::Run const&, edm::EventSetup const&) override {
-      ++m_count;
-      if ( !br ) {
-        throw cms::Exception("out of sequence")
-          << " endRun before beginRun";    
-      }
-      br = false;
-      er = true;
-    }
- 
-   ~WatchRunsAnalyzer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "WatchRunsAnalyzer transitions "
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-
-  class WatchLumiBlocksAnalyzer: public edm::one::EDAnalyzer<edm::one::WatchLuminosityBlocks> {
-  public:
-    explicit WatchLumiBlocksAnalyzer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {
-    }
-    const unsigned int trans_; 
-    bool bl = false;
-    bool el = false;
-    unsigned int m_count = 0;
-
-   void analyze(edm::Event const&, edm::EventSetup const&) override {
-      ++m_count;
-      if ( !bl  || el ) {
-          throw cms::Exception("out of sequence")
-          << " produce before beginLumiBlock or after endLumiBlock";
-      }              
-    }
-
-    void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
-      ++m_count;
-      if ( bl ) {
-        throw cms::Exception("out of sequence")
-          << " beginLumiBlock seen mutiple times";    
-      }
-      bl = true;
-      el = false;
-    }
-
-    void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
-      ++m_count;
-      if ( !bl ) {
-        throw cms::Exception("out of sequence")
-          << " endLumiBlock before beginLumiBlock";    
-      }
-      bl = false;
-      el = true;
-    }
-
-   ~WatchLumiBlocksAnalyzer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "WatchLumiBlocksAnalyzer transitions "
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-  
-  namespace an {
-    struct Cache { bool begin = true; bool end = false; };
-  }
-  class RunCacheAnalyzer: public edm::one::EDAnalyzer<edm::RunCache<an::Cache>> {
-  public:
-    explicit RunCacheAnalyzer(edm::ParameterSet const& p) :
-    trans_(p.getParameter<int>("transitions")) {
-    }
-    const unsigned int trans_;
-    mutable unsigned int m_count = 0;
-    
-    void analyze(edm::Event const& iEvent, edm::EventSetup const&) override {
-      ++m_count;
-      auto c = runCache(iEvent.getRun().index());
-      if( nullptr == c) {
-        throw cms::Exception("Missing cache") <<" no cache in analyze";
-      }
-      
-      if ( !c->begin  || c->end ) {
-        throw cms::Exception("out of sequence")
-        << " produce before beginRun or after endRun";
-      }
-    }
-    
-    std::shared_ptr<an::Cache> globalBeginRun(edm::Run const&, edm::EventSetup const&) const final {
-      ++m_count;
-      return std::make_shared<an::Cache>();
-    }
-    
-    void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) final {
-      ++m_count;
-      auto c = runCache(iRun.index());
-      if( nullptr == c) {
-        throw cms::Exception("Missing cache") <<" no cache in globalEndRun";
+  namespace one {
+
+    class SharedResourcesAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResources> {
+    public:
+      explicit SharedResourcesAnalyzer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        usesResource();
+        callWhenNewProductsRegistered([](edm::BranchDescription const& desc) {
+          std::cout << "one::SharedResourcesAnalyzer " << desc.moduleLabel() << std::endl;
+        });
+      }
+      const unsigned int trans_;
+      unsigned int m_count = 0;
+
+      void analyze(edm::Event const&, edm::EventSetup const&) override { ++m_count; }
+
+      ~SharedResourcesAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "SharedResourcesAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class WatchRunsAnalyzer : public edm::one::EDAnalyzer<edm::one::WatchRuns> {
+    public:
+      explicit WatchRunsAnalyzer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {}
+      bool br = false;
+      bool er = false;
+      const unsigned int trans_;
+      unsigned int m_count = 0;
+
+      void analyze(edm::Event const&, edm::EventSetup const&) override {
+        ++m_count;
+        if (!br || er) {
+          throw cms::Exception("out of sequence") << " produce before beginRun or after endRun";
+        }
+      }
+
+      void beginRun(edm::Run const&, edm::EventSetup const&) override {
+        ++m_count;
+        if (br) {
+          throw cms::Exception("out of sequence") << " beginRun seen multiple times";
+        }
+        br = true;
+        er = false;
+      }
+
+      void endRun(edm::Run const&, edm::EventSetup const&) override {
+        ++m_count;
+        if (!br) {
+          throw cms::Exception("out of sequence") << " endRun before beginRun";
+        }
+        br = false;
+        er = true;
+      }
+
+      ~WatchRunsAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "WatchRunsAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class WatchLumiBlocksAnalyzer : public edm::one::EDAnalyzer<edm::one::WatchLuminosityBlocks> {
+    public:
+      explicit WatchLumiBlocksAnalyzer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {}
+      const unsigned int trans_;
+      bool bl = false;
+      bool el = false;
+      unsigned int m_count = 0;
+
+      void analyze(edm::Event const&, edm::EventSetup const&) override {
+        ++m_count;
+        if (!bl || el) {
+          throw cms::Exception("out of sequence") << " produce before beginLumiBlock or after endLumiBlock";
+        }
+      }
+
+      void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
+        ++m_count;
+        if (bl) {
+          throw cms::Exception("out of sequence") << " beginLumiBlock seen mutiple times";
+        }
+        bl = true;
+        el = false;
+      }
+
+      void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
+        ++m_count;
+        if (!bl) {
+          throw cms::Exception("out of sequence") << " endLumiBlock before beginLumiBlock";
+        }
+        bl = false;
+        el = true;
+      }
+
+      ~WatchLumiBlocksAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "WatchLumiBlocksAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    namespace an {
+      struct Cache {
+        bool begin = true;
+        bool end = false;
+      };
+    }  // namespace an
+    class RunCacheAnalyzer : public edm::one::EDAnalyzer<edm::RunCache<an::Cache>> {
+    public:
+      explicit RunCacheAnalyzer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {}
+      const unsigned int trans_;
+      mutable unsigned int m_count = 0;
+
+      void analyze(edm::Event const& iEvent, edm::EventSetup const&) override {
+        ++m_count;
+        auto c = runCache(iEvent.getRun().index());
+        if (nullptr == c) {
+          throw cms::Exception("Missing cache") << " no cache in analyze";
+        }
+
+        if (!c->begin || c->end) {
+          throw cms::Exception("out of sequence") << " produce before beginRun or after endRun";
+        }
+      }
+
+      std::shared_ptr<an::Cache> globalBeginRun(edm::Run const&, edm::EventSetup const&) const final {
+        ++m_count;
+        return std::make_shared<an::Cache>();
+      }
+
+      void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) final {
+        ++m_count;
+        auto c = runCache(iRun.index());
+        if (nullptr == c) {
+          throw cms::Exception("Missing cache") << " no cache in globalEndRun";
+        }
+        if (!c->begin) {
+          throw cms::Exception("out of sequence") << " endRun before beginRun";
+        }
+        c->begin = false;
+        c->end = true;
+      }
+
+      ~RunCacheAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "WatchRunsAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiBlockCacheAnalyzer : public edm::one::EDAnalyzer<edm::LuminosityBlockCache<an::Cache>> {
+    public:
+      explicit LumiBlockCacheAnalyzer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {}
+      const unsigned int trans_;
+      mutable unsigned int m_count = 0;
+
+      void analyze(edm::Event const& iEvent, edm::EventSetup const&) override {
+        ++m_count;
+
+        auto c = luminosityBlockCache(iEvent.getLuminosityBlock().index());
+        if (nullptr == c) {
+          throw cms::Exception("Missing cache") << " no cache in analyze";
+        }
+
+        if (!c->begin || c->end) {
+          throw cms::Exception("out of sequence") << " produce before beginLumiBlock or after endLumiBlock";
+        }
+      }
+
+      std::shared_ptr<an::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const&,
+                                                            edm::EventSetup const&) const final {
+        ++m_count;
+        return std::make_shared<an::Cache>();
+      }
+
+      void globalEndLuminosityBlock(edm::LuminosityBlock const& iLumi, edm::EventSetup const&) override {
+        ++m_count;
+        auto c = luminosityBlockCache(iLumi.index());
+        if (!c->begin) {
+          throw cms::Exception("out of sequence") << " endLumiBlock before beginLumiBlock";
+        }
+        c->begin = false;
+        c->end = true;
+      }
+
+      ~LumiBlockCacheAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "WatchLumiBlocksAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
       }
-      if ( !c->begin ) {
-        throw cms::Exception("out of sequence")
-        << " endRun before beginRun";
-      }
-      c->begin = false;
-      c->end = true;
-    }
-    
-    ~RunCacheAnalyzer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-        << "WatchRunsAnalyzer transitions "
-        << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-  
-  
-  class LumiBlockCacheAnalyzer: public edm::one::EDAnalyzer< edm::LuminosityBlockCache<an::Cache>> {
-  public:
-    explicit LumiBlockCacheAnalyzer(edm::ParameterSet const& p) :
-    trans_(p.getParameter<int>("transitions")) {
-    }
-    const unsigned int trans_;
-    mutable unsigned int m_count = 0;
-    
-    void analyze(edm::Event const& iEvent, edm::EventSetup const&) override {
-      ++m_count;
-      
-      auto c = luminosityBlockCache(iEvent.getLuminosityBlock().index());
-      if( nullptr == c) {
-        throw cms::Exception("Missing cache") <<" no cache in analyze";
-      }
-
-      if ( !c->begin  || c->end ) {
-        throw cms::Exception("out of sequence")
-        << " produce before beginLumiBlock or after endLumiBlock";
-      }
-    }
-    
-    std::shared_ptr<an::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const final {
-      ++m_count;
-      return std::make_shared<an::Cache>();
-    }
-    
-    void globalEndLuminosityBlock(edm::LuminosityBlock const& iLumi, edm::EventSetup const&) override {
-      ++m_count;
-      auto c = luminosityBlockCache(iLumi.index());
-      if ( !c->begin ) {
-        throw cms::Exception("out of sequence")
-        << " endLumiBlock before beginLumiBlock";
-      }
-      c->begin = false;
-      c->end = true;
-    }
-    
-    ~LumiBlockCacheAnalyzer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-        << "WatchLumiBlocksAnalyzer transitions "
-        << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-
-}
-}
+    };
+
+  }  // namespace one
+}  // namespace edmtest
 
 DEFINE_FWK_MODULE(edmtest::one::SharedResourcesAnalyzer);
 DEFINE_FWK_MODULE(edmtest::one::WatchRunsAnalyzer);
 DEFINE_FWK_MODULE(edmtest::one::WatchLumiBlocksAnalyzer);
 DEFINE_FWK_MODULE(edmtest::one::RunCacheAnalyzer);
 DEFINE_FWK_MODULE(edmtest::one::LumiBlockCacheAnalyzer);
-
diff --git a/FWCore/Framework/test/stubs/TestOneFilters.cc b/FWCore/Framework/test/stubs/TestOneFilters.cc
index 422539b62d937..bb1d6446202e6 100644
--- a/FWCore/Framework/test/stubs/TestOneFilters.cc
+++ b/FWCore/Framework/test/stubs/TestOneFilters.cc
@@ -24,402 +24,348 @@ for testing purposes only.
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 
+namespace edmtest {
+  namespace one {
 
+    class SharedResourcesFilter : public edm::one::EDFilter<edm::one::SharedResources> {
+    public:
+      explicit SharedResourcesFilter(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<int>();
+        usesResource();
+      }
+      const unsigned int trans_;
+      mutable std::atomic<unsigned int> m_count{0};
+      bool filter(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        return true;
+      }
 
-namespace edmtest {
-namespace one {
-
-
-  class SharedResourcesFilter : public edm::one::EDFilter<edm::one::SharedResources> {
-  public:
-    explicit SharedResourcesFilter(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {
-      produces<int>();
-      usesResource();
-    }
-    const unsigned int trans_; 
-    mutable std::atomic<unsigned int> m_count{0};
-    bool filter(edm::Event &, edm::EventSetup const&) override {
-      ++m_count;
-      return true;
-    }
-    
-   ~SharedResourcesFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "SharedResourcesFilter transitions "
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-  
-  class WatchRunsFilter : public edm::one::EDFilter<edm::one::WatchRuns> {
-  public:
-    explicit WatchRunsFilter(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {
-    }
-    bool br = false;
-    bool er = false;
-    const unsigned int trans_; 
-    unsigned int m_count = 0;
-
-   bool filter(edm::Event &, edm::EventSetup const&) override {
-      ++m_count;
-      if ( !br  || er ) {
-          throw cms::Exception("out of sequence")
-          << " produce before beginRun or after endRun";
-      } 
-      return true;
-    }
-
-   void beginRun(edm::Run const&, edm::EventSetup const&) override {
-      ++m_count;
-      if ( br ) {
-        throw cms::Exception("out of sequence")
-          << " beginRun seen multiple times";    
-      }
-      br = true;
-      er = false;
-    }
-
-   void endRun(edm::Run const&, edm::EventSetup const&) override {  
-      ++m_count;
-      if ( !br ) {
-        throw cms::Exception("out of sequence")
-          << " endRun before beginRun";    
-      }
-      br = false;
-      er = true;
-    }
-
-   ~WatchRunsFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "WatchRunsFilter transitions "     
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-
-  class WatchLumiBlocksFilter : public edm::one::EDFilter<edm::one::WatchLuminosityBlocks> {
-  public:
-    explicit WatchLumiBlocksFilter(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {
-    }
-    const unsigned int trans_; 
-    bool bl = false;
-    bool el = false;
-    unsigned int m_count = 0;
-
-    bool filter(edm::Event &, edm::EventSetup const&)  override {
-      ++m_count;
-      if ( !bl  || el ) {
-          throw cms::Exception("out of sequence")
-          << " produce before beginLumiBlock or after endLumiBlock";
-      }              
-      return true;
-    }
-
-    void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override { 
-      ++m_count;
-      if ( bl ) {
-        throw cms::Exception("out of sequence")
-          << " beginLumiBlock seen mutiple times";    
-      }
-      bl = true;
-      el = false;
-     }
-
-    void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
-      ++m_count;
-      if ( !bl ) {
-        throw cms::Exception("out of sequence")
-          << " endLumiBlock before beginLumiBlock";    
-      }
-      bl = false;
-      el = true;
-    }
-
-   ~WatchLumiBlocksFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "WatchLumiBlocksFilter transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-  
-  namespace fltr {
-    struct Cache { bool begin = true; bool end = false; };
-  }
-  class RunCacheFilter: public edm::one::EDFilter<edm::RunCache<fltr::Cache>> {
-  public:
-    explicit RunCacheFilter(edm::ParameterSet const& p) :
-    trans_(p.getParameter<int>("transitions")) {
-    }
-    const unsigned int trans_;
-    mutable unsigned int m_count = 0;
-    
-    bool filter(edm::Event& iEvent, edm::EventSetup const&) override {
-      ++m_count;
-      auto c = runCache(iEvent.getRun().index());
-      if( nullptr == c) {
-        throw cms::Exception("Missing cache") <<" no cache in analyze";
-      }
-      
-      if ( !c->begin  || c->end ) {
-        throw cms::Exception("out of sequence")
-        << " produce before beginRun or after endRun";
-      }
-      
-      return true;
-    }
-    
-    std::shared_ptr<fltr::Cache> globalBeginRun(edm::Run const&, edm::EventSetup const&) const final {
-      ++m_count;
-      return std::make_shared<fltr::Cache>();
-    }
-    
-    void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) final {
-      ++m_count;
-      auto c = runCache(iRun.index());
-      if( nullptr == c) {
-        throw cms::Exception("Missing cache") <<" no cache in globalEndRun";
-      }
-      if ( !c->begin ) {
-        throw cms::Exception("out of sequence")
-        << " endRun before beginRun";
-      }
-      c->begin = false;
-      c->end = true;
-    }
-    
-    ~RunCacheFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-        << "WatchRunsAnalyzer transitions "
-        << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-  
-  
-  class LumiBlockCacheFilter: public edm::one::EDFilter<edm::LuminosityBlockCache<fltr::Cache>> {
-  public:
-    explicit LumiBlockCacheFilter(edm::ParameterSet const& p) :
-    trans_(p.getParameter<int>("transitions")) {
-    }
-    const unsigned int trans_;
-    mutable unsigned int m_count = 0;
-    
-    bool filter(edm::Event& iEvent, edm::EventSetup const&) override {
-      ++m_count;
-      
-      auto c = luminosityBlockCache(iEvent.getLuminosityBlock().index());
-      if( nullptr == c) {
-        throw cms::Exception("Missing cache") <<" no cache in analyze";
-      }
-      
-      if ( !c->begin  || c->end ) {
-        throw cms::Exception("out of sequence")
-        << " produce before beginLumiBlock or after endLumiBlock";
-      }
-      return true;
-    }
-    
-    std::shared_ptr<fltr::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const final {
-      ++m_count;
-      return std::make_shared<fltr::Cache>();
-    }
-    
-    void globalEndLuminosityBlock(edm::LuminosityBlock const& iLumi, edm::EventSetup const&) override {
-      ++m_count;
-      auto c = luminosityBlockCache(iLumi.index());
-      if ( !c->begin ) {
-        throw cms::Exception("out of sequence")
-        << " endLumiBlock before beginLumiBlock";
-      }
-      c->begin = false;
-      c->end = true;
-    }
-    
-    ~LumiBlockCacheFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-        << "WatchLumiBlocksAnalyzer transitions "
-        << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  
-  class BeginRunFilter : public edm::one::EDFilter<edm::one::WatchRuns,edm::BeginRunProducer> {
-  public:
-    explicit BeginRunFilter(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {
-      produces<int>();
-      produces<unsigned int, edm::Transition::BeginRun>("a");
-    }
-    const unsigned int trans_; 
-    unsigned int m_count = 0;
-    bool p = false;
- 
-   void beginRun(edm::Run const&, edm::EventSetup const&) override { 
-      p = false;
-    }
- 
-   bool filter(edm::Event &, edm::EventSetup const&) override {
-      ++m_count;
-      p=true; 
-      return true;
-    }
-
-   void beginRunProduce(edm::Run&, edm::EventSetup const&) override {
-      if ( p ) {
-        throw cms::Exception("out of sequence")
-          << "produce before beginRunProduce";
-      }
-      ++m_count;
-    }
-
-    void endRun(edm::Run const&, edm::EventSetup const&) override { 
-    }
-
-   ~BeginRunFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "BeginRunFilter transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class BeginLumiBlockFilter : public edm::one::EDFilter<edm::one::WatchLuminosityBlocks,edm::BeginLuminosityBlockProducer> {
-  public:
-    explicit BeginLumiBlockFilter(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {	
-      produces<unsigned int, edm::Transition::BeginLuminosityBlock>("a");
-    }
-    const unsigned int trans_; 
-    unsigned int m_count = 0;
-    bool p = false;
-
-    void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override  {
-      p = false;
-    }
- 
-
-    bool filter(edm::Event &, edm::EventSetup const&) override {
-      ++m_count;
-      p = true; 
-      return true;
-    }
-
-    void beginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) override {
-      ++m_count;
-      if ( p ) {
-        throw cms::Exception("out of sequence")
-          << "produce before beginLuminosityBlockProduce";
-      }
-    }
-
-    void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
-    }
-
-
-   ~BeginLumiBlockFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "BeginLumiBlockFilter transitions "     
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class EndRunFilter : public edm::one::EDFilter<edm::one::WatchRuns,edm::EndRunProducer> {
-  public:
-    explicit EndRunFilter(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {
-      produces<unsigned int, edm::Transition::EndRun>("a");
-    }
-    const unsigned int trans_;
-    bool erp = false; 
-    unsigned int m_count = 0;
-
-    void beginRun(edm::Run const&, edm::EventSetup const&) override { 
-      erp = false;
-    }
-
-    bool filter(edm::Event &, edm::EventSetup const&) override {
-      ++m_count;
-      if ( erp ) {
-        throw cms::Exception("out of sequence")
-          << "endRunProduce before produce";
-      }       
-      return true;
-    }
-
-    void endRunProduce(edm::Run&, edm::EventSetup const&) override {
-      ++m_count;
-    }    
-
-    void endRun(edm::Run const&, edm::EventSetup const&) override { 
-    }
-
-
-   ~EndRunFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "EndRunFilter transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class EndLumiBlockFilter : public edm::one::EDFilter<edm::one::WatchLuminosityBlocks,edm::EndLuminosityBlockProducer> {
-  public:
-    explicit EndLumiBlockFilter(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {	
-      produces<unsigned int, edm::Transition::EndLuminosityBlock>("a");
-    }
-    const unsigned int trans_; 
-    bool elbp = false;
-    unsigned int m_count = 0;
-
-    void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override  {
-      elbp = false;
-    }
- 
-   bool filter(edm::Event &, edm::EventSetup const&) override {
-      ++m_count;
-      if ( elbp ) {
-        throw cms::Exception("out of sequence")
-          << "endLumiBlockProduce before produce";
-      }       
-      return true;
-    }
-
-    void endLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) override {
-      ++m_count;
-      elbp = true;
-    }
-
-    void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
-    }
-
-   ~EndLumiBlockFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "EndLumiBlockFilter transitions "     
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-
-}
-}
+      ~SharedResourcesFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "SharedResourcesFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class WatchRunsFilter : public edm::one::EDFilter<edm::one::WatchRuns> {
+    public:
+      explicit WatchRunsFilter(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {}
+      bool br = false;
+      bool er = false;
+      const unsigned int trans_;
+      unsigned int m_count = 0;
+
+      bool filter(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        if (!br || er) {
+          throw cms::Exception("out of sequence") << " produce before beginRun or after endRun";
+        }
+        return true;
+      }
+
+      void beginRun(edm::Run const&, edm::EventSetup const&) override {
+        ++m_count;
+        if (br) {
+          throw cms::Exception("out of sequence") << " beginRun seen multiple times";
+        }
+        br = true;
+        er = false;
+      }
+
+      void endRun(edm::Run const&, edm::EventSetup const&) override {
+        ++m_count;
+        if (!br) {
+          throw cms::Exception("out of sequence") << " endRun before beginRun";
+        }
+        br = false;
+        er = true;
+      }
+
+      ~WatchRunsFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "WatchRunsFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class WatchLumiBlocksFilter : public edm::one::EDFilter<edm::one::WatchLuminosityBlocks> {
+    public:
+      explicit WatchLumiBlocksFilter(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {}
+      const unsigned int trans_;
+      bool bl = false;
+      bool el = false;
+      unsigned int m_count = 0;
+
+      bool filter(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        if (!bl || el) {
+          throw cms::Exception("out of sequence") << " produce before beginLumiBlock or after endLumiBlock";
+        }
+        return true;
+      }
+
+      void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
+        ++m_count;
+        if (bl) {
+          throw cms::Exception("out of sequence") << " beginLumiBlock seen mutiple times";
+        }
+        bl = true;
+        el = false;
+      }
+
+      void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
+        ++m_count;
+        if (!bl) {
+          throw cms::Exception("out of sequence") << " endLumiBlock before beginLumiBlock";
+        }
+        bl = false;
+        el = true;
+      }
+
+      ~WatchLumiBlocksFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "WatchLumiBlocksFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    namespace fltr {
+      struct Cache {
+        bool begin = true;
+        bool end = false;
+      };
+    }  // namespace fltr
+    class RunCacheFilter : public edm::one::EDFilter<edm::RunCache<fltr::Cache>> {
+    public:
+      explicit RunCacheFilter(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {}
+      const unsigned int trans_;
+      mutable unsigned int m_count = 0;
+
+      bool filter(edm::Event& iEvent, edm::EventSetup const&) override {
+        ++m_count;
+        auto c = runCache(iEvent.getRun().index());
+        if (nullptr == c) {
+          throw cms::Exception("Missing cache") << " no cache in analyze";
+        }
+
+        if (!c->begin || c->end) {
+          throw cms::Exception("out of sequence") << " produce before beginRun or after endRun";
+        }
+
+        return true;
+      }
+
+      std::shared_ptr<fltr::Cache> globalBeginRun(edm::Run const&, edm::EventSetup const&) const final {
+        ++m_count;
+        return std::make_shared<fltr::Cache>();
+      }
+
+      void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) final {
+        ++m_count;
+        auto c = runCache(iRun.index());
+        if (nullptr == c) {
+          throw cms::Exception("Missing cache") << " no cache in globalEndRun";
+        }
+        if (!c->begin) {
+          throw cms::Exception("out of sequence") << " endRun before beginRun";
+        }
+        c->begin = false;
+        c->end = true;
+      }
+
+      ~RunCacheFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "WatchRunsAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiBlockCacheFilter : public edm::one::EDFilter<edm::LuminosityBlockCache<fltr::Cache>> {
+    public:
+      explicit LumiBlockCacheFilter(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {}
+      const unsigned int trans_;
+      mutable unsigned int m_count = 0;
+
+      bool filter(edm::Event& iEvent, edm::EventSetup const&) override {
+        ++m_count;
+
+        auto c = luminosityBlockCache(iEvent.getLuminosityBlock().index());
+        if (nullptr == c) {
+          throw cms::Exception("Missing cache") << " no cache in analyze";
+        }
+
+        if (!c->begin || c->end) {
+          throw cms::Exception("out of sequence") << " produce before beginLumiBlock or after endLumiBlock";
+        }
+        return true;
+      }
+
+      std::shared_ptr<fltr::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const&,
+                                                              edm::EventSetup const&) const final {
+        ++m_count;
+        return std::make_shared<fltr::Cache>();
+      }
+
+      void globalEndLuminosityBlock(edm::LuminosityBlock const& iLumi, edm::EventSetup const&) override {
+        ++m_count;
+        auto c = luminosityBlockCache(iLumi.index());
+        if (!c->begin) {
+          throw cms::Exception("out of sequence") << " endLumiBlock before beginLumiBlock";
+        }
+        c->begin = false;
+        c->end = true;
+      }
+
+      ~LumiBlockCacheFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "WatchLumiBlocksAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class BeginRunFilter : public edm::one::EDFilter<edm::one::WatchRuns, edm::BeginRunProducer> {
+    public:
+      explicit BeginRunFilter(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<int>();
+        produces<unsigned int, edm::Transition::BeginRun>("a");
+      }
+      const unsigned int trans_;
+      unsigned int m_count = 0;
+      bool p = false;
+
+      void beginRun(edm::Run const&, edm::EventSetup const&) override { p = false; }
+
+      bool filter(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        p = true;
+        return true;
+      }
+
+      void beginRunProduce(edm::Run&, edm::EventSetup const&) override {
+        if (p) {
+          throw cms::Exception("out of sequence") << "produce before beginRunProduce";
+        }
+        ++m_count;
+      }
+
+      void endRun(edm::Run const&, edm::EventSetup const&) override {}
+
+      ~BeginRunFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "BeginRunFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class BeginLumiBlockFilter
+        : public edm::one::EDFilter<edm::one::WatchLuminosityBlocks, edm::BeginLuminosityBlockProducer> {
+    public:
+      explicit BeginLumiBlockFilter(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int, edm::Transition::BeginLuminosityBlock>("a");
+      }
+      const unsigned int trans_;
+      unsigned int m_count = 0;
+      bool p = false;
+
+      void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override { p = false; }
+
+      bool filter(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        p = true;
+        return true;
+      }
+
+      void beginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) override {
+        ++m_count;
+        if (p) {
+          throw cms::Exception("out of sequence") << "produce before beginLuminosityBlockProduce";
+        }
+      }
+
+      void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {}
+
+      ~BeginLumiBlockFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "BeginLumiBlockFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class EndRunFilter : public edm::one::EDFilter<edm::one::WatchRuns, edm::EndRunProducer> {
+    public:
+      explicit EndRunFilter(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int, edm::Transition::EndRun>("a");
+      }
+      const unsigned int trans_;
+      bool erp = false;
+      unsigned int m_count = 0;
+
+      void beginRun(edm::Run const&, edm::EventSetup const&) override { erp = false; }
+
+      bool filter(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        if (erp) {
+          throw cms::Exception("out of sequence") << "endRunProduce before produce";
+        }
+        return true;
+      }
+
+      void endRunProduce(edm::Run&, edm::EventSetup const&) override { ++m_count; }
+
+      void endRun(edm::Run const&, edm::EventSetup const&) override {}
+
+      ~EndRunFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "EndRunFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class EndLumiBlockFilter
+        : public edm::one::EDFilter<edm::one::WatchLuminosityBlocks, edm::EndLuminosityBlockProducer> {
+    public:
+      explicit EndLumiBlockFilter(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<unsigned int, edm::Transition::EndLuminosityBlock>("a");
+      }
+      const unsigned int trans_;
+      bool elbp = false;
+      unsigned int m_count = 0;
+
+      void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override { elbp = false; }
+
+      bool filter(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        if (elbp) {
+          throw cms::Exception("out of sequence") << "endLumiBlockProduce before produce";
+        }
+        return true;
+      }
+
+      void endLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) override {
+        ++m_count;
+        elbp = true;
+      }
+
+      void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {}
+
+      ~EndLumiBlockFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "EndLumiBlockFilter transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+  }  // namespace one
+}  // namespace edmtest
 
 DEFINE_FWK_MODULE(edmtest::one::SharedResourcesFilter);
 DEFINE_FWK_MODULE(edmtest::one::WatchRunsFilter);
@@ -430,5 +376,3 @@ DEFINE_FWK_MODULE(edmtest::one::BeginRunFilter);
 DEFINE_FWK_MODULE(edmtest::one::BeginLumiBlockFilter);
 DEFINE_FWK_MODULE(edmtest::one::EndRunFilter);
 DEFINE_FWK_MODULE(edmtest::one::EndLumiBlockFilter);
-
-
diff --git a/FWCore/Framework/test/stubs/TestOneProducers.cc b/FWCore/Framework/test/stubs/TestOneProducers.cc
index d572baf9c33ad..3d7603f4117b8 100644
--- a/FWCore/Framework/test/stubs/TestOneProducers.cc
+++ b/FWCore/Framework/test/stubs/TestOneProducers.cc
@@ -24,422 +24,370 @@ for testing purposes only.
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 
+namespace edmtest {
+  namespace one {
 
+    class SharedResourcesProducer : public edm::one::EDProducer<edm::one::SharedResources> {
+    public:
+      explicit SharedResourcesProducer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<int>();
+        usesResource();
+      }
+      const unsigned int trans_;
+      unsigned int m_count = 0;
 
-namespace edmtest {
-namespace one {
-
-  class SharedResourcesProducer : public edm::one::EDProducer<edm::one::SharedResources> {
-  public:
-    explicit SharedResourcesProducer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {
-      produces<int>();
-      usesResource();
-    }
-    const unsigned int trans_; 
-    unsigned int m_count = 0;
-
-    void produce(edm::Event&, edm::EventSetup const&) override { 
-      ++m_count;
-    }
-       
-    ~SharedResourcesProducer() noexcept(false) {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "SharedResourcesProducer transitions " 
-          << m_count << " but it was supposed to be " << trans_;
-      }
-    }
-
-  };
-
-  
-  class WatchRunsProducer : public edm::one::EDProducer<edm::one::WatchRuns> {
-  public:
-    explicit WatchRunsProducer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {
-      produces<int>();
-    }
-    bool br = false;
-    bool er = false;
-    const unsigned int trans_; 
-    unsigned int m_count = 0;
-
-    void produce(edm::Event &, edm::EventSetup const&) override  { 
-      ++m_count;
-      if ( !br  || er ) {
-          throw cms::Exception("out of sequence")
-          << " produce before beginRun or after endRun";
-      } 
-    }
- 
-    void beginRun(edm::Run const&, edm::EventSetup const&) override { 
-      ++m_count;
-      if ( br ) {
-        throw cms::Exception("out of sequence")
-          << " beginRun seen multiple times";    
-      }
-      br = true;
-      er = false;
-    }
- 
-    void endRun(edm::Run const&, edm::EventSetup const&) override { 
-      ++m_count;
-      if ( !br ) {
-        throw cms::Exception("out of sequence")
-          << " endRun before beginRun";    
-      }
-      br = false;
-      er = true;
-    }
-     
-    ~WatchRunsProducer() noexcept(false) {
-       if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "WatchRunsProducer transitions " 
-          << m_count << " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-
-  class WatchLumiBlocksProducer : public edm::one::EDProducer<edm::one::WatchLuminosityBlocks> {
-  public:
-    explicit WatchLumiBlocksProducer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {
-      produces<int>();
-    }
-    const unsigned int trans_; 
-    bool bl = false;
-    bool el = false;
-    unsigned int m_count = 0;
-
-    void produce(edm::Event&, edm::EventSetup const&) override { 
-      ++m_count;
-      if ( !bl  || el ) {
-          throw cms::Exception("out of sequence")
-          << " produce before beginLumiBlock or after endLumiBlock";
-      }       
-    }
-
-    void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override  {
-      ++m_count;
-      if ( bl ) {
-        throw cms::Exception("out of sequence")
-          << " beginLumiBlock seen mutiple times";    
-      }
-      bl = true;
-      el = false;
-     }
-
-    void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
-      ++m_count;
-      if ( !bl ) {
-        throw cms::Exception("out of sequence")
-          << " endLumiBlock before beginLumiBlock";    
-      }
-      bl = false;
-      el = true;
-    }
-
-    ~WatchLumiBlocksProducer() noexcept(false) {
-       if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "WatchLumiBlockProducer transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-       }
-    }
-  };
-  
-  namespace prdr {
-    struct Cache { bool begin = true; bool end = false; };
-  }
-  class RunCacheProducer: public edm::one::EDProducer<edm::RunCache<prdr::Cache>> {
-  public:
-    explicit RunCacheProducer(edm::ParameterSet const& p) :
-    trans_(p.getParameter<int>("transitions")) {
-      produces<int>();
-    }
-    const unsigned int trans_;
-    mutable unsigned int m_count = 0;
-    
-    void produce(edm::Event& iEvent, edm::EventSetup const&) override {
-      ++m_count;
-      auto c = runCache(iEvent.getRun().index());
-      if( nullptr == c) {
-        throw cms::Exception("Missing cache") <<" no cache in analyze";
-      }
-      
-      if ( !c->begin  || c->end ) {
-        throw cms::Exception("out of sequence")
-        << " produce before beginRun or after endRun";
-      }
-    }
-    
-    std::shared_ptr<prdr::Cache> globalBeginRun(edm::Run const&, edm::EventSetup const&) const final {
-      ++m_count;
-      return std::make_shared<prdr::Cache>();
-    }
-    
-    void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) final {
-      ++m_count;
-      auto c = runCache(iRun.index());
-      if( nullptr == c) {
-        throw cms::Exception("Missing cache") <<" no cache in globalEndRun";
-      }
-      if ( !c->begin ) {
-        throw cms::Exception("out of sequence")
-        << " endRun before beginRun";
-      }
-      c->begin = false;
-      c->end = true;
-    }
-    
-    ~RunCacheProducer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-        << "WatchRunsAnalyzer transitions "
-        << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-  
-  
-  class LumiBlockCacheProducer: public edm::one::EDProducer<edm::LuminosityBlockCache<prdr::Cache>> {
-  public:
-    explicit LumiBlockCacheProducer(edm::ParameterSet const& p) :
-    trans_(p.getParameter<int>("transitions")) {
-      produces<int>();
-    }
-    const unsigned int trans_;
-    mutable unsigned int m_count = 0;
-    
-    void produce(edm::Event& iEvent, edm::EventSetup const&) override {
-      ++m_count;
-      
-      auto c = luminosityBlockCache(iEvent.getLuminosityBlock().index());
-      if( nullptr == c) {
-        throw cms::Exception("Missing cache") <<" no cache in analyze";
-      }
-      
-      if ( !c->begin  || c->end ) {
-        throw cms::Exception("out of sequence")
-        << " produce before beginLumiBlock or after endLumiBlock";
-      }
-    }
-    
-    std::shared_ptr<prdr::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const final {
-      ++m_count;
-      return std::make_shared<prdr::Cache>();
-    }
-    
-    void globalEndLuminosityBlock(edm::LuminosityBlock const& iLumi, edm::EventSetup const&) override {
-      ++m_count;
-      auto c = luminosityBlockCache(iLumi.index());
-      if ( !c->begin ) {
-        throw cms::Exception("out of sequence")
-        << " endLumiBlock before beginLumiBlock";
-      }
-      c->begin = false;
-      c->end = true;
-    }
-    
-    ~LumiBlockCacheProducer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-        << "WatchLumiBlocksAnalyzer transitions "
-        << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestBeginRunProducer : public edm::one::EDProducer<edm::one::WatchRuns,edm::BeginRunProducer> {
-  public:
-    explicit TestBeginRunProducer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {
-      produces<int>();
-      produces<unsigned int, edm::Transition::BeginRun>("a");
-    }
-    const unsigned int trans_; 
-    unsigned int m_count = 0;
-    bool p = false;
-
-    void beginRun(edm::Run const&, edm::EventSetup const&) override { 
-      p = false;
-    }
- 
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-      p=true;
-    }
-
-    void beginRunProduce(edm::Run&, edm::EventSetup const&) override {
-      if ( p ) {
-        throw cms::Exception("out of sequence")
-          << "produce before beginRunProduce";
-      }
-      ++m_count;
-    }
-
-    void endRun(edm::Run const&, edm::EventSetup const&) override { 
-    }
-
-    ~TestBeginRunProducer() noexcept(false) {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestBeginRunProducer transitions "
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestBeginLumiBlockProducer : public edm::one::EDProducer<edm::one::WatchLuminosityBlocks,edm::BeginLuminosityBlockProducer> {
-  public:
-    explicit TestBeginLumiBlockProducer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {	
-      produces<int>();
-      produces<unsigned int, edm::Transition::BeginLuminosityBlock>("a");
-    }
-    const unsigned int trans_; 
-    unsigned int m_count = 0;
-    bool p = false;
-
-    void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override  {
-      p = false;
-    }
- 
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-      p = true;
-    }
-
-    void beginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) override {   
-       ++m_count;
-      if ( p ) {
-        throw cms::Exception("out of sequence")
-          << "produce before beginLuminosityBlockProduce";
-      }
-    }
-
-    void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
-    }
-
-    ~TestBeginLumiBlockProducer() noexcept(false) {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestBeginLumiBlockProducer transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestEndRunProducer : public edm::one::EDProducer<edm::one::WatchRuns,edm::EndRunProducer> {
-  public:
-    explicit TestEndRunProducer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {
-      produces<int>();
-      produces<unsigned int, edm::Transition::EndRun>("a");
-    }
-    const unsigned int trans_;
-    bool erp = false; 
-
-    void beginRun(edm::Run const&, edm::EventSetup const&) override { 
-      erp = false;
-    }
- 
-     unsigned int m_count = 0;
-
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-      if ( erp ) {
-        throw cms::Exception("out of sequence")
-          << "endRunProduce before produce";
-      }
-    }
-
-    void endRunProduce(edm::Run&, edm::EventSetup const&) override {
-      ++m_count;
-      erp = true;
-    }
-
-    void endRun(edm::Run const&, edm::EventSetup const&) override { 
-    }
-
-    ~TestEndRunProducer() noexcept(false) {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestEndRunProducer transitions "
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestEndLumiBlockProducer : public edm::one::EDProducer<edm::one::WatchLuminosityBlocks,edm::EndLuminosityBlockProducer> {
-  public:
-    explicit TestEndLumiBlockProducer(edm::ParameterSet const& p) :
-	trans_(p.getParameter<int>("transitions")) {	
-      produces<int>();
-      produces<unsigned int, edm::Transition::EndLuminosityBlock>("a");
-    }
-    const unsigned int trans_; 
-    bool elbp = false;
-    unsigned int m_count = 0;
-
-    void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override  {
-      elbp = false;
-    }
- 
-
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-      if ( elbp ) {
-        throw cms::Exception("out of sequence")
-          << "endLumiBlockProduce before produce";
-      }
-    }
-
-    void endLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) override {
-      ++m_count;
-      elbp = true;
-    }
-
-    void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
-    }
-     
-    ~TestEndLumiBlockProducer() noexcept(false) {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << "TestEndLumiBlockProducer transitions " 
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestAccumulator : public edm::one::EDProducer<edm::Accumulator> {
-  public:
-
-    explicit TestAccumulator(edm::ParameterSet const& p) :
-      m_expectedCount(p.getParameter<unsigned int>("expectedCount")) {
-    }
-
-    void accumulate(edm::Event const&, edm::EventSetup const&) override {
-      ++m_count;
-    }
-
-    ~TestAccumulator() {
-      if (m_count.load() != m_expectedCount) {
-        throw cms::Exception("TestCount")
-          << "TestAccumulator counter was "
-          << m_count << " but it was supposed to be " << m_expectedCount;
-      }
-    }
-
-    mutable std::atomic<unsigned int> m_count{0};
-    const unsigned int m_expectedCount;
-  };
-
-}
-}
+      void produce(edm::Event&, edm::EventSetup const&) override { ++m_count; }
+
+      ~SharedResourcesProducer() noexcept(false) {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "SharedResourcesProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class WatchRunsProducer : public edm::one::EDProducer<edm::one::WatchRuns> {
+    public:
+      explicit WatchRunsProducer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<int>();
+      }
+      bool br = false;
+      bool er = false;
+      const unsigned int trans_;
+      unsigned int m_count = 0;
+
+      void produce(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        if (!br || er) {
+          throw cms::Exception("out of sequence") << " produce before beginRun or after endRun";
+        }
+      }
+
+      void beginRun(edm::Run const&, edm::EventSetup const&) override {
+        ++m_count;
+        if (br) {
+          throw cms::Exception("out of sequence") << " beginRun seen multiple times";
+        }
+        br = true;
+        er = false;
+      }
+
+      void endRun(edm::Run const&, edm::EventSetup const&) override {
+        ++m_count;
+        if (!br) {
+          throw cms::Exception("out of sequence") << " endRun before beginRun";
+        }
+        br = false;
+        er = true;
+      }
+
+      ~WatchRunsProducer() noexcept(false) {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "WatchRunsProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class WatchLumiBlocksProducer : public edm::one::EDProducer<edm::one::WatchLuminosityBlocks> {
+    public:
+      explicit WatchLumiBlocksProducer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<int>();
+      }
+      const unsigned int trans_;
+      bool bl = false;
+      bool el = false;
+      unsigned int m_count = 0;
+
+      void produce(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        if (!bl || el) {
+          throw cms::Exception("out of sequence") << " produce before beginLumiBlock or after endLumiBlock";
+        }
+      }
+
+      void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
+        ++m_count;
+        if (bl) {
+          throw cms::Exception("out of sequence") << " beginLumiBlock seen mutiple times";
+        }
+        bl = true;
+        el = false;
+      }
+
+      void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
+        ++m_count;
+        if (!bl) {
+          throw cms::Exception("out of sequence") << " endLumiBlock before beginLumiBlock";
+        }
+        bl = false;
+        el = true;
+      }
+
+      ~WatchLumiBlocksProducer() noexcept(false) {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "WatchLumiBlockProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    namespace prdr {
+      struct Cache {
+        bool begin = true;
+        bool end = false;
+      };
+    }  // namespace prdr
+    class RunCacheProducer : public edm::one::EDProducer<edm::RunCache<prdr::Cache>> {
+    public:
+      explicit RunCacheProducer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<int>();
+      }
+      const unsigned int trans_;
+      mutable unsigned int m_count = 0;
+
+      void produce(edm::Event& iEvent, edm::EventSetup const&) override {
+        ++m_count;
+        auto c = runCache(iEvent.getRun().index());
+        if (nullptr == c) {
+          throw cms::Exception("Missing cache") << " no cache in analyze";
+        }
+
+        if (!c->begin || c->end) {
+          throw cms::Exception("out of sequence") << " produce before beginRun or after endRun";
+        }
+      }
+
+      std::shared_ptr<prdr::Cache> globalBeginRun(edm::Run const&, edm::EventSetup const&) const final {
+        ++m_count;
+        return std::make_shared<prdr::Cache>();
+      }
+
+      void globalEndRun(edm::Run const& iRun, edm::EventSetup const&) final {
+        ++m_count;
+        auto c = runCache(iRun.index());
+        if (nullptr == c) {
+          throw cms::Exception("Missing cache") << " no cache in globalEndRun";
+        }
+        if (!c->begin) {
+          throw cms::Exception("out of sequence") << " endRun before beginRun";
+        }
+        c->begin = false;
+        c->end = true;
+      }
+
+      ~RunCacheProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "WatchRunsAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiBlockCacheProducer : public edm::one::EDProducer<edm::LuminosityBlockCache<prdr::Cache>> {
+    public:
+      explicit LumiBlockCacheProducer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<int>();
+      }
+      const unsigned int trans_;
+      mutable unsigned int m_count = 0;
+
+      void produce(edm::Event& iEvent, edm::EventSetup const&) override {
+        ++m_count;
+
+        auto c = luminosityBlockCache(iEvent.getLuminosityBlock().index());
+        if (nullptr == c) {
+          throw cms::Exception("Missing cache") << " no cache in analyze";
+        }
+
+        if (!c->begin || c->end) {
+          throw cms::Exception("out of sequence") << " produce before beginLumiBlock or after endLumiBlock";
+        }
+      }
+
+      std::shared_ptr<prdr::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const&,
+                                                              edm::EventSetup const&) const final {
+        ++m_count;
+        return std::make_shared<prdr::Cache>();
+      }
+
+      void globalEndLuminosityBlock(edm::LuminosityBlock const& iLumi, edm::EventSetup const&) override {
+        ++m_count;
+        auto c = luminosityBlockCache(iLumi.index());
+        if (!c->begin) {
+          throw cms::Exception("out of sequence") << " endLumiBlock before beginLumiBlock";
+        }
+        c->begin = false;
+        c->end = true;
+      }
+
+      ~LumiBlockCacheProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "WatchLumiBlocksAnalyzer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestBeginRunProducer : public edm::one::EDProducer<edm::one::WatchRuns, edm::BeginRunProducer> {
+    public:
+      explicit TestBeginRunProducer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<int>();
+        produces<unsigned int, edm::Transition::BeginRun>("a");
+      }
+      const unsigned int trans_;
+      unsigned int m_count = 0;
+      bool p = false;
+
+      void beginRun(edm::Run const&, edm::EventSetup const&) override { p = false; }
+
+      void produce(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        p = true;
+      }
+
+      void beginRunProduce(edm::Run&, edm::EventSetup const&) override {
+        if (p) {
+          throw cms::Exception("out of sequence") << "produce before beginRunProduce";
+        }
+        ++m_count;
+      }
+
+      void endRun(edm::Run const&, edm::EventSetup const&) override {}
+
+      ~TestBeginRunProducer() noexcept(false) {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestBeginRunProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestBeginLumiBlockProducer
+        : public edm::one::EDProducer<edm::one::WatchLuminosityBlocks, edm::BeginLuminosityBlockProducer> {
+    public:
+      explicit TestBeginLumiBlockProducer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<int>();
+        produces<unsigned int, edm::Transition::BeginLuminosityBlock>("a");
+      }
+      const unsigned int trans_;
+      unsigned int m_count = 0;
+      bool p = false;
+
+      void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override { p = false; }
+
+      void produce(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        p = true;
+      }
+
+      void beginLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) override {
+        ++m_count;
+        if (p) {
+          throw cms::Exception("out of sequence") << "produce before beginLuminosityBlockProduce";
+        }
+      }
+
+      void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {}
+
+      ~TestBeginLumiBlockProducer() noexcept(false) {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestBeginLumiBlockProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestEndRunProducer : public edm::one::EDProducer<edm::one::WatchRuns, edm::EndRunProducer> {
+    public:
+      explicit TestEndRunProducer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<int>();
+        produces<unsigned int, edm::Transition::EndRun>("a");
+      }
+      const unsigned int trans_;
+      bool erp = false;
+
+      void beginRun(edm::Run const&, edm::EventSetup const&) override { erp = false; }
+
+      unsigned int m_count = 0;
+
+      void produce(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        if (erp) {
+          throw cms::Exception("out of sequence") << "endRunProduce before produce";
+        }
+      }
+
+      void endRunProduce(edm::Run&, edm::EventSetup const&) override {
+        ++m_count;
+        erp = true;
+      }
+
+      void endRun(edm::Run const&, edm::EventSetup const&) override {}
+
+      ~TestEndRunProducer() noexcept(false) {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestEndRunProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestEndLumiBlockProducer
+        : public edm::one::EDProducer<edm::one::WatchLuminosityBlocks, edm::EndLuminosityBlockProducer> {
+    public:
+      explicit TestEndLumiBlockProducer(edm::ParameterSet const& p) : trans_(p.getParameter<int>("transitions")) {
+        produces<int>();
+        produces<unsigned int, edm::Transition::EndLuminosityBlock>("a");
+      }
+      const unsigned int trans_;
+      bool elbp = false;
+      unsigned int m_count = 0;
+
+      void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override { elbp = false; }
+
+      void produce(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        if (elbp) {
+          throw cms::Exception("out of sequence") << "endLumiBlockProduce before produce";
+        }
+      }
+
+      void endLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&) override {
+        ++m_count;
+        elbp = true;
+      }
+
+      void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {}
+
+      ~TestEndLumiBlockProducer() noexcept(false) {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions")
+              << "TestEndLumiBlockProducer transitions " << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestAccumulator : public edm::one::EDProducer<edm::Accumulator> {
+    public:
+      explicit TestAccumulator(edm::ParameterSet const& p)
+          : m_expectedCount(p.getParameter<unsigned int>("expectedCount")) {}
+
+      void accumulate(edm::Event const&, edm::EventSetup const&) override { ++m_count; }
+
+      ~TestAccumulator() {
+        if (m_count.load() != m_expectedCount) {
+          throw cms::Exception("TestCount")
+              << "TestAccumulator counter was " << m_count << " but it was supposed to be " << m_expectedCount;
+        }
+      }
+
+      mutable std::atomic<unsigned int> m_count{0};
+      const unsigned int m_expectedCount;
+    };
+
+  }  // namespace one
+}  // namespace edmtest
 
 DEFINE_FWK_MODULE(edmtest::one::SharedResourcesProducer);
 DEFINE_FWK_MODULE(edmtest::one::WatchRunsProducer);
diff --git a/FWCore/Framework/test/stubs/TestOutputModule.cc b/FWCore/Framework/test/stubs/TestOutputModule.cc
index 6fded15acce51..429168eeb5eff 100644
--- a/FWCore/Framework/test/stubs/TestOutputModule.cc
+++ b/FWCore/Framework/test/stubs/TestOutputModule.cc
@@ -11,7 +11,6 @@
 #include "FWCore/Framework/interface/RunForOutput.h"
 #include "FWCore/ServiceRegistry/interface/ModuleCallingContext.h"
 
-
 #include <cassert>
 #include <string>
 #include <iostream>
@@ -23,46 +22,38 @@ using namespace edm;
 
 namespace {
 
- void printBits(unsigned char c){
-
-         //cout << "HEX: "<< "0123456789ABCDEF"[((c >> 4) & 0xF)] << std::endl;
-
-        for (int i = 7; i >= 0; --i) {
-            int bit = ((c >> i) & 1);
-            std::cout << " "<<bit;
-        }
- }
-
- void packIntoString(std::vector<unsigned char> const& source,
-                    std::vector<unsigned char>& package)
- {
- unsigned int packInOneByte = 4;
- unsigned int sizeOfPackage = 1 + 
-           ((source.size()-1)/packInOneByte); //Two bits per HLT
- if (source.size() == 0) sizeOfPackage = 0;
- 
- package.resize(sizeOfPackage);
- memset(&package[0], 0x00, sizeOfPackage);
-    
- for (unsigned int i=0; i != source.size() ; ++i)
-   { 
-      unsigned int whichByte = i/packInOneByte;
-      unsigned int indxWithinByte = i % packInOneByte;
-      package[whichByte] = package[whichByte] | 
-                            (source[i] << (indxWithinByte*2));
-   }
-  //for (unsigned int i=0; i !=package.size() ; ++i)
-  //   printBits(package[i]);
-   std::cout<< std::endl;
+  void printBits(unsigned char c) {
+    //cout << "HEX: "<< "0123456789ABCDEF"[((c >> 4) & 0xF)] << std::endl;
+
+    for (int i = 7; i >= 0; --i) {
+      int bit = ((c >> i) & 1);
+      std::cout << " " << bit;
+    }
+  }
 
- }
+  void packIntoString(std::vector<unsigned char> const& source, std::vector<unsigned char>& package) {
+    unsigned int packInOneByte = 4;
+    unsigned int sizeOfPackage = 1 + ((source.size() - 1) / packInOneByte);  //Two bits per HLT
+    if (source.size() == 0)
+      sizeOfPackage = 0;
+
+    package.resize(sizeOfPackage);
+    memset(&package[0], 0x00, sizeOfPackage);
+
+    for (unsigned int i = 0; i != source.size(); ++i) {
+      unsigned int whichByte = i / packInOneByte;
+      unsigned int indxWithinByte = i % packInOneByte;
+      package[whichByte] = package[whichByte] | (source[i] << (indxWithinByte * 2));
+    }
+    //for (unsigned int i=0; i !=package.size() ; ++i)
+    //   printBits(package[i]);
+    std::cout << std::endl;
+  }
 
-}
-namespace edmtest
-{
+}  // namespace
+namespace edmtest {
 
-  class TestOutputModule : public edm::OutputModule
-  {
+  class TestOutputModule : public edm::OutputModule {
   public:
     explicit TestOutputModule(edm::ParameterSet const&);
     virtual ~TestOutputModule();
@@ -82,22 +73,17 @@ namespace edmtest
 
   // -----------------------------------------------------------------
 
-  TestOutputModule::TestOutputModule(edm::ParameterSet const& ps):
-    edm::OutputModule(ps),
-    name_(ps.getParameter<std::string>("name")),
-    bitMask_(ps.getParameter<int>("bitMask")),
-    hltbits_(0),
-    expectTriggerResults_(ps.getUntrackedParameter<bool>("expectTriggerResults",true)),
-  resultsToken_(consumes<edm::TriggerResults>(edm::InputTag("TriggerResults")))
-  {
-  }
-    
-  TestOutputModule::~TestOutputModule()
-  {
-  }
+  TestOutputModule::TestOutputModule(edm::ParameterSet const& ps)
+      : edm::OutputModule(ps),
+        name_(ps.getParameter<std::string>("name")),
+        bitMask_(ps.getParameter<int>("bitMask")),
+        hltbits_(0),
+        expectTriggerResults_(ps.getUntrackedParameter<bool>("expectTriggerResults", true)),
+        resultsToken_(consumes<edm::TriggerResults>(edm::InputTag("TriggerResults"))) {}
 
-  void TestOutputModule::write(edm::EventForOutput const& e)
-  {
+  TestOutputModule::~TestOutputModule() {}
+
+  void TestOutputModule::write(edm::EventForOutput const& e) {
     assert(e.moduleCallingContext()->moduleDescription()->moduleLabel() == description().moduleLabel());
 
     Trig prod;
@@ -116,19 +102,16 @@ namespace edmtest
     // if a TriggerResults object is found.
 
     if (!expectTriggerResults_) {
-
       try {
         prod = getTriggerResults(resultsToken_, e);
         //throw doesn't happen until we dereference
         *prod;
-      }
-      catch (const cms::Exception&) {
+      } catch (const cms::Exception&) {
         // We did not find one as expected, nothing else to test.
         return;
       }
       std::cerr << "\nTestOutputModule::write\n"
-           << "Expected there to be no TriggerResults object but we found one"
-           << std::endl;
+                << "Expected there to be no TriggerResults object but we found one" << std::endl;
       abort();
     }
 
@@ -140,9 +123,9 @@ namespace edmtest
     std::vector<unsigned char> vHltState;
 
     std::vector<std::string> hlts = getAllTriggerNames();
-    unsigned int hltSize = hlts.size(); 
+    unsigned int hltSize = hlts.size();
 
-    for(unsigned int i=0; i != hltSize ; ++i) {
+    for (unsigned int i = 0; i != hltSize; ++i) {
       vHltState.push_back(((prod->at(i)).state()));
     }
 
@@ -150,27 +133,30 @@ namespace edmtest
     packIntoString(vHltState, hltbits_);
 
     //This is Just a printing code.
-    std::cout <<"Size of hltbits:"<<hltbits_.size()<< std::endl;
+    std::cout << "Size of hltbits:" << hltbits_.size() << std::endl;
 
     char* intp = (char*)&bitMask_;
     bool matched = false;
 
-    for(int i = hltbits_.size() - 1; i != -1 ; --i) {
-      std::cout<< std::endl<<"Current Bits Mask byte:";printBits(hltbits_[i]);
-      unsigned char tmp = static_cast<unsigned char>(*(intp+i));
-      std::cout<< std::endl<<"Original Byte:";printBits(tmp);std::cout<< std::endl;
+    for (int i = hltbits_.size() - 1; i != -1; --i) {
+      std::cout << std::endl << "Current Bits Mask byte:";
+      printBits(hltbits_[i]);
+      unsigned char tmp = static_cast<unsigned char>(*(intp + i));
+      std::cout << std::endl << "Original Byte:";
+      printBits(tmp);
+      std::cout << std::endl;
 
-      if (tmp == hltbits_[i]) matched = true;
+      if (tmp == hltbits_[i])
+        matched = true;
     }
-    std::cout<<"\n";
+    std::cout << "\n";
 
-    if ( !matched && hltSize > 0)
-    {
-       std::cerr << "\ncfg bitMask is different from event..aborting."<< std::endl;
+    if (!matched && hltSize > 0) {
+      std::cerr << "\ncfg bitMask is different from event..aborting." << std::endl;
 
-       abort();
-    }
-    else std::cout <<"\nSUCCESS: Found Matching Bits"<< std::endl;
+      abort();
+    } else
+      std::cout << "\nSUCCESS: Found Matching Bits" << std::endl;
   }
 
   void TestOutputModule::writeLuminosityBlock(edm::LuminosityBlockForOutput const& lb) {
@@ -181,10 +167,8 @@ namespace edmtest
     assert(r.moduleCallingContext()->moduleDescription()->moduleLabel() == description().moduleLabel());
   }
 
-  void TestOutputModule::endJob()
-  {
-  }
-}
+  void TestOutputModule::endJob() {}
+}  // namespace edmtest
 using edmtest::TestOutputModule;
 
 DEFINE_FWK_MODULE(TestOutputModule);
diff --git a/FWCore/Framework/test/stubs/TestPRegisterModule1.cc b/FWCore/Framework/test/stubs/TestPRegisterModule1.cc
index 42130e1a7d766..1fe442463926b 100644
--- a/FWCore/Framework/test/stubs/TestPRegisterModule1.cc
+++ b/FWCore/Framework/test/stubs/TestPRegisterModule1.cc
@@ -6,7 +6,6 @@
    \date 19 May 2005
 */
 
-
 #include "FWCore/Framework/interface/Event.h"
 
 #include "DataFormats/TestObjects/interface/ToyProducts.h"
@@ -16,14 +15,11 @@
 
 using namespace edm;
 
-
-TestPRegisterModule1::TestPRegisterModule1(edm::ParameterSet const& p):pset_(p){
-   produces<edmtest::StringProduct>();
+TestPRegisterModule1::TestPRegisterModule1(edm::ParameterSet const& p) : pset_(p) {
+  produces<edmtest::StringProduct>();
 }
 
-void TestPRegisterModule1::produce(Event& e, EventSetup const&)
-{
-  
+void TestPRegisterModule1::produce(Event& e, EventSetup const&) {
   std::string myname = pset_.getParameter<std::string>("@module_label");
   e.put(std::make_unique<edmtest::StringProduct>(myname));
 }
diff --git a/FWCore/Framework/test/stubs/TestPRegisterModule1.h b/FWCore/Framework/test/stubs/TestPRegisterModule1.h
index e2bbaf3d9fe21..37f3af37e6e71 100644
--- a/FWCore/Framework/test/stubs/TestPRegisterModule1.h
+++ b/FWCore/Framework/test/stubs/TestPRegisterModule1.h
@@ -4,7 +4,7 @@
 //
 // Package:     test
 // Class  :     TestPRegisterModule1
-// 
+//
 /**\class TestPRegisterModule1 TestPRegisterModule1.h Framework/test/interface/TestPRegisterModule1.h
 
  Description: <one line class summary>
@@ -26,15 +26,13 @@
 
 // forward declarations
 
-class TestPRegisterModule1 : public edm::EDProducer
-{
+class TestPRegisterModule1 : public edm::EDProducer {
 public:
-   explicit TestPRegisterModule1(edm::ParameterSet const& p);   
-   void produce(edm::Event& e, edm::EventSetup const&);
-   
+  explicit TestPRegisterModule1(edm::ParameterSet const& p);
+  void produce(edm::Event& e, edm::EventSetup const&);
+
 private:
-   edm::ParameterSet pset_;
+  edm::ParameterSet pset_;
 };
 
-
 #endif
diff --git a/FWCore/Framework/test/stubs/TestPRegisterModule2.cc b/FWCore/Framework/test/stubs/TestPRegisterModule2.cc
index 155248c933bb0..3d40b0ebe8311 100644
--- a/FWCore/Framework/test/stubs/TestPRegisterModule2.cc
+++ b/FWCore/Framework/test/stubs/TestPRegisterModule2.cc
@@ -19,42 +19,41 @@
 
 using namespace edm;
 
-TestPRegisterModule2::TestPRegisterModule2(edm::ParameterSet const&){
-   produces<edmtest::DoubleProduct>();
-   consumes<edmtest::StringProduct>(edm::InputTag{"m2"});
+TestPRegisterModule2::TestPRegisterModule2(edm::ParameterSet const&) {
+  produces<edmtest::DoubleProduct>();
+  consumes<edmtest::StringProduct>(edm::InputTag{"m2"});
 }
 
-  void TestPRegisterModule2::produce(Event& e, EventSetup const&)
-  {
-     std::vector<edm::StableProvenance const*> plist;
-     e.getAllStableProvenance(plist);
-
-     std::vector<edm::StableProvenance const*>::const_iterator pd = plist.begin();
-     
-     CPPUNIT_ASSERT(0 !=plist.size());
-     CPPUNIT_ASSERT(2 ==plist.size());
-     CPPUNIT_ASSERT(pd != plist.end());
-     if(pd == plist.end()) return; // To silence Coverity
-     edmtest::StringProduct stringprod;
-     edm::TypeID stringID(stringprod);
-     CPPUNIT_ASSERT(stringID.friendlyClassName() == 
-                    (*pd)->friendlyClassName());
-     CPPUNIT_ASSERT((*pd)->moduleLabel()=="m1");
-     CPPUNIT_ASSERT((*pd)->releaseVersion()==getReleaseVersion());
-
-     ++pd;
-     CPPUNIT_ASSERT(pd != plist.end());
-     if(pd == plist.end()) return; // To silence Coverity
-     
-     edmtest::DoubleProduct dprod;
-     edm::TypeID dID(dprod);
-     CPPUNIT_ASSERT(dID.friendlyClassName() == 
-                  (*pd)->friendlyClassName());
-     CPPUNIT_ASSERT((*pd)->moduleLabel()=="m2");
-     
-     Handle<edmtest::StringProduct> stringp;
-     e.getByLabel("m2",stringp);
-     CPPUNIT_ASSERT(stringp->name_=="m1");
-
-     e.put(std::make_unique<edmtest::DoubleProduct>());
-  }
+void TestPRegisterModule2::produce(Event& e, EventSetup const&) {
+  std::vector<edm::StableProvenance const*> plist;
+  e.getAllStableProvenance(plist);
+
+  std::vector<edm::StableProvenance const*>::const_iterator pd = plist.begin();
+
+  CPPUNIT_ASSERT(0 != plist.size());
+  CPPUNIT_ASSERT(2 == plist.size());
+  CPPUNIT_ASSERT(pd != plist.end());
+  if (pd == plist.end())
+    return;  // To silence Coverity
+  edmtest::StringProduct stringprod;
+  edm::TypeID stringID(stringprod);
+  CPPUNIT_ASSERT(stringID.friendlyClassName() == (*pd)->friendlyClassName());
+  CPPUNIT_ASSERT((*pd)->moduleLabel() == "m1");
+  CPPUNIT_ASSERT((*pd)->releaseVersion() == getReleaseVersion());
+
+  ++pd;
+  CPPUNIT_ASSERT(pd != plist.end());
+  if (pd == plist.end())
+    return;  // To silence Coverity
+
+  edmtest::DoubleProduct dprod;
+  edm::TypeID dID(dprod);
+  CPPUNIT_ASSERT(dID.friendlyClassName() == (*pd)->friendlyClassName());
+  CPPUNIT_ASSERT((*pd)->moduleLabel() == "m2");
+
+  Handle<edmtest::StringProduct> stringp;
+  e.getByLabel("m2", stringp);
+  CPPUNIT_ASSERT(stringp->name_ == "m1");
+
+  e.put(std::make_unique<edmtest::DoubleProduct>());
+}
diff --git a/FWCore/Framework/test/stubs/TestPRegisterModule2.h b/FWCore/Framework/test/stubs/TestPRegisterModule2.h
index 1f6d26c62047b..09606a37244f9 100644
--- a/FWCore/Framework/test/stubs/TestPRegisterModule2.h
+++ b/FWCore/Framework/test/stubs/TestPRegisterModule2.h
@@ -4,7 +4,7 @@
 //
 // Package:     test
 // Class  :     TestPRegisterModule2
-// 
+//
 /**\class TestPRegisterModule2 TestPRegisterModule2.h Framework/test/interface/TestPRegisterModule2.h
 
  Description: <one line class summary>
@@ -29,15 +29,14 @@ namespace edm {
   class Event;
   class EventSetup;
   class ParameterSet;
-}
+}  // namespace edm
 
-class TestPRegisterModule2 : public edm::EDProducer
-{
+class TestPRegisterModule2 : public edm::EDProducer {
 public:
-   explicit TestPRegisterModule2(edm::ParameterSet const& p);
-   
-   void produce(edm::Event& e, edm::EventSetup const&);
-   
+  explicit TestPRegisterModule2(edm::ParameterSet const& p);
+
+  void produce(edm::Event& e, edm::EventSetup const&);
+
 private:
 };
 
diff --git a/FWCore/Framework/test/stubs/TestPRegisterModules.cc b/FWCore/Framework/test/stubs/TestPRegisterModules.cc
index 7e39e94baaa42..ca56e024ecb41 100644
--- a/FWCore/Framework/test/stubs/TestPRegisterModules.cc
+++ b/FWCore/Framework/test/stubs/TestPRegisterModules.cc
@@ -2,7 +2,7 @@
 //
 // Package:     test
 // Class  :     TestPRegisterModules
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
diff --git a/FWCore/Framework/test/stubs/TestSchedulerModule1.cc b/FWCore/Framework/test/stubs/TestSchedulerModule1.cc
index 5a30f7caf9fe5..d2f83e4abae08 100644
--- a/FWCore/Framework/test/stubs/TestSchedulerModule1.cc
+++ b/FWCore/Framework/test/stubs/TestSchedulerModule1.cc
@@ -6,7 +6,6 @@
    \date 19 May 2005
 */
 
-
 #include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -18,13 +17,9 @@
 
 using namespace edm;
 
-
-class TestSchedulerModule1 : public EDProducer
-{
- public:
-  explicit TestSchedulerModule1(ParameterSet const& p):pset_(p){
-    produces<edmtest::StringProduct>();
-  }
+class TestSchedulerModule1 : public EDProducer {
+public:
+  explicit TestSchedulerModule1(ParameterSet const& p) : pset_(p) { produces<edmtest::StringProduct>(); }
 
   void produce(Event& e, EventSetup const&);
 
@@ -32,16 +27,13 @@ class TestSchedulerModule1 : public EDProducer
   ParameterSet pset_;
 };
 
-
-void TestSchedulerModule1::produce(Event& e, EventSetup const&)
-{
+void TestSchedulerModule1::produce(Event& e, EventSetup const&) {
   std::string myname = pset_.getParameter<std::string>("module_name");
   e.put(std::make_unique<edmtest::StringProduct>(myname));
 }
 
 DEFINE_FWK_MODULE(TestSchedulerModule1);
 
-
 // Configure (x)emacs for this file ...
 // Local Variables:
 // mode:c++
diff --git a/FWCore/Framework/test/stubs/TestSchedulerModule2.cc b/FWCore/Framework/test/stubs/TestSchedulerModule2.cc
index be2f5087f994d..fe4eed9b29f23 100644
--- a/FWCore/Framework/test/stubs/TestSchedulerModule2.cc
+++ b/FWCore/Framework/test/stubs/TestSchedulerModule2.cc
@@ -6,8 +6,6 @@
    \date 19 May 2005
 */
 
-
-
 #include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -17,14 +15,11 @@
 #include <memory>
 #include <string>
 
-namespace edm{
+namespace edm {
 
-  class TestSchedulerModule2 : public EDProducer
-  {
+  class TestSchedulerModule2 : public EDProducer {
   public:
-    explicit TestSchedulerModule2(ParameterSet const& p):pset_(p){
-       produces<edmtest::StringProduct>();
-    }
+    explicit TestSchedulerModule2(ParameterSet const& p) : pset_(p) { produces<edmtest::StringProduct>(); }
 
     void produce(Event& e, EventSetup const&);
 
@@ -32,15 +27,11 @@ namespace edm{
     ParameterSet pset_;
   };
 
-
-  void TestSchedulerModule2::produce(Event& e, EventSetup const&)
-  {
-
+  void TestSchedulerModule2::produce(Event& e, EventSetup const&) {
     std::string myname = pset_.getParameter<std::string>("module_name");
     e.put(std::make_unique<edmtest::StringProduct>(myname));
-    
   }
-}//namespace  
+}  // namespace edm
 using edm::TestSchedulerModule2;
 DEFINE_FWK_MODULE(TestSchedulerModule2);
 
diff --git a/FWCore/Framework/test/stubs/TestStreamAnalyzers.cc b/FWCore/Framework/test/stubs/TestStreamAnalyzers.cc
index c26fd0a8e78d8..722cfa9b837d8 100644
--- a/FWCore/Framework/test/stubs/TestStreamAnalyzers.cc
+++ b/FWCore/Framework/test/stubs/TestStreamAnalyzers.cc
@@ -26,435 +26,419 @@ for testing purposes only.
 #include "DataFormats/Provenance/interface/BranchDescription.h"
 
 namespace edmtest {
-namespace stream {
-
-// anonymous namespace here causes build warnings
-namespace cache {
-struct Cache { 
-   Cache():value(0),run(0),lumi(0) {}
-   //Using mutable since we want to update the value.
-   mutable std::atomic<unsigned int> value;
-   mutable std::atomic<unsigned int> run;
-   mutable std::atomic<unsigned int> lumi;
-};
-} //end cache namespace
-
-  using Cache = cache::Cache;
-
-  class GlobalIntAnalyzer : public edm::stream::EDAnalyzer<edm::GlobalCache<Cache>> {
-  public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-   
-    static std::unique_ptr<Cache> initializeGlobalCache(edm::ParameterSet const& p) {
-      ++m_count;
-      return std::make_unique<Cache>();
-    }
-
-    GlobalIntAnalyzer(edm::ParameterSet const& p, Cache const * iGlobal)  {
-      trans_ = p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      callWhenNewProductsRegistered([](edm::BranchDescription const& desc)
-        { std::cout << "stream::GlobalIntAnalyzer " << desc.moduleLabel() << std::endl; });
-    }
-
-    void analyze(edm::Event const&, edm::EventSetup const&) {
-      ++m_count;
-      ++((globalCache())->value);
-       
-    }
-    
-    static void globalEndJob(Cache * iGlobal) {
-      ++m_count;
-      if(iGlobal->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << iGlobal->value << " but it was supposed to be " << cvalue_;
-      }
-    }
-
-    ~GlobalIntAnalyzer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << m_count << " but it was supposed to be " << trans_;
-      }
-    }
-
-    
-  };
-
-  class RunIntAnalyzer : public edm::stream::EDAnalyzer<edm::RunCache<Cache>> {
-  public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbr;
-    static std::atomic<bool> ger;
-    bool br;
-    bool er;
-
-    RunIntAnalyzer(edm::ParameterSet const&p) {
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      m_count = 0;
-    }
-    
-    void analyze(edm::Event const&, edm::EventSetup const&) override {
-      if(moduleDescription().processName() != edm::Service<edm::service::TriggerNamesService>()->getProcessName()) {
-        throw cms::Exception("LogicError")
-          << "module description not properly initialized in stream analyzer";
-      }
-      ++m_count;
-      ++(runCache()->value);
-       
-    }
-
-    static std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
-      ++m_count;
-      gbr = true;
-      ger = false;
-      auto pCache = std::make_shared<Cache>();
-      ++(pCache->run);
-      return pCache;
-    }
-
-    void beginRun(edm::Run const&, edm::EventSetup const&) override {
-      br = true;
-      er = true;
-      if ( !gbr ) {
-        throw cms::Exception("begin out of sequence")
-          << "beginRun seen before globalBeginRun";
-      }
-    }
-
-    static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
-      ++m_count;
-      auto pCache = iContext->run();
-      if ( pCache->run != 1 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
-      } 
-      ger = true;
-      gbr = false;
-      if( iContext->run()->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << iContext->run()->value << " but it was supposed to be " << cvalue_;
-      }
-    }
-
-    void endRun(edm::Run const&, edm::EventSetup const&) override {
-      er = true;
-      br = false;
-      if ( ger ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndRun seen before endRun";
-      }
-    }
-
-    ~RunIntAnalyzer() {
-       if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << m_count << " but it was supposed to be " << trans_;
-      }
-
-    }
-  };
-
-
-  class LumiIntAnalyzer : public edm::stream::EDAnalyzer<edm::LuminosityBlockCache<Cache>> {
-  public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbl;
-    static std::atomic<bool> gel;
-    static std::atomic<bool> bl;
-    static std::atomic<bool> el;
-
-    LumiIntAnalyzer(edm::ParameterSet const&p){
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      m_count = 0;
-    }
-     
-    void analyze(edm::Event const&, edm::EventSetup const&) override {
-      ++m_count;
-      ++(luminosityBlockCache()->value);
-       
-    }
-
-   
-    static std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, RunContext const*) {
-      ++m_count;
-      gbl = true;
-      gel = false;
-      auto pCache = std::make_shared<Cache>();
-      ++(pCache->lumi);
-      return pCache;
-   }
-
-    void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
-      bl = true;
-      el = false;
-      if ( !gbl ) {
-        throw cms::Exception("begin out of sequence")
-          << "beginLuminosityBlock seen before globalBeginLuminosityBlock";
-      }
-    }
-
-
-    static void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, LuminosityBlockContext const* iLBContext) {
-      ++m_count;
-      auto pCache = iLBContext->luminosityBlock();
-      if ( pCache->lumi != 1 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-      }       
-      gel = true;
-      gbl = false;
-      if(iLBContext->luminosityBlock()->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << iLBContext->luminosityBlock()->value << " but it was supposed to be " << cvalue_;
-      }
-    }
-
-   static void endLuminosityBlock(edm::Run const&, edm::EventSetup const&, LuminosityBlockContext const*) {
-      el = true;
-      bl = false;
-      if ( gel ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlock seen before endLuminosityBlock";
-      }      
-   }
-
-    ~LumiIntAnalyzer() {
-       if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << m_count<< " but it was supposed to be " << trans_;
-       }
-    }
-  };
-  
-  class RunSummaryIntAnalyzer : public edm::stream::EDAnalyzer<edm::RunCache<Cache>,edm::RunSummaryCache<Cache>> {
-  public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbr;
-    static std::atomic<bool> ger;
-    static std::atomic<bool> gbrs;
-    static std::atomic<bool> gers;
-    static std::atomic<bool> brs;
-    static std::atomic<bool> ers;
-    static std::atomic<bool> br;
-    static std::atomic<bool> er;
-
-    RunSummaryIntAnalyzer(edm::ParameterSet const&p){
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      m_count = 0;
-    }
-
-    void analyze(edm::Event const&, edm::EventSetup const&)  override {
-      ++m_count;
-      ++(runCache()->value);
-       
-    }
-    
-    void beginRun(edm::Run const&, edm::EventSetup const&) override {
-      br=true;
-      er=false;
-    }
-
-    static std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
-      ++m_count;
-      gbr=true;
-      ger=false;
-      auto pCache = std::make_shared<Cache>();
-      ++(pCache->run);
-      return pCache;
-   }
-    
-    static std::shared_ptr<Cache> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&, GlobalCache const*) {
-      ++m_count;
-      gbrs = true;
-      gers = false;
-      brs = true;
-      ers = false;
-      if ( !gbr ) {
-        throw cms::Exception("begin out of sequence")
-          << "globalBeginRunSummary seen before globalBeginRun";
-      }
-      return std::make_shared<Cache>();
-    }
-
-   void endRunSummary(edm::Run const&, edm::EventSetup const&, Cache* gCache) const override {
-      brs=false;
-      ers=true;
-      gCache->value += runCache()->value;
-      runCache()->value = 0;
-      if ( !er ) {
-        throw cms::Exception("end out of sequence")
-          << "endRunSummary seen before endRun";
-      }
-   }
-    
-    static void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, RunContext const*, Cache* gCache) {
-      ++m_count;
-      gbrs=false;
-      gers=true;
-      if ( !ers ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndRunSummary seen before endRunSummary";
-      }
-      if(gCache->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << gCache->value << " but it was supposed to be " << cvalue_;
-      }
-   }
-
-   static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
-      ++m_count;
-      gbr=false;
-      ger=true;
-      auto pCache = iContext->run();
-      if ( pCache->run != 1 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
-      } 
-   }
-
-    void endRun(edm::Run const&, edm::EventSetup const&) override {
-      er = true;
-      br = false;
-    }   
-
-
-    ~RunSummaryIntAnalyzer() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << m_count<< " but it was supposed to be " << trans_;
-      }
- 
-    }
-  };
-
-  class LumiSummaryIntAnalyzer : public edm::stream::EDAnalyzer<edm::LuminosityBlockCache<Cache>,edm::LuminosityBlockSummaryCache<Cache>> {
-  public:
-    static std::atomic<unsigned int> m_count;
-    static std::atomic<unsigned int> m_lumiSumCalls;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbl;
-    static std::atomic<bool> gel;
-    static std::atomic<bool> gbls;
-    static std::atomic<bool> gels;
-    static std::atomic<bool> bls;
-    static std::atomic<bool> els;
-    static std::atomic<bool> bl;
-    static std::atomic<bool> el;
-
-    LumiSummaryIntAnalyzer(edm::ParameterSet const&p){
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      m_count = 0;
-    }
-
-    void analyze(edm::Event const&, edm::EventSetup const&) override  {
-      ++m_count;
-      ++(luminosityBlockCache()->value);
-       
-    }
-
-    void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
-      bl = true;
-      el = false;
-    }
-
-    static std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, RunContext const*) {
-      ++m_count;
-      gbl = true;
-      gel = false;
-      auto pCache = std::make_shared<Cache>();
-      ++(pCache->lumi);
-      return pCache;
-    }
-
- 
-    static std::shared_ptr<Cache> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, LuminosityBlockContext const*){
-      ++m_count;
-      gbls = true;
-      gels = false;
-      bls = true;
-      els = false;
-      if ( !gbl ) {
-       throw cms::Exception("begin out of sequence")
-         << "globalBeginLuminosityBlockSummary seen before globalBeginLuminosityBlock";
-      }
-      return std::make_shared<Cache>();
-   }
-   
-   
-    void endLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, Cache* gCache) const override {
-      ++m_lumiSumCalls;
-      bls=false;
-      els=true;
-      //This routine could be called at the same time as another stream is calling analyze so must do the change atomically
-      auto v = luminosityBlockCache()->value.exchange(0);
-      gCache->value += v;
-      if ( el ) {
-        throw cms::Exception("end out of sequence")
-          << "endLuminosityBlock seen before endLuminosityBlockSummary";
-      }
-   }
-    
-    static void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, LuminosityBlockContext const*, Cache* gCache){
-     ++m_count;
-     auto nLumis = m_lumiSumCalls.load();
-     gbls=false;
-     gels=true;
-      if ( !els ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlockSummary seen before endLuminosityBlockSummary";
-      }
-     if ( gCache->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << gCache->value << " but it was supposed to be " << cvalue_<<" endLumiBlockSummary called "<<nLumis;
-     }
-   }
-
-   static void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, LuminosityBlockContext const* iLBContext) {
-      ++m_count;
-      auto pCache = iLBContext->luminosityBlock();
-      if ( pCache->lumi != 1 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-      }       
-      gel = true;
-      gbl = false;
-      if ( !gels ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlockSummary seen before globalEndLuminosityBlock";  
-      }
-   }
- 
-    static void endLuminosityBlock(edm::Run const&, edm::EventSetup const&, LuminosityBlockContext const*) {
-      el = true;
-      bl = false;
-    }
-
-
-    ~LumiSummaryIntAnalyzer() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  }; 
-
-
-}
-}
+  namespace stream {
+
+    // anonymous namespace here causes build warnings
+    namespace cache {
+      struct Cache {
+        Cache() : value(0), run(0), lumi(0) {}
+        //Using mutable since we want to update the value.
+        mutable std::atomic<unsigned int> value;
+        mutable std::atomic<unsigned int> run;
+        mutable std::atomic<unsigned int> lumi;
+      };
+    }  // namespace cache
+
+    using Cache = cache::Cache;
+
+    class GlobalIntAnalyzer : public edm::stream::EDAnalyzer<edm::GlobalCache<Cache>> {
+    public:
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+
+      static std::unique_ptr<Cache> initializeGlobalCache(edm::ParameterSet const& p) {
+        ++m_count;
+        return std::make_unique<Cache>();
+      }
+
+      GlobalIntAnalyzer(edm::ParameterSet const& p, Cache const* iGlobal) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        callWhenNewProductsRegistered([](edm::BranchDescription const& desc) {
+          std::cout << "stream::GlobalIntAnalyzer " << desc.moduleLabel() << std::endl;
+        });
+      }
+
+      void analyze(edm::Event const&, edm::EventSetup const&) {
+        ++m_count;
+        ++((globalCache())->value);
+      }
+
+      static void globalEndJob(Cache* iGlobal) {
+        ++m_count;
+        if (iGlobal->value != cvalue_) {
+          throw cms::Exception("cache value") << iGlobal->value << " but it was supposed to be " << cvalue_;
+        }
+      }
+
+      ~GlobalIntAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class RunIntAnalyzer : public edm::stream::EDAnalyzer<edm::RunCache<Cache>> {
+    public:
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbr;
+      static std::atomic<bool> ger;
+      bool br;
+      bool er;
+
+      RunIntAnalyzer(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        m_count = 0;
+      }
+
+      void analyze(edm::Event const&, edm::EventSetup const&) override {
+        if (moduleDescription().processName() != edm::Service<edm::service::TriggerNamesService>()->getProcessName()) {
+          throw cms::Exception("LogicError") << "module description not properly initialized in stream analyzer";
+        }
+        ++m_count;
+        ++(runCache()->value);
+      }
+
+      static std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
+        ++m_count;
+        gbr = true;
+        ger = false;
+        auto pCache = std::make_shared<Cache>();
+        ++(pCache->run);
+        return pCache;
+      }
+
+      void beginRun(edm::Run const&, edm::EventSetup const&) override {
+        br = true;
+        er = true;
+        if (!gbr) {
+          throw cms::Exception("begin out of sequence") << "beginRun seen before globalBeginRun";
+        }
+      }
+
+      static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
+        ++m_count;
+        auto pCache = iContext->run();
+        if (pCache->run != 1) {
+          throw cms::Exception("end out of sequence") << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
+        }
+        ger = true;
+        gbr = false;
+        if (iContext->run()->value != cvalue_) {
+          throw cms::Exception("cache value") << iContext->run()->value << " but it was supposed to be " << cvalue_;
+        }
+      }
+
+      void endRun(edm::Run const&, edm::EventSetup const&) override {
+        er = true;
+        br = false;
+        if (ger) {
+          throw cms::Exception("end out of sequence") << "globalEndRun seen before endRun";
+        }
+      }
+
+      ~RunIntAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiIntAnalyzer : public edm::stream::EDAnalyzer<edm::LuminosityBlockCache<Cache>> {
+    public:
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbl;
+      static std::atomic<bool> gel;
+      static std::atomic<bool> bl;
+      static std::atomic<bool> el;
+
+      LumiIntAnalyzer(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        m_count = 0;
+      }
+
+      void analyze(edm::Event const&, edm::EventSetup const&) override {
+        ++m_count;
+        ++(luminosityBlockCache()->value);
+      }
+
+      static std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                               edm::EventSetup const&,
+                                                               RunContext const*) {
+        ++m_count;
+        gbl = true;
+        gel = false;
+        auto pCache = std::make_shared<Cache>();
+        ++(pCache->lumi);
+        return pCache;
+      }
+
+      void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
+        bl = true;
+        el = false;
+        if (!gbl) {
+          throw cms::Exception("begin out of sequence")
+              << "beginLuminosityBlock seen before globalBeginLuminosityBlock";
+        }
+      }
+
+      static void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                           edm::EventSetup const&,
+                                           LuminosityBlockContext const* iLBContext) {
+        ++m_count;
+        auto pCache = iLBContext->luminosityBlock();
+        if (pCache->lumi != 1) {
+          throw cms::Exception("end out of sequence")
+              << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+        gel = true;
+        gbl = false;
+        if (iLBContext->luminosityBlock()->value != cvalue_) {
+          throw cms::Exception("cache value")
+              << iLBContext->luminosityBlock()->value << " but it was supposed to be " << cvalue_;
+        }
+      }
+
+      static void endLuminosityBlock(edm::Run const&, edm::EventSetup const&, LuminosityBlockContext const*) {
+        el = true;
+        bl = false;
+        if (gel) {
+          throw cms::Exception("end out of sequence") << "globalEndLuminosityBlock seen before endLuminosityBlock";
+        }
+      }
+
+      ~LumiIntAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class RunSummaryIntAnalyzer : public edm::stream::EDAnalyzer<edm::RunCache<Cache>, edm::RunSummaryCache<Cache>> {
+    public:
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbr;
+      static std::atomic<bool> ger;
+      static std::atomic<bool> gbrs;
+      static std::atomic<bool> gers;
+      static std::atomic<bool> brs;
+      static std::atomic<bool> ers;
+      static std::atomic<bool> br;
+      static std::atomic<bool> er;
+
+      RunSummaryIntAnalyzer(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        m_count = 0;
+      }
+
+      void analyze(edm::Event const&, edm::EventSetup const&) override {
+        ++m_count;
+        ++(runCache()->value);
+      }
+
+      void beginRun(edm::Run const&, edm::EventSetup const&) override {
+        br = true;
+        er = false;
+      }
+
+      static std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
+        ++m_count;
+        gbr = true;
+        ger = false;
+        auto pCache = std::make_shared<Cache>();
+        ++(pCache->run);
+        return pCache;
+      }
+
+      static std::shared_ptr<Cache> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&, GlobalCache const*) {
+        ++m_count;
+        gbrs = true;
+        gers = false;
+        brs = true;
+        ers = false;
+        if (!gbr) {
+          throw cms::Exception("begin out of sequence") << "globalBeginRunSummary seen before globalBeginRun";
+        }
+        return std::make_shared<Cache>();
+      }
+
+      void endRunSummary(edm::Run const&, edm::EventSetup const&, Cache* gCache) const override {
+        brs = false;
+        ers = true;
+        gCache->value += runCache()->value;
+        runCache()->value = 0;
+        if (!er) {
+          throw cms::Exception("end out of sequence") << "endRunSummary seen before endRun";
+        }
+      }
+
+      static void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, RunContext const*, Cache* gCache) {
+        ++m_count;
+        gbrs = false;
+        gers = true;
+        if (!ers) {
+          throw cms::Exception("end out of sequence") << "globalEndRunSummary seen before endRunSummary";
+        }
+        if (gCache->value != cvalue_) {
+          throw cms::Exception("cache value") << gCache->value << " but it was supposed to be " << cvalue_;
+        }
+      }
+
+      static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
+        ++m_count;
+        gbr = false;
+        ger = true;
+        auto pCache = iContext->run();
+        if (pCache->run != 1) {
+          throw cms::Exception("end out of sequence") << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
+        }
+      }
+
+      void endRun(edm::Run const&, edm::EventSetup const&) override {
+        er = true;
+        br = false;
+      }
+
+      ~RunSummaryIntAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiSummaryIntAnalyzer
+        : public edm::stream::EDAnalyzer<edm::LuminosityBlockCache<Cache>, edm::LuminosityBlockSummaryCache<Cache>> {
+    public:
+      static std::atomic<unsigned int> m_count;
+      static std::atomic<unsigned int> m_lumiSumCalls;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbl;
+      static std::atomic<bool> gel;
+      static std::atomic<bool> gbls;
+      static std::atomic<bool> gels;
+      static std::atomic<bool> bls;
+      static std::atomic<bool> els;
+      static std::atomic<bool> bl;
+      static std::atomic<bool> el;
+
+      LumiSummaryIntAnalyzer(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        m_count = 0;
+      }
+
+      void analyze(edm::Event const&, edm::EventSetup const&) override {
+        ++m_count;
+        ++(luminosityBlockCache()->value);
+      }
+
+      void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
+        bl = true;
+        el = false;
+      }
+
+      static std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                               edm::EventSetup const&,
+                                                               RunContext const*) {
+        ++m_count;
+        gbl = true;
+        gel = false;
+        auto pCache = std::make_shared<Cache>();
+        ++(pCache->lumi);
+        return pCache;
+      }
+
+      static std::shared_ptr<Cache> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                                      edm::EventSetup const&,
+                                                                      LuminosityBlockContext const*) {
+        ++m_count;
+        gbls = true;
+        gels = false;
+        bls = true;
+        els = false;
+        if (!gbl) {
+          throw cms::Exception("begin out of sequence")
+              << "globalBeginLuminosityBlockSummary seen before globalBeginLuminosityBlock";
+        }
+        return std::make_shared<Cache>();
+      }
+
+      void endLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                     edm::EventSetup const&,
+                                     Cache* gCache) const override {
+        ++m_lumiSumCalls;
+        bls = false;
+        els = true;
+        //This routine could be called at the same time as another stream is calling analyze so must do the change atomically
+        auto v = luminosityBlockCache()->value.exchange(0);
+        gCache->value += v;
+        if (el) {
+          throw cms::Exception("end out of sequence") << "endLuminosityBlock seen before endLuminosityBlockSummary";
+        }
+      }
+
+      static void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                  edm::EventSetup const&,
+                                                  LuminosityBlockContext const*,
+                                                  Cache* gCache) {
+        ++m_count;
+        auto nLumis = m_lumiSumCalls.load();
+        gbls = false;
+        gels = true;
+        if (!els) {
+          throw cms::Exception("end out of sequence")
+              << "globalEndLuminosityBlockSummary seen before endLuminosityBlockSummary";
+        }
+        if (gCache->value != cvalue_) {
+          throw cms::Exception("cache value")
+              << gCache->value << " but it was supposed to be " << cvalue_ << " endLumiBlockSummary called " << nLumis;
+        }
+      }
+
+      static void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                           edm::EventSetup const&,
+                                           LuminosityBlockContext const* iLBContext) {
+        ++m_count;
+        auto pCache = iLBContext->luminosityBlock();
+        if (pCache->lumi != 1) {
+          throw cms::Exception("end out of sequence")
+              << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+        gel = true;
+        gbl = false;
+        if (!gels) {
+          throw cms::Exception("end out of sequence")
+              << "globalEndLuminosityBlockSummary seen before globalEndLuminosityBlock";
+        }
+      }
+
+      static void endLuminosityBlock(edm::Run const&, edm::EventSetup const&, LuminosityBlockContext const*) {
+        el = true;
+        bl = false;
+      }
+
+      ~LumiSummaryIntAnalyzer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+  }  // namespace stream
+}  // namespace edmtest
 std::atomic<unsigned int> edmtest::stream::GlobalIntAnalyzer::m_count{0};
 std::atomic<unsigned int> edmtest::stream::RunIntAnalyzer::m_count{0};
 std::atomic<unsigned int> edmtest::stream::LumiIntAnalyzer::m_count{0};
@@ -493,4 +477,3 @@ DEFINE_FWK_MODULE(edmtest::stream::RunIntAnalyzer);
 DEFINE_FWK_MODULE(edmtest::stream::LumiIntAnalyzer);
 DEFINE_FWK_MODULE(edmtest::stream::RunSummaryIntAnalyzer);
 DEFINE_FWK_MODULE(edmtest::stream::LumiSummaryIntAnalyzer);
-
diff --git a/FWCore/Framework/test/stubs/TestStreamFilters.cc b/FWCore/Framework/test/stubs/TestStreamFilters.cc
index b8275975cc2fe..982fe84c0bfad 100644
--- a/FWCore/Framework/test/stubs/TestStreamFilters.cc
+++ b/FWCore/Framework/test/stubs/TestStreamFilters.cc
@@ -22,653 +22,642 @@ for testing purposes only.
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 
+namespace edmtest {
+  namespace stream {
 
+    // anonymous namespace here causes build warnings
+    namespace cache {
+      struct Cache {
+        Cache() : value(0), run(0), lumi(0) {}
+        //Using mutable since we want to update the value.
+        mutable std::atomic<unsigned int> value;
+        mutable std::atomic<unsigned int> run;
+        mutable std::atomic<unsigned int> lumi;
+      };
 
-namespace edmtest {
-namespace stream {
-
-// anonymous namespace here causes build warnings
-namespace cache {
-struct Cache {
-   Cache():value(0),run(0),lumi(0) {}
-   //Using mutable since we want to update the value.
-   mutable std::atomic<unsigned int> value;
-   mutable std::atomic<unsigned int> run;
-   mutable std::atomic<unsigned int> lumi;
-};
-
-} //end cache namespace
-
-  using Cache = cache::Cache;
-
-  class GlobalIntFilter : public edm::stream::EDFilter<edm::GlobalCache<Cache>> {
-  public:
-    static std::atomic<unsigned int> m_count; 
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    
-    static std::unique_ptr<Cache> initializeGlobalCache(edm::ParameterSet const&) {
-      ++m_count;
-      return std::make_unique<Cache>();
-    }
-
-    GlobalIntFilter(edm::ParameterSet const& p, const Cache* iGlobal) {
-      trans_ = p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      produces<unsigned int>();
-    }
-    
-    bool filter(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-      ++((globalCache())->value);
-       
-      return true;
-    }
-    
-    static void globalEndJob(Cache* iGlobal) {
-      ++m_count;
-      if(iGlobal->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << iGlobal->value << " but it was supposed to be " << cvalue_;
-      }
-    }
-
-    ~GlobalIntFilter() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << m_count << " but it was supposed to be " << trans_;
-      }
-    }
-
-    
-  };
-
-  class RunIntFilter : public edm::stream::EDFilter<edm::RunCache<Cache>> {
-  public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbr;
-    static std::atomic<bool> ger;
-    bool br;
-    bool er;
-
-    RunIntFilter(edm::ParameterSet const&p){
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      m_count = 0;
-      produces<unsigned int>();
-    }
-
-    bool filter(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-      ++(runCache()->value);
-       
-      return true;
-    }
-    
-    static std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
-      ++m_count;
-      gbr = true;
-      ger = false;
-      auto pCache = std::make_shared<Cache>();
-      ++(pCache->run);
-      return pCache;
-   }
-
-    static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
-       ++m_count;
-      auto pCache = iContext->run();
-      if ( pCache->run != 1 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
-      } 
-      ger = true;
-      gbr = false;
-      if( iContext->run()->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << iContext->run()->value << " but it was supposed to be " << cvalue_;
-      }
-    }
-
-    ~RunIntFilter() {
-       if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << m_count << " but it was supposed to be " << trans_;
-      }
-
-    }
-  };
-
-
-  class LumiIntFilter : public edm::stream::EDFilter<edm::LuminosityBlockCache<Cache>> {
-  public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbl;
-    static std::atomic<bool> gel;
-    static std::atomic<bool> bl;
-    static std::atomic<bool> el;
-
-    LumiIntFilter(edm::ParameterSet const&p){
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      m_count = 0;
-      produces<unsigned int>();
-    }
-
-    bool filter(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-      ++(luminosityBlockCache()->value);
-       
-      return true;
-    }
-    
-    static std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, RunContext const*) {
-      ++m_count;
-      gbl = true;
-      gel = false;
-      auto pCache = std::make_shared<Cache>();
-      ++(pCache->lumi);
-      return pCache;
-   }
-
-    void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
-      bl = true;
-      el = false;
-      if ( !gbl ) {
-        throw cms::Exception("begin out of sequence")
-          << "beginLuminosityBlock seen before globalBeginLuminosityBlock";
-      }
-    }
-
- 
-    static void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&, LuminosityBlockContext const* iLBContext) {
-      ++m_count;
-      if(iLBContext->luminosityBlock()->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << "LumiIntFilter cache value " 
-          << iLBContext->luminosityBlock()->value << " but it was supposed to be " << cvalue_;
-      }
-    }
-
-   static void endLuminosityBlock(edm::Run const&, edm::EventSetup const&, LuminosityBlockContext const*) {
-      el = true;
-      bl = false;
-      if ( gel ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlock seen before endLuminosityBlock";
-      }      
-   }
-   
-
-    ~LumiIntFilter() {
-       if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << m_count<< " but it was supposed to be " << trans_;
-       }
-    }
-  };
-  
-  class RunSummaryIntFilter : public edm::stream::EDFilter<edm::RunCache<Cache>,edm::RunSummaryCache<Cache>> {
-  public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbr;
-    static std::atomic<bool> ger;
-    static std::atomic<bool> gbrs;
-    static std::atomic<bool> gers;
-    static std::atomic<bool> brs;
-    static std::atomic<bool> ers;
-    static std::atomic<bool> br;
-    static std::atomic<bool> er;
-
-    RunSummaryIntFilter(edm::ParameterSet const&p){
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      m_count = 0;
-      produces<unsigned int>();
-    }
-
-    void beginRun(edm::Run const&, edm::EventSetup const&) override {
-      br=true;
-      er=false;
-    }
-
-    bool filter(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-      ++(runCache()->value);
-       
-      return true;
-    }
-    
-    static std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
-      ++m_count;
-      gbr=true;
-      ger=false;
-      auto pCache = std::make_shared<Cache>();
-      ++(pCache->run);
-      return pCache;
-   }
-
-    static std::shared_ptr<Cache> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&, GlobalCache const*) {
-      ++m_count;
-      gbrs = true;
-      gers = false;
-      brs = true;
-      ers = false;
-      if ( !gbr ) {
-        throw cms::Exception("begin out of sequence")
-          << "globalBeginRunSummary seen before globalBeginRun";
-      }
-      return std::make_shared<Cache>();
-   }
-    
-    void endRunSummary(edm::Run const&, edm::EventSetup const&, Cache* gCache) const override {
-      brs=false;
-      ers=true;
-      gCache->value += runCache()->value;
-      runCache()->value = 0;
-      if ( !er ) {
-        throw cms::Exception("end out of sequence")
-          << "endRunSummary seen before endRun";
-      }
-    }
-    
-    static void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, RunContext const*, Cache* gCache){
-      ++m_count;
-      gbrs=false;
-      gers=true;
-      if ( !ers ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndRunSummary seen before endRunSummary";
-      }
-      if(gCache->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << gCache->value << " but it was supposed to be " << cvalue_;
-      }
-    }
-
-   static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
-      ++m_count;
-      gbr=false;
-      ger=true;
-      auto pCache = iContext->run();
-      if ( pCache->run != 1 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
-      } 
-  }
-
-    void endRun(edm::Run const&, edm::EventSetup const&) override {
-      er = true;
-      br = false;
-    }   
-
-
-
-    ~RunSummaryIntFilter() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class LumiSummaryIntFilter : public edm::stream::EDFilter<edm::LuminosityBlockCache<Cache>,edm::LuminosityBlockSummaryCache<Cache>> {
-  public:
-    static std::atomic<unsigned int> m_count;
-    static std::atomic<unsigned int> m_lumiSumCalls;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbl;
-    static std::atomic<bool> gel;
-    static std::atomic<bool> gbls;
-    static std::atomic<bool> gels;
-    static std::atomic<bool> bls;
-    static std::atomic<bool> els;
-    static std::atomic<bool> bl;
-    static std::atomic<bool> el;
-
-    LumiSummaryIntFilter(edm::ParameterSet const&p) {
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      m_count = 0;
-      produces<unsigned int>();
-    }
-
-    bool filter(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-      ++(luminosityBlockCache()->value);
-       
-      return true;
-    }
-
-    void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
-      bl = true;
-      el = false;
-    }
-
-    static std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, RunContext const*) {
-      ++m_count;
-      gbl = true;
-      gel = false;
-      auto pCache = std::make_shared<Cache>();
-      ++(pCache->lumi);
-      return pCache;
-    }
-
-
-    static std::shared_ptr<Cache> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, LuminosityBlockContext const*){
-      ++m_count;
-      gbls = true;
-      gels = false;
-      bls = true;
-      els = false;
-      if ( !gbl ) {
-       throw cms::Exception("begin out of sequence")
-         << "globalBeginLuminosityBlockSummary seen before globalBeginLuminosityBlock";
-      }
-      return std::make_shared<Cache>();
-    }
-    
-    void endLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, Cache* gCache) const override {
-      ++m_lumiSumCalls;
-      bls=false;
-      els=true;
-      //This routine could be called at the same time as another stream is calling filter so must do the change atomically
-      auto v = luminosityBlockCache()->value.exchange(0);
-      gCache->value += v;
-      if ( el ) {
-        throw cms::Exception("end out of sequence")
-          << "endLuminosityBlock seen before endLuminosityBlockSummary";
-      }
-    }
-    
-    static void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, LuminosityBlockContext const*, Cache* gCache){
-     ++m_count;
-     auto nLumis = m_lumiSumCalls.load();
-     gbls=false;
-     gels=true;
-      if ( !els ) {
-        throw cms::Exception("end out of sequence")
-          << "LumiSummaryIntFilter " 
-          << "globalEndLuminosityBlockSummary seen before endLuminosityBlockSummary";
-      }
-      if( gCache->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << gCache->value << " but it was supposed to be " << cvalue_<<" endLumiBlockSummary called "<<nLumis;
-      }
-    }
-
-   static void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, LuminosityBlockContext const* iLBContext) {
-      ++m_count;
-      auto pCache = iLBContext->luminosityBlock();
-      if ( pCache->lumi != 1 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-      }       
-      gel = true;
-      gbl = false;
-      if ( !gels ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlockSummary seen before globalEndLuminosityBlock";  
-      }
-   }
-
-    static void endLuminosityBlock(edm::Run const&, edm::EventSetup const&, LuminosityBlockContext const*) {
-      el = true;
-      bl = false;
-    }
-
-
-    ~LumiSummaryIntFilter() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestBeginRunFilter : public edm::stream::EDFilter<edm::RunCache<Cache>,edm::BeginRunProducer> {
+    }  // namespace cache
+
+    using Cache = cache::Cache;
+
+    class GlobalIntFilter : public edm::stream::EDFilter<edm::GlobalCache<Cache>> {
+    public:
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+
+      static std::unique_ptr<Cache> initializeGlobalCache(edm::ParameterSet const&) {
+        ++m_count;
+        return std::make_unique<Cache>();
+      }
+
+      GlobalIntFilter(edm::ParameterSet const& p, const Cache* iGlobal) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        produces<unsigned int>();
+      }
+
+      bool filter(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        ++((globalCache())->value);
+
+        return true;
+      }
+
+      static void globalEndJob(Cache* iGlobal) {
+        ++m_count;
+        if (iGlobal->value != cvalue_) {
+          throw cms::Exception("cache value") << iGlobal->value << " but it was supposed to be " << cvalue_;
+        }
+      }
+
+      ~GlobalIntFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class RunIntFilter : public edm::stream::EDFilter<edm::RunCache<Cache>> {
+    public:
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbr;
+      static std::atomic<bool> ger;
+      bool br;
+      bool er;
+
+      RunIntFilter(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        m_count = 0;
+        produces<unsigned int>();
+      }
+
+      bool filter(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        ++(runCache()->value);
+
+        return true;
+      }
+
+      static std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
+        ++m_count;
+        gbr = true;
+        ger = false;
+        auto pCache = std::make_shared<Cache>();
+        ++(pCache->run);
+        return pCache;
+      }
+
+      static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
+        ++m_count;
+        auto pCache = iContext->run();
+        if (pCache->run != 1) {
+          throw cms::Exception("end out of sequence") << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
+        }
+        ger = true;
+        gbr = false;
+        if (iContext->run()->value != cvalue_) {
+          throw cms::Exception("cache value") << iContext->run()->value << " but it was supposed to be " << cvalue_;
+        }
+      }
+
+      ~RunIntFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiIntFilter : public edm::stream::EDFilter<edm::LuminosityBlockCache<Cache>> {
+    public:
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbl;
+      static std::atomic<bool> gel;
+      static std::atomic<bool> bl;
+      static std::atomic<bool> el;
+
+      LumiIntFilter(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        m_count = 0;
+        produces<unsigned int>();
+      }
+
+      bool filter(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        ++(luminosityBlockCache()->value);
+
+        return true;
+      }
+
+      static std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                               edm::EventSetup const&,
+                                                               RunContext const*) {
+        ++m_count;
+        gbl = true;
+        gel = false;
+        auto pCache = std::make_shared<Cache>();
+        ++(pCache->lumi);
+        return pCache;
+      }
+
+      void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
+        bl = true;
+        el = false;
+        if (!gbl) {
+          throw cms::Exception("begin out of sequence")
+              << "beginLuminosityBlock seen before globalBeginLuminosityBlock";
+        }
+      }
+
+      static void globalEndLuminosityBlock(edm::LuminosityBlock const&,
+                                           edm::EventSetup const&,
+                                           LuminosityBlockContext const* iLBContext) {
+        ++m_count;
+        if (iLBContext->luminosityBlock()->value != cvalue_) {
+          throw cms::Exception("cache value") << "LumiIntFilter cache value " << iLBContext->luminosityBlock()->value
+                                              << " but it was supposed to be " << cvalue_;
+        }
+      }
+
+      static void endLuminosityBlock(edm::Run const&, edm::EventSetup const&, LuminosityBlockContext const*) {
+        el = true;
+        bl = false;
+        if (gel) {
+          throw cms::Exception("end out of sequence") << "globalEndLuminosityBlock seen before endLuminosityBlock";
+        }
+      }
+
+      ~LumiIntFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class RunSummaryIntFilter : public edm::stream::EDFilter<edm::RunCache<Cache>, edm::RunSummaryCache<Cache>> {
+    public:
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbr;
+      static std::atomic<bool> ger;
+      static std::atomic<bool> gbrs;
+      static std::atomic<bool> gers;
+      static std::atomic<bool> brs;
+      static std::atomic<bool> ers;
+      static std::atomic<bool> br;
+      static std::atomic<bool> er;
+
+      RunSummaryIntFilter(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        m_count = 0;
+        produces<unsigned int>();
+      }
+
+      void beginRun(edm::Run const&, edm::EventSetup const&) override {
+        br = true;
+        er = false;
+      }
+
+      bool filter(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        ++(runCache()->value);
+
+        return true;
+      }
+
+      static std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
+        ++m_count;
+        gbr = true;
+        ger = false;
+        auto pCache = std::make_shared<Cache>();
+        ++(pCache->run);
+        return pCache;
+      }
+
+      static std::shared_ptr<Cache> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&, GlobalCache const*) {
+        ++m_count;
+        gbrs = true;
+        gers = false;
+        brs = true;
+        ers = false;
+        if (!gbr) {
+          throw cms::Exception("begin out of sequence") << "globalBeginRunSummary seen before globalBeginRun";
+        }
+        return std::make_shared<Cache>();
+      }
+
+      void endRunSummary(edm::Run const&, edm::EventSetup const&, Cache* gCache) const override {
+        brs = false;
+        ers = true;
+        gCache->value += runCache()->value;
+        runCache()->value = 0;
+        if (!er) {
+          throw cms::Exception("end out of sequence") << "endRunSummary seen before endRun";
+        }
+      }
+
+      static void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, RunContext const*, Cache* gCache) {
+        ++m_count;
+        gbrs = false;
+        gers = true;
+        if (!ers) {
+          throw cms::Exception("end out of sequence") << "globalEndRunSummary seen before endRunSummary";
+        }
+        if (gCache->value != cvalue_) {
+          throw cms::Exception("cache value") << gCache->value << " but it was supposed to be " << cvalue_;
+        }
+      }
+
+      static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
+        ++m_count;
+        gbr = false;
+        ger = true;
+        auto pCache = iContext->run();
+        if (pCache->run != 1) {
+          throw cms::Exception("end out of sequence") << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
+        }
+      }
+
+      void endRun(edm::Run const&, edm::EventSetup const&) override {
+        er = true;
+        br = false;
+      }
+
+      ~RunSummaryIntFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiSummaryIntFilter
+        : public edm::stream::EDFilter<edm::LuminosityBlockCache<Cache>, edm::LuminosityBlockSummaryCache<Cache>> {
+    public:
+      static std::atomic<unsigned int> m_count;
+      static std::atomic<unsigned int> m_lumiSumCalls;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbl;
+      static std::atomic<bool> gel;
+      static std::atomic<bool> gbls;
+      static std::atomic<bool> gels;
+      static std::atomic<bool> bls;
+      static std::atomic<bool> els;
+      static std::atomic<bool> bl;
+      static std::atomic<bool> el;
+
+      LumiSummaryIntFilter(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        m_count = 0;
+        produces<unsigned int>();
+      }
+
+      bool filter(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        ++(luminosityBlockCache()->value);
+
+        return true;
+      }
+
+      void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
+        bl = true;
+        el = false;
+      }
+
+      static std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                               edm::EventSetup const&,
+                                                               RunContext const*) {
+        ++m_count;
+        gbl = true;
+        gel = false;
+        auto pCache = std::make_shared<Cache>();
+        ++(pCache->lumi);
+        return pCache;
+      }
+
+      static std::shared_ptr<Cache> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                                      edm::EventSetup const&,
+                                                                      LuminosityBlockContext const*) {
+        ++m_count;
+        gbls = true;
+        gels = false;
+        bls = true;
+        els = false;
+        if (!gbl) {
+          throw cms::Exception("begin out of sequence")
+              << "globalBeginLuminosityBlockSummary seen before globalBeginLuminosityBlock";
+        }
+        return std::make_shared<Cache>();
+      }
+
+      void endLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                     edm::EventSetup const&,
+                                     Cache* gCache) const override {
+        ++m_lumiSumCalls;
+        bls = false;
+        els = true;
+        //This routine could be called at the same time as another stream is calling filter so must do the change atomically
+        auto v = luminosityBlockCache()->value.exchange(0);
+        gCache->value += v;
+        if (el) {
+          throw cms::Exception("end out of sequence") << "endLuminosityBlock seen before endLuminosityBlockSummary";
+        }
+      }
+
+      static void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                  edm::EventSetup const&,
+                                                  LuminosityBlockContext const*,
+                                                  Cache* gCache) {
+        ++m_count;
+        auto nLumis = m_lumiSumCalls.load();
+        gbls = false;
+        gels = true;
+        if (!els) {
+          throw cms::Exception("end out of sequence")
+              << "LumiSummaryIntFilter "
+              << "globalEndLuminosityBlockSummary seen before endLuminosityBlockSummary";
+        }
+        if (gCache->value != cvalue_) {
+          throw cms::Exception("cache value")
+              << gCache->value << " but it was supposed to be " << cvalue_ << " endLumiBlockSummary called " << nLumis;
+        }
+      }
+
+      static void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                           edm::EventSetup const&,
+                                           LuminosityBlockContext const* iLBContext) {
+        ++m_count;
+        auto pCache = iLBContext->luminosityBlock();
+        if (pCache->lumi != 1) {
+          throw cms::Exception("end out of sequence")
+              << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+        gel = true;
+        gbl = false;
+        if (!gels) {
+          throw cms::Exception("end out of sequence")
+              << "globalEndLuminosityBlockSummary seen before globalEndLuminosityBlock";
+        }
+      }
+
+      static void endLuminosityBlock(edm::Run const&, edm::EventSetup const&, LuminosityBlockContext const*) {
+        el = true;
+        bl = false;
+      }
+
+      ~LumiSummaryIntFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestBeginRunFilter : public edm::stream::EDFilter<edm::RunCache<Cache>, edm::BeginRunProducer> {
     public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbr;
-    static std::atomic<bool> ger;
-
-    TestBeginRunFilter(edm::ParameterSet const&p){
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      m_count = 0;
-      produces<unsigned int>();
-      produces<unsigned int, edm::Transition::BeginRun>("a");
-    }
-
-  static std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
-     ++m_count;
-      gbr=true;
-      ger=false;
-      auto pCache = std::make_shared<Cache>();
-      ++(pCache->run);
-      return pCache;
-   }
-
-    bool filter(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-      return true;
-    }
-
-    static void globalBeginRunProduce(edm::Run& iRun, edm::EventSetup const&, RunContext const*) {
-      ++m_count;
-      if ( !gbr ) {
-        throw cms::Exception("begin out of sequence")
-          << "globalBeginRunProduce seen before globalBeginRun";
-      }
-    }
-
-    static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
-     ++m_count;
-      auto pCache = iContext->run();
-      if ( pCache->run != 1 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
-      } 
-      gbr=false;
-      ger=true;
-    }
-
-    ~TestBeginRunFilter() {
-    if(m_count != trans_) {
-       throw cms::Exception("transitions")
-         << m_count<< " but it was supposed to be " << trans_;
-     }
-    }
-  };
-
-  class TestEndRunFilter : public edm::stream::EDFilter<edm::RunCache<Cache>,edm::EndRunProducer> {
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbr;
+      static std::atomic<bool> ger;
+
+      TestBeginRunFilter(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        m_count = 0;
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::BeginRun>("a");
+      }
+
+      static std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
+        ++m_count;
+        gbr = true;
+        ger = false;
+        auto pCache = std::make_shared<Cache>();
+        ++(pCache->run);
+        return pCache;
+      }
+
+      bool filter(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        return true;
+      }
+
+      static void globalBeginRunProduce(edm::Run& iRun, edm::EventSetup const&, RunContext const*) {
+        ++m_count;
+        if (!gbr) {
+          throw cms::Exception("begin out of sequence") << "globalBeginRunProduce seen before globalBeginRun";
+        }
+      }
+
+      static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
+        ++m_count;
+        auto pCache = iContext->run();
+        if (pCache->run != 1) {
+          throw cms::Exception("end out of sequence") << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
+        }
+        gbr = false;
+        ger = true;
+      }
+
+      ~TestBeginRunFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestEndRunFilter : public edm::stream::EDFilter<edm::RunCache<Cache>, edm::EndRunProducer> {
     public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbr;
-    static std::atomic<bool> ger;
-
-  static std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
-     ++m_count;
-      gbr=true;
-      ger=false;
-      auto pCache = std::make_shared<Cache>();
-      ++(pCache->run);
-      return pCache;
-   }
-
- 
-    TestEndRunFilter(edm::ParameterSet const&p){
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      m_count = 0;
-      produces<unsigned int>();
-      produces<unsigned int, edm::Transition::EndRun>("a");
-    }
-
-    bool filter(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-       
-      return true;
-    }
-
-    static void globalEndRunProduce(edm::Run& iRun, edm::EventSetup const&, RunContext const*) {
-      ++m_count;
-      if ( ger ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndRun seen before globalEndRunProduce";
-      }
-    }
-
-    static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
-      ++m_count;
-      auto pCache = iContext->run();
-      if ( pCache->run != 1 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
-      } 
-      gbr=false;
-      ger=true;
-    }
-
-
-    ~TestEndRunFilter() {
-    if(m_count != trans_) {
-       throw cms::Exception("transitions")
-         << m_count<< " but it was supposed to be " << trans_;
-     }
-    }
-  };
-
-  class TestBeginLumiBlockFilter : public edm::stream::EDFilter<edm::LuminosityBlockCache<Cache>,edm::BeginLuminosityBlockProducer> {
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbr;
+      static std::atomic<bool> ger;
+
+      static std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
+        ++m_count;
+        gbr = true;
+        ger = false;
+        auto pCache = std::make_shared<Cache>();
+        ++(pCache->run);
+        return pCache;
+      }
+
+      TestEndRunFilter(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        m_count = 0;
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::EndRun>("a");
+      }
+
+      bool filter(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+
+        return true;
+      }
+
+      static void globalEndRunProduce(edm::Run& iRun, edm::EventSetup const&, RunContext const*) {
+        ++m_count;
+        if (ger) {
+          throw cms::Exception("end out of sequence") << "globalEndRun seen before globalEndRunProduce";
+        }
+      }
+
+      static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
+        ++m_count;
+        auto pCache = iContext->run();
+        if (pCache->run != 1) {
+          throw cms::Exception("end out of sequence") << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
+        }
+        gbr = false;
+        ger = true;
+      }
+
+      ~TestEndRunFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestBeginLumiBlockFilter
+        : public edm::stream::EDFilter<edm::LuminosityBlockCache<Cache>, edm::BeginLuminosityBlockProducer> {
     public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbl;
-    static std::atomic<bool> gel;
- 
-    TestBeginLumiBlockFilter(edm::ParameterSet const&p){
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      m_count = 0;
-      produces<unsigned int>();
-      produces<unsigned int, edm::Transition::BeginLuminosityBlock>("a");
-    }
-
-    bool filter(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-       
-      return true;
-    }
-
-    static void globalBeginLuminosityBlockProduce(edm::LuminosityBlock& , edm::EventSetup const&, LuminosityBlockContext const*) {
-      ++m_count;
-      if ( !gbl ) {
-        throw cms::Exception("begin out of sequence")
-          << "globalBeginLumiBlockProduce seen before globalBeginLumiBlock";
-      }
-    }
-
-    static std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, RunContext const*) {
-      ++m_count;
-      gbl = true;
-      gel = false;
-      auto pCache = std::make_shared<Cache>();
-      ++(pCache->lumi);
-      return pCache;
-   }
-
-    static void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, LuminosityBlockContext const* iLBContext) {
-      ++m_count;
-      auto pCache = iLBContext->luminosityBlock();
-      if ( pCache->lumi != 1 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-      }
-      gel = true;
-      gbl = false;
-    }
-
-
-    ~TestBeginLumiBlockFilter() {
-    if(m_count != trans_) {
-       throw cms::Exception("transitions")
-         << m_count<< " but it was supposed to be " << trans_;
-     }
-    }
-  };
-
-  class TestEndLumiBlockFilter : public edm::stream::EDFilter<edm::LuminosityBlockCache<Cache>,edm::EndLuminosityBlockProducer> {
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbl;
+      static std::atomic<bool> gel;
+
+      TestBeginLumiBlockFilter(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        m_count = 0;
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::BeginLuminosityBlock>("a");
+      }
+
+      bool filter(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+
+        return true;
+      }
+
+      static void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&,
+                                                    edm::EventSetup const&,
+                                                    LuminosityBlockContext const*) {
+        ++m_count;
+        if (!gbl) {
+          throw cms::Exception("begin out of sequence")
+              << "globalBeginLumiBlockProduce seen before globalBeginLumiBlock";
+        }
+      }
+
+      static std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                               edm::EventSetup const&,
+                                                               RunContext const*) {
+        ++m_count;
+        gbl = true;
+        gel = false;
+        auto pCache = std::make_shared<Cache>();
+        ++(pCache->lumi);
+        return pCache;
+      }
+
+      static void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                           edm::EventSetup const&,
+                                           LuminosityBlockContext const* iLBContext) {
+        ++m_count;
+        auto pCache = iLBContext->luminosityBlock();
+        if (pCache->lumi != 1) {
+          throw cms::Exception("end out of sequence")
+              << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+        gel = true;
+        gbl = false;
+      }
+
+      ~TestBeginLumiBlockFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestEndLumiBlockFilter
+        : public edm::stream::EDFilter<edm::LuminosityBlockCache<Cache>, edm::EndLuminosityBlockProducer> {
     public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbl;
-    static std::atomic<bool> gel;
- 
-    TestEndLumiBlockFilter(edm::ParameterSet const&p){
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      m_count = 0;
-      produces<unsigned int>();
-      produces<unsigned int, edm::Transition::EndLuminosityBlock>("a");
-    }
-
-    bool filter(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-       
-      return true;
-    }
-
-    static std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, RunContext const*) {
-      ++m_count;
-      gbl = true;
-      gel = false;
-      auto pCache = std::make_shared<Cache>();
-      ++(pCache->lumi);
-      return pCache;
-   }
-
-  static void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, LuminosityBlockContext const* iLBContext) {
-      ++m_count;
-      auto pCache = iLBContext->luminosityBlock();
-      if ( pCache->lumi != 1 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-      }
-      gel = true;
-      gbl = false;
-   }
-
-
-    static void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&, LuminosityBlockContext const*) {
-      ++m_count;
-    }
-
-    ~TestEndLumiBlockFilter() {
-    if(m_count != trans_) {
-       throw cms::Exception("transitions")
-         << m_count<< " but it was supposed to be " << trans_;
-     }
-    }
-  };
-
-
-
-
-
-}
-}
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbl;
+      static std::atomic<bool> gel;
+
+      TestEndLumiBlockFilter(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        m_count = 0;
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::EndLuminosityBlock>("a");
+      }
+
+      bool filter(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+
+        return true;
+      }
+
+      static std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                               edm::EventSetup const&,
+                                                               RunContext const*) {
+        ++m_count;
+        gbl = true;
+        gel = false;
+        auto pCache = std::make_shared<Cache>();
+        ++(pCache->lumi);
+        return pCache;
+      }
+
+      static void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                           edm::EventSetup const&,
+                                           LuminosityBlockContext const* iLBContext) {
+        ++m_count;
+        auto pCache = iLBContext->luminosityBlock();
+        if (pCache->lumi != 1) {
+          throw cms::Exception("end out of sequence")
+              << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+        gel = true;
+        gbl = false;
+      }
+
+      static void globalEndLuminosityBlockProduce(edm::LuminosityBlock&,
+                                                  edm::EventSetup const&,
+                                                  LuminosityBlockContext const*) {
+        ++m_count;
+      }
+
+      ~TestEndLumiBlockFilter() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+  }  // namespace stream
+}  // namespace edmtest
 std::atomic<unsigned int> edmtest::stream::GlobalIntFilter::m_count{0};
 std::atomic<unsigned int> edmtest::stream::RunIntFilter::m_count{0};
 std::atomic<unsigned int> edmtest::stream::LumiIntFilter::m_count{0};
diff --git a/FWCore/Framework/test/stubs/TestStreamProducers.cc b/FWCore/Framework/test/stubs/TestStreamProducers.cc
index aab55df08bc4f..4b04cb40f5448 100644
--- a/FWCore/Framework/test/stubs/TestStreamProducers.cc
+++ b/FWCore/Framework/test/stubs/TestStreamProducers.cc
@@ -22,701 +22,676 @@ for testing purposes only.
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 
+namespace edmtest {
+  namespace stream {
+
+    // anonymous namespace here causes build warnings
+    namespace cache {
+      struct Cache {
+        Cache() : value(0), run(0), lumi(0) {}
+        //Using mutable since we want to update the value.
+        mutable std::atomic<unsigned int> value;
+        mutable std::atomic<unsigned int> run;
+        mutable std::atomic<unsigned int> lumi;
+      };
+
+      struct UnsafeCache {
+        UnsafeCache() : value(0), run(0), lumi(0) {}
+        unsigned int value;
+        unsigned int run;
+        unsigned int lumi;
+      };
+
+    }  // namespace cache
+
+    using Cache = cache::Cache;
+    using UnsafeCache = cache::UnsafeCache;
+
+    class GlobalIntProducer : public edm::stream::EDProducer<edm::GlobalCache<Cache>> {
+    public:
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
 
+      static std::unique_ptr<Cache> initializeGlobalCache(edm::ParameterSet const&) {
+        ++m_count;
+        return std::make_unique<Cache>();
+      }
 
-namespace edmtest {
-namespace stream {
-
-// anonymous namespace here causes build warnings
-namespace cache {
-struct Cache { 
-   Cache():value(0),run(0),lumi(0) {}
-   //Using mutable since we want to update the value.
-   mutable std::atomic<unsigned int> value;
-   mutable std::atomic<unsigned int> run;
-   mutable std::atomic<unsigned int> lumi;
-};
-
-struct UnsafeCache {
-   UnsafeCache():value(0),run(0),lumi(0) {}
-   unsigned int value;
-   unsigned int run;
-   unsigned int lumi;
-};
-
-} //end cache namespace
-
-  using Cache = cache::Cache;
-  using UnsafeCache = cache::UnsafeCache;
-
-  class GlobalIntProducer : public edm::stream::EDProducer<edm::GlobalCache<Cache>> {
-  public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-
-    static std::unique_ptr<Cache> initializeGlobalCache(edm::ParameterSet const&) {
-      ++m_count;
-      return std::make_unique<Cache>();
-    }
-
-    GlobalIntProducer(edm::ParameterSet const& p, const Cache* iGlobal)  {
-      trans_ = p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      produces<unsigned int>();
-    }
-
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-      ++((globalCache())->value);
-       
-    }
-    
-    static void globalEndJob(Cache* iGlobal) {
-      ++m_count;
-      if(iGlobal->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << iGlobal->value << " but it was supposed to be " << cvalue_;
-      }
-    }
-
-    ~GlobalIntProducer() {
-      if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << m_count << " but it was supposed to be " << trans_;
-      }
-    }
-
-    
-  };
-
-  class RunIntProducer : public edm::stream::EDProducer<edm::RunCache<Cache>> {
-  public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbr;
-    static std::atomic<bool> ger;
-    bool br;
-    bool er;
-
-    RunIntProducer(edm::ParameterSet const&p) {
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      produces<unsigned int>();
-    }
-
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-      ++(runCache()->value);
-       
-    }
-
-    static std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
-      ++m_count;
-      gbr = true;
-      ger = false;
-      auto pCache = std::make_shared<Cache>();
-      ++(pCache->run);
-      return pCache;
-    }
-
-    void beginRun(edm::Run const&, edm::EventSetup const&) override {
-      br = true;
-      er = true;
-      if ( !gbr ) {
-        throw cms::Exception("begin out of sequence")
-          << "beginRun seen before globalBeginRun";
-      }
-    }
-   
-    static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
-      ++m_count;
-      auto pCache = iContext->run();
-      if ( pCache->run != 1 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
-      } 
-      ger = true;
-      gbr = false;
-      if( iContext->run()->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << iContext->run()->value << " but it was supposed to be " << cvalue_;
-      }
-    }
-
-    void endRun(edm::Run const&, edm::EventSetup const&) override {
-      er = true;
-      br = false;
-      if ( ger ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndRun seen before endRun";
-      }
-    }
-
-    ~RunIntProducer() {
-       if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << m_count << " but it was supposed to be " << trans_;
-      }
-
-    }
-  };
-
-
-  class LumiIntProducer : public edm::stream::EDProducer<edm::LuminosityBlockCache<Cache>> {
-  public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbl;
-    static std::atomic<bool> gel;
-    static std::atomic<bool> bl;
-    static std::atomic<bool> el;
-
-
-    LumiIntProducer(edm::ParameterSet const&p) {
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      produces<unsigned int>();
-    }
-
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-      ++(luminosityBlockCache()->value);
-       
-    }
-    
-     static std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, RunContext const*) {
-      ++m_count;
-      gbl = true;
-      gel = false;
-      auto pCache = std::make_shared<Cache>();
-      ++(pCache->lumi);
-      return pCache;
-    }
-
-    void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
-      bl = true;
-      el = false;
-      if ( !gbl ) {
-        throw cms::Exception("begin out of sequence")
-          << "beginLuminosityBlock seen before globalBeginLuminosityBlock";
-      }
-    }
-
-   
-    static void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, LuminosityBlockContext const* iLBContext) {
-      ++m_count;
-      auto pCache = iLBContext->luminosityBlock();
-      if ( pCache->lumi != 1 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-      }       
-      gel = true;
-      gbl = false;
-      if(iLBContext->luminosityBlock()->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << iLBContext->luminosityBlock()->value << " but it was supposed to be " << cvalue_;
-      }
-    }
-
-   static void endLuminosityBlock(edm::Run const&, edm::EventSetup const&, LuminosityBlockContext const*) {
-      el = true;
-      bl = false;
-      if ( gel ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlock seen before endLuminosityBlock";
-      }      
-   }
-
-
-    ~LumiIntProducer() {
-       if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << m_count<< " but it was supposed to be " << trans_;
-       }
-    }
-  };
-  
-  class RunSummaryIntProducer : public edm::stream::EDProducer<edm::RunCache<Cache>,edm::RunSummaryCache<UnsafeCache>> {
-  public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbr;
-    static std::atomic<bool> ger;
-    static std::atomic<bool> gbrs;
-    static std::atomic<bool> gers;
-    static std::atomic<bool> brs;
-    static std::atomic<bool> ers;
-    static std::atomic<bool> br;
-    static std::atomic<bool> er;
-
-    RunSummaryIntProducer(edm::ParameterSet const&p){
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      produces<unsigned int>();
-    }
-
-    void beginRun(edm::Run const&, edm::EventSetup const&) override {
-      br=true;
-      er=false;
-    }
-
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-      ++(runCache()->value);
-       
-    }
-    
-    static std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
-      ++m_count;
-      gbr=true;
-      ger=false;
-      auto pCache = std::make_shared<Cache>();
-      ++(pCache->run);
-      return pCache;
- 
-    }
-
-    static std::shared_ptr<UnsafeCache> globalBeginRunSummary(edm::Run const&, edm::EventSetup const&, GlobalCache const*) {
-      ++m_count;
-      gbrs = true;
-      gers = false;
-      brs = true;
-      ers = false;
-      if ( !gbr ) {
-        throw cms::Exception("begin out of sequence")
-          << "globalBeginRunSummary seen before globalBeginRun";
-      }
-      return std::make_shared<UnsafeCache>();
-    }
-    
-    void endRunSummary(edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      brs=false;
-      ers=true;
-      gCache->value += runCache()->value;
-      runCache()->value = 0;
-      if ( !er ) {
-        throw cms::Exception("end out of sequence")
-          << "endRunSummary seen before endRun";
-      }
-    }
-    
-    static void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, RunContext const*, UnsafeCache * gCache) {
-      ++m_count;
-      gbrs=false;
-      gers=true;
-      if ( !ers ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndRunSummary seen before endRunSummary";
-      }
-      if(gCache->value != cvalue_) {
-        throw cms::Exception("cache value")
-          << gCache->value << " but it was supposed to be " << cvalue_;
-      }
-    }
-
-    static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
-      ++m_count;
-      gbr=false;
-      ger=true;
-      auto pCache = iContext->run();
-      if ( pCache->run != 1 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
-      } 
-    }
-
-    void endRun(edm::Run const&, edm::EventSetup const&) override {
-      er = true;
-      br = false;
-    }   
-
-    ~RunSummaryIntProducer() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << m_count<< " but it was supposed to be " << trans_;
-      }
- 
-    }
-  };
-
-  class LumiSummaryIntProducer : public edm::stream::EDProducer<edm::LuminosityBlockCache<Cache>,edm::LuminosityBlockSummaryCache<UnsafeCache>> {
-  public:
-    static std::atomic<unsigned int> m_count;
-    static std::atomic<unsigned int> m_lumiSumCalls;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbl;
-    static std::atomic<bool> gel;
-    static std::atomic<bool> gbls;
-    static std::atomic<bool> gels;
-    static std::atomic<bool> bls;
-    static std::atomic<bool> els;
-    static std::atomic<bool> bl;
-    static std::atomic<bool> el;
-
-    LumiSummaryIntProducer(edm::ParameterSet const&p){
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      produces<unsigned int>();
-    }
-
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      ++m_count;
-      ++(luminosityBlockCache()->value);
-       
-    }
-
-    void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
-      bl = true;
-      el = false;
-    }
- 
-    static std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, RunContext const*) {
-      ++m_count;
-      gbl = true;
-      gel = false;
-      auto pCache = std::make_shared<Cache>();
-      ++(pCache->lumi);
-      return pCache;
-    }
-
-
-    static std::shared_ptr<UnsafeCache> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, LuminosityBlockContext const*) {
-      ++m_count;
-      gbls = true;
-      gels = false;
-      bls = true;
-      els = false;
-      if ( !gbl ) {
-       throw cms::Exception("begin out of sequence")
-         << "globalBeginLuminosityBlockSummary seen before globalBeginLuminosityBlock";
-      }
-      return std::make_shared<UnsafeCache>();
-    }
-    
-
-
-    void endLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
-      ++m_lumiSumCalls;
-      bls=false;
-      els=true;
-      //This routine could be called at the same time as another stream is calling produce so must do the change atomically
-      auto v = luminosityBlockCache()->value.exchange(0);
-      gCache->value += v;
-      if ( el ) {
-        throw cms::Exception("end out of sequence")
-          << "endLuminosityBlock seen before endLuminosityBlockSummary";
-      }
-    }
-    
-   static void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&, edm::EventSetup const&, LuminosityBlockContext const*, UnsafeCache* gCache) {
-     ++m_count;
-     auto nLumis =m_lumiSumCalls.load();
-     gbls=false;
-     gels=true;
-      if ( !els ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlockSummary seen before endLuminosityBlockSummary";
-      }
-     if ( gCache->value != cvalue_) {
-        throw cms::Exception("cache value")
-       << gCache->value << " but it was supposed to be " << cvalue_<<" endLumiBlockSummary called "<<nLumis;
-     }
-   }
-
-   static void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, LuminosityBlockContext const* iLBContext) {
-      ++m_count;
-      auto pCache = iLBContext->luminosityBlock();
-      if ( pCache->lumi != 1 ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-      }       
-      gel = true;
-      gbl = false;
-      if ( !gels ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlockSummary seen before globalEndLuminosityBlock";  
-      }
-   }
- 
-    static void endLuminosityBlock(edm::Run const&, edm::EventSetup const&, LuminosityBlockContext const*) {
-      el = true;
-      bl = false;
-    }
-
-    ~LumiSummaryIntProducer() {
-     if(m_count != trans_) {
-        throw cms::Exception("transitions")
-          << m_count<< " but it was supposed to be " << trans_;
-      }
-    }
-  };
-
-  class TestBeginRunProducer : public edm::stream::EDProducer<edm::RunCache<bool>,edm::BeginRunProducer> {
+      GlobalIntProducer(edm::ParameterSet const& p, const Cache* iGlobal) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        produces<unsigned int>();
+      }
+
+      void produce(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        ++((globalCache())->value);
+      }
+
+      static void globalEndJob(Cache* iGlobal) {
+        ++m_count;
+        if (iGlobal->value != cvalue_) {
+          throw cms::Exception("cache value") << iGlobal->value << " but it was supposed to be " << cvalue_;
+        }
+      }
+
+      ~GlobalIntProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class RunIntProducer : public edm::stream::EDProducer<edm::RunCache<Cache>> {
+    public:
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbr;
+      static std::atomic<bool> ger;
+      bool br;
+      bool er;
+
+      RunIntProducer(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        produces<unsigned int>();
+      }
+
+      void produce(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        ++(runCache()->value);
+      }
+
+      static std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
+        ++m_count;
+        gbr = true;
+        ger = false;
+        auto pCache = std::make_shared<Cache>();
+        ++(pCache->run);
+        return pCache;
+      }
+
+      void beginRun(edm::Run const&, edm::EventSetup const&) override {
+        br = true;
+        er = true;
+        if (!gbr) {
+          throw cms::Exception("begin out of sequence") << "beginRun seen before globalBeginRun";
+        }
+      }
+
+      static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
+        ++m_count;
+        auto pCache = iContext->run();
+        if (pCache->run != 1) {
+          throw cms::Exception("end out of sequence") << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
+        }
+        ger = true;
+        gbr = false;
+        if (iContext->run()->value != cvalue_) {
+          throw cms::Exception("cache value") << iContext->run()->value << " but it was supposed to be " << cvalue_;
+        }
+      }
+
+      void endRun(edm::Run const&, edm::EventSetup const&) override {
+        er = true;
+        br = false;
+        if (ger) {
+          throw cms::Exception("end out of sequence") << "globalEndRun seen before endRun";
+        }
+      }
+
+      ~RunIntProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiIntProducer : public edm::stream::EDProducer<edm::LuminosityBlockCache<Cache>> {
+    public:
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbl;
+      static std::atomic<bool> gel;
+      static std::atomic<bool> bl;
+      static std::atomic<bool> el;
+
+      LumiIntProducer(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        produces<unsigned int>();
+      }
+
+      void produce(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        ++(luminosityBlockCache()->value);
+      }
+
+      static std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                               edm::EventSetup const&,
+                                                               RunContext const*) {
+        ++m_count;
+        gbl = true;
+        gel = false;
+        auto pCache = std::make_shared<Cache>();
+        ++(pCache->lumi);
+        return pCache;
+      }
+
+      void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
+        bl = true;
+        el = false;
+        if (!gbl) {
+          throw cms::Exception("begin out of sequence")
+              << "beginLuminosityBlock seen before globalBeginLuminosityBlock";
+        }
+      }
+
+      static void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                           edm::EventSetup const&,
+                                           LuminosityBlockContext const* iLBContext) {
+        ++m_count;
+        auto pCache = iLBContext->luminosityBlock();
+        if (pCache->lumi != 1) {
+          throw cms::Exception("end out of sequence")
+              << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+        gel = true;
+        gbl = false;
+        if (iLBContext->luminosityBlock()->value != cvalue_) {
+          throw cms::Exception("cache value")
+              << iLBContext->luminosityBlock()->value << " but it was supposed to be " << cvalue_;
+        }
+      }
+
+      static void endLuminosityBlock(edm::Run const&, edm::EventSetup const&, LuminosityBlockContext const*) {
+        el = true;
+        bl = false;
+        if (gel) {
+          throw cms::Exception("end out of sequence") << "globalEndLuminosityBlock seen before endLuminosityBlock";
+        }
+      }
+
+      ~LumiIntProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class RunSummaryIntProducer
+        : public edm::stream::EDProducer<edm::RunCache<Cache>, edm::RunSummaryCache<UnsafeCache>> {
+    public:
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbr;
+      static std::atomic<bool> ger;
+      static std::atomic<bool> gbrs;
+      static std::atomic<bool> gers;
+      static std::atomic<bool> brs;
+      static std::atomic<bool> ers;
+      static std::atomic<bool> br;
+      static std::atomic<bool> er;
+
+      RunSummaryIntProducer(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        produces<unsigned int>();
+      }
+
+      void beginRun(edm::Run const&, edm::EventSetup const&) override {
+        br = true;
+        er = false;
+      }
+
+      void produce(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        ++(runCache()->value);
+      }
+
+      static std::shared_ptr<Cache> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
+        ++m_count;
+        gbr = true;
+        ger = false;
+        auto pCache = std::make_shared<Cache>();
+        ++(pCache->run);
+        return pCache;
+      }
+
+      static std::shared_ptr<UnsafeCache> globalBeginRunSummary(edm::Run const&,
+                                                                edm::EventSetup const&,
+                                                                GlobalCache const*) {
+        ++m_count;
+        gbrs = true;
+        gers = false;
+        brs = true;
+        ers = false;
+        if (!gbr) {
+          throw cms::Exception("begin out of sequence") << "globalBeginRunSummary seen before globalBeginRun";
+        }
+        return std::make_shared<UnsafeCache>();
+      }
+
+      void endRunSummary(edm::Run const&, edm::EventSetup const&, UnsafeCache* gCache) const override {
+        brs = false;
+        ers = true;
+        gCache->value += runCache()->value;
+        runCache()->value = 0;
+        if (!er) {
+          throw cms::Exception("end out of sequence") << "endRunSummary seen before endRun";
+        }
+      }
+
+      static void globalEndRunSummary(edm::Run const&, edm::EventSetup const&, RunContext const*, UnsafeCache* gCache) {
+        ++m_count;
+        gbrs = false;
+        gers = true;
+        if (!ers) {
+          throw cms::Exception("end out of sequence") << "globalEndRunSummary seen before endRunSummary";
+        }
+        if (gCache->value != cvalue_) {
+          throw cms::Exception("cache value") << gCache->value << " but it was supposed to be " << cvalue_;
+        }
+      }
+
+      static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
+        ++m_count;
+        gbr = false;
+        ger = true;
+        auto pCache = iContext->run();
+        if (pCache->run != 1) {
+          throw cms::Exception("end out of sequence") << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
+        }
+      }
+
+      void endRun(edm::Run const&, edm::EventSetup const&) override {
+        er = true;
+        br = false;
+      }
+
+      ~RunSummaryIntProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class LumiSummaryIntProducer : public edm::stream::EDProducer<edm::LuminosityBlockCache<Cache>,
+                                                                  edm::LuminosityBlockSummaryCache<UnsafeCache>> {
+    public:
+      static std::atomic<unsigned int> m_count;
+      static std::atomic<unsigned int> m_lumiSumCalls;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbl;
+      static std::atomic<bool> gel;
+      static std::atomic<bool> gbls;
+      static std::atomic<bool> gels;
+      static std::atomic<bool> bls;
+      static std::atomic<bool> els;
+      static std::atomic<bool> bl;
+      static std::atomic<bool> el;
+
+      LumiSummaryIntProducer(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        produces<unsigned int>();
+      }
+
+      void produce(edm::Event&, edm::EventSetup const&) override {
+        ++m_count;
+        ++(luminosityBlockCache()->value);
+      }
+
+      void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override {
+        bl = true;
+        el = false;
+      }
+
+      static std::shared_ptr<Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                               edm::EventSetup const&,
+                                                               RunContext const*) {
+        ++m_count;
+        gbl = true;
+        gel = false;
+        auto pCache = std::make_shared<Cache>();
+        ++(pCache->lumi);
+        return pCache;
+      }
+
+      static std::shared_ptr<UnsafeCache> globalBeginLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                                            edm::EventSetup const&,
+                                                                            LuminosityBlockContext const*) {
+        ++m_count;
+        gbls = true;
+        gels = false;
+        bls = true;
+        els = false;
+        if (!gbl) {
+          throw cms::Exception("begin out of sequence")
+              << "globalBeginLuminosityBlockSummary seen before globalBeginLuminosityBlock";
+        }
+        return std::make_shared<UnsafeCache>();
+      }
+
+      void endLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                     edm::EventSetup const&,
+                                     UnsafeCache* gCache) const override {
+        ++m_lumiSumCalls;
+        bls = false;
+        els = true;
+        //This routine could be called at the same time as another stream is calling produce so must do the change atomically
+        auto v = luminosityBlockCache()->value.exchange(0);
+        gCache->value += v;
+        if (el) {
+          throw cms::Exception("end out of sequence") << "endLuminosityBlock seen before endLuminosityBlockSummary";
+        }
+      }
+
+      static void globalEndLuminosityBlockSummary(edm::LuminosityBlock const&,
+                                                  edm::EventSetup const&,
+                                                  LuminosityBlockContext const*,
+                                                  UnsafeCache* gCache) {
+        ++m_count;
+        auto nLumis = m_lumiSumCalls.load();
+        gbls = false;
+        gels = true;
+        if (!els) {
+          throw cms::Exception("end out of sequence")
+              << "globalEndLuminosityBlockSummary seen before endLuminosityBlockSummary";
+        }
+        if (gCache->value != cvalue_) {
+          throw cms::Exception("cache value")
+              << gCache->value << " but it was supposed to be " << cvalue_ << " endLumiBlockSummary called " << nLumis;
+        }
+      }
+
+      static void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                           edm::EventSetup const&,
+                                           LuminosityBlockContext const* iLBContext) {
+        ++m_count;
+        auto pCache = iLBContext->luminosityBlock();
+        if (pCache->lumi != 1) {
+          throw cms::Exception("end out of sequence")
+              << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+        gel = true;
+        gbl = false;
+        if (!gels) {
+          throw cms::Exception("end out of sequence")
+              << "globalEndLuminosityBlockSummary seen before globalEndLuminosityBlock";
+        }
+      }
+
+      static void endLuminosityBlock(edm::Run const&, edm::EventSetup const&, LuminosityBlockContext const*) {
+        el = true;
+        bl = false;
+      }
+
+      ~LumiSummaryIntProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestBeginRunProducer : public edm::stream::EDProducer<edm::RunCache<bool>, edm::BeginRunProducer> {
     public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbr;
-    static std::atomic<bool> ger;
-    static std::atomic<bool> gbrp;
- 
-    TestBeginRunProducer(edm::ParameterSet const&p) {
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      produces<unsigned int>();
-      produces<unsigned int, edm::Transition::BeginRun>("a");
-    }
-
-    static std::shared_ptr<bool> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
-      gbr=true;
-      ger=false;
-      gbrp=false;
-      return std::shared_ptr<bool>{};
-   }
-
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      if ( !gbrp ) {
-        throw cms::Exception("out of sequence")
-          << "produce before globalBeginRunProduce";
-      }
-    }
-
-    static void globalBeginRunProduce(edm::Run& iRun, edm::EventSetup const&, RunContext const*) {
-      gbrp = true;
-      ++m_count;
-      if ( !gbr ) {
-        throw cms::Exception("begin out of sequence")
-          << "globalBeginRunProduce seen before globalBeginRun";
-      }
-    }
-
-    static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
-      if ( !gbr ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
-      } 
-      gbr=false;
-      ger=true;
-    }
-
-
-    ~TestBeginRunProducer() {
-    if(m_count != trans_) {
-       throw cms::Exception("transitions")
-         << m_count<< " but it was supposed to be " << trans_;
-     }
-    }
-  };
-
-  class TestEndRunProducer : public edm::stream::EDProducer<edm::RunCache<bool>,edm::EndRunProducer> {
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbr;
+      static std::atomic<bool> ger;
+      static std::atomic<bool> gbrp;
+
+      TestBeginRunProducer(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::BeginRun>("a");
+      }
+
+      static std::shared_ptr<bool> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
+        gbr = true;
+        ger = false;
+        gbrp = false;
+        return std::shared_ptr<bool>{};
+      }
+
+      void produce(edm::Event&, edm::EventSetup const&) override {
+        if (!gbrp) {
+          throw cms::Exception("out of sequence") << "produce before globalBeginRunProduce";
+        }
+      }
+
+      static void globalBeginRunProduce(edm::Run& iRun, edm::EventSetup const&, RunContext const*) {
+        gbrp = true;
+        ++m_count;
+        if (!gbr) {
+          throw cms::Exception("begin out of sequence") << "globalBeginRunProduce seen before globalBeginRun";
+        }
+      }
+
+      static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
+        if (!gbr) {
+          throw cms::Exception("end out of sequence") << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
+        }
+        gbr = false;
+        ger = true;
+      }
+
+      ~TestBeginRunProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestEndRunProducer : public edm::stream::EDProducer<edm::RunCache<bool>, edm::EndRunProducer> {
     public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbr;
-    static std::atomic<bool> ger;
-    static std::atomic<bool> p;
-
-    static std::shared_ptr<bool> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
-      gbr=true;
-      ger=false;
-      p =false;
-      return std::shared_ptr<bool>{};
-   }
-
-
-    TestEndRunProducer(edm::ParameterSet const&p){
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      produces<unsigned int>();
-      produces<unsigned int, edm::Transition::EndRun>("a");
-    }
-
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      p = true; 
-    }
-
-    static void globalEndRunProduce(edm::Run& iRun, edm::EventSetup const&, RunContext const*) {
-      ++m_count;
-      if ( !p ) {
-        throw cms::Exception("out of sequence")
-          << "globalEndRunProduce seen before produce";
-      }
-      if ( ger ) {
-        throw cms::Exception("out of sequence")
-          << "globalEndRun seen before globalEndRunProduce";
-      }
-    }
-
-    static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
-      if ( !gbr ) {
-        throw cms::Exception("out of sequence")
-          << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
-      } 
-      gbr=false;
-      ger=true;
-    }
-
-
-    ~TestEndRunProducer() {
-    if(m_count != trans_) {
-       throw cms::Exception("transitions")
-         << m_count<< " but it was supposed to be " << trans_;
-     }
-    }
-  };
-
-  class TestBeginLumiBlockProducer : public edm::stream::EDProducer<edm::LuminosityBlockCache<bool>,edm::BeginLuminosityBlockProducer> {
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbr;
+      static std::atomic<bool> ger;
+      static std::atomic<bool> p;
+
+      static std::shared_ptr<bool> globalBeginRun(edm::Run const& iRun, edm::EventSetup const&, GlobalCache const*) {
+        gbr = true;
+        ger = false;
+        p = false;
+        return std::shared_ptr<bool>{};
+      }
+
+      TestEndRunProducer(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::EndRun>("a");
+      }
+
+      void produce(edm::Event&, edm::EventSetup const&) override { p = true; }
+
+      static void globalEndRunProduce(edm::Run& iRun, edm::EventSetup const&, RunContext const*) {
+        ++m_count;
+        if (!p) {
+          throw cms::Exception("out of sequence") << "globalEndRunProduce seen before produce";
+        }
+        if (ger) {
+          throw cms::Exception("out of sequence") << "globalEndRun seen before globalEndRunProduce";
+        }
+      }
+
+      static void globalEndRun(edm::Run const& iRun, edm::EventSetup const&, RunContext const* iContext) {
+        if (!gbr) {
+          throw cms::Exception("out of sequence") << "globalEndRun seen before globalBeginRun in Run" << iRun.run();
+        }
+        gbr = false;
+        ger = true;
+      }
+
+      ~TestEndRunProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestBeginLumiBlockProducer
+        : public edm::stream::EDProducer<edm::LuminosityBlockCache<bool>, edm::BeginLuminosityBlockProducer> {
     public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbl;
-    static std::atomic<bool> gel;
-    static std::atomic<bool> gblp;
- 
-    TestBeginLumiBlockProducer(edm::ParameterSet const&p){
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      produces<unsigned int>();
-      produces<unsigned int, edm::Transition::BeginLuminosityBlock>("a");
-    }
-
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      if ( !gblp ) {
-        throw cms::Exception("begin out of sequence")
-          << "produce seen before globalBeginLumiBlockProduce";
-      }
-    }
-
-    static void globalBeginLuminosityBlockProduce(edm::LuminosityBlock& , edm::EventSetup const&, LuminosityBlockContext const*) {
-     ++m_count;
-      if ( !gbl ) {
-        throw cms::Exception("begin out of sequence")
-          << "globalBeginLumiBlockProduce seen before globalBeginLumiBlock";
-      }
-      gblp = true;
-    }
-
-    static std::shared_ptr<bool> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, RunContext const*) {
-      gbl = true;
-      gel = false;
-      gblp = false;
-      return std::shared_ptr<bool>();
-   }
-
-    static void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, LuminosityBlockContext const* iLBContext) {
-      if ( !gbl ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-      }
-      gel = true;
-      gbl = false;
-    }
-
-
-    ~TestBeginLumiBlockProducer() {
-    if(m_count != trans_) {
-       throw cms::Exception("transitions")
-         << m_count<< " but it was supposed to be " << trans_;
-     }
-    }
-  };
-
-  class TestEndLumiBlockProducer : public edm::stream::EDProducer<edm::LuminosityBlockCache<bool>,edm::EndLuminosityBlockProducer> {
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbl;
+      static std::atomic<bool> gel;
+      static std::atomic<bool> gblp;
+
+      TestBeginLumiBlockProducer(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::BeginLuminosityBlock>("a");
+      }
+
+      void produce(edm::Event&, edm::EventSetup const&) override {
+        if (!gblp) {
+          throw cms::Exception("begin out of sequence") << "produce seen before globalBeginLumiBlockProduce";
+        }
+      }
+
+      static void globalBeginLuminosityBlockProduce(edm::LuminosityBlock&,
+                                                    edm::EventSetup const&,
+                                                    LuminosityBlockContext const*) {
+        ++m_count;
+        if (!gbl) {
+          throw cms::Exception("begin out of sequence")
+              << "globalBeginLumiBlockProduce seen before globalBeginLumiBlock";
+        }
+        gblp = true;
+      }
+
+      static std::shared_ptr<bool> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                              edm::EventSetup const&,
+                                                              RunContext const*) {
+        gbl = true;
+        gel = false;
+        gblp = false;
+        return std::shared_ptr<bool>();
+      }
+
+      static void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                           edm::EventSetup const&,
+                                           LuminosityBlockContext const* iLBContext) {
+        if (!gbl) {
+          throw cms::Exception("end out of sequence")
+              << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+        gel = true;
+        gbl = false;
+      }
+
+      ~TestBeginLumiBlockProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    class TestEndLumiBlockProducer
+        : public edm::stream::EDProducer<edm::LuminosityBlockCache<bool>, edm::EndLuminosityBlockProducer> {
     public:
-    static std::atomic<unsigned int> m_count;
-    unsigned int trans_;
-    static std::atomic<unsigned int> cvalue_;
-    static std::atomic<bool> gbl;
-    static std::atomic<bool> gel;
-    static std::atomic<bool> p;
- 
-    TestEndLumiBlockProducer(edm::ParameterSet const&p){
-      trans_= p.getParameter<int>("transitions");
-      cvalue_ = p.getParameter<int>("cachevalue");
-      produces<unsigned int>();
-      produces<unsigned int, edm::Transition::EndLuminosityBlock>("a");
-    }
-
-    void produce(edm::Event&, edm::EventSetup const&) override {
-      p = true;
-    }
-
-    static void globalEndLuminosityBlockProduce(edm::LuminosityBlock&, edm::EventSetup const&, LuminosityBlockContext const*) {
-      ++m_count;
-      if ( !p ) {
-        throw cms::Exception("out of sequence")
-          << "globalEndLumiBlockProduce seen before produce";
-      }
-    }
-
-    static std::shared_ptr<bool> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, RunContext const*) {
-      gbl = true;
-      gel = false;
-      p = false;
-      return std::shared_ptr<bool>{};
-   }
-
-    static void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB, edm::EventSetup const&, LuminosityBlockContext const* iLBContext) {
-      if ( !gbl ) {
-        throw cms::Exception("end out of sequence")
-          << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock" << iLB.luminosityBlock();
-      }
-   }
-
-
-    ~TestEndLumiBlockProducer() {
-    if(m_count != trans_) {
-       throw cms::Exception("transitions")
-         << m_count<< " but it was supposed to be " << trans_;
-     }
-    }
-  };
-
-  struct Count {
-    Count() : m_value(0), m_expectedValue(0) {}
-    //Using mutable since we want to update the value.
-    mutable std::atomic<unsigned int> m_value;
-    mutable std::atomic<unsigned int> m_expectedValue;
-  };
-
-  class TestAccumulator : public edm::stream::EDProducer<edm::GlobalCache<Count>, edm::Accumulator> {
-  public:
-
-
-    static std::atomic<unsigned int> m_expectedCount;
-
-    explicit TestAccumulator(edm::ParameterSet const& p, Count const* iCount) {
-      iCount->m_expectedValue = p.getParameter<unsigned int>("expectedCount");
-    }
-
-    static std::unique_ptr<Count> initializeGlobalCache(edm::ParameterSet const&) {
-      return std::unique_ptr<Count>(new Count());
-    }
-
-    void accumulate(edm::Event const&, edm::EventSetup const&) override {
-      ++(globalCache()->m_value);
-    }
-
-    static void globalEndJob(Count const* iCount) {
-      if (iCount->m_value != iCount->m_expectedValue) {
-        throw cms::Exception("CountEvents")
-          << "Number of events seen = " << iCount->m_value << " but it was supposed to be " << iCount->m_expectedValue;
-      }
-    }
-
-    ~TestAccumulator() {
-    }
-  };
-
-}
-}
+      static std::atomic<unsigned int> m_count;
+      unsigned int trans_;
+      static std::atomic<unsigned int> cvalue_;
+      static std::atomic<bool> gbl;
+      static std::atomic<bool> gel;
+      static std::atomic<bool> p;
+
+      TestEndLumiBlockProducer(edm::ParameterSet const& p) {
+        trans_ = p.getParameter<int>("transitions");
+        cvalue_ = p.getParameter<int>("cachevalue");
+        produces<unsigned int>();
+        produces<unsigned int, edm::Transition::EndLuminosityBlock>("a");
+      }
+
+      void produce(edm::Event&, edm::EventSetup const&) override { p = true; }
+
+      static void globalEndLuminosityBlockProduce(edm::LuminosityBlock&,
+                                                  edm::EventSetup const&,
+                                                  LuminosityBlockContext const*) {
+        ++m_count;
+        if (!p) {
+          throw cms::Exception("out of sequence") << "globalEndLumiBlockProduce seen before produce";
+        }
+      }
+
+      static std::shared_ptr<bool> globalBeginLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                                              edm::EventSetup const&,
+                                                              RunContext const*) {
+        gbl = true;
+        gel = false;
+        p = false;
+        return std::shared_ptr<bool>{};
+      }
+
+      static void globalEndLuminosityBlock(edm::LuminosityBlock const& iLB,
+                                           edm::EventSetup const&,
+                                           LuminosityBlockContext const* iLBContext) {
+        if (!gbl) {
+          throw cms::Exception("end out of sequence")
+              << "globalEndLuminosityBlock seen before globalBeginLuminosityBlock in LuminosityBlock"
+              << iLB.luminosityBlock();
+        }
+      }
+
+      ~TestEndLumiBlockProducer() {
+        if (m_count != trans_) {
+          throw cms::Exception("transitions") << m_count << " but it was supposed to be " << trans_;
+        }
+      }
+    };
+
+    struct Count {
+      Count() : m_value(0), m_expectedValue(0) {}
+      //Using mutable since we want to update the value.
+      mutable std::atomic<unsigned int> m_value;
+      mutable std::atomic<unsigned int> m_expectedValue;
+    };
+
+    class TestAccumulator : public edm::stream::EDProducer<edm::GlobalCache<Count>, edm::Accumulator> {
+    public:
+      static std::atomic<unsigned int> m_expectedCount;
+
+      explicit TestAccumulator(edm::ParameterSet const& p, Count const* iCount) {
+        iCount->m_expectedValue = p.getParameter<unsigned int>("expectedCount");
+      }
+
+      static std::unique_ptr<Count> initializeGlobalCache(edm::ParameterSet const&) {
+        return std::unique_ptr<Count>(new Count());
+      }
+
+      void accumulate(edm::Event const&, edm::EventSetup const&) override { ++(globalCache()->m_value); }
+
+      static void globalEndJob(Count const* iCount) {
+        if (iCount->m_value != iCount->m_expectedValue) {
+          throw cms::Exception("CountEvents") << "Number of events seen = " << iCount->m_value
+                                              << " but it was supposed to be " << iCount->m_expectedValue;
+        }
+      }
+
+      ~TestAccumulator() {}
+    };
+
+  }  // namespace stream
+}  // namespace edmtest
 std::atomic<unsigned int> edmtest::stream::GlobalIntProducer::m_count{0};
 std::atomic<unsigned int> edmtest::stream::RunIntProducer::m_count{0};
 std::atomic<unsigned int> edmtest::stream::LumiIntProducer::m_count{0};
@@ -780,4 +755,3 @@ DEFINE_FWK_MODULE(edmtest::stream::TestEndRunProducer);
 DEFINE_FWK_MODULE(edmtest::stream::TestBeginLumiBlockProducer);
 DEFINE_FWK_MODULE(edmtest::stream::TestEndLumiBlockProducer);
 DEFINE_FWK_MODULE(edmtest::stream::TestAccumulator);
-
diff --git a/FWCore/Framework/test/stubs/TestTBBTasksAnalyzer.cc b/FWCore/Framework/test/stubs/TestTBBTasksAnalyzer.cc
index 922683db8a7d7..bb59575e59746 100644
--- a/FWCore/Framework/test/stubs/TestTBBTasksAnalyzer.cc
+++ b/FWCore/Framework/test/stubs/TestTBBTasksAnalyzer.cc
@@ -2,7 +2,7 @@
 //
 // Package:    Framework
 // Class:      TestTBBTasksAnalyzer
-// 
+//
 /**\class TestTBBTasksAnalyzer TestTBBTasksAnalyzer.cc FWCore/Framework/test/stubs/TestTBBTasksAnalyzer.cc
 
  Description: <one line class summary>
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <atomic>
@@ -39,63 +38,65 @@
 //
 
 class TestTBBTasksAnalyzer : public edm::EDAnalyzer {
-   public:
-      explicit TestTBBTasksAnalyzer(const edm::ParameterSet&);
-      ~TestTBBTasksAnalyzer();
-
-
-      virtual void analyze(const edm::Event&, const edm::EventSetup&);
-   private:
-         virtual void endJob();
-         unsigned int m_nTasksToRun;
-         unsigned int m_expectedNumberOfSimultaneousTasks;
-         unsigned int m_maxCountedTasks;
-         unsigned int m_usecondsToSleep;
-      // ----------member data ---------------------------
+public:
+  explicit TestTBBTasksAnalyzer(const edm::ParameterSet&);
+  ~TestTBBTasksAnalyzer();
+
+  virtual void analyze(const edm::Event&, const edm::EventSetup&);
+
+private:
+  virtual void endJob();
+  unsigned int m_nTasksToRun;
+  unsigned int m_expectedNumberOfSimultaneousTasks;
+  unsigned int m_maxCountedTasks;
+  unsigned int m_usecondsToSleep;
+  // ----------member data ---------------------------
 };
 
 namespace {
-   class WaitTask : public tbb::task {
-   public:
-      WaitTask(unsigned int iSleepUSecs, std::atomic<unsigned int>* iCount, std::atomic<unsigned int>* iMaxCount): m_usecondsToSleep(iSleepUSecs),m_count(iCount),m_maxCount(iMaxCount) {}
-      tbb::task* execute() {
-         unsigned int c = ++(*m_count);
-         __sync_synchronize();
-         while(true) {
-            unsigned int mc = *m_maxCount;
-            if(c > mc) {
-               if(m_maxCount->compare_exchange_strong(mc,c)) {
-                  break;
-               }
-            }else {
-               break;
-            }
-         }
-         usleep(m_usecondsToSleep);
-         --(*m_count);
-         return 0;
-      }
-   private:
-      unsigned int m_usecondsToSleep;
-      edm::propagate_const<std::atomic<unsigned int>*> m_count;
-      edm::propagate_const<std::atomic<unsigned int>*> m_maxCount;
-   };
-
-   unsigned int startTasks(unsigned int iNTasks, unsigned int iSleepTime) {
-      std::atomic<unsigned int> count{0};
-      std::atomic<unsigned int> maxCount{0};
-      tbb::task* sync = new(tbb::task::allocate_root()) tbb::empty_task;
-      sync->set_ref_count(iNTasks+1);
-      for(unsigned int i=0; i<iNTasks;++i){
-         tbb::task* t = new(sync->allocate_child()) WaitTask(iSleepTime,&count,&maxCount);
-         sync->spawn(*t);
+  class WaitTask : public tbb::task {
+  public:
+    WaitTask(unsigned int iSleepUSecs, std::atomic<unsigned int>* iCount, std::atomic<unsigned int>* iMaxCount)
+        : m_usecondsToSleep(iSleepUSecs), m_count(iCount), m_maxCount(iMaxCount) {}
+    tbb::task* execute() {
+      unsigned int c = ++(*m_count);
+      __sync_synchronize();
+      while (true) {
+        unsigned int mc = *m_maxCount;
+        if (c > mc) {
+          if (m_maxCount->compare_exchange_strong(mc, c)) {
+            break;
+          }
+        } else {
+          break;
+        }
       }
-      sync->wait_for_all();
-      sync->destroy(*sync);
-      return maxCount.load();
-   }
+      usleep(m_usecondsToSleep);
+      --(*m_count);
+      return 0;
+    }
+
+  private:
+    unsigned int m_usecondsToSleep;
+    edm::propagate_const<std::atomic<unsigned int>*> m_count;
+    edm::propagate_const<std::atomic<unsigned int>*> m_maxCount;
+  };
+
+  unsigned int startTasks(unsigned int iNTasks, unsigned int iSleepTime) {
+    std::atomic<unsigned int> count{0};
+    std::atomic<unsigned int> maxCount{0};
+    tbb::task* sync = new (tbb::task::allocate_root()) tbb::empty_task;
+    sync->set_ref_count(iNTasks + 1);
+    for (unsigned int i = 0; i < iNTasks; ++i) {
+      tbb::task* t = new (sync->allocate_child()) WaitTask(iSleepTime, &count, &maxCount);
+      sync->spawn(*t);
+    }
+    sync->wait_for_all();
+    sync->destroy(*sync);
+    return maxCount.load();
+  }
 
-}
+}  // namespace
 //
 // constants, enums and typedefs
 //
@@ -107,49 +108,37 @@ namespace {
 //
 // constructors and destructor
 //
-TestTBBTasksAnalyzer::TestTBBTasksAnalyzer(const edm::ParameterSet& iConfig) :
-m_nTasksToRun(iConfig.getUntrackedParameter<unsigned int>("numTasksToRun")),
-m_expectedNumberOfSimultaneousTasks(iConfig.getUntrackedParameter<unsigned int>("nExpectedThreads")),
-m_maxCountedTasks(0),
-m_usecondsToSleep(iConfig.getUntrackedParameter<unsigned int>("usecondsToSleep",100000) )
-{
-   //now do what ever initialization is needed
-
+TestTBBTasksAnalyzer::TestTBBTasksAnalyzer(const edm::ParameterSet& iConfig)
+    : m_nTasksToRun(iConfig.getUntrackedParameter<unsigned int>("numTasksToRun")),
+      m_expectedNumberOfSimultaneousTasks(iConfig.getUntrackedParameter<unsigned int>("nExpectedThreads")),
+      m_maxCountedTasks(0),
+      m_usecondsToSleep(iConfig.getUntrackedParameter<unsigned int>("usecondsToSleep", 100000)) {
+  //now do what ever initialization is needed
 }
 
-
-TestTBBTasksAnalyzer::~TestTBBTasksAnalyzer()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+TestTBBTasksAnalyzer::~TestTBBTasksAnalyzer() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-TestTBBTasksAnalyzer::analyze(const edm::Event&, const edm::EventSetup& iSetup)
-{
-
-   unsigned int max = startTasks(m_nTasksToRun,m_usecondsToSleep);
-   
-   if(max > m_maxCountedTasks) {
-      m_maxCountedTasks = max;
-   }
-   
+void TestTBBTasksAnalyzer::analyze(const edm::Event&, const edm::EventSetup& iSetup) {
+  unsigned int max = startTasks(m_nTasksToRun, m_usecondsToSleep);
+
+  if (max > m_maxCountedTasks) {
+    m_maxCountedTasks = max;
+  }
 }
 
-void 
-TestTBBTasksAnalyzer::endJob()
-{
-  if (((m_expectedNumberOfSimultaneousTasks-1)>m_maxCountedTasks) || (m_maxCountedTasks > m_expectedNumberOfSimultaneousTasks)) {
-    throw cms::Exception("WrongNumberOfTasks")<<"expected "<<m_expectedNumberOfSimultaneousTasks<<" but instead saw "<<m_maxCountedTasks
-					       <<"\n";
+void TestTBBTasksAnalyzer::endJob() {
+  if (((m_expectedNumberOfSimultaneousTasks - 1) > m_maxCountedTasks) ||
+      (m_maxCountedTasks > m_expectedNumberOfSimultaneousTasks)) {
+    throw cms::Exception("WrongNumberOfTasks")
+        << "expected " << m_expectedNumberOfSimultaneousTasks << " but instead saw " << m_maxCountedTasks << "\n";
   }
 }
 //define this as a plug-in
diff --git a/FWCore/Framework/test/stubs/TestTriggerNames.cc b/FWCore/Framework/test/stubs/TestTriggerNames.cc
index dc7859f2e197d..86c69b20d5399 100644
--- a/FWCore/Framework/test/stubs/TestTriggerNames.cc
+++ b/FWCore/Framework/test/stubs/TestTriggerNames.cc
@@ -31,7 +31,6 @@ namespace edmtest {
 
   class TestTriggerNames : public edm::one::EDAnalyzer<> {
   public:
-
     typedef std::vector<std::string> Strings;
 
     explicit TestTriggerNames(edm::ParameterSet const&);
@@ -41,7 +40,6 @@ namespace edmtest {
     void endJob();
 
   private:
-
     unsigned int iEvent_;
     Strings expected_trigger_paths_;
     Strings expected_trigger_previous_;
@@ -54,136 +52,129 @@ namespace edmtest {
 
   // -----------------------------------------------------------------
 
-  TestTriggerNames::TestTriggerNames(edm::ParameterSet const& ps) :
-    iEvent_(0U),
-    expected_trigger_paths_(ps.getUntrackedParameter<Strings>("trigPaths", Strings())),
-    expected_trigger_previous_(ps.getUntrackedParameter<Strings>("trigPathsPrevious", Strings())),
-    expected_end_paths_(ps.getUntrackedParameter<Strings>("endPaths", Strings())),
-    streamerSource_(ps.getUntrackedParameter<bool>("streamerSource", false)),
-    dumpPSetRegistry_(ps.getUntrackedParameter<bool>("dumpPSetRegistry", false)),
-    expectedTriggerResultsHLT_(ps.getUntrackedParameter<std::vector<unsigned int> >("expectedTriggerResultsHLT", std::vector<unsigned int>())),
-    expectedTriggerResultsPROD_(ps.getUntrackedParameter<std::vector<unsigned int> >("expectedTriggerResultsPROD", std::vector<unsigned int>())) {
-      if(not expected_trigger_previous_.empty()) {
-        consumesMany<edm::TriggerResults>();
-      }
-      if(not expectedTriggerResultsHLT_.empty()) {
-        consumes<edm::TriggerResults>(edm::InputTag("TriggerResults","","HLT"));
-      }
-      if(not expectedTriggerResultsPROD_.empty()) {
-        consumes<edm::TriggerResults>(edm::InputTag("TriggerResults","","PROD"));
-      }
+  TestTriggerNames::TestTriggerNames(edm::ParameterSet const& ps)
+      : iEvent_(0U),
+        expected_trigger_paths_(ps.getUntrackedParameter<Strings>("trigPaths", Strings())),
+        expected_trigger_previous_(ps.getUntrackedParameter<Strings>("trigPathsPrevious", Strings())),
+        expected_end_paths_(ps.getUntrackedParameter<Strings>("endPaths", Strings())),
+        streamerSource_(ps.getUntrackedParameter<bool>("streamerSource", false)),
+        dumpPSetRegistry_(ps.getUntrackedParameter<bool>("dumpPSetRegistry", false)),
+        expectedTriggerResultsHLT_(ps.getUntrackedParameter<std::vector<unsigned int> >("expectedTriggerResultsHLT",
+                                                                                        std::vector<unsigned int>())),
+        expectedTriggerResultsPROD_(ps.getUntrackedParameter<std::vector<unsigned int> >("expectedTriggerResultsPROD",
+                                                                                         std::vector<unsigned int>())) {
+    if (not expected_trigger_previous_.empty()) {
+      consumesMany<edm::TriggerResults>();
+    }
+    if (not expectedTriggerResultsHLT_.empty()) {
+      consumes<edm::TriggerResults>(edm::InputTag("TriggerResults", "", "HLT"));
+    }
+    if (not expectedTriggerResultsPROD_.empty()) {
+      consumes<edm::TriggerResults>(edm::InputTag("TriggerResults", "", "PROD"));
+    }
   }
 
   // -----------------------------------------------------------------
 
-  TestTriggerNames::~TestTriggerNames() {
-  }
+  TestTriggerNames::~TestTriggerNames() {}
 
   // -----------------------------------------------------------------
 
   void TestTriggerNames::analyze(edm::Event const& e, edm::EventSetup const&) {
-    if(dumpPSetRegistry_) {
+    if (dumpPSetRegistry_) {
       pset::Registry* psetRegistry = pset::Registry::instance();
       psetRegistry->print(std::cout);
     }
 
     // Runs some tests on the TriggerNamesService
-    if(expected_trigger_paths_.size() > 0) {
-
+    if (expected_trigger_paths_.size() > 0) {
       Strings triggernames;
       edm::Service<edm::service::TriggerNamesService> tns;
       triggernames = tns->getTrigPaths();
-      if(triggernames.size() != expected_trigger_paths_.size()) {
+      if (triggernames.size() != expected_trigger_paths_.size()) {
         throw cms::Exception("Test Failure") << "TestTriggerNames: "
-             << "Expected and actual trigger path list not the same size" << std::endl;
+                                             << "Expected and actual trigger path list not the same size" << std::endl;
       }
-      for(Strings::size_type i = 0; i < expected_trigger_paths_.size(); ++i) {
-        if(triggernames[i] != expected_trigger_paths_[i]) {
+      for (Strings::size_type i = 0; i < expected_trigger_paths_.size(); ++i) {
+        if (triggernames[i] != expected_trigger_paths_[i]) {
           throw cms::Exception("Test Failure") << "TestTriggerNames: "
-               << "Expected and actual trigger paths don't match" << std::endl;
+                                               << "Expected and actual trigger paths don't match" << std::endl;
         }
       }
     }
 
-    if(expected_end_paths_.size() > 0) {
-
+    if (expected_end_paths_.size() > 0) {
       Strings endnames;
       edm::Service<edm::service::TriggerNamesService> tns;
       endnames = tns->getEndPaths();
-      if(endnames.size() != expected_end_paths_.size()) {
+      if (endnames.size() != expected_end_paths_.size()) {
         throw cms::Exception("Test Failure") << "TestTriggerNames: "
-             << "Expected and actual end path list not the same size" << std::endl;
+                                             << "Expected and actual end path list not the same size" << std::endl;
       }
-      for(Strings::size_type i = 0; i < expected_end_paths_.size(); ++i) {
-        if(endnames[i] != expected_end_paths_[i]) {
+      for (Strings::size_type i = 0; i < expected_end_paths_.size(); ++i) {
+        if (endnames[i] != expected_end_paths_[i]) {
           throw cms::Exception("Test Failure") << "TestTriggerNames: "
-               << "Expected and actual end paths don't match" << std::endl;
+                                               << "Expected and actual end paths don't match" << std::endl;
         }
       }
     }
 
-
-    if(expected_trigger_previous_.size() > 0) {
+    if (expected_trigger_previous_.size() > 0) {
       typedef std::vector<edm::Handle<edm::TriggerResults> > Trig;
       Trig prod;
       e.getManyByType(prod);
 
-      if(prod.size() == 0) {
-        throw cms::Exception("Test Failure") << "TestTriggerNames: "
-             << "No TriggerResults object found, expected previous trigger results"
-             << std::endl;
+      if (prod.size() == 0) {
+        throw cms::Exception("Test Failure")
+            << "TestTriggerNames: "
+            << "No TriggerResults object found, expected previous trigger results" << std::endl;
       }
 
       Strings triggernames;
       edm::Service<edm::service::TriggerNamesService> tns;
       auto index = 0U;
-      while( (index < prod.size()) and (moduleDescription().processName() == prod[index].provenance()->processName())) {
+      while ((index < prod.size()) and (moduleDescription().processName() == prod[index].provenance()->processName())) {
         ++index;
       }
-      if(tns->getTrigPaths(*prod[index], triggernames)) {
-        if(triggernames.size() != expected_trigger_previous_.size()) {
+      if (tns->getTrigPaths(*prod[index], triggernames)) {
+        if (triggernames.size() != expected_trigger_previous_.size()) {
           std::string et;
-          for(auto const& n: expected_trigger_previous_) {
-            et += n+" ";
+          for (auto const& n : expected_trigger_previous_) {
+            et += n + " ";
           }
           std::string tn;
-          for(auto const& n: triggernames) {
-            tn +=n+" ";
+          for (auto const& n : triggernames) {
+            tn += n + " ";
           }
           throw cms::Exception("Test Failure") << "TestTriggerNames: "
-               << "Expected and actual previous trigger path lists not the same size"
-          <<"\n expected: "<< et
-          <<"\n actual: "<<tn
-          << std::endl;
+                                               << "Expected and actual previous trigger path lists not the same size"
+                                               << "\n expected: " << et << "\n actual: " << tn << std::endl;
         }
-        for(Strings::size_type i = 0; i < expected_trigger_previous_.size(); ++i) {
-          if(triggernames[i] != expected_trigger_previous_[i]) {
+        for (Strings::size_type i = 0; i < expected_trigger_previous_.size(); ++i) {
+          if (triggernames[i] != expected_trigger_previous_[i]) {
             std::string et;
-            for(auto const& n: expected_trigger_previous_) {
-              et += n+" ";
+            for (auto const& n : expected_trigger_previous_) {
+              et += n + " ";
             }
             std::string tn;
-            for(auto const& n: triggernames) {
-              tn +=n+" ";
+            for (auto const& n : triggernames) {
+              tn += n + " ";
             }
 
             throw cms::Exception("Test Failure") << "TestTriggerNames: "
-                 << "Expected and actual previous trigger paths don't match"
-            <<"\n expected: "<< et
-            <<"\n actual: "<<tn
-            << std::endl;
+                                                 << "Expected and actual previous trigger paths don't match"
+                                                 << "\n expected: " << et << "\n actual: " << tn << std::endl;
           }
         }
-      }
-      else {
+      } else {
         throw cms::Exception("Test Failure") << "TestTriggerNames: "
-             << "Failed finding trigger names from a previous process" << std::endl;
+                                             << "Failed finding trigger names from a previous process" << std::endl;
       }
       bool fromPSetRegistry;
-      if(tns->getTrigPaths(*prod[index], triggernames, fromPSetRegistry)) {
-        if(!fromPSetRegistry) {
+      if (tns->getTrigPaths(*prod[index], triggernames, fromPSetRegistry)) {
+        if (!fromPSetRegistry) {
           throw cms::Exception("Test Failure") << "TestTriggerNames: "
-               << "fromPSetRegistry returned with incorrect value" << std::endl;
+                                               << "fromPSetRegistry returned with incorrect value" << std::endl;
         }
       }
 
@@ -191,12 +182,13 @@ namespace edmtest {
       // ID for the parameter set that lists the trigger paths.
       // Test this by getting this parameter set and verifying the trigger
       // paths are the correct size.
-      if(!streamerSource_) {
+      if (!streamerSource_) {
         ParameterSet const& trigpset = parameterSet(*prod[index].provenance());
         Strings trigpaths = trigpset.getParameter<Strings>("@trigger_paths");
-        if(trigpaths.size() != expected_trigger_previous_.size()) {
-          throw cms::Exception("Test Failure") << "TestTriggerNames: Using provenance\n"
-                    << "Expected and actual previous trigger path not the same size" << std::endl;
+        if (trigpaths.size() != expected_trigger_previous_.size()) {
+          throw cms::Exception("Test Failure")
+              << "TestTriggerNames: Using provenance\n"
+              << "Expected and actual previous trigger path not the same size" << std::endl;
         }
       }
 
@@ -206,37 +198,38 @@ namespace edmtest {
       TriggerNames const& triggerNamesFromEvent = e.triggerNames(*prod[index]);
 
       Strings namesFromEvent = triggerNamesFromEvent.triggerNames();
-      if(namesFromEvent.size() != expected_trigger_previous_.size()) {
-        throw cms::Exception("Test Failure") << "TestTriggerNames: While exercising TriggerNames class\n"
-             << "Expected and actual previous trigger path lists not the same size" << std::endl;
+      if (namesFromEvent.size() != expected_trigger_previous_.size()) {
+        throw cms::Exception("Test Failure")
+            << "TestTriggerNames: While exercising TriggerNames class\n"
+            << "Expected and actual previous trigger path lists not the same size" << std::endl;
       }
-      for(Strings::size_type i = 0; i < expected_trigger_previous_.size(); ++i) {
-        if(namesFromEvent[i] != expected_trigger_previous_[i]) {
+      for (Strings::size_type i = 0; i < expected_trigger_previous_.size(); ++i) {
+        if (namesFromEvent[i] != expected_trigger_previous_[i]) {
           throw cms::Exception("Test Failure") << "TestTriggerNames: While exercising TriggerNames class\n"
-               << "Expected and actual previous trigger paths don't match" << std::endl;
+                                               << "Expected and actual previous trigger paths don't match" << std::endl;
         }
-        if(triggerNamesFromEvent.triggerName(i) != expected_trigger_previous_[i]) {
+        if (triggerNamesFromEvent.triggerName(i) != expected_trigger_previous_[i]) {
           throw cms::Exception("Test Failure") << "TestTriggerNames: While exercising TriggerNames class\n"
-               << "name from index accessor\n"
-               << "Expected and actual previous trigger paths don't match" << std::endl;
+                                               << "name from index accessor\n"
+                                               << "Expected and actual previous trigger paths don't match" << std::endl;
         }
         // Exercise the function that returns an index
-        if(i != triggerNamesFromEvent.triggerIndex(expected_trigger_previous_[i])) {
+        if (i != triggerNamesFromEvent.triggerIndex(expected_trigger_previous_[i])) {
           throw cms::Exception("Test Failure") << "TestTriggerNames: While exercising TriggerNames class\n"
-               << "index from name accessor\n"
-               << "Expected and actual previous trigger paths don't match" << std::endl;
+                                               << "index from name accessor\n"
+                                               << "Expected and actual previous trigger paths don't match" << std::endl;
         }
-        if(triggerNamesFromEvent.size() != expected_trigger_previous_.size()) {
+        if (triggerNamesFromEvent.size() != expected_trigger_previous_.size()) {
           throw cms::Exception("Test Failure") << "TestTriggerNames: While exercising TriggerNames class\n"
-               << "Checking size accessor\n"
-               << "Expected and actual previous trigger paths don't match" << std::endl;
+                                               << "Checking size accessor\n"
+                                               << "Expected and actual previous trigger paths don't match" << std::endl;
         }
       }
       // This causes it to find the results in the map lookup in the TEST configuration
       // and exercises that execution path in the code.
       // If you follow the execution in the debugger in EventBase::triggerNames_ in EventBase.cc
       // you can verify this is working correctly.
-      if(prod.size() > 1U) {
+      if (prod.size() > 1U) {
         e.triggerNames(*prod[1]);
       }
     }
@@ -244,96 +237,93 @@ namespace edmtest {
     edm::InputTag tag("TriggerResults", "", "HLT");
     edm::Handle<edm::TriggerResults> hTriggerResults;
 
-    if(expectedTriggerResultsHLT_.size() > 0) {
-      if(e.getByLabel(tag, hTriggerResults)) {
-
+    if (expectedTriggerResultsHLT_.size() > 0) {
+      if (e.getByLabel(tag, hTriggerResults)) {
         edm::TriggerResultsByName resultsByNameHLT = e.triggerResultsByName(*hTriggerResults);
 
-        if(hTriggerResults->parameterSetID() != resultsByNameHLT.parameterSetID() ||
-             hTriggerResults->wasrun() != resultsByNameHLT.wasrun() ||
-             hTriggerResults->accept() != resultsByNameHLT.accept() ||
-             hTriggerResults->error() != resultsByNameHLT.error() ||
-             hTriggerResults->at(0).state() != resultsByNameHLT.at("p01").state() ||
-             hTriggerResults->at(0).index() != resultsByNameHLT.at("p01").index() ||
-             (*hTriggerResults)[0].state() != resultsByNameHLT["p01"].state() ||
-             (*hTriggerResults)[0].index() != resultsByNameHLT["p01"].index() ||
-             hTriggerResults->wasrun(0) != resultsByNameHLT.wasrun("p01") ||
-             hTriggerResults->accept(0) != resultsByNameHLT.accept("p01") ||
-             hTriggerResults->error(0) != resultsByNameHLT.error("p01") ||
-             hTriggerResults->state(0) != resultsByNameHLT.state("p01") ||
-             hTriggerResults->index(0) != resultsByNameHLT.index("p01") ||
-             hTriggerResults->at(0).state() != resultsByNameHLT.at(0).state() ||
-             hTriggerResults->at(0).index() != resultsByNameHLT.at(0).index() ||
-             (*hTriggerResults)[0].state() != resultsByNameHLT[0].state() ||
-             (*hTriggerResults)[0].index() != resultsByNameHLT[0].index() ||
-             hTriggerResults->wasrun(0) != resultsByNameHLT.wasrun(0) ||
-             hTriggerResults->accept(0) != resultsByNameHLT.accept(0) ||
-             hTriggerResults->error(0) != resultsByNameHLT.error(0) ||
-             hTriggerResults->state(0) != resultsByNameHLT.state(0) ||
-             hTriggerResults->index(0) != resultsByNameHLT.index(0)) {
-          throw cms::Exception("Test Failure") << "TestTriggerNames: While testing TriggerResultsByName class\n"
-                    << "TriggerResults values do not match TriggerResultsByName values" << std::endl;
+        if (hTriggerResults->parameterSetID() != resultsByNameHLT.parameterSetID() ||
+            hTriggerResults->wasrun() != resultsByNameHLT.wasrun() ||
+            hTriggerResults->accept() != resultsByNameHLT.accept() ||
+            hTriggerResults->error() != resultsByNameHLT.error() ||
+            hTriggerResults->at(0).state() != resultsByNameHLT.at("p01").state() ||
+            hTriggerResults->at(0).index() != resultsByNameHLT.at("p01").index() ||
+            (*hTriggerResults)[0].state() != resultsByNameHLT["p01"].state() ||
+            (*hTriggerResults)[0].index() != resultsByNameHLT["p01"].index() ||
+            hTriggerResults->wasrun(0) != resultsByNameHLT.wasrun("p01") ||
+            hTriggerResults->accept(0) != resultsByNameHLT.accept("p01") ||
+            hTriggerResults->error(0) != resultsByNameHLT.error("p01") ||
+            hTriggerResults->state(0) != resultsByNameHLT.state("p01") ||
+            hTriggerResults->index(0) != resultsByNameHLT.index("p01") ||
+            hTriggerResults->at(0).state() != resultsByNameHLT.at(0).state() ||
+            hTriggerResults->at(0).index() != resultsByNameHLT.at(0).index() ||
+            (*hTriggerResults)[0].state() != resultsByNameHLT[0].state() ||
+            (*hTriggerResults)[0].index() != resultsByNameHLT[0].index() ||
+            hTriggerResults->wasrun(0) != resultsByNameHLT.wasrun(0) ||
+            hTriggerResults->accept(0) != resultsByNameHLT.accept(0) ||
+            hTriggerResults->error(0) != resultsByNameHLT.error(0) ||
+            hTriggerResults->state(0) != resultsByNameHLT.state(0) ||
+            hTriggerResults->index(0) != resultsByNameHLT.index(0)) {
+          throw cms::Exception("Test Failure")
+              << "TestTriggerNames: While testing TriggerResultsByName class\n"
+              << "TriggerResults values do not match TriggerResultsByName values" << std::endl;
         }
         edm::TriggerNames const& names = e.triggerNames(*hTriggerResults);
-        if(names.triggerNames() != resultsByNameHLT.triggerNames() ||
-            names.size() != resultsByNameHLT.size() ||
+        if (names.triggerNames() != resultsByNameHLT.triggerNames() || names.size() != resultsByNameHLT.size() ||
             names.triggerName(0) != resultsByNameHLT.triggerName(0) ||
             names.triggerIndex("p01") != resultsByNameHLT.triggerIndex("p01")) {
-          throw cms::Exception("Test Failure") << "TestTriggerNames: While testing TriggerResultsByName class\n"
-                    << "TriggerNames values do not match TriggerResultsByName values" << std::endl;
+          throw cms::Exception("Test Failure")
+              << "TestTriggerNames: While testing TriggerResultsByName class\n"
+              << "TriggerNames values do not match TriggerResultsByName values" << std::endl;
         }
       }
     }
 
-    if(expectedTriggerResultsHLT_.size() > iEvent_) {
-
-      if(!hTriggerResults.isValid()) {
+    if (expectedTriggerResultsHLT_.size() > iEvent_) {
+      if (!hTriggerResults.isValid()) {
         throw cms::Exception("Test Failure") << "TestTriggerNames: While testing TriggerResultsByName class\n"
-                  << "Invalid TriggerResults Handle for HLT" << std::endl;
+                                             << "Invalid TriggerResults Handle for HLT" << std::endl;
       }
 
       edm::TriggerResultsByName resultsByNameHLT = e.triggerResultsByName(*hTriggerResults);
 
-      if(!resultsByNameHLT.isValid()) {
+      if (!resultsByNameHLT.isValid()) {
         throw cms::Exception("Test Failure") << "TestTriggerNames: While testing TriggerResultsByName class\n"
-                  << "Invalid object for HLT" << std::endl;
+                                             << "Invalid object for HLT" << std::endl;
       }
-      if(resultsByNameHLT.accept("p02") != (expectedTriggerResultsHLT_[iEvent_] == 1)) {
+      if (resultsByNameHLT.accept("p02") != (expectedTriggerResultsHLT_[iEvent_] == 1)) {
         throw cms::Exception("Test Failure") << "TestTriggerNames: While testing TriggerResultsByName class\n"
-                  << "Expected and actual HLT trigger results don't match" << std::endl;
+                                             << "Expected and actual HLT trigger results don't match" << std::endl;
       }
-      edm::LogAbsolute("TEST") << "Event " << iEvent_ << "  " << resultsByNameHLT.accept("p02")
-                << std::endl;
+      edm::LogAbsolute("TEST") << "Event " << iEvent_ << "  " << resultsByNameHLT.accept("p02") << std::endl;
     }
 
     edm::InputTag tagPROD("TriggerResults", "", "PROD");
     edm::Handle<edm::TriggerResults> hTriggerResultsPROD;
 
-    if(expectedTriggerResultsPROD_.size() > iEvent_) {
+    if (expectedTriggerResultsPROD_.size() > iEvent_) {
       e.getByLabel(tagPROD, hTriggerResultsPROD);
 
-      if(!hTriggerResultsPROD.isValid()) {
+      if (!hTriggerResultsPROD.isValid()) {
         throw cms::Exception("Test Failure") << "TestTriggerNames: While testing TriggerResultsByName class\n"
-                  << "Invalid TriggerResults Handle for PROD" << std::endl;
+                                             << "Invalid TriggerResults Handle for PROD" << std::endl;
       }
 
       edm::TriggerResultsByName resultsByNamePROD = e.triggerResultsByName(*hTriggerResultsPROD);
-      if(!resultsByNamePROD.isValid()) {
+      if (!resultsByNamePROD.isValid()) {
         throw cms::Exception("Test Failure") << "TestTriggerNames: While testing TriggerResultsByName class\n"
-                  << "Invalid object for PROD" << std::endl;
+                                             << "Invalid object for PROD" << std::endl;
       }
-      if(resultsByNamePROD.accept("p1") != (expectedTriggerResultsPROD_[iEvent_] == 1)) {
+      if (resultsByNamePROD.accept("p1") != (expectedTriggerResultsPROD_[iEvent_] == 1)) {
         throw cms::Exception("Test Failure") << "TestTriggerNames: While testing TriggerResultsByName class\n"
-                  << "Expected and actual PROD trigger results don't match" << std::endl;
+                                             << "Expected and actual PROD trigger results don't match" << std::endl;
       }
       edm::LogAbsolute("TEST") << "Event " << iEvent_ << "  " << resultsByNamePROD.accept("p1") << std::endl;
     }
     ++iEvent_;
   }
 
-  void TestTriggerNames::endJob() {
-  }
-}
+  void TestTriggerNames::endJob() {}
+}  // namespace edmtest
 
 using edmtest::TestTriggerNames;
 
diff --git a/FWCore/Framework/test/stubs/ToyAnalyzers.cc b/FWCore/Framework/test/stubs/ToyAnalyzers.cc
index bfacbccc31a1a..1425ced9ac269 100644
--- a/FWCore/Framework/test/stubs/ToyAnalyzers.cc
+++ b/FWCore/Framework/test/stubs/ToyAnalyzers.cc
@@ -37,35 +37,32 @@ namespace edmtest {
   //
   class NonAnalyzer : public edm::EDAnalyzer {
   public:
-    explicit NonAnalyzer(edm::ParameterSet const& /*p*/) {
-    }
+    explicit NonAnalyzer(edm::ParameterSet const& /*p*/) {}
     virtual ~NonAnalyzer() {}
     virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
   };
 
-  void
-  NonAnalyzer::analyze(edm::Event const&, edm::EventSetup const&) {
-  }
+  void NonAnalyzer::analyze(edm::Event const&, edm::EventSetup const&) {}
 
   //--------------------------------------------------------------------
   //
   class IntTestAnalyzer : public edm::EDAnalyzer {
   public:
-    IntTestAnalyzer(edm::ParameterSet const& iPSet) :
-      value_(iPSet.getUntrackedParameter<int>("valueMustMatch")),
-      moduleLabel_(iPSet.getUntrackedParameter<std::string>("moduleLabel"), "") {
+    IntTestAnalyzer(edm::ParameterSet const& iPSet)
+        : value_(iPSet.getUntrackedParameter<int>("valueMustMatch")),
+          moduleLabel_(iPSet.getUntrackedParameter<std::string>("moduleLabel"), "") {
       consumes<IntProduct>(moduleLabel_);
     }
 
     void analyze(edm::Event const& iEvent, edm::EventSetup const&) {
       edm::Handle<IntProduct> handle;
       iEvent.getByLabel(moduleLabel_, handle);
-      if(handle->value != value_) {
-        throw cms::Exception("ValueMissMatch")
-          << "The value for \"" << moduleLabel_ << "\" is "
-          << handle->value << " but it was supposed to be " << value_;
+      if (handle->value != value_) {
+        throw cms::Exception("ValueMissMatch") << "The value for \"" << moduleLabel_ << "\" is " << handle->value
+                                               << " but it was supposed to be " << value_;
       }
     }
+
   private:
     int value_;
     edm::InputTag moduleLabel_;
@@ -75,90 +72,80 @@ namespace edmtest {
   //
   class MultipleIntsAnalyzer : public edm::global::EDAnalyzer<> {
   public:
-    MultipleIntsAnalyzer(edm::ParameterSet const& iPSet)
-    {
+    MultipleIntsAnalyzer(edm::ParameterSet const& iPSet) {
       auto const& tags = iPSet.getUntrackedParameter<std::vector<edm::InputTag>>("getFromModules");
-      for(auto const& tag: tags) {
+      for (auto const& tag : tags) {
         m_tokens.emplace_back(consumes<IntProduct>(tag));
       }
     }
-    
+
     void analyze(edm::StreamID, edm::Event const& iEvent, edm::EventSetup const&) const override {
-      for(auto const& token: m_tokens) {
-        (void) iEvent.getHandle(token);
+      for (auto const& token : m_tokens) {
+        (void)iEvent.getHandle(token);
       }
     }
-    
+
     static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
       edm::ParameterSetDescription desc;
       desc.addUntracked<std::vector<edm::InputTag>>("getFromModules");
       descriptions.addDefault(desc);
-      
     }
+
   private:
     std::vector<edm::EDGetTokenT<IntProduct>> m_tokens;
-    
   };
 
   //--------------------------------------------------------------------
   //
   class IntConsumingAnalyzer : public edm::global::EDAnalyzer<> {
   public:
-    IntConsumingAnalyzer(edm::ParameterSet const& iPSet)
-     {
+    IntConsumingAnalyzer(edm::ParameterSet const& iPSet) {
       consumes<IntProduct>(iPSet.getUntrackedParameter<edm::InputTag>("getFromModule"));
     }
-    
+
     void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const override {}
-    
+
     static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
       edm::ParameterSetDescription desc;
       desc.addUntracked<edm::InputTag>("getFromModule");
       descriptions.addDefault(desc);
-
     }
-
-    
   };
   //--------------------------------------------------------------------
   //
   class IntFromRunConsumingAnalyzer : public edm::global::EDAnalyzer<> {
   public:
-    IntFromRunConsumingAnalyzer(edm::ParameterSet const& iPSet)
-    {
+    IntFromRunConsumingAnalyzer(edm::ParameterSet const& iPSet) {
       consumes<IntProduct, edm::InRun>(iPSet.getUntrackedParameter<edm::InputTag>("getFromModule"));
     }
-    
+
     void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const override {}
-    
+
     static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
       edm::ParameterSetDescription desc;
       desc.addUntracked<edm::InputTag>("getFromModule");
       descriptions.addDefault(desc);
-      
     }
-    
-    
   };
   //--------------------------------------------------------------------
   //
   class ConsumingStreamAnalyzer : public edm::stream::EDAnalyzer<> {
   public:
-    ConsumingStreamAnalyzer(edm::ParameterSet const& iPSet) :
-      value_(iPSet.getUntrackedParameter<int>("valueMustMatch")),
-      moduleLabel_(iPSet.getUntrackedParameter<std::string>("moduleLabel"), "") {
+    ConsumingStreamAnalyzer(edm::ParameterSet const& iPSet)
+        : value_(iPSet.getUntrackedParameter<int>("valueMustMatch")),
+          moduleLabel_(iPSet.getUntrackedParameter<std::string>("moduleLabel"), "") {
       mayConsume<IntProduct>(moduleLabel_);
     }
 
     void analyze(edm::Event const& iEvent, edm::EventSetup const&) {
       edm::Handle<IntProduct> handle;
       iEvent.getByLabel(moduleLabel_, handle);
-      if(handle->value != value_) {
-        throw cms::Exception("ValueMissMatch")
-          << "The value for \"" << moduleLabel_ << "\" is "
-          << handle->value << " but it was supposed to be " << value_;
+      if (handle->value != value_) {
+        throw cms::Exception("ValueMissMatch") << "The value for \"" << moduleLabel_ << "\" is " << handle->value
+                                               << " but it was supposed to be " << value_;
       }
     }
+
   private:
     int value_;
     edm::InputTag moduleLabel_;
@@ -168,22 +155,22 @@ namespace edmtest {
   //
   class ConsumingOneSharedResourceAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResources> {
   public:
-    ConsumingOneSharedResourceAnalyzer(edm::ParameterSet const& iPSet) :
-    value_(iPSet.getUntrackedParameter<int>("valueMustMatch")),
-    moduleLabel_(iPSet.getUntrackedParameter<edm::InputTag>("moduleLabel")) {
+    ConsumingOneSharedResourceAnalyzer(edm::ParameterSet const& iPSet)
+        : value_(iPSet.getUntrackedParameter<int>("valueMustMatch")),
+          moduleLabel_(iPSet.getUntrackedParameter<edm::InputTag>("moduleLabel")) {
       mayConsume<IntProduct>(moduleLabel_);
       usesResource(iPSet.getUntrackedParameter<std::string>("resourceName"));
     }
-    
+
     void analyze(edm::Event const& iEvent, edm::EventSetup const&) {
       edm::Handle<IntProduct> handle;
       iEvent.getByLabel(moduleLabel_, handle);
-      if(handle->value != value_) {
-        throw cms::Exception("ValueMissMatch")
-        << "The value for \"" << moduleLabel_ << "\" is "
-        << handle->value << " but it was supposed to be " << value_;
+      if (handle->value != value_) {
+        throw cms::Exception("ValueMissMatch") << "The value for \"" << moduleLabel_ << "\" is " << handle->value
+                                               << " but it was supposed to be " << value_;
       }
     }
+
   private:
     int value_;
     edm::InputTag moduleLabel_;
@@ -195,13 +182,10 @@ namespace edmtest {
   public:
     SCSimpleAnalyzer(edm::ParameterSet const&) {}
 
-    virtual void
-    analyze(edm::Event const& e, edm::EventSetup const&);
+    virtual void analyze(edm::Event const& e, edm::EventSetup const&);
   };
 
-  void
-  SCSimpleAnalyzer::analyze(edm::Event const& e, edm::EventSetup const&) {
-
+  void SCSimpleAnalyzer::analyze(edm::Event const& e, edm::EventSetup const&) {
     // Get the product back out; it should be sorted.
     edm::Handle<SCSimpleProduct> h;
     e.getByLabel("scs", h);
@@ -217,8 +201,8 @@ namespace edmtest {
 
     // Verify that the vector *is* sorted.
 
-    for(size_type i = 1, end = after.size(); i < end; ++i) {
-      assert(after[i-1].id() < after[i].id());
+    for (size_type i = 1, end = after.size(); i < end; ++i) {
+      assert(after[i - 1].id() < after[i].id());
     }
   }
 
@@ -228,24 +212,22 @@ namespace edmtest {
   public:
     DSVAnalyzer(edm::ParameterSet const&) {}
 
-    virtual void
-    analyze(edm::Event const& e, edm::EventSetup const&);
+    virtual void analyze(edm::Event const& e, edm::EventSetup const&);
+
   private:
     void do_sorted_stuff(edm::Event const& e);
     void do_unsorted_stuff(edm::Event const& e);
   };
 
-  void
-  DSVAnalyzer::analyze(edm::Event const& e, edm::EventSetup const&) {
+  void DSVAnalyzer::analyze(edm::Event const& e, edm::EventSetup const&) {
     do_sorted_stuff(e);
     do_unsorted_stuff(e);
   }
 
-  void
-  DSVAnalyzer::do_sorted_stuff(edm::Event const& e) {
-    typedef DSVSimpleProduct         product_type;
+  void DSVAnalyzer::do_sorted_stuff(edm::Event const& e) {
+    typedef DSVSimpleProduct product_type;
     typedef product_type::value_type detset;
-    typedef detset::value_type       value_type;
+    typedef detset::value_type value_type;
     // Get the product back out; it should be sorted.
     edm::Handle<product_type> h;
     e.getByLabel("dsv1", h);
@@ -256,21 +238,20 @@ namespace edmtest {
     // manipulate them via an interface different from
     // DetSet, just so that we can make sure the collection
     // is sorted.
-    std::vector<value_type> const& after = (h->end()-1)->data;
+    std::vector<value_type> const& after = (h->end() - 1)->data;
     typedef std::vector<value_type>::size_type size_type;
 
     // Verify that the vector *is* sorted.
 
-    for(size_type i = 1, end = after.size(); i < end; ++i) {
-      assert(after[i-1].data < after[i].data);
+    for (size_type i = 1, end = after.size(); i < end; ++i) {
+      assert(after[i - 1].data < after[i].data);
     }
   }
 
-  void
-  DSVAnalyzer::do_unsorted_stuff(edm::Event const& e) {
-    typedef DSVWeirdProduct         product_type;
+  void DSVAnalyzer::do_unsorted_stuff(edm::Event const& e) {
+    typedef DSVWeirdProduct product_type;
     typedef product_type::value_type detset;
-    typedef detset::value_type       value_type;
+    typedef detset::value_type value_type;
     // Get the product back out; it should be unsorted.
     edm::Handle<product_type> h;
     e.getByLabel("dsv1", h);
@@ -281,25 +262,25 @@ namespace edmtest {
     // manipulate them via an interface different from
     // DetSet, just so that we can make sure the collection
     // is not sorted.
-    std::vector<value_type> const& after = (h->end()-1)->data;
+    std::vector<value_type> const& after = (h->end() - 1)->data;
     typedef std::vector<value_type>::size_type size_type;
 
     // Verify that the vector is reverse-sorted.
 
-    for(size_type i = 1, end = after.size(); i < end; ++i) {
-        assert(after[i-1].data > after[i].data);
+    for (size_type i = 1, end = after.size(); i < end; ++i) {
+      assert(after[i - 1].data > after[i].data);
     }
   }
-}
+}  // namespace edmtest
 
-using edmtest::NonAnalyzer;
-using edmtest::IntTestAnalyzer;
-using edmtest::IntConsumingAnalyzer;
-using edmtest::ConsumingStreamAnalyzer;
 using edmtest::ConsumingOneSharedResourceAnalyzer;
-using edmtest::SCSimpleAnalyzer;
+using edmtest::ConsumingStreamAnalyzer;
 using edmtest::DSVAnalyzer;
+using edmtest::IntConsumingAnalyzer;
+using edmtest::IntTestAnalyzer;
 using edmtest::MultipleIntsAnalyzer;
+using edmtest::NonAnalyzer;
+using edmtest::SCSimpleAnalyzer;
 DEFINE_FWK_MODULE(NonAnalyzer);
 DEFINE_FWK_MODULE(IntTestAnalyzer);
 DEFINE_FWK_MODULE(MultipleIntsAnalyzer);
@@ -309,4 +290,3 @@ DEFINE_FWK_MODULE(ConsumingStreamAnalyzer);
 DEFINE_FWK_MODULE(ConsumingOneSharedResourceAnalyzer);
 DEFINE_FWK_MODULE(SCSimpleAnalyzer);
 DEFINE_FWK_MODULE(DSVAnalyzer);
-
diff --git a/FWCore/Framework/test/stubs/ToyDoubleProducers.cc b/FWCore/Framework/test/stubs/ToyDoubleProducers.cc
index 5c1a693ad88e5..233e5248085ef 100644
--- a/FWCore/Framework/test/stubs/ToyDoubleProducers.cc
+++ b/FWCore/Framework/test/stubs/ToyDoubleProducers.cc
@@ -31,26 +31,22 @@ namespace edmtest {
 
   class ToyDoubleProducer : public edm::EDProducer {
   public:
-    explicit ToyDoubleProducer(edm::ParameterSet const& p) :
-      value_(p.getParameter<double>("dvalue")) {
-      produces<DoubleProduct>();
-    }
-    explicit ToyDoubleProducer(double d) : value_(d) {
+    explicit ToyDoubleProducer(edm::ParameterSet const& p) : value_(p.getParameter<double>("dvalue")) {
       produces<DoubleProduct>();
     }
+    explicit ToyDoubleProducer(double d) : value_(d) { produces<DoubleProduct>(); }
     virtual ~ToyDoubleProducer() {}
     virtual void produce(edm::Event& e, edm::EventSetup const& c);
+
   private:
     double value_;
   };
 
-  void
-  ToyDoubleProducer::produce(edm::Event& e, edm::EventSetup const&) {
-
+  void ToyDoubleProducer::produce(edm::Event& e, edm::EventSetup const&) {
     // Make output
     e.put(std::make_unique<DoubleProduct>(value_));
   }
-}
+}  // namespace edmtest
 
 using edmtest::ToyDoubleProducer;
 DEFINE_FWK_MODULE(ToyDoubleProducer);
diff --git a/FWCore/Framework/test/stubs/ToyIntProducers.cc b/FWCore/Framework/test/stubs/ToyIntProducers.cc
index ca4a2455d48a5..c1679f2ea7318 100644
--- a/FWCore/Framework/test/stubs/ToyIntProducers.cc
+++ b/FWCore/Framework/test/stubs/ToyIntProducers.cc
@@ -43,14 +43,11 @@ namespace edmtest {
   //
   class FailingProducer : public edm::global::EDProducer<> {
   public:
-    explicit FailingProducer(edm::ParameterSet const& /*p*/) {
-      produces<IntProduct>();
-    }
+    explicit FailingProducer(edm::ParameterSet const& /*p*/) { produces<IntProduct>(); }
     void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
   };
 
-  void
-  FailingProducer::produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const {
+  void FailingProducer::produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const {
     // We throw an edm exception with a configurable action.
     throw edm::Exception(edm::errors::NotFound) << "Intentional 'NotFound' exception for testing purposes\n";
   }
@@ -63,20 +60,14 @@ namespace edmtest {
   //
   class FailingInRunProducer : public edm::global::EDProducer<edm::BeginRunProducer> {
   public:
-    explicit FailingInRunProducer(edm::ParameterSet const& /*p*/) {
-      produces<IntProduct,edm::Transition::BeginRun>();
-    }
+    explicit FailingInRunProducer(edm::ParameterSet const& /*p*/) { produces<IntProduct, edm::Transition::BeginRun>(); }
     void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
-    
-    void globalBeginRunProduce( edm::Run&, edm::EventSetup const&) const override;
 
+    void globalBeginRunProduce(edm::Run&, edm::EventSetup const&) const override;
   };
-  
-  void
-  FailingInRunProducer::produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const {
-  }
-  void
-  FailingInRunProducer::globalBeginRunProduce( edm::Run&, edm::EventSetup const&) const {
+
+  void FailingInRunProducer::produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const {}
+  void FailingInRunProducer::globalBeginRunProduce(edm::Run&, edm::EventSetup const&) const {
     // We throw an edm exception with a configurable action.
     throw edm::Exception(edm::errors::NotFound) << "Intentional 'NotFound' exception for testing purposes\n";
   }
@@ -88,15 +79,11 @@ namespace edmtest {
   //
   class NonProducer : public edm::global::EDProducer<> {
   public:
-    explicit NonProducer(edm::ParameterSet const& /*p*/) {
-      produces<IntProduct>();
-    }
+    explicit NonProducer(edm::ParameterSet const& /*p*/) { produces<IntProduct>(); }
     void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
   };
 
-  void
-  NonProducer::produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const {
-  }
+  void NonProducer::produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const {}
 
   //--------------------------------------------------------------------
   //
@@ -105,10 +92,8 @@ namespace edmtest {
   // NOTE: this really should be a global::EDProducer<> but for testing we use stream
   class IntProducer : public edm::stream::EDProducer<> {
   public:
-    explicit IntProducer(edm::ParameterSet const& p) :
-      token_{produces<IntProduct>()},
-      value_(p.getParameter<int>("ivalue")) {
-    }
+    explicit IntProducer(edm::ParameterSet const& p)
+        : token_{produces<IntProduct>()}, value_(p.getParameter<int>("ivalue")) {}
     void produce(edm::Event& e, edm::EventSetup const& c) override;
 
   private:
@@ -116,10 +101,9 @@ namespace edmtest {
     int value_;
   };
 
-  void
-  IntProducer::produce(edm::Event& e, edm::EventSetup const&) {
+  void IntProducer::produce(edm::Event& e, edm::EventSetup const&) {
     // EventSetup is not used.
-    e.emplace(token_,value_);
+    e.emplace(token_, value_);
   }
 
   //--------------------------------------------------------------------
@@ -128,25 +112,21 @@ namespace edmtest {
   //
   class IntLegacyProducer : public edm::EDProducer {
   public:
-    explicit IntLegacyProducer(edm::ParameterSet const& p) :
-    value_(p.getParameter<int>("ivalue")) {
-      produces<IntProduct>();
-    }
-    explicit IntLegacyProducer(int i) : value_(i) {
+    explicit IntLegacyProducer(edm::ParameterSet const& p) : value_(p.getParameter<int>("ivalue")) {
       produces<IntProduct>();
     }
+    explicit IntLegacyProducer(int i) : value_(i) { produces<IntProduct>(); }
     void produce(edm::Event& e, edm::EventSetup const& c) override;
-    
+
   private:
     int value_;
   };
-  
-  void
-  IntLegacyProducer::produce(edm::Event& e, edm::EventSetup const&) {
+
+  void IntLegacyProducer::produce(edm::Event& e, edm::EventSetup const&) {
     // EventSetup is not used.
     e.put(std::make_unique<IntProduct>(value_));
   }
-  
+
   //--------------------------------------------------------------------
   //
   // Produces an IntProduct instance.
@@ -154,13 +134,12 @@ namespace edmtest {
   //
   class BusyWaitIntProducer : public edm::global::EDProducer<> {
   public:
-    explicit BusyWaitIntProducer(edm::ParameterSet const& p) :
-    token_{produces<IntProduct>()},
-    value_(p.getParameter<int>("ivalue")),
-    iterations_(p.getParameter<unsigned int>("iterations")),
-    pi_(std::acos(-1)),
-    lumiNumberToThrow_(p.getParameter<unsigned int>("lumiNumberToThrow")) {
-    }
+    explicit BusyWaitIntProducer(edm::ParameterSet const& p)
+        : token_{produces<IntProduct>()},
+          value_(p.getParameter<int>("ivalue")),
+          iterations_(p.getParameter<unsigned int>("iterations")),
+          pi_(std::acos(-1)),
+          lumiNumberToThrow_(p.getParameter<unsigned int>("lumiNumberToThrow")) {}
 
     void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
 
@@ -173,25 +152,22 @@ namespace edmtest {
     const double pi_;
     const unsigned int lumiNumberToThrow_;
   };
-  
-  void
-  BusyWaitIntProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
-    
+
+  void BusyWaitIntProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
     double sum = 0.;
-    const double stepSize = pi_/iterations_;
-    for(unsigned int i = 0; i < iterations_; ++i) {
-      sum += stepSize*cos(i*stepSize);
+    const double stepSize = pi_ / iterations_;
+    for (unsigned int i = 0; i < iterations_; ++i) {
+      sum += stepSize * cos(i * stepSize);
     }
-    
-    e.emplace(token_,value_+sum);
+
+    e.emplace(token_, value_ + sum);
 
     if (e.luminosityBlock() == lumiNumberToThrow_) {
       throw cms::Exception("Test");
     }
   }
 
-  void
-  BusyWaitIntProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  void BusyWaitIntProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription desc;
     desc.add<int>("ivalue");
     desc.add<unsigned int>("iterations");
@@ -202,82 +178,75 @@ namespace edmtest {
   //--------------------------------------------------------------------
   class BusyWaitIntLimitedProducer : public edm::limited::EDProducer<> {
   public:
-    explicit BusyWaitIntLimitedProducer(edm::ParameterSet const& p) :
-    edm::limited::EDProducerBase(p),
-    edm::limited::EDProducer<>(p),
-    token_{produces<IntProduct>()},
-    value_(p.getParameter<int>("ivalue")),
-    iterations_(p.getParameter<unsigned int>("iterations")),
-    pi_(std::acos(-1)){
-    }
-    
+    explicit BusyWaitIntLimitedProducer(edm::ParameterSet const& p)
+        : edm::limited::EDProducerBase(p),
+          edm::limited::EDProducer<>(p),
+          token_{produces<IntProduct>()},
+          value_(p.getParameter<int>("ivalue")),
+          iterations_(p.getParameter<unsigned int>("iterations")),
+          pi_(std::acos(-1)) {}
+
     void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
-    
+
   private:
     const edm::EDPutTokenT<IntProduct> token_;
     const int value_;
     const unsigned int iterations_;
     const double pi_;
     mutable std::atomic<unsigned int> reentrancy_{0};
-    
   };
-  
-  void
-  BusyWaitIntLimitedProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
+
+  void BusyWaitIntLimitedProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
     auto v = ++reentrancy_;
-    if( v > concurrencyLimit()) {
+    if (v > concurrencyLimit()) {
       --reentrancy_;
-      throw cms::Exception("NotLimited","produce called to many times concurrently.");
+      throw cms::Exception("NotLimited", "produce called to many times concurrently.");
     }
-    
+
     double sum = 0.;
-    const double stepSize = pi_/iterations_;
-    for(unsigned int i = 0; i < iterations_; ++i) {
-      sum += stepSize*cos(i*stepSize);
+    const double stepSize = pi_ / iterations_;
+    for (unsigned int i = 0; i < iterations_; ++i) {
+      sum += stepSize * cos(i * stepSize);
     }
-    
-    e.emplace(token_,value_+sum);
+
+    e.emplace(token_, value_ + sum);
     --reentrancy_;
   }
-  
+
   //--------------------------------------------------------------------
   class BusyWaitIntLegacyProducer : public edm::EDProducer {
   public:
-    explicit BusyWaitIntLegacyProducer(edm::ParameterSet const& p) :
-    value_(p.getParameter<int>("ivalue")),
-    iterations_(p.getParameter<unsigned int>("iterations")),
-    pi_(std::acos(-1)){
+    explicit BusyWaitIntLegacyProducer(edm::ParameterSet const& p)
+        : value_(p.getParameter<int>("ivalue")),
+          iterations_(p.getParameter<unsigned int>("iterations")),
+          pi_(std::acos(-1)) {
       produces<IntProduct>();
     }
-    
+
     void produce(edm::Event& e, edm::EventSetup const& c) override;
-    
+
   private:
     const int value_;
     const unsigned int iterations_;
     const double pi_;
-    
   };
-  
-  void
-  BusyWaitIntLegacyProducer::produce( edm::Event& e, edm::EventSetup const&) {
-    
+
+  void BusyWaitIntLegacyProducer::produce(edm::Event& e, edm::EventSetup const&) {
     double sum = 0.;
-    const double stepSize = pi_/iterations_;
-    for(unsigned int i = 0; i < iterations_; ++i) {
-      sum += stepSize*cos(i*stepSize);
+    const double stepSize = pi_ / iterations_;
+    for (unsigned int i = 0; i < iterations_; ++i) {
+      sum += stepSize * cos(i * stepSize);
     }
-    
-    e.put(std::make_unique<IntProduct>(value_+sum));
+
+    e.put(std::make_unique<IntProduct>(value_ + sum));
   }
-  
+
   //--------------------------------------------------------------------
 
   class ConsumingIntProducer : public edm::stream::EDProducer<> {
   public:
-    explicit ConsumingIntProducer(edm::ParameterSet const& p) :
-      token_{produces<IntProduct>()},
-      value_(p.getParameter<int>("ivalue")) {
+    explicit ConsumingIntProducer(edm::ParameterSet const& p)
+        : token_{produces<IntProduct>()}, value_(p.getParameter<int>("ivalue")) {
       // not used, only exists to test PathAndConsumesOfModules
       consumes<edm::TriggerResults>(edm::InputTag("TriggerResults"));
       consumesMany<edm::TriggerResults>();
@@ -289,10 +258,7 @@ namespace edmtest {
     const int value_;
   };
 
-  void
-  ConsumingIntProducer::produce(edm::Event& e, edm::EventSetup const&) {
-    e.emplace(token_,value_);
-  }
+  void ConsumingIntProducer::produce(edm::Event& e, edm::EventSetup const&) { e.emplace(token_, value_); }
 
   //--------------------------------------------------------------------
   //
@@ -301,33 +267,26 @@ namespace edmtest {
   //
   class EventNumberIntProducer : public edm::global::EDProducer<> {
   public:
-    explicit EventNumberIntProducer(edm::ParameterSet const&) :
-    token_{produces<UInt64Product>()}
-    {}
+    explicit EventNumberIntProducer(edm::ParameterSet const&) : token_{produces<UInt64Product>()} {}
     void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
 
   private:
     const edm::EDPutTokenT<UInt64Product> token_;
-
   };
 
-  void
-  EventNumberIntProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
+  void EventNumberIntProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
     // EventSetup is not used.
-    e.emplace(token_,e.id().event());
+    e.emplace(token_, e.id().event());
   }
 
-
   //--------------------------------------------------------------------
   //
   // Produces a TransientIntProduct instance.
   //
   class TransientIntProducer : public edm::global::EDProducer<> {
   public:
-    explicit TransientIntProducer(edm::ParameterSet const& p) :
-    token_{produces<TransientIntProduct>()},
-      value_(p.getParameter<int>("ivalue")) {
-    }
+    explicit TransientIntProducer(edm::ParameterSet const& p)
+        : token_{produces<TransientIntProduct>()}, value_(p.getParameter<int>("ivalue")) {}
     void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
 
   private:
@@ -335,10 +294,9 @@ namespace edmtest {
     const int value_;
   };
 
-  void
-  TransientIntProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
+  void TransientIntProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
     // EventSetup is not used.
-    e.emplace(token_,value_);
+    e.emplace(token_, value_);
   }
 
   //--------------------------------------------------------------------
@@ -347,11 +305,8 @@ namespace edmtest {
   //
   class IntProducerFromTransient : public edm::global::EDProducer<> {
   public:
-    explicit IntProducerFromTransient(edm::ParameterSet const&):
-    putToken_{produces<IntProduct>()},
-    getToken_{consumes<TransientIntProduct>(edm::InputTag{"TransientThing"})}
-    {
-    }
+    explicit IntProducerFromTransient(edm::ParameterSet const&)
+        : putToken_{produces<IntProduct>()}, getToken_{consumes<TransientIntProduct>(edm::InputTag{"TransientThing"})} {}
     void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
 
   private:
@@ -359,12 +314,11 @@ namespace edmtest {
     const edm::EDGetTokenT<TransientIntProduct> getToken_;
   };
 
-  void
-  IntProducerFromTransient::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
+  void IntProducerFromTransient::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
     // EventSetup is not used.
     auto result = e.getHandle(getToken_);
     assert(result);
-    e.emplace(putToken_,result.product()->value);
+    e.emplace(putToken_, result.product()->value);
   }
 
   //--------------------------------------------------------------------
@@ -373,10 +327,8 @@ namespace edmtest {
   //
   class Int16_tProducer : public edm::global::EDProducer<> {
   public:
-    explicit Int16_tProducer(edm::ParameterSet const& p) :
-      token_{produces<Int16_tProduct>()},
-      value_(p.getParameter<int>("ivalue")) {
-    }
+    explicit Int16_tProducer(edm::ParameterSet const& p)
+        : token_{produces<Int16_tProduct>()}, value_(p.getParameter<int>("ivalue")) {}
     void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
 
   private:
@@ -384,10 +336,9 @@ namespace edmtest {
     const boost::int16_t value_;
   };
 
-  void
-  Int16_tProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
+  void Int16_tProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
     // EventSetup is not used.
-    e.emplace(token_,value_);
+    e.emplace(token_, value_);
   }
 
   //
@@ -396,16 +347,17 @@ namespace edmtest {
 
   class AddIntsProducer : public edm::global::EDProducer<> {
   public:
-    explicit AddIntsProducer(edm::ParameterSet const& p) :
-      putToken_{produces<IntProduct>()},
-      otherPutToken_{produces<IntProduct>("other")},
-      onlyGetOnEvent_(p.getUntrackedParameter<unsigned int>("onlyGetOnEvent", 0u)) {
-      auto const& labels = p.getParameter<std::vector<std::string> >("labels");
-      for( auto const& label: labels) {
+    explicit AddIntsProducer(edm::ParameterSet const& p)
+        : putToken_{produces<IntProduct>()},
+          otherPutToken_{produces<IntProduct>("other")},
+          onlyGetOnEvent_(p.getUntrackedParameter<unsigned int>("onlyGetOnEvent", 0u)) {
+      auto const& labels = p.getParameter<std::vector<std::string>>("labels");
+      for (auto const& label : labels) {
         tokens_.emplace_back(consumes<IntProduct>(edm::InputTag{label}));
       }
     }
     void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
+
   private:
     std::vector<edm::EDGetTokenT<IntProduct>> tokens_;
     const edm::EDPutTokenT<IntProduct> putToken_;
@@ -413,18 +365,17 @@ namespace edmtest {
     unsigned int onlyGetOnEvent_;
   };
 
-  void
-  AddIntsProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
+  void AddIntsProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
     // EventSetup is not used.
     int value = 0;
 
     if (onlyGetOnEvent_ == 0u || e.eventAuxiliary().event() == onlyGetOnEvent_) {
-      for(auto const& token: tokens_) {
+      for (auto const& token : tokens_) {
         value += e.get(token).value;
       }
     }
-    e.emplace(putToken_,value);
-    e.emplace(otherPutToken_,value);
+    e.emplace(putToken_, value);
+    e.emplace(otherPutToken_, value);
   }
 
   //
@@ -433,18 +384,20 @@ namespace edmtest {
 
   class ManyIntProducer : public edm::global::EDProducer<> {
   public:
-    explicit ManyIntProducer(edm::ParameterSet const& p):
-      tokenValues_{vector_transform(p.getParameter<std::vector<edm::ParameterSet>>("values"), [this](edm::ParameterSet const& pset) {
-          auto const& branchAlias = pset.getParameter<std::string>("branchAlias");
-          if(not branchAlias.empty()) {
-            return TokenValue{produces<IntProduct>(pset.getParameter<std::string>("instance")).setBranchAlias(branchAlias),
-                              pset.getParameter<int>("value")};
-          }
-          return TokenValue{produces<IntProduct>(pset.getParameter<std::string>("instance")),
-                            pset.getParameter<int>("value")};
-        })},
-      throw_{p.getUntrackedParameter<bool>("throw")}
-    {
+    explicit ManyIntProducer(edm::ParameterSet const& p)
+        : tokenValues_{vector_transform(
+              p.getParameter<std::vector<edm::ParameterSet>>("values"),
+              [this](edm::ParameterSet const& pset) {
+                auto const& branchAlias = pset.getParameter<std::string>("branchAlias");
+                if (not branchAlias.empty()) {
+                  return TokenValue{
+                      produces<IntProduct>(pset.getParameter<std::string>("instance")).setBranchAlias(branchAlias),
+                      pset.getParameter<int>("value")};
+                }
+                return TokenValue{produces<IntProduct>(pset.getParameter<std::string>("instance")),
+                                  pset.getParameter<int>("value")};
+              })},
+          throw_{p.getUntrackedParameter<bool>("throw")} {
       tokenValues_.push_back(TokenValue{produces<IntProduct>(), p.getParameter<int>("ivalue")});
     }
 
@@ -475,14 +428,13 @@ namespace edmtest {
     bool throw_;
   };
 
-  void
-  ManyIntProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
-    if(throw_) {
+  void ManyIntProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
+    if (throw_) {
       throw edm::Exception(edm::errors::NotFound) << "Intentional 'NotFound' exception for testing purposes\n";
     }
 
     // EventSetup is not used.
-    for(auto const tv: tokenValues_) {
+    for (auto const tv : tokenValues_) {
       e.emplace(tv.token, tv.value);
     }
   }
@@ -491,21 +443,23 @@ namespace edmtest {
   // Produces multiple IntProduct products based on other products
   //
 
-  class ManyIntWhenRegisteredProducer: public edm::global::EDProducer<> {
+  class ManyIntWhenRegisteredProducer : public edm::global::EDProducer<> {
   public:
-    explicit ManyIntWhenRegisteredProducer(edm::ParameterSet const& p):
-      sourceLabel_(p.getParameter<std::string>("src"))
-    {
+    explicit ManyIntWhenRegisteredProducer(edm::ParameterSet const& p)
+        : sourceLabel_(p.getParameter<std::string>("src")) {
       callWhenNewProductsRegistered([=](edm::BranchDescription const& iBranch) {
-          if(iBranch.moduleLabel() == sourceLabel_) {
-            if(iBranch.branchType() != edm::InEvent) {
-              throw edm::Exception(edm::errors::UnimplementedFeature) << "ManyIntWhenRegisteredProducer supports only event branches";
-            }
-
-            this->tokens_.push_back(Tokens{this->consumes<IntProduct>(edm::InputTag{iBranch.moduleLabel(), iBranch.productInstanceName(), iBranch.processName()}),
-                                           this->produces<IntProduct>(iBranch.productInstanceName())});
+        if (iBranch.moduleLabel() == sourceLabel_) {
+          if (iBranch.branchType() != edm::InEvent) {
+            throw edm::Exception(edm::errors::UnimplementedFeature)
+                << "ManyIntWhenRegisteredProducer supports only event branches";
           }
-        });
+
+          this->tokens_.push_back(
+              Tokens{this->consumes<IntProduct>(
+                         edm::InputTag{iBranch.moduleLabel(), iBranch.productInstanceName(), iBranch.processName()}),
+                     this->produces<IntProduct>(iBranch.productInstanceName())});
+        }
+      });
     }
 
     static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
@@ -526,30 +480,29 @@ namespace edmtest {
     std::vector<Tokens> tokens_;
   };
 
-  void
-  ManyIntWhenRegisteredProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
-    for(auto const& toks: tokens_) {
+  void ManyIntWhenRegisteredProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
+    for (auto const& toks : tokens_) {
       e.emplace(toks.put, e.get(toks.get));
     }
   };
 
-}
+}  // namespace edmtest
 
-using edmtest::FailingProducer;
-using edmtest::NonProducer;
-using edmtest::IntProducer;
-using edmtest::IntLegacyProducer;
-using edmtest::BusyWaitIntProducer;
-using edmtest::BusyWaitIntLimitedProducer;
+using edmtest::AddIntsProducer;
 using edmtest::BusyWaitIntLegacyProducer;
+using edmtest::BusyWaitIntLimitedProducer;
+using edmtest::BusyWaitIntProducer;
 using edmtest::ConsumingIntProducer;
 using edmtest::EventNumberIntProducer;
-using edmtest::TransientIntProducer;
-using edmtest::IntProducerFromTransient;
+using edmtest::FailingProducer;
 using edmtest::Int16_tProducer;
-using edmtest::AddIntsProducer;
+using edmtest::IntLegacyProducer;
+using edmtest::IntProducer;
+using edmtest::IntProducerFromTransient;
 using edmtest::ManyIntProducer;
 using edmtest::ManyIntWhenRegisteredProducer;
+using edmtest::NonProducer;
+using edmtest::TransientIntProducer;
 DEFINE_FWK_MODULE(FailingProducer);
 DEFINE_FWK_MODULE(edmtest::FailingInRunProducer);
 DEFINE_FWK_MODULE(NonProducer);
diff --git a/FWCore/Framework/test/stubs/ToyModules.cc b/FWCore/Framework/test/stubs/ToyModules.cc
index 4299492366937..2764bb733732b 100644
--- a/FWCore/Framework/test/stubs/ToyModules.cc
+++ b/FWCore/Framework/test/stubs/ToyModules.cc
@@ -35,15 +35,14 @@ namespace edmtest {
   //
   class SCSimpleProducer : public edm::stream::EDProducer<> {
   public:
-    explicit SCSimpleProducer(edm::ParameterSet const& p) :
-      size_(p.getParameter<int>("size")) {
+    explicit SCSimpleProducer(edm::ParameterSet const& p) : size_(p.getParameter<int>("size")) {
       produces<SCSimpleProduct>();
-      assert (size_ > 1);
+      assert(size_ > 1);
     }
 
     explicit SCSimpleProducer(int i) : size_(i) {
       produces<SCSimpleProduct>();
-      assert (size_ > 1);
+      assert(size_ > 1);
     }
 
     virtual ~SCSimpleProducer() {}
@@ -53,20 +52,18 @@ namespace edmtest {
     int size_;  // number of Simples to put in the collection
   };
 
-  void
-  SCSimpleProducer::produce(edm::Event& e,
-                            edm::EventSetup const& /* unused */) {
+  void SCSimpleProducer::produce(edm::Event& e, edm::EventSetup const& /* unused */) {
     // Fill up a collection so that it is sorted *backwards*.
     std::vector<Simple> guts(size_);
-    for(int i = 0; i < size_; ++i) {
-        guts[i].key = size_ - i;
-        guts[i].value = 1.5 * i;
+    for (int i = 0; i < size_; ++i) {
+      guts[i].key = size_ - i;
+      guts[i].value = 1.5 * i;
     }
 
     // Verify that the vector is not sorted -- in fact, it is sorted
     // backwards!
-    for(int i = 1; i < size_; ++i) {
-        assert(guts[i-1].id() > guts[i].id());
+    for (int i = 1; i < size_; ++i) {
+      assert(guts[i - 1].id() > guts[i].id());
     }
 
     // Put the product into the Event, thus sorting it.
@@ -79,17 +76,16 @@ namespace edmtest {
   //
   class OVSimpleProducer : public edm::stream::EDProducer<> {
   public:
-    explicit OVSimpleProducer(edm::ParameterSet const& p) :
-        size_(p.getParameter<int>("size")) {
+    explicit OVSimpleProducer(edm::ParameterSet const& p) : size_(p.getParameter<int>("size")) {
       produces<OVSimpleProduct>();
       produces<OVSimpleDerivedProduct>("derived");
-      assert (size_ > 1);
+      assert(size_ > 1);
     }
 
     explicit OVSimpleProducer(int i) : size_(i) {
       produces<OVSimpleProduct>();
       produces<OVSimpleDerivedProduct>("derived");
-      assert (size_ > 1);
+      assert(size_ > 1);
     }
 
     virtual ~OVSimpleProducer() {}
@@ -99,17 +95,15 @@ namespace edmtest {
     int size_;  // number of Simples to put in the collection
   };
 
-  void
-  OVSimpleProducer::produce(edm::Event& e,
-                            edm::EventSetup const& /* unused */) {
+  void OVSimpleProducer::produce(edm::Event& e, edm::EventSetup const& /* unused */) {
     // Fill up a collection
     auto p = std::make_unique<OVSimpleProduct>();
 
-    for(int i = 0; i < size_; ++i) {
-        auto simple = std::make_unique<Simple>();
-        simple->key = size_ - i;
-        simple->value = 1.5 * i;
-        p->push_back(std::move(simple));
+    for (int i = 0; i < size_; ++i) {
+      auto simple = std::make_unique<Simple>();
+      simple->key = size_ - i;
+      simple->value = 1.5 * i;
+      p->push_back(std::move(simple));
     }
 
     // Put the product into the Event
@@ -118,12 +112,12 @@ namespace edmtest {
     // Fill up a collection of SimpleDerived objects
     auto pd = std::make_unique<OVSimpleDerivedProduct>();
 
-    for(int i = 0; i < size_; ++i) {
-        auto simpleDerived = std::make_unique<SimpleDerived>();
-        simpleDerived->key = size_ - i;
-        simpleDerived->value = 1.5 * i + 100.0;
-        simpleDerived->dummy = 0.0;
-        pd->push_back(std::move(simpleDerived));
+    for (int i = 0; i < size_; ++i) {
+      auto simpleDerived = std::make_unique<SimpleDerived>();
+      simpleDerived->key = size_ - i;
+      simpleDerived->value = 1.5 * i + 100.0;
+      simpleDerived->dummy = 0.0;
+      pd->push_back(std::move(simpleDerived));
     }
 
     // Put the product into the Event
@@ -136,15 +130,14 @@ namespace edmtest {
   //
   class VSimpleProducer : public edm::stream::EDProducer<> {
   public:
-    explicit VSimpleProducer(edm::ParameterSet const& p) :
-        size_(p.getParameter<int>("size")) {
+    explicit VSimpleProducer(edm::ParameterSet const& p) : size_(p.getParameter<int>("size")) {
       produces<VSimpleProduct>();
-      assert (size_ > 1);
+      assert(size_ > 1);
     }
 
     explicit VSimpleProducer(int i) : size_(i) {
       produces<VSimpleProduct>();
-      assert (size_ > 1);
+      assert(size_ > 1);
     }
 
     virtual ~VSimpleProducer() {}
@@ -154,17 +147,15 @@ namespace edmtest {
     int size_;  // number of Simples to put in the collection
   };
 
-  void
-  VSimpleProducer::produce(edm::Event& e,
-                           edm::EventSetup const& /* unused */) {
+  void VSimpleProducer::produce(edm::Event& e, edm::EventSetup const& /* unused */) {
     // Fill up a collection
     auto p = std::make_unique<VSimpleProduct>();
 
-    for(int i = 0; i < size_; ++i) {
-        Simple simple;
-        simple.key = size_ - i;
-        simple.value = 1.5 * i + e.id().event();
-        p->push_back(simple);
+    for (int i = 0; i < size_; ++i) {
+      Simple simple;
+      simple.key = size_ - i;
+      simple.value = 1.5 * i + e.id().event();
+      p->push_back(simple);
     }
 
     // Put the product into the Event
@@ -178,9 +169,7 @@ namespace edmtest {
   //
   class AVSimpleProducer : public edm::stream::EDProducer<> {
   public:
-
-    explicit AVSimpleProducer(edm::ParameterSet const& p) :
-    src_(p.getParameter<edm::InputTag>("src")) {
+    explicit AVSimpleProducer(edm::ParameterSet const& p) : src_(p.getParameter<edm::InputTag>("src")) {
       produces<AVSimpleProduct>();
       consumes<std::vector<edmtest::Simple>>(src_);
     }
@@ -191,19 +180,17 @@ namespace edmtest {
     edm::InputTag src_;
   };
 
-  void
-  AVSimpleProducer::produce(edm::Event& e,
-                            edm::EventSetup const& /* unused */) {
-    edm::Handle<std::vector<edmtest::Simple> > vs;
+  void AVSimpleProducer::produce(edm::Event& e, edm::EventSetup const& /* unused */) {
+    edm::Handle<std::vector<edmtest::Simple>> vs;
     e.getByLabel(src_, vs);
     // Fill up a collection
     auto p = std::make_unique<AVSimpleProduct>(edm::RefProd<std::vector<edmtest::Simple>>(vs));
 
-    for(unsigned int i = 0; i < vs->size(); ++i) {
-        edmtest::Simple simple;
-        simple.key = 100 + i;  // just some arbitrary number for testing
-        simple.value = .1 * e.id().event();
-        p->setValue(i, simple);
+    for (unsigned int i = 0; i < vs->size(); ++i) {
+      edmtest::Simple simple;
+      simple.key = 100 + i;  // just some arbitrary number for testing
+      simple.value = .1 * e.id().event();
+      p->setValue(i, simple);
     }
 
     // Put the product into the Event
@@ -218,9 +205,7 @@ namespace edmtest {
   //
   class DSVProducer : public edm::stream::EDProducer<> {
   public:
-
-    explicit DSVProducer(edm::ParameterSet const& p) :
-        size_(p.getParameter<int>("size")) {
+    explicit DSVProducer(edm::ParameterSet const& p) : size_(p.getParameter<int>("size")) {
       produces<DSVSimpleProduct>();
       produces<DSVWeirdProduct>();
       assert(size_ > 1);
@@ -237,41 +222,40 @@ namespace edmtest {
     virtual void produce(edm::Event& e, edm::EventSetup const&) override;
 
   private:
-    template<typename PROD> void make_a_product(edm::Event& e);
+    template <typename PROD>
+    void make_a_product(edm::Event& e);
     int size_;
   };
 
-  void
-  DSVProducer::produce(edm::Event& e, edm::EventSetup const& /* unused */) {
+  void DSVProducer::produce(edm::Event& e, edm::EventSetup const& /* unused */) {
     this->make_a_product<DSVSimpleProduct>(e);
     this->make_a_product<DSVWeirdProduct>(e);
   }
 
-  template<typename PROD>
-  void
-  DSVProducer::make_a_product(edm::Event& e) {
-    typedef PROD                              product_type;
+  template <typename PROD>
+  void DSVProducer::make_a_product(edm::Event& e) {
+    typedef PROD product_type;
     typedef typename product_type::value_type detset;
-    typedef typename detset::value_type       value_type;
+    typedef typename detset::value_type value_type;
 
     // Fill up a collection so that it is sorted *backwards*.
     std::vector<value_type> guts(size_);
-    for(int i = 0; i < size_; ++i) {
+    for (int i = 0; i < size_; ++i) {
       guts[i].data = size_ - i;
     }
 
     // Verify that the vector is not sorted -- in fact, it is sorted
     // backwards!
-    for(int i = 1; i < size_; ++i) {
-      assert(guts[i-1].data > guts[i].data);
+    for (int i = 1; i < size_; ++i) {
+      assert(guts[i - 1].data > guts[i].data);
     }
 
     auto p = std::make_unique<product_type>();
     int n = 0;
-    for(int id = 1; id<size_; ++id) {
+    for (int id = 1; id < size_; ++id) {
       ++n;
-      detset item(id); // this will get DetID id
-      item.data.insert(item.data.end(), guts.begin(), guts.begin()+n);
+      detset item(id);  // this will get DetID id
+      item.data.insert(item.data.end(), guts.begin(), guts.begin() + n);
       p->insert(item);
     }
 
@@ -288,9 +272,7 @@ namespace edmtest {
   //
   class DSTVProducer : public edm::stream::EDProducer<> {
   public:
-
-    explicit DSTVProducer(edm::ParameterSet const& p) :
-        size_(p.getParameter<int>("size")) {
+    explicit DSTVProducer(edm::ParameterSet const& p) : size_(p.getParameter<int>("size")) {
       produces<DSTVSimpleProduct>();
       produces<DSTVSimpleDerivedProduct>();
       assert(size_ > 1);
@@ -307,47 +289,42 @@ namespace edmtest {
     virtual void produce(edm::Event& e, edm::EventSetup const&) override;
 
   private:
-    template<typename PROD> void make_a_product(edm::Event& e);
+    template <typename PROD>
+    void make_a_product(edm::Event& e);
     void fill_a_data(DSTVSimpleProduct::data_type& d, unsigned int i);
     void fill_a_data(DSTVSimpleDerivedProduct::data_type& d, unsigned int i);
 
     int size_;
   };
 
-  void
-  DSTVProducer::produce(edm::Event& e, edm::EventSetup const& /* unused */) {
+  void DSTVProducer::produce(edm::Event& e, edm::EventSetup const& /* unused */) {
     this->make_a_product<DSTVSimpleProduct>(e);
     this->make_a_product<DSTVSimpleDerivedProduct>(e);
   }
 
-  void
-  DSTVProducer::fill_a_data(DSTVSimpleDerivedProduct::data_type& d, unsigned int i) {
+  void DSTVProducer::fill_a_data(DSTVSimpleDerivedProduct::data_type& d, unsigned int i) {
     d.key = size_ - i;
     d.value = 1.5 * i;
   }
 
-  void
-  DSTVProducer::fill_a_data(DSTVSimpleProduct::data_type& d, unsigned int i) {
-    d.data = size_ - i;
-  }
+  void DSTVProducer::fill_a_data(DSTVSimpleProduct::data_type& d, unsigned int i) { d.data = size_ - i; }
 
-  template<typename PROD>
-  void
-  DSTVProducer::make_a_product(edm::Event& e) {
-    typedef PROD                     product_type;
+  template <typename PROD>
+  void DSTVProducer::make_a_product(edm::Event& e) {
+    typedef PROD product_type;
     //FIXME
     typedef typename product_type::FastFiller detset;
-    typedef typename detset::id_type       id_type;
+    typedef typename detset::id_type id_type;
 
     auto p = std::make_unique<product_type>();
     product_type& v = *p;
 
     unsigned int n = 0;
-    for(id_type id = 1; id<static_cast<id_type>(size_) ;++id) {
+    for (id_type id = 1; id < static_cast<id_type>(size_); ++id) {
       ++n;
-      detset item(v, id); // this will get DetID id
+      detset item(v, id);  // this will get DetID id
       item.resize(n);
-      for(unsigned int i = 0; i < n; ++i)
+      for (unsigned int i = 0; i < n; ++i)
         fill_a_data(item[i], i);
     }
 
@@ -362,8 +339,7 @@ namespace edmtest {
   //
   class ProdigalProducer : public edm::stream::EDProducer<> {
   public:
-    explicit ProdigalProducer(edm::ParameterSet const& p) :
-      label_(p.getParameter<std::string>("label")) {
+    explicit ProdigalProducer(edm::ParameterSet const& p) : label_(p.getParameter<std::string>("label")) {
       produces<Prodigal>();
       consumes<IntProduct>(edm::InputTag{label_});
     }
@@ -374,8 +350,7 @@ namespace edmtest {
     std::string label_;
   };
 
-  void
-  ProdigalProducer::produce(edm::Event& e, edm::EventSetup const&) {
+  void ProdigalProducer::produce(edm::Event& e, edm::EventSetup const&) {
     // EventSetup is not used.
 
     // The purpose of Prodigal is testing of *not* keeping
@@ -386,15 +361,15 @@ namespace edmtest {
     e.put(std::make_unique<Prodigal>(parent->value));
   }
 
-}
+}  // namespace edmtest
 
-using edmtest::SCSimpleProducer;
-using edmtest::OVSimpleProducer;
-using edmtest::VSimpleProducer;
 using edmtest::AVSimpleProducer;
 using edmtest::DSTVProducer;
 using edmtest::DSVProducer;
+using edmtest::OVSimpleProducer;
 using edmtest::ProdigalProducer;
+using edmtest::SCSimpleProducer;
+using edmtest::VSimpleProducer;
 DEFINE_FWK_MODULE(SCSimpleProducer);
 DEFINE_FWK_MODULE(OVSimpleProducer);
 DEFINE_FWK_MODULE(VSimpleProducer);
@@ -402,4 +377,3 @@ DEFINE_FWK_MODULE(AVSimpleProducer);
 DEFINE_FWK_MODULE(DSVProducer);
 DEFINE_FWK_MODULE(DSTVProducer);
 DEFINE_FWK_MODULE(ProdigalProducer);
-
diff --git a/FWCore/Framework/test/stubs/ToyRefProducers.cc b/FWCore/Framework/test/stubs/ToyRefProducers.cc
index 2e1d17263e040..ac2b7408efa01 100644
--- a/FWCore/Framework/test/stubs/ToyRefProducers.cc
+++ b/FWCore/Framework/test/stubs/ToyRefProducers.cc
@@ -31,19 +31,18 @@ namespace edmtest {
   //
   //--------------------------------------------------------------------
 
-
   //--------------------------------------------------------------------
   //
   // Produces an edm::RefVector<std::vector<int> > instance.
   // This requires that an instance of IntVectorProducer be run *before*
   // this producer.
   class IntVecRefVectorProducer : public edm::global::EDProducer<> {
-    typedef edm::RefVector<std::vector<int> > product_type;
+    typedef edm::RefVector<std::vector<int>> product_type;
 
   public:
-    explicit IntVecRefVectorProducer(edm::ParameterSet const& p) :
-        target_{consumes<std::vector<int>>(p.getParameter<edm::InputTag>("target"))},
-        select_(p.getParameter<int>("select")) {
+    explicit IntVecRefVectorProducer(edm::ParameterSet const& p)
+        : target_{consumes<std::vector<int>>(p.getParameter<edm::InputTag>("target"))},
+          select_(p.getParameter<int>("select")) {
       produces<product_type>();
     }
     virtual void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
@@ -60,18 +59,18 @@ namespace edmtest {
     int select_;
   };
 
-  void
-  IntVecRefVectorProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
+  void IntVecRefVectorProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
     // EventSetup is not used.
     // Get our input:
-    edm::Handle<std::vector<int> > input = e.getHandle(target_);
+    edm::Handle<std::vector<int>> input = e.getHandle(target_);
     assert(input.isValid());
 
     auto prod = std::make_unique<product_type>();
 
     typedef product_type::value_type ref;
-    for(size_t i = 0, sz = input->size(); i != sz; ++i) {
-      if(select_ != 0 && (i % select_) == 0) continue;
+    for (size_t i = 0, sz = input->size(); i != sz; ++i) {
+      if (select_ != 0 && (i % select_) == 0)
+        continue;
       prod->push_back(ref(input, i));
     }
 
@@ -87,8 +86,8 @@ namespace edmtest {
     typedef edm::RefToBaseVector<int> product_type;
 
   public:
-    explicit IntVecRefToBaseVectorProducer(edm::ParameterSet const& p) :
-      target_{consumes<edm::View<int>>(p.getParameter<edm::InputTag>("target"))} {
+    explicit IntVecRefToBaseVectorProducer(edm::ParameterSet const& p)
+        : target_{consumes<edm::View<int>>(p.getParameter<edm::InputTag>("target"))} {
       produces<product_type>();
     }
     virtual void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
@@ -97,11 +96,10 @@ namespace edmtest {
     const edm::EDGetTokenT<edm::View<int>> target_;
   };
 
-  void
-  IntVecRefToBaseVectorProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
+  void IntVecRefToBaseVectorProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
     // EventSetup is not used.
     // Get our input:
-    edm::Handle<edm::View<int> > input = e.getHandle(target_);
+    edm::Handle<edm::View<int>> input = e.getHandle(target_);
     assert(input.isValid());
 
     edm::RefToBaseVector<int> refVector;
@@ -121,8 +119,8 @@ namespace edmtest {
     typedef edm::PtrVector<int> product_type;
 
   public:
-    explicit IntVecPtrVectorProducer(edm::ParameterSet const& p) :
-    target_{consumes<edm::View<int>>(p.getParameter<edm::InputTag>("target"))} {
+    explicit IntVecPtrVectorProducer(edm::ParameterSet const& p)
+        : target_{consumes<edm::View<int>>(p.getParameter<edm::InputTag>("target"))} {
       produces<product_type>();
     }
     virtual void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
@@ -131,17 +129,16 @@ namespace edmtest {
     const edm::EDGetTokenT<edm::View<int>> target_;
   };
 
-  void
-  IntVecPtrVectorProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
+  void IntVecPtrVectorProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
     // EventSetup is not used.
     // Get our input:
-    edm::Handle<edm::View<int> > input = e.getHandle(target_);
+    edm::Handle<edm::View<int>> input = e.getHandle(target_);
     assert(input.isValid());
 
     auto prod = std::make_unique<product_type>();
 
     typedef product_type::value_type ref;
-    for(size_t i = 0, sz = input->size(); i != sz; ++i)
+    for (size_t i = 0, sz = input->size(); i != sz; ++i)
       prod->push_back(ref(input, i));
 
     e.put(std::move(prod));
@@ -156,8 +153,8 @@ namespace edmtest {
     typedef std::vector<edm::Ptr<int>> product_type;
 
   public:
-    explicit IntVecStdVectorPtrProducer(edm::ParameterSet const& p) :
-    target_(consumes<edm::View<int>>(p.getParameter<edm::InputTag>("target"))) {
+    explicit IntVecStdVectorPtrProducer(edm::ParameterSet const& p)
+        : target_(consumes<edm::View<int>>(p.getParameter<edm::InputTag>("target"))) {
       produces<product_type>();
     }
     virtual void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
@@ -166,30 +163,28 @@ namespace edmtest {
     const edm::EDGetTokenT<edm::View<int>> target_;
   };
 
-  void
-  IntVecStdVectorPtrProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const  {
+  void IntVecStdVectorPtrProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
     // EventSetup is not used.
     // Get our input:
-    edm::Handle<edm::View<int> > input = e.getHandle(target_);
+    edm::Handle<edm::View<int>> input = e.getHandle(target_);
     assert(input.isValid());
 
     auto prod = std::make_unique<product_type>();
 
     typedef product_type::value_type ref;
-    for(size_t i = 0, sz = input->size(); i != sz; ++i)
+    for (size_t i = 0, sz = input->size(); i != sz; ++i)
       prod->emplace_back(input, i);
 
     e.put(std::move(prod));
   }
 
-}
+}  // namespace edmtest
 
-using edmtest::IntVecRefVectorProducer;
-using edmtest::IntVecRefToBaseVectorProducer;
 using edmtest::IntVecPtrVectorProducer;
+using edmtest::IntVecRefToBaseVectorProducer;
+using edmtest::IntVecRefVectorProducer;
 using edmtest::IntVecStdVectorPtrProducer;
 DEFINE_FWK_MODULE(IntVecRefVectorProducer);
 DEFINE_FWK_MODULE(IntVecRefToBaseVectorProducer);
 DEFINE_FWK_MODULE(IntVecPtrVectorProducer);
 DEFINE_FWK_MODULE(IntVecStdVectorPtrProducer);
-
diff --git a/FWCore/Framework/test/stubs/ToySTLProducers.cc b/FWCore/Framework/test/stubs/ToySTLProducers.cc
index 415bb48a8920e..2254605c4ab6a 100644
--- a/FWCore/Framework/test/stubs/ToySTLProducers.cc
+++ b/FWCore/Framework/test/stubs/ToySTLProducers.cc
@@ -31,11 +31,11 @@ namespace edmtest {
   //
   class IntVectorProducer : public edm::EDProducer {
   public:
-    explicit IntVectorProducer(edm::ParameterSet const& p) :
-      value_(p.getParameter<int>("ivalue")),
-      count_(p.getParameter<int>("count")),
-      delta_(p.getParameter<int>("delta")) {
-      produces<std::vector<int> >();
+    explicit IntVectorProducer(edm::ParameterSet const& p)
+        : value_(p.getParameter<int>("ivalue")),
+          count_(p.getParameter<int>("count")),
+          delta_(p.getParameter<int>("delta")) {
+      produces<std::vector<int>>();
     }
     virtual ~IntVectorProducer() {}
     virtual void produce(edm::Event& e, edm::EventSetup const& c);
@@ -47,18 +47,18 @@ namespace edmtest {
       desc.add<int>("delta", 0);
       descriptions.addDefault(desc);
     }
+
   private:
-    int    value_;
+    int value_;
     size_t count_;
     int delta_;
   };
 
-  void
-  IntVectorProducer::produce(edm::Event& e, edm::EventSetup const&) {
+  void IntVectorProducer::produce(edm::Event& e, edm::EventSetup const&) {
     // EventSetup is not used.
     auto p = std::make_unique<std::vector<int>>(count_, value_);
-    if(delta_ != 0) {
-      for(unsigned int i = 0; i < p->size(); ++i) {
+    if (delta_ != 0) {
+      for (unsigned int i = 0; i < p->size(); ++i) {
         p->at(i) = value_ + i * delta_;
       }
     }
@@ -73,15 +73,14 @@ namespace edmtest {
   class IntVectorSetProducer : public edm::EDProducer {
   public:
     explicit IntVectorSetProducer(edm::ParameterSet const& p) {
-      produces<std::vector<int> >();
-      produces<std::set<int> >();
+      produces<std::vector<int>>();
+      produces<std::set<int>>();
     }
     virtual ~IntVectorSetProducer() {}
     virtual void produce(edm::Event& e, edm::EventSetup const& c);
   };
 
-  void
-  IntVectorSetProducer::produce(edm::Event& e, edm::EventSetup const&) {
+  void IntVectorSetProducer::produce(edm::Event& e, edm::EventSetup const&) {
     // EventSetup is not used.
     e.put(std::make_unique<std::vector<int>>(1, 11));
 
@@ -94,20 +93,19 @@ namespace edmtest {
   //
   class IntListProducer : public edm::EDProducer {
   public:
-    explicit IntListProducer(edm::ParameterSet const& p) :
-        value_(p.getParameter<int>("ivalue")),
-        count_(p.getParameter<int>("count")) {
-      produces<std::list<int> >();
+    explicit IntListProducer(edm::ParameterSet const& p)
+        : value_(p.getParameter<int>("ivalue")), count_(p.getParameter<int>("count")) {
+      produces<std::list<int>>();
     }
     virtual ~IntListProducer() {}
     virtual void produce(edm::Event& e, edm::EventSetup const& c);
+
   private:
-    int    value_;
+    int value_;
     size_t count_;
   };
 
-  void
-  IntListProducer::produce(edm::Event& e, edm::EventSetup const&) {
+  void IntListProducer::produce(edm::Event& e, edm::EventSetup const&) {
     // EventSetup is not used.
     e.put(std::make_unique<std::list<int>>(count_, value_));
   }
@@ -118,20 +116,19 @@ namespace edmtest {
   //
   class IntDequeProducer : public edm::EDProducer {
   public:
-    explicit IntDequeProducer(edm::ParameterSet const& p) :
-        value_(p.getParameter<int>("ivalue")),
-        count_(p.getParameter<int>("count")) {
-      produces<std::deque<int> >();
+    explicit IntDequeProducer(edm::ParameterSet const& p)
+        : value_(p.getParameter<int>("ivalue")), count_(p.getParameter<int>("count")) {
+      produces<std::deque<int>>();
     }
     virtual ~IntDequeProducer() {}
     virtual void produce(edm::Event& e, edm::EventSetup const& c);
+
   private:
-    int    value_;
+    int value_;
     size_t count_;
   };
 
-  void
-  IntDequeProducer::produce(edm::Event& e, edm::EventSetup const&) {
+  void IntDequeProducer::produce(edm::Event& e, edm::EventSetup const&) {
     // EventSetup is not used.
     e.put(std::make_unique<std::deque<int>>(count_, value_));
   }
@@ -142,36 +139,35 @@ namespace edmtest {
   //
   class IntSetProducer : public edm::EDProducer {
   public:
-    explicit IntSetProducer(edm::ParameterSet const& p) :
-        start_(p.getParameter<int>("start")),
-        stop_(p.getParameter<int>("stop")) {
-      produces<std::set<int> >();
+    explicit IntSetProducer(edm::ParameterSet const& p)
+        : start_(p.getParameter<int>("start")), stop_(p.getParameter<int>("stop")) {
+      produces<std::set<int>>();
     }
     virtual ~IntSetProducer() {}
     virtual void produce(edm::Event& e, edm::EventSetup const& c);
+
   private:
     int start_;
     int stop_;
   };
 
-  void
-  IntSetProducer::produce(edm::Event& e, edm::EventSetup const&) {
+  void IntSetProducer::produce(edm::Event& e, edm::EventSetup const&) {
     // EventSetup is not used.
     auto p = std::make_unique<std::set<int>>();
-    for(int i = start_; i < stop_; ++i) p->insert(i);
+    for (int i = start_; i < stop_; ++i)
+      p->insert(i);
     e.put(std::move(p));
   }
 
-}
+}  // namespace edmtest
 
-using edmtest::IntVectorProducer;
-using edmtest::IntVectorSetProducer;
-using edmtest::IntListProducer;
 using edmtest::IntDequeProducer;
+using edmtest::IntListProducer;
 using edmtest::IntSetProducer;
+using edmtest::IntVectorProducer;
+using edmtest::IntVectorSetProducer;
 DEFINE_FWK_MODULE(IntVectorProducer);
 DEFINE_FWK_MODULE(IntVectorSetProducer);
 DEFINE_FWK_MODULE(IntListProducer);
 DEFINE_FWK_MODULE(IntDequeProducer);
 DEFINE_FWK_MODULE(IntSetProducer);
-
diff --git a/FWCore/Framework/test/test_catch2notTP_ESRecordsToProxyIndices.cc b/FWCore/Framework/test/test_catch2notTP_ESRecordsToProxyIndices.cc
new file mode 100644
index 0000000000000..8c64f076f25bf
--- /dev/null
+++ b/FWCore/Framework/test/test_catch2notTP_ESRecordsToProxyIndices.cc
@@ -0,0 +1,82 @@
+#include "catch.hpp"
+
+#include "FWCore/Framework/interface/ESRecordsToProxyIndices.h"
+#include "FWCore/Framework/interface/ComponentDescription.h"
+
+#include <memory>
+#include <string>
+#include <vector>
+
+namespace {
+  struct Data1 {};
+  struct Data2 {};
+  struct Data3 {};
+  struct Rcd1 {};
+  struct Rcd2 {};
+  struct Rcd3 {};
+  struct MissingRcd {};
+}  // namespace
+
+TYPELOOKUP_DATA_REG(Rcd1);
+TYPELOOKUP_DATA_REG(Rcd2);
+TYPELOOKUP_DATA_REG(Rcd3);
+TYPELOOKUP_DATA_REG(MissingRcd);
+
+TYPELOOKUP_DATA_REG(Data1);
+TYPELOOKUP_DATA_REG(Data2);
+TYPELOOKUP_DATA_REG(Data3);
+
+using namespace edm::eventsetup;
+TEST_CASE("test ESRecordsToProxyIndices", "[ESRecordsToProxyIndices]") {
+  DataKey const data1Key{DataKey::makeTypeTag<Data1>(), ""};
+  DataKey const data2Key{DataKey::makeTypeTag<Data2>(), ""};
+  DataKey const data3Key{DataKey::makeTypeTag<Data3>(), ""};
+  auto const rcd1Key = EventSetupRecordKey::makeKey<Rcd1>();
+  auto const rcd2Key = EventSetupRecordKey::makeKey<Rcd2>();
+  auto const rcd3Key = EventSetupRecordKey::makeKey<Rcd3>();
+  auto const missingRcdKey = EventSetupRecordKey::makeKey<MissingRcd>();
+
+  auto constexpr kMissingKey = ESRecordsToProxyIndices::missingProxyIndex();
+
+  SECTION("test empty") {
+    ESRecordsToProxyIndices empty{{}};
+
+    REQUIRE(kMissingKey == empty.indexInRecord(rcd1Key, data1Key));
+    REQUIRE(nullptr == empty.component(rcd1Key, data1Key));
+  }
+
+  SECTION(" test full") {
+    std::vector<EventSetupRecordKey> records = {rcd1Key, rcd2Key, rcd3Key};
+    std::sort(records.begin(), records.end());
+    ESRecordsToProxyIndices r2pi{records};
+
+    std::vector<DataKey> dataKeys = {data1Key, data2Key, data3Key};
+    std::sort(dataKeys.begin(), dataKeys.end());
+    //Now fill
+    ComponentDescription const* const p = reinterpret_cast<ComponentDescription const*>(0);
+    std::vector<
+        std::pair<EventSetupRecordKey, std::pair<std::vector<DataKey>, std::vector<ComponentDescription const*> > > >
+        orderedOfKeys = {{records[0], {{dataKeys[0], dataKeys[1], dataKeys[2]}, {p + 1, p + 2, p + 3}}},
+                         {records[1], {{}, {}}},
+                         {records[2], {{dataKeys[1]}, {p + 4}}}};
+
+    unsigned int index = 0;
+    for (auto const& pr : orderedOfKeys) {
+      REQUIRE(index + 1 == r2pi.dataKeysInRecord(index, pr.first, pr.second.first, pr.second.second));
+      ++index;
+    }
+    for (auto const& pr : orderedOfKeys) {
+      index = 0;
+      auto it = pr.second.second.begin();
+      for (auto const& dk : pr.second.first) {
+        REQUIRE(index == r2pi.indexInRecord(pr.first, dk).value());
+        REQUIRE(*it == r2pi.component(pr.first, dk));
+        ++index;
+        ++it;
+      }
+    }
+    REQUIRE(kMissingKey == r2pi.indexInRecord(missingRcdKey, dataKeys[0]));
+    REQUIRE(kMissingKey == r2pi.indexInRecord(records[1], dataKeys[0]));
+    REQUIRE(kMissingKey == r2pi.indexInRecord(records[2], dataKeys[0]));
+  }
+}
diff --git a/FWCore/Framework/test/test_catch2notTP_MergeableRunProductMetadata.cc b/FWCore/Framework/test/test_catch2notTP_MergeableRunProductMetadata.cc
index 1fe544744d575..64c06068530f7 100644
--- a/FWCore/Framework/test/test_catch2notTP_MergeableRunProductMetadata.cc
+++ b/FWCore/Framework/test/test_catch2notTP_MergeableRunProductMetadata.cc
@@ -23,9 +23,7 @@
 #include <vector>
 
 TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
-
   SECTION("test nested class MetadataForProcess") {
-
     edm::MergeableRunProductMetadata::MetadataForProcess metaDataForProcess;
     REQUIRE(metaDataForProcess.lumis().empty());
     REQUIRE(metaDataForProcess.valid());
@@ -66,101 +64,100 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
   }
 
   SECTION("test main functions") {
-
     edm::ProductRegistry productRegistry;
     edm::ParameterSet dummyPset;
     dummyPset.registerIt();
 
     // not mergeable
     edm::BranchDescription prod1(edm::InRun,
-                                "label",
-                                "PROD",
-                                "edmtest::Thing",
-                                "edmtestThing",
-                                "instance",
-                                "aModule",
-                                dummyPset.id(),
-                                edm::TypeWithDict::byName("edmtest::Thing"),
-                                false);
+                                 "label",
+                                 "PROD",
+                                 "edmtest::Thing",
+                                 "edmtestThing",
+                                 "instance",
+                                 "aModule",
+                                 dummyPset.id(),
+                                 edm::TypeWithDict::byName("edmtest::Thing"),
+                                 false);
     productRegistry.copyProduct(prod1);
 
     // This one should be used
     edm::BranchDescription prod2(edm::InRun,
-                                "aLabel",
-                                "APROD",
-                                "edmtest::ThingWithMerge",
-                                "edmtestThingWithMerge",
-                                "instance",
-                                "aModule",
-                                dummyPset.id(),
-                                edm::TypeWithDict::byName("edmtest::ThingWithMerge"),
-                                false);
+                                 "aLabel",
+                                 "APROD",
+                                 "edmtest::ThingWithMerge",
+                                 "edmtestThingWithMerge",
+                                 "instance",
+                                 "aModule",
+                                 dummyPset.id(),
+                                 edm::TypeWithDict::byName("edmtest::ThingWithMerge"),
+                                 false);
     productRegistry.copyProduct(prod2);
 
     //not in a Run
     edm::BranchDescription prod3(edm::InLumi,
-                                "bLabel",
-                                "BPROD",
-                                "edmtest::ThingWithMerge",
-                                "edmtestThingWithMerge",
-                                "instance",
-                                "aModule",
-                                dummyPset.id(),
-                                edm::TypeWithDict::byName("edmtest::ThingWithMerge"),
-                                false);
+                                 "bLabel",
+                                 "BPROD",
+                                 "edmtest::ThingWithMerge",
+                                 "edmtestThingWithMerge",
+                                 "instance",
+                                 "aModule",
+                                 dummyPset.id(),
+                                 edm::TypeWithDict::byName("edmtest::ThingWithMerge"),
+                                 false);
     productRegistry.copyProduct(prod3);
 
     // produced
     edm::BranchDescription prod4(edm::InRun,
-                                "cLabel",
-                                "CPROD",
-                                "edmtest::ThingWithMerge",
-                                "edmtestThingWithMerge",
-                                "instance",
-                                "aModule",
-                                dummyPset.id(),
-                                edm::TypeWithDict::byName("edmtest::ThingWithMerge"),
-                                true);
+                                 "cLabel",
+                                 "CPROD",
+                                 "edmtest::ThingWithMerge",
+                                 "edmtestThingWithMerge",
+                                 "instance",
+                                 "aModule",
+                                 dummyPset.id(),
+                                 edm::TypeWithDict::byName("edmtest::ThingWithMerge"),
+                                 true);
     productRegistry.addProduct(prod4);
 
     // dropped
     edm::BranchDescription prod5(edm::InRun,
-                                "dLabel",
-                                "DPROD",
-                                "edmtest::ThingWithMerge",
-                                "edmtestThingWithMerge",
-                                "instance",
-                                "aModule",
-                                dummyPset.id(),
-                                edm::TypeWithDict::byName("edmtest::ThingWithMerge"),
-                                false);
+                                 "dLabel",
+                                 "DPROD",
+                                 "edmtest::ThingWithMerge",
+                                 "edmtestThingWithMerge",
+                                 "instance",
+                                 "aModule",
+                                 dummyPset.id(),
+                                 edm::TypeWithDict::byName("edmtest::ThingWithMerge"),
+                                 false);
     prod5.setDropped(true);
     productRegistry.copyProduct(prod5);
 
     // Should be used but the same process name
     edm::BranchDescription prod6(edm::InRun,
-                                "eLabel",
-                                "APROD",
-                                "edmtest::ThingWithMerge",
-                                "edmtestThingWithMerge",
-                                "instance",
-                                "aModule",
-                                dummyPset.id(),
-                                edm::TypeWithDict::byName("edmtest::ThingWithMerge"),
-                                false);
+                                 "eLabel",
+                                 "APROD",
+                                 "edmtest::ThingWithMerge",
+                                 "edmtestThingWithMerge",
+                                 "instance",
+                                 "aModule",
+                                 dummyPset.id(),
+                                 edm::TypeWithDict::byName("edmtest::ThingWithMerge"),
+                                 false);
     productRegistry.copyProduct(prod6);
 
     // Should be used
     edm::BranchDescription prod7(edm::InRun,
-                                "fLabel",
-                                "AAPROD",
-                                "edmtest::ThingWithMerge",
-                                "edmtestThingWithMerge",
-                                "instance",
-                                "aModule",
-                                dummyPset.id(),
-                                edm::TypeWithDict::byName("edmtest::ThingWithMerge"),
-                                false);
+                                 "fLabel",
+                                 "AAPROD",
+                                 "edmtest::ThingWithMerge",
+                                 "edmtestThingWithMerge",
+                                 "instance",
+                                 "aModule",
+                                 dummyPset.id(),
+                                 edm::TypeWithDict::byName("edmtest::ThingWithMerge"),
+                                 false);
     productRegistry.copyProduct(prod7);
 
     edm::MergeableRunProductProcesses mergeableRunProductProcesses;
@@ -171,31 +168,27 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
 
     REQUIRE(mergeableRunProductProcesses.size() == 2);
 
-    std::vector<std::string> expected { "AAPROD", "APROD" };
+    std::vector<std::string> expected{"AAPROD", "APROD"};
     REQUIRE(mergeableRunProductProcesses.processesWithMergeableRunProducts() == expected);
 
-    std::vector<std::string> storedProcesses { "AAAPROD", "AAPROD", "APROD", "ZPROD" };
+    std::vector<std::string> storedProcesses{"AAAPROD", "AAPROD", "APROD", "ZPROD"};
     edm::StoredMergeableRunProductMetadata storedMetadata(storedProcesses);
     REQUIRE(storedMetadata.processesWithMergeableRunProducts() == storedProcesses);
     REQUIRE(storedMetadata.allValidAndUseIndexIntoFile());
 
-    unsigned long long iBeginProcess { 100 };
-    unsigned long long iEndProcess { 101 };
+    unsigned long long iBeginProcess{100};
+    unsigned long long iEndProcess{101};
     edm::StoredMergeableRunProductMetadata::SingleRunEntry singleRunEntry(iBeginProcess, iEndProcess);
     REQUIRE(singleRunEntry.beginProcess() == 100);
     REQUIRE(singleRunEntry.endProcess() == 101);
 
-    unsigned long long iBeginLumi { 200 };
-    unsigned long long iEndLumi { 201 };
-    unsigned int iProcess { 202 };
-    bool iValid { true };
-    bool iUseIndexIntoFile { false };
+    unsigned long long iBeginLumi{200};
+    unsigned long long iEndLumi{201};
+    unsigned int iProcess{202};
+    bool iValid{true};
+    bool iUseIndexIntoFile{false};
     edm::StoredMergeableRunProductMetadata::SingleRunEntryAndProcess singleRunEntryAndProcess(
-      iBeginLumi,
-      iEndLumi,
-      iProcess,
-      iValid,
-      iUseIndexIntoFile);
+        iBeginLumi, iEndLumi, iProcess, iValid, iUseIndexIntoFile);
     REQUIRE(singleRunEntryAndProcess.beginLumi() == 200);
     REQUIRE(singleRunEntryAndProcess.endLumi() == 201);
     REQUIRE(singleRunEntryAndProcess.process() == 202);
@@ -211,25 +204,27 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
     //              not there at all
     //              there with a vector and invalid
     // Let AAAPROD and ZPROD be there for all entries 0, 2, 3, 4
-    std::vector<edm::StoredMergeableRunProductMetadata::SingleRunEntry>& singleRunEntries = storedMetadata.singleRunEntries();
-    singleRunEntries.emplace_back(0,3);
-    singleRunEntries.emplace_back(3,3);
-    singleRunEntries.emplace_back(3,6);
-    singleRunEntries.emplace_back(6,8);
-    singleRunEntries.emplace_back(8,11);
-    singleRunEntries.emplace_back(11,12);
-    singleRunEntries.emplace_back(12,13);
-    singleRunEntries.emplace_back(13,14);
-    singleRunEntries.emplace_back(14,15);
-
-    std::vector<edm::StoredMergeableRunProductMetadata::SingleRunEntryAndProcess>& singleRunEntryAndProcesses = storedMetadata.singleRunEntryAndProcesses();
+    std::vector<edm::StoredMergeableRunProductMetadata::SingleRunEntry>& singleRunEntries =
+        storedMetadata.singleRunEntries();
+    singleRunEntries.emplace_back(0, 3);
+    singleRunEntries.emplace_back(3, 3);
+    singleRunEntries.emplace_back(3, 6);
+    singleRunEntries.emplace_back(6, 8);
+    singleRunEntries.emplace_back(8, 11);
+    singleRunEntries.emplace_back(11, 12);
+    singleRunEntries.emplace_back(12, 13);
+    singleRunEntries.emplace_back(13, 14);
+    singleRunEntries.emplace_back(14, 15);
+
+    std::vector<edm::StoredMergeableRunProductMetadata::SingleRunEntryAndProcess>& singleRunEntryAndProcesses =
+        storedMetadata.singleRunEntryAndProcesses();
     std::vector<edm::LuminosityBlockNumber_t>& lumis = storedMetadata.lumis();
 
     // arguments: beginLumi, endLumi, process Index, valid, useIndexIntoFile
-    unsigned int iAAAPROD { 0 };
+    unsigned int iAAAPROD{0};
     // unsigned int iAAPROD { 1 };
-    unsigned int iAPROD { 2 };
-    unsigned int iZPROD { 3 };
+    unsigned int iAPROD{2};
+    unsigned int iZPROD{3};
 
     // 0th run entry
     iBeginLumi = lumis.size();
@@ -340,7 +335,7 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
     REQUIRE(storedMetadata.getLumiContent(0, std::string("APROD"), valid, lumisBegin, lumisEnd));
     {
       std::vector<edm::LuminosityBlockNumber_t> test(lumisBegin, lumisEnd);
-      std::vector<edm::LuminosityBlockNumber_t> expected { 101, 102 };
+      std::vector<edm::LuminosityBlockNumber_t> expected{101, 102};
       REQUIRE(test == expected);
       REQUIRE(valid);
     }
@@ -353,7 +348,7 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
     REQUIRE(storedMetadata.getLumiContent(4, std::string("APROD"), valid, lumisBegin, lumisEnd));
     {
       std::vector<edm::LuminosityBlockNumber_t> test(lumisBegin, lumisEnd);
-      std::vector<edm::LuminosityBlockNumber_t> expected { 111, 112 };
+      std::vector<edm::LuminosityBlockNumber_t> expected{111, 112};
       REQUIRE(test == expected);
       REQUIRE(!valid);
     }
@@ -374,40 +369,39 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
     processHistory2->push_back(pc);
     fakePHID2 = ph2.id();
 
-    indexIntoFile.addEntry(fakePHID1, 11, 1001, 7, 0); // Event
-    indexIntoFile.addEntry(fakePHID1, 11, 1001, 6, 1); // Event
-    indexIntoFile.addEntry(fakePHID1, 11, 1001, 0, 0); // Lumi
-    indexIntoFile.addEntry(fakePHID1, 11, 1001, 0, 1); // Lumi
-    indexIntoFile.addEntry(fakePHID1, 11, 1001, 5, 2); // Event
-    indexIntoFile.addEntry(fakePHID1, 11, 1001, 4, 3); // Event
-    indexIntoFile.addEntry(fakePHID1, 11, 1001, 0, 2); // Lumi
-    indexIntoFile.addEntry(fakePHID1, 11, 1003, 5, 4); // Event
-    indexIntoFile.addEntry(fakePHID1, 11, 1003, 4, 5); // Event
-    indexIntoFile.addEntry(fakePHID1, 11, 1003, 0, 3); // Lumi
-    indexIntoFile.addEntry(fakePHID1, 11,   0, 0, 0); // Run
-    indexIntoFile.addEntry(fakePHID2, 11,   0, 0, 1); // Run
-    indexIntoFile.addEntry(fakePHID2, 11, 1001, 0, 4); // Lumi
-    indexIntoFile.addEntry(fakePHID2, 11, 1003, 0, 5); // Lumi
-    indexIntoFile.addEntry(fakePHID2, 11, 1003, 4, 6); // Event
-    indexIntoFile.addEntry(fakePHID2, 11, 1003, 0, 6); // Lumi
-    indexIntoFile.addEntry(fakePHID2, 11,   0, 0, 2); // Run
+    indexIntoFile.addEntry(fakePHID1, 11, 1001, 7, 0);  // Event
+    indexIntoFile.addEntry(fakePHID1, 11, 1001, 6, 1);  // Event
+    indexIntoFile.addEntry(fakePHID1, 11, 1001, 0, 0);  // Lumi
+    indexIntoFile.addEntry(fakePHID1, 11, 1001, 0, 1);  // Lumi
+    indexIntoFile.addEntry(fakePHID1, 11, 1001, 5, 2);  // Event
+    indexIntoFile.addEntry(fakePHID1, 11, 1001, 4, 3);  // Event
+    indexIntoFile.addEntry(fakePHID1, 11, 1001, 0, 2);  // Lumi
+    indexIntoFile.addEntry(fakePHID1, 11, 1003, 5, 4);  // Event
+    indexIntoFile.addEntry(fakePHID1, 11, 1003, 4, 5);  // Event
+    indexIntoFile.addEntry(fakePHID1, 11, 1003, 0, 3);  // Lumi
+    indexIntoFile.addEntry(fakePHID1, 11, 0, 0, 0);     // Run
+    indexIntoFile.addEntry(fakePHID2, 11, 0, 0, 1);     // Run
+    indexIntoFile.addEntry(fakePHID2, 11, 1001, 0, 4);  // Lumi
+    indexIntoFile.addEntry(fakePHID2, 11, 1003, 0, 5);  // Lumi
+    indexIntoFile.addEntry(fakePHID2, 11, 1003, 4, 6);  // Event
+    indexIntoFile.addEntry(fakePHID2, 11, 1003, 0, 6);  // Lumi
+    indexIntoFile.addEntry(fakePHID2, 11, 0, 0, 2);     // Run
     indexIntoFile.sortVector_Run_Or_Lumi_Entries();
     edm::IndexIntoFile::IndexIntoFileItr iter = indexIntoFile.begin(edm::IndexIntoFile::firstAppearanceOrder);
 
-
     edm::MergeableRunProductMetadata mergeableRunProductMetadata(mergeableRunProductProcesses);
 
     edm::MergeableRunProductMetadata::MetadataForProcess const* APRODMetadataForProcess =
-      mergeableRunProductMetadata.metadataForOneProcess("APROD");
+        mergeableRunProductMetadata.metadataForOneProcess("APROD");
     REQUIRE(APRODMetadataForProcess);
 
     edm::MergeableRunProductMetadata::MetadataForProcess const* NullMetadataForProcess =
-      mergeableRunProductMetadata.metadataForOneProcess("DOESNOTEXIST");
+        mergeableRunProductMetadata.metadataForOneProcess("DOESNOTEXIST");
     REQUIRE(NullMetadataForProcess == nullptr);
 
     mergeableRunProductMetadata.readRun(0, storedMetadata, edm::IndexIntoFileItrHolder(iter));
     {
-      std::vector<edm::LuminosityBlockNumber_t> expected { 101, 102 };
+      std::vector<edm::LuminosityBlockNumber_t> expected{101, 102};
       REQUIRE(APRODMetadataForProcess->lumis() == expected);
       REQUIRE(APRODMetadataForProcess->mergeDecision() == edm::MergeableRunProductMetadata::REPLACE);
       REQUIRE(mergeableRunProductMetadata.getMergeDecision("APROD") == edm::MergeableRunProductMetadata::REPLACE);
@@ -419,7 +413,7 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
     // Same one again for test purposes
     mergeableRunProductMetadata.readRun(0, storedMetadata, edm::IndexIntoFileItrHolder(iter));
     {
-      std::vector<edm::LuminosityBlockNumber_t> expected { 101, 102 };
+      std::vector<edm::LuminosityBlockNumber_t> expected{101, 102};
       REQUIRE(APRODMetadataForProcess->lumis() == expected);
       REQUIRE(APRODMetadataForProcess->mergeDecision() == edm::MergeableRunProductMetadata::IGNORE);
       REQUIRE(mergeableRunProductMetadata.getMergeDecision("APROD") == edm::MergeableRunProductMetadata::IGNORE);
@@ -430,7 +424,7 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
     // disjoint with newly read ones coming first
     mergeableRunProductMetadata.readRun(5, storedMetadata, edm::IndexIntoFileItrHolder(iter));
     {
-      std::vector<edm::LuminosityBlockNumber_t> expected { 91, 92, 101, 102 };
+      std::vector<edm::LuminosityBlockNumber_t> expected{91, 92, 101, 102};
       REQUIRE(APRODMetadataForProcess->lumis() == expected);
       REQUIRE(APRODMetadataForProcess->mergeDecision() == edm::MergeableRunProductMetadata::MERGE);
       REQUIRE(mergeableRunProductMetadata.getMergeDecision("APROD") == edm::MergeableRunProductMetadata::MERGE);
@@ -441,7 +435,7 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
     // disjoint with newly read ones coming last
     mergeableRunProductMetadata.readRun(6, storedMetadata, edm::IndexIntoFileItrHolder(iter));
     {
-      std::vector<edm::LuminosityBlockNumber_t> expected { 91, 92, 101, 102, 121, 122 };
+      std::vector<edm::LuminosityBlockNumber_t> expected{91, 92, 101, 102, 121, 122};
       REQUIRE(APRODMetadataForProcess->lumis() == expected);
       REQUIRE(APRODMetadataForProcess->mergeDecision() == edm::MergeableRunProductMetadata::MERGE);
       REQUIRE(APRODMetadataForProcess->valid());
@@ -451,7 +445,7 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
     // impossible to merge case, shared elements and both also have at least one non-shared element
     mergeableRunProductMetadata.readRun(7, storedMetadata, edm::IndexIntoFileItrHolder(iter));
     {
-      std::vector<edm::LuminosityBlockNumber_t> expected { 91, 92, 95, 101, 102, 105, 121, 122 };
+      std::vector<edm::LuminosityBlockNumber_t> expected{91, 92, 95, 101, 102, 105, 121, 122};
       REQUIRE(APRODMetadataForProcess->lumis() == expected);
       REQUIRE(APRODMetadataForProcess->mergeDecision() == edm::MergeableRunProductMetadata::MERGE);
       REQUIRE(!APRODMetadataForProcess->valid());
@@ -460,13 +454,13 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
     }
     mergeableRunProductMetadata.preReadFile();
     {
-      std::vector<edm::LuminosityBlockNumber_t> expected { 91, 92, 95, 101, 102, 105, 121, 122 };
+      std::vector<edm::LuminosityBlockNumber_t> expected{91, 92, 95, 101, 102, 105, 121, 122};
       REQUIRE(APRODMetadataForProcess->lumis() == expected);
       REQUIRE(!APRODMetadataForProcess->useIndexIntoFile());
     }
     mergeableRunProductMetadata.readRun(3, storedMetadata, edm::IndexIntoFileItrHolder(iter));
     {
-      std::vector<edm::LuminosityBlockNumber_t> expected { 91, 92, 95, 101, 102, 105, 121, 122 };
+      std::vector<edm::LuminosityBlockNumber_t> expected{91, 92, 95, 101, 102, 105, 121, 122};
       REQUIRE(APRODMetadataForProcess->lumis() == expected);
       REQUIRE(APRODMetadataForProcess->mergeDecision() == edm::MergeableRunProductMetadata::MERGE);
       REQUIRE(!APRODMetadataForProcess->valid());
@@ -475,7 +469,7 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
     }
     mergeableRunProductMetadata.preReadFile();
     {
-      std::vector<edm::LuminosityBlockNumber_t> expected { 91, 92, 95, 101, 102, 105, 121, 122, 1001, 1003 };
+      std::vector<edm::LuminosityBlockNumber_t> expected{91, 92, 95, 101, 102, 105, 121, 122, 1001, 1003};
       REQUIRE(APRODMetadataForProcess->lumis() == expected);
       REQUIRE(!APRODMetadataForProcess->useIndexIntoFile());
     }
@@ -491,7 +485,7 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
     }
     mergeableRunProductMetadata.readRun(0, storedMetadata, edm::IndexIntoFileItrHolder(iter));
     {
-      std::vector<edm::LuminosityBlockNumber_t> expected { 101, 102 };
+      std::vector<edm::LuminosityBlockNumber_t> expected{101, 102};
       REQUIRE(APRODMetadataForProcess->lumis() == expected);
       REQUIRE(APRODMetadataForProcess->mergeDecision() == edm::MergeableRunProductMetadata::REPLACE);
       REQUIRE(APRODMetadataForProcess->valid());
@@ -500,7 +494,7 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
     }
     mergeableRunProductMetadata.readRun(4, storedMetadata, edm::IndexIntoFileItrHolder(iter));
     {
-      std::vector<edm::LuminosityBlockNumber_t> expected { 101, 102, 111, 112 };
+      std::vector<edm::LuminosityBlockNumber_t> expected{101, 102, 111, 112};
       REQUIRE(APRODMetadataForProcess->lumis() == expected);
       REQUIRE(APRODMetadataForProcess->mergeDecision() == edm::MergeableRunProductMetadata::MERGE);
       REQUIRE(!APRODMetadataForProcess->valid());
@@ -524,7 +518,7 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
       REQUIRE(APRODMetadataForProcess->useIndexIntoFile());
       REQUIRE(!APRODMetadataForProcess->allLumisProcessed());
 
-      std::vector<edm::LuminosityBlockNumber_t> expected2 { 1001, 1003 };
+      std::vector<edm::LuminosityBlockNumber_t> expected2{1001, 1003};
       REQUIRE(expected2 == mergeableRunProductMetadata.lumisFromIndexIntoFile());
       REQUIRE(mergeableRunProductMetadata.gotLumisFromIndexIntoFile());
     }
@@ -534,7 +528,7 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
       REQUIRE(expected3 == mergeableRunProductMetadata.lumisFromIndexIntoFile());
       REQUIRE(!mergeableRunProductMetadata.gotLumisFromIndexIntoFile());
 
-      std::vector<edm::LuminosityBlockNumber_t> expected {1001, 1003 };
+      std::vector<edm::LuminosityBlockNumber_t> expected{1001, 1003};
       REQUIRE(APRODMetadataForProcess->lumis() == expected);
       REQUIRE(!APRODMetadataForProcess->useIndexIntoFile());
       REQUIRE(!APRODMetadataForProcess->allLumisProcessed());
@@ -551,18 +545,18 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
       REQUIRE(APRODMetadataForProcess->useIndexIntoFile());
       REQUIRE(!APRODMetadataForProcess->allLumisProcessed());
 
-      std::vector<edm::LuminosityBlockNumber_t> expected2 { 1001, 1003 };
+      std::vector<edm::LuminosityBlockNumber_t> expected2{1001, 1003};
       REQUIRE(expected2 == mergeableRunProductMetadata.lumisFromIndexIntoFile());
       REQUIRE(mergeableRunProductMetadata.gotLumisFromIndexIntoFile());
     }
     {
       mergeableRunProductMetadata.readRun(8, storedMetadata, edm::IndexIntoFileItrHolder(iter));
-      std::vector<edm::LuminosityBlockNumber_t> expected { 1000, 1002, 1003, 1004 };
+      std::vector<edm::LuminosityBlockNumber_t> expected{1000, 1002, 1003, 1004};
       REQUIRE(APRODMetadataForProcess->lumis() == expected);
       mergeableRunProductMetadata.readRun(2, storedMetadata, edm::IndexIntoFileItrHolder(iter));
       REQUIRE(APRODMetadataForProcess->lumis() == expected);
       mergeableRunProductMetadata.preReadFile();
-      std::vector<edm::LuminosityBlockNumber_t> expected2 { 1000, 1001, 1002, 1003, 1004 };
+      std::vector<edm::LuminosityBlockNumber_t> expected2{1000, 1001, 1002, 1003, 1004};
       REQUIRE(APRODMetadataForProcess->lumis() == expected2);
     }
     mergeableRunProductMetadata.postWriteRun();
@@ -571,11 +565,11 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
       mergeableRunProductMetadata.readRun(2, storedMetadata, edm::IndexIntoFileItrHolder(iter));
       mergeableRunProductMetadata.readRun(8, storedMetadata, edm::IndexIntoFileItrHolder(iter));
 
-      std::vector<edm::LuminosityBlockNumber_t> expected1 { 1001, 1003 };
+      std::vector<edm::LuminosityBlockNumber_t> expected1{1001, 1003};
       REQUIRE(expected1 == mergeableRunProductMetadata.lumisFromIndexIntoFile());
       REQUIRE(mergeableRunProductMetadata.gotLumisFromIndexIntoFile());
 
-      std::vector<edm::LuminosityBlockNumber_t> expected2 { 1000, 1002, 1003, 1004 };
+      std::vector<edm::LuminosityBlockNumber_t> expected2{1000, 1002, 1003, 1004};
       REQUIRE(APRODMetadataForProcess->lumis() == expected2);
 
       mergeableRunProductMetadata.writeLumi(1004);
@@ -588,16 +582,15 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
       REQUIRE(!mergeableRunProductMetadata.gotLumisFromIndexIntoFile());
       REQUIRE(!APRODMetadataForProcess->allLumisProcessed());
 
-      std::vector<edm::LuminosityBlockNumber_t> expected4 { 1000, 1001, 1002, 1003, 1004 };
+      std::vector<edm::LuminosityBlockNumber_t> expected4{1000, 1001, 1002, 1003, 1004};
       REQUIRE(APRODMetadataForProcess->lumis() == expected4);
-
     }
     mergeableRunProductMetadata.postWriteRun();
     REQUIRE(mergeableRunProductMetadata.lumisProcessed().empty());
     {
       // ----------------------------------------------------
 
-      std::vector<std::string> storedProcessesOutput { "AAAPROD", "AAPROD", "APROD", "ZPROD" };
+      std::vector<std::string> storedProcessesOutput{"AAAPROD", "AAPROD", "APROD", "ZPROD"};
       edm::StoredMergeableRunProductMetadata storedMetadataOutput(storedProcesses);
 
       mergeableRunProductMetadata.readRun(1, storedMetadata, edm::IndexIntoFileItrHolder(iter));
@@ -614,11 +607,11 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
       mergeableRunProductMetadata.readRun(2, storedMetadata, edm::IndexIntoFileItrHolder(iter));
       mergeableRunProductMetadata.readRun(8, storedMetadata, edm::IndexIntoFileItrHolder(iter));
 
-      std::vector<edm::LuminosityBlockNumber_t> expected1 { 1001, 1003 };
+      std::vector<edm::LuminosityBlockNumber_t> expected1{1001, 1003};
       REQUIRE(expected1 == mergeableRunProductMetadata.lumisFromIndexIntoFile());
       REQUIRE(mergeableRunProductMetadata.gotLumisFromIndexIntoFile());
 
-      std::vector<edm::LuminosityBlockNumber_t> expected2 { 1000, 1002, 1003, 1004 };
+      std::vector<edm::LuminosityBlockNumber_t> expected2{1000, 1002, 1003, 1004};
       REQUIRE(APRODMetadataForProcess->lumis() == expected2);
 
       mergeableRunProductMetadata.writeLumi(1004);
@@ -634,7 +627,7 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
       REQUIRE(!mergeableRunProductMetadata.gotLumisFromIndexIntoFile());
       REQUIRE(APRODMetadataForProcess->allLumisProcessed());
 
-      std::vector<edm::LuminosityBlockNumber_t> expected4 { 1000, 1001, 1002, 1003, 1004 };
+      std::vector<edm::LuminosityBlockNumber_t> expected4{1000, 1001, 1002, 1003, 1004};
       REQUIRE(APRODMetadataForProcess->lumis() == expected4);
 
       mergeableRunProductMetadata.addEntryToStoredMetadata(storedMetadataOutput);
@@ -661,7 +654,8 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
 
       // ---------------------------------------------------
 
-      std::vector<edm::StoredMergeableRunProductMetadata::SingleRunEntry>& singleRunEntries = storedMetadataOutput.singleRunEntries();
+      std::vector<edm::StoredMergeableRunProductMetadata::SingleRunEntry>& singleRunEntries =
+          storedMetadataOutput.singleRunEntries();
       REQUIRE(singleRunEntries.size() == 4);
       REQUIRE(singleRunEntries[0].beginProcess() == 0);
       REQUIRE(singleRunEntries[0].endProcess() == 0);
@@ -672,7 +666,8 @@ TEST_CASE("test MergeableRunProductMetadata", "[MergeableRunProductMetadata]") {
       REQUIRE(singleRunEntries[3].beginProcess() == 3);
       REQUIRE(singleRunEntries[3].endProcess() == 5);
 
-      std::vector<edm::StoredMergeableRunProductMetadata::SingleRunEntryAndProcess>& singleRunEntryAndProcesses = storedMetadataOutput.singleRunEntryAndProcesses();
+      std::vector<edm::StoredMergeableRunProductMetadata::SingleRunEntryAndProcess>& singleRunEntryAndProcesses =
+          storedMetadataOutput.singleRunEntryAndProcesses();
       REQUIRE(singleRunEntryAndProcesses.size() == 5);
 
       REQUIRE(singleRunEntryAndProcesses[0].beginLumi() == 0);
diff --git a/FWCore/Framework/test/test_global_modules_cfg.py b/FWCore/Framework/test/test_global_modules_cfg.py
index 5351265d59c64..10ce5c80aad27 100644
--- a/FWCore/Framework/test/test_global_modules_cfg.py
+++ b/FWCore/Framework/test/test_global_modules_cfg.py
@@ -28,110 +28,110 @@
 )
 
 process.StreamIntProd = cms.EDProducer("edmtest::global::StreamIntProducer",
-    transitions = cms.int32(nEvt+nStreams*(2*(nEvt/nEvtRun)+2*(nEvt/nEvtLumi)+2))
+    transitions = cms.int32(int(nEvt+nStreams*(2*(nEvt/nEvtRun)+2*(nEvt/nEvtLumi)+2)))
     ,cachevalue = cms.int32(1)
 )
 
 process.RunIntProd = cms.EDProducer("edmtest::global::RunIntProducer",
-    transitions = cms.int32(2*(nEvt/nEvtRun))
+    transitions = cms.int32(int(2*(nEvt/nEvtRun)))
     ,cachevalue = cms.int32(nEvtRun)
 )
 
 process.LumiIntProd = cms.EDProducer("edmtest::global::LumiIntProducer",
-    transitions = cms.int32(2*(nEvt/nEvtLumi))
+    transitions = cms.int32(int(2*(nEvt/nEvtLumi)))
     ,cachevalue = cms.int32(nEvtLumi)
 )
 
 process.RunSumIntProd = cms.EDProducer("edmtest::global::RunSummaryIntProducer",
-    transitions = cms.int32(nStreams*(nEvt/nEvtRun)+2*(nEvt/nEvtRun))
+    transitions = cms.int32(int(nStreams*(nEvt/nEvtRun)+2*(nEvt/nEvtRun)))
     ,cachevalue = cms.int32(nEvtRun)
 )
 
 process.LumiSumIntProd = cms.EDProducer("edmtest::global::LumiSummaryIntProducer",
-    transitions = cms.int32(nStreams*(nEvt/nEvtLumi)+2*(nEvt/nEvtLumi))
+    transitions = cms.int32(int(nStreams*(nEvt/nEvtLumi)+2*(nEvt/nEvtLumi)))
     ,cachevalue = cms.int32(nEvtLumi)
 )
 
 process.TestBeginRunProd = cms.EDProducer("edmtest::global::TestBeginRunProducer",
-    transitions = cms.int32((nEvt/nEvtRun))
+    transitions = cms.int32(int(nEvt/nEvtRun))
 )
 
 process.TestEndRunProd = cms.EDProducer("edmtest::global::TestEndRunProducer",
-    transitions = cms.int32((nEvt/nEvtRun))
+    transitions = cms.int32(int(nEvt/nEvtRun))
 )
 
 process.TestBeginLumiBlockProd = cms.EDProducer("edmtest::global::TestBeginLumiBlockProducer",
-    transitions = cms.int32((nEvt/nEvtLumi))
+    transitions = cms.int32(int(nEvt/nEvtLumi))
 )
 
 process.TestEndLumiBlockProd = cms.EDProducer("edmtest::global::TestEndLumiBlockProducer",
-    transitions = cms.int32((nEvt/nEvtLumi))
+    transitions = cms.int32(int(nEvt/nEvtLumi))
 )
 
 process.StreamIntAn = cms.EDAnalyzer("edmtest::global::StreamIntAnalyzer",
-    transitions = cms.int32(nEvt+nStreams*(2*(nEvt/nEvtRun)+2*(nEvt/nEvtLumi)+2))
+    transitions = cms.int32(int(nEvt+nStreams*(2*(nEvt/nEvtRun)+2*(nEvt/nEvtLumi)+2)))
     ,cachevalue = cms.int32(1)
 )
 
 process.RunIntAn= cms.EDAnalyzer("edmtest::global::RunIntAnalyzer",
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtRun))
+    transitions = cms.int32(int(nEvt+2*(nEvt/nEvtRun)))
     ,cachevalue = cms.int32(nEvtRun)
 )
 
 process.LumiIntAn = cms.EDAnalyzer("edmtest::global::LumiIntAnalyzer",
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtLumi))
+    transitions = cms.int32(int(nEvt+2*(nEvt/nEvtLumi)))
     ,cachevalue = cms.int32(nEvtLumi)
 )
 
 process.RunSumIntAn = cms.EDAnalyzer("edmtest::global::RunSummaryIntAnalyzer",
-    transitions = cms.int32(nEvt+nStreams*((nEvt/nEvtRun)+1)+2*(nEvt/nEvtRun))
+    transitions = cms.int32(int(nEvt+nStreams*((nEvt/nEvtRun)+1)+2*(nEvt/nEvtRun)))
     ,cachevalue = cms.int32(nEvtRun)
 )
 
 process.LumiSumIntAn = cms.EDAnalyzer("edmtest::global::LumiSummaryIntAnalyzer",
-    transitions = cms.int32(nEvt+nStreams*((nEvt/nEvtLumi)+1)+2*(nEvt/nEvtLumi))
+    transitions = cms.int32(int(nEvt+nStreams*((nEvt/nEvtLumi)+1)+2*(nEvt/nEvtLumi)))
     ,cachevalue = cms.int32(nEvtLumi)
 )
 
 process.StreamIntFil = cms.EDFilter("edmtest::global::StreamIntFilter",
-    transitions = cms.int32(nEvt+nStreams*(2*(nEvt/nEvtRun)+2*(nEvt/nEvtLumi)+2))
+    transitions = cms.int32(int(nEvt+nStreams*(2*(nEvt/nEvtRun)+2*(nEvt/nEvtLumi)+2)))
     ,cachevalue = cms.int32(1)
 )
 
 process.RunIntFil = cms.EDFilter("edmtest::global::RunIntFilter",
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtRun))
+    transitions = cms.int32(int(nEvt+2*(nEvt/nEvtRun)))
     ,cachevalue = cms.int32(nEvtRun)
 )
 
 process.LumiIntFil = cms.EDFilter("edmtest::global::LumiIntFilter",
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtLumi))
+    transitions = cms.int32(int(nEvt+2*(nEvt/nEvtLumi)))
     ,cachevalue = cms.int32(nEvtLumi)
 )
 
 process.RunSumIntFil = cms.EDFilter("edmtest::global::RunSummaryIntFilter",
-    transitions = cms.int32(nEvt+nStreams*((nEvt/nEvtRun)+1)+2*(nEvt/nEvtRun))
+    transitions = cms.int32(int(nEvt+nStreams*((nEvt/nEvtRun)+1)+2*(nEvt/nEvtRun)))
     ,cachevalue = cms.int32(nEvtRun)
 )
 
 process.LumiSumIntFil = cms.EDFilter("edmtest::global::LumiSummaryIntFilter",
-    transitions = cms.int32(nEvt+nStreams*((nEvt/nEvtLumi)+1)+2*(nEvt/nEvtLumi))
+    transitions = cms.int32(int(nEvt+nStreams*((nEvt/nEvtLumi)+1)+2*(nEvt/nEvtLumi)))
     ,cachevalue = cms.int32(nEvtLumi)
 )
 
 process.TestBeginRunFil = cms.EDFilter("edmtest::global::TestBeginRunFilter",
-    transitions = cms.int32((nEvt/nEvtRun))
+    transitions = cms.int32(int(nEvt/nEvtRun))
 )
 
 process.TestEndRunFil = cms.EDFilter("edmtest::global::TestEndRunFilter",
-    transitions = cms.int32((nEvt/nEvtRun))
+    transitions = cms.int32(int(nEvt/nEvtRun))
 )
 
 process.TestBeginLumiBlockFil = cms.EDFilter("edmtest::global::TestBeginLumiBlockFilter",
-    transitions = cms.int32((nEvt/nEvtLumi))
+    transitions = cms.int32(int(nEvt/nEvtLumi))
 )
 
 process.TestEndLumiBlockFil = cms.EDFilter("edmtest::global::TestEndLumiBlockFilter",
-    transitions = cms.int32((nEvt/nEvtLumi))
+    transitions = cms.int32(int(nEvt/nEvtLumi))
 )
 
 process.TestAccumulator1 = cms.EDProducer("edmtest::global::TestAccumulator",
diff --git a/FWCore/Framework/test/test_limited_modules_cfg.py b/FWCore/Framework/test/test_limited_modules_cfg.py
index bb1175615b3a8..fd44e452b80cb 100644
--- a/FWCore/Framework/test/test_limited_modules_cfg.py
+++ b/FWCore/Framework/test/test_limited_modules_cfg.py
@@ -31,132 +31,132 @@
 
 process.StreamIntProd = cms.EDProducer("edmtest::limited::StreamIntProducer",
     concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32(nEvt+nStreams*(2*(nEvt/nEvtRun)+2*(nEvt/nEvtLumi)+2))
+    transitions = cms.int32(nEvt+nStreams*(2*int(nEvt/nEvtRun)+2*int(nEvt/nEvtLumi)+2))
     ,cachevalue = cms.int32(1)
 )
 
 process.RunIntProd = cms.EDProducer("edmtest::limited::RunIntProducer",
                                     concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32(2*(nEvt/nEvtRun))
+    transitions = cms.int32(2*int(nEvt/nEvtRun))
     ,cachevalue = cms.int32(nEvtRun)
 )
 
 process.LumiIntProd = cms.EDProducer("edmtest::limited::LumiIntProducer",
                                      concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32(2*(nEvt/nEvtLumi))
+    transitions = cms.int32(2*int(nEvt/nEvtLumi))
     ,cachevalue = cms.int32(nEvtLumi)
 )
 
 process.RunSumIntProd = cms.EDProducer("edmtest::limited::RunSummaryIntProducer",
                                        concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32(nStreams*(nEvt/nEvtRun)+2*(nEvt/nEvtRun))
+    transitions = cms.int32(nStreams*int(nEvt/nEvtRun)+2*int(nEvt/nEvtRun))
     ,cachevalue = cms.int32(nEvtRun)
 )
 
 process.LumiSumIntProd = cms.EDProducer("edmtest::limited::LumiSummaryIntProducer",
                                         concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32(nStreams*(nEvt/nEvtLumi)+2*(nEvt/nEvtLumi))
+    transitions = cms.int32(nStreams*int(nEvt/nEvtLumi)+2*int(nEvt/nEvtLumi))
     ,cachevalue = cms.int32(nEvtLumi)
 )
 
 process.TestBeginRunProd = cms.EDProducer("edmtest::limited::TestBeginRunProducer",
                                           concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32((nEvt/nEvtRun))
+    transitions = cms.int32(int(nEvt/nEvtRun))
 )
 
 process.TestEndRunProd = cms.EDProducer("edmtest::limited::TestEndRunProducer",
                                         concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32((nEvt/nEvtRun))
+    transitions = cms.int32(int(nEvt/nEvtRun))
 )
 
 process.TestBeginLumiBlockProd = cms.EDProducer("edmtest::limited::TestBeginLumiBlockProducer",
                                                 concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32((nEvt/nEvtLumi))
+    transitions = cms.int32(int(nEvt/nEvtLumi))
 )
 
 process.TestEndLumiBlockProd = cms.EDProducer("edmtest::limited::TestEndLumiBlockProducer",
                                               concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32((nEvt/nEvtLumi))
+    transitions = cms.int32(int(nEvt/nEvtLumi))
 )
 
 process.StreamIntAn = cms.EDAnalyzer("edmtest::limited::StreamIntAnalyzer",
                                      concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32(nEvt+nStreams*(2*(nEvt/nEvtRun)+2*(nEvt/nEvtLumi)+2))
+    transitions = cms.int32(nEvt+nStreams*(2*int(nEvt/nEvtRun)+2*int(nEvt/nEvtLumi)+2))
     ,cachevalue = cms.int32(1)
 )
 
 process.RunIntAn= cms.EDAnalyzer("edmtest::limited::RunIntAnalyzer",
                                  concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtRun))
+    transitions = cms.int32(nEvt+2*int(nEvt/nEvtRun))
     ,cachevalue = cms.int32(nEvtRun)
 )
 
 process.LumiIntAn = cms.EDAnalyzer("edmtest::limited::LumiIntAnalyzer",
                                    concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+2*int(nEvt/nEvtLumi))
     ,cachevalue = cms.int32(nEvtLumi)
 )
 
 process.RunSumIntAn = cms.EDAnalyzer("edmtest::limited::RunSummaryIntAnalyzer",
                                      concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32(nEvt+nStreams*((nEvt/nEvtRun)+1)+2*(nEvt/nEvtRun))
+    transitions = cms.int32(nEvt+nStreams*(int(nEvt/nEvtRun)+1)+2*int(nEvt/nEvtRun))
     ,cachevalue = cms.int32(nEvtRun)
 )
 
 process.LumiSumIntAn = cms.EDAnalyzer("edmtest::limited::LumiSummaryIntAnalyzer",
                                       concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32(nEvt+nStreams*((nEvt/nEvtLumi)+1)+2*(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+nStreams*(int(nEvt/nEvtLumi)+1)+2*int(nEvt/nEvtLumi))
     ,cachevalue = cms.int32(nEvtLumi)
 )
 
 process.StreamIntFil = cms.EDFilter("edmtest::limited::StreamIntFilter",
                                     concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32(nEvt+nStreams*(2*(nEvt/nEvtRun)+2*(nEvt/nEvtLumi)+2))
+    transitions = cms.int32(nEvt+nStreams*(2*int(nEvt/nEvtRun)+2*int(nEvt/nEvtLumi)+2))
     ,cachevalue = cms.int32(1)
 )
 
 process.RunIntFil = cms.EDFilter("edmtest::limited::RunIntFilter",
                                  concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtRun))
+    transitions = cms.int32(nEvt+2*int(nEvt/nEvtRun))
     ,cachevalue = cms.int32(nEvtRun)
 )
 
 process.LumiIntFil = cms.EDFilter("edmtest::limited::LumiIntFilter",
                                   concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+2*int(nEvt/nEvtLumi))
     ,cachevalue = cms.int32(nEvtLumi)
 )
 
 process.RunSumIntFil = cms.EDFilter("edmtest::limited::RunSummaryIntFilter",
                                     concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32(nEvt+nStreams*((nEvt/nEvtRun)+1)+2*(nEvt/nEvtRun))
+    transitions = cms.int32(nEvt+nStreams*(int(nEvt/nEvtRun)+1)+2*int(nEvt/nEvtRun))
     ,cachevalue = cms.int32(nEvtRun)
 )
 
 process.LumiSumIntFil = cms.EDFilter("edmtest::limited::LumiSummaryIntFilter",
                                      concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32(nEvt+nStreams*((nEvt/nEvtLumi)+1)+2*(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+nStreams*(int(nEvt/nEvtLumi)+1)+2*int(nEvt/nEvtLumi))
     ,cachevalue = cms.int32(nEvtLumi)
 )
 
 process.TestBeginRunFil = cms.EDFilter("edmtest::limited::TestBeginRunFilter",
                                        concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32((nEvt/nEvtRun))
+    transitions = cms.int32(int(nEvt/nEvtRun))
 )
 
 process.TestEndRunFil = cms.EDFilter("edmtest::limited::TestEndRunFilter",
                                      concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32((nEvt/nEvtRun))
+    transitions = cms.int32(int(nEvt/nEvtRun))
 )
 
 process.TestBeginLumiBlockFil = cms.EDFilter("edmtest::limited::TestBeginLumiBlockFilter",
                                              concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32((nEvt/nEvtLumi))
+    transitions = cms.int32(int(nEvt/nEvtLumi))
 )
 
 process.TestEndLumiBlockFil = cms.EDFilter("edmtest::limited::TestEndLumiBlockFilter",
                                            concurrencyLimit = cms.untracked.uint32(1),
-    transitions = cms.int32((nEvt/nEvtLumi))
+    transitions = cms.int32(int(nEvt/nEvtLumi))
 )
 
 process.TestAccumulator1 = cms.EDProducer("edmtest::limited::TestAccumulator",
diff --git a/FWCore/Framework/test/test_one_modules_cfg.py b/FWCore/Framework/test/test_one_modules_cfg.py
index 639b4b03519a6..077db7c6c364e 100644
--- a/FWCore/Framework/test/test_one_modules_cfg.py
+++ b/FWCore/Framework/test/test_one_modules_cfg.py
@@ -33,35 +33,35 @@
 )
 
 process.WatchRunProd = cms.EDProducer("edmtest::one::WatchRunsProducer",
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtRun))
+    transitions = cms.int32(nEvt+2*int(nEvt/nEvtRun))
 )
 
 process.WatchLumiBlockProd = cms.EDProducer("edmtest::one::WatchLumiBlocksProducer",
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+2*int(nEvt/nEvtLumi))
 )
 
 process.RunCacheProd = cms.EDProducer("edmtest::one::RunCacheProducer",
-                                    transitions = cms.int32(nEvt+2*(nEvt/nEvtRun))
+                                    transitions = cms.int32(nEvt+2*int(nEvt/nEvtRun))
                                     )
 
 process.LumiBlockCacheProd = cms.EDProducer("edmtest::one::LumiBlockCacheProducer",
-                                          transitions = cms.int32(nEvt+2*(nEvt/nEvtLumi))
+                                          transitions = cms.int32(nEvt+2*int(nEvt/nEvtLumi))
                                           )
 
 process.BeginRunProd = cms.EDProducer("edmtest::one::TestBeginRunProducer",
-    transitions = cms.int32(nEvt+(nEvt/nEvtRun))
+    transitions = cms.int32(nEvt+int(nEvt/nEvtRun))
 )
 
 process.BeginLumiBlockProd = cms.EDProducer("edmtest::one::TestBeginLumiBlockProducer",
-    transitions = cms.int32(nEvt+(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+int(nEvt/nEvtLumi))
 )
 
 process.EndRunProd = cms.EDProducer("edmtest::one::TestEndRunProducer",
-    transitions = cms.int32(nEvt+(nEvt/nEvtRun))
+    transitions = cms.int32(nEvt+int(nEvt/nEvtRun))
 )
 
 process.EndLumiBlockProd = cms.EDProducer("edmtest::one::TestEndLumiBlockProducer",
-    transitions = cms.int32(nEvt+(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+int(nEvt/nEvtLumi))
 )
 
 
@@ -70,19 +70,19 @@
 )
 
 process.WatchRunAn = cms.EDAnalyzer("edmtest::one::WatchRunsAnalyzer",
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtRun))
+    transitions = cms.int32(nEvt+2*int(nEvt/nEvtRun))
 )
 
 process.WatchLumiBlockAn = cms.EDAnalyzer("edmtest::one::WatchLumiBlocksAnalyzer",
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+2*int(nEvt/nEvtLumi))
 )
 
 process.RunCacheAn = cms.EDAnalyzer("edmtest::one::RunCacheAnalyzer",
-                                    transitions = cms.int32(nEvt+2*(nEvt/nEvtRun))
+                                    transitions = cms.int32(nEvt+2*int(nEvt/nEvtRun))
                                     )
 
 process.LumiBlockCacheAn = cms.EDAnalyzer("edmtest::one::LumiBlockCacheAnalyzer",
-                                          transitions = cms.int32(nEvt+2*(nEvt/nEvtLumi))
+                                          transitions = cms.int32(nEvt+2*int(nEvt/nEvtLumi))
                                           )
 
 process.SharedResFil = cms.EDFilter("edmtest::one::SharedResourcesFilter",
@@ -90,34 +90,34 @@
 )
 
 process.WatchRunFil = cms.EDFilter("edmtest::one::WatchRunsFilter",
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtRun))
+    transitions = cms.int32(nEvt+2*int(nEvt/nEvtRun))
 )
 
 process.WatchLumiBlockFil = cms.EDFilter("edmtest::one::WatchLumiBlocksFilter",
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+2*int(nEvt/nEvtLumi))
 )
 process.RunCacheFil = cms.EDFilter("edmtest::one::RunCacheFilter",
-                                    transitions = cms.int32(nEvt+2*(nEvt/nEvtRun))
+                                    transitions = cms.int32(nEvt+2*int(nEvt/nEvtRun))
                                     )
 
 process.LumiBlockCacheFil = cms.EDFilter("edmtest::one::LumiBlockCacheFilter",
-                                          transitions = cms.int32(nEvt+2*(nEvt/nEvtLumi))
+                                          transitions = cms.int32(nEvt+2*int(nEvt/nEvtLumi))
                                           )
 
 process.BeginRunFil = cms.EDFilter("edmtest::one::BeginRunFilter",
-    transitions = cms.int32(nEvt+(nEvt/nEvtRun))
+    transitions = cms.int32(nEvt+int(nEvt/nEvtRun))
 )
 
 process.BeginLumiBlockFil = cms.EDFilter("edmtest::one::BeginLumiBlockFilter",
-    transitions = cms.int32(nEvt+(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+int(nEvt/nEvtLumi))
 )
 
 process.EndRunFil = cms.EDFilter("edmtest::one::EndRunFilter",
-    transitions = cms.int32(nEvt+(nEvt/nEvtRun))
+    transitions = cms.int32(nEvt+int(nEvt/nEvtRun))
 )
 
 process.EndLumiBlockFil = cms.EDFilter("edmtest::one::EndLumiBlockFilter",
-    transitions = cms.int32(nEvt+(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+int(nEvt/nEvtLumi))
 )
 
 process.TestAccumulator1 = cms.EDProducer("edmtest::one::TestAccumulator",
diff --git a/FWCore/Framework/test/test_stream_modules_cfg.py b/FWCore/Framework/test/test_stream_modules_cfg.py
index d308a6f194ab2..f9ef4a9652c0e 100644
--- a/FWCore/Framework/test/test_stream_modules_cfg.py
+++ b/FWCore/Framework/test/test_stream_modules_cfg.py
@@ -34,42 +34,42 @@
 )
 
 process.RunIntProd = cms.EDProducer("edmtest::stream::RunIntProducer",
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtRun))
+    transitions = cms.int32(int(nEvt+2*(nEvt/nEvtRun)))
     ,cachevalue = cms.int32(nEvtRun)
 )
 
 process.LumiIntProd = cms.EDProducer("edmtest::stream::LumiIntProducer",
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+2*int(nEvt/nEvtLumi))
     ,cachevalue = cms.int32(nEvtLumi)
 )
 
 process.RunSumIntProd = cms.EDProducer("edmtest::stream::RunSummaryIntProducer",
-    transitions = cms.int32(nEvt+4*(nEvt/nEvtRun))
+    transitions = cms.int32(nEvt+4*int(nEvt/nEvtRun))
     ,cachevalue = cms.int32(nEvtRun)
 )
 
 process.LumiSumIntProd = cms.EDProducer("edmtest::stream::LumiSummaryIntProducer",
-    transitions = cms.int32(nEvt+4*(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+4*int(nEvt/nEvtLumi))
     ,cachevalue = cms.int32(nEvtLumi)
 )
 
 process.TestBeginRunProd = cms.EDProducer("edmtest::stream::TestBeginRunProducer",
-    transitions = cms.int32((nEvt/nEvtRun))
+    transitions = cms.int32(int(nEvt/nEvtRun))
     ,cachevalue = cms.int32(nEvt)
 )
 
 process.TestEndRunProd = cms.EDProducer("edmtest::stream::TestEndRunProducer",
-    transitions = cms.int32((nEvt/nEvtRun))
+    transitions = cms.int32(int(nEvt/nEvtRun))
     ,cachevalue = cms.int32(nEvt)
 )
 
 process.TestBeginLumiBlockProd = cms.EDProducer("edmtest::stream::TestBeginLumiBlockProducer",
-    transitions = cms.int32((nEvt/nEvtLumi))
+    transitions = cms.int32(int(nEvt/nEvtLumi))
     ,cachevalue = cms.int32(nEvt)
 )
 
 process.TestEndLumiBlockProd = cms.EDProducer("edmtest::stream::TestEndLumiBlockProducer",
-    transitions = cms.int32((nEvt/nEvtLumi))
+    transitions = cms.int32(int(nEvt/nEvtLumi))
     ,cachevalue = cms.int32(nEvt)
 )
 
@@ -80,22 +80,22 @@
 )
 
 process.RunIntAn= cms.EDAnalyzer("edmtest::stream::RunIntAnalyzer",
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtRun))
+    transitions = cms.int32(nEvt+2*int(nEvt/nEvtRun))
     ,cachevalue = cms.int32(nEvtRun)
 )
 
 process.LumiIntAn = cms.EDAnalyzer("edmtest::stream::LumiIntAnalyzer",
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+2*int(nEvt/nEvtLumi))
     ,cachevalue = cms.int32(nEvtLumi)
 )
 
 process.RunSumIntAn = cms.EDAnalyzer("edmtest::stream::RunSummaryIntAnalyzer",
-    transitions = cms.int32(nEvt+4*(nEvt/nEvtRun))
+    transitions = cms.int32(nEvt+4*int(nEvt/nEvtRun))
     ,cachevalue = cms.int32(nEvtRun)
 )
 
 process.LumiSumIntAn = cms.EDAnalyzer("edmtest::stream::LumiSummaryIntAnalyzer",
-    transitions = cms.int32(nEvt+4*(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+4*int(nEvt/nEvtLumi))
     ,cachevalue = cms.int32(nEvtLumi)
 )
 
@@ -105,41 +105,41 @@
 )
 
 process.RunIntFil = cms.EDFilter("edmtest::stream::RunIntFilter",
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtRun))
+    transitions = cms.int32(nEvt+2*int(nEvt/nEvtRun))
     ,cachevalue = cms.int32(nEvtRun)
 )
 
 process.LumiIntFil = cms.EDFilter("edmtest::stream::LumiIntFilter",
-    transitions = cms.int32(nEvt+2*(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+2*int(nEvt/nEvtLumi))
     ,cachevalue = cms.int32(nEvtLumi)
 )
 
 process.RunSumIntFil = cms.EDFilter("edmtest::stream::RunSummaryIntFilter",
-    transitions = cms.int32(nEvt+4*(nEvt/nEvtRun))
+    transitions = cms.int32(nEvt+4*int(nEvt/nEvtRun))
     ,cachevalue = cms.int32(nEvtRun)
 )
 
 process.LumiSumIntFil = cms.EDFilter("edmtest::stream::LumiSummaryIntFilter",
-    transitions = cms.int32(nEvt+4*(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+4*int(nEvt/nEvtLumi))
     ,cachevalue = cms.int32(nEvtLumi)
 )
 process.TestBeginRunFil = cms.EDFilter("edmtest::stream::TestBeginRunFilter",
-    transitions = cms.int32(nEvt+3*(nEvt/nEvtRun))
+    transitions = cms.int32(nEvt+3*int(nEvt/nEvtRun))
     ,cachevalue = cms.int32(nEvt)
 )
 
 process.TestEndRunFil = cms.EDFilter("edmtest::stream::TestEndRunFilter",
-    transitions = cms.int32(nEvt+3*(nEvt/nEvtRun))
+    transitions = cms.int32(nEvt+3*int(nEvt/nEvtRun))
     ,cachevalue = cms.int32(nEvt)
 )
 
 process.TestBeginLumiBlockFil = cms.EDFilter("edmtest::stream::TestBeginLumiBlockFilter",
-    transitions = cms.int32(nEvt+3*(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+3*int(nEvt/nEvtLumi))
     ,cachevalue = cms.int32(nEvt)
 )
 
 process.TestEndLumiBlockFil = cms.EDFilter("edmtest::stream::TestEndLumiBlockFilter",
-    transitions = cms.int32(nEvt+3*(nEvt/nEvtLumi))
+    transitions = cms.int32(nEvt+3*int(nEvt/nEvtLumi))
     ,cachevalue = cms.int32(nEvt)
 )
 
diff --git a/FWCore/Framework/test/throwIfImproperDependencies_t.cppunit.cc b/FWCore/Framework/test/throwIfImproperDependencies_t.cppunit.cc
index 55aaf389f9e66..e628f302ddd5c 100644
--- a/FWCore/Framework/test/throwIfImproperDependencies_t.cppunit.cc
+++ b/FWCore/Framework/test/throwIfImproperDependencies_t.cppunit.cc
@@ -15,20 +15,19 @@
 #include "FWCore/Utilities/interface/Exception.h"
 #include "cppunit/extensions/HelperMacros.h"
 
-
-class test_throwIfImproperDependencies: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(test_throwIfImproperDependencies);
+class test_throwIfImproperDependencies : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(test_throwIfImproperDependencies);
 
   CPPUNIT_TEST(onePathNoCycleTest);
   CPPUNIT_TEST(onePathHasCycleTest);
   CPPUNIT_TEST(twoPathsNoCycleTest);
   CPPUNIT_TEST(twoPathsWithCycleTest);
 
-CPPUNIT_TEST_SUITE_END();
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void onePathNoCycleTest();
   void onePathHasCycleTest();
@@ -38,44 +37,43 @@ CPPUNIT_TEST_SUITE_END();
 
   using ModuleDependsOnMap = std::map<std::string, std::vector<std::string>>;
   using PathToModules = std::unordered_map<std::string, std::vector<std::string>>;
-  
+
 private:
   static unsigned int indexForModule(std::string const& iName,
-                              std::unordered_map<std::string, unsigned int>& modsToIndex,
-                              std::unordered_map<unsigned int, std::string>& indexToMods) {
+                                     std::unordered_map<std::string, unsigned int>& modsToIndex,
+                                     std::unordered_map<unsigned int, std::string>& indexToMods) {
     auto found = modsToIndex.find(iName);
     unsigned int fromIndex;
-    if(found == modsToIndex.end()) {
+    if (found == modsToIndex.end()) {
       fromIndex = modsToIndex.size();
-      modsToIndex.emplace( iName, fromIndex);
+      modsToIndex.emplace(iName, fromIndex);
       indexToMods.emplace(fromIndex, iName);
     } else {
       fromIndex = found->second;
     }
     return fromIndex;
   }
-  
-  bool testCase( ModuleDependsOnMap const& iModDeps, PathToModules const& iPaths) const {
+
+  bool testCase(ModuleDependsOnMap const& iModDeps, PathToModules const& iPaths) const {
     using namespace edm::graph;
-    
+
     EdgeToPathMap edgeToPathMap;
-    
+
     std::unordered_map<std::string, unsigned int> modsToIndex;
     std::unordered_map<unsigned int, std::string> indexToMods;
-    
+
     //We have an artificial case to be the root of the graph
     const std::string kFinishedProcessing("FinishedProcessing");
     const unsigned int kFinishedProcessingIndex{0};
-    modsToIndex.emplace(kFinishedProcessing,kFinishedProcessingIndex);
-    indexToMods.emplace(kFinishedProcessingIndex,kFinishedProcessing);
-    
+    modsToIndex.emplace(kFinishedProcessing, kFinishedProcessingIndex);
+    indexToMods.emplace(kFinishedProcessingIndex, kFinishedProcessing);
+
     //Setup the module to index map by using all module names used in both containers
     //Start with keys from the module dependency to allow control of the numbering scheme
-    for(auto const& md : iModDeps) {
-      indexForModule(md.first,modsToIndex,indexToMods);
+    for (auto const& md : iModDeps) {
+      indexForModule(md.first, modsToIndex, indexToMods);
     }
-    
-    
+
     std::vector<std::vector<unsigned int>> pathIndexToModuleIndexOrder(iPaths.size());
 
     //Need to be able to quickly look up which paths a module appears on
@@ -83,255 +81,242 @@ CPPUNIT_TEST_SUITE_END();
 
     std::vector<std::string> pathNames;
     std::unordered_map<std::string, unsigned int> pathToIndexMap;
-    for(auto const& path: iPaths) {
+    for (auto const& path : iPaths) {
       unsigned int lastModuleIndex = kInvalidIndex;
       pathNames.push_back(path.first);
       unsigned int pathIndex = pathToIndexMap.size();
       auto& pathOrder = pathIndexToModuleIndexOrder[pathIndex];
       pathToIndexMap.emplace(path.first, pathIndex);
-      for( auto const& mod: path.second) {
-        unsigned int index =indexForModule(mod,modsToIndex,indexToMods);
+      for (auto const& mod : path.second) {
+        unsigned int index = indexForModule(mod, modsToIndex, indexToMods);
         pathOrder.push_back(index);
         moduleIndexToPathIndex[index].push_back(pathIndex);
 
-        if(lastModuleIndex != kInvalidIndex) {
+        if (lastModuleIndex != kInvalidIndex) {
           edgeToPathMap[std::make_pair(index, lastModuleIndex)].push_back(pathIndex);
         }
         lastModuleIndex = index;
       }
       pathOrder.push_back(kFinishedProcessingIndex);
-      if(lastModuleIndex != kInvalidIndex) {
+      if (lastModuleIndex != kInvalidIndex) {
         edgeToPathMap[std::make_pair(kFinishedProcessingIndex, lastModuleIndex)].push_back(pathIndex);
       }
     }
 
-    for(auto const& md : iModDeps) {
-      unsigned int fromIndex =indexForModule(md.first,modsToIndex,indexToMods);
-      for( auto const& dependsOn: md.second) {
-        unsigned int toIndex = indexForModule(dependsOn,modsToIndex,indexToMods);
-        
+    for (auto const& md : iModDeps) {
+      unsigned int fromIndex = indexForModule(md.first, modsToIndex, indexToMods);
+      for (auto const& dependsOn : md.second) {
+        unsigned int toIndex = indexForModule(dependsOn, modsToIndex, indexToMods);
+
         //see if all paths containing this module also contain the dependent module earlier in the path
         // if it does, then treat this only as a path dependency and not a data dependency as this
         // simplifies the circular dependency checking logic
 
         auto itPathsFound = moduleIndexToPathIndex.find(fromIndex);
         bool keepDataDependency = true;
-        if(itPathsFound != moduleIndexToPathIndex.end() and moduleIndexToPathIndex.find(toIndex) != moduleIndexToPathIndex.end()) {
+        if (itPathsFound != moduleIndexToPathIndex.end() and
+            moduleIndexToPathIndex.find(toIndex) != moduleIndexToPathIndex.end()) {
           keepDataDependency = false;
-          for(auto const pathIndex: itPathsFound->second) {
-            for(auto idToCheck: pathIndexToModuleIndexOrder[pathIndex]) {
-              if(idToCheck == toIndex) {
+          for (auto const pathIndex : itPathsFound->second) {
+            for (auto idToCheck : pathIndexToModuleIndexOrder[pathIndex]) {
+              if (idToCheck == toIndex) {
                 //found dependent module first so check next path
                 break;
               }
-              if(idToCheck == fromIndex) {
+              if (idToCheck == fromIndex) {
                 //did not find dependent module earlier on path so
                 // must keep data dependency
                 keepDataDependency = true;
                 break;
               }
             }
-            if(keepDataDependency) {
+            if (keepDataDependency) {
               break;
             }
           }
         }
-        if(keepDataDependency) {
+        if (keepDataDependency) {
           edgeToPathMap[std::make_pair(fromIndex, toIndex)].push_back(kDataDependencyIndex);
         }
       }
     }
 
     throwIfImproperDependencies(edgeToPathMap, pathIndexToModuleIndexOrder, pathNames, indexToMods);
-    
+
     return true;
-    
   }
 };
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(test_throwIfImproperDependencies);
 
-
-void test_throwIfImproperDependencies::onePathNoCycleTest()
-{
+void test_throwIfImproperDependencies::onePathNoCycleTest() {
   {
-    ModuleDependsOnMap md = { {"C", {"B"} },
-                              {"B", {"A" } } };
-    PathToModules paths = { {"p", {"A", "B", "C" } } };
-    
-    CPPUNIT_ASSERT( testCase(md,paths));
+    ModuleDependsOnMap md = {{"C", {"B"}}, {"B", {"A"}}};
+    PathToModules paths = {{"p", {"A", "B", "C"}}};
+
+    CPPUNIT_ASSERT(testCase(md, paths));
   }
-  
+
   {
-    ModuleDependsOnMap md = { };
-    PathToModules paths = { {"p", {"A", "B", "C" } } };
-    
-    CPPUNIT_ASSERT( testCase(md,paths));
+    ModuleDependsOnMap md = {};
+    PathToModules paths = {{"p", {"A", "B", "C"}}};
+
+    CPPUNIT_ASSERT(testCase(md, paths));
   }
-  
+
   {
     //Circular dependency but not connected to any path
     // NOTE: "A" is on the list since the ROOT of the
     // tree in the job is actually TriggerResults which
     // always connects to paths and end paths
-    ModuleDependsOnMap md = { {"E", {"F"} },
-      {"F", {"G"} },
-      {"G", {"E"} },
-      {"A",{}}};
-    PathToModules paths = { {"p", {"A", "B", "C" } } };
-    
-    CPPUNIT_ASSERT( testCase(md,paths));
-  }
+    ModuleDependsOnMap md = {{"E", {"F"}}, {"F", {"G"}}, {"G", {"E"}}, {"A", {}}};
+    PathToModules paths = {{"p", {"A", "B", "C"}}};
 
+    CPPUNIT_ASSERT(testCase(md, paths));
+  }
 }
 
-void test_throwIfImproperDependencies::onePathHasCycleTest()
-{
+void test_throwIfImproperDependencies::onePathHasCycleTest() {
   {
-    ModuleDependsOnMap md = { {"C", {"B"} },
-      {"B", {"A" } } };
+    ModuleDependsOnMap md = {{"C", {"B"}}, {"B", {"A"}}};
     {
-      PathToModules paths = { {"p", {"B", "A", "C" } } };
-    
-      CPPUNIT_ASSERT_THROW( testCase(md,paths), cms::Exception);
+      PathToModules paths = {{"p", {"B", "A", "C"}}};
+
+      CPPUNIT_ASSERT_THROW(testCase(md, paths), cms::Exception);
     }
     {
-      PathToModules paths = { {"p", {"B", "A" } } };
-      
-      CPPUNIT_ASSERT_THROW( testCase(md,paths), cms::Exception);
+      PathToModules paths = {{"p", {"B", "A"}}};
+
+      CPPUNIT_ASSERT_THROW(testCase(md, paths), cms::Exception);
     }
     {
-      PathToModules paths = { {"p", {"C", "A" } } };
-      
-      CPPUNIT_ASSERT_THROW( testCase(md,paths), cms::Exception);
+      PathToModules paths = {{"p", {"C", "A"}}};
+
+      CPPUNIT_ASSERT_THROW(testCase(md, paths), cms::Exception);
     }
     {
-      PathToModules paths = { {"p", {"C", "B" } } };
-      
-      CPPUNIT_ASSERT_THROW( testCase(md,paths), cms::Exception);
-    }
+      PathToModules paths = {{"p", {"C", "B"}}};
 
+      CPPUNIT_ASSERT_THROW(testCase(md, paths), cms::Exception);
+    }
   }
-  
+
   {
-    ModuleDependsOnMap md = { {"C", {"B"} } };
+    ModuleDependsOnMap md = {{"C", {"B"}}};
     {
-      PathToModules paths = { {"p", {"C", "A", "B" } } };
-      
-      CPPUNIT_ASSERT_THROW( testCase(md,paths), cms::Exception);
+      PathToModules paths = {{"p", {"C", "A", "B"}}};
+
+      CPPUNIT_ASSERT_THROW(testCase(md, paths), cms::Exception);
     }
     {
-      PathToModules paths = { {"p", {"A", "C", "B" } } };
-      
-      CPPUNIT_ASSERT_THROW( testCase(md,paths), cms::Exception);
+      PathToModules paths = {{"p", {"A", "C", "B"}}};
+
+      CPPUNIT_ASSERT_THROW(testCase(md, paths), cms::Exception);
     }
     {
-      PathToModules paths = { {"p", {"C", "B", "A" } } };
-      
-      CPPUNIT_ASSERT_THROW( testCase(md,paths), cms::Exception);
+      PathToModules paths = {{"p", {"C", "B", "A"}}};
+
+      CPPUNIT_ASSERT_THROW(testCase(md, paths), cms::Exception);
     }
   }
-
 }
 
-void test_throwIfImproperDependencies::twoPathsNoCycleTest()
-{
+void test_throwIfImproperDependencies::twoPathsNoCycleTest() {
   {
-    ModuleDependsOnMap md = { {"C", {"B"} } };
+    ModuleDependsOnMap md = {{"C", {"B"}}};
 
     {
-      PathToModules paths = { {"p1", {"A", "B", "C" } },
-                              {"p2", {"A", "B","C"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"A", "B", "C"}}, {"p2", {"A", "B", "C"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
 
     {
       //CDJ DEBUG THIS IS NOW FAILING
-      PathToModules paths = { {"p1", {"A", "B", "C" } },
-                              {"p2", {"B", "A","C"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"A", "B", "C"}}, {"p2", {"B", "A", "C"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
     {
-      PathToModules paths = { {"p1", {"A", "B", "C" } },
-                              {"p2", {"B", "C","A"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"A", "B", "C"}}, {"p2", {"B", "C", "A"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
     {
-      PathToModules paths = { {"p1", {"B", "A", "C" } },
-                              {"p2", {"A", "B","C"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"B", "A", "C"}}, {"p2", {"A", "B", "C"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
     {
-      PathToModules paths = { {"p1", {"B", "A", "C" } },
-                              {"p2", {"B", "A","C"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"B", "A", "C"}}, {"p2", {"B", "A", "C"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
     {
-      PathToModules paths = { {"p1", {"B", "A", "C" } },
-                              {"p2", {"B", "C","A"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"B", "A", "C"}}, {"p2", {"B", "C", "A"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
     {
-      PathToModules paths = { {"p1", {"B", "C", "A" } },
-                              {"p2", {"A", "B","C"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"B", "C", "A"}}, {"p2", {"A", "B", "C"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
     {
-      PathToModules paths = { {"p1", {"B", "C", "A" } },
-                              {"p2", {"B", "A","C"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"B", "C", "A"}}, {"p2", {"B", "A", "C"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
     {
-      PathToModules paths = { {"p1", {"B", "C", "A" } },
-                              {"p2", {"B", "C","A"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"B", "C", "A"}}, {"p2", {"B", "C", "A"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
   }
-  
+
   {
     //Test all possible 3 module combinations
     ModuleDependsOnMap md = {};
-    std::vector<std::string> moduleName = {"A","B","C"};
+    std::vector<std::string> moduleName = {"A", "B", "C"};
     std::vector<std::string> pathModules;
-    for(unsigned int i=0; i<3; ++i) {
+    for (unsigned int i = 0; i < 3; ++i) {
       pathModules.push_back(moduleName[i]);
-      for(unsigned int j=0; j<3; ++j) {
-        if(j == i) {continue;}
+      for (unsigned int j = 0; j < 3; ++j) {
+        if (j == i) {
+          continue;
+        }
         pathModules.push_back(moduleName[j]);
-        for(unsigned int k=0; k<3; ++k) {
-          if(j==k or i ==k) {continue;}
+        for (unsigned int k = 0; k < 3; ++k) {
+          if (j == k or i == k) {
+            continue;
+          }
           pathModules.push_back(moduleName[k]);
 
           std::vector<std::string> path2Modules;
-          for(unsigned int i=0; i<3; ++i) {
+          for (unsigned int i = 0; i < 3; ++i) {
             path2Modules.push_back(moduleName[i]);
-            for(unsigned int j=0; j<3; ++j) {
-              if(j == i) {continue;}
+            for (unsigned int j = 0; j < 3; ++j) {
+              if (j == i) {
+                continue;
+              }
               path2Modules.push_back(moduleName[j]);
-              for(unsigned int k=0; k<3; ++k) {
-                if(j==k or i ==k) {continue;}
+              for (unsigned int k = 0; k < 3; ++k) {
+                if (j == k or i == k) {
+                  continue;
+                }
                 path2Modules.push_back(moduleName[k]);
                 PathToModules paths;
-                paths["p1"]=pathModules;
-                paths["p2"]=path2Modules;
-                CPPUNIT_ASSERT( testCase(md,paths));
+                paths["p1"] = pathModules;
+                paths["p2"] = path2Modules;
+                CPPUNIT_ASSERT(testCase(md, paths));
                 path2Modules.pop_back();
               }
               path2Modules.pop_back();
             }
             path2Modules.pop_back();
           }
-          
+
           pathModules.pop_back();
         }
         pathModules.pop_back();
@@ -339,182 +324,130 @@ void test_throwIfImproperDependencies::twoPathsNoCycleTest()
       pathModules.pop_back();
     }
   }
-  
+
   {
-    ModuleDependsOnMap md = { {"C", {"B"} },
-                              {"B", {"A"}},
-                              {"D", {"C"}} };
-    
+    ModuleDependsOnMap md = {{"C", {"B"}}, {"B", {"A"}}, {"D", {"C"}}};
+
     {
-      PathToModules paths = { {"p1", {"A", "C" } },
-                              {"p2", {"B","D"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"A", "C"}}, {"p2", {"B", "D"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
 
     {
-      PathToModules paths = { {"p1", {"A", "D" } },
-                              {"p2", {"B","C"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"A", "D"}}, {"p2", {"B", "C"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
     {
-      PathToModules paths = { {"p1", {"A", "B" } },
-                              {"p2", {"C","D"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"A", "B"}}, {"p2", {"C", "D"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
 
     {
-      PathToModules paths = { {"p1", {"A"} },
-                              {"p2", {"C","D"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"A"}}, {"p2", {"C", "D"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
     {
-      PathToModules paths = { {"p1", {"A"} },
-                              {"p2", {"D"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"A"}}, {"p2", {"D"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
     {
-      PathToModules paths = { {"p1", {"A"} },
-                              {"p2", {"C"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"A"}}, {"p2", {"C"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
-    
+
     {
-      PathToModules paths = { {"p1", {"B" } },
-                              {"p2", {"D"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"B"}}, {"p2", {"D"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
 
     {
-      PathToModules paths = { {"p1", {"B" } },
-                              {"p2", {"C"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"B"}}, {"p2", {"C"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
     {
-      PathToModules paths = { {"p1", {"C" } },
-                              {"p2", {"D"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"C"}}, {"p2", {"D"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
 
     {
-      PathToModules paths = { {"p1", {"A", "C" } },
-                              {"p2", {"A","D"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
+      PathToModules paths = {{"p1", {"A", "C"}}, {"p2", {"A", "D"}}};
+
+      CPPUNIT_ASSERT(testCase(md, paths));
     }
     {
-      PathToModules paths = { {"p1", {"A", "C" } },
-                              {"p2", {"A","D"} } };
-      
-      CPPUNIT_ASSERT( testCase(md,paths));
-    }
+      PathToModules paths = {{"p1", {"A", "C"}}, {"p2", {"A", "D"}}};
 
+      CPPUNIT_ASSERT(testCase(md, paths));
+    }
   }
-  
+
   {
-    ModuleDependsOnMap md = { {"B", {"C"} },
-      {"D", {"A" } } };
-    PathToModules paths = { {"p1", {"A", "B" } },
-      {"p2", {"C","D"}} };
-    
-    CPPUNIT_ASSERT( testCase(md,paths));
+    ModuleDependsOnMap md = {{"B", {"C"}}, {"D", {"A"}}};
+    PathToModules paths = {{"p1", {"A", "B"}}, {"p2", {"C", "D"}}};
+
+    CPPUNIT_ASSERT(testCase(md, paths));
   }
 
   {
-    ModuleDependsOnMap md = { {"B", {"E"} },
-      {"E", {"C"}},
-      {"D", {"F" }},
-      {"F", {"A"}}};
-    PathToModules paths = { {"p1", {"A", "B" } },
-      {"p2", {"C","D"}} };
-    
-    CPPUNIT_ASSERT(testCase(md,paths));
+    ModuleDependsOnMap md = {{"B", {"E"}}, {"E", {"C"}}, {"D", {"F"}}, {"F", {"A"}}};
+    PathToModules paths = {{"p1", {"A", "B"}}, {"p2", {"C", "D"}}};
+
+    CPPUNIT_ASSERT(testCase(md, paths));
   }
 
   {
-    ModuleDependsOnMap md = { {"B", {"E"} },
-      {"E", {"C"}},
-      {"D", {"E" }},
-      {"E", {"A"}}};
-    PathToModules paths = { {"p1", {"A", "B"} },
-                            {"p2", {"C","D"}} };
-    
-    CPPUNIT_ASSERT( testCase(md,paths));
+    ModuleDependsOnMap md = {{"B", {"E"}}, {"E", {"C"}}, {"D", {"E"}}, {"E", {"A"}}};
+    PathToModules paths = {{"p1", {"A", "B"}}, {"p2", {"C", "D"}}};
+
+    CPPUNIT_ASSERT(testCase(md, paths));
   }
 
   {
-    ModuleDependsOnMap md = { {"B", {"E"}},
-                              {"C", {"E"}},
-                              {"D", {"E"}},
-                              {"A", {"E"}} };
-    PathToModules paths = { {"p1", {"A", "B"} },
-                            {"p2", {"C","D"}} };
-    
-    CPPUNIT_ASSERT( testCase(md,paths));
+    ModuleDependsOnMap md = {{"B", {"E"}}, {"C", {"E"}}, {"D", {"E"}}, {"A", {"E"}}};
+    PathToModules paths = {{"p1", {"A", "B"}}, {"p2", {"C", "D"}}};
+
+    CPPUNIT_ASSERT(testCase(md, paths));
   }
 
   {
     //Simplified schedule which was failing
-    ModuleDependsOnMap md = {{"H", {"A"}} };
-    PathToModules paths = {
-      {"reco", {"I", "A","H","G","F","E"} },
-      {"val", {"E","D","C","B","A"}} };
-  
-  CPPUNIT_ASSERT( testCase(md,paths));
+    ModuleDependsOnMap md = {{"H", {"A"}}};
+    PathToModules paths = {{"reco", {"I", "A", "H", "G", "F", "E"}}, {"val", {"E", "D", "C", "B", "A"}}};
+
+    CPPUNIT_ASSERT(testCase(md, paths));
   }
 
   {
     //Simplified schedule which was failing
-    ModuleDependsOnMap md = {
-      {"B", {"X"}},
-      {"Y", {"Z"}},
-      {"Z", {"A"}} };
-    PathToModules paths = {
-      {"p1", {"X", "B","A"}},
-      {"p2", {"A","Z","?","Y","X"}} };
-    
-    CPPUNIT_ASSERT( testCase(md,paths));
+    ModuleDependsOnMap md = {{"B", {"X"}}, {"Y", {"Z"}}, {"Z", {"A"}}};
+    PathToModules paths = {{"p1", {"X", "B", "A"}}, {"p2", {"A", "Z", "?", "Y", "X"}}};
+
+    CPPUNIT_ASSERT(testCase(md, paths));
   }
   {
     //Simplified schedule which was failing
-    ModuleDependsOnMap md = {
-      {"B", {"X"}},
-      {"Y", {"Z"}},
-      {"Z", {"A"}},
-      {"?", {}},
-      {"A", {}},
-      {"X",{}}
-    };
-    PathToModules paths = {
-      {"p1", {"X", "B","A"}},
-      {"p2", {"A","Z","?","Y","X"}} };
-    CPPUNIT_ASSERT( testCase(md,paths));
+    ModuleDependsOnMap md = {{"B", {"X"}}, {"Y", {"Z"}}, {"Z", {"A"}}, {"?", {}}, {"A", {}}, {"X", {}}};
+    PathToModules paths = {{"p1", {"X", "B", "A"}}, {"p2", {"A", "Z", "?", "Y", "X"}}};
+    CPPUNIT_ASSERT(testCase(md, paths));
   }
-  
+
   {
     //Simplified schedule which was failing
     // The data dependency for 'D" can be met
     // by the order of modules on path p2
-    ModuleDependsOnMap md = {
-      {"A_TR", {"zEP1","zEP2"}},
-      {"D", {"B"}},
-      {"E", {"D"}},
-      {"zSEP3", {"A_TR"}}
-    };
-    PathToModules paths = {
-      {"p1", {"E","F","zEP1"}},
-      {"p2", {"B","C","D","zEP2"}},
-      {"p3", {"zSEP3","B","zEP3"}} };
-    
-    CPPUNIT_ASSERT( testCase(md,paths));
+    ModuleDependsOnMap md = {{"A_TR", {"zEP1", "zEP2"}}, {"D", {"B"}}, {"E", {"D"}}, {"zSEP3", {"A_TR"}}};
+    PathToModules paths = {{"p1", {"E", "F", "zEP1"}}, {"p2", {"B", "C", "D", "zEP2"}}, {"p3", {"zSEP3", "B", "zEP3"}}};
+
+    CPPUNIT_ASSERT(testCase(md, paths));
   }
 
   {
@@ -522,183 +455,121 @@ void test_throwIfImproperDependencies::twoPathsNoCycleTest()
     // Check that the framework does not get confused when jumping
     // from one path to the other path just because of the
     // TriggerResults connection.
-    
-    ModuleDependsOnMap md = {
-      {"A_TR", {"zEP1"}},
-      {"A", {"B"}},
-      {"B", {"H"}},
-      {"C", {}},
-      {"D" ,{}},
-      {"E" , {}},
-      {"G",{"D"}},
-      {"H",{"D"}},
-      {"zEP1", {}},
-      {"zSEP2", {"A_TR"}}
-    };
-    PathToModules paths = {
-      {"p2", {"D", "G","H","B","C","zEP1"}},
-      {"p3", {"A"}}, //Needed to make graph search start here
-      {"p1", {"zSEP2","E","D","G","H","B", "C"}} };
-  
-    
-    CPPUNIT_ASSERT( testCase(md,paths));
-    
+
+    ModuleDependsOnMap md = {{"A_TR", {"zEP1"}},
+                             {"A", {"B"}},
+                             {"B", {"H"}},
+                             {"C", {}},
+                             {"D", {}},
+                             {"E", {}},
+                             {"G", {"D"}},
+                             {"H", {"D"}},
+                             {"zEP1", {}},
+                             {"zSEP2", {"A_TR"}}};
+    PathToModules paths = {{"p2", {"D", "G", "H", "B", "C", "zEP1"}},
+                           {"p3", {"A"}},  //Needed to make graph search start here
+                           {"p1", {"zSEP2", "E", "D", "G", "H", "B", "C"}}};
+
+    CPPUNIT_ASSERT(testCase(md, paths));
   }
 }
 
-void test_throwIfImproperDependencies::twoPathsWithCycleTest()
-{
-  
+void test_throwIfImproperDependencies::twoPathsWithCycleTest() {
   {
-    ModuleDependsOnMap md = { {"C", {"B"}},
-                              {"A", {"D"}} };
-    PathToModules paths = { {"p1", {"A","B"}},
-                            {"p2", {"C","D"}} };
-    
-    CPPUNIT_ASSERT_THROW( testCase(md,paths), cms::Exception);
+    ModuleDependsOnMap md = {{"C", {"B"}}, {"A", {"D"}}};
+    PathToModules paths = {{"p1", {"A", "B"}}, {"p2", {"C", "D"}}};
+
+    CPPUNIT_ASSERT_THROW(testCase(md, paths), cms::Exception);
   }
 
   {
     //Add additional dependencies to test that they are ignored
-    ModuleDependsOnMap md = {
-      {"C", {"E","F","G","B"}},
-      {"A", {"D"}} };
-    PathToModules paths = {
-      {"p1", {"A","B"}},
-      {"p2", {"C","D"}} };
-    
-    CPPUNIT_ASSERT_THROW( testCase(md,paths), cms::Exception);
+    ModuleDependsOnMap md = {{"C", {"E", "F", "G", "B"}}, {"A", {"D"}}};
+    PathToModules paths = {{"p1", {"A", "B"}}, {"p2", {"C", "D"}}};
+
+    CPPUNIT_ASSERT_THROW(testCase(md, paths), cms::Exception);
   }
 
   {
-    ModuleDependsOnMap md = { {"C", {"B"}},
-                              {"A", {"D"}} };
-    PathToModules paths = { {"p1", {"A","B"}},
-                            {"p2", {"C","D", "A"}} };
-    
-    CPPUNIT_ASSERT_THROW( testCase(md,paths), cms::Exception);
+    ModuleDependsOnMap md = {{"C", {"B"}}, {"A", {"D"}}};
+    PathToModules paths = {{"p1", {"A", "B"}}, {"p2", {"C", "D", "A"}}};
+
+    CPPUNIT_ASSERT_THROW(testCase(md, paths), cms::Exception);
   }
 
   {
-    ModuleDependsOnMap md = { {"C", {"B"}},
-                              {"A", {"D"}},
-                              {"B", {"A"}},
-                              {"D", {"C"}} };
-    PathToModules paths = { {"p1", {"A","B"}},
-                            {"p2", {"C","D"}} };
-    
-    CPPUNIT_ASSERT_THROW( testCase(md,paths), cms::Exception);
+    ModuleDependsOnMap md = {{"C", {"B"}}, {"A", {"D"}}, {"B", {"A"}}, {"D", {"C"}}};
+    PathToModules paths = {{"p1", {"A", "B"}}, {"p2", {"C", "D"}}};
+
+    CPPUNIT_ASSERT_THROW(testCase(md, paths), cms::Exception);
   }
 
   {
-    ModuleDependsOnMap md = { {"E", {"B"} },
-                              {"C", {"E"}},
-                              {"A", {"D"}}};
-    PathToModules paths = { {"p1", {"A", "B" } },
-                            {"p2", {"C","D"}} };
-    
-    CPPUNIT_ASSERT_THROW( testCase(md,paths), cms::Exception);
+    ModuleDependsOnMap md = {{"E", {"B"}}, {"C", {"E"}}, {"A", {"D"}}};
+    PathToModules paths = {{"p1", {"A", "B"}}, {"p2", {"C", "D"}}};
+
+    CPPUNIT_ASSERT_THROW(testCase(md, paths), cms::Exception);
   }
 
   {
-    ModuleDependsOnMap md = { {"A", {"B"} },
-      {"B", {"C"}},
-      {"C", {"D"}},
-      {"D",{"B"}}};
-    PathToModules paths = { {"p1", {"A","EP"} } };
-    
-    CPPUNIT_ASSERT_THROW( testCase(md,paths), cms::Exception);
+    ModuleDependsOnMap md = {{"A", {"B"}}, {"B", {"C"}}, {"C", {"D"}}, {"D", {"B"}}};
+    PathToModules paths = {{"p1", {"A", "EP"}}};
+
+    CPPUNIT_ASSERT_THROW(testCase(md, paths), cms::Exception);
   }
 
-  
   {
     //Simplified schedule which was failing
-    ModuleDependsOnMap md = {
-      {"B", {"X"}},
-      {"Y", {"Z"}},
-      {"Z", {"A"}},
-      {"?", {}},
-      {"A", {}},
-      {"X",{}}
-    };
+    ModuleDependsOnMap md = {{"B", {"X"}}, {"Y", {"Z"}}, {"Z", {"A"}}, {"?", {}}, {"A", {}}, {"X", {}}};
     //NOTE: p1 is inconsistent but with p2 it would be runnable.
-    PathToModules paths = {
-      {"p1", {"B","A", "X"}},
-      {"p2", {"A","Z","?","Y","X"}} };
-    CPPUNIT_ASSERT_THROW( testCase(md,paths), cms::Exception);
+    PathToModules paths = {{"p1", {"B", "A", "X"}}, {"p2", {"A", "Z", "?", "Y", "X"}}};
+    CPPUNIT_ASSERT_THROW(testCase(md, paths), cms::Exception);
   }
 
   {
-    ModuleDependsOnMap md = {
-      {"A_TR", {"EP1","EP2"}}, //assigned aTR==0, EP1==1, EP2==2
-      {"C", {"A"}},
-      {"D", {"A"}},
-      {"E",{"D"}},
-      {"BP",{"A_TR"}}
-    };
-    
-    PathToModules paths = {
-      {"p1", {"A","B", "C","EP1"}},
-      {"p2", {"E","EP2"}},
-      {"ep", {"BP","A","D"}}
-    };
-    CPPUNIT_ASSERT_THROW( testCase(md,paths), cms::Exception);
+    ModuleDependsOnMap md = {{"A_TR", {"EP1", "EP2"}},  //assigned aTR==0, EP1==1, EP2==2
+                             {"C", {"A"}},
+                             {"D", {"A"}},
+                             {"E", {"D"}},
+                             {"BP", {"A_TR"}}};
+
+    PathToModules paths = {{"p1", {"A", "B", "C", "EP1"}}, {"p2", {"E", "EP2"}}, {"ep", {"BP", "A", "D"}}};
+    CPPUNIT_ASSERT_THROW(testCase(md, paths), cms::Exception);
   }
-  
+
   {
     // The data dependency for 'D" can be met
     // by the order of modules on path p2
     // but NOT by path3
-    ModuleDependsOnMap md = {
-      {"A_TR", {"zEP1","zEP2","zEP3"}},
-      {"D", {"B"}},
-      {"E", {"D"}},
-      {"zSEP4", {"A_TR"}}
-    };
-    PathToModules paths = {
-      {"p1", {"E","F","zEP1"}},
-      {"p2", {"Filter", "B","C","D","zEP2"}},
-      {"p3", {"C","D","zEP3"}},
-      {"p4", {"zSEP4","B","zEP4"}} };
-    
-    CPPUNIT_ASSERT_THROW( testCase(md,paths), cms::Exception);
+    ModuleDependsOnMap md = {{"A_TR", {"zEP1", "zEP2", "zEP3"}}, {"D", {"B"}}, {"E", {"D"}}, {"zSEP4", {"A_TR"}}};
+    PathToModules paths = {{"p1", {"E", "F", "zEP1"}},
+                           {"p2", {"Filter", "B", "C", "D", "zEP2"}},
+                           {"p3", {"C", "D", "zEP3"}},
+                           {"p4", {"zSEP4", "B", "zEP4"}}};
+
+    CPPUNIT_ASSERT_THROW(testCase(md, paths), cms::Exception);
   }
 
   {
     // The data dependency for 'D" can be met
     // by the order of modules on path p2
     // but NOT by path3
-    ModuleDependsOnMap md = {
-      {"A_TR", {"zEP1","zEP2","zEP3"}},
-      {"D", {"B"}},
-      {"E", {"D"}},
-      {"zSEP4", {"A_TR"}}
-    };
-    PathToModules paths = {
-      {"p1", {"E","F","zEP1"}},
-      {"p2", {"Filter", "B", "D","zEP2"}},
-      {"p3", {"C","D","zEP3"}},
-      {"p4", {"zSEP4","B","zEP4"}} };
-    
-    CPPUNIT_ASSERT_THROW( testCase(md,paths), cms::Exception);
+    ModuleDependsOnMap md = {{"A_TR", {"zEP1", "zEP2", "zEP3"}}, {"D", {"B"}}, {"E", {"D"}}, {"zSEP4", {"A_TR"}}};
+    PathToModules paths = {{"p1", {"E", "F", "zEP1"}},
+                           {"p2", {"Filter", "B", "D", "zEP2"}},
+                           {"p3", {"C", "D", "zEP3"}},
+                           {"p4", {"zSEP4", "B", "zEP4"}}};
+
+    CPPUNIT_ASSERT_THROW(testCase(md, paths), cms::Exception);
   }
 
   {
     // The data dependency for 'D" can be met
     // by the order of modules on path p2
     // but NOT by path3
-    ModuleDependsOnMap md = {
-      {"A_TR", {"zEP1","zEP2"}},
-      { "B",{}},
-      {"zFilter", {"A_TR"}}
-    };
-    PathToModules paths = {
-      {"p1", {"zFilter","B","zEP1"}},
-      {"p2", {"zFilter", "B","zEP2"}}
-    };
-    
-    CPPUNIT_ASSERT_THROW( testCase(md,paths), cms::Exception);
-  }
+    ModuleDependsOnMap md = {{"A_TR", {"zEP1", "zEP2"}}, {"B", {}}, {"zFilter", {"A_TR"}}};
+    PathToModules paths = {{"p1", {"zFilter", "B", "zEP1"}}, {"p2", {"zFilter", "B", "zEP2"}}};
 
+    CPPUNIT_ASSERT_THROW(testCase(md, paths), cms::Exception);
+  }
 }
-
diff --git a/FWCore/Integration/interface/ESTestData.h b/FWCore/Integration/interface/ESTestData.h
index 5739e0ebf7c81..19a6c93501af5 100644
--- a/FWCore/Integration/interface/ESTestData.h
+++ b/FWCore/Integration/interface/ESTestData.h
@@ -6,8 +6,9 @@ namespace edmtest {
   class ESTestDataA {
   public:
     ESTestDataA(int v) { value_ = v; }
-    int & value() { return value_; }
+    int& value() { return value_; }
     int const& value() const { return value_; }
+
   private:
     int value_;
   };
@@ -15,8 +16,9 @@ namespace edmtest {
   class ESTestDataB {
   public:
     ESTestDataB(int v = 0, int w = 0) { value_ = v + w; }
-    int & value() { return value_; }
+    int& value() { return value_; }
     int const& value() const { return value_; }
+
   private:
     int value_;
   };
@@ -24,8 +26,9 @@ namespace edmtest {
   class ESTestDataC {
   public:
     ESTestDataC(int v) { value_ = v; }
-    int & value() { return value_; }
+    int& value() { return value_; }
     int const& value() const { return value_; }
+
   private:
     int value_;
   };
@@ -33,8 +36,9 @@ namespace edmtest {
   class ESTestDataD {
   public:
     ESTestDataD(int v) { value_ = v; }
-    int & value() { return value_; }
+    int& value() { return value_; }
     int const& value() const { return value_; }
+
   private:
     int value_;
   };
@@ -42,8 +46,9 @@ namespace edmtest {
   class ESTestDataE {
   public:
     ESTestDataE(int v) { value_ = v; }
-    int & value() { return value_; }
+    int& value() { return value_; }
     int const& value() const { return value_; }
+
   private:
     int value_;
   };
@@ -51,8 +56,9 @@ namespace edmtest {
   class ESTestDataF {
   public:
     ESTestDataF(int v) { value_ = v; }
-    int & value() { return value_; }
+    int& value() { return value_; }
     int const& value() const { return value_; }
+
   private:
     int value_;
   };
@@ -60,8 +66,9 @@ namespace edmtest {
   class ESTestDataG {
   public:
     ESTestDataG(int v) { value_ = v; }
-    int & value() { return value_; }
+    int& value() { return value_; }
     int const& value() const { return value_; }
+
   private:
     int value_;
   };
@@ -69,8 +76,9 @@ namespace edmtest {
   class ESTestDataH {
   public:
     ESTestDataH(int v) { value_ = v; }
-    int & value() { return value_; }
+    int& value() { return value_; }
     int const& value() const { return value_; }
+
   private:
     int value_;
   };
@@ -78,8 +86,9 @@ namespace edmtest {
   class ESTestDataI {
   public:
     ESTestDataI(int v) { value_ = v; }
-    int & value() { return value_; }
+    int& value() { return value_; }
     int const& value() const { return value_; }
+
   private:
     int value_;
   };
@@ -87,8 +96,9 @@ namespace edmtest {
   class ESTestDataJ {
   public:
     ESTestDataJ(int v) { value_ = v; }
-    int & value() { return value_; }
+    int& value() { return value_; }
     int const& value() const { return value_; }
+
   private:
     int value_;
   };
@@ -96,8 +106,9 @@ namespace edmtest {
   class ESTestDataK {
   public:
     ESTestDataK(int v) { value_ = v; }
-    int & value() { return value_; }
+    int& value() { return value_; }
     int const& value() const { return value_; }
+
   private:
     int value_;
   };
@@ -105,10 +116,11 @@ namespace edmtest {
   class ESTestDataZ {
   public:
     ESTestDataZ(int v) { value_ = v; }
-    int & value() { return value_; }
+    int& value() { return value_; }
     int const& value() const { return value_; }
+
   private:
     int value_;
   };
-}
+}  // namespace edmtest
 #endif
diff --git a/FWCore/Integration/interface/ESTestRecords.h b/FWCore/Integration/interface/ESTestRecords.h
index 46eecb70d8d7c..ed26a4e312b7b 100644
--- a/FWCore/Integration/interface/ESTestRecords.h
+++ b/FWCore/Integration/interface/ESTestRecords.h
@@ -18,20 +18,22 @@ class ESTestRecordH : public edm::eventsetup::EventSetupRecordImplementation<EST
 
 class ESTestRecordE : public edm::eventsetup::EventSetupRecordImplementation<ESTestRecordE> {};
 
-class ESTestRecordD : public edm::eventsetup::DependentRecordImplementation<ESTestRecordD, boost::mpl::vector<ESTestRecordF,
-                                                                                                              ESTestRecordG,
-                                                                                                              ESTestRecordH> > {};
+class ESTestRecordD : public edm::eventsetup::DependentRecordImplementation<
+                          ESTestRecordD,
+                          boost::mpl::vector<ESTestRecordF, ESTestRecordG, ESTestRecordH> > {};
 
-class ESTestRecordB : public edm::eventsetup::DependentRecordImplementation<ESTestRecordB, boost::mpl::vector<ESTestRecordC,
-                                                                                                              ESTestRecordD,
-                                                                                                              ESTestRecordE> > {};
+class ESTestRecordB : public edm::eventsetup::DependentRecordImplementation<
+                          ESTestRecordB,
+                          boost::mpl::vector<ESTestRecordC, ESTestRecordD, ESTestRecordE> > {};
 
 class ESTestRecordZ : public edm::eventsetup::EventSetupRecordImplementation<ESTestRecordZ> {};
 
 class ESTestRecordK : public edm::eventsetup::EventSetupRecordImplementation<ESTestRecordK> {};
 
-class ESTestRecordI : public edm::eventsetup::DependentRecordImplementation<ESTestRecordI, boost::mpl::vector<ESTestRecordK> > {};
+class ESTestRecordI
+    : public edm::eventsetup::DependentRecordImplementation<ESTestRecordI, boost::mpl::vector<ESTestRecordK> > {};
 
-class ESTestRecordJ : public edm::eventsetup::DependentRecordImplementation<ESTestRecordJ, boost::mpl::vector<ESTestRecordK> > {};
+class ESTestRecordJ
+    : public edm::eventsetup::DependentRecordImplementation<ESTestRecordJ, boost::mpl::vector<ESTestRecordK> > {};
 
 #endif
diff --git a/FWCore/Integration/test/AcquireIntFilter.cc b/FWCore/Integration/test/AcquireIntFilter.cc
index 46e384cdf3c00..c9c5d20ce581f 100644
--- a/FWCore/Integration/test/AcquireIntFilter.cc
+++ b/FWCore/Integration/test/AcquireIntFilter.cc
@@ -20,23 +20,23 @@ namespace edm {
 
 namespace edmtest {
 
-  class AcquireIntFilter : public edm::global::EDFilter<edm::ExternalWork,
-                                                        edm::StreamCache<test_acquire::Cache>> {
+  class AcquireIntFilter : public edm::global::EDFilter<edm::ExternalWork, edm::StreamCache<test_acquire::Cache>> {
   public:
-
     explicit AcquireIntFilter(edm::ParameterSet const& pset);
     ~AcquireIntFilter() override;
 
     std::unique_ptr<test_acquire::Cache> beginStream(edm::StreamID) const override;
 
-    void acquire(edm::StreamID, edm::Event const&, edm::EventSetup const&, edm::WaitingTaskWithArenaHolder) const override;
+    void acquire(edm::StreamID,
+                 edm::Event const&,
+                 edm::EventSetup const&,
+                 edm::WaitingTaskWithArenaHolder) const override;
 
     bool filter(edm::StreamID, edm::Event&, edm::EventSetup const&) const override;
 
     void endJob() override;
 
   private:
-
     void preallocate(edm::PreallocationConfiguration const&) override;
 
     std::vector<edm::EDGetTokenT<IntProduct>> m_tokens;
@@ -46,10 +46,9 @@ namespace edmtest {
     const unsigned int m_secondsToWaitForWork;
   };
 
-  AcquireIntFilter::AcquireIntFilter(edm::ParameterSet const& pset) :
-    m_numberOfStreamsToAccumulate(pset.getUntrackedParameter<unsigned int>("streamsToAccumulate", 8)),
-    m_secondsToWaitForWork(pset.getUntrackedParameter<unsigned int>("secondsToWaitForWork",1))
- {
+  AcquireIntFilter::AcquireIntFilter(edm::ParameterSet const& pset)
+      : m_numberOfStreamsToAccumulate(pset.getUntrackedParameter<unsigned int>("streamsToAccumulate", 8)),
+        m_secondsToWaitForWork(pset.getUntrackedParameter<unsigned int>("secondsToWaitForWork", 1)) {
     for (auto const& tag : pset.getParameter<std::vector<edm::InputTag>>("tags")) {
       m_tokens.emplace_back(consumes<IntProduct>(tag));
     }
@@ -58,16 +57,14 @@ namespace edmtest {
   }
 
   AcquireIntFilter::~AcquireIntFilter() {
-    if(m_server) {
+    if (m_server) {
       m_server->stop();
     }
   }
 
   void AcquireIntFilter::preallocate(edm::PreallocationConfiguration const& iPrealloc) {
-
-    m_server = std::make_unique<test_acquire::WaitingServer>(iPrealloc.numberOfStreams(),
-                                                             m_numberOfStreamsToAccumulate,
-                                                             m_secondsToWaitForWork);
+    m_server = std::make_unique<test_acquire::WaitingServer>(
+        iPrealloc.numberOfStreams(), m_numberOfStreamsToAccumulate, m_secondsToWaitForWork);
     m_server->start();
   }
 
@@ -79,21 +76,18 @@ namespace edmtest {
                                  edm::Event const& event,
                                  edm::EventSetup const&,
                                  edm::WaitingTaskWithArenaHolder holder) const {
-
     test_acquire::Cache* streamCacheData = streamCache(streamID);
     streamCacheData->retrieved().clear();
     streamCacheData->processed().clear();
 
-    for(auto const& token: m_tokens) {
+    for (auto const& token : m_tokens) {
       streamCacheData->retrieved().push_back(event.get(token).value);
     }
 
     m_server->requestValuesAsync(streamID, &streamCacheData->retrieved(), &streamCacheData->processed(), holder);
   }
 
-  bool AcquireIntFilter::filter(edm::StreamID streamID,
-                                edm::Event& event,
-                                edm::EventSetup const&) const {
+  bool AcquireIntFilter::filter(edm::StreamID streamID, edm::Event& event, edm::EventSetup const&) const {
     int sum = 0;
     for (auto v : streamCache(streamID)->processed()) {
       sum += v;
@@ -101,18 +95,18 @@ namespace edmtest {
     event.put(std::make_unique<IntProduct>(sum));
 
     // This part is here only for the Parentage test.
-    (void) event.get(m_tokenForProduce);
+    (void)event.get(m_tokenForProduce);
 
     return true;
   }
 
   void AcquireIntFilter::endJob() {
-    if(m_server) {
+    if (m_server) {
       m_server->stop();
     }
     m_server.reset();
   }
-}
+}  // namespace edmtest
 
 using edmtest::AcquireIntFilter;
 DEFINE_FWK_MODULE(AcquireIntFilter);
diff --git a/FWCore/Integration/test/AcquireIntProducer.cc b/FWCore/Integration/test/AcquireIntProducer.cc
index 50a5b7678ebbc..5053c8f77cce3 100644
--- a/FWCore/Integration/test/AcquireIntProducer.cc
+++ b/FWCore/Integration/test/AcquireIntProducer.cc
@@ -21,23 +21,23 @@ namespace edm {
 
 namespace edmtest {
 
-  class AcquireIntProducer : public edm::global::EDProducer<edm::ExternalWork,
-                                                            edm::StreamCache<test_acquire::Cache>> {
+  class AcquireIntProducer : public edm::global::EDProducer<edm::ExternalWork, edm::StreamCache<test_acquire::Cache>> {
   public:
-
     explicit AcquireIntProducer(edm::ParameterSet const& pset);
     ~AcquireIntProducer() override;
 
     std::unique_ptr<test_acquire::Cache> beginStream(edm::StreamID) const override;
 
-    void acquire(edm::StreamID, edm::Event const&, edm::EventSetup const&, edm::WaitingTaskWithArenaHolder) const override;
+    void acquire(edm::StreamID,
+                 edm::Event const&,
+                 edm::EventSetup const&,
+                 edm::WaitingTaskWithArenaHolder) const override;
 
     void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override;
 
     void endJob() override;
 
   private:
-
     void preallocate(edm::PreallocationConfiguration const&) override;
 
     std::vector<edm::EDGetTokenT<IntProduct>> m_tokens;
@@ -47,10 +47,9 @@ namespace edmtest {
     const unsigned int m_secondsToWaitForWork;
   };
 
-  AcquireIntProducer::AcquireIntProducer(edm::ParameterSet const& pset) :
-    m_numberOfStreamsToAccumulate(pset.getUntrackedParameter<unsigned int>("streamsToAccumulate", 8)),
-    m_secondsToWaitForWork(pset.getUntrackedParameter<unsigned int>("secondsToWaitForWork",1))
- {
+  AcquireIntProducer::AcquireIntProducer(edm::ParameterSet const& pset)
+      : m_numberOfStreamsToAccumulate(pset.getUntrackedParameter<unsigned int>("streamsToAccumulate", 8)),
+        m_secondsToWaitForWork(pset.getUntrackedParameter<unsigned int>("secondsToWaitForWork", 1)) {
     for (auto const& tag : pset.getParameter<std::vector<edm::InputTag>>("tags")) {
       m_tokens.emplace_back(consumes<IntProduct>(tag));
     }
@@ -59,16 +58,14 @@ namespace edmtest {
   }
 
   AcquireIntProducer::~AcquireIntProducer() {
-    if(m_server) {
+    if (m_server) {
       m_server->stop();
     }
   }
 
   void AcquireIntProducer::preallocate(edm::PreallocationConfiguration const& iPrealloc) {
-
-    m_server = std::make_unique<test_acquire::WaitingServer>(iPrealloc.numberOfStreams(),
-                                                             m_numberOfStreamsToAccumulate,
-                                                             m_secondsToWaitForWork);
+    m_server = std::make_unique<test_acquire::WaitingServer>(
+        iPrealloc.numberOfStreams(), m_numberOfStreamsToAccumulate, m_secondsToWaitForWork);
     m_server->start();
   }
 
@@ -86,18 +83,14 @@ namespace edmtest {
     streamCacheData->retrieved().clear();
     streamCacheData->processed().clear();
 
-    for(auto const& token: m_tokens) {
+    for (auto const& token : m_tokens) {
       streamCacheData->retrieved().push_back(event.get(token).value);
     }
-    m_server->requestValuesAsync(streamID.value(),
-                                 &streamCacheData->retrieved(),
-                                 &streamCacheData->processed(),
-                                 holder);
+    m_server->requestValuesAsync(
+        streamID.value(), &streamCacheData->retrieved(), &streamCacheData->processed(), holder);
   }
 
-  void AcquireIntProducer::produce(edm::StreamID streamID,
-                                   edm::Event& event,
-                                   edm::EventSetup const&) const {
+  void AcquireIntProducer::produce(edm::StreamID streamID, edm::Event& event, edm::EventSetup const&) const {
     usleep(1000000);
 
     int sum = 0;
@@ -107,16 +100,16 @@ namespace edmtest {
     event.put(std::make_unique<IntProduct>(sum));
 
     // This part is here only for the Parentage test.
-    (void) event.get(m_tokenForProduce);
+    (void)event.get(m_tokenForProduce);
   }
 
   void AcquireIntProducer::endJob() {
-    if(m_server) {
+    if (m_server) {
       m_server->stop();
     }
     m_server.reset();
   }
-}
+}  // namespace edmtest
 
 using edmtest::AcquireIntProducer;
 DEFINE_FWK_MODULE(AcquireIntProducer);
diff --git a/FWCore/Integration/test/AcquireIntStreamFilter.cc b/FWCore/Integration/test/AcquireIntStreamFilter.cc
index 208e3595ba1c8..064c20e6afbcc 100644
--- a/FWCore/Integration/test/AcquireIntStreamFilter.cc
+++ b/FWCore/Integration/test/AcquireIntStreamFilter.cc
@@ -21,22 +21,19 @@ namespace edmtest {
 
   class AcquireIntStreamFilter : public edm::stream::EDFilter<edm::ExternalWork> {
   public:
-
     explicit AcquireIntStreamFilter(edm::ParameterSet const& pset);
     ~AcquireIntStreamFilter() override;
     void acquire(edm::Event const&, edm::EventSetup const&, edm::WaitingTaskWithArenaHolder) override;
     bool filter(edm::Event&, edm::EventSetup const&) override;
 
   private:
-
     std::vector<edm::EDGetTokenT<IntProduct>> m_getTokens;
     edm::EDGetTokenT<IntProduct> m_tokenForProduce;
     test_acquire::Token m_token;
   };
 
-  AcquireIntStreamFilter::AcquireIntStreamFilter(edm::ParameterSet const& pset) :
-    m_token{edm::Service<test_acquire::WaitingService>{}->getToken()}
-  {
+  AcquireIntStreamFilter::AcquireIntStreamFilter(edm::ParameterSet const& pset)
+      : m_token{edm::Service<test_acquire::WaitingService>{}->getToken()} {
     for (auto const& tag : pset.getParameter<std::vector<edm::InputTag>>("tags")) {
       m_getTokens.emplace_back(consumes<IntProduct>(tag));
     }
@@ -44,28 +41,24 @@ namespace edmtest {
     produces<IntProduct>();
   }
 
-  AcquireIntStreamFilter::~AcquireIntStreamFilter() { }
+  AcquireIntStreamFilter::~AcquireIntStreamFilter() {}
 
   void AcquireIntStreamFilter::acquire(edm::Event const& event,
                                        edm::EventSetup const&,
                                        edm::WaitingTaskWithArenaHolder holder) {
-
     test_acquire::Cache* cache = edm::Service<test_acquire::WaitingService>()->getCache(m_token);
     cache->retrieved().clear();
     cache->processed().clear();
 
-    for(auto const& token: m_getTokens) {
+    for (auto const& token : m_getTokens) {
       cache->retrieved().push_back(event.get(token).value);
     }
 
-    edm::Service<test_acquire::WaitingService>()->requestValuesAsync(m_token,
-                                                                     &cache->retrieved(),
-                                                                     &cache->processed(),
-                                                                     holder);
+    edm::Service<test_acquire::WaitingService>()->requestValuesAsync(
+        m_token, &cache->retrieved(), &cache->processed(), holder);
   }
 
-  bool AcquireIntStreamFilter::filter(edm::Event& event,
-                                      edm::EventSetup const&) {
+  bool AcquireIntStreamFilter::filter(edm::Event& event, edm::EventSetup const&) {
     int sum = 0;
     test_acquire::Cache* cache = edm::Service<test_acquire::WaitingService>()->getCache(m_token);
     for (auto v : cache->processed()) {
@@ -74,10 +67,10 @@ namespace edmtest {
     event.put(std::make_unique<IntProduct>(sum));
 
     // This part is here only for the Parentage test.
-    (void) event.get(m_tokenForProduce);
+    (void)event.get(m_tokenForProduce);
 
     return true;
   }
-}
+}  // namespace edmtest
 using edmtest::AcquireIntStreamFilter;
 DEFINE_FWK_MODULE(AcquireIntStreamFilter);
diff --git a/FWCore/Integration/test/AcquireIntStreamProducer.cc b/FWCore/Integration/test/AcquireIntStreamProducer.cc
index f0725f6a2ac7a..1aea30aaed69b 100644
--- a/FWCore/Integration/test/AcquireIntStreamProducer.cc
+++ b/FWCore/Integration/test/AcquireIntStreamProducer.cc
@@ -21,22 +21,19 @@ namespace edmtest {
 
   class AcquireIntStreamProducer : public edm::stream::EDProducer<edm::ExternalWork> {
   public:
-
     explicit AcquireIntStreamProducer(edm::ParameterSet const& pset);
     ~AcquireIntStreamProducer() override;
     void acquire(edm::Event const&, edm::EventSetup const&, edm::WaitingTaskWithArenaHolder) override;
     void produce(edm::Event&, edm::EventSetup const&) override;
 
   private:
-
     std::vector<edm::EDGetTokenT<IntProduct>> m_getTokens;
     edm::EDGetTokenT<IntProduct> m_tokenForProduce;
     test_acquire::Token m_token;
   };
 
-  AcquireIntStreamProducer::AcquireIntStreamProducer(edm::ParameterSet const& pset) :
-    m_token{edm::Service<test_acquire::WaitingService>{}->getToken()}
-  {
+  AcquireIntStreamProducer::AcquireIntStreamProducer(edm::ParameterSet const& pset)
+      : m_token{edm::Service<test_acquire::WaitingService>{}->getToken()} {
     for (auto const& tag : pset.getParameter<std::vector<edm::InputTag>>("tags")) {
       m_getTokens.emplace_back(consumes<IntProduct>(tag));
     }
@@ -44,28 +41,24 @@ namespace edmtest {
     produces<IntProduct>();
   }
 
-  AcquireIntStreamProducer::~AcquireIntStreamProducer() { }
+  AcquireIntStreamProducer::~AcquireIntStreamProducer() {}
 
   void AcquireIntStreamProducer::acquire(edm::Event const& event,
                                          edm::EventSetup const&,
                                          edm::WaitingTaskWithArenaHolder holder) {
-
     test_acquire::Cache* cache = edm::Service<test_acquire::WaitingService>()->getCache(m_token);
     cache->retrieved().clear();
     cache->processed().clear();
 
-    for(auto const& token: m_getTokens) {
+    for (auto const& token : m_getTokens) {
       cache->retrieved().push_back(event.get(token).value);
     }
 
-    edm::Service<test_acquire::WaitingService>()->requestValuesAsync(m_token,
-                                                                     &cache->retrieved(),
-                                                                     &cache->processed(),
-                                                                     holder);
+    edm::Service<test_acquire::WaitingService>()->requestValuesAsync(
+        m_token, &cache->retrieved(), &cache->processed(), holder);
   }
 
-  void AcquireIntStreamProducer::produce(edm::Event& event,
-                                         edm::EventSetup const&) {
+  void AcquireIntStreamProducer::produce(edm::Event& event, edm::EventSetup const&) {
     int sum = 0;
     test_acquire::Cache* cache = edm::Service<test_acquire::WaitingService>()->getCache(m_token);
     for (auto v : cache->processed()) {
@@ -74,8 +67,8 @@ namespace edmtest {
     event.put(std::make_unique<IntProduct>(sum));
 
     // This part is here only for the Parentage test.
-    (void) event.get(m_tokenForProduce);
+    (void)event.get(m_tokenForProduce);
   }
-}
+}  // namespace edmtest
 using edmtest::AcquireIntStreamProducer;
 DEFINE_FWK_MODULE(AcquireIntStreamProducer);
diff --git a/FWCore/Integration/test/AssociationMapAnalyzer.cc b/FWCore/Integration/test/AssociationMapAnalyzer.cc
index e9f103fd51eb1..acae3360a00e3 100644
--- a/FWCore/Integration/test/AssociationMapAnalyzer.cc
+++ b/FWCore/Integration/test/AssociationMapAnalyzer.cc
@@ -17,28 +17,26 @@
 namespace edm {
   class EventSetup;
   class StreamID;
-}
+}  // namespace edm
 
 namespace edmtest {
 
   class AssociationMapAnalyzer : public edm::global::EDAnalyzer<> {
   public:
-
-    typedef edm::AssociationMap<edm::OneToValue<std::vector<int>, double > > AssocOneToValue;
-    typedef edm::AssociationMap<edm::OneToOne<std::vector<int>, std::vector<int> > > AssocOneToOne;
-    typedef edm::AssociationMap<edm::OneToMany<std::vector<int>, std::vector<int> > > AssocOneToMany;
-    typedef edm::AssociationMap<edm::OneToManyWithQuality<std::vector<int>, std::vector<int>, double > > AssocOneToManyWithQuality;
-    typedef edm::AssociationMap<edm::OneToOne<edm::View<int>, edm::View<int> > > AssocOneToOneView;
+    typedef edm::AssociationMap<edm::OneToValue<std::vector<int>, double>> AssocOneToValue;
+    typedef edm::AssociationMap<edm::OneToOne<std::vector<int>, std::vector<int>>> AssocOneToOne;
+    typedef edm::AssociationMap<edm::OneToMany<std::vector<int>, std::vector<int>>> AssocOneToMany;
+    typedef edm::AssociationMap<edm::OneToManyWithQuality<std::vector<int>, std::vector<int>, double>>
+        AssocOneToManyWithQuality;
+    typedef edm::AssociationMap<edm::OneToOne<edm::View<int>, edm::View<int>>> AssocOneToOneView;
 
     explicit AssociationMapAnalyzer(edm::ParameterSet const&);
-    virtual void analyze(edm::StreamID,
-                         edm::Event const& event,
-                         edm::EventSetup const&) const override;
+    virtual void analyze(edm::StreamID, edm::Event const& event, edm::EventSetup const&) const override;
 
-    edm::EDGetTokenT<std::vector<int> > inputToken1_;
-    edm::EDGetTokenT<std::vector<int> > inputToken2_;
-    edm::EDGetTokenT<edm::View<int> > inputToken1V_;
-    edm::EDGetTokenT<edm::View<int> > inputToken2V_;
+    edm::EDGetTokenT<std::vector<int>> inputToken1_;
+    edm::EDGetTokenT<std::vector<int>> inputToken2_;
+    edm::EDGetTokenT<edm::View<int>> inputToken1V_;
+    edm::EDGetTokenT<edm::View<int>> inputToken2V_;
 
     edm::EDGetTokenT<AssocOneToOne> associationMapToken1_;
     edm::EDGetTokenT<AssocOneToOne> associationMapToken2_;
@@ -50,12 +48,11 @@ namespace edmtest {
     edm::EDGetTokenT<AssocOneToOneView> associationMapToken8_;
   };
 
-
   AssociationMapAnalyzer::AssociationMapAnalyzer(edm::ParameterSet const& pset) {
-    inputToken1_ = consumes<std::vector<int> >(pset.getParameter<edm::InputTag>("inputTag1"));
-    inputToken2_ = consumes<std::vector<int> >(pset.getParameter<edm::InputTag>("inputTag2"));
-    inputToken1V_ = consumes<edm::View<int> >(pset.getParameter<edm::InputTag>("inputTag1"));
-    inputToken2V_ = consumes<edm::View<int> >(pset.getParameter<edm::InputTag>("inputTag2"));
+    inputToken1_ = consumes<std::vector<int>>(pset.getParameter<edm::InputTag>("inputTag1"));
+    inputToken2_ = consumes<std::vector<int>>(pset.getParameter<edm::InputTag>("inputTag2"));
+    inputToken1V_ = consumes<edm::View<int>>(pset.getParameter<edm::InputTag>("inputTag1"));
+    inputToken2V_ = consumes<edm::View<int>>(pset.getParameter<edm::InputTag>("inputTag2"));
     associationMapToken1_ = consumes<AssocOneToOne>(pset.getParameter<edm::InputTag>("associationMapTag1"));
     associationMapToken2_ = consumes<AssocOneToOne>(pset.getParameter<edm::InputTag>("associationMapTag2"));
     associationMapToken3_ = consumes<AssocOneToValue>(pset.getParameter<edm::InputTag>("associationMapTag3"));
@@ -66,54 +63,50 @@ namespace edmtest {
     associationMapToken8_ = consumes<AssocOneToOneView>(pset.getParameter<edm::InputTag>("associationMapTag8"));
   }
 
-  void
-  AssociationMapAnalyzer::analyze(edm::StreamID,
-                                  edm::Event const& event,
-                                  edm::EventSetup const&) const {
-
-    edm::Handle<std::vector<int> > inputCollection1 = event.getHandle(inputToken1_);
+  void AssociationMapAnalyzer::analyze(edm::StreamID, edm::Event const& event, edm::EventSetup const&) const {
+    edm::Handle<std::vector<int>> inputCollection1 = event.getHandle(inputToken1_);
 
-    edm::Handle<std::vector<int> > inputCollection2 = event.getHandle(inputToken2_);
+    edm::Handle<std::vector<int>> inputCollection2 = event.getHandle(inputToken2_);
 
     // Readout some entries from some AssociationMaps and check that
     // we readout the same content as was was put in. We know the values
     // by looking at the hard coded values in AssociationMapProducer.
     // The particular values used are arbitrary and have no meaning.
 
-    AssocOneToOne const& associationMap1 =event.get(associationMapToken1_);
+    AssocOneToOne const& associationMap1 = event.get(associationMapToken1_);
 
-    if(*associationMap1[edm::Ref<std::vector<int> >(inputCollection1, 0)] != 22 ||
-       *associationMap1[edm::Ref<std::vector<int> >(inputCollection1, 2)] != 24 ||
-       *associationMap1[edm::Ptr<int>(inputCollection1, 0)] != 22 ||
-       *associationMap1[edm::Ptr<int>(inputCollection1, 2)] != 24) {
+    if (*associationMap1[edm::Ref<std::vector<int>>(inputCollection1, 0)] != 22 ||
+        *associationMap1[edm::Ref<std::vector<int>>(inputCollection1, 2)] != 24 ||
+        *associationMap1[edm::Ptr<int>(inputCollection1, 0)] != 22 ||
+        *associationMap1[edm::Ptr<int>(inputCollection1, 2)] != 24) {
       throw cms::Exception("TestFailure") << "unexpected result after using AssociationMap 1";
     }
     AssocOneToOne::const_iterator iter = associationMap1.begin();
-    if(*iter->val != 22 || iter->key != edm::Ref<std::vector<int> >(inputCollection1, 0)) {
+    if (*iter->val != 22 || iter->key != edm::Ref<std::vector<int>>(inputCollection1, 0)) {
       throw cms::Exception("TestFailure") << "unexpected result after using AssociationMap 2";
     }
     ++iter;
-    if(*iter->val != 24 || iter->key != edm::Ref<std::vector<int> >(inputCollection1, 2)) {
+    if (*iter->val != 24 || iter->key != edm::Ref<std::vector<int>>(inputCollection1, 2)) {
       throw cms::Exception("TestFailure") << "unexpected result after using AssociationMap 3";
     }
     ++iter;
-    if(iter != associationMap1.end()) {
+    if (iter != associationMap1.end()) {
       throw cms::Exception("TestFailure") << "unexpected result after using AssociationMap 4";
     }
 
     // Case where handle arguments were used creating the AssociationMap
     AssocOneToOne const& associationMap2 = event.get(associationMapToken2_);
 
-    if(*associationMap2[edm::Ref<std::vector<int> >(inputCollection1, 0)] != 22 ||
-       *associationMap2[edm::Ref<std::vector<int> >(inputCollection1, 2)] != 25 ||
-       *associationMap2[edm::Ptr<int>(inputCollection1, 0)] != 22 ||
-       *associationMap2[edm::Ptr<int>(inputCollection1, 2)] != 25) {
+    if (*associationMap2[edm::Ref<std::vector<int>>(inputCollection1, 0)] != 22 ||
+        *associationMap2[edm::Ref<std::vector<int>>(inputCollection1, 2)] != 25 ||
+        *associationMap2[edm::Ptr<int>(inputCollection1, 0)] != 22 ||
+        *associationMap2[edm::Ptr<int>(inputCollection1, 2)] != 25) {
       throw cms::Exception("TestFailure") << "unexpected result after using AssociationMap 5";
     }
 
     AssocOneToOne::const_iterator iter2 = associationMap2.begin();
     ++iter2;
-    if(*iter2->val != 25 || iter2->key != edm::Ref<std::vector<int> >(inputCollection1, 2)) {
+    if (*iter2->val != 25 || iter2->key != edm::Ref<std::vector<int>>(inputCollection1, 2)) {
       throw cms::Exception("TestFailure") << "unexpected result after using AssociationMap 6";
     }
 
@@ -121,31 +114,31 @@ namespace edmtest {
 
     AssocOneToValue const& associationMap3 = event.get(associationMapToken3_);
 
-    if(associationMap3[edm::Ref<std::vector<int> >(inputCollection1, 0)] != 11.0 ||
-       associationMap3[edm::Ref<std::vector<int> >(inputCollection1, 2)] != 12.0 ||
-       associationMap3[edm::Ptr<int>(inputCollection1, 0)] != 11.0 ||
-       associationMap3[edm::Ptr<int>(inputCollection1, 2)] != 12.0) {
+    if (associationMap3[edm::Ref<std::vector<int>>(inputCollection1, 0)] != 11.0 ||
+        associationMap3[edm::Ref<std::vector<int>>(inputCollection1, 2)] != 12.0 ||
+        associationMap3[edm::Ptr<int>(inputCollection1, 0)] != 11.0 ||
+        associationMap3[edm::Ptr<int>(inputCollection1, 2)] != 12.0) {
       throw cms::Exception("TestFailure") << "unexpected result after using AssociationMap 7";
     }
     AssocOneToValue::const_iterator iter3 = associationMap3.begin();
     ++iter3;
-    if(iter3->val != 12.0 || iter3->key != edm::Ref<std::vector<int> >(inputCollection1, 2)) {
+    if (iter3->val != 12.0 || iter3->key != edm::Ref<std::vector<int>>(inputCollection1, 2)) {
       throw cms::Exception("TestFailure") << "unexpected result after using AssociationMap 8";
     }
 
     // One to Value case with handle argument
 
-    AssocOneToValue const& associationMap4 =event.get(associationMapToken4_);
+    AssocOneToValue const& associationMap4 = event.get(associationMapToken4_);
 
-    if(associationMap4[edm::Ref<std::vector<int> >(inputCollection1, 0)] != 21.0 ||
-       associationMap4[edm::Ref<std::vector<int> >(inputCollection1, 2)] != 22.0 ||
-       associationMap4[edm::Ptr<int>(inputCollection1, 0)] != 21.0 ||
-       associationMap4[edm::Ptr<int>(inputCollection1, 2)] != 22.0) {
+    if (associationMap4[edm::Ref<std::vector<int>>(inputCollection1, 0)] != 21.0 ||
+        associationMap4[edm::Ref<std::vector<int>>(inputCollection1, 2)] != 22.0 ||
+        associationMap4[edm::Ptr<int>(inputCollection1, 0)] != 21.0 ||
+        associationMap4[edm::Ptr<int>(inputCollection1, 2)] != 22.0) {
       throw cms::Exception("TestFailure") << "unexpected result after using AssociationMap 9";
     }
     AssocOneToValue::const_iterator iter4 = associationMap4.begin();
     ++iter4;
-    if(iter4->val != 22.0 || iter4->key != edm::Ref<std::vector<int> >(inputCollection1, 2)) {
+    if (iter4->val != 22.0 || iter4->key != edm::Ref<std::vector<int>>(inputCollection1, 2)) {
       throw cms::Exception("TestFailure") << "unexpected result after using AssociationMap 10";
     }
 
@@ -153,36 +146,35 @@ namespace edmtest {
 
     AssocOneToMany const& associationMap5 = event.get(associationMapToken5_);
 
-    if(*associationMap5[edm::Ref<std::vector<int> >(inputCollection1, 0)].at(0) != 22 ||
-       *associationMap5[edm::Ref<std::vector<int> >(inputCollection1, 2)].at(1) != 27 ||
-       *associationMap5[edm::Ptr<int>(inputCollection1, 0)].at(0) != 22 ||
-       *associationMap5[edm::Ptr<int>(inputCollection1, 2)].at(1) != 27) {
+    if (*associationMap5[edm::Ref<std::vector<int>>(inputCollection1, 0)].at(0) != 22 ||
+        *associationMap5[edm::Ref<std::vector<int>>(inputCollection1, 2)].at(1) != 27 ||
+        *associationMap5[edm::Ptr<int>(inputCollection1, 0)].at(0) != 22 ||
+        *associationMap5[edm::Ptr<int>(inputCollection1, 2)].at(1) != 27) {
       throw cms::Exception("TestFailure") << "unexpected result after using AssociationMap 11";
     }
     AssocOneToMany::const_iterator iter5 = associationMap5.begin();
     ++iter5;
-    if(*iter5->val.at(1) != 27 || iter5->key != edm::Ref<std::vector<int> >(inputCollection1, 2)) {
+    if (*iter5->val.at(1) != 27 || iter5->key != edm::Ref<std::vector<int>>(inputCollection1, 2)) {
       throw cms::Exception("TestFailure") << "unexpected result after using AssociationMap 12";
     }
 
     // One to Many With Quality
 
-    AssocOneToManyWithQuality const& associationMap6 =event.get(associationMapToken6_);
-    if(*associationMap6[edm::Ref<std::vector<int> >(inputCollection1, 0)].at(0).first != 22 ||
-       *associationMap6[edm::Ref<std::vector<int> >(inputCollection1, 2)].at(1).first != 25 ||
-       *associationMap6[edm::Ptr<int>(inputCollection1, 0)].at(0).first != 22 ||
-       *associationMap6[edm::Ptr<int>(inputCollection1, 2)].at(1).first != 25 ||
-       associationMap6[edm::Ref<std::vector<int> >(inputCollection1, 0)].at(0).second != 31.0 ||
-       associationMap6[edm::Ref<std::vector<int> >(inputCollection1, 2)].at(1).second != 32.0 ||
-       associationMap6[edm::Ptr<int>(inputCollection1, 0)].at(0).second != 31.0 ||
-       associationMap6[edm::Ptr<int>(inputCollection1, 2)].at(1).second != 32.0) {
+    AssocOneToManyWithQuality const& associationMap6 = event.get(associationMapToken6_);
+    if (*associationMap6[edm::Ref<std::vector<int>>(inputCollection1, 0)].at(0).first != 22 ||
+        *associationMap6[edm::Ref<std::vector<int>>(inputCollection1, 2)].at(1).first != 25 ||
+        *associationMap6[edm::Ptr<int>(inputCollection1, 0)].at(0).first != 22 ||
+        *associationMap6[edm::Ptr<int>(inputCollection1, 2)].at(1).first != 25 ||
+        associationMap6[edm::Ref<std::vector<int>>(inputCollection1, 0)].at(0).second != 31.0 ||
+        associationMap6[edm::Ref<std::vector<int>>(inputCollection1, 2)].at(1).second != 32.0 ||
+        associationMap6[edm::Ptr<int>(inputCollection1, 0)].at(0).second != 31.0 ||
+        associationMap6[edm::Ptr<int>(inputCollection1, 2)].at(1).second != 32.0) {
       throw cms::Exception("TestFailure") << "unexpected result after using AssociationMap 13";
     }
     AssocOneToManyWithQuality::const_iterator iter6 = associationMap6.begin();
     ++iter6;
-    if(*iter6->val.at(1).first != 25 ||
-       iter6->val.at(1).second != 32.0 ||
-       iter6->key != edm::Ref<std::vector<int> >(inputCollection1, 2)) {
+    if (*iter6->val.at(1).first != 25 || iter6->val.at(1).second != 32.0 ||
+        iter6->key != edm::Ref<std::vector<int>>(inputCollection1, 2)) {
       throw cms::Exception("TestFailure") << "unexpected result after using AssociationMap 14";
     }
 
@@ -192,32 +184,28 @@ namespace edmtest {
 
     edm::Handle<edm::View<int>> inputView2 = event.getHandle(inputToken2V_);
 
-    AssocOneToOneView const& associationMap7 =event.get(associationMapToken7_);
-    if(*associationMap7[inputView1.refAt(0)] != 24 ||
-       *associationMap7[inputView1.refAt(2)] != 25) {
+    AssocOneToOneView const& associationMap7 = event.get(associationMapToken7_);
+    if (*associationMap7[inputView1.refAt(0)] != 24 || *associationMap7[inputView1.refAt(2)] != 25) {
       throw cms::Exception("TestFailure") << "unexpected result after using AssociationMap 15";
     }
     AssocOneToOneView::const_iterator iter7 = associationMap7.begin();
     ++iter7;
-    if(*iter7->val != 25 ||
-       iter7->key != inputView1.refAt(2)) {
+    if (*iter7->val != 25 || iter7->key != inputView1.refAt(2)) {
       throw cms::Exception("TestFailure") << "unexpected result after using AssociationMap 16";
     }
 
     // One to One View built with 2 arguments constructor
 
     AssocOneToOneView const& associationMap8 = event.get(associationMapToken8_);
-    if(*associationMap8[inputView1.refAt(0)] != 26 ||
-       *associationMap8[inputView1.refAt(2)] != 27) {
+    if (*associationMap8[inputView1.refAt(0)] != 26 || *associationMap8[inputView1.refAt(2)] != 27) {
       throw cms::Exception("TestFailure") << "unexpected result after using AssociationMap 17";
     }
     AssocOneToOneView::const_iterator iter8 = associationMap8.begin();
     ++iter8;
-    if(*iter8->val != 27 ||
-       iter8->key != inputView1.refAt(2)) {
+    if (*iter8->val != 27 || iter8->key != inputView1.refAt(2)) {
       throw cms::Exception("TestFailure") << "unexpected result after using AssociationMap 18";
     }
   }
-}
+}  // namespace edmtest
 using edmtest::AssociationMapAnalyzer;
 DEFINE_FWK_MODULE(AssociationMapAnalyzer);
diff --git a/FWCore/Integration/test/AssociationMapProducer.cc b/FWCore/Integration/test/AssociationMapProducer.cc
index 88be4bf5ae740..d015213a95b15 100644
--- a/FWCore/Integration/test/AssociationMapProducer.cc
+++ b/FWCore/Integration/test/AssociationMapProducer.cc
@@ -28,20 +28,19 @@ namespace edmtest {
 
   class AssociationMapProducer : public edm::one::EDProducer<> {
   public:
-
     explicit AssociationMapProducer(edm::ParameterSet const&);
     virtual ~AssociationMapProducer();
 
     void produce(edm::Event&, edm::EventSetup const&) override;
 
-    typedef edm::AssociationMap<edm::OneToValue<std::vector<int>, double > > AssocOneToValue;
+    typedef edm::AssociationMap<edm::OneToValue<std::vector<int>, double> > AssocOneToValue;
     typedef edm::AssociationMap<edm::OneToOne<std::vector<int>, std::vector<int> > > AssocOneToOne;
     typedef edm::AssociationMap<edm::OneToMany<std::vector<int>, std::vector<int> > > AssocOneToMany;
-    typedef edm::AssociationMap<edm::OneToManyWithQuality<std::vector<int>, std::vector<int>, double > > AssocOneToManyWithQuality;
+    typedef edm::AssociationMap<edm::OneToManyWithQuality<std::vector<int>, std::vector<int>, double> >
+        AssocOneToManyWithQuality;
     typedef edm::AssociationMap<edm::OneToOne<edm::View<int>, edm::View<int> > > AssocOneToOneView;
 
   private:
-
     edm::EDGetTokenT<std::vector<int> > inputToken1_;
     edm::EDGetTokenT<std::vector<int> > inputToken2_;
 
@@ -50,7 +49,6 @@ namespace edmtest {
   };
 
   AssociationMapProducer::AssociationMapProducer(edm::ParameterSet const& pset) {
-
     inputToken1_ = consumes<std::vector<int> >(pset.getParameter<edm::InputTag>("inputTag1"));
     inputToken2_ = consumes<std::vector<int> >(pset.getParameter<edm::InputTag>("inputTag2"));
 
@@ -67,10 +65,9 @@ namespace edmtest {
     produces<AssocOneToOneView>("twoArg");
   }
 
-  AssociationMapProducer::~AssociationMapProducer() { }
+  AssociationMapProducer::~AssociationMapProducer() {}
 
   void AssociationMapProducer::produce(edm::Event& event, edm::EventSetup const&) {
-
     edm::Handle<std::vector<int> > inputCollection1 = event.getHandle(inputToken1_);
 
     edm::Handle<std::vector<int> > inputCollection2 = event.getHandle(inputToken2_);
@@ -81,17 +78,13 @@ namespace edmtest {
     // used are arbitrary and have no meaning.
 
     auto assoc1 = std::make_unique<AssocOneToOne>(&event.productGetter());
-    assoc1->insert(edm::Ref<std::vector<int> >(inputCollection1, 0),
-                   edm::Ref<std::vector<int> >(inputCollection2, 1));
-    assoc1->insert(edm::Ref<std::vector<int> >(inputCollection1, 2),
-                   edm::Ref<std::vector<int> >(inputCollection2, 3));
+    assoc1->insert(edm::Ref<std::vector<int> >(inputCollection1, 0), edm::Ref<std::vector<int> >(inputCollection2, 1));
+    assoc1->insert(edm::Ref<std::vector<int> >(inputCollection1, 2), edm::Ref<std::vector<int> >(inputCollection2, 3));
     event.put(std::move(assoc1));
 
     auto assoc2 = std::make_unique<AssocOneToOne>(inputCollection1, inputCollection2);
-    assoc2->insert(edm::Ref<std::vector<int> >(inputCollection1, 0),
-                   edm::Ref<std::vector<int> >(inputCollection2, 1));
-    assoc2->insert(edm::Ref<std::vector<int> >(inputCollection1, 2),
-                   edm::Ref<std::vector<int> >(inputCollection2, 4));
+    assoc2->insert(edm::Ref<std::vector<int> >(inputCollection1, 0), edm::Ref<std::vector<int> >(inputCollection2, 1));
+    assoc2->insert(edm::Ref<std::vector<int> >(inputCollection1, 2), edm::Ref<std::vector<int> >(inputCollection2, 4));
     event.put(std::move(assoc2), "twoArg");
 
     auto assoc3 = std::make_unique<AssocOneToValue>(&event.productGetter());
@@ -105,12 +98,9 @@ namespace edmtest {
     event.put(std::move(assoc4), "handleArg");
 
     auto assoc5 = std::make_unique<AssocOneToMany>(&event.productGetter());
-    assoc5->insert(edm::Ref<std::vector<int> >(inputCollection1, 0),
-                   edm::Ref<std::vector<int> >(inputCollection2, 1));
-    assoc5->insert(edm::Ref<std::vector<int> >(inputCollection1, 2),
-                   edm::Ref<std::vector<int> >(inputCollection2, 4));
-    assoc5->insert(edm::Ref<std::vector<int> >(inputCollection1, 2),
-                   edm::Ref<std::vector<int> >(inputCollection2, 6));
+    assoc5->insert(edm::Ref<std::vector<int> >(inputCollection1, 0), edm::Ref<std::vector<int> >(inputCollection2, 1));
+    assoc5->insert(edm::Ref<std::vector<int> >(inputCollection1, 2), edm::Ref<std::vector<int> >(inputCollection2, 4));
+    assoc5->insert(edm::Ref<std::vector<int> >(inputCollection1, 2), edm::Ref<std::vector<int> >(inputCollection2, 6));
     event.put(std::move(assoc5));
 
     auto assoc6 = std::make_unique<AssocOneToManyWithQuality>(&event.productGetter());
@@ -138,6 +128,6 @@ namespace edmtest {
     assoc8->insert(inputView1.refAt(2), inputView2->refAt(6));
     event.put(std::move(assoc8), "twoArg");
   }
-}
+}  // namespace edmtest
 using edmtest::AssociationMapProducer;
 DEFINE_FWK_MODULE(AssociationMapProducer);
diff --git a/FWCore/Integration/test/Doodad.cc b/FWCore/Integration/test/Doodad.cc
index 1803fc2251357..1acba7464cd12 100644
--- a/FWCore/Integration/test/Doodad.cc
+++ b/FWCore/Integration/test/Doodad.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Integration
 // Class  :     Doodad
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
diff --git a/FWCore/Integration/test/Doodad.h b/FWCore/Integration/test/Doodad.h
index 4bdaabfca5145..af5f41335fbf6 100644
--- a/FWCore/Integration/test/Doodad.h
+++ b/FWCore/Integration/test/Doodad.h
@@ -4,7 +4,7 @@
 //
 // Package:     Integration
 // Class  :     Doodad
-// 
+//
 /**\class Doodad Doodad.h FWCore/Integration/interface/Doodad.h
 
  Description: Dummy class used to test the EventSetup in the integration test
@@ -24,11 +24,10 @@
 
 // forward declarations
 namespace edmtest {
-struct Doodad
-{
-   Doodad() : a() {}
-   int a;
-};
-}
+  struct Doodad {
+    Doodad() : a() {}
+    int a;
+  };
+}  // namespace edmtest
 
 #endif
diff --git a/FWCore/Integration/test/DoodadESProducer.cc b/FWCore/Integration/test/DoodadESProducer.cc
index 4d10e8f24aa14..deeb601f1221c 100644
--- a/FWCore/Integration/test/DoodadESProducer.cc
+++ b/FWCore/Integration/test/DoodadESProducer.cc
@@ -32,64 +32,63 @@
 //
 namespace edmtest {
 
-class DoodadESProducer : public edm::ESProducer {
-   public:
-      DoodadESProducer(edm::ParameterSet const&);
-      ~DoodadESProducer();
-
-      typedef std::unique_ptr<Doodad> ReturnType;
-
-      ReturnType produce(GadgetRcd const&);
-   private:
-      // ----------member data ---------------------------
-      bool exceptionInformation_;
-};
-
-//
-// constants, enums and typedefs
-//
-
-//
-// static data member definitions
-
-//
-// constructors and destructor
-//
-DoodadESProducer::DoodadESProducer(edm::ParameterSet const& iConfig) :
-   exceptionInformation_(iConfig.getUntrackedParameter<bool>("throwException", false)) {
-
-   //the following line is needed to tell the framework what
-   // data is being produced
-   setWhatProduced(this);
-
-   //now do what ever other initialization is needed
-}
-
-DoodadESProducer::~DoodadESProducer() {
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-}
-
-//
-// member functions
-//
-
-// ------------ method called to produce the data  ------------
-DoodadESProducer::ReturnType
-DoodadESProducer::produce(GadgetRcd const& /*iRecord*/) {
-   if(exceptionInformation_) {
+  class DoodadESProducer : public edm::ESProducer {
+  public:
+    DoodadESProducer(edm::ParameterSet const&);
+    ~DoodadESProducer();
+
+    typedef std::unique_ptr<Doodad> ReturnType;
+
+    ReturnType produce(GadgetRcd const&);
+
+  private:
+    // ----------member data ---------------------------
+    bool exceptionInformation_;
+  };
+
+  //
+  // constants, enums and typedefs
+  //
+
+  //
+  // static data member definitions
+
+  //
+  // constructors and destructor
+  //
+  DoodadESProducer::DoodadESProducer(edm::ParameterSet const& iConfig)
+      : exceptionInformation_(iConfig.getUntrackedParameter<bool>("throwException", false)) {
+    //the following line is needed to tell the framework what
+    // data is being produced
+    setWhatProduced(this);
+
+    //now do what ever other initialization is needed
+  }
+
+  DoodadESProducer::~DoodadESProducer() {
+    // do anything here that needs to be done at desctruction time
+    // (e.g. close files, deallocate resources etc.)
+  }
+
+  //
+  // member functions
+  //
+
+  // ------------ method called to produce the data  ------------
+  DoodadESProducer::ReturnType DoodadESProducer::produce(GadgetRcd const& /*iRecord*/) {
+    if (exceptionInformation_) {
       throw std::runtime_error("test exception catching");
-   }
+    }
 
-   using namespace edmtest;
+    using namespace edmtest;
 
-   auto pDoodad = std::make_unique<Doodad>();
+    auto pDoodad = std::make_unique<Doodad>();
 
-   pDoodad->a = 1;
+    pDoodad->a = 1;
 
-   return pDoodad ;
-}
-}
+    return pDoodad;
+  }
+}  // namespace edmtest
 
 using namespace edmtest;
 //define this as a plug-in
diff --git a/FWCore/Integration/test/DoodadESSource.cc b/FWCore/Integration/test/DoodadESSource.cc
index 5a04aa52e2933..e296d7feba030 100644
--- a/FWCore/Integration/test/DoodadESSource.cc
+++ b/FWCore/Integration/test/DoodadESSource.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Integration
 // Class  :     DoodadESSource
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -24,102 +24,91 @@
 #include "FWCore/Utilities/interface/EDMException.h"
 
 namespace edmtest {
-class DoodadESSource :
-   public edm::EventSetupRecordIntervalFinder, 
-   public edm::ESProducer
-{
-   
-public:
-   DoodadESSource(edm::ParameterSet const& pset);
-   
-   std::unique_ptr<Doodad> produce(const GadgetRcd&) ;
-
-   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-
-protected:
-   
-   virtual void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
-                                const edm::IOVSyncValue& iTime, 
-                                edm::ValidityInterval& iInterval);
-   
-private:
-   DoodadESSource(const DoodadESSource&); // stop default
-   
-   const DoodadESSource& operator=(const DoodadESSource&); // stop default
-   
-   // ---------- member data --------------------------------
-   unsigned int nCalls_;
-};
-
-//
-// constants, enums and typedefs
-//
-
-//
-// static data member definitions
-//
-
-//
-// constructors and destructor
-//
-DoodadESSource::DoodadESSource(edm::ParameterSet const& pset)
-: nCalls_(0) {
+  class DoodadESSource : public edm::EventSetupRecordIntervalFinder, public edm::ESProducer {
+  public:
+    DoodadESSource(edm::ParameterSet const& pset);
 
-  if (pset.getUntrackedParameter<bool>("test", true)) {
-     throw edm::Exception(edm::errors::Configuration, "Something is wrong with ESSource validation\n")
-       << "Or the test configuration parameter was set true (it should never be true unless you want this exception)\n";
-   }
+    std::unique_ptr<Doodad> produce(const GadgetRcd&);
 
-   this->findingRecord<GadgetRcd>();
-   setWhatProduced(this);
-}
+    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
-//DoodadESSource::~DoodadESSource()
-//{
-//}
-
-//
-// member functions
-//
-
-std::unique_ptr<Doodad> 
-DoodadESSource::produce(const GadgetRcd&) {
-   auto data = std::make_unique<Doodad>();
-   data->a = nCalls_;
-   ++nCalls_;
-   return data;
-}
-
-void
-DoodadESSource::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-  edm::ParameterSetDescription desc;
-  desc.addOptional<std::string>("appendToDataLabel");
-  desc.addOptionalUntracked<std::string>("test2");
-  desc.addUntracked<bool>("test", false)->
-    setComment("This parameter exists only to test the parameter set validation for ESSources"); 
-  descriptions.add("DoodadESSource", desc);
-}
-
-void 
-DoodadESSource::setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
-                                const edm::IOVSyncValue& iTime, 
-                                edm::ValidityInterval& iInterval) {
-   //Be valid for 3 runs 
-   edm::EventID newTime = edm::EventID((iTime.eventID().run() - 1) - ((iTime.eventID().run() - 1) %3) +1, 1, 1);
-   edm::EventID endTime = newTime.nextRun(1).nextRun(1).nextRun(1).previousRunLastEvent(1);
-   iInterval = edm::ValidityInterval(edm::IOVSyncValue(newTime),
-                                      edm::IOVSyncValue(endTime));
-}
-
-//
-// const member functions
-//
+  protected:
+    virtual void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
+                                const edm::IOVSyncValue& iTime,
+                                edm::ValidityInterval& iInterval);
 
-//
-// static member functions
-//
-}
+  private:
+    DoodadESSource(const DoodadESSource&);  // stop default
+
+    const DoodadESSource& operator=(const DoodadESSource&);  // stop default
+
+    // ---------- member data --------------------------------
+    unsigned int nCalls_;
+  };
+
+  //
+  // constants, enums and typedefs
+  //
+
+  //
+  // static data member definitions
+  //
+
+  //
+  // constructors and destructor
+  //
+  DoodadESSource::DoodadESSource(edm::ParameterSet const& pset) : nCalls_(0) {
+    if (pset.getUntrackedParameter<bool>("test", true)) {
+      throw edm::Exception(edm::errors::Configuration, "Something is wrong with ESSource validation\n")
+          << "Or the test configuration parameter was set true (it should never be true unless you want this "
+             "exception)\n";
+    }
+
+    this->findingRecord<GadgetRcd>();
+    setWhatProduced(this);
+  }
+
+  //DoodadESSource::~DoodadESSource()
+  //{
+  //}
+
+  //
+  // member functions
+  //
+
+  std::unique_ptr<Doodad> DoodadESSource::produce(const GadgetRcd&) {
+    auto data = std::make_unique<Doodad>();
+    data->a = nCalls_;
+    ++nCalls_;
+    return data;
+  }
+
+  void DoodadESSource::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+    edm::ParameterSetDescription desc;
+    desc.addOptional<std::string>("appendToDataLabel");
+    desc.addOptionalUntracked<std::string>("test2");
+    desc.addUntracked<bool>("test", false)
+        ->setComment("This parameter exists only to test the parameter set validation for ESSources");
+    descriptions.add("DoodadESSource", desc);
+  }
+
+  void DoodadESSource::setIntervalFor(const edm::eventsetup::EventSetupRecordKey&,
+                                      const edm::IOVSyncValue& iTime,
+                                      edm::ValidityInterval& iInterval) {
+    //Be valid for 3 runs
+    edm::EventID newTime = edm::EventID((iTime.eventID().run() - 1) - ((iTime.eventID().run() - 1) % 3) + 1, 1, 1);
+    edm::EventID endTime = newTime.nextRun(1).nextRun(1).nextRun(1).previousRunLastEvent(1);
+    iInterval = edm::ValidityInterval(edm::IOVSyncValue(newTime), edm::IOVSyncValue(endTime));
+  }
+
+  //
+  // const member functions
+  //
+
+  //
+  // static member functions
+  //
+}  // namespace edmtest
 using namespace edmtest;
 
 DEFINE_FWK_EVENTSETUP_SOURCE(DoodadESSource);
-
diff --git a/FWCore/Integration/test/EDAlias_t.cpp b/FWCore/Integration/test/EDAlias_t.cpp
index f06454d1e8128..ef7c761f125eb 100644
--- a/FWCore/Integration/test/EDAlias_t.cpp
+++ b/FWCore/Integration/test/EDAlias_t.cpp
@@ -11,7 +11,7 @@ static constexpr auto s_tag = "[EDAlias]";
 
 TEST_CASE("Configuration", s_tag) {
   const std::string baseConfig{
-R"_(from FWCore.TestProcessor.TestProcess import *
+      R"_(from FWCore.TestProcessor.TestProcess import *
 import FWCore.ParameterSet.Config as cms
 
 process = TestProcess()
@@ -25,11 +25,9 @@ process.test = cms.EDProducer('AddIntsProducer', labels = cms.vstring('intalias'
 process.moduleToTest(process.test, cms.Task(process.intprod))
 )_"};
 
-  edm::test::TestProcessor::Config config{ baseConfig };
+  edm::test::TestProcessor::Config config{baseConfig};
 
-  SECTION("Base configuration is OK") {
-    REQUIRE_NOTHROW(edm::test::TestProcessor(config));
-  }
+  SECTION("Base configuration is OK") { REQUIRE_NOTHROW(edm::test::TestProcessor(config)); }
 
   SECTION("No event data") {
     edm::test::TestProcessor tester(config);
@@ -60,7 +58,7 @@ process.moduleToTest(process.test, cms.Task(process.intprod))
 
 TEST_CASE("Configuration with two instance aliases to a single product", s_tag) {
   const std::string baseConfig{
-R"_(from FWCore.TestProcessor.TestProcess import *
+      R"_(from FWCore.TestProcessor.TestProcess import *
 import FWCore.ParameterSet.Config as cms
 
 process = TestProcess()
@@ -79,16 +77,20 @@ process.test = cms.EDProducer('AddIntsProducer', labels = cms.vstring('intalias'
 process.moduleToTest(process.test, cms.Task(process.intprod))
 )_"};
 
-  edm::test::TestProcessor::Config config{ baseConfig };
+  edm::test::TestProcessor::Config config{baseConfig};
 
   SECTION("Alias with two instances pointing to the same product is not allowed") {
-    REQUIRE_THROWS_WITH(edm::test::TestProcessor(config), Catch::Contains("EDAlias conflict") && Catch::Contains("is used for multiple products of type") && Catch::Contains("with module label") && Catch::Contains("and instance name") && Catch::Contains("alias has the instance name") && Catch::Contains("and the other has the instance name"));
+    REQUIRE_THROWS_WITH(
+        edm::test::TestProcessor(config),
+        Catch::Contains("EDAlias conflict") && Catch::Contains("is used for multiple products of type") &&
+            Catch::Contains("with module label") && Catch::Contains("and instance name") &&
+            Catch::Contains("alias has the instance name") && Catch::Contains("and the other has the instance name"));
   }
 }
 
 TEST_CASE("Configuration with two identical aliases pointing to different products") {
   const std::string baseConfig{
-R"_(from FWCore.TestProcessor.TestProcess import *
+      R"_(from FWCore.TestProcessor.TestProcess import *
 import FWCore.ParameterSet.Config as cms
 
 process = TestProcess()
@@ -105,9 +107,12 @@ process.test = cms.EDProducer('AddIntsProducer', labels = cms.vstring('intalias'
 process.moduleToTest(process.test, cms.Task(process.intprod))
 )_"};
 
-  edm::test::TestProcessor::Config config{ baseConfig };
+  edm::test::TestProcessor::Config config{baseConfig};
 
   SECTION("Alias with two instances pointing to the same product is not allowed") {
-    REQUIRE_THROWS_WITH(edm::test::TestProcessor(config), Catch::Contains("EDAlias conflict") && Catch::Contains("and product instance alias") && Catch::Contains("are used for multiple products of type") && Catch::Contains("One has module label") && Catch::Contains("the other has module label"));
+    REQUIRE_THROWS_WITH(edm::test::TestProcessor(config),
+                        Catch::Contains("EDAlias conflict") && Catch::Contains("and product instance alias") &&
+                            Catch::Contains("are used for multiple products of type") &&
+                            Catch::Contains("One has module label") && Catch::Contains("the other has module label"));
   }
 }
diff --git a/FWCore/Integration/test/ESTestAnalyzers.cc b/FWCore/Integration/test/ESTestAnalyzers.cc
index 7bfe3ae9f8a3f..cff1c72f93670 100644
--- a/FWCore/Integration/test/ESTestAnalyzers.cc
+++ b/FWCore/Integration/test/ESTestAnalyzers.cc
@@ -22,27 +22,30 @@ namespace edmtest {
     virtual void analyze(const edm::Event&, const edm::EventSetup&);
 
     static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
   private:
     std::vector<int> runsToGetDataFor_;
     std::vector<int> expectedValues_;
   };
 
-  ESTestAnalyzerA::ESTestAnalyzerA(edm::ParameterSet const& pset) :
-    runsToGetDataFor_(pset.getParameter<std::vector<int> >("runsToGetDataFor")),
-    expectedValues_(pset.getUntrackedParameter<std::vector<int>>("expectedValues")){
-      assert( expectedValues_.empty() or expectedValues_.size() == runsToGetDataFor_.size());
+  ESTestAnalyzerA::ESTestAnalyzerA(edm::ParameterSet const& pset)
+      : runsToGetDataFor_(pset.getParameter<std::vector<int>>("runsToGetDataFor")),
+        expectedValues_(pset.getUntrackedParameter<std::vector<int>>("expectedValues")) {
+    assert(expectedValues_.empty() or expectedValues_.size() == runsToGetDataFor_.size());
   }
 
   void ESTestAnalyzerA::analyze(edm::Event const& ev, edm::EventSetup const& es) {
     auto found = std::find(runsToGetDataFor_.begin(), runsToGetDataFor_.end(), ev.run());
-    if ( found != runsToGetDataFor_.end()) {
+    if (found != runsToGetDataFor_.end()) {
       ESTestRecordA const& rec = es.get<ESTestRecordA>();
       edm::ESHandle<ESTestDataA> dataA;
       rec.get(dataA);
-      edm::LogAbsolute("ESTestAnalyzerA") << "ESTestAnalyzerA: process = " << moduleDescription().processName() << ": Data value = " << dataA->value();
-      if(not expectedValues_.empty()) {
-        if(expectedValues_[found-runsToGetDataFor_.begin()] != dataA->value()) {
-          throw cms::Exception("TestError")<<"Exptected value "<<expectedValues_[found-runsToGetDataFor_.begin()]<<" but saw "<<dataA->value();
+      edm::LogAbsolute("ESTestAnalyzerA")
+          << "ESTestAnalyzerA: process = " << moduleDescription().processName() << ": Data value = " << dataA->value();
+      if (not expectedValues_.empty()) {
+        if (expectedValues_[found - runsToGetDataFor_.begin()] != dataA->value()) {
+          throw cms::Exception("TestError") << "Exptected value " << expectedValues_[found - runsToGetDataFor_.begin()]
+                                            << " but saw " << dataA->value();
         }
       }
     }
@@ -54,14 +57,12 @@ namespace edmtest {
     edm::ParameterSetDescription desc;
     desc.setComment("Test module for the EventSetup");
     desc.add<std::vector<int>>("runsToGetDataFor")
-    ->setComment("ID number for each Run for which we should get EventSetup data.");
-    desc.addUntracked<std::vector<int>>("expectedValues",std::vector<int>())
-    ->setComment("EventSetup value expected for each Run. If empty, no values compared.");
+        ->setComment("ID number for each Run for which we should get EventSetup data.");
+    desc.addUntracked<std::vector<int>>("expectedValues", std::vector<int>())
+        ->setComment("EventSetup value expected for each Run. If empty, no values compared.");
     descriptions.addDefault(desc);
   }
 
-
-
   class ESTestAnalyzerB : public edm::EDAnalyzer {
   public:
     explicit ESTestAnalyzerB(edm::ParameterSet const&);
@@ -76,23 +77,23 @@ namespace edmtest {
     unsigned int expectedIndex_ = 0;
   };
 
-  ESTestAnalyzerB::ESTestAnalyzerB(edm::ParameterSet const& pset) :
-    runsToGetDataFor_(pset.getParameter<std::vector<int> >("runsToGetDataFor")),
-    expectedValues_(pset.getUntrackedParameter<std::vector<int> >("expectedValues")) {
-  }
+  ESTestAnalyzerB::ESTestAnalyzerB(edm::ParameterSet const& pset)
+      : runsToGetDataFor_(pset.getParameter<std::vector<int>>("runsToGetDataFor")),
+        expectedValues_(pset.getUntrackedParameter<std::vector<int>>("expectedValues")) {}
 
   void ESTestAnalyzerB::analyze(edm::Event const& ev, edm::EventSetup const& es) {
     if (std::find(runsToGetDataFor_.begin(), runsToGetDataFor_.end(), ev.run()) != runsToGetDataFor_.end()) {
       ESTestRecordB const& rec = es.get<ESTestRecordB>();
       edm::ESHandle<ESTestDataB> dataB;
       rec.get(dataB);
-      edm::LogAbsolute("ESTestAnalyzerB") << "ESTestAnalyzerB: process = " << moduleDescription().processName() << ": Data value = " << dataB->value();
+      edm::LogAbsolute("ESTestAnalyzerB")
+          << "ESTestAnalyzerB: process = " << moduleDescription().processName() << ": Data value = " << dataB->value();
 
       if (expectedIndex_ < expectedValues_.size()) {
         if (expectedValues_[expectedIndex_] != dataB->value()) {
-          throw cms::Exception("TestError") << "Expected does not match actual value, "
-            << "expected value = " << expectedValues_[expectedIndex_]
-            << " actual value = " << dataB->value();
+          throw cms::Exception("TestError")
+              << "Expected does not match actual value, "
+              << "expected value = " << expectedValues_[expectedIndex_] << " actual value = " << dataB->value();
         }
         ++expectedIndex_;
       }
@@ -102,9 +103,9 @@ namespace edmtest {
   void ESTestAnalyzerB::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription desc;
     desc.add<std::vector<int>>("runsToGetDataFor")
-    ->setComment("ID number for each Run for which we should get EventSetup data.");
-    desc.addUntracked<std::vector<int>>("expectedValues",std::vector<int>())
-    ->setComment("EventSetup value expected for each Run. If empty, no values compared.");
+        ->setComment("ID number for each Run for which we should get EventSetup data.");
+    desc.addUntracked<std::vector<int>>("expectedValues", std::vector<int>())
+        ->setComment("EventSetup value expected for each Run. If empty, no values compared.");
     descriptions.addDefault(desc);
   }
 
@@ -117,16 +118,16 @@ namespace edmtest {
     std::vector<int> runsToGetDataFor_;
   };
 
-  ESTestAnalyzerK::ESTestAnalyzerK(edm::ParameterSet const& pset) :
-    runsToGetDataFor_(pset.getParameter<std::vector<int> >("runsToGetDataFor")) {
-  }
+  ESTestAnalyzerK::ESTestAnalyzerK(edm::ParameterSet const& pset)
+      : runsToGetDataFor_(pset.getParameter<std::vector<int>>("runsToGetDataFor")) {}
 
   void ESTestAnalyzerK::analyze(edm::Event const& ev, edm::EventSetup const& es) {
     if (std::find(runsToGetDataFor_.begin(), runsToGetDataFor_.end(), ev.run()) != runsToGetDataFor_.end()) {
       ESTestRecordK const& rec = es.get<ESTestRecordK>();
       edm::ESHandle<ESTestDataK> dataK;
       rec.get(dataK);
-      edm::LogAbsolute("ESTestAnalyzerK") << "ESTestAnalyzerK: process = " << moduleDescription().processName() << ": Data value = " << dataK->value();
+      edm::LogAbsolute("ESTestAnalyzerK")
+          << "ESTestAnalyzerK: process = " << moduleDescription().processName() << ": Data value = " << dataK->value();
     }
   }
 
@@ -139,13 +140,11 @@ namespace edmtest {
     std::vector<int> runsToGetDataFor_;
   };
 
-  ESTestAnalyzerAZ::ESTestAnalyzerAZ(edm::ParameterSet const& pset) :
-    runsToGetDataFor_(pset.getParameter<std::vector<int> >("runsToGetDataFor")) {
-  }
+  ESTestAnalyzerAZ::ESTestAnalyzerAZ(edm::ParameterSet const& pset)
+      : runsToGetDataFor_(pset.getParameter<std::vector<int>>("runsToGetDataFor")) {}
 
   void ESTestAnalyzerAZ::analyze(edm::Event const& ev, edm::EventSetup const& es) {
     if (std::find(runsToGetDataFor_.begin(), runsToGetDataFor_.end(), ev.run()) != runsToGetDataFor_.end()) {
-
       ESTestRecordA const& recA = es.get<ESTestRecordA>();
       edm::ESHandle<ESTestDataA> dataA;
       recA.get("foo", dataA);
@@ -154,10 +153,11 @@ namespace edmtest {
       edm::ESHandle<ESTestDataZ> dataZ;
       recZ.get("foo", dataZ);
 
-      edm::LogAbsolute("ESTestAnalyzerAZ") << "ESTestAnalyzerAZ: process = " << moduleDescription().processName() << ": Data values = " << dataA->value() << "  " << dataZ->value();
+      edm::LogAbsolute("ESTestAnalyzerAZ") << "ESTestAnalyzerAZ: process = " << moduleDescription().processName()
+                                           << ": Data values = " << dataA->value() << "  " << dataZ->value();
     }
   }
-}
+}  // namespace edmtest
 using namespace edmtest;
 DEFINE_FWK_MODULE(ESTestAnalyzerA);
 DEFINE_FWK_MODULE(ESTestAnalyzerB);
diff --git a/FWCore/Integration/test/ESTestProducers.cc b/FWCore/Integration/test/ESTestProducers.cc
index f013d16743811..332396eebce4e 100644
--- a/FWCore/Integration/test/ESTestProducers.cc
+++ b/FWCore/Integration/test/ESTestProducers.cc
@@ -15,13 +15,12 @@ namespace edmtest {
   public:
     ESTestProducerA(edm::ParameterSet const&);
     std::unique_ptr<ESTestDataA> produce(ESTestRecordA const&);
+
   private:
     int value_;
   };
 
-  ESTestProducerA::ESTestProducerA(edm::ParameterSet const&) : value_(0) {
-    setWhatProduced(this);
-  }
+  ESTestProducerA::ESTestProducerA(edm::ParameterSet const&) : value_(0) { setWhatProduced(this); }
 
   std::unique_ptr<ESTestDataA> ESTestProducerA::produce(ESTestRecordA const& rec) {
     ++value_;
@@ -34,13 +33,12 @@ namespace edmtest {
   public:
     ESTestProducerB(edm::ParameterSet const&);
     std::unique_ptr<ESTestDataB> produce(ESTestRecordB const&);
+
   private:
     int value_;
   };
 
-  ESTestProducerB::ESTestProducerB(edm::ParameterSet const&) : value_(0) {
-    setWhatProduced(this);
-  }
+  ESTestProducerB::ESTestProducerB(edm::ParameterSet const&) : value_(0) { setWhatProduced(this); }
 
   std::unique_ptr<ESTestDataB> ESTestProducerB::produce(ESTestRecordB const& rec) {
     ++value_;
@@ -55,8 +53,8 @@ namespace edmtest {
     ESTestProducerBUsingHost(edm::ParameterSet const&);
     // Must use shared_ptr if using ReusableObjectHolder
     std::shared_ptr<ESTestDataB> produce(ESTestRecordB const&);
-  private:
 
+  private:
     using HostType = edm::ESProductHost<ESTestDataB,
                                         ESTestRecordC,
                                         ESTestRecordD,
@@ -68,32 +66,19 @@ namespace edmtest {
     edm::ReusableObjectHolder<HostType> holder_;
   };
 
-  ESTestProducerBUsingHost::ESTestProducerBUsingHost(edm::ParameterSet const&) {
-    setWhatProduced(this);
-  }
+  ESTestProducerBUsingHost::ESTestProducerBUsingHost(edm::ParameterSet const&) { setWhatProduced(this); }
 
   std::shared_ptr<ESTestDataB> ESTestProducerBUsingHost::produce(ESTestRecordB const& record) {
-
-    auto host = holder_.makeOrGet([]() {
-      return new HostType(100, 1000);
-    });
+    auto host = holder_.makeOrGet([]() { return new HostType(100, 1000); });
 
     // Test that the numberOfRecordTypes and index functions are working properly
-    if (host->numberOfRecordTypes() != 6 ||
-        host->index<ESTestRecordC>() != 0 ||
-        host->index<ESTestRecordD>() != 1 ||
-        host->index<ESTestRecordE>() != 2 ||
-        host->index<ESTestRecordF>() != 3 ||
-        host->index<ESTestRecordG>() != 4 ||
+    if (host->numberOfRecordTypes() != 6 || host->index<ESTestRecordC>() != 0 || host->index<ESTestRecordD>() != 1 ||
+        host->index<ESTestRecordE>() != 2 || host->index<ESTestRecordF>() != 3 || host->index<ESTestRecordG>() != 4 ||
         host->index<ESTestRecordH>() != 5) {
-
       throw cms::Exception("TestError") << "Either function numberOfRecordTypes or index returns incorrect value";
     }
 
-    host->ifRecordChanges<ESTestRecordC>(record,
-                                         [h=host.get()](auto const& rec) {
-      ++h->value();
-    });
+    host->ifRecordChanges<ESTestRecordC>(record, [h = host.get()](auto const& rec) { ++h->value(); });
 
     ++host->value();
     return host;
@@ -105,13 +90,12 @@ namespace edmtest {
   public:
     ESTestProducerC(edm::ParameterSet const&);
     std::unique_ptr<ESTestDataC> produce(ESTestRecordC const&);
+
   private:
     int value_;
   };
 
-  ESTestProducerC::ESTestProducerC(edm::ParameterSet const&) : value_(0) {
-    setWhatProduced(this);
-  }
+  ESTestProducerC::ESTestProducerC(edm::ParameterSet const&) : value_(0) { setWhatProduced(this); }
 
   std::unique_ptr<ESTestDataC> ESTestProducerC::produce(ESTestRecordC const& rec) {
     ++value_;
@@ -124,13 +108,12 @@ namespace edmtest {
   public:
     ESTestProducerD(edm::ParameterSet const&);
     std::unique_ptr<ESTestDataD> produce(ESTestRecordD const&);
+
   private:
     int value_;
   };
 
-  ESTestProducerD::ESTestProducerD(edm::ParameterSet const&) : value_(0) {
-    setWhatProduced(this);
-  }
+  ESTestProducerD::ESTestProducerD(edm::ParameterSet const&) : value_(0) { setWhatProduced(this); }
 
   std::unique_ptr<ESTestDataD> ESTestProducerD::produce(ESTestRecordD const& rec) {
     ++value_;
@@ -143,13 +126,12 @@ namespace edmtest {
   public:
     ESTestProducerE(edm::ParameterSet const&);
     std::unique_ptr<ESTestDataE> produce(ESTestRecordE const&);
+
   private:
     int value_;
   };
 
-  ESTestProducerE::ESTestProducerE(edm::ParameterSet const&) : value_(0) {
-    setWhatProduced(this);
-  }
+  ESTestProducerE::ESTestProducerE(edm::ParameterSet const&) : value_(0) { setWhatProduced(this); }
 
   std::unique_ptr<ESTestDataE> ESTestProducerE::produce(ESTestRecordE const& rec) {
     ++value_;
@@ -162,13 +144,12 @@ namespace edmtest {
   public:
     ESTestProducerF(edm::ParameterSet const&);
     std::unique_ptr<ESTestDataF> produce(ESTestRecordF const&);
+
   private:
     int value_;
   };
 
-  ESTestProducerF::ESTestProducerF(edm::ParameterSet const&) : value_(0) {
-    setWhatProduced(this);
-  }
+  ESTestProducerF::ESTestProducerF(edm::ParameterSet const&) : value_(0) { setWhatProduced(this); }
 
   std::unique_ptr<ESTestDataF> ESTestProducerF::produce(ESTestRecordF const& rec) {
     ++value_;
@@ -181,13 +162,12 @@ namespace edmtest {
   public:
     ESTestProducerG(edm::ParameterSet const&);
     std::unique_ptr<ESTestDataG> produce(ESTestRecordG const&);
+
   private:
     int value_;
   };
 
-  ESTestProducerG::ESTestProducerG(edm::ParameterSet const&) : value_(0) {
-    setWhatProduced(this);
-  }
+  ESTestProducerG::ESTestProducerG(edm::ParameterSet const&) : value_(0) { setWhatProduced(this); }
 
   std::unique_ptr<ESTestDataG> ESTestProducerG::produce(ESTestRecordG const& rec) {
     ++value_;
@@ -200,13 +180,12 @@ namespace edmtest {
   public:
     ESTestProducerH(edm::ParameterSet const&);
     std::unique_ptr<ESTestDataH> produce(ESTestRecordH const&);
+
   private:
     int value_;
   };
 
-  ESTestProducerH::ESTestProducerH(edm::ParameterSet const&) : value_(0) {
-    setWhatProduced(this);
-  }
+  ESTestProducerH::ESTestProducerH(edm::ParameterSet const&) : value_(0) { setWhatProduced(this); }
 
   std::unique_ptr<ESTestDataH> ESTestProducerH::produce(ESTestRecordH const& rec) {
     ++value_;
@@ -219,13 +198,12 @@ namespace edmtest {
   public:
     ESTestProducerI(edm::ParameterSet const&);
     std::unique_ptr<ESTestDataI> produce(ESTestRecordI const&);
+
   private:
     int value_;
   };
 
-  ESTestProducerI::ESTestProducerI(edm::ParameterSet const&) : value_(0) {
-    setWhatProduced(this);
-  }
+  ESTestProducerI::ESTestProducerI(edm::ParameterSet const&) : value_(0) { setWhatProduced(this); }
 
   std::unique_ptr<ESTestDataI> ESTestProducerI::produce(ESTestRecordI const& rec) {
     ++value_;
@@ -238,13 +216,12 @@ namespace edmtest {
   public:
     ESTestProducerJ(edm::ParameterSet const&);
     std::unique_ptr<ESTestDataJ> produce(ESTestRecordJ const&);
+
   private:
     int value_;
   };
 
-  ESTestProducerJ::ESTestProducerJ(edm::ParameterSet const&) : value_(0) {
-    setWhatProduced(this);
-  }
+  ESTestProducerJ::ESTestProducerJ(edm::ParameterSet const&) : value_(0) { setWhatProduced(this); }
 
   std::unique_ptr<ESTestDataJ> ESTestProducerJ::produce(ESTestRecordJ const& rec) {
     ++value_;
@@ -257,13 +234,12 @@ namespace edmtest {
   public:
     ESTestProducerK(edm::ParameterSet const&);
     std::unique_ptr<ESTestDataK> produce(ESTestRecordK const&);
+
   private:
     int value_;
   };
 
-  ESTestProducerK::ESTestProducerK(edm::ParameterSet const&) : value_(0) {
-    setWhatProduced(this);
-  }
+  ESTestProducerK::ESTestProducerK(edm::ParameterSet const&) : value_(0) { setWhatProduced(this); }
 
   std::unique_ptr<ESTestDataK> ESTestProducerK::produce(ESTestRecordK const& rec) {
     ++value_;
@@ -277,14 +253,13 @@ namespace edmtest {
     ESTestProducerAZ(edm::ParameterSet const&);
     std::unique_ptr<ESTestDataA> produceA(ESTestRecordA const&);
     std::unique_ptr<ESTestDataZ> produceZ(ESTestRecordZ const&);
+
   private:
     int valueA_;
     int valueZ_;
   };
 
-  ESTestProducerAZ::ESTestProducerAZ(edm::ParameterSet const&) :
-    valueA_(0),
-    valueZ_(0) {
+  ESTestProducerAZ::ESTestProducerAZ(edm::ParameterSet const&) : valueA_(0), valueZ_(0) {
     setWhatProduced(this, &edmtest::ESTestProducerAZ::produceA, edm::es::Label("foo"));
     setWhatProduced(this, &edmtest::ESTestProducerAZ::produceZ, edm::es::Label("foo"));
   }
@@ -299,7 +274,7 @@ namespace edmtest {
     return std::make_unique<ESTestDataZ>(valueZ_);
   }
 
-}
+}  // namespace edmtest
 
 using namespace edmtest;
 DEFINE_FWK_EVENTSETUP_MODULE(ESTestProducerA);
diff --git a/FWCore/Integration/test/GadgetRcd.cc b/FWCore/Integration/test/GadgetRcd.cc
index ba0340931a702..bf3ba8bbfd9e1 100644
--- a/FWCore/Integration/test/GadgetRcd.cc
+++ b/FWCore/Integration/test/GadgetRcd.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Integration
 // Class  :     GadgetRcd
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
diff --git a/FWCore/Integration/test/GadgetRcd.h b/FWCore/Integration/test/GadgetRcd.h
index c5a313cb1a288..0d99f59ecfa57 100644
--- a/FWCore/Integration/test/GadgetRcd.h
+++ b/FWCore/Integration/test/GadgetRcd.h
@@ -4,7 +4,7 @@
 //
 // Package:     Integration
 // Class  :     GadgetRcd
-// 
+//
 /**\class GadgetRcd GadgetRcd.h FWCore/Integration/interface/GadgetRcd.h
 
  Description: <one line class summary>
@@ -23,4 +23,3 @@
 class GadgetRcd : public edm::eventsetup::EventSetupRecordImplementation<GadgetRcd> {};
 
 #endif
-
diff --git a/FWCore/Integration/test/HierarchicalAlgorithms.h b/FWCore/Integration/test/HierarchicalAlgorithms.h
index f1d9d38b8ab0c..1791e4e0f360e 100644
--- a/FWCore/Integration/test/HierarchicalAlgorithms.h
+++ b/FWCore/Integration/test/HierarchicalAlgorithms.h
@@ -10,34 +10,28 @@
 
 namespace edmtest {
 
-  class alg_2
-  {
+  class alg_2 {
   public:
-    explicit alg_2(const edm::ParameterSet& ps) :
-      flavor_(ps.getParameter<std::string>("flavor")),
-      debugLevel_(ps.getUntrackedParameter<int>("debug", 0))
-    { }
+    explicit alg_2(const edm::ParameterSet& ps)
+        : flavor_(ps.getParameter<std::string>("flavor")), debugLevel_(ps.getUntrackedParameter<int>("debug", 0)) {}
 
     std::string& flavor() { return flavor_; }
 
   private:
     std::string flavor_;
-    int         debugLevel_;
+    int debugLevel_;
   };
 
-  class alg_1
-  {
+  class alg_1 {
   public:
-    explicit alg_1(const edm::ParameterSet& ps) : 
-      count_(ps.getParameter<int>("count")),
-      inner_alg_(ps.getParameterSet("nest_2"))
-    { }
+    explicit alg_1(const edm::ParameterSet& ps)
+        : count_(ps.getParameter<int>("count")), inner_alg_(ps.getParameterSet("nest_2")) {}
 
   private:
-    int   count_;
+    int count_;
     alg_2 inner_alg_;
   };
 
-}
+}  // namespace edmtest
 
 #endif
diff --git a/FWCore/Integration/test/HierarchicalEDProducer.cc b/FWCore/Integration/test/HierarchicalEDProducer.cc
index 47c5a1659e3d3..d96fe94c469c9 100644
--- a/FWCore/Integration/test/HierarchicalEDProducer.cc
+++ b/FWCore/Integration/test/HierarchicalEDProducer.cc
@@ -3,18 +3,18 @@
 
 namespace edmtest {
 
-  HierarchicalEDProducer::HierarchicalEDProducer(edm::ParameterSet const& ps) :
-    radius_ (ps.getParameter<double>("radius")),
-    outer_alg_(ps.getParameterSet("nest_1"))
-  { produces<int>();}
+  HierarchicalEDProducer::HierarchicalEDProducer(edm::ParameterSet const& ps)
+      : radius_(ps.getParameter<double>("radius")), outer_alg_(ps.getParameterSet("nest_1")) {
+    produces<int>();
+  }
 
   // Virtual destructor needed.
-  HierarchicalEDProducer::~HierarchicalEDProducer() {}  
+  HierarchicalEDProducer::~HierarchicalEDProducer() {}
 
   // Functions that gets called by framework every event
   void HierarchicalEDProducer::produce(edm::Event&, edm::EventSetup const&) {
     // nothing to do ... is just a dummy!
   }
-}
+}  // namespace edmtest
 using edmtest::HierarchicalEDProducer;
 DEFINE_FWK_MODULE(HierarchicalEDProducer);
diff --git a/FWCore/Integration/test/HierarchicalEDProducer.h b/FWCore/Integration/test/HierarchicalEDProducer.h
index dfa025c6a5783..9cda31d9b3b1b 100644
--- a/FWCore/Integration/test/HierarchicalEDProducer.h
+++ b/FWCore/Integration/test/HierarchicalEDProducer.h
@@ -12,11 +12,9 @@
 #include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Integration/test/HierarchicalAlgorithms.h"
 
-
 namespace edmtest {
   class HierarchicalEDProducer : public edm::EDProducer {
   public:
-
     explicit HierarchicalEDProducer(edm::ParameterSet const& ps);
 
     virtual ~HierarchicalEDProducer();
@@ -24,8 +22,8 @@ namespace edmtest {
     virtual void produce(edm::Event& e, edm::EventSetup const& c);
 
   private:
-    double       radius_;
-    alg_1        outer_alg_;
+    double radius_;
+    alg_1 outer_alg_;
   };
-}
+}  // namespace edmtest
 #endif
diff --git a/FWCore/Integration/test/HistProducer.cc b/FWCore/Integration/test/HistProducer.cc
index d16c1013259d9..db6829ef22810 100644
--- a/FWCore/Integration/test/HistProducer.cc
+++ b/FWCore/Integration/test/HistProducer.cc
@@ -11,16 +11,15 @@ namespace edmtest {
   }
 
   // Virtual destructor needed.
-  HistProducer::~HistProducer() { }  
+  HistProducer::~HistProducer() {}
 
   // Functions that gets called by framework every event
   void HistProducer::produce(edm::Event& e, edm::EventSetup const&) {
-
     //Empty Histograms
     e.put(std::make_unique<TH1F>());
     //e.put(std::make_unique<ThingWithHist>());
   }
 
-}
+}  // namespace edmtest
 using edmtest::HistProducer;
 DEFINE_FWK_MODULE(HistProducer);
diff --git a/FWCore/Integration/test/HistProducer.h b/FWCore/Integration/test/HistProducer.h
index ce2ba40bc28e6..2cfed9fca00b9 100644
--- a/FWCore/Integration/test/HistProducer.h
+++ b/FWCore/Integration/test/HistProducer.h
@@ -6,12 +6,11 @@
 
 namespace edmtest {
   //struct ThingWithHist {
-//	TH1F hist_;
- // };
+  //	TH1F hist_;
+  // };
 
   class HistProducer : public edm::EDProducer {
   public:
-
     explicit HistProducer(edm::ParameterSet const& ps);
 
     virtual ~HistProducer();
@@ -20,5 +19,5 @@ namespace edmtest {
 
   private:
   };
-}
+}  // namespace edmtest
 #endif
diff --git a/FWCore/Integration/test/IntSource.cc b/FWCore/Integration/test/IntSource.cc
index 697458288dfa1..1713ad7232d86 100644
--- a/FWCore/Integration/test/IntSource.cc
+++ b/FWCore/Integration/test/IntSource.cc
@@ -15,35 +15,28 @@ namespace edm {
     explicit IntSource(ParameterSet const&, InputSourceDescription const&);
     ~IntSource();
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
+
   private:
     virtual bool setRunAndEventInfo(EventID& id, TimeValue_t& time, edm::EventAuxiliary::ExperimentType& eType);
-    virtual void produce(Event &);
+    virtual void produce(Event&);
   };
 
-  IntSource::IntSource(ParameterSet const& pset,
-                                       InputSourceDescription const& desc) :
-    ProducerSourceBase(pset, desc, false)
-  { produces<edmtest::IntProduct>(); }
-
-  IntSource::~IntSource() {
+  IntSource::IntSource(ParameterSet const& pset, InputSourceDescription const& desc)
+      : ProducerSourceBase(pset, desc, false) {
+    produces<edmtest::IntProduct>();
   }
 
-  bool
-  IntSource::setRunAndEventInfo(EventID&, TimeValue_t&, edm::EventAuxiliary::ExperimentType&) {
-    return true;
-  }
+  IntSource::~IntSource() {}
 
-  void
-  IntSource::produce(edm::Event& e) {
-    e.put(std::make_unique<edmtest::IntProduct>(4));
-  }
+  bool IntSource::setRunAndEventInfo(EventID&, TimeValue_t&, edm::EventAuxiliary::ExperimentType&) { return true; }
+
+  void IntSource::produce(edm::Event& e) { e.put(std::make_unique<edmtest::IntProduct>(4)); }
 
-  void
-  IntSource::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void IntSource::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     ProducerSourceBase::fillDescription(desc);
     descriptions.add("source", desc);
   }
-}
+}  // namespace edm
 using edm::IntSource;
 DEFINE_FWK_INPUT_SOURCE(IntSource);
diff --git a/FWCore/Integration/test/ManyProductProducer.cc b/FWCore/Integration/test/ManyProductProducer.cc
index d9b820780e0c6..a0fef677c1972 100644
--- a/FWCore/Integration/test/ManyProductProducer.cc
+++ b/FWCore/Integration/test/ManyProductProducer.cc
@@ -18,7 +18,6 @@ namespace edmtest {
 
   class ManyProductProducer : public edm::EDProducer {
   public:
-
     explicit ManyProductProducer(edm::ParameterSet const& iConfig);
 
     virtual ~ManyProductProducer();
@@ -30,11 +29,9 @@ namespace edmtest {
     std::vector<std::string> instanceNames_;
   };
 
-  
-  ManyProductProducer::ManyProductProducer(edm::ParameterSet const& iConfig) : 
-    nProducts_(iConfig.getUntrackedParameter<unsigned int>("nProducts",1))
-  {
-    for(unsigned int i = 0; i < nProducts_; ++i) {
+  ManyProductProducer::ManyProductProducer(edm::ParameterSet const& iConfig)
+      : nProducts_(iConfig.getUntrackedParameter<unsigned int>("nProducts", 1)) {
+    for (unsigned int i = 0; i < nProducts_; ++i) {
       std::stringstream instanceName;
       instanceName << "i" << i;
       instanceNames_.push_back(instanceName.str());
@@ -42,17 +39,15 @@ namespace edmtest {
     }
   }
 
-  ManyProductProducer::~ManyProductProducer() { }  
+  ManyProductProducer::~ManyProductProducer() {}
 
   // Functions that gets called by framework every event
   void ManyProductProducer::produce(edm::Event& e, edm::EventSetup const&) {
-    for(unsigned int i = 0; i < nProducts_; ++i) {
-    
+    for (unsigned int i = 0; i < nProducts_; ++i) {
       e.put(std::make_unique<IntProduct>(1), instanceNames_[i]);
     }
   }
 
-
   class ManyProductAnalyzer : public edm::EDAnalyzer {
   public:
     explicit ManyProductAnalyzer(edm::ParameterSet const& iConfig);
@@ -60,24 +55,23 @@ namespace edmtest {
     virtual ~ManyProductAnalyzer();
 
     void analyze(edm::Event const&, edm::EventSetup const&);
+
   private:
     unsigned int nProducts_;
     std::vector<edm::InputTag> tags_;
   };
 
-  ManyProductAnalyzer::ManyProductAnalyzer(edm::ParameterSet const& iConfig) :
-    nProducts_(iConfig.getUntrackedParameter<unsigned int>("nProducts",1)) {
-
-    for(unsigned int i = 0; i < nProducts_; ++i) {
+  ManyProductAnalyzer::ManyProductAnalyzer(edm::ParameterSet const& iConfig)
+      : nProducts_(iConfig.getUntrackedParameter<unsigned int>("nProducts", 1)) {
+    for (unsigned int i = 0; i < nProducts_; ++i) {
       std::stringstream instanceName;
       instanceName << "i" << i;
       edm::InputTag tag("produceInts", instanceName.str());
       tags_.push_back(tag);
     }
   }
-  
 
-  ManyProductAnalyzer::~ManyProductAnalyzer() { }  
+  ManyProductAnalyzer::~ManyProductAnalyzer() {}
 
   void ManyProductAnalyzer::analyze(edm::Event const& e, edm::EventSetup const&) {
     edm::Handle<IntProduct> h;
@@ -88,7 +82,7 @@ namespace edmtest {
       }
     }
   }
-}
+}  // namespace edmtest
 
 using edmtest::ManyProductProducer;
 DEFINE_FWK_MODULE(ManyProductProducer);
diff --git a/FWCore/Integration/test/MissingDictionaryTestProducer.cc b/FWCore/Integration/test/MissingDictionaryTestProducer.cc
index d1a1fa85979c2..84d3347c6db22 100644
--- a/FWCore/Integration/test/MissingDictionaryTestProducer.cc
+++ b/FWCore/Integration/test/MissingDictionaryTestProducer.cc
@@ -28,21 +28,18 @@ namespace edmtest {
 
   class MissingDictionaryTestProducer : public edm::one::EDProducer<> {
   public:
-
     explicit MissingDictionaryTestProducer(edm::ParameterSet const&);
     virtual ~MissingDictionaryTestProducer();
 
     void produce(edm::Event&, edm::EventSetup const&) override;
 
   private:
-
     edm::EDGetTokenT<MissingDictionaryTestA> inputToken1_;
     edm::EDGetTokenT<std::vector<MissingDictionaryTestA> > inputToken2_;
     edm::EDGetTokenT<std::list<MissingDictionaryTestA> > inputToken3_;
   };
 
   MissingDictionaryTestProducer::MissingDictionaryTestProducer(edm::ParameterSet const& pset) {
-
     consumes<edm::View<MissingDictionaryTestA> >(pset.getParameter<edm::InputTag>("inputTag"));
     inputToken1_ = consumes<MissingDictionaryTestA>(pset.getParameter<edm::InputTag>("inputTag"));
     inputToken2_ = consumes<std::vector<MissingDictionaryTestA> >(pset.getParameter<edm::InputTag>("inputTag"));
@@ -55,10 +52,9 @@ namespace edmtest {
     produces<std::list<MissingDictionaryTestA> >();
   }
 
-  MissingDictionaryTestProducer::~MissingDictionaryTestProducer() { }
+  MissingDictionaryTestProducer::~MissingDictionaryTestProducer() {}
 
   void MissingDictionaryTestProducer::produce(edm::Event& event, edm::EventSetup const&) {
-
     edm::Handle<MissingDictionaryTestA> h1;
     //event.getByToken(inputToken1_, h1);
 
@@ -77,6 +73,6 @@ namespace edmtest {
     auto result4 = std::make_unique<std::vector<MissingDictionaryTestA> >();
     event.put(std::move(result4), "anInstance");
   }
-}
+}  // namespace edmtest
 using edmtest::MissingDictionaryTestProducer;
 DEFINE_FWK_MODULE(MissingDictionaryTestProducer);
diff --git a/FWCore/Integration/test/OtherThingAlgorithm.cc b/FWCore/Integration/test/OtherThingAlgorithm.cc
index c10b76b9caed5..e9e7c7de33d35 100644
--- a/FWCore/Integration/test/OtherThingAlgorithm.cc
+++ b/FWCore/Integration/test/OtherThingAlgorithm.cc
@@ -6,10 +6,9 @@
 
 namespace edmtest {
   void OtherThingAlgorithm::run(edm::Handle<ThingCollection> const& parentHandle,
-				OtherThingCollection& result,
-				bool useRefs,
-				bool refsAreTransient) const {
-
+                                OtherThingCollection& result,
+                                bool useRefs,
+                                bool refsAreTransient) const {
     const size_t numToMake = 20;
     result.reserve(numToMake);
     ThingCollection const* parent = parentHandle.product();
@@ -25,19 +24,19 @@ namespace edmtest {
         element.ref = edm::Ref<ThingCollection>(element.refProd, i);
         element.refVec.push_back(element.ref);
         element.refVec.push_back(element.ref);
-        element.refVec.push_back(edm::Ref<ThingCollection>(parent, 19-i));
+        element.refVec.push_back(edm::Ref<ThingCollection>(parent, 19 - i));
         edm::RefVector<ThingCollection>::iterator ri = element.refVec.begin();
         element.refVec.erase(ri);
         element.oneNullOneNot.push_back(edm::Ref<ThingCollection>(null, 0));
         element.oneNullOneNot.push_back(edm::Ref<ThingCollection>(parent, 0));
-        assert(element.oneNullOneNot.size() == 2); // we'll check this in our tests
+        assert(element.oneNullOneNot.size() == 2);  // we'll check this in our tests
         element.ptr = edm::Ptr<Thing>(&parent->at(i), i);
-        assert (element.ptr == edm::refToPtr(element.ref));
+        assert(element.ptr == edm::refToPtr(element.ref));
         element.ptrVec.push_back(element.ptr);
-        element.ptrVec.push_back(edm::Ptr<Thing>(&parent->at(19-i), 19-i));
+        element.ptrVec.push_back(edm::Ptr<Thing>(&parent->at(19 - i), 19 - i));
         element.ptrOneNullOneNot.push_back(edm::Ptr<Thing>(nullptr, 0ul));
         element.ptrOneNullOneNot.push_back(edm::Ptr<Thing>(&parent->at(0), 0ul));
-        assert(element.ptrOneNullOneNot.size() == 2); // we'll check this in our tests
+        assert(element.ptrOneNullOneNot.size() == 2);  // we'll check this in our tests
         edm::RefProd<ThingCollection> refProd = edm::RefProd<ThingCollection>(parentHandle);
         edm::Ref<ThingCollection> ref = edm::Ref<ThingCollection>(refProd, i);
         element.refToBaseProd = edm::RefToBaseProd<Thing>(refProd);
@@ -48,19 +47,19 @@ namespace edmtest {
         element.ref = edm::Ref<ThingCollection>(element.refProd, i);
         element.refVec.push_back(element.ref);
         element.refVec.push_back(element.ref);
-        element.refVec.push_back(edm::Ref<ThingCollection>(parentHandle, 19-i));
+        element.refVec.push_back(edm::Ref<ThingCollection>(parentHandle, 19 - i));
         edm::RefVector<ThingCollection>::iterator ri = element.refVec.begin();
         element.refVec.erase(ri);
         element.oneNullOneNot.push_back(edm::Ref<ThingCollection>(parentHandle.id()));
         element.oneNullOneNot.push_back(edm::Ref<ThingCollection>(parentHandle, 0));
-        assert(element.oneNullOneNot.size() == 2); // we'll check this in our tests
+        assert(element.oneNullOneNot.size() == 2);  // we'll check this in our tests
         element.ptr = edm::Ptr<Thing>(parentHandle, i);
-        assert (element.ptr == edm::refToPtr(element.ref));
+        assert(element.ptr == edm::refToPtr(element.ref));
         element.ptrVec.push_back(element.ptr);
-        element.ptrVec.push_back(edm::Ptr<Thing>(parentHandle, 19-i));
+        element.ptrVec.push_back(edm::Ptr<Thing>(parentHandle, 19 - i));
         element.ptrOneNullOneNot.push_back(edm::Ptr<Thing>(parentHandle.id()));
         element.ptrOneNullOneNot.push_back(edm::Ptr<Thing>(parentHandle, 0));
-        assert(element.ptrOneNullOneNot.size() == 2); // we'll check this in our tests
+        assert(element.ptrOneNullOneNot.size() == 2);  // we'll check this in our tests
         edm::RefProd<ThingCollection> refProd = edm::RefProd<ThingCollection>(parentHandle);
         edm::Ref<ThingCollection> ref = edm::Ref<ThingCollection>(refProd, i);
         element.refToBaseProd = edm::RefToBaseProd<Thing>(element.refProd);
@@ -70,4 +69,4 @@ namespace edmtest {
       //      element.refVec.clear(); // no need to clear; 'element' is created anew on every loop
     }
   }
-}
+}  // namespace edmtest
diff --git a/FWCore/Integration/test/OtherThingAlgorithm.h b/FWCore/Integration/test/OtherThingAlgorithm.h
index 1c6412b2f27e8..84bfdfc719cb2 100644
--- a/FWCore/Integration/test/OtherThingAlgorithm.h
+++ b/FWCore/Integration/test/OtherThingAlgorithm.h
@@ -12,18 +12,18 @@ namespace edmtest {
   class OtherThingAlgorithm {
   public:
     OtherThingAlgorithm() : theDebugLevel(0) {}
-  
+
     /// Runs the algorithm and returns a list of OtherThings
     /// The user declares the vector and calls this method.
     void run(edm::Handle<ThingCollection> const& iThingHandle,
              OtherThingCollection& otherThingCollection,
              bool useRefs = true,
              bool refsAreTransient = false) const;
-  
+
   private:
-    int    theDebugLevel;
+    int theDebugLevel;
   };
 
-}
-  
+}  // namespace edmtest
+
 #endif
diff --git a/FWCore/Integration/test/OtherThingAnalyzer.cc b/FWCore/Integration/test/OtherThingAnalyzer.cc
index acd5539eedde7..efe9d20c25848 100644
--- a/FWCore/Integration/test/OtherThingAnalyzer.cc
+++ b/FWCore/Integration/test/OtherThingAnalyzer.cc
@@ -10,56 +10,49 @@
 #include "FWCore/Framework/interface/stream/EDAnalyzer.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-
 namespace edmtest {
-  
+
   class OtherThingAnalyzer : public edm::stream::EDAnalyzer<> {
   public:
-    
     explicit OtherThingAnalyzer(edm::ParameterSet const& pset);
-    
+
     virtual void analyze(edm::Event const& e, edm::EventSetup const& c) override;
-    
+
     void doit(edm::Event const& event, std::string const& label);
-    
+
     static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
   private:
     bool thingWasDropped_;
     edm::InputTag otherTag_;
   };
-  
-  OtherThingAnalyzer::OtherThingAnalyzer(edm::ParameterSet const& pset) :
-    thingWasDropped_(pset.getUntrackedParameter<bool>("thingWasDropped")),
-    otherTag_(pset.getUntrackedParameter<edm::InputTag>("other"))
- {
-   consumes<OtherThingCollection>(otherTag_);
-  }
 
-  void OtherThingAnalyzer::analyze(edm::Event const& e, edm::EventSetup const&) {
-    doit(e, std::string("testUserTag"));
+  OtherThingAnalyzer::OtherThingAnalyzer(edm::ParameterSet const& pset)
+      : thingWasDropped_(pset.getUntrackedParameter<bool>("thingWasDropped")),
+        otherTag_(pset.getUntrackedParameter<edm::InputTag>("other")) {
+    consumes<OtherThingCollection>(otherTag_);
   }
 
+  void OtherThingAnalyzer::analyze(edm::Event const& e, edm::EventSetup const&) { doit(e, std::string("testUserTag")); }
+
   void OtherThingAnalyzer::doit(edm::Event const& dv, std::string const& label) {
     edm::Handle<OtherThingCollection> otherThings;
     dv.getByLabel(otherTag_, otherThings);
     edm::LogInfo("OtherThingAnalyzer") << " --------------- next event ------------ \n";
     int i = 0;
-    for (OtherThingCollection::const_iterator it = otherThings->begin(), itEnd = otherThings->end();
-        it != itEnd; ++it, ++i) {
+    for (OtherThingCollection::const_iterator it = otherThings->begin(), itEnd = otherThings->end(); it != itEnd;
+         ++it, ++i) {
       OtherThing const& otherThing = *it;
 
       if (otherThing.oneNullOneNot.size() != 2) {
-	throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") 
-	  << " oneNullOneNot has wrong length: " << otherThing.oneNullOneNot.size()
-	  << " should be 2\n";
+        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+            << " oneNullOneNot has wrong length: " << otherThing.oneNullOneNot.size() << " should be 2\n";
       }
       if (otherThing.oneNullOneNot[0].isNonnull()) {
-	throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
-	  << " expected null Ref is not null\n";
+        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << " expected null Ref is not null\n";
       }
       if (otherThing.oneNullOneNot[1].isNull()) {
-	throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
-	  << " expected non-null Ref is null\n";
+        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << " expected non-null Ref is null\n";
       }
 
       bool shouldBeTrue = otherThing.refVec[0] != otherThing.refVec[1];
@@ -72,15 +65,18 @@ namespace edmtest {
       }
       shouldBeTrue = otherThing.refProd == otherThing.refProd;
       if (!shouldBeTrue) {
-        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "RefProd Equality has incorrect value\n";
+        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+            << "RefProd Equality has incorrect value\n";
       }
       shouldBeTrue = otherThing.refVec[0].isNonnull();
       if (!shouldBeTrue) {
-        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "Non-null check has incorrect value\n";
+        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+            << "Non-null check has incorrect value\n";
       }
       shouldBeTrue = otherThing.refProd.isNonnull();
       if (!shouldBeTrue) {
-        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "RefProd non-null check has incorrect value\n";
+        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+            << "RefProd non-null check has incorrect value\n";
       }
       shouldBeTrue = !(!otherThing.refVec[0]);
       if (!shouldBeTrue) {
@@ -96,28 +92,27 @@ namespace edmtest {
       }
       shouldBeTrue = (otherThing.refVec == otherThing.refVec);
       if (!shouldBeTrue) {
-        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "RefVector equality has incorrect value\n";
+        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+            << "RefVector equality has incorrect value\n";
       }
       shouldBeTrue = !(otherThing.refVec != otherThing.refVec);
       if (!shouldBeTrue) {
-        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "RefVector inequality has incorrect value\n";
+        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+            << "RefVector inequality has incorrect value\n";
       }
       assert(otherThing.refProd.isAvailable() != thingWasDropped_);
       assert(otherThing.ref.isAvailable() != thingWasDropped_);
       assert(otherThing.refVec.isAvailable() != thingWasDropped_);
 
       if (otherThing.ptrOneNullOneNot.size() != 2) {
-	throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") 
-	  << " ptrOneNullOneNot has wrong length: " << otherThing.ptrOneNullOneNot.size()
-	  << " should be 2\n";
+        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+            << " ptrOneNullOneNot has wrong length: " << otherThing.ptrOneNullOneNot.size() << " should be 2\n";
       }
       if (otherThing.ptrOneNullOneNot[0].isNonnull()) {
-	throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
-	  << " expected null Ptr is not null\n";
+        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << " expected null Ptr is not null\n";
       }
       if (otherThing.ptrOneNullOneNot[1].isNull()) {
-	throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
-	  << " expected non-null Ptr is null\n";
+        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << " expected non-null Ptr is null\n";
       }
 
       shouldBeTrue = otherThing.ptrVec[0] != otherThing.ptrVec[1];
@@ -130,7 +125,8 @@ namespace edmtest {
       }
       shouldBeTrue = otherThing.ptrVec[0].isNonnull();
       if (!shouldBeTrue) {
-        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "Non-null check has incorrect value\n";
+        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+            << "Non-null check has incorrect value\n";
       }
       shouldBeTrue = !(!otherThing.ptrVec[0]);
       if (!shouldBeTrue) {
@@ -142,74 +138,89 @@ namespace edmtest {
       }
       shouldBeTrue = (otherThing.ptrVec == otherThing.ptrVec);
       if (!shouldBeTrue) {
-        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "PtrVector equality has incorrect value\n";
+        throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+            << "PtrVector equality has incorrect value\n";
       }
       assert(otherThing.ptr.isAvailable() != thingWasDropped_);
       assert(otherThing.ptrVec.isAvailable() != thingWasDropped_);
 
-      if (thingWasDropped_) return;
+      if (thingWasDropped_)
+        return;
       {
         ThingCollection const& tcoll = *otherThing.refProd;
         ThingCollection::size_type size1 = tcoll.size();
         ThingCollection::size_type size2 = otherThing.refProd->size();
         if (size1 == 0 || size1 != size2) {
-          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << " RefProd size mismatch " << std::endl;
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << " RefProd size mismatch " << std::endl;
         }
-  
+
         Thing const& tc = *otherThing.ref;
         int const& x = otherThing.ref->a;
         if (tc.a == i && x == i) {
-          edm::LogInfo("OtherThingAnalyzer") << " ITEM " << i << " LABEL " << label << " dereferenced from edm::Ref successfully.\n";
+          edm::LogInfo("OtherThingAnalyzer")
+              << " ITEM " << i << " LABEL " << label << " dereferenced from edm::Ref successfully.\n";
         } else {
-          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "ITEM " << i << " has incorrect edm::Ref value " << tc.a << '\n';
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "ITEM " << i << " has incorrect edm::Ref value " << tc.a << '\n';
         }
-        
+
         edm::View<Thing> const& viewThing = *otherThing.refToBaseProd;
         edm::View<Thing>::size_type const viewSize1 = viewThing.size();
         edm::View<Thing>::size_type const viewSize2 = otherThing.refToBaseProd->size();
         if (viewSize1 == 0 || viewSize2 != viewSize1) {
-          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << " RefToBaseProd size mismatch " << std::endl;
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << " RefToBaseProd size mismatch " << std::endl;
         }
         if (viewSize1 != size1) {
-          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << " RefToBaseProd size mismatch to RefProd size" << std::endl;
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << " RefToBaseProd size mismatch to RefProd size" << std::endl;
         }
         edm::Ref<ThingCollection> refFromCast = otherThing.refToBase.castTo<edm::Ref<ThingCollection> >();
         edm::Ptr<Thing> ptrFromCast = otherThing.refToBase.castTo<edm::Ptr<Thing> >();
         Thing const& tcBase = *otherThing.refToBase;
-        if(tcBase.a != refFromCast->a) {
-          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << " Ref from RefToBase::castTo has incorrect value " << '\n';
+        if (tcBase.a != refFromCast->a) {
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << " Ref from RefToBase::castTo has incorrect value " << '\n';
         }
-        if(tcBase.a != ptrFromCast->a) {
-          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << " Ptr from RefToBase::castTo has incorrect value " << '\n';
+        if (tcBase.a != ptrFromCast->a) {
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << " Ptr from RefToBase::castTo has incorrect value " << '\n';
         }
         int const& xBase = otherThing.refToBase->a;
         if (tcBase.a == i && xBase == i) {
-          edm::LogInfo("OtherThingAnalyzer") << " ITEM " << i << " LABEL " << label << " RefToBase dereferenced successfully.\n";
+          edm::LogInfo("OtherThingAnalyzer")
+              << " ITEM " << i << " LABEL " << label << " RefToBase dereferenced successfully.\n";
         } else {
-          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "ITEM " << i << " RefToBase has incorrect value " << tc.a << '\n';
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "ITEM " << i << " RefToBase has incorrect value " << tc.a << '\n';
         }
-  
+
         Thing const& tcv = *otherThing.refVec[0];
         int const& xv = otherThing.refVec[0]->a;
         if (xv != tcv.a || xv != i) {
-          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "VECTOR ITEM 0 " << i << " has incorrect value " << tcv.a << '\n';
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "VECTOR ITEM 0 " << i << " has incorrect value " << tcv.a << '\n';
         }
         Thing const& tcv1 = *otherThing.refVec[1];
         int const& xv1 = otherThing.refVec[1]->a;
-        if (xv1 != tcv1.a || xv1 != 19-i) {
-          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "VECTOR ITEM 1 " << i << " has incorrect value " << tcv1.a << '\n';
+        if (xv1 != tcv1.a || xv1 != 19 - i) {
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "VECTOR ITEM 1 " << i << " has incorrect value " << tcv1.a << '\n';
         }
         for (edm::RefVector<ThingCollection>::iterator it = otherThing.refVec.begin(), itEnd = otherThing.refVec.end();
-            it != itEnd; ++it) {
+             it != itEnd;
+             ++it) {
           edm::Ref<ThingCollection> tcol = *it;
           Thing const& ti = **it;
           int const& xi = (*it)->a;
-  	if (xi != ti.a) {
-          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "iterator item " << ti.a << " " << xi << '\n';
+          if (xi != ti.a) {
+            throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+                << "iterator item " << ti.a << " " << xi << '\n';
           } else if (it == otherThing.refVec.begin() && xi != i) {
-          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "iterator item 0" << xi << '\n';
-          } else if (it != otherThing.refVec.begin() && xi != 19-i) {
-          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "iterator item 1" << xi << '\n';
+            throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "iterator item 0" << xi << '\n';
+          } else if (it != otherThing.refVec.begin() && xi != 19 - i) {
+            throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "iterator item 1" << xi << '\n';
           }
         }
         edm::RefVector<ThingCollection>::iterator it0 = otherThing.refVec.begin();
@@ -218,61 +229,75 @@ namespace edmtest {
         int one = (*it1)->a;
         it1 = 1 + it0;
         int x1 = (*it1)->a;
-        if (x1 != one) throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
-          << "operator+ iterator error: " << x1 << " " << one << '\n';
+        if (x1 != one)
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "operator+ iterator error: " << x1 << " " << one << '\n';
         it0 = it1 - 1;
         int x0 = (*it0)->a;
-        if (x0 != zero) throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
-          << "operator- iterator error: " << x0 << " " << zero << '\n';
+        if (x0 != zero)
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "operator- iterator error: " << x0 << " " << zero << '\n';
         x0 = (*(it0++))->a;
-        if (x0 != zero) throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
-          << "operator++ iterator error: " << x0 << " " << zero << '\n';
+        if (x0 != zero)
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "operator++ iterator error: " << x0 << " " << zero << '\n';
         x1 = (*it0)->a;
-        if (x1 != one) throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
-          << "operator++ iterator error 2: " << x1 << " " << one << '\n';
+        if (x1 != one)
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "operator++ iterator error 2: " << x1 << " " << one << '\n';
         x1 = (*(it0--))->a;
-        if (x1 != one) throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
-          << "operator-- iterator error: " << x1 << " " << one << '\n';
+        if (x1 != one)
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "operator-- iterator error: " << x1 << " " << one << '\n';
         x0 = (*it0)->a;
-        if (x0 != zero) throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
-          << "operator-- iterator error 2: " << x0 << " " << zero << '\n';
+        if (x0 != zero)
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "operator-- iterator error 2: " << x0 << " " << zero << '\n';
         x1 = it0[1]->a;
-        if (x1 != one) throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
-          << "operator[] iterator error: " << x1 << " " << one << '\n';
+        if (x1 != one)
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "operator[] iterator error: " << x1 << " " << one << '\n';
         x1 = it1[0]->a;
-        if (x1 != one) throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
-          << "operator[] iterator error 2: " << x1 << " " << one << '\n';
+        if (x1 != one)
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "operator[] iterator error 2: " << x1 << " " << one << '\n';
       }
       {
         Thing const& tc = *otherThing.ptr;
         int const& x = otherThing.ptr->a;
         if (tc.a == i && x == i) {
-          edm::LogInfo("OtherThingAnalyzer") << " ITEM " << i << " LABEL " << label << " dereferenced from edm::Ptr successfully.\n";
+          edm::LogInfo("OtherThingAnalyzer")
+              << " ITEM " << i << " LABEL " << label << " dereferenced from edm::Ptr successfully.\n";
         } else {
-          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "ITEM " << i << " has incorrect edm::Ptr value " << tc.a << '\n';
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "ITEM " << i << " has incorrect edm::Ptr value " << tc.a << '\n';
         }
-        
+
         Thing const& tcv = *otherThing.ptrVec[0];
         int const& xv = otherThing.ptrVec[0]->a;
         if (xv != tcv.a || xv != i) {
-          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "VECTOR ITEM 0 " << i << " has incorrect value " << tcv.a << '\n';
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "VECTOR ITEM 0 " << i << " has incorrect value " << tcv.a << '\n';
         }
         Thing const& tcv1 = *otherThing.ptrVec[1];
         int const& xv1 = otherThing.ptrVec[1]->a;
-        if (xv1 != tcv1.a || xv1 != 19-i) {
-          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "VECTOR ITEM 1 " << i << " has incorrect value " << tcv1.a << '\n';
+        if (xv1 != tcv1.a || xv1 != 19 - i) {
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "VECTOR ITEM 1 " << i << " has incorrect value " << tcv1.a << '\n';
         }
         for (edm::PtrVector<Thing>::const_iterator it = otherThing.ptrVec.begin(), itEnd = otherThing.ptrVec.end();
-            it != itEnd; ++it) {
+             it != itEnd;
+             ++it) {
           edm::Ptr<Thing> tcol = *it;
           Thing const& ti = **it;
           int const& xi = (*it)->a;
-  	if (xi != ti.a) {
-          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "iterator item " << ti.a << " " << xi << '\n';
+          if (xi != ti.a) {
+            throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+                << "iterator item " << ti.a << " " << xi << '\n';
           } else if (it == otherThing.ptrVec.begin() && xi != i) {
-          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "iterator item 0" << xi << '\n';
-          } else if (it != otherThing.ptrVec.begin() && xi != 19-i) {
-          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "iterator item 1" << xi << '\n';
+            throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "iterator item 0" << xi << '\n';
+          } else if (it != otherThing.ptrVec.begin() && xi != 19 - i) {
+            throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze") << "iterator item 1" << xi << '\n';
           }
         }
         edm::PtrVector<Thing>::const_iterator it0 = otherThing.ptrVec.begin();
@@ -281,35 +306,45 @@ namespace edmtest {
         int one = (*it1)->a;
         it1 = it0 + 1;
         int x1 = (*it1)->a;
-        if (x1 != one) throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
-          << "operator+ iterator error: " << x1 << " " << one << '\n';
+        if (x1 != one)
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "operator+ iterator error: " << x1 << " " << one << '\n';
         it0 = it1 - 1;
         int x0 = (*it0)->a;
-        if (x0 != zero) throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
-          << "operator- iterator error: " << x0 << " " << zero << '\n';
+        if (x0 != zero)
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "operator- iterator error: " << x0 << " " << zero << '\n';
         x0 = (*(it0++))->a;
-        if (x0 != zero) throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
-          << "operator++ iterator error: " << x0 << " " << zero << '\n';
+        if (x0 != zero)
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "operator++ iterator error: " << x0 << " " << zero << '\n';
         x1 = (*it0)->a;
-        if (x1 != one) throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
-          << "operator++ iterator error 2: " << x1 << " " << one << '\n';
+        if (x1 != one)
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "operator++ iterator error 2: " << x1 << " " << one << '\n';
         x1 = (*(it0--))->a;
-        if (x1 != one) throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
-          << "operator-- iterator error: " << x1 << " " << one << '\n';
+        if (x1 != one)
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "operator-- iterator error: " << x1 << " " << one << '\n';
         x0 = (*it0)->a;
-        if (x0 != zero) throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
-          << "operator-- iterator error 2: " << x0 << " " << zero << '\n';
+        if (x0 != zero)
+          throw cms::Exception("Inconsistent Data", "OtherThingAnalyzer::analyze")
+              << "operator-- iterator error 2: " << x0 << " " << zero << '\n';
       }
     }
   }
-  
+
   void OtherThingAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription desc;
-    desc.addUntracked<bool>("thingWasDropped", false)->setComment("true if the ref to the ThingCollection in the OtherThingCollection can not be resolved since the ThingCollection was not stored.");
-    desc.addUntracked<edm::InputTag>("other",edm::InputTag("OtherThing","testUserTag"))->setComment("Where to get the OtherThingCollection");
+    desc.addUntracked<bool>("thingWasDropped", false)
+        ->setComment(
+            "true if the ref to the ThingCollection in the OtherThingCollection can not be resolved since the "
+            "ThingCollection was not stored.");
+    desc.addUntracked<edm::InputTag>("other", edm::InputTag("OtherThing", "testUserTag"))
+        ->setComment("Where to get the OtherThingCollection");
     descriptions.add("otherThingAnalyzer", desc);
   }
 
-}
+}  // namespace edmtest
 using edmtest::OtherThingAnalyzer;
 DEFINE_FWK_MODULE(OtherThingAnalyzer);
diff --git a/FWCore/Integration/test/OtherThingProducer.cc b/FWCore/Integration/test/OtherThingProducer.cc
index 5a43d8615b17e..9e03d2f55cb67 100644
--- a/FWCore/Integration/test/OtherThingProducer.cc
+++ b/FWCore/Integration/test/OtherThingProducer.cc
@@ -11,18 +11,17 @@
 #include "FWCore/Utilities/interface/EDPutToken.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-
 namespace edmtest {
   class OtherThingProducer : public edm::global::EDProducer<> {
   public:
     explicit OtherThingProducer(edm::ParameterSet const& ps);
-    
+
     ~OtherThingProducer() override;
-    
+
     void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
-    
+
     static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-    
+
   private:
     OtherThingAlgorithm alg_;
     edm::EDGetToken thingToken_;
@@ -31,50 +30,50 @@ namespace edmtest {
     bool refsAreTransient_;
   };
 
-  
-  OtherThingProducer::OtherThingProducer(edm::ParameterSet const& pset): alg_(), refsAreTransient_(false) {
+  OtherThingProducer::OtherThingProducer(edm::ParameterSet const& pset) : alg_(), refsAreTransient_(false) {
     putToken_ = produces<OtherThingCollection>("testUserTag");
     useRefs_ = pset.getUntrackedParameter<bool>("useRefs");
-    if(useRefs_) {
-      thingToken_=consumes<ThingCollection>(pset.getParameter<edm::InputTag>("thingTag"));
+    if (useRefs_) {
+      thingToken_ = consumes<ThingCollection>(pset.getParameter<edm::InputTag>("thingTag"));
     }
     refsAreTransient_ = pset.getUntrackedParameter<bool>("transient");
   }
 
   // Virtual destructor needed.
-  OtherThingProducer::~OtherThingProducer() {}  
+  OtherThingProducer::~OtherThingProducer() {}
 
   // Functions that gets called by framework every event
   void OtherThingProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
-    // Step A: Get Inputs 
+    // Step A: Get Inputs
 
-    // Step B: Create empty output 
+    // Step B: Create empty output
     auto result = std::make_unique<OtherThingCollection>();  //Empty
 
     // Step C: Get data for algorithm
     edm::Handle<ThingCollection> parentHandle;
-    if(useRefs_) {
+    if (useRefs_) {
       bool succeeded = e.getByToken(thingToken_, parentHandle);
       assert(succeeded);
       assert(parentHandle.isValid());
     }
 
-    
     // Step D: Invoke the algorithm, passing in inputs (NONE) and getting back outputs.
     alg_.run(parentHandle, *result, useRefs_, refsAreTransient_);
 
     // Step E: Put outputs into event
-    e.put(putToken_,std::move(result));
+    e.put(putToken_, std::move(result));
   }
-  
+
   void OtherThingProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription desc;
-    desc.add<edm::InputTag>("thingTag",edm::InputTag("Thing"))->setComment("Where to get the ThingCollection");
-    desc.addUntracked<bool>("useRefs",true)->setComment("Actually get the ThingCollection and build edm::Refs to the contained items.");
-    desc.addUntracked<bool>("transient",false)->setComment("If true, then the Refs constructed by the ThingCollection can not be persisted");
+    desc.add<edm::InputTag>("thingTag", edm::InputTag("Thing"))->setComment("Where to get the ThingCollection");
+    desc.addUntracked<bool>("useRefs", true)
+        ->setComment("Actually get the ThingCollection and build edm::Refs to the contained items.");
+    desc.addUntracked<bool>("transient", false)
+        ->setComment("If true, then the Refs constructed by the ThingCollection can not be persisted");
     descriptions.add("otherThingProd", desc);
   }
 
-}
+}  // namespace edmtest
 using edmtest::OtherThingProducer;
 DEFINE_FWK_MODULE(OtherThingProducer);
diff --git a/FWCore/Integration/test/OtherThingRefComparer.cc b/FWCore/Integration/test/OtherThingRefComparer.cc
index b28388459ded4..110654209f9e3 100644
--- a/FWCore/Integration/test/OtherThingRefComparer.cc
+++ b/FWCore/Integration/test/OtherThingRefComparer.cc
@@ -11,39 +11,37 @@
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
 
-
 namespace edmtest {
-  
+
   class OtherThingRefComparer : public edm::stream::EDAnalyzer<> {
   public:
-    
     explicit OtherThingRefComparer(edm::ParameterSet const& pset);
-    
+
     virtual void analyze(edm::Event const& e, edm::EventSetup const& c) override;
-    
+
     static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
   private:
     edm::EDGetTokenT<OtherThingCollection> token1_;
     edm::EDGetTokenT<OtherThingCollection> token2_;
   };
-  
-  OtherThingRefComparer::OtherThingRefComparer(edm::ParameterSet const& pset) :
-  token1_(consumes<OtherThingCollection>(pset.getUntrackedParameter<edm::InputTag>("first"))),
-  token2_(consumes<OtherThingCollection>(pset.getUntrackedParameter<edm::InputTag>("second")))
- {
-  }
+
+  OtherThingRefComparer::OtherThingRefComparer(edm::ParameterSet const& pset)
+      : token1_(consumes<OtherThingCollection>(pset.getUntrackedParameter<edm::InputTag>("first"))),
+        token2_(consumes<OtherThingCollection>(pset.getUntrackedParameter<edm::InputTag>("second"))) {}
 
   void OtherThingRefComparer::analyze(edm::Event const& e, edm::EventSetup const&) {
     auto const& t1_ = e.get(token1_);
     auto const& t2_ = e.get(token2_);
-    
+
     assert(t1_.size() == t2_.size());
 
     {
       auto iter2 = t2_.begin();
-      for(auto const& o1: t1_) {
-        if(o1.ref != iter2->ref) {
-          throw cms::Exception("RefCompareFailure")<<"edm::Refs are not equal"<< o1.ref.id()<<" "<<iter2->ref.id();
+      for (auto const& o1 : t1_) {
+        if (o1.ref != iter2->ref) {
+          throw cms::Exception("RefCompareFailure")
+              << "edm::Refs are not equal" << o1.ref.id() << " " << iter2->ref.id();
         }
         ++iter2;
       }
@@ -51,24 +49,25 @@ namespace edmtest {
 
     {
       auto iter2 = t2_.begin();
-      for(auto const& o1: t1_) {
-        if(o1.ptr != iter2->ptr) {
-          throw cms::Exception("RefCompareFailure")<<"edm::Ptrs are not equal"<<o1.ptr.id()<<" "<<iter2->ptr.id();
+      for (auto const& o1 : t1_) {
+        if (o1.ptr != iter2->ptr) {
+          throw cms::Exception("RefCompareFailure")
+              << "edm::Ptrs are not equal" << o1.ptr.id() << " " << iter2->ptr.id();
         }
         ++iter2;
       }
     }
-
-    
   }
 
   void OtherThingRefComparer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription desc;
-    desc.addUntracked<edm::InputTag>("first",edm::InputTag("OtherThing","testUserTag"))->setComment("Where to get the first OtherThingCollection");
-    desc.addUntracked<edm::InputTag>("second",edm::InputTag("OtherThing","testUserTag"))->setComment("Where to get the second OtherThingCollection");
+    desc.addUntracked<edm::InputTag>("first", edm::InputTag("OtherThing", "testUserTag"))
+        ->setComment("Where to get the first OtherThingCollection");
+    desc.addUntracked<edm::InputTag>("second", edm::InputTag("OtherThing", "testUserTag"))
+        ->setComment("Where to get the second OtherThingCollection");
     descriptions.add("otherThingRefComparer", desc);
   }
 
-}
+}  // namespace edmtest
 using edmtest::OtherThingRefComparer;
 DEFINE_FWK_MODULE(OtherThingRefComparer);
diff --git a/FWCore/Integration/test/PathAnalyzer.cc b/FWCore/Integration/test/PathAnalyzer.cc
index 17840790a665b..0b01b1b5b1a54 100644
--- a/FWCore/Integration/test/PathAnalyzer.cc
+++ b/FWCore/Integration/test/PathAnalyzer.cc
@@ -11,83 +11,60 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/Registry.h"
 
-namespace edmtest 
-{
-  class PathAnalyzer : public edm::EDAnalyzer
-  {
+namespace edmtest {
+  class PathAnalyzer : public edm::EDAnalyzer {
   public:
-
     explicit PathAnalyzer(edm::ParameterSet const&);
     virtual ~PathAnalyzer();
-    
+
     virtual void analyze(edm::Event const&, edm::EventSetup const&);
     virtual void beginJob();
     virtual void endJob();
 
   private:
     void dumpTriggerNamesServiceInfo(char const* where);
-  }; // class PathAnalyzer
+  };  // class PathAnalyzer
 
   //--------------------------------------------------------------------
   //
   // Implementation details
 
-  PathAnalyzer::PathAnalyzer(edm::ParameterSet const&) { }
+  PathAnalyzer::PathAnalyzer(edm::ParameterSet const&) {}
 
   PathAnalyzer::~PathAnalyzer() {}
 
-  void
-  PathAnalyzer::analyze(edm::Event const&, edm::EventSetup const&)
-  {
-    dumpTriggerNamesServiceInfo("analyze");
-  }
+  void PathAnalyzer::analyze(edm::Event const&, edm::EventSetup const&) { dumpTriggerNamesServiceInfo("analyze"); }
 
-  void
-  PathAnalyzer::beginJob()
-  {
-    dumpTriggerNamesServiceInfo("beginJob");
-  }
+  void PathAnalyzer::beginJob() { dumpTriggerNamesServiceInfo("beginJob"); }
 
-  void
-  PathAnalyzer::endJob()
-  {
-    dumpTriggerNamesServiceInfo("endJob");
-  }
-
-  void
-  PathAnalyzer::dumpTriggerNamesServiceInfo(char const* where)
-  {
+  void PathAnalyzer::endJob() { dumpTriggerNamesServiceInfo("endJob"); }
 
+  void PathAnalyzer::dumpTriggerNamesServiceInfo(char const* where) {
     edm::LogInfo("PathAnalyzer").log([&](auto& message) {
-      
       edm::Service<edm::service::TriggerNamesService> tns;
-      message << "TNS size: " << tns->size()<< "\n";
-      
+      message << "TNS size: " << tns->size() << "\n";
+
       auto const& trigpaths = tns->getTrigPaths();
-      message << "dumpTriggernamesServiceInfo called from PathAnalyzer::"
-      << where << '\n';
+      message << "dumpTriggernamesServiceInfo called from PathAnalyzer::" << where << '\n';
       message << "trigger paths are:";
-      for(auto const& p: trigpaths) {
-        message<<" "<<p;
+      for (auto const& p : trigpaths) {
+        message << " " << p;
       }
       message << '\n';
-      
-      for (auto const p: trigpaths)
-      {
+
+      for (auto const p : trigpaths) {
         message << "path name: " << p << " contains:";
-        for(auto const&m: tns->getTrigPathModules(p)) {
-          message<<" "<<m;
+        for (auto const& m : tns->getTrigPathModules(p)) {
+          message << " " << m;
         }
         message << '\n';
       }
-      
-      message << "trigger ParameterSet:\n"
-      << tns->getTriggerPSet()
-      << '\n';
+
+      message << "trigger ParameterSet:\n" << tns->getTriggerPSet() << '\n';
     });
   }
 
-} // namespace edmtest
+}  // namespace edmtest
 
 using edmtest::PathAnalyzer;
 DEFINE_FWK_MODULE(PathAnalyzer);
diff --git a/FWCore/Integration/test/PluginUsingProducer.cc b/FWCore/Integration/test/PluginUsingProducer.cc
index 2024cbbe182d4..4a4a018f54872 100644
--- a/FWCore/Integration/test/PluginUsingProducer.cc
+++ b/FWCore/Integration/test/PluginUsingProducer.cc
@@ -25,67 +25,60 @@ namespace edmtest {
   };
 
   using IntFactory = edmplugin::PluginFactory<IntMakerBase*(edm::ParameterSet const&)>;
-}
+}  // namespace edmtest
 EDM_REGISTER_VALIDATED_PLUGINFACTORY(edmtest::IntFactory, "edmtestIntFactory");
 
 namespace edmtest {
-  
+
   struct OneMaker : public IntMakerBase {
     explicit OneMaker(edm::ParameterSet const&) {}
-    int value() const final { return 1;};
-    
-    static void fillPSetDescription(edm::ParameterSetDescription&) {
-    }
+    int value() const final { return 1; };
+
+    static void fillPSetDescription(edm::ParameterSetDescription&) {}
   };
 
-  struct ValueMaker : public  IntMakerBase {
-    explicit ValueMaker(edm::ParameterSet const& iPSet) :
-    value_{iPSet.getParameter<int>("value") } {}
-    int value() const final { return value_;};
-    
-    static void fillPSetDescription(edm::ParameterSetDescription& iDesc) {
-      iDesc.add<int>("value",5);
-    }
-    
+  struct ValueMaker : public IntMakerBase {
+    explicit ValueMaker(edm::ParameterSet const& iPSet) : value_{iPSet.getParameter<int>("value")} {}
+    int value() const final { return value_; };
+
+    static void fillPSetDescription(edm::ParameterSetDescription& iDesc) { iDesc.add<int>("value", 5); }
+
     int value_;
   };
 
-  
   class PluginUsingProducer : public edm::global::EDProducer<> {
   public:
-
     explicit PluginUsingProducer(edm::ParameterSet const&);
 
     void produce(edm::StreamID, edm::Event&, edm::EventSetup const&) const override;
 
     static void fillDescriptions(edm::ConfigurationDescriptions& iConf) {
       edm::ParameterSetDescription pluginDesc;
-      pluginDesc.addNode( edm::PluginDescription<IntFactory>("type", "edmtestValueMaker", true));
-      
+      pluginDesc.addNode(edm::PluginDescription<IntFactory>("type", "edmtestValueMaker", true));
+
       edm::ParameterSetDescription top;
-      top.add<edm::ParameterSetDescription>("plugin",pluginDesc);
-      
+      top.add<edm::ParameterSetDescription>("plugin", pluginDesc);
+
       iConf.addWithDefaultLabel(top);
     }
+
   private:
     std::unique_ptr<IntMakerBase> maker_;
     edm::EDPutTokenT<int> putToken_;
   };
 
-  PluginUsingProducer::PluginUsingProducer(edm::ParameterSet const& pset):
-  putToken_{produces<int>()}
-  {
+  PluginUsingProducer::PluginUsingProducer(edm::ParameterSet const& pset) : putToken_{produces<int>()} {
     auto pluginPSet = pset.getParameter<edm::ParameterSet>("plugin");
-    maker_ = std::unique_ptr<IntMakerBase>{IntFactory::get()->create(pluginPSet.getParameter<std::string>("type"), pluginPSet)};
+    maker_ = std::unique_ptr<IntMakerBase>{
+        IntFactory::get()->create(pluginPSet.getParameter<std::string>("type"), pluginPSet)};
   }
 
-  void PluginUsingProducer::produce(edm::StreamID, edm::Event& event, edm::EventSetup const&)  const{
+  void PluginUsingProducer::produce(edm::StreamID, edm::Event& event, edm::EventSetup const&) const {
     event.emplace(putToken_, maker_->value());
   }
-}
+}  // namespace edmtest
 using edmtest::PluginUsingProducer;
 DEFINE_FWK_MODULE(PluginUsingProducer);
 
-
-DEFINE_EDM_VALIDATED_PLUGIN(edmtest::IntFactory,edmtest::OneMaker,"edmtestOneMaker");
-DEFINE_EDM_VALIDATED_PLUGIN(edmtest::IntFactory,edmtest::ValueMaker,"edmtestValueMaker");
+DEFINE_EDM_VALIDATED_PLUGIN(edmtest::IntFactory, edmtest::OneMaker, "edmtestOneMaker");
+DEFINE_EDM_VALIDATED_PLUGIN(edmtest::IntFactory, edmtest::ValueMaker, "edmtestValueMaker");
diff --git a/FWCore/Integration/test/ProcessConfiguration_t.cpp b/FWCore/Integration/test/ProcessConfiguration_t.cpp
index 5f20e6d42e925..66ff9ea1784be 100644
--- a/FWCore/Integration/test/ProcessConfiguration_t.cpp
+++ b/FWCore/Integration/test/ProcessConfiguration_t.cpp
@@ -8,49 +8,47 @@
 #include <string>
 
 int main() try {
-    edm::ParameterSet dummyPset;
-    dummyPset.registerIt();
-    edm::ParameterSetID id = dummyPset.id();
-    {
-      edm::ProcessConfiguration pc1;
-      pc1.setParameterSetID(id);
-      assert(pc1 == pc1);
-    }
-    {
-      edm::ProcessConfiguration pc1;
-      edm::ProcessConfiguration pc2;
-      pc1.setParameterSetID(id);
-      pc2.setParameterSetID(id);
-      assert(pc1 == pc2);
-    }
-    {
-      edm::ProcessConfiguration pc1;
-      edm::ProcessConfiguration pc2("reco2", edm::ParameterSetID(), std::string(), std::string());
-      edm::ProcessConfiguration pc3("reco3", edm::ParameterSetID(), std::string(), std::string());
-      edm::ProcessConfiguration pc4("reco2", edm::ParameterSetID(), std::string(), std::string());
-      pc1.setParameterSetID(id);
-      pc2.setParameterSetID(id);
-      pc3.setParameterSetID(id);
-      pc4.setParameterSetID(id);
-      edm::ProcessConfigurationID id1 = pc1.id();
-      edm::ProcessConfigurationID id2 = pc2.id();
-      edm::ProcessConfigurationID id3 = pc3.id();
-   
-      assert(id1 != id2);
-      assert(id2 != id3);
-      assert(id3 != id1);
-   
-      edm::ProcessConfigurationID id4 = pc4.id();
-      assert(pc4 == pc2);
-      assert (id4 == id2);
-    }
-    return 0;
-}
-catch(cms::Exception const& e) {
+  edm::ParameterSet dummyPset;
+  dummyPset.registerIt();
+  edm::ParameterSetID id = dummyPset.id();
+  {
+    edm::ProcessConfiguration pc1;
+    pc1.setParameterSetID(id);
+    assert(pc1 == pc1);
+  }
+  {
+    edm::ProcessConfiguration pc1;
+    edm::ProcessConfiguration pc2;
+    pc1.setParameterSetID(id);
+    pc2.setParameterSetID(id);
+    assert(pc1 == pc2);
+  }
+  {
+    edm::ProcessConfiguration pc1;
+    edm::ProcessConfiguration pc2("reco2", edm::ParameterSetID(), std::string(), std::string());
+    edm::ProcessConfiguration pc3("reco3", edm::ParameterSetID(), std::string(), std::string());
+    edm::ProcessConfiguration pc4("reco2", edm::ParameterSetID(), std::string(), std::string());
+    pc1.setParameterSetID(id);
+    pc2.setParameterSetID(id);
+    pc3.setParameterSetID(id);
+    pc4.setParameterSetID(id);
+    edm::ProcessConfigurationID id1 = pc1.id();
+    edm::ProcessConfigurationID id2 = pc2.id();
+    edm::ProcessConfigurationID id3 = pc3.id();
+
+    assert(id1 != id2);
+    assert(id2 != id3);
+    assert(id3 != id1);
+
+    edm::ProcessConfigurationID id4 = pc4.id();
+    assert(pc4 == pc2);
+    assert(id4 == id2);
+  }
+  return 0;
+} catch (cms::Exception const& e) {
   std::cerr << e.explainSelf() << std::endl;
   return 1;
-}
-catch(std::exception const& e) {
+} catch (std::exception const& e) {
   std::cerr << e.what() << std::endl;
   return 1;
 }
diff --git a/FWCore/Integration/test/ProcessHistory_t.cpp b/FWCore/Integration/test/ProcessHistory_t.cpp
index 3c5693ef3ecb9..50ee7cb6856c8 100644
--- a/FWCore/Integration/test/ProcessHistory_t.cpp
+++ b/FWCore/Integration/test/ProcessHistory_t.cpp
@@ -22,14 +22,22 @@ bool checkRunOrLumiEntry(edm::IndexIntoFile::RunOrLumiEntry const& rl,
                          edm::LuminosityBlockNumber_t lumi,
                          edm::IndexIntoFile::EntryNumber_t beginEvents,
                          edm::IndexIntoFile::EntryNumber_t endEvents) {
-  if (rl.orderPHIDRun() != orderPHIDRun) return false;
-  if (rl.orderPHIDRunLumi() != orderPHIDRunLumi) return false;
-  if (rl.entry() != entry) return false;
-  if (rl.processHistoryIDIndex() != processHistoryIDIndex) return false;
-  if (rl.run() != run) return false;
-  if (rl.lumi() != lumi) return false;
-  if (rl.beginEvents() != beginEvents) return false;
-  if (rl.endEvents() != endEvents) return false;
+  if (rl.orderPHIDRun() != orderPHIDRun)
+    return false;
+  if (rl.orderPHIDRunLumi() != orderPHIDRunLumi)
+    return false;
+  if (rl.entry() != entry)
+    return false;
+  if (rl.processHistoryIDIndex() != processHistoryIDIndex)
+    return false;
+  if (rl.run() != run)
+    return false;
+  if (rl.lumi() != lumi)
+    return false;
+  if (rl.beginEvents() != beginEvents)
+    return false;
+  if (rl.endEvents() != endEvents)
+    return false;
   return true;
 }
 
@@ -64,14 +72,13 @@ int main() try {
   pnl4.push_back(iHLT);
   edm::ProcessHistoryID id4 = pnl4.setProcessHistoryID();
   assert(pnl4 == pnl2);
-  assert (id4 == id2);
+  assert(id4 == id2);
 
   edm::ProcessHistory pnl5;
   pnl5 = pnl3;
   assert(pnl5 == pnl3);
   assert(pnl5.id() == pnl3.id());
 
-
   edm::ProcessConfiguration pc1(std::string("HLT"), psetID, std::string(""), edm::getPassID());
   edm::ProcessConfiguration pc2(std::string("HLT"), psetID, std::string("a"), edm::getPassID());
   edm::ProcessConfiguration pc3(std::string("HLT"), psetID, std::string("1"), edm::getPassID());
@@ -234,28 +241,28 @@ int main() try {
     assert(v[3] == rph4.id());
 
     edm::IndexIntoFile indexIntoFile1;
-    indexIntoFile1.addEntry(phid1,  1, 11, 0, 0);
-    indexIntoFile1.addEntry(phid1,  1, 12, 0, 1);
-    indexIntoFile1.addEntry(phid1,  1, 0,  0, 0);
-    indexIntoFile1.addEntry(phid2,  2, 11, 0, 2);
-    indexIntoFile1.addEntry(phid2,  2, 12, 0, 3);
-    indexIntoFile1.addEntry(phid2,  2, 0,  0, 1);
+    indexIntoFile1.addEntry(phid1, 1, 11, 0, 0);
+    indexIntoFile1.addEntry(phid1, 1, 12, 0, 1);
+    indexIntoFile1.addEntry(phid1, 1, 0, 0, 0);
+    indexIntoFile1.addEntry(phid2, 2, 11, 0, 2);
+    indexIntoFile1.addEntry(phid2, 2, 12, 0, 3);
+    indexIntoFile1.addEntry(phid2, 2, 0, 0, 1);
     indexIntoFile1.addEntry(phid1a, 1, 11, 1, 0);
     indexIntoFile1.addEntry(phid1a, 1, 11, 2, 1);
     indexIntoFile1.addEntry(phid1a, 1, 11, 0, 4);
     indexIntoFile1.addEntry(phid1a, 1, 12, 1, 2);
     indexIntoFile1.addEntry(phid1a, 1, 12, 2, 3);
     indexIntoFile1.addEntry(phid1a, 1, 12, 0, 5);
-    indexIntoFile1.addEntry(phid1a, 1, 0,  0, 2);
-    indexIntoFile1.addEntry(phid3,  3, 0,  0, 3);
-    indexIntoFile1.addEntry(phid2a, 2, 0,  0, 4);
-    indexIntoFile1.addEntry(phid2b, 2, 0,  0, 5);
-    indexIntoFile1.addEntry(phid4,  4, 0,  0, 6);
-    indexIntoFile1.addEntry(phid1b, 1, 0,  0, 7);
-    indexIntoFile1.addEntry(phid1,  5, 11, 0, 6);
-    indexIntoFile1.addEntry(phid1,  5, 0,  0, 8);
-    indexIntoFile1.addEntry(phid4,  1, 11, 0, 7);
-    indexIntoFile1.addEntry(phid4,  1, 0,  0, 9);
+    indexIntoFile1.addEntry(phid1a, 1, 0, 0, 2);
+    indexIntoFile1.addEntry(phid3, 3, 0, 0, 3);
+    indexIntoFile1.addEntry(phid2a, 2, 0, 0, 4);
+    indexIntoFile1.addEntry(phid2b, 2, 0, 0, 5);
+    indexIntoFile1.addEntry(phid4, 4, 0, 0, 6);
+    indexIntoFile1.addEntry(phid1b, 1, 0, 0, 7);
+    indexIntoFile1.addEntry(phid1, 5, 11, 0, 6);
+    indexIntoFile1.addEntry(phid1, 5, 0, 0, 8);
+    indexIntoFile1.addEntry(phid4, 1, 11, 0, 7);
+    indexIntoFile1.addEntry(phid4, 1, 0, 0, 9);
 
     indexIntoFile1.sortVector_Run_Or_Lumi_Entries();
 
@@ -294,33 +301,30 @@ int main() try {
     }
     */
 
-    assert(checkRunOrLumiEntry(runOrLumiEntries.at(0),  0, -1, 0, 0, 1,  0, -1, -1));
-    assert(checkRunOrLumiEntry(runOrLumiEntries.at(1),  0, -1, 2, 0, 1,  0, -1, -1));
-    assert(checkRunOrLumiEntry(runOrLumiEntries.at(2),  0, -1, 7, 0, 1,  0, -1, -1));
-    assert(checkRunOrLumiEntry(runOrLumiEntries.at(3),  0,  0, 0, 0, 1, 11, -1, -1));
-    assert(checkRunOrLumiEntry(runOrLumiEntries.at(4),  0,  0, 4, 0, 1, 11,  0,  2));
-    assert(checkRunOrLumiEntry(runOrLumiEntries.at(5),  0,  1, 1, 0, 1, 12, -1, -1));
-    assert(checkRunOrLumiEntry(runOrLumiEntries.at(6),  0,  1, 5, 0, 1, 12,  2,  4));
-    assert(checkRunOrLumiEntry(runOrLumiEntries.at(7),  1, -1, 1, 1, 2,  0, -1, -1));
-    assert(checkRunOrLumiEntry(runOrLumiEntries.at(8),  1, -1, 4, 1, 2,  0, -1, -1));
-    assert(checkRunOrLumiEntry(runOrLumiEntries.at(9),  1, -1, 5, 1, 2,  0, -1, -1));
-    assert(checkRunOrLumiEntry(runOrLumiEntries.at(10), 1,  2, 2, 1, 2, 11, -1, -1));
-    assert(checkRunOrLumiEntry(runOrLumiEntries.at(11), 1,  3, 3, 1, 2, 12, -1, -1));
-    assert(checkRunOrLumiEntry(runOrLumiEntries.at(12), 3, -1, 3, 2, 3,  0, -1, -1));
-    assert(checkRunOrLumiEntry(runOrLumiEntries.at(13), 6, -1, 6, 3, 4,  0, -1, -1));
-    assert(checkRunOrLumiEntry(runOrLumiEntries.at(14), 8, -1, 8, 0, 5,  0, -1, -1));
-    assert(checkRunOrLumiEntry(runOrLumiEntries.at(15), 8,  6, 6, 0, 5, 11, -1, -1));
-    assert(checkRunOrLumiEntry(runOrLumiEntries.at(16), 9, -1, 9, 3, 1,  0, -1, -1));
-    assert(checkRunOrLumiEntry(runOrLumiEntries.at(17), 9,  7, 7, 3, 1, 11, -1, -1));
+    assert(checkRunOrLumiEntry(runOrLumiEntries.at(0), 0, -1, 0, 0, 1, 0, -1, -1));
+    assert(checkRunOrLumiEntry(runOrLumiEntries.at(1), 0, -1, 2, 0, 1, 0, -1, -1));
+    assert(checkRunOrLumiEntry(runOrLumiEntries.at(2), 0, -1, 7, 0, 1, 0, -1, -1));
+    assert(checkRunOrLumiEntry(runOrLumiEntries.at(3), 0, 0, 0, 0, 1, 11, -1, -1));
+    assert(checkRunOrLumiEntry(runOrLumiEntries.at(4), 0, 0, 4, 0, 1, 11, 0, 2));
+    assert(checkRunOrLumiEntry(runOrLumiEntries.at(5), 0, 1, 1, 0, 1, 12, -1, -1));
+    assert(checkRunOrLumiEntry(runOrLumiEntries.at(6), 0, 1, 5, 0, 1, 12, 2, 4));
+    assert(checkRunOrLumiEntry(runOrLumiEntries.at(7), 1, -1, 1, 1, 2, 0, -1, -1));
+    assert(checkRunOrLumiEntry(runOrLumiEntries.at(8), 1, -1, 4, 1, 2, 0, -1, -1));
+    assert(checkRunOrLumiEntry(runOrLumiEntries.at(9), 1, -1, 5, 1, 2, 0, -1, -1));
+    assert(checkRunOrLumiEntry(runOrLumiEntries.at(10), 1, 2, 2, 1, 2, 11, -1, -1));
+    assert(checkRunOrLumiEntry(runOrLumiEntries.at(11), 1, 3, 3, 1, 2, 12, -1, -1));
+    assert(checkRunOrLumiEntry(runOrLumiEntries.at(12), 3, -1, 3, 2, 3, 0, -1, -1));
+    assert(checkRunOrLumiEntry(runOrLumiEntries.at(13), 6, -1, 6, 3, 4, 0, -1, -1));
+    assert(checkRunOrLumiEntry(runOrLumiEntries.at(14), 8, -1, 8, 0, 5, 0, -1, -1));
+    assert(checkRunOrLumiEntry(runOrLumiEntries.at(15), 8, 6, 6, 0, 5, 11, -1, -1));
+    assert(checkRunOrLumiEntry(runOrLumiEntries.at(16), 9, -1, 9, 3, 1, 0, -1, -1));
+    assert(checkRunOrLumiEntry(runOrLumiEntries.at(17), 9, 7, 7, 3, 1, 11, -1, -1));
   }
   return 0;
-}
-catch(cms::Exception const& e) {
+} catch (cms::Exception const& e) {
   std::cerr << e.explainSelf() << std::endl;
   return 1;
-}
-catch(std::exception const& e) {
+} catch (std::exception const& e) {
   std::cerr << e.what() << std::endl;
   return 1;
 }
-
diff --git a/FWCore/Integration/test/ProdigalAnalyzer.cc b/FWCore/Integration/test/ProdigalAnalyzer.cc
index c63ca1df6e45b..a26ca7809e2cc 100644
--- a/FWCore/Integration/test/ProdigalAnalyzer.cc
+++ b/FWCore/Integration/test/ProdigalAnalyzer.cc
@@ -7,10 +7,7 @@
 #include "DataFormats/TestObjects/interface/ToyProducts.h"
 
 namespace edmtest {
-  ProdigalAnalyzer::ProdigalAnalyzer(edm::ParameterSet const& )
-  {
-    consumes<Prodigal>(edm::InputTag{"maker"});
-  }
+  ProdigalAnalyzer::ProdigalAnalyzer(edm::ParameterSet const&) { consumes<Prodigal>(edm::InputTag{"maker"}); }
 
   void ProdigalAnalyzer::analyze(edm::Event const& e, edm::EventSetup const&) {
     edm::Handle<Prodigal> h;
@@ -18,6 +15,6 @@ namespace edmtest {
     assert(h.provenance()->productProvenance()->parentage().parents().empty());
   }
 
-}
+}  // namespace edmtest
 using edmtest::ProdigalAnalyzer;
 DEFINE_FWK_MODULE(ProdigalAnalyzer);
diff --git a/FWCore/Integration/test/ProdigalAnalyzer.h b/FWCore/Integration/test/ProdigalAnalyzer.h
index e96753ac8fccc..874a33747a953 100644
--- a/FWCore/Integration/test/ProdigalAnalyzer.h
+++ b/FWCore/Integration/test/ProdigalAnalyzer.h
@@ -13,6 +13,6 @@ namespace edmtest {
     virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
   };
 
-}
+}  // namespace edmtest
 
 #endif
diff --git a/FWCore/Integration/test/ProducerWithPSetDesc.cc b/FWCore/Integration/test/ProducerWithPSetDesc.cc
index 03e75549f009b..2ba8b6df3a919 100644
--- a/FWCore/Integration/test/ProducerWithPSetDesc.cc
+++ b/FWCore/Integration/test/ProducerWithPSetDesc.cc
@@ -36,26 +36,22 @@ namespace edmtest {
 
   struct AnotherOneMaker : public AnotherIntMakerBase {
     explicit AnotherOneMaker(edm::ParameterSet const&) {}
-    int value() const final { return 1;};
+    int value() const final { return 1; };
 
-    static void fillPSetDescription(edm::ParameterSetDescription&) {
-    }
+    static void fillPSetDescription(edm::ParameterSetDescription&) {}
   };
 
-  struct AnotherValueMaker : public  AnotherIntMakerBase {
-    explicit AnotherValueMaker(edm::ParameterSet const& iPSet) :
-    value_{iPSet.getParameter<int>("value") } {}
-    int value() const final { return value_;};
+  struct AnotherValueMaker : public AnotherIntMakerBase {
+    explicit AnotherValueMaker(edm::ParameterSet const& iPSet) : value_{iPSet.getParameter<int>("value")} {}
+    int value() const final { return value_; };
 
-    static void fillPSetDescription(edm::ParameterSetDescription& iDesc) {
-      iDesc.add<int>("value",5);
-    }
+    static void fillPSetDescription(edm::ParameterSetDescription& iDesc) { iDesc.add<int>("value", 5); }
     int value_;
   };
-}
+}  // namespace edmtest
 EDM_REGISTER_VALIDATED_PLUGINFACTORY(edmtest::AnotherIntFactory, "edmtestAnotherIntFactory");
-DEFINE_EDM_VALIDATED_PLUGIN(edmtest::AnotherIntFactory,edmtest::AnotherOneMaker,"edmtestAnotherOneMaker");
-DEFINE_EDM_VALIDATED_PLUGIN(edmtest::AnotherIntFactory,edmtest::AnotherValueMaker,"edmtestAnotherValueMaker");
+DEFINE_EDM_VALIDATED_PLUGIN(edmtest::AnotherIntFactory, edmtest::AnotherOneMaker, "edmtestAnotherOneMaker");
+DEFINE_EDM_VALIDATED_PLUGIN(edmtest::AnotherIntFactory, edmtest::AnotherValueMaker, "edmtestAnotherValueMaker");
 
 namespace edmtest {
 
@@ -64,7 +60,8 @@ namespace edmtest {
 
     assert(ps.getParameter<int>("p_int") == 2147483647);
     assert(ps.getUntrackedParameter<int>("p_int_untracked") == -2147483647);
-    if (testingAutoGeneratedCfi) assert(ps.getParameter<int>("p_int_opt") == 0);
+    if (testingAutoGeneratedCfi)
+      assert(ps.getParameter<int>("p_int_opt") == 0);
     if (testingAutoGeneratedCfi) {
       assert(ps.getUntrackedParameter<int>("p_int_optuntracked") == 7);
       assert(!ps.exists("p_int_opt_nd"));
@@ -76,11 +73,11 @@ namespace edmtest {
     }
 
     std::vector<int> vint;
-    vint = ps.getParameter<std::vector<int> >("vint1");
+    vint = ps.getParameter<std::vector<int>>("vint1");
     assert(vint.empty());
-    vint = ps.getParameter<std::vector<int> >("vint2");
+    vint = ps.getParameter<std::vector<int>>("vint2");
     assert(vint[0] == 2147483647);
-    vint = ps.getParameter<std::vector<int> >("vint3");
+    vint = ps.getParameter<std::vector<int>>("vint3");
     assert(vint[0] == 2147483647);
     assert(vint[1] == -2147483647);
     std::array<int, 2> testArray = edm::getFixedSizeArray<int, 2>(ps, std::string("vint3"));
@@ -89,7 +86,7 @@ namespace edmtest {
     std::array<int, 2> testArray1 = edm::getFixedSizeArray<int, 2>(ps, "vint3");
     assert(testArray1[0] == 2147483647);
     assert(testArray1[1] == -2147483647);
-    vint = ps.getParameter<std::vector<int> >("vint4");
+    vint = ps.getParameter<std::vector<int>>("vint4");
     assert(vint[0] == 2147483647);
     assert(vint[1] == -2147483647);
     assert(vint[2] == 0);
@@ -98,14 +95,14 @@ namespace edmtest {
     assert(ps.getUntrackedParameter<unsigned>("uint2") == 0);
 
     std::vector<unsigned> vuint;
-    vuint = ps.getParameter<std::vector<unsigned> >("vuint1");
+    vuint = ps.getParameter<std::vector<unsigned>>("vuint1");
     assert(vuint.empty());
-    vuint = ps.getParameter<std::vector<unsigned> >("vuint2");
+    vuint = ps.getParameter<std::vector<unsigned>>("vuint2");
     assert(vuint[0] == 4294967295U);
-    vuint = ps.getParameter<std::vector<unsigned> >("vuint3");
+    vuint = ps.getParameter<std::vector<unsigned>>("vuint3");
     assert(vuint[0] == 4294967295U);
     assert(vuint[1] == 0);
-    vuint = ps.getParameter<std::vector<unsigned> >("vuint4");
+    vuint = ps.getParameter<std::vector<unsigned>>("vuint4");
     assert(vuint[0] == 4294967295U);
     assert(vuint[1] == 0);
     assert(vuint[2] == 11);
@@ -115,14 +112,14 @@ namespace edmtest {
     assert(ps.getParameter<long long>("int64v3") == 0);
 
     std::vector<long long> vint64;
-    vint64 = ps.getParameter<std::vector<long long> >("vint64v1");
+    vint64 = ps.getParameter<std::vector<long long>>("vint64v1");
     assert(vint64.empty());
-    vint64 = ps.getParameter<std::vector<long long> >("vint64v2");
+    vint64 = ps.getParameter<std::vector<long long>>("vint64v2");
     assert(vint64[0] == 9000000000000000000LL);
-    vint64 = ps.getParameter<std::vector<long long> >("vint64v3");
+    vint64 = ps.getParameter<std::vector<long long>>("vint64v3");
     assert(vint64[0] == 9000000000000000000LL);
     assert(vint64[1] == -9000000000000000000LL);
-    vint64 = ps.getParameter<std::vector<long long> >("vint64v4");
+    vint64 = ps.getParameter<std::vector<long long>>("vint64v4");
     assert(vint64[0] == 9000000000000000000LL);
     assert(vint64[1] == -9000000000000000000LL);
     assert(vint64[2] == 0);
@@ -131,14 +128,14 @@ namespace edmtest {
     assert(ps.getUntrackedParameter<unsigned long long>("uint64v2") == 0);
 
     std::vector<unsigned long long> vuint64;
-    vuint64 = ps.getParameter<std::vector<unsigned long long> >("vuint64v1");
+    vuint64 = ps.getParameter<std::vector<unsigned long long>>("vuint64v1");
     assert(vuint64.empty());
-    vuint64 = ps.getParameter<std::vector<unsigned long long> >("vuint64v2");
+    vuint64 = ps.getParameter<std::vector<unsigned long long>>("vuint64v2");
     assert(vuint64[0] == 18000000000000000000ULL);
-    vuint64 = ps.getParameter<std::vector<unsigned long long> >("vuint64v3");
+    vuint64 = ps.getParameter<std::vector<unsigned long long>>("vuint64v3");
     assert(vuint64[0] == 18000000000000000000ULL);
     assert(vuint64[1] == 0);
-    vuint64 = ps.getParameter<std::vector<unsigned long long> >("vuint64v4");
+    vuint64 = ps.getParameter<std::vector<unsigned long long>>("vuint64v4");
     assert(vuint64[0] == 18000000000000000000ULL);
     assert(vuint64[1] == 0);
     assert(vuint64[2] == 11);
@@ -147,28 +144,28 @@ namespace edmtest {
     // format is 16 instead of 17.
     // assert(ps.getParameter<double>("doublev1") == std::numeric_limits<double>::min());
     assert(ps.getUntrackedParameter<double>("doublev2") == 0.0);
-    assert(fabs(ps.getUntrackedParameter<double>("doublev3") - 0.3)< 0.0000001);
+    assert(fabs(ps.getUntrackedParameter<double>("doublev3") - 0.3) < 0.0000001);
 
     std::vector<double> vdouble;
-    vdouble = ps.getParameter<std::vector<double> >("vdoublev1");
+    vdouble = ps.getParameter<std::vector<double>>("vdoublev1");
     assert(vdouble.empty());
     // cmsRun will fail with a value this big
     // vdouble.push_back(std::numeric_limits<double>::max());
     // This works though
-    vdouble = ps.getParameter<std::vector<double> >("vdoublev2");
+    vdouble = ps.getParameter<std::vector<double>>("vdoublev2");
     assert(vdouble[0] == 1e+300);
-    vdouble = ps.getParameter<std::vector<double> >("vdoublev3");
+    vdouble = ps.getParameter<std::vector<double>>("vdoublev3");
     assert(vdouble[0] == 1e+300);
     assert(vdouble[1] == 0.0);
-    vdouble = ps.getParameter<std::vector<double> >("vdoublev4");
+    vdouble = ps.getParameter<std::vector<double>>("vdoublev4");
     assert(vdouble[0] == 1e+300);
     assert(vdouble[1] == 0.0);
     assert(vdouble[2] == 11.0);
-    vdouble = ps.getParameter<std::vector<double> >("vdoublev5");
+    vdouble = ps.getParameter<std::vector<double>>("vdoublev5");
     assert(vdouble[0] == 1e+300);
     assert(vdouble[1] == 0.0);
     assert(vdouble[2] == 11.0);
-    assert(fabs(vdouble[3] - 0.3)< 0.0000001);
+    assert(fabs(vdouble[3] - 0.3) < 0.0000001);
 
     assert(ps.getParameter<bool>("boolv1") == true);
     assert(ps.getParameter<bool>("boolv2") == false);
@@ -179,14 +176,14 @@ namespace edmtest {
     assert(ps.getParameter<std::string>("stringv2") == test);
 
     std::vector<std::string> vstring;
-    vstring = ps.getParameter<std::vector<std::string> >("vstringv1");
+    vstring = ps.getParameter<std::vector<std::string>>("vstringv1");
     assert(vstring.empty());
-    vstring = ps.getParameter<std::vector<std::string> >("vstringv2");
+    vstring = ps.getParameter<std::vector<std::string>>("vstringv2");
     assert(vstring[0] == std::string("Hello"));
-    vstring = ps.getParameter<std::vector<std::string> >("vstringv3");
+    vstring = ps.getParameter<std::vector<std::string>>("vstringv3");
     assert(vstring[0] == std::string("Hello"));
     assert(vstring[1] == std::string("World"));
-    vstring = ps.getParameter<std::vector<std::string> >("vstringv4");
+    vstring = ps.getParameter<std::vector<std::string>>("vstringv4");
     assert(vstring[0] == std::string("Hello"));
     assert(vstring[1] == std::string("World"));
     assert(vstring[2] == std::string(""));
@@ -197,14 +194,14 @@ namespace edmtest {
     assert(ps.getParameter<edm::EventID>("eventIDv2") == eventID2);
 
     std::vector<edm::EventID> vEventID;
-    vEventID = ps.getParameter<std::vector<edm::EventID> >("vEventIDv1");
+    vEventID = ps.getParameter<std::vector<edm::EventID>>("vEventIDv1");
     assert(vEventID.empty());
-    vEventID = ps.getParameter<std::vector<edm::EventID> >("vEventIDv2");
+    vEventID = ps.getParameter<std::vector<edm::EventID>>("vEventIDv2");
     assert(vEventID[0] == edm::EventID(1000, 0, 1100));
-    vEventID = ps.getParameter<std::vector<edm::EventID> >("vEventIDv3");
+    vEventID = ps.getParameter<std::vector<edm::EventID>>("vEventIDv3");
     assert(vEventID[0] == edm::EventID(1000, 0, 1100));
     assert(vEventID[1] == edm::EventID(10000, 0, 11000));
-    vEventID = ps.getParameter<std::vector<edm::EventID> >("vEventIDv4");
+    vEventID = ps.getParameter<std::vector<edm::EventID>>("vEventIDv4");
     assert(vEventID[0] == edm::EventID(1000, 0, 1100));
     assert(vEventID[1] == edm::EventID(10000, 0, 11000));
     assert(vEventID[2] == edm::EventID(100000, 0, 110000));
@@ -215,56 +212,48 @@ namespace edmtest {
     assert(ps.getParameter<edm::LuminosityBlockID>("luminosityIDv2") == luminosityID2);
 
     std::vector<edm::LuminosityBlockID> vLuminosityBlockID;
-    vLuminosityBlockID = ps.getParameter<std::vector<edm::LuminosityBlockID> >("vLuminosityBlockIDv1");
+    vLuminosityBlockID = ps.getParameter<std::vector<edm::LuminosityBlockID>>("vLuminosityBlockIDv1");
     assert(vLuminosityBlockID.empty());
-    vLuminosityBlockID = ps.getParameter<std::vector<edm::LuminosityBlockID> >("vLuminosityBlockIDv2");
+    vLuminosityBlockID = ps.getParameter<std::vector<edm::LuminosityBlockID>>("vLuminosityBlockIDv2");
     assert(vLuminosityBlockID[0] == edm::LuminosityBlockID(1000, 1100));
-    vLuminosityBlockID = ps.getParameter<std::vector<edm::LuminosityBlockID> >("vLuminosityBlockIDv3");
+    vLuminosityBlockID = ps.getParameter<std::vector<edm::LuminosityBlockID>>("vLuminosityBlockIDv3");
     assert(vLuminosityBlockID[0] == edm::LuminosityBlockID(1000, 1100));
     assert(vLuminosityBlockID[1] == edm::LuminosityBlockID(10000, 11000));
-    vLuminosityBlockID = ps.getParameter<std::vector<edm::LuminosityBlockID> >("vLuminosityBlockIDv4");
+    vLuminosityBlockID = ps.getParameter<std::vector<edm::LuminosityBlockID>>("vLuminosityBlockIDv4");
     assert(vLuminosityBlockID[0] == edm::LuminosityBlockID(1000, 1100));
     assert(vLuminosityBlockID[1] == edm::LuminosityBlockID(10000, 11000));
     assert(vLuminosityBlockID[2] == edm::LuminosityBlockID(100000, 110000));
 
-    edm::LuminosityBlockRange lumiRange1(1,1, 9,9);
-    assert(ps.getParameter<edm::LuminosityBlockRange>("lumiRangev1").startLumiID() ==
-                                                          lumiRange1.startLumiID());
-    assert(ps.getParameter<edm::LuminosityBlockRange>("lumiRangev1").endLumiID() ==
-                                                          lumiRange1.endLumiID());
-    edm::LuminosityBlockRange lumiRange2(3,4, 1000,1000);
-    assert(ps.getParameter<edm::LuminosityBlockRange>("lumiRangev2").startLumiID() ==
-                                                          lumiRange2.startLumiID());
-    assert(ps.getParameter<edm::LuminosityBlockRange>("lumiRangev2").endLumiID() ==
-                                                          lumiRange2.endLumiID());
+    edm::LuminosityBlockRange lumiRange1(1, 1, 9, 9);
+    assert(ps.getParameter<edm::LuminosityBlockRange>("lumiRangev1").startLumiID() == lumiRange1.startLumiID());
+    assert(ps.getParameter<edm::LuminosityBlockRange>("lumiRangev1").endLumiID() == lumiRange1.endLumiID());
+    edm::LuminosityBlockRange lumiRange2(3, 4, 1000, 1000);
+    assert(ps.getParameter<edm::LuminosityBlockRange>("lumiRangev2").startLumiID() == lumiRange2.startLumiID());
+    assert(ps.getParameter<edm::LuminosityBlockRange>("lumiRangev2").endLumiID() == lumiRange2.endLumiID());
 
     std::vector<edm::LuminosityBlockRange> vLumiRange;
-    vLumiRange = ps.getParameter<std::vector<edm::LuminosityBlockRange> >("vLumiRangev1");
+    vLumiRange = ps.getParameter<std::vector<edm::LuminosityBlockRange>>("vLumiRangev1");
     assert(vLumiRange.empty());
-    vLumiRange = ps.getParameter<std::vector<edm::LuminosityBlockRange> >("vLumiRangev2");
+    vLumiRange = ps.getParameter<std::vector<edm::LuminosityBlockRange>>("vLumiRangev2");
     assert(vLumiRange[0].startLumiID() == lumiRange1.startLumiID());
-    vLumiRange = ps.getParameter<std::vector<edm::LuminosityBlockRange> >("vLumiRangev3");
+    vLumiRange = ps.getParameter<std::vector<edm::LuminosityBlockRange>>("vLumiRangev3");
     assert(vLumiRange[0].startLumiID() == lumiRange1.startLumiID());
     assert(vLumiRange[1].startLumiID() == lumiRange2.startLumiID());
     assert(vLumiRange[1].endLumiID() == lumiRange2.endLumiID());
 
-    edm::EventRange eventRange1(1,0,1, 8,0,8);
-    assert(ps.getParameter<edm::EventRange>("eventRangev1").startEventID() ==
-                                                eventRange1.startEventID());
-    assert(ps.getParameter<edm::EventRange>("eventRangev1").endEventID() ==
-                                                eventRange1.endEventID());
-    edm::EventRange eventRange2(3,0,4, 1001,0,1002);
-    assert(ps.getParameter<edm::EventRange>("eventRangev2").startEventID() ==
-                                                eventRange2.startEventID());
-    assert(ps.getParameter<edm::EventRange>("eventRangev2").endEventID() ==
-                                                eventRange2.endEventID());
+    edm::EventRange eventRange1(1, 0, 1, 8, 0, 8);
+    assert(ps.getParameter<edm::EventRange>("eventRangev1").startEventID() == eventRange1.startEventID());
+    assert(ps.getParameter<edm::EventRange>("eventRangev1").endEventID() == eventRange1.endEventID());
+    edm::EventRange eventRange2(3, 0, 4, 1001, 0, 1002);
+    assert(ps.getParameter<edm::EventRange>("eventRangev2").startEventID() == eventRange2.startEventID());
+    assert(ps.getParameter<edm::EventRange>("eventRangev2").endEventID() == eventRange2.endEventID());
 
     std::vector<edm::EventRange> vEventRange;
-    vEventRange = ps.getParameter<std::vector<edm::EventRange> >("vEventRangev1");
+    vEventRange = ps.getParameter<std::vector<edm::EventRange>>("vEventRangev1");
     assert(vEventRange.empty());
-    vEventRange = ps.getParameter<std::vector<edm::EventRange> >("vEventRangev2");
+    vEventRange = ps.getParameter<std::vector<edm::EventRange>>("vEventRangev2");
     assert(vEventRange[0].startEventID() == eventRange1.startEventID());
-    vEventRange = ps.getParameter<std::vector<edm::EventRange> >("vEventRangev3");
+    vEventRange = ps.getParameter<std::vector<edm::EventRange>>("vEventRangev3");
     assert(vEventRange[0].startEventID() == eventRange1.startEventID());
     assert(vEventRange[1].startEventID() == eventRange2.startEventID());
 
@@ -278,18 +267,18 @@ namespace edmtest {
     assert(ps.getParameter<edm::InputTag>("inputTagv4") == inputTag4);
 
     std::vector<edm::InputTag> vInputTag;
-    vInputTag = ps.getParameter<std::vector<edm::InputTag> >("vInputTagv1");
+    vInputTag = ps.getParameter<std::vector<edm::InputTag>>("vInputTagv1");
     assert(vInputTag.empty());
-    vInputTag = ps.getParameter<std::vector<edm::InputTag> >("vInputTagv2");
+    vInputTag = ps.getParameter<std::vector<edm::InputTag>>("vInputTagv2");
     assert(vInputTag[0] == inputTag1);
-    vInputTag = ps.getParameter<std::vector<edm::InputTag> >("vInputTagv3");
+    vInputTag = ps.getParameter<std::vector<edm::InputTag>>("vInputTagv3");
     assert(vInputTag[0] == inputTag1);
     assert(vInputTag[1] == inputTag2);
-    vInputTag = ps.getParameter<std::vector<edm::InputTag> >("vInputTagv4");
+    vInputTag = ps.getParameter<std::vector<edm::InputTag>>("vInputTagv4");
     assert(vInputTag[0] == inputTag1);
     assert(vInputTag[1] == inputTag2);
     assert(vInputTag[2] == inputTag3);
-    vInputTag = ps.getParameter<std::vector<edm::InputTag> >("vInputTagv5");
+    vInputTag = ps.getParameter<std::vector<edm::InputTag>>("vInputTagv5");
     assert(vInputTag[0] == inputTag1);
     assert(vInputTag[1] == inputTag2);
     assert(vInputTag[2] == inputTag3);
@@ -303,14 +292,15 @@ namespace edmtest {
     edm::ParameterSet const& pset = ps.getParameterSet("bar");
     assert(pset.getParameter<unsigned>("Drinks") == 5U);
     assert(pset.getUntrackedParameter<unsigned>("uDrinks") == 5U);
-    if (testingAutoGeneratedCfi) assert(pset.getParameter<unsigned>("oDrinks") == 5U);
-    if (testingAutoGeneratedCfi) assert(pset.getUntrackedParameter<unsigned>("ouDrinks") == 5U);
+    if (testingAutoGeneratedCfi)
+      assert(pset.getParameter<unsigned>("oDrinks") == 5U);
+    if (testingAutoGeneratedCfi)
+      assert(pset.getUntrackedParameter<unsigned>("ouDrinks") == 5U);
 
     //std::vector<edm::ParameterSet> const& vpsetUntracked =
     //  ps.getUntrackedParameterSetVector("test104");
 
-    std::vector<edm::ParameterSet> const& vpset =
-      ps.getParameterSetVector("bars");
+    std::vector<edm::ParameterSet> const& vpset = ps.getParameterSetVector("bars");
 
     assert(vpset.size() == 2U);
 
@@ -358,7 +348,6 @@ namespace edmtest {
 
     edm::ParameterSet const& deeplyNestedPSet = pset1.getParameterSet("testDeeplyNested");
     if (testingAutoGeneratedCfi) {
-
       assert(!deeplyNestedPSet.exists("ndiswitch"));
       assert(!deeplyNestedPSet.exists("ndivalue1"));
       assert(!deeplyNestedPSet.exists("ndivalue2"));
@@ -438,7 +427,6 @@ namespace edmtest {
       assert(psetAnd.getParameter<unsigned>("a2") == 11U);
     }
 
-
     edm::ParameterSet const& psetIfExists = ps.getParameterSet("ifExistsPset");
     assert(psetIfExists.getParameter<unsigned>("x1") == 11U);
     assert(psetIfExists.getParameter<std::string>("x2") == std::string("11"));
@@ -452,11 +440,10 @@ namespace edmtest {
       assert(!psetIfExists.exists("y2"));
     }
 
-
     edm::ParameterSet const& psetAllowed = ps.getParameterSet("allowedLabelsPset");
     if (testingAutoGeneratedCfi) {
-      assert(psetAllowed.getParameter<std::vector<std::string> >("testAllowedLabels") == std::vector<std::string>());
-      assert(psetAllowed.getUntrackedParameter<std::vector<std::string> >("testAllowedLabelsUntracked") ==
+      assert(psetAllowed.getParameter<std::vector<std::string>>("testAllowedLabels") == std::vector<std::string>());
+      assert(psetAllowed.getUntrackedParameter<std::vector<std::string>>("testAllowedLabelsUntracked") ==
              std::vector<std::string>());
       assert(!psetAllowed.exists("testOptAllowedLabels"));
       assert(!psetAllowed.exists("testOptAllowedLabelsUntracked"));
@@ -465,10 +452,9 @@ namespace edmtest {
     produces<ThingCollection>();
   }
 
-  ProducerWithPSetDesc::~ProducerWithPSetDesc() { }
+  ProducerWithPSetDesc::~ProducerWithPSetDesc() {}
 
   void ProducerWithPSetDesc::produce(edm::Event& e, edm::EventSetup const&) {
-
     // This serves no purpose, I just put it here so the module does something
     // Probably could just make this method do nothing and it would not
     // affect the test.
@@ -476,10 +462,7 @@ namespace edmtest {
     e.put(std::move(result));
   }
 
-  void
-  ProducerWithPSetDesc::
-  fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-
+  void ProducerWithPSetDesc::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription iDesc;
 
     // Try to exercise the description code by adding all different
@@ -490,14 +473,15 @@ namespace edmtest {
 
     edm::ParameterDescriptionNode* pn;
     pn = iDesc.add<int>("p_int", 2147483647);
-    pn->setComment("A big integer. I am trying to test the wrapping of comments in"
-                   " the printed output by putting in a long comment to see if it gets"
-                   " wrapped OK. The comment should get indented to the second column"
-                   " indent on every line. By default newlines should be inserted between"
-                   " words to make the lines fit in the terminal screen width. There is "
-                   "a command line parameter that can be set to override this width to "
-                   "any desired value. If there is no terminal then it should default to "
-                   "80. The logic for setting the width is in edmPluginHelp.cpp");
+    pn->setComment(
+        "A big integer. I am trying to test the wrapping of comments in"
+        " the printed output by putting in a long comment to see if it gets"
+        " wrapped OK. The comment should get indented to the second column"
+        " indent on every line. By default newlines should be inserted between"
+        " words to make the lines fit in the terminal screen width. There is "
+        "a command line parameter that can be set to override this width to "
+        "any desired value. If there is no terminal then it should default to "
+        "80. The logic for setting the width is in edmPluginHelp.cpp");
 
     iDesc.addUntracked<int>("p_int_untracked", -2147483647);
     iDesc.addOptional<int>("p_int_opt", 0);
@@ -506,72 +490,72 @@ namespace edmtest {
     iDesc.addOptionalUntracked<int>("p_int_optuntracked_nd");
 
     std::vector<int> vint;
-    iDesc.add<std::vector<int> >("vint1", vint);
+    iDesc.add<std::vector<int>>("vint1", vint);
     vint.push_back(2147483647);
-    iDesc.add<std::vector<int> >(std::string("vint2"), vint);
+    iDesc.add<std::vector<int>>(std::string("vint2"), vint);
     vint.push_back(-2147483647);
-    iDesc.add<std::vector<int> >("vint3", vint);
+    iDesc.add<std::vector<int>>("vint3", vint);
     vint.push_back(0);
-    iDesc.add<std::vector<int> >("vint4", vint);
+    iDesc.add<std::vector<int>>("vint4", vint);
 
     iDesc.add<unsigned>("uint1", 4294967295U);
     iDesc.addUntracked<unsigned>("uint2", 0);
 
     std::vector<unsigned> vuint;
-    iDesc.add<std::vector<unsigned> >("vuint1", vuint);
+    iDesc.add<std::vector<unsigned>>("vuint1", vuint);
     vuint.push_back(4294967295U);
-    iDesc.add<std::vector<unsigned> >("vuint2", vuint);
+    iDesc.add<std::vector<unsigned>>("vuint2", vuint);
     vuint.push_back(0);
-    iDesc.add<std::vector<unsigned> >("vuint3", vuint);
+    iDesc.add<std::vector<unsigned>>("vuint3", vuint);
     vuint.push_back(11);
-    iDesc.add<std::vector<unsigned> >("vuint4", vuint);
+    iDesc.add<std::vector<unsigned>>("vuint4", vuint);
     vuint.push_back(21);
     vuint.push_back(31);
     vuint.push_back(41);
-    iDesc.add<std::vector<unsigned> >("vuint5", vuint);
+    iDesc.add<std::vector<unsigned>>("vuint5", vuint);
 
     iDesc.add<long long>("int64v1", 9000000000000000000LL);
     iDesc.add<long long>("int64v2", -9000000000000000000LL);
     iDesc.add<long long>("int64v3", 0);
 
     std::vector<long long> vint64;
-    iDesc.add<std::vector<long long> >("vint64v1", vint64);
+    iDesc.add<std::vector<long long>>("vint64v1", vint64);
     vint64.push_back(9000000000000000000LL);
-    iDesc.add<std::vector<long long> >("vint64v2", vint64);
+    iDesc.add<std::vector<long long>>("vint64v2", vint64);
     vint64.push_back(-9000000000000000000LL);
-    iDesc.add<std::vector<long long> >("vint64v3", vint64);
+    iDesc.add<std::vector<long long>>("vint64v3", vint64);
     vint64.push_back(0);
-    iDesc.add<std::vector<long long> >("vint64v4", vint64);
+    iDesc.add<std::vector<long long>>("vint64v4", vint64);
 
     iDesc.add<unsigned long long>("uint64v1", 18000000000000000000ULL);
     iDesc.addUntracked<unsigned long long>("uint64v2", 0);
 
     std::vector<unsigned long long> vuint64;
-    iDesc.add<std::vector<unsigned long long> >("vuint64v1", vuint64);
+    iDesc.add<std::vector<unsigned long long>>("vuint64v1", vuint64);
     vuint64.push_back(18000000000000000000ULL);
-    iDesc.add<std::vector<unsigned long long> >("vuint64v2", vuint64);
+    iDesc.add<std::vector<unsigned long long>>("vuint64v2", vuint64);
     vuint64.push_back(0);
-    iDesc.add<std::vector<unsigned long long> >("vuint64v3", vuint64);
+    iDesc.add<std::vector<unsigned long long>>("vuint64v3", vuint64);
     vuint64.push_back(11);
-    iDesc.add<std::vector<unsigned long long> >("vuint64v4", vuint64);
+    iDesc.add<std::vector<unsigned long long>>("vuint64v4", vuint64);
 
     iDesc.add<double>("doublev1", std::numeric_limits<double>::min());
     iDesc.addUntracked<double>("doublev2", 0.0);
     iDesc.addUntracked<double>("doublev3", 0.3);
 
     std::vector<double> vdouble;
-    iDesc.add<std::vector<double> >("vdoublev1", vdouble);
+    iDesc.add<std::vector<double>>("vdoublev1", vdouble);
     // cmsRun will fail with a value this big
     // vdouble.push_back(std::numeric_limits<double>::max());
     // This works though
     vdouble.push_back(1e+300);
-    iDesc.add<std::vector<double> >("vdoublev2", vdouble);
+    iDesc.add<std::vector<double>>("vdoublev2", vdouble);
     vdouble.push_back(0.0);
-    iDesc.add<std::vector<double> >("vdoublev3", vdouble);
+    iDesc.add<std::vector<double>>("vdoublev3", vdouble);
     vdouble.push_back(11.0);
-    iDesc.add<std::vector<double> >("vdoublev4", vdouble);
+    iDesc.add<std::vector<double>>("vdoublev4", vdouble);
     vdouble.push_back(0.3);
-    iDesc.add<std::vector<double> >("vdoublev5", vdouble);
+    iDesc.add<std::vector<double>>("vdoublev5", vdouble);
 
     iDesc.add<bool>("boolv1", true);
     iDesc.add<bool>("boolv2", false);
@@ -582,32 +566,32 @@ namespace edmtest {
     iDesc.add<std::string>("stringv2", test);
 
     std::vector<std::string> vstring;
-    iDesc.add<std::vector<std::string> >("vstringv1", vstring);
+    iDesc.add<std::vector<std::string>>("vstringv1", vstring);
     test = "Hello";
     vstring.push_back(test);
-    iDesc.add<std::vector<std::string> >("vstringv2", vstring);
+    iDesc.add<std::vector<std::string>>("vstringv2", vstring);
     test = "World";
     vstring.push_back(test);
-    iDesc.add<std::vector<std::string> >("vstringv3", vstring);
+    iDesc.add<std::vector<std::string>>("vstringv3", vstring);
     test = "";
     vstring.push_back(test);
-    iDesc.add<std::vector<std::string> >("vstringv4", vstring);
+    iDesc.add<std::vector<std::string>>("vstringv4", vstring);
 
     edm::EventID eventID(11, 0, 12);
     iDesc.add<edm::EventID>("eventIDv1", eventID);
     edm::EventID eventID2(101, 0, 102);
     iDesc.add<edm::EventID>("eventIDv2", eventID2);
     std::vector<edm::EventID> vEventID;
-    iDesc.add<std::vector<edm::EventID> >("vEventIDv1", vEventID);
+    iDesc.add<std::vector<edm::EventID>>("vEventIDv1", vEventID);
     edm::EventID eventID3(1000, 0, 1100);
     vEventID.push_back(eventID3);
-    iDesc.add<std::vector<edm::EventID> >("vEventIDv2", vEventID);
+    iDesc.add<std::vector<edm::EventID>>("vEventIDv2", vEventID);
     edm::EventID eventID4(10000, 0, 11000);
     vEventID.push_back(eventID4);
-    iDesc.add<std::vector<edm::EventID> >("vEventIDv3", vEventID);
+    iDesc.add<std::vector<edm::EventID>>("vEventIDv3", vEventID);
     edm::EventID eventID5(100000, 0, 110000);
     vEventID.push_back(eventID5);
-    iDesc.add<std::vector<edm::EventID> >("vEventIDv4", vEventID);
+    iDesc.add<std::vector<edm::EventID>>("vEventIDv4", vEventID);
 
     edm::LuminosityBlockID luminosityID(11, 12);
     iDesc.add<edm::LuminosityBlockID>("luminosityIDv1", luminosityID);
@@ -615,40 +599,40 @@ namespace edmtest {
     iDesc.add<edm::LuminosityBlockID>("luminosityIDv2", luminosityID2);
 
     std::vector<edm::LuminosityBlockID> vLuminosityBlockID;
-    iDesc.add<std::vector<edm::LuminosityBlockID> >("vLuminosityBlockIDv1", vLuminosityBlockID);
+    iDesc.add<std::vector<edm::LuminosityBlockID>>("vLuminosityBlockIDv1", vLuminosityBlockID);
     edm::LuminosityBlockID luminosityID3(1000, 1100);
     vLuminosityBlockID.push_back(luminosityID3);
-    iDesc.add<std::vector<edm::LuminosityBlockID> >("vLuminosityBlockIDv2", vLuminosityBlockID);
+    iDesc.add<std::vector<edm::LuminosityBlockID>>("vLuminosityBlockIDv2", vLuminosityBlockID);
     edm::LuminosityBlockID luminosityID4(10000, 11000);
     vLuminosityBlockID.push_back(luminosityID4);
-    iDesc.add<std::vector<edm::LuminosityBlockID> >("vLuminosityBlockIDv3", vLuminosityBlockID);
+    iDesc.add<std::vector<edm::LuminosityBlockID>>("vLuminosityBlockIDv3", vLuminosityBlockID);
     edm::LuminosityBlockID luminosityID5(100000, 110000);
     vLuminosityBlockID.push_back(luminosityID5);
-    iDesc.add<std::vector<edm::LuminosityBlockID> >("vLuminosityBlockIDv4", vLuminosityBlockID);
+    iDesc.add<std::vector<edm::LuminosityBlockID>>("vLuminosityBlockIDv4", vLuminosityBlockID);
 
-    edm::LuminosityBlockRange lumiRange(1,1, 9,9);
+    edm::LuminosityBlockRange lumiRange(1, 1, 9, 9);
     iDesc.add<edm::LuminosityBlockRange>("lumiRangev1", lumiRange);
-    edm::LuminosityBlockRange lumiRange2(3,4, 1000,1000);
+    edm::LuminosityBlockRange lumiRange2(3, 4, 1000, 1000);
     iDesc.add<edm::LuminosityBlockRange>("lumiRangev2", lumiRange2);
 
     std::vector<edm::LuminosityBlockRange> vLumiRange;
-    iDesc.add<std::vector<edm::LuminosityBlockRange> >("vLumiRangev1", vLumiRange);
+    iDesc.add<std::vector<edm::LuminosityBlockRange>>("vLumiRangev1", vLumiRange);
     vLumiRange.push_back(lumiRange);
-    iDesc.add<std::vector<edm::LuminosityBlockRange> >("vLumiRangev2", vLumiRange);
+    iDesc.add<std::vector<edm::LuminosityBlockRange>>("vLumiRangev2", vLumiRange);
     vLumiRange.push_back(lumiRange2);
-    iDesc.add<std::vector<edm::LuminosityBlockRange> >("vLumiRangev3", vLumiRange);
+    iDesc.add<std::vector<edm::LuminosityBlockRange>>("vLumiRangev3", vLumiRange);
 
-    edm::EventRange eventRange(1,0,1, 8,0,8);
+    edm::EventRange eventRange(1, 0, 1, 8, 0, 8);
     iDesc.add<edm::EventRange>("eventRangev1", eventRange);
-    edm::EventRange eventRange2(3,0,4, 1001,0,1002);
+    edm::EventRange eventRange2(3, 0, 4, 1001, 0, 1002);
     iDesc.add<edm::EventRange>("eventRangev2", eventRange2);
 
     std::vector<edm::EventRange> vEventRange;
-    iDesc.add<std::vector<edm::EventRange> >("vEventRangev1", vEventRange);
+    iDesc.add<std::vector<edm::EventRange>>("vEventRangev1", vEventRange);
     vEventRange.push_back(eventRange);
-    iDesc.add<std::vector<edm::EventRange> >("vEventRangev2", vEventRange);
+    iDesc.add<std::vector<edm::EventRange>>("vEventRangev2", vEventRange);
     vEventRange.push_back(eventRange2);
-    iDesc.add<std::vector<edm::EventRange> >("vEventRangev3", vEventRange);
+    iDesc.add<std::vector<edm::EventRange>>("vEventRangev3", vEventRange);
 
     edm::InputTag inputTag("One", "Two", "Three");
     iDesc.add<edm::InputTag>("inputTagv1", inputTag);
@@ -660,15 +644,15 @@ namespace edmtest {
     iDesc.add<edm::InputTag>("inputTagv4", inputTag4);
 
     std::vector<edm::InputTag> vInputTag;
-    iDesc.add<std::vector<edm::InputTag> >("vInputTagv1", vInputTag);
+    iDesc.add<std::vector<edm::InputTag>>("vInputTagv1", vInputTag);
     vInputTag.push_back(inputTag);
-    iDesc.add<std::vector<edm::InputTag> >("vInputTagv2", vInputTag);
+    iDesc.add<std::vector<edm::InputTag>>("vInputTagv2", vInputTag);
     vInputTag.push_back(inputTag2);
-    iDesc.add<std::vector<edm::InputTag> >("vInputTagv3", vInputTag);
+    iDesc.add<std::vector<edm::InputTag>>("vInputTagv3", vInputTag);
     vInputTag.push_back(inputTag3);
-    iDesc.add<std::vector<edm::InputTag> >("vInputTagv4", vInputTag);
+    iDesc.add<std::vector<edm::InputTag>>("vInputTagv4", vInputTag);
     vInputTag.push_back(inputTag4);
-    iDesc.add<std::vector<edm::InputTag> >("vInputTagv5", vInputTag);
+    iDesc.add<std::vector<edm::InputTag>>("vInputTagv5", vInputTag);
 
     // For purposes of the test, this just needs to point to any file
     // that exists.  I guess pointing to itself cannot ever fail ...
@@ -696,19 +680,21 @@ namespace edmtest {
     barx.addOptional<unsigned int>("ndoDrinks");
     barx.addOptionalUntracked<unsigned int>("ndouDrinks");
 
-    edm::ParameterDescription<std::vector<edm::ParameterSet> > test102("test102", edm::ParameterSetDescription(), true);
+    edm::ParameterDescription<std::vector<edm::ParameterSet>> test102("test102", edm::ParameterSetDescription(), true);
     iDesc.addOptionalNode(test102, false);
 
-    edm::ParameterDescription<std::vector<edm::ParameterSet> > test103(std::string("test103"), barx, true);
+    edm::ParameterDescription<std::vector<edm::ParameterSet>> test103(std::string("test103"), barx, true);
     iDesc.addOptionalNode(test103, false);
 
     std::vector<edm::ParameterSet> defaultVPSet104;
     defaultVPSet104.push_back(edm::ParameterSet());
-    edm::ParameterDescription<std::vector<edm::ParameterSet> > test104(std::string("test104"), barx, false, defaultVPSet104);
+    edm::ParameterDescription<std::vector<edm::ParameterSet>> test104(
+        std::string("test104"), barx, false, defaultVPSet104);
     iDesc.addNode(test104);
 
     std::vector<edm::ParameterSet> defaultVPSet105;
-    edm::ParameterDescription<std::vector<edm::ParameterSet> > test105(std::string("test105"), barx, false, defaultVPSet105);
+    edm::ParameterDescription<std::vector<edm::ParameterSet>> test105(
+        std::string("test105"), barx, false, defaultVPSet105);
     iDesc.addNode(test105);
 
     double d1 = 0.1;
@@ -720,39 +706,42 @@ namespace edmtest {
     iDesc.addOptionalNode(edm::ParameterDescription<double>("test3", d3, true), false);
 
     iDesc.addOptionalNode(edm::ParameterDescription<std::string>("testA", "fooA", true) and
-                          edm::ParameterDescription<int>("testB", 100, true)&&
-                          edm::ParameterDescription<int>("testC", 101, true), true);
+                              edm::ParameterDescription<int>("testB", 100, true) &&
+                              edm::ParameterDescription<int>("testC", 101, true),
+                          true);
 
     iDesc.ifValueOptional(edm::ParameterDescription<int>("oiswitch", 1, true),
-                           0 >> edm::ParameterDescription<int>("oivalue", 100, true) or
-                           1 >> (edm::ParameterDescription<double>("oivalue1", 101.0, true) and
-                                 edm::ParameterDescription<double>("oivalue2", 101.0, true)) or
-                           2 >> edm::ParameterDescription<std::string>("oivalue", "102", true), true);
+                          0 >> edm::ParameterDescription<int>("oivalue", 100, true) or
+                              1 >> (edm::ParameterDescription<double>("oivalue1", 101.0, true) and
+                                    edm::ParameterDescription<double>("oivalue2", 101.0, true)) or
+                              2 >> edm::ParameterDescription<std::string>("oivalue", "102", true),
+                          true);
 
     edm::ParameterSetDescription deeplyNested;
 
     bool case0 = true;
     bool case1 = false;
     deeplyNested.ifValue(edm::ParameterDescription<bool>("bswitch", false, true),
-                          case0 >> edm::ParameterDescription<int>("bvalue", 100, true) or
-                          case1 >> (edm::ParameterDescription<double>("bvalue1", 101.0, true) and
-                                    edm::ParameterDescription<double>("bvalue2", 101.0, true)));
+                         case0 >> edm::ParameterDescription<int>("bvalue", 100, true) or
+                             case1 >> (edm::ParameterDescription<double>("bvalue1", 101.0, true) and
+                                       edm::ParameterDescription<double>("bvalue2", 101.0, true)));
     deeplyNested.ifValue(edm::ParameterDescription<int>("iswitch", 1, true),
-                          0 >> edm::ParameterDescription<int>("ivalue", 100, true) or
-                          1 >> (edm::ParameterDescription<double>("ivalue1", 101.0, true) and
-                                edm::ParameterDescription<double>("ivalue2", 101.0, false)) or
-                          2 >> edm::ParameterDescription<std::string>("ivalue", "102", true));
+                         0 >> edm::ParameterDescription<int>("ivalue", 100, true) or
+                             1 >> (edm::ParameterDescription<double>("ivalue1", 101.0, true) and
+                                   edm::ParameterDescription<double>("ivalue2", 101.0, false)) or
+                             2 >> edm::ParameterDescription<std::string>("ivalue", "102", true));
     deeplyNested.ifValue(edm::ParameterDescription<std::string>("sswitch", std::string("1"), true),
-                          std::string("0") >> edm::ParameterDescription<int>("svalue", 100, true) or
-                          "1" >> (edm::ParameterDescription<double>("svalue1", 101.0, true) and
-                                  edm::ParameterDescription<double>("svalue2", 101.0, true)) or
-                          "2" >> edm::ParameterDescription<std::string>("svalue", "102", true));
+                         std::string("0") >> edm::ParameterDescription<int>("svalue", 100, true) or
+                             "1" >> (edm::ParameterDescription<double>("svalue1", 101.0, true) and
+                                     edm::ParameterDescription<double>("svalue2", 101.0, true)) or
+                             "2" >> edm::ParameterDescription<std::string>("svalue", "102", true));
 
     deeplyNested.ifValueOptional(edm::ParameterDescription<int>("ndiswitch", 1, true),
-                                  0 >> edm::ParameterDescription<int>("ndivalue", 100, true) or
-                                  1 >> (edm::ParameterDescription<double>("ndivalue1", 101.0, true) and
-                                        edm::ParameterDescription<double>("ndivalue2", 101.0, true)) or
-                                  2 >> edm::ParameterDescription<std::string>("ndivalue", "102", true), false);
+                                 0 >> edm::ParameterDescription<int>("ndivalue", 100, true) or
+                                     1 >> (edm::ParameterDescription<double>("ndivalue1", 101.0, true) and
+                                           edm::ParameterDescription<double>("ndivalue2", 101.0, true)) or
+                                     2 >> edm::ParameterDescription<std::string>("ndivalue", "102", true),
+                                 false);
 
     deeplyNested.add<int>("testint", 1000);
 
@@ -786,10 +775,10 @@ namespace edmtest {
     edm::ParameterSet anotherParameterSet;
     anotherParameterSet.addParameter<int>("xvalue", 17);
     anotherDefaultVPSet.push_back(anotherParameterSet);
-    psetInVector2.addParameter<std::vector<edm::ParameterSet> >("anotherVPSet", anotherDefaultVPSet);
+    psetInVector2.addParameter<std::vector<edm::ParameterSet>>("anotherVPSet", anotherDefaultVPSet);
 
     edm::ParameterSet defaultForDeeplyNested;
-    defaultForDeeplyNested.addParameter<int>("testint",2);
+    defaultForDeeplyNested.addParameter<int>("testint", 2);
     psetInVector2.addParameter<edm::ParameterSet>("testDeeplyNested", defaultForDeeplyNested);
 
     defaultVPSet.push_back(psetInVector2);
@@ -799,8 +788,7 @@ namespace edmtest {
     // Alternate way to add a ParameterSetDescription
     edm::ParameterDescriptionBase* parDescription;
     parDescription = iDesc.addOptional("subpset", edm::ParameterSetDescription());
-    edm::ParameterSetDescription* subPsetDescription =
-      parDescription->parameterSetDescription();
+    edm::ParameterSetDescription* subPsetDescription = parDescription->parameterSetDescription();
 
     subPsetDescription->add<int>("xvalue", 11);
     subPsetDescription->addUntracked<edm::ParameterSetDescription>(std::string("bar"), bar);
@@ -813,21 +801,27 @@ namespace edmtest {
     pn = wildcardPset.addWildcardUntracked<double>(std::string("*"));
     pn->setComment("A comment for a wildcard parameter");
 
-    std::unique_ptr<edm::ParameterDescriptionNode> wnode = std::make_unique<edm::ParameterWildcard<edm::ParameterSetDescription>>("*", edm::RequireExactlyOne, true);
+    std::unique_ptr<edm::ParameterDescriptionNode> wnode =
+        std::make_unique<edm::ParameterWildcard<edm::ParameterSetDescription>>("*", edm::RequireExactlyOne, true);
     wildcardPset.addOptionalNode(std::move(wnode), false);
 
     edm::ParameterSetDescription wSet1;
     wSet1.add<unsigned int>("Drinks", 5);
 
-    std::unique_ptr<edm::ParameterDescriptionNode> wnode2 = std::make_unique<edm::ParameterWildcard<edm::ParameterSetDescription>>("*", edm::RequireAtLeastOne, true, wSet1);
+    std::unique_ptr<edm::ParameterDescriptionNode> wnode2 =
+        std::make_unique<edm::ParameterWildcard<edm::ParameterSetDescription>>(
+            "*", edm::RequireAtLeastOne, true, wSet1);
     wildcardPset.addOptionalNode(std::move(wnode2), false);
 
-    std::unique_ptr<edm::ParameterDescriptionNode> wnode3 = std::make_unique<edm::ParameterWildcard<std::vector<edm::ParameterSet>>>("*", edm::RequireExactlyOne, true);
+    std::unique_ptr<edm::ParameterDescriptionNode> wnode3 =
+        std::make_unique<edm::ParameterWildcard<std::vector<edm::ParameterSet>>>("*", edm::RequireExactlyOne, true);
     wildcardPset.addOptionalNode(std::move(wnode3), false);
 
     wSet1.add<unsigned int>("Drinks2", 11);
 
-    std::unique_ptr<edm::ParameterDescriptionNode> wnode4 = std::make_unique<edm::ParameterWildcard<std::vector<edm::ParameterSet>>>("*", edm::RequireAtLeastOne, true, wSet1);
+    std::unique_ptr<edm::ParameterDescriptionNode> wnode4 =
+        std::make_unique<edm::ParameterWildcard<std::vector<edm::ParameterSet>>>(
+            "*", edm::RequireAtLeastOne, true, wSet1);
     wildcardPset.addOptionalNode(std::move(wnode4), false);
 
     iDesc.add("wildcardPset", wildcardPset);
@@ -839,16 +833,18 @@ namespace edmtest {
     testIntVector.push_back(22);
     edm::ParameterSetDescription switchPset;
     pn = switchPset.ifValue(edm::ParameterDescription<int>("iswitch", 1, true),
-                             0 >> edm::ParameterDescription<std::vector<int> >("ivalue", testIntVector, true) or
-                             1 >> (edm::ParameterDescription<double>("ivalue1", 101.0, true) and
-                                   edm::ParameterDescription<double>("ivalue2", 101.0, true)) or
-                             2 >> edm::ParameterDescription<std::string>("ivalue", "102", true));
+                            0 >> edm::ParameterDescription<std::vector<int>>("ivalue", testIntVector, true) or
+                                1 >> (edm::ParameterDescription<double>("ivalue1", 101.0, true) and
+                                      edm::ParameterDescription<double>("ivalue2", 101.0, true)) or
+                                2 >> edm::ParameterDescription<std::string>("ivalue", "102", true));
     pn->setComment("Comment for a ParameterSwitch");
 
-    switchPset.ifValue(edm::ParameterDescription<bool>("addTeVRefits", true, true),
-                        true >> (edm::ParameterDescription<edm::InputTag>("pickySrc", edm::InputTag(), true) and
-                                 edm::ParameterDescription<edm::InputTag>("tpfmsSrc", edm::InputTag(), true)) or
-                        false >> edm::EmptyGroupDescription())->setComment("If TeV refits are added, their sources need to be specified");
+    switchPset
+        .ifValue(edm::ParameterDescription<bool>("addTeVRefits", true, true),
+                 true >> (edm::ParameterDescription<edm::InputTag>("pickySrc", edm::InputTag(), true) and
+                          edm::ParameterDescription<edm::InputTag>("tpfmsSrc", edm::InputTag(), true)) or
+                     false >> edm::EmptyGroupDescription())
+        ->setComment("If TeV refits are added, their sources need to be specified");
 
     iDesc.add("switchPset", switchPset);
 
@@ -862,12 +858,11 @@ namespace edmtest {
                     edm::ParameterDescription<unsigned int>("name1", 11U, true));
 
     xorPset.addOptionalNode(edm::ParameterDescription<std::string>("name2", "11", true) xor
-                            edm::ParameterDescription<unsigned int>("name2", 11U, true), false);
+                                edm::ParameterDescription<unsigned int>("name2", 11U, true),
+                            false);
 
     xorPset.addNode(edm::ParameterDescription<std::string>("name3", "11", true) xor
-                    edm::ParameterDescription<unsigned int>("name4", 11U, true) xor
-                     test101 xor
-                     test103);
+                    edm::ParameterDescription<unsigned int>("name4", 11U, true) xor test101 xor test103);
 
     iDesc.add("xorPset", xorPset);
 
@@ -882,9 +877,8 @@ namespace edmtest {
                    edm::ParameterDescription<unsigned int>("y2", 11U, true));
 
     orPset.addOptionalNode(edm::ParameterDescription<std::string>("z1", "11", true) or
-                            edm::ParameterDescription<unsigned int>("z2", 11U, true) or
-                            test101 or
-                            test103, false);
+                               edm::ParameterDescription<unsigned int>("z2", 11U, true) or test101 or test103,
+                           false);
 
     iDesc.add("orPset", orPset);
 
@@ -902,14 +896,16 @@ namespace edmtest {
                     edm::ParameterDescription<unsigned int>("z2", 11U, true));
 
     andPset.addOptionalNode(edm::ParameterDescription<std::string>("a1", "11", true) and
-                            edm::ParameterDescription<unsigned int>("a2", 11U, true), false);
+                                edm::ParameterDescription<unsigned int>("a2", 11U, true),
+                            false);
 
     andPset.addOptionalNode((edm::ParameterDescription<std::string>("b1", "11", true) and
-                              edm::ParameterDescription<unsigned int>("b2", 11U, true)) and
-                             edm::ParameterDescription<unsigned int>("b3", 11U, true) and
-                             (edm::ParameterDescription<unsigned int>("b4", 11U, true) and
-                              (edm::ParameterDescription<unsigned int>("b5", 11U, true) and
-                               edm::ParameterDescription<unsigned int>("b6", 11U, true))), true);
+                             edm::ParameterDescription<unsigned int>("b2", 11U, true)) and
+                                edm::ParameterDescription<unsigned int>("b3", 11U, true) and
+                                (edm::ParameterDescription<unsigned int>("b4", 11U, true) and
+                                 (edm::ParameterDescription<unsigned int>("b5", 11U, true) and
+                                  edm::ParameterDescription<unsigned int>("b6", 11U, true))),
+                            true);
 
     iDesc.add("andPset", andPset);
 
@@ -921,8 +917,8 @@ namespace edmtest {
                           edm::ParameterDescription<std::string>("x2", "11", true));
 
     ifExistsPset.ifExistsOptional(edm::ParameterDescription<unsigned int>("y1", 11U, true),
-                                   edm::ParameterDescription<std::string>("y2", "11", true),
-                                   false);
+                                  edm::ParameterDescription<std::string>("y2", "11", true),
+                                  false);
 
     ifExistsPset.ifExists(edm::ParameterDescription<unsigned int>("z1", 11U, true),
                           edm::ParameterDescription<std::string>("z2", "11", true));
@@ -940,75 +936,76 @@ namespace edmtest {
     allowedLabelsPset.labelsFromOptionalUntracked<unsigned>(std::string("testOptAllowedLabelsUntracked"), false);
     allowedLabelsPset.labelsFromOptionalUntracked<edm::ParameterSetDescription>(std::string("testWithSet"), true, bar);
 
-    allowedLabelsPset.labelsFromOptionalUntracked<std::vector<edm::ParameterSet> >(std::string("testWithVectorOfSets"), true, bar);
+    allowedLabelsPset.labelsFromOptionalUntracked<std::vector<edm::ParameterSet>>(
+        std::string("testWithVectorOfSets"), true, bar);
 
     iDesc.add("allowedLabelsPset", allowedLabelsPset);
 
     edm::ParameterSetDescription noDefaultPset3;
 
     noDefaultPset3.addOptional<int>(std::string("noDefault1"));
-    noDefaultPset3.addOptional<std::vector<int> >("noDefault2");
+    noDefaultPset3.addOptional<std::vector<int>>("noDefault2");
     noDefaultPset3.addOptional<unsigned>("noDefault3");
-    noDefaultPset3.addOptional<std::vector<unsigned> >("noDefault4");
+    noDefaultPset3.addOptional<std::vector<unsigned>>("noDefault4");
     noDefaultPset3.addOptional<long long>("noDefault5");
-    noDefaultPset3.addOptional<std::vector<long long> >("noDefault6");
+    noDefaultPset3.addOptional<std::vector<long long>>("noDefault6");
     noDefaultPset3.addOptional<unsigned long long>("noDefault7");
-    noDefaultPset3.addOptional<std::vector<unsigned long long> >("noDefault8");
+    noDefaultPset3.addOptional<std::vector<unsigned long long>>("noDefault8");
     noDefaultPset3.addOptional<double>("noDefault9");
-    noDefaultPset3.addOptional<std::vector<double> >("noDefault10");
+    noDefaultPset3.addOptional<std::vector<double>>("noDefault10");
     noDefaultPset3.addOptional<bool>("noDefault11");
     noDefaultPset3.addOptional<std::string>("noDefault12");
-    noDefaultPset3.addOptional<std::vector<std::string> >("noDefault13");
+    noDefaultPset3.addOptional<std::vector<std::string>>("noDefault13");
     noDefaultPset3.addOptional<edm::EventID>("noDefault14");
-    noDefaultPset3.addOptional<std::vector<edm::EventID> >("noDefault15");
+    noDefaultPset3.addOptional<std::vector<edm::EventID>>("noDefault15");
     noDefaultPset3.addOptional<edm::LuminosityBlockID>("noDefault16");
-    noDefaultPset3.addOptional<std::vector<edm::LuminosityBlockID> >("noDefault17");
+    noDefaultPset3.addOptional<std::vector<edm::LuminosityBlockID>>("noDefault17");
     noDefaultPset3.addOptional<edm::InputTag>("noDefault18");
-    noDefaultPset3.addOptional<std::vector<edm::InputTag> >("noDefault19");
+    noDefaultPset3.addOptional<std::vector<edm::InputTag>>("noDefault19");
     noDefaultPset3.addOptional<edm::FileInPath>("noDefault20");
     noDefaultPset3.addOptional<edm::LuminosityBlockRange>("noDefault21");
-    noDefaultPset3.addOptional<std::vector<edm::LuminosityBlockRange> >("noDefault22");
+    noDefaultPset3.addOptional<std::vector<edm::LuminosityBlockRange>>("noDefault22");
     noDefaultPset3.addOptional<edm::EventRange>("noDefault23");
-    noDefaultPset3.addOptional<std::vector<edm::EventRange> >("noDefault24");
+    noDefaultPset3.addOptional<std::vector<edm::EventRange>>("noDefault24");
 
     iDesc.add("noDefaultPset3", noDefaultPset3);
 
     edm::ParameterSetDescription noDefaultPset4;
 
     noDefaultPset4.addOptionalUntracked<int>(std::string("noDefault1"));
-    noDefaultPset4.addOptionalUntracked<std::vector<int> >("noDefault2");
+    noDefaultPset4.addOptionalUntracked<std::vector<int>>("noDefault2");
     noDefaultPset4.addOptionalUntracked<unsigned>("noDefault3");
-    noDefaultPset4.addOptionalUntracked<std::vector<unsigned> >("noDefault4");
+    noDefaultPset4.addOptionalUntracked<std::vector<unsigned>>("noDefault4");
     noDefaultPset4.addOptionalUntracked<long long>("noDefault5");
-    noDefaultPset4.addOptionalUntracked<std::vector<long long> >("noDefault6");
+    noDefaultPset4.addOptionalUntracked<std::vector<long long>>("noDefault6");
     noDefaultPset4.addOptionalUntracked<unsigned long long>("noDefault7");
-    noDefaultPset4.addOptionalUntracked<std::vector<unsigned long long> >("noDefault8");
+    noDefaultPset4.addOptionalUntracked<std::vector<unsigned long long>>("noDefault8");
     noDefaultPset4.addOptionalUntracked<double>("noDefault9");
-    noDefaultPset4.addOptionalUntracked<std::vector<double> >("noDefault10");
+    noDefaultPset4.addOptionalUntracked<std::vector<double>>("noDefault10");
     noDefaultPset4.addOptionalUntracked<bool>("noDefault11");
     noDefaultPset4.addOptionalUntracked<std::string>("noDefault12");
-    noDefaultPset4.addOptionalUntracked<std::vector<std::string> >("noDefault13");
+    noDefaultPset4.addOptionalUntracked<std::vector<std::string>>("noDefault13");
     noDefaultPset4.addOptionalUntracked<edm::EventID>("noDefault14");
-    noDefaultPset4.addOptionalUntracked<std::vector<edm::EventID> >("noDefault15");
+    noDefaultPset4.addOptionalUntracked<std::vector<edm::EventID>>("noDefault15");
     noDefaultPset4.addOptionalUntracked<edm::LuminosityBlockID>("noDefault16");
-    noDefaultPset4.addOptionalUntracked<std::vector<edm::LuminosityBlockID> >("noDefault17");
+    noDefaultPset4.addOptionalUntracked<std::vector<edm::LuminosityBlockID>>("noDefault17");
     noDefaultPset4.addOptionalUntracked<edm::InputTag>("noDefault18");
-    noDefaultPset4.addOptionalUntracked<std::vector<edm::InputTag> >("noDefault19");
+    noDefaultPset4.addOptionalUntracked<std::vector<edm::InputTag>>("noDefault19");
     noDefaultPset4.addOptionalUntracked<edm::FileInPath>("noDefault20");
     noDefaultPset4.addOptionalUntracked<edm::LuminosityBlockRange>("noDefault21");
-    noDefaultPset4.addOptionalUntracked<std::vector<edm::LuminosityBlockRange> >("noDefault22");
+    noDefaultPset4.addOptionalUntracked<std::vector<edm::LuminosityBlockRange>>("noDefault22");
     noDefaultPset4.addOptionalUntracked<edm::EventRange>("noDefault23");
-    noDefaultPset4.addOptionalUntracked<std::vector<edm::EventRange> >("noDefault24");
+    noDefaultPset4.addOptionalUntracked<std::vector<edm::EventRange>>("noDefault24");
 
     iDesc.add("noDefaultPset4", noDefaultPset4);
 
     edm::ParameterSetDescription pluginDesc;
-    pluginDesc.addNode( edm::PluginDescription<AnotherIntFactory>("type", "edmtestAnotherValueMaker", true));
-    iDesc.add<edm::ParameterSetDescription>("plugin",pluginDesc);
+    pluginDesc.addNode(edm::PluginDescription<AnotherIntFactory>("type", "edmtestAnotherValueMaker", true));
+    iDesc.add<edm::ParameterSetDescription>("plugin", pluginDesc);
 
     edm::ParameterSetDescription pluginDesc1;
-    pluginDesc1.addNode( edm::PluginDescription<AnotherIntFactory>("type", true));
-    iDesc.add<edm::ParameterSetDescription>("plugin1",pluginDesc1);
+    pluginDesc1.addNode(edm::PluginDescription<AnotherIntFactory>("type", true));
+    iDesc.add<edm::ParameterSetDescription>("plugin1", pluginDesc1);
 
     // ------------------------------------------
 
@@ -1024,58 +1021,58 @@ namespace edmtest {
     edm::ParameterSetDescription noDefaultPset1;
 
     noDefaultPset1.add<int>(std::string("noDefault1"));
-    noDefaultPset1.add<std::vector<int> >("noDefault2");
+    noDefaultPset1.add<std::vector<int>>("noDefault2");
     noDefaultPset1.add<unsigned>("noDefault3");
-    noDefaultPset1.add<std::vector<unsigned> >("noDefault4");
+    noDefaultPset1.add<std::vector<unsigned>>("noDefault4");
     noDefaultPset1.add<long long>("noDefault5");
-    noDefaultPset1.add<std::vector<long long> >("noDefault6");
+    noDefaultPset1.add<std::vector<long long>>("noDefault6");
     noDefaultPset1.add<unsigned long long>("noDefault7");
-    noDefaultPset1.add<std::vector<unsigned long long> >("noDefault8");
+    noDefaultPset1.add<std::vector<unsigned long long>>("noDefault8");
     noDefaultPset1.add<double>("noDefault9");
-    noDefaultPset1.add<std::vector<double> >("noDefault10");
+    noDefaultPset1.add<std::vector<double>>("noDefault10");
     noDefaultPset1.add<bool>("noDefault11");
     noDefaultPset1.add<std::string>("noDefault12");
-    noDefaultPset1.add<std::vector<std::string> >("noDefault13");
+    noDefaultPset1.add<std::vector<std::string>>("noDefault13");
     noDefaultPset1.add<edm::EventID>("noDefault14");
-    noDefaultPset1.add<std::vector<edm::EventID> >("noDefault15");
+    noDefaultPset1.add<std::vector<edm::EventID>>("noDefault15");
     noDefaultPset1.add<edm::LuminosityBlockID>("noDefault16");
-    noDefaultPset1.add<std::vector<edm::LuminosityBlockID> >("noDefault17");
+    noDefaultPset1.add<std::vector<edm::LuminosityBlockID>>("noDefault17");
     noDefaultPset1.add<edm::InputTag>("noDefault18");
-    noDefaultPset1.add<std::vector<edm::InputTag> >("noDefault19");
+    noDefaultPset1.add<std::vector<edm::InputTag>>("noDefault19");
     noDefaultPset1.add<edm::FileInPath>("noDefault20");
     noDefaultPset1.add<edm::LuminosityBlockRange>("noDefault21");
-    noDefaultPset1.add<std::vector<edm::LuminosityBlockRange> >("noDefault22");
+    noDefaultPset1.add<std::vector<edm::LuminosityBlockRange>>("noDefault22");
     noDefaultPset1.add<edm::EventRange>("noDefault23");
-    noDefaultPset1.add<std::vector<edm::EventRange> >("noDefault24");
+    noDefaultPset1.add<std::vector<edm::EventRange>>("noDefault24");
 
     iDesc1.add("noDefaultPset1", noDefaultPset1);
 
     edm::ParameterSetDescription noDefaultPset2;
 
     noDefaultPset2.addUntracked<int>(std::string("noDefault1"));
-    noDefaultPset2.addUntracked<std::vector<int> >("noDefault2");
+    noDefaultPset2.addUntracked<std::vector<int>>("noDefault2");
     noDefaultPset2.addUntracked<unsigned>("noDefault3");
-    noDefaultPset2.addUntracked<std::vector<unsigned> >("noDefault4");
+    noDefaultPset2.addUntracked<std::vector<unsigned>>("noDefault4");
     noDefaultPset2.addUntracked<long long>("noDefault5");
-    noDefaultPset2.addUntracked<std::vector<long long> >("noDefault6");
+    noDefaultPset2.addUntracked<std::vector<long long>>("noDefault6");
     noDefaultPset2.addUntracked<unsigned long long>("noDefault7");
-    noDefaultPset2.addUntracked<std::vector<unsigned long long> >("noDefault8");
+    noDefaultPset2.addUntracked<std::vector<unsigned long long>>("noDefault8");
     noDefaultPset2.addUntracked<double>("noDefault9");
-    noDefaultPset2.addUntracked<std::vector<double> >("noDefault10");
+    noDefaultPset2.addUntracked<std::vector<double>>("noDefault10");
     noDefaultPset2.addUntracked<bool>("noDefault11");
     noDefaultPset2.addUntracked<std::string>("noDefault12");
-    noDefaultPset2.addUntracked<std::vector<std::string> >("noDefault13");
+    noDefaultPset2.addUntracked<std::vector<std::string>>("noDefault13");
     noDefaultPset2.addUntracked<edm::EventID>("noDefault14");
-    noDefaultPset2.addUntracked<std::vector<edm::EventID> >("noDefault15");
+    noDefaultPset2.addUntracked<std::vector<edm::EventID>>("noDefault15");
     noDefaultPset2.addUntracked<edm::LuminosityBlockID>("noDefault16");
-    noDefaultPset2.addUntracked<std::vector<edm::LuminosityBlockID> >("noDefault17");
+    noDefaultPset2.addUntracked<std::vector<edm::LuminosityBlockID>>("noDefault17");
     noDefaultPset2.addUntracked<edm::InputTag>("noDefault18");
-    noDefaultPset2.addUntracked<std::vector<edm::InputTag> >("noDefault19");
+    noDefaultPset2.addUntracked<std::vector<edm::InputTag>>("noDefault19");
     noDefaultPset2.addUntracked<edm::FileInPath>("noDefault20");
     noDefaultPset2.addUntracked<edm::LuminosityBlockRange>("noDefault21");
-    noDefaultPset2.addUntracked<std::vector<edm::LuminosityBlockRange> >("noDefault22");
+    noDefaultPset2.addUntracked<std::vector<edm::LuminosityBlockRange>>("noDefault22");
     noDefaultPset2.addUntracked<edm::EventRange>("noDefault23");
-    noDefaultPset2.addUntracked<std::vector<edm::EventRange> >("noDefault24");
+    noDefaultPset2.addUntracked<std::vector<edm::EventRange>>("noDefault24");
 
     iDesc1.add("noDefaultPset2", noDefaultPset2);
     descriptions.add("testLabel1", iDesc1);
@@ -1092,6 +1089,6 @@ namespace edmtest {
     iDesc3.add<int>("p_int", 3);
     descriptions.addWithDefaultLabel(iDesc3);
   }
-}
+}  // namespace edmtest
 using edmtest::ProducerWithPSetDesc;
 DEFINE_FWK_MODULE(ProducerWithPSetDesc);
diff --git a/FWCore/Integration/test/ProducerWithPSetDesc.h b/FWCore/Integration/test/ProducerWithPSetDesc.h
index affb8dc604261..2f3943083f240 100644
--- a/FWCore/Integration/test/ProducerWithPSetDesc.h
+++ b/FWCore/Integration/test/ProducerWithPSetDesc.h
@@ -17,17 +17,16 @@ namespace edm {
 namespace edmtest {
   class ProducerWithPSetDesc : public edm::EDProducer {
   public:
-
     explicit ProducerWithPSetDesc(edm::ParameterSet const& ps);
 
     virtual ~ProducerWithPSetDesc();
 
     virtual void produce(edm::Event& e, edm::EventSetup const& c);
 
-    static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
+    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
   private:
     bool testingAutoGeneratedCfi;
   };
-}
+}  // namespace edmtest
 #endif
diff --git a/FWCore/Integration/test/SwitchProducerProvenanceAnalyzer.cc b/FWCore/Integration/test/SwitchProducerProvenanceAnalyzer.cc
index 81cbe4f1e7fb9..e9cd362d1ab88 100644
--- a/FWCore/Integration/test/SwitchProducerProvenanceAnalyzer.cc
+++ b/FWCore/Integration/test/SwitchProducerProvenanceAnalyzer.cc
@@ -12,10 +12,10 @@
 namespace edm {
   class EventSetup;
   class StreamID;
-}
+}  // namespace edm
 
 namespace edmtest {
-  class SwitchProducerProvenanceAnalyzer: public edm::global::EDAnalyzer<> {
+  class SwitchProducerProvenanceAnalyzer : public edm::global::EDAnalyzer<> {
   public:
     explicit SwitchProducerProvenanceAnalyzer(edm::ParameterSet const& iConfig);
     void analyze(edm::StreamID, edm::Event const& iEvent, edm::EventSetup const& iSetup) const override;
@@ -29,33 +29,36 @@ namespace edmtest {
     bool const aliasMode_;
   };
 
-  SwitchProducerProvenanceAnalyzer::SwitchProducerProvenanceAnalyzer(edm::ParameterSet const& iConfig):
-    inputToken1_(consumes<IntProduct>(iConfig.getParameter<edm::InputTag>("src1"))),
-    inputToken2_(consumes<IntProduct>(iConfig.getParameter<edm::InputTag>("src2"))),
-    producerPrefix_(iConfig.getParameter<std::string>("producerPrefix")),
-    aliasMode_(iConfig.getParameter<bool>("aliasMode"))
-  {}
-    
-  void SwitchProducerProvenanceAnalyzer::analyze(edm::StreamID, edm::Event const& iEvent, edm::EventSetup const& iSetup) const {
+  SwitchProducerProvenanceAnalyzer::SwitchProducerProvenanceAnalyzer(edm::ParameterSet const& iConfig)
+      : inputToken1_(consumes<IntProduct>(iConfig.getParameter<edm::InputTag>("src1"))),
+        inputToken2_(consumes<IntProduct>(iConfig.getParameter<edm::InputTag>("src2"))),
+        producerPrefix_(iConfig.getParameter<std::string>("producerPrefix")),
+        aliasMode_(iConfig.getParameter<bool>("aliasMode")) {}
+
+  void SwitchProducerProvenanceAnalyzer::analyze(edm::StreamID,
+                                                 edm::Event const& iEvent,
+                                                 edm::EventSetup const& iSetup) const {
     edm::Handle<IntProduct> h;
     iEvent.getByToken(inputToken1_, h);
     testProduct(h, iEvent.id().luminosityBlock(), iEvent);
-    
+
     iEvent.getByToken(inputToken2_, h);
     testProduct(h, iEvent.id().luminosityBlock(), iEvent);
   }
 
-  void SwitchProducerProvenanceAnalyzer::testProduct(edm::Handle<IntProduct> const& prod, int mode, edm::Event const& iEvent) const {
+  void SwitchProducerProvenanceAnalyzer::testProduct(edm::Handle<IntProduct> const& prod,
+                                                     int mode,
+                                                     edm::Event const& iEvent) const {
     assert(prod->value == mode);
 
-    edm::Provenance const *provenance = prod.provenance();
+    edm::Provenance const* provenance = prod.provenance();
     assert(provenance != nullptr);
-    auto const *productProvenance = provenance->productProvenance();
+    auto const* productProvenance = provenance->productProvenance();
     assert(productProvenance != nullptr);
-    auto const *processHistory = provenance->processHistoryPtr();
+    auto const* processHistory = provenance->processHistoryPtr();
     assert(processHistory != nullptr);
 
-    edm::pset::Registry const *psetRegistry = edm::pset::Registry::instance();
+    edm::pset::Registry const* psetRegistry = edm::pset::Registry::instance();
     assert(psetRegistry != nullptr);
 
     auto const& moduleLabel = provenance->moduleLabel();
@@ -64,10 +67,10 @@ namespace edmtest {
     assert(productProvenance->branchID() == provenance->branchID());
 
     // Check that the provenance of the Switch itself is recorded correctly
-    for(edm::ProcessConfiguration const& pc: *processHistory) {
-      if(pc.processName() == provenance->processName()) {
+    for (edm::ProcessConfiguration const& pc : *processHistory) {
+      if (pc.processName() == provenance->processName()) {
         edm::ParameterSetID const& psetID = pc.parameterSetID();
-        edm::ParameterSet const *processPSet = psetRegistry->getMapped(psetID);
+        edm::ParameterSet const* processPSet = psetRegistry->getMapped(psetID);
         assert(processPSet);
         auto const& modPSet = processPSet->getParameterSet(moduleLabel);
         assert(modPSet.getParameter<std::string>("@module_edm_type") == "EDProducer");
@@ -75,8 +78,8 @@ namespace edmtest {
         assert(modPSet.getParameter<std::string>("@module_label") == moduleLabel);
         auto const& allCases = modPSet.getParameter<std::vector<std::string>>("@all_cases");
         assert(allCases.size() == 2);
-        assert(allCases[0] == moduleLabel+"@test1");
-        assert(allCases[1] == moduleLabel+"@test2");
+        assert(allCases[0] == moduleLabel + "@test1");
+        assert(allCases[1] == moduleLabel + "@test2");
         assert(modPSet.exists("@chosen_case") == false);
       }
     }
@@ -86,28 +89,28 @@ namespace edmtest {
     // Here is where Switch differs from a normal EDProducer: each Switch output branch has exactly one parent
     assert(parent.parents().size() == 1);
     auto const& parentProvenance = iEvent.getProvenance(parent.parents()[0]);
-    edm::ProductProvenance const *parentProductProvenance = nullptr;
-    if(not (aliasMode_ and mode == 2)) {
+    edm::ProductProvenance const* parentProductProvenance = nullptr;
+    if (not(aliasMode_ and mode == 2)) {
       // If parent is EDAlias, it is skipped in the provenance, so in
       // that case the normal grandparent can be found on the place of
       // the parent.
 
-      assert(parentProvenance.branchDescription().moduleLabel() == moduleLabel+"@test"+std::to_string(mode));
+      assert(parentProvenance.branchDescription().moduleLabel() == moduleLabel + "@test" + std::to_string(mode));
 
       // Check grandparent as well
       parentProductProvenance = parentProvenance.productProvenance();
       assert(parentProductProvenance != nullptr);
-      }
+    }
     auto const& grandParent = parentProductProvenance ? parentProductProvenance->parentage() : parent;
     //auto const& grandParent = parentProductProvenance->parentage();
-    assert(grandParent.parents().size() == 1); // behaviour of the AddIntsProducer
+    assert(grandParent.parents().size() == 1);  // behaviour of the AddIntsProducer
     auto const& grandParentProvenance = iEvent.getProvenance(grandParent.parents()[0]);
     int postfix = mode;
-    if(aliasMode_ and mode == 2) {
+    if (aliasMode_ and mode == 2) {
       postfix = 3;
     }
-    assert(grandParentProvenance.branchDescription().moduleLabel() == producerPrefix_+std::to_string(postfix));
+    assert(grandParentProvenance.branchDescription().moduleLabel() == producerPrefix_ + std::to_string(postfix));
   }
-}
+}  // namespace edmtest
 using edmtest::SwitchProducerProvenanceAnalyzer;
 DEFINE_FWK_MODULE(SwitchProducerProvenanceAnalyzer);
diff --git a/FWCore/Integration/test/SwitchProducer_t.cpp b/FWCore/Integration/test/SwitchProducer_t.cpp
index 289f9dc506f77..bfd098738bee9 100644
--- a/FWCore/Integration/test/SwitchProducer_t.cpp
+++ b/FWCore/Integration/test/SwitchProducer_t.cpp
@@ -11,17 +11,20 @@
 static constexpr auto s_tag = "[SwitchProducer]";
 
 namespace {
-  std::string makeConfig(bool test2Enabled, const std::string& test1, const std::string& test2,
-                         const std::string& otherprod = "", const std::string& othername = "") {
+  std::string makeConfig(bool test2Enabled,
+                         const std::string& test1,
+                         const std::string& test2,
+                         const std::string& otherprod = "",
+                         const std::string& othername = "") {
     std::string otherline;
     std::string othertask;
-    if(not otherprod.empty()) {
-      otherline = "process."+othername+" = "+otherprod+"\n";
-      othertask = ", cms.Task(process."+othername+")";
+    if (not otherprod.empty()) {
+      otherline = "process." + othername + " = " + otherprod + "\n";
+      othertask = ", cms.Task(process." + othername + ")";
     }
 
     return std::string{
-R"_(from FWCore.TestProcessor.TestProcess import *
+               R"_(from FWCore.TestProcessor.TestProcess import *
 import FWCore.ParameterSet.Config as cms
 
 class SwitchProducerTest(cms.SwitchProducer):
@@ -29,17 +32,16 @@ class SwitchProducerTest(cms.SwitchProducer):
         super(SwitchProducerTest,self).__init__(
             dict(
                 test1 = lambda: (True, -10),
-                test2 = lambda: ()_"} + (test2Enabled ? "True" : "False") + ", -9)\n" +
-R"_(            ), **kargs)
+                test2 = lambda: ()_"} +
+           (test2Enabled ? "True" : "False") + ", -9)\n" +
+           R"_(            ), **kargs)
 process = TestProcess()
 )_" + otherline +
-R"_(process.s = SwitchProducerTest(
-   test1 = )_" + test1 + ",\n" +
-"   test2 = " + test2 + "\n" +
-")\n" +
-"process.moduleToTest(process.s"+othertask+")\n";
+           R"_(process.s = SwitchProducerTest(
+   test1 = )_" +
+           test1 + ",\n" + "   test2 = " + test2 + "\n" + ")\n" + "process.moduleToTest(process.s" + othertask + ")\n";
   }
-}
+}  // namespace
 
 TEST_CASE("Configuration", s_tag) {
   const std::string test1{"cms.EDProducer('IntProducer', ivalue = cms.int32(1))"};
@@ -56,12 +58,10 @@ TEST_CASE("Configuration", s_tag) {
     REQUIRE(pset->id() == psetTest2Disabled->id());
   }
 
-  edm::test::TestProcessor::Config config{ baseConfig };
-  edm::test::TestProcessor::Config configTest2Disabled{ baseConfigTest2Disabled };
+  edm::test::TestProcessor::Config config{baseConfig};
+  edm::test::TestProcessor::Config configTest2Disabled{baseConfigTest2Disabled};
 
-  SECTION("Base configuration is OK") {
-    REQUIRE_NOTHROW(edm::test::TestProcessor(config));
-  }
+  SECTION("Base configuration is OK") { REQUIRE_NOTHROW(edm::test::TestProcessor(config)); }
 
   SECTION("No event data") {
     edm::test::TestProcessor tester(config);
@@ -114,12 +114,10 @@ TEST_CASE("Configuration with EDAlias", s_tag) {
     REQUIRE(pset->id() == psetTest2Disabled->id());
   }
 
-  edm::test::TestProcessor::Config config{ baseConfig };
-  edm::test::TestProcessor::Config configTest2Disabled{ baseConfigTest2Disabled };
+  edm::test::TestProcessor::Config config{baseConfig};
+  edm::test::TestProcessor::Config configTest2Disabled{baseConfigTest2Disabled};
 
-  SECTION("Base configuration is OK") {
-    REQUIRE_NOTHROW(edm::test::TestProcessor(config));
-  }
+  SECTION("Base configuration is OK") { REQUIRE_NOTHROW(edm::test::TestProcessor(config)); }
 
   SECTION("No event data") {
     edm::test::TestProcessor tester(config);
@@ -154,18 +152,19 @@ TEST_CASE("Configuration with EDAlias", s_tag) {
   }
 }
 
-
 TEST_CASE("Configuration with many branches", s_tag) {
-  const std::string test1{R"_(cms.EDProducer('ManyIntProducer', ivalue = cms.int32(1), values = cms.VPSet(cms.PSet(instance=cms.string('foo'),value=cms.int32(11)),
+  const std::string test1{
+      R"_(cms.EDProducer('ManyIntProducer', ivalue = cms.int32(1), values = cms.VPSet(cms.PSet(instance=cms.string('foo'),value=cms.int32(11)),
                                                                                        cms.PSet(instance=cms.string('bar'),value=cms.int32(21)))))_"};
-  const std::string test2{R"_(cms.EDProducer('ManyIntProducer', ivalue = cms.int32(2), values = cms.VPSet(cms.PSet(instance=cms.string('foo'),value=cms.int32(12)),
+  const std::string test2{
+      R"_(cms.EDProducer('ManyIntProducer', ivalue = cms.int32(2), values = cms.VPSet(cms.PSet(instance=cms.string('foo'),value=cms.int32(12)),
                                                                                        cms.PSet(instance=cms.string('bar'),value=cms.int32(22)))))_"};
 
   const std::string baseConfig = makeConfig(true, test1, test2);
   const std::string baseConfigTest2Disabled = makeConfig(false, test1, test2);
 
-  edm::test::TestProcessor::Config config{ baseConfig };
-  edm::test::TestProcessor::Config configTest2Disabled{ baseConfigTest2Disabled };
+  edm::test::TestProcessor::Config config{baseConfig};
+  edm::test::TestProcessor::Config configTest2Disabled{baseConfigTest2Disabled};
 
   SECTION("Test2 enabled") {
     edm::test::TestProcessor tester(config);
@@ -185,22 +184,25 @@ TEST_CASE("Configuration with many branches", s_tag) {
 }
 
 TEST_CASE("Configuration with many branches with EDAlias", s_tag) {
-  const std::string otherprod{R"_(cms.EDProducer('ManyIntProducer', ivalue = cms.int32(2), values = cms.VPSet(cms.PSet(instance=cms.string('foo'),value=cms.int32(12)),
+  const std::string otherprod{
+      R"_(cms.EDProducer('ManyIntProducer', ivalue = cms.int32(2), values = cms.VPSet(cms.PSet(instance=cms.string('foo'),value=cms.int32(12)),
                                                                                        cms.PSet(instance=cms.string('bar'),value=cms.int32(22))))
 )_"};
   const std::string othername{"intprod"};
 
-  const std::string test1{R"_(cms.EDProducer('ManyIntProducer', ivalue = cms.int32(1), values = cms.VPSet(cms.PSet(instance=cms.string('foo'),value=cms.int32(11)),
+  const std::string test1{
+      R"_(cms.EDProducer('ManyIntProducer', ivalue = cms.int32(1), values = cms.VPSet(cms.PSet(instance=cms.string('foo'),value=cms.int32(11)),
                                                                                        cms.PSet(instance=cms.string('bar'),value=cms.int32(21)))))_"};
-  const std::string test2{R"_(cms.EDAlias(intprod = cms.VPSet(cms.PSet(type = cms.string('edmtestIntProduct'), fromProductInstance = cms.string(''), toProductInstance = cms.string('')),
+  const std::string test2{
+      R"_(cms.EDAlias(intprod = cms.VPSet(cms.PSet(type = cms.string('edmtestIntProduct'), fromProductInstance = cms.string(''), toProductInstance = cms.string('')),
                                                               cms.PSet(type = cms.string('edmtestIntProduct'), fromProductInstance = cms.string('foo'), toProductInstance = cms.string('foo')),
                                                               cms.PSet(type = cms.string('edmtestIntProduct'), fromProductInstance = cms.string('bar'), toProductInstance = cms.string('bar')))))_"};
 
   const std::string baseConfig = makeConfig(true, test1, test2, otherprod, othername);
   const std::string baseConfigTest2Disabled = makeConfig(false, test1, test2, otherprod, othername);
 
-  edm::test::TestProcessor::Config config{ baseConfig };
-  edm::test::TestProcessor::Config configTest2Disabled{ baseConfigTest2Disabled };
+  edm::test::TestProcessor::Config config{baseConfig};
+  edm::test::TestProcessor::Config configTest2Disabled{baseConfigTest2Disabled};
 
   SECTION("Test2 enabled") {
     edm::test::TestProcessor tester(config);
@@ -217,75 +219,88 @@ TEST_CASE("Configuration with many branches with EDAlias", s_tag) {
     REQUIRE(event.get<edmtest::IntProduct>("foo")->value == 11);
     REQUIRE(event.get<edmtest::IntProduct>("bar")->value == 21);
   }
-
 }
 
-
 TEST_CASE("Configuration with different branches", s_tag) {
   const std::string test1{"cms.EDProducer('ManyIntProducer', ivalue = cms.int32(1), values = cms.VPSet())"};
-  const std::string test2{"cms.EDProducer('ManyIntProducer', ivalue = cms.int32(2), values = cms.VPSet(cms.PSet(instance=cms.string('foo'),value=cms.int32(3))))"};
+  const std::string test2{
+      "cms.EDProducer('ManyIntProducer', ivalue = cms.int32(2), values = "
+      "cms.VPSet(cms.PSet(instance=cms.string('foo'),value=cms.int32(3))))"};
 
   const std::string baseConfig1 = makeConfig(true, test1, test2);
   const std::string baseConfig2 = makeConfig(false, test1, test2);
 
   SECTION("Different branches are not allowed") {
-    edm::test::TestProcessor::Config config1{ baseConfig1 };
-    REQUIRE_THROWS_WITH(edm::test::TestProcessor(config1), Catch::Contains("that does not produce a product") && Catch::Contains("that is produced by the chosen case"));
-
-    edm::test::TestProcessor::Config config2{ baseConfig2 };
-    REQUIRE_THROWS(edm::test::TestProcessor(config1), Catch::Contains("with a product") && Catch::Contains("that is not produced by the chosen case"));
+    edm::test::TestProcessor::Config config1{baseConfig1};
+    REQUIRE_THROWS_WITH(
+        edm::test::TestProcessor(config1),
+        Catch::Contains("that does not produce a product") && Catch::Contains("that is produced by the chosen case"));
+
+    edm::test::TestProcessor::Config config2{baseConfig2};
+    REQUIRE_THROWS(edm::test::TestProcessor(config1),
+                   Catch::Contains("with a product") && Catch::Contains("that is not produced by the chosen case"));
   }
 }
 
 TEST_CASE("Configuration with different branches with EDAlias", s_tag) {
-  const std::string otherprod{"cms.EDProducer('ManyIntProducer', ivalue = cms.int32(2), values = cms.VPSet(cms.PSet(instance=cms.string('foo'),value=cms.int32(3))))"};
+  const std::string otherprod{
+      "cms.EDProducer('ManyIntProducer', ivalue = cms.int32(2), values = "
+      "cms.VPSet(cms.PSet(instance=cms.string('foo'),value=cms.int32(3))))"};
   const std::string othername{"intprod"};
 
   const std::string test1{"cms.EDProducer('ManyIntProducer', ivalue = cms.int32(1), values = cms.VPSet())"};
-  const std::string test2{R"_(cms.EDAlias(intprod = cms.VPSet(cms.PSet(type = cms.string('edmtestIntProduct'), fromProductInstance = cms.string(''), toProductInstance = cms.string('')),
+  const std::string test2{
+      R"_(cms.EDAlias(intprod = cms.VPSet(cms.PSet(type = cms.string('edmtestIntProduct'), fromProductInstance = cms.string(''), toProductInstance = cms.string('')),
                                                               cms.PSet(type = cms.string('edmtestIntProduct'), fromProductInstance = cms.string('foo'), toProductInstance = cms.string('foo')))))_"};
 
   const std::string baseConfig1 = makeConfig(true, test1, test2, otherprod, othername);
   const std::string baseConfig2 = makeConfig(false, test1, test2, otherprod, othername);
 
   SECTION("Different branches are not allowed") {
-    edm::test::TestProcessor::Config config1{ baseConfig1 };
-    REQUIRE_THROWS_WITH(edm::test::TestProcessor(config1), Catch::Contains("that does not produce a product") && Catch::Contains("that is produced by the chosen case"));
-
-    edm::test::TestProcessor::Config config2{ baseConfig2 };
-    REQUIRE_THROWS(edm::test::TestProcessor(config1), Catch::Contains("with a product") && Catch::Contains("that is not produced by the chosen case"));
+    edm::test::TestProcessor::Config config1{baseConfig1};
+    REQUIRE_THROWS_WITH(
+        edm::test::TestProcessor(config1),
+        Catch::Contains("that does not produce a product") && Catch::Contains("that is produced by the chosen case"));
+
+    edm::test::TestProcessor::Config config2{baseConfig2};
+    REQUIRE_THROWS(edm::test::TestProcessor(config1),
+                   Catch::Contains("with a product") && Catch::Contains("that is not produced by the chosen case"));
   }
 }
 
-
-
 TEST_CASE("Configuration with lumi and run", s_tag) {
   const std::string test1{"cms.EDProducer('ThingProducer', nThings = cms.int32(10))"};
   const std::string test2{"cms.EDProducer('ThingProducer', nThings = cms.int32(20))"};
   const std::string baseConfig = makeConfig(true, test1, test2);
 
-  edm::test::TestProcessor::Config config{ baseConfig };
+  edm::test::TestProcessor::Config config{baseConfig};
 
   SECTION("Lumi and run products are not supported") {
-    REQUIRE_THROWS_WITH(edm::test::TestProcessor(config), Catch::Contains("SwitchProducer does not support non-event branches"));
+    REQUIRE_THROWS_WITH(edm::test::TestProcessor(config),
+                        Catch::Contains("SwitchProducer does not support non-event branches"));
   }
 };
 
-
 TEST_CASE("Configuration with ROOT branch alias", s_tag) {
-  const std::string test1{"cms.EDProducer('ManyIntProducer', ivalue = cms.int32(1), values = cms.VPSet(cms.PSet(instance=cms.string('foo'),value=cms.int32(3))))"};
-  const std::string test2{"cms.EDProducer('ManyIntProducer', ivalue = cms.int32(2), values = cms.VPSet(cms.PSet(instance=cms.string('foo'),value=cms.int32(4),branchAlias=cms.string('bar'))))"};
+  const std::string test1{
+      "cms.EDProducer('ManyIntProducer', ivalue = cms.int32(1), values = "
+      "cms.VPSet(cms.PSet(instance=cms.string('foo'),value=cms.int32(3))))"};
+  const std::string test2{
+      "cms.EDProducer('ManyIntProducer', ivalue = cms.int32(2), values = "
+      "cms.VPSet(cms.PSet(instance=cms.string('foo'),value=cms.int32(4),branchAlias=cms.string('bar'))))"};
 
   const std::string baseConfig1 = makeConfig(true, test1, test2);
   const std::string baseConfig2 = makeConfig(false, test1, test2);
 
   SECTION("ROOT branch aliases are not supported for the chosen case") {
-    edm::test::TestProcessor::Config config{ baseConfig1 };
-    REQUIRE_THROWS_WITH(edm::test::TestProcessor(config), Catch::Contains("SwitchProducer does not support ROOT branch aliases"));
+    edm::test::TestProcessor::Config config{baseConfig1};
+    REQUIRE_THROWS_WITH(edm::test::TestProcessor(config),
+                        Catch::Contains("SwitchProducer does not support ROOT branch aliases"));
   }
 
   SECTION("ROOT branch aliases are not supported for the non-chosen case") {
-    edm::test::TestProcessor::Config config{ baseConfig2 };
-    REQUIRE_THROWS_WITH(edm::test::TestProcessor(config), Catch::Contains("SwitchProducer does not support ROOT branch aliases"));
+    edm::test::TestProcessor::Config config{baseConfig2};
+    REQUIRE_THROWS_WITH(edm::test::TestProcessor(config),
+                        Catch::Contains("SwitchProducer does not support ROOT branch aliases"));
   }
 }
diff --git a/FWCore/Integration/test/TableTestModules.cc b/FWCore/Integration/test/TableTestModules.cc
index 667ee454dce05..ce12b027a565c 100644
--- a/FWCore/Integration/test/TableTestModules.cc
+++ b/FWCore/Integration/test/TableTestModules.cc
@@ -14,79 +14,84 @@ namespace {
   std::vector<float> doublesToFloats(std::vector<double> const& iDoubles) {
     std::vector<float> t;
     t.reserve(iDoubles.size());
-    for(double d: iDoubles) { t.push_back( static_cast<float>(d) ); }
+    for (double d : iDoubles) {
+      t.push_back(static_cast<float>(d));
+    }
     return t;
   }
-}
+}  // namespace
 
 namespace edmtest {
 
   class TableTestProducer : public edm::global::EDProducer<> {
   public:
-    TableTestProducer(edm::ParameterSet const& iConfig):
-      anInts_(iConfig.getParameter<std::vector<int>>("anInts")),
-      aFloats_(doublesToFloats(iConfig.getParameter<std::vector<double>>("aFloats"))),
-      aStrings_(iConfig.getParameter<std::vector<std::string>>("aStrings")) {
+    TableTestProducer(edm::ParameterSet const& iConfig)
+        : anInts_(iConfig.getParameter<std::vector<int>>("anInts")),
+          aFloats_(doublesToFloats(iConfig.getParameter<std::vector<double>>("aFloats"))),
+          aStrings_(iConfig.getParameter<std::vector<std::string>>("aStrings")) {
       produces<edmtest::TableTest>();
     }
 
     void produce(edm::StreamID, edm::Event& iEvent, edm::EventSetup const&) const final {
-      iEvent.put( std::make_unique<TableTest>(anInts_,aFloats_,aStrings_) );      
+      iEvent.put(std::make_unique<TableTest>(anInts_, aFloats_, aStrings_));
     }
+
   private:
-    const std::vector<int>  anInts_;
+    const std::vector<int> anInts_;
     const std::vector<float> aFloats_;
     const std::vector<std::string> aStrings_;
   };
 
   class TableTestAnalyzer : public edm::global::EDAnalyzer<> {
   public:
-    TableTestAnalyzer(edm::ParameterSet const& iConfig):
-      anInts_(iConfig.getUntrackedParameter<std::vector<int>>("anInts")),
-      aFloats_(doublesToFloats(iConfig.getUntrackedParameter<std::vector<double>>("aFloats"))),
-      aStrings_(iConfig.getUntrackedParameter<std::vector<std::string>>("aStrings"))
-    {
+    TableTestAnalyzer(edm::ParameterSet const& iConfig)
+        : anInts_(iConfig.getUntrackedParameter<std::vector<int>>("anInts")),
+          aFloats_(doublesToFloats(iConfig.getUntrackedParameter<std::vector<double>>("aFloats"))),
+          aStrings_(iConfig.getUntrackedParameter<std::vector<std::string>>("aStrings")) {
       tableToken_ = consumes<edmtest::TableTest>(iConfig.getUntrackedParameter<edm::InputTag>("table"));
-      if(anInts_.size() != aFloats_.size() or anInts_.size() != aStrings_.size()) {
-        throw cms::Exception("Configuration")<<"anInts_, aFloats_, and aStrings_ must have the same length";
+      if (anInts_.size() != aFloats_.size() or anInts_.size() != aStrings_.size()) {
+        throw cms::Exception("Configuration") << "anInts_, aFloats_, and aStrings_ must have the same length";
       }
     }
-    
+
     void analyze(edm::StreamID, edm::Event const& iEvent, edm::EventSetup const&) const final {
       auto const& t = iEvent.get(tableToken_);
-      
+
       auto size = t.size();
-      if(size != anInts_.size()) {
-        throw cms::Exception("RuntimeError")<<"Table size ("<<size<<") does not equal expected size ("<<anInts_.size()<<")";
+      if (size != anInts_.size()) {
+        throw cms::Exception("RuntimeError")
+            << "Table size (" << size << ") does not equal expected size (" << anInts_.size() << ")";
       }
 
-      unsigned int index=0;
-      for(auto const& row : t) {
-        if( anInts_[index] != row.get<edmtest::AnInt>() ) {
-          throw cms::Exception("RuntimeError")<<"index "<<index<<" anInt ="<<row.get<edmtest::AnInt>()<<" expected "<<anInts_[index];
+      unsigned int index = 0;
+      for (auto const& row : t) {
+        if (anInts_[index] != row.get<edmtest::AnInt>()) {
+          throw cms::Exception("RuntimeError")
+              << "index " << index << " anInt =" << row.get<edmtest::AnInt>() << " expected " << anInts_[index];
         }
-        if( aFloats_[index] != row.get<edmtest::AFloat>() ) {
-          throw cms::Exception("RuntimeError")<<"index "<<index<<" aFloat ="<<row.get<edmtest::AFloat>()<<" expected "<<aFloats_[index];
+        if (aFloats_[index] != row.get<edmtest::AFloat>()) {
+          throw cms::Exception("RuntimeError")
+              << "index " << index << " aFloat =" << row.get<edmtest::AFloat>() << " expected " << aFloats_[index];
         }
-        if( aStrings_[index] != row.get<edmtest::AString>() ) {
-          throw cms::Exception("RuntimeError")<<"index "<<index<<" aString ="<<row.get<edmtest::AString>()<<" expected "<<aStrings_[index];
+        if (aStrings_[index] != row.get<edmtest::AString>()) {
+          throw cms::Exception("RuntimeError")
+              << "index " << index << " aString =" << row.get<edmtest::AString>() << " expected " << aStrings_[index];
         }
         ++index;
       }
     }
-    
+
   private:
-    const std::vector<int>  anInts_;
+    const std::vector<int> anInts_;
     const std::vector<float> aFloats_;
     const std::vector<std::string> aStrings_;
     edm::EDGetTokenT<edmtest::TableTest> tableToken_;
   };
-        
+
   class TableTestOutputModule : public edm::global::OutputModule<> {
   public:
-    TableTestOutputModule(edm::ParameterSet const& pset):
-    edm::global::OutputModuleBase(pset),
-    edm::global::OutputModule<>(pset) {}
+    TableTestOutputModule(edm::ParameterSet const& pset)
+        : edm::global::OutputModuleBase(pset), edm::global::OutputModule<>(pset) {}
 
     static void fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
       edm::ParameterSetDescription desc;
@@ -98,8 +103,8 @@ namespace edmtest {
   private:
     void write(edm::EventForOutput const& e) override {
       using namespace edm;
-      assert(keptProducts()[InEvent].size()>0);
-      for(auto product: keptProducts()[InEvent]) {
+      assert(keptProducts()[InEvent].size() > 0);
+      for (auto product : keptProducts()[InEvent]) {
         BranchDescription const* branchDescription = product.first;
         TypeID const& tid = branchDescription->unwrappedTypeID();
         EDGetToken const& token = product.second;
@@ -107,27 +112,28 @@ namespace edmtest {
         assert(bh.isValid());
         auto examiner = bh.wrapper()->tableExaminer();
         assert(examiner);
-        if( 3 != examiner->columnDescriptions().size()) {
-          throw cms::Exception("RuntimeError")<<"wrong number of columns, expected 3 got "<<examiner->columnDescriptions().size();
+        if (3 != examiner->columnDescriptions().size()) {
+          throw cms::Exception("RuntimeError")
+              << "wrong number of columns, expected 3 got " << examiner->columnDescriptions().size();
         }
-        for(auto const& c: examiner->columnDescriptions()) {
-          if( 0 == std::strcmp(c.first,edmtest::AnInt::label())) {
+        for (auto const& c : examiner->columnDescriptions()) {
+          if (0 == std::strcmp(c.first, edmtest::AnInt::label())) {
             continue;
           }
-          if( 0 == std::strcmp(c.first,edmtest::AFloat::label())) {
+          if (0 == std::strcmp(c.first, edmtest::AFloat::label())) {
             continue;
           }
-          if( 0 == std::strcmp(c.first,edmtest::AString::label())) {
+          if (0 == std::strcmp(c.first, edmtest::AString::label())) {
             continue;
           }
-          throw cms::Exception("RuntimeError")<<"unknown column "<<c.first;
+          throw cms::Exception("RuntimeError") << "unknown column " << c.first;
         }
       }
     }
     void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override {}
     void writeRun(edm::RunForOutput const&) override {}
   };
-}
+}  // namespace edmtest
 DEFINE_FWK_MODULE(edmtest::TableTestProducer);
 DEFINE_FWK_MODULE(edmtest::TableTestAnalyzer);
 DEFINE_FWK_MODULE(edmtest::TableTestOutputModule);
diff --git a/FWCore/Integration/test/TestDescriptionComments.cc b/FWCore/Integration/test/TestDescriptionComments.cc
index fbf72b5e4b48b..68d281a8a0045 100644
--- a/FWCore/Integration/test/TestDescriptionComments.cc
+++ b/FWCore/Integration/test/TestDescriptionComments.cc
@@ -12,36 +12,40 @@ namespace edmtest {
 
   class TestDescriptionComments : public edm::global::EDAnalyzer<> {
   public:
-
     explicit TestDescriptionComments(edm::ParameterSet const&) {}
 
-    static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
+    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
     void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const override final {}
   };
 
-  void TestDescriptionComments::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
-
+  void TestDescriptionComments::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription nestedDesc;
     nestedDesc.add<int>("x", 1);
 
     std::vector<edm::ParameterSet> vectorOfPSets;
 
     edm::ParameterSetDescription desc;
-    desc.ifValue(edm::ParameterDescription<std::string>("sswitch", "b", true, edm::Comment("test1")),
-      "a" >> edm::ParameterDescription<int>(std::string("x"), 100, true, edm::Comment("test2")) or
-      "b" >> (edm::ParameterDescription<double>("y1", true, edm::Comment("test3")) and 
-              edm::ParameterDescription<double>(std::string("y2"), true, edm::Comment(std::string("test4")))) or
-      "c" >> edm::ParameterDescription<std::string>("z", "102", true) or
-      "d" >> edm::ParameterDescription<edm::ParameterSetDescription>("nested1", nestedDesc, true, edm::Comment(std::string("test5"))) or
-      "e" >> edm::ParameterDescription<edm::ParameterSetDescription>(std::string("nested2"), nestedDesc, true, edm::Comment(std::string("test6"))) or
-      "f" >> edm::ParameterDescription<std::vector<edm::ParameterSet> >("vpset1", nestedDesc, true, vectorOfPSets, edm::Comment("test7")) or
-      "g" >> edm::ParameterDescription<std::vector<edm::ParameterSet> >(std::string("vpset2"), nestedDesc, true, vectorOfPSets, edm::Comment("test8")) or
-      "h" >> edm::ParameterDescription<std::vector<edm::ParameterSet> >("vpset3", nestedDesc, true, edm::Comment("test9")) or
-      "i" >> edm::ParameterDescription<std::vector<edm::ParameterSet> >(std::string("vpset4"), nestedDesc, true, edm::Comment("test10"))
-    );
+    desc.ifValue(
+        edm::ParameterDescription<std::string>("sswitch", "b", true, edm::Comment("test1")),
+        "a" >> edm::ParameterDescription<int>(std::string("x"), 100, true, edm::Comment("test2")) or
+            "b" >> (edm::ParameterDescription<double>("y1", true, edm::Comment("test3")) and
+                    edm::ParameterDescription<double>(std::string("y2"), true, edm::Comment(std::string("test4")))) or
+            "c" >> edm::ParameterDescription<std::string>("z", "102", true) or
+            "d" >> edm::ParameterDescription<edm::ParameterSetDescription>(
+                       "nested1", nestedDesc, true, edm::Comment(std::string("test5"))) or
+            "e" >> edm::ParameterDescription<edm::ParameterSetDescription>(
+                       std::string("nested2"), nestedDesc, true, edm::Comment(std::string("test6"))) or
+            "f" >> edm::ParameterDescription<std::vector<edm::ParameterSet> >(
+                       "vpset1", nestedDesc, true, vectorOfPSets, edm::Comment("test7")) or
+            "g" >> edm::ParameterDescription<std::vector<edm::ParameterSet> >(
+                       std::string("vpset2"), nestedDesc, true, vectorOfPSets, edm::Comment("test8")) or
+            "h" >> edm::ParameterDescription<std::vector<edm::ParameterSet> >(
+                       "vpset3", nestedDesc, true, edm::Comment("test9")) or
+            "i" >> edm::ParameterDescription<std::vector<edm::ParameterSet> >(
+                       std::string("vpset4"), nestedDesc, true, edm::Comment("test10")));
     descriptions.add("test", desc);
   }
-}
+}  // namespace edmtest
 using edmtest::TestDescriptionComments;
 DEFINE_FWK_MODULE(TestDescriptionComments);
diff --git a/FWCore/Integration/test/TestFindProduct.cc b/FWCore/Integration/test/TestFindProduct.cc
index 38b41f96559ab..afd0d1d738caf 100644
--- a/FWCore/Integration/test/TestFindProduct.cc
+++ b/FWCore/Integration/test/TestFindProduct.cc
@@ -28,7 +28,6 @@
 namespace edmtest {
   class TestFindProduct : public edm::EDAnalyzer {
   public:
-
     explicit TestFindProduct(edm::ParameterSet const& pset);
     virtual ~TestFindProduct();
 
@@ -36,7 +35,6 @@ namespace edmtest {
     virtual void endJob();
 
   private:
-
     std::vector<edm::InputTag> inputTags_;
     int expectedSum_;
     int sum_;
@@ -48,21 +46,20 @@ namespace edmtest {
     std::vector<edm::EDGetTokenT<IntProduct> > tokens_;
     std::vector<edm::EDGetTokenT<IntProduct> > tokensNotFound_;
     std::vector<edm::EDGetTokenT<edm::View<int> > > tokensView_;
-  }; // class TestFindProduct
+  };  // class TestFindProduct
 
   //--------------------------------------------------------------------
   //
   // Implementation details
 
-  TestFindProduct::TestFindProduct(edm::ParameterSet const& pset) :
-    inputTags_(pset.getUntrackedParameter<std::vector<edm::InputTag> >("inputTags")),
-    expectedSum_(pset.getUntrackedParameter<int>("expectedSum", 0)),
-    sum_(0),
-    inputTagsNotFound_(),
-    getByTokenFirst_(pset.getUntrackedParameter<bool>("getByTokenFirst", false)),
-    inputTagsView_(),
-    runProducerParameterCheck_(pset.getUntrackedParameter<bool>("runProducerParameterCheck", false))
-  {
+  TestFindProduct::TestFindProduct(edm::ParameterSet const& pset)
+      : inputTags_(pset.getUntrackedParameter<std::vector<edm::InputTag> >("inputTags")),
+        expectedSum_(pset.getUntrackedParameter<int>("expectedSum", 0)),
+        sum_(0),
+        inputTagsNotFound_(),
+        getByTokenFirst_(pset.getUntrackedParameter<bool>("getByTokenFirst", false)),
+        inputTagsView_(),
+        runProducerParameterCheck_(pset.getUntrackedParameter<bool>("runProducerParameterCheck", false)) {
     std::vector<edm::InputTag> emptyTagVector;
     inputTagsNotFound_ = pset.getUntrackedParameter<std::vector<edm::InputTag> >("inputTagsNotFound", emptyTagVector);
     inputTagsView_ = pset.getUntrackedParameter<std::vector<edm::InputTag> >("inputTagsView", emptyTagVector);
@@ -80,21 +77,16 @@ namespace edmtest {
 
   TestFindProduct::~TestFindProduct() {}
 
-  void
-  TestFindProduct::analyze(edm::Event const& e, edm::EventSetup const&) {
-
+  void TestFindProduct::analyze(edm::Event const& e, edm::EventSetup const&) {
     edm::Handle<IntProduct> h;
     edm::Handle<IntProduct> hToken;
     edm::Handle<edm::View<int> > hView;
     edm::Handle<edm::View<int> > hViewToken;
 
     std::vector<edm::EDGetTokenT<IntProduct> >::const_iterator iToken = tokens_.begin();
-    for(std::vector<edm::InputTag>::const_iterator iter = inputTags_.begin(),
-         iEnd = inputTags_.end();
-         iter != iEnd;
-        ++iter, ++iToken) {
-
-      if(getByTokenFirst_) {
+    for (std::vector<edm::InputTag>::const_iterator iter = inputTags_.begin(), iEnd = inputTags_.end(); iter != iEnd;
+         ++iter, ++iToken) {
+      if (getByTokenFirst_) {
         e.getByToken(*iToken, hToken);
         *hToken;
       }
@@ -105,7 +97,7 @@ namespace edmtest {
       e.getByToken(*iToken, hToken);
       if (h->value != hToken->value) {
         std::cerr << "TestFindProduct::analyze getByLabel and getByToken return inconsistent results " << std::endl;
-        abort();    
+        abort();
       }
 
       if (runProducerParameterCheck_) {
@@ -128,31 +120,28 @@ namespace edmtest {
       }
     }
     iToken = tokensNotFound_.begin();
-    for(std::vector<edm::InputTag>::const_iterator iter = inputTagsNotFound_.begin(),
-         iEnd = inputTagsNotFound_.end();
+    for (std::vector<edm::InputTag>::const_iterator iter = inputTagsNotFound_.begin(), iEnd = inputTagsNotFound_.end();
          iter != iEnd;
-        ++iter, ++iToken) {
+         ++iter, ++iToken) {
       e.getByLabel(*iter, h);
       if (h.isValid()) {
         std::cerr << "TestFindProduct::analyze: getByLabel found a product that should not be found "
                   << h.provenance()->moduleLabel() << std::endl;
-        abort();    
+        abort();
       }
 
       e.getByToken(*iToken, hToken);
       if (hToken.isValid()) {
         std::cerr << "TestFindProduct::analyze: getByToken found a product that should not be found "
                   << hToken.provenance()->moduleLabel() << std::endl;
-        abort();    
+        abort();
       }
     }
     std::vector<edm::EDGetTokenT<edm::View<int> > >::const_iterator iTokenView = tokensView_.begin();
-    for(std::vector<edm::InputTag>::const_iterator iter = inputTagsView_.begin(),
-         iEnd = inputTagsView_.end();
+    for (std::vector<edm::InputTag>::const_iterator iter = inputTagsView_.begin(), iEnd = inputTagsView_.end();
          iter != iEnd;
-        ++iter, ++iTokenView) {
-
-      if(getByTokenFirst_) {
+         ++iter, ++iTokenView) {
+      if (getByTokenFirst_) {
         e.getByToken(*iTokenView, hViewToken);
         *hViewToken;
       }
@@ -163,20 +152,19 @@ namespace edmtest {
       e.getByToken(*iTokenView, hViewToken);
       if (hView->at(0) != hViewToken->at(0)) {
         std::cerr << "TestFindProduct::analyze getByLabel and getByToken return inconsistent results " << std::endl;
-        abort();    
+        abort();
       }
     }
   }
 
-  void
-  TestFindProduct::endJob() {
+  void TestFindProduct::endJob() {
     std::cout << "TestFindProduct sum = " << sum_ << std::endl;
-    if(expectedSum_ != 0 && sum_ != expectedSum_) {
+    if (expectedSum_ != 0 && sum_ != expectedSum_) {
       throw cms::Exception("TestFail")
-        << "TestFindProduct::endJob - Sum of test object values does not equal expected value";
+          << "TestFindProduct::endJob - Sum of test object values does not equal expected value";
     }
   }
-} // namespace edmtest
+}  // namespace edmtest
 
 using edmtest::TestFindProduct;
 DEFINE_FWK_MODULE(TestFindProduct);
diff --git a/FWCore/Integration/test/TestGetterOfProducts.cc b/FWCore/Integration/test/TestGetterOfProducts.cc
index 571295e4b9819..a880af40be2a5 100644
--- a/FWCore/Integration/test/TestGetterOfProducts.cc
+++ b/FWCore/Integration/test/TestGetterOfProducts.cc
@@ -19,41 +19,34 @@ namespace edm {
   class BranchDescription;
   class Event;
   class EventSetup;
-}
+}  // namespace edm
 
 namespace edmtest {
 
   class TestGetterOfProducts : public edm::stream::EDFilter<> {
   public:
-
     explicit TestGetterOfProducts(edm::ParameterSet const&);
     ~TestGetterOfProducts();
     virtual bool filter(edm::Event&, edm::EventSetup const&);
 
   private:
-
     std::string processName_;
     std::vector<std::string> expectedInputTagLabels_;
     std::vector<std::string> expectedLabelsAfterGet_;
     edm::GetterOfProducts<Thing> getterOfProducts_;
   };
 
-  TestGetterOfProducts::TestGetterOfProducts(edm::ParameterSet const& par) :
-    processName_(par.getParameter<std::string>("processName")),
-    expectedInputTagLabels_(par.getParameter<std::vector<std::string> >("expectedInputTagLabels")),
-    expectedLabelsAfterGet_(par.getParameter<std::vector<std::string> >("expectedLabelsAfterGet")),
-    getterOfProducts_(edm::ProcessMatch(processName_), this) {
-
+  TestGetterOfProducts::TestGetterOfProducts(edm::ParameterSet const& par)
+      : processName_(par.getParameter<std::string>("processName")),
+        expectedInputTagLabels_(par.getParameter<std::vector<std::string> >("expectedInputTagLabels")),
+        expectedLabelsAfterGet_(par.getParameter<std::vector<std::string> >("expectedLabelsAfterGet")),
+        getterOfProducts_(edm::ProcessMatch(processName_), this) {
     callWhenNewProductsRegistered(getterOfProducts_);
   }
 
-  TestGetterOfProducts::~TestGetterOfProducts() { }
-
-  bool
-  TestGetterOfProducts::filter(edm::Event& event, edm::EventSetup const&) {
-
-    
+  TestGetterOfProducts::~TestGetterOfProducts() {}
 
+  bool TestGetterOfProducts::filter(edm::Event& event, edm::EventSetup const&) {
     // These are the InputTag's of the products the getter will look for.
     // These are the matching products in the ProductRegistry, but they
     // may or may not be in a particular Event.
@@ -62,18 +55,20 @@ namespace edmtest {
     if (expectedInputTagLabels_.size() != tokens.size()) {
       std::cerr << "Expected number of InputTag's differs from actual number.\n"
                 << "In function TestGetterOfProducts::filter\n"
-                << "Expected value = " << expectedInputTagLabels_.size() << " actual value = " << tokens.size() << std::endl;
+                << "Expected value = " << expectedInputTagLabels_.size() << " actual value = " << tokens.size()
+                << std::endl;
       abort();
     }
 
     std::vector<std::string>::const_iterator iter = expectedInputTagLabels_.begin();
     for (auto const& token : tokens) {
       edm::EDConsumerBase::Labels labels;
-      labelsForToken(token,labels);
-      if ( *iter != labels.module ) {
-          throw cms::Exception("Failed Test") << "Expected InputTag differs from actual InputTag.\n"
-                  << "In function TestGetterOfProducts::filter\n"
-                  << "Expected value = " << *iter << " actual value = " << labels.module << std::endl;
+      labelsForToken(token, labels);
+      if (*iter != labels.module) {
+        throw cms::Exception("Failed Test")
+            << "Expected InputTag differs from actual InputTag.\n"
+            << "In function TestGetterOfProducts::filter\n"
+            << "Expected value = " << *iter << " actual value = " << labels.module << std::endl;
       }
       ++iter;
     }
@@ -83,17 +78,19 @@ namespace edmtest {
     getterOfProducts_.fillHandles(event, handles);
 
     if (expectedLabelsAfterGet_.size() != handles.size()) {
-      throw cms::Exception("Failed Test") << "Expected number of products gotten differs from actual number.\n"
-                << "In function TestGetterOfProducts::filter\n"
-                << "Expected value = " << expectedLabelsAfterGet_.size() << " actual value = " << handles.size() << std::endl;
+      throw cms::Exception("Failed Test")
+          << "Expected number of products gotten differs from actual number.\n"
+          << "In function TestGetterOfProducts::filter\n"
+          << "Expected value = " << expectedLabelsAfterGet_.size() << " actual value = " << handles.size() << std::endl;
     }
 
     iter = expectedLabelsAfterGet_.begin();
     for (auto const& handle : handles) {
       if (handle.provenance()->moduleLabel() != *iter) {
-        throw cms::Exception("Failed Test") << "Expected module label after get differs from actual module label.\n"
-                  << "In function TestGetterOfProducts::filter\n"
-                  << "Expected value = " << *iter << " actual value = " << handle.provenance()->moduleLabel() << std::endl;
+        throw cms::Exception("Failed Test")
+            << "Expected module label after get differs from actual module label.\n"
+            << "In function TestGetterOfProducts::filter\n"
+            << "Expected value = " << *iter << " actual value = " << handle.provenance()->moduleLabel() << std::endl;
         break;
       }
       ++iter;
@@ -102,20 +99,18 @@ namespace edmtest {
     return true;
   }
 
-
   // -----------------------------------------------------------------------------------------------------------
 
   // Very similar to the above class with these differences.
   // 1. The is an EDAnalyzer instead of a EDFilter
   // 2. It gets multiple types of products so there are
   // two GetterOfProducts objects.
-  // 3. Initialize one of the GetterOfProducts later in the 
+  // 3. Initialize one of the GetterOfProducts later in the
   // constructor.
   // 4. It can be configured to get things from the Run, LuminosityBlock,
   // or Event.
   class TestGetterOfProductsA : public edm::EDAnalyzer {
   public:
-
     explicit TestGetterOfProductsA(edm::ParameterSet const&);
     ~TestGetterOfProductsA();
     virtual void analyze(edm::Event const&, edm::EventSetup const&);
@@ -123,7 +118,6 @@ namespace edmtest {
     virtual void endRun(edm::Run const&, edm::EventSetup const&);
 
   private:
-
     std::string processName_;
     edm::BranchType branchType_;
     std::vector<std::string> expectedInputTagLabels_;
@@ -134,19 +128,20 @@ namespace edmtest {
     edm::GetterOfProducts<Thing> getterUsingLabel_;
   };
 
-  TestGetterOfProductsA::TestGetterOfProductsA(edm::ParameterSet const& par) :
-    processName_(par.getParameter<std::string>("processName")),
-    branchType_(edm::InEvent),
-    expectedInputTagLabels_(par.getParameter<std::vector<std::string> >("expectedInputTagLabels")),
-    expectedLabelsAfterGet_(par.getParameter<std::vector<std::string> >("expectedLabelsAfterGet")),
-    expectedNumberOfThingsWithLabelA_(par.getParameter<unsigned>("expectedNumberOfThingsWithLabelA")),
-    getterOfIntProducts_(),
-    getterOfProducts_(),
-    getterUsingLabel_() {
-
+  TestGetterOfProductsA::TestGetterOfProductsA(edm::ParameterSet const& par)
+      : processName_(par.getParameter<std::string>("processName")),
+        branchType_(edm::InEvent),
+        expectedInputTagLabels_(par.getParameter<std::vector<std::string> >("expectedInputTagLabels")),
+        expectedLabelsAfterGet_(par.getParameter<std::vector<std::string> >("expectedLabelsAfterGet")),
+        expectedNumberOfThingsWithLabelA_(par.getParameter<unsigned>("expectedNumberOfThingsWithLabelA")),
+        getterOfIntProducts_(),
+        getterOfProducts_(),
+        getterUsingLabel_() {
     int bt = par.getParameter<int>("branchType");
-    if (bt == 1) branchType_ = edm::InLumi;
-    else if (bt == 2) branchType_ = edm::InRun;
+    if (bt == 1)
+      branchType_ = edm::InLumi;
+    else if (bt == 2)
+      branchType_ = edm::InRun;
 
     getterOfIntProducts_ = edm::GetterOfProducts<IntProduct>(edm::ProcessMatch(processName_), this);
     getterOfProducts_ = edm::GetterOfProducts<Thing>(edm::ProcessMatch(processName_), this, branchType_);
@@ -159,29 +154,30 @@ namespace edmtest {
     });
   }
 
-  TestGetterOfProductsA::~TestGetterOfProductsA() { }
+  TestGetterOfProductsA::~TestGetterOfProductsA() {}
 
-  void
-  TestGetterOfProductsA::analyze(edm::Event const& event, edm::EventSetup const&) {
-
-    if (branchType_ != edm::InEvent) return;
+  void TestGetterOfProductsA::analyze(edm::Event const& event, edm::EventSetup const&) {
+    if (branchType_ != edm::InEvent)
+      return;
 
     auto const& tokens = getterOfProducts_.tokens();
 
     if (expectedInputTagLabels_.size() != tokens.size()) {
-      throw cms::Exception("Failed Test") << "Expected number of InputTag's differs from actual number.\n"
-                << "In function TestGetterOfProducts::filter\n"
-                << "Expected value = " << expectedInputTagLabels_.size() << " actual value = " << tokens.size() << std::endl;
+      throw cms::Exception("Failed Test")
+          << "Expected number of InputTag's differs from actual number.\n"
+          << "In function TestGetterOfProducts::filter\n"
+          << "Expected value = " << expectedInputTagLabels_.size() << " actual value = " << tokens.size() << std::endl;
     }
 
     std::vector<std::string>::const_iterator iter = expectedInputTagLabels_.begin();
     for (auto const& token : tokens) {
       edm::EDConsumerBase::Labels labels;
-      labelsForToken(token,labels);
+      labelsForToken(token, labels);
       if (*iter != labels.module) {
-        throw cms::Exception("Failed Test") << "Expected InputTag differs from actual InputTag.\n"
-                  << "In function TestGetterOfProducts::filter\n"
-                  << "Expected value = " << *iter << " actual value = " << labels.module << std::endl;
+        throw cms::Exception("Failed Test")
+            << "Expected InputTag differs from actual InputTag.\n"
+            << "In function TestGetterOfProducts::filter\n"
+            << "Expected value = " << *iter << " actual value = " << labels.module << std::endl;
       }
       ++iter;
     }
@@ -190,17 +186,19 @@ namespace edmtest {
     getterOfProducts_.fillHandles(event, handles);
 
     if (expectedLabelsAfterGet_.size() != handles.size()) {
-      throw cms::Exception("Failed Test") << "Expected number of products gotten differs from actual number.\n"
-                << "In function TestGetterOfProducts::filter\n"
-                << "Expected value = " << expectedLabelsAfterGet_.size() << " actual value = " << handles.size() << std::endl;
+      throw cms::Exception("Failed Test")
+          << "Expected number of products gotten differs from actual number.\n"
+          << "In function TestGetterOfProducts::filter\n"
+          << "Expected value = " << expectedLabelsAfterGet_.size() << " actual value = " << handles.size() << std::endl;
     }
 
     iter = expectedLabelsAfterGet_.begin();
     for (auto const& handle : handles) {
       if (handle.provenance()->moduleLabel() != *iter) {
-        throw cms::Exception("Failed Test") << "Expected module label after get differs from actual module label.\n"
-                  << "In function TestGetterOfProducts::filter\n"
-                  << "Expected value = " << *iter << " actual value = " << handle.provenance()->moduleLabel() << std::endl;
+        throw cms::Exception("Failed Test")
+            << "Expected module label after get differs from actual module label.\n"
+            << "In function TestGetterOfProducts::filter\n"
+            << "Expected value = " << *iter << " actual value = " << handle.provenance()->moduleLabel() << std::endl;
         break;
       }
       ++iter;
@@ -209,45 +207,49 @@ namespace edmtest {
     getterUsingLabel_.fillHandles(event, handles);
 
     if (expectedNumberOfThingsWithLabelA_ != handles.size()) {
-      throw cms::Exception("Failed Test") << "Expected number of products with module label A gotten differs from actual number.\n"
-                << "In function TestGetterOfProducts::filter\n"
-                << "Expected value = " << expectedNumberOfThingsWithLabelA_ << " actual value = " << handles.size() << std::endl;
+      throw cms::Exception("Failed Test")
+          << "Expected number of products with module label A gotten differs from actual number.\n"
+          << "In function TestGetterOfProducts::filter\n"
+          << "Expected value = " << expectedNumberOfThingsWithLabelA_ << " actual value = " << handles.size()
+          << std::endl;
     }
 
     iter = expectedLabelsAfterGet_.begin();
     for (auto const& handle : handles) {
       if (handle.provenance()->moduleLabel() != std::string("A")) {
         throw cms::Exception("Failed Test") << "Expected module label after get differs from actual module label.\n"
-                  << "In function TestGetterOfProducts::filter\n"
-                  << "For this get a module label \"A\" is always expected "<< " actual value = " << handle.provenance()->moduleLabel() << std::endl;
+                                            << "In function TestGetterOfProducts::filter\n"
+                                            << "For this get a module label \"A\" is always expected "
+                                            << " actual value = " << handle.provenance()->moduleLabel() << std::endl;
         break;
       }
       ++iter;
     }
   }
 
-  void
-  TestGetterOfProductsA::endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const&) {
-
-    if (branchType_ != edm::InLumi) return;
+  void TestGetterOfProductsA::endLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const&) {
+    if (branchType_ != edm::InLumi)
+      return;
 
     auto const& tokens = getterOfProducts_.tokens();
 
     if (expectedInputTagLabels_.size() != tokens.size()) {
-      throw cms::Exception("Failed Test") << "Expected number of InputTag's differs from actual number.\n"
-                << "In function TestGetterOfProducts::endLuminosityBlock\n"
-                << "Expected value = " << expectedInputTagLabels_.size() << " actual value = " << tokens.size() << std::endl;
+      throw cms::Exception("Failed Test")
+          << "Expected number of InputTag's differs from actual number.\n"
+          << "In function TestGetterOfProducts::endLuminosityBlock\n"
+          << "Expected value = " << expectedInputTagLabels_.size() << " actual value = " << tokens.size() << std::endl;
     }
 
     std::vector<std::string>::const_iterator iter = expectedInputTagLabels_.begin();
     for (auto const& token : tokens) {
       edm::EDConsumerBase::Labels labels;
-      labelsForToken(token,labels);
+      labelsForToken(token, labels);
 
       if (*iter != labels.module) {
-        throw cms::Exception("Failed Test") << "Expected InputTag differs from actual InputTag.\n"
-                  << "In function TestGetterOfProducts::endLuminosityBlock\n"
-                  << "Expected value = " << *iter << " actual value = " << labels.module << std::endl;
+        throw cms::Exception("Failed Test")
+            << "Expected InputTag differs from actual InputTag.\n"
+            << "In function TestGetterOfProducts::endLuminosityBlock\n"
+            << "Expected value = " << *iter << " actual value = " << labels.module << std::endl;
       }
       ++iter;
     }
@@ -256,17 +258,19 @@ namespace edmtest {
     getterOfProducts_.fillHandles(lumi, handles);
 
     if (expectedLabelsAfterGet_.size() != handles.size()) {
-      throw cms::Exception("Failed Test") << "Expected number of products gotten differs from actual number.\n"
-                << "In function TestGetterOfProducts::endLuminosityBlock\n"
-                << "Expected value = " << expectedLabelsAfterGet_.size() << " actual value = " << handles.size() << std::endl;
+      throw cms::Exception("Failed Test")
+          << "Expected number of products gotten differs from actual number.\n"
+          << "In function TestGetterOfProducts::endLuminosityBlock\n"
+          << "Expected value = " << expectedLabelsAfterGet_.size() << " actual value = " << handles.size() << std::endl;
     }
 
     iter = expectedLabelsAfterGet_.begin();
     for (auto const& handle : handles) {
       if (handle.provenance()->moduleLabel() != *iter) {
-        throw cms::Exception("Failed Test") << "Expected module label after get differs from actual module label.\n"
-                  << "In function TestGetterOfProducts::endLuminosityBlock\n"
-                  << "Expected value = " << *iter << " actual value = " << handle.provenance()->moduleLabel() << std::endl;
+        throw cms::Exception("Failed Test")
+            << "Expected module label after get differs from actual module label.\n"
+            << "In function TestGetterOfProducts::endLuminosityBlock\n"
+            << "Expected value = " << *iter << " actual value = " << handle.provenance()->moduleLabel() << std::endl;
         break;
       }
       ++iter;
@@ -275,44 +279,48 @@ namespace edmtest {
     getterUsingLabel_.fillHandles(lumi, handles);
 
     if (expectedNumberOfThingsWithLabelA_ != handles.size()) {
-      throw cms::Exception("Failed Test") << "Expected number of products with module label A gotten differs from actual number.\n"
-                << "In function TestGetterOfProducts::endLuminosityBlock\n"
-                << "Expected value = " << expectedNumberOfThingsWithLabelA_ << " actual value = " << handles.size() << std::endl;
+      throw cms::Exception("Failed Test")
+          << "Expected number of products with module label A gotten differs from actual number.\n"
+          << "In function TestGetterOfProducts::endLuminosityBlock\n"
+          << "Expected value = " << expectedNumberOfThingsWithLabelA_ << " actual value = " << handles.size()
+          << std::endl;
     }
 
     iter = expectedLabelsAfterGet_.begin();
     for (auto const& handle : handles) {
       if (handle.provenance()->moduleLabel() != std::string("A")) {
         throw cms::Exception("Failed Test") << "Expected module label after get differs from actual module label.\n"
-                  << "In function TestGetterOfProducts::endLuminosityBlock\n"
-                  << "For this get a module label \"A\" is always expected "<< " actual value = " << handle.provenance()->moduleLabel() << std::endl;
+                                            << "In function TestGetterOfProducts::endLuminosityBlock\n"
+                                            << "For this get a module label \"A\" is always expected "
+                                            << " actual value = " << handle.provenance()->moduleLabel() << std::endl;
         break;
       }
       ++iter;
     }
   }
 
-  void
-  TestGetterOfProductsA::endRun(edm::Run const& run, edm::EventSetup const&) {
-
-    if (branchType_ != edm::InRun) return;
+  void TestGetterOfProductsA::endRun(edm::Run const& run, edm::EventSetup const&) {
+    if (branchType_ != edm::InRun)
+      return;
 
     auto const& tokens = getterOfProducts_.tokens();
 
     if (expectedInputTagLabels_.size() != tokens.size()) {
-      throw cms::Exception("Failed Test") << "Expected number of InputTag's differs from actual number.\n"
-                << "In function TestGetterOfProducts::endRun\n"
-                << "Expected value = " << expectedInputTagLabels_.size() << " actual value = " << tokens.size() << std::endl;
+      throw cms::Exception("Failed Test")
+          << "Expected number of InputTag's differs from actual number.\n"
+          << "In function TestGetterOfProducts::endRun\n"
+          << "Expected value = " << expectedInputTagLabels_.size() << " actual value = " << tokens.size() << std::endl;
     }
 
     std::vector<std::string>::const_iterator iter = expectedInputTagLabels_.begin();
     for (auto const& token : tokens) {
       edm::EDConsumerBase::Labels labels;
-      labelsForToken(token,labels);
+      labelsForToken(token, labels);
       if (*iter != labels.module) {
-        throw cms::Exception("Failed Test") << "Expected InputTag differs from actual InputTag.\n"
-                  << "In function TestGetterOfProducts::endRun\n"
-                  << "Expected value = " << *iter << " actual value = " << labels.module << std::endl;
+        throw cms::Exception("Failed Test")
+            << "Expected InputTag differs from actual InputTag.\n"
+            << "In function TestGetterOfProducts::endRun\n"
+            << "Expected value = " << *iter << " actual value = " << labels.module << std::endl;
       }
       ++iter;
     }
@@ -321,18 +329,19 @@ namespace edmtest {
     getterOfProducts_.fillHandles(run, handles);
 
     if (expectedLabelsAfterGet_.size() != handles.size()) {
-      throw cms::Exception("Failed Test") << "Expected number of products gotten differs from actual number.\n"
-                << "In function TestGetterOfProducts::endRun\n"
-                << "Expected value = " << expectedLabelsAfterGet_.size() << " actual value = " << handles.size() << std::endl;
-
+      throw cms::Exception("Failed Test")
+          << "Expected number of products gotten differs from actual number.\n"
+          << "In function TestGetterOfProducts::endRun\n"
+          << "Expected value = " << expectedLabelsAfterGet_.size() << " actual value = " << handles.size() << std::endl;
     }
 
     iter = expectedLabelsAfterGet_.begin();
     for (auto const& handle : handles) {
       if (handle.provenance()->moduleLabel() != *iter) {
-        throw cms::Exception("Failed Test") << "Expected module label after get differs from actual module label.\n"
-                  << "In function TestGetterOfProducts::endRun\n"
-                  << "Expected value = " << *iter << " actual value = " << handle.provenance()->moduleLabel() << std::endl;
+        throw cms::Exception("Failed Test")
+            << "Expected module label after get differs from actual module label.\n"
+            << "In function TestGetterOfProducts::endRun\n"
+            << "Expected value = " << *iter << " actual value = " << handle.provenance()->moduleLabel() << std::endl;
         break;
       }
       ++iter;
@@ -341,24 +350,26 @@ namespace edmtest {
     getterUsingLabel_.fillHandles(run, handles);
 
     if (expectedNumberOfThingsWithLabelA_ != handles.size()) {
-      throw cms::Exception("Failed Test") << "Expected number of products with module label A gotten differs from actual number.\n"
-                << "In function TestGetterOfProducts::endRun\n"
-                << "Expected value = " << expectedNumberOfThingsWithLabelA_ << " actual value = " << handles.size() << std::endl;
+      throw cms::Exception("Failed Test")
+          << "Expected number of products with module label A gotten differs from actual number.\n"
+          << "In function TestGetterOfProducts::endRun\n"
+          << "Expected value = " << expectedNumberOfThingsWithLabelA_ << " actual value = " << handles.size()
+          << std::endl;
     }
 
     iter = expectedLabelsAfterGet_.begin();
     for (auto const& handle : handles) {
       if (handle.provenance()->moduleLabel() != std::string("A")) {
         throw cms::Exception("Failed Test") << "Expected module label after get differs from actual module label.\n"
-                  << "In function TestGetterOfProducts::endRun\n"
-                  << "For this get a module label \"A\" is always expected "<< " actual value = " << handle.provenance()->moduleLabel() << std::endl;
+                                            << "In function TestGetterOfProducts::endRun\n"
+                                            << "For this get a module label \"A\" is always expected "
+                                            << " actual value = " << handle.provenance()->moduleLabel() << std::endl;
         break;
       }
       ++iter;
     }
-
   }
-}
+}  // namespace edmtest
 using namespace edmtest;
 DEFINE_FWK_MODULE(TestGetterOfProducts);
 DEFINE_FWK_MODULE(TestGetterOfProductsA);
diff --git a/FWCore/Integration/test/TestGlobalOutput.cc b/FWCore/Integration/test/TestGlobalOutput.cc
index 78004cb2c48ef..79983a282dfba 100644
--- a/FWCore/Integration/test/TestGlobalOutput.cc
+++ b/FWCore/Integration/test/TestGlobalOutput.cc
@@ -15,7 +15,6 @@ namespace edm {
 
   class TestGlobalOutput : public global::OutputModule<WatchInputFiles, RunCache<int>, LuminosityBlockCache<int>> {
   public:
-
     explicit TestGlobalOutput(ParameterSet const& pset);
     ~TestGlobalOutput() override;
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
@@ -35,47 +34,35 @@ namespace edm {
     void globalEndLuminosityBlock(LuminosityBlockForOutput const&) const override;
   };
 
-  TestGlobalOutput::TestGlobalOutput(ParameterSet const& pset) :
-    global::OutputModuleBase(pset),
-    global::OutputModule<WatchInputFiles, RunCache<int>, LuminosityBlockCache<int>>(pset) {
-  }
+  TestGlobalOutput::TestGlobalOutput(ParameterSet const& pset)
+      : global::OutputModuleBase(pset),
+        global::OutputModule<WatchInputFiles, RunCache<int>, LuminosityBlockCache<int>>(pset) {}
 
-  TestGlobalOutput::~TestGlobalOutput() {
-  }
+  TestGlobalOutput::~TestGlobalOutput() {}
 
-  void
-  TestGlobalOutput::write(EventForOutput const& e) {
-    LogAbsolute("TestGlobalOutput")<< "global write event";
-  }
+  void TestGlobalOutput::write(EventForOutput const& e) { LogAbsolute("TestGlobalOutput") << "global write event"; }
 
-  void
-  TestGlobalOutput::writeLuminosityBlock(LuminosityBlockForOutput const&) {
-    LogAbsolute("TestGlobalOutput")<< "global writeLuminosityBlock";
+  void TestGlobalOutput::writeLuminosityBlock(LuminosityBlockForOutput const&) {
+    LogAbsolute("TestGlobalOutput") << "global writeLuminosityBlock";
   }
 
-  void
-  TestGlobalOutput::writeRun(RunForOutput const&) {
-    LogAbsolute("TestGlobalOutput")<< "global writeRun";
-  }
+  void TestGlobalOutput::writeRun(RunForOutput const&) { LogAbsolute("TestGlobalOutput") << "global writeRun"; }
 
-  void
-  TestGlobalOutput::respondToOpenInputFile(FileBlock const&) {
-    LogAbsolute("TestGlobalOutput")<< "global respondToOpenInputFile";
+  void TestGlobalOutput::respondToOpenInputFile(FileBlock const&) {
+    LogAbsolute("TestGlobalOutput") << "global respondToOpenInputFile";
   }
 
-  void
-  TestGlobalOutput::respondToCloseInputFile(FileBlock const&) {
-    LogAbsolute("TestGlobalOutput")<< "global respondToCloseInputFile";
+  void TestGlobalOutput::respondToCloseInputFile(FileBlock const&) {
+    LogAbsolute("TestGlobalOutput") << "global respondToCloseInputFile";
   }
 
-  std::shared_ptr<int>
-  TestGlobalOutput::globalBeginRun(RunForOutput const&) const {
-    LogAbsolute("TestGlobalOutput")<< "global globalBeginRun";
+  std::shared_ptr<int> TestGlobalOutput::globalBeginRun(RunForOutput const&) const {
+    LogAbsolute("TestGlobalOutput") << "global globalBeginRun";
     BranchIDLists const* theBranchIDLists = branchIDLists();
     for (auto const& branchIDList : *theBranchIDLists) {
       LogAbsolute("TestGlobalOutput") << "A branchID list";
       for (auto const& branchID : branchIDList) {
-        LogAbsolute("TestGlobalOutput") << "  global branchID "  << branchID;
+        LogAbsolute("TestGlobalOutput") << "  global branchID " << branchID;
       }
     }
     edm::Service<edm::ConstProductRegistry> reg;
@@ -85,29 +72,25 @@ namespace edm {
     return std::make_shared<int>(0);
   }
 
-  void
-  TestGlobalOutput::globalEndRun(RunForOutput const&) const {
-    LogAbsolute("TestGlobalOutput")<< "global globalEndRun";
+  void TestGlobalOutput::globalEndRun(RunForOutput const&) const {
+    LogAbsolute("TestGlobalOutput") << "global globalEndRun";
   }
 
-  std::shared_ptr<int>
-  TestGlobalOutput::globalBeginLuminosityBlock(LuminosityBlockForOutput const&) const {
-    LogAbsolute("TestGlobalOutput")<< "global globalBeginLuminosityBlock";
+  std::shared_ptr<int> TestGlobalOutput::globalBeginLuminosityBlock(LuminosityBlockForOutput const&) const {
+    LogAbsolute("TestGlobalOutput") << "global globalBeginLuminosityBlock";
     return std::make_shared<int>(0);
   }
 
-  void
-  TestGlobalOutput::globalEndLuminosityBlock(LuminosityBlockForOutput const&) const {
-    LogAbsolute("TestGlobalOutput")<< "global globalEndLuminosityBlock";
+  void TestGlobalOutput::globalEndLuminosityBlock(LuminosityBlockForOutput const&) const {
+    LogAbsolute("TestGlobalOutput") << "global globalEndLuminosityBlock";
   }
 
-  void
-  TestGlobalOutput::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void TestGlobalOutput::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     OutputModule::fillDescription(desc);
     descriptions.addDefault(desc);
   }
-}
+}  // namespace edm
 
 using edm::TestGlobalOutput;
 DEFINE_FWK_MODULE(TestGlobalOutput);
diff --git a/FWCore/Integration/test/TestHistoryKeeping.cc b/FWCore/Integration/test/TestHistoryKeeping.cc
index b0925a69e5ae4..b194da04bd614 100644
--- a/FWCore/Integration/test/TestHistoryKeeping.cc
+++ b/FWCore/Integration/test/TestHistoryKeeping.cc
@@ -8,15 +8,12 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-namespace edmtest 
-{
-  class TestHistoryKeeping : public edm::EDAnalyzer
-  {
+namespace edmtest {
+  class TestHistoryKeeping : public edm::EDAnalyzer {
   public:
-
     explicit TestHistoryKeeping(edm::ParameterSet const& pset);
     virtual ~TestHistoryKeeping();
-    
+
     virtual void analyze(edm::Event const& e, edm::EventSetup const&);
 
     virtual void beginRun(edm::Run const& r, edm::EventSetup const&);
@@ -24,55 +21,43 @@ namespace edmtest
 
   private:
     std::vector<std::string> expectedProcesses_;
-    int   numberOfExpectedHLTProcessesInEachRun_;
-  }; // class TestHistoryKeeping
-
-
+    int numberOfExpectedHLTProcessesInEachRun_;
+  };  // class TestHistoryKeeping
 
   //--------------------------------------------------------------------
   //
   // Implementation details
   //--------------------------------------------------------------------
 
-  TestHistoryKeeping::TestHistoryKeeping(edm::ParameterSet const& pset) :
-    expectedProcesses_(pset.getParameter<std::vector<std::string> >("expected_processes")),
-    numberOfExpectedHLTProcessesInEachRun_(pset.getParameter<int>("number_of_expected_HLT_processes_for_each_run"))
-  {
+  TestHistoryKeeping::TestHistoryKeeping(edm::ParameterSet const& pset)
+      : expectedProcesses_(pset.getParameter<std::vector<std::string> >("expected_processes")),
+        numberOfExpectedHLTProcessesInEachRun_(
+            pset.getParameter<int>("number_of_expected_HLT_processes_for_each_run")) {
     // Nothing to do.
   }
 
   TestHistoryKeeping::~TestHistoryKeeping() {}
 
-  void
-  TestHistoryKeeping::beginRun(edm::Run const&, edm::EventSetup const&)
-  {
+  void TestHistoryKeeping::beginRun(edm::Run const&, edm::EventSetup const&) {
     // At begin run, we're looking at, make sure we can get at the
     // parameter sets for any HLT processing.
   }
 
-  void
-  TestHistoryKeeping::analyze(edm::Event const& ev, edm::EventSetup const&)
-  {
-    for (std::vector<std::string>::const_iterator
-	   i = expectedProcesses_.begin(),
-	   e = expectedProcesses_.end();
-	 i != e;
-	 ++i)
-      {
-	edm::ParameterSet ps;
-	assert(ev.getProcessParameterSet(*i, ps));
-	assert(!ps.empty());
-	assert(ps.getParameter<std::string>("@process_name") == *i);
-      }
+  void TestHistoryKeeping::analyze(edm::Event const& ev, edm::EventSetup const&) {
+    for (std::vector<std::string>::const_iterator i = expectedProcesses_.begin(), e = expectedProcesses_.end(); i != e;
+         ++i) {
+      edm::ParameterSet ps;
+      assert(ev.getProcessParameterSet(*i, ps));
+      assert(!ps.empty());
+      assert(ps.getParameter<std::string>("@process_name") == *i);
+    }
   }
 
-  void
-  TestHistoryKeeping::endRun(edm::Run const&, edm::EventSetup const& )
-  {
+  void TestHistoryKeeping::endRun(edm::Run const&, edm::EventSetup const&) {
     // Nothing to do.
   }
 
-} // namespace edmtest
+}  // namespace edmtest
 
 using edmtest::TestHistoryKeeping;
 DEFINE_FWK_MODULE(TestHistoryKeeping);
diff --git a/FWCore/Integration/test/TestLimitedOutput.cc b/FWCore/Integration/test/TestLimitedOutput.cc
index 475f72c3bd011..f64d28c07b201 100644
--- a/FWCore/Integration/test/TestLimitedOutput.cc
+++ b/FWCore/Integration/test/TestLimitedOutput.cc
@@ -15,7 +15,6 @@ namespace edm {
 
   class TestLimitedOutput : public limited::OutputModule<WatchInputFiles, RunCache<int>, LuminosityBlockCache<int>> {
   public:
-
     explicit TestLimitedOutput(ParameterSet const& pset);
     ~TestLimitedOutput() override;
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
@@ -35,42 +34,30 @@ namespace edm {
     void globalEndLuminosityBlock(LuminosityBlockForOutput const&) const override;
   };
 
-  TestLimitedOutput::TestLimitedOutput(ParameterSet const& pset) :
-    limited::OutputModuleBase(pset),
-    limited::OutputModule<WatchInputFiles, RunCache<int>, LuminosityBlockCache<int>>(pset) {
-  }
+  TestLimitedOutput::TestLimitedOutput(ParameterSet const& pset)
+      : limited::OutputModuleBase(pset),
+        limited::OutputModule<WatchInputFiles, RunCache<int>, LuminosityBlockCache<int>>(pset) {}
 
-  TestLimitedOutput::~TestLimitedOutput() {
-  }
+  TestLimitedOutput::~TestLimitedOutput() {}
 
-  void
-  TestLimitedOutput::write(EventForOutput const& e) {
-    LogAbsolute("TestLimitedOutput")<< "limited write event";
-  }
+  void TestLimitedOutput::write(EventForOutput const& e) { LogAbsolute("TestLimitedOutput") << "limited write event"; }
 
-  void
-  TestLimitedOutput::writeLuminosityBlock(LuminosityBlockForOutput const&) {
-    LogAbsolute("TestLimitedOutput")<< "limited writeLuminosityBlock";
+  void TestLimitedOutput::writeLuminosityBlock(LuminosityBlockForOutput const&) {
+    LogAbsolute("TestLimitedOutput") << "limited writeLuminosityBlock";
   }
 
-  void
-  TestLimitedOutput::writeRun(RunForOutput const&) {
-    LogAbsolute("TestLimitedOutput")<< "limited writeRun";
-  }
+  void TestLimitedOutput::writeRun(RunForOutput const&) { LogAbsolute("TestLimitedOutput") << "limited writeRun"; }
 
-  void
-  TestLimitedOutput::respondToOpenInputFile(FileBlock const&) {
-    LogAbsolute("TestLimitedOutput")<< "limited respondToOpenInputFile";
+  void TestLimitedOutput::respondToOpenInputFile(FileBlock const&) {
+    LogAbsolute("TestLimitedOutput") << "limited respondToOpenInputFile";
   }
 
-  void
-  TestLimitedOutput::respondToCloseInputFile(FileBlock const&) {
-    LogAbsolute("TestLimitedOutput")<< "limited respondToCloseInputFile";
+  void TestLimitedOutput::respondToCloseInputFile(FileBlock const&) {
+    LogAbsolute("TestLimitedOutput") << "limited respondToCloseInputFile";
   }
 
-  std::shared_ptr<int>
-  TestLimitedOutput::globalBeginRun(RunForOutput const&) const {
-    LogAbsolute("TestLimitedOutput")<< "limited globalBeginRun";
+  std::shared_ptr<int> TestLimitedOutput::globalBeginRun(RunForOutput const&) const {
+    LogAbsolute("TestLimitedOutput") << "limited globalBeginRun";
     BranchIDLists const* theBranchIDLists = branchIDLists();
     for (auto const& branchIDList : *theBranchIDLists) {
       LogAbsolute("TestLimitedOutput") << "A branchID list";
@@ -85,29 +72,25 @@ namespace edm {
     return std::make_shared<int>(0);
   }
 
-  void
-  TestLimitedOutput::globalEndRun(RunForOutput const&) const {
-    LogAbsolute("TestLimitedOutput")<< "limited globalEndRun";
+  void TestLimitedOutput::globalEndRun(RunForOutput const&) const {
+    LogAbsolute("TestLimitedOutput") << "limited globalEndRun";
   }
 
-  std::shared_ptr<int>
-  TestLimitedOutput::globalBeginLuminosityBlock(LuminosityBlockForOutput const&) const {
-    LogAbsolute("TestLimitedOutput")<< "limited globalBeginLuminosityBlock";
+  std::shared_ptr<int> TestLimitedOutput::globalBeginLuminosityBlock(LuminosityBlockForOutput const&) const {
+    LogAbsolute("TestLimitedOutput") << "limited globalBeginLuminosityBlock";
     return std::make_shared<int>(0);
   }
 
-  void
-  TestLimitedOutput::globalEndLuminosityBlock(LuminosityBlockForOutput const&) const {
-    LogAbsolute("TestLimitedOutput")<< "limited globalEndLuminosityBlock";
+  void TestLimitedOutput::globalEndLuminosityBlock(LuminosityBlockForOutput const&) const {
+    LogAbsolute("TestLimitedOutput") << "limited globalEndLuminosityBlock";
   }
 
-  void
-  TestLimitedOutput::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void TestLimitedOutput::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     OutputModule::fillDescription(desc);
     descriptions.addDefault(desc);
   }
-}
+}  // namespace edm
 
 using edm::TestLimitedOutput;
 DEFINE_FWK_MODULE(TestLimitedOutput);
diff --git a/FWCore/Integration/test/TestPSetAnalyzer.cc b/FWCore/Integration/test/TestPSetAnalyzer.cc
index b653510d42618..01d390d77c1cb 100644
--- a/FWCore/Integration/test/TestPSetAnalyzer.cc
+++ b/FWCore/Integration/test/TestPSetAnalyzer.cc
@@ -8,7 +8,6 @@
 //
 //
 
-
 // user include files
 #include "DataFormats/Provenance/interface/EventRange.h"
 #include "DataFormats/Provenance/interface/LuminosityBlockRange.h"
@@ -25,35 +24,34 @@
 //
 
 class TestPSetAnalyzer : public edm::EDAnalyzer {
-   public:
-      explicit TestPSetAnalyzer(edm::ParameterSet const&);
-      ~TestPSetAnalyzer();
-
-
-   private:
-      virtual void analyze(edm::Event const&, edm::EventSetup const&);
-
-      edm::LuminosityBlockID                 testLumi_;
-      edm::LuminosityBlockRange              testLRange_;
-      edm::EventRange                        testERange_;
-
-      std::vector<edm::LuminosityBlockID>    testVLumi_;
-      std::vector<edm::LuminosityBlockRange> testVLRange_;
-      std::vector<edm::EventRange>           testVERange_;
-
-      edm::EventID                           testEventID1_;
-      edm::EventID                           testEventID2_;
-      edm::EventID                           testEventID3_;
-      edm::EventID                           testEventID4_;
-      std::vector<edm::EventID>              testVEventID_;
-      edm::EventRange                        testERange1_;
-      edm::EventRange                        testERange2_;
-      edm::EventRange                        testERange3_;
-      edm::EventRange                        testERange4_;
-      edm::EventRange                        testERange5_;
-      std::vector<edm::EventRange>           testVERange2_;
-
-      // ----------member data ---------------------------
+public:
+  explicit TestPSetAnalyzer(edm::ParameterSet const&);
+  ~TestPSetAnalyzer();
+
+private:
+  virtual void analyze(edm::Event const&, edm::EventSetup const&);
+
+  edm::LuminosityBlockID testLumi_;
+  edm::LuminosityBlockRange testLRange_;
+  edm::EventRange testERange_;
+
+  std::vector<edm::LuminosityBlockID> testVLumi_;
+  std::vector<edm::LuminosityBlockRange> testVLRange_;
+  std::vector<edm::EventRange> testVERange_;
+
+  edm::EventID testEventID1_;
+  edm::EventID testEventID2_;
+  edm::EventID testEventID3_;
+  edm::EventID testEventID4_;
+  std::vector<edm::EventID> testVEventID_;
+  edm::EventRange testERange1_;
+  edm::EventRange testERange2_;
+  edm::EventRange testERange3_;
+  edm::EventRange testERange4_;
+  edm::EventRange testERange5_;
+  std::vector<edm::EventRange> testVERange2_;
+
+  // ----------member data ---------------------------
 };
 
 //
@@ -68,81 +66,78 @@ class TestPSetAnalyzer : public edm::EDAnalyzer {
 // constructors and destructor
 //
 TestPSetAnalyzer::TestPSetAnalyzer(edm::ParameterSet const& iConfig) {
-
-    testLumi_             = iConfig.getParameter<edm::LuminosityBlockID>("testLumi");
-    testVLumi_            = iConfig.getParameter<std::vector<edm::LuminosityBlockID> >("testVLumi");
-    testLRange_           = iConfig.getParameter<edm::LuminosityBlockRange>("testRange");
-    testVLRange_          = iConfig.getParameter<std::vector<edm::LuminosityBlockRange> >("testVRange");
-    testERange_           = iConfig.getParameter<edm::EventRange>("testERange");
-    testVERange_          = iConfig.getParameter<std::vector<edm::EventRange> >("testVERange");
-
-    testEventID1_          = iConfig.getParameter<edm::EventID>("testEventID1");
-    testEventID2_          = iConfig.getParameter<edm::EventID>("testEventID2");
-    testEventID3_          = iConfig.getParameter<edm::EventID>("testEventID3");
-    testEventID4_          = iConfig.getParameter<edm::EventID>("testEventID4");
-    testVEventID_         = iConfig.getParameter<std::vector<edm::EventID> >("testVEventID");
-    testERange1_          = iConfig.getParameter<edm::EventRange>("testERange1");
-    testERange2_          = iConfig.getParameter<edm::EventRange>("testERange2");
-    testERange3_          = iConfig.getParameter<edm::EventRange>("testERange3");
-    testERange4_          = iConfig.getParameter<edm::EventRange>("testERange4");
-    testERange5_          = iConfig.getParameter<edm::EventRange>("testERange5");
-    testVERange2_         = iConfig.getParameter<std::vector<edm::EventRange> >("testVERange2");
-
-    std::cout << "Lumi PSet test "   << testLumi_  << std::endl;
-    std::cout << "LRange PSet test "  << testLRange_ << std::endl;
-    std::cout << "ERange PSet test "  << testERange_ << std::endl;
-
-    for(auto const& i : testVLumi_) {
-      std::cout << "VLumi PSet test " << i << std::endl;
-    }
-
-    for(auto const& i : testVLRange_) {
-      std::cout << "VLRange PSet test " << i << std::endl;
-    }
-
-    for(auto const& i : testVERange_) {
-      std::cout << "VERange PSet test " << i << std::endl;
-    }
-
-    std::cout << "EventID1 PSet test "  << testEventID1_ << std::endl;
-    std::cout << "EventID2 PSet test "  << testEventID2_ << std::endl;
-    std::cout << "EventID3 PSet test "  << testEventID3_ << std::endl;
-    std::cout << "EventID4 PSet test "  << testEventID4_ << std::endl;
-    std::cout << "ERange1 PSet test "  << testERange1_ << std::endl;
-    std::cout << "ERange2 PSet test "  << testERange2_ << std::endl;
-    std::cout << "ERange3 PSet test "  << testERange3_ << std::endl;
-    std::cout << "ERange4 PSet test "  << testERange4_ << std::endl;
-    std::cout << "ERange5 PSet test "  << testERange5_ << std::endl;
-
-    for( auto const& i : testVEventID_) {
-      std::cout << "VEventID PSet test " << i << std::endl;
-    }
-
-    for( auto const& i : testVERange2_) {
-      std::cout << "VERange2 PSet test " << i << std::endl;
-    }
+  testLumi_ = iConfig.getParameter<edm::LuminosityBlockID>("testLumi");
+  testVLumi_ = iConfig.getParameter<std::vector<edm::LuminosityBlockID> >("testVLumi");
+  testLRange_ = iConfig.getParameter<edm::LuminosityBlockRange>("testRange");
+  testVLRange_ = iConfig.getParameter<std::vector<edm::LuminosityBlockRange> >("testVRange");
+  testERange_ = iConfig.getParameter<edm::EventRange>("testERange");
+  testVERange_ = iConfig.getParameter<std::vector<edm::EventRange> >("testVERange");
+
+  testEventID1_ = iConfig.getParameter<edm::EventID>("testEventID1");
+  testEventID2_ = iConfig.getParameter<edm::EventID>("testEventID2");
+  testEventID3_ = iConfig.getParameter<edm::EventID>("testEventID3");
+  testEventID4_ = iConfig.getParameter<edm::EventID>("testEventID4");
+  testVEventID_ = iConfig.getParameter<std::vector<edm::EventID> >("testVEventID");
+  testERange1_ = iConfig.getParameter<edm::EventRange>("testERange1");
+  testERange2_ = iConfig.getParameter<edm::EventRange>("testERange2");
+  testERange3_ = iConfig.getParameter<edm::EventRange>("testERange3");
+  testERange4_ = iConfig.getParameter<edm::EventRange>("testERange4");
+  testERange5_ = iConfig.getParameter<edm::EventRange>("testERange5");
+  testVERange2_ = iConfig.getParameter<std::vector<edm::EventRange> >("testVERange2");
+
+  std::cout << "Lumi PSet test " << testLumi_ << std::endl;
+  std::cout << "LRange PSet test " << testLRange_ << std::endl;
+  std::cout << "ERange PSet test " << testERange_ << std::endl;
+
+  for (auto const& i : testVLumi_) {
+    std::cout << "VLumi PSet test " << i << std::endl;
+  }
+
+  for (auto const& i : testVLRange_) {
+    std::cout << "VLRange PSet test " << i << std::endl;
+  }
+
+  for (auto const& i : testVERange_) {
+    std::cout << "VERange PSet test " << i << std::endl;
+  }
+
+  std::cout << "EventID1 PSet test " << testEventID1_ << std::endl;
+  std::cout << "EventID2 PSet test " << testEventID2_ << std::endl;
+  std::cout << "EventID3 PSet test " << testEventID3_ << std::endl;
+  std::cout << "EventID4 PSet test " << testEventID4_ << std::endl;
+  std::cout << "ERange1 PSet test " << testERange1_ << std::endl;
+  std::cout << "ERange2 PSet test " << testERange2_ << std::endl;
+  std::cout << "ERange3 PSet test " << testERange3_ << std::endl;
+  std::cout << "ERange4 PSet test " << testERange4_ << std::endl;
+  std::cout << "ERange5 PSet test " << testERange5_ << std::endl;
+
+  for (auto const& i : testVEventID_) {
+    std::cout << "VEventID PSet test " << i << std::endl;
+  }
+
+  for (auto const& i : testVERange2_) {
+    std::cout << "VERange2 PSet test " << i << std::endl;
+  }
 }
 
-TestPSetAnalyzer::~TestPSetAnalyzer() {
-}
+TestPSetAnalyzer::~TestPSetAnalyzer() {}
 
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-TestPSetAnalyzer::analyze(edm::Event const&, edm::EventSetup const&) {
-   using namespace edm;
+void TestPSetAnalyzer::analyze(edm::Event const&, edm::EventSetup const&) {
+  using namespace edm;
 
 #ifdef THIS_IS_AN_EVENT_EXAMPLE
-   Handle<ExampleData> pIn;
-   iEvent.getByLabel("example", pIn);
+  Handle<ExampleData> pIn;
+  iEvent.getByLabel("example", pIn);
 #endif
 
 #ifdef THIS_IS_AN_EVENTSETUP_EXAMPLE
-   ESHandle<SetupData> pSetup;
-   iSetup.get<SetupRecord>().get(pSetup);
+  ESHandle<SetupData> pSetup;
+  iSetup.get<SetupRecord>().get(pSetup);
 #endif
 }
 
diff --git a/FWCore/Integration/test/TestParentage.cc b/FWCore/Integration/test/TestParentage.cc
index c0c0389b7b48c..def68595eb017 100644
--- a/FWCore/Integration/test/TestParentage.cc
+++ b/FWCore/Integration/test/TestParentage.cc
@@ -22,9 +22,7 @@
 #include <vector>
 
 namespace {
-  void getAncestors(edm::Event const& e,
-                    edm::BranchID const& branchID,
-                    std::set<edm::BranchID>& ancestors) {
+  void getAncestors(edm::Event const& e, edm::BranchID const& branchID, std::set<edm::BranchID>& ancestors) {
     edm::Provenance prov = e.getProvenance(branchID);
     if (prov.productProvenance()) {
       for (auto const& parent : prov.productProvenance()->parentage().parents()) {
@@ -50,39 +48,34 @@ namespace {
       }
     }
   }
-}
+}  // namespace
 
 namespace edmtest {
 
-  class TestParentage : public edm::EDAnalyzer { 
+  class TestParentage : public edm::EDAnalyzer {
   public:
-
     explicit TestParentage(edm::ParameterSet const& pset);
     virtual ~TestParentage();
 
     virtual void analyze(edm::Event const& e, edm::EventSetup const& es) override;
 
   private:
-
     edm::InputTag inputTag_;
     edm::EDGetTokenT<IntProduct> token_;
     std::vector<std::string> expectedAncestors_;
     bool callGetProvenance_;
   };
 
-  TestParentage::TestParentage(edm::ParameterSet const& pset) :
-    inputTag_(pset.getParameter<edm::InputTag>("inputTag")),
-    expectedAncestors_(pset.getParameter<std::vector<std::string> >("expectedAncestors")),
-    callGetProvenance_(pset.getUntrackedParameter<bool>("callGetProvenance", true)) {
-
+  TestParentage::TestParentage(edm::ParameterSet const& pset)
+      : inputTag_(pset.getParameter<edm::InputTag>("inputTag")),
+        expectedAncestors_(pset.getParameter<std::vector<std::string> >("expectedAncestors")),
+        callGetProvenance_(pset.getUntrackedParameter<bool>("callGetProvenance", true)) {
     token_ = consumes<IntProduct>(inputTag_);
   }
 
   TestParentage::~TestParentage() {}
 
-  void
-  TestParentage::analyze(edm::Event const& e, edm::EventSetup const&) {
-
+  void TestParentage::analyze(edm::Event const& e, edm::EventSetup const&) {
     edm::Handle<IntProduct> h = e.getHandle(token_);
 
     edm::Provenance const* prov = h.provenance();
@@ -96,7 +89,7 @@ namespace edmtest {
 
     std::map<edm::BranchID, std::string> branchIDToLabel;
     edm::Service<edm::ConstProductRegistry> reg;
-    for(auto const& prod : reg->productList()) {
+    for (auto const& prod : reg->productList()) {
       branchIDToLabel[prod.second.branchID()] = prod.second.moduleLabel();
     }
 
@@ -104,11 +97,9 @@ namespace edmtest {
     // from a SubProcess and the parentage includes a product not kept
     // in the SubProcess. This might get fixed someday ...
     if (callGetProvenance_) {
-
       std::set<edm::BranchID> ancestors;
       getAncestors(e, prov->branchID(), ancestors);
 
-
       std::set<std::string> ancestorLabels;
       for (edm::BranchID const& ancestor : ancestors) {
         ancestorLabels.insert(branchIDToLabel[ancestor]);
@@ -128,11 +119,12 @@ namespace edmtest {
       ancestorLabels2.insert(branchIDToLabel[ancestor]);
     }
     if (ancestorLabels2 != expectedAncestors) {
-      std::cerr << "TestParentage::analyze: ancestors do not match expected ancestors (parentage from retriever)" << std::endl;
+      std::cerr << "TestParentage::analyze: ancestors do not match expected ancestors (parentage from retriever)"
+                << std::endl;
       abort();
     }
   }
-} // namespace edmtest
+}  // namespace edmtest
 
 using edmtest::TestParentage;
 DEFINE_FWK_MODULE(TestParentage);
diff --git a/FWCore/Integration/test/ThingAlgorithm.cc b/FWCore/Integration/test/ThingAlgorithm.cc
index 320e0cfba4879..5041cde6b60e4 100644
--- a/FWCore/Integration/test/ThingAlgorithm.cc
+++ b/FWCore/Integration/test/ThingAlgorithm.cc
@@ -2,13 +2,13 @@
 #include "DataFormats/TestObjects/interface/Thing.h"
 
 namespace edmtest {
-  void ThingAlgorithm::run(ThingCollection & thingCollection) const {
+  void ThingAlgorithm::run(ThingCollection& thingCollection) const {
     thingCollection.reserve(nThings_);
     auto offset = offset_.fetch_add(offsetDelta_);
     for (int i = 0; i < nThings_; ++i) {
       Thing tc;
-      tc.a = i+offset;
+      tc.a = i + offset;
       thingCollection.push_back(tc);
     }
   }
-}
+}  // namespace edmtest
diff --git a/FWCore/Integration/test/ThingAlgorithm.h b/FWCore/Integration/test/ThingAlgorithm.h
index a60f32eb2e077..eb7f1389d1d7f 100644
--- a/FWCore/Integration/test/ThingAlgorithm.h
+++ b/FWCore/Integration/test/ThingAlgorithm.h
@@ -10,18 +10,19 @@
 namespace edmtest {
   class ThingAlgorithm {
   public:
-  ThingAlgorithm(long iOffsetDelta = 0, int nThings = 20) :  offset_(0), offsetDelta_(iOffsetDelta),
-      nThings_(nThings) {}
+    ThingAlgorithm(long iOffsetDelta = 0, int nThings = 20)
+        : offset_(0), offsetDelta_(iOffsetDelta), nThings_(nThings) {}
 
     /// Runs the algorithm and returns a list of Things
     /// The user declares the vector and calls this method.
     void run(ThingCollection& thingCollection) const;
+
   private:
-    mutable std::atomic<long>   offset_;
-    const long   offsetDelta_;
-    const int    nThings_;
+    mutable std::atomic<long> offset_;
+    const long offsetDelta_;
+    const int nThings_;
   };
 
-}
+}  // namespace edmtest
 
 #endif
diff --git a/FWCore/Integration/test/ThingAnalyzer.cc b/FWCore/Integration/test/ThingAnalyzer.cc
index b9dd3a7bee312..689347242230f 100644
--- a/FWCore/Integration/test/ThingAnalyzer.cc
+++ b/FWCore/Integration/test/ThingAnalyzer.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Integration
 // Class  :     ThingAnalyzer
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -22,128 +22,113 @@
 
 // user include files
 
-
 namespace edmtest {
   struct Empty {};
-  class ThingAnalyzer : public edm::global::EDAnalyzer<edm::RunCache<Empty>,edm::LuminosityBlockCache<Empty>> {
+  class ThingAnalyzer : public edm::global::EDAnalyzer<edm::RunCache<Empty>, edm::LuminosityBlockCache<Empty>> {
   public:
     ThingAnalyzer(edm::ParameterSet const&);
-    
+
     void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const override final;
     std::shared_ptr<Empty> globalBeginRun(edm::Run const&, edm::EventSetup const&) const override final;
     void globalEndRun(edm::Run const&, edm::EventSetup const&) const override final;
-    std::shared_ptr<Empty> globalBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const override final;
+    std::shared_ptr<Empty> globalBeginLuminosityBlock(edm::LuminosityBlock const&,
+                                                      edm::EventSetup const&) const override final;
     void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const override final;
-    
+
     static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
   private:
     void shouldBeInvalid(edm::Handle<ThingCollection> const&) const;
-    
+
     edm::EDGetTokenT<ThingCollection> beginRun_;
     edm::EDGetTokenT<ThingCollection> beginLumi_;
     edm::EDGetTokenT<ThingCollection> event_;
     edm::EDGetTokenT<ThingCollection> endLumi_;
     edm::EDGetTokenT<ThingCollection> endRun_;
   };
-  
-  ThingAnalyzer::ThingAnalyzer(edm::ParameterSet const& iPSet):
-  beginRun_(consumes<ThingCollection,edm::InRun>(iPSet.getUntrackedParameter<edm::InputTag>("beginRun"))),
-  beginLumi_(consumes<ThingCollection,edm::InLumi>(iPSet.getUntrackedParameter<edm::InputTag>("beginLumi"))),
-  event_(consumes<ThingCollection>(iPSet.getUntrackedParameter<edm::InputTag>("event"))),
-  endLumi_(consumes<ThingCollection,edm::InLumi>(iPSet.getUntrackedParameter<edm::InputTag>("endLumi"))),
-  endRun_(consumes<ThingCollection,edm::InRun>(iPSet.getUntrackedParameter<edm::InputTag>("endRun")))
-  {
-    
-  }
-  
-  void
-  ThingAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
-  {
+
+  ThingAnalyzer::ThingAnalyzer(edm::ParameterSet const& iPSet)
+      : beginRun_(consumes<ThingCollection, edm::InRun>(iPSet.getUntrackedParameter<edm::InputTag>("beginRun"))),
+        beginLumi_(consumes<ThingCollection, edm::InLumi>(iPSet.getUntrackedParameter<edm::InputTag>("beginLumi"))),
+        event_(consumes<ThingCollection>(iPSet.getUntrackedParameter<edm::InputTag>("event"))),
+        endLumi_(consumes<ThingCollection, edm::InLumi>(iPSet.getUntrackedParameter<edm::InputTag>("endLumi"))),
+        endRun_(consumes<ThingCollection, edm::InRun>(iPSet.getUntrackedParameter<edm::InputTag>("endRun"))) {}
+
+  void ThingAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription desc;
-    desc.addUntracked("beginRun",edm::InputTag{"thing","beginRun"})->setComment("Collection to get from Run");
-    desc.addUntracked("beginLumi",edm::InputTag{"thing","beginLumi"})->setComment("Collection to get from Lumi");
-    desc.addUntracked("event",edm::InputTag{"thing",""})->setComment("Collection to get from event");
-    desc.addUntracked("endLumi",edm::InputTag{"thing","endLumi"})->setComment("Collection to get from Lumi but only available at end");
-    desc.addUntracked("endRun",edm::InputTag{"thing","endRun"})->setComment("Collection to get from Run but only available at end");
+    desc.addUntracked("beginRun", edm::InputTag{"thing", "beginRun"})->setComment("Collection to get from Run");
+    desc.addUntracked("beginLumi", edm::InputTag{"thing", "beginLumi"})->setComment("Collection to get from Lumi");
+    desc.addUntracked("event", edm::InputTag{"thing", ""})->setComment("Collection to get from event");
+    desc.addUntracked("endLumi", edm::InputTag{"thing", "endLumi"})
+        ->setComment("Collection to get from Lumi but only available at end");
+    desc.addUntracked("endRun", edm::InputTag{"thing", "endRun"})
+        ->setComment("Collection to get from Run but only available at end");
     descriptions.add("thingAnalyzer", desc);
-
   }
 
-  void
-  ThingAnalyzer::analyze(edm::StreamID, edm::Event const& iEvent, edm::EventSetup const&) const
-  {
+  void ThingAnalyzer::analyze(edm::StreamID, edm::Event const& iEvent, edm::EventSetup const&) const {
     auto const& lumi = iEvent.getLuminosityBlock();
-    
+
     auto const& run = lumi.getRun();
-    
-    (void) run.get(beginRun_);
-    
+
+    (void)run.get(beginRun_);
+
     shouldBeInvalid(run.getHandle(endRun_));
-    
-    (void) lumi.get(beginLumi_);
-    
+
+    (void)lumi.get(beginLumi_);
+
     shouldBeInvalid(lumi.getHandle(endLumi_));
 
-    (void) iEvent.get(event_);
+    (void)iEvent.get(event_);
   }
-  
-  std::shared_ptr<Empty>
-  ThingAnalyzer::globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const
-  {
-    (void) iRun.get(beginRun_);
-    
+
+  std::shared_ptr<Empty> ThingAnalyzer::globalBeginRun(edm::Run const& iRun, edm::EventSetup const&) const {
+    (void)iRun.get(beginRun_);
+
     shouldBeInvalid(iRun.getHandle(endRun_));
-    
+
     return std::shared_ptr<Empty>();
   }
-  
-  void
-  ThingAnalyzer::globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const
-  {
-    (void) iRun.get(beginRun_);
-    
-    (void) iRun.get(endRun_);
+
+  void ThingAnalyzer::globalEndRun(edm::Run const& iRun, edm::EventSetup const&) const {
+    (void)iRun.get(beginRun_);
+
+    (void)iRun.get(endRun_);
   }
-  
-  std::shared_ptr<Empty>
-  ThingAnalyzer::globalBeginLuminosityBlock(edm::LuminosityBlock const&iLumi, edm::EventSetup const&) const
-  {
+
+  std::shared_ptr<Empty> ThingAnalyzer::globalBeginLuminosityBlock(edm::LuminosityBlock const& iLumi,
+                                                                   edm::EventSetup const&) const {
     auto const& run = iLumi.getRun();
-    
-    (void) run.get(beginRun_);
-    
+
+    (void)run.get(beginRun_);
+
     shouldBeInvalid(run.getHandle(endRun_));
 
-    (void) iLumi.get(beginLumi_);
-    
+    (void)iLumi.get(beginLumi_);
+
     shouldBeInvalid(iLumi.getHandle(endLumi_));
-    
+
     return std::shared_ptr<Empty>();
   }
-  
-  void
-  ThingAnalyzer::globalEndLuminosityBlock(edm::LuminosityBlock const& iLumi, edm::EventSetup const&) const
-  {
+
+  void ThingAnalyzer::globalEndLuminosityBlock(edm::LuminosityBlock const& iLumi, edm::EventSetup const&) const {
     auto const& run = iLumi.getRun();
-    
-    (void) run.get(beginRun_);
-    
+
+    (void)run.get(beginRun_);
+
     shouldBeInvalid(run.getHandle(endRun_));
-    
-    (void) iLumi.get(beginLumi_);
-    
-    (void) iLumi.get(endLumi_);
-    
+
+    (void)iLumi.get(beginLumi_);
+
+    (void)iLumi.get(endLumi_);
   }
-  
-  void
-  ThingAnalyzer::shouldBeInvalid(edm::Handle<ThingCollection> const& iHandle) const {
-    if(iHandle.isValid()) {
-      throw cms::Exception("ShouldNotBeValid") <<"handle was valid when it should not have been";
+
+  void ThingAnalyzer::shouldBeInvalid(edm::Handle<ThingCollection> const& iHandle) const {
+    if (iHandle.isValid()) {
+      throw cms::Exception("ShouldNotBeValid") << "handle was valid when it should not have been";
     }
   }
 
-}
+}  // namespace edmtest
 
 DEFINE_FWK_MODULE(edmtest::ThingAnalyzer);
diff --git a/FWCore/Integration/test/ThingExtSource.cc b/FWCore/Integration/test/ThingExtSource.cc
index f62ab39920ed9..1e3f0908bd918 100644
--- a/FWCore/Integration/test/ThingExtSource.cc
+++ b/FWCore/Integration/test/ThingExtSource.cc
@@ -6,8 +6,8 @@
 #include "FWCore/Framework/interface/InputSourceMacros.h"
 
 namespace edmtest {
-  ThingExtSource::ThingExtSource(edm::ParameterSet const& pset, edm::InputSourceDescription const& desc) :
-    ProducerSourceFromFiles(pset, desc, true), alg_() {
+  ThingExtSource::ThingExtSource(edm::ParameterSet const& pset, edm::InputSourceDescription const& desc)
+      : ProducerSourceFromFiles(pset, desc, true), alg_() {
     produces<ThingCollection>();
     produces<ThingCollection, edm::Transition::BeginLuminosityBlock>("beginLumi");
     produces<ThingCollection, edm::Transition::BeginLuminosityBlock>("endLumi");
@@ -16,20 +16,20 @@ namespace edmtest {
   }
 
   // Virtual destructor needed.
-  ThingExtSource::~ThingExtSource() { }  
+  ThingExtSource::~ThingExtSource() {}
 
   // Functions that gets called by framework every event
   bool ThingExtSource::setRunAndEventInfo(edm::EventID&, edm::TimeValue_t&, edm::EventAuxiliary::ExperimentType&) {
     // Fake running out of data.
-    if (event() > 2) return false;
+    if (event() > 2)
+      return false;
     return true;
   }
 
   void ThingExtSource::produce(edm::Event& e) {
+    // Step A: Get Inputs
 
-    // Step A: Get Inputs 
-
-    // Step B: Create empty output 
+    // Step B: Create empty output
     auto result = std::make_unique<ThingCollection>();  //Empty
 
     // Step C: Invoke the algorithm, passing in inputs (NONE) and getting back outputs.
@@ -41,9 +41,9 @@ namespace edmtest {
 
   // Functions that gets called by framework every luminosity block
   void ThingExtSource::beginLuminosityBlock(edm::LuminosityBlock& lb) {
-    // Step A: Get Inputs 
+    // Step A: Get Inputs
 
-    // Step B: Create empty output 
+    // Step B: Create empty output
     auto result = std::make_unique<ThingCollection>();  //Empty
 
     // Step C: Invoke the algorithm, passing in inputs (NONE) and getting back outputs.
@@ -51,14 +51,14 @@ namespace edmtest {
 
     // Step D: Put outputs into lumi block
     lb.put(std::move(result), "beginLumi");
-    
+
     endLuminosityBlock(lb);
   }
 
   void ThingExtSource::endLuminosityBlock(edm::LuminosityBlock& lb) {
-    // Step A: Get Inputs 
+    // Step A: Get Inputs
 
-    // Step B: Create empty output 
+    // Step B: Create empty output
     auto result = std::make_unique<ThingCollection>();  //Empty
 
     // Step C: Invoke the algorithm, passing in inputs (NONE) and getting back outputs.
@@ -70,9 +70,9 @@ namespace edmtest {
 
   // Functions that gets called by framework every run
   void ThingExtSource::beginRun(edm::Run& r) {
-    // Step A: Get Inputs 
+    // Step A: Get Inputs
 
-    // Step B: Create empty output 
+    // Step B: Create empty output
     auto result = std::make_unique<ThingCollection>();  //Empty
 
     // Step C: Invoke the algorithm, passing in inputs (NONE) and getting back outputs.
@@ -80,14 +80,14 @@ namespace edmtest {
 
     // Step D: Put outputs into event
     r.put(std::move(result), "beginRun");
-    
+
     endRun(r);
   }
 
   void ThingExtSource::endRun(edm::Run& r) {
-    // Step A: Get Inputs 
+    // Step A: Get Inputs
 
-    // Step B: Create empty output 
+    // Step B: Create empty output
     auto result = std::make_unique<ThingCollection>();  //Empty
 
     // Step C: Invoke the algorithm, passing in inputs (NONE) and getting back outputs.
@@ -97,14 +97,13 @@ namespace edmtest {
     r.put(std::move(result), "endRun");
   }
 
-  void
-  ThingExtSource::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  void ThingExtSource::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription desc;
     desc.setComment("Creates ThingCollections from a file for testing.");
     edm::ProducerSourceFromFiles::fillDescription(desc);
     descriptions.add("source", desc);
   }
 
-}
+}  // namespace edmtest
 using edmtest::ThingExtSource;
 DEFINE_FWK_INPUT_SOURCE(ThingExtSource);
diff --git a/FWCore/Integration/test/ThingExtSource.h b/FWCore/Integration/test/ThingExtSource.h
index 52a233d2bc843..63849099cbeae 100644
--- a/FWCore/Integration/test/ThingExtSource.h
+++ b/FWCore/Integration/test/ThingExtSource.h
@@ -16,7 +16,6 @@
 namespace edmtest {
   class ThingExtSource : public edm::ProducerSourceFromFiles {
   public:
-
     // The following is not yet used, but will be the primary
     // constructor when the parameter set system is available.
     //
@@ -38,8 +37,8 @@ namespace edmtest {
     //Not called by the framework, only used internally
     void endRun(edm::Run& r);
     void endLuminosityBlock(edm::LuminosityBlock& lb);
-    
+
     ThingAlgorithm alg_;
   };
-}
+}  // namespace edmtest
 #endif
diff --git a/FWCore/Integration/test/ThingProducer.cc b/FWCore/Integration/test/ThingProducer.cc
index 8df7fa462daa0..e7c8264f71e05 100644
--- a/FWCore/Integration/test/ThingProducer.cc
+++ b/FWCore/Integration/test/ThingProducer.cc
@@ -5,97 +5,108 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 namespace edmtest {
-  ThingProducer::ThingProducer(edm::ParameterSet const& iConfig): 
-  alg_(iConfig.getParameter<int>("offsetDelta"), //this really should be tracked, but I want backwards compatibility
-       iConfig.getParameter<int>("nThings")),
-  noPut_(iConfig.getUntrackedParameter<bool>("noPut")) // used for testing with missing products
+  ThingProducer::ThingProducer(edm::ParameterSet const& iConfig)
+      : alg_(iConfig.getParameter<int>(
+                 "offsetDelta"),  //this really should be tracked, but I want backwards compatibility
+             iConfig.getParameter<int>("nThings")),
+        noPut_(iConfig.getUntrackedParameter<bool>("noPut"))  // used for testing with missing products
   {
     evToken_ = produces<ThingCollection>();
     blToken_ = produces<ThingCollection, edm::Transition::BeginLuminosityBlock>("beginLumi");
-    elToken_= produces<ThingCollection, edm::Transition::EndLuminosityBlock>("endLumi");
+    elToken_ = produces<ThingCollection, edm::Transition::EndLuminosityBlock>("endLumi");
     brToken_ = produces<ThingCollection, edm::Transition::BeginRun>("beginRun");
     erToken_ = produces<ThingCollection, edm::Transition::EndRun>("endRun");
   }
 
   // Virtual destructor needed.
-  ThingProducer::~ThingProducer() { }  
+  ThingProducer::~ThingProducer() {}
 
   // Functions that gets called by framework every event
   void ThingProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
-    // Step A: Get Inputs 
+    // Step A: Get Inputs
 
-    // Step B: Create empty output 
+    // Step B: Create empty output
     ThingCollection result;  //Empty
 
     // Step C: Invoke the algorithm, passing in inputs (NONE) and getting back outputs.
     alg_.run(result);
 
     // Step D: Put outputs into event
-    if (!noPut_) e.emplace(evToken_,std::move(result));
+    if (!noPut_)
+      e.emplace(evToken_, std::move(result));
   }
 
   // Functions that gets called by framework every luminosity block
   void ThingProducer::globalBeginLuminosityBlockProduce(edm::LuminosityBlock& lb, edm::EventSetup const&) const {
-    // Step A: Get Inputs 
+    // Step A: Get Inputs
 
-    // Step B: Create empty output 
+    // Step B: Create empty output
     ThingCollection result;  //Empty
 
     // Step C: Invoke the algorithm, passing in inputs (NONE) and getting back outputs.
     alg_.run(result);
 
     // Step D: Put outputs into lumi block
-    if (!noPut_) lb.emplace(blToken_, std::move(result));
+    if (!noPut_)
+      lb.emplace(blToken_, std::move(result));
   }
 
   void ThingProducer::globalEndLuminosityBlockProduce(edm::LuminosityBlock& lb, edm::EventSetup const&) const {
-    // Step A: Get Inputs 
+    // Step A: Get Inputs
 
-    // Step B: Create empty output 
+    // Step B: Create empty output
     ThingCollection result;  //Empty
 
     // Step C: Invoke the algorithm, passing in inputs (NONE) and getting back outputs.
     alg_.run(result);
 
     // Step D: Put outputs into lumi block
-    if (!noPut_) lb.emplace(elToken_,std::move(result));
+    if (!noPut_)
+      lb.emplace(elToken_, std::move(result));
   }
 
   // Functions that gets called by framework every run
   void ThingProducer::globalBeginRunProduce(edm::Run& r, edm::EventSetup const&) const {
-    // Step A: Get Inputs 
+    // Step A: Get Inputs
 
-    // Step B: Create empty output 
+    // Step B: Create empty output
     ThingCollection result;  //Empty
 
     // Step C: Invoke the algorithm, passing in inputs (NONE) and getting back outputs.
     alg_.run(result);
 
     // Step D: Put outputs into event
-    if (!noPut_) r.emplace(brToken_,std::move(result));
+    if (!noPut_)
+      r.emplace(brToken_, std::move(result));
   }
 
   void ThingProducer::globalEndRunProduce(edm::Run& r, edm::EventSetup const&) const {
-    // Step A: Get Inputs 
+    // Step A: Get Inputs
 
-    // Step B: Create empty output 
+    // Step B: Create empty output
     ThingCollection result;  //Empty
 
     // Step C: Invoke the algorithm, passing in inputs (NONE) and getting back outputs.
     alg_.run(result);
 
     // Step D: Put outputs into event
-    if (!noPut_) r.emplace(erToken_,std::move(result));
+    if (!noPut_)
+      r.emplace(erToken_, std::move(result));
   }
 
   void ThingProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription desc;
-    desc.add<int>("offsetDelta",0)->setComment("How much extra to increment the value used when creating Things for a new container. E.g. the last value used to create Thing from the previous event is incremented by 'offsetDelta' to compute the value to use of the first Thing created in the next Event.");
-    desc.add<int>("nThings",20)->setComment("How many Things to put in each collection");
-    desc.addUntracked<bool>("noPut",false)->setComment("If true, data is not put into the Principal. This is used to test missing products.");
+    desc.add<int>("offsetDelta", 0)
+        ->setComment(
+            "How much extra to increment the value used when creating Things for a new container. E.g. the last value "
+            "used to create Thing from the previous event is incremented by 'offsetDelta' to compute the value to use "
+            "of the first Thing created in the next Event.");
+    desc.add<int>("nThings", 20)->setComment("How many Things to put in each collection");
+    desc.addUntracked<bool>("noPut", false)
+        ->setComment("If true, data is not put into the Principal. This is used to test missing products.");
     descriptions.add("thingProd", desc);
   }
 
-}
+}  // namespace edmtest
 using edmtest::ThingProducer;
 DEFINE_FWK_MODULE(ThingProducer);
diff --git a/FWCore/Integration/test/ThingProducer.h b/FWCore/Integration/test/ThingProducer.h
index c7b16e10d350b..f364f8ce1c8dd 100644
--- a/FWCore/Integration/test/ThingProducer.h
+++ b/FWCore/Integration/test/ThingProducer.h
@@ -15,14 +15,12 @@
 
 #include "DataFormats/TestObjects/interface/ThingCollection.h"
 
-
 namespace edmtest {
   class ThingProducer : public edm::global::EDProducer<edm::BeginRunProducer,
-  edm::EndRunProducer,
-  edm::EndLuminosityBlockProducer,
-  edm::BeginLuminosityBlockProducer> {
+                                                       edm::EndRunProducer,
+                                                       edm::EndLuminosityBlockProducer,
+                                                       edm::BeginLuminosityBlockProducer> {
   public:
-
     explicit ThingProducer(edm::ParameterSet const& ps);
 
     ~ThingProducer() override;
@@ -48,5 +46,5 @@ namespace edmtest {
     edm::EDPutTokenT<ThingCollection> elToken_;
     bool noPut_;
   };
-}
+}  // namespace edmtest
 #endif
diff --git a/FWCore/Integration/test/ThingSource.cc b/FWCore/Integration/test/ThingSource.cc
index 60d64c29d3008..31b92b683c9b4 100644
--- a/FWCore/Integration/test/ThingSource.cc
+++ b/FWCore/Integration/test/ThingSource.cc
@@ -6,8 +6,8 @@
 #include "FWCore/Framework/interface/InputSourceMacros.h"
 
 namespace edmtest {
-  ThingSource::ThingSource(edm::ParameterSet const& pset, edm::InputSourceDescription const& desc) :
-    ProducerSourceBase(pset, desc, false), alg_() {
+  ThingSource::ThingSource(edm::ParameterSet const& pset, edm::InputSourceDescription const& desc)
+      : ProducerSourceBase(pset, desc, false), alg_() {
     produces<ThingCollection>();
     produces<ThingCollection, edm::Transition::BeginLuminosityBlock>("beginLumi");
     produces<ThingCollection, edm::Transition::BeginLuminosityBlock>("endLumi");
@@ -16,13 +16,13 @@ namespace edmtest {
   }
 
   // Virtual destructor needed.
-  ThingSource::~ThingSource() { }  
+  ThingSource::~ThingSource() {}
 
   // Functions that gets called by framework every event
   void ThingSource::produce(edm::Event& e) {
-    // Step A: Get Inputs 
+    // Step A: Get Inputs
 
-    // Step B: Create empty output 
+    // Step B: Create empty output
     auto result = std::make_unique<ThingCollection>();  //Empty
 
     // Step C: Invoke the algorithm, passing in inputs (NONE) and getting back outputs.
@@ -34,9 +34,9 @@ namespace edmtest {
 
   // Functions that gets called by framework every luminosity block
   void ThingSource::beginLuminosityBlock(edm::LuminosityBlock& lb) {
-    // Step A: Get Inputs 
+    // Step A: Get Inputs
 
-    // Step B: Create empty output 
+    // Step B: Create empty output
     auto result = std::make_unique<ThingCollection>();  //Empty
 
     // Step C: Invoke the algorithm, passing in inputs (NONE) and getting back outputs.
@@ -44,14 +44,14 @@ namespace edmtest {
 
     // Step D: Put outputs into lumi block
     lb.put(std::move(result), "beginLumi");
-    
+
     endLuminosityBlock(lb);
   }
 
   void ThingSource::endLuminosityBlock(edm::LuminosityBlock& lb) {
-    // Step A: Get Inputs 
+    // Step A: Get Inputs
 
-    // Step B: Create empty output 
+    // Step B: Create empty output
     auto result = std::make_unique<ThingCollection>();  //Empty
 
     // Step C: Invoke the algorithm, passing in inputs (NONE) and getting back outputs.
@@ -63,9 +63,9 @@ namespace edmtest {
 
   // Functions that gets called by framework every run
   void ThingSource::beginRun(edm::Run& r) {
-    // Step A: Get Inputs 
+    // Step A: Get Inputs
 
-    // Step B: Create empty output 
+    // Step B: Create empty output
     auto result = std::make_unique<ThingCollection>();  //Empty
 
     // Step C: Invoke the algorithm, passing in inputs (NONE) and getting back outputs.
@@ -73,14 +73,14 @@ namespace edmtest {
 
     // Step D: Put outputs into event
     r.put(std::move(result), "beginRun");
-    
+
     endRun(r);
   }
 
   void ThingSource::endRun(edm::Run& r) {
-    // Step A: Get Inputs 
+    // Step A: Get Inputs
 
-    // Step B: Create empty output 
+    // Step B: Create empty output
     auto result = std::make_unique<ThingCollection>();  //Empty
 
     // Step C: Invoke the algorithm, passing in inputs (NONE) and getting back outputs.
@@ -90,15 +90,13 @@ namespace edmtest {
     r.put(std::move(result), "endRun");
   }
 
-
-  void
-  ThingSource::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  void ThingSource::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription desc;
     desc.setComment("Creates ThingCollections for testing.");
     edm::ProducerSourceBase::fillDescription(desc);
     descriptions.add("source", desc);
   }
 
-}
+}  // namespace edmtest
 using edmtest::ThingSource;
 DEFINE_FWK_INPUT_SOURCE(ThingSource);
diff --git a/FWCore/Integration/test/ThingSource.h b/FWCore/Integration/test/ThingSource.h
index f503c3b2a1201..c699afb26f869 100644
--- a/FWCore/Integration/test/ThingSource.h
+++ b/FWCore/Integration/test/ThingSource.h
@@ -16,7 +16,6 @@
 namespace edmtest {
   class ThingSource : public edm::ProducerSourceBase {
   public:
-
     // The following is not yet used, but will be the primary
     // constructor when the parameter set system is available.
     //
@@ -24,7 +23,9 @@ namespace edmtest {
 
     ~ThingSource() override;
 
-    bool setRunAndEventInfo(edm::EventID&, edm::TimeValue_t&, edm::EventAuxiliary::ExperimentType&) override {return true;}
+    bool setRunAndEventInfo(edm::EventID&, edm::TimeValue_t&, edm::EventAuxiliary::ExperimentType&) override {
+      return true;
+    }
 
     void produce(edm::Event& e) override;
 
@@ -38,8 +39,8 @@ namespace edmtest {
     //called internally, not by the framework
     void endRun(edm::Run& r);
     void endLuminosityBlock(edm::LuminosityBlock& lb);
-    
+
     ThingAlgorithm alg_;
   };
-}
+}  // namespace edmtest
 #endif
diff --git a/FWCore/Integration/test/ThingWithMergeProducer.cc b/FWCore/Integration/test/ThingWithMergeProducer.cc
index 41eba02a9e82e..0790fc3128924 100644
--- a/FWCore/Integration/test/ThingWithMergeProducer.cc
+++ b/FWCore/Integration/test/ThingWithMergeProducer.cc
@@ -20,11 +20,10 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 namespace edmtest {
-  ThingWithMergeProducer::ThingWithMergeProducer(edm::ParameterSet const& pset) :
-    changeIsEqualValue_(pset.getUntrackedParameter<bool>("changeIsEqualValue", false)),
-    labelsToGet_(pset.getUntrackedParameter<std::vector<std::string>>("labelsToGet", std::vector<std::string>())),
-    noPut_(pset.getUntrackedParameter<bool>("noPut", false))
-{
+  ThingWithMergeProducer::ThingWithMergeProducer(edm::ParameterSet const& pset)
+      : changeIsEqualValue_(pset.getUntrackedParameter<bool>("changeIsEqualValue", false)),
+        labelsToGet_(pset.getUntrackedParameter<std::vector<std::string>>("labelsToGet", std::vector<std::string>())),
+        noPut_(pset.getUntrackedParameter<bool>("noPut", false)) {
     produces<Thing>("event");
     produces<Thing, edm::Transition::BeginLuminosityBlock>("beginLumi");
     produces<Thing, edm::Transition::EndLuminosityBlock>("endLumi");
@@ -44,19 +43,18 @@ namespace edmtest {
     produces<ThingWithIsEqual, edm::Transition::EndRun>("endRun");
 
     const std::string s_prod("PROD");
-    for(auto const& label: labelsToGet_) {
-      consumes<Thing>(edm::InputTag(label,"event",s_prod));
-      consumes<Thing,edm::InLumi>(edm::InputTag(label,"beginLumi",s_prod));
-      consumes<Thing,edm::InLumi>(edm::InputTag(label,"endLumi",s_prod));
-      consumes<Thing,edm::InRun>(edm::InputTag(label,"beginRun",s_prod));
-      consumes<Thing,edm::InRun>(edm::InputTag(label,"endRun",s_prod));
+    for (auto const& label : labelsToGet_) {
+      consumes<Thing>(edm::InputTag(label, "event", s_prod));
+      consumes<Thing, edm::InLumi>(edm::InputTag(label, "beginLumi", s_prod));
+      consumes<Thing, edm::InLumi>(edm::InputTag(label, "endLumi", s_prod));
+      consumes<Thing, edm::InRun>(edm::InputTag(label, "beginRun", s_prod));
+      consumes<Thing, edm::InRun>(edm::InputTag(label, "endRun", s_prod));
     }
   }
 
-  ThingWithMergeProducer::~ThingWithMergeProducer() {}  
+  ThingWithMergeProducer::~ThingWithMergeProducer() {}
 
   void ThingWithMergeProducer::produce(edm::Event& e, edm::EventSetup const&) {
-
     // The purpose of this first getByLabel call is to cause the products
     // that are "put" below to have a parent so we can do tests with the
     // parentage provenance.
@@ -68,114 +66,125 @@ namespace edmtest {
 
     auto result = std::make_unique<Thing>();
     result->a = 11;
-    if (!noPut_) e.put(std::move(result), std::string("event"));
+    if (!noPut_)
+      e.put(std::move(result), std::string("event"));
 
     auto result2 = std::make_unique<ThingWithMerge>();
     result2->a = 12;
-    if (!noPut_) e.put(std::move(result2), std::string("event"));
+    if (!noPut_)
+      e.put(std::move(result2), std::string("event"));
 
     auto result3 = std::make_unique<ThingWithIsEqual>();
     result3->a = 13;
-    if (changeIsEqualValue_) result3->a = 14;
-    if (!noPut_) e.put(std::move(result3), std::string("event"));
+    if (changeIsEqualValue_)
+      result3->a = 14;
+    if (!noPut_)
+      e.put(std::move(result3), std::string("event"));
   }
 
   void ThingWithMergeProducer::beginLuminosityBlockProduce(edm::LuminosityBlock& lb, edm::EventSetup const&) {
-
     auto result = std::make_unique<Thing>();
     result->a = 101;
-    if (!noPut_) lb.put(std::move(result), "beginLumi");
+    if (!noPut_)
+      lb.put(std::move(result), "beginLumi");
 
     auto result2 = std::make_unique<ThingWithMerge>();
     result2->a = 102;
-    if (!noPut_) lb.put(std::move(result2), "beginLumi");
+    if (!noPut_)
+      lb.put(std::move(result2), "beginLumi");
 
     auto result3 = std::make_unique<ThingWithIsEqual>();
     result3->a = 103;
-    if (changeIsEqualValue_) result3->a = 104;
-    if (!noPut_) lb.put(std::move(result3), "beginLumi");
+    if (changeIsEqualValue_)
+      result3->a = 104;
+    if (!noPut_)
+      lb.put(std::move(result3), "beginLumi");
   }
 
   void ThingWithMergeProducer::endLuminosityBlockProduce(edm::LuminosityBlock& lb, edm::EventSetup const&) {
-
     auto result = std::make_unique<Thing>();
     result->a = 1001;
-    if (!noPut_) lb.put(std::move(result), "endLumi");
+    if (!noPut_)
+      lb.put(std::move(result), "endLumi");
 
     auto result2 = std::make_unique<ThingWithMerge>();
     result2->a = 1002;
-    if (!noPut_) lb.put(std::move(result2), "endLumi");
+    if (!noPut_)
+      lb.put(std::move(result2), "endLumi");
 
     auto result3 = std::make_unique<ThingWithIsEqual>();
     result3->a = 1003;
-    if (changeIsEqualValue_) result3->a = 1004;
-    if (!noPut_) lb.put(std::move(result3), "endLumi");
+    if (changeIsEqualValue_)
+      result3->a = 1004;
+    if (!noPut_)
+      lb.put(std::move(result3), "endLumi");
   }
 
   // Functions that gets called by framework every run
   void ThingWithMergeProducer::beginRunProduce(edm::Run& r, edm::EventSetup const&) {
-
     auto result = std::make_unique<Thing>();
     result->a = 10001;
-    if (!noPut_) r.put(std::move(result), "beginRun");
+    if (!noPut_)
+      r.put(std::move(result), "beginRun");
 
     auto result2 = std::make_unique<ThingWithMerge>();
     result2->a = 10002;
-    if (!noPut_) r.put(std::move(result2), "beginRun");
+    if (!noPut_)
+      r.put(std::move(result2), "beginRun");
 
     auto result3 = std::make_unique<ThingWithIsEqual>();
     result3->a = 10003;
-    if (changeIsEqualValue_) result3->a = 10004;
-    if (!noPut_) r.put(std::move(result3), "beginRun");
+    if (changeIsEqualValue_)
+      result3->a = 10004;
+    if (!noPut_)
+      r.put(std::move(result3), "beginRun");
   }
 
   void ThingWithMergeProducer::endRunProduce(edm::Run& r, edm::EventSetup const&) {
-
     auto result = std::make_unique<Thing>();
     result->a = 100001;
-    if (!noPut_) r.put(std::move(result), "endRun");
+    if (!noPut_)
+      r.put(std::move(result), "endRun");
 
     auto result2 = std::make_unique<ThingWithMerge>();
     result2->a = 100002;
-    if (!noPut_) r.put(std::move(result2), "endRun");
+    if (!noPut_)
+      r.put(std::move(result2), "endRun");
 
     auto result3 = std::make_unique<ThingWithIsEqual>();
     result3->a = 100003;
-    if (changeIsEqualValue_) result3->a = 100004;
-    if (!noPut_) r.put(std::move(result3), "endRun");
+    if (changeIsEqualValue_)
+      result3->a = 100004;
+    if (!noPut_)
+      r.put(std::move(result3), "endRun");
   }
 
   void ThingWithMergeProducer::beginLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const&) {
-    
     for (Iter iter = labelsToGet_.begin(), ie = labelsToGet_.end(); iter != ie; ++iter) {
       edm::Handle<Thing> h;
       edm::InputTag tag(*iter, "beginLumi", "PROD");
       lb.getByLabel(tag, h);
     }
   }
-  
+
   void ThingWithMergeProducer::endLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const&) {
-    
     for (Iter iter = labelsToGet_.begin(), ie = labelsToGet_.end(); iter != ie; ++iter) {
       edm::Handle<Thing> h;
       edm::InputTag tag(*iter, "endLumi", "PROD");
       lb.getByLabel(tag, h);
     }
-    
   }
-  
+
   // Functions that gets called by framework every run
   void ThingWithMergeProducer::beginRun(edm::Run const& r, edm::EventSetup const&) {
-    
     for (Iter iter = labelsToGet_.begin(), ie = labelsToGet_.end(); iter != ie; ++iter) {
       edm::Handle<Thing> h;
       edm::InputTag tag(*iter, "beginRun", "PROD");
       r.getByLabel(tag, h);
     }
   }
-  
+
   void ThingWithMergeProducer::endRun(edm::Run const& r, edm::EventSetup const&) {
-    
     for (Iter iter = labelsToGet_.begin(), ie = labelsToGet_.end(); iter != ie; ++iter) {
       edm::Handle<Thing> h;
       edm::InputTag tag(*iter, "endRun", "PROD");
@@ -191,6 +200,6 @@ namespace edmtest {
     descriptions.add("thingWithMergeProducer", desc);
   }
 
-}
+}  // namespace edmtest
 using edmtest::ThingWithMergeProducer;
 DEFINE_FWK_MODULE(ThingWithMergeProducer);
diff --git a/FWCore/Integration/test/ThingWithMergeProducer.h b/FWCore/Integration/test/ThingWithMergeProducer.h
index 5942e2f9000e2..6f4cb53652b89 100644
--- a/FWCore/Integration/test/ThingWithMergeProducer.h
+++ b/FWCore/Integration/test/ThingWithMergeProducer.h
@@ -9,13 +9,12 @@
 
 namespace edmtest {
   class ThingWithMergeProducer : public edm::one::EDProducer<edm::EndRunProducer,
-  edm::BeginRunProducer,
-  edm::BeginLuminosityBlockProducer,
-  edm::EndLuminosityBlockProducer,
-  edm::one::WatchRuns,
-  edm::one::WatchLuminosityBlocks> {
+                                                             edm::BeginRunProducer,
+                                                             edm::BeginLuminosityBlockProducer,
+                                                             edm::EndLuminosityBlockProducer,
+                                                             edm::one::WatchRuns,
+                                                             edm::one::WatchLuminosityBlocks> {
   public:
-
     explicit ThingWithMergeProducer(edm::ParameterSet const& ps);
 
     virtual ~ThingWithMergeProducer();
@@ -30,24 +29,23 @@ namespace edmtest {
 
     void endLuminosityBlock(edm::LuminosityBlock const& lb, edm::EventSetup const& c) override;
 
-
     void beginRunProduce(edm::Run& r, edm::EventSetup const& c) override;
-    
+
     void endRunProduce(edm::Run& r, edm::EventSetup const& c) override;
-    
+
     void beginLuminosityBlockProduce(edm::LuminosityBlock& lb, edm::EventSetup const& c) override;
-    
+
     void endLuminosityBlockProduce(edm::LuminosityBlock& lb, edm::EventSetup const& c) override;
 
     static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-  private:
 
+  private:
     typedef std::vector<std::string>::const_iterator Iter;
 
     bool changeIsEqualValue_;
     std::vector<std::string> labelsToGet_;
     bool noPut_;
   };
-}
+}  // namespace edmtest
 
 #endif
diff --git a/FWCore/Integration/test/ThinningTestAnalyzer.cc b/FWCore/Integration/test/ThinningTestAnalyzer.cc
index c8f3f24a02370..160dc50a097ce 100644
--- a/FWCore/Integration/test/ThinningTestAnalyzer.cc
+++ b/FWCore/Integration/test/ThinningTestAnalyzer.cc
@@ -22,17 +22,15 @@ namespace edmtest {
 
   class ThinningTestAnalyzer : public edm::EDAnalyzer {
   public:
-
     explicit ThinningTestAnalyzer(edm::ParameterSet const& pset);
 
     virtual ~ThinningTestAnalyzer() {}
 
-    static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
+    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
     virtual void analyze(edm::Event const& e, edm::EventSetup const& c) override;
 
   private:
-
     void incrementExpectedValue(std::vector<int>::const_iterator& iter) const;
 
     edm::EDGetTokenT<ThingCollection> parentToken_;
@@ -56,22 +54,22 @@ namespace edmtest {
     associationToken_ = mayConsume<edm::ThinnedAssociation>(pset.getParameter<edm::InputTag>("associationTag"));
     trackToken_ = consumes<TrackOfThingsCollection>(pset.getParameter<edm::InputTag>("trackTag"));
     parentWasDropped_ = pset.getParameter<bool>("parentWasDropped");
-    if(!parentWasDropped_) {
+    if (!parentWasDropped_) {
       expectedParentContent_ = pset.getParameter<std::vector<int> >("expectedParentContent");
     }
     thinnedWasDropped_ = pset.getParameter<bool>("thinnedWasDropped");
     thinnedIsAlias_ = pset.getParameter<bool>("thinnedIsAlias");
-    if(!thinnedWasDropped_) {
+    if (!thinnedWasDropped_) {
       expectedThinnedContent_ = pset.getParameter<std::vector<int> >("expectedThinnedContent");
     }
     associationShouldBeDropped_ = pset.getParameter<bool>("associationShouldBeDropped");
-    if(!associationShouldBeDropped_) {
+    if (!associationShouldBeDropped_) {
       expectedIndexesIntoParent_ = pset.getParameter<std::vector<unsigned int> >("expectedIndexesIntoParent");
     }
     expectedValues_ = pset.getParameter<std::vector<int> >("expectedValues");
   }
 
-  void ThinningTestAnalyzer::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
+  void ThinningTestAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription desc;
     desc.add<edm::InputTag>("parentTag");
     desc.add<edm::InputTag>("thinnedTag");
@@ -91,7 +89,6 @@ namespace edmtest {
   }
 
   void ThinningTestAnalyzer::analyze(edm::Event const& event, edm::EventSetup const&) {
-
     edm::Handle<ThingCollection> parentCollection = event.getHandle(parentToken_);
 
     edm::Handle<ThingCollection> thinnedCollection = event.getHandle(thinnedToken_);
@@ -101,19 +98,19 @@ namespace edmtest {
     edm::Handle<TrackOfThingsCollection> trackCollection = event.getHandle(trackToken_);
 
     unsigned int i = 0;
-    if(parentWasDropped_) {
-      if(parentCollection.isValid()) {
+    if (parentWasDropped_) {
+      if (parentCollection.isValid()) {
         throw cms::Exception("TestFailure") << "parent collection present, should have been dropped";
       }
-    } else if(!expectedParentContent_.empty()) {
-      if(parentCollection->size() != expectedParentContent_.size()) {
+    } else if (!expectedParentContent_.empty()) {
+      if (parentCollection->size() != expectedParentContent_.size()) {
         throw cms::Exception("TestFailure") << "parent collection has unexpected size";
       }
-      for(auto const& thing : *parentCollection) {
+      for (auto const& thing : *parentCollection) {
         // Just some numbers that match the somewhat arbitrary values put in
         // by the ThingProducer.
         int expected = static_cast<int>(expectedParentContent_.at(i) + event.eventAuxiliary().event() * 100 + 100);
-        if(thing.a != expected) {
+        if (thing.a != expected) {
           throw cms::Exception("TestFailure") << "parent collection has unexpected content";
         }
         ++i;
@@ -123,155 +120,145 @@ namespace edmtest {
     // Check to see the content is what we expect based on what was written
     // by ThingProducer and TrackOfThingsProducer. The values are somewhat
     // arbitrary and meaningless.
-    if(thinnedWasDropped_) {
-      if(thinnedCollection.isValid()) {
+    if (thinnedWasDropped_) {
+      if (thinnedCollection.isValid()) {
         throw cms::Exception("TestFailure") << "thinned collection present, should have been dropped";
       }
     } else {
       unsigned expectedIndex = 0;
-      if(thinnedCollection->size() != expectedThinnedContent_.size()) {
+      if (thinnedCollection->size() != expectedThinnedContent_.size()) {
         throw cms::Exception("TestFailure") << "thinned collection has unexpected size";
       }
-      for(auto const& thing : *thinnedCollection) {
-        if(thing.a != static_cast<int>(expectedThinnedContent_.at(expectedIndex) + event.eventAuxiliary().event() * 100 + 100)) {
+      for (auto const& thing : *thinnedCollection) {
+        if (thing.a !=
+            static_cast<int>(expectedThinnedContent_.at(expectedIndex) + event.eventAuxiliary().event() * 100 + 100)) {
           throw cms::Exception("TestFailure") << "thinned collection has unexpected content";
         }
         ++expectedIndex;
       }
     }
 
-    if(associationShouldBeDropped_ && associationCollection.isValid()) {
+    if (associationShouldBeDropped_ && associationCollection.isValid()) {
       throw cms::Exception("TestFailure") << "association collection should have been dropped but was not";
     }
-    if(!associationShouldBeDropped_) {
+    if (!associationShouldBeDropped_) {
       unsigned int expectedIndex = 0;
-      if(associationCollection->indexesIntoParent().size() != expectedIndexesIntoParent_.size()) {
+      if (associationCollection->indexesIntoParent().size() != expectedIndexesIntoParent_.size()) {
         throw cms::Exception("TestFailure") << "association collection has unexpected size";
       }
-      for(auto const& association : associationCollection->indexesIntoParent()) {
-        if(association != expectedIndexesIntoParent_.at(expectedIndex)) {
+      for (auto const& association : associationCollection->indexesIntoParent()) {
+        if (association != expectedIndexesIntoParent_.at(expectedIndex)) {
           throw cms::Exception("TestFailure") << "association collection has unexpected content";
         }
         ++expectedIndex;
       }
     }
 
-    if(!parentWasDropped_ && !associationShouldBeDropped_) {
-      if(associationCollection->parentCollectionID() != parentCollection.id()) {
+    if (!parentWasDropped_ && !associationShouldBeDropped_) {
+      if (associationCollection->parentCollectionID() != parentCollection.id()) {
         throw cms::Exception("TestFailure") << "analyze parent ProductID is not correct";
       }
     }
 
-    if(!thinnedWasDropped_ && !associationShouldBeDropped_) {
-      if(associationCollection->thinnedCollectionID() != thinnedCollection.id()) {
+    if (!thinnedWasDropped_ && !associationShouldBeDropped_) {
+      if (associationCollection->thinnedCollectionID() != thinnedCollection.id()) {
         throw cms::Exception("TestFailure") << "analyze thinned ProductID is not correct";
       }
     }
 
-    if(trackCollection->size() != 5u) {
+    if (trackCollection->size() != 5u) {
       throw cms::Exception("TestFailure") << "unexpected Track size";
     }
 
     int eventOffset = static_cast<int>(event.eventAuxiliary().event() * 100 + 100);
 
     std::vector<int>::const_iterator expectedValue = expectedValues_.begin();
-    for(auto const& track : *trackCollection) {
-
-      if(*expectedValue == -1) {
-        if(track.ref1.isAvailable()) {
+    for (auto const& track : *trackCollection) {
+      if (*expectedValue == -1) {
+        if (track.ref1.isAvailable()) {
           throw cms::Exception("TestFailure") << "ref1 is available when it should not be";
         }
       } else {
-        if(!track.ref1.isAvailable()) {
+        if (!track.ref1.isAvailable()) {
           throw cms::Exception("TestFailure") << "ref1 is not available when it should be";
         }
         // Check twice to test some possible caching problems.
-        if(track.ref1->a !=
-           *expectedValue + eventOffset) {
+        if (track.ref1->a != *expectedValue + eventOffset) {
           throw cms::Exception("TestFailure") << "Unexpected values from ref1";
         }
-        if(track.ref1->a !=
-           *expectedValue + eventOffset) {
+        if (track.ref1->a != *expectedValue + eventOffset) {
           throw cms::Exception("TestFailure") << "Unexpected values from ref1 (2nd try)";
         }
       }
 
-      if(*expectedValue == -1) {
-        if(track.refToBase1.isAvailable()) {
+      if (*expectedValue == -1) {
+        if (track.refToBase1.isAvailable()) {
           throw cms::Exception("TestFailure") << "refToBase1 is available when it should not be";
         }
       } else {
-        if(!track.refToBase1.isAvailable()) {
+        if (!track.refToBase1.isAvailable()) {
           throw cms::Exception("TestFailure") << "refToBase1 is not available when it should be";
         }
 
         // Check twice to test some possible caching problems.
-        if(track.refToBase1->a !=
-           *expectedValue + eventOffset) {
+        if (track.refToBase1->a != *expectedValue + eventOffset) {
           throw cms::Exception("TestFailure") << "unexpected values from refToBase1";
         }
-        if(track.refToBase1->a !=
-           *expectedValue + eventOffset) {
+        if (track.refToBase1->a != *expectedValue + eventOffset) {
           throw cms::Exception("TestFailure") << "unexpected values from refToBase1";
         }
       }
       incrementExpectedValue(expectedValue);
 
-      if(*expectedValue == -1) {
-        if(track.ref2.isAvailable()) {
+      if (*expectedValue == -1) {
+        if (track.ref2.isAvailable()) {
           throw cms::Exception("TestFailure") << "ref2 is available when it should not be";
         }
       } else {
-        if(!track.ref2.isAvailable()) {
+        if (!track.ref2.isAvailable()) {
           throw cms::Exception("TestFailure") << "ref2 is not available when it should be";
         }
 
-        if(track.ref2->a !=
-           *expectedValue + eventOffset) {
+        if (track.ref2->a != *expectedValue + eventOffset) {
           throw cms::Exception("TestFailure") << "unexpected values from ref2";
         }
-        if(track.ref2->a !=
-           *expectedValue + eventOffset) {
-          throw cms::Exception("TestFailure") <<  "unexpected values from ref2";
+        if (track.ref2->a != *expectedValue + eventOffset) {
+          throw cms::Exception("TestFailure") << "unexpected values from ref2";
         }
       }
       incrementExpectedValue(expectedValue);
 
-      if(*expectedValue == -1) {
-        if(track.ptr1.isAvailable()) {
+      if (*expectedValue == -1) {
+        if (track.ptr1.isAvailable()) {
           throw cms::Exception("TestFailure") << "ptr1 is available when it should not be";
         }
       } else {
-        if(!track.ptr1.isAvailable()) {
+        if (!track.ptr1.isAvailable()) {
           throw cms::Exception("TestFailure") << "ptr1 is not available when it should be";
         }
 
-        if(track.ptr1->a !=
-           *expectedValue + eventOffset) {
+        if (track.ptr1->a != *expectedValue + eventOffset) {
           throw cms::Exception("TestFailure") << "unexpected values from ptr1";
         }
-        if(track.ptr1->a !=
-          *expectedValue + eventOffset) {
+        if (track.ptr1->a != *expectedValue + eventOffset) {
           throw cms::Exception("TestFailure") << "unexpected values from ptr1 (2)";
         }
       }
       incrementExpectedValue(expectedValue);
 
-      if(*expectedValue == -1) {
-        if(track.ptr2.isAvailable()) {
+      if (*expectedValue == -1) {
+        if (track.ptr2.isAvailable()) {
           throw cms::Exception("TestFailure") << "ptr2 is available when it should not be";
         }
       } else {
-        if(!track.ptr2.isAvailable()) {
+        if (!track.ptr2.isAvailable()) {
           throw cms::Exception("TestFailure") << "ptr2 is not available when it should be";
         }
 
-        if(track.ptr2->a !=
-           *expectedValue + eventOffset) {
+        if (track.ptr2->a != *expectedValue + eventOffset) {
           throw cms::Exception("TestFailure") << "unexpected values from ptr2";
         }
-        if(track.ptr2->a !=
-           *expectedValue + eventOffset) {
+        if (track.ptr2->a != *expectedValue + eventOffset) {
           throw cms::Exception("TestFailure") << " unexpected values from ptr2";
         }
       }
@@ -280,16 +267,15 @@ namespace edmtest {
       // Test RefVector, PtrVector, and RefToBaseVector
       unsigned int k = 0;
       bool allPresent = true;
-      for(auto iExpectedValue : expectedValues_) {
-
-        if(iExpectedValue != -1) {
-          if(track.refVector1[k]->a != iExpectedValue + eventOffset) {
+      for (auto iExpectedValue : expectedValues_) {
+        if (iExpectedValue != -1) {
+          if (track.refVector1[k]->a != iExpectedValue + eventOffset) {
             throw cms::Exception("TestFailure") << "unexpected values from refVector1";
           }
-          if(track.ptrVector1[k]->a != iExpectedValue + eventOffset) {
+          if (track.ptrVector1[k]->a != iExpectedValue + eventOffset) {
             throw cms::Exception("TestFailure") << "unexpected values from ptrVector1";
           }
-          if(track.refToBaseVector1[k]->a != iExpectedValue + eventOffset) {
+          if (track.refToBaseVector1[k]->a != iExpectedValue + eventOffset) {
             throw cms::Exception("TestFailure") << "unexpected values from refToBaseVector1";
           }
         } else {
@@ -298,37 +284,37 @@ namespace edmtest {
         ++k;
       }
 
-      if(allPresent) {
-        if(!track.refVector1.isAvailable()) {
+      if (allPresent) {
+        if (!track.refVector1.isAvailable()) {
           throw cms::Exception("TestFailure") << "unexpected value (false) from refVector::isAvailable";
         }
-        if(!track.ptrVector1.isAvailable()) {
+        if (!track.ptrVector1.isAvailable()) {
           throw cms::Exception("TestFailure") << "unexpected value (false) from ptrVector::isAvailable";
         }
-        if(!track.refToBaseVector1.isAvailable()) {
+        if (!track.refToBaseVector1.isAvailable()) {
           throw cms::Exception("TestFailure") << "unexpected value (false) from refToBaseVector::isAvailable";
         }
       } else {
-        if(track.refVector1.isAvailable()) {
+        if (track.refVector1.isAvailable()) {
           throw cms::Exception("TestFailure") << "unexpected value (true) from refVector::isAvailable";
         }
-        if(track.ptrVector1.isAvailable()) {
+        if (track.ptrVector1.isAvailable()) {
           throw cms::Exception("TestFailure") << "unexpected value (true) from ptrVector::isAvailable";
         }
-        if(track.refToBaseVector1.isAvailable()) {
+        if (track.refToBaseVector1.isAvailable()) {
           throw cms::Exception("TestFailure") << "unexpected value (true) from refToBaseVector::isAvailable";
         }
       }
       k = 0;
-      for(auto iExpectedValue : expectedValues_) {
-        if(iExpectedValue != -1) {
-          if(track.refVector1[k]->a != iExpectedValue + eventOffset) {
+      for (auto iExpectedValue : expectedValues_) {
+        if (iExpectedValue != -1) {
+          if (track.refVector1[k]->a != iExpectedValue + eventOffset) {
             throw cms::Exception("TestFailure") << "unexpected values from refVector1";
           }
-          if(track.ptrVector1[k]->a != iExpectedValue + eventOffset) {
+          if (track.ptrVector1[k]->a != iExpectedValue + eventOffset) {
             throw cms::Exception("TestFailure") << "unexpected values from ptrVector1";
           }
-          if(track.refToBaseVector1[k]->a != iExpectedValue + eventOffset) {
+          if (track.refToBaseVector1[k]->a != iExpectedValue + eventOffset) {
             throw cms::Exception("TestFailure") << "unexpected values from refToBaseVector1";
           }
         } else {
@@ -341,8 +327,9 @@ namespace edmtest {
 
   void ThinningTestAnalyzer::incrementExpectedValue(std::vector<int>::const_iterator& iter) const {
     ++iter;
-    if(iter == expectedValues_.end()) iter = expectedValues_.begin();
+    if (iter == expectedValues_.end())
+      iter = expectedValues_.begin();
   }
-}
+}  // namespace edmtest
 using edmtest::ThinningTestAnalyzer;
 DEFINE_FWK_MODULE(ThinningTestAnalyzer);
diff --git a/FWCore/Integration/test/ThinningThingProducer.cc b/FWCore/Integration/test/ThinningThingProducer.cc
index fc832d46d716c..35907ca4ff520 100644
--- a/FWCore/Integration/test/ThinningThingProducer.cc
+++ b/FWCore/Integration/test/ThinningThingProducer.cc
@@ -28,14 +28,13 @@ namespace edmtest {
 
   class ThinningThingSelector {
   public:
-
     ThinningThingSelector(edm::ParameterSet const& pset, edm::ConsumesCollector&& cc);
 
-    static void fillDescription(edm::ParameterSetDescription & desc);
+    static void fillDescription(edm::ParameterSetDescription& desc);
 
     void preChoose(edm::Handle<edmtest::ThingCollection> tc, edm::Event const& event, edm::EventSetup const& es);
 
-    bool choose( unsigned int iIndex, edmtest::Thing const& iItem);
+    bool choose(unsigned int iIndex, edmtest::Thing const& iItem);
 
   private:
     edm::EDGetTokenT<TrackOfThingsCollection> trackToken_;
@@ -50,13 +49,15 @@ namespace edmtest {
     expectedCollectionSize_ = pset.getParameter<unsigned int>("expectedCollectionSize");
   }
 
-  void ThinningThingSelector::fillDescription(edm::ParameterSetDescription & desc) {
+  void ThinningThingSelector::fillDescription(edm::ParameterSetDescription& desc) {
     desc.add<edm::InputTag>("trackTag");
     desc.add<unsigned int>("offsetToThinnedKey");
     desc.add<unsigned int>("expectedCollectionSize");
   }
 
-  void ThinningThingSelector::preChoose(edm::Handle<edmtest::ThingCollection> tc, edm::Event const& event, edm::EventSetup const& es) {
+  void ThinningThingSelector::preChoose(edm::Handle<edmtest::ThingCollection> tc,
+                                        edm::Event const& event,
+                                        edm::EventSetup const& es) {
     for (auto const& track : event.get(trackToken_)) {
       keysToSave_.insert(track.ref1.key() - offsetToThinnedKey_);
       keysToSave_.insert(track.ref2.key() - offsetToThinnedKey_);
@@ -65,8 +66,9 @@ namespace edmtest {
     }
 
     // Just checking to see if the collection got passed in. Not really using it for anything.
-    if(tc->size() != expectedCollectionSize_) {
-      throw cms::Exception("TestFailure") << "ThinningThingSelector::preChoose, collection size = " << tc->size() << " expected size = " << expectedCollectionSize_;
+    if (tc->size() != expectedCollectionSize_) {
+      throw cms::Exception("TestFailure") << "ThinningThingSelector::preChoose, collection size = " << tc->size()
+                                          << " expected size = " << expectedCollectionSize_;
     }
 
     // Just checking to see the EventSetup works from here. Not really using it for anything.
@@ -75,19 +77,20 @@ namespace edmtest {
     pSetup.isValid();
   }
 
-  bool ThinningThingSelector::choose( unsigned int iIndex, edmtest::Thing const& iItem) {
-
+  bool ThinningThingSelector::choose(unsigned int iIndex, edmtest::Thing const& iItem) {
     // Just checking to see the element in the container got passed in OK. Not really using it.
     // Just using %10 because it coincidentally works with the arbitrary numbers I picked, no meaning really.
-    if(static_cast<unsigned>(iItem.a % 10) != iIndex % 10) {
-      throw cms::Exception("TestFailure") << "ThinningThingSelector::choose, item content = " << iItem.a << " index = " << iIndex;
+    if (static_cast<unsigned>(iItem.a % 10) != iIndex % 10) {
+      throw cms::Exception("TestFailure")
+          << "ThinningThingSelector::choose, item content = " << iItem.a << " index = " << iIndex;
     }
 
     // Save the Things referenced by the Tracks
-    if(keysToSave_.find(iIndex) == keysToSave_.end()) return false;
+    if (keysToSave_.find(iIndex) == keysToSave_.end())
+      return false;
     return true;
   }
-}
+}  // namespace edmtest
 
 typedef edm::ThinningProducer<edmtest::ThingCollection, edmtest::ThinningThingSelector> ThinningThingProducer;
 DEFINE_FWK_MODULE(ThinningThingProducer);
diff --git a/FWCore/Integration/test/ThrowingSource.cc b/FWCore/Integration/test/ThrowingSource.cc
index ec6ff28a399a6..69a3e424c3138 100644
--- a/FWCore/Integration/test/ThrowingSource.cc
+++ b/FWCore/Integration/test/ThrowingSource.cc
@@ -10,7 +10,7 @@ namespace edm {
   class ThrowingSource : public ProducerSourceBase {
   public:
     explicit ThrowingSource(ParameterSet const&, InputSourceDescription const&);
-    ~ThrowingSource() noexcept(false) ;
+    ~ThrowingSource() noexcept(false);
 
     void beginJob() override;
     void endJob() override;
@@ -21,9 +21,10 @@ namespace edm {
     std::shared_ptr<edm::RunAuxiliary> readRunAuxiliary_() override;
     std::shared_ptr<edm::LuminosityBlockAuxiliary> readLuminosityBlockAuxiliary_() override;
     void readEvent_(edm::EventPrincipal&) override;
+
   private:
     enum {
-      kDoNotThrow  = 0,
+      kDoNotThrow = 0,
       kConstructor = 1,
       kBeginJob = 2,
       kBeginRun = 3,
@@ -40,89 +41,86 @@ namespace edm {
       kDestructor = 14
     };
     bool setRunAndEventInfo(EventID& id, TimeValue_t& time, edm::EventAuxiliary::ExperimentType& eType) override;
-    void produce(Event &) override;
+    void produce(Event&) override;
 
     // To test exception throws from sources
     int whenToThrow_;
   };
 
-  ThrowingSource::ThrowingSource(ParameterSet const& pset,
-				       InputSourceDescription const& desc) :
-    ProducerSourceBase(pset, desc, false), whenToThrow_(pset.getUntrackedParameter<int>("whenToThrow", kDoNotThrow)) {
-    if (whenToThrow_ == kConstructor) throw cms::Exception("TestThrow") << "ThrowingSource constructor";
-
+  ThrowingSource::ThrowingSource(ParameterSet const& pset, InputSourceDescription const& desc)
+      : ProducerSourceBase(pset, desc, false),
+        whenToThrow_(pset.getUntrackedParameter<int>("whenToThrow", kDoNotThrow)) {
+    if (whenToThrow_ == kConstructor)
+      throw cms::Exception("TestThrow") << "ThrowingSource constructor";
   }
 
   ThrowingSource::~ThrowingSource() noexcept(false) {
-    if (whenToThrow_ == kDestructor) throw cms::Exception("TestThrow") << "ThrowingSource destructor";
+    if (whenToThrow_ == kDestructor)
+      throw cms::Exception("TestThrow") << "ThrowingSource destructor";
   }
 
-  bool
-  ThrowingSource::setRunAndEventInfo(EventID&, TimeValue_t&, edm::EventAuxiliary::ExperimentType&) {
-    return true;
-  }
+  bool ThrowingSource::setRunAndEventInfo(EventID&, TimeValue_t&, edm::EventAuxiliary::ExperimentType&) { return true; }
 
-  void
-  ThrowingSource::produce(edm::Event&) {
-  }
+  void ThrowingSource::produce(edm::Event&) {}
 
-  void
-  ThrowingSource::beginJob() {
-    if (whenToThrow_ == kBeginJob) throw cms::Exception("TestThrow") << "ThrowingSource::beginJob";
+  void ThrowingSource::beginJob() {
+    if (whenToThrow_ == kBeginJob)
+      throw cms::Exception("TestThrow") << "ThrowingSource::beginJob";
   }
 
-  void
-  ThrowingSource::endJob() {
-    if (whenToThrow_ == kEndJob) throw cms::Exception("TestThrow") << "ThrowingSource::endJob";
+  void ThrowingSource::endJob() {
+    if (whenToThrow_ == kEndJob)
+      throw cms::Exception("TestThrow") << "ThrowingSource::endJob";
   }
 
-  void
-  ThrowingSource::beginLuminosityBlock(LuminosityBlock& lb) {
-    if (whenToThrow_ == kBeginLumi) throw cms::Exception("TestThrow") << "ThrowingSource::beginLuminosityBlock";
+  void ThrowingSource::beginLuminosityBlock(LuminosityBlock& lb) {
+    if (whenToThrow_ == kBeginLumi)
+      throw cms::Exception("TestThrow") << "ThrowingSource::beginLuminosityBlock";
   }
 
-  void
-  ThrowingSource::beginRun(Run& run) {
-    if (whenToThrow_ == kBeginRun) throw cms::Exception("TestThrow") << "ThrowingSource::beginRun";
+  void ThrowingSource::beginRun(Run& run) {
+    if (whenToThrow_ == kBeginRun)
+      throw cms::Exception("TestThrow") << "ThrowingSource::beginRun";
   }
 
-  std::unique_ptr<FileBlock>
-  ThrowingSource::readFile_() {
-    if (whenToThrow_ == kReadFile) throw cms::Exception("TestThrow") << "ThrowingSource::readFile_";
+  std::unique_ptr<FileBlock> ThrowingSource::readFile_() {
+    if (whenToThrow_ == kReadFile)
+      throw cms::Exception("TestThrow") << "ThrowingSource::readFile_";
     return std::make_unique<FileBlock>();
   }
 
-  void
-  ThrowingSource::closeFile_() {
-    if (whenToThrow_ == kCloseFile) throw cms::Exception("TestThrow") << "ThrowingSource::closeFile_";
+  void ThrowingSource::closeFile_() {
+    if (whenToThrow_ == kCloseFile)
+      throw cms::Exception("TestThrow") << "ThrowingSource::closeFile_";
   }
 
-  std::shared_ptr<RunAuxiliary>
-  ThrowingSource::readRunAuxiliary_() {
-    if (whenToThrow_ == kReadRunAuxiliary) throw cms::Exception("TestThrow") << "ThrowingSource::readRunAuxiliary_";
+  std::shared_ptr<RunAuxiliary> ThrowingSource::readRunAuxiliary_() {
+    if (whenToThrow_ == kReadRunAuxiliary)
+      throw cms::Exception("TestThrow") << "ThrowingSource::readRunAuxiliary_";
     Timestamp ts = Timestamp(presentTime());
     resetNewRun();
     return std::make_shared<RunAuxiliary>(eventID().run(), ts, Timestamp::invalidTimestamp());
   }
 
-  std::shared_ptr<LuminosityBlockAuxiliary>
-  ThrowingSource::readLuminosityBlockAuxiliary_() {
-    if (whenToThrow_ == kReadLuminosityBlockAuxiliary) throw cms::Exception("TestThrow") << "ThrowingSource::readLuminosityBlockAuxiliary_";
-    if (processingMode() == Runs) return std::shared_ptr<LuminosityBlockAuxiliary>();
+  std::shared_ptr<LuminosityBlockAuxiliary> ThrowingSource::readLuminosityBlockAuxiliary_() {
+    if (whenToThrow_ == kReadLuminosityBlockAuxiliary)
+      throw cms::Exception("TestThrow") << "ThrowingSource::readLuminosityBlockAuxiliary_";
+    if (processingMode() == Runs)
+      return std::shared_ptr<LuminosityBlockAuxiliary>();
     Timestamp ts = Timestamp(presentTime());
     resetNewLumi();
-    return std::make_shared<LuminosityBlockAuxiliary>(eventID().run(), eventID().luminosityBlock(), ts, Timestamp::invalidTimestamp());
+    return std::make_shared<LuminosityBlockAuxiliary>(
+        eventID().run(), eventID().luminosityBlock(), ts, Timestamp::invalidTimestamp());
   }
 
-  void
-  ThrowingSource::readEvent_(EventPrincipal& eventPrincipal) {
-    if (whenToThrow_ == kReadEvent) throw cms::Exception("TestThrow") << "ThrowingSource::readEvent_";
+  void ThrowingSource::readEvent_(EventPrincipal& eventPrincipal) {
+    if (whenToThrow_ == kReadEvent)
+      throw cms::Exception("TestThrow") << "ThrowingSource::readEvent_";
     assert(eventCached() || processingMode() != RunsLumisAndEvents);
     EventAuxiliary aux(eventID(), processGUID(), Timestamp(presentTime()), false, EventAuxiliary::Undefined);
     eventPrincipal.fillEventPrincipal(aux, processHistoryRegistry());
   }
-}
+}  // namespace edm
 
 using edm::ThrowingSource;
 DEFINE_FWK_INPUT_SOURCE(ThrowingSource);
-
diff --git a/FWCore/Integration/test/TrackOfThingsProducer.cc b/FWCore/Integration/test/TrackOfThingsProducer.cc
index edb72ba2e6bfe..1a62abcd81940 100644
--- a/FWCore/Integration/test/TrackOfThingsProducer.cc
+++ b/FWCore/Integration/test/TrackOfThingsProducer.cc
@@ -19,14 +19,12 @@ namespace edmtest {
 
   class TrackOfThingsProducer : public edm::one::EDProducer<> {
   public:
-
     explicit TrackOfThingsProducer(edm::ParameterSet const&);
     virtual ~TrackOfThingsProducer();
 
     void produce(edm::Event&, edm::EventSetup const&) override;
 
   private:
-
     void incrementKey(std::vector<unsigned int>::const_iterator& key) const;
 
     edm::EDGetTokenT<ThingCollection> inputToken_;
@@ -34,7 +32,6 @@ namespace edmtest {
   };
 
   TrackOfThingsProducer::TrackOfThingsProducer(edm::ParameterSet const& pset) {
-
     inputToken_ = consumes<ThingCollection>(pset.getParameter<edm::InputTag>("inputTag"));
 
     keysToReference_ = pset.getParameter<std::vector<unsigned int> >("keysToReference");
@@ -42,15 +39,15 @@ namespace edmtest {
     produces<TrackOfThingsCollection>();
   }
 
-  TrackOfThingsProducer::~TrackOfThingsProducer() { }
+  TrackOfThingsProducer::~TrackOfThingsProducer() {}
 
   void TrackOfThingsProducer::incrementKey(std::vector<unsigned int>::const_iterator& key) const {
     ++key;
-    if(key == keysToReference_.end()) key = keysToReference_.begin();
+    if (key == keysToReference_.end())
+      key = keysToReference_.begin();
   }
 
   void TrackOfThingsProducer::produce(edm::Event& event, edm::EventSetup const&) {
-
     edm::Handle<ThingCollection> inputCollection = event.getHandle(inputToken_);
 
     auto result = std::make_unique<TrackOfThingsCollection>();
@@ -61,9 +58,7 @@ namespace edmtest {
     // and have no meaning other than that we will later check that we can
     // read out what we put in here.
     std::vector<unsigned int>::const_iterator key = keysToReference_.begin();
-    for(unsigned int i = 0; i < 5; ++i) {
-
-
+    for (unsigned int i = 0; i < 5; ++i) {
       edmtest::TrackOfThings trackOfThings;
 
       trackOfThings.ref1 = edm::Ref<ThingCollection>(inputCollection, *key);
@@ -80,10 +75,11 @@ namespace edmtest {
 
       trackOfThings.refToBase1 = edm::RefToBase<Thing>(trackOfThings.ref1);
 
-      for(auto iKey : keysToReference_) {
+      for (auto iKey : keysToReference_) {
         trackOfThings.refVector1.push_back(edm::Ref<ThingCollection>(inputCollection, iKey));
         trackOfThings.ptrVector1.push_back(edm::Ptr<Thing>(inputCollection, iKey));
-        trackOfThings.refToBaseVector1.push_back(edm::RefToBase<Thing>(edm::Ref<ThingCollection>(inputCollection, iKey)));
+        trackOfThings.refToBaseVector1.push_back(
+            edm::RefToBase<Thing>(edm::Ref<ThingCollection>(inputCollection, iKey)));
       }
 
       result->push_back(trackOfThings);
@@ -91,6 +87,6 @@ namespace edmtest {
 
     event.put(std::move(result));
   }
-}
+}  // namespace edmtest
 using edmtest::TrackOfThingsProducer;
 DEFINE_FWK_MODULE(TrackOfThingsProducer);
diff --git a/FWCore/Integration/test/UseValueExampleAnalyzer.cc b/FWCore/Integration/test/UseValueExampleAnalyzer.cc
index 44f9e33c179e9..71a3fd85cec1c 100644
--- a/FWCore/Integration/test/UseValueExampleAnalyzer.cc
+++ b/FWCore/Integration/test/UseValueExampleAnalyzer.cc
@@ -2,7 +2,7 @@
 //
 // Package:    Integration
 // Class:      UseValueExampleAnalyzer
-// 
+//
 /**\class UseValueExampleAnalyzer UseValueExampleAnalyzer.cc FWCore/Integration/test/UseValueExampleAnalyzer.cc
 
 Description: <one line class summary>
@@ -16,7 +16,6 @@ Description: <one line class summary>
 //
 //
 
-
 // system include files
 #include <memory>
 #include <iostream>
@@ -26,7 +25,6 @@ Description: <one line class summary>
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-
 #include "FWCore/Integration/test/ValueExample.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
@@ -36,13 +34,13 @@ Description: <one line class summary>
 
 class UseValueExampleAnalyzer : public edm::EDAnalyzer {
 public:
-   explicit UseValueExampleAnalyzer(const edm::ParameterSet&);
-   ~UseValueExampleAnalyzer();
-   
-   
-   virtual void analyze(const edm::Event&, const edm::EventSetup&);
+  explicit UseValueExampleAnalyzer(const edm::ParameterSet&);
+  ~UseValueExampleAnalyzer();
+
+  virtual void analyze(const edm::Event&, const edm::EventSetup&);
+
 private:
-      // ----------member data ---------------------------
+  // ----------member data ---------------------------
 };
 
 //
@@ -56,33 +54,23 @@ class UseValueExampleAnalyzer : public edm::EDAnalyzer {
 //
 // constructors and destructor
 //
-UseValueExampleAnalyzer::UseValueExampleAnalyzer(const edm::ParameterSet& /* iConfig */)
-{
-   //now do what ever initialization is needed
-   
+UseValueExampleAnalyzer::UseValueExampleAnalyzer(const edm::ParameterSet& /* iConfig */) {
+  //now do what ever initialization is needed
 }
 
-
-UseValueExampleAnalyzer::~UseValueExampleAnalyzer()
-{
-   
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-   
+UseValueExampleAnalyzer::~UseValueExampleAnalyzer() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-UseValueExampleAnalyzer::analyze(const edm::Event& /* iEvent */, const edm::EventSetup& /* iSetup*/)
-{   
-   std::cout<<" value from service "<< edm::Service<ValueExample>()->value()<<std::endl; 
+void UseValueExampleAnalyzer::analyze(const edm::Event& /* iEvent */, const edm::EventSetup& /* iSetup*/) {
+  std::cout << " value from service " << edm::Service<ValueExample>()->value() << std::endl;
 }
 
 //define this as a plug-in
 DEFINE_FWK_MODULE(UseValueExampleAnalyzer);
-
diff --git a/FWCore/Integration/test/ValueExample.cc b/FWCore/Integration/test/ValueExample.cc
index ce05b36080a93..50a61eb9f3ee6 100644
--- a/FWCore/Integration/test/ValueExample.cc
+++ b/FWCore/Integration/test/ValueExample.cc
@@ -2,7 +2,7 @@
 //
 // Package:     test
 // Class  :     ValueExample
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -15,17 +15,11 @@
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
-ValueExample::ValueExample(const edm::ParameterSet& iPSet):
-value_(iPSet.getParameter<int>("value"))
-{
-}
+ValueExample::ValueExample(const edm::ParameterSet& iPSet) : value_(iPSet.getParameter<int>("value")) {}
 
-ValueExample::~ValueExample()
-{
-}
+ValueExample::~ValueExample() {}
 
-void ValueExample::fillDescriptions(edm::ConfigurationDescriptions & descriptions)
-{
+void ValueExample::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
   desc.add<int>("value");
   descriptions.addDefault(desc);
diff --git a/FWCore/Integration/test/ValueExample.h b/FWCore/Integration/test/ValueExample.h
index 4ee0c7c9799de..99166e7129e67 100644
--- a/FWCore/Integration/test/ValueExample.h
+++ b/FWCore/Integration/test/ValueExample.h
@@ -4,7 +4,7 @@
 //
 // Package:     Integration
 // Class  :     ValueExample
-// 
+//
 /**\class ValueExample ValueExample.h FWCore/Integration/test/stubs/ValueExample.h
 
  Description: An example of a trivial Service
@@ -21,30 +21,28 @@
 namespace edm {
   class ParameterSet;
   class ConfigurationDescriptions;
-}
+}  // namespace edm
 
-class ValueExample
-{
-   
+class ValueExample {
 public:
-   ValueExample(const edm::ParameterSet&);
-   virtual ~ValueExample();
-   
-   // ---------- const member functions ---------------------
-   int value() const { return value_; }
-   
-   // ---------- static member functions --------------------
-   static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
-
-   // ---------- member functions ---------------------------
-   
+  ValueExample(const edm::ParameterSet&);
+  virtual ~ValueExample();
+
+  // ---------- const member functions ---------------------
+  int value() const { return value_; }
+
+  // ---------- static member functions --------------------
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
+  // ---------- member functions ---------------------------
+
 private:
-      ValueExample(const ValueExample&); // stop default
-   
-   const ValueExample& operator=(const ValueExample&); // stop default
-   
-   // ---------- member data --------------------------------
-   int value_;
+  ValueExample(const ValueExample&);  // stop default
+
+  const ValueExample& operator=(const ValueExample&);  // stop default
+
+  // ---------- member data --------------------------------
+  int value_;
 };
 
 #endif
diff --git a/FWCore/Integration/test/ValueExamplePlugin.cc b/FWCore/Integration/test/ValueExamplePlugin.cc
index 8b14d529600f7..39ed6d87a5834 100644
--- a/FWCore/Integration/test/ValueExamplePlugin.cc
+++ b/FWCore/Integration/test/ValueExamplePlugin.cc
@@ -2,7 +2,7 @@
 //
 // Package:     test
 // Class  :     ValueExample
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -16,4 +16,4 @@
 #include "FWCore/Integration/test/ValueExample.h"
 #include "FWCore/ServiceRegistry/interface/ServiceMaker.h"
 using namespace edm::serviceregistry;
-DEFINE_FWK_SERVICE_MAKER(ValueExample,ParameterSetMaker<ValueExample>);
+DEFINE_FWK_SERVICE_MAKER(ValueExample, ParameterSetMaker<ValueExample>);
diff --git a/FWCore/Integration/test/ViewAnalyzer.cc b/FWCore/Integration/test/ViewAnalyzer.cc
index cb56f296620c0..4a8aa915098b6 100644
--- a/FWCore/Integration/test/ViewAnalyzer.cc
+++ b/FWCore/Integration/test/ViewAnalyzer.cc
@@ -25,45 +25,33 @@
 using namespace edm;
 using namespace std::rel_ops;
 
-namespace edmtest 
-{
+namespace edmtest {
   class ViewAnalyzer : public edm::global::EDAnalyzer<> {
   public:
     explicit ViewAnalyzer(edm::ParameterSet const& /* no parameters*/);
-    virtual void analyze(edm::StreamID,
-                         edm::Event const& e,
-                         edm::EventSetup const& /* unused */ ) const override;
+    virtual void analyze(edm::StreamID, edm::Event const& e, edm::EventSetup const& /* unused */) const override;
 
     template <typename P, typename V>
-    void testProduct(edm::Event const& e,
-                     std::string const& moduleLabel) const;
+    void testProduct(edm::Event const& e, std::string const& moduleLabel) const;
 
-    void testDSVProduct(edm::Event const& e,
-                        std::string const& moduleLabel) const;
+    void testDSVProduct(edm::Event const& e, std::string const& moduleLabel) const;
 
-    void testAVProduct(edm::Event const& e,
-                       std::string const& moduleLabel) const;
+    void testAVProduct(edm::Event const& e, std::string const& moduleLabel) const;
 
-    void testProductWithBaseClass(edm::Event const& e,
-                                  std::string const& moduleLabel) const;
+    void testProductWithBaseClass(edm::Event const& e, std::string const& moduleLabel) const;
 
-    void testRefVector(edm::Event const& e,
-                       std::string const& moduleLabel) const;
+    void testRefVector(edm::Event const& e, std::string const& moduleLabel) const;
 
-    void testRefToBaseVector(edm::Event const& e,
-                             std::string const& moduleLabel) const;
+    void testRefToBaseVector(edm::Event const& e, std::string const& moduleLabel) const;
 
-    void testPtrVector(edm::Event const& e,
-                       std::string const& moduleLabel) const;
+    void testPtrVector(edm::Event const& e, std::string const& moduleLabel) const;
 
-    void testStdVectorPtr(edm::Event const& e,
-                          std::string const& moduleLabel) const;
+    void testStdVectorPtr(edm::Event const& e, std::string const& moduleLabel) const;
   };
 
-
   ViewAnalyzer::ViewAnalyzer(ParameterSet const&) {
-    consumes<edm::View<int>>(edm::InputTag{"intvec","","TEST"});
-    consumes<edm::View<int>>(edm::InputTag{"intvec",""});
+    consumes<edm::View<int>>(edm::InputTag{"intvec", "", "TEST"});
+    consumes<edm::View<int>>(edm::InputTag{"intvec", ""});
     consumes<std::vector<int>>(edm::InputTag{"intvec"});
     consumes<edm::View<int>>(edm::InputTag{"intvec"});
     consumes<std::list<int>>(edm::InputTag{"intlist"});
@@ -81,18 +69,18 @@ namespace edmtest
     consumes<edmtest::DSVSimpleProduct>(edm::InputTag{"dsvsimple"});
     consumes<edm::View<edmtest::DSVSimpleProduct::value_type>>(edm::InputTag{"dsvsimple"});
 
-    consumes<OVSimpleDerivedProduct>(edm::InputTag{"ovsimple","derived"});
-    consumes<edm::View<Simple>>(edm::InputTag{"ovsimple","derived"});
-    
+    consumes<OVSimpleDerivedProduct>(edm::InputTag{"ovsimple", "derived"});
+    consumes<edm::View<Simple>>(edm::InputTag{"ovsimple", "derived"});
+
     consumes<RefVector<std::vector<int>>>(edm::InputTag{"intvecrefvec"});
     consumes<edm::View<int>>(edm::InputTag{"intvecrefvec"});
-    
+
     consumes<RefToBaseVector<int>>(edm::InputTag{"intvecreftbvec"});
     consumes<edm::View<int>>(edm::InputTag{"intvecreftbvec"});
 
     consumes<PtrVector<int>>(edm::InputTag{"intvecptrvec"});
     consumes<edm::View<int>>(edm::InputTag{"intvecptrvec"});
-    
+
     consumes<std::vector<edm::Ptr<int>>>(edm::InputTag{"intvecstdvecptr"});
     consumes<edm::View<int>>(edm::InputTag{"intvecstdvecptr"});
 
@@ -101,24 +89,16 @@ namespace edmtest
 
   template <typename P, typename V = typename P::value_type>
   struct tester {
-    static void call(ViewAnalyzer const* va, 
-		     Event const& e,
-		     char const* moduleLabel)
-    {
-      va->template testProduct<P,V>(e, moduleLabel);
+    static void call(ViewAnalyzer const* va, Event const& e, char const* moduleLabel) {
+      va->template testProduct<P, V>(e, moduleLabel);
     }
-
   };
 
-  void 
-  ViewAnalyzer::analyze(StreamID,
-                        Event const& e,
-                        EventSetup const& /* unused */) const {
-
-    tester<std::vector<int> >::call(this, e, "intvec");
-    tester<std::list<int> >::call(this, e, "intlist");
-    tester<std::deque<int> >::call(this, e, "intdeque");
-    tester<std::set<int> >::call(this, e, "intset");
+  void ViewAnalyzer::analyze(StreamID, Event const& e, EventSetup const& /* unused */) const {
+    tester<std::vector<int>>::call(this, e, "intvec");
+    tester<std::list<int>>::call(this, e, "intlist");
+    tester<std::deque<int>>::call(this, e, "intdeque");
+    tester<std::set<int>>::call(this, e, "intset");
 
     tester<SCSimpleProduct>::call(this, e, "simple");
     tester<OVSimpleProduct>::call(this, e, "ovsimple");
@@ -130,79 +110,77 @@ namespace edmtest
     testRefVector(e, "intvecrefvec");
     testRefToBaseVector(e, "intvecreftbvec");
     testPtrVector(e, "intvecptrvec");
-    testStdVectorPtr(e,"intvecstdvecptr");
-    
+    testStdVectorPtr(e, "intvecstdvecptr");
+
     //See if InputTag works
     {
-      edm::InputTag tag("intvec","");
-      edm::Handle<edm::View<int> > hInt;
-      e.getByLabel(tag,hInt);
+      edm::InputTag tag("intvec", "");
+      edm::Handle<edm::View<int>> hInt;
+      e.getByLabel(tag, hInt);
       assert(hInt.isValid());
     }
     {
-      edm::InputTag tag("intvec","","TEST");
-      edm::Handle<edm::View<int> > hInt;
-      e.getByLabel(tag,hInt);
+      edm::InputTag tag("intvec", "", "TEST");
+      edm::Handle<edm::View<int>> hInt;
+      e.getByLabel(tag, hInt);
       assert(hInt.isValid());
     }
   }
 
   template <typename P, typename V>
-  void
-  ViewAnalyzer::testProduct(Event const& e,
- 			    std::string const& moduleLabel) const {
-    typedef P                               sequence_t;
-    typedef V                               value_t;
-    typedef View<value_t>                   view_t;
+  void ViewAnalyzer::testProduct(Event const& e, std::string const& moduleLabel) const {
+    typedef P sequence_t;
+    typedef V value_t;
+    typedef View<value_t> view_t;
 
     Handle<sequence_t> hproduct;
     e.getByLabel(moduleLabel, hproduct);
     assert(hproduct.isValid());
-    
+
     Handle<view_t> hview;
     e.getByLabel(moduleLabel, hview);
     assert(hview.isValid());
-    
+
     assert(hproduct.id() == hview.id());
     assert(*hproduct.provenance() == *hview.provenance());
-    
+
     assert(hproduct->size() == hview->size());
 
     typename sequence_t::const_iterator i_product = hproduct->begin();
     typename sequence_t::const_iterator e_product = hproduct->end();
-    typename view_t::const_iterator     i_view = hview->begin();
-    typename view_t::const_iterator     e_view = hview->end();
+    typename view_t::const_iterator i_view = hview->begin();
+    typename view_t::const_iterator e_view = hview->end();
     size_t slot = 0;
     while (i_product != e_product && i_view != e_view) {
-	value_t const& product_item = *i_product;
-	value_t const& view_item = *i_view;
-        assert(product_item == view_item);
+      value_t const& product_item = *i_product;
+      value_t const& view_item = *i_view;
+      assert(product_item == view_item);
 
-        edm::Ref<sequence_t> ref3(hproduct, slot);
-        assert(*ref3 == product_item);
+      edm::Ref<sequence_t> ref3(hproduct, slot);
+      assert(*ref3 == product_item);
 
-        edm::RefProd<sequence_t> refProd4(hproduct);
-        edm::Ref<sequence_t> ref4(refProd4, slot);
-        assert(*ref4 == product_item);
+      edm::RefProd<sequence_t> refProd4(hproduct);
+      edm::Ref<sequence_t> ref4(refProd4, slot);
+      assert(*ref4 == product_item);
 
-	++i_product; ++i_view; ++slot;
+      ++i_product;
+      ++i_view;
+      ++slot;
     }
 
     // Make sure the references are right.
     size_t numElements = hview->size();
     for (size_t i = 0; i < numElements; ++i) {
-    	RefToBase<value_t> ref = hview->refAt(i);
-	assert(ref.isNonnull());
-    }	  
+      RefToBase<value_t> ref = hview->refAt(i);
+      assert(ref.isNonnull());
+    }
   }
 
-  void
-  ViewAnalyzer::testDSVProduct(Event const& e,
- 			    std::string const& moduleLabel) const {
+  void ViewAnalyzer::testDSVProduct(Event const& e, std::string const& moduleLabel) const {
     typedef edmtest::DSVSimpleProduct sequence_t;
-    typedef sequence_t::value_type    value_t;
-    typedef View<value_t>             view_t;
-    
+    typedef sequence_t::value_type value_t;
+    typedef View<value_t> view_t;
+
     Handle<sequence_t> hprod;
     e.getByLabel(moduleLabel, hprod);
     assert(hprod.isValid());
@@ -213,30 +191,29 @@ namespace edmtest
 
     assert(hprod.id() == hview.id());
     assert(*hprod.provenance() == *hview.provenance());
-    
+
     assert(hprod->size() == hview->size());
 
     sequence_t::const_iterator i_prod = hprod->begin();
     sequence_t::const_iterator e_prod = hprod->end();
-    view_t::const_iterator     i_view = hview->begin();
-    view_t::const_iterator     e_view = hview->end();
+    view_t::const_iterator i_view = hview->begin();
+    view_t::const_iterator e_view = hview->end();
 
     while (i_prod != e_prod && i_view != e_view) {
-	value_t const& prod = *i_prod;
-	value_t const& view = *i_view;
-        assert(prod.detId() == view.detId());
-        assert(prod.data == view.data);
+      value_t const& prod = *i_prod;
+      value_t const& view = *i_view;
+      assert(prod.detId() == view.detId());
+      assert(prod.data == view.data);
 
-	++i_prod; ++i_view;
+      ++i_prod;
+      ++i_view;
     }
   }
 
-  void
-  ViewAnalyzer::testAVProduct(Event const& e,
-                              std::string const& moduleLabel) const {
+  void ViewAnalyzer::testAVProduct(Event const& e, std::string const& moduleLabel) const {
     typedef edmtest::AVSimpleProduct sequence_t;
-    typedef sequence_t::value_type    value_t;
-    typedef View<value_t>             view_t;
+    typedef sequence_t::value_type value_t;
+    typedef View<value_t> view_t;
 
     Handle<sequence_t> hprod;
     e.getByLabel(moduleLabel, hprod);
@@ -253,19 +230,20 @@ namespace edmtest
 
     sequence_t::const_iterator i_prod = hprod->begin();
     sequence_t::const_iterator e_prod = hprod->end();
-    view_t::const_iterator     i_view = hview->begin();
-    view_t::const_iterator     e_view = hview->end();
+    view_t::const_iterator i_view = hview->begin();
+    view_t::const_iterator e_view = hview->end();
 
     while (i_prod != e_prod && i_view != e_view) {
-	value_t const& prod = *i_prod;
-	value_t const& view = *i_view;
-        assert(prod == view);
-        assert((*hprod)[prod.first] == prod.second);
-        edm::Ptr<sequence_t::key_type> ptr(prod.first.id(), prod.first.key(), &e.productGetter());
-        assert((*hprod)[ptr] == prod.second);
-        edm::RefToBase<sequence_t::key_type> refToBase(prod.first);
-        assert((*hprod)[refToBase] == prod.second);
-	++i_prod; ++i_view;
+      value_t const& prod = *i_prod;
+      value_t const& view = *i_view;
+      assert(prod == view);
+      assert((*hprod)[prod.first] == prod.second);
+      edm::Ptr<sequence_t::key_type> ptr(prod.first.id(), prod.first.key(), &e.productGetter());
+      assert((*hprod)[ptr] == prod.second);
+      edm::RefToBase<sequence_t::key_type> refToBase(prod.first);
+      assert((*hprod)[refToBase] == prod.second);
+      ++i_prod;
+      ++i_view;
     }
   }
 
@@ -273,63 +251,60 @@ namespace edmtest
   // a View of "Simple" objects even when the sequence
   // has elements of a different type. The different type
   // inherits from "Simple" and is named "SimpleDerived"
-  void
-  ViewAnalyzer::testProductWithBaseClass(Event const& e,
- 			    std::string const& moduleLabel) const {
-    typedef OVSimpleDerivedProduct          sequence_t;
-    typedef Simple                          value_t;
-    typedef View<value_t>                   view_t;
-    
+  void ViewAnalyzer::testProductWithBaseClass(Event const& e, std::string const& moduleLabel) const {
+    typedef OVSimpleDerivedProduct sequence_t;
+    typedef Simple value_t;
+    typedef View<value_t> view_t;
+
     Handle<sequence_t> hprod;
     e.getByLabel(moduleLabel, "derived", hprod);
     assert(hprod.isValid());
-    
+
     Handle<view_t> hview;
     e.getByLabel(moduleLabel, "derived", hview);
     assert(hview.isValid());
-    
+
     assert(hprod.id() == hview.id());
     assert(*hprod.provenance() == *hview.provenance());
-    
+
     assert(hprod->size() == hview->size());
 
     unsigned slot = 0;
 
     sequence_t::const_iterator i_prod = hprod->begin();
     sequence_t::const_iterator e_prod = hprod->end();
-    view_t::const_iterator     i_view = hview->begin();
-    view_t::const_iterator     e_view = hview->end();
+    view_t::const_iterator i_view = hview->begin();
+    view_t::const_iterator e_view = hview->end();
 
     while (i_prod != e_prod && i_view != e_view) {
-	SimpleDerived const& prod = *i_prod;
-	Simple const& view = *i_view;
-        assert(prod == view);
+      SimpleDerived const& prod = *i_prod;
+      Simple const& view = *i_view;
+      assert(prod == view);
 
-        // Tack on a test of RefToBase::castTo here
+      // Tack on a test of RefToBase::castTo here
 
-        edm::RefToBaseProd<Simple> refToBaseProd(hview);
-        edm::RefToBase<Simple> refToBase(refToBaseProd, slot);
+      edm::RefToBaseProd<Simple> refToBaseProd(hview);
+      edm::RefToBase<Simple> refToBase(refToBaseProd, slot);
 
-        edm::Ptr<SimpleDerived> ptr = refToBase.castTo<edm::Ptr<SimpleDerived> >();
-        SimpleDerived const& valueFromPtr = *ptr;
-        assert(valueFromPtr == view);
+      edm::Ptr<SimpleDerived> ptr = refToBase.castTo<edm::Ptr<SimpleDerived>>();
+      SimpleDerived const& valueFromPtr = *ptr;
+      assert(valueFromPtr == view);
 
-        edm::Ref<edm::OwnVector<SimpleDerived>  > ref = refToBase.castTo<edm::Ref<edm::OwnVector<SimpleDerived> > >();
-        SimpleDerived const& valueFromRef = *ref;
-        assert(valueFromRef == view);
+      edm::Ref<edm::OwnVector<SimpleDerived>> ref = refToBase.castTo<edm::Ref<edm::OwnVector<SimpleDerived>>>();
+      SimpleDerived const& valueFromRef = *ref;
+      assert(valueFromRef == view);
 
-	++i_prod; ++i_view;
-        ++slot;
+      ++i_prod;
+      ++i_view;
+      ++slot;
     }
   }
 
-  void
-  ViewAnalyzer::testRefVector(Event const& e,
-			      std::string const& moduleLabel) const {
-    typedef RefVector<std::vector<int> >   sequence_t;
-    typedef int                       value_t;
-    typedef View<value_t>             view_t;
-    
+  void ViewAnalyzer::testRefVector(Event const& e, std::string const& moduleLabel) const {
+    typedef RefVector<std::vector<int>> sequence_t;
+    typedef int value_t;
+    typedef View<value_t> view_t;
+
     Handle<sequence_t> hproduct;
     e.getByLabel(moduleLabel, hproduct);
     assert(hproduct.isValid());
@@ -337,48 +312,48 @@ namespace edmtest
     Handle<view_t> hview;
     e.getByLabel(moduleLabel, hview);
     assert(hview.isValid());
-    
+
     assert(hproduct.id() == hview.id());
     assert(*hproduct.provenance() == *hview.provenance());
-    
+
     assert(hproduct->size() == hview->size());
 
     sequence_t::const_iterator i_product = hproduct->begin();
     sequence_t::const_iterator e_product = hproduct->end();
-    view_t::const_iterator     i_view = hview->begin();
-    view_t::const_iterator     e_view = hview->end();
+    view_t::const_iterator i_view = hview->begin();
+    view_t::const_iterator e_view = hview->end();
     size_t slot = 0;
     while (i_product != e_product && i_view != e_view) {
-	value_t const& product_item = **i_product;
-	value_t const& view_item = *i_view;
-        assert(product_item == view_item);
+      value_t const& product_item = **i_product;
+      value_t const& view_item = *i_view;
+      assert(product_item == view_item);
 
-         // Tack on a test of RefToBase::castTo here
-        edm::RefToBaseProd<int> refToBaseProd(hview);
-        edm::RefToBase<int> refToBase(refToBaseProd, slot);
+      // Tack on a test of RefToBase::castTo here
+      edm::RefToBaseProd<int> refToBaseProd(hview);
+      edm::RefToBase<int> refToBase(refToBaseProd, slot);
 
-        edm::Ptr<int> ref = refToBase.castTo<edm::Ptr<int> >();
-        int item_other = *ref;
-        assert(item_other == product_item);
+      edm::Ptr<int> ref = refToBase.castTo<edm::Ptr<int>>();
+      int item_other = *ref;
+      assert(item_other == product_item);
 
-        edm::Ref<std::vector<int> > ref2 = refToBase.castTo<edm::Ref<std::vector<int> > >();
-        int item_other2 = *ref2;
-        assert(item_other2 == product_item);
+      edm::Ref<std::vector<int>> ref2 = refToBase.castTo<edm::Ref<std::vector<int>>>();
+      int item_other2 = *ref2;
+      assert(item_other2 == product_item);
 
-        edm::Ref<sequence_t> ref3(hproduct, slot);
-        assert(*ref3 == product_item);
+      edm::Ref<sequence_t> ref3(hproduct, slot);
+      assert(*ref3 == product_item);
 
-	++i_product; ++i_view; ++slot;
+      ++i_product;
+      ++i_view;
+      ++slot;
     }
   }
 
-  void
-  ViewAnalyzer::testRefToBaseVector(Event const& e,
-				    std::string const& moduleLabel) const {
-    typedef RefToBaseVector<int>      sequence_t;
-    typedef int                       value_t;
-    typedef View<value_t>             view_t;
-    
+  void ViewAnalyzer::testRefToBaseVector(Event const& e, std::string const& moduleLabel) const {
+    typedef RefToBaseVector<int> sequence_t;
+    typedef int value_t;
+    typedef View<value_t> view_t;
+
     Handle<sequence_t> hproduct;
     e.getByLabel(moduleLabel, hproduct);
     assert(hproduct.isValid());
@@ -386,32 +361,32 @@ namespace edmtest
     Handle<view_t> hview;
     e.getByLabel(moduleLabel, hview);
     assert(hview.isValid());
-    
+
     assert(hproduct.id() == hview.id());
     assert(*hproduct.provenance() == *hview.provenance());
-    
+
     assert(hproduct->size() == hview->size());
 
     sequence_t::const_iterator i_product = hproduct->begin();
     sequence_t::const_iterator e_product = hproduct->end();
-    view_t::const_iterator     i_view = hview->begin();
-    view_t::const_iterator     e_view = hview->end();
+    view_t::const_iterator i_view = hview->begin();
+    view_t::const_iterator e_view = hview->end();
     size_t slot = 0;
     while (i_product != e_product && i_view != e_view) {
-	value_t const& product_item = **i_product;
-	value_t const& view_item = *i_view;
-        assert(product_item == view_item);
-	++i_product; ++i_view; ++slot;
+      value_t const& product_item = **i_product;
+      value_t const& view_item = *i_view;
+      assert(product_item == view_item);
+      ++i_product;
+      ++i_view;
+      ++slot;
     }
   }
 
-  void
-  ViewAnalyzer::testPtrVector(Event const& e,
-			      std::string const& moduleLabel) const {
-    typedef PtrVector<int>            sequence_t;
-    typedef int                       value_t;
-    typedef View<value_t>             view_t;
-    
+  void ViewAnalyzer::testPtrVector(Event const& e, std::string const& moduleLabel) const {
+    typedef PtrVector<int> sequence_t;
+    typedef int value_t;
+    typedef View<value_t> view_t;
+
     Handle<sequence_t> hproduct;
     e.getByLabel(moduleLabel, hproduct);
     assert(hproduct.isValid());
@@ -428,31 +403,31 @@ namespace edmtest
     InputTag tag2(moduleLabel);
     e.getByLabel(tag2, hview);
     assert(hview.isValid());
-    
+
     assert(hproduct.id() == hview.id());
     assert(*hproduct.provenance() == *hview.provenance());
-    
+
     assert(hproduct->size() == hview->size());
 
     sequence_t::const_iterator i_product = hproduct->begin();
     sequence_t::const_iterator e_product = hproduct->end();
-    view_t::const_iterator     i_view = hview->begin();
-    view_t::const_iterator     e_view = hview->end();
+    view_t::const_iterator i_view = hview->begin();
+    view_t::const_iterator e_view = hview->end();
     size_t slot = 0;
     while (i_product != e_product && i_view != e_view) {
-	value_t const& product_item = **i_product;
-	value_t const& view_item = *i_view;
-        assert(product_item == view_item);
-	++i_product; ++i_view; ++slot;
+      value_t const& product_item = **i_product;
+      value_t const& view_item = *i_view;
+      assert(product_item == view_item);
+      ++i_product;
+      ++i_view;
+      ++slot;
     }
   }
 
-  void
-  ViewAnalyzer::testStdVectorPtr(Event const& e,
-                                 std::string const& moduleLabel) const {
-    typedef std::vector<edm::Ptr<int>>            sequence_t;
-    typedef int                       value_t;
-    typedef View<value_t>             view_t;
+  void ViewAnalyzer::testStdVectorPtr(Event const& e, std::string const& moduleLabel) const {
+    typedef std::vector<edm::Ptr<int>> sequence_t;
+    typedef int value_t;
+    typedef View<value_t> view_t;
 
     Handle<sequence_t> hproduct;
     e.getByLabel(moduleLabel, hproduct);
@@ -471,8 +446,8 @@ namespace edmtest
 
     sequence_t::const_iterator i_product = hproduct->begin();
     sequence_t::const_iterator e_product = hproduct->end();
-    view_t::const_iterator     i_view = hview->begin();
-    view_t::const_iterator     e_view = hview->end();
+    view_t::const_iterator i_view = hview->begin();
+    view_t::const_iterator e_view = hview->end();
     unsigned int slot = 0;
     while (i_product != e_product && i_view != e_view) {
       value_t const& product_item = **i_product;
@@ -482,11 +457,13 @@ namespace edmtest
       edm::Ref<sequence_t> ref3(hproduct, slot);
       assert(**ref3 == product_item);
 
-      ++i_product; ++i_view; ++slot;
+      ++i_product;
+      ++i_view;
+      ++slot;
     }
   }
 
-}
+}  // namespace edmtest
 
 using edmtest::ViewAnalyzer;
 DEFINE_FWK_MODULE(ViewAnalyzer);
diff --git a/FWCore/Integration/test/WaitingServer.cc b/FWCore/Integration/test/WaitingServer.cc
index ad5c1fc97005f..6ff186e547981 100644
--- a/FWCore/Integration/test/WaitingServer.cc
+++ b/FWCore/Integration/test/WaitingServer.cc
@@ -6,12 +6,10 @@
 namespace edmtest {
   namespace test_acquire {
 
-    void
-    WaitingServer::requestValuesAsync(unsigned int dataID,
-                                      std::vector<int> const* iIn,
-                                      std::vector<int>* iOut,
-                                      edm::WaitingTaskWithArenaHolder holder) {
-
+    void WaitingServer::requestValuesAsync(unsigned int dataID,
+                                           std::vector<int> const* iIn,
+                                           std::vector<int>* iOut,
+                                           edm::WaitingTaskWithArenaHolder holder) {
       auto& streamData = m_perStream.at(dataID);
 
       streamData.in_ = iIn;
@@ -21,11 +19,11 @@ namespace edmtest {
         std::lock_guard<std::mutex> guard(m_mutex);
         m_waitingStreams.push_back(dataID);
       }
-      m_cond.notify_one(); //wakes up the server thread
+      m_cond.notify_one();  //wakes up the server thread
     }
 
     void WaitingServer::start() {
-      m_thread = std::make_unique<std::thread>([this]() { serverDoWork(); } );
+      m_thread = std::make_unique<std::thread>([this]() { serverDoWork(); });
     }
 
     void WaitingServer::stop() {
@@ -36,9 +34,7 @@ namespace edmtest {
       }
     }
 
-    bool WaitingServer::readyForWork() const {
-      return m_waitingStreams.size() >= m_minNumStreamsBeforeDoingWork;
-    }
+    bool WaitingServer::readyForWork() const { return m_waitingStreams.size() >= m_minNumStreamsBeforeDoingWork; }
 
     void WaitingServer::serverDoWork() {
       while (not m_shouldStop) {
@@ -46,12 +42,7 @@ namespace edmtest {
         {
           std::unique_lock<std::mutex> lk(m_mutex);
 
-          m_cond.wait_for(lk,
-                          std::chrono::seconds(m_secondsToWait),
-                          [this] ()->bool
-          {
-            return readyForWork();
-          });
+          m_cond.wait_for(lk, std::chrono::seconds(m_secondsToWait), [this]() -> bool { return readyForWork(); });
 
           // Once we know which streams have given us data
           // we can release the lock and let other streams
@@ -62,20 +53,20 @@ namespace edmtest {
 
         // Here is the work that the server does for the modules
         // it will just add 1 to each value it has been given
-        for(auto index: streamsToUse){
-          auto & streamData = m_perStream.at(index);
+        for (auto index : streamsToUse) {
+          auto& streamData = m_perStream.at(index);
 
           std::exception_ptr exceptionPtr;
           try {
-            for (auto v: *streamData.in_) {
-              streamData.out_->push_back(v+1);
+            for (auto v : *streamData.in_) {
+              streamData.out_->push_back(v + 1);
             }
-          } catch(...) {
+          } catch (...) {
             exceptionPtr = std::current_exception();
           }
           streamData.holder_.doneWaiting(exceptionPtr);
         }
       }
     }
-  }
-}
+  }  // namespace test_acquire
+}  // namespace edmtest
diff --git a/FWCore/Integration/test/WaitingServer.h b/FWCore/Integration/test/WaitingServer.h
index bd534924362f4..e601ee2e8f9ed 100644
--- a/FWCore/Integration/test/WaitingServer.h
+++ b/FWCore/Integration/test/WaitingServer.h
@@ -25,12 +25,11 @@ namespace edmtest {
     public:
       WaitingServer(unsigned int iNumberOfStreams,
                     unsigned int iMinNumberOfStreamsBeforeDoingWork,
-                    unsigned int iSecondsToWait):
-        m_perStream(iNumberOfStreams),
-        m_minNumStreamsBeforeDoingWork(iMinNumberOfStreamsBeforeDoingWork),
-        m_secondsToWait(iSecondsToWait),
-        m_shouldStop(false) {
-      }
+                    unsigned int iSecondsToWait)
+          : m_perStream(iNumberOfStreams),
+            m_minNumStreamsBeforeDoingWork(iMinNumberOfStreamsBeforeDoingWork),
+            m_secondsToWait(iSecondsToWait),
+            m_shouldStop(false) {}
 
       void start();
       void stop();
@@ -41,12 +40,11 @@ namespace edmtest {
                               edm::WaitingTaskWithArenaHolder holder);
 
     private:
-
       void serverDoWork();
 
       bool readyForWork() const;
 
-      std::mutex m_mutex; //needed by m_cond
+      std::mutex m_mutex;  //needed by m_cond
       std::condition_variable m_cond;
       std::unique_ptr<std::thread> m_thread;
       std::vector<StreamData> m_perStream;
@@ -58,18 +56,16 @@ namespace edmtest {
 
     class Cache {
     public:
-
       std::vector<int> const& retrieved() const { return m_retrieved; }
-      std::vector<int> & retrieved() { return m_retrieved; }
+      std::vector<int>& retrieved() { return m_retrieved; }
 
       std::vector<int> const& processed() const { return m_processed; }
-      std::vector<int> & processed() { return m_processed; }
+      std::vector<int>& processed() { return m_processed; }
 
     private:
-
       std::vector<int> m_retrieved;
       std::vector<int> m_processed;
     };
-  }
-}
+  }  // namespace test_acquire
+}  // namespace edmtest
 #endif
diff --git a/FWCore/Integration/test/WaitingService.cc b/FWCore/Integration/test/WaitingService.cc
index c0f68b366413b..3bed9bd6e8853 100644
--- a/FWCore/Integration/test/WaitingService.cc
+++ b/FWCore/Integration/test/WaitingService.cc
@@ -6,11 +6,10 @@
 namespace edmtest {
   namespace test_acquire {
 
-    WaitingService::WaitingService(edm::ParameterSet const& pset, edm::ActivityRegistry&iRegistry) :
-      count_(0),
-      numberOfStreamsToAccumulate_(pset.getUntrackedParameter<unsigned int>("streamsToAccumulate", 8)),
-      secondsToWaitForWork_(pset.getUntrackedParameter<unsigned int>("secondsToWaitForWork",1))
-    {
+    WaitingService::WaitingService(edm::ParameterSet const& pset, edm::ActivityRegistry& iRegistry)
+        : count_(0),
+          numberOfStreamsToAccumulate_(pset.getUntrackedParameter<unsigned int>("streamsToAccumulate", 8)),
+          secondsToWaitForWork_(pset.getUntrackedParameter<unsigned int>("secondsToWaitForWork", 1)) {
       iRegistry.watchPreallocate(this, &WaitingService::preallocate);
       iRegistry.watchPostEndJob(this, &WaitingService::postEndJob);
     }
@@ -23,20 +22,19 @@ namespace edmtest {
 
     void WaitingService::preallocate(edm::service::SystemBounds const&) {
       caches_.resize(count_.load());
-      server_ = std::make_unique<test_acquire::WaitingServer>(count_.load(),
-                                                              numberOfStreamsToAccumulate_,
-                                                              secondsToWaitForWork_);
+      server_ = std::make_unique<test_acquire::WaitingServer>(
+          count_.load(), numberOfStreamsToAccumulate_, secondsToWaitForWork_);
       server_->start();
     }
 
-    void  WaitingService::postEndJob() {
-      if(server_) {
+    void WaitingService::postEndJob() {
+      if (server_) {
         server_->stop();
       }
       server_.reset();
     }
-  }
-}
+  }  // namespace test_acquire
+}  // namespace edmtest
 
 using edmtest::test_acquire::WaitingService;
 DEFINE_FWK_SERVICE(WaitingService);
diff --git a/FWCore/Integration/test/WaitingService.h b/FWCore/Integration/test/WaitingService.h
index 915b2d65fd44c..262c7eb9b61bf 100644
--- a/FWCore/Integration/test/WaitingService.h
+++ b/FWCore/Integration/test/WaitingService.h
@@ -13,23 +13,23 @@ namespace edm {
   namespace service {
     class SystemBounds;
   }
-}
+}  // namespace edm
 
 namespace edmtest {
   namespace test_acquire {
 
     class Token {
     public:
-      Token(unsigned int v) : value_(v) { }
+      Token(unsigned int v) : value_(v) {}
       unsigned int value() const { return value_; }
+
     private:
       unsigned int value_;
     };
 
     class WaitingService {
     public:
-
-      WaitingService(edm::ParameterSet const& pset, edm::ActivityRegistry&iRegistry);
+      WaitingService(edm::ParameterSet const& pset, edm::ActivityRegistry& iRegistry);
       ~WaitingService();
 
       Token getToken() { return Token(count_.fetch_add(1)); }
@@ -54,6 +54,6 @@ namespace edmtest {
       const unsigned int numberOfStreamsToAccumulate_;
       const unsigned int secondsToWaitForWork_;
     };
-  }
-}
+  }  // namespace test_acquire
+}  // namespace edmtest
 #endif
diff --git a/FWCore/Integration/test/WaitingThreadIntProducer.cc b/FWCore/Integration/test/WaitingThreadIntProducer.cc
index 4d0be98223bc1..606187cfef6d5 100644
--- a/FWCore/Integration/test/WaitingThreadIntProducer.cc
+++ b/FWCore/Integration/test/WaitingThreadIntProducer.cc
@@ -7,7 +7,6 @@
 #include "FWCore/Concurrency/interface/WaitingTaskList.h"
 #include "DataFormats/TestObjects/interface/ToyProducts.h"
 
-
 #include <memory>
 #include <vector>
 #include <atomic>
@@ -18,15 +17,14 @@ namespace {
   /* Holds the data the WaitingServer needs to remember for each stream
    */
   struct StreamData {
-    StreamData() :
-    in_(nullptr), out_(nullptr), task_(nullptr) {}
+    StreamData() : in_(nullptr), out_(nullptr), task_(nullptr) {}
     //The members are atomic so that a framework thread can
     // be putting new values in them as the server thread is running
     std::atomic<std::vector<int> const*> in_;
     std::atomic<std::vector<int>*>* out_;
     std::atomic<edm::WaitingTask*> task_;
   };
-  
+
   /*
    This class controls a waiting thread. The classes waits until the 
    required number of streams have passed it data (or until a time limit is reached)
@@ -38,32 +36,35 @@ namespace {
   public:
     WaitingServer(unsigned int iNumberOfStreams,
                   unsigned int iMinNumberOfStreamsBeforeDoingWork,
-                  unsigned int iSecondsToWait):
-    m_perStream(iNumberOfStreams),
-    m_minNumStreamsBeforeDoingWork(iMinNumberOfStreamsBeforeDoingWork),
-    m_secondsToWait(iSecondsToWait),
-    m_shouldStop(false),
-    m_drainQueue(false) {}
+                  unsigned int iSecondsToWait)
+        : m_perStream(iNumberOfStreams),
+          m_minNumStreamsBeforeDoingWork(iMinNumberOfStreamsBeforeDoingWork),
+          m_secondsToWait(iSecondsToWait),
+          m_shouldStop(false),
+          m_drainQueue(false) {}
     void start();
     void stop();
-    
+
     ///iIn and iOut must have a lifetime longer than the asynchronous call
-    void requestValuesAsync(edm::StreamID, std::vector<int> const* iIn, std::atomic<std::vector<int>*>* iOut, edm::WaitingTask* iWaitingTask);
-    
+    void requestValuesAsync(edm::StreamID,
+                            std::vector<int> const* iIn,
+                            std::atomic<std::vector<int>*>* iOut,
+                            edm::WaitingTask* iWaitingTask);
+
     //These are not used in this example at the moment since there is no
     // way at present to determine that no more events will be processed.
     // In the future a call to endStreamLuminosityBlock could be used
     // as a signal to start draining.
-    void drainQueue() {m_drainQueue.store(true);}
-    void stopDrainingQueue() {m_drainQueue.store(false);}
-    
+    void drainQueue() { m_drainQueue.store(true); }
+    void stopDrainingQueue() { m_drainQueue.store(false); }
+
   private:
     void serverDoWork();
-    
+
     bool readyForWork() const;
-    
+
     edm::WaitingTaskList m_taskList;
-    std::mutex m_mutex; //needed by m_cond
+    std::mutex m_mutex;  //needed by m_cond
     std::condition_variable m_cond;
     std::unique_ptr<std::thread> m_thread;
     std::vector<StreamData> m_perStream;
@@ -73,71 +74,65 @@ namespace {
     std::atomic<bool> m_shouldStop;
     std::atomic<bool> m_drainQueue;
   };
-  
+
   void WaitingServer::requestValuesAsync(edm::StreamID iID,
-                                    std::vector<int> const* iIn,
-                                    std::atomic<std::vector<int>*>* iOut,
-                                    edm::WaitingTask* iWaitingTask) {
+                                         std::vector<int> const* iIn,
+                                         std::atomic<std::vector<int>*>* iOut,
+                                         edm::WaitingTask* iWaitingTask) {
     auto& streamData = m_perStream[iID.value()];
     assert(streamData.in_.load() == nullptr);
-    
+
     streamData.in_.store(iIn);
-    
+
     //increment to keep it from running immediately
     iWaitingTask->increment_ref_count();
     streamData.task_.store(iWaitingTask);
-    
+
     std::lock_guard<std::mutex> guard(m_mutex);
     m_waitingStreams.push_back(iID.value());
-    streamData.out_=iOut;
-    m_cond.notify_one(); //wakes up the server thread
+    streamData.out_ = iOut;
+    m_cond.notify_one();  //wakes up the server thread
   }
-  
+
   void WaitingServer::stop() {
     m_shouldStop = true;
     m_thread->join();
     m_thread.reset();
   }
-  
+
   void WaitingServer::start() {
-    m_thread = std::make_unique<std::thread>([this]() { serverDoWork(); } );
+    m_thread = std::make_unique<std::thread>([this]() { serverDoWork(); });
   }
-  
+
   /* Used to determine if there is something for the server thread to do*/
   bool WaitingServer::readyForWork() const {
-    if(m_shouldStop) {
+    if (m_shouldStop) {
       return true;
     }
-    if(m_drainQueue or (m_minNumStreamsBeforeDoingWork<= m_waitingStreams.size())) {
+    if (m_drainQueue or (m_minNumStreamsBeforeDoingWork <= m_waitingStreams.size())) {
       return true;
     }
     return false;
   }
-  
+
   void WaitingServer::serverDoWork() {
-    while( not m_shouldStop) {
+    while (not m_shouldStop) {
       std::vector<unsigned int> streamsToUse;
       {
         std::unique_lock<std::mutex> lk(m_mutex);
 
         //Other threads could have provided work to do
         // before we started wait_for
-        if(not readyForWork()) {
-          
+        if (not readyForWork()) {
           //We use wait for to handle the cases where
           // no more events will be sent to the server
           // or where we have a synchronization point
           // where all events must stop processing for a time.
           // In both cases we need to drain the system
-          m_cond.wait_for(lk,
-                          std::chrono::seconds(m_secondsToWait),
-                          [this] ()->bool
-          {
-            return readyForWork();
-          });
+          m_cond.wait_for(lk, std::chrono::seconds(m_secondsToWait), [this]() -> bool { return readyForWork(); });
         }
-        
-        if(m_shouldStop) {
+
+        if (m_shouldStop) {
           lk.unlock();
           break;
         }
@@ -147,49 +142,48 @@ namespace {
         streamsToUse.swap(m_waitingStreams);
         lk.unlock();
       }
-      
+
       //Here is the work that the server does for the modules
       // it will just add 1 to each value it has been given
-      for(auto index: streamsToUse){
-        auto & streamData = m_perStream[index];
+      for (auto index : streamsToUse) {
+        auto& streamData = m_perStream[index];
         auto task = streamData.task_.exchange(nullptr);
         //release the waiting task for this stream when we are done
-        m_taskList.add( task );
+        m_taskList.add(task);
         task->decrement_ref_count();
-        
+
         auto out = streamData.out_->load();
         out->clear();
         auto in = streamData.in_.load();
-        
-        for( auto v: *in) {
-          out->push_back(v+1);
+
+        for (auto v : *in) {
+          out->push_back(v + 1);
         }
         //to be sure memory in other threads will see these changes
         // we will just put the pointer back into the atomic
         streamData.out_->store(out);
         streamData.in_.store(nullptr);
       }
-      
+
       //now inform all waiting tasks that we have done the work
       m_taskList.doneWaiting(std::exception_ptr());
       // reset so that next call to add will wait
       m_taskList.reset();
     }
   }
-}
+}  // namespace
 
 namespace edmtest {
 
   class WaitingThreadIntProducer : public edm::global::EDProducer<> {
   public:
-
     explicit WaitingThreadIntProducer(edm::ParameterSet const& iConfig);
     ~WaitingThreadIntProducer() override;
-    
+
     virtual void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
 
     virtual void endJob() override;
-    
+
   private:
     virtual void preallocate(edm::PreallocationConfiguration const&) override;
 
@@ -199,68 +193,66 @@ namespace edmtest {
     const unsigned int m_secondsToWaitForWork;
   };
 
-  
-  WaitingThreadIntProducer::WaitingThreadIntProducer(edm::ParameterSet const& iConfig):
-  m_numberOfStreamsToAccumulate(iConfig.getUntrackedParameter<unsigned int>("streamsToAccumulate")),
-  m_secondsToWaitForWork(iConfig.getUntrackedParameter<unsigned int>("secondsToWaitForWork",10U))
-  {
-    for( auto const& tag: iConfig.getParameter<std::vector<edm::InputTag>>("tags")) {
+  WaitingThreadIntProducer::WaitingThreadIntProducer(edm::ParameterSet const& iConfig)
+      : m_numberOfStreamsToAccumulate(iConfig.getUntrackedParameter<unsigned int>("streamsToAccumulate")),
+        m_secondsToWaitForWork(iConfig.getUntrackedParameter<unsigned int>("secondsToWaitForWork", 10U)) {
+    for (auto const& tag : iConfig.getParameter<std::vector<edm::InputTag>>("tags")) {
       m_tokens.emplace_back(consumes<IntProduct>(tag));
     }
     produces<IntProduct>();
   }
-  
+
   WaitingThreadIntProducer::~WaitingThreadIntProducer() {
-    if(m_server) {
+    if (m_server) {
       m_server->stop();
     }
   }
 
   void WaitingThreadIntProducer::preallocate(edm::PreallocationConfiguration const& iPrealloc) {
     unsigned int iNStreams = iPrealloc.numberOfStreams();
-    m_server = std::make_unique<WaitingServer>(iNStreams,
-                                               m_numberOfStreamsToAccumulate <=iNStreams? m_numberOfStreamsToAccumulate : iNStreams,
-                                               m_secondsToWaitForWork);
+    m_server = std::make_unique<WaitingServer>(
+        iNStreams,
+        m_numberOfStreamsToAccumulate <= iNStreams ? m_numberOfStreamsToAccumulate : iNStreams,
+        m_secondsToWaitForWork);
     m_server->start();
   }
-  
+
   void WaitingThreadIntProducer::endJob() {
-    if(m_server) {
+    if (m_server) {
       m_server->stop();
     }
     m_server.reset();
   }
 
-
   // Functions that gets called by framework every event
   void WaitingThreadIntProducer::produce(edm::StreamID iID, edm::Event& e, edm::EventSetup const&) const {
     std::vector<int> retrieved;
-    
-    for(auto const& token: m_tokens) {
+
+    for (auto const& token : m_tokens) {
       retrieved.push_back(e.get(token).value);
     }
-    
+
     std::vector<int> values;
-    
+
     auto taskToWait = edm::make_empty_waiting_task();
     taskToWait->set_ref_count(2);
     std::atomic<std::vector<int>*> sync{&values};
-    
+
     m_server->requestValuesAsync(iID, &retrieved, &sync, taskToWait.get());
     taskToWait->decrement_ref_count();
-    
+
     taskToWait->wait_for_all();
-    
+
     //make sure the memory is actually synced
     auto& tValues = *sync.load();
-    
+
     int sum = 0;
-    for(auto v : tValues) {
+    for (auto v : tValues) {
       sum += v;
     }
     e.put(std::make_unique<IntProduct>(sum));
   }
-}
+}  // namespace edmtest
 
 using edmtest::WaitingThreadIntProducer;
 DEFINE_FWK_MODULE(WaitingThreadIntProducer);
diff --git a/FWCore/Integration/test/WhatsIt.cc b/FWCore/Integration/test/WhatsIt.cc
index 182b8f71fd79a..a86b5fc928716 100644
--- a/FWCore/Integration/test/WhatsIt.cc
+++ b/FWCore/Integration/test/WhatsIt.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Integration
 // Class  :     WhatsIt
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
diff --git a/FWCore/Integration/test/WhatsIt.h b/FWCore/Integration/test/WhatsIt.h
index f2b0c37b5dd7b..e0573c415260a 100644
--- a/FWCore/Integration/test/WhatsIt.h
+++ b/FWCore/Integration/test/WhatsIt.h
@@ -4,7 +4,7 @@
 //
 // Package:     Integration
 // Class  :     WhatsIt
-// 
+//
 /**\class WhatsIt WhatsIt.h FWCore/Integration/interface/WhatsIt.h
 
  Description: Dummy class used to test the EventSetup in the integration test
@@ -25,11 +25,10 @@
 // forward declarations
 
 namespace edmtest {
-struct WhatsIt
-{
-   WhatsIt() : a() {}
-   int a;
-};
-}
+  struct WhatsIt {
+    WhatsIt() : a() {}
+    int a;
+  };
+}  // namespace edmtest
 
 #endif
diff --git a/FWCore/Integration/test/WhatsItAnalyzer.cc b/FWCore/Integration/test/WhatsItAnalyzer.cc
index 909745e2cedca..1b067576bab0c 100644
--- a/FWCore/Integration/test/WhatsItAnalyzer.cc
+++ b/FWCore/Integration/test/WhatsItAnalyzer.cc
@@ -2,7 +2,7 @@
 //
 // Package:    WhatsItAnalyzer
 // Class:      WhatsItAnalyzer
-// 
+//
 /**\class WhatsItAnalyzer WhatsItAnalyzer.cc test/WhatsItAnalyzer/src/WhatsItAnalyzer.cc
 
  Description: <one line class summary>
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <iostream>
@@ -27,7 +26,6 @@
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-
 #include "FWCore/Integration/test/WhatsIt.h"
 #include "FWCore/Integration/test/GadgetRcd.h"
 
@@ -41,66 +39,53 @@
 
 namespace edmtest {
 
-class WhatsItAnalyzer : public edm::EDAnalyzer {
-   public:
-      explicit WhatsItAnalyzer(const edm::ParameterSet&);
-      ~WhatsItAnalyzer();
-
-
-      virtual void analyze(const edm::Event&, const edm::EventSetup&);
-   private:
-
-      void getAndTest(GadgetRcd const& record,
-                      edm::ESHandle<WhatsIt>& handle,
-                      int expectedValue,
-                      const char* label);
-
-      // ----------member data ---------------------------
-      std::vector<int> expectedValues_;
-      unsigned int index_;
-};
-
-//
-// constants, enums and typedefs
-//
-
-//
-// static data member definitions
-//
-
-//
-// constructors and destructor
-//
-WhatsItAnalyzer::WhatsItAnalyzer(const edm::ParameterSet& iConfig):
-   expectedValues_(iConfig.getUntrackedParameter<std::vector<int> >("expectedValues",std::vector<int>())),
-   index_(0)
-{
-   //now do what ever initialization is needed
-
-}
-
-
-WhatsItAnalyzer::~WhatsItAnalyzer()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
-}
-
-
-//
-// member functions
-//
-
-// ------------ method called to produce the data  ------------
-void
-WhatsItAnalyzer::analyze(const edm::Event& /*iEvent*/, const edm::EventSetup& iSetup)
-{
-   edm::ESHandle<WhatsIt> pSetup;
-   GadgetRcd const& gadgetRcd = iSetup.get<GadgetRcd>();
-
-   if (index_ < expectedValues_.size()) {
+  class WhatsItAnalyzer : public edm::EDAnalyzer {
+  public:
+    explicit WhatsItAnalyzer(const edm::ParameterSet&);
+    ~WhatsItAnalyzer();
+
+    virtual void analyze(const edm::Event&, const edm::EventSetup&);
+
+  private:
+    void getAndTest(GadgetRcd const& record, edm::ESHandle<WhatsIt>& handle, int expectedValue, const char* label);
+
+    // ----------member data ---------------------------
+    std::vector<int> expectedValues_;
+    unsigned int index_;
+  };
+
+  //
+  // constants, enums and typedefs
+  //
+
+  //
+  // static data member definitions
+  //
+
+  //
+  // constructors and destructor
+  //
+  WhatsItAnalyzer::WhatsItAnalyzer(const edm::ParameterSet& iConfig)
+      : expectedValues_(iConfig.getUntrackedParameter<std::vector<int> >("expectedValues", std::vector<int>())),
+        index_(0) {
+    //now do what ever initialization is needed
+  }
+
+  WhatsItAnalyzer::~WhatsItAnalyzer() {
+    // do anything here that needs to be done at desctruction time
+    // (e.g. close files, deallocate resources etc.)
+  }
+
+  //
+  // member functions
+  //
+
+  // ------------ method called to produce the data  ------------
+  void WhatsItAnalyzer::analyze(const edm::Event& /*iEvent*/, const edm::EventSetup& iSetup) {
+    edm::ESHandle<WhatsIt> pSetup;
+    GadgetRcd const& gadgetRcd = iSetup.get<GadgetRcd>();
+
+    if (index_ < expectedValues_.size()) {
       int expectedValue = expectedValues_.at(index_);
       getAndTest(gadgetRcd, pSetup, expectedValue, "");
       getAndTest(gadgetRcd, pSetup, expectedValue, "A");
@@ -108,20 +93,19 @@ WhatsItAnalyzer::analyze(const edm::Event& /*iEvent*/, const edm::EventSetup& iS
       getAndTest(gadgetRcd, pSetup, expectedValue, "C");
       getAndTest(gadgetRcd, pSetup, expectedValue, "D");
       ++index_;
-   }
-}
-
-void WhatsItAnalyzer::getAndTest(GadgetRcd const& record,
-                                 edm::ESHandle<WhatsIt>& handle,
-                                 int expectedValue,
-                                 const char* label) {
-   record.get(label, handle);
-   if (expectedValue != handle->a) {
-      throw cms::Exception("TestFail") << label << ": expected value " << expectedValue
-         << " but got "<< handle->a;
-   }
-}
-}
+    }
+  }
+
+  void WhatsItAnalyzer::getAndTest(GadgetRcd const& record,
+                                   edm::ESHandle<WhatsIt>& handle,
+                                   int expectedValue,
+                                   const char* label) {
+    record.get(label, handle);
+    if (expectedValue != handle->a) {
+      throw cms::Exception("TestFail") << label << ": expected value " << expectedValue << " but got " << handle->a;
+    }
+  }
+}  // namespace edmtest
 using namespace edmtest;
 //define this as a plug-in
 DEFINE_FWK_MODULE(WhatsItAnalyzer);
diff --git a/FWCore/Integration/test/WhatsItESProducer.cc b/FWCore/Integration/test/WhatsItESProducer.cc
index dcd14377193ac..927e500e788ac 100644
--- a/FWCore/Integration/test/WhatsItESProducer.cc
+++ b/FWCore/Integration/test/WhatsItESProducer.cc
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <optional>
@@ -40,135 +39,122 @@
 //
 namespace edmtest {
 
-class WhatsItESProducer : public edm::ESProducer {
-   public:
-      WhatsItESProducer(edm::ParameterSet const& pset);
-      ~WhatsItESProducer();
-
-      typedef std::unique_ptr<WhatsIt> ReturnType;
-      typedef std::unique_ptr<const WhatsIt> ReturnTypeA;
-      typedef std::shared_ptr<WhatsIt> ReturnTypeB;
-      typedef std::shared_ptr<const WhatsIt> ReturnTypeC;
-      typedef std::optional<WhatsIt> ReturnTypeD;
-
-      ReturnType produce(const GadgetRcd &);
-      ReturnTypeA produceA(const GadgetRcd &);
-      ReturnTypeB produceB(const GadgetRcd &);
-      ReturnTypeC produceC(const GadgetRcd &);
-      ReturnTypeD produceD(const GadgetRcd &);
-
-      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-
-   private:
-      // ----------member data ---------------------------
-      edm::ESGetToken<edmtest::Doodad,GadgetRcd> token_;
-      edm::ESGetToken<edmtest::Doodad,GadgetRcd> tokenA_;
-      edm::ESGetToken<edmtest::Doodad,GadgetRcd> tokenB_;
-      edm::ESGetToken<edmtest::Doodad,GadgetRcd> tokenC_;
-      edm::ESGetToken<edmtest::Doodad,GadgetRcd> tokenD_;
-};
+  class WhatsItESProducer : public edm::ESProducer {
+  public:
+    WhatsItESProducer(edm::ParameterSet const& pset);
+    ~WhatsItESProducer();
+
+    typedef std::unique_ptr<WhatsIt> ReturnType;
+    typedef std::unique_ptr<const WhatsIt> ReturnTypeA;
+    typedef std::shared_ptr<WhatsIt> ReturnTypeB;
+    typedef std::shared_ptr<const WhatsIt> ReturnTypeC;
+    typedef std::optional<WhatsIt> ReturnTypeD;
+
+    ReturnType produce(const GadgetRcd&);
+    ReturnTypeA produceA(const GadgetRcd&);
+    ReturnTypeB produceB(const GadgetRcd&);
+    ReturnTypeC produceC(const GadgetRcd&);
+    ReturnTypeD produceD(const GadgetRcd&);
+
+    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
+  private:
+    // ----------member data ---------------------------
+    edm::ESGetToken<edmtest::Doodad, GadgetRcd> token_;
+    edm::ESGetToken<edmtest::Doodad, GadgetRcd> tokenA_;
+    edm::ESGetToken<edmtest::Doodad, GadgetRcd> tokenB_;
+    edm::ESGetToken<edmtest::Doodad, GadgetRcd> tokenC_;
+    edm::ESGetToken<edmtest::Doodad, GadgetRcd> tokenD_;
+  };
+
+  //
+  // constants, enums and typedefs
+  //
+
+  //
+  // static data member definitions
+  //
+
+  //
+  // constructors and destructor
+  //
+  WhatsItESProducer::WhatsItESProducer(edm::ParameterSet const& pset) {
+    if (pset.getUntrackedParameter<bool>("test", true)) {
+      throw edm::Exception(edm::errors::Configuration, "Something is wrong with ESProducer validation\n")
+          << "Or the test configuration parameter was set true (it should never be true unless you want this "
+             "exception)\n";
+    }
+
+    //the following line is needed to tell the framework what
+    // data is being produced
+    auto collector = setWhatProduced(this);
+    auto collectorA = setWhatProduced(this, &WhatsItESProducer::produceA, edm::es::Label("A"));
+    auto collectorB = setWhatProduced(this, &WhatsItESProducer::produceB, edm::es::Label("B"));
+    auto collectorC = setWhatProduced(this, &WhatsItESProducer::produceC, edm::es::Label("C"));
+    auto collectorD = setWhatProduced(this, &WhatsItESProducer::produceD, edm::es::Label("D"));
+
+    //now do what ever other initialization is needed
+    auto const data_label = pset.exists("doodadLabel") ? pset.getParameter<std::string>("doodadLabel") : std::string{};
+    token_ = collector.consumes<edmtest::Doodad>(edm::ESInputTag{"", data_label});
+    tokenA_ = collectorA.consumes<edmtest::Doodad>(edm::ESInputTag{"", data_label});
+    tokenB_ = collectorB.consumes<edmtest::Doodad>(edm::ESInputTag{"", data_label});
+    tokenC_ = collectorC.consumes<edmtest::Doodad>(edm::ESInputTag{"", data_label});
+    tokenD_ = collectorD.consumes<edmtest::Doodad>(edm::ESInputTag{"", data_label});
+  }
 
-//
-// constants, enums and typedefs
-//
+  WhatsItESProducer::~WhatsItESProducer() {
+    // do anything here that needs to be done at desctruction time
+    // (e.g. close files, deallocate resources etc.)
+  }
 
-//
-// static data member definitions
-//
+  //
+  // member functions
+  //
 
-//
-// constructors and destructor
-//
-WhatsItESProducer::WhatsItESProducer(edm::ParameterSet const& pset)
-{
-  if (pset.getUntrackedParameter<bool>("test", true)) {
-     throw edm::Exception(edm::errors::Configuration, "Something is wrong with ESProducer validation\n")
-       << "Or the test configuration parameter was set true (it should never be true unless you want this exception)\n";
+  // ------------ method called to produce the data  ------------
+  WhatsItESProducer::ReturnType WhatsItESProducer::produce(const GadgetRcd& iRecord) {
+    edm::ESHandle<Doodad> doodad = iRecord.getHandle(token_);
+    auto pWhatsIt = std::make_unique<WhatsIt>();
+    pWhatsIt->a = doodad->a;
+    return pWhatsIt;
   }
 
-  //the following line is needed to tell the framework what
-  // data is being produced
-  auto collector = setWhatProduced(this);
-  auto collectorA = setWhatProduced(this, &WhatsItESProducer::produceA, edm::es::Label("A"));
-  auto collectorB = setWhatProduced(this, &WhatsItESProducer::produceB, edm::es::Label("B"));
-  auto collectorC = setWhatProduced(this, &WhatsItESProducer::produceC, edm::es::Label("C"));
-  auto collectorD = setWhatProduced(this, &WhatsItESProducer::produceD, edm::es::Label("D"));
-
-  //now do what ever other initialization is needed
-  auto const data_label = pset.exists("doodadLabel") ? pset.getParameter<std::string>("doodadLabel"): std::string{};
-  token_ = collector.consumes<edmtest::Doodad>(edm::ESInputTag{"", data_label});
-  tokenA_ = collectorA.consumes<edmtest::Doodad>(edm::ESInputTag{"", data_label});
-  tokenB_ = collectorB.consumes<edmtest::Doodad>(edm::ESInputTag{"", data_label});
-  tokenC_ = collectorC.consumes<edmtest::Doodad>(edm::ESInputTag{"", data_label});
-  tokenD_ = collectorD.consumes<edmtest::Doodad>(edm::ESInputTag{"", data_label});
-}
-
-WhatsItESProducer::~WhatsItESProducer()
-{
-  // do anything here that needs to be done at desctruction time
-  // (e.g. close files, deallocate resources etc.)
-}
+  WhatsItESProducer::ReturnTypeA WhatsItESProducer::produceA(const GadgetRcd& iRecord) {
+    edm::ESHandle<Doodad> doodad = iRecord.getHandle(tokenA_);
+    auto pWhatsIt = std::make_unique<WhatsIt>();
+    pWhatsIt->a = doodad->a;
+    return pWhatsIt;
+  }
 
+  WhatsItESProducer::ReturnTypeB WhatsItESProducer::produceB(const GadgetRcd& iRecord) {
+    edm::ESHandle<Doodad> doodad = iRecord.getHandle(tokenB_);
+    auto pWhatsIt = std::make_shared<WhatsIt>();
+    pWhatsIt->a = doodad->a;
+    return pWhatsIt;
+  }
 
-//
-// member functions
-//
+  WhatsItESProducer::ReturnTypeC WhatsItESProducer::produceC(const GadgetRcd& iRecord) {
+    edm::ESHandle<Doodad> doodad = iRecord.getHandle(tokenC_);
+    auto pWhatsIt = std::make_shared<WhatsIt>();
+    pWhatsIt->a = doodad->a;
+    return pWhatsIt;
+  }
+
+  WhatsItESProducer::ReturnTypeD WhatsItESProducer::produceD(const GadgetRcd& iRecord) {
+    edm::ESHandle<Doodad> doodad = iRecord.getHandle(tokenD_);
+    auto pWhatsIt = std::make_optional<WhatsIt>();
+    pWhatsIt->a = doodad->a;
+    return pWhatsIt;
+  }
 
-// ------------ method called to produce the data  ------------
-WhatsItESProducer::ReturnType
-WhatsItESProducer::produce(const GadgetRcd& iRecord)
-{
-   edm::ESHandle<Doodad> doodad = iRecord.getHandle(token_);
-   auto pWhatsIt = std::make_unique<WhatsIt>() ;
-   pWhatsIt->a = doodad->a;
-   return pWhatsIt ;
-}
-
-WhatsItESProducer::ReturnTypeA
-WhatsItESProducer::produceA(const GadgetRcd& iRecord)
-{
-   edm::ESHandle<Doodad> doodad = iRecord.getHandle(tokenA_);
-   auto pWhatsIt = std::make_unique<WhatsIt>() ;
-   pWhatsIt->a = doodad->a;
-   return pWhatsIt ;
-}
-
-WhatsItESProducer::ReturnTypeB
-WhatsItESProducer::produceB(const GadgetRcd& iRecord)
-{
-   edm::ESHandle<Doodad> doodad = iRecord.getHandle(tokenB_);
-   auto pWhatsIt = std::make_shared<WhatsIt>() ;
-   pWhatsIt->a = doodad->a;
-   return pWhatsIt ;
-}
-
-WhatsItESProducer::ReturnTypeC
-WhatsItESProducer::produceC(const GadgetRcd& iRecord)
-{
-   edm::ESHandle<Doodad> doodad = iRecord.getHandle(tokenC_);
-   auto pWhatsIt = std::make_shared<WhatsIt>() ;
-   pWhatsIt->a = doodad->a;
-   return pWhatsIt ;
-}
-
-WhatsItESProducer::ReturnTypeD
-WhatsItESProducer::produceD(const GadgetRcd& iRecord)
-{
-   edm::ESHandle<Doodad> doodad = iRecord.getHandle(tokenD_);
-   auto pWhatsIt = std::make_optional<WhatsIt>() ;
-   pWhatsIt->a = doodad->a;
-   return pWhatsIt ;
-}
-
-void
-WhatsItESProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-  edm::ParameterSetDescription desc;
-  desc.addOptional<std::string>("doodadLabel");
-  desc.addUntracked<bool>("test", false)->
-    setComment("This parameter exists only to test the parameter set validation for ESSources");
-  descriptions.add("WhatsItESProducer", desc);
-}
-}
+  void WhatsItESProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+    edm::ParameterSetDescription desc;
+    desc.addOptional<std::string>("doodadLabel");
+    desc.addUntracked<bool>("test", false)
+        ->setComment("This parameter exists only to test the parameter set validation for ESSources");
+    descriptions.add("WhatsItESProducer", desc);
+  }
+}  // namespace edmtest
 using namespace edmtest;
 //define this as a plug-in
 DEFINE_FWK_EVENTSETUP_MODULE(WhatsItESProducer);
diff --git a/FWCore/Integration/test/WhatsItExtensionCordAnalyzer.cc b/FWCore/Integration/test/WhatsItExtensionCordAnalyzer.cc
index d393ccbe749b0..5fbb5e7169eeb 100644
--- a/FWCore/Integration/test/WhatsItExtensionCordAnalyzer.cc
+++ b/FWCore/Integration/test/WhatsItExtensionCordAnalyzer.cc
@@ -2,7 +2,7 @@
 //
 // Package:    WhatsItExtensionCordAnalyzer
 // Class:      WhatsItExtensionCordAnalyzer
-// 
+//
 /**\class WhatsItExtensionCordAnalyzer WhatsItExtensionCordAnalyzer.cc test/WhatsItExtensionCordAnalyzer/src/WhatsItExtensionCordAnalyzer.cc
 
  Description: <one line class summary>
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <iostream>
@@ -26,11 +25,9 @@
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-
 #include "FWCore/Integration/test/WhatsIt.h"
 #include "FWCore/Integration/test/GadgetRcd.h"
 
-
 //Here is the ExtensionCord/Outlet headers
 #include "FWCore/Framework/interface/ESOutlet.h"
 #include "FWCore/Utilities/interface/ExtensionCord.h"
@@ -42,81 +39,69 @@
 namespace edmtest {
 
   class Last {
-public:
-    Last(const edm::ExtensionCord<WhatsIt>& iCord): cord_(iCord) {}
-    void doIt() {
-      std::cout <<"WhatsIt "<<cord_->a<<std::endl;
-    }
-private:
+  public:
+    Last(const edm::ExtensionCord<WhatsIt>& iCord) : cord_(iCord) {}
+    void doIt() { std::cout << "WhatsIt " << cord_->a << std::endl; }
+
+  private:
     edm::ExtensionCord<WhatsIt> cord_;
   };
-  
+
   class Middle {
-public:
-    Middle(const edm::ExtensionCord<WhatsIt>& iCord): last_(iCord) {}
-    void doIt() {
-      last_.doIt();
-    }
-private:
+  public:
+    Middle(const edm::ExtensionCord<WhatsIt>& iCord) : last_(iCord) {}
+    void doIt() { last_.doIt(); }
+
+  private:
     Last last_;
   };
-  
-class WhatsItExtensionCordAnalyzer : public edm::EDAnalyzer {
-   public:
-      explicit WhatsItExtensionCordAnalyzer(const edm::ParameterSet&);
-      ~WhatsItExtensionCordAnalyzer();
-
 
-      virtual void analyze(const edm::Event&, const edm::EventSetup&);
-   private:
-      // ----------member data ---------------------------
-        edm::ExtensionCord<WhatsIt> cord_;
-        Middle middle_;
-};
+  class WhatsItExtensionCordAnalyzer : public edm::EDAnalyzer {
+  public:
+    explicit WhatsItExtensionCordAnalyzer(const edm::ParameterSet&);
+    ~WhatsItExtensionCordAnalyzer();
 
-//
-// constants, enums and typedefs
-//
+    virtual void analyze(const edm::Event&, const edm::EventSetup&);
 
-//
-// static data member definitions
-//
-
-//
-// constructors and destructor
-//
-WhatsItExtensionCordAnalyzer::WhatsItExtensionCordAnalyzer(const edm::ParameterSet& /*iConfig*/) :
-cord_(),
-middle_(cord_)
-{
-   //now do what ever initialization is needed
+  private:
+    // ----------member data ---------------------------
+    edm::ExtensionCord<WhatsIt> cord_;
+    Middle middle_;
+  };
 
-}
+  //
+  // constants, enums and typedefs
+  //
 
+  //
+  // static data member definitions
+  //
 
-WhatsItExtensionCordAnalyzer::~WhatsItExtensionCordAnalyzer()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+  //
+  // constructors and destructor
+  //
+  WhatsItExtensionCordAnalyzer::WhatsItExtensionCordAnalyzer(const edm::ParameterSet& /*iConfig*/)
+      : cord_(), middle_(cord_) {
+    //now do what ever initialization is needed
+  }
 
-}
+  WhatsItExtensionCordAnalyzer::~WhatsItExtensionCordAnalyzer() {
+    // do anything here that needs to be done at desctruction time
+    // (e.g. close files, deallocate resources etc.)
+  }
 
+  //
+  // member functions
+  //
 
-//
-// member functions
-//
+  // ------------ method called to produce the data  ------------
+  void WhatsItExtensionCordAnalyzer::analyze(const edm::Event& /*iEvent*/, const edm::EventSetup& iSetup) {
+    edm::ESOutlet<WhatsIt, GadgetRcd> outlet(iSetup, cord_);
 
-// ------------ method called to produce the data  ------------
-void
-WhatsItExtensionCordAnalyzer::analyze(const edm::Event& /*iEvent*/, const edm::EventSetup& iSetup)
-{
-  edm::ESOutlet<WhatsIt,GadgetRcd> outlet( iSetup, cord_ );
-  
-  middle_.doIt();
-}
+    middle_.doIt();
+  }
 
-}
+}  // namespace edmtest
 using namespace edmtest;
 //define this as a plug-in
 DEFINE_FWK_MODULE(WhatsItExtensionCordAnalyzer);
diff --git a/FWCore/Integration/test/WhatsItWatcherAnalyzer.cc b/FWCore/Integration/test/WhatsItWatcherAnalyzer.cc
index 587c3fc06fa5a..64d74c6a792ac 100644
--- a/FWCore/Integration/test/WhatsItWatcherAnalyzer.cc
+++ b/FWCore/Integration/test/WhatsItWatcherAnalyzer.cc
@@ -2,7 +2,7 @@
 //
 // Package:    WhatsItWatcherAnalyzer
 // Class:      WhatsItWatcherAnalyzer
-// 
+//
 /**\class WhatsItWatcherAnalyzer WhatsItWatcherAnalyzer.cc test/WhatsItWatcherAnalyzer/src/WhatsItWatcherAnalyzer.cc
 
  Description: <one line class summary>
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <iostream>
@@ -26,7 +25,6 @@
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-
 #include "FWCore/Integration/test/WhatsIt.h"
 #include "FWCore/Integration/test/GadgetRcd.h"
 
@@ -40,88 +38,74 @@
 
 namespace edmtest {
 
-class WhatsItWatcherAnalyzer : public edm::EDAnalyzer {
-   public:
-      explicit WhatsItWatcherAnalyzer(const edm::ParameterSet&);
-      ~WhatsItWatcherAnalyzer();
-
-
-      virtual void analyze(const edm::Event&, const edm::EventSetup&);
-   private:
-      // ----------member data ---------------------------
-        void watch1(const GadgetRcd& );
-        void watch2(const GadgetRcd& );
-        
-        edm::ESWatcher<GadgetRcd> watch1_;
-        edm::ESWatcher<GadgetRcd> watch2_;
-        edm::ESWatcher<GadgetRcd> watchBool_;
-
-};
-
-//
-// constants, enums and typedefs
-//
-
-//
-// static data member definitions
-//
-
-//
-// constructors and destructor
-//
-WhatsItWatcherAnalyzer::WhatsItWatcherAnalyzer(const edm::ParameterSet& /*iConfig*/):
-  watch1_(this,&WhatsItWatcherAnalyzer::watch1),
-  watch2_(std::bind(&WhatsItWatcherAnalyzer::watch2,this,std::placeholders::_1)),
-  watchBool_()
-{
-   //now do what ever initialization is needed
-
-}
-
-
-WhatsItWatcherAnalyzer::~WhatsItWatcherAnalyzer()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
-}
-
-
-//
-// member functions
-//
-
-// ------------ method called to produce the data  ------------
-void
-WhatsItWatcherAnalyzer::analyze(const edm::Event& /*iEvent*/, const edm::EventSetup& iSetup)
-{
-   bool w1 = watch1_.check(iSetup);
-   bool w2 = watch2_.check(iSetup);
-   bool w3 = watchBool_.check(iSetup);
-   assert(w1 == w2);
-   assert(w2 == w3 );
-}
-
-void
-WhatsItWatcherAnalyzer::watch1(const GadgetRcd& iRcd)
-{
-  edm::ESHandle<edmtest::WhatsIt> pSetup;
-  iRcd.get(pSetup);
-  
-  std::cout <<"watch1: WhatsIt "<<pSetup->a<<" changed"<<std::endl;
-}
-
-void
-WhatsItWatcherAnalyzer::watch2(const GadgetRcd& iRcd)
-{
-  edm::ESHandle<WhatsIt> pSetup;
-  iRcd.get(pSetup);
-  
-  std::cout <<"watch2: WhatsIt "<<pSetup->a<<" changed"<<std::endl;
-}
-
-}
+  class WhatsItWatcherAnalyzer : public edm::EDAnalyzer {
+  public:
+    explicit WhatsItWatcherAnalyzer(const edm::ParameterSet&);
+    ~WhatsItWatcherAnalyzer();
+
+    virtual void analyze(const edm::Event&, const edm::EventSetup&);
+
+  private:
+    // ----------member data ---------------------------
+    void watch1(const GadgetRcd&);
+    void watch2(const GadgetRcd&);
+
+    edm::ESWatcher<GadgetRcd> watch1_;
+    edm::ESWatcher<GadgetRcd> watch2_;
+    edm::ESWatcher<GadgetRcd> watchBool_;
+  };
+
+  //
+  // constants, enums and typedefs
+  //
+
+  //
+  // static data member definitions
+  //
+
+  //
+  // constructors and destructor
+  //
+  WhatsItWatcherAnalyzer::WhatsItWatcherAnalyzer(const edm::ParameterSet& /*iConfig*/)
+      : watch1_(this, &WhatsItWatcherAnalyzer::watch1),
+        watch2_(std::bind(&WhatsItWatcherAnalyzer::watch2, this, std::placeholders::_1)),
+        watchBool_() {
+    //now do what ever initialization is needed
+  }
+
+  WhatsItWatcherAnalyzer::~WhatsItWatcherAnalyzer() {
+    // do anything here that needs to be done at desctruction time
+    // (e.g. close files, deallocate resources etc.)
+  }
+
+  //
+  // member functions
+  //
+
+  // ------------ method called to produce the data  ------------
+  void WhatsItWatcherAnalyzer::analyze(const edm::Event& /*iEvent*/, const edm::EventSetup& iSetup) {
+    bool w1 = watch1_.check(iSetup);
+    bool w2 = watch2_.check(iSetup);
+    bool w3 = watchBool_.check(iSetup);
+    assert(w1 == w2);
+    assert(w2 == w3);
+  }
+
+  void WhatsItWatcherAnalyzer::watch1(const GadgetRcd& iRcd) {
+    edm::ESHandle<edmtest::WhatsIt> pSetup;
+    iRcd.get(pSetup);
+
+    std::cout << "watch1: WhatsIt " << pSetup->a << " changed" << std::endl;
+  }
+
+  void WhatsItWatcherAnalyzer::watch2(const GadgetRcd& iRcd) {
+    edm::ESHandle<WhatsIt> pSetup;
+    iRcd.get(pSetup);
+
+    std::cout << "watch2: WhatsIt " << pSetup->a << " changed" << std::endl;
+  }
+
+}  // namespace edmtest
 using namespace edmtest;
 //define this as a plug-in
 DEFINE_FWK_MODULE(WhatsItWatcherAnalyzer);
diff --git a/FWCore/Integration/test/standalone_t.cppunit.cc b/FWCore/Integration/test/standalone_t.cppunit.cc
index 1196eba2e80d9..c4c726a1a7e8b 100644
--- a/FWCore/Integration/test/standalone_t.cppunit.cc
+++ b/FWCore/Integration/test/standalone_t.cppunit.cc
@@ -7,7 +7,7 @@ setup the MessageLogger in this test. Note that tests like
 this will hang after 1000 messages are sent to the MessageLogger
 if the MessageLogger is not runnning.
 
-----------------------------------------------------------------------*/  
+----------------------------------------------------------------------*/
 
 #include "FWCore/PluginManager/interface/ProblemTracker.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -23,59 +23,50 @@ if the MessageLogger is not runnning.
 #include <memory>
 #include <string>
 
-class testStandalone: public CppUnit::TestFixture
-{
+class testStandalone : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testStandalone);
   CPPUNIT_TEST(writeAndReadFile);
   CPPUNIT_TEST_SUITE_END();
 
-
- public:
-
-  void setUp()
-  {
+public:
+  void setUp() {
     m_handler = std::make_unique<edm::AssertHandler>();
     m_scheduler = std::make_unique<tbb::task_scheduler_init>(1);
   }
 
-  void tearDown(){
-    m_handler = nullptr; // propagate_const<T> has no reset() function
+  void tearDown() {
+    m_handler = nullptr;  // propagate_const<T> has no reset() function
   }
 
   void writeAndReadFile();
 
- private:
-
+private:
   edm::propagate_const<std::unique_ptr<edm::AssertHandler>> m_handler;
   edm::propagate_const<std::unique_ptr<tbb::task_scheduler_init>> m_scheduler;
-  
-  
 };
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testStandalone);
 
-
-
-void testStandalone::writeAndReadFile()
-{
+void testStandalone::writeAndReadFile() {
   {
-    std::string configuration("import FWCore.ParameterSet.Config as cms\n"
-                              "process = cms.Process('TEST')\n"
-                              "process.maxEvents = cms.untracked.PSet(\n"
-                              "    input = cms.untracked.int32(5)\n"
-                              ")\n"
-                              "process.source = cms.Source('EmptySource')\n"
-                              "process.JobReportService = cms.Service('JobReportService')\n"
-                              "process.InitRootHandlers = cms.Service('InitRootHandlers')\n"
-                              "process.m1 = cms.EDProducer('IntProducer',\n"
-                              "    ivalue = cms.int32(11)\n"
-                              ")\n"
-                              "process.out = cms.OutputModule('PoolOutputModule',\n"
-                              "    fileName = cms.untracked.string('testStandalone.root')\n"
-                              ")\n"
-                              "process.p = cms.Path(process.m1)\n"
-                              "process.e = cms.EndPath(process.out)\n");
+    std::string configuration(
+        "import FWCore.ParameterSet.Config as cms\n"
+        "process = cms.Process('TEST')\n"
+        "process.maxEvents = cms.untracked.PSet(\n"
+        "    input = cms.untracked.int32(5)\n"
+        ")\n"
+        "process.source = cms.Source('EmptySource')\n"
+        "process.JobReportService = cms.Service('JobReportService')\n"
+        "process.InitRootHandlers = cms.Service('InitRootHandlers')\n"
+        "process.m1 = cms.EDProducer('IntProducer',\n"
+        "    ivalue = cms.int32(11)\n"
+        ")\n"
+        "process.out = cms.OutputModule('PoolOutputModule',\n"
+        "    fileName = cms.untracked.string('testStandalone.root')\n"
+        ")\n"
+        "process.p = cms.Path(process.m1)\n"
+        "process.e = cms.EndPath(process.out)\n");
 
     edm::EventProcessor proc(edm::getPSetFromConfig(configuration));
     proc.beginJob();
@@ -84,15 +75,15 @@ void testStandalone::writeAndReadFile()
   }
 
   {
-    std::string configuration("import FWCore.ParameterSet.Config as cms\n"
-                              "process = cms.Process('TEST1')\n"
-                              "process.source = cms.Source('PoolSource',\n"
-                              "    fileNames = cms.untracked.vstring('file:testStandalone.root')\n"
-                              ")\n"
-                              "process.InitRootHandlers = cms.Service('InitRootHandlers')\n"
-                              "process.JobReportService = cms.Service('JobReportService')\n"
-                              "process.add_(cms.Service('SiteLocalConfigService'))\n"
-                             );
+    std::string configuration(
+        "import FWCore.ParameterSet.Config as cms\n"
+        "process = cms.Process('TEST1')\n"
+        "process.source = cms.Source('PoolSource',\n"
+        "    fileNames = cms.untracked.vstring('file:testStandalone.root')\n"
+        ")\n"
+        "process.InitRootHandlers = cms.Service('InitRootHandlers')\n"
+        "process.JobReportService = cms.Service('JobReportService')\n"
+        "process.add_(cms.Service('SiteLocalConfigService'))\n");
 
     edm::EventProcessor proc(edm::getPSetFromConfig(configuration));
     proc.beginJob();
diff --git a/FWCore/Integration/test/testSubProcessEventSetup_cfg.py b/FWCore/Integration/test/testSubProcessEventSetup_cfg.py
index 0d653eaccf07c..a09c13176eff3 100644
--- a/FWCore/Integration/test/testSubProcessEventSetup_cfg.py
+++ b/FWCore/Integration/test/testSubProcessEventSetup_cfg.py
@@ -4,7 +4,7 @@
 
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
 process.MessageLogger.cerr.threshold = 'INFO'
-process.MessageLogger.cerr.INFO.limit = 100
+process.MessageLogger.cerr.INFO.limit = 200
 
 #process.options = cms.untracked.PSet(forceEventSetupCacheClearOnNewRun = cms.untracked.bool(True))
 
diff --git a/FWCore/MessageLogger/interface/AbstractMLscribe.h b/FWCore/MessageLogger/interface/AbstractMLscribe.h
index 13db8d3d3315f..900160a304f8d 100644
--- a/FWCore/MessageLogger/interface/AbstractMLscribe.h
+++ b/FWCore/MessageLogger/interface/AbstractMLscribe.h
@@ -3,29 +3,26 @@
 
 #include "FWCore/MessageLogger/interface/MessageLoggerQ.h"
 
-namespace edm  {
-namespace service {       
+namespace edm {
+  namespace service {
 
-class AbstractMLscribe 
-{
-public:
-  // ---  birth/death:
-  AbstractMLscribe();
-  virtual ~AbstractMLscribe();
+    class AbstractMLscribe {
+    public:
+      // ---  birth/death:
+      AbstractMLscribe();
+      virtual ~AbstractMLscribe();
 
-  // ---  methods needed for logging
-  virtual
-  void  runCommand(MessageLoggerQ::OpCode  opcode, void * operand);
+      // ---  methods needed for logging
+      virtual void runCommand(MessageLoggerQ::OpCode opcode, void *operand);
 
-private:
-  // --- no copying:
-  AbstractMLscribe(AbstractMLscribe const &) = delete;
-  void  operator = (AbstractMLscribe const &) = delete;
+    private:
+      // --- no copying:
+      AbstractMLscribe(AbstractMLscribe const &) = delete;
+      void operator=(AbstractMLscribe const &) = delete;
 
-};  // AbstractMLscribe
+    };  // AbstractMLscribe
 
-}   // end of namespace service
+  }  // end of namespace service
 }  // namespace edm
 
-
-#endif // FWCore_MessageLogger_AbstractMLscribe_h
+#endif  // FWCore_MessageLogger_AbstractMLscribe_h
diff --git a/FWCore/MessageLogger/interface/ConfigurationHandshake.h b/FWCore/MessageLogger/interface/ConfigurationHandshake.h
index d5b67a59cb723..967c3adde1504 100644
--- a/FWCore/MessageLogger/interface/ConfigurationHandshake.h
+++ b/FWCore/MessageLogger/interface/ConfigurationHandshake.h
@@ -17,9 +17,8 @@ namespace edm {
     std::mutex m;
     std::condition_variable c;
     edm::Place_for_passing_exception_ptr epp;
-    explicit ConfigurationHandshake 
-      (void* p_in, Place_for_passing_exception_ptr epp_in) : 
-    			      p(p_in), m(), c(), epp(epp_in) {}   
-  };  
+    explicit ConfigurationHandshake(void* p_in, Place_for_passing_exception_ptr epp_in)
+        : p(p_in), m(), c(), epp(epp_in) {}
+  };
 }  // namespace edm
 #endif  // FWCore_MessageLogger_ConfigurationHandshake_h
diff --git a/FWCore/MessageLogger/interface/ELextendedID.h b/FWCore/MessageLogger/interface/ELextendedID.h
index 13d62105fdea4..25a9ebc42235d 100644
--- a/FWCore/MessageLogger/interface/ELextendedID.h
+++ b/FWCore/MessageLogger/interface/ELextendedID.h
@@ -1,7 +1,6 @@
 #ifndef MessageLogger_ELextendedID_h
 #define MessageLogger_ELextendedID_h
 
-
 // ----------------------------------------------------------------------
 //
 // ELextendedID.h	is used as a key in maps for both counting toward
@@ -13,44 +12,36 @@
 //
 // ----------------------------------------------------------------------
 
-
 #include "FWCore/MessageLogger/interface/ELstring.h"
 #include "FWCore/MessageLogger/interface/ELseverityLevel.h"
 
+namespace edm {
 
-namespace edm {       
-
-
-// ----------------------------------------------------------------------
-// ELextendedID:
-// ----------------------------------------------------------------------
-
-class ELextendedID  {
-
-public:
-
-  // -----  Publicly accessible data members:
-  //
-  ELstring        id;
-  ELseverityLevel severity;
-  ELstring        module;
-  ELstring        subroutine;
+  // ----------------------------------------------------------------------
+  // ELextendedID:
+  // ----------------------------------------------------------------------
 
-  // -----  Comparator:
-  //
-  bool operator<( const ELextendedID & xid ) const;
+  class ELextendedID {
+  public:
+    // -----  Publicly accessible data members:
+    //
+    ELstring id;
+    ELseverityLevel severity;
+    ELstring module;
+    ELstring subroutine;
 
-  // -----  (Re)initializer:
-  //
-  void clear();
+    // -----  Comparator:
+    //
+    bool operator<(const ELextendedID& xid) const;
 
-};  // ELextendedID
-
-
-// ----------------------------------------------------------------------
+    // -----  (Re)initializer:
+    //
+    void clear();
 
+  };  // ELextendedID
 
-}        // end of namespace edm
+  // ----------------------------------------------------------------------
 
+}  // end of namespace edm
 
 #endif  // MessageLogger_ELextendedID_h
diff --git a/FWCore/MessageLogger/interface/ELlist.h b/FWCore/MessageLogger/interface/ELlist.h
index 1e3abb6f6d9a2..881e88a5a8564 100644
--- a/FWCore/MessageLogger/interface/ELlist.h
+++ b/FWCore/MessageLogger/interface/ELlist.h
@@ -1,7 +1,6 @@
 #ifndef MessageLogger_ELlist_h
 #define MessageLogger_ELlist_h
 
-
 // ----------------------------------------------------------------------
 //
 // ELlist.h     Provides a list class with the semantics of std::list.
@@ -17,34 +16,27 @@
 //
 // The following elements of list semantics are relied upon:
 //      push_back()             ELadminstrator
-//	
+//
 //
 // ----------------------------------------------------------------------
 
-
 #ifndef ELSTRING_H
-  #include "FWCore/MessageLogger/interface/ELstring.h"
+#include "FWCore/MessageLogger/interface/ELstring.h"
 #endif
 
-
 #include <list>
 
+namespace edm {
 
-namespace edm {       
-
+  // ----------------------------------------------------------------------
 
-// ----------------------------------------------------------------------
-
-
-class ELdestination;
-typedef std::list<ELdestination *> ELlist_dest;
-
-typedef std::list<ELstring       > ELlist_string;
-
-// ----------------------------------------------------------------------
+  class ELdestination;
+  typedef std::list<ELdestination *> ELlist_dest;
 
+  typedef std::list<ELstring> ELlist_string;
 
-}        // end of namespace edm
+  // ----------------------------------------------------------------------
 
+}  // end of namespace edm
 
-#endif // MessageLogger_ELlist_h
+#endif  // MessageLogger_ELlist_h
diff --git a/FWCore/MessageLogger/interface/ELmap.h b/FWCore/MessageLogger/interface/ELmap.h
index e40fde6166492..92c444e74b021 100644
--- a/FWCore/MessageLogger/interface/ELmap.h
+++ b/FWCore/MessageLogger/interface/ELmap.h
@@ -1,7 +1,6 @@
 #ifndef MessageLogger_ELmap_h
 #define MessageLogger_ELmap_h
 
-
 // ----------------------------------------------------------------------
 //
 // ELmap.h      Provides a map class with the semantics of std::map.
@@ -32,82 +31,66 @@
 //
 // ----------------------------------------------------------------------
 
-
 #include <map>
 
 #include "FWCore/MessageLogger/interface/ELstring.h"
 #include "FWCore/MessageLogger/interface/ELextendedID.h"
 
+namespace edm {
 
-namespace edm {       
-
-
-// ----------------------------------------------------------------------
-
-
-class LimitAndTimespan  {
-
-public:
-
-  int limit;
-  int timespan;
-  int interval;
-
-  LimitAndTimespan( int lim = -1, int ts = -1, int ivl = -1 );
+  // ----------------------------------------------------------------------
 
-};  // LimitAndTimespan
+  class LimitAndTimespan {
+  public:
+    int limit;
+    int timespan;
+    int interval;
 
+    LimitAndTimespan(int lim = -1, int ts = -1, int ivl = -1);
 
-class CountAndLimit  {
+  };  // LimitAndTimespan
 
-public:
+  class CountAndLimit {
+  public:
+    int n;
+    int aggregateN;
+    time_t lastTime;
+    int limit;
+    int timespan;
+    int interval;
+    int skipped;
 
-  int    n;
-  int    aggregateN;
-  time_t lastTime;
-  int    limit;
-  int    timespan;
-  int    interval;
-  int    skipped;
+    CountAndLimit(int lim = -1, int ts = -1, int ivl = -1);
+    bool add();
 
-  CountAndLimit( int lim = -1, int ts = -1, int ivl = -1 );
-  bool add();
+  };  // CountAndLimit
 
-};  // CountAndLimit
+  class StatsCount {
+  public:
+    int n;
+    int aggregateN;
+    bool ignoredFlag;
+    ELstring context1;
+    ELstring context2;
+    ELstring contextLast;
 
+    StatsCount();
+    void add(const ELstring& context, bool reactedTo);
 
-class StatsCount  {
+  };  // StatsCount
 
-public:
+  // ----------------------------------------------------------------------
 
-  int      n;
-  int      aggregateN;
-  bool     ignoredFlag;
-  ELstring context1;
-  ELstring context2;
-  ELstring contextLast;
+  typedef std::map<ELstring, LimitAndTimespan> ELmap_limits;
 
-  StatsCount();
-  void add( const ELstring & context, bool reactedTo );
+  typedef std::map<ELextendedID, CountAndLimit> ELmap_counts;
 
-};  // StatsCount
-
-
-// ----------------------------------------------------------------------
-
-
-typedef std::map< ELstring     , LimitAndTimespan > ELmap_limits;
-
-typedef std::map< ELextendedID , CountAndLimit    > ELmap_counts;
-
-typedef std::map< ELextendedID , StatsCount       > ELmap_stats;
-
-// See ELseverityLevel.cc for another map:  ELmap_sevTran
-
-// ----------------------------------------------------------------------
+  typedef std::map<ELextendedID, StatsCount> ELmap_stats;
 
+  // See ELseverityLevel.cc for another map:  ELmap_sevTran
 
-}        // end of namespace edm
+  // ----------------------------------------------------------------------
 
+}  // end of namespace edm
 
-#endif // MessageLogger_ELmap_h
+#endif  // MessageLogger_ELmap_h
diff --git a/FWCore/MessageLogger/interface/ELseverityLevel.h b/FWCore/MessageLogger/interface/ELseverityLevel.h
index b772f20f4f5ab..0ae4886cd6286 100644
--- a/FWCore/MessageLogger/interface/ELseverityLevel.h
+++ b/FWCore/MessageLogger/interface/ELseverityLevel.h
@@ -1,7 +1,6 @@
 #ifndef MessageLogger_ELseverityLevel_h
 #define MessageLogger_ELseverityLevel_h
 
-
 // ----------------------------------------------------------------------
 //
 // ELseverityLevel.h - declare objects that encode a message's urgency
@@ -38,199 +37,184 @@
 //
 // ----------------------------------------------------------------------
 
-
 #ifndef ELSTRING_H
-  #include "FWCore/MessageLogger/interface/ELstring.h"
+#include "FWCore/MessageLogger/interface/ELstring.h"
 #endif
 
-namespace edm {       
-
+namespace edm {
 
-// ----------------------------------------------------------------------
-// Forward declaration:
-// ----------------------------------------------------------------------
-
-class ELseverityLevel;
+  // ----------------------------------------------------------------------
+  // Forward declaration:
+  // ----------------------------------------------------------------------
 
+  class ELseverityLevel;
 
 #ifndef __ROOTCLING__
-// ----------------------------------------------------------------------
-// Synonym for type of ELseverityLevel-generating function:
-// ----------------------------------------------------------------------
-
-typedef  ELseverityLevel const  ELslGen();
-
-
-// ----------------------------------------------------------------------
-// ELslProxy class template:
-// ----------------------------------------------------------------------
-
-template< ELslGen ELgen >
-struct ELslProxy  {
-
-  // --- birth/death:
-  //
-  ELslProxy();
-  ~ELslProxy();
-
-  // --- copying:
-  //
-  ELslProxy( ELslProxy const & );
-  ELslProxy const &  operator= ( ELslProxy const & );
-
-  // --- conversion::
-  //
-  operator ELseverityLevel const () const;
-
-  // --- forwarding:
-  //
-  int             getLevel()    const;
-  const ELstring  getSymbol()   const;
-  const ELstring  getName()     const;
-  const ELstring  getInputStr() const;
-  const ELstring  getVarName()  const;
-
-};  // ELslProxy<ELslGen>
+  // ----------------------------------------------------------------------
+  // Synonym for type of ELseverityLevel-generating function:
+  // ----------------------------------------------------------------------
+
+  typedef ELseverityLevel const ELslGen();
+
+  // ----------------------------------------------------------------------
+  // ELslProxy class template:
+  // ----------------------------------------------------------------------
+
+  template <ELslGen ELgen>
+  struct ELslProxy {
+    // --- birth/death:
+    //
+    ELslProxy();
+    ~ELslProxy();
+
+    // --- copying:
+    //
+    ELslProxy(ELslProxy const&);
+    ELslProxy const& operator=(ELslProxy const&);
+
+    // --- conversion::
+    //
+    operator ELseverityLevel const() const;
+
+    // --- forwarding:
+    //
+    int getLevel() const;
+    const ELstring getSymbol() const;
+    const ELstring getName() const;
+    const ELstring getInputStr() const;
+    const ELstring getVarName() const;
+
+  };  // ELslProxy<ELslGen>
 #endif
 
-// ----------------------------------------------------------------------
-
-
-// ----------------------------------------------------------------------
-// ELseverityLevel:
-// ----------------------------------------------------------------------
-
-class ELseverityLevel  {
-
-public:
-
-  // ---  One ELseverityLevel is globally instantiated (see below)
-  // ---  for each of the following levels:
-  //
-  enum ELsev_  {
-    ELsev_noValueAssigned = 0  // default returned by map when not found
-  , ELsev_zeroSeverity         // threshold use only
-  , ELsev_success              // report reaching a milestone
-  , ELsev_info                 // information
-  , ELsev_warning              // warning
-  , ELsev_error                // error detected
-  , ELsev_unspecified          // severity was not specified
-  , ELsev_severe               // future results are suspect
-  , ELsev_highestSeverity      // threshold use only
-  // -----
-  , nLevels                    // how many levels?
-  };  // ELsev_
-
-  // -----  Birth/death:
-  //
-  ELseverityLevel( ELsev_ lev = ELsev_unspecified );
-  ELseverityLevel ( ELstring const & str );
-        // str may match getSymbol, getName, getInputStr,
-        // or getVarName -- see accessors
-  ~ELseverityLevel();
-
-  // -----  Comparator:
-  //
-  int  cmp( ELseverityLevel const & e ) const;
-
-  // -----  Accessors:
-  //
-  int             getLevel()    const;
-  const ELstring  getSymbol()   const;  // example: "-e"
-  const ELstring  getName()     const;  // example: "Error"
-  const ELstring  getInputStr() const;  // example: "ERROR"
-  const ELstring  getVarName()  const;  // example: "ELerror"
-
-  // -----  Emitter:
-  //
-  friend std::ostream &  operator<< (
-    std::ostream          &  os
-  , const ELseverityLevel &  sev
-  );
-
-private:
-
-  // Data per ELseverityLevel object:
-  //
-  int    myLevel;
-
-};  // ELseverityLevel
-
+  // ----------------------------------------------------------------------
+
+  // ----------------------------------------------------------------------
+  // ELseverityLevel:
+  // ----------------------------------------------------------------------
+
+  class ELseverityLevel {
+  public:
+    // ---  One ELseverityLevel is globally instantiated (see below)
+    // ---  for each of the following levels:
+    //
+    enum ELsev_ {
+      ELsev_noValueAssigned = 0  // default returned by map when not found
+      ,
+      ELsev_zeroSeverity  // threshold use only
+      ,
+      ELsev_success  // report reaching a milestone
+      ,
+      ELsev_info  // information
+      ,
+      ELsev_warning  // warning
+      ,
+      ELsev_error  // error detected
+      ,
+      ELsev_unspecified  // severity was not specified
+      ,
+      ELsev_severe  // future results are suspect
+      ,
+      ELsev_highestSeverity  // threshold use only
+      // -----
+      ,
+      nLevels  // how many levels?
+    };         // ELsev_
+
+    // -----  Birth/death:
+    //
+    ELseverityLevel(ELsev_ lev = ELsev_unspecified);
+    ELseverityLevel(ELstring const& str);
+    // str may match getSymbol, getName, getInputStr,
+    // or getVarName -- see accessors
+    ~ELseverityLevel();
+
+    // -----  Comparator:
+    //
+    int cmp(ELseverityLevel const& e) const;
+
+    // -----  Accessors:
+    //
+    int getLevel() const;
+    const ELstring getSymbol() const;    // example: "-e"
+    const ELstring getName() const;      // example: "Error"
+    const ELstring getInputStr() const;  // example: "ERROR"
+    const ELstring getVarName() const;   // example: "ELerror"
+
+    // -----  Emitter:
+    //
+    friend std::ostream& operator<<(std::ostream& os, const ELseverityLevel& sev);
+
+  private:
+    // Data per ELseverityLevel object:
+    //
+    int myLevel;
+
+  };  // ELseverityLevel
 
 #ifndef __ROOTCLING__
-// ----------------------------------------------------------------------
-// Declare the globally available severity objects,
-// one generator function and one proxy per non-default ELsev_:
-// ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
+  // Declare the globally available severity objects,
+  // one generator function and one proxy per non-default ELsev_:
+  // ----------------------------------------------------------------------
 
-extern ELslGen  ELzeroSeverityGen;
-extern ELslProxy< ELzeroSeverityGen    > const  ELzeroSeverity;
+  extern ELslGen ELzeroSeverityGen;
+  extern ELslProxy<ELzeroSeverityGen> const ELzeroSeverity;
 
-extern ELslGen  ELdebugGen;
-extern ELslProxy< ELdebugGen         > const  ELdebug;
+  extern ELslGen ELdebugGen;
+  extern ELslProxy<ELdebugGen> const ELdebug;
 
-extern ELslGen  ELinfoGen;
-extern ELslProxy< ELinfoGen            > const  ELinfo;
+  extern ELslGen ELinfoGen;
+  extern ELslProxy<ELinfoGen> const ELinfo;
 
-extern ELslGen  ELwarningGen;
-extern ELslProxy< ELwarningGen         > const  ELwarning;
+  extern ELslGen ELwarningGen;
+  extern ELslProxy<ELwarningGen> const ELwarning;
 
-extern ELslGen  ELerrorGen;
-extern ELslProxy< ELerrorGen           > const  ELerror;
+  extern ELslGen ELerrorGen;
+  extern ELslProxy<ELerrorGen> const ELerror;
 
-extern ELslGen  ELunspecifiedGen;
-extern ELslProxy< ELunspecifiedGen     > const  ELunspecified;
+  extern ELslGen ELunspecifiedGen;
+  extern ELslProxy<ELunspecifiedGen> const ELunspecified;
 
-extern ELslGen  ELsevereGen;
-extern ELslProxy< ELsevereGen          > const  ELsevere;
+  extern ELslGen ELsevereGen;
+  extern ELslProxy<ELsevereGen> const ELsevere;
 
-extern ELslGen  ELhighestSeverityGen;
-extern ELslProxy< ELhighestSeverityGen > const  ELhighestSeverity;
+  extern ELslGen ELhighestSeverityGen;
+  extern ELslProxy<ELhighestSeverityGen> const ELhighestSeverity;
 #else
-ELseverityLevel const  ELzeroSeverity;
-ELseverityLevel const  ELdebug;
-ELseverityLevel const  ELinfo;
-ELseverityLevel const  ELwarning;
-ELseverityLevel const  ELerror;
-ELseverityLevel const  ELunspecified;
-ELseverityLevel const  ELsevere;
-ELseverityLevel const  ELhighestSeverity;
+  ELseverityLevel const ELzeroSeverity;
+  ELseverityLevel const ELdebug;
+  ELseverityLevel const ELinfo;
+  ELseverityLevel const ELwarning;
+  ELseverityLevel const ELerror;
+  ELseverityLevel const ELunspecified;
+  ELseverityLevel const ELsevere;
+  ELseverityLevel const ELhighestSeverity;
 #endif
 
+  // ----------------------------------------------------------------------
+  // Comparators:
+  // ----------------------------------------------------------------------
 
-// ----------------------------------------------------------------------
-// Comparators:
-// ----------------------------------------------------------------------
+  extern bool operator==(ELseverityLevel const& e1, ELseverityLevel const& e2);
+  extern bool operator!=(ELseverityLevel const& e1, ELseverityLevel const& e2);
+  extern bool operator<(ELseverityLevel const& e1, ELseverityLevel const& e2);
+  extern bool operator<=(ELseverityLevel const& e1, ELseverityLevel const& e2);
+  extern bool operator>(ELseverityLevel const& e1, ELseverityLevel const& e2);
+  extern bool operator>=(ELseverityLevel const& e1, ELseverityLevel const& e2);
 
-extern bool  operator== ( ELseverityLevel const & e1
-                        , ELseverityLevel const & e2 );
-extern bool  operator!= ( ELseverityLevel const & e1
-                        , ELseverityLevel const & e2 );
-extern bool  operator<  ( ELseverityLevel const & e1
-                        , ELseverityLevel const & e2 );
-extern bool  operator<= ( ELseverityLevel const & e1
-                        , ELseverityLevel const & e2 );
-extern bool  operator>  ( ELseverityLevel const & e1
-                        , ELseverityLevel const & e2 );
-extern bool  operator>= ( ELseverityLevel const & e1
-                        , ELseverityLevel const & e2 );
-
-
-// ----------------------------------------------------------------------
-
-}        // end of namespace edm
+  // ----------------------------------------------------------------------
 
+}  // end of namespace edm
 
 // ----------------------------------------------------------------------
 
 #ifndef __ROOTCLING__
 #define ELSEVERITYLEVEL_ICC
-  #include "FWCore/MessageLogger/interface/ELseverityLevel.icc"
-#undef  ELSEVERITYLEVEL_ICC
+#include "FWCore/MessageLogger/interface/ELseverityLevel.icc"
+#undef ELSEVERITYLEVEL_ICC
 #endif
 
-
 // ----------------------------------------------------------------------
 
 #endif  // MessageLogger_ELseverityLevel_h
-
diff --git a/FWCore/MessageLogger/interface/ELseverityLevel.icc b/FWCore/MessageLogger/interface/ELseverityLevel.icc
index 887c219f66851..c2b2b57cef8eb 100644
--- a/FWCore/MessageLogger/interface/ELseverityLevel.icc
+++ b/FWCore/MessageLogger/interface/ELseverityLevel.icc
@@ -1,109 +1,85 @@
 #ifndef ELSEVERITYLEVEL_ICC
-  #error ELseverityLevel.icc erroneously included by file other than ELseverityLevel.h
+#error ELseverityLevel.icc erroneously included by file other than ELseverityLevel.h
 #endif
 
-
 // ----------------------------------------------------------------------
 //
 // ELseverityLevel.icc
 //
 // ----------------------------------------------------------------------
 
+namespace edm {
 
-namespace edm {      
+  // ----------------------------------------------------------------------
+  // ELslProxy<> template class methods:
+  // ----------------------------------------------------------------------
 
+  template <ELslGen ELgen>
+  inline ELslProxy<ELgen>::ELslProxy() {
+    ;
+  }
 
-// ----------------------------------------------------------------------
-// ELslProxy<> template class methods:
-// ----------------------------------------------------------------------
+  template <ELslGen ELgen>
+  inline ELslProxy<ELgen>::~ELslProxy() {
+    ;
+  }
 
-template< ELslGen ELgen >
-inline
-ELslProxy<ELgen>::ELslProxy()
-{ ; }
-
-template< ELslGen ELgen >
-inline
-ELslProxy<ELgen>::~ELslProxy()
-{ ; }
-
-template< ELslGen ELgen >
-inline
-ELslProxy<ELgen>::ELslProxy( ELslProxy const & )
-{ ; }
-
-template< ELslGen ELgen >
-inline
-ELslProxy<ELgen> const &  ELslProxy<ELgen>::operator= ( ELslProxy const & )
-{ return  *this; }
-
-template< ELslGen ELgen >
-inline
-ELslProxy<ELgen>::operator ELseverityLevel const () const
-{ return ELgen(); }
-
-template< ELslGen ELgen >
-inline
-int  ELslProxy<ELgen>::getLevel() const
-{ return ELgen().getLevel(); }
-
-template< ELslGen ELgen >
-inline
-const ELstring  ELslProxy<ELgen>::getSymbol() const
-{ return ELgen().getSymbol(); }
-
-template< ELslGen ELgen >
-inline
-const ELstring  ELslProxy<ELgen>::getName() const
-{ return ELgen().getName(); }
-
-template< ELslGen ELgen >
-inline
-const ELstring  ELslProxy<ELgen>::getInputStr() const
-{ return ELgen().getInputStr(); }
-
-template< ELslGen ELgen >
-inline
-const ELstring  ELslProxy<ELgen>::getVarName() const
-{ return ELgen().getVarName(); }
+  template <ELslGen ELgen>
+  inline ELslProxy<ELgen>::ELslProxy(ELslProxy const&) {
+    ;
+  }
 
+  template <ELslGen ELgen>
+  inline ELslProxy<ELgen> const& ELslProxy<ELgen>::operator=(ELslProxy const&) {
+    return *this;
+  }
 
-// ----------------------------------------------------------------------
-// Comparators:
-// ----------------------------------------------------------------------
+  template <ELslGen ELgen>
+  inline ELslProxy<ELgen>::operator ELseverityLevel const() const {
+    return ELgen();
+  }
 
-inline
-bool  operator== ( ELseverityLevel const & e1
-                 , ELseverityLevel const & e2 )
-{ return  e1.cmp(e2) == 0; }
+  template <ELslGen ELgen>
+  inline int ELslProxy<ELgen>::getLevel() const {
+    return ELgen().getLevel();
+  }
 
-inline
-bool  operator!= ( ELseverityLevel const & e1
-                 , ELseverityLevel const & e2 )
-{ return  e1.cmp(e2) != 0; }
+  template <ELslGen ELgen>
+  inline const ELstring ELslProxy<ELgen>::getSymbol() const {
+    return ELgen().getSymbol();
+  }
 
-inline
-bool  operator<  ( ELseverityLevel const & e1
-                 , ELseverityLevel const & e2 )
-{ return  e1.cmp(e2) < 0; }
+  template <ELslGen ELgen>
+  inline const ELstring ELslProxy<ELgen>::getName() const {
+    return ELgen().getName();
+  }
 
-inline
-bool  operator<= ( ELseverityLevel const & e1
-                 , ELseverityLevel const & e2 )
-{ return  e1.cmp(e2) <= 0; }
+  template <ELslGen ELgen>
+  inline const ELstring ELslProxy<ELgen>::getInputStr() const {
+    return ELgen().getInputStr();
+  }
 
-inline
-bool  operator>  ( ELseverityLevel const & e1
-                 , ELseverityLevel const & e2 )
-{ return  e1.cmp(e2) > 0; }
+  template <ELslGen ELgen>
+  inline const ELstring ELslProxy<ELgen>::getVarName() const {
+    return ELgen().getVarName();
+  }
 
-inline
-bool  operator>= ( ELseverityLevel const & e1
-                 , ELseverityLevel const & e2 )
-{ return  e1.cmp(e2) >= 0; }
+  // ----------------------------------------------------------------------
+  // Comparators:
+  // ----------------------------------------------------------------------
 
+  inline bool operator==(ELseverityLevel const& e1, ELseverityLevel const& e2) { return e1.cmp(e2) == 0; }
 
-// ----------------------------------------------------------------------
+  inline bool operator!=(ELseverityLevel const& e1, ELseverityLevel const& e2) { return e1.cmp(e2) != 0; }
+
+  inline bool operator<(ELseverityLevel const& e1, ELseverityLevel const& e2) { return e1.cmp(e2) < 0; }
+
+  inline bool operator<=(ELseverityLevel const& e1, ELseverityLevel const& e2) { return e1.cmp(e2) <= 0; }
+
+  inline bool operator>(ELseverityLevel const& e1, ELseverityLevel const& e2) { return e1.cmp(e2) > 0; }
+
+  inline bool operator>=(ELseverityLevel const& e1, ELseverityLevel const& e2) { return e1.cmp(e2) >= 0; }
 
-}        // end of namespace edm
+  // ----------------------------------------------------------------------
 
+}  // end of namespace edm
diff --git a/FWCore/MessageLogger/interface/ELstring.h b/FWCore/MessageLogger/interface/ELstring.h
index da14ba3e3e95d..1be448240dfd9 100644
--- a/FWCore/MessageLogger/interface/ELstring.h
+++ b/FWCore/MessageLogger/interface/ELstring.h
@@ -1,7 +1,6 @@
 #ifndef MessageLogger_ELstring_h
 #define MessageLogger_ELstring_h
 
-
 // ----------------------------------------------------------------------
 //
 // ELstring.h	Provides a string class with the semantics of std::string.
@@ -13,27 +12,20 @@
 //
 // ----------------------------------------------------------------------
 
-
 #include <string>
 
+namespace edm {
 
-namespace edm {       
-
-
-// ----------------------------------------------------------------------
-
-
-typedef std::string ELstring;
-
-bool eq_nocase( const ELstring & s1, const char s2[] );
+  // ----------------------------------------------------------------------
 
-bool eq( const ELstring & s1, const ELstring s2 );
+  typedef std::string ELstring;
 
+  bool eq_nocase(const ELstring& s1, const char s2[]);
 
-// ----------------------------------------------------------------------
-
+  bool eq(const ELstring& s1, const ELstring s2);
 
-}        // end of namespace edm
+  // ----------------------------------------------------------------------
 
+}  // end of namespace edm
 
 #endif  // MessageLogger_ELstring_h
diff --git a/FWCore/MessageLogger/interface/ErrorObj.h b/FWCore/MessageLogger/interface/ErrorObj.h
index 8230552b4ccae..a415234b44cc5 100644
--- a/FWCore/MessageLogger/interface/ErrorObj.h
+++ b/FWCore/MessageLogger/interface/ErrorObj.h
@@ -1,7 +1,6 @@
 #ifndef MessageLogger_ErrorObj_h
 #define MessageLogger_ErrorObj_h
 
-
 // ----------------------------------------------------------------------
 //
 // ErrorObj 	is the representation of all information about an error
@@ -22,7 +21,6 @@
 //
 // ----------------------------------------------------------------------
 
-
 #include "FWCore/MessageLogger/interface/ELstring.h"
 #include "FWCore/MessageLogger/interface/ELlist.h"
 #include "FWCore/MessageLogger/interface/ELextendedID.h"
@@ -31,111 +29,98 @@
 #include <sstream>
 #include <string>
 
-namespace edm {       
-
-
-// ----------------------------------------------------------------------
-// Prerequisite classes:
-// ----------------------------------------------------------------------
-
-class ELcout;
-
-
-// ----------------------------------------------------------------------
-// ErrorObj:
-// ----------------------------------------------------------------------
-
-class ErrorObj  {
-
-public:
-  // --- birth/death:
-  //
-  ErrorObj( const ELseverityLevel & sev, 
-  	    const ELstring & id, 
-	    bool verbatim = false );
-  ErrorObj( const ErrorObj & orig );  // Same serial number and everything!
-  virtual ~ErrorObj();
-
-  ErrorObj& operator=( const ErrorObj& other );
-  void swap ( ErrorObj& other );
-  // --- accessors:
-  //
-  int                    serial() const;
-  const ELextendedID &   xid() const;
-  const ELstring &       idOverflow() const;
-  time_t                 timestamp() const;
-  const ELlist_string &  items() const;
-  bool                   reactedTo() const;
-  ELstring               fullText() const;
-  ELstring               context() const;
-  bool                   is_verbatim() const;
-
-  // mutators:
-  //
-  virtual void  setSeverity  ( const ELseverityLevel & sev );
-  virtual void  setID        ( const ELstring & ID );
-  virtual void  setModule    ( const ELstring & module );
-  virtual void  setSubroutine( const ELstring & subroutine );
-  virtual void  setContext   ( const ELstring & context );
-
-  // -----  Methods for ErrorLog or for physicists logging errors:
-  //
-  template< class T >
-  inline ErrorObj &  opltlt ( const T & t );
-         ErrorObj &  opltlt ( const char s[] );
-  inline ErrorObj &  operator<< ( std::ostream&(*f)(std::ostream&) ); 
-  inline ErrorObj &  operator<< ( std::ios_base&(*f)(std::ios_base&) ); 
-
-  virtual ErrorObj &  emitToken( const ELstring & txt );
-
-  // ---  mutators for use by ELadministrator and ELtsErrorLog
-  //
-  virtual void  set( const ELseverityLevel & sev, const ELstring & id );
-  virtual void  clear();
-  virtual void  setReactedTo ( bool r );
-
-private:
-
-  // ---  data members:
+namespace edm {
+
+  // ----------------------------------------------------------------------
+  // Prerequisite classes:
+  // ----------------------------------------------------------------------
+
+  class ELcout;
+
+  // ----------------------------------------------------------------------
+  // ErrorObj:
+  // ----------------------------------------------------------------------
+
+  class ErrorObj {
+  public:
+    // --- birth/death:
+    //
+    ErrorObj(const ELseverityLevel& sev, const ELstring& id, bool verbatim = false);
+    ErrorObj(const ErrorObj& orig);  // Same serial number and everything!
+    virtual ~ErrorObj();
+
+    ErrorObj& operator=(const ErrorObj& other);
+    void swap(ErrorObj& other);
+    // --- accessors:
+    //
+    int serial() const;
+    const ELextendedID& xid() const;
+    const ELstring& idOverflow() const;
+    time_t timestamp() const;
+    const ELlist_string& items() const;
+    bool reactedTo() const;
+    ELstring fullText() const;
+    ELstring context() const;
+    bool is_verbatim() const;
+
+    // mutators:
+    //
+    virtual void setSeverity(const ELseverityLevel& sev);
+    virtual void setID(const ELstring& ID);
+    virtual void setModule(const ELstring& module);
+    virtual void setSubroutine(const ELstring& subroutine);
+    virtual void setContext(const ELstring& context);
+
+    // -----  Methods for ErrorLog or for physicists logging errors:
+    //
+    template <class T>
+    inline ErrorObj& opltlt(const T& t);
+    ErrorObj& opltlt(const char s[]);
+    inline ErrorObj& operator<<(std::ostream& (*f)(std::ostream&));
+    inline ErrorObj& operator<<(std::ios_base& (*f)(std::ios_base&));
+
+    virtual ErrorObj& emitToken(const ELstring& txt);
+
+    // ---  mutators for use by ELadministrator and ELtsErrorLog
+    //
+    virtual void set(const ELseverityLevel& sev, const ELstring& id);
+    virtual void clear();
+    virtual void setReactedTo(bool r);
+
+  private:
+    // ---  data members:
+    //
+    int mySerial;
+    ELextendedID myXid;
+    ELstring myIdOverflow;
+    time_t myTimestamp;
+    ELlist_string myItems;
+    bool myReactedTo;
+    ELstring myContext;
+    std::ostringstream myOs;
+    std::string emptyString;
+    bool verbatim;
+
+  };  // ErrorObj
+
+  // ----------------------------------------------------------------------
+
+  // -----  Method for physicists logging errors:
   //
-  int            mySerial;
-  ELextendedID   myXid;
-  ELstring       myIdOverflow;
-  time_t         myTimestamp;
-  ELlist_string  myItems;
-  bool           myReactedTo;
-  ELstring       myContext;
-  std::ostringstream myOs; 
-  std::string    emptyString;
-  bool		 verbatim;
-    
-};  // ErrorObj
-
-
-// ----------------------------------------------------------------------
-
+  template <class T>
+  inline ErrorObj& operator<<(ErrorObj& e, const T& t);
 
-// -----  Method for physicists logging errors:
-//
-template< class T >
-inline ErrorObj &  operator<<( ErrorObj & e, const T & t );
+  ErrorObj& operator<<(ErrorObj& e, const char s[]);
 
-ErrorObj &  operator<<( ErrorObj & e, const char s[] );
+  // ----------------------------------------------------------------------
 
+  // ----------------------------------------------------------------------
+  // Global functions:
+  // ----------------------------------------------------------------------
 
-// ----------------------------------------------------------------------
+  inline void swap(ErrorObj& a, ErrorObj& b) { a.swap(b); }
 
-
-// ----------------------------------------------------------------------
-// Global functions:
-// ----------------------------------------------------------------------
-
-inline
-void swap(ErrorObj& a, ErrorObj& b) {
-  a.swap(b);
-}
-
-}        // end of namespace edm
+}  // end of namespace edm
 
 // ----------------------------------------------------------------------
 // .icc
@@ -144,11 +129,9 @@ void swap(ErrorObj& a, ErrorObj& b) {
 // The icc file contains the template for operator<< (ErrorObj&, T)
 
 #define ERROROBJ_ICC
-  #include "FWCore/MessageLogger/interface/ErrorObj.icc"
-#undef  ERROROBJ_ICC
-
+#include "FWCore/MessageLogger/interface/ErrorObj.icc"
+#undef ERROROBJ_ICC
 
 // ----------------------------------------------------------------------
 
-
-#endif // MessageLogger_ErrorObj_h
+#endif  // MessageLogger_ErrorObj_h
diff --git a/FWCore/MessageLogger/interface/ErrorObj.icc b/FWCore/MessageLogger/interface/ErrorObj.icc
index 1b04d03f1c506..037826c040ecf 100644
--- a/FWCore/MessageLogger/interface/ErrorObj.icc
+++ b/FWCore/MessageLogger/interface/ErrorObj.icc
@@ -1,8 +1,7 @@
 #ifndef ERROROBJ_ICC
-  #error ErrorObj.icc erroneously included by file other than ErrorObj.h
+#error ErrorObj.icc erroneously included by file other than ErrorObj.h
 #endif
 
-
 // ----------------------------------------------------------------------
 //
 // ErrorObj.icc
@@ -13,54 +12,48 @@
 
 // ----------------------------------------------------------------------
 
-#include<sstream>
+#include <sstream>
 
-namespace edm {      
+namespace edm {
 
-// ----------------------------------------------------------------------
-// Methods for physicists adding to an ErrorObj:
-// ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
+  // Methods for physicists adding to an ErrorObj:
+  // ----------------------------------------------------------------------
 
-template <class T>
-ErrorObj & 
-ErrorObj::opltlt ( const T & t )  {
-  myOs.str(emptyString);
-  myOs << t;
+  template <class T>
+  ErrorObj& ErrorObj::opltlt(const T& t) {
+    myOs.str(emptyString);
+    myOs << t;
 #ifdef OLD_STYLE_AUTOMATIC_SPACES
-  if ( ! myOs.str().empty() ) emitToken( myOs.str() + ' ' );
+    if (!myOs.str().empty())
+      emitToken(myOs.str() + ' ');
 #else
-  if ( ! myOs.str().empty() ) emitToken( myOs.str() );
+    if (!myOs.str().empty())
+      emitToken(myOs.str());
 #endif
-  return *this;
-}  // operator<< <T>()
+    return *this;
+  }  // operator<< <T>()
 
-// ----------------------------------------------------------------------
-// Global method for physicists adding to an ErrorObj:
-// ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
+  // Global method for physicists adding to an ErrorObj:
+  // ----------------------------------------------------------------------
 
+  template <class T>
+  ErrorObj& operator<<(ErrorObj& e, const T& t) {
+    return e.opltlt(t);
+  }  // operator<< <T>()
 
-template <class T>
-ErrorObj & operator<<( ErrorObj & e, const T & t )  {
-  return e.opltlt(t);
-}  // operator<< <T>()
+  inline ErrorObj& ErrorObj::operator<<(std::ostream& (*f)(std::ostream&)) {
+    f(myOs);
+    myOs.str(emptyString);
+    return *this;
+  }
 
-inline 
-ErrorObj &  
-ErrorObj::operator<< (  std::ostream&(*f)(std::ostream&) ) {
-  f(myOs);
-  myOs.str(emptyString);
-  return *this;
-} 
-
-inline
-ErrorObj &  
-ErrorObj::operator<< ( std::ios_base&(*f)(std::ios_base&) ) {
-  f(myOs);
-  return *this;
-} 
-
-
-// ----------------------------------------------------------------------
+  inline ErrorObj& ErrorObj::operator<<(std::ios_base& (*f)(std::ios_base&)) {
+    f(myOs);
+    return *this;
+  }
 
+  // ----------------------------------------------------------------------
 
-}        // end of namespace edm
+}  // end of namespace edm
diff --git a/FWCore/MessageLogger/interface/ErrorSummaryEntry.h b/FWCore/MessageLogger/interface/ErrorSummaryEntry.h
index edb9289c890da..3164867159cec 100644
--- a/FWCore/MessageLogger/interface/ErrorSummaryEntry.h
+++ b/FWCore/MessageLogger/interface/ErrorSummaryEntry.h
@@ -8,9 +8,9 @@
 // ----------------------------------------------------------------------
 //
 // ErrorSummaryEntry.h - Structure to hold summary of a warning or error
-//		    message issued in an event.  
+//		    message issued in an event.
 //
-//   Usage:  
+//   Usage:
 //	if (edm::FreshErrorsExist()) {
 //	  std::vector(edm::ErrorSummaryEntry es = edm::LoggedErrorsSummary();
 //	  package_as_product_in_the_event (es);
@@ -26,45 +26,44 @@
 //     edm::ErrorSummaryEntry as documentation of how to use it.
 //
 // 20-Aug-2008 mf	Created file.
-// 
+//
 // 22-Jun-2009 mf	Added severity to the structure.  This adds just one
 //			integer to the memory used.
 //
 // ----------------------------------------------------------------------
 
-namespace edm {       
-
-struct ErrorSummaryEntry 
-{
-  std::string     category;
-  std::string     module;
-  ELseverityLevel severity;
-  unsigned int    count;
-  ErrorSummaryEntry(std::string const & cat, std::string const & mod, 
-  		    ELseverityLevel sev, unsigned int cnt = 0) 
-	: category(cat)
-	, module  (mod)
-	, severity(sev)
-	, count(cnt) {}
-  ErrorSummaryEntry() : category(), module(), severity(), count(0) {}
-  bool operator< (ErrorSummaryEntry const & rhs) const {
-    if (category < rhs.category) return true;
-    if (category > rhs.category) return false; 
-    if (module   < rhs.module)   return true;
-    if (module   > rhs.module)   return false; 
-    if (severity < rhs.severity) return true;
-    if (severity > rhs.severity) return false; 
-    if (count    < rhs.count)    return true;
-    return false; 
-  }
-  bool operator== (ErrorSummaryEntry const & rhs) const {
-    return ( (category < rhs.category) && (module < rhs.module)
-    	  && (severity < rhs.severity) && (count  < rhs.count)  );
-  }
-};
+namespace edm {
 
-}        // end of namespace edm
+  struct ErrorSummaryEntry {
+    std::string category;
+    std::string module;
+    ELseverityLevel severity;
+    unsigned int count;
+    ErrorSummaryEntry(std::string const& cat, std::string const& mod, ELseverityLevel sev, unsigned int cnt = 0)
+        : category(cat), module(mod), severity(sev), count(cnt) {}
+    ErrorSummaryEntry() : category(), module(), severity(), count(0) {}
+    bool operator<(ErrorSummaryEntry const& rhs) const {
+      if (category < rhs.category)
+        return true;
+      if (category > rhs.category)
+        return false;
+      if (module < rhs.module)
+        return true;
+      if (module > rhs.module)
+        return false;
+      if (severity < rhs.severity)
+        return true;
+      if (severity > rhs.severity)
+        return false;
+      if (count < rhs.count)
+        return true;
+      return false;
+    }
+    bool operator==(ErrorSummaryEntry const& rhs) const {
+      return ((category < rhs.category) && (module < rhs.module) && (severity < rhs.severity) && (count < rhs.count));
+    }
+  };
 
+}  // end of namespace edm
 
 #endif  // MessageLogger_ErrorSummaryEntry_h
-
diff --git a/FWCore/MessageLogger/interface/ExceptionMessages.h b/FWCore/MessageLogger/interface/ExceptionMessages.h
index 4437ee7d82cd8..78a6577b05d7d 100644
--- a/FWCore/MessageLogger/interface/ExceptionMessages.h
+++ b/FWCore/MessageLogger/interface/ExceptionMessages.h
@@ -8,7 +8,7 @@ namespace cms {
 namespace edm {
   class JobReport;
 
-  void printCmsException(cms::Exception& e, edm::JobReport * jobRep = nullptr, int rc = -1);
+  void printCmsException(cms::Exception& e, edm::JobReport* jobRep = nullptr, int rc = -1);
   void printCmsExceptionWarning(char const* behavior, cms::Exception const& e);
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/MessageLogger/interface/JobReport.h b/FWCore/MessageLogger/interface/JobReport.h
index e71cbc3b5d852..aa0ab8308429a 100644
--- a/FWCore/MessageLogger/interface/JobReport.h
+++ b/FWCore/MessageLogger/interface/JobReport.h
@@ -100,18 +100,17 @@ Changes Log 1: 2009/01/14 10:29:00, Natalia Garcia Nebot
 
 namespace edm {
 
-    class JobReport {
-    public:
-
-      typedef unsigned int RunNumber;
-      typedef std::size_t Token;
+  class JobReport {
+  public:
+    typedef unsigned int RunNumber;
+    typedef std::size_t Token;
 
-      struct RunReport {
-        RunNumber runNumber;
-        std::map<unsigned int,unsigned long> lumiSectionsToNEvents;
-      };
+    struct RunReport {
+      RunNumber runNumber;
+      std::map<unsigned int, unsigned long> lumiSectionsToNEvents;
+    };
 
-      /**\struct InputFile
+    /**\struct InputFile
 
       Description: Holds information about an InputFile.
 
@@ -120,24 +119,24 @@ namespace edm {
       been opened for input.
       */
 
-      struct InputFile {
-        typedef std::vector<std::string> StringVector;
-
-        std::string     logicalFileName;
-        std::string     physicalFileName;
-        std::string     catalog;
-        std::string     inputType; // primaryFiles, secondaryFiles, mixingFiles
-        std::string     inputSourceClassName; // class which created the file
-        std::string     moduleLabel;   // name of class instance
-        std::string     guid;
-        std::size_t     numEventsRead;
-        StringVector    branchNames;
-        std::map<RunNumber, RunReport> runReports;
-        bool            fileHasBeenClosed;
-        std::set<std::string> fastClonedBranches;
-      };
-
-      /**\struct OutputFile
+    struct InputFile {
+      typedef std::vector<std::string> StringVector;
+
+      std::string logicalFileName;
+      std::string physicalFileName;
+      std::string catalog;
+      std::string inputType;             // primaryFiles, secondaryFiles, mixingFiles
+      std::string inputSourceClassName;  // class which created the file
+      std::string moduleLabel;           // name of class instance
+      std::string guid;
+      std::size_t numEventsRead;
+      StringVector branchNames;
+      std::map<RunNumber, RunReport> runReports;
+      bool fileHasBeenClosed;
+      std::set<std::string> fastClonedBranches;
+    };
+
+    /**\struct OutputFile
 
       Description: Holds information about an OutputFile.
 
@@ -146,83 +145,85 @@ namespace edm {
       been opened for output.
       */
 
-      struct OutputFile {
-
-        typedef InputFile::StringVector StringVector;
-
-        std::string     logicalFileName;
-        std::string     physicalFileName;
-        std::string     catalog;
-        std::string     outputModuleClassName;
-        std::string     moduleLabel;   // name of class instance
-        std::string     guid;
-        std::string     dataType;
-        std::string     branchHash;
-        std::size_t     numEventsWritten;
-        StringVector    branchNames;
-        std::vector<Token> contributingInputs;
-        tbb::concurrent_vector<Token> contributingInputsSecSource;
-        std::map<std::string, bool> fastCopyingInputs;
-        std::map<RunNumber, RunReport> runReports;
-        bool            fileHasBeenClosed;
-      };
-
-      class AtomicLongLong {
-      public:
-        AtomicLongLong() : value_(0) {}
-        AtomicLongLong(AtomicLongLong const& r) : value_(r.value_.load()) {}
-        std::atomic<long long>& value() { return value_; }
-        std::atomic<long long> const& value() const { return value_; }
-      private:
-        std::atomic<long long> value_;
-      };
-
-      struct JobReportImpl {
-
-        JobReportImpl& operator=(JobReportImpl const&) = delete;
-        JobReportImpl(JobReportImpl const&) = delete;
-
-        InputFile& getInputFileForToken(InputType inputType, Token t);
-        OutputFile& getOutputFileForToken(Token t);
-
-        /*
+    struct OutputFile {
+      typedef InputFile::StringVector StringVector;
+
+      std::string logicalFileName;
+      std::string physicalFileName;
+      std::string catalog;
+      std::string outputModuleClassName;
+      std::string moduleLabel;  // name of class instance
+      std::string guid;
+      std::string dataType;
+      std::string branchHash;
+      std::size_t numEventsWritten;
+      StringVector branchNames;
+      std::vector<Token> contributingInputs;
+      tbb::concurrent_vector<Token> contributingInputsSecSource;
+      std::map<std::string, bool> fastCopyingInputs;
+      std::map<RunNumber, RunReport> runReports;
+      bool fileHasBeenClosed;
+    };
+
+    class AtomicLongLong {
+    public:
+      AtomicLongLong() : value_(0) {}
+      AtomicLongLong(AtomicLongLong const& r) : value_(r.value_.load()) {}
+      std::atomic<long long>& value() { return value_; }
+      std::atomic<long long> const& value() const { return value_; }
+
+    private:
+      std::atomic<long long> value_;
+    };
+
+    struct JobReportImpl {
+      JobReportImpl& operator=(JobReportImpl const&) = delete;
+      JobReportImpl(JobReportImpl const&) = delete;
+
+      InputFile& getInputFileForToken(InputType inputType, Token t);
+      OutputFile& getOutputFileForToken(Token t);
+
+      /*
          * Add the input file token provided to every output
          * file currently available.
          * Used whenever a new input file is opened, it's token
          * is added to all open output files as a contributor
          */
-        void insertInputForOutputs(InputType inputType, Token t);
+      void insertInputForOutputs(InputType inputType, Token t);
 
-        /*
+      /*
          * Associate a Lumi Section to all open output files
          *
          */
-        void associateLumiSection(JobReport::Token token, unsigned int runNumber, unsigned int lumiSection, unsigned long nEvents);
+      void associateLumiSection(JobReport::Token token,
+                                unsigned int runNumber,
+                                unsigned int lumiSection,
+                                unsigned long nEvents);
 
-        /*
+      /*
          * Associate a Lumi Section to all open input files
          *
          */
-        void associateInputLumiSection(unsigned int runNumber, unsigned int lumiSection);
+      void associateInputLumiSection(unsigned int runNumber, unsigned int lumiSection);
 
-        /*
+      /*
          * Associate a run to all open output files
          */
-        void associateRun(JobReport::Token token, unsigned int runNumber);
+      void associateRun(JobReport::Token token, unsigned int runNumber);
 
-        /*
+      /*
          * Associate a run to all open output files
          */
-        void associateInputRun(unsigned int runNumber);
+      void associateInputRun(unsigned int runNumber);
 
-        /*
+      /*
          * Write an InputFile object to the Logger
          * Generate XML string for InputFile instance and dispatch to
          * job report via MessageLogger
          */
-        void writeInputFile(InputFile const& f);
+      void writeInputFile(InputFile const& f);
 
-        /*
+      /*
          * Write an OutputFile object to the Logger
          * Generate an XML string for the OutputFile provided and
          * dispatch it to the logger
@@ -236,206 +237,201 @@ namespace edm {
          * output file due to filtering etc.
          *
          */
-        void writeOutputFile(OutputFile const& f);
+      void writeOutputFile(OutputFile const& f);
 
-        /*
+      /*
          *  Flush all open files to logger in event of a problem.
          */
-        void flushFiles(void);
-
-        JobReportImpl(std::ostream* iOst): printedReadBranches_(false), ost_(iOst) {}
-
-        std::ostream const* ost() const {return get_underlying_safe(ost_);}
-        std::ostream*& ost() {return get_underlying_safe(ost_);}
-
-        std::vector<InputFile> inputFiles_;
-        tbb::concurrent_vector<InputFile> inputFilesSecSource_;
-        tbb::concurrent_vector<OutputFile> outputFiles_;
-        std::map<std::string, long long> readBranches_;
-        std::map<std::string, long long> readBranchesSecFile_;
-        tbb::concurrent_unordered_map<std::string, AtomicLongLong> readBranchesSecSource_;
-        bool printedReadBranches_;
-        std::vector<InputFile>::size_type lastOpenedPrimaryInputFile_;
-        edm::propagate_const<std::ostream*> ost_;
-      };
-
-      JobReport();
-      //Does not take ownership of pointer
-      JobReport(std::ostream* outputStream);
-
-      JobReport& operator=(JobReport const&) = delete;
-      JobReport(JobReport const&) = delete;
-
-      ~JobReport();
-
-      /// Report that an input file has been opened.
-      /// The returned Token should be used for later identification
-      /// of this file.
-      Token inputFileOpened(std::string const& physicalFileName,
-                            std::string const& logicalFileName,
-                            std::string const& catalog,
-                            std::string const& inputType,
-                            std::string const& inputSourceClassName,
-                            std::string const& moduleLabel,
-                            std::string const& guid,
-                            std::vector<std::string> const& branchNames);
-
-      /// Report that an event has been read from
-      /// the file identified by the given Token.
-      void eventReadFromFile(InputType inputType, Token fileToken);
-
-      ///
-      /// Report the data type of a file after it has been opened
-      /// Needed since the data type isn't known until an event has been
-      /// read
-      // CMS-THREADING Current implementation requires an instance of an
-      // OuputModule run on only one thread at a time.
-      void reportDataType(Token fileToken, std::string const& dataType);
-
-
-      /// Report that the input file identified by the given Token has
-      /// been closed. An exception will be thrown if the given Token
-      /// was not obtained from inputFileOpened.
-      void inputFileClosed(InputType inputType, Token fileToken);
-
-      /// Report that an output file has been opened.
-      /// The returned Token should be used for later identification
-      /// of this file.
-      Token outputFileOpened(std::string const& physicalFileName,
-                             std::string const& logicalFileName,
-                             std::string const& catalog,
-                             std::string const& outputModuleClassName,
-                             std::string const& moduleLabel,
-                             std::string const& guid,
-                             std::string const& dataType,
-                             std::string const& branchHash,
-                             std::vector<std::string> const& branchNames);
-
-      /// Report that the event with the given id has been written to
-      /// the file identified by the given Token.
-      // CMS-THREADING Current implementation requires an instance of an
-      // OuputModule run on only one thread at a time.
-      void eventWrittenToFile(Token fileToken, RunNumber_t run, EventNumber_t event);
-
-      /// Report that the output file identified by the given Token has
-      /// been closed. An exception will be thrown if the given Token
-      /// was not obtained from outputFileOpened.
-      void outputFileClosed(Token fileToken);
-
-      void reportSkippedEvent(RunNumber_t run, EventNumber_t event);
-
-      /// API for reporting a Run to the job report.
-      /// for output files, call only if Run is written to
-      /// the output file
-      ///
-      void reportRunNumber(JobReport::Token token, unsigned int run);
-
-      /// API for reporting a Lumi Section to the job report.
-      /// for output files, call only if lumi section is written to
-      /// the output file
-      ///
-      void reportLumiSection(JobReport::Token token, unsigned int run, unsigned int lumiSectId, unsigned long nEvents=0);
-
-      ///
-      /// API for reporting a Lumi Section to the job report.
-      /// for input files, call only if lumi section is physically read
-      /// from the input file
-      ///
-      void reportInputLumiSection(unsigned int run, unsigned int lumiSectId);
-
-      ///
-      /// API to report a run read from input
-      ///
-      void reportInputRunNumber(unsigned int run);
-
-      ///
-      /// Report an exception, providing details of the problem as
-      /// a short description (Eg "XXXError") and a long description
-      /// (Eg "XXX crashed because...")
-      /// Also overload this method to accept an optional standard exit code
-      void reportError(std::string const& shortDesc,
-                       std::string const& longDesc,
-                       int const& exitCode);
-
-      ///
-      /// Report Skipped File
-      ///
-      /// Report that a file has been skipped due to it not being
-      /// found.
-      void reportSkippedFile(std::string const& pfn, std::string const& lfn);
-
-      void reportFallbackAttempt(std::string const& pfn, std::string const& lfn, std::string const& err);
-
-      void reportAnalysisFile(std::string const& fileName,
-                              std::map<std::string, std::string> const& fileData) ;
-
-      ///
-      /// Report Memory statistics
-      /// ALTERNATE FORM - USING THIS MAY NECESSITATE CHANGES IN PARSING XML!
-      /// Invoked by the Memory service to send an end of job
-      /// summary about memory usage for inclusion in the job report
-      ///
-      void reportMemoryInfo(std::vector<std::string> const& memoryData);
-
-      ///
-      /// Report Message statistics
-      /// Invoked by the MessageLogger service to send an end of job
-      /// summary about numbers of various categories messages issued
-      /// for inclusion in the job report
-      ///
-      void reportMessageInfo(std::map<std::string, double> const& messageData);
-
-      ///
-      /// Report read branches
-      /// Invoked by the source that reads ROOT/EDM files at the end of a job
-      /// to report which product branches in the Events tree have been read,
-      /// with a count of the number of events for which the branch was read.
-      ///
-      void reportReadBranches();
-
-      ///  Inform the job report that a branch has been read.
-      void reportReadBranch(InputType inputType, std::string const& branchName);
-
-      ///  Inform the job report that branches have been fast Cloned.
-      void reportFastClonedBranches(std::set<std::string> const& fastClonedBranches, long long nEvents);
-
-      ///
-      /// Report the name of the random engine persistency file
-      ///
-      void reportRandomStateFile(std::string const& name);
-
-      /*
+      void flushFiles(void);
+
+      JobReportImpl(std::ostream* iOst) : printedReadBranches_(false), ost_(iOst) {}
+
+      std::ostream const* ost() const { return get_underlying_safe(ost_); }
+      std::ostream*& ost() { return get_underlying_safe(ost_); }
+
+      std::vector<InputFile> inputFiles_;
+      tbb::concurrent_vector<InputFile> inputFilesSecSource_;
+      tbb::concurrent_vector<OutputFile> outputFiles_;
+      std::map<std::string, long long> readBranches_;
+      std::map<std::string, long long> readBranchesSecFile_;
+      tbb::concurrent_unordered_map<std::string, AtomicLongLong> readBranchesSecSource_;
+      bool printedReadBranches_;
+      std::vector<InputFile>::size_type lastOpenedPrimaryInputFile_;
+      edm::propagate_const<std::ostream*> ost_;
+    };
+
+    JobReport();
+    //Does not take ownership of pointer
+    JobReport(std::ostream* outputStream);
+
+    JobReport& operator=(JobReport const&) = delete;
+    JobReport(JobReport const&) = delete;
+
+    ~JobReport();
+
+    /// Report that an input file has been opened.
+    /// The returned Token should be used for later identification
+    /// of this file.
+    Token inputFileOpened(std::string const& physicalFileName,
+                          std::string const& logicalFileName,
+                          std::string const& catalog,
+                          std::string const& inputType,
+                          std::string const& inputSourceClassName,
+                          std::string const& moduleLabel,
+                          std::string const& guid,
+                          std::vector<std::string> const& branchNames);
+
+    /// Report that an event has been read from
+    /// the file identified by the given Token.
+    void eventReadFromFile(InputType inputType, Token fileToken);
+
+    ///
+    /// Report the data type of a file after it has been opened
+    /// Needed since the data type isn't known until an event has been
+    /// read
+    // CMS-THREADING Current implementation requires an instance of an
+    // OuputModule run on only one thread at a time.
+    void reportDataType(Token fileToken, std::string const& dataType);
+
+    /// Report that the input file identified by the given Token has
+    /// been closed. An exception will be thrown if the given Token
+    /// was not obtained from inputFileOpened.
+    void inputFileClosed(InputType inputType, Token fileToken);
+
+    /// Report that an output file has been opened.
+    /// The returned Token should be used for later identification
+    /// of this file.
+    Token outputFileOpened(std::string const& physicalFileName,
+                           std::string const& logicalFileName,
+                           std::string const& catalog,
+                           std::string const& outputModuleClassName,
+                           std::string const& moduleLabel,
+                           std::string const& guid,
+                           std::string const& dataType,
+                           std::string const& branchHash,
+                           std::vector<std::string> const& branchNames);
+
+    /// Report that the event with the given id has been written to
+    /// the file identified by the given Token.
+    // CMS-THREADING Current implementation requires an instance of an
+    // OuputModule run on only one thread at a time.
+    void eventWrittenToFile(Token fileToken, RunNumber_t run, EventNumber_t event);
+
+    /// Report that the output file identified by the given Token has
+    /// been closed. An exception will be thrown if the given Token
+    /// was not obtained from outputFileOpened.
+    void outputFileClosed(Token fileToken);
+
+    void reportSkippedEvent(RunNumber_t run, EventNumber_t event);
+
+    /// API for reporting a Run to the job report.
+    /// for output files, call only if Run is written to
+    /// the output file
+    ///
+    void reportRunNumber(JobReport::Token token, unsigned int run);
+
+    /// API for reporting a Lumi Section to the job report.
+    /// for output files, call only if lumi section is written to
+    /// the output file
+    ///
+    void reportLumiSection(JobReport::Token token, unsigned int run, unsigned int lumiSectId, unsigned long nEvents = 0);
+
+    ///
+    /// API for reporting a Lumi Section to the job report.
+    /// for input files, call only if lumi section is physically read
+    /// from the input file
+    ///
+    void reportInputLumiSection(unsigned int run, unsigned int lumiSectId);
+
+    ///
+    /// API to report a run read from input
+    ///
+    void reportInputRunNumber(unsigned int run);
+
+    ///
+    /// Report an exception, providing details of the problem as
+    /// a short description (Eg "XXXError") and a long description
+    /// (Eg "XXX crashed because...")
+    /// Also overload this method to accept an optional standard exit code
+    void reportError(std::string const& shortDesc, std::string const& longDesc, int const& exitCode);
+
+    ///
+    /// Report Skipped File
+    ///
+    /// Report that a file has been skipped due to it not being
+    /// found.
+    void reportSkippedFile(std::string const& pfn, std::string const& lfn);
+
+    void reportFallbackAttempt(std::string const& pfn, std::string const& lfn, std::string const& err);
+
+    void reportAnalysisFile(std::string const& fileName, std::map<std::string, std::string> const& fileData);
+
+    ///
+    /// Report Memory statistics
+    /// ALTERNATE FORM - USING THIS MAY NECESSITATE CHANGES IN PARSING XML!
+    /// Invoked by the Memory service to send an end of job
+    /// summary about memory usage for inclusion in the job report
+    ///
+    void reportMemoryInfo(std::vector<std::string> const& memoryData);
+
+    ///
+    /// Report Message statistics
+    /// Invoked by the MessageLogger service to send an end of job
+    /// summary about numbers of various categories messages issued
+    /// for inclusion in the job report
+    ///
+    void reportMessageInfo(std::map<std::string, double> const& messageData);
+
+    ///
+    /// Report read branches
+    /// Invoked by the source that reads ROOT/EDM files at the end of a job
+    /// to report which product branches in the Events tree have been read,
+    /// with a count of the number of events for which the branch was read.
+    ///
+    void reportReadBranches();
+
+    ///  Inform the job report that a branch has been read.
+    void reportReadBranch(InputType inputType, std::string const& branchName);
+
+    ///  Inform the job report that branches have been fast Cloned.
+    void reportFastClonedBranches(std::set<std::string> const& fastClonedBranches, long long nEvents);
+
+    ///
+    /// Report the name of the random engine persistency file
+    ///
+    void reportRandomStateFile(std::string const& name);
+
+    /*
        * Report information about fast copying. Called for each open output file
        * whenever an input file is opened.
        */
-      void reportFastCopyingStatus(Token t, std::string const& inputFileName, bool fastCopying);
-
-      ///
-      /// Performance Reports
-      ///
-      /// Two categories:  Summary for entire job and module
-      /// for a specific module
-      /// Each one requires a performance metric class such
-      /// as Timing, Memory, CPU, Trigger etc.
-      void reportPerformanceSummary(std::string const&  metricClass,
+    void reportFastCopyingStatus(Token t, std::string const& inputFileName, bool fastCopying);
+
+    ///
+    /// Performance Reports
+    ///
+    /// Two categories:  Summary for entire job and module
+    /// for a specific module
+    /// Each one requires a performance metric class such
+    /// as Timing, Memory, CPU, Trigger etc.
+    void reportPerformanceSummary(std::string const& metricClass, std::map<std::string, std::string> const& metrics);
+
+    void reportPerformanceForModule(std::string const& metricClass,
+                                    std::string const& moduleName,
                                     std::map<std::string, std::string> const& metrics);
 
-      void reportPerformanceForModule(std::string const&  metricClass,
-                                      std::string const&  moduleName,
-                                      std::map<std::string, std::string> const& metrics);
-
-      /// debug/test util
-      std::string dumpFiles(void);
+    /// debug/test util
+    std::string dumpFiles(void);
 
-   protected:
-      edm::propagate_const<std::unique_ptr<JobReportImpl>>& impl() {return impl_;}
+  protected:
+    edm::propagate_const<std::unique_ptr<JobReportImpl>>& impl() { return impl_; }
 
-   private:
-      edm::propagate_const<std::unique_ptr<JobReportImpl>> impl_;
-      std::mutex write_mutex;
-   };
+  private:
+    edm::propagate_const<std::unique_ptr<JobReportImpl>> impl_;
+    std::mutex write_mutex;
+  };
 
-   std::ostream& operator<< (std::ostream& os, JobReport::InputFile const& f);
-   std::ostream& operator<< (std::ostream& os, JobReport::OutputFile const& f);
-}
+  std::ostream& operator<<(std::ostream& os, JobReport::InputFile const& f);
+  std::ostream& operator<<(std::ostream& os, JobReport::OutputFile const& f);
+}  // namespace edm
 #endif
diff --git a/FWCore/MessageLogger/interface/LoggedErrorsSummary.h b/FWCore/MessageLogger/interface/LoggedErrorsSummary.h
index 50bb7d736c2ef..3274c528d9be3 100644
--- a/FWCore/MessageLogger/interface/LoggedErrorsSummary.h
+++ b/FWCore/MessageLogger/interface/LoggedErrorsSummary.h
@@ -4,9 +4,9 @@
 // ----------------------------------------------------------------------
 //
 // LoggedErrorsSummary.h - Methods to obtain summary of warning and error
-//		    messages issued in an event.  
+//		    messages issued in an event.
 //
-//   Usage:  
+//   Usage:
 //	EnableLoggedErrorsSummary();
 //	then per event:
 //	some_code_that_might_issue_messages();
@@ -30,7 +30,7 @@
 //    std::vector<edm::ErrorSummaryEntry> errs;
 //    std::vector<edm::ErrorSummaryEntry>::const_iterator end = es.end();
 //    for (std::vector<edm::ErrorSummaryEntry>::const_iterator i = es.begin();
-//                                                        i != end; ++i) { 
+//                                                        i != end; ++i) {
 //      if ( i->severity >= edm:ELerror ) errs.push_back(*i);
 //    }
 //    place_into_event(errs);
@@ -46,16 +46,14 @@
 
 #include <vector>
 
-namespace edm {       
+namespace edm {
 
-bool EnableLoggedErrorsSummary();
-bool DisableLoggedErrorsSummary();
-bool FreshErrorsExist(unsigned int iStreamID);
-std::vector<ErrorSummaryEntry> LoggedErrorsSummary( unsigned int iStreamID);     // Errors and Warnings
-std::vector<ErrorSummaryEntry> LoggedErrorsOnlySummary(unsigned int iStreamID); // Errors only
-
-}        // end of namespace edm
+  bool EnableLoggedErrorsSummary();
+  bool DisableLoggedErrorsSummary();
+  bool FreshErrorsExist(unsigned int iStreamID);
+  std::vector<ErrorSummaryEntry> LoggedErrorsSummary(unsigned int iStreamID);      // Errors and Warnings
+  std::vector<ErrorSummaryEntry> LoggedErrorsOnlySummary(unsigned int iStreamID);  // Errors only
 
+}  // end of namespace edm
 
 #endif  // MessageLogger_LoggedErrorsSummary_h
-
diff --git a/FWCore/MessageLogger/interface/MessageDrop.h b/FWCore/MessageLogger/interface/MessageDrop.h
index 40dc5aca0cac9..c8a55c086063c 100644
--- a/FWCore/MessageLogger/interface/MessageDrop.h
+++ b/FWCore/MessageLogger/interface/MessageDrop.h
@@ -22,7 +22,7 @@
 
 // Framework include files
 
-#include "FWCore/Utilities/interface/EDMException.h"	// change log 4
+#include "FWCore/Utilities/interface/EDMException.h"  // change log 4
 #include "FWCore/Utilities/interface/thread_safety_macros.h"
 #include "FWCore/Utilities/interface/propagate_const.h"
 
@@ -34,10 +34,10 @@
 //
 //  1  mf 5/12/06	initialize debugEnabled to true, to avoid unitialized
 //			data detection in memory checks (and to be safe in
-//			getting enabled output independant of timings) 
+//			getting enabled output independant of timings)
 //
 //  4  mf 2/22/07	static ex_p to have a way to convey exceptions to throw
-//			(this is needed when configuring could lead to an 
+//			(this is needed when configuring could lead to an
 //			exception, for example)
 //
 //  5  mf 2/22/07	jobreport_name to have a way to convey content
@@ -60,8 +60,8 @@
 //                      Support for reducing the string operations done when
 //			moving from one module to the next.
 //
-// 11  mf 11/29/10	Snapshot method to preare for invalidation of the   
-//			pointers used to hold module context.  Supports 
+// 11  mf 11/29/10	Snapshot method to preare for invalidation of the
+//			pointers used to hold module context.  Supports
 //			surviving throws that cause objects to go out of scope.
 //
 // 12  fwyzard 7/6/11   Add support for discarding LogError-level messages
@@ -70,58 +70,54 @@
 // 13  wmtan 11/11/11   Make non-copyable to satisfy Coverity. Would otherwise
 //                      need special copy ctor and copy assignment operator.
 
-
 // user include files
 
 namespace edm {
 
-namespace messagedrop {
-  class StringProducer;
-  class StringProducerWithPhase;
-  class StringProducerPath; 
-  class StringProducerSinglet;  
-}
-
-struct MessageDrop {
-private:
-  MessageDrop();					// change log 10:
-  							// moved to cc file  
-  MessageDrop( MessageDrop const& ) = delete;
-  MessageDrop& operator=( MessageDrop const& ) = delete;
-public:
-  ~MessageDrop();					// change log 10
-  static MessageDrop * instance ();
-  std::string moduleContext();
-  void setModuleWithPhase(std::string const & name,
-                          std::string const & label,
-                          unsigned int moduleID,
-                          const char* phase);  
-  void setPath(const char* type, std::string const & pathname);
-  void setSinglet(const char * sing);
-  void clear();
-
-  std::string runEvent;
-  unsigned int streamID;
-  bool debugEnabled;                             // change log 8
-  bool infoEnabled;                              // change log 8
-  bool warningEnabled;                           // change log 8
-  bool errorEnabled;                             // change log 8, 12
-
-  CMS_THREAD_SAFE static std::string jobMode;					// change log 6
-  CMS_THREAD_SAFE static unsigned char messageLoggerScribeIsRunning;	// change log 7
-  CMS_THREAD_SAFE static bool debugAlwaysSuppressed;			// change log 9
-  CMS_THREAD_SAFE static bool infoAlwaysSuppressed;			// change log 9
-  CMS_THREAD_SAFE static bool warningAlwaysSuppressed;			// change log 9
-private:
-  edm::propagate_const<messagedrop::StringProducerWithPhase*> spWithPhase;
-  edm::propagate_const<messagedrop::StringProducerPath*> spPath;
-  edm::propagate_const<messagedrop::StringProducerSinglet*> spSinglet;
-  messagedrop::StringProducer const    * moduleNameProducer;
-};
-
-static const unsigned char  MLSCRIBE_RUNNING_INDICATOR = 29; // change log 7
-
-} // end of namespace edm
-
-
-#endif // MessageLogger_MessageDrop_h
+  namespace messagedrop {
+    class StringProducer;
+    class StringProducerWithPhase;
+    class StringProducerPath;
+    class StringProducerSinglet;
+  }  // namespace messagedrop
+
+  struct MessageDrop {
+  private:
+    MessageDrop();  // change log 10:
+                    // moved to cc file
+    MessageDrop(MessageDrop const&) = delete;
+    MessageDrop& operator=(MessageDrop const&) = delete;
+
+  public:
+    ~MessageDrop();  // change log 10
+    static MessageDrop* instance();
+    std::string moduleContext();
+    void setModuleWithPhase(std::string const& name, std::string const& label, unsigned int moduleID, const char* phase);
+    void setPath(const char* type, std::string const& pathname);
+    void setSinglet(const char* sing);
+    void clear();
+
+    std::string runEvent;
+    unsigned int streamID;
+    bool debugEnabled;    // change log 8
+    bool infoEnabled;     // change log 8
+    bool warningEnabled;  // change log 8
+    bool errorEnabled;    // change log 8, 12
+
+    CMS_THREAD_SAFE static std::string jobMode;                         // change log 6
+    CMS_THREAD_SAFE static unsigned char messageLoggerScribeIsRunning;  // change log 7
+    CMS_THREAD_SAFE static bool debugAlwaysSuppressed;                  // change log 9
+    CMS_THREAD_SAFE static bool infoAlwaysSuppressed;                   // change log 9
+    CMS_THREAD_SAFE static bool warningAlwaysSuppressed;                // change log 9
+  private:
+    edm::propagate_const<messagedrop::StringProducerWithPhase*> spWithPhase;
+    edm::propagate_const<messagedrop::StringProducerPath*> spPath;
+    edm::propagate_const<messagedrop::StringProducerSinglet*> spSinglet;
+    messagedrop::StringProducer const* moduleNameProducer;
+  };
+
+  static const unsigned char MLSCRIBE_RUNNING_INDICATOR = 29;  // change log 7
+
+}  // end of namespace edm
+
+#endif  // MessageLogger_MessageDrop_h
diff --git a/FWCore/MessageLogger/interface/MessageLogger.h b/FWCore/MessageLogger/interface/MessageLogger.h
index f1cd5b57aa989..da129fd0fa9a7 100644
--- a/FWCore/MessageLogger/interface/MessageLogger.h
+++ b/FWCore/MessageLogger/interface/MessageLogger.h
@@ -39,7 +39,7 @@
 //		    objects.  This cures the use-of-thread-commands-after-
 //		    exit problem in programs that link but do not use the
 //		    MessageLogger.
-// 
+//
 // 9  mf 12/12/07   Check for subtly terrible situation of copying and then
 //		    writing to a LogDebug_ object.  Also forbid copying any
 //		    of the ordinary LogXXX objects (since that implies either
@@ -75,17 +75,17 @@
 // 18 wmtan 07/08/10 Remove unnecessary includes
 //
 // 19 mf  09/21/10 !!! BEHAVIOR CHANGE: LogDebug suppression.
-//                 The sole preprocessor symbol controlling suppression of 
+//                 The sole preprocessor symbol controlling suppression of
 //                 LogDebug is EDM_ML_DEBUG.  If EDM_ML_DEBUG is not defined
-//                 then LogDebug is suppressed.  Thus by default LogDebug is 
+//                 then LogDebug is suppressed.  Thus by default LogDebug is
 //                 suppressed.
 //
 // 20 mf  09/21/10 The mechanism of LogDebug is modified such that if LogDebug
-//                 is suppressed, whether via lack of the EDM_ML_DEBUG symbol 
-//                 or dynabically via !debgEnabled, all code past the 
-//                 LogDebug(...), including operator<< and functions to 
+//                 is suppressed, whether via lack of the EDM_ML_DEBUG symbol
+//                 or dynabically via !debgEnabled, all code past the
+//                 LogDebug(...), including operator<< and functions to
 //                 prepare the output strings, is squelched.  This was the
-//                 original intended behavior.  
+//                 original intended behavior.
 //
 //  ************   Note that in this regard, LogDebug behaves like assert:
 //                 The use of functions having side effects, on a LogDebug
@@ -96,19 +96,19 @@
 // 21  mf 9/23/10  Support for situations where no thresholds are low
 //                 enough to react to LogDebug (or info, or warning).
 //		   A key observation is that while debugEnabled
-//		   should in principle be obtained via an instance() of 
+//		   should in principle be obtained via an instance() of
 //		   MessageDrop, debugAlwaysSuppressed is universal across
 //		   threads and hence is properly just a class static, which
 //		   is much quicker to check.
 //
-// 22  mf 9/27/10  edmmltest::LogWarningThatSuppressesLikeLogInfo, 
+// 22  mf 9/27/10  edmmltest::LogWarningThatSuppressesLikeLogInfo,
 //		   a class provided solely to allow testing of the feature
 //		   that if all destinations have threshold too high, then
 //		   a level of messages (in this case, INFO) will be suppressed
-//		   without even being seen by the destinations. 
+//		   without even being seen by the destinations.
 //
-// 23 mf 11/30/10  SnapshotMessageLog() method to force MessageDrop to 
-//		   capture any pointed-to strings in anticipation of key 
+// 23 mf 11/30/10  SnapshotMessageLog() method to force MessageDrop to
+//		   capture any pointed-to strings in anticipation of key
 //		   objects going away before a message is going to be issued.
 //
 // 24 fwyzard 7/6/11    Add support for discarding LogError-level messages
@@ -134,445 +134,515 @@
 
 #include "FWCore/MessageLogger/interface/MessageSender.h"
 #include "FWCore/MessageLogger/interface/MessageDrop.h"
-#include "FWCore/Utilities/interface/EDMException.h"		// Change log 8
-
-
-namespace edm  {
-
-class LogWarning
-{
-public:
-  explicit LogWarning( std::string const & id ) 
-    : ap ( ELwarning,id,false,(MessageDrop::warningAlwaysSuppressed || !MessageDrop::instance()->warningEnabled)) // Change log 21
-  { }
-  ~LogWarning();						// Change log 13
-
-  template< class T >
-    LogWarning & 
-    operator<< (T const & t)  { if(ap.valid()) ap << t; return *this; }
-  LogWarning & 
-  operator<< ( std::ostream&(*f)(std::ostream&))  
-				      { if(ap.valid()) ap << f; return *this; }
-  LogWarning & 
-  operator<< ( std::ios_base&(*f)(std::ios_base&) )  
-				      { if(ap.valid()) ap << f; return *this; }
-
-  template<typename F>
-  LogWarning& log(F&& iF) {
-    if(ap.valid()) {
-      iF(ap);
+#include "FWCore/Utilities/interface/EDMException.h"  // Change log 8
+
+namespace edm {
+
+  class LogWarning {
+  public:
+    explicit LogWarning(std::string const& id)
+        : ap(ELwarning,
+             id,
+             false,
+             (MessageDrop::warningAlwaysSuppressed || !MessageDrop::instance()->warningEnabled))  // Change log 21
+    {}
+    ~LogWarning();  // Change log 13
+
+    template <class T>
+    LogWarning& operator<<(T const& t) {
+      if (ap.valid())
+        ap << t;
+      return *this;
     }
-    return *this;
-  }
-private:
-  MessageSender ap; 
-  LogWarning( LogWarning const& ) = delete;				// Change log 9
-  LogWarning& operator=( LogWarning const& ) = delete;
-   
-};  // LogWarning
-
-class LogError
-{
-public:
-  explicit LogError( std::string const & id ) 
-    : ap ( ELerror,id,false,!MessageDrop::instance()->errorEnabled )        // Change log 24
-  { }
-  ~LogError();							// Change log 13
-
-  template< class T >
-    LogError & 
-    operator<< (T const & t)  { if(ap.valid()) ap << t; return *this; }
-  LogError & 
-  operator<< ( std::ostream&(*f)(std::ostream&))  
-				      { if(ap.valid()) ap << f; return *this; }
-  LogError & 
-  operator<< ( std::ios_base&(*f)(std::ios_base&) )  
-				      { if(ap.valid()) ap << f; return *this; }     
-  
-  template<typename F>
-  LogError& log(F&& iF) {
-    if(ap.valid()) {
-      iF(ap);
+    LogWarning& operator<<(std::ostream& (*f)(std::ostream&)) {
+      if (ap.valid())
+        ap << f;
+      return *this;
     }
-    return *this;
-  }
-
-private:
-  MessageSender ap; 
-  LogError( LogError const& ) = delete;					// Change log 9
-  LogError& operator=( LogError const& ) = delete;
-
-};  // LogError
-
-class LogSystem
-{
-public:
-  explicit LogSystem( std::string const & id ) 
-    : ap( ELsevere,id )
-  { }
-  ~LogSystem();							// Change log 13
-
-  template< class T >
-    LogSystem & 
-    operator<< (T const & t)  { ap << t; return *this; }
-  LogSystem & 
-  operator<< ( std::ostream&(*f)(std::ostream&))  
-				      { ap << f; return *this; }
-  LogSystem & 
-  operator<< ( std::ios_base&(*f)(std::ios_base&) )  
-				      { ap << f; return *this; }     
-
-  template<typename F>
-  LogSystem& log(F&& iF) {
-    iF(ap);
-    return *this;
-  }
-
-private:
-  MessageSender ap; 
-  LogSystem( LogSystem const& ) = delete;				// Change log 9
-  LogSystem& operator=( LogSystem const& ) = delete;
-
-};  // LogSystem
-
-class LogInfo				
-{
-public:
-  explicit LogInfo( std::string const & id ) 
-    : ap ( ELinfo,id,false,(MessageDrop::infoAlwaysSuppressed || !MessageDrop::instance()->infoEnabled) ) // Change log 21
-  { }
-  ~LogInfo();							// Change log 13
-
-  template< class T >
-    LogInfo & 
-    operator<< (T const & t)  { if(ap.valid()) ap << t; return *this; }
-  LogInfo & 
-  operator<< ( std::ostream&(*f)(std::ostream&))  
-				      { if(ap.valid()) ap << f; return *this; }
-  LogInfo & 
-  operator<< ( std::ios_base&(*f)(std::ios_base&) )  
-				      { if(ap.valid()) ap << f; return *this; }     
-
-  template<typename F>
-  LogInfo& log(F&& iF) {
-    if(ap.valid()) {
-      iF(ap);
+    LogWarning& operator<<(std::ios_base& (*f)(std::ios_base&)) {
+      if (ap.valid())
+        ap << f;
+      return *this;
     }
-    return *this;
-  }
-private:
-  MessageSender ap; 
-  LogInfo( LogInfo const& ) = delete;					// Change log 9
-  LogInfo& operator=( LogInfo const& ) = delete;
-  
-};  // LogInfo
-
-// verbatim version of LogInfo
-class LogVerbatim						// change log 2
-{
-public:
-  explicit LogVerbatim( std::string const & id ) 
-    : ap ( ELinfo,id,true,(MessageDrop::infoAlwaysSuppressed || !MessageDrop::instance()->infoEnabled) ) // Change log 21
-  { }
-  ~LogVerbatim();						// Change log 13
-
-  template< class T >
-    LogVerbatim & 
-    operator<< (T const & t)  { if(ap.valid()) ap << t; return *this; } 
-								// Change log 14
-  LogVerbatim & 
-  operator<< ( std::ostream&(*f)(std::ostream&))  
-				      { if(ap.valid()) ap << f; return *this; }
-  LogVerbatim & 
-  operator<< ( std::ios_base&(*f)(std::ios_base&) )  
-				      { if(ap.valid()) ap << f; return *this; }   
-
-  template<typename F>
-  LogVerbatim& log(F&& iF) {
-    if(ap.valid()) {
-      iF(ap);
+
+    template <typename F>
+    LogWarning& log(F&& iF) {
+      if (ap.valid()) {
+        iF(ap);
+      }
+      return *this;
     }
-    return *this;
-  }
-
-private:
-  MessageSender ap; 
-  LogVerbatim( LogVerbatim const& ) = delete;				// Change log 9
-  LogVerbatim& operator=( LogVerbatim const& ) = delete;
-  
-};  // LogVerbatim
-
-// verbatim version of LogWarning
-class LogPrint							// change log 3
-{
-public:
-  explicit LogPrint( std::string const & id ) 
-    : ap ( ELwarning,id,true,(MessageDrop::warningAlwaysSuppressed || !MessageDrop::instance()->warningEnabled)) // Change log 21
-  { }
-  ~LogPrint();							// Change log 13
-
-  template< class T >
-    LogPrint & 
-    operator<< (T const & t)  { if(ap.valid()) ap << t; return *this; } 
-								// Change log 14
-  LogPrint & 
-  operator<< ( std::ostream&(*f)(std::ostream&))  
-				{ if(ap.valid()) ap << f; return *this; }
-  LogPrint & 
-  operator<< ( std::ios_base&(*f)(std::ios_base&) )  
-				{ if(ap.valid()) ap << f; return *this; }      
-
-  template<typename F>
-  LogPrint& log(F&& iF) {
-    if(ap.valid()) {
-      iF(ap);
+
+  private:
+    MessageSender ap;
+    LogWarning(LogWarning const&) = delete;  // Change log 9
+    LogWarning& operator=(LogWarning const&) = delete;
+
+  };  // LogWarning
+
+  class LogError {
+  public:
+    explicit LogError(std::string const& id)
+        : ap(ELerror, id, false, !MessageDrop::instance()->errorEnabled)  // Change log 24
+    {}
+    ~LogError();  // Change log 13
+
+    template <class T>
+    LogError& operator<<(T const& t) {
+      if (ap.valid())
+        ap << t;
+      return *this;
     }
-    return *this;
-  }
-
-private:
-  MessageSender ap; 
-  LogPrint( LogPrint const& ) = delete;					// Change log 9
-  LogPrint& operator=( LogPrint const& ) = delete;
-  
-};  // LogPrint
-
-
-// verbatim version of LogError
-class LogProblem						// change log 4
-{
-public:
- explicit LogProblem ( std::string const & id )
-    : ap ( ELerror,id,true,!MessageDrop::instance()->errorEnabled )        // Change log 24
-  { }
-  ~LogProblem();						// Change log 13
-
-  template< class T >
-    LogProblem & 
-    operator<< (T const & t)  { if(ap.valid()) ap << t; return *this; }
-  LogProblem & 
-  operator<< ( std::ostream&(*f)(std::ostream&))  
-				      { if(ap.valid()) ap << f; return *this; }
-  LogProblem & 
-  operator<< ( std::ios_base&(*f)(std::ios_base&) )  
-				      { if(ap.valid()) ap << f; return *this; }     
-  
-  template<typename F>
-  LogProblem& log(F&& iF) {
-    if(ap.valid()) {
-      iF(ap);
+    LogError& operator<<(std::ostream& (*f)(std::ostream&)) {
+      if (ap.valid())
+        ap << f;
+      return *this;
     }
-    return *this;
-  }
-
-private:
-  MessageSender ap; 
-  LogProblem( LogProblem const& ) = delete;				// Change log 9
-  LogProblem& operator=( LogProblem const& ) = delete;
-
-};  // LogProblem
-
-// less judgemental verbatim version of LogError
-class LogImportant						// change log 11
-{
-public:
-  explicit LogImportant( std::string const & id ) 
-    : ap ( ELerror,id,true,!MessageDrop::instance()->errorEnabled )        // Change log 24
-  { }
-  ~LogImportant();						 // Change log 13
-
-  template< class T >
-    LogImportant & 
-    operator<< (T const & t)  { if(ap.valid()) ap << t; return *this; }
-  LogImportant & 
-  operator<< ( std::ostream&(*f)(std::ostream&))  
-				      { if(ap.valid()) ap << f; return *this; }
-  LogImportant & 
-  operator<< ( std::ios_base&(*f)(std::ios_base&) )  
-				      { if(ap.valid()) ap << f; return *this; }     
-
-  template<typename F>
-  LogImportant& log(F&& iF) {
-    if(ap.valid()) {
-      iF(ap);
+    LogError& operator<<(std::ios_base& (*f)(std::ios_base&)) {
+      if (ap.valid())
+        ap << f;
+      return *this;
     }
-    return *this;
-  }
-
-private:
-  MessageSender ap; 
-  LogImportant( LogImportant const& ) = delete;				// Change log 9
-  LogImportant& operator=( LogImportant const& ) = delete;
-
-};  // LogImportant
-
-// verbatim version of LogSystem
-class LogAbsolute						// change log 4
-{
-public:
-  explicit LogAbsolute( std::string const & id ) 
-    : ap( ELsevere,id,true ) // true for verbatim
-  { }
-  ~LogAbsolute();						// Change log 13
-
-  template< class T >
-    LogAbsolute & 
-    operator<< (T const & t)  { ap << t; return *this; }
-  LogAbsolute & 
-  operator<< ( std::ostream&(*f)(std::ostream&))  
-				      { ap << f; return *this; }
-  LogAbsolute & 
-  operator<< ( std::ios_base&(*f)(std::ios_base&) )  
-				      { ap << f; return *this; }     
-
-  
-  template<typename F>
-  LogAbsolute& log(F&& iF) {
-    iF(ap);
-    return *this;
-  }
-
-private:
-  MessageSender ap; 
-  LogAbsolute( LogAbsolute const& ) = delete;				// Change log 9
-  LogAbsolute& operator=( LogAbsolute const& ) = delete;
-
-};  // LogAbsolute
-
-std::string stripLeadingDirectoryTree(const std::string & file);
-
-// change log 10:  removed onlyLowestDirectory()
-
-void LogStatistics(); 
-
-class LogDebug_
-{
-public:
-  LogDebug_() : ap() {}
-  explicit LogDebug_( std::string const & id, std::string const & file, int line ); // Change log 17
-  ~LogDebug_(); 
-
-  template< class T >
-    LogDebug_ & 
-    operator<< (T const & t)  
-    {
-      if (ap.valid()) ap << t; 
-      return *this; }
-  LogDebug_ & 
-  operator<< ( std::ostream&(*f)(std::ostream&))  
-    {
-      if (ap.valid()) ap << f; 
-      return *this; }
-  LogDebug_ & 
-  operator<< ( std::ios_base&(*f)(std::ios_base&) )  
-    {
-      if (ap.valid()) ap << f; 
-      return *this; }
-			   // Change log 8:  The tests for ap.valid() being null 
-  
-  template<typename F>
-  LogDebug_& log(F&& iF) {
-    if(ap.valid()) {
-      iF(ap);
+
+    template <typename F>
+    LogError& log(F&& iF) {
+      if (ap.valid()) {
+        iF(ap);
+      }
+      return *this;
+    }
+
+  private:
+    MessageSender ap;
+    LogError(LogError const&) = delete;  // Change log 9
+    LogError& operator=(LogError const&) = delete;
+
+  };  // LogError
+
+  class LogSystem {
+  public:
+    explicit LogSystem(std::string const& id) : ap(ELsevere, id) {}
+    ~LogSystem();  // Change log 13
+
+    template <class T>
+    LogSystem& operator<<(T const& t) {
+      ap << t;
+      return *this;
+    }
+    LogSystem& operator<<(std::ostream& (*f)(std::ostream&)) {
+      ap << f;
+      return *this;
     }
-    return *this;
-  }
-
-private:
-  MessageSender ap; 
-  std::string stripLeadingDirectoryTree (const std::string & file) const;
-								// change log 10
-};  // LogDebug_
-
-class LogTrace_
-{
-public:
-  LogTrace_() : ap() {}
-  explicit LogTrace_( std::string const & id );			// Change log 13
-  ~LogTrace_(); 
-
-  template< class T >
-    LogTrace_ & 
-    operator<< (T const & t)  
-    { 
-      if (ap.valid()) ap << t; 
-      return *this; }
-  LogTrace_ & 
-  operator<< ( std::ostream&(*f)(std::ostream&))  
-    { 
-      if (ap.valid()) ap << f; 
-      return *this; }
-  LogTrace_ & 
-  operator<< ( std::ios_base&(*f)(std::ios_base&) )  
-    {
-      if (ap.valid()) ap << f; 
-      return *this; }
-			   // Change log 8:  The tests for ap.valid() being null 
- 
-  template<typename F>
-  LogTrace_& log(F&& iF) {
-    if(ap.valid()) {
+    LogSystem& operator<<(std::ios_base& (*f)(std::ios_base&)) {
+      ap << f;
+      return *this;
+    }
+
+    template <typename F>
+    LogSystem& log(F&& iF) {
       iF(ap);
+      return *this;
     }
-    return *this;
-  }
-
-private:
-  MessageSender ap; 
-  
-};  // LogTrace_
-
-// Change log 22
-namespace edmmltest {
-class LogWarningThatSuppressesLikeLogInfo
-{
-public:
-  explicit LogWarningThatSuppressesLikeLogInfo( std::string const & id ) 
-    : ap ( ELwarning,id,false,(MessageDrop::infoAlwaysSuppressed || !MessageDrop::instance()->warningEnabled) )  // Change log 22
-  { }
-  ~LogWarningThatSuppressesLikeLogInfo();						
-  template< class T >
-    LogWarningThatSuppressesLikeLogInfo & 
-    operator<< (T const & t)  { if(ap.valid()) ap << t; return *this; }
-  LogWarningThatSuppressesLikeLogInfo & 
-  operator<< ( std::ostream&(*f)(std::ostream&))  
-				      { if(ap.valid()) ap << f; return *this; }
-  LogWarningThatSuppressesLikeLogInfo & 
-  operator<< ( std::ios_base&(*f)(std::ios_base&) )  
-				      { if(ap.valid()) ap << f; return *this; }
-
-  template<typename F>
-  LogWarningThatSuppressesLikeLogInfo& log(F&& iF) {
-    if(ap.valid()) {
+
+  private:
+    MessageSender ap;
+    LogSystem(LogSystem const&) = delete;  // Change log 9
+    LogSystem& operator=(LogSystem const&) = delete;
+
+  };  // LogSystem
+
+  class LogInfo {
+  public:
+    explicit LogInfo(std::string const& id)
+        : ap(ELinfo,
+             id,
+             false,
+             (MessageDrop::infoAlwaysSuppressed || !MessageDrop::instance()->infoEnabled))  // Change log 21
+    {}
+    ~LogInfo();  // Change log 13
+
+    template <class T>
+    LogInfo& operator<<(T const& t) {
+      if (ap.valid())
+        ap << t;
+      return *this;
+    }
+    LogInfo& operator<<(std::ostream& (*f)(std::ostream&)) {
+      if (ap.valid())
+        ap << f;
+      return *this;
+    }
+    LogInfo& operator<<(std::ios_base& (*f)(std::ios_base&)) {
+      if (ap.valid())
+        ap << f;
+      return *this;
+    }
+
+    template <typename F>
+    LogInfo& log(F&& iF) {
+      if (ap.valid()) {
+        iF(ap);
+      }
+      return *this;
+    }
+
+  private:
+    MessageSender ap;
+    LogInfo(LogInfo const&) = delete;  // Change log 9
+    LogInfo& operator=(LogInfo const&) = delete;
+
+  };  // LogInfo
+
+  // verbatim version of LogInfo
+  class LogVerbatim  // change log 2
+  {
+  public:
+    explicit LogVerbatim(std::string const& id)
+        : ap(ELinfo,
+             id,
+             true,
+             (MessageDrop::infoAlwaysSuppressed || !MessageDrop::instance()->infoEnabled))  // Change log 21
+    {}
+    ~LogVerbatim();  // Change log 13
+
+    template <class T>
+    LogVerbatim& operator<<(T const& t) {
+      if (ap.valid())
+        ap << t;
+      return *this;
+    }
+    // Change log 14
+    LogVerbatim& operator<<(std::ostream& (*f)(std::ostream&)) {
+      if (ap.valid())
+        ap << f;
+      return *this;
+    }
+    LogVerbatim& operator<<(std::ios_base& (*f)(std::ios_base&)) {
+      if (ap.valid())
+        ap << f;
+      return *this;
+    }
+
+    template <typename F>
+    LogVerbatim& log(F&& iF) {
+      if (ap.valid()) {
+        iF(ap);
+      }
+      return *this;
+    }
+
+  private:
+    MessageSender ap;
+    LogVerbatim(LogVerbatim const&) = delete;  // Change log 9
+    LogVerbatim& operator=(LogVerbatim const&) = delete;
+
+  };  // LogVerbatim
+
+  // verbatim version of LogWarning
+  class LogPrint  // change log 3
+  {
+  public:
+    explicit LogPrint(std::string const& id)
+        : ap(ELwarning,
+             id,
+             true,
+             (MessageDrop::warningAlwaysSuppressed || !MessageDrop::instance()->warningEnabled))  // Change log 21
+    {}
+    ~LogPrint();  // Change log 13
+
+    template <class T>
+    LogPrint& operator<<(T const& t) {
+      if (ap.valid())
+        ap << t;
+      return *this;
+    }
+    // Change log 14
+    LogPrint& operator<<(std::ostream& (*f)(std::ostream&)) {
+      if (ap.valid())
+        ap << f;
+      return *this;
+    }
+    LogPrint& operator<<(std::ios_base& (*f)(std::ios_base&)) {
+      if (ap.valid())
+        ap << f;
+      return *this;
+    }
+
+    template <typename F>
+    LogPrint& log(F&& iF) {
+      if (ap.valid()) {
+        iF(ap);
+      }
+      return *this;
+    }
+
+  private:
+    MessageSender ap;
+    LogPrint(LogPrint const&) = delete;  // Change log 9
+    LogPrint& operator=(LogPrint const&) = delete;
+
+  };  // LogPrint
+
+  // verbatim version of LogError
+  class LogProblem  // change log 4
+  {
+  public:
+    explicit LogProblem(std::string const& id)
+        : ap(ELerror, id, true, !MessageDrop::instance()->errorEnabled)  // Change log 24
+    {}
+    ~LogProblem();  // Change log 13
+
+    template <class T>
+    LogProblem& operator<<(T const& t) {
+      if (ap.valid())
+        ap << t;
+      return *this;
+    }
+    LogProblem& operator<<(std::ostream& (*f)(std::ostream&)) {
+      if (ap.valid())
+        ap << f;
+      return *this;
+    }
+    LogProblem& operator<<(std::ios_base& (*f)(std::ios_base&)) {
+      if (ap.valid())
+        ap << f;
+      return *this;
+    }
+
+    template <typename F>
+    LogProblem& log(F&& iF) {
+      if (ap.valid()) {
+        iF(ap);
+      }
+      return *this;
+    }
+
+  private:
+    MessageSender ap;
+    LogProblem(LogProblem const&) = delete;  // Change log 9
+    LogProblem& operator=(LogProblem const&) = delete;
+
+  };  // LogProblem
+
+  // less judgemental verbatim version of LogError
+  class LogImportant  // change log 11
+  {
+  public:
+    explicit LogImportant(std::string const& id)
+        : ap(ELerror, id, true, !MessageDrop::instance()->errorEnabled)  // Change log 24
+    {}
+    ~LogImportant();  // Change log 13
+
+    template <class T>
+    LogImportant& operator<<(T const& t) {
+      if (ap.valid())
+        ap << t;
+      return *this;
+    }
+    LogImportant& operator<<(std::ostream& (*f)(std::ostream&)) {
+      if (ap.valid())
+        ap << f;
+      return *this;
+    }
+    LogImportant& operator<<(std::ios_base& (*f)(std::ios_base&)) {
+      if (ap.valid())
+        ap << f;
+      return *this;
+    }
+
+    template <typename F>
+    LogImportant& log(F&& iF) {
+      if (ap.valid()) {
+        iF(ap);
+      }
+      return *this;
+    }
+
+  private:
+    MessageSender ap;
+    LogImportant(LogImportant const&) = delete;  // Change log 9
+    LogImportant& operator=(LogImportant const&) = delete;
+
+  };  // LogImportant
+
+  // verbatim version of LogSystem
+  class LogAbsolute  // change log 4
+  {
+  public:
+    explicit LogAbsolute(std::string const& id)
+        : ap(ELsevere, id, true)  // true for verbatim
+    {}
+    ~LogAbsolute();  // Change log 13
+
+    template <class T>
+    LogAbsolute& operator<<(T const& t) {
+      ap << t;
+      return *this;
+    }
+    LogAbsolute& operator<<(std::ostream& (*f)(std::ostream&)) {
+      ap << f;
+      return *this;
+    }
+    LogAbsolute& operator<<(std::ios_base& (*f)(std::ios_base&)) {
+      ap << f;
+      return *this;
+    }
+
+    template <typename F>
+    LogAbsolute& log(F&& iF) {
       iF(ap);
+      return *this;
+    }
+
+  private:
+    MessageSender ap;
+    LogAbsolute(LogAbsolute const&) = delete;  // Change log 9
+    LogAbsolute& operator=(LogAbsolute const&) = delete;
+
+  };  // LogAbsolute
+
+  std::string stripLeadingDirectoryTree(const std::string& file);
+
+  // change log 10:  removed onlyLowestDirectory()
+
+  void LogStatistics();
+
+  class LogDebug_ {
+  public:
+    LogDebug_() : ap() {}
+    explicit LogDebug_(std::string const& id, std::string const& file, int line);  // Change log 17
+    ~LogDebug_();
+
+    template <class T>
+    LogDebug_& operator<<(T const& t) {
+      if (ap.valid())
+        ap << t;
+      return *this;
+    }
+    LogDebug_& operator<<(std::ostream& (*f)(std::ostream&)) {
+      if (ap.valid())
+        ap << f;
+      return *this;
+    }
+    LogDebug_& operator<<(std::ios_base& (*f)(std::ios_base&)) {
+      if (ap.valid())
+        ap << f;
+      return *this;
+    }
+    // Change log 8:  The tests for ap.valid() being null
+
+    template <typename F>
+    LogDebug_& log(F&& iF) {
+      if (ap.valid()) {
+        iF(ap);
+      }
+      return *this;
     }
-    return *this;
-  }
-
-private:
-  MessageSender ap; 
-  LogWarningThatSuppressesLikeLogInfo( LogWarningThatSuppressesLikeLogInfo const& ) = delete;				// Change log 9
-  LogWarningThatSuppressesLikeLogInfo& operator=( LogWarningThatSuppressesLikeLogInfo const& ) = delete;
-   
-};  // LogWarningThatSuppressesLikeLogInfo
-} // end namespace edmmltest
-
-class Suppress_LogDebug_ 
-{ 
-  // With any decent optimization, use of Suppress_LogDebug_ (...)
-  // including streaming of items to it via operator<<
-  // will produce absolutely no executable code.
-public:
-  template< class T >
-    Suppress_LogDebug_ &operator<< (T const&) { return *this; }	// Change log 12
-    Suppress_LogDebug_ &operator<< (std::ostream&(*)(std::ostream&)) { return *this; }	// Change log 12
-    Suppress_LogDebug_ &operator<< (std::ios_base&(*)(std::ios_base&)) { return *this; } // Change log 12
-  
-  template<typename F>
-  Suppress_LogDebug_& log(F&& iF) {
-    return *this;
-  }
-};  // Suppress_LogDebug_
+
+  private:
+    MessageSender ap;
+    std::string stripLeadingDirectoryTree(const std::string& file) const;
+    // change log 10
+  };  // LogDebug_
+
+  class LogTrace_ {
+  public:
+    LogTrace_() : ap() {}
+    explicit LogTrace_(std::string const& id);  // Change log 13
+    ~LogTrace_();
+
+    template <class T>
+    LogTrace_& operator<<(T const& t) {
+      if (ap.valid())
+        ap << t;
+      return *this;
+    }
+    LogTrace_& operator<<(std::ostream& (*f)(std::ostream&)) {
+      if (ap.valid())
+        ap << f;
+      return *this;
+    }
+    LogTrace_& operator<<(std::ios_base& (*f)(std::ios_base&)) {
+      if (ap.valid())
+        ap << f;
+      return *this;
+    }
+    // Change log 8:  The tests for ap.valid() being null
+
+    template <typename F>
+    LogTrace_& log(F&& iF) {
+      if (ap.valid()) {
+        iF(ap);
+      }
+      return *this;
+    }
+
+  private:
+    MessageSender ap;
+
+  };  // LogTrace_
+
+  // Change log 22
+  namespace edmmltest {
+    class LogWarningThatSuppressesLikeLogInfo {
+    public:
+      explicit LogWarningThatSuppressesLikeLogInfo(std::string const& id)
+          : ap(ELwarning,
+               id,
+               false,
+               (MessageDrop::infoAlwaysSuppressed || !MessageDrop::instance()->warningEnabled))  // Change log 22
+      {}
+      ~LogWarningThatSuppressesLikeLogInfo();
+      template <class T>
+      LogWarningThatSuppressesLikeLogInfo& operator<<(T const& t) {
+        if (ap.valid())
+          ap << t;
+        return *this;
+      }
+      LogWarningThatSuppressesLikeLogInfo& operator<<(std::ostream& (*f)(std::ostream&)) {
+        if (ap.valid())
+          ap << f;
+        return *this;
+      }
+      LogWarningThatSuppressesLikeLogInfo& operator<<(std::ios_base& (*f)(std::ios_base&)) {
+        if (ap.valid())
+          ap << f;
+        return *this;
+      }
+
+      template <typename F>
+      LogWarningThatSuppressesLikeLogInfo& log(F&& iF) {
+        if (ap.valid()) {
+          iF(ap);
+        }
+        return *this;
+      }
+
+    private:
+      MessageSender ap;
+      LogWarningThatSuppressesLikeLogInfo(LogWarningThatSuppressesLikeLogInfo const&) = delete;  // Change log 9
+      LogWarningThatSuppressesLikeLogInfo& operator=(LogWarningThatSuppressesLikeLogInfo const&) = delete;
+
+    };  // LogWarningThatSuppressesLikeLogInfo
+  }     // end namespace edmmltest
+
+  class Suppress_LogDebug_ {
+    // With any decent optimization, use of Suppress_LogDebug_ (...)
+    // including streaming of items to it via operator<<
+    // will produce absolutely no executable code.
+  public:
+    template <class T>
+    Suppress_LogDebug_& operator<<(T const&) {
+      return *this;
+    }                                                                                     // Change log 12
+    Suppress_LogDebug_& operator<<(std::ostream& (*)(std::ostream&)) { return *this; }    // Change log 12
+    Suppress_LogDebug_& operator<<(std::ios_base& (*)(std::ios_base&)) { return *this; }  // Change log 12
+
+    template <typename F>
+    Suppress_LogDebug_& log(F&& iF) {
+      return *this;
+    }
+  };  // Suppress_LogDebug_
 
   bool isDebugEnabled();
   bool isInfoEnabled();
@@ -580,30 +650,34 @@ class Suppress_LogDebug_
   void HaltMessageLogging();
   void FlushMessageLog();
   void clearMessageLog();
-  void GroupLogStatistics(std::string const & category);
+  void GroupLogStatistics(std::string const& category);
   bool isMessageProcessingSetUp();
 
   // Change Log 15
   // The following two methods have no effect except in stand-alone apps
   // that do not create a MessageServicePresence:
-  void setStandAloneMessageThreshold    (edm::ELseverityLevel const& severity);
-  void squelchStandAloneMessageCategory (std::string const & category);
-  
-}  // namespace edm
+  void setStandAloneMessageThreshold(edm::ELseverityLevel const& severity);
+  void squelchStandAloneMessageCategory(std::string const& category);
 
+}  // namespace edm
 
 // change log 19 and change log 20
-// The preprocessor symbol controlling suppression of LogDebug is EDM_ML_DEBUG.  Thus by default (BEHAVIOR CHANGE) LogDebug is 
+// The preprocessor symbol controlling suppression of LogDebug is EDM_ML_DEBUG.  Thus by default (BEHAVIOR CHANGE) LogDebug is
 // If LogDebug is suppressed, all code past the LogDebug(...) is squelched.
 // See doc/suppression.txt.
 
-#ifndef EDM_ML_DEBUG 
+#ifndef EDM_ML_DEBUG
 #define LogDebug(id) true ? edm::Suppress_LogDebug_() : edm::Suppress_LogDebug_()
 #define LogTrace(id) true ? edm::Suppress_LogDebug_() : edm::Suppress_LogDebug_()
 #else
 // change log 21
-#define LogDebug(id) (edm::MessageDrop::debugAlwaysSuppressed || !edm::MessageDrop::instance()->debugEnabled) ? edm::LogDebug_() : edm::LogDebug_(id, __FILE__, __LINE__)
-#define LogTrace(id) (edm::MessageDrop::debugAlwaysSuppressed || !edm::MessageDrop::instance()->debugEnabled) ? edm::LogTrace_() : edm::LogTrace_(id)
+#define LogDebug(id)                                                                       \
+  (edm::MessageDrop::debugAlwaysSuppressed || !edm::MessageDrop::instance()->debugEnabled) \
+      ? edm::LogDebug_()                                                                   \
+      : edm::LogDebug_(id, __FILE__, __LINE__)
+#define LogTrace(id)                                                                                          \
+  (edm::MessageDrop::debugAlwaysSuppressed || !edm::MessageDrop::instance()->debugEnabled) ? edm::LogTrace_() \
+                                                                                           : edm::LogTrace_(id)
 #endif
 
 // change log 27
@@ -614,13 +688,15 @@ class Suppress_LogDebug_
 // declared only if EDM_ML_DEBUG is enabled. If it is disabled, rely
 // on the fact that LogDebug/LogTrace should compile to no-op.
 #ifdef EDM_ML_DEBUG
-#define IfLogDebug(cond, cat) if(cond) LogDebug(cat)
-#define IfLogTrace(cond, cat) if(cond) LogTrace(cat)
+#define IfLogDebug(cond, cat) \
+  if (cond)                   \
+  LogDebug(cat)
+#define IfLogTrace(cond, cat) \
+  if (cond)                   \
+  LogTrace(cat)
 #else
 #define IfLogDebug(cond, cat) LogDebug(cat)
 #define IfLogTrace(cond, cat) LogTrace(cat)
 #endif
 
-
 #endif  // MessageLogger_MessageLogger_h
-
diff --git a/FWCore/MessageLogger/interface/MessageLoggerQ.h b/FWCore/MessageLogger/interface/MessageLoggerQ.h
index 6bc041e0fd093..80d1cc1cb0ae9 100644
--- a/FWCore/MessageLogger/interface/MessageLoggerQ.h
+++ b/FWCore/MessageLogger/interface/MessageLoggerQ.h
@@ -10,86 +10,86 @@
 #include <map>
 #include <set>
 
-namespace edm
-{
-
-// --- forward declarations:
-class ErrorObj;
-class ParameterSet;
-class ELdestination;
-namespace service {
-class AbstractMLscribe;
-}
-
-
-class MessageLoggerQ
-{
-public:
-  // --- enumerate types of messages that can be enqueued:
-  enum OpCode      // abbrev's used hereinafter
-  { END_THREAD     // END
-  , LOG_A_MESSAGE  // LOG
-  , CONFIGURE      // CFG -- handshaked
-  , EXTERN_DEST    // EXT
-  , SUMMARIZE      // SUM
-  , JOBMODE        // MOD
-  , SHUT_UP        // SHT
-  , FLUSH_LOG_Q    // FLS -- handshaked
-  , GROUP_STATS    // GRP
-  , FJR_SUMMARY    // JRS -- handshaked
-  };  // OpCode
-
-  // ---  birth via a surrogate:
-  static  MessageLoggerQ *  instance();
-
-  // ---  post a message to the queue:
-  static  void  MLqEND();
-  static  void  MLqLOG( ErrorObj * p );
-  static  void  MLqCFG( ParameterSet * p );
-  static  void  MLqSUM();
-  static  void  MLqMOD( std::string * jm );
-  static  void  MLqSHT();
-  static  void  MLqFLS();
-  static  void  MLqGRP(std::string * cat_p);
-  static  void  MLqJRS(std::map<std::string, double> * sum_p);
-
-  // ---  bookkeeping for single-thread mode
-  static  void  setMLscribe_ptr
-     (std::shared_ptr<edm::service::AbstractMLscribe>  m);
-
-  // ---  helper for scribes
-  static bool handshaked ( const OpCode & op );
-
-  // --- special control of standAlone logging behavior
-  static  void standAloneThreshold(edm::ELseverityLevel const& severity);
-  static  void squelch(std::string const & category);
-  static  bool ignore ( edm::ELseverityLevel const & severity, 
-  			std::string const & category );
-			
-private:
-  // ---  traditional birth/death, but disallowed to users:
-  MessageLoggerQ();
-  ~MessageLoggerQ();
-
-  // ---  place an item onto the queue, or execute the command directly
-  static  void  simpleCommand( OpCode opcode, void * operand );
-  static  void  handshakedCommand( OpCode opcode, 
-  				   void * operand, 
-				   std::string const & commandMnemonic);
-
-  // --- no copying:
-  MessageLoggerQ( MessageLoggerQ const & ) = delete;
-  void  operator = ( MessageLoggerQ const & ) = delete;
-
-  // --- data:
-  CMS_THREAD_SAFE static  std::shared_ptr<edm::service::AbstractMLscribe> mlscribe_ptr;
-  CMS_THREAD_SAFE static  edm::ELseverityLevel threshold;
-  CMS_THREAD_SAFE static  std::set<std::string> squelchSet;
-  
-};  // MessageLoggerQ
-
+namespace edm {
+
+  // --- forward declarations:
+  class ErrorObj;
+  class ParameterSet;
+  class ELdestination;
+  namespace service {
+    class AbstractMLscribe;
+  }
+
+  class MessageLoggerQ {
+  public:
+    // --- enumerate types of messages that can be enqueued:
+    enum OpCode   // abbrev's used hereinafter
+    { END_THREAD  // END
+      ,
+      LOG_A_MESSAGE  // LOG
+      ,
+      CONFIGURE  // CFG -- handshaked
+      ,
+      EXTERN_DEST  // EXT
+      ,
+      SUMMARIZE  // SUM
+      ,
+      JOBMODE  // MOD
+      ,
+      SHUT_UP  // SHT
+      ,
+      FLUSH_LOG_Q  // FLS -- handshaked
+      ,
+      GROUP_STATS  // GRP
+      ,
+      FJR_SUMMARY  // JRS -- handshaked
+    };             // OpCode
+
+    // ---  birth via a surrogate:
+    static MessageLoggerQ* instance();
+
+    // ---  post a message to the queue:
+    static void MLqEND();
+    static void MLqLOG(ErrorObj* p);
+    static void MLqCFG(ParameterSet* p);
+    static void MLqSUM();
+    static void MLqMOD(std::string* jm);
+    static void MLqSHT();
+    static void MLqFLS();
+    static void MLqGRP(std::string* cat_p);
+    static void MLqJRS(std::map<std::string, double>* sum_p);
+
+    // ---  bookkeeping for single-thread mode
+    static void setMLscribe_ptr(std::shared_ptr<edm::service::AbstractMLscribe> m);
+
+    // ---  helper for scribes
+    static bool handshaked(const OpCode& op);
+
+    // --- special control of standAlone logging behavior
+    static void standAloneThreshold(edm::ELseverityLevel const& severity);
+    static void squelch(std::string const& category);
+    static bool ignore(edm::ELseverityLevel const& severity, std::string const& category);
+
+  private:
+    // ---  traditional birth/death, but disallowed to users:
+    MessageLoggerQ();
+    ~MessageLoggerQ();
+
+    // ---  place an item onto the queue, or execute the command directly
+    static void simpleCommand(OpCode opcode, void* operand);
+    static void handshakedCommand(OpCode opcode, void* operand, std::string const& commandMnemonic);
+
+    // --- no copying:
+    MessageLoggerQ(MessageLoggerQ const&) = delete;
+    void operator=(MessageLoggerQ const&) = delete;
+
+    // --- data:
+    CMS_THREAD_SAFE static std::shared_ptr<edm::service::AbstractMLscribe> mlscribe_ptr;
+    CMS_THREAD_SAFE static edm::ELseverityLevel threshold;
+    CMS_THREAD_SAFE static std::set<std::string> squelchSet;
+
+  };  // MessageLoggerQ
 
 }  // namespace edm
 
-
 #endif  // FWCore_MessageLogger_MessageLoggerQ_h
diff --git a/FWCore/MessageLogger/interface/MessageSender.h b/FWCore/MessageLogger/interface/MessageSender.h
index 097623ad63737..c5bde64d67a09 100644
--- a/FWCore/MessageLogger/interface/MessageSender.h
+++ b/FWCore/MessageLogger/interface/MessageSender.h
@@ -13,53 +13,43 @@
 //
 //  1  mf 8/25/08	error summary information for LoggedErrorsSummary()
 //
-//  2  mf 6/22/09	add severity to LoggedErrorsSummary by using 
+//  2  mf 6/22/09	add severity to LoggedErrorsSummary by using
 //			ErrorSummaryEntry as map key
-//			
+//
 //  3 wmtan 6/22/11     Hold the ErrorObj with a shared pointer with a custom deleter.
 //                      The custom deleter takes over the function of the message sending from the MessageSender destructor.
 //                      This allows MessageSender to be copyable, which fixes the clang compilation errors.
-         
 
-namespace edm
-{
+namespace edm {
 
-class MessageSender
-{
-  struct ErrorObjDeleter {
-    ErrorObjDeleter() {}
-    void operator()(ErrorObj * errorObjPtr);
-  };
+  class MessageSender {
+    struct ErrorObjDeleter {
+      ErrorObjDeleter() {}
+      void operator()(ErrorObj* errorObjPtr);
+    };
 
-public:
-  // ---  birth/death:
-  MessageSender() : errorobj_p() {} 
-  MessageSender( ELseverityLevel const & sev, 
-  		 ELstring const & id,
-		 bool verbatim = false, bool suppressed = false );
-  ~MessageSender();
+  public:
+    // ---  birth/death:
+    MessageSender() : errorobj_p() {}
+    MessageSender(ELseverityLevel const& sev, ELstring const& id, bool verbatim = false, bool suppressed = false);
+    ~MessageSender();
 
-  // ---  stream out the next part of a message:
-  template< class T >
-    MessageSender &
-    operator<< ( T const & t )
-  {
-    if (valid()) (*errorobj_p) << t;
-    return *this;
-  }
+    // ---  stream out the next part of a message:
+    template <class T>
+    MessageSender& operator<<(T const& t) {
+      if (valid())
+        (*errorobj_p) << t;
+      return *this;
+    }
 
-  bool valid() {
-    return errorobj_p != nullptr;
-  }
-  
-private:
-  // data:
-  std::shared_ptr<ErrorObj> errorobj_p;
+    bool valid() { return errorobj_p != nullptr; }
 
-};  // MessageSender
+  private:
+    // data:
+    std::shared_ptr<ErrorObj> errorobj_p;
 
+  };  // MessageSender
 
 }  // namespace edm
 
-
 #endif  // FWCore_MessageLogger_MessageSender_h
diff --git a/FWCore/MessageLogger/interface/SilentMLscribe.h b/FWCore/MessageLogger/interface/SilentMLscribe.h
index 40eba73f98a2d..2098cb06b8200 100644
--- a/FWCore/MessageLogger/interface/SilentMLscribe.h
+++ b/FWCore/MessageLogger/interface/SilentMLscribe.h
@@ -4,7 +4,7 @@
 //
 // Package:     MessageLogger
 // Class  :     SilentMLscribe
-// 
+//
 /**\class SilentMLscribe SilentMLscribe.h FWCore/MessageLogger/interface/SilentMLscribe.h
 
  Description: <one line class summary>
@@ -25,27 +25,24 @@
 
 // forward declarations
 namespace edm {
-   namespace service {
-      class SilentMLscribe : public AbstractMLscribe {
-         
-      public:
-         SilentMLscribe();
-         ~SilentMLscribe() override;
-         
-         
-         // ---------- member functions ---------------------------
-         
-         void  runCommand(MessageLoggerQ::OpCode  opcode, void * operand) override;
-         
-      private:
-         SilentMLscribe(const SilentMLscribe&) = delete; // stop default
-         
-         const SilentMLscribe& operator=(const SilentMLscribe&) = delete; // stop default
-         
-         // ---------- member data --------------------------------
-         
-      };      
-   }
-}
+  namespace service {
+    class SilentMLscribe : public AbstractMLscribe {
+    public:
+      SilentMLscribe();
+      ~SilentMLscribe() override;
+
+      // ---------- member functions ---------------------------
+
+      void runCommand(MessageLoggerQ::OpCode opcode, void* operand) override;
+
+    private:
+      SilentMLscribe(const SilentMLscribe&) = delete;  // stop default
+
+      const SilentMLscribe& operator=(const SilentMLscribe&) = delete;  // stop default
+
+      // ---------- member data --------------------------------
+    };
+  }  // namespace service
+}  // namespace edm
 
 #endif
diff --git a/FWCore/MessageLogger/src/AbstractMLscribe.cc b/FWCore/MessageLogger/src/AbstractMLscribe.cc
index 10b3421b25532..e1f0bd51fb3cc 100644
--- a/FWCore/MessageLogger/src/AbstractMLscribe.cc
+++ b/FWCore/MessageLogger/src/AbstractMLscribe.cc
@@ -1,11 +1,11 @@
 #include "FWCore/MessageLogger/interface/AbstractMLscribe.h"
 
-namespace edm  {
-namespace service { 
+namespace edm {
+  namespace service {
 
-AbstractMLscribe::AbstractMLscribe() {}
-AbstractMLscribe::~AbstractMLscribe() {}
-void AbstractMLscribe::runCommand(MessageLoggerQ::OpCode, void *) {}
+    AbstractMLscribe::AbstractMLscribe() {}
+    AbstractMLscribe::~AbstractMLscribe() {}
+    void AbstractMLscribe::runCommand(MessageLoggerQ::OpCode, void *) {}
 
-}   // end of namespace service
+  }  // end of namespace service
 }  // namespace edm
diff --git a/FWCore/MessageLogger/src/ELextendedID.cc b/FWCore/MessageLogger/src/ELextendedID.cc
index 30c009bb06fa7..7757488b9f840 100644
--- a/FWCore/MessageLogger/src/ELextendedID.cc
+++ b/FWCore/MessageLogger/src/ELextendedID.cc
@@ -9,53 +9,48 @@
 //
 // ----------------------------------------------------------------------
 
-
 #include "FWCore/MessageLogger/interface/ELextendedID.h"
 
+namespace edm {
 
-namespace edm
-{
-
-
-// ----------------------------------------------------------------------
-// Comparator:
-// ----------------------------------------------------------------------
-
-bool ELextendedID::operator<( const ELextendedID & xid ) const  {
-
-  return
-          ( severity   < xid.severity   )  ?  true
-        : ( severity   > xid.severity   )  ?  false
-
-        : ( id         < xid.id         )  ?  true
-        : ( id         > xid.id         )  ?  false
-
-        : ( module     < xid.module     )  ?  true
-        : ( module     > xid.module     )  ?  false
+  // ----------------------------------------------------------------------
+  // Comparator:
+  // ----------------------------------------------------------------------
 
-        : ( subroutine < xid.subroutine )  ?  true
-        : ( subroutine > xid.subroutine )  ?  false
+  bool ELextendedID::operator<(const ELextendedID& xid) const {
+    return (severity < xid.severity)
+               ? true
+               : (severity > xid.severity)
+                     ? false
 
-        :                                     false
-        ;
+                     : (id < xid.id)
+                           ? true
+                           : (id > xid.id) ? false
 
-}  // ELextendedID::operator<()
+                                           : (module < xid.module)
+                                                 ? true
+                                                 : (module > xid.module) ? false
 
+                                                                         : (subroutine < xid.subroutine)
+                                                                               ? true
+                                                                               : (subroutine > xid.subroutine) ? false
 
-// ----------------------------------------------------------------------
-// (Re)initializer:
-// ----------------------------------------------------------------------
+                                                                                                               : false;
 
-void ELextendedID::clear()  {
+  }  // ELextendedID::operator<()
 
-  id         = "";
-  severity   = ELunspecified;
-  module     = "";
-  subroutine = "";
+  // ----------------------------------------------------------------------
+  // (Re)initializer:
+  // ----------------------------------------------------------------------
 
-}  // clear()
+  void ELextendedID::clear() {
+    id = "";
+    severity = ELunspecified;
+    module = "";
+    subroutine = "";
 
+  }  // clear()
 
-// ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
 
-} // end of namespace edm  */
+}  // end of namespace edm  */
diff --git a/FWCore/MessageLogger/src/ELmap.cc b/FWCore/MessageLogger/src/ELmap.cc
index b2ac86459418b..2a54079581758 100644
--- a/FWCore/MessageLogger/src/ELmap.cc
+++ b/FWCore/MessageLogger/src/ELmap.cc
@@ -16,7 +16,6 @@
 //
 // ----------------------------------------------------------------------
 
-
 #include "FWCore/MessageLogger/interface/ELmap.h"
 
 // Possible traces
@@ -24,163 +23,136 @@
 //#define ELcountTRACE
 // #define ELmapDumpTRACE
 
+namespace edm {
 
-namespace edm
-{
-
-
-// ----------------------------------------------------------------------
-// LimitAndTimespan:
-// ----------------------------------------------------------------------
-
-LimitAndTimespan::LimitAndTimespan( int lim, int ts, int ivl )
-: limit   ( lim )
-, timespan( ts )
-, interval( ivl )
-{ }
-
-
-// ----------------------------------------------------------------------
-// CountAndLimit:
-// ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
+  // LimitAndTimespan:
+  // ----------------------------------------------------------------------
 
-CountAndLimit::CountAndLimit( int lim, int ts, int ivl )
-: n         ( 0 )
-, aggregateN( 0 )
-, lastTime  ( time(nullptr) )
-, limit     ( lim )
-, timespan  ( ts  )
-, interval  ( ivl )
-, skipped   ( ivl-1 )  // So that the FIRST of the prescaled messages emerges
-{ }
+  LimitAndTimespan::LimitAndTimespan(int lim, int ts, int ivl) : limit(lim), timespan(ts), interval(ivl) {}
 
+  // ----------------------------------------------------------------------
+  // CountAndLimit:
+  // ----------------------------------------------------------------------
 
-bool  CountAndLimit::add()  {
+  CountAndLimit::CountAndLimit(int lim, int ts, int ivl)
+      : n(0),
+        aggregateN(0),
+        lastTime(time(nullptr)),
+        limit(lim),
+        timespan(ts),
+        interval(ivl),
+        skipped(ivl - 1)  // So that the FIRST of the prescaled messages emerges
+  {}
 
-  time_t  now = time(nullptr);
+  bool CountAndLimit::add() {
+    time_t now = time(nullptr);
 
 #ifdef ELcountTRACE
-  std::cerr << "&&&--- CountAndLimit::add \n";
-  std::cerr << "&&&    Time now  is " << now << "\n";
-  std::cerr << "&&&    Last time is " << lastTime << "\n";
-  std::cerr << "&&&    timespan  is " << timespan << "\n";
-  std::cerr << "&&&    difftime  is " << difftime( now, lastTime ) << "\n"
-                                << std::flush;
+    std::cerr << "&&&--- CountAndLimit::add \n";
+    std::cerr << "&&&    Time now  is " << now << "\n";
+    std::cerr << "&&&    Last time is " << lastTime << "\n";
+    std::cerr << "&&&    timespan  is " << timespan << "\n";
+    std::cerr << "&&&    difftime  is " << difftime(now, lastTime) << "\n" << std::flush;
 #endif
 
-  // Has it been so long that we should restart counting toward the limit?
-  if ( (timespan >= 0)
-            &&
-        (difftime(now, lastTime) >= timespan) )  {
-     n = 0;
-     if ( interval > 0 ) {
-       skipped = interval - 1; // So this message will be reacted to
-     } else {
-       skipped = 0;
-     }
-  }
+    // Has it been so long that we should restart counting toward the limit?
+    if ((timespan >= 0) && (difftime(now, lastTime) >= timespan)) {
+      n = 0;
+      if (interval > 0) {
+        skipped = interval - 1;  // So this message will be reacted to
+      } else {
+        skipped = 0;
+      }
+    }
 
-  lastTime = now;
+    lastTime = now;
 
-  ++n;  
-  ++aggregateN;
-  ++skipped;  
+    ++n;
+    ++aggregateN;
+    ++skipped;
 
 #ifdef ELcountTRACE
-  std::cerr << "&&&       n is " << n << "-- limit is    " << limit    << "\n";
-  std::cerr << "&&& skipped is " << skipped 
-  	                              << "-- interval is " << interval << "\n";
+    std::cerr << "&&&       n is " << n << "-- limit is    " << limit << "\n";
+    std::cerr << "&&& skipped is " << skipped << "-- interval is " << interval << "\n";
 #endif
-  
-  if (skipped < interval) return false;
 
-  if ( limit == 0 ) return false;        // Zero limit - never react to this
-  if ( (limit < 0)  || ( n <= limit )) {
-    skipped = 0;
-    return true;
-  }
-  
-  // Now we are over the limit - have we exceeded limit by 2^N * limit?
-  long  diff = n - limit;
-  long  r = diff/limit;
-  if ( r*limit != diff ) { // Not a multiple of limit - don't react
-    return false;
-  }  
-  if ( r == 1 )   {	// Exactly twice limit - react
+    if (skipped < interval)
+      return false;
+
+    if (limit == 0)
+      return false;  // Zero limit - never react to this
+    if ((limit < 0) || (n <= limit)) {
+      skipped = 0;
+      return true;
+    }
+
+    // Now we are over the limit - have we exceeded limit by 2^N * limit?
+    long diff = n - limit;
+    long r = diff / limit;
+    if (r * limit != diff) {  // Not a multiple of limit - don't react
+      return false;
+    }
+    if (r == 1) {  // Exactly twice limit - react
+      skipped = 0;
+      return true;
+    }
+
+    while (r > 1) {
+      if ((r & 1) != 0)
+        return false;  // Not 2**n times limit - don't react
+      r >>= 1;
+    }
+    // If you never get an odd number till one, r is 2**n so react
+
     skipped = 0;
     return true;
-  }
 
-  while ( r > 1 )  {
-    if ( (r & 1) != 0 )  return false;  // Not 2**n times limit - don't react
-    r >>= 1;
-  }
-  // If you never get an odd number till one, r is 2**n so react
-  
-  skipped = 0;
-  return true;
-
-}  // add()
-
-
-// ----------------------------------------------------------------------
-// StatsCount:
-// ----------------------------------------------------------------------
+  }  // add()
 
-StatsCount::StatsCount()
-: n          ( 0 )
-, aggregateN ( 0 )
-, ignoredFlag( false )
-, context1   ( "" )
-, context2   ( "" )
-, contextLast( "" )
-{ }
+  // ----------------------------------------------------------------------
+  // StatsCount:
+  // ----------------------------------------------------------------------
 
+  StatsCount::StatsCount() : n(0), aggregateN(0), ignoredFlag(false), context1(""), context2(""), contextLast("") {}
 
-void  StatsCount::add( const ELstring & context, bool reactedTo )  {
+  void StatsCount::add(const ELstring& context, bool reactedTo) {
+    ++n;
+    ++aggregateN;
 
-  ++n;  ++aggregateN;
+    ((1 == n) ? context1 : (2 == n) ? context2 : contextLast) = ELstring(context, 0, 16);
 
-  ( (1 == n) ? context1
-  : (2 == n) ? context2
-  :            contextLast
-  )                        = ELstring( context, 0, 16 );
+    if (!reactedTo)
+      ignoredFlag = true;
 
-  if ( ! reactedTo )
-    ignoredFlag = true;
+  }  // add()
 
-}  // add()
-
-
-// ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
 
 #ifdef ELmapDumpTRACE
-// ----------------------------------------------------------------------
-// Global Dump methods (useful for debugging)
-// ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
+  // Global Dump methods (useful for debugging)
+  // ----------------------------------------------------------------------
 
 #include <sstream>
 #include <string.h>
 
-boost::shared_array<char> ELmapDump ( ELmap_limits m )  {
+  boost::shared_array<char> ELmapDump(ELmap_limits m) {
+    std::ostringstream s;
+    s << "**** ELmap_limits Dump **** \n";
 
-  std::ostringstream s;
-  s << "**** ELmap_limits Dump **** \n";
+    ELmap_limits::const_iterator i;
+    for (i = m.begin(); i != m.end(); ++i) {
+      LimitAndTimespan lt = (*i).second;
+      s << "     " << (*i).first << ":  " << lt.limit << ", " << lt.timespan << "\n";
+    }
+    s << "--------------------------------------------\n";
 
-  ELmap_limits::const_iterator i;
-  for ( i = m.begin();  i != m.end();  ++i )  {
-    LimitAndTimespan lt = (*i).second;
-    s << "     " << (*i).first << ":  " << lt.limit << ", " <<
-                lt.timespan << "\n";
-  }
-  s << "--------------------------------------------\n";
+    boost::shared_array<char> dump(new char[s.str().size() + 1]);
+    strcpy(dump.get(), s.str().c_str());
 
-  boost::shared_array<char> dump(new char[s.str().size()+1]);
-  strcpy( dump.get(), s.str().c_str() );
-
-  return dump;
-
-}
+    return dump;
+  }
 #endif
 
-} // end of namespace edm  */
+}  // end of namespace edm  */
diff --git a/FWCore/MessageLogger/src/ELseverityLevel.cc b/FWCore/MessageLogger/src/ELseverityLevel.cc
index 8efa346a002bd..dcc34d5d1af99 100644
--- a/FWCore/MessageLogger/src/ELseverityLevel.cc
+++ b/FWCore/MessageLogger/src/ELseverityLevel.cc
@@ -35,7 +35,7 @@
 // 13-Jun-2007 mf       Change (requested by CMS) the name Severe to System
 //			(since that his how MessageLogger uses that level)
 // 21-Apr-2009 mf	Change the symbol for ELsev_success (which is used
-//                      by CMS for LogDebug) from -! to -d.  
+//                      by CMS for LogDebug) from -! to -d.
 // ----------------------------------------------------------------------
 
 #include <ostream>
@@ -43,254 +43,288 @@
 #include "FWCore/MessageLogger/interface/ELseverityLevel.h"
 #include "FWCore/MessageLogger/interface/ELmap.h"
 
-
 // Possible Traces
 // #define ELsevConTRACE
 
-
-namespace edm
-{
-
-
-// ----------------------------------------------------------------------
-// Helper to construct the string->ELsev_ map on demand:
-// ----------------------------------------------------------------------
-  
-  typedef std::map< ELstring const, ELseverityLevel::ELsev_ > ELmap;
-  
-  static
-  ELmap const &  loadMap()  {
-    
-    static const ELmap  m = {
-      { ELzeroSeverity.getSymbol(), ELseverityLevel::ELsev_zeroSeverity }
-    , { ELzeroSeverity.getName()     , ELseverityLevel::ELsev_zeroSeverity }
-    , { ELzeroSeverity.getInputStr() , ELseverityLevel::ELsev_zeroSeverity }
-    , { ELzeroSeverity.getVarName()  , ELseverityLevel::ELsev_zeroSeverity }
-      ,
-      { ELdebug.getSymbol()   , ELseverityLevel::ELsev_success }
-    , { ELdebug.getName()     , ELseverityLevel::ELsev_success }
-    , { ELdebug.getInputStr() , ELseverityLevel::ELsev_success }
-    , { ELdebug.getVarName()  , ELseverityLevel::ELsev_success }
-      ,
-      { ELinfo.getSymbol()   , ELseverityLevel::ELsev_info }
-    , { ELinfo.getName()     , ELseverityLevel::ELsev_info }
-    , { ELinfo.getInputStr() , ELseverityLevel::ELsev_info }
-    , { ELinfo.getVarName()  , ELseverityLevel::ELsev_info }
-    ,
-      { ELwarning.getSymbol()   , ELseverityLevel::ELsev_warning }
-    , { ELwarning.getName()     , ELseverityLevel::ELsev_warning }
-    , { ELwarning.getInputStr() , ELseverityLevel::ELsev_warning }
-    , { ELwarning.getVarName()  , ELseverityLevel::ELsev_warning }
-    ,
-      { ELerror.getSymbol()   , ELseverityLevel::ELsev_error }
-    , { ELerror.getName()     , ELseverityLevel::ELsev_error }
-    , { ELerror.getInputStr() , ELseverityLevel::ELsev_error }
-    , { ELerror.getVarName()  , ELseverityLevel::ELsev_error }
-    ,
-      { ELunspecified.getSymbol()   , ELseverityLevel::ELsev_unspecified }
-    , { ELunspecified.getName()     , ELseverityLevel::ELsev_unspecified }
-    , { ELunspecified.getInputStr() , ELseverityLevel::ELsev_unspecified }
-    , { ELunspecified.getVarName()  , ELseverityLevel::ELsev_unspecified }
-    ,
-      { ELsevere.getSymbol()   , ELseverityLevel::ELsev_severe }
-    , { ELsevere.getName()     , ELseverityLevel::ELsev_severe }
-    , { ELsevere.getInputStr() , ELseverityLevel::ELsev_severe }
-    , { ELsevere.getVarName()  , ELseverityLevel::ELsev_severe }
-    ,
-      { ELhighestSeverity.getSymbol()   , ELseverityLevel::ELsev_highestSeverity }
-    , { ELhighestSeverity.getName()     , ELseverityLevel::ELsev_highestSeverity }
-    , { ELhighestSeverity.getInputStr() , ELseverityLevel::ELsev_highestSeverity }
-    , { ELhighestSeverity.getVarName()  , ELseverityLevel::ELsev_highestSeverity }
-    } ;
+namespace edm {
+
+  // ----------------------------------------------------------------------
+  // Helper to construct the string->ELsev_ map on demand:
+  // ----------------------------------------------------------------------
+
+  typedef std::map<ELstring const, ELseverityLevel::ELsev_> ELmap;
+
+  static ELmap const& loadMap() {
+    static const ELmap m = {{ELzeroSeverity.getSymbol(), ELseverityLevel::ELsev_zeroSeverity},
+                            {ELzeroSeverity.getName(), ELseverityLevel::ELsev_zeroSeverity},
+                            {ELzeroSeverity.getInputStr(), ELseverityLevel::ELsev_zeroSeverity},
+                            {ELzeroSeverity.getVarName(), ELseverityLevel::ELsev_zeroSeverity},
+                            {ELdebug.getSymbol(), ELseverityLevel::ELsev_success},
+                            {ELdebug.getName(), ELseverityLevel::ELsev_success},
+                            {ELdebug.getInputStr(), ELseverityLevel::ELsev_success},
+                            {ELdebug.getVarName(), ELseverityLevel::ELsev_success},
+                            {ELinfo.getSymbol(), ELseverityLevel::ELsev_info},
+                            {ELinfo.getName(), ELseverityLevel::ELsev_info},
+                            {ELinfo.getInputStr(), ELseverityLevel::ELsev_info},
+                            {ELinfo.getVarName(), ELseverityLevel::ELsev_info},
+                            {ELwarning.getSymbol(), ELseverityLevel::ELsev_warning},
+                            {ELwarning.getName(), ELseverityLevel::ELsev_warning},
+                            {ELwarning.getInputStr(), ELseverityLevel::ELsev_warning},
+                            {ELwarning.getVarName(), ELseverityLevel::ELsev_warning},
+                            {ELerror.getSymbol(), ELseverityLevel::ELsev_error},
+                            {ELerror.getName(), ELseverityLevel::ELsev_error},
+                            {ELerror.getInputStr(), ELseverityLevel::ELsev_error},
+                            {ELerror.getVarName(), ELseverityLevel::ELsev_error},
+                            {ELunspecified.getSymbol(), ELseverityLevel::ELsev_unspecified},
+                            {ELunspecified.getName(), ELseverityLevel::ELsev_unspecified},
+                            {ELunspecified.getInputStr(), ELseverityLevel::ELsev_unspecified},
+                            {ELunspecified.getVarName(), ELseverityLevel::ELsev_unspecified},
+                            {ELsevere.getSymbol(), ELseverityLevel::ELsev_severe},
+                            {ELsevere.getName(), ELseverityLevel::ELsev_severe},
+                            {ELsevere.getInputStr(), ELseverityLevel::ELsev_severe},
+                            {ELsevere.getVarName(), ELseverityLevel::ELsev_severe},
+                            {ELhighestSeverity.getSymbol(), ELseverityLevel::ELsev_highestSeverity},
+                            {ELhighestSeverity.getName(), ELseverityLevel::ELsev_highestSeverity},
+                            {ELhighestSeverity.getInputStr(), ELseverityLevel::ELsev_highestSeverity},
+                            {ELhighestSeverity.getVarName(), ELseverityLevel::ELsev_highestSeverity}};
 
     return m;
-    
   }
 
-// ----------------------------------------------------------------------
-// Birth/death:
-// ----------------------------------------------------------------------
-
-ELseverityLevel::ELseverityLevel( enum ELsev_ lev ) : myLevel( lev )  {
+  // ----------------------------------------------------------------------
+  // Birth/death:
+  // ----------------------------------------------------------------------
 
-  #ifdef ELsevConTRACE
-    std::cerr << "--- ELseverityLevel " << lev
-              << " (" << getName() << ")\n"
-              << std::flush;
-  #endif
+  ELseverityLevel::ELseverityLevel(enum ELsev_ lev) : myLevel(lev) {
+#ifdef ELsevConTRACE
+    std::cerr << "--- ELseverityLevel " << lev << " (" << getName() << ")\n" << std::flush;
+#endif
+  }
 
-}
+  ELseverityLevel::ELseverityLevel(ELstring const& s) {
+    static ELmap const& m = loadMap();
 
+    ELmap::const_iterator i = m.find(s);
+    myLevel = (i == m.end()) ? ELsev_unspecified : i->second;
+  }
 
-ELseverityLevel::ELseverityLevel( ELstring const & s )  {
-  
-  static ELmap const & m = loadMap();
-  
-  ELmap::const_iterator  i = m.find( s );
-  myLevel = ( i == m.end() ) ? ELsev_unspecified : i->second;
-  
-}
+  ELseverityLevel::~ELseverityLevel() { ; }
+
+  // ----------------------------------------------------------------------
+  // Comparator:
+  // ----------------------------------------------------------------------
+
+  int ELseverityLevel::cmp(ELseverityLevel const& e) const { return myLevel - e.myLevel; }
+
+  // ----------------------------------------------------------------------
+  // Accessors:
+  // ----------------------------------------------------------------------
+
+  int ELseverityLevel::getLevel() const { return myLevel; }
+
+  const ELstring ELseverityLevel::getSymbol() const {
+    ELstring result;
+
+    switch (myLevel) {
+      default:
+        result = "0";
+        break;
+      case ELsev_zeroSeverity:
+        result = "--";
+        break;
+      case ELsev_success:
+        result = "-d";
+        break;  // 4/21/09 mf
+      case ELsev_info:
+        result = "-i";
+        break;
+      case ELsev_warning:
+        result = "-w";
+        break;
+      case ELsev_error:
+        result = "-e";
+        break;
+      case ELsev_unspecified:
+        result = "??";
+        break;
+      case ELsev_severe:
+        result = "-s";
+        break;
+      case ELsev_highestSeverity:
+        result = "!!";
+        break;
+    };  // switch
+
+    return result;
+  }
 
-ELseverityLevel::~ELseverityLevel()  { ; }
+  const ELstring ELseverityLevel::getName() const {
+    ELstring result;
+
+    switch (myLevel) {
+      default:
+        result = "?no value?";
+        break;
+      case ELsev_zeroSeverity:
+        result = "--";
+        break;
+      case ELsev_success:
+        result = "Debug";
+        break;  // 4/21/09 mf
+      case ELsev_info:
+        result = "Info";
+        break;
+      case ELsev_warning:
+        result = "Warning";
+        break;
+      case ELsev_error:
+        result = "Error";
+        break;
+      case ELsev_unspecified:
+        result = "??";
+        break;
+      case ELsev_severe:
+        result = "System";
+        break;  // 6/13/07 mf
+      case ELsev_highestSeverity:
+        result = "!!";
+        break;
+    };  // switch
+
+    return result;
+  }
 
+  const ELstring ELseverityLevel::getInputStr() const {
+    ELstring result;
+
+    switch (myLevel) {
+      default:
+        result = "?no value?";
+        break;
+      case ELsev_zeroSeverity:
+        result = "ZERO";
+        break;
+      case ELsev_success:
+        result = "DEBUG";
+        break;
+      case ELsev_info:
+        result = "INFO";
+        break;
+      case ELsev_warning:
+        result = "WARNING";
+        break;
+      case ELsev_error:
+        result = "ERROR";
+        break;
+      case ELsev_unspecified:
+        result = "UNSPECIFIED";
+        break;
+      case ELsev_severe:
+        result = "SYSTEM";
+        break;  // 6/13/07 mf
+      case ELsev_highestSeverity:
+        result = "HIGHEST";
+        break;
+    };  // switch
+
+    return result;
+  }
 
-// ----------------------------------------------------------------------
-// Comparator:
-// ----------------------------------------------------------------------
+  const ELstring ELseverityLevel::getVarName() const {
+    ELstring result;
+
+    switch (myLevel) {
+      default:
+        result = "?no value?       ";
+        break;
+      case ELsev_zeroSeverity:
+        result = "ELzeroSeverity   ";
+        break;
+      case ELsev_success:
+        result = "ELdebug          ";
+        break;  // 4/21/09
+      case ELsev_info:
+        result = "ELinfo           ";
+        break;
+      case ELsev_warning:
+        result = "ELwarning        ";
+        break;
+      case ELsev_error:
+        result = "ELerror          ";
+        break;
+      case ELsev_unspecified:
+        result = "ELunspecified    ";
+        break;
+      case ELsev_severe:
+        result = "ELsystem         ";
+        break;  // 6/13/07
+      case ELsev_highestSeverity:
+        result = "ELhighestSeverity";
+        break;
+    };  // switch
+
+    return result;
+  }
 
-int  ELseverityLevel::cmp( ELseverityLevel const & e ) const  {
-  return myLevel - e.myLevel;
-}
+  // ----------------------------------------------------------------------
+  // Emitter:
+  // ----------------------------------------------------------------------
 
+  std::ostream& operator<<(std::ostream& os, const ELseverityLevel& sev) { return os << " -" << sev.getName() << "- "; }
 
-// ----------------------------------------------------------------------
-// Accessors:
-// ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
+  // Declare the globally available severity objects,
+  // one generator function and one proxy per non-default ELsev_:
+  // ----------------------------------------------------------------------
 
-int  ELseverityLevel::getLevel()  const  {
-  return  myLevel;
-}
-
-
-const ELstring  ELseverityLevel::getSymbol() const  {
-  ELstring  result;
-
-  switch ( myLevel )  {
-    default                   :  result =  "0" ; break;
-    case ELsev_zeroSeverity   :  result =  "--"; break;
-    case ELsev_success        :  result =  "-d"; break;		// 4/21/09 mf
-    case ELsev_info           :  result =  "-i"; break;
-    case ELsev_warning        :  result =  "-w"; break;
-    case ELsev_error          :  result =  "-e"; break;
-    case ELsev_unspecified    :  result =  "??"; break;
-    case ELsev_severe         :  result =  "-s"; break;
-    case ELsev_highestSeverity:  result =  "!!"; break;
-  };  // switch
-
-  return result;
-}
-
-
-const ELstring  ELseverityLevel::getName() const  {
-  ELstring  result;
-
-  switch ( myLevel )  {
-    default                   :  result =  "?no value?"; break;
-    case ELsev_zeroSeverity   :  result =  "--"        ; break;
-    case ELsev_success        :  result =  "Debug"     ; break; // 4/21/09 mf
-    case ELsev_info           :  result =  "Info"      ; break;
-    case ELsev_warning        :  result =  "Warning"   ; break;
-    case ELsev_error          :  result =  "Error"     ; break;
-    case ELsev_unspecified    :  result =  "??"        ; break;
-    case ELsev_severe         :  result =  "System"    ; break; // 6/13/07 mf
-    case ELsev_highestSeverity:  result =  "!!"        ; break;
-  };  // switch
-
-  return result;
-}
-
-
-const ELstring  ELseverityLevel::getInputStr() const  {
-  ELstring  result;
-
-  switch ( myLevel )  {
-    default                   : result =  "?no value?" ; break;
-    case ELsev_zeroSeverity   : result =  "ZERO"       ; break;
-    case ELsev_success        : result =  "DEBUG"      ; break;
-    case ELsev_info           : result =  "INFO"       ; break;
-    case ELsev_warning        : result =  "WARNING"    ; break;
-    case ELsev_error          : result =  "ERROR"      ; break;
-    case ELsev_unspecified    : result =  "UNSPECIFIED"; break;
-    case ELsev_severe         : result =  "SYSTEM"     ; break;  // 6/13/07 mf
-    case ELsev_highestSeverity: result =  "HIGHEST"    ; break;
-  };  // switch
-
-  return result;
-}
-
-
-const ELstring  ELseverityLevel::getVarName() const  {
-  ELstring  result;
-
-  switch ( myLevel )  {
-    default                   : result =  "?no value?       "; break;
-    case ELsev_zeroSeverity   : result =  "ELzeroSeverity   "; break;
-    case ELsev_success        : result =  "ELdebug          "; break;// 4/21/09
-    case ELsev_info           : result =  "ELinfo           "; break;
-    case ELsev_warning        : result =  "ELwarning        "; break;
-    case ELsev_error          : result =  "ELerror          "; break;
-    case ELsev_unspecified    : result =  "ELunspecified    "; break;
-    case ELsev_severe         : result =  "ELsystem         "; break;// 6/13/07
-    case ELsev_highestSeverity: result =  "ELhighestSeverity"; break;
-  };  // switch
-
-  return result;
-}
+  ELseverityLevel const ELzeroSeverityGen() {
+    static ELseverityLevel const e(ELseverityLevel::ELsev_zeroSeverity);
+    return e;
+  }
+  ELslProxy<ELzeroSeverityGen> const ELzeroSeverity;
 
+  ELseverityLevel const ELdebugGen() {
+    static ELseverityLevel const e(ELseverityLevel::ELsev_success);
+    return e;
+  }
+  ELslProxy<ELdebugGen> const ELdebug;
 
-// ----------------------------------------------------------------------
-// Emitter:
-// ----------------------------------------------------------------------
+  ELseverityLevel const ELinfoGen() {
+    static ELseverityLevel const e(ELseverityLevel::ELsev_info);
+    return e;
+  }
+  ELslProxy<ELinfoGen> const ELinfo;
 
-std::ostream & operator<<( std::ostream & os, const ELseverityLevel & sev )  {
-  return os << " -" << sev.getName() << "- ";
-}
+  ELseverityLevel const ELwarningGen() {
+    static ELseverityLevel const e(ELseverityLevel::ELsev_warning);
+    return e;
+  }
+  ELslProxy<ELwarningGen> const ELwarning;
 
+  ELseverityLevel const ELerrorGen() {
+    static ELseverityLevel const e(ELseverityLevel::ELsev_error);
+    return e;
+  }
+  ELslProxy<ELerrorGen> const ELerror;
 
-// ----------------------------------------------------------------------
-// Declare the globally available severity objects,
-// one generator function and one proxy per non-default ELsev_:
-// ----------------------------------------------------------------------
+  ELseverityLevel const ELunspecifiedGen() {
+    static ELseverityLevel const e(ELseverityLevel::ELsev_unspecified);
+    return e;
+  }
+  ELslProxy<ELunspecifiedGen> const ELunspecified;
 
-ELseverityLevel const  ELzeroSeverityGen()  {
-  static ELseverityLevel const  e( ELseverityLevel::ELsev_zeroSeverity );
-  return e;
-}
-ELslProxy< ELzeroSeverityGen    > const  ELzeroSeverity;
-
-ELseverityLevel const  ELdebugGen()  {
-  static ELseverityLevel const  e( ELseverityLevel::ELsev_success );
-  return e;
-}
-ELslProxy< ELdebugGen         > const  ELdebug;
-
-ELseverityLevel const  ELinfoGen()  {
-  static ELseverityLevel const  e( ELseverityLevel::ELsev_info );
-  return e;
-}
-ELslProxy< ELinfoGen            > const  ELinfo;
-
-ELseverityLevel const  ELwarningGen()  {
-  static ELseverityLevel const  e( ELseverityLevel::ELsev_warning );
-  return e;
-}
-ELslProxy< ELwarningGen         > const  ELwarning;
-
-ELseverityLevel const  ELerrorGen()  {
-  static ELseverityLevel const  e( ELseverityLevel::ELsev_error );
-  return e;
-}
-ELslProxy< ELerrorGen           > const  ELerror;
-
-ELseverityLevel const  ELunspecifiedGen()  {
-  static ELseverityLevel const  e( ELseverityLevel::ELsev_unspecified );
-  return e;
-}
-ELslProxy< ELunspecifiedGen     > const  ELunspecified;
-
-ELseverityLevel const  ELsevereGen()  {
-  static ELseverityLevel const  e( ELseverityLevel::ELsev_severe );
-  return e;
-}
-ELslProxy< ELsevereGen          > const  ELsevere;
-
-ELseverityLevel const  ELhighestSeverityGen()  {
-  static ELseverityLevel const  e( ELseverityLevel::ELsev_highestSeverity );
-  return e;
-}
-ELslProxy< ELhighestSeverityGen > const  ELhighestSeverity;
+  ELseverityLevel const ELsevereGen() {
+    static ELseverityLevel const e(ELseverityLevel::ELsev_severe);
+    return e;
+  }
+  ELslProxy<ELsevereGen> const ELsevere;
 
-// ----------------------------------------------------------------------
+  ELseverityLevel const ELhighestSeverityGen() {
+    static ELseverityLevel const e(ELseverityLevel::ELsev_highestSeverity);
+    return e;
+  }
+  ELslProxy<ELhighestSeverityGen> const ELhighestSeverity;
 
+  // ----------------------------------------------------------------------
 
-} // end of namespace edm  */
+}  // end of namespace edm  */
diff --git a/FWCore/MessageLogger/src/ELstring.cc b/FWCore/MessageLogger/src/ELstring.cc
index 3016136ea1912..9e365b86a80e6 100644
--- a/FWCore/MessageLogger/src/ELstring.cc
+++ b/FWCore/MessageLogger/src/ELstring.cc
@@ -12,38 +12,30 @@
 //
 // ----------------------------------------------------------------------
 
-
 #include "FWCore/MessageLogger/interface/ELstring.h"
 #include <cctype>
 #include <cstring>
 
-namespace edm
-{
-
-
-bool  eq_nocase( const ELstring & s1, const char s2[] )  {
-  using std::toupper;
-
-  if (s1.length() != strlen(s2) ) return false;
+namespace edm {
 
-  ELstring::const_iterator  p1;
-  const char             *  p2;
+  bool eq_nocase(const ELstring& s1, const char s2[]) {
+    using std::toupper;
 
-  for ( p1 = s1.begin(), p2 = s2;  *p2 != '\0';  ++p1, ++p2 )  {
-    if ( toupper(*p1) != toupper(*p2) )  {
+    if (s1.length() != strlen(s2))
       return false;
-    }
-  }
-  return true;
-
-}  // eq_nocase()
 
+    ELstring::const_iterator p1;
+    const char* p2;
 
-bool  eq( const ELstring & s1, const ELstring s2 )  {
-
-  return  s1 == s2;
+    for (p1 = s1.begin(), p2 = s2; *p2 != '\0'; ++p1, ++p2) {
+      if (toupper(*p1) != toupper(*p2)) {
+        return false;
+      }
+    }
+    return true;
 
-}  // eq()
+  }  // eq_nocase()
 
+  bool eq(const ELstring& s1, const ELstring s2) { return s1 == s2; }  // eq()
 
-} // end of namespace edm  */
+}  // end of namespace edm  */
diff --git a/FWCore/MessageLogger/src/ErrorObj.cc b/FWCore/MessageLogger/src/ErrorObj.cc
index d58228c7a891a..372d3ca9e10b6 100644
--- a/FWCore/MessageLogger/src/ErrorObj.cc
+++ b/FWCore/MessageLogger/src/ErrorObj.cc
@@ -24,8 +24,8 @@
 //			by the MessageLogger stack)
 //
 // 4/28/06  mf		maxIDlength changed from 20 to 200
-//			If a category name exceeds that, then the 
-//			limit not taking effect bug will occur again... 
+//			If a category name exceeds that, then the
+//			limit not taking effect bug will occur again...
 //
 // 6/6/06  mf		verbatim
 //
@@ -47,247 +47,205 @@
 #ifndef IOSTREAM_INCLUDED
 #endif
 
-
 // ----------------------------------------------------------------------
 
-
 // Possible Traces
 // #define ErrorObjCONSTRUCTOR_TRACE
 // #define ErrorObj_EMIT_TRACE
 // #define ErrorObj_SUB_TRACE
 
-
 // ----------------------------------------------------------------------
 
+namespace edm {
 
-namespace edm
-{
-
-
-// ----------------------------------------------------------------------
-// Class static and class-wide parameter:
-// ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
+  // Class static and class-wide parameter:
+  // ----------------------------------------------------------------------
 
   // ---  class-wide serial number stamper:
   //
-CMS_THREAD_SAFE static std::atomic<int>  ourSerial(  0 );
-const unsigned int  maxIDlength( 200 );		// changed 4/28/06 from 20
+  CMS_THREAD_SAFE static std::atomic<int> ourSerial(0);
+  const unsigned int maxIDlength(200);  // changed 4/28/06 from 20
 
+  // ----------------------------------------------------------------------
+  // Birth/death:
+  // ----------------------------------------------------------------------
 
-// ----------------------------------------------------------------------
-// Birth/death:
-// ----------------------------------------------------------------------
-
-ErrorObj::ErrorObj( const ELseverityLevel & sev, 
-		    const ELstring & id,
-		    bool verbat )  : verbatim(verbat) {
-
-  #ifdef ErrorObjCONSTRUCTOR_TRACE
+  ErrorObj::ErrorObj(const ELseverityLevel& sev, const ELstring& id, bool verbat) : verbatim(verbat) {
+#ifdef ErrorObjCONSTRUCTOR_TRACE
     std::cerr << "Constructor for ErrorObj\n";
-  #endif
-
-  clear();
-  set( sev, id );
-
-}  // ErrorObj()
-
-
-ErrorObj::ErrorObj( const ErrorObj & orig )  :
-          mySerial        ( orig.mySerial )
-        , myXid           ( orig.myXid )
-        , myIdOverflow    ( orig.myIdOverflow )
-        , myTimestamp     ( orig.myTimestamp )
-        , myItems         ( orig.myItems )
-        , myReactedTo     ( orig.myReactedTo )
- 	, myOs            ( )
-	, emptyString     ( )
-	, verbatim	  ( orig.verbatim )
-{
+#endif
 
-  #ifdef ErrorObjCONSTRUCTOR_TRACE
+    clear();
+    set(sev, id);
+
+  }  // ErrorObj()
+
+  ErrorObj::ErrorObj(const ErrorObj& orig)
+      : mySerial(orig.mySerial),
+        myXid(orig.myXid),
+        myIdOverflow(orig.myIdOverflow),
+        myTimestamp(orig.myTimestamp),
+        myItems(orig.myItems),
+        myReactedTo(orig.myReactedTo),
+        myOs(),
+        emptyString(),
+        verbatim(orig.verbatim) {
+#ifdef ErrorObjCONSTRUCTOR_TRACE
     std::cerr << "Copy Constructor for ErrorObj\n";
-  #endif
-
-}  // ErrorObj(ErrorObj)
-
+#endif
 
-ErrorObj::~ErrorObj()  {
+  }  // ErrorObj(ErrorObj)
 
-  #ifdef ErrorObjCONSTRUCTOR_TRACE
+  ErrorObj::~ErrorObj() {
+#ifdef ErrorObjCONSTRUCTOR_TRACE
     std::cerr << "Destructor for ErrorObj\n";
-  #endif
-
-}  // ~ErrorObj()
-
-ErrorObj& ErrorObj::operator=( const ErrorObj & other ) {
-  ErrorObj temp(other);
-  this->swap(temp);
-  return *this;
-}
-
-void ErrorObj::swap( ErrorObj& other ) {
-  std::swap(mySerial, other.mySerial);
-  std::swap(myXid, other.myXid);
-  myIdOverflow.swap(other.myIdOverflow);
-  std::swap(myTimestamp, other.myTimestamp);
-  myItems.swap(other.myItems);
-  std::swap(myReactedTo, other.myReactedTo);
-  myContext.swap(other.myContext);
-  std::string temp(other.myOs.str());
-  other.myOs.str(myOs.str());
-  myOs.str(temp);
-  emptyString.swap(other.emptyString);
-  std::swap(verbatim, other.verbatim);
-}
-
-// ----------------------------------------------------------------------
-// Accessors:
-// ----------------------------------------------------------------------
-
-int                   ErrorObj::serial()     const  { return mySerial; }
-const ELextendedID &  ErrorObj::xid()        const  { return myXid; }
-const ELstring &      ErrorObj::idOverflow() const  { return myIdOverflow; }
-time_t                ErrorObj::timestamp()  const  { return myTimestamp; }
-const ELlist_string & ErrorObj::items()      const  { return myItems; }
-bool                  ErrorObj::reactedTo()  const  { return myReactedTo; }
-bool                  ErrorObj::is_verbatim()const  { return verbatim; }
+#endif
 
-ELstring ErrorObj::context() const {
-  return myContext;
-}
+  }  // ~ErrorObj()
 
-ELstring ErrorObj::fullText() const  {
+  ErrorObj& ErrorObj::operator=(const ErrorObj& other) {
+    ErrorObj temp(other);
+    this->swap(temp);
+    return *this;
+  }
 
-  ELstring result;
-  for ( ELlist_string::const_iterator it = myItems.begin();
-        it != myItems.end();
-        ++it )
-    result +=  *it;
-  return result;
+  void ErrorObj::swap(ErrorObj& other) {
+    std::swap(mySerial, other.mySerial);
+    std::swap(myXid, other.myXid);
+    myIdOverflow.swap(other.myIdOverflow);
+    std::swap(myTimestamp, other.myTimestamp);
+    myItems.swap(other.myItems);
+    std::swap(myReactedTo, other.myReactedTo);
+    myContext.swap(other.myContext);
+    std::string temp(other.myOs.str());
+    other.myOs.str(myOs.str());
+    myOs.str(temp);
+    emptyString.swap(other.emptyString);
+    std::swap(verbatim, other.verbatim);
+  }
 
-}  // fullText()
+  // ----------------------------------------------------------------------
+  // Accessors:
+  // ----------------------------------------------------------------------
 
+  int ErrorObj::serial() const { return mySerial; }
+  const ELextendedID& ErrorObj::xid() const { return myXid; }
+  const ELstring& ErrorObj::idOverflow() const { return myIdOverflow; }
+  time_t ErrorObj::timestamp() const { return myTimestamp; }
+  const ELlist_string& ErrorObj::items() const { return myItems; }
+  bool ErrorObj::reactedTo() const { return myReactedTo; }
+  bool ErrorObj::is_verbatim() const { return verbatim; }
 
-// ----------------------------------------------------------------------
-// Mutators:
-// ----------------------------------------------------------------------
+  ELstring ErrorObj::context() const { return myContext; }
 
-void ErrorObj::setSeverity( const ELseverityLevel & sev )  {
-  myXid.severity = (sev <= ELzeroSeverity   ) ? (ELseverityLevel)ELdebug
-                 : (sev >= ELhighestSeverity) ? (ELseverityLevel)ELsevere
-                 :                              sev
-                 ;
-}
+  ELstring ErrorObj::fullText() const {
+    ELstring result;
+    for (ELlist_string::const_iterator it = myItems.begin(); it != myItems.end(); ++it)
+      result += *it;
+    return result;
 
+  }  // fullText()
 
-void ErrorObj::setID( const ELstring & id )  {
-  myXid.id = ELstring( id, 0, maxIDlength );
-  if ( id.length() > maxIDlength )
-    myIdOverflow = ELstring( id, maxIDlength, id.length()-maxIDlength );
-}
+  // ----------------------------------------------------------------------
+  // Mutators:
+  // ----------------------------------------------------------------------
 
+  void ErrorObj::setSeverity(const ELseverityLevel& sev) {
+    myXid.severity = (sev <= ELzeroSeverity) ? (ELseverityLevel)ELdebug
+                                             : (sev >= ELhighestSeverity) ? (ELseverityLevel)ELsevere : sev;
+  }
 
-void ErrorObj::setModule( const ELstring & module )  { myXid.module = module; }
+  void ErrorObj::setID(const ELstring& id) {
+    myXid.id = ELstring(id, 0, maxIDlength);
+    if (id.length() > maxIDlength)
+      myIdOverflow = ELstring(id, maxIDlength, id.length() - maxIDlength);
+  }
 
-void ErrorObj::setContext( const ELstring & c )  { myContext = c; }
+  void ErrorObj::setModule(const ELstring& module) { myXid.module = module; }
 
+  void ErrorObj::setContext(const ELstring& c) { myContext = c; }
 
-void ErrorObj::setSubroutine( const ELstring & subroutine )  {
-  #ifdef ErrorObj_SUB_TRACE
+  void ErrorObj::setSubroutine(const ELstring& subroutine) {
+#ifdef ErrorObj_SUB_TRACE
     std::cerr << "=:=:=: ErrorObj::setSubroutine(" << subroutine << ")\n";
-  #endif
-  myXid.subroutine = (subroutine[0] == ' ')
-                   ? subroutine.substr(1)
-                   : subroutine;
-}
-
-
-void ErrorObj::setReactedTo( bool r )  {
-  myReactedTo = r;
-}
+#endif
+    myXid.subroutine = (subroutine[0] == ' ') ? subroutine.substr(1) : subroutine;
+  }
 
+  void ErrorObj::setReactedTo(bool r) { myReactedTo = r; }
 
 #ifdef ErrorObj_SUB_TRACE
   static int subN = 0;
 #endif
 
-
-ErrorObj & ErrorObj::emitToken( const ELstring & s )  {
-
-  #ifdef ErrorObj_EMIT_TRACE
+  ErrorObj& ErrorObj::emitToken(const ELstring& s) {
+#ifdef ErrorObj_EMIT_TRACE
     std::cerr << "=:=:=: ErrorObj::emitToken( " << s << " )\n";
-  #endif
+#endif
 
-  #ifdef ErrorObj_SUB_TRACE
-    if ( subN > 0 )  {
+#ifdef ErrorObj_SUB_TRACE
+    if (subN > 0) {
       std::cerr << "=:=:=: subN ErrorObj::emitToken( " << s << " )\n";
       subN--;
     }
-  #endif
-
-  if ( eq_nocase(s.substr(0,5), "@SUB=" ) )  {
-    #ifdef ErrorObj_SUB_TRACE
-      std::cerr << "=:=:=: ErrorObj::@SUB s.substr(5) is: " << s.substr(5)
-                << '\n';
-    #endif
-    setSubroutine(s.substr(5));
-  }
-  else  {
-    myItems.push_back( s );
-  }
-
-  return * this;
-
-}  // emitToken()
-
+#endif
 
-void ErrorObj::set( const ELseverityLevel & sev, const ELstring & id )  {
+    if (eq_nocase(s.substr(0, 5), "@SUB=")) {
+#ifdef ErrorObj_SUB_TRACE
+      std::cerr << "=:=:=: ErrorObj::@SUB s.substr(5) is: " << s.substr(5) << '\n';
+#endif
+      setSubroutine(s.substr(5));
+    } else {
+      myItems.push_back(s);
+    }
 
-  clear();
+    return *this;
 
-  myTimestamp = time( nullptr );
-  mySerial = ++ ourSerial;
+  }  // emitToken()
 
-  setID( id );
-  setSeverity( sev );
+  void ErrorObj::set(const ELseverityLevel& sev, const ELstring& id) {
+    clear();
 
-}  // set()
+    myTimestamp = time(nullptr);
+    mySerial = ++ourSerial;
 
+    setID(id);
+    setSeverity(sev);
 
-void ErrorObj::clear()  {
+  }  // set()
 
-  mySerial     = 0;
-  myXid.clear();
-  myIdOverflow = "";
-  myTimestamp  = 0;
-  myItems.erase( myItems.begin(), myItems.end() );  // myItems.clear();
-  myReactedTo  = false;
+  void ErrorObj::clear() {
+    mySerial = 0;
+    myXid.clear();
+    myIdOverflow = "";
+    myTimestamp = 0;
+    myItems.erase(myItems.begin(), myItems.end());  // myItems.clear();
+    myReactedTo = false;
 
-}  // clear()
+  }  // clear()
 
-ErrorObj & 
-ErrorObj::opltlt ( const char s[] ) {
-  // Exactly equivalent to the general template. 
-  // If this is not provided explicitly, then the template will
-  // be instantiated once for each length of string ever used.
-  myOs.str(emptyString); 
-  myOs << s;
+  ErrorObj& ErrorObj::opltlt(const char s[]) {
+    // Exactly equivalent to the general template.
+    // If this is not provided explicitly, then the template will
+    // be instantiated once for each length of string ever used.
+    myOs.str(emptyString);
+    myOs << s;
 #ifdef OLD_STYLE_AUTOMATIC_SPACES
-  if ( ! myOs.str().empty() ) {
-    if ( !verbatim ) {
-      emitToken( myOs.str() + ' ' );
-    } else {
-       emitToken( myOs.str() );
+    if (!myOs.str().empty()) {
+      if (!verbatim) {
+        emitToken(myOs.str() + ' ');
+      } else {
+        emitToken(myOs.str());
+      }
     }
-  }
 #else
-  if ( ! myOs.str().empty() ) emitToken( myOs.str() );
+    if (!myOs.str().empty())
+      emitToken(myOs.str());
 #endif
-  return *this;
-}
+    return *this;
+  }
 
-ErrorObj & operator<<( ErrorObj & e, const char s[] ) {
-  return e.opltlt(s);
-}
+  ErrorObj& operator<<(ErrorObj& e, const char s[]) { return e.opltlt(s); }
 
-} // end of namespace edm  */
+}  // end of namespace edm  */
diff --git a/FWCore/MessageLogger/src/ExceptionMessages.cc b/FWCore/MessageLogger/src/ExceptionMessages.cc
index 6c05af17c4681..c49fbe51ad241 100644
--- a/FWCore/MessageLogger/src/ExceptionMessages.cc
+++ b/FWCore/MessageLogger/src/ExceptionMessages.cc
@@ -9,33 +9,28 @@
 #include <iomanip>
 
 namespace edm {
-  void 
-  printCmsException(cms::Exception& e, edm::JobReport * jobRep, int rc) try {
+  void printCmsException(cms::Exception& e, edm::JobReport* jobRep, int rc) try {
     std::string shortDesc("Fatal Exception");
     std::ostringstream longDesc;
     longDesc << e.explainSelf();
-    LogAbsolute(shortDesc)
-      << "----- Begin " << shortDesc << " "
-      << std::setprecision(0) << TimeOfDay()
-      << "-----------------------\n"
-      << longDesc.str()
-      << "----- End " << shortDesc << " -------------------------------------------------";
-    if(jobRep) jobRep->reportError(shortDesc, longDesc.str(), rc);
-  } catch(...) {
+    LogAbsolute(shortDesc) << "----- Begin " << shortDesc << " " << std::setprecision(0) << TimeOfDay()
+                           << "-----------------------\n"
+                           << longDesc.str() << "----- End " << shortDesc
+                           << " -------------------------------------------------";
+    if (jobRep)
+      jobRep->reportError(shortDesc, longDesc.str(), rc);
+  } catch (...) {
   }
 
-  void
-  printCmsExceptionWarning(char const* behavior, cms::Exception const& e) try {
+  void printCmsExceptionWarning(char const* behavior, cms::Exception const& e) try {
     std::string shortDesc(behavior);
     shortDesc += " Exception";
     std::ostringstream longDesc;
     longDesc << e.explainSelf();
-    LogPrint(shortDesc)
-      << "----- Begin " << shortDesc << " "
-      << std::setprecision(0) << TimeOfDay()
-      << "-----------------------\n"
-      << longDesc.str()
-      << "----- End " << shortDesc << " -------------------------------------------------";
-  } catch(...) {
+    LogPrint(shortDesc) << "----- Begin " << shortDesc << " " << std::setprecision(0) << TimeOfDay()
+                        << "-----------------------\n"
+                        << longDesc.str() << "----- End " << shortDesc
+                        << " -------------------------------------------------";
+  } catch (...) {
   }
-}
+}  // namespace edm
diff --git a/FWCore/MessageLogger/src/JobReport.cc b/FWCore/MessageLogger/src/JobReport.cc
index 0079c2ba27ad3..1f5dc6155b5da 100644
--- a/FWCore/MessageLogger/src/JobReport.cc
+++ b/FWCore/MessageLogger/src/JobReport.cc
@@ -39,7 +39,7 @@ namespace edm {
   template <typename S, typename T>
   S& formatFile(T const& f, S& os) {
     tinyxml2::XMLDocument doc;
-    if(f.fileHasBeenClosed) {
+    if (f.fileHasBeenClosed) {
       os << "\n<State  Value=\"closed\"/>";
     } else {
       os << "\n<State  Value=\"open\"/>";
@@ -50,7 +50,7 @@ namespace edm {
     os << "\n<ModuleLabel>" << doc.NewText(f.moduleLabel.c_str())->Value() << "</ModuleLabel>";
     os << "\n<GUID>" << f.guid << "</GUID>";
     os << "\n<Branches>";
-    for(auto const& branch : f.branchNames) {
+    for (auto const& branch : f.branchNames) {
       os << "\n  <Branch>" << doc.NewText(branch.c_str())->Value() << "</Branch>";
       doc.DeleteChildren();
     }
@@ -68,8 +68,7 @@ namespace edm {
     os << "\n<InputFile>";
     formatFile(f, os);
     os << "\n<InputType>" << f.inputType << "</InputType>";
-    os << "\n<InputSourceClass>" << doc.NewText(f.inputSourceClassName.c_str())->Value()
-       << "</InputSourceClass>";
+    os << "\n<InputSourceClass>" << doc.NewText(f.inputSourceClassName.c_str())->Value() << "</InputSourceClass>";
     os << "\n<EventsRead>" << f.numEventsRead << "</EventsRead>";
     return os;
   }
@@ -78,97 +77,67 @@ namespace edm {
   S& print(S& os, JobReport::OutputFile const& f) {
     tinyxml2::XMLDocument doc;
     formatFile(f, os);
-    os << "\n<OutputModuleClass>"
-       << doc.NewText(f.outputModuleClassName.c_str())->Value()
-       << "</OutputModuleClass>";
-    os << "\n<TotalEvents>"
-       << f.numEventsWritten
-       << "</TotalEvents>\n";
-    os << "\n<DataType>"
-       << doc.NewText(f.dataType.c_str())->Value()
-       << "</DataType>\n";
-    os << "\n<BranchHash>"
-       << doc.NewText(f.branchHash.c_str())->Value()
-       << "</BranchHash>\n";
+    os << "\n<OutputModuleClass>" << doc.NewText(f.outputModuleClassName.c_str())->Value() << "</OutputModuleClass>";
+    os << "\n<TotalEvents>" << f.numEventsWritten << "</TotalEvents>\n";
+    os << "\n<DataType>" << doc.NewText(f.dataType.c_str())->Value() << "</DataType>\n";
+    os << "\n<BranchHash>" << doc.NewText(f.branchHash.c_str())->Value() << "</BranchHash>\n";
     return os;
   }
 
   template <typename S>
-  S& print(S& os,
-           JobReport::RunReport const& rep) {
-    os << "\n<Run ID=\""
-       << rep.runNumber
-       << "\">\n";
-
-    for(auto const& il : rep.lumiSectionsToNEvents) {
-      if(std::numeric_limits<unsigned long>::max() == il.second) {
+  S& print(S& os, JobReport::RunReport const& rep) {
+    os << "\n<Run ID=\"" << rep.runNumber << "\">\n";
+
+    for (auto const& il : rep.lumiSectionsToNEvents) {
+      if (std::numeric_limits<unsigned long>::max() == il.second) {
         os << "   <LumiSection ID=\"" << il.first << "\"/>\n";
-        
+
       } else {
-        os << "   <LumiSection ID=\"" << il.first << "\" NEvents=\""<<il.second<< "\"/>\n";
+        os << "   <LumiSection ID=\"" << il.first << "\" NEvents=\"" << il.second << "\"/>\n";
       }
     }
     os << "</Run>\n";
     return os;
   }
 
-  std::ostream& operator<< (std::ostream& os, JobReport::InputFile const& f) {
-    return print(os,f);
-  }
-  std::ostream& operator<< (std::ostream& os, JobReport::OutputFile const& f) {
-    return print(os,f);
-  }
-  std::ostream& operator<< (std::ostream& os, JobReport::RunReport const& f) {
-    return print(os,f);
-  }
+  std::ostream& operator<<(std::ostream& os, JobReport::InputFile const& f) { return print(os, f); }
+  std::ostream& operator<<(std::ostream& os, JobReport::OutputFile const& f) { return print(os, f); }
+  std::ostream& operator<<(std::ostream& os, JobReport::RunReport const& f) { return print(os, f); }
 
   JobReport::InputFile& JobReport::JobReportImpl::getInputFileForToken(InputType inputType, JobReport::Token t) {
-
     InputFile* inputFile = nullptr;
-    if(inputType == InputType::SecondarySource) {
-      if(t >= inputFilesSecSource_.size()) {
-        throw edm::Exception(edm::errors::LogicError)
-          << "Access reported for secondary source input file with token "
-          << t
-          << " but no matching input file is found\n";
+    if (inputType == InputType::SecondarySource) {
+      if (t >= inputFilesSecSource_.size()) {
+        throw edm::Exception(edm::errors::LogicError) << "Access reported for secondary source input file with token "
+                                                      << t << " but no matching input file is found\n";
       }
       inputFile = &inputFilesSecSource_[t];
     } else {
-      if(t >= inputFiles_.size()) {
+      if (t >= inputFiles_.size()) {
         throw edm::Exception(edm::errors::LogicError)
-          << "Access reported for input file with token "
-          << t
-          << " but no matching input file is found\n";
+            << "Access reported for input file with token " << t << " but no matching input file is found\n";
       }
       inputFile = &inputFiles_[t];
     }
-    if(inputFile->fileHasBeenClosed) {
+    if (inputFile->fileHasBeenClosed) {
       throw edm::Exception(edm::errors::LogicError)
-        << "Access reported for input file with token "
-        << t
-        << " after this file has been closed.\n"
-        << "File record follows:\n"
-        << *inputFile
-        << '\n';
+          << "Access reported for input file with token " << t << " after this file has been closed.\n"
+          << "File record follows:\n"
+          << *inputFile << '\n';
     }
     return *inputFile;
   }
 
   JobReport::OutputFile& JobReport::JobReportImpl::getOutputFileForToken(JobReport::Token t) {
-    if(t >= outputFiles_.size()) {
+    if (t >= outputFiles_.size()) {
       throw edm::Exception(edm::errors::LogicError)
-        << "Access reported for output file with token "
-        << t
-        << " but no matching output file is found\n";
+          << "Access reported for output file with token " << t << " but no matching output file is found\n";
     }
-    if(outputFiles_[t].fileHasBeenClosed) {
+    if (outputFiles_[t].fileHasBeenClosed) {
       throw edm::Exception(edm::errors::LogicError)
-        << "Access reported for output file with token "
-        << t
-        << " after this file has been closed.\n"
-        << "File record follows:\n"
-        << outputFiles_[t]
-        << '\n';
+          << "Access reported for output file with token " << t << " after this file has been closed.\n"
+          << "File record follows:\n"
+          << outputFiles_[t] << '\n';
     }
     return outputFiles_[t];
   }
@@ -180,9 +149,9 @@ namespace edm {
    * is added to all open output files as a contributor
    */
   void JobReport::JobReportImpl::insertInputForOutputs(InputType inputType, JobReport::Token t) {
-    for(auto & outputFile : outputFiles_) {
-      if(!outputFile.fileHasBeenClosed) {
-        if(inputType == InputType::SecondarySource) {
+    for (auto& outputFile : outputFiles_) {
+      if (!outputFile.fileHasBeenClosed) {
+        if (inputType == InputType::SecondarySource) {
           outputFile.contributingInputsSecSource.push_back(t);
         } else {
           outputFile.contributingInputs.push_back(t);
@@ -197,10 +166,10 @@ namespace edm {
    * job report via MessageLogger
    */
   void JobReport::JobReportImpl::writeInputFile(JobReport::InputFile const& f) {
-    if(ost_) {
-      *ost_ << f ;
+    if (ost_) {
+      *ost_ << f;
       *ost_ << "\n<Runs>";
-      for(auto const& runReport : f.runReports) {
+      for (auto const& runReport : f.runReports) {
         *ost_ << runReport.second;
       }
       *ost_ << "\n</Runs>\n";
@@ -225,32 +194,34 @@ namespace edm {
    */
   void JobReport::JobReportImpl::writeOutputFile(JobReport::OutputFile const& f) {
     tinyxml2::XMLDocument doc;
-    if(ost_) {
+    if (ost_) {
       *ost_ << "\n<File>";
       *ost_ << f;
 
       *ost_ << "\n<Runs>";
-      for(auto const& runReport : f.runReports) {
+      for (auto const& runReport : f.runReports) {
         *ost_ << runReport.second;
       }
       *ost_ << "\n</Runs>\n";
 
       *ost_ << "\n<Inputs>";
-      for(auto token : f.contributingInputs) {
+      for (auto token : f.contributingInputs) {
         JobReport::InputFile inpFile = inputFiles_.at(token);
         *ost_ << "\n<Input>";
         *ost_ << "\n  <LFN>" << doc.NewText(inpFile.logicalFileName.c_str())->Value() << "</LFN>";
         *ost_ << "\n  <PFN>" << doc.NewText(inpFile.physicalFileName.c_str())->Value() << "</PFN>";
-        *ost_ << "\n  <FastCopying>" << findOrDefault(f.fastCopyingInputs, inpFile.physicalFileName) << "</FastCopying>";
+        *ost_ << "\n  <FastCopying>" << findOrDefault(f.fastCopyingInputs, inpFile.physicalFileName)
+              << "</FastCopying>";
         *ost_ << "\n</Input>";
         doc.DeleteChildren();
       }
-      for(auto token : f.contributingInputsSecSource) {
+      for (auto token : f.contributingInputsSecSource) {
         JobReport::InputFile inpFile = inputFilesSecSource_.at(token);
         *ost_ << "\n<Input>";
         *ost_ << "\n  <LFN>" << doc.NewText(inpFile.logicalFileName.c_str())->Value() << "</LFN>";
         *ost_ << "\n  <PFN>" << doc.NewText(inpFile.physicalFileName.c_str())->Value() << "</PFN>";
-        *ost_ << "\n  <FastCopying>" << findOrDefault(f.fastCopyingInputs, inpFile.physicalFileName) << "</FastCopying>";
+        *ost_ << "\n  <FastCopying>" << findOrDefault(f.fastCopyingInputs, inpFile.physicalFileName)
+              << "</FastCopying>";
         *ost_ << "\n</Input>";
         doc.DeleteChildren();
       }
@@ -264,18 +235,18 @@ namespace edm {
    *  Called from JobReport dtor to flush any remaining open files
    */
   void JobReport::JobReportImpl::flushFiles(void) {
-    for(auto const& inputFile : inputFiles_) {
-      if(!(inputFile.fileHasBeenClosed)) {
+    for (auto const& inputFile : inputFiles_) {
+      if (!(inputFile.fileHasBeenClosed)) {
         writeInputFile(inputFile);
       }
     }
-    for(auto const& inputFile : inputFilesSecSource_) {
-      if(!(inputFile.fileHasBeenClosed)) {
+    for (auto const& inputFile : inputFilesSecSource_) {
+      if (!(inputFile.fileHasBeenClosed)) {
         writeInputFile(inputFile);
       }
     }
-    for(auto const& outputFile : outputFiles_) {
-      if(!(outputFile.fileHasBeenClosed)) {
+    for (auto const& outputFile : outputFiles_) {
+      if (!(outputFile.fileHasBeenClosed)) {
         writeOutputFile(outputFile);
       }
     }
@@ -284,42 +255,48 @@ namespace edm {
   void JobReport::JobReportImpl::associateRun(JobReport::Token token, unsigned int runNumber) {
     auto& theMap = outputFiles_.at(token).runReports;
     std::map<RunNumber, RunReport>::iterator iter(theMap.lower_bound(runNumber));
-    if(iter == theMap.end() || runNumber < iter->first) {    // not found
-      theMap.emplace_hint(iter, runNumber, JobReport::RunReport{ runNumber, {}});  // insert it
+    if (iter == theMap.end() || runNumber < iter->first) {                        // not found
+      theMap.emplace_hint(iter, runNumber, JobReport::RunReport{runNumber, {}});  // insert it
     }
   }
 
   void JobReport::JobReportImpl::associateInputRun(unsigned int runNumber) {
-    for(auto& inputFile : inputFiles_) {
-      if(!inputFile.fileHasBeenClosed) {
+    for (auto& inputFile : inputFiles_) {
+      if (!inputFile.fileHasBeenClosed) {
         std::map<RunNumber, RunReport>& theMap = inputFile.runReports;
         std::map<RunNumber, RunReport>::iterator iter(theMap.lower_bound(runNumber));
-        if(iter == theMap.end() || runNumber < iter->first) {    // not found
-          theMap.emplace_hint(iter, runNumber, JobReport::RunReport{ runNumber, {}});  // insert it
+        if (iter == theMap.end() || runNumber < iter->first) {                        // not found
+          theMap.emplace_hint(iter, runNumber, JobReport::RunReport{runNumber, {}});  // insert it
         }
       }
     }
   }
 
-  void JobReport::JobReportImpl::associateLumiSection(JobReport::Token token, unsigned int runNumber, unsigned int lumiSect, unsigned long nEvents) {
+  void JobReport::JobReportImpl::associateLumiSection(JobReport::Token token,
+                                                      unsigned int runNumber,
+                                                      unsigned int lumiSect,
+                                                      unsigned long nEvents) {
     auto& theMap = outputFiles_.at(token).runReports;
     std::map<RunNumber, RunReport>::iterator iter(theMap.lower_bound(runNumber));
-    if(iter == theMap.end() || runNumber < iter->first) {    // not found
-      theMap.emplace_hint(iter, runNumber, JobReport::RunReport{ runNumber, {{{lumiSect,nEvents}}}});  // insert it
+    if (iter == theMap.end() || runNumber < iter->first) {                                             // not found
+      theMap.emplace_hint(iter, runNumber, JobReport::RunReport{runNumber, {{{lumiSect, nEvents}}}});  // insert it
     } else {
-      iter->second.lumiSectionsToNEvents[lumiSect]+=nEvents;
+      iter->second.lumiSectionsToNEvents[lumiSect] += nEvents;
     }
   }
 
   void JobReport::JobReportImpl::associateInputLumiSection(unsigned int runNumber, unsigned int lumiSect) {
-    for(auto& inputFile : inputFiles_) {
-      if(!inputFile.fileHasBeenClosed) {
+    for (auto& inputFile : inputFiles_) {
+      if (!inputFile.fileHasBeenClosed) {
         std::map<RunNumber, RunReport>& theMap = inputFile.runReports;
         std::map<RunNumber, RunReport>::iterator iter(theMap.lower_bound(runNumber));
-        if(iter == theMap.end() || runNumber < iter->first) {    // not found
-          theMap.emplace_hint(iter, runNumber, JobReport::RunReport{ runNumber, {{lumiSect,std::numeric_limits<unsigned long>::max()}}});  // insert it
+        if (iter == theMap.end() || runNumber < iter->first) {  // not found
+          theMap.emplace_hint(
+              iter,
+              runNumber,
+              JobReport::RunReport{runNumber, {{lumiSect, std::numeric_limits<unsigned long>::max()}}});  // insert it
         } else {
-          iter->second.lumiSectionsToNEvents[lumiSect]=std::numeric_limits<unsigned long>::max();
+          iter->second.lumiSectionsToNEvents[lumiSect] = std::numeric_limits<unsigned long>::max();
         }
       }
     }
@@ -327,31 +304,27 @@ namespace edm {
 
   JobReport::~JobReport() {
     impl_->flushFiles();
-    if(impl_->ost_) {
+    if (impl_->ost_) {
       *(impl_->ost_) << "</FrameworkJobReport>\n" << std::flush;
     }
   }
 
-    JobReport::JobReport() :
-      impl_(new JobReportImpl(nullptr)) {
-    }
+  JobReport::JobReport() : impl_(new JobReportImpl(nullptr)) {}
 
-    JobReport::JobReport(std::ostream* iOstream) : impl_(new JobReportImpl(iOstream)) {
-      if(impl_->ost_) {
-        *(impl_->ost_) << "<FrameworkJobReport>\n";
-      }
+  JobReport::JobReport(std::ostream* iOstream) : impl_(new JobReportImpl(iOstream)) {
+    if (impl_->ost_) {
+      *(impl_->ost_) << "<FrameworkJobReport>\n";
     }
+  }
 
-  JobReport::Token
-  JobReport::inputFileOpened(std::string const& physicalFileName,
-                             std::string const& logicalFileName,
-                             std::string const& catalog,
-                             std::string const& inputType,
-                             std::string const& inputSourceClassName,
-                             std::string const& moduleLabel,
-                             std::string const& guid,
-                             std::vector<std::string> const& branchNames) {
-
+  JobReport::Token JobReport::inputFileOpened(std::string const& physicalFileName,
+                                              std::string const& logicalFileName,
+                                              std::string const& catalog,
+                                              std::string const& inputType,
+                                              std::string const& inputSourceClassName,
+                                              std::string const& moduleLabel,
+                                              std::string const& guid,
+                                              std::vector<std::string> const& branchNames) {
     InputType theInputType = InputType::Primary;
     InputFile* newFile = nullptr;
     JobReport::Token newToken = 0;
@@ -369,20 +342,20 @@ namespace edm {
       newFile = &impl_->inputFiles_.back();
       newToken = impl_->inputFiles_.size() - 1;
     }
-    
-    if(theInputType == InputType::Primary) {
+
+    if (theInputType == InputType::Primary) {
       impl_->lastOpenedPrimaryInputFile_ = impl_->inputFiles_.size() - 1;
     }
-    newFile->logicalFileName      = logicalFileName;
-    newFile->physicalFileName     = physicalFileName;
-    newFile->catalog              = catalog;
-    newFile->inputType            = inputType;
+    newFile->logicalFileName = logicalFileName;
+    newFile->physicalFileName = physicalFileName;
+    newFile->catalog = catalog;
+    newFile->inputType = inputType;
     newFile->inputSourceClassName = inputSourceClassName;
-    newFile->moduleLabel          = moduleLabel;
-    newFile->guid                 = guid;
-    newFile->numEventsRead        = 0;
-    newFile->branchNames          = branchNames;
-    newFile->fileHasBeenClosed    = false;
+    newFile->moduleLabel = moduleLabel;
+    newFile->guid = guid;
+    newFile->numEventsRead = 0;
+    newFile->branchNames = branchNames;
+    newFile->fileHasBeenClosed = false;
 
     // Add the new input file token to all output files
     //  currently open.
@@ -390,23 +363,20 @@ namespace edm {
     return newToken;
   }
 
-  void
-  JobReport::eventReadFromFile(InputType inputType, JobReport::Token fileToken) {
+  void JobReport::eventReadFromFile(InputType inputType, JobReport::Token fileToken) {
     JobReport::InputFile& f = impl_->getInputFileForToken(inputType, fileToken);
     ++f.numEventsRead;
   }
 
-  void
-  JobReport::reportDataType(Token fileToken, std::string const& dataType) {
+  void JobReport::reportDataType(Token fileToken, std::string const& dataType) {
     JobReport::OutputFile& f = impl_->getOutputFileForToken(fileToken);
     f.dataType = dataType;
   }
 
-  void
-  JobReport::inputFileClosed(InputType inputType, JobReport::Token fileToken) {
+  void JobReport::inputFileClosed(InputType inputType, JobReport::Token fileToken) {
     JobReport::InputFile& f = impl_->getInputFileForToken(inputType, fileToken);
     f.fileHasBeenClosed = true;
-    if(inputType == InputType::Primary) {
+    if (inputType == InputType::Primary) {
       impl_->writeInputFile(f);
     } else {
       {
@@ -416,62 +386,58 @@ namespace edm {
     }
   }
 
-  JobReport::Token
-  JobReport::outputFileOpened(std::string const& physicalFileName,
-                              std::string const& logicalFileName,
-                              std::string const& catalog,
-                              std::string const& outputModuleClassName,
-                              std::string const& moduleLabel,
-                              std::string const& guid,
-                              std::string const& dataType,
-                              std::string const& branchHash,
-                              std::vector<std::string> const& branchNames) {
+  JobReport::Token JobReport::outputFileOpened(std::string const& physicalFileName,
+                                               std::string const& logicalFileName,
+                                               std::string const& catalog,
+                                               std::string const& outputModuleClassName,
+                                               std::string const& moduleLabel,
+                                               std::string const& guid,
+                                               std::string const& dataType,
+                                               std::string const& branchHash,
+                                               std::vector<std::string> const& branchNames) {
     auto itr = impl_->outputFiles_.emplace_back();
     JobReport::OutputFile& r = *itr;
 
-    r.logicalFileName       = logicalFileName;
-    r.physicalFileName      = physicalFileName;
-    r.catalog               = catalog;
+    r.logicalFileName = logicalFileName;
+    r.physicalFileName = physicalFileName;
+    r.catalog = catalog;
     r.outputModuleClassName = outputModuleClassName;
-    r.moduleLabel           = moduleLabel;
-    r.guid           = guid;
+    r.moduleLabel = moduleLabel;
+    r.guid = guid;
     r.dataType = dataType;
     r.branchHash = branchHash;
-    r.numEventsWritten      = 0;
-    r.branchNames           = branchNames;
-    r.fileHasBeenClosed     = false;
+    r.numEventsWritten = 0;
+    r.branchNames = branchNames;
+    r.fileHasBeenClosed = false;
     //
     // Init list of contributors to list of open input file Tokens
     //
-    for(std::vector<Token>::size_type i = 0, iEnd = impl_->inputFiles_.size(); i < iEnd; ++i) {
-      if(!impl_->inputFiles_[i].fileHasBeenClosed) {
+    for (std::vector<Token>::size_type i = 0, iEnd = impl_->inputFiles_.size(); i < iEnd; ++i) {
+      if (!impl_->inputFiles_[i].fileHasBeenClosed) {
         r.contributingInputs.push_back(i);
       }
     }
-    for(tbb::concurrent_vector<Token>::size_type i = 0, iEnd = impl_->inputFilesSecSource_.size(); i < iEnd; ++i) {
-      if(!impl_->inputFilesSecSource_[i].fileHasBeenClosed) {
+    for (tbb::concurrent_vector<Token>::size_type i = 0, iEnd = impl_->inputFilesSecSource_.size(); i < iEnd; ++i) {
+      if (!impl_->inputFilesSecSource_[i].fileHasBeenClosed) {
         r.contributingInputsSecSource.push_back(i);
       }
     }
     return itr - impl_->outputFiles_.begin();
   }
 
-  void
-  JobReport::eventWrittenToFile(JobReport::Token fileToken, RunNumber_t /*run*/, EventNumber_t) {
+  void JobReport::eventWrittenToFile(JobReport::Token fileToken, RunNumber_t /*run*/, EventNumber_t) {
     JobReport::OutputFile& f = impl_->getOutputFileForToken(fileToken);
     ++f.numEventsWritten;
   }
 
-  void
-  JobReport::outputFileClosed(JobReport::Token fileToken) {
+  void JobReport::outputFileClosed(JobReport::Token fileToken) {
     JobReport::OutputFile& f = impl_->getOutputFileForToken(fileToken);
     f.fileHasBeenClosed = true;
     impl_->writeOutputFile(f);
   }
 
-  void
-  JobReport::reportSkippedEvent(RunNumber_t run, EventNumber_t event) {
-    if(impl_->ost_) {
+  void JobReport::reportSkippedEvent(RunNumber_t run, EventNumber_t event) {
+    if (impl_->ost_) {
       std::ostream& msg = *(impl_->ost_);
       {
         std::lock_guard<std::mutex> lock(write_mutex);
@@ -482,36 +448,31 @@ namespace edm {
     }
   }
 
-  void
-  JobReport:: reportFastCopyingStatus(JobReport::Token fileToken, std::string const& inputFileName, bool fastCopying) {
+  void JobReport::reportFastCopyingStatus(JobReport::Token fileToken,
+                                          std::string const& inputFileName,
+                                          bool fastCopying) {
     JobReport::OutputFile& f = impl_->getOutputFileForToken(fileToken);
     f.fastCopyingInputs.insert(std::make_pair(inputFileName, fastCopying));
   }
 
-  void
-  JobReport::reportLumiSection(JobReport::Token token, unsigned int run, unsigned int lumiSectId, unsigned long nEvents) {
-    impl_->associateLumiSection(token, run, lumiSectId,nEvents);
+  void JobReport::reportLumiSection(JobReport::Token token,
+                                    unsigned int run,
+                                    unsigned int lumiSectId,
+                                    unsigned long nEvents) {
+    impl_->associateLumiSection(token, run, lumiSectId, nEvents);
   }
 
-  void
-  JobReport::reportInputLumiSection(unsigned int run, unsigned int lumiSectId) {
+  void JobReport::reportInputLumiSection(unsigned int run, unsigned int lumiSectId) {
     impl_->associateInputLumiSection(run, lumiSectId);
   }
 
-  void
-  JobReport::reportRunNumber(JobReport::Token token, unsigned int run) {
-    impl_->associateRun(token, run);
-  }
+  void JobReport::reportRunNumber(JobReport::Token token, unsigned int run) { impl_->associateRun(token, run); }
 
-  void
-  JobReport::reportInputRunNumber(unsigned int run) {
-    impl_->associateInputRun(run);
-  }
+  void JobReport::reportInputRunNumber(unsigned int run) { impl_->associateInputRun(run); }
 
-  void
-  JobReport::reportAnalysisFile(std::string const& fileName, std::map<std::string, std::string> const& fileData) {
+  void JobReport::reportAnalysisFile(std::string const& fileName, std::map<std::string, std::string> const& fileData) {
     tinyxml2::XMLDocument doc;
-    if(impl_->ost_) {
+    if (impl_->ost_) {
       std::ostream& msg = *(impl_->ost_);
       {
         std::lock_guard<std::mutex> lock(write_mutex);
@@ -519,10 +480,9 @@ namespace edm {
             << "  <FileName>" << doc.NewText(fileName.c_str())->Value() << "</FileName>\n";
 
         typedef std::map<std::string, std::string>::const_iterator const_iterator;
-        for(const_iterator pos = fileData.begin(), posEnd = fileData.end(); pos != posEnd; ++pos) {
-          msg <<  "  <" << pos->first
-              <<  "  Value=\"" << pos->second  << "\" />"
-              <<  "\n";
+        for (const_iterator pos = fileData.begin(), posEnd = fileData.end(); pos != posEnd; ++pos) {
+          msg << "  <" << pos->first << "  Value=\"" << pos->second << "\" />"
+              << "\n";
         }
         msg << "</AnalysisFile>\n";
         msg << std::flush;
@@ -530,16 +490,12 @@ namespace edm {
     }
   }
 
-  void
-  JobReport::reportError(std::string const& shortDesc,
-                         std::string const& longDesc,
-                         int const& exitCode) {
-    if(impl_->ost_) {
+  void JobReport::reportError(std::string const& shortDesc, std::string const& longDesc, int const& exitCode) {
+    if (impl_->ost_) {
       {
         std::lock_guard<std::mutex> lock(write_mutex);
         std::ostream& msg = *(impl_->ost_);
-        msg << "<FrameworkError ExitStatus=\""<< exitCode
-            << "\" Type=\"" << shortDesc << "\" >\n";
+        msg << "<FrameworkError ExitStatus=\"" << exitCode << "\" Type=\"" << shortDesc << "\" >\n";
         msg << "<![CDATA[\n" << longDesc << "\n]]>\n";
         msg << "</FrameworkError>\n";
         msg << std::flush;
@@ -547,52 +503,48 @@ namespace edm {
     }
   }
 
-  void
-  JobReport::reportSkippedFile(std::string const& pfn,
-                               std::string const& lfn) {
-    if(impl_->ost_) {
+  void JobReport::reportSkippedFile(std::string const& pfn, std::string const& lfn) {
+    if (impl_->ost_) {
       std::ostream& msg = *(impl_->ost_);
       tinyxml2::XMLDocument doc;
       tinyxml2::XMLPrinter printer;
-      tinyxml2::XMLElement * skipped = doc.NewElement("SkippedFile");
+      tinyxml2::XMLElement* skipped = doc.NewElement("SkippedFile");
       skipped->SetAttribute("Pfn", pfn.c_str());
       skipped->SetAttribute("Lfn", lfn.c_str());
       {
         std::lock_guard<std::mutex> lock(write_mutex);
         skipped->Accept(&printer);
-        msg << printer.CStr() ;
+        msg << printer.CStr();
         msg << std::flush;
       }
     }
   }
 
-  void
-  JobReport::reportFallbackAttempt(std::string const& pfn, std::string const& lfn, std::string const& err) {
-    if(impl_->ost_) {
+  void JobReport::reportFallbackAttempt(std::string const& pfn, std::string const& lfn, std::string const& err) {
+    if (impl_->ost_) {
       std::ostream& msg = *(impl_->ost_);
       tinyxml2::XMLDocument doc;
       tinyxml2::XMLPrinter printer;
-      tinyxml2::XMLElement * fallback = doc.NewElement("FallbackAttempt");
+      tinyxml2::XMLElement* fallback = doc.NewElement("FallbackAttempt");
       fallback->SetAttribute("Pfn", pfn.c_str());
       fallback->SetAttribute("Lfn", lfn.c_str());
       {
         std::lock_guard<std::mutex> lock(write_mutex);
         fallback->Accept(&printer);
-        msg << printer.CStr() ;
+        msg << printer.CStr();
         msg << "<![CDATA[\n" << err << "\n]]>\n";
         msg << std::flush;
       }
     }
   }
 
-  void
-  JobReport::reportMemoryInfo(std::vector<std::string> const& memoryData) {
-    if(impl_->ost_) {
+  void JobReport::reportMemoryInfo(std::vector<std::string> const& memoryData) {
+    if (impl_->ost_) {
       std::ostream& msg = *(impl_->ost_);
       msg << "<MemoryService>\n";
 
       typedef std::vector<std::string>::const_iterator const_iterator;
-      for(const_iterator pos = memoryData.begin(), posEnd = memoryData.end(); pos != posEnd; ++pos) {
+      for (const_iterator pos = memoryData.begin(), posEnd = memoryData.end(); pos != posEnd; ++pos) {
         msg << *pos << "\n";
       }
       msg << "</MemoryService>\n";
@@ -600,41 +552,39 @@ namespace edm {
     }
   }
 
-  void
-  JobReport::reportMessageInfo(std::map<std::string, double> const& messageData) {
-    if(impl_->ost_) {
+  void JobReport::reportMessageInfo(std::map<std::string, double> const& messageData) {
+    if (impl_->ost_) {
       std::ostream& msg = *(impl_->ost_);
       msg << "<MessageSummary>\n";
       typedef std::map<std::string, double>::const_iterator const_iterator;
-      for(const_iterator pos = messageData.begin(), posEnd = messageData.end(); pos != posEnd; ++pos) {
-        msg <<  "  <" << pos->first
-        <<  "  Value=\"" << pos->second  << "\" />"
-        <<  "\n";
+      for (const_iterator pos = messageData.begin(), posEnd = messageData.end(); pos != posEnd; ++pos) {
+        msg << "  <" << pos->first << "  Value=\"" << pos->second << "\" />"
+            << "\n";
       }
       msg << "</MessageSummary>\n";
       msg << std::flush;
     }
   }
 
-  void
-  JobReport::reportReadBranches() {
-    if(impl_->printedReadBranches_) return;
+  void JobReport::reportReadBranches() {
+    if (impl_->printedReadBranches_)
+      return;
     impl_->printedReadBranches_ = true;
-    if(impl_->ost_) {
+    if (impl_->ost_) {
       std::ostream& ost = *(impl_->ost_);
       ost << "<ReadBranches>\n";
       tinyxml2::XMLDocument doc;
       tinyxml2::XMLPrinter printer;
-      for(auto const& iBranch : impl_->readBranches_) {
-        tinyxml2::XMLElement * branch = doc.NewElement("Branch");
+      for (auto const& iBranch : impl_->readBranches_) {
+        tinyxml2::XMLElement* branch = doc.NewElement("Branch");
         branch->SetAttribute("Name", iBranch.first.c_str());
         branch->SetAttribute("ReadCount", int64_t(iBranch.second));
         branch->Accept(&printer);
         ost << printer.CStr();
         printer.ClearBuffer();
       }
-      for(auto const& iBranch : impl_->readBranchesSecFile_) {
-        tinyxml2::XMLElement * branch = doc.NewElement("Branch");
+      for (auto const& iBranch : impl_->readBranchesSecFile_) {
+        tinyxml2::XMLElement* branch = doc.NewElement("Branch");
         branch->SetAttribute("Name", iBranch.first.c_str());
         branch->SetAttribute("ReadCount", int64_t(iBranch.second));
         branch->Accept(&printer);
@@ -642,10 +592,10 @@ namespace edm {
         printer.ClearBuffer();
       }
       ost << "</ReadBranches>\n";
-      if(!impl_->readBranchesSecSource_.empty()) {
+      if (!impl_->readBranchesSecSource_.empty()) {
         ost << "<SecondarySourceReadBranches>\n";
-        for(auto const& iBranch : impl_->readBranchesSecSource_) {
-          tinyxml2::XMLElement * branch = doc.NewElement("Branch");
+        for (auto const& iBranch : impl_->readBranchesSecSource_) {
+          tinyxml2::XMLElement* branch = doc.NewElement("Branch");
           branch->SetAttribute("Name", iBranch.first.c_str());
           branch->SetAttribute("ReadCount", int64_t(iBranch.second.value().load()));
           branch->Accept(&printer);
@@ -658,12 +608,12 @@ namespace edm {
     }
   }
 
-  void
-  JobReport::reportReadBranch(InputType inputType, std::string const& branchName) {
-    if(inputType == InputType::Primary) {
+  void JobReport::reportReadBranch(InputType inputType, std::string const& branchName) {
+    if (inputType == InputType::Primary) {
       // Fast cloned branches have already been reported.
-      std::set<std::string> const& clonedBranches = impl_->inputFiles_.at(impl_->lastOpenedPrimaryInputFile_).fastClonedBranches;
-      if(clonedBranches.find(branchName) == clonedBranches.end()) {
+      std::set<std::string> const& clonedBranches =
+          impl_->inputFiles_.at(impl_->lastOpenedPrimaryInputFile_).fastClonedBranches;
+      if (clonedBranches.find(branchName) == clonedBranches.end()) {
         ++impl_->readBranches_[branchName];
       }
     } else if (inputType == InputType::SecondaryFile) {
@@ -673,12 +623,13 @@ namespace edm {
     }
   }
 
-  void
-  JobReport::reportFastClonedBranches(std::set<std::string> const& fastClonedBranches, long long nEvents) {
-    std::set<std::string>& clonedBranches = impl_->inputFiles_.at(impl_->lastOpenedPrimaryInputFile_).fastClonedBranches;
-    for(std::set<std::string>::const_iterator it = fastClonedBranches.begin(), itEnd = fastClonedBranches.end();
-        it != itEnd; ++it) {
-      if(clonedBranches.insert(*it).second) {
+  void JobReport::reportFastClonedBranches(std::set<std::string> const& fastClonedBranches, long long nEvents) {
+    std::set<std::string>& clonedBranches =
+        impl_->inputFiles_.at(impl_->lastOpenedPrimaryInputFile_).fastClonedBranches;
+    for (std::set<std::string>::const_iterator it = fastClonedBranches.begin(), itEnd = fastClonedBranches.end();
+         it != itEnd;
+         ++it) {
+      if (clonedBranches.insert(*it).second) {
         impl_->readBranches_[*it] += nEvents;
       }
     }
@@ -686,76 +637,72 @@ namespace edm {
 
   void JobReport::reportRandomStateFile(std::string const& name) {
     tinyxml2::XMLDocument doc;
-    if(impl_->ost_) {
+    if (impl_->ost_) {
       std::ostream& msg = *(impl_->ost_);
       {
         std::lock_guard<std::mutex> lock(write_mutex);
         msg << "<RandomServiceStateFile>\n"
             << doc.NewText(name.c_str())->Value() << "\n"
-            <<  "</RandomServiceStateFile>\n";
+            << "</RandomServiceStateFile>\n";
         msg << std::flush;
       }
     }
   }
 
-  void
-  JobReport::reportPerformanceSummary(std::string const& metricClass,
-                                      std::map<std::string, std::string> const& metrics) {
-    if(impl_->ost_) {
+  void JobReport::reportPerformanceSummary(std::string const& metricClass,
+                                           std::map<std::string, std::string> const& metrics) {
+    if (impl_->ost_) {
       std::ostream& msg = *(impl_->ost_);
       msg << "<PerformanceReport>\n"
-        << "  <PerformanceSummary Metric=\"" << metricClass << "\">\n";
+          << "  <PerformanceSummary Metric=\"" << metricClass << "\">\n";
 
       typedef std::map<std::string, std::string>::const_iterator const_iterator;
-      for(const_iterator iter = metrics.begin(), iterEnd = metrics.end(); iter != iterEnd; ++iter) {
+      for (const_iterator iter = metrics.begin(), iterEnd = metrics.end(); iter != iterEnd; ++iter) {
         msg << "    <Metric Name=\"" << iter->first << "\" "
-        << "Value=\"" << iter->second << "\"/>\n";
+            << "Value=\"" << iter->second << "\"/>\n";
       }
 
       msg << "  </PerformanceSummary>\n"
-        << "</PerformanceReport>\n";
+          << "</PerformanceReport>\n";
       msg << std::flush;
       //LogInfo("FwkJob") << msg.str();
     }
   }
 
-  void
-  JobReport::reportPerformanceForModule(std::string const&  metricClass,
-                                        std::string const&  moduleName,
-                                        std::map<std::string, std::string> const& metrics) {
-    if(impl_->ost_) {
+  void JobReport::reportPerformanceForModule(std::string const& metricClass,
+                                             std::string const& moduleName,
+                                             std::map<std::string, std::string> const& metrics) {
+    if (impl_->ost_) {
       std::ostream& msg = *(impl_->ost_);
       msg << "<PerformanceReport>\n"
-        << "  <PerformanceModule Metric=\"" << metricClass << "\" "
-        << " Module=\"" << moduleName << "\" >\n";
+          << "  <PerformanceModule Metric=\"" << metricClass << "\" "
+          << " Module=\"" << moduleName << "\" >\n";
 
       typedef std::map<std::string, std::string>::const_iterator const_iterator;
-      for(const_iterator iter = metrics.begin(), iterEnd = metrics.end(); iter != iterEnd; ++iter) {
+      for (const_iterator iter = metrics.begin(), iterEnd = metrics.end(); iter != iterEnd; ++iter) {
         msg << "    <Metric Name=\"" << iter->first << "\" "
-        << "Value=\"" << iter->second << "\"/>\n";
+            << "Value=\"" << iter->second << "\"/>\n";
       }
 
       msg << "  </PerformanceModule>\n"
-        << "</PerformanceReport>\n";
+          << "</PerformanceReport>\n";
       msg << std::flush;
       //LogInfo("FwkJob") << msg.str();
     }
   }
 
-  std::string
-  JobReport::dumpFiles(void) {
+  std::string JobReport::dumpFiles(void) {
     std::ostringstream msg;
 
     tinyxml2::XMLDocument doc;
-    for(auto const& f :impl_->outputFiles_) {
-
+    for (auto const& f : impl_->outputFiles_) {
       msg << "\n<File>";
       msg << f;
 
       msg << "\n<LumiSections>";
       msg << "\n<Inputs>";
       typedef std::vector<JobReport::Token>::iterator iterator;
-      for(auto const& iInput : f.contributingInputs) {
+      for (auto const& iInput : f.contributingInputs) {
         auto const& inpFile = impl_->inputFiles_[iInput];
         msg << "\n<Input>";
         msg << "\n  <LFN>" << doc.NewText(inpFile.logicalFileName.c_str())->Value() << "</LFN>";
@@ -766,9 +713,8 @@ namespace edm {
       }
       msg << "\n</Inputs>";
       msg << "\n</File>";
-
     }
     return msg.str();
   }
 
-} //namspace edm
+}  // namespace edm
diff --git a/FWCore/MessageLogger/src/MessageDrop.cc b/FWCore/MessageLogger/src/MessageDrop.cc
index ba8854c23bdf1..cf5136a26a4ab 100644
--- a/FWCore/MessageLogger/src/MessageDrop.cc
+++ b/FWCore/MessageLogger/src/MessageDrop.cc
@@ -32,10 +32,10 @@
 //			its derivative classes.
 //
 // 4 11/29/10 mf	Intitalize all local string-holders in the various
-//			string producers. 
+//			string producers.
 //
-// 5  mf 11/30/10	Snapshot method to prepare for invalidation of the   
-//			pointers used to hold module context.  Supports 
+// 5  mf 11/30/10	Snapshot method to prepare for invalidation of the
+//			pointers used to hold module context.  Supports
 //			surviving throws that cause objects to go out of scope.
 //
 // 6  mf 12/7/10	Fix in snapshot method to avoid strncpy from
@@ -48,171 +48,152 @@
 using namespace edm;
 
 // The following are false at initialization (in case configure is not done)
-// and are set true at the start of configure_ordinary_destinations, 
-// but are set false once a destination is thresholded to react to the 
-// corresponding severity: 
-bool MessageDrop::debugAlwaysSuppressed=false;		// change log 2
-bool MessageDrop::infoAlwaysSuppressed=false;	 	// change log 2
-bool MessageDrop::warningAlwaysSuppressed=false; 	// change log 2
+// and are set true at the start of configure_ordinary_destinations,
+// but are set false once a destination is thresholded to react to the
+// corresponding severity:
+bool MessageDrop::debugAlwaysSuppressed = false;    // change log 2
+bool MessageDrop::infoAlwaysSuppressed = false;     // change log 2
+bool MessageDrop::warningAlwaysSuppressed = false;  // change log 2
 std::string MessageDrop::jobMode{};
 
-MessageDrop *
-MessageDrop::instance()
-{
+MessageDrop* MessageDrop::instance() {
   thread_local static MessageDrop s_drop{};
   return &s_drop;
 }
-namespace  {
+namespace {
   const std::string kBlankString{" "};
 }
 
 namespace edm {
-namespace messagedrop {
-
-class StringProducer {
-  public:
-    virtual ~StringProducer() {}
-    virtual std::string theContext() const = 0;
-};
-  
-class StringProducerWithPhase : public StringProducer
-{
-  public:
-    StringProducerWithPhase() 
-    : name_                (&kBlankString)
-    , label_               (&kBlankString)
-    , phasePtr_            ("(Startup)")
-    , moduleID_            (std::numeric_limits<unsigned int>::max())
-    , cache_               ()
-    , idLabelMap_        ()
-    {
-    }
-
-    std::string theContext() const override {
-      if (cache_.empty()) {
-        if (moduleID_ != std::numeric_limits<unsigned int>::max()) {
-          auto nameLableIter = idLabelMap_.find(moduleID_);
-          if  (nameLableIter != idLabelMap_.end()) {
-            cache_.assign(nameLableIter->second);
-            cache_.append(phasePtr_);
-            return cache_;
+  namespace messagedrop {
+
+    class StringProducer {
+    public:
+      virtual ~StringProducer() {}
+      virtual std::string theContext() const = 0;
+    };
+
+    class StringProducerWithPhase : public StringProducer {
+    public:
+      StringProducerWithPhase()
+          : name_(&kBlankString),
+            label_(&kBlankString),
+            phasePtr_("(Startup)"),
+            moduleID_(std::numeric_limits<unsigned int>::max()),
+            cache_(),
+            idLabelMap_() {}
+
+      std::string theContext() const override {
+        if (cache_.empty()) {
+          if (moduleID_ != std::numeric_limits<unsigned int>::max()) {
+            auto nameLableIter = idLabelMap_.find(moduleID_);
+            if (nameLableIter != idLabelMap_.end()) {
+              cache_.assign(nameLableIter->second);
+              cache_.append(phasePtr_);
+              return cache_;
+            }
           }
+          cache_.assign(*name_);
+          cache_.append(":");
+          cache_.append(*label_);
+          idLabelMap_[moduleID_] = cache_;
+          cache_.append(phasePtr_);
         }
-        cache_.assign(*name_);
-        cache_.append(":");
-        cache_.append(*label_);
-        idLabelMap_[moduleID_] = cache_;
-        cache_.append(phasePtr_);	
+        return cache_;
       }
-      return cache_;
-    }
-    void set(std::string const & name,
-             std::string const & label,
-             unsigned int moduleID,
-             const char* phase)  {
-      name_ = &name;
-      label_ = &label;     
-      moduleID_ = moduleID;
-      phasePtr_ = phase;
-      cache_.clear();	     
-    } 
-  private:
-    std::string const * name_;
-    std::string const * label_;
-    const char* phasePtr_;
-    unsigned int moduleID_;
-    mutable std::string cache_;
-    mutable std::map<unsigned int, std::string> idLabelMap_;
-};
-
-class StringProducerPath : public StringProducer{
-  public:
-    StringProducerPath() 
-    : typePtr_("PathNotYetEstablished") 		// change log 4
-    , path_ (" ")
-    , cache_()
-    {
-    }
-     std::string theContext() const override {
-      if ( cache_.empty() ) {
-        cache_.assign(typePtr_);
-        cache_.append(path_);
+      void set(std::string const& name, std::string const& label, unsigned int moduleID, const char* phase) {
+        name_ = &name;
+        label_ = &label;
+        moduleID_ = moduleID;
+        phasePtr_ = phase;
+        cache_.clear();
       }
-      return cache_; 
-    }
-    void set(const char* type, std::string const & pathname) {
-      typePtr_ = type;
-      path_ = pathname;
-      cache_.clear();	     
-    } 
-  private:
-    const char* typePtr_;
-    std::string path_;
-    mutable std::string cache_;
-};
-  
-class StringProducerSinglet : public StringProducer{
-  public:
-    StringProducerSinglet()
-    : singlet_("(NoModuleName)")
-    {
-    }
-    std::string theContext() const override {
-      return singlet_;
-    }
-    void set(const char * sing) {singlet_ = sing; } 
-  private:
-    const char * singlet_;
-};
-
-} // namespace messagedrop
-
-MessageDrop::MessageDrop()
-  : runEvent("pre-events")
-  , streamID(std::numeric_limits<unsigned int>::max())
-  , debugEnabled(true)
-  , infoEnabled(true)
-  , warningEnabled(true)
-  , errorEnabled(true)
-  , spWithPhase(new  messagedrop::StringProducerWithPhase)
-  , spPath (new messagedrop::StringProducerPath)
-  , spSinglet (new messagedrop::StringProducerSinglet)
-  , moduleNameProducer (spSinglet)
-{ 
-} 
-
-MessageDrop::~MessageDrop()
-{
-  delete spSinglet.get();
-  delete spPath.get();
-  delete spWithPhase.get();
-}
-
-void MessageDrop::setModuleWithPhase(std::string const & name,
-                                     std::string const & label,
-                                     unsigned int moduleID,
-                                     const char* phase) {
-  spWithPhase->set(name, label, moduleID, phase);
-  moduleNameProducer = spWithPhase;
-}				     
- 
-void MessageDrop::setPath(const char* type, std::string const & pathname) {
-  spPath->set(type, pathname);
-  moduleNameProducer = spPath;
-}
-
-void MessageDrop::setSinglet(const char * sing) {
-  spSinglet->set(sing);
-  moduleNameProducer = spSinglet;
-}
 
-std::string MessageDrop::moduleContext() {
-  return moduleNameProducer->theContext();
-}
-void MessageDrop::clear() {
-  setSinglet("");
-}
-} // namespace edm
+    private:
+      std::string const* name_;
+      std::string const* label_;
+      const char* phasePtr_;
+      unsigned int moduleID_;
+      mutable std::string cache_;
+      mutable std::map<unsigned int, std::string> idLabelMap_;
+    };
+
+    class StringProducerPath : public StringProducer {
+    public:
+      StringProducerPath()
+          : typePtr_("PathNotYetEstablished")  // change log 4
+            ,
+            path_(" "),
+            cache_() {}
+      std::string theContext() const override {
+        if (cache_.empty()) {
+          cache_.assign(typePtr_);
+          cache_.append(path_);
+        }
+        return cache_;
+      }
+      void set(const char* type, std::string const& pathname) {
+        typePtr_ = type;
+        path_ = pathname;
+        cache_.clear();
+      }
 
+    private:
+      const char* typePtr_;
+      std::string path_;
+      mutable std::string cache_;
+    };
+
+    class StringProducerSinglet : public StringProducer {
+    public:
+      StringProducerSinglet() : singlet_("(NoModuleName)") {}
+      std::string theContext() const override { return singlet_; }
+      void set(const char* sing) { singlet_ = sing; }
+
+    private:
+      const char* singlet_;
+    };
+
+  }  // namespace messagedrop
+
+  MessageDrop::MessageDrop()
+      : runEvent("pre-events"),
+        streamID(std::numeric_limits<unsigned int>::max()),
+        debugEnabled(true),
+        infoEnabled(true),
+        warningEnabled(true),
+        errorEnabled(true),
+        spWithPhase(new messagedrop::StringProducerWithPhase),
+        spPath(new messagedrop::StringProducerPath),
+        spSinglet(new messagedrop::StringProducerSinglet),
+        moduleNameProducer(spSinglet) {}
+
+  MessageDrop::~MessageDrop() {
+    delete spSinglet.get();
+    delete spPath.get();
+    delete spWithPhase.get();
+  }
+
+  void MessageDrop::setModuleWithPhase(std::string const& name,
+                                       std::string const& label,
+                                       unsigned int moduleID,
+                                       const char* phase) {
+    spWithPhase->set(name, label, moduleID, phase);
+    moduleNameProducer = spWithPhase;
+  }
+
+  void MessageDrop::setPath(const char* type, std::string const& pathname) {
+    spPath->set(type, pathname);
+    moduleNameProducer = spPath;
+  }
+
+  void MessageDrop::setSinglet(const char* sing) {
+    spSinglet->set(sing);
+    moduleNameProducer = spSinglet;
+  }
+
+  std::string MessageDrop::moduleContext() { return moduleNameProducer->theContext(); }
+  void MessageDrop::clear() { setSinglet(""); }
+}  // namespace edm
 
 unsigned char MessageDrop::messageLoggerScribeIsRunning = 0;
diff --git a/FWCore/MessageLogger/src/MessageLogger.cc b/FWCore/MessageLogger/src/MessageLogger.cc
index 33e530b6c9aff..d2cb2f4f7f4dc 100644
--- a/FWCore/MessageLogger/src/MessageLogger.cc
+++ b/FWCore/MessageLogger/src/MessageLogger.cc
@@ -49,98 +49,89 @@
 
 namespace edm {
 
-LogInfo::~LogInfo() {}
-LogWarning::~LogWarning() {}
-LogError::~LogError() {}
-LogAbsolute::~LogAbsolute() {}
-LogSystem::~LogSystem() {}
-LogVerbatim::~LogVerbatim() {}
-LogDebug_::~LogDebug_() {}
-LogTrace_::~LogTrace_() {}
-LogPrint::~LogPrint() {}
-LogProblem::~LogProblem() {}
-LogImportant::~LogImportant() {}
-namespace edmmltest {						// 9/27/10b mf
- LogWarningThatSuppressesLikeLogInfo::~LogWarningThatSuppressesLikeLogInfo() {}
-}
-
-void LogStatistics() {
-  edm::MessageLoggerQ::MLqSUM ( ); // trigger summary info
-}
-
-bool isDebugEnabled() {
-  return ((!edm::MessageDrop::debugAlwaysSuppressed)		// 9/27/10 mf
-         && edm::MessageDrop::instance()->debugEnabled );
-}
-
-bool isInfoEnabled() {
-  return ((!edm::MessageDrop::infoAlwaysSuppressed)		// 9/27/10 mf
-         && edm::MessageDrop::instance()->infoEnabled );
-}
-
-bool isWarningEnabled() {
-  return ((!edm::MessageDrop::warningAlwaysSuppressed)		// 9/27/10 mf
-         && edm::MessageDrop::instance()->warningEnabled );
-}
-
-bool isErrorEnabled() {
-  return edm::MessageDrop::instance()->errorEnabled;                        // 7/6/11 fwyzard
-}
-
-void HaltMessageLogging() {
-  edm::MessageLoggerQ::MLqSHT ( ); // Shut the logger up
-}
-
-void FlushMessageLog() {
-  if (MessageDrop::instance()->messageLoggerScribeIsRunning !=
-  			MLSCRIBE_RUNNING_INDICATOR) return; 	// 6/20/08 mf
-  edm::MessageLoggerQ::MLqFLS ( ); // Flush the message log queue
-}
-
-void clearMessageLog() {					// 11/30/10 mf
-  MessageDrop::instance()->clear();
-}
-
-bool isMessageProcessingSetUp() {				// 6/20/08 mf
-//  std::cerr << "isMessageProcessingSetUp: \n";
-//  std::cerr << "messageLoggerScribeIsRunning = "
-//            << (int)MessageDrop::instance()->messageLoggerScribeIsRunning << "\n";
-  return (MessageDrop::instance()->messageLoggerScribeIsRunning ==
-  			MLSCRIBE_RUNNING_INDICATOR);
-}
-
-void GroupLogStatistics(std::string const & category) {
-  std::string * cat_p = new std::string(category);
-  edm::MessageLoggerQ::MLqGRP (cat_p); // Indicate a group summary category
-  // Note that the scribe will be responsible for deleting cat_p
-}
-
-edm::LogDebug_::LogDebug_( std::string const & id, std::string const & file, int line )
-  : ap( ELdebug,id)
-{
-   *this
-        << " "
-        << stripLeadingDirectoryTree(file)
-        << ":" << line << "\n";
-}
-
-std::string
-edm::LogDebug_::stripLeadingDirectoryTree(const std::string & file) const {
-  std::string::size_type lastSlash = file.find_last_of('/');
-  if (lastSlash == std::string::npos) return file;
-  if (lastSlash == file.size()-1)     return file;
-  return file.substr(lastSlash+1, file.size()-lastSlash-1);
-}
-
-edm::LogTrace_::LogTrace_( std::string const & id )
-  : ap( ELdebug,id,true)
-  {  }
-
-void setStandAloneMessageThreshold(edm::ELseverityLevel const& severity) {
-  edm::MessageLoggerQ::standAloneThreshold(severity);
-}
-void squelchStandAloneMessageCategory(std::string const & category){
-  edm::MessageLoggerQ::squelch(category);
-}
+  LogInfo::~LogInfo() {}
+  LogWarning::~LogWarning() {}
+  LogError::~LogError() {}
+  LogAbsolute::~LogAbsolute() {}
+  LogSystem::~LogSystem() {}
+  LogVerbatim::~LogVerbatim() {}
+  LogDebug_::~LogDebug_() {}
+  LogTrace_::~LogTrace_() {}
+  LogPrint::~LogPrint() {}
+  LogProblem::~LogProblem() {}
+  LogImportant::~LogImportant() {}
+  namespace edmmltest {  // 9/27/10b mf
+    LogWarningThatSuppressesLikeLogInfo::~LogWarningThatSuppressesLikeLogInfo() {}
+  }  // namespace edmmltest
+
+  void LogStatistics() {
+    edm::MessageLoggerQ::MLqSUM();  // trigger summary info
+  }
+
+  bool isDebugEnabled() {
+    return ((!edm::MessageDrop::debugAlwaysSuppressed)  // 9/27/10 mf
+            && edm::MessageDrop::instance()->debugEnabled);
+  }
+
+  bool isInfoEnabled() {
+    return ((!edm::MessageDrop::infoAlwaysSuppressed)  // 9/27/10 mf
+            && edm::MessageDrop::instance()->infoEnabled);
+  }
+
+  bool isWarningEnabled() {
+    return ((!edm::MessageDrop::warningAlwaysSuppressed)  // 9/27/10 mf
+            && edm::MessageDrop::instance()->warningEnabled);
+  }
+
+  bool isErrorEnabled() {
+    return edm::MessageDrop::instance()->errorEnabled;  // 7/6/11 fwyzard
+  }
+
+  void HaltMessageLogging() {
+    edm::MessageLoggerQ::MLqSHT();  // Shut the logger up
+  }
+
+  void FlushMessageLog() {
+    if (MessageDrop::instance()->messageLoggerScribeIsRunning != MLSCRIBE_RUNNING_INDICATOR)
+      return;                       // 6/20/08 mf
+    edm::MessageLoggerQ::MLqFLS();  // Flush the message log queue
+  }
+
+  void clearMessageLog() {  // 11/30/10 mf
+    MessageDrop::instance()->clear();
+  }
+
+  bool isMessageProcessingSetUp() {  // 6/20/08 mf
+                                     //  std::cerr << "isMessageProcessingSetUp: \n";
+                                     //  std::cerr << "messageLoggerScribeIsRunning = "
+    //            << (int)MessageDrop::instance()->messageLoggerScribeIsRunning << "\n";
+    return (MessageDrop::instance()->messageLoggerScribeIsRunning == MLSCRIBE_RUNNING_INDICATOR);
+  }
+
+  void GroupLogStatistics(std::string const& category) {
+    std::string* cat_p = new std::string(category);
+    edm::MessageLoggerQ::MLqGRP(cat_p);  // Indicate a group summary category
+    // Note that the scribe will be responsible for deleting cat_p
+  }
+
+  edm::LogDebug_::LogDebug_(std::string const& id, std::string const& file, int line) : ap(ELdebug, id) {
+    *this << " " << stripLeadingDirectoryTree(file) << ":" << line << "\n";
+  }
+
+  std::string edm::LogDebug_::stripLeadingDirectoryTree(const std::string& file) const {
+    std::string::size_type lastSlash = file.find_last_of('/');
+    if (lastSlash == std::string::npos)
+      return file;
+    if (lastSlash == file.size() - 1)
+      return file;
+    return file.substr(lastSlash + 1, file.size() - lastSlash - 1);
+  }
+
+  edm::LogTrace_::LogTrace_(std::string const& id) : ap(ELdebug, id, true) {}
+
+  void setStandAloneMessageThreshold(edm::ELseverityLevel const& severity) {
+    edm::MessageLoggerQ::standAloneThreshold(severity);
+  }
+  void squelchStandAloneMessageCategory(std::string const& category) { edm::MessageLoggerQ::squelch(category); }
 
 }  // namespace edm
diff --git a/FWCore/MessageLogger/src/MessageLoggerQ.cc b/FWCore/MessageLogger/src/MessageLoggerQ.cc
index 7ea869ccaa256..0be3720e204b8 100644
--- a/FWCore/MessageLogger/src/MessageLoggerQ.cc
+++ b/FWCore/MessageLogger/src/MessageLoggerQ.cc
@@ -16,7 +16,7 @@
 //////////////////////////////////////////////////////////////////////
 
 // Change Log
-// 
+//
 // 1 - 3/9/07 mf
 //	Addition of JOB command, to be used by --jobreport
 // 2 - 6/19/07 mf
@@ -36,7 +36,7 @@
 // 9 - 8/6/09  mf
 //      handshaked() method to support cleaner abstraction of scribes
 // 10 - 8/7/09  mf, crj
-//      major down-functioning:  the actual dealing with buffer of the 
+//      major down-functioning:  the actual dealing with buffer of the
 //      SingleConsumerQ is moved off into MainThreadMLscribe.
 // 11 - 8/10/09 mf, cdj
 //      StandAloneScribe - a class that gets installed as the scribe if
@@ -54,204 +54,149 @@ using namespace edm;
 
 // ChangeLog 11
 namespace {
-   class StandAloneScribe : public edm::service::AbstractMLscribe {
-      
-   public:
-      StandAloneScribe() {}
-            
-      // ---------- member functions ---------------------------
-      
-      void  runCommand(edm::MessageLoggerQ::OpCode  opcode, void * operand) override;
-      
-   private:
-      StandAloneScribe(const StandAloneScribe&) = delete; // stop default
-      
-      const StandAloneScribe& operator=(const StandAloneScribe&) = delete; // stop default
-      
-      // ---------- member data --------------------------------
-      
-   };      
-   
-   void  
-   StandAloneScribe::runCommand(edm::MessageLoggerQ::OpCode  opcode, void * operand) {
-      //even though we don't print, have to clean up memory
-      switch (opcode) {
-         case edm::MessageLoggerQ::LOG_A_MESSAGE: {
-            edm::ErrorObj *  errorobj_p = static_cast<edm::ErrorObj *>(operand);
-	    if ( MessageLoggerQ::ignore				// ChangeLog 13
-	    		(errorobj_p->xid().severity, errorobj_p->xid().id) ) {
-              delete errorobj_p;
-              break;
-	    }
-	    if (errorobj_p->is_verbatim()) {
- 	      std::cerr<< errorobj_p->fullText() << std::endl;
-	    } else {
- 	      std::cerr<< "%MSG" << errorobj_p->xid().severity.getSymbol()
-	               << " " << errorobj_p->xid().id << ": \n"
-            	       << errorobj_p->fullText() << "\n"
-		       << "%MSG"
-		       << std::endl;
-	    }
-            delete errorobj_p;
-            break;
-         }
-         case edm::MessageLoggerQ::JOBMODE:
-         case edm::MessageLoggerQ::GROUP_STATS:
-	 {
-            std::string* string_p = static_cast<std::string*> (operand);
-            delete string_p;
-            break;
-	 }
-         default:
-            break;
+  class StandAloneScribe : public edm::service::AbstractMLscribe {
+  public:
+    StandAloneScribe() {}
+
+    // ---------- member functions ---------------------------
+
+    void runCommand(edm::MessageLoggerQ::OpCode opcode, void *operand) override;
+
+  private:
+    StandAloneScribe(const StandAloneScribe &) = delete;  // stop default
+
+    const StandAloneScribe &operator=(const StandAloneScribe &) = delete;  // stop default
+
+    // ---------- member data --------------------------------
+  };
+
+  void StandAloneScribe::runCommand(edm::MessageLoggerQ::OpCode opcode, void *operand) {
+    //even though we don't print, have to clean up memory
+    switch (opcode) {
+      case edm::MessageLoggerQ::LOG_A_MESSAGE: {
+        edm::ErrorObj *errorobj_p = static_cast<edm::ErrorObj *>(operand);
+        if (MessageLoggerQ::ignore  // ChangeLog 13
+            (errorobj_p->xid().severity, errorobj_p->xid().id)) {
+          delete errorobj_p;
+          break;
+        }
+        if (errorobj_p->is_verbatim()) {
+          std::cerr << errorobj_p->fullText() << std::endl;
+        } else {
+          std::cerr << "%MSG" << errorobj_p->xid().severity.getSymbol() << " " << errorobj_p->xid().id << ": \n"
+                    << errorobj_p->fullText() << "\n"
+                    << "%MSG" << std::endl;
+        }
+        delete errorobj_p;
+        break;
+      }
+      case edm::MessageLoggerQ::JOBMODE:
+      case edm::MessageLoggerQ::GROUP_STATS: {
+        std::string *string_p = static_cast<std::string *>(operand);
+        delete string_p;
+        break;
       }
-   }   
+      default:
+        break;
+    }
+  }
 
   // Changelog 14
-  std::shared_ptr<StandAloneScribe> obtainStandAloneScribePtr() {   
+  std::shared_ptr<StandAloneScribe> obtainStandAloneScribePtr() {
     static auto standAloneScribe_ptr = std::make_shared<StandAloneScribe>();
     return standAloneScribe_ptr;
   }
 
+}  // end of anonymous namespace
 
-} // end of anonymous namespace
-
-std::shared_ptr<edm::service::AbstractMLscribe>  
-  MessageLoggerQ::mlscribe_ptr = obtainStandAloneScribePtr();  
-  				// changeLog 8, 11, 14
-
-MessageLoggerQ::MessageLoggerQ()
-{ }
-
+std::shared_ptr<edm::service::AbstractMLscribe> MessageLoggerQ::mlscribe_ptr = obtainStandAloneScribePtr();
+// changeLog 8, 11, 14
 
-MessageLoggerQ::~MessageLoggerQ()
-{ }
+MessageLoggerQ::MessageLoggerQ() {}
 
+MessageLoggerQ::~MessageLoggerQ() {}
 
-MessageLoggerQ *
-  MessageLoggerQ::instance()
-{
+MessageLoggerQ *MessageLoggerQ::instance() {
   CMS_THREAD_SAFE static MessageLoggerQ queue;
   return &queue;
 }  // MessageLoggerQ::instance()
 
-void
-  MessageLoggerQ::setMLscribe_ptr
-  	(std::shared_ptr<edm::service::AbstractMLscribe> m) // changeLog 8, 14
+void MessageLoggerQ::setMLscribe_ptr(std::shared_ptr<edm::service::AbstractMLscribe> m)  // changeLog 8, 14
 {
-  if (!m) { 
+  if (!m) {
     mlscribe_ptr = obtainStandAloneScribePtr();
   } else {
     mlscribe_ptr = m;
   }
 }  // MessageLoggerQ::setMLscribe_ptr(m)
 
-void
-  MessageLoggerQ::simpleCommand(OpCode opcode, void * operand)// changeLog 8, 10
+void MessageLoggerQ::simpleCommand(OpCode opcode, void *operand)  // changeLog 8, 10
 {
   mlscribe_ptr->runCommand(opcode, operand);
-} // simpleCommand
+}  // simpleCommand
 
-void
-  MessageLoggerQ::handshakedCommand( 
-  	OpCode opcode, 
-	void * operand,
-	std::string const & commandMnemonic )
-{								// Change Log 10
+void MessageLoggerQ::handshakedCommand(OpCode opcode,
+                                       void *operand,
+                                       std::string const &commandMnemonic) {  // Change Log 10
   try {
     mlscribe_ptr->runCommand(opcode, operand);
-  }
-  catch(edm::Exception& ex)
-  {
+  } catch (edm::Exception &ex) {
     ex << "\n The preceding exception was thrown in MessageLoggerScribe\n";
     ex << "and forwarded to the main thread from the Messages thread.";
-    std::cerr << "exception from MessageLoggerQ::" 
-              << commandMnemonic << " - exception what() is \n" 
-    	      << ex.what();
+    std::cerr << "exception from MessageLoggerQ::" << commandMnemonic << " - exception what() is \n" << ex.what();
     // TODO - get the above text into the what itself
-    throw ex;   
-  }  
+    throw ex;
+  }
 }  // handshakedCommand
 
-void
-  MessageLoggerQ::MLqEND()
-{
-  simpleCommand (END_THREAD, (void *)nullptr); 
-}  // MessageLoggerQ::END()
+void MessageLoggerQ::MLqEND() { simpleCommand(END_THREAD, (void *)nullptr); }  // MessageLoggerQ::END()
 
-void
-  MessageLoggerQ::MLqSHT()
-{
-  simpleCommand (SHUT_UP, (void *)nullptr); 
-}  // MessageLoggerQ::SHT()
+void MessageLoggerQ::MLqSHT() { simpleCommand(SHUT_UP, (void *)nullptr); }  // MessageLoggerQ::SHT()
 
-void
-  MessageLoggerQ::MLqLOG( ErrorObj * p )
-{
-  simpleCommand (LOG_A_MESSAGE, static_cast<void *>(p)); 
+void MessageLoggerQ::MLqLOG(ErrorObj *p) {
+  simpleCommand(LOG_A_MESSAGE, static_cast<void *>(p));
 }  // MessageLoggerQ::LOG()
 
+void MessageLoggerQ::MLqCFG(ParameterSet *p) { handshakedCommand(CONFIGURE, p, "CFG"); }  // MessageLoggerQ::CFG()
 
-void
-  MessageLoggerQ::MLqCFG( ParameterSet * p )
-{
-  handshakedCommand(CONFIGURE, p, "CFG" );
-}  // MessageLoggerQ::CFG()
-
-void
-  MessageLoggerQ::MLqSUM( )
-{
-  simpleCommand (SUMMARIZE, nullptr); 
-}  // MessageLoggerQ::SUM()
+void MessageLoggerQ::MLqSUM() { simpleCommand(SUMMARIZE, nullptr); }  // MessageLoggerQ::SUM()
 
-void
-  MessageLoggerQ::MLqMOD( std::string * jm )
-{
-  simpleCommand (JOBMODE, static_cast<void *>(jm)); 
+void MessageLoggerQ::MLqMOD(std::string *jm) {
+  simpleCommand(JOBMODE, static_cast<void *>(jm));
 }  // MessageLoggerQ::MOD()
 
-
-void
-  MessageLoggerQ::MLqFLS(  )			// Change Log 5
+void MessageLoggerQ::MLqFLS()  // Change Log 5
 {
   // The ConfigurationHandshake, developed for synchronous CFG, contains a
   // place to convey exception information.  FLS does not need this, nor does
-  // it need the parameter set, but we are reusing ConfigurationHandshake 
+  // it need the parameter set, but we are reusing ConfigurationHandshake
   // rather than reinventing the mechanism.
-  handshakedCommand(FLUSH_LOG_Q, nullptr, "FLS" );
+  handshakedCommand(FLUSH_LOG_Q, nullptr, "FLS");
 }  // MessageLoggerQ::FLS()
 
-void
-  MessageLoggerQ::MLqGRP( std::string * cat_p )  	// Change Log 6
+void MessageLoggerQ::MLqGRP(std::string *cat_p)  // Change Log 6
 {
-  simpleCommand (GROUP_STATS, static_cast<void *>(cat_p)); 
+  simpleCommand(GROUP_STATS, static_cast<void *>(cat_p));
 }  // MessageLoggerQ::GRP()
 
-void
-  MessageLoggerQ::MLqJRS( std::map<std::string, double> * sum_p )
-{
-  handshakedCommand(FJR_SUMMARY, sum_p, "JRS" );
+void MessageLoggerQ::MLqJRS(std::map<std::string, double> *sum_p) {
+  handshakedCommand(FJR_SUMMARY, sum_p, "JRS");
 }  // MessageLoggerQ::CFG()
 
-
-bool
-  MessageLoggerQ::handshaked(MessageLoggerQ::OpCode const & op)  // changeLog 9
+bool MessageLoggerQ::handshaked(MessageLoggerQ::OpCode const &op)  // changeLog 9
 {
-   return ( (op == CONFIGURE) || (op == FLUSH_LOG_Q) || (op == FJR_SUMMARY) );
+  return ((op == CONFIGURE) || (op == FLUSH_LOG_Q) || (op == FJR_SUMMARY));
 }  // MessageLoggerQ::handshaked(op)
 
 // change Log 13:
-edm::ELseverityLevel MessageLoggerQ::threshold (edm::ELseverityLevel::ELsev_warning);
+edm::ELseverityLevel MessageLoggerQ::threshold(edm::ELseverityLevel::ELsev_warning);
 std::set<std::string> MessageLoggerQ::squelchSet;
-void MessageLoggerQ::standAloneThreshold(edm::ELseverityLevel const& severity) {
-  threshold = severity;
-}
-void MessageLoggerQ::squelch(std::string const & category) {
-  squelchSet.insert(category);  
-}
-bool MessageLoggerQ::ignore ( edm::ELseverityLevel const & severity, 
-  			       std::string const & category ) {
-  if ( severity < threshold ) return true;
-  if ( squelchSet.count(category) > 0 ) return true;
+void MessageLoggerQ::standAloneThreshold(edm::ELseverityLevel const &severity) { threshold = severity; }
+void MessageLoggerQ::squelch(std::string const &category) { squelchSet.insert(category); }
+bool MessageLoggerQ::ignore(edm::ELseverityLevel const &severity, std::string const &category) {
+  if (severity < threshold)
+    return true;
+  if (squelchSet.count(category) > 0)
+    return true;
   return false;
-}			       
+}
diff --git a/FWCore/MessageLogger/src/MessageSender.cc b/FWCore/MessageLogger/src/MessageSender.cc
index fd4eb8a5caa88..bdd2dc8f3e053 100644
--- a/FWCore/MessageLogger/src/MessageSender.cc
+++ b/FWCore/MessageLogger/src/MessageSender.cc
@@ -13,7 +13,6 @@
 #include <functional>
 #include "tbb/concurrent_unordered_map.h"
 
-
 #define TRACE_DROP
 #ifdef TRACE_DROP
 #include <iostream>
@@ -23,27 +22,26 @@
 //
 //  1  mf 8/25/08	keeping the error summary information for
 //			LoggedErrorsSummary()
-//			
+//
 // 2  mf 11/2/10	Use new moduleContext method of MessageDrop:
 //			see MessageServer/src/MessageLogger.cc change 17.
-//			
-
+//
 
 using namespace edm;
 
-namespace  {
+namespace {
   //Helper class used as 'key' to the thread safe map storing the
   // per event log error and log warning messages
   struct ErrorSummaryMapKey {
-    std::string     category;
-    std::string     module;
+    std::string category;
+    std::string module;
     ELseverityLevel severity;
 
     bool operator<(ErrorSummaryMapKey const& iOther) const {
-      int comp =severity.getLevel()-iOther.severity.getLevel();
-      if(0==comp) {
+      int comp = severity.getLevel() - iOther.severity.getLevel();
+      if (0 == comp) {
         comp = category.compare(iOther.category);
-        if(comp == 0) {
+        if (comp == 0) {
           comp = module.compare(iOther.module);
         }
       }
@@ -51,104 +49,94 @@ namespace  {
     }
 
     bool operator==(ErrorSummaryMapKey const& iOther) const {
-      return ((iOther.category==category) and
-              (iOther.module==module) and
-              (severity.getLevel() ==iOther.severity.getLevel()));
+      return ((iOther.category == category) and (iOther.module == module) and
+              (severity.getLevel() == iOther.severity.getLevel()));
     }
     size_t smallHash() const {
       std::hash<std::string> h;
 
-      return h( category+module+severity.getSymbol());
+      return h(category + module + severity.getSymbol());
     }
 
     struct key_hash {
-      std::size_t operator()(ErrorSummaryMapKey const& iKey) const{
-        return iKey.smallHash();
-      }
+      std::size_t operator()(ErrorSummaryMapKey const& iKey) const { return iKey.smallHash(); }
     };
   };
-  
+
   class AtomicUnsignedInt {
   public:
     AtomicUnsignedInt() : value_(0) {}
     AtomicUnsignedInt(AtomicUnsignedInt const& r) : value_(r.value_.load(std::memory_order_acquire)) {}
     std::atomic<unsigned int>& value() { return value_; }
     std::atomic<unsigned int> const& value() const { return value_; }
+
   private:
     std::atomic<unsigned int> value_;
   };
 
-}
+}  // namespace
 
 CMS_THREAD_SAFE static std::atomic<bool> errorSummaryIsBeingKept{false};
 //Each item in the vector is reserved for a different Stream
-CMS_THREAD_SAFE static std::vector<tbb::concurrent_unordered_map<ErrorSummaryMapKey, AtomicUnsignedInt,ErrorSummaryMapKey::key_hash>> errorSummaryMaps;
+CMS_THREAD_SAFE static std::vector<
+    tbb::concurrent_unordered_map<ErrorSummaryMapKey, AtomicUnsignedInt, ErrorSummaryMapKey::key_hash>>
+    errorSummaryMaps;
 
-MessageSender::MessageSender( ELseverityLevel const & sev, 
-			      ELstring const & id,
-			      bool verbatim, bool suppressed )
-: errorobj_p( suppressed ? nullptr : new ErrorObj(sev,id,verbatim), ErrorObjDeleter())
-{
+MessageSender::MessageSender(ELseverityLevel const& sev, ELstring const& id, bool verbatim, bool suppressed)
+    : errorobj_p(suppressed ? nullptr : new ErrorObj(sev, id, verbatim), ErrorObjDeleter()) {
   //std::cout << "MessageSender ctor; new ErrorObj at: " << errorobj_p << '\n';
 }
 
-
 // This destructor must not be permitted to throw. A
 // boost::thread_resoruce_error is thrown at static destruction time,
 // if the MessageLogger library is loaded -- even if it is not used.
-void MessageSender::ErrorObjDeleter::operator()(ErrorObj * errorObjPtr) {
+void MessageSender::ErrorObjDeleter::operator()(ErrorObj* errorObjPtr) {
   if (errorObjPtr == nullptr) {
     return;
   }
-  try 
-    {
-      //std::cout << "MessageSender dtor; ErrorObj at: " << errorobj_p << '\n';
-
-      // surrender ownership of our ErrorObj, transferring ownership
-      // (via the intermediate MessageLoggerQ) to the MessageLoggerScribe
-      // that will (a) route the message text to its destination(s)
-      // and will then (b) dispose of the ErrorObj
-      
-      MessageDrop * drop = MessageDrop::instance();
-      if (drop) {
-	errorObjPtr->setModule(drop->moduleContext());		// change log 
-	errorObjPtr->setContext(drop->runEvent);
-      } 
+  try {
+    //std::cout << "MessageSender dtor; ErrorObj at: " << errorobj_p << '\n';
+
+    // surrender ownership of our ErrorObj, transferring ownership
+    // (via the intermediate MessageLoggerQ) to the MessageLoggerScribe
+    // that will (a) route the message text to its destination(s)
+    // and will then (b) dispose of the ErrorObj
+
+    MessageDrop* drop = MessageDrop::instance();
+    if (drop) {
+      errorObjPtr->setModule(drop->moduleContext());  // change log
+      errorObjPtr->setContext(drop->runEvent);
+    }
 #ifdef TRACE_DROP
-      if (!drop) std::cerr << "MessageSender::~MessageSender() - Null drop pointer \n";
+    if (!drop)
+      std::cerr << "MessageSender::~MessageSender() - Null drop pointer \n";
 #endif
-								// change log 1
-      if ( errorSummaryIsBeingKept.load(std::memory_order_acquire) &&
-           errorObjPtr->xid().severity >= ELwarning && drop &&
-          drop->streamID < std::numeric_limits<unsigned int>::max())
-      {
-        auto& errorSummaryMap =errorSummaryMaps[drop->streamID];
-
-        ELextendedID const & xid = errorObjPtr->xid();
-        ErrorSummaryMapKey key {xid.id, xid.module, xid.severity};
-        auto i = errorSummaryMap.find(key);
-        if (i != errorSummaryMap.end()) {
-          i->second.value().fetch_add(1,std::memory_order_acq_rel);  // same as ++errorSummaryMap[key]
-        } else {
-          errorSummaryMap[key].value().store(1,std::memory_order_release);
-        }
+    // change log 1
+    if (errorSummaryIsBeingKept.load(std::memory_order_acquire) && errorObjPtr->xid().severity >= ELwarning && drop &&
+        drop->streamID < std::numeric_limits<unsigned int>::max()) {
+      auto& errorSummaryMap = errorSummaryMaps[drop->streamID];
+
+      ELextendedID const& xid = errorObjPtr->xid();
+      ErrorSummaryMapKey key{xid.id, xid.module, xid.severity};
+      auto i = errorSummaryMap.find(key);
+      if (i != errorSummaryMap.end()) {
+        i->second.value().fetch_add(1, std::memory_order_acq_rel);  // same as ++errorSummaryMap[key]
+      } else {
+        errorSummaryMap[key].value().store(1, std::memory_order_release);
       }
-      
-      MessageLoggerQ::MLqLOG(errorObjPtr);
-    }
-  catch ( ... )
-    {
-      // nothing to do
-      
-      // for test that removal of thread-involved static works, 
-      // simply throw here, then run in trivial_main in totalview
-      // and Next or Step so that the exception would be detected.
-      // That test has been done 12/14/07.
     }
+
+    MessageLoggerQ::MLqLOG(errorObjPtr);
+  } catch (...) {
+    // nothing to do
+
+    // for test that removal of thread-involved static works,
+    // simply throw here, then run in trivial_main in totalview
+    // and Next or Step so that the exception would be detected.
+    // That test has been done 12/14/07.
+  }
 }
-MessageSender::~MessageSender()
-{
-}
+MessageSender::~MessageSender() {}
 
 //The following functions are declared here rather than in
 // LoggedErrorsSummary.cc because only  MessageSender and these
@@ -157,66 +145,60 @@ MessageSender::~MessageSender()
 // statics can be file scoped rather than class scoped and therefore
 // better encapsulated.
 namespace edm {
-  
+
   bool EnableLoggedErrorsSummary() {
-    bool ret = errorSummaryIsBeingKept.exchange(true,std::memory_order_acq_rel);
+    bool ret = errorSummaryIsBeingKept.exchange(true, std::memory_order_acq_rel);
     return ret;
   }
-  
-  bool DisableLoggedErrorsSummary(){
-    bool ret = errorSummaryIsBeingKept.exchange(false,std::memory_order_acq_rel);
+
+  bool DisableLoggedErrorsSummary() {
+    bool ret = errorSummaryIsBeingKept.exchange(false, std::memory_order_acq_rel);
     return ret;
   }
-  
+
   bool FreshErrorsExist(unsigned int iStreamID) {
-    assert(iStreamID<errorSummaryMaps.size());
-    return  !errorSummaryMaps[iStreamID].empty();
+    assert(iStreamID < errorSummaryMaps.size());
+    return !errorSummaryMaps[iStreamID].empty();
   }
-  
+
   std::vector<ErrorSummaryEntry> LoggedErrorsSummary(unsigned int iStreamID) {
-    assert(iStreamID<errorSummaryMaps.size());
-    auto const& errorSummaryMap =errorSummaryMaps[iStreamID];
+    assert(iStreamID < errorSummaryMaps.size());
+    auto const& errorSummaryMap = errorSummaryMaps[iStreamID];
     std::vector<ErrorSummaryEntry> v;
     auto end = errorSummaryMap.end();
-    for (auto i = errorSummaryMap.begin();
-         i != end; ++i) {
+    for (auto i = errorSummaryMap.begin(); i != end; ++i) {
       auto const& key = i->first;
-      ErrorSummaryEntry e{key.category,key.module,key.severity};
+      ErrorSummaryEntry e{key.category, key.module, key.severity};
 
       e.count = i->second.value().load(std::memory_order_acquire);
       v.push_back(e);
     }
-    std::sort(v.begin(),v.end());
+    std::sort(v.begin(), v.end());
     return v;
   }
-  
+
   void clearLoggedErrorsSummary(unsigned int iStreamID) {
-    assert(iStreamID<errorSummaryMaps.size());
+    assert(iStreamID < errorSummaryMaps.size());
     errorSummaryMaps[iStreamID].clear();
   }
-  
-  void setMaxLoggedErrorsSummaryIndicies(unsigned int iMax) {
-    errorSummaryMaps.resize(iMax);
-  }
 
-  
-  std::vector<ErrorSummaryEntry> LoggedErrorsOnlySummary(unsigned int iStreamID) {    //  ChangeLog 2
+  void setMaxLoggedErrorsSummaryIndicies(unsigned int iMax) { errorSummaryMaps.resize(iMax); }
+
+  std::vector<ErrorSummaryEntry> LoggedErrorsOnlySummary(unsigned int iStreamID) {  //  ChangeLog 2
     std::vector<ErrorSummaryEntry> v;
     assert(iStreamID < errorSummaryMaps.size());
-    auto const& errorSummaryMap =errorSummaryMaps[iStreamID];
+    auto const& errorSummaryMap = errorSummaryMaps[iStreamID];
     auto end = errorSummaryMap.end();
-    for (auto i = errorSummaryMap.begin();
-         i != end; ++i) {
+    for (auto i = errorSummaryMap.begin(); i != end; ++i) {
       auto const& key = i->first;
       if (key.severity >= edm::ELerror) {
-        ErrorSummaryEntry e{key.category,key.module,key.severity};
+        ErrorSummaryEntry e{key.category, key.module, key.severity};
         e.count = i->second.value().load(std::memory_order_acquire);
         v.push_back(e);
       }
     }
-    std::sort(v.begin(),v.end());
+    std::sort(v.begin(), v.end());
     return v;
   }
-  
-} // end namespace edm
 
+}  // end namespace edm
diff --git a/FWCore/MessageLogger/src/SilentMLscribe.cc b/FWCore/MessageLogger/src/SilentMLscribe.cc
index 141bb1fc83d67..614edd96f6079 100644
--- a/FWCore/MessageLogger/src/SilentMLscribe.cc
+++ b/FWCore/MessageLogger/src/SilentMLscribe.cc
@@ -2,7 +2,7 @@
 //
 // Package:     MessageLogger
 // Class  :     SilentMLscribe
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -17,74 +17,68 @@
 #include "FWCore/MessageLogger/interface/ErrorObj.h"
 
 namespace edm {
-   namespace service {
+  namespace service {
 
-//
-// constants, enums and typedefs
-//
+    //
+    // constants, enums and typedefs
+    //
 
-//
-// static data member definitions
-//
+    //
+    // static data member definitions
+    //
 
-//
-// constructors and destructor
-//
-      SilentMLscribe::SilentMLscribe()
-      {
-      }
-      
-// SilentMLscribe::SilentMLscribe(const SilentMLscribe& rhs)
-// {
-//    // do actual copying here;
-// }
+    //
+    // constructors and destructor
+    //
+    SilentMLscribe::SilentMLscribe() {}
 
-      SilentMLscribe::~SilentMLscribe()
-      {
-      }
+    // SilentMLscribe::SilentMLscribe(const SilentMLscribe& rhs)
+    // {
+    //    // do actual copying here;
+    // }
 
-//
-// assignment operators
-//
-// const SilentMLscribe& SilentMLscribe::operator=(const SilentMLscribe& rhs)
-// {
-//   //An exception safe implementation is
-//   SilentMLscribe temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
+    SilentMLscribe::~SilentMLscribe() {}
 
-//
-// member functions
-//
-      void  
-      SilentMLscribe::runCommand(MessageLoggerQ::OpCode  opcode, void * operand) {
-         //even though we don't print, have to clean up memory
-         switch (opcode) {
-            case MessageLoggerQ::LOG_A_MESSAGE: {
-               ErrorObj *  errorobj_p = static_cast<ErrorObj *>(operand);
-               delete errorobj_p;
-               break;
-            }
-            case MessageLoggerQ::JOBMODE:
-            case MessageLoggerQ::GROUP_STATS:
-	    {
-               std::string* string_p = static_cast<std::string*> (operand);
-               delete string_p;
-               break;
-	    }
-            default:
-               break;
-         }
+    //
+    // assignment operators
+    //
+    // const SilentMLscribe& SilentMLscribe::operator=(const SilentMLscribe& rhs)
+    // {
+    //   //An exception safe implementation is
+    //   SilentMLscribe temp(rhs);
+    //   swap(rhs);
+    //
+    //   return *this;
+    // }
+
+    //
+    // member functions
+    //
+    void SilentMLscribe::runCommand(MessageLoggerQ::OpCode opcode, void* operand) {
+      //even though we don't print, have to clean up memory
+      switch (opcode) {
+        case MessageLoggerQ::LOG_A_MESSAGE: {
+          ErrorObj* errorobj_p = static_cast<ErrorObj*>(operand);
+          delete errorobj_p;
+          break;
+        }
+        case MessageLoggerQ::JOBMODE:
+        case MessageLoggerQ::GROUP_STATS: {
+          std::string* string_p = static_cast<std::string*>(operand);
+          delete string_p;
+          break;
+        }
+        default:
+          break;
       }
+    }
 
-//
-// const member functions
-//
+    //
+    // const member functions
+    //
 
-//
-// static member functions
-//
-   }
-}
+    //
+    // static member functions
+    //
+  }  // namespace service
+}  // namespace edm
diff --git a/FWCore/MessageService/bin/Standalone.cpp b/FWCore/MessageService/bin/Standalone.cpp
index f527bef2adc3e..952403e346b11 100644
--- a/FWCore/MessageService/bin/Standalone.cpp
+++ b/FWCore/MessageService/bin/Standalone.cpp
@@ -7,7 +7,7 @@
    has provided the main program instead of supplying a module
    for cmsRun to call on.
 
-----------------------------------------------------------------------*/  
+----------------------------------------------------------------------*/
 
 #include <exception>
 #include <iostream>
@@ -26,112 +26,95 @@
 
 // -----------------------------------------------
 
-std::string indirectWarn( int /*num*/ )
-{
-//  std::cout << "  Returning the string Emit Warning level message " << num << std::endl; 
-    return std::string("\t\tEmit Warning level message "); 
+std::string indirectWarn(int /*num*/) {
+  //  std::cout << "  Returning the string Emit Warning level message " << num << std::endl;
+  return std::string("\t\tEmit Warning level message ");
 }
 
-
-std::string indirectInfo( int /*num*/ )
-{
-//  std::cout << "  Returning the string Emit Info level message " << num << std::endl; 
-    return std::string("\t\tEmit Info level message "); 
+std::string indirectInfo(int /*num*/) {
+  //  std::cout << "  Returning the string Emit Info level message " << num << std::endl;
+  return std::string("\t\tEmit Info level message ");
 }
 
-void DoMyStuff( )
-{
-// Issue several types of logger messages.  This function could
-// be substantially more complex. This example is about as simple
-// as can be.
+void DoMyStuff() {
+  // Issue several types of logger messages.  This function could
+  // be substantially more complex. This example is about as simple
+  // as can be.
 
   double d = 3.14159265357989;
-  edm::LogWarning("cat_A")   << "Test of std::setprecision(p):"
-  			     << " Pi with precision 12 is " 
-  			     << std::setprecision(12) << d;
-
-  for( int i=0; i<25; ++i) {
-//  edm::LogInfo("cat_B")    << "\t\tEmit Info level message " << i+1;
-    edm::LogInfo("cat_B")    << indirectInfo(i+1) << i+1;
-//  edm::LogWarning("cat_C") << "\t\tEmit Warning level message " << i+1;
-    edm::LogWarning("cat_C") << indirectWarn(i+1) << i+1;
+  edm::LogWarning("cat_A") << "Test of std::setprecision(p):"
+                           << " Pi with precision 12 is " << std::setprecision(12) << d;
+
+  for (int i = 0; i < 25; ++i) {
+    //  edm::LogInfo("cat_B")    << "\t\tEmit Info level message " << i+1;
+    edm::LogInfo("cat_B") << indirectInfo(i + 1) << i + 1;
+    //  edm::LogWarning("cat_C") << "\t\tEmit Warning level message " << i+1;
+    edm::LogWarning("cat_C") << indirectWarn(i + 1) << i + 1;
   }
-}  
+}
 
 int main(int, char* argv[]) {
-
   std::string const kProgramName = argv[0];
 
   int rc = 0;
   try {
+    // A.  Instantiate a plug-in manager first.
+    edm::AssertHandler ah;
 
-// A.  Instantiate a plug-in manager first.
-   edm::AssertHandler ah;
-
-// B.  Load the message service plug-in.  Forget this and bad things happen!
-//     In particular, the job hangs as soon as the output buffer fills up.
-//     That's because, without the message service, there is no mechanism for
-//     emptying the buffers.
+    // B.  Load the message service plug-in.  Forget this and bad things happen!
+    //     In particular, the job hangs as soon as the output buffer fills up.
+    //     That's because, without the message service, there is no mechanism for
+    //     emptying the buffers.
     std::shared_ptr<edm::Presence> theMessageServicePresence;
-    theMessageServicePresence = std::shared_ptr<edm::Presence>(edm::PresenceFactory::get()->
-      makePresence("MessageServicePresence").release());
+    theMessageServicePresence =
+        std::shared_ptr<edm::Presence>(edm::PresenceFactory::get()->makePresence("MessageServicePresence").release());
 
-// C.  Manufacture a configuration and establish it.
+    // C.  Manufacture a configuration and establish it.
     std::string config =
-      "process x = {"
-	"service = MessageLogger {"
-	  "untracked vstring destinations = {'infos.mlog','warnings.mlog'}"
-	  "untracked PSet infos = {"
-	    "untracked string threshold = 'INFO'"
-	    "untracked PSet default = {untracked int32 limit = 1000000}"
-	    "untracked PSet FwkJob = {untracked int32 limit = 0}"
-	  "}"
-	  "untracked PSet warnings = {"
-	    "untracked string threshold = 'WARNING'"
-	    "untracked PSet default = {untracked int32 limit = 1000000}"
-	  "}"
-	  "untracked vstring fwkJobReports = {'FrameworkJobReport.xml'}"
-	  "untracked vstring categories = {'FwkJob'}"
-	  "untracked PSet FrameworkJobReport.xml = {"
-	    "untracked PSet default = {untracked int32 limit = 0}"
-	    "untracked PSet FwkJob = {untracked int32 limit = 10000000}"
-	  "}"
-	"}"
-	"service = JobReportService{}"
-	"service = SiteLocalConfigService{}"
-      "}";
-
-// D.  Create the services.
+        "process x = {"
+        "service = MessageLogger {"
+        "untracked vstring destinations = {'infos.mlog','warnings.mlog'}"
+        "untracked PSet infos = {"
+        "untracked string threshold = 'INFO'"
+        "untracked PSet default = {untracked int32 limit = 1000000}"
+        "untracked PSet FwkJob = {untracked int32 limit = 0}"
+        "}"
+        "untracked PSet warnings = {"
+        "untracked string threshold = 'WARNING'"
+        "untracked PSet default = {untracked int32 limit = 1000000}"
+        "}"
+        "untracked vstring fwkJobReports = {'FrameworkJobReport.xml'}"
+        "untracked vstring categories = {'FwkJob'}"
+        "untracked PSet FrameworkJobReport.xml = {"
+        "untracked PSet default = {untracked int32 limit = 0}"
+        "untracked PSet FwkJob = {untracked int32 limit = 10000000}"
+        "}"
+        "}"
+        "service = JobReportService{}"
+        "service = SiteLocalConfigService{}"
+        "}";
+
+    // D.  Create the services.
     std::unique_ptr<edm::ParameterSet> params;
     edm::makeParameterSets(config, params);
     edm::ServiceToken tempToken(edm::ServiceRegistry::createServicesFromConfig(std::move(params)));
-    
 
-// E.  Make the services available.
+    // E.  Make the services available.
     edm::ServiceRegistry::Operate operate(tempToken);
 
-//  Generate a bunch of messages.
-    DoMyStuff( );
+    //  Generate a bunch of messages.
+    DoMyStuff();
   }
 
-//  Deal with any exceptions that may have been thrown.
+  //  Deal with any exceptions that may have been thrown.
   catch (cms::Exception& e) {
-    std::cout << "cms::Exception caught in "
-                                << kProgramName
-                                << "\n"
-                                << e.explainSelf();
+    std::cout << "cms::Exception caught in " << kProgramName << "\n" << e.explainSelf();
     rc = 1;
-  }
-  catch (std::exception& e) {
-    std::cout << "Standard library exception caught in "
-                                << kProgramName
-                                << "\n"
-                                << e.what();
+  } catch (std::exception& e) {
+    std::cout << "Standard library exception caught in " << kProgramName << "\n" << e.what();
     rc = 1;
-  }
-  catch (...) {
-    std::cout << "Unknown exception caught in "
-                                << kProgramName;
+  } catch (...) {
+    std::cout << "Unknown exception caught in " << kProgramName;
     rc = 2;
   }
 
diff --git a/FWCore/MessageService/interface/ELadministrator.h b/FWCore/MessageService/interface/ELadministrator.h
index b43426bd12850..4a54c55052726 100644
--- a/FWCore/MessageService/interface/ELadministrator.h
+++ b/FWCore/MessageService/interface/ELadministrator.h
@@ -1,7 +1,6 @@
 #ifndef MessageService_ELadministrator_h
 #define MessageService_ELadministrator_h
 
-
 // ----------------------------------------------------------------------
 //
 // ELadminstrator.h  provides the singleton class that the framework uses to
@@ -41,8 +40,8 @@
 // 6/14/00 web	Declare classes before granting friendship.
 // 6/4/01  mf	Grant friedship to ELtsErrorLog
 // 3/6/02  mf   Items for recovering handles to attached destinations:
-//		the attachedDestinations map, 
-//		an additional signature for attach(), 
+//		the attachedDestinations map,
+//		an additional signature for attach(),
 //		and getELdestControl() method
 // 3/17/04 mf	exitThreshold and setExitThreshold
 // 1/10/06 mf	finish
@@ -58,97 +57,87 @@
 
 #include <memory>
 
-namespace edm {       
-namespace service {       
-
-
-// ----------------------------------------------------------------------
-// Prerequisite classes:
-// ----------------------------------------------------------------------
-
-class ELdestination;
-class ELcout;
-class MessageLoggerScribe;
-
-
-// ----------------------------------------------------------------------
-// ELadministrator:
-// ----------------------------------------------------------------------
-
-class ELadministrator  {	// *** Destructable Singleton Pattern ***
-
-  friend class MessageLoggerScribe;	// proper ELadministrator cleanup
-  friend class ThreadSafeLogMessageLoggerScribe;	// proper ELadministrator cleanup
-  friend class ELcout;			// ELcout behavior
-
-// *** Error Logger Functionality ***
-
-public:
-  
-  ~ELadministrator();
-
-
-  //Replaces ErrorLog which is no longer needed
-  void log(edm::ErrorObj & msg);
-  
-  // ---  furnish/recall destinations:
-  //
-  std::shared_ptr<ELdestination> attach( std::shared_ptr<ELdestination> sink );
-
-  // ---  handle severity information:
-  //
-  ELseverityLevel  checkSeverity();
-  int severityCount( const ELseverityLevel & sev ) const;
-  int severityCount( const ELseverityLevel & from,
-	 	     const ELseverityLevel & to ) const;
-  void resetSeverityCount( const ELseverityLevel & sev );
-  void resetSeverityCount( const ELseverityLevel & from,
-	 	           const ELseverityLevel & to );
-  void resetSeverityCount();			// reset all
-
-  // ---  apply the following actions to all attached destinations:
-  //
-  void setThresholds( const ELseverityLevel & sev );
-  void setLimits    ( const ELstring        & id,  int limit    );
-  void setLimits    ( const ELseverityLevel & sev, int limit    );
-  void setIntervals ( const ELstring        & id,  int interval );
-  void setIntervals ( const ELseverityLevel & sev, int interval );
-  void setTimespans ( const ELstring        & id,  int seconds  );
-  void setTimespans ( const ELseverityLevel & sev, int seconds  );
-  void wipe();
-  void finish();
-  
-protected:
-  // ---  member data accessors:
-  //
-  const ELseverityLevel       & abortThreshold() const;
-  const ELseverityLevel       &  exitThreshold() const;
-  const ELseverityLevel       & highSeverity() const;
-  int                           severityCounts( int lev ) const;
-
-protected:
-  // ---  traditional birth/death, but disallowed to users:
-  //
-  ELadministrator();
-
-private:
-
-  // ---  traditional member data:
-  //
-  std::list<edm::propagate_const<std::shared_ptr<ELdestination>>> sinks_;		
-  ELseverityLevel            highSeverity_;
-  int                        severityCounts_[ ELseverityLevel::nLevels ];
-
-  std::map<ELstring, edm::propagate_const<std::shared_ptr<ELdestination>>> attachedDestinations_;
-
-};  // ELadministrator
-
-
-// ----------------------------------------------------------------------
-
-
-}        // end of namespace service
-}        // end of namespace edm
-
+namespace edm {
+  namespace service {
+
+    // ----------------------------------------------------------------------
+    // Prerequisite classes:
+    // ----------------------------------------------------------------------
+
+    class ELdestination;
+    class ELcout;
+    class MessageLoggerScribe;
+
+    // ----------------------------------------------------------------------
+    // ELadministrator:
+    // ----------------------------------------------------------------------
+
+    class ELadministrator {  // *** Destructable Singleton Pattern ***
+
+      friend class MessageLoggerScribe;               // proper ELadministrator cleanup
+      friend class ThreadSafeLogMessageLoggerScribe;  // proper ELadministrator cleanup
+      friend class ELcout;                            // ELcout behavior
+
+      // *** Error Logger Functionality ***
+
+    public:
+      ~ELadministrator();
+
+      //Replaces ErrorLog which is no longer needed
+      void log(edm::ErrorObj& msg);
+
+      // ---  furnish/recall destinations:
+      //
+      std::shared_ptr<ELdestination> attach(std::shared_ptr<ELdestination> sink);
+
+      // ---  handle severity information:
+      //
+      ELseverityLevel checkSeverity();
+      int severityCount(const ELseverityLevel& sev) const;
+      int severityCount(const ELseverityLevel& from, const ELseverityLevel& to) const;
+      void resetSeverityCount(const ELseverityLevel& sev);
+      void resetSeverityCount(const ELseverityLevel& from, const ELseverityLevel& to);
+      void resetSeverityCount();  // reset all
+
+      // ---  apply the following actions to all attached destinations:
+      //
+      void setThresholds(const ELseverityLevel& sev);
+      void setLimits(const ELstring& id, int limit);
+      void setLimits(const ELseverityLevel& sev, int limit);
+      void setIntervals(const ELstring& id, int interval);
+      void setIntervals(const ELseverityLevel& sev, int interval);
+      void setTimespans(const ELstring& id, int seconds);
+      void setTimespans(const ELseverityLevel& sev, int seconds);
+      void wipe();
+      void finish();
+
+    protected:
+      // ---  member data accessors:
+      //
+      const ELseverityLevel& abortThreshold() const;
+      const ELseverityLevel& exitThreshold() const;
+      const ELseverityLevel& highSeverity() const;
+      int severityCounts(int lev) const;
+
+    protected:
+      // ---  traditional birth/death, but disallowed to users:
+      //
+      ELadministrator();
+
+    private:
+      // ---  traditional member data:
+      //
+      std::list<edm::propagate_const<std::shared_ptr<ELdestination>>> sinks_;
+      ELseverityLevel highSeverity_;
+      int severityCounts_[ELseverityLevel::nLevels];
+
+      std::map<ELstring, edm::propagate_const<std::shared_ptr<ELdestination>>> attachedDestinations_;
+
+    };  // ELadministrator
+
+    // ----------------------------------------------------------------------
+
+  }  // end of namespace service
+}  // end of namespace edm
 
 #endif  // MessageService_ELadministrator_h
diff --git a/FWCore/MessageService/interface/ELdestination.h b/FWCore/MessageService/interface/ELdestination.h
index d4371484ac21a..48b0b540aa07c 100644
--- a/FWCore/MessageService/interface/ELdestination.h
+++ b/FWCore/MessageService/interface/ELdestination.h
@@ -1,7 +1,6 @@
 #ifndef FWCore_MessageService_ELdestination_h
 #define FWCore_MessageService_ELdestination_h
 
-
 // ----------------------------------------------------------------------
 //
 // ELdestination   is a virtual class defining the interface to a
@@ -19,11 +18,11 @@
 // 6/14/00 web	Declare classes before granting friendship.
 // 10/4/00 mf   Add excludeModule
 // 1/15/01 mf	setLineLength()
-// 2/13/01 mf	fix written by pc to accomodate NT problem with 
+// 2/13/01 mf	fix written by pc to accomodate NT problem with
 //		static init { $001$ }.  Corresponding fix is in .cc file.
 // 3/13/01 mf	statisticsMap()
 // 04/04/01 mf  add ignoreMOdule and respondToModule
-// 6/23/03 mf   changeFile() and flush() 
+// 6/23/03 mf   changeFile() and flush()
 // 1/10/06 mf	finish
 // 6/19/08 mf   summaryForJobReport()
 //
@@ -38,110 +37,115 @@
 #include <unordered_set>
 #include <string>
 
-namespace edm {       
-namespace service {       
-
-// ----------------------------------------------------------------------
-// prerequisite classes:
-// ----------------------------------------------------------------------
-
-class ELadministrator;
-
-
-// ----------------------------------------------------------------------
-// ELdestination:
-// ----------------------------------------------------------------------
-
-class ELdestination  {
-
-  friend class ELadministrator;
-
-public:
-
-  ELdestination();
-  virtual ~ELdestination();
-
-  // -----  Methods invoked by the ELadministrator:
-  //
-public:
-  virtual bool log( const edm::ErrorObj & msg );
-
-  virtual ELstring getNewline() const;
-
-  virtual void finish();
-
-  // -----  Behavior control methods invoked by the framework:
-  //
-  void setThreshold( const ELseverityLevel & sv );
-  void setTraceThreshold( const ELseverityLevel & sv );
-  void setLimit( const ELstring & s, int n );
-  void setLimit( const ELseverityLevel & sv, int n );
-  void setInterval( const ELstring & s, int interval );
-  void setInterval( const ELseverityLevel& sv, int interval);
-  void setTimespan( const ELstring& s, int n );
-  void setTimespan( const ELseverityLevel & sv, int n );
-
-  // -----  Select output format options:
-  //
-  virtual void suppressText();           virtual void includeText(); // $$ jvr
-  virtual void suppressModule();         virtual void includeModule();
-  virtual void suppressSubroutine();     virtual void includeSubroutine();
-  virtual void suppressTime();           virtual void includeTime();
-  virtual void suppressContext();        virtual void includeContext();
-  virtual void suppressSerial();         virtual void includeSerial();
-  virtual void useFullContext();         virtual void useContext();
-  virtual void separateTime();           virtual void attachTime();
-  virtual void separateEpilogue();       virtual void attachEpilogue();
-  virtual int  setLineLength(int len);	 virtual int  getLineLength() const;
-
-  virtual void wipe();
-  virtual void zero();
-  virtual void filterModule( ELstring const & moduleName );
-  virtual void excludeModule( ELstring const & moduleName );
-  virtual void ignoreModule( ELstring const & moduleName );
-  virtual void respondToModule( ELstring const & moduleName );
-  virtual bool thisShouldBeIgnored(const ELstring & s) const;
-
-  virtual void setTableLimit( int n );
-
-  virtual void changeFile (std::ostream & os);
-  virtual void changeFile (const ELstring & filename);
-  virtual void flush(); 				       
-
-
-protected:
-  ELseverityLevel threshold;
-  ELseverityLevel traceThreshold;
-  ELlimitsTable   limits;
-  ELstring        preamble;
-  ELstring        newline;
-  ELstring        indent;
-  int		  lineLength;
-  bool            ignoreMostModules;
-  std::unordered_set<std::string>  respondToThese;
-  bool            respondToMostModules;
-  std::unordered_set<std::string> ignoreThese;
-					// Fix $001 2/13/01 mf
+namespace edm {
+  namespace service {
+
+    // ----------------------------------------------------------------------
+    // prerequisite classes:
+    // ----------------------------------------------------------------------
+
+    class ELadministrator;
+
+    // ----------------------------------------------------------------------
+    // ELdestination:
+    // ----------------------------------------------------------------------
+
+    class ELdestination {
+      friend class ELadministrator;
+
+    public:
+      ELdestination();
+      virtual ~ELdestination();
+
+      // -----  Methods invoked by the ELadministrator:
+      //
+    public:
+      virtual bool log(const edm::ErrorObj& msg);
+
+      virtual ELstring getNewline() const;
+
+      virtual void finish();
+
+      // -----  Behavior control methods invoked by the framework:
+      //
+      void setThreshold(const ELseverityLevel& sv);
+      void setTraceThreshold(const ELseverityLevel& sv);
+      void setLimit(const ELstring& s, int n);
+      void setLimit(const ELseverityLevel& sv, int n);
+      void setInterval(const ELstring& s, int interval);
+      void setInterval(const ELseverityLevel& sv, int interval);
+      void setTimespan(const ELstring& s, int n);
+      void setTimespan(const ELseverityLevel& sv, int n);
+
+      // -----  Select output format options:
+      //
+      virtual void suppressText();
+      virtual void includeText();  // $$ jvr
+      virtual void suppressModule();
+      virtual void includeModule();
+      virtual void suppressSubroutine();
+      virtual void includeSubroutine();
+      virtual void suppressTime();
+      virtual void includeTime();
+      virtual void suppressContext();
+      virtual void includeContext();
+      virtual void suppressSerial();
+      virtual void includeSerial();
+      virtual void useFullContext();
+      virtual void useContext();
+      virtual void separateTime();
+      virtual void attachTime();
+      virtual void separateEpilogue();
+      virtual void attachEpilogue();
+      virtual int setLineLength(int len);
+      virtual int getLineLength() const;
+
+      virtual void wipe();
+      virtual void zero();
+      virtual void filterModule(ELstring const& moduleName);
+      virtual void excludeModule(ELstring const& moduleName);
+      virtual void ignoreModule(ELstring const& moduleName);
+      virtual void respondToModule(ELstring const& moduleName);
+      virtual bool thisShouldBeIgnored(const ELstring& s) const;
+
+      virtual void setTableLimit(int n);
+
+      virtual void changeFile(std::ostream& os);
+      virtual void changeFile(const ELstring& filename);
+      virtual void flush();
+
+    protected:
+      ELseverityLevel threshold;
+      ELseverityLevel traceThreshold;
+      ELlimitsTable limits;
+      ELstring preamble;
+      ELstring newline;
+      ELstring indent;
+      int lineLength;
+      bool ignoreMostModules;
+      std::unordered_set<std::string> respondToThese;
+      bool respondToMostModules;
+      std::unordered_set<std::string> ignoreThese;
+      // Fix $001 2/13/01 mf
 #ifndef DEFECT_NO_STATIC_CONST_INIT
-  static const int defaultLineLength = 80;
+      static const int defaultLineLength = 80;
 #else
-  static const int defaultLineLength;	
+      static const int defaultLineLength;
 #endif
 
-  // -----  Verboten methods:
-  //
-private:
-  ELdestination( const ELdestination & orig ) = delete;
-  ELdestination& operator= ( const ELdestination & orig ) = delete;
-
-};  // ELdestination
+      // -----  Verboten methods:
+      //
+    private:
+      ELdestination(const ELdestination& orig) = delete;
+      ELdestination& operator=(const ELdestination& orig) = delete;
 
-struct close_and_delete {
-  void operator()(std::ostream* os) const;
-};
+    };  // ELdestination
 
-}        // end of namespace service
-}        // end of namespace edm
+    struct close_and_delete {
+      void operator()(std::ostream* os) const;
+    };
 
+  }  // end of namespace service
+}  // end of namespace edm
 
 #endif  // FWCore_MessageService_ELdestination_h
diff --git a/FWCore/MessageService/interface/ELlimitsTable.h b/FWCore/MessageService/interface/ELlimitsTable.h
index 439ef662c42ee..3019102f1495c 100644
--- a/FWCore/MessageService/interface/ELlimitsTable.h
+++ b/FWCore/MessageService/interface/ELlimitsTable.h
@@ -1,7 +1,6 @@
 #ifndef FWCore_MessageService_ELlimitsTable_h
 #define FWCore_MessageService_ELlimitsTable_h
 
-
 // ----------------------------------------------------------------------
 //
 // ELlimitsTable is a class holding two maps:  One listing various
@@ -35,83 +34,73 @@
 //
 // ----------------------------------------------------------------------
 
-
 #include "FWCore/MessageLogger/interface/ELstring.h"
 #include "FWCore/MessageLogger/interface/ELseverityLevel.h"
 #include "FWCore/MessageLogger/interface/ELextendedID.h"
 #include "FWCore/MessageLogger/interface/ELmap.h"
 
-namespace edm {       
-namespace service {       
-
-
-// ----------------------------------------------------------------------
-// Prerequisite class:
-// ----------------------------------------------------------------------
+namespace edm {
+  namespace service {
 
-class ELdestination;
-class ELoutput;
+    // ----------------------------------------------------------------------
+    // Prerequisite class:
+    // ----------------------------------------------------------------------
 
+    class ELdestination;
+    class ELoutput;
 
-// ----------------------------------------------------------------------
-// ELlimitsTable:
-// ----------------------------------------------------------------------
+    // ----------------------------------------------------------------------
+    // ELlimitsTable:
+    // ----------------------------------------------------------------------
 
-class ELlimitsTable  {
+    class ELlimitsTable {
+      friend class ELdestination;
+      friend class ELoutput;
 
-  friend class ELdestination;
-  friend class ELoutput;
+    public:
+      ELlimitsTable();
+      ~ELlimitsTable();
 
-public:
+      // -----  Methods invoked by the destination under impetus from the logger:
+      //
+    public:
+      bool add(const ELextendedID& xid);
+      void setTableLimit(int n);
 
-  ELlimitsTable();
-  ~ELlimitsTable();
+      // -----  Control methods invoked by the framework:
+      //
+    public:
+      void wipe();  // Clears everything -- counts and limits established.
+      void zero();  // Clears only counts.
 
-// -----  Methods invoked by the destination under impetus from the logger:
-//
-public:
-  bool add( const ELextendedID & xid );
-  void setTableLimit( int n );
+      void setLimit(const ELstring& id, int n);
+      void setLimit(const ELseverityLevel& sev, int n);
+      void setInterval(const ELstring& id, int interval);
+      void setInterval(const ELseverityLevel& sev, int interval);
+      void setTimespan(const ELstring& id, int n);
+      void setTimespan(const ELseverityLevel& sev, int n);
 
-// -----  Control methods invoked by the framework:
-//
-public:
+      ELlimitsTable& operator=(const ELlimitsTable& t);
 
-  void wipe();  // Clears everything -- counts and limits established.
-  void zero();  // Clears only counts.
+      // -----  Tables and auxilliary private data:
+      //
+    protected:
+      int severityLimits[ELseverityLevel::nLevels];
+      int severityTimespans[ELseverityLevel::nLevels];
+      int severityIntervals[ELseverityLevel::nLevels];
+      int wildcardLimit;
+      int wildcardInterval;
+      int wildcardTimespan;
 
-  void setLimit   ( const ELstring        & id,  int n        );
-  void setLimit   ( const ELseverityLevel & sev, int n        );
-  void setInterval( const ELstring        & id,  int interval );
-  void setInterval( const ELseverityLevel & sev, int interval );
-  void setTimespan( const ELstring        & id,  int n        );
-  void setTimespan( const ELseverityLevel & sev, int n        );
-
-  ELlimitsTable & operator= (const ELlimitsTable & t);
-
-// -----  Tables and auxilliary private data:
-//
-protected:
-
-  int severityLimits   [ELseverityLevel::nLevels];
-  int severityTimespans[ELseverityLevel::nLevels];
-  int severityIntervals[ELseverityLevel::nLevels];
-  int wildcardLimit;
-  int wildcardInterval;
-  int wildcardTimespan;
-
-  int tableLimit;
-  ELmap_limits limits;
-  ELmap_counts counts;
-
-};  // ELlimitsTable
-
-
-// ----------------------------------------------------------------------
+      int tableLimit;
+      ELmap_limits limits;
+      ELmap_counts counts;
 
+    };  // ELlimitsTable
 
-}        // end of namespace service
-}        // end of namespace edm
+    // ----------------------------------------------------------------------
 
+  }  // end of namespace service
+}  // end of namespace edm
 
-#endif // FWCore_MessageService_ELlimitsTable_h
+#endif  // FWCore_MessageService_ELlimitsTable_h
diff --git a/FWCore/MessageService/interface/ELoutput.h b/FWCore/MessageService/interface/ELoutput.h
index ea11fce6ee81a..fcfd7e72edff2 100644
--- a/FWCore/MessageService/interface/ELoutput.h
+++ b/FWCore/MessageService/interface/ELoutput.h
@@ -1,7 +1,6 @@
 #ifndef FWCore_MessageService_ELoutput_h
 #define FWCore_MessageService_ELoutput_h
 
-
 // ----------------------------------------------------------------------
 //
 // ELoutput	is a subclass of ELdestination representing the standard
@@ -17,8 +16,8 @@
 // 10/4/00 mf	add excludeModule()
 //  4/4/01 mf 	Removed moduleOfInterest and moduleToExclude, in favor
 //		of using base class method.
-//  6/23/03 mf  changeFile(), flush() 
-//  6/11/07 mf  changed default for emitAtStart to false  
+//  6/23/03 mf  changeFile(), flush()
+//  6/11/07 mf  changed default for emitAtStart to false
 //
 // ----------------------------------------------------------------------
 
@@ -29,103 +28,86 @@
 
 #include <memory>
 
-namespace edm {       
-
-
-// ----------------------------------------------------------------------
-// prerequisite classes:
-// ----------------------------------------------------------------------
-
-class ErrorObj;
-namespace service {       
-
-
-// ----------------------------------------------------------------------
-// ELoutput:
-// ----------------------------------------------------------------------
-
-class ELoutput : public ELdestination  {
-
-public:
-
-  // ---  Birth/death:
-  //
-  ELoutput();
-  ELoutput( std::ostream & os, bool emitAtStart = false );	// 6/11/07 mf
-  ELoutput( const ELstring & fileName, bool emitAtStart = false );
-  ELoutput( const ELoutput & orig );
-  ~ELoutput() override;
-
-  // ---  Methods invoked by the ELadministrator:
-  //
-public:
-  bool log( const edm::ErrorObj & msg ) override;
-
-protected:
-    // trivial clearSummary(), wipe(), zero() from base class
-    // trivial three summary(..) from base class
-
-protected:
-  // ---  Internal Methods -- Users should not invoke these:
-  //
-protected:
-  void emitToken( const ELstring & s, bool nl=false ) ;
-
-  void suppressTime() override;
-  void includeTime() override;
-  void suppressModule()override;
-  void includeModule() override;
-  void suppressSubroutine() override;
-  void includeSubroutine() override;
-  void suppressText() override;
-  void includeText() override;
-  void suppressContext() override;
-  void includeContext() override;
-  void suppressSerial() override;
-  void includeSerial() override;
-  void useFullContext() override;
-  void useContext() override;
-  void separateTime() override;
-  void attachTime() override;
-  void separateEpilogue() override;
-  void attachEpilogue() override;
-
-  void changeFile (std::ostream & os) override;
-  void changeFile (const ELstring & filename) override;
-  void flush() override;
-
-
-protected:
-  // --- member data:
-  //
-  std::shared_ptr<std::ostream> os;
-  int                             charsOnLine;
-  edm::ELextendedID               xid;
-
-  bool wantTimestamp
-  ,    wantModule
-  ,    wantSubroutine
-  ,    wantText
-  ,    wantSomeContext
-  ,    wantSerial
-  ,    wantFullContext
-  ,    wantTimeSeparate
-  ,    wantEpilogueSeparate
-  ,    preambleMode
-  ;
-
-  // --- Verboten method:
-  //
-  ELoutput & operator=( const ELoutput & orig ) = delete;
-
-};  // ELoutput
-
-
-// ----------------------------------------------------------------------
-
-
-}        // end of namespace service
-}        // end of namespace edm
-
-
-#endif // FWCore_MessageService_ELoutput_h
+namespace edm {
+
+  // ----------------------------------------------------------------------
+  // prerequisite classes:
+  // ----------------------------------------------------------------------
+
+  class ErrorObj;
+  namespace service {
+
+    // ----------------------------------------------------------------------
+    // ELoutput:
+    // ----------------------------------------------------------------------
+
+    class ELoutput : public ELdestination {
+    public:
+      // ---  Birth/death:
+      //
+      ELoutput();
+      ELoutput(std::ostream& os, bool emitAtStart = false);  // 6/11/07 mf
+      ELoutput(const ELstring& fileName, bool emitAtStart = false);
+      ELoutput(const ELoutput& orig);
+      ~ELoutput() override;
+
+      // ---  Methods invoked by the ELadministrator:
+      //
+    public:
+      bool log(const edm::ErrorObj& msg) override;
+
+    protected:
+      // trivial clearSummary(), wipe(), zero() from base class
+      // trivial three summary(..) from base class
+
+    protected:
+      // ---  Internal Methods -- Users should not invoke these:
+      //
+    protected:
+      void emitToken(const ELstring& s, bool nl = false);
+
+      void suppressTime() override;
+      void includeTime() override;
+      void suppressModule() override;
+      void includeModule() override;
+      void suppressSubroutine() override;
+      void includeSubroutine() override;
+      void suppressText() override;
+      void includeText() override;
+      void suppressContext() override;
+      void includeContext() override;
+      void suppressSerial() override;
+      void includeSerial() override;
+      void useFullContext() override;
+      void useContext() override;
+      void separateTime() override;
+      void attachTime() override;
+      void separateEpilogue() override;
+      void attachEpilogue() override;
+
+      void changeFile(std::ostream& os) override;
+      void changeFile(const ELstring& filename) override;
+      void flush() override;
+
+    protected:
+      // --- member data:
+      //
+      std::shared_ptr<std::ostream> os;
+      int charsOnLine;
+      edm::ELextendedID xid;
+
+      bool wantTimestamp, wantModule, wantSubroutine, wantText, wantSomeContext, wantSerial, wantFullContext,
+          wantTimeSeparate, wantEpilogueSeparate, preambleMode;
+
+      // --- Verboten method:
+      //
+      ELoutput& operator=(const ELoutput& orig) = delete;
+
+    };  // ELoutput
+
+    // ----------------------------------------------------------------------
+
+  }  // end of namespace service
+}  // end of namespace edm
+
+#endif  // FWCore_MessageService_ELoutput_h
diff --git a/FWCore/MessageService/interface/ELstatistics.h b/FWCore/MessageService/interface/ELstatistics.h
index 4e91f507d7c0c..3beca68607d18 100644
--- a/FWCore/MessageService/interface/ELstatistics.h
+++ b/FWCore/MessageService/interface/ELstatistics.h
@@ -1,7 +1,6 @@
 #ifndef FWCore_MessageService_ELstatistics_h
 #define FWCore_MessageService_ELstatistics_h
 
-
 // ----------------------------------------------------------------------
 //
 // ELstatistics	is a subclass of ELdestination representing the
@@ -20,9 +19,9 @@
 //  4/4/01 mf   Removed moduleOfInterest and moduleToExclude, in favor
 //              of using base class method.
 // 1/17/06 mf	summary() for use in MessageLogger
-// 8/16/07 mf	noteGroupedCategory(cat) to support grouping of modules in 
+// 8/16/07 mf	noteGroupedCategory(cat) to support grouping of modules in
 //		specified categories.  Also, a static vector of such categories.
-// 6/19/08 mf	summaryForJobReport() for use in CMS framework 
+// 6/19/08 mf	summaryForJobReport() for use in CMS framework
 //
 // ----------------------------------------------------------------------
 
@@ -34,98 +33,89 @@
 
 #include <set>
 
-namespace edm {       
-
+namespace edm {
 
-// ----------------------------------------------------------------------
-// prerequisite classes:
-// ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
+  // prerequisite classes:
+  // ----------------------------------------------------------------------
 
-class ErrorObj;
-namespace service {       
-class ELadministrator;
+  class ErrorObj;
+  namespace service {
+    class ELadministrator;
 
+    // ----------------------------------------------------------------------
+    // ELstatistics:
+    // ----------------------------------------------------------------------
 
-// ----------------------------------------------------------------------
-// ELstatistics:
-// ----------------------------------------------------------------------
-
-class ELstatistics : public ELdestination  {
+    class ELstatistics : public ELdestination {
+      friend class ELadministrator;
 
-  friend class ELadministrator;
+    public:
+      // -----  constructor/destructor:
+      ELstatistics();
+      ELstatistics(std::ostream& osp);
+      ELstatistics(int spaceLimit);
+      ELstatistics(int spaceLimit, std::ostream& osp);
+      ELstatistics(const ELstatistics& orig);
+      ~ELstatistics() override;
 
-public:
-  // -----  constructor/destructor:
-  ELstatistics();
-  ELstatistics( std::ostream & osp );
-  ELstatistics( int spaceLimit );
-  ELstatistics( int spaceLimit, std::ostream & osp );
-  ELstatistics( const ELstatistics & orig );
-  ~ELstatistics() override;
+      // -----  Methods invoked by the ELadministrator:
+      //
+    public:
+      // Used by attach() to put the destination on the ELadministrators list
+      //-| There is a note in Design Notes about semantics
+      //-| of copying a destination onto the list:  ofstream
+      //-| ownership is passed to the new copy.
 
-  // -----  Methods invoked by the ELadministrator:
-  //
-public:
-    // Used by attach() to put the destination on the ELadministrators list
-		//-| There is a note in Design Notes about semantics
-		//-| of copying a destination onto the list:  ofstream
-		//-| ownership is passed to the new copy.
+      bool log(const edm::ErrorObj& msg) override;
 
-  bool log( const edm::ErrorObj & msg ) override;
+      // output( const ELstring & item, const ELseverityLevel & sev )
+      // from base class
 
-  // output( const ELstring & item, const ELseverityLevel & sev )
-  // from base class
+      // ----- Methods invoked by the MessageLoggerScribe, bypassing destControl
+      //
+    public:
+      static void noteGroupedCategory(std::string const& cat);  // 8/16/07 mf
 
-  // ----- Methods invoked by the MessageLoggerScribe, bypassing destControl
-  //
-public:
-  static void noteGroupedCategory(std::string const & cat);  // 8/16/07 mf 
+      void summary(unsigned long overfullWaitCount);
+      void noTerminationSummary();
+      void summaryForJobReport(std::map<std::string, double>& sm);
+      void wipe() override;
 
+    protected:
+      void clearSummary();
 
-  void summary( unsigned long overfullWaitCount );
-  void noTerminationSummary();
-  void summaryForJobReport (std::map<std::string, double> & sm);
-  void wipe() override;
+      void zero() override;
 
-protected:
-  void clearSummary();
+      std::map<ELextendedID, StatsCount> statisticsMap() const;
 
-  void zero() override;
+      // summarization( const ELstring & sumLines, const ELstring & sumLines )
+      // from base class
 
+    protected:
+      int tableLimit;
+      ELmap_stats stats;
+      bool updatedStats;
+      std::ostream& termStream;
 
-  std::map<ELextendedID,StatsCount> statisticsMap() const;
+      bool printAtTermination;
 
-  
-  // summarization( const ELstring & sumLines, const ELstring & sumLines )
-  // from base class
+      CMS_THREAD_SAFE static std::set<std::string> groupedCategories;  // 8/16/07 mf
+      static ELstring formSummary(ELmap_stats& stats);                 // 8/16/07 mf
 
-protected:
-  int            tableLimit;
-  ELmap_stats    stats;
-  bool           updatedStats;
-  std::ostream & termStream;
+      // ----  Helper methods specific to MessageLogger applicaton
+      //
+    private:
+      std::string dualLogName(std::string const& s);
+      ELstatistics& operator=(const ELstatistics& orig) = delete;  // verboten
 
-  bool           printAtTermination;
-
-  CMS_THREAD_SAFE static std::set<std::string> groupedCategories;		// 8/16/07 mf 
-  static ELstring formSummary(ELmap_stats & stats);		// 8/16/07 mf 
-
-  // ----  Helper methods specific to MessageLogger applicaton
-  //
-private:
-  std::string dualLogName(std::string const & s);
-  ELstatistics & operator=( const ELstatistics & orig ) = delete;  // verboten
-
-  void summary( std::ostream & os, const ELstring & title );
-  
-};  // ELstatistics
-
-
-// ----------------------------------------------------------------------
+      void summary(std::ostream& os, const ELstring& title);
 
+    };  // ELstatistics
 
-}        // end of namespace service
-}        // end of namespace edm
+    // ----------------------------------------------------------------------
 
+  }  // end of namespace service
+}  // end of namespace edm
 
-#endif // FWCore_MessageService_ELstatistics_h
+#endif  // FWCore_MessageService_ELstatistics_h
diff --git a/FWCore/MessageService/interface/MainThreadMLscribe.h b/FWCore/MessageService/interface/MainThreadMLscribe.h
index 046897a322eea..1d2ecd5b2845c 100644
--- a/FWCore/MessageService/interface/MainThreadMLscribe.h
+++ b/FWCore/MessageService/interface/MainThreadMLscribe.h
@@ -16,46 +16,41 @@
 #include <iostream>
 
 namespace edm {
-namespace service {       
-
-// ----------------------------------------------------------------------
-//
-// MainThreadMLscribe.h
-//
-// This class is a concrete of AbstractMessageLoggerScribe
-// Its purpose exists ONLY if there is a second thread running the workhorse
-// scrribe.  In that case, the workhorse will be consuming from a
-// SingleConsumerQ, and this class is the one that places the item on said 
-// queue.  It does work that used to be the realm of MessageLoggerQ.
-//
-// Changes:
-//
-// 0 - 8/7/09  	Initial version mf and crj
-//
-// -----------------------------------------------------------------------
-
-class ThreadQueue;
-
-class MainThreadMLscribe : public AbstractMLscribe
-{
-public:
-  // ---  birth/death:
-  MainThreadMLscribe(std::shared_ptr<ThreadQueue> tqp);
-  ~MainThreadMLscribe() override;
-
-  // --- receive and act on messages:
-  							
-  void  runCommand(MessageLoggerQ::OpCode  opcode, void * operand) override;
-		  						
-
-private:
-
-   edm::propagate_const<std::shared_ptr<ThreadQueue>> m_queue;
-};  // MainThreadMLscribe
-
-
-}   // end of namespace service
+  namespace service {
+
+    // ----------------------------------------------------------------------
+    //
+    // MainThreadMLscribe.h
+    //
+    // This class is a concrete of AbstractMessageLoggerScribe
+    // Its purpose exists ONLY if there is a second thread running the workhorse
+    // scrribe.  In that case, the workhorse will be consuming from a
+    // SingleConsumerQ, and this class is the one that places the item on said
+    // queue.  It does work that used to be the realm of MessageLoggerQ.
+    //
+    // Changes:
+    //
+    // 0 - 8/7/09  	Initial version mf and crj
+    //
+    // -----------------------------------------------------------------------
+
+    class ThreadQueue;
+
+    class MainThreadMLscribe : public AbstractMLscribe {
+    public:
+      // ---  birth/death:
+      MainThreadMLscribe(std::shared_ptr<ThreadQueue> tqp);
+      ~MainThreadMLscribe() override;
+
+      // --- receive and act on messages:
+
+      void runCommand(MessageLoggerQ::OpCode opcode, void* operand) override;
+
+    private:
+      edm::propagate_const<std::shared_ptr<ThreadQueue>> m_queue;
+    };  // MainThreadMLscribe
+
+  }  // end of namespace service
 }  // namespace edm
 
-
 #endif  // FWCore_MessageService_MainThreadMLscribe_h
diff --git a/FWCore/MessageService/interface/MessageLogger.h b/FWCore/MessageService/interface/MessageLogger.h
index c918e74480deb..f0edb8260e27a 100644
--- a/FWCore/MessageService/interface/MessageLogger.h
+++ b/FWCore/MessageService/interface/MessageLogger.h
@@ -39,154 +39,139 @@
 
 // forward declarations
 
-namespace edm  {
-class ModuleDescription;
-class ParameterSet;
-namespace service  {
-
-
-class MessageLogger {
-public:
-  MessageLogger( ParameterSet const &, ActivityRegistry & );
-
-  void  fillErrorObj(edm::ErrorObj& obj) const;
-  bool  debugEnabled() const { return debugEnabled_; }
-
-  static 
-  bool  anyDebugEnabled() { return anyDebugEnabled_; }
-
-  static
-  void  SummarizeInJobReport();
-  
-private:
-
-  void  postBeginJob();
-  void  postEndJob();
-  void  jobFailure();
-  
-  void  preSourceEvent  ( StreamID );
-  void  postSourceEvent ( StreamID );
-  void  preSourceRunLumi  ();
-  void  postSourceRunLumi ();
-  
-  void  preFile       ( std::string const&, bool );
-  void  preFileClose  ( std::string const&, bool );
-  void  postFile      ( std::string const&, bool );
-  
-  void  preModuleConstruction ( ModuleDescription const & );
-  void  postModuleConstruction( ModuleDescription const & );
-  
-  void  preSourceConstruction ( ModuleDescription const & );
-  void  postSourceConstruction( ModuleDescription const & );
-  
-  void  preModuleEvent ( StreamContext const&, ModuleCallingContext const& );
-  void  postModuleEvent( StreamContext const&, ModuleCallingContext const& );
-  
-  void  preModuleEventAcquire ( StreamContext const&, ModuleCallingContext const& );
-  void  postModuleEventAcquire( StreamContext const&, ModuleCallingContext const& );
-
-  void  preModuleBeginJob  ( ModuleDescription const & );
-  void  postModuleBeginJob ( ModuleDescription const & );
-  void  preModuleEndJob  ( ModuleDescription const & );
-  void  postModuleEndJob ( ModuleDescription const & );
-
-  void  preModuleBeginStream  ( StreamContext const&, ModuleCallingContext const& );
-  void  postModuleBeginStream ( StreamContext const&, ModuleCallingContext const& );
-  void  preModuleEndStream  ( StreamContext const&, ModuleCallingContext const& );
-  void  postModuleEndStream ( StreamContext const&, ModuleCallingContext const& );
-
-  void  preModuleStreamBeginRun  ( StreamContext const&, ModuleCallingContext const& );
-  void  postModuleStreamBeginRun ( StreamContext const&, ModuleCallingContext const& );
-  void  preModuleStreamEndRun  ( StreamContext const&, ModuleCallingContext const& );
-  void  postModuleStreamEndRun ( StreamContext const&, ModuleCallingContext const& );
-  
-  void  preModuleStreamBeginLumi  ( StreamContext const&, ModuleCallingContext const& );
-  void  postModuleStreamBeginLumi ( StreamContext const&, ModuleCallingContext const& );
-  void  preModuleStreamEndLumi  ( StreamContext const&, ModuleCallingContext const& );
-  void  postModuleStreamEndLumi ( StreamContext const&, ModuleCallingContext const& );
-  
-  void  preEvent ( StreamContext const& );
-  void  postEvent( StreamContext const& );
-  
-  void  preStreamBeginRun    ( StreamContext const& );
-  void  postStreamBeginRun   ( StreamContext const& );
-  void  preStreamEndRun      ( StreamContext const& );
-  void  postStreamEndRun     ( StreamContext const& );
-  void  preStreamBeginLumi   ( StreamContext const& );
-  void  postStreamBeginLumi  ( StreamContext const& );
-  void  preStreamEndLumi     ( StreamContext const& );
-  void  postStreamEndLumi    ( StreamContext const& );
-
-  void  preModuleGlobalBeginRun  ( GlobalContext const&, ModuleCallingContext const& );
-  void  postModuleGlobalBeginRun ( GlobalContext const&, ModuleCallingContext const& );
-  void  preModuleGlobalEndRun    ( GlobalContext const&, ModuleCallingContext const& );
-  void  postModuleGlobalEndRun   ( GlobalContext const&, ModuleCallingContext const& );
-  
-  void  preModuleGlobalBeginLumi  ( GlobalContext const&, ModuleCallingContext const& );
-  void  postModuleGlobalBeginLumi ( GlobalContext const&, ModuleCallingContext const& );
-  void  preModuleGlobalEndLumi    ( GlobalContext const&, ModuleCallingContext const& );
-  void  postModuleGlobalEndLumi   ( GlobalContext const&, ModuleCallingContext const& );
-
-  void  preGlobalBeginRun    ( GlobalContext const& );
-  void  postGlobalBeginRun   ( GlobalContext const& );
-  void  preGlobalEndRun      ( GlobalContext const& );
-  void  postGlobalEndRun     ( GlobalContext const& );
-  void  preGlobalBeginLumi   ( GlobalContext const& );
-  void  postGlobalBeginLumi  ( GlobalContext const& );
-  void  preGlobalEndLumi     ( GlobalContext const& );
-  void  postGlobalEndLumi    ( GlobalContext const& );
-  
-  void  prePathEvent    ( StreamContext const&, PathContext const& );
-  void  postPathEvent   ( StreamContext const&, PathContext const&, HLTPathStatus const&);
-
-  // set up the module name in the message drop, and the enable/suppress info
-  void  establishModule       ( const ModuleDescription& desc,
-  		                const char* whichPhase );
-  void  unEstablishModule     ( const ModuleDescription& desc,
-  		                const char*  whichPhase );
-  void  establishModule       (unsigned int transitionIndex,
-                               const ModuleCallingContext& context,
-                               const char* whichPhase );
-  void  unEstablishModule     (const ModuleCallingContext& desc,
-                               const char*  whichPhase );
-  void  establish             ( const char*  whichPhase );
-  void  unEstablish           ( const char*  whichPhase ); 
-  
-  //Cache string description for each active transition
-  // stream info is first in the container
-  // concurrent lumi info is next
-  // concurrent run info is last
-  std::vector<std::string> transitionInfoCache_;
-  unsigned int lumiInfoBegin_=0;
-  unsigned int runInfoBegin_=0;
-
-  std::set<std::string> debugEnabledModules_;
-  std::map<std::string,ELseverityLevel> suppression_levels_;
-  bool debugEnabled_;
-  CMS_THREAD_SAFE static bool   anyDebugEnabled_;
-  CMS_THREAD_SAFE static bool everyDebugEnabled_;
-
-  CMS_THREAD_SAFE static bool fjrSummaryRequested_;
-  bool messageServicePSetHasBeenValidated_;
-  std::string  messageServicePSetValidatationResults_;
-
-  bool nonModule_debugEnabled;
-  bool nonModule_infoEnabled;
-  bool nonModule_warningEnabled;  
-  bool nonModule_errorEnabled;  
-
-};  // MessageLogger
-
-  inline
-  bool isProcessWideService(MessageLogger const*) {
-    return true;
-  }
-
-}  // namespace service
+namespace edm {
+  class ModuleDescription;
+  class ParameterSet;
+  namespace service {
+
+    class MessageLogger {
+    public:
+      MessageLogger(ParameterSet const&, ActivityRegistry&);
+
+      void fillErrorObj(edm::ErrorObj& obj) const;
+      bool debugEnabled() const { return debugEnabled_; }
+
+      static bool anyDebugEnabled() { return anyDebugEnabled_; }
+
+      static void SummarizeInJobReport();
+
+    private:
+      void postBeginJob();
+      void postEndJob();
+      void jobFailure();
+
+      void preSourceEvent(StreamID);
+      void postSourceEvent(StreamID);
+      void preSourceRunLumi();
+      void postSourceRunLumi();
+
+      void preFile(std::string const&, bool);
+      void preFileClose(std::string const&, bool);
+      void postFile(std::string const&, bool);
+
+      void preModuleConstruction(ModuleDescription const&);
+      void postModuleConstruction(ModuleDescription const&);
+
+      void preSourceConstruction(ModuleDescription const&);
+      void postSourceConstruction(ModuleDescription const&);
+
+      void preModuleEvent(StreamContext const&, ModuleCallingContext const&);
+      void postModuleEvent(StreamContext const&, ModuleCallingContext const&);
+
+      void preModuleEventAcquire(StreamContext const&, ModuleCallingContext const&);
+      void postModuleEventAcquire(StreamContext const&, ModuleCallingContext const&);
+
+      void preModuleBeginJob(ModuleDescription const&);
+      void postModuleBeginJob(ModuleDescription const&);
+      void preModuleEndJob(ModuleDescription const&);
+      void postModuleEndJob(ModuleDescription const&);
+
+      void preModuleBeginStream(StreamContext const&, ModuleCallingContext const&);
+      void postModuleBeginStream(StreamContext const&, ModuleCallingContext const&);
+      void preModuleEndStream(StreamContext const&, ModuleCallingContext const&);
+      void postModuleEndStream(StreamContext const&, ModuleCallingContext const&);
+
+      void preModuleStreamBeginRun(StreamContext const&, ModuleCallingContext const&);
+      void postModuleStreamBeginRun(StreamContext const&, ModuleCallingContext const&);
+      void preModuleStreamEndRun(StreamContext const&, ModuleCallingContext const&);
+      void postModuleStreamEndRun(StreamContext const&, ModuleCallingContext const&);
+
+      void preModuleStreamBeginLumi(StreamContext const&, ModuleCallingContext const&);
+      void postModuleStreamBeginLumi(StreamContext const&, ModuleCallingContext const&);
+      void preModuleStreamEndLumi(StreamContext const&, ModuleCallingContext const&);
+      void postModuleStreamEndLumi(StreamContext const&, ModuleCallingContext const&);
+
+      void preEvent(StreamContext const&);
+      void postEvent(StreamContext const&);
+
+      void preStreamBeginRun(StreamContext const&);
+      void postStreamBeginRun(StreamContext const&);
+      void preStreamEndRun(StreamContext const&);
+      void postStreamEndRun(StreamContext const&);
+      void preStreamBeginLumi(StreamContext const&);
+      void postStreamBeginLumi(StreamContext const&);
+      void preStreamEndLumi(StreamContext const&);
+      void postStreamEndLumi(StreamContext const&);
+
+      void preModuleGlobalBeginRun(GlobalContext const&, ModuleCallingContext const&);
+      void postModuleGlobalBeginRun(GlobalContext const&, ModuleCallingContext const&);
+      void preModuleGlobalEndRun(GlobalContext const&, ModuleCallingContext const&);
+      void postModuleGlobalEndRun(GlobalContext const&, ModuleCallingContext const&);
+
+      void preModuleGlobalBeginLumi(GlobalContext const&, ModuleCallingContext const&);
+      void postModuleGlobalBeginLumi(GlobalContext const&, ModuleCallingContext const&);
+      void preModuleGlobalEndLumi(GlobalContext const&, ModuleCallingContext const&);
+      void postModuleGlobalEndLumi(GlobalContext const&, ModuleCallingContext const&);
+
+      void preGlobalBeginRun(GlobalContext const&);
+      void postGlobalBeginRun(GlobalContext const&);
+      void preGlobalEndRun(GlobalContext const&);
+      void postGlobalEndRun(GlobalContext const&);
+      void preGlobalBeginLumi(GlobalContext const&);
+      void postGlobalBeginLumi(GlobalContext const&);
+      void preGlobalEndLumi(GlobalContext const&);
+      void postGlobalEndLumi(GlobalContext const&);
+
+      void prePathEvent(StreamContext const&, PathContext const&);
+      void postPathEvent(StreamContext const&, PathContext const&, HLTPathStatus const&);
+
+      // set up the module name in the message drop, and the enable/suppress info
+      void establishModule(const ModuleDescription& desc, const char* whichPhase);
+      void unEstablishModule(const ModuleDescription& desc, const char* whichPhase);
+      void establishModule(unsigned int transitionIndex, const ModuleCallingContext& context, const char* whichPhase);
+      void unEstablishModule(const ModuleCallingContext& desc, const char* whichPhase);
+      void establish(const char* whichPhase);
+      void unEstablish(const char* whichPhase);
+
+      //Cache string description for each active transition
+      // stream info is first in the container
+      // concurrent lumi info is next
+      // concurrent run info is last
+      std::vector<std::string> transitionInfoCache_;
+      unsigned int lumiInfoBegin_ = 0;
+      unsigned int runInfoBegin_ = 0;
+
+      std::set<std::string> debugEnabledModules_;
+      std::map<std::string, ELseverityLevel> suppression_levels_;
+      bool debugEnabled_;
+      CMS_THREAD_SAFE static bool anyDebugEnabled_;
+      CMS_THREAD_SAFE static bool everyDebugEnabled_;
+
+      CMS_THREAD_SAFE static bool fjrSummaryRequested_;
+      bool messageServicePSetHasBeenValidated_;
+      std::string messageServicePSetValidatationResults_;
+
+      bool nonModule_debugEnabled;
+      bool nonModule_infoEnabled;
+      bool nonModule_warningEnabled;
+      bool nonModule_errorEnabled;
+
+    };  // MessageLogger
+
+    inline bool isProcessWideService(MessageLogger const*) { return true; }
+
+  }  // namespace service
 
 }  // namespace edm
 
-
-
 #endif  // FWCore_MessageService_MessageLogger_h
-
diff --git a/FWCore/MessageService/interface/MessageLoggerDefaults.h b/FWCore/MessageService/interface/MessageLoggerDefaults.h
index 2e2af72547712..1fd1bf3ff3c6d 100644
--- a/FWCore/MessageService/interface/MessageLoggerDefaults.h
+++ b/FWCore/MessageService/interface/MessageLoggerDefaults.h
@@ -22,7 +22,7 @@
 */
 
 //
-// Original Author:  M. Fischler 
+// Original Author:  M. Fischler
 //         Created:  Tues Jun 14 10:38:19 CST 2007
 //
 
@@ -52,10 +52,10 @@
 // When default values change for one job mode of operation or another,
 // implement that change in the appropriate member function implemented
 // in HardwiredDefaults.cc.  For example, hardwireGridJobMode().
-// 
+//
 // When a new default is needed, add the item to the struct, and then place
 // the default value into the appropriate sections of the various member
-// functions in HardwiredDefaults.cc. 
+// functions in HardwiredDefaults.cc.
 // It may be necessary to supply values of that default for each of the modes,
 // even though the ErrorLogger default is suitable for all the modes but one.
 //
@@ -64,99 +64,91 @@
 // MessageLoggerDefaults.cc following the pattern shown for existing items
 
 namespace edm {
-namespace service {
-
-struct MessageLoggerDefaults {
-public:
-  static const int NO_VALUE_SET = -45654;
-
-  struct Category {
-    std::string threshold;
-    int limit;
-    int reportEvery;
-    int timespan;
-    Category() : 
-      threshold("")
-    , limit(NO_VALUE_SET)  
-    , reportEvery(NO_VALUE_SET)  
-    , timespan(NO_VALUE_SET) {}
-  };
-  
-  struct Destination {
-    std::string threshold;
-    std::map<std::string,Category> category; 
-    std::map<std::string,Category> sev; 
-    std::string output;
-  };
-  
-  // publicly available collections and structures
-
-  std::vector<std::string> categories;
-  std::vector<std::string> destinations;
-  std::vector<std::string> fwkJobReports;
-  std::vector<std::string> statistics;
-  std::map<std::string,Destination> destination;
-      
-  // access to values set
-  
-  std::string threshold (std::string const & dest);
-  std::string output    (std::string const & dest);
-
-  int limit      (std::string const & dest, std::string const & cat);
-  int reportEvery(std::string const & dest, std::string const & cat);
-  int timespan   (std::string const & dest, std::string const & cat);
-    
-  int sev_limit      (std::string const & dest, std::string const & sev);
-  int sev_reportEvery(std::string const & dest, std::string const & sev);
-  int sev_timespan   (std::string const & dest, std::string const & sev);
-    
-  // Modes with hardwired defaults
-  
-  void hardwireGridJobMode();
-  void hardwireReleaseValidationJobMode();
-  void hardwireAnalysisJobMode();
-  void hardwireNilJobMode();
-
-  static edm::JobMode mode(std::string const & jm);
-   
-  // ctor
-
-  explicit MessageLoggerDefaults (edm::JobMode mode = GridJobMode) {
-    // mode-independent defaults
-    
-    // mode-dependent defaults
-    switch (mode) {
-      // GridJobMode:	Intended for automated batch-like processing, in which 
-      //               	the output stream for cerr is routed to an apropro
-      //               	file.  LogInfo messages are enabled, and at least 
-      //	      	one such message is delivered from the framework per
-      //		event, so this mode is not suitable for many-Hz light
-      //		event processing. 
-      case GridJobMode: 
-        hardwireGridJobMode();
-	break;       
-      case ReleaseValidationJobMode:
-        hardwireReleaseValidationJobMode();
-	break;       
-      case AnalysisJobMode:
-        hardwireAnalysisJobMode();
-	break;       
-      case NilJobMode:
-        hardwireNilJobMode();
-	break;       
-      default:
-        // this should never happen!  No user error can get here.
-	bool    Invalid_JobMode_in_ctor_of_MessageLoggerDefaults = false;
-	assert (Invalid_JobMode_in_ctor_of_MessageLoggerDefaults);
-    } // end of switch on mode
-  }
-
-};
-
-
-
-} // end of namespace service
-} // end of namespace edm
-
-
-#endif // MessageLogger_MessageLoggerDefaults_h
+  namespace service {
+
+    struct MessageLoggerDefaults {
+    public:
+      static const int NO_VALUE_SET = -45654;
+
+      struct Category {
+        std::string threshold;
+        int limit;
+        int reportEvery;
+        int timespan;
+        Category() : threshold(""), limit(NO_VALUE_SET), reportEvery(NO_VALUE_SET), timespan(NO_VALUE_SET) {}
+      };
+
+      struct Destination {
+        std::string threshold;
+        std::map<std::string, Category> category;
+        std::map<std::string, Category> sev;
+        std::string output;
+      };
+
+      // publicly available collections and structures
+
+      std::vector<std::string> categories;
+      std::vector<std::string> destinations;
+      std::vector<std::string> fwkJobReports;
+      std::vector<std::string> statistics;
+      std::map<std::string, Destination> destination;
+
+      // access to values set
+
+      std::string threshold(std::string const& dest);
+      std::string output(std::string const& dest);
+
+      int limit(std::string const& dest, std::string const& cat);
+      int reportEvery(std::string const& dest, std::string const& cat);
+      int timespan(std::string const& dest, std::string const& cat);
+
+      int sev_limit(std::string const& dest, std::string const& sev);
+      int sev_reportEvery(std::string const& dest, std::string const& sev);
+      int sev_timespan(std::string const& dest, std::string const& sev);
+
+      // Modes with hardwired defaults
+
+      void hardwireGridJobMode();
+      void hardwireReleaseValidationJobMode();
+      void hardwireAnalysisJobMode();
+      void hardwireNilJobMode();
+
+      static edm::JobMode mode(std::string const& jm);
+
+      // ctor
+
+      explicit MessageLoggerDefaults(edm::JobMode mode = GridJobMode) {
+        // mode-independent defaults
+
+        // mode-dependent defaults
+        switch (mode) {
+          // GridJobMode:	Intended for automated batch-like processing, in which
+          //               	the output stream for cerr is routed to an apropro
+          //               	file.  LogInfo messages are enabled, and at least
+          //	      	one such message is delivered from the framework per
+          //		event, so this mode is not suitable for many-Hz light
+          //		event processing.
+          case GridJobMode:
+            hardwireGridJobMode();
+            break;
+          case ReleaseValidationJobMode:
+            hardwireReleaseValidationJobMode();
+            break;
+          case AnalysisJobMode:
+            hardwireAnalysisJobMode();
+            break;
+          case NilJobMode:
+            hardwireNilJobMode();
+            break;
+          default:
+            // this should never happen!  No user error can get here.
+            bool Invalid_JobMode_in_ctor_of_MessageLoggerDefaults = false;
+            assert(Invalid_JobMode_in_ctor_of_MessageLoggerDefaults);
+        }  // end of switch on mode
+      }
+    };
+
+  }  // end of namespace service
+}  // end of namespace edm
+
+#endif  // MessageLogger_MessageLoggerDefaults_h
diff --git a/FWCore/MessageService/interface/MessageLoggerScribe.h b/FWCore/MessageService/interface/MessageLoggerScribe.h
index 25dd7bf085f4d..785471573bb5e 100644
--- a/FWCore/MessageService/interface/MessageLoggerScribe.h
+++ b/FWCore/MessageService/interface/MessageLoggerScribe.h
@@ -20,226 +20,210 @@
 #include <iostream>
 
 namespace edm {
-namespace service {       
-
-// ----------------------------------------------------------------------
-//
-// MessageLoggerScribe.h
-//
-// Changes:
-//
-//   1 - 2/6/07  mf  	
-//	Set up ability to get a remembered pointer to the ErrorLog of an
-//      instance of MessageLoggerScribe, from a non-member function, via
-//	getErrorLog_ptr(), and a corresponding routine to remember the pointer
-//	as setStaticErrorLog_ptr().  Needed if we decide to send an explicit 
-//      message from the scribe.
-//
-//   2 - ?/?/? before 3/1/07 jm
-//	 Modify parameter getting template so as not to catch tracked ones
-//	 (that is, to crash if user mistakenly does not say untracked)
-//
-//   3 - 3/13/07 mf
-//	 Added configure_ordinary_destinations, configure_fwkJobReports,
-//	 and configure_statistics to allow these to be broken out of 
-//	 configure_errorlog. 	
-//
-//   4 - 3/26/07 mf
-//	 Added configure_default_fwkJobReport, which implements the config
-//	 originally placed in the .cfi file.
-//
-//   5 - 6/15/07 mf
-//	 Accommodations for use of MessageLoggerDefault structure 
-//
-//   6 - 7/24/07 mf
-//	 Instace variable indicating that we really are logging what is sent.
-//	 This is to be able to supress the <generator> info sent at exit by
-//	 the JobReport, in the case where no .cfg file was given.
-//
-//   7 - 4/8/08 mf
-//	 Modified getAparameter behavior when tracked parameter is found,
-//	 for nicer output message. 
-//
-//   8 - 6/19/08 mf
-//	 triggerFJRmessageSummary
-//
-//   9 - 10/21/08 mf
-//	 variables and routines in preparation for single-thread
-//
-//  10 - 10/22/08 mf
-//	 derivation from AbstractMLscribe to allow for single-thread calling
-//	 from MessageLoggerQ without introducing coupling to MessageService
-//
-//  11 - 5/26/09 mf
-//	 restore getAparameter behavior to NOT throw for tracked, since
-//       now this will be caught when validating the PSet.
-//
-//  12 - 8/10/09 mf, cj
-//	 member data  to hold shared pointer to thread queue
-//
-// -----------------------------------------------------------------------
-
-class ThreadQueue;
-class ELadministrator;
-class ELstatistics;
-
-class MessageLoggerScribe : public AbstractMLscribe
-{
-public:
-  // ---  birth/death:
-  
-  // ChangeLog 12
-  /// --- If queue is NULL, this sets singleThread true 
-  explicit MessageLoggerScribe(std::shared_ptr<ThreadQueue> queue);
-  
-  ~MessageLoggerScribe() override;
-
-  // --- receive and act on messages:
-  virtual
-  void  run();
-  							// changelog 10
-  void  runCommand(MessageLoggerQ::OpCode  opcode, void * operand) override;
-		  						// changeLog 9
-
-private:
-  // --- convenience typedefs
-  typedef std::string          String;
-  typedef std::vector<String>  vString;
-  typedef ParameterSet         PSet;
-
-  // --- log one consumed message
-  void log(ErrorObj * errorobj_p);
-
-  // --- cause statistics destinations to output
-  void triggerStatisticsSummaries();
-  void triggerFJRmessageSummary(std::map<std::string, double> & sm);
-  
-  // --- handle details of configuring via a ParameterSet:
-  void  configure_errorlog( );
-  void  configure_ordinary_destinations( );			// Change Log 3
-  void  configure_statistics( );				// Change Log 3
-  void  configure_dest( std::shared_ptr<ELdestination> dest_ctrl
-                      , String const &  filename
-		      );
-
-#define VALIDATE_ELSEWHERE					// ChangeLog 11
+  namespace service {
+
+    // ----------------------------------------------------------------------
+    //
+    // MessageLoggerScribe.h
+    //
+    // Changes:
+    //
+    //   1 - 2/6/07  mf
+    //	Set up ability to get a remembered pointer to the ErrorLog of an
+    //      instance of MessageLoggerScribe, from a non-member function, via
+    //	getErrorLog_ptr(), and a corresponding routine to remember the pointer
+    //	as setStaticErrorLog_ptr().  Needed if we decide to send an explicit
+    //      message from the scribe.
+    //
+    //   2 - ?/?/? before 3/1/07 jm
+    //	 Modify parameter getting template so as not to catch tracked ones
+    //	 (that is, to crash if user mistakenly does not say untracked)
+    //
+    //   3 - 3/13/07 mf
+    //	 Added configure_ordinary_destinations, configure_fwkJobReports,
+    //	 and configure_statistics to allow these to be broken out of
+    //	 configure_errorlog.
+    //
+    //   4 - 3/26/07 mf
+    //	 Added configure_default_fwkJobReport, which implements the config
+    //	 originally placed in the .cfi file.
+    //
+    //   5 - 6/15/07 mf
+    //	 Accommodations for use of MessageLoggerDefault structure
+    //
+    //   6 - 7/24/07 mf
+    //	 Instace variable indicating that we really are logging what is sent.
+    //	 This is to be able to supress the <generator> info sent at exit by
+    //	 the JobReport, in the case where no .cfg file was given.
+    //
+    //   7 - 4/8/08 mf
+    //	 Modified getAparameter behavior when tracked parameter is found,
+    //	 for nicer output message.
+    //
+    //   8 - 6/19/08 mf
+    //	 triggerFJRmessageSummary
+    //
+    //   9 - 10/21/08 mf
+    //	 variables and routines in preparation for single-thread
+    //
+    //  10 - 10/22/08 mf
+    //	 derivation from AbstractMLscribe to allow for single-thread calling
+    //	 from MessageLoggerQ without introducing coupling to MessageService
+    //
+    //  11 - 5/26/09 mf
+    //	 restore getAparameter behavior to NOT throw for tracked, since
+    //       now this will be caught when validating the PSet.
+    //
+    //  12 - 8/10/09 mf, cj
+    //	 member data  to hold shared pointer to thread queue
+    //
+    // -----------------------------------------------------------------------
+
+    class ThreadQueue;
+    class ELadministrator;
+    class ELstatistics;
+
+    class MessageLoggerScribe : public AbstractMLscribe {
+    public:
+      // ---  birth/death:
+
+      // ChangeLog 12
+      /// --- If queue is NULL, this sets singleThread true
+      explicit MessageLoggerScribe(std::shared_ptr<ThreadQueue> queue);
+
+      ~MessageLoggerScribe() override;
+
+      // --- receive and act on messages:
+      virtual void run();
+      // changelog 10
+      void runCommand(MessageLoggerQ::OpCode opcode, void* operand) override;
+      // changeLog 9
+
+    private:
+      // --- convenience typedefs
+      typedef std::string String;
+      typedef std::vector<String> vString;
+      typedef ParameterSet PSet;
+
+      // --- log one consumed message
+      void log(ErrorObj* errorobj_p);
+
+      // --- cause statistics destinations to output
+      void triggerStatisticsSummaries();
+      void triggerFJRmessageSummary(std::map<std::string, double>& sm);
+
+      // --- handle details of configuring via a ParameterSet:
+      void configure_errorlog();
+      void configure_ordinary_destinations();  // Change Log 3
+      void configure_statistics();             // Change Log 3
+      void configure_dest(std::shared_ptr<ELdestination> dest_ctrl, String const& filename);
+
+#define VALIDATE_ELSEWHERE  // ChangeLog 11
 
 #ifdef OLDSTYLE
-  template <class T>
-  T getAparameter ( PSet const& p, std::string const & id, T const & def ) 
-  {
-    T t;
-    try { 
-      t = p.template getUntrackedParameter<T>(id, def);
-    } catch (...) {
-      t = p.template getParameter<T>(id);
-      std::cerr << "Tracked parameter " << id 
-                << " used in MessageLogger configuration.\n"
-		<< "Use of tracked parameters for the message service "
-		<< "is deprecated.\n"
-		<< "The .cfg file should be modified to make this untracked.\n";
-    }
-    return t;
-  }
+      template <class T>
+      T getAparameter(PSet const& p, std::string const& id, T const& def) {
+        T t;
+        try {
+          t = p.template getUntrackedParameter<T>(id, def);
+        } catch (...) {
+          t = p.template getParameter<T>(id);
+          std::cerr << "Tracked parameter " << id << " used in MessageLogger configuration.\n"
+                    << "Use of tracked parameters for the message service "
+                    << "is deprecated.\n"
+                    << "The .cfg file should be modified to make this untracked.\n";
+        }
+        return t;
+      }
 #else
 #ifdef SIMPLESTYLE
-  template <class T>
-  T getAparameter ( PSet const& p, std::string const & id, T const & def ) 
-  {
-    T t;
-    t = p.template getUntrackedParameter<T>(id, def);
-    return t;
-  }								// changelog 2
+      template <class T>
+      T getAparameter(PSet const& p, std::string const& id, T const& def) {
+        T t;
+        t = p.template getUntrackedParameter<T>(id, def);
+        return t;
+      }  // changelog 2
 #else
 #ifdef VALIDATE_ELSEWHERE
-  template <class T>						// ChangeLog 11
-  T getAparameter ( PSet const& p, std::string const & id, T const & def ) 
-  {
-    T t = def;
-    try { 
-      t = p.template getUntrackedParameter<T>(id, def);
-    } catch (...) {
-      try {
-        t = p.template getParameter<T>(id);
-      } catch (...) {
-        // Since PSetValidation will catch such errors, we simply proceed as
-	// best we can in case we are setting up the logger just to contain the 
-	// validation-caught error messages. 
+      template <class T>  // ChangeLog 11
+      T getAparameter(PSet const& p, std::string const& id, T const& def) {
+        T t = def;
+        try {
+          t = p.template getUntrackedParameter<T>(id, def);
+        } catch (...) {
+          try {
+            t = p.template getParameter<T>(id);
+          } catch (...) {
+            // Since PSetValidation will catch such errors, we simply proceed as
+            // best we can in case we are setting up the logger just to contain the
+            // validation-caught error messages.
+          }
+        }
+        return t;
       }
-    }
-    return t;
-  }
 #else  // Do not tolerate errors
-  template <class T>
-  T  getAparameter ( PSet const& p, std::string const & id, T const & def ) 
-  {								// changelog 7
-    T t;
-    try { 
-      t = p.template getUntrackedParameter<T>(id, def);
-    } catch (cms::Exception& e) {
-      try {
-        t = p.template getParameter<T>(id);
-      } catch (...) {
-        // if we get here, this was NOT a simple tracked parameter goof.
-	// we should just rethrow the ORIGINAL error
-	e.raise();
-      } 
-      std::cerr << "Tracked parameter " << id 
-                << " used in MessageLogger configuration.\n"
-		<< "Use of tracked parameters for the message service "
-		<< "is not allowed.\n"
-		<< "The .cfg file should be modified to make this untracked.\n";
-      e.raise();		
-    } catch (...) {
-      // This is not the usual tracked/untracked error; we can't add useful info
-      throw;
-    }
-    return t;
-     }
-
-#endif // VALIDATE_ELSEWHERE
-#endif // SIMPLESTYLE
-#endif // OLD_STYLE and the else Do not tolerate errors
+      template <class T>
+      T getAparameter(PSet const& p, std::string const& id, T const& def) {  // changelog 7
+        T t;
+        try {
+          t = p.template getUntrackedParameter<T>(id, def);
+        } catch (cms::Exception& e) {
+          try {
+            t = p.template getParameter<T>(id);
+          } catch (...) {
+            // if we get here, this was NOT a simple tracked parameter goof.
+            // we should just rethrow the ORIGINAL error
+            e.raise();
+          }
+          std::cerr << "Tracked parameter " << id << " used in MessageLogger configuration.\n"
+                    << "Use of tracked parameters for the message service "
+                    << "is not allowed.\n"
+                    << "The .cfg file should be modified to make this untracked.\n";
+          e.raise();
+        } catch (...) {
+          // This is not the usual tracked/untracked error; we can't add useful info
+          throw;
+        }
+        return t;
+      }
+
+#endif  // VALIDATE_ELSEWHERE
+#endif  // SIMPLESTYLE
+#endif  // OLD_STYLE and the else Do not tolerate errors
 
 #ifdef REMOVE
-  template <class T>
-  T  getCategoryDefault ( PSet * p, 
-  			  std::string const & id, 
-			  std::string const & def  ) 
-  {
-    T t;
-    t = p->template getUntrackedParameter<T>(id, def);
-    return t;
-  }								
+      template <class T>
+      T getCategoryDefault(PSet* p, std::string const& id, std::string const& def) {
+        T t;
+        t = p->template getUntrackedParameter<T>(id, def);
+        return t;
+      }
 #endif
 
-
-  // --- other helpers
-  void parseCategories (std::string const & s, std::vector<std::string> & cats);
-  
-  // --- data:
-  edm::propagate_const<std::shared_ptr<ELadministrator>> admin_p;
-  std::shared_ptr<ELdestination>                       early_dest;
-  std::vector<edm::propagate_const<std::shared_ptr<std::ofstream>>> file_ps;
-  edm::propagate_const<std::shared_ptr<PSet>> job_pset_p;
-  std::map<String,edm::propagate_const<std::ostream*>> stream_ps;
-  std::vector<String> 	  	      ordinary_destination_filenames;
-  std::vector<std::shared_ptr<ELstatistics>>          statisticsDestControls;
-  std::vector<bool>                   statisticsResets;
-  bool				      clean_slate_configuration;
-  value_ptr<MessageLoggerDefaults>    messageLoggerDefaults;
-  bool				      active;
-  bool 				      singleThread;		// changeLog 9
-  bool 				      done;			// changeLog 9
-  bool 				      purge_mode;		// changeLog 9
-  int				      count;			// changeLog 9
-  edm::propagate_const<std::shared_ptr<ThreadQueue>> m_queue;	// changeLog 12
-      
-};  // MessageLoggerScribe
-
-
-}   // end of namespace service
+      // --- other helpers
+      void parseCategories(std::string const& s, std::vector<std::string>& cats);
+
+      // --- data:
+      edm::propagate_const<std::shared_ptr<ELadministrator>> admin_p;
+      std::shared_ptr<ELdestination> early_dest;
+      std::vector<edm::propagate_const<std::shared_ptr<std::ofstream>>> file_ps;
+      edm::propagate_const<std::shared_ptr<PSet>> job_pset_p;
+      std::map<String, edm::propagate_const<std::ostream*>> stream_ps;
+      std::vector<String> ordinary_destination_filenames;
+      std::vector<std::shared_ptr<ELstatistics>> statisticsDestControls;
+      std::vector<bool> statisticsResets;
+      bool clean_slate_configuration;
+      value_ptr<MessageLoggerDefaults> messageLoggerDefaults;
+      bool active;
+      bool singleThread;                                           // changeLog 9
+      bool done;                                                   // changeLog 9
+      bool purge_mode;                                             // changeLog 9
+      int count;                                                   // changeLog 9
+      edm::propagate_const<std::shared_ptr<ThreadQueue>> m_queue;  // changeLog 12
+
+    };  // MessageLoggerScribe
+
+  }  // end of namespace service
 }  // namespace edm
 
-
 #endif  // FWCore_MessageService_MessageLoggerScribe_h
diff --git a/FWCore/MessageService/interface/MessageServicePSetValidation.h b/FWCore/MessageService/interface/MessageServicePSetValidation.h
index 342f7b2302584..4fe3d88166d51 100644
--- a/FWCore/MessageService/interface/MessageServicePSetValidation.h
+++ b/FWCore/MessageService/interface/MessageServicePSetValidation.h
@@ -36,267 +36,240 @@
 
 // forward declarations
 
-namespace edm  {
-namespace service  {
+namespace edm {
+  namespace service {
 
+    class MessageServicePSetValidation {
+    public:
+      std::string operator()(ParameterSet const& pset);
 
-class MessageServicePSetValidation
-{
-public:
-  std::string operator() ( ParameterSet const & pset ); 
-private:
-  typedef std::string          String;
-  typedef std::vector<String>  vString;
+    private:
+      typedef std::string String;
+      typedef std::vector<String> vString;
 
-  void messageLoggerPSet ( ParameterSet const & pset ); 
-  void psetLists ( ParameterSet const & pset ); 
-  void suppressionLists ( ParameterSet const & pset ); 
-  bool validateThreshold (std::string const & thresh, 
-  			  std::string const & psetName);
-  bool checkThreshold (std::string const & thresh);
-  void noDuplicates(vString const & v, std::string const & psetName,
-                    std::string  const & parameterLabel );
-  void noDuplicates(vString const & v1, vString const & v2, 
-             	    std::string const & psetName,
-      		    std::string  const & p1, std::string  const & p2 );
-  void noCoutCerrClash(vString const & v, std::string const & psetName,
-                       std::string  const & parameterLabel );
-  void noKeywords(vString const & v, std::string const & psetName,
-                  std::string  const & parameterLabel );
-  bool keywordCheck(std::string const & word);
-  void noNonPSetUsage( ParameterSet const & pset, 
-  		      vString const & v, std::string const & psetName,
-                      std::string const & parameterLabel );
-  void noBadParams(vString const & v, vString const & params, 
-  		   std::string const & psetName, 
-		   std::string const & parameterLabel, 
-		   std::string const & type);
-  void vStringsCheck(ParameterSet const & pset,std::string const & psetName); 
-  bool wildcard(vString const & v);
-  bool allowedVstring (std::string const & s);
-  void noOtherPsets(ParameterSet const & pset); 
-  void noNoncategoryPsets(ParameterSet const & pset,
-  			  std::string const & psetName);  
-  bool lookForMatch(vString const & v, std::string const & s);
-  void destinationPSets(ParameterSet const & pset);
-  void destinationPSet(ParameterSet const & pset, std::string const & psetName);
-  void defaultPSet(ParameterSet const & main_pset);
-  void statisticsPSets(ParameterSet const & pset);
-  void statisticsPSet(ParameterSet const & pset, std::string const & psetName);
-  void fwkJobReportPSets(ParameterSet const & pset);
-  void fwkJobReportPSet(ParameterSet const & pset,std::string const & psetName);
-  void categoryPSets(ParameterSet const & pset, std::string const & psetName); 
-  void categoryPSet (ParameterSet const & pset, 
-  		     std::string const & OuterPsetName,
-		     std::string const & categoryName); 
-  void catInts (ParameterSet const & pset, 
-  		std::string const & psetName,
-		std::string const & categoryName); 
-  void catNoPSets (ParameterSet const & pset, 
-  		   std::string const & psetName,
-		   std::string const & categoryName); 
-  void catBoolRestriction (ParameterSet const & pset, 
-  			   std::string  const & psetName, 
-  			   std::string  const & categoryName, 
-			   std::string const & type);
+      void messageLoggerPSet(ParameterSet const& pset);
+      void psetLists(ParameterSet const& pset);
+      void suppressionLists(ParameterSet const& pset);
+      bool validateThreshold(std::string const& thresh, std::string const& psetName);
+      bool checkThreshold(std::string const& thresh);
+      void noDuplicates(vString const& v, std::string const& psetName, std::string const& parameterLabel);
+      void noDuplicates(vString const& v1,
+                        vString const& v2,
+                        std::string const& psetName,
+                        std::string const& p1,
+                        std::string const& p2);
+      void noCoutCerrClash(vString const& v, std::string const& psetName, std::string const& parameterLabel);
+      void noKeywords(vString const& v, std::string const& psetName, std::string const& parameterLabel);
+      bool keywordCheck(std::string const& word);
+      void noNonPSetUsage(ParameterSet const& pset,
+                          vString const& v,
+                          std::string const& psetName,
+                          std::string const& parameterLabel);
+      void noBadParams(vString const& v,
+                       vString const& params,
+                       std::string const& psetName,
+                       std::string const& parameterLabel,
+                       std::string const& type);
+      void vStringsCheck(ParameterSet const& pset, std::string const& psetName);
+      bool wildcard(vString const& v);
+      bool allowedVstring(std::string const& s);
+      void noOtherPsets(ParameterSet const& pset);
+      void noNoncategoryPsets(ParameterSet const& pset, std::string const& psetName);
+      bool lookForMatch(vString const& v, std::string const& s);
+      void destinationPSets(ParameterSet const& pset);
+      void destinationPSet(ParameterSet const& pset, std::string const& psetName);
+      void defaultPSet(ParameterSet const& main_pset);
+      void statisticsPSets(ParameterSet const& pset);
+      void statisticsPSet(ParameterSet const& pset, std::string const& psetName);
+      void fwkJobReportPSets(ParameterSet const& pset);
+      void fwkJobReportPSet(ParameterSet const& pset, std::string const& psetName);
+      void categoryPSets(ParameterSet const& pset, std::string const& psetName);
+      void categoryPSet(ParameterSet const& pset, std::string const& OuterPsetName, std::string const& categoryName);
+      void catInts(ParameterSet const& pset, std::string const& psetName, std::string const& categoryName);
+      void catNoPSets(ParameterSet const& pset, std::string const& psetName, std::string const& categoryName);
+      void catBoolRestriction(ParameterSet const& pset,
+                              std::string const& psetName,
+                              std::string const& categoryName,
+                              std::string const& type);
 
-  template <typename T>
-  T check 
-      ( ParameterSet const & pset, 
-  	std::string  const & psetName,
-	std::string  const & parameterLabel ) 
-  {
-    T val = T();
-    try {
-      if (!pset.exists(parameterLabel)) return val;
-      if ( pset.existsAs<T> (parameterLabel, false) ) {
-	val = pset.getUntrackedParameter<T>(parameterLabel, val);
-	return val;
-      }
-      if ( pset.existsAs<T> (parameterLabel, true) )   {
-	flaws << psetName << " PSet: \n"
-	      << parameterLabel
-	      << " is declared as tracked - needs to be untracked \n";
-        val = pset.getParameter<T>(parameterLabel);
-      } else {
-        flaws << psetName << " PSet: \n"
-	      << parameterLabel 
-	      << " is declared with incorrect type \n";
-      }
-      return val;
-    } catch (cms::Exception& e) {
-      flaws << psetName << " PSet: \n"
-	    << parameterLabel 
-	    << " is declared but causes an exception when processed: \n"
-	    << e.what() << "\n";
-      return val;
-    }
-  }  // check()
+      template <typename T>
+      T check(ParameterSet const& pset, std::string const& psetName, std::string const& parameterLabel) {
+        T val = T();
+        try {
+          if (!pset.exists(parameterLabel))
+            return val;
+          if (pset.existsAs<T>(parameterLabel, false)) {
+            val = pset.getUntrackedParameter<T>(parameterLabel, val);
+            return val;
+          }
+          if (pset.existsAs<T>(parameterLabel, true)) {
+            flaws << psetName << " PSet: \n" << parameterLabel << " is declared as tracked - needs to be untracked \n";
+            val = pset.getParameter<T>(parameterLabel);
+          } else {
+            flaws << psetName << " PSet: \n" << parameterLabel << " is declared with incorrect type \n";
+          }
+          return val;
+        } catch (cms::Exception& e) {
+          flaws << psetName << " PSet: \n"
+                << parameterLabel << " is declared but causes an exception when processed: \n"
+                << e.what() << "\n";
+          return val;
+        }
+      }  // check()
 
-  template <typename T>
-  void disallowedParam 
-      ( ParameterSet const & pset,
-        vString      const & v,
-  	std::string  const & psetName,
-	std::string  const & parameterLabel, 	
-	std::string  const & type ) 
-  {
-    vString params = pset.getParameterNamesForType <T> (true);
-    noBadParams(v, params, psetName, parameterLabel, type);
-    params = pset.getParameterNamesForType <T> (false);
-    noBadParams(v, params, psetName, parameterLabel, type);
-  }  // disallowedParam()
+      template <typename T>
+      void disallowedParam(ParameterSet const& pset,
+                           vString const& v,
+                           std::string const& psetName,
+                           std::string const& parameterLabel,
+                           std::string const& type) {
+        vString params = pset.getParameterNamesForType<T>(true);
+        noBadParams(v, params, psetName, parameterLabel, type);
+        params = pset.getParameterNamesForType<T>(false);
+        noBadParams(v, params, psetName, parameterLabel, type);
+      }  // disallowedParam()
 
-  template <typename T>
-  void noneExcept (ParameterSet const & pset, 
-  		std::string  const & psetName, std::string const & type)
-  {
-    vString x = pset.template getParameterNamesForType <T> (false);
-    vString::const_iterator end = x.end();
-    for ( vString::const_iterator i = x.begin(); i != end; ++i ) {
-      flaws << psetName << " PSet: \n"
-	    << (*i) << " is used as a " << type << "\n"
-	    << "Usage of " << type << " is not recognized here\n"; 
-    }
-    x = pset.template getParameterNamesForType <T> (true);
-    end = x.end();
-    for ( vString::const_iterator i = x.begin(); i != end; ++i ) {
-      if  ( (*i) == "@service_type" ) continue;    
-      flaws << psetName << " PSet: \n"
-	    << (*i) << " is used as a tracked " << type << "\n"
-	    << "Tracked parameters not allowed here, "
-	    <<" and even untracked it would not be recognized\n";
-    }
-  } // noneExcept()
+      template <typename T>
+      void noneExcept(ParameterSet const& pset, std::string const& psetName, std::string const& type) {
+        vString x = pset.template getParameterNamesForType<T>(false);
+        vString::const_iterator end = x.end();
+        for (vString::const_iterator i = x.begin(); i != end; ++i) {
+          flaws << psetName << " PSet: \n"
+                << (*i) << " is used as a " << type << "\n"
+                << "Usage of " << type << " is not recognized here\n";
+        }
+        x = pset.template getParameterNamesForType<T>(true);
+        end = x.end();
+        for (vString::const_iterator i = x.begin(); i != end; ++i) {
+          if ((*i) == "@service_type")
+            continue;
+          flaws << psetName << " PSet: \n"
+                << (*i) << " is used as a tracked " << type << "\n"
+                << "Tracked parameters not allowed here, "
+                << " and even untracked it would not be recognized\n";
+        }
+      }  // noneExcept()
 
-  template <typename T>
-  void noneExcept (ParameterSet const & pset, 
-  		std::string  const & psetName, std::string const & type,
-		std::string  const & ok)
-  {
-    vString x = pset.template getParameterNamesForType <T> (false);
-    vString::const_iterator end = x.end();
-    for ( vString::const_iterator i = x.begin(); i != end; ++i ) {
-      std::string val = (*i);
-      if ( val != ok ) {
-	flaws << psetName << " PSet: \n"
-	      << val << " is used as a " << type << "\n"
-	      << "This usage is not recognized in this type of PSet\n"; 
-      }
-    }
-    x = pset.template getParameterNamesForType <T> (true);
-    end = x.end();
-    for ( vString::const_iterator i = x.begin(); i != end; ++i ) {
-      if  ( (*i) == "@service_type" ) continue;    
-      flaws << psetName << " PSet: \n"
-	    << (*i) << " is used as a tracked " << type << "\n"
-	    << "Tracked parameters not allowed here\n";
-    }
-  } // noneExcept(okValue)
+      template <typename T>
+      void noneExcept(ParameterSet const& pset,
+                      std::string const& psetName,
+                      std::string const& type,
+                      std::string const& ok) {
+        vString x = pset.template getParameterNamesForType<T>(false);
+        vString::const_iterator end = x.end();
+        for (vString::const_iterator i = x.begin(); i != end; ++i) {
+          std::string val = (*i);
+          if (val != ok) {
+            flaws << psetName << " PSet: \n"
+                  << val << " is used as a " << type << "\n"
+                  << "This usage is not recognized in this type of PSet\n";
+          }
+        }
+        x = pset.template getParameterNamesForType<T>(true);
+        end = x.end();
+        for (vString::const_iterator i = x.begin(); i != end; ++i) {
+          if ((*i) == "@service_type")
+            continue;
+          flaws << psetName << " PSet: \n"
+                << (*i) << " is used as a tracked " << type << "\n"
+                << "Tracked parameters not allowed here\n";
+        }
+      }  // noneExcept(okValue)
 
-  template <typename T>
-  void noneExcept (ParameterSet const & pset, 
-  		std::string  const & psetName, std::string const & type,
-		T const & ok1, T const & ok2 )
-  {
-    vString x = pset.template getParameterNamesForType <T> (false);
-    vString::const_iterator end = x.end();
-    for ( vString::const_iterator i = x.begin(); i != end; ++i ) {
-      std::string val = (*i);
-      if ( (val != ok1) && (val != ok2) ) {
-	flaws << psetName << " PSet: \n"
-	      << val << " is used as a " << type << "\n"
-	      << "This usage is not recognized in this type of PSet\n"; 
-      }
-    }
-    x = pset.template getParameterNamesForType <T> (true);
-    end = x.end();
-    for ( vString::const_iterator i = x.begin(); i != end; ++i ) {
-      if  ( (*i) == "@service_type" ) continue;    
-      flaws << psetName << " PSet: \n"
-	    << (*i) << " is used as a tracked " << type << "\n"
-	    << "Tracked parameters not allowed here\n";
-    }
-  } // noneExcept(okValue1, okValue2)
+      template <typename T>
+      void noneExcept(
+          ParameterSet const& pset, std::string const& psetName, std::string const& type, T const& ok1, T const& ok2) {
+        vString x = pset.template getParameterNamesForType<T>(false);
+        vString::const_iterator end = x.end();
+        for (vString::const_iterator i = x.begin(); i != end; ++i) {
+          std::string val = (*i);
+          if ((val != ok1) && (val != ok2)) {
+            flaws << psetName << " PSet: \n"
+                  << val << " is used as a " << type << "\n"
+                  << "This usage is not recognized in this type of PSet\n";
+          }
+        }
+        x = pset.template getParameterNamesForType<T>(true);
+        end = x.end();
+        for (vString::const_iterator i = x.begin(); i != end; ++i) {
+          if ((*i) == "@service_type")
+            continue;
+          flaws << psetName << " PSet: \n"
+                << (*i) << " is used as a tracked " << type << "\n"
+                << "Tracked parameters not allowed here\n";
+        }
+      }  // noneExcept(okValue1, okValue2)
 
-  template <typename T>
-  void noneExcept (ParameterSet const & pset, 
-  		std::string  const & psetName, std::string const & type,
-		vString const & vok )
-  {
-    vString x = pset.template getParameterNamesForType <T> (false);
-    vString::const_iterator end = x.end();
-    vString::const_iterator vend = vok.end();
-    for ( vString::const_iterator i = x.begin(); i != end; ++i ) {
-      bool found = false;    
-      for (vString::const_iterator vit = vok.begin(); vit!=vend; ++vit) {
-	if ( *i == *vit ) found = true;
-      }
-      if ( !found ) {
-	  flaws << psetName << " PSet: \n"
-		<< *i << " is used as a " << type << "\n"
-		<< "This usage is not recognized in this type of PSet\n"; 
-      }
-    }
-    x = pset.template getParameterNamesForType <T> (true);
-    end = x.end();
-    for ( vString::const_iterator i = x.begin(); i != end; ++i ) {
-      if  ( (*i) == "@service_type" ) continue;    
-      flaws << psetName << " PSet: \n"
-	    << (*i) << " is used as a tracked " << type << "\n"
-	    << "Tracked parameters not allowed here\n";
-    }
-  } // noneExcept(vok)
+      template <typename T>
+      void noneExcept(ParameterSet const& pset,
+                      std::string const& psetName,
+                      std::string const& type,
+                      vString const& vok) {
+        vString x = pset.template getParameterNamesForType<T>(false);
+        vString::const_iterator end = x.end();
+        vString::const_iterator vend = vok.end();
+        for (vString::const_iterator i = x.begin(); i != end; ++i) {
+          bool found = false;
+          for (vString::const_iterator vit = vok.begin(); vit != vend; ++vit) {
+            if (*i == *vit)
+              found = true;
+          }
+          if (!found) {
+            flaws << psetName << " PSet: \n"
+                  << *i << " is used as a " << type << "\n"
+                  << "This usage is not recognized in this type of PSet\n";
+          }
+        }
+        x = pset.template getParameterNamesForType<T>(true);
+        end = x.end();
+        for (vString::const_iterator i = x.begin(); i != end; ++i) {
+          if ((*i) == "@service_type")
+            continue;
+          flaws << psetName << " PSet: \n"
+                << (*i) << " is used as a tracked " << type << "\n"
+                << "Tracked parameters not allowed here\n";
+        }
+      }  // noneExcept(vok)
 
-  template <typename T>
-  void catNone (ParameterSet const & pset, 
-  		std::string  const & psetName, 
-  		std::string  const & categoryName, 
-		std::string const & type)
-  {
-    vString x = pset.template getParameterNamesForType <T> (false);
-    vString::const_iterator end = x.end();
-    for ( vString::const_iterator i = x.begin(); i != end; ++i ) {
-      flaws << categoryName << " category PSet nested in "
-      	    << psetName << " PSet: \n"
-	    << (*i) << " is used as a " << type << "\n"
-	    << "Usage of " << type << " is not recognized here\n"; 
-    }
-    x = pset.template getParameterNamesForType <T> (true);
-    end = x.end();
-    for ( vString::const_iterator i = x.begin(); i != end; ++i ) {
-      flaws << categoryName << " category PSet nested in "
-      	    << psetName << " PSet: \n"
-	    << (*i) << " is used as a tracked " << type << "\n"
-	    << "Tracked parameters not allowed here, "
-	    <<" and even untracked it would not be recognized\n";
-    }
-  } // catNone()
+      template <typename T>
+      void catNone(ParameterSet const& pset,
+                   std::string const& psetName,
+                   std::string const& categoryName,
+                   std::string const& type) {
+        vString x = pset.template getParameterNamesForType<T>(false);
+        vString::const_iterator end = x.end();
+        for (vString::const_iterator i = x.begin(); i != end; ++i) {
+          flaws << categoryName << " category PSet nested in " << psetName << " PSet: \n"
+                << (*i) << " is used as a " << type << "\n"
+                << "Usage of " << type << " is not recognized here\n";
+        }
+        x = pset.template getParameterNamesForType<T>(true);
+        end = x.end();
+        for (vString::const_iterator i = x.begin(); i != end; ++i) {
+          flaws << categoryName << " category PSet nested in " << psetName << " PSet: \n"
+                << (*i) << " is used as a tracked " << type << "\n"
+                << "Tracked parameters not allowed here, "
+                << " and even untracked it would not be recognized\n";
+        }
+      }  // catNone()
 
+      // private data
+      std::ostringstream flaws;
+      std::vector<std::string> destinations;
+      std::vector<std::string> statistics;
+      std::vector<std::string> fwkJobReports;
+      std::vector<std::string> categories;
+      std::vector<std::string> messageIDs;
+      std::vector<std::string> debugModules;
+      std::vector<std::string> suppressInfo;
+      std::vector<std::string> suppressDebug;
+      std::vector<std::string> suppressWarning;
+      std::vector<std::string> suppressError;
 
+    };  // MessageServicePSetValidation
 
-  // private data  
-  std::ostringstream flaws; 
-  std::vector<std::string> destinations;
-  std::vector<std::string> statistics;
-  std::vector<std::string> fwkJobReports;
-  std::vector<std::string> categories;
-  std::vector<std::string> messageIDs;
-  std::vector<std::string> debugModules;
-  std::vector<std::string> suppressInfo;
-  std::vector<std::string> suppressDebug;
-  std::vector<std::string> suppressWarning;
-  std::vector<std::string> suppressError;
-
-  
-};  // MessageServicePSetValidation
-
-
-}  // namespace service
+  }  // namespace service
 
 }  // namespace edm
 
-
-
 #endif  // FWCore_MessageService_MessageServicePSetValidation_h
-
diff --git a/FWCore/MessageService/interface/MessageServicePresence.h b/FWCore/MessageService/interface/MessageServicePresence.h
index 7b93a56eea64b..4a0d9af2a0046 100644
--- a/FWCore/MessageService/interface/MessageServicePresence.h
+++ b/FWCore/MessageService/interface/MessageServicePresence.h
@@ -8,36 +8,32 @@
 
 #include <memory>
 
+namespace edm {
+  namespace service {
 
-namespace edm  {
-namespace service {       
+    class ThreadQueue;
 
-class ThreadQueue;
+    class MessageServicePresence : public Presence {
+    public:
+      // ---  birth/death:
+      MessageServicePresence();
+      ~MessageServicePresence() override;
 
-class MessageServicePresence : public Presence
-{
-public:
-  // ---  birth/death:
-  MessageServicePresence();
-  ~MessageServicePresence() override;
+    private:
+      // --- no copying:
+      MessageServicePresence(MessageServicePresence const&) = delete;  // Disallow copying
+      void operator=(MessageServicePresence const&) = delete;          // Disallow copying
 
-private:
-  // --- no copying:
-  MessageServicePresence(MessageServicePresence const&) = delete; // Disallow copying
-  void operator=(MessageServicePresence const &) = delete; // Disallow copying
+      std::shared_ptr<ThreadQueue const> queue() const { return get_underlying_safe(m_queue); }
+      std::shared_ptr<ThreadQueue>& queue() { return get_underlying_safe(m_queue); }
 
-  std::shared_ptr<ThreadQueue const> queue() const {return get_underlying_safe(m_queue);}
-  std::shared_ptr<ThreadQueue>& queue() {return get_underlying_safe(m_queue);}
+      // --- data:
+      edm::propagate_const<std::shared_ptr<ThreadQueue>> m_queue;
+      boost::thread m_scribeThread;
 
-  // --- data:
-  edm::propagate_const<std::shared_ptr<ThreadQueue>> m_queue;
-  boost::thread  m_scribeThread;
+    };  // MessageServicePresence
 
-};  // MessageServicePresence
-
-
-}   // end of namespace service
+  }  // end of namespace service
 }  // namespace edm
 
-
 #endif  // FWCore_MessageService_MessageServicePresence_h
diff --git a/FWCore/MessageService/interface/SingleThreadMSPresence.h b/FWCore/MessageService/interface/SingleThreadMSPresence.h
index 318ceed16a77d..340d1f822b165 100644
--- a/FWCore/MessageService/interface/SingleThreadMSPresence.h
+++ b/FWCore/MessageService/interface/SingleThreadMSPresence.h
@@ -3,29 +3,26 @@
 
 #include "FWCore/Utilities/interface/Presence.h"
 
-namespace edm  {
-namespace service {       
+namespace edm {
+  namespace service {
 
-class SingleThreadMSPresence : public Presence
-{
-public:
-  // ---  birth/death:
-  SingleThreadMSPresence();
-  ~SingleThreadMSPresence() override;
+    class SingleThreadMSPresence : public Presence {
+    public:
+      // ---  birth/death:
+      SingleThreadMSPresence();
+      ~SingleThreadMSPresence() override;
 
-  // --- Access to the scribe
-  // REMOVED AbstractMLscribe * scribe_ptr() { return &m; }  
+      // --- Access to the scribe
+      // REMOVED AbstractMLscribe * scribe_ptr() { return &m; }
 
-private:
-  // --- no copying:
-  SingleThreadMSPresence(SingleThreadMSPresence const &) = delete;
-  void  operator = (SingleThreadMSPresence const &) = delete;
-  
-};  // SingleThreadMSPresence
+    private:
+      // --- no copying:
+      SingleThreadMSPresence(SingleThreadMSPresence const &) = delete;
+      void operator=(SingleThreadMSPresence const &) = delete;
 
+    };  // SingleThreadMSPresence
 
-}   // end of namespace service
+  }  // end of namespace service
 }  // namespace edm
 
-
 #endif  // FWCore_MessageService_SingleThreadMSPresence_h
diff --git a/FWCore/MessageService/interface/ThreadQueue.h b/FWCore/MessageService/interface/ThreadQueue.h
index 52f8a03c82367..b8efc97b6eb62 100644
--- a/FWCore/MessageService/interface/ThreadQueue.h
+++ b/FWCore/MessageService/interface/ThreadQueue.h
@@ -4,7 +4,7 @@
 //
 // Package:     MessageService
 // Class  :     ThreadQueue
-// 
+//
 /**\class ThreadQueue ThreadQueue.h FWCore/MessageService/interface/ThreadQueue.h
 
  Description: <one line class summary>
@@ -21,16 +21,11 @@
 #include "FWCore/MessageLogger/interface/MessageLoggerQ.h"
 #include "FWCore/Utilities/interface/SingleConsumerQ.h"
 
-
-
-
 namespace edm {
-namespace service {
-
-class ThreadQueue
-{
+  namespace service {
 
-   public:
+    class ThreadQueue {
+    public:
       ThreadQueue();
       virtual ~ThreadQueue();
 
@@ -40,29 +35,26 @@ class ThreadQueue
 
       // ---------- member functions ---------------------------
 
-  // ---  obtain a message from the queue:
-  void  consume( MessageLoggerQ::OpCode & opcode, void * & operand );
+      // ---  obtain a message from the queue:
+      void consume(MessageLoggerQ::OpCode& opcode, void*& operand);
 
-  // ---  place a message onto the queue:
-  void  produce( MessageLoggerQ::OpCode opcode, void *   operand );
+      // ---  place a message onto the queue:
+      void produce(MessageLoggerQ::OpCode opcode, void* operand);
 
- 
-   private:
-      ThreadQueue(const ThreadQueue&) = delete; // stop default
+    private:
+      ThreadQueue(const ThreadQueue&) = delete;  // stop default
 
-      const ThreadQueue& operator=(const ThreadQueue&) = delete; // stop default
+      const ThreadQueue& operator=(const ThreadQueue&) = delete;  // stop default
 
       // ---------- member data --------------------------------
 
-  // --- buffer parameters:  (were private but needed by MainTrhreadMLscribe
-  static  const int  buf_depth = 500;
-  static  const int  buf_size  = sizeof(MessageLoggerQ::OpCode)
-                               + sizeof(void *);
-  SingleConsumerQ  m_buf;
-
-};
+      // --- buffer parameters:  (were private but needed by MainTrhreadMLscribe
+      static const int buf_depth = 500;
+      static const int buf_size = sizeof(MessageLoggerQ::OpCode) + sizeof(void*);
+      SingleConsumerQ m_buf;
+    };
 
-} // end namespace service
-} // end namespace edm
+  }  // end namespace service
+}  // end namespace edm
 
 #endif
diff --git a/FWCore/MessageService/interface/ThreadSafeLogMessageLoggerScribe.h b/FWCore/MessageService/interface/ThreadSafeLogMessageLoggerScribe.h
index ede011b5df8f4..069259b594b85 100644
--- a/FWCore/MessageService/interface/ThreadSafeLogMessageLoggerScribe.h
+++ b/FWCore/MessageService/interface/ThreadSafeLogMessageLoggerScribe.h
@@ -22,101 +22,95 @@
 #include "tbb/concurrent_queue.h"
 
 namespace edm {
-namespace service {       
-
-// ----------------------------------------------------------------------
-//
-// ThreadSafeLogMessageLoggerScribe.h
-//
-// OpCodeLOG_A_MESSAGE messages can be handled from multiple threads
-//
-// -----------------------------------------------------------------------
-
-class ELadministrator;
-class ELstatistics;
-
-class ThreadSafeLogMessageLoggerScribe : public AbstractMLscribe
-{
-public:
-  // ---  birth/death:
-  
-  // ChangeLog 12
-  /// --- If queue is NULL, this sets singleThread true 
-  explicit ThreadSafeLogMessageLoggerScribe();
-  
-  ~ThreadSafeLogMessageLoggerScribe() override;
-
-  // --- receive and act on messages:
-  							// changelog 10
-  void  runCommand(MessageLoggerQ::OpCode  opcode, void * operand) override;
-		  						// changeLog 9
-
-private:
-  // --- convenience typedefs
-  typedef std::string          String;
-  typedef std::vector<String>  vString;
-  typedef ParameterSet         PSet;
-
-  // --- log one consumed message
-  void log(ErrorObj * errorobj_p);
-
-  // --- cause statistics destinations to output
-  void triggerStatisticsSummaries();
-  void triggerFJRmessageSummary(std::map<std::string, double> & sm);
-  
-  // --- handle details of configuring via a ParameterSet:
-  void  configure_errorlog( );
-  void  configure_ordinary_destinations( );			// Change Log 3
-  void  configure_statistics( );				// Change Log 3
-  void  configure_dest( std::shared_ptr<ELdestination> dest_ctrl
-                      , String const &  filename
-		      );
-
-  template <class T>						// ChangeLog 11
-  T getAparameter ( PSet const& p, std::string const & id, T const & def ) 
-  {
-    T t = def;
-    try { 
-      t = p.template getUntrackedParameter<T>(id, def);
-    } catch (...) {
-      try {
-        t = p.template getParameter<T>(id);
-      } catch (...) {
-        // Since PSetValidation will catch such errors, we simply proceed as
-	// best we can in case we are setting up the logger just to contain the 
-	// validation-caught error messages. 
+  namespace service {
+
+    // ----------------------------------------------------------------------
+    //
+    // ThreadSafeLogMessageLoggerScribe.h
+    //
+    // OpCodeLOG_A_MESSAGE messages can be handled from multiple threads
+    //
+    // -----------------------------------------------------------------------
+
+    class ELadministrator;
+    class ELstatistics;
+
+    class ThreadSafeLogMessageLoggerScribe : public AbstractMLscribe {
+    public:
+      // ---  birth/death:
+
+      // ChangeLog 12
+      /// --- If queue is NULL, this sets singleThread true
+      explicit ThreadSafeLogMessageLoggerScribe();
+
+      ~ThreadSafeLogMessageLoggerScribe() override;
+
+      // --- receive and act on messages:
+      // changelog 10
+      void runCommand(MessageLoggerQ::OpCode opcode, void* operand) override;
+      // changeLog 9
+
+    private:
+      // --- convenience typedefs
+      typedef std::string String;
+      typedef std::vector<String> vString;
+      typedef ParameterSet PSet;
+
+      // --- log one consumed message
+      void log(ErrorObj* errorobj_p);
+
+      // --- cause statistics destinations to output
+      void triggerStatisticsSummaries();
+      void triggerFJRmessageSummary(std::map<std::string, double>& sm);
+
+      // --- handle details of configuring via a ParameterSet:
+      void configure_errorlog();
+      void configure_ordinary_destinations();  // Change Log 3
+      void configure_statistics();             // Change Log 3
+      void configure_dest(std::shared_ptr<ELdestination> dest_ctrl, String const& filename);
+
+      template <class T>  // ChangeLog 11
+      T getAparameter(PSet const& p, std::string const& id, T const& def) {
+        T t = def;
+        try {
+          t = p.template getUntrackedParameter<T>(id, def);
+        } catch (...) {
+          try {
+            t = p.template getParameter<T>(id);
+          } catch (...) {
+            // Since PSetValidation will catch such errors, we simply proceed as
+            // best we can in case we are setting up the logger just to contain the
+            // validation-caught error messages.
+          }
+        }
+        return t;
       }
-    }
-    return t;
-  }
-
-  // --- other helpers
-  void parseCategories (std::string const & s, std::vector<std::string> & cats);
-  
-  // --- data:
-  edm::propagate_const<std::shared_ptr<ELadministrator>>  admin_p;
-  std::shared_ptr<ELdestination>                       early_dest;
-  std::vector<edm::propagate_const<std::shared_ptr<std::ofstream>>> file_ps;
-  edm::propagate_const<std::shared_ptr<PSet>> job_pset_p;
-  std::map<String, edm::propagate_const<std::ostream*>> stream_ps;
-  std::vector<String> 	  	      ordinary_destination_filenames;
-  std::vector<std::shared_ptr<ELstatistics>> statisticsDestControls;
-  std::vector<bool>                   statisticsResets;
-  bool				      clean_slate_configuration;
-  value_ptr<MessageLoggerDefaults>    messageLoggerDefaults;
-  bool				      active;
-  std::atomic<bool> purge_mode;		// changeLog 9
-  std::atomic<int>  count;			// changeLog 9
-  std::atomic<bool> m_messageBeingSent;
-  tbb::concurrent_queue<ErrorObj*> m_waitingMessages;
-  size_t m_waitingThreshold;
-  std::atomic<unsigned long> m_tooManyWaitingMessagesCount;
-  
-};  // ThreadSafeLogMessageLoggerScribe
-
-
-}   // end of namespace service
-}  // namespace edm
 
+      // --- other helpers
+      void parseCategories(std::string const& s, std::vector<std::string>& cats);
+
+      // --- data:
+      edm::propagate_const<std::shared_ptr<ELadministrator>> admin_p;
+      std::shared_ptr<ELdestination> early_dest;
+      std::vector<edm::propagate_const<std::shared_ptr<std::ofstream>>> file_ps;
+      edm::propagate_const<std::shared_ptr<PSet>> job_pset_p;
+      std::map<String, edm::propagate_const<std::ostream*>> stream_ps;
+      std::vector<String> ordinary_destination_filenames;
+      std::vector<std::shared_ptr<ELstatistics>> statisticsDestControls;
+      std::vector<bool> statisticsResets;
+      bool clean_slate_configuration;
+      value_ptr<MessageLoggerDefaults> messageLoggerDefaults;
+      bool active;
+      std::atomic<bool> purge_mode;  // changeLog 9
+      std::atomic<int> count;        // changeLog 9
+      std::atomic<bool> m_messageBeingSent;
+      tbb::concurrent_queue<ErrorObj*> m_waitingMessages;
+      size_t m_waitingThreshold;
+      std::atomic<unsigned long> m_tooManyWaitingMessagesCount;
+
+    };  // ThreadSafeLogMessageLoggerScribe
+
+  }  // end of namespace service
+}  // namespace edm
 
 #endif  // FWCore_MessageService_ThreadSafeLogMessageLoggerScribe_h
diff --git a/FWCore/MessageService/plugins/Module.cc b/FWCore/MessageService/plugins/Module.cc
index 881c66a20a46b..305b9e4619209 100644
--- a/FWCore/MessageService/plugins/Module.cc
+++ b/FWCore/MessageService/plugins/Module.cc
@@ -12,5 +12,3 @@ DEFINE_FWK_SERVICE(MessageLogger);
 DEFINE_FWK_PRESENCE(MessageServicePresence);
 DEFINE_FWK_PRESENCE(SingleThreadMSPresence);
 #pragma GCC visibility pop
- 
- 
diff --git a/FWCore/MessageService/src/ELadministrator.cc b/FWCore/MessageService/src/ELadministrator.cc
index 3d2cd1e942ab1..81b8ca8ceb3a2 100644
--- a/FWCore/MessageService/src/ELadministrator.cc
+++ b/FWCore/MessageService/src/ELadministrator.cc
@@ -72,7 +72,6 @@
 //
 // ----------------------------------------------------------------------
 
-
 #include "FWCore/MessageService/interface/ELadministrator.h"
 #include "FWCore/MessageService/interface/ELdestination.h"
 #include "FWCore/MessageService/interface/ELoutput.h"
@@ -84,233 +83,175 @@
 #include <list>
 using std::cerr;
 
-
 namespace edm {
-namespace service {
-
-
-// Possible Traces:
-// #define ELadministratorCONSTRUCTOR_TRACE
-// #define ELadTRACE_FINISH
-
-  
-void ELadministrator::log(edm::ErrorObj & msg) {
-  
-  
-  // severity level statistics keeping:                 // $$ mf 6/7/01
-  int lev = msg.xid().severity.getLevel();
-  ++ severityCounts_[lev];
-  if ( lev > highSeverity_.getLevel() )
-    highSeverity_ = msg.xid().severity;
-  
-  // -----  send the message to each destination:
-  //
-  if (sinks_.begin() == sinks_.end())  {
-    std::cerr << "\nERROR LOGGED WITHOUT DESTINATION!\n";
-    std::cerr << "Attaching destination \"cerr\" to ELadministrator by default\n"
-    << std::endl;
-    attach(std::make_shared<ELoutput>(std::cerr));
-  }
-  for (auto& sink : sinks_)
-    if ( sink->log( msg )  )
-      msg.setReactedTo ( true );
-  
-  return;
-  
-}
-
-
-// ----------------------------------------------------------------------
-// ELadministrator functionality:
-// ----------------------------------------------------------------------
+  namespace service {
 
-std::shared_ptr<ELdestination> ELadministrator::attach( std::shared_ptr<ELdestination> sink )  {
+    // Possible Traces:
+    // #define ELadministratorCONSTRUCTOR_TRACE
+    // #define ELadTRACE_FINISH
 
-  sinks_.push_back( sink );
-  return sink;
-  
-}  // attach()
+    void ELadministrator::log(edm::ErrorObj& msg) {
+      // severity level statistics keeping:                 // $$ mf 6/7/01
+      int lev = msg.xid().severity.getLevel();
+      ++severityCounts_[lev];
+      if (lev > highSeverity_.getLevel())
+        highSeverity_ = msg.xid().severity;
 
-ELseverityLevel  ELadministrator::checkSeverity()  {
+      // -----  send the message to each destination:
+      //
+      if (sinks_.begin() == sinks_.end()) {
+        std::cerr << "\nERROR LOGGED WITHOUT DESTINATION!\n";
+        std::cerr << "Attaching destination \"cerr\" to ELadministrator by default\n" << std::endl;
+        attach(std::make_shared<ELoutput>(std::cerr));
+      }
+      for (auto& sink : sinks_)
+        if (sink->log(msg))
+          msg.setReactedTo(true);
 
-  const ELseverityLevel  retval( highSeverity_ );
-  highSeverity_ = ELzeroSeverity;
-  return retval;
+      return;
+    }
 
-}  // checkSeverity()
+    // ----------------------------------------------------------------------
+    // ELadministrator functionality:
+    // ----------------------------------------------------------------------
 
+    std::shared_ptr<ELdestination> ELadministrator::attach(std::shared_ptr<ELdestination> sink) {
+      sinks_.push_back(sink);
+      return sink;
 
-int ELadministrator::severityCount( const ELseverityLevel & sev ) const  {
+    }  // attach()
 
-  return severityCounts_[sev.getLevel()];
+    ELseverityLevel ELadministrator::checkSeverity() {
+      const ELseverityLevel retval(highSeverity_);
+      highSeverity_ = ELzeroSeverity;
+      return retval;
 
-}  // severityCount()
+    }  // checkSeverity()
 
+    int ELadministrator::severityCount(const ELseverityLevel& sev) const {
+      return severityCounts_[sev.getLevel()];
 
-int ELadministrator::severityCount(
-  const ELseverityLevel & from,
-  const ELseverityLevel & to
-)  const  {
+    }  // severityCount()
 
-  int k = from.getLevel();
-  int sum = severityCounts_[k];
+    int ELadministrator::severityCount(const ELseverityLevel& from, const ELseverityLevel& to) const {
+      int k = from.getLevel();
+      int sum = severityCounts_[k];
 
-  while ( ++k != to.getLevel() )
-    sum += severityCounts_[k];
+      while (++k != to.getLevel())
+        sum += severityCounts_[k];
 
-  return  sum;
+      return sum;
 
-}  // severityCount()
+    }  // severityCount()
 
+    void ELadministrator::resetSeverityCount(const ELseverityLevel& sev) {
+      severityCounts_[sev.getLevel()] = 0;
 
-void ELadministrator::resetSeverityCount( const ELseverityLevel & sev )  {
+    }  // resetSeverityCount()
 
-  severityCounts_[sev.getLevel()] = 0;
+    void ELadministrator::resetSeverityCount(const ELseverityLevel& from, const ELseverityLevel& to) {
+      for (int k = from.getLevel(); k <= to.getLevel(); ++k)
+        severityCounts_[k] = 0;
 
-}  // resetSeverityCount()
+    }  // resetSeverityCount()
 
+    void ELadministrator::resetSeverityCount() {
+      resetSeverityCount(ELzeroSeverity, ELhighestSeverity);
 
-void ELadministrator::resetSeverityCount( const ELseverityLevel & from,
-                                          const ELseverityLevel & to   )  {
+    }  // resetSeverityCount()
 
-  for ( int k = from.getLevel();  k <= to.getLevel();  ++k )
-    severityCounts_[k] = 0;
+    // ----------------------------------------------------------------------
+    // Accessors:
+    // ----------------------------------------------------------------------
 
-}  // resetSeverityCount()
+    const ELseverityLevel& ELadministrator::highSeverity() const { return highSeverity_; }
 
+    int ELadministrator::severityCounts(const int lev) const { return severityCounts_[lev]; }
 
-void ELadministrator::resetSeverityCount()  {
-
-  resetSeverityCount( ELzeroSeverity, ELhighestSeverity );
-
-}  // resetSeverityCount()
-
-
-// ----------------------------------------------------------------------
-// Accessors:
-// ----------------------------------------------------------------------
-
-const ELseverityLevel & ELadministrator::highSeverity() const  {
-  return highSeverity_;
-}
-
-
-int ELadministrator::severityCounts( const int lev ) const  {
-  return severityCounts_[lev];
-}
-
-
-// ----------------------------------------------------------------------
-// Message handling:
-// ----------------------------------------------------------------------
-
-
-// ----------------------------------------------------------------------
-// The following do the indicated action to all attached destinations:
-// ----------------------------------------------------------------------
+    // ----------------------------------------------------------------------
+    // Message handling:
+    // ----------------------------------------------------------------------
 
-void ELadministrator::setThresholds( const ELseverityLevel & sev )  {
+    // ----------------------------------------------------------------------
+    // The following do the indicated action to all attached destinations:
+    // ----------------------------------------------------------------------
 
-  for (auto& sink : sinks_)
-    sink->threshold = sev;
+    void ELadministrator::setThresholds(const ELseverityLevel& sev) {
+      for (auto& sink : sinks_)
+        sink->threshold = sev;
 
-}  // setThresholds()
+    }  // setThresholds()
 
+    void ELadministrator::setLimits(const ELstring& id, int limit) {
+      for (auto& sink : sinks_)
+        sink->limits.setLimit(id, limit);
 
-void ELadministrator::setLimits( const ELstring & id, int limit )  {
+    }  // setLimits()
 
-  for (auto& sink : sinks_)
-    sink->limits.setLimit( id, limit );
+    void ELadministrator::setIntervals(const ELseverityLevel& sev, int interval) {
+      for (auto& sink : sinks_)
+        sink->limits.setInterval(sev, interval);
 
-}  // setLimits()
+    }  // setIntervals()
 
+    void ELadministrator::setIntervals(const ELstring& id, int interval) {
+      for (auto& sink : sinks_)
+        sink->limits.setInterval(id, interval);
 
-void ELadministrator::setIntervals
-			( const ELseverityLevel & sev, int interval )  {
+    }  // setIntervals()
 
-  for (auto& sink : sinks_)
-    sink->limits.setInterval( sev, interval );
+    void ELadministrator::setLimits(const ELseverityLevel& sev, int limit) {
+      for (auto& sink : sinks_)
+        sink->limits.setLimit(sev, limit);
 
-}  // setIntervals()
+    }  // setLimits()
 
-void ELadministrator::setIntervals( const ELstring & id, int interval )  {
+    void ELadministrator::setTimespans(const ELstring& id, int seconds) {
+      for (auto& sink : sinks_)
+        sink->limits.setTimespan(id, seconds);
 
-  for (auto& sink : sinks_)
-    sink->limits.setInterval( id, interval );
+    }  // setTimespans()
 
-}  // setIntervals()
+    void ELadministrator::setTimespans(const ELseverityLevel& sev, int seconds) {
+      for (auto& sink : sinks_)
+        sink->limits.setTimespan(sev, seconds);
 
+    }  // setTimespans()
 
-void ELadministrator::setLimits( const ELseverityLevel & sev, int limit )  {
+    void ELadministrator::wipe() {
+      for (auto& sink : sinks_)
+        sink->limits.wipe();
 
-  for (auto& sink : sinks_)
-    sink->limits.setLimit( sev, limit );
+    }  // wipe()
 
-}  // setLimits()
+    void ELadministrator::finish() {
+      for (auto& sink : sinks_)
+        sink->finish();
 
+    }  // wipe()
 
-void ELadministrator::setTimespans( const ELstring & id, int seconds )  {
+    ELadministrator::ELadministrator() : sinks_(), highSeverity_(ELseverityLevel(ELseverityLevel::ELsev_zeroSeverity)) {
+#ifdef ELadministratorCONSTRUCTOR_TRACE
+      std::cerr << "ELadminstrator constructor\n";
+#endif
 
-  for (auto& sink : sinks_)
-    sink->limits.setTimespan( id, seconds );
+      for (int lev = 0; lev < ELseverityLevel::nLevels; ++lev)
+        severityCounts_[lev] = 0;
+    }
+    //-*****************************
+    // The ELadminstrator destructor
+    //-*****************************
 
-}  // setTimespans()
+    ELadministrator::~ELadministrator() {
+#ifdef ELadministratorCONSTRUCTOR_TRACE
+      std::cerr << "ELadministrator Destructor\n";
+#endif
 
+      sinks_.clear();
 
-void ELadministrator::setTimespans( const ELseverityLevel & sev, int seconds )  {
-
-  for (auto& sink : sinks_)
-    sink->limits.setTimespan( sev, seconds );
-
-}  // setTimespans()
-
-
-void ELadministrator::wipe()  {
-
-  for (auto& sink : sinks_)
-    sink->limits.wipe();
-
-}  // wipe()
-
-void ELadministrator::finish()  {
-
-  for (auto& sink : sinks_)
-    sink->finish();
-
-}  // wipe()
-
-
-ELadministrator::ELadministrator()
-: sinks_         (                                                           )
-, highSeverity_  ( ELseverityLevel (ELseverityLevel::ELsev_zeroSeverity)     )
-{
-
-  #ifdef ELadministratorCONSTRUCTOR_TRACE
-    std::cerr << "ELadminstrator constructor\n";
-  #endif
-
-  for ( int lev = 0;  lev < ELseverityLevel::nLevels;  ++lev )
-    severityCounts_[lev] = 0;
-
-}
-//-*****************************
-// The ELadminstrator destructor
-//-*****************************
-
-ELadministrator::~ELadministrator()  {
-
-  #ifdef ELadministratorCONSTRUCTOR_TRACE
-    std::cerr << "ELadministrator Destructor\n";
-  #endif
-
-  sinks_.clear();
-
-}  // ~ELadministrator()
-
-
-
-// ----------------------------------------------------------------------
+    }  // ~ELadministrator()
 
+    // ----------------------------------------------------------------------
 
-} // end of namespace service  
-} // end of namespace edm  
+  }  // end of namespace service
+}  // end of namespace edm
diff --git a/FWCore/MessageService/src/ELdestination.cc b/FWCore/MessageService/src/ELdestination.cc
index 2bb9e45c931ef..856786e3293c3 100644
--- a/FWCore/MessageService/src/ELdestination.cc
+++ b/FWCore/MessageService/src/ELdestination.cc
@@ -24,7 +24,6 @@
 //
 // ----------------------------------------------------------------------
 
-
 #include <iostream>
 #include <fstream>
 
@@ -34,231 +33,196 @@
 // #define ELdestinationCONSTRUCTOR_TRACE
 
 namespace edm {
-namespace service {
-                                         // Fix $001 2/13/01 mf
+  namespace service {
+    // Fix $001 2/13/01 mf
 #ifdef DEFECT_NO_STATIC_CONST_INIT
-  const int ELdestination::defaultLineLength = 80;
+    const int ELdestination::defaultLineLength = 80;
 #endif
 
-ELdestination::ELdestination()
-: threshold     ( ELzeroSeverity    )
-, traceThreshold( ELhighestSeverity )
-, limits        (                   )
-, preamble      ( "%MSG"            )
-, newline       ( "\n"              )
-, indent        ( "      "          )
-, lineLength    ( defaultLineLength )
-, ignoreMostModules (false)
-, respondToThese()
-, respondToMostModules (false)
-, ignoreThese()
-{
-
-  #ifdef ELdestinationCONSTRUCTOR_TRACE
-    std::cerr << "Constructor for ELdestination\n";
-  #endif
-
-}  // ELdestination()
-
-
-ELdestination::~ELdestination()  {
-
-  #ifdef ELdestinationCONSTRUCTOR_TRACE
-    std::cerr << "Destructor for ELdestination\n";
-  #endif
-
-}  // ~ELdestination()
-
-
-// ----------------------------------------------------------------------
-// Methods invoked by the ELadministrator:
-// ----------------------------------------------------------------------
-
-bool ELdestination::log( const edm::ErrorObj &)  { return false; }
-
-
-// ----------------------------------------------------------------------
-// Methods invoked through the ELdestControl handle:
-// ----------------------------------------------------------------------
-
-// Each of these must be overridden by any destination for which they make
-// sense.   In this base class, where they are all no-ops, the methods which
-// generate data to a destination, stream or stream will warn at that place,
-// and all the no-op methods will issue an ELwarning2 at their own destination.
-
-
-static const ELstring hereMsg = "available via this destination";
-static const ELstring noosMsg = "No ostream";
-static const ELstring notELoutputMsg = "This destination is not an ELoutput";
-
-// ----------------------------------------------------------------------
-// Behavior control methods invoked by the framework
-// ----------------------------------------------------------------------
-
-void ELdestination::setThreshold( const ELseverityLevel & sv )  {
-  threshold = sv;
-}
-
-
-void ELdestination::setTraceThreshold( const ELseverityLevel & sv )  {
-  traceThreshold = sv;
-}
-
-
-void ELdestination::setLimit( const ELstring & s, int n )  {
-  limits.setLimit( s, n );
-}
-
+    ELdestination::ELdestination()
+        : threshold(ELzeroSeverity),
+          traceThreshold(ELhighestSeverity),
+          limits(),
+          preamble("%MSG"),
+          newline("\n"),
+          indent("      "),
+          lineLength(defaultLineLength),
+          ignoreMostModules(false),
+          respondToThese(),
+          respondToMostModules(false),
+          ignoreThese() {
+#ifdef ELdestinationCONSTRUCTOR_TRACE
+      std::cerr << "Constructor for ELdestination\n";
+#endif
 
-void ELdestination::setInterval
-( const ELseverityLevel & sv, int interval )  {
-  limits.setInterval( sv, interval );
-}
+    }  // ELdestination()
 
-void ELdestination::setInterval( const ELstring & s, int interval )  {
-  limits.setInterval( s, interval );
-}
+    ELdestination::~ELdestination() {
+#ifdef ELdestinationCONSTRUCTOR_TRACE
+      std::cerr << "Destructor for ELdestination\n";
+#endif
 
+    }  // ~ELdestination()
 
-void ELdestination::setLimit( const ELseverityLevel & sv, int n )  {
-  limits.setLimit( sv, n );
-}
+    // ----------------------------------------------------------------------
+    // Methods invoked by the ELadministrator:
+    // ----------------------------------------------------------------------
 
+    bool ELdestination::log(const edm::ErrorObj&) { return false; }
 
-void ELdestination::setTimespan( const ELstring & s, int n )  {
-  limits.setTimespan( s, n );
-}
+    // ----------------------------------------------------------------------
+    // Methods invoked through the ELdestControl handle:
+    // ----------------------------------------------------------------------
 
+    // Each of these must be overridden by any destination for which they make
+    // sense.   In this base class, where they are all no-ops, the methods which
+    // generate data to a destination, stream or stream will warn at that place,
+    // and all the no-op methods will issue an ELwarning2 at their own destination.
 
-void ELdestination::setTimespan( const ELseverityLevel & sv, int n )  {
-  limits.setTimespan( sv, n );
-}
+    static const ELstring hereMsg = "available via this destination";
+    static const ELstring noosMsg = "No ostream";
+    static const ELstring notELoutputMsg = "This destination is not an ELoutput";
 
+    // ----------------------------------------------------------------------
+    // Behavior control methods invoked by the framework
+    // ----------------------------------------------------------------------
 
-void ELdestination::wipe()  { limits.wipe(); }
+    void ELdestination::setThreshold(const ELseverityLevel& sv) { threshold = sv; }
 
+    void ELdestination::setTraceThreshold(const ELseverityLevel& sv) { traceThreshold = sv; }
 
-void ELdestination::zero()  { limits.zero(); }
+    void ELdestination::setLimit(const ELstring& s, int n) { limits.setLimit(s, n); }
 
-void ELdestination::respondToModule( ELstring const & moduleName )  {
-  if (moduleName=="*") {
-    ignoreMostModules = false;
-    respondToMostModules = true;
-    ignoreThese.clear();
-    respondToThese.clear();
-  } else {
-    respondToThese.insert(moduleName);
-    ignoreThese.erase(moduleName);
-  }
-}
+    void ELdestination::setInterval(const ELseverityLevel& sv, int interval) { limits.setInterval(sv, interval); }
 
-void ELdestination::ignoreModule( ELstring const & moduleName )  {
-  if (moduleName=="*") {
-    respondToMostModules = false;
-    ignoreMostModules = true;
-    respondToThese.clear();
-    ignoreThese.clear();
-  } else {
-    ignoreThese.insert(moduleName);
-    respondToThese.erase(moduleName);
-  }
-}
+    void ELdestination::setInterval(const ELstring& s, int interval) { limits.setInterval(s, interval); }
 
-void ELdestination::filterModule( ELstring const & moduleName )  {
-  ignoreModule("*");
-  respondToModule(moduleName);
-}
+    void ELdestination::setLimit(const ELseverityLevel& sv, int n) { limits.setLimit(sv, n); }
 
-void ELdestination::excludeModule( ELstring const & moduleName )  {
-  respondToModule("*");
-  ignoreModule(moduleName);
-}
+    void ELdestination::setTimespan(const ELstring& s, int n) { limits.setTimespan(s, n); }
 
-void ELdestination::finish() {  }
+    void ELdestination::setTimespan(const ELseverityLevel& sv, int n) { limits.setTimespan(sv, n); }
 
-void ELdestination::setTableLimit( int n )  { limits.setTableLimit( n ); }
+    void ELdestination::wipe() { limits.wipe(); }
 
+    void ELdestination::zero() { limits.zero(); }
 
-void ELdestination::changeFile (std::ostream & /*unused*/) {
-  edm::ErrorObj  msg( ELwarning, noosMsg );
-  msg << notELoutputMsg;
-  log( msg );
-}
+    void ELdestination::respondToModule(ELstring const& moduleName) {
+      if (moduleName == "*") {
+        ignoreMostModules = false;
+        respondToMostModules = true;
+        ignoreThese.clear();
+        respondToThese.clear();
+      } else {
+        respondToThese.insert(moduleName);
+        ignoreThese.erase(moduleName);
+      }
+    }
 
-void ELdestination::changeFile (const ELstring & filename) {
-  edm::ErrorObj  msg( ELwarning, noosMsg );
-  msg << notELoutputMsg << newline << "file requested is" << filename;
-  log( msg );
-}
+    void ELdestination::ignoreModule(ELstring const& moduleName) {
+      if (moduleName == "*") {
+        respondToMostModules = false;
+        ignoreMostModules = true;
+        respondToThese.clear();
+        ignoreThese.clear();
+      } else {
+        ignoreThese.insert(moduleName);
+        respondToThese.erase(moduleName);
+      }
+    }
 
-void ELdestination::flush () {
-  edm::ErrorObj  msg( ELwarning, noosMsg );
-  msg << "cannot flush()";
-  log( msg );
-}
+    void ELdestination::filterModule(ELstring const& moduleName) {
+      ignoreModule("*");
+      respondToModule(moduleName);
+    }
 
-// ----------------------------------------------------------------------
-// Output format options:
-// ----------------------------------------------------------------------
+    void ELdestination::excludeModule(ELstring const& moduleName) {
+      respondToModule("*");
+      ignoreModule(moduleName);
+    }
 
-void ELdestination::suppressText()  { ; }                      // $$ jvr
-void ELdestination::includeText()   { ; }
+    void ELdestination::finish() {}
 
-void ELdestination::suppressModule()  { ; }
-void ELdestination::includeModule()   { ; }
+    void ELdestination::setTableLimit(int n) { limits.setTableLimit(n); }
 
-void ELdestination::suppressSubroutine()  { ; }
-void ELdestination::includeSubroutine()   { ; }
+    void ELdestination::changeFile(std::ostream& /*unused*/) {
+      edm::ErrorObj msg(ELwarning, noosMsg);
+      msg << notELoutputMsg;
+      log(msg);
+    }
 
-void ELdestination::suppressTime()  { ; }
-void ELdestination::includeTime()   { ; }
+    void ELdestination::changeFile(const ELstring& filename) {
+      edm::ErrorObj msg(ELwarning, noosMsg);
+      msg << notELoutputMsg << newline << "file requested is" << filename;
+      log(msg);
+    }
 
-void ELdestination::suppressContext()  { ; }
-void ELdestination::includeContext()   { ; }
+    void ELdestination::flush() {
+      edm::ErrorObj msg(ELwarning, noosMsg);
+      msg << "cannot flush()";
+      log(msg);
+    }
 
-void ELdestination::suppressSerial()  { ; }
-void ELdestination::includeSerial()   { ; }
+    // ----------------------------------------------------------------------
+    // Output format options:
+    // ----------------------------------------------------------------------
 
-void ELdestination::useFullContext()  { ; }
-void ELdestination::useContext()      { ; }
+    void ELdestination::suppressText() { ; }  // $$ jvr
+    void ELdestination::includeText() { ; }
 
-void ELdestination::separateTime()  { ; }
-void ELdestination::attachTime()    { ; }
+    void ELdestination::suppressModule() { ; }
+    void ELdestination::includeModule() { ; }
 
-void ELdestination::separateEpilogue()  { ; }
-void ELdestination::attachEpilogue()    { ; }
+    void ELdestination::suppressSubroutine() { ; }
+    void ELdestination::includeSubroutine() { ; }
 
-ELstring ELdestination::getNewline() const  { return newline; }
+    void ELdestination::suppressTime() { ; }
+    void ELdestination::includeTime() { ; }
 
-int ELdestination::setLineLength (int len) {
-  int temp=lineLength;
-  lineLength = len;
-  return temp;
-}
+    void ELdestination::suppressContext() { ; }
+    void ELdestination::includeContext() { ; }
 
-int ELdestination::getLineLength () const { return lineLength; }
+    void ELdestination::suppressSerial() { ; }
+    void ELdestination::includeSerial() { ; }
 
+    void ELdestination::useFullContext() { ; }
+    void ELdestination::useContext() { ; }
 
-// ----------------------------------------------------------------------
-// Protected helper methods:
-// ----------------------------------------------------------------------
+    void ELdestination::separateTime() { ; }
+    void ELdestination::attachTime() { ; }
 
-bool ELdestination::thisShouldBeIgnored(const ELstring & s) const {
-  if (respondToMostModules) {
-    return ( ignoreThese.find(s) != ignoreThese.end() );
-  } else if (ignoreMostModules) {
-    return ( respondToThese.find(s) == respondToThese.end() );
-  } else {
-  return false;
-  }
-}
-
-
-void close_and_delete::operator()(std::ostream* os) const {
-  std::ofstream* p = static_cast<std::ofstream*>(os);
-  p->close();
-  delete os;
-}
-
-} // end of namespace service  
-} // end of namespace edm  
+    void ELdestination::separateEpilogue() { ; }
+    void ELdestination::attachEpilogue() { ; }
+
+    ELstring ELdestination::getNewline() const { return newline; }
+
+    int ELdestination::setLineLength(int len) {
+      int temp = lineLength;
+      lineLength = len;
+      return temp;
+    }
+
+    int ELdestination::getLineLength() const { return lineLength; }
+
+    // ----------------------------------------------------------------------
+    // Protected helper methods:
+    // ----------------------------------------------------------------------
+
+    bool ELdestination::thisShouldBeIgnored(const ELstring& s) const {
+      if (respondToMostModules) {
+        return (ignoreThese.find(s) != ignoreThese.end());
+      } else if (ignoreMostModules) {
+        return (respondToThese.find(s) == respondToThese.end());
+      } else {
+        return false;
+      }
+    }
+
+    void close_and_delete::operator()(std::ostream* os) const {
+      std::ofstream* p = static_cast<std::ofstream*>(os);
+      p->close();
+      delete os;
+    }
+
+  }  // end of namespace service
+}  // end of namespace edm
diff --git a/FWCore/MessageService/src/ELlimitsTable.cc b/FWCore/MessageService/src/ELlimitsTable.cc
index 43e496bc244fc..f1c46e077d3c2 100644
--- a/FWCore/MessageService/src/ELlimitsTable.cc
+++ b/FWCore/MessageService/src/ELlimitsTable.cc
@@ -20,7 +20,6 @@
 //
 // ----------------------------------------------------------------------
 
-
 #include "FWCore/MessageService/interface/ELlimitsTable.h"
 
 // Posible traces
@@ -29,249 +28,223 @@
 //#define ELlimitsTableCONSTRUCTOR_TRACE
 //#define ELlimitsTableATRACE
 
-
 namespace edm {
-namespace service {
-
-// ----------------------------------------------------------------------
-// Constructor, destructor:
-// ----------------------------------------------------------------------
+  namespace service {
 
+    // ----------------------------------------------------------------------
+    // Constructor, destructor:
+    // ----------------------------------------------------------------------
 
-ELlimitsTable::ELlimitsTable()
-: wildcardLimit   ( -1 )
-, wildcardInterval( -1 )
-, wildcardTimespan( -1 )
-, tableLimit      ( -1 )
-, limits          (    )
-, counts          (    )
-{
-
+    ELlimitsTable::ELlimitsTable()
+        : wildcardLimit(-1), wildcardInterval(-1), wildcardTimespan(-1), tableLimit(-1), limits(), counts() {
 #ifdef ELlimitsTableCONSTRUCTOR_TRACE
-  std::cerr << "Constructor for ELlimitsTable\n";
+      std::cerr << "Constructor for ELlimitsTable\n";
 #endif
 
-  for ( int k = 0;  k < ELseverityLevel::nLevels;  ++k )  {
-    severityLimits[k]    = -1;                // JvR 99-06-10
-    severityIntervals[k]    = -1;             
-    severityTimespans[k] = -1;
-  }
-
-}  // ELlimitsTable()
-
+      for (int k = 0; k < ELseverityLevel::nLevels; ++k) {
+        severityLimits[k] = -1;  // JvR 99-06-10
+        severityIntervals[k] = -1;
+        severityTimespans[k] = -1;
+      }
 
-ELlimitsTable::~ELlimitsTable()  {
+    }  // ELlimitsTable()
 
+    ELlimitsTable::~ELlimitsTable() {
 #ifdef ELlimitsTableCONSTRUCTOR_TRACE
-  std::cerr << "Destructor for ELlimitsTable\n";
+      std::cerr << "Destructor for ELlimitsTable\n";
 #endif
 
-}  // ~ELlimitsTable()
+    }  // ~ELlimitsTable()
 
+    // ----------------------------------------------------------------------
+    // Methods invoked by the logger:
+    // ----------------------------------------------------------------------
 
-// ----------------------------------------------------------------------
-// Methods invoked by the logger:
-// ----------------------------------------------------------------------
-
-void ELlimitsTable::setTableLimit( int n )  { tableLimit = n; }
-
-
-bool ELlimitsTable::add( const ELextendedID & xid )  {
+    void ELlimitsTable::setTableLimit(int n) { tableLimit = n; }
 
+    bool ELlimitsTable::add(const ELextendedID& xid) {
 #ifdef ELlimitsTableATRACE
-  std::cerr << "&&&--- adding to limits table: " << xid.id << '\n';
+      std::cerr << "&&&--- adding to limits table: " << xid.id << '\n';
 #endif
 
-  ELmap_counts::iterator c = counts.find( xid );
+      ELmap_counts::iterator c = counts.find(xid);
 
-  if ( c == counts.end() )  {  // no such entry yet
+      if (c == counts.end()) {  // no such entry yet
 
-    #ifdef ELlimitsTableATRACE
-    std::cerr << "&&&    no such entry yet in counts \n";
-    #endif
+#ifdef ELlimitsTableATRACE
+        std::cerr << "&&&    no such entry yet in counts \n";
+#endif
 
-    // if the counts table is "full", then this will never be rejected
-    // and info will not be kept so why go through significant work: 
-    if ( tableLimit > 0  && static_cast<int>(counts.size()) >= tableLimit ) {
-      return true;
-    }
-    int lim;
-    int ivl;
-    int ts;
-    ELmap_limits::iterator l = limits.find( xid.id );
-
-    if ( l != limits.end() )  { // use limits previously established for this id
-      lim = (*l).second.limit;
-      ivl = (*l).second.interval;
-      ts  = (*l).second.timespan;
-      if ( lim < 0 )  {                                    // jvr 6/17/99
-        lim = severityLimits[xid.severity.getLevel()];
-        if ( lim < 0 )  {
-          lim = wildcardLimit;
+        // if the counts table is "full", then this will never be rejected
+        // and info will not be kept so why go through significant work:
+        if (tableLimit > 0 && static_cast<int>(counts.size()) >= tableLimit) {
+          return true;
         }
-      }
-      if ( ivl < 0 )  {                                    
-        ivl = severityIntervals[xid.severity.getLevel()];
-        if ( ivl < 0 )  {
-          ivl = wildcardInterval;			// mf 11/02/07
-        }
-      }
-      if ( ts < 0 )  {
-        ts = severityTimespans[xid.severity.getLevel()];
-        if (ts < 0 )  {
-          ts = wildcardTimespan;
-        }
-        limits[xid.id] = LimitAndTimespan( lim, ts );
-      }
-      #ifdef ELlimitsTableATRACE
-      std::cerr << "&&&    Entry found in limits: limit = " << lim
-           << " interval = " << ivl
-           << " timespan = " << ts << '\n';
-      #endif
-      // change log 9/29/10:  Do not put this into limits table
-   } else  {   // establish and use limits new to this id
-      lim = severityLimits   [xid.severity.getLevel()];
-      ivl = severityIntervals[xid.severity.getLevel()];
-      ts  = severityTimespans[xid.severity.getLevel()];
-      #ifdef ELlimitsTableATRACE
-      std::cerr << "&&&    Limit taken from severityLimits: " << lim << '\n'
-           << "&&&    Interval taken from severityLimits: " << ivl << '\n';
-      #endif
-      if ( lim < 0 )  {
-        lim = wildcardLimit;
-        #ifdef ELlimitsTableATRACE
-        std::cerr << "&&&    Limit reset to wildcard limit: " << lim << '\n';
-        #endif
-      }
-      if ( ivl < 0 )  {
-        ivl = wildcardInterval;
-        #ifdef ELlimitsTableATRACE
-        std::cerr << "&&&    Interval reset to wildcard interval: " << ivl << '\n';
-        #endif
-      }
-      #ifdef ELlimitsTableATRACE
-      std::cerr << "&&&    Timespan taken from severityTimespans: " << ts << '\n';
-      #endif
-      if ( ts < 0 )  {
-        ts = wildcardTimespan;
-        #ifdef ELlimitsTableATRACE
-        std::cerr << "&&&    timespan reset to wildcard timespan: " << ts << '\n';
-        #endif
-      }
-
-      // change log 9/29/10 DO not save id's future limits:
-    }
-
-    // save, if possible, this xid's initial entry:
-    if ( tableLimit < 0  || static_cast<int>(counts.size()) < tableLimit )
-      counts[xid] = CountAndLimit( lim, ts, ivl );
-    c = counts.find( xid );
-  }
-
-  return  ( c == counts.end() )
-        ? true               // no limit filtering can be applied
-        : (*c).second.add()  // apply limit filtering
-        ;
-
-}  // add()
-
-
-// ----------------------------------------------------------------------
-// Control methods invoked by the framework:
-// ----------------------------------------------------------------------
-
-void ELlimitsTable::wipe()  {
-  // This clears everything -- counts and aggregate counts for severity levels
-  // and for individual ID's, as well as any limits established, the limit
-  // for "*" all messages, and the collection of severity defaults.  wipe()
-  // does not not affect thresholds.
-
-  limits.erase( limits.begin(), limits.end() );
-  ELmap_counts::iterator i;
-  for ( i = counts.begin();  i != counts.end();  ++i )  {
-    (*i).second.limit = -1;
-    (*i).second.n = (*i).second.aggregateN = 0;
-  }
-
-  wildcardLimit    = -1;
-  wildcardTimespan = -1;
-  for ( int lev = 0;  lev < ELseverityLevel::nLevels;  ++lev )  {
-    severityLimits   [lev] = -1;
-    severityIntervals[lev] = -1;
-    severityTimespans[lev] = -1;
-  }
-
-}
-
-
-void ELlimitsTable::zero()  {
-  // This clears counts but not aggregate counts for severity levels
-  // and for individual ID's.
+        int lim;
+        int ivl;
+        int ts;
+        ELmap_limits::iterator l = limits.find(xid.id);
+
+        if (l != limits.end()) {  // use limits previously established for this id
+          lim = (*l).second.limit;
+          ivl = (*l).second.interval;
+          ts = (*l).second.timespan;
+          if (lim < 0) {  // jvr 6/17/99
+            lim = severityLimits[xid.severity.getLevel()];
+            if (lim < 0) {
+              lim = wildcardLimit;
+            }
+          }
+          if (ivl < 0) {
+            ivl = severityIntervals[xid.severity.getLevel()];
+            if (ivl < 0) {
+              ivl = wildcardInterval;  // mf 11/02/07
+            }
+          }
+          if (ts < 0) {
+            ts = severityTimespans[xid.severity.getLevel()];
+            if (ts < 0) {
+              ts = wildcardTimespan;
+            }
+            limits[xid.id] = LimitAndTimespan(lim, ts);
+          }
+#ifdef ELlimitsTableATRACE
+          std::cerr << "&&&    Entry found in limits: limit = " << lim << " interval = " << ivl << " timespan = " << ts
+                    << '\n';
+#endif
+          // change log 9/29/10:  Do not put this into limits table
+        } else {  // establish and use limits new to this id
+          lim = severityLimits[xid.severity.getLevel()];
+          ivl = severityIntervals[xid.severity.getLevel()];
+          ts = severityTimespans[xid.severity.getLevel()];
+#ifdef ELlimitsTableATRACE
+          std::cerr << "&&&    Limit taken from severityLimits: " << lim << '\n'
+                    << "&&&    Interval taken from severityLimits: " << ivl << '\n';
+#endif
+          if (lim < 0) {
+            lim = wildcardLimit;
+#ifdef ELlimitsTableATRACE
+            std::cerr << "&&&    Limit reset to wildcard limit: " << lim << '\n';
+#endif
+          }
+          if (ivl < 0) {
+            ivl = wildcardInterval;
+#ifdef ELlimitsTableATRACE
+            std::cerr << "&&&    Interval reset to wildcard interval: " << ivl << '\n';
+#endif
+          }
+#ifdef ELlimitsTableATRACE
+          std::cerr << "&&&    Timespan taken from severityTimespans: " << ts << '\n';
+#endif
+          if (ts < 0) {
+            ts = wildcardTimespan;
+#ifdef ELlimitsTableATRACE
+            std::cerr << "&&&    timespan reset to wildcard timespan: " << ts << '\n';
+#endif
+          }
 
-  ELmap_counts::iterator i;
-  for ( i = counts.begin();  i != counts.end();  ++i )
-    (*i).second.n = 0;
-}
+          // change log 9/29/10 DO not save id's future limits:
+        }
 
+        // save, if possible, this xid's initial entry:
+        if (tableLimit < 0 || static_cast<int>(counts.size()) < tableLimit)
+          counts[xid] = CountAndLimit(lim, ts, ivl);
+        c = counts.find(xid);
+      }
 
-void ELlimitsTable::setLimit( const ELstring & id, int n )  {
-  if ( id[0] == '*' )  wildcardLimit    = n;
-  else                 limits[id].limit = n;
-}
+      return (c == counts.end()) ? true               // no limit filtering can be applied
+                                 : (*c).second.add()  // apply limit filtering
+          ;
 
+    }  // add()
 
-void ELlimitsTable::setLimit( const ELseverityLevel & sev, int n )  {
-  severityLimits[sev.getLevel()] = n;
-}
+    // ----------------------------------------------------------------------
+    // Control methods invoked by the framework:
+    // ----------------------------------------------------------------------
 
-void ELlimitsTable::setInterval( const ELstring & id, int interval )  {
-  if ( id[0] == '*' )  wildcardInterval    = interval;
-  else                 limits[id].interval = interval;
-}
+    void ELlimitsTable::wipe() {
+      // This clears everything -- counts and aggregate counts for severity levels
+      // and for individual ID's, as well as any limits established, the limit
+      // for "*" all messages, and the collection of severity defaults.  wipe()
+      // does not not affect thresholds.
 
+      limits.erase(limits.begin(), limits.end());
+      ELmap_counts::iterator i;
+      for (i = counts.begin(); i != counts.end(); ++i) {
+        (*i).second.limit = -1;
+        (*i).second.n = (*i).second.aggregateN = 0;
+      }
 
-void ELlimitsTable::setInterval( const ELseverityLevel & sev, int interval )  {
-  severityIntervals[sev.getLevel()] = interval;
-}
+      wildcardLimit = -1;
+      wildcardTimespan = -1;
+      for (int lev = 0; lev < ELseverityLevel::nLevels; ++lev) {
+        severityLimits[lev] = -1;
+        severityIntervals[lev] = -1;
+        severityTimespans[lev] = -1;
+      }
+    }
 
+    void ELlimitsTable::zero() {
+      // This clears counts but not aggregate counts for severity levels
+      // and for individual ID's.
 
-void ELlimitsTable::setTimespan( const ELstring & id, int n )  {
-  if ( id[0] == '*' )  wildcardTimespan    = n;
-  else                 limits[id].timespan = n;
-}
+      ELmap_counts::iterator i;
+      for (i = counts.begin(); i != counts.end(); ++i)
+        (*i).second.n = 0;
+    }
 
+    void ELlimitsTable::setLimit(const ELstring& id, int n) {
+      if (id[0] == '*')
+        wildcardLimit = n;
+      else
+        limits[id].limit = n;
+    }
 
-void ELlimitsTable::setTimespan( const ELseverityLevel & sev, int n )  {
-  severityTimespans[sev.getLevel()] = n;
-}
+    void ELlimitsTable::setLimit(const ELseverityLevel& sev, int n) { severityLimits[sev.getLevel()] = n; }
 
+    void ELlimitsTable::setInterval(const ELstring& id, int interval) {
+      if (id[0] == '*')
+        wildcardInterval = interval;
+      else
+        limits[id].interval = interval;
+    }
 
-// ----------------------------------------------------------------------
-// Support for internal operations:
-// ----------------------------------------------------------------------
+    void ELlimitsTable::setInterval(const ELseverityLevel& sev, int interval) {
+      severityIntervals[sev.getLevel()] = interval;
+    }
 
-ELlimitsTable & ELlimitsTable::operator=( const ELlimitsTable & t )  {
+    void ELlimitsTable::setTimespan(const ELstring& id, int n) {
+      if (id[0] == '*')
+        wildcardTimespan = n;
+      else
+        limits[id].timespan = n;
+    }
 
-  if(this == &t) {
-    return  *this; // self assignment
-  }
-  limits = t.limits;  // The non-trivial operator= for a map!
+    void ELlimitsTable::setTimespan(const ELseverityLevel& sev, int n) { severityTimespans[sev.getLevel()] = n; }
 
-  for ( int lev = 0;  lev < ELseverityLevel::nLevels;  ++lev )  {
-    severityTimespans[lev] = t.severityTimespans[lev];
-    severityTimespans[lev] = t.severityTimespans[lev];
-  }
+    // ----------------------------------------------------------------------
+    // Support for internal operations:
+    // ----------------------------------------------------------------------
 
-  wildcardLimit    = t.wildcardLimit;
-  wildcardTimespan = t.wildcardTimespan;
+    ELlimitsTable& ELlimitsTable::operator=(const ELlimitsTable& t) {
+      if (this == &t) {
+        return *this;  // self assignment
+      }
+      limits = t.limits;  // The non-trivial operator= for a map!
 
-  return  *this;
+      for (int lev = 0; lev < ELseverityLevel::nLevels; ++lev) {
+        severityTimespans[lev] = t.severityTimespans[lev];
+        severityTimespans[lev] = t.severityTimespans[lev];
+      }
 
-}  // operator=()
+      wildcardLimit = t.wildcardLimit;
+      wildcardTimespan = t.wildcardTimespan;
 
+      return *this;
 
-// ----------------------------------------------------------------------
+    }  // operator=()
 
+    // ----------------------------------------------------------------------
 
-} // end of namespace service  
-} // end of namespace edm  
+  }  // end of namespace service
+}  // end of namespace edm
diff --git a/FWCore/MessageService/src/ELoutput.cc b/FWCore/MessageService/src/ELoutput.cc
index aa1f59f39578e..5ede9f9cd121d 100644
--- a/FWCore/MessageService/src/ELoutput.cc
+++ b/FWCore/MessageService/src/ELoutput.cc
@@ -36,13 +36,13 @@
 //                      correctly provide the time zone.  Had been providing
 //                      CST every time.
 //
-// 12/xx/06     mf	Tailoring to CMS MessageLogger 
-//  1/11/06	mf      Eliminate time stamp from starting message 
+// 12/xx/06     mf	Tailoring to CMS MessageLogger
+//  1/11/06	mf      Eliminate time stamp from starting message
 //  3/20/06	mf	Major formatting change to do no formatting
 //			except the header and line separation.
 //  4/04/06	mf	Move the line feed between header and text
 //			till after the first 3 items (FILE:LINE) for
-//			debug messages. 
+//			debug messages.
 //  6/06/06	mf	Verbatim
 //  6/12/06	mf	Set preambleMode true when printing the header
 //
@@ -56,23 +56,22 @@
 //			impose limits.  This is to implement the LogSystem
 //			feature:  Those messages are never to be ignored.
 //
-//  3 6/11/07  mf	In emitToken():  In preamble mode, do not break and indent 
+//  3 6/11/07  mf	In emitToken():  In preamble mode, do not break and indent
 //			even if exceeding nominal line length.
 //
-//  4 6/11/07  mf	In log():  After the message, add a %MSG on its own line 
+//  4 6/11/07  mf	In log():  After the message, add a %MSG on its own line
 //
 //  5 3/27/09  mf	Properly treat charsOnLine, which had been fouled due to
 //			change 3.  In log() and emitToken().
 //
 //  6 9/2/10  mf	Initialize preambleMode in each ctor, and remove the
-//			unnecessary use of tprm which was preserving a moot 
+//			unnecessary use of tprm which was preserving a moot
 //			initial value.
 //
 //  7 9/30/10 wmtan	make formatTime() thread safe by not using statics.
 //
 // ----------------------------------------------------------------------
 
-
 #include "FWCore/MessageService/interface/ELoutput.h"
 
 #include "FWCore/MessageLogger/interface/ErrorObj.h"
@@ -90,582 +89,559 @@
 #include <cassert>
 
 namespace edm {
-namespace service {
-
-// ----------------------------------------------------------------------
-// Useful function:
-// ----------------------------------------------------------------------
+  namespace service {
 
+    // ----------------------------------------------------------------------
+    // Useful function:
+    // ----------------------------------------------------------------------
 
-static ELstring formatTime( const time_t t )  { // Change log 7
+    static ELstring formatTime(const time_t t) {  // Change log 7
 
-  static char const dummy[] = "dd-Mon-yyyy hh:mm:ss TZN     "; // Change log 7 for length only
-  char ts[sizeof(dummy)]; // Change log 7
+      static char const dummy[] = "dd-Mon-yyyy hh:mm:ss TZN     ";  // Change log 7 for length only
+      char ts[sizeof(dummy)];                                       // Change log 7
 
-  struct tm timebuf; // Change log 7
+      struct tm timebuf;  // Change log 7
 
-  strftime( ts, sizeof(dummy), "%d-%b-%Y %H:%M:%S %Z", localtime_r(&t, &timebuf) ); // Change log 7
-                // mf 4-9-04
+      strftime(ts, sizeof(dummy), "%d-%b-%Y %H:%M:%S %Z", localtime_r(&t, &timebuf));  // Change log 7
+                                                                                       // mf 4-9-04
 
 #ifdef STRIP_TRAILING_BLANKS_IN_TIMEZONE
-  // strip trailing blanks that would come when the time zone is not as
-  // long as the maximum allowed - probably not worth the time 
-  unsigned int b = strlen(ts);
-  while (ts[--b] == ' ') {ts[b] = 0;}
-#endif 
+      // strip trailing blanks that would come when the time zone is not as
+      // long as the maximum allowed - probably not worth the time
+      unsigned int b = strlen(ts);
+      while (ts[--b] == ' ') {
+        ts[b] = 0;
+      }
+#endif
 
-  ELstring result(ts); // Change log 7
-  return result; // Change log 7
-}  // formatTime()
+      ELstring result(ts);  // Change log 7
+      return result;        // Change log 7
+    }                       // formatTime()
+
+    // ----------------------------------------------------------------------
+    // Constructors:
+    // ----------------------------------------------------------------------
+
+    ELoutput::ELoutput()
+        : ELdestination(),
+          os(&std::cerr, do_nothing_deleter()),
+          charsOnLine(0),
+          xid(),
+          wantTimestamp(true),
+          wantModule(true),
+          wantSubroutine(true),
+          wantText(true),
+          wantSomeContext(true),
+          wantSerial(false),
+          wantFullContext(false),
+          wantTimeSeparate(false),
+          wantEpilogueSeparate(false),
+          preambleMode(true)  // 006 9/2/10 mf
+    {
+#ifdef ELoutputCONSTRUCTOR_TRACE
+      std::cerr << "Constructor for ELoutput()\n";
+#endif
 
+      emitToken("\n=================================================", true);
+      emitToken("\nMessage Log File written by MessageLogger service \n");
+      emitToken("\n=================================================\n", true);
+
+    }  // ELoutput()
+
+    ELoutput::ELoutput(std::ostream& os_, bool emitAtStart)
+        : ELdestination(),
+          os(&os_, do_nothing_deleter()),
+          charsOnLine(0),
+          xid(),
+          wantTimestamp(true),
+          wantModule(true),
+          wantSubroutine(true),
+          wantText(true),
+          wantSomeContext(true),
+          wantSerial(false),
+          wantFullContext(false),
+          wantTimeSeparate(false),
+          wantEpilogueSeparate(false),
+          preambleMode(true)  // 006 9/2/10 mf
+    {
+#ifdef ELoutputCONSTRUCTOR_TRACE
+      std::cerr << "Constructor for ELoutput( os )\n";
+#endif
 
-// ----------------------------------------------------------------------
-// Constructors:
-// ----------------------------------------------------------------------
+      // Enh 001 2/13/01 mf
+      if (emitAtStart) {
+        preambleMode = true;
+        emitToken("\n=================================================", true);
+        emitToken("\nMessage Log File written by MessageLogger service \n");
+        emitToken("\n=================================================\n", true);
+      }
 
-ELoutput::ELoutput()
-: ELdestination       (            )
-, os                  ( &std::cerr, do_nothing_deleter() )
-, charsOnLine         ( 0          )
-, xid                 (            )
-, wantTimestamp       ( true       )
-, wantModule          ( true       )
-, wantSubroutine      ( true       )
-, wantText            ( true       )
-, wantSomeContext     ( true       )
-, wantSerial          ( false      )
-, wantFullContext     ( false      )
-, wantTimeSeparate    ( false      )
-, wantEpilogueSeparate( false      )
-, preambleMode        ( true       )		// 006 9/2/10 mf
-{
-
-  #ifdef ELoutputCONSTRUCTOR_TRACE
-    std::cerr << "Constructor for ELoutput()\n";
-  #endif
-
-  emitToken( "\n=================================================", true );
-  emitToken( "\nMessage Log File written by MessageLogger service \n" );
-  emitToken( "\n=================================================\n", true );
-
-}  // ELoutput()
-
-
-ELoutput::ELoutput( std::ostream & os_ , bool emitAtStart )
-: ELdestination       (       )
-, os                  ( &os_, do_nothing_deleter() )
-, charsOnLine         ( 0     )
-, xid                 (       )
-, wantTimestamp       ( true  )
-, wantModule          ( true  )
-, wantSubroutine      ( true  )
-, wantText            ( true  )
-, wantSomeContext     ( true  )
-, wantSerial          ( false )
-, wantFullContext     ( false )
-, wantTimeSeparate    ( false )
-, wantEpilogueSeparate( false )
-, preambleMode        ( true  )		// 006 9/2/10 mf
-{
-
-  #ifdef ELoutputCONSTRUCTOR_TRACE
-    std::cerr << "Constructor for ELoutput( os )\n";
-  #endif
-
-                                        // Enh 001 2/13/01 mf
-  if (emitAtStart) {
-    preambleMode = true;
-    emitToken( "\n=================================================", true );
-    emitToken( "\nMessage Log File written by MessageLogger service \n" );
-    emitToken( "\n=================================================\n", true );
-  }
-
-}  // ELoutput()
-
-
-ELoutput::ELoutput( const ELstring & fileName, bool emitAtStart )
-: ELdestination       (       )
-, os                  ( new std::ofstream( fileName.c_str() , std::ios/*_base*/::app), close_and_delete())
-, charsOnLine         ( 0     )
-, xid                 (       )
-, wantTimestamp       ( true  )
-, wantModule          ( true  )
-, wantSubroutine      ( true  )
-, wantText            ( true  )
-, wantSomeContext     ( true  )
-, wantSerial          ( false )
-, wantFullContext     ( false )
-, wantTimeSeparate    ( false )
-, wantEpilogueSeparate( false )
-, preambleMode        ( true  )		// 006 9/2/10 mf
-{
-
-  #ifdef ELoutputCONSTRUCTOR_TRACE
-    std::cerr << "Constructor for ELoutput( " << fileName << " )\n";
-  #endif
-
-  preambleMode = true;
-  if ( os && *os )  {
-    #ifdef ELoutputCONSTRUCTOR_TRACE
-      std::cerr << "          Testing if os is owned\n";
-    #endif
-    #ifdef ELoutputCONSTRUCTOR_TRACE
-      std::cerr << "          About to do first emit\n";
-    #endif
-                                        // Enh 001 2/13/01 mf
-    if (emitAtStart) {
-      emitToken( "\n=======================================================",
-                                                                true );
-      emitToken( "\nError Log File " );
-      emitToken( fileName );
-      emitToken( " \n" );
-    }
-  }
-  else  {
-    #ifdef ELoutputCONSTRUCTOR_TRACE
-      std::cerr << "          Deleting os\n";
-    #endif
-    os.reset(&std::cerr, do_nothing_deleter());
-    #ifdef ELoutputCONSTRUCTOR_TRACE
-      std::cerr << "          about to emit to cerr\n";
-    #endif
-    if (emitAtStart) {
-      emitToken( "\n=======================================================",
-                                                                true );
-      emitToken( "\n%MSG** Logging to cerr is being substituted" );
-      emitToken( " for specified log file \"" );
-      emitToken( fileName  );
-      emitToken( "\" which could not be opened for write or append.\n" );
-    }
-  }
-  if (emitAtStart) {
-    ELstring const& ftime = formatTime(time(nullptr)); // Change log 7
-    emitToken( ftime, true );
-    emitToken( "\n=======================================================\n",
-                                                                true );
-  }
-  // preambleMode = tprm; removed 9/2/10 mf see change log 6
-
-  #ifdef ELoutputCONSTRUCTOR_TRACE
-    std::cerr << "Constructor for ELoutput completed.\n";
-  #endif
-
-}  // ELoutput()
-
-
-ELoutput::ELoutput( const ELoutput & orig )
-: ELdestination       (                           )
-, os                  ( orig.os                   )
-, charsOnLine         ( orig.charsOnLine          )
-, xid                 ( orig.xid                  )
-, wantTimestamp       ( orig.wantTimestamp        )
-, wantModule          ( orig.wantModule           )
-, wantSubroutine      ( orig.wantSubroutine       )
-, wantText            ( orig.wantText             )
-, wantSomeContext     ( orig.wantSomeContext      )
-, wantSerial          ( orig.wantSerial           )
-, wantFullContext     ( orig.wantFullContext      )
-, wantTimeSeparate    ( orig.wantTimeSeparate     )
-, wantEpilogueSeparate( orig.wantEpilogueSeparate )
-, preambleMode        ( orig.preambleMode         )	// 006 9/2/10 mf
-{
-
-  #ifdef ELoutputCONSTRUCTOR_TRACE
-    std::cerr << "Copy constructor for ELoutput\n";
-  #endif
-
-  // mf 6/15/01 fix of Bug 005
-  threshold             = orig.threshold;
-  traceThreshold        = orig.traceThreshold;
-  limits                = orig.limits;
-  preamble              = orig.preamble;
-  newline               = orig.newline;
-  indent                = orig.indent;
-  lineLength            = orig.lineLength;
-
-  ignoreMostModules     = orig.ignoreMostModules;
-  respondToThese        = orig.respondToThese;
-  respondToMostModules  = orig.respondToMostModules;
-  ignoreThese           = orig.ignoreThese;
-
-}  // ELoutput()
-
-
-ELoutput::~ELoutput()  {
-
-  #ifdef ELoutputCONSTRUCTOR_TRACE
-    std::cerr << "Destructor for ELoutput\n";
-  #endif
-
-}  // ~ELoutput()
+    }  // ELoutput()
+
+    ELoutput::ELoutput(const ELstring& fileName, bool emitAtStart)
+        : ELdestination(),
+          os(new std::ofstream(fileName.c_str(), std::ios /*_base*/ ::app), close_and_delete()),
+          charsOnLine(0),
+          xid(),
+          wantTimestamp(true),
+          wantModule(true),
+          wantSubroutine(true),
+          wantText(true),
+          wantSomeContext(true),
+          wantSerial(false),
+          wantFullContext(false),
+          wantTimeSeparate(false),
+          wantEpilogueSeparate(false),
+          preambleMode(true)  // 006 9/2/10 mf
+    {
+#ifdef ELoutputCONSTRUCTOR_TRACE
+      std::cerr << "Constructor for ELoutput( " << fileName << " )\n";
+#endif
 
+      preambleMode = true;
+      if (os && *os) {
+#ifdef ELoutputCONSTRUCTOR_TRACE
+        std::cerr << "          Testing if os is owned\n";
+#endif
+#ifdef ELoutputCONSTRUCTOR_TRACE
+        std::cerr << "          About to do first emit\n";
+#endif
+        // Enh 001 2/13/01 mf
+        if (emitAtStart) {
+          emitToken("\n=======================================================", true);
+          emitToken("\nError Log File ");
+          emitToken(fileName);
+          emitToken(" \n");
+        }
+      } else {
+#ifdef ELoutputCONSTRUCTOR_TRACE
+        std::cerr << "          Deleting os\n";
+#endif
+        os.reset(&std::cerr, do_nothing_deleter());
+#ifdef ELoutputCONSTRUCTOR_TRACE
+        std::cerr << "          about to emit to cerr\n";
+#endif
+        if (emitAtStart) {
+          emitToken("\n=======================================================", true);
+          emitToken("\n%MSG** Logging to cerr is being substituted");
+          emitToken(" for specified log file \"");
+          emitToken(fileName);
+          emitToken("\" which could not be opened for write or append.\n");
+        }
+      }
+      if (emitAtStart) {
+        ELstring const& ftime = formatTime(time(nullptr));  // Change log 7
+        emitToken(ftime, true);
+        emitToken("\n=======================================================\n", true);
+      }
+      // preambleMode = tprm; removed 9/2/10 mf see change log 6
 
-// ----------------------------------------------------------------------
-// Methods invoked by the ELadministrator:
-// ----------------------------------------------------------------------
+#ifdef ELoutputCONSTRUCTOR_TRACE
+      std::cerr << "Constructor for ELoutput completed.\n";
+#endif
+
+    }  // ELoutput()
+
+    ELoutput::ELoutput(const ELoutput& orig)
+        : ELdestination(),
+          os(orig.os),
+          charsOnLine(orig.charsOnLine),
+          xid(orig.xid),
+          wantTimestamp(orig.wantTimestamp),
+          wantModule(orig.wantModule),
+          wantSubroutine(orig.wantSubroutine),
+          wantText(orig.wantText),
+          wantSomeContext(orig.wantSomeContext),
+          wantSerial(orig.wantSerial),
+          wantFullContext(orig.wantFullContext),
+          wantTimeSeparate(orig.wantTimeSeparate),
+          wantEpilogueSeparate(orig.wantEpilogueSeparate),
+          preambleMode(orig.preambleMode)  // 006 9/2/10 mf
+    {
+#ifdef ELoutputCONSTRUCTOR_TRACE
+      std::cerr << "Copy constructor for ELoutput\n";
+#endif
 
-//#define THRESHTRACE
-//#define ELoutputTRACE_LOG
+      // mf 6/15/01 fix of Bug 005
+      threshold = orig.threshold;
+      traceThreshold = orig.traceThreshold;
+      limits = orig.limits;
+      preamble = orig.preamble;
+      newline = orig.newline;
+      indent = orig.indent;
+      lineLength = orig.lineLength;
+
+      ignoreMostModules = orig.ignoreMostModules;
+      respondToThese = orig.respondToThese;
+      respondToMostModules = orig.respondToMostModules;
+      ignoreThese = orig.ignoreThese;
+
+    }  // ELoutput()
+
+    ELoutput::~ELoutput() {
+#ifdef ELoutputCONSTRUCTOR_TRACE
+      std::cerr << "Destructor for ELoutput\n";
+#endif
 
-bool ELoutput::log( const edm::ErrorObj & msg )  {
+    }  // ~ELoutput()
 
-  #ifdef ELoutputTRACE_LOG
-    std::cerr << "    =:=:=: Log to an ELoutput \n";
-  #endif
+    // ----------------------------------------------------------------------
+    // Methods invoked by the ELadministrator:
+    // ----------------------------------------------------------------------
 
-  xid = msg.xid();      // Save the xid.
+    //#define THRESHTRACE
+    //#define ELoutputTRACE_LOG
+
+    bool ELoutput::log(const edm::ErrorObj& msg) {
+#ifdef ELoutputTRACE_LOG
+      std::cerr << "    =:=:=: Log to an ELoutput \n";
+#endif
+
+      xid = msg.xid();  // Save the xid.
 
 #ifdef THRESHTRACE
-  std::cerr << "    =:=:=: Log to an ELoutput \n"
-    	    << "           severity  = " << xid.severity  << "\n"
-	    << "           threshold = " << threshold     << "\n"
-	    << "           id        = " << xid.id        << "\n";
+      std::cerr << "    =:=:=: Log to an ELoutput \n"
+                << "           severity  = " << xid.severity << "\n"
+                << "           threshold = " << threshold << "\n"
+                << "           id        = " << xid.id << "\n";
 #endif
 
-  // See if this message is to be acted upon, and add it to limits table
-  // if it was not already present:
-  //
-  if ( xid.severity < threshold        )  return false;
-  if ( thisShouldBeIgnored(xid.module) 
-  	&& (xid.severity < ELsevere) /* change log 2 */ )  
-					  return false;
-  if ( ! limits.add( xid )              
-    	&& (xid.severity < ELsevere) /* change log 2 */ )  
-					  return false;
-
-  #ifdef ELoutputTRACE_LOG
-    std::cerr << "    =:=:=: Limits table work done \n";
-  #endif
-
-  // Output the prologue:
-  //
-  preambleMode = true;
-
-  if  ( !msg.is_verbatim()  ) {
-    charsOnLine = 0; 						// Change log 5
-    emitToken( preamble );
-    emitToken( xid.severity.getSymbol() );
-    emitToken( " " );
-    emitToken( xid.id );
-    emitToken( msg.idOverflow() );
-    emitToken( ": " );
-  }
-  
-  #ifdef ELoutputTRACE_LOG
-    std::cerr << "    =:=:=: Prologue done \n";
-  #endif
-  // Output serial number of message:
-  //
-  if  ( !msg.is_verbatim()  ) 
- {
-    if ( wantSerial )  {
-      std::ostringstream s;
-      s << msg.serial();
-      emitToken( "[serial #" + s.str() + ELstring("] ") );
-    }
-  }
-  
-#ifdef OUTPUT_FORMATTED_ERROR_MESSAGES
-  // Output each item in the message (before the epilogue):
-  //
-  if ( wantText )  {
-    ELlist_string::const_iterator it;
-    for ( it = msg.items().begin();  it != msg.items().end();  ++it )  {
-    #ifdef ELoutputTRACE_LOG
-      std::cerr << "      =:=:=: Item:  " << *it << '\n';
-    #endif
-      emitToken( *it );
-    }
-  }
+      // See if this message is to be acted upon, and add it to limits table
+      // if it was not already present:
+      //
+      if (xid.severity < threshold)
+        return false;
+      if (thisShouldBeIgnored(xid.module) && (xid.severity < ELsevere) /* change log 2 */)
+        return false;
+      if (!limits.add(xid) && (xid.severity < ELsevere) /* change log 2 */)
+        return false;
+
+#ifdef ELoutputTRACE_LOG
+      std::cerr << "    =:=:=: Limits table work done \n";
 #endif
 
-  // Provide further identification:
-  //
-  bool needAspace = true;
-  if  ( !msg.is_verbatim()  ) 
- {
-    if ( wantEpilogueSeparate )  {
-      if ( xid.module.length() + xid.subroutine.length() > 0 )  {
-	emitToken("\n");
-	needAspace = false;
+      // Output the prologue:
+      //
+      preambleMode = true;
+
+      if (!msg.is_verbatim()) {
+        charsOnLine = 0;  // Change log 5
+        emitToken(preamble);
+        emitToken(xid.severity.getSymbol());
+        emitToken(" ");
+        emitToken(xid.id);
+        emitToken(msg.idOverflow());
+        emitToken(": ");
       }
-      else if ( wantTimestamp && !wantTimeSeparate )  {
-	emitToken("\n");
-	needAspace = false;
+
+#ifdef ELoutputTRACE_LOG
+      std::cerr << "    =:=:=: Prologue done \n";
+#endif
+      // Output serial number of message:
+      //
+      if (!msg.is_verbatim()) {
+        if (wantSerial) {
+          std::ostringstream s;
+          s << msg.serial();
+          emitToken("[serial #" + s.str() + ELstring("] "));
+        }
       }
-    }
-    if ( wantModule && (xid.module.length() > 0) )  {
-      if (needAspace) { emitToken(ELstring(" ")); needAspace = false; }
-      emitToken( xid.module + ELstring(" ") );
-    }
-    if ( wantSubroutine && (xid.subroutine.length() > 0) )  {
-      if (needAspace) { emitToken(ELstring(" ")); needAspace = false; }
-      emitToken( xid.subroutine + "()" + ELstring(" ") );
-    }
-  }
-  
-  #ifdef ELoutputTRACE_LOG
-    std::cerr << "    =:=:=: Module and Subroutine done \n";
-  #endif
-
-  // Provide time stamp:
-  //
-  if  ( !msg.is_verbatim() ) 
- {
-    if ( wantTimestamp )  {
-      if ( wantTimeSeparate )  {
-	emitToken( ELstring("\n") );
-	needAspace = false;
+
+#ifdef OUTPUT_FORMATTED_ERROR_MESSAGES
+      // Output each item in the message (before the epilogue):
+      //
+      if (wantText) {
+        ELlist_string::const_iterator it;
+        for (it = msg.items().begin(); it != msg.items().end(); ++it) {
+#ifdef ELoutputTRACE_LOG
+          std::cerr << "      =:=:=: Item:  " << *it << '\n';
+#endif
+          emitToken(*it);
+        }
       }
-      if (needAspace) { emitToken(ELstring(" ")); needAspace = false; }
-      ELstring const& ftime = formatTime(msg.timestamp()); // Change log 7
-      emitToken( ftime + ELstring(" ") );
-    }
-  }
-  
-  #ifdef ELoutputTRACE_LOG
-    std::cerr << "    =:=:=: TimeStamp done \n";
-  #endif
-
-  // Provide the context information:
-  //
-  if  ( !msg.is_verbatim() ) 
- {
-    if ( wantSomeContext ) {
-      if (needAspace) { emitToken(ELstring(" ")); needAspace = false; }
-      assert(!needAspace);
-      if ( wantFullContext )  {
-	emitToken( msg.context());
-      #ifdef ELoutputTRACE_LOG
-	std::cerr << "    =:=:=: fullContext done: \n";
-      #endif
-      } else  {
-	emitToken( msg.context());
-    #ifdef ELoutputTRACE_LOG
-      std::cerr << "    =:=:=: Context done: \n";
-    #endif
+#endif
+
+      // Provide further identification:
+      //
+      bool needAspace = true;
+      if (!msg.is_verbatim()) {
+        if (wantEpilogueSeparate) {
+          if (xid.module.length() + xid.subroutine.length() > 0) {
+            emitToken("\n");
+            needAspace = false;
+          } else if (wantTimestamp && !wantTimeSeparate) {
+            emitToken("\n");
+            needAspace = false;
+          }
+        }
+        if (wantModule && (xid.module.length() > 0)) {
+          if (needAspace) {
+            emitToken(ELstring(" "));
+            needAspace = false;
+          }
+          emitToken(xid.module + ELstring(" "));
+        }
+        if (wantSubroutine && (xid.subroutine.length() > 0)) {
+          if (needAspace) {
+            emitToken(ELstring(" "));
+            needAspace = false;
+          }
+          emitToken(xid.subroutine + "()" + ELstring(" "));
+        }
       }
-    }
-  }
-  
-  // Provide traceback information:
-  //
-
-  bool insertNewlineAfterHeader = ( msg.xid().severity != ELdebug );
-  // ELdebug is what LogDebug issues
-  
-  if  ( !msg.is_verbatim() ) 
- {
-    if ( msg.xid().severity >= traceThreshold )  {
-      emitToken( ELstring("\n")
-          , insertNewlineAfterHeader );
-    }
-    else  {                                        //else statement added JV:1
-      emitToken("", insertNewlineAfterHeader);
-    }
-  }
-  #ifdef ELoutputTRACE_LOG
-    std::cerr << "    =:=:=: Trace routine done: \n";
-  #endif
 
-#ifndef OUTPUT_FORMATTED_ERROR_MESSAGES
-  // Finally, output each item in the message:
-  //
-  preambleMode = false;
-  if ( wantText )  {
-    ELlist_string::const_iterator it;
-    int item_count = 0;
-    for ( it = msg.items().begin();  it != msg.items().end();  ++it )  {
-    #ifdef ELoutputTRACE_LOG
-      std::cerr << "      =:=:=: Item:  " << *it << '\n';
-    #endif
-      ++item_count;
-      if  ( !msg.is_verbatim() ) {
-	if ( !insertNewlineAfterHeader && (item_count == 3) ) {
-          // in a LogDebug message, the first 3 items are FILE, :, and LINE
-          emitToken( *it, true );
-	} else {
-          emitToken( *it );
-	}
-      } else {
-        emitToken( *it );
+#ifdef ELoutputTRACE_LOG
+      std::cerr << "    =:=:=: Module and Subroutine done \n";
+#endif
+
+      // Provide time stamp:
+      //
+      if (!msg.is_verbatim()) {
+        if (wantTimestamp) {
+          if (wantTimeSeparate) {
+            emitToken(ELstring("\n"));
+            needAspace = false;
+          }
+          if (needAspace) {
+            emitToken(ELstring(" "));
+            needAspace = false;
+          }
+          ELstring const& ftime = formatTime(msg.timestamp());  // Change log 7
+          emitToken(ftime + ELstring(" "));
+        }
       }
-    }
-  }
+
+#ifdef ELoutputTRACE_LOG
+      std::cerr << "    =:=:=: TimeStamp done \n";
 #endif
 
-  // And after the message, add a %MSG on its own line
-  // Change log 4  6/11/07 mf
+      // Provide the context information:
+      //
+      if (!msg.is_verbatim()) {
+        if (wantSomeContext) {
+          if (needAspace) {
+            emitToken(ELstring(" "));
+            needAspace = false;
+          }
+          assert(!needAspace);
+          if (wantFullContext) {
+            emitToken(msg.context());
+#ifdef ELoutputTRACE_LOG
+            std::cerr << "    =:=:=: fullContext done: \n";
+#endif
+          } else {
+            emitToken(msg.context());
+#ifdef ELoutputTRACE_LOG
+            std::cerr << "    =:=:=: Context done: \n";
+#endif
+          }
+        }
+      }
 
-  if  ( !msg.is_verbatim() ) 
-  {
-    emitToken("\n%MSG");
-  }
-  
+      // Provide traceback information:
+      //
 
-  // Done; message has been fully processed; separate, flush, and leave
-  //
+      bool insertNewlineAfterHeader = (msg.xid().severity != ELdebug);
+      // ELdebug is what LogDebug issues
 
-  (*os) << newline;
-  flush(); 
+      if (!msg.is_verbatim()) {
+        if (msg.xid().severity >= traceThreshold) {
+          emitToken(ELstring("\n"), insertNewlineAfterHeader);
+        } else {  //else statement added JV:1
+          emitToken("", insertNewlineAfterHeader);
+        }
+      }
+#ifdef ELoutputTRACE_LOG
+      std::cerr << "    =:=:=: Trace routine done: \n";
+#endif
 
+#ifndef OUTPUT_FORMATTED_ERROR_MESSAGES
+      // Finally, output each item in the message:
+      //
+      preambleMode = false;
+      if (wantText) {
+        ELlist_string::const_iterator it;
+        int item_count = 0;
+        for (it = msg.items().begin(); it != msg.items().end(); ++it) {
+#ifdef ELoutputTRACE_LOG
+          std::cerr << "      =:=:=: Item:  " << *it << '\n';
+#endif
+          ++item_count;
+          if (!msg.is_verbatim()) {
+            if (!insertNewlineAfterHeader && (item_count == 3)) {
+              // in a LogDebug message, the first 3 items are FILE, :, and LINE
+              emitToken(*it, true);
+            } else {
+              emitToken(*it);
+            }
+          } else {
+            emitToken(*it);
+          }
+        }
+      }
+#endif
 
-  #ifdef ELoutputTRACE_LOG
-    std::cerr << "  =:=:=: log(msg) done: \n";
-  #endif
+      // And after the message, add a %MSG on its own line
+      // Change log 4  6/11/07 mf
 
-  return true;
+      if (!msg.is_verbatim()) {
+        emitToken("\n%MSG");
+      }
 
-}  // log()
+      // Done; message has been fully processed; separate, flush, and leave
+      //
 
+      (*os) << newline;
+      flush();
 
-// Remainder are from base class.
+#ifdef ELoutputTRACE_LOG
+      std::cerr << "  =:=:=: log(msg) done: \n";
+#endif
 
-// ----------------------------------------------------------------------
-// Output methods:
-// ----------------------------------------------------------------------
+      return true;
 
-void ELoutput::emitToken( const ELstring & s, bool nl )  {
+    }  // log()
 
-  #ifdef ELoutput_EMIT_TRACE
-    std::cerr << "[][][] in emit:  charsOnLine is " << charsOnLine << '\n';
-    std::cerr << "[][][] in emit:  s.length() " << s.length() << '\n';
-    std::cerr << "[][][] in emit:  lineLength is " << lineLength << '\n';
-  #endif
+    // Remainder are from base class.
 
-  if (s.length() == 0)  {
-    if ( nl )  {
-      (*os) << newline << std::flush;
-      charsOnLine = 0;
-    }
-    return;
-  }
-
-  char first = s[0];
-  char second,
-       last,
-       last2;
-  second = (s.length() < 2) ? '\0' : s[1];
-  last = (s.length() < 2) ? '\0' : s[s.length()-1];
-  last2 = (s.length() < 3) ? '\0' : s[s.length()-2];
-         //checking -2 because the very last char is sometimes a ' ' inserted
-         //by ErrorLog::operator<<
-
-  if (preambleMode) {
-               //Accounts for newline @ the beginning of the ELstring     JV:2
-    if ( first == '\n'
-    || (charsOnLine + static_cast<int>(s.length())) > lineLength )  {
-      #ifdef ELoutput_EMIT_TRACE
-	std::cerr << "[][][] in emit: about to << to *os \n";
-      #endif
-      #ifdef HEADERS_BROKEN_INTO_LINES_AND_INDENTED
-      // Change log 3: Removed this code 6/11/07 mf
-      (*os) << newline << indent;
-      charsOnLine = indent.length();
-      #else
-      charsOnLine = 0;   					// Change log 5   
-      #endif
-      if (second != ' ')  {
-	(*os) << ' ';
-	charsOnLine++;
-      }
-      if ( first == '\n' )  {
-	(*os) << s.substr(1);
-      }
-      else  {
-	(*os) << s;
-      }
-    }
-    #ifdef ELoutput_EMIT_TRACE
-      std::cerr << "[][][] in emit: about to << s to *os: " << s << " \n";
-    #endif
-    else  {
-      (*os) << s;
-    }
+    // ----------------------------------------------------------------------
+    // Output methods:
+    // ----------------------------------------------------------------------
 
-    if (last == '\n' || last2 == '\n')  {  //accounts for newline @ end    $$ JV:2
-      (*os) << indent;                    //of the ELstring
-      if (last != ' ')
-	(*os) << ' ';
-      charsOnLine = indent.length() + 1;
-    }
+    void ELoutput::emitToken(const ELstring& s, bool nl) {
+#ifdef ELoutput_EMIT_TRACE
+      std::cerr << "[][][] in emit:  charsOnLine is " << charsOnLine << '\n';
+      std::cerr << "[][][] in emit:  s.length() " << s.length() << '\n';
+      std::cerr << "[][][] in emit:  lineLength is " << lineLength << '\n';
+#endif
 
-    if ( nl )  { (*os) << newline << std::flush; charsOnLine = 0;           }
-    else       {                                 charsOnLine += s.length(); }
-}
+      if (s.length() == 0) {
+        if (nl) {
+          (*os) << newline << std::flush;
+          charsOnLine = 0;
+        }
+        return;
+      }
 
-  if (!preambleMode) {
-    (*os) << s;
-  }
-  
-  #ifdef ELoutput_EMIT_TRACE
-    std::cerr << "[][][] in emit: completed \n";
-  #endif
+      char first = s[0];
+      char second, last, last2;
+      second = (s.length() < 2) ? '\0' : s[1];
+      last = (s.length() < 2) ? '\0' : s[s.length() - 1];
+      last2 = (s.length() < 3) ? '\0' : s[s.length() - 2];
+      //checking -2 because the very last char is sometimes a ' ' inserted
+      //by ErrorLog::operator<<
+
+      if (preambleMode) {
+        //Accounts for newline @ the beginning of the ELstring     JV:2
+        if (first == '\n' || (charsOnLine + static_cast<int>(s.length())) > lineLength) {
+#ifdef ELoutput_EMIT_TRACE
+          std::cerr << "[][][] in emit: about to << to *os \n";
+#endif
+#ifdef HEADERS_BROKEN_INTO_LINES_AND_INDENTED
+          // Change log 3: Removed this code 6/11/07 mf
+          (*os) << newline << indent;
+          charsOnLine = indent.length();
+#else
+          charsOnLine = 0;  // Change log 5
+#endif
+          if (second != ' ') {
+            (*os) << ' ';
+            charsOnLine++;
+          }
+          if (first == '\n') {
+            (*os) << s.substr(1);
+          } else {
+            (*os) << s;
+          }
+        }
+#ifdef ELoutput_EMIT_TRACE
+        std::cerr << "[][][] in emit: about to << s to *os: " << s << " \n";
+#endif
+        else {
+          (*os) << s;
+        }
+
+        if (last == '\n' || last2 == '\n') {  //accounts for newline @ end    $$ JV:2
+          (*os) << indent;                    //of the ELstring
+          if (last != ' ')
+            (*os) << ' ';
+          charsOnLine = indent.length() + 1;
+        }
+
+        if (nl) {
+          (*os) << newline << std::flush;
+          charsOnLine = 0;
+        } else {
+          charsOnLine += s.length();
+        }
+      }
 
-}  // emitToken()
+      if (!preambleMode) {
+        (*os) << s;
+      }
 
+#ifdef ELoutput_EMIT_TRACE
+      std::cerr << "[][][] in emit: completed \n";
+#endif
 
-// ----------------------------------------------------------------------
-// Methods controlling message formatting:
-// ----------------------------------------------------------------------
+    }  // emitToken()
 
-void ELoutput::includeTime()   { wantTimestamp = true;  }
-void ELoutput::suppressTime()  { wantTimestamp = false; }
+    // ----------------------------------------------------------------------
+    // Methods controlling message formatting:
+    // ----------------------------------------------------------------------
 
-void ELoutput::includeModule()   { wantModule = true;  }
-void ELoutput::suppressModule()  { wantModule = false; }
+    void ELoutput::includeTime() { wantTimestamp = true; }
+    void ELoutput::suppressTime() { wantTimestamp = false; }
 
-void ELoutput::includeSubroutine()   { wantSubroutine = true;  }
-void ELoutput::suppressSubroutine()  { wantSubroutine = false; }
+    void ELoutput::includeModule() { wantModule = true; }
+    void ELoutput::suppressModule() { wantModule = false; }
 
-void ELoutput::includeText()   { wantText = true;  }
-void ELoutput::suppressText()  { wantText = false; }
+    void ELoutput::includeSubroutine() { wantSubroutine = true; }
+    void ELoutput::suppressSubroutine() { wantSubroutine = false; }
 
-void ELoutput::includeContext()   { wantSomeContext = true;  }
-void ELoutput::suppressContext()  { wantSomeContext = false; }
+    void ELoutput::includeText() { wantText = true; }
+    void ELoutput::suppressText() { wantText = false; }
 
-void ELoutput::suppressSerial()  { wantSerial = false; }
-void ELoutput::includeSerial()   { wantSerial = true;  }
+    void ELoutput::includeContext() { wantSomeContext = true; }
+    void ELoutput::suppressContext() { wantSomeContext = false; }
 
-void ELoutput::useFullContext()  { wantFullContext = true;  }
-void ELoutput::useContext()      { wantFullContext = false; }
+    void ELoutput::suppressSerial() { wantSerial = false; }
+    void ELoutput::includeSerial() { wantSerial = true; }
 
-void ELoutput::separateTime()  { wantTimeSeparate = true;  }
-void ELoutput::attachTime()    { wantTimeSeparate = false; }
+    void ELoutput::useFullContext() { wantFullContext = true; }
+    void ELoutput::useContext() { wantFullContext = false; }
 
-void ELoutput::separateEpilogue()  { wantEpilogueSeparate = true;  }
-void ELoutput::attachEpilogue()    { wantEpilogueSeparate = false; }
+    void ELoutput::separateTime() { wantTimeSeparate = true; }
+    void ELoutput::attachTime() { wantTimeSeparate = false; }
 
+    void ELoutput::separateEpilogue() { wantEpilogueSeparate = true; }
+    void ELoutput::attachEpilogue() { wantEpilogueSeparate = false; }
 
-// ----------------------------------------------------------------------
-// Changing ostream:
-// ----------------------------------------------------------------------
+    // ----------------------------------------------------------------------
+    // Changing ostream:
+    // ----------------------------------------------------------------------
 
-void ELoutput::changeFile (std::ostream & os_) {
-  os.reset(&os_, do_nothing_deleter());
-  emitToken( "\n=======================================================", true );
-  emitToken( "\nError Log changed to this stream\n" );
-  ELstring const& ftime = formatTime(time(nullptr)); // Change log 7
-  emitToken( ftime, true );
-  emitToken( "\n=======================================================\n", true );
-}
-
-void ELoutput::changeFile (const ELstring & filename) {
-  os.reset(new std::ofstream( filename.c_str(), std::ios/*_base*/::app), close_and_delete());
-  emitToken( "\n=======================================================", true );
-  emitToken( "\nError Log changed to this file\n" );
-  ELstring const& ftime = formatTime(time(nullptr)); // Change log 7
-  emitToken( ftime, true );
-  emitToken( "\n=======================================================\n", true );
-}
-
-void ELoutput::flush()  {
-  os->flush();
-}
+    void ELoutput::changeFile(std::ostream& os_) {
+      os.reset(&os_, do_nothing_deleter());
+      emitToken("\n=======================================================", true);
+      emitToken("\nError Log changed to this stream\n");
+      ELstring const& ftime = formatTime(time(nullptr));  // Change log 7
+      emitToken(ftime, true);
+      emitToken("\n=======================================================\n", true);
+    }
 
+    void ELoutput::changeFile(const ELstring& filename) {
+      os.reset(new std::ofstream(filename.c_str(), std::ios /*_base*/ ::app), close_and_delete());
+      emitToken("\n=======================================================", true);
+      emitToken("\nError Log changed to this file\n");
+      ELstring const& ftime = formatTime(time(nullptr));  // Change log 7
+      emitToken(ftime, true);
+      emitToken("\n=======================================================\n", true);
+    }
 
-// ----------------------------------------------------------------------
+    void ELoutput::flush() { os->flush(); }
 
+    // ----------------------------------------------------------------------
 
-} // end of namespace service  
-} // end of namespace edm  
+  }  // end of namespace service
+}  // end of namespace edm
diff --git a/FWCore/MessageService/src/ELstatistics.cc b/FWCore/MessageService/src/ELstatistics.cc
index d590cc46d752e..78100ba6c785d 100644
--- a/FWCore/MessageService/src/ELstatistics.cc
+++ b/FWCore/MessageService/src/ELstatistics.cc
@@ -18,13 +18,12 @@
 //                      initializers to correspond to order of member
 //                      declarations
 //   1/17/06    mf	summary() for use in MessageLogger
-//   8/16/07    mf	Changes to implement grouping of modules in specified 
+//   8/16/07    mf	Changes to implement grouping of modules in specified
 //			categories
 //   6/19/08    mf	summaryForJobReport()
 //
 //  ---------------------------------------------------------------------
 
-
 #include "FWCore/MessageService/interface/ELstatistics.h"
 
 #include "FWCore/MessageLogger/interface/ErrorObj.h"
@@ -39,500 +38,446 @@
 // #define ELstatisticsCONSTRUCTOR_TRACE
 // #define ELstatsLOG_TRACE
 
-
 namespace edm {
-namespace service {
-
-
-
-// ----------------------------------------------------------------------
-// Constructors
-// ----------------------------------------------------------------------
-
-
-ELstatistics::ELstatistics()
-: ELdestination     (           )
-, tableLimit        ( -1        )
-, stats             (           )
-, updatedStats      ( false     )
-, termStream        ( std::cerr )
-, printAtTermination( true      )
-{
-
-  #ifdef ELstatisticsCONSTRUCTOR_TRACE
-    std::cerr << "Constructor for ELstatistics()\n";
-  #endif
-
-}  // ELstatistics()
-
-
-ELstatistics::ELstatistics( std::ostream & osp )
-: ELdestination     (       )
-, tableLimit        ( -1    )
-, stats             (       )
-, updatedStats      ( false )
-, termStream        ( osp   )
-, printAtTermination( true  )
-{
-
-  #ifdef ELstatisticsCONSTRUCTOR_TRACE
-    std::cerr << "Constructor for ELstatistics(osp)\n";
-  #endif
-
-}  // ELstatistics()
-
-
-ELstatistics::ELstatistics( int spaceLimit )
-: ELdestination     (            )
-, tableLimit        ( spaceLimit )
-, stats             (            )
-, updatedStats      ( false      )
-, termStream        ( std::cerr  )
-, printAtTermination( true       )
-{
-
-  #ifdef ELstatisticsCONSTRUCTOR_TRACE
-    std::cerr << "Constructor for ELstatistics(spaceLimit)\n";
-  #endif
-
-}  // ELstatistics()
-
-
-ELstatistics::ELstatistics( int spaceLimit, std::ostream & osp )
-: ELdestination     (            )
-, tableLimit        ( spaceLimit )
-, stats             (            )
-, updatedStats      ( false      )
-, termStream        ( osp        )
-, printAtTermination( true       )
-{
-
-  #ifdef ELstatisticsCONSTRUCTOR_TRACE
-    std::cerr << "Constructor for ELstatistics(spaceLimit,osp)\n";
-  #endif
-
-}  // ELstatistics()
-
-
-ELstatistics::ELstatistics( const ELstatistics & orig)
-: ELdestination     (                         )
-, tableLimit        ( orig.tableLimit         )
-, stats             ( orig.stats              )
-, updatedStats      ( orig.updatedStats       )
-, termStream        ( orig.termStream         )
-, printAtTermination( orig.printAtTermination )
-{
-
-  #ifdef ELstatisticsCONSTRUCTOR_TRACE
-    std::cerr << "Copy constructor for ELstatistics()\n";
-  #endif
-
-  ignoreMostModules    = orig.ignoreMostModules;
-  respondToThese       = orig.respondToThese;
-  respondToMostModules = orig.respondToMostModules;
-  ignoreThese          = orig.ignoreThese;
-
-}  // ELstatistics()
-
-
-ELstatistics::~ELstatistics()  {
-
-  #ifdef ELstatisticsCONSTRUCTOR_TRACE
-    std::cerr << "Destructor for ELstatistics\n";
-  #endif
-
-  if ( updatedStats && printAtTermination )
-    summary( termStream, "Termination Summary" );
-
-}  // ~ELstatistics()
-
-
-// ----------------------------------------------------------------------
-// Methods invoked by the ELadministrator
-// ----------------------------------------------------------------------
-
-static  std::string summarizeContext(const std::string& c)
-  {
-    if ( c.substr (0,4) != "Run:" ) return c;
-    std::istringstream is (c);
-    std::string runWord;
-    int run;
-    is >> runWord >> run;
-    if (!is) return c;
-    if (runWord != "Run:") return c;
-    std::string eventWord;
-    int event;
-    is >> eventWord >> event;
-    if (!is) return c;
-    if (eventWord != "Event:") return c;
-    std::ostringstream os;
-    os << run << "/" << event;
-    return os.str();
-  }
-
-
-bool  ELstatistics::log( const edm::ErrorObj & msg )  {
-
-  #ifdef ELstatsLOG_TRACE
-    std::cerr << "  =:=:=: Log to an ELstatistics\n";
-  #endif
-
-  // See if this message is to be counted.
-
-  if ( msg.xid().severity < threshold )        return false;
-  if ( thisShouldBeIgnored(msg.xid().module) ) return false;
-
-  // Account for this message, making a new table entry if needed:
-  //
-  ELmap_stats::iterator s = stats.find( msg.xid() );
-  if ( s == stats.end() )  {
-    if ( tableLimit < 0  ||  static_cast<int>(stats.size()) < tableLimit )  {
-      stats[msg.xid()] = StatsCount();
-      s = stats.find( msg.xid() );
+  namespace service {
+
+    // ----------------------------------------------------------------------
+    // Constructors
+    // ----------------------------------------------------------------------
+
+    ELstatistics::ELstatistics()
+        : ELdestination(),
+          tableLimit(-1),
+          stats(),
+          updatedStats(false),
+          termStream(std::cerr),
+          printAtTermination(true) {
+#ifdef ELstatisticsCONSTRUCTOR_TRACE
+      std::cerr << "Constructor for ELstatistics()\n";
+#endif
+
+    }  // ELstatistics()
+
+    ELstatistics::ELstatistics(std::ostream& osp)
+        : ELdestination(), tableLimit(-1), stats(), updatedStats(false), termStream(osp), printAtTermination(true) {
+#ifdef ELstatisticsCONSTRUCTOR_TRACE
+      std::cerr << "Constructor for ELstatistics(osp)\n";
+#endif
+
+    }  // ELstatistics()
+
+    ELstatistics::ELstatistics(int spaceLimit)
+        : ELdestination(),
+          tableLimit(spaceLimit),
+          stats(),
+          updatedStats(false),
+          termStream(std::cerr),
+          printAtTermination(true) {
+#ifdef ELstatisticsCONSTRUCTOR_TRACE
+      std::cerr << "Constructor for ELstatistics(spaceLimit)\n";
+#endif
+
+    }  // ELstatistics()
+
+    ELstatistics::ELstatistics(int spaceLimit, std::ostream& osp)
+        : ELdestination(),
+          tableLimit(spaceLimit),
+          stats(),
+          updatedStats(false),
+          termStream(osp),
+          printAtTermination(true) {
+#ifdef ELstatisticsCONSTRUCTOR_TRACE
+      std::cerr << "Constructor for ELstatistics(spaceLimit,osp)\n";
+#endif
+
+    }  // ELstatistics()
+
+    ELstatistics::ELstatistics(const ELstatistics& orig)
+        : ELdestination(),
+          tableLimit(orig.tableLimit),
+          stats(orig.stats),
+          updatedStats(orig.updatedStats),
+          termStream(orig.termStream),
+          printAtTermination(orig.printAtTermination) {
+#ifdef ELstatisticsCONSTRUCTOR_TRACE
+      std::cerr << "Copy constructor for ELstatistics()\n";
+#endif
+
+      ignoreMostModules = orig.ignoreMostModules;
+      respondToThese = orig.respondToThese;
+      respondToMostModules = orig.respondToMostModules;
+      ignoreThese = orig.ignoreThese;
+
+    }  // ELstatistics()
+
+    ELstatistics::~ELstatistics() {
+#ifdef ELstatisticsCONSTRUCTOR_TRACE
+      std::cerr << "Destructor for ELstatistics\n";
+#endif
+
+      if (updatedStats && printAtTermination)
+        summary(termStream, "Termination Summary");
+
+    }  // ~ELstatistics()
+
+    // ----------------------------------------------------------------------
+    // Methods invoked by the ELadministrator
+    // ----------------------------------------------------------------------
+
+    static std::string summarizeContext(const std::string& c) {
+      if (c.substr(0, 4) != "Run:")
+        return c;
+      std::istringstream is(c);
+      std::string runWord;
+      int run;
+      is >> runWord >> run;
+      if (!is)
+        return c;
+      if (runWord != "Run:")
+        return c;
+      std::string eventWord;
+      int event;
+      is >> eventWord >> event;
+      if (!is)
+        return c;
+      if (eventWord != "Event:")
+        return c;
+      std::ostringstream os;
+      os << run << "/" << event;
+      return os.str();
     }
-  }
-  #ifdef ELstatsLOG_TRACE
-    std::cerr << "    =:=:=: Message accounted for in stats \n";
-  #endif
-  if ( s != stats.end() )  {
-        (*s).second.add( summarizeContext(msg.context()), msg.reactedTo() );
 
-    updatedStats = true;
-    #ifdef ELstatsLOG_TRACE
-      std::cerr << "    =:=:=: Updated stats \n";
-    #endif
-  }
+    bool ELstatistics::log(const edm::ErrorObj& msg) {
+#ifdef ELstatsLOG_TRACE
+      std::cerr << "  =:=:=: Log to an ELstatistics\n";
+#endif
 
+      // See if this message is to be counted.
 
-  // For the purposes of telling whether any log destination has reacted
-  // to the message, the statistics destination does not count:
-  //
+      if (msg.xid().severity < threshold)
+        return false;
+      if (thisShouldBeIgnored(msg.xid().module))
+        return false;
 
-  #ifdef ELstatsLOG_TRACE
-    std::cerr << "  =:=:=: log(msg) done (stats) \n";
-  #endif
-
-  return false;
-
-
-}  // log()
-
-
-void  ELstatistics::clearSummary()  {
-
-  limits.zero();
-  ELmap_stats::iterator s;
-  for ( s = stats.begin();  s != stats.end();  ++s )  {
-    (*s).second.n = 0;
-    (*s).second.context1 = (*s).second.context2 = (*s).second.contextLast = "";
-  }
-
-}  // clearSummary()
-
-
-void  ELstatistics::wipe()  {
+      // Account for this message, making a new table entry if needed:
+      //
+      ELmap_stats::iterator s = stats.find(msg.xid());
+      if (s == stats.end()) {
+        if (tableLimit < 0 || static_cast<int>(stats.size()) < tableLimit) {
+          stats[msg.xid()] = StatsCount();
+          s = stats.find(msg.xid());
+        }
+      }
+#ifdef ELstatsLOG_TRACE
+      std::cerr << "    =:=:=: Message accounted for in stats \n";
+#endif
+      if (s != stats.end()) {
+        (*s).second.add(summarizeContext(msg.context()), msg.reactedTo());
+
+        updatedStats = true;
+#ifdef ELstatsLOG_TRACE
+        std::cerr << "    =:=:=: Updated stats \n";
+#endif
+      }
 
-  limits.wipe();
-  stats.erase( stats.begin(), stats.end() );  //stats.clear();
+      // For the purposes of telling whether any log destination has reacted
+      // to the message, the statistics destination does not count:
+      //
 
-}  // wipe()
+#ifdef ELstatsLOG_TRACE
+      std::cerr << "  =:=:=: log(msg) done (stats) \n";
+#endif
 
+      return false;
 
-void  ELstatistics::zero()  {
+    }  // log()
 
-  limits.zero();
+    void ELstatistics::clearSummary() {
+      limits.zero();
+      ELmap_stats::iterator s;
+      for (s = stats.begin(); s != stats.end(); ++s) {
+        (*s).second.n = 0;
+        (*s).second.context1 = (*s).second.context2 = (*s).second.contextLast = "";
+      }
 
-}  // zero()
+    }  // clearSummary()
 
+    void ELstatistics::wipe() {
+      limits.wipe();
+      stats.erase(stats.begin(), stats.end());  //stats.clear();
 
-ELstring  ELstatistics::formSummary( ELmap_stats & stats )  {
-			// Major changes 8/16/07 mf, including making this
-			// a static member function instead of a free function
-			
-  using std::ios;       /* _base ? */
-  using std::setw;
-  using std::right;
-  using std::left;
+    }  // wipe()
 
-  std::ostringstream          s;
-  int                         n = 0;
+    void ELstatistics::zero() { limits.zero(); }  // zero()
 
-  // -----  Summary part I:
-  //
-  bool      ftnote( false );
+    ELstring ELstatistics::formSummary(ELmap_stats& stats) {
+      // Major changes 8/16/07 mf, including making this
+      // a static member function instead of a free function
 
-  struct part3  {
-    long n, t;
-    part3() : n(0L), t(0L)  { ; }
-  }  p3[ELseverityLevel::nLevels];
+      using std::ios; /* _base ? */
+      using std::left;
+      using std::right;
+      using std::setw;
 
-  std::set<std::string>::iterator gcEnd = groupedCategories.end(); 
-  std::set<std::string> gCats = groupedCategories;  // TEMP FOR DEBUGGING SANITY
-  for ( ELmap_stats::const_iterator i = stats.begin();  i != stats.end();  ++i )  {
+      std::ostringstream s;
+      int n = 0;
 
-     // If this is a grouped category, wait till later to output its stats
-    std::string cat = (*i).first.id; 
-    if ( groupedCategories.find(cat) != gcEnd )
-    {								// 8/16/07 mf
-       continue; // We will process these categories later
-    }
-    							
-    // -----  Emit new process and part I header, if needed:
-    //
-    if ( n == 0 ) {
-      s << "\n";
-      s << " type     category        sev    module        "
-             "subroutine        count    total\n"
-        << " ---- -------------------- -- ---------------- "
-             "----------------  -----    -----\n"
-        ;
-    }
-    // -----  Emit detailed message information:
-    //
-    s << right << std::setw( 5) << ++n                                     << ' '
-      << left  << std::setw(20) << (*i).first.id.substr(0,20)              << ' '
-      << left  << std::setw( 2) << (*i).first.severity.getSymbol()         << ' '
-      << left  << std::setw(16) << (*i).first.module.substr(0,16)          << ' '
-      << left  << std::setw(16) << (*i).first.subroutine.substr(0,16)
-      << right << std::setw( 7) << (*i).second.n
-      << left  << std::setw( 1) << ( (*i).second.ignoredFlag ? '*' : ' ' )
-      << right << std::setw( 8) << (*i).second.aggregateN                  << '\n'
-      ;
-    ftnote = ftnote || (*i).second.ignoredFlag;
-
-    // -----  Obtain information for Part III, below:
-    //
-    ELextendedID xid = (*i).first;
-    p3[xid.severity.getLevel()].n += (*i).second.n;
-    p3[xid.severity.getLevel()].t += (*i).second.aggregateN;
-  }  // for i
-
-  // ----- Part Ia:  The grouped categories
-  for ( std::set<std::string>::iterator g = groupedCategories.begin(); g != gcEnd; ++g ) {
-    int groupTotal = 0;
-    int groupAggregateN = 0;
-    ELseverityLevel severityLevel;
-    bool groupIgnored = true;
-    for ( ELmap_stats::const_iterator i = stats.begin();  i != stats.end();  ++i )  {
-      if ( (*i).first.id == *g ) {
-        if (groupTotal==0) severityLevel = (*i).first.severity;
-	groupIgnored &= (*i).second.ignoredFlag;
-	groupAggregateN += (*i).second.aggregateN;
-        ++groupTotal;
-      } 
-    } // for i
-    if (groupTotal > 0) {
-      // -----  Emit detailed message information:
+      // -----  Summary part I:
       //
-      s << right << std::setw( 5) << ++n                                     << ' '
-	<< left  << std::setw(20) << (*g).substr(0,20)                       << ' '
-	<< left  << std::setw( 2) << severityLevel.getSymbol()               << ' '
-	<< left  << std::setw(16) << "  <Any Module>  "                      << ' '
-	<< left  << std::setw(16) << "<Any Function>"
-	<< right << std::setw( 7) << groupTotal
-	<< left  << std::setw( 1) << ( groupIgnored ? '*' : ' ' )
-	<< right << std::setw( 8) << groupAggregateN                  << '\n'
-	;
-      ftnote = ftnote || groupIgnored;
-
-      // -----  Obtain information for Part III, below:
+      bool ftnote(false);
+
+      struct part3 {
+        long n, t;
+        part3() : n(0L), t(0L) { ; }
+      } p3[ELseverityLevel::nLevels];
+
+      std::set<std::string>::iterator gcEnd = groupedCategories.end();
+      std::set<std::string> gCats = groupedCategories;  // TEMP FOR DEBUGGING SANITY
+      for (ELmap_stats::const_iterator i = stats.begin(); i != stats.end(); ++i) {
+        // If this is a grouped category, wait till later to output its stats
+        std::string cat = (*i).first.id;
+        if (groupedCategories.find(cat) != gcEnd) {  // 8/16/07 mf
+          continue;                                  // We will process these categories later
+        }
+
+        // -----  Emit new process and part I header, if needed:
+        //
+        if (n == 0) {
+          s << "\n";
+          s << " type     category        sev    module        "
+               "subroutine        count    total\n"
+            << " ---- -------------------- -- ---------------- "
+               "----------------  -----    -----\n";
+        }
+        // -----  Emit detailed message information:
+        //
+        s << right << std::setw(5) << ++n << ' ' << left << std::setw(20) << (*i).first.id.substr(0, 20) << ' ' << left
+          << std::setw(2) << (*i).first.severity.getSymbol() << ' ' << left << std::setw(16)
+          << (*i).first.module.substr(0, 16) << ' ' << left << std::setw(16) << (*i).first.subroutine.substr(0, 16)
+          << right << std::setw(7) << (*i).second.n << left << std::setw(1) << ((*i).second.ignoredFlag ? '*' : ' ')
+          << right << std::setw(8) << (*i).second.aggregateN << '\n';
+        ftnote = ftnote || (*i).second.ignoredFlag;
+
+        // -----  Obtain information for Part III, below:
+        //
+        ELextendedID xid = (*i).first;
+        p3[xid.severity.getLevel()].n += (*i).second.n;
+        p3[xid.severity.getLevel()].t += (*i).second.aggregateN;
+      }  // for i
+
+      // ----- Part Ia:  The grouped categories
+      for (std::set<std::string>::iterator g = groupedCategories.begin(); g != gcEnd; ++g) {
+        int groupTotal = 0;
+        int groupAggregateN = 0;
+        ELseverityLevel severityLevel;
+        bool groupIgnored = true;
+        for (ELmap_stats::const_iterator i = stats.begin(); i != stats.end(); ++i) {
+          if ((*i).first.id == *g) {
+            if (groupTotal == 0)
+              severityLevel = (*i).first.severity;
+            groupIgnored &= (*i).second.ignoredFlag;
+            groupAggregateN += (*i).second.aggregateN;
+            ++groupTotal;
+          }
+        }  // for i
+        if (groupTotal > 0) {
+          // -----  Emit detailed message information:
+          //
+          s << right << std::setw(5) << ++n << ' ' << left << std::setw(20) << (*g).substr(0, 20) << ' ' << left
+            << std::setw(2) << severityLevel.getSymbol() << ' ' << left << std::setw(16) << "  <Any Module>  " << ' '
+            << left << std::setw(16) << "<Any Function>" << right << std::setw(7) << groupTotal << left << std::setw(1)
+            << (groupIgnored ? '*' : ' ') << right << std::setw(8) << groupAggregateN << '\n';
+          ftnote = ftnote || groupIgnored;
+
+          // -----  Obtain information for Part III, below:
+          //
+          int lev = severityLevel.getLevel();
+          p3[lev].n += groupTotal;
+          p3[lev].t += groupAggregateN;
+        }  // end if groupTotal>0
+      }    // for g
+
+      // -----  Provide footnote to part I, if needed:
       //
-      int lev = severityLevel.getLevel();
-      p3[lev].n += groupTotal;
-      p3[lev].t += groupAggregateN;
-    } // end if groupTotal>0
-  }  // for g
-
-  // -----  Provide footnote to part I, if needed:
-  //
-  if ( ftnote )
-    s << "\n* Some occurrences of this message"
-         " were suppressed in all logs, due to limits.\n"
-      ;
-
-  // -----  Summary part II:
-  //
-  n = 0;
-  for ( ELmap_stats::const_iterator i = stats.begin();  i != stats.end();  ++i )  {
-    std::string cat = (*i).first.id; 
-    if ( groupedCategories.find(cat) != gcEnd )
-    {								// 8/16/07 mf
-       continue; // We will process these categories later
-    }
-    if ( n ==  0 ) {
-      s << '\n'
-	<< " type    category    Examples: "
-	   "run/evt        run/evt          run/evt\n"
-	<< " ---- -------------------- ----"
-	   "------------ ---------------- ----------------\n"
-	;
-    }
-    s << right << std::setw( 5) << ++n                             << ' '
-      << left  << std::setw(20) << (*i).first.id.c_str()           << ' '
-      << left  << std::setw(16) << (*i).second.context1.c_str()    << ' '
-      << left  << std::setw(16) << (*i).second.context2.c_str()    << ' '
-                           << (*i).second.contextLast.c_str() << '\n'
-      ;
-  }  // for
-
-  // -----  Summary part III:
-  //
-  s << "\nSeverity    # Occurrences   Total Occurrences\n"
-    <<   "--------    -------------   -----------------\n";
-  for ( int k = 0;  k < ELseverityLevel::nLevels;  ++k )  {
-    if ( p3[k].n != 0  ||  p3[k].t != 0 )  {
-      s << left  << std::setw( 8) << ELseverityLevel( ELseverityLevel::ELsev_(k) ).getName().c_str()
-        << right << std::setw(17) << p3[k].n
-        << right << std::setw(20) << p3[k].t
-                             << '\n'
-        ;
-    }
-  }  // for
-
-  return s.str();
-
-}  // formSummary()
-
+      if (ftnote)
+        s << "\n* Some occurrences of this message"
+             " were suppressed in all logs, due to limits.\n";
 
-void  ELstatistics::summary( std::ostream & os, const ELstring & title )  {
-
-  os << title << std::endl << formSummary(stats) << std::flush;
-  updatedStats = false;
+      // -----  Summary part II:
+      //
+      n = 0;
+      for (ELmap_stats::const_iterator i = stats.begin(); i != stats.end(); ++i) {
+        std::string cat = (*i).first.id;
+        if (groupedCategories.find(cat) != gcEnd) {  // 8/16/07 mf
+          continue;                                  // We will process these categories later
+        }
+        if (n == 0) {
+          s << '\n'
+            << " type    category    Examples: "
+               "run/evt        run/evt          run/evt\n"
+            << " ---- -------------------- ----"
+               "------------ ---------------- ----------------\n";
+        }
+        s << right << std::setw(5) << ++n << ' ' << left << std::setw(20) << (*i).first.id.c_str() << ' ' << left
+          << std::setw(16) << (*i).second.context1.c_str() << ' ' << left << std::setw(16)
+          << (*i).second.context2.c_str() << ' ' << (*i).second.contextLast.c_str() << '\n';
+      }  // for
+
+      // -----  Summary part III:
+      //
+      s << "\nSeverity    # Occurrences   Total Occurrences\n"
+        << "--------    -------------   -----------------\n";
+      for (int k = 0; k < ELseverityLevel::nLevels; ++k) {
+        if (p3[k].n != 0 || p3[k].t != 0) {
+          s << left << std::setw(8) << ELseverityLevel(ELseverityLevel::ELsev_(k)).getName().c_str() << right
+            << std::setw(17) << p3[k].n << right << std::setw(20) << p3[k].t << '\n';
+        }
+      }  // for
 
-}  // summary()
+      return s.str();
 
-void  ELstatistics::summary(unsigned long overfullWaitCount )  {
+    }  // formSummary()
 
-  termStream << "\n=============================================\n\n"
-  	     << "MessageLogger Summary" << std::endl
-         << formSummary(stats) <<std::endl
-         << "dropped waiting message count "<<overfullWaitCount
-         << std::endl << std::flush;
-  updatedStats = false;
+    void ELstatistics::summary(std::ostream& os, const ELstring& title) {
+      os << title << std::endl << formSummary(stats) << std::flush;
+      updatedStats = false;
 
-}  // summary()
+    }  // summary()
 
-void  ELstatistics::noTerminationSummary()  { printAtTermination = false; }
+    void ELstatistics::summary(unsigned long overfullWaitCount) {
+      termStream << "\n=============================================\n\n"
+                 << "MessageLogger Summary" << std::endl
+                 << formSummary(stats) << std::endl
+                 << "dropped waiting message count " << overfullWaitCount << std::endl
+                 << std::flush;
+      updatedStats = false;
 
-std::map<ELextendedID , StatsCount> ELstatistics::statisticsMap() const {
-  return std::map<ELextendedID , StatsCount> ( stats );
-}
+    }  // summary()
 
+    void ELstatistics::noTerminationSummary() { printAtTermination = false; }
 
-								// 6/19/08 mf
-void  ELstatistics::summaryForJobReport (std::map<std::string, double> & sm) {
+    std::map<ELextendedID, StatsCount> ELstatistics::statisticsMap() const {
+      return std::map<ELextendedID, StatsCount>(stats);
+    }
 
-  struct part3  {
-    long n, t;
-    part3() : n(0L), t(0L)  { ; }
-  }  p3[ELseverityLevel::nLevels];
+    // 6/19/08 mf
+    void ELstatistics::summaryForJobReport(std::map<std::string, double>& sm) {
+      struct part3 {
+        long n, t;
+        part3() : n(0L), t(0L) { ; }
+      } p3[ELseverityLevel::nLevels];
+
+      std::set<std::string>::iterator gcEnd = groupedCategories.end();
+      std::set<std::string> gCats = groupedCategories;  // TEMP FOR DEBUGGING SANITY
+
+      // ----- Part I:  The ungrouped categories
+      for (ELmap_stats::const_iterator i = stats.begin(); i != stats.end(); ++i) {
+        // If this is a grouped category, wait till later to output its stats
+        std::string cat = (*i).first.id;
+        if (groupedCategories.find(cat) != gcEnd) {
+          continue;  // We will process these categories later
+        }
+
+        // -----  Emit detailed message information:
+        //
+        std::ostringstream s;
+        s << "Category_";
+        std::string sevSymbol = (*i).first.severity.getSymbol();
+        if (sevSymbol[0] == '-')
+          sevSymbol = sevSymbol.substr(1);
+        s << sevSymbol << "_" << (*i).first.id;
+        int n = (*i).second.aggregateN;
+        std::string catstr = s.str();
+        if (sm.find(catstr) != sm.end()) {
+          sm[catstr] += n;
+        } else {
+          sm[catstr] = n;
+        }
+        // -----  Obtain information for Part III, below:
+        //
+        ELextendedID xid = (*i).first;
+        p3[xid.severity.getLevel()].n += (*i).second.n;
+        p3[xid.severity.getLevel()].t += (*i).second.aggregateN;
+      }  // for i
+
+      // ----- Part Ia:  The grouped categories
+      for (std::set<std::string>::iterator g = groupedCategories.begin(); g != gcEnd; ++g) {
+        int groupTotal = 0;
+        int groupAggregateN = 0;
+        ELseverityLevel severityLevel;
+        for (ELmap_stats::const_iterator i = stats.begin(); i != stats.end(); ++i) {
+          if ((*i).first.id == *g) {
+            if (groupTotal == 0)
+              severityLevel = (*i).first.severity;
+            groupAggregateN += (*i).second.aggregateN;
+            ++groupTotal;
+          }
+        }  // for i
+        if (groupTotal > 0) {
+          // -----  Emit detailed message information:
+          //
+          std::ostringstream s;
+          s << "Category_";
+          std::string sevSymbol = severityLevel.getSymbol();
+          if (sevSymbol[0] == '-')
+            sevSymbol = sevSymbol.substr(1);
+          s << sevSymbol << "_" << *g;
+          int n = groupAggregateN;
+          std::string catstr = s.str();
+          if (sm.find(catstr) != sm.end()) {
+            sm[catstr] += n;
+          } else {
+            sm[catstr] = n;
+          }
+
+          // -----  Obtain information for Part III, below:
+          //
+          int lev = severityLevel.getLevel();
+          p3[lev].n += groupTotal;
+          p3[lev].t += groupAggregateN;
+        }  // end if groupTotal>0
+      }    // for g
+
+      // part II (sample event numbers) does not exist for the job report.
+
+      // -----  Summary part III:
+      //
+      for (int k = 0; k < ELseverityLevel::nLevels; ++k) {
+        //if ( p3[k].t != 0 )  {
+        if (true) {
+          std::string sevName;
+          sevName = ELseverityLevel(ELseverityLevel::ELsev_(k)).getName();
+          if (sevName == "Severe")
+            sevName = "System";
+          if (sevName == "Success")
+            sevName = "Debug";
+          sevName = std::string("Log") + sevName;
+          sevName = dualLogName(sevName);
+          if (sevName != "UnusedSeverity") {
+            sm[sevName] = p3[k].t;
+          }
+        }
+      }  // for k
+
+    }  // summaryForJobReport()
+
+    std::string ELstatistics::dualLogName(std::string const& s) {
+      if (s == "LogDebug")
+        return "LogDebug_LogTrace";
+      if (s == "LogInfo")
+        return "LogInfo_LogVerbatim";
+      if (s == "LogWarning")
+        return "LogWarnng_LogPrint";
+      if (s == "LogError")
+        return "LogError_LogProblem";
+      if (s == "LogSystem")
+        return "LogSystem_LogAbsolute";
+      return "UnusedSeverity";
+    }
 
-  std::set<std::string>::iterator gcEnd = groupedCategories.end(); 
-  std::set<std::string> gCats = groupedCategories;  // TEMP FOR DEBUGGING SANITY
+    std::set<std::string> ELstatistics::groupedCategories;  // 8/16/07 mf
 
-  // ----- Part I:  The ungrouped categories
-  for ( ELmap_stats::const_iterator i = stats.begin();  i != stats.end();  ++i )  {
+    void ELstatistics::noteGroupedCategory(std::string const& cat) { groupedCategories.insert(cat); }
 
-     // If this is a grouped category, wait till later to output its stats
-    std::string cat = (*i).first.id; 
-    if ( groupedCategories.find(cat) != gcEnd )
-    {								
-       continue; // We will process these categories later
-    }
-    							
-    // -----  Emit detailed message information:
-    //
-    std::ostringstream s;
-    s << "Category_";
-    std::string sevSymbol = (*i).first.severity.getSymbol();
-    if ( sevSymbol[0] == '-' ) sevSymbol = sevSymbol.substr(1);
-    s << sevSymbol << "_" << (*i).first.id;
-    int n = (*i).second.aggregateN;    
-    std::string catstr = s.str();
-    if (sm.find(catstr) != sm.end()) {
-      sm[catstr] += n; 
-    } else {
-       sm[catstr] = n;
-    } 
-    // -----  Obtain information for Part III, below:
-    //
-    ELextendedID xid = (*i).first;
-    p3[xid.severity.getLevel()].n += (*i).second.n;
-    p3[xid.severity.getLevel()].t += (*i).second.aggregateN;
-  }  // for i
-
-  // ----- Part Ia:  The grouped categories
-  for ( std::set<std::string>::iterator g = groupedCategories.begin(); g != gcEnd; ++g ) {
-    int groupTotal = 0;
-    int groupAggregateN = 0;
-    ELseverityLevel severityLevel;
-    for ( ELmap_stats::const_iterator i = stats.begin();  i != stats.end();  ++i )  {
-      if ( (*i).first.id == *g ) {
-        if (groupTotal==0) severityLevel = (*i).first.severity;
-	groupAggregateN += (*i).second.aggregateN;
-        ++groupTotal;
-      } 
-    } // for i
-    if (groupTotal > 0) {
-      // -----  Emit detailed message information:
-      //
-      std::ostringstream s;
-      s << "Category_";
-      std::string sevSymbol = severityLevel.getSymbol();
-      if ( sevSymbol[0] == '-' ) sevSymbol = sevSymbol.substr(1);
-      s << sevSymbol << "_" << *g;
-      int n = groupAggregateN;    
-      std::string catstr = s.str();
-      if (sm.find(catstr) != sm.end()) {
-        sm[catstr] += n; 
-      } else {
-         sm[catstr] = n;
-      } 
-
-      // -----  Obtain information for Part III, below:
-      //
-      int lev = severityLevel.getLevel();
-      p3[lev].n += groupTotal;
-      p3[lev].t += groupAggregateN;
-    } // end if groupTotal>0
-  }  // for g
-
-  // part II (sample event numbers) does not exist for the job report.
-
-  // -----  Summary part III:
-  //
-  for ( int k = 0;  k < ELseverityLevel::nLevels;  ++k )  {
-    //if ( p3[k].t != 0 )  {
-    if (true) {
-      std::string sevName;
-      sevName = ELseverityLevel( ELseverityLevel::ELsev_(k) ).getName();
-      if (sevName == "Severe")  sevName = "System";
-      if (sevName == "Success") sevName = "Debug";
-      sevName = std::string("Log")+sevName;
-      sevName = dualLogName(sevName);
-      if (sevName != "UnusedSeverity") {
-        sm[sevName] = p3[k].t;
-      }
-    }
-  }  // for k
-
-} // summaryForJobReport()
-
-std::string ELstatistics::dualLogName (std::string const & s) 
-{
-  if (s=="LogDebug")   return  "LogDebug_LogTrace";
-  if (s=="LogInfo")    return  "LogInfo_LogVerbatim";
-  if (s=="LogWarning") return  "LogWarnng_LogPrint";
-  if (s=="LogError")   return  "LogError_LogProblem";
-  if (s=="LogSystem")  return  "LogSystem_LogAbsolute";
-  return "UnusedSeverity";
-}
-
-std::set<std::string> ELstatistics::groupedCategories; // 8/16/07 mf 
-
-void ELstatistics::noteGroupedCategory(std::string const & cat) {
-  groupedCategories.insert(cat);
-}
-  
-} // end of namespace service  
-} // end of namespace edm  
+  }  // end of namespace service
+}  // end of namespace edm
diff --git a/FWCore/MessageService/src/HardwiredDefaults.cc b/FWCore/MessageService/src/HardwiredDefaults.cc
index 14d83841bdf56..892fcaa10c0e8 100644
--- a/FWCore/MessageService/src/HardwiredDefaults.cc
+++ b/FWCore/MessageService/src/HardwiredDefaults.cc
@@ -4,7 +4,7 @@
 //
 // All the hardwired defaults, organized by which JobMode they apply to
 //
-// JobModes:  
+// JobModes:
 //	JobModeGrid
 //	JobModeAnalysis
 //
@@ -20,186 +20,183 @@
 //
 // ----------------------------------------------------------------------
 
-
-
 #include "FWCore/MessageService/interface/MessageLoggerDefaults.h"
 
 #include <iostream>
 
 namespace edm {
-namespace service {
-
-edm::JobMode 
-MessageLoggerDefaults::
-mode(std::string const & jm)
-{
-  if (jm == "")           return       GridJobMode;  // no -mode option = grid
-  if (jm == "grid")       return       GridJobMode;
-  if (jm == "infos")      return       ReleaseValidationJobMode;
-  if (jm == "analysis")   return       AnalysisJobMode;
-  if (jm == "nil")        return       NilJobMode;
-  std::cerr << "Unrecognized Job Mode Option: " << jm
-  	    << " -- defaulting to analysis mode ";
-  return AnalysisJobMode;
-}  
-
-void MessageLoggerDefaults::
-hardwireGridJobMode() 
-{
-  //	std::cerr << " ======= hardwireGridJobMode() \n";
-  destinations.push_back ( "cerr"              );
-  categories.push_back   ( "FwkJob"            );
-  categories.push_back   ( "FwkReport"         );
-  categories.push_back   ( "FwkSummary"        );
-  categories.push_back   ( "Root_NoDictionary" );
-  statistics.push_back   ( "cerr_stats"        );
-  // cerr destination - 
-  //      note that using the name cerr is OK since it is not std::cerr
-  //      but when we want to use default as a name, we have to be circumspect
-  { Destination cerr;			  // PSet cerr
-    cerr.threshold = "INFO";		  // string threshold = "INFO"
-    Category INFO_limits;		  // PSet INFO = { ... } 
-      INFO_limits.limit = 0;		  // int32 limit = 0
-      cerr.sev["INFO"] = INFO_limits; 
-    Category  default_for_dest;		  // PSet default
-      default_for_dest.limit = 10000000;  // int32 limit = 10000000
-      cerr.category["default"] = default_for_dest;
-    Category FwkReport;			  // PSet FwkReport
-      FwkReport.limit = 10000000;	  // int32 limit = 10000000
-      FwkReport.reportEvery = 1;	  // int32 reportEvery = 1
-      cerr.category["FwkReport"] = FwkReport;
-    Category FwkSummary;		  // PSet FwkSummary
-      FwkSummary.limit = 10000000;	  // int32 limit = 10000000
-      FwkSummary.reportEvery = 1;	  // int32 reportEvery = 1
-      cerr.category["FwkSummary"] = FwkSummary;
-    Category FwkJob;		  	  // PSet FwkJob
-      FwkJob.limit = 0;	  		  // int32 limit = 0
-      cerr.category["FwkJob"] = FwkJob;
-     Category Root_NoDictionary;	  // PSet Root_NoDictionary
-      Root_NoDictionary.limit =  0;	  // int32 limit = 0
-      cerr.category["Root_NoDictionary"] = Root_NoDictionary;
-    destination["cerr"] = cerr;
-  }
-  { Destination FrameworkJobReport;	  // PSet FrameworkJobReport
-    Category  default_for_dest;		  // PSet default
-      default_for_dest.limit = 0;  	  // int32 limit = 0
-      FrameworkJobReport.category["default"] = default_for_dest;
-    Category FwkJob;		  	  // PSet FwkJob
-      FwkJob.limit = 10000000;	  	  // int32 limit = 10000000
-      FrameworkJobReport.category["FwkJob"] = FwkJob;
-    destination["FrameworkJobReport"] = FrameworkJobReport;
-  }
-  { Destination cerr_stats;			 // PSet cerr_stats
-    cerr_stats.threshold = "WARNING";		 // string threshold = "WARNING"
-    cerr_stats.output = "cerr";		 	 // string output = "cerr"
-    destination["cerr_stats"] = cerr_stats;
-  }
+  namespace service {
 
-} // hardwireGridJobMode
+    edm::JobMode MessageLoggerDefaults::mode(std::string const& jm) {
+      if (jm.empty())
+        return GridJobMode;  // no -mode option = grid
+      if (jm == "grid")
+        return GridJobMode;
+      if (jm == "infos")
+        return ReleaseValidationJobMode;
+      if (jm == "analysis")
+        return AnalysisJobMode;
+      if (jm == "nil")
+        return NilJobMode;
+      std::cerr << "Unrecognized Job Mode Option: " << jm << " -- defaulting to analysis mode ";
+      return AnalysisJobMode;
+    }
 
-void MessageLoggerDefaults::
-hardwireReleaseValidationJobMode() 
-{
-  //	std::cerr << " ======= hardwireReleaseValidationJobMode() \n";
-  destinations.push_back ( "cerr"              );
-  categories.push_back   ( "FwkJob"            );
-  categories.push_back   ( "FwkReport"         );
-  categories.push_back   ( "FwkSummary"        );
-  categories.push_back   ( "Root_NoDictionary" );
-  statistics.push_back   ( "cerr_stats"        );
-  // cerr destination - 
-  //      note that using the name cerr is OK since it is not std::cerr
-  //      but when we want to use default as a name, we have to be circumspect
-  { Destination cerr;			  // PSet cerr
-    cerr.threshold = "INFO";		  // string threshold = "INFO"
-    Category INFO_limits;		  // PSet INFO = { ... } 
-      INFO_limits.limit = 5;		  // int32 limit = 5
-      cerr.sev["INFO"] = INFO_limits; 
-    Category  default_for_dest;		  // PSet default
-      default_for_dest.limit = 10000000;  // int32 limit = 10000000
-      cerr.category["default"] = default_for_dest;
-    Category FwkReport;			  // PSet FwkReport
-      FwkReport.limit = 10000000;	  // int32 limit = 10000000
-      FwkReport.reportEvery = 1;	  // int32 reportEvery = 1
-      cerr.category["FwkReport"] = FwkReport;
-    Category FwkSummary;		  // PSet FwkSummary
-      FwkSummary.limit = 10000000;	  // int32 limit = 10000000
-      FwkSummary.reportEvery = 1;	  // int32 reportEvery = 1
-      cerr.category["FwkSummary"] = FwkSummary;
-    Category FwkJob;		  	  // PSet FwkJob
-      FwkJob.limit = 0;	  		  // int32 limit = 0
-      cerr.category["FwkJob"] = FwkJob;
-     Category Root_NoDictionary;	  // PSet Root_NoDictionary
-      Root_NoDictionary.limit =  0;	  // int32 limit = 0
-      cerr.category["Root_NoDictionary"] = Root_NoDictionary;
-    destination["cerr"] = cerr;
-  }
-  { Destination FrameworkJobReport;	  // PSet FrameworkJobReport
-    Category  default_for_dest;		  // PSet default
-      default_for_dest.limit = 0;  	  // int32 limit = 0
-      FrameworkJobReport.category["default"] = default_for_dest;
-    Category FwkJob;		  	  // PSet FwkJob
-      FwkJob.limit = 10000000;	  	  // int32 limit = 10000000
-      FrameworkJobReport.category["FwkJob"] = FwkJob;
-    destination["FrameworkJobReport"] = FrameworkJobReport;
-  }
-  { Destination cerr_stats;			 // PSet cerr_stats
-    cerr_stats.threshold = "INFO";		 // string threshold = "INFO"
-    cerr_stats.output = "cerr";		 	 // string output = "cerr"
-    destination["cerr_stats"] = cerr_stats;
-  }
+    void MessageLoggerDefaults::hardwireGridJobMode() {
+      //	std::cerr << " ======= hardwireGridJobMode() \n";
+      destinations.push_back("cerr");
+      categories.push_back("FwkJob");
+      categories.push_back("FwkReport");
+      categories.push_back("FwkSummary");
+      categories.push_back("Root_NoDictionary");
+      statistics.push_back("cerr_stats");
+      // cerr destination -
+      //      note that using the name cerr is OK since it is not std::cerr
+      //      but when we want to use default as a name, we have to be circumspect
+      {
+        Destination cerr;         // PSet cerr
+        cerr.threshold = "INFO";  // string threshold = "INFO"
+        Category INFO_limits;     // PSet INFO = { ... }
+        INFO_limits.limit = 0;    // int32 limit = 0
+        cerr.sev["INFO"] = INFO_limits;
+        Category default_for_dest;          // PSet default
+        default_for_dest.limit = 10000000;  // int32 limit = 10000000
+        cerr.category["default"] = default_for_dest;
+        Category FwkReport;          // PSet FwkReport
+        FwkReport.limit = 10000000;  // int32 limit = 10000000
+        FwkReport.reportEvery = 1;   // int32 reportEvery = 1
+        cerr.category["FwkReport"] = FwkReport;
+        Category FwkSummary;          // PSet FwkSummary
+        FwkSummary.limit = 10000000;  // int32 limit = 10000000
+        FwkSummary.reportEvery = 1;   // int32 reportEvery = 1
+        cerr.category["FwkSummary"] = FwkSummary;
+        Category FwkJob;   // PSet FwkJob
+        FwkJob.limit = 0;  // int32 limit = 0
+        cerr.category["FwkJob"] = FwkJob;
+        Category Root_NoDictionary;   // PSet Root_NoDictionary
+        Root_NoDictionary.limit = 0;  // int32 limit = 0
+        cerr.category["Root_NoDictionary"] = Root_NoDictionary;
+        destination["cerr"] = cerr;
+      }
+      {
+        Destination FrameworkJobReport;  // PSet FrameworkJobReport
+        Category default_for_dest;       // PSet default
+        default_for_dest.limit = 0;      // int32 limit = 0
+        FrameworkJobReport.category["default"] = default_for_dest;
+        Category FwkJob;          // PSet FwkJob
+        FwkJob.limit = 10000000;  // int32 limit = 10000000
+        FrameworkJobReport.category["FwkJob"] = FwkJob;
+        destination["FrameworkJobReport"] = FrameworkJobReport;
+      }
+      {
+        Destination cerr_stats;            // PSet cerr_stats
+        cerr_stats.threshold = "WARNING";  // string threshold = "WARNING"
+        cerr_stats.output = "cerr";        // string output = "cerr"
+        destination["cerr_stats"] = cerr_stats;
+      }
 
-} // hardwireReleaseValidationJobMode
+    }  // hardwireGridJobMode
 
-void MessageLoggerDefaults::
-hardwireAnalysisJobMode() 
-{
-  //	std::cerr << " ======= hardwireAnalysisJobMode() \n";
-  destinations.push_back ( "warnings"          );
-  categories.push_back   ( "FwkJob"            );
-  categories.push_back   ( "FwkReport"         );
-  categories.push_back   ( "FwkSummary"        );
-  categories.push_back   ( "Root_NoDictionary" );
-  statistics.push_back   ( "cerr"              );
-  // cerr destination - 
-  //      note that using the name cerr is OK since it is not std::cerr
-  //      but when we want to use default as a name, we have to be circumspect
-  { Destination warnings;		  // PSet warnings
-    warnings.threshold = "INFO";	  // string threshold = "INFO"
-    Category INFO_limits;		  // PSet INFO = { ... } 
-      INFO_limits.limit = 0;		  // int32 limit = 0
-      warnings.sev["INFO"] = INFO_limits; 
-    Category  default_for_dest;		  // PSet default
-      default_for_dest.limit = 1000    ;  // int32 limit = 1000
-      warnings.category["default"] = default_for_dest;
-    Category FwkReport;			  // PSet FwkReport
-      FwkReport.limit = 10000000;	  // int32 limit = 10000000
-      FwkReport.reportEvery = 100;	  // int32 reportEvery = 100
-      warnings.category["FwkReport"] = FwkReport;
-    Category FwkSummary;		  // PSet FwkSummary
-      FwkSummary.limit = 10000000;	  // int32 limit = 10000000
-      warnings.category["FwkSummary"] = FwkSummary;
-    Category FwkJob;		  	  // PSet FwkJob
-      FwkJob.limit = 0;	  		  // int32 limit = 0
-      warnings.category["FwkJob"] = FwkJob;
-     Category Root_NoDictionary;	  // PSet Root_NoDictionary
-      Root_NoDictionary.limit =  0;	  // int32 limit = 0
-      warnings.category["Root_NoDictionary"] = Root_NoDictionary;
-    destination["warnings"] = warnings;
-  }
-  { Destination cerr;			 	// PSet cerr
-    cerr.threshold = "INFO";			// string threshold = "INFO"
-    destination["cerr"] = cerr;
-  }
-} // hardwireAnalysisJobMode
+    void MessageLoggerDefaults::hardwireReleaseValidationJobMode() {
+      //	std::cerr << " ======= hardwireReleaseValidationJobMode() \n";
+      destinations.push_back("cerr");
+      categories.push_back("FwkJob");
+      categories.push_back("FwkReport");
+      categories.push_back("FwkSummary");
+      categories.push_back("Root_NoDictionary");
+      statistics.push_back("cerr_stats");
+      // cerr destination -
+      //      note that using the name cerr is OK since it is not std::cerr
+      //      but when we want to use default as a name, we have to be circumspect
+      {
+        Destination cerr;         // PSet cerr
+        cerr.threshold = "INFO";  // string threshold = "INFO"
+        Category INFO_limits;     // PSet INFO = { ... }
+        INFO_limits.limit = 5;    // int32 limit = 5
+        cerr.sev["INFO"] = INFO_limits;
+        Category default_for_dest;          // PSet default
+        default_for_dest.limit = 10000000;  // int32 limit = 10000000
+        cerr.category["default"] = default_for_dest;
+        Category FwkReport;          // PSet FwkReport
+        FwkReport.limit = 10000000;  // int32 limit = 10000000
+        FwkReport.reportEvery = 1;   // int32 reportEvery = 1
+        cerr.category["FwkReport"] = FwkReport;
+        Category FwkSummary;          // PSet FwkSummary
+        FwkSummary.limit = 10000000;  // int32 limit = 10000000
+        FwkSummary.reportEvery = 1;   // int32 reportEvery = 1
+        cerr.category["FwkSummary"] = FwkSummary;
+        Category FwkJob;   // PSet FwkJob
+        FwkJob.limit = 0;  // int32 limit = 0
+        cerr.category["FwkJob"] = FwkJob;
+        Category Root_NoDictionary;   // PSet Root_NoDictionary
+        Root_NoDictionary.limit = 0;  // int32 limit = 0
+        cerr.category["Root_NoDictionary"] = Root_NoDictionary;
+        destination["cerr"] = cerr;
+      }
+      {
+        Destination FrameworkJobReport;  // PSet FrameworkJobReport
+        Category default_for_dest;       // PSet default
+        default_for_dest.limit = 0;      // int32 limit = 0
+        FrameworkJobReport.category["default"] = default_for_dest;
+        Category FwkJob;          // PSet FwkJob
+        FwkJob.limit = 10000000;  // int32 limit = 10000000
+        FrameworkJobReport.category["FwkJob"] = FwkJob;
+        destination["FrameworkJobReport"] = FrameworkJobReport;
+      }
+      {
+        Destination cerr_stats;         // PSet cerr_stats
+        cerr_stats.threshold = "INFO";  // string threshold = "INFO"
+        cerr_stats.output = "cerr";     // string output = "cerr"
+        destination["cerr_stats"] = cerr_stats;
+      }
 
-void MessageLoggerDefaults::
-hardwireNilJobMode() 
-{
-  //	std::cerr << " ======= hardwireNilJobMode() \n";
-} // hardwireNilJobMode
+    }  // hardwireReleaseValidationJobMode
 
+    void MessageLoggerDefaults::hardwireAnalysisJobMode() {
+      //	std::cerr << " ======= hardwireAnalysisJobMode() \n";
+      destinations.push_back("warnings");
+      categories.push_back("FwkJob");
+      categories.push_back("FwkReport");
+      categories.push_back("FwkSummary");
+      categories.push_back("Root_NoDictionary");
+      statistics.push_back("cerr");
+      // cerr destination -
+      //      note that using the name cerr is OK since it is not std::cerr
+      //      but when we want to use default as a name, we have to be circumspect
+      {
+        Destination warnings;         // PSet warnings
+        warnings.threshold = "INFO";  // string threshold = "INFO"
+        Category INFO_limits;         // PSet INFO = { ... }
+        INFO_limits.limit = 0;        // int32 limit = 0
+        warnings.sev["INFO"] = INFO_limits;
+        Category default_for_dest;      // PSet default
+        default_for_dest.limit = 1000;  // int32 limit = 1000
+        warnings.category["default"] = default_for_dest;
+        Category FwkReport;           // PSet FwkReport
+        FwkReport.limit = 10000000;   // int32 limit = 10000000
+        FwkReport.reportEvery = 100;  // int32 reportEvery = 100
+        warnings.category["FwkReport"] = FwkReport;
+        Category FwkSummary;          // PSet FwkSummary
+        FwkSummary.limit = 10000000;  // int32 limit = 10000000
+        warnings.category["FwkSummary"] = FwkSummary;
+        Category FwkJob;   // PSet FwkJob
+        FwkJob.limit = 0;  // int32 limit = 0
+        warnings.category["FwkJob"] = FwkJob;
+        Category Root_NoDictionary;   // PSet Root_NoDictionary
+        Root_NoDictionary.limit = 0;  // int32 limit = 0
+        warnings.category["Root_NoDictionary"] = Root_NoDictionary;
+        destination["warnings"] = warnings;
+      }
+      {
+        Destination cerr;         // PSet cerr
+        cerr.threshold = "INFO";  // string threshold = "INFO"
+        destination["cerr"] = cerr;
+      }
+    }  // hardwireAnalysisJobMode
 
-} // end of namespace service  
-} // end of namespace edm  
+    void MessageLoggerDefaults::hardwireNilJobMode() {
+      //	std::cerr << " ======= hardwireNilJobMode() \n";
+    }  // hardwireNilJobMode
 
+  }  // end of namespace service
+}  // end of namespace edm
diff --git a/FWCore/MessageService/src/MainThreadMLscribe.cc b/FWCore/MessageService/src/MainThreadMLscribe.cc
index 8c58536f56de2..cc4fffd8553cb 100644
--- a/FWCore/MessageService/src/MainThreadMLscribe.cc
+++ b/FWCore/MessageService/src/MainThreadMLscribe.cc
@@ -4,50 +4,42 @@
 //
 // Changes:
 //
-// 
+//
 
 #include "FWCore/MessageService/interface/MainThreadMLscribe.h"
 #include "FWCore/MessageService/interface/ThreadQueue.h"
 #include "FWCore/MessageLogger/interface/ConfigurationHandshake.h"
 
 namespace edm {
-namespace service {
+  namespace service {
 
-MainThreadMLscribe::MainThreadMLscribe(std::shared_ptr<ThreadQueue> tqp) 
-  : m_queue(tqp) 
-{
-}
+    MainThreadMLscribe::MainThreadMLscribe(std::shared_ptr<ThreadQueue> tqp) : m_queue(tqp) {}
 
-MainThreadMLscribe::~MainThreadMLscribe() {}
+    MainThreadMLscribe::~MainThreadMLscribe() {}
 
-void  
-MainThreadMLscribe::
-runCommand(MessageLoggerQ::OpCode  opcode, void * operand)
-{
-  if (MessageLoggerQ::handshaked(opcode)) {
-    Place_for_passing_exception_ptr epp(new Pointer_to_new_exception_on_heap());
-    ConfigurationHandshake h(operand,epp);
-    void * v(static_cast<void *>(&h));
-    Pointer_to_new_exception_on_heap ep;
-    {
-      std::unique_lock<std::mutex> sl(h.m);       // get lock
-      m_queue->produce (opcode, v);
-      // wait for result to appear (in epp)
-      h.c.wait(sl); // c.wait(sl) unlocks the scoped lock and sleeps till notified
-      // ... and once the MessageLoggerScribe does h.c.notify_all() ... 
-      ep = *h.epp;
-      // finally, release the scoped lock by letting it go out of scope 
-    }
-    if ( ep ) {
-      edm::Exception ex(*ep);
-      throw ex;
-    }  
-  } else {
-    m_queue->produce (opcode, operand);
-  }
-} // runCommand
-  
-  
+    void MainThreadMLscribe::runCommand(MessageLoggerQ::OpCode opcode, void *operand) {
+      if (MessageLoggerQ::handshaked(opcode)) {
+        Place_for_passing_exception_ptr epp(new Pointer_to_new_exception_on_heap());
+        ConfigurationHandshake h(operand, epp);
+        void *v(static_cast<void *>(&h));
+        Pointer_to_new_exception_on_heap ep;
+        {
+          std::unique_lock<std::mutex> sl(h.m);  // get lock
+          m_queue->produce(opcode, v);
+          // wait for result to appear (in epp)
+          h.c.wait(sl);  // c.wait(sl) unlocks the scoped lock and sleeps till notified
+          // ... and once the MessageLoggerScribe does h.c.notify_all() ...
+          ep = *h.epp;
+          // finally, release the scoped lock by letting it go out of scope
+        }
+        if (ep) {
+          edm::Exception ex(*ep);
+          throw ex;
+        }
+      } else {
+        m_queue->produce(opcode, operand);
+      }
+    }  // runCommand
 
-} // end of namespace service  
-} // end of namespace edm  
+  }  // end of namespace service
+}  // end of namespace edm
diff --git a/FWCore/MessageService/src/MessageLogger.cc b/FWCore/MessageService/src/MessageLogger.cc
index 08ac7a698cdff..4837b08cdadd9 100644
--- a/FWCore/MessageService/src/MessageLogger.cc
+++ b/FWCore/MessageService/src/MessageLogger.cc
@@ -95,7 +95,6 @@
 #include "FWCore/ServiceRegistry/interface/GlobalContext.h"
 #include "FWCore/ServiceRegistry/interface/PathContext.h"
 
-
 #include <sstream>
 #include <limits>
 
@@ -104,26 +103,18 @@ using namespace edm::service;
 
 namespace {
   char const* const s_globalTransitionNames[] = {
-    "@beginJob",
-    "@beginRun",
-    "@beginLumi",
-    "@endLumi",
-    "@endRun",
-    "@endJob",
-    "@writeRun",
-    "@writeLumi"
-  };
-  
+      "@beginJob", "@beginRun", "@beginLumi", "@endLumi", "@endRun", "@endJob", "@writeRun", "@writeLumi"};
+
   char const* const s_streamTransitionNames[] = {
-    "@beginStream",
-    "@streamBeginRun",
-    "@streamBeginLumi",
-    "",//event
-    "@streamEndLumi",
-    "@streamEndRun",
-    "@endStream",
+      "@beginStream",
+      "@streamBeginRun",
+      "@streamBeginLumi",
+      "",  //event
+      "@streamEndLumi",
+      "@streamEndRun",
+      "@endStream",
   };
-}
+}  // namespace
 
 namespace edm {
   //Forward declare here
@@ -134,322 +125,295 @@ namespace edm {
   void setMaxLoggedErrorsSummaryIndicies(unsigned int iMax);
 
   namespace service {
-    
-    bool edm::service::MessageLogger::anyDebugEnabled_                    = false;
-    bool edm::service::MessageLogger::everyDebugEnabled_                  = false;
-    bool edm::service::MessageLogger::fjrSummaryRequested_                = false;
-    
+
+    bool edm::service::MessageLogger::anyDebugEnabled_ = false;
+    bool edm::service::MessageLogger::everyDebugEnabled_ = false;
+    bool edm::service::MessageLogger::fjrSummaryRequested_ = false;
+
     //
     // constructors and destructor
     //
-    edm::service::MessageLogger::
-    MessageLogger( ParameterSet const & iPS
-                  , ActivityRegistry   & iRegistry
-                  )
-    : debugEnabled_(false)
-    , messageServicePSetHasBeenValidated_(false)
-    , messageServicePSetValidatationResults_()
-    , nonModule_debugEnabled(false)
-    , nonModule_infoEnabled(true)
-    , nonModule_warningEnabled(true)
-    , nonModule_errorEnabled(true)                          // change log 20
+    edm::service::MessageLogger::MessageLogger(ParameterSet const& iPS, ActivityRegistry& iRegistry)
+        : debugEnabled_(false),
+          messageServicePSetHasBeenValidated_(false),
+          messageServicePSetValidatationResults_(),
+          nonModule_debugEnabled(false),
+          nonModule_infoEnabled(true),
+          nonModule_warningEnabled(true),
+          nonModule_errorEnabled(true)  // change log 20
     {
       // prepare cfg validation string for later use
       MessageServicePSetValidation validator;
-      messageServicePSetValidatationResults_ = validator(iPS);	// change log 12
-      
+      messageServicePSetValidatationResults_ = validator(iPS);  // change log 12
+
       typedef std::vector<std::string> vString;
       vString empty_vString;
       vString debugModules;
       vString suppressDebug;
       vString suppressInfo;
       vString suppressWarning;
-      vString suppressError;                                        // change log 20
-      
-      try {								// change log 13
-                          // decide whether a summary should be placed in job report
-        fjrSummaryRequested_ =
-    	  iPS.getUntrackedParameter<bool>("messageSummaryToJobReport", false);
-        
+      vString suppressError;  // change log 20
+
+      try {  // change log 13
+             // decide whether a summary should be placed in job report
+        fjrSummaryRequested_ = iPS.getUntrackedParameter<bool>("messageSummaryToJobReport", false);
+
         // grab list of debug-enabled modules
-        debugModules =
-    	  iPS.getUntrackedParameter<vString>("debugModules", empty_vString);
-        
+        debugModules = iPS.getUntrackedParameter<vString>("debugModules", empty_vString);
+
         // grab lists of suppressLEVEL modules
-        suppressDebug =
-    	  iPS.getUntrackedParameter<vString>("suppressDebug", empty_vString);
-        
-        suppressInfo =
-    	  iPS.getUntrackedParameter<vString>("suppressInfo", empty_vString);
-        
-        suppressWarning =
-    	  iPS.getUntrackedParameter<vString>("suppressWarning", empty_vString);
-        
-        suppressError =                                             // change log 20
-    	  iPS.getUntrackedParameter<vString>("suppressError", empty_vString);
-      } catch (cms::Exception& e) {					// change log 13
+        suppressDebug = iPS.getUntrackedParameter<vString>("suppressDebug", empty_vString);
+
+        suppressInfo = iPS.getUntrackedParameter<vString>("suppressInfo", empty_vString);
+
+        suppressWarning = iPS.getUntrackedParameter<vString>("suppressWarning", empty_vString);
+
+        suppressError =  // change log 20
+            iPS.getUntrackedParameter<vString>("suppressError", empty_vString);
+      } catch (cms::Exception& e) {  // change log 13
       }
-      
+
       // Use these lists to prepare a map to use in tracking suppression
-      
+
       // Do suppressDebug first and suppressError last to get proper order
-      for( vString::const_iterator it  = suppressDebug.begin();
-          it != suppressDebug.end(); ++it ) {
+      for (vString::const_iterator it = suppressDebug.begin(); it != suppressDebug.end(); ++it) {
         suppression_levels_[*it] = ELseverityLevel::ELsev_success;
       }
-      
-      for( vString::const_iterator it  = suppressInfo.begin();
-          it != suppressInfo.end(); ++it ) {
+
+      for (vString::const_iterator it = suppressInfo.begin(); it != suppressInfo.end(); ++it) {
         suppression_levels_[*it] = ELseverityLevel::ELsev_info;
       }
-      
-      for( vString::const_iterator it  = suppressWarning.begin();
-          it != suppressWarning.end(); ++it ) {
+
+      for (vString::const_iterator it = suppressWarning.begin(); it != suppressWarning.end(); ++it) {
         suppression_levels_[*it] = ELseverityLevel::ELsev_warning;
       }
-      
-      for( vString::const_iterator it  = suppressError.begin();     // change log 20
-          it != suppressError.end(); ++it ) {
+
+      for (vString::const_iterator it = suppressError.begin();  // change log 20
+           it != suppressError.end();
+           ++it) {
         suppression_levels_[*it] = ELseverityLevel::ELsev_error;
       }
-      
+
       // set up for tracking whether current module is debug-enabled
       // (and info-enabled and warning-enabled)
-      if ( debugModules.empty()) {
-        anyDebugEnabled_ = false;					// change log 11
-        MessageDrop::instance()->debugEnabled = false;		// change log 1
+      if (debugModules.empty()) {
+        anyDebugEnabled_ = false;                       // change log 11
+        MessageDrop::instance()->debugEnabled = false;  // change log 1
       } else {
-        anyDebugEnabled_ = true;					// change log 11
+        anyDebugEnabled_ = true;  // change log 11
         MessageDrop::instance()->debugEnabled = false;
         // this will be over-ridden when specific modules are entered
       }
-      
+
       // if ( debugModules.empty()) anyDebugEnabled_ = true; // wrong; change log 11
-      for( vString::const_iterator it  = debugModules.begin();
-          it != debugModules.end(); ++it ) {
+      for (vString::const_iterator it = debugModules.begin(); it != debugModules.end(); ++it) {
         if (*it == "*") {
           everyDebugEnabled_ = true;
         } else {
           debugEnabledModules_.insert(*it);
         }
       }
-      
+
       // change log 7
       std::string jm = edm::MessageDrop::jobMode;
-      std::string * jm_p = new std::string(jm);
-      MessageLoggerQ::MLqMOD( jm_p ); 				// change log 9
-      
-      MessageLoggerQ::MLqCFG( new ParameterSet(iPS) );		// change log 9
-      
-      iRegistry.watchPreallocate([this](edm::service::SystemBounds const& iBounds){
+      std::string* jm_p = new std::string(jm);
+      MessageLoggerQ::MLqMOD(jm_p);  // change log 9
+
+      MessageLoggerQ::MLqCFG(new ParameterSet(iPS));  // change log 9
+
+      iRegistry.watchPreallocate([this](edm::service::SystemBounds const& iBounds) {
         //reserve the proper amount of space to record the transition info
-        this->transitionInfoCache_.resize(iBounds.maxNumberOfStreams()
-                                          +iBounds.maxNumberOfConcurrentLuminosityBlocks()
-                                          +iBounds.maxNumberOfConcurrentRuns());
+        this->transitionInfoCache_.resize(iBounds.maxNumberOfStreams() +
+                                          iBounds.maxNumberOfConcurrentLuminosityBlocks() +
+                                          iBounds.maxNumberOfConcurrentRuns());
         lumiInfoBegin_ = iBounds.maxNumberOfStreams();
-        runInfoBegin_= lumiInfoBegin_+iBounds.maxNumberOfConcurrentLuminosityBlocks();
+        runInfoBegin_ = lumiInfoBegin_ + iBounds.maxNumberOfConcurrentLuminosityBlocks();
 
         setMaxLoggedErrorsSummaryIndicies(iBounds.maxNumberOfStreams());
       });
-      
-      iRegistry.watchPostBeginJob(this,&MessageLogger::postBeginJob);
-      iRegistry.watchPostEndJob(this,&MessageLogger::postEndJob);
-      iRegistry.watchJobFailure(this,&MessageLogger::jobFailure);	// change log 14
-      
-      iRegistry.watchPreModuleConstruction(this,&MessageLogger::preModuleConstruction);
-      iRegistry.watchPostModuleConstruction(this,&MessageLogger::postModuleConstruction);
+
+      iRegistry.watchPostBeginJob(this, &MessageLogger::postBeginJob);
+      iRegistry.watchPostEndJob(this, &MessageLogger::postEndJob);
+      iRegistry.watchJobFailure(this, &MessageLogger::jobFailure);  // change log 14
+
+      iRegistry.watchPreModuleConstruction(this, &MessageLogger::preModuleConstruction);
+      iRegistry.watchPostModuleConstruction(this, &MessageLogger::postModuleConstruction);
       // change log 3
-      
-      iRegistry.watchPreSourceConstruction(this,&MessageLogger::preSourceConstruction);
-      iRegistry.watchPostSourceConstruction(this,&MessageLogger::postSourceConstruction);
+
+      iRegistry.watchPreSourceConstruction(this, &MessageLogger::preSourceConstruction);
+      iRegistry.watchPostSourceConstruction(this, &MessageLogger::postSourceConstruction);
       // change log 3
-      
-      iRegistry.watchPreModuleEvent(this,&MessageLogger::preModuleEvent);
-      iRegistry.watchPostModuleEvent(this,&MessageLogger::postModuleEvent);
 
-      iRegistry.watchPreModuleEventAcquire(this,&MessageLogger::preModuleEventAcquire);
-      iRegistry.watchPostModuleEventAcquire(this,&MessageLogger::postModuleEventAcquire);
+      iRegistry.watchPreModuleEvent(this, &MessageLogger::preModuleEvent);
+      iRegistry.watchPostModuleEvent(this, &MessageLogger::postModuleEvent);
+
+      iRegistry.watchPreModuleEventAcquire(this, &MessageLogger::preModuleEventAcquire);
+      iRegistry.watchPostModuleEventAcquire(this, &MessageLogger::postModuleEventAcquire);
 
-      iRegistry.watchPreSourceEvent(this,&MessageLogger::preSourceEvent);
-      iRegistry.watchPostSourceEvent(this,&MessageLogger::postSourceEvent);
+      iRegistry.watchPreSourceEvent(this, &MessageLogger::preSourceEvent);
+      iRegistry.watchPostSourceEvent(this, &MessageLogger::postSourceEvent);
       // change log 14:
       iRegistry.watchPreSourceRun([this](RunIndex) { preSourceRunLumi(); });
       iRegistry.watchPostSourceRun([this](RunIndex) { postSourceRunLumi(); });
       iRegistry.watchPreSourceLumi([this](LuminosityBlockIndex) { preSourceRunLumi(); });
       iRegistry.watchPostSourceLumi([this](LuminosityBlockIndex) { postSourceRunLumi(); });
-      iRegistry.watchPreOpenFile(this,&MessageLogger::preFile);
-      iRegistry.watchPostOpenFile(this,&MessageLogger::postFile);
-      iRegistry.watchPreCloseFile(this,&MessageLogger::preFileClose);
-      iRegistry.watchPostCloseFile(this,&MessageLogger::postFile);
-      
+      iRegistry.watchPreOpenFile(this, &MessageLogger::preFile);
+      iRegistry.watchPostOpenFile(this, &MessageLogger::postFile);
+      iRegistry.watchPreCloseFile(this, &MessageLogger::preFileClose);
+      iRegistry.watchPostCloseFile(this, &MessageLogger::postFile);
+
       // change log 13:
       // change log 15
-      iRegistry.watchPreModuleBeginJob(this,&MessageLogger::preModuleBeginJob);
-      iRegistry.watchPostModuleBeginJob(this,&MessageLogger::postModuleBeginJob);
-      iRegistry.watchPreModuleEndJob(this,&MessageLogger::preModuleEndJob);
-      iRegistry.watchPostModuleEndJob(this,&MessageLogger::postModuleEndJob);
-      
-      iRegistry.watchPreModuleBeginStream(this,&MessageLogger::preModuleBeginStream);
-      iRegistry.watchPostModuleBeginStream(this,&MessageLogger::postModuleBeginStream);
-      iRegistry.watchPreModuleEndStream(this,&MessageLogger::preModuleEndStream);
-      iRegistry.watchPostModuleEndStream(this,&MessageLogger::postModuleEndStream);
-      
-      iRegistry.watchPreModuleStreamBeginRun(this,&MessageLogger::preModuleStreamBeginRun);
-      iRegistry.watchPostModuleStreamBeginRun(this,&MessageLogger::postModuleStreamBeginRun);
-      iRegistry.watchPreModuleStreamEndRun(this,&MessageLogger::preModuleStreamEndRun);
-      iRegistry.watchPostModuleStreamEndRun(this,&MessageLogger::postModuleStreamEndRun);
-      iRegistry.watchPreModuleStreamBeginLumi(this,&MessageLogger::preModuleStreamBeginLumi);
-      iRegistry.watchPostModuleStreamBeginLumi(this,&MessageLogger::postModuleStreamBeginLumi);
-      iRegistry.watchPreModuleStreamEndLumi(this,&MessageLogger::preModuleStreamEndLumi);
-      iRegistry.watchPostModuleStreamEndLumi(this,&MessageLogger::postModuleStreamEndLumi);
-      
-      iRegistry.watchPreModuleGlobalBeginRun(this,&MessageLogger::preModuleGlobalBeginRun);
-      iRegistry.watchPostModuleGlobalBeginRun(this,&MessageLogger::postModuleGlobalBeginRun);
-      iRegistry.watchPreModuleGlobalEndRun(this,&MessageLogger::preModuleGlobalEndRun);
-      iRegistry.watchPostModuleGlobalEndRun(this,&MessageLogger::postModuleGlobalEndRun);
-      iRegistry.watchPreModuleGlobalBeginLumi(this,&MessageLogger::preModuleGlobalBeginLumi);
-      iRegistry.watchPostModuleGlobalBeginLumi(this,&MessageLogger::postModuleGlobalBeginLumi);
-      iRegistry.watchPreModuleGlobalEndLumi(this,&MessageLogger::preModuleGlobalEndLumi);
-      iRegistry.watchPostModuleGlobalEndLumi(this,&MessageLogger::postModuleGlobalEndLumi);
-      
-      iRegistry.watchPreEvent(this,&MessageLogger::preEvent);
-      iRegistry.watchPostEvent(this,&MessageLogger::postEvent);
-      
-      iRegistry.watchPreStreamBeginRun(this,&MessageLogger::preStreamBeginRun);
-      iRegistry.watchPostStreamBeginRun(this,&MessageLogger::postStreamBeginRun);
-      iRegistry.watchPreStreamEndRun(this,&MessageLogger::preStreamEndRun);
-      iRegistry.watchPostStreamEndRun(this,&MessageLogger::postStreamEndRun);
-      iRegistry.watchPreStreamBeginLumi(this,&MessageLogger::preStreamBeginLumi);
-      iRegistry.watchPostStreamBeginLumi(this,&MessageLogger::postStreamBeginLumi);
-      iRegistry.watchPreStreamEndLumi(this,&MessageLogger::preStreamEndLumi);
-      iRegistry.watchPostStreamEndLumi(this,&MessageLogger::postStreamEndLumi);
-      
-      iRegistry.watchPreGlobalBeginRun(this,&MessageLogger::preGlobalBeginRun);
-      iRegistry.watchPostGlobalBeginRun(this,&MessageLogger::postGlobalBeginRun);
-      iRegistry.watchPreGlobalEndRun(this,&MessageLogger::preGlobalEndRun);
-      iRegistry.watchPostGlobalEndRun(this,&MessageLogger::postGlobalEndRun);
-      iRegistry.watchPreGlobalBeginLumi(this,&MessageLogger::preGlobalBeginLumi);
-      iRegistry.watchPostGlobalBeginLumi(this,&MessageLogger::postGlobalBeginLumi);
-      iRegistry.watchPreGlobalEndLumi(this,&MessageLogger::preGlobalEndLumi);
-      iRegistry.watchPostGlobalEndLumi(this,&MessageLogger::postGlobalEndLumi);
-      
-      iRegistry.watchPrePathEvent(this,&MessageLogger::prePathEvent);
-      iRegistry.watchPostPathEvent(this,&MessageLogger::postPathEvent);
-      
-      
+      iRegistry.watchPreModuleBeginJob(this, &MessageLogger::preModuleBeginJob);
+      iRegistry.watchPostModuleBeginJob(this, &MessageLogger::postModuleBeginJob);
+      iRegistry.watchPreModuleEndJob(this, &MessageLogger::preModuleEndJob);
+      iRegistry.watchPostModuleEndJob(this, &MessageLogger::postModuleEndJob);
+
+      iRegistry.watchPreModuleBeginStream(this, &MessageLogger::preModuleBeginStream);
+      iRegistry.watchPostModuleBeginStream(this, &MessageLogger::postModuleBeginStream);
+      iRegistry.watchPreModuleEndStream(this, &MessageLogger::preModuleEndStream);
+      iRegistry.watchPostModuleEndStream(this, &MessageLogger::postModuleEndStream);
+
+      iRegistry.watchPreModuleStreamBeginRun(this, &MessageLogger::preModuleStreamBeginRun);
+      iRegistry.watchPostModuleStreamBeginRun(this, &MessageLogger::postModuleStreamBeginRun);
+      iRegistry.watchPreModuleStreamEndRun(this, &MessageLogger::preModuleStreamEndRun);
+      iRegistry.watchPostModuleStreamEndRun(this, &MessageLogger::postModuleStreamEndRun);
+      iRegistry.watchPreModuleStreamBeginLumi(this, &MessageLogger::preModuleStreamBeginLumi);
+      iRegistry.watchPostModuleStreamBeginLumi(this, &MessageLogger::postModuleStreamBeginLumi);
+      iRegistry.watchPreModuleStreamEndLumi(this, &MessageLogger::preModuleStreamEndLumi);
+      iRegistry.watchPostModuleStreamEndLumi(this, &MessageLogger::postModuleStreamEndLumi);
+
+      iRegistry.watchPreModuleGlobalBeginRun(this, &MessageLogger::preModuleGlobalBeginRun);
+      iRegistry.watchPostModuleGlobalBeginRun(this, &MessageLogger::postModuleGlobalBeginRun);
+      iRegistry.watchPreModuleGlobalEndRun(this, &MessageLogger::preModuleGlobalEndRun);
+      iRegistry.watchPostModuleGlobalEndRun(this, &MessageLogger::postModuleGlobalEndRun);
+      iRegistry.watchPreModuleGlobalBeginLumi(this, &MessageLogger::preModuleGlobalBeginLumi);
+      iRegistry.watchPostModuleGlobalBeginLumi(this, &MessageLogger::postModuleGlobalBeginLumi);
+      iRegistry.watchPreModuleGlobalEndLumi(this, &MessageLogger::preModuleGlobalEndLumi);
+      iRegistry.watchPostModuleGlobalEndLumi(this, &MessageLogger::postModuleGlobalEndLumi);
+
+      iRegistry.watchPreEvent(this, &MessageLogger::preEvent);
+      iRegistry.watchPostEvent(this, &MessageLogger::postEvent);
+
+      iRegistry.watchPreStreamBeginRun(this, &MessageLogger::preStreamBeginRun);
+      iRegistry.watchPostStreamBeginRun(this, &MessageLogger::postStreamBeginRun);
+      iRegistry.watchPreStreamEndRun(this, &MessageLogger::preStreamEndRun);
+      iRegistry.watchPostStreamEndRun(this, &MessageLogger::postStreamEndRun);
+      iRegistry.watchPreStreamBeginLumi(this, &MessageLogger::preStreamBeginLumi);
+      iRegistry.watchPostStreamBeginLumi(this, &MessageLogger::postStreamBeginLumi);
+      iRegistry.watchPreStreamEndLumi(this, &MessageLogger::preStreamEndLumi);
+      iRegistry.watchPostStreamEndLumi(this, &MessageLogger::postStreamEndLumi);
+
+      iRegistry.watchPreGlobalBeginRun(this, &MessageLogger::preGlobalBeginRun);
+      iRegistry.watchPostGlobalBeginRun(this, &MessageLogger::postGlobalBeginRun);
+      iRegistry.watchPreGlobalEndRun(this, &MessageLogger::preGlobalEndRun);
+      iRegistry.watchPostGlobalEndRun(this, &MessageLogger::postGlobalEndRun);
+      iRegistry.watchPreGlobalBeginLumi(this, &MessageLogger::preGlobalBeginLumi);
+      iRegistry.watchPostGlobalBeginLumi(this, &MessageLogger::postGlobalBeginLumi);
+      iRegistry.watchPreGlobalEndLumi(this, &MessageLogger::preGlobalEndLumi);
+      iRegistry.watchPostGlobalEndLumi(this, &MessageLogger::postGlobalEndLumi);
+
+      iRegistry.watchPrePathEvent(this, &MessageLogger::prePathEvent);
+      iRegistry.watchPostPathEvent(this, &MessageLogger::postPathEvent);
+
       MessageDrop* messageDrop = MessageDrop::instance();
-      nonModule_debugEnabled   = messageDrop->debugEnabled;
-      nonModule_infoEnabled    = messageDrop->infoEnabled;
+      nonModule_debugEnabled = messageDrop->debugEnabled;
+      nonModule_infoEnabled = messageDrop->infoEnabled;
       nonModule_warningEnabled = messageDrop->warningEnabled;
-      nonModule_errorEnabled   = messageDrop->errorEnabled;
-    } // ctor
-    
+      nonModule_errorEnabled = messageDrop->errorEnabled;
+    }  // ctor
+
     //
     // Shared helper routines for establishing module name and enabling behavior
     //
-    
-    void
-    MessageLogger::establishModule(ModuleDescription const & desc,
-                                   const char * whichPhase)	// ChangeLog 13, 17
+
+    void MessageLogger::establishModule(ModuleDescription const& desc,
+                                        const char* whichPhase)  // ChangeLog 13, 17
     {
       MessageDrop* messageDrop = MessageDrop::instance();
-      
+
       // std::cerr << "establishModule( " << desc.moduleName() << ")\n";
       // Change Log 17
-      messageDrop->setModuleWithPhase(desc.moduleName(), desc.moduleLabel(),
-                                      desc.id(), whichPhase );
+      messageDrop->setModuleWithPhase(desc.moduleName(), desc.moduleLabel(), desc.id(), whichPhase);
       // Removed caching per change 17 - caching is now done in MessageDrop.cc
       // in theContext() method, and only happens if a message is actually issued.
-      
+
       if (!anyDebugEnabled_) {
         messageDrop->debugEnabled = false;
       } else if (everyDebugEnabled_) {
         messageDrop->debugEnabled = true;
       } else {
-        messageDrop->debugEnabled =
-        debugEnabledModules_.count(desc.moduleLabel());
+        messageDrop->debugEnabled = debugEnabledModules_.count(desc.moduleLabel());
       }
-      
+
       auto it = suppression_levels_.find(desc.moduleLabel());
-      if ( it != suppression_levels_.end() ) {
-        messageDrop->debugEnabled  = messageDrop->debugEnabled
-        && (it->second < ELseverityLevel::ELsev_success );
-        messageDrop->infoEnabled    = (it->second < ELseverityLevel::ELsev_info );
-        messageDrop->warningEnabled = (it->second < ELseverityLevel::ELsev_warning );
-        messageDrop->errorEnabled   = (it->second < ELseverityLevel::ELsev_error );
+      if (it != suppression_levels_.end()) {
+        messageDrop->debugEnabled = messageDrop->debugEnabled && (it->second < ELseverityLevel::ELsev_success);
+        messageDrop->infoEnabled = (it->second < ELseverityLevel::ELsev_info);
+        messageDrop->warningEnabled = (it->second < ELseverityLevel::ELsev_warning);
+        messageDrop->errorEnabled = (it->second < ELseverityLevel::ELsev_error);
       } else {
-        messageDrop->infoEnabled    = true;
+        messageDrop->infoEnabled = true;
         messageDrop->warningEnabled = true;
-        messageDrop->errorEnabled   = true;
+        messageDrop->errorEnabled = true;
       }
-    } // establishModule
-    
-    void
-    MessageLogger::establishModule(unsigned int transitionIndex,
-                                   ModuleCallingContext const & mod,
-                                   const char * whichPhase)	// ChangeLog 13, 17
+    }  // establishModule
+
+    void MessageLogger::establishModule(unsigned int transitionIndex,
+                                        ModuleCallingContext const& mod,
+                                        const char* whichPhase)  // ChangeLog 13, 17
     {
       MessageDrop* messageDrop = MessageDrop::instance();
-      
+
       // std::cerr << "establishModule( " << desc.moduleName() << ")\n";
       // Change Log 17
       auto const desc = mod.moduleDescription();
       messageDrop->runEvent = transitionInfoCache_[transitionIndex];
-      messageDrop->setModuleWithPhase(desc->moduleName(), desc->moduleLabel(),
-                                      desc->id(), whichPhase );
+      messageDrop->setModuleWithPhase(desc->moduleName(), desc->moduleLabel(), desc->id(), whichPhase);
       messageDrop->streamID = transitionIndex;
-      if(transitionIndex>= lumiInfoBegin_) {
+      if (transitionIndex >= lumiInfoBegin_) {
         messageDrop->streamID = std::numeric_limits<unsigned int>::max();
       }
       // Removed caching per change 17 - caching is now done in MessageDrop.cc
       // in theContext() method, and only happens if a message is actually issued.
-      
+
       if (!anyDebugEnabled_) {
         messageDrop->debugEnabled = false;
       } else if (everyDebugEnabled_) {
         messageDrop->debugEnabled = true;
       } else {
-        messageDrop->debugEnabled =
-        debugEnabledModules_.count(desc->moduleLabel());
+        messageDrop->debugEnabled = debugEnabledModules_.count(desc->moduleLabel());
       }
-      
+
       auto it = suppression_levels_.find(desc->moduleLabel());
-      if ( it != suppression_levels_.end() ) {
-        messageDrop->debugEnabled  = messageDrop->debugEnabled
-        && (it->second < ELseverityLevel::ELsev_success );
-        messageDrop->infoEnabled    = (it->second < ELseverityLevel::ELsev_info );
-        messageDrop->warningEnabled = (it->second < ELseverityLevel::ELsev_warning );
-        messageDrop->errorEnabled   = (it->second < ELseverityLevel::ELsev_error );
+      if (it != suppression_levels_.end()) {
+        messageDrop->debugEnabled = messageDrop->debugEnabled && (it->second < ELseverityLevel::ELsev_success);
+        messageDrop->infoEnabled = (it->second < ELseverityLevel::ELsev_info);
+        messageDrop->warningEnabled = (it->second < ELseverityLevel::ELsev_warning);
+        messageDrop->errorEnabled = (it->second < ELseverityLevel::ELsev_error);
       } else {
-        messageDrop->infoEnabled    = true;
+        messageDrop->infoEnabled = true;
         messageDrop->warningEnabled = true;
-        messageDrop->errorEnabled   = true;
+        messageDrop->errorEnabled = true;
       }
-    } // establishModule
-    
-    
-    void
-    MessageLogger::unEstablishModule(ModuleDescription const & /*unused*/,
-                                     const char*  state)
-    {
+    }  // establishModule
+
+    void MessageLogger::unEstablishModule(ModuleDescription const& /*unused*/, const char* state) {
       // std::cerr << "unestablishModule( " << desc.moduleName() << ") "
       //           << "state = " << *state << "\n";
-      
+
       MessageDrop* messageDrop = MessageDrop::instance();
-      messageDrop->setSinglet( state ); 			// Change Log 17
-      messageDrop->debugEnabled   = nonModule_debugEnabled;
-      messageDrop->infoEnabled    = nonModule_infoEnabled;
+      messageDrop->setSinglet(state);  // Change Log 17
+      messageDrop->debugEnabled = nonModule_debugEnabled;
+      messageDrop->infoEnabled = nonModule_infoEnabled;
       messageDrop->warningEnabled = nonModule_warningEnabled;
-      messageDrop->errorEnabled   = nonModule_errorEnabled; // change log 20
+      messageDrop->errorEnabled = nonModule_errorEnabled;  // change log 20
     }
-    
-    void
-    MessageLogger::unEstablishModule(ModuleCallingContext const & mod,
-                                     const char*  state)
-    {
+
+    void MessageLogger::unEstablishModule(ModuleCallingContext const& mod, const char* state) {
       //Need to reset to what was previously being used on this thread
       auto previous = mod.previousModuleOnThread();
-      if(previous) {
+      if (previous) {
         //need to know if we are in a global or stream context
         auto top = previous->getTopModuleCallingContext();
         assert(nullptr != top);
@@ -457,473 +421,404 @@ namespace edm {
           auto globalContext = top->globalContext();
           assert(nullptr != globalContext);
           auto tran = globalContext->transition();
-          if(tran == GlobalContext::Transition::kBeginLuminosityBlock or
-             tran == GlobalContext::Transition::kEndLuminosityBlock) {
-            establishModule(lumiInfoBegin_+globalContext->luminosityBlockIndex(),
-                            *previous,s_globalTransitionNames[static_cast<int>(tran)]);
+          if (tran == GlobalContext::Transition::kBeginLuminosityBlock or
+              tran == GlobalContext::Transition::kEndLuminosityBlock) {
+            establishModule(lumiInfoBegin_ + globalContext->luminosityBlockIndex(),
+                            *previous,
+                            s_globalTransitionNames[static_cast<int>(tran)]);
           } else {
-            establishModule(runInfoBegin_+globalContext->runIndex(),
-                            *previous,s_globalTransitionNames[static_cast<int>(tran)]);
+            establishModule(
+                runInfoBegin_ + globalContext->runIndex(), *previous, s_globalTransitionNames[static_cast<int>(tran)]);
           }
         } else {
           auto stream = previous->getStreamContext();
-          establishModule(stream->streamID().value(),*previous,s_streamTransitionNames[static_cast<int>(stream->transition())]);
+          establishModule(
+              stream->streamID().value(), *previous, s_streamTransitionNames[static_cast<int>(stream->transition())]);
         }
       } else {
-
         MessageDrop* messageDrop = MessageDrop::instance();
         messageDrop->streamID = std::numeric_limits<unsigned int>::max();
-        messageDrop->setSinglet( state ); 			// Change Log 17
-        messageDrop->debugEnabled   = nonModule_debugEnabled;
-        messageDrop->infoEnabled    = nonModule_infoEnabled;
+        messageDrop->setSinglet(state);  // Change Log 17
+        messageDrop->debugEnabled = nonModule_debugEnabled;
+        messageDrop->infoEnabled = nonModule_infoEnabled;
         messageDrop->warningEnabled = nonModule_warningEnabled;
-        messageDrop->errorEnabled   = nonModule_errorEnabled; // change log 20
+        messageDrop->errorEnabled = nonModule_errorEnabled;  // change log 20
       }
-      
+
       // std::cerr << "unestablishModule( " << desc.moduleName() << ") "
       //           << "state = " << *state << "\n";
-      
     }
-    
-    void
-    MessageLogger::establish(const char* state)
-    {
+
+    void MessageLogger::establish(const char* state) {
       MessageDrop* messageDrop = MessageDrop::instance();
-      messageDrop->setSinglet( state ); 			// Change Log 17
+      messageDrop->setSinglet(state);  // Change Log 17
       if (!anyDebugEnabled_) {
         messageDrop->debugEnabled = false;
       } else if (everyDebugEnabled_) {
         messageDrop->debugEnabled = true;
       } else {
-        messageDrop->debugEnabled =
-    		debugEnabledModules_.count(state);	// change log 8
+        messageDrop->debugEnabled = debugEnabledModules_.count(state);  // change log 8
       }
-      std::map<const std::string,ELseverityLevel>::const_iterator it =
-      suppression_levels_.find(state);		// change log 8
-      if ( it != suppression_levels_.end() ) {
-        messageDrop->debugEnabled  = messageDrop->debugEnabled
-        && (it->second < ELseverityLevel::ELsev_success );
-        messageDrop->infoEnabled    = (it->second < ELseverityLevel::ELsev_info );
-        messageDrop->warningEnabled = (it->second < ELseverityLevel::ELsev_warning );
-        messageDrop->errorEnabled   = (it->second < ELseverityLevel::ELsev_error );
+      std::map<const std::string, ELseverityLevel>::const_iterator it =
+          suppression_levels_.find(state);  // change log 8
+      if (it != suppression_levels_.end()) {
+        messageDrop->debugEnabled = messageDrop->debugEnabled && (it->second < ELseverityLevel::ELsev_success);
+        messageDrop->infoEnabled = (it->second < ELseverityLevel::ELsev_info);
+        messageDrop->warningEnabled = (it->second < ELseverityLevel::ELsev_warning);
+        messageDrop->errorEnabled = (it->second < ELseverityLevel::ELsev_error);
       } else {
-        messageDrop->infoEnabled    = true;
+        messageDrop->infoEnabled = true;
         messageDrop->warningEnabled = true;
-        messageDrop->errorEnabled   = true;
+        messageDrop->errorEnabled = true;
       }
     }
-    
-    void
-    MessageLogger::unEstablish(const char* state)
-    {
-      MessageDrop::instance()->setSinglet( state ); 	// Change Log 17
+
+    void MessageLogger::unEstablish(const char* state) {
+      MessageDrop::instance()->setSinglet(state);  // Change Log 17
     }
-    
+
     //
     // callbacks that need to establish the module, and their counterparts
     //
-    
-    void
-    MessageLogger::preModuleConstruction(const ModuleDescription& desc)
-    {
-      if (!messageServicePSetHasBeenValidated_) {			// change log 12
-        if (!messageServicePSetValidatationResults_.empty() ) {
-          throw ( edm::Exception
-                 ( edm::errors::Configuration
-                  , messageServicePSetValidatationResults_
-                  )                                         );
+
+    void MessageLogger::preModuleConstruction(const ModuleDescription& desc) {
+      if (!messageServicePSetHasBeenValidated_) {  // change log 12
+        if (!messageServicePSetValidatationResults_.empty()) {
+          throw(edm::Exception(edm::errors::Configuration, messageServicePSetValidatationResults_));
         }
         messageServicePSetHasBeenValidated_ = true;
       }
-      establishModule (desc,"@ctor");				// ChangeLog 16
-    }
-    void MessageLogger::postModuleConstruction(const ModuleDescription& iDescription)
-    { //it is now guaranteed that this will be called even if the module throws
-      unEstablishModule (iDescription, "AfterModConstruction"); }
-    
-    void
-    MessageLogger::preModuleBeginJob(const ModuleDescription& desc)
-    {
-      establishModule (desc,"@beginJob");				// ChangeLog 13
+      establishModule(desc, "@ctor");  // ChangeLog 16
     }
-    void MessageLogger::postModuleBeginJob(const ModuleDescription& iDescription)
-    { unEstablishModule (iDescription, "AfterModBeginJob"); }
-    
-    void
-    MessageLogger::preSourceConstruction(const ModuleDescription& desc)
-    {
-      if (!messageServicePSetHasBeenValidated_) {			// change log 12
-        if (!messageServicePSetValidatationResults_.empty() ) {
-          throw ( edm::Exception
-                 ( edm::errors::Configuration
-                  , messageServicePSetValidatationResults_
-                  )                                         );
+    void MessageLogger::postModuleConstruction(
+        const ModuleDescription&
+            iDescription) {  //it is now guaranteed that this will be called even if the module throws
+      unEstablishModule(iDescription, "AfterModConstruction");
+    }
+
+    void MessageLogger::preModuleBeginJob(const ModuleDescription& desc) {
+      establishModule(desc, "@beginJob");  // ChangeLog 13
+    }
+    void MessageLogger::postModuleBeginJob(const ModuleDescription& iDescription) {
+      unEstablishModule(iDescription, "AfterModBeginJob");
+    }
+
+    void MessageLogger::preSourceConstruction(const ModuleDescription& desc) {
+      if (!messageServicePSetHasBeenValidated_) {  // change log 12
+        if (!messageServicePSetValidatationResults_.empty()) {
+          throw(edm::Exception(edm::errors::Configuration, messageServicePSetValidatationResults_));
         }
         messageServicePSetHasBeenValidated_ = true;
       }
-      establishModule(desc,"@sourceConstruction");		// ChangeLog 16
+      establishModule(desc, "@sourceConstruction");  // ChangeLog 16
     }
-    void MessageLogger::postSourceConstruction(const ModuleDescription& iDescription)
-    { unEstablishModule (iDescription, "AfterSourceConstruction"); }
-    
-    void
-    MessageLogger::preModuleBeginStream(StreamContext const& stream, ModuleCallingContext const& mcc)
-    {
+    void MessageLogger::postSourceConstruction(const ModuleDescription& iDescription) {
+      unEstablishModule(iDescription, "AfterSourceConstruction");
+    }
+
+    void MessageLogger::preModuleBeginStream(StreamContext const& stream, ModuleCallingContext const& mcc) {
       ModuleDescription const& desc = *mcc.moduleDescription();
-      establishModule (desc,"@beginStream");				// ChangeLog 13
+      establishModule(desc, "@beginStream");  // ChangeLog 13
     }
-    void MessageLogger::postModuleBeginStream(StreamContext const& stream, ModuleCallingContext const& mcc)
-    {
+    void MessageLogger::postModuleBeginStream(StreamContext const& stream, ModuleCallingContext const& mcc) {
       ModuleDescription const& desc = *mcc.moduleDescription();
-      unEstablishModule (desc, "AfterModBeginStream");
+      unEstablishModule(desc, "AfterModBeginStream");
     }
 
-    void
-    MessageLogger::preModuleStreamBeginRun(StreamContext const& stream, ModuleCallingContext const& mod)
-    {
-      establishModule (stream.streamID().value(),mod,
-                       s_streamTransitionNames[static_cast<int>(StreamContext::Transition::kBeginRun)]);
-    }
-    void MessageLogger::postModuleStreamBeginRun(StreamContext const& stream, ModuleCallingContext const& mod)
-    { unEstablishModule (mod, "AfterModStreamBeginRun"); }
-    
-    void
-    MessageLogger::preModuleStreamBeginLumi(StreamContext const& stream, ModuleCallingContext const& mod)
-    {
-      establishModule (stream.streamID().value(),mod,
-                       s_streamTransitionNames[static_cast<int>(StreamContext::Transition::kBeginLuminosityBlock)]);
-    }
-    void MessageLogger::postModuleStreamBeginLumi(StreamContext const& stream, ModuleCallingContext const& mod)
-    { unEstablishModule (mod, "AfterModStreamBeginLumi"); }
-    
-    void
-    MessageLogger::preModuleEvent(StreamContext const& stream, ModuleCallingContext const& mod)
-    {
-      establishModule (stream.streamID().value(),mod,
-                       s_streamTransitionNames[static_cast<int>(StreamContext::Transition::kEvent)]);
+    void MessageLogger::preModuleStreamBeginRun(StreamContext const& stream, ModuleCallingContext const& mod) {
+      establishModule(stream.streamID().value(),
+                      mod,
+                      s_streamTransitionNames[static_cast<int>(StreamContext::Transition::kBeginRun)]);
     }
-    
-    void MessageLogger::postModuleEvent(StreamContext const& stream, ModuleCallingContext const& mod)
-    {
-      unEstablishModule(mod,"PostModuleEvent");
+    void MessageLogger::postModuleStreamBeginRun(StreamContext const& stream, ModuleCallingContext const& mod) {
+      unEstablishModule(mod, "AfterModStreamBeginRun");
     }
 
-    void
-    MessageLogger::preModuleEventAcquire(StreamContext const& stream, ModuleCallingContext const& mod)
-    {
-      establishModule (stream.streamID().value(),mod,
-                       s_streamTransitionNames[static_cast<int>(StreamContext::Transition::kEvent)]);
+    void MessageLogger::preModuleStreamBeginLumi(StreamContext const& stream, ModuleCallingContext const& mod) {
+      establishModule(stream.streamID().value(),
+                      mod,
+                      s_streamTransitionNames[static_cast<int>(StreamContext::Transition::kBeginLuminosityBlock)]);
+    }
+    void MessageLogger::postModuleStreamBeginLumi(StreamContext const& stream, ModuleCallingContext const& mod) {
+      unEstablishModule(mod, "AfterModStreamBeginLumi");
     }
 
-    void MessageLogger::postModuleEventAcquire(StreamContext const& stream, ModuleCallingContext const& mod)
-    {
-      unEstablishModule(mod,"PostModuleEventAcquire");
+    void MessageLogger::preModuleEvent(StreamContext const& stream, ModuleCallingContext const& mod) {
+      establishModule(
+          stream.streamID().value(), mod, s_streamTransitionNames[static_cast<int>(StreamContext::Transition::kEvent)]);
     }
 
-    void
-    MessageLogger::preModuleStreamEndLumi(StreamContext const& stream, ModuleCallingContext const& mod)
-    {
-      establishModule (stream.streamID().value(),mod,
-                       s_streamTransitionNames[static_cast<int>(StreamContext::Transition::kEndLuminosityBlock)]);
-    }
-    void MessageLogger::postModuleStreamEndLumi(StreamContext const& stream, ModuleCallingContext const& mod)
-    { unEstablishModule (mod, "AfterModStreamEndLumi"); }
-    
-    void
-    MessageLogger::preModuleStreamEndRun(StreamContext const& stream, ModuleCallingContext const& mod)
-    {
-      establishModule (stream.streamID().value(),mod,
-                       s_streamTransitionNames[static_cast<int>(StreamContext::Transition::kEndRun)]);				// ChangeLog 13
+    void MessageLogger::postModuleEvent(StreamContext const& stream, ModuleCallingContext const& mod) {
+      unEstablishModule(mod, "PostModuleEvent");
+    }
+
+    void MessageLogger::preModuleEventAcquire(StreamContext const& stream, ModuleCallingContext const& mod) {
+      establishModule(
+          stream.streamID().value(), mod, s_streamTransitionNames[static_cast<int>(StreamContext::Transition::kEvent)]);
+    }
+
+    void MessageLogger::postModuleEventAcquire(StreamContext const& stream, ModuleCallingContext const& mod) {
+      unEstablishModule(mod, "PostModuleEventAcquire");
+    }
+
+    void MessageLogger::preModuleStreamEndLumi(StreamContext const& stream, ModuleCallingContext const& mod) {
+      establishModule(stream.streamID().value(),
+                      mod,
+                      s_streamTransitionNames[static_cast<int>(StreamContext::Transition::kEndLuminosityBlock)]);
+    }
+    void MessageLogger::postModuleStreamEndLumi(StreamContext const& stream, ModuleCallingContext const& mod) {
+      unEstablishModule(mod, "AfterModStreamEndLumi");
     }
-    void MessageLogger::postModuleStreamEndRun(StreamContext const& stream, ModuleCallingContext const& mod)
-    { unEstablishModule (mod, "AfterModStreamEndRun"); }
-    
+
+    void MessageLogger::preModuleStreamEndRun(StreamContext const& stream, ModuleCallingContext const& mod) {
+      establishModule(stream.streamID().value(),
+                      mod,
+                      s_streamTransitionNames[static_cast<int>(StreamContext::Transition::kEndRun)]);  // ChangeLog 13
+    }
+    void MessageLogger::postModuleStreamEndRun(StreamContext const& stream, ModuleCallingContext const& mod) {
+      unEstablishModule(mod, "AfterModStreamEndRun");
+    }
+
     //Global
-    void
-    MessageLogger::preModuleGlobalBeginRun(GlobalContext const& context, ModuleCallingContext const& mod)
-    {
-      establishModule (runInfoBegin_+ context.runIndex().value(),mod,
-                       s_globalTransitionNames[static_cast<int>(GlobalContext::Transition::kBeginRun)]);
-    }
-    void MessageLogger::postModuleGlobalBeginRun(GlobalContext const& context, ModuleCallingContext const& mod)
-    { unEstablishModule (mod, "AfterModGlobalBeginRun"); }
-    
-    void
-    MessageLogger::preModuleGlobalBeginLumi(GlobalContext const& context, ModuleCallingContext const& mod)
-    {
-      establishModule (lumiInfoBegin_+ context.luminosityBlockIndex().value(),mod,
-                       s_globalTransitionNames[static_cast<int>(GlobalContext::Transition::kBeginLuminosityBlock)]);
-    }
-    void MessageLogger::postModuleGlobalBeginLumi(GlobalContext const& stream, ModuleCallingContext const& mod)
-    { unEstablishModule (mod, "AfterModGlobalBeginLumi"); }
-    
-    void
-    MessageLogger::preModuleGlobalEndLumi(GlobalContext const& context, ModuleCallingContext const& mod)
-    {
-      establishModule (lumiInfoBegin_+ context.luminosityBlockIndex().value(),mod,
-                       s_globalTransitionNames[static_cast<int>(GlobalContext::Transition::kEndLuminosityBlock)]);
-    }
-    void MessageLogger::postModuleGlobalEndLumi(GlobalContext const& stream, ModuleCallingContext const& mod)
-    { unEstablishModule (mod, "AfterModGlobalEndLumi"); }
-    
-    void
-    MessageLogger::preModuleGlobalEndRun(GlobalContext const& context, ModuleCallingContext const& mod)
-    {
-      establishModule (runInfoBegin_+ context.runIndex().value(), mod,
-                       s_globalTransitionNames[static_cast<int>(GlobalContext::Transition::kEndRun)]);				// ChangeLog 13
+    void MessageLogger::preModuleGlobalBeginRun(GlobalContext const& context, ModuleCallingContext const& mod) {
+      establishModule(runInfoBegin_ + context.runIndex().value(),
+                      mod,
+                      s_globalTransitionNames[static_cast<int>(GlobalContext::Transition::kBeginRun)]);
+    }
+    void MessageLogger::postModuleGlobalBeginRun(GlobalContext const& context, ModuleCallingContext const& mod) {
+      unEstablishModule(mod, "AfterModGlobalBeginRun");
     }
-    void MessageLogger::postModuleGlobalEndRun(GlobalContext const& stream, ModuleCallingContext const& mod)
-    { unEstablishModule (mod, "AfterModGlobalEndRun"); }
 
-    void
-    MessageLogger::preModuleEndStream(StreamContext const&, ModuleCallingContext const& mcc)
-    {
+    void MessageLogger::preModuleGlobalBeginLumi(GlobalContext const& context, ModuleCallingContext const& mod) {
+      establishModule(lumiInfoBegin_ + context.luminosityBlockIndex().value(),
+                      mod,
+                      s_globalTransitionNames[static_cast<int>(GlobalContext::Transition::kBeginLuminosityBlock)]);
+    }
+    void MessageLogger::postModuleGlobalBeginLumi(GlobalContext const& stream, ModuleCallingContext const& mod) {
+      unEstablishModule(mod, "AfterModGlobalBeginLumi");
+    }
+
+    void MessageLogger::preModuleGlobalEndLumi(GlobalContext const& context, ModuleCallingContext const& mod) {
+      establishModule(lumiInfoBegin_ + context.luminosityBlockIndex().value(),
+                      mod,
+                      s_globalTransitionNames[static_cast<int>(GlobalContext::Transition::kEndLuminosityBlock)]);
+    }
+    void MessageLogger::postModuleGlobalEndLumi(GlobalContext const& stream, ModuleCallingContext const& mod) {
+      unEstablishModule(mod, "AfterModGlobalEndLumi");
+    }
+
+    void MessageLogger::preModuleGlobalEndRun(GlobalContext const& context, ModuleCallingContext const& mod) {
+      establishModule(runInfoBegin_ + context.runIndex().value(),
+                      mod,
+                      s_globalTransitionNames[static_cast<int>(GlobalContext::Transition::kEndRun)]);  // ChangeLog 13
+    }
+    void MessageLogger::postModuleGlobalEndRun(GlobalContext const& stream, ModuleCallingContext const& mod) {
+      unEstablishModule(mod, "AfterModGlobalEndRun");
+    }
+
+    void MessageLogger::preModuleEndStream(StreamContext const&, ModuleCallingContext const& mcc) {
       ModuleDescription const& desc = *mcc.moduleDescription();
-      establishModule (desc,"@endStream");				// ChangeLog 13
+      establishModule(desc, "@endStream");  // ChangeLog 13
     }
 
-    void MessageLogger::postModuleEndStream(StreamContext const&, ModuleCallingContext const& mcc)
-    {
+    void MessageLogger::postModuleEndStream(StreamContext const&, ModuleCallingContext const& mcc) {
       ModuleDescription const& desc = *mcc.moduleDescription();
-      unEstablishModule (desc, "AfterModEndStream");
+      unEstablishModule(desc, "AfterModEndStream");
     }
 
-    void
-    MessageLogger::preModuleEndJob(const ModuleDescription& desc)
-    {
-      establishModule (desc,"@endJob");				// ChangeLog 13
+    void MessageLogger::preModuleEndJob(const ModuleDescription& desc) {
+      establishModule(desc, "@endJob");  // ChangeLog 13
+    }
+    void MessageLogger::postModuleEndJob(const ModuleDescription& iDescription) {
+      unEstablishModule(iDescription, "AfterModEndJob");
     }
-    void MessageLogger::postModuleEndJob(const ModuleDescription& iDescription)
-    { unEstablishModule (iDescription, "AfterModEndJob"); }
-    
+
     //
     // callbacks that don't know about the module
     //
-    
-    void
-    MessageLogger::postBeginJob()
-    {
+
+    void MessageLogger::postBeginJob() {
       MessageDrop::instance()->runEvent = "BeforeEvents";
-      MessageDrop::instance()->setSinglet("AfterBeginJob");     // Change Log 17
+      MessageDrop::instance()->setSinglet("AfterBeginJob");  // Change Log 17
     }
-    
-    void MessageLogger::preSourceEvent(StreamID)
-    { establish("source"); }
-    void MessageLogger::postSourceEvent(StreamID)
-    { unEstablish("AfterSource");
+
+    void MessageLogger::preSourceEvent(StreamID) { establish("source"); }
+    void MessageLogger::postSourceEvent(StreamID) {
+      unEstablish("AfterSource");
       MessageDrop::instance()->runEvent = "AfterSource";
     }
-    void MessageLogger::preSourceRunLumi()
-    { establish("source"); }
-    void MessageLogger::postSourceRunLumi()
-    { unEstablish("AfterSource"); }
-    
-    void MessageLogger::preFile( std::string const &, bool )
-    {  establish("file_open"); }
-    void MessageLogger::preFileClose( std::string const &, bool )
-    {  establish("file_close"); }
-    void MessageLogger::postFile( std::string const &, bool )
-    { unEstablish("AfterFile"); }
-    
-    
-    void
-    MessageLogger::preEvent( StreamContext const& iContext)
-    {
+    void MessageLogger::preSourceRunLumi() { establish("source"); }
+    void MessageLogger::postSourceRunLumi() { unEstablish("AfterSource"); }
+
+    void MessageLogger::preFile(std::string const&, bool) { establish("file_open"); }
+    void MessageLogger::preFileClose(std::string const&, bool) { establish("file_close"); }
+    void MessageLogger::postFile(std::string const&, bool) { unEstablish("AfterFile"); }
+
+    void MessageLogger::preEvent(StreamContext const& iContext) {
       std::ostringstream ost;
       auto const& id = iContext.eventID();
-      ost << "Run: " << id.run()
-      << " Event: " << id.event();    			// change log 2
-      assert(iContext.streamID().value()<transitionInfoCache_.size());
-      transitionInfoCache_[iContext.streamID().value()]=ost.str();
+      ost << "Run: " << id.run() << " Event: " << id.event();  // change log 2
+      assert(iContext.streamID().value() < transitionInfoCache_.size());
+      transitionInfoCache_[iContext.streamID().value()] = ost.str();
       edm::MessageDrop::instance()->runEvent = ost.str();
-      edm::MessageDrop::instance()->setSinglet("PreEventProcessing");// changelog 17
-                                                                     // Note - module name had not been set here  Similarly in other places where
-                                                                     // RunEvent carries the new information; we add setSinglet for module name.
+      edm::MessageDrop::instance()->setSinglet("PreEventProcessing");  // changelog 17
+          // Note - module name had not been set here  Similarly in other places where
+          // RunEvent carries the new information; we add setSinglet for module name.
     }
-    
-    void
-    MessageLogger::postEvent(StreamContext const& iContext)
-    {
+
+    void MessageLogger::postEvent(StreamContext const& iContext) {
       edm::MessageDrop::instance()->runEvent = "PostProcessEvent";
       edm::clearLoggedErrorsSummary(iContext.streamID().value());
     }
-    
-    void
-    MessageLogger::preStreamBeginRun( StreamContext const& iContext)	// change log 14
+
+    void MessageLogger::preStreamBeginRun(StreamContext const& iContext)  // change log 14
     {
       std::ostringstream ost;
-      ost << "Run: " << iContext.eventID().run()<<" Stream: "<<iContext.streamID().value();;
-      transitionInfoCache_[iContext.streamID().value()]=ost.str();
+      ost << "Run: " << iContext.eventID().run() << " Stream: " << iContext.streamID().value();
+      ;
+      transitionInfoCache_[iContext.streamID().value()] = ost.str();
       edm::MessageDrop::instance()->runEvent = ost.str();
-      edm::MessageDrop::instance()->setSinglet("PreStreamBeginRun");	// changelog 17
+      edm::MessageDrop::instance()->setSinglet("PreStreamBeginRun");  // changelog 17
     }
-    void MessageLogger::postStreamBeginRun(StreamContext const&)
-    {
+    void MessageLogger::postStreamBeginRun(StreamContext const&) {
       edm::MessageDrop::instance()->runEvent = "PostStreamBeginRun";
-      edm::MessageDrop::instance()->setSinglet("PostStreamBeginRun");	// changelog 17
-                                                                // Note - module name had not been set here
+      edm::MessageDrop::instance()->setSinglet("PostStreamBeginRun");  // changelog 17
+                                                                       // Note - module name had not been set here
     }
-    
-    void
-    MessageLogger::preStreamEndRun( StreamContext const& iContext)
-    {
+
+    void MessageLogger::preStreamEndRun(StreamContext const& iContext) {
       std::ostringstream ost;
-      ost << "End Run: " << iContext.eventID().run()<<" Stream: "<<iContext.streamID().value();;
-      transitionInfoCache_[iContext.streamID().value()]=ost.str();
+      ost << "End Run: " << iContext.eventID().run() << " Stream: " << iContext.streamID().value();
+      ;
+      transitionInfoCache_[iContext.streamID().value()] = ost.str();
       edm::MessageDrop::instance()->runEvent = ost.str();
-      edm::MessageDrop::instance()->setSinglet("PreStreamEndRun");	// changelog 17
+      edm::MessageDrop::instance()->setSinglet("PreStreamEndRun");  // changelog 17
     }
-    
-    void MessageLogger::postStreamEndRun(StreamContext const&)
-    {
+
+    void MessageLogger::postStreamEndRun(StreamContext const&) {
       edm::MessageDrop::instance()->runEvent = "PostStreamEndRun";
-      edm::MessageDrop::instance()->setSinglet("PostStreaEndRun");	// changelog 17
+      edm::MessageDrop::instance()->setSinglet("PostStreaEndRun");  // changelog 17
     }
-    
-    void
-    MessageLogger::preStreamBeginLumi( StreamContext const& iContext)
-    {
+
+    void MessageLogger::preStreamBeginLumi(StreamContext const& iContext) {
       std::ostringstream ost;
       auto const& id = iContext.eventID();
-      ost << "Run: " << id.run() << " Lumi: " << id.luminosityBlock()<<" Stream: "<<iContext.streamID().value();
-      transitionInfoCache_[iContext.streamID().value()]=ost.str();
+      ost << "Run: " << id.run() << " Lumi: " << id.luminosityBlock() << " Stream: " << iContext.streamID().value();
+      transitionInfoCache_[iContext.streamID().value()] = ost.str();
       edm::MessageDrop::instance()->runEvent = ost.str();
-      edm::MessageDrop::instance()->setSinglet("PreStreamBeginLumi");	// changelog 17
+      edm::MessageDrop::instance()->setSinglet("PreStreamBeginLumi");  // changelog 17
     }
-    
-    void MessageLogger::postStreamBeginLumi(StreamContext const&)
-    {
+
+    void MessageLogger::postStreamBeginLumi(StreamContext const&) {
       edm::MessageDrop::instance()->runEvent = "PostStreamBeginLumi";
-      edm::MessageDrop::instance()->setSinglet("PostStreamBeginLumi");	// changelog 17
+      edm::MessageDrop::instance()->setSinglet("PostStreamBeginLumi");  // changelog 17
     }
-    
-    void
-    MessageLogger::preStreamEndLumi( StreamContext const& iContext)
-    {
+
+    void MessageLogger::preStreamEndLumi(StreamContext const& iContext) {
       std::ostringstream ost;
       auto const& id = iContext.eventID();
-      ost << "Run: " << id.run() << " Lumi: " << id.luminosityBlock()<<" Stream: "<<iContext.streamID().value();;
-      transitionInfoCache_[iContext.streamID().value()]=ost.str();
+      ost << "Run: " << id.run() << " Lumi: " << id.luminosityBlock() << " Stream: " << iContext.streamID().value();
+      ;
+      transitionInfoCache_[iContext.streamID().value()] = ost.str();
       edm::MessageDrop::instance()->runEvent = ost.str();
-      edm::MessageDrop::instance()->setSinglet("PreStreamEndLumi");	// changelog 17
+      edm::MessageDrop::instance()->setSinglet("PreStreamEndLumi");  // changelog 17
     }
-    void MessageLogger::postStreamEndLumi(StreamContext const&)
-    {
+    void MessageLogger::postStreamEndLumi(StreamContext const&) {
       edm::MessageDrop::instance()->runEvent = "PostStreamEndLumi";
-      edm::MessageDrop::instance()->setSinglet("PostStreamEndLumi");	// changelog 17
+      edm::MessageDrop::instance()->setSinglet("PostStreamEndLumi");  // changelog 17
     }
-    
-    
-    void
-    MessageLogger::preGlobalBeginRun( GlobalContext const& iContext)	// change log 14
+
+    void MessageLogger::preGlobalBeginRun(GlobalContext const& iContext)  // change log 14
     {
       std::ostringstream ost;
       ost << "Run: " << iContext.luminosityBlockID().run();
-      transitionInfoCache_[runInfoBegin_+iContext.runIndex()]=ost.str();
+      transitionInfoCache_[runInfoBegin_ + iContext.runIndex()] = ost.str();
       edm::MessageDrop::instance()->runEvent = ost.str();
-      edm::MessageDrop::instance()->setSinglet("PreGlobalBeginRun");	// changelog 17
+      edm::MessageDrop::instance()->setSinglet("PreGlobalBeginRun");  // changelog 17
     }
-    void MessageLogger::postGlobalBeginRun(GlobalContext const&)
-    {
+    void MessageLogger::postGlobalBeginRun(GlobalContext const&) {
       edm::MessageDrop::instance()->runEvent = "PostGlobalBeginRun";
-      edm::MessageDrop::instance()->setSinglet("PostGlobalBeginRun");	// changelog 17
-                                                                // Note - module name had not been set here
+      edm::MessageDrop::instance()->setSinglet("PostGlobalBeginRun");  // changelog 17
+                                                                       // Note - module name had not been set here
     }
-    
-    void
-    MessageLogger::prePathEvent( StreamContext const& stream, PathContext const& iPath)	// change log 14
+
+    void MessageLogger::prePathEvent(StreamContext const& stream, PathContext const& iPath)  // change log 14
     {
       auto messageDrop = edm::MessageDrop::instance();
       messageDrop->runEvent = transitionInfoCache_[stream.streamID().value()];
-      messageDrop->setPath( "PreProcPath ", iPath.pathName());
+      messageDrop->setPath("PreProcPath ", iPath.pathName());
       // change log 17
     }
-    
-    void MessageLogger::postPathEvent(StreamContext const&, PathContext const&, HLTPathStatus const&)
-    {
-      edm::MessageDrop::instance()->setSinglet("PostProcessPath");	// changelog 17
+
+    void MessageLogger::postPathEvent(StreamContext const&, PathContext const&, HLTPathStatus const&) {
+      edm::MessageDrop::instance()->setSinglet("PostProcessPath");  // changelog 17
     }
-    
-    void
-    MessageLogger::preGlobalEndRun( GlobalContext const& iContext)
-    {
+
+    void MessageLogger::preGlobalEndRun(GlobalContext const& iContext) {
       std::ostringstream ost;
       ost << "End Run: " << iContext.luminosityBlockID().run();
-      transitionInfoCache_[runInfoBegin_+iContext.runIndex()]=ost.str();
+      transitionInfoCache_[runInfoBegin_ + iContext.runIndex()] = ost.str();
       edm::MessageDrop::instance()->runEvent = ost.str();
-      edm::MessageDrop::instance()->setSinglet("PreGlobalEndRun");	// changelog 17
+      edm::MessageDrop::instance()->setSinglet("PreGlobalEndRun");  // changelog 17
     }
-    
-    void MessageLogger::postGlobalEndRun(GlobalContext const&)
-    { 
+
+    void MessageLogger::postGlobalEndRun(GlobalContext const&) {
       edm::MessageDrop::instance()->runEvent = "PostGlobalEndRun";
-      edm::MessageDrop::instance()->setSinglet("PostGlobalEndRun");	// changelog 17
+      edm::MessageDrop::instance()->setSinglet("PostGlobalEndRun");  // changelog 17
     }
-    
-    void
-    MessageLogger::preGlobalBeginLumi( GlobalContext const& iContext)
-    {
+
+    void MessageLogger::preGlobalBeginLumi(GlobalContext const& iContext) {
       std::ostringstream ost;
       auto const& id = iContext.luminosityBlockID();
       ost << "Run: " << id.run() << " Lumi: " << id.luminosityBlock();
-      transitionInfoCache_[lumiInfoBegin_+iContext.luminosityBlockIndex()]=ost.str();
+      transitionInfoCache_[lumiInfoBegin_ + iContext.luminosityBlockIndex()] = ost.str();
       edm::MessageDrop::instance()->runEvent = ost.str();
-      edm::MessageDrop::instance()->setSinglet("PreGlobalBeginLumi");	// changelog 17
+      edm::MessageDrop::instance()->setSinglet("PreGlobalBeginLumi");  // changelog 17
     }
-    
-    void MessageLogger::postGlobalBeginLumi(GlobalContext const&)
-    { 
+
+    void MessageLogger::postGlobalBeginLumi(GlobalContext const&) {
       edm::MessageDrop::instance()->runEvent = "PostGlobalBeginLumi";
-      edm::MessageDrop::instance()->setSinglet("PostGlobalBeginLumi");	// changelog 17
+      edm::MessageDrop::instance()->setSinglet("PostGlobalBeginLumi");  // changelog 17
     }
-    
-    void
-    MessageLogger::preGlobalEndLumi( GlobalContext const& iContext)
-    {
+
+    void MessageLogger::preGlobalEndLumi(GlobalContext const& iContext) {
       std::ostringstream ost;
       auto const& id = iContext.luminosityBlockID();
       ost << "Run: " << id.run() << " Lumi: " << id.luminosityBlock();
-      transitionInfoCache_[lumiInfoBegin_+iContext.luminosityBlockIndex()]=ost.str();
+      transitionInfoCache_[lumiInfoBegin_ + iContext.luminosityBlockIndex()] = ost.str();
       edm::MessageDrop::instance()->runEvent = ost.str();
-      edm::MessageDrop::instance()->setSinglet("PreGlobalEndLumi");	// changelog 17
+      edm::MessageDrop::instance()->setSinglet("PreGlobalEndLumi");  // changelog 17
     }
-    void MessageLogger::postGlobalEndLumi(GlobalContext const&)
-    { 
+    void MessageLogger::postGlobalEndLumi(GlobalContext const&) {
       edm::MessageDrop::instance()->runEvent = "PostGlobalEndLumi";
-      edm::MessageDrop::instance()->setSinglet("PostGlobalEndLumi");	// changelog 17
+      edm::MessageDrop::instance()->setSinglet("PostGlobalEndLumi");  // changelog 17
     }
-    
-    void
-    MessageLogger::postEndJob()
-    {
-      SummarizeInJobReport();     // Put summary info into Job Rep  // change log 10
-      MessageLoggerQ::MLqSUM ( ); // trigger summary info.		// change log 9
+
+    void MessageLogger::postEndJob() {
+      SummarizeInJobReport();    // Put summary info into Job Rep  // change log 10
+      MessageLoggerQ::MLqSUM();  // trigger summary info.		// change log 9
     }
-    
-    void
-    MessageLogger::jobFailure()
-    {
+
+    void MessageLogger::jobFailure() {
       MessageDrop* messageDrop = MessageDrop::instance();
       messageDrop->setSinglet("jobFailure");
-      SummarizeInJobReport();     // Put summary info into Job Rep  // change log 10
-      MessageLoggerQ::MLqSUM ( ); // trigger summary info.		// change log 9
+      SummarizeInJobReport();    // Put summary info into Job Rep  // change log 10
+      MessageLoggerQ::MLqSUM();  // trigger summary info.		// change log 9
     }
-    
-    
+
     //
     // Other methods
     //
-    
-    void
-    MessageLogger::SummarizeInJobReport() {
-      if ( fjrSummaryRequested_ ) { 
-        std::map<std::string, double> * smp = new std::map<std::string, double> ();
-        MessageLoggerQ::MLqJRS ( smp );
+
+    void MessageLogger::SummarizeInJobReport() {
+      if (fjrSummaryRequested_) {
+        std::map<std::string, double>* smp = new std::map<std::string, double>();
+        MessageLoggerQ::MLqJRS(smp);
         Service<JobReport> reportSvc;
         reportSvc->reportMessageInfo(*smp);
         delete smp;
-      } 
+      }
     }
-    
-  } // end of namespace service  
-} // end of namespace edm  
+
+  }  // end of namespace service
+}  // end of namespace edm
diff --git a/FWCore/MessageService/src/MessageLoggerDefaults.cc b/FWCore/MessageService/src/MessageLoggerDefaults.cc
index 26acf109c818d..951c9cbefdaf5 100644
--- a/FWCore/MessageService/src/MessageLoggerDefaults.cc
+++ b/FWCore/MessageService/src/MessageLoggerDefaults.cc
@@ -10,338 +10,290 @@
 // 11/02/07 mf	Corrected sev_limit, sev_reportEvery, and sev_timespan
 //  		changing if (c != def_destin.category.end()) to
 //		if (c != def_destin.sev.end()) if 4 places in each.
-//		This fixes the skipped framework job report message 
-//		problem.  The bug also could have been causing other 
-//		messages to be skipped.  
+//		This fixes the skipped framework job report message
+//		problem.  The bug also could have been causing other
+//		messages to be skipped.
 //
 // ----------------------------------------------------------------------
 
-
-
 #include "FWCore/MessageService/interface/MessageLoggerDefaults.h"
 
 namespace edm {
-namespace service {
-
-std::string 
-MessageLoggerDefaults::
-threshold(std::string const & dest)
-{
-  std::string thr = "";
-  std::map<std::string,Destination>::iterator d = destination.find(dest);  
-  if (d != destination.end()) {
-    Destination & destin = d->second;
-    thr = destin.threshold;
-  }
-  std::map<std::string,Destination>::iterator dd = destination.find("default");
-  if ( thr == "" ) { 
-    if (dd != destination.end()) {
-      Destination & def_destin = dd->second;
-      thr = def_destin.threshold;
-    }
-  }
-  return thr;   
-} // threshold
-
-std::string 
-MessageLoggerDefaults::
-output(std::string const & dest)
-{
-  std::string otpt = "";
-  std::map<std::string,Destination>::iterator d = destination.find(dest);  
-  if (d != destination.end()) {
-    Destination & destin = d->second;
-    otpt = destin.output;
-  }
-  // There is no default output; so if we did not find the dest, then return ""
-  return otpt;   
-} // output
-
-int 
-MessageLoggerDefaults::
-limit(std::string const & dest, std::string const & cat)
-{
-  int lim = NO_VALUE_SET;
-  std::map<std::string,Destination>::iterator d = destination.find(dest);  
-  if (d != destination.end()) {
-    Destination & destin = d->second;
-    std::map<std::string,Category>::iterator c = destin.category.find(cat);
-    if (c != destin.category.end()) {
-      lim = c->second.limit;
-    } 
-  }
-  std::map<std::string,Destination>::iterator dd = destination.find("default");
-  if ( lim == NO_VALUE_SET ) { 
-    if (dd != destination.end()) {
-      Destination & def_destin = dd->second;
-      std::map<std::string,Category>::iterator 
-		      c = def_destin.category.find(cat);
-      if (c != def_destin.category.end()) {
-        lim = c->second.limit;
-      } 
-    }
-  }
-  if ( lim == NO_VALUE_SET ) { 
-    if (d != destination.end()) {
-      Destination & destin = d->second;
-      std::map<std::string,Category>::iterator 
-		      cd = destin.category.find("default");
-      if (cd != destin.category.end()) {
-        lim = cd->second.limit;
-      } 
-    }
-  }     
-  if ( lim == NO_VALUE_SET ) { 
-    if (dd != destination.end()) {
-      Destination & def_destin = dd->second;
-      std::map<std::string,Category>::iterator 
-		      cdd = def_destin.category.find("default");
-      if (cdd != def_destin.category.end()) {
-        lim = cdd->second.limit;
-      } 
-    }
-  }     
-  return lim;   
-} // limit
-
-int 
-MessageLoggerDefaults::
-reportEvery(std::string const & dest, std::string const & cat)
-{
-  int re = NO_VALUE_SET;
-  std::map<std::string,Destination>::iterator d = destination.find(dest);  
-  if (d != destination.end()) {
-    Destination & destin = d->second;
-    std::map<std::string,Category>::iterator c = destin.category.find(cat);
-    if (c != destin.category.end()) {
-      re = c->second.reportEvery;
-    } 
-  }
-  std::map<std::string,Destination>::iterator dd = destination.find("default");
-  if ( re == NO_VALUE_SET ) { 
-    if (dd != destination.end()) {
-      Destination & def_destin = dd->second;
-      std::map<std::string,Category>::iterator 
-		      c = def_destin.category.find(cat);
-      if (c != def_destin.category.end()) {
-        re = c->second.reportEvery;
-      } 
-    }
-  }
-  if ( re == NO_VALUE_SET ) { 
-    if (d != destination.end()) {
-      Destination & destin = d->second;
-      std::map<std::string,Category>::iterator 
-		      cd = destin.category.find("default");
-      if (cd != destin.category.end()) {
-        re = cd->second.reportEvery;
-      } 
-    }
-  }     
-  if ( re == NO_VALUE_SET ) { 
-    if (dd != destination.end()) {
-      Destination & def_destin = dd->second;
-      std::map<std::string,Category>::iterator 
-		      cdd = def_destin.category.find("default");
-      if (cdd != def_destin.category.end()) {
-        re = cdd->second.reportEvery;
-      } 
-    }
-  }     
-  return re;   
-} // reportEvery
+  namespace service {
 
-int 
-MessageLoggerDefaults::
-timespan(std::string const & dest, std::string const & cat)
-{
-  int tim = NO_VALUE_SET;
-  std::map<std::string,Destination>::iterator d = destination.find(dest);  
-  if (d != destination.end()) {
-    Destination & destin = d->second;
-    std::map<std::string,Category>::iterator c = destin.category.find(cat);
-    if (c != destin.category.end()) {
-      tim = c->second.timespan;
-    } 
-  }
-  std::map<std::string,Destination>::iterator dd = destination.find("default");
-  if ( tim == NO_VALUE_SET ) { 
-    if (dd != destination.end()) {
-      Destination & def_destin = dd->second;
-      std::map<std::string,Category>::iterator 
-		      c = def_destin.category.find(cat);
-      if (c != def_destin.category.end()) {
-        tim = c->second.timespan;
-      } 
-    }
-  }
-  if ( tim == NO_VALUE_SET ) { 
-    if (d != destination.end()) {
-      Destination & destin = d->second;
-      std::map<std::string,Category>::iterator 
-		      cd = destin.category.find("default");
-      if (cd != destin.category.end()) {
-        tim = cd->second.timespan;
-      } 
-    }
-  }     
-  if ( tim == NO_VALUE_SET ) { 
-    if (dd != destination.end()) {
-      Destination & def_destin = dd->second;
-      std::map<std::string,Category>::iterator 
-		      cdd = def_destin.category.find("default");
-      if (cdd != def_destin.category.end()) {
-        tim = cdd->second.timespan;
-      } 
-    }
-  }     
-  return tim;   
-} // timespan
+    std::string MessageLoggerDefaults::threshold(std::string const& dest) {
+      std::string thr = "";
+      std::map<std::string, Destination>::iterator d = destination.find(dest);
+      if (d != destination.end()) {
+        Destination& destin = d->second;
+        thr = destin.threshold;
+      }
+      std::map<std::string, Destination>::iterator dd = destination.find("default");
+      if (thr.empty()) {
+        if (dd != destination.end()) {
+          Destination& def_destin = dd->second;
+          thr = def_destin.threshold;
+        }
+      }
+      return thr;
+    }  // threshold
 
-int 
-MessageLoggerDefaults::
-sev_limit(std::string const & dest, std::string const & cat)
-{
-  int lim = NO_VALUE_SET;
-  std::map<std::string,Destination>::iterator d = destination.find(dest);  
-  if (d != destination.end()) {
-    Destination & destin = d->second;
-    std::map<std::string,Category>::iterator c = destin.sev.find(cat);
-    if (c != destin.sev.end()) {
-      lim = c->second.limit;
-    } 
-  }
-  std::map<std::string,Destination>::iterator dd = destination.find("default");
-  if ( lim == NO_VALUE_SET ) { 
-    if (dd != destination.end()) {
-      Destination & def_destin = dd->second;
-      std::map<std::string,Category>::iterator 
-		      c = def_destin.sev.find(cat);
-      if (c != def_destin.sev.end()) {
-        lim = c->second.limit;
-      } 
-    }
-  }
-  if ( lim == NO_VALUE_SET ) { 
-    if (d != destination.end()) {
-      Destination & destin = d->second;
-      std::map<std::string,Category>::iterator 
-		      cd = destin.sev.find("default");
-      if (cd != destin.sev.end()) {
-        lim = cd->second.limit;
-      } 
-    }
-  }     
-  if ( lim == NO_VALUE_SET ) { 
-    if (dd != destination.end()) {
-      Destination & def_destin = dd->second;
-      std::map<std::string,Category>::iterator 
-		      cdd = def_destin.sev.find("default");
-      if (cdd != def_destin.sev.end()) {
-        lim = cdd->second.limit;
-      } 
-    }
-  }     
-  return lim;   
-} // sev_limit
+    std::string MessageLoggerDefaults::output(std::string const& dest) {
+      std::string otpt = "";
+      std::map<std::string, Destination>::iterator d = destination.find(dest);
+      if (d != destination.end()) {
+        Destination& destin = d->second;
+        otpt = destin.output;
+      }
+      // There is no default output; so if we did not find the dest, then return ""
+      return otpt;
+    }  // output
 
-int 
-MessageLoggerDefaults::
-sev_reportEvery(std::string const & dest, std::string const & cat)
-{
-  int re = NO_VALUE_SET;
-  std::map<std::string,Destination>::iterator d = destination.find(dest);  
-  if (d != destination.end()) {
-    Destination & destin = d->second;
-    std::map<std::string,Category>::iterator c = destin.sev.find(cat);
-    if (c != destin.sev.end()) {
-      re = c->second.reportEvery;
-    } 
-  }
-  std::map<std::string,Destination>::iterator dd = destination.find("default");
-  if ( re == NO_VALUE_SET ) { 
-    if (dd != destination.end()) {
-      Destination & def_destin = dd->second;
-      std::map<std::string,Category>::iterator 
-		      c = def_destin.sev.find(cat);
-      if (c != def_destin.sev.end()) {
-        re = c->second.reportEvery;
-      } 
-    }
-  }
-  if ( re == NO_VALUE_SET ) { 
-    if (d != destination.end()) {
-      Destination & destin = d->second;
-      std::map<std::string,Category>::iterator 
-		      cd = destin.sev.find("default");
-      if (cd != destin.sev.end()) {
-        re = cd->second.reportEvery;
-      } 
-    }
-  }     
-  if ( re == NO_VALUE_SET ) { 
-    if (dd != destination.end()) {
-      Destination & def_destin = dd->second;
-      std::map<std::string,Category>::iterator 
-		      cdd = def_destin.sev.find("default");
-      if (cdd != def_destin.sev.end()) {
-        re = cdd->second.reportEvery;
-      } 
-    }
-  }     
-  return re;   
-} // sev_reportEvery
+    int MessageLoggerDefaults::limit(std::string const& dest, std::string const& cat) {
+      int lim = NO_VALUE_SET;
+      std::map<std::string, Destination>::iterator d = destination.find(dest);
+      if (d != destination.end()) {
+        Destination& destin = d->second;
+        std::map<std::string, Category>::iterator c = destin.category.find(cat);
+        if (c != destin.category.end()) {
+          lim = c->second.limit;
+        }
+      }
+      std::map<std::string, Destination>::iterator dd = destination.find("default");
+      if (lim == NO_VALUE_SET) {
+        if (dd != destination.end()) {
+          Destination& def_destin = dd->second;
+          std::map<std::string, Category>::iterator c = def_destin.category.find(cat);
+          if (c != def_destin.category.end()) {
+            lim = c->second.limit;
+          }
+        }
+      }
+      if (lim == NO_VALUE_SET) {
+        if (d != destination.end()) {
+          Destination& destin = d->second;
+          std::map<std::string, Category>::iterator cd = destin.category.find("default");
+          if (cd != destin.category.end()) {
+            lim = cd->second.limit;
+          }
+        }
+      }
+      if (lim == NO_VALUE_SET) {
+        if (dd != destination.end()) {
+          Destination& def_destin = dd->second;
+          std::map<std::string, Category>::iterator cdd = def_destin.category.find("default");
+          if (cdd != def_destin.category.end()) {
+            lim = cdd->second.limit;
+          }
+        }
+      }
+      return lim;
+    }  // limit
 
-int 
-MessageLoggerDefaults::
-sev_timespan(std::string const & dest, std::string const & cat)
-{
-  int tim = NO_VALUE_SET;
-  std::map<std::string,Destination>::iterator d = destination.find(dest);  
-  if (d != destination.end()) {
-    Destination & destin = d->second;
-    std::map<std::string,Category>::iterator c = destin.sev.find(cat);
-    if (c != destin.sev.end()) {
-      tim = c->second.timespan;
-    } 
-  }
-  std::map<std::string,Destination>::iterator dd = destination.find("default");
-  if ( tim == NO_VALUE_SET ) { 
-    if (dd != destination.end()) {
-      Destination & def_destin = dd->second;
-      std::map<std::string,Category>::iterator 
-		      c = def_destin.sev.find(cat);
-      if (c != def_destin.sev.end()) {
-        tim = c->second.timespan;
-      } 
-    }
-  }
-  if ( tim == NO_VALUE_SET ) { 
-    if (d != destination.end()) {
-      Destination & destin = d->second;
-      std::map<std::string,Category>::iterator 
-		      cd = destin.sev.find("default");
-      if (cd != destin.sev.end()) {
-        tim = cd->second.timespan;
-      } 
-    }
-  }     
-  if ( tim == NO_VALUE_SET ) { 
-    if (dd != destination.end()) {
-      Destination & def_destin = dd->second;
-      std::map<std::string,Category>::iterator 
-		      cdd = def_destin.sev.find("default");
-      if (cdd != def_destin.sev.end()) {
-        tim = cdd->second.timespan;
-      } 
-    }
-  }     
-  return tim;   
-} // sev_timespan
+    int MessageLoggerDefaults::reportEvery(std::string const& dest, std::string const& cat) {
+      int re = NO_VALUE_SET;
+      std::map<std::string, Destination>::iterator d = destination.find(dest);
+      if (d != destination.end()) {
+        Destination& destin = d->second;
+        std::map<std::string, Category>::iterator c = destin.category.find(cat);
+        if (c != destin.category.end()) {
+          re = c->second.reportEvery;
+        }
+      }
+      std::map<std::string, Destination>::iterator dd = destination.find("default");
+      if (re == NO_VALUE_SET) {
+        if (dd != destination.end()) {
+          Destination& def_destin = dd->second;
+          std::map<std::string, Category>::iterator c = def_destin.category.find(cat);
+          if (c != def_destin.category.end()) {
+            re = c->second.reportEvery;
+          }
+        }
+      }
+      if (re == NO_VALUE_SET) {
+        if (d != destination.end()) {
+          Destination& destin = d->second;
+          std::map<std::string, Category>::iterator cd = destin.category.find("default");
+          if (cd != destin.category.end()) {
+            re = cd->second.reportEvery;
+          }
+        }
+      }
+      if (re == NO_VALUE_SET) {
+        if (dd != destination.end()) {
+          Destination& def_destin = dd->second;
+          std::map<std::string, Category>::iterator cdd = def_destin.category.find("default");
+          if (cdd != def_destin.category.end()) {
+            re = cdd->second.reportEvery;
+          }
+        }
+      }
+      return re;
+    }  // reportEvery
 
+    int MessageLoggerDefaults::timespan(std::string const& dest, std::string const& cat) {
+      int tim = NO_VALUE_SET;
+      std::map<std::string, Destination>::iterator d = destination.find(dest);
+      if (d != destination.end()) {
+        Destination& destin = d->second;
+        std::map<std::string, Category>::iterator c = destin.category.find(cat);
+        if (c != destin.category.end()) {
+          tim = c->second.timespan;
+        }
+      }
+      std::map<std::string, Destination>::iterator dd = destination.find("default");
+      if (tim == NO_VALUE_SET) {
+        if (dd != destination.end()) {
+          Destination& def_destin = dd->second;
+          std::map<std::string, Category>::iterator c = def_destin.category.find(cat);
+          if (c != def_destin.category.end()) {
+            tim = c->second.timespan;
+          }
+        }
+      }
+      if (tim == NO_VALUE_SET) {
+        if (d != destination.end()) {
+          Destination& destin = d->second;
+          std::map<std::string, Category>::iterator cd = destin.category.find("default");
+          if (cd != destin.category.end()) {
+            tim = cd->second.timespan;
+          }
+        }
+      }
+      if (tim == NO_VALUE_SET) {
+        if (dd != destination.end()) {
+          Destination& def_destin = dd->second;
+          std::map<std::string, Category>::iterator cdd = def_destin.category.find("default");
+          if (cdd != def_destin.category.end()) {
+            tim = cdd->second.timespan;
+          }
+        }
+      }
+      return tim;
+    }  // timespan
 
+    int MessageLoggerDefaults::sev_limit(std::string const& dest, std::string const& cat) {
+      int lim = NO_VALUE_SET;
+      std::map<std::string, Destination>::iterator d = destination.find(dest);
+      if (d != destination.end()) {
+        Destination& destin = d->second;
+        std::map<std::string, Category>::iterator c = destin.sev.find(cat);
+        if (c != destin.sev.end()) {
+          lim = c->second.limit;
+        }
+      }
+      std::map<std::string, Destination>::iterator dd = destination.find("default");
+      if (lim == NO_VALUE_SET) {
+        if (dd != destination.end()) {
+          Destination& def_destin = dd->second;
+          std::map<std::string, Category>::iterator c = def_destin.sev.find(cat);
+          if (c != def_destin.sev.end()) {
+            lim = c->second.limit;
+          }
+        }
+      }
+      if (lim == NO_VALUE_SET) {
+        if (d != destination.end()) {
+          Destination& destin = d->second;
+          std::map<std::string, Category>::iterator cd = destin.sev.find("default");
+          if (cd != destin.sev.end()) {
+            lim = cd->second.limit;
+          }
+        }
+      }
+      if (lim == NO_VALUE_SET) {
+        if (dd != destination.end()) {
+          Destination& def_destin = dd->second;
+          std::map<std::string, Category>::iterator cdd = def_destin.sev.find("default");
+          if (cdd != def_destin.sev.end()) {
+            lim = cdd->second.limit;
+          }
+        }
+      }
+      return lim;
+    }  // sev_limit
 
+    int MessageLoggerDefaults::sev_reportEvery(std::string const& dest, std::string const& cat) {
+      int re = NO_VALUE_SET;
+      std::map<std::string, Destination>::iterator d = destination.find(dest);
+      if (d != destination.end()) {
+        Destination& destin = d->second;
+        std::map<std::string, Category>::iterator c = destin.sev.find(cat);
+        if (c != destin.sev.end()) {
+          re = c->second.reportEvery;
+        }
+      }
+      std::map<std::string, Destination>::iterator dd = destination.find("default");
+      if (re == NO_VALUE_SET) {
+        if (dd != destination.end()) {
+          Destination& def_destin = dd->second;
+          std::map<std::string, Category>::iterator c = def_destin.sev.find(cat);
+          if (c != def_destin.sev.end()) {
+            re = c->second.reportEvery;
+          }
+        }
+      }
+      if (re == NO_VALUE_SET) {
+        if (d != destination.end()) {
+          Destination& destin = d->second;
+          std::map<std::string, Category>::iterator cd = destin.sev.find("default");
+          if (cd != destin.sev.end()) {
+            re = cd->second.reportEvery;
+          }
+        }
+      }
+      if (re == NO_VALUE_SET) {
+        if (dd != destination.end()) {
+          Destination& def_destin = dd->second;
+          std::map<std::string, Category>::iterator cdd = def_destin.sev.find("default");
+          if (cdd != def_destin.sev.end()) {
+            re = cdd->second.reportEvery;
+          }
+        }
+      }
+      return re;
+    }  // sev_reportEvery
 
-} // end of namespace service  
-} // end of namespace edm  
+    int MessageLoggerDefaults::sev_timespan(std::string const& dest, std::string const& cat) {
+      int tim = NO_VALUE_SET;
+      std::map<std::string, Destination>::iterator d = destination.find(dest);
+      if (d != destination.end()) {
+        Destination& destin = d->second;
+        std::map<std::string, Category>::iterator c = destin.sev.find(cat);
+        if (c != destin.sev.end()) {
+          tim = c->second.timespan;
+        }
+      }
+      std::map<std::string, Destination>::iterator dd = destination.find("default");
+      if (tim == NO_VALUE_SET) {
+        if (dd != destination.end()) {
+          Destination& def_destin = dd->second;
+          std::map<std::string, Category>::iterator c = def_destin.sev.find(cat);
+          if (c != def_destin.sev.end()) {
+            tim = c->second.timespan;
+          }
+        }
+      }
+      if (tim == NO_VALUE_SET) {
+        if (d != destination.end()) {
+          Destination& destin = d->second;
+          std::map<std::string, Category>::iterator cd = destin.sev.find("default");
+          if (cd != destin.sev.end()) {
+            tim = cd->second.timespan;
+          }
+        }
+      }
+      if (tim == NO_VALUE_SET) {
+        if (dd != destination.end()) {
+          Destination& def_destin = dd->second;
+          std::map<std::string, Category>::iterator cdd = def_destin.sev.find("default");
+          if (cdd != def_destin.sev.end()) {
+            tim = cdd->second.timespan;
+          }
+        }
+      }
+      return tim;
+    }  // sev_timespan
 
+  }  // end of namespace service
+}  // end of namespace edm
diff --git a/FWCore/MessageService/src/MessageLoggerScribe.cc b/FWCore/MessageService/src/MessageLoggerScribe.cc
index 1f6036fd88eb9..56442a396e714 100644
--- a/FWCore/MessageService/src/MessageLoggerScribe.cc
+++ b/FWCore/MessageService/src/MessageLoggerScribe.cc
@@ -4,21 +4,21 @@
 //
 // Changes:
 //
-//   1 - 3/22/06  mf  - in configure_dest()	
+//   1 - 3/22/06  mf  - in configure_dest()
 //	Repaired the fact that destination limits for categories
 //	were not being effective:
 //	a) use values from the destination specific default PSet
 //	   rather than the overall default PSet to set these
-//	b) when an explicit value has been set - either by overall default or 
+//	b) when an explicit value has been set - either by overall default or
 //	   by a destination specific default PSet - set that limit or
 //	   timespan for that dest_ctrl via a "*" msgId.
-// 
-//   2 - 3/22/06  mf  - in configure_dest()	
+//
+//   2 - 3/22/06  mf  - in configure_dest()
 //	Enabled the use of -1 in the .cfg file to mean infinite limit
 //	or timespan.  This is done by:
-//	a) replacing the default value of -1 (by which we recognize 
+//	a) replacing the default value of -1 (by which we recognize
 //	never-specified values) by NO_VALUE_SET = -45654
-//	b) checking for values of -1 and substituting a very large integer  
+//	b) checking for values of -1 and substituting a very large integer
 //
 //   3 - 4/28/06  mf  - in configure_dest()
 //	Mods to help deal with the fact that checking for an empty PSet is
@@ -27,18 +27,18 @@
 //	a) Replaced default values directly in getAparameter with variables
 //	which can be examined all in one place.
 //	b) Carefully checked that we are never comparing to the empty PSet
-//	
+//
 //   4 - 4/28/06  mf  - in configure_dest()
-//	If a destination name does not have an extension, append .log 
+//	If a destination name does not have an extension, append .log
 //	(or in the case of a FwkJobReport, .xml).
 //	[note for this change - the filename kept as an index to stream_ps
 //	can be kept as its original name; it is just a tool for assigning
 //	the right shared stream to statistics destinations]
 //
 //   5 - 4/28/06  mf  - in configure_dest()
-//	Provision for an overall default affecting all categories, for 
+//	Provision for an overall default affecting all categories, for
 //	example, establishing a limit for all a specific category for
-//	every destination. 
+//	every destination.
 //
 //   6 - 5/18/06 mf  - in configure_dest()
 //	Implement establishing intervals between reacting to message of
@@ -46,7 +46,7 @@
 //
 //   7 - 5/24/06 mf  - in configure_dest()
 //	Corrected algorithm for estabolishing limits and intervals, avoiding
-//      interference between setting the one and getting the default for the 
+//      interference between setting the one and getting the default for the
 //      other.
 //
 //   8 - 5/31/06 wmtan  - in configure_errorlog()
@@ -80,7 +80,7 @@
 //            D. Evans (who was being hit with that behavior due to an
 //	      accidental .cfg omission) asserts (8/16) that running with
 //            no .cfg file is a sufficient anomoly that the current change
-//            is acceptable. 
+//            is acceptable.
 //
 //  14 - 10/18/06 mf  - in configure_error_log()
 //	Finer control of output file name for a given destination:
@@ -108,38 +108,38 @@
 //	 command-line option lets you produce them.
 //
 //  20 - 3/15/07 mf - in configure_statistics() and configure_fwkJobReports()
-//	 Handle the placeholder case 
+//	 Handle the placeholder case
 //
 //  21 - 3/15/07 mf - run()
-//	 Improve the behavior of catches of exceptions in non-synchronous 
+//	 Improve the behavior of catches of exceptions in non-synchronous
 //       command cases:  Unless the ConfigurationHandshake is used, re-throw
 //	 is not an option, but exit is also not very good.
 //
 //  22 - 4/18/07 mf - in configure_error_log and its called functions
 //	 Allow for duplicate file names if configuration happens twice.
 //
-//  23 - 6/13/07 mf - in configure_statistics 
+//  23 - 6/13/07 mf - in configure_statistics
 //	 Repared error of calling "cerr" "err", which would cause appended
-//	 statistics destinations going to cerr to instead come out in a file 
+//	 statistics destinations going to cerr to instead come out in a file
 //	 err.log
 //
 //  24 - 6/15/07 mf - in configure_errlog and its descendants
-//	 Major mods to hardwire defaults taken from the .cfi file 
+//	 Major mods to hardwire defaults taken from the .cfi file
 //	 To allow flexibility, this depends on MessageLoggerDefaults.h
 //
-//  25 - 7/24/07 mf - in run() 
-//	 A command SHUT_UP to deactivate, and in the LOG_A_MESSGE case, response to 
+//  25 - 7/24/07 mf - in run()
+//	 A command SHUT_UP to deactivate, and in the LOG_A_MESSGE case, response to
 //	 that command.  This allows supression of the generator info in case of a
-//	 completely .cfg-less cmsRun command.  
+//	 completely .cfg-less cmsRun command.
 //
 //  26 - 8/7/07 mf - in run()
-//	 A command FLUSH_LOG_Q to consume the entire queue, processing each 
+//	 A command FLUSH_LOG_Q to consume the entire queue, processing each
 //	 message.  Actually, the key is that on the other side, it is used in
-//       a synchronous manner (like CONFIGURE) so as soon as one gets up to 
-//	 the flush command, the queue has in fact been flushed!  
+//       a synchronous manner (like CONFIGURE) so as soon as one gets up to
+//	 the flush command, the queue has in fact been flushed!
 //
 //  27 - 8/16/07 mf - in run()
-//	 A command GROUP_STATS to add a category to a list which ELstatistics 
+//	 A command GROUP_STATS to add a category to a list which ELstatistics
 //	 will use to avoid separate per-module statistics for that category.
 //
 //  28 - 6/18/08 mf - in CONFIGURE case and FLUSH_LOG_Q case
@@ -149,7 +149,7 @@
 //  29 - 6/19/08 mf - in run() and a new function triggerFJRmessageSummary()
 //	 Implemented filling a map with summary info for the Job Report
 //
-//  30 - 6/20/08 mf - in run() 
+//  30 - 6/20/08 mf - in run()
 //	 Setting MessageLoggerScribeIsRunning
 //
 //  31 - 7/9/08  mf - in configure_ordinary_destinations()
@@ -177,8 +177,8 @@
 //       and warningAlwaysSuppressed when setting up thresholds
 //
 //  38 - 9/29/10 mf, ql
-//       Limit and timespan shuold be translated from -1 input to 
-//	 2000000000.  This was being done in all cases except the 
+//       Limit and timespan shuold be translated from -1 input to
+//	 2000000000.  This was being done in all cases except the
 //	 severity limits; omission rectified.
 //
 // ----------------------------------------------------------------------
@@ -192,8 +192,8 @@
 #include "FWCore/MessageLogger/interface/ErrorObj.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/MessageLogger/interface/ConfigurationHandshake.h"
-#include "FWCore/MessageLogger/interface/MessageDrop.h"		// change log 37
-#include "FWCore/MessageLogger/interface/ELseverityLevel.h"	// change log 37
+#include "FWCore/MessageLogger/interface/MessageDrop.h"      // change log 37
+#include "FWCore/MessageLogger/interface/ELseverityLevel.h"  // change log 37
 
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/Utilities/interface/Algorithms.h"
@@ -207,809 +207,717 @@
 using std::cerr;
 
 namespace edm {
-namespace service {
-
-
-MessageLoggerScribe::MessageLoggerScribe(std::shared_ptr<ThreadQueue> queue)
-: admin_p   ( new ELadministrator() )
-, early_dest( admin_p->attach(std::make_shared<ELoutput>(std::cerr, false)) )
-, file_ps   ( )
-, job_pset_p( )
-, clean_slate_configuration( true )
-, active( true )
-, singleThread (queue.get() == nullptr)				// changeLog 36
-, done (false)							// changeLog 32
-, purge_mode (false)						// changeLog 32
-, count (false)							// changeLog 32
-, m_queue(queue)						// changeLog 36
-{
-}
-
-MessageLoggerScribe::~MessageLoggerScribe()
-{
-  admin_p->finish();
-}
-
-
-void
-  MessageLoggerScribe::run()
-{
-  MessageLoggerQ::OpCode  opcode;
-  void *                  operand;
-
-  MessageDrop::instance()->messageLoggerScribeIsRunning = 
-  				MLSCRIBE_RUNNING_INDICATOR;	// ChangeLog 30
-//  std::cerr << "MessageLoggerScribe::run(): \n";
-//  std::cerr << "messageLoggerScribeIsRunning = "
-//      << (int)MessageDrop::instance()->messageLoggerScribeIsRunning << "\n";
-
-  do  {
-    m_queue->consume(opcode, operand);  // grab next work item from Q 
-    					// changeLog 36
-    runCommand (opcode, operand);
-  } while(! done);
-
-}  // MessageLoggerScribe::run()
-
-void
-  MessageLoggerScribe::runCommand(				// changeLog 32
-  	MessageLoggerQ::OpCode  opcode, 
-	void * operand)
-{
-  switch(opcode)  {  // interpret the work item
-    default:  {
-      assert(false);  // can't happen (we certainly hope!)
-      break;
-    }
-    case MessageLoggerQ::END_THREAD:  {
-      assert( operand == nullptr );
-      done = true;
-      MessageDrop::instance()->messageLoggerScribeIsRunning = 
-	      (unsigned char) -1; 				// ChangeLog 30
-      break;
+  namespace service {
+
+    MessageLoggerScribe::MessageLoggerScribe(std::shared_ptr<ThreadQueue> queue)
+        : admin_p(new ELadministrator()),
+          early_dest(admin_p->attach(std::make_shared<ELoutput>(std::cerr, false))),
+          file_ps(),
+          job_pset_p(),
+          clean_slate_configuration(true),
+          active(true),
+          singleThread(queue.get() == nullptr)  // changeLog 36
+          ,
+          done(false)  // changeLog 32
+          ,
+          purge_mode(false)  // changeLog 32
+          ,
+          count(false)  // changeLog 32
+          ,
+          m_queue(queue)  // changeLog 36
+    {}
+
+    MessageLoggerScribe::~MessageLoggerScribe() { admin_p->finish(); }
+
+    void MessageLoggerScribe::run() {
+      MessageLoggerQ::OpCode opcode;
+      void* operand;
+
+      MessageDrop::instance()->messageLoggerScribeIsRunning = MLSCRIBE_RUNNING_INDICATOR;  // ChangeLog 30
+      //  std::cerr << "MessageLoggerScribe::run(): \n";
+      //  std::cerr << "messageLoggerScribeIsRunning = "
+      //      << (int)MessageDrop::instance()->messageLoggerScribeIsRunning << "\n";
+
+      do {
+        m_queue->consume(opcode, operand);  // grab next work item from Q
+                                            // changeLog 36
+        runCommand(opcode, operand);
+      } while (!done);
+
+    }  // MessageLoggerScribe::run()
+
+    void MessageLoggerScribe::runCommand(  // changeLog 32
+        MessageLoggerQ::OpCode opcode,
+        void* operand) {
+      switch (opcode) {  // interpret the work item
+        default: {
+          assert(false);  // can't happen (we certainly hope!)
+          break;
+        }
+        case MessageLoggerQ::END_THREAD: {
+          assert(operand == nullptr);
+          done = true;
+          MessageDrop::instance()->messageLoggerScribeIsRunning = (unsigned char)-1;  // ChangeLog 30
+          break;
+        }
+        case MessageLoggerQ::LOG_A_MESSAGE: {
+          ErrorObj* errorobj_p = static_cast<ErrorObj*>(operand);
+          try {
+            if (active && !purge_mode)
+              log(errorobj_p);
+          } catch (cms::Exception& e) {
+            ++count;
+            std::cerr << "MessageLoggerScribe caught " << count << " cms::Exceptions, text = \n" << e.what() << "\n";
+
+            if (count > 25) {
+              cerr << "MessageLogger will no longer be processing "
+                   << "messages due to errors (entering purge mode).\n";
+              purge_mode = true;
+            }
+          } catch (...) {
+            std::cerr << "MessageLoggerScribe caught an unknown exception and "
+                      << "will no longer be processing "
+                      << "messages. (entering purge mode)\n";
+            purge_mode = true;
+          }
+          delete errorobj_p;  // dispose of the message text
+          break;
+        }
+        case MessageLoggerQ::CONFIGURE: {  // changelog 17
+          if (singleThread) {
+            job_pset_p =
+                std::shared_ptr<PSet>(static_cast<PSet*>(operand));  // propagate_const<T> has no reset() function
+            configure_errorlog();
+            break;
+          } else {
+            ConfigurationHandshake* h_p = static_cast<ConfigurationHandshake*>(operand);
+            job_pset_p =
+                std::shared_ptr<PSet>(static_cast<PSet*>(h_p->p));  // propagate_const<T> has no reset() function
+            std::lock_guard<std::mutex> sl(h_p->m);                 // get lock
+            try {
+              configure_errorlog();
+            } catch (edm::Exception& e) {
+              Place_for_passing_exception_ptr epp = h_p->epp;
+              if (!(*epp)) {
+                *epp = std::make_shared<edm::Exception>(e);
+              } else {
+                Pointer_to_new_exception_on_heap ep = *epp;
+                (*ep) << "\n and another exception: \n" << e.what();
+              }
+            }
+            // Note - since the configuring code has not made a new copy of the
+            // job parameter set, we must not delete job_pset_p (in contrast to
+            // the case for errorobj_p).  On the other hand, if we instantiate
+            // a new edm::Exception pointed to by *epp, it is the responsibility
+            // of the MessageLoggerQ to delete it.
+            h_p->c.notify_all();  // Signal to MessageLoggerQ that we are done
+            // finally, release the scoped lock by letting it go out of scope
+            break;
+          }
+        }
+        case MessageLoggerQ::SUMMARIZE: {
+          assert(operand == nullptr);
+          try {
+            triggerStatisticsSummaries();
+          } catch (cms::Exception& e) {
+            std::cerr << "MessageLoggerScribe caught exception "
+                      << "during summarize:\n"
+                      << e.what() << "\n";
+          } catch (...) {
+            std::cerr << "MessageLoggerScribe caught unkonwn exception type "
+                      << "during summarize. (Ignored)\n";
+          }
+          break;
+        }
+        case MessageLoggerQ::JOBMODE: {  // change log 24
+          std::string* jobMode_p = static_cast<std::string*>(operand);
+          JobMode jm = MessageLoggerDefaults::mode(*jobMode_p);
+          messageLoggerDefaults = value_ptr<MessageLoggerDefaults>(new MessageLoggerDefaults(jm));
+          // Note - since messageLoggerDefaults is a value_ptr,
+          //        there is no concern about deleting here.
+          delete jobMode_p;  // dispose of the message text
+                             // which will have been new-ed
+                             // in MessageLogger.cc (service version)
+          break;
+        }
+        case MessageLoggerQ::SHUT_UP: {
+          assert(operand == nullptr);
+          active = false;
+          break;
+        }
+        case MessageLoggerQ::FLUSH_LOG_Q: {  // changelog 26
+          if (singleThread)
+            return;
+          ConfigurationHandshake* h_p = static_cast<ConfigurationHandshake*>(operand);
+          job_pset_p = std::shared_ptr<PSet>(static_cast<PSet*>(h_p->p));  // propagate_const<T> has no reset() function
+          std::lock_guard<std::mutex> sl(h_p->m);                          // get lock
+          h_p->c.notify_all();                                             // Signal to MessageLoggerQ that we are done
+          // finally, release the scoped lock by letting it go out of scope
+          break;
+        }
+        case MessageLoggerQ::GROUP_STATS: {  // change log 27
+          std::string* cat_p = static_cast<std::string*>(operand);
+          ELstatistics::noteGroupedCategory(*cat_p);
+          delete cat_p;  // dispose of the message text
+          break;
+        }
+        case MessageLoggerQ::FJR_SUMMARY: {  // changelog 29
+          if (singleThread) {
+            std::map<std::string, double>* smp = static_cast<std::map<std::string, double>*>(operand);
+            triggerFJRmessageSummary(*smp);
+            break;
+          } else {
+            ConfigurationHandshake* h_p = static_cast<ConfigurationHandshake*>(operand);
+            std::lock_guard<std::mutex> sl(h_p->m);  // get lock
+            std::map<std::string, double>* smp = static_cast<std::map<std::string, double>*>(h_p->p);
+            triggerFJRmessageSummary(*smp);
+            h_p->c.notify_all();  // Signal to MessageLoggerQ that we are done
+            // finally, release the scoped lock by letting it go out of scope
+            break;
+          }
+        }
+      }  // switch
+
+    }  // MessageLoggerScribe::runCommand(opcode, operand)
+
+    void MessageLoggerScribe::log(ErrorObj* errorobj_p) {
+      std::vector<std::string> categories;
+      parseCategories(errorobj_p->xid().id, categories);
+      for (unsigned int icat = 0; icat < categories.size(); ++icat) {
+        errorobj_p->setID(categories[icat]);
+        admin_p->log(*errorobj_p);  // route the message text
+      }
     }
-    case MessageLoggerQ::LOG_A_MESSAGE:  {
-      ErrorObj *  errorobj_p = static_cast<ErrorObj *>(operand);
-      try {
-	if(active && !purge_mode) log (errorobj_p);        
+
+    void MessageLoggerScribe::configure_errorlog() {
+      vString empty_vString;
+      String empty_String;
+      PSet empty_PSet;
+
+      // The following is present to test pre-configuration message handling:
+      String preconfiguration_message =
+          getAparameter<String>(*job_pset_p, "generate_preconfiguration_message", empty_String);
+      if (preconfiguration_message != empty_String) {
+        // To test a preconfiguration message without first going thru the
+        // configuration we are about to do, we issue the message (so it sits
+        // on the queue), then copy the processing that the LOG_A_MESSAGE case
+        // does.  We suppress the timestamp to allow for automated unit testing.
+        early_dest->suppressTime();
+        LogError("preconfiguration") << preconfiguration_message;
+        if (!singleThread) {
+          MessageLoggerQ::OpCode opcode;
+          void* operand;
+          m_queue->consume(opcode, operand);  // grab next work item from Q
+          assert(opcode == MessageLoggerQ::LOG_A_MESSAGE);
+          ErrorObj* errorobj_p = static_cast<ErrorObj*>(operand);
+          log(errorobj_p);
+          delete errorobj_p;  // dispose of the message text
+        }
       }
-      catch(cms::Exception& e)
-      {
-	  ++count;
-	  std::cerr << "MessageLoggerScribe caught " << count
-	       << " cms::Exceptions, text = \n"
-	       << e.what() << "\n";
-
-	  if(count > 25)
-	    {
-	      cerr << "MessageLogger will no longer be processing "
-		   << "messages due to errors (entering purge mode).\n";
-	      purge_mode = true;
-	    }
+
+      if (!stream_ps.empty()) {
+        LogWarning("multiLogConfig") << "The message logger has been configured multiple times";
+        clean_slate_configuration = false;  // Change Log 22
       }
-      catch(...)
+      configure_ordinary_destinations();  // Change Log 16
+      configure_statistics();             // Change Log 16
+    }                                     // MessageLoggerScribe::configure_errorlog()
+
+    void MessageLoggerScribe::configure_dest(std::shared_ptr<ELdestination> dest_ctrl, String const& filename) {
+      static const int NO_VALUE_SET = -45654;  // change log 2
+      vString empty_vString;
+      PSet empty_PSet;
+      String empty_String;
+
+      // Defaults:							// change log 3a
+      const std::string COMMON_DEFAULT_THRESHOLD = "INFO";
+      const int COMMON_DEFAULT_LIMIT = NO_VALUE_SET;
+      const int COMMON_DEFAULT_INTERVAL = NO_VALUE_SET;  // change log 6
+      const int COMMON_DEFAULT_TIMESPAN = NO_VALUE_SET;
+
+      char const* severity_array[] = {"WARNING", "INFO", "ERROR", "DEBUG"};
+      vString const severities(severity_array + 0, severity_array + 4);
+
+      // grab list of categories
+      vString categories = getAparameter<vString>(*job_pset_p, "categories", empty_vString);
+
+      // grab list of messageIDs -- these are a synonym for categories
+      // Note -- the use of messageIDs is deprecated in favor of categories
       {
-	  std::cerr << "MessageLoggerScribe caught an unknown exception and "
-	       << "will no longer be processing "
-	       << "messages. (entering purge mode)\n";
-	  purge_mode = true;
+        vString messageIDs = getAparameter<vString>(*job_pset_p, "messageIDs", empty_vString);
+
+        // combine the lists, not caring about possible duplicates (for now)
+        copy_all(messageIDs, std::back_inserter(categories));
+      }  // no longer need messageIDs
+
+      // grab list of hardwired categories (hardcats) -- these are to be added
+      // to the list of categories -- change log 24
+      {
+        std::vector<std::string> hardcats = messageLoggerDefaults->categories;
+        // combine the lists, not caring about possible duplicates (for now)
+        copy_all(hardcats, std::back_inserter(categories));
+      }  // no longer need hardcats
+
+      // grab default threshold common to all destinations
+      String default_threshold = getAparameter<String>(*job_pset_p, "threshold", empty_String);
+      // change log 3a
+      // change log 24
+
+      // grab default limit/interval/timespan common to all destinations/categories:
+      PSet default_pset = getAparameter<PSet>(*job_pset_p, "default", empty_PSet);
+      int default_limit = getAparameter<int>(default_pset, "limit", COMMON_DEFAULT_LIMIT);
+      int default_interval = getAparameter<int>(default_pset, "reportEvery", COMMON_DEFAULT_INTERVAL);
+      // change log 6, 10
+      int default_timespan = getAparameter<int>(default_pset, "timespan", COMMON_DEFAULT_TIMESPAN);
+      // change log 2a
+      // change log 3a
+      String default_pset_threshold = getAparameter<String>(default_pset, "threshold", default_threshold);
+      // change log 34
+
+      // grab all of this destination's parameters:
+      PSet dest_pset = getAparameter<PSet>(*job_pset_p, filename, empty_PSet);
+
+      // See if this is just a placeholder			// change log 9
+      bool is_placeholder = getAparameter<bool>(dest_pset, "placeholder", false);
+      if (is_placeholder)
+        return;
+
+      // grab this destination's default limit/interval/timespan:
+      PSet dest_default_pset = getAparameter<PSet>(dest_pset, "default", empty_PSet);
+      int dest_default_limit = getAparameter<int>(dest_default_pset, "limit", default_limit);
+      int dest_default_interval = getAparameter<int>(dest_default_pset, "reportEvery", default_interval);
+      // change log 6
+      int dest_default_timespan = getAparameter<int>(dest_default_pset, "timespan", default_timespan);
+      // change log 1a
+      if (dest_default_limit != NO_VALUE_SET) {
+        if (dest_default_limit < 0)
+          dest_default_limit = 2000000000;
+        dest_ctrl->setLimit("*", dest_default_limit);
+      }                                             // change log 1b, 2a, 2b
+      if (dest_default_interval != NO_VALUE_SET) {  // change log 6
+        dest_ctrl->setInterval("*", dest_default_interval);
       }
-      delete errorobj_p;  // dispose of the message text
-      break;
-    }
-    case MessageLoggerQ::CONFIGURE:  {			// changelog 17
-      if (singleThread) {
-        job_pset_p = std::shared_ptr<PSet>(static_cast<PSet*>(operand)); // propagate_const<T> has no reset() function
-	configure_errorlog();
-	break;
-      } else {
-	ConfigurationHandshake * h_p = 
-		static_cast<ConfigurationHandshake *>(operand);
-        job_pset_p = std::shared_ptr<PSet>(static_cast<PSet*>(h_p->p)); // propagate_const<T> has no reset() function
-  std::lock_guard<std::mutex> sl(h_p->m);   // get lock
-	try {
-	  configure_errorlog();
-	}
-	catch(edm::Exception& e)
-	  {
-	    Place_for_passing_exception_ptr epp = h_p->epp;
-	    if (!(*epp)) { 
-	      *epp = std::make_shared<edm::Exception>(e);
-	    } else {
-	      Pointer_to_new_exception_on_heap ep = *epp;
-	      (*ep) << "\n and another exception: \n" << e.what();
-	    }
-	  }
-	// Note - since the configuring code has not made a new copy of the 
-	// job parameter set, we must not delete job_pset_p (in contrast to
-	// the case for errorobj_p).  On the other hand, if we instantiate
-	// a new edm::Exception pointed to by *epp, it is the responsibility
-	// of the MessageLoggerQ to delete it.
-	h_p->c.notify_all();  // Signal to MessageLoggerQ that we are done
-	// finally, release the scoped lock by letting it go out of scope 
-	break;
+      if (dest_default_timespan != NO_VALUE_SET) {
+        if (dest_default_timespan < 0)
+          dest_default_timespan = 2000000000;
+        dest_ctrl->setTimespan("*", dest_default_timespan);
+      }  // change log 1b, 2a, 2b
+
+      // establish this destination's threshold:
+      String dest_threshold = getAparameter<String>(dest_pset, "threshold", default_threshold);
+      if (dest_threshold == empty_String) {
+        dest_threshold = default_threshold;
       }
-    }
-    case MessageLoggerQ::SUMMARIZE: {
-      assert( operand == nullptr );
-      try {
-	triggerStatisticsSummaries();
+      if (dest_threshold == empty_String) {  // change log 34
+        dest_threshold = default_pset_threshold;
       }
-      catch(cms::Exception& e)
-	{
-	  std::cerr << "MessageLoggerScribe caught exception "
-	       << "during summarize:\n"
-	       << e.what() << "\n";
-	}
-      catch(...)
-	{
-	  std::cerr << "MessageLoggerScribe caught unkonwn exception type "
-	       << "during summarize. (Ignored)\n";
-	}
-      break;
-    }
-    case MessageLoggerQ::JOBMODE:  {			// change log 24
-      std::string* jobMode_p =
-	      static_cast<std::string*>(operand);
-      JobMode jm = MessageLoggerDefaults::mode(*jobMode_p);
-      messageLoggerDefaults = 
-	value_ptr<MessageLoggerDefaults>(new MessageLoggerDefaults(jm));
-	      // Note - since messageLoggerDefaults is a value_ptr, 
-	      //        there is no concern about deleting here.
-      delete jobMode_p;  // dispose of the message text
-      			 // which will have been new-ed
-			 // in MessageLogger.cc (service version)
-      break;
-    }
-    case MessageLoggerQ::SHUT_UP:  {
-      assert( operand == nullptr );
-      active = false;
-      break;
-    }
-    case MessageLoggerQ::FLUSH_LOG_Q:  {			// changelog 26
-      if (singleThread) return;
-      ConfigurationHandshake * h_p = 
-	      static_cast<ConfigurationHandshake *>(operand);
-      job_pset_p = std::shared_ptr<PSet>(static_cast<PSet*>(h_p->p)); // propagate_const<T> has no reset() function
-      std::lock_guard<std::mutex> sl(h_p->m);   // get lock
-      h_p->c.notify_all();  // Signal to MessageLoggerQ that we are done
-      // finally, release the scoped lock by letting it go out of scope 
-      break;
-    }
-    case MessageLoggerQ::GROUP_STATS:  {			// change log 27
-      std::string* cat_p =
-	      static_cast<std::string*>(operand);
-      ELstatistics::noteGroupedCategory(*cat_p);
-      delete cat_p;  // dispose of the message text
-      break;
-    }
-    case MessageLoggerQ::FJR_SUMMARY:  {			// changelog 29
-      if (singleThread) {
-	std::map<std::string, double> * smp = 
-		static_cast<std::map<std::string, double> *>(operand);
-	triggerFJRmessageSummary(*smp);
-	break;
-      } else {
-	ConfigurationHandshake * h_p = 
-		static_cast<ConfigurationHandshake *>(operand);
-    std::lock_guard<std::mutex> sl(h_p->m);   // get lock
-	std::map<std::string, double> * smp = 
-		static_cast<std::map<std::string, double> *>(h_p->p);
-	triggerFJRmessageSummary(*smp);
-	h_p->c.notify_all();  // Signal to MessageLoggerQ that we are done
-	// finally, release the scoped lock by letting it go out of scope 
-	break;
+      if (dest_threshold == empty_String) {
+        dest_threshold = messageLoggerDefaults->threshold(filename);
+      }
+      if (dest_threshold == empty_String)
+        dest_threshold = COMMON_DEFAULT_THRESHOLD;
+      ELseverityLevel threshold_sev(dest_threshold);
+      dest_ctrl->setThreshold(threshold_sev);
+      // change log 37
+      if (threshold_sev <= ELseverityLevel::ELsev_success) {
+        edm::MessageDrop::debugAlwaysSuppressed = false;
+      }
+      if (threshold_sev <= ELseverityLevel::ELsev_info) {
+        edm::MessageDrop::infoAlwaysSuppressed = false;
+      }
+      if (threshold_sev <= ELseverityLevel::ELsev_warning) {
+        edm::MessageDrop::warningAlwaysSuppressed = false;
       }
-    }
-  }  // switch
-
-}  // MessageLoggerScribe::runCommand(opcode, operand)
-
-void MessageLoggerScribe::log ( ErrorObj *  errorobj_p ) {
-  std::vector<std::string> categories;
-  parseCategories(errorobj_p->xid().id, categories);
-  for (unsigned int icat = 0; icat < categories.size(); ++icat) {
-    errorobj_p->setID(categories[icat]);
-    admin_p->log( *errorobj_p );  // route the message text
-  } 
-}
-
-void
-  MessageLoggerScribe::configure_errorlog()
-{
-  vString  empty_vString;
-  String   empty_String;
-  PSet     empty_PSet;
-  
-  // The following is present to test pre-configuration message handling:
-  String preconfiguration_message 
-       = getAparameter<String>
-       	(*job_pset_p, "generate_preconfiguration_message", empty_String);
-  if (preconfiguration_message != empty_String) {
-    // To test a preconfiguration message without first going thru the 
-    // configuration we are about to do, we issue the message (so it sits
-    // on the queue), then copy the processing that the LOG_A_MESSAGE case
-    // does.  We suppress the timestamp to allow for automated unit testing.
-    early_dest->suppressTime();
-    LogError ("preconfiguration") << preconfiguration_message;
-    if (!singleThread) {
-      MessageLoggerQ::OpCode  opcode;
-      void *                  operand;
-      m_queue->consume(opcode, operand);  // grab next work item from Q
-      assert (opcode == MessageLoggerQ::LOG_A_MESSAGE);
-      ErrorObj *  errorobj_p = static_cast<ErrorObj *>(operand);
-      log (errorobj_p);        
-      delete errorobj_p;  // dispose of the message text
-    }
-  }
-
-  if ( !stream_ps.empty() ) {
-    LogWarning ("multiLogConfig") 
-    	<< "The message logger has been configured multiple times"; 
-    clean_slate_configuration = false;				// Change Log 22
-  }
-  configure_ordinary_destinations();				// Change Log 16
-  configure_statistics();					// Change Log 16
-}  // MessageLoggerScribe::configure_errorlog()
-
-
-
-
-void
-  MessageLoggerScribe::configure_dest( std::shared_ptr<ELdestination> dest_ctrl
-                                     , String const &  filename
-				     )
-{
-  static const int NO_VALUE_SET = -45654;			// change log 2
-  vString  empty_vString;
-  PSet     empty_PSet;
-  String   empty_String;
-
-  // Defaults:							// change log 3a
-  const std::string COMMON_DEFAULT_THRESHOLD = "INFO";
-  const         int COMMON_DEFAULT_LIMIT     = NO_VALUE_SET; 
-  const         int COMMON_DEFAULT_INTERVAL  = NO_VALUE_SET; 	// change log 6
-  const         int COMMON_DEFAULT_TIMESPAN  = NO_VALUE_SET; 
-
-  char const*  severity_array[] = {"WARNING", "INFO", "ERROR", "DEBUG"};
-  vString const  severities(severity_array+0, severity_array+4);
-
-  // grab list of categories
-  vString  categories
-     = getAparameter<vString>(*job_pset_p, "categories", empty_vString);
-
-  // grab list of messageIDs -- these are a synonym for categories
-  // Note -- the use of messageIDs is deprecated in favor of categories
-  {
-    vString  messageIDs
-      = getAparameter<vString>(*job_pset_p, "messageIDs", empty_vString);
-
-  // combine the lists, not caring about possible duplicates (for now)
-    copy_all( messageIDs, std::back_inserter(categories) );
-  }  // no longer need messageIDs
-
-  // grab list of hardwired categories (hardcats) -- these are to be added
-  // to the list of categories -- change log 24
-  {
-    std::vector<std::string> hardcats = messageLoggerDefaults->categories;
-  // combine the lists, not caring about possible duplicates (for now)
-    copy_all( hardcats, std::back_inserter(categories) );
-  }  // no longer need hardcats
-
-  // grab default threshold common to all destinations
-  String default_threshold
-     = getAparameter<String>(*job_pset_p, "threshold", empty_String);
-     						// change log 3a
-						// change log 24
-
-  // grab default limit/interval/timespan common to all destinations/categories:
-  PSet  default_pset
-     = getAparameter<PSet>(*job_pset_p, "default", empty_PSet);
-  int  default_limit
-    = getAparameter<int>(default_pset, "limit", COMMON_DEFAULT_LIMIT);
-  int  default_interval
-    = getAparameter<int>(default_pset, "reportEvery", COMMON_DEFAULT_INTERVAL);
-    						// change log 6, 10
-  int  default_timespan
-    = getAparameter<int>(default_pset, "timespan", COMMON_DEFAULT_TIMESPAN);
-						// change log 2a
-    						// change log 3a
-  String default_pset_threshold				
-     = getAparameter<String>(default_pset, "threshold", default_threshold);
-     						// change log 34
-					
-  // grab all of this destination's parameters:
-  PSet  dest_pset = getAparameter<PSet>(*job_pset_p, filename, empty_PSet);
-
-  // See if this is just a placeholder			// change log 9
-  bool is_placeholder 
-      = getAparameter<bool>(dest_pset, "placeholder", false);
-  if (is_placeholder) return;
-  
-  // grab this destination's default limit/interval/timespan:
-  PSet  dest_default_pset
-     = getAparameter<PSet>(dest_pset, "default", empty_PSet);
-  int  dest_default_limit
-    = getAparameter<int>(dest_default_pset, "limit", default_limit);
-  int  dest_default_interval
-    = getAparameter<int>(dest_default_pset, "reportEvery", default_interval);
-    						// change log 6
-  int  dest_default_timespan
-    = getAparameter<int>(dest_default_pset, "timespan", default_timespan);
-    						// change log 1a
-  if ( dest_default_limit != NO_VALUE_SET ) {
-    if ( dest_default_limit < 0 ) dest_default_limit = 2000000000;
-    dest_ctrl->setLimit("*", dest_default_limit );
-  } 						// change log 1b, 2a, 2b
-  if ( dest_default_interval != NO_VALUE_SET ) {  // change log 6
-    dest_ctrl->setInterval("*", dest_default_interval );
-  } 						
-  if ( dest_default_timespan != NO_VALUE_SET ) {
-    if ( dest_default_timespan < 0 ) dest_default_timespan = 2000000000;
-    dest_ctrl->setTimespan("*", dest_default_timespan );
-  } 						// change log 1b, 2a, 2b
-    						  
-  // establish this destination's threshold:
-  String dest_threshold
-     = getAparameter<String>(dest_pset, "threshold", default_threshold);
-  if (dest_threshold == empty_String) {  
-    dest_threshold = default_threshold;
-  }
-  if (dest_threshold == empty_String) {			// change log 34
-      dest_threshold = default_pset_threshold;
-  }
-  if (dest_threshold == empty_String) {
-    dest_threshold = messageLoggerDefaults->threshold(filename);
-  }
-  if (dest_threshold == empty_String) dest_threshold = COMMON_DEFAULT_THRESHOLD;
-  ELseverityLevel  threshold_sev(dest_threshold);
-  dest_ctrl->setThreshold(threshold_sev);
-  // change log 37
-  if (threshold_sev <= ELseverityLevel::ELsev_success) 
-  	{ edm::MessageDrop::debugAlwaysSuppressed = false; }
-  if (threshold_sev <= ELseverityLevel::ELsev_info) 
-  	{ edm::MessageDrop::infoAlwaysSuppressed = false; }
-  if (threshold_sev <= ELseverityLevel::ELsev_warning) 
-  	{ edm::MessageDrop::warningAlwaysSuppressed = false; }
-
-  // establish this destination's limit/interval/timespan for each category:
-  for( vString::const_iterator id_it = categories.begin()
-     ; id_it != categories.end()
-     ; ++id_it
-     )
-  {
-    String  msgID = *id_it;
-    PSet default_category_pset 
-       = getAparameter<PSet>(default_pset, msgID, empty_PSet);	// change log 5
-    PSet  category_pset
-       = getAparameter<PSet>(dest_pset, msgID, default_category_pset);
-
-    int  category_default_limit 
-       = getAparameter<int>(default_category_pset, "limit", NO_VALUE_SET);
-    int  limit
-      = getAparameter<int>(category_pset, "limit", category_default_limit);
-    if (limit == NO_VALUE_SET) limit = dest_default_limit;
-       								// change log 7 
-    int  category_default_interval 
-       = getAparameter<int>(default_category_pset, "reportEvery", NO_VALUE_SET);
-    int  interval
-      = getAparameter<int>(category_pset, "reportEvery",category_default_interval);
-    if (interval == NO_VALUE_SET) interval = dest_default_interval;
-      						// change log 6  and then 7
-    int  category_default_timespan 
-       = getAparameter<int>(default_category_pset, "timespan", NO_VALUE_SET);
-    int  timespan
-      = getAparameter<int>(category_pset, "timespan", category_default_timespan);
-    if (timespan == NO_VALUE_SET) timespan = dest_default_timespan;
-       								// change log 7 
-
-    const std::string& category = msgID;
-    if ( limit     == NO_VALUE_SET )  {				// change log 24
-       limit = messageLoggerDefaults->limit(filename,category);
-    }  
-    if ( interval     == NO_VALUE_SET )  {			// change log 24
-       interval = messageLoggerDefaults->reportEvery(filename,category);
-    }  
-    if ( timespan     == NO_VALUE_SET )  {			// change log 24
-       timespan = messageLoggerDefaults->timespan(filename,category);
-    }  
-     
-    if( limit     != NO_VALUE_SET )  {
-      if ( limit < 0 ) limit = 2000000000;  
-      dest_ctrl->setLimit(msgID, limit);
-    }  						// change log 2a, 2b
-    if( interval  != NO_VALUE_SET )  {
-      dest_ctrl->setInterval(msgID, interval);
-    }  						// change log 6
-    if( timespan  != NO_VALUE_SET )  {
-      if ( timespan < 0 ) timespan = 2000000000;  
-      dest_ctrl->setTimespan(msgID, timespan);
-    }						// change log 2a, 2b
-						
-  }  // for
-
-  // establish this destination's limit for each severity:
-  for( vString::const_iterator sev_it = severities.begin()
-     ; sev_it != severities.end()
-     ; ++sev_it
-     )
-  {
-    String  sevID = *sev_it;
-    ELseverityLevel  severity(sevID);
-    PSet  default_sev_pset 
-    	= getAparameter<PSet>(default_pset, sevID, empty_PSet);
-    PSet  sev_pset 
-    	= getAparameter<PSet>(dest_pset, sevID, default_sev_pset);
-						// change log 5
-    int  limit     = getAparameter<int>(sev_pset, "limit", NO_VALUE_SET);
-    if ( limit     == NO_VALUE_SET )  {				// change log 24
-       limit = messageLoggerDefaults->sev_limit(filename,sevID);
-    }  
-    if( limit    != NO_VALUE_SET )  {
-      if (limit < 0) limit = 2000000000;			// change log 38
-      dest_ctrl->setLimit(severity, limit   );
-    }
-    int  interval  = getAparameter<int>(sev_pset, "reportEvery", NO_VALUE_SET);
-    if ( interval     == NO_VALUE_SET )  {			// change log 24
-       interval = messageLoggerDefaults->sev_reportEvery(filename,sevID);
-    }  
-    if( interval != NO_VALUE_SET )  dest_ctrl->setInterval(severity, interval);
-						// change log 2
-    int  timespan  = getAparameter<int>(sev_pset, "timespan", NO_VALUE_SET);
-    if ( timespan     == NO_VALUE_SET )  {			// change log 24
-       timespan = messageLoggerDefaults->sev_timespan(filename,sevID);
-    }  
-    if( timespan    != NO_VALUE_SET )  {
-      if (timespan < 0) timespan = 2000000000;			// change log 38
-      dest_ctrl->setTimespan(severity, timespan   );
-    }
-  }  // for
-
-  // establish this destination's linebreak policy:
-  bool noLineBreaks_default 
-  	= getAparameter<bool> (default_pset, "noLineBreaks", false);
-						// change log 5
-  bool noLineBreaks 
-  	= getAparameter<bool> (dest_pset, "noLineBreaks", noLineBreaks_default);
-  if (noLineBreaks) {
-    dest_ctrl->setLineLength(32000);
-  }
-  else {
-    int  lenDef = 80;
-    int  lineLen_default
-    	 = getAparameter<int> (default_pset, "lineLength", lenDef);
-						// change log 5
-    int  lineLen = getAparameter<int> (dest_pset, "lineLength", lineLen_default);
-    if (lineLen != lenDef) {
-      dest_ctrl->setLineLength(lineLen);
-    }
-  }
-
-  // if indicated, suppress time stamps in this destination's output
-  bool suppressTime_default 
-  	= getAparameter<bool> (default_pset, "noTimeStamps", false);
-  bool suppressTime 
-  	= getAparameter<bool> (dest_pset, "noTimeStamps", suppressTime_default);
-  if (suppressTime) {
-    dest_ctrl->suppressTime();
-  }
-
-}  // MessageLoggerScribe::configure_dest()
-
-void
-  MessageLoggerScribe::configure_ordinary_destinations()	// Changelog 16
-{
-  vString  empty_vString;
-  String   empty_String;
-  PSet     empty_PSet;
-
-  // Initialize unversal suppression variables
-  MessageDrop::debugAlwaysSuppressed=true;		// change log 37
-  MessageDrop::infoAlwaysSuppressed=true;	 	// change log 37
-  MessageDrop::warningAlwaysSuppressed=true; 		// change log 37
-
-  // grab list of destinations:
-  vString  destinations
-     = getAparameter<vString>(*job_pset_p, "destinations", empty_vString);
-
-  // Use the default list of destinations if and only if the grabbed list is
-  // empty						 	// change log 24
-  if (destinations.empty()) {
-    destinations = messageLoggerDefaults->destinations;
-  }
-  
-  // dial down the early destination if other dest's are supplied:
-  if( ! destinations.empty() )
-    early_dest->setThreshold(ELhighestSeverity);
-
-  // establish each destination:
-  for( vString::const_iterator it = destinations.begin()
-     ; it != destinations.end()
-     ; ++it
-     )
-  {
-    String filename = *it;
-    String psetname = filename;
-    
-    // check that this destination is not just a placeholder // change log 11
-    PSet  dest_pset = getAparameter<PSet>(*job_pset_p, psetname, empty_PSet);
-    bool is_placeholder 
-	= getAparameter<bool>(dest_pset, "placeholder", false);
-    if (is_placeholder) continue;
-
-    // Modify the file name if extension or name is explicitly specified
-    // change log 14 
-
-    // Although for an ordinary destination there is no output attribute
-    // for the cfg (you can use filename instead) we provide output() for
-    // uniformity with the statistics destinations.  The "right way" to
-    // work this would have been to provide a filename() method, along with 
-    // an extension() method.  We recognize the potential name confusion here
-    // (filename(filename))!
-    
-    // Determine the destination file name to use if no explicit filename is
-    // supplied in the cfg.
-    String filename_default 
-        = getAparameter<String>(dest_pset, "output", empty_String);
-    if ( filename_default == empty_String ) {
-      filename_default = messageLoggerDefaults->output(psetname); // change log 31
-      if (filename_default  == empty_String) {
-        filename_default  = filename;
-      }        
-    }
 
-    String explicit_filename 
-        = getAparameter<String>(dest_pset, "filename", filename_default);
-    if (explicit_filename != empty_String) filename = explicit_filename;
-    String explicit_extension 
-        = getAparameter<String>(dest_pset, "extension", empty_String);
-    if (explicit_extension != empty_String) {
-      if (explicit_extension[0] == '.') {
-	filename += explicit_extension;             
+      // establish this destination's limit/interval/timespan for each category:
+      for (vString::const_iterator id_it = categories.begin(); id_it != categories.end(); ++id_it) {
+        String msgID = *id_it;
+        PSet default_category_pset = getAparameter<PSet>(default_pset, msgID, empty_PSet);  // change log 5
+        PSet category_pset = getAparameter<PSet>(dest_pset, msgID, default_category_pset);
+
+        int category_default_limit = getAparameter<int>(default_category_pset, "limit", NO_VALUE_SET);
+        int limit = getAparameter<int>(category_pset, "limit", category_default_limit);
+        if (limit == NO_VALUE_SET)
+          limit = dest_default_limit;
+        // change log 7
+        int category_default_interval = getAparameter<int>(default_category_pset, "reportEvery", NO_VALUE_SET);
+        int interval = getAparameter<int>(category_pset, "reportEvery", category_default_interval);
+        if (interval == NO_VALUE_SET)
+          interval = dest_default_interval;
+        // change log 6  and then 7
+        int category_default_timespan = getAparameter<int>(default_category_pset, "timespan", NO_VALUE_SET);
+        int timespan = getAparameter<int>(category_pset, "timespan", category_default_timespan);
+        if (timespan == NO_VALUE_SET)
+          timespan = dest_default_timespan;
+        // change log 7
+
+        const std::string& category = msgID;
+        if (limit == NO_VALUE_SET) {  // change log 24
+          limit = messageLoggerDefaults->limit(filename, category);
+        }
+        if (interval == NO_VALUE_SET) {  // change log 24
+          interval = messageLoggerDefaults->reportEvery(filename, category);
+        }
+        if (timespan == NO_VALUE_SET) {  // change log 24
+          timespan = messageLoggerDefaults->timespan(filename, category);
+        }
+
+        if (limit != NO_VALUE_SET) {
+          if (limit < 0)
+            limit = 2000000000;
+          dest_ctrl->setLimit(msgID, limit);
+        }  // change log 2a, 2b
+        if (interval != NO_VALUE_SET) {
+          dest_ctrl->setInterval(msgID, interval);
+        }  // change log 6
+        if (timespan != NO_VALUE_SET) {
+          if (timespan < 0)
+            timespan = 2000000000;
+          dest_ctrl->setTimespan(msgID, timespan);
+        }  // change log 2a, 2b
+
+      }  // for
+
+      // establish this destination's limit for each severity:
+      for (vString::const_iterator sev_it = severities.begin(); sev_it != severities.end(); ++sev_it) {
+        String sevID = *sev_it;
+        ELseverityLevel severity(sevID);
+        PSet default_sev_pset = getAparameter<PSet>(default_pset, sevID, empty_PSet);
+        PSet sev_pset = getAparameter<PSet>(dest_pset, sevID, default_sev_pset);
+        // change log 5
+        int limit = getAparameter<int>(sev_pset, "limit", NO_VALUE_SET);
+        if (limit == NO_VALUE_SET) {  // change log 24
+          limit = messageLoggerDefaults->sev_limit(filename, sevID);
+        }
+        if (limit != NO_VALUE_SET) {
+          if (limit < 0)
+            limit = 2000000000;  // change log 38
+          dest_ctrl->setLimit(severity, limit);
+        }
+        int interval = getAparameter<int>(sev_pset, "reportEvery", NO_VALUE_SET);
+        if (interval == NO_VALUE_SET) {  // change log 24
+          interval = messageLoggerDefaults->sev_reportEvery(filename, sevID);
+        }
+        if (interval != NO_VALUE_SET)
+          dest_ctrl->setInterval(severity, interval);
+        // change log 2
+        int timespan = getAparameter<int>(sev_pset, "timespan", NO_VALUE_SET);
+        if (timespan == NO_VALUE_SET) {  // change log 24
+          timespan = messageLoggerDefaults->sev_timespan(filename, sevID);
+        }
+        if (timespan != NO_VALUE_SET) {
+          if (timespan < 0)
+            timespan = 2000000000;  // change log 38
+          dest_ctrl->setTimespan(severity, timespan);
+        }
+      }  // for
+
+      // establish this destination's linebreak policy:
+      bool noLineBreaks_default = getAparameter<bool>(default_pset, "noLineBreaks", false);
+      // change log 5
+      bool noLineBreaks = getAparameter<bool>(dest_pset, "noLineBreaks", noLineBreaks_default);
+      if (noLineBreaks) {
+        dest_ctrl->setLineLength(32000);
       } else {
-	filename = filename + "." + explicit_extension;   
+        int lenDef = 80;
+        int lineLen_default = getAparameter<int>(default_pset, "lineLength", lenDef);
+        // change log 5
+        int lineLen = getAparameter<int>(dest_pset, "lineLength", lineLen_default);
+        if (lineLen != lenDef) {
+          dest_ctrl->setLineLength(lineLen);
+        }
       }
-    }
 
-    // Attach a default extension of .log if there is no extension on a file
-    // change log 18 - this had been done in concert with attaching destination
-    
-    std::string actual_filename = filename;			// change log 4
-    if ( (filename != "cout") && (filename != "cerr") )  {
-      const std::string::size_type npos = std::string::npos;
-      if ( filename.find('.') == npos ) {
-        actual_filename += ".log";
-      }  
-    }
+      // if indicated, suppress time stamps in this destination's output
+      bool suppressTime_default = getAparameter<bool>(default_pset, "noTimeStamps", false);
+      bool suppressTime = getAparameter<bool>(dest_pset, "noTimeStamps", suppressTime_default);
+      if (suppressTime) {
+        dest_ctrl->suppressTime();
+      }
 
-     // Check that this is not a duplicate name			// change log 18
-    if ( stream_ps.find(actual_filename)!=stream_ps.end() ) {        
-      if (clean_slate_configuration) {				// change log 22
-//        throw edm::Exception ( edm::errors::Configuration )   
-        LogError("duplicateDestination")			// change log 35
-        <<"Duplicate name for a MessageLogger Destination: " 
-        << actual_filename
-        << "\n" << "Only the first configuration instructions are used";
-	continue;
-      } else {
-        LogWarning("duplicateDestination")
-        <<"Duplicate name for a MessageLogger Destination: " 
-        << actual_filename
-        << "\n" << "Only original configuration instructions are used";
-        continue;
+    }  // MessageLoggerScribe::configure_dest()
+
+    void MessageLoggerScribe::configure_ordinary_destinations()  // Changelog 16
+    {
+      vString empty_vString;
+      String empty_String;
+      PSet empty_PSet;
+
+      // Initialize unversal suppression variables
+      MessageDrop::debugAlwaysSuppressed = true;    // change log 37
+      MessageDrop::infoAlwaysSuppressed = true;     // change log 37
+      MessageDrop::warningAlwaysSuppressed = true;  // change log 37
+
+      // grab list of destinations:
+      vString destinations = getAparameter<vString>(*job_pset_p, "destinations", empty_vString);
+
+      // Use the default list of destinations if and only if the grabbed list is
+      // empty						 	// change log 24
+      if (destinations.empty()) {
+        destinations = messageLoggerDefaults->destinations;
       }
-    } 
-    
-    ordinary_destination_filenames.push_back(actual_filename);
-
-    // attach the current destination, keeping a control handle to it:
-    std::shared_ptr<ELdestination> dest_ctrl;
-    if( actual_filename == "cout" )  {
-      dest_ctrl = std::make_shared<ELoutput>(std::cout);
-      admin_p->attach( dest_ctrl );
-      stream_ps["cout"] = &std::cout;
-    }
-    else if( actual_filename == "cerr" )  {
-      early_dest->setThreshold(ELzeroSeverity); 
-      dest_ctrl = early_dest;
-      stream_ps["cerr"] = &std::cerr;
-    }
-    else  {
-      auto os_sp = std::make_shared<std::ofstream>(actual_filename.c_str());
-      file_ps.push_back(os_sp);
-      dest_ctrl = std::make_shared<ELoutput>(*os_sp);
-      admin_p->attach( dest_ctrl );
-      stream_ps[actual_filename] = os_sp.get();
-    }
 
-    // now configure this destination:
-    configure_dest(dest_ctrl, psetname);
-
-  }  // for [it = destinations.begin() to end()]
-
-} // configure_ordinary_destinations
-
-
-void
-  MessageLoggerScribe::configure_statistics()
-{
-  vString  empty_vString;
-  String   empty_String;
-  PSet     empty_PSet;
-
-  // grab list of statistics destinations:
-  vString  statistics 
-     = getAparameter<vString>(*job_pset_p, "statistics", empty_vString);
-  
-  bool no_statistics_configured = statistics.empty();		// change log 24
-  
-  if ( no_statistics_configured ) {
-    // Read the list of staistics destinations from hardwired defaults,
-    // but only if there is also no list of ordinary destinations.
-    // (If a cfg specifies destinations, and no statistics, assume that
-    // is what the user wants.)
-    vString  destinations
-     = getAparameter<vString>(*job_pset_p, "destinations", empty_vString);
-    if (destinations.empty()) { 
-      statistics = messageLoggerDefaults->statistics;
-      no_statistics_configured = statistics.empty();
-    }
-  }
-
-   // establish each statistics destination:
-  for( vString::const_iterator it = statistics.begin()
-     ; it != statistics.end()
-     ; ++it
-     )
-  {
-    String statname = *it;
-    const String& psetname = statname;
-
-    // check that this destination is not just a placeholder // change log 20
-    PSet  stat_pset = getAparameter<PSet>(*job_pset_p, psetname, empty_PSet);
-    bool is_placeholder 
-	= getAparameter<bool>(stat_pset, "placeholder", false);
-    if (is_placeholder) continue;
-
-    // Determine the destination file name
-    String filename 
-        = getAparameter<String>(stat_pset, "output", empty_String);
-    if ( filename == empty_String ) {
-      filename = messageLoggerDefaults->output(psetname);	// change log 31
-      if (filename == empty_String) {
-        filename = statname;
-      }        
-    }
+      // dial down the early destination if other dest's are supplied:
+      if (!destinations.empty())
+        early_dest->setThreshold(ELhighestSeverity);
 
-    // Modify the file name if extension or name is explicitly specified
-    // change log 14 -- probably suspenders and a belt, because ouput option
-    // is present, but uniformity is nice.
-					
-    String explicit_filename 
-        = getAparameter<String>(stat_pset, "filename", filename);
-    if (explicit_filename != empty_String) filename = explicit_filename;
-    String explicit_extension 
-        = getAparameter<String>(stat_pset, "extension", empty_String);
-    if (explicit_extension != empty_String) {
-      if (explicit_extension[0] == '.') {
-	filename += explicit_extension;             
-      } else {
-	filename = filename + "." + explicit_extension;   
+      // establish each destination:
+      for (vString::const_iterator it = destinations.begin(); it != destinations.end(); ++it) {
+        String filename = *it;
+        String psetname = filename;
+
+        // check that this destination is not just a placeholder // change log 11
+        PSet dest_pset = getAparameter<PSet>(*job_pset_p, psetname, empty_PSet);
+        bool is_placeholder = getAparameter<bool>(dest_pset, "placeholder", false);
+        if (is_placeholder)
+          continue;
+
+        // Modify the file name if extension or name is explicitly specified
+        // change log 14
+
+        // Although for an ordinary destination there is no output attribute
+        // for the cfg (you can use filename instead) we provide output() for
+        // uniformity with the statistics destinations.  The "right way" to
+        // work this would have been to provide a filename() method, along with
+        // an extension() method.  We recognize the potential name confusion here
+        // (filename(filename))!
+
+        // Determine the destination file name to use if no explicit filename is
+        // supplied in the cfg.
+        String filename_default = getAparameter<String>(dest_pset, "output", empty_String);
+        if (filename_default == empty_String) {
+          filename_default = messageLoggerDefaults->output(psetname);  // change log 31
+          if (filename_default == empty_String) {
+            filename_default = filename;
+          }
+        }
+
+        String explicit_filename = getAparameter<String>(dest_pset, "filename", filename_default);
+        if (explicit_filename != empty_String)
+          filename = explicit_filename;
+        String explicit_extension = getAparameter<String>(dest_pset, "extension", empty_String);
+        if (explicit_extension != empty_String) {
+          if (explicit_extension[0] == '.') {
+            filename += explicit_extension;
+          } else {
+            filename = filename + "." + explicit_extension;
+          }
+        }
+
+        // Attach a default extension of .log if there is no extension on a file
+        // change log 18 - this had been done in concert with attaching destination
+
+        std::string actual_filename = filename;  // change log 4
+        if ((filename != "cout") && (filename != "cerr")) {
+          const std::string::size_type npos = std::string::npos;
+          if (filename.find('.') == npos) {
+            actual_filename += ".log";
+          }
+        }
+
+        // Check that this is not a duplicate name			// change log 18
+        if (stream_ps.find(actual_filename) != stream_ps.end()) {
+          if (clean_slate_configuration) {    // change log 22
+                                              //        throw edm::Exception ( edm::errors::Configuration )
+            LogError("duplicateDestination")  // change log 35
+                << "Duplicate name for a MessageLogger Destination: " << actual_filename << "\n"
+                << "Only the first configuration instructions are used";
+            continue;
+          } else {
+            LogWarning("duplicateDestination")
+                << "Duplicate name for a MessageLogger Destination: " << actual_filename << "\n"
+                << "Only original configuration instructions are used";
+            continue;
+          }
+        }
+
+        ordinary_destination_filenames.push_back(actual_filename);
+
+        // attach the current destination, keeping a control handle to it:
+        std::shared_ptr<ELdestination> dest_ctrl;
+        if (actual_filename == "cout") {
+          dest_ctrl = std::make_shared<ELoutput>(std::cout);
+          admin_p->attach(dest_ctrl);
+          stream_ps["cout"] = &std::cout;
+        } else if (actual_filename == "cerr") {
+          early_dest->setThreshold(ELzeroSeverity);
+          dest_ctrl = early_dest;
+          stream_ps["cerr"] = &std::cerr;
+        } else {
+          auto os_sp = std::make_shared<std::ofstream>(actual_filename.c_str());
+          file_ps.push_back(os_sp);
+          dest_ctrl = std::make_shared<ELoutput>(*os_sp);
+          admin_p->attach(dest_ctrl);
+          stream_ps[actual_filename] = os_sp.get();
+        }
+
+        // now configure this destination:
+        configure_dest(dest_ctrl, psetname);
+
+      }  // for [it = destinations.begin() to end()]
+
+    }  // configure_ordinary_destinations
+
+    void MessageLoggerScribe::configure_statistics() {
+      vString empty_vString;
+      String empty_String;
+      PSet empty_PSet;
+
+      // grab list of statistics destinations:
+      vString statistics = getAparameter<vString>(*job_pset_p, "statistics", empty_vString);
+
+      bool no_statistics_configured = statistics.empty();  // change log 24
+
+      if (no_statistics_configured) {
+        // Read the list of staistics destinations from hardwired defaults,
+        // but only if there is also no list of ordinary destinations.
+        // (If a cfg specifies destinations, and no statistics, assume that
+        // is what the user wants.)
+        vString destinations = getAparameter<vString>(*job_pset_p, "destinations", empty_vString);
+        if (destinations.empty()) {
+          statistics = messageLoggerDefaults->statistics;
+          no_statistics_configured = statistics.empty();
+        }
       }
-    }
 
-    // Attach a default extension of .log if there is no extension on a file
-    // change log 18 - this had been done in concert with attaching destination
-    
-    std::string actual_filename = filename;			// change log 4
-    if ( (filename != "cout") && (filename != "cerr") )  {	// change log 23
+      // establish each statistics destination:
+      for (vString::const_iterator it = statistics.begin(); it != statistics.end(); ++it) {
+        String statname = *it;
+        const String& psetname = statname;
+
+        // check that this destination is not just a placeholder // change log 20
+        PSet stat_pset = getAparameter<PSet>(*job_pset_p, psetname, empty_PSet);
+        bool is_placeholder = getAparameter<bool>(stat_pset, "placeholder", false);
+        if (is_placeholder)
+          continue;
+
+        // Determine the destination file name
+        String filename = getAparameter<String>(stat_pset, "output", empty_String);
+        if (filename == empty_String) {
+          filename = messageLoggerDefaults->output(psetname);  // change log 31
+          if (filename == empty_String) {
+            filename = statname;
+          }
+        }
+
+        // Modify the file name if extension or name is explicitly specified
+        // change log 14 -- probably suspenders and a belt, because ouput option
+        // is present, but uniformity is nice.
+
+        String explicit_filename = getAparameter<String>(stat_pset, "filename", filename);
+        if (explicit_filename != empty_String)
+          filename = explicit_filename;
+        String explicit_extension = getAparameter<String>(stat_pset, "extension", empty_String);
+        if (explicit_extension != empty_String) {
+          if (explicit_extension[0] == '.') {
+            filename += explicit_extension;
+          } else {
+            filename = filename + "." + explicit_extension;
+          }
+        }
+
+        // Attach a default extension of .log if there is no extension on a file
+        // change log 18 - this had been done in concert with attaching destination
+
+        std::string actual_filename = filename;              // change log 4
+        if ((filename != "cout") && (filename != "cerr")) {  // change log 23
+          const std::string::size_type npos = std::string::npos;
+          if (filename.find('.') == npos) {
+            actual_filename += ".log";
+          }
+        }
+
+        // Check that this is not a duplicate name -
+        // unless it is an ordinary destination (which stats can share)
+        if (!search_all(ordinary_destination_filenames, actual_filename)) {
+          if (stream_ps.find(actual_filename) != stream_ps.end()) {
+            if (clean_slate_configuration) {  // change log 22
+              throw edm::Exception(edm::errors::Configuration)
+                  << "Duplicate name for a MessageLogger Statistics Destination: " << actual_filename << "\n";
+            } else {
+              LogWarning("duplicateDestination")
+                  << "Duplicate name for a MessageLogger Statistics Destination: " << actual_filename << "\n"
+                  << "Only original configuration instructions are used";
+              continue;
+            }
+          }
+        }
+
+        // create (if statistics file does not match any destination file name)
+        // or note (if statistics file matches a destination file name) the ostream.
+        // But if no statistics destinations were provided in the config, do not
+        // create a new destination for this hardwired statistics - only act if
+        // it is matches a destination.  (shange log 24)
+        bool statistics_destination_is_real = !no_statistics_configured;
+        std::ostream* os_p;
+        if (stream_ps.find(actual_filename) == stream_ps.end()) {
+          if (actual_filename == "cout") {
+            os_p = &std::cout;
+          } else if (actual_filename == "cerr") {
+            os_p = &std::cerr;
+          } else {
+            auto os_sp = std::make_shared<std::ofstream>(actual_filename.c_str());
+            file_ps.push_back(os_sp);
+            os_p = os_sp.get();
+          }
+          stream_ps[actual_filename] = os_p;
+        } else {
+          statistics_destination_is_real = true;  // change log 24
+          os_p = stream_ps[actual_filename];
+        }
+
+        if (statistics_destination_is_real) {  // change log 24
+          // attach the statistics destination, keeping a control handle to it:
+          auto stat = std::make_shared<ELstatistics>(*os_p);
+          admin_p->attach(stat);
+          statisticsDestControls.push_back(stat);
+          bool reset = getAparameter<bool>(stat_pset, "reset", false);
+          statisticsResets.push_back(reset);
+
+          // now configure this destination:
+          configure_dest(stat, psetname);
+
+          // and suppress the desire to do an extra termination summary just because
+          // of end-of-job info messages
+          stat->noTerminationSummary();
+        }
+
+      }  // for [it = statistics.begin() to end()]
+
+    }  // configure_statistics
+
+    void MessageLoggerScribe::parseCategories(std::string const& s, std::vector<std::string>& cats) {
       const std::string::size_type npos = std::string::npos;
-      if ( filename.find('.') == npos ) {
-        actual_filename += ".log";
-      }  
+      std::string::size_type i = 0;
+      while (i != npos) {
+        std::string::size_type j = s.find('|', i);
+        cats.push_back(s.substr(i, j - i));
+        i = j;
+        while ((i != npos) && (s[i] == '|'))
+          ++i;
+        // the above handles cases of || and also | at end of string
+      }
+      // Note:  This algorithm assigns, as desired, one null category if it
+      //        encounters an empty categories string
     }
 
-    // Check that this is not a duplicate name - 
-    // unless it is an ordinary destination (which stats can share)
-    if ( !search_all(ordinary_destination_filenames, actual_filename) ) {
-      if ( stream_ps.find(actual_filename)!=stream_ps.end() ) {        
-        if (clean_slate_configuration) {			// change log 22
-          throw edm::Exception ( edm::errors::Configuration ) 
-          <<"Duplicate name for a MessageLogger Statistics Destination: " 
-          << actual_filename
-          << "\n";
-        } else {
-          LogWarning("duplicateDestination")
-          <<"Duplicate name for a MessageLogger Statistics Destination: " 
-          << actual_filename
-          << "\n" << "Only original configuration instructions are used";
-          continue;
-        } 
+    void MessageLoggerScribe::triggerStatisticsSummaries() {
+      assert(statisticsDestControls.size() == statisticsResets.size());
+      for (unsigned int i = 0; i != statisticsDestControls.size(); ++i) {
+        statisticsDestControls[i]->summary(0);
+        if (statisticsResets[i])
+          statisticsDestControls[i]->wipe();
       }
     }
-    
-    // create (if statistics file does not match any destination file name)
-    // or note (if statistics file matches a destination file name) the ostream.
-    // But if no statistics destinations were provided in the config, do not
-    // create a new destination for this hardwired statistics - only act if
-    // it is matches a destination.  (shange log 24)
-    bool statistics_destination_is_real = !no_statistics_configured;
-    std::ostream* os_p;
-    if ( stream_ps.find(actual_filename) == stream_ps.end() ) {
-      if ( actual_filename == "cout" ) {
-        os_p = &std::cout;
-      } else if ( actual_filename == "cerr" ) {
-        os_p = &std::cerr;
+
+    void MessageLoggerScribe::triggerFJRmessageSummary(std::map<std::string, double>& sm)  // ChangeLog 29
+    {
+      if (statisticsDestControls.empty()) {
+        sm["NoStatisticsDestinationsConfigured"] = 0.0;
       } else {
-        auto os_sp = std::make_shared<std::ofstream>(actual_filename.c_str());
-	file_ps.push_back(os_sp);
-        os_p = os_sp.get();
+        statisticsDestControls[0]->summaryForJobReport(sm);
       }
-      stream_ps[actual_filename] = os_p;
-    } else { 
-      statistics_destination_is_real = true;			// change log 24
-      os_p = stream_ps[actual_filename];
-    }
-       
-    if (statistics_destination_is_real)	{			// change log 24
-      // attach the statistics destination, keeping a control handle to it:
-      auto stat = std::make_shared<ELstatistics>(*os_p);
-      admin_p->attach( stat );
-      statisticsDestControls.push_back(stat);
-      bool reset = getAparameter<bool>(stat_pset, "reset", false);
-      statisticsResets.push_back(reset);
-    
-      // now configure this destination:
-      configure_dest(stat, psetname);
-
-      // and suppress the desire to do an extra termination summary just because
-      // of end-of-job info messages
-      stat->noTerminationSummary();
-    }
-     
-  }  // for [it = statistics.begin() to end()]
-
-} // configure_statistics
-
-void
-  MessageLoggerScribe::parseCategories (std::string const & s,
-  				        std::vector<std::string> & cats)
-{
-  const std::string::size_type npos = std::string::npos;
-        std::string::size_type i    = 0;
-  while ( i != npos ) {    
-    std::string::size_type j = s.find('|',i);   
-    cats.push_back (s.substr(i,j-i));
-    i = j;
-    while ( (i != npos) && (s[i] == '|') ) ++i; 
-    // the above handles cases of || and also | at end of string
-  } 
-  // Note:  This algorithm assigns, as desired, one null category if it
-  //        encounters an empty categories string
-}
-
-void
-  MessageLoggerScribe::triggerStatisticsSummaries() {
-    assert (statisticsDestControls.size() == statisticsResets.size());
-    for (unsigned int i = 0; i != statisticsDestControls.size(); ++i) {
-      statisticsDestControls[i]->summary( 0 );
-      if (statisticsResets[i]) statisticsDestControls[i]->wipe( );
     }
-}
-
-void
-  MessageLoggerScribe::
-  triggerFJRmessageSummary(std::map<std::string, double> & sm)  // ChangeLog 29
-{
-  if (statisticsDestControls.empty()) {
-    sm["NoStatisticsDestinationsConfigured"] = 0.0;
-  } else {
-    statisticsDestControls[0]->summaryForJobReport(sm);
-  }
-}
-
-
-
-} // end of namespace service  
-} // end of namespace edm  
 
+  }  // end of namespace service
+}  // end of namespace edm
diff --git a/FWCore/MessageService/src/MessageServicePSetValidation.cc b/FWCore/MessageService/src/MessageServicePSetValidation.cc
index 3e3a89a22715f..d93dff915f402 100644
--- a/FWCore/MessageService/src/MessageServicePSetValidation.cc
+++ b/FWCore/MessageService/src/MessageServicePSetValidation.cc
@@ -25,853 +25,797 @@ using namespace edm;
 using namespace edm::service;
 
 namespace edm {
-namespace service {
-
-std::string
-edm::service::MessageServicePSetValidation::
-operator() (ParameterSet const & pset)
-{
-  messageLoggerPSet (pset); 
-  return flaws.str();  
-}  // operator() to validate the PSet passed in
-
-void
-edm::service::MessageServicePSetValidation::
-messageLoggerPSet (ParameterSet const & pset) 
-{
-  // Four types of material are allowed at the MessageLogger level:
-  //   PSet lists (such as destinations or categories
-  //   Suppression lists, such as SuppressInfo or debugModules
-  //   General parameters, such as threshold or messageSummaryToJobReport
-  //   Nested PSets, such as those for each destination
-
-  // PSet lists
-
-  psetLists(pset);
-
-  // Suppression lists
-
-  suppressionLists(pset);
-
-  // No other vstrings
-  
-  vStringsCheck(pset, "MessageLogger");
-  
-  // General Parameters
-  
-  check<bool> 
-  	( pset, "MessageLogger", "messageSummaryToJobReport" );
-  std::string dumps = check<std::string> 
-  	( pset, "MessageLogger", "generate_preconfiguration_message" );
-  std::string thresh = check<std::string> 
-     	( pset, "MessageLogger", "threshold" );
-  if (!thresh.empty()) validateThreshold(thresh, "MessageLogger");
-  check<unsigned int>
-  ( pset, "MessageLogger", "waiting_threshold");
-  
-  // Nested PSets
-
-  destinationPSets(pset);
-  defaultPSet(pset);
-  statisticsPSets(pset);
-  fwkJobReportPSets(pset);
-  categoryPSets(pset, "MessageLogger");  
-
-  // No other PSets -- unless they contain optionalPSet or placeholder=True 
-
-  noOtherPsets (pset); 
-
-  // Nothing else -- look for int, unsigned int, bool, float, double, string
-
-  noneExcept <int> (pset, "MessageLogger", "int");
-  noneExcept <unsigned int> (pset, "MessageLogger", "unsigned int","waiting_threshold");
-  noneExcept <bool> (pset, "MessageLogger","bool","messageSummaryToJobReport");
-  	// Note - at this, the upper MessageLogger PSet level, the use of 
-	// optionalPSet makes no sense, so we are OK letting that be a flaw
-  noneExcept <float> (pset, "MessageLogger","float");
-  noneExcept <double> (pset, "MessageLogger","double");
-  noneExcept <std::string> (pset, "MessageLogger","string", 
-  		            "threshold", "generate_preconfiguration_message");
-
-  // Append explanatory information if flaws were found
-  
-  if (!flaws.str().empty()) {
-    flaws << "\nThe above are from MessageLogger configuration validation.\n"
-    << "In most cases, these involve lines that the logger configuration code\n"
-    << "would not process, but which the cfg creator obviously meant to have "
-    << "effect.\n";
-  }
-     
-} // messageLoggerPSet
-
-void 
-edm::service::MessageServicePSetValidation:: 
-psetLists ( ParameterSet const & pset ) 
-{
-  destinations = check<vString>
-  	(pset, "MessageLogger", "destinations");
-  noDuplicates(destinations,"MessageLogger", "destinations");
-  noKeywords(destinations,"MessageLogger", "destinations");
-  noNonPSetUsage(pset, destinations,"MessageLogger", "destinations");
-  // REMOVED: noCoutCerrClash(destinations,"MessageLogger", "destinations");
-
-  statistics = check<vString>
-  	(pset, "MessageLogger", "statistics");
-  noDuplicates(statistics,"MessageLogger", "statistics");
-  noKeywords(statistics,"MessageLogger", "statistics");
-  noNonPSetUsage(pset, statistics,"MessageLogger", "statistics");
-
-  fwkJobReports = check<vString>
-  	(pset, "MessageLogger", "fwkJobReports");
-  noDuplicates(fwkJobReports,"MessageLogger", "fwkJobReports");
-  noKeywords(fwkJobReports,"MessageLogger", "fwkJobReports");
-  noNonPSetUsage(pset, fwkJobReports,"MessageLogger", "fwkJobReports");
-  noDuplicates(fwkJobReports,destinations,
-  		"MessageLogger", "fwkJobReports","destinations");
-  noDuplicates(fwkJobReports,statistics,
-  		"MessageLogger", "fwkJobReports","statistics");
-
-  categories = check<vString>
-  	(pset, "MessageLogger", "categories");
-  noDuplicates(categories,"MessageLogger", "categories");
-  noKeywords(categories,"MessageLogger", "categories");
-  noNonPSetUsage(pset, categories,"MessageLogger", "categories");
-  noDuplicates(categories,destinations,
-  		"MessageLogger", "categories","destinations");
-  noDuplicates(categories,statistics,
-  		"MessageLogger", "categories","statistics");
-  noDuplicates(categories,fwkJobReports,
-  		"MessageLogger", "categories","fwkJobReports");
-
-  messageIDs = check<vString>
-  	(pset, "MessageLogger", "messageIDs");
-  noDuplicates(messageIDs,"MessageLogger", "messageIDs");
-  noKeywords(messageIDs,"MessageLogger", "messageIDs");
-  noNonPSetUsage(pset, messageIDs,"MessageLogger", "messageIDs");
-  noDuplicates(messageIDs,destinations,
-  		"MessageLogger", "messageIDs","destinations");
-  noDuplicates(messageIDs,statistics,
-  		"MessageLogger", "messageIDs","statistics");
-  noDuplicates(messageIDs,fwkJobReports,
-  		"MessageLogger", "messageIDs","fwkJobReports");
-  noDuplicates(messageIDs,fwkJobReports,
-  		"MessageLogger", "messageIDs","categories");
-
-} // psetLists
-
-void 
-edm::service::MessageServicePSetValidation:: 
-suppressionLists ( ParameterSet const & pset ) 
-{
-  debugModules = check<vString>
-  	(pset, "MessageLogger", "debugModules");
-  bool dmStar = wildcard(debugModules);
-  if ( dmStar && debugModules.size() != 1) {
-    flaws << "MessageLogger" << " PSet: \n"
-	  << "debugModules contains wildcard character *" 
-	  << " and also " << debugModules.size()-1 
-	  << " other entries - * must be alone\n";
-  } 
-  suppressDebug = check<vString>
-  	(pset, "MessageLogger", "suppressDebug");
-  if ( (!suppressDebug.empty())  && (!dmStar) ) {
-    flaws << "MessageLogger" << " PSet: \n"
-	  << "suppressDebug contains modules, but debugModules is not *\n"
-	  << "Unless all the debugModules are enabled,\n"
-	  << "suppressing specific modules is meaningless\n";  
-  }
-  if (wildcard(suppressDebug)) {
-    flaws << "MessageLogger" << " PSet: \n"
-	  << "Use of wildcard (*) in suppressDebug is not supported\n"
-	  << "By default, LogDebug is suppressed for all modules\n";
-  }
-  suppressInfo = check<vString>
-  	(pset, "MessageLogger", "suppressInfo");
-  if (wildcard(suppressInfo)) {
-    flaws << "MessageLogger" << " PSet: \n"
-	  << "Use of wildcard (*) in suppressInfo is not supported\n";
-  }
-  suppressWarning = check<vString>
-  	(pset, "MessageLogger", "suppressWarning");
-  if (wildcard(suppressWarning)) {
-    flaws << "MessageLogger" << " PSet: \n"
-	  << "Use of wildcard (*) in suppressWarning is not supported\n";
-  }
-  suppressError = check<vString>
-  	(pset, "MessageLogger", "suppressError");
-  if (wildcard(suppressError)) {
-    flaws << "MessageLogger" << " PSet: \n"
-	  << "Use of wildcard (*) in suppressError is not supported\n";
-  }
-
-} // suppressionLists
-
-
-void 
-edm::service::MessageServicePSetValidation:: 
-vStringsCheck ( ParameterSet const & pset,std::string const & /*psetName*/ ) 
-{
-  vString vStrings = pset.getParameterNamesForType <vString> (false); 
-  vString::const_iterator end = vStrings.end();
-  for ( vString::const_iterator i = vStrings.begin(); i != end; ++i ) {
-    if ( !allowedVstring(*i) ) {
-      flaws << "MessageLogger" << " PSet: \n"
-	    << (*i) << " is used as a vstring, "
-	    << "but no such vstring is recognized\n"; 
-    }
-  }
-  vStrings = pset.getParameterNamesForType <vString> (true); 
-  end = vStrings.end();
-  for ( vString::const_iterator i = vStrings.begin(); i != end; ++i ) {
-      flaws << "MessageLogger" << " PSet: \n"
-	    << (*i) << " is used as a tracked vstring: "
-	    << "tracked parameters not allowed here\n"; 
-  }
-} // vStringsCheck
-
-bool 
-edm::service::MessageServicePSetValidation:: 
-allowedVstring (std::string const & s)
-{
-  if (s == "destinations") 	return true;
-  if (s == "statistics") 	return true;
-  if (s == "destinations") 	return true;
-  if (s == "fwkJobReports") 	return true;
-  if (s == "categories") 	return true;
-  if (s == "messageIDs") 	return true;
-  if (s == "debugModules") 	return true;
-  if (s == "suppressInfo") 	return true;
-  if (s == "suppressDebug") 	return true;
-  if (s == "suppressWarning") 	return true;
-  if (s == "suppressError") 	return true;
-  return false;
-}  // allowedVstring
-
-
-
-bool 
-edm::service::MessageServicePSetValidation::  
-validateThreshold (std::string const & thresh, std::string const & psetName)
-{
-  if (checkThreshold(thresh)) return true;
-  flaws << psetName << " PSet: \n"
-	<< "threshold has value " << thresh 
-	<< " which is not among {DEBUG, INFO, WARNING, ERROR}\n";
-  return false;
-} // validateThreshold
-
-bool 
-edm::service::MessageServicePSetValidation::  
-checkThreshold (std::string const & thresh)
-{
-  if (thresh == "WARNING") 	return true;
-  if (thresh == "INFO") 	return true;
-  if (thresh == "ERROR") 	return true;
-  if (thresh == "DEBUG") 	return true;
-  return false;
-}  
-
-void
-edm::service::MessageServicePSetValidation::  
-noDuplicates(vString const & v, std::string const & psetName,
-             std::string  const & parameterLabel ) 
-{
-  vString::const_iterator end = v.end();
-  for (vString::const_iterator i = v.begin(); i != end; ++i) {
-    for (vString::const_iterator j = i+1; j != end; ++j)       {
-      if ( *i == *j ) {
-        flaws << psetName << " PSet: \n"
-	      << "in vString " << parameterLabel
-	      << " duplication of the string " << *i << "\n";
+  namespace service {
+
+    std::string edm::service::MessageServicePSetValidation::operator()(ParameterSet const& pset) {
+      messageLoggerPSet(pset);
+      return flaws.str();
+    }  // operator() to validate the PSet passed in
+
+    void edm::service::MessageServicePSetValidation::messageLoggerPSet(ParameterSet const& pset) {
+      // Four types of material are allowed at the MessageLogger level:
+      //   PSet lists (such as destinations or categories
+      //   Suppression lists, such as SuppressInfo or debugModules
+      //   General parameters, such as threshold or messageSummaryToJobReport
+      //   Nested PSets, such as those for each destination
+
+      // PSet lists
+
+      psetLists(pset);
+
+      // Suppression lists
+
+      suppressionLists(pset);
+
+      // No other vstrings
+
+      vStringsCheck(pset, "MessageLogger");
+
+      // General Parameters
+
+      check<bool>(pset, "MessageLogger", "messageSummaryToJobReport");
+      std::string dumps = check<std::string>(pset, "MessageLogger", "generate_preconfiguration_message");
+      std::string thresh = check<std::string>(pset, "MessageLogger", "threshold");
+      if (!thresh.empty())
+        validateThreshold(thresh, "MessageLogger");
+      check<unsigned int>(pset, "MessageLogger", "waiting_threshold");
+
+      // Nested PSets
+
+      destinationPSets(pset);
+      defaultPSet(pset);
+      statisticsPSets(pset);
+      fwkJobReportPSets(pset);
+      categoryPSets(pset, "MessageLogger");
+
+      // No other PSets -- unless they contain optionalPSet or placeholder=True
+
+      noOtherPsets(pset);
+
+      // Nothing else -- look for int, unsigned int, bool, float, double, string
+
+      noneExcept<int>(pset, "MessageLogger", "int");
+      noneExcept<unsigned int>(pset, "MessageLogger", "unsigned int", "waiting_threshold");
+      noneExcept<bool>(pset, "MessageLogger", "bool", "messageSummaryToJobReport");
+      // Note - at this, the upper MessageLogger PSet level, the use of
+      // optionalPSet makes no sense, so we are OK letting that be a flaw
+      noneExcept<float>(pset, "MessageLogger", "float");
+      noneExcept<double>(pset, "MessageLogger", "double");
+      noneExcept<std::string>(pset, "MessageLogger", "string", "threshold", "generate_preconfiguration_message");
+
+      // Append explanatory information if flaws were found
+
+      if (!flaws.str().empty()) {
+        flaws << "\nThe above are from MessageLogger configuration validation.\n"
+              << "In most cases, these involve lines that the logger configuration code\n"
+              << "would not process, but which the cfg creator obviously meant to have "
+              << "effect.\n";
       }
-    }
-  }
-} // noDuplicates(v)
-
-void
-edm::service::MessageServicePSetValidation::  
-noDuplicates(vString const & v1, vString const & v2, 
-             std::string const & psetName,
-	     std::string  const & p1, std::string  const & p2 )
-{
-  vString::const_iterator end1 = v1.end();
-  vString::const_iterator end2 = v2.end();
-  for (vString::const_iterator i = v1.begin(); i != end1; ++i) {
-    for (vString::const_iterator j = v2.begin(); j != end2; ++j) {
-      if ( *i == *j ) {
-        flaws << psetName << " PSet: \n"
-	      << "in vStrings " << p1 << " and " << p2
-	      << " duplication of the string " << *i << "\n";
+
+    }  // messageLoggerPSet
+
+    void edm::service::MessageServicePSetValidation::psetLists(ParameterSet const& pset) {
+      destinations = check<vString>(pset, "MessageLogger", "destinations");
+      noDuplicates(destinations, "MessageLogger", "destinations");
+      noKeywords(destinations, "MessageLogger", "destinations");
+      noNonPSetUsage(pset, destinations, "MessageLogger", "destinations");
+      // REMOVED: noCoutCerrClash(destinations,"MessageLogger", "destinations");
+
+      statistics = check<vString>(pset, "MessageLogger", "statistics");
+      noDuplicates(statistics, "MessageLogger", "statistics");
+      noKeywords(statistics, "MessageLogger", "statistics");
+      noNonPSetUsage(pset, statistics, "MessageLogger", "statistics");
+
+      fwkJobReports = check<vString>(pset, "MessageLogger", "fwkJobReports");
+      noDuplicates(fwkJobReports, "MessageLogger", "fwkJobReports");
+      noKeywords(fwkJobReports, "MessageLogger", "fwkJobReports");
+      noNonPSetUsage(pset, fwkJobReports, "MessageLogger", "fwkJobReports");
+      noDuplicates(fwkJobReports, destinations, "MessageLogger", "fwkJobReports", "destinations");
+      noDuplicates(fwkJobReports, statistics, "MessageLogger", "fwkJobReports", "statistics");
+
+      categories = check<vString>(pset, "MessageLogger", "categories");
+      noDuplicates(categories, "MessageLogger", "categories");
+      noKeywords(categories, "MessageLogger", "categories");
+      noNonPSetUsage(pset, categories, "MessageLogger", "categories");
+      noDuplicates(categories, destinations, "MessageLogger", "categories", "destinations");
+      noDuplicates(categories, statistics, "MessageLogger", "categories", "statistics");
+      noDuplicates(categories, fwkJobReports, "MessageLogger", "categories", "fwkJobReports");
+
+      messageIDs = check<vString>(pset, "MessageLogger", "messageIDs");
+      noDuplicates(messageIDs, "MessageLogger", "messageIDs");
+      noKeywords(messageIDs, "MessageLogger", "messageIDs");
+      noNonPSetUsage(pset, messageIDs, "MessageLogger", "messageIDs");
+      noDuplicates(messageIDs, destinations, "MessageLogger", "messageIDs", "destinations");
+      noDuplicates(messageIDs, statistics, "MessageLogger", "messageIDs", "statistics");
+      noDuplicates(messageIDs, fwkJobReports, "MessageLogger", "messageIDs", "fwkJobReports");
+      noDuplicates(messageIDs, fwkJobReports, "MessageLogger", "messageIDs", "categories");
+
+    }  // psetLists
+
+    void edm::service::MessageServicePSetValidation::suppressionLists(ParameterSet const& pset) {
+      debugModules = check<vString>(pset, "MessageLogger", "debugModules");
+      bool dmStar = wildcard(debugModules);
+      if (dmStar && debugModules.size() != 1) {
+        flaws << "MessageLogger"
+              << " PSet: \n"
+              << "debugModules contains wildcard character *"
+              << " and also " << debugModules.size() - 1 << " other entries - * must be alone\n";
       }
+      suppressDebug = check<vString>(pset, "MessageLogger", "suppressDebug");
+      if ((!suppressDebug.empty()) && (!dmStar)) {
+        flaws << "MessageLogger"
+              << " PSet: \n"
+              << "suppressDebug contains modules, but debugModules is not *\n"
+              << "Unless all the debugModules are enabled,\n"
+              << "suppressing specific modules is meaningless\n";
+      }
+      if (wildcard(suppressDebug)) {
+        flaws << "MessageLogger"
+              << " PSet: \n"
+              << "Use of wildcard (*) in suppressDebug is not supported\n"
+              << "By default, LogDebug is suppressed for all modules\n";
+      }
+      suppressInfo = check<vString>(pset, "MessageLogger", "suppressInfo");
+      if (wildcard(suppressInfo)) {
+        flaws << "MessageLogger"
+              << " PSet: \n"
+              << "Use of wildcard (*) in suppressInfo is not supported\n";
+      }
+      suppressWarning = check<vString>(pset, "MessageLogger", "suppressWarning");
+      if (wildcard(suppressWarning)) {
+        flaws << "MessageLogger"
+              << " PSet: \n"
+              << "Use of wildcard (*) in suppressWarning is not supported\n";
+      }
+      suppressError = check<vString>(pset, "MessageLogger", "suppressError");
+      if (wildcard(suppressError)) {
+        flaws << "MessageLogger"
+              << " PSet: \n"
+              << "Use of wildcard (*) in suppressError is not supported\n";
+      }
+
+    }  // suppressionLists
+
+    void edm::service::MessageServicePSetValidation::vStringsCheck(ParameterSet const& pset,
+                                                                   std::string const& /*psetName*/) {
+      vString vStrings = pset.getParameterNamesForType<vString>(false);
+      vString::const_iterator end = vStrings.end();
+      for (vString::const_iterator i = vStrings.begin(); i != end; ++i) {
+        if (!allowedVstring(*i)) {
+          flaws << "MessageLogger"
+                << " PSet: \n"
+                << (*i) << " is used as a vstring, "
+                << "but no such vstring is recognized\n";
+        }
+      }
+      vStrings = pset.getParameterNamesForType<vString>(true);
+      end = vStrings.end();
+      for (vString::const_iterator i = vStrings.begin(); i != end; ++i) {
+        flaws << "MessageLogger"
+              << " PSet: \n"
+              << (*i) << " is used as a tracked vstring: "
+              << "tracked parameters not allowed here\n";
+      }
+    }  // vStringsCheck
+
+    bool edm::service::MessageServicePSetValidation::allowedVstring(std::string const& s) {
+      if (s == "destinations")
+        return true;
+      if (s == "statistics")
+        return true;
+      if (s == "destinations")
+        return true;
+      if (s == "fwkJobReports")
+        return true;
+      if (s == "categories")
+        return true;
+      if (s == "messageIDs")
+        return true;
+      if (s == "debugModules")
+        return true;
+      if (s == "suppressInfo")
+        return true;
+      if (s == "suppressDebug")
+        return true;
+      if (s == "suppressWarning")
+        return true;
+      if (s == "suppressError")
+        return true;
+      return false;
+    }  // allowedVstring
+
+    bool edm::service::MessageServicePSetValidation::validateThreshold(std::string const& thresh,
+                                                                       std::string const& psetName) {
+      if (checkThreshold(thresh))
+        return true;
+      flaws << psetName << " PSet: \n"
+            << "threshold has value " << thresh << " which is not among {DEBUG, INFO, WARNING, ERROR}\n";
+      return false;
+    }  // validateThreshold
+
+    bool edm::service::MessageServicePSetValidation::checkThreshold(std::string const& thresh) {
+      if (thresh == "WARNING")
+        return true;
+      if (thresh == "INFO")
+        return true;
+      if (thresh == "ERROR")
+        return true;
+      if (thresh == "DEBUG")
+        return true;
+      return false;
     }
-  }
-} // noDuplicates(v1,v2)
-
-void
-edm::service::MessageServicePSetValidation::  
-noCoutCerrClash(vString const & v, std::string const & psetName,
-                std::string  const & parameterLabel ) 
-{
-  vString::const_iterator end = v.end();
-  bool coutPresent = false;
-  bool cerrPresent = false;
-  for (vString::const_iterator i = v.begin(); i != end; ++i) {
-    if ( *i == "cout" ) coutPresent = true;
-    if ( *i == "cerr" ) cerrPresent = true;
-  }
-  if (coutPresent && cerrPresent) {
-        flaws << psetName << " PSet: \n"
-	      << "vString " << parameterLabel
-	      << " has both cout and cerr \n";
-  }
-} // noCoutCerrClash(v)
-
-void
-edm::service::MessageServicePSetValidation::  
-noKeywords(vString const & v, std::string const & psetName,
-           std::string  const & parameterLabel ) 
-{
-  vString::const_iterator end = v.end();
-  for (vString::const_iterator i = v.begin(); i != end; ++i) {
-     if (!keywordCheck(*i)) {
-        flaws << psetName << " PSet: \n"
-	      << "vString " << parameterLabel
-	      << " should not contain the keyword " << *i << "\n";
-     }
-  }
-} // noKeywords(v)
-
-bool
-edm::service::MessageServicePSetValidation::  
-keywordCheck(std::string const & word)
-{
-  if (word == "default") 	return false;
-  if (word == "categories") 	return false;
-  if (word == "messageIDs") 	return false;
-  if (word == "fwkJobReports")	return false;
-  if (word == "destinations") 	return false;
-  if (word == "statistics") 	return false;
-  if (word == "debugModules") 	return false;
-  if (word == "suppressInfo") 	return false;
-  if (word == "suppressDebug") 	return false;
-  if (word == "suppressWarning")return false;
-  if (word == "suppressError")  return false;
-  if (word == "threshold") 	return false;
-  if (word == "ERROR") 		return false;
-  if (word == "WARNING") 	return false;
-  if (word == "INFO") 		return false;
-  if (word == "DEBUG") 		return false;
-  if (word == "placeholder") 	return false;
-  if (word == "limit") 		return false;
-  if (word == "reportEvery") 	return false;
-  if (word == "timespan") 	return false;
-  if (word == "noLineBreaks") 	return false;
-  if (word == "lineLength") 	return false;
-  if (word == "noTimeStamps") 	return false;
-  if (word == "output") 	return false;
-  if (word == "filename") 	return false;
-  if (word == "extension") 	return false;
-  if (word == "reset") 		return false;
-  if (word == "optionalPSet")	return false;
-  return true;
-} // keywordCheck
-
-void
-edm::service::MessageServicePSetValidation::  
-noNonPSetUsage(ParameterSet const & pset ,
-  	       vString const & v, std::string const & psetName,
-               std::string  const & parameterLabel ) 
-{
-  disallowedParam <int> ( pset, v, psetName, parameterLabel, "int" );
-  disallowedParam <unsigned int> ( pset, v, psetName, parameterLabel, "uint" );
-  disallowedParam <bool> ( pset, v, psetName, parameterLabel, "bool" );
-  disallowedParam <float> ( pset, v, psetName, parameterLabel, "float" );
-  disallowedParam <double> ( pset, v, psetName, parameterLabel, "double" );
-  disallowedParam <std::string> ( pset, v, psetName, parameterLabel, "string" );
-  disallowedParam <std::vector<std::string> > 
-  	( pset, v, psetName, parameterLabel, "vstring" );
-} // noNonPSetUsage
-
-void 
-edm::service::MessageServicePSetValidation::  
-noBadParams(vString const & v, vString const & params, 
-  	    std::string const & psetName, 
-	    std::string const & parameterLabel, 
-	    std::string const & type)
-{
-  vString::const_iterator end1 = v.end();
-  vString::const_iterator end2 = params.end();
-  for (vString::const_iterator i = v.begin(); i != end1; ++i) {
-    for (vString::const_iterator j = params.begin(); j != end2; ++j) {
-      if ( *i == *j ) {
+
+    void edm::service::MessageServicePSetValidation::noDuplicates(vString const& v,
+                                                                  std::string const& psetName,
+                                                                  std::string const& parameterLabel) {
+      vString::const_iterator end = v.end();
+      for (vString::const_iterator i = v.begin(); i != end; ++i) {
+        for (vString::const_iterator j = i + 1; j != end; ++j) {
+          if (*i == *j) {
+            flaws << psetName << " PSet: \n"
+                  << "in vString " << parameterLabel << " duplication of the string " << *i << "\n";
+          }
+        }
+      }
+    }  // noDuplicates(v)
+
+    void edm::service::MessageServicePSetValidation::noDuplicates(vString const& v1,
+                                                                  vString const& v2,
+                                                                  std::string const& psetName,
+                                                                  std::string const& p1,
+                                                                  std::string const& p2) {
+      vString::const_iterator end1 = v1.end();
+      vString::const_iterator end2 = v2.end();
+      for (vString::const_iterator i = v1.begin(); i != end1; ++i) {
+        for (vString::const_iterator j = v2.begin(); j != end2; ++j) {
+          if (*i == *j) {
+            flaws << psetName << " PSet: \n"
+                  << "in vStrings " << p1 << " and " << p2 << " duplication of the string " << *i << "\n";
+          }
+        }
+      }
+    }  // noDuplicates(v1,v2)
+
+    void edm::service::MessageServicePSetValidation::noCoutCerrClash(vString const& v,
+                                                                     std::string const& psetName,
+                                                                     std::string const& parameterLabel) {
+      vString::const_iterator end = v.end();
+      bool coutPresent = false;
+      bool cerrPresent = false;
+      for (vString::const_iterator i = v.begin(); i != end; ++i) {
+        if (*i == "cout")
+          coutPresent = true;
+        if (*i == "cerr")
+          cerrPresent = true;
+      }
+      if (coutPresent && cerrPresent) {
         flaws << psetName << " PSet: \n"
-	      << *i << " (listed in vstring " << parameterLabel << ")\n"
-	      << "is used as a parameter of type " << type
-	      << " instead of as a PSet \n"; 
+              << "vString " << parameterLabel << " has both cout and cerr \n";
       }
+    }  // noCoutCerrClash(v)
+
+    void edm::service::MessageServicePSetValidation::noKeywords(vString const& v,
+                                                                std::string const& psetName,
+                                                                std::string const& parameterLabel) {
+      vString::const_iterator end = v.end();
+      for (vString::const_iterator i = v.begin(); i != end; ++i) {
+        if (!keywordCheck(*i)) {
+          flaws << psetName << " PSet: \n"
+                << "vString " << parameterLabel << " should not contain the keyword " << *i << "\n";
+        }
+      }
+    }  // noKeywords(v)
+
+    bool edm::service::MessageServicePSetValidation::keywordCheck(std::string const& word) {
+      if (word == "default")
+        return false;
+      if (word == "categories")
+        return false;
+      if (word == "messageIDs")
+        return false;
+      if (word == "fwkJobReports")
+        return false;
+      if (word == "destinations")
+        return false;
+      if (word == "statistics")
+        return false;
+      if (word == "debugModules")
+        return false;
+      if (word == "suppressInfo")
+        return false;
+      if (word == "suppressDebug")
+        return false;
+      if (word == "suppressWarning")
+        return false;
+      if (word == "suppressError")
+        return false;
+      if (word == "threshold")
+        return false;
+      if (word == "ERROR")
+        return false;
+      if (word == "WARNING")
+        return false;
+      if (word == "INFO")
+        return false;
+      if (word == "DEBUG")
+        return false;
+      if (word == "placeholder")
+        return false;
+      if (word == "limit")
+        return false;
+      if (word == "reportEvery")
+        return false;
+      if (word == "timespan")
+        return false;
+      if (word == "noLineBreaks")
+        return false;
+      if (word == "lineLength")
+        return false;
+      if (word == "noTimeStamps")
+        return false;
+      if (word == "output")
+        return false;
+      if (word == "filename")
+        return false;
+      if (word == "extension")
+        return false;
+      if (word == "reset")
+        return false;
+      if (word == "optionalPSet")
+        return false;
+      return true;
+    }  // keywordCheck
+
+    void edm::service::MessageServicePSetValidation::noNonPSetUsage(ParameterSet const& pset,
+                                                                    vString const& v,
+                                                                    std::string const& psetName,
+                                                                    std::string const& parameterLabel) {
+      disallowedParam<int>(pset, v, psetName, parameterLabel, "int");
+      disallowedParam<unsigned int>(pset, v, psetName, parameterLabel, "uint");
+      disallowedParam<bool>(pset, v, psetName, parameterLabel, "bool");
+      disallowedParam<float>(pset, v, psetName, parameterLabel, "float");
+      disallowedParam<double>(pset, v, psetName, parameterLabel, "double");
+      disallowedParam<std::string>(pset, v, psetName, parameterLabel, "string");
+      disallowedParam<std::vector<std::string> >(pset, v, psetName, parameterLabel, "vstring");
+    }  // noNonPSetUsage
+
+    void edm::service::MessageServicePSetValidation::noBadParams(vString const& v,
+                                                                 vString const& params,
+                                                                 std::string const& psetName,
+                                                                 std::string const& parameterLabel,
+                                                                 std::string const& type) {
+      vString::const_iterator end1 = v.end();
+      vString::const_iterator end2 = params.end();
+      for (vString::const_iterator i = v.begin(); i != end1; ++i) {
+        for (vString::const_iterator j = params.begin(); j != end2; ++j) {
+          if (*i == *j) {
+            flaws << psetName << " PSet: \n"
+                  << *i << " (listed in vstring " << parameterLabel << ")\n"
+                  << "is used as a parameter of type " << type << " instead of as a PSet \n";
+          }
+        }
+      }
+
+    }  // noBadParams
+
+    bool edm::service::MessageServicePSetValidation::wildcard(vString const& v) {
+      vString::const_iterator end = v.end();
+      for (vString::const_iterator i = v.begin(); i != end; ++i) {
+        if ((*i) == "*")
+          return true;
+      }
+      return false;
     }
-  }
-
-} // noBadParams
- 
-bool
-edm::service::MessageServicePSetValidation::  
-wildcard(vString const & v) 
-{
-  vString::const_iterator end = v.end();
-  for (vString::const_iterator i = v.begin(); i != end; ++i) {
-    if ((*i) == "*") return true;
-  }
-  return false;
-}
-
-void
-edm::service::MessageServicePSetValidation::  
-noOtherPsets(ParameterSet const & pset)
-{
-  vString psnames;
-  pset.getParameterSetNames(psnames, false);
-  vString::const_iterator end = psnames.end();
-  for (vString::const_iterator i = psnames.begin(); i != end; ++i) {
-    if ( lookForMatch (destinations, *i) ) 	continue;
-    if ( lookForMatch (statistics, *i) ) 	continue;
-    if ( lookForMatch (fwkJobReports, *i) ) 	continue;
-    if ( lookForMatch (categories, *i) ) 	continue;
-    if ( lookForMatch (messageIDs, *i) ) 	continue;
-    if ( (*i) == "default" ) 			continue;
-    ParameterSet empty_PSet;
-    bool ok_optionalPSet = false; 
-    try {
-      ParameterSet const& culprit = 
-                    pset.getUntrackedParameterSet((*i),empty_PSet);
-      ok_optionalPSet = 
-          culprit.getUntrackedParameter<bool>("placeholder",  ok_optionalPSet);
-      ok_optionalPSet = 
-          culprit.getUntrackedParameter<bool>("optionalPSet", ok_optionalPSet);
-    } catch (cms::Exception& e) { 
-    }
-    if (ok_optionalPSet) continue; 
-    flaws << "MessageLogger " << " PSet: \n"
-	  << *i << " is an unrecognized name for a PSet\n";
-  }
-  psnames.clear();
-  unsigned int n = pset.getParameterSetNames(psnames, true);
-  if ( n > 0 ) {
-    end = psnames.end();
-    for (vString::const_iterator i = psnames.begin(); i != end; ++i) {
-      flaws << "MessageLogger " << " PSet: \n"
-	    << "PSet " << *i << " is tracked - not allowed\n";
-    }
-  }
-}
-
-bool
-edm::service::MessageServicePSetValidation::  
-lookForMatch(vString const & v, std::string const & s)
-{
-  vString::const_iterator begin = v.begin();
-  vString::const_iterator end = v.end();
-  return ( std::find(begin, end, s) != end );
-}
-
-void
-edm::service::MessageServicePSetValidation::  
-destinationPSets(ParameterSet const & pset)
-{
-  ParameterSet empty_PSet;
-  std::vector<std::string>::const_iterator end = destinations.end();
-  for ( std::vector<std::string>::const_iterator i = destinations.begin();
-  							     i != end; ++i )  {
-    ParameterSet const& d = pset.getUntrackedParameterSet(*i,empty_PSet);
-    destinationPSet(d,*i); 
-  }
-} // destinationPSets
-
-void
-edm::service::MessageServicePSetValidation::  
-destinationPSet(ParameterSet const & pset, std::string const & psetName)
-{
-  // Category PSets
-
-  categoryPSets (pset, psetName);
-     
-  // No other PSets -- unless they contain optionalPSet or placeholder=True 
-  
-  noNoncategoryPsets (pset, psetName);
-  
-  // General parameters
-  
-  check <bool> ( pset, psetName, "placeholder" );
-  std::string thresh = check<std::string> ( pset, "psetName", "threshold" );
-  if (!thresh.empty()) validateThreshold(thresh, psetName);
-  check <bool> ( pset, psetName, "noLineBreaks" );
-  check <int>  ( pset, psetName, "lineLength" );
-  check <bool> ( pset, psetName, "noTimeStamps" );
-  std::string s = check<std::string> ( pset, "psetName", "filename" );
-  if ( (s == "cerr") || (s == "cout") ) {
-    flaws << psetName << " PSet: \n"
-	  << s << " is not allowed as a value of filename \n";
-  }
-  s = check<std::string> ( pset, "psetName", "extension" );
-  if ( (s == "cerr") || (s == "cout") ) {
-    flaws << psetName << " PSet: \n"
-	 << s << " is not allowed as a value of extension \n";
-  }
-  s = check<std::string> ( pset, "psetName", "output" );  
-  
-  // No other parameters
-
-  noneExcept <int> (pset, psetName, "int", "lineLength"); 
-
-  vString okbool;
-  okbool.push_back ("placeholder");
-  okbool.push_back ("optionalPSet");
-  okbool.push_back ("noLineBreaks");
-  okbool.push_back ("noTimeStamps");
-  noneExcept <bool> (pset, psetName, "bool", okbool);   
-  vString okstring;
-  okstring.push_back ("threshold");
-  okstring.push_back ("output");
-  okstring.push_back ("filename");
-  okstring.push_back ("extension");
-  noneExcept <std::string> (pset, psetName, "string", okstring);   
-  
-} // destinationPSet
-
-void
-edm::service::MessageServicePSetValidation::  
-defaultPSet(ParameterSet const & main_pset)
-{
-  ParameterSet empty_PSet;
-  ParameterSet const& pset = main_pset.getUntrackedParameterSet("default",empty_PSet);
-  std::string psetName = "default (at MessageLogger main level)";
-  
-  // Category PSets
-
-  categoryPSets (pset, psetName);
-     
-  // No other PSets -- unless they contain optionalPSet or placeholder=True 
-  
-  noNoncategoryPsets (pset, psetName);
-  
-  // Parameters applying to the default category
-  
-  catInts ( pset, psetName, "default" );
-
-  // General parameters
-  
-  check <bool> ( pset, psetName, "placeholder" );
-  std::string thresh = check<std::string> ( pset, "psetName", "threshold" );
-  if (!thresh.empty()) validateThreshold(thresh, psetName);
-  check <bool> ( pset, psetName, "noLineBreaks" );
-  check <int>  ( pset, psetName, "limit" );   
-  check <int>  ( pset, psetName, "reportEvery" );   
-  check <int>  ( pset, psetName, "timespan" );   
-  check <int>  ( pset, psetName, "lineLength" );   
-  check <bool> ( pset, psetName, "noTimeStamps" );
-  
-  // No other parameters
-  vString okint;
-  okint.push_back("limit");
-  okint.push_back("reportEvery");
-  okint.push_back("timespan");
-  okint.push_back("lineLength");
-  noneExcept <int> (pset, psetName, "int", okint); 
-  vString okbool;
-  okbool.push_back ("placeholder");
-  okbool.push_back ("optionalPSet");
-  okbool.push_back ("noLineBreaks");
-  okbool.push_back ("noTimeStamps");
-  noneExcept <bool> (pset, psetName, "bool", okbool);   
-  vString okstring;
-  okstring.push_back ("threshold");
-  noneExcept <std::string> (pset, psetName, "string", okstring);   
-  
-} // defaultPSet
-
-void
-edm::service::MessageServicePSetValidation::  
-statisticsPSets(ParameterSet const & pset)
-{
-  ParameterSet empty_PSet;
-  std::vector<std::string>::const_iterator end = statistics.end();
-  for ( std::vector<std::string>::const_iterator i = statistics.begin();
-  							     i != end; ++i )  {
-    if (lookForMatch(destinations, *i)) continue; 
-    ParameterSet const& d = pset.getUntrackedParameterSet(*i, empty_PSet);
-    statisticsPSet(d,*i); 
-  }
-} // statisticsPSets
-
-void
-edm::service::MessageServicePSetValidation::  
-statisticsPSet(ParameterSet const & pset, std::string const & psetName)
-{
-  // Category PSets
-  
-  categoryPSets (pset, psetName);
-     
-  // No other PSets -- unless they contain optionalPSet or placeholder=True 
-  
-  noNoncategoryPsets (pset, psetName);
-  
-  // General parameters
-  
-  std::string thresh = check<std::string> ( pset, "psetName", "threshold" );
-  if (!thresh.empty()) validateThreshold(thresh, psetName);
-  check <bool> ( pset, psetName, "placeholder" );
-  check <bool> ( pset, psetName, "reset" );
-  std::string s = check<std::string> ( pset, "psetName", "filename" );
-  if ( (s == "cerr") || (s == "cout") ) {
-    flaws << psetName << " PSet: \n"
-	  << s << " is not allowed as a value of filename \n";
-  }
-  s = check<std::string> ( pset, "psetName", "extension" );
-  if ( (s == "cerr") || (s == "cout") ) {
-    flaws << psetName << " PSet: \n"
-	 << s << " is not allowed as a value of extension \n";
-  }
-  s = check<std::string> ( pset, "psetName", "output" );  
-  
-  // No other parameters
-
-  noneExcept <int> (pset, psetName, "int"); 
-
-  vString okbool;
-  okbool.push_back ("placeholder");
-  okbool.push_back ("optionalPSet");
-  okbool.push_back ("reset");
-  noneExcept <bool> (pset, psetName, "bool", okbool);   
-  vString okstring;
-  okstring.push_back ("output");
-  okstring.push_back ("filename");
-  okstring.push_back ("extension");
-  okstring.push_back ("threshold");
-  noneExcept <std::string> (pset, psetName, "string", okstring);   
-  
-} // statisticsPSet
-
-void
-edm::service::MessageServicePSetValidation::  
-fwkJobReportPSets(ParameterSet const & pset)
-{
-  ParameterSet empty_PSet;
-  std::vector<std::string>::const_iterator end = fwkJobReports.end();
-  for ( std::vector<std::string>::const_iterator i = fwkJobReports.begin();
-  							     i != end; ++i )  {
-    ParameterSet const& d = pset.getUntrackedParameterSet(*i, empty_PSet);
-    fwkJobReportPSet(d,*i); 
-  }
-} // fwkJobReportPSets
-
-void
-edm::service::MessageServicePSetValidation::  
-fwkJobReportPSet(ParameterSet const & pset, std::string const & psetName)
-{
-  // Category PSets
-  
-  categoryPSets (pset, psetName);
-     
-  // No other PSets -- unless they contain optionalPSet or placeholder=True 
-  
-  noNoncategoryPsets (pset, psetName);
-  
-  // General parameters
-  
-  check <bool> ( pset, psetName, "placeholder" );
-  std::string s = check<std::string> ( pset, "psetName", "filename" );
-  if ( (s == "cerr") || (s == "cout") ) {
-    flaws << psetName << " PSet: \n"
-	  << s << " is not allowed as a value of filename \n";
-  }
-  s = check<std::string> ( pset, "psetName", "extension" );
-  if ( (s == "cerr") || (s == "cout") ) {
-    flaws << psetName << " PSet: \n"
-	 << s << " is not allowed as a value of extension \n";
-  }
-  s = check<std::string> ( pset, "psetName", "output" );  
-    
-  // No other parameters
-
-  noneExcept <int> (pset, psetName, "int"); 
-
-  vString okbool;
-  okbool.push_back ("placeholder");
-  okbool.push_back ("optionalPSet");
-  noneExcept <bool> (pset, psetName, "bool", okbool);   
-  vString okstring;
-  okstring.push_back ("output");
-  okstring.push_back ("filename");
-  okstring.push_back ("extension");
-  noneExcept <std::string> (pset, psetName, "string", okstring);   
-  
-} // fwkJobReportPSet
-
-void
-edm::service::MessageServicePSetValidation::  
-noNoncategoryPsets(ParameterSet const & pset,std::string const & psetName)
-{
-  vString psnames;
-  pset.getParameterSetNames(psnames, false);
-  vString::const_iterator end = psnames.end();
-  for (vString::const_iterator i = psnames.begin(); i != end; ++i) {
-    if ( lookForMatch (categories, *i) ) 	continue;
-    if ( lookForMatch (messageIDs, *i) ) 	continue;
-    if ( (*i) == "default" ) 			continue;
-    if ( (*i) == "ERROR" ) 			continue;
-    if ( (*i) == "WARNING" ) 			continue;
-    if ( (*i) == "INFO" ) 			continue;
-    if ( (*i) == "DEBUG" ) 			continue;
-    ParameterSet empty_PSet;
-    bool ok_optionalPSet = false; 
-    try {
-      ParameterSet const& culprit = 
-                    pset.getUntrackedParameterSet((*i),empty_PSet);
-      ok_optionalPSet = 
-          culprit.getUntrackedParameter<bool>("placeholder",  ok_optionalPSet);
-      ok_optionalPSet = 
-          culprit.getUntrackedParameter<bool>("optionalPSet", ok_optionalPSet);
-    } catch (cms::Exception& e) { 
-    }
-    if (ok_optionalPSet) continue; 
-    flaws << psetName << " PSet: \n"
-	  << *i << " is an unrecognized name for a PSet in this context \n";
-  }
-  psnames.clear();
-  unsigned int n = pset.getParameterSetNames(psnames, true);
-  if ( n > 0 ) {
-    end = psnames.end();
-    for (vString::const_iterator i = psnames.begin(); i != end; ++i) {
-      flaws << psetName << " PSet: \n"
-	    << "PSet " << *i << " is tracked - not allowed\n";
+
+    void edm::service::MessageServicePSetValidation::noOtherPsets(ParameterSet const& pset) {
+      vString psnames;
+      pset.getParameterSetNames(psnames, false);
+      vString::const_iterator end = psnames.end();
+      for (vString::const_iterator i = psnames.begin(); i != end; ++i) {
+        if (lookForMatch(destinations, *i))
+          continue;
+        if (lookForMatch(statistics, *i))
+          continue;
+        if (lookForMatch(fwkJobReports, *i))
+          continue;
+        if (lookForMatch(categories, *i))
+          continue;
+        if (lookForMatch(messageIDs, *i))
+          continue;
+        if ((*i) == "default")
+          continue;
+        ParameterSet empty_PSet;
+        bool ok_optionalPSet = false;
+        try {
+          ParameterSet const& culprit = pset.getUntrackedParameterSet((*i), empty_PSet);
+          ok_optionalPSet = culprit.getUntrackedParameter<bool>("placeholder", ok_optionalPSet);
+          ok_optionalPSet = culprit.getUntrackedParameter<bool>("optionalPSet", ok_optionalPSet);
+        } catch (cms::Exception& e) {
+        }
+        if (ok_optionalPSet)
+          continue;
+        flaws << "MessageLogger "
+              << " PSet: \n"
+              << *i << " is an unrecognized name for a PSet\n";
+      }
+      psnames.clear();
+      unsigned int n = pset.getParameterSetNames(psnames, true);
+      if (n > 0) {
+        end = psnames.end();
+        for (vString::const_iterator i = psnames.begin(); i != end; ++i) {
+          flaws << "MessageLogger "
+                << " PSet: \n"
+                << "PSet " << *i << " is tracked - not allowed\n";
+        }
+      }
     }
-  }
-} // noNoncategoryPsets
-
-void
-edm::service::MessageServicePSetValidation::  
-categoryPSets(ParameterSet const & pset, std::string const & psetName ) 
-{
-  categoryPSet (pset, psetName, "ERROR"  );
-  categoryPSet (pset, psetName, "WARNING");
-  categoryPSet (pset, psetName, "INFO"   ) ;
-  categoryPSet (pset, psetName, "DEBUG"  );
-  if (psetName != "MessageLogger") categoryPSet (pset, psetName, "default");
-  // The above conditional is because default in the main level is treated
-  // as a set of defaults differnt from those of a simple category. 
-  std::vector<std::string>::const_iterator end = categories.end();
-  for (std::vector<std::string>::const_iterator i = categories.begin(); 
-       i != end; ++i) {
-    categoryPSet(pset, psetName, *i);
-  }
-} // categoryPSets	      
-
-void
-edm::service::MessageServicePSetValidation::  
-categoryPSet (ParameterSet const & pset,
-	      std::string const & OuterPsetName,
-	      std::string const & categoryName)  {
-  if (pset.existsAs<ParameterSet> (categoryName, true)) {
-      flaws << OuterPsetName << " PSet: \n"
-	    << "Category PSet " << categoryName 
-	    << " is tracked - not allowed\n";
-      return;  
-  }
-  ParameterSet empty_PSet;
-  ParameterSet const& c = pset.getUntrackedParameterSet(categoryName,empty_PSet);
-  std::string const & psetName(OuterPsetName);
-  catInts   			( c, psetName, categoryName );
-  catNone <unsigned int> 	( c, psetName, categoryName, "unsigned int" );
-  catBoolRestriction 		( c, psetName, categoryName, "bool" );
-  catNone <float> 		( c, psetName, categoryName, "float" );
-  catNone <double> 		( c, psetName, categoryName, "double" );
-  catNone <std::string> 	( c, psetName, categoryName, "string" );
-  catNone <vString> 		( c, psetName, categoryName, "vSting" );
-  catNoPSets 			( c, psetName, categoryName );
-} // categoryPSet	      
-
-void
-edm::service::MessageServicePSetValidation::  
-catInts (ParameterSet const & pset, 
-  	std::string  const & psetName, 
-  	std::string  const & categoryName)  
-{
-  vString x = pset.getParameterNamesForType <int> (false);
-  vString::const_iterator end = x.end();
-  for ( vString::const_iterator i = x.begin(); i != end; ++i ) {
-    if ( *i == "limit" ) continue;
-    if ( *i == "reportEvery" ) continue;
-    if ( *i == "timespan" ) continue;
-    flaws << categoryName << " category PSet nested in "
-      	  << psetName << " PSet: \n"
-	  << (*i) << " is not an allowed parameter within a category PSet \n";
-  }
-  x = pset.getParameterNamesForType <int> (true);
-  end = x.end();
-  for ( vString::const_iterator i = x.begin(); i != end; ++i ) {
-    flaws << categoryName << " category PSet nested in "
-     	  << psetName << " PSet: \n"
-	  << (*i) << " is used as a tracked int \n"
-	  << "Tracked parameters not allowed here \n";
-  }
-} // catInts()
-
-void
-edm::service::MessageServicePSetValidation::  
-catNoPSets (ParameterSet const & pset, 
-  	std::string  const & psetName, 
-  	std::string  const & categoryName)  
-{
-  vString psnames;
-  pset.getParameterSetNames(psnames, false);
-  vString::const_iterator end = psnames.end();
-  for (vString::const_iterator i = psnames.begin(); i != end; ++i) {
-    flaws << categoryName << " category PSet nested in "
-      	  << psetName << " PSet: \n"
-	  << *i << " is used as a  PSet\n"
-	  << "PSets not allowed within a category PSet\n";
-  }
-  psnames.clear();
-  unsigned int n = pset.getParameterSetNames(psnames, true);
-  if ( n > 0 ) {
-    end = psnames.end();
-    for (vString::const_iterator i = psnames.begin(); i != end; ++i) {
-    flaws << categoryName << " category PSet nested in "
-      	  << psetName << " PSet: \n"
-	  << *i << " is used as a tracked PSet\n"
-	  << "tracked parameters not permitted, and "
-	  << "PSets not allowed within a category PSet\n";
+
+    bool edm::service::MessageServicePSetValidation::lookForMatch(vString const& v, std::string const& s) {
+      vString::const_iterator begin = v.begin();
+      vString::const_iterator end = v.end();
+      return (std::find(begin, end, s) != end);
     }
-  }
-} // catNoPSets
-
-void
-edm::service::MessageServicePSetValidation::  
-catBoolRestriction (ParameterSet const & pset, 
-  		    std::string  const & psetName, 
-  		    std::string  const & categoryName,
-		    std::string  const & type)  
-{
-  vString x = pset.getParameterNamesForType <bool> (false);
-  vString::const_iterator end = x.end();
-  for ( vString::const_iterator i = x.begin(); i != end; ++i ) {
-    if ( ((*i) == "placeholder") || ((*i) == "optionalPSet") ) continue;
-    flaws << categoryName << " category PSet nested in "
-      	  << psetName << " PSet: \n"
-	  << (*i) << " is used as a " << type << "\n"
-	  << "Usage of " << type << " is not recognized here\n"; 
-  }
-  x = pset.getParameterNamesForType <bool> (true);
-  end = x.end();
-  for ( vString::const_iterator i = x.begin(); i != end; ++i ) {
-    flaws << categoryName << " category PSet nested in "
-      	  << psetName << " PSet: \n"
-	  << (*i) << " is used as a tracked " << type << "\n"
-	  << "Tracked parameters not allowed here, "
-	  <<" and even untracked it would not be recognized\n";
-  }
-} // catBoolRestriction()
-
-
-} // end of namespace service  
-} // end of namespace edm  
+
+    void edm::service::MessageServicePSetValidation::destinationPSets(ParameterSet const& pset) {
+      ParameterSet empty_PSet;
+      std::vector<std::string>::const_iterator end = destinations.end();
+      for (std::vector<std::string>::const_iterator i = destinations.begin(); i != end; ++i) {
+        ParameterSet const& d = pset.getUntrackedParameterSet(*i, empty_PSet);
+        destinationPSet(d, *i);
+      }
+    }  // destinationPSets
+
+    void edm::service::MessageServicePSetValidation::destinationPSet(ParameterSet const& pset,
+                                                                     std::string const& psetName) {
+      // Category PSets
+
+      categoryPSets(pset, psetName);
+
+      // No other PSets -- unless they contain optionalPSet or placeholder=True
+
+      noNoncategoryPsets(pset, psetName);
+
+      // General parameters
+
+      check<bool>(pset, psetName, "placeholder");
+      std::string thresh = check<std::string>(pset, "psetName", "threshold");
+      if (!thresh.empty())
+        validateThreshold(thresh, psetName);
+      check<bool>(pset, psetName, "noLineBreaks");
+      check<int>(pset, psetName, "lineLength");
+      check<bool>(pset, psetName, "noTimeStamps");
+      std::string s = check<std::string>(pset, "psetName", "filename");
+      if ((s == "cerr") || (s == "cout")) {
+        flaws << psetName << " PSet: \n" << s << " is not allowed as a value of filename \n";
+      }
+      s = check<std::string>(pset, "psetName", "extension");
+      if ((s == "cerr") || (s == "cout")) {
+        flaws << psetName << " PSet: \n" << s << " is not allowed as a value of extension \n";
+      }
+      s = check<std::string>(pset, "psetName", "output");
+
+      // No other parameters
+
+      noneExcept<int>(pset, psetName, "int", "lineLength");
+
+      vString okbool;
+      okbool.push_back("placeholder");
+      okbool.push_back("optionalPSet");
+      okbool.push_back("noLineBreaks");
+      okbool.push_back("noTimeStamps");
+      noneExcept<bool>(pset, psetName, "bool", okbool);
+      vString okstring;
+      okstring.push_back("threshold");
+      okstring.push_back("output");
+      okstring.push_back("filename");
+      okstring.push_back("extension");
+      noneExcept<std::string>(pset, psetName, "string", okstring);
+
+    }  // destinationPSet
+
+    void edm::service::MessageServicePSetValidation::defaultPSet(ParameterSet const& main_pset) {
+      ParameterSet empty_PSet;
+      ParameterSet const& pset = main_pset.getUntrackedParameterSet("default", empty_PSet);
+      std::string psetName = "default (at MessageLogger main level)";
+
+      // Category PSets
+
+      categoryPSets(pset, psetName);
+
+      // No other PSets -- unless they contain optionalPSet or placeholder=True
+
+      noNoncategoryPsets(pset, psetName);
+
+      // Parameters applying to the default category
+
+      catInts(pset, psetName, "default");
+
+      // General parameters
+
+      check<bool>(pset, psetName, "placeholder");
+      std::string thresh = check<std::string>(pset, "psetName", "threshold");
+      if (!thresh.empty())
+        validateThreshold(thresh, psetName);
+      check<bool>(pset, psetName, "noLineBreaks");
+      check<int>(pset, psetName, "limit");
+      check<int>(pset, psetName, "reportEvery");
+      check<int>(pset, psetName, "timespan");
+      check<int>(pset, psetName, "lineLength");
+      check<bool>(pset, psetName, "noTimeStamps");
+
+      // No other parameters
+      vString okint;
+      okint.push_back("limit");
+      okint.push_back("reportEvery");
+      okint.push_back("timespan");
+      okint.push_back("lineLength");
+      noneExcept<int>(pset, psetName, "int", okint);
+      vString okbool;
+      okbool.push_back("placeholder");
+      okbool.push_back("optionalPSet");
+      okbool.push_back("noLineBreaks");
+      okbool.push_back("noTimeStamps");
+      noneExcept<bool>(pset, psetName, "bool", okbool);
+      vString okstring;
+      okstring.push_back("threshold");
+      noneExcept<std::string>(pset, psetName, "string", okstring);
+
+    }  // defaultPSet
+
+    void edm::service::MessageServicePSetValidation::statisticsPSets(ParameterSet const& pset) {
+      ParameterSet empty_PSet;
+      std::vector<std::string>::const_iterator end = statistics.end();
+      for (std::vector<std::string>::const_iterator i = statistics.begin(); i != end; ++i) {
+        if (lookForMatch(destinations, *i))
+          continue;
+        ParameterSet const& d = pset.getUntrackedParameterSet(*i, empty_PSet);
+        statisticsPSet(d, *i);
+      }
+    }  // statisticsPSets
+
+    void edm::service::MessageServicePSetValidation::statisticsPSet(ParameterSet const& pset,
+                                                                    std::string const& psetName) {
+      // Category PSets
+
+      categoryPSets(pset, psetName);
+
+      // No other PSets -- unless they contain optionalPSet or placeholder=True
+
+      noNoncategoryPsets(pset, psetName);
+
+      // General parameters
+
+      std::string thresh = check<std::string>(pset, "psetName", "threshold");
+      if (!thresh.empty())
+        validateThreshold(thresh, psetName);
+      check<bool>(pset, psetName, "placeholder");
+      check<bool>(pset, psetName, "reset");
+      std::string s = check<std::string>(pset, "psetName", "filename");
+      if ((s == "cerr") || (s == "cout")) {
+        flaws << psetName << " PSet: \n" << s << " is not allowed as a value of filename \n";
+      }
+      s = check<std::string>(pset, "psetName", "extension");
+      if ((s == "cerr") || (s == "cout")) {
+        flaws << psetName << " PSet: \n" << s << " is not allowed as a value of extension \n";
+      }
+      s = check<std::string>(pset, "psetName", "output");
+
+      // No other parameters
+
+      noneExcept<int>(pset, psetName, "int");
+
+      vString okbool;
+      okbool.push_back("placeholder");
+      okbool.push_back("optionalPSet");
+      okbool.push_back("reset");
+      noneExcept<bool>(pset, psetName, "bool", okbool);
+      vString okstring;
+      okstring.push_back("output");
+      okstring.push_back("filename");
+      okstring.push_back("extension");
+      okstring.push_back("threshold");
+      noneExcept<std::string>(pset, psetName, "string", okstring);
+
+    }  // statisticsPSet
+
+    void edm::service::MessageServicePSetValidation::fwkJobReportPSets(ParameterSet const& pset) {
+      ParameterSet empty_PSet;
+      std::vector<std::string>::const_iterator end = fwkJobReports.end();
+      for (std::vector<std::string>::const_iterator i = fwkJobReports.begin(); i != end; ++i) {
+        ParameterSet const& d = pset.getUntrackedParameterSet(*i, empty_PSet);
+        fwkJobReportPSet(d, *i);
+      }
+    }  // fwkJobReportPSets
+
+    void edm::service::MessageServicePSetValidation::fwkJobReportPSet(ParameterSet const& pset,
+                                                                      std::string const& psetName) {
+      // Category PSets
+
+      categoryPSets(pset, psetName);
+
+      // No other PSets -- unless they contain optionalPSet or placeholder=True
+
+      noNoncategoryPsets(pset, psetName);
+
+      // General parameters
+
+      check<bool>(pset, psetName, "placeholder");
+      std::string s = check<std::string>(pset, "psetName", "filename");
+      if ((s == "cerr") || (s == "cout")) {
+        flaws << psetName << " PSet: \n" << s << " is not allowed as a value of filename \n";
+      }
+      s = check<std::string>(pset, "psetName", "extension");
+      if ((s == "cerr") || (s == "cout")) {
+        flaws << psetName << " PSet: \n" << s << " is not allowed as a value of extension \n";
+      }
+      s = check<std::string>(pset, "psetName", "output");
+
+      // No other parameters
+
+      noneExcept<int>(pset, psetName, "int");
+
+      vString okbool;
+      okbool.push_back("placeholder");
+      okbool.push_back("optionalPSet");
+      noneExcept<bool>(pset, psetName, "bool", okbool);
+      vString okstring;
+      okstring.push_back("output");
+      okstring.push_back("filename");
+      okstring.push_back("extension");
+      noneExcept<std::string>(pset, psetName, "string", okstring);
+
+    }  // fwkJobReportPSet
+
+    void edm::service::MessageServicePSetValidation::noNoncategoryPsets(ParameterSet const& pset,
+                                                                        std::string const& psetName) {
+      vString psnames;
+      pset.getParameterSetNames(psnames, false);
+      vString::const_iterator end = psnames.end();
+      for (vString::const_iterator i = psnames.begin(); i != end; ++i) {
+        if (lookForMatch(categories, *i))
+          continue;
+        if (lookForMatch(messageIDs, *i))
+          continue;
+        if ((*i) == "default")
+          continue;
+        if ((*i) == "ERROR")
+          continue;
+        if ((*i) == "WARNING")
+          continue;
+        if ((*i) == "INFO")
+          continue;
+        if ((*i) == "DEBUG")
+          continue;
+        ParameterSet empty_PSet;
+        bool ok_optionalPSet = false;
+        try {
+          ParameterSet const& culprit = pset.getUntrackedParameterSet((*i), empty_PSet);
+          ok_optionalPSet = culprit.getUntrackedParameter<bool>("placeholder", ok_optionalPSet);
+          ok_optionalPSet = culprit.getUntrackedParameter<bool>("optionalPSet", ok_optionalPSet);
+        } catch (cms::Exception& e) {
+        }
+        if (ok_optionalPSet)
+          continue;
+        flaws << psetName << " PSet: \n" << *i << " is an unrecognized name for a PSet in this context \n";
+      }
+      psnames.clear();
+      unsigned int n = pset.getParameterSetNames(psnames, true);
+      if (n > 0) {
+        end = psnames.end();
+        for (vString::const_iterator i = psnames.begin(); i != end; ++i) {
+          flaws << psetName << " PSet: \n"
+                << "PSet " << *i << " is tracked - not allowed\n";
+        }
+      }
+    }  // noNoncategoryPsets
+
+    void edm::service::MessageServicePSetValidation::categoryPSets(ParameterSet const& pset,
+                                                                   std::string const& psetName) {
+      categoryPSet(pset, psetName, "ERROR");
+      categoryPSet(pset, psetName, "WARNING");
+      categoryPSet(pset, psetName, "INFO");
+      categoryPSet(pset, psetName, "DEBUG");
+      if (psetName != "MessageLogger")
+        categoryPSet(pset, psetName, "default");
+      // The above conditional is because default in the main level is treated
+      // as a set of defaults differnt from those of a simple category.
+      std::vector<std::string>::const_iterator end = categories.end();
+      for (std::vector<std::string>::const_iterator i = categories.begin(); i != end; ++i) {
+        categoryPSet(pset, psetName, *i);
+      }
+    }  // categoryPSets
+
+    void edm::service::MessageServicePSetValidation::categoryPSet(ParameterSet const& pset,
+                                                                  std::string const& OuterPsetName,
+                                                                  std::string const& categoryName) {
+      if (pset.existsAs<ParameterSet>(categoryName, true)) {
+        flaws << OuterPsetName << " PSet: \n"
+              << "Category PSet " << categoryName << " is tracked - not allowed\n";
+        return;
+      }
+      ParameterSet empty_PSet;
+      ParameterSet const& c = pset.getUntrackedParameterSet(categoryName, empty_PSet);
+      std::string const& psetName(OuterPsetName);
+      catInts(c, psetName, categoryName);
+      catNone<unsigned int>(c, psetName, categoryName, "unsigned int");
+      catBoolRestriction(c, psetName, categoryName, "bool");
+      catNone<float>(c, psetName, categoryName, "float");
+      catNone<double>(c, psetName, categoryName, "double");
+      catNone<std::string>(c, psetName, categoryName, "string");
+      catNone<vString>(c, psetName, categoryName, "vSting");
+      catNoPSets(c, psetName, categoryName);
+    }  // categoryPSet
+
+    void edm::service::MessageServicePSetValidation::catInts(ParameterSet const& pset,
+                                                             std::string const& psetName,
+                                                             std::string const& categoryName) {
+      vString x = pset.getParameterNamesForType<int>(false);
+      vString::const_iterator end = x.end();
+      for (vString::const_iterator i = x.begin(); i != end; ++i) {
+        if (*i == "limit")
+          continue;
+        if (*i == "reportEvery")
+          continue;
+        if (*i == "timespan")
+          continue;
+        flaws << categoryName << " category PSet nested in " << psetName << " PSet: \n"
+              << (*i) << " is not an allowed parameter within a category PSet \n";
+      }
+      x = pset.getParameterNamesForType<int>(true);
+      end = x.end();
+      for (vString::const_iterator i = x.begin(); i != end; ++i) {
+        flaws << categoryName << " category PSet nested in " << psetName << " PSet: \n"
+              << (*i) << " is used as a tracked int \n"
+              << "Tracked parameters not allowed here \n";
+      }
+    }  // catInts()
+
+    void edm::service::MessageServicePSetValidation::catNoPSets(ParameterSet const& pset,
+                                                                std::string const& psetName,
+                                                                std::string const& categoryName) {
+      vString psnames;
+      pset.getParameterSetNames(psnames, false);
+      vString::const_iterator end = psnames.end();
+      for (vString::const_iterator i = psnames.begin(); i != end; ++i) {
+        flaws << categoryName << " category PSet nested in " << psetName << " PSet: \n"
+              << *i << " is used as a  PSet\n"
+              << "PSets not allowed within a category PSet\n";
+      }
+      psnames.clear();
+      unsigned int n = pset.getParameterSetNames(psnames, true);
+      if (n > 0) {
+        end = psnames.end();
+        for (vString::const_iterator i = psnames.begin(); i != end; ++i) {
+          flaws << categoryName << " category PSet nested in " << psetName << " PSet: \n"
+                << *i << " is used as a tracked PSet\n"
+                << "tracked parameters not permitted, and "
+                << "PSets not allowed within a category PSet\n";
+        }
+      }
+    }  // catNoPSets
+
+    void edm::service::MessageServicePSetValidation::catBoolRestriction(ParameterSet const& pset,
+                                                                        std::string const& psetName,
+                                                                        std::string const& categoryName,
+                                                                        std::string const& type) {
+      vString x = pset.getParameterNamesForType<bool>(false);
+      vString::const_iterator end = x.end();
+      for (vString::const_iterator i = x.begin(); i != end; ++i) {
+        if (((*i) == "placeholder") || ((*i) == "optionalPSet"))
+          continue;
+        flaws << categoryName << " category PSet nested in " << psetName << " PSet: \n"
+              << (*i) << " is used as a " << type << "\n"
+              << "Usage of " << type << " is not recognized here\n";
+      }
+      x = pset.getParameterNamesForType<bool>(true);
+      end = x.end();
+      for (vString::const_iterator i = x.begin(); i != end; ++i) {
+        flaws << categoryName << " category PSet nested in " << psetName << " PSet: \n"
+              << (*i) << " is used as a tracked " << type << "\n"
+              << "Tracked parameters not allowed here, "
+              << " and even untracked it would not be recognized\n";
+      }
+    }  // catBoolRestriction()
+
+  }  // end of namespace service
+}  // end of namespace edm
diff --git a/FWCore/MessageService/src/MessageServicePresence.cc b/FWCore/MessageService/src/MessageServicePresence.cc
index 6087aab8a7c33..77f71b8f69067 100644
--- a/FWCore/MessageService/src/MessageServicePresence.cc
+++ b/FWCore/MessageService/src/MessageServicePresence.cc
@@ -5,17 +5,17 @@
 // Changes:
 //
 //   1 - 2/11/07  mf 	Added a call to edm::disableAllSigs(&oldset)
-//			to disable signals so that they are all handled 
+//			to disable signals so that they are all handled
 //			by the event processor thread
-// 
+//
 //   2 - 8/10/09  mf 	Mods to support the use of abstract scribes
 //		  cdj	so that standalones can work easily
-//			
-// 
+//
+//
 //   2 - 8/12/09  mf 	Mods to get ownership of mlscribe better
-//		  cdj	
-//			
-// 
+//		  cdj
+//
+//
 
 #include "FWCore/MessageService/interface/MainThreadMLscribe.h"
 #include "FWCore/MessageService/interface/MessageServicePresence.h"
@@ -27,57 +27,50 @@
 
 using namespace edm::service;
 
-
-namespace  {
-void
-  runMessageLoggerScribe(std::shared_ptr<ThreadQueue> queue)
-{
-  sigset_t oldset;
-  edm::disableAllSigs(&oldset);
-  MessageLoggerScribe  m(queue);  
-  m.run();
-  // explicitly DO NOT reenableSigs(oldset) because -
-  // 1) When this terminates, the main thread may not yet have done a join() and we
-  //    don't want to handle the sigs at that point in this thread
-  // 2) If we re-enable sigs, we will get the entire stack of accumulated ones (if any) 
-}
+namespace {
+  void runMessageLoggerScribe(std::shared_ptr<ThreadQueue> queue) {
+    sigset_t oldset;
+    edm::disableAllSigs(&oldset);
+    MessageLoggerScribe m(queue);
+    m.run();
+    // explicitly DO NOT reenableSigs(oldset) because -
+    // 1) When this terminates, the main thread may not yet have done a join() and we
+    //    don't want to handle the sigs at that point in this thread
+    // 2) If we re-enable sigs, we will get the entire stack of accumulated ones (if any)
+  }
 }  // namespace
 
 namespace edm {
-namespace service {
-
-
-MessageServicePresence::MessageServicePresence()
-  : Presence()
-  , m_queue (new ThreadQueue)
-  , m_scribeThread
-         ( ( (void) MessageLoggerQ::instance() // ensure Q's static data init'd
-            , std::bind(&runMessageLoggerScribe, queue())
-	    			// start a new thread, run rMLS(m_queue)
-				// ChangeLog 2
-          ) ) 
-	  // Note that m_scribeThread, which is a boost::thread, has a single-argument ctor - 
-	  // just the function to be run.  But we need to do something first, namely,
-	  // ensure that the MessageLoggerQ is in a valid state - and that requires
-	  // a statement.  So we bundle that statement in parenthesis, separated by 
-	  // a comma, with the argument we really want (runMessageLoggerScribe).  This
-	  // creates a single argument, wheich evaluates to runMessageLoggerScribe after
-	  // first executing the before-the-comma statement. 
-{
-  MessageLoggerQ::setMLscribe_ptr(
-    std::shared_ptr<edm::service::AbstractMLscribe>(std::make_shared<MainThreadMLscribe>(queue())));
-    								// change log 3
-  //std::cout << "MessageServicePresence ctor\n";
-}
+  namespace service {
 
+    MessageServicePresence::MessageServicePresence()
+        : Presence(),
+          m_queue(new ThreadQueue),
+          m_scribeThread(((void)MessageLoggerQ::instance()  // ensure Q's static data init'd
+                          ,
+                          std::bind(&runMessageLoggerScribe, queue())
+                          // start a new thread, run rMLS(m_queue)
+                          // ChangeLog 2
+                          ))
+    // Note that m_scribeThread, which is a boost::thread, has a single-argument ctor -
+    // just the function to be run.  But we need to do something first, namely,
+    // ensure that the MessageLoggerQ is in a valid state - and that requires
+    // a statement.  So we bundle that statement in parenthesis, separated by
+    // a comma, with the argument we really want (runMessageLoggerScribe).  This
+    // creates a single argument, wheich evaluates to runMessageLoggerScribe after
+    // first executing the before-the-comma statement.
+    {
+      MessageLoggerQ::setMLscribe_ptr(
+          std::shared_ptr<edm::service::AbstractMLscribe>(std::make_shared<MainThreadMLscribe>(queue())));
+      // change log 3
+      //std::cout << "MessageServicePresence ctor\n";
+    }
 
-MessageServicePresence::~MessageServicePresence()
-{
-  MessageLoggerQ::MLqEND();
-  m_scribeThread.join();
-  MessageLoggerQ::setMLscribe_ptr
-    (std::shared_ptr<edm::service::AbstractMLscribe>());   // change log 3
-}
+    MessageServicePresence::~MessageServicePresence() {
+      MessageLoggerQ::MLqEND();
+      m_scribeThread.join();
+      MessageLoggerQ::setMLscribe_ptr(std::shared_ptr<edm::service::AbstractMLscribe>());  // change log 3
+    }
 
-} // end of namespace service  
-} // end of namespace edm  
+  }  // end of namespace service
+}  // end of namespace edm
diff --git a/FWCore/MessageService/src/SingleThreadMSPresence.cc b/FWCore/MessageService/src/SingleThreadMSPresence.cc
index cda33c137868e..531755e7c3053 100644
--- a/FWCore/MessageService/src/SingleThreadMSPresence.cc
+++ b/FWCore/MessageService/src/SingleThreadMSPresence.cc
@@ -4,7 +4,7 @@
 //
 // Changes:
 //
-// 
+//
 
 #include "FWCore/MessageService/interface/SingleThreadMSPresence.h"
 #include "FWCore/MessageService/interface/ThreadSafeLogMessageLoggerScribe.h"
@@ -14,27 +14,20 @@
 
 #include <memory>
 
-
 namespace edm {
-namespace service {
-
-
-SingleThreadMSPresence::SingleThreadMSPresence()
-  : Presence()
-{
-  //std::cout << "SingleThreadMSPresence ctor\n";
-  MessageLoggerQ::setMLscribe_ptr(std::shared_ptr<edm::service::AbstractMLscribe>(std::make_shared<ThreadSafeLogMessageLoggerScribe>()));
-  MessageDrop::instance()->messageLoggerScribeIsRunning = 
-  				MLSCRIBE_RUNNING_INDICATOR;
-}
-
-
-SingleThreadMSPresence::~SingleThreadMSPresence()
-{
-  MessageLoggerQ::MLqEND();
-  MessageLoggerQ::setMLscribe_ptr
-    (std::shared_ptr<edm::service::AbstractMLscribe>());
-}
-
-} // end of namespace service  
-} // end of namespace edm  
+  namespace service {
+
+    SingleThreadMSPresence::SingleThreadMSPresence() : Presence() {
+      //std::cout << "SingleThreadMSPresence ctor\n";
+      MessageLoggerQ::setMLscribe_ptr(
+          std::shared_ptr<edm::service::AbstractMLscribe>(std::make_shared<ThreadSafeLogMessageLoggerScribe>()));
+      MessageDrop::instance()->messageLoggerScribeIsRunning = MLSCRIBE_RUNNING_INDICATOR;
+    }
+
+    SingleThreadMSPresence::~SingleThreadMSPresence() {
+      MessageLoggerQ::MLqEND();
+      MessageLoggerQ::setMLscribe_ptr(std::shared_ptr<edm::service::AbstractMLscribe>());
+    }
+
+  }  // end of namespace service
+}  // end of namespace edm
diff --git a/FWCore/MessageService/src/ThreadQueue.cc b/FWCore/MessageService/src/ThreadQueue.cc
index 593c041bc3e06..a2bc85e971e61 100644
--- a/FWCore/MessageService/src/ThreadQueue.cc
+++ b/FWCore/MessageService/src/ThreadQueue.cc
@@ -4,45 +4,33 @@
 //
 // Changes:
 //
-// 
+//
 
 #include "FWCore/MessageService/interface/ThreadQueue.h"
 #include <cstring>
 
 namespace edm {
-namespace service {
-
-ThreadQueue::ThreadQueue() 
-  : m_buf (buf_size, buf_depth)
-{
-}
-ThreadQueue::~ThreadQueue() {}
+  namespace service {
 
-void  
-ThreadQueue::
-produce(MessageLoggerQ::OpCode  o, void * operand)
-{
-  SingleConsumerQ::ProducerBuffer b(m_buf);
-  char * slot_p = static_cast<char *>(b.buffer());
-  void * v = operand;
-  std::memcpy(slot_p+0             , &o, sizeof(MessageLoggerQ::OpCode));
-  std::memcpy(slot_p+sizeof(MessageLoggerQ::OpCode), &v, sizeof(void *));
-  b.commit(buf_size);
-} // runCommand
-  
-void  
-ThreadQueue::
-consume( MessageLoggerQ::OpCode & opcode, void * & operand )
-{
-  SingleConsumerQ::ConsumerBuffer b(m_buf);  // Look -- CONSUMER buffer
-  char * slot_p = static_cast<char *>(b.buffer());
-  std::memcpy(&opcode , slot_p+0             , sizeof(MessageLoggerQ::OpCode));
-  std::memcpy(&operand, slot_p+sizeof(MessageLoggerQ::OpCode), sizeof(void *));
-  b.commit(buf_size);
-}
+    ThreadQueue::ThreadQueue() : m_buf(buf_size, buf_depth) {}
+    ThreadQueue::~ThreadQueue() {}
 
+    void ThreadQueue::produce(MessageLoggerQ::OpCode o, void *operand) {
+      SingleConsumerQ::ProducerBuffer b(m_buf);
+      char *slot_p = static_cast<char *>(b.buffer());
+      void *v = operand;
+      std::memcpy(slot_p + 0, &o, sizeof(MessageLoggerQ::OpCode));
+      std::memcpy(slot_p + sizeof(MessageLoggerQ::OpCode), &v, sizeof(void *));
+      b.commit(buf_size);
+    }  // runCommand
 
-  
+    void ThreadQueue::consume(MessageLoggerQ::OpCode &opcode, void *&operand) {
+      SingleConsumerQ::ConsumerBuffer b(m_buf);  // Look -- CONSUMER buffer
+      char *slot_p = static_cast<char *>(b.buffer());
+      std::memcpy(&opcode, slot_p + 0, sizeof(MessageLoggerQ::OpCode));
+      std::memcpy(&operand, slot_p + sizeof(MessageLoggerQ::OpCode), sizeof(void *));
+      b.commit(buf_size);
+    }
 
-} // end of namespace service  
-} // end of namespace edm  
+  }  // end of namespace service
+}  // end of namespace edm
diff --git a/FWCore/MessageService/src/ThreadSafeLogMessageLoggerScribe.cc b/FWCore/MessageService/src/ThreadSafeLogMessageLoggerScribe.cc
index b80aaa030238f..50e5885186376 100644
--- a/FWCore/MessageService/src/ThreadSafeLogMessageLoggerScribe.cc
+++ b/FWCore/MessageService/src/ThreadSafeLogMessageLoggerScribe.cc
@@ -18,8 +18,8 @@
 #include "FWCore/MessageLogger/interface/ErrorObj.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/MessageLogger/interface/ConfigurationHandshake.h"
-#include "FWCore/MessageLogger/interface/MessageDrop.h"		// change log 37
-#include "FWCore/MessageLogger/interface/ELseverityLevel.h"	// change log 37
+#include "FWCore/MessageLogger/interface/MessageDrop.h"      // change log 37
+#include "FWCore/MessageLogger/interface/ELseverityLevel.h"  // change log 37
 
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/Utilities/interface/Algorithms.h"
@@ -34,115 +34,100 @@ using std::cerr;
 
 namespace edm {
   namespace service {
-    
-    
+
     ThreadSafeLogMessageLoggerScribe::ThreadSafeLogMessageLoggerScribe()
-    : admin_p   ( new ELadministrator() )
-    , early_dest( admin_p->attach(std::make_shared<ELoutput>(std::cerr, false)) )
-    , file_ps   ( )
-    , job_pset_p( )
-    , clean_slate_configuration( true )
-    , active( true )
-    , purge_mode (false)						// changeLog 32
-    , count (false)							// changeLog 32
-    , m_messageBeingSent(false)
-    , m_waitingThreshold(100)
-    , m_tooManyWaitingMessagesCount(0)
-    {
-    }
-    
-    ThreadSafeLogMessageLoggerScribe::~ThreadSafeLogMessageLoggerScribe()
-    {
+        : admin_p(new ELadministrator()),
+          early_dest(admin_p->attach(std::make_shared<ELoutput>(std::cerr, false))),
+          file_ps(),
+          job_pset_p(),
+          clean_slate_configuration(true),
+          active(true),
+          purge_mode(false)  // changeLog 32
+          ,
+          count(false)  // changeLog 32
+          ,
+          m_messageBeingSent(false),
+          m_waitingThreshold(100),
+          m_tooManyWaitingMessagesCount(0) {}
+
+    ThreadSafeLogMessageLoggerScribe::~ThreadSafeLogMessageLoggerScribe() {
       //if there are any waiting message, finish them off
-      ErrorObj* errorobj_p=nullptr;
+      ErrorObj* errorobj_p = nullptr;
       std::vector<std::string> categories;
-      while(m_waitingMessages.try_pop(errorobj_p)) {
-        if(not purge_mode) {
+      while (m_waitingMessages.try_pop(errorobj_p)) {
+        if (not purge_mode) {
           categories.clear();
           parseCategories(errorobj_p->xid().id, categories);
           for (unsigned int icat = 0; icat < categories.size(); ++icat) {
             errorobj_p->setID(categories[icat]);
-            admin_p->log( *errorobj_p );  // route the message text
+            admin_p->log(*errorobj_p);  // route the message text
           }
         }
         delete errorobj_p;
       }
-      
+
       admin_p->finish();
     }
-    
-    void
-    ThreadSafeLogMessageLoggerScribe::runCommand(				// changeLog 32
-                                                 MessageLoggerQ::OpCode  opcode,
-                                                 void * operand)
-    {
-      switch(opcode)  {  // interpret the work item
-        default:  {
+
+    void ThreadSafeLogMessageLoggerScribe::runCommand(  // changeLog 32
+        MessageLoggerQ::OpCode opcode,
+        void* operand) {
+      switch (opcode) {  // interpret the work item
+        default: {
           assert(false);  // can't happen (we certainly hope!)
           break;
         }
-        case MessageLoggerQ::END_THREAD:  {
+        case MessageLoggerQ::END_THREAD: {
           break;
         }
-        case MessageLoggerQ::LOG_A_MESSAGE:  {
-          ErrorObj *  errorobj_p = static_cast<ErrorObj *>(operand);
+        case MessageLoggerQ::LOG_A_MESSAGE: {
+          ErrorObj* errorobj_p = static_cast<ErrorObj*>(operand);
           try {
-            if(active && !purge_mode){
-              log (errorobj_p);
+            if (active && !purge_mode) {
+              log(errorobj_p);
             }
-          }
-          catch(cms::Exception& e)
-          {
+          } catch (cms::Exception& e) {
             ++count;
-            std::cerr << "ThreadSafeLogMessageLoggerScribe caught " << count
-            << " cms::Exceptions, text = \n"
-            << e.what() << "\n";
-            
-            if(count > 25)
-            {
+            std::cerr << "ThreadSafeLogMessageLoggerScribe caught " << count << " cms::Exceptions, text = \n"
+                      << e.what() << "\n";
+
+            if (count > 25) {
               cerr << "MessageLogger will no longer be processing "
-              << "messages due to errors (entering purge mode).\n";
+                   << "messages due to errors (entering purge mode).\n";
               purge_mode = true;
             }
-          }
-          catch(...)
-          {
+          } catch (...) {
             std::cerr << "ThreadSafeLogMessageLoggerScribe caught an unknown exception and "
-            << "will no longer be processing "
-            << "messages. (entering purge mode)\n";
+                      << "will no longer be processing "
+                      << "messages. (entering purge mode)\n";
             purge_mode = true;
           }
           break;
         }
-        case MessageLoggerQ::CONFIGURE:  {			// changelog 17
-          job_pset_p = std::shared_ptr<PSet>(static_cast<PSet*>(operand)); // propagate_const<T> has no reset() function
+        case MessageLoggerQ::CONFIGURE: {  // changelog 17
+          job_pset_p =
+              std::shared_ptr<PSet>(static_cast<PSet*>(operand));  // propagate_const<T> has no reset() function
           configure_errorlog();
           break;
         }
         case MessageLoggerQ::SUMMARIZE: {
-          assert( operand == nullptr );
+          assert(operand == nullptr);
           try {
             triggerStatisticsSummaries();
-          }
-          catch(cms::Exception& e)
-          {
+          } catch (cms::Exception& e) {
             std::cerr << "ThreadSafeLogMessageLoggerScribe caught exception "
-            << "during summarize:\n"
-            << e.what() << "\n";
-          }
-          catch(...)
-          {
+                      << "during summarize:\n"
+                      << e.what() << "\n";
+          } catch (...) {
             std::cerr << "ThreadSafeLogMessageLoggerScribe caught unkonwn exception type "
-            << "during summarize. (Ignored)\n";
+                      << "during summarize. (Ignored)\n";
           }
           break;
         }
-        case MessageLoggerQ::JOBMODE:  {			// change log 24
-          std::string* jobMode_p =
-          static_cast<std::string*>(operand);
+        case MessageLoggerQ::JOBMODE: {  // change log 24
+          std::string* jobMode_p = static_cast<std::string*>(operand);
           JobMode jm = MessageLoggerDefaults::mode(*jobMode_p);
-          messageLoggerDefaults =
-          value_ptr<MessageLoggerDefaults>(new MessageLoggerDefaults(jm));
+          messageLoggerDefaults = value_ptr<MessageLoggerDefaults>(new MessageLoggerDefaults(jm));
           // Note - since messageLoggerDefaults is a value_ptr,
           //        there is no concern about deleting here.
           delete jobMode_p;  // dispose of the message text
@@ -150,55 +135,53 @@ namespace edm {
                              // in MessageLogger.cc (service version)
           break;
         }
-        case MessageLoggerQ::SHUT_UP:  {
-          assert( operand == nullptr );
+        case MessageLoggerQ::SHUT_UP: {
+          assert(operand == nullptr);
           active = false;
           break;
         }
-        case MessageLoggerQ::FLUSH_LOG_Q:  {			// changelog 26
+        case MessageLoggerQ::FLUSH_LOG_Q: {  // changelog 26
           break;
         }
-        case MessageLoggerQ::GROUP_STATS:  {			// change log 27
-          std::string* cat_p =
-          static_cast<std::string*>(operand);
+        case MessageLoggerQ::GROUP_STATS: {  // change log 27
+          std::string* cat_p = static_cast<std::string*>(operand);
           ELstatistics::noteGroupedCategory(*cat_p);
           delete cat_p;  // dispose of the message text
           break;
         }
-        case MessageLoggerQ::FJR_SUMMARY:  {			// changelog 29
-          std::map<std::string, double> * smp =
-          static_cast<std::map<std::string, double> *>(operand);
+        case MessageLoggerQ::FJR_SUMMARY: {  // changelog 29
+          std::map<std::string, double>* smp = static_cast<std::map<std::string, double>*>(operand);
           triggerFJRmessageSummary(*smp);
           break;
         }
       }  // switch
-      
+
     }  // ThreadSafeLogMessageLoggerScribe::runCommand(opcode, operand)
-    
-    void ThreadSafeLogMessageLoggerScribe::log ( ErrorObj *  errorobj_p ) {
+
+    void ThreadSafeLogMessageLoggerScribe::log(ErrorObj* errorobj_p) {
       bool expected = false;
       std::unique_ptr<ErrorObj> obj(errorobj_p);
-      if(m_messageBeingSent.compare_exchange_strong(expected,true)) {
+      if (m_messageBeingSent.compare_exchange_strong(expected, true)) {
         std::vector<std::string> categories;
         parseCategories(errorobj_p->xid().id, categories);
         for (unsigned int icat = 0; icat < categories.size(); ++icat) {
           errorobj_p->setID(categories[icat]);
-          admin_p->log( *errorobj_p );  // route the message text
+          admin_p->log(*errorobj_p);  // route the message text
         }
         //process any waiting messages
-        errorobj_p=nullptr;
-        while(not purge_mode and m_waitingMessages.try_pop(errorobj_p)) {
+        errorobj_p = nullptr;
+        while (not purge_mode and m_waitingMessages.try_pop(errorobj_p)) {
           obj.reset(errorobj_p);
           categories.clear();
           parseCategories(errorobj_p->xid().id, categories);
           for (unsigned int icat = 0; icat < categories.size(); ++icat) {
             errorobj_p->setID(categories[icat]);
-            admin_p->log( *errorobj_p );  // route the message text
+            admin_p->log(*errorobj_p);  // route the message text
           }
         }
         m_messageBeingSent.store(false);
       } else {
-        if(m_waitingMessages.unsafe_size() < m_waitingThreshold) {
+        if (m_waitingMessages.unsafe_size() < m_waitingThreshold) {
           obj.release();
           m_waitingMessages.push(errorobj_p);
         } else {
@@ -206,350 +189,307 @@ namespace edm {
         }
       }
     }
-    
-    void
-    ThreadSafeLogMessageLoggerScribe::configure_errorlog()
-    {
-      vString  empty_vString;
-      String   empty_String;
-      PSet     empty_PSet;
-      
+
+    void ThreadSafeLogMessageLoggerScribe::configure_errorlog() {
+      vString empty_vString;
+      String empty_String;
+      PSet empty_PSet;
+
       // The following is present to test pre-configuration message handling:
-      String preconfiguration_message
-      = getAparameter<String>
-      (*job_pset_p, "generate_preconfiguration_message", empty_String);
+      String preconfiguration_message =
+          getAparameter<String>(*job_pset_p, "generate_preconfiguration_message", empty_String);
       if (preconfiguration_message != empty_String) {
         // To test a preconfiguration message without first going thru the
         // configuration we are about to do, we issue the message (so it sits
         // on the queue), then copy the processing that the LOG_A_MESSAGE case
         // does.  We suppress the timestamp to allow for automated unit testing.
         early_dest->suppressTime();
-        LogError ("preconfiguration") << preconfiguration_message;
+        LogError("preconfiguration") << preconfiguration_message;
       }
-      
-      if ( !stream_ps.empty() ) {
-        LogWarning ("multiLogConfig")
-        << "The message logger has been configured multiple times";
-        clean_slate_configuration = false;				// Change Log 22
+
+      if (!stream_ps.empty()) {
+        LogWarning("multiLogConfig") << "The message logger has been configured multiple times";
+        clean_slate_configuration = false;  // Change Log 22
       }
-      m_waitingThreshold = getAparameter<unsigned int>(*job_pset_p,
-                                                      "waiting_threshold",
-                                                      100);
-      configure_ordinary_destinations();				// Change Log 16
-      configure_statistics();					// Change Log 16
-    }  // ThreadSafeLogMessageLoggerScribe::configure_errorlog()
-    
-    
-    
-    
-    void
-    ThreadSafeLogMessageLoggerScribe::configure_dest( std::shared_ptr<ELdestination> dest_ctrl
-                                                     , String const &  filename
-                                                     )
-    {
-      static const int NO_VALUE_SET = -45654;			// change log 2
-      vString  empty_vString;
-      PSet     empty_PSet;
-      String   empty_String;
-      
+      m_waitingThreshold = getAparameter<unsigned int>(*job_pset_p, "waiting_threshold", 100);
+      configure_ordinary_destinations();  // Change Log 16
+      configure_statistics();             // Change Log 16
+    }                                     // ThreadSafeLogMessageLoggerScribe::configure_errorlog()
+
+    void ThreadSafeLogMessageLoggerScribe::configure_dest(std::shared_ptr<ELdestination> dest_ctrl,
+                                                          String const& filename) {
+      static const int NO_VALUE_SET = -45654;  // change log 2
+      vString empty_vString;
+      PSet empty_PSet;
+      String empty_String;
+
       // Defaults:							// change log 3a
       const std::string COMMON_DEFAULT_THRESHOLD = "INFO";
-      const         int COMMON_DEFAULT_LIMIT     = NO_VALUE_SET;
-      const         int COMMON_DEFAULT_INTERVAL  = NO_VALUE_SET; 	// change log 6
-      const         int COMMON_DEFAULT_TIMESPAN  = NO_VALUE_SET;
-      
-      char const*  severity_array[] = {"WARNING", "INFO", "ERROR", "DEBUG"};
-      vString const  severities(severity_array+0, severity_array+4);
-      
+      const int COMMON_DEFAULT_LIMIT = NO_VALUE_SET;
+      const int COMMON_DEFAULT_INTERVAL = NO_VALUE_SET;  // change log 6
+      const int COMMON_DEFAULT_TIMESPAN = NO_VALUE_SET;
+
+      char const* severity_array[] = {"WARNING", "INFO", "ERROR", "DEBUG"};
+      vString const severities(severity_array + 0, severity_array + 4);
+
       // grab list of categories
-      vString  categories
-      = getAparameter<vString>(*job_pset_p, "categories", empty_vString);
-      
+      vString categories = getAparameter<vString>(*job_pset_p, "categories", empty_vString);
+
       // grab list of messageIDs -- these are a synonym for categories
       // Note -- the use of messageIDs is deprecated in favor of categories
       {
-        vString  messageIDs
-        = getAparameter<vString>(*job_pset_p, "messageIDs", empty_vString);
-        
+        vString messageIDs = getAparameter<vString>(*job_pset_p, "messageIDs", empty_vString);
+
         // combine the lists, not caring about possible duplicates (for now)
-        copy_all( messageIDs, std::back_inserter(categories) );
+        copy_all(messageIDs, std::back_inserter(categories));
       }  // no longer need messageIDs
-      
+
       // grab list of hardwired categories (hardcats) -- these are to be added
       // to the list of categories -- change log 24
       {
         std::vector<std::string> hardcats = messageLoggerDefaults->categories;
         // combine the lists, not caring about possible duplicates (for now)
-        copy_all( hardcats, std::back_inserter(categories) );
+        copy_all(hardcats, std::back_inserter(categories));
       }  // no longer need hardcats
-      
+
       // grab default threshold common to all destinations
-      String default_threshold
-      = getAparameter<String>(*job_pset_p, "threshold", empty_String);
+      String default_threshold = getAparameter<String>(*job_pset_p, "threshold", empty_String);
       // change log 3a
       // change log 24
-      
+
       // grab default limit/interval/timespan common to all destinations/categories:
-      PSet  default_pset
-      = getAparameter<PSet>(*job_pset_p, "default", empty_PSet);
-      int  default_limit
-      = getAparameter<int>(default_pset, "limit", COMMON_DEFAULT_LIMIT);
-      int  default_interval
-      = getAparameter<int>(default_pset, "reportEvery", COMMON_DEFAULT_INTERVAL);
+      PSet default_pset = getAparameter<PSet>(*job_pset_p, "default", empty_PSet);
+      int default_limit = getAparameter<int>(default_pset, "limit", COMMON_DEFAULT_LIMIT);
+      int default_interval = getAparameter<int>(default_pset, "reportEvery", COMMON_DEFAULT_INTERVAL);
       // change log 6, 10
-      int  default_timespan
-      = getAparameter<int>(default_pset, "timespan", COMMON_DEFAULT_TIMESPAN);
+      int default_timespan = getAparameter<int>(default_pset, "timespan", COMMON_DEFAULT_TIMESPAN);
       // change log 2a
       // change log 3a
-      String default_pset_threshold
-      = getAparameter<String>(default_pset, "threshold", default_threshold);
+      String default_pset_threshold = getAparameter<String>(default_pset, "threshold", default_threshold);
       // change log 34
-      
+
       // grab all of this destination's parameters:
-      PSet  dest_pset = getAparameter<PSet>(*job_pset_p, filename, empty_PSet);
-      
+      PSet dest_pset = getAparameter<PSet>(*job_pset_p, filename, empty_PSet);
+
       // See if this is just a placeholder			// change log 9
-      bool is_placeholder
-      = getAparameter<bool>(dest_pset, "placeholder", false);
-      if (is_placeholder) return;
-      
+      bool is_placeholder = getAparameter<bool>(dest_pset, "placeholder", false);
+      if (is_placeholder)
+        return;
+
       // grab this destination's default limit/interval/timespan:
-      PSet  dest_default_pset
-      = getAparameter<PSet>(dest_pset, "default", empty_PSet);
-      int  dest_default_limit
-      = getAparameter<int>(dest_default_pset, "limit", default_limit);
-      int  dest_default_interval
-      = getAparameter<int>(dest_default_pset, "reportEvery", default_interval);
+      PSet dest_default_pset = getAparameter<PSet>(dest_pset, "default", empty_PSet);
+      int dest_default_limit = getAparameter<int>(dest_default_pset, "limit", default_limit);
+      int dest_default_interval = getAparameter<int>(dest_default_pset, "reportEvery", default_interval);
       // change log 6
-      int  dest_default_timespan
-      = getAparameter<int>(dest_default_pset, "timespan", default_timespan);
+      int dest_default_timespan = getAparameter<int>(dest_default_pset, "timespan", default_timespan);
       // change log 1a
-      if ( dest_default_limit != NO_VALUE_SET ) {
-        if ( dest_default_limit < 0 ) dest_default_limit = 2000000000;
-        dest_ctrl->setLimit("*", dest_default_limit );
-      } 						// change log 1b, 2a, 2b
-      if ( dest_default_interval != NO_VALUE_SET ) {  // change log 6
-        dest_ctrl->setInterval("*", dest_default_interval );
+      if (dest_default_limit != NO_VALUE_SET) {
+        if (dest_default_limit < 0)
+          dest_default_limit = 2000000000;
+        dest_ctrl->setLimit("*", dest_default_limit);
+      }                                             // change log 1b, 2a, 2b
+      if (dest_default_interval != NO_VALUE_SET) {  // change log 6
+        dest_ctrl->setInterval("*", dest_default_interval);
       }
-      if ( dest_default_timespan != NO_VALUE_SET ) {
-        if ( dest_default_timespan < 0 ) dest_default_timespan = 2000000000;
-        dest_ctrl->setTimespan("*", dest_default_timespan );
-      } 						// change log 1b, 2a, 2b
-      
+      if (dest_default_timespan != NO_VALUE_SET) {
+        if (dest_default_timespan < 0)
+          dest_default_timespan = 2000000000;
+        dest_ctrl->setTimespan("*", dest_default_timespan);
+      }  // change log 1b, 2a, 2b
+
       // establish this destination's threshold:
-      String dest_threshold
-      = getAparameter<String>(dest_pset, "threshold", default_threshold);
+      String dest_threshold = getAparameter<String>(dest_pset, "threshold", default_threshold);
       if (dest_threshold == empty_String) {
         dest_threshold = default_threshold;
       }
-      if (dest_threshold == empty_String) {			// change log 34
+      if (dest_threshold == empty_String) {  // change log 34
         dest_threshold = default_pset_threshold;
       }
       if (dest_threshold == empty_String) {
         dest_threshold = messageLoggerDefaults->threshold(filename);
       }
-      if (dest_threshold == empty_String) dest_threshold = COMMON_DEFAULT_THRESHOLD;
-      ELseverityLevel  threshold_sev(dest_threshold);
+      if (dest_threshold == empty_String)
+        dest_threshold = COMMON_DEFAULT_THRESHOLD;
+      ELseverityLevel threshold_sev(dest_threshold);
       dest_ctrl->setThreshold(threshold_sev);
       // change log 37
-      if (threshold_sev <= ELseverityLevel::ELsev_success)
-      { edm::MessageDrop::debugAlwaysSuppressed = false; }
-      if (threshold_sev <= ELseverityLevel::ELsev_info)
-      { edm::MessageDrop::infoAlwaysSuppressed = false; }
-      if (threshold_sev <= ELseverityLevel::ELsev_warning)
-      { edm::MessageDrop::warningAlwaysSuppressed = false; }
-      
+      if (threshold_sev <= ELseverityLevel::ELsev_success) {
+        edm::MessageDrop::debugAlwaysSuppressed = false;
+      }
+      if (threshold_sev <= ELseverityLevel::ELsev_info) {
+        edm::MessageDrop::infoAlwaysSuppressed = false;
+      }
+      if (threshold_sev <= ELseverityLevel::ELsev_warning) {
+        edm::MessageDrop::warningAlwaysSuppressed = false;
+      }
+
       // establish this destination's limit/interval/timespan for each category:
-      for( vString::const_iterator id_it = categories.begin()
-          ; id_it != categories.end()
-          ; ++id_it
-          )
-      {
-        String  msgID = *id_it;
-        PSet default_category_pset
-        = getAparameter<PSet>(default_pset, msgID, empty_PSet);	// change log 5
-        PSet  category_pset
-        = getAparameter<PSet>(dest_pset, msgID, default_category_pset);
-        
-        int  category_default_limit
-        = getAparameter<int>(default_category_pset, "limit", NO_VALUE_SET);
-        int  limit
-        = getAparameter<int>(category_pset, "limit", category_default_limit);
-        if (limit == NO_VALUE_SET) limit = dest_default_limit;
+      for (vString::const_iterator id_it = categories.begin(); id_it != categories.end(); ++id_it) {
+        String msgID = *id_it;
+        PSet default_category_pset = getAparameter<PSet>(default_pset, msgID, empty_PSet);  // change log 5
+        PSet category_pset = getAparameter<PSet>(dest_pset, msgID, default_category_pset);
+
+        int category_default_limit = getAparameter<int>(default_category_pset, "limit", NO_VALUE_SET);
+        int limit = getAparameter<int>(category_pset, "limit", category_default_limit);
+        if (limit == NO_VALUE_SET)
+          limit = dest_default_limit;
         // change log 7
-        int  category_default_interval
-        = getAparameter<int>(default_category_pset, "reportEvery", NO_VALUE_SET);
-        int  interval
-        = getAparameter<int>(category_pset, "reportEvery",category_default_interval);
-        if (interval == NO_VALUE_SET) interval = dest_default_interval;
+        int category_default_interval = getAparameter<int>(default_category_pset, "reportEvery", NO_VALUE_SET);
+        int interval = getAparameter<int>(category_pset, "reportEvery", category_default_interval);
+        if (interval == NO_VALUE_SET)
+          interval = dest_default_interval;
         // change log 6  and then 7
-        int  category_default_timespan
-        = getAparameter<int>(default_category_pset, "timespan", NO_VALUE_SET);
-        int  timespan
-        = getAparameter<int>(category_pset, "timespan", category_default_timespan);
-        if (timespan == NO_VALUE_SET) timespan = dest_default_timespan;
+        int category_default_timespan = getAparameter<int>(default_category_pset, "timespan", NO_VALUE_SET);
+        int timespan = getAparameter<int>(category_pset, "timespan", category_default_timespan);
+        if (timespan == NO_VALUE_SET)
+          timespan = dest_default_timespan;
         // change log 7
-        
+
         const std::string& category = msgID;
-        if ( limit     == NO_VALUE_SET )  {				// change log 24
-          limit = messageLoggerDefaults->limit(filename,category);
+        if (limit == NO_VALUE_SET) {  // change log 24
+          limit = messageLoggerDefaults->limit(filename, category);
         }
-        if ( interval     == NO_VALUE_SET )  {			// change log 24
-          interval = messageLoggerDefaults->reportEvery(filename,category);
+        if (interval == NO_VALUE_SET) {  // change log 24
+          interval = messageLoggerDefaults->reportEvery(filename, category);
         }
-        if ( timespan     == NO_VALUE_SET )  {			// change log 24
-          timespan = messageLoggerDefaults->timespan(filename,category);
+        if (timespan == NO_VALUE_SET) {  // change log 24
+          timespan = messageLoggerDefaults->timespan(filename, category);
         }
-        
-        if( limit     != NO_VALUE_SET )  {
-          if ( limit < 0 ) limit = 2000000000;
+
+        if (limit != NO_VALUE_SET) {
+          if (limit < 0)
+            limit = 2000000000;
           dest_ctrl->setLimit(msgID, limit);
-        }  						// change log 2a, 2b
-        if( interval  != NO_VALUE_SET )  {
+        }  // change log 2a, 2b
+        if (interval != NO_VALUE_SET) {
           dest_ctrl->setInterval(msgID, interval);
-        }  						// change log 6
-        if( timespan  != NO_VALUE_SET )  {
-          if ( timespan < 0 ) timespan = 2000000000;
+        }  // change log 6
+        if (timespan != NO_VALUE_SET) {
+          if (timespan < 0)
+            timespan = 2000000000;
           dest_ctrl->setTimespan(msgID, timespan);
-        }						// change log 2a, 2b
-        
+        }  // change log 2a, 2b
+
       }  // for
-      
+
       // establish this destination's limit for each severity:
-      for( vString::const_iterator sev_it = severities.begin()
-          ; sev_it != severities.end()
-          ; ++sev_it
-          )
-      {
-        String  sevID = *sev_it;
-        ELseverityLevel  severity(sevID);
-        PSet  default_sev_pset
-        = getAparameter<PSet>(default_pset, sevID, empty_PSet);
-        PSet  sev_pset
-        = getAparameter<PSet>(dest_pset, sevID, default_sev_pset);
+      for (vString::const_iterator sev_it = severities.begin(); sev_it != severities.end(); ++sev_it) {
+        String sevID = *sev_it;
+        ELseverityLevel severity(sevID);
+        PSet default_sev_pset = getAparameter<PSet>(default_pset, sevID, empty_PSet);
+        PSet sev_pset = getAparameter<PSet>(dest_pset, sevID, default_sev_pset);
         // change log 5
-        int  limit     = getAparameter<int>(sev_pset, "limit", NO_VALUE_SET);
-        if ( limit     == NO_VALUE_SET )  {				// change log 24
-          limit = messageLoggerDefaults->sev_limit(filename,sevID);
+        int limit = getAparameter<int>(sev_pset, "limit", NO_VALUE_SET);
+        if (limit == NO_VALUE_SET) {  // change log 24
+          limit = messageLoggerDefaults->sev_limit(filename, sevID);
         }
-        if( limit    != NO_VALUE_SET )  {
-          if (limit < 0) limit = 2000000000;			// change log 38
-          dest_ctrl->setLimit(severity, limit   );
+        if (limit != NO_VALUE_SET) {
+          if (limit < 0)
+            limit = 2000000000;  // change log 38
+          dest_ctrl->setLimit(severity, limit);
         }
-        int  interval  = getAparameter<int>(sev_pset, "reportEvery", NO_VALUE_SET);
-        if ( interval     == NO_VALUE_SET )  {			// change log 24
-          interval = messageLoggerDefaults->sev_reportEvery(filename,sevID);
+        int interval = getAparameter<int>(sev_pset, "reportEvery", NO_VALUE_SET);
+        if (interval == NO_VALUE_SET) {  // change log 24
+          interval = messageLoggerDefaults->sev_reportEvery(filename, sevID);
         }
-        if( interval != NO_VALUE_SET )  dest_ctrl->setInterval(severity, interval);
+        if (interval != NO_VALUE_SET)
+          dest_ctrl->setInterval(severity, interval);
         // change log 2
-        int  timespan  = getAparameter<int>(sev_pset, "timespan", NO_VALUE_SET);
-        if ( timespan     == NO_VALUE_SET )  {			// change log 24
-          timespan = messageLoggerDefaults->sev_timespan(filename,sevID);
+        int timespan = getAparameter<int>(sev_pset, "timespan", NO_VALUE_SET);
+        if (timespan == NO_VALUE_SET) {  // change log 24
+          timespan = messageLoggerDefaults->sev_timespan(filename, sevID);
         }
-        if( timespan    != NO_VALUE_SET )  {
-          if (timespan < 0) timespan = 2000000000;			// change log 38
-          dest_ctrl->setTimespan(severity, timespan   );
+        if (timespan != NO_VALUE_SET) {
+          if (timespan < 0)
+            timespan = 2000000000;  // change log 38
+          dest_ctrl->setTimespan(severity, timespan);
         }
       }  // for
-      
+
       // establish this destination's linebreak policy:
-      bool noLineBreaks_default
-      = getAparameter<bool> (default_pset, "noLineBreaks", false);
+      bool noLineBreaks_default = getAparameter<bool>(default_pset, "noLineBreaks", false);
       // change log 5
-      bool noLineBreaks
-      = getAparameter<bool> (dest_pset, "noLineBreaks", noLineBreaks_default);
+      bool noLineBreaks = getAparameter<bool>(dest_pset, "noLineBreaks", noLineBreaks_default);
       if (noLineBreaks) {
         dest_ctrl->setLineLength(32000);
-      }
-      else {
-        int  lenDef = 80;
-        int  lineLen_default
-        = getAparameter<int> (default_pset, "lineLength", lenDef);
+      } else {
+        int lenDef = 80;
+        int lineLen_default = getAparameter<int>(default_pset, "lineLength", lenDef);
         // change log 5
-        int  lineLen = getAparameter<int> (dest_pset, "lineLength", lineLen_default);
+        int lineLen = getAparameter<int>(dest_pset, "lineLength", lineLen_default);
         if (lineLen != lenDef) {
           dest_ctrl->setLineLength(lineLen);
         }
       }
-      
+
       // if indicated, suppress time stamps in this destination's output
-      bool suppressTime_default
-      = getAparameter<bool> (default_pset, "noTimeStamps", false);
-      bool suppressTime
-      = getAparameter<bool> (dest_pset, "noTimeStamps", suppressTime_default);
+      bool suppressTime_default = getAparameter<bool>(default_pset, "noTimeStamps", false);
+      bool suppressTime = getAparameter<bool>(dest_pset, "noTimeStamps", suppressTime_default);
       if (suppressTime) {
         dest_ctrl->suppressTime();
       }
-      
+
     }  // ThreadSafeLogMessageLoggerScribe::configure_dest()
-    
-    void
-    ThreadSafeLogMessageLoggerScribe::configure_ordinary_destinations()	// Changelog 16
+
+    void ThreadSafeLogMessageLoggerScribe::configure_ordinary_destinations()  // Changelog 16
     {
-      vString  empty_vString;
-      String   empty_String;
-      PSet     empty_PSet;
-      
+      vString empty_vString;
+      String empty_String;
+      PSet empty_PSet;
+
       // Initialize unversal suppression variables
-      MessageDrop::debugAlwaysSuppressed=true;		// change log 37
-      MessageDrop::infoAlwaysSuppressed=true;	 	// change log 37
-      MessageDrop::warningAlwaysSuppressed=true; 		// change log 37
-      
+      MessageDrop::debugAlwaysSuppressed = true;    // change log 37
+      MessageDrop::infoAlwaysSuppressed = true;     // change log 37
+      MessageDrop::warningAlwaysSuppressed = true;  // change log 37
+
       // grab list of destinations:
-      vString  destinations
-      = getAparameter<vString>(*job_pset_p, "destinations", empty_vString);
-      
+      vString destinations = getAparameter<vString>(*job_pset_p, "destinations", empty_vString);
+
       // Use the default list of destinations if and only if the grabbed list is
       // empty						 	// change log 24
       if (destinations.empty()) {
         destinations = messageLoggerDefaults->destinations;
       }
-      
+
       // dial down the early destination if other dest's are supplied:
-      if( ! destinations.empty() )
+      if (!destinations.empty())
         early_dest->setThreshold(ELhighestSeverity);
-      
+
       // establish each destination:
-      for( vString::const_iterator it = destinations.begin()
-          ; it != destinations.end()
-          ; ++it
-          )
-      {
+      for (vString::const_iterator it = destinations.begin(); it != destinations.end(); ++it) {
         String filename = *it;
         String psetname = filename;
-        
+
         // check that this destination is not just a placeholder // change log 11
-        PSet  dest_pset = getAparameter<PSet>(*job_pset_p, psetname, empty_PSet);
-        bool is_placeholder
-        = getAparameter<bool>(dest_pset, "placeholder", false);
-        if (is_placeholder) continue;
-        
+        PSet dest_pset = getAparameter<PSet>(*job_pset_p, psetname, empty_PSet);
+        bool is_placeholder = getAparameter<bool>(dest_pset, "placeholder", false);
+        if (is_placeholder)
+          continue;
+
         // Modify the file name if extension or name is explicitly specified
         // change log 14
-        
+
         // Although for an ordinary destination there is no output attribute
         // for the cfg (you can use filename instead) we provide output() for
         // uniformity with the statistics destinations.  The "right way" to
         // work this would have been to provide a filename() method, along with
         // an extension() method.  We recognize the potential name confusion here
         // (filename(filename))!
-        
+
         // Determine the destination file name to use if no explicit filename is
         // supplied in the cfg.
-        String filename_default
-        = getAparameter<String>(dest_pset, "output", empty_String);
-        if ( filename_default == empty_String ) {
-          filename_default = messageLoggerDefaults->output(psetname); // change log 31
-          if (filename_default  == empty_String) {
-            filename_default  = filename;
+        String filename_default = getAparameter<String>(dest_pset, "output", empty_String);
+        if (filename_default == empty_String) {
+          filename_default = messageLoggerDefaults->output(psetname);  // change log 31
+          if (filename_default == empty_String) {
+            filename_default = filename;
           }
         }
-        
-        String explicit_filename
-        = getAparameter<String>(dest_pset, "filename", filename_default);
-        if (explicit_filename != empty_String) filename = explicit_filename;
-        String explicit_extension
-        = getAparameter<String>(dest_pset, "extension", empty_String);
+
+        String explicit_filename = getAparameter<String>(dest_pset, "filename", filename_default);
+        if (explicit_filename != empty_String)
+          filename = explicit_filename;
+        String explicit_extension = getAparameter<String>(dest_pset, "extension", empty_String);
         if (explicit_extension != empty_String) {
           if (explicit_extension[0] == '.') {
             filename += explicit_extension;
@@ -557,124 +497,109 @@ namespace edm {
             filename = filename + "." + explicit_extension;
           }
         }
-        
+
         // Attach a default extension of .log if there is no extension on a file
         // change log 18 - this had been done in concert with attaching destination
-        
-        std::string actual_filename = filename;			// change log 4
-        if ( (filename != "cout") && (filename != "cerr") )  {
+
+        std::string actual_filename = filename;  // change log 4
+        if ((filename != "cout") && (filename != "cerr")) {
           const std::string::size_type npos = std::string::npos;
-          if ( filename.find('.') == npos ) {
+          if (filename.find('.') == npos) {
             actual_filename += ".log";
           }
         }
-        
+
         // Check that this is not a duplicate name			// change log 18
-        if ( stream_ps.find(actual_filename)!=stream_ps.end() ) {
-          if (clean_slate_configuration) {				// change log 22
-                                                  //        throw edm::Exception ( edm::errors::Configuration )
-            LogError("duplicateDestination")			// change log 35
-            <<"Duplicate name for a MessageLogger Destination: "
-            << actual_filename
-            << "\n" << "Only the first configuration instructions are used";
+        if (stream_ps.find(actual_filename) != stream_ps.end()) {
+          if (clean_slate_configuration) {    // change log 22
+                                              //        throw edm::Exception ( edm::errors::Configuration )
+            LogError("duplicateDestination")  // change log 35
+                << "Duplicate name for a MessageLogger Destination: " << actual_filename << "\n"
+                << "Only the first configuration instructions are used";
             continue;
           } else {
             LogWarning("duplicateDestination")
-            <<"Duplicate name for a MessageLogger Destination: "
-            << actual_filename
-            << "\n" << "Only original configuration instructions are used";
+                << "Duplicate name for a MessageLogger Destination: " << actual_filename << "\n"
+                << "Only original configuration instructions are used";
             continue;
           }
         }
-        
+
         ordinary_destination_filenames.push_back(actual_filename);
-        
+
         // attach the current destination, keeping a control handle to it:
         std::shared_ptr<ELdestination> dest_ctrl;
-        if( actual_filename == "cout" )  {
-          dest_ctrl = admin_p->attach( std::make_shared<ELoutput>(std::cout) );
+        if (actual_filename == "cout") {
+          dest_ctrl = admin_p->attach(std::make_shared<ELoutput>(std::cout));
           stream_ps["cout"] = &std::cout;
-        }
-        else if( actual_filename == "cerr" )  {
+        } else if (actual_filename == "cerr") {
           early_dest->setThreshold(ELzeroSeverity);
           dest_ctrl = early_dest;
           stream_ps["cerr"] = &std::cerr;
-        }
-        else  {
+        } else {
           auto os_sp = std::make_shared<std::ofstream>(actual_filename.c_str());
           file_ps.push_back(os_sp);
-          dest_ctrl = admin_p->attach( std::make_shared<ELoutput>(*os_sp) );
+          dest_ctrl = admin_p->attach(std::make_shared<ELoutput>(*os_sp));
           stream_ps[actual_filename] = os_sp.get();
         }
-        
+
         // now configure this destination:
         configure_dest(dest_ctrl, psetname);
-        
+
       }  // for [it = destinations.begin() to end()]
-      
-    } // configure_ordinary_destinations
-    
-    
-    void
-    ThreadSafeLogMessageLoggerScribe::configure_statistics()
-    {
-      vString  empty_vString;
-      String   empty_String;
-      PSet     empty_PSet;
-      
+
+    }  // configure_ordinary_destinations
+
+    void ThreadSafeLogMessageLoggerScribe::configure_statistics() {
+      vString empty_vString;
+      String empty_String;
+      PSet empty_PSet;
+
       // grab list of statistics destinations:
-      vString  statistics
-      = getAparameter<vString>(*job_pset_p, "statistics", empty_vString);
-      
-      bool no_statistics_configured = statistics.empty();		// change log 24
-      
-      if ( no_statistics_configured ) {
+      vString statistics = getAparameter<vString>(*job_pset_p, "statistics", empty_vString);
+
+      bool no_statistics_configured = statistics.empty();  // change log 24
+
+      if (no_statistics_configured) {
         // Read the list of staistics destinations from hardwired defaults,
         // but only if there is also no list of ordinary destinations.
         // (If a cfg specifies destinations, and no statistics, assume that
         // is what the user wants.)
-        vString  destinations
-        = getAparameter<vString>(*job_pset_p, "destinations", empty_vString);
+        vString destinations = getAparameter<vString>(*job_pset_p, "destinations", empty_vString);
         if (destinations.empty()) {
           statistics = messageLoggerDefaults->statistics;
           no_statistics_configured = statistics.empty();
         }
       }
-      
+
       // establish each statistics destination:
-      for( vString::const_iterator it = statistics.begin()
-          ; it != statistics.end()
-          ; ++it
-          )
-      {
+      for (vString::const_iterator it = statistics.begin(); it != statistics.end(); ++it) {
         String statname = *it;
         const String& psetname = statname;
-        
+
         // check that this destination is not just a placeholder // change log 20
-        PSet  stat_pset = getAparameter<PSet>(*job_pset_p, psetname, empty_PSet);
-        bool is_placeholder
-        = getAparameter<bool>(stat_pset, "placeholder", false);
-        if (is_placeholder) continue;
-        
+        PSet stat_pset = getAparameter<PSet>(*job_pset_p, psetname, empty_PSet);
+        bool is_placeholder = getAparameter<bool>(stat_pset, "placeholder", false);
+        if (is_placeholder)
+          continue;
+
         // Determine the destination file name
-        String filename
-        = getAparameter<String>(stat_pset, "output", empty_String);
-        if ( filename == empty_String ) {
-          filename = messageLoggerDefaults->output(psetname);	// change log 31
+        String filename = getAparameter<String>(stat_pset, "output", empty_String);
+        if (filename == empty_String) {
+          filename = messageLoggerDefaults->output(psetname);  // change log 31
           if (filename == empty_String) {
             filename = statname;
           }
         }
-        
+
         // Modify the file name if extension or name is explicitly specified
         // change log 14 -- probably suspenders and a belt, because ouput option
         // is present, but uniformity is nice.
-        
-        String explicit_filename
-        = getAparameter<String>(stat_pset, "filename", filename);
-        if (explicit_filename != empty_String) filename = explicit_filename;
-        String explicit_extension
-        = getAparameter<String>(stat_pset, "extension", empty_String);
+
+        String explicit_filename = getAparameter<String>(stat_pset, "filename", filename);
+        if (explicit_filename != empty_String)
+          filename = explicit_filename;
+        String explicit_extension = getAparameter<String>(stat_pset, "extension", empty_String);
         if (explicit_extension != empty_String) {
           if (explicit_extension[0] == '.') {
             filename += explicit_extension;
@@ -682,37 +607,34 @@ namespace edm {
             filename = filename + "." + explicit_extension;
           }
         }
-        
+
         // Attach a default extension of .log if there is no extension on a file
         // change log 18 - this had been done in concert with attaching destination
-        
-        std::string actual_filename = filename;			// change log 4
-        if ( (filename != "cout") && (filename != "cerr") )  {	// change log 23
+
+        std::string actual_filename = filename;              // change log 4
+        if ((filename != "cout") && (filename != "cerr")) {  // change log 23
           const std::string::size_type npos = std::string::npos;
-          if ( filename.find('.') == npos ) {
+          if (filename.find('.') == npos) {
             actual_filename += ".log";
           }
         }
-        
+
         // Check that this is not a duplicate name -
         // unless it is an ordinary destination (which stats can share)
-        if ( !search_all(ordinary_destination_filenames, actual_filename) ) {
-          if ( stream_ps.find(actual_filename)!=stream_ps.end() ) {
-            if (clean_slate_configuration) {			// change log 22
-              throw edm::Exception ( edm::errors::Configuration )
-              <<"Duplicate name for a MessageLogger Statistics Destination: "
-              << actual_filename
-              << "\n";
+        if (!search_all(ordinary_destination_filenames, actual_filename)) {
+          if (stream_ps.find(actual_filename) != stream_ps.end()) {
+            if (clean_slate_configuration) {  // change log 22
+              throw edm::Exception(edm::errors::Configuration)
+                  << "Duplicate name for a MessageLogger Statistics Destination: " << actual_filename << "\n";
             } else {
               LogWarning("duplicateDestination")
-              <<"Duplicate name for a MessageLogger Statistics Destination: "
-              << actual_filename
-              << "\n" << "Only original configuration instructions are used";
+                  << "Duplicate name for a MessageLogger Statistics Destination: " << actual_filename << "\n"
+                  << "Only original configuration instructions are used";
               continue;
             }
           }
         }
-        
+
         // create (if statistics file does not match any destination file name)
         // or note (if statistics file matches a destination file name) the ostream.
         // But if no statistics destinations were provided in the config, do not
@@ -720,10 +642,10 @@ namespace edm {
         // it is matches a destination.  (shange log 24)
         bool statistics_destination_is_real = !no_statistics_configured;
         std::ostream* os_p;
-        if ( stream_ps.find(actual_filename) == stream_ps.end() ) {
-          if ( actual_filename == "cout" ) {
+        if (stream_ps.find(actual_filename) == stream_ps.end()) {
+          if (actual_filename == "cout") {
             os_p = &std::cout;
-          } else if ( actual_filename == "cerr" ) {
+          } else if (actual_filename == "cerr") {
             os_p = &std::cerr;
           } else {
             auto os_sp = std::make_shared<std::ofstream>(actual_filename.c_str());
@@ -732,59 +654,55 @@ namespace edm {
           }
           stream_ps[actual_filename] = os_p;
         } else {
-          statistics_destination_is_real = true;			// change log 24
+          statistics_destination_is_real = true;  // change log 24
           os_p = stream_ps[actual_filename];
         }
-        
-        if (statistics_destination_is_real)	{			// change log 24
-                                                  // attach the statistics destination, keeping a control handle to it:
+
+        if (statistics_destination_is_real) {  // change log 24
+                                               // attach the statistics destination, keeping a control handle to it:
           auto stat = std::make_shared<ELstatistics>(*os_p);
           admin_p->attach(stat);
           statisticsDestControls.push_back(stat);
           bool reset = getAparameter<bool>(stat_pset, "reset", false);
           statisticsResets.push_back(reset);
-          
+
           // now configure this destination:
           configure_dest(stat, psetname);
-          
+
           // and suppress the desire to do an extra termination summary just because
           // of end-of-job info messages
           stat->noTerminationSummary();
         }
-        
+
       }  // for [it = statistics.begin() to end()]
-      
-    } // configure_statistics
-    
-    void
-    ThreadSafeLogMessageLoggerScribe::parseCategories (std::string const & s,
-                                                       std::vector<std::string> & cats)
-    {
+
+    }  // configure_statistics
+
+    void ThreadSafeLogMessageLoggerScribe::parseCategories(std::string const& s, std::vector<std::string>& cats) {
       const std::string::size_type npos = std::string::npos;
-      std::string::size_type i    = 0;
-      while ( i != npos ) {
-        std::string::size_type j = s.find('|',i);
-        cats.push_back (s.substr(i,j-i));
+      std::string::size_type i = 0;
+      while (i != npos) {
+        std::string::size_type j = s.find('|', i);
+        cats.push_back(s.substr(i, j - i));
         i = j;
-        while ( (i != npos) && (s[i] == '|') ) ++i;
+        while ((i != npos) && (s[i] == '|'))
+          ++i;
         // the above handles cases of || and also | at end of string
       }
       // Note:  This algorithm assigns, as desired, one null category if it
       //        encounters an empty categories string
     }
-    
-    void
-    ThreadSafeLogMessageLoggerScribe::triggerStatisticsSummaries() {
-      assert (statisticsDestControls.size() == statisticsResets.size());
+
+    void ThreadSafeLogMessageLoggerScribe::triggerStatisticsSummaries() {
+      assert(statisticsDestControls.size() == statisticsResets.size());
       for (unsigned int i = 0; i != statisticsDestControls.size(); ++i) {
-        statisticsDestControls[i]->summary(m_tooManyWaitingMessagesCount.load() );
-        if (statisticsResets[i]) statisticsDestControls[i]->wipe( );
+        statisticsDestControls[i]->summary(m_tooManyWaitingMessagesCount.load());
+        if (statisticsResets[i])
+          statisticsDestControls[i]->wipe();
       }
     }
-    
-    void
-    ThreadSafeLogMessageLoggerScribe::
-    triggerFJRmessageSummary(std::map<std::string, double> & sm)  // ChangeLog 29
+
+    void ThreadSafeLogMessageLoggerScribe::triggerFJRmessageSummary(std::map<std::string, double>& sm)  // ChangeLog 29
     {
       if (statisticsDestControls.empty()) {
         sm["NoStatisticsDestinationsConfigured"] = 0.0;
@@ -792,9 +710,6 @@ namespace edm {
         statisticsDestControls[0]->summaryForJobReport(sm);
       }
     }
-    
-    
-    
-  } // end of namespace service
-} // end of namespace edm
 
+  }  // end of namespace service
+}  // end of namespace edm
diff --git a/FWCore/MessageService/test/MLexampleModule_1.cc b/FWCore/MessageService/test/MLexampleModule_1.cc
index 3898bf130a1ff..516be5691ef6a 100644
--- a/FWCore/MessageService/test/MLexampleModule_1.cc
+++ b/FWCore/MessageService/test/MLexampleModule_1.cc
@@ -5,31 +5,26 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
-
-
-void
-  MLexampleModule_1::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-  std::string empty_;
-  std::string file_ = "nameOfFile";
-       LogDebug  ("cat_A")   << "LogDebug was used to send this message";
-       LogDebug  ("cat_B")   << "LogDebug was used to send this other message";
-  edm::LogError  ("cat_B")   << "LogError was used to send this other message";
-  edm::LogWarning("cat_A")   << "LogWarning was used to send this message";
-  edm::LogWarning("cat_B")   << "LogWarning was used to send this other message";
-  edm::LogInfo   ("cat_A")   << "LogInfo was used to send this message";
-  edm::LogInfo   ("cat_B")   << "LogInfo was used to send this other message";
-  edm::LogInfo   ("FwkJob")  << "<Message>LogInfo was used to send a job report</Message>";
-
- }  // MessageLoggerClient::analyze()
-
+namespace edmtest {
+
+  void MLexampleModule_1::analyze(edm::Event const& /*unused*/
+                                  ,
+                                  edm::EventSetup const& /*unused*/
+  ) {
+    std::string empty_;
+    std::string file_ = "nameOfFile";
+    LogDebug("cat_A") << "LogDebug was used to send this message";
+    LogDebug("cat_B") << "LogDebug was used to send this other message";
+    edm::LogError("cat_B") << "LogError was used to send this other message";
+    edm::LogWarning("cat_A") << "LogWarning was used to send this message";
+    edm::LogWarning("cat_B") << "LogWarning was used to send this other message";
+    edm::LogInfo("cat_A") << "LogInfo was used to send this message";
+    edm::LogInfo("cat_B") << "LogInfo was used to send this other message";
+    edm::LogInfo("FwkJob") << "<Message>LogInfo was used to send a job report</Message>";
+
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::MLexampleModule_1;
 DEFINE_FWK_MODULE(MLexampleModule_1);
diff --git a/FWCore/MessageService/test/MLexampleModule_1.h b/FWCore/MessageService/test/MLexampleModule_1.h
index b136ca33aaf80..b2018994cbe78 100644
--- a/FWCore/MessageService/test/MLexampleModule_1.h
+++ b/FWCore/MessageService/test/MLexampleModule_1.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class MLexampleModule_1
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    MLexampleModule_1( edm::ParameterSet const & )
-  { }
+  class MLexampleModule_1 : public edm::EDAnalyzer {
+  public:
+    explicit MLexampleModule_1(edm::ParameterSet const&) {}
 
-  virtual
-    ~MLexampleModule_1()
-  { }
+    virtual ~MLexampleModule_1() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_MLexampleModule_1_h
diff --git a/FWCore/MessageService/test/MemoryTestClient_A.cc b/FWCore/MessageService/test/MemoryTestClient_A.cc
index 3b9c47b46fa15..775254fe75632 100644
--- a/FWCore/MessageService/test/MemoryTestClient_A.cc
+++ b/FWCore/MessageService/test/MemoryTestClient_A.cc
@@ -6,126 +6,120 @@
 #include <iomanip>
 #include <string>
 
-namespace edmtest
-{
- 
-int  MemoryTestClient_A::nevent = 0;
+namespace edmtest {
 
-MemoryTestClient_A::MemoryTestClient_A( edm::ParameterSet const & ps)
-  : memoryPattern(), vsize(0), last_allocation(nullptr) 
-{
-  int pattern = ps.getUntrackedParameter<int>("pattern",1);
-  edm::LogWarning("memoryPattern") << "Memory Pattern selected: " << pattern;
-  initializeMemoryPattern(pattern);
-}
+  int MemoryTestClient_A::nevent = 0;
 
-void
-  MemoryTestClient_A::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-  nevent++;
-  double v = memoryPattern[nevent%memoryPattern.size()];
-  edm::LogVerbatim("memoryUsage") << "Event " << nevent 
-  	<< " uses "<< v << " Mbytes";
-  if ( v > vsize ) {
-    int leaksize = static_cast<int>((v-vsize)*1048576);
-    char* leak = new  char[leaksize];
-    edm::LogPrint("memoryIncrease") << "Event " << nevent 
-  	<< " increases vsize by "<< v-vsize << " Mbytes";
-    vsize = v;
-    last_allocation = leak;
+  MemoryTestClient_A::MemoryTestClient_A(edm::ParameterSet const& ps)
+      : memoryPattern(), vsize(0), last_allocation(nullptr) {
+    int pattern = ps.getUntrackedParameter<int>("pattern", 1);
+    edm::LogWarning("memoryPattern") << "Memory Pattern selected: " << pattern;
+    initializeMemoryPattern(pattern);
   }
-  // DO NOT delete[] leak; the point is to increment vsize!
-  
-}  // MessageLoggerClient::analyze()
 
-void  MemoryTestClient_A::initializeMemoryPattern(int pattern) {
-  switch(pattern) {
-    case 1:		// A general pattern
-	memoryPattern.push_back(   2.1   );
-	memoryPattern.push_back(   3.1   );
-	memoryPattern.push_back(   4.1   );
-	memoryPattern.push_back(   2.1   );
-	memoryPattern.push_back(   1.7   );
-	memoryPattern.push_back(   8.4   );
-	memoryPattern.push_back(   3.4   );
-	memoryPattern.push_back(  43.1   );
-	memoryPattern.push_back(  17.1   );
-	memoryPattern.push_back(   2.1   );
-	memoryPattern.push_back(  47.9   );
-	memoryPattern.push_back(   8.3   );
-	memoryPattern.push_back(  56.3   );
-	memoryPattern.push_back(   1.1   );
-	memoryPattern.push_back(  19.1   );
-	memoryPattern.push_back(   2.1   );
-	memoryPattern.push_back(  22.0   );
-	memoryPattern.push_back(   9.1   );
-	memoryPattern.push_back(   2.1   );
-	memoryPattern.push_back(  57.9   );
-	memoryPattern.push_back(   2.1   );
-	memoryPattern.push_back(  59.5   );
-	memoryPattern.push_back(   4.1   );
-	memoryPattern.push_back(   6.1   );
-	memoryPattern.push_back(  61.5   );
-	memoryPattern.push_back(   4.2   );
-	memoryPattern.push_back(   6.3   );
-    break;
-    case 2:		// Here, there is a swap with R1 insteadd of L1
-	memoryPattern.push_back(   2.1   );
-	memoryPattern.push_back(   3.1   );
-	memoryPattern.push_back(   4.1   );
-	memoryPattern.push_back(   2.1   );
-	memoryPattern.push_back(   1.7   );
-	memoryPattern.push_back(   8.4   );
-	memoryPattern.push_back(   3.4   );
-	memoryPattern.push_back(   2.1   );
-	memoryPattern.push_back(   1.7   );
-	memoryPattern.push_back(   3.4   );
-	memoryPattern.push_back(  43.1   );
-	memoryPattern.push_back(  17.1   );
-	memoryPattern.push_back(   2.1   );
-	memoryPattern.push_back(  47.9   );
-	memoryPattern.push_back(   8.3   );
-	memoryPattern.push_back(  56.3   );
-	memoryPattern.push_back(   1.1   );
-	memoryPattern.push_back(  69.1   );
-	memoryPattern.push_back(   2.1   );
-	memoryPattern.push_back(  22.0   );
-	memoryPattern.push_back(   9.1   );
-	memoryPattern.push_back(   2.1   );
-	memoryPattern.push_back( 117.9   );
-	memoryPattern.push_back(   2.1   );
-	memoryPattern.push_back( 119.5   );
-	memoryPattern.push_back(   4.1   );
-	memoryPattern.push_back(   6.1   );
-	memoryPattern.push_back( 120.8   );
-	memoryPattern.push_back(  19.5   );
-  break;
-    case 3:		// Here, there are few increments
-	memoryPattern.push_back(   2.1   );
-	memoryPattern.push_back(   3.1   );
-	memoryPattern.push_back(   4.1   );
-	memoryPattern.push_back(   2.1   );
-	memoryPattern.push_back(   1.7   );
-	memoryPattern.push_back(   8.4   );
-	memoryPattern.push_back(   3.4   );
-	memoryPattern.push_back(   2.1   );
-	memoryPattern.push_back(   1.7   );
-	memoryPattern.push_back(   3.4   );
-	memoryPattern.push_back(  43.1   );
-	memoryPattern.push_back(  17.1   );
-    break;
-    default:
-	memoryPattern.push_back(   2.1   );
-	memoryPattern.push_back(   3.1   );
-	memoryPattern.push_back(   4.1   );
-	memoryPattern.push_back(   2.1   );
+  void MemoryTestClient_A::analyze(edm::Event const& /*unused*/
+                                   ,
+                                   edm::EventSetup const& /*unused*/
+  ) {
+    nevent++;
+    double v = memoryPattern[nevent % memoryPattern.size()];
+    edm::LogVerbatim("memoryUsage") << "Event " << nevent << " uses " << v << " Mbytes";
+    if (v > vsize) {
+      int leaksize = static_cast<int>((v - vsize) * 1048576);
+      char* leak = new char[leaksize];
+      edm::LogPrint("memoryIncrease") << "Event " << nevent << " increases vsize by " << v - vsize << " Mbytes";
+      vsize = v;
+      last_allocation = leak;
+    }
+    // DO NOT delete[] leak; the point is to increment vsize!
+
+  }  // MessageLoggerClient::analyze()
+
+  void MemoryTestClient_A::initializeMemoryPattern(int pattern) {
+    switch (pattern) {
+      case 1:  // A general pattern
+        memoryPattern.push_back(2.1);
+        memoryPattern.push_back(3.1);
+        memoryPattern.push_back(4.1);
+        memoryPattern.push_back(2.1);
+        memoryPattern.push_back(1.7);
+        memoryPattern.push_back(8.4);
+        memoryPattern.push_back(3.4);
+        memoryPattern.push_back(43.1);
+        memoryPattern.push_back(17.1);
+        memoryPattern.push_back(2.1);
+        memoryPattern.push_back(47.9);
+        memoryPattern.push_back(8.3);
+        memoryPattern.push_back(56.3);
+        memoryPattern.push_back(1.1);
+        memoryPattern.push_back(19.1);
+        memoryPattern.push_back(2.1);
+        memoryPattern.push_back(22.0);
+        memoryPattern.push_back(9.1);
+        memoryPattern.push_back(2.1);
+        memoryPattern.push_back(57.9);
+        memoryPattern.push_back(2.1);
+        memoryPattern.push_back(59.5);
+        memoryPattern.push_back(4.1);
+        memoryPattern.push_back(6.1);
+        memoryPattern.push_back(61.5);
+        memoryPattern.push_back(4.2);
+        memoryPattern.push_back(6.3);
+        break;
+      case 2:  // Here, there is a swap with R1 insteadd of L1
+        memoryPattern.push_back(2.1);
+        memoryPattern.push_back(3.1);
+        memoryPattern.push_back(4.1);
+        memoryPattern.push_back(2.1);
+        memoryPattern.push_back(1.7);
+        memoryPattern.push_back(8.4);
+        memoryPattern.push_back(3.4);
+        memoryPattern.push_back(2.1);
+        memoryPattern.push_back(1.7);
+        memoryPattern.push_back(3.4);
+        memoryPattern.push_back(43.1);
+        memoryPattern.push_back(17.1);
+        memoryPattern.push_back(2.1);
+        memoryPattern.push_back(47.9);
+        memoryPattern.push_back(8.3);
+        memoryPattern.push_back(56.3);
+        memoryPattern.push_back(1.1);
+        memoryPattern.push_back(69.1);
+        memoryPattern.push_back(2.1);
+        memoryPattern.push_back(22.0);
+        memoryPattern.push_back(9.1);
+        memoryPattern.push_back(2.1);
+        memoryPattern.push_back(117.9);
+        memoryPattern.push_back(2.1);
+        memoryPattern.push_back(119.5);
+        memoryPattern.push_back(4.1);
+        memoryPattern.push_back(6.1);
+        memoryPattern.push_back(120.8);
+        memoryPattern.push_back(19.5);
+        break;
+      case 3:  // Here, there are few increments
+        memoryPattern.push_back(2.1);
+        memoryPattern.push_back(3.1);
+        memoryPattern.push_back(4.1);
+        memoryPattern.push_back(2.1);
+        memoryPattern.push_back(1.7);
+        memoryPattern.push_back(8.4);
+        memoryPattern.push_back(3.4);
+        memoryPattern.push_back(2.1);
+        memoryPattern.push_back(1.7);
+        memoryPattern.push_back(3.4);
+        memoryPattern.push_back(43.1);
+        memoryPattern.push_back(17.1);
+        break;
+      default:
+        memoryPattern.push_back(2.1);
+        memoryPattern.push_back(3.1);
+        memoryPattern.push_back(4.1);
+        memoryPattern.push_back(2.1);
+    }
   }
-}
 
 }  // namespace edmtest
 
-
 using edmtest::MemoryTestClient_A;
 DEFINE_FWK_MODULE(MemoryTestClient_A);
diff --git a/FWCore/MessageService/test/MemoryTestClient_A.h b/FWCore/MessageService/test/MemoryTestClient_A.h
index 5e735674f7b40..70749fc23cf82 100644
--- a/FWCore/MessageService/test/MemoryTestClient_A.h
+++ b/FWCore/MessageService/test/MemoryTestClient_A.h
@@ -14,36 +14,24 @@ namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
+  class MemoryTestClient_A : public edm::EDAnalyzer {
+  public:
+    explicit MemoryTestClient_A(edm::ParameterSet const&);
 
-class MemoryTestClient_A
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    MemoryTestClient_A( edm::ParameterSet const & );
+    virtual ~MemoryTestClient_A() {}
 
-  virtual
-    ~MemoryTestClient_A()
-  { }
-
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-  static int nevent;
-  std::vector<double> memoryPattern;
-  void initializeMemoryPattern(int pattern);
-  double vsize;
-  edm::propagate_const<char*> last_allocation;
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+    static int nevent;
+    std::vector<double> memoryPattern;
+    void initializeMemoryPattern(int pattern);
+    double vsize;
+    edm::propagate_const<char*> last_allocation;
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_MemoryTestClient_A_h
diff --git a/FWCore/MessageService/test/MessageLoggerClient.cc b/FWCore/MessageService/test/MessageLoggerClient.cc
index f1b1d3176b4d5..0f92a6d413bd9 100644
--- a/FWCore/MessageService/test/MessageLoggerClient.cc
+++ b/FWCore/MessageService/test/MessageLoggerClient.cc
@@ -4,34 +4,27 @@
 
 #include <iostream>
 
-
-namespace edmtest
-{
-
-
-void
-  MessageLoggerClient::analyze( edm::Event      const & /*unused*/
-                              , edm::EventSetup const & /*unused*/
-                              )
-{
-  //std::cout << "Module reached\n";
-  LogDebug("aTestMessage") << "LogDebug was used to send this message";
-  edm::LogInfo("aTestMessage") << "LogInfo was used to send this message";
-  edm::LogWarning("aTestMessage") << "LogWarning was used to send this message";
-  edm::LogError("aTestMessage") << "LogError was used to send this message";
-  edm::LogInfo("cat1|cat2||cat3") << "Three-category message";
-
-  edm::LogWarning("aboutToSend") << "about to send 100 warnings";
-  for( unsigned i = 0;  i != 100;  ++i )  {
-    edm::LogWarning("unimportant") << "warning number " << i;
-  }
-
-
-}  // MessageLoggerClient::analyze()
-
+namespace edmtest {
+
+  void MessageLoggerClient::analyze(edm::Event const& /*unused*/
+                                    ,
+                                    edm::EventSetup const& /*unused*/
+  ) {
+    //std::cout << "Module reached\n";
+    LogDebug("aTestMessage") << "LogDebug was used to send this message";
+    edm::LogInfo("aTestMessage") << "LogInfo was used to send this message";
+    edm::LogWarning("aTestMessage") << "LogWarning was used to send this message";
+    edm::LogError("aTestMessage") << "LogError was used to send this message";
+    edm::LogInfo("cat1|cat2||cat3") << "Three-category message";
+
+    edm::LogWarning("aboutToSend") << "about to send 100 warnings";
+    for (unsigned i = 0; i != 100; ++i) {
+      edm::LogWarning("unimportant") << "warning number " << i;
+    }
+
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::MessageLoggerClient;
 DEFINE_FWK_MODULE(MessageLoggerClient);
diff --git a/FWCore/MessageService/test/MessageLoggerClient.h b/FWCore/MessageService/test/MessageLoggerClient.h
index c6c080ea7ce84..9b7dc790cfa73 100644
--- a/FWCore/MessageService/test/MessageLoggerClient.h
+++ b/FWCore/MessageService/test/MessageLoggerClient.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class MessageLoggerClient
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    MessageLoggerClient( edm::ParameterSet const & )
-  { }
+  class MessageLoggerClient : public edm::EDAnalyzer {
+  public:
+    explicit MessageLoggerClient(edm::ParameterSet const&) {}
 
-  virtual
-    ~MessageLoggerClient()
-  { }
+    virtual ~MessageLoggerClient() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // Integration_MessageLoggerClient_h
diff --git a/FWCore/MessageService/test/PSetTestClient_A.cc b/FWCore/MessageService/test/PSetTestClient_A.cc
index 8b0812fb52ea6..73ecb2c896a59 100644
--- a/FWCore/MessageService/test/PSetTestClient_A.cc
+++ b/FWCore/MessageService/test/PSetTestClient_A.cc
@@ -6,31 +6,27 @@
 #include <string>
 #include <sstream>
 
-namespace edmtest
-{
+namespace edmtest {
 
-PSetTestClient_A::PSetTestClient_A( edm::ParameterSet const & p)
-{
-//  std::cerr << "PSetTestClient_A ctor called\n";
-  edm::ParameterSet emptyPSet;
-  a = p.getUntrackedParameterSet("a",emptyPSet);
-  b = a.getUntrackedParameterSet("b",emptyPSet);
-  xa = a.getUntrackedParameter<int>("x",99);
-  xb = b.getUntrackedParameter<int>("x",88);
-//  std::cerr << "...xa = " << xa << "xb = " << xb << "\n";
-}
+  PSetTestClient_A::PSetTestClient_A(edm::ParameterSet const& p) {
+    //  std::cerr << "PSetTestClient_A ctor called\n";
+    edm::ParameterSet emptyPSet;
+    a = p.getUntrackedParameterSet("a", emptyPSet);
+    b = a.getUntrackedParameterSet("b", emptyPSet);
+    xa = a.getUntrackedParameter<int>("x", 99);
+    xb = b.getUntrackedParameter<int>("x", 88);
+    //  std::cerr << "...xa = " << xa << "xb = " << xb << "\n";
+  }
 
-void
-  PSetTestClient_A::analyze( edm::Event      const & /*unused*/
-                            , edm::EventSetup const & /*unused*/
-                              )
-{
-//  std::cerr << "PSetTestClient_A::analyze called\n";
-  edm::LogError ("x") << "xa = " << xa << " xb = " << xb;
-}  
+  void PSetTestClient_A::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    //  std::cerr << "PSetTestClient_A::analyze called\n";
+    edm::LogError("x") << "xa = " << xa << " xb = " << xb;
+  }
 
-
-} // end namespace edmtest
+}  // end namespace edmtest
 
 using edmtest::PSetTestClient_A;
 DEFINE_FWK_MODULE(PSetTestClient_A);
diff --git a/FWCore/MessageService/test/PSetTestClient_A.h b/FWCore/MessageService/test/PSetTestClient_A.h
index 29eabd1047aea..2191e02d9e5d2 100644
--- a/FWCore/MessageService/test/PSetTestClient_A.h
+++ b/FWCore/MessageService/test/PSetTestClient_A.h
@@ -12,30 +12,22 @@ namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class PSetTestClient_A
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    PSetTestClient_A( edm::ParameterSet const & p);
-  virtual ~PSetTestClient_A() {}
-  
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-private:
-  edm::ParameterSet a;
-  edm::ParameterSet b;
-  int xa;
-  int xb;
-};
+  class PSetTestClient_A : public edm::EDAnalyzer {
+  public:
+    explicit PSetTestClient_A(edm::ParameterSet const& p);
+    virtual ~PSetTestClient_A() {}
 
-}  // namespace edmtest
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
+
+  private:
+    edm::ParameterSet a;
+    edm::ParameterSet b;
+    int xa;
+    int xb;
+  };
 
+}  // namespace edmtest
 
 #endif  // FWCore_MessageService_test_PSetTestClient_A_h
diff --git a/FWCore/MessageService/test/ProblemTestClient_t1.cc b/FWCore/MessageService/test/ProblemTestClient_t1.cc
index 2b920ee5ff3c4..e1be73977ddfa 100644
--- a/FWCore/MessageService/test/ProblemTestClient_t1.cc
+++ b/FWCore/MessageService/test/ProblemTestClient_t1.cc
@@ -5,23 +5,18 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
+namespace edmtest {
 
+  void ProblemTestClient_t1::analyze(edm::Event const& /*unused*/
+                                     ,
+                                     edm::EventSetup const& /*unused*/
+  ) {
+    LogDebug("cat_A") << "This message should not appear";
+    LogDebug("TrackerGeom") << "LogDebug was used to send this message";
 
-void
-  ProblemTestClient_t1::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-       LogDebug  ("cat_A")   << "This message should not appear";
-       LogDebug  ("TrackerGeom")  << "LogDebug was used to send this message";
-
-}  // MessageLoggerClient::analyze()
-
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::ProblemTestClient_t1;
 DEFINE_FWK_MODULE(ProblemTestClient_t1);
diff --git a/FWCore/MessageService/test/ProblemTestClient_t1.h b/FWCore/MessageService/test/ProblemTestClient_t1.h
index c22ae04dbe2a7..a6dc9ebb33253 100644
--- a/FWCore/MessageService/test/ProblemTestClient_t1.h
+++ b/FWCore/MessageService/test/ProblemTestClient_t1.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class ProblemTestClient_t1
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    ProblemTestClient_t1( edm::ParameterSet const & )
-  { }
+  class ProblemTestClient_t1 : public edm::EDAnalyzer {
+  public:
+    explicit ProblemTestClient_t1(edm::ParameterSet const&) {}
 
-  virtual
-    ~ProblemTestClient_t1()
-  { }
+    virtual ~ProblemTestClient_t1() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_ProblemTestClient_t1_h
diff --git a/FWCore/MessageService/test/UnitTestClient_A.cc b/FWCore/MessageService/test/UnitTestClient_A.cc
index 3e789ea1400e9..ed4daa78b04b5 100644
--- a/FWCore/MessageService/test/UnitTestClient_A.cc
+++ b/FWCore/MessageService/test/UnitTestClient_A.cc
@@ -5,33 +5,29 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
-
-void
-  UnitTestClient_A::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-  std::string empty_;
-  std::string file_ = "nameOfFile";
-       LogDebug  ("cat_A")   << "LogDebug was used to send this message";
-       LogDebug  ("cat_B")   << "LogDebug was used to send this other message";
-  edm::LogError  ("cat_A")   << "LogError was used to send this message"
-  			     << "-which is long enough to span lines but-"
-			     << "will not be broken up by the logger any more";
-  edm::LogError  ("cat_B")   << "LogError was used to send this other message";
-  edm::LogWarning("cat_A")   << "LogWarning was used to send this message";
-  edm::LogWarning("cat_B")   << "LogWarning was used to send this other message";
-  edm::LogInfo   ("cat_A")   << "LogInfo was used to send this message";
-  edm::LogInfo   ("cat_B")   << "LogInfo was used to send this other message";
-  edm::LogInfo   ("FwkJob")  << "<Message>LogInfo was used to send a job report</Message>";
-
- }  // MessageLoggerClient::analyze()
-
+namespace edmtest {
+
+  void UnitTestClient_A::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    std::string empty_;
+    std::string file_ = "nameOfFile";
+    LogDebug("cat_A") << "LogDebug was used to send this message";
+    LogDebug("cat_B") << "LogDebug was used to send this other message";
+    edm::LogError("cat_A") << "LogError was used to send this message"
+                           << "-which is long enough to span lines but-"
+                           << "will not be broken up by the logger any more";
+    edm::LogError("cat_B") << "LogError was used to send this other message";
+    edm::LogWarning("cat_A") << "LogWarning was used to send this message";
+    edm::LogWarning("cat_B") << "LogWarning was used to send this other message";
+    edm::LogInfo("cat_A") << "LogInfo was used to send this message";
+    edm::LogInfo("cat_B") << "LogInfo was used to send this other message";
+    edm::LogInfo("FwkJob") << "<Message>LogInfo was used to send a job report</Message>";
+
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_A;
 DEFINE_FWK_MODULE(UnitTestClient_A);
diff --git a/FWCore/MessageService/test/UnitTestClient_A.h b/FWCore/MessageService/test/UnitTestClient_A.h
index f77e1e2ec92e5..44b22b317c1e1 100644
--- a/FWCore/MessageService/test/UnitTestClient_A.h
+++ b/FWCore/MessageService/test/UnitTestClient_A.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_A
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_A( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_A : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_A(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_A()
-  { }
+    virtual ~UnitTestClient_A() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_A_h
diff --git a/FWCore/MessageService/test/UnitTestClient_Ad.cc b/FWCore/MessageService/test/UnitTestClient_Ad.cc
index 484984afc1d6b..427ca41983979 100644
--- a/FWCore/MessageService/test/UnitTestClient_Ad.cc
+++ b/FWCore/MessageService/test/UnitTestClient_Ad.cc
@@ -7,34 +7,29 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
-
-
-void
-  UnitTestClient_Ad::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-  std::string empty_;
-  std::string file_ = "nameOfFile";
-       LogDebug  ("cat_A")   << "LogDebug was used to send this message";
-       LogDebug  ("cat_B")   << "LogDebug was used to send this other message";
-  edm::LogError  ("cat_A")   << "LogError was used to send this message"
-  			     << "-which is long enough to span lines but-"
-			     << "will not be broken up by the logger any more";
-  edm::LogError  ("cat_B")   << "LogError was used to send this other message";
-  edm::LogWarning("cat_A")   << "LogWarning was used to send this message";
-  edm::LogWarning("cat_B")   << "LogWarning was used to send this other message";
-  edm::LogInfo   ("cat_A")   << "LogInfo was used to send this message";
-  edm::LogInfo   ("cat_B")   << "LogInfo was used to send this other message";
-  edm::LogInfo   ("FwkJob")  << "<Message>LogInfo was used to send a job report</Message>";
-
- }  // MessageLoggerClient::analyze()
-
+namespace edmtest {
+
+  void UnitTestClient_Ad::analyze(edm::Event const& /*unused*/
+                                  ,
+                                  edm::EventSetup const& /*unused*/
+  ) {
+    std::string empty_;
+    std::string file_ = "nameOfFile";
+    LogDebug("cat_A") << "LogDebug was used to send this message";
+    LogDebug("cat_B") << "LogDebug was used to send this other message";
+    edm::LogError("cat_A") << "LogError was used to send this message"
+                           << "-which is long enough to span lines but-"
+                           << "will not be broken up by the logger any more";
+    edm::LogError("cat_B") << "LogError was used to send this other message";
+    edm::LogWarning("cat_A") << "LogWarning was used to send this message";
+    edm::LogWarning("cat_B") << "LogWarning was used to send this other message";
+    edm::LogInfo("cat_A") << "LogInfo was used to send this message";
+    edm::LogInfo("cat_B") << "LogInfo was used to send this other message";
+    edm::LogInfo("FwkJob") << "<Message>LogInfo was used to send a job report</Message>";
+
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_Ad;
 DEFINE_FWK_MODULE(UnitTestClient_Ad);
diff --git a/FWCore/MessageService/test/UnitTestClient_Ad.h b/FWCore/MessageService/test/UnitTestClient_Ad.h
index 3a2bcd2b8f11c..5e669c593137a 100644
--- a/FWCore/MessageService/test/UnitTestClient_Ad.h
+++ b/FWCore/MessageService/test/UnitTestClient_Ad.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_Ad
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_Ad( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_Ad : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_Ad(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_Ad()
-  { }
+    virtual ~UnitTestClient_Ad() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_Ad_h
diff --git a/FWCore/MessageService/test/UnitTestClient_B.cc b/FWCore/MessageService/test/UnitTestClient_B.cc
index c4ca9ef1ff995..9134c65e09bc6 100644
--- a/FWCore/MessageService/test/UnitTestClient_B.cc
+++ b/FWCore/MessageService/test/UnitTestClient_B.cc
@@ -5,27 +5,23 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
- 
-int  UnitTestClient_B::nevent = 0;
+namespace edmtest {
 
-void
-  UnitTestClient_B::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-  nevent++;
-  for (int i = 0; i < nevent; ++i) {
-    edm::LogError  ("cat_A")   << "LogError was used to send this message";
-  }
-  edm::LogError  ("cat_B")   << "LogError was used to send this other message";
-  edm::LogStatistics();
-}  // MessageLoggerClient::analyze()
+  int UnitTestClient_B::nevent = 0;
 
+  void UnitTestClient_B::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    nevent++;
+    for (int i = 0; i < nevent; ++i) {
+      edm::LogError("cat_A") << "LogError was used to send this message";
+    }
+    edm::LogError("cat_B") << "LogError was used to send this other message";
+    edm::LogStatistics();
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_B;
 DEFINE_FWK_MODULE(UnitTestClient_B);
diff --git a/FWCore/MessageService/test/UnitTestClient_B.h b/FWCore/MessageService/test/UnitTestClient_B.h
index 3fdf4e934c2be..8b75e7b8e9a71 100644
--- a/FWCore/MessageService/test/UnitTestClient_B.h
+++ b/FWCore/MessageService/test/UnitTestClient_B.h
@@ -11,33 +11,20 @@ namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
+  class UnitTestClient_B : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_B(edm::ParameterSet const&) {}
 
-class UnitTestClient_B
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_B( edm::ParameterSet const & )
-  { }
+    virtual ~UnitTestClient_B() {}
 
-  virtual
-    ~UnitTestClient_B()
-  { }
-
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-  static int nevent;
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+    static int nevent;
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_B_h
diff --git a/FWCore/MessageService/test/UnitTestClient_C.cc b/FWCore/MessageService/test/UnitTestClient_C.cc
index 8ad1796eb8863..05dea812e35b1 100644
--- a/FWCore/MessageService/test/UnitTestClient_C.cc
+++ b/FWCore/MessageService/test/UnitTestClient_C.cc
@@ -6,35 +6,26 @@
 #include <string>
 #include <iomanip>
 
-namespace edmtest
-{
-
-
-void
-  UnitTestClient_C::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-  int i = 145;
-  edm::LogWarning("cat_A")   << "Test of std::hex:" 
-  			     << i << std::hex << "in hex is"  << i;
-   edm::LogWarning("cat_A")  << "Test of std::setw(n) and std::setfill('c'):" 
-   			     << "The following should read ++abcdefg $$$12:" 
-  			     << std::setfill('+')  << std::setw(9) << "abcdefg"
-			     << std::setw(5) << std::setfill('$') << 12 ;
-  double d = 3.14159265357989;
-  edm::LogWarning("cat_A")   << "Test of std::setprecision(p):"
-  			     << "Pi with precision 12 is" 
-  			     << std::setprecision(12) << d;
-  edm::LogWarning("cat_A")   << "Test of spacing:"
-   			     << "The following should read a b c dd:" 
-			     << "a" <<  std::setfill('+')  
-			     << "b" << std::hex << "c" << std::setw(2) << "dd";
-}  // MessageLoggerClient::analyze()
-
+namespace edmtest {
+
+  void UnitTestClient_C::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    int i = 145;
+    edm::LogWarning("cat_A") << "Test of std::hex:" << i << std::hex << "in hex is" << i;
+    edm::LogWarning("cat_A") << "Test of std::setw(n) and std::setfill('c'):"
+                             << "The following should read ++abcdefg $$$12:" << std::setfill('+') << std::setw(9)
+                             << "abcdefg" << std::setw(5) << std::setfill('$') << 12;
+    double d = 3.14159265357989;
+    edm::LogWarning("cat_A") << "Test of std::setprecision(p):"
+                             << "Pi with precision 12 is" << std::setprecision(12) << d;
+    edm::LogWarning("cat_A") << "Test of spacing:"
+                             << "The following should read a b c dd:"
+                             << "a" << std::setfill('+') << "b" << std::hex << "c" << std::setw(2) << "dd";
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_C;
 DEFINE_FWK_MODULE(UnitTestClient_C);
diff --git a/FWCore/MessageService/test/UnitTestClient_C.h b/FWCore/MessageService/test/UnitTestClient_C.h
index 7ae60119207cd..86b13df1ee5fa 100644
--- a/FWCore/MessageService/test/UnitTestClient_C.h
+++ b/FWCore/MessageService/test/UnitTestClient_C.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_C
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_C( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_C : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_C(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_C()
-  { }
+    virtual ~UnitTestClient_C() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_A_h
diff --git a/FWCore/MessageService/test/UnitTestClient_D.cc b/FWCore/MessageService/test/UnitTestClient_D.cc
index d768077baa209..4e3ff4fef8be6 100644
--- a/FWCore/MessageService/test/UnitTestClient_D.cc
+++ b/FWCore/MessageService/test/UnitTestClient_D.cc
@@ -6,27 +6,22 @@
 #include <string>
 #include <iomanip>
 
-namespace edmtest
-{
+namespace edmtest {
 
+  void UnitTestClient_D::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    edm::LogWarning("cat_A") << "This message should not appear in "
+                             << "the framework job report";
+    edm::LogWarning("FwkJob") << "<Message>This message should appear in "
+                              << "the framework job report</Message>";
+    edm::LogWarning("special") << "This message should appear in "
+                               << "restrict but the others should not";
 
-void
-  UnitTestClient_D::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-  edm::LogWarning("cat_A")   << "This message should not appear in " 
-  			     << "the framework job report";
-  edm::LogWarning("FwkJob")  << "<Message>This message should appear in " 
- 			     << "the framework job report</Message>";
-  edm::LogWarning("special") << "This message should appear in " 
- 			     << "restrict but the others should not";
-
-}  // MessageLoggerClient::analyze()
-
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_D;
 DEFINE_FWK_MODULE(UnitTestClient_D);
diff --git a/FWCore/MessageService/test/UnitTestClient_D.h b/FWCore/MessageService/test/UnitTestClient_D.h
index 95750db30c5fe..c8e86f866ace8 100644
--- a/FWCore/MessageService/test/UnitTestClient_D.h
+++ b/FWCore/MessageService/test/UnitTestClient_D.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_D
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_D( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_D : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_D(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_D()
-  { }
+    virtual ~UnitTestClient_D() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_D_h
diff --git a/FWCore/MessageService/test/UnitTestClient_E.cc b/FWCore/MessageService/test/UnitTestClient_E.cc
index 53dfc373a1fa5..19e0b5e193ea2 100644
--- a/FWCore/MessageService/test/UnitTestClient_E.cc
+++ b/FWCore/MessageService/test/UnitTestClient_E.cc
@@ -5,53 +5,40 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
-
-
-void
-  UnitTestClient_E::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-    edm::LogInfo   ("expect_overall_unnamed")   
-    << "The following outputs are expected: \n"  
-    << "unlisted_category    appearing in events 1,2,3,4,5,10,15,25,45 \n";
-    
-    edm::LogInfo   ("expect_overall_specific")   
-    << "The following outputs are expected: \n"  
-    << "lim3bydefault    appearing in events 1,2,3,6,9,15,27 \n";
- 
-    edm::LogInfo   ("expect_supercede_specific")   
-    << "The following outputs are expected: \n"  
-    << "lim2bycommondefault appearing in events 1,2,3,4,5,6,7,8,16,24,40 \n";
- 
-    edm::LogInfo   ("expect_non_supercede_common_specific")   
-    << "The following outputs are expected: \n"  
-    << "lim2bycommondefault appearing in events 1,2,4,6,10,18,34 \n";
-
-    edm::LogInfo   ("expect_specific")   
-    << "The following outputs are expected: \n"  
-    << "lim0bydefaults appearing in events 1,2,3,4,5,6,12,18,30 \n";
- 
-  for (int i=1; i<=50; ++i) {
-    edm::LogInfo   ("unlisted_category")   << 
-  	"message with overall default limit of 5: " << i;
-    edm::LogInfo   ("lim3bydefault")   << 
-  	"message with specific overall default limit of 3: " << i;
-    edm::LogInfo   ("lim2bycommondefault")   << 
-  	"message with specific overall default limit of 2: " << i;
-    edm::LogInfo   ("lim0bydefaults")   << 
-  	"message with overall default and dest default limit of 0: " << i;
-//    edm::LogInfo   ("lim3bydefault")   << 
-//  	"message with overall default limit (superceded) of 2: " << i;
-   }
-   
-}  // MessageLoggerClient::analyze()
+namespace edmtest {
 
+  void UnitTestClient_E::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    edm::LogInfo("expect_overall_unnamed") << "The following outputs are expected: \n"
+                                           << "unlisted_category    appearing in events 1,2,3,4,5,10,15,25,45 \n";
 
-}  // namespace edmtest
+    edm::LogInfo("expect_overall_specific") << "The following outputs are expected: \n"
+                                            << "lim3bydefault    appearing in events 1,2,3,6,9,15,27 \n";
+
+    edm::LogInfo("expect_supercede_specific") << "The following outputs are expected: \n"
+                                              << "lim2bycommondefault appearing in events 1,2,3,4,5,6,7,8,16,24,40 \n";
+
+    edm::LogInfo("expect_non_supercede_common_specific")
+        << "The following outputs are expected: \n"
+        << "lim2bycommondefault appearing in events 1,2,4,6,10,18,34 \n";
+
+    edm::LogInfo("expect_specific") << "The following outputs are expected: \n"
+                                    << "lim0bydefaults appearing in events 1,2,3,4,5,6,12,18,30 \n";
 
+    for (int i = 1; i <= 50; ++i) {
+      edm::LogInfo("unlisted_category") << "message with overall default limit of 5: " << i;
+      edm::LogInfo("lim3bydefault") << "message with specific overall default limit of 3: " << i;
+      edm::LogInfo("lim2bycommondefault") << "message with specific overall default limit of 2: " << i;
+      edm::LogInfo("lim0bydefaults") << "message with overall default and dest default limit of 0: " << i;
+      //    edm::LogInfo   ("lim3bydefault")   <<
+      //  	"message with overall default limit (superceded) of 2: " << i;
+    }
+
+  }  // MessageLoggerClient::analyze()
+
+}  // namespace edmtest
 
 using edmtest::UnitTestClient_E;
 DEFINE_FWK_MODULE(UnitTestClient_E);
diff --git a/FWCore/MessageService/test/UnitTestClient_E.h b/FWCore/MessageService/test/UnitTestClient_E.h
index 15137f1f6d5b9..099733d480502 100644
--- a/FWCore/MessageService/test/UnitTestClient_E.h
+++ b/FWCore/MessageService/test/UnitTestClient_E.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_E
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_E( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_E : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_E(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_E()
-  { }
+    virtual ~UnitTestClient_E() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_E_h
diff --git a/FWCore/MessageService/test/UnitTestClient_F.cc b/FWCore/MessageService/test/UnitTestClient_F.cc
index e8a8564971d92..bba5d64021f36 100644
--- a/FWCore/MessageService/test/UnitTestClient_F.cc
+++ b/FWCore/MessageService/test/UnitTestClient_F.cc
@@ -5,53 +5,39 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
-
-
-void
-  UnitTestClient_F::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-    edm::LogInfo   ("expect_overall_unnamed")   
-    << "The following outputs are expected: \n"  
-    << "unlisted_category    appearing in events 1,6,11,16,21,26,31,36,41,46 \n";
-    
-    edm::LogInfo   ("expect_overall_specific")   
-    << "The following outputs are expected: \n"  
-    << "int7bycommondefault    appearing in events 1,8,15,22,29,36,43,50 \n";
- 
-    edm::LogInfo   ("expect_supercede_specific")   
-    << "The following outputs are expected: \n"  
-    << "int7bycommondefault appearing in events 1,11,21,31,41 \n";
- 
-    edm::LogInfo   ("expect_non_supercede_common_specific")   
-    << "The following outputs are expected: \n"  
-    << "int7bycommondefault appearing in events 1,19,37 \n"
-    << "unlisted_category appearing in events 1,27 \n";
-
-    edm::LogInfo   ("expect_specific")   
-    << "The following outputs are expected: \n"  
-    << "int25bydefaults appearing in events 1,13,25,37,49 \n"
-    << "unlisted_category appearing in events 1,31 \n";
- 
-  for (int i=1; i<=50; ++i) {
-    edm::LogInfo   ("unlisted_category")   << 
-  	"message with overall default interval of 5: " << i;
-    edm::LogInfo   ("int4bydefault")   << 
-  	"message with specific overall default interval of 4: " << i;
-    edm::LogInfo   ("int7bycommondefault")   << 
-  	"message with specific overall default interval of 7: " << i;
-    edm::LogInfo   ("int25bydefaults")   << 
-  	"message with overall default and dest default interval of 25: " << i;
-   }
-   
-}  // MessageLoggerClient::analyze()
+namespace edmtest {
 
+  void UnitTestClient_F::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    edm::LogInfo("expect_overall_unnamed") << "The following outputs are expected: \n"
+                                           << "unlisted_category    appearing in events 1,6,11,16,21,26,31,36,41,46 \n";
 
-}  // namespace edmtest
+    edm::LogInfo("expect_overall_specific") << "The following outputs are expected: \n"
+                                            << "int7bycommondefault    appearing in events 1,8,15,22,29,36,43,50 \n";
+
+    edm::LogInfo("expect_supercede_specific") << "The following outputs are expected: \n"
+                                              << "int7bycommondefault appearing in events 1,11,21,31,41 \n";
+
+    edm::LogInfo("expect_non_supercede_common_specific") << "The following outputs are expected: \n"
+                                                         << "int7bycommondefault appearing in events 1,19,37 \n"
+                                                         << "unlisted_category appearing in events 1,27 \n";
+
+    edm::LogInfo("expect_specific") << "The following outputs are expected: \n"
+                                    << "int25bydefaults appearing in events 1,13,25,37,49 \n"
+                                    << "unlisted_category appearing in events 1,31 \n";
 
+    for (int i = 1; i <= 50; ++i) {
+      edm::LogInfo("unlisted_category") << "message with overall default interval of 5: " << i;
+      edm::LogInfo("int4bydefault") << "message with specific overall default interval of 4: " << i;
+      edm::LogInfo("int7bycommondefault") << "message with specific overall default interval of 7: " << i;
+      edm::LogInfo("int25bydefaults") << "message with overall default and dest default interval of 25: " << i;
+    }
+
+  }  // MessageLoggerClient::analyze()
+
+}  // namespace edmtest
 
 using edmtest::UnitTestClient_F;
 DEFINE_FWK_MODULE(UnitTestClient_F);
diff --git a/FWCore/MessageService/test/UnitTestClient_F.h b/FWCore/MessageService/test/UnitTestClient_F.h
index 7ecdbdb7bd63c..ab6f08b187438 100644
--- a/FWCore/MessageService/test/UnitTestClient_F.h
+++ b/FWCore/MessageService/test/UnitTestClient_F.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_F
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_F( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_F : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_F(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_F()
-  { }
+    virtual ~UnitTestClient_F() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_F_h
diff --git a/FWCore/MessageService/test/UnitTestClient_G.cc b/FWCore/MessageService/test/UnitTestClient_G.cc
index 92a9f973fc02e..f82acd3c3d940 100644
--- a/FWCore/MessageService/test/UnitTestClient_G.cc
+++ b/FWCore/MessageService/test/UnitTestClient_G.cc
@@ -6,36 +6,30 @@
 #include <string>
 #include <iomanip>
 
-namespace edmtest
-{
+namespace edmtest {
 
+  void UnitTestClient_G::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    if (!edm::isMessageProcessingSetUp()) {
+      std::cerr << "??? It appears that Message Processing is not Set Up???\n\n";
+    }
 
-void
-  UnitTestClient_G::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-  if (!edm::isMessageProcessingSetUp()) {
-    std::cerr << "??? It appears that Message Processing is not Set Up???\n\n";
-  }
+    double d = 3.14159265357989;
+    edm::LogWarning("cat_A") << "Test of std::setprecision(p):"
+                             << " Pi with precision 12 is " << std::setprecision(12) << d;
 
-  double d = 3.14159265357989;
-  edm::LogWarning("cat_A")   << "Test of std::setprecision(p):"
-  			     << " Pi with precision 12 is " 
-  			     << std::setprecision(12) << d;
-
-  for( int i=0; i<10; ++i) {
-    edm::LogInfo("cat_B")      << "\t\tEmit Info level message " << i+1;
-  }
-
-  for( int i=0; i<15; ++i) {
-    edm::LogWarning("cat_C")      << "\t\tEmit Warning level message " << i+1;
-  }
-}  // MessageLoggerClient::analyze()
+    for (int i = 0; i < 10; ++i) {
+      edm::LogInfo("cat_B") << "\t\tEmit Info level message " << i + 1;
+    }
 
+    for (int i = 0; i < 15; ++i) {
+      edm::LogWarning("cat_C") << "\t\tEmit Warning level message " << i + 1;
+    }
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_G;
 DEFINE_FWK_MODULE(UnitTestClient_G);
diff --git a/FWCore/MessageService/test/UnitTestClient_G.h b/FWCore/MessageService/test/UnitTestClient_G.h
index f740b1ecd150b..e8f20beb83957 100644
--- a/FWCore/MessageService/test/UnitTestClient_G.h
+++ b/FWCore/MessageService/test/UnitTestClient_G.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_G
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_G( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_G : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_G(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_G()
-  { }
+    virtual ~UnitTestClient_G() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_A_h
diff --git a/FWCore/MessageService/test/UnitTestClient_H.cc b/FWCore/MessageService/test/UnitTestClient_H.cc
index 828b036f61f28..1eaaa57842397 100644
--- a/FWCore/MessageService/test/UnitTestClient_H.cc
+++ b/FWCore/MessageService/test/UnitTestClient_H.cc
@@ -9,28 +9,26 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
-
-
-void
-  UnitTestClient_H::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-       LogTrace    ("cat_A") << "LogTrace was used to send this mess" << "age";
-       LogDebug    ("cat_B") << "LogDebug was used to send this other message";
-       IfLogTrace(nonexistent, "cat_A") << "IfLogTrace was used to send this message"; // check that these compile with non-existent variable as the condition
-       IfLogTrace(nonexistent, "cat_A") << "IfLogTrace was used to not send this message";
-       IfLogDebug(nonexistent, "cat_B") << "IfLogDebug was used to send this other message";
-       IfLogDebug(nonexistent, "cat_B") << "IfLogDebug was used to not send other this message";
-  edm::LogVerbatim ("cat_A") << "LogVerbatim was us" << "ed to send this message";
-  edm::LogInfo     ("cat_B") << "LogInfo was used to send this other message";
-}  // MessageLoggerClient::analyze()
-
+namespace edmtest {
+
+  void UnitTestClient_H::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    LogTrace("cat_A") << "LogTrace was used to send this mess"
+                      << "age";
+    LogDebug("cat_B") << "LogDebug was used to send this other message";
+    IfLogTrace(nonexistent, "cat_A")
+        << "IfLogTrace was used to send this message";  // check that these compile with non-existent variable as the condition
+    IfLogTrace(nonexistent, "cat_A") << "IfLogTrace was used to not send this message";
+    IfLogDebug(nonexistent, "cat_B") << "IfLogDebug was used to send this other message";
+    IfLogDebug(nonexistent, "cat_B") << "IfLogDebug was used to not send other this message";
+    edm::LogVerbatim("cat_A") << "LogVerbatim was us"
+                              << "ed to send this message";
+    edm::LogInfo("cat_B") << "LogInfo was used to send this other message";
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_H;
 DEFINE_FWK_MODULE(UnitTestClient_H);
diff --git a/FWCore/MessageService/test/UnitTestClient_H.h b/FWCore/MessageService/test/UnitTestClient_H.h
index 7a2c3e7129cbb..d6ef68bf6b675 100644
--- a/FWCore/MessageService/test/UnitTestClient_H.h
+++ b/FWCore/MessageService/test/UnitTestClient_H.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_H
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_H( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_H : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_H(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_H()
-  { }
+    virtual ~UnitTestClient_H() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_H_h
diff --git a/FWCore/MessageService/test/UnitTestClient_Hd.cc b/FWCore/MessageService/test/UnitTestClient_Hd.cc
index d52808bd6d6a1..3114d09955e0e 100644
--- a/FWCore/MessageService/test/UnitTestClient_Hd.cc
+++ b/FWCore/MessageService/test/UnitTestClient_Hd.cc
@@ -7,28 +7,25 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
-
-
-void
-  UnitTestClient_Hd::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-       LogTrace    ("cat_A") << "LogTrace was used to send this mess" << "age";
-       LogDebug    ("cat_B") << "LogDebug was used to send this other message";
-       IfLogTrace(true , "cat_A") << "IfLogTrace was used to send this message";
-       IfLogTrace(false, "cat_A") << "IfLogTrace was used to not send this message";
-       IfLogDebug(true , "cat_B") << "IfLogDebug was used to send this other message";
-       IfLogDebug(false, "cat_B") << "IfLogDebug was used to not send other this message";
-  edm::LogVerbatim ("cat_A") << "LogVerbatim was us" << "ed to send this message";
-  edm::LogInfo     ("cat_B") << "LogInfo was used to send this other message";
-}  // MessageLoggerClient::analyze()
-
+namespace edmtest {
+
+  void UnitTestClient_Hd::analyze(edm::Event const& /*unused*/
+                                  ,
+                                  edm::EventSetup const& /*unused*/
+  ) {
+    LogTrace("cat_A") << "LogTrace was used to send this mess"
+                      << "age";
+    LogDebug("cat_B") << "LogDebug was used to send this other message";
+    IfLogTrace(true, "cat_A") << "IfLogTrace was used to send this message";
+    IfLogTrace(false, "cat_A") << "IfLogTrace was used to not send this message";
+    IfLogDebug(true, "cat_B") << "IfLogDebug was used to send this other message";
+    IfLogDebug(false, "cat_B") << "IfLogDebug was used to not send other this message";
+    edm::LogVerbatim("cat_A") << "LogVerbatim was us"
+                              << "ed to send this message";
+    edm::LogInfo("cat_B") << "LogInfo was used to send this other message";
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_Hd;
 DEFINE_FWK_MODULE(UnitTestClient_Hd);
diff --git a/FWCore/MessageService/test/UnitTestClient_Hd.h b/FWCore/MessageService/test/UnitTestClient_Hd.h
index e44fbedc7cfca..2e1da51f53eb6 100644
--- a/FWCore/MessageService/test/UnitTestClient_Hd.h
+++ b/FWCore/MessageService/test/UnitTestClient_Hd.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_Hd
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_Hd( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_Hd : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_Hd(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_Hd()
-  { }
+    virtual ~UnitTestClient_Hd() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_Hd_h
diff --git a/FWCore/MessageService/test/UnitTestClient_I.cc b/FWCore/MessageService/test/UnitTestClient_I.cc
index 823efe9be39c9..c959b84b747f1 100644
--- a/FWCore/MessageService/test/UnitTestClient_I.cc
+++ b/FWCore/MessageService/test/UnitTestClient_I.cc
@@ -5,35 +5,30 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
-
-
-void
-  UnitTestClient_I::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-  std::string empty_;
-  std::string file_ = "nameOfFile";
-       LogDebug  ("cat_A")   << "LogDebug was used to send this message";
-       LogDebug  ("cat_B")   << "LogDebug was used to send this other message";
-  edm::LogError  ("cat_A")   << "LogError was used to send this message"
-  			     << "-which is long enough to span lines but-"
-			     << "will not be broken up by the logger any more";
-  edm::LogError  ("cat_B")   << "LogError was used to send this other message";
-  edm::LogWarning("cat_A")   << "LogWarning was used to send this message";
-  edm::LogWarning("cat_B")   << "LogWarning was used to send this other message";
-  edm::LogInfo   ("cat_A")   << "LogInfo was used to send this message";
-  edm::LogInfo   ("cat_B")   << "LogInfo was used to send this other message";
-
-  edm::LogInfo   ("FwkJob")  << "<Message>LogInfo was used to send a job report</Message>";
-
- }  // MessageLoggerClient::analyze()
-
+namespace edmtest {
+
+  void UnitTestClient_I::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    std::string empty_;
+    std::string file_ = "nameOfFile";
+    LogDebug("cat_A") << "LogDebug was used to send this message";
+    LogDebug("cat_B") << "LogDebug was used to send this other message";
+    edm::LogError("cat_A") << "LogError was used to send this message"
+                           << "-which is long enough to span lines but-"
+                           << "will not be broken up by the logger any more";
+    edm::LogError("cat_B") << "LogError was used to send this other message";
+    edm::LogWarning("cat_A") << "LogWarning was used to send this message";
+    edm::LogWarning("cat_B") << "LogWarning was used to send this other message";
+    edm::LogInfo("cat_A") << "LogInfo was used to send this message";
+    edm::LogInfo("cat_B") << "LogInfo was used to send this other message";
+
+    edm::LogInfo("FwkJob") << "<Message>LogInfo was used to send a job report</Message>";
+
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_I;
 DEFINE_FWK_MODULE(UnitTestClient_I);
diff --git a/FWCore/MessageService/test/UnitTestClient_I.h b/FWCore/MessageService/test/UnitTestClient_I.h
index f5b3f520b9f46..34952a0170415 100644
--- a/FWCore/MessageService/test/UnitTestClient_I.h
+++ b/FWCore/MessageService/test/UnitTestClient_I.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_I
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_I( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_I : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_I(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_I()
-  { }
+    virtual ~UnitTestClient_I() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_I_h
diff --git a/FWCore/MessageService/test/UnitTestClient_J.cc b/FWCore/MessageService/test/UnitTestClient_J.cc
index 9a558b8efebc8..4530643ed4139 100644
--- a/FWCore/MessageService/test/UnitTestClient_J.cc
+++ b/FWCore/MessageService/test/UnitTestClient_J.cc
@@ -6,28 +6,24 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
-
-
-void
-  UnitTestClient_J::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-
-  edm::MessageDrop::instance()->debugEnabled  = false;
-
-       LogTrace    ("cat_A") << "LogTrace was used to send this mess" << "age";
-       LogDebug    ("cat_B") << "LogDebug was used to send this other message";
-  edm::LogVerbatim ("cat_A") << "LogVerbatim was us" << "ed to send this message";
-  if( edm::isInfoEnabled() ) 
-     edm::LogInfo  ("cat_B") << "LogInfo was used to send this other message";
-}  // MessageLoggerClient::analyze()
-
+namespace edmtest {
+
+  void UnitTestClient_J::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    edm::MessageDrop::instance()->debugEnabled = false;
+
+    LogTrace("cat_A") << "LogTrace was used to send this mess"
+                      << "age";
+    LogDebug("cat_B") << "LogDebug was used to send this other message";
+    edm::LogVerbatim("cat_A") << "LogVerbatim was us"
+                              << "ed to send this message";
+    if (edm::isInfoEnabled())
+      edm::LogInfo("cat_B") << "LogInfo was used to send this other message";
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_J;
 DEFINE_FWK_MODULE(UnitTestClient_J);
diff --git a/FWCore/MessageService/test/UnitTestClient_J.h b/FWCore/MessageService/test/UnitTestClient_J.h
index 39d700f3d0100..218495843be54 100644
--- a/FWCore/MessageService/test/UnitTestClient_J.h
+++ b/FWCore/MessageService/test/UnitTestClient_J.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_J
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_J( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_J : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_J(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_J()
-  { }
+    virtual ~UnitTestClient_J() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_J_h
diff --git a/FWCore/MessageService/test/UnitTestClient_K.cc b/FWCore/MessageService/test/UnitTestClient_K.cc
index 070cf4d572459..f34e9daedbf90 100644
--- a/FWCore/MessageService/test/UnitTestClient_K.cc
+++ b/FWCore/MessageService/test/UnitTestClient_K.cc
@@ -5,26 +5,20 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
+namespace edmtest {
 
+  void UnitTestClient_K::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    for (int i = 0; i < 10; ++i) {
+      edm::LogPrint("cat_P") << "LogPrint: " << i;
+      edm::LogSystem("cat_S") << "LogSystem: " << i;
+    }
 
-void
-  UnitTestClient_K::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-  
-  for (int i=0; i<10; ++i) {
-    edm::LogPrint  ("cat_P") << "LogPrint: " << i; 
-    edm::LogSystem ("cat_S") << "LogSystem: " << i; 
-  }
-
-}  // MessageLoggerClient::analyze()
-
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_K;
 DEFINE_FWK_MODULE(UnitTestClient_K);
diff --git a/FWCore/MessageService/test/UnitTestClient_K.h b/FWCore/MessageService/test/UnitTestClient_K.h
index 241cd9d59c0ba..8bdd225af9aa4 100644
--- a/FWCore/MessageService/test/UnitTestClient_K.h
+++ b/FWCore/MessageService/test/UnitTestClient_K.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_K
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_K( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_K : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_K(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_K()
-  { }
+    virtual ~UnitTestClient_K() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_K_h
diff --git a/FWCore/MessageService/test/UnitTestClient_M.cc b/FWCore/MessageService/test/UnitTestClient_M.cc
index 89ed9a75b7be1..382c14b5f2731 100644
--- a/FWCore/MessageService/test/UnitTestClient_M.cc
+++ b/FWCore/MessageService/test/UnitTestClient_M.cc
@@ -8,30 +8,20 @@
 
 // Test of LogSystem, LogAbsolute, LogProblem, LogPrint, LogVerbatim
 
-namespace edmtest
-{
-
-
-void
-  UnitTestClient_M::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-  edm::LogSystem("system")    << 
-  	"Text sent to LogSystem"; 
-  edm::LogAbsolute("absolute")  << 
-  	"Text sent to LogAbsolute - should be unformatted"; 
-  edm::LogProblem("problem")   << 
-  	"Text sent to LogProblem - should be unformatted"; 
-  edm::LogPrint("print")       << 
-  	"Text sent to LogPrint- should be unformatted"; 
-  edm::LogVerbatim("verbatim") << 
-  	"Text sent to LogVerbatim - should be unformatted"; 
-}  // MessageLoggerClient::analyze()
-
+namespace edmtest {
+
+  void UnitTestClient_M::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    edm::LogSystem("system") << "Text sent to LogSystem";
+    edm::LogAbsolute("absolute") << "Text sent to LogAbsolute - should be unformatted";
+    edm::LogProblem("problem") << "Text sent to LogProblem - should be unformatted";
+    edm::LogPrint("print") << "Text sent to LogPrint- should be unformatted";
+    edm::LogVerbatim("verbatim") << "Text sent to LogVerbatim - should be unformatted";
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_M;
 DEFINE_FWK_MODULE(UnitTestClient_M);
diff --git a/FWCore/MessageService/test/UnitTestClient_M.h b/FWCore/MessageService/test/UnitTestClient_M.h
index b354e47fd43c5..6377ad4133b1b 100644
--- a/FWCore/MessageService/test/UnitTestClient_M.h
+++ b/FWCore/MessageService/test/UnitTestClient_M.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_M
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_M( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_M : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_M(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_M()
-  { }
+    virtual ~UnitTestClient_M() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_M_h
diff --git a/FWCore/MessageService/test/UnitTestClient_N.cc b/FWCore/MessageService/test/UnitTestClient_N.cc
index e82e71501f18d..904db9e3f092a 100644
--- a/FWCore/MessageService/test/UnitTestClient_N.cc
+++ b/FWCore/MessageService/test/UnitTestClient_N.cc
@@ -5,31 +5,23 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
-
-
-void
-  UnitTestClient_N::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-  std::string empty_;
-  std::string file_ = "nameOfFile";
-       LogDebug  ("ridiculously_long_category_name_to_make_header_wrap_A")   
-       		<< "LogDebug was used to send this message";
-       LogDebug  ("ridiculously_long_category_name_to_make_header_wrap_B")  
-        	<< "LogDebug was used to send this other message";
-  edm::LogInfo   ("ridiculously_long_category_name_to_make_header_wrap_A")  
-  		<< "LogInfo was used to send this message";
-  edm::LogInfo   ("ridiculously_long_category_name_to_make_header_wrap_B")   
-  		<< "LogInfo was used to send this other message";
-
- }  // MessageLoggerClient::analyze()
-
+namespace edmtest {
+
+  void UnitTestClient_N::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    std::string empty_;
+    std::string file_ = "nameOfFile";
+    LogDebug("ridiculously_long_category_name_to_make_header_wrap_A") << "LogDebug was used to send this message";
+    LogDebug("ridiculously_long_category_name_to_make_header_wrap_B") << "LogDebug was used to send this other message";
+    edm::LogInfo("ridiculously_long_category_name_to_make_header_wrap_A") << "LogInfo was used to send this message";
+    edm::LogInfo("ridiculously_long_category_name_to_make_header_wrap_B")
+        << "LogInfo was used to send this other message";
+
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_N;
 DEFINE_FWK_MODULE(UnitTestClient_N);
diff --git a/FWCore/MessageService/test/UnitTestClient_N.h b/FWCore/MessageService/test/UnitTestClient_N.h
index 205d7b82c58c2..f9225e76f0688 100644
--- a/FWCore/MessageService/test/UnitTestClient_N.h
+++ b/FWCore/MessageService/test/UnitTestClient_N.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_N
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_N( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_N : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_N(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_N()
-  { }
+    virtual ~UnitTestClient_N() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_N_h
diff --git a/FWCore/MessageService/test/UnitTestClient_Nd.cc b/FWCore/MessageService/test/UnitTestClient_Nd.cc
index ebbf60109c7eb..ed5dcb3e25e45 100644
--- a/FWCore/MessageService/test/UnitTestClient_Nd.cc
+++ b/FWCore/MessageService/test/UnitTestClient_Nd.cc
@@ -5,31 +5,23 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
-
-
-void
-  UnitTestClient_Nd::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-  std::string empty_;
-  std::string file_ = "nameOfFile";
-       LogDebug  ("ridiculously_long_category_name_to_make_header_wrap_A")   
-       		<< "LogDebug was used to send this message";
-       LogDebug  ("ridiculously_long_category_name_to_make_header_wrap_B")  
-        	<< "LogDebug was used to send this other message";
-  edm::LogInfo   ("ridiculously_long_category_name_to_make_header_wrap_A")  
-  		<< "LogInfo was used to send this message";
-  edm::LogInfo   ("ridiculously_long_category_name_to_make_header_wrap_B")   
-  		<< "LogInfo was used to send this other message";
-
- }  // MessageLoggerClient::analyze()
-
+namespace edmtest {
+
+  void UnitTestClient_Nd::analyze(edm::Event const& /*unused*/
+                                  ,
+                                  edm::EventSetup const& /*unused*/
+  ) {
+    std::string empty_;
+    std::string file_ = "nameOfFile";
+    LogDebug("ridiculously_long_category_name_to_make_header_wrap_A") << "LogDebug was used to send this message";
+    LogDebug("ridiculously_long_category_name_to_make_header_wrap_B") << "LogDebug was used to send this other message";
+    edm::LogInfo("ridiculously_long_category_name_to_make_header_wrap_A") << "LogInfo was used to send this message";
+    edm::LogInfo("ridiculously_long_category_name_to_make_header_wrap_B")
+        << "LogInfo was used to send this other message";
+
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_Nd;
 DEFINE_FWK_MODULE(UnitTestClient_Nd);
diff --git a/FWCore/MessageService/test/UnitTestClient_Nd.h b/FWCore/MessageService/test/UnitTestClient_Nd.h
index 8952e0fb66090..5e2f30f30956d 100644
--- a/FWCore/MessageService/test/UnitTestClient_Nd.h
+++ b/FWCore/MessageService/test/UnitTestClient_Nd.h
@@ -6,37 +6,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_Nd
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_Nd( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_Nd : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_Nd(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_Nd()
-  { }
+    virtual ~UnitTestClient_Nd() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_Nd_h
diff --git a/FWCore/MessageService/test/UnitTestClient_O.cc b/FWCore/MessageService/test/UnitTestClient_O.cc
index 41385302be499..a9c60d7175813 100644
--- a/FWCore/MessageService/test/UnitTestClient_O.cc
+++ b/FWCore/MessageService/test/UnitTestClient_O.cc
@@ -5,26 +5,18 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
+namespace edmtest {
 
+  void UnitTestClient_O::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    edm::LogInfo("importantInfo") << "This LogInfo message should appear in both destinations";
+    edm::LogInfo("routineInfo") << "This LogInfo message should appear in the info destination";
 
-void
-  UnitTestClient_O::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-  edm::LogInfo   ("importantInfo")   
-  		<< "This LogInfo message should appear in both destinations";
-  edm::LogInfo   ("routineInfo")   
-		<< "This LogInfo message should appear in the info destination";
-
-
- }  // MessageLoggerClient::analyze()
-
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_O;
 DEFINE_FWK_MODULE(UnitTestClient_O);
diff --git a/FWCore/MessageService/test/UnitTestClient_O.h b/FWCore/MessageService/test/UnitTestClient_O.h
index 37d3439df6fa8..2675fe0015315 100644
--- a/FWCore/MessageService/test/UnitTestClient_O.h
+++ b/FWCore/MessageService/test/UnitTestClient_O.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_O
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_O( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_O : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_O(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_O()
-  { }
+    virtual ~UnitTestClient_O() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_O_h
diff --git a/FWCore/MessageService/test/UnitTestClient_P.cc b/FWCore/MessageService/test/UnitTestClient_P.cc
index a0f33ea1cddb6..1e3032507f26c 100644
--- a/FWCore/MessageService/test/UnitTestClient_P.cc
+++ b/FWCore/MessageService/test/UnitTestClient_P.cc
@@ -1,4 +1,4 @@
-// Tests effect of LogFlush by cfg-configurable choices of how many 
+// Tests effect of LogFlush by cfg-configurable choices of how many
 // messages to use to clog the queue and whether or not FlushMessageLog
 // is invoked.  Under normal testing, it will invoke FlushMessageLog in
 // a situation where its absence would result in different output.
@@ -10,34 +10,29 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
+namespace edmtest {
 
+  void UnitTestClient_P::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    edm::LogWarning("configuration") << "useLogFlush = " << useLogFlush << " queueFillers = " << queueFillers;
+    std::string longMessage;
+    for (int k = 0; k < 100; k++) {
+      longMessage += "Line in long message\n";
+    }
+    for (int i = 0; i < queueFillers; ++i) {
+      edm::LogInfo("cat") << "message " << i << "\n" << longMessage;
+    }
 
-void
-  UnitTestClient_P::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-  edm::LogWarning ("configuration") << "useLogFlush = " << useLogFlush 
-  			       << " queueFillers = " << queueFillers;
-  std::string longMessage;
-  for (int k=0; k<100; k++) {
-    longMessage += "Line in long message\n";
-  }
-  for (int i=0; i< queueFillers; ++i) {
-    edm::LogInfo("cat") <<  "message " << i << "\n" << longMessage;
-  }
-
-  edm::LogError ("keyMessage") << "This message is issued just before abort";
-  if  (useLogFlush)  edm::FlushMessageLog();
-  _exit(0);
-
- }  // MessageLoggerClient::analyze()
+    edm::LogError("keyMessage") << "This message is issued just before abort";
+    if (useLogFlush)
+      edm::FlushMessageLog();
+    _exit(0);
 
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_P;
 DEFINE_FWK_MODULE(UnitTestClient_P);
diff --git a/FWCore/MessageService/test/UnitTestClient_P.h b/FWCore/MessageService/test/UnitTestClient_P.h
index ebeb1a2e7181f..409866a174b18 100644
--- a/FWCore/MessageService/test/UnitTestClient_P.h
+++ b/FWCore/MessageService/test/UnitTestClient_P.h
@@ -6,44 +6,28 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_P
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_P( edm::ParameterSet const & p) 
-    : useLogFlush(true)
-    , queueFillers(1)
-  { 
-    useLogFlush  = p.getUntrackedParameter<bool>("useLogFlush",  useLogFlush);
-    queueFillers = p.getUntrackedParameter<int> ("queueFillers", queueFillers);
-  }
+  class UnitTestClient_P : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_P(edm::ParameterSet const& p) : useLogFlush(true), queueFillers(1) {
+      useLogFlush = p.getUntrackedParameter<bool>("useLogFlush", useLogFlush);
+      queueFillers = p.getUntrackedParameter<int>("queueFillers", queueFillers);
+    }
 
-  virtual
-    ~UnitTestClient_P()
-  { }
+    virtual ~UnitTestClient_P() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-  bool useLogFlush;
-  int  queueFillers;
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+    bool useLogFlush;
+    int queueFillers;
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_P_h
diff --git a/FWCore/MessageService/test/UnitTestClient_Q.cc b/FWCore/MessageService/test/UnitTestClient_Q.cc
index ff84bfe8e8095..f66802f4420a5 100644
--- a/FWCore/MessageService/test/UnitTestClient_Q.cc
+++ b/FWCore/MessageService/test/UnitTestClient_Q.cc
@@ -4,29 +4,25 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
+namespace edmtest {
 
-void
-  UTC_Q1::analyze( edm::Event      const & /*unused*/
-                            , edm::EventSetup const & /*unused*/
-                              )
-{
-  edm::LogInfo   ("cat_A")   << "Q1 with identifier " << identifier;
-  edm::LogInfo   ("timer")   << "Q1 timer with identifier " << identifier;
-  edm::LogInfo   ("trace")   << "Q1 trace with identifier " << identifier;
-}  
-
-void
-  UTC_Q2::analyze( edm::Event      const & /*unused*/
-                            , edm::EventSetup const & /*unused*/
-                              )
-{
-  edm::LogInfo   ("cat_A")   << "Q2 with identifier " << identifier;
-  edm::LogInfo   ("timer")   << "Q2 timer with identifier " << identifier;
-  edm::LogInfo   ("trace")   << "Q2 trace with identifier " << identifier;
-}  
+  void UTC_Q1::analyze(edm::Event const& /*unused*/
+                       ,
+                       edm::EventSetup const& /*unused*/
+  ) {
+    edm::LogInfo("cat_A") << "Q1 with identifier " << identifier;
+    edm::LogInfo("timer") << "Q1 timer with identifier " << identifier;
+    edm::LogInfo("trace") << "Q1 trace with identifier " << identifier;
+  }
 
+  void UTC_Q2::analyze(edm::Event const& /*unused*/
+                       ,
+                       edm::EventSetup const& /*unused*/
+  ) {
+    edm::LogInfo("cat_A") << "Q2 with identifier " << identifier;
+    edm::LogInfo("timer") << "Q2 timer with identifier " << identifier;
+    edm::LogInfo("trace") << "Q2 trace with identifier " << identifier;
+  }
 
 }  // namespace edmtest
 
diff --git a/FWCore/MessageService/test/UnitTestClient_Q.h b/FWCore/MessageService/test/UnitTestClient_Q.h
index 4bfd08c42a2ca..74d5305c83a62 100644
--- a/FWCore/MessageService/test/UnitTestClient_Q.h
+++ b/FWCore/MessageService/test/UnitTestClient_Q.h
@@ -11,62 +11,38 @@ namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
+  class UTC_Q1 : public edm::EDAnalyzer {
+  public:
+    explicit UTC_Q1(edm::ParameterSet const& p) {
+      identifier = p.getUntrackedParameter<int>("identifier", 99);
+      edm::GroupLogStatistics("timer");  // these lines would normally be in
+      edm::GroupLogStatistics("trace");  // whatever service knows that
+                                         // timer and trace should be groupd
+                                         // by moduels for statistics
+    }
 
-class UTC_Q1
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UTC_Q1( edm::ParameterSet const & p)
-  { 
-    identifier = p.getUntrackedParameter<int> ("identifier", 99);
-    edm::GroupLogStatistics("timer");  // these lines would normally be in
-    edm::GroupLogStatistics("trace");  // whatever service knows that
-    				       // timer and trace should be groupd
-				       // by moduels for statistics
-  }
+    virtual ~UTC_Q1() {}
 
-  virtual
-    ~UTC_Q1()
-  { }
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
+  private:
+    int identifier;
+  };
 
-private:
-  int identifier;
-};
+  class UTC_Q2 : public edm::EDAnalyzer {
+  public:
+    explicit UTC_Q2(edm::ParameterSet const& p) { identifier = p.getUntrackedParameter<int>("identifier", 98); }
 
-class UTC_Q2
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UTC_Q2( edm::ParameterSet const & p)
-  { 
-    identifier = p.getUntrackedParameter<int> ("identifier", 98);
-  }
+    virtual ~UTC_Q2() {}
 
-  virtual
-    ~UTC_Q2()
-  { }
-
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-  int identifier;
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+    int identifier;
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_Q_h
diff --git a/FWCore/MessageService/test/UnitTestClient_R.cc b/FWCore/MessageService/test/UnitTestClient_R.cc
index b80dc06179173..a521a961de29b 100644
--- a/FWCore/MessageService/test/UnitTestClient_R.cc
+++ b/FWCore/MessageService/test/UnitTestClient_R.cc
@@ -6,24 +6,19 @@
 #include <string>
 #include <iomanip>
 
-namespace edmtest
-{
-
-
-void
-  UnitTestClient_R::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-
-  for( int i=0; i<10000; ++i) {
-    edm::LogError("cat_A")   << "A " << i;
-    edm::LogError("cat_B")   << "B " << i;
-  }
-}  // MessageLoggerClient::analyze()
+namespace edmtest {
+
+  void UnitTestClient_R::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    for (int i = 0; i < 10000; ++i) {
+      edm::LogError("cat_A") << "A " << i;
+      edm::LogError("cat_B") << "B " << i;
+    }
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_R;
 DEFINE_FWK_MODULE(UnitTestClient_R);
diff --git a/FWCore/MessageService/test/UnitTestClient_R.h b/FWCore/MessageService/test/UnitTestClient_R.h
index 8b7380b6355de..c098af1a7a02a 100644
--- a/FWCore/MessageService/test/UnitTestClient_R.h
+++ b/FWCore/MessageService/test/UnitTestClient_R.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_R
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_R( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_R : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_R(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_R()
-  { }
+    virtual ~UnitTestClient_R() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_A_h
diff --git a/FWCore/MessageService/test/UnitTestClient_S.cc b/FWCore/MessageService/test/UnitTestClient_S.cc
index e407dc2d4f3f3..1ccddf36caa9d 100644
--- a/FWCore/MessageService/test/UnitTestClient_S.cc
+++ b/FWCore/MessageService/test/UnitTestClient_S.cc
@@ -6,62 +6,55 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
+namespace edmtest {
 
-bool UTC_S1::enableNotYetCalled = true;
-int UTC_S1::n = 0;
-int UTC_S2::n = 0;
+  bool UTC_S1::enableNotYetCalled = true;
+  int UTC_S1::n = 0;
+  int UTC_S2::n = 0;
 
-void
-  UTC_S1::analyze( edm::Event      const & /*unused*/
-                            , edm::EventSetup const & /*unused*/
-                              )
-{
-  if (enableNotYetCalled) {
-    edm::EnableLoggedErrorsSummary();
-    enableNotYetCalled = false;
+  void UTC_S1::analyze(edm::Event const& /*unused*/
+                       ,
+                       edm::EventSetup const& /*unused*/
+  ) {
+    if (enableNotYetCalled) {
+      edm::EnableLoggedErrorsSummary();
+      enableNotYetCalled = false;
+    }
+    n++;
+    if (n <= 2)
+      return;
+    edm::LogError("cat_A") << "S1 with identifier " << identifier << " n = " << n;
+    edm::LogError("grouped_cat") << "S1 timer with identifier " << identifier;
   }
-  n++;
-  if (n <= 2) return;
-  edm::LogError   ("cat_A")   << "S1 with identifier " << identifier
-  			      << " n = " << n;
-  edm::LogError   ("grouped_cat")  << "S1 timer with identifier " << identifier;
-}  
 
-void
-  UTC_S2::analyze( edm::Event      const & /*unused*/
-                            , edm::EventSetup const & /*unused*/
-                              )
-{
-  n++;
-  if (n <= 2) return;
-  edm::LogError   ("cat_A")   << "S2 with identifier " << identifier;
-  edm::LogError   ("grouped_cat") << "S2 timer with identifier " << identifier;
-  edm::LogError   ("cat_B")   << "S2B with identifier " << identifier;
-  for (int i = 0; i<n; ++i) {
-    edm::LogError   ("cat_B")   << "more S2B";
+  void UTC_S2::analyze(edm::Event const& /*unused*/
+                       ,
+                       edm::EventSetup const& /*unused*/
+  ) {
+    n++;
+    if (n <= 2)
+      return;
+    edm::LogError("cat_A") << "S2 with identifier " << identifier;
+    edm::LogError("grouped_cat") << "S2 timer with identifier " << identifier;
+    edm::LogError("cat_B") << "S2B with identifier " << identifier;
+    for (int i = 0; i < n; ++i) {
+      edm::LogError("cat_B") << "more S2B";
+    }
   }
-}  
 
-void
-  UTC_SUMMARY::analyze( edm::Event      const & iEvent
-                            , edm::EventSetup const & /*unused*/
-                              )
-{
-  const auto index = iEvent.streamID().value();
-  if (!edm::FreshErrorsExist(index)) {
-    edm::LogInfo   ("NoFreshErrors") << "Not in this event, anyway";
+  void UTC_SUMMARY::analyze(edm::Event const& iEvent, edm::EventSetup const& /*unused*/
+  ) {
+    const auto index = iEvent.streamID().value();
+    if (!edm::FreshErrorsExist(index)) {
+      edm::LogInfo("NoFreshErrors") << "Not in this event, anyway";
+    }
+    std::vector<edm::ErrorSummaryEntry> es = edm::LoggedErrorsSummary(index);
+    std::ostringstream os;
+    for (unsigned int i = 0; i != es.size(); ++i) {
+      os << es[i].category << "   " << es[i].module << "   " << es[i].count << "\n";
+    }
+    edm::LogVerbatim("ErrorsInEvent") << os.str();
   }
-  std::vector<edm::ErrorSummaryEntry> es = edm::LoggedErrorsSummary(index);
-  std::ostringstream os;
-  for (unsigned int i = 0; i != es.size(); ++i) {
-    os << es[i].category << "   " << es[i].module << "   " 
-       << es[i].count << "\n";
-  }
-  edm::LogVerbatim ("ErrorsInEvent") << os.str();
-}  
-
 
 }  // namespace edmtest
 
diff --git a/FWCore/MessageService/test/UnitTestClient_S.h b/FWCore/MessageService/test/UnitTestClient_S.h
index caa94621034e9..c52cf26212a51 100644
--- a/FWCore/MessageService/test/UnitTestClient_S.h
+++ b/FWCore/MessageService/test/UnitTestClient_S.h
@@ -11,83 +11,49 @@ namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UTC_S1
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UTC_S1( edm::ParameterSet const & p)
-  { 
-    identifier = p.getUntrackedParameter<int> ("identifier", 99);
-    edm::GroupLogStatistics("grouped_cat");  
-  }
-
-  virtual
-    ~UTC_S1()
-  { }
-
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-  int identifier;
-  static bool enableNotYetCalled;
-  static int n;
-};
-
-class UTC_S2
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UTC_S2( edm::ParameterSet const & p)
-  { 
-    identifier = p.getUntrackedParameter<int> ("identifier", 98);
-  }
-
-  virtual
-    ~UTC_S2()
-  { }
-
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-  int identifier;
-  static int n;
-};
-
-class UTC_SUMMARY
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UTC_SUMMARY( edm::ParameterSet const &)
-  { 
-  }
-
-  virtual
-    ~UTC_SUMMARY()
-  { }
-
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+  class UTC_S1 : public edm::EDAnalyzer {
+  public:
+    explicit UTC_S1(edm::ParameterSet const &p) {
+      identifier = p.getUntrackedParameter<int>("identifier", 99);
+      edm::GroupLogStatistics("grouped_cat");
+    }
 
+    virtual ~UTC_S1() {}
 
-}  // namespace edmtest
+    virtual void analyze(edm::Event const &e, edm::EventSetup const &c);
+
+  private:
+    int identifier;
+    static bool enableNotYetCalled;
+    static int n;
+  };
+
+  class UTC_S2 : public edm::EDAnalyzer {
+  public:
+    explicit UTC_S2(edm::ParameterSet const &p) { identifier = p.getUntrackedParameter<int>("identifier", 98); }
+
+    virtual ~UTC_S2() {}
+
+    virtual void analyze(edm::Event const &e, edm::EventSetup const &c);
+
+  private:
+    int identifier;
+    static int n;
+  };
 
+  class UTC_SUMMARY : public edm::EDAnalyzer {
+  public:
+    explicit UTC_SUMMARY(edm::ParameterSet const &) {}
+
+    virtual ~UTC_SUMMARY() {}
+
+    virtual void analyze(edm::Event const &e, edm::EventSetup const &c);
+
+  private:
+  };
+
+}  // namespace edmtest
 
 #endif  // FWCore_MessageService_test_UnitTestClient_S_h
diff --git a/FWCore/MessageService/test/UnitTestClient_SLumi.cc b/FWCore/MessageService/test/UnitTestClient_SLumi.cc
index 4a82c3b2f5033..8abd2ecc8a20e 100644
--- a/FWCore/MessageService/test/UnitTestClient_SLumi.cc
+++ b/FWCore/MessageService/test/UnitTestClient_SLumi.cc
@@ -6,71 +6,63 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
+namespace edmtest {
 
-bool UTC_SL1::enableNotYetCalled = true;
-int UTC_SL1::n = 0;
-int UTC_SL2::n = 0;
+  bool UTC_SL1::enableNotYetCalled = true;
+  int UTC_SL1::n = 0;
+  int UTC_SL2::n = 0;
 
-void
-  UTC_SL1::analyze( edm::Event      const & /*unused*/
-                            , edm::EventSetup const & /*unused*/
-                              )
-{
-  if (enableNotYetCalled) {
-    edm::EnableLoggedErrorsSummary();
-    enableNotYetCalled = false;
+  void UTC_SL1::analyze(edm::Event const& /*unused*/
+                        ,
+                        edm::EventSetup const& /*unused*/
+  ) {
+    if (enableNotYetCalled) {
+      edm::EnableLoggedErrorsSummary();
+      enableNotYetCalled = false;
+    }
+    n++;
+    if (n <= 2)
+      return;
+    edm::LogError("cat_A") << "S1 with identifier " << identifier << " n = " << n;
+    edm::LogError("grouped_cat") << "S1 timer with identifier " << identifier;
   }
-  n++;
-  if (n <= 2) return;
-  edm::LogError   ("cat_A")   << "S1 with identifier " << identifier
-  			      << " n = " << n;
-  edm::LogError   ("grouped_cat")  << "S1 timer with identifier " << identifier;
-}  
 
-void
-  UTC_SL2::analyze( edm::Event      const & /*unused*/
-                            , edm::EventSetup const & /*unused*/
-                              )
-{
-  n++;
-  if (n <= 2) return;
-  edm::LogError   ("cat_A")   << "S2 with identifier " << identifier;
-  edm::LogError   ("grouped_cat") << "S2 timer with identifier " << identifier;
-  edm::LogError   ("cat_B")   << "S2B with identifier " << identifier;
-  for (int i = 0; i<n; ++i) {
-    edm::LogError   ("cat_B")   << "more S2B";
+  void UTC_SL2::analyze(edm::Event const& /*unused*/
+                        ,
+                        edm::EventSetup const& /*unused*/
+  ) {
+    n++;
+    if (n <= 2)
+      return;
+    edm::LogError("cat_A") << "S2 with identifier " << identifier;
+    edm::LogError("grouped_cat") << "S2 timer with identifier " << identifier;
+    edm::LogError("cat_B") << "S2B with identifier " << identifier;
+    for (int i = 0; i < n; ++i) {
+      edm::LogError("cat_B") << "more S2B";
+    }
   }
-}  
 
-void
-  UTC_SLUMMARY::analyze( edm::Event      const & iEvent
-                            , edm::EventSetup const & /*unused*/
-                              )
-{
-  auto const index = iEvent.streamID().value();
-  if (!edm::FreshErrorsExist(index)) {
-    edm::LogInfo   ("NoFreshErrors") << "Not in this event, anyway";
+  void UTC_SLUMMARY::analyze(edm::Event const& iEvent, edm::EventSetup const& /*unused*/
+  ) {
+    auto const index = iEvent.streamID().value();
+    if (!edm::FreshErrorsExist(index)) {
+      edm::LogInfo("NoFreshErrors") << "Not in this event, anyway";
+    }
+    std::vector<edm::ErrorSummaryEntry> es = edm::LoggedErrorsSummary(index);
+    std::ostringstream os;
+    for (unsigned int i = 0; i != es.size(); ++i) {
+      os << es[i].category << "   " << es[i].module << "   " << es[i].count << "\n";
+    }
+    edm::LogVerbatim("ErrorsInEvent") << os.str();
   }
-  std::vector<edm::ErrorSummaryEntry> es = edm::LoggedErrorsSummary(index);
-  std::ostringstream os;
-  for (unsigned int i = 0; i != es.size(); ++i) {
-    os << es[i].category << "   " << es[i].module << "   " 
-       << es[i].count << "\n";
-  }
-  edm::LogVerbatim ("ErrorsInEvent") << os.str();
-}  
-
-void
-  UTC_SLUMMARY::endLuminosityBlock( edm::LuminosityBlock const & /*unused*/
-                            , edm::EventSetup const & /*unused*/
-                              )
-{
-  // throw cms::Exception("endLuminosityBlock called!");
-  edm::LogInfo ("endLuminosityBlock") << "endLuminosityBlock() called";
-}  
 
+  void UTC_SLUMMARY::endLuminosityBlock(edm::LuminosityBlock const& /*unused*/
+                                        ,
+                                        edm::EventSetup const& /*unused*/
+  ) {
+    // throw cms::Exception("endLuminosityBlock called!");
+    edm::LogInfo("endLuminosityBlock") << "endLuminosityBlock() called";
+  }
 
 }  // namespace edmtest
 
diff --git a/FWCore/MessageService/test/UnitTestClient_SLumi.h b/FWCore/MessageService/test/UnitTestClient_SLumi.h
index beabb46a358d7..e735595c1970c 100644
--- a/FWCore/MessageService/test/UnitTestClient_SLumi.h
+++ b/FWCore/MessageService/test/UnitTestClient_SLumi.h
@@ -11,88 +11,51 @@ namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UTC_SL1
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UTC_SL1( edm::ParameterSet const & p)
-  { 
-    identifier = p.getUntrackedParameter<int> ("identifier", 99);
-    edm::GroupLogStatistics("grouped_cat");  
-  }
-
-  virtual
-    ~UTC_SL1()
-  { }
-
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-  int identifier;
-  static bool enableNotYetCalled;
-  static int n;
-};
-
-class UTC_SL2
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UTC_SL2( edm::ParameterSet const & p)
-  { 
-    identifier = p.getUntrackedParameter<int> ("identifier", 98);
-  }
-
-  virtual
-    ~UTC_SL2()
-  { }
-
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-  int identifier;
-  static int n;
-};
-
-class UTC_SLUMMARY
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UTC_SLUMMARY( edm::ParameterSet const &)
-  { 
-  }
-
-  virtual
-    ~UTC_SLUMMARY()
-  { }
-
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-  virtual
-    void endLuminosityBlock ( edm::LuminosityBlock const & lb
-                	    , edm::EventSetup 	   const & c
-                	    );
-
-private:
-};
+  class UTC_SL1 : public edm::EDAnalyzer {
+  public:
+    explicit UTC_SL1(edm::ParameterSet const &p) {
+      identifier = p.getUntrackedParameter<int>("identifier", 99);
+      edm::GroupLogStatistics("grouped_cat");
+    }
 
+    virtual ~UTC_SL1() {}
 
-}  // namespace edmtest
+    virtual void analyze(edm::Event const &e, edm::EventSetup const &c);
+
+  private:
+    int identifier;
+    static bool enableNotYetCalled;
+    static int n;
+  };
+
+  class UTC_SL2 : public edm::EDAnalyzer {
+  public:
+    explicit UTC_SL2(edm::ParameterSet const &p) { identifier = p.getUntrackedParameter<int>("identifier", 98); }
+
+    virtual ~UTC_SL2() {}
+
+    virtual void analyze(edm::Event const &e, edm::EventSetup const &c);
+
+  private:
+    int identifier;
+    static int n;
+  };
 
+  class UTC_SLUMMARY : public edm::EDAnalyzer {
+  public:
+    explicit UTC_SLUMMARY(edm::ParameterSet const &) {}
+
+    virtual ~UTC_SLUMMARY() {}
+
+    virtual void analyze(edm::Event const &e, edm::EventSetup const &c);
+
+    virtual void endLuminosityBlock(edm::LuminosityBlock const &lb, edm::EventSetup const &c);
+
+  private:
+  };
+
+}  // namespace edmtest
 
 #endif  // FWCore_MessageService_test_UnitTestClient_SLumi_h
diff --git a/FWCore/MessageService/test/UnitTestClient_T.cc b/FWCore/MessageService/test/UnitTestClient_T.cc
index 9c04c8c01c28b..e16dd285dfa16 100644
--- a/FWCore/MessageService/test/UnitTestClient_T.cc
+++ b/FWCore/MessageService/test/UnitTestClient_T.cc
@@ -7,77 +7,61 @@
 #include <string>
 #include <sstream>
 
-namespace edmtest
-{
+namespace edmtest {
 
-void
-  UTC_T1::analyze( edm::Event      const & /*unused*/
-                            , edm::EventSetup const & /*unused*/
-                              )
-{
-  if (ev == 0) edm::EnableLoggedErrorsSummary();
-  edm::LogError  ("cat_A")   << "T1 error with identifier " << identifier
-  			     << " event " << ev;
-  edm::LogWarning("cat_A")   << "T1 warning with identifier " << identifier
-  			     << " event " << ev;
-  edm::LogError  ("timer")   << "T1 timer error with identifier " << identifier
-  			     << " event " << ev;
-  ev++;
-}  
+  void UTC_T1::analyze(edm::Event const& /*unused*/
+                       ,
+                       edm::EventSetup const& /*unused*/
+  ) {
+    if (ev == 0)
+      edm::EnableLoggedErrorsSummary();
+    edm::LogError("cat_A") << "T1 error with identifier " << identifier << " event " << ev;
+    edm::LogWarning("cat_A") << "T1 warning with identifier " << identifier << " event " << ev;
+    edm::LogError("timer") << "T1 timer error with identifier " << identifier << " event " << ev;
+    ev++;
+  }
 
-void
-  UTC_T2::analyze( edm::Event      const & iEvent
-                            , edm::EventSetup const & /*unused*/
-                              )
-{
-  const auto index = iEvent.streamID().value();
-  edm::LogError  ("cat_A")   << "T2 error with identifier " << identifier
-  			     << " event " << ev;
-  edm::LogWarning("cat_A")   << "T2 warning with identifier " << identifier
-  			     << " event " << ev;
-  edm::LogError  ("timer")   << "T2 timer error with identifier " << identifier
-  			     << " event " << ev;
-  if ( ev == 9 ) {
-    if (edm::FreshErrorsExist(index)) {
-	edm::LogInfo("summary") << 
-	"At ev = " << ev << "FreshErrorsExist() returns true"; 
-    } else {
-	edm::LogError("summary") 
-	<< "At ev = " << ev << "FreshErrorsExist() returns false"
-	<< " which is unexpected"; 
+  void UTC_T2::analyze(edm::Event const& iEvent, edm::EventSetup const& /*unused*/
+  ) {
+    const auto index = iEvent.streamID().value();
+    edm::LogError("cat_A") << "T2 error with identifier " << identifier << " event " << ev;
+    edm::LogWarning("cat_A") << "T2 warning with identifier " << identifier << " event " << ev;
+    edm::LogError("timer") << "T2 timer error with identifier " << identifier << " event " << ev;
+    if (ev == 9) {
+      if (edm::FreshErrorsExist(index)) {
+        edm::LogInfo("summary") << "At ev = " << ev << "FreshErrorsExist() returns true";
+      } else {
+        edm::LogError("summary") << "At ev = " << ev << "FreshErrorsExist() returns false"
+                                 << " which is unexpected";
+      }
+      std::vector<edm::ErrorSummaryEntry> v = edm::LoggedErrorsSummary(index);
+      printLES(v);
     }
-    std::vector<edm::ErrorSummaryEntry> v = edm::LoggedErrorsSummary(index);
-    printLES(v);
-  }
-  if ( ev == 15 ) {
-    if (edm::FreshErrorsExist(index)) {
-	edm::LogInfo("summary") 
-	<< "At ev = " << ev << "FreshErrorsExist() returns true"; 
-    } else {
-	edm::LogError("summary") 
-	<< "At ev = " << ev << "FreshErrorsExist() returns false"
-	<< " which is unexpected"; 
+    if (ev == 15) {
+      if (edm::FreshErrorsExist(index)) {
+        edm::LogInfo("summary") << "At ev = " << ev << "FreshErrorsExist() returns true";
+      } else {
+        edm::LogError("summary") << "At ev = " << ev << "FreshErrorsExist() returns false"
+                                 << " which is unexpected";
+      }
+      std::vector<edm::ErrorSummaryEntry> v = edm::LoggedErrorsOnlySummary(index);
+      printLES(v);
     }
-    std::vector<edm::ErrorSummaryEntry> v = edm::LoggedErrorsOnlySummary(index);
-    printLES(v);
+    ev++;
   }
-  ev++;
-}  
 
-void
-UTC_T2::printLES(std::vector<edm::ErrorSummaryEntry> const & v) {
-  std::ostringstream s;
-  typedef std::vector<edm::ErrorSummaryEntry>::const_iterator IT;
-  IT end = v.end();
-  s << "Error Summary Vector with " << v.size() << " entries:\n";
-  for (IT i = v.begin(); i != end; ++i) {
-    s << "Category " << i->category << "   Module " << i->module
-    << "   Severity " << (i->severity).getName() 
-    << "   Count " << i->count << "\n";
-  }   
-  s << "-------------------------- \n";
-  edm::LogVerbatim("summary") << s.str();
-}
+  void UTC_T2::printLES(std::vector<edm::ErrorSummaryEntry> const& v) {
+    std::ostringstream s;
+    typedef std::vector<edm::ErrorSummaryEntry>::const_iterator IT;
+    IT end = v.end();
+    s << "Error Summary Vector with " << v.size() << " entries:\n";
+    for (IT i = v.begin(); i != end; ++i) {
+      s << "Category " << i->category << "   Module " << i->module << "   Severity " << (i->severity).getName()
+        << "   Count " << i->count << "\n";
+    }
+    s << "-------------------------- \n";
+    edm::LogVerbatim("summary") << s.str();
+  }
 
 }  // namespace edmtest
 
diff --git a/FWCore/MessageService/test/UnitTestClient_T.h b/FWCore/MessageService/test/UnitTestClient_T.h
index d2a6dfa7e6165..2d522d5063d92 100644
--- a/FWCore/MessageService/test/UnitTestClient_T.h
+++ b/FWCore/MessageService/test/UnitTestClient_T.h
@@ -13,61 +13,35 @@ namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
+  class UTC_T1 : public edm::EDAnalyzer {
+  public:
+    explicit UTC_T1(edm::ParameterSet const& p) : ev(0) { identifier = p.getUntrackedParameter<int>("identifier", 99); }
 
-class UTC_T1
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UTC_T1( edm::ParameterSet const & p) : ev(0)
-  { 
-    identifier = p.getUntrackedParameter<int> ("identifier", 99);
-  }
+    virtual ~UTC_T1() {}
 
-  virtual
-    ~UTC_T1()
-  { }
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
+  private:
+    int identifier;
+    int ev;
+  };
 
-private:
-  int identifier;
-  int ev;
-};
+  class UTC_T2 : public edm::EDAnalyzer {
+  public:
+    explicit UTC_T2(edm::ParameterSet const& p) : ev(0) { identifier = p.getUntrackedParameter<int>("identifier", 98); }
 
-class UTC_T2
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UTC_T2( edm::ParameterSet const & p) : ev(0)
-  { 
-    identifier = p.getUntrackedParameter<int> ("identifier", 98);
-  }
+    virtual ~UTC_T2() {}
 
-  virtual
-    ~UTC_T2()
-  { }
-
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-  int identifier;
-  int ev;
-  void printLES(std::vector<edm::ErrorSummaryEntry> const & v);
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+    int identifier;
+    int ev;
+    void printLES(std::vector<edm::ErrorSummaryEntry> const& v);
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_T_h
diff --git a/FWCore/MessageService/test/UnitTestClient_V.cc b/FWCore/MessageService/test/UnitTestClient_V.cc
index 2eead0d7382de..9e070b27e90c9 100644
--- a/FWCore/MessageService/test/UnitTestClient_V.cc
+++ b/FWCore/MessageService/test/UnitTestClient_V.cc
@@ -6,68 +6,45 @@
 #include <string>
 #include <sstream>
 
-namespace edmtest
-{
-
-void
-  UTC_V1::analyze( edm::Event      const & /*unused*/
-                            , edm::EventSetup const & /*unused*/
-                              )
-{
-  edm::LogError  ("cat_A")   << "T1 analyze error with identifier " 
-  			     << identifier << " event " << ev;
-  edm::LogWarning("cat_A")   << "T1 analyze warning with identifier " 
-  			     << identifier << " event " << ev;
-  edm::LogInfo   ("cat_A")    << "T1 analyze info with identifier " 
-  			     << identifier << " event " << ev;
-       LogDebug  ("cat_A")    << "T1 analyze debug with identifier " 
-  			     << identifier << " event " << ev;
-  ev++;
-}  
-
-void
-  UTC_V1::beginJob(  )
-{
-  edm::LogWarning("cat_BJ")   << "T1 beginJob warning with identifier " 
-  			     << identifier << " event " << ev;
-       LogDebug  ("cat_BJ")    << "T1 beginJob debug with identifier " 
-  			     << identifier << " event " << ev;
-}
-
-void
-  UTC_V1::beginRun(edm::Run const& /*unused*/, edm::EventSetup const& /*unused*/)
-{
-  edm::LogInfo("cat_BR")   << "T1 beginRun info with identifier " 
-  			     << identifier << " event " << ev;
-       LogDebug  ("cat_BJ")    << "T1 beginRun debug with identifier " 
-  			     << identifier << " event " << ev;
-}
-
-void
-  UTC_V1::beginLuminosityBlock
-  		(edm::LuminosityBlock const& /*unused*/, edm::EventSetup const& /*unused*/)
-{
-  edm::LogWarning("cat_BL")   << "T1 beginLumi warning with identifier " 
-  			     << identifier << " event " << ev;
-       LogDebug  ("cat_BL")    << "T1 beginLumi debug with identifier " 
-  			     << identifier << " event " << ev;
-}
-
-void
-  UTC_V2::analyze( edm::Event      const & /*unused*/
-                            , edm::EventSetup const & /*unused*/
-                              )
-{
-  edm::LogError  ("cat_A")   << "T1 analyze error with identifier " 
-  			     << identifier << " event " << ev;
-  edm::LogWarning("cat_A")   << "T1 analyze warning with identifier " 
-  			     << identifier << " event " << ev;
-  edm::LogInfo  ("cat_A")    << "T1 analyze info with identifier " 
-  			     << identifier << " event " << ev;
-  ev++;
-}  
-
-} // end namespace edmtest
+namespace edmtest {
+
+  void UTC_V1::analyze(edm::Event const& /*unused*/
+                       ,
+                       edm::EventSetup const& /*unused*/
+  ) {
+    edm::LogError("cat_A") << "T1 analyze error with identifier " << identifier << " event " << ev;
+    edm::LogWarning("cat_A") << "T1 analyze warning with identifier " << identifier << " event " << ev;
+    edm::LogInfo("cat_A") << "T1 analyze info with identifier " << identifier << " event " << ev;
+    LogDebug("cat_A") << "T1 analyze debug with identifier " << identifier << " event " << ev;
+    ev++;
+  }
+
+  void UTC_V1::beginJob() {
+    edm::LogWarning("cat_BJ") << "T1 beginJob warning with identifier " << identifier << " event " << ev;
+    LogDebug("cat_BJ") << "T1 beginJob debug with identifier " << identifier << " event " << ev;
+  }
+
+  void UTC_V1::beginRun(edm::Run const& /*unused*/, edm::EventSetup const& /*unused*/) {
+    edm::LogInfo("cat_BR") << "T1 beginRun info with identifier " << identifier << " event " << ev;
+    LogDebug("cat_BJ") << "T1 beginRun debug with identifier " << identifier << " event " << ev;
+  }
+
+  void UTC_V1::beginLuminosityBlock(edm::LuminosityBlock const& /*unused*/, edm::EventSetup const& /*unused*/) {
+    edm::LogWarning("cat_BL") << "T1 beginLumi warning with identifier " << identifier << " event " << ev;
+    LogDebug("cat_BL") << "T1 beginLumi debug with identifier " << identifier << " event " << ev;
+  }
+
+  void UTC_V2::analyze(edm::Event const& /*unused*/
+                       ,
+                       edm::EventSetup const& /*unused*/
+  ) {
+    edm::LogError("cat_A") << "T1 analyze error with identifier " << identifier << " event " << ev;
+    edm::LogWarning("cat_A") << "T1 analyze warning with identifier " << identifier << " event " << ev;
+    edm::LogInfo("cat_A") << "T1 analyze info with identifier " << identifier << " event " << ev;
+    ev++;
+  }
+
+}  // end namespace edmtest
 
 using edmtest::UTC_V1;
 using edmtest::UTC_V2;
diff --git a/FWCore/MessageService/test/UnitTestClient_V.h b/FWCore/MessageService/test/UnitTestClient_V.h
index 1bf508e403522..8d1e3f06ee74e 100644
--- a/FWCore/MessageService/test/UnitTestClient_V.h
+++ b/FWCore/MessageService/test/UnitTestClient_V.h
@@ -12,67 +12,38 @@ namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UTC_V1
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UTC_V1( edm::ParameterSet const & p) : ev(0)
-  { 
-    identifier = p.getUntrackedParameter<int> ("identifier", 99);
-  }
-
-  virtual
-    ~UTC_V1()
-  { }
-
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-  virtual void beginJob ();
-  virtual void beginRun (edm::Run const&, edm::EventSetup const&);
-  virtual void beginLuminosityBlock
-  		(edm::LuminosityBlock const&, edm::EventSetup const&);
-
-
-
-private:
-  int identifier;
-  int ev;
-};
-
-class UTC_V2
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UTC_V2( edm::ParameterSet const & p) : ev(0)
-  { 
-    identifier = p.getUntrackedParameter<int> ("identifier", 98);
-  }
-
-  virtual
-    ~UTC_V2()
-  { }
-
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-  int identifier;
-  int ev;
-};
+  class UTC_V1 : public edm::EDAnalyzer {
+  public:
+    explicit UTC_V1(edm::ParameterSet const& p) : ev(0) { identifier = p.getUntrackedParameter<int>("identifier", 99); }
 
+    virtual ~UTC_V1() {}
 
-}  // namespace edmtest
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
+
+    virtual void beginJob();
+    virtual void beginRun(edm::Run const&, edm::EventSetup const&);
+    virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&);
+
+  private:
+    int identifier;
+    int ev;
+  };
+
+  class UTC_V2 : public edm::EDAnalyzer {
+  public:
+    explicit UTC_V2(edm::ParameterSet const& p) : ev(0) { identifier = p.getUntrackedParameter<int>("identifier", 98); }
 
+    virtual ~UTC_V2() {}
+
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
+
+  private:
+    int identifier;
+    int ev;
+  };
+
+}  // namespace edmtest
 
 #endif  // FWCore_MessageService_test_UnitTestClient_T_h
diff --git a/FWCore/MessageService/test/UnitTestClient_Vd.cc b/FWCore/MessageService/test/UnitTestClient_Vd.cc
index 1a1b48dbbfca4..2e2bedb9313f1 100644
--- a/FWCore/MessageService/test/UnitTestClient_Vd.cc
+++ b/FWCore/MessageService/test/UnitTestClient_Vd.cc
@@ -8,68 +8,45 @@
 #include <string>
 #include <sstream>
 
-namespace edmtest
-{
-
-void
-  UTC_Vd1::analyze( edm::Event      const & /*unused*/
-                            , edm::EventSetup const & /*unused*/
-                              )
-{
-  edm::LogError  ("cat_A")   << "T1 analyze error with identifier " 
-  			     << identifier << " event " << ev;
-  edm::LogWarning("cat_A")   << "T1 analyze warning with identifier " 
-  			     << identifier << " event " << ev;
-  edm::LogInfo   ("cat_A")    << "T1 analyze info with identifier " 
-  			     << identifier << " event " << ev;
-       LogDebug  ("cat_A")    << "T1 analyze debug with identifier " 
-  			     << identifier << " event " << ev;
-  ev++;
-}  
-
-void
-  UTC_Vd1::beginJob(  )
-{
-  edm::LogWarning("cat_BJ")   << "T1 beginJob warning with identifier " 
-  			     << identifier << " event " << ev;
-       LogDebug  ("cat_BJ")    << "T1 beginJob debug with identifier " 
-  			     << identifier << " event " << ev;
-}
-
-void
-  UTC_Vd1::beginRun(edm::Run const& /*unused*/, edm::EventSetup const& /*unused*/)
-{
-  edm::LogInfo("cat_BR")   << "T1 beginRun info with identifier " 
-  			     << identifier << " event " << ev;
-       LogDebug  ("cat_BJ")    << "T1 beginRun debug with identifier " 
-  			     << identifier << " event " << ev;
-}
-
-void
-  UTC_Vd1::beginLuminosityBlock
-  		(edm::LuminosityBlock const& /*unused*/, edm::EventSetup const& /*unused*/)
-{
-  edm::LogWarning("cat_BL")   << "T1 beginLumi warning with identifier " 
-  			     << identifier << " event " << ev;
-       LogDebug  ("cat_BL")    << "T1 beginLumi debug with identifier " 
-  			     << identifier << " event " << ev;
-}
-
-void
-  UTC_Vd2::analyze( edm::Event      const & /*unused*/
-                            , edm::EventSetup const & /*unused*/
-                              )
-{
-  edm::LogError  ("cat_A")   << "T1 analyze error with identifier " 
-  			     << identifier << " event " << ev;
-  edm::LogWarning("cat_A")   << "T1 analyze warning with identifier " 
-  			     << identifier << " event " << ev;
-  edm::LogInfo  ("cat_A")    << "T1 analyze info with identifier " 
-  			     << identifier << " event " << ev;
-  ev++;
-}  
-
-} // end namespace edmtest
+namespace edmtest {
+
+  void UTC_Vd1::analyze(edm::Event const& /*unused*/
+                        ,
+                        edm::EventSetup const& /*unused*/
+  ) {
+    edm::LogError("cat_A") << "T1 analyze error with identifier " << identifier << " event " << ev;
+    edm::LogWarning("cat_A") << "T1 analyze warning with identifier " << identifier << " event " << ev;
+    edm::LogInfo("cat_A") << "T1 analyze info with identifier " << identifier << " event " << ev;
+    LogDebug("cat_A") << "T1 analyze debug with identifier " << identifier << " event " << ev;
+    ev++;
+  }
+
+  void UTC_Vd1::beginJob() {
+    edm::LogWarning("cat_BJ") << "T1 beginJob warning with identifier " << identifier << " event " << ev;
+    LogDebug("cat_BJ") << "T1 beginJob debug with identifier " << identifier << " event " << ev;
+  }
+
+  void UTC_Vd1::beginRun(edm::Run const& /*unused*/, edm::EventSetup const& /*unused*/) {
+    edm::LogInfo("cat_BR") << "T1 beginRun info with identifier " << identifier << " event " << ev;
+    LogDebug("cat_BJ") << "T1 beginRun debug with identifier " << identifier << " event " << ev;
+  }
+
+  void UTC_Vd1::beginLuminosityBlock(edm::LuminosityBlock const& /*unused*/, edm::EventSetup const& /*unused*/) {
+    edm::LogWarning("cat_BL") << "T1 beginLumi warning with identifier " << identifier << " event " << ev;
+    LogDebug("cat_BL") << "T1 beginLumi debug with identifier " << identifier << " event " << ev;
+  }
+
+  void UTC_Vd2::analyze(edm::Event const& /*unused*/
+                        ,
+                        edm::EventSetup const& /*unused*/
+  ) {
+    edm::LogError("cat_A") << "T1 analyze error with identifier " << identifier << " event " << ev;
+    edm::LogWarning("cat_A") << "T1 analyze warning with identifier " << identifier << " event " << ev;
+    edm::LogInfo("cat_A") << "T1 analyze info with identifier " << identifier << " event " << ev;
+    ev++;
+  }
+
+}  // end namespace edmtest
 
 using edmtest::UTC_Vd1;
 using edmtest::UTC_Vd2;
diff --git a/FWCore/MessageService/test/UnitTestClient_Vd.h b/FWCore/MessageService/test/UnitTestClient_Vd.h
index a17a7da032908..b7702a4f9b48f 100644
--- a/FWCore/MessageService/test/UnitTestClient_Vd.h
+++ b/FWCore/MessageService/test/UnitTestClient_Vd.h
@@ -12,67 +12,42 @@ namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UTC_Vd1
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UTC_Vd1( edm::ParameterSet const & p) : ev(0)
-  { 
-    identifier = p.getUntrackedParameter<int> ("identifier", 99);
-  }
-
-  virtual
-    ~UTC_Vd1()
-  { }
-
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-  virtual void beginJob ();
-  virtual void beginRun (edm::Run const&, edm::EventSetup const&);
-  virtual void beginLuminosityBlock
-  		(edm::LuminosityBlock const&, edm::EventSetup const&);
-
-
-
-private:
-  int identifier;
-  int ev;
-};
-
-class UTC_Vd2
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UTC_Vd2( edm::ParameterSet const & p) : ev(0)
-  { 
-    identifier = p.getUntrackedParameter<int> ("identifier", 98);
-  }
-
-  virtual
-    ~UTC_Vd2()
-  { }
-
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-  int identifier;
-  int ev;
-};
+  class UTC_Vd1 : public edm::EDAnalyzer {
+  public:
+    explicit UTC_Vd1(edm::ParameterSet const& p) : ev(0) {
+      identifier = p.getUntrackedParameter<int>("identifier", 99);
+    }
 
+    virtual ~UTC_Vd1() {}
 
-}  // namespace edmtest
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
+
+    virtual void beginJob();
+    virtual void beginRun(edm::Run const&, edm::EventSetup const&);
+    virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&);
+
+  private:
+    int identifier;
+    int ev;
+  };
+
+  class UTC_Vd2 : public edm::EDAnalyzer {
+  public:
+    explicit UTC_Vd2(edm::ParameterSet const& p) : ev(0) {
+      identifier = p.getUntrackedParameter<int>("identifier", 98);
+    }
 
+    virtual ~UTC_Vd2() {}
+
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
+
+  private:
+    int identifier;
+    int ev;
+  };
+
+}  // namespace edmtest
 
 #endif  // FWCore_MessageService_test_UnitTestClient_Vd_h
diff --git a/FWCore/MessageService/test/UnitTestClient_W.cc b/FWCore/MessageService/test/UnitTestClient_W.cc
index 059808b436410..f3d64acdad451 100644
--- a/FWCore/MessageService/test/UnitTestClient_W.cc
+++ b/FWCore/MessageService/test/UnitTestClient_W.cc
@@ -5,23 +5,19 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
-
-void
-  UnitTestClient_W::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-  edm::LogWarning("cat_A")   << "LogWarning was used to send this message";
-  edm::LogInfo   ("cat_B")   << "LogInfo was used to send this message";
-  edm::edmmltest::LogWarningThatSuppressesLikeLogInfo("cat_C")
-  	<< "LogWarningThatSuppressesLikeLogInfo was used to send this message";
- }  // MessageLoggerClient::analyze()
+namespace edmtest {
 
+  void UnitTestClient_W::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    edm::LogWarning("cat_A") << "LogWarning was used to send this message";
+    edm::LogInfo("cat_B") << "LogInfo was used to send this message";
+    edm::edmmltest::LogWarningThatSuppressesLikeLogInfo("cat_C")
+        << "LogWarningThatSuppressesLikeLogInfo was used to send this message";
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_W;
 DEFINE_FWK_MODULE(UnitTestClient_W);
diff --git a/FWCore/MessageService/test/UnitTestClient_W.h b/FWCore/MessageService/test/UnitTestClient_W.h
index 70a1f8b9f1385..b26ec8a97f8a4 100644
--- a/FWCore/MessageService/test/UnitTestClient_W.h
+++ b/FWCore/MessageService/test/UnitTestClient_W.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_W
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_W( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_W : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_W(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_W()
-  { }
+    virtual ~UnitTestClient_W() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_W_h
diff --git a/FWCore/MessageService/test/UnitTestClient_X.cc b/FWCore/MessageService/test/UnitTestClient_X.cc
index d3f62f62391ef..8379c442c9ba0 100644
--- a/FWCore/MessageService/test/UnitTestClient_X.cc
+++ b/FWCore/MessageService/test/UnitTestClient_X.cc
@@ -5,23 +5,19 @@
 #include <iostream>
 #include <string>
 
-namespace edmtest
-{
-
-void
-  UnitTestClient_X::analyze( edm::Event      const & /*unused*/
-                           , edm::EventSetup const & /*unused*/
-                              )
-{
-  edm::LogWarning("cat_A")   << "LogWarning was used to send this message";
-  edm::LogInfo   ("cat_A")   << "LogInfo was used to send this message";
-  edm::LogInfo   ("cat_B")   << "LogInfo was used to send this message";
-  edm::LogWarning("cat_B")   << "LogWarning was used to send this message";
-}  // MessageLoggerClient::analyze()
+namespace edmtest {
 
+  void UnitTestClient_X::analyze(edm::Event const& /*unused*/
+                                 ,
+                                 edm::EventSetup const& /*unused*/
+  ) {
+    edm::LogWarning("cat_A") << "LogWarning was used to send this message";
+    edm::LogInfo("cat_A") << "LogInfo was used to send this message";
+    edm::LogInfo("cat_B") << "LogInfo was used to send this message";
+    edm::LogWarning("cat_B") << "LogWarning was used to send this message";
+  }  // MessageLoggerClient::analyze()
 
 }  // namespace edmtest
 
-
 using edmtest::UnitTestClient_X;
 DEFINE_FWK_MODULE(UnitTestClient_X);
diff --git a/FWCore/MessageService/test/UnitTestClient_X.h b/FWCore/MessageService/test/UnitTestClient_X.h
index a3180a82ae65f..4057df8795515 100644
--- a/FWCore/MessageService/test/UnitTestClient_X.h
+++ b/FWCore/MessageService/test/UnitTestClient_X.h
@@ -4,37 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class UnitTestClient_X
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    UnitTestClient_X( edm::ParameterSet const & )
-  { }
+  class UnitTestClient_X : public edm::EDAnalyzer {
+  public:
+    explicit UnitTestClient_X(edm::ParameterSet const&) {}
 
-  virtual
-    ~UnitTestClient_X()
-  { }
+    virtual ~UnitTestClient_X() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
-
-private:
-};
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_UnitTestClient_X_h
diff --git a/FWCore/MessageService/test/makeJobReport.cpp b/FWCore/MessageService/test/makeJobReport.cpp
index 71a90cbf2225e..2e459ebc52872 100644
--- a/FWCore/MessageService/test/makeJobReport.cpp
+++ b/FWCore/MessageService/test/makeJobReport.cpp
@@ -7,74 +7,57 @@
 #include "FWCore/MessageLogger/interface/JobReport.h"
 #include "FWCore/Utilities/interface/InputType.h"
 
-
-void work()
-{
-
+void work() {
   std::cout << "Testing JobReport" << std::endl;
   std::ostringstream ost;
   {
-  auto theReport = std::make_unique<edm::JobReport>(&ost); 
-  
-
-  std::vector<std::string> inputBranches;
-  for (int i = 0; i < 10; i++){
-    inputBranches.push_back("Some_Input_Branch");
+    auto theReport = std::make_unique<edm::JobReport>(&ost);
+
+    std::vector<std::string> inputBranches;
+    for (int i = 0; i < 10; i++) {
+      inputBranches.push_back("Some_Input_Branch");
+    }
+
+    std::size_t inpFile = theReport->inputFileOpened(
+        "InputPFN", "InputLFN", "InputCatalog", "InputType", "InputSource", "InputLabel", "InputGUID", inputBranches);
+
+    std::vector<std::string> outputBranches;
+    for (int i = 0; i < 10; i++) {
+      outputBranches.push_back("Some_Output_Branch_Probably_From_HLT");
+    }
+
+    std::size_t outFile = theReport->outputFileOpened("OutputPFN",
+                                                      "OutputLFN",
+                                                      "OutputCatalog",
+                                                      "OutputModule",
+                                                      "OutputModuleName",
+                                                      "OutputGUID",
+                                                      "DataType",
+                                                      "OutputBranchesHash",
+                                                      outputBranches);
+
+    for (int i = 0; i < 1000; i++) {
+      theReport->eventReadFromFile(edm::InputType::Primary, inpFile);
+      theReport->eventWrittenToFile(outFile, 1000001, i);
+    }
+
+    theReport->inputFileClosed(edm::InputType::Primary, inpFile);
+    theReport->outputFileClosed(outFile);
   }
-  
- std::size_t inpFile = theReport->inputFileOpened("InputPFN",
-						  "InputLFN",
-						  "InputCatalog",
-						  "InputType",
-						  "InputSource",
-						  "InputLabel",
-						  "InputGUID",
-						  inputBranches);
-  
- 
-  std::vector<std::string> outputBranches;
-  for (int i=0; i < 10; i++){
-    outputBranches.push_back("Some_Output_Branch_Probably_From_HLT");
-
-  }
-
-  
-  std::size_t outFile = theReport->outputFileOpened("OutputPFN",
-						    "OutputLFN",
-						    "OutputCatalog",
-						    "OutputModule",
-						    "OutputModuleName",
-						    "OutputGUID",
-						    "DataType",
-						    "OutputBranchesHash",
-						    outputBranches);
-
-  
-  for (int i=0; i < 1000; i++){
-    theReport->eventReadFromFile(edm::InputType::Primary, inpFile);
-    theReport->eventWrittenToFile(outFile, 1000001, i);
-  }
-
-  theReport->inputFileClosed(edm::InputType::Primary, inpFile);
-  theReport->outputFileClosed(outFile);
-  
-  }
-  std::cout << ost.str()<<std::endl;
-
+  std::cout << ost.str() << std::endl;
 }
 
-int main()
-{
+int main() {
   int rc = -1;
   try {
-      work();
-      
-      rc = 0;
+    work();
+
+    rc = 0;
   }
-  
-  catch ( ... ) {
-      std::cerr << "Unknown exception caught\n";
-      rc = 2;
+
+  catch (...) {
+    std::cerr << "Unknown exception caught\n";
+    rc = 2;
   }
   return rc;
 }
diff --git a/FWCore/MessageService/test/makeSignals.cc b/FWCore/MessageService/test/makeSignals.cc
index 3fe271b2e8211..9986aee8835fc 100644
--- a/FWCore/MessageService/test/makeSignals.cc
+++ b/FWCore/MessageService/test/makeSignals.cc
@@ -11,50 +11,46 @@
 #define RAISE_SEGV
 //#define RAISE_USR2
 
-namespace edmtest
-{
-
-void
-  makeSignals::analyze( edm::Event      const & e
-                       ,edm::EventSetup const & /*unused*/
-                      )
-{
+namespace edmtest {
+
+  void makeSignals::analyze(edm::Event const& e, edm::EventSetup const& /*unused*/
+  ) {
 #ifdef RAISE_SEGV
-  int signum = 11;
-  std::string SigName("SIGSEGV");
+    int signum = 11;
+    std::string SigName("SIGSEGV");
 #endif
 
 #ifdef RAISE_USR2
-  int signum = 12;
-  std::string SigName("SIGUSR2");
+    int signum = 12;
+    std::string SigName("SIGUSR2");
 #endif
-  edm::MessageDrop::instance()->debugEnabled  = true;
-
-       LogTrace    ("cat_A") << "LogTrace was used to send this mess" << "age";
-       LogDebug    ("cat_B") << "LogDebug was used to send this other message";
-  edm::LogVerbatim ("cat_A") << "LogVerbatim was us" << "ed to send this message";
-  if( edm::isInfoEnabled() ) 
-     edm::LogInfo  ("cat_B") << "LogInfo was used to send this other message\n" ;
-
-  if( e.id().event() == 5 )
-   {
-    std::cerr << "Raising Signal " << SigName << " = " << signum << std::endl;
-    edm::LogInfo("Signals") << "Raising Signal " << SigName << " = " << signum ;
+    edm::MessageDrop::instance()->debugEnabled = true;
+
+    LogTrace("cat_A") << "LogTrace was used to send this mess"
+                      << "age";
+    LogDebug("cat_B") << "LogDebug was used to send this other message";
+    edm::LogVerbatim("cat_A") << "LogVerbatim was us"
+                              << "ed to send this message";
+    if (edm::isInfoEnabled())
+      edm::LogInfo("cat_B") << "LogInfo was used to send this other message\n";
+
+    if (e.id().event() == 5) {
+      std::cerr << "Raising Signal " << SigName << " = " << signum << std::endl;
+      edm::LogInfo("Signals") << "Raising Signal " << SigName << " = " << signum;
 #ifdef RAISE_SEGV
-    raise(SIGSEGV);
+      raise(SIGSEGV);
 #endif
 
 #ifdef RAISE_USR2
-    raise(SIGUSR2);
+      raise(SIGUSR2);
 #endif
 
-//  Force a Seg Fault
-//  int * pint = 0;
-//  int rint = *pint;
-   }
-}  // makeSignals::analyze()
+      //  Force a Seg Fault
+      //  int * pint = 0;
+      //  int rint = *pint;
+    }
+  }  // makeSignals::analyze()
 }  // namespace edmtest
 
-
 using edmtest::makeSignals;
 DEFINE_FWK_MODULE(makeSignals);
diff --git a/FWCore/MessageService/test/makeSignals.h b/FWCore/MessageService/test/makeSignals.h
index 07ade62c8bdb8..a56753971a073 100644
--- a/FWCore/MessageService/test/makeSignals.h
+++ b/FWCore/MessageService/test/makeSignals.h
@@ -4,34 +4,23 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 
-
 namespace edm {
   class ParameterSet;
 }
 
+namespace edmtest {
 
-namespace edmtest
-{
-
-class makeSignals
-  : public edm::EDAnalyzer
-{
-public:
-  explicit
-    makeSignals( edm::ParameterSet const & ) { }
+  class makeSignals : public edm::EDAnalyzer {
+  public:
+    explicit makeSignals(edm::ParameterSet const&) {}
 
-  virtual
-    ~makeSignals() { }
+    virtual ~makeSignals() {}
 
-  virtual
-    void analyze( edm::Event      const & e
-                , edm::EventSetup const & c
-                );
+    virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
 
-private:
-};
+  private:
+  };
 
 }  // namespace edmtest
 
-
 #endif  // FWCore_MessageService_test_makeSignals_h
diff --git a/FWCore/MessageService/test/standAloneTest.cpp b/FWCore/MessageService/test/standAloneTest.cpp
index 912e4568d7c49..e3368306235e4 100644
--- a/FWCore/MessageService/test/standAloneTest.cpp
+++ b/FWCore/MessageService/test/standAloneTest.cpp
@@ -1,58 +1,55 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-namespace edmtest
-{
-
-void sampleStandAlone() 
-{
-       LogDebug    ("cat_A")   << "LogDebug    was used to send cat_A";
-       LogDebug    ("cat_B")   << "LogDebug    was used to send cat_B";
-       LogTrace    ("cat_A")   << "LogTrace    was used to send cat_A";
-       LogTrace    ("cat_B")   << "LogTrace    was used to send cat_B";
-  edm::LogInfo     ("cat_A")   << "LogInfo     was used to send cat_A";
-  edm::LogInfo     ("cat_B")   << "LogInfo     was used to send cat_B";
-  edm::LogVerbatim ("cat_A")   << "LogVerbatim was used to send cat_A";
-  edm::LogVerbatim ("cat_B")   << "LogVerbatim was used to send cat_B";
-  edm::LogWarning  ("cat_A")   << "LogWarning  was used to send cat_A";
-  edm::LogWarning  ("cat_B")   << "LogWarning  was used to send cat_B";
-  edm::LogPrint    ("cat_A")   << "LogPrint    was used to send cat_A";
-  edm::LogPrint    ("cat_B")   << "LogPrint    was used to send cat_B";
-  edm::LogError    ("cat_A")   << "LogError    was used to send cat_A";
-  edm::LogError    ("cat_B")   << "LogError    was used to send cat_B";
-  edm::LogProblem  ("cat_A")   << "LogProblem  was used to send cat_A";
-  edm::LogProblem  ("cat_B")   << "LogProblem  was used to send cat_B";
-}
+namespace edmtest {
+
+  void sampleStandAlone() {
+    LogDebug("cat_A") << "LogDebug    was used to send cat_A";
+    LogDebug("cat_B") << "LogDebug    was used to send cat_B";
+    LogTrace("cat_A") << "LogTrace    was used to send cat_A";
+    LogTrace("cat_B") << "LogTrace    was used to send cat_B";
+    edm::LogInfo("cat_A") << "LogInfo     was used to send cat_A";
+    edm::LogInfo("cat_B") << "LogInfo     was used to send cat_B";
+    edm::LogVerbatim("cat_A") << "LogVerbatim was used to send cat_A";
+    edm::LogVerbatim("cat_B") << "LogVerbatim was used to send cat_B";
+    edm::LogWarning("cat_A") << "LogWarning  was used to send cat_A";
+    edm::LogWarning("cat_B") << "LogWarning  was used to send cat_B";
+    edm::LogPrint("cat_A") << "LogPrint    was used to send cat_A";
+    edm::LogPrint("cat_B") << "LogPrint    was used to send cat_B";
+    edm::LogError("cat_A") << "LogError    was used to send cat_A";
+    edm::LogError("cat_B") << "LogError    was used to send cat_B";
+    edm::LogProblem("cat_A") << "LogProblem  was used to send cat_A";
+    edm::LogProblem("cat_B") << "LogProblem  was used to send cat_B";
+  }
 
 }  // namespace edmtest
 
-int main() 
-{ 
-  edm::LogImportant ("note") << "Default settings";
+int main() {
+  edm::LogImportant("note") << "Default settings";
   edmtest::sampleStandAlone();
 
-  edm::LogImportant ("note") << "threshold DEBUG";
+  edm::LogImportant("note") << "threshold DEBUG";
   edm::setStandAloneMessageThreshold(edm::ELdebug);
   edmtest::sampleStandAlone();
 
-  edm::LogImportant ("note") << "threshold INFO";
+  edm::LogImportant("note") << "threshold INFO";
   edm::setStandAloneMessageThreshold(edm::ELinfo);
   edmtest::sampleStandAlone();
 
-  edm::LogImportant ("note") << "threshold WARNING";
+  edm::LogImportant("note") << "threshold WARNING";
   edm::setStandAloneMessageThreshold(edm::ELwarning);
   edmtest::sampleStandAlone();
 
-  edm::LogImportant ("note") << "threshold ELerror"; // ERROR would confuse 
-  						     // the grep checking that
-						     // the runtests worked
+  edm::LogImportant("note") << "threshold ELerror";  // ERROR would confuse
+                                                     // the grep checking that
+                                                     // the runtests worked
   edm::setStandAloneMessageThreshold(edm::ELerror);
   edmtest::sampleStandAlone();
 
-  edm::LogImportant ("note") << "squelch cat_A";
+  edm::LogImportant("note") << "squelch cat_A";
   edm::squelchStandAloneMessageCategory("cat_A");
   edmtest::sampleStandAlone();
 
-  edm::LogImportant ("note") << "squelch cat_B";
+  edm::LogImportant("note") << "squelch cat_B";
   edm::squelchStandAloneMessageCategory("cat_B");
   edmtest::sampleStandAlone();
 
diff --git a/FWCore/MessageService/test/unit_test_outputs/u13d_debugs.log b/FWCore/MessageService/test/unit_test_outputs/u13d_debugs.log
index 369183b8f4222..4a9de286f2109 100644
--- a/FWCore/MessageService/test/unit_test_outputs/u13d_debugs.log
+++ b/FWCore/MessageService/test/unit_test_outputs/u13d_debugs.log
@@ -1,9 +1,9 @@
 LogTrace was used to send this message
-%MSG-d cat_B:  UnitTestClient_Hd:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Hd.cc:20
+%MSG-d cat_B:  UnitTestClient_Hd:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Hd.cc:18
 LogDebug was used to send this other message
 %MSG
 IfLogTrace was used to send this message
-%MSG-d cat_B:  UnitTestClient_Hd:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Hd.cc:23
+%MSG-d cat_B:  UnitTestClient_Hd:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Hd.cc:21
 IfLogDebug was used to send this other message
 %MSG
 LogVerbatim was used to send this message
@@ -11,11 +11,11 @@ LogVerbatim was used to send this message
 LogInfo was used to send this other message
 %MSG
 LogTrace was used to send this message
-%MSG-d cat_B:  UnitTestClient_Hd:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Hd.cc:20
+%MSG-d cat_B:  UnitTestClient_Hd:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Hd.cc:18
 LogDebug was used to send this other message
 %MSG
 IfLogTrace was used to send this message
-%MSG-d cat_B:  UnitTestClient_Hd:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Hd.cc:23
+%MSG-d cat_B:  UnitTestClient_Hd:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Hd.cc:21
 IfLogDebug was used to send this other message
 %MSG
 LogVerbatim was used to send this message
diff --git a/FWCore/MessageService/test/unit_test_outputs/u16_altDebugs.mmlog b/FWCore/MessageService/test/unit_test_outputs/u16_altDebugs.mmlog
index d2edc7415aaf4..2460dfc09a04f 100644
--- a/FWCore/MessageService/test/unit_test_outputs/u16_altDebugs.mmlog
+++ b/FWCore/MessageService/test/unit_test_outputs/u16_altDebugs.mmlog
@@ -1,8 +1,8 @@
 Begin processing the 1st record. Run 1, Event 1, LumiSection 1 on stream 0 at {Timestamp} 
-%MSG-d cat_A:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Ad.cc:21
+%MSG-d cat_A:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Ad.cc:18
 LogDebug was used to send this message
 %MSG
-%MSG-d cat_B:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Ad.cc:22
+%MSG-d cat_B:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Ad.cc:19
 LogDebug was used to send this other message
 %MSG
 %MSG-e cat_A:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1
@@ -24,10 +24,10 @@ LogInfo was used to send this message
 LogInfo was used to send this other message
 %MSG
 Begin processing the 2nd record. Run 1, Event 2, LumiSection 1 on stream 0 at {Timestamp} 
-%MSG-d cat_A:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Ad.cc:21
+%MSG-d cat_A:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Ad.cc:18
 LogDebug was used to send this message
 %MSG
-%MSG-d cat_B:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Ad.cc:22
+%MSG-d cat_B:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Ad.cc:19
 LogDebug was used to send this other message
 %MSG
 %MSG-e cat_A:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2
diff --git a/FWCore/MessageService/test/unit_test_outputs/u19d_debugs.log b/FWCore/MessageService/test/unit_test_outputs/u19d_debugs.log
index 6e8f0398a094e..636dbd58f5a9b 100644
--- a/FWCore/MessageService/test/unit_test_outputs/u19d_debugs.log
+++ b/FWCore/MessageService/test/unit_test_outputs/u19d_debugs.log
@@ -1,8 +1,8 @@
 Begin processing the 1st record. Run 1, Event 1, LumiSection 1 on stream 0 at {Timestamp} 
-%MSG-d ridiculously_long_category_name_to_make_header_wrap_A:   UnitTestClient_Nd:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Nd.cc:19
+%MSG-d ridiculously_long_category_name_to_make_header_wrap_A:   UnitTestClient_Nd:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Nd.cc:16
 LogDebug was used to send this message
 %MSG
-%MSG-d ridiculously_long_category_name_to_make_header_wrap_B:   UnitTestClient_Nd:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Nd.cc:21
+%MSG-d ridiculously_long_category_name_to_make_header_wrap_B:   UnitTestClient_Nd:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Nd.cc:17
 LogDebug was used to send this other message
 %MSG
 %MSG-i ridiculously_long_category_name_to_make_header_wrap_A:   UnitTestClient_Nd:sendSomeMessages Run: 1 Event: 1
@@ -12,10 +12,10 @@ LogInfo was used to send this message
 LogInfo was used to send this other message
 %MSG
 Begin processing the 2nd record. Run 1, Event 2, LumiSection 1 on stream 0 at {Timestamp} 
-%MSG-d ridiculously_long_category_name_to_make_header_wrap_A:   UnitTestClient_Nd:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Nd.cc:19
+%MSG-d ridiculously_long_category_name_to_make_header_wrap_A:   UnitTestClient_Nd:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Nd.cc:16
 LogDebug was used to send this message
 %MSG
-%MSG-d ridiculously_long_category_name_to_make_header_wrap_B:   UnitTestClient_Nd:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Nd.cc:21
+%MSG-d ridiculously_long_category_name_to_make_header_wrap_B:   UnitTestClient_Nd:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Nd.cc:17
 LogDebug was used to send this other message
 %MSG
 %MSG-i ridiculously_long_category_name_to_make_header_wrap_A:   UnitTestClient_Nd:sendSomeMessages Run: 1 Event: 2
diff --git a/FWCore/MessageService/test/unit_test_outputs/u1d_debugs.log b/FWCore/MessageService/test/unit_test_outputs/u1d_debugs.log
index d2edc7415aaf4..2460dfc09a04f 100644
--- a/FWCore/MessageService/test/unit_test_outputs/u1d_debugs.log
+++ b/FWCore/MessageService/test/unit_test_outputs/u1d_debugs.log
@@ -1,8 +1,8 @@
 Begin processing the 1st record. Run 1, Event 1, LumiSection 1 on stream 0 at {Timestamp} 
-%MSG-d cat_A:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Ad.cc:21
+%MSG-d cat_A:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Ad.cc:18
 LogDebug was used to send this message
 %MSG
-%MSG-d cat_B:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Ad.cc:22
+%MSG-d cat_B:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1 UnitTestClient_Ad.cc:19
 LogDebug was used to send this other message
 %MSG
 %MSG-e cat_A:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 1
@@ -24,10 +24,10 @@ LogInfo was used to send this message
 LogInfo was used to send this other message
 %MSG
 Begin processing the 2nd record. Run 1, Event 2, LumiSection 1 on stream 0 at {Timestamp} 
-%MSG-d cat_A:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Ad.cc:21
+%MSG-d cat_A:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Ad.cc:18
 LogDebug was used to send this message
 %MSG
-%MSG-d cat_B:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Ad.cc:22
+%MSG-d cat_B:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2 UnitTestClient_Ad.cc:19
 LogDebug was used to send this other message
 %MSG
 %MSG-e cat_A:  UnitTestClient_Ad:sendSomeMessages Run: 1 Event: 2
diff --git a/FWCore/MessageService/test/unit_test_outputs/u33d_all.log b/FWCore/MessageService/test/unit_test_outputs/u33d_all.log
index 818cdddf998ae..5a7dfa5bc58b8 100644
--- a/FWCore/MessageService/test/unit_test_outputs/u33d_all.log
+++ b/FWCore/MessageService/test/unit_test_outputs/u33d_all.log
@@ -4,7 +4,7 @@ T1 beginJob warning with identifier 11 event 0
 %MSG-w cat_BJ:  UTC_Vd1:ssm_1b@beginJob pre-events
 T1 beginJob warning with identifier 12 event 0
 %MSG
-%MSG-d cat_BJ:  UTC_Vd1:ssm_1b@beginJob pre-events UnitTestClient_Vd.cc:35
+%MSG-d cat_BJ:  UTC_Vd1:ssm_1b@beginJob pre-events UnitTestClient_Vd.cc:26
 T1 beginJob debug with identifier 12 event 0
 %MSG
 %MSG-i cat_BR:  UTC_Vd1:ssm_1a@beginRun Run: 1
@@ -13,7 +13,7 @@ T1 beginRun info with identifier 11 event 0
 %MSG-i cat_BR:  UTC_Vd1:ssm_1b@beginRun Run: 1
 T1 beginRun info with identifier 12 event 0
 %MSG
-%MSG-d cat_BJ:  UTC_Vd1:ssm_1b@beginRun Run: 1 UnitTestClient_Vd.cc:44
+%MSG-d cat_BJ:  UTC_Vd1:ssm_1b@beginRun Run: 1 UnitTestClient_Vd.cc:31
 T1 beginRun debug with identifier 12 event 0
 %MSG
 %MSG-w cat_BL:  UTC_Vd1:ssm_1a@beginLumi Run: 1 Lumi: 1
@@ -22,7 +22,7 @@ T1 beginLumi warning with identifier 11 event 0
 %MSG-w cat_BL:  UTC_Vd1:ssm_1b@beginLumi Run: 1 Lumi: 1
 T1 beginLumi warning with identifier 12 event 0
 %MSG
-%MSG-d cat_BL:  UTC_Vd1:ssm_1b@beginLumi Run: 1 Lumi: 1 UnitTestClient_Vd.cc:54
+%MSG-d cat_BL:  UTC_Vd1:ssm_1b@beginLumi Run: 1 Lumi: 1 UnitTestClient_Vd.cc:36
 T1 beginLumi debug with identifier 12 event 0
 %MSG
 Begin processing the 1st record. Run 1, Event 1, LumiSection 1 on stream 0 at {Timestamp} 
@@ -50,7 +50,7 @@ T1 analyze warning with identifier 12 event 0
 %MSG-i cat_A:  UTC_Vd1:ssm_1b Run: 1 Event: 1
 T1 analyze info with identifier 12 event 0
 %MSG
-%MSG-d cat_A:  UTC_Vd1:ssm_1b Run: 1 Event: 1 UnitTestClient_Vd.cc:25
+%MSG-d cat_A:  UTC_Vd1:ssm_1b Run: 1 Event: 1 UnitTestClient_Vd.cc:20
 T1 analyze debug with identifier 12 event 0
 %MSG
 %MSG-e cat_A:  UTC_Vd2:ssm_2b Run: 1 Event: 1
@@ -87,7 +87,7 @@ T1 analyze warning with identifier 12 event 1
 %MSG-i cat_A:  UTC_Vd1:ssm_1b Run: 1 Event: 2
 T1 analyze info with identifier 12 event 1
 %MSG
-%MSG-d cat_A:  UTC_Vd1:ssm_1b Run: 1 Event: 2 UnitTestClient_Vd.cc:25
+%MSG-d cat_A:  UTC_Vd1:ssm_1b Run: 1 Event: 2 UnitTestClient_Vd.cc:20
 T1 analyze debug with identifier 12 event 1
 %MSG
 %MSG-e cat_A:  UTC_Vd2:ssm_2b Run: 1 Event: 2
diff --git a/FWCore/Modules/src/AbortOnEventIDAnalyzer.cc b/FWCore/Modules/src/AbortOnEventIDAnalyzer.cc
index 9ad689f518736..3f81dd6f03bdf 100644
--- a/FWCore/Modules/src/AbortOnEventIDAnalyzer.cc
+++ b/FWCore/Modules/src/AbortOnEventIDAnalyzer.cc
@@ -37,19 +37,18 @@
 
 class AbortOnEventIDAnalyzer : public edm::EDAnalyzer {
 public:
-   explicit AbortOnEventIDAnalyzer(edm::ParameterSet const&);
-   ~AbortOnEventIDAnalyzer() override;
-    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-
+  explicit AbortOnEventIDAnalyzer(edm::ParameterSet const&);
+  ~AbortOnEventIDAnalyzer() override;
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 private:
-   void beginJob() override;
-   void analyze(edm::Event const&, edm::EventSetup const&) override;
-   void endJob() override;
+  void beginJob() override;
+  void analyze(edm::Event const&, edm::EventSetup const&) override;
+  void endJob() override;
 
-   // ----------member data ---------------------------
-   std::vector<edm::EventID> ids_;
-   bool throwException_;
+  // ----------member data ---------------------------
+  std::vector<edm::EventID> ids_;
+  bool throwException_;
 };
 
 //
@@ -63,43 +62,35 @@ class AbortOnEventIDAnalyzer : public edm::EDAnalyzer {
 //
 // constructors and destructor
 //
-AbortOnEventIDAnalyzer::AbortOnEventIDAnalyzer(edm::ParameterSet const& iConfig) :
-  ids_(iConfig.getUntrackedParameter<std::vector<edm::EventID> >("eventsToAbort")),
-  throwException_(iConfig.getUntrackedParameter<bool>("throwExceptionInsteadOfAbort"))
-{
-   //now do what ever initialization is needed
-
+AbortOnEventIDAnalyzer::AbortOnEventIDAnalyzer(edm::ParameterSet const& iConfig)
+    : ids_(iConfig.getUntrackedParameter<std::vector<edm::EventID> >("eventsToAbort")),
+      throwException_(iConfig.getUntrackedParameter<bool>("throwExceptionInsteadOfAbort")) {
+  //now do what ever initialization is needed
 }
 
-
 AbortOnEventIDAnalyzer::~AbortOnEventIDAnalyzer() {
-
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 namespace {
-   struct CompareWithoutLumi {
-      CompareWithoutLumi(edm::EventID const& iThis) : m_this(iThis) {
-      }
-      bool operator()(edm::EventID const& iOther) {
-         return m_this.run() == iOther.run() && m_this.event() == iOther.event();
-      }
-      edm::EventID m_this;
-   };
-}
+  struct CompareWithoutLumi {
+    CompareWithoutLumi(edm::EventID const& iThis) : m_this(iThis) {}
+    bool operator()(edm::EventID const& iOther) {
+      return m_this.run() == iOther.run() && m_this.event() == iOther.event();
+    }
+    edm::EventID m_this;
+  };
+}  // namespace
 
 // ------------ method called to for each event  ------------
-void
-AbortOnEventIDAnalyzer::analyze(edm::Event const& iEvent, edm::EventSetup const&) {
-  std::vector<edm::EventID>::iterator itFind= std::find_if(ids_.begin(), ids_.end(), CompareWithoutLumi(iEvent.id()));
-  if(itFind != ids_.end()) {
+void AbortOnEventIDAnalyzer::analyze(edm::Event const& iEvent, edm::EventSetup const&) {
+  std::vector<edm::EventID>::iterator itFind = std::find_if(ids_.begin(), ids_.end(), CompareWithoutLumi(iEvent.id()));
+  if (itFind != ids_.end()) {
     if (throwException_) {
       throw cms::Exception("AbortEvent") << "Found event " << iEvent.id() << "\n";
     } else {
@@ -109,18 +100,13 @@ AbortOnEventIDAnalyzer::analyze(edm::Event const& iEvent, edm::EventSetup const&
 }
 
 // ------------ method called once each job just before starting event loop  ------------
-void
-AbortOnEventIDAnalyzer::beginJob() {
-}
+void AbortOnEventIDAnalyzer::beginJob() {}
 
 // ------------ method called once each job just after ending the event loop  ------------
-void
-AbortOnEventIDAnalyzer::endJob() {
-}
+void AbortOnEventIDAnalyzer::endJob() {}
 
 // ------------ method called once each job for validation
-void
-AbortOnEventIDAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+void AbortOnEventIDAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
   desc.addUntracked<std::vector<edm::EventID> >("eventsToAbort");
   desc.addUntracked<bool>("throwExceptionInsteadOfAbort", false);
diff --git a/FWCore/Modules/src/AsciiOutputModule.cc b/FWCore/Modules/src/AsciiOutputModule.cc
index 6b879116f1467..611147138f876 100644
--- a/FWCore/Modules/src/AsciiOutputModule.cc
+++ b/FWCore/Modules/src/AsciiOutputModule.cc
@@ -38,28 +38,29 @@ namespace edm {
     int counter_;
   };
 
-  AsciiOutputModule::AsciiOutputModule(ParameterSet const& pset) :
-    global::OutputModuleBase(pset),
-    global::OutputModule<>(pset),
-    prescale_(pset.getUntrackedParameter<unsigned int>("prescale")),
-    verbosity_(pset.getUntrackedParameter<unsigned int>("verbosity")),
-    counter_(0) {
-     if (prescale_ == 0) prescale_ = 1;
+  AsciiOutputModule::AsciiOutputModule(ParameterSet const& pset)
+      : global::OutputModuleBase(pset),
+        global::OutputModule<>(pset),
+        prescale_(pset.getUntrackedParameter<unsigned int>("prescale")),
+        verbosity_(pset.getUntrackedParameter<unsigned int>("verbosity")),
+        counter_(0) {
+    if (prescale_ == 0)
+      prescale_ = 1;
   }
 
   AsciiOutputModule::~AsciiOutputModule() {
     LogAbsolute("AsciiOut") << ">>> processed " << counter_ << " events" << std::endl;
   }
 
-  void
-  AsciiOutputModule::write(EventForOutput const& e) {
-
-    if ((++counter_ % prescale_) != 0 || verbosity_ <= 0) return;
+  void AsciiOutputModule::write(EventForOutput const& e) {
+    if ((++counter_ % prescale_) != 0 || verbosity_ <= 0)
+      return;
 
     // RunForOutput const& run = evt.getRun(); // this is still unused
-    LogAbsolute("AsciiOut")<< ">>> processing event # " << e.id() << " time " << e.time().value() << std::endl;
+    LogAbsolute("AsciiOut") << ">>> processing event # " << e.id() << " time " << e.time().value() << std::endl;
 
-    if (verbosity_ <= 1) return;
+    if (verbosity_ <= 1)
+      return;
 
     // Write out non-EDProduct contents...
 
@@ -73,17 +74,17 @@ namespace edm {
 
     // Loop over products, and write some output for each...
     Service<ConstProductRegistry> reg;
-    for(auto const& prod: reg->productList()) {
+    for (auto const& prod : reg->productList()) {
       BranchDescription const& desc = prod.second;
-      if(selected(desc)) {
-        if(desc.isAlias()) {
+      if (selected(desc)) {
+        if (desc.isAlias()) {
           LogAbsolute("AsciiOut") << "ModuleLabel " << desc.moduleLabel() << " is an alias for";
         }
 
         auto const& prov = e.getProvenance(desc.originalBranchID());
         LogAbsolute("AsciiOut") << prov;
 
-        if(verbosity_ > 2) {
+        if (verbosity_ > 2) {
           BranchDescription const& desc2 = prov.branchDescription();
           std::string const& process = desc2.processName();
           std::string const& label = desc2.moduleLabel();
@@ -96,7 +97,7 @@ namespace edm {
                 pset::Registry const* psetRegistry = pset::Registry::instance();
                 ParameterSet const* processPset = psetRegistry->getMapped(psetID);
                 if (processPset) {
-                  if(desc.isAlias()) {
+                  if (desc.isAlias()) {
                     LogAbsolute("AsciiOut") << "Alias PSet\n" << processPset->getParameterSet(desc.moduleLabel());
                   }
                   LogAbsolute("AsciiOut") << processPset->getParameterSet(label) << "\n";
@@ -109,21 +110,20 @@ namespace edm {
     }
   }
 
-  void
-  AsciiOutputModule::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void AsciiOutputModule::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     desc.setComment("Outputs event information into text file.");
-    desc.addUntracked("prescale", 1U)
-        ->setComment("prescale factor");
+    desc.addUntracked("prescale", 1U)->setComment("prescale factor");
     desc.addUntracked("verbosity", 1U)
-        ->setComment("0: no output\n"
-                     "1: event ID and timestamp only\n"
-                     "2: provenance for each kept product\n"
-                     ">2: PSet and provenance for each kept product");
+        ->setComment(
+            "0: no output\n"
+            "1: event ID and timestamp only\n"
+            "2: provenance for each kept product\n"
+            ">2: PSet and provenance for each kept product");
     OutputModule::fillDescription(desc);
     descriptions.add("asciiOutput", desc);
   }
-}
+}  // namespace edm
 
 using edm::AsciiOutputModule;
 DEFINE_FWK_MODULE(AsciiOutputModule);
diff --git a/FWCore/Modules/src/BunchCrossingFilter.cc b/FWCore/Modules/src/BunchCrossingFilter.cc
index 74ea7b4c49396..4d6a43e1ad156 100644
--- a/FWCore/Modules/src/BunchCrossingFilter.cc
+++ b/FWCore/Modules/src/BunchCrossingFilter.cc
@@ -14,7 +14,7 @@ namespace {
     return v;
   }
 
-}
+}  // namespace
 
 namespace edm {
 
@@ -29,24 +29,21 @@ namespace edm {
     const std::vector<unsigned int> bunches_;
   };
 
-  BunchCrossingFilter::BunchCrossingFilter(ParameterSet const& config) :
-    bunches_(sorted(config.getParameter<std::vector<unsigned int>>("bunches")))
-  {
-  }
+  BunchCrossingFilter::BunchCrossingFilter(ParameterSet const& config)
+      : bunches_(sorted(config.getParameter<std::vector<unsigned int>>("bunches"))) {}
 
-  bool BunchCrossingFilter::filter(StreamID, Event& event, EventSetup const&) const
-  {
+  bool BunchCrossingFilter::filter(StreamID, Event& event, EventSetup const&) const {
     return std::binary_search(bunches_.begin(), bunches_.end(), event.bunchCrossing());
   }
 
-  void
-  BunchCrossingFilter::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void BunchCrossingFilter::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
-    desc.add<std::vector<unsigned int>>("bunches", {})->setComment("List of bunch crossings for which events should be accepted [1-3564].");
+    desc.add<std::vector<unsigned int>>("bunches", {})
+        ->setComment("List of bunch crossings for which events should be accepted [1-3564].");
     descriptions.add("bunchCrossingFilter", desc);
   }
 
-}
+}  // namespace edm
 
 using edm::BunchCrossingFilter;
 DEFINE_FWK_MODULE(BunchCrossingFilter);
diff --git a/FWCore/Modules/src/EmptyESSource.cc b/FWCore/Modules/src/EmptyESSource.cc
index e921012d050cd..9f848ecce1be0 100644
--- a/FWCore/Modules/src/EmptyESSource.cc
+++ b/FWCore/Modules/src/EmptyESSource.cc
@@ -7,102 +7,98 @@
 #include "FWCore/Framework/interface/SourceFactory.h"
 
 namespace edm {
-   
-class EmptyESSource : public  EventSetupRecordIntervalFinder {
 
-   public:
-      EmptyESSource(ParameterSet const&);
-      //virtual ~EmptyESSource();
+  class EmptyESSource : public EventSetupRecordIntervalFinder {
+  public:
+    EmptyESSource(ParameterSet const&);
+    //virtual ~EmptyESSource();
 
-      // ---------- const member functions ---------------------
+    // ---------- const member functions ---------------------
 
-      // ---------- static member functions --------------------
+    // ---------- static member functions --------------------
 
-      // ---------- member functions ---------------------------
-   void setIntervalFor(eventsetup::EventSetupRecordKey const&,
-                        IOVSyncValue const& iTime, 
+    // ---------- member functions ---------------------------
+    void setIntervalFor(eventsetup::EventSetupRecordKey const&,
+                        IOVSyncValue const& iTime,
                         ValidityInterval& oInterval) override;
-      
-   private:
-      EmptyESSource(EmptyESSource const&) = delete; // stop default
-
-      EmptyESSource const& operator=(EmptyESSource const&) = delete; // stop default
-      
-      void delaySettingRecords() override;
-      // ---------- member data --------------------------------
-      std::string recordName_;
-      std::set <IOVSyncValue> setOfIOV_;
-      bool iovIsTime_;
-};
-
-EmptyESSource::EmptyESSource(ParameterSet const& pset) :
-     recordName_(pset.getParameter<std::string>("recordName")),
-     iovIsTime_(!pset.getParameter<bool>("iovIsRunNotTime")) {
-   std::vector<unsigned int> temp(pset.getParameter< std::vector<unsigned int> >("firstValid"));
-   for(std::vector<unsigned int>::iterator itValue = temp.begin(), itValueEnd = temp.end();
-        itValue != itValueEnd;
-        ++itValue) {
-      if(iovIsTime_) {
-         setOfIOV_.insert(IOVSyncValue(Timestamp(*itValue)));
+
+  private:
+    EmptyESSource(EmptyESSource const&) = delete;  // stop default
+
+    EmptyESSource const& operator=(EmptyESSource const&) = delete;  // stop default
+
+    void delaySettingRecords() override;
+    // ---------- member data --------------------------------
+    std::string recordName_;
+    std::set<IOVSyncValue> setOfIOV_;
+    bool iovIsTime_;
+  };
+
+  EmptyESSource::EmptyESSource(ParameterSet const& pset)
+      : recordName_(pset.getParameter<std::string>("recordName")),
+        iovIsTime_(!pset.getParameter<bool>("iovIsRunNotTime")) {
+    std::vector<unsigned int> temp(pset.getParameter<std::vector<unsigned int> >("firstValid"));
+    for (std::vector<unsigned int>::iterator itValue = temp.begin(), itValueEnd = temp.end(); itValue != itValueEnd;
+         ++itValue) {
+      if (iovIsTime_) {
+        setOfIOV_.insert(IOVSyncValue(Timestamp(*itValue)));
       } else {
-         setOfIOV_.insert(IOVSyncValue(EventID(*itValue, 0, 0)));
+        setOfIOV_.insert(IOVSyncValue(EventID(*itValue, 0, 0)));
       }
-   }
-   //copy_all(temp, inserter(setOfIOV_ , setOfIOV_.end()));
-}
-  
-   
-void 
-EmptyESSource::delaySettingRecords() {
-   eventsetup::EventSetupRecordKey recordKey = eventsetup::EventSetupRecordKey::TypeTag::findType(recordName_);
-   if (recordKey == eventsetup::EventSetupRecordKey()) {
-      throw edm::Exception(errors::Configuration) << " The Record type named \"" << recordName_
-      << "\" could not be found. Please check the spelling. \n"
-      << "If the spelling is fine, then no module in the job requires this Record and therefore EmptyESSource can not function.\n"
-      "In such a case please either remove the EmptyESSource with label'"
-      << descriptionForFinder().label_ << "' from your job or add a module which needs the Record to your job.";
-   }
-   findingRecordWithKey(recordKey);
-}
-
-void 
-EmptyESSource::setIntervalFor(eventsetup::EventSetupRecordKey const&,
-                               IOVSyncValue const& iTime, 
-                               ValidityInterval& oInterval) {
-   oInterval = ValidityInterval::invalidInterval();
-   //if no intervals given, fail immediately
-   if (setOfIOV_.empty()) {
+    }
+    //copy_all(temp, inserter(setOfIOV_ , setOfIOV_.end()));
+  }
+
+  void EmptyESSource::delaySettingRecords() {
+    eventsetup::EventSetupRecordKey recordKey = eventsetup::EventSetupRecordKey::TypeTag::findType(recordName_);
+    if (recordKey == eventsetup::EventSetupRecordKey()) {
+      throw edm::Exception(errors::Configuration)
+          << " The Record type named \"" << recordName_ << "\" could not be found. Please check the spelling. \n"
+          << "If the spelling is fine, then no module in the job requires this Record and therefore EmptyESSource can "
+             "not function.\n"
+             "In such a case please either remove the EmptyESSource with label'"
+          << descriptionForFinder().label_ << "' from your job or add a module which needs the Record to your job.";
+    }
+    findingRecordWithKey(recordKey);
+  }
+
+  void EmptyESSource::setIntervalFor(eventsetup::EventSetupRecordKey const&,
+                                     IOVSyncValue const& iTime,
+                                     ValidityInterval& oInterval) {
+    oInterval = ValidityInterval::invalidInterval();
+    //if no intervals given, fail immediately
+    if (setOfIOV_.empty()) {
       return;
-   }
-   
-   std::pair< std::set<IOVSyncValue>::iterator, 
-      std::set<IOVSyncValue>::iterator > itFound = setOfIOV_.equal_range(iTime);
-   
-   //we have overshot
-   if(itFound.first == itFound.second) {
-      if(itFound.first == setOfIOV_.begin()) {
-         //request is before first valid interval, so fail
-         return;
+    }
+
+    std::pair<std::set<IOVSyncValue>::iterator, std::set<IOVSyncValue>::iterator> itFound =
+        setOfIOV_.equal_range(iTime);
+
+    //we have overshot
+    if (itFound.first == itFound.second) {
+      if (itFound.first == setOfIOV_.begin()) {
+        //request is before first valid interval, so fail
+        return;
       }
       //go back one step
       --itFound.first;
-   }
-   if (itFound.first == setOfIOV_.end()) {
+    }
+    if (itFound.first == setOfIOV_.end()) {
       return;
-   }
-   
-   IOVSyncValue endOfInterval = IOVSyncValue::endOfTime();
-   
-   if(itFound.second != setOfIOV_.end()) {
-      if(iovIsTime_) {
-         endOfInterval = IOVSyncValue(Timestamp(itFound.second->time().value() - 1));
+    }
+
+    IOVSyncValue endOfInterval = IOVSyncValue::endOfTime();
+
+    if (itFound.second != setOfIOV_.end()) {
+      if (iovIsTime_) {
+        endOfInterval = IOVSyncValue(Timestamp(itFound.second->time().value() - 1));
       } else {
-         endOfInterval = IOVSyncValue(itFound.second->eventID().previousRunLastEvent(0));
+        endOfInterval = IOVSyncValue(itFound.second->eventID().previousRunLastEvent(0));
       }
-   }
-   oInterval = ValidityInterval(*(itFound.first), endOfInterval);
-}
+    }
+    oInterval = ValidityInterval(*(itFound.first), endOfInterval);
+  }
 
-}
+}  // namespace edm
 using edm::EmptyESSource;
 DEFINE_FWK_EVENTSETUP_SOURCE(EmptyESSource);
diff --git a/FWCore/Modules/src/EmptySource.cc b/FWCore/Modules/src/EmptySource.cc
index 6291340d4f632..5e8b7bc97e26b 100644
--- a/FWCore/Modules/src/EmptySource.cc
+++ b/FWCore/Modules/src/EmptySource.cc
@@ -10,36 +10,28 @@ namespace edm {
     explicit EmptySource(ParameterSet const&, InputSourceDescription const&);
     ~EmptySource() override;
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
+
   private:
     bool setRunAndEventInfo(EventID& id, TimeValue_t& time, edm::EventAuxiliary::ExperimentType&) override;
-    void produce(Event &) override;
+    void produce(Event&) override;
   };
 
-  EmptySource::EmptySource(ParameterSet const& pset,
-				       InputSourceDescription const& desc) :
-    ProducerSourceBase(pset, desc, false)
-  { }
+  EmptySource::EmptySource(ParameterSet const& pset, InputSourceDescription const& desc)
+      : ProducerSourceBase(pset, desc, false) {}
 
-  EmptySource::~EmptySource() {
-  }
+  EmptySource::~EmptySource() {}
 
-  bool
-  EmptySource::setRunAndEventInfo(EventID&, TimeValue_t&, edm::EventAuxiliary::ExperimentType&) {
-    return true;
-  }
+  bool EmptySource::setRunAndEventInfo(EventID&, TimeValue_t&, edm::EventAuxiliary::ExperimentType&) { return true; }
 
-  void
-  EmptySource::produce(edm::Event&) {
-  }
+  void EmptySource::produce(edm::Event&) {}
 
-  void
-  EmptySource::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void EmptySource::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     desc.setComment("Creates runs, lumis and events containing no products.");
     ProducerSourceBase::fillDescription(desc);
     descriptions.add("source", desc);
   }
-}
+}  // namespace edm
 
 using edm::EmptySource;
 DEFINE_FWK_INPUT_SOURCE(EmptySource);
diff --git a/FWCore/Modules/src/EventAuxiliaryHistoryProducer.cc b/FWCore/Modules/src/EventAuxiliaryHistoryProducer.cc
index 31ba12a885833..86e82ee99cf13 100644
--- a/FWCore/Modules/src/EventAuxiliaryHistoryProducer.cc
+++ b/FWCore/Modules/src/EventAuxiliaryHistoryProducer.cc
@@ -24,38 +24,41 @@ namespace edm {
     EDPutTokenT<std::vector<EventAuxiliary>> token_;
   };
 
-  EventAuxiliaryHistoryProducer::EventAuxiliaryHistoryProducer(ParameterSet const& ps):
-    depth_(ps.getParameter<unsigned int>("historyDepth")),
-    history_(),
-    token_{produces<std::vector<EventAuxiliary> > ()}
-  {
-  }
+  EventAuxiliaryHistoryProducer::EventAuxiliaryHistoryProducer(ParameterSet const& ps)
+      : depth_(ps.getParameter<unsigned int>("historyDepth")),
+        history_(),
+        token_{produces<std::vector<EventAuxiliary>>()} {}
 
   void EventAuxiliaryHistoryProducer::produce(Event& e, EventSetup const&) {
-    EventAuxiliary aux(e.id(), "", e.time(), e.isRealData(), e.experimentType(),
-                       e.bunchCrossing(), EventAuxiliary::invalidStoreNumber, e.orbitNumber()); 
-  //EventAuxiliary const& aux = e.auxiliary(); // when available
-    if(!history_.empty()) {
-      if(history_.back().id().next(aux.luminosityBlock()) != aux.id()) history_.clear();
-      if(history_.size() >= depth_) history_.pop_front();
+    EventAuxiliary aux(e.id(),
+                       "",
+                       e.time(),
+                       e.isRealData(),
+                       e.experimentType(),
+                       e.bunchCrossing(),
+                       EventAuxiliary::invalidStoreNumber,
+                       e.orbitNumber());
+    //EventAuxiliary const& aux = e.auxiliary(); // when available
+    if (!history_.empty()) {
+      if (history_.back().id().next(aux.luminosityBlock()) != aux.id())
+        history_.clear();
+      if (history_.size() >= depth_)
+        history_.pop_front();
     }
 
     history_.push_back(aux);
 
-    e.emplace(token_,history_.begin(), history_.end());
-  }
-
-  void EventAuxiliaryHistoryProducer::endJob() {
+    e.emplace(token_, history_.begin(), history_.end());
   }
 
+  void EventAuxiliaryHistoryProducer::endJob() {}
 
-  void
-  EventAuxiliaryHistoryProducer::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void EventAuxiliaryHistoryProducer::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     desc.add<unsigned int>("historyDepth");
     descriptions.add("eventAuxiliaryHistory", desc);
   }
-}
+}  // namespace edm
 
 using edm::EventAuxiliaryHistoryProducer;
 DEFINE_FWK_MODULE(EventAuxiliaryHistoryProducer);
diff --git a/FWCore/Modules/src/EventContentAnalyzer.cc b/FWCore/Modules/src/EventContentAnalyzer.cc
index f1348fe98d24a..cd20727d76674 100644
--- a/FWCore/Modules/src/EventContentAnalyzer.cc
+++ b/FWCore/Modules/src/EventContentAnalyzer.cc
@@ -46,68 +46,68 @@
 namespace edm {
   class ConfigurationDescriptions;
   namespace {
-    std::string formatClassName(std::string const& iName) {
-       return std::string("(")+iName+")";
-    }
+    std::string formatClassName(std::string const& iName) { return std::string("(") + iName + ")"; }
 
     char const* kNameValueSep = "=";
     ///convert the object information to the correct type and print it
-    template<typename T>
+    template <typename T>
     void doPrint(std::string const& iName, ObjectWithDict const& iObject, std::string const& iIndent) {
-      LogAbsolute("EventContent") << iIndent << iName << kNameValueSep << *reinterpret_cast<T*>(iObject.address());// << "\n";
+      LogAbsolute("EventContent") << iIndent << iName << kNameValueSep
+                                  << *reinterpret_cast<T*>(iObject.address());  // << "\n";
     }
 
-    template<>
+    template <>
     void doPrint<char>(std::string const& iName, ObjectWithDict const& iObject, std::string const& iIndent) {
-      LogAbsolute("EventContent") << iIndent << iName << kNameValueSep << static_cast<int>(*reinterpret_cast<char*>(iObject.address()));// << "\n";
+      LogAbsolute("EventContent") << iIndent << iName << kNameValueSep
+                                  << static_cast<int>(*reinterpret_cast<char*>(iObject.address()));  // << "\n";
     }
 
-    template<>
+    template <>
     void doPrint<unsigned char>(std::string const& iName, ObjectWithDict const& iObject, std::string const& iIndent) {
-      LogAbsolute("EventContent") << iIndent << iName << kNameValueSep << static_cast<unsigned int>(*reinterpret_cast<unsigned char*>(iObject.address()));// << "\n";
+      LogAbsolute("EventContent") << iIndent << iName << kNameValueSep
+                                  << static_cast<unsigned int>(
+                                         *reinterpret_cast<unsigned char*>(iObject.address()));  // << "\n";
     }
 
-    template<>
+    template <>
     void doPrint<bool>(std::string const& iName, ObjectWithDict const& iObject, std::string const& iIndent) {
-      LogAbsolute("EventContent") << iIndent << iName << kNameValueSep << ((*reinterpret_cast<bool*>(iObject.address()))?"true":"false");// << "\n";
+      LogAbsolute("EventContent") << iIndent << iName << kNameValueSep
+                                  << ((*reinterpret_cast<bool*>(iObject.address())) ? "true" : "false");  // << "\n";
     }
 
-    typedef void(*FunctionType)(std::string const&, ObjectWithDict const&, std::string const&);
+    typedef void (*FunctionType)(std::string const&, ObjectWithDict const&, std::string const&);
     typedef std::map<std::string, FunctionType> TypeToPrintMap;
 
-    template<typename T>
+    template <typename T>
     void addToMap(TypeToPrintMap& iMap) {
-       iMap[typeid(T).name()] = doPrint<T>;
+      iMap[typeid(T).name()] = doPrint<T>;
     }
 
-    bool printAsBuiltin(std::string const& iName,
-                               ObjectWithDict const& iObject,
-                               std::string const& iIndent) {
-       typedef void(*FunctionType)(std::string const&, ObjectWithDict const&, std::string const&);
-       typedef std::map<std::string, FunctionType> TypeToPrintMap;
-       static TypeToPrintMap s_map;
-       static bool isFirst = true;
-       if(isFirst) {
-          addToMap<bool>(s_map);
-          addToMap<char>(s_map);
-          addToMap<short>(s_map);
-          addToMap<int>(s_map);
-          addToMap<long>(s_map);
-          addToMap<unsigned char>(s_map);
-          addToMap<unsigned short>(s_map);
-          addToMap<unsigned int>(s_map);
-          addToMap<unsigned long>(s_map);
-          addToMap<float>(s_map);
-          addToMap<double>(s_map);
-          isFirst = false;
-       }
-       TypeToPrintMap::iterator itFound = s_map.find(iObject.typeOf().name());
-       if(itFound == s_map.end()) {
-
-          return false;
-       }
-       itFound->second(iName, iObject, iIndent);
-       return true;
+    bool printAsBuiltin(std::string const& iName, ObjectWithDict const& iObject, std::string const& iIndent) {
+      typedef void (*FunctionType)(std::string const&, ObjectWithDict const&, std::string const&);
+      typedef std::map<std::string, FunctionType> TypeToPrintMap;
+      static TypeToPrintMap s_map;
+      static bool isFirst = true;
+      if (isFirst) {
+        addToMap<bool>(s_map);
+        addToMap<char>(s_map);
+        addToMap<short>(s_map);
+        addToMap<int>(s_map);
+        addToMap<long>(s_map);
+        addToMap<unsigned char>(s_map);
+        addToMap<unsigned short>(s_map);
+        addToMap<unsigned int>(s_map);
+        addToMap<unsigned long>(s_map);
+        addToMap<float>(s_map);
+        addToMap<double>(s_map);
+        isFirst = false;
+      }
+      TypeToPrintMap::iterator itFound = s_map.find(iObject.typeOf().name());
+      if (itFound == s_map.end()) {
+        return false;
+      }
+      itFound->second(iName, iObject, iIndent);
+      return true;
     }
 
     bool printAsContainer(std::string const& iName,
@@ -119,19 +119,18 @@ namespace edm {
                      ObjectWithDict const& iObject,
                      std::string const& iIndent,
                      std::string const& iIndentDelta) {
-       const std::string& printName = iName;
-       const ObjectWithDict& objectToPrint = iObject;
-       std::string indent(iIndent);
-       if(iObject.typeOf().isPointer()) {
-         LogAbsolute("EventContent") << iIndent << iName << kNameValueSep << formatClassName(iObject.typeOf().name()) << std::hex << iObject.address() << std::dec;// << "\n";
-          TypeWithDict pointedType = iObject.typeOf().toType(); // for Pointers, I get the real type this way
-          if(TypeWithDict::byName("void") == pointedType ||
-             pointedType.isPointer() ||
-             iObject.address() == nullptr) {
-             return;
-          }
+      const std::string& printName = iName;
+      const ObjectWithDict& objectToPrint = iObject;
+      std::string indent(iIndent);
+      if (iObject.typeOf().isPointer()) {
+        LogAbsolute("EventContent") << iIndent << iName << kNameValueSep << formatClassName(iObject.typeOf().name())
+                                    << std::hex << iObject.address() << std::dec;  // << "\n";
+        TypeWithDict pointedType = iObject.typeOf().toType();  // for Pointers, I get the real type this way
+        if (TypeWithDict::byName("void") == pointedType || pointedType.isPointer() || iObject.address() == nullptr) {
           return;
-          /*
+        }
+        return;
+        /*
           //have the code that follows print the contents of the data to which the pointer points
           objectToPrint = ObjectWithDict(pointedType, iObject.address());
           //try to convert it to its actual type (assuming the original type was a base class)
@@ -139,105 +138,101 @@ namespace edm {
           printName = std::string("*")+iName;
           indent += iIndentDelta;
           */
-       }
-       std::string typeName(objectToPrint.typeOf().name());
-       if(typeName.empty()) {
-          typeName = "<unknown>";
-       }
-
-       if(printAsBuiltin(printName, objectToPrint, indent)) {
-          return;
-       }
-       if(printAsContainer(printName, objectToPrint, indent, iIndentDelta)) {
-          return;
-       }
-
-       LogAbsolute("EventContent") << indent << printName << " " << formatClassName(typeName);// << "\n";
-       indent += iIndentDelta;
-       //print all the data members
-       TypeDataMembers dataMembers(objectToPrint.typeOf());
-       for(auto const& dataMember : dataMembers) {
-          MemberWithDict const member(dataMember);
-          //LogAbsolute("EventContent") << "     debug " << member.name() << " " << member.typeName() << "\n";
-          try {
-             printObject(member.name(),
-                         member.get(objectToPrint),
-                         indent,
-                         iIndentDelta);
-          }catch(std::exception& iEx) {
-            LogAbsolute("EventContent") << indent << member.name() << " <exception caught(" << iEx.what() << ")>\n";
-          }
-       }
+      }
+      std::string typeName(objectToPrint.typeOf().name());
+      if (typeName.empty()) {
+        typeName = "<unknown>";
+      }
+
+      if (printAsBuiltin(printName, objectToPrint, indent)) {
+        return;
+      }
+      if (printAsContainer(printName, objectToPrint, indent, iIndentDelta)) {
+        return;
+      }
+
+      LogAbsolute("EventContent") << indent << printName << " " << formatClassName(typeName);  // << "\n";
+      indent += iIndentDelta;
+      //print all the data members
+      TypeDataMembers dataMembers(objectToPrint.typeOf());
+      for (auto const& dataMember : dataMembers) {
+        MemberWithDict const member(dataMember);
+        //LogAbsolute("EventContent") << "     debug " << member.name() << " " << member.typeName() << "\n";
+        try {
+          printObject(member.name(), member.get(objectToPrint), indent, iIndentDelta);
+        } catch (std::exception& iEx) {
+          LogAbsolute("EventContent") << indent << member.name() << " <exception caught(" << iEx.what() << ")>\n";
+        }
+      }
     }
 
     bool printAsContainer(std::string const& iName,
                           ObjectWithDict const& iObject,
                           std::string const& iIndent,
                           std::string const& iIndentDelta) {
-       ObjectWithDict sizeObj;
-       try {
-          size_t temp; //used to hold the memory for the return value
-          FunctionWithDict sizeFunc = iObject.typeOf().functionMemberByName("size");
-          assert(sizeFunc.finalReturnType() == typeid(size_t));
-          sizeObj = ObjectWithDict(TypeWithDict(typeid(size_t)), &temp);
-          sizeFunc.invoke(iObject, &sizeObj);
-          //std::cout << "size of type '" << sizeObj.name() << "' " << sizeObj.typeName() << std::endl;
-          size_t size = *reinterpret_cast<size_t*>(sizeObj.address());
-          FunctionWithDict atMember;
+      ObjectWithDict sizeObj;
+      try {
+        size_t temp;  //used to hold the memory for the return value
+        FunctionWithDict sizeFunc = iObject.typeOf().functionMemberByName("size");
+        assert(sizeFunc.finalReturnType() == typeid(size_t));
+        sizeObj = ObjectWithDict(TypeWithDict(typeid(size_t)), &temp);
+        sizeFunc.invoke(iObject, &sizeObj);
+        //std::cout << "size of type '" << sizeObj.name() << "' " << sizeObj.typeName() << std::endl;
+        size_t size = *reinterpret_cast<size_t*>(sizeObj.address());
+        FunctionWithDict atMember;
+        try {
+          atMember = iObject.typeOf().functionMemberByName("at");
+        } catch (std::exception const& x) {
+          //std::cerr << "could not get 'at' member because " << x.what() << std::endl;
+          return false;
+        }
+        LogAbsolute("EventContent") << iIndent << iName << kNameValueSep << "[size=" << size << "]";  //"\n";
+        ObjectWithDict contained;
+        std::string indexIndent = iIndent + iIndentDelta;
+        TypeWithDict atReturnType(atMember.finalReturnType());
+        //std::cout << "return type " << atReturnType.name() << " size of " << atReturnType.SizeOf()
+        // << " pointer? " << atReturnType.isPointer() << " ref? " << atReturnType.isReference() << std::endl;
+
+        //Return by reference must be treated differently since reflex will not properly create
+        // memory for a ref (which should just be a pointer to the object and not the object itself)
+        //So we will create memory on the stack which can be used to hold a reference
+        bool const isRef = atReturnType.isReference();
+        void* refMemoryBuffer = nullptr;
+        size_t index = 0;
+        //The argument to the 'at' function is the index. Since the argument list holds pointers to the arguments
+        // we only need to create it once and then when the value of index changes the pointer already
+        // gets the new value
+        std::vector<void*> args;
+        args.push_back(&index);
+        for (; index != size; ++index) {
+          std::ostringstream sizeS;
+          sizeS << "[" << index << "]";
+          if (isRef) {
+            ObjectWithDict refObject(atReturnType, &refMemoryBuffer);
+            atMember.invoke(iObject, &refObject, args);
+            //Although to hold the return value from a reference reflex requires you to pass it a
+            // void** when it tries to call methods on the reference it expects to be given a void*
+            contained = ObjectWithDict(atReturnType, refMemoryBuffer);
+          } else {
+            contained = atReturnType.construct();
+            atMember.invoke(iObject, &contained, args);
+          }
+          //LogAbsolute("EventContent") << "invoked 'at'" << std::endl;
           try {
-             atMember = iObject.typeOf().functionMemberByName("at");
-          } catch(std::exception const& x) {
-             //std::cerr << "could not get 'at' member because " << x.what() << std::endl;
-             return false;
+            printObject(sizeS.str(), contained, indexIndent, iIndentDelta);
+          } catch (std::exception& iEx) {
+            LogAbsolute("EventContent") << indexIndent << iName << " <exception caught(" << iEx.what() << ")>\n";
           }
-          LogAbsolute("EventContent") << iIndent << iName << kNameValueSep << "[size=" << size << "]";//"\n";
-          ObjectWithDict contained;
-          std::string indexIndent = iIndent + iIndentDelta;
-          TypeWithDict atReturnType(atMember.finalReturnType());
-          //std::cout << "return type " << atReturnType.name() << " size of " << atReturnType.SizeOf()
-          // << " pointer? " << atReturnType.isPointer() << " ref? " << atReturnType.isReference() << std::endl;
-
-          //Return by reference must be treated differently since reflex will not properly create
-          // memory for a ref (which should just be a pointer to the object and not the object itself)
-          //So we will create memory on the stack which can be used to hold a reference
-          bool const isRef = atReturnType.isReference();
-          void* refMemoryBuffer = nullptr;
-          size_t index = 0;
-          //The argument to the 'at' function is the index. Since the argument list holds pointers to the arguments
-          // we only need to create it once and then when the value of index changes the pointer already
-          // gets the new value
-          std::vector<void*> args;
-          args.push_back(&index);
-          for(; index != size; ++index) {
-             std::ostringstream sizeS;
-             sizeS << "[" << index << "]";
-             if(isRef) {
-                ObjectWithDict refObject(atReturnType, &refMemoryBuffer);
-                atMember.invoke(iObject, &refObject, args);
-                //Although to hold the return value from a reference reflex requires you to pass it a
-                // void** when it tries to call methods on the reference it expects to be given a void*
-                contained = ObjectWithDict(atReturnType, refMemoryBuffer);
-             } else {
-                contained = atReturnType.construct();
-                atMember.invoke(iObject, &contained, args);
-             }
-             //LogAbsolute("EventContent") << "invoked 'at'" << std::endl;
-             try {
-                printObject(sizeS.str(), contained, indexIndent, iIndentDelta);
-             } catch(std::exception& iEx) {
-                    LogAbsolute("EventContent") << indexIndent << iName << " <exception caught("
-                      << iEx.what() << ")>\n";
-             }
-             if(!isRef) {
-                contained.destruct(true);
-             }
+          if (!isRef) {
+            contained.destruct(true);
           }
-          return true;
-       } catch(std::exception const& x) {
-          //std::cerr << "failed to invoke 'at' because " << x.what() << std::endl;
-          return false;
-       }
-       return false;
+        }
+        return true;
+      } catch (std::exception const& x) {
+        //std::cerr << "failed to invoke 'at' because " << x.what() << std::endl;
+        return false;
+      }
+      return false;
     }
 
     void printObject(Event const& iEvent,
@@ -247,90 +242,85 @@ namespace edm {
                      std::string const& iProcessName,
                      std::string const& iIndent,
                      std::string const& iIndentDelta) {
-       try {
-          GenericHandle handle(iClassName);
-       }catch(edm::Exception const&) {
-          LogAbsolute("EventContent") << iIndent << " \"" << iClassName << "\"" << " is an unknown type" << std::endl;
-          return;
-       }
-       GenericHandle handle(iClassName);
-       iEvent.getByLabel(InputTag(iModuleLabel, iInstanceLabel, iProcessName), handle);
-       std::string className = formatClassName(iClassName);
-       printObject(className, *handle, iIndent, iIndentDelta);
+      try {
+        GenericHandle handle(iClassName);
+      } catch (edm::Exception const&) {
+        LogAbsolute("EventContent") << iIndent << " \"" << iClassName << "\""
+                                    << " is an unknown type" << std::endl;
+        return;
+      }
+      GenericHandle handle(iClassName);
+      iEvent.getByLabel(InputTag(iModuleLabel, iInstanceLabel, iProcessName), handle);
+      std::string className = formatClassName(iClassName);
+      printObject(className, *handle, iIndent, iIndentDelta);
     }
-  }
+  }  // namespace
 
   class EventContentAnalyzer : public EDAnalyzer {
   public:
-     explicit EventContentAnalyzer(ParameterSet const&);
-     ~EventContentAnalyzer() override;
+    explicit EventContentAnalyzer(ParameterSet const&);
+    ~EventContentAnalyzer() override;
 
-     void analyze(Event const&, EventSetup const&) override;
-     void endJob() override;
+    void analyze(Event const&, EventSetup const&) override;
+    void endJob() override;
 
-     static void fillDescriptions(ConfigurationDescriptions& descriptions);
+    static void fillDescriptions(ConfigurationDescriptions& descriptions);
 
   private:
-
-     // ----------member data ---------------------------
-     std::string indentation_;
-     std::string verboseIndentation_;
-     std::vector<std::string> moduleLabels_;
-     bool        verbose_;
-     std::vector<std::string> getModuleLabels_;
-     bool        getData_;
-     int         evno_;
-     std::map<std::string, int> cumulates_;
-     bool        listContent_;
-     bool        listProvenance_;
+    // ----------member data ---------------------------
+    std::string indentation_;
+    std::string verboseIndentation_;
+    std::vector<std::string> moduleLabels_;
+    bool verbose_;
+    std::vector<std::string> getModuleLabels_;
+    bool getData_;
+    int evno_;
+    std::map<std::string, int> cumulates_;
+    bool listContent_;
+    bool listProvenance_;
   };
 
   //
   // constructors and destructor
   //
-  EventContentAnalyzer::EventContentAnalyzer(ParameterSet const& iConfig) :
-    indentation_(iConfig.getUntrackedParameter("indentation", std::string("++"))),
-    verboseIndentation_(iConfig.getUntrackedParameter("verboseIndentation", std::string("  "))),
-    moduleLabels_(iConfig.getUntrackedParameter("verboseForModuleLabels", std::vector<std::string>())),
-    verbose_(iConfig.getUntrackedParameter("verbose", false) || !moduleLabels_.empty()),
-    getModuleLabels_(iConfig.getUntrackedParameter("getDataForModuleLabels", std::vector<std::string>())),
-    getData_(iConfig.getUntrackedParameter("getData", false) || !getModuleLabels_.empty()),
-    evno_(1),
-    listContent_(iConfig.getUntrackedParameter("listContent", true)),
-    listProvenance_(iConfig.getUntrackedParameter("listProvenance", false))
-  {
-     //now do what ever initialization is needed
-     sort_all(moduleLabels_);
-     sort_all(getModuleLabels_);
-     if(getData_) {
-        callWhenNewProductsRegistered([this](edm::BranchDescription const& iBranch) {
-           if(getModuleLabels_.empty()) {
-              const std::string kPathStatus("edm::PathStatus");
-              const std::string kEndPathStatus("edm::EndPathStatus");
-              if(iBranch.className() != kPathStatus && iBranch.className() != kEndPathStatus) {
-                 this->consumes(edm::TypeToGet{iBranch.unwrappedTypeID(),PRODUCT_TYPE},
-                                edm::InputTag{iBranch.moduleLabel(),iBranch.productInstanceName(),iBranch.processName()});
-              }
-           } else {
-              for (auto const& mod : this->getModuleLabels_) {
-                 if (iBranch.moduleLabel() == mod) {
-                    this->consumes(edm::TypeToGet{iBranch.unwrappedTypeID(),PRODUCT_TYPE},
-                                   edm::InputTag{mod,iBranch.productInstanceName(),iBranch.processName()});
-                    break;
-                 }
-              }
-           }
+  EventContentAnalyzer::EventContentAnalyzer(ParameterSet const& iConfig)
+      : indentation_(iConfig.getUntrackedParameter("indentation", std::string("++"))),
+        verboseIndentation_(iConfig.getUntrackedParameter("verboseIndentation", std::string("  "))),
+        moduleLabels_(iConfig.getUntrackedParameter("verboseForModuleLabels", std::vector<std::string>())),
+        verbose_(iConfig.getUntrackedParameter("verbose", false) || !moduleLabels_.empty()),
+        getModuleLabels_(iConfig.getUntrackedParameter("getDataForModuleLabels", std::vector<std::string>())),
+        getData_(iConfig.getUntrackedParameter("getData", false) || !getModuleLabels_.empty()),
+        evno_(1),
+        listContent_(iConfig.getUntrackedParameter("listContent", true)),
+        listProvenance_(iConfig.getUntrackedParameter("listProvenance", false)) {
+    //now do what ever initialization is needed
+    sort_all(moduleLabels_);
+    sort_all(getModuleLabels_);
+    if (getData_) {
+      callWhenNewProductsRegistered([this](edm::BranchDescription const& iBranch) {
+        if (getModuleLabels_.empty()) {
+          const std::string kPathStatus("edm::PathStatus");
+          const std::string kEndPathStatus("edm::EndPathStatus");
+          if (iBranch.className() != kPathStatus && iBranch.className() != kEndPathStatus) {
+            this->consumes(edm::TypeToGet{iBranch.unwrappedTypeID(), PRODUCT_TYPE},
+                           edm::InputTag{iBranch.moduleLabel(), iBranch.productInstanceName(), iBranch.processName()});
+          }
+        } else {
+          for (auto const& mod : this->getModuleLabels_) {
+            if (iBranch.moduleLabel() == mod) {
+              this->consumes(edm::TypeToGet{iBranch.unwrappedTypeID(), PRODUCT_TYPE},
+                             edm::InputTag{mod, iBranch.productInstanceName(), iBranch.processName()});
+              break;
+            }
+          }
         }
-        );
-     }
-      
+      });
+    }
   }
 
   EventContentAnalyzer::~EventContentAnalyzer() {
-
-     // do anything here that needs to be done at destruction time
-     // (e.g. close files, deallocate resources etc.)
-
+    // do anything here that needs to be done at destruction time
+    // (e.g. close files, deallocate resources etc.)
   }
 
   //
@@ -338,183 +328,169 @@ namespace edm {
   //
 
   // ------------ method called to produce the data  ------------
-  void
-  EventContentAnalyzer::analyze(Event const& iEvent, EventSetup const&) {
-     typedef std::vector<StableProvenance const*> Provenances;
-     Provenances provenances;
-
-     iEvent.getAllStableProvenance(provenances);
-
-     if(listContent_) {
-       LogAbsolute("EventContent") << "\n" << indentation_ << "Event " << std::setw(5) << evno_ << " contains "
-                                   << provenances.size() << " product" << (provenances.size() == 1 ? "" : "s")
-                                   << " with friendlyClassName, moduleLabel, productInstanceName and processName:"
-                                   << std::endl;
-     }
-
-     std::string startIndent = indentation_+verboseIndentation_;
-     for(auto const& provenance : provenances) {
-         std::string const& className = provenance->className();
-         const std::string kPathStatus("edm::PathStatus");
-         const std::string kEndPathStatus("edm::EndPathStatus");
-         if(className == kPathStatus || className == kEndPathStatus) {
-           continue;
-         }
-         std::string const& friendlyName = provenance->friendlyClassName();
-         //if(friendlyName.empty())  friendlyName = std::string("||");
-
-         std::string const& modLabel = provenance->moduleLabel();
-         //if(modLabel.empty()) modLabel = std::string("||");
-
-         std::string const& instanceName = provenance->productInstanceName();
-         //if(instanceName.empty()) instanceName = std::string("||");
-
-         std::string const& processName = provenance->processName();
-
-         bool doVerbose = verbose_ && (moduleLabels_.empty() ||
-                                       binary_search_all(moduleLabels_, modLabel));
-
-         if(listContent_ || doVerbose) {
-           LogAbsolute("EventContent") << indentation_ << friendlyName
-                                       << " \"" << modLabel
-                                       << "\" \"" << instanceName << "\" \""
-                                       << processName << "\""
-                                       << " (productId = " << provenance->productID() << ")"
-                                       << std::endl;
-
-           if(listProvenance_) {
-             auto const& prov = iEvent.getProvenance(provenance->branchID());
-             auto const *productProvenance = prov.productProvenance();
-             if(productProvenance) {
-               const bool isAlias = productProvenance->branchID() != provenance->branchID();
-               std::string aliasForModLabel;
-               LogAbsolute("EventContent") << prov;
-               if(isAlias) {
-                 aliasForModLabel = iEvent.getProvenance(productProvenance->branchID()).moduleLabel();
-                 LogAbsolute("EventContent") << "Is an alias for " << aliasForModLabel;
-               }
-               ProcessHistory const *processHistory = prov.processHistoryPtr();
-               if(processHistory) {
-                 for(ProcessConfiguration const& pc: *processHistory) {
-                   if(pc.processName() == prov.processName()) {
-                     ParameterSetID const& psetID = pc.parameterSetID();
-                     pset::Registry const* psetRegistry = pset::Registry::instance();
-                     ParameterSet const* processPset = psetRegistry->getMapped(psetID);
-                     if (processPset) {
-                       if(processPset->existsAs<ParameterSet>(modLabel)) {
-                         if(isAlias) {
-                           LogAbsolute("EventContent") << "Alias PSet";
-                         }
-                         LogAbsolute("EventContent") << processPset->getParameterSet(modLabel);
-                       }
-                       if(isAlias and processPset->existsAs<ParameterSet>(aliasForModLabel)) {
-                         LogAbsolute("EventContent") << processPset->getParameterSet(aliasForModLabel);
-                       }
-                     }
-                   }
-                 }
-               }
-             }
-           }
-         }
-         std::string key = friendlyName
-           + std::string(" + \"") + modLabel
-           + std::string("\" + \"") + instanceName + "\" \"" + processName + "\"";
-         ++cumulates_[key];
-
-         if(doVerbose) {
-             //indent one level before starting to print
-             printObject(iEvent,
-                         className,
-                         modLabel,
-                         instanceName,
-                         processName,
-                         startIndent,
-                         verboseIndentation_);
-             continue;
-         }
-         if(getData_) {
-           std::string class_and_label = friendlyName + "_" + modLabel;
-           if(getModuleLabels_.empty() ||
-             binary_search_all(getModuleLabels_, modLabel) ||
-             binary_search_all(getModuleLabels_, class_and_label)) {
-             try {
-               GenericHandle handle(className);
-             } catch(edm::Exception const&) {
-               LogAbsolute("EventContent") << startIndent << " \"" << className << "\"" << " is an unknown type" << std::endl;
-               return;
-             }
-             GenericHandle handle(className);
-             iEvent.getByLabel(InputTag(modLabel,
-                                        instanceName,
-                                        processName),
-                                        handle);
-           }
-         }
-     }
-     //std::cout << "Mine" << std::endl;
-     ++evno_;
+  void EventContentAnalyzer::analyze(Event const& iEvent, EventSetup const&) {
+    typedef std::vector<StableProvenance const*> Provenances;
+    Provenances provenances;
+
+    iEvent.getAllStableProvenance(provenances);
+
+    if (listContent_) {
+      LogAbsolute("EventContent") << "\n"
+                                  << indentation_ << "Event " << std::setw(5) << evno_ << " contains "
+                                  << provenances.size() << " product" << (provenances.size() == 1 ? "" : "s")
+                                  << " with friendlyClassName, moduleLabel, productInstanceName and processName:"
+                                  << std::endl;
+    }
+
+    std::string startIndent = indentation_ + verboseIndentation_;
+    for (auto const& provenance : provenances) {
+      std::string const& className = provenance->className();
+      const std::string kPathStatus("edm::PathStatus");
+      const std::string kEndPathStatus("edm::EndPathStatus");
+      if (className == kPathStatus || className == kEndPathStatus) {
+        continue;
+      }
+      std::string const& friendlyName = provenance->friendlyClassName();
+      //if(friendlyName.empty())  friendlyName = std::string("||");
+
+      std::string const& modLabel = provenance->moduleLabel();
+      //if(modLabel.empty()) modLabel = std::string("||");
+
+      std::string const& instanceName = provenance->productInstanceName();
+      //if(instanceName.empty()) instanceName = std::string("||");
+
+      std::string const& processName = provenance->processName();
+
+      bool doVerbose = verbose_ && (moduleLabels_.empty() || binary_search_all(moduleLabels_, modLabel));
+
+      if (listContent_ || doVerbose) {
+        LogAbsolute("EventContent") << indentation_ << friendlyName << " \"" << modLabel << "\" \"" << instanceName
+                                    << "\" \"" << processName << "\""
+                                    << " (productId = " << provenance->productID() << ")" << std::endl;
+
+        if (listProvenance_) {
+          auto const& prov = iEvent.getProvenance(provenance->branchID());
+          auto const* productProvenance = prov.productProvenance();
+          if (productProvenance) {
+            const bool isAlias = productProvenance->branchID() != provenance->branchID();
+            std::string aliasForModLabel;
+            LogAbsolute("EventContent") << prov;
+            if (isAlias) {
+              aliasForModLabel = iEvent.getProvenance(productProvenance->branchID()).moduleLabel();
+              LogAbsolute("EventContent") << "Is an alias for " << aliasForModLabel;
+            }
+            ProcessHistory const* processHistory = prov.processHistoryPtr();
+            if (processHistory) {
+              for (ProcessConfiguration const& pc : *processHistory) {
+                if (pc.processName() == prov.processName()) {
+                  ParameterSetID const& psetID = pc.parameterSetID();
+                  pset::Registry const* psetRegistry = pset::Registry::instance();
+                  ParameterSet const* processPset = psetRegistry->getMapped(psetID);
+                  if (processPset) {
+                    if (processPset->existsAs<ParameterSet>(modLabel)) {
+                      if (isAlias) {
+                        LogAbsolute("EventContent") << "Alias PSet";
+                      }
+                      LogAbsolute("EventContent") << processPset->getParameterSet(modLabel);
+                    }
+                    if (isAlias and processPset->existsAs<ParameterSet>(aliasForModLabel)) {
+                      LogAbsolute("EventContent") << processPset->getParameterSet(aliasForModLabel);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+      std::string key = friendlyName + std::string(" + \"") + modLabel + std::string("\" + \"") + instanceName +
+                        "\" \"" + processName + "\"";
+      ++cumulates_[key];
+
+      if (doVerbose) {
+        //indent one level before starting to print
+        printObject(iEvent, className, modLabel, instanceName, processName, startIndent, verboseIndentation_);
+        continue;
+      }
+      if (getData_) {
+        std::string class_and_label = friendlyName + "_" + modLabel;
+        if (getModuleLabels_.empty() || binary_search_all(getModuleLabels_, modLabel) ||
+            binary_search_all(getModuleLabels_, class_and_label)) {
+          try {
+            GenericHandle handle(className);
+          } catch (edm::Exception const&) {
+            LogAbsolute("EventContent") << startIndent << " \"" << className << "\""
+                                        << " is an unknown type" << std::endl;
+            return;
+          }
+          GenericHandle handle(className);
+          iEvent.getByLabel(InputTag(modLabel, instanceName, processName), handle);
+        }
+      }
+    }
+    //std::cout << "Mine" << std::endl;
+    ++evno_;
   }
 
   // ------------ method called at end of job -------------------
-  void
-  EventContentAnalyzer::endJob() {
-     typedef std::map<std::string, int> nameMap;
-
-     LogAbsolute("EventContent") << "\nSummary for key being the concatenation of friendlyClassName, moduleLabel, productInstanceName and processName" << std::endl;
-     for(nameMap::const_iterator it = cumulates_.begin(), itEnd = cumulates_.end();
-                                 it != itEnd;
-                                 ++it) {
-        LogAbsolute("EventContent") << std::setw(6) << it->second << " occurrences of key " << it->first << std::endl;
-     }
-
-  // Test boost::lexical_cast  We don't need this right now so comment it out.
-  // int k = 137;
-  // std::string ktext = boost::lexical_cast<std::string>(k);
-  // std::cout << "\nInteger " << k << " expressed as a string is |" << ktext << "|" << std::endl;
-  }
+  void EventContentAnalyzer::endJob() {
+    typedef std::map<std::string, int> nameMap;
+
+    LogAbsolute("EventContent") << "\nSummary for key being the concatenation of friendlyClassName, moduleLabel, "
+                                   "productInstanceName and processName"
+                                << std::endl;
+    for (nameMap::const_iterator it = cumulates_.begin(), itEnd = cumulates_.end(); it != itEnd; ++it) {
+      LogAbsolute("EventContent") << std::setw(6) << it->second << " occurrences of key " << it->first << std::endl;
+    }
 
-  void
-  EventContentAnalyzer::fillDescriptions(ConfigurationDescriptions& descriptions) {
+    // Test boost::lexical_cast  We don't need this right now so comment it out.
+    // int k = 137;
+    // std::string ktext = boost::lexical_cast<std::string>(k);
+    // std::cout << "\nInteger " << k << " expressed as a string is |" << ktext << "|" << std::endl;
+  }
 
-     descriptions.setComment("This plugin will print a list of all products in the event "
-                             "provenance.  It also has options to print and/or get each product.");
+  void EventContentAnalyzer::fillDescriptions(ConfigurationDescriptions& descriptions) {
+    descriptions.setComment(
+        "This plugin will print a list of all products in the event "
+        "provenance.  It also has options to print and/or get each product.");
 
-     ParameterSetDescription desc;
+    ParameterSetDescription desc;
 
-     ParameterDescriptionNode* np;
+    ParameterDescriptionNode* np;
 
-     std::string defaultString("++");
-     np = desc.addOptionalUntracked<std::string>("indentation", defaultString);
-     np->setComment("This string is printed at the beginning of every line printed during event processing.");
+    std::string defaultString("++");
+    np = desc.addOptionalUntracked<std::string>("indentation", defaultString);
+    np->setComment("This string is printed at the beginning of every line printed during event processing.");
 
-     np = desc.addOptionalUntracked<bool>("verbose", false);
-     np->setComment("If true, the contents of products are printed.");
+    np = desc.addOptionalUntracked<bool>("verbose", false);
+    np->setComment("If true, the contents of products are printed.");
 
-     defaultString = "  ";
-     np = desc.addOptionalUntracked<std::string>("verboseIndentation", defaultString);
-     np->setComment("This string is used to further indent lines when printing the contents of products in verbose mode.");
+    defaultString = "  ";
+    np = desc.addOptionalUntracked<std::string>("verboseIndentation", defaultString);
+    np->setComment(
+        "This string is used to further indent lines when printing the contents of products in verbose mode.");
 
-     std::vector<std::string> defaultVString;
+    std::vector<std::string> defaultVString;
 
-     np = desc.addOptionalUntracked<std::vector<std::string> >("verboseForModuleLabels", defaultVString);
-     np->setComment("If this vector is not empty, then only products with module labels on this list are printed.");
+    np = desc.addOptionalUntracked<std::vector<std::string> >("verboseForModuleLabels", defaultVString);
+    np->setComment("If this vector is not empty, then only products with module labels on this list are printed.");
 
-     np = desc.addOptionalUntracked<bool>("getData", false);
-     np->setComment("If true the products will be retrieved using getByLabel.");
+    np = desc.addOptionalUntracked<bool>("getData", false);
+    np->setComment("If true the products will be retrieved using getByLabel.");
 
-     np = desc.addOptionalUntracked<std::vector<std::string> >("getDataForModuleLabels", defaultVString);
-     np->setComment("If this vector is not empty, then only products with module labels on this list are retrieved by getByLabel.");
+    np = desc.addOptionalUntracked<std::vector<std::string> >("getDataForModuleLabels", defaultVString);
+    np->setComment(
+        "If this vector is not empty, then only products with module labels on this list are retrieved by getByLabel.");
 
-     np = desc.addOptionalUntracked<bool>("listContent", true);
-     np->setComment("If true then print a list of all the event content.");
+    np = desc.addOptionalUntracked<bool>("listContent", true);
+    np->setComment("If true then print a list of all the event content.");
 
-     np = desc.addOptionalUntracked<bool>("listProvenance", false);
-     np->setComment("If true, and if listContent or verbose is true, print provenance information for each product");
+    np = desc.addOptionalUntracked<bool>("listProvenance", false);
+    np->setComment("If true, and if listContent or verbose is true, print provenance information for each product");
 
-     descriptions.add("printContent", desc);
+    descriptions.add("printContent", desc);
   }
-}
+}  // namespace edm
 
 using edm::EventContentAnalyzer;
 DEFINE_FWK_MODULE(EventContentAnalyzer);
diff --git a/FWCore/Modules/src/EventIDChecker.cc b/FWCore/Modules/src/EventIDChecker.cc
index 017497e2fa701..a6a7c8bf6714e 100644
--- a/FWCore/Modules/src/EventIDChecker.cc
+++ b/FWCore/Modules/src/EventIDChecker.cc
@@ -36,23 +36,22 @@
 
 class EventIDChecker : public edm::EDAnalyzer {
 public:
-   explicit EventIDChecker(edm::ParameterSet const&);
-   ~EventIDChecker() override;
-    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-
+  explicit EventIDChecker(edm::ParameterSet const&);
+  ~EventIDChecker() override;
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 private:
-   void beginJob() override;
-   void analyze(edm::Event const&, edm::EventSetup const&) override;
-   void endJob() override;
+  void beginJob() override;
+  void analyze(edm::Event const&, edm::EventSetup const&) override;
+  void endJob() override;
 
-   // ----------member data ---------------------------
-   std::vector<edm::EventID> ids_;
-   unsigned int index_;
+  // ----------member data ---------------------------
+  std::vector<edm::EventID> ids_;
+  unsigned int index_;
 
-   unsigned int multiProcessSequentialEvents_;
-   unsigned int numberOfEventsLeftBeforeSearch_;
-   bool mustSearch_;
+  unsigned int multiProcessSequentialEvents_;
+  unsigned int numberOfEventsLeftBeforeSearch_;
+  bool mustSearch_;
 };
 
 //
@@ -66,85 +65,74 @@ class EventIDChecker : public edm::EDAnalyzer {
 //
 // constructors and destructor
 //
-EventIDChecker::EventIDChecker(edm::ParameterSet const& iConfig) :
-  ids_(iConfig.getUntrackedParameter<std::vector<edm::EventID> >("eventSequence")),
-  index_(0),
-  multiProcessSequentialEvents_(iConfig.getUntrackedParameter<unsigned int>("multiProcessSequentialEvents")),
-  numberOfEventsLeftBeforeSearch_(0),
-  mustSearch_(false)
-{
-   //now do what ever initialization is needed
-
+EventIDChecker::EventIDChecker(edm::ParameterSet const& iConfig)
+    : ids_(iConfig.getUntrackedParameter<std::vector<edm::EventID> >("eventSequence")),
+      index_(0),
+      multiProcessSequentialEvents_(iConfig.getUntrackedParameter<unsigned int>("multiProcessSequentialEvents")),
+      numberOfEventsLeftBeforeSearch_(0),
+      mustSearch_(false) {
+  //now do what ever initialization is needed
 }
 
-
 EventIDChecker::~EventIDChecker() {
-
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 namespace {
-   struct CompareWithoutLumi {
-      CompareWithoutLumi(edm::EventID const& iThis) : m_this(iThis) {
-      }
-      bool operator()(edm::EventID const& iOther) {
-         return m_this.run() == iOther.run() && m_this.event() == iOther.event();
-      }
-      edm::EventID m_this;
-   };
-}
+  struct CompareWithoutLumi {
+    CompareWithoutLumi(edm::EventID const& iThis) : m_this(iThis) {}
+    bool operator()(edm::EventID const& iOther) {
+      return m_this.run() == iOther.run() && m_this.event() == iOther.event();
+    }
+    edm::EventID m_this;
+  };
+}  // namespace
 
 // ------------ method called to for each event  ------------
-void
-EventIDChecker::analyze(edm::Event const& iEvent, edm::EventSetup const&) {
-   if(mustSearch_) {
-      if(0 == numberOfEventsLeftBeforeSearch_) {
-         numberOfEventsLeftBeforeSearch_ = multiProcessSequentialEvents_;
-         //the event must be after the last event in our list since multicore doesn't go backwards
-         std::vector<edm::EventID>::iterator itFind= std::find_if(ids_.begin()+index_, ids_.end(), CompareWithoutLumi(iEvent.id()));
-         if(itFind == ids_.end()) {
-            throw cms::Exception("MissedEvent") << "The event " << iEvent.id() << "is not in the list.\n";
-         }
-         index_ = itFind-ids_.begin();
+void EventIDChecker::analyze(edm::Event const& iEvent, edm::EventSetup const&) {
+  if (mustSearch_) {
+    if (0 == numberOfEventsLeftBeforeSearch_) {
+      numberOfEventsLeftBeforeSearch_ = multiProcessSequentialEvents_;
+      //the event must be after the last event in our list since multicore doesn't go backwards
+      std::vector<edm::EventID>::iterator itFind =
+          std::find_if(ids_.begin() + index_, ids_.end(), CompareWithoutLumi(iEvent.id()));
+      if (itFind == ids_.end()) {
+        throw cms::Exception("MissedEvent") << "The event " << iEvent.id() << "is not in the list.\n";
       }
-      --numberOfEventsLeftBeforeSearch_;
-   }
-
-   if(index_ >= ids_.size()) {
-      throw cms::Exception("TooManyEvents") << "Was passes " << ids_.size() << " EventIDs but have processed more events than that\n";
-   }
-   if(iEvent.id().run() != ids_[index_].run() || iEvent.id().event() != ids_[index_].event()) {
-      throw cms::Exception("WrongEvent") << "Was expecting event " << ids_[index_] << " but was given " << iEvent.id() << "\n";
-   }
-   ++index_;
+      index_ = itFind - ids_.begin();
+    }
+    --numberOfEventsLeftBeforeSearch_;
+  }
+
+  if (index_ >= ids_.size()) {
+    throw cms::Exception("TooManyEvents")
+        << "Was passes " << ids_.size() << " EventIDs but have processed more events than that\n";
+  }
+  if (iEvent.id().run() != ids_[index_].run() || iEvent.id().event() != ids_[index_].event()) {
+    throw cms::Exception("WrongEvent") << "Was expecting event " << ids_[index_] << " but was given " << iEvent.id()
+                                       << "\n";
+  }
+  ++index_;
 }
 
 // ------------ method called once each job just before starting event loop  ------------
-void
-EventIDChecker::beginJob() {
-}
+void EventIDChecker::beginJob() {}
 
 // ------------ method called once each job just after ending the event loop  ------------
-void
-EventIDChecker::endJob() {
-}
+void EventIDChecker::endJob() {}
 
 // ------------ method called once each job for validation
-void
-EventIDChecker::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+void EventIDChecker::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
   desc.addUntracked<std::vector<edm::EventID> >("eventSequence");
   desc.addUntracked<unsigned int>("multiProcessSequentialEvents", 0U);
   descriptions.add("eventIDChecker", desc);
 }
 
-
 //define this as a plug-in
 DEFINE_FWK_MODULE(EventIDChecker);
diff --git a/FWCore/Modules/src/EventSetupCacheIdentifierChecker.cc b/FWCore/Modules/src/EventSetupCacheIdentifierChecker.cc
index 0bf5d8ad57f86..cb64bfe015a76 100644
--- a/FWCore/Modules/src/EventSetupCacheIdentifierChecker.cc
+++ b/FWCore/Modules/src/EventSetupCacheIdentifierChecker.cc
@@ -2,7 +2,7 @@
 //
 // Package:    EventSetupCacheIdentifierChecker
 // Class:      EventSetupCacheIdentifierChecker
-// 
+//
 /**\class EventSetupCacheIdentifierChecker EventSetupCacheIdentifierChecker.cc FWCore/Modules/src/EventSetupCacheIdentifierChecker.cc
 
  Description: [one line class summary]
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <map>
@@ -42,14 +41,13 @@
 
 namespace edm {
   class EventSetupCacheIdentifierChecker : public edm::EDAnalyzer {
-   public:
+  public:
     explicit EventSetupCacheIdentifierChecker(const edm::ParameterSet&);
     ~EventSetupCacheIdentifierChecker() override;
 
     static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
-
-   private:
+  private:
     //virtual void beginJob() ;
     void analyze(const edm::Event&, const edm::EventSetup&) override;
     //virtual void endJob() ;
@@ -61,12 +59,12 @@ namespace edm {
 
     void check(edm::EventSetup const&);
     void initialize();
-      // ----------member data ---------------------------
+    // ----------member data ---------------------------
     ParameterSet m_pset;
-    std::map<eventsetup::EventSetupRecordKey,std::vector<unsigned int> > m_recordKeysToExpectedCacheIdentifiers;
+    std::map<eventsetup::EventSetupRecordKey, std::vector<unsigned int> > m_recordKeysToExpectedCacheIdentifiers;
     unsigned int m_index;
   };
-}
+}  // namespace edm
 //
 // constants, enums and typedefs
 //
@@ -79,125 +77,110 @@ using namespace edm;
 //
 // constructors and destructor
 //
-EventSetupCacheIdentifierChecker::EventSetupCacheIdentifierChecker(const edm::ParameterSet& iConfig):
-m_pset(iConfig),
-m_index(0)
-{
-   //now do what ever initialization is needed
-
+EventSetupCacheIdentifierChecker::EventSetupCacheIdentifierChecker(const edm::ParameterSet& iConfig)
+    : m_pset(iConfig), m_index(0) {
+  //now do what ever initialization is needed
 }
 
-
-EventSetupCacheIdentifierChecker::~EventSetupCacheIdentifierChecker()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+EventSetupCacheIdentifierChecker::~EventSetupCacheIdentifierChecker() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called for each event  ------------
-void
-EventSetupCacheIdentifierChecker::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void EventSetupCacheIdentifierChecker::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   check(iSetup);
 }
 
-
 // ------------ method called once each job just before starting event loop  ------------
-//void 
+//void
 //EventSetupCacheIdentifierChecker::beginJob()
 //{
 //}
 
 // ------------ method called once each job just after ending the event loop  ------------
-//void 
-//EventSetupCacheIdentifierChecker::endJob() 
+//void
+//EventSetupCacheIdentifierChecker::endJob()
 //{
 //}
 
 // ------------ method called when starting to processes a run  ------------
-void 
-EventSetupCacheIdentifierChecker::beginRun(edm::Run const&, edm::EventSetup const& iSetup)
-{
-  check(iSetup);
-}
+void EventSetupCacheIdentifierChecker::beginRun(edm::Run const&, edm::EventSetup const& iSetup) { check(iSetup); }
 
 // ------------ method called when ending the processing of a run  ------------
-//void 
+//void
 //EventSetupCacheIdentifierChecker::endRun(edm::Run const&, edm::EventSetup const&)
 //{
 //}
 
 // ------------ method called when starting to processes a luminosity block  ------------
-void 
-EventSetupCacheIdentifierChecker::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const& iSetup)
-{
+void EventSetupCacheIdentifierChecker::beginLuminosityBlock(edm::LuminosityBlock const&,
+                                                            edm::EventSetup const& iSetup) {
   check(iSetup);
 }
 
 // ------------ method called when ending the processing of a luminosity block  ------------
-//void 
+//void
 //EventSetupCacheIdentifierChecker::endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&)
 //{
 //}
 
-void
-EventSetupCacheIdentifierChecker::check(edm::EventSetup const& iSetup)
-{
-  if(m_recordKeysToExpectedCacheIdentifiers.empty()) {
+void EventSetupCacheIdentifierChecker::check(edm::EventSetup const& iSetup) {
+  if (m_recordKeysToExpectedCacheIdentifiers.empty()) {
     initialize();
   }
   using namespace edm::eventsetup;
 
-  
-  for(auto it = m_recordKeysToExpectedCacheIdentifiers.begin(), itEnd = m_recordKeysToExpectedCacheIdentifiers.end();
-      it != itEnd;
-      ++it) {
+  for (auto it = m_recordKeysToExpectedCacheIdentifiers.begin(), itEnd = m_recordKeysToExpectedCacheIdentifiers.end();
+       it != itEnd;
+       ++it) {
     auto pRecord = iSetup.find(it->first);
-    if(not pRecord) {
-      edm::LogWarning("RecordNotInIOV") <<"The EventSetup Record '"<<it->first.name()<<"' is not available for this IOV.";
+    if (not pRecord) {
+      edm::LogWarning("RecordNotInIOV") << "The EventSetup Record '" << it->first.name()
+                                        << "' is not available for this IOV.";
     }
-    if(it->second.size() <= m_index) {
-      throw cms::Exception("TooFewCacheIDs")<<"The vector of cacheIdentifiers for the record "<<it->first.name()<<" is too short";
+    if (it->second.size() <= m_index) {
+      throw cms::Exception("TooFewCacheIDs")
+          << "The vector of cacheIdentifiers for the record " << it->first.name() << " is too short";
     }
-    if(pRecord && pRecord->cacheIdentifier() != it->second[m_index]) {
-      throw cms::Exception("IncorrectCacheID")<<"The Record "<<it->first.name()<<" was supposed to have cacheIdentifier: "<<it->second[m_index]<<" but instead has "<<pRecord->cacheIdentifier();
+    if (pRecord && pRecord->cacheIdentifier() != it->second[m_index]) {
+      throw cms::Exception("IncorrectCacheID")
+          << "The Record " << it->first.name() << " was supposed to have cacheIdentifier: " << it->second[m_index]
+          << " but instead has " << pRecord->cacheIdentifier();
     }
   }
   ++m_index;
 }
 
-void
-EventSetupCacheIdentifierChecker::initialize()
-{
+void EventSetupCacheIdentifierChecker::initialize() {
   std::vector<std::string> recordNames{m_pset.getParameterNamesForType<std::vector<unsigned int> >(false)};
 
-  for(auto const& name: recordNames) {
+  for (auto const& name : recordNames) {
     eventsetup::EventSetupRecordKey recordKey(eventsetup::EventSetupRecordKey::TypeTag::findType(name));
-    if(recordKey.type() == eventsetup::EventSetupRecordKey::TypeTag()) {
+    if (recordKey.type() == eventsetup::EventSetupRecordKey::TypeTag()) {
       //record not found
-      edm::LogWarning("DataGetter") <<"Record \""<< name <<"\" does not exist "<<std::endl;
-      
+      edm::LogWarning("DataGetter") << "Record \"" << name << "\" does not exist " << std::endl;
+
       continue;
     }
-    
-    m_recordKeysToExpectedCacheIdentifiers.insert(std::make_pair(recordKey, m_pset.getUntrackedParameter<std::vector<unsigned int> >(name)));
+
+    m_recordKeysToExpectedCacheIdentifiers.insert(
+        std::make_pair(recordKey, m_pset.getUntrackedParameter<std::vector<unsigned int> >(name)));
   }
 }
 
 // ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
-void
-EventSetupCacheIdentifierChecker::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+void EventSetupCacheIdentifierChecker::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   //The following says we do not know what parameters are allowed so do no validation
   // Please change this to state exactly what you do use, even if it is no parameters
   edm::ParameterSetDescription desc;
-  desc.addWildcardUntracked<std::vector<unsigned int> >("*")->setComment("The label is the name of an EventSetup Record while the vector contains the expected cacheIdentifier values for each beginRun, beginLuminosityBlock and event transition");
+  desc.addWildcardUntracked<std::vector<unsigned int> >("*")->setComment(
+      "The label is the name of an EventSetup Record while the vector contains the expected cacheIdentifier values for "
+      "each beginRun, beginLuminosityBlock and event transition");
   descriptions.addDefault(desc);
 }
 
diff --git a/FWCore/Modules/src/EventSetupRecordDataGetter.cc b/FWCore/Modules/src/EventSetupRecordDataGetter.cc
index 62df466cfeb8f..fb6f799a781ae 100644
--- a/FWCore/Modules/src/EventSetupRecordDataGetter.cc
+++ b/FWCore/Modules/src/EventSetupRecordDataGetter.cc
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <map>
 #include <vector>
@@ -38,183 +37,180 @@
 // class decleration
 //
 namespace edm {
-   class EventSetupRecordDataGetter : public edm::stream::EDAnalyzer< > {
-public:
-     explicit EventSetupRecordDataGetter(ParameterSet const&);
-     ~EventSetupRecordDataGetter() override;
-
-
-     void analyze(Event const&, EventSetup const&) override;
-     void beginRun(Run const&, EventSetup const&) override;
-     void beginLuminosityBlock(LuminosityBlock const&, EventSetup const&) override;
-
-     static void fillDescriptions(ConfigurationDescriptions& descriptions);
-
-private:
-     void doGet(EventSetup const&);
-        // ----------member data ---------------------------
-     const ParameterSet pSet_;
-
-     typedef std::map<eventsetup::EventSetupRecordKey, std::vector<eventsetup::DataKey> > RecordToDataKeys;
-     RecordToDataKeys recordToDataKeys_;
-     std::map<eventsetup::EventSetupRecordKey, unsigned long long> recordToCacheIdentifier_;
-     const bool verbose_;
-
+  class EventSetupRecordDataGetter : public edm::stream::EDAnalyzer<> {
+  public:
+    explicit EventSetupRecordDataGetter(ParameterSet const&);
+    ~EventSetupRecordDataGetter() override;
+
+    void analyze(Event const&, EventSetup const&) override;
+    void beginRun(Run const&, EventSetup const&) override;
+    void beginLuminosityBlock(LuminosityBlock const&, EventSetup const&) override;
+
+    static void fillDescriptions(ConfigurationDescriptions& descriptions);
+
+  private:
+    void doGet(EventSetup const&);
+    // ----------member data ---------------------------
+    const ParameterSet pSet_;
+
+    typedef std::map<eventsetup::EventSetupRecordKey, std::vector<eventsetup::DataKey> > RecordToDataKeys;
+    RecordToDataKeys recordToDataKeys_;
+    std::map<eventsetup::EventSetupRecordKey, unsigned long long> recordToCacheIdentifier_;
+    const bool verbose_;
   };
 
-//
-// constructors and destructor
-//
-   EventSetupRecordDataGetter::EventSetupRecordDataGetter(ParameterSet const& iConfig) :
-    pSet_(iConfig),
-    recordToDataKeys_(),
-    recordToCacheIdentifier_(),
-    verbose_(iConfig.getUntrackedParameter<bool>("verbose")) {}
-
-   EventSetupRecordDataGetter::~EventSetupRecordDataGetter() {
-
-     // do anything here that needs to be done at desctruction time
-     // (e.g. close files, deallocate resources etc.)
-
-   }
+  //
+  // constructors and destructor
+  //
+  EventSetupRecordDataGetter::EventSetupRecordDataGetter(ParameterSet const& iConfig)
+      : pSet_(iConfig),
+        recordToDataKeys_(),
+        recordToCacheIdentifier_(),
+        verbose_(iConfig.getUntrackedParameter<bool>("verbose")) {}
+
+  EventSetupRecordDataGetter::~EventSetupRecordDataGetter() {
+    // do anything here that needs to be done at desctruction time
+    // (e.g. close files, deallocate resources etc.)
+  }
+
+  //
+  // member functions
+  //
+
+  // ------------ method called to produce the data  ------------
+  void EventSetupRecordDataGetter::fillDescriptions(ConfigurationDescriptions& descriptions) {
+    descriptions.setComment("Retrieves specified data from the EventSetup sytem whenever that data changes.");
+
+    ParameterSetDescription desc;
+    desc.addUntracked<bool>("verbose", false)
+        ->setComment("Print a message to the logger each time a data item is gotten.");
+
+    ParameterSetDescription toGet;
+    toGet.add<std::string>("record")->setComment(
+        "The name of an EventSetup record holding the data you want obtained.");
+    toGet.add<std::vector<std::string> >("data")->setComment(
+        "The identifier for the data you wish to retrieve. "
+        "The identifier is in two parts separated by a backslash '/'. "
+        "The first part is the C++ class name of the data and the "
+        "second part is the label used when getting the data (blank is acceptable). "
+        "If there is no label, the backslash may be omitted.");
+
+    std::vector<edm::ParameterSet> emptyVect;
+    desc.addVPSet("toGet", toGet, emptyVect)
+        ->setComment(
+            "The contained PSets must have the following structure.\n"
+            "A 'string' named 'record' that holds the name of an EventSetup record holding the data you want to "
+            "obtain.\n"
+            "a 'vstring' named 'data' that holds identifiers for the data you wish to retrieve. "
+            "The identifier is in two parts separated by a backslash '/'. "
+            "The first part is the C++ class name of the data and the "
+            "second part is the label used when getting the data (blank is acceptable). "
+            "If there is no label, the backslash may be omitted.\n"
+            "If the VPSet is empty it means all data in the EventSetup should be retrieved.");
+    descriptions.add("getEventSetupData", desc);
+  }
+
+  void EventSetupRecordDataGetter::beginRun(Run const&, EventSetup const& iSetup) { doGet(iSetup); }
+
+  void EventSetupRecordDataGetter::beginLuminosityBlock(LuminosityBlock const&, EventSetup const& iSetup) {
+    doGet(iSetup);
+  }
+
+  void EventSetupRecordDataGetter::analyze(edm::Event const& /*iEvent*/, edm::EventSetup const& iSetup) {
+    doGet(iSetup);
+  }
+
+  void EventSetupRecordDataGetter::doGet(EventSetup const& iSetup) {
+    if (recordToDataKeys_.empty()) {
+      typedef std::vector<ParameterSet> Parameters;
+      Parameters const& toGet = pSet_.getParameterSetVector("toGet");
+
+      for (Parameters::const_iterator itToGet = toGet.begin(), itToGetEnd = toGet.end(); itToGet != itToGetEnd;
+           ++itToGet) {
+        std::string recordName = itToGet->getParameter<std::string>("record");
+
+        eventsetup::EventSetupRecordKey recordKey(eventsetup::EventSetupRecordKey::TypeTag::findType(recordName));
+        if (recordKey.type() == eventsetup::EventSetupRecordKey::TypeTag()) {
+          //record not found
+          edm::LogWarning("DataGetter") << "Record \"" << recordName << "\" does not exist " << std::endl;
+
+          continue;
+        }
+        typedef std::vector<std::string> Strings;
+        Strings dataNames = itToGet->getParameter<Strings>("data");
+        std::vector<eventsetup::DataKey> dataKeys;
+        for (Strings::iterator itDatum = dataNames.begin(), itDatumEnd = dataNames.end(); itDatum != itDatumEnd;
+             ++itDatum) {
+          std::string datumName(*itDatum, 0, itDatum->find_first_of("/"));
+          std::string labelName;
+          if (itDatum->size() != datumName.size()) {
+            labelName = std::string(*itDatum, datumName.size() + 1);
+          }
+          eventsetup::TypeTag datumType = eventsetup::TypeTag::findType(datumName);
+          if (datumType == eventsetup::TypeTag()) {
+            //not found
+            edm::LogWarning("DataGetter") << "data item of type \"" << datumName << "\" does not exist" << std::endl;
+
+            continue;
+          }
+          eventsetup::DataKey datumKey(datumType, labelName.c_str());
+          dataKeys.push_back(datumKey);
+        }
+        recordToDataKeys_.insert(std::make_pair(recordKey, dataKeys));
+        recordToCacheIdentifier_.insert(std::make_pair(recordKey, 0));
+      }
+      if (toGet.empty()) {
+        //This means we should get everything in the EventSetup
+        std::vector<eventsetup::EventSetupRecordKey> recordKeys;
+        iSetup.fillAvailableRecordKeys(recordKeys);
+        std::vector<eventsetup::DataKey> dataKeys;
+
+        for (std::vector<eventsetup::EventSetupRecordKey>::iterator itRKey = recordKeys.begin(),
+                                                                    itRKeyEnd = recordKeys.end();
+             itRKey != itRKeyEnd;
+             ++itRKey) {
+          auto record = iSetup.find(*itRKey);
+          assert(record);
+          dataKeys.clear();
+          record->fillRegisteredDataKeys(dataKeys);
+          recordToDataKeys_.insert(std::make_pair(*itRKey, dataKeys));
+          recordToCacheIdentifier_.insert(std::make_pair(*itRKey, 0));
+        }
+      }
+    }
 
+    using namespace edm::eventsetup;
 
-//
-// member functions
-//
+    //For each requested Record get the requested data only if the Record is in a new IOV
 
-// ------------ method called to produce the data  ------------
-   void EventSetupRecordDataGetter::fillDescriptions(ConfigurationDescriptions& descriptions) {
-      descriptions.setComment("Retrieves specified data from the EventSetup sytem whenever that data changes.");
-
-      ParameterSetDescription desc;
-      desc.addUntracked<bool>("verbose", false)->setComment("Print a message to the logger each time a data item is gotten.");
-
-      ParameterSetDescription toGet;
-      toGet.add<std::string>("record")->setComment("The name of an EventSetup record holding the data you want obtained.");
-      toGet.add<std::vector<std::string> >("data")->setComment("The identifier for the data you wish to retrieve. "
-                                                               "The identifier is in two parts separated by a backslash '/'. "
-                                                               "The first part is the C++ class name of the data and the "
-                                                               "second part is the label used when getting the data (blank is acceptable). "
-                                                               "If there is no label, the backslash may be omitted."
-      );
-
-      std::vector<edm::ParameterSet> emptyVect;
-      desc.addVPSet("toGet", toGet,emptyVect)->setComment("The contained PSets must have the following structure.\n"
-                                                "A 'string' named 'record' that holds the name of an EventSetup record holding the data you want to obtain.\n"
-                                                "a 'vstring' named 'data' that holds identifiers for the data you wish to retrieve. "
-                                                "The identifier is in two parts separated by a backslash '/'. "
-                                                "The first part is the C++ class name of the data and the "
-                                                "second part is the label used when getting the data (blank is acceptable). "
-                                                "If there is no label, the backslash may be omitted.\n"
-                                                "If the VPSet is empty it means all data in the EventSetup should be retrieved."
-      );
-      descriptions.add("getEventSetupData", desc);
-   }
-
-   void
-   EventSetupRecordDataGetter::beginRun(Run const&, EventSetup const& iSetup) {
-      doGet(iSetup);
-   }
-
-   void
-   EventSetupRecordDataGetter::beginLuminosityBlock(LuminosityBlock const&, EventSetup const& iSetup) {
-      doGet(iSetup);
-   }
-
-   void
-   EventSetupRecordDataGetter::analyze(edm::Event const& /*iEvent*/, edm::EventSetup const& iSetup) {
-      doGet(iSetup);
-   }
-
-   void
-   EventSetupRecordDataGetter::doGet(EventSetup const& iSetup) {
-      if(recordToDataKeys_.empty()) {
-         typedef std::vector<ParameterSet> Parameters;
-         Parameters const& toGet = pSet_.getParameterSetVector("toGet");
-
-         for(Parameters::const_iterator itToGet = toGet.begin(), itToGetEnd = toGet.end(); itToGet != itToGetEnd; ++itToGet) {
-            std::string recordName = itToGet->getParameter<std::string>("record");
-
-            eventsetup::EventSetupRecordKey recordKey(eventsetup::EventSetupRecordKey::TypeTag::findType(recordName));
-            if(recordKey.type() == eventsetup::EventSetupRecordKey::TypeTag()) {
-              //record not found
-              edm::LogWarning("DataGetter") <<"Record \""<< recordName <<"\" does not exist "<<std::endl;
-
-               continue;
-            }
-            typedef std::vector<std::string> Strings;
-            Strings dataNames = itToGet->getParameter<Strings>("data");
-            std::vector<eventsetup::DataKey> dataKeys;
-            for(Strings::iterator itDatum = dataNames.begin(), itDatumEnd = dataNames.end();
-                  itDatum != itDatumEnd; ++itDatum) {
-               std::string datumName(*itDatum, 0, itDatum->find_first_of("/"));
-               std::string labelName;
-               if(itDatum->size() != datumName.size()) {
-                  labelName = std::string(*itDatum, datumName.size()+1);
-               }
-               eventsetup::TypeTag datumType = eventsetup::TypeTag::findType(datumName);
-               if(datumType == eventsetup::TypeTag()) {
-                 //not found
-                 edm::LogWarning("DataGetter") <<"data item of type \""<< datumName <<"\" does not exist"<<std::endl;
-
-
-                  continue;
-               }
-               eventsetup::DataKey datumKey(datumType, labelName.c_str());
-               dataKeys.push_back(datumKey);
-            }
-            recordToDataKeys_.insert(std::make_pair(recordKey, dataKeys));
-            recordToCacheIdentifier_.insert(std::make_pair(recordKey, 0));
-         }
-         if(toGet.empty()) {
-            //This means we should get everything in the EventSetup
-            std::vector<eventsetup::EventSetupRecordKey> recordKeys;
-            iSetup.fillAvailableRecordKeys(recordKeys);
-            std::vector<eventsetup::DataKey> dataKeys;
-
-            for(std::vector<eventsetup::EventSetupRecordKey>::iterator itRKey = recordKeys.begin(), itRKeyEnd = recordKeys.end();
-                itRKey != itRKeyEnd;
-                ++itRKey) {
-               auto record = iSetup.find(*itRKey);
-               assert(record );
-               dataKeys.clear();
-               record->fillRegisteredDataKeys(dataKeys);
-               recordToDataKeys_.insert(std::make_pair(*itRKey, dataKeys));
-               recordToCacheIdentifier_.insert(std::make_pair(*itRKey, 0));
-            }
-         }
+    for (RecordToDataKeys::iterator itRecord = recordToDataKeys_.begin(), itRecordEnd = recordToDataKeys_.end();
+         itRecord != itRecordEnd;
+         ++itRecord) {
+      auto pRecord = iSetup.find(itRecord->first);
+      if (not pRecord) {
+        edm::LogWarning("RecordNotInIOV")
+            << "The EventSetup Record '" << itRecord->first.name() << "' is not available for this IOV.";
       }
-
-      using namespace edm::eventsetup;
-
-      //For each requested Record get the requested data only if the Record is in a new IOV
-
-      for(RecordToDataKeys::iterator itRecord = recordToDataKeys_.begin(), itRecordEnd = recordToDataKeys_.end();
-           itRecord != itRecordEnd;
-           ++itRecord) {
-         auto pRecord = iSetup.find(itRecord->first);
-         if(not pRecord) {
-           edm::LogWarning("RecordNotInIOV") <<"The EventSetup Record '"<<itRecord->first.name()<<"' is not available for this IOV.";
-         }
-         if(pRecord.has_value() && pRecord->cacheIdentifier() != recordToCacheIdentifier_[itRecord->first]) {
-            recordToCacheIdentifier_[itRecord->first] = pRecord->cacheIdentifier();
-            typedef std::vector<DataKey> Keys;
-            Keys const& keys = itRecord->second;
-            for(Keys::const_iterator itKey = keys.begin(), itKeyEnd = keys.end();
-                 itKey != itKeyEnd;
-                 ++itKey) {
-               if(! pRecord->doGet(*itKey)) {
-                 edm::LogWarning("DataGetter") << "No data of type \""<<itKey->type().name() <<"\" with name \""<< itKey->name().value()<<"\" in record "<<itRecord->first.type().name() <<" found "<< std::endl;
-               } else {
-                  if(verbose_) {
-                    edm::LogSystem("DataGetter") << "got data of type \""<<itKey->type().name() <<"\" with name \""<< itKey->name().value()<<"\" in record "<<itRecord->first.type().name() << std::endl;
-                  }
-               }
+      if (pRecord.has_value() && pRecord->cacheIdentifier() != recordToCacheIdentifier_[itRecord->first]) {
+        recordToCacheIdentifier_[itRecord->first] = pRecord->cacheIdentifier();
+        typedef std::vector<DataKey> Keys;
+        Keys const& keys = itRecord->second;
+        for (Keys::const_iterator itKey = keys.begin(), itKeyEnd = keys.end(); itKey != itKeyEnd; ++itKey) {
+          if (!pRecord->doGet(*itKey)) {
+            edm::LogWarning("DataGetter")
+                << "No data of type \"" << itKey->type().name() << "\" with name \"" << itKey->name().value()
+                << "\" in record " << itRecord->first.type().name() << " found " << std::endl;
+          } else {
+            if (verbose_) {
+              edm::LogSystem("DataGetter")
+                  << "got data of type \"" << itKey->type().name() << "\" with name \"" << itKey->name().value()
+                  << "\" in record " << itRecord->first.type().name() << std::endl;
             }
-         }
+          }
+        }
       }
-   }
-}
+    }
+  }
+}  // namespace edm
 using edm::EventSetupRecordDataGetter;
 DEFINE_FWK_MODULE(EventSetupRecordDataGetter);
diff --git a/FWCore/Modules/src/GetProductCheckerOutputModule.cc b/FWCore/Modules/src/GetProductCheckerOutputModule.cc
index 7edb1d74d1351..f6e6e46fc9a38 100644
--- a/FWCore/Modules/src/GetProductCheckerOutputModule.cc
+++ b/FWCore/Modules/src/GetProductCheckerOutputModule.cc
@@ -2,11 +2,11 @@
 //
 // Package:     Modules
 // Class  :     GetProductCheckerOutputModule
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
-// Original Author:  
+// Original Author:
 //         Created:  Wed Oct  7 14:41:26 CDT 2009
 //
 
@@ -26,104 +26,102 @@
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 namespace edm {
-   class ModuleCallingContext;
-   class ParameterSet;
-
-   class GetProductCheckerOutputModule : public OutputModule {
-   public:
-      // We do not take ownership of passed stream.
-      explicit GetProductCheckerOutputModule(ParameterSet const& pset);
-      ~GetProductCheckerOutputModule() override;
-      static void fillDescriptions(ConfigurationDescriptions& descriptions);
-
-   private:
-      void write(EventForOutput const& e) override;
-      void writeLuminosityBlock(LuminosityBlockForOutput const&) override;
-      void writeRun(RunForOutput const&) override;
-   };
-
-//
-// constants, enums and typedefs
-//
-
-//
-// static data member definitions
-//
-
-//
-// constructors and destructor
-//
-   GetProductCheckerOutputModule::GetProductCheckerOutputModule(ParameterSet const& iPSet):
-   OutputModule(iPSet) { 
-   } 
-
-// GetProductCheckerOutputModule::GetProductCheckerOutputModule(GetProductCheckerOutputModule const& rhs) {
-//    // do actual copying here;
-// }
-
-   GetProductCheckerOutputModule::~GetProductCheckerOutputModule() {
-   }
-
-//
-// assignment operators
-//
-// GetProductCheckerOutputModule const& GetProductCheckerOutputModule::operator=(GetProductCheckerOutputModule const& rhs) {
-//   //An exception safe implementation is
-//   GetProductCheckerOutputModule temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
-
-//
-// member functions
-//
-   template<typename T>
-   static
-   void check(T const& p, std::string const& id, SelectedProducts const& iProducts) {
-     for(auto const& product : iProducts) {
-       BranchDescription const* branchDescription = product.first;
-       TypeID const& tid = branchDescription->unwrappedTypeID();
-       EDGetToken const& token = product.second;
-       BasicHandle bh = p.getByToken(token, tid);
-       if(nullptr != bh.provenance() && bh.provenance()->branchDescription().branchID() != branchDescription->branchID()) {
-         throw cms::Exception("BranchIDMissMatch") << "While processing " << id << " getByToken request for " << branchDescription->moduleLabel()
-            << " '" << branchDescription->productInstanceName() << "' " << branchDescription->processName()
-            << "\n should have returned BranchID " << branchDescription->branchID() << " but returned BranchID " << bh.provenance()->branchDescription().branchID() << "\n";
-       }
-     }
-   }
-   void GetProductCheckerOutputModule::write(EventForOutput const& e) {
-      std::ostringstream str;
-      str << e.id();
-      check(e, str.str(), keptProducts()[InEvent]);
-   }
-   void GetProductCheckerOutputModule::writeLuminosityBlock(LuminosityBlockForOutput const& l) {
-      std::ostringstream str;
-      str << l.id();
-      check(l, str.str(), keptProducts()[InLumi]);
-   }
-   void GetProductCheckerOutputModule::writeRun(RunForOutput const& r) {
-      std::ostringstream str;
-      str << r.id();
-      check(r, str.str(), keptProducts()[InRun]);
-   }
+  class ModuleCallingContext;
+  class ParameterSet;
+
+  class GetProductCheckerOutputModule : public OutputModule {
+  public:
+    // We do not take ownership of passed stream.
+    explicit GetProductCheckerOutputModule(ParameterSet const& pset);
+    ~GetProductCheckerOutputModule() override;
+    static void fillDescriptions(ConfigurationDescriptions& descriptions);
+
+  private:
+    void write(EventForOutput const& e) override;
+    void writeLuminosityBlock(LuminosityBlockForOutput const&) override;
+    void writeRun(RunForOutput const&) override;
+  };
+
+  //
+  // constants, enums and typedefs
+  //
+
+  //
+  // static data member definitions
+  //
+
+  //
+  // constructors and destructor
+  //
+  GetProductCheckerOutputModule::GetProductCheckerOutputModule(ParameterSet const& iPSet) : OutputModule(iPSet) {}
+
+  // GetProductCheckerOutputModule::GetProductCheckerOutputModule(GetProductCheckerOutputModule const& rhs) {
+  //    // do actual copying here;
+  // }
+
+  GetProductCheckerOutputModule::~GetProductCheckerOutputModule() {}
+
+  //
+  // assignment operators
+  //
+  // GetProductCheckerOutputModule const& GetProductCheckerOutputModule::operator=(GetProductCheckerOutputModule const& rhs) {
+  //   //An exception safe implementation is
+  //   GetProductCheckerOutputModule temp(rhs);
+  //   swap(rhs);
+  //
+  //   return *this;
+  // }
+
+  //
+  // member functions
+  //
+  template <typename T>
+  static void check(T const& p, std::string const& id, SelectedProducts const& iProducts) {
+    for (auto const& product : iProducts) {
+      BranchDescription const* branchDescription = product.first;
+      TypeID const& tid = branchDescription->unwrappedTypeID();
+      EDGetToken const& token = product.second;
+      BasicHandle bh = p.getByToken(token, tid);
+      if (nullptr != bh.provenance() &&
+          bh.provenance()->branchDescription().branchID() != branchDescription->branchID()) {
+        throw cms::Exception("BranchIDMissMatch")
+            << "While processing " << id << " getByToken request for " << branchDescription->moduleLabel() << " '"
+            << branchDescription->productInstanceName() << "' " << branchDescription->processName()
+            << "\n should have returned BranchID " << branchDescription->branchID() << " but returned BranchID "
+            << bh.provenance()->branchDescription().branchID() << "\n";
+      }
+    }
+  }
+  void GetProductCheckerOutputModule::write(EventForOutput const& e) {
+    std::ostringstream str;
+    str << e.id();
+    check(e, str.str(), keptProducts()[InEvent]);
+  }
+  void GetProductCheckerOutputModule::writeLuminosityBlock(LuminosityBlockForOutput const& l) {
+    std::ostringstream str;
+    str << l.id();
+    check(l, str.str(), keptProducts()[InLumi]);
+  }
+  void GetProductCheckerOutputModule::writeRun(RunForOutput const& r) {
+    std::ostringstream str;
+    str << r.id();
+    check(r, str.str(), keptProducts()[InRun]);
+  }
 
-//
-// const member functions
-//
+  //
+  // const member functions
+  //
 
-//
-// static member functions
-//
+  //
+  // static member functions
+  //
 
-  void
-  GetProductCheckerOutputModule::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void GetProductCheckerOutputModule::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     OutputModule::fillDescription(desc);
     descriptions.add("productChecker", desc);
   }
-}
+}  // namespace edm
 
 using edm::GetProductCheckerOutputModule;
 DEFINE_FWK_MODULE(GetProductCheckerOutputModule);
diff --git a/FWCore/Modules/src/IterateNTimesLooper.cc b/FWCore/Modules/src/IterateNTimesLooper.cc
index 76847193c25e7..642851b946223 100644
--- a/FWCore/Modules/src/IterateNTimesLooper.cc
+++ b/FWCore/Modules/src/IterateNTimesLooper.cc
@@ -20,47 +20,42 @@
 namespace edm {
 
   class IterateNTimesLooper : public EDLooper {
+  public:
+    IterateNTimesLooper(ParameterSet const&);
+    ~IterateNTimesLooper() override;
 
-    public:
-      IterateNTimesLooper(ParameterSet const&);
-      ~IterateNTimesLooper() override;
+    // ---------- const member functions ---------------------
 
-      // ---------- const member functions ---------------------
+    // ---------- static member functions --------------------
 
-      // ---------- static member functions --------------------
+    // ---------- member functions ---------------------------
+    void startingNewLoop(unsigned int) override;
+    Status duringLoop(Event const&, EventSetup const&) override;
+    Status endOfLoop(EventSetup const&, unsigned int) override;
 
-      // ---------- member functions ---------------------------
-      void startingNewLoop(unsigned int) override;
-      Status duringLoop(Event const&, EventSetup const&) override;
-      Status endOfLoop(EventSetup const&, unsigned int) override;
+  private:
+    IterateNTimesLooper(IterateNTimesLooper const&) = delete;  // stop default
 
-    private:
-      IterateNTimesLooper(IterateNTimesLooper const&) = delete; // stop default
+    IterateNTimesLooper const& operator=(IterateNTimesLooper const&) = delete;  // stop default
 
-      IterateNTimesLooper const& operator=(IterateNTimesLooper const&) = delete; // stop default
-
-      // ---------- member data --------------------------------
-      unsigned int max_;
-      unsigned int times_;
-      bool shouldStop_;
+    // ---------- member data --------------------------------
+    unsigned int max_;
+    unsigned int times_;
+    bool shouldStop_;
   };
 
   //
   //
   // constructors and destructor
   //
-  IterateNTimesLooper::IterateNTimesLooper(ParameterSet const& iConfig) :
-    max_(iConfig.getParameter<unsigned int>("nTimes")),
-    times_(0),
-    shouldStop_(false) {
-  }
+  IterateNTimesLooper::IterateNTimesLooper(ParameterSet const& iConfig)
+      : max_(iConfig.getParameter<unsigned int>("nTimes")), times_(0), shouldStop_(false) {}
 
   // IterateNTimesLooper::IterateNTimesLooper(IterateNTimesLooper const& rhs) {
   //    // do actual copying here;
   // }
 
-  IterateNTimesLooper::~IterateNTimesLooper() {
-  }
+  IterateNTimesLooper::~IterateNTimesLooper() {}
 
   //
   // assignment operators
@@ -76,25 +71,22 @@ namespace edm {
   //
   // member functions
   //
-  void
-  IterateNTimesLooper::startingNewLoop(unsigned int iIteration) {
+  void IterateNTimesLooper::startingNewLoop(unsigned int iIteration) {
     times_ = iIteration;
-    if(iIteration >= max_) {
+    if (iIteration >= max_) {
       shouldStop_ = true;
     }
   }
 
-  EDLooper::Status
-  IterateNTimesLooper::duringLoop(Event const&, EventSetup const&) {
+  EDLooper::Status IterateNTimesLooper::duringLoop(Event const&, EventSetup const&) {
     return shouldStop_ ? kStop : kContinue;
   }
 
-  EDLooper::Status
-  IterateNTimesLooper::endOfLoop(EventSetup const&, unsigned int /*iCounter*/) {
+  EDLooper::Status IterateNTimesLooper::endOfLoop(EventSetup const&, unsigned int /*iCounter*/) {
     ++times_;
     return (times_ < max_) ? kContinue : kStop;
   }
-}
+}  // namespace edm
 
 using edm::IterateNTimesLooper;
 DEFINE_FWK_LOOPER(IterateNTimesLooper);
diff --git a/FWCore/Modules/src/LogErrorFilter.cc b/FWCore/Modules/src/LogErrorFilter.cc
index 9c819218939aa..f933ef3f48886 100644
--- a/FWCore/Modules/src/LogErrorFilter.cc
+++ b/FWCore/Modules/src/LogErrorFilter.cc
@@ -41,7 +41,7 @@ class LogErrorFilter : public edm::stream::EDFilter<> {
 private:
   bool filter(edm::Event&, edm::EventSetup const&) override;
 
-  void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override ;
+  void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
 
   // ----------member data ---------------------------
   edm::EDGetTokenT<std::vector<edm::ErrorSummaryEntry>> harvesterToken_;
@@ -70,28 +70,28 @@ class LogErrorFilter : public edm::stream::EDFilter<> {
 //
 // constructors and destructor
 //
-LogErrorFilter::LogErrorFilter(edm::ParameterSet const& iConfig) :
-  atLeastOneError_(iConfig.getParameter<bool>("atLeastOneError")),
-  atLeastOneWarning_(iConfig.getParameter<bool>("atLeastOneWarning")),
-  atLeastOneEntry_(atLeastOneError_ && atLeastOneWarning_),
-  useThresholdsPerKind_(iConfig.getParameter<bool>("useThresholdsPerKind")),
-  avoidCategories_(iConfig.getParameter<std::vector<std::string> >("avoidCategories")) {
-  if(!atLeastOneError_ && !atLeastOneWarning_) {
-    throw edm::Exception(edm::errors::Configuration) <<
-      "Useless configuration of the error/warning filter. Need to select on an error or a warning or both.\n";
+LogErrorFilter::LogErrorFilter(edm::ParameterSet const& iConfig)
+    : atLeastOneError_(iConfig.getParameter<bool>("atLeastOneError")),
+      atLeastOneWarning_(iConfig.getParameter<bool>("atLeastOneWarning")),
+      atLeastOneEntry_(atLeastOneError_ && atLeastOneWarning_),
+      useThresholdsPerKind_(iConfig.getParameter<bool>("useThresholdsPerKind")),
+      avoidCategories_(iConfig.getParameter<std::vector<std::string>>("avoidCategories")) {
+  if (!atLeastOneError_ && !atLeastOneWarning_) {
+    throw edm::Exception(edm::errors::Configuration)
+        << "Useless configuration of the error/warning filter. Need to select on an error or a warning or both.\n";
   }
   harvesterToken_ = consumes<std::vector<edm::ErrorSummaryEntry>>(iConfig.getParameter<edm::InputTag>("harvesterTag"));
   maxErrorKindsPerLumi_ = 999999;
   maxWarningKindsPerLumi_ = 999999;
-  if (useThresholdsPerKind_){
+  if (useThresholdsPerKind_) {
     maxErrorKindsPerLumi_ = iConfig.getParameter<unsigned int>("maxErrorKindsPerLumi");
     maxWarningKindsPerLumi_ = iConfig.getParameter<unsigned int>("maxWarningKindsPerLumi");
   }
 }
 
 LogErrorFilter::~LogErrorFilter() {
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
 //
@@ -99,45 +99,44 @@ LogErrorFilter::~LogErrorFilter() {
 //
 
 // ------------ method called on each new Event  ------------
-bool
-LogErrorFilter::filter(edm::Event& iEvent, edm::EventSetup const&) {
-
-  if(auto errorsAndWarnings = iEvent.getHandle(harvesterToken_)) {
-    if (useThresholdsPerKind_){
+bool LogErrorFilter::filter(edm::Event& iEvent, edm::EventSetup const&) {
+  if (auto errorsAndWarnings = iEvent.getHandle(harvesterToken_)) {
+    if (useThresholdsPerKind_) {
       unsigned int errorsBelowThreshold = 0;
       unsigned int warningsBelowThreshold = 0;
       // update counters here
-      for(auto const& summary : *errorsAndWarnings) {
-        if (std::find(avoidCategories_.begin(),avoidCategories_.end(), summary.category) != avoidCategories_.end() )
+      for (auto const& summary : *errorsAndWarnings) {
+        if (std::find(avoidCategories_.begin(), avoidCategories_.end(), summary.category) != avoidCategories_.end())
           continue;
-        std::string kind= summary.category + ":" + summary.module;
+        std::string kind = summary.category + ":" + summary.module;
         int iSeverity = summary.severity.getLevel();
-        if (iSeverity == edm::ELseverityLevel::ELsev_error){
+        if (iSeverity == edm::ELseverityLevel::ELsev_error) {
           unsigned int& iCount = errorCounts_[kind];
           iCount++;
-          if (iCount <= maxErrorKindsPerLumi_) errorsBelowThreshold++;
-        } else if (iSeverity == edm::ELseverityLevel::ELsev_warning){
+          if (iCount <= maxErrorKindsPerLumi_)
+            errorsBelowThreshold++;
+        } else if (iSeverity == edm::ELseverityLevel::ELsev_warning) {
           unsigned int& iCount = warningCounts_[kind];
           iCount++;
-          if (iCount <= maxWarningKindsPerLumi_) warningsBelowThreshold++;
+          if (iCount <= maxWarningKindsPerLumi_)
+            warningsBelowThreshold++;
         }
-
       }
-      return ( (atLeastOneEntry_ && (errorsBelowThreshold > 0 || warningsBelowThreshold > 0))
-              || (atLeastOneError_ && errorsBelowThreshold > 0)
-              || (atLeastOneWarning_ && warningsBelowThreshold > 0));
+      return ((atLeastOneEntry_ && (errorsBelowThreshold > 0 || warningsBelowThreshold > 0)) ||
+              (atLeastOneError_ && errorsBelowThreshold > 0) || (atLeastOneWarning_ && warningsBelowThreshold > 0));
     } else {
       //no separation by kind, just count any errors/warnings
-      if(atLeastOneEntry_) {
-        for(auto const& summary: *errorsAndWarnings) {
+      if (atLeastOneEntry_) {
+        for (auto const& summary : *errorsAndWarnings) {
           edm::ELseverityLevel const& severity = summary.severity;
-          if(severity.getLevel() != edm::ELseverityLevel::ELsev_error and
-             severity.getLevel() != edm::ELseverityLevel::ELsev_warning) {
+          if (severity.getLevel() != edm::ELseverityLevel::ELsev_error and
+              severity.getLevel() != edm::ELseverityLevel::ELsev_warning) {
             continue;
           }
-          if(!avoidCategories_.empty()) {
+          if (!avoidCategories_.empty()) {
             //veto categories from user input.
-            if(std::find(avoidCategories_.begin(),avoidCategories_.end(),summary.category) != avoidCategories_.end()) {
+            if (std::find(avoidCategories_.begin(), avoidCategories_.end(), summary.category) !=
+                avoidCategories_.end()) {
               continue;
             }
           }
@@ -145,30 +144,31 @@ LogErrorFilter::filter(edm::Event& iEvent, edm::EventSetup const&) {
         }
         return false;
       } else {
-        if(atLeastOneError_ || atLeastOneWarning_) {
+        if (atLeastOneError_ || atLeastOneWarning_) {
           unsigned int nError = 0;
           unsigned int nWarning = 0;
-          for(auto const& summary: *errorsAndWarnings) {
+          for (auto const& summary : *errorsAndWarnings) {
             //veto categories from user input.
-            if(!avoidCategories_.empty()) {
-              if(std::find(avoidCategories_.begin(),avoidCategories_.end(), summary.category) != avoidCategories_.end()) {
+            if (!avoidCategories_.empty()) {
+              if (std::find(avoidCategories_.begin(), avoidCategories_.end(), summary.category) !=
+                  avoidCategories_.end()) {
                 continue;
               }
             }
             edm::ELseverityLevel const& severity = summary.severity;
             //count errors
-            if(severity.getLevel() == edm::ELseverityLevel::ELsev_error) {
+            if (severity.getLevel() == edm::ELseverityLevel::ELsev_error) {
               ++nError;
             }
             //count warnings
-            if(severity.getLevel() == edm::ELseverityLevel::ELsev_warning) {
+            if (severity.getLevel() == edm::ELseverityLevel::ELsev_warning) {
               ++nWarning;
             }
           }
-          if(atLeastOneError_ && nError != 0) {
+          if (atLeastOneError_ && nError != 0) {
             return (true);
           }
-          if(atLeastOneWarning_ && nWarning != 0) {
+          if (atLeastOneWarning_ && nWarning != 0) {
             return (true);
           }
         }
@@ -178,12 +178,12 @@ LogErrorFilter::filter(edm::Event& iEvent, edm::EventSetup const&) {
   return (false);
 }
 
-void LogErrorFilter::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&){
+void LogErrorFilter::beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {
   if (useThresholdsPerKind_) {
-    for(auto& err: errorCounts_) {
+    for (auto& err : errorCounts_) {
       err.second = 0;
     }
-    for(auto& err: warningCounts_) {
+    for (auto& err : warningCounts_) {
       err.second = 0;
     }
   }
@@ -191,9 +191,7 @@ void LogErrorFilter::beginLuminosityBlock(edm::LuminosityBlock const&, edm::Even
   return;
 }
 
-
-void
-LogErrorFilter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+void LogErrorFilter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
   desc.add<edm::InputTag>("harvesterTag");
   desc.add<bool>("atLeastOneError");
@@ -201,7 +199,7 @@ LogErrorFilter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   desc.add<bool>("useThresholdsPerKind");
   desc.add<unsigned int>("maxErrorKindsPerLumi", 999999);
   desc.add<unsigned int>("maxWarningKindsPerLumi", 999999);
-  desc.add<std::vector<std::string> >("avoidCategories");
+  desc.add<std::vector<std::string>>("avoidCategories");
   descriptions.add("logErrorFilter", desc);
 }
 
diff --git a/FWCore/Modules/src/LogErrorHarvester.cc b/FWCore/Modules/src/LogErrorHarvester.cc
index 439c84183bbad..a62e126f38268 100644
--- a/FWCore/Modules/src/LogErrorHarvester.cc
+++ b/FWCore/Modules/src/LogErrorHarvester.cc
@@ -50,75 +50,59 @@ namespace edm {
     EDPutTokenT<std::vector<ErrorSummaryEntry>> token_;
   };
 
-  LogErrorHarvester::LogErrorHarvester(ParameterSet const& iPSet):
-  token_{produces<std::vector<ErrorSummaryEntry>>()}
-  {
-    
-
+  LogErrorHarvester::LogErrorHarvester(ParameterSet const& iPSet) : token_{produces<std::vector<ErrorSummaryEntry>>()} {
     const edm::TypeID endPathStatusType{typeid(edm::EndPathStatus)};
     const edm::TypeID pathStatusType{typeid(edm::PathStatus)};
     const edm::TypeID triggerResultsType{typeid(edm::TriggerResults)};
 
     auto const& ignore = iPSet.getUntrackedParameter<std::vector<std::string>>("excludeModules");
-    const std::unordered_set<std::string> excludedModules(ignore.begin(),ignore.end());
+    const std::unordered_set<std::string> excludedModules(ignore.begin(), ignore.end());
 
     auto const& includeM = iPSet.getUntrackedParameter<std::vector<std::string>>("includeModules");
-    const std::unordered_set<std::string> includeModules(includeM.begin(),includeM.end());
+    const std::unordered_set<std::string> includeModules(includeM.begin(), includeM.end());
 
     //Need to be sure to run only after all other EDProducers have run
-    callWhenNewProductsRegistered([this,
-                                   endPathStatusType,pathStatusType,triggerResultsType,
-                                   excludedModules, includeModules](edm::BranchDescription const& iBD) 
-    {
-      if((iBD.branchType() == edm::InEvent and moduleDescription().processName() == iBD.processName()) and 
-         ( (includeModules.empty() or
-            includeModules.end() != includeModules.find(iBD.moduleLabel())) and
-           (iBD.unwrappedTypeID() != endPathStatusType and
-            iBD.unwrappedTypeID() != pathStatusType and
-            iBD.unwrappedTypeID() != triggerResultsType))) {
-        if(excludedModules.end() == excludedModules.find(iBD.moduleLabel())) {
-          consumes(edm::TypeToGet{iBD.unwrappedTypeID(),edm::PRODUCT_TYPE},
-                   edm::InputTag{iBD.moduleLabel(),
-                                 iBD.productInstanceName(),
-                                 iBD.processName()});
-        }
-      }
-    });
+    callWhenNewProductsRegistered(
+        [this, endPathStatusType, pathStatusType, triggerResultsType, excludedModules, includeModules](
+            edm::BranchDescription const& iBD) {
+          if ((iBD.branchType() == edm::InEvent and moduleDescription().processName() == iBD.processName()) and
+              ((includeModules.empty() or includeModules.end() != includeModules.find(iBD.moduleLabel())) and
+               (iBD.unwrappedTypeID() != endPathStatusType and iBD.unwrappedTypeID() != pathStatusType and
+                iBD.unwrappedTypeID() != triggerResultsType))) {
+            if (excludedModules.end() == excludedModules.find(iBD.moduleLabel())) {
+              consumes(edm::TypeToGet{iBD.unwrappedTypeID(), edm::PRODUCT_TYPE},
+                       edm::InputTag{iBD.moduleLabel(), iBD.productInstanceName(), iBD.processName()});
+            }
+          }
+        });
   }
 
-  void
-  LogErrorHarvester::produce(StreamID const sid, Event& iEvent, EventSetup const&) const {
+  void LogErrorHarvester::produce(StreamID const sid, Event& iEvent, EventSetup const&) const {
     const auto index = sid.value();
-    if(!FreshErrorsExist(index)) {
+    if (!FreshErrorsExist(index)) {
       //puts a default constructed product in the event
       iEvent.emplace(token_);
     } else {
-      iEvent.emplace(token_,LoggedErrorsSummary(index));
+      iEvent.emplace(token_, LoggedErrorsSummary(index));
     }
   }
 
   // ------------ method called once each job just before starting event loop  ------------
-  void
-  LogErrorHarvester::beginJob() {
-    EnableLoggedErrorsSummary();
-  }
+  void LogErrorHarvester::beginJob() { EnableLoggedErrorsSummary(); }
 
   // ------------ method called once each job just after ending the event loop  ------------
-  void
-  LogErrorHarvester::endJob() {
-    DisableLoggedErrorsSummary();
-  }
-
+  void LogErrorHarvester::endJob() { DisableLoggedErrorsSummary(); }
 
   // ------------ method called once each job for validation  ------------
-  void
-  LogErrorHarvester::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void LogErrorHarvester::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
-    desc.addUntracked<std::vector<std::string>>("excludeModules",std::vector<std::string>{})->setComment("List of module labels to exclude from consumes.");
-    desc.addUntracked<std::vector<std::string>>("includeModules",std::vector<std::string>{})->setComment("List of the only module labels to include in consumes. The empty list will include all.");
+    desc.addUntracked<std::vector<std::string>>("excludeModules", std::vector<std::string>{})
+        ->setComment("List of module labels to exclude from consumes.");
+    desc.addUntracked<std::vector<std::string>>("includeModules", std::vector<std::string>{})
+        ->setComment("List of the only module labels to include in consumes. The empty list will include all.");
     descriptions.add("logErrorHarvester", desc);
   }
-}
+}  // namespace edm
 
 //define this as a plug-in
 using edm::LogErrorHarvester;
diff --git a/FWCore/Modules/src/ModuloEventIDFilter.cc b/FWCore/Modules/src/ModuloEventIDFilter.cc
index ba43ca65ff48c..370ba80b78320 100644
--- a/FWCore/Modules/src/ModuloEventIDFilter.cc
+++ b/FWCore/Modules/src/ModuloEventIDFilter.cc
@@ -15,27 +15,24 @@ namespace edm {
     bool filter(StreamID, Event& e, EventSetup const& c) const final;
 
   private:
-    const unsigned int n_; // accept one in n
-    const unsigned int offset_; // with offset, ie. sequence of events does not have to start at first event
+    const unsigned int n_;       // accept one in n
+    const unsigned int offset_;  // with offset, ie. sequence of events does not have to start at first event
   };
 
-  ModuloEventIDFilter::ModuloEventIDFilter(ParameterSet const& ps) :
-    n_(ps.getParameter<unsigned int>("modulo")),
-    offset_(ps.getParameter<unsigned int>("offset")) {
-  }
+  ModuloEventIDFilter::ModuloEventIDFilter(ParameterSet const& ps)
+      : n_(ps.getParameter<unsigned int>("modulo")), offset_(ps.getParameter<unsigned int>("offset")) {}
 
   bool ModuloEventIDFilter::filter(StreamID, Event& iEvent, EventSetup const&) const {
     return (iEvent.id().event() % n_ == offset_);
   }
 
-  void
-  ModuloEventIDFilter::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void ModuloEventIDFilter::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     desc.add<unsigned int>("modulo")->setComment("Accept event if (eventID % modulo) == offset.");
     desc.add<unsigned int>("offset")->setComment("Used to shift which value of modulo to accept.");
     descriptions.add("eventIDFilter", desc);
   }
-}
+}  // namespace edm
 
 using edm::ModuloEventIDFilter;
 DEFINE_FWK_MODULE(ModuloEventIDFilter);
diff --git a/FWCore/Modules/src/ModuloStreamIDFilter.cc b/FWCore/Modules/src/ModuloStreamIDFilter.cc
index 44b5af2fd3693..70c1631728154 100644
--- a/FWCore/Modules/src/ModuloStreamIDFilter.cc
+++ b/FWCore/Modules/src/ModuloStreamIDFilter.cc
@@ -15,30 +15,26 @@ namespace edm {
     bool filter(StreamID, Event& e, EventSetup const& c) const final;
 
   private:
-    const unsigned int n_; // accept one in n
-    const unsigned int offset_; // with offset, ie. sequence of events does not have to start at first event
+    const unsigned int n_;       // accept one in n
+    const unsigned int offset_;  // with offset, ie. sequence of events does not have to start at first event
   };
 
-  ModuloStreamIDFilter::ModuloStreamIDFilter(ParameterSet const& ps) :
-    n_(ps.getParameter<unsigned int>("modulo")),
-    offset_(ps.getParameter<unsigned int>("offset")) {
-  }
+  ModuloStreamIDFilter::ModuloStreamIDFilter(ParameterSet const& ps)
+      : n_(ps.getParameter<unsigned int>("modulo")), offset_(ps.getParameter<unsigned int>("offset")) {}
 
-  ModuloStreamIDFilter::~ModuloStreamIDFilter() {
-  }
+  ModuloStreamIDFilter::~ModuloStreamIDFilter() {}
 
   bool ModuloStreamIDFilter::filter(StreamID iStreamID, Event&, EventSetup const&) const {
     return (iStreamID.value() % n_ == offset_);
   }
 
-  void
-  ModuloStreamIDFilter::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void ModuloStreamIDFilter::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     desc.add<unsigned int>("modulo")->setComment("Accept event if (streamID % modulo) == offset.");
     desc.add<unsigned int>("offset")->setComment("Used to shift which value of modulo to accept.");
     descriptions.add("streamIDFilter", desc);
   }
-}
+}  // namespace edm
 
 using edm::ModuloStreamIDFilter;
 DEFINE_FWK_MODULE(ModuloStreamIDFilter);
diff --git a/FWCore/Modules/src/NavigateEventsLooper.cc b/FWCore/Modules/src/NavigateEventsLooper.cc
index 2b2e1f7c9529d..43cec9c334b86 100644
--- a/FWCore/Modules/src/NavigateEventsLooper.cc
+++ b/FWCore/Modules/src/NavigateEventsLooper.cc
@@ -27,7 +27,6 @@ turn off fast cloning its configuration.
 namespace edm {
 
   class NavigateEventsLooper : public EDLooperBase {
-
   public:
     NavigateEventsLooper(ParameterSet const& pset);
     ~NavigateEventsLooper() override;
@@ -37,8 +36,8 @@ namespace edm {
     Status endOfLoop(EventSetup const& es, unsigned int iCounter) override;
 
   private:
-    NavigateEventsLooper(NavigateEventsLooper const&) = delete; // stop default
-    NavigateEventsLooper const& operator=(NavigateEventsLooper const&) = delete; // stop default
+    NavigateEventsLooper(NavigateEventsLooper const&) = delete;                   // stop default
+    NavigateEventsLooper const& operator=(NavigateEventsLooper const&) = delete;  // stop default
 
     int maxLoops_;
     int countLoops_;
@@ -46,45 +45,40 @@ namespace edm {
     bool shouldStopProcess_;
   };
 
-  NavigateEventsLooper::NavigateEventsLooper(ParameterSet const& pset) :
-    maxLoops_(pset.getUntrackedParameter<int>("maxLoops", -1)),
-    countLoops_(0),
-    shouldStopLoop_(false),
-    shouldStopProcess_(false) {
-  }
+  NavigateEventsLooper::NavigateEventsLooper(ParameterSet const& pset)
+      : maxLoops_(pset.getUntrackedParameter<int>("maxLoops", -1)),
+        countLoops_(0),
+        shouldStopLoop_(false),
+        shouldStopProcess_(false) {}
 
-  NavigateEventsLooper::~NavigateEventsLooper() {
-  }
-
-  void
-  NavigateEventsLooper::startingNewLoop(unsigned int /*iIteration*/) {
-  }
+  NavigateEventsLooper::~NavigateEventsLooper() {}
 
-  EDLooperBase::Status
-  NavigateEventsLooper::duringLoop(Event const&, EventSetup const&, ProcessingController& pc) {
+  void NavigateEventsLooper::startingNewLoop(unsigned int /*iIteration*/) {}
 
-    if(!pc.lastOperationSucceeded()) {
+  EDLooperBase::Status NavigateEventsLooper::duringLoop(Event const&, EventSetup const&, ProcessingController& pc) {
+    if (!pc.lastOperationSucceeded()) {
       std::cout << "Event could not be found. Nothing done. Try again.\n";
     }
 
     std::cout << "\nWhat should we do next?\n";
 
-    if(pc.forwardState() == ProcessingController::kEventsAheadInFile) {
+    if (pc.forwardState() == ProcessingController::kEventsAheadInFile) {
       std::cout << "(0) process the next event\n";
-    } else if(pc.forwardState() == ProcessingController::kNextFileExists) {
+    } else if (pc.forwardState() == ProcessingController::kNextFileExists) {
       std::cout << "(0) process the next event if it exists (at last event in the open file. there are more files)\n";
-    } else if(pc.forwardState() == ProcessingController::kAtLastEvent) {
+    } else if (pc.forwardState() == ProcessingController::kAtLastEvent) {
       std::cout << "(0) will stop the loop because this is the last event\n";
-    } else if(pc.forwardState() == ProcessingController::kUnknownForward) {
+    } else if (pc.forwardState() == ProcessingController::kUnknownForward) {
       std::cout << "(0) process the next event (if it exists)\n";
     }
 
-    if(pc.canRandomAccess()) {
-      if(pc.reverseState() == ProcessingController::kEventsBackwardsInFile) {
+    if (pc.canRandomAccess()) {
+      if (pc.reverseState() == ProcessingController::kEventsBackwardsInFile) {
         std::cout << "(1) process the previous event\n";
-      } else if(pc.reverseState() == ProcessingController::kPreviousFileExists) {
-        std::cout << "(1) process the previous event if there are any (at first event in the open file. there are previous files)\n";
-      } else if(pc.reverseState() == ProcessingController::kAtFirstEvent) {
+      } else if (pc.reverseState() == ProcessingController::kPreviousFileExists) {
+        std::cout << "(1) process the previous event if there are any (at first event in the open file. there are "
+                     "previous files)\n";
+      } else if (pc.reverseState() == ProcessingController::kAtFirstEvent) {
         std::cout << "(1) will stop the loop because this is the first event\n";
       }
 
@@ -98,63 +92,65 @@ namespace edm {
     bool inputFailed = false;
     do {
       inputFailed = false;
-      if(!(std::cin >> x) || x < 0 || x > 4) {
+      if (!(std::cin >> x) || x < 0 || x > 4) {
         inputFailed = true;
         std::cin.clear();
         std::cin.ignore(10000, '\n');
-        std::cout << "Please enter numeric characters only. The value must be in the range 0 to 4 (inclusive). Please try again." << std::endl;
+        std::cout << "Please enter numeric characters only. The value must be in the range 0 to 4 (inclusive). Please "
+                     "try again."
+                  << std::endl;
       }
-      if(!pc.canRandomAccess() && (x == 1 || x == 2)) {
+      if (!pc.canRandomAccess() && (x == 1 || x == 2)) {
         inputFailed = true;
         std::cout << "The source cannot do random access. 1 and 2 are illegal values. Please try again." << std::endl;
       }
-    } while(inputFailed);
+    } while (inputFailed);
 
     shouldStopLoop_ = false;
     shouldStopProcess_ = false;
-    if(x == 0) {
+    if (x == 0) {
       pc.setTransitionToNextEvent();
-    } else if(x == 1) {
+    } else if (x == 1) {
       pc.setTransitionToPreviousEvent();
-    } else if(x == 2) {
+    } else if (x == 2) {
       std::cout << "Which run?" << std::endl;
       do {
         inputFailed = false;
-        if(!(std::cin >> x)) {
+        if (!(std::cin >> x)) {
           inputFailed = true;
           std::cin.clear();
           std::cin.ignore(10000, '\n');
           std::cout << "Please enter numeric characters only. Please try again." << std::endl;
         }
-      } while(inputFailed);
+      } while (inputFailed);
       RunNumber_t run = x;
       std::cout << "Which luminosity block?" << std::endl;
       do {
         inputFailed = false;
-        if(!(std::cin >> x)) {
+        if (!(std::cin >> x)) {
           inputFailed = true;
           std::cin.clear();
           std::cin.ignore(10000, '\n');
           std::cout << "Please enter numeric characters only. Please try again." << std::endl;
         }
-      } while(inputFailed);
+      } while (inputFailed);
       LuminosityBlockNumber_t lumi = x;
       std::cout << "Which event?" << std::endl;
       do {
         inputFailed = false;
-        if(!(std::cin >> x)) {
+        if (!(std::cin >> x)) {
           inputFailed = true;
           std::cin.clear();
           std::cin.ignore(10000, '\n');
           std::cout << "Please enter numeric characters only. Please try again." << std::endl;
         }
-      } while(inputFailed);
+      } while (inputFailed);
       EventNumber_t ev = x;
       pc.setTransitionToEvent(EventID(run, lumi, ev));
-    } else if(x == 3) {
+    } else if (x == 3) {
       pc.setTransitionToNextEvent();
       shouldStopLoop_ = true;
-    } else if(x == 4) {
+    } else if (x == 4) {
       pc.setTransitionToNextEvent();
       shouldStopLoop_ = true;
       shouldStopProcess_ = true;
@@ -162,14 +158,14 @@ namespace edm {
     return shouldStopLoop_ ? kStop : kContinue;
   }
 
-  EDLooperBase::Status
-  NavigateEventsLooper::endOfLoop(EventSetup const&, unsigned int /*iCounter*/) {
+  EDLooperBase::Status NavigateEventsLooper::endOfLoop(EventSetup const&, unsigned int /*iCounter*/) {
     std::cout << "Ending loop" << std::endl;
-    if(shouldStopProcess_) return kStop;
+    if (shouldStopProcess_)
+      return kStop;
     ++countLoops_;
-    return(maxLoops_ < 0 || countLoops_ < maxLoops_) ? kContinue : kStop;
+    return (maxLoops_ < 0 || countLoops_ < maxLoops_) ? kContinue : kStop;
   }
-}
+}  // namespace edm
 
 using edm::NavigateEventsLooper;
 DEFINE_FWK_LOOPER(NavigateEventsLooper);
diff --git a/FWCore/Modules/src/PathStatusFilter.cc b/FWCore/Modules/src/PathStatusFilter.cc
index 0b9c830299c5f..46d3b48f33647 100644
--- a/FWCore/Modules/src/PathStatusFilter.cc
+++ b/FWCore/Modules/src/PathStatusFilter.cc
@@ -82,38 +82,32 @@ namespace edm {
 
     class Evaluator {
     public:
-      virtual ~Evaluator() { }
+      virtual ~Evaluator() {}
 
       enum EvaluatorType { Name, Not, And, Or, BeginParen };
       virtual EvaluatorType type() const = 0;
 
-      virtual void setLeft(std::unique_ptr<Evaluator> &&) {}
-      virtual void setRight(std::unique_ptr<Evaluator> &&) {}
+      virtual void setLeft(std::unique_ptr<Evaluator>&&) {}
+      virtual void setRight(std::unique_ptr<Evaluator>&&) {}
 
-      virtual void print(std::ostream & out, unsigned int indentation) const {}
-      virtual void init(ConsumesCollector &) {}
+      virtual void print(std::ostream& out, unsigned int indentation) const {}
+      virtual void init(ConsumesCollector&) {}
       virtual bool evaluate(Event const& event) const { return true; };
     };
 
     class Operand : public Evaluator {
     public:
-      Operand(std::vector<char> const& pathName) :
-        pathName_(pathName.begin(), pathName.end()) {
-      }
+      Operand(std::vector<char> const& pathName) : pathName_(pathName.begin(), pathName.end()) {}
 
       EvaluatorType type() const override { return Name; }
 
-      void print(std::ostream & out, unsigned int indentation) const override {
-        out << std::string( indentation, ' ' ) << pathName_ << "\n";
+      void print(std::ostream& out, unsigned int indentation) const override {
+        out << std::string(indentation, ' ') << pathName_ << "\n";
       }
 
-      void init(ConsumesCollector & iC) override {
-        token_ = iC.consumes<PathStatus>(InputTag(pathName_));
-      }
+      void init(ConsumesCollector& iC) override { token_ = iC.consumes<PathStatus>(InputTag(pathName_)); }
 
-      bool evaluate(Event const& event) const override {
-        return event.get(token_).accept();
-      }
+      bool evaluate(Event const& event) const override { return event.get(token_).accept(); }
 
     private:
       std::string pathName_;
@@ -124,20 +118,16 @@ namespace edm {
     public:
       EvaluatorType type() const override { return Not; }
 
-      void setLeft(std::unique_ptr<Evaluator> && v) override { operand_ = std::move(v); }
+      void setLeft(std::unique_ptr<Evaluator>&& v) override { operand_ = std::move(v); }
 
-      void print(std::ostream & out, unsigned int indentation) const override {
-        out << std::string( indentation, ' ' ) << "not\n";
+      void print(std::ostream& out, unsigned int indentation) const override {
+        out << std::string(indentation, ' ') << "not\n";
         operand_->print(out, indentation + 4);
       }
 
-      void init(ConsumesCollector & iC) override {
-        operand_->init(iC);
-      }
+      void init(ConsumesCollector& iC) override { operand_->init(iC); }
 
-      bool evaluate(Event const& event) const override {
-        return !operand_->evaluate(event);
-      }
+      bool evaluate(Event const& event) const override { return !operand_->evaluate(event); }
 
     private:
       edm::propagate_const<std::unique_ptr<Evaluator>> operand_;
@@ -148,12 +138,12 @@ namespace edm {
     public:
       EvaluatorType type() const override;
 
-      void setLeft(std::unique_ptr<Evaluator> && v) override { left_ = std::move(v); }
-      void setRight(std::unique_ptr<Evaluator> && v) override { right_ = std::move(v); }
+      void setLeft(std::unique_ptr<Evaluator>&& v) override { left_ = std::move(v); }
+      void setRight(std::unique_ptr<Evaluator>&& v) override { right_ = std::move(v); }
 
-      void print(std::ostream & out, unsigned int indentation) const override;
+      void print(std::ostream& out, unsigned int indentation) const override;
 
-      void init(ConsumesCollector & iC) override {
+      void init(ConsumesCollector& iC) override {
         left_->init(iC);
         right_->init(iC);
       }
@@ -169,26 +159,24 @@ namespace edm {
     };
 
     template <>
-    inline Evaluator::EvaluatorType
-    BinaryOperator<std::logical_and<bool>>::type() const { return And; }
+    inline Evaluator::EvaluatorType BinaryOperator<std::logical_and<bool>>::type() const {
+      return And;
+    }
 
     template <>
-    inline Evaluator::EvaluatorType
-    BinaryOperator<std::logical_or<bool>>::type() const { return Or; }
+    inline Evaluator::EvaluatorType BinaryOperator<std::logical_or<bool>>::type() const {
+      return Or;
+    }
 
     template <>
-    void
-    BinaryOperator<std::logical_and<bool>>::print(std::ostream & out,
-                                                  unsigned int indentation) const {
-      out << std::string( indentation, ' ' ) << "and\n";
+    void BinaryOperator<std::logical_and<bool>>::print(std::ostream& out, unsigned int indentation) const {
+      out << std::string(indentation, ' ') << "and\n";
       left_->print(out, indentation + 4);
       right_->print(out, indentation + 4);
     }
     template <>
-    void
-    BinaryOperator<std::logical_or<bool>>::print(std::ostream & out,
-                                                 unsigned int indentation) const {
-      out << std::string( indentation, ' ' ) << "or\n";
+    void BinaryOperator<std::logical_or<bool>>::print(std::ostream& out, unsigned int indentation) const {
+      out << std::string(indentation, ' ') << "or\n";
       left_->print(out, indentation + 4);
       right_->print(out, indentation + 4);
     }
@@ -207,10 +195,7 @@ namespace edm {
     // internet for a description of this algorithm)
     class ShuntingYardAlgorithm {
     public:
-
-      void addPathName(std::vector<char> const& s) {
-        operandStack.push_back(std::make_unique<Operand>(s));
-      }
+      void addPathName(std::vector<char> const& s) { operandStack.push_back(std::make_unique<Operand>(s)); }
 
       void addOperatorNot() {
         if (operatorStack.empty() || operatorStack.back()->type() != Evaluator::Not) {
@@ -267,9 +252,7 @@ namespace edm {
         operatorStack.push_back(std::make_unique<OrOperator>());
       }
 
-      void addBeginParenthesis() {
-        operatorStack.push_back(std::make_unique<BeginParenthesis>());
-      }
+      void addBeginParenthesis() { operatorStack.push_back(std::make_unique<BeginParenthesis>()); }
 
       void addEndParenthesis() {
         while (!operatorStack.empty()) {
@@ -293,7 +276,7 @@ namespace edm {
           // should catch any errors of this type before we get here.
           if (backEvaluator->type() == Evaluator::BeginParen) {
             throw cms::Exception("LogicError")
-              << "Should be impossible to get this error. Contact a Framework developer";
+                << "Should be impossible to get this error. Contact a Framework developer";
           }
           if (backEvaluator->type() == Evaluator::And || backEvaluator->type() == Evaluator::Or) {
             moveBinaryOperator();
@@ -304,8 +287,7 @@ namespace edm {
         // Just a sanity check. The grammar defined for the boost Spirit parser
         // should catch any errors of this type before we get here.
         if (!operatorStack.empty() || operandStack.size() != 1U) {
-          throw cms::Exception("LogicError")
-            << "Should be impossible to get this error. Contact a Framework developer";
+          throw cms::Exception("LogicError") << "Should be impossible to get this error. Contact a Framework developer";
         }
         std::unique_ptr<Evaluator> temp = std::move(operandStack.back());
         operandStack.pop_back();
@@ -321,11 +303,7 @@ namespace edm {
     template <typename Iterator>
     class Grammar : public qi::grammar<Iterator, ascii::space_type> {
     public:
-
-      Grammar(ShuntingYardAlgorithm* algorithm) :
-        Grammar::base_type(expression),
-        algorithm_(algorithm) {
-
+      Grammar(ShuntingYardAlgorithm* algorithm) : Grammar::base_type(expression), algorithm_(algorithm) {
         // setup functors that call into shunting algorithm while parsing the logical expression
         auto addPathName = phoenix::bind(&ShuntingYardAlgorithm::addPathName, algorithm_, qi::_1);
         auto addOperatorNot = phoenix::bind(&ShuntingYardAlgorithm::addOperatorNot, algorithm_);
@@ -337,20 +315,17 @@ namespace edm {
         // Define the syntax allowed in the logical expressions
         pathName = !unaryOperator >> !binaryOperatorTest >> (+qi::char_("a-zA-Z0-9_"))[addPathName];
         binaryOperand = (qi::lit('(')[addBeginParenthesis] >> expression >> qi::lit(')')[addEndParenthesis]) |
-                        (unaryOperator[addOperatorNot] >> binaryOperand) |
-                        pathName;
+                        (unaryOperator[addOperatorNot] >> binaryOperand) | pathName;
         afterOperator = ascii::space | &qi::lit('(') | &qi::eoi;
         unaryOperator = qi::lit("not") >> afterOperator;
         // The only difference in the next two is that one calls a functor and the other does not
-        binaryOperatorTest = (qi::lit("and") >> afterOperator) |
-                             (qi::lit("or") >> afterOperator);
-        binaryOperator = (qi::lit("and") >> afterOperator)[addOperatorAnd] |
-                         (qi::lit("or") >> afterOperator)[addOperatorOr];
+        binaryOperatorTest = (qi::lit("and") >> afterOperator) | (qi::lit("or") >> afterOperator);
+        binaryOperator =
+            (qi::lit("and") >> afterOperator)[addOperatorAnd] | (qi::lit("or") >> afterOperator)[addOperatorOr];
         expression = binaryOperand % binaryOperator;
       }
 
     private:
-
       qi::rule<Iterator> pathName;
       qi::rule<Iterator, ascii::space_type> binaryOperand;
       qi::rule<Iterator> afterOperator;
@@ -361,16 +336,13 @@ namespace edm {
 
       ShuntingYardAlgorithm* algorithm_;
     };
-  }
-
-  PathStatusFilter::PathStatusFilter(ParameterSet const& pset) :
-    evaluator_(nullptr),
-    verbose_(pset.getUntrackedParameter<bool>("verbose")) {
+  }  // namespace pathStatusExpression
 
+  PathStatusFilter::PathStatusFilter(ParameterSet const& pset)
+      : evaluator_(nullptr), verbose_(pset.getUntrackedParameter<bool>("verbose")) {
     std::string const logicalExpression = pset.getParameter<std::string>("logicalExpression");
     if (verbose_) {
-      LogAbsolute("PathStatusFilter") << "PathStatusFilter logicalExpression = "
-                                      << logicalExpression;
+      LogAbsolute("PathStatusFilter") << "PathStatusFilter logicalExpression = " << logicalExpression;
     }
 
     if (logicalExpression.empty()) {
@@ -382,25 +354,23 @@ namespace edm {
     pathStatusExpression::Grammar<std::string::const_iterator> grammar(&shuntingYardAlgorithm);
 
     auto it = logicalExpression.cbegin();
-    if (!qi::phrase_parse(it, logicalExpression.cend(), grammar, ascii::space) ||
-        (it != logicalExpression.cend())) {
-      throw cms::Exception("Configuration")
-        << "Syntax error in logical expression. Here is an example of how\n"
-        << "the syntax should look:\n"
-        << "    \"path1 and not (path2 or not path3)\"\n"
-        << "The expression must contain alternating appearances of operands\n"
-        << "which are path names and binary operators which can be \'and\'\n"
-        << "or \'or\', with a path name at the beginning and end. There\n"
-        << "must be at least one path name. In addition to the alternating\n"
-        << "path names and binary operators, the unary operator \'not\' can\n"
-        << "be inserted before a path name or a begin parenthesis.\n"
-        << "Parentheses are allowed. Parentheses must come in matching pairs.\n"
-        << "Matching begin and end parentheses must contain a complete and\n"
-        << "syntactically correct logical expression. There must be at least\n"
-        << "one space or parenthesis between operators and path names. Extra\n"
-        << "space is ignored and OK. Path names can only contain upper and\n"
-        << "lower case letters, numbers, and underscores. A path name cannot\n"
-        << "be the same as an operator name.\n";
+    if (!qi::phrase_parse(it, logicalExpression.cend(), grammar, ascii::space) || (it != logicalExpression.cend())) {
+      throw cms::Exception("Configuration") << "Syntax error in logical expression. Here is an example of how\n"
+                                            << "the syntax should look:\n"
+                                            << "    \"path1 and not (path2 or not path3)\"\n"
+                                            << "The expression must contain alternating appearances of operands\n"
+                                            << "which are path names and binary operators which can be \'and\'\n"
+                                            << "or \'or\', with a path name at the beginning and end. There\n"
+                                            << "must be at least one path name. In addition to the alternating\n"
+                                            << "path names and binary operators, the unary operator \'not\' can\n"
+                                            << "be inserted before a path name or a begin parenthesis.\n"
+                                            << "Parentheses are allowed. Parentheses must come in matching pairs.\n"
+                                            << "Matching begin and end parentheses must contain a complete and\n"
+                                            << "syntactically correct logical expression. There must be at least\n"
+                                            << "one space or parenthesis between operators and path names. Extra\n"
+                                            << "space is ignored and OK. Path names can only contain upper and\n"
+                                            << "lower case letters, numbers, and underscores. A path name cannot\n"
+                                            << "be the same as an operator name.\n";
     }
 
     evaluator_ = shuntingYardAlgorithm.finish();
@@ -413,14 +383,13 @@ namespace edm {
     evaluator_->init(iC);
   }
 
-  void
-  PathStatusFilter::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void PathStatusFilter::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     desc.add<std::string>("logicalExpression", std::string())
-      ->setComment("Operands are path names. Operators in precedence order "
-                   "\'not\', \'and\', and \'or\'. Parentheses allowed.");
-    desc.addUntracked<bool>("verbose", false)
-      ->setComment("For debugging only");
+        ->setComment(
+            "Operands are path names. Operators in precedence order "
+            "\'not\', \'and\', and \'or\'. Parentheses allowed.");
+    desc.addUntracked<bool>("verbose", false)->setComment("For debugging only");
     descriptions.add("pathStatusFilter", desc);
   }
 
@@ -430,7 +399,7 @@ namespace edm {
     }
     return evaluator_->evaluate(event);
   }
-}
+}  // namespace edm
 
 using edm::PathStatusFilter;
 DEFINE_FWK_MODULE(PathStatusFilter);
diff --git a/FWCore/Modules/src/Prescaler.cc b/FWCore/Modules/src/Prescaler.cc
index 586ad85691328..738d830dd2fbf 100644
--- a/FWCore/Modules/src/Prescaler.cc
+++ b/FWCore/Modules/src/Prescaler.cc
@@ -17,18 +17,14 @@ namespace edm {
 
   private:
     mutable std::atomic<int> count_;
-    int n_; // accept one in n
-    int offset_; // with offset, ie. sequence of events does not have to start at first event
+    int n_;       // accept one in n
+    int offset_;  // with offset, ie. sequence of events does not have to start at first event
   };
 
-  Prescaler::Prescaler(ParameterSet const& ps) :
-    count_(),
-    n_(ps.getParameter<int>("prescaleFactor")),
-    offset_(ps.getParameter<int>("prescaleOffset")) {
-  }
+  Prescaler::Prescaler(ParameterSet const& ps)
+      : count_(), n_(ps.getParameter<int>("prescaleFactor")), offset_(ps.getParameter<int>("prescaleOffset")) {}
 
-  Prescaler::~Prescaler() {
-  }
+  Prescaler::~Prescaler() {}
 
   bool Prescaler::filter(StreamID, Event&, EventSetup const&) const {
     //have to capture the value here since it could change by the time we do the comparision
@@ -36,14 +32,16 @@ namespace edm {
     return count % n_ == offset_ ? true : false;
   }
 
-  void
-  Prescaler::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void Prescaler::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     desc.add<int>("prescaleFactor")->setComment("Accept one event every N events");
-    desc.add<int>("prescaleOffset")->setComment("The first event to accept should be the Mth one. Choose 'prescaleFactor'=1 to accept the first event from the source.");
+    desc.add<int>("prescaleOffset")
+        ->setComment(
+            "The first event to accept should be the Mth one. Choose 'prescaleFactor'=1 to accept the first event from "
+            "the source.");
     descriptions.add("preScaler", desc);
   }
-}
+}  // namespace edm
 
 using edm::Prescaler;
 DEFINE_FWK_MODULE(Prescaler);
diff --git a/FWCore/Modules/src/PrintEventSetupContent.cc b/FWCore/Modules/src/PrintEventSetupContent.cc
index 7f8c8663af825..7714cc0bdbb2d 100644
--- a/FWCore/Modules/src/PrintEventSetupContent.cc
+++ b/FWCore/Modules/src/PrintEventSetupContent.cc
@@ -39,53 +39,52 @@
 //
 
 namespace edm {
-  class PrintEventSetupContent : public one::EDAnalyzer<one::WatchRuns,one::WatchLuminosityBlocks> {
-    public:
-      explicit PrintEventSetupContent(ParameterSet const&);
-      ~PrintEventSetupContent() override;
+  class PrintEventSetupContent : public one::EDAnalyzer<one::WatchRuns, one::WatchLuminosityBlocks> {
+  public:
+    explicit PrintEventSetupContent(ParameterSet const&);
+    ~PrintEventSetupContent() override;
 
-      static void fillDescriptions(ConfigurationDescriptions& descriptions);
+    static void fillDescriptions(ConfigurationDescriptions& descriptions);
 
-    private:
-      void beginJob() override;
+  private:
+    void beginJob() override;
 
-      void analyze(Event const&, EventSetup const&) override;
-      void endJob() override ;
-      void beginRun(Run const&, EventSetup const&) override;
-      void endRun(Run const&, EventSetup const&) override;
-      void beginLuminosityBlock(LuminosityBlock const&, EventSetup const&) override;
-      void endLuminosityBlock(LuminosityBlock const&, EventSetup const&) override;
+    void analyze(Event const&, EventSetup const&) override;
+    void endJob() override;
+    void beginRun(Run const&, EventSetup const&) override;
+    void endRun(Run const&, EventSetup const&) override;
+    void beginLuminosityBlock(LuminosityBlock const&, EventSetup const&) override;
+    void endLuminosityBlock(LuminosityBlock const&, EventSetup const&) override;
 
-      void print(EventSetup const&);
+    void print(EventSetup const&);
 
-      // ----------member data ---------------------------
-      const bool printProviders_;
-      const bool compact_;
-      std::map<eventsetup::EventSetupRecordKey, unsigned long long > cacheIdentifiers_;
-};
+    // ----------member data ---------------------------
+    const bool printProviders_;
+    const bool compact_;
+    std::map<eventsetup::EventSetupRecordKey, unsigned long long> cacheIdentifiers_;
+  };
 
-//
-// constants, enums and typedefs
-//
+  //
+  // constants, enums and typedefs
+  //
 
-//
-// static data member definitions
-//
+  //
+  // static data member definitions
+  //
 
-//
-// constructors and destructor
-//
-  PrintEventSetupContent::PrintEventSetupContent(ParameterSet const& config) :
-      printProviders_(config.getUntrackedParameter<bool>("printProviders")),
-      compact_(config.getUntrackedParameter<bool>("compact"))
-  {
-  //now do what ever initialization is neededEventSetupRecordDataGetter::EventSetupRecordDataGetter(ParameterSet const& iConfig):
-  //  getter = new EventSetupRecordDataGetter::EventSetupRecordDataGetter(iConfig);
+  //
+  // constructors and destructor
+  //
+  PrintEventSetupContent::PrintEventSetupContent(ParameterSet const& config)
+      : printProviders_(config.getUntrackedParameter<bool>("printProviders")),
+        compact_(config.getUntrackedParameter<bool>("compact")) {
+    //now do what ever initialization is neededEventSetupRecordDataGetter::EventSetupRecordDataGetter(ParameterSet const& iConfig):
+    //  getter = new EventSetupRecordDataGetter::EventSetupRecordDataGetter(iConfig);
   }
 
   PrintEventSetupContent::~PrintEventSetupContent() {
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+    // do anything here that needs to be done at desctruction time
+    // (e.g. close files, deallocate resources etc.)
   }
 
   //
@@ -93,31 +92,17 @@ namespace edm {
   //
 
   // ------------ method called to for each event  ------------
-  void
-  PrintEventSetupContent::analyze(Event const&, EventSetup const& iSetup) {
-    print(iSetup);
-  }
+  void PrintEventSetupContent::analyze(Event const&, EventSetup const& iSetup) { print(iSetup); }
 
-  void
-  PrintEventSetupContent::beginRun(Run const&, EventSetup const& iSetup){
-    print(iSetup);
-  }
+  void PrintEventSetupContent::beginRun(Run const&, EventSetup const& iSetup) { print(iSetup); }
 
-  void
-  PrintEventSetupContent::endRun(Run const&, EventSetup const& iSetup){
-  }
+  void PrintEventSetupContent::endRun(Run const&, EventSetup const& iSetup) {}
 
-  void
-  PrintEventSetupContent::beginLuminosityBlock(LuminosityBlock const&, EventSetup const& iSetup){
-    print(iSetup);
-  }
+  void PrintEventSetupContent::beginLuminosityBlock(LuminosityBlock const&, EventSetup const& iSetup) { print(iSetup); }
 
-  void
-  PrintEventSetupContent::endLuminosityBlock(LuminosityBlock const&, EventSetup const& iSetup){
-  }
+  void PrintEventSetupContent::endLuminosityBlock(LuminosityBlock const&, EventSetup const& iSetup) {}
 
-  void
-  PrintEventSetupContent::print (EventSetup const& iSetup) {
+  void PrintEventSetupContent::print(EventSetup const& iSetup) {
     typedef std::vector<eventsetup::EventSetupRecordKey> Records;
     typedef std::vector<eventsetup::DataKey> Data;
 
@@ -126,9 +111,8 @@ namespace edm {
     iSetup.fillAvailableRecordKeys(records);
     std::unique_ptr<LogSystem> msg;
 
-    for(Records::iterator itrecords = records.begin(), itrecordsend = records.end();
-       itrecords != itrecordsend; ++itrecords ) {
-
+    for (Records::iterator itrecords = records.begin(), itrecordsend = records.end(); itrecords != itrecordsend;
+         ++itrecords) {
       auto rec = iSetup.find(*itrecords);
 
       if (rec && cacheIdentifiers_[*itrecords] != rec->cacheIdentifier()) {
@@ -140,7 +124,9 @@ namespace edm {
               msg.reset(new LogSystem("ESContent"));
             else
               *msg << '\n';
-            *msg << "ESContent> " << "record:" << itrecords->name() << " data:" << itdata->type().name() << " '" << itdata->name().value() << "'";
+            *msg << "ESContent> "
+                 << "record:" << itrecords->name() << " data:" << itdata->type().name() << " '"
+                 << itdata->name().value() << "'";
             if (printProviders_) {
               edm::eventsetup::ComponentDescription const* cd = rec->providerDescription(*itdata);
               *msg << " provider:" << cd->type_ << " '" << cd->label_ << "'";
@@ -149,11 +135,17 @@ namespace edm {
         } else {
           if (not msg) {
             msg.reset(new LogSystem("ESContent"));
-            *msg << "Changed Record" << "\n  " << "<datatype>" << " " << "'label' provider: 'provider label' <provider module type>";
+            *msg << "Changed Record"
+                 << "\n  "
+                 << "<datatype>"
+                 << " "
+                 << "'label' provider: 'provider label' <provider module type>";
           }
           *msg << "\n" << itrecords->name();
-          *msg << "\n start: " << rec->validityInterval().first().eventID() << " time: " << rec->validityInterval().first().time().value();
-          *msg << "\n end:   " << rec->validityInterval().last().eventID() << " time: " << rec->validityInterval().last().time().value();
+          *msg << "\n start: " << rec->validityInterval().first().eventID()
+               << " time: " << rec->validityInterval().first().time().value();
+          *msg << "\n end:   " << rec->validityInterval().last().eventID()
+               << " time: " << rec->validityInterval().last().time().value();
           for (Data::iterator itdata = data.begin(), itdataend = data.end(); itdata != itdataend; ++itdata) {
             *msg << "\n  " << itdata->type().name() << " '" << itdata->name().value() << "'";
             if (printProviders_) {
@@ -166,39 +158,35 @@ namespace edm {
     }
   }
 
-   //#ifdef THIS_IS_AN_EVENT_EXAMPLE
-   //   Handle<ExampleData> pIn;
-   //   iEvent.getByLabel("example", pIn);
-   //#endif
+  //#ifdef THIS_IS_AN_EVENT_EXAMPLE
+  //   Handle<ExampleData> pIn;
+  //   iEvent.getByLabel("example", pIn);
+  //#endif
 
-   //#ifdef THIS_IS_AN_EVENTSETUP_EXAMPLE
-   //   ESHandle<SetupData> pSetup;
-   //   iSetup.get<SetupRecord>().get(pSetup);
-   //#endif
+  //#ifdef THIS_IS_AN_EVENTSETUP_EXAMPLE
+  //   ESHandle<SetupData> pSetup;
+  //   iSetup.get<SetupRecord>().get(pSetup);
+  //#endif
 
   // ------------ method called once each job just before starting event loop  ------------
-  void
-  PrintEventSetupContent::beginJob() {
-  }
+  void PrintEventSetupContent::beginJob() {}
 
   // ------------ method called once each job just after ending the event loop  ------------
-  void
-  PrintEventSetupContent::endJob() {
-  }
+  void PrintEventSetupContent::endJob() {}
 
   // ------------ method called once each job for validation  ------------
-  void
-  PrintEventSetupContent::fillDescriptions(ConfigurationDescriptions& descriptions) {
-    descriptions.setComment("Print what data is available in each available EventSetup Record in the job.\n"
-                            "As part of the data is the C++ class type, label and which module makes that data.");
+  void PrintEventSetupContent::fillDescriptions(ConfigurationDescriptions& descriptions) {
+    descriptions.setComment(
+        "Print what data is available in each available EventSetup Record in the job.\n"
+        "As part of the data is the C++ class type, label and which module makes that data.");
     ParameterSetDescription desc;
-    desc.addUntracked<bool>( "compact", false )->setComment(
-      "If 'true' produces a more compact view, similar to the one used by PrintEventSetupDataRetrieval");
-    desc.addUntracked<bool>("printProviders", true)->setComment(
-      "If 'true' also print which ES module provides the data");
+    desc.addUntracked<bool>("compact", false)
+        ->setComment("If 'true' produces a more compact view, similar to the one used by PrintEventSetupDataRetrieval");
+    desc.addUntracked<bool>("printProviders", true)
+        ->setComment("If 'true' also print which ES module provides the data");
     descriptions.add("printEventSetupContent", desc);
   }
-}
+}  // namespace edm
 
 //define this as a plug-in
 using edm::PrintEventSetupContent;
diff --git a/FWCore/Modules/src/PrintEventSetupDataRetrieval.cc b/FWCore/Modules/src/PrintEventSetupDataRetrieval.cc
index f2bbd6449f8b5..557fcf6161bf4 100644
--- a/FWCore/Modules/src/PrintEventSetupDataRetrieval.cc
+++ b/FWCore/Modules/src/PrintEventSetupDataRetrieval.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Services
 // Class  :     PrintEventSetupDataRetrieval
-// 
+//
 // Implementation:
 //     A service which prints which data from the EventSetup have been retrieved since the last time it checked
 //
@@ -27,180 +27,185 @@
 #include "FWCore/Framework/interface/DataKey.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-
 namespace edm {
-   class PrintEventSetupDataRetrieval: public edm::one::EDAnalyzer<edm::one::WatchRuns,edm::one::WatchLuminosityBlocks> {
-   public:
-      PrintEventSetupDataRetrieval(edm::ParameterSet const&);
-      
-      void analyze( edm::Event const&, edm::EventSetup const&) override;
-      
-      void beginRun( edm::Run const&, edm::EventSetup const&) override;
-      void endRun(edm::Run const&, edm::EventSetup const&) override;
-      
-      void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
-      void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
-      
-      static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
-   private:
-      void check(EventSetup const&);
-      // ---------- member data --------------------------------
-      typedef std::map<eventsetup::EventSetupRecordKey, std::pair<unsigned long long, std::map<eventsetup::DataKey,bool> > > RetrievedDataMap;
-      
-      RetrievedDataMap m_retrievedDataMap;
-      std::vector<eventsetup::EventSetupRecordKey> m_recordKeys;
-      const bool m_printProviders;
-      const bool m_checkDuringBeginRun;
-      const bool m_checkDuringBeginLumi;
-      const bool m_checkDuringEvent;
-      
-   };
-//
-// constants, enums and typedefs
-//
-
-//
-// static data member definitions
-//
-
-//
-// constructors and destructor
-//
-   PrintEventSetupDataRetrieval::PrintEventSetupDataRetrieval(const ParameterSet& iPS):
-    m_printProviders(iPS.getUntrackedParameter<bool>("printProviders")),
-    m_checkDuringBeginRun(iPS.getUntrackedParameter<bool>("checkDuringBeginRun")),
-    m_checkDuringBeginLumi(iPS.getUntrackedParameter<bool>("checkDuringBeginLumi")),
-    m_checkDuringEvent(iPS.getUntrackedParameter<bool>("checkDuringEvent"))
-   {
-   }
-
-// PrintEventSetupDataRetrieval::PrintEventSetupDataRetrieval(const PrintEventSetupDataRetrieval& rhs)
-// {
-//    // do actual copying here;
-// }
-
-   //PrintEventSetupDataRetrieval::~PrintEventSetupDataRetrieval()
-   //{
-   //}
-
-   void PrintEventSetupDataRetrieval::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
-      edm::ParameterSetDescription desc;
-      desc.addUntracked<bool>("printProviders",false)->setComment(
-      "If 'true' also print which ES module provides the data");
-      desc.addUntracked<bool>("checkDuringBeginRun",false)->setComment(
-       "If 'true' check for retrieved data during each begin run is processed");
-      desc.addUntracked<bool>("checkDuringBeginLumi",false)->setComment(
-       "If 'true' check for retrieved data during each begin lumi is processed");
-      desc.addUntracked<bool>("checkDuringEvent",true)->setComment(
-       "If 'true' check for retrieved data during an event is processed");
-      descriptions.add("PrintEventSetupDataRetrieval", desc);
-      descriptions.setComment("This analyzer reports when EventSetup data is retrieved by a module in the job.");
-   }
-
-//
-// assignment operators
-//
-// const PrintEventSetupDataRetrieval& PrintEventSetupDataRetrieval::operator=(const PrintEventSetupDataRetrieval& rhs)
-// {
-//   //An exception safe implementation is
-//   PrintEventSetupDataRetrieval temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
+  class PrintEventSetupDataRetrieval
+      : public edm::one::EDAnalyzer<edm::one::WatchRuns, edm::one::WatchLuminosityBlocks> {
+  public:
+    PrintEventSetupDataRetrieval(edm::ParameterSet const&);
+
+    void analyze(edm::Event const&, edm::EventSetup const&) override;
+
+    void beginRun(edm::Run const&, edm::EventSetup const&) override;
+    void endRun(edm::Run const&, edm::EventSetup const&) override;
+
+    void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
+    void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override;
+
+    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
+  private:
+    void check(EventSetup const&);
+    // ---------- member data --------------------------------
+    typedef std::map<eventsetup::EventSetupRecordKey,
+                     std::pair<unsigned long long, std::map<eventsetup::DataKey, bool> > >
+        RetrievedDataMap;
+
+    RetrievedDataMap m_retrievedDataMap;
+    std::vector<eventsetup::EventSetupRecordKey> m_recordKeys;
+    const bool m_printProviders;
+    const bool m_checkDuringBeginRun;
+    const bool m_checkDuringBeginLumi;
+    const bool m_checkDuringEvent;
+  };
+  //
+  // constants, enums and typedefs
+  //
+
+  //
+  // static data member definitions
+  //
+
+  //
+  // constructors and destructor
+  //
+  PrintEventSetupDataRetrieval::PrintEventSetupDataRetrieval(const ParameterSet& iPS)
+      : m_printProviders(iPS.getUntrackedParameter<bool>("printProviders")),
+        m_checkDuringBeginRun(iPS.getUntrackedParameter<bool>("checkDuringBeginRun")),
+        m_checkDuringBeginLumi(iPS.getUntrackedParameter<bool>("checkDuringBeginLumi")),
+        m_checkDuringEvent(iPS.getUntrackedParameter<bool>("checkDuringEvent")) {}
+
+  // PrintEventSetupDataRetrieval::PrintEventSetupDataRetrieval(const PrintEventSetupDataRetrieval& rhs)
+  // {
+  //    // do actual copying here;
+  // }
+
+  //PrintEventSetupDataRetrieval::~PrintEventSetupDataRetrieval()
+  //{
+  //}
+
+  void PrintEventSetupDataRetrieval::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+    edm::ParameterSetDescription desc;
+    desc.addUntracked<bool>("printProviders", false)
+        ->setComment("If 'true' also print which ES module provides the data");
+    desc.addUntracked<bool>("checkDuringBeginRun", false)
+        ->setComment("If 'true' check for retrieved data during each begin run is processed");
+    desc.addUntracked<bool>("checkDuringBeginLumi", false)
+        ->setComment("If 'true' check for retrieved data during each begin lumi is processed");
+    desc.addUntracked<bool>("checkDuringEvent", true)
+        ->setComment("If 'true' check for retrieved data during an event is processed");
+    descriptions.add("PrintEventSetupDataRetrieval", desc);
+    descriptions.setComment("This analyzer reports when EventSetup data is retrieved by a module in the job.");
+  }
+
+  //
+  // assignment operators
+  //
+  // const PrintEventSetupDataRetrieval& PrintEventSetupDataRetrieval::operator=(const PrintEventSetupDataRetrieval& rhs)
+  // {
+  //   //An exception safe implementation is
+  //   PrintEventSetupDataRetrieval temp(rhs);
+  //   swap(rhs);
+  //
+  //   return *this;
+  // }
+
+  //
+  // member functions
+  //
+  void PrintEventSetupDataRetrieval::analyze(Event const&, EventSetup const& iES) {
+    if (m_checkDuringEvent) {
+      check(iES);
+    }
+  }
+
+  void PrintEventSetupDataRetrieval::beginRun(Run const&, EventSetup const& iES) {
+    if (m_checkDuringBeginRun) {
+      check(iES);
+    }
+  }
+
+  void PrintEventSetupDataRetrieval::endRun(Run const&, EventSetup const&) {}
+
+  void PrintEventSetupDataRetrieval::beginLuminosityBlock(LuminosityBlock const&, EventSetup const& iES) {
+    if (m_checkDuringBeginLumi) {
+      check(iES);
+    }
+  }
+
+  void PrintEventSetupDataRetrieval::endLuminosityBlock(LuminosityBlock const&, EventSetup const&) {}
+
+  void PrintEventSetupDataRetrieval::check(EventSetup const& iES) {
+    //std::cout <<"postProcessEvent"<<std::endl;
+    m_recordKeys.clear();
+    iES.fillAvailableRecordKeys(m_recordKeys);
+
+    std::unique_ptr<LogSystem> msg;
+    for (std::vector<eventsetup::EventSetupRecordKey>::const_iterator it = m_recordKeys.begin(),
+                                                                      itEnd = m_recordKeys.end();
+         it != itEnd;
+         ++it) {
+      //std::cout <<"  "<<it->name()<<std::endl;
+      auto r = iES.find(*it);
+      assert(r);
+
+      RetrievedDataMap::iterator itRetrievedData = m_retrievedDataMap.find(*it);
+      if (itRetrievedData == m_retrievedDataMap.end()) {
+        itRetrievedData =
+            m_retrievedDataMap
+                .insert(std::make_pair(*it, std::pair<unsigned long long, std::map<eventsetup::DataKey, bool> >()))
+                .first;
+        itRetrievedData->second.first = r->cacheIdentifier();
+        std::vector<eventsetup::DataKey> keys;
+        r->fillRegisteredDataKeys(keys);
+        for (std::vector<eventsetup::DataKey>::const_iterator itData = keys.begin(), itDataEnd = keys.end();
+             itData != itDataEnd;
+             ++itData) {
+          itRetrievedData->second.second.insert(std::make_pair(*itData, false));
+        }
+      }
+      RetrievedDataMap::value_type& retrievedData = *itRetrievedData;
+      if (itRetrievedData->second.first != r->cacheIdentifier()) {
+        itRetrievedData->second.first = r->cacheIdentifier();
+        for (std::map<eventsetup::DataKey, bool>::iterator itDatum = retrievedData.second.second.begin(),
+                                                           itDatumEnd = retrievedData.second.second.end();
+             itDatum != itDatumEnd;
+             ++itDatum) {
+          itDatum->second = false;
+        }
+      }
 
-//
-// member functions
-//
-   void 
-   PrintEventSetupDataRetrieval::analyze(Event const&, EventSetup const& iES) {
-      if(m_checkDuringEvent) { check(iES); }
-   }
-
-   void 
-   PrintEventSetupDataRetrieval::beginRun(Run const&, EventSetup const& iES) {
-      if(m_checkDuringBeginRun) { check(iES); }
-   }
-
-   void
-   PrintEventSetupDataRetrieval::endRun(Run const&, EventSetup const&) {
-   }
-
-   void
-   PrintEventSetupDataRetrieval::beginLuminosityBlock(LuminosityBlock const&, EventSetup const& iES) {
-      if(m_checkDuringBeginLumi) { check(iES); }
-   }
-
-   void
-   PrintEventSetupDataRetrieval::endLuminosityBlock(LuminosityBlock const&, EventSetup const&) {
-   }
-
-   void PrintEventSetupDataRetrieval::check(EventSetup const& iES) {
-      //std::cout <<"postProcessEvent"<<std::endl;
-      m_recordKeys.clear();
-      iES.fillAvailableRecordKeys(m_recordKeys);
-      
-      std::unique_ptr<LogSystem> msg;
-      for(std::vector<eventsetup::EventSetupRecordKey>::const_iterator it = m_recordKeys.begin(), itEnd = m_recordKeys.end();
-          it != itEnd;
-          ++it) {
-         //std::cout <<"  "<<it->name()<<std::endl;
-         auto r = iES.find(*it);
-         assert(r);
-         
-         RetrievedDataMap::iterator itRetrievedData =  m_retrievedDataMap.find(*it);
-         if(itRetrievedData == m_retrievedDataMap.end()) {
-            itRetrievedData = m_retrievedDataMap.insert(std::make_pair(*it,std::pair<unsigned long long, std::map<eventsetup::DataKey,bool> >())).first;
-            itRetrievedData->second.first = r->cacheIdentifier();
-            std::vector<eventsetup::DataKey> keys;
-            r->fillRegisteredDataKeys(keys);
-            for(std::vector<eventsetup::DataKey>::const_iterator itData = keys.begin(), itDataEnd = keys.end();
-                itData != itDataEnd;
-                ++itData) {
-               itRetrievedData->second.second.insert(std::make_pair(*itData,false));
-            }
-         }
-         RetrievedDataMap::value_type& retrievedData = *itRetrievedData;
-         if(itRetrievedData->second.first != r->cacheIdentifier()) {
-            itRetrievedData->second.first = r->cacheIdentifier();
-            for(std::map<eventsetup::DataKey,bool>::iterator itDatum = retrievedData.second.second.begin(), itDatumEnd = retrievedData.second.second.end();
-                itDatum != itDatumEnd;
-                ++itDatum) {
-               itDatum->second = false;
-            }
-         }
-         
-         for(std::map<eventsetup::DataKey,bool>::iterator itDatum = retrievedData.second.second.begin(), itDatumEnd = retrievedData.second.second.end();
-            itDatum != itDatumEnd;
-            ++itDatum) {
-            bool wasGotten = r->wasGotten(itDatum->first);
-            if (wasGotten != itDatum->second) {
-               if (not msg)
-                  msg.reset(new LogSystem("ESContent"));
-               else
-                  *msg << "\n";
-               itDatum->second = wasGotten;
-               *msg << "Retrieved> record:" << it->name() << " data:" << itDatum->first.type().name() << " '" << itDatum->first.name().value() << "'";
-               if (m_printProviders) {
-                  const edm::eventsetup::ComponentDescription* d = r->providerDescription(itDatum->first);
-                  assert(nullptr != d);
-                  *msg << " provider:" << d->type_ << " '" << d->label_ << "'";
-               }
-            }
-         }
+      for (std::map<eventsetup::DataKey, bool>::iterator itDatum = retrievedData.second.second.begin(),
+                                                         itDatumEnd = retrievedData.second.second.end();
+           itDatum != itDatumEnd;
+           ++itDatum) {
+        bool wasGotten = r->wasGotten(itDatum->first);
+        if (wasGotten != itDatum->second) {
+          if (not msg)
+            msg.reset(new LogSystem("ESContent"));
+          else
+            *msg << "\n";
+          itDatum->second = wasGotten;
+          *msg << "Retrieved> record:" << it->name() << " data:" << itDatum->first.type().name() << " '"
+               << itDatum->first.name().value() << "'";
+          if (m_printProviders) {
+            const edm::eventsetup::ComponentDescription* d = r->providerDescription(itDatum->first);
+            assert(nullptr != d);
+            *msg << " provider:" << d->type_ << " '" << d->label_ << "'";
+          }
+        }
       }
-   }
+    }
+  }
 
-//
-// const member functions
-//
+  //
+  // const member functions
+  //
 
-//
-// static member functions
-//
-}
+  //
+  // static member functions
+  //
+}  // namespace edm
 
 //define this as a plug-in
 using edm::PrintEventSetupDataRetrieval;
 DEFINE_FWK_MODULE(PrintEventSetupDataRetrieval);
-
diff --git a/FWCore/Modules/src/ProvenanceCheckerOutputModule.cc b/FWCore/Modules/src/ProvenanceCheckerOutputModule.cc
index 98188c67e10cb..d125058a8a321 100644
--- a/FWCore/Modules/src/ProvenanceCheckerOutputModule.cc
+++ b/FWCore/Modules/src/ProvenanceCheckerOutputModule.cc
@@ -22,181 +22,172 @@
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-
 // user include files
 
 namespace edm {
 
-   class ModuleCallingContext;
-   class ParameterSet;
-
-   class ProvenanceCheckerOutputModule : public OutputModule {
-   public:
-      // We do not take ownership of passed stream.
-      explicit ProvenanceCheckerOutputModule(ParameterSet const& pset);
-      ~ProvenanceCheckerOutputModule() override;
-      static void fillDescriptions(ConfigurationDescriptions& descriptions);
-
-   private:
-      void write(EventForOutput const& e) override;
-      void writeLuminosityBlock(LuminosityBlockForOutput const&) override {}
-      void writeRun(RunForOutput const&) override {}
-   };
-
-
-//
-// constants, enums and typedefs
-//
-
-//
-// static data member definitions
-//
-
-//
-// constructors and destructor
-//
-   ProvenanceCheckerOutputModule::ProvenanceCheckerOutputModule(ParameterSet const& pset) :
-   OutputModule(pset)
-   {
-   }
-
-// ProvenanceCheckerOutputModule::ProvenanceCheckerOutputModule(ProvenanceCheckerOutputModule const& rhs)
-// {
-//    // do actual copying here;
-// }
-
-   ProvenanceCheckerOutputModule::~ProvenanceCheckerOutputModule()
-   {
-   }
-
-//
-// assignment operators
-//
-// ProvenanceCheckerOutputModule const& ProvenanceCheckerOutputModule::operator=(ProvenanceCheckerOutputModule const& rhs)
-// {
-//   //An exception safe implementation is
-//   ProvenanceCheckerOutputModule temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
-
-   namespace {
-     void markAncestors(EventForOutput const& e,
-                             ProductProvenance const& iInfo,
-                             std::map<BranchID, bool>& oMap,
-                             std::set<BranchID>& oMapperMissing) {
-       for(BranchID const id : iInfo.parentage().parents()) {
-         //Don't look for parents if we've previously looked at the parents
-         if(oMap.find(id) == oMap.end()) {
-            //use side effect of calling operator[] which is if the item isn't there it will add it as 'false'
-            oMap[id];
-            ProductProvenance const* pInfo = e.getProvenance(id).productProvenance();
-            if(pInfo) {
-               markAncestors(e, *pInfo, oMap, oMapperMissing);
-            } else {
-               oMapperMissing.insert(id);
-            }
-         }
-       }
-     }
-   }
-
-   void
-   ProvenanceCheckerOutputModule::write(EventForOutput const& e) {
-      //check ProductProvenance's parents to see if they are in the ProductProvenance list
-
-      std::map<BranchID, bool> seenParentInPrincipal;
-      std::set<BranchID> missingFromMapper;
-      std::set<BranchID> missingProductProvenance;
-
-      std::map<BranchID, const BranchDescription*> idToBranchDescriptions;
-      for(auto const product : keptProducts()[InEvent]) {
-        BranchDescription const* branchDescription = product.first; 
-        BranchID branchID = branchDescription->branchID();
-        idToBranchDescriptions[branchID] = branchDescription;
-        TypeID const& tid(branchDescription->unwrappedTypeID());
-        EDGetToken const& token = product.second;
-        BasicHandle bh = e.getByToken(token, tid);
-             bool cannotFindProductProvenance=false;
-             if(!(bh.provenance() and bh.provenance()->productProvenance())) {
-                missingProductProvenance.insert(branchID);
-                cannotFindProductProvenance=true;
-             }
-             ProductProvenance const* pInfo = e.getProvenance(branchID).productProvenance();
-             if(!pInfo) {
-                missingFromMapper.insert(branchID);
-                continue;
-             }
-             if(cannotFindProductProvenance) {
-                continue;
-             }
-             markAncestors(e, *(bh.provenance()->productProvenance()), seenParentInPrincipal, missingFromMapper);
-            seenParentInPrincipal[branchID] = true;
+  class ModuleCallingContext;
+  class ParameterSet;
+
+  class ProvenanceCheckerOutputModule : public OutputModule {
+  public:
+    // We do not take ownership of passed stream.
+    explicit ProvenanceCheckerOutputModule(ParameterSet const& pset);
+    ~ProvenanceCheckerOutputModule() override;
+    static void fillDescriptions(ConfigurationDescriptions& descriptions);
+
+  private:
+    void write(EventForOutput const& e) override;
+    void writeLuminosityBlock(LuminosityBlockForOutput const&) override {}
+    void writeRun(RunForOutput const&) override {}
+  };
+
+  //
+  // constants, enums and typedefs
+  //
+
+  //
+  // static data member definitions
+  //
+
+  //
+  // constructors and destructor
+  //
+  ProvenanceCheckerOutputModule::ProvenanceCheckerOutputModule(ParameterSet const& pset) : OutputModule(pset) {}
+
+  // ProvenanceCheckerOutputModule::ProvenanceCheckerOutputModule(ProvenanceCheckerOutputModule const& rhs)
+  // {
+  //    // do actual copying here;
+  // }
+
+  ProvenanceCheckerOutputModule::~ProvenanceCheckerOutputModule() {}
+
+  //
+  // assignment operators
+  //
+  // ProvenanceCheckerOutputModule const& ProvenanceCheckerOutputModule::operator=(ProvenanceCheckerOutputModule const& rhs)
+  // {
+  //   //An exception safe implementation is
+  //   ProvenanceCheckerOutputModule temp(rhs);
+  //   swap(rhs);
+  //
+  //   return *this;
+  // }
+
+  namespace {
+    void markAncestors(EventForOutput const& e,
+                       ProductProvenance const& iInfo,
+                       std::map<BranchID, bool>& oMap,
+                       std::set<BranchID>& oMapperMissing) {
+      for (BranchID const id : iInfo.parentage().parents()) {
+        //Don't look for parents if we've previously looked at the parents
+        if (oMap.find(id) == oMap.end()) {
+          //use side effect of calling operator[] which is if the item isn't there it will add it as 'false'
+          oMap[id];
+          ProductProvenance const* pInfo = e.getProvenance(id).productProvenance();
+          if (pInfo) {
+            markAncestors(e, *pInfo, oMap, oMapperMissing);
+          } else {
+            oMapperMissing.insert(id);
+          }
+        }
       }
-
-      //Determine what BranchIDs are in the product registry
-      Service<ConstProductRegistry> reg;
-      ProductRegistry::ProductList const& prodList = reg->productList();
-      std::set<BranchID> branchesInReg;
-      for(auto const& product : prodList) {
-         branchesInReg.insert(product.second.branchID());
-         idToBranchDescriptions[product.second.branchID()] = &product.second;
+    }
+  }  // namespace
+
+  void ProvenanceCheckerOutputModule::write(EventForOutput const& e) {
+    //check ProductProvenance's parents to see if they are in the ProductProvenance list
+
+    std::map<BranchID, bool> seenParentInPrincipal;
+    std::set<BranchID> missingFromMapper;
+    std::set<BranchID> missingProductProvenance;
+
+    std::map<BranchID, const BranchDescription*> idToBranchDescriptions;
+    for (auto const product : keptProducts()[InEvent]) {
+      BranchDescription const* branchDescription = product.first;
+      BranchID branchID = branchDescription->branchID();
+      idToBranchDescriptions[branchID] = branchDescription;
+      TypeID const& tid(branchDescription->unwrappedTypeID());
+      EDGetToken const& token = product.second;
+      BasicHandle bh = e.getByToken(token, tid);
+      bool cannotFindProductProvenance = false;
+      if (!(bh.provenance() and bh.provenance()->productProvenance())) {
+        missingProductProvenance.insert(branchID);
+        cannotFindProductProvenance = true;
       }
-
-      std::set<BranchID> missingFromReg;
-      for(auto const& item : seenParentInPrincipal) {
-         if(branchesInReg.find(item.first) == branchesInReg.end()) {
-            missingFromReg.insert(item.first);
-         }
+      ProductProvenance const* pInfo = e.getProvenance(branchID).productProvenance();
+      if (!pInfo) {
+        missingFromMapper.insert(branchID);
+        continue;
       }
-
-      if(!missingFromMapper.empty()) {
-         LogError("ProvenanceChecker") << "Missing the following BranchIDs from ProductProvenanceRetriever\n";
-         for(std::set<BranchID>::iterator it = missingFromMapper.begin(), itEnd = missingFromMapper.end();
-             it != itEnd;
-             ++it) {
-            LogProblem("ProvenanceChecker") << *it<<" "<<*(idToBranchDescriptions[*it]);
-         }
+      if (cannotFindProductProvenance) {
+        continue;
       }
-
-      if(!missingProductProvenance.empty()) {
-         LogError("ProvenanceChecker") << "The ProductResolvers for the following BranchIDs have no ProductProvenance\n";
-         for(std::set<BranchID>::iterator it = missingProductProvenance.begin(), itEnd = missingProductProvenance.end();
-             it != itEnd;
-             ++it) {
-            LogProblem("ProvenanceChecker") << *it<<" "<<*(idToBranchDescriptions[*it]);
-         }
+      markAncestors(e, *(bh.provenance()->productProvenance()), seenParentInPrincipal, missingFromMapper);
+      seenParentInPrincipal[branchID] = true;
+    }
+
+    //Determine what BranchIDs are in the product registry
+    Service<ConstProductRegistry> reg;
+    ProductRegistry::ProductList const& prodList = reg->productList();
+    std::set<BranchID> branchesInReg;
+    for (auto const& product : prodList) {
+      branchesInReg.insert(product.second.branchID());
+      idToBranchDescriptions[product.second.branchID()] = &product.second;
+    }
+
+    std::set<BranchID> missingFromReg;
+    for (auto const& item : seenParentInPrincipal) {
+      if (branchesInReg.find(item.first) == branchesInReg.end()) {
+        missingFromReg.insert(item.first);
       }
+    }
 
-      if(!missingFromReg.empty()) {
-         LogError("ProvenanceChecker") << "Missing the following BranchIDs from ProductRegistry\n";
-         for(auto const& item : missingFromReg) {
-            LogProblem("ProvenanceChecker") << item << " " << *(idToBranchDescriptions[item]);
-         }
+    if (!missingFromMapper.empty()) {
+      LogError("ProvenanceChecker") << "Missing the following BranchIDs from ProductProvenanceRetriever\n";
+      for (std::set<BranchID>::iterator it = missingFromMapper.begin(), itEnd = missingFromMapper.end(); it != itEnd;
+           ++it) {
+        LogProblem("ProvenanceChecker") << *it << " " << *(idToBranchDescriptions[*it]);
+      }
+    }
+
+    if (!missingProductProvenance.empty()) {
+      LogError("ProvenanceChecker") << "The ProductResolvers for the following BranchIDs have no ProductProvenance\n";
+      for (std::set<BranchID>::iterator it = missingProductProvenance.begin(), itEnd = missingProductProvenance.end();
+           it != itEnd;
+           ++it) {
+        LogProblem("ProvenanceChecker") << *it << " " << *(idToBranchDescriptions[*it]);
       }
+    }
 
-      if(!missingFromMapper.empty() || !missingProductProvenance.empty() || !missingFromReg.empty()) {
-         throw cms::Exception("ProvenanceError")
-         << (!missingFromMapper.empty() ? "Having missing ancestors from ProductProvenanceRetriever.\n" : "")
-         << (!missingProductProvenance.empty() ? " Have missing ProductProvenance's from ProductResolver in Event.\n" : "")
-         << (!missingFromReg.empty() ? " Have missing info from ProductRegistry.\n" : "");
+    if (!missingFromReg.empty()) {
+      LogError("ProvenanceChecker") << "Missing the following BranchIDs from ProductRegistry\n";
+      for (auto const& item : missingFromReg) {
+        LogProblem("ProvenanceChecker") << item << " " << *(idToBranchDescriptions[item]);
       }
-   }
+    }
+
+    if (!missingFromMapper.empty() || !missingProductProvenance.empty() || !missingFromReg.empty()) {
+      throw cms::Exception("ProvenanceError")
+          << (!missingFromMapper.empty() ? "Having missing ancestors from ProductProvenanceRetriever.\n" : "")
+          << (!missingProductProvenance.empty() ? " Have missing ProductProvenance's from ProductResolver in Event.\n"
+                                                : "")
+          << (!missingFromReg.empty() ? " Have missing info from ProductRegistry.\n" : "");
+    }
+  }
 
-//
-// const member functions
-//
+  //
+  // const member functions
+  //
 
-//
-// static member functions
-//
-  void
-  ProvenanceCheckerOutputModule::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  //
+  // static member functions
+  //
+  void ProvenanceCheckerOutputModule::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     OutputModule::fillDescription(desc);
     descriptions.add("provenanceChecker", desc);
   }
-}
+}  // namespace edm
 using edm::ProvenanceCheckerOutputModule;
 DEFINE_FWK_MODULE(ProvenanceCheckerOutputModule);
diff --git a/FWCore/Modules/src/RunLumiEventChecker.cc b/FWCore/Modules/src/RunLumiEventChecker.cc
index cb73a62e4211b..e1da77f4fcd1c 100644
--- a/FWCore/Modules/src/RunLumiEventChecker.cc
+++ b/FWCore/Modules/src/RunLumiEventChecker.cc
@@ -41,32 +41,33 @@
 //
 namespace rlec {
   struct Cache {};
-}
+}  // namespace rlec
 
-class RunLumiEventChecker : public edm::global::EDAnalyzer<edm::RunCache<rlec::Cache>, edm::LuminosityBlockCache<rlec::Cache>> {
+class RunLumiEventChecker
+    : public edm::global::EDAnalyzer<edm::RunCache<rlec::Cache>, edm::LuminosityBlockCache<rlec::Cache>> {
 public:
-   explicit RunLumiEventChecker(edm::ParameterSet const&);
-   ~RunLumiEventChecker() override;
-    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+  explicit RunLumiEventChecker(edm::ParameterSet const&);
+  ~RunLumiEventChecker() override;
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
 private:
-   void beginJob() override;
-   void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const override;
-   void endJob() override;
-
-   std::shared_ptr<rlec::Cache> globalBeginRun(edm::Run const& run, edm::EventSetup const& es) const override;
-   void globalEndRun(edm::Run const& run, edm::EventSetup const& es) const override;
-   
-   std::shared_ptr<rlec::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& es) const override;
-   void globalEndLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& es) const override;
-
-   void check(edm::EventID const& iID, bool isEvent) const;
-   
-   // ----------member data ---------------------------
-   std::vector<edm::EventID> ids_;
-   mutable std::atomic<unsigned int> index_;
-   bool unorderedEvents_;
-   
+  void beginJob() override;
+  void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const override;
+  void endJob() override;
+
+  std::shared_ptr<rlec::Cache> globalBeginRun(edm::Run const& run, edm::EventSetup const& es) const override;
+  void globalEndRun(edm::Run const& run, edm::EventSetup const& es) const override;
+
+  std::shared_ptr<rlec::Cache> globalBeginLuminosityBlock(edm::LuminosityBlock const& lumi,
+                                                          edm::EventSetup const& es) const override;
+  void globalEndLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& es) const override;
+
+  void check(edm::EventID const& iID, bool isEvent) const;
+
+  // ----------member data ---------------------------
+  std::vector<edm::EventID> ids_;
+  mutable std::atomic<unsigned int> index_;
+  bool unorderedEvents_;
 };
 
 //
@@ -80,89 +81,80 @@ class RunLumiEventChecker : public edm::global::EDAnalyzer<edm::RunCache<rlec::C
 //
 // constructors and destructor
 //
-RunLumiEventChecker::RunLumiEventChecker(edm::ParameterSet const& iConfig) :
-  ids_(iConfig.getUntrackedParameter<std::vector<edm::EventID> >("eventSequence")),
-  index_(0),
-  unorderedEvents_(iConfig.getUntrackedParameter<bool>("unorderedEvents"))
-{
-   //now do what ever initialization is needed
+RunLumiEventChecker::RunLumiEventChecker(edm::ParameterSet const& iConfig)
+    : ids_(iConfig.getUntrackedParameter<std::vector<edm::EventID>>("eventSequence")),
+      index_(0),
+      unorderedEvents_(iConfig.getUntrackedParameter<bool>("unorderedEvents")) {
+  //now do what ever initialization is needed
 }
 
-
 RunLumiEventChecker::~RunLumiEventChecker() {
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
 //
 // member functions
 //
 
-void
-RunLumiEventChecker::check(edm::EventID const& iEventID, bool iIsEvent) const {
-   if(index_ >= ids_.size()) {
-      throw cms::Exception("TooManyEvents") << "Was passes " << ids_.size() << " EventIDs but have processed more events than that\n";
-   }
-   if(unorderedEvents_) {
-     auto itFound =std::find(ids_.begin(),ids_.end(), iEventID);
-     if(itFound == ids_.end()) {
-       throw cms::Exception("UnexpecedEvent") <<"The event "<<iEventID<<" was not expected.";
-     }
-   } else {
-     if(iEventID  != ids_[index_]) {
-        throw cms::Exception("WrongEvent") << "Was expecting event " << ids_[index_] << " but was given " << iEventID << "\n";
-     }
-   }
-   ++index_;
+void RunLumiEventChecker::check(edm::EventID const& iEventID, bool iIsEvent) const {
+  if (index_ >= ids_.size()) {
+    throw cms::Exception("TooManyEvents")
+        << "Was passes " << ids_.size() << " EventIDs but have processed more events than that\n";
+  }
+  if (unorderedEvents_) {
+    auto itFound = std::find(ids_.begin(), ids_.end(), iEventID);
+    if (itFound == ids_.end()) {
+      throw cms::Exception("UnexpecedEvent") << "The event " << iEventID << " was not expected.";
+    }
+  } else {
+    if (iEventID != ids_[index_]) {
+      throw cms::Exception("WrongEvent") << "Was expecting event " << ids_[index_] << " but was given " << iEventID
+                                         << "\n";
+    }
+  }
+  ++index_;
 }
 
 // ------------ method called to for each event  ------------
-void
-RunLumiEventChecker::analyze(edm::StreamID, edm::Event const& iEvent, edm::EventSetup const&) const {
-   check(iEvent.id(), true);
+void RunLumiEventChecker::analyze(edm::StreamID, edm::Event const& iEvent, edm::EventSetup const&) const {
+  check(iEvent.id(), true);
 }
 
-std::shared_ptr<rlec::Cache>
-RunLumiEventChecker::globalBeginRun(edm::Run const& run, edm::EventSetup const&) const {
-   check(edm::EventID(run.id().run(), 0, 0), false);
-   return std::shared_ptr<rlec::Cache>{};
+std::shared_ptr<rlec::Cache> RunLumiEventChecker::globalBeginRun(edm::Run const& run, edm::EventSetup const&) const {
+  check(edm::EventID(run.id().run(), 0, 0), false);
+  return std::shared_ptr<rlec::Cache>{};
 }
-void 
-RunLumiEventChecker::globalEndRun(edm::Run const& run, edm::EventSetup const&) const {
-   check(edm::EventID(run.id().run(), 0, 0), false);   
+void RunLumiEventChecker::globalEndRun(edm::Run const& run, edm::EventSetup const&) const {
+  check(edm::EventID(run.id().run(), 0, 0), false);
 }
 
-std::shared_ptr<rlec::Cache>
-RunLumiEventChecker::globalBeginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const&) const {
-   check(edm::EventID(lumi.id().run(), lumi.id().luminosityBlock(), 0), false);   
-   return std::shared_ptr<rlec::Cache>{};
+std::shared_ptr<rlec::Cache> RunLumiEventChecker::globalBeginLuminosityBlock(edm::LuminosityBlock const& lumi,
+                                                                             edm::EventSetup const&) const {
+  check(edm::EventID(lumi.id().run(), lumi.id().luminosityBlock(), 0), false);
+  return std::shared_ptr<rlec::Cache>{};
 }
 
-void 
-RunLumiEventChecker::globalEndLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const&) const {
-   check(edm::EventID(lumi.id().run(), lumi.id().luminosityBlock(), 0), false);   
+void RunLumiEventChecker::globalEndLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const&) const {
+  check(edm::EventID(lumi.id().run(), lumi.id().luminosityBlock(), 0), false);
 }
 
-
 // ------------ method called once each job just before starting event loop  ------------
-void
-RunLumiEventChecker::beginJob() {
-}
+void RunLumiEventChecker::beginJob() {}
 
 // ------------ method called once each job just after ending the event loop  ------------
-void
-RunLumiEventChecker::endJob() {
-   if(index_ != ids_.size()) {
-      throw cms::Exception("WrongNumberOfEvents")<<"Saw "<<index_<<" events but was supposed to see "<<ids_.size()<<"\n";
-   }
+void RunLumiEventChecker::endJob() {
+  if (index_ != ids_.size()) {
+    throw cms::Exception("WrongNumberOfEvents")
+        << "Saw " << index_ << " events but was supposed to see " << ids_.size() << "\n";
+  }
 }
 
 // ------------ method called once each job for validation
-void
-RunLumiEventChecker::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+void RunLumiEventChecker::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
-  desc.addUntracked<std::vector<edm::EventID> >("eventSequence");
-  desc.addUntracked<bool>("unorderedEvents",false);
+  desc.addUntracked<std::vector<edm::EventID>>("eventSequence");
+  desc.addUntracked<bool>("unorderedEvents", false);
   descriptions.add("runLumiEventIDChecker", desc);
 }
 
diff --git a/FWCore/Modules/src/SwitchProducer.cc b/FWCore/Modules/src/SwitchProducer.cc
index ec4ec9e19a990..2a6281960c1ee 100644
--- a/FWCore/Modules/src/SwitchProducer.cc
+++ b/FWCore/Modules/src/SwitchProducer.cc
@@ -12,11 +12,11 @@ namespace edm {
    * - Create the consumes() links to the chosen case to make the prefetching work correclty
    * - Forward the produces() information to create proper BranchDescription objects
    */
-  class SwitchProducer: public global::EDProducer<> {
+  class SwitchProducer : public global::EDProducer<> {
   public:
     explicit SwitchProducer(ParameterSet const& iConfig);
     ~SwitchProducer() override = default;
-     static void fillDescriptions(ConfigurationDescriptions& descriptions);
+    static void fillDescriptions(ConfigurationDescriptions& descriptions);
     void produce(StreamID, Event& e, EventSetup const& c) const final {}
   };
 
@@ -24,20 +24,22 @@ namespace edm {
     auto const& moduleLabel = iConfig.getParameter<std::string>("@module_label");
     auto const& chosenLabel = iConfig.getUntrackedParameter<std::string>("@chosen_case");
     callWhenNewProductsRegistered([=](edm::BranchDescription const& iBranch) {
-        if(iBranch.moduleLabel() == chosenLabel) {
-          if(iBranch.branchType() != InEvent) {
-            throw Exception(errors::UnimplementedFeature) << "SwitchProducer does not support non-event branches. Got " << iBranch.branchType() << " for SwitchProducer with label " << moduleLabel << " whose chosen case is " << chosenLabel << ".";
-          }
-
-          // With consumes, create the connection to the chosen case EDProducer for prefetching
-          this->consumes(edm::TypeToGet{iBranch.unwrappedTypeID(),PRODUCT_TYPE},
-                         edm::InputTag{iBranch.moduleLabel(), iBranch.productInstanceName(), iBranch.processName()});
-          // With produces, create a producer-like BranchDescription
-          // early-enough for it to be flagged as non-OnDemand in case
-          // the SwithcProducer is on a Path
-          this->produces(iBranch.unwrappedTypeID(), iBranch.productInstanceName()).setSwitchAlias(iBranch.moduleLabel());
+      if (iBranch.moduleLabel() == chosenLabel) {
+        if (iBranch.branchType() != InEvent) {
+          throw Exception(errors::UnimplementedFeature)
+              << "SwitchProducer does not support non-event branches. Got " << iBranch.branchType()
+              << " for SwitchProducer with label " << moduleLabel << " whose chosen case is " << chosenLabel << ".";
         }
-      });
+
+        // With consumes, create the connection to the chosen case EDProducer for prefetching
+        this->consumes(edm::TypeToGet{iBranch.unwrappedTypeID(), PRODUCT_TYPE},
+                       edm::InputTag{iBranch.moduleLabel(), iBranch.productInstanceName(), iBranch.processName()});
+        // With produces, create a producer-like BranchDescription
+        // early-enough for it to be flagged as non-OnDemand in case
+        // the SwithcProducer is on a Path
+        this->produces(iBranch.unwrappedTypeID(), iBranch.productInstanceName()).setSwitchAlias(iBranch.moduleLabel());
+      }
+    });
   }
 
   void SwitchProducer::fillDescriptions(ConfigurationDescriptions& descriptions) {
@@ -46,7 +48,7 @@ namespace edm {
     desc.addUntracked<std::string>("@chosen_case");
     descriptions.addDefault(desc);
   }
-}
+}  // namespace edm
 
 using edm::SwitchProducer;
 DEFINE_FWK_MODULE(SwitchProducer);
diff --git a/FWCore/Modules/src/TestSource.cc b/FWCore/Modules/src/TestSource.cc
index 7ec8e747701af..32dc2a39b5fe3 100644
--- a/FWCore/Modules/src/TestSource.cc
+++ b/FWCore/Modules/src/TestSource.cc
@@ -13,83 +13,93 @@ namespace edm {
   public:
     explicit TestSource(ParameterSet const&, InputSourceDescription const&);
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
+
   private:
     ItemType getNextItemType() final;
     std::shared_ptr<RunAuxiliary> readRunAuxiliary_() final;
     std::shared_ptr<LuminosityBlockAuxiliary> readLuminosityBlockAuxiliary_() final;
     void readEvent_(EventPrincipal& eventPrincipal) final;
-    
-    std::vector<std::pair<ItemType,EventID>> m_transitions;
-    std::vector<std::pair<ItemType,EventID>>::const_iterator m_nextTransition;
-    
-    static ItemType stringToType( const std::string& ) ;
+
+    std::vector<std::pair<ItemType, EventID>> m_transitions;
+    std::vector<std::pair<ItemType, EventID>>::const_iterator m_nextTransition;
+
+    static ItemType stringToType(const std::string&);
   };
 
-  TestSource::TestSource(ParameterSet const& pset,
-				       InputSourceDescription const& desc) :
-    InputSource(pset, desc)
-  {
-    for( auto const& p: pset.getUntrackedParameter<std::vector<edm::ParameterSet>>("transitions")) {
-      m_transitions.emplace_back( stringToType(p.getUntrackedParameter<std::string>("type")),
-                                  p.getUntrackedParameter<EventID>("id"));
+  TestSource::TestSource(ParameterSet const& pset, InputSourceDescription const& desc) : InputSource(pset, desc) {
+    for (auto const& p : pset.getUntrackedParameter<std::vector<edm::ParameterSet>>("transitions")) {
+      m_transitions.emplace_back(stringToType(p.getUntrackedParameter<std::string>("type")),
+                                 p.getUntrackedParameter<EventID>("id"));
     }
     m_nextTransition = m_transitions.begin();
   }
 
-  TestSource::ItemType TestSource::stringToType( const std::string& iTrans ) {
-    if (iTrans == "IsStop") { return IsStop;}
-    if (iTrans == "IsFile") { return IsFile;}
-    if (iTrans == "IsRun") { return IsRun;}
-    if (iTrans == "IsLumi") {return IsLumi;}
-    if (iTrans == "IsEvent") {return IsEvent;}
-    if (iTrans == "IsSynchronize") {return IsSynchronize;}
-    
-    throw edm::Exception(errors::Configuration)<<"Unknown transition type \'"<<iTrans<<"\'";
-    
+  TestSource::ItemType TestSource::stringToType(const std::string& iTrans) {
+    if (iTrans == "IsStop") {
+      return IsStop;
+    }
+    if (iTrans == "IsFile") {
+      return IsFile;
+    }
+    if (iTrans == "IsRun") {
+      return IsRun;
+    }
+    if (iTrans == "IsLumi") {
+      return IsLumi;
+    }
+    if (iTrans == "IsEvent") {
+      return IsEvent;
+    }
+    if (iTrans == "IsSynchronize") {
+      return IsSynchronize;
+    }
+
+    throw edm::Exception(errors::Configuration) << "Unknown transition type \'" << iTrans << "\'";
+
     return IsInvalid;
   }
 
   TestSource::ItemType TestSource::getNextItemType() {
-    if(m_nextTransition == m_transitions.end()) {
+    if (m_nextTransition == m_transitions.end()) {
       return IsStop;
     }
     auto trans = m_nextTransition->first;
     ++m_nextTransition;
     return trans;
   }
-  
+
   std::shared_ptr<RunAuxiliary> TestSource::readRunAuxiliary_() {
-    auto it =m_nextTransition;
+    auto it = m_nextTransition;
     --it;
-    return std::make_shared<RunAuxiliary>(it->second.run(),Timestamp(0),Timestamp(10));
+    return std::make_shared<RunAuxiliary>(it->second.run(), Timestamp(0), Timestamp(10));
   }
-  
+
   std::shared_ptr<LuminosityBlockAuxiliary> TestSource::readLuminosityBlockAuxiliary_() {
-    auto it =m_nextTransition;
+    auto it = m_nextTransition;
     --it;
-    return std::make_shared<LuminosityBlockAuxiliary>(it->second.run(),it->second.luminosityBlock(), Timestamp(0),Timestamp(10));
+    return std::make_shared<LuminosityBlockAuxiliary>(
+        it->second.run(), it->second.luminosityBlock(), Timestamp(0), Timestamp(10));
   }
 
   void TestSource::readEvent_(EventPrincipal& eventPrincipal) {
-    auto it =m_nextTransition;
+    auto it = m_nextTransition;
     --it;
     EventAuxiliary aux(it->second, processGUID(), Timestamp(0), false);
     eventPrincipal.fillEventPrincipal(aux, processHistoryRegistry());
   }
 
-  void
-  TestSource::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void TestSource::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     desc.setComment("Generates the specified sequence of transitions.");
     ProducerSourceBase::fillDescription(desc);
-    
+
     ParameterSetDescription trans;
     trans.addUntracked<std::string>("type");
     trans.addUntracked<edm::EventID>("id");
-    desc.addVPSetUntracked("transitions",trans, {{}});
+    desc.addVPSetUntracked("transitions", trans, {{}});
     descriptions.add("source", desc);
   }
-}
+}  // namespace edm
 
 using edm::TestSource;
 DEFINE_FWK_INPUT_SOURCE(TestSource);
diff --git a/FWCore/Modules/src/TimeStudyModules.cc b/FWCore/Modules/src/TimeStudyModules.cc
index 9cb0f79c33aaa..63878205a77fc 100644
--- a/FWCore/Modules/src/TimeStudyModules.cc
+++ b/FWCore/Modules/src/TimeStudyModules.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Modules
 // Class  :     TimeStudyModules
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -38,148 +38,132 @@
 #include "FWCore/ServiceRegistry/interface/ServiceMaker.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-
 namespace timestudy {
   namespace {
     struct Sleeper {
-      Sleeper(edm::ParameterSet const& p, edm::ConsumesCollector&& iCol ) {
+      Sleeper(edm::ParameterSet const& p, edm::ConsumesCollector&& iCol) {
         auto const& cv = p.getParameter<std::vector<edm::InputTag>>("consumes");
         tokens_.reserve(cv.size());
-        for(auto const& c: cv) {
-          tokens_.emplace_back( iCol.consumes<int>(c));
+        for (auto const& c : cv) {
+          tokens_.emplace_back(iCol.consumes<int>(c));
         }
-        
+
         auto const& tv = p.getParameter<std::vector<double>>("eventTimes");
         eventTimes_.reserve(tv.size());
-        for(auto t: tv) {
-          eventTimes_.push_back( static_cast<useconds_t>(t*1E6));
+        for (auto t : tv) {
+          eventTimes_.push_back(static_cast<useconds_t>(t * 1E6));
         }
       }
 
-      void
-      getAndSleep(edm::Event const& e) const {
-        for(auto const&t: tokens_) {
-          (void) e.getHandle(t);
+      void getAndSleep(edm::Event const& e) const {
+        for (auto const& t : tokens_) {
+          (void)e.getHandle(t);
         }
         //Event number minimum value is 1
-        usleep( eventTimes_[ (e.id().event()-1) % eventTimes_.size()]);
+        usleep(eventTimes_[(e.id().event() - 1) % eventTimes_.size()]);
       }
-      
+
       static void fillDescription(edm::ParameterSetDescription& desc) {
         desc.add<std::vector<edm::InputTag>>("consumes", {})->setComment("What event int data products to consume");
-        desc.add<std::vector<double>>("eventTimes")->setComment("The time, in seconds, for how long the module should sleep each event. The index to use is based on a modulo of size of the list applied to the Event ID number.");
+        desc.add<std::vector<double>>("eventTimes")
+            ->setComment(
+                "The time, in seconds, for how long the module should sleep each event. The index to use is based on a "
+                "modulo of size of the list applied to the Event ID number.");
       }
-      
+
     private:
       std::vector<edm::EDGetTokenT<int>> tokens_;
       std::vector<useconds_t> eventTimes_;
-
     };
+  }  // namespace
+  //--------------------------------------------------------------------
+  //
+  // Produces an IntProduct instance.
+  //
+  class SleepingProducer : public edm::global::EDProducer<> {
+  public:
+    explicit SleepingProducer(edm::ParameterSet const& p)
+        : value_(p.getParameter<int>("ivalue")), sleeper_(p, consumesCollector()), token_{produces<int>()} {}
+    void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
+
+    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
+  private:
+    const int value_;
+    Sleeper sleeper_;
+    const edm::EDPutTokenT<int> token_;
+  };
+
+  void SleepingProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
+    // EventSetup is not used.
+    sleeper_.getAndSleep(e);
+
+    e.emplace(token_, value_);
   }
-//--------------------------------------------------------------------
-//
-// Produces an IntProduct instance.
-//
-class SleepingProducer : public edm::global::EDProducer<> {
-public:
-  explicit SleepingProducer(edm::ParameterSet const& p) :
-  value_(p.getParameter<int>("ivalue")),
-  sleeper_(p, consumesCollector()),
-  token_{produces<int>()}
-  {
+
+  void SleepingProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+    edm::ParameterSetDescription desc;
+
+    desc.add<int>("ivalue")->setComment("Value to put into Event");
+    Sleeper::fillDescription(desc);
+
+    descriptions.addDefault(desc);
   }
-  void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
-  
-  static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
-  
-private:
-  const int value_;
-  Sleeper sleeper_;
-  const edm::EDPutTokenT<int> token_;
-};
-
-void
-SleepingProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
-  // EventSetup is not used.
-  sleeper_.getAndSleep(e);
-  
-  e.emplace(token_,value_);
-}
-  
-void
-SleepingProducer::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
-  edm::ParameterSetDescription desc;
-
-  desc.add<int>("ivalue")->setComment("Value to put into Event");
-  Sleeper::fillDescription(desc);
-  
-  descriptions.addDefault(desc);
-}
 
   class OneSleepingProducer : public edm::one::EDProducer<edm::one::SharedResources> {
   public:
-    explicit OneSleepingProducer(edm::ParameterSet const& p) :
-    value_(p.getParameter<int>("ivalue")),
-    sleeper_(p, consumesCollector()),
-    token_{produces<int>()}
-    {
+    explicit OneSleepingProducer(edm::ParameterSet const& p)
+        : value_(p.getParameter<int>("ivalue")), sleeper_(p, consumesCollector()), token_{produces<int>()} {
       usesResource(p.getParameter<std::string>("resource"));
     }
-    void produce( edm::Event& e, edm::EventSetup const& c) override;
-    
-    static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
-    
+    void produce(edm::Event& e, edm::EventSetup const& c) override;
+
+    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
   private:
     const int value_;
     Sleeper sleeper_;
     const edm::EDPutTokenT<int> token_;
   };
-  
-  void
-  OneSleepingProducer::produce(edm::Event& e, edm::EventSetup const&) {
+
+  void OneSleepingProducer::produce(edm::Event& e, edm::EventSetup const&) {
     // EventSetup is not used.
     sleeper_.getAndSleep(e);
-    
-    e.emplace(token_,value_);
+
+    e.emplace(token_, value_);
   }
-  
-  void
-  OneSleepingProducer::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
+
+  void OneSleepingProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription desc;
-    
+
     desc.add<int>("ivalue")->setComment("Value to put into Event");
-    desc.add<std::string>("resource",std::string())->setComment("The name of the resource that is being shared");
+    desc.add<std::string>("resource", std::string())->setComment("The name of the resource that is being shared");
     Sleeper::fillDescription(desc);
-    
+
     descriptions.addDefault(desc);
   }
 
   class OneSleepingAnalyzer : public edm::one::EDAnalyzer<> {
   public:
-    explicit OneSleepingAnalyzer(edm::ParameterSet const& p) :
-    sleeper_(p, consumesCollector())
-    {
-    }
-    void analyze( edm::Event const& e, edm::EventSetup const& c) override;
-    
-    static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
-    
+    explicit OneSleepingAnalyzer(edm::ParameterSet const& p) : sleeper_(p, consumesCollector()) {}
+    void analyze(edm::Event const& e, edm::EventSetup const& c) override;
+
+    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
   private:
     Sleeper sleeper_;
   };
-  
-  void
-  OneSleepingAnalyzer::analyze(edm::Event const& e, edm::EventSetup const&) {
+
+  void OneSleepingAnalyzer::analyze(edm::Event const& e, edm::EventSetup const&) {
     // EventSetup is not used.
     sleeper_.getAndSleep(e);
   }
-  
-  void
-  OneSleepingAnalyzer::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
+
+  void OneSleepingAnalyzer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription desc;
-    
+
     Sleeper::fillDescription(desc);
-    
+
     descriptions.addDefault(desc);
   }
 
@@ -200,11 +184,10 @@ SleepingProducer::fillDescriptions(edm::ConfigurationDescriptions & descriptions
    */
   class SleepingServer {
   public:
-    SleepingServer(edm::ParameterSet const& iPS, edm::ActivityRegistry& iAR):
-    nWaitingEvents_(iPS.getUntrackedParameter<unsigned int>("nWaitingEvents"))
-    {
+    SleepingServer(edm::ParameterSet const& iPS, edm::ActivityRegistry& iAR)
+        : nWaitingEvents_(iPS.getUntrackedParameter<unsigned int>("nWaitingEvents")) {
       iAR.watchPreallocate([this](edm::service::SystemBounds const& iBounds) {
-        auto const nStreams =iBounds.maxNumberOfStreams();
+        auto const nStreams = iBounds.maxNumberOfStreams();
         waitingStreams_.reserve(nStreams);
         waitTimesPerStream_.resize(nStreams);
         waitingTaskPerStream_.resize(nStreams);
@@ -215,57 +198,54 @@ SleepingProducer::fillDescriptions(edm::ConfigurationDescriptions & descriptions
         condition_.notify_one();
         serverThread_->join();
       });
-      iAR.watchPreStreamBeginLumi([this](edm::StreamContext const&) {
-        ++activeStreams_;
-      });
+      iAR.watchPreStreamBeginLumi([this](edm::StreamContext const&) { ++activeStreams_; });
       iAR.watchPreStreamEndLumi([this](edm::StreamContext const&) {
         --activeStreams_;
         condition_.notify_one();
       });
 
-      serverThread_ = std::make_unique<std::thread>([this]() { threadWork(); } );
+      serverThread_ = std::make_unique<std::thread>([this]() { threadWork(); });
     }
-    
-    void asyncWork(edm::StreamID id, edm::WaitingTaskWithArenaHolder iTask, long initTime, long workTime, long finishTime) {
-      waitTimesPerStream_[id.value()]={{initTime,workTime,finishTime}};
-      waitingTaskPerStream_[id.value()]=std::move(iTask);
+
+    void asyncWork(
+        edm::StreamID id, edm::WaitingTaskWithArenaHolder iTask, long initTime, long workTime, long finishTime) {
+      waitTimesPerStream_[id.value()] = {{initTime, workTime, finishTime}};
+      waitingTaskPerStream_[id.value()] = std::move(iTask);
       {
         std::lock_guard<std::mutex> lk{mutex_};
         waitingStreams_.push_back(id.value());
       }
       condition_.notify_one();
     }
-    
+
   private:
     bool readyToDoSomething() {
-      if(stopProcessing_) {
+      if (stopProcessing_) {
         return true;
       }
-      if(waitingStreams_.size() >= nWaitingEvents_) {
+      if (waitingStreams_.size() >= nWaitingEvents_) {
         return true;
       }
       //every running stream is now waiting
       return waitingStreams_.size() == activeStreams_;
     }
-    
+
     void threadWork() {
-      while(not stopProcessing_.load()) {
+      while (not stopProcessing_.load()) {
         std::vector<int> streamsToProcess;
         {
           std::unique_lock<std::mutex> lk(mutex_);
-          condition_.wait(lk, [this]() {
-            return readyToDoSomething();
-          });
-          swap(streamsToProcess,waitingStreams_);
+          condition_.wait(lk, [this]() { return readyToDoSomething(); });
+          swap(streamsToProcess, waitingStreams_);
         }
-        if(stopProcessing_) {
+        if (stopProcessing_) {
           break;
         }
         long longestTime = 0;
         //simulate filling the external device
-        for(auto i: streamsToProcess) {
-          auto const& v=waitTimesPerStream_[i];
-          if(v[1]>longestTime) {
+        for (auto i : streamsToProcess) {
+          auto const& v = waitTimesPerStream_[i];
+          if (v[1] > longestTime) {
             longestTime = v[1];
           }
           usleep(v[0]);
@@ -274,8 +254,8 @@ SleepingProducer::fillDescriptions(edm::ConfigurationDescriptions & descriptions
         usleep(longestTime);
 
         //simulate copying data back
-        for(auto i: streamsToProcess) {
-          auto const& v=waitTimesPerStream_[i];
+        for (auto i : streamsToProcess) {
+          auto const& v = waitTimesPerStream_[i];
           usleep(v[2]);
           waitingTaskPerStream_[i].doneWaiting(std::exception_ptr());
         }
@@ -285,7 +265,7 @@ SleepingProducer::fillDescriptions(edm::ConfigurationDescriptions & descriptions
     const unsigned int nWaitingEvents_;
     std::unique_ptr<std::thread> serverThread_;
     std::vector<int> waitingStreams_;
-    std::vector<std::array<long,3>> waitTimesPerStream_;
+    std::vector<std::array<long, 3>> waitTimesPerStream_;
     std::vector<edm::WaitingTaskWithArenaHolder> waitingTaskPerStream_;
     std::mutex mutex_;
     std::condition_variable condition_;
@@ -295,41 +275,41 @@ SleepingProducer::fillDescriptions(edm::ConfigurationDescriptions & descriptions
 
   class ExternalWorkSleepingProducer : public edm::global::EDProducer<edm::ExternalWork> {
   public:
-    explicit ExternalWorkSleepingProducer(edm::ParameterSet const& p) :
-    value_(p.getParameter<int>("ivalue")),
-    sleeper_(p, consumesCollector()),
-    token_{produces<int>()}
-    {
+    explicit ExternalWorkSleepingProducer(edm::ParameterSet const& p)
+        : value_(p.getParameter<int>("ivalue")), sleeper_(p, consumesCollector()), token_{produces<int>()} {
       {
         auto const& tv = p.getParameter<std::vector<double>>("serviceInitTimes");
         initTimes_.reserve(tv.size());
-        for(auto t: tv) {
-          initTimes_.push_back( static_cast<useconds_t>(t*1E6));
+        for (auto t : tv) {
+          initTimes_.push_back(static_cast<useconds_t>(t * 1E6));
         }
       }
       {
         auto const& tv = p.getParameter<std::vector<double>>("serviceWorkTimes");
         workTimes_.reserve(tv.size());
-        for(auto t: tv) {
-          workTimes_.push_back( static_cast<useconds_t>(t*1E6));
+        for (auto t : tv) {
+          workTimes_.push_back(static_cast<useconds_t>(t * 1E6));
         }
       }
       {
         auto const& tv = p.getParameter<std::vector<double>>("serviceFinishTimes");
         finishTimes_.reserve(tv.size());
-        for(auto t: tv) {
-          finishTimes_.push_back( static_cast<useconds_t>(t*1E6));
+        for (auto t : tv) {
+          finishTimes_.push_back(static_cast<useconds_t>(t * 1E6));
         }
       }
       assert(finishTimes_.size() == initTimes_.size());
       assert(workTimes_.size() == initTimes_.size());
     }
-    void acquire(edm::StreamID, edm::Event const & e, edm::EventSetup const& c, edm::WaitingTaskWithArenaHolder holder) const override;
+    void acquire(edm::StreamID,
+                 edm::Event const& e,
+                 edm::EventSetup const& c,
+                 edm::WaitingTaskWithArenaHolder holder) const override;
 
     void produce(edm::StreamID, edm::Event& e, edm::EventSetup const& c) const override;
-    
-    static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
-    
+
+    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
   private:
     std::vector<long> initTimes_;
     std::vector<long> workTimes_;
@@ -339,37 +319,36 @@ SleepingProducer::fillDescriptions(edm::ConfigurationDescriptions & descriptions
     const edm::EDPutTokenT<int> token_;
   };
 
-  void
-  ExternalWorkSleepingProducer::acquire(edm::StreamID id, edm::Event const& e, edm::EventSetup const&, edm::WaitingTaskWithArenaHolder holder) const {
+  void ExternalWorkSleepingProducer::acquire(edm::StreamID id,
+                                             edm::Event const& e,
+                                             edm::EventSetup const&,
+                                             edm::WaitingTaskWithArenaHolder holder) const {
     // EventSetup is not used.
     sleeper_.getAndSleep(e);
     edm::Service<SleepingServer> server;
-    auto index = (e.id().event()-1) % initTimes_.size();
+    auto index = (e.id().event() - 1) % initTimes_.size();
     server->asyncWork(id, std::move(holder), initTimes_[index], workTimes_[index], finishTimes_[index]);
   }
 
-  void
-  ExternalWorkSleepingProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
-    e.emplace(token_,value_);
+  void ExternalWorkSleepingProducer::produce(edm::StreamID, edm::Event& e, edm::EventSetup const&) const {
+    e.emplace(token_, value_);
   }
-  
-  void
-  ExternalWorkSleepingProducer::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
+
+  void ExternalWorkSleepingProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
     edm::ParameterSetDescription desc;
-    
+
     desc.add<int>("ivalue")->setComment("Value to put into Event");
     desc.add<std::vector<double>>("serviceInitTimes");
     desc.add<std::vector<double>>("serviceWorkTimes");
     desc.add<std::vector<double>>("serviceFinishTimes");
     Sleeper::fillDescription(desc);
-    
+
     descriptions.addDefault(desc);
   }
 
-}
+}  // namespace timestudy
 DEFINE_FWK_SERVICE(timestudy::SleepingServer);
 DEFINE_FWK_MODULE(timestudy::SleepingProducer);
 DEFINE_FWK_MODULE(timestudy::OneSleepingProducer);
 DEFINE_FWK_MODULE(timestudy::ExternalWorkSleepingProducer);
 DEFINE_FWK_MODULE(timestudy::OneSleepingAnalyzer);
-
diff --git a/FWCore/Modules/test/test_catch2_LogErrorFilter.cc b/FWCore/Modules/test/test_catch2_LogErrorFilter.cc
index dcc2734b8c8a4..1b540a1272f7b 100644
--- a/FWCore/Modules/test/test_catch2_LogErrorFilter.cc
+++ b/FWCore/Modules/test/test_catch2_LogErrorFilter.cc
@@ -8,7 +8,7 @@
 static constexpr auto s_tag = "[LogErrorFilter]";
 TEST_CASE("Tests of LogErrorFilter", s_tag) {
   const std::string baseConfig{
-R"_(from FWCore.TestProcessor.TestProcess import *
+      R"_(from FWCore.TestProcessor.TestProcess import *
 process = TestProcess()
 process.errorFilter = cms.EDFilter('LogErrorFilter',
                       harvesterTag = cms.InputTag('in'),
@@ -21,315 +21,242 @@ process.errorFilter = cms.EDFilter('LogErrorFilter',
 )
 
 process.moduleToTest(process.errorFilter)
-)_"
-  };
-  
+)_"};
+
   SECTION("No threshhold, both warnings and errors") {
-    edm::test::TestProcessor::Config config{
-      baseConfig 
-    };
-    
+    edm::test::TestProcessor::Config config{baseConfig};
+
     using ESVec = std::vector<edm::ErrorSummaryEntry>;
     auto const putToken = config.produces<ESVec>("in");
-    
+
     edm::test::TestProcessor tester(config);
-    REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                       std::make_unique<ESVec>())).modulePassed());
-    
+    REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>())).modulePassed());
+
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_error}};
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_error}};
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_warning}};
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_warning}};
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_info}};
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_info}};
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
   }
 
   SECTION("No threshhold, just errors") {
-    edm::test::TestProcessor::Config config{
-      baseConfig +
-        R"_(
+    edm::test::TestProcessor::Config config{baseConfig +
+                                            R"_(
 process.errorFilter.atLeastOneWarning = False
-)_"
-    };
-    
+)_"};
+
     using ESVec = std::vector<edm::ErrorSummaryEntry>;
     auto const putToken = config.produces<ESVec>("in");
-    
+
     edm::test::TestProcessor tester(config);
-    REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                       std::make_unique<ESVec>())).modulePassed());
-    
+    REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>())).modulePassed());
+
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_error}};
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_error}};
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_warning}};
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_warning}};
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_info}};
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_info}};
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
   }
 
   SECTION("No threshhold, just warnings") {
-    edm::test::TestProcessor::Config config{
-      baseConfig +
-        R"_(
+    edm::test::TestProcessor::Config config{baseConfig +
+                                            R"_(
 process.errorFilter.atLeastOneError = False
-)_"
-    };
-    
+)_"};
+
     using ESVec = std::vector<edm::ErrorSummaryEntry>;
     auto const putToken = config.produces<ESVec>("in");
-    
+
     edm::test::TestProcessor tester(config);
-    REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                       std::make_unique<ESVec>())).modulePassed());
-    
+    REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>())).modulePassed());
+
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_error}};
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_error}};
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_warning}};
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_warning}};
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_info}};
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_info}};
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
   }
 
   SECTION("No threshhold, errors, warnings, and categories") {
-    edm::test::TestProcessor::Config config{
-      baseConfig +
-        R"_(
+    edm::test::TestProcessor::Config config{baseConfig +
+                                            R"_(
 process.errorFilter.avoidCategories = ["IgnoreCat"]
-)_"
-    };
+)_"};
 
     using ESVec = std::vector<edm::ErrorSummaryEntry>;
     auto const putToken = config.produces<ESVec>("in");
 
     edm::test::TestProcessor tester(config);
-    REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                       std::make_unique<ESVec>())).modulePassed());
-    
+    REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>())).modulePassed());
+
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_error}};
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_error}};
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"IgnoreCat","mod", edm::ELseverityLevel::ELsev_error}};
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"IgnoreCat", "mod", edm::ELseverityLevel::ELsev_error}};
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-     ESVec errors = {{"IgnoreCat","mod", edm::ELseverityLevel::ELsev_error},
-                     {"Cat","mod", edm::ELseverityLevel::ELsev_error} };
-     REQUIRE(tester.test(std::make_pair(putToken,
-                                              std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"IgnoreCat", "mod", edm::ELseverityLevel::ELsev_error},
+                      {"Cat", "mod", edm::ELseverityLevel::ELsev_error}};
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_warning}};
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_warning}};
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"IgnoreCat","mod", edm::ELseverityLevel::ELsev_warning}};
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"IgnoreCat", "mod", edm::ELseverityLevel::ELsev_warning}};
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_info}};
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_info}};
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"IgnoreCat","mod", edm::ELseverityLevel::ELsev_info}};
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"IgnoreCat", "mod", edm::ELseverityLevel::ELsev_info}};
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
   };
   SECTION("threshhold of 1, both warnings and errors") {
-    edm::test::TestProcessor::Config config{
-      baseConfig +
-        R"_(
+    edm::test::TestProcessor::Config config{baseConfig +
+                                            R"_(
 process.errorFilter.useThresholdsPerKind = True
 )_"
 
     };
-    
+
     using ESVec = std::vector<edm::ErrorSummaryEntry>;
     auto const putToken = config.produces<ESVec>("in");
-    
+
     edm::test::TestProcessor tester(config);
-    REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                       std::make_unique<ESVec>())).modulePassed());
-    
+    REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>())).modulePassed());
+
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_error}};
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_error}};
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_warning}};
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_warning}};
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"Cat2","mod", edm::ELseverityLevel::ELsev_error}};
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat2", "mod", edm::ELseverityLevel::ELsev_error}};
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_info}};
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_info}};
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     tester.setLuminosityBlockNumber(2);
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_error}};
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_error}};
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_warning}};
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_warning}};
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"Cat2","mod", edm::ELseverityLevel::ELsev_error}};
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat2", "mod", edm::ELseverityLevel::ELsev_error}};
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
   }
-  
+
   SECTION("threshhold of 1, both warnings and errors, and categories") {
-    edm::test::TestProcessor::Config config{
-      baseConfig +
-        R"_(
+    edm::test::TestProcessor::Config config{baseConfig +
+                                            R"_(
 process.errorFilter.useThresholdsPerKind = True
 process.errorFilter.avoidCategories = ["IgnoreCat"]
 )_"
 
     };
-    
+
     using ESVec = std::vector<edm::ErrorSummaryEntry>;
     auto const putToken = config.produces<ESVec>("in");
-    
+
     edm::test::TestProcessor tester(config);
-    REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                       std::make_unique<ESVec>())).modulePassed());
-    
+    REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>())).modulePassed());
+
     {
-     ESVec errors = {{"IgnoreCat","mod", edm::ELseverityLevel::ELsev_error}};
-     REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                              std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"IgnoreCat", "mod", edm::ELseverityLevel::ELsev_error}};
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_error}};
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_error}};
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"IgnoreCat","mod", edm::ELseverityLevel::ELsev_warning}};
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-     }
+      ESVec errors = {{"IgnoreCat", "mod", edm::ELseverityLevel::ELsev_warning}};
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+    }
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_warning}};
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_warning}};
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"Cat2","mod", edm::ELseverityLevel::ELsev_error}};
-      REQUIRE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat2", "mod", edm::ELseverityLevel::ELsev_error}};
+      REQUIRE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
     {
-      ESVec errors = {{"IgnoreCat","mod", edm::ELseverityLevel::ELsev_info}};
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-     }
+      ESVec errors = {{"IgnoreCat", "mod", edm::ELseverityLevel::ELsev_info}};
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+    }
     {
-      ESVec errors = {{"Cat","mod", edm::ELseverityLevel::ELsev_info}};
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
-      REQUIRE_FALSE(tester.test(std::make_pair(putToken,
-                                               std::make_unique<ESVec>(errors))).modulePassed());
+      ESVec errors = {{"Cat", "mod", edm::ELseverityLevel::ELsev_info}};
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
+      REQUIRE_FALSE(tester.test(std::make_pair(putToken, std::make_unique<ESVec>(errors))).modulePassed());
     }
   }
 
   SECTION("Missing data") {
-    edm::test::TestProcessor::Config config{
-      baseConfig 
-    };
+    edm::test::TestProcessor::Config config{baseConfig};
     edm::test::TestProcessor tester(config);
-    
-    REQUIRE_FALSE( tester.test().modulePassed());
+
+    REQUIRE_FALSE(tester.test().modulePassed());
   }
 }
-
diff --git a/FWCore/Modules/test/test_catch2_ModuloEventIDFilter.cc b/FWCore/Modules/test/test_catch2_ModuloEventIDFilter.cc
index a70ab5c164b10..d862b2ec8f50a 100644
--- a/FWCore/Modules/test/test_catch2_ModuloEventIDFilter.cc
+++ b/FWCore/Modules/test/test_catch2_ModuloEventIDFilter.cc
@@ -7,20 +7,17 @@ static constexpr auto s_tag = "[ModuloEventIDFilter]";
 
 TEST_CASE("Check parameters of ModuloEventIDFilter", s_tag) {
   const std::string baseConfig{
-R"_(from FWCore.TestProcessor.TestProcess import *
+      R"_(from FWCore.TestProcessor.TestProcess import *
 process = TestProcess()
 process.toTest = cms.EDFilter('ModuloEventIDFilter',
                                  modulo =cms.uint32(3),
                                  offset = cms.uint32(offset))
 process.moduleToTest(process.toTest)
-)_"
-  };
-  
+)_"};
+
   SECTION("modulo sets how many events to fail before success") {
-    edm::test::TestProcessor::Config config{
-      "offset=1\n"+baseConfig 
-    };
-    
+    edm::test::TestProcessor::Config config{"offset=1\n" + baseConfig};
+
     edm::test::TestProcessor tester(config);
     tester.setEventNumber(1);
     REQUIRE(tester.test().modulePassed());
@@ -37,11 +34,9 @@ process.moduleToTest(process.toTest)
     tester.setEventNumber(15);
     REQUIRE_FALSE(tester.test().modulePassed());
   }
-  
+
   SECTION("offset sets which event succeeds") {
-    edm::test::TestProcessor::Config config{
-      "offset=2\n"+baseConfig
-    };
+    edm::test::TestProcessor::Config config{"offset=2\n" + baseConfig};
 
     edm::test::TestProcessor tester(config);
     tester.setEventNumber(1);
@@ -59,15 +54,13 @@ process.moduleToTest(process.toTest)
   }
 }
 
-TEST_CASE("No default parameters of ModuloEventIDFilter",s_tag) {
+TEST_CASE("No default parameters of ModuloEventIDFilter", s_tag) {
   const std::string config{
-R"_(from FWCore.TestProcessor.TestProcess import *
+      R"_(from FWCore.TestProcessor.TestProcess import *
 process = TestProcess()
 process.toTest = cms.EDFilter('ModuloEventIDFilter')
 process.moduleToTest(process.toTest)
-)_"
-  };
-  
-  REQUIRE_THROWS_AS( edm::test::TestProcessor(config), cms::Exception);
-}
+)_"};
 
+  REQUIRE_THROWS_AS(edm::test::TestProcessor(config), cms::Exception);
+}
diff --git a/FWCore/Modules/test/test_catch2_PathStatusFilter.cc b/FWCore/Modules/test/test_catch2_PathStatusFilter.cc
index e59df8c9f4561..d4e48f56966d8 100644
--- a/FWCore/Modules/test/test_catch2_PathStatusFilter.cc
+++ b/FWCore/Modules/test/test_catch2_PathStatusFilter.cc
@@ -11,20 +11,19 @@ static constexpr auto s_tag = "[PathStatusFilter]";
 
 TEST_CASE("Standard checks of PathStatusFilter", s_tag) {
   const std::string baseConfig{
-R"_(from FWCore.TestProcessor.TestProcess import *
+      R"_(from FWCore.TestProcessor.TestProcess import *
 process = TestProcess()
 process.toTest = cms.EDFilter("PathStatusFilter")
 process.moduleToTest(process.toTest)
-)_"
-  };
+)_"};
 
   SECTION("module constructor") {
-    edm::test::TestProcessor::Config config{ baseConfig };
+    edm::test::TestProcessor::Config config{baseConfig};
     REQUIRE_NOTHROW(edm::test::TestProcessor(config));
   }
 
   SECTION("No event data, empty expression") {
-    edm::test::TestProcessor::Config config{ baseConfig };
+    edm::test::TestProcessor::Config config{baseConfig};
     edm::test::TestProcessor tester(config);
     REQUIRE_NOTHROW(tester.test());
 
@@ -36,15 +35,13 @@ process.moduleToTest(process.toTest)
     std::string fullConfig = baseConfig +
                              R"_(process.toTest.logicalExpression = cms.string("pathname")
                              )_";
-    edm::test::TestProcessor::Config testConfig{ fullConfig };
+    edm::test::TestProcessor::Config testConfig{fullConfig};
     auto token = testConfig.produces<edm::PathStatus>("pathname");
     edm::test::TestProcessor tester(testConfig);
-    auto event = tester.test(std::make_pair(token,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
+    auto event = tester.test(std::make_pair(token, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(event.modulePassed());
 
-    event = tester.test(std::make_pair(token,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
+    event = tester.test(std::make_pair(token, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(!event.modulePassed());
 
     REQUIRE_THROWS(tester.test());
@@ -54,33 +51,21 @@ process.moduleToTest(process.toTest)
     std::string fullConfig = baseConfig +
                              R"_(process.toTest.logicalExpression = cms.string("path1 and path2")
                              )_";
-    edm::test::TestProcessor::Config testConfig{ fullConfig };
+    edm::test::TestProcessor::Config testConfig{fullConfig};
     auto token1 = testConfig.produces<edm::PathStatus>("path1");
     auto token2 = testConfig.produces<edm::PathStatus>("path2");
     edm::test::TestProcessor tester(testConfig);
-    auto event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass))
-    );
+    auto event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                             std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                        std::make_pair(token2,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                        std::make_pair(token2,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Pass))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                        std::make_pair(token2,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(!event.modulePassed());
   }
 
@@ -88,33 +73,21 @@ process.moduleToTest(process.toTest)
     std::string fullConfig = baseConfig +
                              R"_(process.toTest.logicalExpression = cms.string("path1 or path2")
                              )_";
-    edm::test::TestProcessor::Config testConfig{ fullConfig };
+    edm::test::TestProcessor::Config testConfig{fullConfig};
     auto token1 = testConfig.produces<edm::PathStatus>("path1");
     auto token2 = testConfig.produces<edm::PathStatus>("path2");
     edm::test::TestProcessor tester(testConfig);
-    auto event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass))
-    );
+    auto event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                             std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                        std::make_pair(token2,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                        std::make_pair(token2,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Pass))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                        std::make_pair(token2,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(!event.modulePassed());
   }
 
@@ -122,15 +95,13 @@ process.moduleToTest(process.toTest)
     std::string fullConfig = baseConfig +
                              R"_(process.toTest.logicalExpression = cms.string("not pathname")
                              )_";
-    edm::test::TestProcessor::Config testConfig{ fullConfig };
+    edm::test::TestProcessor::Config testConfig{fullConfig};
     auto token = testConfig.produces<edm::PathStatus>("pathname");
     edm::test::TestProcessor tester(testConfig);
-    auto event = tester.test(std::make_pair(token,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
+    auto event = tester.test(std::make_pair(token, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(!event.modulePassed());
 
-    event = tester.test(std::make_pair(token,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
+    event = tester.test(std::make_pair(token, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(event.modulePassed());
   }
 
@@ -138,156 +109,93 @@ process.moduleToTest(process.toTest)
     std::string fullConfig = baseConfig +
                              R"_(process.toTest.logicalExpression = cms.string("path1 or path2 and path3")
                              )_";
-    edm::test::TestProcessor::Config testConfig{ fullConfig };
+    edm::test::TestProcessor::Config testConfig{fullConfig};
     auto token1 = testConfig.produces<edm::PathStatus>("path1");
     auto token2 = testConfig.produces<edm::PathStatus>("path2");
     auto token3 = testConfig.produces<edm::PathStatus>("path3");
     edm::test::TestProcessor tester(testConfig);
-    auto event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass))
-    );
+    auto event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                             std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                             std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(!event.modulePassed());
   }
   SECTION("test parenthesis") {
     std::string fullConfig = baseConfig +
                              R"_(process.toTest.logicalExpression = cms.string("(path1 or path2) and path3")
                              )_";
-    edm::test::TestProcessor::Config testConfig{ fullConfig };
+    edm::test::TestProcessor::Config testConfig{fullConfig};
     auto token1 = testConfig.produces<edm::PathStatus>("path1");
     auto token2 = testConfig.produces<edm::PathStatus>("path2");
     auto token3 = testConfig.produces<edm::PathStatus>("path3");
     edm::test::TestProcessor tester(testConfig);
-    auto event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass))
-    );
+    auto event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                             std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                             std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(!event.modulePassed());
   }
 
   SECTION("test extra space between pathnames and operators") {
-    std::string fullConfig = baseConfig +
-                             R"_(process.toTest.logicalExpression = cms.string("\t    path1   \t and \t  path2 \t and \t not(path3)and not not not path4 or(path5)and  not (  path6 or(path7)) \t   ")
+    std::string fullConfig =
+        baseConfig +
+        R"_(process.toTest.logicalExpression = cms.string("\t    path1   \t and \t  path2 \t and \t not(path3)and not not not path4 or(path5)and  not (  path6 or(path7)) \t   ")
                              )_";
-    edm::test::TestProcessor::Config testConfig{ fullConfig };
+    edm::test::TestProcessor::Config testConfig{fullConfig};
     auto token1 = testConfig.produces<edm::PathStatus>("path1");
     auto token2 = testConfig.produces<edm::PathStatus>("path2");
     auto token3 = testConfig.produces<edm::PathStatus>("path3");
@@ -296,149 +204,77 @@ process.moduleToTest(process.toTest)
     auto token6 = testConfig.produces<edm::PathStatus>("path6");
     auto token7 = testConfig.produces<edm::PathStatus>("path7");
     edm::test::TestProcessor tester(testConfig);
-    auto event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token4,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token5,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token6,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token7,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass))
-    );
+    auto event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                             std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                             std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                             std::make_pair(token4, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                             std::make_pair(token5, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                             std::make_pair(token6, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                             std::make_pair(token7, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token4,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token5,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token6,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token7,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token4, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token5, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token6, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token7, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token4,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token5,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token6,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token7,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token4, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token5, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token6, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token7, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token4,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token5,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token6,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token7,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token4, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token5, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token6, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token7, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token4,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token5,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token6,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token7,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token4, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token5, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token6, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token7, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token4,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token5,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token6,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token7,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token4, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token5, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token6, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token7, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token4,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token5,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token6,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token7,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token4, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token5, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token6, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token7, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token4,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token5,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token6,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token7,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token4, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token5, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token6, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token7, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token4,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token5,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token6,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                             std::make_pair(token7,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass))
-    );
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token4, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token5, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token6, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token7, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(!event.modulePassed());
   }
 
@@ -446,15 +282,13 @@ process.moduleToTest(process.toTest)
     std::string fullConfig = baseConfig +
                              R"_(process.toTest.logicalExpression = cms.string("a")
                              )_";
-    edm::test::TestProcessor::Config testConfig{ fullConfig };
+    edm::test::TestProcessor::Config testConfig{fullConfig};
     auto token = testConfig.produces<edm::PathStatus>("a");
     edm::test::TestProcessor tester(testConfig);
-    auto event = tester.test(std::make_pair(token,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
+    auto event = tester.test(std::make_pair(token, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(event.modulePassed());
 
-    event = tester.test(std::make_pair(token,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
+    event = tester.test(std::make_pair(token, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(!event.modulePassed());
   }
 
@@ -462,96 +296,65 @@ process.moduleToTest(process.toTest)
     std::string fullConfig = baseConfig +
                              R"_(process.toTest.logicalExpression = cms.string("nota and nota and anot")
                              )_";
-    edm::test::TestProcessor::Config testConfig{ fullConfig };
+    edm::test::TestProcessor::Config testConfig{fullConfig};
     auto token1 = testConfig.produces<edm::PathStatus>("nota");
     auto token2 = testConfig.produces<edm::PathStatus>("anot");
     edm::test::TestProcessor tester(testConfig);
-    auto event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
+    auto event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                             std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                        std::make_pair(token2,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                        std::make_pair(token2,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                        std::make_pair(token2,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(!event.modulePassed());
   }
 
   SECTION("test multiple parentheses and 'not's") {
-    std::string fullConfig = baseConfig +
-                             R"_(process.toTest.logicalExpression = cms.string("not not not (((not(not(((((not not path1))) or path2))) and path3)))")
+    std::string fullConfig =
+        baseConfig +
+        R"_(process.toTest.logicalExpression = cms.string("not not not (((not(not(((((not not path1))) or path2))) and path3)))")
                              )_";
-    edm::test::TestProcessor::Config testConfig{ fullConfig };
+    edm::test::TestProcessor::Config testConfig{fullConfig};
     auto token1 = testConfig.produces<edm::PathStatus>("path1");
     auto token2 = testConfig.produces<edm::PathStatus>("path2");
     auto token3 = testConfig.produces<edm::PathStatus>("path3");
     edm::test::TestProcessor tester(testConfig);
-    auto event = tester.test(std::make_pair(token1,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token2,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                             std::make_pair(token3,
-                                            std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
+    auto event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                             std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                             std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                        std::make_pair(token2,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                        std::make_pair(token3,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                        std::make_pair(token2,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                        std::make_pair(token3,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                        std::make_pair(token2,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                        std::make_pair(token3,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                        std::make_pair(token2,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                        std::make_pair(token3,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(!event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                        std::make_pair(token2,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
-                        std::make_pair(token3,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Pass)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                        std::make_pair(token2,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                        std::make_pair(token3,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Pass)));
     REQUIRE(event.modulePassed());
-    event = tester.test(std::make_pair(token1,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                        std::make_pair(token2,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
-                        std::make_pair(token3,
-                                       std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
+    event = tester.test(std::make_pair(token1, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token2, std::make_unique<edm::PathStatus>(edm::hlt::Fail)),
+                        std::make_pair(token3, std::make_unique<edm::PathStatus>(edm::hlt::Fail)));
     REQUIRE(event.modulePassed());
   }
 }
diff --git a/FWCore/Modules/test/test_catch2_Prescaler.cc b/FWCore/Modules/test/test_catch2_Prescaler.cc
index b2f993bd19ce6..ccb3b10efda89 100644
--- a/FWCore/Modules/test/test_catch2_Prescaler.cc
+++ b/FWCore/Modules/test/test_catch2_Prescaler.cc
@@ -6,20 +6,17 @@
 static constexpr auto s_tag = "[Prescaler]";
 TEST_CASE("Check parameters of Prescaler", s_tag) {
   const std::string baseConfig{
-R"_(from FWCore.TestProcessor.TestProcess import *
+      R"_(from FWCore.TestProcessor.TestProcess import *
 process = TestProcess()
 process.prescale = cms.EDFilter('Prescaler',
                                  prescaleFactor =cms.int32(3),
                                  prescaleOffset = cms.int32(offset))
 process.moduleToTest(process.prescale)
-)_"
-  };
-  
+)_"};
+
   SECTION("prescaleFactor sets how many events to fail before success") {
-    edm::test::TestProcessor::Config config{
-      "offset=1\n"+baseConfig 
-    };
-    
+    edm::test::TestProcessor::Config config{"offset=1\n" + baseConfig};
+
     edm::test::TestProcessor tester(config);
     REQUIRE(tester.test().modulePassed());
     REQUIRE_FALSE(tester.test().modulePassed());
@@ -29,30 +26,26 @@ process.moduleToTest(process.prescale)
     REQUIRE_FALSE(tester.test().modulePassed());
     REQUIRE(tester.test().modulePassed());
   }
-  
+
   SECTION("prescaleOffset sets which event succeeds") {
-    edm::test::TestProcessor::Config config{
-      "offset=2\n"+baseConfig
-    };
+    edm::test::TestProcessor::Config config{"offset=2\n" + baseConfig};
 
     edm::test::TestProcessor tester(config);
     REQUIRE_FALSE(tester.test().modulePassed());
     REQUIRE(tester.test().modulePassed());
     REQUIRE_FALSE(tester.test().modulePassed());
     REQUIRE_FALSE(tester.test().modulePassed());
-    REQUIRE(tester.test().modulePassed());    
+    REQUIRE(tester.test().modulePassed());
   }
 }
 
-TEST_CASE("No default parameters of Prescaler",s_tag) {
+TEST_CASE("No default parameters of Prescaler", s_tag) {
   const std::string config{
-R"_(from FWCore.TestProcessor.TestProcess import *
+      R"_(from FWCore.TestProcessor.TestProcess import *
 process = TestProcess()
 process.prescale = cms.EDFilter('Prescaler')
 process.moduleToTest(process.prescale)
-)_"
-  };
-  
-  REQUIRE_THROWS_AS( edm::test::TestProcessor(config), cms::Exception);
-}
+)_"};
 
+  REQUIRE_THROWS_AS(edm::test::TestProcessor(config), cms::Exception);
+}
diff --git a/FWCore/ParameterSet/bin/edmConfigToPython.cpp b/FWCore/ParameterSet/bin/edmConfigToPython.cpp
index 2135f212353cb..73d1d82ef57a0 100644
--- a/FWCore/ParameterSet/bin/edmConfigToPython.cpp
+++ b/FWCore/ParameterSet/bin/edmConfigToPython.cpp
@@ -11,18 +11,14 @@
 using namespace edm;
 using namespace edm::pset;
 
-void
-writePythonForm(std::string const& config, std::ostream& out)
-{
+void writePythonForm(std::string const& config, std::ostream& out) {
   edm::pset::ParseTree parsetree(config);
-  
+
   PythonFormWriter writer;
   writer.write(parsetree, out);
 }
 
-
-int main()
-{
+int main() {
   // Read input from cin into configstring..
   std::string configstring;
   edm::read_from_cin(configstring);
@@ -31,18 +27,13 @@ int main()
   // standard out.
 
   int rc = 1;  // failure
-  try  
-    { 
-      writePythonForm(configstring, std::cout);
-      rc = 0; // success
-    }
-  catch ( edm::Exception const& x )
-    {
-      std::cerr << x << '\n';
-    }
-  catch ( ... )
-    {
-      std::cerr << "Unidentified exception caught\n";	
-    }
-  return rc;  
+  try {
+    writePythonForm(configstring, std::cout);
+    rc = 0;  // success
+  } catch (edm::Exception const& x) {
+    std::cerr << x << '\n';
+  } catch (...) {
+    std::cerr << "Unidentified exception caught\n";
+  }
+  return rc;
 }
diff --git a/FWCore/ParameterSet/bin/edmPluginHelp.cpp b/FWCore/ParameterSet/bin/edmPluginHelp.cpp
index da66650745b8b..bba491ec32d72 100644
--- a/FWCore/ParameterSet/bin/edmPluginHelp.cpp
+++ b/FWCore/ParameterSet/bin/edmPluginHelp.cpp
@@ -2,7 +2,7 @@
 //
 // Package:     ParameterSet
 // Class  :     edmPluginHelp
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -32,7 +32,7 @@
 #include <iomanip>
 #include <memory>
 #include <sys/ioctl.h>
-#include <unistd.h> 
+#include <unistd.h>
 #include <map>
 #include <exception>
 #include <utility>
@@ -61,16 +61,16 @@ static char const* const kTopLevelCommandOpt = "topLevel,t";
 namespace {
 
   void getMatchingPlugins(edmplugin::PluginInfo const& pluginInfo,
-                          std::vector<edmplugin::PluginInfo> & matchingInfos,
-                          std::string & previousName,
+                          std::vector<edmplugin::PluginInfo>& matchingInfos,
+                          std::string& previousName,
                           std::string const& library,
                           std::string const& plugin) {
-
     // We do not want duplicate plugin names and
     // can safely assume the calls to this function
     // occur with the pluginInfo argument sorted by
     // pluginName
-    if (pluginInfo.name_ == previousName) return;
+    if (pluginInfo.name_ == previousName)
+      return;
     previousName = pluginInfo.name_;
 
     if (!library.empty() && pluginInfo.loadable_.leaf() != library) {
@@ -80,7 +80,7 @@ namespace {
     if (!plugin.empty() && pluginInfo.name_ != plugin) {
       return;
     }
-    
+
     matchingInfos.push_back(pluginInfo);
   }
 
@@ -93,10 +93,9 @@ namespace {
                          bool printOnlyLabels,
                          bool printOnlyPlugins,
                          unsigned lineWidth,
-                         int & iPlugin)
-  {
+                         int& iPlugin) {
     // Define the output stream for all output
-    std::ostream & os = std::cout;
+    std::ostream& os = std::cout;
     std::ios::fmtflags oldFlags = os.flags();
 
     ++iPlugin;
@@ -105,32 +104,35 @@ namespace {
 
     try {
       filler = std::unique_ptr<edm::ParameterSetDescriptionFillerBase>{factory->create(pluginInfo.name_)};
-    }
-    catch(cms::Exception& e) {
+    } catch (cms::Exception& e) {
       os << "\nSTART ERROR FROM edmPluginHelp\n";
       os << "The executable \"edmPluginHelp\" encountered a problem while creating a\n"
-                   "ParameterSetDescriptionFiller, probably related to loading a plugin.\n"
-                   "This plugin is being skipped.  Here is the info from the exception:\n"
+            "ParameterSetDescriptionFiller, probably related to loading a plugin.\n"
+            "This plugin is being skipped.  Here is the info from the exception:\n"
          << e.what() << std::endl;
       os << "END ERROR FROM edmPluginHelp\n\n";
       return;
     }
 
-    std::string const & baseType = (filler->extendedBaseType().empty() ? filler->baseType() : filler->extendedBaseType());
+    std::string const& baseType =
+        (filler->extendedBaseType().empty() ? filler->baseType() : filler->extendedBaseType());
 
     if (printOnlyPlugins) {
-
       os << std::setfill(' ');
       os << std::left;
       if (iPlugin == 1) {
-        os << std::setw(6) << "" << " ";
+        os << std::setw(6) << ""
+           << " ";
         os << std::setw(50) << "Plugin Name";
         os << std::setw(24) << "Plugin Type";
-        os << "Library Name" << "\n";
-        os << std::setw(6) << "" << " ";
+        os << "Library Name"
+           << "\n";
+        os << std::setw(6) << ""
+           << " ";
         os << std::setw(50) << "-----------";
         os << std::setw(24) << "-----------";
-        os << "------------" << "\n";
+        os << "------------"
+           << "\n";
       }
       os << std::setw(6) << iPlugin << " ";
       os << std::setw(50) << pluginInfo.name_;
@@ -140,20 +142,20 @@ namespace {
       return;
     }
 
-    os << std::left << iPlugin << "  " << pluginInfo.name_ << "  (" << baseType << ")  " << pluginInfo.loadable_.leaf() << "\n";
+    os << std::left << iPlugin << "  " << pluginInfo.name_ << "  (" << baseType << ")  " << pluginInfo.loadable_.leaf()
+       << "\n";
     os.flags(oldFlags);
 
     edm::ConfigurationDescriptions descriptions(filler->baseType(), pluginInfo.name_);
 
     try {
       filler->fill(descriptions);
-    }
-    catch(cms::Exception& e) {
+    } catch (cms::Exception& e) {
       os << "\nSTART ERROR FROM edmPluginHelp\n";
       os << "The executable \"edmPluginHelp\" encountered a problem while filling a\n"
             "ParameterSetDescription.  We give up for this plugin and skip printing out\n"
             "this description and any following descriptions for this plugin.  Here\n"
-            "is the info from the exception:\n" 
+            "is the info from the exception:\n"
          << e.what() << std::endl;
       os << "END ERROR FROM edmPluginHelp\n\n";
       return;
@@ -162,13 +164,12 @@ namespace {
     try {
       int indentation = 0;
       descriptions.print(os, moduleLabel, brief, printOnlyLabels, lineWidth, indentation, iPlugin);
-    }
-    catch(cms::Exception& e) {
+    } catch (cms::Exception& e) {
       os << "\nSTART ERROR FROM edmPluginHelp\n";
       os << "The executable \"edmPluginHelp\" encountered a problem while printing out a\n"
             "ParameterSetDescription.  We give up for this plugin and skip printing out\n"
             "this description and any following descriptions for this plugin.  Here\n"
-            "is the info from the exception:\n" 
+            "is the info from the exception:\n"
          << e.what() << std::endl;
       os << "END ERROR FROM edmPluginHelp\n\n";
       return;
@@ -176,8 +177,7 @@ namespace {
   }
 
   void printTopLevelParameterSets(bool brief, size_t lineWidth, std::string const& psetName) {
-
-    std::ostream & os = std::cout;
+    std::ostream& os = std::cout;
 
     edm::ParameterSetDescription description;
 
@@ -197,8 +197,9 @@ namespace {
       os << "\nDescription of \'maxSecondsUntilRampdown\' top level ParameterSet\n\n";
       edm::fillMaxSecondsUntilRampdownDescription(description);
     } else {
-      throw cms::Exception("CommandLineArgument") << "Unrecognized name for top level parameter set. "
-        << "Allowed values are 'options', 'maxEvents', 'maxLuminosityBlocks', and 'maxSecondsUntilRampdown'";
+      throw cms::Exception("CommandLineArgument")
+          << "Unrecognized name for top level parameter set. "
+          << "Allowed values are 'options', 'maxEvents', 'maxLuminosityBlocks', and 'maxSecondsUntilRampdown'";
     }
 
     edm::DocFormatHelper dfh;
@@ -209,11 +210,10 @@ namespace {
     description.print(os, dfh);
     os << "\n";
   }
-}
+}  // namespace
 // ---------------------------------------------------------------------------------
 
-int main (int argc, char **argv)
-try {
+int main(int argc, char** argv) try {
   // Process the command line arguments
   std::string descString(argv[0]);
   descString += " option [options]\n\n";
@@ -229,46 +229,44 @@ try {
 
   descString += "At least one of the following options must be used: -p, -l, -a, -q, or -t\n\n";
   descString += "Allowed options:";
-  boost::program_options::options_description desc(descString);   
-  desc.add_options()
-                  (kHelpCommandOpt, "produce help message")
-                  (kPluginCommandOpt,
-                   boost::program_options::value<std::string>(),
-                   "only print descriptions for this plugin")
-                  (kLibraryCommandOpt,
-                   boost::program_options::value<std::string>(),
-                   "only print descriptions for plugins in this library")
-                  (kAllLibrariesCommandOpt,
-                   "allows the program to run without selecting a plugin or library. "
-                   "This will take a significant amount of time.")
-                  (kModuleLabelCommandOpt,
-                   boost::program_options::value<std::string>(),
-                   "only print descriptions for this module label")
-                  (kBriefCommandOpt,
-                   "do not print comments, more compact format, suppress text"
-                   " added to help the user understand what the output means")
-                  (kPrintOnlyLabelsCommandOpt,
-                   "do not print parameter descriptions, just list module labels matching selection criteria")
-                  (kPrintOnlyPluginsCommandOpt,
-                   "do not print parameter descriptions or module labels, just list plugins matching selection criteria")
-                  (kLineWidthCommandOpt,
-                   boost::program_options::value<unsigned>(),
-                   "try to limit lines to this length by inserting newlines between words in comments. Long words or names can cause the line length to exceed this limit. Defaults to terminal screen width or 80")
-                  (kTopLevelCommandOpt, boost::program_options::value<std::string>(),
-                   "print only the description for the top level parameter set with this name. Allowed names are 'options', 'maxEvents', 'maxLuminosityBlocks', and 'maxSecondsUntilRampdown'.");
+  boost::program_options::options_description desc(descString);
+  desc.add_options()(kHelpCommandOpt, "produce help message")(
+      kPluginCommandOpt, boost::program_options::value<std::string>(), "only print descriptions for this plugin")(
+      kLibraryCommandOpt,
+      boost::program_options::value<std::string>(),
+      "only print descriptions for plugins in this library")(
+      kAllLibrariesCommandOpt,
+      "allows the program to run without selecting a plugin or library. "
+      "This will take a significant amount of time.")(kModuleLabelCommandOpt,
+                                                      boost::program_options::value<std::string>(),
+                                                      "only print descriptions for this module label")(
+      kBriefCommandOpt,
+      "do not print comments, more compact format, suppress text"
+      " added to help the user understand what the output means")(
+      kPrintOnlyLabelsCommandOpt,
+      "do not print parameter descriptions, just list module labels matching selection criteria")(
+      kPrintOnlyPluginsCommandOpt,
+      "do not print parameter descriptions or module labels, just list plugins matching selection criteria")(
+      kLineWidthCommandOpt,
+      boost::program_options::value<unsigned>(),
+      "try to limit lines to this length by inserting newlines between words in comments. Long words or names can "
+      "cause the line length to exceed this limit. Defaults to terminal screen width or 80")(
+      kTopLevelCommandOpt,
+      boost::program_options::value<std::string>(),
+      "print only the description for the top level parameter set with this name. Allowed names are 'options', "
+      "'maxEvents', 'maxLuminosityBlocks', and 'maxSecondsUntilRampdown'.");
 
   boost::program_options::variables_map vm;
   try {
-    store(boost::program_options::command_line_parser(argc,argv).options(desc).run(),vm);
+    store(boost::program_options::command_line_parser(argc, argv).options(desc).run(), vm);
     notify(vm);
-  } catch(boost::program_options::error const& iException) {
-    std::cerr << "Exception from command line processing: "
-              << iException.what() << "\n";
+  } catch (boost::program_options::error const& iException) {
+    std::cerr << "Exception from command line processing: " << iException.what() << "\n";
     std::cerr << desc << std::endl;
     return 1;
-  }     
+  }
 
-  if(vm.count(kHelpOpt)) {
+  if (vm.count(kHelpOpt)) {
     std::cout << desc << std::endl;
     return 0;
   }
@@ -288,10 +286,7 @@ try {
     library = vm[kLibraryOpt].as<std::string>();
   }
   if (!vm.count(kAllLibrariesOpt)) {
-    if (!vm.count(kPluginOpt) &&
-        !vm.count(kLibraryOpt) &&
-        !vm.count(kPrintOnlyPluginsOpt) &&
-        !vm.count(kTopLevelOpt)) {
+    if (!vm.count(kPluginOpt) && !vm.count(kLibraryOpt) && !vm.count(kPrintOnlyPluginsOpt) && !vm.count(kTopLevelOpt)) {
       std::cerr << "\nERROR: At least one of the following options must be used: -p, -l, -a, -q, or -t\n\n";
       std::cerr << desc << std::endl;
       return 1;
@@ -325,20 +320,18 @@ try {
 #ifdef TIOCGWINSZ
     {
       struct winsize w;
-      if (ioctl(2, TIOCGWINSZ, &w) == 0)
-      {
+      if (ioctl(2, TIOCGWINSZ, &w) == 0) {
         if (w.ws_col > 0)
-        lineWidth = w.ws_col;
+          lineWidth = w.ws_col;
       }
     }
 #else
 #ifdef WIOCGETD
     {
       struct uwdata w;
-      if (ioctl(2, WIOCGETD, &w) == 0)
-      {
+      if (ioctl(2, WIOCGETD, &w) == 0) {
         if (w.uw_width > 0)
-        lineWidth = w.uw_width / w.uw_hs;
+          lineWidth = w.uw_width / w.uw_hs;
       }
     }
 #endif
@@ -361,26 +354,27 @@ try {
   std::vector<edmplugin::PluginInfo> infos;
 
   try {
-
     edmplugin::PluginManager::configure(edmplugin::standard::config());
     typedef edmplugin::PluginManager::CategoryToInfos CatToInfos;
     CatToInfos const& catToInfos = edmplugin::PluginManager::get()->categoryToInfos();
     factory = edm::ParameterSetDescriptionFillerPluginFactory::get();
 
     CatToInfos::const_iterator itPlugins = catToInfos.find(factory->category());
-    if(itPlugins == catToInfos.end() ) {
+    if (itPlugins == catToInfos.end()) {
       return 0;
     }
     infos = itPlugins->second;
 
-  } catch(cms::Exception& e) {
-    std::cerr << "The executable \"edmPluginHelp\" failed while retrieving the list of parameter description plugins from the cache.\n"
-              << "The following problem occurred:\n" 
+  } catch (cms::Exception& e) {
+    std::cerr << "The executable \"edmPluginHelp\" failed while retrieving the list of parameter description plugins "
+                 "from the cache.\n"
+              << "The following problem occurred:\n"
               << e.what() << std::endl;
     return 1;
-  } catch(const std::exception& e) {
-    std::cerr << "The executable \"edmPluginHelp\" failed while retrieving the list of parameter description plugins from the cache.\n"
-              << "The following problem occurred:\n" 
+  } catch (const std::exception& e) {
+    std::cerr << "The executable \"edmPluginHelp\" failed while retrieving the list of parameter description plugins "
+                 "from the cache.\n"
+              << "The following problem occurred:\n"
               << e.what() << std::endl;
     return 1;
   }
@@ -391,25 +385,23 @@ try {
   std::vector<edmplugin::PluginInfo> matchingInfos;
 
   try {
-
     std::string previousName;
 
-    edm::for_all(infos, std::bind(&getMatchingPlugins,
-                                    std::placeholders::_1,
-                                    std::ref(matchingInfos),
-                                    std::ref(previousName),
-                                    std::cref(library),
-                                    std::cref(plugin)));
-  }
-  catch(cms::Exception& e) {
+    edm::for_all(infos,
+                 std::bind(&getMatchingPlugins,
+                           std::placeholders::_1,
+                           std::ref(matchingInfos),
+                           std::ref(previousName),
+                           std::cref(library),
+                           std::cref(plugin)));
+  } catch (cms::Exception& e) {
     std::cerr << "The executable \"edmPluginHelp\" failed while selecting plugins.\n"
-              << "The following problem occurred:\n" 
+              << "The following problem occurred:\n"
               << e.what() << std::endl;
     return 1;
-  }
-  catch(const std::exception& e) {
+  } catch (const std::exception& e) {
     std::cerr << "The executable \"edmPluginHelp\" failed while selecting plugins.\n"
-              << "The following problem occurred:\n" 
+              << "The following problem occurred:\n"
               << e.what() << std::endl;
     return 1;
   }
@@ -417,33 +409,33 @@ try {
   // For each selected plugin, fill the ParameterSetDescription for all defined
   // module labels and then print out the details of the description.
   try {
-
     int iPlugin = 0;
- 
-    edm::for_all(matchingInfos, std::bind(&writeDocForPlugin,
-                                            std::placeholders::_1,
-                                            factory,
-                                            std::cref(moduleLabel),
-                                            brief,
-                                            printOnlyLabels,
-                                            printOnlyPlugins,
-                                            lineWidth,
-                                            std::ref(iPlugin)));
-  } catch(cms::Exception& e) {
-    std::cerr << "\nThe executable \"edmPluginHelp\" failed. The following problem occurred:\n" 
+
+    edm::for_all(matchingInfos,
+                 std::bind(&writeDocForPlugin,
+                           std::placeholders::_1,
+                           factory,
+                           std::cref(moduleLabel),
+                           brief,
+                           printOnlyLabels,
+                           printOnlyPlugins,
+                           lineWidth,
+                           std::ref(iPlugin)));
+  } catch (cms::Exception& e) {
+    std::cerr << "\nThe executable \"edmPluginHelp\" failed. The following problem occurred:\n"
               << e.what() << std::endl;
     return 1;
-  } catch(const std::exception& e) {
-    std::cerr << "\nThe executable \"edmPluginHelp\" failed. The following problem occurred:\n" 
+  } catch (const std::exception& e) {
+    std::cerr << "\nThe executable \"edmPluginHelp\" failed. The following problem occurred:\n"
               << e.what() << std::endl;
     return 1;
   }
 
   return 0;
-} catch(cms::Exception const& e) {
+} catch (cms::Exception const& e) {
   std::cerr << e.explainSelf() << std::endl;
   return 1;
-} catch(std::exception const& e) {
+} catch (std::exception const& e) {
   std::cerr << e.what() << std::endl;
   return 1;
 }
diff --git a/FWCore/ParameterSet/bin/edmWriteConfigs.cpp b/FWCore/ParameterSet/bin/edmWriteConfigs.cpp
index 9a08f07fc32fa..294c096f73cd2 100644
--- a/FWCore/ParameterSet/bin/edmWriteConfigs.cpp
+++ b/FWCore/ParameterSet/bin/edmWriteConfigs.cpp
@@ -65,18 +65,19 @@ static char const* const kPluginCommandOpt = "plugin,x";
 
 namespace {
   void getMatchingPluginNames(edmplugin::PluginInfo const& pluginInfo,
-                              std::vector<std::string> & pluginNames,
-                              std::string & previousName,
+                              std::vector<std::string>& pluginNames,
+                              std::string& previousName,
                               std::string const& library) {
     // We do not want duplicate plugin names and
     // can safely assume the calls to this function
     // occur with the pluginInfo argument sorted by
     // pluginName
-    if(pluginInfo.name_ == previousName) return;
+    if (pluginInfo.name_ == previousName)
+      return;
     previousName = pluginInfo.name_;
 
     // If the library matches save the name
-    if(pluginInfo.loadable_.leaf() == library) {
+    if (pluginInfo.loadable_.leaf() == library) {
       pluginNames.push_back(pluginInfo.name_);
     }
   }
@@ -91,34 +92,29 @@ namespace {
     edm::ConfigurationDescriptions descriptions(filler->baseType(), pluginName);
 
     try {
-      edm::convertException::wrap([&]() {
-        filler->fill(descriptions);
-      });
-    }
-    catch(cms::Exception& e) {
+      edm::convertException::wrap([&]() { filler->fill(descriptions); });
+    } catch (cms::Exception& e) {
       std::ostringstream ost;
-      ost << "Filling ParameterSetDescriptions for module of base type " << baseType << " with plugin name \'" << pluginName << "\'";
+      ost << "Filling ParameterSetDescriptions for module of base type " << baseType << " with plugin name \'"
+          << pluginName << "\'";
       e.addContext(ost.str());
       throw;
     }
 
     try {
-      edm::convertException::wrap([&]() {
-        descriptions.writeCfis(usedCfiFileNames);
-      });
-    }
-    catch(cms::Exception& e) {
+      edm::convertException::wrap([&]() { descriptions.writeCfis(usedCfiFileNames); });
+    } catch (cms::Exception& e) {
       std::ostringstream ost;
-      ost << "Writing cfi files using ParameterSetDescriptions for module of base type " << baseType << " with plugin name \'" << pluginName << "\'";
+      ost << "Writing cfi files using ParameterSetDescriptions for module of base type " << baseType
+          << " with plugin name \'" << pluginName << "\'";
       e.addContext(ost.str());
       throw;
     }
   }
 
   struct Listener {
-
-    typedef std::pair< std::string, std::string> NameAndType;
-    typedef std::vector< NameAndType > NameAndTypes;
+    typedef std::pair<std::string, std::string> NameAndType;
+    typedef std::vector<NameAndType> NameAndTypes;
 
     void newFactory(edmplugin::PluginFactoryBase const* iBase) {
       using std::placeholders::_1;
@@ -132,22 +128,19 @@ namespace {
   };
 
   void getPluginsMatchingCategory(Listener::NameAndType const& nameAndType,
-                                  std::vector<std::string> & pluginNames,
+                                  std::vector<std::string>& pluginNames,
                                   std::string const& category) {
-    if(category == nameAndType.second){
+    if (category == nameAndType.second) {
       pluginNames.push_back(nameAndType.first);
     }
   }
-}
-
-int main (int argc, char **argv)
-try {
+}  // namespace
 
+int main(int argc, char** argv) try {
   edm::FileInPath::disableFileLookup();
 
   using std::placeholders::_1;
-  boost::filesystem::path initialWorkingDirectory =
-    boost::filesystem::initial_path<boost::filesystem::path>();
+  boost::filesystem::path initialWorkingDirectory = boost::filesystem::initial_path<boost::filesystem::path>();
 
   // Process the command line arguments
   std::string descString(argv[0]);
@@ -162,24 +155,22 @@ try {
   descString += "Instead of specifying a library, there is also an option to specify a plugin.\n\n";
   descString += "Allowed options";
   boost::program_options::options_description desc(descString);
-  desc.add_options()
-                  (kHelpCommandOpt, "produce help message")
-                  (kLibraryCommandOpt,
-                   boost::program_options::value<std::string>(),
-                   "library filename")
-                  (kPathCommandOpt, "When this option is set, the library filename "
-                   "is interpreted as a relative or absolute path. If there are no directories in "
-                   "the library filename, then it looks for the library file in the current directory. "
-                   "Fails with an error message if the path does not lead to a library file that exists "
-                   "or can be loaded. "
-                   "If this option is not set, then the library filename should only be "
-                   "a filename without any directories.  In that case, it is assumed "
-                   "the build system has already put the library file in the "
-                   "appropriate place, built the edmplugincache, and the PluginManager "
-                   "is used to find and load the library.")
-                  (kPluginCommandOpt,
-                   boost::program_options::value<std::string>(),
-                   "plugin name. You must specify either a library or plugin, but not both.");
+  desc.add_options()(kHelpCommandOpt, "produce help message")(
+      kLibraryCommandOpt, boost::program_options::value<std::string>(), "library filename")(
+      kPathCommandOpt,
+      "When this option is set, the library filename "
+      "is interpreted as a relative or absolute path. If there are no directories in "
+      "the library filename, then it looks for the library file in the current directory. "
+      "Fails with an error message if the path does not lead to a library file that exists "
+      "or can be loaded. "
+      "If this option is not set, then the library filename should only be "
+      "a filename without any directories.  In that case, it is assumed "
+      "the build system has already put the library file in the "
+      "appropriate place, built the edmplugincache, and the PluginManager "
+      "is used to find and load the library.")(
+      kPluginCommandOpt,
+      boost::program_options::value<std::string>(),
+      "plugin name. You must specify either a library or plugin, but not both.");
 
   boost::program_options::positional_options_description p;
   p.add(kLibraryOpt, -1);
@@ -188,14 +179,13 @@ try {
   try {
     store(boost::program_options::command_line_parser(argc, argv).options(desc).positional(p).run(), vm);
     notify(vm);
-  } catch(boost::program_options::error const& iException) {
-    std::cerr << "Exception from command line processing: "
-              << iException.what() << "\n";
+  } catch (boost::program_options::error const& iException) {
+    std::cerr << "Exception from command line processing: " << iException.what() << "\n";
     std::cerr << desc << std::endl;
     return 1;
   }
 
-  if(vm.count(kHelpOpt)) {
+  if (vm.count(kHelpOpt)) {
     std::cout << desc << std::endl;
     return 0;
   }
@@ -205,58 +195,51 @@ try {
 
   try {
     edm::convertException::wrap([&]() {
-
-      if(vm.count(kLibraryOpt) && vm.count(kPluginOpt)) {
+      if (vm.count(kLibraryOpt) && vm.count(kPluginOpt)) {
         throw cms::Exception("Command Line Arguments")
-          << "Both library and plugin specified. You must specify one or the other, but not both.";
+            << "Both library and plugin specified. You must specify one or the other, but not both.";
       }
-      if(vm.count(kLibraryOpt)) {
+      if (vm.count(kLibraryOpt)) {
         library = vm[kLibraryOpt].as<std::string>();
-      }
-      else if(vm.count(kPluginOpt)) {
+      } else if (vm.count(kPluginOpt)) {
         requestedPlugin = vm[kPluginOpt].as<std::string>();
-      }
-      else {
+      } else {
         throw cms::Exception("Command Line Arguments")
-          << "No library or plugin specified. You must specify one or the other (but not both).";
+            << "No library or plugin specified. You must specify one or the other (but not both).";
       }
 
       edm::ParameterSetDescriptionFillerPluginFactory* factory;
       std::vector<std::string> pluginNames;
 
-      if(vm.count(kPluginOpt)) {
+      if (vm.count(kPluginOpt)) {
         edmplugin::PluginManager::configure(edmplugin::standard::config());
         factory = edm::ParameterSetDescriptionFillerPluginFactory::get();
         pluginNames.push_back(requestedPlugin);
       }
       // If using the PluginManager to find the library
-      else if(!vm.count(kPathOpt)) {
-
+      else if (!vm.count(kPathOpt)) {
         // From the PluginManager get a reference to a
         // a vector of PlugInInfo's for plugins defining ParameterSetDescriptions.
         // Each PlugInInfo contains the plugin name and library name.
         edmplugin::PluginManager::configure(edmplugin::standard::config());
         typedef edmplugin::PluginManager::CategoryToInfos CatToInfos;
-        CatToInfos const& catToInfos
-          = edmplugin::PluginManager::get()->categoryToInfos();
-        factory =
-          edm::ParameterSetDescriptionFillerPluginFactory::get();
+        CatToInfos const& catToInfos = edmplugin::PluginManager::get()->categoryToInfos();
+        factory = edm::ParameterSetDescriptionFillerPluginFactory::get();
         CatToInfos::const_iterator itPlugins = catToInfos.find(factory->category());
 
         // No plugins in this category at all
-        if(itPlugins == catToInfos.end() ) return;
+        if (itPlugins == catToInfos.end())
+          return;
 
         std::vector<edmplugin::PluginInfo> const& infos = itPlugins->second;
         std::string previousName;
 
-        edm::for_all(infos, std::bind(&getMatchingPluginNames,
-                                      _1,
-                                      std::ref(pluginNames),
-                                      std::ref(previousName),
-                                      std::cref(library)));
+        edm::for_all(
+            infos,
+            std::bind(&getMatchingPluginNames, _1, std::ref(pluginNames), std::ref(previousName), std::cref(library)));
 
       } else {
-      // the library name is part of a path
+        // the library name is part of a path
 
         Listener listener;
         edmplugin::PluginFactoryManager* pfm = edmplugin::PluginFactoryManager::get();
@@ -272,7 +255,7 @@ try {
         // LD_LIBRARY_PATH or some other location that it searches
         // to find some library that has the same name, but
         // was not the intended target.
-        if(loadableFile.filename() == loadableFile.string()) {
+        if (loadableFile.filename() == loadableFile.string()) {
           loadableFile = initialWorkingDirectory / loadableFile;
         }
 
@@ -280,59 +263,47 @@ try {
         // The listener records the plugin names and categories as they are loaded
         try {
           edmplugin::SharedLibrary lib(loadableFile);
-        }
-        catch(cms::Exception const& iException) {
-          if(iException.category() == "PluginLibraryLoadError") {
+        } catch (cms::Exception const& iException) {
+          if (iException.category() == "PluginLibraryLoadError") {
             std::cerr << "error: edmWriteConfigs caught an exception while loading a plugin library.\n"
                       << "The executable will return success (0) so scram will continue,\n"
                       << "but no cfi files will be written.\n"
                       << iException.what() << std::endl;
             return;
-          }
-          else {
+          } else {
             throw;
           }
         }
 
         // We do not care about PluginCapabilities category so do not bother to try to include them
 
-        factory =
-          edm::ParameterSetDescriptionFillerPluginFactory::get();
+        factory = edm::ParameterSetDescriptionFillerPluginFactory::get();
 
-        edm::for_all(listener.nameAndTypes_, std::bind(&getPluginsMatchingCategory,
-                                                         _1,
-                                                         std::ref(pluginNames),
-                                                         std::cref(factory->category())));
+        edm::for_all(listener.nameAndTypes_,
+                     std::bind(&getPluginsMatchingCategory, _1, std::ref(pluginNames), std::cref(factory->category())));
       }
 
       std::set<std::string> usedCfiFileNames;
-      edm::for_all(pluginNames, std::bind(&writeCfisForPlugin,
-                                            _1,
-                                            factory,
-                                            std::ref(usedCfiFileNames)));
+      edm::for_all(pluginNames, std::bind(&writeCfisForPlugin, _1, factory, std::ref(usedCfiFileNames)));
     });
-  }
-  catch (cms::Exception & iException) {
+  } catch (cms::Exception& iException) {
     if (!library.empty()) {
       std::ostringstream ost;
       ost << "Processing library " << library;
       iException.addContext(ost.str());
     }
     iException.addContext("Running executable \"edmWriteConfigs\"");
-    std::cerr
-      << "----- Begin Fatal Exception "
-      << std::setprecision(0) << edm::TimeOfDay()
-      << "-----------------------\n"
-      << iException.explainSelf()
-      << "----- End Fatal Exception -------------------------------------------------"
-      << std::endl;
+    std::cerr << "----- Begin Fatal Exception " << std::setprecision(0) << edm::TimeOfDay()
+              << "-----------------------\n"
+              << iException.explainSelf()
+              << "----- End Fatal Exception -------------------------------------------------" << std::endl;
     return 1;
   }
   return 0;
-} catch(cms::Exception const& e) {
+} catch (cms::Exception const& e) {
   std::cerr << e.explainSelf() << std::endl;
   return 1;
-} catch(std::exception const& e) {
+} catch (std::exception const& e) {
   std::cerr << e.what() << std::endl;
   return 1;
 }
diff --git a/FWCore/ParameterSet/interface/ANDGroupDescription.h b/FWCore/ParameterSet/interface/ANDGroupDescription.h
index 02c87c8a8db4c..e7bca224b8c6d 100644
--- a/FWCore/ParameterSet/interface/ANDGroupDescription.h
+++ b/FWCore/ParameterSet/interface/ANDGroupDescription.h
@@ -17,8 +17,7 @@ namespace edm {
 
   class ANDGroupDescription : public ParameterDescriptionNode {
   public:
-    ANDGroupDescription(ParameterDescriptionNode const& node_left,
-                        ParameterDescriptionNode const& node_right);
+    ANDGroupDescription(ParameterDescriptionNode const& node_left, ParameterDescriptionNode const& node_right);
 
     ANDGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
                         ParameterDescriptionNode const& node_right);
@@ -29,37 +28,22 @@ namespace edm {
     ANDGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
                         std::unique_ptr<ParameterDescriptionNode> node_right);
 
-    ParameterDescriptionNode* clone() const override {
-      return new ANDGroupDescription(*this);
-    }
+    ParameterDescriptionNode* clone() const override { return new ANDGroupDescription(*this); }
 
   private:
+    void checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
+                                    std::set<ParameterTypes>& parameterTypes,
+                                    std::set<ParameterTypes>& wildcardTypes) const override;
 
-    void checkAndGetLabelsAndTypes_(std::set<std::string> & usedLabels,
-                                    std::set<ParameterTypes> & parameterTypes,
-                                    std::set<ParameterTypes> & wildcardTypes) const override;
+    void validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const override;
 
-    void validate_(ParameterSet & pset,
-                   std::set<std::string> & validatedLabels,
-                   bool optional) const override;
+    void writeCfi_(std::ostream& os, bool& startWithComma, int indentation, bool& wroteSomething) const override;
 
-    void writeCfi_(std::ostream & os,
-                   bool & startWithComma,
-                   int indentation,
-                   bool & wroteSomething) const override;
+    void print_(std::ostream& os, bool optional, bool writeToCfi, DocFormatHelper& dfh) const override;
 
-    void print_(std::ostream & os,
-                bool optional,
-                bool writeToCfi,
-                DocFormatHelper & dfh) const override;
+    bool hasNestedContent_() const override { return true; }
 
-    bool hasNestedContent_() const override {
-      return true;
-    }
-
-    void printNestedContent_(std::ostream & os,
-                             bool optional,
-                             DocFormatHelper & dfh) const override;
+    void printNestedContent_(std::ostream& os, bool optional, DocFormatHelper& dfh) const override;
 
     bool exists_(ParameterSet const& pset) const override;
 
@@ -67,15 +51,13 @@ namespace edm {
 
     int howManyXORSubNodesExist_(ParameterSet const& pset) const override;
 
-
     void throwIfDuplicateLabels(std::set<std::string> const& labelsLeft,
                                 std::set<std::string> const& labelsRight) const;
 
-    void throwIfDuplicateTypes(std::set<ParameterTypes> const& types1,
-                               std::set<ParameterTypes> const& types2) const;
+    void throwIfDuplicateTypes(std::set<ParameterTypes> const& types1, std::set<ParameterTypes> const& types2) const;
 
     edm::value_ptr<ParameterDescriptionNode> node_left_;
     edm::value_ptr<ParameterDescriptionNode> node_right_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/AllowedLabelsDescription.h b/FWCore/ParameterSet/interface/AllowedLabelsDescription.h
index b67a5ce97ee2a..e43c4be21460c 100644
--- a/FWCore/ParameterSet/interface/AllowedLabelsDescription.h
+++ b/FWCore/ParameterSet/interface/AllowedLabelsDescription.h
@@ -19,109 +19,77 @@ namespace edm {
   class ParameterSetDescription;
   class DocFormatHelper;
 
-  template<class T>
+  template <class T>
   class AllowedLabelsDescription : public AllowedLabelsDescriptionBase {
-
   public:
-    AllowedLabelsDescription(std::string const& label,
-                             bool isTracked) :
-      AllowedLabelsDescriptionBase(label, ParameterTypeToEnum::toEnum<T>(), isTracked)
-    {              
-    }
+    AllowedLabelsDescription(std::string const& label, bool isTracked)
+        : AllowedLabelsDescriptionBase(label, ParameterTypeToEnum::toEnum<T>(), isTracked) {}
 
-    AllowedLabelsDescription(char const* label,
-                             bool isTracked) :
-      AllowedLabelsDescriptionBase(label, ParameterTypeToEnum::toEnum<T>(), isTracked)
-    {
-    }
+    AllowedLabelsDescription(char const* label, bool isTracked)
+        : AllowedLabelsDescriptionBase(label, ParameterTypeToEnum::toEnum<T>(), isTracked) {}
 
-    ~AllowedLabelsDescription() override
-    {
-    }
+    ~AllowedLabelsDescription() override {}
 
-    ParameterDescriptionNode* clone() const override {
-      return new AllowedLabelsDescription(*this);
-    }
+    ParameterDescriptionNode* clone() const override { return new AllowedLabelsDescription(*this); }
 
   private:
-
     void validateAllowedLabel_(std::string const& allowedLabel,
-                               ParameterSet & pset,
-                               std::set<std::string> & validatedLabels) const override {
+                               ParameterSet& pset,
+                               std::set<std::string>& validatedLabels) const override {
       if (pset.existsAs<T>(allowedLabel, isTracked())) {
         validatedLabels.insert(allowedLabel);
       }
     }
   };
 
-  template<>
+  template <>
   class AllowedLabelsDescription<ParameterSetDescription> : public AllowedLabelsDescriptionBase {
-
   public:
-    AllowedLabelsDescription(std::string const& label,
-                             bool isTracked);
+    AllowedLabelsDescription(std::string const& label, bool isTracked);
 
-    AllowedLabelsDescription(char const* label,
-                             bool isTracked);
+    AllowedLabelsDescription(char const* label, bool isTracked);
 
-    AllowedLabelsDescription(std::string const& label,
-                             ParameterSetDescription const& value,
-                             bool isTracked);
+    AllowedLabelsDescription(std::string const& label, ParameterSetDescription const& value, bool isTracked);
 
-    AllowedLabelsDescription(char const* label,
-                             ParameterSetDescription const& value,
-                             bool isTracked);
+    AllowedLabelsDescription(char const* label, ParameterSetDescription const& value, bool isTracked);
 
     ~AllowedLabelsDescription() override;
 
     ParameterDescriptionNode* clone() const override;
 
   private:
-
-    void printNestedContent_(std::ostream & os,
-                             bool optional,
-                             DocFormatHelper & helper) const override;
+    void printNestedContent_(std::ostream& os, bool optional, DocFormatHelper& helper) const override;
 
     void validateAllowedLabel_(std::string const& allowedLabel,
-                               ParameterSet & pset,
-                               std::set<std::string> & validatedLabels) const override;
+                               ParameterSet& pset,
+                               std::set<std::string>& validatedLabels) const override;
 
     value_ptr<ParameterSetDescription> psetDesc_;
   };
 
-  template<>
+  template <>
   class AllowedLabelsDescription<std::vector<ParameterSet> > : public AllowedLabelsDescriptionBase {
-
   public:
-    AllowedLabelsDescription(std::string const& label,
-                             bool isTracked);
+    AllowedLabelsDescription(std::string const& label, bool isTracked);
 
-    AllowedLabelsDescription(char const* label,
-                             bool isTracked);
+    AllowedLabelsDescription(char const* label, bool isTracked);
 
-    AllowedLabelsDescription(std::string const& label,
-                             ParameterSetDescription const& value,
-                             bool isTracked);
+    AllowedLabelsDescription(std::string const& label, ParameterSetDescription const& value, bool isTracked);
 
-    AllowedLabelsDescription(char const* label,
-                             ParameterSetDescription const& value,
-                             bool isTracked);
+    AllowedLabelsDescription(char const* label, ParameterSetDescription const& value, bool isTracked);
 
     ~AllowedLabelsDescription() override;
 
     ParameterDescriptionNode* clone() const override;
 
   private:
-
-    void printNestedContent_(std::ostream & os,
-                             bool optional,
-                             DocFormatHelper & helper) const override;
+    void printNestedContent_(std::ostream& os, bool optional, DocFormatHelper& helper) const override;
 
     void validateAllowedLabel_(std::string const& allowedLabel,
-                               ParameterSet & pset,
-                               std::set<std::string> & validatedLabels) const override;
+                               ParameterSet& pset,
+                               std::set<std::string>& validatedLabels) const override;
 
     value_ptr<ParameterSetDescription> psetDesc_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/AllowedLabelsDescriptionBase.h b/FWCore/ParameterSet/interface/AllowedLabelsDescriptionBase.h
index 56fe118f8c420..e9b4d4fe6fb5b 100644
--- a/FWCore/ParameterSet/interface/AllowedLabelsDescriptionBase.h
+++ b/FWCore/ParameterSet/interface/AllowedLabelsDescriptionBase.h
@@ -15,48 +15,32 @@ namespace edm {
 
   class AllowedLabelsDescriptionBase : public ParameterDescriptionNode {
   public:
-
     ~AllowedLabelsDescriptionBase() override;
 
     ParameterTypes type() const { return type_; }
     bool isTracked() const { return isTracked_; }
 
   protected:
-
     AllowedLabelsDescriptionBase(std::string const& label, ParameterTypes iType, bool isTracked);
 
     AllowedLabelsDescriptionBase(char const* label, ParameterTypes iType, bool isTracked);
 
-    void printNestedContentBase_(std::ostream & os,
-                                 bool optional,
-                                 DocFormatHelper & dfh) const;
+    void printNestedContentBase_(std::ostream& os, bool optional, DocFormatHelper& dfh) const;
 
   private:
+    void checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
+                                    std::set<ParameterTypes>& parameterTypes,
+                                    std::set<ParameterTypes>& wildcardTypes) const override;
 
-    void checkAndGetLabelsAndTypes_(std::set<std::string> & usedLabels,
-                                    std::set<ParameterTypes> & parameterTypes,
-                                    std::set<ParameterTypes> & wildcardTypes) const override;
-
-    void validate_(ParameterSet & pset,
-                   std::set<std::string> & validatedLabels,
-                   bool optional) const override;
-
-    void writeCfi_(std::ostream & os,
-                   bool & startWithComma,
-                   int indentation,
-                   bool & wroteSomething) const override;
+    void validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const override;
 
+    void writeCfi_(std::ostream& os, bool& startWithComma, int indentation, bool& wroteSomething) const override;
 
-    void print_(std::ostream & os,
-                bool optional,
-                bool writeToCfi,
-                DocFormatHelper & dfh) const override;
+    void print_(std::ostream& os, bool optional, bool writeToCfi, DocFormatHelper& dfh) const override;
 
     bool hasNestedContent_() const override;
 
-    void printNestedContent_(std::ostream & os,
-                             bool optional,
-                             DocFormatHelper & dfh) const override;
+    void printNestedContent_(std::ostream& os, bool optional, DocFormatHelper& dfh) const override;
 
     bool exists_(ParameterSet const& pset) const override;
 
@@ -65,13 +49,13 @@ namespace edm {
     int howManyXORSubNodesExist_(ParameterSet const& pset) const override;
 
     virtual void validateAllowedLabel_(std::string const& allowedLabel,
-                                       ParameterSet & pset,
-                                       std::set<std::string> & validatedLabels) const = 0;
+                                       ParameterSet& pset,
+                                       std::set<std::string>& validatedLabels) const = 0;
 
     ParameterDescription<std::vector<std::string> > parameterHoldingLabels_;
     ParameterTypes type_;
     bool isTracked_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ParameterSet/interface/ConfigurationDescriptions.h b/FWCore/ParameterSet/interface/ConfigurationDescriptions.h
index 48cd317ea42d0..a69206eacd29e 100644
--- a/FWCore/ParameterSet/interface/ConfigurationDescriptions.h
+++ b/FWCore/ParameterSet/interface/ConfigurationDescriptions.h
@@ -4,7 +4,7 @@
 //
 // Package:     ParameterSet
 // Class  :     ConfigurationDescriptions
-// 
+//
 /**\class ConfigurationDescriptions ConfigurationDescriptions.h FWCore/ParameterSet/interface/ConfigurationDescriptions.h
 
  Used to hold ParameterSetDescriptions corresponding to labels
@@ -27,9 +27,8 @@ namespace edm {
 
   class ConfigurationDescriptions {
   public:
-    
     typedef std::vector<std::pair<std::string, ParameterSetDescription> >::iterator iterator;
-    
+
     //NOTE: This does not take ownership of the PreValidatorBase instance so
     // this instance must remain valid for as long as the ConfigurationDescriptions
     // is being modified
@@ -43,7 +42,7 @@ namespace edm {
     // ---------------------------------------------------------
 
     std::string const& comment() const { return comment_; }
-    void setComment(std::string const & value);
+    void setComment(std::string const& value);
     void setComment(char const* value);
 
     void add(std::string const& label, ParameterSetDescription const& psetDescription);
@@ -56,16 +55,16 @@ namespace edm {
     ParameterSetDescription* defaultDescription();
     iterator begin();
     iterator end();
-    
+
     // ---------------------------------------------------------
     // These functions use the information in the descriptions
     // ---------------------------------------------------------
 
-    void validate(ParameterSet & pset, std::string const& moduleLabel) const;
+    void validate(ParameterSet& pset, std::string const& moduleLabel) const;
 
     void writeCfis(std::set<std::string>& usedCfiFileNames) const;
 
-    void print(std::ostream & os,
+    void print(std::ostream& os,
                std::string const& moduleLabel,
                bool brief,
                bool printOnlyLabels,
@@ -76,7 +75,6 @@ namespace edm {
     // ---------------------------------------------------------
 
   private:
-
     class DescriptionCounter {
     public:
       int iPlugin;
@@ -90,15 +88,15 @@ namespace edm {
                                  std::set<std::string>& usedCfiFileNames);
 
     void printForLabel(std::pair<std::string, ParameterSetDescription> const& labelAndDesc,
-                       std::ostream & os,
+                       std::ostream& os,
                        std::string const& moduleLabel,
                        bool brief,
                        bool printOnlyLabels,
                        size_t lineWidth,
                        int indentationn,
-                       DescriptionCounter & counter) const;
+                       DescriptionCounter& counter) const;
 
-    void printForLabel(std::ostream & os,
+    void printForLabel(std::ostream& os,
                        std::string const& label,
                        ParameterSetDescription const& description,
                        std::string const& moduleLabel,
@@ -106,7 +104,7 @@ namespace edm {
                        bool printOnlyLabels,
                        size_t lineWidth,
                        int indentationn,
-                       DescriptionCounter & counter) const;
+                       DescriptionCounter& counter) const;
 
     std::string baseType_;
     std::string pluginName_;
@@ -118,6 +116,6 @@ namespace edm {
     std::string comment_;
     bool defaultDescDefined_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ParameterSet/interface/DocFormatHelper.h b/FWCore/ParameterSet/interface/DocFormatHelper.h
index 139c90eaff31c..93b80695c7e19 100644
--- a/FWCore/ParameterSet/interface/DocFormatHelper.h
+++ b/FWCore/ParameterSet/interface/DocFormatHelper.h
@@ -13,30 +13,21 @@ namespace edm {
   class ParameterDescriptionNode;
 
   class DocFormatHelper {
-
   public:
-
-    enum DescriptionParent {
-      TOP,
-      OR,
-      XOR,
-      AND,
-      OTHER      
-    };
-
-    DocFormatHelper() :
-      brief_(false),
-      lineWidth_(80),
-      indentation_(4),
-      startColumn2_(24U),
-      section_(),
-      pass_(0),
-      column1_(0),
-      column2_(0),
-      column3_(0),
-      counter_(0),
-      parent_(OTHER)
-    { }
+    enum DescriptionParent { TOP, OR, XOR, AND, OTHER };
+
+    DocFormatHelper()
+        : brief_(false),
+          lineWidth_(80),
+          indentation_(4),
+          startColumn2_(24U),
+          section_(),
+          pass_(0),
+          column1_(0),
+          column2_(0),
+          column3_(0),
+          counter_(0),
+          parent_(OTHER) {}
 
     void init();
 
@@ -59,9 +50,18 @@ namespace edm {
     size_t column2() const { return column2_; }
     size_t column3() const { return column3_; }
 
-    void setAtLeast1(size_t width) { if (width > column1_) column1_ = width; }
-    void setAtLeast2(size_t width) { if (width > column2_) column2_ = width; }
-    void setAtLeast3(size_t width) { if (width > column3_) column3_ = width; }
+    void setAtLeast1(size_t width) {
+      if (width > column1_)
+        column1_ = width;
+    }
+    void setAtLeast2(size_t width) {
+      if (width > column2_)
+        column2_ = width;
+    }
+    void setAtLeast3(size_t width) {
+      if (width > column3_)
+        column3_ = width;
+    }
 
     int counter() const { return counter_; }
     void setCounter(int value) { counter_ = value; }
@@ -73,20 +73,16 @@ namespace edm {
 
     size_t commentWidth() const;
 
-    static void wrapAndPrintText(std::ostream & os,
-                                 std::string const& text,
-                                 size_t indent,
-                                 size_t suggestedWidth);
+    static void wrapAndPrintText(std::ostream& os, std::string const& text, size_t indent, size_t suggestedWidth);
 
-    void indent(std::ostream & os) const;
-    void indent2(std::ostream & os) const;
+    void indent(std::ostream& os) const;
+    void indent2(std::ostream& os) const;
 
     static int offsetModuleLabel() { return 2; }
     static int offsetTopLevelPSet() { return 2; }
     static int offsetSectionContent() { return 4; }
 
   private:
-
     bool brief_;
     size_t lineWidth_;
     int indentation_;
@@ -104,5 +100,5 @@ namespace edm {
 
     DescriptionParent parent_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/EmptyGroupDescription.h b/FWCore/ParameterSet/interface/EmptyGroupDescription.h
index bc80d4d6e7e95..c41d4d7e0ac5f 100644
--- a/FWCore/ParameterSet/interface/EmptyGroupDescription.h
+++ b/FWCore/ParameterSet/interface/EmptyGroupDescription.h
@@ -16,29 +16,18 @@ namespace edm {
   public:
     EmptyGroupDescription();
 
-    ParameterDescriptionNode* clone() const override {
-      return new EmptyGroupDescription(*this);
-    }
+    ParameterDescriptionNode* clone() const override { return new EmptyGroupDescription(*this); }
 
   private:
+    void checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
+                                    std::set<ParameterTypes>& parameterTypes,
+                                    std::set<ParameterTypes>& wildcardTypes) const override;
 
-    void checkAndGetLabelsAndTypes_(std::set<std::string> & usedLabels,
-                                    std::set<ParameterTypes> & parameterTypes,
-                                    std::set<ParameterTypes> & wildcardTypes) const override;
+    void validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const override;
 
-    void validate_(ParameterSet & pset,
-                   std::set<std::string> & validatedLabels,
-                   bool optional) const override;
+    void writeCfi_(std::ostream& os, bool& startWithComma, int indentation, bool& wroteSomething) const override;
 
-    void writeCfi_(std::ostream & os,
-                   bool & startWithComma,
-                   int indentation,
-                   bool & wroteSomething) const override;
-
-    void print_(std::ostream & os,
-                bool optional,
-                bool writeToCfi,
-                DocFormatHelper & dfh) const override;
+    void print_(std::ostream& os, bool optional, bool writeToCfi, DocFormatHelper& dfh) const override;
 
     bool exists_(ParameterSet const& pset) const override;
 
@@ -46,5 +35,5 @@ namespace edm {
 
     int howManyXORSubNodesExist_(ParameterSet const& pset) const override;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/Entry.h b/FWCore/ParameterSet/interface/Entry.h
index b4fc202090e06..5e744375c6803 100644
--- a/FWCore/ParameterSet/interface/Entry.h
+++ b/FWCore/ParameterSet/interface/Entry.h
@@ -10,7 +10,6 @@
 //
 // ----------------------------------------------------------------------
 
-
 #include <string>
 #include <vector>
 #include <iosfwd>
@@ -42,11 +41,11 @@ namespace edm {
   public:
     // Bool
     Entry(std::string const& name, bool val, bool is_tracked);
-    bool  getBool() const;
+    bool getBool() const;
 
     // Int32
     Entry(std::string const& name, int val, bool is_tracked);
-    int  getInt32() const;
+    int getInt32() const;
 
     // vInt32
     Entry(std::string const& name, std::vector<int> const& val, bool is_tracked);
@@ -54,7 +53,7 @@ namespace edm {
 
     // Uint32
     Entry(std::string const& name, unsigned val, bool is_tracked);
-    unsigned  getUInt32() const;
+    unsigned getUInt32() const;
 
     // vUint32
     Entry(std::string const& name, std::vector<unsigned> const& val, bool is_tracked);
@@ -62,7 +61,7 @@ namespace edm {
 
     // Int64
     Entry(std::string const& name, long long val, bool is_tracked);
-    long long  getInt64() const;
+    long long getInt64() const;
 
     // vInt64
     Entry(std::string const& name, std::vector<long long> const& val, bool is_tracked);
@@ -70,7 +69,7 @@ namespace edm {
 
     // Uint64
     Entry(std::string const& name, unsigned long long val, bool is_tracked);
-    unsigned long long  getUInt64() const;
+    unsigned long long getUInt64() const;
 
     // vUint64
     Entry(std::string const& name, std::vector<unsigned long long> const& val, bool is_tracked);
@@ -155,10 +154,8 @@ namespace edm {
 
     // coded string
     Entry(std::string const& name, std::string const&);
-    Entry(std::string const& name, std::string const& type,
-          std::string const& value, bool is_tracked);
-    Entry(std::string const& name, std::string const& type,
-          std::vector<std::string> const& value, bool is_tracked);
+    Entry(std::string const& name, std::string const& type, std::string const& value, bool is_tracked);
+    Entry(std::string const& name, std::string const& type, std::vector<std::string> const& value, bool is_tracked);
 
     ~Entry() = default;
     Entry(Entry const&) = default;
@@ -169,9 +166,9 @@ namespace edm {
 
     std::string toString() const;
     void toString(std::string& result) const;
-    void toDigest(cms::Digest &digest) const;
+    void toDigest(cms::Digest& digest) const;
 
-    size_t sizeOfString() const {return rep.size() + 4;}
+    size_t sizeOfString() const { return rep.size() + 4; }
 
     // access
     bool isTracked() const { return tracked == '+'; }
@@ -182,9 +179,9 @@ namespace edm {
 
   private:
     std::string name_;
-    std::string  rep;
-    char         type;
-    char         tracked;
+    std::string rep;
+    char type;
+    char tracked;
 
     // verify class invariant
     void validate() const;
@@ -194,22 +191,14 @@ namespace edm {
 
     // helpers to throw exceptions
     void throwValueError(char const* expectedType) const;
-    void throwEntryError(char const* expectedType,std::string const& badRep) const;
+    void throwEntryError(char const* expectedType, std::string const& badRep) const;
     void throwEncodeError(char const* type) const;
 
   };  // Entry
 
+  inline bool operator==(Entry const& a, Entry const& b) { return a.toString() == b.toString(); }
 
-  inline bool
-  operator==(Entry const& a, Entry const& b) {
-    return a.toString() == b.toString();
-  }
-
-  inline bool
-  operator!=(Entry const& a, Entry const& b) {
-    return !(a == b);
-  }
-} // namespace edm
-
+  inline bool operator!=(Entry const& a, Entry const& b) { return !(a == b); }
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ParameterSet/interface/FileInPath.h b/FWCore/ParameterSet/interface/FileInPath.h
index 497d75e3b2434..68225fba6497e 100644
--- a/FWCore/ParameterSet/interface/FileInPath.h
+++ b/FWCore/ParameterSet/interface/FileInPath.h
@@ -54,27 +54,16 @@
 //     Therefore, any changes made to these variables externally during the lifetime of
 //     a FileInPath object will have no effect.
 
-
 // TODO: Find the correct package for this class to reside. It
 // doesn't seem well-suited for ParameterSet.
 
-
 #include <iosfwd>
 #include <string>
 
-
-namespace edm
-{
-  class FileInPath
-  {
+namespace edm {
+  class FileInPath {
   public:
-
-    enum LocationCode {
-      Unknown = 0,
-      Local = 1,
-      Release = 2,
-      Data = 3
-    };
+    enum LocationCode { Unknown = 0, Local = 1, Release = 2, Data = 3 };
 
     /// Default c'tor does no file-existence check; what file would it
     /// check for existence?
@@ -85,7 +74,7 @@ namespace edm
     explicit FileInPath(const char* r);
 
     FileInPath(FileInPath const& other);
-    FileInPath& operator=( FileInPath const& other);
+    FileInPath& operator=(FileInPath const& other);
     ~FileInPath();
     void swap(FileInPath& other);
 
@@ -98,7 +87,7 @@ namespace edm
     LocationCode location() const;
 
     /// Return a string that can be used to open the referenced
-    /// file. 
+    /// file.
     ///
     /// Note that operations on this file may fail, including
     /// testing for existence. This is because the state of a
@@ -110,7 +99,7 @@ namespace edm
     /// Write contents to the given ostream.
     /// Writing errors are reflected in the state of the stream.
     void write(std::ostream& os) const;
-    
+
     /// Read from the given istream, and set contents accordingly.
     /// Reading errors are reflected in the state of the stream.
     void read(std::istream& is);
@@ -121,13 +110,13 @@ namespace edm
     static void disableFileLookup();
 
   private:
-    std::string    relativePath_;
-    std::string    canonicalFilename_;
-    LocationCode   location_;
-    std::string    localTop_;
-    std::string    releaseTop_;
-    std::string    dataTop_;
-    std::string    searchPath_;
+    std::string relativePath_;
+    std::string canonicalFilename_;
+    LocationCode location_;
+    std::string localTop_;
+    std::string releaseTop_;
+    std::string dataTop_;
+    std::string searchPath_;
 
     // Helper function for construction.
     void getEnvironment();
@@ -135,34 +124,22 @@ namespace edm
   };
 
   // Free swap function
-  inline
-  void
-  swap(FileInPath& a, FileInPath& b) 
-  {
-    a.swap(b);
-  }
+  inline void swap(FileInPath& a, FileInPath& b) { a.swap(b); }
 
-  inline  std::ostream& 
-  operator<< (std::ostream& os, const edm::FileInPath& fip)
-  {
+  inline std::ostream& operator<<(std::ostream& os, const edm::FileInPath& fip) {
     fip.write(os);
     return os;
   }
 
-  inline std::istream&
-  operator>> (std::istream& is, FileInPath& fip)
-  {
+  inline std::istream& operator>>(std::istream& is, FileInPath& fip) {
     fip.read(is);
     return is;
   }
 
-  inline bool
-  operator== (edm::FileInPath const& a,
-	      edm::FileInPath const& b)
-  {
-    return a.location() == b.location() && a.relativePath() == b.relativePath();      
+  inline bool operator==(edm::FileInPath const& a, edm::FileInPath const& b) {
+    return a.location() == b.location() && a.relativePath() == b.relativePath();
   }
 
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ParameterSet/interface/FillDescriptionFromPSet.h b/FWCore/ParameterSet/interface/FillDescriptionFromPSet.h
index a7644215bc1c7..20df09696b134 100644
--- a/FWCore/ParameterSet/interface/FillDescriptionFromPSet.h
+++ b/FWCore/ParameterSet/interface/FillDescriptionFromPSet.h
@@ -4,5 +4,5 @@ namespace edm {
   class ParameterSet;
   class ParameterSetDescription;
 
-  void fillDescriptionFromPSet(ParameterSet const& pset, ParameterSetDescription & desc); 
-}
+  void fillDescriptionFromPSet(ParameterSet const& pset, ParameterSetDescription& desc);
+}  // namespace edm
diff --git a/FWCore/ParameterSet/interface/IfExistsDescription.h b/FWCore/ParameterSet/interface/IfExistsDescription.h
index 6d939e0aa85d9..6988ce1f5beb5 100644
--- a/FWCore/ParameterSet/interface/IfExistsDescription.h
+++ b/FWCore/ParameterSet/interface/IfExistsDescription.h
@@ -17,8 +17,7 @@ namespace edm {
 
   class IfExistsDescription : public ParameterDescriptionNode {
   public:
-    IfExistsDescription(ParameterDescriptionNode const& node_left,
-                        ParameterDescriptionNode const& node_right);
+    IfExistsDescription(ParameterDescriptionNode const& node_left, ParameterDescriptionNode const& node_right);
 
     IfExistsDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
                         ParameterDescriptionNode const& node_right);
@@ -29,37 +28,22 @@ namespace edm {
     IfExistsDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
                         std::unique_ptr<ParameterDescriptionNode> node_right);
 
-    ParameterDescriptionNode* clone() const override {
-      return new IfExistsDescription(*this);
-    }
+    ParameterDescriptionNode* clone() const override { return new IfExistsDescription(*this); }
 
   private:
+    void checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
+                                    std::set<ParameterTypes>& parameterTypes,
+                                    std::set<ParameterTypes>& wildcardTypes) const override;
 
-    void checkAndGetLabelsAndTypes_(std::set<std::string> & usedLabels,
-                                    std::set<ParameterTypes> & parameterTypes,
-                                    std::set<ParameterTypes> & wildcardTypes) const override;
-
-    void validate_(ParameterSet & pset,
-                   std::set<std::string> & validatedLabels,
-                   bool optional) const override;
+    void validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const override;
 
-    void writeCfi_(std::ostream & os,
-                   bool & startWithComma,
-                   int indentation,
-                   bool & wroteSomething) const override;
+    void writeCfi_(std::ostream& os, bool& startWithComma, int indentation, bool& wroteSomething) const override;
 
-    void print_(std::ostream & os,
-                bool optional,
-                bool writeToCfi,
-                DocFormatHelper & dfh) const override;
+    void print_(std::ostream& os, bool optional, bool writeToCfi, DocFormatHelper& dfh) const override;
 
-    bool hasNestedContent_() const override {
-      return true;
-    }
+    bool hasNestedContent_() const override { return true; }
 
-    void printNestedContent_(std::ostream & os,
-                             bool optional,
-                             DocFormatHelper & dfh) const override;
+    void printNestedContent_(std::ostream& os, bool optional, DocFormatHelper& dfh) const override;
 
     bool exists_(ParameterSet const& pset) const override;
 
@@ -70,11 +54,10 @@ namespace edm {
     void throwIfDuplicateLabels(std::set<std::string> const& labelsLeft,
                                 std::set<std::string> const& labelsRight) const;
 
-    void throwIfDuplicateTypes(std::set<ParameterTypes> const& types1,
-                               std::set<ParameterTypes> const& types2) const;
+    void throwIfDuplicateTypes(std::set<ParameterTypes> const& types1, std::set<ParameterTypes> const& types2) const;
 
     edm::value_ptr<ParameterDescriptionNode> node_left_;
     edm::value_ptr<ParameterDescriptionNode> node_right_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/IllegalParameters.h b/FWCore/ParameterSet/interface/IllegalParameters.h
index 5ddd9c22ef952..06cd0ffd442c9 100644
--- a/FWCore/ParameterSet/interface/IllegalParameters.h
+++ b/FWCore/ParameterSet/interface/IllegalParameters.h
@@ -19,6 +19,6 @@ namespace edm {
     friend class SubProcess;
     friend class ParameterSetDescription;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ParameterSet/interface/ORGroupDescription.h b/FWCore/ParameterSet/interface/ORGroupDescription.h
index aabcd1d4ed178..3a9c4d4d8b256 100644
--- a/FWCore/ParameterSet/interface/ORGroupDescription.h
+++ b/FWCore/ParameterSet/interface/ORGroupDescription.h
@@ -17,49 +17,31 @@ namespace edm {
 
   class ORGroupDescription : public ParameterDescriptionNode {
   public:
-    ORGroupDescription(ParameterDescriptionNode const& node_left,
-                       ParameterDescriptionNode const& node_right);
+    ORGroupDescription(ParameterDescriptionNode const& node_left, ParameterDescriptionNode const& node_right);
 
-    ORGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
-                       ParameterDescriptionNode const& node_right);
+    ORGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left, ParameterDescriptionNode const& node_right);
 
-    ORGroupDescription(ParameterDescriptionNode const& node_left,
-                       std::unique_ptr<ParameterDescriptionNode> node_right);
+    ORGroupDescription(ParameterDescriptionNode const& node_left, std::unique_ptr<ParameterDescriptionNode> node_right);
 
     ORGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
                        std::unique_ptr<ParameterDescriptionNode> node_right);
 
-    ParameterDescriptionNode* clone() const override {
-      return new ORGroupDescription(*this);
-    }
+    ParameterDescriptionNode* clone() const override { return new ORGroupDescription(*this); }
 
   private:
+    void checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
+                                    std::set<ParameterTypes>& parameterTypes,
+                                    std::set<ParameterTypes>& wildcardTypes) const override;
 
-    void checkAndGetLabelsAndTypes_(std::set<std::string> & usedLabels,
-                                    std::set<ParameterTypes> & parameterTypes,
-                                    std::set<ParameterTypes> & wildcardTypes) const override;
-
-    void validate_(ParameterSet & pset,
-                   std::set<std::string> & validatedLabels,
-                   bool optional) const override;
+    void validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const override;
 
-    void writeCfi_(std::ostream & os,
-                   bool & startWithComma,
-                   int indentation,
-                   bool & wroteSomething) const override;
+    void writeCfi_(std::ostream& os, bool& startWithComma, int indentation, bool& wroteSomething) const override;
 
-    void print_(std::ostream & os,
-                bool optional,
-                bool writeToCfi,
-                DocFormatHelper & dfh) const override;
+    void print_(std::ostream& os, bool optional, bool writeToCfi, DocFormatHelper& dfh) const override;
 
-    bool hasNestedContent_() const override {
-      return true;
-    }
+    bool hasNestedContent_() const override { return true; }
 
-    void printNestedContent_(std::ostream & os,
-                             bool optional,
-                             DocFormatHelper & dfh) const override;
+    void printNestedContent_(std::ostream& os, bool optional, DocFormatHelper& dfh) const override;
 
     bool exists_(ParameterSet const& pset) const override;
 
@@ -70,11 +52,10 @@ namespace edm {
     void throwIfDuplicateLabels(std::set<std::string> const& labelsLeft,
                                 std::set<std::string> const& labelsRight) const;
 
-    void throwIfDuplicateTypes(std::set<ParameterTypes> const& types1,
-                               std::set<ParameterTypes> const& types2) const;
+    void throwIfDuplicateTypes(std::set<ParameterTypes> const& types1, std::set<ParameterTypes> const& types2) const;
 
     edm::value_ptr<ParameterDescriptionNode> node_left_;
     edm::value_ptr<ParameterDescriptionNode> node_right_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/ParameterDescription.h b/FWCore/ParameterSet/interface/ParameterDescription.h
index 8cad48072c5d0..6ef3288a002e2 100644
--- a/FWCore/ParameterSet/interface/ParameterDescription.h
+++ b/FWCore/ParameterSet/interface/ParameterDescription.h
@@ -51,7 +51,10 @@ namespace edm {
     void writeValue(std::ostream& os, int indentation, long long const& value_, ValueFormat format);
     void writeValue(std::ostream& os, int indentation, std::vector<long long> const& value_, ValueFormat format);
     void writeValue(std::ostream& os, int indentation, unsigned long long const& value_, ValueFormat format);
-    void writeValue(std::ostream& os, int indentation, std::vector<unsigned long long> const& value_, ValueFormat format);
+    void writeValue(std::ostream& os,
+                    int indentation,
+                    std::vector<unsigned long long> const& value_,
+                    ValueFormat format);
     void writeValue(std::ostream& os, int indentation, double const& value_, ValueFormat format);
     void writeValue(std::ostream& os, int indentation, std::vector<double> const& value_, ValueFormat format);
     void writeValue(std::ostream& os, int indentation, bool const& value_, ValueFormat format);
@@ -62,7 +65,10 @@ namespace edm {
     void writeValue(std::ostream& os, int indentation, LuminosityBlockID const& value_, ValueFormat format);
     void writeValue(std::ostream& os, int indentation, std::vector<LuminosityBlockID> const& value_, ValueFormat format);
     void writeValue(std::ostream& os, int indentation, LuminosityBlockRange const& value_, ValueFormat format);
-    void writeValue(std::ostream& os, int indentation, std::vector<LuminosityBlockRange> const& value_, ValueFormat format);
+    void writeValue(std::ostream& os,
+                    int indentation,
+                    std::vector<LuminosityBlockRange> const& value_,
+                    ValueFormat format);
     void writeValue(std::ostream& os, int indentation, EventRange const& value_, ValueFormat format);
     void writeValue(std::ostream& os, int indentation, std::vector<EventRange> const& value_, ValueFormat format);
     void writeValue(std::ostream& os, int indentation, InputTag const& value_, ValueFormat format);
@@ -93,90 +99,71 @@ namespace edm {
     bool hasNestedContent(InputTag const& value);
     bool hasNestedContent(std::vector<InputTag> const& value);
     bool hasNestedContent(FileInPath const& value);
-  }
+  }  // namespace writeParameterValue
 
-  template<typename T>
+  template <typename T>
   class ParameterDescription : public ParameterDescriptionBase {
   public:
-
-    ParameterDescription(std::string const& iLabel,
-                         T const& value,
-                         bool isTracked,
-                         Comment const& iComment = Comment()) :
-      // WARNING: the toEnum function is intentionally undefined if the template
-      // parameter is ParameterSet or vector<ParameterSet>.  Both of these cases
-      // are handled by full template specializations below.  In the first case.
-      // ParameterSetDescription should be used instead of ParameterSet.
-      // In the second case the function arguments are completely different.
-      // Note that this template parameter is most often passed through from
-      // an add*<T> function of class ParameterSetDescription. For vector<ParameterSet>
-      // use the addVPSet* versions of those functions.
-      ParameterDescriptionBase(iLabel, ParameterTypeToEnum::toEnum<T>(), isTracked, true, iComment),
-      value_(value) {
-    }
-
-    ParameterDescription(char const* iLabel,
-                         T const& value,
-                         bool isTracked,
-                         Comment const& iComment = Comment()) :
-      // WARNING: the toEnum function is intentionally undefined if the template
-      // parameter is ParameterSet or vector<ParameterSet>.  Both of these cases
-      // are handled by full template specializations below.  In the first case.
-      // ParameterSetDescription should be used instead of ParameterSet.
-      // In the second case the function arguments are completely different.
-      // Note that this template parameter is most often passed through from
-      // an add*<T> function of class ParameterSetDescription. For vector<ParameterSet>
-      // use the addVPSet* versions of those functions.
-      ParameterDescriptionBase(iLabel, ParameterTypeToEnum::toEnum<T>(), isTracked, true, iComment),
-      value_(value) {
-    }
-
-    ParameterDescription(std::string const& iLabel,
-                         bool isTracked,
-                         Comment const& iComment = Comment()) :
-      // WARNING: the toEnum function is intentionally undefined if the template
-      // parameter is ParameterSet or vector<ParameterSet>.  Both of these cases
-      // are handled by full template specializations below.  In the first case.
-      // ParameterSetDescription should be used instead of ParameterSet.
-      // In the second case the function arguments are completely different.
-      // Note that this template parameter is most often passed through from
-      // an add*<T> function of class ParameterSetDescription. For vector<ParameterSet>
-      // use the addVPSet* versions of those functions.
-      ParameterDescriptionBase(iLabel, ParameterTypeToEnum::toEnum<T>(), isTracked, false, iComment),
-      value_() {
-    }
-
-    ParameterDescription(char const* iLabel,
-                         bool isTracked,
-                         Comment const& iComment = Comment()) :
-      // WARNING: the toEnum function is intentionally undefined if the template
-      // parameter is ParameterSet or vector<ParameterSet>.  Both of these cases
-      // are handled by full template specializations below.  In the first case.
-      // ParameterSetDescription should be used instead of ParameterSet.
-      // In the second case the function arguments are completely different.
-      // Note that this template parameter is most often passed through from
-      // an add*<T> function of class ParameterSetDescription. For vector<ParameterSet>
-      // use the addVPSet* versions of those functions.
-      ParameterDescriptionBase(iLabel, ParameterTypeToEnum::toEnum<T>(), isTracked, false, iComment),
-      value_() {
-    }
-
-    ~ParameterDescription() override { }
-
-    ParameterDescriptionNode* clone() const override {
-      return new ParameterDescription(*this);
-    }
+    ParameterDescription(std::string const& iLabel, T const& value, bool isTracked, Comment const& iComment = Comment())
+        :  // WARNING: the toEnum function is intentionally undefined if the template
+          // parameter is ParameterSet or vector<ParameterSet>.  Both of these cases
+          // are handled by full template specializations below.  In the first case.
+          // ParameterSetDescription should be used instead of ParameterSet.
+          // In the second case the function arguments are completely different.
+          // Note that this template parameter is most often passed through from
+          // an add*<T> function of class ParameterSetDescription. For vector<ParameterSet>
+          // use the addVPSet* versions of those functions.
+          ParameterDescriptionBase(iLabel, ParameterTypeToEnum::toEnum<T>(), isTracked, true, iComment),
+          value_(value) {}
+
+    ParameterDescription(char const* iLabel, T const& value, bool isTracked, Comment const& iComment = Comment())
+        :  // WARNING: the toEnum function is intentionally undefined if the template
+          // parameter is ParameterSet or vector<ParameterSet>.  Both of these cases
+          // are handled by full template specializations below.  In the first case.
+          // ParameterSetDescription should be used instead of ParameterSet.
+          // In the second case the function arguments are completely different.
+          // Note that this template parameter is most often passed through from
+          // an add*<T> function of class ParameterSetDescription. For vector<ParameterSet>
+          // use the addVPSet* versions of those functions.
+          ParameterDescriptionBase(iLabel, ParameterTypeToEnum::toEnum<T>(), isTracked, true, iComment),
+          value_(value) {}
+
+    ParameterDescription(std::string const& iLabel, bool isTracked, Comment const& iComment = Comment())
+        :  // WARNING: the toEnum function is intentionally undefined if the template
+          // parameter is ParameterSet or vector<ParameterSet>.  Both of these cases
+          // are handled by full template specializations below.  In the first case.
+          // ParameterSetDescription should be used instead of ParameterSet.
+          // In the second case the function arguments are completely different.
+          // Note that this template parameter is most often passed through from
+          // an add*<T> function of class ParameterSetDescription. For vector<ParameterSet>
+          // use the addVPSet* versions of those functions.
+          ParameterDescriptionBase(iLabel, ParameterTypeToEnum::toEnum<T>(), isTracked, false, iComment),
+          value_() {}
+
+    ParameterDescription(char const* iLabel, bool isTracked, Comment const& iComment = Comment())
+        :  // WARNING: the toEnum function is intentionally undefined if the template
+          // parameter is ParameterSet or vector<ParameterSet>.  Both of these cases
+          // are handled by full template specializations below.  In the first case.
+          // ParameterSetDescription should be used instead of ParameterSet.
+          // In the second case the function arguments are completely different.
+          // Note that this template parameter is most often passed through from
+          // an add*<T> function of class ParameterSetDescription. For vector<ParameterSet>
+          // use the addVPSet* versions of those functions.
+          ParameterDescriptionBase(iLabel, ParameterTypeToEnum::toEnum<T>(), isTracked, false, iComment),
+          value_() {}
+
+    ~ParameterDescription() override {}
+
+    ParameterDescriptionNode* clone() const override { return new ParameterDescription(*this); }
 
     T getDefaultValue() const { return value_; }
 
   private:
-
-    bool exists_(ParameterSet const& pset) const override {
-      return pset.existsAs<T>(label(), isTracked());
-    }
+    bool exists_(ParameterSet const& pset) const override { return pset.existsAs<T>(label(), isTracked()); }
 
     bool hasNestedContent_() const override {
-      if (!hasDefault()) return false;
+      if (!hasDefault())
+        return false;
       return writeParameterValue::hasNestedContent(value_);
     }
 
@@ -195,8 +182,7 @@ namespace edm {
     void insertDefault_(ParameterSet& pset) const override {
       if (isTracked()) {
         pset.addParameter(label(), value_);
-      }
-      else {
+      } else {
         pset.addUntrackedParameter(label(), value_);
       }
     }
@@ -204,11 +190,9 @@ namespace edm {
     T value_;
   };
 
-  template<>
+  template <>
   class ParameterDescription<ParameterSetDescription> : public ParameterDescriptionBase {
-
   public:
-
     ParameterDescription(std::string const& iLabel,
                          ParameterSetDescription const& value,
                          bool isTracked,
@@ -222,27 +206,18 @@ namespace edm {
     ~ParameterDescription() override;
 
     ParameterSetDescription const* parameterSetDescription() const override;
-    ParameterSetDescription * parameterSetDescription() override;
+    ParameterSetDescription* parameterSetDescription() override;
 
-    ParameterDescriptionNode* clone() const override {
-      return new ParameterDescription(*this);
-    }
+    ParameterDescriptionNode* clone() const override { return new ParameterDescription(*this); }
 
   private:
+    void validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const override;
 
-    void validate_(ParameterSet& pset,
-                   std::set<std::string>& validatedLabels,
-                   bool optional) const override;
-
-    void printDefault_(std::ostream& os,
-                       bool writeToCfi,
-                       DocFormatHelper& dfh) const override;
+    void printDefault_(std::ostream& os, bool writeToCfi, DocFormatHelper& dfh) const override;
 
     bool hasNestedContent_() const override;
 
-    void printNestedContent_(std::ostream& os,
-                             bool optional,
-                             DocFormatHelper& dfh) const override;
+    void printNestedContent_(std::ostream& os, bool optional, DocFormatHelper& dfh) const override;
 
     bool exists_(ParameterSet const& pset) const override;
 
@@ -257,11 +232,9 @@ namespace edm {
     value_ptr<ParameterSetDescription> psetDesc_;
   };
 
-  template<>
+  template <>
   class ParameterDescription<std::vector<ParameterSet> > : public ParameterDescriptionBase {
-
   public:
-
     ParameterDescription(std::string const& iLabel,
                          ParameterSetDescription const& psetDesc,
                          bool isTracked,
@@ -287,29 +260,20 @@ namespace edm {
     ~ParameterDescription() override;
 
     ParameterSetDescription const* parameterSetDescription() const override;
-    ParameterSetDescription * parameterSetDescription() override;
+    ParameterSetDescription* parameterSetDescription() override;
 
-    ParameterDescriptionNode* clone() const override {
-      return new ParameterDescription(*this);
-    }
+    ParameterDescriptionNode* clone() const override { return new ParameterDescription(*this); }
 
     void setPartOfDefaultOfVPSet(bool value) { partOfDefaultOfVPSet_ = value; }
 
   private:
+    void validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const override;
 
-    void validate_(ParameterSet& pset,
-                   std::set<std::string>& validatedLabels,
-                   bool optional) const override;
-
-    void printDefault_(std::ostream& os,
-                       bool writeToCfi,
-                       DocFormatHelper& dfh) const override;
+    void printDefault_(std::ostream& os, bool writeToCfi, DocFormatHelper& dfh) const override;
 
     bool hasNestedContent_() const override;
 
-    void printNestedContent_(std::ostream& os,
-                             bool optional,
-                             DocFormatHelper& dfh) const override;
+    void printNestedContent_(std::ostream& os, bool optional, DocFormatHelper& dfh) const override;
 
     bool exists_(ParameterSet const& pset) const override;
 
@@ -330,5 +294,5 @@ namespace edm {
     std::vector<ParameterSet> vPset_;
     bool partOfDefaultOfVPSet_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/ParameterDescriptionBase.h b/FWCore/ParameterSet/interface/ParameterDescriptionBase.h
index c401b4e356f20..5e3ac5e8c23d4 100644
--- a/FWCore/ParameterSet/interface/ParameterDescriptionBase.h
+++ b/FWCore/ParameterSet/interface/ParameterDescriptionBase.h
@@ -30,8 +30,7 @@ namespace edm {
   class ParameterSetDescription;
   class DocFormatHelper;
 
-  class ParameterDescriptionBase : public ParameterDescriptionNode 
-  {
+  class ParameterDescriptionBase : public ParameterDescriptionNode {
   public:
     ~ParameterDescriptionBase() override;
 
@@ -41,72 +40,51 @@ namespace edm {
     bool hasDefault() const { return hasDefault_; }
 
     virtual ParameterSetDescription const* parameterSetDescription() const { return nullptr; }
-    virtual ParameterSetDescription * parameterSetDescription() { return nullptr; }
+    virtual ParameterSetDescription* parameterSetDescription() { return nullptr; }
 
   protected:
     void throwParameterWrongTrackiness() const;
     void throwParameterWrongType() const;
     void throwMissingRequiredNoDefault() const;
 
-    ParameterDescriptionBase(std::string const& iLabel,
-                             ParameterTypes iType,
-                             bool isTracked,
-                             bool hasDefault,
-                             Comment const& iComment
-                            );
+    ParameterDescriptionBase(
+        std::string const& iLabel, ParameterTypes iType, bool isTracked, bool hasDefault, Comment const& iComment);
 
-    ParameterDescriptionBase(char const* iLabel,
-                             ParameterTypes iType,
-                             bool isTracked,
-                             bool hasDefault,
-                             Comment const& iComment
-                            );
+    ParameterDescriptionBase(
+        char const* iLabel, ParameterTypes iType, bool isTracked, bool hasDefault, Comment const& iComment);
 
   private:
+    void checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
+                                    std::set<ParameterTypes>& parameterTypes,
+                                    std::set<ParameterTypes>& wildcardTypes) const override;
 
-    void checkAndGetLabelsAndTypes_(std::set<std::string> & usedLabels,
-                                    std::set<ParameterTypes> & parameterTypes,
-                                    std::set<ParameterTypes> & wildcardTypes) const override;
+    void validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const override;
 
-    void validate_(ParameterSet & pset,
-                   std::set<std::string> & validatedLabels,
-                   bool optional) const override;
-
-    void writeCfi_(std::ostream & os,
-                   bool & startWithComma,
-                   int indentation,
-                   bool & wroteSomething) const override;
+    void writeCfi_(std::ostream& os, bool& startWithComma, int indentation, bool& wroteSomething) const override;
 
     bool partiallyExists_(ParameterSet const& pset) const override;
 
     int howManyXORSubNodesExist_(ParameterSet const& pset) const override;
 
-    virtual void writeCfi_(std::ostream & os, int indentation) const = 0;
+    virtual void writeCfi_(std::ostream& os, int indentation) const = 0;
 
-    virtual void writeDoc_(std::ostream & os, int indentation) const = 0;
+    virtual void writeDoc_(std::ostream& os, int indentation) const = 0;
 
-    void print_(std::ostream & os,
-                bool optional,
-                bool writeToCfi,
-                DocFormatHelper & dfh) const override;
+    void print_(std::ostream& os, bool optional, bool writeToCfi, DocFormatHelper& dfh) const override;
 
-    virtual void printDefault_(std::ostream & os,
-                               bool writeToCfi,
-                               DocFormatHelper & dfh) const;
+    virtual void printDefault_(std::ostream& os, bool writeToCfi, DocFormatHelper& dfh) const;
 
-    void printNestedContent_(std::ostream & os,
-                             bool optional,
-                             DocFormatHelper & dfh) const override;
+    void printNestedContent_(std::ostream& os, bool optional, DocFormatHelper& dfh) const override;
 
     using ParameterDescriptionNode::exists_;
     virtual bool exists_(ParameterSet const& pset, bool isTracked) const = 0;
 
-    virtual void insertDefault_(ParameterSet & pset) const = 0;
+    virtual void insertDefault_(ParameterSet& pset) const = 0;
 
     std::string label_;
     ParameterTypes type_;
     bool isTracked_;
     bool hasDefault_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/ParameterDescriptionCases.h b/FWCore/ParameterSet/interface/ParameterDescriptionCases.h
index 9c17c7557cfa5..6b31268d8e5e6 100644
--- a/FWCore/ParameterSet/interface/ParameterDescriptionCases.h
+++ b/FWCore/ParameterSet/interface/ParameterDescriptionCases.h
@@ -31,51 +31,43 @@
 
 namespace edm {
 
-  template<typename T>
+  template <typename T>
   class ParameterDescriptionCases {
   public:
     typedef std::map<T, edm::value_ptr<ParameterDescriptionNode> > CaseMap;
 
     void insert(T caseValue, std::unique_ptr<ParameterDescriptionNode> node) {
-      std::pair<T, edm::value_ptr<ParameterDescriptionNode> > casePair(caseValue,edm::value_ptr<ParameterDescriptionNode>());
-      std::pair<typename CaseMap::iterator,bool> status;
+      std::pair<T, edm::value_ptr<ParameterDescriptionNode> > casePair(caseValue,
+                                                                       edm::value_ptr<ParameterDescriptionNode>());
+      std::pair<typename CaseMap::iterator, bool> status;
       status = caseMap_->insert(casePair);
       (*caseMap_)[caseValue] = std::move(node);
-      if (status.second == false) duplicateCaseValues_ = true;
+      if (status.second == false)
+        duplicateCaseValues_ = true;
     }
 
     std::unique_ptr<CaseMap> caseMap() { return std::move(caseMap_); }
     bool duplicateCaseValues() const { return duplicateCaseValues_; }
 
   private:
+    friend std::unique_ptr<ParameterDescriptionCases<bool> > operator>>(bool caseValue,
+                                                                        std::unique_ptr<ParameterDescriptionNode> node);
 
-    friend
-    std::unique_ptr<ParameterDescriptionCases<bool> >
-    operator>>(bool caseValue,
-               std::unique_ptr<ParameterDescriptionNode> node);
+    friend std::unique_ptr<ParameterDescriptionCases<int> > operator>>(int caseValue,
+                                                                       std::unique_ptr<ParameterDescriptionNode> node);
 
-    friend
-    std::unique_ptr<ParameterDescriptionCases<int> >
-    operator>>(int caseValue,
-               std::unique_ptr<ParameterDescriptionNode> node);
+    friend std::unique_ptr<ParameterDescriptionCases<std::string> > operator>>(
+        std::string const& caseValue, std::unique_ptr<ParameterDescriptionNode> node);
 
-    friend
-    std::unique_ptr<ParameterDescriptionCases<std::string> >
-    operator>>(std::string const& caseValue,
-               std::unique_ptr<ParameterDescriptionNode> node);
-
-    friend
-    std::unique_ptr<ParameterDescriptionCases<std::string> >
-    operator>>(char const* caseValue,
-               std::unique_ptr<ParameterDescriptionNode> node);
+    friend std::unique_ptr<ParameterDescriptionCases<std::string> > operator>>(
+        char const* caseValue, std::unique_ptr<ParameterDescriptionNode> node);
 
     // The constructor is intentionally private so that only the operator>> functions
-    // can create these. 
-    ParameterDescriptionCases(T const& caseValue, std::unique_ptr<ParameterDescriptionNode> node) :
-      caseMap_(new CaseMap),
-      duplicateCaseValues_(false)
-    {
-      std::pair<T, edm::value_ptr<ParameterDescriptionNode> > casePair(caseValue,edm::value_ptr<ParameterDescriptionNode>());
+    // can create these.
+    ParameterDescriptionCases(T const& caseValue, std::unique_ptr<ParameterDescriptionNode> node)
+        : caseMap_(new CaseMap), duplicateCaseValues_(false) {
+      std::pair<T, edm::value_ptr<ParameterDescriptionNode> > casePair(caseValue,
+                                                                       edm::value_ptr<ParameterDescriptionNode>());
       caseMap_->insert(casePair);
       (*caseMap_)[caseValue] = std::move(node);
     }
@@ -84,16 +76,14 @@ namespace edm {
     bool duplicateCaseValues_;
   };
 
-  std::unique_ptr<ParameterDescriptionCases<bool> >
-  operator||(std::unique_ptr<ParameterDescriptionCases<bool> >,
-             std::unique_ptr<ParameterDescriptionCases<bool> >);
+  std::unique_ptr<ParameterDescriptionCases<bool> > operator||(std::unique_ptr<ParameterDescriptionCases<bool> >,
+                                                               std::unique_ptr<ParameterDescriptionCases<bool> >);
 
-  std::unique_ptr<ParameterDescriptionCases<int> >
-  operator||(std::unique_ptr<ParameterDescriptionCases<int> >,
-             std::unique_ptr<ParameterDescriptionCases<int> >);
+  std::unique_ptr<ParameterDescriptionCases<int> > operator||(std::unique_ptr<ParameterDescriptionCases<int> >,
+                                                              std::unique_ptr<ParameterDescriptionCases<int> >);
 
-  std::unique_ptr<ParameterDescriptionCases<std::string> >
-  operator||(std::unique_ptr<ParameterDescriptionCases<std::string> >,
-	     std::unique_ptr<ParameterDescriptionCases<std::string> >);
-}
+  std::unique_ptr<ParameterDescriptionCases<std::string> > operator||(
+      std::unique_ptr<ParameterDescriptionCases<std::string> >,
+      std::unique_ptr<ParameterDescriptionCases<std::string> >);
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/ParameterDescriptionNode.h b/FWCore/ParameterSet/interface/ParameterDescriptionNode.h
index 19b9f4171aa73..b89ad866cd1fc 100644
--- a/FWCore/ParameterSet/interface/ParameterDescriptionNode.h
+++ b/FWCore/ParameterSet/interface/ParameterDescriptionNode.h
@@ -18,7 +18,8 @@
 namespace edm {
 
   class ParameterSet;
-  template <typename T> class ParameterDescriptionCases;
+  template <typename T>
+  class ParameterDescriptionCases;
   class DocFormatHelper;
 
   // Originally these were defined such that the values were the
@@ -71,19 +72,16 @@ namespace edm {
     explicit Comment(std::string const& iComment);
     explicit Comment(char const* iComment);
     std::string const& comment() const { return comment_; }
+
   private:
     std::string comment_;
   };
 
   class ParameterDescriptionNode {
-
   public:
-
     ParameterDescriptionNode() {}
 
-    explicit ParameterDescriptionNode(Comment const& iComment) :
-      comment_(iComment.comment()) {
-    }
+    explicit ParameterDescriptionNode(Comment const& iComment) : comment_(iComment.comment()) {}
 
     virtual ~ParameterDescriptionNode();
 
@@ -99,9 +97,7 @@ namespace edm {
     // named "optional" is true, which should only be possible for the
     // top level nodes of a ParameterSetDescription.  When a parameter is
     // found or inserted its label is added into the list of validatedLabels.
-    void validate(ParameterSet& pset,
-                  std::set<std::string>& validatedLabels,
-                  bool optional) const {
+    void validate(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const {
       validate_(pset, validatedLabels, optional);
     }
 
@@ -115,26 +111,16 @@ namespace edm {
     // ParameterSetDescription where the algorithm fails to write
     // a valid cfi, in some cases the description can be so pathological
     // that it is impossible to write a cfi that will pass validation.
-    void writeCfi(std::ostream& os,
-                  bool& startWithComma,
-                  int indentation,
-                  bool& wroteSomething) const {
+    void writeCfi(std::ostream& os, bool& startWithComma, int indentation, bool& wroteSomething) const {
       writeCfi_(os, startWithComma, indentation, wroteSomething);
     }
 
     // Print out the description in human readable format
-    void print(std::ostream& os,
-               bool optional,
-               bool writeToCfi,
-               DocFormatHelper& dfh) const;
+    void print(std::ostream& os, bool optional, bool writeToCfi, DocFormatHelper& dfh) const;
 
-    bool hasNestedContent() const {
-      return hasNestedContent_();
-    }
+    bool hasNestedContent() const { return hasNestedContent_(); }
 
-    void printNestedContent(std::ostream& os,
-                            bool optional,
-                            DocFormatHelper& dfh) const;
+    void printNestedContent(std::ostream& os, bool optional, DocFormatHelper& dfh) const;
 
     // The next three functions are only called by the logical nodes
     // on their subnodes.  When executing these functions, the
@@ -143,17 +129,13 @@ namespace edm {
     // Usually checks to see if a parameter exists in the configuration, but
     // if the node is a logical node, then it returns the value of the logical
     // expression.
-    bool exists(ParameterSet const& pset) const {
-      return exists_(pset);
-    }
+    bool exists(ParameterSet const& pset) const { return exists_(pset); }
 
     // For most nodes, this simply returns the same value as the exists
     // function.  But for AND nodes this returns true if either its subnodes
     // exists.  Used by operator&& during validation, if either of an AND node's
     // subnodes exists, then both subnodes get validated.
-    bool partiallyExists(ParameterSet const& pset) const {
-      return partiallyExists_(pset);
-    }
+    bool partiallyExists(ParameterSet const& pset) const { return partiallyExists_(pset); }
 
     // For most nodes, this simply returns the same value as the exists
     // function. It is different for an XOR node.  It counts
@@ -166,9 +148,7 @@ namespace edm {
     // -- if it returns zero, then validation tries to validate the first node and
     // then rechecks to see what the missing parameter insertion did (there could
     // be side effects on the nodes that were not validated)
-    int howManyXORSubNodesExist(ParameterSet const& pset) const {
-      return howManyXORSubNodesExist_(pset);
-    }
+    int howManyXORSubNodesExist(ParameterSet const& pset) const { return howManyXORSubNodesExist_(pset); }
 
     /* Validation puts requirements on which parameters can and cannot exist
     within a ParameterSet.  The evaluation of whether a ParameterSet passes
@@ -231,32 +211,19 @@ namespace edm {
     static void printSpaces(std::ostream& os, int n);
 
   protected:
-
     virtual void checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
                                             std::set<ParameterTypes>& parameterTypes,
                                             std::set<ParameterTypes>& wildcardTypes) const = 0;
 
-    virtual void validate_(ParameterSet& pset,
-                           std::set<std::string>& validatedLabels,
-                           bool optional) const = 0;
+    virtual void validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const = 0;
 
-    virtual void writeCfi_(std::ostream& os,
-                           bool& startWithComma,
-                           int indentation,
-                           bool& wroteSomething) const = 0;
+    virtual void writeCfi_(std::ostream& os, bool& startWithComma, int indentation, bool& wroteSomething) const = 0;
 
-    virtual void print_(std::ostream&,
-                        bool /*optional*/,
-                        bool /*writeToCfi*/,
-                        DocFormatHelper&) const { }
+    virtual void print_(std::ostream&, bool /*optional*/, bool /*writeToCfi*/, DocFormatHelper&) const {}
 
-    virtual bool hasNestedContent_() const {
-      return false;
-    }
+    virtual bool hasNestedContent_() const { return false; }
 
-    virtual void printNestedContent_(std::ostream&,
-                                     bool /*optional*/,
-                                     DocFormatHelper&) const { }
+    virtual void printNestedContent_(std::ostream&, bool /*optional*/, DocFormatHelper&) const {}
 
     virtual bool exists_(ParameterSet const& pset) const = 0;
 
@@ -275,90 +242,68 @@ namespace edm {
 
   // operator>> ---------------------------------------------
 
-  std::unique_ptr<ParameterDescriptionCases<bool> >
-  operator>>(bool caseValue,
-             ParameterDescriptionNode const& node);
+  std::unique_ptr<ParameterDescriptionCases<bool> > operator>>(bool caseValue, ParameterDescriptionNode const& node);
 
-  std::unique_ptr<ParameterDescriptionCases<int> >
-  operator>>(int caseValue,
-             ParameterDescriptionNode const& node);
+  std::unique_ptr<ParameterDescriptionCases<int> > operator>>(int caseValue, ParameterDescriptionNode const& node);
 
-  std::unique_ptr<ParameterDescriptionCases<std::string> >
-  operator>>(std::string const& caseValue,
-             ParameterDescriptionNode const& node);
+  std::unique_ptr<ParameterDescriptionCases<std::string> > operator>>(std::string const& caseValue,
+                                                                      ParameterDescriptionNode const& node);
 
-  std::unique_ptr<ParameterDescriptionCases<std::string> >
-  operator>>(char const* caseValue,
-             ParameterDescriptionNode const& node);
+  std::unique_ptr<ParameterDescriptionCases<std::string> > operator>>(char const* caseValue,
+                                                                      ParameterDescriptionNode const& node);
 
-  std::unique_ptr<ParameterDescriptionCases<bool> >
-  operator>>(bool caseValue,
-             std::unique_ptr<ParameterDescriptionNode> node);
+  std::unique_ptr<ParameterDescriptionCases<bool> > operator>>(bool caseValue,
+                                                               std::unique_ptr<ParameterDescriptionNode> node);
 
-  std::unique_ptr<ParameterDescriptionCases<int> >
-  operator>>(int caseValue,
-             std::unique_ptr<ParameterDescriptionNode> node);
+  std::unique_ptr<ParameterDescriptionCases<int> > operator>>(int caseValue,
+                                                              std::unique_ptr<ParameterDescriptionNode> node);
 
-  std::unique_ptr<ParameterDescriptionCases<std::string> >
-  operator>>(std::string const& caseValue,
-             std::unique_ptr<ParameterDescriptionNode> node);
+  std::unique_ptr<ParameterDescriptionCases<std::string> > operator>>(std::string const& caseValue,
+                                                                      std::unique_ptr<ParameterDescriptionNode> node);
 
-  std::unique_ptr<ParameterDescriptionCases<std::string> >
-  operator>>(char const* caseValue,
-             std::unique_ptr<ParameterDescriptionNode> node);
+  std::unique_ptr<ParameterDescriptionCases<std::string> > operator>>(char const* caseValue,
+                                                                      std::unique_ptr<ParameterDescriptionNode> node);
 
   // operator&& ---------------------------------------------
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator&&(ParameterDescriptionNode const& node_left,
-             ParameterDescriptionNode const& node_right);
+  std::unique_ptr<ParameterDescriptionNode> operator&&(ParameterDescriptionNode const& node_left,
+                                                       ParameterDescriptionNode const& node_right);
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator&&(std::unique_ptr<ParameterDescriptionNode> node_left,
-             ParameterDescriptionNode const& node_right);
+  std::unique_ptr<ParameterDescriptionNode> operator&&(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                                       ParameterDescriptionNode const& node_right);
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator&&(ParameterDescriptionNode const& node_left,
-             std::unique_ptr<ParameterDescriptionNode> node_right);
+  std::unique_ptr<ParameterDescriptionNode> operator&&(ParameterDescriptionNode const& node_left,
+                                                       std::unique_ptr<ParameterDescriptionNode> node_right);
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator&&(std::unique_ptr<ParameterDescriptionNode> node_left,
-             std::unique_ptr<ParameterDescriptionNode> node_right);
+  std::unique_ptr<ParameterDescriptionNode> operator&&(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                                       std::unique_ptr<ParameterDescriptionNode> node_right);
 
   // operator|| ---------------------------------------------
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator||(ParameterDescriptionNode const& node_left,
-             ParameterDescriptionNode const& node_right);
+  std::unique_ptr<ParameterDescriptionNode> operator||(ParameterDescriptionNode const& node_left,
+                                                       ParameterDescriptionNode const& node_right);
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator||(std::unique_ptr<ParameterDescriptionNode> node_left,
-             ParameterDescriptionNode const& node_right);
+  std::unique_ptr<ParameterDescriptionNode> operator||(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                                       ParameterDescriptionNode const& node_right);
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator||(ParameterDescriptionNode const& node_left,
-             std::unique_ptr<ParameterDescriptionNode> node_right);
+  std::unique_ptr<ParameterDescriptionNode> operator||(ParameterDescriptionNode const& node_left,
+                                                       std::unique_ptr<ParameterDescriptionNode> node_right);
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator||(std::unique_ptr<ParameterDescriptionNode> node_left,
-             std::unique_ptr<ParameterDescriptionNode> node_right);
+  std::unique_ptr<ParameterDescriptionNode> operator||(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                                       std::unique_ptr<ParameterDescriptionNode> node_right);
 
   // operator^  ---------------------------------------------
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator^(ParameterDescriptionNode const& node_left,
-            ParameterDescriptionNode const& node_right);
+  std::unique_ptr<ParameterDescriptionNode> operator^(ParameterDescriptionNode const& node_left,
+                                                      ParameterDescriptionNode const& node_right);
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator^(std::unique_ptr<ParameterDescriptionNode> node_left,
-            ParameterDescriptionNode const& node_right);
+  std::unique_ptr<ParameterDescriptionNode> operator^(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                                      ParameterDescriptionNode const& node_right);
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator^(ParameterDescriptionNode const& node_left,
-            std::unique_ptr<ParameterDescriptionNode> node_right);
+  std::unique_ptr<ParameterDescriptionNode> operator^(ParameterDescriptionNode const& node_left,
+                                                      std::unique_ptr<ParameterDescriptionNode> node_right);
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator^(std::unique_ptr<ParameterDescriptionNode> node_left,
-            std::unique_ptr<ParameterDescriptionNode> node_right);
-}
+  std::unique_ptr<ParameterDescriptionNode> operator^(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                                      std::unique_ptr<ParameterDescriptionNode> node_right);
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/ParameterSet.h b/FWCore/ParameterSet/interface/ParameterSet.h
index a438c49addf05..20c24de194a3c 100644
--- a/FWCore/ParameterSet/interface/ParameterSet.h
+++ b/FWCore/ParameterSet/interface/ParameterSet.h
@@ -35,12 +35,9 @@ namespace edm {
 
   class ParameterSet {
   public:
-    template<typename T> friend class ParameterDescription;
-    enum Bool {
-      False = 0,
-      True = 1,
-      Unknown = 2
-    };
+    template <typename T>
+    friend class ParameterDescription;
+    enum Bool { False = 0, True = 1, Unknown = 2 };
 
     // default-construct
     ParameterSet();
@@ -61,8 +58,8 @@ namespace edm {
     // identification
     ParameterSetID id() const;
     void setID(ParameterSetID const& id);
-    bool isRegistered() const {return id_.isValid();}
-    ParameterSetID trackedID() const {return id();} // to be phased out.
+    bool isRegistered() const { return id_.isValid(); }
+    ParameterSetID trackedID() const { return id(); }  // to be phased out.
 
     // Entry-handling
     Entry const& retrieve(char const*) const;
@@ -80,7 +77,7 @@ namespace edm {
 
     void insertParameterSet(bool okay_to_replace, std::string const& name, ParameterSetEntry const& entry);
     void insertVParameterSet(bool okay_to_replace, std::string const& name, VParameterSetEntry const& entry);
-    void insert(bool ok_to_replace, char const* , Entry const&);
+    void insert(bool ok_to_replace, char const*, Entry const&);
     void insert(bool ok_to_replace, std::string const&, Entry const&);
     void augment(ParameterSet const& from);
     void copyFrom(ParameterSet const& from, std::string const& name);
@@ -89,91 +86,70 @@ namespace edm {
     // encode only tracked parameters
     std::string toString() const;
     void toString(std::string& result) const;
-    void toDigest(cms::Digest &digest) const;
+    void toDigest(cms::Digest& digest) const;
 
     //encode tracked and untracked parameters
     void allToString(std::string& result) const;
 
-    template<typename T>
-    T
-    getParameter(std::string const&) const;
+    template <typename T>
+    T getParameter(std::string const&) const;
 
-    template<typename T>
-    T
-    getParameter(char const*) const;
+    template <typename T>
+    T getParameter(char const*) const;
 
-    ParameterSet const&
-    getParameterSet(std::string const&) const;
+    ParameterSet const& getParameterSet(std::string const&) const;
 
-    ParameterSet const&
-    getParameterSet(char const*) const;
+    ParameterSet const& getParameterSet(char const*) const;
 
-    ParameterSet
-    getUntrackedParameterSet(std::string const& name, ParameterSet const& defaultValue) const;
+    ParameterSet getUntrackedParameterSet(std::string const& name, ParameterSet const& defaultValue) const;
 
-    ParameterSet
-    getUntrackedParameterSet(char const* name, ParameterSet const& defaultValue) const;
+    ParameterSet getUntrackedParameterSet(char const* name, ParameterSet const& defaultValue) const;
 
-    ParameterSet const&
-    getUntrackedParameterSet(std::string const& name) const;
+    ParameterSet const& getUntrackedParameterSet(std::string const& name) const;
 
-    ParameterSet const&
-    getUntrackedParameterSet(char const* name) const;
+    ParameterSet const& getUntrackedParameterSet(char const* name) const;
 
-    VParameterSet const&
-    getParameterSetVector(std::string const& name) const;
+    VParameterSet const& getParameterSetVector(std::string const& name) const;
 
-    VParameterSet const&
-    getParameterSetVector(char const* name) const;
+    VParameterSet const& getParameterSetVector(char const* name) const;
 
-    VParameterSet
-    getUntrackedParameterSetVector(std::string const& name, VParameterSet const& defaultValue) const;
+    VParameterSet getUntrackedParameterSetVector(std::string const& name, VParameterSet const& defaultValue) const;
 
-    VParameterSet
-    getUntrackedParameterSetVector(char const* name, VParameterSet const& defaultValue) const;
+    VParameterSet getUntrackedParameterSetVector(char const* name, VParameterSet const& defaultValue) const;
 
-    VParameterSet const&
-    getUntrackedParameterSetVector(std::string const& name) const;
+    VParameterSet const& getUntrackedParameterSetVector(std::string const& name) const;
 
-    VParameterSet const&
-    getUntrackedParameterSetVector(char const* name) const;
+    VParameterSet const& getUntrackedParameterSetVector(char const* name) const;
 
-    template<typename T>
-    void
-    addParameter(std::string const& name, T const& value) {
+    template <typename T>
+    void addParameter(std::string const& name, T const& value) {
       invalidateRegistration(name);
       insert(true, name, Entry(name, value, true));
     }
 
-    template<typename T>
-    void
-    addParameter(char const* name, T const& value) {
+    template <typename T>
+    void addParameter(char const* name, T const& value) {
       invalidateRegistration(name);
       insert(true, name, Entry(name, value, true));
     }
 
-    template<typename T>
-    T
-    getUntrackedParameter(std::string const&, T const&) const;
+    template <typename T>
+    T getUntrackedParameter(std::string const&, T const&) const;
 
-    template<typename T>
-    T
-    getUntrackedParameter(char const*, T const&) const;
+    template <typename T>
+    T getUntrackedParameter(char const*, T const&) const;
 
-    template<typename T>
-    T
-    getUntrackedParameter(std::string const&) const;
+    template <typename T>
+    T getUntrackedParameter(std::string const&) const;
 
-    template<typename T>
-    T
-    getUntrackedParameter(char const*) const;
+    template <typename T>
+    T getUntrackedParameter(char const*) const;
 
     /// The returned value is the number of new FileInPath objects
     /// pushed into the vector.
     /// N.B.: The vector 'output' is *not* cleared; new entries are
     /// added with push_back.
-    std::vector<FileInPath>::size_type
-    getAllFileInPaths(std::vector<FileInPath>& output) const;
+    std::vector<FileInPath>::size_type getAllFileInPaths(std::vector<FileInPath>& output) const;
 
     std::vector<std::string> getParameterNames() const;
 
@@ -181,15 +157,15 @@ namespace edm {
     bool exists(std::string const& parameterName) const;
 
     /// checks if a parameter exists as a given type
-    template<typename T>
-    bool existsAs(std::string const& parameterName, bool trackiness=true) const {
-       std::vector<std::string> names = getParameterNamesForType<T>(trackiness);
-       return std::find(names.begin(), names.end(), parameterName) != names.end();
+    template <typename T>
+    bool existsAs(std::string const& parameterName, bool trackiness = true) const {
+      std::vector<std::string> names = getParameterNamesForType<T>(trackiness);
+      return std::find(names.begin(), names.end(), parameterName) != names.end();
     }
 
     void deprecatedInputTagWarning(std::string const& name, std::string const& label) const;
 
-    template<typename T>
+    template <typename T>
     std::vector<std::string> getParameterNamesForType(bool trackiness = true) const {
       std::vector<std::string> result;
       // This is icky, but I don't know of another way in the current
@@ -202,21 +178,17 @@ namespace edm {
       return result;
     }
 
-    template<typename T>
-    void
-    addUntrackedParameter(std::string const& name, T const& value) {
+    template <typename T>
+    void addUntrackedParameter(std::string const& name, T const& value) {
       insert(true, name, Entry(name, value, false));
     }
 
-    template<typename T>
-    void
-    addUntrackedParameter(char const* name, T const& value) {
+    template <typename T>
+    void addUntrackedParameter(char const* name, T const& value) {
       insert(true, name, Entry(name, value, false));
     }
 
-    bool empty() const {
-      return tbl_.empty() && psetTable_.empty() && vpsetTable_.empty();
-    }
+    bool empty() const { return tbl_.empty() && psetTable_.empty() && vpsetTable_.empty(); }
 
     ParameterSet trackedPart() const;
 
@@ -225,21 +197,19 @@ namespace edm {
     // of names pushed into the vector. If 'trackiness' is true, we
     // return tracked parameters; if 'trackiness' is false, w return
     // untracked parameters.
-    size_t getParameterSetNames(std::vector<std::string>& output,
-                                bool trackiness = true) const;
+    size_t getParameterSetNames(std::vector<std::string>& output, bool trackiness = true) const;
 
     // Return the names of all parameters of type
     // vector<ParameterSet>, pushing the names into the argument
     // 'output'. Return the number of names pushed into the vector. If
     // 'trackiness' is true, we return tracked parameters; if
     // 'trackiness' is false, w return untracked parameters.
-    size_t getParameterSetVectorNames(std::vector<std::string>& output,
-                                      bool trackiness=true) const;
+    size_t getParameterSetVectorNames(std::vector<std::string>& output, bool trackiness = true) const;
 
     // need a simple interface for python
     std::string dump(unsigned int indent = 0) const;
 
-    friend std::ostream& operator << (std::ostream& os, ParameterSet const& pset);
+    friend std::ostream& operator<<(std::ostream& os, ParameterSet const& pset);
 
     ParameterSet const& registerIt();
 
@@ -250,35 +220,28 @@ namespace edm {
     std::vector<ParameterSet> popVParameterSet(std::string const& name);
 
     typedef std::map<std::string, Entry> table;
-    table const& tbl() const {return tbl_;}
+    table const& tbl() const { return tbl_; }
 
     typedef std::map<std::string, ParameterSetEntry> psettable;
-    psettable const& psetTable() const {return psetTable_;}
+    psettable const& psetTable() const { return psetTable_; }
 
     typedef std::map<std::string, VParameterSetEntry> vpsettable;
-    vpsettable const& vpsetTable() const {return vpsetTable_;}
+    vpsettable const& vpsetTable() const { return vpsetTable_; }
 
-    ParameterSet*
-    getPSetForUpdate(std::string const& name, bool& isTracked);
+    ParameterSet* getPSetForUpdate(std::string const& name, bool& isTracked);
 
-    ParameterSet*
-    getPSetForUpdate(std::string const& name) {
+    ParameterSet* getPSetForUpdate(std::string const& name) {
       bool isTracked = false;
       return getPSetForUpdate(name, isTracked);
     }
 
-    VParameterSetEntry*
-    getPSetVectorForUpdate(std::string const& name);
+    VParameterSetEntry* getPSetVectorForUpdate(std::string const& name);
 
     // construct from coded string and register it.
-    static
-    void
-    registerFromString(std::string const& rep);
+    static void registerFromString(std::string const& rep);
 
     // return ID of empty parameter set without registering it.
-    static
-    ParameterSetID
-    emptyParameterSetID();
+    static ParameterSetID emptyParameterSetID();
 
   private:
     // construct from coded string and id.
@@ -309,923 +272,780 @@ namespace edm {
 
     // Return the names of all the entries with the given typecode and
     // given status (trackiness)
-    size_t getNamesByCode_(char code,
-                           bool trackiness,
-                           std::vector<std::string>& output) const;
-
+    size_t getNamesByCode_(char code, bool trackiness, std::vector<std::string>& output) const;
 
   };  // ParameterSet
 
-  inline
-  void swap (ParameterSet& a, ParameterSet& b) {
-    a.swap(b);
-  }
+  inline void swap(ParameterSet& a, ParameterSet& b) { a.swap(b); }
 
   bool operator==(ParameterSet const& a, ParameterSet const& b);
 
   bool isTransientEqual(ParameterSet const& a, ParameterSet const& b);
 
-  inline
-  bool
-  operator!=(ParameterSet const& a, ParameterSet const& b) {
-    return !(a == b);
-  }
+  inline bool operator!=(ParameterSet const& a, ParameterSet const& b) { return !(a == b); }
 
   // Free function to retrieve a parameter set, given the parameter set ID.
-  ParameterSet const&
-  getParameterSet(ParameterSetID const& id);
+  ParameterSet const& getParameterSet(ParameterSetID const& id);
 
-  ParameterSet const&
-  getProcessParameterSetContainingModule(ModuleDescription const& moduleDescription);
+  ParameterSet const& getProcessParameterSetContainingModule(ModuleDescription const& moduleDescription);
 
   // specializations
   // ----------------------------------------------------------------------
 
-  template<>
-  bool
-  ParameterSet::getParameter<bool>(std::string const& name) const;
+  template <>
+  bool ParameterSet::getParameter<bool>(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // Int32, vInt32
 
-  template<>
-  int
-  ParameterSet::getParameter<int>(std::string const& name) const;
+  template <>
+  int ParameterSet::getParameter<int>(std::string const& name) const;
 
-  template<>
-  std::vector<int>
-  ParameterSet::getParameter<std::vector<int> >(std::string const& name) const;
+  template <>
+  std::vector<int> ParameterSet::getParameter<std::vector<int> >(std::string const& name) const;
 
- // ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
   // Int64, vInt64
 
-  template<>
-  long long
-  ParameterSet::getParameter<long long>(std::string const& name) const;
+  template <>
+  long long ParameterSet::getParameter<long long>(std::string const& name) const;
 
-  template<>
-  std::vector<long long>
-  ParameterSet::getParameter<std::vector<long long> >(std::string const& name) const;
+  template <>
+  std::vector<long long> ParameterSet::getParameter<std::vector<long long> >(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // Uint32, vUint32
 
-  template<>
-  unsigned int
-  ParameterSet::getParameter<unsigned int>(std::string const& name) const;
+  template <>
+  unsigned int ParameterSet::getParameter<unsigned int>(std::string const& name) const;
 
-  template<>
-  std::vector<unsigned int>
-  ParameterSet::getParameter<std::vector<unsigned int> >(std::string const& name) const;
+  template <>
+  std::vector<unsigned int> ParameterSet::getParameter<std::vector<unsigned int> >(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // Uint64, vUint64
 
-  template<>
-  unsigned long long
-  ParameterSet::getParameter<unsigned long long>(std::string const& name) const;
+  template <>
+  unsigned long long ParameterSet::getParameter<unsigned long long>(std::string const& name) const;
 
-  template<>
-  std::vector<unsigned long long>
-  ParameterSet::getParameter<std::vector<unsigned long long> >(std::string const& name) const;
+  template <>
+  std::vector<unsigned long long> ParameterSet::getParameter<std::vector<unsigned long long> >(
+      std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // Double, vDouble
 
-  template<>
-  double
-  ParameterSet::getParameter<double>(std::string const& name) const;
+  template <>
+  double ParameterSet::getParameter<double>(std::string const& name) const;
 
-  template<>
-  std::vector<double>
-  ParameterSet::getParameter<std::vector<double> >(std::string const& name) const;
+  template <>
+  std::vector<double> ParameterSet::getParameter<std::vector<double> >(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // String, vString
 
-  template<>
-  std::string
-  ParameterSet::getParameter<std::string>(std::string const& name) const;
+  template <>
+  std::string ParameterSet::getParameter<std::string>(std::string const& name) const;
 
-  template<>
-  std::vector<std::string>
-  ParameterSet::getParameter<std::vector<std::string> >(std::string const& name) const;
+  template <>
+  std::vector<std::string> ParameterSet::getParameter<std::vector<std::string> >(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // FileInPath
 
-  template<>
-  FileInPath
-  ParameterSet::getParameter<FileInPath>(std::string const& name) const;
+  template <>
+  FileInPath ParameterSet::getParameter<FileInPath>(std::string const& name) const;
 
   // FileInPath can't default-construct something useful, so we specialize
   // this template
-  template<>
-  std::vector<std::string>
-  ParameterSet::getParameterNamesForType<FileInPath>(bool trackiness) const;
+  template <>
+  std::vector<std::string> ParameterSet::getParameterNamesForType<FileInPath>(bool trackiness) const;
 
   // ----------------------------------------------------------------------
   // InputTag
 
-  template<>
-  InputTag
-  ParameterSet::getParameter<InputTag>(std::string const& name) const;
+  template <>
+  InputTag ParameterSet::getParameter<InputTag>(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // VInputTag
 
-  template<>
-  std::vector<InputTag>
-  ParameterSet::getParameter<std::vector<InputTag> >(std::string const& name) const;
+  template <>
+  std::vector<InputTag> ParameterSet::getParameter<std::vector<InputTag> >(std::string const& name) const;
 
-   // ----------------------------------------------------------------------
-   // ESInputTag
+  // ----------------------------------------------------------------------
+  // ESInputTag
 
-   template<>
-   ESInputTag
-   ParameterSet::getParameter<ESInputTag>(std::string const& name) const;
+  template <>
+  ESInputTag ParameterSet::getParameter<ESInputTag>(std::string const& name) const;
 
-   // ----------------------------------------------------------------------
-   // VESInputTag
+  // ----------------------------------------------------------------------
+  // VESInputTag
 
-   template<>
-   std::vector<ESInputTag>
-   ParameterSet::getParameter<std::vector<ESInputTag> >(std::string const& name) const;
+  template <>
+  std::vector<ESInputTag> ParameterSet::getParameter<std::vector<ESInputTag> >(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // EventID
 
-  template<>
-  EventID
-  ParameterSet::getParameter<EventID>(std::string const& name) const;
+  template <>
+  EventID ParameterSet::getParameter<EventID>(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // VEventID
 
-  template<>
-  std::vector<EventID>
-  ParameterSet::getParameter<std::vector<EventID> >(std::string const& name) const;
+  template <>
+  std::vector<EventID> ParameterSet::getParameter<std::vector<EventID> >(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // LuminosityBlockID
 
-  template<>
-  LuminosityBlockID
-  ParameterSet::getParameter<LuminosityBlockID>(std::string const& name) const;
+  template <>
+  LuminosityBlockID ParameterSet::getParameter<LuminosityBlockID>(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // VLuminosityBlockID
 
-  template<>
-  std::vector<LuminosityBlockID>
-  ParameterSet::getParameter<std::vector<LuminosityBlockID> >(std::string const& name) const;
+  template <>
+  std::vector<LuminosityBlockID> ParameterSet::getParameter<std::vector<LuminosityBlockID> >(
+      std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // EventRange
 
-  template<>
-  EventRange
-  ParameterSet::getParameter<EventRange>(std::string const& name) const;
+  template <>
+  EventRange ParameterSet::getParameter<EventRange>(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // VEventRange
 
-  template<>
-  std::vector<EventRange>
-  ParameterSet::getParameter<std::vector<EventRange> >(std::string const& name) const;
+  template <>
+  std::vector<EventRange> ParameterSet::getParameter<std::vector<EventRange> >(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // LuminosityBlockRange
 
-  template<>
-  LuminosityBlockRange
-  ParameterSet::getParameter<LuminosityBlockRange>(std::string const& name) const;
+  template <>
+  LuminosityBlockRange ParameterSet::getParameter<LuminosityBlockRange>(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // VLuminosityBlockRange
 
-  template<>
-  std::vector<LuminosityBlockRange>
-  ParameterSet::getParameter<std::vector<LuminosityBlockRange> >(std::string const& name) const;
+  template <>
+  std::vector<LuminosityBlockRange> ParameterSet::getParameter<std::vector<LuminosityBlockRange> >(
+      std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // PSet, vPSet
 
-  template<>
-  ParameterSet
-  ParameterSet::getParameter<ParameterSet>(std::string const& name) const;
+  template <>
+  ParameterSet ParameterSet::getParameter<ParameterSet>(std::string const& name) const;
 
-  template<>
-  VParameterSet
-  ParameterSet::getParameter<VParameterSet>(std::string const& name) const;
+  template <>
+  VParameterSet ParameterSet::getParameter<VParameterSet>(std::string const& name) const;
 
-  template<>
-  void
-  ParameterSet::addParameter<ParameterSet>(std::string const& name, ParameterSet const& value);
+  template <>
+  void ParameterSet::addParameter<ParameterSet>(std::string const& name, ParameterSet const& value);
 
-  template<>
-  void
-  ParameterSet::addParameter<ParameterSet>(char const* name, ParameterSet const& value);
+  template <>
+  void ParameterSet::addParameter<ParameterSet>(char const* name, ParameterSet const& value);
 
-  template<>
-  void
-  ParameterSet::addUntrackedParameter<ParameterSet>(std::string const& name, ParameterSet const& value);
+  template <>
+  void ParameterSet::addUntrackedParameter<ParameterSet>(std::string const& name, ParameterSet const& value);
 
-  template<>
-  void
-  ParameterSet::addUntrackedParameter<ParameterSet>(char const* name, ParameterSet const& value);
+  template <>
+  void ParameterSet::addUntrackedParameter<ParameterSet>(char const* name, ParameterSet const& value);
 
-  template<>
-  void
-  ParameterSet::addParameter<VParameterSet>(std::string const& name, VParameterSet const& value);
+  template <>
+  void ParameterSet::addParameter<VParameterSet>(std::string const& name, VParameterSet const& value);
 
-  template<>
-  void
-  ParameterSet::addParameter<VParameterSet>(char const* name, VParameterSet const& value);
+  template <>
+  void ParameterSet::addParameter<VParameterSet>(char const* name, VParameterSet const& value);
 
-  template<>
-  void
-  ParameterSet::addUntrackedParameter<VParameterSet>(std::string const& name, VParameterSet const& value);
+  template <>
+  void ParameterSet::addUntrackedParameter<VParameterSet>(std::string const& name, VParameterSet const& value);
 
-  template<>
-  void
-  ParameterSet::addUntrackedParameter<VParameterSet>(char const* name, VParameterSet const& value);
+  template <>
+  void ParameterSet::addUntrackedParameter<VParameterSet>(char const* name, VParameterSet const& value);
 
   // untracked parameters
 
   // ----------------------------------------------------------------------
   // Bool, vBool
 
-  template<>
-  bool
-  ParameterSet::getUntrackedParameter<bool>(std::string const& name, bool const& defaultValue) const;
+  template <>
+  bool ParameterSet::getUntrackedParameter<bool>(std::string const& name, bool const& defaultValue) const;
 
-  template<>
-  bool
-  ParameterSet::getUntrackedParameter<bool>(std::string const& name) const;
+  template <>
+  bool ParameterSet::getUntrackedParameter<bool>(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // Int32, vInt32
 
-  template<>
-  int
-  ParameterSet::getUntrackedParameter<int>(std::string const& name, int const& defaultValue) const;
+  template <>
+  int ParameterSet::getUntrackedParameter<int>(std::string const& name, int const& defaultValue) const;
 
-  template<>
-  int
-  ParameterSet::getUntrackedParameter<int>(std::string const& name) const;
+  template <>
+  int ParameterSet::getUntrackedParameter<int>(std::string const& name) const;
 
-  template<>
-  std::vector<int>
-  ParameterSet::getUntrackedParameter<std::vector<int> >(std::string const& name, std::vector<int> const& defaultValue) const;
+  template <>
+  std::vector<int> ParameterSet::getUntrackedParameter<std::vector<int> >(std::string const& name,
+                                                                          std::vector<int> const& defaultValue) const;
 
-  template<>
-  std::vector<int>
-  ParameterSet::getUntrackedParameter<std::vector<int> >(std::string const& name) const;
+  template <>
+  std::vector<int> ParameterSet::getUntrackedParameter<std::vector<int> >(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // Uint32, vUint32
 
-  template<>
-  unsigned int
-  ParameterSet::getUntrackedParameter<unsigned int>(std::string const& name, unsigned int const& defaultValue) const;
+  template <>
+  unsigned int ParameterSet::getUntrackedParameter<unsigned int>(std::string const& name,
+                                                                 unsigned int const& defaultValue) const;
 
-  template<>
-  unsigned int
-  ParameterSet::getUntrackedParameter<unsigned int>(std::string const& name) const;
+  template <>
+  unsigned int ParameterSet::getUntrackedParameter<unsigned int>(std::string const& name) const;
 
-  template<>
-  std::vector<unsigned int>
-  ParameterSet::getUntrackedParameter<std::vector<unsigned int> >(std::string const& name, std::vector<unsigned int> const& defaultValue) const;
+  template <>
+  std::vector<unsigned int> ParameterSet::getUntrackedParameter<std::vector<unsigned int> >(
+      std::string const& name, std::vector<unsigned int> const& defaultValue) const;
 
-  template<>
-  std::vector<unsigned int>
-  ParameterSet::getUntrackedParameter<std::vector<unsigned int> >(std::string const& name) const;
+  template <>
+  std::vector<unsigned int> ParameterSet::getUntrackedParameter<std::vector<unsigned int> >(
+      std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // Uint64, vUint64
 
-  template<>
-  unsigned long long
-  ParameterSet::getUntrackedParameter<unsigned long long>(std::string const& name, unsigned long long const& defaultValue) const;
+  template <>
+  unsigned long long ParameterSet::getUntrackedParameter<unsigned long long>(
+      std::string const& name, unsigned long long const& defaultValue) const;
 
-  template<>
-  unsigned long long
-  ParameterSet::getUntrackedParameter<unsigned long long>(std::string const& name) const;
+  template <>
+  unsigned long long ParameterSet::getUntrackedParameter<unsigned long long>(std::string const& name) const;
 
-  template<>
-  std::vector<unsigned long long>
-  ParameterSet::getUntrackedParameter<std::vector<unsigned long long> >(std::string const& name, std::vector<unsigned long long> const& defaultValue) const;
+  template <>
+  std::vector<unsigned long long> ParameterSet::getUntrackedParameter<std::vector<unsigned long long> >(
+      std::string const& name, std::vector<unsigned long long> const& defaultValue) const;
 
-  template<>
-  std::vector<unsigned long long>
-  ParameterSet::getUntrackedParameter<std::vector<unsigned long long> >(std::string const& name) const;
+  template <>
+  std::vector<unsigned long long> ParameterSet::getUntrackedParameter<std::vector<unsigned long long> >(
+      std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // Int64, Vint64
 
-  template<>
-  long long
-  ParameterSet::getUntrackedParameter<long long>(std::string const& name, long long const& defaultValue) const;
+  template <>
+  long long ParameterSet::getUntrackedParameter<long long>(std::string const& name,
+                                                           long long const& defaultValue) const;
 
-  template<>
-  long long
-  ParameterSet::getUntrackedParameter<long long>(std::string const& name) const;
+  template <>
+  long long ParameterSet::getUntrackedParameter<long long>(std::string const& name) const;
 
-  template<>
-  std::vector<long long>
-  ParameterSet::getUntrackedParameter<std::vector<long long> >(std::string const& name, std::vector<long long> const& defaultValue) const;
+  template <>
+  std::vector<long long> ParameterSet::getUntrackedParameter<std::vector<long long> >(
+      std::string const& name, std::vector<long long> const& defaultValue) const;
 
-  template<>
-  std::vector<long long>
-  ParameterSet::getUntrackedParameter<std::vector<long long> >(std::string const& name) const;
+  template <>
+  std::vector<long long> ParameterSet::getUntrackedParameter<std::vector<long long> >(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // Double, vDouble
 
-  template<>
-  double
-  ParameterSet::getUntrackedParameter<double>(std::string const& name, double const& defaultValue) const;
+  template <>
+  double ParameterSet::getUntrackedParameter<double>(std::string const& name, double const& defaultValue) const;
 
-  template<>
-  double
-  ParameterSet::getUntrackedParameter<double>(std::string const& name) const;
+  template <>
+  double ParameterSet::getUntrackedParameter<double>(std::string const& name) const;
 
-  template<>
-  std::vector<double>
-  ParameterSet::getUntrackedParameter<std::vector<double> >(std::string const& name, std::vector<double> const& defaultValue) const;
+  template <>
+  std::vector<double> ParameterSet::getUntrackedParameter<std::vector<double> >(
+      std::string const& name, std::vector<double> const& defaultValue) const;
 
-  template<>
-  std::vector<double>
-  ParameterSet::getUntrackedParameter<std::vector<double> >(std::string const& name) const;
+  template <>
+  std::vector<double> ParameterSet::getUntrackedParameter<std::vector<double> >(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // String, vString
 
-  template<>
-  std::string
-  ParameterSet::getUntrackedParameter<std::string>(std::string const& name, std::string const& defaultValue) const;
+  template <>
+  std::string ParameterSet::getUntrackedParameter<std::string>(std::string const& name,
+                                                               std::string const& defaultValue) const;
 
-  template<>
-  std::string
-  ParameterSet::getUntrackedParameter<std::string>(std::string const& name) const;
+  template <>
+  std::string ParameterSet::getUntrackedParameter<std::string>(std::string const& name) const;
 
-  template<>
-  std::vector<std::string>
-  ParameterSet::getUntrackedParameter<std::vector<std::string> >(std::string const& name, std::vector<std::string> const& defaultValue) const;
+  template <>
+  std::vector<std::string> ParameterSet::getUntrackedParameter<std::vector<std::string> >(
+      std::string const& name, std::vector<std::string> const& defaultValue) const;
 
-  template<>
-  std::vector<std::string>
-  ParameterSet::getUntrackedParameter<std::vector<std::string> >(std::string const& name) const;
+  template <>
+  std::vector<std::string> ParameterSet::getUntrackedParameter<std::vector<std::string> >(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   //  FileInPath
 
-  template<>
-  FileInPath
-  ParameterSet::getUntrackedParameter<FileInPath>(std::string const& name, FileInPath const& defaultValue) const;
+  template <>
+  FileInPath ParameterSet::getUntrackedParameter<FileInPath>(std::string const& name,
+                                                             FileInPath const& defaultValue) const;
 
-  template<>
-  FileInPath
-  ParameterSet::getUntrackedParameter<FileInPath>(std::string const& name) const;
+  template <>
+  FileInPath ParameterSet::getUntrackedParameter<FileInPath>(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // InputTag, VInputTag
 
-  template<>
-  InputTag
-  ParameterSet::getUntrackedParameter<InputTag>(std::string const& name, InputTag const& defaultValue) const;
+  template <>
+  InputTag ParameterSet::getUntrackedParameter<InputTag>(std::string const& name, InputTag const& defaultValue) const;
 
-  template<>
-  InputTag
-  ParameterSet::getUntrackedParameter<InputTag>(std::string const& name) const;
+  template <>
+  InputTag ParameterSet::getUntrackedParameter<InputTag>(std::string const& name) const;
 
-  template<>
-  std::vector<InputTag>
-  ParameterSet::getUntrackedParameter<std::vector<InputTag> >(std::string const& name,
-                                      std::vector<InputTag> const& defaultValue) const;
+  template <>
+  std::vector<InputTag> ParameterSet::getUntrackedParameter<std::vector<InputTag> >(
+      std::string const& name, std::vector<InputTag> const& defaultValue) const;
 
-  template<>
-  std::vector<InputTag>
-  ParameterSet::getUntrackedParameter<std::vector<InputTag> >(std::string const& name) const;
+  template <>
+  std::vector<InputTag> ParameterSet::getUntrackedParameter<std::vector<InputTag> >(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // EventID, VEventID
 
-  template<>
-  EventID
-  ParameterSet::getUntrackedParameter<EventID>(std::string const& name, EventID const& defaultValue) const;
+  template <>
+  EventID ParameterSet::getUntrackedParameter<EventID>(std::string const& name, EventID const& defaultValue) const;
 
-  template<>
-  EventID
-  ParameterSet::getUntrackedParameter<EventID>(std::string const& name) const;
+  template <>
+  EventID ParameterSet::getUntrackedParameter<EventID>(std::string const& name) const;
 
-  template<>
-  std::vector<EventID>
-  ParameterSet::getUntrackedParameter<std::vector<EventID> >(std::string const& name,
-                                      std::vector<EventID> const& defaultValue) const;
-  template<>
-  std::vector<EventID>
-  ParameterSet::getUntrackedParameter<std::vector<EventID> >(std::string const& name) const;
+  template <>
+  std::vector<EventID> ParameterSet::getUntrackedParameter<std::vector<EventID> >(
+      std::string const& name, std::vector<EventID> const& defaultValue) const;
+  template <>
+  std::vector<EventID> ParameterSet::getUntrackedParameter<std::vector<EventID> >(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // LuminosityBlockID, VLuminosityBlockID
 
-  template<>
-  LuminosityBlockID
-  ParameterSet::getUntrackedParameter<LuminosityBlockID>(std::string const& name, LuminosityBlockID const& defaultValue) const;
+  template <>
+  LuminosityBlockID ParameterSet::getUntrackedParameter<LuminosityBlockID>(std::string const& name,
+                                                                           LuminosityBlockID const& defaultValue) const;
 
-  template<>
-  LuminosityBlockID
-  ParameterSet::getUntrackedParameter<LuminosityBlockID>(std::string const& name) const;
+  template <>
+  LuminosityBlockID ParameterSet::getUntrackedParameter<LuminosityBlockID>(std::string const& name) const;
 
-  template<>
-  std::vector<LuminosityBlockID>
-  ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockID> >(std::string const& name,
-                                      std::vector<LuminosityBlockID> const& defaultValue) const;
-  template<>
-  std::vector<LuminosityBlockID>
-  ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockID> >(std::string const& name) const;
+  template <>
+  std::vector<LuminosityBlockID> ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockID> >(
+      std::string const& name, std::vector<LuminosityBlockID> const& defaultValue) const;
+  template <>
+  std::vector<LuminosityBlockID> ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockID> >(
+      std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // EventRange, VEventRange
 
-  template<>
-  EventRange
-  ParameterSet::getUntrackedParameter<EventRange>(std::string const& name, EventRange const& defaultValue) const;
+  template <>
+  EventRange ParameterSet::getUntrackedParameter<EventRange>(std::string const& name,
+                                                             EventRange const& defaultValue) const;
 
-  template<>
-  EventRange
-  ParameterSet::getUntrackedParameter<EventRange>(std::string const& name) const;
+  template <>
+  EventRange ParameterSet::getUntrackedParameter<EventRange>(std::string const& name) const;
 
-  template<>
-  std::vector<EventRange>
-  ParameterSet::getUntrackedParameter<std::vector<EventRange> >(std::string const& name,
-                                      std::vector<EventRange> const& defaultValue) const;
-  template<>
-  std::vector<EventRange>
-  ParameterSet::getUntrackedParameter<std::vector<EventRange> >(std::string const& name) const;
+  template <>
+  std::vector<EventRange> ParameterSet::getUntrackedParameter<std::vector<EventRange> >(
+      std::string const& name, std::vector<EventRange> const& defaultValue) const;
+  template <>
+  std::vector<EventRange> ParameterSet::getUntrackedParameter<std::vector<EventRange> >(std::string const& name) const;
 
   // ----------------------------------------------------------------------
   // LuminosityBlockRange, VLuminosityBlockRange
 
-  template<>
-  LuminosityBlockRange
-  ParameterSet::getUntrackedParameter<LuminosityBlockRange>(std::string const& name, LuminosityBlockRange const& defaultValue) const;
+  template <>
+  LuminosityBlockRange ParameterSet::getUntrackedParameter<LuminosityBlockRange>(
+      std::string const& name, LuminosityBlockRange const& defaultValue) const;
 
-  template<>
-  LuminosityBlockRange
-  ParameterSet::getUntrackedParameter<LuminosityBlockRange>(std::string const& name) const;
+  template <>
+  LuminosityBlockRange ParameterSet::getUntrackedParameter<LuminosityBlockRange>(std::string const& name) const;
 
-  template<>
-  std::vector<LuminosityBlockRange>
-  ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockRange> >(std::string const& name,
-                                      std::vector<LuminosityBlockRange> const& defaultValue) const;
-  template<>
-  std::vector<LuminosityBlockRange>
-  ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockRange> >(std::string const& name) const;
+  template <>
+  std::vector<LuminosityBlockRange> ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockRange> >(
+      std::string const& name, std::vector<LuminosityBlockRange> const& defaultValue) const;
+  template <>
+  std::vector<LuminosityBlockRange> ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockRange> >(
+      std::string const& name) const;
 
   // specializations
   // ----------------------------------------------------------------------
   // Bool, vBool
 
-  template<>
-  bool
-  ParameterSet::getParameter<bool>(char const* name) const;
+  template <>
+  bool ParameterSet::getParameter<bool>(char const* name) const;
 
   // ----------------------------------------------------------------------
   // Int32, vInt32
 
-  template<>
-  int
-  ParameterSet::getParameter<int>(char const* name) const;
+  template <>
+  int ParameterSet::getParameter<int>(char const* name) const;
 
-  template<>
-  std::vector<int>
-  ParameterSet::getParameter<std::vector<int> >(char const* name) const;
+  template <>
+  std::vector<int> ParameterSet::getParameter<std::vector<int> >(char const* name) const;
 
- // ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
   // Int64, vInt64
 
-  template<>
-  long long
-  ParameterSet::getParameter<long long>(char const* name) const;
+  template <>
+  long long ParameterSet::getParameter<long long>(char const* name) const;
 
-  template<>
-  std::vector<long long>
-  ParameterSet::getParameter<std::vector<long long> >(char const* name) const;
+  template <>
+  std::vector<long long> ParameterSet::getParameter<std::vector<long long> >(char const* name) const;
 
   // ----------------------------------------------------------------------
   // Uint32, vUint32
 
-  template<>
-  unsigned int
-  ParameterSet::getParameter<unsigned int>(char const* name) const;
+  template <>
+  unsigned int ParameterSet::getParameter<unsigned int>(char const* name) const;
 
-  template<>
-  std::vector<unsigned int>
-  ParameterSet::getParameter<std::vector<unsigned int> >(char const* name) const;
+  template <>
+  std::vector<unsigned int> ParameterSet::getParameter<std::vector<unsigned int> >(char const* name) const;
 
   // ----------------------------------------------------------------------
   // Uint64, vUint64
 
-  template<>
-  unsigned long long
-  ParameterSet::getParameter<unsigned long long>(char const* name) const;
+  template <>
+  unsigned long long ParameterSet::getParameter<unsigned long long>(char const* name) const;
 
-  template<>
-  std::vector<unsigned long long>
-  ParameterSet::getParameter<std::vector<unsigned long long> >(char const* name) const;
+  template <>
+  std::vector<unsigned long long> ParameterSet::getParameter<std::vector<unsigned long long> >(char const* name) const;
 
   // ----------------------------------------------------------------------
   // Double, vDouble
 
-  template<>
-  double
-  ParameterSet::getParameter<double>(char const* name) const;
+  template <>
+  double ParameterSet::getParameter<double>(char const* name) const;
 
-  template<>
-  std::vector<double>
-  ParameterSet::getParameter<std::vector<double> >(char const* name) const;
+  template <>
+  std::vector<double> ParameterSet::getParameter<std::vector<double> >(char const* name) const;
 
   // ----------------------------------------------------------------------
   // String, vString
 
-  template<>
-  std::string
-  ParameterSet::getParameter<std::string>(char const* name) const;
+  template <>
+  std::string ParameterSet::getParameter<std::string>(char const* name) const;
 
-  template<>
-  std::vector<std::string>
-  ParameterSet::getParameter<std::vector<std::string> >(char const* name) const;
+  template <>
+  std::vector<std::string> ParameterSet::getParameter<std::vector<std::string> >(char const* name) const;
 
   // ----------------------------------------------------------------------
   // FileInPath
 
-  template<>
-  FileInPath
-  ParameterSet::getParameter<FileInPath>(char const* name) const;
+  template <>
+  FileInPath ParameterSet::getParameter<FileInPath>(char const* name) const;
 
   // ----------------------------------------------------------------------
   // InputTag
 
-  template<>
-  InputTag
-  ParameterSet::getParameter<InputTag>(char const* name) const;
+  template <>
+  InputTag ParameterSet::getParameter<InputTag>(char const* name) const;
 
   // ----------------------------------------------------------------------
   // VInputTag
 
-  template<>
-  std::vector<InputTag>
-  ParameterSet::getParameter<std::vector<InputTag> >(char const* name) const;
+  template <>
+  std::vector<InputTag> ParameterSet::getParameter<std::vector<InputTag> >(char const* name) const;
 
   // ----------------------------------------------------------------------
   // EventID
 
-  template<>
-  EventID
-  ParameterSet::getParameter<EventID>(char const* name) const;
+  template <>
+  EventID ParameterSet::getParameter<EventID>(char const* name) const;
 
   // ----------------------------------------------------------------------
   // VEventID
 
-  template<>
-  std::vector<EventID>
-  ParameterSet::getParameter<std::vector<EventID> >(char const* name) const;
+  template <>
+  std::vector<EventID> ParameterSet::getParameter<std::vector<EventID> >(char const* name) const;
 
   // ----------------------------------------------------------------------
   // LuminosityBlockID
 
-  template<>
-  LuminosityBlockID
-  ParameterSet::getParameter<LuminosityBlockID>(char const* name) const;
+  template <>
+  LuminosityBlockID ParameterSet::getParameter<LuminosityBlockID>(char const* name) const;
 
   // ----------------------------------------------------------------------
   // VLuminosityBlockID
 
-  template<>
-  std::vector<LuminosityBlockID>
-  ParameterSet::getParameter<std::vector<LuminosityBlockID> >(char const* name) const;
+  template <>
+  std::vector<LuminosityBlockID> ParameterSet::getParameter<std::vector<LuminosityBlockID> >(char const* name) const;
 
   // ----------------------------------------------------------------------
   // EventRange
 
-  template<>
-  EventRange
-  ParameterSet::getParameter<EventRange>(char const* name) const;
+  template <>
+  EventRange ParameterSet::getParameter<EventRange>(char const* name) const;
 
   // ----------------------------------------------------------------------
   // VEventRange
 
-  template<>
-  std::vector<EventRange>
-  ParameterSet::getParameter<std::vector<EventRange> >(char const* name) const;
+  template <>
+  std::vector<EventRange> ParameterSet::getParameter<std::vector<EventRange> >(char const* name) const;
 
   // ----------------------------------------------------------------------
   // LuminosityBlockRange
 
-  template<>
-  LuminosityBlockRange
-  ParameterSet::getParameter<LuminosityBlockRange>(char const* name) const;
+  template <>
+  LuminosityBlockRange ParameterSet::getParameter<LuminosityBlockRange>(char const* name) const;
 
   // ----------------------------------------------------------------------
   // VLuminosityBlockRange
 
-  template<>
-  std::vector<LuminosityBlockRange>
-  ParameterSet::getParameter<std::vector<LuminosityBlockRange> >(char const* name) const;
+  template <>
+  std::vector<LuminosityBlockRange> ParameterSet::getParameter<std::vector<LuminosityBlockRange> >(
+      char const* name) const;
 
   // ----------------------------------------------------------------------
   // PSet, vPSet
 
-  template<>
-  ParameterSet
-  ParameterSet::getParameter<ParameterSet>(char const* name) const;
+  template <>
+  ParameterSet ParameterSet::getParameter<ParameterSet>(char const* name) const;
 
-  template<>
-  VParameterSet
-  ParameterSet::getParameter<VParameterSet>(char const* name) const;
+  template <>
+  VParameterSet ParameterSet::getParameter<VParameterSet>(char const* name) const;
 
   // untracked parameters
 
   // ----------------------------------------------------------------------
   // Bool, vBool
 
-  template<>
-  bool
-  ParameterSet::getUntrackedParameter<bool>(char const* name, bool const& defaultValue) const;
+  template <>
+  bool ParameterSet::getUntrackedParameter<bool>(char const* name, bool const& defaultValue) const;
 
-  template<>
-  bool
-  ParameterSet::getUntrackedParameter<bool>(char const* name) const;
+  template <>
+  bool ParameterSet::getUntrackedParameter<bool>(char const* name) const;
 
   // ----------------------------------------------------------------------
   // Int32, vInt32
 
-  template<>
-  int
-  ParameterSet::getUntrackedParameter<int>(char const* name, int const& defaultValue) const;
+  template <>
+  int ParameterSet::getUntrackedParameter<int>(char const* name, int const& defaultValue) const;
 
-  template<>
-  int
-  ParameterSet::getUntrackedParameter<int>(char const* name) const;
+  template <>
+  int ParameterSet::getUntrackedParameter<int>(char const* name) const;
 
-  template<>
-  std::vector<int>
-  ParameterSet::getUntrackedParameter<std::vector<int> >(char const* name, std::vector<int> const& defaultValue) const;
+  template <>
+  std::vector<int> ParameterSet::getUntrackedParameter<std::vector<int> >(char const* name,
+                                                                          std::vector<int> const& defaultValue) const;
 
-  template<>
-  std::vector<int>
-  ParameterSet::getUntrackedParameter<std::vector<int> >(char const* name) const;
+  template <>
+  std::vector<int> ParameterSet::getUntrackedParameter<std::vector<int> >(char const* name) const;
 
   // ----------------------------------------------------------------------
   // Uint32, vUint32
 
-  template<>
-  unsigned int
-  ParameterSet::getUntrackedParameter<unsigned int>(char const* name, unsigned int const& defaultValue) const;
+  template <>
+  unsigned int ParameterSet::getUntrackedParameter<unsigned int>(char const* name,
+                                                                 unsigned int const& defaultValue) const;
 
-  template<>
-  unsigned int
-  ParameterSet::getUntrackedParameter<unsigned int>(char const* name) const;
+  template <>
+  unsigned int ParameterSet::getUntrackedParameter<unsigned int>(char const* name) const;
 
-  template<>
-  std::vector<unsigned int>
-  ParameterSet::getUntrackedParameter<std::vector<unsigned int> >(char const* name, std::vector<unsigned int> const& defaultValue) const;
+  template <>
+  std::vector<unsigned int> ParameterSet::getUntrackedParameter<std::vector<unsigned int> >(
+      char const* name, std::vector<unsigned int> const& defaultValue) const;
 
-  template<>
-  std::vector<unsigned int>
-  ParameterSet::getUntrackedParameter<std::vector<unsigned int> >(char const* name) const;
+  template <>
+  std::vector<unsigned int> ParameterSet::getUntrackedParameter<std::vector<unsigned int> >(char const* name) const;
 
   // ----------------------------------------------------------------------
   // Uint64, vUint64
 
-  template<>
-  unsigned long long
-  ParameterSet::getUntrackedParameter<unsigned long long>(char const* name, unsigned long long const& defaultValue) const;
+  template <>
+  unsigned long long ParameterSet::getUntrackedParameter<unsigned long long>(
+      char const* name, unsigned long long const& defaultValue) const;
 
-  template<>
-  unsigned long long
-  ParameterSet::getUntrackedParameter<unsigned long long>(char const* name) const;
+  template <>
+  unsigned long long ParameterSet::getUntrackedParameter<unsigned long long>(char const* name) const;
 
-  template<>
-  std::vector<unsigned long long>
-  ParameterSet::getUntrackedParameter<std::vector<unsigned long long> >(char const* name, std::vector<unsigned long long> const& defaultValue) const;
+  template <>
+  std::vector<unsigned long long> ParameterSet::getUntrackedParameter<std::vector<unsigned long long> >(
+      char const* name, std::vector<unsigned long long> const& defaultValue) const;
 
-  template<>
-  std::vector<unsigned long long>
-  ParameterSet::getUntrackedParameter<std::vector<unsigned long long> >(char const* name) const;
+  template <>
+  std::vector<unsigned long long> ParameterSet::getUntrackedParameter<std::vector<unsigned long long> >(
+      char const* name) const;
 
   // ----------------------------------------------------------------------
   // Int64, Vint64
 
-  template<>
-  long long
-  ParameterSet::getUntrackedParameter<long long>(char const* name, long long const& defaultValue) const;
+  template <>
+  long long ParameterSet::getUntrackedParameter<long long>(char const* name, long long const& defaultValue) const;
 
-  template<>
-  long long
-  ParameterSet::getUntrackedParameter<long long>(char const* name) const;
+  template <>
+  long long ParameterSet::getUntrackedParameter<long long>(char const* name) const;
 
-  template<>
-  std::vector<long long>
-  ParameterSet::getUntrackedParameter<std::vector<long long> >(char const* name, std::vector<long long> const& defaultValue) const;
+  template <>
+  std::vector<long long> ParameterSet::getUntrackedParameter<std::vector<long long> >(
+      char const* name, std::vector<long long> const& defaultValue) const;
 
-  template<>
-  std::vector<long long>
-  ParameterSet::getUntrackedParameter<std::vector<long long> >(char const* name) const;
+  template <>
+  std::vector<long long> ParameterSet::getUntrackedParameter<std::vector<long long> >(char const* name) const;
 
   // ----------------------------------------------------------------------
   // Double, vDouble
 
-  template<>
-  double
-  ParameterSet::getUntrackedParameter<double>(char const* name, double const& defaultValue) const;
+  template <>
+  double ParameterSet::getUntrackedParameter<double>(char const* name, double const& defaultValue) const;
 
-  template<>
-  double
-  ParameterSet::getUntrackedParameter<double>(char const* name) const;
+  template <>
+  double ParameterSet::getUntrackedParameter<double>(char const* name) const;
 
-  template<>
-  std::vector<double>
-  ParameterSet::getUntrackedParameter<std::vector<double> >(char const* name, std::vector<double> const& defaultValue) const;
+  template <>
+  std::vector<double> ParameterSet::getUntrackedParameter<std::vector<double> >(
+      char const* name, std::vector<double> const& defaultValue) const;
 
-  template<>
-  std::vector<double>
-  ParameterSet::getUntrackedParameter<std::vector<double> >(char const* name) const;
+  template <>
+  std::vector<double> ParameterSet::getUntrackedParameter<std::vector<double> >(char const* name) const;
 
   // ----------------------------------------------------------------------
   // String, vString
 
-  template<>
-  std::string
-  ParameterSet::getUntrackedParameter<std::string>(char const* name, std::string const& defaultValue) const;
+  template <>
+  std::string ParameterSet::getUntrackedParameter<std::string>(char const* name, std::string const& defaultValue) const;
 
-  template<>
-  std::string
-  ParameterSet::getUntrackedParameter<std::string>(char const* name) const;
+  template <>
+  std::string ParameterSet::getUntrackedParameter<std::string>(char const* name) const;
 
-  template<>
-  std::vector<std::string>
-  ParameterSet::getUntrackedParameter<std::vector<std::string> >(char const* name, std::vector<std::string> const& defaultValue) const;
+  template <>
+  std::vector<std::string> ParameterSet::getUntrackedParameter<std::vector<std::string> >(
+      char const* name, std::vector<std::string> const& defaultValue) const;
 
-  template<>
-  std::vector<std::string>
-  ParameterSet::getUntrackedParameter<std::vector<std::string> >(char const* name) const;
+  template <>
+  std::vector<std::string> ParameterSet::getUntrackedParameter<std::vector<std::string> >(char const* name) const;
 
   // ----------------------------------------------------------------------
   //  FileInPath
 
-  template<>
-  FileInPath
-  ParameterSet::getUntrackedParameter<FileInPath>(char const* name, FileInPath const& defaultValue) const;
+  template <>
+  FileInPath ParameterSet::getUntrackedParameter<FileInPath>(char const* name, FileInPath const& defaultValue) const;
 
-  template<>
-  FileInPath
-  ParameterSet::getUntrackedParameter<FileInPath>(char const* name) const;
+  template <>
+  FileInPath ParameterSet::getUntrackedParameter<FileInPath>(char const* name) const;
 
   // ----------------------------------------------------------------------
   // InputTag, VInputTag
 
-  template<>
-  InputTag
-  ParameterSet::getUntrackedParameter<InputTag>(char const* name, InputTag const& defaultValue) const;
+  template <>
+  InputTag ParameterSet::getUntrackedParameter<InputTag>(char const* name, InputTag const& defaultValue) const;
 
-  template<>
-  InputTag
-  ParameterSet::getUntrackedParameter<InputTag>(char const* name) const;
+  template <>
+  InputTag ParameterSet::getUntrackedParameter<InputTag>(char const* name) const;
 
-  template<>
-  std::vector<InputTag>
-  ParameterSet::getUntrackedParameter<std::vector<InputTag> >(char const* name,
-                                      std::vector<InputTag> const& defaultValue) const;
+  template <>
+  std::vector<InputTag> ParameterSet::getUntrackedParameter<std::vector<InputTag> >(
+      char const* name, std::vector<InputTag> const& defaultValue) const;
 
-  template<>
-  std::vector<InputTag>
-  ParameterSet::getUntrackedParameter<std::vector<InputTag> >(char const* name) const;
+  template <>
+  std::vector<InputTag> ParameterSet::getUntrackedParameter<std::vector<InputTag> >(char const* name) const;
 
   // ----------------------------------------------------------------------
   // EventID, VEventID
 
-  template<>
-  EventID
-  ParameterSet::getUntrackedParameter<EventID>(char const* name, EventID const& defaultValue) const;
+  template <>
+  EventID ParameterSet::getUntrackedParameter<EventID>(char const* name, EventID const& defaultValue) const;
 
-  template<>
-  EventID
-  ParameterSet::getUntrackedParameter<EventID>(char const* name) const;
+  template <>
+  EventID ParameterSet::getUntrackedParameter<EventID>(char const* name) const;
 
-  template<>
-  std::vector<EventID>
-  ParameterSet::getUntrackedParameter<std::vector<EventID> >(char const* name,
-                                      std::vector<EventID> const& defaultValue) const;
-  template<>
-  std::vector<EventID>
-  ParameterSet::getUntrackedParameter<std::vector<EventID> >(char const* name) const;
+  template <>
+  std::vector<EventID> ParameterSet::getUntrackedParameter<std::vector<EventID> >(
+      char const* name, std::vector<EventID> const& defaultValue) const;
+  template <>
+  std::vector<EventID> ParameterSet::getUntrackedParameter<std::vector<EventID> >(char const* name) const;
 
   // ----------------------------------------------------------------------
   // LuminosityBlockID, VLuminosityBlockID
 
-  template<>
-  LuminosityBlockID
-  ParameterSet::getUntrackedParameter<LuminosityBlockID>(char const* name, LuminosityBlockID const& defaultValue) const;
+  template <>
+  LuminosityBlockID ParameterSet::getUntrackedParameter<LuminosityBlockID>(char const* name,
+                                                                           LuminosityBlockID const& defaultValue) const;
 
-  template<>
-  LuminosityBlockID
-  ParameterSet::getUntrackedParameter<LuminosityBlockID>(char const* name) const;
+  template <>
+  LuminosityBlockID ParameterSet::getUntrackedParameter<LuminosityBlockID>(char const* name) const;
 
-  template<>
-  std::vector<LuminosityBlockID>
-  ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockID> >(char const* name,
-                                      std::vector<LuminosityBlockID> const& defaultValue) const;
-  template<>
-  std::vector<LuminosityBlockID>
-  ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockID> >(char const* name) const;
+  template <>
+  std::vector<LuminosityBlockID> ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockID> >(
+      char const* name, std::vector<LuminosityBlockID> const& defaultValue) const;
+  template <>
+  std::vector<LuminosityBlockID> ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockID> >(
+      char const* name) const;
 
   // ----------------------------------------------------------------------
   // EventRange, VEventRange
 
-  template<>
-  EventRange
-  ParameterSet::getUntrackedParameter<EventRange>(char const* name, EventRange const& defaultValue) const;
+  template <>
+  EventRange ParameterSet::getUntrackedParameter<EventRange>(char const* name, EventRange const& defaultValue) const;
 
-  template<>
-  EventRange
-  ParameterSet::getUntrackedParameter<EventRange>(char const* name) const;
+  template <>
+  EventRange ParameterSet::getUntrackedParameter<EventRange>(char const* name) const;
 
-  template<>
-  std::vector<EventRange>
-  ParameterSet::getUntrackedParameter<std::vector<EventRange> >(char const* name,
-                                      std::vector<EventRange> const& defaultValue) const;
-  template<>
-  std::vector<EventRange>
-  ParameterSet::getUntrackedParameter<std::vector<EventRange> >(char const* name) const;
+  template <>
+  std::vector<EventRange> ParameterSet::getUntrackedParameter<std::vector<EventRange> >(
+      char const* name, std::vector<EventRange> const& defaultValue) const;
+  template <>
+  std::vector<EventRange> ParameterSet::getUntrackedParameter<std::vector<EventRange> >(char const* name) const;
 
   // ----------------------------------------------------------------------
   // LuminosityBlockRange, VLuminosityBlockRange
 
-  template<>
-  LuminosityBlockRange
-  ParameterSet::getUntrackedParameter<LuminosityBlockRange>(char const* name, LuminosityBlockRange const& defaultValue) const;
+  template <>
+  LuminosityBlockRange ParameterSet::getUntrackedParameter<LuminosityBlockRange>(
+      char const* name, LuminosityBlockRange const& defaultValue) const;
 
-  template<>
-  LuminosityBlockRange
-  ParameterSet::getUntrackedParameter<LuminosityBlockRange>(char const* name) const;
+  template <>
+  LuminosityBlockRange ParameterSet::getUntrackedParameter<LuminosityBlockRange>(char const* name) const;
 
-  template<>
-  std::vector<LuminosityBlockRange>
-  ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockRange> >(char const* name,
-                                      std::vector<LuminosityBlockRange> const& defaultValue) const;
-  template<>
-  std::vector<LuminosityBlockRange>
-  ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockRange> >(char const* name) const;
+  template <>
+  std::vector<LuminosityBlockRange> ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockRange> >(
+      char const* name, std::vector<LuminosityBlockRange> const& defaultValue) const;
+  template <>
+  std::vector<LuminosityBlockRange> ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockRange> >(
+      char const* name) const;
 
   // ----------------------------------------------------------------------
   // PSet, vPSet
 
-  template<>
-  ParameterSet
-  ParameterSet::getUntrackedParameter<ParameterSet>(char const* name, ParameterSet const& defaultValue) const;
+  template <>
+  ParameterSet ParameterSet::getUntrackedParameter<ParameterSet>(char const* name,
+                                                                 ParameterSet const& defaultValue) const;
 
-  template<>
-  ParameterSet
-  ParameterSet::getUntrackedParameter<ParameterSet>(std::string const& name, ParameterSet const& defaultValue) const;
+  template <>
+  ParameterSet ParameterSet::getUntrackedParameter<ParameterSet>(std::string const& name,
+                                                                 ParameterSet const& defaultValue) const;
 
-  template<>
-  ParameterSet
-  ParameterSet::getUntrackedParameter<ParameterSet>(char const* name) const;
+  template <>
+  ParameterSet ParameterSet::getUntrackedParameter<ParameterSet>(char const* name) const;
 
-  template<>
-  ParameterSet
-  ParameterSet::getUntrackedParameter<ParameterSet>(std::string const& name) const;
+  template <>
+  ParameterSet ParameterSet::getUntrackedParameter<ParameterSet>(std::string const& name) const;
 
-  template<>
-  VParameterSet
-  ParameterSet::getUntrackedParameter<VParameterSet>(char const* name, VParameterSet const& defaultValue) const;
+  template <>
+  VParameterSet ParameterSet::getUntrackedParameter<VParameterSet>(char const* name,
+                                                                   VParameterSet const& defaultValue) const;
 
-  template<>
-  VParameterSet
-  ParameterSet::getUntrackedParameter<VParameterSet>(char const* name) const;
+  template <>
+  VParameterSet ParameterSet::getUntrackedParameter<VParameterSet>(char const* name) const;
 
-  template<>
-  VParameterSet
-  ParameterSet::getUntrackedParameter<VParameterSet>(std::string const& name, VParameterSet const& defaultValue) const;
+  template <>
+  VParameterSet ParameterSet::getUntrackedParameter<VParameterSet>(std::string const& name,
+                                                                   VParameterSet const& defaultValue) const;
 
-  template<>
-  VParameterSet
-  ParameterSet::getUntrackedParameter<VParameterSet>(std::string const& name) const;
+  template <>
+  VParameterSet ParameterSet::getUntrackedParameter<VParameterSet>(std::string const& name) const;
 
-  template<>
-  std::vector<std::string>
-  ParameterSet::getParameterNamesForType<ParameterSet>(bool trackiness) const;
+  template <>
+  std::vector<std::string> ParameterSet::getParameterNamesForType<ParameterSet>(bool trackiness) const;
 
-  template<>
-  std::vector<std::string>
-  ParameterSet::getParameterNamesForType<VParameterSet>(bool trackiness) const;
+  template <>
+  std::vector<std::string> ParameterSet::getParameterNamesForType<VParameterSet>(bool trackiness) const;
 
-  ParameterSet::Bool
-  operator&&(ParameterSet::Bool a, ParameterSet::Bool b);
+  ParameterSet::Bool operator&&(ParameterSet::Bool a, ParameterSet::Bool b);
 
 }  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/ParameterSetConverter.h b/FWCore/ParameterSet/interface/ParameterSetConverter.h
index e8c208cd7d2f8..1d0bd99186c47 100644
--- a/FWCore/ParameterSet/interface/ParameterSetConverter.h
+++ b/FWCore/ParameterSet/interface/ParameterSetConverter.h
@@ -44,9 +44,12 @@ namespace edm {
     typedef std::map<std::string, std::string> StringMap;
     typedef std::list<std::pair<std::string, ParameterSetID> > StringWithIDList;
     typedef std::map<ParameterSetID, ParameterSetID> ParameterSetIdConverter;
-    ParameterSetConverter(ParameterSetMap const& psetMap, ParameterSetIdConverter& idConverter, bool alreadyByReference);
+    ParameterSetConverter(ParameterSetMap const& psetMap,
+                          ParameterSetIdConverter& idConverter,
+                          bool alreadyByReference);
     ~ParameterSetConverter();
-    ParameterSetIdConverter const& parameterSetIdConverter() const {return parameterSetIdConverter_;}
+    ParameterSetIdConverter const& parameterSetIdConverter() const { return parameterSetIdConverter_; }
+
   private:
     void convertParameterSets();
     void noConvertParameterSets();
@@ -56,5 +59,5 @@ namespace edm {
     StringMap replace_;
     ParameterSetIdConverter& parameterSetIdConverter_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/ParameterSetDescription.h b/FWCore/ParameterSet/interface/ParameterSetDescription.h
index 43ee6782ccb8d..a9f5386293172 100644
--- a/FWCore/ParameterSet/interface/ParameterSetDescription.h
+++ b/FWCore/ParameterSet/interface/ParameterSetDescription.h
@@ -4,7 +4,7 @@
 //
 // Package:     ParameterSet
 // Class  :     ParameterSetDescription
-// 
+//
 /**\class ParameterSetDescription ParameterSetDescription.h FWCore/ParameterSet/interface/ParameterSetDescription.h
 
  Description: Used to describe the allowed values in a ParameterSet
@@ -43,8 +43,10 @@ namespace edm {
   class ParameterDescriptionBase;
   class ParameterWildcardBase;
   class ParameterDescriptionNode;
-  template <typename T> class ParameterDescription;
-  template <typename T> class ParameterDescriptionCases;
+  template <typename T>
+  class ParameterDescription;
+  template <typename T>
+  class ParameterDescriptionCases;
   class DocFormatHelper;
 
   class ParameterSetDescription {
@@ -56,7 +58,11 @@ namespace edm {
       edm::value_ptr<ParameterDescriptionNode> const& node() const { return node_; }
       void setOptional(bool value) { optional_ = value; }
       void setWriteToCfi(bool value) { writeToCfi_ = value; }
-      ParameterDescriptionNode* setNode(std::unique_ptr<ParameterDescriptionNode> node) { node_ = std::move(node); return node_.operator->(); }
+      ParameterDescriptionNode* setNode(std::unique_ptr<ParameterDescriptionNode> node) {
+        node_ = std::move(node);
+        return node_.operator->();
+      }
+
     private:
       bool optional_;
       bool writeToCfi_;
@@ -70,12 +76,12 @@ namespace edm {
     virtual ~ParameterSetDescription();
 
     std::string const& comment() const { return comment_; }
-    void setComment(std::string const & value);
+    void setComment(std::string const& value);
     void setComment(char const* value);
 
     ///allow any parameter label/value pairs
     void setAllowAnything();
-      
+
     // This is set only for parameterizables which have not set their descriptions.
     // This should only be called to allow backwards compatibility.
     void setUnknown();
@@ -85,46 +91,46 @@ namespace edm {
     // ParameterSetDescription instead of a ParameterSet.  And do not
     // use these next 8 functions for parameters of type vector<ParameterSet>
 
-    template<typename T, typename U>
-    ParameterDescriptionBase * add(U const& iLabel, T const& value) {
+    template <typename T, typename U>
+    ParameterDescriptionBase* add(U const& iLabel, T const& value) {
       return add<T, U>(iLabel, value, true, false, true);
     }
 
-    template<typename T, typename U>
-    ParameterDescriptionBase * addUntracked(U const& iLabel, T const& value) {
+    template <typename T, typename U>
+    ParameterDescriptionBase* addUntracked(U const& iLabel, T const& value) {
       return add<T, U>(iLabel, value, false, false, true);
     }
 
-    template<typename T, typename U>
-    ParameterDescriptionBase * addOptional(U const& iLabel, T const& value) {
+    template <typename T, typename U>
+    ParameterDescriptionBase* addOptional(U const& iLabel, T const& value) {
       return add<T, U>(iLabel, value, true, true, true);
     }
 
-    template<typename T, typename U>
-    ParameterDescriptionBase * addOptionalUntracked(U const& iLabel, T const& value) {
+    template <typename T, typename U>
+    ParameterDescriptionBase* addOptionalUntracked(U const& iLabel, T const& value) {
       return add<T, U>(iLabel, value, false, true, true);
     }
 
     // For the next 4 functions, there is no default so they will not get injected
     // during validation if missing and they will not get written into cfi files.
 
-    template<typename T, typename U>
-    ParameterDescriptionBase * add(U const& iLabel) {
+    template <typename T, typename U>
+    ParameterDescriptionBase* add(U const& iLabel) {
       return add<T, U>(iLabel, true, false, false);
     }
 
-    template<typename T, typename U>
-    ParameterDescriptionBase * addUntracked(U const& iLabel) {
+    template <typename T, typename U>
+    ParameterDescriptionBase* addUntracked(U const& iLabel) {
       return add<T, U>(iLabel, false, false, false);
     }
 
-    template<typename T, typename U>
-    ParameterDescriptionBase * addOptional(U const& iLabel) {
+    template <typename T, typename U>
+    ParameterDescriptionBase* addOptional(U const& iLabel) {
       return add<T, U>(iLabel, true, true, false);
     }
 
-    template<typename T, typename U>
-    ParameterDescriptionBase * addOptionalUntracked(U const& iLabel) {
+    template <typename T, typename U>
+    ParameterDescriptionBase* addOptionalUntracked(U const& iLabel) {
       return add<T, U>(iLabel, false, true, false);
     }
 
@@ -139,67 +145,63 @@ namespace edm {
     // in the description will be inserted during validation.  These defaults
     // are also used when writing cfi files.
 
-    template<typename U>
-    ParameterDescriptionBase * addVPSet(U const& iLabel,
-                                        ParameterSetDescription const& validator,
-                                        std::vector<ParameterSet> const& defaults) {
+    template <typename U>
+    ParameterDescriptionBase* addVPSet(U const& iLabel,
+                                       ParameterSetDescription const& validator,
+                                       std::vector<ParameterSet> const& defaults) {
       return addVPSet<U>(iLabel, validator, defaults, true, false, true);
     }
 
-    template<typename U>
-    ParameterDescriptionBase * addVPSetUntracked(U const& iLabel,
-                                        ParameterSetDescription const& validator,
-                                        std::vector<ParameterSet> const& defaults) {
+    template <typename U>
+    ParameterDescriptionBase* addVPSetUntracked(U const& iLabel,
+                                                ParameterSetDescription const& validator,
+                                                std::vector<ParameterSet> const& defaults) {
       return addVPSet<U>(iLabel, validator, defaults, false, false, true);
     }
 
-    template<typename U>
-    ParameterDescriptionBase * addVPSetOptional(U const& iLabel,
-                                        ParameterSetDescription const& validator,
-                                        std::vector<ParameterSet> const& defaults) {
+    template <typename U>
+    ParameterDescriptionBase* addVPSetOptional(U const& iLabel,
+                                               ParameterSetDescription const& validator,
+                                               std::vector<ParameterSet> const& defaults) {
       return addVPSet<U>(iLabel, validator, defaults, true, true, true);
     }
 
-    template<typename U>
-    ParameterDescriptionBase * addVPSetOptionalUntracked(U const& iLabel,
-                                        ParameterSetDescription const& validator,
-                                        std::vector<ParameterSet> const& defaults) {
+    template <typename U>
+    ParameterDescriptionBase* addVPSetOptionalUntracked(U const& iLabel,
+                                                        ParameterSetDescription const& validator,
+                                                        std::vector<ParameterSet> const& defaults) {
       return addVPSet<U>(iLabel, validator, defaults, false, true, true);
     }
 
-    template<typename U>
-    ParameterDescriptionBase * addVPSet(U const& iLabel,
-                                        ParameterSetDescription const& validator) {
+    template <typename U>
+    ParameterDescriptionBase* addVPSet(U const& iLabel, ParameterSetDescription const& validator) {
       return addVPSet<U>(iLabel, validator, true, false, false);
     }
 
-    template<typename U>
-    ParameterDescriptionBase * addVPSetUntracked(U const& iLabel,
-                                        ParameterSetDescription const& validator) {
+    template <typename U>
+    ParameterDescriptionBase* addVPSetUntracked(U const& iLabel, ParameterSetDescription const& validator) {
       return addVPSet<U>(iLabel, validator, false, false, false);
     }
 
-    template<typename U>
-    ParameterDescriptionBase * addVPSetOptional(U const& iLabel,
-                                        ParameterSetDescription const& validator) {
+    template <typename U>
+    ParameterDescriptionBase* addVPSetOptional(U const& iLabel, ParameterSetDescription const& validator) {
       return addVPSet<U>(iLabel, validator, true, true, false);
     }
 
-    template<typename U>
-    ParameterDescriptionBase * addVPSetOptionalUntracked(U const& iLabel,
-                                        ParameterSetDescription const& validator) {
+    template <typename U>
+    ParameterDescriptionBase* addVPSetOptionalUntracked(U const& iLabel, ParameterSetDescription const& validator) {
       return addVPSet<U>(iLabel, validator, false, true, false);
     }
 
     // ********* Wildcards *********
 
-    template<typename T, typename U>
-    ParameterWildcardBase * addWildcard(U const& pattern) {
+    template <typename T, typename U>
+    ParameterWildcardBase* addWildcard(U const& pattern) {
       return addWildcard<T, U>(pattern, true);
     }
 
-    template<typename T, typename U>
-    ParameterWildcardBase * addWildcardUntracked(U const& pattern) {
+    template <typename T, typename U>
+    ParameterWildcardBase* addWildcardUntracked(U const& pattern) {
       return addWildcard<T, U>(pattern, false);
     }
 
@@ -215,57 +217,48 @@ namespace edm {
     // T holds the value of the switch variable.
     // If you try using any other type, then it will not compile.
     template <typename T>
-    ParameterDescriptionNode*
-    ifValue(ParameterDescription<T> const& switchParameter,
-            std::unique_ptr<ParameterDescriptionCases<T> > cases) {
+    ParameterDescriptionNode* ifValue(ParameterDescription<T> const& switchParameter,
+                                      std::unique_ptr<ParameterDescriptionCases<T>> cases) {
       return ifValue<T>(switchParameter, std::move(cases), false, true);
     }
 
     template <typename T>
-    ParameterDescriptionNode*
-    ifValueOptional(ParameterDescription<T> const& switchParameter,
-                    std::unique_ptr<ParameterDescriptionCases<T> > cases,
-                    bool writeToCfi) {
+    ParameterDescriptionNode* ifValueOptional(ParameterDescription<T> const& switchParameter,
+                                              std::unique_ptr<ParameterDescriptionCases<T>> cases,
+                                              bool writeToCfi) {
       return ifValue<T>(switchParameter, std::move(cases), true, writeToCfi);
     }
 
     // ********* if exists ************
-    ParameterDescriptionNode*
-    ifExists(ParameterDescriptionNode const& node1,
-	     ParameterDescriptionNode const& node2) {
+    ParameterDescriptionNode* ifExists(ParameterDescriptionNode const& node1, ParameterDescriptionNode const& node2) {
       return ifExists(node1, node2, false, true);
     }
 
-    ParameterDescriptionNode*
-    ifExistsOptional(ParameterDescriptionNode const& node1,
-		          ParameterDescriptionNode const& node2,
-                          bool writeToCfi) {
+    ParameterDescriptionNode* ifExistsOptional(ParameterDescriptionNode const& node1,
+                                               ParameterDescriptionNode const& node2,
+                                               bool writeToCfi) {
       return ifExists(node1, node2, true, writeToCfi);
     }
 
     // ********* for parameters that are a list of allowed labels *********
-    template<typename T, typename U>
-    ParameterDescriptionNode*
-    labelsFrom(U const& iLabel) {
-      return labelsFrom<T,U>(iLabel, true, false, true);
+    template <typename T, typename U>
+    ParameterDescriptionNode* labelsFrom(U const& iLabel) {
+      return labelsFrom<T, U>(iLabel, true, false, true);
     }
 
-    template<typename T, typename U>
-    ParameterDescriptionNode*
-    labelsFromUntracked(U const& iLabel) {
-      return labelsFrom<T,U>(iLabel, false, false, true);
+    template <typename T, typename U>
+    ParameterDescriptionNode* labelsFromUntracked(U const& iLabel) {
+      return labelsFrom<T, U>(iLabel, false, false, true);
     }
 
-    template<typename T, typename U>
-    ParameterDescriptionNode*
-    labelsFromOptional(U const& iLabel, bool writeToCfi) {
-      return labelsFrom<T,U>(iLabel, true, true, writeToCfi);
+    template <typename T, typename U>
+    ParameterDescriptionNode* labelsFromOptional(U const& iLabel, bool writeToCfi) {
+      return labelsFrom<T, U>(iLabel, true, true, writeToCfi);
     }
 
-    template<typename T, typename U>
-    ParameterDescriptionNode*
-    labelsFromOptionalUntracked(U const& iLabel, bool writeToCfi) {
-      return labelsFrom<T,U>(iLabel, false, true, writeToCfi);
+    template <typename T, typename U>
+    ParameterDescriptionNode* labelsFromOptionalUntracked(U const& iLabel, bool writeToCfi) {
+      return labelsFrom<T, U>(iLabel, false, true, writeToCfi);
     }
 
     // These next four functions only work when the template
@@ -276,121 +269,100 @@ namespace edm {
     // In either case U can be either a string or char*
     // Note the U and V can be determined from the arguments, but
     // T must be explicitly specified by the calling function.
-    template<typename T, typename U, typename V>
-    ParameterDescriptionNode*
-    labelsFrom(U const& iLabel, V const& desc) {
-      return labelsFrom<T,U,V>(iLabel, true, false, true, desc);
+    template <typename T, typename U, typename V>
+    ParameterDescriptionNode* labelsFrom(U const& iLabel, V const& desc) {
+      return labelsFrom<T, U, V>(iLabel, true, false, true, desc);
     }
 
-    template<typename T, typename U, typename V>
-    ParameterDescriptionNode*
-    labelsFromUntracked(U const& iLabel, V const& desc) {
-      return labelsFrom<T,U,V>(iLabel, false, false, true, desc);
+    template <typename T, typename U, typename V>
+    ParameterDescriptionNode* labelsFromUntracked(U const& iLabel, V const& desc) {
+      return labelsFrom<T, U, V>(iLabel, false, false, true, desc);
     }
 
-    template<typename T, typename U, typename V>
-    ParameterDescriptionNode*
-    labelsFromOptional(U const& iLabel, bool writeToCfi, V const& desc) {
-      return labelsFrom<T,U,V>(iLabel, true, true, writeToCfi, desc);
+    template <typename T, typename U, typename V>
+    ParameterDescriptionNode* labelsFromOptional(U const& iLabel, bool writeToCfi, V const& desc) {
+      return labelsFrom<T, U, V>(iLabel, true, true, writeToCfi, desc);
     }
 
-    template<typename T, typename U, typename V>
-    ParameterDescriptionNode*
-    labelsFromOptionalUntracked(U const& iLabel, bool writeToCfi, V const& desc) {
-      return labelsFrom<T,U,V>(iLabel, false, true, writeToCfi, desc);
+    template <typename T, typename U, typename V>
+    ParameterDescriptionNode* labelsFromOptionalUntracked(U const& iLabel, bool writeToCfi, V const& desc) {
+      return labelsFrom<T, U, V>(iLabel, false, true, writeToCfi, desc);
     }
 
     bool anythingAllowed() const { return anythingAllowed_; }
     bool isUnknown() const { return unknown_; }
 
-    const_iterator begin() const {
-      return entries_.begin();
-    }
+    const_iterator begin() const { return entries_.begin(); }
 
-    const_iterator end() const {
-      return entries_.end();
-    }
+    const_iterator end() const { return entries_.end(); }
 
     // Better performance if space is reserved for the number of
     // top level parameters before any are added.
-    void reserve(SetDescriptionEntries::size_type n) {
-      entries_.reserve(n);
-    }
+    void reserve(SetDescriptionEntries::size_type n) { entries_.reserve(n); }
 
-    void validate(ParameterSet & pset) const;
+    void validate(ParameterSet& pset) const;
 
-    void writeCfi(std::ostream & os, bool startWithComma, int indentation) const; 
+    void writeCfi(std::ostream& os, bool startWithComma, int indentation) const;
 
-    void print(std::ostream & os, DocFormatHelper & dfh) const; 
+    void print(std::ostream& os, DocFormatHelper& dfh) const;
 
     bool isLabelUnused(std::string const& label) const;
 
   private:
+    template <typename T, typename U>
+    ParameterDescriptionBase* add(U const& iLabel, T const& value, bool isTracked, bool isOptional, bool writeToCfi);
 
-    template<typename T, typename U>
-    ParameterDescriptionBase * add(U const& iLabel, T const& value,
-                                   bool isTracked, bool isOptional, bool writeToCfi);
-
-    template<typename T, typename U>
-    ParameterDescriptionBase * add(U const& iLabel,
-                                   bool isTracked, bool isOptional, bool writeToCfi);
+    template <typename T, typename U>
+    ParameterDescriptionBase* add(U const& iLabel, bool isTracked, bool isOptional, bool writeToCfi);
 
-    template<typename U>
-    ParameterDescriptionBase * addVPSet(U const& iLabel,
-					ParameterSetDescription const& validator,
-                                        std::vector<ParameterSet> const& defaults,
-                                        bool isTracked, bool isOptional, bool writeToCfi);
+    template <typename U>
+    ParameterDescriptionBase* addVPSet(U const& iLabel,
+                                       ParameterSetDescription const& validator,
+                                       std::vector<ParameterSet> const& defaults,
+                                       bool isTracked,
+                                       bool isOptional,
+                                       bool writeToCfi);
 
-    template<typename U>
-    ParameterDescriptionBase * addVPSet(U const& iLabel,
-					ParameterSetDescription const& validator,
-                                        bool isTracked, bool isOptional, bool writeToCfi);
+    template <typename U>
+    ParameterDescriptionBase* addVPSet(
+        U const& iLabel, ParameterSetDescription const& validator, bool isTracked, bool isOptional, bool writeToCfi);
 
-    template<typename T, typename U>
-    ParameterWildcardBase * addWildcard(U const& pattern, bool isTracked);
+    template <typename T, typename U>
+    ParameterWildcardBase* addWildcard(U const& pattern, bool isTracked);
 
     ParameterDescriptionNode* addNode(std::unique_ptr<ParameterDescriptionNode> node, bool optional, bool writeToCfi);
 
     template <typename T>
-    ParameterDescriptionNode*
-    ifValue(ParameterDescription<T> const& switchParameter,
-            std::unique_ptr<ParameterDescriptionCases<T> > cases,
-            bool optional, bool writeToCfi);
-
-    ParameterDescriptionNode*
-    ifExists(ParameterDescriptionNode const& node1,
-             ParameterDescriptionNode const& node2,
-             bool optional, bool writeToCfi);
-
-    template<typename T, typename U>
-    ParameterDescriptionNode*
-    labelsFrom(U const& iLabel, bool isTracked, bool optional, bool writeToCfi);
-
-    template<typename T, typename U, typename V>
-    ParameterDescriptionNode*
-    labelsFrom(U const& iLabel, bool isTracked, bool optional, bool writeToCfi, V const& desc);
-
-    static
-    void
-    validateNode(SetDescriptionEntry const& entry,
-                 ParameterSet & pset,
-                 std::set<std::string> & validatedNames);
-
-    static void 
-    throwIllegalParameters(std::vector<std::string> const& parameterNames,
-                           std::set<std::string> const& validatedNames);
-
-    static void
-    writeNode(SetDescriptionEntry const& entry,
-              std::ostream & os,
-              bool & startWithComma,
-              int indentation,
-              bool & wroteSomething);
-
-    static void
-    printNode(SetDescriptionEntry const& entry,
-              std::ostream & os,
-              DocFormatHelper & dfh);
+    ParameterDescriptionNode* ifValue(ParameterDescription<T> const& switchParameter,
+                                      std::unique_ptr<ParameterDescriptionCases<T>> cases,
+                                      bool optional,
+                                      bool writeToCfi);
+
+    ParameterDescriptionNode* ifExists(ParameterDescriptionNode const& node1,
+                                       ParameterDescriptionNode const& node2,
+                                       bool optional,
+                                       bool writeToCfi);
+
+    template <typename T, typename U>
+    ParameterDescriptionNode* labelsFrom(U const& iLabel, bool isTracked, bool optional, bool writeToCfi);
+
+    template <typename T, typename U, typename V>
+    ParameterDescriptionNode* labelsFrom(U const& iLabel, bool isTracked, bool optional, bool writeToCfi, V const& desc);
+
+    static void validateNode(SetDescriptionEntry const& entry,
+                             ParameterSet& pset,
+                             std::set<std::string>& validatedNames);
+
+    static void throwIllegalParameters(std::vector<std::string> const& parameterNames,
+                                       std::set<std::string> const& validatedNames);
+
+    static void writeNode(SetDescriptionEntry const& entry,
+                          std::ostream& os,
+                          bool& startWithComma,
+                          int indentation,
+                          bool& wroteSomething);
+
+    static void printNode(SetDescriptionEntry const& entry, std::ostream& os, DocFormatHelper& dfh);
 
     void throwIfLabelsAlreadyUsed(std::set<std::string> const& nodeLabels);
     void throwIfWildcardCollision(std::set<ParameterTypes> const& nodeParameterTypes,
@@ -402,11 +374,11 @@ namespace edm {
 
     std::set<std::string> usedLabels_;
     std::set<ParameterTypes> typesUsedForParameters_;
-    std::set<ParameterTypes> typesUsedForWildcards_;    
+    std::set<ParameterTypes> typesUsedForWildcards_;
 
     std::string comment_;
   };
-}
+}  // namespace edm
 
 #include "FWCore/ParameterSet/interface/ParameterWildcard.h"
 #include "FWCore/ParameterSet/interface/ParameterSwitch.h"
@@ -414,76 +386,81 @@ namespace edm {
 
 namespace edm {
 
-  template<typename T, typename U>
-  ParameterDescriptionBase*
-  ParameterSetDescription::add(U const& iLabel, T const& value, bool isTracked, bool isOptional, bool writeToCfi) {
-
-    std::unique_ptr<ParameterDescriptionNode> node = std::make_unique<ParameterDescription<T>>(iLabel, value, isTracked);
+  template <typename T, typename U>
+  ParameterDescriptionBase* ParameterSetDescription::add(
+      U const& iLabel, T const& value, bool isTracked, bool isOptional, bool writeToCfi) {
+    std::unique_ptr<ParameterDescriptionNode> node =
+        std::make_unique<ParameterDescription<T>>(iLabel, value, isTracked);
     ParameterDescriptionNode* pnode = addNode(std::move(node), isOptional, writeToCfi);
     return static_cast<ParameterDescriptionBase*>(pnode);
   }
 
-  template<typename T, typename U>
-  ParameterDescriptionBase*
-  ParameterSetDescription::add(U const& iLabel, bool isTracked, bool isOptional, bool writeToCfi) {
-
+  template <typename T, typename U>
+  ParameterDescriptionBase* ParameterSetDescription::add(U const& iLabel,
+                                                         bool isTracked,
+                                                         bool isOptional,
+                                                         bool writeToCfi) {
     std::unique_ptr<ParameterDescriptionNode> node = std::make_unique<ParameterDescription<T>>(iLabel, isTracked);
     ParameterDescriptionNode* pnode = addNode(std::move(node), isOptional, writeToCfi);
     return static_cast<ParameterDescriptionBase*>(pnode);
   }
 
-  template<typename U>
-  ParameterDescriptionBase *
-  ParameterSetDescription::addVPSet(U const& iLabel,
-                                    ParameterSetDescription const& validator,
-                                    std::vector<ParameterSet> const& defaults,
-                                    bool isTracked, bool isOptional, bool writeToCfi) {
-    std::unique_ptr<ParameterDescriptionNode> node = std::make_unique<ParameterDescription<std::vector<ParameterSet>>>(iLabel, validator, isTracked, defaults);
+  template <typename U>
+  ParameterDescriptionBase* ParameterSetDescription::addVPSet(U const& iLabel,
+                                                              ParameterSetDescription const& validator,
+                                                              std::vector<ParameterSet> const& defaults,
+                                                              bool isTracked,
+                                                              bool isOptional,
+                                                              bool writeToCfi) {
+    std::unique_ptr<ParameterDescriptionNode> node =
+        std::make_unique<ParameterDescription<std::vector<ParameterSet>>>(iLabel, validator, isTracked, defaults);
     ParameterDescriptionNode* pnode = addNode(std::move(node), isOptional, writeToCfi);
     return static_cast<ParameterDescriptionBase*>(pnode);
   }
 
-  template<typename U>
-  ParameterDescriptionBase *
-  ParameterSetDescription::addVPSet(U const& iLabel,
-                                    ParameterSetDescription const& validator,
-                                    bool isTracked, bool isOptional, bool writeToCfi) {
-    std::unique_ptr<ParameterDescriptionNode> node = std::make_unique<ParameterDescription<std::vector<ParameterSet>>>(iLabel, validator, isTracked);
+  template <typename U>
+  ParameterDescriptionBase* ParameterSetDescription::addVPSet(
+      U const& iLabel, ParameterSetDescription const& validator, bool isTracked, bool isOptional, bool writeToCfi) {
+    std::unique_ptr<ParameterDescriptionNode> node =
+        std::make_unique<ParameterDescription<std::vector<ParameterSet>>>(iLabel, validator, isTracked);
     ParameterDescriptionNode* pnode = addNode(std::move(node), isOptional, writeToCfi);
     return static_cast<ParameterDescriptionBase*>(pnode);
   }
 
-  template<typename T, typename U>
-  ParameterWildcardBase*
-  ParameterSetDescription::addWildcard(U const& pattern, bool isTracked) {
-    
-    std::unique_ptr<ParameterDescriptionNode> node = std::make_unique<ParameterWildcard<T>>(pattern, RequireZeroOrMore, isTracked);
+  template <typename T, typename U>
+  ParameterWildcardBase* ParameterSetDescription::addWildcard(U const& pattern, bool isTracked) {
+    std::unique_ptr<ParameterDescriptionNode> node =
+        std::make_unique<ParameterWildcard<T>>(pattern, RequireZeroOrMore, isTracked);
     ParameterDescriptionNode* pnode = addNode(std::move(node), true, false);
     return static_cast<ParameterWildcardBase*>(pnode);
   }
 
   template <typename T>
-  ParameterDescriptionNode*
-  ParameterSetDescription::ifValue(ParameterDescription<T> const& switchParameter,
-          std::unique_ptr<ParameterDescriptionCases<T> > cases,
-          bool optional, bool writeToCfi) {
-    std::unique_ptr<ParameterDescriptionNode> pdswitch = std::make_unique<ParameterSwitch<T>>(switchParameter, std::move(cases));
+  ParameterDescriptionNode* ParameterSetDescription::ifValue(ParameterDescription<T> const& switchParameter,
+                                                             std::unique_ptr<ParameterDescriptionCases<T>> cases,
+                                                             bool optional,
+                                                             bool writeToCfi) {
+    std::unique_ptr<ParameterDescriptionNode> pdswitch =
+        std::make_unique<ParameterSwitch<T>>(switchParameter, std::move(cases));
     return addNode(std::move(pdswitch), optional, writeToCfi);
   }
 
-  template<typename T, typename U>
-  ParameterDescriptionNode*
-  ParameterSetDescription::labelsFrom(U const& iLabel, bool isTracked, bool optional, bool writeToCfi) {
+  template <typename T, typename U>
+  ParameterDescriptionNode* ParameterSetDescription::labelsFrom(U const& iLabel,
+                                                                bool isTracked,
+                                                                bool optional,
+                                                                bool writeToCfi) {
     std::unique_ptr<ParameterDescriptionNode> pd = std::make_unique<AllowedLabelsDescription<T>>(iLabel, isTracked);
     return addNode(std::move(pd), optional, writeToCfi);
   }
 
-  template<typename T, typename U, typename V>
-  ParameterDescriptionNode*
-  ParameterSetDescription::labelsFrom(U const& iLabel, bool isTracked, bool optional, bool writeToCfi, V const& desc) {
-    std::unique_ptr<ParameterDescriptionNode> pd = std::make_unique<AllowedLabelsDescription<T>>(iLabel, desc, isTracked);
+  template <typename T, typename U, typename V>
+  ParameterDescriptionNode* ParameterSetDescription::labelsFrom(
+      U const& iLabel, bool isTracked, bool optional, bool writeToCfi, V const& desc) {
+    std::unique_ptr<ParameterDescriptionNode> pd =
+        std::make_unique<AllowedLabelsDescription<T>>(iLabel, desc, isTracked);
     return addNode(std::move(pd), optional, writeToCfi);
   }
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ParameterSet/interface/ParameterSetDescriptionFiller.h b/FWCore/ParameterSet/interface/ParameterSetDescriptionFiller.h
index 76473033486b8..199de1857833f 100644
--- a/FWCore/ParameterSet/interface/ParameterSetDescriptionFiller.h
+++ b/FWCore/ParameterSet/interface/ParameterSetDescriptionFiller.h
@@ -29,20 +29,17 @@ method of the templated argument.  This allows the ParameterSetDescriptionFiller
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 
 namespace edm {
-  template< typename T>
-  class ParameterSetDescriptionFiller : public ParameterSetDescriptionFillerBase
-  {
+  template <typename T>
+  class ParameterSetDescriptionFiller : public ParameterSetDescriptionFillerBase {
   public:
     ParameterSetDescriptionFiller() {}
 
-    void fill(ConfigurationDescriptions & descriptions) const override {
+    void fill(ConfigurationDescriptions& descriptions) const override {
       T::fillDescriptions(descriptions);
       T::prevalidate(descriptions);
     }
 
-    const std::string& baseType() const override {
-      return T::baseType();
-    }
+    const std::string& baseType() const override { return T::baseType(); }
 
     const std::string& extendedBaseType() const override {
       const T* type = nullptr;
@@ -50,9 +47,8 @@ namespace edm {
     }
 
   private:
-    ParameterSetDescriptionFiller(const ParameterSetDescriptionFiller&) = delete; // stop default
-    const ParameterSetDescriptionFiller& operator=(const ParameterSetDescriptionFiller&) = delete; // stop default
-    
+    ParameterSetDescriptionFiller(const ParameterSetDescriptionFiller&) = delete;                   // stop default
+    const ParameterSetDescriptionFiller& operator=(const ParameterSetDescriptionFiller&) = delete;  // stop default
   };
 
   // We need a special version of this class for Services because there is
@@ -65,159 +61,148 @@ namespace edm {
 
   namespace fillDetails {
 
-    using no_tag = std::false_type; // type indicating FALSE
-    using yes_tag = std::true_type; // type indicating TRUE
+    using no_tag = std::false_type;  // type indicating FALSE
+    using yes_tag = std::true_type;  // type indicating TRUE
 
-    template <typename T, void (*)(ConfigurationDescriptions &)>  struct fillDescriptions_function;
-    template <typename T> no_tag  has_fillDescriptions_helper(...);
-    template <typename T> yes_tag has_fillDescriptions_helper(fillDescriptions_function<T, &T::fillDescriptions> * dummy);
+    template <typename T, void (*)(ConfigurationDescriptions&)>
+    struct fillDescriptions_function;
+    template <typename T>
+    no_tag has_fillDescriptions_helper(...);
+    template <typename T>
+    yes_tag has_fillDescriptions_helper(fillDescriptions_function<T, &T::fillDescriptions>* dummy);
 
-    template<typename T>
+    template <typename T>
     struct has_fillDescriptions_function {
-      static constexpr bool value =
-      std::is_same<decltype(has_fillDescriptions_helper<T>(nullptr)),yes_tag>::value;
+      static constexpr bool value = std::is_same<decltype(has_fillDescriptions_helper<T>(nullptr)), yes_tag>::value;
     };
 
     template <typename T>
     struct DoFillDescriptions {
-      void operator()(ConfigurationDescriptions & descriptions) {
-        T::fillDescriptions(descriptions);
-      }
+      void operator()(ConfigurationDescriptions& descriptions) { T::fillDescriptions(descriptions); }
     };
 
     template <typename T>
     struct DoFillAsUnknown {
-      void operator()(ConfigurationDescriptions & descriptions) {
+      void operator()(ConfigurationDescriptions& descriptions) {
         ParameterSetDescription desc;
         desc.setUnknown();
         descriptions.addDefault(desc);
       }
     };
 
-    template <typename T, void (*)(ConfigurationDescriptions &)>  struct prevalidate_function;
-    template <typename T> no_tag  has_prevalidate_helper(...);
-    template <typename T> yes_tag has_prevalidate_helper(fillDescriptions_function<T, &T::prevalidate> * dummy);
+    template <typename T, void (*)(ConfigurationDescriptions&)>
+    struct prevalidate_function;
+    template <typename T>
+    no_tag has_prevalidate_helper(...);
+    template <typename T>
+    yes_tag has_prevalidate_helper(fillDescriptions_function<T, &T::prevalidate>* dummy);
 
-    template<typename T>
+    template <typename T>
     struct has_prevalidate_function {
-      static constexpr bool value =
-      std::is_same<decltype(has_prevalidate_helper<T>(nullptr)),yes_tag>::value;
+      static constexpr bool value = std::is_same<decltype(has_prevalidate_helper<T>(nullptr)), yes_tag>::value;
     };
 
     template <typename T>
     struct DoPrevalidate {
-      void operator()(ConfigurationDescriptions & descriptions) {
-        T::prevalidate(descriptions);
-      }
+      void operator()(ConfigurationDescriptions& descriptions) { T::prevalidate(descriptions); }
     };
 
     template <typename T>
     struct DoNothing {
-      void operator()(ConfigurationDescriptions & descriptions) {
-      }
+      void operator()(ConfigurationDescriptions& descriptions) {}
     };
 
-  }
+  }  // namespace fillDetails
 
   // Not needed at the moment
   //void prevalidateService(ConfigurationDescriptions &);
 
-  template< typename T>
-  class DescriptionFillerForServices : public ParameterSetDescriptionFillerBase
-  {
+  template <typename T>
+  class DescriptionFillerForServices : public ParameterSetDescriptionFillerBase {
   public:
     DescriptionFillerForServices() {}
 
     // If T has a fillDescriptions function then just call that, otherwise
     // put in an "unknown description" as a default.
-    void fill(ConfigurationDescriptions & descriptions) const override {
+    void fill(ConfigurationDescriptions& descriptions) const override {
       std::conditional_t<edm::fillDetails::has_fillDescriptions_function<T>::value,
                          edm::fillDetails::DoFillDescriptions<T>,
-                         edm::fillDetails::DoFillAsUnknown<T>> fill_descriptions;
+                         edm::fillDetails::DoFillAsUnknown<T>>
+          fill_descriptions;
       fill_descriptions(descriptions);
       //we don't have a need for prevalidation of services at the moment, so this is a placeholder
       // Probably the best package to declare this in would be FWCore/ServiceRegistry
       //prevalidateService(descriptions);
     }
 
-    const std::string& baseType() const override {
-      return kBaseForService;
-    }
+    const std::string& baseType() const override { return kBaseForService; }
 
-    const std::string& extendedBaseType() const override {
-      return kEmpty;
-    }
+    const std::string& extendedBaseType() const override { return kEmpty; }
 
   private:
-    void prevalidate(ConfigurationDescriptions & descriptions);
-    DescriptionFillerForServices(const DescriptionFillerForServices&); // stop default
-    const DescriptionFillerForServices& operator=(const DescriptionFillerForServices&); // stop default
+    void prevalidate(ConfigurationDescriptions& descriptions);
+    DescriptionFillerForServices(const DescriptionFillerForServices&);                   // stop default
+    const DescriptionFillerForServices& operator=(const DescriptionFillerForServices&);  // stop default
   };
 
-  template<typename T>
-  class DescriptionFillerForESSources : public ParameterSetDescriptionFillerBase
-  {
+  template <typename T>
+  class DescriptionFillerForESSources : public ParameterSetDescriptionFillerBase {
   public:
     DescriptionFillerForESSources() {}
 
     // If T has a fillDescriptions function then just call that, otherwise
     // put in an "unknown description" as a default.
-    void fill(ConfigurationDescriptions & descriptions) const override {
+    void fill(ConfigurationDescriptions& descriptions) const override {
       std::conditional_t<edm::fillDetails::has_fillDescriptions_function<T>::value,
                          edm::fillDetails::DoFillDescriptions<T>,
-                         edm::fillDetails::DoFillAsUnknown<T>> fill_descriptions;
+                         edm::fillDetails::DoFillAsUnknown<T>>
+          fill_descriptions;
       fill_descriptions(descriptions);
 
       std::conditional_t<edm::fillDetails::has_prevalidate_function<T>::value,
                          edm::fillDetails::DoPrevalidate<T>,
-                         edm::fillDetails::DoNothing<T>> prevalidate;
+                         edm::fillDetails::DoNothing<T>>
+          prevalidate;
       prevalidate(descriptions);
     }
 
-    const std::string& baseType() const override {
-      return kBaseForESSource;
-    }
+    const std::string& baseType() const override { return kBaseForESSource; }
 
-    const std::string& extendedBaseType() const override {
-      return kEmpty;
-    }
+    const std::string& extendedBaseType() const override { return kEmpty; }
 
   private:
-    DescriptionFillerForESSources(const DescriptionFillerForESSources&) = delete; // stop default
-    const DescriptionFillerForESSources& operator=(const DescriptionFillerForESSources&) = delete; // stop default
+    DescriptionFillerForESSources(const DescriptionFillerForESSources&) = delete;                   // stop default
+    const DescriptionFillerForESSources& operator=(const DescriptionFillerForESSources&) = delete;  // stop default
   };
 
-  template<typename T>
-  class DescriptionFillerForESProducers : public ParameterSetDescriptionFillerBase
-  {
+  template <typename T>
+  class DescriptionFillerForESProducers : public ParameterSetDescriptionFillerBase {
   public:
     DescriptionFillerForESProducers() {}
 
     // If T has a fillDescriptions function then just call that, otherwise
     // put in an "unknown description" as a default.
-    void fill(ConfigurationDescriptions & descriptions) const override {
+    void fill(ConfigurationDescriptions& descriptions) const override {
       std::conditional_t<edm::fillDetails::has_fillDescriptions_function<T>::value,
                          edm::fillDetails::DoFillDescriptions<T>,
-                         edm::fillDetails::DoFillAsUnknown<T>> fill_descriptions;
+                         edm::fillDetails::DoFillAsUnknown<T>>
+          fill_descriptions;
       fill_descriptions(descriptions);
 
       std::conditional_t<edm::fillDetails::has_prevalidate_function<T>::value,
                          edm::fillDetails::DoPrevalidate<T>,
-                         edm::fillDetails::DoNothing<T>> prevalidate;
+                         edm::fillDetails::DoNothing<T>>
+          prevalidate;
       prevalidate(descriptions);
     }
 
-    const std::string& baseType() const override {
-      return kBaseForESProducer;
-    }
+    const std::string& baseType() const override { return kBaseForESProducer; }
 
-    const std::string& extendedBaseType() const override {
-      return kEmpty;
-    }
+    const std::string& extendedBaseType() const override { return kEmpty; }
 
   private:
-    DescriptionFillerForESProducers(const DescriptionFillerForESProducers&) = delete; // stop default
-    const DescriptionFillerForESProducers& operator=(const DescriptionFillerForESProducers&) = delete; // stop default
+    DescriptionFillerForESProducers(const DescriptionFillerForESProducers&) = delete;                   // stop default
+    const DescriptionFillerForESProducers& operator=(const DescriptionFillerForESProducers&) = delete;  // stop default
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/ParameterSetDescriptionFillerBase.h b/FWCore/ParameterSet/interface/ParameterSetDescriptionFillerBase.h
index d28da24a5c34e..e3b70441f1d03 100644
--- a/FWCore/ParameterSet/interface/ParameterSetDescriptionFillerBase.h
+++ b/FWCore/ParameterSet/interface/ParameterSetDescriptionFillerBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     ParameterSet
 // Class  :     ParameterSetDescriptionFillerBase
-// 
+//
 /**\class ParameterSetDescriptionFillerBase ParameterSetDescriptionFillerBase.h FWCore/ParameterSet/interface/ParameterSetDescriptionFillerBase.h
 
  Description: Base class for a component which can fill a ParameterSetDescription object
@@ -30,148 +30,122 @@ and query the component for its allowed ParameterSetDescription.
 #include <string>
 
 namespace edm {
-   class EDProducer;
-   class EDFilter;
-   class EDAnalyzer;
-   class OutputModule;
-
-   namespace one {
-      class EDProducerBase;
-      class EDFilterBase;
-      class EDAnalyzerBase;
-      class OutputModuleBase;
-   }
-
-   namespace stream {
+  class EDProducer;
+  class EDFilter;
+  class EDAnalyzer;
+  class OutputModule;
+
+  namespace one {
+    class EDProducerBase;
+    class EDFilterBase;
+    class EDAnalyzerBase;
+    class OutputModuleBase;
+  }  // namespace one
+
+  namespace stream {
+    class EDProducerBase;
+    class EDFilterBase;
+    class EDAnalyzerBase;
+  }  // namespace stream
+
+  namespace global {
     class EDProducerBase;
     class EDFilterBase;
     class EDAnalyzerBase;
-   }
+    class OutputModuleBase;
+  }  // namespace global
 
-   namespace global {
+  namespace limited {
     class EDProducerBase;
     class EDFilterBase;
     class EDAnalyzerBase;
     class OutputModuleBase;
-   }
-
-   namespace limited {
-      class EDProducerBase;
-      class EDFilterBase;
-      class EDAnalyzerBase;
-      class OutputModuleBase;
-   }
-
-class ParameterSetDescriptionFillerBase
-{
-
-   public:
-      ParameterSetDescriptionFillerBase() {}
-      virtual ~ParameterSetDescriptionFillerBase();
-
-      // ---------- const member functions ---------------------
-      virtual void fill(ConfigurationDescriptions & descriptions) const = 0;
-      virtual const std::string& baseType() const = 0;
-      virtual const std::string& extendedBaseType() const = 0;
-  
-      // ---------- static member functions --------------------
-
-      // ---------- member functions ---------------------------
-
-   protected:
-      static const std::string kEmpty;
-      static const std::string kBaseForService;
-      static const std::string kBaseForESSource;
-      static const std::string kBaseForESProducer;
-      static const std::string kExtendedBaseForEDAnalyzer;
-      static const std::string kExtendedBaseForEDProducer;
-      static const std::string kExtendedBaseForEDFilter;
-      static const std::string kExtendedBaseForOutputModule;
-      static const std::string kExtendedBaseForOneEDAnalyzer;
-      static const std::string kExtendedBaseForOneEDProducer;
-      static const std::string kExtendedBaseForOneEDFilter;
-      static const std::string kExtendedBaseForOneOutputModule;
-      static const std::string kExtendedBaseForStreamEDAnalyzer;
-      static const std::string kExtendedBaseForStreamEDProducer;
-      static const std::string kExtendedBaseForStreamEDFilter;
-      static const std::string kExtendedBaseForGlobalEDAnalyzer;
-      static const std::string kExtendedBaseForGlobalEDProducer;
-      static const std::string kExtendedBaseForGlobalEDFilter;
-      static const std::string kExtendedBaseForGlobalOutputModule;
-      static const std::string kExtendedBaseForLimitedEDAnalyzer;
-      static const std::string kExtendedBaseForLimitedEDProducer;
-      static const std::string kExtendedBaseForLimitedEDFilter;
-      static const std::string kExtendedBaseForLimitedOutputModule;
-
-      static const std::string& extendedBaseType(EDAnalyzer const*) {
-         return kExtendedBaseForEDAnalyzer;
-      }
-      static const std::string& extendedBaseType(EDProducer const*)  {
-       return kExtendedBaseForEDProducer;
-      }
-      static const std::string& extendedBaseType(EDFilter const*)  {
-         return kExtendedBaseForEDFilter;
-      }
-      static const std::string& extendedBaseType(OutputModule const*)  {
-         return kExtendedBaseForOutputModule;
-      }
-      static const std::string& extendedBaseType(one::EDAnalyzerBase const*)  {
-         return kExtendedBaseForOneEDAnalyzer;
-      }
-      static const std::string& extendedBaseType(one::EDProducerBase const*)  {
-         return kExtendedBaseForOneEDProducer;
-      }
-      static const std::string& extendedBaseType(one::EDFilterBase const*)  {
-         return kExtendedBaseForOneEDFilter;
-      }
-      static const std::string& extendedBaseType(one::OutputModuleBase const*)  {
-         return kExtendedBaseForOneOutputModule;
-      }
-      static const std::string& extendedBaseType(stream::EDAnalyzerBase const*) {
-         return kExtendedBaseForStreamEDAnalyzer;
-      }
-      static const std::string& extendedBaseType(stream::EDProducerBase const*) {
-         return kExtendedBaseForStreamEDProducer;
-      }
-      static const std::string& extendedBaseType(stream::EDFilterBase const*) {
-         return kExtendedBaseForStreamEDFilter;
-      }
-      static const std::string& extendedBaseType(global::EDAnalyzerBase const*) {
-         return kExtendedBaseForGlobalEDAnalyzer;
-      }
-      static const std::string& extendedBaseType(global::EDProducerBase const*) {
-         return kExtendedBaseForGlobalEDProducer;
-      }
-      static const std::string& extendedBaseType(global::EDFilterBase const*) {
-         return kExtendedBaseForGlobalEDFilter;
-      }
-      static const std::string& extendedBaseType(global::OutputModuleBase const*) {
-         return kExtendedBaseForGlobalOutputModule;
-      }
-   static const std::string& extendedBaseType(limited::EDAnalyzerBase const*) {
+  }  // namespace limited
+
+  class ParameterSetDescriptionFillerBase {
+  public:
+    ParameterSetDescriptionFillerBase() {}
+    virtual ~ParameterSetDescriptionFillerBase();
+
+    // ---------- const member functions ---------------------
+    virtual void fill(ConfigurationDescriptions& descriptions) const = 0;
+    virtual const std::string& baseType() const = 0;
+    virtual const std::string& extendedBaseType() const = 0;
+
+    // ---------- static member functions --------------------
+
+    // ---------- member functions ---------------------------
+
+  protected:
+    static const std::string kEmpty;
+    static const std::string kBaseForService;
+    static const std::string kBaseForESSource;
+    static const std::string kBaseForESProducer;
+    static const std::string kExtendedBaseForEDAnalyzer;
+    static const std::string kExtendedBaseForEDProducer;
+    static const std::string kExtendedBaseForEDFilter;
+    static const std::string kExtendedBaseForOutputModule;
+    static const std::string kExtendedBaseForOneEDAnalyzer;
+    static const std::string kExtendedBaseForOneEDProducer;
+    static const std::string kExtendedBaseForOneEDFilter;
+    static const std::string kExtendedBaseForOneOutputModule;
+    static const std::string kExtendedBaseForStreamEDAnalyzer;
+    static const std::string kExtendedBaseForStreamEDProducer;
+    static const std::string kExtendedBaseForStreamEDFilter;
+    static const std::string kExtendedBaseForGlobalEDAnalyzer;
+    static const std::string kExtendedBaseForGlobalEDProducer;
+    static const std::string kExtendedBaseForGlobalEDFilter;
+    static const std::string kExtendedBaseForGlobalOutputModule;
+    static const std::string kExtendedBaseForLimitedEDAnalyzer;
+    static const std::string kExtendedBaseForLimitedEDProducer;
+    static const std::string kExtendedBaseForLimitedEDFilter;
+    static const std::string kExtendedBaseForLimitedOutputModule;
+
+    static const std::string& extendedBaseType(EDAnalyzer const*) { return kExtendedBaseForEDAnalyzer; }
+    static const std::string& extendedBaseType(EDProducer const*) { return kExtendedBaseForEDProducer; }
+    static const std::string& extendedBaseType(EDFilter const*) { return kExtendedBaseForEDFilter; }
+    static const std::string& extendedBaseType(OutputModule const*) { return kExtendedBaseForOutputModule; }
+    static const std::string& extendedBaseType(one::EDAnalyzerBase const*) { return kExtendedBaseForOneEDAnalyzer; }
+    static const std::string& extendedBaseType(one::EDProducerBase const*) { return kExtendedBaseForOneEDProducer; }
+    static const std::string& extendedBaseType(one::EDFilterBase const*) { return kExtendedBaseForOneEDFilter; }
+    static const std::string& extendedBaseType(one::OutputModuleBase const*) { return kExtendedBaseForOneOutputModule; }
+    static const std::string& extendedBaseType(stream::EDAnalyzerBase const*) {
+      return kExtendedBaseForStreamEDAnalyzer;
+    }
+    static const std::string& extendedBaseType(stream::EDProducerBase const*) {
+      return kExtendedBaseForStreamEDProducer;
+    }
+    static const std::string& extendedBaseType(stream::EDFilterBase const*) { return kExtendedBaseForStreamEDFilter; }
+    static const std::string& extendedBaseType(global::EDAnalyzerBase const*) {
+      return kExtendedBaseForGlobalEDAnalyzer;
+    }
+    static const std::string& extendedBaseType(global::EDProducerBase const*) {
+      return kExtendedBaseForGlobalEDProducer;
+    }
+    static const std::string& extendedBaseType(global::EDFilterBase const*) { return kExtendedBaseForGlobalEDFilter; }
+    static const std::string& extendedBaseType(global::OutputModuleBase const*) {
+      return kExtendedBaseForGlobalOutputModule;
+    }
+    static const std::string& extendedBaseType(limited::EDAnalyzerBase const*) {
       return kExtendedBaseForLimitedEDAnalyzer;
-   }
-   static const std::string& extendedBaseType(limited::EDProducerBase const*) {
+    }
+    static const std::string& extendedBaseType(limited::EDProducerBase const*) {
       return kExtendedBaseForLimitedEDProducer;
-   }
-   static const std::string& extendedBaseType(limited::EDFilterBase const*) {
-      return kExtendedBaseForLimitedEDFilter;
-   }
-   static const std::string& extendedBaseType(limited::OutputModuleBase const*) {
+    }
+    static const std::string& extendedBaseType(limited::EDFilterBase const*) { return kExtendedBaseForLimitedEDFilter; }
+    static const std::string& extendedBaseType(limited::OutputModuleBase const*) {
       return kExtendedBaseForLimitedOutputModule;
-   }
-      static const std::string& extendedBaseType(void const *) {
-         return kEmpty;
-      }
-  
-   private:
-      ParameterSetDescriptionFillerBase(const ParameterSetDescriptionFillerBase&) = delete; // stop default
+    }
+    static const std::string& extendedBaseType(void const*) { return kEmpty; }
 
-      const ParameterSetDescriptionFillerBase& operator=(const ParameterSetDescriptionFillerBase&) = delete; // stop default
+  private:
+    ParameterSetDescriptionFillerBase(const ParameterSetDescriptionFillerBase&) = delete;  // stop default
 
-      // ---------- member data --------------------------------
+    const ParameterSetDescriptionFillerBase& operator=(const ParameterSetDescriptionFillerBase&) =
+        delete;  // stop default
 
-};
+    // ---------- member data --------------------------------
+  };
 
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/ParameterSetDescriptionFillerPluginFactory.h b/FWCore/ParameterSet/interface/ParameterSetDescriptionFillerPluginFactory.h
index 3fc3065e3b17c..233621e0afd39 100644
--- a/FWCore/ParameterSet/interface/ParameterSetDescriptionFillerPluginFactory.h
+++ b/FWCore/ParameterSet/interface/ParameterSetDescriptionFillerPluginFactory.h
@@ -4,7 +4,7 @@
 //
 // Package:     ParameterSet
 // Class  :     ParameterSetDescriptionFillerPluginFactory
-// 
+//
 /**\class ParameterSetDescriptionFillerPluginFactory ParameterSetDescriptionFillerPluginFactory.h FWCore/ParameterSet/interface/ParameterSetDescriptionFillerPluginFactory.h
 
  Description: Provides access to the ParameterSetDescription object of a plugin
@@ -30,20 +30,24 @@ namespace edm {
   typedef edmplugin::PluginFactory<ParameterSetDescriptionFillerBase*(void)> ParameterSetDescriptionFillerPluginFactory;
 }
 
-#define DEFINE_FWK_PSET_DESC_FILLER(type) \
-static const edm::ParameterSetDescriptionFillerPluginFactory::PMaker<edm::ParameterSetDescriptionFiller<type > > EDM_PLUGIN_SYM(s_filler , __LINE__ ) (#type)
+#define DEFINE_FWK_PSET_DESC_FILLER(type)                                                                         \
+  static const edm::ParameterSetDescriptionFillerPluginFactory::PMaker<edm::ParameterSetDescriptionFiller<type> > \
+      EDM_PLUGIN_SYM(s_filler, __LINE__)(#type)
 //NOTE: Can't do the below since this appears on the same line as another factory and w'ed have two variables with the same name
 //DEFINE_EDM_PLUGIN (edm::ParameterSetDescriptionFillerPluginFactory,type,#type)
 
 // Define another analogous macro to handle the special case of services.
 
-#define DEFINE_DESC_FILLER_FOR_SERVICES(pluginName, serviceType)		\
-static const edm::ParameterSetDescriptionFillerPluginFactory::PMaker<edm::DescriptionFillerForServices<serviceType > > EDM_PLUGIN_SYM(s_filler , __LINE__ ) (#pluginName)
+#define DEFINE_DESC_FILLER_FOR_SERVICES(pluginName, serviceType)                                                        \
+  static const edm::ParameterSetDescriptionFillerPluginFactory::PMaker<edm::DescriptionFillerForServices<serviceType> > \
+      EDM_PLUGIN_SYM(s_filler, __LINE__)(#pluginName)
 
-#define DEFINE_DESC_FILLER_FOR_ESSOURCES(type) \
-static const edm::ParameterSetDescriptionFillerPluginFactory::PMaker<edm::DescriptionFillerForESSources<type > > EDM_PLUGIN_SYM(s_filler , __LINE__ ) (#type)
+#define DEFINE_DESC_FILLER_FOR_ESSOURCES(type)                                                                    \
+  static const edm::ParameterSetDescriptionFillerPluginFactory::PMaker<edm::DescriptionFillerForESSources<type> > \
+      EDM_PLUGIN_SYM(s_filler, __LINE__)(#type)
 
-#define DEFINE_DESC_FILLER_FOR_ESPRODUCERS(type) \
-static const edm::ParameterSetDescriptionFillerPluginFactory::PMaker<edm::DescriptionFillerForESProducers<type > > EDM_PLUGIN_SYM(s_filler , __LINE__ ) (#type)
+#define DEFINE_DESC_FILLER_FOR_ESPRODUCERS(type)                                                                    \
+  static const edm::ParameterSetDescriptionFillerPluginFactory::PMaker<edm::DescriptionFillerForESProducers<type> > \
+      EDM_PLUGIN_SYM(s_filler, __LINE__)(#type)
 
 #endif
diff --git a/FWCore/ParameterSet/interface/ParameterSetDescriptionTraits.h b/FWCore/ParameterSet/interface/ParameterSetDescriptionTraits.h
index 9825405819802..ba2c54d5055e6 100644
--- a/FWCore/ParameterSet/interface/ParameterSetDescriptionTraits.h
+++ b/FWCore/ParameterSet/interface/ParameterSetDescriptionTraits.h
@@ -12,5 +12,5 @@ namespace edm {
     static ParameterSetDescription* clone(ParameterSetDescription const* p);
     static void destroy(ParameterSetDescription* p);
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/ParameterSetEntry.h b/FWCore/ParameterSet/interface/ParameterSetEntry.h
index a3fb58669764f..b69bd5b9b2577 100644
--- a/FWCore/ParameterSet/interface/ParameterSetEntry.h
+++ b/FWCore/ParameterSet/interface/ParameterSetEntry.h
@@ -35,13 +35,13 @@ namespace edm {
 
     std::string toString() const;
     void toString(std::string& result) const;
-    void toDigest(cms::Digest &digest) const;
+    void toDigest(cms::Digest& digest) const;
 
-    bool isTracked() const {return isTracked_;}
+    bool isTracked() const { return isTracked_; }
     void setIsTracked(bool v) { isTracked_ = v; }
 
-    ParameterSetID id() const {return theID_;}
-  
+    ParameterSetID id() const { return theID_; }
+
     /// returns the PSet
     ParameterSet const& pset() const;
     ParameterSet& psetForUpdate();
@@ -51,10 +51,9 @@ namespace edm {
     void updateID();
 
     std::string dump(unsigned int indent = 0) const;
-    friend std::ostream & operator<<(std::ostream & os, ParameterSetEntry const& psetEntry);
+    friend std::ostream& operator<<(std::ostream& os, ParameterSetEntry const& psetEntry);
 
   private:
-    
     bool isTracked_;
     // can be internally reconstituted from the ID, in an
     // ostensibly const function
@@ -63,7 +62,6 @@ namespace edm {
     ParameterSetID theID_;
   };
 
-}
+}  // namespace edm
 
 #endif
-
diff --git a/FWCore/ParameterSet/interface/ParameterSetfwd.h b/FWCore/ParameterSet/interface/ParameterSetfwd.h
index cb60273c34d68..cb0419e53566c 100644
--- a/FWCore/ParameterSet/interface/ParameterSetfwd.h
+++ b/FWCore/ParameterSet/interface/ParameterSetfwd.h
@@ -14,7 +14,6 @@ namespace edm {
   class FileInPath;
   class ParameterSetDescription;
   class ConfigurationDescriptions;
-}
+}  // namespace edm
 
 #endif
-
diff --git a/FWCore/ParameterSet/interface/ParameterSwitch.h b/FWCore/ParameterSet/interface/ParameterSwitch.h
index 5acc79e2ea786..8a95857ec381d 100644
--- a/FWCore/ParameterSet/interface/ParameterSwitch.h
+++ b/FWCore/ParameterSet/interface/ParameterSwitch.h
@@ -21,87 +21,64 @@
 
 namespace edm {
 
-  template<class T>
+  template <class T>
   class ParameterSwitch : public ParameterSwitchBase {
-
   public:
     typedef std::map<T, edm::value_ptr<ParameterDescriptionNode> > CaseMap;
     typedef typename std::map<T, edm::value_ptr<ParameterDescriptionNode> >::const_iterator CaseMapConstIter;
 
     ParameterSwitch(ParameterDescription<T> const& switchParameter,
-                    std::unique_ptr<ParameterDescriptionCases<T> > cases) :
-      switch_(switchParameter),
-      cases_(*cases->caseMap())
-    {
+                    std::unique_ptr<ParameterDescriptionCases<T> > cases)
+        : switch_(switchParameter), cases_(*cases->caseMap()) {
       if (cases->duplicateCaseValues()) {
         throwDuplicateCaseValues(switchParameter.label());
       }
     }
 
-    ParameterDescriptionNode* clone() const override {
-      return new ParameterSwitch(*this);
-    }
+    ParameterDescriptionNode* clone() const override { return new ParameterSwitch(*this); }
 
   private:
-
-    void checkAndGetLabelsAndTypes_(std::set<std::string> & usedLabels,
-                                    std::set<ParameterTypes> & parameterTypes,
-                                    std::set<ParameterTypes> & wildcardTypes) const override {
-
+    void checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
+                                    std::set<ParameterTypes>& parameterTypes,
+                                    std::set<ParameterTypes>& wildcardTypes) const override {
       std::set<std::string> caseLabels;
       std::set<ParameterTypes> caseParameterTypes;
       std::set<ParameterTypes> caseWildcardTypes;
-      for_all(cases_, std::bind(&ParameterSwitch::checkCaseLabels,
-                                std::placeholders::_1,
-                                std::ref(caseLabels),
-                                std::ref(caseParameterTypes),
-                                std::ref(caseWildcardTypes)));
-
-      insertAndCheckLabels(switch_.label(),
-                           usedLabels,
-                           caseLabels);
-
-      insertAndCheckTypes(switch_.type(),
-                          caseParameterTypes,
-                          caseWildcardTypes,
-                          parameterTypes,
-                          wildcardTypes);
+      for_all(cases_,
+              std::bind(&ParameterSwitch::checkCaseLabels,
+                        std::placeholders::_1,
+                        std::ref(caseLabels),
+                        std::ref(caseParameterTypes),
+                        std::ref(caseWildcardTypes)));
+
+      insertAndCheckLabels(switch_.label(), usedLabels, caseLabels);
+
+      insertAndCheckTypes(switch_.type(), caseParameterTypes, caseWildcardTypes, parameterTypes, wildcardTypes);
 
       if (cases_.find(switch_.getDefaultValue()) == cases_.end()) {
         throwNoCaseForDefault(switch_.label());
       }
     }
 
-    void validate_(ParameterSet & pset,
-                   std::set<std::string> & validatedLabels,
-                   bool optional) const override {
-
+    void validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const override {
       switch_.validate(pset, validatedLabels, optional);
       if (switch_.exists(pset)) {
-        T switchValue;   
+        T switchValue;
         if (switch_.isTracked()) {
           switchValue = pset.getParameter<T>(switch_.label());
-        }
-        else {
+        } else {
           switchValue = pset.getUntrackedParameter<T>(switch_.label());
         }
-	typename CaseMap::const_iterator selectedCase = cases_.find(switchValue);
+        typename CaseMap::const_iterator selectedCase = cases_.find(switchValue);
         if (selectedCase != cases_.end()) {
           selectedCase->second->validate(pset, validatedLabels, false);
-        }
-        else {
-	  std::stringstream ss;
-          ss << "The switch parameter with label \""
-             << switch_.label()
-             << "\" has been assigned an illegal value.\n"
-             << "The value from the configuration is \""
-             << switchValue
-             << "\".\n"
+        } else {
+          std::stringstream ss;
+          ss << "The switch parameter with label \"" << switch_.label() << "\" has been assigned an illegal value.\n"
+             << "The value from the configuration is \"" << switchValue << "\".\n"
              << "The allowed values are:\n";
 
-          for (CaseMapConstIter iter = cases_.begin(), iEnd = cases_.end();
-               iter != iEnd;
-               ++iter) {
+          for (CaseMapConstIter iter = cases_.begin(), iEnd = cases_.end(); iter != iEnd; ++iter) {
             ss << "  " << iter->first << "\n";
           }
           throwNoCaseForSwitchValue(ss.str());
@@ -109,10 +86,7 @@ namespace edm {
       }
     }
 
-    void writeCfi_(std::ostream & os,
-                   bool & startWithComma,
-                   int indentation,
-                   bool & wroteSomething) const override {
+    void writeCfi_(std::ostream& os, bool& startWithComma, int indentation, bool& wroteSomething) const override {
       switch_.writeCfi(os, startWithComma, indentation, wroteSomething);
 
       typename CaseMap::const_iterator selectedCase = cases_.find(switch_.getDefaultValue());
@@ -121,27 +95,28 @@ namespace edm {
       }
     }
 
-    void print_(std::ostream & os,
-                bool optional,
-                bool writeToCfi,
-                DocFormatHelper & dfh) const override {
-      printBase(os, optional, writeToCfi, dfh, switch_.label(), switch_.isTracked(), parameterTypeEnumToString(switch_.type()));
+    void print_(std::ostream& os, bool optional, bool writeToCfi, DocFormatHelper& dfh) const override {
+      printBase(os,
+                optional,
+                writeToCfi,
+                dfh,
+                switch_.label(),
+                switch_.isTracked(),
+                parameterTypeEnumToString(switch_.type()));
     }
 
-    void printNestedContent_(std::ostream & os,
-                             bool optional,
-                             DocFormatHelper & dfh) const override {
-
+    void printNestedContent_(std::ostream& os, bool optional, DocFormatHelper& dfh) const override {
       DocFormatHelper new_dfh(dfh);
       printNestedContentBase(os, dfh, new_dfh, switch_.label());
 
       switch_.print(os, optional, true, new_dfh);
-      for_all(cases_, std::bind(&ParameterSwitchBase::printCaseT<T>,
-                                std::placeholders::_1,
-                                std::ref(os),
-                                optional,
-                                std::ref(new_dfh),
-                                std::cref(switch_.label())));
+      for_all(cases_,
+              std::bind(&ParameterSwitchBase::printCaseT<T>,
+                        std::placeholders::_1,
+                        std::ref(os),
+                        optional,
+                        std::ref(new_dfh),
+                        std::cref(switch_.label())));
 
       new_dfh.setPass(1);
       new_dfh.setCounter(0);
@@ -149,36 +124,38 @@ namespace edm {
       new_dfh.indent(os);
       os << "switch:\n";
       switch_.print(os, optional, true, new_dfh);
-      for_all(cases_, std::bind(&ParameterSwitchBase::printCaseT<T>,
-                                  std::placeholders::_1,
-                                  std::ref(os),
-                                  optional,
-                                  std::ref(new_dfh),
-                                  std::cref(switch_.label())));
+      for_all(cases_,
+              std::bind(&ParameterSwitchBase::printCaseT<T>,
+                        std::placeholders::_1,
+                        std::ref(os),
+                        optional,
+                        std::ref(new_dfh),
+                        std::cref(switch_.label())));
 
       new_dfh.setPass(2);
       new_dfh.setCounter(0);
 
       switch_.printNestedContent(os, optional, new_dfh);
-      for_all(cases_, std::bind(&ParameterSwitchBase::printCaseT<T>,
-                                  std::placeholders::_1,
-                                  std::ref(os),
-                                  optional,
-                                  std::ref(new_dfh),
-                                  std::cref(switch_.label())));
+      for_all(cases_,
+              std::bind(&ParameterSwitchBase::printCaseT<T>,
+                        std::placeholders::_1,
+                        std::ref(os),
+                        optional,
+                        std::ref(new_dfh),
+                        std::cref(switch_.label())));
     }
 
     bool exists_(ParameterSet const& pset) const override { return switch_.exists(pset); }
 
     static void checkCaseLabels(std::pair<T, edm::value_ptr<ParameterDescriptionNode> > const& thePair,
-                                std::set<std::string> & labels,
-                                std::set<ParameterTypes> & parameterTypes,
-                                std::set<ParameterTypes> & wildcardTypes) {
+                                std::set<std::string>& labels,
+                                std::set<ParameterTypes>& parameterTypes,
+                                std::set<ParameterTypes>& wildcardTypes) {
       thePair.second->checkAndGetLabelsAndTypes(labels, parameterTypes, wildcardTypes);
     }
 
     ParameterDescription<T> switch_;
     CaseMap cases_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/ParameterSwitchBase.h b/FWCore/ParameterSet/interface/ParameterSwitchBase.h
index 7c22517ae0741..7f8df8a2b0f69 100644
--- a/FWCore/ParameterSet/interface/ParameterSwitchBase.h
+++ b/FWCore/ParameterSet/interface/ParameterSwitchBase.h
@@ -19,14 +19,14 @@ namespace edm {
 
   protected:
     void insertAndCheckLabels(std::string const& switchLabel,
-                              std::set<std::string> & usedLabels,
-                              std::set<std::string> & labels) const;
+                              std::set<std::string>& usedLabels,
+                              std::set<std::string>& labels) const;
 
     void insertAndCheckTypes(ParameterTypes switchType,
                              std::set<ParameterTypes> const& caseParameterTypes,
                              std::set<ParameterTypes> const& caseWildcardTypes,
-                             std::set<ParameterTypes> & parameterTypes,
-                             std::set<ParameterTypes> & wildcardTypes) const;
+                             std::set<ParameterTypes>& parameterTypes,
+                             std::set<ParameterTypes>& wildcardTypes) const;
 
     void throwDuplicateCaseValues(std::string const& switchLabel) const;
 
@@ -34,55 +34,53 @@ namespace edm {
 
     void throwNoCaseForSwitchValue(std::string const& message) const;
 
-    void printBase(std::ostream & os,
+    void printBase(std::ostream& os,
                    bool optional,
                    bool writeToCfi,
-                   DocFormatHelper & dfh,
+                   DocFormatHelper& dfh,
                    std::string const& switchLabel,
                    bool isTracked,
                    std::string const& typeString) const;
 
     bool hasNestedContent_() const override;
 
-    void printNestedContentBase(std::ostream & os,
-                                DocFormatHelper & dfh,
-                                DocFormatHelper & new_dfh,
+    void printNestedContentBase(std::ostream& os,
+                                DocFormatHelper& dfh,
+                                DocFormatHelper& new_dfh,
                                 std::string const& switchLabel) const;
 
     template <typename T>
     static void printCaseT(std::pair<T, edm::value_ptr<ParameterDescriptionNode> > const& p,
-                           std::ostream & os,
+                           std::ostream& os,
                            bool optional,
-                           DocFormatHelper & dfh,
+                           DocFormatHelper& dfh,
                            std::string const& switchLabel) {
       ParameterSwitchBase::printCase(p, os, optional, dfh, switchLabel);
     }
 
   private:
-
     static void printCase(std::pair<bool, edm::value_ptr<ParameterDescriptionNode> > const& p,
-                          std::ostream & os,
+                          std::ostream& os,
                           bool optional,
-                          DocFormatHelper & dfh,
+                          DocFormatHelper& dfh,
                           std::string const& switchLabel);
 
     static void printCase(std::pair<int, edm::value_ptr<ParameterDescriptionNode> > const& p,
-                          std::ostream & os,
+                          std::ostream& os,
                           bool optional,
-                          DocFormatHelper & dfh,
+                          DocFormatHelper& dfh,
                           std::string const& switchLabel);
 
     static void printCase(std::pair<std::string, edm::value_ptr<ParameterDescriptionNode> > const& p,
-                          std::ostream & os,
+                          std::ostream& os,
                           bool optional,
-                          DocFormatHelper & dfh,
+                          DocFormatHelper& dfh,
                           std::string const& switchLabel);
 
     bool partiallyExists_(ParameterSet const& pset) const override;
 
     int howManyXORSubNodesExist_(ParameterSet const& pset) const override;
-
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ParameterSet/interface/ParameterWildcard.h b/FWCore/ParameterSet/interface/ParameterWildcard.h
index c7f1f80fa451d..522315f0cd77d 100644
--- a/FWCore/ParameterSet/interface/ParameterWildcard.h
+++ b/FWCore/ParameterSet/interface/ParameterWildcard.h
@@ -19,62 +19,56 @@ namespace edm {
   class ParameterSetDescription;
   class DocFormatHelper;
 
-  template<class T>
+  template <class T>
   class ParameterWildcard : public ParameterWildcardBase {
-
   public:
-
-    ParameterWildcard(std::string const& pattern, WildcardValidationCriteria criteria, bool isTracked) :
-      ParameterWildcardBase(ParameterTypeToEnum::toEnum<T>(), isTracked, criteria) {
+    ParameterWildcard(std::string const& pattern, WildcardValidationCriteria criteria, bool isTracked)
+        : ParameterWildcardBase(ParameterTypeToEnum::toEnum<T>(), isTracked, criteria) {
       throwIfInvalidPattern(pattern);
     }
 
-    ParameterWildcard(char const* pattern, WildcardValidationCriteria criteria, bool isTracked) :
-      ParameterWildcardBase(ParameterTypeToEnum::toEnum<T>(), isTracked, criteria) {
+    ParameterWildcard(char const* pattern, WildcardValidationCriteria criteria, bool isTracked)
+        : ParameterWildcardBase(ParameterTypeToEnum::toEnum<T>(), isTracked, criteria) {
       throwIfInvalidPattern(pattern);
     }
 
-    ~ParameterWildcard() override { }
+    ~ParameterWildcard() override {}
 
-    ParameterDescriptionNode* clone() const override {
-      return new ParameterWildcard(*this);
-    }
+    ParameterDescriptionNode* clone() const override { return new ParameterWildcard(*this); }
 
   private:
-   
-    void validate_(ParameterSet & pset,
-                   std::set<std::string> & validatedLabels,
-                   bool optional) const override {
-
-      std::vector<std::string> parameterNames  = pset.getParameterNamesForType<T>(isTracked());
+    void validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const override {
+      std::vector<std::string> parameterNames = pset.getParameterNamesForType<T>(isTracked());
       validateMatchingNames(parameterNames, validatedLabels, optional);
-
     }
 
     bool exists_(ParameterSet const& pset) const override {
+      if (criteria() == RequireZeroOrMore)
+        return true;
 
-      if (criteria() == RequireZeroOrMore) return true;
+      std::vector<std::string> parameterNames = pset.getParameterNamesForType<T>(isTracked());
 
-      std::vector<std::string> parameterNames  = pset.getParameterNamesForType<T>(isTracked());
-
-      if (criteria() == RequireAtLeastOne) return !parameterNames.empty();
+      if (criteria() == RequireAtLeastOne)
+        return !parameterNames.empty();
       return parameterNames.size() == 1U;
     }
 
     // In the future may need to add a data member of type T to hold a default value
   };
 
-  template<>
+  template <>
   class ParameterWildcard<ParameterSetDescription> : public ParameterWildcardBase {
-
   public:
-
     ParameterWildcard(std::string const& pattern, WildcardValidationCriteria criteria, bool isTracked);
     ParameterWildcard(char const* pattern, WildcardValidationCriteria criteria, bool isTracked);
 
-    ParameterWildcard(std::string const& pattern, WildcardValidationCriteria criteria, bool isTracked,
+    ParameterWildcard(std::string const& pattern,
+                      WildcardValidationCriteria criteria,
+                      bool isTracked,
                       ParameterSetDescription const& desc);
-    ParameterWildcard(char const* pattern, WildcardValidationCriteria criteria, bool isTracked,
+    ParameterWildcard(char const* pattern,
+                      WildcardValidationCriteria criteria,
+                      bool isTracked,
                       ParameterSetDescription const& desc);
 
     ~ParameterWildcard() override;
@@ -82,35 +76,32 @@ namespace edm {
     ParameterDescriptionNode* clone() const override;
 
   private:
-   
-    void validate_(ParameterSet & pset,
-                   std::set<std::string> & validatedLabels,
-                   bool optional) const override;
+    void validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const override;
 
     bool hasNestedContent_() const override;
 
-    void printNestedContent_(std::ostream & os,
-                             bool optional,
-                             DocFormatHelper & helper) const override;
+    void printNestedContent_(std::ostream& os, bool optional, DocFormatHelper& helper) const override;
 
     bool exists_(ParameterSet const& pset) const override;
 
-    void validateDescription(std::string const& parameterName, ParameterSet & pset) const;
+    void validateDescription(std::string const& parameterName, ParameterSet& pset) const;
 
     value_ptr<ParameterSetDescription> psetDesc_;
   };
 
-  template<>
+  template <>
   class ParameterWildcard<std::vector<ParameterSet> > : public ParameterWildcardBase {
-
   public:
-
     ParameterWildcard(std::string const& pattern, WildcardValidationCriteria criteria, bool isTracked);
     ParameterWildcard(char const* pattern, WildcardValidationCriteria criteria, bool isTracked);
 
-    ParameterWildcard(std::string const& pattern, WildcardValidationCriteria criteria, bool isTracked,
+    ParameterWildcard(std::string const& pattern,
+                      WildcardValidationCriteria criteria,
+                      bool isTracked,
                       ParameterSetDescription const& desc);
-    ParameterWildcard(char const* pattern, WildcardValidationCriteria criteria, bool isTracked,
+    ParameterWildcard(char const* pattern,
+                      WildcardValidationCriteria criteria,
+                      bool isTracked,
                       ParameterSetDescription const& desc);
 
     ~ParameterWildcard() override;
@@ -118,22 +109,17 @@ namespace edm {
     ParameterDescriptionNode* clone() const override;
 
   private:
-   
-    void validate_(ParameterSet & pset,
-                   std::set<std::string> & validatedLabels,
-                   bool optional) const override;
+    void validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const override;
 
     bool hasNestedContent_() const override;
 
-    void printNestedContent_(std::ostream & os,
-                             bool optional,
-                             DocFormatHelper & dfh) const override;
+    void printNestedContent_(std::ostream& os, bool optional, DocFormatHelper& dfh) const override;
 
     bool exists_(ParameterSet const& pset) const override;
 
-    void validatePSetVector(std::string const& parameterName, ParameterSet & pset) const;
+    void validatePSetVector(std::string const& parameterName, ParameterSet& pset) const;
 
     value_ptr<ParameterSetDescription> psetDesc_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/ParameterWildcardBase.h b/FWCore/ParameterSet/interface/ParameterWildcardBase.h
index 8e5443b1826ed..7f6fd7842ac83 100644
--- a/FWCore/ParameterSet/interface/ParameterWildcardBase.h
+++ b/FWCore/ParameterSet/interface/ParameterWildcardBase.h
@@ -9,55 +9,39 @@
 #include <iosfwd>
 #include <vector>
 
-
 namespace edm {
 
   class ParameterSet;
   class DocFormatHelper;
 
-  enum WildcardValidationCriteria {
-    RequireZeroOrMore,
-    RequireAtLeastOne,
-    RequireExactlyOne
-  };
+  enum WildcardValidationCriteria { RequireZeroOrMore, RequireAtLeastOne, RequireExactlyOne };
 
-  class ParameterWildcardBase : public ParameterDescriptionNode 
-  {
+  class ParameterWildcardBase : public ParameterDescriptionNode {
   public:
     ~ParameterWildcardBase() override;
 
     ParameterTypes type() const { return type_; }
     bool isTracked() const { return isTracked_; }
     WildcardValidationCriteria criteria() const { return criteria_; }
- 
+
   protected:
-    ParameterWildcardBase(ParameterTypes iType,
-                          bool isTracked,
-                          WildcardValidationCriteria criteria
-                         );
+    ParameterWildcardBase(ParameterTypes iType, bool isTracked, WildcardValidationCriteria criteria);
 
     void throwIfInvalidPattern(char const* pattern) const;
     void throwIfInvalidPattern(std::string const& pattern) const;
 
     void validateMatchingNames(std::vector<std::string> const& matchingNames,
-                               std::set<std::string> & validatedLabels,
+                               std::set<std::string>& validatedLabels,
                                bool optional) const;
 
   private:
+    void checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
+                                    std::set<ParameterTypes>& parameterTypes,
+                                    std::set<ParameterTypes>& wildcardTypes) const override;
 
-    void checkAndGetLabelsAndTypes_(std::set<std::string> & usedLabels,
-                                    std::set<ParameterTypes> & parameterTypes,
-                                    std::set<ParameterTypes> & wildcardTypes) const override;
-
-    void writeCfi_(std::ostream & os,
-                   bool & startWithComma,
-                   int indentation,
-                   bool & wroteSomething) const override;
+    void writeCfi_(std::ostream& os, bool& startWithComma, int indentation, bool& wroteSomething) const override;
 
-    void print_(std::ostream & os,
-                bool optional,
-                bool writeToCfi,
-                DocFormatHelper & dfh) const override;
+    void print_(std::ostream& os, bool optional, bool writeToCfi, DocFormatHelper& dfh) const override;
 
     bool partiallyExists_(ParameterSet const& pset) const override;
 
@@ -75,5 +59,5 @@ namespace edm {
     // pattern if we implement regular expressions, globbing, or some
     // other kind of wildcard patterns other than "*".
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/PluginDescription.h b/FWCore/ParameterSet/interface/PluginDescription.h
index 3db392fe9a55f..bbe61245e9b92 100644
--- a/FWCore/ParameterSet/interface/PluginDescription.h
+++ b/FWCore/ParameterSet/interface/PluginDescription.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/ParameterSet
 // Class  :     PluginDescription
-// 
+//
 /**\class PluginDescription PluginDescription.h "PluginDescription.h"
 
  Description: Use to describe how to validate a plugin that will be loaded
@@ -93,189 +93,164 @@ Each user plugin must define a static member function:
 
 // forward declarations
 namespace edm {
-template< typename T>
-  class PluginDescription : public ParameterDescriptionNode
-{
-public:
-  /**Constructor without a default for typeLabel
+  template <typename T>
+  class PluginDescription : public ParameterDescriptionNode {
+  public:
+    /**Constructor without a default for typeLabel
    @param[in] typeLabel the label for the std::string parameter which holds the plugin type to be loaded
    @param[in] typeLabelIsTracked 'true' if the parameter `typeLabel` is tracked, else should be false
    */
-  PluginDescription(std::string typeLabel, bool typeLabelIsTracked):
-  typeLabel_{std::move(typeLabel)},
-  typeLabelIsTracked_{typeLabelIsTracked} {}
+    PluginDescription(std::string typeLabel, bool typeLabelIsTracked)
+        : typeLabel_{std::move(typeLabel)}, typeLabelIsTracked_{typeLabelIsTracked} {}
 
-  /**Constructor with a default for typeLabel
+    /**Constructor with a default for typeLabel
    @param[in] typeLabel the label for the std::string parameter which holds the plugin type to be loaded
    @param[in] defaultType the default plugin type that should be loaded if no type is given
    @param[in] typeLabelIsTracked 'true' if the parameter `typeLabel` is tracked, else should be false
    */
-  PluginDescription(std::string typeLabel, std::string defaultType, bool typeLabelIsTracked):
-  typeLabel_{std::move(typeLabel)},
-  defaultType_{std::move(defaultType)},
-  typeLabelIsTracked_{typeLabelIsTracked} {}
-
-  // ---------- const member functions ---------------------
-  ParameterDescriptionNode* clone() const final {
-    return new PluginDescription<T>(*this);
-  }
-
-protected:
-  
-  void checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
-                                  std::set<ParameterTypes>& parameterTypes,
-                                  std::set<ParameterTypes>& wildcardTypes) const final {
-    
-  }
-  
-  
-  
-  void validate_(ParameterSet& pset,
-                 std::set<std::string>& validatedLabels,
-                 bool optional) const final {
-    loadPlugin(findType(pset));
-    cache_->validate(pset);
-    //all names are good
-    auto n =pset.getParameterNames();
-    validatedLabels.insert(n.begin(),n.end());
-  }
-  
-  void writeCfi_(std::ostream& os,
-                 bool& startWithComma,
-                 int indentation,
-                 bool& wroteSomething) const final {
-    if(not defaultType_.empty()) {
-      if (!edmplugin::PluginManager::isAvailable()) {
-        auto conf = edmplugin::standard::config();
-        conf.allowNoCache();
-        edmplugin::PluginManager::configure(conf);
-      }
+    PluginDescription(std::string typeLabel, std::string defaultType, bool typeLabelIsTracked)
+        : typeLabel_{std::move(typeLabel)},
+          defaultType_{std::move(defaultType)},
+          typeLabelIsTracked_{typeLabelIsTracked} {}
+
+    // ---------- const member functions ---------------------
+    ParameterDescriptionNode* clone() const final { return new PluginDescription<T>(*this); }
+
+  protected:
+    void checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
+                                    std::set<ParameterTypes>& parameterTypes,
+                                    std::set<ParameterTypes>& wildcardTypes) const final {}
 
-      loadPlugin(defaultType_);
-      
-      cache_->writeCfi(os,startWithComma,indentation);
-      wroteSomething = true;
+    void validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const final {
+      loadPlugin(findType(pset));
+      cache_->validate(pset);
+      //all names are good
+      auto n = pset.getParameterNames();
+      validatedLabels.insert(n.begin(), n.end());
     }
-  }
-  
-  bool hasNestedContent_() const final {
-    return true;
-  }
-  
-  void printNestedContent_(std::ostream& os,
-                           bool /*optional*/,
-                           DocFormatHelper& dfh) const final {
-    int indentation = dfh.indentation();
-
-    using CreatedType = PluginDescriptionAdaptorBase<typename T::CreatedType>;
-    using Factory = edmplugin::PluginFactory<CreatedType*()>;
-
-    std::stringstream ss;
-    ss << dfh.section() << "." << dfh.counter();
-    std::string newSection = ss.str();
-
-    printSpaces(os, indentation);
-    os << "Section " << newSection
-    << " " << Factory::get()->category() << " Plugins description:\n";
-    if(!dfh.brief()) os << "\n";
-
-    DocFormatHelper new_dfh(dfh);
-    new_dfh.init();
-    new_dfh.setSection(newSection);
-
-    //loop over all possible plugins
-    unsigned int pluginCount = 0;
-    std::string previousName;
-    for(auto const& info: edmplugin::PluginManager::get()->categoryToInfos().find(Factory::get()->category())->second) {
-
-      // We only want to print the first instance of each plugin name
-      if (previousName == info.name_) {
-        continue;
+
+    void writeCfi_(std::ostream& os, bool& startWithComma, int indentation, bool& wroteSomething) const final {
+      if (not defaultType_.empty()) {
+        if (!edmplugin::PluginManager::isAvailable()) {
+          auto conf = edmplugin::standard::config();
+          conf.allowNoCache();
+          edmplugin::PluginManager::configure(conf);
+        }
+
+        loadPlugin(defaultType_);
+
+        cache_->writeCfi(os, startWithComma, indentation);
+        wroteSomething = true;
       }
+    }
+
+    bool hasNestedContent_() const final { return true; }
+
+    void printNestedContent_(std::ostream& os, bool /*optional*/, DocFormatHelper& dfh) const final {
+      int indentation = dfh.indentation();
+
+      using CreatedType = PluginDescriptionAdaptorBase<typename T::CreatedType>;
+      using Factory = edmplugin::PluginFactory<CreatedType*()>;
 
       std::stringstream ss;
       ss << dfh.section() << "." << dfh.counter();
       std::string newSection = ss.str();
+
       printSpaces(os, indentation);
-      os << "Section " << newSection <<"."<< ++pluginCount
-      << " " << info.name_ << " Plugin description:\n";
-      if(!dfh.brief()) os << "\n";
+      os << "Section " << newSection << " " << Factory::get()->category() << " Plugins description:\n";
+      if (!dfh.brief())
+        os << "\n";
 
       DocFormatHelper new_dfh(dfh);
       new_dfh.init();
       new_dfh.setSection(newSection);
 
-      loadDescription(info.name_)->print(os,new_dfh);
+      //loop over all possible plugins
+      unsigned int pluginCount = 0;
+      std::string previousName;
+      for (auto const& info :
+           edmplugin::PluginManager::get()->categoryToInfos().find(Factory::get()->category())->second) {
+        // We only want to print the first instance of each plugin name
+        if (previousName == info.name_) {
+          continue;
+        }
 
-      previousName = info.name_;
-    }
-  }
-  
-  bool exists_(ParameterSet const& pset) const final {
-    return pset.existsAs<std::string>(typeLabel_, typeLabelIsTracked_);
-  }
-  
-  bool partiallyExists_(ParameterSet const& pset) const final {
-    return exists_(pset);
-  }
-  
-  int howManyXORSubNodesExist_(ParameterSet const& pset) const final {
-    return exists(pset) ? 1 : 0;
-  }
-
-private:
-
-  std::string findType(edm::ParameterSet const& iPSet) const {
-    if(typeLabelIsTracked_) {
-      if(iPSet.existsAs<std::string>(typeLabel_) || defaultType_.empty()) {
-        return iPSet.getParameter<std::string>(typeLabel_);
-      } else {
-        return defaultType_;
+        std::stringstream ss;
+        ss << dfh.section() << "." << dfh.counter();
+        std::string newSection = ss.str();
+        printSpaces(os, indentation);
+        os << "Section " << newSection << "." << ++pluginCount << " " << info.name_ << " Plugin description:\n";
+        if (!dfh.brief())
+          os << "\n";
+
+        DocFormatHelper new_dfh(dfh);
+        new_dfh.init();
+        new_dfh.setSection(newSection);
+
+        loadDescription(info.name_)->print(os, new_dfh);
+
+        previousName = info.name_;
       }
     }
-    if(defaultType_.empty()) {
-      return iPSet.getUntrackedParameter<std::string>(typeLabel_);
+
+    bool exists_(ParameterSet const& pset) const final {
+      return pset.existsAs<std::string>(typeLabel_, typeLabelIsTracked_);
     }
-    return iPSet.getUntrackedParameter<std::string>(typeLabel_,defaultType_);
-  }
-  
-  void loadPlugin(std::string const& iName) const {
-    if(not cache_) {
-      cache_ = loadDescription(iName);
+
+    bool partiallyExists_(ParameterSet const& pset) const final { return exists_(pset); }
+
+    int howManyXORSubNodesExist_(ParameterSet const& pset) const final { return exists(pset) ? 1 : 0; }
+
+  private:
+    std::string findType(edm::ParameterSet const& iPSet) const {
+      if (typeLabelIsTracked_) {
+        if (iPSet.existsAs<std::string>(typeLabel_) || defaultType_.empty()) {
+          return iPSet.getParameter<std::string>(typeLabel_);
+        } else {
+          return defaultType_;
+        }
+      }
+      if (defaultType_.empty()) {
+        return iPSet.getUntrackedParameter<std::string>(typeLabel_);
+      }
+      return iPSet.getUntrackedParameter<std::string>(typeLabel_, defaultType_);
     }
-  }
-  
-  std::shared_ptr<ParameterSetDescription>
-  loadDescription(std::string const& iName) const {
-    using CreatedType = PluginDescriptionAdaptorBase<typename T::CreatedType>;
-    std::unique_ptr<CreatedType> a(edmplugin::PluginFactory<CreatedType*()>::get()->create(iName));
-    
-    std::shared_ptr<ParameterSetDescription> desc = std::make_shared<ParameterSetDescription>(a->description());
-    
-    //There is no way to check to see if a node already wants a label
-    if(typeLabelIsTracked_) {
-      if(defaultType_.empty()) {
-        desc->add<std::string>(typeLabel_);
-      } else {
-        desc->add<std::string>(typeLabel_,defaultType_);
+
+    void loadPlugin(std::string const& iName) const {
+      if (not cache_) {
+        cache_ = loadDescription(iName);
       }
-    } else {
-      if(defaultType_.empty()) {
-        desc->addUntracked<std::string>(typeLabel_);
+    }
+
+    std::shared_ptr<ParameterSetDescription> loadDescription(std::string const& iName) const {
+      using CreatedType = PluginDescriptionAdaptorBase<typename T::CreatedType>;
+      std::unique_ptr<CreatedType> a(edmplugin::PluginFactory<CreatedType*()>::get()->create(iName));
+
+      std::shared_ptr<ParameterSetDescription> desc = std::make_shared<ParameterSetDescription>(a->description());
+
+      //There is no way to check to see if a node already wants a label
+      if (typeLabelIsTracked_) {
+        if (defaultType_.empty()) {
+          desc->add<std::string>(typeLabel_);
+        } else {
+          desc->add<std::string>(typeLabel_, defaultType_);
+        }
       } else {
-        desc->addUntracked<std::string>(typeLabel_,defaultType_);
+        if (defaultType_.empty()) {
+          desc->addUntracked<std::string>(typeLabel_);
+        } else {
+          desc->addUntracked<std::string>(typeLabel_, defaultType_);
+        }
       }
+      return desc;
     }
-    return desc;
-  }
-
-  // ---------- member data --------------------------------
-  mutable std::shared_ptr<ParameterSetDescription> cache_;
-  std::string typeLabel_;
-  std::string defaultType_;
-  bool typeLabelIsTracked_;
-  
-};
-}
+
+    // ---------- member data --------------------------------
+    mutable std::shared_ptr<ParameterSetDescription> cache_;
+    std::string typeLabel_;
+    std::string defaultType_;
+    bool typeLabelIsTracked_;
+  };
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ParameterSet/interface/PluginDescriptionAdaptor.h b/FWCore/ParameterSet/interface/PluginDescriptionAdaptor.h
index bfb2ec3f50e94..5d6b3dff9e07d 100644
--- a/FWCore/ParameterSet/interface/PluginDescriptionAdaptor.h
+++ b/FWCore/ParameterSet/interface/PluginDescriptionAdaptor.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/ParameterSet
 // Class  :     PluginDescriptionAdaptor
-// 
+//
 /**\class PluginDescriptionAdaptor PluginDescriptionAdaptor.h "PluginDescriptionAdaptor.h"
 
  Description: [one line class summary]
@@ -28,16 +28,15 @@
 
 namespace edm {
 
-template<typename BASE, typename T>
-  class PluginDescriptionAdaptor : public PluginDescriptionAdaptorBase<BASE>
-{
-public:
-  // ---------- const member functions ---------------------
-  edm::ParameterSetDescription description() const final {
-    edm::ParameterSetDescription d;
-    T::fillPSetDescription(d);
-    return d;
-  }
-};
-}
+  template <typename BASE, typename T>
+  class PluginDescriptionAdaptor : public PluginDescriptionAdaptorBase<BASE> {
+  public:
+    // ---------- const member functions ---------------------
+    edm::ParameterSetDescription description() const final {
+      edm::ParameterSetDescription d;
+      T::fillPSetDescription(d);
+      return d;
+    }
+  };
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/PluginDescriptionAdaptorBase.h b/FWCore/ParameterSet/interface/PluginDescriptionAdaptorBase.h
index 9aa085812e077..4da73298b5e4f 100644
--- a/FWCore/ParameterSet/interface/PluginDescriptionAdaptorBase.h
+++ b/FWCore/ParameterSet/interface/PluginDescriptionAdaptorBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/ParameterSet
 // Class  :     PluginDescriptionAdaptorBase
-// 
+//
 /**\class PluginDescriptionAdaptorBase PluginDescriptionAdaptorBase.h "PluginDescriptionAdaptorBase.h"
 
  Description: Base class for the adaptor used to call fillPSetDescription of a plugin
@@ -26,14 +26,13 @@
 // forward declarations
 
 namespace edm {
-template<typename T>
-class PluginDescriptionAdaptorBase
-{
-public:
-  virtual ~PluginDescriptionAdaptorBase() = default;
-  
-  // ---------- const member functions ---------------------
-  virtual edm::ParameterSetDescription description() const = 0;
-};
-}
+  template <typename T>
+  class PluginDescriptionAdaptorBase {
+  public:
+    virtual ~PluginDescriptionAdaptorBase() = default;
+
+    // ---------- const member functions ---------------------
+    virtual edm::ParameterSetDescription description() const = 0;
+  };
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/ProcessDesc.h b/FWCore/ParameterSet/interface/ProcessDesc.h
index 517fc64d2d875..0bd747c3ae747 100644
--- a/FWCore/ParameterSet/interface/ProcessDesc.h
+++ b/FWCore/ParameterSet/interface/ProcessDesc.h
@@ -12,7 +12,6 @@ namespace edm {
   class ParameterSet;
 
   class ProcessDesc {
-
   public:
     explicit ProcessDesc(std::shared_ptr<ParameterSet> pset);
     explicit ProcessDesc(std::unique_ptr<ParameterSet> pset);
@@ -23,12 +22,12 @@ namespace edm {
     ~ProcessDesc();
 
     /// get the parameter set
-    std::shared_ptr<ParameterSet const> getProcessPSet() const {return get_underlying_safe(pset_);}
-    std::shared_ptr<ParameterSet>& getProcessPSet() {return get_underlying_safe(pset_);}
+    std::shared_ptr<ParameterSet const> getProcessPSet() const { return get_underlying_safe(pset_); }
+    std::shared_ptr<ParameterSet>& getProcessPSet() { return get_underlying_safe(pset_); }
 
     /// get the descriptions of the services
-    auto const& getServicesPSets() const {return services_;}
-    auto& getServicesPSets() {return services_;}
+    auto const& getServicesPSets() const { return services_; }
+    auto& getServicesPSets() { return services_; }
 
     void addService(ParameterSet& pset);
     /// add a service as an empty pset
@@ -42,10 +41,11 @@ namespace edm {
                      std::vector<std::string> const& forcedServices = std::vector<std::string>());
 
     std::string dump() const;
+
   private:
     edm::propagate_const<std::shared_ptr<ParameterSet>> pset_;
     std::vector<ParameterSet> services_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ParameterSet/interface/Registry.h b/FWCore/ParameterSet/interface/Registry.h
index b8db78e3f8705..54462397c254c 100644
--- a/FWCore/ParameterSet/interface/Registry.h
+++ b/FWCore/ParameterSet/interface/Registry.h
@@ -26,7 +26,7 @@ namespace edm {
     class Registry {
     public:
       typedef edm::ParameterSetID key_type;
-      typedef edm::ParameterSet   value_type;
+      typedef edm::ParameterSet value_type;
 
       static Registry* instance();
 
@@ -55,28 +55,18 @@ namespace edm {
       void clear();
 
       struct key_hash {
-        std::size_t operator()(key_type const& iKey) const{
-          return iKey.smallHash();
-        }
+        std::size_t operator()(key_type const& iKey) const { return iKey.smallHash(); }
       };
-      typedef tbb::concurrent_unordered_map<key_type,value_type,key_hash> map_type;
+      typedef tbb::concurrent_unordered_map<key_type, value_type, key_hash> map_type;
       typedef map_type::const_iterator const_iterator;
 
-      const_iterator begin() const {
-        return m_map.begin();
-      }
+      const_iterator begin() const { return m_map.begin(); }
 
-      const_iterator end() const {
-        return m_map.end();
-      }
+      const_iterator end() const { return m_map.end(); }
 
-      bool empty() const {
-        return m_map.empty();
-      }
+      bool empty() const { return m_map.empty(); }
 
-      size_t size() const {
-        return m_map.size();
-      }
+      size_t size() const { return m_map.size(); }
 
       /// Fill the given map with the persistent form of each
       /// ParameterSet in the registry.
diff --git a/FWCore/ParameterSet/interface/VParameterSetEntry.h b/FWCore/ParameterSet/interface/VParameterSetEntry.h
index 4fa87604b55c6..4614fb219f9a2 100644
--- a/FWCore/ParameterSet/interface/VParameterSetEntry.h
+++ b/FWCore/ParameterSet/interface/VParameterSetEntry.h
@@ -35,9 +35,9 @@ namespace edm {
 
     std::string toString() const;
     void toString(std::string& result) const;
-    void toDigest(cms::Digest &digest) const;
+    void toDigest(cms::Digest& digest) const;
 
-    bool isTracked() const {return tracked_;}
+    bool isTracked() const { return tracked_; }
 
     /// returns the VPSet
     std::vector<ParameterSet> const& vpset() const;
@@ -54,10 +54,9 @@ namespace edm {
     friend std::ostream& operator<<(std::ostream& os, VParameterSetEntry const& vpsetEntry);
 
   private:
-
     bool tracked_;
     mutable atomic_value_ptr<std::vector<ParameterSet> > theVPSet_;
     value_ptr<std::vector<ParameterSetID> > theIDs_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/ValidatedPluginFactoryMacros.h b/FWCore/ParameterSet/interface/ValidatedPluginFactoryMacros.h
index a3ba88c0b48a0..338a1c700ed45 100644
--- a/FWCore/ParameterSet/interface/ValidatedPluginFactoryMacros.h
+++ b/FWCore/ParameterSet/interface/ValidatedPluginFactoryMacros.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/ParameterSet
 // Class  :     ValidatedPluginFactoryMacros
-// 
+//
 /**\class ValidatedPluginFactoryMacros ValidatedPluginFactoryMacros.h "ValidatedPluginFactoryMacros.h"
 
  Description: macros used to register a PluginFactory which uses ParameterSet validation
@@ -27,7 +27,8 @@
 #include "FWCore/ParameterSet/interface/PluginDescriptionAdaptorBase.h"
 #include "FWCore/PluginManager/interface/PluginFactory.h"
 
-#define EDM_REGISTER_VALIDATED_PLUGINFACTORY(_factory_,_category_) \
-EDM_REGISTER_PLUGINFACTORY(_factory_,_category_);\
-EDM_REGISTER_PLUGINFACTORY2(edmplugin::PluginFactory<edm::PluginDescriptionAdaptorBase<_factory_::CreatedType>*()>, "PluginDescriptor" _category_)
+#define EDM_REGISTER_VALIDATED_PLUGINFACTORY(_factory_, _category_)                                                   \
+  EDM_REGISTER_PLUGINFACTORY(_factory_, _category_);                                                                  \
+  EDM_REGISTER_PLUGINFACTORY2(edmplugin::PluginFactory<edm::PluginDescriptionAdaptorBase<_factory_::CreatedType>*()>, \
+                              "PluginDescriptor" _category_)
 #endif
diff --git a/FWCore/ParameterSet/interface/ValidatedPluginMacros.h b/FWCore/ParameterSet/interface/ValidatedPluginMacros.h
index 3fc6d31d074bd..4c33ee57805dd 100644
--- a/FWCore/ParameterSet/interface/ValidatedPluginMacros.h
+++ b/FWCore/ParameterSet/interface/ValidatedPluginMacros.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/ParameterSet
 // Class  :     ValidatedPluginMacros
-// 
+//
 /**\class ValidatedPluginMacros ValidatedPluginMacros.h "ValidatedPluginMacros.h"
 
  Description: Registration macros for plugins that use ParameterSet validation
@@ -25,9 +25,11 @@
 #include "FWCore/ParameterSet/interface/PluginDescriptionAdaptor.h"
 #include "FWCore/PluginManager/interface/PluginFactory.h"
 
-#define DEFINE_EDM_VALIDATED_PLUGIN(factory, type, name) \
-DEFINE_EDM_PLUGIN(factory, type, name); \
-using EDM_PLUGIN_SYM(adaptor_t,__LINE__) = edm::PluginDescriptionAdaptor<factory::CreatedType,type>; \
-DEFINE_EDM_PLUGIN2(edmplugin::PluginFactory<edm::PluginDescriptionAdaptorBase<factory::CreatedType>*()>, EDM_PLUGIN_SYM(adaptor_t,__LINE__), name)
+#define DEFINE_EDM_VALIDATED_PLUGIN(factory, type, name)                                                   \
+  DEFINE_EDM_PLUGIN(factory, type, name);                                                                  \
+  using EDM_PLUGIN_SYM(adaptor_t, __LINE__) = edm::PluginDescriptionAdaptor<factory::CreatedType, type>;   \
+  DEFINE_EDM_PLUGIN2(edmplugin::PluginFactory<edm::PluginDescriptionAdaptorBase<factory::CreatedType>*()>, \
+                     EDM_PLUGIN_SYM(adaptor_t, __LINE__),                                                  \
+                     name)
 
 #endif
diff --git a/FWCore/ParameterSet/interface/XORGroupDescription.h b/FWCore/ParameterSet/interface/XORGroupDescription.h
index ab49cf290e7d9..22434d3e88608 100644
--- a/FWCore/ParameterSet/interface/XORGroupDescription.h
+++ b/FWCore/ParameterSet/interface/XORGroupDescription.h
@@ -17,8 +17,7 @@ namespace edm {
 
   class XORGroupDescription : public ParameterDescriptionNode {
   public:
-    XORGroupDescription(ParameterDescriptionNode const& node_left,
-                        ParameterDescriptionNode const& node_right);
+    XORGroupDescription(ParameterDescriptionNode const& node_left, ParameterDescriptionNode const& node_right);
 
     XORGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
                         ParameterDescriptionNode const& node_right);
@@ -29,37 +28,22 @@ namespace edm {
     XORGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
                         std::unique_ptr<ParameterDescriptionNode> node_right);
 
-    ParameterDescriptionNode* clone() const override {
-      return new XORGroupDescription(*this);
-    }
+    ParameterDescriptionNode* clone() const override { return new XORGroupDescription(*this); }
 
   private:
+    void checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
+                                    std::set<ParameterTypes>& parameterTypes,
+                                    std::set<ParameterTypes>& wildcardTypes) const override;
 
-    void checkAndGetLabelsAndTypes_(std::set<std::string> & usedLabels,
-                                    std::set<ParameterTypes> & parameterTypes,
-                                    std::set<ParameterTypes> & wildcardTypes) const override;
-
-    void validate_(ParameterSet & pset,
-                   std::set<std::string> & validatedLabels,
-                   bool optional) const override;
+    void validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const override;
 
-    void writeCfi_(std::ostream & os,
-                   bool & startWithComma,
-                   int indentation,
-                   bool & wroteSomething) const override;
+    void writeCfi_(std::ostream& os, bool& startWithComma, int indentation, bool& wroteSomething) const override;
 
-    void print_(std::ostream & os,
-                bool optional,
-                bool writeToCfi,
-                DocFormatHelper & dfh) const override;
+    void print_(std::ostream& os, bool optional, bool writeToCfi, DocFormatHelper& dfh) const override;
 
-    bool hasNestedContent_() const override {
-      return true;
-    }
+    bool hasNestedContent_() const override { return true; }
 
-    void printNestedContent_(std::ostream & os,
-                             bool optional,
-                             DocFormatHelper & dfh) const override;
+    void printNestedContent_(std::ostream& os, bool optional, DocFormatHelper& dfh) const override;
 
     bool exists_(ParameterSet const& pset) const override;
 
@@ -73,5 +57,5 @@ namespace edm {
     edm::value_ptr<ParameterDescriptionNode> node_left_;
     edm::value_ptr<ParameterDescriptionNode> node_right_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/defaultModuleLabel.h b/FWCore/ParameterSet/interface/defaultModuleLabel.h
index 823e4b95e2d80..e98b76b156dd8 100644
--- a/FWCore/ParameterSet/interface/defaultModuleLabel.h
+++ b/FWCore/ParameterSet/interface/defaultModuleLabel.h
@@ -5,7 +5,7 @@
 #include <algorithm>
 
 namespace edm {
-  std::string defaultModuleLabel(std::string label) { // take by value because we'll copy it anyway
+  std::string defaultModuleLabel(std::string label) {  // take by value because we'll copy it anyway
     // remove all colons (module type may contain namespace)
     label.erase(std::remove(label.begin(), label.end(), ':'), label.end());
 
@@ -14,7 +14,7 @@ namespace edm {
     // if the label starts with more than one uppercase letter, change n-1 to lowercase
     // otherwise, change the first letter to lowercase
     unsigned int ups = 0;
-    for (char c: label)
+    for (char c : label)
       if (std::isupper(c))
         ++ups;
       else
@@ -26,6 +26,6 @@ namespace edm {
 
     return label;
   }
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ParameterSet/interface/getFixedSizeArray.h b/FWCore/ParameterSet/interface/getFixedSizeArray.h
index 8a2ee3a06c5ff..aee4f7a92d81d 100644
--- a/FWCore/ParameterSet/interface/getFixedSizeArray.h
+++ b/FWCore/ParameterSet/interface/getFixedSizeArray.h
@@ -12,19 +12,17 @@
 
 namespace edm {
 
-  template<class T, std::size_t N>
-  std::array<T, N>
-  getFixedSizeArray(ParameterSet const& pset, std::string const& name) {
+  template <class T, std::size_t N>
+  std::array<T, N> getFixedSizeArray(ParameterSet const& pset, std::string const& name) {
     std::vector<T> vec = pset.getParameter<std::vector<T>>(name);
     if (vec.size() != N) {
       throw Exception(errors::Configuration)
-        << "The parameter '" << name
-        << "' should have " << N << " elements, but has " << vec.size()
-        << " elements in the configuration.\n";
+          << "The parameter '" << name << "' should have " << N << " elements, but has " << vec.size()
+          << " elements in the configuration.\n";
     }
-    std::array<T, N> a {};
+    std::array<T, N> a{};
     std::copy_n(vec.begin(), N, a.begin());
     return a;
   }
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/interface/split.h b/FWCore/ParameterSet/interface/split.h
index 0a62665706c8c..0caf2f42c02c6 100644
--- a/FWCore/ParameterSet/interface/split.h
+++ b/FWCore/ParameterSet/interface/split.h
@@ -5,55 +5,41 @@
 // definition of split() and related templates
 // ----------------------------------------------------------------------
 
-
 // ----------------------------------------------------------------------
 // prolog
 
-
 // ----------------------------------------------------------------------
 // prerequisite source files and headers
 
 #include <string>
 
-
 // ----------------------------------------------------------------------
 // contents
 
-namespace edm  {
+namespace edm {
 
-  template< class FwdIter >
-  FwdIter
-    contextual_find(FwdIter b, FwdIter e
-                   , char first, char sep, char last);
+  template <class FwdIter>
+  FwdIter contextual_find(FwdIter b, FwdIter e, char first, char sep, char last);
 
-  template< class FwdIter >
-  FwdIter
-    contextual_find_not(FwdIter b, FwdIter e
-                       , char first, char sep, char last);
+  template <class FwdIter>
+  FwdIter contextual_find_not(FwdIter b, FwdIter e, char first, char sep, char last);
 
-  template< class OutIter >
-  bool
-    split(OutIter result
-         , std::string const& string_to_split
-         , char first, char sep, char last);
+  template <class OutIter>
+  bool split(OutIter result, std::string const& string_to_split, char first, char sep, char last);
 
 }  // namespace edm
 
-
 // ----------------------------------------------------------------------
 // contextual_find
 
-template< class FwdIter >
-FwdIter
-  edm::contextual_find(FwdIter b, FwdIter e
-                      , char first, char sep, char last)
-{
-  for(int  nested = 0;  b != e;  ++b)  {
-    if(*b == first)
+template <class FwdIter>
+FwdIter edm::contextual_find(FwdIter b, FwdIter e, char first, char sep, char last) {
+  for (int nested = 0; b != e; ++b) {
+    if (*b == first)
       ++nested;
-    else if(*b == last)
+    else if (*b == last)
       --nested;
-    else if(*b == sep  &&  nested == 0)
+    else if (*b == sep && nested == 0)
       return b;
   }
 
@@ -61,17 +47,13 @@ FwdIter
 
 }  // contextual_find()
 
-
 // ----------------------------------------------------------------------
 // contextual_find_not
 
-template< class FwdIter >
-FwdIter
-  edm::contextual_find_not(FwdIter b, FwdIter e
-                          , char /* first */ , char sep, char /* last */)
-{
-  for(;  b != e;  ++b)  {
-    if(*b != sep)
+template <class FwdIter>
+FwdIter edm::contextual_find_not(FwdIter b, FwdIter e, char /* first */, char sep, char /* last */) {
+  for (; b != e; ++b) {
+    if (*b != sep)
       return b;
   }
 
@@ -79,34 +61,33 @@ FwdIter
 
 }  // contextual_find_not()
 
-
 // ----------------------------------------------------------------------
 // split()
 
-template< class OutIter >
-bool
-  edm::split(OutIter dest, std::string const& s
-            , char first, char sep, char last)
-{
-  typedef  std::string::const_iterator  str_c_iter;
-  str_c_iter  b = s.begin()
-           ,  e = s.end();
+template <class OutIter>
+bool edm::split(OutIter dest, std::string const& s, char first, char sep, char last) {
+  typedef std::string::const_iterator str_c_iter;
+  str_c_iter b = s.begin(), e = s.end();
 
-  if(static_cast<unsigned int>(e - b) < 2u)  return false;
+  if (static_cast<unsigned int>(e - b) < 2u)
+    return false;
 
-  if(*b == first)  ++b;
-  else               return false;
+  if (*b == first)
+    ++b;
+  else
+    return false;
 
-  if(*--e != last)  return false;
+  if (*--e != last)
+    return false;
 
   // invariant:  we've found all items in [b..boi)
-  for(str_c_iter  //boi = std::find_if(b, e, is_not_a(sep))
-                   boi = contextual_find_not(b, e, first, sep, last)
-                ,  eoi
-     ; boi != e
-     //; boi = std::find_if(eoi, e, is_not_a(sep))
-     ; boi = contextual_find_not(eoi, e, first, sep, last))
-  {
+  for (str_c_iter  //boi = std::find_if(b, e, is_not_a(sep))
+           boi = contextual_find_not(b, e, first, sep, last),
+           eoi;
+       boi != e
+       //; boi = std::find_if(eoi, e, is_not_a(sep))
+       ;
+       boi = contextual_find_not(eoi, e, first, sep, last)) {
     // find end of current item:
     //eoi = std::find_if(boi, e, is_a(sep));
     eoi = contextual_find(boi, e, first, sep, last);
@@ -118,7 +99,6 @@ bool
   return true;
 }  // split< >()
 
-
 // ----------------------------------------------------------------------
 // epilog
 
diff --git a/FWCore/ParameterSet/interface/types.h b/FWCore/ParameterSet/interface/types.h
index 8b6437e5d1ae0..265b21cdff5ef 100644
--- a/FWCore/ParameterSet/interface/types.h
+++ b/FWCore/ParameterSet/interface/types.h
@@ -5,11 +5,9 @@
 // declaration of type encoding/decoding functions
 // ----------------------------------------------------------------------
 
-
 // ----------------------------------------------------------------------
 // prolog
 
-
 // ----------------------------------------------------------------------
 // prerequisite source files and headers
 
@@ -140,7 +138,7 @@ namespace edm {
   bool decode(std::vector<ParameterSet>&, std::string const&);
   bool encode(std::string&, std::vector<ParameterSet> const&);
 
-} // namespace edm
+}  // namespace edm
 
 // ----------------------------------------------------------------------
 // epilog
diff --git a/FWCore/ParameterSet/interface/validateTopLevelParameterSets.h b/FWCore/ParameterSet/interface/validateTopLevelParameterSets.h
index 1e7e65baad523..bf867fa4c1418 100644
--- a/FWCore/ParameterSet/interface/validateTopLevelParameterSets.h
+++ b/FWCore/ParameterSet/interface/validateTopLevelParameterSets.h
@@ -13,5 +13,5 @@ namespace edm {
   void fillMaxEventsDescription(ParameterSetDescription& description);
   void fillMaxLuminosityBlocksDescription(ParameterSetDescription& description);
   void fillMaxSecondsUntilRampdownDescription(ParameterSetDescription& description);
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ParameterSet/python/Config.py b/FWCore/ParameterSet/python/Config.py
index 06b8d518d1272..1dd894b13bedd 100644
--- a/FWCore/ParameterSet/python/Config.py
+++ b/FWCore/ParameterSet/python/Config.py
@@ -40,7 +40,7 @@ def checkImportPermission(minLevel = 2, allowedPatterns = []):
     import inspect
     import os
 
-    ignorePatterns = ['FWCore/ParameterSet/Config.py','<string>']
+    ignorePatterns = ['FWCore/ParameterSet/Config.py','<string>','<frozen ']
     CMSSWPath = [os.environ['CMSSW_BASE'],os.environ['CMSSW_RELEASE_BASE']]
 
     # Filter the stack to things in CMSSWPath and not in ignorePatterns
diff --git a/FWCore/ParameterSet/src/ANDGroupDescription.cc b/FWCore/ParameterSet/src/ANDGroupDescription.cc
index a50ecbd781f84..4825bb2b1a6d1 100644
--- a/FWCore/ParameterSet/src/ANDGroupDescription.cc
+++ b/FWCore/ParameterSet/src/ANDGroupDescription.cc
@@ -10,40 +10,25 @@
 
 namespace edm {
 
-  ANDGroupDescription::
-  ANDGroupDescription(ParameterDescriptionNode const& node_left,
-                      ParameterDescriptionNode const& node_right) :
-    node_left_(node_left.clone()),
-    node_right_(node_right.clone()) {
-  }
+  ANDGroupDescription::ANDGroupDescription(ParameterDescriptionNode const& node_left,
+                                           ParameterDescriptionNode const& node_right)
+      : node_left_(node_left.clone()), node_right_(node_right.clone()) {}
 
-  ANDGroupDescription::
-  ANDGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
-                      ParameterDescriptionNode const& node_right) :
-    node_left_(std::move(node_left)),
-    node_right_(node_right.clone()) {
-  }
+  ANDGroupDescription::ANDGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                           ParameterDescriptionNode const& node_right)
+      : node_left_(std::move(node_left)), node_right_(node_right.clone()) {}
 
-  ANDGroupDescription::
-  ANDGroupDescription(ParameterDescriptionNode const& node_left,
-                      std::unique_ptr<ParameterDescriptionNode> node_right) :
-    node_left_(node_left.clone()),
-    node_right_(std::move(node_right)) {
-  }
+  ANDGroupDescription::ANDGroupDescription(ParameterDescriptionNode const& node_left,
+                                           std::unique_ptr<ParameterDescriptionNode> node_right)
+      : node_left_(node_left.clone()), node_right_(std::move(node_right)) {}
 
-  ANDGroupDescription::
-  ANDGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
-                      std::unique_ptr<ParameterDescriptionNode> node_right) :
-    node_left_(std::move(node_left)),
-    node_right_(std::move(node_right)) {
-  }
-
-  void
-  ANDGroupDescription::
-  checkAndGetLabelsAndTypes_(std::set<std::string> & usedLabels,
-                             std::set<ParameterTypes> & parameterTypes,
-                             std::set<ParameterTypes> & wildcardTypes) const {
+  ANDGroupDescription::ANDGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                           std::unique_ptr<ParameterDescriptionNode> node_right)
+      : node_left_(std::move(node_left)), node_right_(std::move(node_right)) {}
 
+  void ANDGroupDescription::checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
+                                                       std::set<ParameterTypes>& parameterTypes,
+                                                       std::set<ParameterTypes>& wildcardTypes) const {
     std::set<std::string> labelsLeft;
     std::set<ParameterTypes> parameterTypesLeft;
     std::set<ParameterTypes> wildcardTypesLeft;
@@ -68,34 +53,22 @@ namespace edm {
     wildcardTypes.insert(wildcardTypesLeft.begin(), wildcardTypesLeft.end());
   }
 
-  void
-  ANDGroupDescription::
-  validate_(ParameterSet & pset,
-            std::set<std::string> & validatedLabels,
-            bool optional) const {
+  void ANDGroupDescription::validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const {
     if (partiallyExists(pset) || !optional) {
       node_left_->validate(pset, validatedLabels, false);
       node_right_->validate(pset, validatedLabels, false);
     }
   }
 
-  void
-  ANDGroupDescription::
-  writeCfi_(std::ostream & os,
-            bool & startWithComma,
-            int indentation,
-            bool & wroteSomething) const {
+  void ANDGroupDescription::writeCfi_(std::ostream& os,
+                                      bool& startWithComma,
+                                      int indentation,
+                                      bool& wroteSomething) const {
     node_left_->writeCfi(os, startWithComma, indentation, wroteSomething);
     node_right_->writeCfi(os, startWithComma, indentation, wroteSomething);
   }
 
-  void
-  ANDGroupDescription::
-  print_(std::ostream & os,
-         bool optional,
-         bool writeToCfi,
-         DocFormatHelper & dfh) const {
-
+  void ANDGroupDescription::print_(std::ostream& os, bool optional, bool writeToCfi, DocFormatHelper& dfh) const {
     if (dfh.parent() == DocFormatHelper::AND) {
       dfh.decrementCounter();
       node_left_->print(os, false, true, dfh);
@@ -104,26 +77,27 @@ namespace edm {
     }
 
     if (dfh.pass() == 1) {
-
       dfh.indent(os);
       os << "AND group:";
 
       if (dfh.brief()) {
+        if (optional)
+          os << " optional";
 
-        if (optional)  os << " optional";
-
-        if (!writeToCfi) os << " (do not write to cfi)";
+        if (!writeToCfi)
+          os << " (do not write to cfi)";
 
         os << " see Section " << dfh.section() << "." << dfh.counter() << "\n";
       }
       // not brief
       else {
-
         os << "\n";
         dfh.indent2(os);
 
-        if (optional)  os << "optional";
-        if (!writeToCfi) os << " (do not write to cfi)";
+        if (optional)
+          os << "optional";
+        if (!writeToCfi)
+          os << " (do not write to cfi)";
         if (optional || !writeToCfi) {
           os << "\n";
           dfh.indent2(os);
@@ -132,22 +106,14 @@ namespace edm {
         os << "see Section " << dfh.section() << "." << dfh.counter() << "\n";
 
         if (!comment().empty()) {
-          DocFormatHelper::wrapAndPrintText(os,
-                                            comment(),
-                                            dfh.startColumn2(),
-                                            dfh.commentWidth());
+          DocFormatHelper::wrapAndPrintText(os, comment(), dfh.startColumn2(), dfh.commentWidth());
         }
         os << "\n";
       }
     }
   }
 
-  void
-  ANDGroupDescription::
-  printNestedContent_(std::ostream & os,
-                      bool optional,
-                      DocFormatHelper & dfh) const {
-
+  void ANDGroupDescription::printNestedContent_(std::ostream& os, bool optional, DocFormatHelper& dfh) const {
     if (dfh.parent() == DocFormatHelper::AND) {
       dfh.decrementCounter();
       node_left_->printNestedContent(os, false, dfh);
@@ -165,16 +131,15 @@ namespace edm {
     std::string newSection = ss.str();
 
     printSpaces(os, indentation);
-    os << "Section " << newSection
-       << " AND group description:\n";
+    os << "Section " << newSection << " AND group description:\n";
     printSpaces(os, indentation);
     if (optional) {
       os << "This optional AND group requires all or none of the following to be in the PSet\n";
-    }
-    else {
+    } else {
       os << "This AND group requires all of the following to be in the PSet\n";
     }
-    if (!dfh.brief()) os << "\n";
+    if (!dfh.brief())
+      os << "\n";
 
     DocFormatHelper new_dfh(dfh);
     new_dfh.init();
@@ -198,77 +163,54 @@ namespace edm {
     node_right_->printNestedContent(os, false, new_dfh);
   }
 
-  bool
-  ANDGroupDescription::
-  exists_(ParameterSet const& pset) const {
+  bool ANDGroupDescription::exists_(ParameterSet const& pset) const {
     return node_left_->exists(pset) && node_right_->exists(pset);
   }
 
-  bool
-  ANDGroupDescription::
-  partiallyExists_(ParameterSet const& pset) const {
+  bool ANDGroupDescription::partiallyExists_(ParameterSet const& pset) const {
     return node_left_->partiallyExists(pset) || node_right_->partiallyExists(pset);
   }
 
-  int
-  ANDGroupDescription::
-  howManyXORSubNodesExist_(ParameterSet const& pset) const {
-    return exists(pset) ? 1 : 0; 
-  }
-
-  void
-  ANDGroupDescription::
-  throwIfDuplicateLabels(std::set<std::string> const& labelsLeft,
-                         std::set<std::string> const& labelsRight) const {
+  int ANDGroupDescription::howManyXORSubNodesExist_(ParameterSet const& pset) const { return exists(pset) ? 1 : 0; }
 
+  void ANDGroupDescription::throwIfDuplicateLabels(std::set<std::string> const& labelsLeft,
+                                                   std::set<std::string> const& labelsRight) const {
     std::set<std::string> duplicateLabels;
     std::insert_iterator<std::set<std::string> > insertIter(duplicateLabels, duplicateLabels.begin());
-    std::set_intersection(labelsLeft.begin(), labelsLeft.end(),
-                          labelsRight.begin(), labelsRight.end(),
-                          insertIter);
+    std::set_intersection(labelsLeft.begin(), labelsLeft.end(), labelsRight.begin(), labelsRight.end(), insertIter);
     if (!duplicateLabels.empty()) {
       std::stringstream ss;
-      for (std::set<std::string>::const_iterator iter = duplicateLabels.begin(),
-	                                         iEnd = duplicateLabels.end();
+      for (std::set<std::string>::const_iterator iter = duplicateLabels.begin(), iEnd = duplicateLabels.end();
            iter != iEnd;
            ++iter) {
-        ss << " \"" << *iter <<  "\"\n";
+        ss << " \"" << *iter << "\"\n";
       }
-      throw edm::Exception(errors::LogicError)
-        << "Labels used in different nodes of a ParameterSetDescription\n"
-        << "\"and\" expression must be unique.  The following duplicate\n"
-        << "labels were detected:\n"
-        << ss.str()
-        << "\n";
+      throw edm::Exception(errors::LogicError) << "Labels used in different nodes of a ParameterSetDescription\n"
+                                               << "\"and\" expression must be unique.  The following duplicate\n"
+                                               << "labels were detected:\n"
+                                               << ss.str() << "\n";
     }
   }
 
-  void
-  ANDGroupDescription::
-  throwIfDuplicateTypes(std::set<ParameterTypes> const& types1,
-                        std::set<ParameterTypes> const& types2) const
-  {
+  void ANDGroupDescription::throwIfDuplicateTypes(std::set<ParameterTypes> const& types1,
+                                                  std::set<ParameterTypes> const& types2) const {
     if (!types1.empty()) {
       std::set<ParameterTypes> duplicateTypes;
       std::insert_iterator<std::set<ParameterTypes> > insertIter(duplicateTypes, duplicateTypes.begin());
-      std::set_intersection(types1.begin(), types1.end(),
-                            types2.begin(), types2.end(),
-                            insertIter);
+      std::set_intersection(types1.begin(), types1.end(), types2.begin(), types2.end(), insertIter);
       if (!duplicateTypes.empty()) {
         std::stringstream ss;
-        for (std::set<ParameterTypes>::const_iterator iter = duplicateTypes.begin(),
-	                                              iEnd = duplicateTypes.end();
+        for (std::set<ParameterTypes>::const_iterator iter = duplicateTypes.begin(), iEnd = duplicateTypes.end();
              iter != iEnd;
              ++iter) {
-          ss << " \"" << parameterTypeEnumToString(*iter) <<  "\"\n";
+          ss << " \"" << parameterTypeEnumToString(*iter) << "\"\n";
         }
         throw edm::Exception(errors::LogicError)
-          << "Types used for wildcards in different nodes of a ParameterSetDescription\n"
-          << "\"and\" expression must be different from types used for other parameters.\n"
-          << "The following duplicate types were detected:\n"
-          << ss.str()
-          << "\n";
+            << "Types used for wildcards in different nodes of a ParameterSetDescription\n"
+            << "\"and\" expression must be different from types used for other parameters.\n"
+            << "The following duplicate types were detected:\n"
+            << ss.str() << "\n";
       }
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/AllowedLabelsDescription.cc b/FWCore/ParameterSet/src/AllowedLabelsDescription.cc
index 059e37fd7e533..4996fa516af50 100644
--- a/FWCore/ParameterSet/src/AllowedLabelsDescription.cc
+++ b/FWCore/ParameterSet/src/AllowedLabelsDescription.cc
@@ -7,56 +7,31 @@
 
 namespace edm {
 
-  AllowedLabelsDescription<ParameterSetDescription>::
-  AllowedLabelsDescription(std::string const& label,
-                           bool isTracked) :
-    AllowedLabelsDescriptionBase(label, k_PSet, isTracked),
-    psetDesc_()
-  {              
-  }
+  AllowedLabelsDescription<ParameterSetDescription>::AllowedLabelsDescription(std::string const& label, bool isTracked)
+      : AllowedLabelsDescriptionBase(label, k_PSet, isTracked), psetDesc_() {}
 
-  AllowedLabelsDescription<ParameterSetDescription>::
-  AllowedLabelsDescription(char const* label,
-                           bool isTracked) :
-    AllowedLabelsDescriptionBase(label, k_PSet, isTracked),
-    psetDesc_()
-  {
-  }
+  AllowedLabelsDescription<ParameterSetDescription>::AllowedLabelsDescription(char const* label, bool isTracked)
+      : AllowedLabelsDescriptionBase(label, k_PSet, isTracked), psetDesc_() {}
 
-  AllowedLabelsDescription<ParameterSetDescription>::
-  AllowedLabelsDescription(std::string const& label,
-                           ParameterSetDescription const& value,
-                           bool isTracked) :
-    AllowedLabelsDescriptionBase(label, k_PSet, isTracked),
-    psetDesc_(new ParameterSetDescription(value))
-  {              
-  }
+  AllowedLabelsDescription<ParameterSetDescription>::AllowedLabelsDescription(std::string const& label,
+                                                                              ParameterSetDescription const& value,
+                                                                              bool isTracked)
+      : AllowedLabelsDescriptionBase(label, k_PSet, isTracked), psetDesc_(new ParameterSetDescription(value)) {}
 
-  AllowedLabelsDescription<ParameterSetDescription>::
-  AllowedLabelsDescription(char const* label,
-                           ParameterSetDescription const& value,
-                           bool isTracked) :
-    AllowedLabelsDescriptionBase(label, k_PSet, isTracked),
-    psetDesc_(new ParameterSetDescription(value))
-  {
-  }
+  AllowedLabelsDescription<ParameterSetDescription>::AllowedLabelsDescription(char const* label,
+                                                                              ParameterSetDescription const& value,
+                                                                              bool isTracked)
+      : AllowedLabelsDescriptionBase(label, k_PSet, isTracked), psetDesc_(new ParameterSetDescription(value)) {}
 
-  AllowedLabelsDescription<ParameterSetDescription>::~AllowedLabelsDescription()
-  {
-  }
+  AllowedLabelsDescription<ParameterSetDescription>::~AllowedLabelsDescription() {}
 
-  ParameterDescriptionNode*
-  AllowedLabelsDescription<ParameterSetDescription>::
-  clone() const {
+  ParameterDescriptionNode* AllowedLabelsDescription<ParameterSetDescription>::clone() const {
     return new AllowedLabelsDescription(*this);
   }
 
-  void
-  AllowedLabelsDescription<ParameterSetDescription>::
-  printNestedContent_(std::ostream & os,
-                      bool optional,
-                      DocFormatHelper & dfh) const {
-
+  void AllowedLabelsDescription<ParameterSetDescription>::printNestedContent_(std::ostream& os,
+                                                                              bool optional,
+                                                                              DocFormatHelper& dfh) const {
     printNestedContentBase_(os, optional, dfh);
 
     int indentation = dfh.indentation();
@@ -70,17 +45,17 @@ namespace edm {
 
     if (dfh.brief()) {
       printSpaces(os, indentation + DocFormatHelper::offsetSectionContent());
-    }
-    else {
+    } else {
       dfh.indent2(os);
     }
     os << "see Section " << newSection << "\n";
-    if (!dfh.brief()) os << "\n";
+    if (!dfh.brief())
+      os << "\n";
 
     printSpaces(os, indentation);
-    os << "Section " << newSection
-       << " PSet description:\n";
-    if (!dfh.brief()) os << "\n";
+    os << "Section " << newSection << " PSet description:\n";
+    if (!dfh.brief())
+      os << "\n";
 
     DocFormatHelper new_dfh(dfh);
     new_dfh.setSection(newSection);
@@ -90,72 +65,45 @@ namespace edm {
     psetDesc_->print(os, new_dfh);
   }
 
-  void
-  AllowedLabelsDescription<ParameterSetDescription>::
-  validateAllowedLabel_(std::string const& allowedLabel,
-                        ParameterSet & pset,
-                        std::set<std::string> & validatedLabels) const {
+  void AllowedLabelsDescription<ParameterSetDescription>::validateAllowedLabel_(
+      std::string const& allowedLabel, ParameterSet& pset, std::set<std::string>& validatedLabels) const {
     if (pset.existsAs<ParameterSet>(allowedLabel, isTracked())) {
       validatedLabels.insert(allowedLabel);
       if (psetDesc_) {
-        ParameterSet * containedPSet = pset.getPSetForUpdate(allowedLabel);
+        ParameterSet* containedPSet = pset.getPSetForUpdate(allowedLabel);
         psetDesc_->validate(*containedPSet);
       }
     }
   }
 
-// -----------------------------------------------------------------------
+  // -----------------------------------------------------------------------
 
-  AllowedLabelsDescription<std::vector<ParameterSet> >::
-  AllowedLabelsDescription(std::string const& label,
-                           bool isTracked) :
-    AllowedLabelsDescriptionBase(label, k_VPSet, isTracked),
-    psetDesc_()
-  {              
-  }
+  AllowedLabelsDescription<std::vector<ParameterSet> >::AllowedLabelsDescription(std::string const& label,
+                                                                                 bool isTracked)
+      : AllowedLabelsDescriptionBase(label, k_VPSet, isTracked), psetDesc_() {}
 
-  AllowedLabelsDescription<std::vector<ParameterSet> >::
-  AllowedLabelsDescription(char const* label,
-                           bool isTracked) :
-    AllowedLabelsDescriptionBase(label, k_VPSet, isTracked),
-    psetDesc_()
-  {
-  }
+  AllowedLabelsDescription<std::vector<ParameterSet> >::AllowedLabelsDescription(char const* label, bool isTracked)
+      : AllowedLabelsDescriptionBase(label, k_VPSet, isTracked), psetDesc_() {}
 
-  AllowedLabelsDescription<std::vector<ParameterSet> >::
-  AllowedLabelsDescription(std::string const& label,
-                           ParameterSetDescription const& value,
-                           bool isTracked) :
-    AllowedLabelsDescriptionBase(label, k_VPSet, isTracked),
-    psetDesc_(new ParameterSetDescription(value))
-  {
-  }
+  AllowedLabelsDescription<std::vector<ParameterSet> >::AllowedLabelsDescription(std::string const& label,
+                                                                                 ParameterSetDescription const& value,
+                                                                                 bool isTracked)
+      : AllowedLabelsDescriptionBase(label, k_VPSet, isTracked), psetDesc_(new ParameterSetDescription(value)) {}
 
-  AllowedLabelsDescription<std::vector<ParameterSet> >::
-  AllowedLabelsDescription(char const* label,
-                           ParameterSetDescription const& value,
-                           bool isTracked) :
-    AllowedLabelsDescriptionBase(label, k_VPSet, isTracked),
-    psetDesc_(new ParameterSetDescription(value))
-  {
-  }
+  AllowedLabelsDescription<std::vector<ParameterSet> >::AllowedLabelsDescription(char const* label,
+                                                                                 ParameterSetDescription const& value,
+                                                                                 bool isTracked)
+      : AllowedLabelsDescriptionBase(label, k_VPSet, isTracked), psetDesc_(new ParameterSetDescription(value)) {}
 
-  AllowedLabelsDescription<std::vector<ParameterSet> >::~AllowedLabelsDescription()
-  {
-  }
+  AllowedLabelsDescription<std::vector<ParameterSet> >::~AllowedLabelsDescription() {}
 
-  ParameterDescriptionNode*
-  AllowedLabelsDescription<std::vector<ParameterSet> >::
-  clone() const {
+  ParameterDescriptionNode* AllowedLabelsDescription<std::vector<ParameterSet> >::clone() const {
     return new AllowedLabelsDescription(*this);
   }
 
-  void
-  AllowedLabelsDescription<std::vector<ParameterSet> >::
-  printNestedContent_(std::ostream & os,
-                      bool optional,
-                      DocFormatHelper & dfh) const {
-
+  void AllowedLabelsDescription<std::vector<ParameterSet> >::printNestedContent_(std::ostream& os,
+                                                                                 bool optional,
+                                                                                 DocFormatHelper& dfh) const {
     printNestedContentBase_(os, optional, dfh);
 
     int indentation = dfh.indentation();
@@ -169,17 +117,17 @@ namespace edm {
 
     if (dfh.brief()) {
       printSpaces(os, indentation + DocFormatHelper::offsetSectionContent());
-    }
-    else {
+    } else {
       dfh.indent2(os);
     }
     os << "see Section " << newSection << "\n";
-    if (!dfh.brief()) os << "\n";
+    if (!dfh.brief())
+      os << "\n";
 
     printSpaces(os, indentation);
-    os << "Section " << newSection
-       << " PSet description used to validate all elements of VPSet's:\n";
-    if (!dfh.brief()) os << "\n";
+    os << "Section " << newSection << " PSet description used to validate all elements of VPSet's:\n";
+    if (!dfh.brief())
+      os << "\n";
 
     DocFormatHelper new_dfh(dfh);
     new_dfh.setSection(newSection);
@@ -189,16 +137,13 @@ namespace edm {
     psetDesc_->print(os, new_dfh);
   }
 
-  void
-  AllowedLabelsDescription<std::vector<ParameterSet> >::
-  validateAllowedLabel_(std::string const& allowedLabel,
-                        ParameterSet & pset,
-                        std::set<std::string> & validatedLabels) const {
+  void AllowedLabelsDescription<std::vector<ParameterSet> >::validateAllowedLabel_(
+      std::string const& allowedLabel, ParameterSet& pset, std::set<std::string>& validatedLabels) const {
     if (pset.existsAs<std::vector<ParameterSet> >(allowedLabel, isTracked())) {
       validatedLabels.insert(allowedLabel);
 
       if (psetDesc_) {
-        VParameterSetEntry * vpsetEntry = pset.getPSetVectorForUpdate(allowedLabel);
+        VParameterSetEntry* vpsetEntry = pset.getPSetVectorForUpdate(allowedLabel);
         assert(vpsetEntry);
         for (unsigned i = 0; i < vpsetEntry->size(); ++i) {
           psetDesc_->validate(vpsetEntry->psetInVector(i));
@@ -206,4 +151,4 @@ namespace edm {
       }
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/AllowedLabelsDescriptionBase.cc b/FWCore/ParameterSet/src/AllowedLabelsDescriptionBase.cc
index 1f97fa2a68dae..7e95dc0ffd35e 100644
--- a/FWCore/ParameterSet/src/AllowedLabelsDescriptionBase.cc
+++ b/FWCore/ParameterSet/src/AllowedLabelsDescriptionBase.cc
@@ -10,92 +10,75 @@
 
 namespace edm {
 
-  AllowedLabelsDescriptionBase::~AllowedLabelsDescriptionBase() { }
+  AllowedLabelsDescriptionBase::~AllowedLabelsDescriptionBase() {}
 
-  AllowedLabelsDescriptionBase::
-  AllowedLabelsDescriptionBase(std::string const& label, ParameterTypes iType, bool isTracked):
-    parameterHoldingLabels_(label, std::vector<std::string>(), isTracked),
-    type_(iType),
-    isTracked_(isTracked) {
-  }
-
-  AllowedLabelsDescriptionBase::
-  AllowedLabelsDescriptionBase(char const* label, ParameterTypes iType, bool isTracked):
-    parameterHoldingLabels_(label, std::vector<std::string>(), isTracked),
-    type_(iType),
-    isTracked_(isTracked) {
-  }
+  AllowedLabelsDescriptionBase::AllowedLabelsDescriptionBase(std::string const& label,
+                                                             ParameterTypes iType,
+                                                             bool isTracked)
+      : parameterHoldingLabels_(label, std::vector<std::string>(), isTracked), type_(iType), isTracked_(isTracked) {}
 
+  AllowedLabelsDescriptionBase::AllowedLabelsDescriptionBase(char const* label, ParameterTypes iType, bool isTracked)
+      : parameterHoldingLabels_(label, std::vector<std::string>(), isTracked), type_(iType), isTracked_(isTracked) {}
 
-  void
-  AllowedLabelsDescriptionBase::
-  checkAndGetLabelsAndTypes_(std::set<std::string> & usedLabels,
-                             std::set<ParameterTypes> & parameterTypes,
-                             std::set<ParameterTypes> & wildcardTypes) const {
-
+  void AllowedLabelsDescriptionBase::checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
+                                                                std::set<ParameterTypes>& parameterTypes,
+                                                                std::set<ParameterTypes>& wildcardTypes) const {
     parameterHoldingLabels_.checkAndGetLabelsAndTypes(usedLabels, parameterTypes, wildcardTypes);
   }
 
-  void
-  AllowedLabelsDescriptionBase::
-  validate_(ParameterSet & pset,
-            std::set<std::string> & validatedLabels,
-            bool optional) const {
-
+  void AllowedLabelsDescriptionBase::validate_(ParameterSet& pset,
+                                               std::set<std::string>& validatedLabels,
+                                               bool optional) const {
     parameterHoldingLabels_.validate(pset, validatedLabels, optional);
     if (parameterHoldingLabels_.exists(pset)) {
       std::vector<std::string> allowedLabels;
       if (isTracked()) {
         allowedLabels = pset.getParameter<std::vector<std::string> >(parameterHoldingLabels_.label());
-      }
-      else {
+      } else {
         allowedLabels = pset.getUntrackedParameter<std::vector<std::string> >(parameterHoldingLabels_.label());
       }
-      for_all(allowedLabels, std::bind(&AllowedLabelsDescriptionBase::validateAllowedLabel_,
-                                         this,
-                                         std::placeholders::_1,
-                                         std::ref(pset),
-                                         std::ref(validatedLabels)));
+      for_all(allowedLabels,
+              std::bind(&AllowedLabelsDescriptionBase::validateAllowedLabel_,
+                        this,
+                        std::placeholders::_1,
+                        std::ref(pset),
+                        std::ref(validatedLabels)));
     }
   }
 
-  void
-  AllowedLabelsDescriptionBase::
-  writeCfi_(std::ostream & os,
-            bool & startWithComma,
-            int indentation,
-            bool & wroteSomething) const {
+  void AllowedLabelsDescriptionBase::writeCfi_(std::ostream& os,
+                                               bool& startWithComma,
+                                               int indentation,
+                                               bool& wroteSomething) const {
     parameterHoldingLabels_.writeCfi(os, startWithComma, indentation, wroteSomething);
   }
 
-  void
-  AllowedLabelsDescriptionBase::
-  print_(std::ostream & os,
-         bool optional,
-	 bool writeToCfi,
-         DocFormatHelper & dfh) const
-  {
+  void AllowedLabelsDescriptionBase::print_(std::ostream& os,
+                                            bool optional,
+                                            bool writeToCfi,
+                                            DocFormatHelper& dfh) const {
     if (dfh.pass() == 1) {
-
       dfh.indent(os);
       os << parameterHoldingLabels_.label() << " (list of allowed labels)";
 
       if (dfh.brief()) {
+        if (optional)
+          os << " optional";
 
-        if (optional)  os << " optional";
-
-        if (!writeToCfi) os << " (do not write to cfi)";
+        if (!writeToCfi)
+          os << " (do not write to cfi)";
 
         os << " see Section " << dfh.section() << "." << dfh.counter() << "\n";
       }
       // not brief
       else {
-
         os << "\n";
         dfh.indent2(os);
 
-        if (optional)  os << "optional";
-        if (!writeToCfi) os << " (do not write to cfi)";
+        if (optional)
+          os << "optional";
+        if (!writeToCfi)
+          os << " (do not write to cfi)";
         if (optional || !writeToCfi) {
           os << "\n";
           dfh.indent2(os);
@@ -104,52 +87,38 @@ namespace edm {
         os << "see Section " << dfh.section() << "." << dfh.counter() << "\n";
 
         if (!comment().empty()) {
-          DocFormatHelper::wrapAndPrintText(os,
-                                            comment(),
-                                            dfh.startColumn2(),
-                                            dfh.commentWidth());
+          DocFormatHelper::wrapAndPrintText(os, comment(), dfh.startColumn2(), dfh.commentWidth());
         }
         os << "\n";
       }
     }
   }
 
-  bool
-  AllowedLabelsDescriptionBase::
-  hasNestedContent_() const {
-    return true;
-  }
-
+  bool AllowedLabelsDescriptionBase::hasNestedContent_() const { return true; }
 
-  void
-  AllowedLabelsDescriptionBase::
-  printNestedContent_(std::ostream & os,
-                      bool optional,
-                      DocFormatHelper & dfh) const {
+  void AllowedLabelsDescriptionBase::printNestedContent_(std::ostream& os, bool optional, DocFormatHelper& dfh) const {
     printNestedContentBase_(os, optional, dfh);
-    if (!dfh.brief()) os << "\n";
+    if (!dfh.brief())
+      os << "\n";
   }
 
-  void
-  AllowedLabelsDescriptionBase::
-  printNestedContentBase_(std::ostream & os,
-                          bool optional,
-                          DocFormatHelper & dfh) const {
-
+  void AllowedLabelsDescriptionBase::printNestedContentBase_(std::ostream& os,
+                                                             bool optional,
+                                                             DocFormatHelper& dfh) const {
     int indentation = dfh.indentation();
     if (dfh.parent() != DocFormatHelper::TOP) {
       indentation -= DocFormatHelper::offsetSectionContent();
     }
 
     printSpaces(os, indentation);
-    os << "Section " << dfh.section() << "." << dfh.counter()
-       << " " << parameterHoldingLabels_.label()
+    os << "Section " << dfh.section() << "." << dfh.counter() << " " << parameterHoldingLabels_.label()
        << " - allowed labels description\n";
     printSpaces(os, indentation);
     os << "The following parameter contains a list of parameter labels\n";
     printSpaces(os, indentation);
     os << "which are allowed to be in the PSet\n";
-    if (!dfh.brief()) os << "\n";
+    if (!dfh.brief())
+      os << "\n";
 
     DocFormatHelper new_dfh(dfh);
     new_dfh.init();
@@ -157,30 +126,24 @@ namespace edm {
     parameterHoldingLabels_.print(os, optional, true, new_dfh);
     dfh.indent(os);
     os << "type of allowed parameters:";
-    if (dfh.brief()) os << " ";
+    if (dfh.brief())
+      os << " ";
     else {
       os << "\n";
       dfh.indent2(os);
-    } 
-    if (!isTracked()) os << "untracked ";
+    }
+    if (!isTracked())
+      os << "untracked ";
     os << parameterTypeEnumToString(type()) << "\n";
   }
 
-  bool
-  AllowedLabelsDescriptionBase::
-  exists_(ParameterSet const& pset) const {
+  bool AllowedLabelsDescriptionBase::exists_(ParameterSet const& pset) const {
     return parameterHoldingLabels_.exists(pset);
   }
 
-  bool
-  AllowedLabelsDescriptionBase::
-  partiallyExists_(ParameterSet const& pset) const {
-    return exists(pset);
-  }
+  bool AllowedLabelsDescriptionBase::partiallyExists_(ParameterSet const& pset) const { return exists(pset); }
 
-  int
-  AllowedLabelsDescriptionBase::
-  howManyXORSubNodesExist_(ParameterSet const& pset) const {
+  int AllowedLabelsDescriptionBase::howManyXORSubNodesExist_(ParameterSet const& pset) const {
     return exists(pset) ? 1 : 0;
   }
-}
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/ConfigurationDescriptions.cc b/FWCore/ParameterSet/src/ConfigurationDescriptions.cc
index 7c66e1ea0cef3..8d9d5e98a0b8b 100644
--- a/FWCore/ParameterSet/src/ConfigurationDescriptions.cc
+++ b/FWCore/ParameterSet/src/ConfigurationDescriptions.cc
@@ -2,7 +2,7 @@
 //
 // Package:     ParameterSet
 // Class  :     ConfigurationDescriptions
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -32,126 +32,97 @@ namespace {
       psetDesc = &thePair.second;
     }
   }
-}         
+}  // namespace
 
-static const char* const kSource ="Source";
+static const char* const kSource = "Source";
 static const char* const kService = "Service";
 static const char* const k_source = "source";
 
 namespace edm {
 
-  ConfigurationDescriptions::ConfigurationDescriptions(std::string const& baseType, std::string const& pluginName) :
-    baseType_(baseType),
-    pluginName_(pluginName),
-    defaultDescDefined_(false)
-  { }
+  ConfigurationDescriptions::ConfigurationDescriptions(std::string const& baseType, std::string const& pluginName)
+      : baseType_(baseType), pluginName_(pluginName), defaultDescDefined_(false) {}
 
-  ConfigurationDescriptions::~ConfigurationDescriptions() {} 
+  ConfigurationDescriptions::~ConfigurationDescriptions() {}
 
-  void
-  ConfigurationDescriptions::setComment(std::string const & value)
-  { comment_ = value; }
+  void ConfigurationDescriptions::setComment(std::string const& value) { comment_ = value; }
 
-  void
-  ConfigurationDescriptions::setComment(char const* value)
-  { comment_ = value; }
+  void ConfigurationDescriptions::setComment(char const* value) { comment_ = value; }
 
-  void
-  ConfigurationDescriptions::add(char const* label,
-                                 ParameterSetDescription const& psetDescription) {
+  void ConfigurationDescriptions::add(char const* label, ParameterSetDescription const& psetDescription) {
     std::string labelString(label);
     add(labelString, psetDescription);
   }
 
-  void
-  ConfigurationDescriptions::add(std::string const& label,
-                                 ParameterSetDescription const& psetDescription) {
-
-    if (0==strcmp(baseType_.c_str(),kSource)) {
-      if (0!=strcmp(label.c_str(),k_source)) {
+  void ConfigurationDescriptions::add(std::string const& label, ParameterSetDescription const& psetDescription) {
+    if (0 == strcmp(baseType_.c_str(), kSource)) {
+      if (0 != strcmp(label.c_str(), k_source)) {
         throw edm::Exception(edm::errors::LogicError,
-          "ConfigurationDescriptions::add, when adding a ParameterSetDescription for a source the label must be \"source\"\n");
+                             "ConfigurationDescriptions::add, when adding a ParameterSetDescription for a source the "
+                             "label must be \"source\"\n");
       }
-      if (!descriptions_.empty() ||
-          defaultDescDefined_ == true) {
-        throw edm::Exception(edm::errors::LogicError,
-          "ConfigurationDescriptions::add, for a source only 1 ParameterSetDescription may be added\n");
+      if (!descriptions_.empty() || defaultDescDefined_ == true) {
+        throw edm::Exception(
+            edm::errors::LogicError,
+            "ConfigurationDescriptions::add, for a source only 1 ParameterSetDescription may be added\n");
       }
-    }
-    else if (0==strcmp(baseType_.c_str(),kService)) {
-      if (!descriptions_.empty() ||
-          defaultDescDefined_ == true) {
-        throw edm::Exception(edm::errors::LogicError,
-          "ConfigurationDescriptions::add, for a service only 1 ParameterSetDescription may be added\n");
+    } else if (0 == strcmp(baseType_.c_str(), kService)) {
+      if (!descriptions_.empty() || defaultDescDefined_ == true) {
+        throw edm::Exception(
+            edm::errors::LogicError,
+            "ConfigurationDescriptions::add, for a service only 1 ParameterSetDescription may be added\n");
       }
     }
-    
+
     // To minimize the number of copies involved create an empty description first
     // and push it into the vector.  Then perform the copy.
     std::pair<std::string, ParameterSetDescription> pairWithEmptyDescription;
     descriptions_.push_back(pairWithEmptyDescription);
-    std::pair<std::string, ParameterSetDescription> & pair = descriptions_.back();
+    std::pair<std::string, ParameterSetDescription>& pair = descriptions_.back();
 
     pair.first = label;
     pair.second = psetDescription;
-    
   }
 
-  void
-  ConfigurationDescriptions::addWithDefaultLabel(ParameterSetDescription const& psetDescription) {
+  void ConfigurationDescriptions::addWithDefaultLabel(ParameterSetDescription const& psetDescription) {
     std::string label;
-    if(kService == baseType_) {
+    if (kService == baseType_) {
       label = pluginName_;
-    }
-    else if(kSource == baseType_) {
+    } else if (kSource == baseType_) {
       label = "source";
-    }
-    else {
+    } else {
       label = defaultModuleLabel(pluginName_);
     }
     add(label, psetDescription);
   }
 
-  void
-  ConfigurationDescriptions::addDefault(ParameterSetDescription const& psetDescription) {
-
-    if (0==strcmp(baseType_.c_str(),kSource) || 0==strcmp(baseType_.c_str(),kService)) {
-      if (!descriptions_.empty() ||
-          defaultDescDefined_ == true) {
+  void ConfigurationDescriptions::addDefault(ParameterSetDescription const& psetDescription) {
+    if (0 == strcmp(baseType_.c_str(), kSource) || 0 == strcmp(baseType_.c_str(), kService)) {
+      if (!descriptions_.empty() || defaultDescDefined_ == true) {
         throw edm::Exception(edm::errors::LogicError,
-          "ConfigurationDescriptions::addDefault, for a source or service only 1 ParameterSetDescription may be added\n");
+                             "ConfigurationDescriptions::addDefault, for a source or service only 1 "
+                             "ParameterSetDescription may be added\n");
       }
     }
 
     defaultDescDefined_ = true;
     defaultDesc_ = psetDescription;
-    
   }
-  
-  ParameterSetDescription* 
-  ConfigurationDescriptions::defaultDescription() {
+
+  ParameterSetDescription* ConfigurationDescriptions::defaultDescription() {
     if (defaultDescDefined_) {
       return &defaultDesc_;
     }
     return nullptr;
   }
-  
-  ConfigurationDescriptions::iterator 
-  ConfigurationDescriptions::begin() { return descriptions_.begin();}
-
-  ConfigurationDescriptions::iterator 
-  ConfigurationDescriptions::end() {return descriptions_.end();}
-
-  
-  void
-  ConfigurationDescriptions::validate(ParameterSet & pset,
-                                      std::string const& moduleLabel) const {
-    
+
+  ConfigurationDescriptions::iterator ConfigurationDescriptions::begin() { return descriptions_.begin(); }
+
+  ConfigurationDescriptions::iterator ConfigurationDescriptions::end() { return descriptions_.end(); }
+
+  void ConfigurationDescriptions::validate(ParameterSet& pset, std::string const& moduleLabel) const {
     ParameterSetDescription const* psetDesc = nullptr;
-    for_all(descriptions_, std::bind(&matchLabel,
-                                       std::placeholders::_1,
-                                       std::cref(moduleLabel),
-                                       std::ref(psetDesc)));
+    for_all(descriptions_, std::bind(&matchLabel, std::placeholders::_1, std::cref(moduleLabel), std::ref(psetDesc)));
 
     // If there is a matching label
     if (psetDesc != nullptr) {
@@ -169,35 +140,32 @@ namespace edm {
     // for this module ever.
   }
 
-  void
-  ConfigurationDescriptions::writeCfis(std::set<std::string>& usedCfiFileNames) const {
-
-    for_all(descriptions_, std::bind(&ConfigurationDescriptions::writeCfiForLabel,
-                                       std::placeholders::_1,
-                                       std::cref(baseType_),
-                                       std::cref(pluginName_),
-                                       std::ref(usedCfiFileNames)));
+  void ConfigurationDescriptions::writeCfis(std::set<std::string>& usedCfiFileNames) const {
+    for_all(descriptions_,
+            std::bind(&ConfigurationDescriptions::writeCfiForLabel,
+                      std::placeholders::_1,
+                      std::cref(baseType_),
+                      std::cref(pluginName_),
+                      std::ref(usedCfiFileNames)));
   }
 
-
-  void
-  ConfigurationDescriptions::writeCfiForLabel(std::pair<std::string, ParameterSetDescription> const& labelAndDesc,
-                                              std::string const& baseType,
-                                              std::string const& pluginName,
-                                              std::set<std::string>& usedCfiFileNames)
-  {
-    if (0 == strcmp(baseType.c_str(),kService) && labelAndDesc.first != pluginName) {
+  void ConfigurationDescriptions::writeCfiForLabel(std::pair<std::string, ParameterSetDescription> const& labelAndDesc,
+                                                   std::string const& baseType,
+                                                   std::string const& pluginName,
+                                                   std::set<std::string>& usedCfiFileNames) {
+    if (0 == strcmp(baseType.c_str(), kService) && labelAndDesc.first != pluginName) {
       throw edm::Exception(edm::errors::LogicError,
-        "ConfigurationDescriptions::writeCfiForLabel\nFor a service the label and the plugin name must be the same.\n")
-        << "This error is probably caused by an incorrect label being passed\nto the ConfigurationDescriptions::add function earlier.\n"
-        << "plugin name = \"" << pluginName << "\"  label name = \"" << labelAndDesc.first << "\"\n";
+                           "ConfigurationDescriptions::writeCfiForLabel\nFor a service the label and the plugin name "
+                           "must be the same.\n")
+          << "This error is probably caused by an incorrect label being passed\nto the ConfigurationDescriptions::add "
+             "function earlier.\n"
+          << "plugin name = \"" << pluginName << "\"  label name = \"" << labelAndDesc.first << "\"\n";
     }
 
     std::string cfi_filename;
-    if (0 == strcmp(baseType.c_str(),kSource)) {
+    if (0 == strcmp(baseType.c_str(), kSource)) {
       cfi_filename = pluginName + "_cfi.py";
-    }
-    else {
+    } else {
       cfi_filename = labelAndDesc.first + "_cfi.py";
     }
     if (!usedCfiFileNames.insert(cfi_filename).second) {
@@ -225,12 +193,11 @@ namespace edm {
       throw ex;
     }
     std::ofstream outFile(cfi_filename.c_str());
-    if(outFile.fail()) {
-      edm::Exception ex(edm::errors::LogicError,
-                        "Creating cfi file failed.\n");
+    if (outFile.fail()) {
+      edm::Exception ex(edm::errors::LogicError, "Creating cfi file failed.\n");
       ex << "Opening a file '" << cfi_filename << "' for module '" << labelAndDesc.first << "' failed.\n";
       ex << "Error code from errno " << errno << ": " << std::strerror(errno) << "\n";
-      
+
       ex.addContext("Executing function ConfigurationDescriptions::writeCfiForLabel");
       throw ex;
     }
@@ -243,18 +210,17 @@ namespace edm {
     labelAndDesc.second.writeCfi(outFile, startWithComma, indentation);
 
     outFile << ")\n";
-  
+
     outFile.close();
 
-    if (0 == strcmp(baseType.c_str(),kSource)) {
+    if (0 == strcmp(baseType.c_str(), kSource)) {
       std::cout << pluginName << "\n";
-    }
-    else {
+    } else {
       std::cout << labelAndDesc.first << "\n";
     }
   }
 
-  void ConfigurationDescriptions::print(std::ostream & os,
+  void ConfigurationDescriptions::print(std::ostream& os,
                                         std::string const& moduleLabel,
                                         bool brief,
                                         bool printOnlyLabels,
@@ -276,7 +242,8 @@ namespace edm {
       os << std::setfill(' ') << std::setw(indentation) << "";
       os << "PSets will not be validated and no cfi files will be generated.\n";
       os << std::setfill(oldFill);
-      if (!brief) os << "\n";
+      if (!brief)
+        os << "\n";
       return;
     }
 
@@ -290,7 +257,8 @@ namespace edm {
       os << std::setfill(' ') << std::setw(indentation) << "";
       os << "Its PSets will not be validated, and no cfi files will be generated.\n";
       os << std::setfill(oldFill);
-      if (!brief) os << "\n";
+      if (!brief)
+        os << "\n";
       return;
     }
 
@@ -301,22 +269,19 @@ namespace edm {
           ss << "This plugin has only one PSet description. "
              << "This description is always used to validate configurations. "
              << "Because this configuration has no label, no cfi files will be generated.";
-        }
-        else {
+        } else {
           ss << "This plugin has " << (descriptions_.size() + 1U) << " PSet descriptions. "
              << "The description used to validate a configuration is selected by "
              << "matching the module labels. If none match, then the last description, "
              << "which has no label, is selected. "
              << "A cfi file will be generated for each configuration with a module label.";
         }
-      }
-      else {
+      } else {
         if (descriptions_.size() == 1U) {
           ss << "This plugin has " << descriptions_.size() << " PSet description. "
              << "This description is always used to validate configurations. "
              << "The label below is used when generating the cfi file.";
-        }
-        else {
+        } else {
           ss << "This plugin has " << descriptions_.size() << " PSet descriptions. "
              << "The description used to validate a configuration is selected by "
              << "matching the module labels. If none match the first description below is used. "
@@ -334,8 +299,8 @@ namespace edm {
     counter.iSelectedModule = 0;
     counter.iModule = 0;
 
-    for(auto const& d: descriptions_) {
-      printForLabel(d,os, moduleLabel,brief, printOnlyLabels,lineWidth,indentation, counter);
+    for (auto const& d : descriptions_) {
+      printForLabel(d, os, moduleLabel, brief, printOnlyLabels, lineWidth, indentation, counter);
     }
 
     if (defaultDescDefined_) {
@@ -351,16 +316,14 @@ namespace edm {
     }
   }
 
-  void
-  ConfigurationDescriptions::printForLabel(std::pair<std::string, ParameterSetDescription> const& labelAndDesc,
-                                           std::ostream & os,
-                                           std::string const& moduleLabel,
-                                           bool brief,
-                                           bool printOnlyLabels,
-                                           size_t lineWidth,
-                                           int indentation,
-                                           DescriptionCounter & counter) const
-  {
+  void ConfigurationDescriptions::printForLabel(std::pair<std::string, ParameterSetDescription> const& labelAndDesc,
+                                                std::ostream& os,
+                                                std::string const& moduleLabel,
+                                                bool brief,
+                                                bool printOnlyLabels,
+                                                size_t lineWidth,
+                                                int indentation,
+                                                DescriptionCounter& counter) const {
     printForLabel(os,
                   labelAndDesc.first,
                   labelAndDesc.second,
@@ -372,19 +335,18 @@ namespace edm {
                   counter);
   }
 
-  void
-  ConfigurationDescriptions::printForLabel(std::ostream & os,
-                                           std::string const& label,
-                                           ParameterSetDescription const& description,
-                                           std::string const& moduleLabel,
-                                           bool brief,
-                                           bool printOnlyLabels,
-                                           size_t lineWidth,
-                                           int indentation,
-                                           DescriptionCounter & counter) const
-  {
+  void ConfigurationDescriptions::printForLabel(std::ostream& os,
+                                                std::string const& label,
+                                                ParameterSetDescription const& description,
+                                                std::string const& moduleLabel,
+                                                bool brief,
+                                                bool printOnlyLabels,
+                                                size_t lineWidth,
+                                                int indentation,
+                                                DescriptionCounter& counter) const {
     ++counter.iModule;
-    if (!moduleLabel.empty() && label != moduleLabel) return;
+    if (!moduleLabel.empty() && label != moduleLabel)
+      return;
     ++counter.iSelectedModule;
 
     std::stringstream ss;
@@ -396,26 +358,25 @@ namespace edm {
     os << section << " ";
     if (label == std::string("@default")) {
       os << "description without a module label\n";
-    }
-    else {
+    } else {
       if (!brief) {
-        if (0 == strcmp(baseType_.c_str(),kSource) || 0 == strcmp(baseType_.c_str(),kService)) {
+        if (0 == strcmp(baseType_.c_str(), kSource) || 0 == strcmp(baseType_.c_str(), kService)) {
           os << "label: ";
-        }
-        else {
+        } else {
           os << "module label: ";
         }
       }
-      os << label << "\n";      
+      os << label << "\n";
     }
 
     if (!brief) {
       if (!description.comment().empty()) {
-        DocFormatHelper::wrapAndPrintText(os, description.comment(), indentation, lineWidth - indentation);        
+        DocFormatHelper::wrapAndPrintText(os, description.comment(), indentation, lineWidth - indentation);
       }
       os << "\n";
     }
-    if (printOnlyLabels) return;
+    if (printOnlyLabels)
+      return;
 
     DocFormatHelper dfh;
     dfh.setBrief(brief);
@@ -426,4 +387,4 @@ namespace edm {
 
     description.print(os, dfh);
   }
-}
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/DocFormatHelper.cc b/FWCore/ParameterSet/src/DocFormatHelper.cc
index b5f6de1f1b761..a883e624a7c77 100644
--- a/FWCore/ParameterSet/src/DocFormatHelper.cc
+++ b/FWCore/ParameterSet/src/DocFormatHelper.cc
@@ -8,7 +8,6 @@ namespace edm {
 
   namespace {
     void wrapAndPrintLine(std::ostream& os, std::string const& text, size_t indent, size_t suggestedWidth) {
-
       char oldFill = os.fill();
 
       size_t length = text.size();
@@ -21,13 +20,14 @@ namespace edm {
 
       // Loop over spaces in the text
       while (true) {
-
         // If the rest of the text fits on the current line,
         // then print it and we are done
         if ((length - startLine) <= suggestedWidth) {
           os << std::setfill(' ') << std::setw(indent) << "";
-          if (startLine == 0) os << text;
-          else os << text.substr(startLine);
+          if (startLine == 0)
+            os << text;
+          else
+            os << text.substr(startLine);
           os << "\n";
           break;
         }
@@ -54,7 +54,6 @@ namespace edm {
         }
 
         if ((pos + 1U - startLine) > suggestedWidth) {
-
           // With this word the line is too long.  Print out to
           // the end of the previous word if there was one.
           // If there was not, then print to the end of this word
@@ -76,7 +75,7 @@ namespace edm {
       }
       os.fill(oldFill);
     }
-  }
+  }  // namespace
 
   // Print and wrap text to an output stream.
   // This function looks for new line chars in the text,
@@ -99,7 +98,6 @@ namespace edm {
                                          std::string const& text,
                                          size_t indent,
                                          size_t suggestedWidth) {
-
     size_t pos = text.find_first_of('\n');
     if (pos == std::string::npos) {
       // no embedded newlines
@@ -123,7 +121,6 @@ namespace edm {
   }
 
   size_t DocFormatHelper::commentWidth() const {
-
     // Make the length of a comment at least 30 characters
     // per line, longer if there is more space available
     size_t width = 30U;
@@ -144,4 +141,4 @@ namespace edm {
     os << std::setfill(' ') << std::setw(startColumn2_) << "";
     os.fill(oldFill);
   }
-}
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/EmptyGroupDescription.cc b/FWCore/ParameterSet/src/EmptyGroupDescription.cc
index a6d332d08f437..5b7d603b6d892 100644
--- a/FWCore/ParameterSet/src/EmptyGroupDescription.cc
+++ b/FWCore/ParameterSet/src/EmptyGroupDescription.cc
@@ -6,61 +6,38 @@
 
 namespace edm {
 
-  EmptyGroupDescription::
-  EmptyGroupDescription() { }
-
-  void
-  EmptyGroupDescription::
-  checkAndGetLabelsAndTypes_(std::set<std::string>& /*usedLabels*/,
-                             std::set<ParameterTypes>& /*parameterTypes*/,
-                             std::set<ParameterTypes>& /*wildcardTypes*/) const { }
-
-  void
-  EmptyGroupDescription::
-  validate_(ParameterSet&,
-            std::set<std::string>& /*validatedLabels*/,
-            bool /*optional*/) const { }
-
-  void
-  EmptyGroupDescription::
-  writeCfi_(std::ostream&,
-            bool& /*startWithComma*/,
-            int /*indentation*/,
-            bool& /*wroteSomething*/) const { }
-
-  void
-  EmptyGroupDescription::
-  print_(std::ostream& os,
-         bool /*optional*/,
-         bool /*writeToCfi*/,
-         DocFormatHelper& dfh) const {
-
-    if(dfh.pass() == 1) {
-
+  EmptyGroupDescription::EmptyGroupDescription() {}
+
+  void EmptyGroupDescription::checkAndGetLabelsAndTypes_(std::set<std::string>& /*usedLabels*/,
+                                                         std::set<ParameterTypes>& /*parameterTypes*/,
+                                                         std::set<ParameterTypes>& /*wildcardTypes*/) const {}
+
+  void EmptyGroupDescription::validate_(ParameterSet&,
+                                        std::set<std::string>& /*validatedLabels*/,
+                                        bool /*optional*/) const {}
+
+  void EmptyGroupDescription::writeCfi_(std::ostream&,
+                                        bool& /*startWithComma*/,
+                                        int /*indentation*/,
+                                        bool& /*wroteSomething*/) const {}
+
+  void EmptyGroupDescription::print_(std::ostream& os,
+                                     bool /*optional*/,
+                                     bool /*writeToCfi*/,
+                                     DocFormatHelper& dfh) const {
+    if (dfh.pass() == 1) {
       dfh.indent(os);
       os << "Empty group description\n";
 
-      if(!dfh.brief()) {
+      if (!dfh.brief()) {
         os << "\n";
       }
     }
   }
 
-  bool
-  EmptyGroupDescription::
-  exists_(ParameterSet const&) const {
-    return true;
-  }
+  bool EmptyGroupDescription::exists_(ParameterSet const&) const { return true; }
 
-  bool
-  EmptyGroupDescription::
-  partiallyExists_(ParameterSet const& pset) const {
-    return exists(pset);
-  }
+  bool EmptyGroupDescription::partiallyExists_(ParameterSet const& pset) const { return exists(pset); }
 
-  int
-  EmptyGroupDescription::
-  howManyXORSubNodesExist_(ParameterSet const& pset) const {
-    return exists(pset) ? 1 : 0;
-  }
-}
+  int EmptyGroupDescription::howManyXORSubNodesExist_(ParameterSet const& pset) const { return exists(pset) ? 1 : 0; }
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/Entry.cc b/FWCore/ParameterSet/src/Entry.cc
index 5092667d5700d..1463bce7a0bae 100644
--- a/FWCore/ParameterSet/src/Entry.cc
+++ b/FWCore/ParameterSet/src/Entry.cc
@@ -2,7 +2,6 @@
 // definition of Entry's function members
 // ----------------------------------------------------------------------
 
-
 // ----------------------------------------------------------------------
 // prerequisite source files and headers
 // ----------------------------------------------------------------------
@@ -19,10 +18,7 @@
 #include <cassert>
 #include <iostream>
 
-enum {
-   kTESInputTag  = 'g',
-   kTVESInputTag = 'G'
-};
+enum { kTESInputTag = 'g', kTVESInputTag = 'G' };
 
 namespace edm {
   namespace pset {
@@ -35,7 +31,7 @@ namespace edm {
       std::map<std::string, char> type2Code_;
     };
 
-    TypeTrans::TypeTrans():table_(255) {
+    TypeTrans::TypeTrans() : table_(255) {
       table_['b'] = "vBool";
       table_['B'] = "bool";
       table_['i'] = "vint32";
@@ -67,494 +63,530 @@ namespace edm {
       table_['r'] = "VEventRange";
       table_['R'] = "EventRange";
 
-      for(CodeMap::const_iterator itCode = table_.begin(), itCodeEnd = table_.end();
-           itCode != itCodeEnd;
-           ++itCode) {
-         type2Code_[*itCode] = (itCode - table_.begin());
+      for (CodeMap::const_iterator itCode = table_.begin(), itCodeEnd = table_.end(); itCode != itCodeEnd; ++itCode) {
+        type2Code_[*itCode] = (itCode - table_.begin());
       }
     }
-  }
+  }  // namespace pset
 
   static pset::TypeTrans const sTypeTranslations;
   typedef std::map<std::string, char> Type2Code;
 
-// ----------------------------------------------------------------------
-// consistency-checker
-// ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
+  // consistency-checker
+  // ----------------------------------------------------------------------
 
-  void
-  Entry::validate() const {
+  void Entry::validate() const {
     // tracked
-    assert (tracked == '+' || tracked == '-');
-//     if(tracked != '+' && tracked != '-')
-//       throw EntryError(std::string("invalid tracked code ") + tracked);
+    assert(tracked == '+' || tracked == '-');
+    //     if(tracked != '+' && tracked != '-')
+    //       throw EntryError(std::string("invalid tracked code ") + tracked);
 
     // type and rep
-    switch(type)  {
-      case 'B':  {  // Bool
-        bool  val;
-        if (!decode(val, rep)) throwEntryError("bool", rep);
+    switch (type) {
+      case 'B': {  // Bool
+        bool val;
+        if (!decode(val, rep))
+          throwEntryError("bool", rep);
         break;
       }
-      case 'b':  {  // vBool
-        std::vector<bool>  val;
-        if(!decode(val, rep)) throwEntryError("vector<bool>", rep);
+      case 'b': {  // vBool
+        std::vector<bool> val;
+        if (!decode(val, rep))
+          throwEntryError("vector<bool>", rep);
         break;
       }
-      case 'I':  {  // Int32
-        int  val;
-        if(!decode(val, rep)) throwEntryError("int", rep);
+      case 'I': {  // Int32
+        int val;
+        if (!decode(val, rep))
+          throwEntryError("int", rep);
         break;
       }
-      case 'i':  {  // vInt32
-        std::vector<int>  val;
-        if(!decode(val, rep)) throwEntryError("vector<int>", rep);
+      case 'i': {  // vInt32
+        std::vector<int> val;
+        if (!decode(val, rep))
+          throwEntryError("vector<int>", rep);
         break;
       }
-      case 'U':  {  // Uint32
-        unsigned  val;
-        if(!decode(val, rep)) throwEntryError("unsigned int", rep);
+      case 'U': {  // Uint32
+        unsigned val;
+        if (!decode(val, rep))
+          throwEntryError("unsigned int", rep);
         break;
       }
-      case 'u':  {  // vUint32
-        std::vector<unsigned>  val;
-        if(!decode(val, rep)) throwEntryError("vector<unsigned int>", rep);
+      case 'u': {  // vUint32
+        std::vector<unsigned> val;
+        if (!decode(val, rep))
+          throwEntryError("vector<unsigned int>", rep);
         break;
       }
-      case 'L':  {  // Int64
-        int  val;
-        if(!decode(val, rep)) throwEntryError("int64", rep);
+      case 'L': {  // Int64
+        int val;
+        if (!decode(val, rep))
+          throwEntryError("int64", rep);
         break;
       }
-      case 'l':  {  // vInt64
-        std::vector<int>  val;
-        if(!decode(val, rep)) throwEntryError("vector<int64>", rep);
+      case 'l': {  // vInt64
+        std::vector<int> val;
+        if (!decode(val, rep))
+          throwEntryError("vector<int64>", rep);
         break;
       }
-      case 'X':  {  // Uint64
-        unsigned  val;
-        if(!decode(val, rep)) throwEntryError("unsigned int64", rep);
+      case 'X': {  // Uint64
+        unsigned val;
+        if (!decode(val, rep))
+          throwEntryError("unsigned int64", rep);
         break;
       }
-      case 'x':  {  // vUint64
-        std::vector<unsigned>  val;
-        if(!decode(val, rep)) throwEntryError("vector<unsigned int64>", rep);
+      case 'x': {  // vUint64
+        std::vector<unsigned> val;
+        if (!decode(val, rep))
+          throwEntryError("vector<unsigned int64>", rep);
         break;
       }
-      case 'S':  {  // String
-        std::string  val;
-        if(!decode(val, rep)) throwEntryError("string", rep);
+      case 'S': {  // String
+        std::string val;
+        if (!decode(val, rep))
+          throwEntryError("string", rep);
         break;
       }
-      case 's':  {  // vString
-        std::vector<std::string>  val;
-        if(!decode(val, rep)) throwEntryError("vector<string>", rep);
+      case 's': {  // vString
+        std::vector<std::string> val;
+        if (!decode(val, rep))
+          throwEntryError("vector<string>", rep);
         break;
       }
-      case 'F':  {  // FileInPath
+      case 'F': {  // FileInPath
         FileInPath val;
-        if(!decode(val, rep)) throwEntryError("FileInPath", rep);
+        if (!decode(val, rep))
+          throwEntryError("FileInPath", rep);
         break;
       }
-      case 't':  {  // InputTag
+      case 't': {  // InputTag
         InputTag val;
-        if(!decode(val, rep)) throwEntryError("InputTag", rep);
+        if (!decode(val, rep))
+          throwEntryError("InputTag", rep);
         break;
       }
-      case 'v':  {  // VInputTag
+      case 'v': {  // VInputTag
         std::vector<InputTag> val;
-        if(!decode(val, rep)) throwEntryError("VInputTag", rep);
+        if (!decode(val, rep))
+          throwEntryError("VInputTag", rep);
         break;
       }
-      case kTESInputTag: { //ESInputTag
-         ESInputTag val;
-         if(!decode(val,rep)) throwEntryError("ESInputTag", rep);
-         break;
+      case kTESInputTag: {  //ESInputTag
+        ESInputTag val;
+        if (!decode(val, rep))
+          throwEntryError("ESInputTag", rep);
+        break;
       }
-      case kTVESInputTag: { //ESInputTag
-         std::vector<ESInputTag> val;
-         if(!decode(val,rep)) throwEntryError("VESInputTag", rep);
-         break;
+      case kTVESInputTag: {  //ESInputTag
+        std::vector<ESInputTag> val;
+        if (!decode(val, rep))
+          throwEntryError("VESInputTag", rep);
+        break;
       }
-      case 'E':  {  // EventID
+      case 'E': {  // EventID
         EventID val;
-        if(!decode(val, rep)) throwEntryError("EventID", rep);
+        if (!decode(val, rep))
+          throwEntryError("EventID", rep);
         break;
       }
-      case 'e':  {  // VEventID
+      case 'e': {  // VEventID
         std::vector<EventID> val;
-        if(!decode(val, rep)) throwEntryError("VEventID", rep);
+        if (!decode(val, rep))
+          throwEntryError("VEventID", rep);
         break;
       }
-      case 'M':  {  // LuminosityBlockID
+      case 'M': {  // LuminosityBlockID
         LuminosityBlockID val;
-        if(!decode(val, rep)) throwEntryError("LuminosityBlockID", rep);
+        if (!decode(val, rep))
+          throwEntryError("LuminosityBlockID", rep);
         break;
       }
-      case 'm':  {  // VLuminosityBlockID
+      case 'm': {  // VLuminosityBlockID
         std::vector<LuminosityBlockID> val;
-        if(!decode(val, rep)) throwEntryError("VLuminosityBlockID", rep);
+        if (!decode(val, rep))
+          throwEntryError("VLuminosityBlockID", rep);
         break;
       }
-      case 'D':  {  // Double
-        double  val;
-        if(!decode(val, rep)) throwEntryError("double", rep);
+      case 'D': {  // Double
+        double val;
+        if (!decode(val, rep))
+          throwEntryError("double", rep);
         break;
       }
-      case 'd':  {  // vDouble
-        std::vector<double>  val;
-        if(!decode(val, rep)) throwEntryError("vector<double>", rep);
+      case 'd': {  // vDouble
+        std::vector<double> val;
+        if (!decode(val, rep))
+          throwEntryError("vector<double>", rep);
         break;
       }
-      case 'P':  {  // ParameterSet
+      case 'P': {  // ParameterSet
         ParameterSet val;
-        if(!decode(val, rep)) throwEntryError("ParameterSet", rep);
+        if (!decode(val, rep))
+          throwEntryError("ParameterSet", rep);
         break;
       }
-      case 'p':  {  // vParameterSet
-        std::vector<ParameterSet>  val;
-        if(!decode(val, rep)) throwEntryError("vector<ParameterSet>", rep);
+      case 'p': {  // vParameterSet
+        std::vector<ParameterSet> val;
+        if (!decode(val, rep))
+          throwEntryError("vector<ParameterSet>", rep);
         break;
       }
-      case 'A':  {  // LuminosityBlockRange
+      case 'A': {  // LuminosityBlockRange
         LuminosityBlockRange val;
-        if(!decode(val, rep)) throwEntryError("LuminosityBlockRange", rep);
+        if (!decode(val, rep))
+          throwEntryError("LuminosityBlockRange", rep);
         break;
       }
-      case 'a':  {  // VLuminosityBlockRange
+      case 'a': {  // VLuminosityBlockRange
         std::vector<LuminosityBlockRange> val;
-        if(!decode(val, rep)) throwEntryError("VLuminosityBlockRange", rep);
+        if (!decode(val, rep))
+          throwEntryError("VLuminosityBlockRange", rep);
         break;
       }
-      case 'R':  {  // EventRange
+      case 'R': {  // EventRange
         EventRange val;
-        if(!decode(val, rep)) throwEntryError("EventRange", rep);
+        if (!decode(val, rep))
+          throwEntryError("EventRange", rep);
         break;
       }
-      case 'r':  {  // VEventRange
+      case 'r': {  // VEventRange
         std::vector<EventRange> val;
-        if(!decode(val, rep)) throwEntryError("VEventRange", rep);
+        if (!decode(val, rep))
+          throwEntryError("VEventRange", rep);
         break;
       }
-      default:  {
+      default: {
         // We should never get here.
-        assert ("Invalid type code" == nullptr);
+        assert("Invalid type code" == nullptr);
         //throw EntryError(std::string("invalid type code ") + type);
         break;
       }
     }  // switch(type)
-  }  // Entry::validate()
+  }    // Entry::validate()
 
-// ----------------------------------------------------------------------
-// constructors
-// ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
+  // constructors
+  // ----------------------------------------------------------------------
 
-// ----------------------------------------------------------------------
-// Bool
+  // ----------------------------------------------------------------------
+  // Bool
 
-  Entry::Entry(std::string const& name, bool val, bool is_tracked) :
-    name_(name), rep(), type('B'), tracked(is_tracked ? '+' : '-') {
-    if(!encode(rep, val)) throwEncodeError("bool");
+  Entry::Entry(std::string const& name, bool val, bool is_tracked)
+      : name_(name), rep(), type('B'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("bool");
     validate();
   }
 
-// ----------------------------------------------------------------------
-// Int32
+  // ----------------------------------------------------------------------
+  // Int32
 
-  Entry::Entry(std::string const& name, int  val, bool is_tracked) :
-    name_(name), rep(), type('I'), tracked(is_tracked ? '+' : '-') {
-    if(!encode(rep, val)) throwEncodeError("int");
+  Entry::Entry(std::string const& name, int val, bool is_tracked)
+      : name_(name), rep(), type('I'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("int");
     validate();
   }
 
-// ----------------------------------------------------------------------
-// vInt32
+  // ----------------------------------------------------------------------
+  // vInt32
 
-  Entry::Entry(std::string const& name, std::vector<int> const& val, bool is_tracked) :
-    name_(name), rep(), type('i'), tracked(is_tracked ? '+' : '-') {
-    if(!encode(rep, val)) throwEncodeError("vector<int>");
+  Entry::Entry(std::string const& name, std::vector<int> const& val, bool is_tracked)
+      : name_(name), rep(), type('i'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("vector<int>");
     validate();
   }
 
-// ----------------------------------------------------------------------
-// Uint32
+  // ----------------------------------------------------------------------
+  // Uint32
 
-  Entry::Entry(std::string const& name, unsigned val, bool is_tracked) :
-    name_(name), rep(), type('U'), tracked(is_tracked ? '+' : '-') {
-    if(!encode(rep, val)) throwEncodeError("unsigned int");
+  Entry::Entry(std::string const& name, unsigned val, bool is_tracked)
+      : name_(name), rep(), type('U'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("unsigned int");
     validate();
   }
 
-// ----------------------------------------------------------------------
-// vUint32
+  // ----------------------------------------------------------------------
+  // vUint32
 
- Entry::Entry(std::string const& name, std::vector<unsigned> const& val, bool is_tracked) :
-   name_(name), rep(), type('u'), tracked(is_tracked ? '+' : '-') {
-   if(!encode(rep, val)) throwEncodeError("vector<unsigned int>");
+  Entry::Entry(std::string const& name, std::vector<unsigned> const& val, bool is_tracked)
+      : name_(name), rep(), type('u'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("vector<unsigned int>");
     validate();
   }
 
-// ----------------------------------------------------------------------
-// Int64
+  // ----------------------------------------------------------------------
+  // Int64
 
-  Entry::Entry(std::string const& name, long long val, bool is_tracked) :
-    name_(name), rep(), type('L'), tracked(is_tracked ? '+' : '-') {
-    if(!encode(rep, val)) throwEncodeError("int64");
+  Entry::Entry(std::string const& name, long long val, bool is_tracked)
+      : name_(name), rep(), type('L'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("int64");
     validate();
   }
 
-// ----------------------------------------------------------------------
-// vInt64
+  // ----------------------------------------------------------------------
+  // vInt64
 
-  Entry::Entry(std::string const& name, std::vector<long long> const& val, bool is_tracked) :
-    name_(name), rep(), type('l'), tracked(is_tracked ? '+' : '-') {
-    if(!encode(rep, val)) throwEncodeError("vector<int64>");
+  Entry::Entry(std::string const& name, std::vector<long long> const& val, bool is_tracked)
+      : name_(name), rep(), type('l'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("vector<int64>");
     validate();
   }
 
-// ----------------------------------------------------------------------
-// Uint64
+  // ----------------------------------------------------------------------
+  // Uint64
 
-  Entry::Entry(std::string const& name, unsigned long long val, bool is_tracked) :
-    name_(name), rep(), type('X'), tracked(is_tracked ? '+' : '-') {
-    if(!encode(rep, val)) throwEncodeError("unsigned int64");
+  Entry::Entry(std::string const& name, unsigned long long val, bool is_tracked)
+      : name_(name), rep(), type('X'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("unsigned int64");
     validate();
   }
 
-// ----------------------------------------------------------------------
-// vUint64
+  // ----------------------------------------------------------------------
+  // vUint64
 
- Entry::Entry(std::string const& name, std::vector<unsigned long long> const& val, bool is_tracked) :
-   name_(name), rep(), type('x'), tracked(is_tracked ? '+' : '-') {
-   if(!encode(rep, val)) throwEncodeError("vector<unsigned int64>");
+  Entry::Entry(std::string const& name, std::vector<unsigned long long> const& val, bool is_tracked)
+      : name_(name), rep(), type('x'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("vector<unsigned int64>");
     validate();
   }
 
-// ----------------------------------------------------------------------
-// Double
+  // ----------------------------------------------------------------------
+  // Double
 
- Entry::Entry(std::string const& name, double val, bool is_tracked) :
-   name_(name), rep(), type('D'), tracked(is_tracked ? '+' : '-') {
-   if(!encode(rep, val)) throwEncodeError("double");
+  Entry::Entry(std::string const& name, double val, bool is_tracked)
+      : name_(name), rep(), type('D'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("double");
     validate();
   }
 
-// ----------------------------------------------------------------------
-// vDouble
+  // ----------------------------------------------------------------------
+  // vDouble
 
-  Entry::Entry(std::string const& name, std::vector<double> const& val, bool is_tracked) :
-    name_(name), rep(), type('d'), tracked(is_tracked ? '+' : '-') {
-    if(!encode(rep, val)) throwEncodeError("vector<double>");
+  Entry::Entry(std::string const& name, std::vector<double> const& val, bool is_tracked)
+      : name_(name), rep(), type('d'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("vector<double>");
     validate();
   }
 
-// ----------------------------------------------------------------------
-// String
+  // ----------------------------------------------------------------------
+  // String
 
-  Entry::Entry(std::string const& name, std::string const& val, bool is_tracked) :
-    name_(name), rep(), type('S'), tracked(is_tracked ? '+' : '-') {
-    if(!encode(rep, val)) throwEncodeError("string");
+  Entry::Entry(std::string const& name, std::string const& val, bool is_tracked)
+      : name_(name), rep(), type('S'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("string");
     validate();
   }
 
-// ----------------------------------------------------------------------
-// vString
+  // ----------------------------------------------------------------------
+  // vString
 
-  Entry::Entry(std::string const& name, std::vector<std::string> const& val, bool is_tracked) :
-       name_(name), rep(), type('s'), tracked(is_tracked ? '+' : '-') {
-    if(!encode(rep, val)) throwEncodeError("vector<string>");
+  Entry::Entry(std::string const& name, std::vector<std::string> const& val, bool is_tracked)
+      : name_(name), rep(), type('s'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("vector<string>");
     validate();
   }
 
-// ----------------------------------------------------------------------
-// FileInPath
+  // ----------------------------------------------------------------------
+  // FileInPath
 
-  Entry::Entry(std::string const& name, FileInPath const& val, bool is_tracked) :
-    name_(name), rep(), type('F'), tracked(is_tracked ? '+' : '-') {
-    if (!encode(rep, val)) throwEncodeError("FileInPath");
+  Entry::Entry(std::string const& name, FileInPath const& val, bool is_tracked)
+      : name_(name), rep(), type('F'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("FileInPath");
     validate();
   }
 
-// ----------------------------------------------------------------------
-// InputTag
+  // ----------------------------------------------------------------------
+  // InputTag
 
-  Entry::Entry(std::string const& name, InputTag const& val, bool is_tracked) :
-    name_(name), rep(), type('t'), tracked(is_tracked ? '+' : '-') {
-    if (!encode(rep, val)) throwEncodeError("InputTag");
+  Entry::Entry(std::string const& name, InputTag const& val, bool is_tracked)
+      : name_(name), rep(), type('t'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("InputTag");
     validate();
   }
 
+  // ----------------------------------------------------------------------
+  // VInputTag
 
-// ----------------------------------------------------------------------
-// VInputTag
-
-  Entry::Entry(std::string const& name, std::vector<InputTag> const& val, bool is_tracked) :
-    name_(name), rep(), type('v'), tracked(is_tracked ? '+' : '-') {
-    if (!encode(rep, val)) throwEncodeError("VInputTag");
+  Entry::Entry(std::string const& name, std::vector<InputTag> const& val, bool is_tracked)
+      : name_(name), rep(), type('v'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("VInputTag");
     validate();
   }
 
+  // ----------------------------------------------------------------------
+  // ESInputTag
 
-// ----------------------------------------------------------------------
-// ESInputTag
-
-   Entry::Entry(std::string const& name, ESInputTag const& val, bool is_tracked) :
-   name_(name), rep(), type(kTESInputTag), tracked(is_tracked ? '+' : '-') {
-      if (!encode(rep, val)) throwEncodeError("InputTag");
-      validate();
-   }
-
-// ----------------------------------------------------------------------
-// VESInputTag
-
-   Entry::Entry(std::string const& name, std::vector<ESInputTag> const& val, bool is_tracked) :
-   name_(name), rep(), type(kTVESInputTag), tracked(is_tracked ? '+' : '-') {
-      if (!encode(rep, val)) throwEncodeError("VESInputTag");
-      validate();
-   }
-
+  Entry::Entry(std::string const& name, ESInputTag const& val, bool is_tracked)
+      : name_(name), rep(), type(kTESInputTag), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("InputTag");
+    validate();
+  }
 
-// ----------------------------------------------------------------------
-//  EventID
+  // ----------------------------------------------------------------------
+  // VESInputTag
 
-  Entry::Entry(std::string const& name, EventID const& val, bool is_tracked) :
-    name_(name), rep(), type('E'), tracked(is_tracked ? '+' : '-') {
-    if (!encode(rep, val)) throwEncodeError("EventID");
+  Entry::Entry(std::string const& name, std::vector<ESInputTag> const& val, bool is_tracked)
+      : name_(name), rep(), type(kTVESInputTag), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("VESInputTag");
     validate();
   }
 
+  // ----------------------------------------------------------------------
+  //  EventID
 
-// ----------------------------------------------------------------------
-// VEventID
-
-  Entry::Entry(std::string const& name, std::vector<EventID> const& val, bool is_tracked) :
-    name_(name), rep(), type('e'), tracked(is_tracked ? '+' : '-') {
-    if (!encode(rep, val)) throwEncodeError("VEventID");
+  Entry::Entry(std::string const& name, EventID const& val, bool is_tracked)
+      : name_(name), rep(), type('E'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("EventID");
     validate();
   }
 
+  // ----------------------------------------------------------------------
+  // VEventID
 
+  Entry::Entry(std::string const& name, std::vector<EventID> const& val, bool is_tracked)
+      : name_(name), rep(), type('e'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("VEventID");
+    validate();
+  }
 
-// ----------------------------------------------------------------------
-//  LuminosityBlockID
+  // ----------------------------------------------------------------------
+  //  LuminosityBlockID
 
-  Entry::Entry(std::string const& name, LuminosityBlockID const& val, bool is_tracked) :
-    name_(name), rep(), type('M'), tracked(is_tracked ? '+' : '-') {
-    if (!encode(rep, val)) throwEncodeError("LuminosityBlockID");
+  Entry::Entry(std::string const& name, LuminosityBlockID const& val, bool is_tracked)
+      : name_(name), rep(), type('M'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("LuminosityBlockID");
     validate();
   }
 
+  // ----------------------------------------------------------------------
+  // VLuminosityBlockID
 
-// ----------------------------------------------------------------------
-// VLuminosityBlockID
-
-  Entry::Entry(std::string const& name, std::vector<LuminosityBlockID> const& val, bool is_tracked) :
-    name_(name), rep(), type('m'), tracked(is_tracked ? '+' : '-') {
-    if (!encode(rep, val)) throwEncodeError("VLuminosityBlockID");
+  Entry::Entry(std::string const& name, std::vector<LuminosityBlockID> const& val, bool is_tracked)
+      : name_(name), rep(), type('m'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("VLuminosityBlockID");
     validate();
   }
 
-// ----------------------------------------------------------------------
-//  LuminosityBlockRange
+  // ----------------------------------------------------------------------
+  //  LuminosityBlockRange
 
-  Entry::Entry(std::string const& name, LuminosityBlockRange const& val, bool is_tracked) :
-    name_(name), rep(), type('A'), tracked(is_tracked ? '+' : '-') {
-    if (!encode(rep, val)) throwEncodeError("LuminosityBlockRange");
+  Entry::Entry(std::string const& name, LuminosityBlockRange const& val, bool is_tracked)
+      : name_(name), rep(), type('A'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("LuminosityBlockRange");
     validate();
   }
 
+  // ----------------------------------------------------------------------
+  // VLuminosityBlockRange
 
-// ----------------------------------------------------------------------
-// VLuminosityBlockRange
-
-  Entry::Entry(std::string const& name, std::vector<LuminosityBlockRange> const& val, bool is_tracked) :
-    name_(name), rep(), type('a'), tracked(is_tracked ? '+' : '-') {
-    if (!encode(rep, val)) throwEncodeError("VLuminosityBlockRange");
+  Entry::Entry(std::string const& name, std::vector<LuminosityBlockRange> const& val, bool is_tracked)
+      : name_(name), rep(), type('a'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("VLuminosityBlockRange");
     validate();
   }
 
-// ----------------------------------------------------------------------
-//  EventRange
+  // ----------------------------------------------------------------------
+  //  EventRange
 
-  Entry::Entry(std::string const& name, EventRange const& val, bool is_tracked) :
-    name_(name), rep(), type('R'), tracked(is_tracked ? '+' : '-') {
-    if (!encode(rep, val)) throwEncodeError("EventRange");
+  Entry::Entry(std::string const& name, EventRange const& val, bool is_tracked)
+      : name_(name), rep(), type('R'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("EventRange");
     validate();
   }
 
-// ----------------------------------------------------------------------
-// VEventRange
+  // ----------------------------------------------------------------------
+  // VEventRange
 
-  Entry::Entry(std::string const& name, std::vector<EventRange> const& val, bool is_tracked) :
-    name_(name), rep(), type('r'), tracked(is_tracked ? '+' : '-') {
-    if (!encode(rep, val)) throwEncodeError("VEventRange");
+  Entry::Entry(std::string const& name, std::vector<EventRange> const& val, bool is_tracked)
+      : name_(name), rep(), type('r'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("VEventRange");
     validate();
   }
 
+  // ----------------------------------------------------------------------
+  // ParameterSet
 
-// ----------------------------------------------------------------------
-// ParameterSet
-
-  Entry::Entry(std::string const& name, ParameterSet const& val, bool is_tracked) :
-    name_(name), rep(), type('P'), tracked(is_tracked ? '+' : '-') {
-    if(!encode(rep, val)) throwEncodeError("ParameterSet");
+  Entry::Entry(std::string const& name, ParameterSet const& val, bool is_tracked)
+      : name_(name), rep(), type('P'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("ParameterSet");
     validate();
   }
 
-// ----------------------------------------------------------------------
-// vPSet
+  // ----------------------------------------------------------------------
+  // vPSet
 
-  Entry::Entry(std::string const& name, std::vector<ParameterSet> const& val, bool is_tracked) :
-      name_(name), rep(), type('p'), tracked(is_tracked ? '+' : '-') {
-    if(!encode(rep, val)) throwEncodeError("vector<ParameterSet>");
+  Entry::Entry(std::string const& name, std::vector<ParameterSet> const& val, bool is_tracked)
+      : name_(name), rep(), type('p'), tracked(is_tracked ? '+' : '-') {
+    if (!encode(rep, val))
+      throwEncodeError("vector<ParameterSet>");
     validate();
   }
 
-// ----------------------------------------------------------------------
-// coded string
+  // ----------------------------------------------------------------------
+  // coded string
 
-  Entry::Entry(std::string const& name, std::string const& code) :
-    name_(name), rep(), type('?'), tracked('?') {
-    if(!fromString(code.begin(), code.end()))
+  Entry::Entry(std::string const& name, std::string const& code) : name_(name), rep(), type('?'), tracked('?') {
+    if (!fromString(code.begin(), code.end()))
       throwEncodeError("coded string");
     validate();
   }
 
-
-  Entry::Entry(std::string const& name, std::string const& type, std::string const& value,
-               bool is_tracked) :
-    name_(name), rep(), type('?'), tracked('?') {
-    std::string codedString(is_tracked ?"-":"+");
+  Entry::Entry(std::string const& name, std::string const& type, std::string const& value, bool is_tracked)
+      : name_(name), rep(), type('?'), tracked('?') {
+    std::string codedString(is_tracked ? "-" : "+");
 
     Type2Code::const_iterator itFound = sTypeTranslations.type2Code_.find(type);
-    if(itFound == sTypeTranslations.type2Code_.end()) {
-        throw Exception(errors::Configuration)
-          << "bad type name used for Entry : " << type;
+    if (itFound == sTypeTranslations.type2Code_.end()) {
+      throw Exception(errors::Configuration) << "bad type name used for Entry : " << type;
     }
 
     codedString += itFound->second;
-    codedString +='(';
+    codedString += '(';
     codedString += value;
-    codedString +=')';
+    codedString += ')';
 
-    if(!fromString(codedString.begin(), codedString.end())) {
-        throw Exception(errors::Configuration)
-          <<  "bad encoded Entry string " <<  codedString;
+    if (!fromString(codedString.begin(), codedString.end())) {
+      throw Exception(errors::Configuration) << "bad encoded Entry string " << codedString;
     }
     validate();
   }
 
-  Entry::Entry(std::string const& name, std::string const& type,
-               std::vector<std::string> const& value,
-               bool is_tracked) :
-    name_(name), rep() , type('?'), tracked('?') {
-    std::string codedString(is_tracked ?"-":"+");
+  Entry::Entry(std::string const& name, std::string const& type, std::vector<std::string> const& value, bool is_tracked)
+      : name_(name), rep(), type('?'), tracked('?') {
+    std::string codedString(is_tracked ? "-" : "+");
 
-    Type2Code::const_iterator itFound =
-      sTypeTranslations.type2Code_.find(type);
-    if(itFound == sTypeTranslations.type2Code_.end()) {
-        throw Exception(errors::Configuration)
-          << "bad type name used for Entry : " << type;
+    Type2Code::const_iterator itFound = sTypeTranslations.type2Code_.find(type);
+    if (itFound == sTypeTranslations.type2Code_.end()) {
+      throw Exception(errors::Configuration) << "bad type name used for Entry : " << type;
     }
 
     codedString += itFound->second;
@@ -564,7 +596,7 @@ namespace edm {
     std::vector<std::string>::const_iterator e = value.end();
     std::string const kSeparator(",");
     std::string sep("");
-    for(; i!= e; ++i) {
+    for (; i != e; ++i) {
       codedString += sep;
       codedString += *i;
       sep = kSeparator;
@@ -572,19 +604,17 @@ namespace edm {
     codedString += '}';
     codedString += ')';
 
-    if(!fromString(codedString.begin(), codedString.end())) {
-        throw Exception(errors::Configuration)
-          << "bad encoded Entry string " << codedString;
+    if (!fromString(codedString.begin(), codedString.end())) {
+      throw Exception(errors::Configuration) << "bad encoded Entry string " << codedString;
     }
     validate();
   }
 
-// ----------------------------------------------------------------------
-// coding
-// ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
+  // coding
+  // ----------------------------------------------------------------------
 
-  void
-  Entry::toString(std::string& result) const {
+  void Entry::toString(std::string& result) const {
     result.reserve(result.size() + sizeOfString());
     result += tracked;
     result += type;
@@ -593,8 +623,7 @@ namespace edm {
     result += ')';
   }
 
-  void
-  Entry::toDigest(cms::Digest &digest) const {
+  void Entry::toDigest(cms::Digest& digest) const {
     digest.append(&tracked, 1);
     digest.append(&type, 1);
     digest.append("(", 1);
@@ -602,451 +631,449 @@ namespace edm {
     digest.append(")", 1);
   }
 
-  std::string
-  Entry::toString() const {
+  std::string Entry::toString() const {
     std::string result;
     toString(result);
     return result;
   }
 
-// ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
 
-  bool
-  Entry::fromString(std::string::const_iterator const b, std::string::const_iterator const e) {
-    if(static_cast<unsigned int>(e - b) < 4u || b[2] != '(' || e[-1] != ')')
+  bool Entry::fromString(std::string::const_iterator const b, std::string::const_iterator const e) {
+    if (static_cast<unsigned int>(e - b) < 4u || b[2] != '(' || e[-1] != ')')
 
       return false;
 
     tracked = b[0];
     type = b[1];
-    rep = std::string(b+3, e-1);
+    rep = std::string(b + 3, e - 1);
 
     return true;
   }  // from_string()
 
-// ----------------------------------------------------------------------
-// value accessors
-// ----------------------------------------------------------------------
-
+  // ----------------------------------------------------------------------
+  // value accessors
+  // ----------------------------------------------------------------------
 
-// ----------------------------------------------------------------------
-// Bool
+  // ----------------------------------------------------------------------
+  // Bool
 
-  bool
-  Entry::getBool() const {
-    if (type != 'B') throwValueError("bool");
-    bool  val;
-    if (!decode(val, rep)) throwEntryError("bool", rep);
+  bool Entry::getBool() const {
+    if (type != 'B')
+      throwValueError("bool");
+    bool val;
+    if (!decode(val, rep))
+      throwEntryError("bool", rep);
     return val;
   }
 
+  // ----------------------------------------------------------------------
+  // Int32
 
-// ----------------------------------------------------------------------
-// Int32
-
-  int
-  Entry::getInt32() const {
-    if(type != 'I') throwValueError("int");
-    int  val;
-    if(!decode(val, rep)) throwEntryError("int", rep);
+  int Entry::getInt32() const {
+    if (type != 'I')
+      throwValueError("int");
+    int val;
+    if (!decode(val, rep))
+      throwEntryError("int", rep);
     return val;
   }
 
-// ----------------------------------------------------------------------
-// vInt32
+  // ----------------------------------------------------------------------
+  // vInt32
 
-  std::vector<int>
-  Entry::getVInt32() const {
-    if(type != 'i') throwValueError("vector<int>");
-    std::vector<int>  val;
-    if(!decode(val, rep)) throwEntryError("vector<int>", rep);
+  std::vector<int> Entry::getVInt32() const {
+    if (type != 'i')
+      throwValueError("vector<int>");
+    std::vector<int> val;
+    if (!decode(val, rep))
+      throwEntryError("vector<int>", rep);
     return val;
   }
 
+  // ----------------------------------------------------------------------
+  // Int32
 
-// ----------------------------------------------------------------------
-// Int32
-
-  long long
-  Entry::getInt64() const {
-    if(type != 'L') throwValueError("int64");
-    long long  val;
-    if(!decode(val, rep)) throwEntryError("int64", rep);
+  long long Entry::getInt64() const {
+    if (type != 'L')
+      throwValueError("int64");
+    long long val;
+    if (!decode(val, rep))
+      throwEntryError("int64", rep);
     return val;
   }
 
-// ----------------------------------------------------------------------
-// vInt32
+  // ----------------------------------------------------------------------
+  // vInt32
 
-  std::vector<long long>
-  Entry::getVInt64() const {
-    if(type != 'l') throwValueError("vector<int64>");
-    std::vector<long long>  val;
-    if(!decode(val, rep)) throwEntryError("vector<int64>", rep);
+  std::vector<long long> Entry::getVInt64() const {
+    if (type != 'l')
+      throwValueError("vector<int64>");
+    std::vector<long long> val;
+    if (!decode(val, rep))
+      throwEntryError("vector<int64>", rep);
     return val;
   }
 
+  // ----------------------------------------------------------------------
+  // Uint32
 
-
-// ----------------------------------------------------------------------
-// Uint32
-
-  unsigned
-  Entry::getUInt32() const {
-    if(type != 'U') throwValueError("unsigned int");
-    unsigned  val;
-    if(!decode(val, rep)) throwEntryError("unsigned int", rep);
+  unsigned Entry::getUInt32() const {
+    if (type != 'U')
+      throwValueError("unsigned int");
+    unsigned val;
+    if (!decode(val, rep))
+      throwEntryError("unsigned int", rep);
     return val;
   }
 
-// ----------------------------------------------------------------------
-// vUint32
+  // ----------------------------------------------------------------------
+  // vUint32
 
-  std::vector<unsigned>
-  Entry::getVUInt32() const {
-    if(type != 'u') throwValueError("vector<unsigned int>");
-    std::vector<unsigned>  val;
-    if(!decode(val, rep)) throwEntryError("vector<unsigned int>", rep);
+  std::vector<unsigned> Entry::getVUInt32() const {
+    if (type != 'u')
+      throwValueError("vector<unsigned int>");
+    std::vector<unsigned> val;
+    if (!decode(val, rep))
+      throwEntryError("vector<unsigned int>", rep);
     return val;
   }
 
+  // ----------------------------------------------------------------------
+  // Uint64
 
-// ----------------------------------------------------------------------
-// Uint64
-
-  unsigned long long
-  Entry::getUInt64() const {
-    if(type != 'X') throwValueError("uint64");
+  unsigned long long Entry::getUInt64() const {
+    if (type != 'X')
+      throwValueError("uint64");
     unsigned long long val;
-    if(!decode(val, rep)) throwEntryError("uint64", rep);
+    if (!decode(val, rep))
+      throwEntryError("uint64", rep);
     return val;
   }
 
-// ----------------------------------------------------------------------
-// vUint64
+  // ----------------------------------------------------------------------
+  // vUint64
 
-  std::vector<unsigned long long>
-  Entry::getVUInt64() const {
-    if(type != 'x') throwValueError("vector<uint64>");
-    std::vector<unsigned long long>  val;
-    if(!decode(val, rep)) throwEntryError("vector<uint64>", rep);
+  std::vector<unsigned long long> Entry::getVUInt64() const {
+    if (type != 'x')
+      throwValueError("vector<uint64>");
+    std::vector<unsigned long long> val;
+    if (!decode(val, rep))
+      throwEntryError("vector<uint64>", rep);
     return val;
   }
 
-// ----------------------------------------------------------------------
-// Double
+  // ----------------------------------------------------------------------
+  // Double
 
-  double
-  Entry::getDouble() const {
-    if(type != 'D') throwValueError("double");
-    double  val;
-    if(!decode(val, rep)) throwEntryError("double", rep);
+  double Entry::getDouble() const {
+    if (type != 'D')
+      throwValueError("double");
+    double val;
+    if (!decode(val, rep))
+      throwEntryError("double", rep);
     return val;
   }
 
-// ----------------------------------------------------------------------
-// vDouble
+  // ----------------------------------------------------------------------
+  // vDouble
 
-  std::vector<double>
-  Entry::getVDouble() const {
-    if(type != 'd') throwValueError("vector<double>");
-    std::vector<double>  val;
-    if(!decode(val, rep)) throwEntryError("vector<double>", rep);
+  std::vector<double> Entry::getVDouble() const {
+    if (type != 'd')
+      throwValueError("vector<double>");
+    std::vector<double> val;
+    if (!decode(val, rep))
+      throwEntryError("vector<double>", rep);
     return val;
   }
 
-// ----------------------------------------------------------------------
-// String
+  // ----------------------------------------------------------------------
+  // String
 
-  std::string
-  Entry::getString() const {
-    if(type != 'S') throwValueError("string");
-    std::string  val;
-    if(!decode(val, rep)) throwEntryError("string", rep);
+  std::string Entry::getString() const {
+    if (type != 'S')
+      throwValueError("string");
+    std::string val;
+    if (!decode(val, rep))
+      throwEntryError("string", rep);
     return val;
   }
 
-// ----------------------------------------------------------------------
-// vString
+  // ----------------------------------------------------------------------
+  // vString
 
-  std::vector<std::string>
-  Entry::getVString() const {
-    if(type != 's') throwValueError("vector<string>");
-    std::vector<std::string>  val;
-    if(!decode(val, rep)) throwEntryError("vector<string>", rep);
+  std::vector<std::string> Entry::getVString() const {
+    if (type != 's')
+      throwValueError("vector<string>");
+    std::vector<std::string> val;
+    if (!decode(val, rep))
+      throwEntryError("vector<string>", rep);
     return val;
   }
 
+  // ----------------------------------------------------------------------
+  // FileInPath
 
-// ----------------------------------------------------------------------
-// FileInPath
-
-  FileInPath
-  Entry::getFileInPath() const {
-    if(type != 'F') throwValueError("FileInPath");
+  FileInPath Entry::getFileInPath() const {
+    if (type != 'F')
+      throwValueError("FileInPath");
     FileInPath val;
-    if(!decode(val, rep)) throwEntryError("FileInPath", rep);
+    if (!decode(val, rep))
+      throwEntryError("FileInPath", rep);
     return val;
   }
 
-// ----------------------------------------------------------------------
-// InputTag
+  // ----------------------------------------------------------------------
+  // InputTag
 
-  InputTag
-  Entry::getInputTag() const {
-    if(type != 't') throwValueError("InputTag");
+  InputTag Entry::getInputTag() const {
+    if (type != 't')
+      throwValueError("InputTag");
     InputTag val;
-    if(!decode(val, rep)) throwEntryError("InputTag", rep);
+    if (!decode(val, rep))
+      throwEntryError("InputTag", rep);
     return val;
   }
 
+  // ----------------------------------------------------------------------
+  // VInputTag
 
-// ----------------------------------------------------------------------
-// VInputTag
-
-  std::vector<InputTag>
-  Entry::getVInputTag() const {
-    if(type != 'v') throwValueError("VInputTag");
+  std::vector<InputTag> Entry::getVInputTag() const {
+    if (type != 'v')
+      throwValueError("VInputTag");
     std::vector<InputTag> val;
-    if(!decode(val, rep)) throwEntryError("VInputTag", rep);
+    if (!decode(val, rep))
+      throwEntryError("VInputTag", rep);
     return val;
   }
 
+  // ----------------------------------------------------------------------
+  // ESInputTag
 
-// ----------------------------------------------------------------------
-// ESInputTag
-
-   ESInputTag
-   Entry::getESInputTag() const {
-      if(type != kTESInputTag) throwValueError("ESInputTag");
-      ESInputTag val;
-      if(!decode(val, rep)) throwEntryError("ESInputTag", rep);
-      return val;
-   }
-
+  ESInputTag Entry::getESInputTag() const {
+    if (type != kTESInputTag)
+      throwValueError("ESInputTag");
+    ESInputTag val;
+    if (!decode(val, rep))
+      throwEntryError("ESInputTag", rep);
+    return val;
+  }
 
-// ----------------------------------------------------------------------
-// VESInputTag
+  // ----------------------------------------------------------------------
+  // VESInputTag
 
-   std::vector<ESInputTag>
-   Entry::getVESInputTag() const {
-      if(type != kTVESInputTag) throwValueError("VESInputTag");
-      std::vector<ESInputTag> val;
-      if(!decode(val, rep)) throwEntryError("VESInputTag", rep);
-      return val;
-   }
+  std::vector<ESInputTag> Entry::getVESInputTag() const {
+    if (type != kTVESInputTag)
+      throwValueError("VESInputTag");
+    std::vector<ESInputTag> val;
+    if (!decode(val, rep))
+      throwEntryError("VESInputTag", rep);
+    return val;
+  }
 
-// ----------------------------------------------------------------------
-// EventID
+  // ----------------------------------------------------------------------
+  // EventID
 
-  EventID
-  Entry::getEventID() const {
-    if(type != 'E') throwValueError("EventID");
+  EventID Entry::getEventID() const {
+    if (type != 'E')
+      throwValueError("EventID");
     EventID val;
-    if(!decode(val, rep)) throwEntryError("EventID", rep);
+    if (!decode(val, rep))
+      throwEntryError("EventID", rep);
     return val;
   }
 
-// ----------------------------------------------------------------------
-// VEventID
+  // ----------------------------------------------------------------------
+  // VEventID
 
-  std::vector<EventID>
-  Entry::getVEventID() const {
-    if(type != 'e') throwValueError("VEventID");
+  std::vector<EventID> Entry::getVEventID() const {
+    if (type != 'e')
+      throwValueError("VEventID");
     std::vector<EventID> val;
-    if(!decode(val, rep)) throwEntryError("EventID", rep);
+    if (!decode(val, rep))
+      throwEntryError("EventID", rep);
     return val;
   }
 
+  // ----------------------------------------------------------------------
+  // LuminosityBlockID
 
-// ----------------------------------------------------------------------
-// LuminosityBlockID
-
-  LuminosityBlockID
-  Entry::getLuminosityBlockID() const {
-    if(type != 'M') throwValueError("LuminosityBlockID");
+  LuminosityBlockID Entry::getLuminosityBlockID() const {
+    if (type != 'M')
+      throwValueError("LuminosityBlockID");
     LuminosityBlockID val;
-    if(!decode(val, rep)) throwEntryError("LuminosityBlockID", rep);
+    if (!decode(val, rep))
+      throwEntryError("LuminosityBlockID", rep);
     return val;
   }
 
-// ----------------------------------------------------------------------
-// VLuminosityBlockID
+  // ----------------------------------------------------------------------
+  // VLuminosityBlockID
 
-  std::vector<LuminosityBlockID>
-  Entry::getVLuminosityBlockID() const {
-    if(type != 'm') throwValueError("VLuminosityBlockID");
+  std::vector<LuminosityBlockID> Entry::getVLuminosityBlockID() const {
+    if (type != 'm')
+      throwValueError("VLuminosityBlockID");
     std::vector<LuminosityBlockID> val;
-    if(!decode(val, rep)) throwEntryError("LuminosityBlockID", rep);
+    if (!decode(val, rep))
+      throwEntryError("LuminosityBlockID", rep);
     return val;
   }
 
-// LuminosityBlockRange
+  // LuminosityBlockRange
 
-  LuminosityBlockRange
-  Entry::getLuminosityBlockRange() const {
-    if(type != 'A') throwValueError("LuminosityBlockRange");
+  LuminosityBlockRange Entry::getLuminosityBlockRange() const {
+    if (type != 'A')
+      throwValueError("LuminosityBlockRange");
     LuminosityBlockRange val;
-    if(!decode(val, rep)) throwEntryError("LuminosityBlockRange", rep);
+    if (!decode(val, rep))
+      throwEntryError("LuminosityBlockRange", rep);
     return val;
   }
 
-// ----------------------------------------------------------------------
-// VLuminosityBlockRange
+  // ----------------------------------------------------------------------
+  // VLuminosityBlockRange
 
-  std::vector<LuminosityBlockRange>
-  Entry::getVLuminosityBlockRange() const {
-    if(type != 'a') throwValueError("VLuminosityBlockRange");
+  std::vector<LuminosityBlockRange> Entry::getVLuminosityBlockRange() const {
+    if (type != 'a')
+      throwValueError("VLuminosityBlockRange");
     std::vector<LuminosityBlockRange> val;
-    if(!decode(val, rep)) throwEntryError("LuminosityBlockRange", rep);
+    if (!decode(val, rep))
+      throwEntryError("LuminosityBlockRange", rep);
     return val;
   }
 
-// ----------------------------------------------------------------------
-// EventRange
+  // ----------------------------------------------------------------------
+  // EventRange
 
-  EventRange
-  Entry::getEventRange() const {
-    if(type != 'R') throwValueError("EventRange");
+  EventRange Entry::getEventRange() const {
+    if (type != 'R')
+      throwValueError("EventRange");
     EventRange val;
-    if(!decode(val, rep)) throwEntryError("EventRange", rep);
+    if (!decode(val, rep))
+      throwEntryError("EventRange", rep);
     return val;
   }
 
-// ----------------------------------------------------------------------
-// VEventRange
+  // ----------------------------------------------------------------------
+  // VEventRange
 
-  std::vector<EventRange>
-  Entry::getVEventRange() const {
-    if(type != 'r') throwValueError("VEventRange");
+  std::vector<EventRange> Entry::getVEventRange() const {
+    if (type != 'r')
+      throwValueError("VEventRange");
     std::vector<EventRange> val;
-    if(!decode(val, rep)) throwEntryError("EventRange", rep);
+    if (!decode(val, rep))
+      throwEntryError("EventRange", rep);
     return val;
   }
 
-// ----------------------------------------------------------------------
-// ----------------------------------------------------------------------
-// ParameterSet
+  // ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
+  // ParameterSet
 
-  ParameterSet
-  Entry::getPSet() const {
-    if(type != 'P') throwValueError("ParameterSet");
+  ParameterSet Entry::getPSet() const {
+    if (type != 'P')
+      throwValueError("ParameterSet");
     ParameterSet val;
-    if(!decode(val, rep)) throwEntryError("ParameterSet", rep);
+    if (!decode(val, rep))
+      throwEntryError("ParameterSet", rep);
     return val;
   }
 
-// ----------------------------------------------------------------------
-// vPSet
+  // ----------------------------------------------------------------------
+  // vPSet
 
-  std::vector<ParameterSet>
-  Entry::getVPSet() const {
-    if(type != 'p') throwValueError("vector<ParameterSet>");
-    std::vector<ParameterSet>  val;
-    if(!decode(val, rep)) throwEntryError("vector<ParameterSet>", rep);
+  std::vector<ParameterSet> Entry::getVPSet() const {
+    if (type != 'p')
+      throwValueError("vector<ParameterSet>");
+    std::vector<ParameterSet> val;
+    if (!decode(val, rep))
+      throwEntryError("vector<ParameterSet>", rep);
     return val;
   }
 
-
-  std::ostream&
-  operator<< (std::ostream& os, Entry const& entry) {
-    os << sTypeTranslations.table_[entry.typeCode()] << " "
-       << (entry.isTracked() ? "tracked " : "untracked ") <<" = ";
+  std::ostream& operator<<(std::ostream& os, Entry const& entry) {
+    os << sTypeTranslations.table_[entry.typeCode()] << " " << (entry.isTracked() ? "tracked " : "untracked ") << " = ";
 
     // now handle the difficult cases
-    switch(entry.typeCode()) {
-      case 'P': // ParameterSet
+    switch (entry.typeCode()) {
+      case 'P':  // ParameterSet
       {
         os << entry.getPSet();
         break;
       }
-      case 'p': // vector<ParameterSet>
+      case 'p':  // vector<ParameterSet>
       {
         // Make sure we get the representation of each contained
         // ParameterSet including *only* tracked parameters
         std::vector<ParameterSet> whole = entry.getVPSet();
         std::vector<ParameterSet>::const_iterator i = whole.begin();
         std::vector<ParameterSet>::const_iterator e = whole.end();
-        std::string start ="";
+        std::string start = "";
         std::string const between(",\n");
-        os << "{"<<std::endl;
-         for (; i != e; ++i) {
-           os <<  start<< *i;
-           start = between;
-         }
-         if (!whole.empty()) {
-           os << std::endl;
-         }
-         os << "}";
-         break;
+        os << "{" << std::endl;
+        for (; i != e; ++i) {
+          os << start << *i;
+          start = between;
+        }
+        if (!whole.empty()) {
+          os << std::endl;
+        }
+        os << "}";
+        break;
       }
-      case 'S':
-      {
+      case 'S': {
         os << "'" << entry.getString() << "'";
         break;
       }
-      case 's':
-      {
-
+      case 's': {
         os << "{";
-        std::string start ="'";
+        std::string start = "'";
         std::string const between(",'");
         std::vector<std::string> strings = entry.getVString();
-        for(std::vector<std::string>::const_iterator it = strings.begin(), itEnd = strings.end();
-            it != itEnd;
-            ++it) {
+        for (std::vector<std::string>::const_iterator it = strings.begin(), itEnd = strings.end(); it != itEnd; ++it) {
           os << start << *it << "'";
           start = between;
         }
         os << "}";
         break;
       }
-      case 'I':
-      {
+      case 'I': {
         os << entry.getInt32();
         break;
       }
-      case 'U':
-      {
+      case 'U': {
         os << entry.getUInt32();
         break;
       }
-      case 'v':
-      {
+      case 'v': {
         //VInputTag needs to be treated seperately because it is encode like
         // vector<string> rather than using the individual encodings of each InputTag
         os << "{";
         std::string start = "";
         std::string const between(",");
         std::vector<InputTag> tags = entry.getVInputTag();
-        for(std::vector<InputTag>::const_iterator it = tags.begin(), itEnd = tags.end();
-            it != itEnd;
-            ++it) {
+        for (std::vector<InputTag>::const_iterator it = tags.begin(), itEnd = tags.end(); it != itEnd; ++it) {
           os << start << it->encode();
           start = between;
         }
         os << "}";
         break;
       }
-       case kTVESInputTag:
-       {
-          //VESInputTag needs to be treated seperately because it is encode like
-          // vector<string> rather than using the individual encodings of each ESInputTag
-          os << "{";
-          std::string start = "";
-          std::string const between(",");
-          std::vector<ESInputTag> tags = entry.getVESInputTag();
-          for(std::vector<ESInputTag>::const_iterator it = tags.begin(), itEnd = tags.end();
-              it != itEnd;
-              ++it) {
-             os << start << it->encode();
-             start = between;
-          }
-          os << "}";
-          break;
-       }
-       default:
-      {
+      case kTVESInputTag: {
+        //VESInputTag needs to be treated seperately because it is encode like
+        // vector<string> rather than using the individual encodings of each ESInputTag
+        os << "{";
+        std::string start = "";
+        std::string const between(",");
+        std::vector<ESInputTag> tags = entry.getVESInputTag();
+        for (std::vector<ESInputTag>::const_iterator it = tags.begin(), itEnd = tags.end(); it != itEnd; ++it) {
+          os << start << it->encode();
+          start = between;
+        }
+        os << "}";
+        break;
+      }
+      default: {
         os << entry.rep;
         break;
       }
@@ -1055,26 +1082,20 @@ namespace edm {
     return os;
   }
 
-    // Helper functions for throwing exceptions
-
-    void Entry::throwValueError(char const* expectedType) const {
-      throw Exception(errors::Configuration, "ValueError")
-        << "type of " << name_ << " is expected to be " << expectedType
-        << " but declared as " << sTypeTranslations.table_[type];
-    }
+  // Helper functions for throwing exceptions
 
-    void Entry::throwEntryError(char const* expectedType,
-                         std::string const& badRep) const {
-      throw Exception(errors::Configuration, "EntryError")
-        << "can not convert representation of " << name_ << ": "
-        << badRep
-        << " to value of type " << expectedType << " ";
-    }
+  void Entry::throwValueError(char const* expectedType) const {
+    throw Exception(errors::Configuration, "ValueError") << "type of " << name_ << " is expected to be " << expectedType
+                                                         << " but declared as " << sTypeTranslations.table_[type];
+  }
 
-    void Entry::throwEncodeError(char const* type) const {
-      throw Exception(errors::Configuration, "EncodingError")
-        << "can not encode " << name_ << " as type: " << type;
-    }
+  void Entry::throwEntryError(char const* expectedType, std::string const& badRep) const {
+    throw Exception(errors::Configuration, "EntryError") << "can not convert representation of " << name_ << ": "
+                                                         << badRep << " to value of type " << expectedType << " ";
+  }
 
+  void Entry::throwEncodeError(char const* type) const {
+    throw Exception(errors::Configuration, "EncodingError") << "can not encode " << name_ << " as type: " << type;
+  }
 
-}
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/FileInPath.cc b/FWCore/ParameterSet/src/FileInPath.cc
index 7b72e755ab0c0..a11b3dd0aeaa3 100644
--- a/FWCore/ParameterSet/src/FileInPath.cc
+++ b/FWCore/ParameterSet/src/FileInPath.cc
@@ -14,8 +14,7 @@
 
 namespace bf = boost::filesystem;
 
-namespace
-{
+namespace {
 
   std::atomic<bool> s_fileLookupDisabled{false};
 
@@ -40,7 +39,7 @@ namespace
   // Remove symlinks from path
   std::string removeSymLinks(std::string const& envName) {
     char const* const var = getenv(envName.c_str());
-    if(var == nullptr) {
+    if (var == nullptr) {
       return std::string();
     }
     std::string path = var;
@@ -50,28 +49,29 @@ namespace
 
   std::string removeSymLinksSrc(std::string const& envName) {
     char const* const var = getenv(envName.c_str());
-    if(var == nullptr) {
+    if (var == nullptr) {
       return std::string();
     }
     std::string const src = "/src";
     std::string path = var + src;
     edm::resolveSymbolicLinks(path);
     size_t actualSize = path.size() - src.size();
-    assert(path.substr(actualSize, src.size())  == src);
+    assert(path.substr(actualSize, src.size()) == src);
     return path.substr(0, actualSize);
   }
 
   std::string removeSymLinksTokens(std::string const& envName) {
     char const* const var = getenv(envName.c_str());
-    if(var == nullptr) {
+    if (var == nullptr) {
       return std::string();
     }
     std::string theSearchPath;
     typedef std::vector<std::string> stringvec_t;
     stringvec_t pathElements = edm::tokenize(std::string(var), ":");
-    for(auto& element : pathElements) {
+    for (auto& element : pathElements) {
       edm::resolveSymbolicLinks(element);
-      if(!theSearchPath.empty()) theSearchPath += ":";
+      if (!theSearchPath.empty())
+        theSearchPath += ":";
       theSearchPath += element;
     }
     return theSearchPath;
@@ -83,49 +83,34 @@ namespace
   // Return false is *nothing* is found
   // Throw an exception if either a directory or symbolic link is found.
   // If true is returned, then put the
-  bool locateFile(bf::path  p,
-		  std::string const& relative)
-  {
+  bool locateFile(bf::path p, std::string const& relative) {
     p /= relative;
 
-    if (!bf::exists(p)) return false;
+    if (!bf::exists(p))
+      return false;
 
     if (bf::is_directory(p)) {
-      throw edm::Exception(edm::errors::FileInPathError)
-	<< "Path "
-	<< p.string()
-	<< " is a directory, not a file\n";
+      throw edm::Exception(edm::errors::FileInPathError) << "Path " << p.string() << " is a directory, not a file\n";
     }
 
     if (bf::is_symlink(bf::symlink_status(p))) {
       throw edm::Exception(edm::errors::FileInPathError)
-	<< "Path "
-	<< p.string()
-	<< " is a symbolic link, not a file\n";
+          << "Path " << p.string() << " is a symbolic link, not a file\n";
     }
     return true;
   }
-}
+}  // namespace
 
-namespace edm
-{
+namespace edm {
 
-  FileInPath::FileInPath() :
-    relativePath_(),
-    canonicalFilename_(),
-    location_(Unknown)
-  {
+  FileInPath::FileInPath() : relativePath_(), canonicalFilename_(), location_(Unknown) {
     if (s_fileLookupDisabled) {
       return;
     }
     getEnvironment();
   }
 
-  FileInPath::FileInPath(const std::string& r) :
-    relativePath_(r),
-    canonicalFilename_(),
-    location_(Unknown)
-  {
+  FileInPath::FileInPath(const std::string& r) : relativePath_(r), canonicalFilename_(), location_(Unknown) {
     if (s_fileLookupDisabled) {
       return;
     }
@@ -133,44 +118,35 @@ namespace edm
     initialize_();
   }
 
-  FileInPath::FileInPath(char const* r) :
-    relativePath_(r ? r : ""),
-    canonicalFilename_(),
-    location_(Unknown)
-  {
+  FileInPath::FileInPath(char const* r) : relativePath_(r ? r : ""), canonicalFilename_(), location_(Unknown) {
     if (s_fileLookupDisabled) {
       return;
     }
-    if(r == nullptr) {
-     throw edm::Exception(edm::errors::FileInPathError) << "Relative path must not be null\n";
+    if (r == nullptr) {
+      throw edm::Exception(edm::errors::FileInPathError) << "Relative path must not be null\n";
     }
     getEnvironment();
     initialize_();
   }
 
-  FileInPath::FileInPath(FileInPath const& other) :
-    relativePath_(other.relativePath_),
-    canonicalFilename_(other.canonicalFilename_),
-    location_(other.location_),
-    localTop_(other.localTop_),
-    releaseTop_(other.releaseTop_),
-    dataTop_(other.dataTop_),
-    searchPath_(other.searchPath_)
-  {}
+  FileInPath::FileInPath(FileInPath const& other)
+      : relativePath_(other.relativePath_),
+        canonicalFilename_(other.canonicalFilename_),
+        location_(other.location_),
+        localTop_(other.localTop_),
+        releaseTop_(other.releaseTop_),
+        dataTop_(other.dataTop_),
+        searchPath_(other.searchPath_) {}
 
   FileInPath::~FileInPath() {}
 
-  FileInPath&
-  FileInPath::operator=(FileInPath const& other)
-  {
+  FileInPath& FileInPath::operator=(FileInPath const& other) {
     FileInPath temp(other);
     this->swap(temp);
     return *this;
   }
 
-  void
-  FileInPath::swap(FileInPath& other)
-  {
+  void FileInPath::swap(FileInPath& other) {
     relativePath_.swap(other.relativePath_);
     canonicalFilename_.swap(other.canonicalFilename_);
     std::swap(location_, other.location_);
@@ -180,91 +156,52 @@ namespace edm
     searchPath_.swap(other.searchPath_);
   }
 
-  std::string
-  FileInPath::relativePath() const
-  {
-    return relativePath_;
-  }
+  std::string FileInPath::relativePath() const { return relativePath_; }
 
+  FileInPath::LocationCode FileInPath::location() const { return location_; }
 
-  FileInPath::LocationCode
-  FileInPath::location() const
-  {
-    return location_;
-  }
-
-  std::string
-  FileInPath::fullPath() const
-  {
-    return canonicalFilename_;
-  }
+  std::string FileInPath::fullPath() const { return canonicalFilename_; }
 
-  void
-  FileInPath::write(std::ostream& os) const
-  {
+  void FileInPath::write(std::ostream& os) const {
     if (location_ == Unknown) {
       os << version << ' ' << relativePath_ << ' ' << location_;
     } else if (location_ == Local) {
       // Guarantee a site independent value by stripping $LOCALTOP.
       if (localTop_.empty()) {
-	throw edm::Exception(edm::errors::FileInPathError)
-	  << "Environment Variable "
-	  << LOCALTOP
-	  << " is not set.\n";
+        throw edm::Exception(edm::errors::FileInPathError) << "Environment Variable " << LOCALTOP << " is not set.\n";
       }
       std::string::size_type pos = canonicalFilename_.find(localTop_);
       if (pos != 0) {
-	throw edm::Exception(edm::errors::FileInPathError)
-	  << "Path "
-	  << canonicalFilename_
-	  << " is not in the local release area "
-	  << localTop_
-	  << "\n";
+        throw edm::Exception(edm::errors::FileInPathError)
+            << "Path " << canonicalFilename_ << " is not in the local release area " << localTop_ << "\n";
       }
       os << version << ' ' << relativePath_ << ' ' << location_ << ' ' << canonicalFilename_.substr(localTop_.size());
     } else if (location_ == Release) {
       // Guarantee a site independent value by stripping $RELEASETOP.
       if (releaseTop_.empty()) {
-	throw edm::Exception(edm::errors::FileInPathError)
-	  << "Environment Variable "
-	  << RELEASETOP
-	  << " is not set.\n";
+        throw edm::Exception(edm::errors::FileInPathError) << "Environment Variable " << RELEASETOP << " is not set.\n";
       }
       std::string::size_type pos = canonicalFilename_.find(releaseTop_);
       if (pos != 0) {
-	throw edm::Exception(edm::errors::FileInPathError)
-	  << "Path "
-	  << canonicalFilename_
-	  << " is not in the base release area "
-	  << releaseTop_
-	  << "\n";
+        throw edm::Exception(edm::errors::FileInPathError)
+            << "Path " << canonicalFilename_ << " is not in the base release area " << releaseTop_ << "\n";
       }
       os << version << ' ' << relativePath_ << ' ' << location_ << ' ' << canonicalFilename_.substr(releaseTop_.size());
     } else if (location_ == Data) {
       // Guarantee a site independent value by stripping $DATATOP.
       if (dataTop_.empty()) {
-	throw edm::Exception(edm::errors::FileInPathError)
-	  << "Environment Variable "
-	  << DATATOP
-	  << " is not set.\n";
+        throw edm::Exception(edm::errors::FileInPathError) << "Environment Variable " << DATATOP << " is not set.\n";
       }
       std::string::size_type pos = canonicalFilename_.find(dataTop_);
       if (pos != 0) {
-	throw edm::Exception(edm::errors::FileInPathError)
-	  << "Path "
-	  << canonicalFilename_
-	  << " is not in the data area "
-	  << dataTop_
-	  << "\n";
+        throw edm::Exception(edm::errors::FileInPathError)
+            << "Path " << canonicalFilename_ << " is not in the data area " << dataTop_ << "\n";
       }
       os << version << ' ' << relativePath_ << ' ' << location_ << ' ' << canonicalFilename_.substr(dataTop_.size());
     }
   }
 
-
-  void
-  FileInPath::read(std::istream& is)
-  {
+  void FileInPath::read(std::istream& is) {
     std::string vsn;
     std::string relname;
     std::string canFilename;
@@ -272,7 +209,8 @@ namespace edm
     // This #if needed for backward compatibility
     // for files written before CMSSW_1_5_0_pre3.
     is >> vsn;
-    if (!is) return;
+    if (!is)
+      return;
     bool oldFormat = (version != vsn);
     if (oldFormat) {
       relname = vsn;
@@ -285,20 +223,19 @@ namespace edm
       int loc;
       is >> relname >> loc;
       location_ = static_cast<FileInPath::LocationCode>(loc);
-      if (location_ != Unknown) is >> canFilename;
+      if (location_ != Unknown)
+        is >> canFilename;
     }
 #else
     is >> vsn >> relname >> loc >> canFilename;
 #endif
-    if (!is) return;
+    if (!is)
+      return;
     relativePath_ = relname;
     if (location_ == Local) {
       if (localTop_.empty()) {
-	throw edm::Exception(edm::errors::FileInPathError)
-	  << "Environment Variable "
-	  << LOCALTOP
-	  << " is not set.\n"
-	  << "Trying to read Local file: " << canFilename << ".\n";
+        throw edm::Exception(edm::errors::FileInPathError) << "Environment Variable " << LOCALTOP << " is not set.\n"
+                                                           << "Trying to read Local file: " << canFilename << ".\n";
       }
 #if 1
       // This #if needed for backward compatibility
@@ -307,19 +244,16 @@ namespace edm
         canonicalFilename_ = canFilename;
       } else
 #endif
-      canonicalFilename_ = localTop_ + canFilename;
+        canonicalFilename_ = localTop_ + canFilename;
     } else if (location_ == Release) {
       if (releaseTop_.empty()) {
-	throw edm::Exception(edm::errors::FileInPathError)
-	  << "Environment Variable "
-	  << RELEASETOP
-	  << " is not set.\n";
+        throw edm::Exception(edm::errors::FileInPathError) << "Environment Variable " << RELEASETOP << " is not set.\n";
       }
 #if 1
       // This #if needed for backward compatibility
       // for files written before CMSSW_1_5_0_pre3.
       if (oldFormat) {
-         std::string::size_type pos = canFilename.find(BASE);
+        std::string::size_type pos = canFilename.find(BASE);
         if (pos == 0) {
           // Replace the placehoder with the path to the base release (site dependent).
           canonicalFilename_ = releaseTop_ + canFilename.substr(BASE.size());
@@ -329,26 +263,22 @@ namespace edm
         }
       } else
 #endif
-      canonicalFilename_ = releaseTop_ + canFilename;
+        canonicalFilename_ = releaseTop_ + canFilename;
     } else if (location_ == Data) {
       if (dataTop_.empty()) {
-	throw edm::Exception(edm::errors::FileInPathError)
-	  << "Environment Variable "
-	  << DATATOP
-	  << " is not set.\n";
+        throw edm::Exception(edm::errors::FileInPathError) << "Environment Variable " << DATATOP << " is not set.\n";
       }
       canonicalFilename_ = dataTop_ + canFilename;
     }
   }
 
-  void
-  FileInPath::readFromParameterSetBlob(std::istream& is)
-  {
+  void FileInPath::readFromParameterSetBlob(std::istream& is) {
     std::string vsn;
     std::string relname;
     std::string canFilename;
     is >> vsn;
-    if (!is) return;
+    if (!is)
+      return;
     bool oldFormat = (version != vsn);
     if (oldFormat) {
       relname = vsn;
@@ -361,24 +291,26 @@ namespace edm
       int loc;
       is >> relname >> loc;
       location_ = static_cast<FileInPath::LocationCode>(loc);
-      if (location_ != Unknown) is >> canFilename;
+      if (location_ != Unknown)
+        is >> canFilename;
     }
-    if (!is) return;
+    if (!is)
+      return;
     relativePath_ = relname;
     if (location_ == Local) {
       if (localTop_.empty()) {
-	localTop_ = "@LOCAL";
+        localTop_ = "@LOCAL";
       }
       if (oldFormat) {
         canonicalFilename_ = canFilename;
       } else
-      canonicalFilename_ = localTop_ + canFilename;
+        canonicalFilename_ = localTop_ + canFilename;
     } else if (location_ == Release) {
       if (releaseTop_.empty()) {
-	releaseTop_="@RELEASE";
+        releaseTop_ = "@RELEASE";
       }
       if (oldFormat) {
-         std::string::size_type pos = canFilename.find(BASE);
+        std::string::size_type pos = canFilename.find(BASE);
         if (pos == 0) {
           // Replace the placehoder with the path to the base release (site dependent).
           canonicalFilename_ = releaseTop_ + canFilename.substr(BASE.size());
@@ -387,13 +319,10 @@ namespace edm
           canonicalFilename_ = canFilename;
         }
       } else
-      canonicalFilename_ = releaseTop_ + canFilename;
+        canonicalFilename_ = releaseTop_ + canFilename;
     } else if (location_ == Data) {
       if (dataTop_.empty()) {
-	throw edm::Exception(edm::errors::FileInPathError)
-	  << "Environment Variable "
-	  << DATATOP
-	  << " is not set.\n";
+        throw edm::Exception(edm::errors::FileInPathError) << "Environment Variable " << DATATOP << " is not set.\n";
       }
       canonicalFilename_ = dataTop_ + canFilename;
     }
@@ -401,14 +330,10 @@ namespace edm
 
   //------------------------------------------------------------
 
-
-  void
-  FileInPath::getEnvironment() {
+  void FileInPath::getEnvironment() {
     static std::string const searchPath = removeSymLinksTokens(PathVariableName);
     if (searchPath.empty()) {
-      throw edm::Exception(edm::errors::FileInPathError)
-	<< PathVariableName
-	<< " must be defined\n";
+      throw edm::Exception(edm::errors::FileInPathError) << PathVariableName << " must be defined\n";
     }
     searchPath_ = searchPath;
 
@@ -432,21 +357,19 @@ namespace edm
       // RELEASETOP is the same as LOCALTOP.  This means that the environment is set
       // for the base release itself.  So LOCALTOP actually contains the
       // location of the base release.
-        localTop_.clear();
+      localTop_.clear();
     }
   }
 
-  void
-  FileInPath::initialize_() {
+  void FileInPath::initialize_() {
     if (relativePath_.empty()) {
-      throw edm::Exception(edm::errors::FileInPathError)
-	<< "Relative path must not be empty\n";
+      throw edm::Exception(edm::errors::FileInPathError) << "Relative path must not be empty\n";
     }
 
     // Find the file, based on the value of path variable.
     typedef std::vector<std::string> stringvec_t;
-    stringvec_t  pathElements = tokenize(searchPath_, ":");
-    for(auto const& element : pathElements) {
+    stringvec_t pathElements = tokenize(searchPath_, ":");
+    for (auto const& element : pathElements) {
       // Set the boost::fs path to the current element of
       // CMSSW_SEARCH_PATH:
       bf::path pathPrefix(element);
@@ -454,76 +377,62 @@ namespace edm
       // Does the a file exist? locateFile throws is it finds
       // something goofy.
       if (locateFile(pathPrefix, relativePath_)) {
-	// Convert relative path to canonical form, and save it.
-	relativePath_ = bf::path(relativePath_).normalize().string();
-
-	// Save the absolute path.
-	canonicalFilename_ = bf::absolute(relativePath_, pathPrefix).string();
-	if (canonicalFilename_.empty()) {
-	  throw edm::Exception(edm::errors::FileInPathError)
-	    << "fullPath is empty"
-	    << "\nrelativePath() is: " << relativePath_
-	    << "\npath prefix is: " << pathPrefix.string()
-	    << '\n';
+        // Convert relative path to canonical form, and save it.
+        relativePath_ = bf::path(relativePath_).normalize().string();
+
+        // Save the absolute path.
+        canonicalFilename_ = bf::absolute(relativePath_, pathPrefix).string();
+        if (canonicalFilename_.empty()) {
+          throw edm::Exception(edm::errors::FileInPathError)
+              << "fullPath is empty"
+              << "\nrelativePath() is: " << relativePath_ << "\npath prefix is: " << pathPrefix.string() << '\n';
         }
 
-	// From the current path element, find the branch path (basically the path minus the
-	// last directory, e.g. /src or /share):
-	for (bf::path br = pathPrefix.branch_path(); !br.normalize().string().empty(); br = br.branch_path()) {
-
-	  if (!localTop_.empty()) {
-	    // Create a path object for our local path LOCALTOP:
-	    bf::path local_(localTop_);
-	    // If the branch path matches the local path, the file was found locally:
-	    if (br == local_) {
-	      location_ = Local;
-	      return;
-	    }
-	  }
-
-	  if (!releaseTop_.empty()) {
-	    // Create a path object for our release path RELEASETOP:
-	    bf::path release_(releaseTop_);
-	    // If the branch path matches the release path, the file was found in the release:
-	    if (br == release_) {
-	      location_ = Release;
-	      return;
-	    }
-	  }
-
-	  if (!dataTop_.empty()) {
-	    // Create a path object for our data path DATATOP:
-	    bf::path data_(dataTop_);
-	    // If the branch path matches the data path, the file was found in the data area:
-	    if (br == data_) {
-	      location_ = Data;
-	      return;
-	    }
-	  }
-	}
+        // From the current path element, find the branch path (basically the path minus the
+        // last directory, e.g. /src or /share):
+        for (bf::path br = pathPrefix.branch_path(); !br.normalize().string().empty(); br = br.branch_path()) {
+          if (!localTop_.empty()) {
+            // Create a path object for our local path LOCALTOP:
+            bf::path local_(localTop_);
+            // If the branch path matches the local path, the file was found locally:
+            if (br == local_) {
+              location_ = Local;
+              return;
+            }
+          }
+
+          if (!releaseTop_.empty()) {
+            // Create a path object for our release path RELEASETOP:
+            bf::path release_(releaseTop_);
+            // If the branch path matches the release path, the file was found in the release:
+            if (br == release_) {
+              location_ = Release;
+              return;
+            }
+          }
+
+          if (!dataTop_.empty()) {
+            // Create a path object for our data path DATATOP:
+            bf::path data_(dataTop_);
+            // If the branch path matches the data path, the file was found in the data area:
+            if (br == data_) {
+              location_ = Data;
+              return;
+            }
+          }
+        }
       }
     }
 
     // If we got here, we ran out of path elements without finding
     // what we're looking found.
     throw edm::Exception(edm::errors::FileInPathError)
-      << "edm::FileInPath unable to find file "
-      << relativePath_
-      << " anywhere in the search path."
-      << "\nThe search path is defined by: "
-      << PathVariableName
-      << "\n${"
-      << PathVariableName
-      << "} is: "
-      << getenv(PathVariableName.c_str())
-      << "\nCurrent directory is: "
-      << bf::initial_path().string()
-      << "\n";
-  }
-
-  void FileInPath::disableFileLookup() {
-    s_fileLookupDisabled = true;
+        << "edm::FileInPath unable to find file " << relativePath_ << " anywhere in the search path."
+        << "\nThe search path is defined by: " << PathVariableName << "\n${" << PathVariableName
+        << "} is: " << getenv(PathVariableName.c_str()) << "\nCurrent directory is: " << bf::initial_path().string()
+        << "\n";
   }
 
-}
+  void FileInPath::disableFileLookup() { s_fileLookupDisabled = true; }
 
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/FillDescriptionFromPSet.cc b/FWCore/ParameterSet/src/FillDescriptionFromPSet.cc
index 6ff74958ec7a7..e359aef0893a8 100644
--- a/FWCore/ParameterSet/src/FillDescriptionFromPSet.cc
+++ b/FWCore/ParameterSet/src/FillDescriptionFromPSet.cc
@@ -16,59 +16,73 @@ namespace edm {
   class EventRange;
   class InputTag;
   class FileInPath;
-}
+}  // namespace edm
 
-typedef void (*FillDescriptionFromParameter)(edm::ParameterSet const&, std::string const&, bool, edm::ParameterSetDescription&);
+typedef void (*FillDescriptionFromParameter)(edm::ParameterSet const&,
+                                             std::string const&,
+                                             bool,
+                                             edm::ParameterSetDescription&);
 
 static std::map<edm::ParameterTypes, FillDescriptionFromParameter> s_findTheRightFunction;
 
 namespace {
 
-  template<typename T>
+  template <typename T>
   void fillDescriptionFromParameter(edm::ParameterSet const& pset,
                                     std::string const& name,
                                     bool isTracked,
                                     edm::ParameterSetDescription& desc) {
     if (isTracked) {
       desc.add<T>(name, pset.getParameter<T>(name));
-    }
-    else {
+    } else {
       desc.addUntracked<T>(name, pset.getUntrackedParameter<T>(name));
     }
   }
 
   void initMap() {
     s_findTheRightFunction[static_cast<edm::ParameterTypes>('I')] = &fillDescriptionFromParameter<int>;
-    s_findTheRightFunction[static_cast<edm::ParameterTypes>('i')] = &fillDescriptionFromParameter<std::vector<int> >;
+    s_findTheRightFunction[static_cast<edm::ParameterTypes>('i')] = &fillDescriptionFromParameter<std::vector<int>>;
     s_findTheRightFunction[static_cast<edm::ParameterTypes>('U')] = &fillDescriptionFromParameter<unsigned>;
-    s_findTheRightFunction[static_cast<edm::ParameterTypes>('u')] = &fillDescriptionFromParameter<std::vector<unsigned> >;
+    s_findTheRightFunction[static_cast<edm::ParameterTypes>('u')] =
+        &fillDescriptionFromParameter<std::vector<unsigned>>;
     s_findTheRightFunction[static_cast<edm::ParameterTypes>('L')] = &fillDescriptionFromParameter<long long>;
-    s_findTheRightFunction[static_cast<edm::ParameterTypes>('l')] = &fillDescriptionFromParameter<std::vector<long long> >;
+    s_findTheRightFunction[static_cast<edm::ParameterTypes>('l')] =
+        &fillDescriptionFromParameter<std::vector<long long>>;
     s_findTheRightFunction[static_cast<edm::ParameterTypes>('X')] = &fillDescriptionFromParameter<unsigned long long>;
-    s_findTheRightFunction[static_cast<edm::ParameterTypes>('x')] = &fillDescriptionFromParameter<std::vector<unsigned long long> >;
+    s_findTheRightFunction[static_cast<edm::ParameterTypes>('x')] =
+        &fillDescriptionFromParameter<std::vector<unsigned long long>>;
     s_findTheRightFunction[static_cast<edm::ParameterTypes>('D')] = &fillDescriptionFromParameter<double>;
-    s_findTheRightFunction[static_cast<edm::ParameterTypes>('d')] = &fillDescriptionFromParameter<std::vector<double> >;
+    s_findTheRightFunction[static_cast<edm::ParameterTypes>('d')] = &fillDescriptionFromParameter<std::vector<double>>;
     s_findTheRightFunction[static_cast<edm::ParameterTypes>('B')] = &fillDescriptionFromParameter<bool>;
     s_findTheRightFunction[static_cast<edm::ParameterTypes>('S')] = &fillDescriptionFromParameter<std::string>;
-    s_findTheRightFunction[static_cast<edm::ParameterTypes>('s')] = &fillDescriptionFromParameter<std::vector<std::string> >;
+    s_findTheRightFunction[static_cast<edm::ParameterTypes>('s')] =
+        &fillDescriptionFromParameter<std::vector<std::string>>;
     s_findTheRightFunction[static_cast<edm::ParameterTypes>('E')] = &fillDescriptionFromParameter<edm::EventID>;
-    s_findTheRightFunction[static_cast<edm::ParameterTypes>('e')] = &fillDescriptionFromParameter<std::vector<edm::EventID> >;
-    s_findTheRightFunction[static_cast<edm::ParameterTypes>('M')] = &fillDescriptionFromParameter<edm::LuminosityBlockID>;
-    s_findTheRightFunction[static_cast<edm::ParameterTypes>('m')] = &fillDescriptionFromParameter<std::vector<edm::LuminosityBlockID> >;
+    s_findTheRightFunction[static_cast<edm::ParameterTypes>('e')] =
+        &fillDescriptionFromParameter<std::vector<edm::EventID>>;
+    s_findTheRightFunction[static_cast<edm::ParameterTypes>('M')] =
+        &fillDescriptionFromParameter<edm::LuminosityBlockID>;
+    s_findTheRightFunction[static_cast<edm::ParameterTypes>('m')] =
+        &fillDescriptionFromParameter<std::vector<edm::LuminosityBlockID>>;
     s_findTheRightFunction[static_cast<edm::ParameterTypes>('t')] = &fillDescriptionFromParameter<edm::InputTag>;
-    s_findTheRightFunction[static_cast<edm::ParameterTypes>('v')] = &fillDescriptionFromParameter<std::vector<edm::InputTag> >;
+    s_findTheRightFunction[static_cast<edm::ParameterTypes>('v')] =
+        &fillDescriptionFromParameter<std::vector<edm::InputTag>>;
     s_findTheRightFunction[static_cast<edm::ParameterTypes>('F')] = &fillDescriptionFromParameter<edm::FileInPath>;
-    s_findTheRightFunction[static_cast<edm::ParameterTypes>('A')] = &fillDescriptionFromParameter<edm::LuminosityBlockRange>;
-    s_findTheRightFunction[static_cast<edm::ParameterTypes>('a')] = &fillDescriptionFromParameter<std::vector<edm::LuminosityBlockRange> >;
+    s_findTheRightFunction[static_cast<edm::ParameterTypes>('A')] =
+        &fillDescriptionFromParameter<edm::LuminosityBlockRange>;
+    s_findTheRightFunction[static_cast<edm::ParameterTypes>('a')] =
+        &fillDescriptionFromParameter<std::vector<edm::LuminosityBlockRange>>;
     s_findTheRightFunction[static_cast<edm::ParameterTypes>('R')] = &fillDescriptionFromParameter<edm::EventRange>;
-    s_findTheRightFunction[static_cast<edm::ParameterTypes>('r')] = &fillDescriptionFromParameter<std::vector<edm::EventRange> >;
+    s_findTheRightFunction[static_cast<edm::ParameterTypes>('r')] =
+        &fillDescriptionFromParameter<std::vector<edm::EventRange>>;
   }
 
   std::map<edm::ParameterTypes, FillDescriptionFromParameter>& findTheRightFunction() {
-    if (s_findTheRightFunction.empty()) initMap();
+    if (s_findTheRightFunction.empty())
+      initMap();
     return s_findTheRightFunction;
   }
-}
+}  // namespace
 
 namespace edm {
 
@@ -85,61 +99,54 @@ namespace edm {
   // no way a description generated from a ParameterSet can properly
   // express those concepts.
 
-  void fillDescriptionFromPSet(ParameterSet const& pset,
-                               ParameterSetDescription& desc) {
+  void fillDescriptionFromPSet(ParameterSet const& pset, ParameterSetDescription& desc) {
     ParameterSet::table const& entries = pset.tbl();
-    for (ParameterSet::table::const_iterator entry = entries.begin(),
-           endEntries = entries.end();
-         entry != endEntries;
+    for (ParameterSet::table::const_iterator entry = entries.begin(), endEntries = entries.end(); entry != endEntries;
          ++entry) {
       std::map<edm::ParameterTypes, FillDescriptionFromParameter>::iterator iter =
-        findTheRightFunction().find(static_cast<edm::ParameterTypes>(entry->second.typeCode()));
+          findTheRightFunction().find(static_cast<edm::ParameterTypes>(entry->second.typeCode()));
       if (iter != findTheRightFunction().end()) {
         iter->second(pset, entry->first, entry->second.isTracked(), desc);
       }
     }
 
     ParameterSet::psettable const& pset_entries = pset.psetTable();
-    for (ParameterSet::psettable::const_iterator pset_entry = pset_entries.begin(),
-           endEntries = pset_entries.end();
+    for (ParameterSet::psettable::const_iterator pset_entry = pset_entries.begin(), endEntries = pset_entries.end();
          pset_entry != endEntries;
          ++pset_entry) {
       edm::ParameterSet nestedPset;
       if (pset_entry->second.isTracked()) {
         nestedPset = pset.getParameterSet(pset_entry->first);
-      }
-      else {
+      } else {
         nestedPset = pset.getUntrackedParameterSet(pset_entry->first);
       }
       ParameterSetDescription nestedDescription;
       fillDescriptionFromPSet(nestedPset, nestedDescription);
       if (pset_entry->second.isTracked()) {
         desc.add<edm::ParameterSetDescription>(pset_entry->first, nestedDescription);
-      }
-      else {
+      } else {
         desc.addUntracked<edm::ParameterSetDescription>(pset_entry->first, nestedDescription);
       }
     }
 
     ParameterSet::vpsettable const& vpset_entries = pset.vpsetTable();
-    for (ParameterSet::vpsettable::const_iterator vpset_entry = vpset_entries.begin(),
-           endEntries = vpset_entries.end();
+    for (ParameterSet::vpsettable::const_iterator vpset_entry = vpset_entries.begin(), endEntries = vpset_entries.end();
          vpset_entry != endEntries;
          ++vpset_entry) {
       std::vector<edm::ParameterSet> nestedVPset;
       if (vpset_entry->second.isTracked()) {
         nestedVPset = pset.getParameterSetVector(vpset_entry->first);
-      }
-      else {
+      } else {
         nestedVPset = pset.getUntrackedParameterSetVector(vpset_entry->first);
       }
       ParameterSetDescription emptyDescription;
 
-      auto pd = std::make_unique<ParameterDescription<std::vector<ParameterSet>>>(vpset_entry->first, emptyDescription, vpset_entry->second.isTracked(), nestedVPset);
+      auto pd = std::make_unique<ParameterDescription<std::vector<ParameterSet>>>(
+          vpset_entry->first, emptyDescription, vpset_entry->second.isTracked(), nestedVPset);
 
       pd->setPartOfDefaultOfVPSet(true);
       std::unique_ptr<ParameterDescriptionNode> node(std::move(pd));
       desc.addNode(std::move(node));
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/IfExistsDescription.cc b/FWCore/ParameterSet/src/IfExistsDescription.cc
index d8f67f8186613..aa56dd31dbe0b 100644
--- a/FWCore/ParameterSet/src/IfExistsDescription.cc
+++ b/FWCore/ParameterSet/src/IfExistsDescription.cc
@@ -10,40 +10,25 @@
 
 namespace edm {
 
-  IfExistsDescription::
-  IfExistsDescription(ParameterDescriptionNode const& node_left,
-                      ParameterDescriptionNode const& node_right) :
-    node_left_(node_left.clone()),
-    node_right_(node_right.clone()) {
-  }
+  IfExistsDescription::IfExistsDescription(ParameterDescriptionNode const& node_left,
+                                           ParameterDescriptionNode const& node_right)
+      : node_left_(node_left.clone()), node_right_(node_right.clone()) {}
 
-  IfExistsDescription::
-  IfExistsDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
-                      ParameterDescriptionNode const& node_right) :
-    node_left_(std::move(node_left)),
-    node_right_(node_right.clone()) {
-  }
+  IfExistsDescription::IfExistsDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                           ParameterDescriptionNode const& node_right)
+      : node_left_(std::move(node_left)), node_right_(node_right.clone()) {}
 
-  IfExistsDescription::
-  IfExistsDescription(ParameterDescriptionNode const& node_left,
-                      std::unique_ptr<ParameterDescriptionNode> node_right) :
-    node_left_(node_left.clone()),
-    node_right_(std::move(node_right)) {
-  }
-
-  IfExistsDescription::
-  IfExistsDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
-                      std::unique_ptr<ParameterDescriptionNode> node_right) :
-    node_left_(std::move(node_left)),
-    node_right_(std::move(node_right)) {
-  }
+  IfExistsDescription::IfExistsDescription(ParameterDescriptionNode const& node_left,
+                                           std::unique_ptr<ParameterDescriptionNode> node_right)
+      : node_left_(node_left.clone()), node_right_(std::move(node_right)) {}
 
-  void
-  IfExistsDescription::
-  checkAndGetLabelsAndTypes_(std::set<std::string> & usedLabels,
-                             std::set<ParameterTypes> & parameterTypes,
-                             std::set<ParameterTypes> & wildcardTypes) const {
+  IfExistsDescription::IfExistsDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                           std::unique_ptr<ParameterDescriptionNode> node_right)
+      : node_left_(std::move(node_left)), node_right_(std::move(node_right)) {}
 
+  void IfExistsDescription::checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
+                                                       std::set<ParameterTypes>& parameterTypes,
+                                                       std::set<ParameterTypes>& wildcardTypes) const {
     std::set<std::string> labelsLeft;
     std::set<ParameterTypes> parameterTypesLeft;
     std::set<ParameterTypes> wildcardTypesLeft;
@@ -68,70 +53,56 @@ namespace edm {
     wildcardTypes.insert(wildcardTypesLeft.begin(), wildcardTypesLeft.end());
   }
 
-  void
-  IfExistsDescription::
-  validate_(ParameterSet & pset,
-            std::set<std::string> & validatedLabels,
-            bool optional) const {
-
+  void IfExistsDescription::validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const {
     bool leftExists = node_left_->exists(pset);
     bool rightExists = node_right_->exists(pset);
 
     if (!leftExists && !rightExists) {
       return;
-    }
-    else if (leftExists && rightExists) {
+    } else if (leftExists && rightExists) {
       node_left_->validate(pset, validatedLabels, false);
       node_right_->validate(pset, validatedLabels, false);
-    }
-    else if (leftExists && !rightExists) {
+    } else if (leftExists && !rightExists) {
       node_left_->validate(pset, validatedLabels, false);
-      if (!optional) node_right_->validate(pset, validatedLabels, false);
-    }
-    else if (!leftExists && rightExists) {
+      if (!optional)
+        node_right_->validate(pset, validatedLabels, false);
+    } else if (!leftExists && rightExists) {
       node_left_->validate(pset, validatedLabels, false);
       node_right_->validate(pset, validatedLabels, false);
     }
   }
 
-  void
-  IfExistsDescription::
-  writeCfi_(std::ostream & os,
-            bool & startWithComma,
-            int indentation,
-            bool & wroteSomething) const {
+  void IfExistsDescription::writeCfi_(std::ostream& os,
+                                      bool& startWithComma,
+                                      int indentation,
+                                      bool& wroteSomething) const {
     node_left_->writeCfi(os, startWithComma, indentation, wroteSomething);
     node_right_->writeCfi(os, startWithComma, indentation, wroteSomething);
   }
 
-  void
-  IfExistsDescription::
-  print_(std::ostream & os,
-         bool optional,
-         bool writeToCfi,
-         DocFormatHelper & dfh) const {
-
+  void IfExistsDescription::print_(std::ostream& os, bool optional, bool writeToCfi, DocFormatHelper& dfh) const {
     if (dfh.pass() == 1) {
-
       dfh.indent(os);
       os << "IfExists pair:";
 
       if (dfh.brief()) {
+        if (optional)
+          os << " optional";
 
-        if (optional)  os << " optional";
-
-        if (!writeToCfi) os << " (do not write to cfi)";
+        if (!writeToCfi)
+          os << " (do not write to cfi)";
 
         os << " see Section " << dfh.section() << "." << dfh.counter() << "\n";
       }
       // not brief
       else {
-
         os << "\n";
         dfh.indent2(os);
 
-        if (optional)  os << "optional";
-        if (!writeToCfi) os << " (do not write to cfi)";
+        if (optional)
+          os << "optional";
+        if (!writeToCfi)
+          os << " (do not write to cfi)";
         if (optional || !writeToCfi) {
           os << "\n";
           dfh.indent2(os);
@@ -140,22 +111,14 @@ namespace edm {
         os << "see Section " << dfh.section() << "." << dfh.counter() << "\n";
 
         if (!comment().empty()) {
-          DocFormatHelper::wrapAndPrintText(os,
-                                            comment(),
-                                            dfh.startColumn2(),
-                                            dfh.commentWidth());
+          DocFormatHelper::wrapAndPrintText(os, comment(), dfh.startColumn2(), dfh.commentWidth());
         }
         os << "\n";
       }
     }
   }
 
-  void
-  IfExistsDescription::
-  printNestedContent_(std::ostream & os,
-                      bool optional,
-                      DocFormatHelper & dfh) const {
-
+  void IfExistsDescription::printNestedContent_(std::ostream& os, bool optional, DocFormatHelper& dfh) const {
     int indentation = dfh.indentation();
     if (dfh.parent() != DocFormatHelper::TOP) {
       indentation -= DocFormatHelper::offsetSectionContent();
@@ -167,16 +130,17 @@ namespace edm {
 
     printSpaces(os, indentation);
     os << "Section " << newSection;
-    if (optional) os << " optional";
+    if (optional)
+      os << " optional";
     os << " IfExists pair description:\n";
     printSpaces(os, indentation);
     if (optional) {
       os << "If the first parameter exists, then the second is allowed to exist\n";
-    }
-    else {
+    } else {
       os << "If the first parameter exists, then the second is required to exist\n";
     }
-    if (!dfh.brief()) os << "\n";
+    if (!dfh.brief())
+      os << "\n";
 
     DocFormatHelper new_dfh(dfh);
     new_dfh.init();
@@ -197,86 +161,63 @@ namespace edm {
     new_dfh.setCounter(0);
 
     node_left_->printNestedContent(os, false, new_dfh);
-    node_right_->printNestedContent(os, false , new_dfh);
+    node_right_->printNestedContent(os, false, new_dfh);
   }
 
-  bool
-  IfExistsDescription::
-  exists_(ParameterSet const& pset) const {
+  bool IfExistsDescription::exists_(ParameterSet const& pset) const {
     bool leftExists = node_left_->exists(pset);
     bool rightExists = node_right_->exists(pset);
 
-    if (leftExists && rightExists) return true;
-    else if (!leftExists && !rightExists) return true;
+    if (leftExists && rightExists)
+      return true;
+    else if (!leftExists && !rightExists)
+      return true;
     return false;
   }
 
-  bool
-  IfExistsDescription::
-  partiallyExists_(ParameterSet const& pset) const {
-    return exists(pset);
-  }
-
-  int
-  IfExistsDescription::
-  howManyXORSubNodesExist_(ParameterSet const& pset) const {
-    return exists(pset) ? 1 : 0;
-  }
+  bool IfExistsDescription::partiallyExists_(ParameterSet const& pset) const { return exists(pset); }
 
-  void
-  IfExistsDescription::
-  throwIfDuplicateLabels(std::set<std::string> const& labelsLeft,
-                         std::set<std::string> const& labelsRight) const {
+  int IfExistsDescription::howManyXORSubNodesExist_(ParameterSet const& pset) const { return exists(pset) ? 1 : 0; }
 
+  void IfExistsDescription::throwIfDuplicateLabels(std::set<std::string> const& labelsLeft,
+                                                   std::set<std::string> const& labelsRight) const {
     std::set<std::string> duplicateLabels;
     std::insert_iterator<std::set<std::string> > insertIter(duplicateLabels, duplicateLabels.begin());
-    std::set_intersection(labelsLeft.begin(), labelsLeft.end(),
-                          labelsRight.begin(), labelsRight.end(),
-                          insertIter);
+    std::set_intersection(labelsLeft.begin(), labelsLeft.end(), labelsRight.begin(), labelsRight.end(), insertIter);
     if (!duplicateLabels.empty()) {
       std::stringstream ss;
-      for (std::set<std::string>::const_iterator iter = duplicateLabels.begin(),
-	                                         iEnd = duplicateLabels.end();
+      for (std::set<std::string>::const_iterator iter = duplicateLabels.begin(), iEnd = duplicateLabels.end();
            iter != iEnd;
            ++iter) {
-        ss << " \"" << *iter <<  "\"\n";
+        ss << " \"" << *iter << "\"\n";
       }
-      throw edm::Exception(errors::LogicError)
-        << "Labels used in a node of a ParameterSetDescription\n"
-        << "\"ifExists\" expression must be not be the same as labels used\n"
-        << "in other nodes of the expression.  The following duplicate\n"
-        << "labels were detected:\n"
-        << ss.str()
-        << "\n";
+      throw edm::Exception(errors::LogicError) << "Labels used in a node of a ParameterSetDescription\n"
+                                               << "\"ifExists\" expression must be not be the same as labels used\n"
+                                               << "in other nodes of the expression.  The following duplicate\n"
+                                               << "labels were detected:\n"
+                                               << ss.str() << "\n";
     }
   }
 
-  void
-  IfExistsDescription::
-  throwIfDuplicateTypes(std::set<ParameterTypes> const& types1,
-                        std::set<ParameterTypes> const& types2) const
-  {
+  void IfExistsDescription::throwIfDuplicateTypes(std::set<ParameterTypes> const& types1,
+                                                  std::set<ParameterTypes> const& types2) const {
     if (!types1.empty()) {
       std::set<ParameterTypes> duplicateTypes;
       std::insert_iterator<std::set<ParameterTypes> > insertIter(duplicateTypes, duplicateTypes.begin());
-      std::set_intersection(types1.begin(), types1.end(),
-                            types2.begin(), types2.end(),
-                            insertIter);
+      std::set_intersection(types1.begin(), types1.end(), types2.begin(), types2.end(), insertIter);
       if (!duplicateTypes.empty()) {
         std::stringstream ss;
-        for (std::set<ParameterTypes>::const_iterator iter = duplicateTypes.begin(),
-	                                              iEnd = duplicateTypes.end();
+        for (std::set<ParameterTypes>::const_iterator iter = duplicateTypes.begin(), iEnd = duplicateTypes.end();
              iter != iEnd;
              ++iter) {
-          ss << " \"" << parameterTypeEnumToString(*iter) <<  "\"\n";
+          ss << " \"" << parameterTypeEnumToString(*iter) << "\"\n";
         }
         throw edm::Exception(errors::LogicError)
-          << "Types used for wildcards in a node of a ParameterSetDescription\n"
-          << "\"ifExists\" expression must be different from types used for other parameters\n"
-          << "in other nodes.  The following duplicate types were detected:\n"
-          << ss.str()
-          << "\n";
+            << "Types used for wildcards in a node of a ParameterSetDescription\n"
+            << "\"ifExists\" expression must be different from types used for other parameters\n"
+            << "in other nodes.  The following duplicate types were detected:\n"
+            << ss.str() << "\n";
       }
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/ORGroupDescription.cc b/FWCore/ParameterSet/src/ORGroupDescription.cc
index af9a7d07ec550..c634bcdab2524 100644
--- a/FWCore/ParameterSet/src/ORGroupDescription.cc
+++ b/FWCore/ParameterSet/src/ORGroupDescription.cc
@@ -10,40 +10,25 @@
 
 namespace edm {
 
-  ORGroupDescription::
-  ORGroupDescription(ParameterDescriptionNode const& node_left,
-                     ParameterDescriptionNode const& node_right) :
-    node_left_(node_left.clone()),
-    node_right_(node_right.clone()) {
-  }
-
-  ORGroupDescription::
-  ORGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
-                     ParameterDescriptionNode const& node_right) :
-    node_left_(std::move(node_left)),
-    node_right_(node_right.clone()) {
-  }
+  ORGroupDescription::ORGroupDescription(ParameterDescriptionNode const& node_left,
+                                         ParameterDescriptionNode const& node_right)
+      : node_left_(node_left.clone()), node_right_(node_right.clone()) {}
 
-  ORGroupDescription::
-  ORGroupDescription(ParameterDescriptionNode const& node_left,
-                     std::unique_ptr<ParameterDescriptionNode> node_right) :
-    node_left_(node_left.clone()),
-    node_right_(std::move(node_right)) {
-  }
+  ORGroupDescription::ORGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                         ParameterDescriptionNode const& node_right)
+      : node_left_(std::move(node_left)), node_right_(node_right.clone()) {}
 
-  ORGroupDescription::
-  ORGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
-                     std::unique_ptr<ParameterDescriptionNode> node_right) :
-    node_left_(std::move(node_left)),
-    node_right_(std::move(node_right)) {
-  }
+  ORGroupDescription::ORGroupDescription(ParameterDescriptionNode const& node_left,
+                                         std::unique_ptr<ParameterDescriptionNode> node_right)
+      : node_left_(node_left.clone()), node_right_(std::move(node_right)) {}
 
-  void
-  ORGroupDescription::
-  checkAndGetLabelsAndTypes_(std::set<std::string> & usedLabels,
-                             std::set<ParameterTypes> & parameterTypes,
-                             std::set<ParameterTypes> & wildcardTypes) const {
+  ORGroupDescription::ORGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                         std::unique_ptr<ParameterDescriptionNode> node_right)
+      : node_left_(std::move(node_left)), node_right_(std::move(node_right)) {}
 
+  void ORGroupDescription::checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
+                                                      std::set<ParameterTypes>& parameterTypes,
+                                                      std::set<ParameterTypes>& wildcardTypes) const {
     std::set<std::string> labelsLeft;
     std::set<ParameterTypes> parameterTypesLeft;
     std::set<ParameterTypes> wildcardTypesLeft;
@@ -68,42 +53,32 @@ namespace edm {
     wildcardTypes.insert(wildcardTypesLeft.begin(), wildcardTypesLeft.end());
   }
 
-  void
-  ORGroupDescription::
-  validate_(ParameterSet & pset,
-            std::set<std::string> & validatedLabels,
-            bool optional) const {
-
+  void ORGroupDescription::validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const {
     bool leftExists = node_left_->exists(pset);
     bool rightExists = node_right_->exists(pset);
 
     if (leftExists || rightExists) {
-      if (leftExists) node_left_->validate(pset, validatedLabels, false);
-      if (rightExists) node_right_->validate(pset, validatedLabels, false);
+      if (leftExists)
+        node_left_->validate(pset, validatedLabels, false);
+      if (rightExists)
+        node_right_->validate(pset, validatedLabels, false);
       return;
     }
 
-    if (optional) return;
+    if (optional)
+      return;
 
     node_left_->validate(pset, validatedLabels, false);
   }
 
-  void
-  ORGroupDescription::
-  writeCfi_(std::ostream & os,
-            bool & startWithComma,
-            int indentation,
-            bool & wroteSomething) const {
+  void ORGroupDescription::writeCfi_(std::ostream& os,
+                                     bool& startWithComma,
+                                     int indentation,
+                                     bool& wroteSomething) const {
     node_left_->writeCfi(os, startWithComma, indentation, wroteSomething);
   }
 
-  void
-  ORGroupDescription::
-  print_(std::ostream & os,
-         bool optional,
-         bool writeToCfi,
-         DocFormatHelper & dfh) const {
-
+  void ORGroupDescription::print_(std::ostream& os, bool optional, bool writeToCfi, DocFormatHelper& dfh) const {
     if (dfh.parent() == DocFormatHelper::OR) {
       dfh.decrementCounter();
       node_left_->print(os, false, true, dfh);
@@ -112,26 +87,27 @@ namespace edm {
     }
 
     if (dfh.pass() == 1) {
-
       dfh.indent(os);
       os << "OR group:";
 
       if (dfh.brief()) {
+        if (optional)
+          os << " optional";
 
-        if (optional)  os << " optional";
-
-        if (!writeToCfi) os << " (do not write to cfi)";
+        if (!writeToCfi)
+          os << " (do not write to cfi)";
 
         os << " see Section " << dfh.section() << "." << dfh.counter() << "\n";
       }
       // not brief
       else {
-
         os << "\n";
         dfh.indent2(os);
 
-        if (optional)  os << "optional";
-        if (!writeToCfi) os << " (do not write to cfi)";
+        if (optional)
+          os << "optional";
+        if (!writeToCfi)
+          os << " (do not write to cfi)";
         if (optional || !writeToCfi) {
           os << "\n";
           dfh.indent2(os);
@@ -140,22 +116,14 @@ namespace edm {
         os << "see Section " << dfh.section() << "." << dfh.counter() << "\n";
 
         if (!comment().empty()) {
-          DocFormatHelper::wrapAndPrintText(os,
-                                            comment(),
-                                            dfh.startColumn2(),
-                                            dfh.commentWidth());
+          DocFormatHelper::wrapAndPrintText(os, comment(), dfh.startColumn2(), dfh.commentWidth());
         }
         os << "\n";
       }
     }
   }
 
-  void
-  ORGroupDescription::
-  printNestedContent_(std::ostream & os,
-                      bool optional,
-                      DocFormatHelper & dfh) const {
-
+  void ORGroupDescription::printNestedContent_(std::ostream& os, bool optional, DocFormatHelper& dfh) const {
     if (dfh.parent() == DocFormatHelper::OR) {
       dfh.decrementCounter();
       node_left_->printNestedContent(os, false, dfh);
@@ -173,19 +141,18 @@ namespace edm {
     std::string newSection = ss.str();
 
     printSpaces(os, indentation);
-    os << "Section " << newSection
-       << " OR group description:\n";
+    os << "Section " << newSection << " OR group description:\n";
     printSpaces(os, indentation);
     if (optional) {
       // An optional OR group is kind of pointless, it would be
       // easier just make the parameters be independent optional parameters
       // I only allow it to make the behavior analogous to the other groups
       os << "This optional OR group requires at least one or none of the following to be in the PSet\n";
-    }
-    else {
+    } else {
       os << "This OR group requires at least one of the following to be in the PSet\n";
     }
-    if (!dfh.brief()) os << "\n";
+    if (!dfh.brief())
+      os << "\n";
 
     DocFormatHelper new_dfh(dfh);
     new_dfh.init();
@@ -209,79 +176,53 @@ namespace edm {
     node_right_->printNestedContent(os, false, new_dfh);
   }
 
-  bool
-  ORGroupDescription::
-  exists_(ParameterSet const& pset) const {
-    return node_left_->exists(pset) ||
-           node_right_->exists(pset);
-  }
-
-  bool
-  ORGroupDescription::
-  partiallyExists_(ParameterSet const& pset) const {
-    return exists(pset);
+  bool ORGroupDescription::exists_(ParameterSet const& pset) const {
+    return node_left_->exists(pset) || node_right_->exists(pset);
   }
 
-  int
-  ORGroupDescription::
-  howManyXORSubNodesExist_(ParameterSet const& pset) const {
-    return exists(pset) ? 1 : 0;
-  }
+  bool ORGroupDescription::partiallyExists_(ParameterSet const& pset) const { return exists(pset); }
 
-  void
-  ORGroupDescription::
-  throwIfDuplicateLabels(std::set<std::string> const& labelsLeft,
-                         std::set<std::string> const& labelsRight) const {
+  int ORGroupDescription::howManyXORSubNodesExist_(ParameterSet const& pset) const { return exists(pset) ? 1 : 0; }
 
+  void ORGroupDescription::throwIfDuplicateLabels(std::set<std::string> const& labelsLeft,
+                                                  std::set<std::string> const& labelsRight) const {
     std::set<std::string> duplicateLabels;
     std::insert_iterator<std::set<std::string> > insertIter(duplicateLabels, duplicateLabels.begin());
-    std::set_intersection(labelsLeft.begin(), labelsLeft.end(),
-                          labelsRight.begin(), labelsRight.end(),
-                          insertIter);
+    std::set_intersection(labelsLeft.begin(), labelsLeft.end(), labelsRight.begin(), labelsRight.end(), insertIter);
     if (!duplicateLabels.empty()) {
       std::stringstream ss;
-      for (std::set<std::string>::const_iterator iter = duplicateLabels.begin(),
-	                                         iEnd = duplicateLabels.end();
+      for (std::set<std::string>::const_iterator iter = duplicateLabels.begin(), iEnd = duplicateLabels.end();
            iter != iEnd;
            ++iter) {
-        ss << " \"" << *iter <<  "\"\n";
+        ss << " \"" << *iter << "\"\n";
       }
-      throw edm::Exception(errors::LogicError)
-        << "Labels used in a node of a ParameterSetDescription\n"
-        << "\"or\" expression must be not be the same as labels used\n"
-        << "in other nodes of the expression.  The following duplicate\n"
-        << "labels were detected:\n"
-        << ss.str()
-        << "\n";
+      throw edm::Exception(errors::LogicError) << "Labels used in a node of a ParameterSetDescription\n"
+                                               << "\"or\" expression must be not be the same as labels used\n"
+                                               << "in other nodes of the expression.  The following duplicate\n"
+                                               << "labels were detected:\n"
+                                               << ss.str() << "\n";
     }
   }
 
-  void
-  ORGroupDescription::
-  throwIfDuplicateTypes(std::set<ParameterTypes> const& types1,
-                        std::set<ParameterTypes> const& types2) const
-  {
+  void ORGroupDescription::throwIfDuplicateTypes(std::set<ParameterTypes> const& types1,
+                                                 std::set<ParameterTypes> const& types2) const {
     if (!types1.empty()) {
       std::set<ParameterTypes> duplicateTypes;
       std::insert_iterator<std::set<ParameterTypes> > insertIter(duplicateTypes, duplicateTypes.begin());
-      std::set_intersection(types1.begin(), types1.end(),
-                            types2.begin(), types2.end(),
-                            insertIter);
+      std::set_intersection(types1.begin(), types1.end(), types2.begin(), types2.end(), insertIter);
       if (!duplicateTypes.empty()) {
         std::stringstream ss;
-        for (std::set<ParameterTypes>::const_iterator iter = duplicateTypes.begin(),
-	                                              iEnd = duplicateTypes.end();
+        for (std::set<ParameterTypes>::const_iterator iter = duplicateTypes.begin(), iEnd = duplicateTypes.end();
              iter != iEnd;
              ++iter) {
-          ss << " \"" << parameterTypeEnumToString(*iter) <<  "\"\n";
+          ss << " \"" << parameterTypeEnumToString(*iter) << "\"\n";
         }
         throw edm::Exception(errors::LogicError)
-          << "Types used for wildcards in a node of a ParameterSetDescription\n"
-          << "\"or\" expression must be different from types used for other parameters\n"
-          << "in other nodes.  The following duplicate types were detected:\n"
-          << ss.str()
-          << "\n";
+            << "Types used for wildcards in a node of a ParameterSetDescription\n"
+            << "\"or\" expression must be different from types used for other parameters\n"
+            << "in other nodes.  The following duplicate types were detected:\n"
+            << ss.str() << "\n";
       }
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/ParameterDescription.cc b/FWCore/ParameterSet/src/ParameterDescription.cc
index 0548004be3e64..e6551fb645420 100644
--- a/FWCore/ParameterSet/src/ParameterDescription.cc
+++ b/FWCore/ParameterSet/src/ParameterDescription.cc
@@ -24,45 +24,37 @@ namespace edm {
 
   // =================================================================
 
-  ParameterDescription<ParameterSetDescription>::
-  ParameterDescription(std::string const& iLabel,
-                       ParameterSetDescription const& value,
-                       bool isTracked,
-                       Comment const& iComment) :
-      ParameterDescriptionBase(iLabel, k_PSet, isTracked, true, iComment),
-      psetDesc_(new ParameterSetDescription(value)) {
-  }
-
-  ParameterDescription<ParameterSetDescription>::
-  ParameterDescription(char const* iLabel,
-                       ParameterSetDescription const& value,
-                       bool isTracked,
-                       Comment const& iComment) :
-      ParameterDescriptionBase(iLabel, k_PSet, isTracked, true, iComment),
-      psetDesc_(new ParameterSetDescription(value)) {
-  }
-
-  ParameterDescription<ParameterSetDescription>::
-  ~ParameterDescription() { }
-
-  void
-  ParameterDescription<ParameterSetDescription>::
-  validate_(ParameterSet& pset,
-           std::set<std::string>& validatedLabels,
-           bool optional) const {
-
+  ParameterDescription<ParameterSetDescription>::ParameterDescription(std::string const& iLabel,
+                                                                      ParameterSetDescription const& value,
+                                                                      bool isTracked,
+                                                                      Comment const& iComment)
+      : ParameterDescriptionBase(iLabel, k_PSet, isTracked, true, iComment),
+        psetDesc_(new ParameterSetDescription(value)) {}
+
+  ParameterDescription<ParameterSetDescription>::ParameterDescription(char const* iLabel,
+                                                                      ParameterSetDescription const& value,
+                                                                      bool isTracked,
+                                                                      Comment const& iComment)
+      : ParameterDescriptionBase(iLabel, k_PSet, isTracked, true, iComment),
+        psetDesc_(new ParameterSetDescription(value)) {}
+
+  ParameterDescription<ParameterSetDescription>::~ParameterDescription() {}
+
+  void ParameterDescription<ParameterSetDescription>::validate_(ParameterSet& pset,
+                                                                std::set<std::string>& validatedLabels,
+                                                                bool optional) const {
     bool exists = pset.existsAs<ParameterSet>(label(), isTracked());
 
-    if(exists) {
+    if (exists) {
       validatedLabels.insert(label());
-    } else if(pset.existsAs<ParameterSet>(label(), !isTracked())) {
+    } else if (pset.existsAs<ParameterSet>(label(), !isTracked())) {
       throwParameterWrongTrackiness();
-    } else if(pset.exists(label())) {
+    } else if (pset.exists(label())) {
       throwParameterWrongType();
     }
 
-    if(!optional && !exists) {
-      if(isTracked()) {
+    if (!optional && !exists) {
+      if (isTracked()) {
         pset.addParameter(label(), ParameterSet());
       } else {
         pset.addUntrackedParameter(label(), ParameterSet());
@@ -72,39 +64,31 @@ namespace edm {
 
     exists = pset.existsAs<ParameterSet>(label(), isTracked());
 
-    if(exists) {
-      if(pset.isRegistered()) {
-         pset.invalidateRegistration("");
+    if (exists) {
+      if (pset.isRegistered()) {
+        pset.invalidateRegistration("");
       }
-      ParameterSet * containedPSet = pset.getPSetForUpdate(label());
+      ParameterSet* containedPSet = pset.getPSetForUpdate(label());
       psetDesc_->validate(*containedPSet);
     }
   }
 
-  void
-  ParameterDescription<ParameterSetDescription>::
-  printDefault_(std::ostream& os,
-                  bool writeToCfi,
-                  DocFormatHelper& dfh) const {
-    os << "see Section " << dfh.section()
-       << "." << dfh.counter();
-    if(!writeToCfi) os << " (do not write to cfi)";
+  void ParameterDescription<ParameterSetDescription>::printDefault_(std::ostream& os,
+                                                                    bool writeToCfi,
+                                                                    DocFormatHelper& dfh) const {
+    os << "see Section " << dfh.section() << "." << dfh.counter();
+    if (!writeToCfi)
+      os << " (do not write to cfi)";
     os << "\n";
   }
 
-  bool
-  ParameterDescription<ParameterSetDescription>::
-  hasNestedContent_() const {
-    return true;
-  }
+  bool ParameterDescription<ParameterSetDescription>::hasNestedContent_() const { return true; }
 
-  void
-  ParameterDescription<ParameterSetDescription>::
-  printNestedContent_(std::ostream& os,
-                      bool /*optional*/,
-                      DocFormatHelper& dfh) const {
+  void ParameterDescription<ParameterSetDescription>::printNestedContent_(std::ostream& os,
+                                                                          bool /*optional*/,
+                                                                          DocFormatHelper& dfh) const {
     int indentation = dfh.indentation();
-    if(dfh.parent() != DocFormatHelper::TOP) {
+    if (dfh.parent() != DocFormatHelper::TOP) {
       indentation -= DocFormatHelper::offsetSectionContent();
     }
 
@@ -113,147 +97,116 @@ namespace edm {
     std::string newSection = ss.str();
 
     printSpaces(os, indentation);
-    os << "Section " << newSection
-       << " " << label() << " PSet description:\n";
-    if(!dfh.brief()) os << "\n";
+    os << "Section " << newSection << " " << label() << " PSet description:\n";
+    if (!dfh.brief())
+      os << "\n";
 
     DocFormatHelper new_dfh(dfh);
     new_dfh.init();
     new_dfh.setSection(newSection);
-    if(dfh.parent() == DocFormatHelper::TOP) {
+    if (dfh.parent() == DocFormatHelper::TOP) {
       new_dfh.setIndentation(indentation + DocFormatHelper::offsetSectionContent());
     }
     psetDesc_->print(os, new_dfh);
   }
 
-  bool
-  ParameterDescription<ParameterSetDescription>::
-  exists_(ParameterSet const& pset) const {
+  bool ParameterDescription<ParameterSetDescription>::exists_(ParameterSet const& pset) const {
     return pset.existsAs<ParameterSet>(label(), isTracked());
   }
 
-  ParameterSetDescription const*
-  ParameterDescription<ParameterSetDescription>::
-  parameterSetDescription() const {
+  ParameterSetDescription const* ParameterDescription<ParameterSetDescription>::parameterSetDescription() const {
     return psetDesc_.operator->();
   }
 
-  ParameterSetDescription *
-  ParameterDescription<ParameterSetDescription>::
-  parameterSetDescription() {
+  ParameterSetDescription* ParameterDescription<ParameterSetDescription>::parameterSetDescription() {
     return psetDesc_.operator->();
   }
 
-  void
-  ParameterDescription<ParameterSetDescription>::
-  writeCfi_(std::ostream& os, int indentation) const {
+  void ParameterDescription<ParameterSetDescription>::writeCfi_(std::ostream& os, int indentation) const {
     bool startWithComma = false;
     indentation += 2;
     psetDesc_->writeCfi(os, startWithComma, indentation);
   }
 
-  void
-  ParameterDescription<ParameterSetDescription>::
-  writeDoc_(std::ostream&, int /*indentation*/) const {
-  }
+  void ParameterDescription<ParameterSetDescription>::writeDoc_(std::ostream&, int /*indentation*/) const {}
 
   // These next two should not be needed for this specialization
-  bool
-  ParameterDescription<ParameterSetDescription>::
-  exists_(ParameterSet const&, bool /*isTracked*/) const {
+  bool ParameterDescription<ParameterSetDescription>::exists_(ParameterSet const&, bool /*isTracked*/) const {
     throw Exception(errors::LogicError);
     return true;
   }
 
-  void
-  ParameterDescription<ParameterSetDescription>::
-  insertDefault_(ParameterSet&) const {
+  void ParameterDescription<ParameterSetDescription>::insertDefault_(ParameterSet&) const {
     throw Exception(errors::LogicError);
     return;
   }
 
   // =================================================================
 
-  ParameterDescription<std::vector<ParameterSet> >::
-  ParameterDescription(std::string const& iLabel,
-                       ParameterSetDescription const& psetDesc,
-                       bool isTracked,
-                       std::vector<ParameterSet> const& vPset,
-                       Comment const& iComment) :
-      ParameterDescriptionBase(iLabel, k_VPSet, isTracked, true, iComment),
-      psetDesc_(new ParameterSetDescription(psetDesc)),
-      vPset_(vPset),
-      partOfDefaultOfVPSet_(false) {
-  }
-
-  ParameterDescription<std::vector<ParameterSet> >::
-  ParameterDescription(char const* iLabel,
-                       ParameterSetDescription const& psetDesc,
-                       bool isTracked,
-                       std::vector<ParameterSet> const& vPset,
-                       Comment const& iComment) :
-      ParameterDescriptionBase(iLabel, k_VPSet, isTracked, true, iComment),
-      psetDesc_(new ParameterSetDescription(psetDesc)),
-      vPset_(vPset),
-      partOfDefaultOfVPSet_(false) {
-  }
-
-  ParameterDescription<std::vector<ParameterSet> >::
-  ParameterDescription(std::string const& iLabel,
-                       ParameterSetDescription const& psetDesc,
-                       bool isTracked,
-                       Comment const& iComment) :
-      ParameterDescriptionBase(iLabel, k_VPSet, isTracked, false, iComment),
-      psetDesc_(new ParameterSetDescription(psetDesc)),
-      vPset_(),
-      partOfDefaultOfVPSet_(false) {
-  }
-
-  ParameterDescription<std::vector<ParameterSet> >::
-  ParameterDescription(char const* iLabel,
-                       ParameterSetDescription const& psetDesc,
-                       bool isTracked,
-                       Comment const& iComment) :
-      ParameterDescriptionBase(iLabel, k_VPSet, isTracked, false, iComment),
-      psetDesc_(new ParameterSetDescription(psetDesc)),
-      vPset_(),
-      partOfDefaultOfVPSet_(false) {
-  }
-
-  ParameterDescription<std::vector<ParameterSet> >::
-  ~ParameterDescription() { }
-
-  ParameterSetDescription const*
-  ParameterDescription<std::vector<ParameterSet> >::
-  parameterSetDescription() const {
+  ParameterDescription<std::vector<ParameterSet> >::ParameterDescription(std::string const& iLabel,
+                                                                         ParameterSetDescription const& psetDesc,
+                                                                         bool isTracked,
+                                                                         std::vector<ParameterSet> const& vPset,
+                                                                         Comment const& iComment)
+      : ParameterDescriptionBase(iLabel, k_VPSet, isTracked, true, iComment),
+        psetDesc_(new ParameterSetDescription(psetDesc)),
+        vPset_(vPset),
+        partOfDefaultOfVPSet_(false) {}
+
+  ParameterDescription<std::vector<ParameterSet> >::ParameterDescription(char const* iLabel,
+                                                                         ParameterSetDescription const& psetDesc,
+                                                                         bool isTracked,
+                                                                         std::vector<ParameterSet> const& vPset,
+                                                                         Comment const& iComment)
+      : ParameterDescriptionBase(iLabel, k_VPSet, isTracked, true, iComment),
+        psetDesc_(new ParameterSetDescription(psetDesc)),
+        vPset_(vPset),
+        partOfDefaultOfVPSet_(false) {}
+
+  ParameterDescription<std::vector<ParameterSet> >::ParameterDescription(std::string const& iLabel,
+                                                                         ParameterSetDescription const& psetDesc,
+                                                                         bool isTracked,
+                                                                         Comment const& iComment)
+      : ParameterDescriptionBase(iLabel, k_VPSet, isTracked, false, iComment),
+        psetDesc_(new ParameterSetDescription(psetDesc)),
+        vPset_(),
+        partOfDefaultOfVPSet_(false) {}
+
+  ParameterDescription<std::vector<ParameterSet> >::ParameterDescription(char const* iLabel,
+                                                                         ParameterSetDescription const& psetDesc,
+                                                                         bool isTracked,
+                                                                         Comment const& iComment)
+      : ParameterDescriptionBase(iLabel, k_VPSet, isTracked, false, iComment),
+        psetDesc_(new ParameterSetDescription(psetDesc)),
+        vPset_(),
+        partOfDefaultOfVPSet_(false) {}
+
+  ParameterDescription<std::vector<ParameterSet> >::~ParameterDescription() {}
+
+  ParameterSetDescription const* ParameterDescription<std::vector<ParameterSet> >::parameterSetDescription() const {
     return psetDesc_.operator->();
   }
 
-  ParameterSetDescription *
-  ParameterDescription<std::vector<ParameterSet> >::
-  parameterSetDescription() {
+  ParameterSetDescription* ParameterDescription<std::vector<ParameterSet> >::parameterSetDescription() {
     return psetDesc_.operator->();
   }
 
-  void
-  ParameterDescription<std::vector<ParameterSet> >::
-  validate_(ParameterSet& pset,
-            std::set<std::string>& validatedLabels,
-            bool optional) const {
-
+  void ParameterDescription<std::vector<ParameterSet> >::validate_(ParameterSet& pset,
+                                                                   std::set<std::string>& validatedLabels,
+                                                                   bool optional) const {
     bool exists = pset.existsAs<std::vector<ParameterSet> >(label(), isTracked());
 
-    if(exists) {
+    if (exists) {
       validatedLabels.insert(label());
-    } else if(pset.existsAs<std::vector<ParameterSet> >(label(), !isTracked())) {
+    } else if (pset.existsAs<std::vector<ParameterSet> >(label(), !isTracked())) {
       throwParameterWrongTrackiness();
-    } else if(pset.exists(label())) {
+    } else if (pset.exists(label())) {
       throwParameterWrongType();
     }
 
-    if(!exists && !optional) {
-      if(hasDefault()) {
-        if(isTracked()) {
+    if (!exists && !optional) {
+      if (hasDefault()) {
+        if (isTracked()) {
           pset.addParameter(label(), vPset_);
         } else {
           pset.addUntrackedParameter(label(), vPset_);
@@ -265,104 +218,97 @@ namespace edm {
     }
 
     exists = pset.existsAs<std::vector<ParameterSet> >(label(), isTracked());
-    if(exists) {
-      VParameterSetEntry * vpsetEntry = pset.getPSetVectorForUpdate(label());
+    if (exists) {
+      VParameterSetEntry* vpsetEntry = pset.getPSetVectorForUpdate(label());
       assert(vpsetEntry);
 
-      for(unsigned i = 0; i < vpsetEntry->size(); ++i) {
+      for (unsigned i = 0; i < vpsetEntry->size(); ++i) {
         psetDesc_->validate(vpsetEntry->psetInVector(i));
       }
     }
   }
 
-  void
-  ParameterDescription<std::vector<ParameterSet> >::
-  printDefault_(std::ostream& os,
-                bool writeToCfi,
-                DocFormatHelper& dfh) const {
-    os << "see Section " << dfh.section()
-       << "." << dfh.counter();
-    if(!writeToCfi) os << " (do not write to cfi)";
+  void ParameterDescription<std::vector<ParameterSet> >::printDefault_(std::ostream& os,
+                                                                       bool writeToCfi,
+                                                                       DocFormatHelper& dfh) const {
+    os << "see Section " << dfh.section() << "." << dfh.counter();
+    if (!writeToCfi)
+      os << " (do not write to cfi)";
     os << "\n";
   }
 
+  bool ParameterDescription<std::vector<ParameterSet> >::hasNestedContent_() const { return true; }
 
-  bool
-  ParameterDescription<std::vector<ParameterSet> >::
-  hasNestedContent_() const {
-    return true;
-  }
-
-  void
-  ParameterDescription<std::vector<ParameterSet> >::
-  printNestedContent_(std::ostream& os,
-                      bool /*optional*/,
-                      DocFormatHelper& dfh) const {
-
+  void ParameterDescription<std::vector<ParameterSet> >::printNestedContent_(std::ostream& os,
+                                                                             bool /*optional*/,
+                                                                             DocFormatHelper& dfh) const {
     int indentation = dfh.indentation();
-    if(dfh.parent() != DocFormatHelper::TOP) {
+    if (dfh.parent() != DocFormatHelper::TOP) {
       indentation -= DocFormatHelper::offsetSectionContent();
     }
 
-    if(!partOfDefaultOfVPSet_) {
+    if (!partOfDefaultOfVPSet_) {
       printSpaces(os, indentation);
-      os << "Section " << dfh.section() << "." << dfh.counter()
-         << " " << label() << " VPSet description:\n";
+      os << "Section " << dfh.section() << "." << dfh.counter() << " " << label() << " VPSet description:\n";
 
       printSpaces(os, indentation + DocFormatHelper::offsetSectionContent());
-      os << "All elements will be validated using the PSet description in Section "
-         << dfh.section() << "." << dfh.counter() << ".1.\n";
+      os << "All elements will be validated using the PSet description in Section " << dfh.section() << "."
+         << dfh.counter() << ".1.\n";
     } else {
       printSpaces(os, indentation);
-      os << "Section " << dfh.section() << "." << dfh.counter()
-         << " " << " VPSet description for VPSet that is part of the default of a containing VPSet:\n";
+      os << "Section " << dfh.section() << "." << dfh.counter() << " "
+         << " VPSet description for VPSet that is part of the default of a containing VPSet:\n";
     }
 
     printSpaces(os, indentation + DocFormatHelper::offsetSectionContent());
 
     unsigned subsectionOffset = 2;
-    if(partOfDefaultOfVPSet_) subsectionOffset = 1;
-
-    if(hasDefault()) {
-      if(vPset_.empty()) os << "The default VPSet is empty.\n";
-      else if(vPset_.size() == 1U) os << "The default VPSet has 1 element.\n";
-      else os << "The default VPSet has " << vPset_.size() << " elements.\n";
-
-      if(!vPset_.empty()) {
-        for(unsigned i = 0; i < vPset_.size(); ++i) {
+    if (partOfDefaultOfVPSet_)
+      subsectionOffset = 1;
+
+    if (hasDefault()) {
+      if (vPset_.empty())
+        os << "The default VPSet is empty.\n";
+      else if (vPset_.size() == 1U)
+        os << "The default VPSet has 1 element.\n";
+      else
+        os << "The default VPSet has " << vPset_.size() << " elements.\n";
+
+      if (!vPset_.empty()) {
+        for (unsigned i = 0; i < vPset_.size(); ++i) {
           printSpaces(os, indentation + DocFormatHelper::offsetSectionContent());
-          os << "[" << (i) << "]: see Section " << dfh.section()
-             << "." << dfh.counter() << "." << (i + subsectionOffset) << "\n";
+          os << "[" << (i) << "]: see Section " << dfh.section() << "." << dfh.counter() << "."
+             << (i + subsectionOffset) << "\n";
         }
       }
     } else {
       os << "Does not have a default VPSet.\n";
     }
 
-    if(!dfh.brief()) os << "\n";
-
-    if(!partOfDefaultOfVPSet_) {
+    if (!dfh.brief())
+      os << "\n";
 
+    if (!partOfDefaultOfVPSet_) {
       std::stringstream ss;
       ss << dfh.section() << "." << dfh.counter() << ".1";
       std::string newSection = ss.str();
 
       printSpaces(os, indentation);
       os << "Section " << newSection << " description of PSet used to validate elements of VPSet:\n";
-      if(!dfh.brief()) os << "\n";
+      if (!dfh.brief())
+        os << "\n";
 
       DocFormatHelper new_dfh(dfh);
       new_dfh.init();
       new_dfh.setSection(newSection);
-      if(dfh.parent() == DocFormatHelper::TOP) {
-         new_dfh.setIndentation(indentation + DocFormatHelper::offsetSectionContent());
+      if (dfh.parent() == DocFormatHelper::TOP) {
+        new_dfh.setIndentation(indentation + DocFormatHelper::offsetSectionContent());
       }
       psetDesc_->print(os, new_dfh);
     }
 
-    if(hasDefault()) {
-      for(unsigned i = 0; i < vPset_.size(); ++i) {
-
+    if (hasDefault()) {
+      for (unsigned i = 0; i < vPset_.size(); ++i) {
         std::stringstream ss;
         ss << dfh.section() << "." << dfh.counter() << "." << (i + subsectionOffset);
         std::string newSection = ss.str();
@@ -370,12 +316,13 @@ namespace edm {
         printSpaces(os, indentation);
         os << "Section " << newSection << " PSet description of "
            << "default VPSet element [" << i << "]\n";
-        if(!dfh.brief()) os << "\n";
+        if (!dfh.brief())
+          os << "\n";
 
         DocFormatHelper new_dfh(dfh);
         new_dfh.init();
         new_dfh.setSection(newSection);
-        if(dfh.parent() == DocFormatHelper::TOP) {
+        if (dfh.parent() == DocFormatHelper::TOP) {
           new_dfh.setIndentation(indentation + DocFormatHelper::offsetSectionContent());
         }
 
@@ -386,19 +333,16 @@ namespace edm {
     }
   }
 
-  bool
-  ParameterDescription<std::vector<ParameterSet> >::
-  exists_(ParameterSet const& pset) const {
+  bool ParameterDescription<std::vector<ParameterSet> >::exists_(ParameterSet const& pset) const {
     return pset.existsAs<std::vector<ParameterSet> >(label(), isTracked());
   }
 
-  void
-  ParameterDescription<std::vector<ParameterSet> >::
-  writeOneElementToCfi(ParameterSet const& pset,
-                       std::ostream& os,
-                       int indentation,
-                       bool& nextOneStartsWithAComma) {
-    if(nextOneStartsWithAComma) os << ",";
+  void ParameterDescription<std::vector<ParameterSet> >::writeOneElementToCfi(ParameterSet const& pset,
+                                                                              std::ostream& os,
+                                                                              int indentation,
+                                                                              bool& nextOneStartsWithAComma) {
+    if (nextOneStartsWithAComma)
+      os << ",";
     nextOneStartsWithAComma = true;
     os << "\n";
     printSpaces(os, indentation + 2);
@@ -415,35 +359,25 @@ namespace edm {
     os << ")";
   }
 
-  void
-  ParameterDescription<std::vector<ParameterSet> >::
-  writeCfi_(std::ostream& os, int indentation) const {
+  void ParameterDescription<std::vector<ParameterSet> >::writeCfi_(std::ostream& os, int indentation) const {
     bool nextOneStartsWithAComma = false;
-    for_all(vPset_, std::bind(&writeOneElementToCfi,
-                                 std::placeholders::_1,
-                                 std::ref(os),
-                                 indentation,
-                                 std::ref(nextOneStartsWithAComma)));
+    for_all(
+        vPset_,
+        std::bind(
+            &writeOneElementToCfi, std::placeholders::_1, std::ref(os), indentation, std::ref(nextOneStartsWithAComma)));
     os << "\n";
     printSpaces(os, indentation);
   }
 
-  void
-  ParameterDescription<std::vector<ParameterSet> >::
-  writeDoc_(std::ostream&, int /*indentation*/) const {
-  }
+  void ParameterDescription<std::vector<ParameterSet> >::writeDoc_(std::ostream&, int /*indentation*/) const {}
 
   // These next two should not be needed for this specialization
-  bool
-  ParameterDescription<std::vector<ParameterSet> >::
-  exists_(ParameterSet const&, bool /*isTracked*/) const {
+  bool ParameterDescription<std::vector<ParameterSet> >::exists_(ParameterSet const&, bool /*isTracked*/) const {
     throw Exception(errors::LogicError);
     return true;
   }
 
-  void
-  ParameterDescription<std::vector<ParameterSet> >::
-  insertDefault_(ParameterSet&) const {
+  void ParameterDescription<std::vector<ParameterSet> >::insertDefault_(ParameterSet&) const {
     throw Exception(errors::LogicError);
     return;
   }
@@ -452,7 +386,7 @@ namespace edm {
 
   namespace writeParameterValue {
 
-    template<typename T>
+    template <typename T>
     void writeSingleValue(std::ostream& os, T const& value, ValueFormat) {
       os << value;
     }
@@ -481,43 +415,43 @@ namespace edm {
       s << std::setprecision(17) << value;
       result = s.str();
 
-      if(result.size() > 15 && std::string::npos != result.find(".")) {
+      if (result.size() > 15 && std::string::npos != result.find(".")) {
         std::stringstream s;
         s << std::setprecision(15) << value;
         std::string resultLessPrecision = s.str();
 
-        if(resultLessPrecision.size() < result.size() - 2) {
+        if (resultLessPrecision.size() < result.size() - 2) {
           double test = std::strtod(resultLessPrecision.c_str(), nullptr);
-          if(test == value) {
+          if (test == value) {
             result = resultLessPrecision;
           }
         }
       }
     }
 
-    template<>
+    template <>
     void writeSingleValue<double>(std::ostream& os, double const& value, ValueFormat) {
       std::string sValue;
       formatDouble(value, sValue);
       os << sValue;
     }
 
-    template<>
+    template <>
     void writeSingleValue<bool>(std::ostream& os, bool const& value, ValueFormat) {
       value ? os << "True" : os << "False";
     }
 
-    template<>
+    template <>
     void writeSingleValue<std::string>(std::ostream& os, std::string const& value, ValueFormat) {
       os << "'" << value << "'";
     }
 
-    template<>
+    template <>
     void writeSingleValue<EventID>(std::ostream& os, EventID const& value, ValueFormat format) {
-      if(format == CFI) {
+      if (format == CFI) {
         os << value.run() << ", " << value.luminosityBlock() << ", " << value.event();
       } else {
-        if(value.luminosityBlock() == 0U) {
+        if (value.luminosityBlock() == 0U) {
           os << value.run() << ":" << value.event();
         } else {
           os << value.run() << ":" << value.luminosityBlock() << ":" << value.event();
@@ -525,63 +459,71 @@ namespace edm {
       }
     }
 
-    template<>
+    template <>
     void writeSingleValue<LuminosityBlockID>(std::ostream& os, LuminosityBlockID const& value, ValueFormat format) {
-      if(format == CFI) os << value.run() << ", " << value.luminosityBlock();
-      else os << value.run() << ":" << value.luminosityBlock();
+      if (format == CFI)
+        os << value.run() << ", " << value.luminosityBlock();
+      else
+        os << value.run() << ":" << value.luminosityBlock();
     }
 
-    template<>
+    template <>
     void writeSingleValue<EventRange>(std::ostream& os, EventRange const& value, ValueFormat format) {
-      if(value.startLumi() == 0U) {
-        if(format == CFI) os << "'" << value.startRun() << ":" << value.startEvent() << "-"
-                                     << value.endRun() << ":" << value.endEvent() << "'";
-        else os << value.startRun() << ":" << value.startEvent() << "-"
-                << value.endRun() << ":" << value.endEvent();
+      if (value.startLumi() == 0U) {
+        if (format == CFI)
+          os << "'" << value.startRun() << ":" << value.startEvent() << "-" << value.endRun() << ":" << value.endEvent()
+             << "'";
+        else
+          os << value.startRun() << ":" << value.startEvent() << "-" << value.endRun() << ":" << value.endEvent();
       } else {
-        if(format == CFI) os << "'" << value.startRun() << ":" << value.startLumi() << ":" << value.startEvent() << "-"
-                                     << value.endRun() << ":" << value.endLumi() << ":" << value.endEvent() << "'";
-        else os << value.startRun() << ":" << value.startLumi() << ":" << value.startEvent() << "-"
-                << value.endRun() << ":" << value.endLumi() << ":" << value.endEvent();
+        if (format == CFI)
+          os << "'" << value.startRun() << ":" << value.startLumi() << ":" << value.startEvent() << "-"
+             << value.endRun() << ":" << value.endLumi() << ":" << value.endEvent() << "'";
+        else
+          os << value.startRun() << ":" << value.startLumi() << ":" << value.startEvent() << "-" << value.endRun()
+             << ":" << value.endLumi() << ":" << value.endEvent();
       }
     }
 
-    template<>
-    void writeSingleValue<LuminosityBlockRange>(std::ostream& os, LuminosityBlockRange const& value, ValueFormat format) {
-      if(format == CFI) os << "'" << value.startRun() << ":" << value.startLumi() << "-"
-                            << value.endRun() << ":" << value.endLumi() << "'";
-      else os << value.startRun() << ":" << value.startLumi() << "-"
-              << value.endRun() << ":" << value.endLumi();
+    template <>
+    void writeSingleValue<LuminosityBlockRange>(std::ostream& os,
+                                                LuminosityBlockRange const& value,
+                                                ValueFormat format) {
+      if (format == CFI)
+        os << "'" << value.startRun() << ":" << value.startLumi() << "-" << value.endRun() << ":" << value.endLumi()
+           << "'";
+      else
+        os << value.startRun() << ":" << value.startLumi() << "-" << value.endRun() << ":" << value.endLumi();
     }
 
-    template<>
+    template <>
     void writeSingleValue<InputTag>(std::ostream& os, InputTag const& value, ValueFormat format) {
-      if(format == CFI) {
+      if (format == CFI) {
         os << "'" << value.label() << "'";
-        if(!value.instance().empty() || !value.process().empty()) {
+        if (!value.instance().empty() || !value.process().empty()) {
           os << ", '" << value.instance() << "'";
         }
-        if(!value.process().empty()) {
+        if (!value.process().empty()) {
           os << ", '" << value.process() << "'";
         }
       } else {
         os << "'" << value.label();
-        if(!value.instance().empty() || !value.process().empty()) {
+        if (!value.instance().empty() || !value.process().empty()) {
           os << ":" << value.instance();
         }
-        if(!value.process().empty()) {
+        if (!value.process().empty()) {
           os << ":" << value.process();
         }
         os << "'";
       }
     }
 
-    template<>
+    template <>
     void writeSingleValue<FileInPath>(std::ostream& os, FileInPath const& value, ValueFormat) {
       os << "'" << value.relativePath() << "'";
     }
 
-    template<typename T>
+    template <typename T>
     void writeValue(std::ostream& os, T const& value_, ValueFormat format) {
       std::ios_base::fmtflags ff = os.flags(std::ios_base::dec);
       os.width(0);
@@ -589,81 +531,90 @@ namespace edm {
       os.flags(ff);
     }
 
-    template<typename T>
+    template <typename T>
     void writeValueInVector(std::ostream& os, T const& value, ValueFormat format) {
       writeSingleValue<T>(os, value, format);
     }
 
     // Specializations for cases where we write the single values into
     // vectors differently than when there is only one not in a vector.
-    template<>
+    template <>
     void writeValueInVector<EventID>(std::ostream& os, EventID const& value, ValueFormat format) {
-      if(value.luminosityBlock() == 0U) {
-        if(format == CFI) os << "'" << value.run() << ":" << value.event() << "'";
-        else os << value.run() << ":" << value.event();
+      if (value.luminosityBlock() == 0U) {
+        if (format == CFI)
+          os << "'" << value.run() << ":" << value.event() << "'";
+        else
+          os << value.run() << ":" << value.event();
       } else {
-        if(format == CFI) os << "'" << value.run() << ":" << value.luminosityBlock() << ":" << value.event() << "'";
-        else os << value.run() << ":" << value.luminosityBlock() << ":" << value.event();
+        if (format == CFI)
+          os << "'" << value.run() << ":" << value.luminosityBlock() << ":" << value.event() << "'";
+        else
+          os << value.run() << ":" << value.luminosityBlock() << ":" << value.event();
       }
     }
 
-    template<>
+    template <>
     void writeValueInVector<LuminosityBlockID>(std::ostream& os, LuminosityBlockID const& value, ValueFormat format) {
-      if(format == CFI) os << "'" << value.run() << ":" << value.luminosityBlock() << "'";
-      else os << value.run() << ":" << value.luminosityBlock();
+      if (format == CFI)
+        os << "'" << value.run() << ":" << value.luminosityBlock() << "'";
+      else
+        os << value.run() << ":" << value.luminosityBlock();
     }
 
-    template<>
+    template <>
     void writeValueInVector<InputTag>(std::ostream& os, InputTag const& value, ValueFormat) {
       os << "'" << value.label();
-      if(!value.instance().empty() || !value.process().empty()) {
+      if (!value.instance().empty() || !value.process().empty()) {
         os << ":" << value.instance();
       }
-      if(!value.process().empty()) {
+      if (!value.process().empty()) {
         os << ":" << value.process();
       }
       os << "'";
     }
 
-    template<typename T>
-    void writeValueInVectorWithSpace(T const& value,
-                                     std::ostream& os,
-                                     int indentation,
-                                     bool& startWithComma,
-                                     ValueFormat format,
-                                     int& i) {
-      if(startWithComma && format == CFI) os << ",";
+    template <typename T>
+    void writeValueInVectorWithSpace(
+        T const& value, std::ostream& os, int indentation, bool& startWithComma, ValueFormat format, int& i) {
+      if (startWithComma && format == CFI)
+        os << ",";
       startWithComma = true;
       os << "\n" << std::setw(indentation) << "";
-      if(format == DOC) os << "[" << i << "]: ";
+      if (format == DOC)
+        os << "[" << i << "]: ";
       writeValueInVector<T>(os, value, format);
       ++i;
     }
 
-    template<typename T>
+    template <typename T>
     void writeVector(std::ostream& os, int indentation, std::vector<T> const& value_, ValueFormat format) {
       std::ios_base::fmtflags ff = os.flags(std::ios_base::dec);
       char oldFill = os.fill();
       os.width(0);
-      if(value_.empty() && format == DOC) {
+      if (value_.empty() && format == DOC) {
         os << "empty";
-      } else if(value_.size() == 1U && format == CFI) {
+      } else if (value_.size() == 1U && format == CFI) {
         writeValueInVector<T>(os, value_[0], format);
-      } else if(!value_.empty()) {
-        if(format == DOC) os << "(vector size = " << value_.size() << ")";
-        if(format == CFI and value_.size() > 255U) os << " *(";
+      } else if (!value_.empty()) {
+        if (format == DOC)
+          os << "(vector size = " << value_.size() << ")";
+        if (format == CFI and value_.size() > 255U)
+          os << " *(";
         os.fill(' ');
         bool startWithComma = false;
         int i = 0;
-        for_all(value_, std::bind(&writeValueInVectorWithSpace<T>,
-                                    std::placeholders::_1,
-                                    std::ref(os),
-                                    indentation + 2,
-                                    std::ref(startWithComma),
-                                    format,
-                                    std::ref(i)));
-        if(format == CFI) os << "\n" << std::setw(indentation) << "";
-        if(format == CFI and value_.size() > 255U) os << ") ";
+        for_all(value_,
+                std::bind(&writeValueInVectorWithSpace<T>,
+                          std::placeholders::_1,
+                          std::ref(os),
+                          indentation + 2,
+                          std::ref(startWithComma),
+                          format,
+                          std::ref(i)));
+        if (format == CFI)
+          os << "\n" << std::setw(indentation) << "";
+        if (format == CFI and value_.size() > 255U)
+          os << ") ";
       }
       os.flags(ff);
       os.fill(oldFill);
@@ -697,7 +648,10 @@ namespace edm {
       writeValue<unsigned long long>(os, value_, format);
     }
 
-    void writeValue(std::ostream& os, int indentation, std::vector<unsigned long long> const& value_, ValueFormat format) {
+    void writeValue(std::ostream& os,
+                    int indentation,
+                    std::vector<unsigned long long> const& value_,
+                    ValueFormat format) {
       writeVector<unsigned long long>(os, indentation, value_, format);
     }
 
@@ -733,7 +687,10 @@ namespace edm {
       writeValue<LuminosityBlockID>(os, value_, format);
     }
 
-    void writeValue(std::ostream& os, int indentation, std::vector<LuminosityBlockID> const& value_, ValueFormat format) {
+    void writeValue(std::ostream& os,
+                    int indentation,
+                    std::vector<LuminosityBlockID> const& value_,
+                    ValueFormat format) {
       writeVector<LuminosityBlockID>(os, indentation, value_, format);
     }
 
@@ -741,7 +698,10 @@ namespace edm {
       writeValue<LuminosityBlockRange>(os, value_, format);
     }
 
-    void writeValue(std::ostream& os, int indentation, std::vector<LuminosityBlockRange> const& value_, ValueFormat format) {
+    void writeValue(std::ostream& os,
+                    int indentation,
+                    std::vector<LuminosityBlockRange> const& value_,
+                    ValueFormat format) {
       writeVector<LuminosityBlockRange>(os, indentation, value_, format);
     }
 
@@ -789,5 +749,5 @@ namespace edm {
     bool hasNestedContent(InputTag const&) { return false; }
     bool hasNestedContent(std::vector<InputTag> const& value) { return value.size() > 5U; }
     bool hasNestedContent(FileInPath const&) { return false; }
-  }
-}
+  }  // namespace writeParameterValue
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/ParameterDescriptionBase.cc b/FWCore/ParameterSet/src/ParameterDescriptionBase.cc
index 094d61d716c06..6d173c7bab6a6 100644
--- a/FWCore/ParameterSet/src/ParameterDescriptionBase.cc
+++ b/FWCore/ParameterSet/src/ParameterDescriptionBase.cc
@@ -21,109 +21,95 @@
 
 namespace edm {
 
-  ParameterDescriptionBase::ParameterDescriptionBase(std::string const& iLabel,
-                                                     ParameterTypes iType,
-                                                     bool isTracked,
-                                                     bool hasDefault,
-                                                     Comment const& iComment)
-    :ParameterDescriptionNode(iComment),
-     label_(iLabel),
-     type_(iType),
-     isTracked_(isTracked),
-     hasDefault_(hasDefault) {
-    if(label_.empty()) {
-      throw Exception(errors::LogicError)
-        << "Empty string used as a label for a parameter.  This is\n"
-           "not allowed.\n";
+  ParameterDescriptionBase::ParameterDescriptionBase(
+      std::string const& iLabel, ParameterTypes iType, bool isTracked, bool hasDefault, Comment const& iComment)
+      : ParameterDescriptionNode(iComment),
+        label_(iLabel),
+        type_(iType),
+        isTracked_(isTracked),
+        hasDefault_(hasDefault) {
+    if (label_.empty()) {
+      throw Exception(errors::LogicError) << "Empty string used as a label for a parameter.  This is\n"
+                                             "not allowed.\n";
     }
   }
 
-  ParameterDescriptionBase::ParameterDescriptionBase(char const* iLabel,
-                                                     ParameterTypes iType,
-                                                     bool isTracked,
-                                                     bool hasDefault,
-                                                     Comment const& iComment)
-    :ParameterDescriptionNode(iComment),
-     label_(iLabel),
-     type_(iType),
-     isTracked_(isTracked),
-     hasDefault_(hasDefault) {
-    if(label_.empty()) {
-      throw Exception(errors::LogicError)
-        << "Empty string used as a label for a parameter.  This is\n"
-           "not allowed.\n";
+  ParameterDescriptionBase::ParameterDescriptionBase(
+      char const* iLabel, ParameterTypes iType, bool isTracked, bool hasDefault, Comment const& iComment)
+      : ParameterDescriptionNode(iComment),
+        label_(iLabel),
+        type_(iType),
+        isTracked_(isTracked),
+        hasDefault_(hasDefault) {
+    if (label_.empty()) {
+      throw Exception(errors::LogicError) << "Empty string used as a label for a parameter.  This is\n"
+                                             "not allowed.\n";
     }
   }
 
-  ParameterDescriptionBase::~ParameterDescriptionBase() { }
+  ParameterDescriptionBase::~ParameterDescriptionBase() {}
 
-  void
-  ParameterDescriptionBase::throwParameterWrongTrackiness() const {
+  void ParameterDescriptionBase::throwParameterWrongTrackiness() const {
     std::string tr("a tracked");
     std::string shouldBe("untracked");
-    if(isTracked()) {
+    if (isTracked()) {
       tr = "an untracked";
       shouldBe = "tracked";
     }
 
-    throw Exception(errors::Configuration)
-      << "In the configuration, parameter \"" << label() << "\" is defined "
-      "as " << tr << " " << parameterTypeEnumToString(type()) << ".\n"
-      << "It should be " << shouldBe << ".\n";
+    throw Exception(errors::Configuration) << "In the configuration, parameter \"" << label()
+                                           << "\" is defined "
+                                              "as "
+                                           << tr << " " << parameterTypeEnumToString(type()) << ".\n"
+                                           << "It should be " << shouldBe << ".\n";
   }
 
-  void
-  ParameterDescriptionBase::throwParameterWrongType() const {
+  void ParameterDescriptionBase::throwParameterWrongType() const {
     std::string tr("an untracked");
-    if(isTracked()) tr = "a tracked";
-
-    throw Exception(errors::Configuration)
-      << "Parameter \"" << label() << "\" should be defined "
-      "as " << tr << " " << parameterTypeEnumToString(type()) << ".\n"
-      << "The type in the configuration is incorrect.\n";
+    if (isTracked())
+      tr = "a tracked";
+
+    throw Exception(errors::Configuration) << "Parameter \"" << label()
+                                           << "\" should be defined "
+                                              "as "
+                                           << tr << " " << parameterTypeEnumToString(type()) << ".\n"
+                                           << "The type in the configuration is incorrect.\n";
   }
 
-  void
-  ParameterDescriptionBase::throwMissingRequiredNoDefault() const {
-
+  void ParameterDescriptionBase::throwMissingRequiredNoDefault() const {
     std::string tr("untracked");
-    if(isTracked()) tr = "tracked";
+    if (isTracked())
+      tr = "tracked";
 
     throw Exception(errors::Configuration)
-      << "Missing required parameter.  It should have label \""
-      << label() << "\" and have type \""
-      << tr << " " << parameterTypeEnumToString(type()) << "\".\n"
-      << "The description has no default.  The parameter must be defined "
-         "in the configuration\n";
+        << "Missing required parameter.  It should have label \"" << label() << "\" and have type \"" << tr << " "
+        << parameterTypeEnumToString(type()) << "\".\n"
+        << "The description has no default.  The parameter must be defined "
+           "in the configuration\n";
   }
 
-  void
-  ParameterDescriptionBase::
-  checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
-                             std::set<ParameterTypes>& parameterTypes,
-                             std::set<ParameterTypes>& /*wildcardTypes*/) const {
+  void ParameterDescriptionBase::checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
+                                                            std::set<ParameterTypes>& parameterTypes,
+                                                            std::set<ParameterTypes>& /*wildcardTypes*/) const {
     usedLabels.insert(label());
     parameterTypes.insert(type());
   }
 
-  void
-  ParameterDescriptionBase::
-  validate_(ParameterSet& pset,
-            std::set<std::string>& validatedLabels,
-            bool optional) const {
-
+  void ParameterDescriptionBase::validate_(ParameterSet& pset,
+                                           std::set<std::string>& validatedLabels,
+                                           bool optional) const {
     bool exists = exists_(pset, isTracked());
 
-    if(exists) {
+    if (exists) {
       validatedLabels.insert(label());
-    } else if(exists_(pset, !isTracked())) {
+    } else if (exists_(pset, !isTracked())) {
       throwParameterWrongTrackiness();
-    } else if(pset.exists(label())) {
+    } else if (pset.exists(label())) {
       throwParameterWrongType();
     }
 
-    if(!exists && !optional) {
-      if(hasDefault()) {
+    if (!exists && !optional) {
+      if (hasDefault()) {
         insertDefault_(pset);
         validatedLabels.insert(label());
       } else {
@@ -132,56 +118,48 @@ namespace edm {
     }
   }
 
-  void
-  ParameterDescriptionBase::
-  writeCfi_(std::ostream& os,
-           bool& startWithComma,
-           int indentation,
-           bool& wroteSomething) const {
-
-    if(!hasDefault()) return;
+  void ParameterDescriptionBase::writeCfi_(std::ostream& os,
+                                           bool& startWithComma,
+                                           int indentation,
+                                           bool& wroteSomething) const {
+    if (!hasDefault())
+      return;
 
     wroteSomething = true;
-    if(startWithComma) os << ",";
+    if (startWithComma)
+      os << ",";
     startWithComma = true;
 
     os << "\n";
     printSpaces(os, indentation);
 
-    os << label()
-       << " = cms.";
-    if(!isTracked()) os << "untracked.";
-    os << parameterTypeEnumToString(type())
-       << "(";
+    os << label() << " = cms.";
+    if (!isTracked())
+      os << "untracked.";
+    os << parameterTypeEnumToString(type()) << "(";
     writeCfi_(os, indentation);
     os << ")";
   }
 
-  void
-  ParameterDescriptionBase::
-  print_(std::ostream& os,
-         bool optional,
-         bool writeToCfi,
-         DocFormatHelper& dfh) const {
-    if(dfh.pass() == 0) {
+  void ParameterDescriptionBase::print_(std::ostream& os, bool optional, bool writeToCfi, DocFormatHelper& dfh) const {
+    if (dfh.pass() == 0) {
       dfh.setAtLeast1(label().size());
-      if(isTracked()) {
+      if (isTracked()) {
         dfh.setAtLeast2(parameterTypeEnumToString(type()).size());
       } else {
         dfh.setAtLeast2(parameterTypeEnumToString(type()).size() + 10U);
       }
-      if(optional) {
+      if (optional) {
         dfh.setAtLeast3(8U);
       }
     } else {
-
-      if(dfh.brief()) {
+      if (dfh.brief()) {
         std::ios::fmtflags oldFlags = os.flags();
 
         dfh.indent(os);
         os << std::left << std::setw(dfh.column1()) << label() << " ";
 
-        if(isTracked()) {
+        if (isTracked()) {
           os << std::setw(dfh.column2()) << parameterTypeEnumToString(type());
         } else {
           std::stringstream ss;
@@ -192,7 +170,7 @@ namespace edm {
         os << " ";
 
         os << std::setw(dfh.column3());
-        if(optional) {
+        if (optional) {
           os << "optional";
         } else {
           os << "";
@@ -207,39 +185,34 @@ namespace edm {
 
         dfh.indent2(os);
         os << "type: ";
-        if(!isTracked()) os << "untracked ";
+        if (!isTracked())
+          os << "untracked ";
 
         os << parameterTypeEnumToString(type()) << " ";
 
-        if(optional)  os << "optional";
+        if (optional)
+          os << "optional";
         os << "\n";
 
         dfh.indent2(os);
         printDefault_(os, writeToCfi, dfh);
 
-        if(!comment().empty()) {
-          DocFormatHelper::wrapAndPrintText(os,
-                                            comment(),
-                                            dfh.startColumn2(),
-                                            dfh.commentWidth());
+        if (!comment().empty()) {
+          DocFormatHelper::wrapAndPrintText(os, comment(), dfh.startColumn2(), dfh.commentWidth());
         }
         os << "\n";
       }
     }
   }
 
-  void
-  ParameterDescriptionBase::
-  printDefault_(std::ostream& os,
-                  bool writeToCfi,
-                  DocFormatHelper& dfh) const {
-    if(!dfh.brief()) os << "default: ";
-    if(writeToCfi && hasDefault()) {
-      if(hasNestedContent()) {
-        os << "see Section " << dfh.section()
-           << "." << dfh.counter();
+  void ParameterDescriptionBase::printDefault_(std::ostream& os, bool writeToCfi, DocFormatHelper& dfh) const {
+    if (!dfh.brief())
+      os << "default: ";
+    if (writeToCfi && hasDefault()) {
+      if (hasNestedContent()) {
+        os << "see Section " << dfh.section() << "." << dfh.counter();
       } else {
-        if(dfh.brief()) {
+        if (dfh.brief()) {
           writeDoc_(os, dfh.indentation());
         } else {
           writeDoc_(os, dfh.startColumn2());
@@ -251,33 +224,23 @@ namespace edm {
     os << "\n";
   }
 
-  void
-  ParameterDescriptionBase::
-  printNestedContent_(std::ostream& os,
-                      bool /*optional*/,
-                      DocFormatHelper& dfh) const {
+  void ParameterDescriptionBase::printNestedContent_(std::ostream& os, bool /*optional*/, DocFormatHelper& dfh) const {
     int indentation = dfh.indentation();
-    if(dfh.parent() != DocFormatHelper::TOP) {
+    if (dfh.parent() != DocFormatHelper::TOP) {
       indentation -= DocFormatHelper::offsetSectionContent();
     }
 
     printSpaces(os, indentation);
-    os << "Section " << dfh.section() << "." << dfh.counter()
-       << " " << label() << " default contents: ";
+    os << "Section " << dfh.section() << "." << dfh.counter() << " " << label() << " default contents: ";
     writeDoc_(os, indentation + 2);
     os << "\n";
-    if(!dfh.brief()) os << "\n";
+    if (!dfh.brief())
+      os << "\n";
   }
 
-  bool
-  ParameterDescriptionBase::
-  partiallyExists_(ParameterSet const& pset) const {
-    return exists(pset);
-  }
+  bool ParameterDescriptionBase::partiallyExists_(ParameterSet const& pset) const { return exists(pset); }
 
-  int
-  ParameterDescriptionBase::
-  howManyXORSubNodesExist_(ParameterSet const& pset) const {
+  int ParameterDescriptionBase::howManyXORSubNodesExist_(ParameterSet const& pset) const {
     return exists(pset) ? 1 : 0;
   }
-}
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/ParameterDescriptionCases.cc b/FWCore/ParameterSet/src/ParameterDescriptionCases.cc
index 78e81f7bc70f5..a89051fa5f430 100644
--- a/FWCore/ParameterSet/src/ParameterDescriptionCases.cc
+++ b/FWCore/ParameterSet/src/ParameterDescriptionCases.cc
@@ -1,17 +1,15 @@
 
 #include "FWCore/ParameterSet/interface/ParameterDescriptionCases.h"
 
-
 namespace edm {
 
-  std::unique_ptr<ParameterDescriptionCases<bool> >
-  operator||(std::unique_ptr<ParameterDescriptionCases<bool> > left,
-             std::unique_ptr<ParameterDescriptionCases<bool> > right) {
-
+  std::unique_ptr<ParameterDescriptionCases<bool> > operator||(
+      std::unique_ptr<ParameterDescriptionCases<bool> > left, std::unique_ptr<ParameterDescriptionCases<bool> > right) {
     std::unique_ptr<std::map<bool, edm::value_ptr<ParameterDescriptionNode> > > rightCases = right->caseMap();
     for (std::map<bool, edm::value_ptr<ParameterDescriptionNode> >::const_iterator iter = rightCases->begin(),
-	                                                                           iEnd = rightCases->end();
-         iter != iEnd; ++iter) {
+                                                                                   iEnd = rightCases->end();
+         iter != iEnd;
+         ++iter) {
       bool caseValue = iter->first;
       std::unique_ptr<ParameterDescriptionNode> node(iter->second->clone());
       left->insert(caseValue, std::move(node));
@@ -19,14 +17,13 @@ namespace edm {
     return left;
   }
 
-  std::unique_ptr<ParameterDescriptionCases<int> >
-  operator||(std::unique_ptr<ParameterDescriptionCases<int> > left,
-             std::unique_ptr<ParameterDescriptionCases<int> > right) {
-
+  std::unique_ptr<ParameterDescriptionCases<int> > operator||(std::unique_ptr<ParameterDescriptionCases<int> > left,
+                                                              std::unique_ptr<ParameterDescriptionCases<int> > right) {
     std::unique_ptr<std::map<int, edm::value_ptr<ParameterDescriptionNode> > > rightCases = right->caseMap();
     for (std::map<int, edm::value_ptr<ParameterDescriptionNode> >::const_iterator iter = rightCases->begin(),
-	                                                                          iEnd = rightCases->end();
-         iter != iEnd; ++iter) {
+                                                                                  iEnd = rightCases->end();
+         iter != iEnd;
+         ++iter) {
       int caseValue = iter->first;
       std::unique_ptr<ParameterDescriptionNode> node(iter->second->clone());
       left->insert(caseValue, std::move(node));
@@ -34,18 +31,18 @@ namespace edm {
     return left;
   }
 
-  std::unique_ptr<ParameterDescriptionCases<std::string> >
-  operator||(std::unique_ptr<ParameterDescriptionCases<std::string> > left,
-             std::unique_ptr<ParameterDescriptionCases<std::string> > right) {
-
+  std::unique_ptr<ParameterDescriptionCases<std::string> > operator||(
+      std::unique_ptr<ParameterDescriptionCases<std::string> > left,
+      std::unique_ptr<ParameterDescriptionCases<std::string> > right) {
     std::unique_ptr<std::map<std::string, edm::value_ptr<ParameterDescriptionNode> > > rightCases = right->caseMap();
     for (std::map<std::string, edm::value_ptr<ParameterDescriptionNode> >::const_iterator iter = rightCases->begin(),
-	                                                                        iEnd = rightCases->end();
-         iter != iEnd; ++iter) {
+                                                                                          iEnd = rightCases->end();
+         iter != iEnd;
+         ++iter) {
       std::string caseValue = iter->first;
       std::unique_ptr<ParameterDescriptionNode> node(iter->second->clone());
       left->insert(caseValue, std::move(node));
     }
     return left;
   }
-}
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/ParameterDescriptionNode.cc b/FWCore/ParameterSet/src/ParameterDescriptionNode.cc
index fcb3a602e09da..046510b6fa76c 100644
--- a/FWCore/ParameterSet/src/ParameterDescriptionNode.cc
+++ b/FWCore/ParameterSet/src/ParameterDescriptionNode.cc
@@ -10,8 +10,14 @@
 #include <cassert>
 #include <ostream>
 
-#define TYPE_TO_ENUM(type,e_val) template<> ParameterTypes ParameterTypeToEnum::toEnum<type >(){ return e_val; }
-#define TYPE_TO_NAME(type) case k_ ## type: return #type
+#define TYPE_TO_ENUM(type, e_val)                      \
+  template <>                                          \
+  ParameterTypes ParameterTypeToEnum::toEnum<type>() { \
+    return e_val;                                      \
+  }
+#define TYPE_TO_NAME(type) \
+  case k_##type:           \
+    return #type
 
 namespace edm {
 
@@ -22,30 +28,30 @@ namespace edm {
   class InputTag;
   class FileInPath;
 
-  TYPE_TO_ENUM(int,k_int32)
-  TYPE_TO_ENUM(std::vector<int>,k_vint32)
-  TYPE_TO_ENUM(unsigned,k_uint32)
-  TYPE_TO_ENUM(std::vector<unsigned>,k_vuint32)
-  TYPE_TO_ENUM(long long,k_int64)
-  TYPE_TO_ENUM(std::vector<long long>,k_vint64)
-  TYPE_TO_ENUM(unsigned long long,k_uint64)
-  TYPE_TO_ENUM(std::vector<unsigned long long>,k_vuint64)
-  TYPE_TO_ENUM(double,k_double)
-  TYPE_TO_ENUM(std::vector<double>,k_vdouble)
-  TYPE_TO_ENUM(bool,k_bool)
-  TYPE_TO_ENUM(std::string,k_string)
-  TYPE_TO_ENUM(std::vector<std::string>,k_vstring)
-  TYPE_TO_ENUM(EventID,k_EventID)
-  TYPE_TO_ENUM(std::vector<EventID>,k_VEventID)
-  TYPE_TO_ENUM(LuminosityBlockID,k_LuminosityBlockID)
-  TYPE_TO_ENUM(std::vector<LuminosityBlockID>,k_VLuminosityBlockID)
-  TYPE_TO_ENUM(InputTag,k_InputTag)
-  TYPE_TO_ENUM(std::vector<InputTag>,k_VInputTag)
-  TYPE_TO_ENUM(FileInPath,k_FileInPath)
-  TYPE_TO_ENUM(LuminosityBlockRange,k_LuminosityBlockRange)
-  TYPE_TO_ENUM(std::vector<LuminosityBlockRange>,k_VLuminosityBlockRange)
-  TYPE_TO_ENUM(EventRange,k_EventRange)
-  TYPE_TO_ENUM(std::vector<EventRange>,k_VEventRange)
+  TYPE_TO_ENUM(int, k_int32)
+  TYPE_TO_ENUM(std::vector<int>, k_vint32)
+  TYPE_TO_ENUM(unsigned, k_uint32)
+  TYPE_TO_ENUM(std::vector<unsigned>, k_vuint32)
+  TYPE_TO_ENUM(long long, k_int64)
+  TYPE_TO_ENUM(std::vector<long long>, k_vint64)
+  TYPE_TO_ENUM(unsigned long long, k_uint64)
+  TYPE_TO_ENUM(std::vector<unsigned long long>, k_vuint64)
+  TYPE_TO_ENUM(double, k_double)
+  TYPE_TO_ENUM(std::vector<double>, k_vdouble)
+  TYPE_TO_ENUM(bool, k_bool)
+  TYPE_TO_ENUM(std::string, k_string)
+  TYPE_TO_ENUM(std::vector<std::string>, k_vstring)
+  TYPE_TO_ENUM(EventID, k_EventID)
+  TYPE_TO_ENUM(std::vector<EventID>, k_VEventID)
+  TYPE_TO_ENUM(LuminosityBlockID, k_LuminosityBlockID)
+  TYPE_TO_ENUM(std::vector<LuminosityBlockID>, k_VLuminosityBlockID)
+  TYPE_TO_ENUM(InputTag, k_InputTag)
+  TYPE_TO_ENUM(std::vector<InputTag>, k_VInputTag)
+  TYPE_TO_ENUM(FileInPath, k_FileInPath)
+  TYPE_TO_ENUM(LuminosityBlockRange, k_LuminosityBlockRange)
+  TYPE_TO_ENUM(std::vector<LuminosityBlockRange>, k_VLuminosityBlockRange)
+  TYPE_TO_ENUM(EventRange, k_EventRange)
+  TYPE_TO_ENUM(std::vector<EventRange>, k_VEventRange)
   // These are intentionally not implemented to prevent one
   // from calling add<ParameterSet>.  One should call
   // add<ParameterSetDescription> instead.
@@ -53,7 +59,7 @@ namespace edm {
   // TYPE_TO_ENUM(std::vector<ParameterSet>,k_VPSet)
 
   std::string parameterTypeEnumToString(ParameterTypes iType) {
-    switch(iType) {
+    switch (iType) {
       TYPE_TO_NAME(int32);
       TYPE_TO_NAME(vint32);
       TYPE_TO_NAME(uint32);
@@ -80,8 +86,8 @@ namespace edm {
       TYPE_TO_NAME(VLuminosityBlockRange);
       TYPE_TO_NAME(EventRange);
       TYPE_TO_NAME(VEventRange);
-    default:
-      assert(false);
+      default:
+        assert(false);
     }
     return "";
   }
@@ -90,42 +96,27 @@ namespace edm {
   Comment::Comment(std::string const& iComment) : comment_(iComment) {}
   Comment::Comment(char const* iComment) : comment_(iComment) {}
 
-  ParameterDescriptionNode::~ParameterDescriptionNode() {
-  }
+  ParameterDescriptionNode::~ParameterDescriptionNode() {}
 
-  void
-  ParameterDescriptionNode::setComment(std::string const& value) {
-    comment_ = value;
-  }
+  void ParameterDescriptionNode::setComment(std::string const& value) { comment_ = value; }
 
-  void
-  ParameterDescriptionNode::setComment(char const* value) {
-    comment_ = value;
-  }
+  void ParameterDescriptionNode::setComment(char const* value) { comment_ = value; }
 
-  void
-  ParameterDescriptionNode::print(std::ostream& os,
-                                  bool optional,
-                                  bool writeToCfi,
-                                  DocFormatHelper& dfh) const {
+  void ParameterDescriptionNode::print(std::ostream& os, bool optional, bool writeToCfi, DocFormatHelper& dfh) const {
     if (hasNestedContent()) {
       dfh.incrementCounter();
     }
     print_(os, optional, writeToCfi, dfh);
   }
 
-  void
-  ParameterDescriptionNode::printNestedContent(std::ostream& os,
-                                               bool optional,
-                                               DocFormatHelper& dfh) const {
+  void ParameterDescriptionNode::printNestedContent(std::ostream& os, bool optional, DocFormatHelper& dfh) const {
     if (hasNestedContent()) {
       dfh.incrementCounter();
       printNestedContent_(os, optional, dfh);
     }
   }
 
-  void
-  ParameterDescriptionNode::printSpaces(std::ostream& os, int n) {
+  void ParameterDescriptionNode::printSpaces(std::ostream& os, int n) {
     char oldFill = os.fill(' ');
     os.width(n);
     os << "";
@@ -134,138 +125,116 @@ namespace edm {
 
   // operator>> ---------------------------------------------
 
-  std::unique_ptr<ParameterDescriptionCases<bool>>
-  operator>>(bool caseValue,
-             ParameterDescriptionNode const& node) {
+  std::unique_ptr<ParameterDescriptionCases<bool>> operator>>(bool caseValue, ParameterDescriptionNode const& node) {
     std::unique_ptr<ParameterDescriptionNode> clonedNode(node.clone());
     return caseValue >> std::move(clonedNode);
   }
 
-  std::unique_ptr<ParameterDescriptionCases<int>>
-  operator>>(int caseValue,
-             ParameterDescriptionNode const& node) {
+  std::unique_ptr<ParameterDescriptionCases<int>> operator>>(int caseValue, ParameterDescriptionNode const& node) {
     std::unique_ptr<ParameterDescriptionNode> clonedNode(node.clone());
     return caseValue >> std::move(clonedNode);
   }
 
-  std::unique_ptr<ParameterDescriptionCases<std::string>>
-  operator>>(std::string const& caseValue,
-             ParameterDescriptionNode const& node) {
+  std::unique_ptr<ParameterDescriptionCases<std::string>> operator>>(std::string const& caseValue,
+                                                                     ParameterDescriptionNode const& node) {
     std::unique_ptr<ParameterDescriptionNode> clonedNode(node.clone());
     return caseValue >> std::move(clonedNode);
   }
 
-  std::unique_ptr<ParameterDescriptionCases<std::string>>
-  operator>>(char const* caseValue,
-             ParameterDescriptionNode const& node) {
+  std::unique_ptr<ParameterDescriptionCases<std::string>> operator>>(char const* caseValue,
+                                                                     ParameterDescriptionNode const& node) {
     std::unique_ptr<ParameterDescriptionNode> clonedNode(node.clone());
     return caseValue >> std::move(clonedNode);
   }
 
-  std::unique_ptr<ParameterDescriptionCases<bool>>
-  operator>>(bool caseValue,
-             std::unique_ptr<ParameterDescriptionNode> node) {
+  std::unique_ptr<ParameterDescriptionCases<bool>> operator>>(bool caseValue,
+                                                              std::unique_ptr<ParameterDescriptionNode> node) {
     return std::unique_ptr<ParameterDescriptionCases<bool>>(
-      new ParameterDescriptionCases<bool>(caseValue, std::move(node)));
+        new ParameterDescriptionCases<bool>(caseValue, std::move(node)));
   }
 
-  std::unique_ptr<ParameterDescriptionCases<int>>
-  operator>>(int caseValue,
-             std::unique_ptr<ParameterDescriptionNode> node) {
+  std::unique_ptr<ParameterDescriptionCases<int>> operator>>(int caseValue,
+                                                             std::unique_ptr<ParameterDescriptionNode> node) {
     return std::unique_ptr<ParameterDescriptionCases<int>>(
-      new ParameterDescriptionCases<int>(caseValue, std::move(node)));
+        new ParameterDescriptionCases<int>(caseValue, std::move(node)));
   }
 
-  std::unique_ptr<ParameterDescriptionCases<std::string>>
-  operator>>(std::string const& caseValue,
-             std::unique_ptr<ParameterDescriptionNode> node) {
+  std::unique_ptr<ParameterDescriptionCases<std::string>> operator>>(std::string const& caseValue,
+                                                                     std::unique_ptr<ParameterDescriptionNode> node) {
     return std::unique_ptr<ParameterDescriptionCases<std::string>>(
-      new ParameterDescriptionCases<std::string>(caseValue, std::move(node)));
+        new ParameterDescriptionCases<std::string>(caseValue, std::move(node)));
   }
 
-  std::unique_ptr<ParameterDescriptionCases<std::string>>
-  operator>>(char const* caseValue,
-             std::unique_ptr<ParameterDescriptionNode> node) {
+  std::unique_ptr<ParameterDescriptionCases<std::string>> operator>>(char const* caseValue,
+                                                                     std::unique_ptr<ParameterDescriptionNode> node) {
     std::string caseValueString(caseValue);
     return std::unique_ptr<ParameterDescriptionCases<std::string>>(
-      new ParameterDescriptionCases<std::string>(caseValue, std::move(node)));
+        new ParameterDescriptionCases<std::string>(caseValue, std::move(node)));
   }
 
   // operator&& ---------------------------------------------
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator&&(ParameterDescriptionNode const& node_left,
-             ParameterDescriptionNode const& node_right) {
+  std::unique_ptr<ParameterDescriptionNode> operator&&(ParameterDescriptionNode const& node_left,
+                                                       ParameterDescriptionNode const& node_right) {
     return std::make_unique<ANDGroupDescription>(node_left, node_right);
   }
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator&&(std::unique_ptr<ParameterDescriptionNode> node_left,
-             ParameterDescriptionNode const& node_right) {
+  std::unique_ptr<ParameterDescriptionNode> operator&&(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                                       ParameterDescriptionNode const& node_right) {
     return std::make_unique<ANDGroupDescription>(std::move(node_left), node_right);
   }
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator&&(ParameterDescriptionNode const& node_left,
-             std::unique_ptr<ParameterDescriptionNode> node_right) {
+  std::unique_ptr<ParameterDescriptionNode> operator&&(ParameterDescriptionNode const& node_left,
+                                                       std::unique_ptr<ParameterDescriptionNode> node_right) {
     return std::make_unique<ANDGroupDescription>(node_left, std::move(node_right));
   }
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator&&(std::unique_ptr<ParameterDescriptionNode> node_left,
-             std::unique_ptr<ParameterDescriptionNode> node_right) {
+  std::unique_ptr<ParameterDescriptionNode> operator&&(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                                       std::unique_ptr<ParameterDescriptionNode> node_right) {
     return std::make_unique<ANDGroupDescription>(std::move(node_left), std::move(node_right));
   }
 
   // operator|| ---------------------------------------------
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator||(ParameterDescriptionNode const& node_left,
-             ParameterDescriptionNode const& node_right) {
+  std::unique_ptr<ParameterDescriptionNode> operator||(ParameterDescriptionNode const& node_left,
+                                                       ParameterDescriptionNode const& node_right) {
     return std::make_unique<ORGroupDescription>(node_left, node_right);
   }
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator||(std::unique_ptr<ParameterDescriptionNode> node_left,
-             ParameterDescriptionNode const& node_right) {
+  std::unique_ptr<ParameterDescriptionNode> operator||(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                                       ParameterDescriptionNode const& node_right) {
     return std::make_unique<ORGroupDescription>(std::move(node_left), node_right);
   }
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator||(ParameterDescriptionNode const& node_left,
-             std::unique_ptr<ParameterDescriptionNode> node_right) {
+  std::unique_ptr<ParameterDescriptionNode> operator||(ParameterDescriptionNode const& node_left,
+                                                       std::unique_ptr<ParameterDescriptionNode> node_right) {
     return std::make_unique<ORGroupDescription>(node_left, std::move(node_right));
   }
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator||(std::unique_ptr<ParameterDescriptionNode> node_left,
-             std::unique_ptr<ParameterDescriptionNode> node_right) {
+  std::unique_ptr<ParameterDescriptionNode> operator||(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                                       std::unique_ptr<ParameterDescriptionNode> node_right) {
     return std::make_unique<ORGroupDescription>(std::move(node_left), std::move(node_right));
   }
 
   // operator^  ---------------------------------------------
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator^(ParameterDescriptionNode const& node_left,
-            ParameterDescriptionNode const& node_right) {
+  std::unique_ptr<ParameterDescriptionNode> operator^(ParameterDescriptionNode const& node_left,
+                                                      ParameterDescriptionNode const& node_right) {
     return std::make_unique<XORGroupDescription>(node_left, node_right);
   }
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator^(std::unique_ptr<ParameterDescriptionNode> node_left,
-            ParameterDescriptionNode const& node_right) {
+  std::unique_ptr<ParameterDescriptionNode> operator^(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                                      ParameterDescriptionNode const& node_right) {
     return std::make_unique<XORGroupDescription>(std::move(node_left), node_right);
   }
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator^(ParameterDescriptionNode const& node_left,
-            std::unique_ptr<ParameterDescriptionNode> node_right) {
+  std::unique_ptr<ParameterDescriptionNode> operator^(ParameterDescriptionNode const& node_left,
+                                                      std::unique_ptr<ParameterDescriptionNode> node_right) {
     return std::make_unique<XORGroupDescription>(node_left, std::move(node_right));
   }
 
-  std::unique_ptr<ParameterDescriptionNode>
-  operator^(std::unique_ptr<ParameterDescriptionNode> node_left,
-            std::unique_ptr<ParameterDescriptionNode> node_right) {
+  std::unique_ptr<ParameterDescriptionNode> operator^(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                                      std::unique_ptr<ParameterDescriptionNode> node_right) {
     return std::make_unique<XORGroupDescription>(std::move(node_left), std::move(node_right));
   }
-}
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/ParameterSet.cc b/FWCore/ParameterSet/src/ParameterSet.cc
index 631905acde693..e2596bdc7b92a 100644
--- a/FWCore/ParameterSet/src/ParameterSet.cc
+++ b/FWCore/ParameterSet/src/ParameterSet.cc
@@ -1,4 +1,4 @@
- // ----------------------------------------------------------------------
+// ----------------------------------------------------------------------
 //
 // definition of ParameterSet's function members
 // ----------------------------------------------------------------------
@@ -29,18 +29,17 @@
 
 namespace edm {
 
-  void
-  ParameterSet::invalidateRegistration(std::string const& nameOfTracked) {
+  void ParameterSet::invalidateRegistration(std::string const& nameOfTracked) {
     // We have added a new parameter.  Invalidate the ID.
-    if(isRegistered()) {
+    if (isRegistered()) {
       id_ = ParameterSetID();
-      if(!nameOfTracked.empty()) {
+      if (!nameOfTracked.empty()) {
         // Give a warning (informational for now).
-        LogInfo("ParameterSet")  << "Warning: You have added a new tracked parameter\n"
-                                 <<  "'" << nameOfTracked << "' to a previously registered parameter set.\n"
-                                 << "This is a bad idea because the new parameter(s) will not be recorded.\n"
-                                 << "Use the forthcoming ParameterSetDescription facility instead.\n"
-                                 << "A warning is given only for the first such parameter in a pset.\n";
+        LogInfo("ParameterSet") << "Warning: You have added a new tracked parameter\n"
+                                << "'" << nameOfTracked << "' to a previously registered parameter set.\n"
+                                << "This is a bad idea because the new parameter(s) will not be recorded.\n"
+                                << "Use the forthcoming ParameterSetDescription facility instead.\n"
+                                << "A warning is given only for the first such parameter in a pset.\n";
       }
     }
     assert(!isRegistered());
@@ -50,47 +49,34 @@ namespace edm {
   // constructors
   // ----------------------------------------------------------------------
 
-  ParameterSet::ParameterSet() :
-    tbl_(),
-    psetTable_(),
-    vpsetTable_(),
-    id_() {
-  }
+  ParameterSet::ParameterSet() : tbl_(), psetTable_(), vpsetTable_(), id_() {}
 
   // ----------------------------------------------------------------------
   // from coded string
 
-  ParameterSet::ParameterSet(std::string const& code) :
-    tbl_(),
-    psetTable_(),
-    vpsetTable_(),
-    id_() {
-    if(!fromString(code)) {
+  ParameterSet::ParameterSet(std::string const& code) : tbl_(), psetTable_(), vpsetTable_(), id_() {
+    if (!fromString(code)) {
       throw Exception(errors::Configuration, "InvalidInput")
-        << "The encoded configuration string "
-        << "passed to a ParameterSet during construction is invalid:\n"
-        << code;
+          << "The encoded configuration string "
+          << "passed to a ParameterSet during construction is invalid:\n"
+          << code;
     }
   }
 
   // ----------------------------------------------------------------------
   // from coded string and ID.
 
-  ParameterSet::ParameterSet(std::string const& code, ParameterSetID const& id) :
-    tbl_(),
-    psetTable_(),
-    vpsetTable_(),
-    id_(id) {
-    if(!fromString(code)) {
+  ParameterSet::ParameterSet(std::string const& code, ParameterSetID const& id)
+      : tbl_(), psetTable_(), vpsetTable_(), id_(id) {
+    if (!fromString(code)) {
       throw Exception(errors::Configuration, "InvalidInput")
-        << "The encoded configuration string "
-        << "passed to a ParameterSet during construction is invalid:\n"
-        << code;
+          << "The encoded configuration string "
+          << "passed to a ParameterSet during construction is invalid:\n"
+          << code;
     }
   }
 
-  void
-  ParameterSet::registerFromString(std::string const& rep) {
+  void ParameterSet::registerFromString(std::string const& rep) {
     // from coded string.  Will cause registration
     cms::Digest dg(rep);
     edm::ParameterSetID psID(dg.digest().toString());
@@ -98,8 +84,7 @@ namespace edm {
     pset::Registry::instance()->insertMapped(ps);
   }
 
-  ParameterSetID
-  ParameterSet::emptyParameterSetID() {  // const
+  ParameterSetID ParameterSet::emptyParameterSetID() {  // const
     cms::Digest newDigest;
     ParameterSet().toDigest(newDigest);
     return ParameterSetID(newDigest.digest().toString());
@@ -119,7 +104,7 @@ namespace edm {
   }
 
   ParameterSet const& ParameterSet::registerIt() {
-    if(!isRegistered()) {
+    if (!isRegistered()) {
       calculateID();
       pset::Registry::instance()->insertMapped(*this);
     }
@@ -167,235 +152,200 @@ namespace edm {
 
   void ParameterSet::calculateID() {
     // make sure contained tracked psets are updated
-    for(auto& item : psetTable_) {
+    for (auto& item : psetTable_) {
       ParameterSet& pset = item.second.psetForUpdate();
-      if(!pset.isRegistered()) {
+      if (!pset.isRegistered()) {
         pset.registerIt();
       }
       item.second.updateID();
     }
 
     // make sure contained tracked vpsets are updated
-    for(vpsettable::iterator i = vpsetTable_.begin(), e = vpsetTable_.end(); i != e; ++i) {
+    for (vpsettable::iterator i = vpsetTable_.begin(), e = vpsetTable_.end(); i != e; ++i) {
       i->second.registerPsetsAndUpdateIDs();
     }
-//  The old, string base code is found below. Uncomment this and the assert to check whether
-//  there are discrepancies between old and new implementation.
-//    std::string stringrep;
-//    toString(stringrep);
-//    cms::Digest md5alg(stringrep);
-//    id_ = ParameterSetID(md5alg.digest().toString());
+    //  The old, string base code is found below. Uncomment this and the assert to check whether
+    //  there are discrepancies between old and new implementation.
+    //    std::string stringrep;
+    //    toString(stringrep);
+    //    cms::Digest md5alg(stringrep);
+    //    id_ = ParameterSetID(md5alg.digest().toString());
     cms::Digest newDigest;
     toDigest(newDigest);
     id_ = ParameterSetID(newDigest.digest().toString());
-//    assert(md5alg.digest().toString() == newDigest.digest().toString());
+    //    assert(md5alg.digest().toString() == newDigest.digest().toString());
     assert(isRegistered());
   }
 
   // ----------------------------------------------------------------------
   // identification
-  ParameterSetID
-  ParameterSet::id() const {
+  ParameterSetID ParameterSet::id() const {
     // checks if valid
-    if(!isRegistered()) {
-      throw Exception(errors::LogicError)
-        << "ParameterSet::id() called prematurely\n"
-        << "before ParameterSet::registerIt() has been called.\n";
+    if (!isRegistered()) {
+      throw Exception(errors::LogicError) << "ParameterSet::id() called prematurely\n"
+                                          << "before ParameterSet::registerIt() has been called.\n";
     }
     return id_;
   }
 
-  void ParameterSet::setID(ParameterSetID const& id) {
-    id_ = id;
-  }
+  void ParameterSet::setID(ParameterSetID const& id) { id_ = id; }
 
   // ----------------------------------------------------------------------
   // Entry-handling
   // ----------------------------------------------------------------------
 
-  Entry const*
-  ParameterSet::getEntryPointerOrThrow_(char const* name) const {
+  Entry const* ParameterSet::getEntryPointerOrThrow_(char const* name) const {
     return getEntryPointerOrThrow_(std::string(name));
   }
 
-  Entry const*
-  ParameterSet::getEntryPointerOrThrow_(std::string const& name) const {
+  Entry const* ParameterSet::getEntryPointerOrThrow_(std::string const& name) const {
     Entry const* result = retrieveUntracked(name);
-    if(result == nullptr)
+    if (result == nullptr)
       throw Exception(errors::Configuration, "MissingParameter:")
-        << "The required parameter '" << name
-        << "' was not specified.\n";
+          << "The required parameter '" << name << "' was not specified.\n";
     return result;
   }
 
-  template<typename T, typename U> T first(std::pair<T, U> const& p) {
+  template <typename T, typename U>
+  T first(std::pair<T, U> const& p) {
     return p.first;
   }
 
-  template<typename T, typename U> U second(std::pair<T, U> const& p) {
+  template <typename T, typename U>
+  U second(std::pair<T, U> const& p) {
     return p.second;
   }
 
-  Entry const&
-  ParameterSet::retrieve(char const* name) const {
-    return retrieve(std::string(name));
-  }
+  Entry const& ParameterSet::retrieve(char const* name) const { return retrieve(std::string(name)); }
 
-  Entry const&
-  ParameterSet::retrieve(std::string const& name) const {
-    table::const_iterator  it = tbl_.find(name);
-    if(it == tbl_.end()) {
-        throw Exception(errors::Configuration, "MissingParameter:")
-          << "Parameter '" << name
-          << "' not found.";
+  Entry const& ParameterSet::retrieve(std::string const& name) const {
+    table::const_iterator it = tbl_.find(name);
+    if (it == tbl_.end()) {
+      throw Exception(errors::Configuration, "MissingParameter:") << "Parameter '" << name << "' not found.";
     }
-    if(it->second.isTracked() == false) {
-      if(name[0] == '@') {
+    if (it->second.isTracked() == false) {
+      if (name[0] == '@') {
         throw Exception(errors::Configuration, "StatusMismatch:")
-          << "Framework Error:  Parameter '" << name
-          << "' is incorrectly designated as tracked in the framework.";
+            << "Framework Error:  Parameter '" << name << "' is incorrectly designated as tracked in the framework.";
       } else {
         throw Exception(errors::Configuration, "StatusMismatch:")
-          << "Parameter '" << name
-          << "' is designated as tracked in the code,\n"
-          << "but is designated as untracked in the configuration file.\n"
-          << "Please remove 'untracked' from the configuration file for parameter '"<< name << "'.";
+            << "Parameter '" << name << "' is designated as tracked in the code,\n"
+            << "but is designated as untracked in the configuration file.\n"
+            << "Please remove 'untracked' from the configuration file for parameter '" << name << "'.";
       }
     }
     return it->second;
   }  // retrieve()
 
-  Entry const*
-  ParameterSet::retrieveUntracked(char const* name) const {
-    return retrieveUntracked(std::string(name));
-  }
+  Entry const* ParameterSet::retrieveUntracked(char const* name) const { return retrieveUntracked(std::string(name)); }
 
-  Entry const*
-  ParameterSet::retrieveUntracked(std::string const& name) const {
-    table::const_iterator  it = tbl_.find(name);
+  Entry const* ParameterSet::retrieveUntracked(std::string const& name) const {
+    table::const_iterator it = tbl_.find(name);
 
-    if(it == tbl_.end()) return nullptr;
-    if(it->second.isTracked()) {
-      if(name[0] == '@') {
+    if (it == tbl_.end())
+      return nullptr;
+    if (it->second.isTracked()) {
+      if (name[0] == '@') {
         throw Exception(errors::Configuration, "StatusMismatch:")
-          << "Framework Error:  Parameter '" << name
-          << "' is incorrectly designated as untracked in the framework.";
+            << "Framework Error:  Parameter '" << name << "' is incorrectly designated as untracked in the framework.";
       } else {
         throw Exception(errors::Configuration, "StatusMismatch:")
-          << "Parameter '" << name
-          << "' is designated as untracked in the code,\n"
-          << "but is not designated as untracked in the configuration file.\n"
-          << "Please change the configuration file to 'untracked <type> " << name << "'.";
+            << "Parameter '" << name << "' is designated as untracked in the code,\n"
+            << "but is not designated as untracked in the configuration file.\n"
+            << "Please change the configuration file to 'untracked <type> " << name << "'.";
       }
     }
     return &it->second;
   }  // retrieve()
 
-  ParameterSetEntry const&
-  ParameterSet::retrieveParameterSet(std::string const& name) const {
+  ParameterSetEntry const& ParameterSet::retrieveParameterSet(std::string const& name) const {
     psettable::const_iterator it = psetTable_.find(name);
-    if(it == psetTable_.end()) {
-        throw Exception(errors::Configuration, "MissingParameter:")
-          << "ParameterSet '" << name
-          << "' not found.";
+    if (it == psetTable_.end()) {
+      throw Exception(errors::Configuration, "MissingParameter:") << "ParameterSet '" << name << "' not found.";
     }
-    if(it->second.isTracked() == false) {
-      if(name[0] == '@') {
+    if (it->second.isTracked() == false) {
+      if (name[0] == '@') {
         throw Exception(errors::Configuration, "StatusMismatch:")
-          << "Framework Error:  ParameterSet '" << name
-          << "' is incorrectly designated as tracked in the framework.";
+            << "Framework Error:  ParameterSet '" << name << "' is incorrectly designated as tracked in the framework.";
       } else {
         throw Exception(errors::Configuration, "StatusMismatch:")
-          << "ParameterSet '" << name
-          << "' is designated as tracked in the code,\n"
-          << "but is designated as untracked in the configuration file.\n"
-          << "Please remove 'untracked' from the configuration file for parameter '"<< name << "'.";
+            << "ParameterSet '" << name << "' is designated as tracked in the code,\n"
+            << "but is designated as untracked in the configuration file.\n"
+            << "Please remove 'untracked' from the configuration file for parameter '" << name << "'.";
       }
     }
     return it->second;
   }  // retrieve()
 
-  ParameterSetEntry const*
-  ParameterSet::retrieveUntrackedParameterSet(std::string const& name) const {
-    psettable::const_iterator  it = psetTable_.find(name);
+  ParameterSetEntry const* ParameterSet::retrieveUntrackedParameterSet(std::string const& name) const {
+    psettable::const_iterator it = psetTable_.find(name);
 
-    if(it == psetTable_.end()) return nullptr;
-    if(it->second.isTracked()) {
-      if(name[0] == '@') {
+    if (it == psetTable_.end())
+      return nullptr;
+    if (it->second.isTracked()) {
+      if (name[0] == '@') {
         throw Exception(errors::Configuration, "StatusMismatch:")
-          << "Framework Error:  ParameterSet '" << name
-          << "' is incorrectly designated as untracked in the framework.";
+            << "Framework Error:  ParameterSet '" << name
+            << "' is incorrectly designated as untracked in the framework.";
       } else {
         throw Exception(errors::Configuration, "StatusMismatch:")
-          << "ParameterSet '" << name
-          << "' is designated as untracked in the code,\n"
-          << "but is not designated as untracked in the configuration file.\n"
-          << "Please change the configuration file to 'untracked <type> " << name << "'.";
+            << "ParameterSet '" << name << "' is designated as untracked in the code,\n"
+            << "but is not designated as untracked in the configuration file.\n"
+            << "Please change the configuration file to 'untracked <type> " << name << "'.";
       }
     }
     return &it->second;
   }  // retrieve()
 
-  VParameterSetEntry const&
-  ParameterSet::retrieveVParameterSet(std::string const& name) const {
+  VParameterSetEntry const& ParameterSet::retrieveVParameterSet(std::string const& name) const {
     vpsettable::const_iterator it = vpsetTable_.find(name);
-    if(it == vpsetTable_.end()) {
-        throw Exception(errors::Configuration, "MissingParameter:")
-          << "VParameterSet '" << name
-          << "' not found.";
+    if (it == vpsetTable_.end()) {
+      throw Exception(errors::Configuration, "MissingParameter:") << "VParameterSet '" << name << "' not found.";
     }
-    if(it->second.isTracked() == false) {
+    if (it->second.isTracked() == false) {
       throw Exception(errors::Configuration, "StatusMismatch:")
-        << "VParameterSet '" << name
-        << "' is designated as tracked in the code,\n"
-        << "but is designated as untracked in the configuration file.\n"
-        << "Please remove 'untracked' from the configuration file for parameter '"<< name << "'.";
+          << "VParameterSet '" << name << "' is designated as tracked in the code,\n"
+          << "but is designated as untracked in the configuration file.\n"
+          << "Please remove 'untracked' from the configuration file for parameter '" << name << "'.";
     }
     return it->second;
   }  // retrieve()
 
-  VParameterSetEntry const*
-  ParameterSet::retrieveUntrackedVParameterSet(std::string const& name) const {
+  VParameterSetEntry const* ParameterSet::retrieveUntrackedVParameterSet(std::string const& name) const {
     vpsettable::const_iterator it = vpsetTable_.find(name);
 
-    if(it == vpsetTable_.end()) return nullptr;
-    if(it->second.isTracked()) {
+    if (it == vpsetTable_.end())
+      return nullptr;
+    if (it->second.isTracked()) {
       throw Exception(errors::Configuration, "StatusMismatch:")
-        << "VParameterSet '" << name
-        << "' is designated as untracked in the code,\n"
-        << "but is not designated as untracked in the configuration file.\n"
-        << "Please change the configuration file to 'untracked <type> " << name << "'.";
+          << "VParameterSet '" << name << "' is designated as untracked in the code,\n"
+          << "but is not designated as untracked in the configuration file.\n"
+          << "Please change the configuration file to 'untracked <type> " << name << "'.";
     }
     return &it->second;
   }  // retrieve()
 
-  Entry const*
-  ParameterSet::retrieveUnknown(char const* name) const {
-    return retrieveUnknown(std::string(name));
-  }
+  Entry const* ParameterSet::retrieveUnknown(char const* name) const { return retrieveUnknown(std::string(name)); }
 
-  Entry const*
-  ParameterSet::retrieveUnknown(std::string const& name) const {
+  Entry const* ParameterSet::retrieveUnknown(std::string const& name) const {
     table::const_iterator it = tbl_.find(name);
-    if(it == tbl_.end()) {
+    if (it == tbl_.end()) {
       return nullptr;
     }
     return &it->second;
   }
 
-  ParameterSetEntry const*
-  ParameterSet::retrieveUnknownParameterSet(std::string const& name) const {
-    psettable::const_iterator  it = psetTable_.find(name);
-    if(it == psetTable_.end()) {
+  ParameterSetEntry const* ParameterSet::retrieveUnknownParameterSet(std::string const& name) const {
+    psettable::const_iterator it = psetTable_.find(name);
+    if (it == psetTable_.end()) {
       return nullptr;
     }
     return &it->second;
   }
 
-  VParameterSetEntry const*
-  ParameterSet::retrieveUnknownVParameterSet(std::string const& name) const {
-    vpsettable::const_iterator  it = vpsetTable_.find(name);
-    if(it == vpsetTable_.end()) {
+  VParameterSetEntry const* ParameterSet::retrieveUnknownVParameterSet(std::string const& name) const {
+    vpsettable::const_iterator it = vpsetTable_.find(name);
+    if (it == vpsetTable_.end()) {
       return nullptr;
     }
     return &it->second;
@@ -404,44 +354,35 @@ namespace edm {
   // ----------------------------------------------------------------------
   // ----------------------------------------------------------------------
 
-  std::string
-  ParameterSet::getParameterAsString(std::string const& name) const {
-    if(existsAs<ParameterSet>(name)) {
+  std::string ParameterSet::getParameterAsString(std::string const& name) const {
+    if (existsAs<ParameterSet>(name)) {
       return retrieveUnknownParameterSet(name)->toString();
-    }
-    else if(existsAs<std::vector<ParameterSet> >(name)) {
+    } else if (existsAs<std::vector<ParameterSet> >(name)) {
       return retrieveUnknownVParameterSet(name)->toString();
-    }
-    else if(exists(name)) {
+    } else if (exists(name)) {
       return retrieveUnknown(name)->toString();
-    }
-    else {
+    } else {
       throw Exception(errors::Configuration, "getParameterAsString")
-       << "Cannot find parameter " << name  << " in " << *this;
+          << "Cannot find parameter " << name << " in " << *this;
     }
   }
 
   // ----------------------------------------------------------------------
   // ----------------------------------------------------------------------
 
-  void
-  ParameterSet::insert(bool okay_to_replace, char const* name, Entry const& value) {
+  void ParameterSet::insert(bool okay_to_replace, char const* name, Entry const& value) {
     insert(okay_to_replace, std::string(name), value);
   }
 
-  void
-  ParameterSet::insert(bool okay_to_replace, std::string const& name, Entry const& value) {
+  void ParameterSet::insert(bool okay_to_replace, std::string const& name, Entry const& value) {
     // We should probably get rid of 'okay_to_replace', which will
     // simplify the logic in this function.
-    table::iterator  it = tbl_.find(name);
+    table::iterator it = tbl_.find(name);
 
-    if(it == tbl_.end())  {
-      if(!tbl_.insert(std::make_pair(name, value)).second)
-        throw Exception(errors::Configuration, "InsertFailure")
-          << "cannot insert " << name
-          << " into a ParameterSet\n";
-    }
-    else if(okay_to_replace)  {
+    if (it == tbl_.end()) {
+      if (!tbl_.insert(std::make_pair(name, value)).second)
+        throw Exception(errors::Configuration, "InsertFailure") << "cannot insert " << name << " into a ParameterSet\n";
+    } else if (okay_to_replace) {
       it->second = value;
     }
   }  // insert()
@@ -451,82 +392,76 @@ namespace edm {
     // simplify the logic in this function.
     psettable::iterator it = psetTable_.find(name);
 
-    if(it == psetTable_.end()) {
-      if(!psetTable_.insert(std::make_pair(name, entry)).second)
-        throw Exception(errors::Configuration, "InsertFailure")
-          << "cannot insert " << name
-          << " into a ParameterSet\n";
-    } else if(okay_to_replace) {
+    if (it == psetTable_.end()) {
+      if (!psetTable_.insert(std::make_pair(name, entry)).second)
+        throw Exception(errors::Configuration, "InsertFailure") << "cannot insert " << name << " into a ParameterSet\n";
+    } else if (okay_to_replace) {
       it->second = entry;
     }
   }  // insert()
 
-  void ParameterSet::insertVParameterSet(bool okay_to_replace, std::string const& name, VParameterSetEntry const& entry) {
+  void ParameterSet::insertVParameterSet(bool okay_to_replace,
+                                         std::string const& name,
+                                         VParameterSetEntry const& entry) {
     // We should probably get rid of 'okay_to_replace', which will
     // simplify the logic in this function.
     vpsettable::iterator it = vpsetTable_.find(name);
 
-    if(it == vpsetTable_.end()) {
-      if(!vpsetTable_.insert(std::make_pair(name, entry)).second)
+    if (it == vpsetTable_.end()) {
+      if (!vpsetTable_.insert(std::make_pair(name, entry)).second)
         throw Exception(errors::Configuration, "InsertFailure")
-          << "cannot insert " << name
-          << " into a VParameterSet\n";
-    } else if(okay_to_replace) {
+            << "cannot insert " << name << " into a VParameterSet\n";
+    } else if (okay_to_replace) {
       it->second = entry;
     }
   }  // insert()
 
-  void
-  ParameterSet::augment(ParameterSet const& from) {
+  void ParameterSet::augment(ParameterSet const& from) {
     // This preemptive invalidation may be more agressive than necessary.
     invalidateRegistration(std::string());
-    if(&from == this) {
+    if (&from == this) {
       return;
     }
 
-    for(table::const_iterator b = from.tbl_.begin(), e = from.tbl_.end(); b != e; ++b) {
+    for (table::const_iterator b = from.tbl_.begin(), e = from.tbl_.end(); b != e; ++b) {
       this->insert(false, b->first, b->second);
     }
-    for(psettable::const_iterator b = from.psetTable_.begin(), e = from.psetTable_.end(); b != e; ++b) {
+    for (psettable::const_iterator b = from.psetTable_.begin(), e = from.psetTable_.end(); b != e; ++b) {
       this->insertParameterSet(false, b->first, b->second);
     }
-    for(vpsettable::const_iterator b = from.vpsetTable_.begin(), e = from.vpsetTable_.end(); b != e; ++b) {
+    for (vpsettable::const_iterator b = from.vpsetTable_.begin(), e = from.vpsetTable_.end(); b != e; ++b) {
       this->insertVParameterSet(false, b->first, b->second);
     }
   }  // augment()
 
   void ParameterSet::copyFrom(ParameterSet const& from, std::string const& name) {
     invalidateRegistration(std::string());
-    if(from.existsAs<ParameterSet>(name)) {
+    if (from.existsAs<ParameterSet>(name)) {
       this->insertParameterSet(false, name, *(from.retrieveUnknownParameterSet(name)));
-    }
-    else if(from.existsAs<std::vector<ParameterSet> >(name)) {
+    } else if (from.existsAs<std::vector<ParameterSet> >(name)) {
       this->insertVParameterSet(false, name, *(from.retrieveUnknownVParameterSet(name)));
-    }
-    else if(from.exists(name)) {
+    } else if (from.exists(name)) {
       this->insert(false, name, *(from.retrieveUnknown(name)));
-    }
-    else {
-      throw Exception(errors::Configuration, "copyFrom")
-       << "Cannot find parameter " << name  << " in " << from;
+    } else {
+      throw Exception(errors::Configuration, "copyFrom") << "Cannot find parameter " << name << " in " << from;
     }
   }
 
-  ParameterSet*
-  ParameterSet::getPSetForUpdate(std::string const& name, bool& isTracked) {
+  ParameterSet* ParameterSet::getPSetForUpdate(std::string const& name, bool& isTracked) {
     assert(!isRegistered());
     isTracked = false;
     psettable::iterator it = psetTable_.find(name);
-    if(it == psetTable_.end()) return nullptr;
+    if (it == psetTable_.end())
+      return nullptr;
     isTracked = it->second.isTracked();
     return &it->second.psetForUpdate();
   }
 
-  VParameterSetEntry*
-  ParameterSet::getPSetVectorForUpdate(std::string const& name) {
+  VParameterSetEntry* ParameterSet::getPSetVectorForUpdate(std::string const& name) {
     assert(!isRegistered());
     vpsettable::iterator it = vpsetTable_.find(name);
-    if(it == vpsetTable_.end()) return nullptr;
+    if (it == vpsetTable_.end())
+      return nullptr;
     return &it->second;
   }
 
@@ -534,33 +469,26 @@ namespace edm {
   // coding
   // ----------------------------------------------------------------------
 
-  void
-  ParameterSet::toString(std::string& rep) const {
-    toStringImp(rep, false);
-  }
+  void ParameterSet::toString(std::string& rep) const { toStringImp(rep, false); }
 
-  void
-  ParameterSet::allToString(std::string& rep) const {
-    toStringImp(rep, true);
-  }
+  void ParameterSet::allToString(std::string& rep) const { toStringImp(rep, true); }
 
-  void
-  ParameterSet::toStringImp(std::string& rep, bool useAll) const {
+  void ParameterSet::toStringImp(std::string& rep, bool useAll) const {
     // make sure the PSets get filled
-    if(empty()) {
+    if (empty()) {
       rep += "<>";
       return;
     }
     size_t size = 1;
-    for(table::const_iterator b = tbl_.begin(), e = tbl_.end(); b != e; ++b) {
-      if(useAll || b->second.isTracked()) {
+    for (table::const_iterator b = tbl_.begin(), e = tbl_.end(); b != e; ++b) {
+      if (useAll || b->second.isTracked()) {
         size += 2;
         size += b->first.size();
         size += b->second.sizeOfString();
       }
     }
-    for(psettable::const_iterator b = psetTable_.begin(), e = psetTable_.end(); b != e; ++b) {
-      if(useAll || b->second.isTracked()) {
+    for (psettable::const_iterator b = psetTable_.begin(), e = psetTable_.end(); b != e; ++b) {
+      if (useAll || b->second.isTracked()) {
         size += 2;
         size += b->first.size();
         size += b->first.size();
@@ -568,20 +496,20 @@ namespace edm {
         size += sizeof(ParameterSetID);
       }
     }
-    for(vpsettable::const_iterator b = vpsetTable_.begin(), e = vpsetTable_.end(); b != e; ++b) {
-      if(useAll || b->second.isTracked()) {
+    for (vpsettable::const_iterator b = vpsetTable_.begin(), e = vpsetTable_.end(); b != e; ++b) {
+      if (useAll || b->second.isTracked()) {
         size += 2;
         size += b->first.size();
         size += sizeof(ParameterSetID) * b->second.vpset().size();
       }
     }
 
-    rep.reserve(rep.size()+size);
+    rep.reserve(rep.size() + size);
     rep += '<';
     std::string start;
     std::string const between(";");
-    for(table::const_iterator b = tbl_.begin(), e = tbl_.end(); b != e; ++b) {
-      if(useAll || b->second.isTracked()) {
+    for (table::const_iterator b = tbl_.begin(), e = tbl_.end(); b != e; ++b) {
+      if (useAll || b->second.isTracked()) {
         rep += start;
         rep += b->first;
         rep += '=';
@@ -589,8 +517,8 @@ namespace edm {
         start = between;
       }
     }
-    for(psettable::const_iterator b = psetTable_.begin(), e = psetTable_.end(); b != e; ++b) {
-      if(useAll || b->second.isTracked()) {
+    for (psettable::const_iterator b = psetTable_.begin(), e = psetTable_.end(); b != e; ++b) {
+      if (useAll || b->second.isTracked()) {
         rep += start;
         rep += b->first;
         rep += '=';
@@ -598,8 +526,8 @@ namespace edm {
         start = between;
       }
     }
-    for(vpsettable::const_iterator b = vpsetTable_.begin(), e = vpsetTable_.end(); b != e; ++b) {
-      if(useAll || b->second.isTracked()) {
+    for (vpsettable::const_iterator b = vpsetTable_.begin(), e = vpsetTable_.end(); b != e; ++b) {
+      if (useAll || b->second.isTracked()) {
         rep += start;
         rep += b->first;
         rep += '=';
@@ -611,12 +539,11 @@ namespace edm {
     rep += '>';
   }  // to_string()
 
-  void
-  ParameterSet::toDigest(cms::Digest &digest) const {
+  void ParameterSet::toDigest(cms::Digest& digest) const {
     digest.append("<", 1);
     bool started = false;
-    for(table::const_iterator b = tbl_.begin(), e = tbl_.end(); b != e; ++b) {
-      if(b->second.isTracked()) {
+    for (table::const_iterator b = tbl_.begin(), e = tbl_.end(); b != e; ++b) {
+      if (b->second.isTracked()) {
         if (started)
           digest.append(";", 1);
         digest.append(b->first);
@@ -625,8 +552,8 @@ namespace edm {
         started = true;
       }
     }
-    for(psettable::const_iterator b = psetTable_.begin(), e = psetTable_.end(); b != e; ++b) {
-      if(b->second.isTracked()) {
+    for (psettable::const_iterator b = psetTable_.begin(), e = psetTable_.end(); b != e; ++b) {
+      if (b->second.isTracked()) {
         if (started)
           digest.append(";", 1);
         digest.append(b->first);
@@ -635,8 +562,8 @@ namespace edm {
         started = true;
       }
     }
-    for(vpsettable::const_iterator b = vpsetTable_.begin(), e = vpsetTable_.end(); b != e; ++b) {
-      if(b->second.isTracked()) {
+    for (vpsettable::const_iterator b = vpsetTable_.begin(), e = vpsetTable_.end(); b != e; ++b) {
+      if (b->second.isTracked()) {
         if (started)
           digest.append(";", 1);
         digest.append(b->first);
@@ -645,11 +572,10 @@ namespace edm {
       }
     }
 
-    digest.append(">",1);
+    digest.append(">", 1);
   }
 
-  std::string
-  ParameterSet::toString() const {
+  std::string ParameterSet::toString() const {
     std::string result;
     toString(result);
     return result;
@@ -657,54 +583,53 @@ namespace edm {
 
   // ----------------------------------------------------------------------
 
-  bool
-  ParameterSet::fromString(std::string const& from) {
+  bool ParameterSet::fromString(std::string const& from) {
     std::vector<std::string> temp;
-    if(!split(std::back_inserter(temp), from, '<', ';', '>'))
+    if (!split(std::back_inserter(temp), from, '<', ';', '>'))
       return false;
 
     tbl_.clear();  // precaution
-    for(std::vector<std::string>::const_iterator b = temp.begin(), e = temp.end(); b != e; ++b) {
+    for (std::vector<std::string>::const_iterator b = temp.begin(), e = temp.end(); b != e; ++b) {
       // locate required name/value separator
       std::string::const_iterator q = find_in_all(*b, '=');
-      if(q == b->end())
+      if (q == b->end())
         return false;
 
       // form name unique to this ParameterSet
-      std::string  name = std::string(b->begin(), q);
-      if(tbl_.find(name) != tbl_.end())
+      std::string name = std::string(b->begin(), q);
+      if (tbl_.find(name) != tbl_.end())
         return false;
 
-      std::string rep(q+1, b->end());
+      std::string rep(q + 1, b->end());
       // entries are generically of the form tracked-type-rep
-      if(rep[0] == '-') {
+      if (rep[0] == '-') {
       }
-      if(rep[1] == 'Q') {
+      if (rep[1] == 'Q') {
         ParameterSetEntry psetEntry(rep);
-        if(!psetTable_.insert(std::make_pair(name, psetEntry)).second) {
+        if (!psetTable_.insert(std::make_pair(name, psetEntry)).second) {
           return false;
         }
-      } else if(rep[1] == 'q') {
+      } else if (rep[1] == 'q') {
         VParameterSetEntry vpsetEntry(rep);
-        if(!vpsetTable_.insert(std::make_pair(name, vpsetEntry)).second) {
+        if (!vpsetTable_.insert(std::make_pair(name, vpsetEntry)).second) {
           return false;
         }
-      } else if(rep[1] == 'P') {
+      } else if (rep[1] == 'P') {
         Entry value(name, rep);
         ParameterSetEntry psetEntry(value.getPSet(), value.isTracked());
-        if(!psetTable_.insert(std::make_pair(name, psetEntry)).second) {
+        if (!psetTable_.insert(std::make_pair(name, psetEntry)).second) {
           return false;
         }
-      } else if(rep[1] == 'p') {
+      } else if (rep[1] == 'p') {
         Entry value(name, rep);
         VParameterSetEntry vpsetEntry(value.getVPSet(), value.isTracked());
-        if(!vpsetTable_.insert(std::make_pair(name, vpsetEntry)).second) {
+        if (!vpsetTable_.insert(std::make_pair(name, vpsetEntry)).second) {
           return false;
         }
       } else {
         // form value and insert name/value pair
-        Entry  value(name, rep);
-        if(!tbl_.insert(std::make_pair(name, value)).second) {
+        Entry value(name, rep);
+        if (!tbl_.insert(std::make_pair(name, value)).second) {
           return false;
         }
       }
@@ -713,56 +638,58 @@ namespace edm {
     return true;
   }  // from_string()
 
-  std::vector<FileInPath>::size_type
-  ParameterSet::getAllFileInPaths(std::vector<FileInPath>& output) const {
+  std::vector<FileInPath>::size_type ParameterSet::getAllFileInPaths(std::vector<FileInPath>& output) const {
     std::vector<FileInPath>::size_type count = 0;
     table::const_iterator it = tbl_.begin();
     table::const_iterator end = tbl_.end();
     while (it != end) {
-        Entry const& e = it->second;
-        if(e.typeCode() == 'F') {
-            ++count;
-            output.push_back(e.getFileInPath());
-        }
-        ++it;
+      Entry const& e = it->second;
+      if (e.typeCode() == 'F') {
+        ++count;
+        output.push_back(e.getFileInPath());
+      }
+      ++it;
     }
     return count;
   }
 
-  std::vector<std::string>
-  ParameterSet::getParameterNames() const {
+  std::vector<std::string> ParameterSet::getParameterNames() const {
     using std::placeholders::_1;
     std::vector<std::string> returnValue;
-    std::transform(tbl_.begin(), tbl_.end(), back_inserter(returnValue),
+    std::transform(tbl_.begin(),
+                   tbl_.end(),
+                   back_inserter(returnValue),
                    std::bind(&std::pair<std::string const, Entry>::first, _1));
-    std::transform(psetTable_.begin(), psetTable_.end(), back_inserter(returnValue),
+    std::transform(psetTable_.begin(),
+                   psetTable_.end(),
+                   back_inserter(returnValue),
                    std::bind(&std::pair<std::string const, ParameterSetEntry>::first, _1));
-    std::transform(vpsetTable_.begin(), vpsetTable_.end(), back_inserter(returnValue),
+    std::transform(vpsetTable_.begin(),
+                   vpsetTable_.end(),
+                   back_inserter(returnValue),
                    std::bind(&std::pair<std::string const, VParameterSetEntry>::first, _1));
     return returnValue;
   }
 
   bool ParameterSet::exists(std::string const& parameterName) const {
-    return(tbl_.find(parameterName) != tbl_.end() ||
-     psetTable_.find(parameterName) != psetTable_.end() ||
-    vpsetTable_.find(parameterName) != vpsetTable_.end());
+    return (tbl_.find(parameterName) != tbl_.end() || psetTable_.find(parameterName) != psetTable_.end() ||
+            vpsetTable_.find(parameterName) != vpsetTable_.end());
   }
 
-  ParameterSet
-  ParameterSet::trackedPart() const {
+  ParameterSet ParameterSet::trackedPart() const {
     ParameterSet result;
-    for(table::const_iterator tblItr = tbl_.begin(); tblItr != tbl_.end(); ++tblItr) {
-      if(tblItr->second.isTracked()) {
+    for (table::const_iterator tblItr = tbl_.begin(); tblItr != tbl_.end(); ++tblItr) {
+      if (tblItr->second.isTracked()) {
         result.tbl_.insert(*tblItr);
       }
     }
-    for(psettable::const_iterator psetItr = psetTable_.begin(); psetItr != psetTable_.end(); ++psetItr) {
-      if(psetItr->second.isTracked()) {
+    for (psettable::const_iterator psetItr = psetTable_.begin(); psetItr != psetTable_.end(); ++psetItr) {
+      if (psetItr->second.isTracked()) {
         result.addParameter<ParameterSet>(psetItr->first, psetItr->second.pset().trackedPart());
       }
     }
-    for(vpsettable::const_iterator vpsetItr = vpsetTable_.begin(); vpsetItr != vpsetTable_.end(); ++vpsetItr) {
-      if(vpsetItr->second.isTracked()) {
+    for (vpsettable::const_iterator vpsetItr = vpsetTable_.begin(); vpsetItr != vpsetTable_.end(); ++vpsetItr) {
+      if (vpsetItr->second.isTracked()) {
         VParameterSet vresult;
         std::vector<ParameterSet> const& this_vpset = vpsetItr->second.vpset();
 
@@ -776,7 +703,7 @@ namespace edm {
     return result;
   }
 
-/*
+  /*
   // Comment out unneeded function
   size_t
   ParameterSet::getAllParameterSetNames(std::vector<std::string>& output) const {
@@ -787,56 +714,46 @@ namespace edm {
   }
 */
 
-  size_t
-  ParameterSet::getParameterSetNames(std::vector<std::string>& output,
-                                     bool trackiness) const {
-    for(psettable::const_iterator psetItr = psetTable_.begin();
-        psetItr != psetTable_.end(); ++psetItr) {
-      if(psetItr->second.isTracked() == trackiness) {
+  size_t ParameterSet::getParameterSetNames(std::vector<std::string>& output, bool trackiness) const {
+    for (psettable::const_iterator psetItr = psetTable_.begin(); psetItr != psetTable_.end(); ++psetItr) {
+      if (psetItr->second.isTracked() == trackiness) {
         output.push_back(psetItr->first);
       }
     }
     return output.size();
   }
 
-  size_t
-  ParameterSet::getParameterSetVectorNames(std::vector<std::string>& output,
-                                           bool trackiness) const {
-    for(vpsettable::const_iterator vpsetItr = vpsetTable_.begin();
-         vpsetItr != vpsetTable_.end(); ++vpsetItr) {
-      if(vpsetItr->second.isTracked() == trackiness) {
+  size_t ParameterSet::getParameterSetVectorNames(std::vector<std::string>& output, bool trackiness) const {
+    for (vpsettable::const_iterator vpsetItr = vpsetTable_.begin(); vpsetItr != vpsetTable_.end(); ++vpsetItr) {
+      if (vpsetItr->second.isTracked() == trackiness) {
         output.push_back(vpsetItr->first);
       }
     }
     return output.size();
   }
 
-  size_t
-  ParameterSet::getNamesByCode_(char code,
-                                bool trackiness,
-                                std::vector<std::string>& output) const {
+  size_t ParameterSet::getNamesByCode_(char code, bool trackiness, std::vector<std::string>& output) const {
     size_t count = 0;
-    if(code == 'Q') {
+    if (code == 'Q') {
       return getParameterSetNames(output, trackiness);
     }
-    if(code == 'q') {
+    if (code == 'q') {
       return getParameterSetVectorNames(output, trackiness);
     }
     table::const_iterator it = tbl_.begin();
     table::const_iterator end = tbl_.end();
     while (it != end) {
       Entry const& e = it->second;
-      if(e.typeCode() == code &&
-          e.isTracked() == trackiness) { // if it is a vector of ParameterSet
-          ++count;
-          output.push_back(it->first); // save the name
+      if (e.typeCode() == code && e.isTracked() == trackiness) {  // if it is a vector of ParameterSet
+        ++count;
+        output.push_back(it->first);  // save the name
       }
       ++it;
     }
     return count;
   }
 
-  template<>
+  template <>
   std::vector<std::string> ParameterSet::getParameterNamesForType<FileInPath>(bool trackiness) const {
     std::vector<std::string> result;
     getNamesByCode_('F', trackiness, result);
@@ -844,61 +761,60 @@ namespace edm {
   }
 
   bool operator==(ParameterSet const& a, ParameterSet const& b) {
-    if(a.isRegistered() && b.isRegistered()) {
+    if (a.isRegistered() && b.isRegistered()) {
       return (a.id() == b.id());
     }
     return isTransientEqual(a.trackedPart(), b.trackedPart());
   }
 
   bool isTransientEqual(ParameterSet const& a, ParameterSet const& b) {
-    if(a.tbl().size() != b.tbl().size()) {
-        return false;
+    if (a.tbl().size() != b.tbl().size()) {
+      return false;
     }
-    if(a.psetTable().size() != b.psetTable().size()) {
-        return false;
+    if (a.psetTable().size() != b.psetTable().size()) {
+      return false;
     }
-    if(a.vpsetTable().size() != b.vpsetTable().size()) {
-        return false;
+    if (a.vpsetTable().size() != b.vpsetTable().size()) {
+      return false;
     }
     typedef ParameterSet::table::const_iterator Ti;
-    for (Ti i = a.tbl().begin(), e = a.tbl().end(),
-            j = b.tbl().begin(), f = b.tbl().end();
-            i != e && j != f; ++i, ++j) {
-      if(*i != *j) {
+    for (Ti i = a.tbl().begin(), e = a.tbl().end(), j = b.tbl().begin(), f = b.tbl().end(); i != e && j != f;
+         ++i, ++j) {
+      if (*i != *j) {
         return false;
       }
     }
     typedef ParameterSet::psettable::const_iterator Pi;
-    for (Pi i = a.psetTable().begin(), e = a.psetTable().end(),
-            j = b.psetTable().begin(), f = b.psetTable().end();
-            i != e && j != f; ++i, ++j) {
-      if(i->first != j->first) {
+    for (Pi i = a.psetTable().begin(), e = a.psetTable().end(), j = b.psetTable().begin(), f = b.psetTable().end();
+         i != e && j != f;
+         ++i, ++j) {
+      if (i->first != j->first) {
         return false;
       }
-      if(i->second.isTracked() != j->second.isTracked()) {
+      if (i->second.isTracked() != j->second.isTracked()) {
         return false;
       }
-      if(!isTransientEqual(i->second.pset(), j->second.pset())) {
+      if (!isTransientEqual(i->second.pset(), j->second.pset())) {
         return false;
       }
     }
     typedef ParameterSet::vpsettable::const_iterator PVi;
-    for (PVi i = a.vpsetTable().begin(), e = a.vpsetTable().end(),
-             j = b.vpsetTable().begin(), f = b.vpsetTable().end();
-             i != e && j != f; ++i, ++j) {
-      if(i->first != j->first) {
+    for (PVi i = a.vpsetTable().begin(), e = a.vpsetTable().end(), j = b.vpsetTable().begin(), f = b.vpsetTable().end();
+         i != e && j != f;
+         ++i, ++j) {
+      if (i->first != j->first) {
         return false;
       }
-      if(i->second.isTracked() != j->second.isTracked()) {
+      if (i->second.isTracked() != j->second.isTracked()) {
         return false;
       }
       std::vector<ParameterSet> const& iv = i->second.vpset();
       std::vector<ParameterSet> const& jv = j->second.vpset();
-      if(iv.size() != jv.size()) {
+      if (iv.size() != jv.size()) {
         return false;
       }
       for (size_t k = 0; k < iv.size(); ++k) {
-        if(!isTransientEqual(iv[k], jv[k])) {
+        if (!isTransientEqual(iv[k], jv[k])) {
           return false;
         }
       }
@@ -911,20 +827,20 @@ namespace edm {
     // indent a bit
     std::string indentation(indent, ' ');
     os << "{" << std::endl;
-    for(table::const_iterator i = tbl_.begin(), e = tbl_.end(); i != e; ++i) {
+    for (table::const_iterator i = tbl_.begin(), e = tbl_.end(); i != e; ++i) {
       os << indentation << "  " << i->first << ": " << i->second << std::endl;
     }
-    for(psettable::const_iterator i = psetTable_.begin(), e = psetTable_.end(); i != e; ++i) {
+    for (psettable::const_iterator i = psetTable_.begin(), e = psetTable_.end(); i != e; ++i) {
       // indent a bit
       std::string n = i->first;
       ParameterSetEntry const& pe = i->second;
-      os << indentation << "  " << n << ": " << pe.dump(indent + 2) <<  std::endl;
+      os << indentation << "  " << n << ": " << pe.dump(indent + 2) << std::endl;
     }
-    for(vpsettable::const_iterator i = vpsetTable_.begin(), e = vpsetTable_.end(); i != e; ++i) {
+    for (vpsettable::const_iterator i = vpsetTable_.begin(), e = vpsetTable_.end(); i != e; ++i) {
       // indent a bit
       std::string n = i->first;
       VParameterSetEntry const& pe = i->second;
-      os << indentation << "  " << n << ": " << pe.dump(indent + 2) <<  std::endl;
+      os << indentation << "  " << n << ": " << pe.dump(indent + 2) << std::endl;
     }
     os << indentation << "}";
     return os.str();
@@ -936,270 +852,237 @@ namespace edm {
   }
 
   // Free function to return a parameterSet given its ID.
-  ParameterSet const&
-  getParameterSet(ParameterSetID const& id) {
+  ParameterSet const& getParameterSet(ParameterSetID const& id) {
     ParameterSet const* result = nullptr;
-    if(nullptr == (result = pset::Registry::instance()->getMapped(id))) {
-      throw Exception(errors::LogicError, "MissingParameterSet:")
-        << "Parameter Set ID '" << id << "' not found.";
+    if (nullptr == (result = pset::Registry::instance()->getMapped(id))) {
+      throw Exception(errors::LogicError, "MissingParameterSet:") << "Parameter Set ID '" << id << "' not found.";
     }
     return *result;
   }
 
-  ParameterSet const&
-  getProcessParameterSetContainingModule(ModuleDescription const& moduleDescription) {
+  ParameterSet const& getProcessParameterSetContainingModule(ModuleDescription const& moduleDescription) {
     return getParameterSet(moduleDescription.mainParameterSetID());
   }
 
-  void ParameterSet::deprecatedInputTagWarning(std::string const& name,
-                                               std::string const& label) const {
-    LogWarning("Configuration") << "Warning:\n\tstring " << name
-                                << " = \"" << label
-                                << "\"\nis deprecated, "
-                                << "please update your config file to use\n\tInputTag "
-                                << name << " = " << label;
+  void ParameterSet::deprecatedInputTagWarning(std::string const& name, std::string const& label) const {
+    LogWarning("Configuration") << "Warning:\n\tstring " << name << " = \"" << label << "\"\nis deprecated, "
+                                << "please update your config file to use\n\tInputTag " << name << " = " << label;
   }
 
   // specializations
   // ----------------------------------------------------------------------
   // Bool, vBool
 
-  template<>
-  bool
-  ParameterSet::getParameter<bool>(std::string const& name) const {
+  template <>
+  bool ParameterSet::getParameter<bool>(std::string const& name) const {
     return retrieve(name).getBool();
   }
 
   // ----------------------------------------------------------------------
   // Int32, vInt32
 
-  template<>
-  int
-  ParameterSet::getParameter<int>(std::string const& name) const {
+  template <>
+  int ParameterSet::getParameter<int>(std::string const& name) const {
     return retrieve(name).getInt32();
   }
 
-  template<>
-  std::vector<int>
-  ParameterSet::getParameter<std::vector<int> >(std::string const& name) const {
+  template <>
+  std::vector<int> ParameterSet::getParameter<std::vector<int> >(std::string const& name) const {
     return retrieve(name).getVInt32();
   }
 
- // ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
   // Int64, vInt64
 
-  template<>
-  long long
-  ParameterSet::getParameter<long long>(std::string const& name) const {
+  template <>
+  long long ParameterSet::getParameter<long long>(std::string const& name) const {
     return retrieve(name).getInt64();
   }
 
-  template<>
-  std::vector<long long>
-  ParameterSet::getParameter<std::vector<long long> >(std::string const& name) const {
+  template <>
+  std::vector<long long> ParameterSet::getParameter<std::vector<long long> >(std::string const& name) const {
     return retrieve(name).getVInt64();
   }
 
   // ----------------------------------------------------------------------
   // Uint32, vUint32
 
-  template<>
-  unsigned int
-  ParameterSet::getParameter<unsigned int>(std::string const& name) const {
+  template <>
+  unsigned int ParameterSet::getParameter<unsigned int>(std::string const& name) const {
     return retrieve(name).getUInt32();
   }
 
-  template<>
-  std::vector<unsigned int>
-  ParameterSet::getParameter<std::vector<unsigned int> >(std::string const& name) const {
+  template <>
+  std::vector<unsigned int> ParameterSet::getParameter<std::vector<unsigned int> >(std::string const& name) const {
     return retrieve(name).getVUInt32();
   }
 
   // ----------------------------------------------------------------------
   // Uint64, vUint64
 
-  template<>
-  unsigned long long
-  ParameterSet::getParameter<unsigned long long>(std::string const& name) const {
+  template <>
+  unsigned long long ParameterSet::getParameter<unsigned long long>(std::string const& name) const {
     return retrieve(name).getUInt64();
   }
 
-  template<>
-  std::vector<unsigned long long>
-  ParameterSet::getParameter<std::vector<unsigned long long> >(std::string const& name) const {
+  template <>
+  std::vector<unsigned long long> ParameterSet::getParameter<std::vector<unsigned long long> >(
+      std::string const& name) const {
     return retrieve(name).getVUInt64();
   }
 
   // ----------------------------------------------------------------------
   // Double, vDouble
 
-  template<>
-  double
-  ParameterSet::getParameter<double>(std::string const& name) const {
+  template <>
+  double ParameterSet::getParameter<double>(std::string const& name) const {
     return retrieve(name).getDouble();
   }
 
-  template<>
-  std::vector<double>
-  ParameterSet::getParameter<std::vector<double> >(std::string const& name) const {
+  template <>
+  std::vector<double> ParameterSet::getParameter<std::vector<double> >(std::string const& name) const {
     return retrieve(name).getVDouble();
   }
 
   // ----------------------------------------------------------------------
   // String, vString
 
-  template<>
-  std::string
-  ParameterSet::getParameter<std::string>(std::string const& name) const {
+  template <>
+  std::string ParameterSet::getParameter<std::string>(std::string const& name) const {
     return retrieve(name).getString();
   }
 
-  template<>
-  std::vector<std::string>
-  ParameterSet::getParameter<std::vector<std::string> >(std::string const& name) const {
+  template <>
+  std::vector<std::string> ParameterSet::getParameter<std::vector<std::string> >(std::string const& name) const {
     return retrieve(name).getVString();
   }
 
   // ----------------------------------------------------------------------
   // FileInPath
 
-  template<>
-  FileInPath
-  ParameterSet::getParameter<FileInPath>(std::string const& name) const {
+  template <>
+  FileInPath ParameterSet::getParameter<FileInPath>(std::string const& name) const {
     return retrieve(name).getFileInPath();
   }
 
   // ----------------------------------------------------------------------
   // InputTag
 
-  template<>
-  InputTag
-  ParameterSet::getParameter<InputTag>(std::string const& name) const {
+  template <>
+  InputTag ParameterSet::getParameter<InputTag>(std::string const& name) const {
     Entry const& e_input = retrieve(name);
     switch (e_input.typeCode()) {
-      case 't':   // InputTag
+      case 't':  // InputTag
         return e_input.getInputTag();
-      case 'S':   // string
+      case 'S':  // string
         std::string const& label = e_input.getString();
         deprecatedInputTagWarning(name, label);
         return InputTag(label);
     }
-    throw Exception(errors::Configuration, "ValueError") << "type of "
-       << name << " is expected to be InputTag or string (deprecated)";
-
+    throw Exception(errors::Configuration, "ValueError")
+        << "type of " << name << " is expected to be InputTag or string (deprecated)";
   }
 
   // ----------------------------------------------------------------------
   // VInputTag
 
-  template<>
-  std::vector<InputTag>
-  ParameterSet::getParameter<std::vector<InputTag> >(std::string const& name) const {
+  template <>
+  std::vector<InputTag> ParameterSet::getParameter<std::vector<InputTag> >(std::string const& name) const {
     return retrieve(name).getVInputTag();
   }
 
-   // ----------------------------------------------------------------------
-   // ESInputTag
+  // ----------------------------------------------------------------------
+  // ESInputTag
 
-   template<>
-   ESInputTag
-   ParameterSet::getParameter<ESInputTag>(std::string const& name) const {
-      return retrieve(name).getESInputTag();
-   }
+  template <>
+  ESInputTag ParameterSet::getParameter<ESInputTag>(std::string const& name) const {
+    return retrieve(name).getESInputTag();
+  }
 
-   // ----------------------------------------------------------------------
-   // VESInputTag
+  // ----------------------------------------------------------------------
+  // VESInputTag
 
-   template<>
-   std::vector<ESInputTag>
-   ParameterSet::getParameter<std::vector<ESInputTag> >(std::string const& name) const {
-      return retrieve(name).getVESInputTag();
-   }
+  template <>
+  std::vector<ESInputTag> ParameterSet::getParameter<std::vector<ESInputTag> >(std::string const& name) const {
+    return retrieve(name).getVESInputTag();
+  }
 
   // ----------------------------------------------------------------------
   // EventID
 
-  template<>
-  EventID
-  ParameterSet::getParameter<EventID>(std::string const& name) const {
+  template <>
+  EventID ParameterSet::getParameter<EventID>(std::string const& name) const {
     return retrieve(name).getEventID();
   }
 
   // ----------------------------------------------------------------------
   // VEventID
 
-  template<>
-  std::vector<EventID>
-  ParameterSet::getParameter<std::vector<EventID> >(std::string const& name) const {
+  template <>
+  std::vector<EventID> ParameterSet::getParameter<std::vector<EventID> >(std::string const& name) const {
     return retrieve(name).getVEventID();
   }
 
   // ----------------------------------------------------------------------
   // LuminosityBlockID
 
-  template<>
-  LuminosityBlockID
-  ParameterSet::getParameter<LuminosityBlockID>(std::string const& name) const {
+  template <>
+  LuminosityBlockID ParameterSet::getParameter<LuminosityBlockID>(std::string const& name) const {
     return retrieve(name).getLuminosityBlockID();
   }
 
   // ----------------------------------------------------------------------
   // VLuminosityBlockID
 
-  template<>
-  std::vector<LuminosityBlockID>
-  ParameterSet::getParameter<std::vector<LuminosityBlockID> >(std::string const& name) const {
+  template <>
+  std::vector<LuminosityBlockID> ParameterSet::getParameter<std::vector<LuminosityBlockID> >(
+      std::string const& name) const {
     return retrieve(name).getVLuminosityBlockID();
   }
 
   // ----------------------------------------------------------------------
   // EventRange
 
-  template<>
-  EventRange
-  ParameterSet::getParameter<EventRange>(std::string const& name) const {
+  template <>
+  EventRange ParameterSet::getParameter<EventRange>(std::string const& name) const {
     return retrieve(name).getEventRange();
   }
 
   // ----------------------------------------------------------------------
   // VEventRange
 
-  template<>
-  std::vector<EventRange>
-  ParameterSet::getParameter<std::vector<EventRange> >(std::string const& name) const {
+  template <>
+  std::vector<EventRange> ParameterSet::getParameter<std::vector<EventRange> >(std::string const& name) const {
     return retrieve(name).getVEventRange();
   }
 
   // ----------------------------------------------------------------------
   // LuminosityBlockRange
 
-  template<>
-  LuminosityBlockRange
-  ParameterSet::getParameter<LuminosityBlockRange>(std::string const& name) const {
+  template <>
+  LuminosityBlockRange ParameterSet::getParameter<LuminosityBlockRange>(std::string const& name) const {
     return retrieve(name).getLuminosityBlockRange();
   }
 
   // ----------------------------------------------------------------------
   // VLuminosityBlockRange
 
-  template<>
-  std::vector<LuminosityBlockRange>
-  ParameterSet::getParameter<std::vector<LuminosityBlockRange> >(std::string const& name) const {
+  template <>
+  std::vector<LuminosityBlockRange> ParameterSet::getParameter<std::vector<LuminosityBlockRange> >(
+      std::string const& name) const {
     return retrieve(name).getVLuminosityBlockRange();
   }
 
   // ----------------------------------------------------------------------
   // PSet, vPSet
 
-  template<>
-  ParameterSet
-  ParameterSet::getParameter<ParameterSet>(std::string const& name) const {
+  template <>
+  ParameterSet ParameterSet::getParameter<ParameterSet>(std::string const& name) const {
     return getParameterSet(name);
   }
 
-  template<>
-  VParameterSet
-  ParameterSet::getParameter<VParameterSet>(std::string const& name) const {
+  template <>
+  VParameterSet ParameterSet::getParameter<VParameterSet>(std::string const& name) const {
     return getParameterSetVector(name);
   }
 
@@ -1208,385 +1091,354 @@ namespace edm {
   // ----------------------------------------------------------------------
   // Bool, vBool
 
-  template<>
-  bool
-  ParameterSet::getUntrackedParameter<bool>(std::string const& name, bool const& defaultValue) const {
+  template <>
+  bool ParameterSet::getUntrackedParameter<bool>(std::string const& name, bool const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getBool();
   }
 
-  template<>
-  bool
-  ParameterSet::getUntrackedParameter<bool>(std::string const& name) const {
+  template <>
+  bool ParameterSet::getUntrackedParameter<bool>(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getBool();
   }
 
   // ----------------------------------------------------------------------
   // Int32, vInt32
 
-  template<>
-  int
-  ParameterSet::getUntrackedParameter<int>(std::string const& name, int const& defaultValue) const {
+  template <>
+  int ParameterSet::getUntrackedParameter<int>(std::string const& name, int const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getInt32();
   }
 
-  template<>
-  int
-  ParameterSet::getUntrackedParameter<int>(std::string const& name) const {
+  template <>
+  int ParameterSet::getUntrackedParameter<int>(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getInt32();
   }
 
-  template<>
-  std::vector<int>
-  ParameterSet::getUntrackedParameter<std::vector<int> >(std::string const& name, std::vector<int> const& defaultValue) const {
+  template <>
+  std::vector<int> ParameterSet::getUntrackedParameter<std::vector<int> >(std::string const& name,
+                                                                          std::vector<int> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVInt32();
   }
 
-  template<>
-  std::vector<int>
-  ParameterSet::getUntrackedParameter<std::vector<int> >(std::string const& name) const {
+  template <>
+  std::vector<int> ParameterSet::getUntrackedParameter<std::vector<int> >(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getVInt32();
   }
 
   // ----------------------------------------------------------------------
   // Uint32, vUint32
 
-  template<>
-  unsigned int
-  ParameterSet::getUntrackedParameter<unsigned int>(std::string const& name, unsigned int const& defaultValue) const {
+  template <>
+  unsigned int ParameterSet::getUntrackedParameter<unsigned int>(std::string const& name,
+                                                                 unsigned int const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getUInt32();
   }
 
-  template<>
-  unsigned int
-  ParameterSet::getUntrackedParameter<unsigned int>(std::string const& name) const {
+  template <>
+  unsigned int ParameterSet::getUntrackedParameter<unsigned int>(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getUInt32();
   }
 
-  template<>
-  std::vector<unsigned int>
-  ParameterSet::getUntrackedParameter<std::vector<unsigned int> >(std::string const& name, std::vector<unsigned int> const& defaultValue) const {
+  template <>
+  std::vector<unsigned int> ParameterSet::getUntrackedParameter<std::vector<unsigned int> >(
+      std::string const& name, std::vector<unsigned int> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVUInt32();
   }
 
-  template<>
-  std::vector<unsigned int>
-  ParameterSet::getUntrackedParameter<std::vector<unsigned int> >(std::string const& name) const {
+  template <>
+  std::vector<unsigned int> ParameterSet::getUntrackedParameter<std::vector<unsigned int> >(
+      std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getVUInt32();
   }
 
   // ----------------------------------------------------------------------
   // Uint64, vUint64
 
-  template<>
-  unsigned long long
-  ParameterSet::getUntrackedParameter<unsigned long long>(std::string const& name, unsigned long long const& defaultValue) const {
+  template <>
+  unsigned long long ParameterSet::getUntrackedParameter<unsigned long long>(
+      std::string const& name, unsigned long long const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getUInt64();
   }
 
-  template<>
-  unsigned long long
-  ParameterSet::getUntrackedParameter<unsigned long long>(std::string const& name) const {
+  template <>
+  unsigned long long ParameterSet::getUntrackedParameter<unsigned long long>(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getUInt64();
   }
 
-  template<>
-  std::vector<unsigned long long>
-  ParameterSet::getUntrackedParameter<std::vector<unsigned long long> >(std::string const& name, std::vector<unsigned long long> const& defaultValue) const {
+  template <>
+  std::vector<unsigned long long> ParameterSet::getUntrackedParameter<std::vector<unsigned long long> >(
+      std::string const& name, std::vector<unsigned long long> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVUInt64();
   }
 
-  template<>
-  std::vector<unsigned long long>
-  ParameterSet::getUntrackedParameter<std::vector<unsigned long long> >(std::string const& name) const {
+  template <>
+  std::vector<unsigned long long> ParameterSet::getUntrackedParameter<std::vector<unsigned long long> >(
+      std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getVUInt64();
   }
 
   // ----------------------------------------------------------------------
   // Int64, Vint64
 
-  template<>
-  long long
-  ParameterSet::getUntrackedParameter<long long>(std::string const& name, long long const& defaultValue) const {
+  template <>
+  long long ParameterSet::getUntrackedParameter<long long>(std::string const& name,
+                                                           long long const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getInt64();
   }
 
-  template<>
-  long long
-  ParameterSet::getUntrackedParameter<long long>(std::string const& name) const {
+  template <>
+  long long ParameterSet::getUntrackedParameter<long long>(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getInt64();
   }
 
-  template<>
-  std::vector<long long>
-  ParameterSet::getUntrackedParameter<std::vector<long long> >(std::string const& name, std::vector<long long> const& defaultValue) const {
+  template <>
+  std::vector<long long> ParameterSet::getUntrackedParameter<std::vector<long long> >(
+      std::string const& name, std::vector<long long> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVInt64();
   }
 
-  template<>
-  std::vector<long long>
-  ParameterSet::getUntrackedParameter<std::vector<long long> >(std::string const& name) const {
+  template <>
+  std::vector<long long> ParameterSet::getUntrackedParameter<std::vector<long long> >(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getVInt64();
   }
 
   // ----------------------------------------------------------------------
   // Double, vDouble
 
-  template<>
-  double
-  ParameterSet::getUntrackedParameter<double>(std::string const& name, double const& defaultValue) const {
+  template <>
+  double ParameterSet::getUntrackedParameter<double>(std::string const& name, double const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getDouble();
   }
 
-  template<>
-  double
-  ParameterSet::getUntrackedParameter<double>(std::string const& name) const {
+  template <>
+  double ParameterSet::getUntrackedParameter<double>(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getDouble();
   }
 
-  template<>
-  std::vector<double>
-  ParameterSet::getUntrackedParameter<std::vector<double> >(std::string const& name, std::vector<double> const& defaultValue) const {
-    Entry const* entryPtr = retrieveUntracked(name); return entryPtr == nullptr ? defaultValue : entryPtr->getVDouble();
+  template <>
+  std::vector<double> ParameterSet::getUntrackedParameter<std::vector<double> >(
+      std::string const& name, std::vector<double> const& defaultValue) const {
+    Entry const* entryPtr = retrieveUntracked(name);
+    return entryPtr == nullptr ? defaultValue : entryPtr->getVDouble();
   }
 
-  template<>
-  std::vector<double>
-  ParameterSet::getUntrackedParameter<std::vector<double> >(std::string const& name) const {
+  template <>
+  std::vector<double> ParameterSet::getUntrackedParameter<std::vector<double> >(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getVDouble();
   }
 
   // ----------------------------------------------------------------------
   // String, vString
 
-  template<>
-  std::string
-  ParameterSet::getUntrackedParameter<std::string>(std::string const& name, std::string const& defaultValue) const {
+  template <>
+  std::string ParameterSet::getUntrackedParameter<std::string>(std::string const& name,
+                                                               std::string const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getString();
   }
 
-  template<>
-  std::string
-  ParameterSet::getUntrackedParameter<std::string>(std::string const& name) const {
+  template <>
+  std::string ParameterSet::getUntrackedParameter<std::string>(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getString();
   }
 
-  template<>
-  std::vector<std::string>
-  ParameterSet::getUntrackedParameter<std::vector<std::string> >(std::string const& name, std::vector<std::string> const& defaultValue) const {
+  template <>
+  std::vector<std::string> ParameterSet::getUntrackedParameter<std::vector<std::string> >(
+      std::string const& name, std::vector<std::string> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVString();
   }
 
-  template<>
-  std::vector<std::string>
-  ParameterSet::getUntrackedParameter<std::vector<std::string> >(std::string const& name) const {
+  template <>
+  std::vector<std::string> ParameterSet::getUntrackedParameter<std::vector<std::string> >(
+      std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getVString();
   }
 
   // ----------------------------------------------------------------------
   //  FileInPath
 
-  template<>
-  FileInPath
-  ParameterSet::getUntrackedParameter<FileInPath>(std::string const& name, FileInPath const& defaultValue) const {
+  template <>
+  FileInPath ParameterSet::getUntrackedParameter<FileInPath>(std::string const& name,
+                                                             FileInPath const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getFileInPath();
   }
 
-  template<>
-  FileInPath
-  ParameterSet::getUntrackedParameter<FileInPath>(std::string const& name) const {
+  template <>
+  FileInPath ParameterSet::getUntrackedParameter<FileInPath>(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getFileInPath();
   }
 
   // ----------------------------------------------------------------------
   // InputTag, VInputTag
 
-  template<>
-  InputTag
-  ParameterSet::getUntrackedParameter<InputTag>(std::string const& name, InputTag const& defaultValue) const {
+  template <>
+  InputTag ParameterSet::getUntrackedParameter<InputTag>(std::string const& name, InputTag const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getInputTag();
   }
 
-  template<>
-  InputTag
-  ParameterSet::getUntrackedParameter<InputTag>(std::string const& name) const {
+  template <>
+  InputTag ParameterSet::getUntrackedParameter<InputTag>(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getInputTag();
   }
 
-  template<>
-  std::vector<InputTag>
-  ParameterSet::getUntrackedParameter<std::vector<InputTag> >(std::string const& name,
-                                      std::vector<InputTag> const& defaultValue) const {
+  template <>
+  std::vector<InputTag> ParameterSet::getUntrackedParameter<std::vector<InputTag> >(
+      std::string const& name, std::vector<InputTag> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVInputTag();
   }
 
-  template<>
-  std::vector<InputTag>
-  ParameterSet::getUntrackedParameter<std::vector<InputTag> >(std::string const& name) const {
+  template <>
+  std::vector<InputTag> ParameterSet::getUntrackedParameter<std::vector<InputTag> >(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getVInputTag();
   }
 
-   // ----------------------------------------------------------------------
-   // ESInputTag, VESInputTag
+  // ----------------------------------------------------------------------
+  // ESInputTag, VESInputTag
 
-   template<>
-   ESInputTag
-   ParameterSet::getUntrackedParameter<ESInputTag>(std::string const& name, ESInputTag const& defaultValue) const {
-      Entry const* entryPtr = retrieveUntracked(name);
-      return entryPtr == nullptr ? defaultValue : entryPtr->getESInputTag();
-   }
+  template <>
+  ESInputTag ParameterSet::getUntrackedParameter<ESInputTag>(std::string const& name,
+                                                             ESInputTag const& defaultValue) const {
+    Entry const* entryPtr = retrieveUntracked(name);
+    return entryPtr == nullptr ? defaultValue : entryPtr->getESInputTag();
+  }
 
-   template<>
-   ESInputTag
-   ParameterSet::getUntrackedParameter<ESInputTag>(std::string const& name) const {
-      return getEntryPointerOrThrow_(name)->getESInputTag();
-   }
+  template <>
+  ESInputTag ParameterSet::getUntrackedParameter<ESInputTag>(std::string const& name) const {
+    return getEntryPointerOrThrow_(name)->getESInputTag();
+  }
 
-   template<>
-   std::vector<ESInputTag>
-   ParameterSet::getUntrackedParameter<std::vector<ESInputTag> >(std::string const& name,
-                                                               std::vector<ESInputTag> const& defaultValue) const {
-      Entry const* entryPtr = retrieveUntracked(name);
-      return entryPtr == nullptr ? defaultValue : entryPtr->getVESInputTag();
-   }
+  template <>
+  std::vector<ESInputTag> ParameterSet::getUntrackedParameter<std::vector<ESInputTag> >(
+      std::string const& name, std::vector<ESInputTag> const& defaultValue) const {
+    Entry const* entryPtr = retrieveUntracked(name);
+    return entryPtr == nullptr ? defaultValue : entryPtr->getVESInputTag();
+  }
 
-   template<>
-   std::vector<ESInputTag>
-   ParameterSet::getUntrackedParameter<std::vector<ESInputTag> >(std::string const& name) const {
-      return getEntryPointerOrThrow_(name)->getVESInputTag();
-   }
+  template <>
+  std::vector<ESInputTag> ParameterSet::getUntrackedParameter<std::vector<ESInputTag> >(std::string const& name) const {
+    return getEntryPointerOrThrow_(name)->getVESInputTag();
+  }
 
   // ----------------------------------------------------------------------
   // EventID, VEventID
 
-  template<>
-  EventID
-  ParameterSet::getUntrackedParameter<EventID>(std::string const& name, EventID const& defaultValue) const {
+  template <>
+  EventID ParameterSet::getUntrackedParameter<EventID>(std::string const& name, EventID const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getEventID();
   }
 
-  template<>
-  EventID
-  ParameterSet::getUntrackedParameter<EventID>(std::string const& name) const {
+  template <>
+  EventID ParameterSet::getUntrackedParameter<EventID>(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getEventID();
   }
 
-  template<>
-  std::vector<EventID>
-  ParameterSet::getUntrackedParameter<std::vector<EventID> >(std::string const& name,
-                                      std::vector<EventID> const& defaultValue) const {
+  template <>
+  std::vector<EventID> ParameterSet::getUntrackedParameter<std::vector<EventID> >(
+      std::string const& name, std::vector<EventID> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVEventID();
   }
 
-  template<>
-  std::vector<EventID>
-  ParameterSet::getUntrackedParameter<std::vector<EventID> >(std::string const& name) const {
+  template <>
+  std::vector<EventID> ParameterSet::getUntrackedParameter<std::vector<EventID> >(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getVEventID();
   }
 
   // ----------------------------------------------------------------------
   // LuminosityBlockID, VLuminosityBlockID
 
-  template<>
-  LuminosityBlockID
-  ParameterSet::getUntrackedParameter<LuminosityBlockID>(std::string const& name, LuminosityBlockID const& defaultValue) const {
+  template <>
+  LuminosityBlockID ParameterSet::getUntrackedParameter<LuminosityBlockID>(
+      std::string const& name, LuminosityBlockID const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getLuminosityBlockID();
   }
 
-  template<>
-  LuminosityBlockID
-  ParameterSet::getUntrackedParameter<LuminosityBlockID>(std::string const& name) const {
+  template <>
+  LuminosityBlockID ParameterSet::getUntrackedParameter<LuminosityBlockID>(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getLuminosityBlockID();
   }
 
-  template<>
-  std::vector<LuminosityBlockID>
-  ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockID> >(std::string const& name,
-                                      std::vector<LuminosityBlockID> const& defaultValue) const {
+  template <>
+  std::vector<LuminosityBlockID> ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockID> >(
+      std::string const& name, std::vector<LuminosityBlockID> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVLuminosityBlockID();
   }
 
-  template<>
-  std::vector<LuminosityBlockID>
-  ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockID> >(std::string const& name) const {
+  template <>
+  std::vector<LuminosityBlockID> ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockID> >(
+      std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getVLuminosityBlockID();
   }
 
   // ----------------------------------------------------------------------
   // EventRange, VEventRange
 
-  template<>
-  EventRange
-  ParameterSet::getUntrackedParameter<EventRange>(std::string const& name, EventRange const& defaultValue) const {
+  template <>
+  EventRange ParameterSet::getUntrackedParameter<EventRange>(std::string const& name,
+                                                             EventRange const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getEventRange();
   }
 
-  template<>
-  EventRange
-  ParameterSet::getUntrackedParameter<EventRange>(std::string const& name) const {
+  template <>
+  EventRange ParameterSet::getUntrackedParameter<EventRange>(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getEventRange();
   }
 
-  template<>
-  std::vector<EventRange>
-  ParameterSet::getUntrackedParameter<std::vector<EventRange> >(std::string const& name,
-                                      std::vector<EventRange> const& defaultValue) const {
+  template <>
+  std::vector<EventRange> ParameterSet::getUntrackedParameter<std::vector<EventRange> >(
+      std::string const& name, std::vector<EventRange> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVEventRange();
   }
 
-  template<>
-  std::vector<EventRange>
-  ParameterSet::getUntrackedParameter<std::vector<EventRange> >(std::string const& name) const {
+  template <>
+  std::vector<EventRange> ParameterSet::getUntrackedParameter<std::vector<EventRange> >(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getVEventRange();
   }
 
   // ----------------------------------------------------------------------
   // LuminosityBlockRange, VLuminosityBlockRange
 
-  template<>
-  LuminosityBlockRange
-  ParameterSet::getUntrackedParameter<LuminosityBlockRange>(std::string const& name, LuminosityBlockRange const& defaultValue) const {
+  template <>
+  LuminosityBlockRange ParameterSet::getUntrackedParameter<LuminosityBlockRange>(
+      std::string const& name, LuminosityBlockRange const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getLuminosityBlockRange();
   }
 
-  template<>
-  LuminosityBlockRange
-  ParameterSet::getUntrackedParameter<LuminosityBlockRange>(std::string const& name) const {
+  template <>
+  LuminosityBlockRange ParameterSet::getUntrackedParameter<LuminosityBlockRange>(std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getLuminosityBlockRange();
   }
 
-  template<>
-  std::vector<LuminosityBlockRange>
-  ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockRange> >(std::string const& name,
-                                      std::vector<LuminosityBlockRange> const& defaultValue) const {
+  template <>
+  std::vector<LuminosityBlockRange> ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockRange> >(
+      std::string const& name, std::vector<LuminosityBlockRange> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVLuminosityBlockRange();
   }
 
-  template<>
-  std::vector<LuminosityBlockRange>
-  ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockRange> >(std::string const& name) const {
+  template <>
+  std::vector<LuminosityBlockRange> ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockRange> >(
+      std::string const& name) const {
     return getEntryPointerOrThrow_(name)->getVLuminosityBlockRange();
   }
 
@@ -1594,242 +1446,214 @@ namespace edm {
   // ----------------------------------------------------------------------
   // Bool, vBool
 
-  template<>
-  bool
-  ParameterSet::getParameter<bool>(char const* name) const {
+  template <>
+  bool ParameterSet::getParameter<bool>(char const* name) const {
     return retrieve(name).getBool();
   }
 
   // ----------------------------------------------------------------------
   // Int32, vInt32
 
-  template<>
-  int
-  ParameterSet::getParameter<int>(char const* name) const {
+  template <>
+  int ParameterSet::getParameter<int>(char const* name) const {
     return retrieve(name).getInt32();
   }
 
-  template<>
-  std::vector<int>
-  ParameterSet::getParameter<std::vector<int> >(char const* name) const {
+  template <>
+  std::vector<int> ParameterSet::getParameter<std::vector<int> >(char const* name) const {
     return retrieve(name).getVInt32();
   }
 
- // ----------------------------------------------------------------------
+  // ----------------------------------------------------------------------
   // Int64, vInt64
 
-  template<>
-  long long
-  ParameterSet::getParameter<long long>(char const* name) const {
+  template <>
+  long long ParameterSet::getParameter<long long>(char const* name) const {
     return retrieve(name).getInt64();
   }
 
-  template<>
-  std::vector<long long>
-  ParameterSet::getParameter<std::vector<long long> >(char const* name) const {
+  template <>
+  std::vector<long long> ParameterSet::getParameter<std::vector<long long> >(char const* name) const {
     return retrieve(name).getVInt64();
   }
 
   // ----------------------------------------------------------------------
   // Uint32, vUint32
 
-  template<>
-  unsigned int
-  ParameterSet::getParameter<unsigned int>(char const* name) const {
+  template <>
+  unsigned int ParameterSet::getParameter<unsigned int>(char const* name) const {
     return retrieve(name).getUInt32();
   }
 
-  template<>
-  std::vector<unsigned int>
-  ParameterSet::getParameter<std::vector<unsigned int> >(char const* name) const {
+  template <>
+  std::vector<unsigned int> ParameterSet::getParameter<std::vector<unsigned int> >(char const* name) const {
     return retrieve(name).getVUInt32();
   }
 
   // ----------------------------------------------------------------------
   // Uint64, vUint64
 
-  template<>
-  unsigned long long
-  ParameterSet::getParameter<unsigned long long>(char const* name) const {
+  template <>
+  unsigned long long ParameterSet::getParameter<unsigned long long>(char const* name) const {
     return retrieve(name).getUInt64();
   }
 
-  template<>
-  std::vector<unsigned long long>
-  ParameterSet::getParameter<std::vector<unsigned long long> >(char const* name) const {
+  template <>
+  std::vector<unsigned long long> ParameterSet::getParameter<std::vector<unsigned long long> >(char const* name) const {
     return retrieve(name).getVUInt64();
   }
 
   // ----------------------------------------------------------------------
   // Double, vDouble
 
-  template<>
-  double
-  ParameterSet::getParameter<double>(char const* name) const {
+  template <>
+  double ParameterSet::getParameter<double>(char const* name) const {
     return retrieve(name).getDouble();
   }
 
-  template<>
-  std::vector<double>
-  ParameterSet::getParameter<std::vector<double> >(char const* name) const {
+  template <>
+  std::vector<double> ParameterSet::getParameter<std::vector<double> >(char const* name) const {
     return retrieve(name).getVDouble();
   }
 
   // ----------------------------------------------------------------------
   // String, vString
 
-  template<>
-  std::string
-  ParameterSet::getParameter<std::string>(char const* name) const {
+  template <>
+  std::string ParameterSet::getParameter<std::string>(char const* name) const {
     return retrieve(name).getString();
   }
 
-  template<>
-  std::vector<std::string>
-  ParameterSet::getParameter<std::vector<std::string> >(char const* name) const {
+  template <>
+  std::vector<std::string> ParameterSet::getParameter<std::vector<std::string> >(char const* name) const {
     return retrieve(name).getVString();
   }
 
   // ----------------------------------------------------------------------
   // FileInPath
 
-  template<>
-  FileInPath
-  ParameterSet::getParameter<FileInPath>(char const* name) const {
+  template <>
+  FileInPath ParameterSet::getParameter<FileInPath>(char const* name) const {
     return retrieve(name).getFileInPath();
   }
 
   // ----------------------------------------------------------------------
   // InputTag
 
-  template<>
-  InputTag
-  ParameterSet::getParameter<InputTag>(char const* name) const {
+  template <>
+  InputTag ParameterSet::getParameter<InputTag>(char const* name) const {
     Entry const& e_input = retrieve(name);
     switch (e_input.typeCode()) {
-      case 't':   // InputTag
+      case 't':  // InputTag
         return e_input.getInputTag();
-      case 'S':   // string
+      case 'S':  // string
         std::string const& label = e_input.getString();
         deprecatedInputTagWarning(name, label);
         return InputTag(label);
     }
-    throw Exception(errors::Configuration, "ValueError") << "type of "
-       << name << " is expected to be InputTag or string (deprecated)";
+    throw Exception(errors::Configuration, "ValueError")
+        << "type of " << name << " is expected to be InputTag or string (deprecated)";
   }
 
   // ----------------------------------------------------------------------
   // VInputTag
 
-  template<>
-  std::vector<InputTag>
-  ParameterSet::getParameter<std::vector<InputTag> >(char const* name) const {
+  template <>
+  std::vector<InputTag> ParameterSet::getParameter<std::vector<InputTag> >(char const* name) const {
     return retrieve(name).getVInputTag();
   }
 
-   // ----------------------------------------------------------------------
-   // ESInputTag
-
-   template<>
-   ESInputTag
-   ParameterSet::getParameter<ESInputTag>(char const* name) const {
-      return retrieve(name).getESInputTag();
-   }
+  // ----------------------------------------------------------------------
+  // ESInputTag
 
-   // ----------------------------------------------------------------------
-   // VESInputTag
+  template <>
+  ESInputTag ParameterSet::getParameter<ESInputTag>(char const* name) const {
+    return retrieve(name).getESInputTag();
+  }
 
-   template<>
-   std::vector<ESInputTag>
-   ParameterSet::getParameter<std::vector<ESInputTag> >(char const* name) const {
-      return retrieve(name).getVESInputTag();
-   }
+  // ----------------------------------------------------------------------
+  // VESInputTag
 
+  template <>
+  std::vector<ESInputTag> ParameterSet::getParameter<std::vector<ESInputTag> >(char const* name) const {
+    return retrieve(name).getVESInputTag();
+  }
 
   // ----------------------------------------------------------------------
   // EventID
 
-  template<>
-  EventID
-  ParameterSet::getParameter<EventID>(char const* name) const {
+  template <>
+  EventID ParameterSet::getParameter<EventID>(char const* name) const {
     return retrieve(name).getEventID();
   }
 
   // ----------------------------------------------------------------------
   // VEventID
 
-  template<>
-  std::vector<EventID>
-  ParameterSet::getParameter<std::vector<EventID> >(char const* name) const {
+  template <>
+  std::vector<EventID> ParameterSet::getParameter<std::vector<EventID> >(char const* name) const {
     return retrieve(name).getVEventID();
   }
 
   // ----------------------------------------------------------------------
   // LuminosityBlockID
 
-  template<>
-  LuminosityBlockID
-  ParameterSet::getParameter<LuminosityBlockID>(char const* name) const {
+  template <>
+  LuminosityBlockID ParameterSet::getParameter<LuminosityBlockID>(char const* name) const {
     return retrieve(name).getLuminosityBlockID();
   }
 
   // ----------------------------------------------------------------------
   // VLuminosityBlockID
 
-  template<>
-  std::vector<LuminosityBlockID>
-  ParameterSet::getParameter<std::vector<LuminosityBlockID> >(char const* name) const {
+  template <>
+  std::vector<LuminosityBlockID> ParameterSet::getParameter<std::vector<LuminosityBlockID> >(char const* name) const {
     return retrieve(name).getVLuminosityBlockID();
   }
 
   // ----------------------------------------------------------------------
   // EventRange
 
-  template<>
-  EventRange
-  ParameterSet::getParameter<EventRange>(char const* name) const {
+  template <>
+  EventRange ParameterSet::getParameter<EventRange>(char const* name) const {
     return retrieve(name).getEventRange();
   }
 
   // ----------------------------------------------------------------------
   // VEventRange
 
-  template<>
-  std::vector<EventRange>
-  ParameterSet::getParameter<std::vector<EventRange> >(char const* name) const {
+  template <>
+  std::vector<EventRange> ParameterSet::getParameter<std::vector<EventRange> >(char const* name) const {
     return retrieve(name).getVEventRange();
   }
 
   // ----------------------------------------------------------------------
   // LuminosityBlockRange
 
-  template<>
-  LuminosityBlockRange
-  ParameterSet::getParameter<LuminosityBlockRange>(char const* name) const {
+  template <>
+  LuminosityBlockRange ParameterSet::getParameter<LuminosityBlockRange>(char const* name) const {
     return retrieve(name).getLuminosityBlockRange();
   }
 
   // ----------------------------------------------------------------------
   // VLuminosityBlockRange
 
-  template<>
-  std::vector<LuminosityBlockRange>
-  ParameterSet::getParameter<std::vector<LuminosityBlockRange> >(char const* name) const {
+  template <>
+  std::vector<LuminosityBlockRange> ParameterSet::getParameter<std::vector<LuminosityBlockRange> >(
+      char const* name) const {
     return retrieve(name).getVLuminosityBlockRange();
   }
 
   // ----------------------------------------------------------------------
   // PSet, vPSet
 
-  template<>
-  ParameterSet
-  ParameterSet::getParameter<ParameterSet>(char const* name) const {
+  template <>
+  ParameterSet ParameterSet::getParameter<ParameterSet>(char const* name) const {
     return getParameterSet(name);
   }
 
-  template<>
-  VParameterSet
-  ParameterSet::getParameter<VParameterSet>(char const* name) const {
+  template <>
+  VParameterSet ParameterSet::getParameter<VParameterSet>(char const* name) const {
     return getParameterSetVector(name);
   }
 
@@ -1838,596 +1662,533 @@ namespace edm {
   // ----------------------------------------------------------------------
   // Bool, vBool
 
-  template<>
-  bool
-  ParameterSet::getUntrackedParameter<bool>(char const* name, bool const& defaultValue) const {
+  template <>
+  bool ParameterSet::getUntrackedParameter<bool>(char const* name, bool const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getBool();
   }
 
-  template<>
-  bool
-  ParameterSet::getUntrackedParameter<bool>(char const* name) const {
+  template <>
+  bool ParameterSet::getUntrackedParameter<bool>(char const* name) const {
     return getEntryPointerOrThrow_(name)->getBool();
   }
 
   // ----------------------------------------------------------------------
   // Int32, vInt32
 
-  template<>
-  int
-  ParameterSet::getUntrackedParameter<int>(char const* name, int const& defaultValue) const {
+  template <>
+  int ParameterSet::getUntrackedParameter<int>(char const* name, int const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getInt32();
   }
 
-  template<>
-  int
-  ParameterSet::getUntrackedParameter<int>(char const* name) const {
+  template <>
+  int ParameterSet::getUntrackedParameter<int>(char const* name) const {
     return getEntryPointerOrThrow_(name)->getInt32();
   }
 
-  template<>
-  std::vector<int>
-  ParameterSet::getUntrackedParameter<std::vector<int> >(char const* name, std::vector<int> const& defaultValue) const {
+  template <>
+  std::vector<int> ParameterSet::getUntrackedParameter<std::vector<int> >(char const* name,
+                                                                          std::vector<int> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVInt32();
   }
 
-  template<>
-  std::vector<int>
-  ParameterSet::getUntrackedParameter<std::vector<int> >(char const* name) const {
+  template <>
+  std::vector<int> ParameterSet::getUntrackedParameter<std::vector<int> >(char const* name) const {
     return getEntryPointerOrThrow_(name)->getVInt32();
   }
 
   // ----------------------------------------------------------------------
   // Uint32, vUint32
 
-  template<>
-  unsigned int
-  ParameterSet::getUntrackedParameter<unsigned int>(char const* name, unsigned int const& defaultValue) const {
+  template <>
+  unsigned int ParameterSet::getUntrackedParameter<unsigned int>(char const* name,
+                                                                 unsigned int const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getUInt32();
   }
 
-  template<>
-  unsigned int
-  ParameterSet::getUntrackedParameter<unsigned int>(char const* name) const {
+  template <>
+  unsigned int ParameterSet::getUntrackedParameter<unsigned int>(char const* name) const {
     return getEntryPointerOrThrow_(name)->getUInt32();
   }
 
-  template<>
-  std::vector<unsigned int>
-  ParameterSet::getUntrackedParameter<std::vector<unsigned int> >(char const* name, std::vector<unsigned int> const& defaultValue) const {
+  template <>
+  std::vector<unsigned int> ParameterSet::getUntrackedParameter<std::vector<unsigned int> >(
+      char const* name, std::vector<unsigned int> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVUInt32();
   }
 
-  template<>
-  std::vector<unsigned int>
-  ParameterSet::getUntrackedParameter<std::vector<unsigned int> >(char const* name) const {
+  template <>
+  std::vector<unsigned int> ParameterSet::getUntrackedParameter<std::vector<unsigned int> >(char const* name) const {
     return getEntryPointerOrThrow_(name)->getVUInt32();
   }
 
   // ----------------------------------------------------------------------
   // Uint64, vUint64
 
-  template<>
-  unsigned long long
-  ParameterSet::getUntrackedParameter<unsigned long long>(char const* name, unsigned long long const& defaultValue) const {
+  template <>
+  unsigned long long ParameterSet::getUntrackedParameter<unsigned long long>(
+      char const* name, unsigned long long const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getUInt64();
   }
 
-  template<>
-  unsigned long long
-  ParameterSet::getUntrackedParameter<unsigned long long>(char const* name) const {
+  template <>
+  unsigned long long ParameterSet::getUntrackedParameter<unsigned long long>(char const* name) const {
     return getEntryPointerOrThrow_(name)->getUInt64();
   }
 
-  template<>
-  std::vector<unsigned long long>
-  ParameterSet::getUntrackedParameter<std::vector<unsigned long long> >(char const* name, std::vector<unsigned long long> const& defaultValue) const {
+  template <>
+  std::vector<unsigned long long> ParameterSet::getUntrackedParameter<std::vector<unsigned long long> >(
+      char const* name, std::vector<unsigned long long> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVUInt64();
   }
 
-  template<>
-  std::vector<unsigned long long>
-  ParameterSet::getUntrackedParameter<std::vector<unsigned long long> >(char const* name) const {
+  template <>
+  std::vector<unsigned long long> ParameterSet::getUntrackedParameter<std::vector<unsigned long long> >(
+      char const* name) const {
     return getEntryPointerOrThrow_(name)->getVUInt64();
   }
 
   // ----------------------------------------------------------------------
   // Int64, Vint64
 
-  template<>
-  long long
-  ParameterSet::getUntrackedParameter<long long>(char const* name, long long const& defaultValue) const {
+  template <>
+  long long ParameterSet::getUntrackedParameter<long long>(char const* name, long long const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getInt64();
   }
 
-  template<>
-  long long
-  ParameterSet::getUntrackedParameter<long long>(char const* name) const {
+  template <>
+  long long ParameterSet::getUntrackedParameter<long long>(char const* name) const {
     return getEntryPointerOrThrow_(name)->getInt64();
   }
 
-  template<>
-  std::vector<long long>
-  ParameterSet::getUntrackedParameter<std::vector<long long> >(char const* name, std::vector<long long> const& defaultValue) const {
+  template <>
+  std::vector<long long> ParameterSet::getUntrackedParameter<std::vector<long long> >(
+      char const* name, std::vector<long long> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVInt64();
   }
 
-  template<>
-  std::vector<long long>
-  ParameterSet::getUntrackedParameter<std::vector<long long> >(char const* name) const {
+  template <>
+  std::vector<long long> ParameterSet::getUntrackedParameter<std::vector<long long> >(char const* name) const {
     return getEntryPointerOrThrow_(name)->getVInt64();
   }
 
   // ----------------------------------------------------------------------
   // Double, vDouble
 
-  template<>
-  double
-  ParameterSet::getUntrackedParameter<double>(char const* name, double const& defaultValue) const {
+  template <>
+  double ParameterSet::getUntrackedParameter<double>(char const* name, double const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getDouble();
   }
 
-  template<>
-  double
-  ParameterSet::getUntrackedParameter<double>(char const* name) const {
+  template <>
+  double ParameterSet::getUntrackedParameter<double>(char const* name) const {
     return getEntryPointerOrThrow_(name)->getDouble();
   }
 
-  template<>
-  std::vector<double>
-  ParameterSet::getUntrackedParameter<std::vector<double> >(char const* name, std::vector<double> const& defaultValue) const {
-    Entry const* entryPtr = retrieveUntracked(name); return entryPtr == nullptr ? defaultValue : entryPtr->getVDouble();
+  template <>
+  std::vector<double> ParameterSet::getUntrackedParameter<std::vector<double> >(
+      char const* name, std::vector<double> const& defaultValue) const {
+    Entry const* entryPtr = retrieveUntracked(name);
+    return entryPtr == nullptr ? defaultValue : entryPtr->getVDouble();
   }
 
-  template<>
-  std::vector<double>
-  ParameterSet::getUntrackedParameter<std::vector<double> >(char const* name) const {
+  template <>
+  std::vector<double> ParameterSet::getUntrackedParameter<std::vector<double> >(char const* name) const {
     return getEntryPointerOrThrow_(name)->getVDouble();
   }
 
   // ----------------------------------------------------------------------
   // String, vString
 
-  template<>
-  std::string
-  ParameterSet::getUntrackedParameter<std::string>(char const* name, std::string const& defaultValue) const {
+  template <>
+  std::string ParameterSet::getUntrackedParameter<std::string>(char const* name,
+                                                               std::string const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getString();
   }
 
-  template<>
-  std::string
-  ParameterSet::getUntrackedParameter<std::string>(char const* name) const {
+  template <>
+  std::string ParameterSet::getUntrackedParameter<std::string>(char const* name) const {
     return getEntryPointerOrThrow_(name)->getString();
   }
 
-  template<>
-  std::vector<std::string>
-  ParameterSet::getUntrackedParameter<std::vector<std::string> >(char const* name, std::vector<std::string> const& defaultValue) const {
+  template <>
+  std::vector<std::string> ParameterSet::getUntrackedParameter<std::vector<std::string> >(
+      char const* name, std::vector<std::string> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVString();
   }
 
-  template<>
-  std::vector<std::string>
-  ParameterSet::getUntrackedParameter<std::vector<std::string> >(char const* name) const {
+  template <>
+  std::vector<std::string> ParameterSet::getUntrackedParameter<std::vector<std::string> >(char const* name) const {
     return getEntryPointerOrThrow_(name)->getVString();
   }
 
   // ----------------------------------------------------------------------
   //  FileInPath
 
-  template<>
-  FileInPath
-  ParameterSet::getUntrackedParameter<FileInPath>(char const* name, FileInPath const& defaultValue) const {
+  template <>
+  FileInPath ParameterSet::getUntrackedParameter<FileInPath>(char const* name, FileInPath const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getFileInPath();
   }
 
-  template<>
-  FileInPath
-  ParameterSet::getUntrackedParameter<FileInPath>(char const* name) const {
+  template <>
+  FileInPath ParameterSet::getUntrackedParameter<FileInPath>(char const* name) const {
     return getEntryPointerOrThrow_(name)->getFileInPath();
   }
 
   // ----------------------------------------------------------------------
   // InputTag, VInputTag
 
-  template<>
-  InputTag
-  ParameterSet::getUntrackedParameter<InputTag>(char const* name, InputTag const& defaultValue) const {
+  template <>
+  InputTag ParameterSet::getUntrackedParameter<InputTag>(char const* name, InputTag const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getInputTag();
   }
 
-  template<>
-  InputTag
-  ParameterSet::getUntrackedParameter<InputTag>(char const* name) const {
+  template <>
+  InputTag ParameterSet::getUntrackedParameter<InputTag>(char const* name) const {
     return getEntryPointerOrThrow_(name)->getInputTag();
   }
 
-  template<>
-  std::vector<InputTag>
-  ParameterSet::getUntrackedParameter<std::vector<InputTag> >(char const* name,
-                                      std::vector<InputTag> const& defaultValue) const {
+  template <>
+  std::vector<InputTag> ParameterSet::getUntrackedParameter<std::vector<InputTag> >(
+      char const* name, std::vector<InputTag> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVInputTag();
   }
 
-  template<>
-  std::vector<InputTag>
-  ParameterSet::getUntrackedParameter<std::vector<InputTag> >(char const* name) const {
+  template <>
+  std::vector<InputTag> ParameterSet::getUntrackedParameter<std::vector<InputTag> >(char const* name) const {
     return getEntryPointerOrThrow_(name)->getVInputTag();
   }
 
-   // ----------------------------------------------------------------------
-   // ESInputTag, VESInputTag
+  // ----------------------------------------------------------------------
+  // ESInputTag, VESInputTag
 
-   template<>
-   ESInputTag
-   ParameterSet::getUntrackedParameter<ESInputTag>(char const* name, ESInputTag const& defaultValue) const {
-      Entry const* entryPtr = retrieveUntracked(name);
-      return entryPtr == nullptr ? defaultValue : entryPtr->getESInputTag();
-   }
+  template <>
+  ESInputTag ParameterSet::getUntrackedParameter<ESInputTag>(char const* name, ESInputTag const& defaultValue) const {
+    Entry const* entryPtr = retrieveUntracked(name);
+    return entryPtr == nullptr ? defaultValue : entryPtr->getESInputTag();
+  }
 
-   template<>
-   ESInputTag
-   ParameterSet::getUntrackedParameter<ESInputTag>(char const* name) const {
-      return getEntryPointerOrThrow_(name)->getESInputTag();
-   }
+  template <>
+  ESInputTag ParameterSet::getUntrackedParameter<ESInputTag>(char const* name) const {
+    return getEntryPointerOrThrow_(name)->getESInputTag();
+  }
 
-   template<>
-   std::vector<ESInputTag>
-   ParameterSet::getUntrackedParameter<std::vector<ESInputTag> >(char const* name,
-                                                               std::vector<ESInputTag> const& defaultValue) const {
-      Entry const* entryPtr = retrieveUntracked(name);
-      return entryPtr == nullptr ? defaultValue : entryPtr->getVESInputTag();
-   }
+  template <>
+  std::vector<ESInputTag> ParameterSet::getUntrackedParameter<std::vector<ESInputTag> >(
+      char const* name, std::vector<ESInputTag> const& defaultValue) const {
+    Entry const* entryPtr = retrieveUntracked(name);
+    return entryPtr == nullptr ? defaultValue : entryPtr->getVESInputTag();
+  }
 
-   template<>
-   std::vector<ESInputTag>
-   ParameterSet::getUntrackedParameter<std::vector<ESInputTag> >(char const* name) const {
-      return getEntryPointerOrThrow_(name)->getVESInputTag();
-   }
+  template <>
+  std::vector<ESInputTag> ParameterSet::getUntrackedParameter<std::vector<ESInputTag> >(char const* name) const {
+    return getEntryPointerOrThrow_(name)->getVESInputTag();
+  }
 
   // ----------------------------------------------------------------------
   // EventID, VEventID
 
-  template<>
-  EventID
-  ParameterSet::getUntrackedParameter<EventID>(char const* name, EventID const& defaultValue) const {
+  template <>
+  EventID ParameterSet::getUntrackedParameter<EventID>(char const* name, EventID const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getEventID();
   }
 
-  template<>
-  EventID
-  ParameterSet::getUntrackedParameter<EventID>(char const* name) const {
+  template <>
+  EventID ParameterSet::getUntrackedParameter<EventID>(char const* name) const {
     return getEntryPointerOrThrow_(name)->getEventID();
   }
 
-  template<>
-  std::vector<EventID>
-  ParameterSet::getUntrackedParameter<std::vector<EventID> >(char const* name,
-                                      std::vector<EventID> const& defaultValue) const {
+  template <>
+  std::vector<EventID> ParameterSet::getUntrackedParameter<std::vector<EventID> >(
+      char const* name, std::vector<EventID> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVEventID();
   }
 
-  template<>
-  std::vector<EventID>
-  ParameterSet::getUntrackedParameter<std::vector<EventID> >(char const* name) const {
+  template <>
+  std::vector<EventID> ParameterSet::getUntrackedParameter<std::vector<EventID> >(char const* name) const {
     return getEntryPointerOrThrow_(name)->getVEventID();
   }
 
   // ----------------------------------------------------------------------
   // LuminosityBlockID, VLuminosityBlockID
 
-  template<>
-  LuminosityBlockID
-  ParameterSet::getUntrackedParameter<LuminosityBlockID>(char const* name, LuminosityBlockID const& defaultValue) const {
+  template <>
+  LuminosityBlockID ParameterSet::getUntrackedParameter<LuminosityBlockID>(
+      char const* name, LuminosityBlockID const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getLuminosityBlockID();
   }
 
-  template<>
-  LuminosityBlockID
-  ParameterSet::getUntrackedParameter<LuminosityBlockID>(char const* name) const {
+  template <>
+  LuminosityBlockID ParameterSet::getUntrackedParameter<LuminosityBlockID>(char const* name) const {
     return getEntryPointerOrThrow_(name)->getLuminosityBlockID();
   }
 
-  template<>
-  std::vector<LuminosityBlockID>
-  ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockID> >(char const* name,
-                                      std::vector<LuminosityBlockID> const& defaultValue) const {
+  template <>
+  std::vector<LuminosityBlockID> ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockID> >(
+      char const* name, std::vector<LuminosityBlockID> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVLuminosityBlockID();
   }
 
-  template<>
-  std::vector<LuminosityBlockID>
-  ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockID> >(char const* name) const {
+  template <>
+  std::vector<LuminosityBlockID> ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockID> >(
+      char const* name) const {
     return getEntryPointerOrThrow_(name)->getVLuminosityBlockID();
   }
 
   // ----------------------------------------------------------------------
   // EventRange, VEventRange
 
-  template<>
-  EventRange
-  ParameterSet::getUntrackedParameter<EventRange>(char const* name, EventRange const& defaultValue) const {
+  template <>
+  EventRange ParameterSet::getUntrackedParameter<EventRange>(char const* name, EventRange const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getEventRange();
   }
 
-  template<>
-  EventRange
-  ParameterSet::getUntrackedParameter<EventRange>(char const* name) const {
+  template <>
+  EventRange ParameterSet::getUntrackedParameter<EventRange>(char const* name) const {
     return getEntryPointerOrThrow_(name)->getEventRange();
   }
 
-  template<>
-  std::vector<EventRange>
-  ParameterSet::getUntrackedParameter<std::vector<EventRange> >(char const* name,
-                                      std::vector<EventRange> const& defaultValue) const {
+  template <>
+  std::vector<EventRange> ParameterSet::getUntrackedParameter<std::vector<EventRange> >(
+      char const* name, std::vector<EventRange> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVEventRange();
   }
 
-  template<>
-  std::vector<EventRange>
-  ParameterSet::getUntrackedParameter<std::vector<EventRange> >(char const* name) const {
+  template <>
+  std::vector<EventRange> ParameterSet::getUntrackedParameter<std::vector<EventRange> >(char const* name) const {
     return getEntryPointerOrThrow_(name)->getVEventRange();
   }
 
   // ----------------------------------------------------------------------
   // LuminosityBlockRange, VLuminosityBlockRange
 
-  template<>
-  LuminosityBlockRange
-  ParameterSet::getUntrackedParameter<LuminosityBlockRange>(char const* name, LuminosityBlockRange const& defaultValue) const {
+  template <>
+  LuminosityBlockRange ParameterSet::getUntrackedParameter<LuminosityBlockRange>(
+      char const* name, LuminosityBlockRange const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getLuminosityBlockRange();
   }
 
-  template<>
-  LuminosityBlockRange
-  ParameterSet::getUntrackedParameter<LuminosityBlockRange>(char const* name) const {
+  template <>
+  LuminosityBlockRange ParameterSet::getUntrackedParameter<LuminosityBlockRange>(char const* name) const {
     return getEntryPointerOrThrow_(name)->getLuminosityBlockRange();
   }
 
-  template<>
-  std::vector<LuminosityBlockRange>
-  ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockRange> >(char const* name,
-                                      std::vector<LuminosityBlockRange> const& defaultValue) const {
+  template <>
+  std::vector<LuminosityBlockRange> ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockRange> >(
+      char const* name, std::vector<LuminosityBlockRange> const& defaultValue) const {
     Entry const* entryPtr = retrieveUntracked(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->getVLuminosityBlockRange();
   }
 
-  template<>
-  std::vector<LuminosityBlockRange>
-  ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockRange> >(char const* name) const {
+  template <>
+  std::vector<LuminosityBlockRange> ParameterSet::getUntrackedParameter<std::vector<LuminosityBlockRange> >(
+      char const* name) const {
     return getEntryPointerOrThrow_(name)->getVLuminosityBlockRange();
   }
 
   // ----------------------------------------------------------------------
   // PSet, vPSet
 
-  template<>
-  ParameterSet
-  ParameterSet::getUntrackedParameter<ParameterSet>(char const* name, ParameterSet const& defaultValue) const {
+  template <>
+  ParameterSet ParameterSet::getUntrackedParameter<ParameterSet>(char const* name,
+                                                                 ParameterSet const& defaultValue) const {
     return getUntrackedParameterSet(name, defaultValue);
   }
 
-  template<>
-  VParameterSet
-  ParameterSet::getUntrackedParameter<VParameterSet>(char const* name, VParameterSet const& defaultValue) const {
+  template <>
+  VParameterSet ParameterSet::getUntrackedParameter<VParameterSet>(char const* name,
+                                                                   VParameterSet const& defaultValue) const {
     return getUntrackedParameterSetVector(name, defaultValue);
   }
 
-  template<>
-  ParameterSet
-  ParameterSet::getUntrackedParameter<ParameterSet>(std::string const& name, ParameterSet const& defaultValue) const {
+  template <>
+  ParameterSet ParameterSet::getUntrackedParameter<ParameterSet>(std::string const& name,
+                                                                 ParameterSet const& defaultValue) const {
     return getUntrackedParameterSet(name, defaultValue);
   }
 
-  template<>
-  VParameterSet
-  ParameterSet::getUntrackedParameter<VParameterSet>(std::string const& name, VParameterSet const& defaultValue) const {
+  template <>
+  VParameterSet ParameterSet::getUntrackedParameter<VParameterSet>(std::string const& name,
+                                                                   VParameterSet const& defaultValue) const {
     return getUntrackedParameterSetVector(name, defaultValue);
   }
 
-  template<>
-  ParameterSet
-  ParameterSet::getUntrackedParameter<ParameterSet>(char const* name) const {
+  template <>
+  ParameterSet ParameterSet::getUntrackedParameter<ParameterSet>(char const* name) const {
     return getUntrackedParameterSet(name);
   }
 
-  template<>
-  VParameterSet
-  ParameterSet::getUntrackedParameter<VParameterSet>(char const* name) const {
+  template <>
+  VParameterSet ParameterSet::getUntrackedParameter<VParameterSet>(char const* name) const {
     return getUntrackedParameterSetVector(name);
   }
 
-  template<>
-  ParameterSet
-  ParameterSet::getUntrackedParameter<ParameterSet>(std::string const& name) const {
+  template <>
+  ParameterSet ParameterSet::getUntrackedParameter<ParameterSet>(std::string const& name) const {
     return getUntrackedParameterSet(name);
   }
 
-  template<>
-  VParameterSet
-  ParameterSet::getUntrackedParameter<VParameterSet>(std::string const& name) const {
+  template <>
+  VParameterSet ParameterSet::getUntrackedParameter<VParameterSet>(std::string const& name) const {
     return getUntrackedParameterSetVector(name);
   }
 
-//----------------------------------------------------------------------------------
-// specializations for addParameter and addUntrackedParameter
+  //----------------------------------------------------------------------------------
+  // specializations for addParameter and addUntrackedParameter
 
-  template<>
-  void
-  ParameterSet::addParameter<ParameterSet>(std::string const& name, ParameterSet const& value) {
+  template <>
+  void ParameterSet::addParameter<ParameterSet>(std::string const& name, ParameterSet const& value) {
     invalidateRegistration(name);
     insertParameterSet(true, name, ParameterSetEntry(value, true));
   }
 
-  template<>
-  void
-  ParameterSet::addParameter<VParameterSet>(std::string const& name, VParameterSet const& value) {
+  template <>
+  void ParameterSet::addParameter<VParameterSet>(std::string const& name, VParameterSet const& value) {
     invalidateRegistration(name);
     insertVParameterSet(true, name, VParameterSetEntry(value, true));
   }
 
-  template<>
-  void
-  ParameterSet::addParameter<ParameterSet>(char const* name, ParameterSet const& value) {
+  template <>
+  void ParameterSet::addParameter<ParameterSet>(char const* name, ParameterSet const& value) {
     invalidateRegistration(name);
     insertParameterSet(true, name, ParameterSetEntry(value, true));
   }
 
-  template<>
-  void
-  ParameterSet::addParameter<VParameterSet>(char const* name, VParameterSet const& value) {
+  template <>
+  void ParameterSet::addParameter<VParameterSet>(char const* name, VParameterSet const& value) {
     invalidateRegistration(name);
     insertVParameterSet(true, name, VParameterSetEntry(value, true));
   }
 
-  template<>
-  void
-  ParameterSet::addUntrackedParameter<ParameterSet>(std::string const& name, ParameterSet const& value) {
+  template <>
+  void ParameterSet::addUntrackedParameter<ParameterSet>(std::string const& name, ParameterSet const& value) {
     insertParameterSet(true, name, ParameterSetEntry(value, false));
   }
 
-  template<>
-  void
-  ParameterSet::addUntrackedParameter<VParameterSet>(std::string const& name, VParameterSet const& value) {
+  template <>
+  void ParameterSet::addUntrackedParameter<VParameterSet>(std::string const& name, VParameterSet const& value) {
     insertVParameterSet(true, name, VParameterSetEntry(value, false));
   }
 
-  template<>
-  void
-  ParameterSet::addUntrackedParameter<ParameterSet>(char const* name, ParameterSet const& value) {
+  template <>
+  void ParameterSet::addUntrackedParameter<ParameterSet>(char const* name, ParameterSet const& value) {
     insertParameterSet(true, name, ParameterSetEntry(value, false));
   }
 
-  template<>
-  void
-  ParameterSet::addUntrackedParameter<VParameterSet>(char const* name, VParameterSet const& value) {
+  template <>
+  void ParameterSet::addUntrackedParameter<VParameterSet>(char const* name, VParameterSet const& value) {
     insertVParameterSet(true, name, VParameterSetEntry(value, false));
   }
 
-//----------------------------------------------------------------------------------
-// specializations for getParameterNamesForType
+  //----------------------------------------------------------------------------------
+  // specializations for getParameterNamesForType
 
-  template<>
-  std::vector<std::string>
-  ParameterSet::getParameterNamesForType<ParameterSet>(bool trackiness) const {
+  template <>
+  std::vector<std::string> ParameterSet::getParameterNamesForType<ParameterSet>(bool trackiness) const {
     std::vector<std::string> output;
     getParameterSetNames(output, trackiness);
     return output;
   }
 
-  template<>
-  std::vector<std::string>
-  ParameterSet::getParameterNamesForType<VParameterSet>(bool trackiness) const {
+  template <>
+  std::vector<std::string> ParameterSet::getParameterNamesForType<VParameterSet>(bool trackiness) const {
     std::vector<std::string> output;
     getParameterSetVectorNames(output, trackiness);
     return output;
   }
 
-  ParameterSet const&
-  ParameterSet::getParameterSet(std::string const& name) const {
+  ParameterSet const& ParameterSet::getParameterSet(std::string const& name) const {
     return retrieveParameterSet(name).pset();
   }
 
-  ParameterSet const&
-  ParameterSet::getParameterSet(char const* name) const {
+  ParameterSet const& ParameterSet::getParameterSet(char const* name) const {
     return retrieveParameterSet(name).pset();
   }
 
-  ParameterSet
-  ParameterSet::getUntrackedParameterSet(std::string const& name, ParameterSet const& defaultValue) const {
+  ParameterSet ParameterSet::getUntrackedParameterSet(std::string const& name, ParameterSet const& defaultValue) const {
     return getUntrackedParameterSet(name.c_str(), defaultValue);
   }
 
-  ParameterSet
-  ParameterSet::getUntrackedParameterSet(char const* name, ParameterSet const& defaultValue) const {
+  ParameterSet ParameterSet::getUntrackedParameterSet(char const* name, ParameterSet const& defaultValue) const {
     ParameterSetEntry const* entryPtr = retrieveUntrackedParameterSet(name);
-    if(entryPtr == nullptr) {
+    if (entryPtr == nullptr) {
       return defaultValue;
     }
     return entryPtr->pset();
   }
 
-  ParameterSet const&
-  ParameterSet::getUntrackedParameterSet(std::string const& name) const {
+  ParameterSet const& ParameterSet::getUntrackedParameterSet(std::string const& name) const {
     return getUntrackedParameterSet(name.c_str());
   }
 
-  ParameterSet const&
-  ParameterSet::getUntrackedParameterSet(char const* name) const {
+  ParameterSet const& ParameterSet::getUntrackedParameterSet(char const* name) const {
     ParameterSetEntry const* result = retrieveUntrackedParameterSet(name);
-    if(result == nullptr)
+    if (result == nullptr)
       throw Exception(errors::Configuration, "MissingParameter:")
-        << "The required ParameterSet '" << name << "' was not specified.\n";
+          << "The required ParameterSet '" << name << "' was not specified.\n";
     return result->pset();
   }
 
-  VParameterSet const&
-  ParameterSet::getParameterSetVector(std::string const& name) const {
+  VParameterSet const& ParameterSet::getParameterSetVector(std::string const& name) const {
     return retrieveVParameterSet(name).vpset();
   }
 
-  VParameterSet const&
-  ParameterSet::getParameterSetVector(char const* name) const {
+  VParameterSet const& ParameterSet::getParameterSetVector(char const* name) const {
     return retrieveVParameterSet(name).vpset();
   }
 
-  VParameterSet
-  ParameterSet::getUntrackedParameterSetVector(std::string const& name, VParameterSet const& defaultValue) const {
+  VParameterSet ParameterSet::getUntrackedParameterSetVector(std::string const& name,
+                                                             VParameterSet const& defaultValue) const {
     return getUntrackedParameterSetVector(name.c_str(), defaultValue);
   }
 
-  VParameterSet
-  ParameterSet::getUntrackedParameterSetVector(char const* name, VParameterSet const& defaultValue) const {
+  VParameterSet ParameterSet::getUntrackedParameterSetVector(char const* name,
+                                                             VParameterSet const& defaultValue) const {
     VParameterSetEntry const* entryPtr = retrieveUntrackedVParameterSet(name);
     return entryPtr == nullptr ? defaultValue : entryPtr->vpset();
   }
 
-  VParameterSet const&
-  ParameterSet::getUntrackedParameterSetVector(std::string const& name) const {
+  VParameterSet const& ParameterSet::getUntrackedParameterSetVector(std::string const& name) const {
     return getUntrackedParameterSetVector(name.c_str());
   }
 
-  VParameterSet const&
-  ParameterSet::getUntrackedParameterSetVector(char const* name) const {
+  VParameterSet const& ParameterSet::getUntrackedParameterSetVector(char const* name) const {
     VParameterSetEntry const* result = retrieveUntrackedVParameterSet(name);
-    if(result == nullptr)
+    if (result == nullptr)
       throw Exception(errors::Configuration, "MissingParameter:")
-        << "The required ParameterSetVector '" << name << "' was not specified.\n";
+          << "The required ParameterSetVector '" << name << "' was not specified.\n";
     return result->vpset();
   }
 
-//----------------------------------------------------------------------------------
-  ParameterSet::Bool
-  operator&&(ParameterSet::Bool a, ParameterSet::Bool b) {
-    if(a == ParameterSet::False || b == ParameterSet::False) {
+  //----------------------------------------------------------------------------------
+  ParameterSet::Bool operator&&(ParameterSet::Bool a, ParameterSet::Bool b) {
+    if (a == ParameterSet::False || b == ParameterSet::False) {
       return ParameterSet::False;
-    } else if(a == ParameterSet::Unknown || b == ParameterSet::Unknown) {
+    } else if (a == ParameterSet::Unknown || b == ParameterSet::Unknown) {
       return ParameterSet::Unknown;
     }
     return ParameterSet::True;
   }
 
-
-} // namespace edm
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/ParameterSetConverter.cc b/FWCore/ParameterSet/src/ParameterSetConverter.cc
index ae03811427175..cf9035ff222ed 100644
--- a/FWCore/ParameterSet/src/ParameterSetConverter.cc
+++ b/FWCore/ParameterSet/src/ParameterSetConverter.cc
@@ -3,9 +3,9 @@
 ParameterSetConverter.cc
 
 ----------------------------------------------------------------------*/
-  //------------------------------------------------------------
-  // Adapts parameter sets by value (fileFormatVersion_.value() < 12) to parameter sets by reference
-  // Adapts untracked @trigger_paths (fileFormatVersion_.value() < 13) to tracked @trigger_paths.
+//------------------------------------------------------------
+// Adapts parameter sets by value (fileFormatVersion_.value() < 12) to parameter sets by reference
+// Adapts untracked @trigger_paths (fileFormatVersion_.value() < 13) to tracked @trigger_paths.
 
 #include "FWCore/ParameterSet/interface/ParameterSetConverter.h"
 #include <iterator>
@@ -16,24 +16,23 @@ ParameterSetConverter.cc
 namespace edm {
 
   namespace {
-    void
-    insertIntoReplace(ParameterSetConverter::StringMap& replace,
-		std::string const& fromPrefix,
-		std::string const& from,
-		std::string const& fromPostfix,
-		std::string const& toPrefix,
-		std::string const& to,
-		std::string const& toPostfix) {
-      replace.insert(std::make_pair(fromPrefix+from+fromPostfix, toPrefix+to+toPostfix));
+    void insertIntoReplace(ParameterSetConverter::StringMap& replace,
+                           std::string const& fromPrefix,
+                           std::string const& from,
+                           std::string const& fromPostfix,
+                           std::string const& toPrefix,
+                           std::string const& to,
+                           std::string const& toPostfix) {
+      replace.insert(std::make_pair(fromPrefix + from + fromPostfix, toPrefix + to + toPostfix));
     }
-  }
+  }  // namespace
 
-  MainParameterSet::MainParameterSet(ParameterSetID const& oldID, std::string const& psetString) :
-      oldID_(oldID),
-      parameterSet_(psetString),
-      paths_(parameterSet_.getParameter<StringVector>("@paths")),
-      endPaths_(),
-      triggerPaths_() {
+  MainParameterSet::MainParameterSet(ParameterSetID const& oldID, std::string const& psetString)
+      : oldID_(oldID),
+        parameterSet_(psetString),
+        paths_(parameterSet_.getParameter<StringVector>("@paths")),
+        endPaths_(),
+        triggerPaths_() {
     if (parameterSet_.existsAs<StringVector>("@end_paths")) {
       endPaths_ = (parameterSet_.getParameter<StringVector>("@end_paths"));
     }
@@ -46,10 +45,8 @@ namespace edm {
 
   MainParameterSet::~MainParameterSet() {}
 
-  TriggerPath::TriggerPath(ParameterSet const& pset) :
-      parameterSet_(pset),
-      tPaths_(parameterSet_.getParameter<StringVector>("@trigger_paths")),
-      triggerPaths_() {
+  TriggerPath::TriggerPath(ParameterSet const& pset)
+      : parameterSet_(pset), tPaths_(parameterSet_.getParameter<StringVector>("@trigger_paths")), triggerPaths_() {
     for (StringVector::const_iterator i = tPaths_.begin(), e = tPaths_.end(); i != e; ++i) {
       triggerPaths_.insert(*i);
     }
@@ -60,14 +57,9 @@ namespace edm {
   //------------------------------------------------------------
 
   ParameterSetConverter::ParameterSetConverter(ParameterSetMap const& psetMap,
-						ParameterSetIdConverter& idConverter,
-						bool alreadyByReference) :
-    parameterSets_(),
-    mainParameterSets_(),
-    triggerPaths_(),
-    replace_(),
-    parameterSetIdConverter_(idConverter)
-  {
+                                               ParameterSetIdConverter& idConverter,
+                                               bool alreadyByReference)
+      : parameterSets_(), mainParameterSets_(), triggerPaths_(), replace_(), parameterSetIdConverter_(idConverter) {
     for (ParameterSetMap::const_iterator i = psetMap.begin(), iEnd = psetMap.end(); i != iEnd; ++i) {
       parameterSets_.push_back(std::make_pair(i->second.pset(), i->first));
     }
@@ -77,44 +69,46 @@ namespace edm {
       replace_.insert(std::make_pair(std::string("=+p({})"), std::string("=+q({})")));
       convertParameterSets();
     }
-    for (std::vector<MainParameterSet>::iterator j = mainParameterSets_.begin(), jEnd = mainParameterSets_.end(); j != jEnd; ++j) {
+    for (std::vector<MainParameterSet>::iterator j = mainParameterSets_.begin(), jEnd = mainParameterSets_.end();
+         j != jEnd;
+         ++j) {
       for (std::vector<TriggerPath>::iterator i = triggerPaths_.begin(), iEnd = triggerPaths_.end(); i != iEnd; ++i) {
-	if (i->triggerPaths_ == j->triggerPaths_) {
-	  j->parameterSet_.addParameter("@trigger_paths", i->parameterSet_);
-	  break;
+        if (i->triggerPaths_ == j->triggerPaths_) {
+          j->parameterSet_.addParameter("@trigger_paths", i->parameterSet_);
+          break;
         }
       }
     }
-    for (std::vector<MainParameterSet>::iterator i = mainParameterSets_.begin(), iEnd = mainParameterSets_.end(); i != iEnd; ++i) {
+    for (std::vector<MainParameterSet>::iterator i = mainParameterSets_.begin(), iEnd = mainParameterSets_.end();
+         i != iEnd;
+         ++i) {
       ParameterSet& pset = i->parameterSet_;
       pset.registerIt();
       ParameterSetID newID(pset.id());
       if (i->oldID_ != newID && i->oldID_ != ParameterSetID()) {
-	parameterSetIdConverter_.insert(std::make_pair(i->oldID_, newID));
+        parameterSetIdConverter_.insert(std::make_pair(i->oldID_, newID));
       }
     }
   }
 
   ParameterSetConverter::~ParameterSetConverter() {}
 
-  void
-  ParameterSetConverter::noConvertParameterSets() {
+  void ParameterSetConverter::noConvertParameterSets() {
     for (StringWithIDList::iterator i = parameterSets_.begin(), iEnd = parameterSets_.end(); i != iEnd; ++i) {
       if (i->first.find("@all_sources") != std::string::npos) {
         mainParameterSets_.push_back(MainParameterSet(i->second, i->first));
       } else {
         ParameterSet pset(i->first);
         pset.setID(i->second);
-	pset::Registry::instance()->insertMapped(pset);
-	if (i->first.find("@trigger_paths") != std::string::npos) {
-	  triggerPaths_.push_back(pset);
-	}
-      } 
+        pset::Registry::instance()->insertMapped(pset);
+        if (i->first.find("@trigger_paths") != std::string::npos) {
+          triggerPaths_.push_back(pset);
+        }
+      }
     }
   }
 
-  void
-  ParameterSetConverter::convertParameterSets() {
+  void ParameterSetConverter::convertParameterSets() {
     std::string const comma(",");
     std::string const rparam(")");
     std::string const rvparam("})");
@@ -125,68 +119,69 @@ namespace edm {
     bool doItAgain = false;
     for (StringMap::const_iterator j = replace_.begin(), jEnd = replace_.end(); j != jEnd; ++j) {
       for (StringWithIDList::iterator i = parameterSets_.begin(), iEnd = parameterSets_.end(); i != iEnd; ++i) {
-	for (std::string::size_type it = i->first.find(j->first); it != std::string::npos; it = i->first.find(j->first)) {
-	  i->first.replace(it, j->first.size(), j->second);
-	  doItAgain = true;
-	}
+        for (std::string::size_type it = i->first.find(j->first); it != std::string::npos;
+             it = i->first.find(j->first)) {
+          i->first.replace(it, j->first.size(), j->second);
+          doItAgain = true;
+        }
       }
     }
     for (StringWithIDList::iterator i = parameterSets_.begin(), iEnd = parameterSets_.end(); i != iEnd; ++i) {
       if (i->first.find("+P") == std::string::npos && i->first.find("+p") == std::string::npos) {
-	if (i->first.find("@all_sources") != std::string::npos) {
-	  mainParameterSets_.push_back(MainParameterSet(i->second, i->first));
-	} else {
+        if (i->first.find("@all_sources") != std::string::npos) {
+          mainParameterSets_.push_back(MainParameterSet(i->second, i->first));
+        } else {
           ParameterSet pset(i->first);
           pset.registerIt();
-	  std::string& from = i->first;
-	  std::string to;
-	  ParameterSetID newID(pset.id());
-	  newID.toString(to);
-	  insertIntoReplace(replace_, loldparam, from, rparam, lparam, to, rparam);
-	  insertIntoReplace(replace_, comma, from, comma, comma, to, comma);
-	  insertIntoReplace(replace_, comma, from, rvparam, comma, to, rvparam);
-	  insertIntoReplace(replace_, loldvparam, from, comma, lvparam, to, comma);
-	  insertIntoReplace(replace_, loldvparam, from, rvparam, lvparam, to, rvparam);
-	  if (i->second != newID && i->second != ParameterSetID()) {
-	    parameterSetIdConverter_.insert(std::make_pair(i->second, newID));
-	  }
-	  if (i->first.find("@trigger_paths") != std::string::npos) {
-	    triggerPaths_.push_back(pset);
-	  }
-	}
-	StringWithIDList::iterator icopy = i;
-	++i;
-	parameterSets_.erase(icopy);
-	--i;
-	doItAgain = true;
+          std::string& from = i->first;
+          std::string to;
+          ParameterSetID newID(pset.id());
+          newID.toString(to);
+          insertIntoReplace(replace_, loldparam, from, rparam, lparam, to, rparam);
+          insertIntoReplace(replace_, comma, from, comma, comma, to, comma);
+          insertIntoReplace(replace_, comma, from, rvparam, comma, to, rvparam);
+          insertIntoReplace(replace_, loldvparam, from, comma, lvparam, to, comma);
+          insertIntoReplace(replace_, loldvparam, from, rvparam, lvparam, to, rvparam);
+          if (i->second != newID && i->second != ParameterSetID()) {
+            parameterSetIdConverter_.insert(std::make_pair(i->second, newID));
+          }
+          if (i->first.find("@trigger_paths") != std::string::npos) {
+            triggerPaths_.push_back(pset);
+          }
+        }
+        StringWithIDList::iterator icopy = i;
+        ++i;
+        parameterSets_.erase(icopy);
+        --i;
+        doItAgain = true;
       }
     }
     if (!doItAgain && !parameterSets_.empty()) {
       for (StringWithIDList::iterator i = parameterSets_.begin(), iEnd = parameterSets_.end(); i != iEnd; ++i) {
-	std::list<std::string> pieces;
-	split(std::back_inserter(pieces), i->first, '<', ';', '>');
-	for (std::list<std::string>::iterator i= pieces.begin(), e = pieces.end(); i != e; ++i) {
-	  std::string removeName = i->substr(i->find('+'));
-	  if (removeName.size() >= 4) {
-	    if (removeName[1] == 'P') {
-	      std::string psetString(removeName.begin()+3, removeName.end()-1);
-	      parameterSets_.push_back(std::make_pair(psetString, ParameterSetID()));
-	      doItAgain = true;
-	    } else if (removeName[1] == 'p') {
-	      std::string pvec = std::string(removeName.begin()+3, removeName.end()-1);
-	      StringList temp;
-	      split(std::back_inserter(temp), pvec, '{', ',', '}');
-	      for (StringList::const_iterator j = temp.begin(), f = temp.end(); j != f; ++j) {
-		parameterSets_.push_back(std::make_pair(*j, ParameterSetID()));
-	      }
-	      doItAgain = true;
-	    }
-	  }	
-	}
+        std::list<std::string> pieces;
+        split(std::back_inserter(pieces), i->first, '<', ';', '>');
+        for (std::list<std::string>::iterator i = pieces.begin(), e = pieces.end(); i != e; ++i) {
+          std::string removeName = i->substr(i->find('+'));
+          if (removeName.size() >= 4) {
+            if (removeName[1] == 'P') {
+              std::string psetString(removeName.begin() + 3, removeName.end() - 1);
+              parameterSets_.push_back(std::make_pair(psetString, ParameterSetID()));
+              doItAgain = true;
+            } else if (removeName[1] == 'p') {
+              std::string pvec = std::string(removeName.begin() + 3, removeName.end() - 1);
+              StringList temp;
+              split(std::back_inserter(temp), pvec, '{', ',', '}');
+              for (StringList::const_iterator j = temp.begin(), f = temp.end(); j != f; ++j) {
+                parameterSets_.push_back(std::make_pair(*j, ParameterSetID()));
+              }
+              doItAgain = true;
+            }
+          }
+        }
       }
     }
     if (doItAgain) {
       convertParameterSets();
     }
-  }  
-}
+  }
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/ParameterSetDescription.cc b/FWCore/ParameterSet/src/ParameterSetDescription.cc
index 7ef54daa185d7..ef0b8e50e2675 100644
--- a/FWCore/ParameterSet/src/ParameterSetDescription.cc
+++ b/FWCore/ParameterSet/src/ParameterSetDescription.cc
@@ -2,7 +2,7 @@
 //
 // Package:     ParameterSet
 // Class  :     ParameterSetDescription
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -26,66 +26,41 @@
 
 namespace edm {
 
-  ParameterSetDescription::ParameterSetDescription():
-  anythingAllowed_(false),
-  unknown_(false) {
-  }
+  ParameterSetDescription::ParameterSetDescription() : anythingAllowed_(false), unknown_(false) {}
 
-  ParameterSetDescription::~ParameterSetDescription() {
-  }
+  ParameterSetDescription::~ParameterSetDescription() {}
 
-  void
-  ParameterSetDescription::setComment(std::string const & value)
-  { comment_ = value; }
+  void ParameterSetDescription::setComment(std::string const& value) { comment_ = value; }
 
-  void
-  ParameterSetDescription::setComment(char const* value)
-  { comment_ = value; }
+  void ParameterSetDescription::setComment(char const* value) { comment_ = value; }
 
-  void 
-  ParameterSetDescription::setAllowAnything()
-  {
-    anythingAllowed_ = true;
-  }
+  void ParameterSetDescription::setAllowAnything() { anythingAllowed_ = true; }
 
-  void 
-  ParameterSetDescription::setUnknown()
-  {
-    unknown_ = true;
-  }
+  void ParameterSetDescription::setUnknown() { unknown_ = true; }
 
-  ParameterDescriptionNode*
-  ParameterSetDescription::
-  addNode(ParameterDescriptionNode const& node) {
+  ParameterDescriptionNode* ParameterSetDescription::addNode(ParameterDescriptionNode const& node) {
     std::unique_ptr<ParameterDescriptionNode> clonedNode(node.clone());
     return addNode(std::move(clonedNode), false, true);
   }
 
-  ParameterDescriptionNode*
-  ParameterSetDescription::
-  addNode(std::unique_ptr<ParameterDescriptionNode> node) {
+  ParameterDescriptionNode* ParameterSetDescription::addNode(std::unique_ptr<ParameterDescriptionNode> node) {
     return addNode(std::move(node), false, true);
   }
 
-  ParameterDescriptionNode*
-  ParameterSetDescription::
-  addOptionalNode(ParameterDescriptionNode const& node, bool writeToCfi) {
+  ParameterDescriptionNode* ParameterSetDescription::addOptionalNode(ParameterDescriptionNode const& node,
+                                                                     bool writeToCfi) {
     std::unique_ptr<ParameterDescriptionNode> clonedNode(node.clone());
     return addNode(std::move(clonedNode), true, writeToCfi);
   }
 
-  ParameterDescriptionNode*
-  ParameterSetDescription::
-  addOptionalNode(std::unique_ptr<ParameterDescriptionNode> node, bool writeToCfi) {
+  ParameterDescriptionNode* ParameterSetDescription::addOptionalNode(std::unique_ptr<ParameterDescriptionNode> node,
+                                                                     bool writeToCfi) {
     return addNode(std::move(node), true, writeToCfi);
   }
 
-  ParameterDescriptionNode*
-  ParameterSetDescription::
-  addNode(std::unique_ptr<ParameterDescriptionNode> node,
-      bool optional,
-      bool writeToCfi) {
-  
+  ParameterDescriptionNode* ParameterSetDescription::addNode(std::unique_ptr<ParameterDescriptionNode> node,
+                                                             bool optional,
+                                                             bool writeToCfi) {
     std::set<std::string> nodeLabels;
     std::set<ParameterTypes> nodeParameterTypes;
     std::set<ParameterTypes> nodeWildcardTypes;
@@ -100,19 +75,16 @@ namespace edm {
     return entries_.back().setNode(std::move(node));
   }
 
-  void
-  ParameterSetDescription::validate(ParameterSet & pset) const
-  {
+  void ParameterSetDescription::validate(ParameterSet& pset) const {
     using std::placeholders::_1;
-    if (unknown_) return;
+    if (unknown_)
+      return;
 
     std::set<std::string> validatedLabels;
-    for_all(entries_,
-            std::bind(&ParameterSetDescription::validateNode, _1, std::ref(pset), std::ref(validatedLabels)));
+    for_all(entries_, std::bind(&ParameterSetDescription::validateNode, _1, std::ref(pset), std::ref(validatedLabels)));
 
     std::vector<std::string> parameterNames = pset.getParameterNames();
     if (validatedLabels.size() != parameterNames.size()) {
-
       // Three labels will be magically inserted into the top level
       // of a module ParameterSet even though they are not in the
       // python configuration files.  If these are present, then
@@ -140,7 +112,6 @@ namespace edm {
 
       // Try again
       if (validatedLabels.size() != parameterNames.size()) {
-
         if (IllegalParameters::throwAnException() && !anythingAllowed()) {
           throwIllegalParameters(parameterNames, validatedLabels);
         }
@@ -148,19 +119,17 @@ namespace edm {
     }
   }
 
-  void
-  ParameterSetDescription::writeCfi(std::ostream & os,
-                                    bool startWithComma,
-                                    int indentation) const {
+  void ParameterSetDescription::writeCfi(std::ostream& os, bool startWithComma, int indentation) const {
     using std::placeholders::_1;
     bool wroteSomething = false;
 
-    for_all(entries_, std::bind(&ParameterSetDescription::writeNode,
-                                  _1,
-                                  std::ref(os),
-                                  std::ref(startWithComma),
-                                  indentation,
-                                  std::ref(wroteSomething)));
+    for_all(entries_,
+            std::bind(&ParameterSetDescription::writeNode,
+                      _1,
+                      std::ref(os),
+                      std::ref(startWithComma),
+                      indentation,
+                      std::ref(wroteSomething)));
 
     if (wroteSomething) {
       char oldFill = os.fill();
@@ -168,23 +137,21 @@ namespace edm {
     }
   }
 
-  void ParameterSetDescription::
-  validateNode(SetDescriptionEntry const& entry,
-               ParameterSet & pset,
-               std::set<std::string> & validatedLabels) {
+  void ParameterSetDescription::validateNode(SetDescriptionEntry const& entry,
+                                             ParameterSet& pset,
+                                             std::set<std::string>& validatedLabels) {
     entry.node()->validate(pset, validatedLabels, entry.optional());
   }
 
-  void ParameterSetDescription::
-  print(std::ostream & os, DocFormatHelper & dfh) const {
-
+  void ParameterSetDescription::print(std::ostream& os, DocFormatHelper& dfh) const {
     using std::placeholders::_1;
     if (isUnknown()) {
       dfh.indent(os);
       os << "Description is unknown.  The configured PSet will not be validated\n";
       dfh.indent(os);
       os << "because the plugin has not defined this parameter set description.\n";
-      if (!dfh.brief()) os << "\n";
+      if (!dfh.brief())
+        os << "\n";
     }
 
     if (anythingAllowed()) {
@@ -192,142 +159,100 @@ namespace edm {
       os << "Description allows anything. If the configured PSet contains illegal parameters,\n";
       dfh.indent(os);
       os << "then validation will ignore them instead of throwing an exception.\n";
-      if (!dfh.brief()) os << "\n";
+      if (!dfh.brief())
+        os << "\n";
     }
 
     if (entries_.empty()) {
       dfh.indent(os);
       os << "Description is empty\n";
-      if (!dfh.brief()) os << "\n";
+      if (!dfh.brief())
+        os << "\n";
       return;
     }
 
     // Zeroth pass is only to calculate column widths in advance of any printing
     dfh.setPass(0);
     dfh.setCounter(0);
-    for_all(entries_, std::bind(&ParameterSetDescription::printNode,
-                                  _1,
-                                  std::ref(os),
-                                  std::ref(dfh)));
+    for_all(entries_, std::bind(&ParameterSetDescription::printNode, _1, std::ref(os), std::ref(dfh)));
 
     // First pass prints top level parameters and references to structure
     dfh.setPass(1);
     dfh.setCounter(0);
-    for_all(entries_, std::bind(&ParameterSetDescription::printNode,
-                                  _1,
-                                  std::ref(os),
-                                  std::ref(dfh)));
+    for_all(entries_, std::bind(&ParameterSetDescription::printNode, _1, std::ref(os), std::ref(dfh)));
 
     // Second pass prints substructure that goes into different sections of the
     // output document
     dfh.setPass(2);
     dfh.setCounter(0);
-    for_all(entries_, std::bind(&ParameterSetDescription::printNode,
-                                  _1,
-                                  std::ref(os),
-                                  std::ref(dfh)));
+    for_all(entries_, std::bind(&ParameterSetDescription::printNode, _1, std::ref(os), std::ref(dfh)));
   }
 
-  bool
-  ParameterSetDescription::
-  isLabelUnused(std::string const& label) const {
+  bool ParameterSetDescription::isLabelUnused(std::string const& label) const {
     return usedLabels_.find(label) == usedLabels_.end();
   }
 
-  void
-  ParameterSetDescription::throwIllegalParameters(
-    std::vector<std::string> const& parameterNames,
-    std::set<std::string> const& validatedLabels) {
-
+  void ParameterSetDescription::throwIllegalParameters(std::vector<std::string> const& parameterNames,
+                                                       std::set<std::string> const& validatedLabels) {
     std::set<std::string> parNames(parameterNames.begin(), parameterNames.end());
 
-
     std::set<std::string> diffNames;
     std::insert_iterator<std::set<std::string> > insertIter(diffNames, diffNames.begin());
-    std::set_difference(parNames.begin(), parNames.end(),
-                        validatedLabels.begin(), validatedLabels.end(),
-                        insertIter);
+    std::set_difference(parNames.begin(), parNames.end(), validatedLabels.begin(), validatedLabels.end(), insertIter);
 
     std::stringstream ss;
-    for (std::set<std::string>::const_iterator iter = diffNames.begin(),
-	                                       iEnd = diffNames.end();
-         iter != iEnd;
-         ++iter) {
-      ss << " '" << *iter <<  "'\n";
+    for (std::set<std::string>::const_iterator iter = diffNames.begin(), iEnd = diffNames.end(); iter != iEnd; ++iter) {
+      ss << " '" << *iter << "'\n";
     }
     if (diffNames.size() == 1U) {
       throw edm::Exception(errors::Configuration)
-        << "Illegal parameter found in configuration.  The parameter is named:\n" 
-        << ss.str()
-        << "You could be trying to use a parameter name that is not\n"
-        << "allowed for this plugin or it could be misspelled.\n";
-    }
-    else {
+          << "Illegal parameter found in configuration.  The parameter is named:\n"
+          << ss.str() << "You could be trying to use a parameter name that is not\n"
+          << "allowed for this plugin or it could be misspelled.\n";
+    } else {
       throw edm::Exception(errors::Configuration)
-        << "Illegal parameters found in configuration.  The parameters are named:\n" 
-        << ss.str()
-        << "You could be trying to use parameter names that are not\n"
-        << "allowed for this plugin or they could be misspelled.\n";
+          << "Illegal parameters found in configuration.  The parameters are named:\n"
+          << ss.str() << "You could be trying to use parameter names that are not\n"
+          << "allowed for this plugin or they could be misspelled.\n";
     }
   }
 
-  void
-  ParameterSetDescription::writeNode(SetDescriptionEntry const& entry,
-                                     std::ostream & os,
-                                     bool & startWithComma,
-                                     int indentation,
-                                     bool & wroteSomething) {
+  void ParameterSetDescription::writeNode(
+      SetDescriptionEntry const& entry, std::ostream& os, bool& startWithComma, int indentation, bool& wroteSomething) {
     if (entry.writeToCfi()) {
       entry.node()->writeCfi(os, startWithComma, indentation, wroteSomething);
     }
   }
 
-  void
-  ParameterSetDescription::printNode(SetDescriptionEntry const& entry,
-                                     std::ostream & os,
-                                     DocFormatHelper & dfh) {
+  void ParameterSetDescription::printNode(SetDescriptionEntry const& entry, std::ostream& os, DocFormatHelper& dfh) {
     if (dfh.pass() < 2) {
       entry.node()->print(os, entry.optional(), entry.writeToCfi(), dfh);
-    }
-    else {
+    } else {
       entry.node()->printNestedContent(os, entry.optional(), dfh);
     }
   }
 
-  void
-  ParameterSetDescription::
-  throwIfLabelsAlreadyUsed(std::set<std::string> const& nodeLabels) {
-
+  void ParameterSetDescription::throwIfLabelsAlreadyUsed(std::set<std::string> const& nodeLabels) {
     std::set<std::string> duplicateLabels;
     std::insert_iterator<std::set<std::string> > insertIter(duplicateLabels, duplicateLabels.begin());
-    std::set_intersection(nodeLabels.begin(), nodeLabels.end(),
-                          usedLabels_.begin(), usedLabels_.end(),
-                          insertIter);
+    std::set_intersection(nodeLabels.begin(), nodeLabels.end(), usedLabels_.begin(), usedLabels_.end(), insertIter);
     if (duplicateLabels.empty()) {
       usedLabels_.insert(nodeLabels.begin(), nodeLabels.end());
-    }
-    else {
-
+    } else {
       std::stringstream ss;
-      for (std::set<std::string>::const_iterator iter = duplicateLabels.begin(),
-	                                         iEnd = duplicateLabels.end();
+      for (std::set<std::string>::const_iterator iter = duplicateLabels.begin(), iEnd = duplicateLabels.end();
            iter != iEnd;
            ++iter) {
-        ss << " \"" << *iter <<  "\"\n";
+        ss << " \"" << *iter << "\"\n";
       }
-      throw edm::Exception(errors::LogicError)
-        << "Labels used in different nodes of a ParameterSetDescription\n"
-        << "must be unique.  The following duplicate labels were detected:\n"
-        << ss.str()
-        << "\n";
+      throw edm::Exception(errors::LogicError) << "Labels used in different nodes of a ParameterSetDescription\n"
+                                               << "must be unique.  The following duplicate labels were detected:\n"
+                                               << ss.str() << "\n";
     }
   }
 
-  void
-  ParameterSetDescription::
-  throwIfWildcardCollision(std::set<ParameterTypes> const& nodeParameterTypes,
-                           std::set<ParameterTypes> const& nodeWildcardTypes) {
-
+  void ParameterSetDescription::throwIfWildcardCollision(std::set<ParameterTypes> const& nodeParameterTypes,
+                                                         std::set<ParameterTypes> const& nodeWildcardTypes) {
     // 1. Check that the new wildcard types do not collide with the existing
     // parameter types.
     // 2. Check that the new parameter types do not collide with the existing
@@ -340,54 +265,50 @@ namespace edm {
     // types and the new wildcard types before passing the sets to this function.
 
     if (!nodeWildcardTypes.empty()) {
-
       std::set<ParameterTypes> duplicateTypes1;
       std::insert_iterator<std::set<ParameterTypes> > insertIter1(duplicateTypes1, duplicateTypes1.begin());
-      std::set_intersection(typesUsedForParameters_.begin(), typesUsedForParameters_.end(),
-                            nodeWildcardTypes.begin(), nodeWildcardTypes.end(),
+      std::set_intersection(typesUsedForParameters_.begin(),
+                            typesUsedForParameters_.end(),
+                            nodeWildcardTypes.begin(),
+                            nodeWildcardTypes.end(),
                             insertIter1);
 
       if (!duplicateTypes1.empty()) {
-
         std::stringstream ss;
-        for (std::set<ParameterTypes>::const_iterator iter = duplicateTypes1.begin(),
-	                                              iEnd = duplicateTypes1.end();
+        for (std::set<ParameterTypes>::const_iterator iter = duplicateTypes1.begin(), iEnd = duplicateTypes1.end();
              iter != iEnd;
              ++iter) {
-          ss << " \"" << parameterTypeEnumToString(*iter) <<  "\"\n";
+          ss << " \"" << parameterTypeEnumToString(*iter) << "\"\n";
         }
         throw edm::Exception(errors::LogicError)
-          << "Within a ParameterSetDescription, the type used for a wildcard must\n"
-          << "not be the same as the type used for other parameters. This rule\n"
-          << "is violated for the following types:\n"
-          << ss.str()
-          << "\n";
+            << "Within a ParameterSetDescription, the type used for a wildcard must\n"
+            << "not be the same as the type used for other parameters. This rule\n"
+            << "is violated for the following types:\n"
+            << ss.str() << "\n";
       }
     }
 
     if (!typesUsedForWildcards_.empty()) {
-
       std::set<ParameterTypes> duplicateTypes2;
       std::insert_iterator<std::set<ParameterTypes> > insertIter2(duplicateTypes2, duplicateTypes2.begin());
-      std::set_intersection(typesUsedForWildcards_.begin(), typesUsedForWildcards_.end(),
-                            nodeParameterTypes.begin(), nodeParameterTypes.end(),
+      std::set_intersection(typesUsedForWildcards_.begin(),
+                            typesUsedForWildcards_.end(),
+                            nodeParameterTypes.begin(),
+                            nodeParameterTypes.end(),
                             insertIter2);
 
       if (!duplicateTypes2.empty()) {
-
         std::stringstream ss;
-        for (std::set<ParameterTypes>::const_iterator iter = duplicateTypes2.begin(),
-	                                              iEnd = duplicateTypes2.end();
+        for (std::set<ParameterTypes>::const_iterator iter = duplicateTypes2.begin(), iEnd = duplicateTypes2.end();
              iter != iEnd;
              ++iter) {
-          ss << " \"" << parameterTypeEnumToString(*iter) <<  "\"\n";
+          ss << " \"" << parameterTypeEnumToString(*iter) << "\"\n";
         }
         throw edm::Exception(errors::LogicError)
-          << "Within a ParameterSetDescription, the type used for a wildcard must\n"
-          << "not be the same as the type used for other parameters. This rule is\n"
-          << "violated for the following types :\n"
-          << ss.str()
-          << "\n";
+            << "Within a ParameterSetDescription, the type used for a wildcard must\n"
+            << "not be the same as the type used for other parameters. This rule is\n"
+            << "violated for the following types :\n"
+            << ss.str() << "\n";
       }
     }
 
@@ -395,12 +316,11 @@ namespace edm {
     typesUsedForWildcards_.insert(nodeWildcardTypes.begin(), nodeWildcardTypes.end());
   }
 
-  ParameterDescriptionNode*
-  ParameterSetDescription::
-  ifExists(ParameterDescriptionNode const& node1,
-           ParameterDescriptionNode const& node2,
-           bool optional, bool writeToCfi) {
+  ParameterDescriptionNode* ParameterSetDescription::ifExists(ParameterDescriptionNode const& node1,
+                                                              ParameterDescriptionNode const& node2,
+                                                              bool optional,
+                                                              bool writeToCfi) {
     std::unique_ptr<ParameterDescriptionNode> pdIfExists = std::make_unique<IfExistsDescription>(node1, node2);
     return addNode(std::move(pdIfExists), optional, writeToCfi);
   }
-}
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/ParameterSetDescriptionFillerBase.cc b/FWCore/ParameterSet/src/ParameterSetDescriptionFillerBase.cc
index d0f210000a1a3..1dd130f4b33f1 100644
--- a/FWCore/ParameterSet/src/ParameterSetDescriptionFillerBase.cc
+++ b/FWCore/ParameterSet/src/ParameterSetDescriptionFillerBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     ParameterSet
 // Class  :     ParameterSetDescriptionFillerBase
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -15,7 +15,6 @@
 // user include files
 #include "FWCore/ParameterSet/interface/ParameterSetDescriptionFillerBase.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -59,10 +58,8 @@ const std::string edm::ParameterSetDescriptionFillerBase::kExtendedBaseForLimite
 //    // do actual copying here;
 // }
 namespace edm {
-ParameterSetDescriptionFillerBase::~ParameterSetDescriptionFillerBase()
-{
-}
-}
+  ParameterSetDescriptionFillerBase::~ParameterSetDescriptionFillerBase() {}
+}  // namespace edm
 //
 // assignment operators
 //
diff --git a/FWCore/ParameterSet/src/ParameterSetDescriptionFillerPluginFactory.cc b/FWCore/ParameterSet/src/ParameterSetDescriptionFillerPluginFactory.cc
index 4d8a78cb869dc..57fbf0ca2a3d3 100644
--- a/FWCore/ParameterSet/src/ParameterSetDescriptionFillerPluginFactory.cc
+++ b/FWCore/ParameterSet/src/ParameterSetDescriptionFillerPluginFactory.cc
@@ -2,7 +2,7 @@
 //
 // Package:     ParameterSet
 // Class  :     ParameterSetDescriptionFillerPluginFactory
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -15,8 +15,8 @@
 // user include files
 #include "FWCore/ParameterSet/interface/ParameterSetDescriptionFillerPluginFactory.h"
 
-
 //
 // constants, enums and typedefs
 //
-EDM_REGISTER_PLUGINFACTORY(edm::ParameterSetDescriptionFillerPluginFactory,"CMS EDM Framework ParameterSet Description");
+EDM_REGISTER_PLUGINFACTORY(edm::ParameterSetDescriptionFillerPluginFactory,
+                           "CMS EDM Framework ParameterSet Description");
diff --git a/FWCore/ParameterSet/src/ParameterSetDescriptionTraits.cc b/FWCore/ParameterSet/src/ParameterSetDescriptionTraits.cc
index 4e533526af052..d49bf379b5423 100644
--- a/FWCore/ParameterSet/src/ParameterSetDescriptionTraits.cc
+++ b/FWCore/ParameterSet/src/ParameterSetDescriptionTraits.cc
@@ -7,7 +7,5 @@ namespace edm {
     return new ParameterSetDescription(*p);
   }
 
-  void value_ptr_traits<ParameterSetDescription>::destroy(ParameterSetDescription* p) {
-    delete p;
-  } 
-}
+  void value_ptr_traits<ParameterSetDescription>::destroy(ParameterSetDescription* p) { delete p; }
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/ParameterSetEntry.cc b/FWCore/ParameterSet/src/ParameterSetEntry.cc
index 188d5e8482edd..100a67098b047 100644
--- a/FWCore/ParameterSet/src/ParameterSetEntry.cc
+++ b/FWCore/ParameterSet/src/ParameterSetEntry.cc
@@ -8,70 +8,49 @@
 #include <iostream>
 namespace edm {
 
-  ParameterSetEntry::ParameterSetEntry()
-  : isTracked_(false),
-    thePSet_(nullptr),
-    theID_()
-  {
-  }
+  ParameterSetEntry::ParameterSetEntry() : isTracked_(false), thePSet_(nullptr), theID_() {}
 
   ParameterSetEntry::ParameterSetEntry(ParameterSet const& pset, bool isTracked)
-  : isTracked_(isTracked),
-    thePSet_(new ParameterSet(pset)),
-    theID_()
-  {
+      : isTracked_(isTracked), thePSet_(new ParameterSet(pset)), theID_() {
     if (pset.isRegistered()) {
       theID_ = pset.id();
     }
   }
 
   ParameterSetEntry::ParameterSetEntry(ParameterSetID const& id, bool isTracked)
-  : isTracked_(isTracked),
-    thePSet_(),
-    theID_(id)
-  {
-  }
+      : isTracked_(isTracked), thePSet_(), theID_(id) {}
 
-  ParameterSetEntry::ParameterSetEntry(std::string const& rep)
-  : isTracked_(rep[0] == '+'),
-    thePSet_(),
-    theID_()
-  {
+  ParameterSetEntry::ParameterSetEntry(std::string const& rep) : isTracked_(rep[0] == '+'), thePSet_(), theID_() {
     assert(rep[0] == '+' || rep[0] == '-');
     assert(rep[2] == '(');
-    assert(rep[rep.size()-1] == ')');
-    ParameterSetID newID(std::string(rep.begin()+3, rep.end()-1) );
+    assert(rep[rep.size() - 1] == ')');
+    ParameterSetID newID(std::string(rep.begin() + 3, rep.end() - 1));
     theID_.swap(newID);
   }
-    
-  void
-  ParameterSetEntry::toString(std::string& result) const {
+
+  void ParameterSetEntry::toString(std::string& result) const {
     result += isTracked() ? "+Q(" : "-Q(";
     if (!theID_.isValid()) {
-      throw edm::Exception(edm::errors::LogicError)
-        << "ParameterSet::toString() called prematurely\n"
-        << "before ParameterSet::registerIt() has been called\n"
-        << "for all nested parameter sets\n";
+      throw edm::Exception(edm::errors::LogicError) << "ParameterSet::toString() called prematurely\n"
+                                                    << "before ParameterSet::registerIt() has been called\n"
+                                                    << "for all nested parameter sets\n";
     }
     theID_.toString(result);
     result += ')';
   }
 
-  void
-  ParameterSetEntry::toDigest(cms::Digest &digest) const {
+  void ParameterSetEntry::toDigest(cms::Digest& digest) const {
     digest.append(isTracked() ? "+Q(" : "-Q(", 3);
     if (!theID_.isValid()) {
-      throw edm::Exception(edm::errors::LogicError)
-        << "ParameterSet::toString() called prematurely\n"
-        << "before ParameterSet::registerIt() has been called\n"
-        << "for all nested parameter sets\n";
+      throw edm::Exception(edm::errors::LogicError) << "ParameterSet::toString() called prematurely\n"
+                                                    << "before ParameterSet::registerIt() has been called\n"
+                                                    << "for all nested parameter sets\n";
     }
     theID_.toDigest(digest);
     digest.append(")", 1);
   }
 
-  std::string
-  ParameterSetEntry::toString() const {
+  std::string ParameterSetEntry::toString() const {
     std::string result;
     toString(result);
     return result;
@@ -88,10 +67,10 @@ namespace edm {
   }
 
   void ParameterSetEntry::fillPSet() const {
-    if(nullptr == thePSet_.load()) {
+    if (nullptr == thePSet_.load()) {
       auto tmp = std::make_unique<ParameterSet>(getParameterSet(theID_));
       ParameterSet* expected = nullptr;
-      if(thePSet_.compare_exchange_strong(expected, tmp.get())) {
+      if (thePSet_.compare_exchange_strong(expected, tmp.get())) {
         // thePSet_ was equal to nullptr and now is equal to tmp.get()
         tmp.release();
       }
@@ -105,15 +84,13 @@ namespace edm {
 
   std::string ParameterSetEntry::dump(unsigned int indent) const {
     std::ostringstream os;
-    const char* trackiness = (isTracked()?"tracked":"untracked");
-    os << "PSet "<<trackiness<<" = (" << pset().dump(indent) << ")";
+    const char* trackiness = (isTracked() ? "tracked" : "untracked");
+    os << "PSet " << trackiness << " = (" << pset().dump(indent) << ")";
     return os.str();
   }
 
-  std::ostream & operator<<(std::ostream & os, ParameterSetEntry const& psetEntry) {
+  std::ostream& operator<<(std::ostream& os, ParameterSetEntry const& psetEntry) {
     os << psetEntry.dump();
     return os;
   }
-}
-
-
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/ParameterSwitchBase.cc b/FWCore/ParameterSet/src/ParameterSwitchBase.cc
index 0d2f106f22cd2..09cfb13cd4bd2 100644
--- a/FWCore/ParameterSet/src/ParameterSwitchBase.cc
+++ b/FWCore/ParameterSet/src/ParameterSwitchBase.cc
@@ -10,94 +10,74 @@
 
 namespace edm {
 
-  ParameterSwitchBase::~ParameterSwitchBase() { }
+  ParameterSwitchBase::~ParameterSwitchBase() {}
 
-  void
-  ParameterSwitchBase::
-  throwDuplicateCaseValues(std::string const& switchLabel) const {
-    throw Exception(errors::LogicError)
-      << "When adding a ParameterSwitch to a ParameterSetDescription the values\n"
-      << "associated with the different cases must be unique.  Duplicate\n"
-      << "values were found for the switch with label: \"" << switchLabel
-      << "\"\n";
+  void ParameterSwitchBase::throwDuplicateCaseValues(std::string const& switchLabel) const {
+    throw Exception(errors::LogicError) << "When adding a ParameterSwitch to a ParameterSetDescription the values\n"
+                                        << "associated with the different cases must be unique.  Duplicate\n"
+                                        << "values were found for the switch with label: \"" << switchLabel << "\"\n";
   }
 
-  void
-  ParameterSwitchBase::
-  insertAndCheckLabels(std::string const& switchLabel,
-                       std::set<std::string>& usedLabels,
-                       std::set<std::string>& labels) const {
-
-    std::pair<std::set<std::string>::iterator,bool> status = labels.insert(switchLabel);
-    if(status.second == false) {
+  void ParameterSwitchBase::insertAndCheckLabels(std::string const& switchLabel,
+                                                 std::set<std::string>& usedLabels,
+                                                 std::set<std::string>& labels) const {
+    std::pair<std::set<std::string>::iterator, bool> status = labels.insert(switchLabel);
+    if (status.second == false) {
       throw Exception(errors::LogicError)
-        << "The label used for the switch parameter in a ParameterSetDescription\n"
-        << "must be different from the labels used in the associated cases.  The following\n"
-        << "duplicate label was found: \"" << switchLabel << "\"\n";
+          << "The label used for the switch parameter in a ParameterSetDescription\n"
+          << "must be different from the labels used in the associated cases.  The following\n"
+          << "duplicate label was found: \"" << switchLabel << "\"\n";
     }
     usedLabels.insert(labels.begin(), labels.end());
   }
 
-  void
-  ParameterSwitchBase::
-  insertAndCheckTypes(ParameterTypes switchType,
-                      std::set<ParameterTypes> const& caseParameterTypes,
-                      std::set<ParameterTypes> const& caseWildcardTypes,
-                      std::set<ParameterTypes>& parameterTypes,
-                      std::set<ParameterTypes>& wildcardTypes) const {
-
-    if(caseWildcardTypes.find(switchType) != caseWildcardTypes.end()) {
+  void ParameterSwitchBase::insertAndCheckTypes(ParameterTypes switchType,
+                                                std::set<ParameterTypes> const& caseParameterTypes,
+                                                std::set<ParameterTypes> const& caseWildcardTypes,
+                                                std::set<ParameterTypes>& parameterTypes,
+                                                std::set<ParameterTypes>& wildcardTypes) const {
+    if (caseWildcardTypes.find(switchType) != caseWildcardTypes.end()) {
       throw Exception(errors::LogicError)
-        << "The type used for the switch parameter in a ParameterSetDescription\n"
-        << "must be different from the types used for wildcards in the associated cases.  The following\n"
-        << "duplicate type was found: \"" << parameterTypeEnumToString(switchType) << "\"\n";
+          << "The type used for the switch parameter in a ParameterSetDescription\n"
+          << "must be different from the types used for wildcards in the associated cases.  The following\n"
+          << "duplicate type was found: \"" << parameterTypeEnumToString(switchType) << "\"\n";
     }
     parameterTypes.insert(switchType);
     parameterTypes.insert(caseParameterTypes.begin(), caseParameterTypes.end());
     wildcardTypes.insert(caseWildcardTypes.begin(), caseWildcardTypes.end());
   }
 
-  void
-  ParameterSwitchBase::
-  throwNoCaseForDefault(std::string const& switchLabel) const {
+  void ParameterSwitchBase::throwNoCaseForDefault(std::string const& switchLabel) const {
     throw Exception(errors::LogicError)
-      << "The default value used for the switch parameter in a ParameterSetDescription\n"
-      << "must match the value used to select one of the associated cases.  This is not\n"
-      << "true for the switch named \"" << switchLabel << "\"\n";
+        << "The default value used for the switch parameter in a ParameterSetDescription\n"
+        << "must match the value used to select one of the associated cases.  This is not\n"
+        << "true for the switch named \"" << switchLabel << "\"\n";
   }
 
-  void
-  ParameterSwitchBase::
-  throwNoCaseForSwitchValue(std::string const& message) const {
-    throw Exception(errors::Configuration)
-      << message;
+  void ParameterSwitchBase::throwNoCaseForSwitchValue(std::string const& message) const {
+    throw Exception(errors::Configuration) << message;
   }
 
-  void
-  ParameterSwitchBase::
-  printBase(std::ostream& os,
-            bool optional,
-            bool writeToCfi,
-            DocFormatHelper& dfh,
-            std::string const& switchLabel,
-            bool isTracked,
-            std::string const& typeString) const {
-
-    if(dfh.pass() == 0) {
+  void ParameterSwitchBase::printBase(std::ostream& os,
+                                      bool optional,
+                                      bool writeToCfi,
+                                      DocFormatHelper& dfh,
+                                      std::string const& switchLabel,
+                                      bool isTracked,
+                                      std::string const& typeString) const {
+    if (dfh.pass() == 0) {
       dfh.setAtLeast1(switchLabel.size() + 9U);
-      if(isTracked) {
+      if (isTracked) {
         dfh.setAtLeast2(typeString.size());
       } else {
         dfh.setAtLeast2(typeString.size() + 10U);
       }
       dfh.setAtLeast3(8U);
     }
-    if(dfh.pass() == 1) {
-
+    if (dfh.pass() == 1) {
       dfh.indent(os);
 
-      if(dfh.brief()) {
-
+      if (dfh.brief()) {
         std::stringstream ss;
         ss << switchLabel << " (switch)";
         std::ios::fmtflags oldFlags = os.flags();
@@ -105,7 +85,7 @@ namespace edm {
         os << " ";
 
         os << std::setw(dfh.column2());
-        if(isTracked) {
+        if (isTracked) {
           os << typeString;
         } else {
           std::stringstream ss1;
@@ -114,10 +94,13 @@ namespace edm {
         }
 
         os << " " << std::setw(dfh.column3());
-        if(optional)  os << "optional";
-        else  os << "";
+        if (optional)
+          os << "optional";
+        else
+          os << "";
 
-        if(!writeToCfi) os << " (do not write to cfi)";
+        if (!writeToCfi)
+          os << " (do not write to cfi)";
 
         os << " see Section " << dfh.section() << "." << dfh.counter() << "\n";
         os.flags(oldFlags);
@@ -128,43 +111,36 @@ namespace edm {
 
         dfh.indent2(os);
         os << "type: ";
-        if(!isTracked) os << "untracked ";
+        if (!isTracked)
+          os << "untracked ";
         os << typeString << " ";
 
-        if(optional)  os << "optional";
+        if (optional)
+          os << "optional";
 
-        if(!writeToCfi) os << " (do not write to cfi)";
+        if (!writeToCfi)
+          os << " (do not write to cfi)";
         os << "\n";
 
         dfh.indent2(os);
         os << "see Section " << dfh.section() << "." << dfh.counter() << "\n";
 
-        if(!comment().empty()) {
-          DocFormatHelper::wrapAndPrintText(os,
-                                            comment(),
-                                            dfh.startColumn2(),
-                                            dfh.commentWidth());
+        if (!comment().empty()) {
+          DocFormatHelper::wrapAndPrintText(os, comment(), dfh.startColumn2(), dfh.commentWidth());
         }
         os << "\n";
       }
     }
   }
 
-  bool
-  ParameterSwitchBase::
-  hasNestedContent_() const {
-    return true;
-  }
-
-  void
-  ParameterSwitchBase::
-  printNestedContentBase(std::ostream& os,
-                         DocFormatHelper& dfh,
-                         DocFormatHelper& new_dfh,
-                         std::string const& switchLabel) const {
+  bool ParameterSwitchBase::hasNestedContent_() const { return true; }
 
+  void ParameterSwitchBase::printNestedContentBase(std::ostream& os,
+                                                   DocFormatHelper& dfh,
+                                                   DocFormatHelper& new_dfh,
+                                                   std::string const& switchLabel) const {
     int indentation = dfh.indentation();
-    if(dfh.parent() != DocFormatHelper::TOP) {
+    if (dfh.parent() != DocFormatHelper::TOP) {
       indentation -= DocFormatHelper::offsetSectionContent();
     }
 
@@ -173,16 +149,16 @@ namespace edm {
     std::string newSection = ss.str();
 
     printSpaces(os, indentation);
-    os << "Section " << newSection
-       << " " << switchLabel << " (switch):\n";
+    os << "Section " << newSection << " " << switchLabel << " (switch):\n";
 
-    if(!dfh.brief()) {
+    if (!dfh.brief()) {
       printSpaces(os, indentation);
       os << "The value of \"" << switchLabel << "\" controls which other parameters\n";
       printSpaces(os, indentation);
       os << "are required or allowed to be in the PSet.\n";
     }
-    if(!dfh.brief()) os << "\n";
+    if (!dfh.brief())
+      os << "\n";
 
     new_dfh.init();
     new_dfh.setSection(newSection);
@@ -190,79 +166,66 @@ namespace edm {
     new_dfh.setParent(DocFormatHelper::OTHER);
   }
 
-
-  void
-  ParameterSwitchBase::
-  printCase(std::pair<bool, value_ptr<ParameterDescriptionNode> > const& p,
-            std::ostream& os,
-            bool /*optional*/,
-            DocFormatHelper& dfh,
-            std::string const& switchLabel) {
-    if(dfh.pass() == 0) {
+  void ParameterSwitchBase::printCase(std::pair<bool, value_ptr<ParameterDescriptionNode> > const& p,
+                                      std::ostream& os,
+                                      bool /*optional*/,
+                                      DocFormatHelper& dfh,
+                                      std::string const& switchLabel) {
+    if (dfh.pass() == 0) {
       p.second->print(os, false, true, dfh);
     }
-    if(dfh.pass() == 1) {
+    if (dfh.pass() == 1) {
       dfh.indent(os);
       os << "if " << switchLabel << " = ";
-      if(p.first) os << "True";
-      else os << "False";
+      if (p.first)
+        os << "True";
+      else
+        os << "False";
       os << "\n";
       p.second->print(os, false, true, dfh);
     }
-    if(dfh.pass() == 2) {
+    if (dfh.pass() == 2) {
       p.second->printNestedContent(os, false, dfh);
     }
   }
 
-  void
-  ParameterSwitchBase::
-  printCase(std::pair<int, value_ptr<ParameterDescriptionNode> > const& p,
-            std::ostream& os,
-            bool /*optional*/,
-            DocFormatHelper& dfh,
-            std::string const& switchLabel) {
-    if(dfh.pass() == 0) {
+  void ParameterSwitchBase::printCase(std::pair<int, value_ptr<ParameterDescriptionNode> > const& p,
+                                      std::ostream& os,
+                                      bool /*optional*/,
+                                      DocFormatHelper& dfh,
+                                      std::string const& switchLabel) {
+    if (dfh.pass() == 0) {
       p.second->print(os, false, true, dfh);
     }
-    if(dfh.pass() == 1) {
+    if (dfh.pass() == 1) {
       dfh.indent(os);
       os << "if " << switchLabel << " = " << p.first << "\n";
       p.second->print(os, false, true, dfh);
     }
-    if(dfh.pass() == 2) {
+    if (dfh.pass() == 2) {
       p.second->printNestedContent(os, false, dfh);
     }
   }
 
-  void
-  ParameterSwitchBase::
-  printCase(std::pair<std::string, value_ptr<ParameterDescriptionNode> > const& p,
-            std::ostream& os,
-            bool /*optional*/,
-            DocFormatHelper& dfh,
-            std::string const& switchLabel) {
-    if(dfh.pass() == 0) {
+  void ParameterSwitchBase::printCase(std::pair<std::string, value_ptr<ParameterDescriptionNode> > const& p,
+                                      std::ostream& os,
+                                      bool /*optional*/,
+                                      DocFormatHelper& dfh,
+                                      std::string const& switchLabel) {
+    if (dfh.pass() == 0) {
       p.second->print(os, false, true, dfh);
     }
-    if(dfh.pass() == 1) {
+    if (dfh.pass() == 1) {
       dfh.indent(os);
       os << "if " << switchLabel << " = \"" << p.first << "\"\n";
       p.second->print(os, false, true, dfh);
     }
-    if(dfh.pass() == 2) {
+    if (dfh.pass() == 2) {
       p.second->printNestedContent(os, false, dfh);
     }
   }
 
-  bool
-  ParameterSwitchBase::
-  partiallyExists_(ParameterSet const& pset) const {
-    return exists(pset);
-  }
+  bool ParameterSwitchBase::partiallyExists_(ParameterSet const& pset) const { return exists(pset); }
 
-  int
-  ParameterSwitchBase::
-  howManyXORSubNodesExist_(ParameterSet const& pset) const {
-    return exists(pset) ? 1 : 0;
-  }
-}
+  int ParameterSwitchBase::howManyXORSubNodesExist_(ParameterSet const& pset) const { return exists(pset) ? 1 : 0; }
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/ParameterWildcard.cc b/FWCore/ParameterSet/src/ParameterWildcard.cc
index 49fcfaff4276c..80f86c15890f9 100644
--- a/FWCore/ParameterSet/src/ParameterWildcard.cc
+++ b/FWCore/ParameterSet/src/ParameterWildcard.cc
@@ -11,94 +11,82 @@
 
 namespace edm {
 
-  ParameterWildcard<ParameterSetDescription>::
-  ParameterWildcard(std::string const& pattern, WildcardValidationCriteria criteria, bool isTracked) :
-    ParameterWildcardBase(k_PSet, isTracked, criteria),
-    psetDesc_() {
+  ParameterWildcard<ParameterSetDescription>::ParameterWildcard(std::string const& pattern,
+                                                                WildcardValidationCriteria criteria,
+                                                                bool isTracked)
+      : ParameterWildcardBase(k_PSet, isTracked, criteria), psetDesc_() {
     throwIfInvalidPattern(pattern);
   }
 
-  ParameterWildcard<ParameterSetDescription>::
-  ParameterWildcard(char const* pattern, WildcardValidationCriteria criteria, bool isTracked) :
-    ParameterWildcardBase(k_PSet, isTracked, criteria),
-    psetDesc_() {
+  ParameterWildcard<ParameterSetDescription>::ParameterWildcard(char const* pattern,
+                                                                WildcardValidationCriteria criteria,
+                                                                bool isTracked)
+      : ParameterWildcardBase(k_PSet, isTracked, criteria), psetDesc_() {
     throwIfInvalidPattern(pattern);
   }
 
-  ParameterWildcard<ParameterSetDescription>::
-  ParameterWildcard(std::string const& pattern, WildcardValidationCriteria criteria, bool isTracked, ParameterSetDescription const& desc) :
-    ParameterWildcardBase(k_PSet, isTracked, criteria),
-    psetDesc_(new ParameterSetDescription(desc)) {
+  ParameterWildcard<ParameterSetDescription>::ParameterWildcard(std::string const& pattern,
+                                                                WildcardValidationCriteria criteria,
+                                                                bool isTracked,
+                                                                ParameterSetDescription const& desc)
+      : ParameterWildcardBase(k_PSet, isTracked, criteria), psetDesc_(new ParameterSetDescription(desc)) {
     throwIfInvalidPattern(pattern);
   }
 
-
-  ParameterWildcard<ParameterSetDescription>::
-  ParameterWildcard(char const* pattern, WildcardValidationCriteria criteria, bool isTracked, ParameterSetDescription const& desc) :
-    ParameterWildcardBase(k_PSet, isTracked, criteria),
-    psetDesc_(new ParameterSetDescription(desc)) {
+  ParameterWildcard<ParameterSetDescription>::ParameterWildcard(char const* pattern,
+                                                                WildcardValidationCriteria criteria,
+                                                                bool isTracked,
+                                                                ParameterSetDescription const& desc)
+      : ParameterWildcardBase(k_PSet, isTracked, criteria), psetDesc_(new ParameterSetDescription(desc)) {
     throwIfInvalidPattern(pattern);
   }
 
+  ParameterWildcard<ParameterSetDescription>::~ParameterWildcard() {}
 
-  ParameterWildcard<ParameterSetDescription>::
-  ~ParameterWildcard() { }
-
-  ParameterDescriptionNode*
-  ParameterWildcard<ParameterSetDescription>::
-  clone() const {
+  ParameterDescriptionNode* ParameterWildcard<ParameterSetDescription>::clone() const {
     return new ParameterWildcard(*this);
   }
 
-  void
-  ParameterWildcard<ParameterSetDescription>::
-  validate_(ParameterSet& pset,
-            std::set<std::string>& validatedLabels,
-            bool optional) const {
-
-    std::vector<std::string> parameterNames  = pset.getParameterNamesForType<ParameterSet>(isTracked());
+  void ParameterWildcard<ParameterSetDescription>::validate_(ParameterSet& pset,
+                                                             std::set<std::string>& validatedLabels,
+                                                             bool optional) const {
+    std::vector<std::string> parameterNames = pset.getParameterNamesForType<ParameterSet>(isTracked());
     validateMatchingNames(parameterNames, validatedLabels, optional);
 
-    if(psetDesc_) {
+    if (psetDesc_) {
       for_all(parameterNames,
               std::bind(&ParameterWildcard<ParameterSetDescription>::validateDescription,
-                          this,
-                          std::placeholders::_1,
-                          std::ref(pset)));
+                        this,
+                        std::placeholders::_1,
+                        std::ref(pset)));
     }
   }
 
-  void
-  ParameterWildcard<ParameterSetDescription>::
-  validateDescription(std::string const& parameterName,
-                      ParameterSet& pset) const {
+  void ParameterWildcard<ParameterSetDescription>::validateDescription(std::string const& parameterName,
+                                                                       ParameterSet& pset) const {
     ParameterSet* containedPSet = pset.getPSetForUpdate(parameterName);
     psetDesc_->validate(*containedPSet);
   }
 
-  bool
-  ParameterWildcard<ParameterSetDescription>::
-  hasNestedContent_() const {
-    if(psetDesc_) return true;
+  bool ParameterWildcard<ParameterSetDescription>::hasNestedContent_() const {
+    if (psetDesc_)
+      return true;
     return false;
   }
 
-  void
-  ParameterWildcard<ParameterSetDescription>::
-  printNestedContent_(std::ostream& os,
-                      bool /*optional*/,
-                      DocFormatHelper& dfh) const {
-
+  void ParameterWildcard<ParameterSetDescription>::printNestedContent_(std::ostream& os,
+                                                                       bool /*optional*/,
+                                                                       DocFormatHelper& dfh) const {
     int indentation = dfh.indentation();
-    if(dfh.parent() != DocFormatHelper::TOP) {
+    if (dfh.parent() != DocFormatHelper::TOP) {
       indentation -= DocFormatHelper::offsetSectionContent();
     }
 
     printSpaces(os, indentation);
-    os << "Section " << dfh.section() << "." << dfh.counter()
-       << " description of PSet matching wildcard:";
+    os << "Section " << dfh.section() << "." << dfh.counter() << " description of PSet matching wildcard:";
     os << "\n";
-    if(!dfh.brief()) os << "\n";
+    if (!dfh.brief())
+      os << "\n";
 
     std::stringstream ss;
     ss << dfh.section() << "." << dfh.counter();
@@ -112,104 +100,90 @@ namespace edm {
     psetDesc_->print(os, new_dfh);
   }
 
-  bool
-  ParameterWildcard<ParameterSetDescription>::
-  exists_(ParameterSet const& pset) const {
-
-    if(criteria() == RequireZeroOrMore) return true;
+  bool ParameterWildcard<ParameterSetDescription>::exists_(ParameterSet const& pset) const {
+    if (criteria() == RequireZeroOrMore)
+      return true;
 
-    std::vector<std::string> parameterNames  = pset.getParameterNamesForType<ParameterSet>(isTracked());
+    std::vector<std::string> parameterNames = pset.getParameterNamesForType<ParameterSet>(isTracked());
 
-    if(criteria() == RequireAtLeastOne) return !parameterNames.empty();
+    if (criteria() == RequireAtLeastOne)
+      return !parameterNames.empty();
     return parameterNames.size() == 1U;
   }
 
-// -------------------------------------------------------------------------
+  // -------------------------------------------------------------------------
 
-  ParameterWildcard<std::vector<ParameterSet> >::
-  ParameterWildcard(std::string const& pattern, WildcardValidationCriteria criteria, bool isTracked) :
-    ParameterWildcardBase(k_VPSet, isTracked, criteria),
-    psetDesc_() {
+  ParameterWildcard<std::vector<ParameterSet> >::ParameterWildcard(std::string const& pattern,
+                                                                   WildcardValidationCriteria criteria,
+                                                                   bool isTracked)
+      : ParameterWildcardBase(k_VPSet, isTracked, criteria), psetDesc_() {
     throwIfInvalidPattern(pattern);
   }
 
-  ParameterWildcard<std::vector<ParameterSet> >::
-  ParameterWildcard(char const* pattern, WildcardValidationCriteria criteria, bool isTracked) :
-    ParameterWildcardBase(k_VPSet, isTracked, criteria),
-    psetDesc_() {
+  ParameterWildcard<std::vector<ParameterSet> >::ParameterWildcard(char const* pattern,
+                                                                   WildcardValidationCriteria criteria,
+                                                                   bool isTracked)
+      : ParameterWildcardBase(k_VPSet, isTracked, criteria), psetDesc_() {
     throwIfInvalidPattern(pattern);
   }
 
-  ParameterWildcard<std::vector<ParameterSet> >::
-  ParameterWildcard(std::string const& pattern, WildcardValidationCriteria criteria, bool isTracked,
-                    ParameterSetDescription const& desc) :
-    ParameterWildcardBase(k_VPSet, isTracked, criteria),
-    psetDesc_(new ParameterSetDescription(desc)) {
+  ParameterWildcard<std::vector<ParameterSet> >::ParameterWildcard(std::string const& pattern,
+                                                                   WildcardValidationCriteria criteria,
+                                                                   bool isTracked,
+                                                                   ParameterSetDescription const& desc)
+      : ParameterWildcardBase(k_VPSet, isTracked, criteria), psetDesc_(new ParameterSetDescription(desc)) {
     throwIfInvalidPattern(pattern);
   }
 
-
-  ParameterWildcard<std::vector<ParameterSet> >::
-  ParameterWildcard(char const* pattern, WildcardValidationCriteria criteria, bool isTracked,
-                    ParameterSetDescription const& desc) :
-    ParameterWildcardBase(k_VPSet, isTracked, criteria),
-    psetDesc_(new ParameterSetDescription(desc)) {
+  ParameterWildcard<std::vector<ParameterSet> >::ParameterWildcard(char const* pattern,
+                                                                   WildcardValidationCriteria criteria,
+                                                                   bool isTracked,
+                                                                   ParameterSetDescription const& desc)
+      : ParameterWildcardBase(k_VPSet, isTracked, criteria), psetDesc_(new ParameterSetDescription(desc)) {
     throwIfInvalidPattern(pattern);
   }
 
+  ParameterWildcard<std::vector<ParameterSet> >::~ParameterWildcard() {}
 
-  ParameterWildcard<std::vector<ParameterSet> >::
-  ~ParameterWildcard() { }
-
-  ParameterDescriptionNode*
-  ParameterWildcard<std::vector<ParameterSet> >::
-  clone() const {
+  ParameterDescriptionNode* ParameterWildcard<std::vector<ParameterSet> >::clone() const {
     return new ParameterWildcard(*this);
   }
 
-  void
-  ParameterWildcard<std::vector<ParameterSet> >::
-  validate_(ParameterSet& pset,
-            std::set<std::string>& validatedLabels,
-            bool optional) const {
-
-    std::vector<std::string> parameterNames  = pset.getParameterNamesForType<std::vector<ParameterSet> >(isTracked());
+  void ParameterWildcard<std::vector<ParameterSet> >::validate_(ParameterSet& pset,
+                                                                std::set<std::string>& validatedLabels,
+                                                                bool optional) const {
+    std::vector<std::string> parameterNames = pset.getParameterNamesForType<std::vector<ParameterSet> >(isTracked());
     validateMatchingNames(parameterNames, validatedLabels, optional);
 
-    if(psetDesc_) {
+    if (psetDesc_) {
       for_all(parameterNames,
               std::bind(&ParameterWildcard<std::vector<ParameterSet> >::validatePSetVector,
-                          this,
-                          std::placeholders::_1,
-                          std::ref(pset)));
+                        this,
+                        std::placeholders::_1,
+                        std::ref(pset)));
     }
   }
 
-  void
-  ParameterWildcard<std::vector<ParameterSet> >::
-  validatePSetVector(std::string const& parameterName, ParameterSet& pset) const {
+  void ParameterWildcard<std::vector<ParameterSet> >::validatePSetVector(std::string const& parameterName,
+                                                                         ParameterSet& pset) const {
     VParameterSetEntry* vpsetEntry = pset.getPSetVectorForUpdate(parameterName);
     assert(vpsetEntry);
-    for(unsigned i = 0; i < vpsetEntry->size(); ++i) {
+    for (unsigned i = 0; i < vpsetEntry->size(); ++i) {
       psetDesc_->validate(vpsetEntry->psetInVector(i));
     }
   }
 
-  bool
-  ParameterWildcard<std::vector<ParameterSet> >::
-  hasNestedContent_() const {
-    if(psetDesc_) return true;
+  bool ParameterWildcard<std::vector<ParameterSet> >::hasNestedContent_() const {
+    if (psetDesc_)
+      return true;
     return false;
   }
 
-  void
-  ParameterWildcard<std::vector<ParameterSet> >::
-  printNestedContent_(std::ostream& os,
-                      bool /*optional*/,
-                      DocFormatHelper& dfh) const {
-
+  void ParameterWildcard<std::vector<ParameterSet> >::printNestedContent_(std::ostream& os,
+                                                                          bool /*optional*/,
+                                                                          DocFormatHelper& dfh) const {
     int indentation = dfh.indentation();
-    if(dfh.parent() != DocFormatHelper::TOP) {
+    if (dfh.parent() != DocFormatHelper::TOP) {
       indentation -= DocFormatHelper::offsetSectionContent();
     }
 
@@ -217,7 +191,8 @@ namespace edm {
     os << "Section " << dfh.section() << "." << dfh.counter()
        << " description used to validate all PSets which are in the VPSet matching the wildcard:";
     os << "\n";
-    if(!dfh.brief()) os << "\n";
+    if (!dfh.brief())
+      os << "\n";
 
     std::stringstream ss;
     ss << dfh.section() << "." << dfh.counter();
@@ -231,15 +206,14 @@ namespace edm {
     psetDesc_->print(os, new_dfh);
   }
 
-  bool
-  ParameterWildcard<std::vector<ParameterSet> >::
-  exists_(ParameterSet const& pset) const {
-
-    if(criteria() == RequireZeroOrMore) return true;
+  bool ParameterWildcard<std::vector<ParameterSet> >::exists_(ParameterSet const& pset) const {
+    if (criteria() == RequireZeroOrMore)
+      return true;
 
-    std::vector<std::string> parameterNames  = pset.getParameterNamesForType<std::vector<ParameterSet> >(isTracked());
+    std::vector<std::string> parameterNames = pset.getParameterNamesForType<std::vector<ParameterSet> >(isTracked());
 
-    if(criteria() == RequireAtLeastOne) return !parameterNames.empty();
+    if (criteria() == RequireAtLeastOne)
+      return !parameterNames.empty();
     return parameterNames.size() == 1U;
   }
-}
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/ParameterWildcardBase.cc b/FWCore/ParameterSet/src/ParameterWildcardBase.cc
index a3472a3c12d5b..dcbe552225dcf 100644
--- a/FWCore/ParameterSet/src/ParameterWildcardBase.cc
+++ b/FWCore/ParameterSet/src/ParameterWildcardBase.cc
@@ -10,91 +10,74 @@
 
 namespace edm {
 
-  ParameterWildcardBase::~ParameterWildcardBase() { }
+  ParameterWildcardBase::~ParameterWildcardBase() {}
 
   ParameterWildcardBase::ParameterWildcardBase(ParameterTypes iType,
                                                bool isTracked,
                                                WildcardValidationCriteria criteria)
-    :type_(iType),
-     isTracked_(isTracked),
-     criteria_(criteria) {
-  }
+      : type_(iType), isTracked_(isTracked), criteria_(criteria) {}
 
-  void
-  ParameterWildcardBase::
-  throwIfInvalidPattern(char const* pattern) const {
+  void ParameterWildcardBase::throwIfInvalidPattern(char const* pattern) const {
     std::string sPattern(pattern);
     throwIfInvalidPattern(sPattern);
   }
 
-  void
-  ParameterWildcardBase::
-  throwIfInvalidPattern(std::string const& pattern) const {
-    if(pattern != std::string("*")) {
+  void ParameterWildcardBase::throwIfInvalidPattern(std::string const& pattern) const {
+    if (pattern != std::string("*")) {
       throw Exception(errors::Configuration)
-        << "Currently, the only supported wildcard in ParameterSetDescriptions\n"
-        << "is the single character \"*\".  The configuration contains a wildcard\n"
-        << "with pattern \"" << pattern << "\" and type \"" << parameterTypeEnumToString(type()) << "\"\n"
-        << "At some future date, globbing or regular expression support may be added\n"
-        << "if there are any requests for it from users.\n";
+          << "Currently, the only supported wildcard in ParameterSetDescriptions\n"
+          << "is the single character \"*\".  The configuration contains a wildcard\n"
+          << "with pattern \"" << pattern << "\" and type \"" << parameterTypeEnumToString(type()) << "\"\n"
+          << "At some future date, globbing or regular expression support may be added\n"
+          << "if there are any requests for it from users.\n";
     }
   }
 
-  void
-  ParameterWildcardBase::
-  validateMatchingNames(std::vector<std::string> const& matchingNames,
-                        std::set<std::string>& validatedLabels,
-                        bool optional) const {
+  void ParameterWildcardBase::validateMatchingNames(std::vector<std::string> const& matchingNames,
+                                                    std::set<std::string>& validatedLabels,
+                                                    bool optional) const {
     validatedLabels.insert(matchingNames.begin(), matchingNames.end());
-    if(criteria_ == RequireZeroOrMore) return;
-    if(criteria_ == RequireAtLeastOne && matchingNames.empty() && !optional) {
+    if (criteria_ == RequireZeroOrMore)
+      return;
+    if (criteria_ == RequireAtLeastOne && matchingNames.empty() && !optional) {
       throw Exception(errors::Configuration)
-        << "Parameter wildcard of type \"" << parameterTypeEnumToString(type()) << "\" requires "
-        << "at least one match\n"
-        << "and there are no parameters in the configuration matching\n"
-        << "that type.\n";
-    } else if(criteria_ == RequireExactlyOne) {
-      if((matchingNames.empty() && !optional) ||
-           matchingNames.size() > 1U) {
+          << "Parameter wildcard of type \"" << parameterTypeEnumToString(type()) << "\" requires "
+          << "at least one match\n"
+          << "and there are no parameters in the configuration matching\n"
+          << "that type.\n";
+    } else if (criteria_ == RequireExactlyOne) {
+      if ((matchingNames.empty() && !optional) || matchingNames.size() > 1U) {
         throw Exception(errors::Configuration)
-          << "Parameter wildcard of type \"" << parameterTypeEnumToString(type()) << "\" requires\n"
-          << "exactly one match and there are " << matchingNames.size() << " matching parameters\n"
-          << "in the configuration.\n";
+            << "Parameter wildcard of type \"" << parameterTypeEnumToString(type()) << "\" requires\n"
+            << "exactly one match and there are " << matchingNames.size() << " matching parameters\n"
+            << "in the configuration.\n";
       }
     }
   }
 
-  void
-  ParameterWildcardBase::
-  checkAndGetLabelsAndTypes_(std::set<std::string>& /*usedLabels*/,
-                             std::set<ParameterTypes>& /*parameterTypes*/,
-                             std::set<ParameterTypes>& wildcardTypes) const {
+  void ParameterWildcardBase::checkAndGetLabelsAndTypes_(std::set<std::string>& /*usedLabels*/,
+                                                         std::set<ParameterTypes>& /*parameterTypes*/,
+                                                         std::set<ParameterTypes>& wildcardTypes) const {
     wildcardTypes.insert(type());
   }
 
-  void
-  ParameterWildcardBase::
-  print_(std::ostream& os,
-         bool optional,
-         bool /*writeToCfi*/,
-         DocFormatHelper& dfh) const {
-    if(dfh.pass() == 0) {
+  void ParameterWildcardBase::print_(std::ostream& os, bool optional, bool /*writeToCfi*/, DocFormatHelper& dfh) const {
+    if (dfh.pass() == 0) {
       dfh.setAtLeast1(11U);
-      if(isTracked()) {
+      if (isTracked()) {
         dfh.setAtLeast2(parameterTypeEnumToString(type()).size());
       } else {
         dfh.setAtLeast2(parameterTypeEnumToString(type()).size() + 10U);
       }
       dfh.setAtLeast3(8U);
     } else {
-
-      if(dfh.brief()) {
-
+      if (dfh.brief()) {
         dfh.indent(os);
         std::ios::fmtflags oldFlags = os.flags();
-        os << std::left << std::setw(dfh.column1()) << "wildcard: *" << " ";
+        os << std::left << std::setw(dfh.column1()) << "wildcard: *"
+           << " ";
 
-        if(isTracked()) {
+        if (isTracked()) {
           os << std::setw(dfh.column2()) << parameterTypeEnumToString(type());
         } else {
           std::stringstream ss;
@@ -104,21 +87,22 @@ namespace edm {
 
         os << " ";
         os << std::setw(dfh.column3());
-        if(optional) os << "optional";
-        else os << "";
+        if (optional)
+          os << "optional";
+        else
+          os << "";
 
-        if(criteria() == RequireZeroOrMore) {
+        if (criteria() == RequireZeroOrMore) {
           os << " (require zero or more)";
-        } else if(criteria() == RequireAtLeastOne) {
+        } else if (criteria() == RequireAtLeastOne) {
           os << " (require at least one)";
-        } else if(criteria() == RequireExactlyOne) {
+        } else if (criteria() == RequireExactlyOne) {
           os << " (require exactly one)";
         }
         os << "\n";
-        if(hasNestedContent()) {
+        if (hasNestedContent()) {
           dfh.indent(os);
-          os << "  (see Section " << dfh.section()
-             << "." << dfh.counter() << ")\n";
+          os << "  (see Section " << dfh.section() << "." << dfh.counter() << ")\n";
         }
         os.flags(oldFlags);
       } else {
@@ -129,58 +113,48 @@ namespace edm {
 
         dfh.indent2(os);
         os << "type: ";
-        if(isTracked()) {
+        if (isTracked()) {
           os << parameterTypeEnumToString(type());
         } else {
           os << "untracked " << parameterTypeEnumToString(type());
         }
 
-        if(optional)  os << " optional";
+        if (optional)
+          os << " optional";
         os << "\n";
 
         dfh.indent2(os);
         os << "criteria: ";
-        if(criteria() == RequireZeroOrMore) os << "require zero or more";
-        else if(criteria() == RequireAtLeastOne) os << "require at least one";
-        else if(criteria() == RequireExactlyOne) os << "require exactly one";
+        if (criteria() == RequireZeroOrMore)
+          os << "require zero or more";
+        else if (criteria() == RequireAtLeastOne)
+          os << "require at least one";
+        else if (criteria() == RequireExactlyOne)
+          os << "require exactly one";
         os << "\n";
 
-        if(hasNestedContent()) {
+        if (hasNestedContent()) {
           dfh.indent2(os);
-          os << "(see Section " << dfh.section()
-             << "." << dfh.counter() << ")\n";
+          os << "(see Section " << dfh.section() << "." << dfh.counter() << ")\n";
         }
 
-        if(!comment().empty()) {
-          DocFormatHelper::wrapAndPrintText(os,
-                                            comment(),
-                                            dfh.startColumn2(),
-                                            dfh.commentWidth());
+        if (!comment().empty()) {
+          DocFormatHelper::wrapAndPrintText(os, comment(), dfh.startColumn2(), dfh.commentWidth());
         }
         os << "\n";
       }
     }
   }
 
-  void
-  ParameterWildcardBase::
-  writeCfi_(std::ostream&,
-            bool& /*startWithComma*/,
-            int /*indentation*/,
-            bool& /*wroteSomething*/) const {
+  void ParameterWildcardBase::writeCfi_(std::ostream&,
+                                        bool& /*startWithComma*/,
+                                        int /*indentation*/,
+                                        bool& /*wroteSomething*/) const {
     // Until we implement default labels and values there is nothing
     // to do here.
   }
 
-  bool
-  ParameterWildcardBase::
-  partiallyExists_(ParameterSet const& pset) const {
-    return exists(pset);
-  }
+  bool ParameterWildcardBase::partiallyExists_(ParameterSet const& pset) const { return exists(pset); }
 
-  int
-  ParameterWildcardBase::
-  howManyXORSubNodesExist_(ParameterSet const& pset) const {
-    return exists(pset) ? 1 : 0;
-  }
-}
+  int ParameterWildcardBase::howManyXORSubNodesExist_(ParameterSet const& pset) const { return exists(pset) ? 1 : 0; }
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/ProcessDesc.cc b/FWCore/ParameterSet/src/ProcessDesc.cc
index 9fbdd7d208763..635d16202bf7b 100644
--- a/FWCore/ParameterSet/src/ProcessDesc.cc
+++ b/FWCore/ParameterSet/src/ProcessDesc.cc
@@ -4,22 +4,17 @@
 
 namespace edm {
 
-  ProcessDesc::ProcessDesc(std::shared_ptr<ParameterSet> pset) :
-      pset_(pset), services_(pset_->popVParameterSet(std::string("services"))) {
-  }
+  ProcessDesc::ProcessDesc(std::shared_ptr<ParameterSet> pset)
+      : pset_(pset), services_(pset_->popVParameterSet(std::string("services"))) {}
 
-  ProcessDesc::ProcessDesc(std::unique_ptr<ParameterSet> pset) :
-    pset_(std::move(pset)), services_(pset_->popVParameterSet(std::string("services"))) {
-  }
+  ProcessDesc::ProcessDesc(std::unique_ptr<ParameterSet> pset)
+      : pset_(std::move(pset)), services_(pset_->popVParameterSet(std::string("services"))) {}
 
-  ProcessDesc::ProcessDesc(std::string const&) :
-      pset_(new ParameterSet),
-      services_{} {
-    throw Exception(errors::Configuration,"Old config strings no longer accepted");
+  ProcessDesc::ProcessDesc(std::string const&) : pset_(new ParameterSet), services_{} {
+    throw Exception(errors::Configuration, "Old config strings no longer accepted");
   }
 
-  ProcessDesc::~ProcessDesc() {
-  }
+  ProcessDesc::~ProcessDesc() {}
 
   void ProcessDesc::addService(ParameterSet& pset) {
     // The standard services should be initialized first.
@@ -33,7 +28,7 @@ namespace edm {
   }
 
   void ProcessDesc::addDefaultService(std::string const& service) {
-    for(auto it = services_.begin(), itEnd = services_.end(); it != itEnd; ++it) {
+    for (auto it = services_.begin(), itEnd = services_.end(); it != itEnd; ++it) {
       std::string name = it->getParameter<std::string>("@service_type");
       if (name == service) {
         // Use the configured service.  Don't add a default.
@@ -48,7 +43,7 @@ namespace edm {
   }
 
   void ProcessDesc::addForcedService(std::string const& service) {
-    for(auto it = services_.begin(), itEnd = services_.end(); it != itEnd; ++it) {
+    for (auto it = services_.begin(), itEnd = services_.end(); it != itEnd; ++it) {
       std::string name = it->getParameter<std::string>("@service_type");
       if (name == service) {
         // Remove the configured service before adding the default.
@@ -62,11 +57,11 @@ namespace edm {
   void ProcessDesc::addServices(std::vector<std::string> const& defaultServices,
                                 std::vector<std::string> const& forcedServices) {
     // Add the default services to services_.
-    for(auto const& service: defaultServices) {
+    for (auto const& service : defaultServices) {
       addDefaultService(service);
     }
     // Add the forced services to services_.
-    for(auto const& service : forcedServices) {
+    for (auto const& service : forcedServices) {
       addForcedService(service);
     }
   }
@@ -78,4 +73,4 @@ namespace edm {
     }
     return out;
   }
-} // namespace edm
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/Registry.cc b/FWCore/ParameterSet/src/Registry.cc
index 433af12ad44ba..b5b0d8d92502d 100644
--- a/FWCore/ParameterSet/src/Registry.cc
+++ b/FWCore/ParameterSet/src/Registry.cc
@@ -9,45 +9,37 @@
 namespace edm {
   namespace pset {
 
-    Registry*
-    Registry::instance() {
+    Registry* Registry::instance() {
       CMS_THREAD_SAFE static Registry s_reg;
       return &s_reg;
     }
-    
-    bool
-    Registry::getMapped(key_type const& k, value_type& result) const {
+
+    bool Registry::getMapped(key_type const& k, value_type& result) const {
       auto it = m_map.find(k);
       bool found = it != m_map.end();
-      if(found) {
+      if (found) {
         result = it->second;
       }
       return found;
     }
-    
-    Registry::value_type const*
-    Registry::getMapped(key_type const& k) const {
+
+    Registry::value_type const* Registry::getMapped(key_type const& k) const {
       auto it = m_map.find(k);
       bool found = it != m_map.end();
-      return found? &(it->second) : static_cast<value_type const*>(nullptr);
+      return found ? &(it->second) : static_cast<value_type const*>(nullptr);
     }
-  
-    bool
-    Registry::insertMapped(value_type const& v, bool forceUpdate) {
-      auto wasAdded = m_map.insert(std::make_pair(v.id(),v));
-      if(forceUpdate and not wasAdded.second) {
+
+    bool Registry::insertMapped(value_type const& v, bool forceUpdate) {
+      auto wasAdded = m_map.insert(std::make_pair(v.id(), v));
+      if (forceUpdate and not wasAdded.second) {
         wasAdded.first->second = v;
       }
       return wasAdded.second;
     }
-    
-    void
-    Registry::clear() {
-      m_map.clear();
-    }
 
-    void
-    Registry::fillMap(regmap_type& fillme) const {
+    void Registry::clear() { m_map.clear(); }
+
+    void Registry::fillMap(regmap_type& fillme) const {
       fillme.clear();
       // Note: The tracked part is in the registry.
       for (auto const& item : m_map) {
@@ -55,12 +47,11 @@ namespace edm {
       }
     }
 
-    void
-    Registry::print(std::ostream& os) const {
+    void Registry::print(std::ostream& os) const {
       os << "Registry with " << size() << " entries\n";
-      for(auto const& item : *this) {
+      for (auto const& item : *this) {
         os << item.first << " " << item.second << '\n';
       }
     }
-  } // namespace pset
-} // namespace edm
+  }  // namespace pset
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/VParameterSetEntry.cc b/FWCore/ParameterSet/src/VParameterSetEntry.cc
index e7ff058e401df..cb9fff8537642 100644
--- a/FWCore/ParameterSet/src/VParameterSetEntry.cc
+++ b/FWCore/ParameterSet/src/VParameterSetEntry.cc
@@ -9,29 +9,21 @@
 
 namespace edm {
 
-  VParameterSetEntry::VParameterSetEntry() :
-      tracked_(false),
-      theVPSet_(),
-      theIDs_() {
-  }
+  VParameterSetEntry::VParameterSetEntry() : tracked_(false), theVPSet_(), theIDs_() {}
 
-  VParameterSetEntry::VParameterSetEntry(std::vector<ParameterSet> const& vpset, bool isTracked) :
-      tracked_(isTracked),
-      theVPSet_(new std::vector<ParameterSet>),
-      theIDs_() {
+  VParameterSetEntry::VParameterSetEntry(std::vector<ParameterSet> const& vpset, bool isTracked)
+      : tracked_(isTracked), theVPSet_(new std::vector<ParameterSet>), theIDs_() {
     for (std::vector<ParameterSet>::const_iterator i = vpset.begin(), e = vpset.end(); i != e; ++i) {
       theVPSet_->push_back(*i);
     }
   }
 
-  VParameterSetEntry::VParameterSetEntry(std::string const& rep) :
-      tracked_(rep[0] == '+'),
-      theVPSet_(),
-      theIDs_(new std::vector<ParameterSetID>) {
+  VParameterSetEntry::VParameterSetEntry(std::string const& rep)
+      : tracked_(rep[0] == '+'), theVPSet_(), theIDs_(new std::vector<ParameterSetID>) {
     assert(rep[0] == '+' || rep[0] == '-');
     std::vector<std::string> temp;
     // need a substring that starts at the '{'
-    std::string bracketedRepr(rep.begin()+2, rep.end());
+    std::string bracketedRepr(rep.begin() + 2, rep.end());
     split(std::back_inserter(temp), bracketedRepr, '{', ',', '}');
     theIDs_->reserve(temp.size());
     for (std::vector<std::string>::const_iterator i = temp.begin(), e = temp.end(); i != e; ++i) {
@@ -39,8 +31,7 @@ namespace edm {
     }
   }
 
-  void
-  VParameterSetEntry::toString(std::string& result) const {
+  void VParameterSetEntry::toString(std::string& result) const {
     assert(theIDs_);
     result += tracked_ ? "+q" : "-q";
     result += '{';
@@ -54,8 +45,7 @@ namespace edm {
     result += '}';
   }
 
-  void
-  VParameterSetEntry::toDigest(cms::Digest &digest) const {
+  void VParameterSetEntry::toDigest(cms::Digest& digest) const {
     assert(theIDs_);
     digest.append(tracked_ ? "+q{" : "-q{", 3);
     bool started = false;
@@ -65,7 +55,7 @@ namespace edm {
       i->toDigest(digest);
       started = true;
     }
-    digest.append("}",1);
+    digest.append("}", 1);
   }
 
   std::string VParameterSetEntry::toString() const {
@@ -89,14 +79,14 @@ namespace edm {
   }
 
   void VParameterSetEntry::fillVPSet() const {
-    if(nullptr == theVPSet_.load()) {
+    if (nullptr == theVPSet_.load()) {
       auto tmp = std::make_unique<std::vector<ParameterSet>>();
       tmp->reserve(theIDs_->size());
       for (auto const& theID : *theIDs_) {
         tmp->push_back(getParameterSet(theID));
       }
       VParameterSet* expected = nullptr;
-      if(theVPSet_.compare_exchange_strong(expected, tmp.get())) {
+      if (theVPSet_.compare_exchange_strong(expected, tmp.get())) {
         // theVPSet_ was equal to nullptr and now is equal to tmp.get()
         tmp.release();
       }
@@ -112,13 +102,11 @@ namespace edm {
     return theVPSet_->at(i);
   }
 
-  std::vector<ParameterSet>::size_type VParameterSetEntry::size() const {
-    return vpset().size();
-  }
+  std::vector<ParameterSet>::size_type VParameterSetEntry::size() const { return vpset().size(); }
 
   void VParameterSetEntry::registerPsetsAndUpdateIDs() {
     fillVPSet();
-    theIDs_ = value_ptr<std::vector<ParameterSetID> >(new std::vector<ParameterSetID>);
+    theIDs_ = value_ptr<std::vector<ParameterSetID>>(new std::vector<ParameterSetID>);
     theIDs_->resize(theVPSet_->size());
     for (std::vector<ParameterSet>::iterator i = theVPSet_->begin(), e = theVPSet_->end(); i != e; ++i) {
       if (!i->isRegistered()) {
@@ -128,14 +116,14 @@ namespace edm {
     }
   }
 
-  std::string VParameterSetEntry::dump(unsigned int indent)  const {
+  std::string VParameterSetEntry::dump(unsigned int indent) const {
     std::string indentation(indent, ' ');
     std::ostringstream os;
     std::vector<ParameterSet> const& vps = vpset();
-    os << "VPSet "<<(isTracked()?"tracked":"untracked")<<" = ({" << std::endl;
+    os << "VPSet " << (isTracked() ? "tracked" : "untracked") << " = ({" << std::endl;
     std::string start;
     std::string const between(",\n");
-    for(std::vector<ParameterSet>::const_iterator i = vps.begin(), e = vps.end(); i != e; ++i) {
+    for (std::vector<ParameterSet>::const_iterator i = vps.begin(), e = vps.end(); i != e; ++i) {
       os << start << indentation << i->dump(indent);
       start = between;
     }
@@ -150,4 +138,4 @@ namespace edm {
     os << vpsetEntry.dump();
     return os;
   }
-}
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/XORGroupDescription.cc b/FWCore/ParameterSet/src/XORGroupDescription.cc
index c8e396d1d10b3..ebbebf462d105 100644
--- a/FWCore/ParameterSet/src/XORGroupDescription.cc
+++ b/FWCore/ParameterSet/src/XORGroupDescription.cc
@@ -8,40 +8,25 @@
 
 namespace edm {
 
-  XORGroupDescription::
-  XORGroupDescription(ParameterDescriptionNode const& node_left,
-                      ParameterDescriptionNode const& node_right) :
-    node_left_(node_left.clone()),
-    node_right_(node_right.clone()) {
-  }
-
-  XORGroupDescription::
-  XORGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
-                      ParameterDescriptionNode const& node_right) :
-    node_left_(std::move(node_left)),
-    node_right_(node_right.clone()) {
-  }
+  XORGroupDescription::XORGroupDescription(ParameterDescriptionNode const& node_left,
+                                           ParameterDescriptionNode const& node_right)
+      : node_left_(node_left.clone()), node_right_(node_right.clone()) {}
 
-  XORGroupDescription::
-  XORGroupDescription(ParameterDescriptionNode const& node_left,
-                      std::unique_ptr<ParameterDescriptionNode> node_right) :
-    node_left_(node_left.clone()),
-    node_right_(std::move(node_right)) {
-  }
+  XORGroupDescription::XORGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                           ParameterDescriptionNode const& node_right)
+      : node_left_(std::move(node_left)), node_right_(node_right.clone()) {}
 
-  XORGroupDescription::
-  XORGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
-                      std::unique_ptr<ParameterDescriptionNode> node_right) :
-    node_left_(std::move(node_left)),
-    node_right_(std::move(node_right)) {
-  }
+  XORGroupDescription::XORGroupDescription(ParameterDescriptionNode const& node_left,
+                                           std::unique_ptr<ParameterDescriptionNode> node_right)
+      : node_left_(node_left.clone()), node_right_(std::move(node_right)) {}
 
-  void
-  XORGroupDescription::
-  checkAndGetLabelsAndTypes_(std::set<std::string> & usedLabels,
-                             std::set<ParameterTypes> & parameterTypes,
-                             std::set<ParameterTypes> & wildcardTypes) const {
+  XORGroupDescription::XORGroupDescription(std::unique_ptr<ParameterDescriptionNode> node_left,
+                                           std::unique_ptr<ParameterDescriptionNode> node_right)
+      : node_left_(std::move(node_left)), node_right_(std::move(node_right)) {}
 
+  void XORGroupDescription::checkAndGetLabelsAndTypes_(std::set<std::string>& usedLabels,
+                                                       std::set<ParameterTypes>& parameterTypes,
+                                                       std::set<ParameterTypes>& wildcardTypes) const {
     std::set<std::string> labelsLeft;
     std::set<ParameterTypes> parameterTypesLeft;
     std::set<ParameterTypes> wildcardTypesLeft;
@@ -62,30 +47,24 @@ namespace edm {
     wildcardTypes.insert(wildcardTypesLeft.begin(), wildcardTypesLeft.end());
   }
 
-  void
-  XORGroupDescription::
-  validate_(ParameterSet & pset,
-            std::set<std::string> & validatedLabels,
-            bool optional) const {
-
+  void XORGroupDescription::validate_(ParameterSet& pset, std::set<std::string>& validatedLabels, bool optional) const {
     int nExistLeft = node_left_->howManyXORSubNodesExist(pset);
     int nExistRight = node_right_->howManyXORSubNodesExist(pset);
     int nTotal = nExistLeft + nExistRight;
 
-    if (nTotal == 0 && optional) return;
+    if (nTotal == 0 && optional)
+      return;
 
     if (nTotal > 1) {
       throwMoreThanOneParameter();
     }
 
     if (nExistLeft == 1) {
-      node_left_->validate(pset, validatedLabels, false);      
-    }
-    else if (nExistRight == 1) {
+      node_left_->validate(pset, validatedLabels, false);
+    } else if (nExistRight == 1) {
       node_right_->validate(pset, validatedLabels, false);
-    }
-    else if (nTotal == 0) {
-      node_left_->validate(pset, validatedLabels, false);      
+    } else if (nTotal == 0) {
+      node_left_->validate(pset, validatedLabels, false);
 
       // When missing parameters get inserted, both nodes could
       // be affected so we have to recheck both nodes.
@@ -99,22 +78,14 @@ namespace edm {
     }
   }
 
-  void
-  XORGroupDescription::
-  writeCfi_(std::ostream & os,
-            bool & startWithComma,
-            int indentation,
-            bool & wroteSomething) const {
+  void XORGroupDescription::writeCfi_(std::ostream& os,
+                                      bool& startWithComma,
+                                      int indentation,
+                                      bool& wroteSomething) const {
     node_left_->writeCfi(os, startWithComma, indentation, wroteSomething);
   }
 
-  void
-  XORGroupDescription::
-  print_(std::ostream & os,
-         bool optional,
-         bool writeToCfi,
-         DocFormatHelper & dfh) const {
-
+  void XORGroupDescription::print_(std::ostream& os, bool optional, bool writeToCfi, DocFormatHelper& dfh) const {
     if (dfh.parent() == DocFormatHelper::XOR) {
       dfh.decrementCounter();
       node_left_->print(os, false, true, dfh);
@@ -123,26 +94,27 @@ namespace edm {
     }
 
     if (dfh.pass() == 1) {
-
       dfh.indent(os);
       os << "XOR group:";
 
       if (dfh.brief()) {
+        if (optional)
+          os << " optional";
 
-        if (optional)  os << " optional";
-
-        if (!writeToCfi) os << " (do not write to cfi)";
+        if (!writeToCfi)
+          os << " (do not write to cfi)";
 
         os << " see Section " << dfh.section() << "." << dfh.counter() << "\n";
       }
       // not brief
       else {
-
         os << "\n";
         dfh.indent2(os);
 
-        if (optional)  os << "optional";
-        if (!writeToCfi) os << " (do not write to cfi)";
+        if (optional)
+          os << "optional";
+        if (!writeToCfi)
+          os << " (do not write to cfi)";
         if (optional || !writeToCfi) {
           os << "\n";
           dfh.indent2(os);
@@ -151,22 +123,14 @@ namespace edm {
         os << "see Section " << dfh.section() << "." << dfh.counter() << "\n";
 
         if (!comment().empty()) {
-          DocFormatHelper::wrapAndPrintText(os,
-                                            comment(),
-                                            dfh.startColumn2(),
-                                            dfh.commentWidth());
+          DocFormatHelper::wrapAndPrintText(os, comment(), dfh.startColumn2(), dfh.commentWidth());
         }
         os << "\n";
       }
     }
   }
 
-  void
-  XORGroupDescription::
-  printNestedContent_(std::ostream & os,
-                      bool optional,
-                      DocFormatHelper & dfh) const {
-
+  void XORGroupDescription::printNestedContent_(std::ostream& os, bool optional, DocFormatHelper& dfh) const {
     if (dfh.parent() == DocFormatHelper::XOR) {
       dfh.decrementCounter();
       node_left_->printNestedContent(os, false, dfh);
@@ -184,16 +148,15 @@ namespace edm {
     std::string newSection = ss.str();
 
     printSpaces(os, indentation);
-    os << "Section " << newSection
-       << " XOR group description:\n";
+    os << "Section " << newSection << " XOR group description:\n";
     printSpaces(os, indentation);
     if (optional) {
       os << "This optional XOR group requires exactly one or none of the following to be in the PSet\n";
-    }
-    else {
+    } else {
       os << "This XOR group requires exactly one of the following to be in the PSet\n";
     }
-    if (!dfh.brief()) os << "\n";
+    if (!dfh.brief())
+      os << "\n";
 
     DocFormatHelper new_dfh(dfh);
     new_dfh.init();
@@ -217,53 +180,39 @@ namespace edm {
     node_right_->printNestedContent(os, false, new_dfh);
   }
 
-  bool
-  XORGroupDescription::
-  exists_(ParameterSet const& pset) const {
-    int nTotal = node_left_->howManyXORSubNodesExist(pset) +
-                 node_right_->howManyXORSubNodesExist(pset);
+  bool XORGroupDescription::exists_(ParameterSet const& pset) const {
+    int nTotal = node_left_->howManyXORSubNodesExist(pset) + node_right_->howManyXORSubNodesExist(pset);
     return nTotal == 1;
   }
 
-  bool
-  XORGroupDescription::
-  partiallyExists_(ParameterSet const& pset) const {
-    return exists(pset);
-  }
+  bool XORGroupDescription::partiallyExists_(ParameterSet const& pset) const { return exists(pset); }
 
-  int
-  XORGroupDescription::
-  howManyXORSubNodesExist_(ParameterSet const& pset) const {
-    return node_left_->howManyXORSubNodesExist(pset) +
-           node_right_->howManyXORSubNodesExist(pset);
+  int XORGroupDescription::howManyXORSubNodesExist_(ParameterSet const& pset) const {
+    return node_left_->howManyXORSubNodesExist(pset) + node_right_->howManyXORSubNodesExist(pset);
   }
 
-  void
-  XORGroupDescription::
-  throwMoreThanOneParameter() const {
+  void XORGroupDescription::throwMoreThanOneParameter() const {
     // Need to expand this error message to print more information
     // I guess I need to print out the entire node structure of
     // of the xor node and all the nodes it contains.
     throw edm::Exception(errors::LogicError)
-      << "Exactly one parameter can exist in a ParameterSet from a list of\n"
-      << "parameters described by an \"xor\" operator in a ParameterSetDescription.\n"
-      << "This rule also applies in a more general sense to the other types\n"
-      << "of nodes that can appear within a ParameterSetDescription.  Only one\n"
-      << "can pass validation as \"existing\".\n";
+        << "Exactly one parameter can exist in a ParameterSet from a list of\n"
+        << "parameters described by an \"xor\" operator in a ParameterSetDescription.\n"
+        << "This rule also applies in a more general sense to the other types\n"
+        << "of nodes that can appear within a ParameterSetDescription.  Only one\n"
+        << "can pass validation as \"existing\".\n";
   }
 
-  void
-  XORGroupDescription::
-  throwAfterValidation() const {
+  void XORGroupDescription::throwAfterValidation() const {
     // Need to expand this error message to print more information
     // I guess I need to print out the entire node structure of
     // of the xor node and all the nodes it contains.
     throw edm::Exception(errors::LogicError)
-      << "Exactly one parameter can exist in a ParameterSet from a list of\n"
-      << "parameters described by an \"xor\" operator in a ParameterSetDescription.\n"
-      << "This rule also applies in a more general sense to the other types\n"
-      << "of nodes that can appear within a ParameterSetDescription.  Only one\n"
-      << "can pass validation as \"existing\".  This error has occurred after an\n"
-      << "attempt to insert missing parameters to fix the problem.\n";
+        << "Exactly one parameter can exist in a ParameterSet from a list of\n"
+        << "parameters described by an \"xor\" operator in a ParameterSetDescription.\n"
+        << "This rule also applies in a more general sense to the other types\n"
+        << "of nodes that can appear within a ParameterSetDescription.  Only one\n"
+        << "can pass validation as \"existing\".  This error has occurred after an\n"
+        << "attempt to insert missing parameters to fix the problem.\n";
   }
-}
+}  // namespace edm
diff --git a/FWCore/ParameterSet/src/types.cc b/FWCore/ParameterSet/src/types.cc
index f23c6d82805fb..c3e3f67018398 100644
--- a/FWCore/ParameterSet/src/types.cc
+++ b/FWCore/ParameterSet/src/types.cc
@@ -2,7 +2,6 @@
 // definition of type encoding/decoding functions
 // ----------------------------------------------------------------------
 
-
 // ----------------------------------------------------------------------
 // prerequisite source files and headers
 // ----------------------------------------------------------------------
@@ -25,1183 +24,1088 @@ using namespace edm;
 // utility functions
 // ----------------------------------------------------------------------
 
-static char
-  to_hex(unsigned int i) {
-  return i + (i < 10u ? '0' : ('A'-10));
-}
+static char to_hex(unsigned int i) { return i + (i < 10u ? '0' : ('A' - 10)); }
 
 // ----------------------------------------------------------------------
 
-static unsigned int
-  from_hex(char c) {
-  switch(c) {
-    case '0': case '1': case '2': case '3': case '4':
-    case '5': case '6': case '7': case '8': case '9':
+static unsigned int from_hex(char c) {
+  switch (c) {
+    case '0':
+    case '1':
+    case '2':
+    case '3':
+    case '4':
+    case '5':
+    case '6':
+    case '7':
+    case '8':
+    case '9':
       return c - '0';
-    case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
+    case 'a':
+    case 'b':
+    case 'c':
+    case 'd':
+    case 'e':
+    case 'f':
       return 10 + c - 'a';
-    case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
+    case 'A':
+    case 'B':
+    case 'C':
+    case 'D':
+    case 'E':
+    case 'F':
       return 10 + c - 'A';
     default:
       return 0;
   }
-} // from_hex()
+}  // from_hex()
 
-static void
-  append_hex_rep(std::string &s, unsigned int c) {
+static void append_hex_rep(std::string& s, unsigned int c) {
   s += to_hex(c / 16u);
   s += to_hex(c % 16u);
-} // append_hex_rep()
-
+}  // append_hex_rep()
 
 // ----------------------------------------------------------------------
 // Bool
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(bool& to, std::string const& from) {
-    if(from == "true") { to = true; return true; }
-    else if(from == "false") { to = false; return true; }
-    else {return false;}
-  } // decode to bool
+bool edm::decode(bool& to, std::string const& from) {
+  if (from == "true") {
+    to = true;
+    return true;
+  } else if (from == "false") {
+    to = false;
+    return true;
+  } else {
+    return false;
+  }
+}  // decode to bool
 
 // ----------------------------------------------------------------------
 
-  bool
-  edm::encode(std::string& to, bool from) {
-    to = from ? "true" : "false";
-    return true;
-  } // encode from bool
-
+bool edm::encode(std::string& to, bool from) {
+  to = from ? "true" : "false";
+  return true;
+}  // encode from bool
 
 // ----------------------------------------------------------------------
 // vBool
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(std::vector<bool>& to, std::string const& from) {
-    std::vector<std::string> temp;
-    if(!split(std::back_inserter(temp), from, '{', ',', '}')) {
-      return false;
-    }
+bool edm::decode(std::vector<bool>& to, std::string const& from) {
+  std::vector<std::string> temp;
+  if (!split(std::back_inserter(temp), from, '{', ',', '}')) {
+    return false;
+  }
 
-    to.clear();
-    for(std::vector<std::string>::const_iterator b = temp.begin()
-                                               , e = temp.end()
-        ; b != e; ++b) {
-      bool val = false;
-      if(!decode(val, *b)) {
-        return false;
-      }
-      to.push_back(val);
+  to.clear();
+  for (std::vector<std::string>::const_iterator b = temp.begin(), e = temp.end(); b != e; ++b) {
+    bool val = false;
+    if (!decode(val, *b)) {
+      return false;
     }
-    return true;
-  } // decode to vector<bool>
+    to.push_back(val);
+  }
+  return true;
+}  // decode to vector<bool>
 
 // ----------------------------------------------------------------------
 
-  bool
-  edm::encode(std::string& to, std::vector<bool> const& from) {
-    to = "{";
+bool edm::encode(std::string& to, std::vector<bool> const& from) {
+  to = "{";
 
-    std::string converted;
-    for(std::vector<bool>::const_iterator b = from.begin()
-                                         , e = from.end()
-       ; b != e; ++b) {
-      if(!encode(converted, *b)) {
-        return false;
-      }
-      if(b != from.begin()) {
-        to += ",";
-      }
-      to += converted;
+  std::string converted;
+  for (std::vector<bool>::const_iterator b = from.begin(), e = from.end(); b != e; ++b) {
+    if (!encode(converted, *b)) {
+      return false;
     }
-    to += '}';
-    return true;
-  } // encode from vector<bool>
-
+    if (b != from.begin()) {
+      to += ",";
+    }
+    to += converted;
+  }
+  to += '}';
+  return true;
+}  // encode from vector<bool>
 
 // ----------------------------------------------------------------------
 // Int32
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(int& to, std::string const& from) {
-    std::string::const_iterator b = from.begin()
-                              ,  e = from.end();
+bool edm::decode(int& to, std::string const& from) {
+  std::string::const_iterator b = from.begin(), e = from.end();
 
-    if(*b != '+' && *b != '-') {
-      return false;
-    }
-    int sign = (*b == '+') ? +1 : -1;
+  if (*b != '+' && *b != '-') {
+    return false;
+  }
+  int sign = (*b == '+') ? +1 : -1;
 
-    to = 0;
-    while(++b != e)  {
-      if(!std::isdigit(*b)) {
-        return false;
-      }
-      to = 10 * to + (*b - '0');
+  to = 0;
+  while (++b != e) {
+    if (!std::isdigit(*b)) {
+      return false;
     }
-    to *= sign;
+    to = 10 * to + (*b - '0');
+  }
+  to *= sign;
 
-    return true;
-  } // decode to int
+  return true;
+}  // decode to int
 
 // ----------------------------------------------------------------------
 
-  bool
-  edm::encode(std::string& to, int from) {
-    bool is_negative = (from < 0);
-    if(is_negative) {
-      from = -from; // TODO: work around this for most negative integer
-    }
-    to.clear();
-    do {
-      to = static_cast<char>(from % 10 + '0') + to;
-      from /= 10;
-    } while(from > 0);
-    to = (is_negative ? '-' : '+') + to;
+bool edm::encode(std::string& to, int from) {
+  bool is_negative = (from < 0);
+  if (is_negative) {
+    from = -from;  // TODO: work around this for most negative integer
+  }
+  to.clear();
+  do {
+    to = static_cast<char>(from % 10 + '0') + to;
+    from /= 10;
+  } while (from > 0);
+  to = (is_negative ? '-' : '+') + to;
 
-    return true;
-  } // encode from int
+  return true;
+}  // encode from int
 
 // ----------------------------------------------------------------------
 // Int64
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(long long& to, std::string const& from) {
-    std::string::const_iterator b = from.begin()
-                              , e = from.end();
+bool edm::decode(long long& to, std::string const& from) {
+  std::string::const_iterator b = from.begin(), e = from.end();
 
-    if(*b != '+' && *b != '-') {
-      return false;
-    }
-    int sign = (*b == '+') ? +1 : -1;
+  if (*b != '+' && *b != '-') {
+    return false;
+  }
+  int sign = (*b == '+') ? +1 : -1;
 
-    to = 0;
-    while(++b != e)  {
-      if(!std::isdigit(*b)) {
-        return false;
-      }
-      to = 10 * to + (*b - '0');
+  to = 0;
+  while (++b != e) {
+    if (!std::isdigit(*b)) {
+      return false;
     }
-    to *= sign;
+    to = 10 * to + (*b - '0');
+  }
+  to *= sign;
 
-    return true;
-  } // decode to int
+  return true;
+}  // decode to int
 
 // ----------------------------------------------------------------------
 
-  bool
-  edm::encode(std::string& to, long long from) {
-    bool is_negative = (from < 0);
-    if(is_negative) {
-      from = -from; // TODO: work around this for most negative integer
-    }
+bool edm::encode(std::string& to, long long from) {
+  bool is_negative = (from < 0);
+  if (is_negative) {
+    from = -from;  // TODO: work around this for most negative integer
+  }
 
-    to.clear();
-    do {
-      to = static_cast<char>(from % 10 + '0') + to;
-      from /= 10;
-    } while(from > 0);
-    to = (is_negative ? '-' : '+') + to;
+  to.clear();
+  do {
+    to = static_cast<char>(from % 10 + '0') + to;
+    from /= 10;
+  } while (from > 0);
+  to = (is_negative ? '-' : '+') + to;
 
-    return true;
-  } // encode from int
+  return true;
+}  // encode from int
 
 // ----------------------------------------------------------------------
 // vInt32
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(std::vector<int>& to, std::string const& from) {
-    std::vector<std::string> temp;
-    if(!split(std::back_inserter(temp), from, '{', ',', '}')) {
-      return false;
-    }
+bool edm::decode(std::vector<int>& to, std::string const& from) {
+  std::vector<std::string> temp;
+  if (!split(std::back_inserter(temp), from, '{', ',', '}')) {
+    return false;
+  }
 
-    to.clear();
-    for(std::vector<std::string>::const_iterator b = temp.begin()
-                                               , e = temp.end()
-        ; b != e; ++b) {
-      int val = 0;
-      if(!decode(val, *b)) {
-        return false;
-      }
-      to.push_back(val);
+  to.clear();
+  for (std::vector<std::string>::const_iterator b = temp.begin(), e = temp.end(); b != e; ++b) {
+    int val = 0;
+    if (!decode(val, *b)) {
+      return false;
     }
+    to.push_back(val);
+  }
 
-    return true;
-  } // decode to vector<int>
+  return true;
+}  // decode to vector<int>
 
 // ----------------------------------------------------------------------
 
-  bool
-  edm::encode(std::string& to, std::vector<int> const& from) {
-    to = "{";
+bool edm::encode(std::string& to, std::vector<int> const& from) {
+  to = "{";
 
-    std::string converted;
-    for(std::vector<int>::const_iterator b = from.begin()
-                                       , e = from.end()
-       ; b != e; ++b) {
-      if(!encode(converted, *b)) {
-        return false;
-      }
+  std::string converted;
+  for (std::vector<int>::const_iterator b = from.begin(), e = from.end(); b != e; ++b) {
+    if (!encode(converted, *b)) {
+      return false;
+    }
 
-      if(b != from.begin()) {
-        to += ",";
-      }
-      to += converted;
+    if (b != from.begin()) {
+      to += ",";
     }
+    to += converted;
+  }
 
-    to += '}';
-    return true;
-  } // encode from vector<int>
+  to += '}';
+  return true;
+}  // encode from vector<int>
 
 // ----------------------------------------------------------------------
 // vInt64
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(std::vector<long long>& to, std::string const& from) {
-    std::vector<std::string> temp;
-    if(!split(std::back_inserter(temp), from, '{', ',', '}')) {
+bool edm::decode(std::vector<long long>& to, std::string const& from) {
+  std::vector<std::string> temp;
+  if (!split(std::back_inserter(temp), from, '{', ',', '}')) {
+    return false;
+  }
+
+  to.clear();
+  for (std::vector<std::string>::const_iterator b = temp.begin(), e = temp.end(); b != e; ++b) {
+    long long val = 0LL;
+    if (!decode(val, *b)) {
       return false;
     }
+    to.push_back(val);
+  }
 
-    to.clear();
-    for(std::vector<std::string>::const_iterator b = temp.begin()
-                                               , e = temp.end()
-        ; b != e; ++b) {
-      long long val = 0LL;
-      if(!decode(val, *b)) {
-        return false;
-      }
-      to.push_back(val);
-    }
-
-    return true;
-  } // decode to vector<int>
+  return true;
+}  // decode to vector<int>
 
 // ----------------------------------------------------------------------
 
-  bool
-  edm::encode(std::string& to, std::vector<long long> const& from) {
-    to = "{";
+bool edm::encode(std::string& to, std::vector<long long> const& from) {
+  to = "{";
 
-    std::string converted;
-    for(std::vector<long long>::const_iterator b = from.begin()
-                                        , e = from.end()
-       ; b != e; ++b) {
-      if(!encode(converted, *b)) {
-        return false;
-      }
-      if(b != from.begin()) {
-        to += ",";
-      }
-      to += converted;
+  std::string converted;
+  for (std::vector<long long>::const_iterator b = from.begin(), e = from.end(); b != e; ++b) {
+    if (!encode(converted, *b)) {
+      return false;
     }
-    to += '}';
-    return true;
-  } // encode from vector<int>
+    if (b != from.begin()) {
+      to += ",";
+    }
+    to += converted;
+  }
+  to += '}';
+  return true;
+}  // encode from vector<int>
 
 // ----------------------------------------------------------------------
 // Uint32
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(unsigned int& to, std::string const& from) {
-    std::string::const_iterator b = from.begin()
-                              , e = from.end();
+bool edm::decode(unsigned int& to, std::string const& from) {
+  std::string::const_iterator b = from.begin(), e = from.end();
 
-    to = 0u;
-    for(; b != e; ++b) {
-      if(*b == 'u' || *b == 'U') {
-        return true;
-      }
-      if(!std::isdigit(*b)) {
-        return false;
-      }
-      to = 10u * to + (*b - '0');
+  to = 0u;
+  for (; b != e; ++b) {
+    if (*b == 'u' || *b == 'U') {
+      return true;
     }
-    return true;
-  } // decode to unsigned
+    if (!std::isdigit(*b)) {
+      return false;
+    }
+    to = 10u * to + (*b - '0');
+  }
+  return true;
+}  // decode to unsigned
 
 // ----------------------------------------------------------------------
 
-  bool
-  edm::encode(std::string& to, unsigned int from) {
-    to.clear();
-    do {
-      to = static_cast<char>(from % 10 + '0') + to;
-      from /= 10u;
-    }  while(from > 0u);
+bool edm::encode(std::string& to, unsigned int from) {
+  to.clear();
+  do {
+    to = static_cast<char>(from % 10 + '0') + to;
+    from /= 10u;
+  } while (from > 0u);
 
-    return true;
-  } // encode from unsigned
+  return true;
+}  // encode from unsigned
 
 // ----------------------------------------------------------------------
 // Uint64
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(unsigned long long& to, std::string const& from) {
-    std::string::const_iterator b = from.begin()
-                              , e = from.end();
-    to = 0u;
-    for(; b != e; ++b)  {
-      if(*b == 'u' || *b == 'U') {
-        return true;
-      }
-      if(!std::isdigit(*b)) {
-        return false;
-      }
-      to = 10u * to + (*b - '0');
+bool edm::decode(unsigned long long& to, std::string const& from) {
+  std::string::const_iterator b = from.begin(), e = from.end();
+  to = 0u;
+  for (; b != e; ++b) {
+    if (*b == 'u' || *b == 'U') {
+      return true;
     }
-    return true;
-  } // decode to unsigned
+    if (!std::isdigit(*b)) {
+      return false;
+    }
+    to = 10u * to + (*b - '0');
+  }
+  return true;
+}  // decode to unsigned
 
 // ----------------------------------------------------------------------
 
-  bool
-  edm::encode(std::string& to, unsigned long long from) {
-    to.clear();
-    do {
-      to = static_cast<char>(from % 10 + '0') + to;
-      from /= 10u;
-    }  while(from > 0u);
+bool edm::encode(std::string& to, unsigned long long from) {
+  to.clear();
+  do {
+    to = static_cast<char>(from % 10 + '0') + to;
+    from /= 10u;
+  } while (from > 0u);
 
-    return true;
-  } // encode from unsigned
+  return true;
+}  // encode from unsigned
 
 // ----------------------------------------------------------------------
 // vUint32
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(std::vector<unsigned int>& to, std::string const& from) {
-    std::vector<std::string> temp;
-    if(!split(std::back_inserter(temp), from, '{', ',', '}')) {
+bool edm::decode(std::vector<unsigned int>& to, std::string const& from) {
+  std::vector<std::string> temp;
+  if (!split(std::back_inserter(temp), from, '{', ',', '}')) {
+    return false;
+  }
+  to.clear();
+  for (std::vector<std::string>::const_iterator b = temp.begin(), e = temp.end(); b != e; ++b) {
+    unsigned int val = 0;
+    if (!decode(val, *b)) {
       return false;
     }
-    to.clear();
-    for(std::vector<std::string>::const_iterator b = temp.begin()
-                                               , e = temp.end()
-        ; b != e; ++b) {
-      unsigned int val = 0;
-      if(!decode(val, *b)) {
-        return false;
-      }
-      to.push_back(val);
-    }
+    to.push_back(val);
+  }
 
-    return true;
-  } // decode to vector<unsigned int>
+  return true;
+}  // decode to vector<unsigned int>
 
 // ----------------------------------------------------------------------
 
-  bool
-  edm::encode(std::string& to, std::vector<unsigned int> const& from) {
-    to = "{";
+bool edm::encode(std::string& to, std::vector<unsigned int> const& from) {
+  to = "{";
 
-    std::string converted;
-    for(std::vector<unsigned int>::const_iterator b = from.begin()
-                                             , e = from.end()
-       ; b != e; ++b) {
-      if(!encode(converted, *b)) {
-        return false;
-      }
-      if(b != from.begin()) {
-        to += ",";
-      }
-      to += converted;
+  std::string converted;
+  for (std::vector<unsigned int>::const_iterator b = from.begin(), e = from.end(); b != e; ++b) {
+    if (!encode(converted, *b)) {
+      return false;
     }
+    if (b != from.begin()) {
+      to += ",";
+    }
+    to += converted;
+  }
 
-    to += '}';
-    return true;
-  } // encode from vector<unsigned int>
+  to += '}';
+  return true;
+}  // encode from vector<unsigned int>
 
 // ----------------------------------------------------------------------
 // vUint64
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(std::vector<unsigned long long>& to, std::string const& from) {
-    std::vector<std::string> temp;
-    if(!split(std::back_inserter(temp), from, '{', ',', '}')) {
+bool edm::decode(std::vector<unsigned long long>& to, std::string const& from) {
+  std::vector<std::string> temp;
+  if (!split(std::back_inserter(temp), from, '{', ',', '}')) {
+    return false;
+  }
+  to.clear();
+  for (std::vector<std::string>::const_iterator b = temp.begin(), e = temp.end(); b != e; ++b) {
+    unsigned long long val = 0ULL;
+    if (!decode(val, *b)) {
       return false;
     }
-    to.clear();
-    for(std::vector<std::string>::const_iterator b = temp.begin()
-                                               ,  e = temp.end()
-        ; b != e; ++b) {
-      unsigned long long val = 0ULL;
-      if(!decode(val, *b)) {
-        return false;
-      }
-      to.push_back(val);
-    }
+    to.push_back(val);
+  }
 
-    return true;
-  } // decode to vector<unsigned int>
+  return true;
+}  // decode to vector<unsigned int>
 
 // ----------------------------------------------------------------------
 
-  bool
-  edm::encode(std::string& to, std::vector<unsigned long long> const& from) {
-    to = "{";
+bool edm::encode(std::string& to, std::vector<unsigned long long> const& from) {
+  to = "{";
 
-    std::string converted;
-    for(std::vector<unsigned long long>::const_iterator b = from.begin()
-                                             , e = from.end()
-       ; b != e; ++b) {
-      if(!encode(converted, *b)) {
-        return false;
-      }
-
-      if(b != from.begin()) {
-        to += ",";
-      }
-      to += converted;
+  std::string converted;
+  for (std::vector<unsigned long long>::const_iterator b = from.begin(), e = from.end(); b != e; ++b) {
+    if (!encode(converted, *b)) {
+      return false;
     }
 
-    to += '}';
-    return true;
-  } // encode from vector<unsigned int>
+    if (b != from.begin()) {
+      to += ",";
+    }
+    to += converted;
+  }
 
+  to += '}';
+  return true;
+}  // encode from vector<unsigned int>
 
 // ----------------------------------------------------------------------
 // Double
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(double& to, std::string const& from) {
-    if(from == "NaN") {
-      to = std::numeric_limits<double>::quiet_NaN();
-    } else if(from == "+inf" || from == "inf") {
-      to = std::numeric_limits<double>::has_infinity
-         ? std::numeric_limits<double>::infinity()
-         : std::numeric_limits<double>::max();
-    } else if(from == "-inf") {
-      to = std::numeric_limits<double>::has_infinity
-         ? -std::numeric_limits<double>::infinity()
-         : -std::numeric_limits<double>::max();
-    }
+bool edm::decode(double& to, std::string const& from) {
+  if (from == "NaN") {
+    to = std::numeric_limits<double>::quiet_NaN();
+  } else if (from == "+inf" || from == "inf") {
+    to = std::numeric_limits<double>::has_infinity ? std::numeric_limits<double>::infinity()
+                                                   : std::numeric_limits<double>::max();
+  } else if (from == "-inf") {
+    to = std::numeric_limits<double>::has_infinity ? -std::numeric_limits<double>::infinity()
+                                                   : -std::numeric_limits<double>::max();
+  }
 
-    else  {
-      try  {
-        // std::cerr << "from:" << from << std::endl;
-        to = boost::lexical_cast<double>(from);
-        // std::cerr << "to:" << to << std::endl;
-      }
-      catch(boost::bad_lexical_cast&)  {
-        return false;
-      }
+  else {
+    try {
+      // std::cerr << "from:" << from << std::endl;
+      to = boost::lexical_cast<double>(from);
+      // std::cerr << "to:" << to << std::endl;
+    } catch (boost::bad_lexical_cast&) {
+      return false;
     }
-    return true;
   }
+  return true;
+}
 
 // ----------------------------------------------------------------------
 
-  bool
-  edm::encode(std::string& to, double from) {
-    std::ostringstream ost;
-    ost.precision(std::numeric_limits<double>::digits10 + 1);
-    ost << from;
-    if(!ost) return false;
-    to = ost.str();
-    return true;
-  }
-
+bool edm::encode(std::string& to, double from) {
+  std::ostringstream ost;
+  ost.precision(std::numeric_limits<double>::digits10 + 1);
+  ost << from;
+  if (!ost)
+    return false;
+  to = ost.str();
+  return true;
+}
 
 // ----------------------------------------------------------------------
 // vDouble
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(std::vector<double>& to, std::string const& from) {
-    std::vector<std::string> temp;
-    if(!split(std::back_inserter(temp), from, '{', ',', '}'))
-      return false;
+bool edm::decode(std::vector<double>& to, std::string const& from) {
+  std::vector<std::string> temp;
+  if (!split(std::back_inserter(temp), from, '{', ',', '}'))
+    return false;
 
-    to.clear();
-    for(std::vector<std::string>::const_iterator b = temp.begin()
-                                               , e = temp.end()
-        ; b != e; ++b) {
-      double  val;
-      if(!decode(val, *b))
-        return false;
-      to.push_back(val);
-    }
+  to.clear();
+  for (std::vector<std::string>::const_iterator b = temp.begin(), e = temp.end(); b != e; ++b) {
+    double val;
+    if (!decode(val, *b))
+      return false;
+    to.push_back(val);
+  }
 
-    return true;
-  } // decode to vector<double>
+  return true;
+}  // decode to vector<double>
 
 // ----------------------------------------------------------------------
 
-  bool
-  edm::encode(std::string& to, std::vector<double> const& from) {
-    to = "{";
-
-    std::string converted;
-    for(std::vector<double>::const_iterator b = from.begin()
-                                           , e = from.end()
-       ; b != e; ++b) {
-      if(!encode(converted, *b))
-        return false;
+bool edm::encode(std::string& to, std::vector<double> const& from) {
+  to = "{";
 
-      if(b != from.begin())
-        to += ",";
-      to += converted;
-    }
+  std::string converted;
+  for (std::vector<double>::const_iterator b = from.begin(), e = from.end(); b != e; ++b) {
+    if (!encode(converted, *b))
+      return false;
 
-    to += '}';
-    return true;
-  } // encode from vector<double>
+    if (b != from.begin())
+      to += ",";
+    to += converted;
+  }
 
+  to += '}';
+  return true;
+}  // encode from vector<double>
 
 // ----------------------------------------------------------------------
 // String
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(std::string& to, std::string const& from) {
-    /*std::cerr << "Decoding: " << from << '\n'; //DEBUG*/
-    std::string::const_iterator b = from.begin()
-                              ,  e = from.end();
+bool edm::decode(std::string& to, std::string const& from) {
+  /*std::cerr << "Decoding: " << from << '\n'; //DEBUG*/
+  std::string::const_iterator b = from.begin(), e = from.end();
 
-    to = "";
-    to.reserve((e-b)/2);
-    char  c = '\0';
-    for(bool  even_pos = true
-       ;  b != e; ++b, even_pos = !even_pos) {
-      if(even_pos)  {
-        /*std::cerr << "Even: |"
+  to = "";
+  to.reserve((e - b) / 2);
+  char c = '\0';
+  for (bool even_pos = true; b != e; ++b, even_pos = !even_pos) {
+    if (even_pos) {
+      /*std::cerr << "Even: |"
                   << *b
                   << "|   giving "
                   << from_hex(*b)
                   << "\n"; //DEBUG*/
-        c = static_cast<char>(from_hex(*b));
-      }
-      else  {
-        /*std::cerr << "Odd:  |"
+      c = static_cast<char>(from_hex(*b));
+    } else {
+      /*std::cerr << "Odd:  |"
                   << *b
                   << "|   giving "
                   << from_hex(*b)
                   << "\n"; //DEBUG*/
-        c = static_cast<char>(c * 16 + from_hex(*b));
-        //      if(std::isalnum(c))  {
-          /*std::cerr << "Ans:  |" << c << "|\n"; //DEBUG*/
-          to += c;
-        //}
-        //else  { // keep all special chars encoded
-          //to += "\\x";
-          //to += to_hex_rep(c);
-        //}
-      }
+      c = static_cast<char>(c * 16 + from_hex(*b));
+      //      if(std::isalnum(c))  {
+      /*std::cerr << "Ans:  |" << c << "|\n"; //DEBUG*/
+      to += c;
+      //}
+      //else  { // keep all special chars encoded
+      //to += "\\x";
+      //to += to_hex_rep(c);
+      //}
     }
-    /*std::cerr << "Decoded: " << to << '\n'; //DEBUG*/
-    return true;
-  } // decode to String
-
+  }
+  /*std::cerr << "Decoded: " << to << '\n'; //DEBUG*/
+  return true;
+}  // decode to String
 
 // ----------------------------------------------------------------------
 // FileInPath
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(FileInPath& to, std::string const& from) {
-    std::istringstream is(from);
-    FileInPath temp;
-    temp.readFromParameterSetBlob(is);
-    if (!is) return false;
-    to = temp;
-    return true;
-  } // decode to FileInPath
-
-
-
-  bool
-  edm::encode(std::string& to, FileInPath const& from) {
-    std::ostringstream ost;
-    ost << from;
-    if (!ost) return false;
-    to = ost.str();
-    return true;
-  }
-
+bool edm::decode(FileInPath& to, std::string const& from) {
+  std::istringstream is(from);
+  FileInPath temp;
+  temp.readFromParameterSetBlob(is);
+  if (!is)
+    return false;
+  to = temp;
+  return true;
+}  // decode to FileInPath
+
+bool edm::encode(std::string& to, FileInPath const& from) {
+  std::ostringstream ost;
+  ost << from;
+  if (!ost)
+    return false;
+  to = ost.str();
+  return true;
+}
 
 // ----------------------------------------------------------------------
 // InputTag
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(InputTag& to, std::string const& from) {
-    to = InputTag(from);
-    return true;
-  } // decode to InputTag
-
-
-
-  bool
-  edm::encode(std::string& to, InputTag const& from) {
-    to = from.encode();
-    return true;
-  }
+bool edm::decode(InputTag& to, std::string const& from) {
+  to = InputTag(from);
+  return true;
+}  // decode to InputTag
 
+bool edm::encode(std::string& to, InputTag const& from) {
+  to = from.encode();
+  return true;
+}
 
 // ----------------------------------------------------------------------
 // VInputTag
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(std::vector<InputTag>& to, std::string const& from) {
-    std::vector<std::string> strings;
-    decode(strings, from);
-
-    for(std::vector<std::string>::const_iterator stringItr = strings.begin(), stringItrEnd = strings.end();
-        stringItr != stringItrEnd; ++stringItr) {
-      to.push_back(InputTag(*stringItr));
-    }
-    return true;
-  } // decode to VInputTag
+bool edm::decode(std::vector<InputTag>& to, std::string const& from) {
+  std::vector<std::string> strings;
+  decode(strings, from);
 
-
-
-  bool
-  edm::encode(std::string& to, std::vector<InputTag> const& from) {
-    std::vector<std::string> strings;
-    for(std::vector<InputTag>::const_iterator tagItr = from.begin(), tagItrEnd = from.end();
-         tagItr != tagItrEnd; ++tagItr) {
-      strings.push_back(tagItr->encode());
-    }
-    encode(to, strings);
-    return true;
+  for (std::vector<std::string>::const_iterator stringItr = strings.begin(), stringItrEnd = strings.end();
+       stringItr != stringItrEnd;
+       ++stringItr) {
+    to.push_back(InputTag(*stringItr));
   }
-
-
+  return true;
+}  // decode to VInputTag
+
+bool edm::encode(std::string& to, std::vector<InputTag> const& from) {
+  std::vector<std::string> strings;
+  for (std::vector<InputTag>::const_iterator tagItr = from.begin(), tagItrEnd = from.end(); tagItr != tagItrEnd;
+       ++tagItr) {
+    strings.push_back(tagItr->encode());
+  }
+  encode(to, strings);
+  return true;
+}
 
 // ----------------------------------------------------------------------
 // ESInputTag
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(ESInputTag& to, std::string const& from) {
-     to = ESInputTag(from);
-     return true;
-  } // decode to InputTag
-
-
-
-  bool
-  edm::encode(std::string& to, ESInputTag const& from) {
-     to = from.encode();
-     return true;
-  }
+bool edm::decode(ESInputTag& to, std::string const& from) {
+  to = ESInputTag(from);
+  return true;
+}  // decode to InputTag
 
+bool edm::encode(std::string& to, ESInputTag const& from) {
+  to = from.encode();
+  return true;
+}
 
 // ----------------------------------------------------------------------
 // VESInputTag
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(std::vector<ESInputTag>& to, std::string const& from) {
-     std::vector<std::string> strings;
-     decode(strings, from);
+bool edm::decode(std::vector<ESInputTag>& to, std::string const& from) {
+  std::vector<std::string> strings;
+  decode(strings, from);
 
-     for(std::vector<std::string>::const_iterator stringItr = strings.begin(), stringItrEnd = strings.end();
-         stringItr != stringItrEnd; ++stringItr) {
-        to.push_back(ESInputTag(*stringItr));
-     }
-     return true;
-  } // decode to VInputTag
-
-
-
-  bool
-  edm::encode(std::string& to, std::vector<ESInputTag> const& from) {
-     std::vector<std::string> strings;
-     for(std::vector<ESInputTag>::const_iterator tagItr = from.begin(), tagItrEnd = from.end();
-         tagItr != tagItrEnd; ++tagItr) {
-        strings.push_back(tagItr->encode());
-     }
-     encode(to, strings);
-     return true;
+  for (std::vector<std::string>::const_iterator stringItr = strings.begin(), stringItrEnd = strings.end();
+       stringItr != stringItrEnd;
+       ++stringItr) {
+    to.push_back(ESInputTag(*stringItr));
   }
-
+  return true;
+}  // decode to VInputTag
+
+bool edm::encode(std::string& to, std::vector<ESInputTag> const& from) {
+  std::vector<std::string> strings;
+  for (std::vector<ESInputTag>::const_iterator tagItr = from.begin(), tagItrEnd = from.end(); tagItr != tagItrEnd;
+       ++tagItr) {
+    strings.push_back(tagItr->encode());
+  }
+  encode(to, strings);
+  return true;
+}
 
 // ----------------------------------------------------------------------
 // EventID
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(edm::EventID& to, std::string const& from) {
-    std::vector<std::string> tokens = edm::tokenize(from, ":");
-    assert(tokens.size() == 2 || tokens.size() == 3);
-    unsigned int run = strtoul(tokens[0].c_str(), nullptr, 0);
-    unsigned int lumi = (tokens.size() == 2 ? 0 : strtoul(tokens[1].c_str(), nullptr, 0));
-    unsigned long long event = strtoull(tokens[tokens.size() - 1].c_str(), nullptr, 0);
-    to = edm::EventID(run, lumi, event);
-
-    return true;
-  } // decode to EventID
+bool edm::decode(edm::EventID& to, std::string const& from) {
+  std::vector<std::string> tokens = edm::tokenize(from, ":");
+  assert(tokens.size() == 2 || tokens.size() == 3);
+  unsigned int run = strtoul(tokens[0].c_str(), nullptr, 0);
+  unsigned int lumi = (tokens.size() == 2 ? 0 : strtoul(tokens[1].c_str(), nullptr, 0));
+  unsigned long long event = strtoull(tokens[tokens.size() - 1].c_str(), nullptr, 0);
+  to = edm::EventID(run, lumi, event);
 
+  return true;
+}  // decode to EventID
 
-
-  bool
-  edm::encode(std::string& to, edm::EventID const& from) {
-    std::ostringstream os;
-    if (from.luminosityBlock() == 0U) {
-      os << from.run() << ":" << from.event();
-    } else {
-      os << from.run() << ":" << from.luminosityBlock() << ":" << from.event();
-    }
-    to = os.str();
-    return true;
+bool edm::encode(std::string& to, edm::EventID const& from) {
+  std::ostringstream os;
+  if (from.luminosityBlock() == 0U) {
+    os << from.run() << ":" << from.event();
+  } else {
+    os << from.run() << ":" << from.luminosityBlock() << ":" << from.event();
   }
-
+  to = os.str();
+  return true;
+}
 
 // ----------------------------------------------------------------------
 // VEventID
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(std::vector<edm::EventID>& to, std::string const& from) {
-      std::vector<std::string> strings;
-      decode(strings, from);
-
-      for(std::vector<std::string>::const_iterator stringItr = strings.begin(), stringItrEnd = strings.end();
-          stringItr != stringItrEnd; ++stringItr) {
-        edm::EventID eventID;
-        decode(eventID, *stringItr);
-        to.push_back(eventID);
-      }
-      return true;
-    } // decode to VInputTag
+bool edm::decode(std::vector<edm::EventID>& to, std::string const& from) {
+  std::vector<std::string> strings;
+  decode(strings, from);
 
-
-
-  bool
-  edm::encode(std::string& to, std::vector<edm::EventID> const& from) {
-      std::vector<std::string> strings;
-      for(std::vector<edm::EventID>::const_iterator idItr = from.begin(), idItrEnd = from.end();
-          idItr != idItrEnd; ++idItr) {
-        std::string encodedEventID;
-        encode(encodedEventID, *idItr);
-        strings.push_back(encodedEventID);
-      }
-      encode(to, strings);
-      return true;
-    }
+  for (std::vector<std::string>::const_iterator stringItr = strings.begin(), stringItrEnd = strings.end();
+       stringItr != stringItrEnd;
+       ++stringItr) {
+    edm::EventID eventID;
+    decode(eventID, *stringItr);
+    to.push_back(eventID);
+  }
+  return true;
+}  // decode to VInputTag
+
+bool edm::encode(std::string& to, std::vector<edm::EventID> const& from) {
+  std::vector<std::string> strings;
+  for (std::vector<edm::EventID>::const_iterator idItr = from.begin(), idItrEnd = from.end(); idItr != idItrEnd;
+       ++idItr) {
+    std::string encodedEventID;
+    encode(encodedEventID, *idItr);
+    strings.push_back(encodedEventID);
+  }
+  encode(to, strings);
+  return true;
+}
 
 // ----------------------------------------------------------------------
 // LuminosityBlockID
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(edm::LuminosityBlockID& to, std::string const& from) {
-      std::vector<std::string> tokens = edm::tokenize(from, ":");
-      assert(tokens.size() == 2);
-      unsigned int run = strtoul(tokens[0].c_str(), nullptr, 0);
-      unsigned int lumi = strtoul(tokens[1].c_str(), nullptr, 0);
-      to = edm::LuminosityBlockID(run, lumi);
-      return true;
-    } // decode to LuminosityBlockID
-
-
-
-  bool
-  edm::encode(std::string& to, edm::LuminosityBlockID const& from) {
-      std::ostringstream os;
-      os << from.run() << ":" << from.luminosityBlock();
-      to = os.str();
-      return true;
-    }
-
+bool edm::decode(edm::LuminosityBlockID& to, std::string const& from) {
+  std::vector<std::string> tokens = edm::tokenize(from, ":");
+  assert(tokens.size() == 2);
+  unsigned int run = strtoul(tokens[0].c_str(), nullptr, 0);
+  unsigned int lumi = strtoul(tokens[1].c_str(), nullptr, 0);
+  to = edm::LuminosityBlockID(run, lumi);
+  return true;
+}  // decode to LuminosityBlockID
+
+bool edm::encode(std::string& to, edm::LuminosityBlockID const& from) {
+  std::ostringstream os;
+  os << from.run() << ":" << from.luminosityBlock();
+  to = os.str();
+  return true;
+}
 
 // ----------------------------------------------------------------------
 // VLuminosityBlockID
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(std::vector<edm::LuminosityBlockID>& to, std::string const& from) {
-    std::vector<std::string> strings;
-    decode(strings, from);
+bool edm::decode(std::vector<edm::LuminosityBlockID>& to, std::string const& from) {
+  std::vector<std::string> strings;
+  decode(strings, from);
 
-    for(std::vector<std::string>::const_iterator stringItr = strings.begin(), stringItrEnd = strings.end();
-        stringItr != stringItrEnd; ++stringItr) {
-      edm::LuminosityBlockID lumiID;
-      decode(lumiID, *stringItr);
-      to.push_back(lumiID);
-    }
-    return true;
-  } // decode to VInputTag
-
-
-
-  bool
-  edm::encode(std::string& to, std::vector<edm::LuminosityBlockID> const& from) {
-    std::vector<std::string> strings;
-    for(std::vector<edm::LuminosityBlockID>::const_iterator idItr = from.begin(), idItrEnd = from.end();
-        idItr != idItrEnd; ++idItr) {
-      std::string encodedLuminosityBlockID;
-      encode(encodedLuminosityBlockID, *idItr);
-      strings.push_back(encodedLuminosityBlockID);
-    }
-    encode(to, strings);
-    return true;
+  for (std::vector<std::string>::const_iterator stringItr = strings.begin(), stringItrEnd = strings.end();
+       stringItr != stringItrEnd;
+       ++stringItr) {
+    edm::LuminosityBlockID lumiID;
+    decode(lumiID, *stringItr);
+    to.push_back(lumiID);
   }
-
+  return true;
+}  // decode to VInputTag
+
+bool edm::encode(std::string& to, std::vector<edm::LuminosityBlockID> const& from) {
+  std::vector<std::string> strings;
+  for (std::vector<edm::LuminosityBlockID>::const_iterator idItr = from.begin(), idItrEnd = from.end();
+       idItr != idItrEnd;
+       ++idItr) {
+    std::string encodedLuminosityBlockID;
+    encode(encodedLuminosityBlockID, *idItr);
+    strings.push_back(encodedLuminosityBlockID);
+  }
+  encode(to, strings);
+  return true;
+}
 
 // ----------------------------------------------------------------------
-  // LuminosityBlockRange
+// LuminosityBlockRange
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(edm::LuminosityBlockRange& to, std::string const& from) {
-    std::vector<std::string> tokens = edm::tokenize(from, "-");
-    assert(tokens.size() == 2);
-    edm::LuminosityBlockID begin;
-    edm::LuminosityBlockID end;
-    edm::decode(begin,tokens[0]);
-    edm::decode(end,tokens[1]);
-    to = edm::LuminosityBlockRange(begin.run(), begin.luminosityBlock(),
-                                   end.run(),   end.luminosityBlock());
-    return true;
-  }  // decode to LuminosityBlockRange
-
-  bool
-  edm::encode(std::string& to, edm::LuminosityBlockRange const& from) {
-    std::ostringstream os;
-    os << from.startRun() << ":" << from.startLumi() << "-"
-       << from.endRun() << ":" << from.endLumi();
-    to = os.str();
-    return true;
-  }
+bool edm::decode(edm::LuminosityBlockRange& to, std::string const& from) {
+  std::vector<std::string> tokens = edm::tokenize(from, "-");
+  assert(tokens.size() == 2);
+  edm::LuminosityBlockID begin;
+  edm::LuminosityBlockID end;
+  edm::decode(begin, tokens[0]);
+  edm::decode(end, tokens[1]);
+  to = edm::LuminosityBlockRange(begin.run(), begin.luminosityBlock(), end.run(), end.luminosityBlock());
+  return true;
+}  // decode to LuminosityBlockRange
+
+bool edm::encode(std::string& to, edm::LuminosityBlockRange const& from) {
+  std::ostringstream os;
+  os << from.startRun() << ":" << from.startLumi() << "-" << from.endRun() << ":" << from.endLumi();
+  to = os.str();
+  return true;
+}
 
 // ----------------------------------------------------------------------
 // VLuminosityBlockRange
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(std::vector<edm::LuminosityBlockRange>& to, std::string const& from) {
-    std::vector<std::string> strings;
-    decode(strings, from);
+bool edm::decode(std::vector<edm::LuminosityBlockRange>& to, std::string const& from) {
+  std::vector<std::string> strings;
+  decode(strings, from);
 
-    for(std::vector<std::string>::const_iterator stringItr = strings.begin(), stringItrEnd = strings.end();
-        stringItr != stringItrEnd; ++stringItr) {
-      edm::LuminosityBlockRange lumiRange;
-      decode(lumiRange, *stringItr);
-      to.push_back(lumiRange);
-    }
-    return true;
-  } // decode to VInputTag
-
-  bool
-  edm::encode(std::string& to, std::vector<edm::LuminosityBlockRange> const& from) {
-    std::vector<std::string> strings;
-    for(std::vector<edm::LuminosityBlockRange>::const_iterator idItr = from.begin(), idItrEnd = from.end();
-        idItr != idItrEnd; ++idItr) {
-      std::string encodedLuminosityBlockRange;
-      encode(encodedLuminosityBlockRange, *idItr);
-      strings.push_back(encodedLuminosityBlockRange);
-    }
-    encode(to, strings);
-    return true;
+  for (std::vector<std::string>::const_iterator stringItr = strings.begin(), stringItrEnd = strings.end();
+       stringItr != stringItrEnd;
+       ++stringItr) {
+    edm::LuminosityBlockRange lumiRange;
+    decode(lumiRange, *stringItr);
+    to.push_back(lumiRange);
+  }
+  return true;
+}  // decode to VInputTag
+
+bool edm::encode(std::string& to, std::vector<edm::LuminosityBlockRange> const& from) {
+  std::vector<std::string> strings;
+  for (std::vector<edm::LuminosityBlockRange>::const_iterator idItr = from.begin(), idItrEnd = from.end();
+       idItr != idItrEnd;
+       ++idItr) {
+    std::string encodedLuminosityBlockRange;
+    encode(encodedLuminosityBlockRange, *idItr);
+    strings.push_back(encodedLuminosityBlockRange);
   }
+  encode(to, strings);
+  return true;
+}
 
 // ----------------------------------------------------------------------
 // EventRange
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(edm::EventRange& to, std::string const& from) {
-    std::vector<std::string> tokens = edm::tokenize(from, "-");
-    assert(tokens.size() == 2);
-    edm::EventID begin;
-    edm::EventID end;
-    edm::decode(begin,tokens[0]);
-    edm::decode(end,tokens[1]);
-    assert((begin.luminosityBlock() == 0) == (end.luminosityBlock() == 0));
-    to = edm::EventRange(begin.run(), begin.luminosityBlock(), begin.event(),
-                           end.run(), end.luminosityBlock(), end.event());
-    return true;
-  }  // decode to EventRange
-
-  bool
-  edm::encode(std::string& to, edm::EventRange const& from) {
-    std::ostringstream os;
-    if (from.startLumi() == 0) {
-      assert(from.endLumi() == 0);
-      os << from.startRun() << ":" << from.startEvent() << "-"
-         << from.endRun() << ":" << from.endEvent();
-    } else {
-      assert(from.endLumi() != 0);
-      os << from.startRun() << ":" << from.startLumi() << ":" << from.startEvent() << "-"
-         << from.endRun() << ":" << from.endLumi() << ":" << from.endEvent();
-    }
-    to = os.str();
-    return true;
+bool edm::decode(edm::EventRange& to, std::string const& from) {
+  std::vector<std::string> tokens = edm::tokenize(from, "-");
+  assert(tokens.size() == 2);
+  edm::EventID begin;
+  edm::EventID end;
+  edm::decode(begin, tokens[0]);
+  edm::decode(end, tokens[1]);
+  assert((begin.luminosityBlock() == 0) == (end.luminosityBlock() == 0));
+  to = edm::EventRange(
+      begin.run(), begin.luminosityBlock(), begin.event(), end.run(), end.luminosityBlock(), end.event());
+  return true;
+}  // decode to EventRange
+
+bool edm::encode(std::string& to, edm::EventRange const& from) {
+  std::ostringstream os;
+  if (from.startLumi() == 0) {
+    assert(from.endLumi() == 0);
+    os << from.startRun() << ":" << from.startEvent() << "-" << from.endRun() << ":" << from.endEvent();
+  } else {
+    assert(from.endLumi() != 0);
+    os << from.startRun() << ":" << from.startLumi() << ":" << from.startEvent() << "-" << from.endRun() << ":"
+       << from.endLumi() << ":" << from.endEvent();
   }
+  to = os.str();
+  return true;
+}
 
 // ----------------------------------------------------------------------
 // VEventRange
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(std::vector<edm::EventRange>& to, std::string const& from) {
-    std::vector<std::string> strings;
-    decode(strings, from);
+bool edm::decode(std::vector<edm::EventRange>& to, std::string const& from) {
+  std::vector<std::string> strings;
+  decode(strings, from);
 
-    for(std::vector<std::string>::const_iterator stringItr = strings.begin(), stringItrEnd = strings.end();
-        stringItr != stringItrEnd; ++stringItr) {
-      edm::EventRange eventRange;
-      decode(eventRange, *stringItr);
-      to.push_back(eventRange);
-    }
-    return true;
+  for (std::vector<std::string>::const_iterator stringItr = strings.begin(), stringItrEnd = strings.end();
+       stringItr != stringItrEnd;
+       ++stringItr) {
+    edm::EventRange eventRange;
+    decode(eventRange, *stringItr);
+    to.push_back(eventRange);
   }
+  return true;
+}
 
-  bool
-  edm::encode(std::string& to, std::vector<edm::EventRange> const& from) {
-    std::vector<std::string> strings;
-    for(std::vector<edm::EventRange>::const_iterator idItr = from.begin(), idItrEnd = from.end();
-        idItr != idItrEnd; ++idItr) {
-      std::string encodedEventRange;
-      encode(encodedEventRange, *idItr);
-      strings.push_back(encodedEventRange);
-    }
-    encode(to, strings);
-    return true;
+bool edm::encode(std::string& to, std::vector<edm::EventRange> const& from) {
+  std::vector<std::string> strings;
+  for (std::vector<edm::EventRange>::const_iterator idItr = from.begin(), idItrEnd = from.end(); idItr != idItrEnd;
+       ++idItr) {
+    std::string encodedEventRange;
+    encode(encodedEventRange, *idItr);
+    strings.push_back(encodedEventRange);
   }
+  encode(to, strings);
+  return true;
+}
 
 // ----------------------------------------------------------------------
 
-  bool
-  edm::encode(std::string& to, std::string const& from) {
-    std::string::const_iterator b = from.begin()
-                              , e = from.end();
-
-    enum escape_state { NONE
-                      , BACKSLASH
-                      , HEX, HEX1
-                      , OCT1, OCT2
-                      };
-
-    escape_state  state = NONE;
-    int code = 0;
-    to = "";
-    for(; b != e; ++b) {
-      /*std::cerr << "State: " << state << "; char = " << *b << '\n'; //DEBUG*/
-      switch(state)  {
-        case NONE:  {
-          if(*b == '\\')  state = BACKSLASH;
-          else              append_hex_rep(to, *b);
-          /*std::cerr << "To: |" << to << "|\n"; //DEBUG*/
-          break;
-        }
-        case BACKSLASH:  {
-          code = 0;
-          switch(*b)  {
-            case 'x': case 'X':  {
-              state = HEX;
-              break;
-            }
-            case '0': case '1': case '2': case '3':
-            case '4': case '5': case '6': case '7':  {
-              code = 8 * code + from_hex(*b);
-              state = OCT1;
-              break;
-            }
-            case 'n':  {
-              append_hex_rep(to, 10);
-              state = NONE;
-              break;
-            }
-            case 't':  {
-              append_hex_rep(to, 9);
-              state = NONE;
-              break;
-            }
-            default:  {
-              append_hex_rep(to, *b);
-              state = NONE;
-              break;
-            }
+bool edm::encode(std::string& to, std::string const& from) {
+  std::string::const_iterator b = from.begin(), e = from.end();
+
+  enum escape_state { NONE, BACKSLASH, HEX, HEX1, OCT1, OCT2 };
+
+  escape_state state = NONE;
+  int code = 0;
+  to = "";
+  for (; b != e; ++b) {
+    /*std::cerr << "State: " << state << "; char = " << *b << '\n'; //DEBUG*/
+    switch (state) {
+      case NONE: {
+        if (*b == '\\')
+          state = BACKSLASH;
+        else
+          append_hex_rep(to, *b);
+        /*std::cerr << "To: |" << to << "|\n"; //DEBUG*/
+        break;
+      }
+      case BACKSLASH: {
+        code = 0;
+        switch (*b) {
+          case 'x':
+          case 'X': {
+            state = HEX;
+            break;
           }
-          break;
-        }
-        case HEX:  {
-          to += *b;
-          state = HEX1;
-          break;
-        }
-        case HEX1:  {
-          to += *b;
-          state = NONE;
-          break;
-        }
-        case OCT1:  {
-          switch(*b)  {
-            case '0': case '1': case '2': case '3':
-            case '4': case '5': case '6': case '7':  {
-              code = 8 * code + from_hex(*b);
-              state = OCT2;
-              break;
-            }
-            default:  {
-              append_hex_rep(to, code);
-              state = NONE;
-              break;
-            }
+          case '0':
+          case '1':
+          case '2':
+          case '3':
+          case '4':
+          case '5':
+          case '6':
+          case '7': {
+            code = 8 * code + from_hex(*b);
+            state = OCT1;
+            break;
+          }
+          case 'n': {
+            append_hex_rep(to, 10);
+            state = NONE;
+            break;
+          }
+          case 't': {
+            append_hex_rep(to, 9);
+            state = NONE;
+            break;
+          }
+          default: {
+            append_hex_rep(to, *b);
+            state = NONE;
+            break;
           }
-          break;
         }
-        case OCT2:  {
-          switch(*b)  {
-            case '0': case '1': case '2': case '3':
-            case '4': case '5': case '6': case '7':  {
-              code = 8 * code + from_hex(*b);
-              break;
-            }
-            default:  {
-              append_hex_rep(to, code);
-              break;
-            }
+        break;
+      }
+      case HEX: {
+        to += *b;
+        state = HEX1;
+        break;
+      }
+      case HEX1: {
+        to += *b;
+        state = NONE;
+        break;
+      }
+      case OCT1: {
+        switch (*b) {
+          case '0':
+          case '1':
+          case '2':
+          case '3':
+          case '4':
+          case '5':
+          case '6':
+          case '7': {
+            code = 8 * code + from_hex(*b);
+            state = OCT2;
+            break;
+          }
+          default: {
+            append_hex_rep(to, code);
+            state = NONE;
+            break;
           }
-          state = NONE;
-          break;
         }
-        default:  {
-          throw std::logic_error("can't happen");
-          break;
+        break;
+      }
+      case OCT2: {
+        switch (*b) {
+          case '0':
+          case '1':
+          case '2':
+          case '3':
+          case '4':
+          case '5':
+          case '6':
+          case '7': {
+            code = 8 * code + from_hex(*b);
+            break;
+          }
+          default: {
+            append_hex_rep(to, code);
+            break;
+          }
         }
+        state = NONE;
+        break;
       }
-    } // for
-
-    return true;
-  } // encode from String
+      default: {
+        throw std::logic_error("can't happen");
+        break;
+      }
+    }
+  }  // for
 
+  return true;
+}  // encode from String
 
 // ----------------------------------------------------------------------
 // vString
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(std::vector<std::string>& to, std::string const& from) {
-    std::vector<std::string> temp;
-    if(!split(std::back_inserter(temp), from, '{', ',', '}'))
-      return false;
+bool edm::decode(std::vector<std::string>& to, std::string const& from) {
+  std::vector<std::string> temp;
+  if (!split(std::back_inserter(temp), from, '{', ',', '}'))
+    return false;
 
-    to.clear();
-    for(std::vector<std::string>::const_iterator b = temp.begin()
-                                               , e = temp.end()
-        ; b != e; ++b) {
-      std::string val;
-      // treat blank string specially
-      if(*b == "XXX") {
-         val = "";
-      } else if(!decode(val, *b)) {
-        return false;
-      }
-      to.push_back(val);
+  to.clear();
+  for (std::vector<std::string>::const_iterator b = temp.begin(), e = temp.end(); b != e; ++b) {
+    std::string val;
+    // treat blank string specially
+    if (*b == "XXX") {
+      val = "";
+    } else if (!decode(val, *b)) {
+      return false;
     }
+    to.push_back(val);
+  }
 
-    return true;
-  } // decode to vector<string>
+  return true;
+}  // decode to vector<string>
 
 // ----------------------------------------------------------------------
 
-  bool
-  edm::encode(std::string& to, std::vector<std::string> const& from) {
-    to = "{";
-
-    std::string converted;
-    for(std::vector<std::string>::const_iterator b = from.begin()
-                                                , e = from.end()
-       ; b != e; ++b) {
-      // treat blank string specially
-      if(*b == "") {
-         converted = "XXX";
-      } else if(!encode(converted, *b)) {
-        return false;
-      }
+bool edm::encode(std::string& to, std::vector<std::string> const& from) {
+  to = "{";
 
-      if(b != from.begin())
-        to += ",";
-      to += converted;
+  std::string converted;
+  for (std::vector<std::string>::const_iterator b = from.begin(), e = from.end(); b != e; ++b) {
+    // treat blank string specially
+    if (b->empty()) {
+      converted = "XXX";
+    } else if (!encode(converted, *b)) {
+      return false;
     }
 
-    to += '}';
-    return true;
-  } // encode from vector<string>
+    if (b != from.begin())
+      to += ",";
+    to += converted;
+  }
 
+  to += '}';
+  return true;
+}  // encode from vector<string>
 
 // ----------------------------------------------------------------------
 // ParameterSet
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(ParameterSet& to, std::string const& from) {
-    to = ParameterSet(from);
-    return true;
-  } // decode to ParameterSet
+bool edm::decode(ParameterSet& to, std::string const& from) {
+  to = ParameterSet(from);
+  return true;
+}  // decode to ParameterSet
 
 // ----------------------------------------------------------------------
 
-  bool
-  edm::encode(std::string& to, ParameterSet const& from) {
-    to = from.toString();
-    return true;
-  } // encode from ParameterSet
-
+bool edm::encode(std::string& to, ParameterSet const& from) {
+  to = from.toString();
+  return true;
+}  // encode from ParameterSet
 
 // ----------------------------------------------------------------------
 // vPSet
 // ----------------------------------------------------------------------
 
-  bool
-  edm::decode(std::vector<ParameterSet>& to, std::string const& from) {
-    std::vector<std::string> temp;
-    if(!split(std::back_inserter(temp), from, '{', ',', '}'))
-      return false;
+bool edm::decode(std::vector<ParameterSet>& to, std::string const& from) {
+  std::vector<std::string> temp;
+  if (!split(std::back_inserter(temp), from, '{', ',', '}'))
+    return false;
 
-    to.clear();
-    for(std::vector<std::string>::const_iterator b = temp.begin()
-                                               , e = temp.end()
-        ; b != e; ++b) {
-      ParameterSet val;
-      if(!decode(val, *b)) {
-        return false;
-      }
-      to.push_back(val);
+  to.clear();
+  for (std::vector<std::string>::const_iterator b = temp.begin(), e = temp.end(); b != e; ++b) {
+    ParameterSet val;
+    if (!decode(val, *b)) {
+      return false;
     }
+    to.push_back(val);
+  }
 
-    return true;
-  } // decode to vector<ParameterSet>
+  return true;
+}  // decode to vector<ParameterSet>
 
 // ----------------------------------------------------------------------
 
-  bool
-  edm::encode(std::string& to, std::vector<ParameterSet> const& from) {
-    to = "{";
+bool edm::encode(std::string& to, std::vector<ParameterSet> const& from) {
+  to = "{";
 
-    std::string converted;
-    for(std::vector<ParameterSet>::const_iterator b = from.begin()
-                                         , e = from.end()
-       ; b != e; ++b) {
-      if(!encode(converted, *b)) {
-        return false;
-      }
-      if(b != from.begin()) {
-        to += ",";
-      }
-      to += converted;
+  std::string converted;
+  for (std::vector<ParameterSet>::const_iterator b = from.begin(), e = from.end(); b != e; ++b) {
+    if (!encode(converted, *b)) {
+      return false;
     }
-    to += '}';
-    return true;
-  } // encode from vector<ParameterSet>
-
+    if (b != from.begin()) {
+      to += ",";
+    }
+    to += converted;
+  }
+  to += '}';
+  return true;
+}  // encode from vector<ParameterSet>
 
 // ----------------------------------------------------------------------
diff --git a/FWCore/ParameterSet/src/validateTopLevelParameterSets.cc b/FWCore/ParameterSet/src/validateTopLevelParameterSets.cc
index 14dd8d8b0a98d..6df8e710e45de 100644
--- a/FWCore/ParameterSet/src/validateTopLevelParameterSets.cc
+++ b/FWCore/ParameterSet/src/validateTopLevelParameterSets.cc
@@ -11,110 +11,106 @@
 
 namespace edm {
 
-void fillOptionsDescription(ParameterSetDescription& description) {
-
-  description.addUntracked<unsigned int>("numberOfThreads", s_defaultNumberOfThreads)->
-    setComment("If zero, let TBB use its default which is normally the number of CPUs on the machine");
-  description.addUntracked<unsigned int>("numberOfStreams", 0)->
-    setComment("If zero, then set the number of streams to be the same as the number of threads");
-  description.addUntracked<unsigned int>("numberOfConcurrentRuns", 1);
-  description.addUntracked<unsigned int>("numberOfConcurrentLuminosityBlocks", 1)->
-    setComment("If zero, then set the same as the number of runs");
-  description.addUntracked<bool>("wantSummary", false)->
-    setComment("Set true to print a report on the trigger decisions and timing of modules");
-  description.addUntracked<std::string>("fileMode", "FULLMERGE")->
-    setComment("Legal values are 'NOMERGE' and 'FULLMERGE'");
-  description.addUntracked<bool>("forceEventSetupCacheClearOnNewRun", false);
-  description.addUntracked<bool>("throwIfIllegalParameter", true)->
-    setComment("Set false to disable exception throws when configuration validation detects illegal parameters");
-  description.addUntracked<bool>("printDependencies", false)->
-    setComment("Print data dependencies between modules");
-
-
-  // No default for this one because the parameter value is
-  // actually used in the main function in cmsRun.cpp before
-  // the parameter set is validated here.
-  description.addOptionalUntracked<unsigned int>("sizeOfStackForThreadsInKB");
-
-  std::vector<std::string> emptyVector;
-
-  description.addUntracked<std::vector<std::string>>("Rethrow", emptyVector);
-  description.addUntracked<std::vector<std::string>>("SkipEvent", emptyVector);
-  description.addUntracked<std::vector<std::string>>("FailPath", emptyVector);
-  description.addUntracked<std::vector<std::string>>("IgnoreCompletely", emptyVector);
-
-  description.addUntracked<std::vector<std::string>>("canDeleteEarly", emptyVector)->
-    setComment("Branch names of products that the Framework can try to delete before the end of the Event");
-
-  description.addOptionalUntracked<bool>("allowUnscheduled")->
-    setComment("Obsolete. Has no effect. Allowed only for backward compatibility for old Python configuration files.");
-  description.addOptionalUntracked<std::string>("emptyRunLumiMode")->
-    setComment("Obsolete. Has no effect. Allowed only for backward compatibility for old Python configuration files.");
-  description.addOptionalUntracked<bool>("makeTriggerResults")->
-    setComment("Obsolete. Has no effect. Allowed only for backward compatibility for old Python configuration files.");
-}
-
-void fillMaxEventsDescription(ParameterSetDescription& description) {
-  description.addUntracked<int>("input", -1)->
-    setComment("Default of -1 implies no limit.");
-
-  ParameterSetDescription nestedDescription;
-  nestedDescription.addWildcardUntracked<int>("*");
-  description.addOptionalNode(ParameterDescription<int>("output", false) xor
-                              ParameterDescription<ParameterSetDescription>("output", nestedDescription, false), false);
-}
-
-void fillMaxLuminosityBlocksDescription(ParameterSetDescription& description) {
-  description.addUntracked<int>("input", -1)->
-    setComment("Default of -1 implies no limit.");
-}
-
-void fillMaxSecondsUntilRampdownDescription(ParameterSetDescription& description) {
-  description.addUntracked<int>("input", -1)->
-    setComment("Default of -1 implies no limit.");
-}
-
-void validateTopLevelParameterSets(ParameterSet* processParameterSet) {
-
-  std::string processName = processParameterSet->getParameter<std::string>("@process_name");
-
-  std::vector<std::string> psetNames {"options", "maxEvents", "maxLuminosityBlocks", "maxSecondsUntilRampdown"};
-
-  for (auto const& psetName : psetNames) {
-
-    bool isTracked {false};
-    ParameterSet* pset = processParameterSet->getPSetForUpdate(psetName, isTracked);
-    if (pset == nullptr) {
-      ParameterSet emptyPset;
-      processParameterSet->addUntrackedParameter<ParameterSet>(psetName, emptyPset);
-      pset = processParameterSet->getPSetForUpdate(psetName, isTracked);
-    }
-    if (isTracked) {
-      throw Exception(errors::Configuration)
-        << "In the configuration the top level parameter set named \'" << psetName << "\' in process \'" << processName << "\' is tracked.\n"
-        << "It must be untracked";
-    }
+  void fillOptionsDescription(ParameterSetDescription& description) {
+    description.addUntracked<unsigned int>("numberOfThreads", s_defaultNumberOfThreads)
+        ->setComment("If zero, let TBB use its default which is normally the number of CPUs on the machine");
+    description.addUntracked<unsigned int>("numberOfStreams", 0)
+        ->setComment("If zero, then set the number of streams to be the same as the number of threads");
+    description.addUntracked<unsigned int>("numberOfConcurrentRuns", 1);
+    description.addUntracked<unsigned int>("numberOfConcurrentLuminosityBlocks", 1)
+        ->setComment("If zero, then set the same as the number of runs");
+    description.addUntracked<bool>("wantSummary", false)
+        ->setComment("Set true to print a report on the trigger decisions and timing of modules");
+    description.addUntracked<std::string>("fileMode", "FULLMERGE")
+        ->setComment("Legal values are 'NOMERGE' and 'FULLMERGE'");
+    description.addUntracked<bool>("forceEventSetupCacheClearOnNewRun", false);
+    description.addUntracked<bool>("throwIfIllegalParameter", true)
+        ->setComment("Set false to disable exception throws when configuration validation detects illegal parameters");
+    description.addUntracked<bool>("printDependencies", false)->setComment("Print data dependencies between modules");
+
+    // No default for this one because the parameter value is
+    // actually used in the main function in cmsRun.cpp before
+    // the parameter set is validated here.
+    description.addOptionalUntracked<unsigned int>("sizeOfStackForThreadsInKB");
+
+    std::vector<std::string> emptyVector;
+
+    description.addUntracked<std::vector<std::string>>("Rethrow", emptyVector);
+    description.addUntracked<std::vector<std::string>>("SkipEvent", emptyVector);
+    description.addUntracked<std::vector<std::string>>("FailPath", emptyVector);
+    description.addUntracked<std::vector<std::string>>("IgnoreCompletely", emptyVector);
+
+    description.addUntracked<std::vector<std::string>>("canDeleteEarly", emptyVector)
+        ->setComment("Branch names of products that the Framework can try to delete before the end of the Event");
+
+    description.addOptionalUntracked<bool>("allowUnscheduled")
+        ->setComment(
+            "Obsolete. Has no effect. Allowed only for backward compatibility for old Python configuration files.");
+    description.addOptionalUntracked<std::string>("emptyRunLumiMode")
+        ->setComment(
+            "Obsolete. Has no effect. Allowed only for backward compatibility for old Python configuration files.");
+    description.addOptionalUntracked<bool>("makeTriggerResults")
+        ->setComment(
+            "Obsolete. Has no effect. Allowed only for backward compatibility for old Python configuration files.");
+  }
 
-    ParameterSetDescription description;
-    if (psetName == "options") {
-      fillOptionsDescription(description);
-    } else if (psetName == "maxEvents") {
-      fillMaxEventsDescription(description);
-    } else if (psetName == "maxLuminosityBlocks") {
-      fillMaxLuminosityBlocksDescription(description);
-    } else if (psetName == "maxSecondsUntilRampdown") {
-      fillMaxSecondsUntilRampdownDescription(description);
-    }
+  void fillMaxEventsDescription(ParameterSetDescription& description) {
+    description.addUntracked<int>("input", -1)->setComment("Default of -1 implies no limit.");
+
+    ParameterSetDescription nestedDescription;
+    nestedDescription.addWildcardUntracked<int>("*");
+    description.addOptionalNode(ParameterDescription<int>("output", false) xor
+                                    ParameterDescription<ParameterSetDescription>("output", nestedDescription, false),
+                                false);
+  }
+
+  void fillMaxLuminosityBlocksDescription(ParameterSetDescription& description) {
+    description.addUntracked<int>("input", -1)->setComment("Default of -1 implies no limit.");
+  }
+
+  void fillMaxSecondsUntilRampdownDescription(ParameterSetDescription& description) {
+    description.addUntracked<int>("input", -1)->setComment("Default of -1 implies no limit.");
+  }
 
-    try {
-      description.validate(*pset);
-    } catch(cms::Exception& ex) {
-      std::ostringstream ost;
-      ost << "Validating top level \'" << psetName << "\' ParameterSet for process \'" << processName << "\'";
-      ex.addContext(ost.str());
-      throw;
+  void validateTopLevelParameterSets(ParameterSet* processParameterSet) {
+    std::string processName = processParameterSet->getParameter<std::string>("@process_name");
+
+    std::vector<std::string> psetNames{"options", "maxEvents", "maxLuminosityBlocks", "maxSecondsUntilRampdown"};
+
+    for (auto const& psetName : psetNames) {
+      bool isTracked{false};
+      ParameterSet* pset = processParameterSet->getPSetForUpdate(psetName, isTracked);
+      if (pset == nullptr) {
+        ParameterSet emptyPset;
+        processParameterSet->addUntrackedParameter<ParameterSet>(psetName, emptyPset);
+        pset = processParameterSet->getPSetForUpdate(psetName, isTracked);
+      }
+      if (isTracked) {
+        throw Exception(errors::Configuration) << "In the configuration the top level parameter set named \'"
+                                               << psetName << "\' in process \'" << processName << "\' is tracked.\n"
+                                               << "It must be untracked";
+      }
+
+      ParameterSetDescription description;
+      if (psetName == "options") {
+        fillOptionsDescription(description);
+      } else if (psetName == "maxEvents") {
+        fillMaxEventsDescription(description);
+      } else if (psetName == "maxLuminosityBlocks") {
+        fillMaxLuminosityBlocksDescription(description);
+      } else if (psetName == "maxSecondsUntilRampdown") {
+        fillMaxSecondsUntilRampdownDescription(description);
+      }
+
+      try {
+        description.validate(*pset);
+      } catch (cms::Exception& ex) {
+        std::ostringstream ost;
+        ost << "Validating top level \'" << psetName << "\' ParameterSet for process \'" << processName << "\'";
+        ex.addContext(ost.str());
+        throw;
+      }
     }
   }
-}
 
-}
+}  // namespace edm
diff --git a/FWCore/ParameterSet/test/IncludeFileFinder_t.cppunit.cc b/FWCore/ParameterSet/test/IncludeFileFinder_t.cppunit.cc
index 088cd4d7b5baa..cddc0af7673c3 100644
--- a/FWCore/ParameterSet/test/IncludeFileFinder_t.cppunit.cc
+++ b/FWCore/ParameterSet/test/IncludeFileFinder_t.cppunit.cc
@@ -13,13 +13,12 @@
 #include "FWCore/PluginManager/interface/PluginManager.h"
 #include "FWCore/PluginManager/interface/standard.h"
 
-using std::string;
-using std::vector;
 using edm::pset::IncludeFileFinder;
 using std::pair;
+using std::string;
+using std::vector;
 
-class IncludeFileFinderTest: public CppUnit::TestFixture
-{
+class IncludeFileFinderTest : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(IncludeFileFinderTest);
   CPPUNIT_TEST(strippingTest);
   CPPUNIT_TEST(twoWordsTest);
@@ -27,63 +26,56 @@ class IncludeFileFinderTest: public CppUnit::TestFixture
   CPPUNIT_TEST_SUITE_END();
 
 public:
-  void setUp(){
-    if(not edmplugin::PluginManager::isAvailable()) {
+  void setUp() {
+    if (not edmplugin::PluginManager::isAvailable()) {
       edmplugin::PluginManager::configure(edmplugin::standard::config());
     }
   }
-  void tearDown(){}
+  void tearDown() {}
 
   void strippingTest();
   void stripTrailerTest();
   void twoWordsTest();
   void ultimateTest();
+
 private:
 };
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(IncludeFileFinderTest);
 
-
-void IncludeFileFinderTest::strippingTest()
-{
+void IncludeFileFinderTest::strippingTest() {
   string original = "libSimCalorimetryCaloSimAlgosPlugins.so";
 
   string result = IncludeFileFinder::stripHeader(original);
-  CPPUNIT_ASSERT (result == "SimCalorimetryCaloSimAlgosPlugins.so");
-   
-  string result2 =  IncludeFileFinder::stripTrailer(result);
-  CPPUNIT_ASSERT (result2 == "SimCalorimetryCaloSimAlgos");
-}
+  CPPUNIT_ASSERT(result == "SimCalorimetryCaloSimAlgosPlugins.so");
 
+  string result2 = IncludeFileFinder::stripTrailer(result);
+  CPPUNIT_ASSERT(result2 == "SimCalorimetryCaloSimAlgos");
+}
 
-void IncludeFileFinderTest::twoWordsTest()
-{
+void IncludeFileFinderTest::twoWordsTest() {
   string original = "SimCalorimetryCaloSimAlgos";
   vector<pair<string, string> > twoWords = IncludeFileFinder::twoWordsFrom(original);
 
-  CPPUNIT_ASSERT (twoWords.size() == 4);
-  CPPUNIT_ASSERT (twoWords[0].first  == "Sim");
-  CPPUNIT_ASSERT (twoWords[0].second == "CalorimetryCaloSimAlgos");
-  CPPUNIT_ASSERT (twoWords[1].first  == "SimCalorimetry");
-  CPPUNIT_ASSERT (twoWords[1].second == "CaloSimAlgos");
-  CPPUNIT_ASSERT (twoWords[2].first  == "SimCalorimetryCalo");
-  CPPUNIT_ASSERT (twoWords[2].second == "SimAlgos");
-  CPPUNIT_ASSERT (twoWords[3].first  == "SimCalorimetryCaloSim");
-  CPPUNIT_ASSERT (twoWords[3].second == "Algos");
-
+  CPPUNIT_ASSERT(twoWords.size() == 4);
+  CPPUNIT_ASSERT(twoWords[0].first == "Sim");
+  CPPUNIT_ASSERT(twoWords[0].second == "CalorimetryCaloSimAlgos");
+  CPPUNIT_ASSERT(twoWords[1].first == "SimCalorimetry");
+  CPPUNIT_ASSERT(twoWords[1].second == "CaloSimAlgos");
+  CPPUNIT_ASSERT(twoWords[2].first == "SimCalorimetryCalo");
+  CPPUNIT_ASSERT(twoWords[2].second == "SimAlgos");
+  CPPUNIT_ASSERT(twoWords[3].first == "SimCalorimetryCaloSim");
+  CPPUNIT_ASSERT(twoWords[3].second == "Algos");
 }
 
-
-void IncludeFileFinderTest::ultimateTest()
-{
+void IncludeFileFinderTest::ultimateTest() {
   string moduleClass = "CSCDigiProducer";
   IncludeFileFinder finder;
-//  string library = finder.libraryOf(moduleClass);
-//  CPPUNIT_ASSERT (library == "libSimMuonCSCDigitizer.so");
+  //  string library = finder.libraryOf(moduleClass);
+  //  CPPUNIT_ASSERT (library == "libSimMuonCSCDigitizer.so");
 
   string moduleLabel = "muoncscdigi";
-//  edm::FileInPath file = finder.find(moduleClass, moduleLabel);
+  //  edm::FileInPath file = finder.find(moduleClass, moduleLabel);
   // will throw if can't find
 }
-
diff --git a/FWCore/ParameterSet/test/defaultModuleLabel_t.cc b/FWCore/ParameterSet/test/defaultModuleLabel_t.cc
index 8e094c666d56c..48ffdbb539309 100644
--- a/FWCore/ParameterSet/test/defaultModuleLabel_t.cc
+++ b/FWCore/ParameterSet/test/defaultModuleLabel_t.cc
@@ -2,14 +2,14 @@
 
 #include "FWCore/ParameterSet/interface/defaultModuleLabel.h"
 
-class testDefaultModuleLabel: public CppUnit::TestFixture {
+class testDefaultModuleLabel : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testDefaultModuleLabel);
   CPPUNIT_TEST(test);
   CPPUNIT_TEST_SUITE_END();
 
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void test();
 };
diff --git a/FWCore/ParameterSet/test/parameterSetDescription_t.cc b/FWCore/ParameterSet/test/parameterSetDescription_t.cc
index 44f45a591915f..cdbc4732bc7e6 100644
--- a/FWCore/ParameterSet/test/parameterSetDescription_t.cc
+++ b/FWCore/ParameterSet/test/parameterSetDescription_t.cc
@@ -35,21 +35,19 @@ namespace testParameterSetDescription {
     assert(node.exists(pset) == exists);
     assert(node.partiallyExists(pset) == exists);
     assert(node.howManyXORSubNodesExist(pset) == (exists ? 1 : 0));
-    if(validates) {
+    if (validates) {
       psetDesc.validate(pset);
     } else {
       try {
         psetDesc.validate(pset);
         assert(0);
-      }
-      catch(edm::Exception const&) {
+      } catch (edm::Exception const&) {
         // There should be an exception
       }
     }
   }
 
   void testWildcards() {
-
     {
       edm::ParameterSetDescription set;
       edm::ParameterWildcard<int> w("*", edm::RequireZeroOrMore, true);
@@ -120,8 +118,7 @@ namespace testParameterSetDescription {
       try {
         set.add<double>("testTypeChecking2", 11.0);
         assert(0);
-      }
-        catch(edm::Exception const&) {
+      } catch (edm::Exception const&) {
         // There should be an exception
       }
     }
@@ -129,8 +126,7 @@ namespace testParameterSetDescription {
     try {
       edm::ParameterWildcard<int> wrong("a*", edm::RequireZeroOrMore, true);
       assert(0);
-    }
-      catch(edm::Exception const&) {
+    } catch (edm::Exception const&) {
       // There should be an exception
     }
 
@@ -163,8 +159,8 @@ namespace testParameterSetDescription {
 
     {
       edm::ParameterSetDescription set;
-      edm::ParameterWildcard<edm::ParameterSetDescription> w("*", edm::RequireZeroOrMore, true,
-                                                             edm::ParameterSetDescription());
+      edm::ParameterWildcard<edm::ParameterSetDescription> w(
+          "*", edm::RequireZeroOrMore, true, edm::ParameterSetDescription());
       set.addNode(w);
       edm::ParameterSet pset;
       testDesc(w, set, pset, true, true);
@@ -179,8 +175,7 @@ namespace testParameterSetDescription {
 
     {
       edm::ParameterSetDescription set;
-      edm::ParameterWildcard<edm::ParameterSetDescription> w("*", edm::RequireZeroOrMore, true,
-                                                             nestedDesc);
+      edm::ParameterWildcard<edm::ParameterSetDescription> w("*", edm::RequireZeroOrMore, true, nestedDesc);
       set.addNode(w);
       edm::ParameterSet pset;
       testDesc(w, set, pset, true, true);
@@ -192,8 +187,8 @@ namespace testParameterSetDescription {
 
     {
       edm::ParameterSetDescription set;
-      edm::ParameterWildcard<edm::ParameterSetDescription> w(std::string("*"), edm::RequireExactlyOne, true,
-                                                             nestedDesc);
+      edm::ParameterWildcard<edm::ParameterSetDescription> w(
+          std::string("*"), edm::RequireExactlyOne, true, nestedDesc);
       set.addNode(w);
       edm::ParameterSet pset;
       testDesc(w, set, pset, false, false);
@@ -205,8 +200,7 @@ namespace testParameterSetDescription {
 
     {
       edm::ParameterSetDescription set;
-      edm::ParameterWildcard<edm::ParameterSetDescription> w("*", edm::RequireAtLeastOne, true,
-                                                             nestedDesc);
+      edm::ParameterWildcard<edm::ParameterSetDescription> w("*", edm::RequireAtLeastOne, true, nestedDesc);
       set.addNode(w);
       edm::ParameterSet pset;
       testDesc(w, set, pset, false, false);
@@ -224,38 +218,38 @@ namespace testParameterSetDescription {
 
     {
       edm::ParameterSetDescription set;
-      edm::ParameterWildcard<std::vector<edm::ParameterSet> > w("*", edm::RequireZeroOrMore, true);
+      edm::ParameterWildcard<std::vector<edm::ParameterSet>> w("*", edm::RequireZeroOrMore, true);
       set.addNode(w);
       edm::ParameterSet pset;
       testDesc(w, set, pset, true, true);
-      pset.addParameter<std::vector<edm::ParameterSet> >("nested1", nestedVPset);
+      pset.addParameter<std::vector<edm::ParameterSet>>("nested1", nestedVPset);
       testDesc(w, set, pset, true, true);
-      pset.addParameter<std::vector<edm::ParameterSet> >("nested2", nestedVPset);
+      pset.addParameter<std::vector<edm::ParameterSet>>("nested2", nestedVPset);
       testDesc(w, set, pset, true, true);
     }
 
     {
       edm::ParameterSetDescription set;
-      edm::ParameterWildcard<std::vector<edm::ParameterSet> > w(std::string("*"), edm::RequireZeroOrMore, true);
+      edm::ParameterWildcard<std::vector<edm::ParameterSet>> w(std::string("*"), edm::RequireZeroOrMore, true);
       set.addNode(w);
       edm::ParameterSet pset;
       testDesc(w, set, pset, true, true);
-      pset.addParameter<std::vector<edm::ParameterSet> >("nested1", nestedVPset);
+      pset.addParameter<std::vector<edm::ParameterSet>>("nested1", nestedVPset);
       testDesc(w, set, pset, true, true);
-      pset.addParameter<std::vector<edm::ParameterSet> >("nested2", nestedVPset);
+      pset.addParameter<std::vector<edm::ParameterSet>>("nested2", nestedVPset);
       testDesc(w, set, pset, true, true);
     }
 
     {
       edm::ParameterSetDescription set;
-      edm::ParameterWildcard<std::vector<edm::ParameterSet> > w("*", edm::RequireZeroOrMore, true,
-                                                                edm::ParameterSetDescription());
+      edm::ParameterWildcard<std::vector<edm::ParameterSet>> w(
+          "*", edm::RequireZeroOrMore, true, edm::ParameterSetDescription());
       set.addNode(w);
       edm::ParameterSet pset;
       testDesc(w, set, pset, true, true);
-      pset.addParameter<std::vector<edm::ParameterSet> >("nested1", nestedVPset);
+      pset.addParameter<std::vector<edm::ParameterSet>>("nested1", nestedVPset);
       testDesc(w, set, pset, true, false);
-      pset.addParameter<std::vector<edm::ParameterSet> >("nested2", nestedVPset);
+      pset.addParameter<std::vector<edm::ParameterSet>>("nested2", nestedVPset);
       testDesc(w, set, pset, true, false);
     }
 
@@ -263,61 +257,58 @@ namespace testParameterSetDescription {
     descElement.addUntracked<unsigned>("n11", 1);
     {
       edm::ParameterSetDescription set;
-      edm::ParameterWildcard<std::vector<edm::ParameterSet> > w("*", edm::RequireZeroOrMore, true,
-                                                                descElement);
+      edm::ParameterWildcard<std::vector<edm::ParameterSet>> w("*", edm::RequireZeroOrMore, true, descElement);
       set.addNode(w);
       edm::ParameterSet pset;
       testDesc(w, set, pset, true, true);
-      pset.addParameter<std::vector<edm::ParameterSet> >("nested1", nestedVPset);
+      pset.addParameter<std::vector<edm::ParameterSet>>("nested1", nestedVPset);
       testDesc(w, set, pset, true, true);
-      pset.addParameter<std::vector<edm::ParameterSet> >("nested2", nestedVPset);
+      pset.addParameter<std::vector<edm::ParameterSet>>("nested2", nestedVPset);
       testDesc(w, set, pset, true, true);
     }
 
     {
       edm::ParameterSetDescription set;
-      edm::ParameterWildcard<std::vector<edm::ParameterSet> > w(std::string("*"), edm::RequireExactlyOne, true,
-                                                                descElement);
+      edm::ParameterWildcard<std::vector<edm::ParameterSet>> w(
+          std::string("*"), edm::RequireExactlyOne, true, descElement);
       set.addNode(w);
       edm::ParameterSet pset;
       testDesc(w, set, pset, false, false);
-      pset.addParameter<std::vector<edm::ParameterSet> >("nested1", nestedVPset);
+      pset.addParameter<std::vector<edm::ParameterSet>>("nested1", nestedVPset);
       testDesc(w, set, pset, true, true);
-      pset.addParameter<std::vector<edm::ParameterSet> >("nested2", nestedVPset);
+      pset.addParameter<std::vector<edm::ParameterSet>>("nested2", nestedVPset);
       testDesc(w, set, pset, false, false);
     }
 
     {
       edm::ParameterSetDescription set;
-      edm::ParameterWildcard<std::vector<edm::ParameterSet> > w("*", edm::RequireAtLeastOne, true,
-                                                                descElement);
+      edm::ParameterWildcard<std::vector<edm::ParameterSet>> w("*", edm::RequireAtLeastOne, true, descElement);
       set.addNode(w);
       edm::ParameterSet pset;
       testDesc(w, set, pset, false, false);
-      pset.addParameter<std::vector<edm::ParameterSet> >("nested1", nestedVPset);
+      pset.addParameter<std::vector<edm::ParameterSet>>("nested1", nestedVPset);
       testDesc(w, set, pset, true, true);
-      pset.addParameter<std::vector<edm::ParameterSet> >("nested2", nestedVPset);
+      pset.addParameter<std::vector<edm::ParameterSet>>("nested2", nestedVPset);
       testDesc(w, set, pset, true, true);
     }
 
     return;
   }
 
-// ---------------------------------------------------------------------------------
+  // ---------------------------------------------------------------------------------
 
   void testSwitch() {
-
     // Duplicate case values not allowed
     edm::ParameterSetDescription psetDesc;
     try {
       psetDesc.ifValue(edm::ParameterDescription<int>("oiswitch", 1, true),
-                        0 >> edm::ParameterDescription<int>("oivalue", 100, true) or
-                        1 >> (edm::ParameterDescription<double>("oivalue1", 101.0, true) and
-                              edm::ParameterDescription<double>("oivalue2", 101.0, true)) or
-                        1 >> edm::ParameterDescription<std::string>("oivalue", "102", true));
+                       0 >> edm::ParameterDescription<int>("oivalue", 100, true) or
+                           1 >> (edm::ParameterDescription<double>("oivalue1", 101.0, true) and
+                                 edm::ParameterDescription<double>("oivalue2", 101.0, true)) or
+                           1 >> edm::ParameterDescription<std::string>("oivalue", "102", true));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // Types used in case parameters cannot duplicate type already used in a wildcard
     edm::ParameterSetDescription psetDesc1;
@@ -326,13 +317,13 @@ namespace testParameterSetDescription {
 
     try {
       psetDesc1.ifValue(edm::ParameterDescription<int>("oiswitch", 1, true),
-                         0 >> edm::ParameterDescription<int>("oivalue", 100, true) or
-                         1 >> (edm::ParameterDescription<double>("oivalue1", 101.0, true) and
-                               edm::ParameterDescription<double>("oivalue2", 101.0, true)) or
-                         2 >> edm::ParameterDescription<std::string>("oivalue", "102", true));
+                        0 >> edm::ParameterDescription<int>("oivalue", 100, true) or
+                            1 >> (edm::ParameterDescription<double>("oivalue1", 101.0, true) and
+                                  edm::ParameterDescription<double>("oivalue2", 101.0, true)) or
+                            2 >> edm::ParameterDescription<std::string>("oivalue", "102", true));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // Types used in the switch parameter cannot duplicate type already used in a wildcard
     edm::ParameterSetDescription psetDesc2;
@@ -343,94 +334,94 @@ namespace testParameterSetDescription {
       psetDesc2.ifValue(edm::ParameterDescription<int>("aswitch", 1, true),
                         1 >> (edm::ParameterDescription<unsigned>("avalue1", 101, true) and
                               edm::ParameterDescription<unsigned>("avalue2", 101, true)) or
-                        2 >> edm::ParameterDescription<std::string>("avalue", "102", true));
+                            2 >> edm::ParameterDescription<std::string>("avalue", "102", true));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // Type used in the switch parameter cannot duplicate type in a case wildcard
     edm::ParameterSetDescription psetDesc3;
     try {
       psetDesc3.ifValue(edm::ParameterDescription<int>("xswitch", 1, true),
-                         0 >> edm::ParameterWildcard<int>("*", edm::RequireAtLeastOne, true) or
-                         1 >> (edm::ParameterDescription<double>("xvalue1", 101.0, true) and
-                               edm::ParameterDescription<double>("xvalue2", 101.0, true)));
+                        0 >> edm::ParameterWildcard<int>("*", edm::RequireAtLeastOne, true) or
+                            1 >> (edm::ParameterDescription<double>("xvalue1", 101.0, true) and
+                                  edm::ParameterDescription<double>("xvalue2", 101.0, true)));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // Type used in a parameter cannot duplicate type in a case wildcard
     edm::ParameterSetDescription psetDesc4;
     psetDesc4.add<unsigned>("testunsigned", 1U);
     try {
       psetDesc4.ifValue(edm::ParameterDescription<int>("xswitch", 1, true),
-                         0 >> edm::ParameterWildcard<unsigned>("*", edm::RequireAtLeastOne, true) or
-                         1 >> (edm::ParameterDescription<double>("xvalue1", 101.0, true) and
-                               edm::ParameterDescription<double>("xvalue2", 101.0, true)));
+                        0 >> edm::ParameterWildcard<unsigned>("*", edm::RequireAtLeastOne, true) or
+                            1 >> (edm::ParameterDescription<double>("xvalue1", 101.0, true) and
+                                  edm::ParameterDescription<double>("xvalue2", 101.0, true)));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // No problem is wildcard type and parameter type are the same for different cases.
     edm::ParameterSetDescription psetDesc5;
     psetDesc5.ifValue(edm::ParameterDescription<int>("uswitch", 1, true),
-                       0 >> edm::ParameterWildcard<unsigned>("*", edm::RequireAtLeastOne, true) or
-                       1 >> (edm::ParameterDescription<unsigned>("uvalue1", 101, true) and
-                             edm::ParameterDescription<unsigned>("uvalue2", 101, true)));
+                      0 >> edm::ParameterWildcard<unsigned>("*", edm::RequireAtLeastOne, true) or
+                          1 >> (edm::ParameterDescription<unsigned>("uvalue1", 101, true) and
+                                edm::ParameterDescription<unsigned>("uvalue2", 101, true)));
 
     // The switch parameter label cannot be the same as a label that already exists
     edm::ParameterSetDescription psetDesc6;
     psetDesc6.add<unsigned>("xswitch", 1U);
     try {
       psetDesc6.ifValue(edm::ParameterDescription<int>("xswitch", 1, true),
-                         0 >> edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true) or
-                         1 >> (edm::ParameterDescription<double>("xvalue1", 101.0, true) and
-                               edm::ParameterDescription<double>("xvalue2", 101.0, true)));
+                        0 >> edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true) or
+                            1 >> (edm::ParameterDescription<double>("xvalue1", 101.0, true) and
+                                  edm::ParameterDescription<double>("xvalue2", 101.0, true)));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // Case labels cannot be the same as a label that already exists
     edm::ParameterSetDescription psetDesc7;
     psetDesc7.add<unsigned>("xvalue1", 1U);
     try {
       psetDesc7.ifValue(edm::ParameterDescription<int>("xswitch", 1, true),
-                         0 >> edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true) or
-                         1 >> (edm::ParameterDescription<double>("xvalue1", 101.0, true) and
-                               edm::ParameterDescription<double>("xvalue2", 101.0, true)));
+                        0 >> edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true) or
+                            1 >> (edm::ParameterDescription<double>("xvalue1", 101.0, true) and
+                                  edm::ParameterDescription<double>("xvalue2", 101.0, true)));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // Case labels cannot be the same as a switch label
     edm::ParameterSetDescription psetDesc8;
     try {
       psetDesc8.ifValue(edm::ParameterDescription<int>("xswitch", 1, true),
-                         0 >> edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true) or
-                         1 >> (edm::ParameterDescription<double>("xswitch", 101.0, true) and
-                               edm::ParameterDescription<double>("xvalue2", 101.0, true)));
+                        0 >> edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true) or
+                            1 >> (edm::ParameterDescription<double>("xswitch", 101.0, true) and
+                                  edm::ParameterDescription<double>("xvalue2", 101.0, true)));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // Parameter set switch value must be one of the defined cases
     edm::ParameterSetDescription psetDesc9;
     try {
       psetDesc9.ifValue(edm::ParameterDescription<int>("xswitch", 1, true),
-                         0 >> edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true) or
-                         1 >> (edm::ParameterDescription<double>("xvalue1", 101.0, true) and
-                               edm::ParameterDescription<double>("xvalue2", 101.0, true)));
+                        0 >> edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true) or
+                            1 >> (edm::ParameterDescription<double>("xvalue1", 101.0, true) and
+                                  edm::ParameterDescription<double>("xvalue2", 101.0, true)));
       edm::ParameterSet pset;
       pset.addParameter<int>("xswitch", 5);
       psetDesc9.validate(pset);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     edm::ParameterSwitch<int> pswitch(edm::ParameterDescription<int>("xswitch", 1, true),
-                         0 >> edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true) or
-                         1 >> (edm::ParameterDescription<double>("xvalue1", 101.0, true) and
-                               edm::ParameterDescription<double>("xvalue2", 101.0, true)));
+                                      0 >> edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true) or
+                                          1 >> (edm::ParameterDescription<double>("xvalue1", 101.0, true) and
+                                                edm::ParameterDescription<double>("xvalue2", 101.0, true)));
     edm::ParameterSetDescription psetDesc10;
     psetDesc10.addNode(pswitch);
     edm::ParameterSet pset10;
@@ -439,17 +430,16 @@ namespace testParameterSetDescription {
     testDesc(pswitch, psetDesc10, pset10, true, true);
   }
 
-// ---------------------------------------------------------------------------------
+  // ---------------------------------------------------------------------------------
 
   void testXor() {
     edm::ParameterSetDescription psetDesc1;
     std::unique_ptr<edm::ParameterDescriptionNode> node1(
-              edm::ParameterDescription<double>("x1", 101.0, true) xor
-              (edm::ParameterDescription<double>("x1", 101.0, true) and
-               edm::ParameterDescription<double>("x2", 101.0, true)) xor
-              edm::ParameterDescription<double>("x1", 101.0, true) xor
-              (edm::ParameterDescription<double>("x1", 101.0, true) or
-               edm::ParameterDescription<double>("x2", 101.0, true)));
+        edm::ParameterDescription<double>("x1", 101.0, true) xor
+        (edm::ParameterDescription<double>("x1", 101.0, true) and
+         edm::ParameterDescription<double>("x2", 101.0, true)) xor
+        edm::ParameterDescription<double>("x1", 101.0, true) xor
+        (edm::ParameterDescription<double>("x1", 101.0, true) or edm::ParameterDescription<double>("x2", 101.0, true)));
 
     edm::ParameterSet pset1;
 
@@ -470,97 +460,92 @@ namespace testParameterSetDescription {
     try {
       psetDesc1.validate(pset1);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */}
 
     // More than one of the options existing should also fail
     try {
       psetDesc1.validate(pset2);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */}
 
     // One of the labels cannot already exist in the description
     edm::ParameterSetDescription psetDesc2;
     psetDesc2.add<unsigned>("xvalue1", 1U);
-    std::unique_ptr<edm::ParameterDescriptionNode> node2(
-              edm::ParameterDescription<double>("x1", 101.0, true) xor
-              (edm::ParameterDescription<double>("x1", 101.0, true) and
-               edm::ParameterDescription<double>("x2", 101.0, true)) xor
-              edm::ParameterDescription<double>("x1", 101.0, true) xor
-              (edm::ParameterDescription<double>("xvalue1", 101.0, true) or
-               edm::ParameterDescription<double>("x2", 101.0, true)));
+    std::unique_ptr<edm::ParameterDescriptionNode> node2(edm::ParameterDescription<double>("x1", 101.0, true) xor
+                                                         (edm::ParameterDescription<double>("x1", 101.0, true) and
+                                                          edm::ParameterDescription<double>("x2", 101.0, true)) xor
+                                                         edm::ParameterDescription<double>("x1", 101.0, true) xor
+                                                         (edm::ParameterDescription<double>("xvalue1", 101.0, true) or
+                                                          edm::ParameterDescription<double>("x2", 101.0, true)));
     try {
       psetDesc2.addNode(std::move(node2));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // One of the labels cannot already exist in the description, other order
     edm::ParameterSetDescription psetDesc3;
-    std::unique_ptr<edm::ParameterDescriptionNode> node3(
-              edm::ParameterDescription<double>("x1", 101.0, true) xor
-              (edm::ParameterDescription<double>("x1", 101.0, true) and
-               edm::ParameterDescription<double>("x2", 101.0, true)) xor
-              edm::ParameterDescription<double>("x1", 101.0, true) xor
-              (edm::ParameterDescription<double>("xvalue1", 101.0, true) or
-               edm::ParameterDescription<double>("x2", 101.0, true)));
+    std::unique_ptr<edm::ParameterDescriptionNode> node3(edm::ParameterDescription<double>("x1", 101.0, true) xor
+                                                         (edm::ParameterDescription<double>("x1", 101.0, true) and
+                                                          edm::ParameterDescription<double>("x2", 101.0, true)) xor
+                                                         edm::ParameterDescription<double>("x1", 101.0, true) xor
+                                                         (edm::ParameterDescription<double>("xvalue1", 101.0, true) or
+                                                          edm::ParameterDescription<double>("x2", 101.0, true)));
     psetDesc3.addNode(std::move(node3));
     try {
       psetDesc3.add<unsigned>("xvalue1", 1U);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // A parameter cannot use the same type as a wildcard
     edm::ParameterSetDescription psetDesc4;
     std::unique_ptr<edm::ParameterDescriptionNode> node4(
-              edm::ParameterDescription<double>("x1", 101.0, true) xor
-              (edm::ParameterDescription<double>("x1", 101.0, true) and
-               edm::ParameterDescription<unsigned>("x2", 101, true)) xor
-              edm::ParameterDescription<double>("x1", 101.0, true) xor
-              (edm::ParameterDescription<double>("x1", 101.0, true) or
-               edm::ParameterDescription<double>("x2", 101.0, true)));
+        edm::ParameterDescription<double>("x1", 101.0, true) xor
+        (edm::ParameterDescription<double>("x1", 101.0, true) and
+         edm::ParameterDescription<unsigned>("x2", 101, true)) xor
+        edm::ParameterDescription<double>("x1", 101.0, true) xor
+        (edm::ParameterDescription<double>("x1", 101.0, true) or edm::ParameterDescription<double>("x2", 101.0, true)));
     psetDesc4.addNode(std::move(node4));
 
     edm::ParameterWildcard<unsigned> w4("*", edm::RequireAtLeastOne, true);
     try {
       psetDesc4.addNode(w4);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // A parameter cannot use the same type as a wildcard
     edm::ParameterSetDescription psetDesc5;
     std::unique_ptr<edm::ParameterDescriptionNode> node5(
-              edm::ParameterDescription<double>("x1", 101.0, true) xor
-              (edm::ParameterDescription<double>("x1", 101.0, true) and
-               edm::ParameterWildcard<unsigned>("*", edm::RequireAtLeastOne, true)) xor
-              edm::ParameterDescription<double>("x1", 101.0, true) xor
-              (edm::ParameterDescription<double>("x1", 101.0, true) or
-               edm::ParameterWildcard<unsigned>("*", edm::RequireAtLeastOne, true)));
+        edm::ParameterDescription<double>("x1", 101.0, true) xor
+        (edm::ParameterDescription<double>("x1", 101.0, true) and
+         edm::ParameterWildcard<unsigned>("*", edm::RequireAtLeastOne, true)) xor
+        edm::ParameterDescription<double>("x1", 101.0, true) xor
+        (edm::ParameterDescription<double>("x1", 101.0, true) or
+         edm::ParameterWildcard<unsigned>("*", edm::RequireAtLeastOne, true)));
     psetDesc5.addNode(std::move(node5));
 
     edm::ParameterDescription<unsigned> n5("z5", edm::RequireAtLeastOne, true);
     try {
       psetDesc5.addNode(n5);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
   }
 
-// ---------------------------------------------------------------------------------
+  // ---------------------------------------------------------------------------------
 
   void testOr() {
-
     edm::ParameterSetDescription psetDesc1;
-    std::unique_ptr<edm::ParameterDescriptionNode> node1(
-              edm::ParameterDescription<double>("x1", 101.0, true) or
-              (edm::ParameterDescription<double>("x2", 101.0, true) and
-               edm::ParameterDescription<double>("x3", 101.0, true)) or
-              edm::ParameterDescription<double>("x4", 101.0, true) or
-              (edm::ParameterDescription<double>("x5", 101.0, true) xor
-               edm::ParameterDescription<double>("x6", 101.0, true)));
+    std::unique_ptr<edm::ParameterDescriptionNode> node1(edm::ParameterDescription<double>("x1", 101.0, true) or
+                                                         (edm::ParameterDescription<double>("x2", 101.0, true) and
+                                                          edm::ParameterDescription<double>("x3", 101.0, true)) or
+                                                         edm::ParameterDescription<double>("x4", 101.0, true) or
+                                                         (edm::ParameterDescription<double>("x5", 101.0, true) xor
+                                                          edm::ParameterDescription<double>("x6", 101.0, true)));
 
     edm::ParameterSet pset1;
 
@@ -589,102 +574,96 @@ namespace testParameterSetDescription {
     // One of the labels cannot already exist in the description
     edm::ParameterSetDescription psetDesc2;
     psetDesc2.add<unsigned>("x1", 1U);
-    std::unique_ptr<edm::ParameterDescriptionNode> node2(
-              edm::ParameterDescription<double>("x1", 101.0, true) or
-              (edm::ParameterDescription<double>("x2", 101.0, true) and
-               edm::ParameterDescription<double>("x3", 101.0, true)) or
-              edm::ParameterDescription<double>("x4", 101.0, true));
+    std::unique_ptr<edm::ParameterDescriptionNode> node2(edm::ParameterDescription<double>("x1", 101.0, true) or
+                                                         (edm::ParameterDescription<double>("x2", 101.0, true) and
+                                                          edm::ParameterDescription<double>("x3", 101.0, true)) or
+                                                         edm::ParameterDescription<double>("x4", 101.0, true));
     try {
       psetDesc2.addNode(std::move(node2));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // One of the labels cannot already exist in the description, other order
     edm::ParameterSetDescription psetDesc3;
-    std::unique_ptr<edm::ParameterDescriptionNode> node3(
-              edm::ParameterDescription<double>("x1", 101.0, true) or
-              (edm::ParameterDescription<double>("x2", 101.0, true) and
-               edm::ParameterDescription<double>("x3", 101.0, true)) or
-              edm::ParameterDescription<double>("x4", 101.0, true));
+    std::unique_ptr<edm::ParameterDescriptionNode> node3(edm::ParameterDescription<double>("x1", 101.0, true) or
+                                                         (edm::ParameterDescription<double>("x2", 101.0, true) and
+                                                          edm::ParameterDescription<double>("x3", 101.0, true)) or
+                                                         edm::ParameterDescription<double>("x4", 101.0, true));
     psetDesc3.addNode(std::move(node3));
 
     try {
       psetDesc3.add<unsigned>("x1", 1U);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // Put the duplicate labels in different nodes of the "or" expression
     edm::ParameterSetDescription psetDesc4;
-    std::unique_ptr<edm::ParameterDescriptionNode> node4(
-              edm::ParameterDescription<double>("x1", 101.0, true) or
-              (edm::ParameterDescription<double>("x2", 101.0, true) and
-               edm::ParameterDescription<double>("x3", 101.0, true)) or
-              edm::ParameterDescription<double>("x1", 101.0, true));
+    std::unique_ptr<edm::ParameterDescriptionNode> node4(edm::ParameterDescription<double>("x1", 101.0, true) or
+                                                         (edm::ParameterDescription<double>("x2", 101.0, true) and
+                                                          edm::ParameterDescription<double>("x3", 101.0, true)) or
+                                                         edm::ParameterDescription<double>("x1", 101.0, true));
     try {
       psetDesc4.addNode(std::move(node4));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // A type used in a wildcard should not be the same as a type
     // used for another parameter
     edm::ParameterSetDescription psetDesc5;
     std::unique_ptr<edm::ParameterDescriptionNode> node5(
-              edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true) or
-              (edm::ParameterDescription<double>("x2", 101.0, true) and
-               edm::ParameterDescription<unsigned>("x3", 101U, true)) or
-              edm::ParameterDescription<unsigned>("x1", 101U, true));
+        edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true) or
+        (edm::ParameterDescription<double>("x2", 101.0, true) and
+         edm::ParameterDescription<unsigned>("x3", 101U, true)) or
+        edm::ParameterDescription<unsigned>("x1", 101U, true));
     try {
       psetDesc5.addNode(std::move(node5));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // A type used in a wildcard should not be the same as a type
     // used for another parameter node
     edm::ParameterSetDescription psetDesc6;
     psetDesc6.add<double>("x0", 1.0);
     std::unique_ptr<edm::ParameterDescriptionNode> node6(
-              edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true) or
-              (edm::ParameterDescription<unsigned>("x2", 101U, true) and
-               edm::ParameterDescription<unsigned>("x3", 101U, true)) or
-              edm::ParameterDescription<unsigned>("x1", 101U, true));
+        edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true) or
+        (edm::ParameterDescription<unsigned>("x2", 101U, true) and
+         edm::ParameterDescription<unsigned>("x3", 101U, true)) or
+        edm::ParameterDescription<unsigned>("x1", 101U, true));
     try {
       psetDesc6.addNode(std::move(node6));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // A type used in a wildcard should not be the same as a type
     // used for another parameter node
     edm::ParameterSetDescription psetDesc7;
     psetDesc7.addWildcard<double>("*");
-    std::unique_ptr<edm::ParameterDescriptionNode> node7(
-              edm::ParameterDescription<double>("x0", 1.0, true) or
-              (edm::ParameterDescription<unsigned>("x2", 101U, true) and
-               edm::ParameterDescription<unsigned>("x3", 101U, true)) or
-              edm::ParameterDescription<unsigned>("x1", 101U, true));
+    std::unique_ptr<edm::ParameterDescriptionNode> node7(edm::ParameterDescription<double>("x0", 1.0, true) or
+                                                         (edm::ParameterDescription<unsigned>("x2", 101U, true) and
+                                                          edm::ParameterDescription<unsigned>("x3", 101U, true)) or
+                                                         edm::ParameterDescription<unsigned>("x1", 101U, true));
     try {
       psetDesc7.addNode(std::move(node7));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
   }
 
-// ---------------------------------------------------------------------------------
+  // ---------------------------------------------------------------------------------
 
   void testAnd() {
-
     edm::ParameterSetDescription psetDesc1;
-    std::unique_ptr<edm::ParameterDescriptionNode> node1(
-              edm::ParameterDescription<double>("x1", 101.0, true) and
-              (edm::ParameterDescription<double>("x2", 101.0, true) or
-               edm::ParameterDescription<double>("x3", 101.0, true)) and
-              edm::ParameterDescription<double>("x4", 101.0, true) and
-              (edm::ParameterDescription<double>("x5", 101.0, true) xor
-               edm::ParameterDescription<double>("x6", 101.0, true)));
+    std::unique_ptr<edm::ParameterDescriptionNode> node1(edm::ParameterDescription<double>("x1", 101.0, true) and
+                                                         (edm::ParameterDescription<double>("x2", 101.0, true) or
+                                                          edm::ParameterDescription<double>("x3", 101.0, true)) and
+                                                         edm::ParameterDescription<double>("x4", 101.0, true) and
+                                                         (edm::ParameterDescription<double>("x5", 101.0, true) xor
+                                                          edm::ParameterDescription<double>("x6", 101.0, true)));
 
     edm::ParameterSet pset1;
 
@@ -718,111 +697,101 @@ namespace testParameterSetDescription {
     // One of the labels cannot already exist in the description
     edm::ParameterSetDescription psetDesc2;
     psetDesc2.add<unsigned>("x1", 1U);
-    std::unique_ptr<edm::ParameterDescriptionNode> node2(
-              edm::ParameterDescription<double>("x1", 101.0, true) and
-              (edm::ParameterDescription<double>("x2", 101.0, true) or
-               edm::ParameterDescription<double>("x3", 101.0, true)) and
-              edm::ParameterDescription<double>("x4", 101.0, true));
+    std::unique_ptr<edm::ParameterDescriptionNode> node2(edm::ParameterDescription<double>("x1", 101.0, true) and
+                                                         (edm::ParameterDescription<double>("x2", 101.0, true) or
+                                                          edm::ParameterDescription<double>("x3", 101.0, true)) and
+                                                         edm::ParameterDescription<double>("x4", 101.0, true));
     try {
       psetDesc2.addNode(std::move(node2));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // One of the labels cannot already exist in the description, other order
     edm::ParameterSetDescription psetDesc3;
-    std::unique_ptr<edm::ParameterDescriptionNode> node3(
-              edm::ParameterDescription<double>("x1", 101.0, true) and
-              (edm::ParameterDescription<double>("x2", 101.0, true) or
-               edm::ParameterDescription<double>("x3", 101.0, true)) and
-              edm::ParameterDescription<double>("x4", 101.0, true));
+    std::unique_ptr<edm::ParameterDescriptionNode> node3(edm::ParameterDescription<double>("x1", 101.0, true) and
+                                                         (edm::ParameterDescription<double>("x2", 101.0, true) or
+                                                          edm::ParameterDescription<double>("x3", 101.0, true)) and
+                                                         edm::ParameterDescription<double>("x4", 101.0, true));
     psetDesc3.addNode(std::move(node3));
 
     try {
       psetDesc3.add<unsigned>("x1", 1U);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // Put the duplicate labels in different nodes of the "and" expression
     edm::ParameterSetDescription psetDesc4;
-    std::unique_ptr<edm::ParameterDescriptionNode> node4(
-              edm::ParameterDescription<double>("x1", 101.0, true) and
-              (edm::ParameterDescription<double>("x2", 101.0, true) or
-               edm::ParameterDescription<double>("x3", 101.0, true)) and
-              edm::ParameterDescription<double>("x1", 101.0, true));
+    std::unique_ptr<edm::ParameterDescriptionNode> node4(edm::ParameterDescription<double>("x1", 101.0, true) and
+                                                         (edm::ParameterDescription<double>("x2", 101.0, true) or
+                                                          edm::ParameterDescription<double>("x3", 101.0, true)) and
+                                                         edm::ParameterDescription<double>("x1", 101.0, true));
     try {
       psetDesc4.addNode(std::move(node4));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // A type used in a wildcard should not be the same as a type
     // used for another parameter
     edm::ParameterSetDescription psetDesc5;
     std::unique_ptr<edm::ParameterDescriptionNode> node5(
-              edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true) and
-              (edm::ParameterDescription<double>("x2", 101.0, true) or
-               edm::ParameterDescription<unsigned>("x3", 101U, true)) and
-              edm::ParameterDescription<unsigned>("x1", 101U, true));
+        edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true) and
+        (edm::ParameterDescription<double>("x2", 101.0, true) or
+         edm::ParameterDescription<unsigned>("x3", 101U, true)) and
+        edm::ParameterDescription<unsigned>("x1", 101U, true));
     try {
       psetDesc5.addNode(std::move(node5));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // A type used in a wildcard should not be the same as a type
     // used for another parameter node
     edm::ParameterSetDescription psetDesc6;
     psetDesc6.add<double>("x0", 1.0);
     std::unique_ptr<edm::ParameterDescriptionNode> node6(
-              edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true) and
-              (edm::ParameterDescription<unsigned>("x2", 101U, true) or
-               edm::ParameterDescription<unsigned>("x3", 101U, true)) and
-              edm::ParameterDescription<unsigned>("x1", 101U, true));
+        edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true) and
+        (edm::ParameterDescription<unsigned>("x2", 101U, true) or
+         edm::ParameterDescription<unsigned>("x3", 101U, true)) and
+        edm::ParameterDescription<unsigned>("x1", 101U, true));
     try {
       psetDesc6.addNode(std::move(node6));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // A type used in a wildcard should not be the same as a type
     // used for another parameter node
     edm::ParameterSetDescription psetDesc7;
     psetDesc7.addWildcard<double>("*");
-    std::unique_ptr<edm::ParameterDescriptionNode> node7(
-              edm::ParameterDescription<double>("x0", 1.0, true) and
-              (edm::ParameterDescription<unsigned>("x2", 101U, true) or
-               edm::ParameterDescription<unsigned>("x3", 101U, true)) and
-              edm::ParameterDescription<unsigned>("x1", 101U, true));
+    std::unique_ptr<edm::ParameterDescriptionNode> node7(edm::ParameterDescription<double>("x0", 1.0, true) and
+                                                         (edm::ParameterDescription<unsigned>("x2", 101U, true) or
+                                                          edm::ParameterDescription<unsigned>("x3", 101U, true)) and
+                                                         edm::ParameterDescription<unsigned>("x1", 101U, true));
     try {
       psetDesc7.addNode(std::move(node7));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
   }
 
-// ---------------------------------------------------------------------------------
+  // ---------------------------------------------------------------------------------
 
   void testIfExists() {
-
     edm::ParameterSetDescription psetDesc1;
     std::unique_ptr<edm::ParameterDescriptionNode> node1(
-      std::make_unique<edm::IfExistsDescription>(
-        edm::ParameterDescription<double>("x1", 101.0, true),
-        (edm::ParameterDescription<double>("x2", 101.0, true) and
-         edm::ParameterDescription<double>("x3", 101.0, true))));
+        std::make_unique<edm::IfExistsDescription>(edm::ParameterDescription<double>("x1", 101.0, true),
+                                                   (edm::ParameterDescription<double>("x2", 101.0, true) and
+                                                    edm::ParameterDescription<double>("x3", 101.0, true))));
 
-    std::unique_ptr<edm::ParameterDescriptionNode> node1a(
-      std::make_unique<edm::IfExistsDescription>(
-        (edm::ParameterDescription<double>("x2", 101.0, true) and
-         edm::ParameterDescription<double>("x3", 101.0, true)),
+    std::unique_ptr<edm::ParameterDescriptionNode> node1a(std::make_unique<edm::IfExistsDescription>(
+        (edm::ParameterDescription<double>("x2", 101.0, true) and edm::ParameterDescription<double>("x3", 101.0, true)),
         edm::ParameterDescription<double>("x1", 101.0, true)));
 
-    std::unique_ptr<edm::ParameterDescriptionNode> node1b(
-      std::make_unique<edm::IfExistsDescription>(
-        (edm::ParameterDescription<double>("x1", 101.0, true) xor
-         edm::ParameterDescription<int>("x1", 101, true)),
+    std::unique_ptr<edm::ParameterDescriptionNode> node1b(std::make_unique<edm::IfExistsDescription>(
+        (edm::ParameterDescription<double>("x1", 101.0, true) xor edm::ParameterDescription<int>("x1", 101, true)),
         (edm::ParameterDescription<double>("x2", 101.0, true) and
          edm::ParameterDescription<double>("x3", 101.0, true))));
 
@@ -874,103 +843,96 @@ namespace testParameterSetDescription {
     edm::ParameterSetDescription psetDesc2;
     psetDesc2.add<unsigned>("x1", 1U);
     std::unique_ptr<edm::ParameterDescriptionNode> node2(
-      std::make_unique<edm::IfExistsDescription>(
-        edm::ParameterDescription<double>("x1", 101.0, true),
-        (edm::ParameterDescription<double>("x2", 101.0, true) and
-         edm::ParameterDescription<double>("x3", 101.0, true))));
+        std::make_unique<edm::IfExistsDescription>(edm::ParameterDescription<double>("x1", 101.0, true),
+                                                   (edm::ParameterDescription<double>("x2", 101.0, true) and
+                                                    edm::ParameterDescription<double>("x3", 101.0, true))));
 
     try {
       psetDesc2.addNode(std::move(node2));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // One of the labels cannot already exist in the description, other order
     edm::ParameterSetDescription psetDesc3;
     std::unique_ptr<edm::ParameterDescriptionNode> node3(
-      std::make_unique<edm::IfExistsDescription>(
-        edm::ParameterDescription<double>("x1", 101.0, true),
-        (edm::ParameterDescription<double>("x2", 101.0, true) and
-         edm::ParameterDescription<double>("x3", 101.0, true))));
+        std::make_unique<edm::IfExistsDescription>(edm::ParameterDescription<double>("x1", 101.0, true),
+                                                   (edm::ParameterDescription<double>("x2", 101.0, true) and
+                                                    edm::ParameterDescription<double>("x3", 101.0, true))));
     psetDesc3.addNode(std::move(node3));
 
     try {
       psetDesc3.add<unsigned>("x1", 1U);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // Put the duplicate labels in different nodes of the "and" expression
     edm::ParameterSetDescription psetDesc4;
     std::unique_ptr<edm::ParameterDescriptionNode> node4(
-      std::make_unique<edm::IfExistsDescription>(
-        edm::ParameterDescription<double>("x1", 101.0, true),
-        (edm::ParameterDescription<double>("x2", 101.0, true) and
-         edm::ParameterDescription<double>("x1", 101.0, true))));
+        std::make_unique<edm::IfExistsDescription>(edm::ParameterDescription<double>("x1", 101.0, true),
+                                                   (edm::ParameterDescription<double>("x2", 101.0, true) and
+                                                    edm::ParameterDescription<double>("x1", 101.0, true))));
     try {
       psetDesc4.addNode(std::move(node4));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // A type used in a wildcard should not be the same as a type
     // used for another parameter
     edm::ParameterSetDescription psetDesc5;
-    std::unique_ptr<edm::ParameterDescriptionNode> node5(
-      std::make_unique<edm::IfExistsDescription>(
+    std::unique_ptr<edm::ParameterDescriptionNode> node5(std::make_unique<edm::IfExistsDescription>(
         edm::ParameterDescription<double>("x1", 101.0, true),
         (edm::ParameterDescription<unsigned>("x2", 101U, true) and
          edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true))));
     try {
       psetDesc5.addNode(std::move(node5));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // A type used in a wildcard should not be the same as a type
     // used for another parameter node
     edm::ParameterSetDescription psetDesc6;
     psetDesc6.add<double>("x0", 1.0);
     std::unique_ptr<edm::ParameterDescriptionNode> node6(
-      std::make_unique<edm::IfExistsDescription>(
-        edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true),
-        (edm::ParameterDescription<unsigned>("x2", 101U, true) and
-         edm::ParameterDescription<unsigned>("x3", 102U, true))));
+        std::make_unique<edm::IfExistsDescription>(edm::ParameterWildcard<double>("*", edm::RequireAtLeastOne, true),
+                                                   (edm::ParameterDescription<unsigned>("x2", 101U, true) and
+                                                    edm::ParameterDescription<unsigned>("x3", 102U, true))));
     try {
       psetDesc6.addNode(std::move(node6));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // A type used in a wildcard should not be the same as a type
     // used for another parameter node
     edm::ParameterSetDescription psetDesc7;
     psetDesc7.addWildcard<double>("*");
     std::unique_ptr<edm::ParameterDescriptionNode> node7(
-      std::make_unique<edm::IfExistsDescription>(
-        edm::ParameterDescription<double>("x1", 11.0, true),
-        (edm::ParameterDescription<unsigned>("x2", 101U, true) and
-         edm::ParameterDescription<unsigned>("x3", 102U, true))));
+        std::make_unique<edm::IfExistsDescription>(edm::ParameterDescription<double>("x1", 11.0, true),
+                                                   (edm::ParameterDescription<unsigned>("x2", 101U, true) and
+                                                    edm::ParameterDescription<unsigned>("x3", 102U, true))));
     try {
       psetDesc7.addNode(std::move(node7));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
   }
 
-// ---------------------------------------------------------------------------------
+  // ---------------------------------------------------------------------------------
 
   void testAllowedLabels() {
-
     edm::ParameterSetDescription psetDesc1;
     std::unique_ptr<edm::ParameterDescriptionNode> node1(
-      std::make_unique<edm::AllowedLabelsDescription<int>>("allowedLabels", true));
+        std::make_unique<edm::AllowedLabelsDescription<int>>("allowedLabels", true));
 
     edm::ParameterSet pset1;
 
     edm::ParameterSet pset2;
     std::vector<std::string> labels;
-    pset2.addParameter<std::vector<std::string> >("allowedLabels", labels);
+    pset2.addParameter<std::vector<std::string>>("allowedLabels", labels);
 
     assert(node1->exists(pset1) == false);
     assert(node1->partiallyExists(pset1) == false);
@@ -984,25 +946,25 @@ namespace testParameterSetDescription {
     edm::ParameterSetDescription psetDesc2;
     psetDesc2.add<unsigned>("x1", 1U);
     std::unique_ptr<edm::ParameterDescriptionNode> node2(
-      std::make_unique<edm::AllowedLabelsDescription<int>>("x1", true));
+        std::make_unique<edm::AllowedLabelsDescription<int>>("x1", true));
 
     try {
       psetDesc2.addNode(std::move(node2));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // A type used in a wildcard should not be the same as a type
     // used for another parameter node
     edm::ParameterSetDescription psetDesc3;
-    psetDesc3.addWildcard<std::vector<std::string> >("*");
+    psetDesc3.addWildcard<std::vector<std::string>>("*");
     std::unique_ptr<edm::ParameterDescriptionNode> node3(
-      std::make_unique<edm::AllowedLabelsDescription<int>>("x1", true));
+        std::make_unique<edm::AllowedLabelsDescription<int>>("x1", true));
     try {
       psetDesc3.addNode(std::move(node3));
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     edm::ParameterSetDescription psetDesc4;
     psetDesc4.labelsFrom<edm::ParameterSetDescription>("allowedLabelsA");
@@ -1017,12 +979,12 @@ namespace testParameterSetDescription {
     try {
       psetDesc4.validate(psetA);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     std::vector<std::string> labels1;
     labels1.push_back(std::string("setB"));
-    psetA.addParameter<std::vector<std::string> >("allowedLabelsA", labels1);
+    psetA.addParameter<std::vector<std::string>>("allowedLabelsA", labels1);
 
     // Now setB should be an allowed parameter
     psetDesc4.validate(psetA);
@@ -1037,8 +999,8 @@ namespace testParameterSetDescription {
     try {
       psetDesc5.validate(psetA);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     // Now include "x" in the description and it should once again pass validation
     edm::ParameterSetDescription psetDesc6;
@@ -1058,15 +1020,15 @@ namespace testParameterSetDescription {
     try {
       psetDesc9.validate(psetA);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
     psetDesc10.validate(psetA);
 
     // Now repeat what was done above with the variations
     // necessary to test the vector<ParameterSet> case
     {
       edm::ParameterSetDescription psetDesc14;
-      psetDesc14.labelsFrom<std::vector<edm::ParameterSet> >("allowedLabelsC");
+      psetDesc14.labelsFrom<std::vector<edm::ParameterSet>>("allowedLabelsC");
 
       edm::ParameterSet psetC;
       edm::ParameterSet psetD;
@@ -1076,18 +1038,18 @@ namespace testParameterSetDescription {
       vpset.push_back(psetD);
       vpset.push_back(psetD);
 
-      psetC.addParameter<std::vector<edm::ParameterSet> >("vSetD", vpset);
+      psetC.addParameter<std::vector<edm::ParameterSet>>("vSetD", vpset);
 
       // vSetD is an illegal parameter
       try {
         psetDesc14.validate(psetC);
         assert(0);
+      } catch (edm::Exception const&) { /* There should be an exception */
       }
-      catch(edm::Exception const&) { /* There should be an exception */ }
 
       std::vector<std::string> labels1;
       labels1.push_back(std::string("vSetD"));
-      psetC.addParameter<std::vector<std::string> >("allowedLabelsC", labels1);
+      psetC.addParameter<std::vector<std::string>>("allowedLabelsC", labels1);
 
       // Now vSetB should be an allowed parameter
       psetDesc14.validate(psetC);
@@ -1096,43 +1058,43 @@ namespace testParameterSetDescription {
       // because a description was not passed to the labelsFrom function.
 
       edm::ParameterSetDescription psetDesc15;
-      psetDesc15.labelsFrom<std::vector<edm::ParameterSet> >("allowedLabelsC", edm::ParameterSetDescription());
+      psetDesc15.labelsFrom<std::vector<edm::ParameterSet>>("allowedLabelsC", edm::ParameterSetDescription());
       // Now it should fail because the description says the contained vector<ParameterSet>
       // should have empty ParameterSets, but they have parameter "y"
       try {
         psetDesc15.validate(psetC);
         assert(0);
+      } catch (edm::Exception const&) { /* There should be an exception */
       }
-      catch(edm::Exception const&) { /* There should be an exception */ }
 
       // Now include "y" in the description and it should once again pass validation
       edm::ParameterSetDescription psetDesc6;
       edm::ParameterSetDescription psetDesc7;
       psetDesc7.add<int>("y", 1);
 
-      psetDesc6.labelsFrom<std::vector<edm::ParameterSet> >("allowedLabelsC", psetDesc7);
+      psetDesc6.labelsFrom<std::vector<edm::ParameterSet>>("allowedLabelsC", psetDesc7);
       psetDesc6.validate(psetC);
 
       // A minor variation, repeat with a string argument
       edm::ParameterSetDescription psetDesc18;
       edm::ParameterSetDescription psetDesc19;
       edm::ParameterSetDescription psetDesc20;
-      psetDesc18.labelsFrom<std::vector<edm::ParameterSet> >(std::string("allowedLabelsC"));
-      psetDesc19.labelsFrom<std::vector<edm::ParameterSet> >(std::string("allowedLabelsC"), edm::ParameterSetDescription());
-      psetDesc20.labelsFrom<std::vector<edm::ParameterSet> >(std::string("allowedLabelsC"), psetDesc7);
+      psetDesc18.labelsFrom<std::vector<edm::ParameterSet>>(std::string("allowedLabelsC"));
+      psetDesc19.labelsFrom<std::vector<edm::ParameterSet>>(std::string("allowedLabelsC"),
+                                                            edm::ParameterSetDescription());
+      psetDesc20.labelsFrom<std::vector<edm::ParameterSet>>(std::string("allowedLabelsC"), psetDesc7);
       psetDesc18.validate(psetC);
       try {
         psetDesc19.validate(psetC);
         assert(0);
+      } catch (edm::Exception const&) { /* There should be an exception */
       }
-      catch(edm::Exception const&) { /* There should be an exception */ }
       psetDesc20.validate(psetC);
     }
   }
-// ---------------------------------------------------------------------------------
+  // ---------------------------------------------------------------------------------
 
   void testNoDefault() {
-
     edm::ParameterSetDescription psetDesc;
     psetDesc.add<int>("x");
     edm::ParameterSet pset;
@@ -1140,8 +1102,8 @@ namespace testParameterSetDescription {
     try {
       psetDesc.validate(pset);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     pset.addParameter<int>("x", 1);
     psetDesc.validate(pset);
@@ -1150,14 +1112,13 @@ namespace testParameterSetDescription {
     try {
       psetDesc.validate(pset);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
   }
 
-// ---------------------------------------------------------------------------------
+  // ---------------------------------------------------------------------------------
 
   void testWrongTrackiness() {
-
     edm::ParameterSet pset1;
     pset1.addParameter<int>("test1", 1);
 
@@ -1166,8 +1127,8 @@ namespace testParameterSetDescription {
     try {
       psetDesc1.validate(pset1);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     edm::ParameterSet pset2;
     pset2.addParameter<edm::ParameterSet>("test2", edm::ParameterSet());
@@ -1177,25 +1138,24 @@ namespace testParameterSetDescription {
     try {
       psetDesc2.validate(pset2);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     edm::ParameterSet pset3;
-    pset3.addParameter<std::vector<edm::ParameterSet> >("test3", std::vector<edm::ParameterSet>());
+    pset3.addParameter<std::vector<edm::ParameterSet>>("test3", std::vector<edm::ParameterSet>());
 
     edm::ParameterSetDescription psetDesc3;
     psetDesc3.addVPSetUntracked("test3", edm::ParameterSetDescription());
     try {
       psetDesc3.validate(pset3);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
   }
 
-// ---------------------------------------------------------------------------------
+  // ---------------------------------------------------------------------------------
 
   void testWrongType() {
-
     edm::ParameterSet pset1;
     pset1.addParameter<unsigned int>("test1", 1);
 
@@ -1204,8 +1164,8 @@ namespace testParameterSetDescription {
     try {
       psetDesc1.validate(pset1);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     edm::ParameterSet pset2;
     pset2.addParameter<int>("test2", 1);
@@ -1215,8 +1175,8 @@ namespace testParameterSetDescription {
     try {
       psetDesc2.validate(pset2);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
 
     edm::ParameterSet pset3;
     pset3.addParameter<int>("test3", 1);
@@ -1226,26 +1186,22 @@ namespace testParameterSetDescription {
     try {
       psetDesc3.validate(pset3);
       assert(0);
+    } catch (edm::Exception const&) { /* There should be an exception */
     }
-    catch(edm::Exception const&) { /* There should be an exception */ }
   }
 
-// ---------------------------------------------------------------------------------
+  // ---------------------------------------------------------------------------------
 
   struct TestPluginBase {
     virtual ~TestPluginBase() = default;
   };
-  
+
   struct ATestPlugin : public TestPluginBase {
-    static void fillPSetDescription( edm::ParameterSetDescription& iPS) {
-      iPS.add<int>("anInt",5);
-    }
+    static void fillPSetDescription(edm::ParameterSetDescription& iPS) { iPS.add<int>("anInt", 5); }
   };
 
   struct BTestPlugin : public TestPluginBase {
-    static void fillPSetDescription( edm::ParameterSetDescription& iPS) {
-      iPS.add<double>("aDouble",0.5);
-    }
+    static void fillPSetDescription(edm::ParameterSetDescription& iPS) { iPS.add<double>("aDouble", 0.5); }
   };
 
   using TestPluginFactory = edmplugin::PluginFactory<testParameterSetDescription::TestPluginBase*()>;
@@ -1254,31 +1210,31 @@ namespace testParameterSetDescription {
     edmplugin::PluginManager::configure(edmplugin::standard::config());
     {
       edm::ParameterSetDescription desc;
-      desc.addNode(edm::PluginDescription<TestPluginFactory>("type",true));
+      desc.addNode(edm::PluginDescription<TestPluginFactory>("type", true));
 
       edm::ParameterSet pset1;
       pset1.addParameter<std::string>("type", "ATestPlugin");
-      pset1.addParameter<int>("anInt",3);
+      pset1.addParameter<int>("anInt", 3);
 
       desc.validate(pset1);
     }
 
     {
       edm::ParameterSetDescription desc;
-      desc.addNode(edm::PluginDescription<TestPluginFactory>("type",true));
-      
+      desc.addNode(edm::PluginDescription<TestPluginFactory>("type", true));
+
       edm::ParameterSet pset1;
       pset1.addParameter<std::string>("type", "BTestPlugin");
-      pset1.addParameter<double>("aDouble",0.2);
-      
+      pset1.addParameter<double>("aDouble", 0.2);
+
       desc.validate(pset1);
     }
 
     {
       //add defaults
       edm::ParameterSetDescription desc;
-      desc.addNode(edm::PluginDescription<TestPluginFactory>("type",true));
-      
+      desc.addNode(edm::PluginDescription<TestPluginFactory>("type", true));
+
       edm::ParameterSet pset1;
       pset1.addParameter<std::string>("type", "ATestPlugin");
       desc.validate(pset1);
@@ -1288,8 +1244,8 @@ namespace testParameterSetDescription {
     {
       //add defaults
       edm::ParameterSetDescription desc;
-      desc.addNode(edm::PluginDescription<TestPluginFactory>("type","ATestPlugin", true));
-      
+      desc.addNode(edm::PluginDescription<TestPluginFactory>("type", "ATestPlugin", true));
+
       edm::ParameterSet pset1;
       desc.validate(pset1);
       assert(pset1.getParameter<int>("anInt") == 5);
@@ -1299,62 +1255,60 @@ namespace testParameterSetDescription {
     {
       //an additional parameter
       edm::ParameterSetDescription desc;
-      desc.addNode(edm::PluginDescription<TestPluginFactory>("type",true));
-      
+      desc.addNode(edm::PluginDescription<TestPluginFactory>("type", true));
+
       edm::ParameterSet pset1;
       pset1.addParameter<std::string>("type", "ATestPlugin");
-      pset1.addParameter<int>("anInt",3);
-      pset1.addParameter<int>("NotRight",3);
+      pset1.addParameter<int>("anInt", 3);
+      pset1.addParameter<int>("NotRight", 3);
 
       try {
         desc.validate(pset1);
         assert(false);
-      }catch(edm::Exception const&iException) {
+      } catch (edm::Exception const& iException) {
       }
     }
 
     {
       //missing type
       edm::ParameterSetDescription desc;
-      desc.addNode(edm::PluginDescription<TestPluginFactory>("type",true));
-      
+      desc.addNode(edm::PluginDescription<TestPluginFactory>("type", true));
+
       edm::ParameterSet pset1;
-      pset1.addParameter<int>("anInt",3);
-      
+      pset1.addParameter<int>("anInt", 3);
+
       try {
         desc.validate(pset1);
         assert(false);
-      }catch(edm::Exception const&iException) {
+      } catch (edm::Exception const& iException) {
       }
     }
 
     {
       //a non-existent type
       edm::ParameterSetDescription desc;
-      desc.addNode(edm::PluginDescription<TestPluginFactory>("type",true));
-      
+      desc.addNode(edm::PluginDescription<TestPluginFactory>("type", true));
+
       edm::ParameterSet pset1;
       pset1.addParameter<std::string>("type", "ZTestPlugin");
-      
+
       try {
         desc.validate(pset1);
         assert(false);
-      }catch(cms::Exception const&iException) {
+      } catch (cms::Exception const& iException) {
         //std::cout <<iException.what()<<std::endl;
       }
     }
-
   }
-}
+}  // namespace testParameterSetDescription
 using TestPluginFactory = testParameterSetDescription::TestPluginFactory;
 
 EDM_REGISTER_VALIDATED_PLUGINFACTORY(TestPluginFactory, "TestPluginFWCoreParameterSet");
 
 DEFINE_EDM_VALIDATED_PLUGIN(TestPluginFactory, testParameterSetDescription::ATestPlugin, "ATestPlugin");
-DEFINE_EDM_VALIDATED_PLUGIN(TestPluginFactory,testParameterSetDescription::BTestPlugin, "BTestPlugin");
+DEFINE_EDM_VALIDATED_PLUGIN(TestPluginFactory, testParameterSetDescription::BTestPlugin, "BTestPlugin");
 
 int main(int, char**) try {
-
   std::cout << "Running TestFWCoreParameterSetDescription from parameterSetDescription_t.cc" << std::endl;
 
   {
@@ -1366,15 +1320,13 @@ int main(int, char**) try {
     edm::ParameterSet params;
     psetDesc.validate(params);
 
-    params.addParameter<std::string>("testname",
-                                   std::string("testvalue"));
+    params.addParameter<std::string>("testname", std::string("testvalue"));
 
     // Expect this to throw, parameter not in description
     try {
       psetDesc.validate(params);
       assert(0);
-    }
-    catch(edm::Exception const&) {
+    } catch (edm::Exception const&) {
       // OK
     }
 
@@ -1392,8 +1344,7 @@ int main(int, char**) try {
     edm::ParameterSetDescription psetDesc;
 
     edm::ParameterSet params;
-    params.addParameter<std::string>("testname",
-                                   std::string("testvalue"));
+    params.addParameter<std::string>("testname", std::string("testvalue"));
     psetDesc.setUnknown();
     assert(psetDesc.isUnknown());
 
@@ -1405,7 +1356,7 @@ int main(int, char**) try {
     // add an entry into a ParameterSet without FileInPath pointing
     // at a real file.
     edm::ParameterSetDescription psetDesc;
-    edm::ParameterDescriptionBase * par = psetDesc.add<edm::FileInPath>("fileInPath", edm::FileInPath());
+    edm::ParameterDescriptionBase* par = psetDesc.add<edm::FileInPath>("fileInPath", edm::FileInPath());
     assert(par->type() == edm::k_FileInPath);
     assert(edm::parameterTypeEnumToString(par->type()) == std::string("FileInPath"));
   }
@@ -1416,7 +1367,7 @@ int main(int, char**) try {
   psetDesc.reserve(2);
 
   int a = 1;
-  edm::ParameterDescriptionBase * par = psetDesc.add<int>(std::string("ivalue"), a);
+  edm::ParameterDescriptionBase* par = psetDesc.add<int>(std::string("ivalue"), a);
   assert(par->exists(pset) == false);
   assert(par->partiallyExists(pset) == false);
   assert(par->howManyXORSubNodesExist(pset) == 0);
@@ -1435,8 +1386,7 @@ int main(int, char**) try {
   try {
     psetDesc.validate(psetWrongTrackiness);
     assert(0);
-  }
-  catch(edm::Exception const&) {
+  } catch (edm::Exception const&) {
     // There should be an exception
   }
 
@@ -1445,15 +1395,13 @@ int main(int, char**) try {
   try {
     psetDesc.validate(psetWrongType);
     assert(0);
-  }
-  catch(edm::Exception const&) {
+  } catch (edm::Exception const&) {
     // There should be an exception
   }
 
   edm::ParameterSetDescription::const_iterator parIter = psetDesc.begin();
   assert(parIter->node().operator->() == par);
 
-
   unsigned b = 2;
   par = psetDesc.add<unsigned>("uvalue", b);
   pset.addParameter<unsigned>("uvalue", b);
@@ -1534,56 +1482,56 @@ int main(int, char**) try {
   assert(edm::parameterTypeEnumToString(par->type()) == std::string("InputTag"));
 
   std::vector<int> v1;
-  par = psetDesc.add<std::vector<int> >("v1", v1);
-  pset.addParameter<std::vector<int> >("v1", v1);
+  par = psetDesc.add<std::vector<int>>("v1", v1);
+  pset.addParameter<std::vector<int>>("v1", v1);
   assert(par->type() == edm::k_vint32);
   assert(edm::parameterTypeEnumToString(par->type()) == std::string("vint32"));
 
   std::vector<unsigned> v2;
-  par = psetDesc.add<std::vector<unsigned> >("v2", v2);
-  pset.addParameter<std::vector<unsigned> >("v2", v2);
+  par = psetDesc.add<std::vector<unsigned>>("v2", v2);
+  pset.addParameter<std::vector<unsigned>>("v2", v2);
   assert(par->type() == edm::k_vuint32);
   assert(edm::parameterTypeEnumToString(par->type()) == std::string("vuint32"));
 
   std::vector<long long> v3;
-  par = psetDesc.add<std::vector<long long> >("v3", v3);
-  pset.addParameter<std::vector<long long> >("v3", v3);
+  par = psetDesc.add<std::vector<long long>>("v3", v3);
+  pset.addParameter<std::vector<long long>>("v3", v3);
   assert(par->type() == edm::k_vint64);
   assert(edm::parameterTypeEnumToString(par->type()) == std::string("vint64"));
 
   std::vector<unsigned long long> v4;
-  par = psetDesc.add<std::vector<unsigned long long> >("v4", v4);
-  pset.addParameter<std::vector<unsigned long long> >("v4", v4);
+  par = psetDesc.add<std::vector<unsigned long long>>("v4", v4);
+  pset.addParameter<std::vector<unsigned long long>>("v4", v4);
   assert(par->type() == edm::k_vuint64);
   assert(edm::parameterTypeEnumToString(par->type()) == std::string("vuint64"));
 
   std::vector<double> v5;
-  par = psetDesc.add<std::vector<double> >("v5", v5);
-  pset.addParameter<std::vector<double> >("v5", v5);
+  par = psetDesc.add<std::vector<double>>("v5", v5);
+  pset.addParameter<std::vector<double>>("v5", v5);
   assert(par->type() == edm::k_vdouble);
   assert(edm::parameterTypeEnumToString(par->type()) == std::string("vdouble"));
 
   std::vector<std::string> v6;
-  par = psetDesc.add<std::vector<std::string> >("v6", v6);
-  pset.addParameter<std::vector<std::string> >("v6", v6);
+  par = psetDesc.add<std::vector<std::string>>("v6", v6);
+  pset.addParameter<std::vector<std::string>>("v6", v6);
   assert(par->type() == edm::k_vstring);
   assert(edm::parameterTypeEnumToString(par->type()) == std::string("vstring"));
 
   std::vector<edm::EventID> v7;
-  par = psetDesc.add<std::vector<edm::EventID> >("v7", v7);
-  pset.addParameter<std::vector<edm::EventID> >("v7", v7);
+  par = psetDesc.add<std::vector<edm::EventID>>("v7", v7);
+  pset.addParameter<std::vector<edm::EventID>>("v7", v7);
   assert(par->type() == edm::k_VEventID);
   assert(edm::parameterTypeEnumToString(par->type()) == std::string("VEventID"));
 
   std::vector<edm::LuminosityBlockID> v8;
-  par = psetDesc.add<std::vector<edm::LuminosityBlockID> >("v8", v8);
-  pset.addParameter<std::vector<edm::LuminosityBlockID> >("v8", v8);
+  par = psetDesc.add<std::vector<edm::LuminosityBlockID>>("v8", v8);
+  pset.addParameter<std::vector<edm::LuminosityBlockID>>("v8", v8);
   assert(par->type() == edm::k_VLuminosityBlockID);
   assert(edm::parameterTypeEnumToString(par->type()) == std::string("VLuminosityBlockID"));
 
   std::vector<edm::InputTag> v9;
-  par = psetDesc.add<std::vector<edm::InputTag> >("v9", v9);
-  pset.addParameter<std::vector<edm::InputTag> >("v9", v9);
+  par = psetDesc.add<std::vector<edm::InputTag>>("v9", v9);
+  pset.addParameter<std::vector<edm::InputTag>>("v9", v9);
   assert(par->type() == edm::k_VInputTag);
   assert(edm::parameterTypeEnumToString(par->type()) == std::string("VInputTag"));
 
@@ -1606,7 +1554,7 @@ int main(int, char**) try {
   assert(par->partiallyExists(pset) == false);
   assert(par->howManyXORSubNodesExist(pset) == 0);
   std::vector<edm::ParameterSet> vp1;
-  pset.addParameter<std::vector<edm::ParameterSet> >("psetVectorDesc", vp1);
+  pset.addParameter<std::vector<edm::ParameterSet>>("psetVectorDesc", vp1);
   assert(par->type() == edm::k_VPSet);
   assert(edm::parameterTypeEnumToString(par->type()) == std::string("VPSet"));
   assert(par->exists(pset) == true);
@@ -1633,27 +1581,28 @@ int main(int, char**) try {
   vPset.push_back(edm::ParameterSet());
   vPset.push_back(nest1);
 
-  pset.addUntrackedParameter<std::vector<edm::ParameterSet> >("nestLevel0", vPset);
+  pset.addUntrackedParameter<std::vector<edm::ParameterSet>>("nestLevel0", vPset);
 
   std::vector<edm::ParameterSetDescription> testDescriptions;
   testDescriptions.push_back(psetDesc);
   testDescriptions.push_back(psetDesc);
   testDescriptions.push_back(psetDesc);
 
-  for(int i = 0; i < 3; ++i) {
-
+  for (int i = 0; i < 3; ++i) {
     edm::ParameterSetDescription nestLevel2;
 
     // for the first test do not put a parameter in the description
     // so there will be an extra parameter in the ParameterSet and
     // validation should fail.
-    if(i > 0) nestLevel2.add<int>("intLevel2a", 1);
+    if (i > 0)
+      nestLevel2.add<int>("intLevel2a", 1);
 
     // for the next test validation should pass
 
     // For the last test add an extra required parameter in the
     // description that is not in the ParameterSet.
-    if(i == 2) nestLevel2.add<int>("intLevel2extra", 11);
+    if (i == 2)
+      nestLevel2.add<int>("intLevel2extra", 11);
 
     nestLevel2.addUntracked<int>("intLevel2b", 1);
     nestLevel2.addOptional<int>("intLevel2c", 1);
@@ -1672,8 +1621,7 @@ int main(int, char**) try {
   try {
     testDescriptions[0].validate(pset);
     assert(0);
-  }
-  catch(edm::Exception const&) {
+  } catch (edm::Exception const&) {
     // There should be an exception
   }
 
@@ -1684,10 +1632,9 @@ int main(int, char**) try {
   // the missing parameter into the ParameterSet
   testDescriptions[2].validate(pset);
 
-  std::vector<edm::ParameterSet> const& vpset =
-    pset.getUntrackedParameterSetVector("nestLevel0");
+  std::vector<edm::ParameterSet> const& vpset = pset.getUntrackedParameterSetVector("nestLevel0");
   edm::ParameterSet const& psetInPset = vpset[1].getParameterSet("nestLevel1b");
-  assert(psetInPset.getParameter<int>("intLevel2extra") ==  11);
+  assert(psetInPset.getParameter<int>("intLevel2extra") == 11);
 
   // One more iteration, this time the purpose is to
   // test the parameterSetDescription accessors.
@@ -1738,12 +1685,12 @@ int main(int, char**) try {
   testParameterSetDescription::testWrongTrackiness();
   testParameterSetDescription::testWrongType();
   testParameterSetDescription::testPlugin();
-  
+
   return 0;
-} catch(cms::Exception const& e) {
+} catch (cms::Exception const& e) {
   std::cerr << e.explainSelf() << std::endl;
   return 1;
-} catch(std::exception const& e) {
+} catch (std::exception const& e) {
   std::cerr << e.what() << std::endl;
   return 1;
 }
diff --git a/FWCore/ParameterSet/test/ps_t.cppunit.cc b/FWCore/ParameterSet/test/ps_t.cppunit.cc
index 142a50ee3619c..9bfb0c8804ae4 100644
--- a/FWCore/ParameterSet/test/ps_t.cppunit.cc
+++ b/FWCore/ParameterSet/test/ps_t.cppunit.cc
@@ -14,9 +14,7 @@
 #include "FWCore/Utilities/interface/Algorithms.h"
 #include "FWCore/Utilities/interface/Digest.h"
 
-
-class testps: public CppUnit::TestFixture
-{
+class testps : public CppUnit::TestFixture {
   //CPPUNIT_TEST_EXCEPTION(emptyTest,edm::Exception);
   CPPUNIT_TEST_SUITE(testps);
   CPPUNIT_TEST(emptyTest);
@@ -42,8 +40,8 @@ class testps: public CppUnit::TestFixture
   CPPUNIT_TEST_SUITE_END();
 
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void emptyTest();
   void boolTest();
@@ -72,107 +70,86 @@ class testps: public CppUnit::TestFixture
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testps);
 
-void testps::emptyTest()
-{
+void testps::emptyTest() {
   edm::ParameterSet p1;
   std::string p1_encoded = p1.toString();
   edm::ParameterSet p2(p1_encoded);
-  CPPUNIT_ASSERT (p1 == p2);
+  CPPUNIT_ASSERT(p1 == p2);
 }
 
 namespace {
-  bool do_compare(const edm::EventRange& iLHS,
-                  const edm::EventRange& iRHS) {
-    return iLHS.startEventID() == iRHS.startEventID() &&
-    iLHS.endEventID() == iRHS.endEventID();
+  bool do_compare(const edm::EventRange& iLHS, const edm::EventRange& iRHS) {
+    return iLHS.startEventID() == iRHS.startEventID() && iLHS.endEventID() == iRHS.endEventID();
   }
-  
-  template<class T>
-  bool do_compare(const T& iLHS, const T& iRHS){
+
+  template <class T>
+  bool do_compare(const T& iLHS, const T& iRHS) {
     return iLHS == iRHS;
   }
-  
-  template<class T, class A>
-  bool do_compare(const std::vector<T,A>& iLHS,
-                  const std::vector<T,A>& iRHS) {
-    if(iLHS.size() != iRHS.size()) {
+
+  template <class T, class A>
+  bool do_compare(const std::vector<T, A>& iLHS, const std::vector<T, A>& iRHS) {
+    if (iLHS.size() != iRHS.size()) {
       return false;
     }
-    typename std::vector<T,A>::const_iterator itL = iLHS.begin();
-    typename std::vector<T,A>::const_iterator itR = iRHS.begin();
-    typename std::vector<T,A>::const_iterator itLEnd = iLHS.end();
-    for(; itL != itLEnd; ++itL,++itR) {
-      if(!do_compare(*itL,*itR)) {
+    typename std::vector<T, A>::const_iterator itL = iLHS.begin();
+    typename std::vector<T, A>::const_iterator itR = iRHS.begin();
+    typename std::vector<T, A>::const_iterator itLEnd = iLHS.end();
+    for (; itL != itLEnd; ++itL, ++itR) {
+      if (!do_compare(*itL, *itR)) {
         return false;
       }
     }
     return true;
   }
-  
-}
 
+}  // namespace
 
 template <class T>
-void trackedTestbody(const T& value)
-{
+void trackedTestbody(const T& value) {
   try {
     edm::ParameterSet p1;
     p1.template addParameter<T>("x", value);
     p1.registerIt();
-    CPPUNIT_ASSERT(do_compare(p1.template getParameter<T>("x") ,value) );
+    CPPUNIT_ASSERT(do_compare(p1.template getParameter<T>("x"), value));
     std::string p1_encoded = p1.toString();
     edm::ParameterSet p2(p1_encoded);
     CPPUNIT_ASSERT(p1 == p2);
-    CPPUNIT_ASSERT(do_compare(p2.template getParameter<T>("x") , value) );
+    CPPUNIT_ASSERT(do_compare(p2.template getParameter<T>("x"), value));
+  } catch (cms::Exception& x) {
+    std::cerr << "cms Exception caught, message follows\n" << x.what();
+    throw;
+  } catch (std::exception& x) {
+    std::cerr << "std exception caught, message follows\n" << x.what();
+    throw;
+  } catch (...) {
+    std::cerr << "Unrecognized exception type thrown\n"
+              << "no details available\n";
+    throw;
   }
-  catch (cms::Exception& x)
-    {
-      std::cerr << "cms Exception caught, message follows\n"
-		<< x.what();
-      throw;
-    }
-  catch (std::exception& x)
-    {
-      std::cerr << "std exception caught, message follows\n"
-		<< x.what();
-      throw;
-    }
-  catch (...)
-    {
-      std::cerr << "Unrecognized exception type thrown\n"
-		<< "no details available\n";
-      throw;	
-    }
 }
 
 template <class T>
-void
-untrackedTestbody(const T& value)
-{
+void untrackedTestbody(const T& value) {
   edm::ParameterSet p;
   p.template addUntrackedParameter<T>("x", value);
-  CPPUNIT_ASSERT(do_compare(p.template getUntrackedParameter<T>("x") , value));
+  CPPUNIT_ASSERT(do_compare(p.template getUntrackedParameter<T>("x"), value));
 
-  CPPUNIT_ASSERT_THROW(p.template getUntrackedParameter<T>("does not exist"), 
-   		       cms::Exception);
+  CPPUNIT_ASSERT_THROW(p.template getUntrackedParameter<T>("does not exist"), cms::Exception);
 }
 
 template <class T>
-void
-testbody(T value)
-{
+void testbody(T value) {
   trackedTestbody<T>(value);
   untrackedTestbody<T>(value);
 }
 
-void testps::boolTest()
-{
+void testps::boolTest() {
   testbody<bool>(false);
   testbody<bool>(true);
 }
 
-void testps::intTest()
-{
+void testps::intTest() {
   testbody<int>(-std::numeric_limits<int>::max());
   testbody<int>(-2112);
   testbody<int>(-0);
@@ -181,20 +158,17 @@ void testps::intTest()
   testbody<int>(std::numeric_limits<int>::max());
 }
 
-void testps::uintTest()
-{
+void testps::uintTest() {
   testbody<unsigned int>(0);
   testbody<unsigned int>(35621);
   testbody<unsigned int>(std::numeric_limits<unsigned int>::max());
-  
+
   testbody<std::vector<unsigned int> >(std::vector<unsigned int>());
   testbody<std::vector<unsigned int> >(std::vector<unsigned int>(1, 35621));
   testbody<std::vector<unsigned int> >(std::vector<unsigned int>(1, std::numeric_limits<unsigned int>::max()));
-
 }
 
-void testps::doubleTest()
-{
+void testps::doubleTest() {
   testbody<double>(-1.25);
   testbody<double>(-0.0);
   testbody<double>(0.0);
@@ -205,16 +179,15 @@ void testps::doubleTest()
   testbody<double>(-2.3456789e231);
   testbody<double>(2.3456789e-231);
   testbody<double>(2.3456789e231);
-  double oneThird = 1.0/3.0;
+  double oneThird = 1.0 / 3.0;
   testbody<double>(oneThird);
 }
 
-void testps::stringTest()
-{
+void testps::stringTest() {
   testbody<std::string>("");
   testbody<std::string>("Hello there");
   testbody<std::string>("123");
-  testbody<std::string>("This\nis\tsilly\n");  
+  testbody<std::string>("This\nis\tsilly\n");
   std::vector<std::string> vs;
   vs.push_back("");
   vs.push_back("1");
@@ -222,60 +195,54 @@ void testps::stringTest()
   vs.push_back("three");
   testbody<std::vector<std::string> >(vs);
   edm::ParameterSet p1;
-  p1.addParameter<std::vector<std::string> >("vs",vs);
+  p1.addParameter<std::vector<std::string> >("vs", vs);
   p1.registerIt();
   std::vector<std::string> vs2 = p1.getParameter<std::vector<std::string> >("vs");
   //FIXME doesn't count spaces
 }
 
-void testps::eventIDTest()
-{
+void testps::eventIDTest() {
   testbody<edm::EventID>(edm::EventID());
   testbody<edm::EventID>(edm::EventID::firstValidEvent());
-  testbody<edm::EventID>(edm::EventID(2,3,4));
-  testbody<edm::EventID>(edm::EventID(2,3,edm::EventID::maxEventNumber()));
-  testbody<edm::EventID>(edm::EventID(edm::EventID::maxRunNumber(), edm::EventID::maxLuminosityBlockNumber(), edm::EventID::maxEventNumber()));
+  testbody<edm::EventID>(edm::EventID(2, 3, 4));
+  testbody<edm::EventID>(edm::EventID(2, 3, edm::EventID::maxEventNumber()));
+  testbody<edm::EventID>(edm::EventID(
+      edm::EventID::maxRunNumber(), edm::EventID::maxLuminosityBlockNumber(), edm::EventID::maxEventNumber()));
 }
 
-void testps::eventRangeTest()
-{
+void testps::eventRangeTest() {
   testbody<edm::EventRange>(edm::EventRange());
-  testbody<edm::EventRange>(edm::EventRange(1,1,1,
-                                            edm::EventID::maxRunNumber(), edm::EventID::maxLuminosityBlockNumber(), edm::EventID::maxEventNumber()));
-  testbody<edm::EventRange>(edm::EventRange(2,3,4,2,3,10));
-
+  testbody<edm::EventRange>(edm::EventRange(
+      1, 1, 1, edm::EventID::maxRunNumber(), edm::EventID::maxLuminosityBlockNumber(), edm::EventID::maxEventNumber()));
+  testbody<edm::EventRange>(edm::EventRange(2, 3, 4, 2, 3, 10));
 
-  testbody<edm::EventRange>(edm::EventRange(1,0,1,
-                                            edm::EventID::maxRunNumber(),0,edm::EventID::maxEventNumber()));
-  testbody<edm::EventRange>(edm::EventRange(2,0,4,2,0,10));
+  testbody<edm::EventRange>(edm::EventRange(1, 0, 1, edm::EventID::maxRunNumber(), 0, edm::EventID::maxEventNumber()));
+  testbody<edm::EventRange>(edm::EventRange(2, 0, 4, 2, 0, 10));
 }
 
-void testps::vEventRangeTest()
-{
+void testps::vEventRangeTest() {
   testbody<std::vector<edm::EventRange> >(std::vector<edm::EventRange>());
-  testbody<std::vector<edm::EventRange> >(std::vector<edm::EventRange>(1, 
-                                                                       edm::EventRange(1,1,1,
-                                                                                       edm::EventID::maxRunNumber(),
-                                                                                       edm::EventID::maxLuminosityBlockNumber(),
-                                                                                       edm::EventID::maxEventNumber())));
-
-  testbody<std::vector<edm::EventRange> >(std::vector<edm::EventRange>(1, 
-                                                                       edm::EventRange(1,0,1,
-                                                                                       edm::EventID::maxRunNumber(),
-                                                                                       0,
-                                                                                       edm::EventID::maxEventNumber())));
+  testbody<std::vector<edm::EventRange> >(
+      std::vector<edm::EventRange>(1,
+                                   edm::EventRange(1,
+                                                   1,
+                                                   1,
+                                                   edm::EventID::maxRunNumber(),
+                                                   edm::EventID::maxLuminosityBlockNumber(),
+                                                   edm::EventID::maxEventNumber())));
+
+  testbody<std::vector<edm::EventRange> >(std::vector<edm::EventRange>(
+      1, edm::EventRange(1, 0, 1, edm::EventID::maxRunNumber(), 0, edm::EventID::maxEventNumber())));
 
   std::vector<edm::EventRange> er;
   er.reserve(2);
-  er.push_back(edm::EventRange(2,3,4,2,3,10));
-  er.push_back(edm::EventRange(5,1,1,10,3,10));
-  
+  er.push_back(edm::EventRange(2, 3, 4, 2, 3, 10));
+  er.push_back(edm::EventRange(5, 1, 1, 10, 3, 10));
+
   testbody<std::vector<edm::EventRange> >(er);
 }
 
-
-void testps::fileInPathTest()
-{
+void testps::fileInPathTest() {
   edm::ParameterSet p;
   edm::FileInPath fip("FWCore/ParameterSet/python/Config.py");
   p.addParameter<edm::FileInPath>("fip", fip);
@@ -283,12 +250,10 @@ void testps::fileInPathTest()
   CPPUNIT_ASSERT(p.getParameterNamesForType<edm::FileInPath>()[0] == "fip");
 }
 
-
-void testps::doubleEqualityTest()
-{
+void testps::doubleEqualityTest() {
   edm::ParameterSet p1, p2, p3;
   p1.addParameter<double>("x", 0.1);
-  p2.addParameter<double>("x", 1.0e-1);  
+  p2.addParameter<double>("x", 1.0e-1);
   p3.addParameter<double>("x", 0.100);
   p1.registerIt();
   p2.registerIt();
@@ -298,12 +263,11 @@ void testps::doubleEqualityTest()
   CPPUNIT_ASSERT(p2 == p3);
 
   CPPUNIT_ASSERT(p1.toString() == p2.toString());
-  CPPUNIT_ASSERT(p1.toString()  == p3.toString());
+  CPPUNIT_ASSERT(p1.toString() == p3.toString());
   CPPUNIT_ASSERT(p2.toString() == p3.toString());
 }
 
-void testps::negativeZeroTest()
-{
+void testps::negativeZeroTest() {
   edm::ParameterSet a1, a2;
   a1.addParameter<double>("x", 0.0);
   a2.addParameter<double>("x", -0.0);
@@ -316,8 +280,7 @@ void testps::negativeZeroTest()
   CPPUNIT_ASSERT(a1.getParameter<double>("x") == a2.getParameter<double>("x"));
 }
 
-void testps::idTest()
-{
+void testps::idTest() {
   edm::ParameterSet a;
   a.registerIt();
   edm::ParameterSetID a_id = a.id();
@@ -326,41 +289,37 @@ void testps::idTest()
   b.registerIt();
   edm::ParameterSetID b_id = b.id();
 
-  CPPUNIT_ASSERT (a != b); 
-  CPPUNIT_ASSERT (a.id() != b.id());
+  CPPUNIT_ASSERT(a != b);
+  CPPUNIT_ASSERT(a.id() != b.id());
 }
 
-void testps::calculateIDTest()
-{
-  std::vector<int> thousand(1000,0);
-  std::vector<int> hundred(100,0);
+void testps::calculateIDTest() {
+  std::vector<int> thousand(1000, 0);
+  std::vector<int> hundred(100, 0);
   edm::ParameterSet a;
   edm::ParameterSet b;
   edm::ParameterSet c;
-  a.addParameter<double>("pi",3.14);
-  a.addParameter<int>("answer", 42),
-  a.addParameter<std::string>("amiga", "rules");
+  a.addParameter<double>("pi", 3.14);
+  a.addParameter<int>("answer", 42), a.addParameter<std::string>("amiga", "rules");
   a.addParameter<std::vector<int> >("thousands", thousand);
   a.addUntrackedParameter<double>("e", 2.72);
-  a.addUntrackedParameter<int>("question", 41+1);
+  a.addUntrackedParameter<int>("question", 41 + 1);
   a.addUntrackedParameter<std::string>("atari", "too");
   a.addUntrackedParameter<std::vector<int> >("hundred", hundred);
 
-  b.addParameter<double>("pi",3.14);
-  b.addParameter<int>("answer", 42),
-  b.addParameter<std::string>("amiga", "rules");
+  b.addParameter<double>("pi", 3.14);
+  b.addParameter<int>("answer", 42), b.addParameter<std::string>("amiga", "rules");
   b.addParameter<std::vector<int> >("thousands", thousand);
   b.addUntrackedParameter<double>("e", 2.72);
-  b.addUntrackedParameter<int>("question", 41+1);
+  b.addUntrackedParameter<int>("question", 41 + 1);
   b.addUntrackedParameter<std::string>("atari", "too");
   b.addUntrackedParameter<std::vector<int> >("hundred", hundred);
 
-  c.addParameter<double>("pi",3.14);
-  c.addParameter<int>("answer", 42),                                                                                                                                                                                       
-  c.addParameter<std::string>("amiga", "rules");
+  c.addParameter<double>("pi", 3.14);
+  c.addParameter<int>("answer", 42), c.addParameter<std::string>("amiga", "rules");
   c.addParameter<std::vector<int> >("thousands", thousand);
   c.addUntrackedParameter<double>("e", 2.72);
-  c.addUntrackedParameter<int>("question", 41+1);
+  c.addUntrackedParameter<int>("question", 41 + 1);
   c.addUntrackedParameter<std::string>("atari", "too");
   c.addUntrackedParameter<std::vector<int> >("hundred", hundred);
 
@@ -370,26 +329,25 @@ void testps::calculateIDTest()
 
   a.addUntrackedParameter<std::vector<edm::ParameterSet> >("vps", vb);
   std::string stringrep;
-  a.toString(stringrep);                                                                                                                                                                                                
+  a.toString(stringrep);
   cms::Digest md5alg(stringrep);
   cms::Digest newDigest;
   a.toDigest(newDigest);
-  CPPUNIT_ASSERT (md5alg.digest().toString() == newDigest.digest().toString());
+  CPPUNIT_ASSERT(md5alg.digest().toString() == newDigest.digest().toString());
 }
 
-void testps::mapByIdTest()
-{
+void testps::mapByIdTest() {
   // makes parameter sets and ids
   edm::ParameterSet a;
-  a.addParameter<double>("pi",3.14);
+  a.addParameter<double>("pi", 3.14);
   a.addParameter<std::string>("name", "Bub");
   a.registerIt();
-  CPPUNIT_ASSERT( a.exists("pi") );
-  CPPUNIT_ASSERT( !a.exists("pie") );
+  CPPUNIT_ASSERT(a.exists("pi"));
+  CPPUNIT_ASSERT(!a.exists("pie"));
 
   edm::ParameterSet b;
   b.addParameter<bool>("b", false);
-  b.addParameter<std::vector<int> >("three_zeros", std::vector<int>(3,0));
+  b.addParameter<std::vector<int> >("three_zeros", std::vector<int>(3, 0));
   b.registerIt();
 
   edm::ParameterSet c;
@@ -406,12 +364,12 @@ void testps::mapByIdTest()
   edm::ParameterSetID id_d = d.id();
 
   // fill map
-  typedef std::map<edm::ParameterSetID,edm::ParameterSet> map_t;
-  map_t   psets;
+  typedef std::map<edm::ParameterSetID, edm::ParameterSet> map_t;
+  map_t psets;
 
   psets.insert(std::make_pair(id_a, a));
   psets.insert(std::make_pair(id_b, b));
-  psets.insert(std::make_pair(id_c, c));  
+  psets.insert(std::make_pair(id_c, c));
   psets.insert(std::make_pair(id_d, d));
 
   // query map
@@ -423,17 +381,14 @@ void testps::mapByIdTest()
 }
 
 template <class T>
-void 
-test_for_name()
-{
+void test_for_name() {
   edm::ParameterSet preal;
   edm::ParameterSet const& ps = preal;
-  // Use 'ps' to make sure we're only getting 'const' access; 
+  // Use 'ps' to make sure we're only getting 'const' access;
   // use 'preal' when we need to modify the underlying ParameterSet.
 
   std::vector<std::string> names = ps.getParameterNames();
-  CPPUNIT_ASSERT( names.empty() );
-
+  CPPUNIT_ASSERT(names.empty());
 
   // The following causes failure, because of an apparent GCC bug in comparing bools!
   //T value;
@@ -441,27 +396,27 @@ test_for_name()
   T value = T();
   preal.template addParameter<T>("x", value);
   names = ps.getParameterNames();
-  CPPUNIT_ASSERT( names.size() == 1 );
-  CPPUNIT_ASSERT( names[0] == "x" );
+  CPPUNIT_ASSERT(names.size() == 1);
+  CPPUNIT_ASSERT(names[0] == "x");
   T stored_value = ps.template getParameter<T>(names[0]);
-  CPPUNIT_ASSERT( stored_value == value );
+  CPPUNIT_ASSERT(stored_value == value);
 
   preal.template addUntrackedParameter<T>("y", value);
   preal.registerIt();
   names = ps.getParameterNames();
-  CPPUNIT_ASSERT( names.size() == 2 );
+  CPPUNIT_ASSERT(names.size() == 2);
 
   edm::sort_all(names);
-  CPPUNIT_ASSERT( edm::binary_search_all(names, "x") );
-  CPPUNIT_ASSERT( edm::binary_search_all(names, "y") );
+  CPPUNIT_ASSERT(edm::binary_search_all(names, "x"));
+  CPPUNIT_ASSERT(edm::binary_search_all(names, "y"));
   names = ps.template getParameterNamesForType<T>();
-  CPPUNIT_ASSERT( names.size() == 1 );
+  CPPUNIT_ASSERT(names.size() == 1);
   edm::sort_all(names);
-  CPPUNIT_ASSERT( edm::binary_search_all(names, "x") );
+  CPPUNIT_ASSERT(edm::binary_search_all(names, "x"));
   names = ps.template getParameterNamesForType<T>(false);
-  CPPUNIT_ASSERT( names.size() == 1 );
+  CPPUNIT_ASSERT(names.size() == 1);
   edm::sort_all(names);
-  CPPUNIT_ASSERT( edm::binary_search_all(names, "y") );
+  CPPUNIT_ASSERT(edm::binary_search_all(names, "y"));
 
   std::string firstString = ps.toString();
   edm::ParameterSet p2(firstString);
@@ -473,13 +428,12 @@ test_for_name()
   ps.allToString(allString);
   //since have untracked parameter these strings will not be identical
   CPPUNIT_ASSERT(firstString != allString);
-  
+
   edm::ParameterSet pAll(allString);
-  CPPUNIT_ASSERT(pAll.getParameterNames().size()==2);
+  CPPUNIT_ASSERT(pAll.getParameterNames().size() == 2);
 }
 
-void testps::nameAccessTest()
-{
+void testps::nameAccessTest() {
   test_for_name<bool>();
 
   test_for_name<int>();
@@ -494,7 +448,7 @@ void testps::nameAccessTest()
   test_for_name<std::string>();
   test_for_name<std::vector<std::string> >();
   test_for_name<edm::ParameterSet>();
-  test_for_name<std::vector<edm::ParameterSet> >();  
+  test_for_name<std::vector<edm::ParameterSet> >();
 
   // Can't make default FileInPath objects...
 
@@ -505,15 +459,12 @@ void testps::nameAccessTest()
     p.addParameter<double>("a", 2.5);
     p.registerIt();
     const bool tracked = true;
-    std::vector<std::string> names = 
-      p.getParameterNamesForType<int>(tracked);
-    CPPUNIT_ASSERT( names.empty() ); 
+    std::vector<std::string> names = p.getParameterNamesForType<int>(tracked);
+    CPPUNIT_ASSERT(names.empty());
   }
-
 }
 
-void testps::testEmbeddedPSet()
-{
+void testps::testEmbeddedPSet() {
   edm::ParameterSet ps;
   edm::ParameterSet psEmbedded, psDeeper;
   psEmbedded.addUntrackedParameter<std::string>("p1", "wham");
@@ -554,7 +505,8 @@ void testps::testEmbeddedPSet()
   CPPUNIT_ASSERT(trackedPart.exists("psEmbedded"));
   CPPUNIT_ASSERT(trackedPart.getParameterSet("psEmbedded").exists("p2"));
   CPPUNIT_ASSERT(!trackedPart.getParameterSet("psEmbedded").exists("p1"));
-  CPPUNIT_ASSERT(trackedPart.getParameterSet("psEmbedded").getParameterSet("psDeeper").getParameter<int>("deepest") == 6);
+  CPPUNIT_ASSERT(trackedPart.getParameterSet("psEmbedded").getParameterSet("psDeeper").getParameter<int>("deepest") ==
+                 6);
   CPPUNIT_ASSERT(ps.getUntrackedParameter<unsigned long long>("u64") == 64);
   CPPUNIT_ASSERT(!trackedPart.exists("u64"));
   std::vector<edm::ParameterSet> const& vpset1 = trackedPart.getParameterSetVector("psVPset");
@@ -563,8 +515,7 @@ void testps::testEmbeddedPSet()
   CPPUNIT_ASSERT(vpset1[2].getParameter<int>("int3") == 3);
 }
 
-void testps::testRegistration()
-{
+void testps::testRegistration() {
   edm::ParameterSet ps;
   edm::ParameterSet psEmbedded, psDeeper;
   psEmbedded.addUntrackedParameter<std::string>("p1", "wham");
@@ -591,8 +542,7 @@ void testps::testRegistration()
   CPPUNIT_ASSERT(psDeeper.isRegistered());
 }
 
-void testps::testCopyFrom()
-{
+void testps::testCopyFrom() {
   edm::ParameterSet psOld;
   edm::ParameterSet psNew;
   edm::ParameterSet psInternal;
@@ -609,8 +559,7 @@ void testps::testCopyFrom()
   CPPUNIT_ASSERT(psNew.existsAs<std::vector<edm::ParameterSet> >("vps"));
 }
 
-void testps::testGetParameterAsString()
-{
+void testps::testGetParameterAsString() {
   edm::ParameterSet ps;
   edm::ParameterSet psInternal;
   std::vector<edm::ParameterSet> vpset;
diff --git a/FWCore/ParameterSetReader/bin/edmConfigHash.cpp b/FWCore/ParameterSetReader/bin/edmConfigHash.cpp
index 6f4e8507129f8..e0896c3992e39 100644
--- a/FWCore/ParameterSetReader/bin/edmConfigHash.cpp
+++ b/FWCore/ParameterSetReader/bin/edmConfigHash.cpp
@@ -5,7 +5,7 @@
 // of a cmsRun process, because validation code may insert
 // additional parameters into the configuration.
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h" 
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSetReader/interface/ParameterSetReader.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
@@ -14,18 +14,18 @@
 #include <iostream>
 #include <string>
 
-int main(int argc, char **argv) try {
+int main(int argc, char** argv) try {
   // config can either be a name or a string
   std::string config;
 
-  if(argc == 1) {
+  if (argc == 1) {
     // Read input from cin into configstring..
     std::string line;
-    while(std::getline(std::cin, line)) {
+    while (std::getline(std::cin, line)) {
       config += line;
       config += '\n';
     }
-  } else if(argc == 2) {
+  } else if (argc == 2) {
     config = std::string(argv[1]);
   }
 
@@ -33,10 +33,10 @@ int main(int argc, char **argv) try {
   parameterSet->registerIt();
   std::cout << parameterSet->id() << std::endl;
   return 0;
-} catch(cms::Exception const& e) {
+} catch (cms::Exception const& e) {
   std::cout << e.explainSelf() << std::endl;
   return 1;
-} catch(std::exception const& e) {
+} catch (std::exception const& e) {
   std::cout << e.what() << std::endl;
   return 1;
 }
diff --git a/FWCore/ParameterSetReader/bin/edmParameterSetDump.cpp b/FWCore/ParameterSetReader/bin/edmParameterSetDump.cpp
index cd907f091cdda..13e786096291a 100644
--- a/FWCore/ParameterSetReader/bin/edmParameterSetDump.cpp
+++ b/FWCore/ParameterSetReader/bin/edmParameterSetDump.cpp
@@ -2,7 +2,7 @@
 //
 // Package:     PythonParameterSet
 // Class  :     edmParameterSetDump
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -18,8 +18,8 @@
 #include <iostream>
 #include <string>
 
-int main (int argc, char **argv) try {
-  if(argc != 2) {
+int main(int argc, char** argv) try {
+  if (argc != 2) {
     std::cout << "Usage: edmParameterSetDump <cfgfile>" << std::endl;
   }
   std::string fileName(argv[1]);
@@ -27,10 +27,10 @@ int main (int argc, char **argv) try {
   std::cout << "====Main Process====" << std::endl;
   std::cout << parameterSet->dump() << std::endl;
   return 0;
-} catch(cms::Exception const& e) {
+} catch (cms::Exception const& e) {
   std::cout << e.explainSelf() << std::endl;
   return 1;
-} catch(std::exception const& e) {
+} catch (std::exception const& e) {
   std::cout << e.what() << std::endl;
   return 1;
 }
diff --git a/FWCore/ParameterSetReader/interface/ParameterSetReader.h b/FWCore/ParameterSetReader/interface/ParameterSetReader.h
index 7ed1258d7971b..f24d835dd4506 100644
--- a/FWCore/ParameterSetReader/interface/ParameterSetReader.h
+++ b/FWCore/ParameterSetReader/interface/ParameterSetReader.h
@@ -5,19 +5,15 @@
 
 namespace edm {
 
-  std::unique_ptr<edm::ParameterSet> getPSetFromConfig(const std::string &config);
+  std::unique_ptr<edm::ParameterSet> getPSetFromConfig(const std::string& config);
 
   std::unique_ptr<edm::ParameterSet> readConfig(std::string const& config, int argc, char* argv[]);
 
   std::unique_ptr<edm::ParameterSet> readConfig(std::string const& config);
 
-  void makeParameterSets(std::string const& configtext,
-			 std::unique_ptr<ParameterSet> & main);
+  void makeParameterSets(std::string const& configtext, std::unique_ptr<ParameterSet>& main);
 
   std::unique_ptr<edm::ParameterSet> readPSetsFrom(std::string const& fileOrString);
 
-
-};
+};  // namespace edm
 #endif
-
-
diff --git a/FWCore/ParameterSetReader/interface/ProcessDescImpl.h b/FWCore/ParameterSetReader/interface/ProcessDescImpl.h
index de6b0f9bea161..37f9620345f68 100644
--- a/FWCore/ParameterSetReader/interface/ProcessDescImpl.h
+++ b/FWCore/ParameterSetReader/interface/ProcessDescImpl.h
@@ -3,7 +3,6 @@
 
 #include "FWCore/PythonParameterSet/interface/PyBind11ProcessDesc.h"
 
-using ProcessDescImpl = PyBind11ProcessDesc; 
+using ProcessDescImpl = PyBind11ProcessDesc;
 
 #endif
-
diff --git a/FWCore/ParameterSetReader/src/ParameterSetReader.cc b/FWCore/ParameterSetReader/src/ParameterSetReader.cc
index 8fcfc938b5a73..a18046c7bdac3 100644
--- a/FWCore/ParameterSetReader/src/ParameterSetReader.cc
+++ b/FWCore/ParameterSetReader/src/ParameterSetReader.cc
@@ -2,24 +2,22 @@
 #include "FWCore/PythonParameterSet/interface/PyBind11ProcessDesc.h"
 #include "FWCore/PythonParameterSet/interface/MakePyBind11ParameterSets.h"
 
-std::unique_ptr<edm::ParameterSet> edm::getPSetFromConfig(const std::string &config) {
+std::unique_ptr<edm::ParameterSet> edm::getPSetFromConfig(const std::string& config) {
   return PyBind11ProcessDesc(config).parameterSet();
 }
 
-
 //its really the stuff in MakePythonParameterSets that should be in the different namespace
 //I'll do that if this setup is ok
 std::unique_ptr<edm::ParameterSet> edm::readConfig(std::string const& config, int argc, char* argv[]) {
-  return edm::cmspybind11::readConfig(config,argc,argv);
+  return edm::cmspybind11::readConfig(config, argc, argv);
 }
 
 std::unique_ptr<edm::ParameterSet> edm::readConfig(std::string const& config) {
   return edm::cmspybind11::readConfig(config);
 }
 
-void edm::makeParameterSets(std::string const& configtext,
-			    std::unique_ptr<ParameterSet> & main) {
-  edm::cmspybind11::makeParameterSets(configtext,main);
+void edm::makeParameterSets(std::string const& configtext, std::unique_ptr<ParameterSet>& main) {
+  edm::cmspybind11::makeParameterSets(configtext, main);
 }
 
 std::unique_ptr<edm::ParameterSet> edm::readPSetsFrom(std::string const& fileOrString) {
diff --git a/FWCore/PluginManager/bin/dump.cc b/FWCore/PluginManager/bin/dump.cc
index 5884d51d89631..9079f4a0dcab7 100644
--- a/FWCore/PluginManager/bin/dump.cc
+++ b/FWCore/PluginManager/bin/dump.cc
@@ -1,6 +1,5 @@
 //<<<<<< INCLUDES                                                       >>>>>>
 
-
 #include <iostream>
 #include <utility>
 #include <cstdlib>
@@ -11,93 +10,84 @@
 #include "FWCore/PluginManager/interface/PluginManager.h"
 #include "FWCore/PluginManager/interface/standard.h"
 
-
 using namespace edmplugin;
 
-
-int main (int argc, char **argv)
-{
+int main(int argc, char** argv) {
   using namespace boost::program_options;
-  
+
   static const char* const kFilesOpt = "files";
   static const char* const kFilesCommandOpt = "files,f";
   static const char* const kAllFilesOpt = "all_files";
   static const char* const kAllFilesCommandOpt = "all_files,a";
   static const char* const kHelpOpt = "help";
   static const char* const kHelpCommandOpt = "help,h";
-  
+
   std::string descString(argv[0]);
   descString += " [options]";
   descString += "\nAllowed options";
   options_description desc(descString);
-  desc.add_options()
-    (kHelpCommandOpt, "produce help message")
-    (kFilesCommandOpt
-     , "list the file from which a plugin will come")
-    (kAllFilesCommandOpt
-     , "list all the files to which a plugin is registered")
-    //(kAllCommandOpt,"when no paths given, try to update caches for all known directories [default is to only scan the first directory]")
-    ;
-  
+  desc.add_options()(kHelpCommandOpt, "produce help message")(kFilesCommandOpt,
+                                                              "list the file from which a plugin will come")(
+      kAllFilesCommandOpt, "list all the files to which a plugin is registered")
+      //(kAllCommandOpt,"when no paths given, try to update caches for all known directories [default is to only scan the first directory]")
+      ;
+
   variables_map vm;
   try {
-    store(command_line_parser(argc,argv).options(desc).run(),vm);
+    store(command_line_parser(argc, argv).options(desc).run(), vm);
     notify(vm);
-  } catch(const error& iException) {
-    std::cerr <<iException.what();
+  } catch (const error& iException) {
+    std::cerr << iException.what();
     return 1;
   }
-  
-  if(vm.count(kHelpOpt)) {
-    std::cout << desc <<std::endl;
+
+  if (vm.count(kHelpOpt)) {
+    std::cout << desc << std::endl;
     return 0;
   }
-  
+
   bool printFiles = false;
-  if(vm.count(kFilesOpt) ) {
+  if (vm.count(kFilesOpt)) {
     printFiles = true;
   }
-  
+
   bool printAllFiles = false;
-  if(vm.count(kAllFilesOpt) ) {
+  if (vm.count(kAllFilesOpt)) {
     printFiles = true;
     printAllFiles = true;
   }
-  
+
   int returnValue = EXIT_SUCCESS;
   try {
     //dump all know plugins
     PluginManager::configure(standard::config());
-    
+
     typedef edmplugin::PluginManager::CategoryToInfos CatToInfos;
-    
+
     const CatToInfos& catToInfos = edmplugin::PluginManager::get()->categoryToInfos();
     // map every module to its library.  Code copied from EdmPluginDump
-    for (CatToInfos::const_iterator it = catToInfos.begin(), itEnd=catToInfos.end();
-         it != itEnd; ++it)
-    {
-      std::cout <<"Category "<<it->first<<":"<<std::endl;
+    for (CatToInfos::const_iterator it = catToInfos.begin(), itEnd = catToInfos.end(); it != itEnd; ++it) {
+      std::cout << "Category " << it->first << ":" << std::endl;
       std::string prevPluginName;
-      for (edmplugin::PluginManager::Infos::const_iterator itInfo = it->second.begin(), itInfoEnd = it->second.end(); 
-           itInfo != itInfoEnd; ++itInfo)
-      {
+      for (edmplugin::PluginManager::Infos::const_iterator itInfo = it->second.begin(), itInfoEnd = it->second.end();
+           itInfo != itInfoEnd;
+           ++itInfo) {
         std::string pluginName = itInfo->name_;
-        if(pluginName != prevPluginName) {
-          std::cout <<"  "<<pluginName<<std::endl;
-          if(printFiles) {
-            std::cout <<"   "<<itInfo->loadable_.string()<<std::endl;
+        if (pluginName != prevPluginName) {
+          std::cout << "  " << pluginName << std::endl;
+          if (printFiles) {
+            std::cout << "   " << itInfo->loadable_.string() << std::endl;
           }
-          prevPluginName=pluginName;
-        }
-        else if(printAllFiles) {
-          std::cout <<"   "<<itInfo->loadable_.string()<<std::endl;
+          prevPluginName = pluginName;
+        } else if (printAllFiles) {
+          std::cout << "   " << itInfo->loadable_.string() << std::endl;
         }
       }
     }
-  }catch(std::exception& iException) {
-    std::cerr <<"Caught exception "<<iException.what()<<std::endl;
+  } catch (std::exception& iException) {
+    std::cerr << "Caught exception " << iException.what() << std::endl;
     returnValue = EXIT_FAILURE;
   }
 
-    return returnValue;
+  return returnValue;
 }
diff --git a/FWCore/PluginManager/bin/refresh.cc b/FWCore/PluginManager/bin/refresh.cc
index 3fb109b788d61..35d2aa0886dab 100644
--- a/FWCore/PluginManager/bin/refresh.cc
+++ b/FWCore/PluginManager/bin/refresh.cc
@@ -24,15 +24,15 @@
 
 using namespace edmplugin;
 
-// We process DSOs by forking and processing them in the child, in bunches of 
+// We process DSOs by forking and processing them in the child, in bunches of
 // PER_PROCESS_DSO. Once a bunch has been processed we exit the child and
 // spawn a new one.
 // Due to the different behavior of the linker on different platforms, we process
 // a different number of DSOs per process.
 // For macosx the cost is to actually resolve weak symbols and it grows with
 // the number of libraries as well, so we try to process not too many libraries.
-// In linux the main cost is to load the library itself, so we try to load as 
-// many as reasonable in a single process to avoid having to reload them in 
+// In linux the main cost is to load the library itself, so we try to load as
+// many as reasonable in a single process to avoid having to reload them in
 // the subsequent process. Obviuously keeping the PER_PROCESS_DSO low keeps the
 // memory usage low as well.
 #ifdef __APPLE__
@@ -47,23 +47,21 @@ namespace std {
   ostream& operator<<(std::ostream& o, vector<std::string> const& iValue) {
     std::string sep("");
     std::string commaSep(",");
-    for(std::vector<std::string>::const_iterator it = iValue.begin(), itEnd = iValue.end();
-        it != itEnd;
-        ++it) {
+    for (std::vector<std::string>::const_iterator it = iValue.begin(), itEnd = iValue.end(); it != itEnd; ++it) {
       o << sep << *it;
       sep = commaSep;
     }
     return o;
   }
-}
+}  // namespace std
 namespace {
   struct Listener {
     typedef edmplugin::CacheParser::NameAndType NameAndType;
     typedef edmplugin::CacheParser::NameAndTypes NameAndTypes;
 
     void newFactory(edmplugin::PluginFactoryBase const* iBase) {
-      using std::placeholders::_1; 
-      using std::placeholders::_2; 
+      using std::placeholders::_1;
+      using std::placeholders::_2;
       iBase->newPluginAdded_.connect(std::bind(std::mem_fn(&Listener::newPlugin), this, _1, _2));
     }
     void newPlugin(std::string const& iCategory, edmplugin::PluginInfo const& iInfo) {
@@ -72,10 +70,10 @@ namespace {
 
     NameAndTypes nameAndTypes_;
   };
-}
-int main (int argc, char **argv) try {
+}  // namespace
+int main(int argc, char** argv) try {
   using namespace boost::program_options;
-  using std::placeholders::_1; 
+  using std::placeholders::_1;
 
   static char const* const kPathsOpt = "paths";
   static char const* const kPathsCommandOpt = "paths,p";
@@ -91,16 +89,15 @@ int main (int argc, char **argv) try {
   options_description desc(descString);
   std::string defaultDir(".");
   std::vector<std::string> defaultDirList = edmplugin::standard::config().searchPath();
-  if(!defaultDirList.empty()) {
+  if (!defaultDirList.empty()) {
     defaultDir = defaultDirList[0];
   }
-  desc.add_options()
-    (kHelpCommandOpt, "produce help message")
-    (kPathsCommandOpt, value<std::vector<std::string> >()->default_value(
-                          std::vector<std::string>(1, defaultDir))
-     , "a directory or a list of files to scan")
-    //(kAllCommandOpt, "when no paths given, try to update caches for all known directories [default is to only scan the first directory]")
-    ;
+  desc.add_options()(kHelpCommandOpt, "produce help message")(
+      kPathsCommandOpt,
+      value<std::vector<std::string> >()->default_value(std::vector<std::string>(1, defaultDir)),
+      "a directory or a list of files to scan")
+      //(kAllCommandOpt, "when no paths given, try to update caches for all known directories [default is to only scan the first directory]")
+      ;
 
   positional_options_description p;
   p.add(kPathsOpt, -1);
@@ -109,12 +106,12 @@ int main (int argc, char **argv) try {
   try {
     store(command_line_parser(argc, argv).options(desc).positional(p).run(), vm);
     notify(vm);
-  } catch(error const& iException) {
+  } catch (error const& iException) {
     std::cerr << iException.what();
     return 1;
   }
 
-  if(vm.count(kHelpOpt)) {
+  if (vm.count(kHelpOpt)) {
     std::cout << desc << std::endl;
     return 0;
   }
@@ -135,7 +132,7 @@ int main (int argc, char **argv) try {
     path directory(requestedPaths[0]);
     std::vector<std::string> files;
     bool removeMissingFiles = false;
-    if(boost::filesystem::is_directory(directory)) {
+    if (boost::filesystem::is_directory(directory)) {
       if (requestedPaths.size() > 1) {
         std::cerr << "if a directory is given then only one argument is allowed" << std::endl;
         return 1;
@@ -144,20 +141,18 @@ int main (int argc, char **argv) try {
       //if asked to look at whole directory, then we can also remove missing files
       removeMissingFiles = true;
 
-      boost::filesystem::directory_iterator       file (directory);
-      boost::filesystem::directory_iterator       end;
+      boost::filesystem::directory_iterator file(directory);
+      boost::filesystem::directory_iterator end;
 
       path cacheFile(directory);
       cacheFile /= standard::cachefileName();
 
       std::time_t cacheLastChange(0);
-      if(exists(cacheFile)) {
+      if (exists(cacheFile)) {
         cacheLastChange = last_write_time(cacheFile);
       }
-      for (; file != end; ++file)
-      {
-
-        path  filename (*file);
+      for (; file != end; ++file) {
+        path filename(*file);
         path shortName(file->path().filename());
         const std::string& stringName = shortName.string();
 
@@ -165,19 +160,19 @@ int main (int argc, char **argv) try {
         if (stringName.size() < kPluginPrefix.size()) {
           continue;
         }
-        if(stringName.substr(0, kPluginPrefix.size()) != kPluginPrefix) {
+        if (stringName.substr(0, kPluginPrefix.size()) != kPluginPrefix) {
           continue;
         }
 
-        if(last_write_time(filename) > cacheLastChange) {
+        if (last_write_time(filename) > cacheLastChange) {
           files.push_back(stringName);
         }
       }
     } else {
       //we have files
       directory = directory.branch_path();
-      for(std::vector<std::string>::iterator it = requestedPaths.begin(), itEnd = requestedPaths.end();
-          it != itEnd; ++it) {
+      for (std::vector<std::string>::iterator it = requestedPaths.begin(), itEnd = requestedPaths.end(); it != itEnd;
+           ++it) {
         boost::filesystem::path f(*it);
         if (!exists(f)) {
           std::cerr << "the file '" << f.string() << "' does not exist" << std::endl;
@@ -187,9 +182,11 @@ int main (int argc, char **argv) try {
           std::cerr << "either one directory or a list of files are allowed as arguments" << std::endl;
           return 1;
         }
-        if(directory != f.branch_path()) {
-          std::cerr << "all files must have be in the same directory (" << directory.string() << ")\n"
-          " the file " << f.string() << " does not." << std::endl;
+        if (directory != f.branch_path()) {
+          std::cerr << "all files must have be in the same directory (" << directory.string()
+                    << ")\n"
+                       " the file "
+                    << f.string() << " does not." << std::endl;
         }
 #if (BOOST_VERSION / 100000) >= 1 && ((BOOST_VERSION / 100) % 1000) >= 47
         files.push_back(f.filename().string());
@@ -200,22 +197,22 @@ int main (int argc, char **argv) try {
     }
 
     path cacheFile(directory);
-    cacheFile /= edmplugin::standard::cachefileName();//path(s_cacheFile);
+    cacheFile /= edmplugin::standard::cachefileName();  //path(s_cacheFile);
 
     CacheParser::LoadableToPlugins old;
-    if(exists(cacheFile)) {
+    if (exists(cacheFile)) {
       std::ifstream cf(cacheFile.string().c_str());
-      if(!cf) {
-        cms::Exception("FailedToOpen") << "unable to open file '" << cacheFile.string() << "' for reading even though it is present.\n"
-        "Please check permissions on the file.";
+      if (!cf) {
+        cms::Exception("FailedToOpen") << "unable to open file '" << cacheFile.string()
+                                       << "' for reading even though it is present.\n"
+                                          "Please check permissions on the file.";
       }
       CacheParser::read(cf, old);
     }
 
-
     //load each file and 'listen' to which plugins are loaded
     Listener listener;
-    edmplugin::PluginFactoryManager* pfm =  edmplugin::PluginFactoryManager::get();
+    edmplugin::PluginFactoryManager* pfm = edmplugin::PluginFactoryManager::get();
     pfm->newFactory_.connect(std::bind(std::mem_fn(&Listener::newFactory), &listener, _1));
     edm::for_all(*pfm, std::bind(std::mem_fn(&Listener::newFactory), &listener, _1));
 
@@ -223,47 +220,45 @@ int main (int argc, char **argv) try {
     // use it.
     std::string temporaryFilename = (cacheFile.string() + ".tmp");
     std::ofstream cf(temporaryFilename.c_str());
-    if(!cf) {
-      cms::Exception("FailedToOpen") << "unable to open file '" 
-          << temporaryFilename << "' for writing.\n"
-      "Please check permissions on the file.";
+    if (!cf) {
+      cms::Exception("FailedToOpen") << "unable to open file '" << temporaryFilename
+                                     << "' for writing.\n"
+                                        "Please check permissions on the file.";
     }
     // Sort the files so that they are loaded "by subsystem", hopefully meaning
     // they share more dependencies.
     std::sort(files.begin(), files.end());
-    
-    for(size_t fi = 0, fe = files.size(); fi < fe; fi += PER_PROCESS_DSO)
-    {
+
+    for (size_t fi = 0, fe = files.size(); fi < fe; fi += PER_PROCESS_DSO) {
       CacheParser::LoadableToPlugins ltp;
       pid_t worker = fork();
-      if (worker == 0)
-      {
+      if (worker == 0) {
         // This the child process.
-        // We load the DSO and find out its plugins, write to the cache 
+        // We load the DSO and find out its plugins, write to the cache
         // stream and exit, leaving the parent to spawn a new proces.
         size_t ci = PER_PROCESS_DSO;
-        while (ci && fi != fe)
-        {
-          path loadableFile(directory);                                                                                                                                                                                                                                          
+        while (ci && fi != fe) {
+          path loadableFile(directory);
           loadableFile /= (files[fi]);
           listener.nameAndTypes_.clear();
 
           try {
-           try {
-               edmplugin::SharedLibrary lib(loadableFile);
-               //PluginCapabilities is special, the plugins do not call it.  Instead, for each shared library load
-               // we need to ask it to try to find plugins
-               PluginCapabilities::get()->tryToFind(lib);
-               ltp[files[fi]] = listener.nameAndTypes_;
-            
-            } catch(cms::Exception const& iException) {
-               if(iException.category() == "PluginLibraryLoadError") {
-                  std::cerr << "Caught exception " << iException.what() << " will ignore " << files[fi] << " and continue." << std::endl;
-               } else {
-                  throw;
-               }
+            try {
+              edmplugin::SharedLibrary lib(loadableFile);
+              //PluginCapabilities is special, the plugins do not call it.  Instead, for each shared library load
+              // we need to ask it to try to find plugins
+              PluginCapabilities::get()->tryToFind(lib);
+              ltp[files[fi]] = listener.nameAndTypes_;
+
+            } catch (cms::Exception const& iException) {
+              if (iException.category() == "PluginLibraryLoadError") {
+                std::cerr << "Caught exception " << iException.what() << " will ignore " << files[fi]
+                          << " and continue." << std::endl;
+              } else {
+                throw;
+              }
             }
-          }catch(std::exception& iException) {
+          } catch (std::exception& iException) {
             std::cerr << "Caught exception " << iException.what() << std::endl;
             exit(1);
           }
@@ -273,47 +268,41 @@ int main (int argc, char **argv) try {
         CacheParser::write(ltp, cf);
         cf << std::flush;
         _exit(0);
-      }
-      else
-      {
+      } else {
         // Throw if any of the child died with non 0 status.
         int status = 0;
         waitpid(worker, &status, 0);
-        if (WIFEXITED(status) == true && status != 0)
-        {
+        if (WIFEXITED(status) == true && status != 0) {
           std::cerr << "Error while processing." << std::endl;
           exit(status);
         }
       }
     }
-    
+
     cf << std::flush;
-    
+
     // We read the new cache and we merge it with the old one.
     CacheParser::LoadableToPlugins ltp;
     std::ifstream icf(temporaryFilename.c_str());
-    if(!icf) {
-      cms::Exception("FailedToOpen") << "unable to open file '" << temporaryFilename.c_str() << "' for reading even though it is present.\n"
-      "Please check permissions on the file.";
+    if (!icf) {
+      cms::Exception("FailedToOpen") << "unable to open file '" << temporaryFilename.c_str()
+                                     << "' for reading even though it is present.\n"
+                                        "Please check permissions on the file.";
     }
     CacheParser::read(icf, ltp);
-    
-    for (CacheParser::LoadableToPlugins::iterator itFile = ltp.begin() ;
-         itFile != ltp.end() ;
-         ++itFile)
-    {
-      old[itFile->first] = itFile->second; 
+
+    for (CacheParser::LoadableToPlugins::iterator itFile = ltp.begin(); itFile != ltp.end(); ++itFile) {
+      old[itFile->first] = itFile->second;
     }
-    
+
     // If required, we remove the plugins which are missing. Notice that old is
     // now the most updated copy of the cache.
-    if(removeMissingFiles) {
-      for(CacheParser::LoadableToPlugins::iterator itFile = old.begin();
-          itFile != old.end();
-          /*don't advance the iterator here because it may have become invalid */) {
+    if (removeMissingFiles) {
+      for (CacheParser::LoadableToPlugins::iterator itFile = old.begin(); itFile != old.end();
+           /*don't advance the iterator here because it may have become invalid */) {
         path loadableFile(directory);
         loadableFile /= (itFile->first);
-        if(not exists(loadableFile)) {
+        if (not exists(loadableFile)) {
           std::cout << "removing file '" << temporaryFilename.c_str() << "'" << std::endl;
           CacheParser::LoadableToPlugins::iterator itToItemBeingRemoved = itFile;
           //advance the iterator while it is still valid
@@ -325,22 +314,23 @@ int main (int argc, char **argv) try {
         }
       }
     }
-  
+
     // We finally write the final cache.
     std::ofstream fcf(temporaryFilename.c_str());
-    if(!fcf) {
-      cms::Exception("FailedToOpen") << "unable to open file '" << temporaryFilename.c_str() << "' for writing.\n"
-      "Please check permissions on the file.";
+    if (!fcf) {
+      cms::Exception("FailedToOpen") << "unable to open file '" << temporaryFilename.c_str()
+                                     << "' for writing.\n"
+                                        "Please check permissions on the file.";
     }
     CacheParser::write(old, fcf);
-    rename(temporaryFilename.c_str(), cacheFile.string().c_str());  
-  } catch(std::exception& iException) {
+    rename(temporaryFilename.c_str(), cacheFile.string().c_str());
+  } catch (std::exception& iException) {
     std::cerr << "Caught exception " << iException.what() << std::endl;
     returnValue = EXIT_FAILURE;
   }
 
   return returnValue;
-} catch(std::exception const& iException) {
+} catch (std::exception const& iException) {
   std::cerr << iException.what() << std::endl;
   return 1;
 }
diff --git a/FWCore/PluginManager/interface/CacheParser.h b/FWCore/PluginManager/interface/CacheParser.h
index cc5c55b925aa2..ae8ccde6d4ea1 100644
--- a/FWCore/PluginManager/interface/CacheParser.h
+++ b/FWCore/PluginManager/interface/CacheParser.h
@@ -4,7 +4,7 @@
 //
 // Package:     PluginManager
 // Class  :     CacheParser
-// 
+//
 /**\class CacheParser CacheParser.h FWCore/PluginManager/interface/CacheParser.h
 
  Description: Parses the cache information about which plugins are in which libraries
@@ -37,44 +37,45 @@ If a space exists in either of these three fields, it will be replaced with a %,
 class TestCacheParser;
 
 namespace edmplugin {
-class CacheParser
-{
-
-   public:
-      typedef std::map<std::string, std::vector<PluginInfo> > CategoryToInfos;
-      typedef std::pair< std::string, std::string> NameAndType;
-      typedef std::vector< NameAndType > NameAndTypes;
-      typedef std::map<boost::filesystem::path, NameAndTypes > LoadableToPlugins;
+  class CacheParser {
+  public:
+    typedef std::map<std::string, std::vector<PluginInfo> > CategoryToInfos;
+    typedef std::pair<std::string, std::string> NameAndType;
+    typedef std::vector<NameAndType> NameAndTypes;
+    typedef std::map<boost::filesystem::path, NameAndTypes> LoadableToPlugins;
 
-      // ---------- const member functions ---------------------
+    // ---------- const member functions ---------------------
 
-      // ---------- static member functions --------------------
+    // ---------- static member functions --------------------
 
-      // ---------- member functions ---------------------------
-      /**The std::vector<PluginInfo>'s in CategoryToInfos are guaranteed to be ordered by
+    // ---------- member functions ---------------------------
+    /**The std::vector<PluginInfo>'s in CategoryToInfos are guaranteed to be ordered by
         PluginInfo.name_ where identical names are ordered by the order they are passed to read.
         In this way multiple calls to read for different directories will preserve the ordering
         */
-      static void read(std::istream&, const boost::filesystem::path& iDirectory, CategoryToInfos& oOut);
-      static void write(const CategoryToInfos&, std::ostream&);
-      
-      static void read(std::istream&, LoadableToPlugins& oOut);
-      static void write(LoadableToPlugins& iIn, std::ostream&);
-   private:
-      //for testing
-      friend class ::TestCacheParser;
-      CacheParser(const CacheParser&) = delete; // stop default
-
-      const CacheParser& operator=(const CacheParser&) = delete; // stop default
-
-      static bool readline(std::istream& iIn, const boost::filesystem::path& iDirectory,
-               unsigned long iRecordNumber, PluginInfo &oInfo, std::string& oPluginType);
-      static std::string& replaceSpaces(std::string& io);
-      static std::string& restoreSpaces(std::string& io);
-      
-      // ---------- member data --------------------------------
-
-};
-
-}
+    static void read(std::istream&, const boost::filesystem::path& iDirectory, CategoryToInfos& oOut);
+    static void write(const CategoryToInfos&, std::ostream&);
+
+    static void read(std::istream&, LoadableToPlugins& oOut);
+    static void write(LoadableToPlugins& iIn, std::ostream&);
+
+  private:
+    //for testing
+    friend class ::TestCacheParser;
+    CacheParser(const CacheParser&) = delete;  // stop default
+
+    const CacheParser& operator=(const CacheParser&) = delete;  // stop default
+
+    static bool readline(std::istream& iIn,
+                         const boost::filesystem::path& iDirectory,
+                         unsigned long iRecordNumber,
+                         PluginInfo& oInfo,
+                         std::string& oPluginType);
+    static std::string& replaceSpaces(std::string& io);
+    static std::string& restoreSpaces(std::string& io);
+
+    // ---------- member data --------------------------------
+  };
+
+}  // namespace edmplugin
 #endif
diff --git a/FWCore/PluginManager/interface/PluginCapabilities.h b/FWCore/PluginManager/interface/PluginCapabilities.h
index 0234f7687809d..72abf3f409986 100644
--- a/FWCore/PluginManager/interface/PluginCapabilities.h
+++ b/FWCore/PluginManager/interface/PluginCapabilities.h
@@ -4,7 +4,7 @@
 //
 // Package:     PluginManager
 // Class  :     PluginCapabilities
-// 
+//
 /**\class PluginCapabilities PluginCapabilities.h FWCore/PluginManager/interface/PluginCapabilities.h
 
  Description: <one line class summary>
@@ -29,37 +29,37 @@
 namespace edmplugin {
   class SharedLibrary;
   class DummyFriend;
-class PluginCapabilities : public PluginFactoryBase
-{
-   friend class DummyFriend;
-   public:
-      ~PluginCapabilities() override;
-
-      // ---------- const member functions ---------------------
-      std::vector<PluginInfo> available() const override;
-      const std::string& category() const override; 
-      
-      // ---------- static member functions --------------------
-      static PluginCapabilities* get();
-      
-      // ---------- member functions ---------------------------
-      void load(const std::string& iName);
-      
-      //returns false if loading fails because iName is unknown
-      bool tryToLoad(const std::string& iName);
-      
-      ///Check to see if any capabilities are in the file, returns 'true' if found
-      bool tryToFind(const SharedLibrary& iLoadable);
-
-   private:
-      PluginCapabilities();
-      PluginCapabilities(const PluginCapabilities&) = delete; // stop default
-
-      const PluginCapabilities& operator=(const PluginCapabilities&) = delete; // stop default
-
-      // ---------- member data --------------------------------
-      std::map<std::string, boost::filesystem::path> classToLoadable_;
-};
-
-}
+  class PluginCapabilities : public PluginFactoryBase {
+    friend class DummyFriend;
+
+  public:
+    ~PluginCapabilities() override;
+
+    // ---------- const member functions ---------------------
+    std::vector<PluginInfo> available() const override;
+    const std::string& category() const override;
+
+    // ---------- static member functions --------------------
+    static PluginCapabilities* get();
+
+    // ---------- member functions ---------------------------
+    void load(const std::string& iName);
+
+    //returns false if loading fails because iName is unknown
+    bool tryToLoad(const std::string& iName);
+
+    ///Check to see if any capabilities are in the file, returns 'true' if found
+    bool tryToFind(const SharedLibrary& iLoadable);
+
+  private:
+    PluginCapabilities();
+    PluginCapabilities(const PluginCapabilities&) = delete;  // stop default
+
+    const PluginCapabilities& operator=(const PluginCapabilities&) = delete;  // stop default
+
+    // ---------- member data --------------------------------
+    std::map<std::string, boost::filesystem::path> classToLoadable_;
+  };
+
+}  // namespace edmplugin
 #endif
diff --git a/FWCore/PluginManager/interface/PluginFactory.h b/FWCore/PluginManager/interface/PluginFactory.h
index 4482593aa45e5..5b5592f571551 100644
--- a/FWCore/PluginManager/interface/PluginFactory.h
+++ b/FWCore/PluginManager/interface/PluginFactory.h
@@ -4,7 +4,7 @@
 //
 // Package:     PluginManager
 // Class  :     PluginFactory
-// 
+//
 /**\class PluginFactory PluginFactory.h FWCore/PluginManager/interface/PluginFactory.h
 
  Description: Public interface for loading a plugin
@@ -29,86 +29,97 @@
 // forward declarations
 
 namespace edmplugin {
-template< class T> class PluginFactory;
+  template <class T>
+  class PluginFactory;
   class DummyFriend;
-  
-template<typename R, typename... Args>
-class PluginFactory<R*(Args...)> : public PluginFactoryBase
-{
-      friend class DummyFriend;
-   public:
-      using TemplateArgType = R*(Args...);
-      using CreatedType = R;
-
-      struct PMakerBase {
-        virtual R* create(Args...) const = 0;
-        virtual ~PMakerBase() {}
-      };
-      template<class TPlug>
-      struct PMaker : public PMakerBase {
-        PMaker(const std::string& iName) {
-          PluginFactory<R*(Args...)>::get()->registerPMaker(this,iName);
-        }
-        R* create(Args... args) const override {
-          return new TPlug(std::forward<Args>(args)...);
-        }
-      };
-
-      // ---------- const member functions ---------------------
-      const std::string& category() const override ;
-      
-      R* create(const std::string& iName, Args... args) const {
-        return reinterpret_cast<PMakerBase*>(PluginFactoryBase::findPMaker(iName))->create(std::forward<Args>(args)...);
-      }
-
-      ///like above but returns 0 if iName is unknown
-      R* tryToCreate(const std::string& iName, Args... args) const {
-        auto found = PluginFactoryBase::tryToFindPMaker(iName);
-        if(found ==nullptr) {
-          return nullptr;
-        }
-        return reinterpret_cast<PMakerBase*>(found)->create(args...);
-      }
-      // ---------- static member functions --------------------
 
-      static PluginFactory<R*(Args...)>* get();
-      // ---------- member functions ---------------------------
-      void registerPMaker(PMakerBase* iPMaker, const std::string& iName) {
-        PluginFactoryBase::registerPMaker(iPMaker, iName);
+  template <typename R, typename... Args>
+  class PluginFactory<R*(Args...)> : public PluginFactoryBase {
+    friend class DummyFriend;
+
+  public:
+    using TemplateArgType = R*(Args...);
+    using CreatedType = R;
+
+    struct PMakerBase {
+      virtual R* create(Args...) const = 0;
+      virtual ~PMakerBase() {}
+    };
+    template <class TPlug>
+    struct PMaker : public PMakerBase {
+      PMaker(const std::string& iName) { PluginFactory<R*(Args...)>::get()->registerPMaker(this, iName); }
+      R* create(Args... args) const override { return new TPlug(std::forward<Args>(args)...); }
+    };
+
+    // ---------- const member functions ---------------------
+    const std::string& category() const override;
+
+    R* create(const std::string& iName, Args... args) const {
+      return reinterpret_cast<PMakerBase*>(PluginFactoryBase::findPMaker(iName))->create(std::forward<Args>(args)...);
+    }
+
+    ///like above but returns 0 if iName is unknown
+    R* tryToCreate(const std::string& iName, Args... args) const {
+      auto found = PluginFactoryBase::tryToFindPMaker(iName);
+      if (found == nullptr) {
+        return nullptr;
       }
-
-   private:
-      PluginFactory() {
-        finishedConstruction();
-      }
-      PluginFactory(const PluginFactory&) = delete; // stop default
-
-      const PluginFactory& operator=(const PluginFactory&) = delete; // stop default
-
-};
-}
-#define CONCATENATE_HIDDEN(a,b) a ## b 
-#define CONCATENATE(a,b) CONCATENATE_HIDDEN(a,b)
-#define EDM_REGISTER_PLUGINFACTORY(_factory_,_category_) \
-namespace edmplugin {\
-  template<> edmplugin::PluginFactory<_factory_::TemplateArgType>* edmplugin::PluginFactory<_factory_::TemplateArgType>::get() { CMS_THREAD_SAFE static edmplugin::PluginFactory<_factory_::TemplateArgType> s_instance; return &s_instance;}\
-  template<> const std::string& edmplugin::PluginFactory<_factory_::TemplateArgType>::category() const { static const std::string s_cat(_category_);  return s_cat;}\
-  } enum {CONCATENATE(dummy_edm_register_pluginfactory_, __LINE__)}
-
-#define EDM_REGISTER_PLUGINFACTORY2(_factory_,_category_) \
-namespace edmplugin {\
-template<> edmplugin::PluginFactory<_factory_::TemplateArgType>* edmplugin::PluginFactory<_factory_::TemplateArgType>::get() { CMS_THREAD_SAFE static edmplugin::PluginFactory<_factory_::TemplateArgType> s_instance; return &s_instance;}\
-template<> const std::string& edmplugin::PluginFactory<_factory_::TemplateArgType>::category() const { static const std::string s_cat(_category_);  return s_cat;}\
-} enum {CONCATENATE(dummy_edm_register_pluginfactory_2_, __LINE__)}
+      return reinterpret_cast<PMakerBase*>(found)->create(args...);
+    }
+    // ---------- static member functions --------------------
+
+    static PluginFactory<R*(Args...)>* get();
+    // ---------- member functions ---------------------------
+    void registerPMaker(PMakerBase* iPMaker, const std::string& iName) {
+      PluginFactoryBase::registerPMaker(iPMaker, iName);
+    }
+
+  private:
+    PluginFactory() { finishedConstruction(); }
+    PluginFactory(const PluginFactory&) = delete;  // stop default
+
+    const PluginFactory& operator=(const PluginFactory&) = delete;  // stop default
+  };
+}  // namespace edmplugin
+#define FWCORE_CONCATENATE_HIDDEN(a, b) a##b
+#define FWCORE_CONCATENATE(a, b) FWCORE_CONCATENATE_HIDDEN(a, b)
+#define EDM_REGISTER_PLUGINFACTORY(_factory_, _category_)                                                               \
+  namespace edmplugin {                                                                                                 \
+    template <>                                                                                                         \
+    edmplugin::PluginFactory<_factory_::TemplateArgType>* edmplugin::PluginFactory<_factory_::TemplateArgType>::get() { \
+      CMS_THREAD_SAFE static edmplugin::PluginFactory<_factory_::TemplateArgType> s_instance;                           \
+      return &s_instance;                                                                                               \
+    }                                                                                                                   \
+    template <>                                                                                                         \
+    const std::string& edmplugin::PluginFactory<_factory_::TemplateArgType>::category() const {                         \
+      static const std::string s_cat(_category_);                                                                       \
+      return s_cat;                                                                                                     \
+    }                                                                                                                   \
+  }                                                                                                                     \
+  enum { FWCORE_CONCATENATE(dummy_edm_register_pluginfactory_, __LINE__) }
+
+#define EDM_REGISTER_PLUGINFACTORY2(_factory_, _category_)                                                              \
+  namespace edmplugin {                                                                                                 \
+    template <>                                                                                                         \
+    edmplugin::PluginFactory<_factory_::TemplateArgType>* edmplugin::PluginFactory<_factory_::TemplateArgType>::get() { \
+      CMS_THREAD_SAFE static edmplugin::PluginFactory<_factory_::TemplateArgType> s_instance;                           \
+      return &s_instance;                                                                                               \
+    }                                                                                                                   \
+    template <>                                                                                                         \
+    const std::string& edmplugin::PluginFactory<_factory_::TemplateArgType>::category() const {                         \
+      static const std::string s_cat(_category_);                                                                       \
+      return s_cat;                                                                                                     \
+    }                                                                                                                   \
+  }                                                                                                                     \
+  enum { FWCORE_CONCATENATE(dummy_edm_register_pluginfactory_2_, __LINE__) }
 
 #endif
 
-#define EDM_PLUGIN_SYM(x,y) EDM_PLUGIN_SYM2(x,y)
-#define EDM_PLUGIN_SYM2(x,y) x ## y
-
-#define DEFINE_EDM_PLUGIN(factory,type,name) \
-static const factory::PMaker<type> EDM_PLUGIN_SYM(s_maker , __LINE__ ) (name)
+#define EDM_PLUGIN_SYM(x, y) EDM_PLUGIN_SYM2(x, y)
+#define EDM_PLUGIN_SYM2(x, y) x##y
 
-#define DEFINE_EDM_PLUGIN2(factory,type,name) \
-static const factory::PMaker<type> EDM_PLUGIN_SYM(s_maker2 , __LINE__ ) (name)
+#define DEFINE_EDM_PLUGIN(factory, type, name) \
+  static const factory::PMaker<type> EDM_PLUGIN_SYM(s_maker, __LINE__)(name)
 
+#define DEFINE_EDM_PLUGIN2(factory, type, name) \
+  static const factory::PMaker<type> EDM_PLUGIN_SYM(s_maker2, __LINE__)(name)
diff --git a/FWCore/PluginManager/interface/PluginFactoryBase.h b/FWCore/PluginManager/interface/PluginFactoryBase.h
index 59a96123e0890..742c594fc8062 100644
--- a/FWCore/PluginManager/interface/PluginFactoryBase.h
+++ b/FWCore/PluginManager/interface/PluginFactoryBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     PluginManager
 // Class  :     PluginFactoryBase
-// 
+//
 /**\class PluginFactoryBase PluginFactoryBase.h FWCore/PluginManager/interface/PluginFactoryBase.h
 
  Description: Base class for all plugin factories
@@ -33,91 +33,81 @@
 
 // forward declarations
 namespace edmplugin {
-class PluginFactoryBase
-{
-
-   public:
-      PluginFactoryBase() {}
-      virtual ~PluginFactoryBase();
-
-      struct PluginMakerInfo {
-        PluginMakerInfo(void* iPtr, const std::string& iName):
-        m_name(iName),
-        m_ptr() {
-          m_ptr.store(iPtr,std::memory_order_release);}
-        
-        PluginMakerInfo(const PluginMakerInfo& iOther):
-        m_name(iOther.m_name),
-        m_ptr() {
-          m_ptr.store(iOther.m_ptr.load(std::memory_order_acquire),
-                      std::memory_order_release);
-        }
-        
-        PluginMakerInfo& operator=(const PluginMakerInfo& iOther) {
-          m_name = iOther.m_name;
-          m_ptr.store(iOther.m_ptr.load(std::memory_order_acquire),std::memory_order_release);
-          return *this;
-        }
-        std::string m_name;
-        //NOTE: this has to be last since once it is non zero it signals
-        // that the construction has finished
-        std::atomic<void*> m_ptr;
-      };
-  
-      typedef tbb::concurrent_vector<PluginMakerInfo> PMakers;
-      typedef tbb::concurrent_unordered_map<std::string, PMakers > Plugins;
-
-      // ---------- const member functions ---------------------
-
-      ///return info about all plugins which are already available in the program
-      virtual std::vector<PluginInfo> available() const;
-
-      ///returns the name of the category to which this plugin factory belongs
-      virtual const std::string& category() const = 0;
-      
-      ///signal containing plugin category, and  plugin info for newly added plugin
-      mutable edm::signalslot::Signal<void(const std::string&, const PluginInfo&)> newPluginAdded_;
-
-      // ---------- static member functions --------------------
-
-      // ---------- member functions ---------------------------
-
-   protected:
-      /**call this as the last line in the constructor of inheriting classes
+  class PluginFactoryBase {
+  public:
+    PluginFactoryBase() {}
+    virtual ~PluginFactoryBase();
+
+    struct PluginMakerInfo {
+      PluginMakerInfo(void* iPtr, const std::string& iName) : m_name(iName), m_ptr() {
+        m_ptr.store(iPtr, std::memory_order_release);
+      }
+
+      PluginMakerInfo(const PluginMakerInfo& iOther) : m_name(iOther.m_name), m_ptr() {
+        m_ptr.store(iOther.m_ptr.load(std::memory_order_acquire), std::memory_order_release);
+      }
+
+      PluginMakerInfo& operator=(const PluginMakerInfo& iOther) {
+        m_name = iOther.m_name;
+        m_ptr.store(iOther.m_ptr.load(std::memory_order_acquire), std::memory_order_release);
+        return *this;
+      }
+      std::string m_name;
+      //NOTE: this has to be last since once it is non zero it signals
+      // that the construction has finished
+      std::atomic<void*> m_ptr;
+    };
+
+    typedef tbb::concurrent_vector<PluginMakerInfo> PMakers;
+    typedef tbb::concurrent_unordered_map<std::string, PMakers> Plugins;
+
+    // ---------- const member functions ---------------------
+
+    ///return info about all plugins which are already available in the program
+    virtual std::vector<PluginInfo> available() const;
+
+    ///returns the name of the category to which this plugin factory belongs
+    virtual const std::string& category() const = 0;
+
+    ///signal containing plugin category, and  plugin info for newly added plugin
+    mutable edm::signalslot::Signal<void(const std::string&, const PluginInfo&)> newPluginAdded_;
+
+    // ---------- static member functions --------------------
+
+    // ---------- member functions ---------------------------
+
+  protected:
+    /**call this as the last line in the constructor of inheriting classes
       this is done so that the virtual table will be properly initialized when the
       routine is called
       */
-      void finishedConstruction();
-      
-      void newPlugin(const std::string& iName);
+    void finishedConstruction();
+
+    void newPlugin(const std::string& iName);
+
+    //since each inheriting class has its own Container type to hold their PMakers
+    // this function allows them to share the same code when doing the lookup
+    // this routine will throw an exception if iName is unknown therefore the return value is always valid
+    void* findPMaker(const std::string& iName) const;
 
-      //since each inheriting class has its own Container type to hold their PMakers
-      // this function allows them to share the same code when doing the lookup
-      // this routine will throw an exception if iName is unknown therefore the return value is always valid
-      void* findPMaker(const std::string& iName) const;
+    //similar to findPMaker but will return 'end()' if iName is known
+    void* tryToFindPMaker(const std::string& iName) const;
 
-      //similar to findPMaker but will return 'end()' if iName is known
-      void* tryToFindPMaker(const std::string& iName) const;
-      
-      void fillInfo(const PMakers &makers,
-                    PluginInfo& iInfo,
-                    std::vector<PluginInfo>& iReturn ) const;
+    void fillInfo(const PMakers& makers, PluginInfo& iInfo, std::vector<PluginInfo>& iReturn) const;
 
-      void fillAvailable(std::vector<PluginInfo>& iReturn) const;
+    void fillAvailable(std::vector<PluginInfo>& iReturn) const;
 
-      void registerPMaker(void* iPMaker, const std::string& iName);
-      
-   private:
-      PluginFactoryBase(const PluginFactoryBase&) = delete; // stop default
+    void registerPMaker(void* iPMaker, const std::string& iName);
 
-      const PluginFactoryBase& operator=(const PluginFactoryBase&) = delete; // stop default
+  private:
+    PluginFactoryBase(const PluginFactoryBase&) = delete;  // stop default
 
-      void checkProperLoadable(const std::string& iName, const std::string& iLoadedFrom) const;
-      // ---------- member data --------------------------------
-      Plugins m_plugins;
-  
+    const PluginFactoryBase& operator=(const PluginFactoryBase&) = delete;  // stop default
 
-};
+    void checkProperLoadable(const std::string& iName, const std::string& iLoadedFrom) const;
+    // ---------- member data --------------------------------
+    Plugins m_plugins;
+  };
 
-}
+}  // namespace edmplugin
 #endif
diff --git a/FWCore/PluginManager/interface/PluginFactoryManager.h b/FWCore/PluginManager/interface/PluginFactoryManager.h
index 80d2960d0ba8c..7438792bc2b16 100644
--- a/FWCore/PluginManager/interface/PluginFactoryManager.h
+++ b/FWCore/PluginManager/interface/PluginFactoryManager.h
@@ -4,7 +4,7 @@
 //
 // Package:     PluginManager
 // Class  :     PluginFactoryManager
-// 
+//
 /**\class PluginFactoryManager PluginFactoryManager.h FWCore/PluginManager/interface/PluginFactoryManager.h
 
  Description: <one line class summary>
@@ -29,36 +29,33 @@
 namespace edmplugin {
   class PluginFactoryBase;
   class DummyFriend;
-class PluginFactoryManager
-{
+  class PluginFactoryManager {
+  public:
+    friend class DummyFriend;
 
-   public:
-      friend class DummyFriend;
-  
-      ~PluginFactoryManager();
+    ~PluginFactoryManager();
 
-      typedef std::vector<const PluginFactoryBase*>::const_iterator const_iterator;
-      // ---------- const member functions ---------------------
-      const_iterator begin() const;
-      const_iterator end() const;
+    typedef std::vector<const PluginFactoryBase*>::const_iterator const_iterator;
+    // ---------- const member functions ---------------------
+    const_iterator begin() const;
+    const_iterator end() const;
 
-      // ---------- static member functions --------------------
-      static PluginFactoryManager* get();
+    // ---------- static member functions --------------------
+    static PluginFactoryManager* get();
 
-      // ---------- member functions ---------------------------
-      void addFactory(const PluginFactoryBase*);
-      edm::signalslot::Signal<void(const PluginFactoryBase*)> newFactory_;
-      
-   private:
-      PluginFactoryManager();
-      PluginFactoryManager(const PluginFactoryManager&) = delete; // stop default
+    // ---------- member functions ---------------------------
+    void addFactory(const PluginFactoryBase*);
+    edm::signalslot::Signal<void(const PluginFactoryBase*)> newFactory_;
 
-      const PluginFactoryManager& operator=(const PluginFactoryManager&) = delete; // stop default
+  private:
+    PluginFactoryManager();
+    PluginFactoryManager(const PluginFactoryManager&) = delete;  // stop default
 
-      // ---------- member data --------------------------------
-      std::vector<const PluginFactoryBase*> factories_;
+    const PluginFactoryManager& operator=(const PluginFactoryManager&) = delete;  // stop default
 
-};
+    // ---------- member data --------------------------------
+    std::vector<const PluginFactoryBase*> factories_;
+  };
 
-}
+}  // namespace edmplugin
 #endif
diff --git a/FWCore/PluginManager/interface/PluginInfo.h b/FWCore/PluginManager/interface/PluginInfo.h
index 309bba73c2652..583d9db9c6f40 100644
--- a/FWCore/PluginManager/interface/PluginInfo.h
+++ b/FWCore/PluginManager/interface/PluginInfo.h
@@ -4,7 +4,7 @@
 //
 // Package:     PluginManager
 // Class  :     PluginInfo
-// 
+//
 /**\class PluginInfo PluginInfo.h FWCore/PluginManager/interface/PluginInfo.h
 
  Description: Holds information about a particular plugin
@@ -25,9 +25,9 @@
 
 // forward declarations
 namespace edmplugin {
-struct PluginInfo {
-  std::string name_;
-  boost::filesystem::path loadable_;
-};
-}
+  struct PluginInfo {
+    std::string name_;
+    boost::filesystem::path loadable_;
+  };
+}  // namespace edmplugin
 #endif
diff --git a/FWCore/PluginManager/interface/PluginManager.h b/FWCore/PluginManager/interface/PluginManager.h
index a77eb9daff7c6..6c0aece8bab1e 100644
--- a/FWCore/PluginManager/interface/PluginManager.h
+++ b/FWCore/PluginManager/interface/PluginManager.h
@@ -4,7 +4,7 @@
 //
 // Package:     PluginManager
 // Class  :     PluginManager
-// 
+//
 /**\class PluginManager PluginManager.h FWCore/PluginManager/interface/PluginManager.h
 
  Description: Manages the loading of shared objects
@@ -37,104 +37,94 @@
 namespace edmplugin {
   class DummyFriend;
   class PluginFactoryBase;
-  
+
   struct PluginManagerPathHasher {
     size_t operator()(boost::filesystem::path const& iPath) const {
       tbb::tbb_hash<std::string> hasher;
-      return hasher( iPath.native() );
+      return hasher(iPath.native());
     }
   };
-  
-class PluginManager
-{
-   friend class DummyFriend;
+
+  class PluginManager {
+    friend class DummyFriend;
+
   public:
-     typedef std::vector<std::string> SearchPath;
-     typedef std::vector<PluginInfo> Infos;
-     typedef std::map<std::string, Infos > CategoryToInfos;
-
-     class Config {
-      public:
-       Config() { }
-       Config& searchPath(const SearchPath& iPath) {
-         m_path = iPath;
-         return *this;
-       }
-       const SearchPath& searchPath() const {
-         return m_path;
-       }
-       void allowNoCache() {
-         m_mustHaveCache = false;
-       }
-       
-       bool mustHaveCache() const {
-         return m_mustHaveCache;
-       }
-       private:
-       SearchPath m_path;
-       bool m_mustHaveCache = true;
-     };
-
-      ~PluginManager();
-
-      // ---------- const member functions ---------------------
-      const SharedLibrary& load(const std::string& iCategory,
-                                const std::string& iPlugin);
-
-      const boost::filesystem::path& loadableFor(const std::string& iCategory,
-                                                 const std::string& iPlugin);
-      
-      /**The container is ordered by category, then plugin name and then by precidence order of the plugin files.
+    typedef std::vector<std::string> SearchPath;
+    typedef std::vector<PluginInfo> Infos;
+    typedef std::map<std::string, Infos> CategoryToInfos;
+
+    class Config {
+    public:
+      Config() {}
+      Config& searchPath(const SearchPath& iPath) {
+        m_path = iPath;
+        return *this;
+      }
+      const SearchPath& searchPath() const { return m_path; }
+      void allowNoCache() { m_mustHaveCache = false; }
+
+      bool mustHaveCache() const { return m_mustHaveCache; }
+
+    private:
+      SearchPath m_path;
+      bool m_mustHaveCache = true;
+    };
+
+    ~PluginManager();
+
+    // ---------- const member functions ---------------------
+    const SharedLibrary& load(const std::string& iCategory, const std::string& iPlugin);
+
+    const boost::filesystem::path& loadableFor(const std::string& iCategory, const std::string& iPlugin);
+
+    /**The container is ordered by category, then plugin name and then by precidence order of the plugin files.
         Therefore the first match on category and plugin name will be the proper file to load
         */
-      const CategoryToInfos& categoryToInfos() const {
-        return categoryToInfos_;
-      }
-      
-      //If can not find iPlugin in category iCategory return null pointer, any other failure will cause a throw
-      const SharedLibrary* tryToLoad(const std::string& iCategory,
-                                     const std::string& iPlugin);
-      
-      // ---------- static member functions --------------------
-      ///file name of the shared object being loaded
-      static const std::string& loadingFile() { 
-        return loadingLibraryNamed_();}
-
-      ///if the value returned from loadingFile matches this string then the file is statically linked
-      static const std::string& staticallyLinkedLoadingFileName();
-
-      
-      static PluginManager* get();
-      static PluginManager& configure(const Config& );
-      
-      static bool isAvailable();
-      
-      // ---------- member functions ---------------------------
-      edm::signalslot::Signal<void(const boost::filesystem::path&)> goingToLoad_;
-      edm::signalslot::Signal<void(const SharedLibrary&)> justLoaded_;
-      edm::signalslot::Signal<void(const std::string&,const std::string&)> askedToLoadCategoryWithPlugin_;
-   private:
-      PluginManager(const Config&);
-      PluginManager(const PluginManager&) = delete; // stop default
-
-      const PluginManager& operator=(const PluginManager&) = delete; // stop default
-
-      void newFactory(const PluginFactoryBase* );
-      static std::string& loadingLibraryNamed_();
-      static PluginManager*& singleton();
-  
-      std::recursive_mutex& pluginLoadMutex() {return pluginLoadMutex_;}
-  
-      const boost::filesystem::path& loadableFor_(const std::string& iCategory,
-                                                  const std::string& iPlugin,
-                                                  bool& ioThrowIfFailElseSucceedStatus);
-      // ---------- member data --------------------------------
-      SearchPath searchPath_;
-      tbb::concurrent_unordered_map<boost::filesystem::path, std::shared_ptr<SharedLibrary>, PluginManagerPathHasher > loadables_;
-      
-      CategoryToInfos categoryToInfos_;
-      std::recursive_mutex pluginLoadMutex_;
-};
-
-}
+    const CategoryToInfos& categoryToInfos() const { return categoryToInfos_; }
+
+    //If can not find iPlugin in category iCategory return null pointer, any other failure will cause a throw
+    const SharedLibrary* tryToLoad(const std::string& iCategory, const std::string& iPlugin);
+
+    // ---------- static member functions --------------------
+    ///file name of the shared object being loaded
+    static const std::string& loadingFile() { return loadingLibraryNamed_(); }
+
+    ///if the value returned from loadingFile matches this string then the file is statically linked
+    static const std::string& staticallyLinkedLoadingFileName();
+
+    static PluginManager* get();
+    static PluginManager& configure(const Config&);
+
+    static bool isAvailable();
+
+    // ---------- member functions ---------------------------
+    edm::signalslot::Signal<void(const boost::filesystem::path&)> goingToLoad_;
+    edm::signalslot::Signal<void(const SharedLibrary&)> justLoaded_;
+    edm::signalslot::Signal<void(const std::string&, const std::string&)> askedToLoadCategoryWithPlugin_;
+
+  private:
+    PluginManager(const Config&);
+    PluginManager(const PluginManager&) = delete;  // stop default
+
+    const PluginManager& operator=(const PluginManager&) = delete;  // stop default
+
+    void newFactory(const PluginFactoryBase*);
+    static std::string& loadingLibraryNamed_();
+    static PluginManager*& singleton();
+
+    std::recursive_mutex& pluginLoadMutex() { return pluginLoadMutex_; }
+
+    const boost::filesystem::path& loadableFor_(const std::string& iCategory,
+                                                const std::string& iPlugin,
+                                                bool& ioThrowIfFailElseSucceedStatus);
+    // ---------- member data --------------------------------
+    SearchPath searchPath_;
+    tbb::concurrent_unordered_map<boost::filesystem::path, std::shared_ptr<SharedLibrary>, PluginManagerPathHasher>
+        loadables_;
+
+    CategoryToInfos categoryToInfos_;
+    std::recursive_mutex pluginLoadMutex_;
+  };
+
+}  // namespace edmplugin
 #endif
diff --git a/FWCore/PluginManager/interface/PresenceFactory.h b/FWCore/PluginManager/interface/PresenceFactory.h
index 9d504678318e1..63781484d94f6 100644
--- a/FWCore/PluginManager/interface/PresenceFactory.h
+++ b/FWCore/PluginManager/interface/PresenceFactory.h
@@ -8,9 +8,9 @@
 #include <memory>
 
 namespace edm {
-  typedef edmplugin::PluginFactory<Presence* ()> PresencePluginFactory;
-  
-  typedef Presence* (PresenceFunc)();
+  typedef edmplugin::PluginFactory<Presence*()> PresencePluginFactory;
+
+  typedef Presence*(PresenceFunc)();
 
   class PresenceFactory {
   public:
@@ -18,12 +18,11 @@ namespace edm {
 
     static PresenceFactory* get();
 
-    std::unique_ptr<Presence>
-      makePresence(std::string const & presence_type) const;
+    std::unique_ptr<Presence> makePresence(std::string const& presence_type) const;
 
   private:
     PresenceFactory();
     //static PresenceFactory singleInstance_;
   };
-}
-#endif // FWCore_PluginManager_PresenceFactory_h
+}  // namespace edm
+#endif  // FWCore_PluginManager_PresenceFactory_h
diff --git a/FWCore/PluginManager/interface/PresenceMacros.h b/FWCore/PluginManager/interface/PresenceMacros.h
index 50987d7cd79b2..45155c07e45e1 100644
--- a/FWCore/PluginManager/interface/PresenceMacros.h
+++ b/FWCore/PluginManager/interface/PresenceMacros.h
@@ -3,7 +3,6 @@
 
 #include "FWCore/PluginManager/interface/PresenceFactory.h"
 
-#define DEFINE_FWK_PRESENCE(type) \
-  DEFINE_EDM_PLUGIN (edm::PresencePluginFactory,type,#type)
+#define DEFINE_FWK_PRESENCE(type) DEFINE_EDM_PLUGIN(edm::PresencePluginFactory, type, #type)
 
 #endif
diff --git a/FWCore/PluginManager/interface/ProblemTracker.h b/FWCore/PluginManager/interface/ProblemTracker.h
index ae8390fc8f926..ef75b6a215105 100644
--- a/FWCore/PluginManager/interface/ProblemTracker.h
+++ b/FWCore/PluginManager/interface/ProblemTracker.h
@@ -13,10 +13,8 @@ occur, good state information can be printed.
 
 **/
 
-namespace edm
-{
-  class ProblemTracker
-  {
+namespace edm {
+  class ProblemTracker {
   public:
     static ProblemTracker const* instance();
 
@@ -26,16 +24,16 @@ namespace edm
     ProblemTracker(const ProblemTracker&) = delete;
   };
 
-  class AssertHandler
-  {
+  class AssertHandler {
   public:
     AssertHandler();
     ~AssertHandler();
+
   private:
     AssertHandler(const AssertHandler&) = delete;
     ProblemTracker const* pt_;
   };
 
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/PluginManager/interface/SharedLibrary.h b/FWCore/PluginManager/interface/SharedLibrary.h
index 9ecd228c32665..c4fffccbdd18b 100644
--- a/FWCore/PluginManager/interface/SharedLibrary.h
+++ b/FWCore/PluginManager/interface/SharedLibrary.h
@@ -4,7 +4,7 @@
 //
 // Package:     PluginManager
 // Class  :     SharedLibrary
-// 
+//
 /**\class SharedLibrary SharedLibrary.h FWCore/PluginManager/interface/SharedLibrary.h
 
  Description: Handles the loading of a SharedLibrary
@@ -26,30 +26,28 @@
 // forward declarations
 
 namespace edmplugin {
-class SharedLibrary
-{
+  class SharedLibrary {
+  public:
+    SharedLibrary(const boost::filesystem::path& iName);
+    ~SharedLibrary();
 
-   public:
-      SharedLibrary(const boost::filesystem::path& iName);
-      ~SharedLibrary();
+    // ---------- const member functions ---------------------
+    bool symbol(const std::string& iSymbolName, void*& iSymbol) const;
+    const boost::filesystem::path& path() const { return path_; }
 
-      // ---------- const member functions ---------------------
-      bool symbol(const std::string& iSymbolName, void* & iSymbol) const;
-      const boost::filesystem::path& path() const { return path_;}
+    // ---------- static member functions --------------------
 
-      // ---------- static member functions --------------------
+    // ---------- member functions ---------------------------
 
-      // ---------- member functions ---------------------------
-      
-   private:
-      SharedLibrary(const SharedLibrary&) = delete; // stop default
+  private:
+    SharedLibrary(const SharedLibrary&) = delete;  // stop default
 
-      const SharedLibrary& operator=(const SharedLibrary&) = delete; // stop default
+    const SharedLibrary& operator=(const SharedLibrary&) = delete;  // stop default
 
-      // ---------- member data --------------------------------
-      void* libraryHandle_;
-      boost::filesystem::path path_;
-};
+    // ---------- member data --------------------------------
+    void* libraryHandle_;
+    boost::filesystem::path path_;
+  };
 
-}
+}  // namespace edmplugin
 #endif
diff --git a/FWCore/PluginManager/interface/standard.h b/FWCore/PluginManager/interface/standard.h
index 0e5cb737120a4..25204e5087102 100644
--- a/FWCore/PluginManager/interface/standard.h
+++ b/FWCore/PluginManager/interface/standard.h
@@ -4,7 +4,7 @@
 //
 // Package:     PluginManager
 // Class  :     standard
-// 
+//
 /**\class standard standard.h FWCore/PluginManager/interface/standard.h
 
  Description: namespace which holds the standard configuration information
@@ -31,11 +31,11 @@ namespace edmplugin {
   namespace standard {
 
     PluginManager::Config config();
-    
+
     const boost::filesystem::path& cachefileName();
     const boost::filesystem::path& poisonedCachefileName();
-    
+
     const std::string& pluginPrefix();
-  }
-}
+  }  // namespace standard
+}  // namespace edmplugin
 #endif
diff --git a/FWCore/PluginManager/src/CacheParser.cc b/FWCore/PluginManager/src/CacheParser.cc
index 5e875df719434..6a370443b64ac 100644
--- a/FWCore/PluginManager/src/CacheParser.cc
+++ b/FWCore/PluginManager/src/CacheParser.cc
@@ -2,7 +2,7 @@
 //
 // Package:     PluginManager
 // Class  :     CacheParser
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -21,213 +21,190 @@
 #include "FWCore/Utilities/interface/Algorithms.h"
 
 namespace edmplugin {
-//
-// constants, enums and typedefs
-//
-
-//
-// static data member definitions
-//
-
-//
-// constructors and destructor
-//
-//CacheParser::CacheParser(std::istream&)
-//{
-//}
+  //
+  // constants, enums and typedefs
+  //
+
+  //
+  // static data member definitions
+  //
+
+  //
+  // constructors and destructor
+  //
+  //CacheParser::CacheParser(std::istream&)
+  //{
+  //}
+
+  // CacheParser::CacheParser(const CacheParser& rhs)
+  // {
+  //    // do actual copying here;
+  // }
+
+  //CacheParser::~CacheParser()
+  //{
+  //}
+
+  //
+  // assignment operators
+  //
+  // const CacheParser& CacheParser::operator=(const CacheParser& rhs)
+  // {
+  //   //An exception safe implementation is
+  //   CacheParser temp(rhs);
+  //   swap(rhs);
+  //
+  //   return *this;
+  // }
+
+  //
+  // member functions
+  //
+
+  //
+  // const member functions
+  //
+
+  //
+  // static member functions
+  //
+  static void checkForError(const std::istream& iIn, unsigned long iRecordNumber, const std::string& iContext) {
+    if (iIn.eof()) {
+      throw cms::Exception("PluginCacheParseFailed")
+          << "Unexpectedly reached end of file for line " << iRecordNumber << " just after '" << iContext << "'";
+    }
+    if (iIn.bad()) {
+      throw cms::Exception("PluginCacheParseFailed")
+          << "Reading failed on line " << iRecordNumber << " just after '" << iContext << "'";
+    }
+  }
 
-// CacheParser::CacheParser(const CacheParser& rhs)
-// {
-//    // do actual copying here;
-// }
+  bool CacheParser::readline(std::istream& iIn,
+                             const boost::filesystem::path& iDirectory,
+                             unsigned long iRecordNumber,
+                             PluginInfo& oInfo,
+                             std::string& oPluginType) {
+    static const std::string kNewLine("start of new line");
+    std::string fileName;
+    std::string pluginName;
+    iIn >> fileName;
+    if (iIn.eof()) {
+      return false;
+    }
+    checkForError(iIn, iRecordNumber, kNewLine);
+    CacheParser::restoreSpaces(fileName);
+    iIn >> pluginName;
+    checkForError(iIn, iRecordNumber, fileName);
+    CacheParser::restoreSpaces(pluginName);
+    iIn >> oPluginType;
+    checkForError(iIn, iRecordNumber, oPluginType);
+    CacheParser::restoreSpaces(oPluginType);
+
+    oInfo.loadable_ = iDirectory / fileName;
+    oInfo.name_ = pluginName;
+
+    //ignore everything to the end of line
+    iIn.ignore(std::numeric_limits<int>::max(), '\n');
+    while (iIn.peek() == '\n') {
+      iIn.get();
+    }
+    return true;
+  }
 
-//CacheParser::~CacheParser()
-//{
-//}
+  namespace {
+    struct CompPluginInfos {
+      bool operator()(const PluginInfo& iLHS, const PluginInfo& iRHS) const { return iLHS.name_ < iRHS.name_; }
+    };
+  }  // namespace
 
-//
-// assignment operators
-//
-// const CacheParser& CacheParser::operator=(const CacheParser& rhs)
-// {
-//   //An exception safe implementation is
-//   CacheParser temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
+  void CacheParser::read(std::istream& iIn,
+                         const boost::filesystem::path& iDirectory,
+                         CacheParser::CategoryToInfos& iOut) {
+    unsigned long recordNumber = 0;
 
-//
-// member functions
-//
+    std::string pluginType;
 
-//
-// const member functions
-//
+    PluginInfo info;
 
-//
-// static member functions
-//
-  static void checkForError(const std::istream& iIn,
-                            unsigned long iRecordNumber,
-                            const std::string& iContext)
-{
-    if(iIn.eof()) {
-      throw cms::Exception("PluginCacheParseFailed")<<"Unexpectedly reached end of file for line "
-      <<iRecordNumber<<" just after '"<<iContext<<"'";
+    while (iIn) {
+      ++recordNumber;
+      if (not readline(iIn, iDirectory, recordNumber, info, pluginType)) {
+        break;
+      }
+      iOut[pluginType].push_back(info);
     }
-    if(iIn.bad()) {
-      throw cms::Exception("PluginCacheParseFailed")<<"Reading failed on line "<<iRecordNumber <<" just after '"<<iContext<<"'";
+    //now do a sort which preserves any previous order for files
+    for (CacheParser::CategoryToInfos::iterator it = iOut.begin(), itEnd = iOut.end(); it != itEnd; ++it) {
+      std::stable_sort(it->second.begin(), it->second.end(), CompPluginInfos());
     }
-}
-  
-bool
-CacheParser::readline(std::istream& iIn, const boost::filesystem::path& iDirectory,
-         unsigned long iRecordNumber, PluginInfo &oInfo, std::string& oPluginType)
-{    
-  static const std::string kNewLine("start of new line");
-  std::string fileName;
-  std::string pluginName;
-  iIn >> fileName;
-  if(iIn.eof()) { return false;}
-  checkForError(iIn,iRecordNumber,kNewLine);
-  CacheParser::restoreSpaces(fileName);
-  iIn >> pluginName;
-  checkForError(iIn,iRecordNumber,fileName);
-  CacheParser::restoreSpaces(pluginName);
-  iIn >> oPluginType;
-  checkForError(iIn,iRecordNumber,oPluginType);
-  CacheParser::restoreSpaces(oPluginType);
-  
-  oInfo.loadable_ = iDirectory / fileName;
-  oInfo.name_ = pluginName;
-  
-  //ignore everything to the end of line
-  iIn.ignore(std::numeric_limits<int>::max(),
-             '\n');
-  while(iIn.peek() == '\n') {
-    iIn.get();
-  }  
-  return true;
-}
-
-namespace {
-  struct CompPluginInfos {
-    bool operator()(const PluginInfo& iLHS,
-                    const PluginInfo& iRHS) const
-  {
-    return iLHS.name_ < iRHS.name_;
   }
-  };
-}
-
-void
-CacheParser::read(std::istream& iIn, 
-                  const boost::filesystem::path& iDirectory,
-                  CacheParser::CategoryToInfos& iOut)
-{
-  unsigned long recordNumber=0;
-  
-  std::string pluginType;
-  
-  PluginInfo info;
-
-  while(iIn) {
-    ++recordNumber;
-    if( not readline(iIn,iDirectory,recordNumber,info,pluginType) ) {
-      break;
-    }
-    iOut[pluginType].push_back(info);
-  }
-  //now do a sort which preserves any previous order for files
-  for(CacheParser::CategoryToInfos::iterator it = iOut.begin(), itEnd=iOut.end();
-      it != itEnd;
-      ++it) {
-    std::stable_sort(it->second.begin(),it->second.end(), CompPluginInfos());
-  }
-}
-
-void
-CacheParser::write(const CategoryToInfos& iInfos, std::ostream& oOut)
-{
-  //order the data more to our liking: library then object then type
-  LoadableToPlugins ordered;
-  
-  for(CategoryToInfos::const_iterator it = iInfos.begin();
-      it != iInfos.end();
-      ++it) {
-    std::string type(it->first);
-    for(std::vector<PluginInfo>::const_iterator it2=it->second.begin();
-        it2 != it->second.end();
-        ++it2) {
-      //remove any directory specification
+
+  void CacheParser::write(const CategoryToInfos& iInfos, std::ostream& oOut) {
+    //order the data more to our liking: library then object then type
+    LoadableToPlugins ordered;
+
+    for (CategoryToInfos::const_iterator it = iInfos.begin(); it != iInfos.end(); ++it) {
+      std::string type(it->first);
+      for (std::vector<PluginInfo>::const_iterator it2 = it->second.begin(); it2 != it->second.end(); ++it2) {
+        //remove any directory specification
 #if (BOOST_VERSION / 100000) >= 1 && ((BOOST_VERSION / 100) % 1000) >= 47
-      std::string loadable(it2->loadable_.filename().string());
+        std::string loadable(it2->loadable_.filename().string());
 #else
-      std::string loadable(it2->loadable_.filename());
+        std::string loadable(it2->loadable_.filename());
 #endif
-      std::string name(it2->name_);
-      ordered[loadable].push_back(NameAndType(name,type));
+        std::string name(it2->name_);
+        ordered[loadable].push_back(NameAndType(name, type));
+      }
     }
+    write(ordered, oOut);
   }
-  write(ordered,oOut);
-}
-
-void 
-CacheParser::write(LoadableToPlugins& iIn, std::ostream& oOut)
-{
-  for( LoadableToPlugins::iterator it = iIn.begin();
-       it!=iIn.end();
-       ++it) {
-    std::string loadable(it->first.string());
-    replaceSpaces(loadable);
-    edm::sort_all(it->second);
-    
-    for(std::vector<std::pair<std::string,std::string> >::iterator it2 = it->second.begin();
-        it2 != it->second.end();
-        ++it2) {
-      oOut << loadable <<" "<<replaceSpaces(it2->first)<<" "<<replaceSpaces(it2->second)<<"\n";
+
+  void CacheParser::write(LoadableToPlugins& iIn, std::ostream& oOut) {
+    for (LoadableToPlugins::iterator it = iIn.begin(); it != iIn.end(); ++it) {
+      std::string loadable(it->first.string());
+      replaceSpaces(loadable);
+      edm::sort_all(it->second);
+
+      for (std::vector<std::pair<std::string, std::string> >::iterator it2 = it->second.begin();
+           it2 != it->second.end();
+           ++it2) {
+        oOut << loadable << " " << replaceSpaces(it2->first) << " " << replaceSpaces(it2->second) << "\n";
+      }
     }
   }
-}
-
-void 
-CacheParser::read(std::istream& iIn, LoadableToPlugins& oOut)
-{
-  unsigned long recordNumber=0;
-  
-  std::string pluginType;
-  
-  PluginInfo info;
-  NameAndType pat;
-  boost::filesystem::path empty;
-  
-  while(iIn) {
-    ++recordNumber;
-    if( not readline(iIn,empty,recordNumber,info,pat.second) ) {
-      break;
+
+  void CacheParser::read(std::istream& iIn, LoadableToPlugins& oOut) {
+    unsigned long recordNumber = 0;
+
+    std::string pluginType;
+
+    PluginInfo info;
+    NameAndType pat;
+    boost::filesystem::path empty;
+
+    while (iIn) {
+      ++recordNumber;
+      if (not readline(iIn, empty, recordNumber, info, pat.second)) {
+        break;
+      }
+      pat.first = info.name_;
+      oOut[info.loadable_].push_back(pat);
     }
-    pat.first = info.name_;
-    oOut[info.loadable_].push_back(pat);
   }
-}
-
-std::string& 
-CacheParser::replaceSpaces(std::string& io)
-{
-  std::string::size_type index=0;
-  while(std::string::npos != (index = io.find_first_of(" \t\n",index))) {
-    io[index]='%';
+
+  std::string& CacheParser::replaceSpaces(std::string& io) {
+    std::string::size_type index = 0;
+    while (std::string::npos != (index = io.find_first_of(" \t\n", index))) {
+      io[index] = '%';
+    }
+    return io;
   }
-  return io;
-}
-
-std::string& CacheParser::restoreSpaces(std::string& io)
-{
-  std::string::size_type index=0;
-  while(std::string::npos != (index = io.find_first_of("%",index))) {
-    io[index]=' ';
+
+  std::string& CacheParser::restoreSpaces(std::string& io) {
+    std::string::size_type index = 0;
+    while (std::string::npos != (index = io.find_first_of("%", index))) {
+      io[index] = ' ';
+    }
+    return io;
   }
-  return io;
-}
-}
+}  // namespace edmplugin
diff --git a/FWCore/PluginManager/src/PluginCapabilities.cc b/FWCore/PluginManager/src/PluginCapabilities.cc
index 3bc45c4cc19d0..67c4494d4a161 100644
--- a/FWCore/PluginManager/src/PluginCapabilities.cc
+++ b/FWCore/PluginManager/src/PluginCapabilities.cc
@@ -2,7 +2,7 @@
 //
 // Package:     PluginManager
 // Class  :     PluginCapabilities
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -20,152 +20,142 @@
 #include "FWCore/Utilities/interface/thread_safety_macros.h"
 
 namespace edmplugin {
-//
-// constants, enums and typedefs
-//
+  //
+  // constants, enums and typedefs
+  //
 
-//
-// static data member definitions
-//
+  //
+  // static data member definitions
+  //
 
-//
-// constructors and destructor
-//
-PluginCapabilities::PluginCapabilities()
-{
-  finishedConstruction();
-}
+  //
+  // constructors and destructor
+  //
+  PluginCapabilities::PluginCapabilities() { finishedConstruction(); }
 
-// PluginCapabilities::PluginCapabilities(const PluginCapabilities& rhs)
-// {
-//    // do actual copying here;
-// }
+  // PluginCapabilities::PluginCapabilities(const PluginCapabilities& rhs)
+  // {
+  //    // do actual copying here;
+  // }
 
-PluginCapabilities::~PluginCapabilities()
-{
-}
+  PluginCapabilities::~PluginCapabilities() {}
 
-//
-// assignment operators
-//
-// const PluginCapabilities& PluginCapabilities::operator=(const PluginCapabilities& rhs)
-// {
-//   //An exception safe implementation is
-//   PluginCapabilities temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
+  //
+  // assignment operators
+  //
+  // const PluginCapabilities& PluginCapabilities::operator=(const PluginCapabilities& rhs)
+  // {
+  //   //An exception safe implementation is
+  //   PluginCapabilities temp(rhs);
+  //   swap(rhs);
+  //
+  //   return *this;
+  // }
 
-//
-// member functions
-//
-bool 
-PluginCapabilities::tryToFind(const SharedLibrary& iLoadable)
-{
-  void* sym;
-  if( not iLoadable.symbol("SEAL_CAPABILITIES",sym) ) {
-    return false;
-  }
-  
-  const char** names;
-  int size;
-  //reinterpret_cast<void (*)(const char**&,int&)>(sym)(names,size);
-  reinterpret_cast<void (*)(const char**&,int&)>(reinterpret_cast<unsigned long>(sym))(names,size);
-
-  PluginInfo info;
-  for(int i=0; i < size; ++i) {
-    std::string name(names[i]);
-    classToLoadable_[name]=iLoadable.path();
-    
-    //NOTE: can't use newPlugin(name) to do the work since it assumes
-    //  we haven't yet returned from PluginManager::load method
-    info.name_ = name;
-    info.loadable_ = iLoadable.path();
-    this->newPluginAdded_(category(),info);
-  }
-  return true;
-}
-
-void 
-PluginCapabilities::load(const std::string& iName)
-{
-  if(classToLoadable_.end() == classToLoadable_.find(iName) ) {
-    const SharedLibrary& lib = PluginManager::get()->load(category(),
-                                                          iName);
-    //read the items from the 'capabilities' symbol
-    if(not tryToFind(lib) ) {
-      throw cms::Exception("PluginNotFound")<<"The dictionary for class '"<<iName <<"' is supposed to be in file\n '"
-      <<lib.path().string()<<"'\n but no dictionaries are in that file.\n"
-      "It appears like the cache is wrong.  Please do 'EdmPluginRefresh "<<lib.path().string()<<"'.";
+  //
+  // member functions
+  //
+  bool PluginCapabilities::tryToFind(const SharedLibrary& iLoadable) {
+    void* sym;
+    if (not iLoadable.symbol("SEAL_CAPABILITIES", sym)) {
+      return false;
     }
-    
-    if(classToLoadable_.end() == classToLoadable_.find(iName)) {
-      throw cms::Exception("PluginNotFound")<<"The dictionary for class '"<<iName<<"' is supposed to be in file\n '"
-      <<lib.path().string()<<"'\n but was not found.\n"
-      "It appears like the cache is wrong.  Please do 'EdmPluginRefresh "<<lib.path().string()<<"'.";
+
+    const char** names;
+    int size;
+    //reinterpret_cast<void (*)(const char**&,int&)>(sym)(names,size);
+    reinterpret_cast<void (*)(const char**&, int&)>(reinterpret_cast<unsigned long>(sym))(names, size);
+
+    PluginInfo info;
+    for (int i = 0; i < size; ++i) {
+      std::string name(names[i]);
+      classToLoadable_[name] = iLoadable.path();
+
+      //NOTE: can't use newPlugin(name) to do the work since it assumes
+      //  we haven't yet returned from PluginManager::load method
+      info.name_ = name;
+      info.loadable_ = iLoadable.path();
+      this->newPluginAdded_(category(), info);
     }
+    return true;
   }
-}
-
-bool
-PluginCapabilities::tryToLoad(const std::string& iName)
-{
-  if(classToLoadable_.end() == classToLoadable_.find(iName) ) {
-    const SharedLibrary* lib = PluginManager::get()->tryToLoad(category(),
-                                                          iName);
-    if( nullptr == lib) {
-      return false;
-    }
-    //read the items from the 'capabilities' symbol
-    if(not tryToFind(*lib) ) {
-      throw cms::Exception("PluginNotFound")<<"The dictionary for class '"<<iName <<"' is supposed to be in file\n '"
-      <<lib->path().string()<<"'\n but no dictionaries are in that file.\n"
-      "It appears like the cache is wrong.  Please do 'EdmPluginRefresh "<<lib->path().string()<<"'.";
+
+  void PluginCapabilities::load(const std::string& iName) {
+    if (classToLoadable_.end() == classToLoadable_.find(iName)) {
+      const SharedLibrary& lib = PluginManager::get()->load(category(), iName);
+      //read the items from the 'capabilities' symbol
+      if (not tryToFind(lib)) {
+        throw cms::Exception("PluginNotFound")
+            << "The dictionary for class '" << iName << "' is supposed to be in file\n '" << lib.path().string()
+            << "'\n but no dictionaries are in that file.\n"
+               "It appears like the cache is wrong.  Please do 'EdmPluginRefresh "
+            << lib.path().string() << "'.";
+      }
+
+      if (classToLoadable_.end() == classToLoadable_.find(iName)) {
+        throw cms::Exception("PluginNotFound")
+            << "The dictionary for class '" << iName << "' is supposed to be in file\n '" << lib.path().string()
+            << "'\n but was not found.\n"
+               "It appears like the cache is wrong.  Please do 'EdmPluginRefresh "
+            << lib.path().string() << "'.";
+      }
     }
-    
-    if(classToLoadable_.end() == classToLoadable_.find(iName)) {
-      throw cms::Exception("PluginNotFound")<<"The dictionary for class '"<<iName<<"' is supposed to be in file\n '"
-      <<lib->path().string()<<"'\n but was not found.\n"
-      "It appears like the cache is wrong.  Please do 'EdmPluginRefresh "<<lib->path().string()<<"'.";
+  }
+
+  bool PluginCapabilities::tryToLoad(const std::string& iName) {
+    if (classToLoadable_.end() == classToLoadable_.find(iName)) {
+      const SharedLibrary* lib = PluginManager::get()->tryToLoad(category(), iName);
+      if (nullptr == lib) {
+        return false;
+      }
+      //read the items from the 'capabilities' symbol
+      if (not tryToFind(*lib)) {
+        throw cms::Exception("PluginNotFound")
+            << "The dictionary for class '" << iName << "' is supposed to be in file\n '" << lib->path().string()
+            << "'\n but no dictionaries are in that file.\n"
+               "It appears like the cache is wrong.  Please do 'EdmPluginRefresh "
+            << lib->path().string() << "'.";
+      }
+
+      if (classToLoadable_.end() == classToLoadable_.find(iName)) {
+        throw cms::Exception("PluginNotFound")
+            << "The dictionary for class '" << iName << "' is supposed to be in file\n '" << lib->path().string()
+            << "'\n but was not found.\n"
+               "It appears like the cache is wrong.  Please do 'EdmPluginRefresh "
+            << lib->path().string() << "'.";
+      }
     }
+    return true;
   }
-  return true;
-}
-//
-// const member functions
-//
-std::vector<PluginInfo> 
-PluginCapabilities::available() const
-{
-  PluginInfo info;
-  std::vector<PluginInfo> infos;
-  infos.reserve(classToLoadable_.size());
-  
-  for(std::map<std::string, boost::filesystem::path>::const_iterator it = classToLoadable_.begin();
-      it != classToLoadable_.end();
-      ++it) {
-    info.name_ = it->first;
-    info.loadable_ = it->second;
-    infos.push_back(info);
+  //
+  // const member functions
+  //
+  std::vector<PluginInfo> PluginCapabilities::available() const {
+    PluginInfo info;
+    std::vector<PluginInfo> infos;
+    infos.reserve(classToLoadable_.size());
+
+    for (std::map<std::string, boost::filesystem::path>::const_iterator it = classToLoadable_.begin();
+         it != classToLoadable_.end();
+         ++it) {
+      info.name_ = it->first;
+      info.loadable_ = it->second;
+      infos.push_back(info);
+    }
+    return infos;
   }
-  return infos;
-}
 
-const std::string& 
-PluginCapabilities::category() const
-{
-  static const std::string s_cat("Capability");
-  return s_cat;
-}
+  const std::string& PluginCapabilities::category() const {
+    static const std::string s_cat("Capability");
+    return s_cat;
+  }
 
-//
-// static member functions
-//
-PluginCapabilities*
-PluginCapabilities::get() {
-  CMS_THREAD_SAFE static PluginCapabilities s_instance;
-  return &s_instance;
-}
+  //
+  // static member functions
+  //
+  PluginCapabilities* PluginCapabilities::get() {
+    CMS_THREAD_SAFE static PluginCapabilities s_instance;
+    return &s_instance;
+  }
 
-}
+}  // namespace edmplugin
diff --git a/FWCore/PluginManager/src/PluginFactoryBase.cc b/FWCore/PluginManager/src/PluginFactoryBase.cc
index 8a25c7a66f738..830962cb30fc9 100644
--- a/FWCore/PluginManager/src/PluginFactoryBase.cc
+++ b/FWCore/PluginManager/src/PluginFactoryBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     PluginManager
 // Class  :     PluginFactoryBase
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -18,169 +18,148 @@
 #include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/PluginManager/interface/PluginFactoryManager.h"
 
-
 namespace edmplugin {
-//
-// constants, enums and typedefs
-//
-
-//
-// static data member definitions
-//
-
-//
-// constructors and destructor
-//
-
-// PluginFactoryBase::PluginFactoryBase(const PluginFactoryBase& rhs)
-// {
-//    // do actual copying here;
-// }
-
-PluginFactoryBase::~PluginFactoryBase()
-{
-}
-
-//
-// assignment operators
-//
-// const PluginFactoryBase& PluginFactoryBase::operator=(const PluginFactoryBase& rhs)
-// {
-//   //An exception safe implementation is
-//   PluginFactoryBase temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
-
-//
-// member functions
-//
-void
-PluginFactoryBase::finishedConstruction()
-{
-   PluginFactoryManager::get()->addFactory(this);
-}
-
-void
-PluginFactoryBase::newPlugin(const std::string& iName)
-{
-  PluginInfo info;
-  info.loadable_=boost::filesystem::path(PluginManager::loadingFile());
-  info.name_=iName;
-  newPluginAdded_(category(),info);
-}
-
-
-void*
-PluginFactoryBase::findPMaker(const std::string& iName) const
-{
-  //do we already have it?
-  Plugins::const_iterator itFound = m_plugins.find(iName);
-  if(itFound == m_plugins.end()) {
-    std::string lib = PluginManager::get()->load(this->category(),iName).path().string();
-    itFound = m_plugins.find(iName);
-    if(itFound == m_plugins.end()) {
-      throw cms::Exception("PluginCacheError")<<"The plugin '"<<iName<<"' should have been in loadable\n '"
-      <<lib<<"'\n but was not there.  This means the plugin cache is incorrect.  Please run 'EdmPluginRefresh "<<lib<<"'";
-    }
-  } else {
-    //The item in the container can still be under construction so wait until the m_ptr has been set since that is done last
-    auto const& value= itFound->second.front();
-    while(value.m_ptr.load(std::memory_order_acquire)==nullptr) {}
-    checkProperLoadable(iName,value.m_name);
+  //
+  // constants, enums and typedefs
+  //
+
+  //
+  // static data member definitions
+  //
+
+  //
+  // constructors and destructor
+  //
+
+  // PluginFactoryBase::PluginFactoryBase(const PluginFactoryBase& rhs)
+  // {
+  //    // do actual copying here;
+  // }
+
+  PluginFactoryBase::~PluginFactoryBase() {}
+
+  //
+  // assignment operators
+  //
+  // const PluginFactoryBase& PluginFactoryBase::operator=(const PluginFactoryBase& rhs)
+  // {
+  //   //An exception safe implementation is
+  //   PluginFactoryBase temp(rhs);
+  //   swap(rhs);
+  //
+  //   return *this;
+  // }
+
+  //
+  // member functions
+  //
+  void PluginFactoryBase::finishedConstruction() { PluginFactoryManager::get()->addFactory(this); }
+
+  void PluginFactoryBase::newPlugin(const std::string& iName) {
+    PluginInfo info;
+    info.loadable_ = boost::filesystem::path(PluginManager::loadingFile());
+    info.name_ = iName;
+    newPluginAdded_(category(), info);
   }
-  return itFound->second.front().m_ptr.load(std::memory_order_acquire);
-}
-
-
-void*
-PluginFactoryBase::tryToFindPMaker(const std::string& iName) const
-{
-  //do we already have it?
-  Plugins::const_iterator itFound = m_plugins.find(iName);
-  if(itFound == m_plugins.end()) {
-    const SharedLibrary* slib = PluginManager::get()->tryToLoad(this->category(),iName);
-    if(nullptr!=slib) {
-      std::string lib = slib->path().string();
+
+  void* PluginFactoryBase::findPMaker(const std::string& iName) const {
+    //do we already have it?
+    Plugins::const_iterator itFound = m_plugins.find(iName);
+    if (itFound == m_plugins.end()) {
+      std::string lib = PluginManager::get()->load(this->category(), iName).path().string();
       itFound = m_plugins.find(iName);
-      if(itFound == m_plugins.end()) {
-        throw cms::Exception("PluginCacheError")<<"The plugin '"<<iName<<"' should have been in loadable\n '"
-        <<lib<<"'\n but was not there.  This means the plugin cache is incorrect.  Please run 'EdmPluginRefresh "<<lib<<"'";
+      if (itFound == m_plugins.end()) {
+        throw cms::Exception("PluginCacheError")
+            << "The plugin '" << iName << "' should have been in loadable\n '" << lib
+            << "'\n but was not there.  This means the plugin cache is incorrect.  Please run 'EdmPluginRefresh " << lib
+            << "'";
+      }
+    } else {
+      //The item in the container can still be under construction so wait until the m_ptr has been set since that is done last
+      auto const& value = itFound->second.front();
+      while (value.m_ptr.load(std::memory_order_acquire) == nullptr) {
       }
+      checkProperLoadable(iName, value.m_name);
     }
-  } else {
-    //The item in the container can still be under construction so wait until the m_ptr has been set since that is done last
-    auto const& value= itFound->second.front();
-    while(value.m_ptr.load(std::memory_order_acquire)==nullptr) {}
-    checkProperLoadable(iName,value.m_name);
+    return itFound->second.front().m_ptr.load(std::memory_order_acquire);
   }
-  return itFound != m_plugins.end()? itFound->second.front().m_ptr.load(std::memory_order_acquire) : nullptr;
-}
-
-void 
-PluginFactoryBase::fillInfo(const PMakers &makers,
-              PluginInfo& iInfo,
-              std::vector<PluginInfo>& iReturn ) const {
-  for(PMakers::const_iterator it = makers.begin();
-      it != makers.end();
-      ++it) {
-    while (nullptr ==it->m_ptr.load(std::memory_order_acquire)) ;
-    iInfo.loadable_ = it->m_name;
-    iReturn.push_back(iInfo);
+
+  void* PluginFactoryBase::tryToFindPMaker(const std::string& iName) const {
+    //do we already have it?
+    Plugins::const_iterator itFound = m_plugins.find(iName);
+    if (itFound == m_plugins.end()) {
+      const SharedLibrary* slib = PluginManager::get()->tryToLoad(this->category(), iName);
+      if (nullptr != slib) {
+        std::string lib = slib->path().string();
+        itFound = m_plugins.find(iName);
+        if (itFound == m_plugins.end()) {
+          throw cms::Exception("PluginCacheError")
+              << "The plugin '" << iName << "' should have been in loadable\n '" << lib
+              << "'\n but was not there.  This means the plugin cache is incorrect.  Please run 'EdmPluginRefresh "
+              << lib << "'";
+        }
+      }
+    } else {
+      //The item in the container can still be under construction so wait until the m_ptr has been set since that is done last
+      auto const& value = itFound->second.front();
+      while (value.m_ptr.load(std::memory_order_acquire) == nullptr) {
+      }
+      checkProperLoadable(iName, value.m_name);
+    }
+    return itFound != m_plugins.end() ? itFound->second.front().m_ptr.load(std::memory_order_acquire) : nullptr;
   }
-}
-
-void 
-PluginFactoryBase::fillAvailable(std::vector<PluginInfo>& iReturn) const {
-  PluginInfo info;
-  for( Plugins::const_iterator it = m_plugins.begin();
-      it != m_plugins.end();
-      ++it) {
-    info.name_ = it->first;
-    fillInfo(it->second,
-             info, iReturn);
+
+  void PluginFactoryBase::fillInfo(const PMakers& makers, PluginInfo& iInfo, std::vector<PluginInfo>& iReturn) const {
+    for (PMakers::const_iterator it = makers.begin(); it != makers.end(); ++it) {
+      while (nullptr == it->m_ptr.load(std::memory_order_acquire))
+        ;
+      iInfo.loadable_ = it->m_name;
+      iReturn.push_back(iInfo);
+    }
   }
-}
-
-void 
-PluginFactoryBase::checkProperLoadable(const std::string& iName, const std::string& iLoadedFrom) const
-{
-  //should check to see if this is from the proper loadable if it
-  // was not statically linked
-  if (iLoadedFrom != PluginManager::staticallyLinkedLoadingFileName() &&
-      PluginManager::isAvailable()) {
-    if( iLoadedFrom != PluginManager::get()->loadableFor(category(),iName).string() ) {
-      throw cms::Exception("WrongPluginLoaded")<<"The plugin '"<<iName<<"' should have been loaded from\n '"
-      <<PluginManager::get()->loadableFor(category(),iName).string()
-      <<"'\n but instead it was already loaded from\n '"
-      <<iLoadedFrom<<"'\n because some other plugin was loaded from the latter loadables.\n"
-      "To work around the problem the plugin '"<<iName<<"' should only be defined in one of these loadables.";
+
+  void PluginFactoryBase::fillAvailable(std::vector<PluginInfo>& iReturn) const {
+    PluginInfo info;
+    for (Plugins::const_iterator it = m_plugins.begin(); it != m_plugins.end(); ++it) {
+      info.name_ = it->first;
+      fillInfo(it->second, info, iReturn);
     }
   }
-}
 
+  void PluginFactoryBase::checkProperLoadable(const std::string& iName, const std::string& iLoadedFrom) const {
+    //should check to see if this is from the proper loadable if it
+    // was not statically linked
+    if (iLoadedFrom != PluginManager::staticallyLinkedLoadingFileName() && PluginManager::isAvailable()) {
+      if (iLoadedFrom != PluginManager::get()->loadableFor(category(), iName).string()) {
+        throw cms::Exception("WrongPluginLoaded")
+            << "The plugin '" << iName << "' should have been loaded from\n '"
+            << PluginManager::get()->loadableFor(category(), iName).string()
+            << "'\n but instead it was already loaded from\n '" << iLoadedFrom
+            << "'\n because some other plugin was loaded from the latter loadables.\n"
+               "To work around the problem the plugin '"
+            << iName << "' should only be defined in one of these loadables.";
+      }
+    }
+  }
 
-void 
-PluginFactoryBase::registerPMaker(void* iPMaker, const std::string& iName) {
-  assert(nullptr!= iPMaker);
-  m_plugins[iName].push_back(PluginMakerInfo(iPMaker,PluginManager::loadingFile()));
-  newPlugin(iName);
-}
+  void PluginFactoryBase::registerPMaker(void* iPMaker, const std::string& iName) {
+    assert(nullptr != iPMaker);
+    m_plugins[iName].push_back(PluginMakerInfo(iPMaker, PluginManager::loadingFile()));
+    newPlugin(iName);
+  }
 
-std::vector<PluginInfo> 
-PluginFactoryBase::available() const {
-  std::vector<PluginInfo> returnValue;
-  returnValue.reserve(m_plugins.size());
-  fillAvailable(returnValue);
-  return returnValue;
-}
+  std::vector<PluginInfo> PluginFactoryBase::available() const {
+    std::vector<PluginInfo> returnValue;
+    returnValue.reserve(m_plugins.size());
+    fillAvailable(returnValue);
+    return returnValue;
+  }
 
-//
-// const member functions
-//
+  //
+  // const member functions
+  //
 
-//
-// static member functions
-//
-}
+  //
+  // static member functions
+  //
+}  // namespace edmplugin
diff --git a/FWCore/PluginManager/src/PluginFactoryManager.cc b/FWCore/PluginManager/src/PluginFactoryManager.cc
index 6ee83e3dacfff..85cc1f93c474e 100644
--- a/FWCore/PluginManager/src/PluginFactoryManager.cc
+++ b/FWCore/PluginManager/src/PluginFactoryManager.cc
@@ -2,7 +2,7 @@
 //
 // Package:     PluginManager
 // Class  :     PluginFactoryManager
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -16,75 +16,59 @@
 #include "FWCore/PluginManager/interface/PluginFactoryManager.h"
 #include "FWCore/Utilities/interface/thread_safety_macros.h"
 
-namespace edmplugin{
-//
-// constants, enums and typedefs
-//
+namespace edmplugin {
+  //
+  // constants, enums and typedefs
+  //
 
-//
-// static data member definitions
-//
+  //
+  // static data member definitions
+  //
 
-//
-// constructors and destructor
-//
-PluginFactoryManager::PluginFactoryManager()
-{
-}
+  //
+  // constructors and destructor
+  //
+  PluginFactoryManager::PluginFactoryManager() {}
 
-// PluginFactoryManager::PluginFactoryManager(const PluginFactoryManager& rhs)
-// {
-//    // do actual copying here;
-// }
+  // PluginFactoryManager::PluginFactoryManager(const PluginFactoryManager& rhs)
+  // {
+  //    // do actual copying here;
+  // }
 
-PluginFactoryManager::~PluginFactoryManager()
-{
-}
+  PluginFactoryManager::~PluginFactoryManager() {}
 
-//
-// assignment operators
-//
-// const PluginFactoryManager& PluginFactoryManager::operator=(const PluginFactoryManager& rhs)
-// {
-//   //An exception safe implementation is
-//   PluginFactoryManager temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
+  //
+  // assignment operators
+  //
+  // const PluginFactoryManager& PluginFactoryManager::operator=(const PluginFactoryManager& rhs)
+  // {
+  //   //An exception safe implementation is
+  //   PluginFactoryManager temp(rhs);
+  //   swap(rhs);
+  //
+  //   return *this;
+  // }
 
-//
-// member functions
-//
-void
-PluginFactoryManager::addFactory(const PluginFactoryBase* iFactory)
-{
-   factories_.push_back(iFactory);
-   newFactory_(iFactory);
-}
+  //
+  // member functions
+  //
+  void PluginFactoryManager::addFactory(const PluginFactoryBase* iFactory) {
+    factories_.push_back(iFactory);
+    newFactory_(iFactory);
+  }
 
-//
-// const member functions
-//
-PluginFactoryManager::const_iterator
-PluginFactoryManager::begin() const
-{
-   return factories_.begin();
-}
+  //
+  // const member functions
+  //
+  PluginFactoryManager::const_iterator PluginFactoryManager::begin() const { return factories_.begin(); }
 
-PluginFactoryManager::const_iterator
-PluginFactoryManager::end() const
-{
-   return factories_.end();
-}
+  PluginFactoryManager::const_iterator PluginFactoryManager::end() const { return factories_.end(); }
 
-//
-// static member functions
-//
-PluginFactoryManager*
-PluginFactoryManager::get()
-{
-   CMS_THREAD_SAFE static PluginFactoryManager s_instance;
-   return &s_instance;
-}
-}
+  //
+  // static member functions
+  //
+  PluginFactoryManager* PluginFactoryManager::get() {
+    CMS_THREAD_SAFE static PluginFactoryManager s_instance;
+    return &s_instance;
+  }
+}  // namespace edmplugin
diff --git a/FWCore/PluginManager/src/PluginManager.cc b/FWCore/PluginManager/src/PluginManager.cc
index 4f925ccd23b6b..3e2d5f14ebf80 100644
--- a/FWCore/PluginManager/src/PluginManager.cc
+++ b/FWCore/PluginManager/src/PluginManager.cc
@@ -2,7 +2,7 @@
 //
 // Package:     PluginManager
 // Class  :     PluginManager
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -31,35 +31,32 @@
 #include "FWCore/Utilities/interface/thread_safety_macros.h"
 
 namespace edmplugin {
-//
-// constants, enums and typedefs
-//
+  //
+  // constants, enums and typedefs
+  //
 
-//
-// static data member definitions
-//
+  //
+  // static data member definitions
+  //
 
-static bool readCacheFile(const boost::filesystem::path &cacheFile,
-                          const boost::filesystem::path &dir, 
-                          PluginManager::CategoryToInfos &categoryToInfos) 
-{
-  if(exists(cacheFile) ) {
-    std::ifstream file(cacheFile.string().c_str());
-    if(not file) {
-      throw cms::Exception("PluginMangerCacheProblem")<<"Unable to open the cache file '"<<cacheFile.string()
-      <<"'. Please check permissions on file";
+  static bool readCacheFile(const boost::filesystem::path& cacheFile,
+                            const boost::filesystem::path& dir,
+                            PluginManager::CategoryToInfos& categoryToInfos) {
+    if (exists(cacheFile)) {
+      std::ifstream file(cacheFile.string().c_str());
+      if (not file) {
+        throw cms::Exception("PluginMangerCacheProblem")
+            << "Unable to open the cache file '" << cacheFile.string() << "'. Please check permissions on file";
+      }
+      CacheParser::read(file, dir, categoryToInfos);
+      return true;
     }
-    CacheParser::read(file, dir, categoryToInfos);          
-    return true;
+    return false;
   }
-  return false;
-}
-//
-// constructors and destructor
-//
-PluginManager::PluginManager(const PluginManager::Config& iConfig) :
-  searchPath_( iConfig.searchPath() )
-{
+  //
+  // constructors and destructor
+  //
+  PluginManager::PluginManager(const PluginManager::Config& iConfig) : searchPath_(iConfig.searchPath()) {
     using std::placeholders::_1;
     const boost::filesystem::path& kCacheFile(standard::cachefileName());
     // This is the filename of a file which contains plugins which exist in the
@@ -68,14 +65,13 @@ PluginManager::PluginManager(const PluginManager::Config& iConfig) :
     const boost::filesystem::path& kPoisonedCacheFile(standard::poisonedCachefileName());
     //NOTE: This may not be needed :/
     PluginFactoryManager* pfm = PluginFactoryManager::get();
-    pfm->newFactory_.connect(std::bind(std::mem_fn(&PluginManager::newFactory),this,_1));
+    pfm->newFactory_.connect(std::bind(std::mem_fn(&PluginManager::newFactory), this, _1));
 
-    // When building a single big executable the plugins are already registered in the 
+    // When building a single big executable the plugins are already registered in the
     // PluginFactoryManager, we therefore only need to populate the categoryToInfos_ map
     // with the relevant information.
-    for (PluginFactoryManager::const_iterator i = pfm->begin(), e = pfm->end(); i != e; ++i)
-    {
-    	categoryToInfos_[(*i)->category()] = (*i)->available();
+    for (PluginFactoryManager::const_iterator i = pfm->begin(), e = pfm->end(); i != e; ++i) {
+      categoryToInfos_[(*i)->category()] = (*i)->available();
     }
 
     //read in the files
@@ -83,297 +79,261 @@ PluginManager::PluginManager(const PluginManager::Config& iConfig) :
     // in that order
     bool foundAtLeastOneCacheFile = false;
     std::set<std::string> alreadySeen;
-    for(SearchPath::const_iterator itPath=searchPath_.begin(), itEnd = searchPath_.end();
-        itPath != itEnd;
-        ++itPath) {
+    for (SearchPath::const_iterator itPath = searchPath_.begin(), itEnd = searchPath_.end(); itPath != itEnd;
+         ++itPath) {
       //take care of the case where the same path is passed in multiple times
-      if (alreadySeen.find(*itPath) != alreadySeen.end() ) {
+      if (alreadySeen.find(*itPath) != alreadySeen.end()) {
         continue;
       }
       alreadySeen.insert(*itPath);
       boost::filesystem::path dir(*itPath);
-      if( exists( dir) ) {
-        if(not is_directory(dir) ) {
-          throw cms::Exception("PluginManagerBadPath") <<"The path '"<<dir.string()<<"' for the PluginManager is not a directory";
+      if (exists(dir)) {
+        if (not is_directory(dir)) {
+          throw cms::Exception("PluginManagerBadPath")
+              << "The path '" << dir.string() << "' for the PluginManager is not a directory";
         }
-        boost::filesystem::path cacheFile = dir/kCacheFile;
-        
-        if (readCacheFile(cacheFile, dir, categoryToInfos_))
-        {
-          foundAtLeastOneCacheFile=true; 
+        boost::filesystem::path cacheFile = dir / kCacheFile;
+
+        if (readCacheFile(cacheFile, dir, categoryToInfos_)) {
+          foundAtLeastOneCacheFile = true;
         }
 
         // We do not check for return code since we do not want to consider a
         // poison cache file as a valid cache file having been found.
-        boost::filesystem::path poisonedCacheFile = dir/kPoisonedCacheFile;
-        readCacheFile(poisonedCacheFile, dir/"poisoned", categoryToInfos_);
+        boost::filesystem::path poisonedCacheFile = dir / kPoisonedCacheFile;
+        readCacheFile(poisonedCacheFile, dir / "poisoned", categoryToInfos_);
       }
     }
-    if(not foundAtLeastOneCacheFile and iConfig.mustHaveCache()) {
-      auto ex = cms::Exception("PluginManagerNoCacheFile")<<"No cache files named '"<<standard::cachefileName()<<"' were found in the directories \n";
-      for( auto const& seen : alreadySeen) {
-        ex <<" '"<<seen<<"'\n";
+    if (not foundAtLeastOneCacheFile and iConfig.mustHaveCache()) {
+      auto ex = cms::Exception("PluginManagerNoCacheFile")
+                << "No cache files named '" << standard::cachefileName() << "' were found in the directories \n";
+      for (auto const& seen : alreadySeen) {
+        ex << " '" << seen << "'\n";
       }
       throw ex;
     }
     //Since this should not be called until after 'main' has started, we can set the value
-    loadingLibraryNamed_()="<loaded by another plugin system>";
-}
+    loadingLibraryNamed_() = "<loaded by another plugin system>";
+  }
 
-// PluginManager::PluginManager(const PluginManager& rhs)
-// {
-//    // do actual copying here;
-// }
+  // PluginManager::PluginManager(const PluginManager& rhs)
+  // {
+  //    // do actual copying here;
+  // }
 
-PluginManager::~PluginManager()
-{
-}
+  PluginManager::~PluginManager() {}
 
-//
-// assignment operators
-//
-// const PluginManager& PluginManager::operator=(const PluginManager& rhs)
-// {
-//   //An exception safe implementation is
-//   PluginManager temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
+  //
+  // assignment operators
+  //
+  // const PluginManager& PluginManager::operator=(const PluginManager& rhs)
+  // {
+  //   //An exception safe implementation is
+  //   PluginManager temp(rhs);
+  //   swap(rhs);
+  //
+  //   return *this;
+  // }
 
-//
-// member functions
-//
-void
-PluginManager::newFactory(const PluginFactoryBase*)
-{
-}
-//
-// const member functions
-//
-namespace {
-  struct PICompare {
-    bool operator()(const PluginInfo& iLHS,
-                    const PluginInfo& iRHS) const {
-                      return iLHS.name_ < iRHS.name_;
-                    }
-  };
-}
-
-const boost::filesystem::path& 
-PluginManager::loadableFor(const std::string& iCategory,
-                             const std::string& iPlugin)
-{
-  bool throwIfFail = true;
-  return loadableFor_(iCategory, iPlugin,throwIfFail);
-}
-
-const boost::filesystem::path& 
-PluginManager::loadableFor_(const std::string& iCategory,
-                                            const std::string& iPlugin,
-                                            bool& ioThrowIfFailElseSucceedStatus)
-{
-  const bool throwIfFail = ioThrowIfFailElseSucceedStatus;
-  ioThrowIfFailElseSucceedStatus = true;
-  CategoryToInfos::iterator itFound = categoryToInfos_.find(iCategory);
-  if(itFound == categoryToInfos_.end()) {
-    if(throwIfFail) {
-      throw cms::Exception("PluginNotFound")<<"Unable to find plugin '"<<iPlugin<<
-      "' because the category '"<<iCategory<<"' has no known plugins";
-    } else {
-      ioThrowIfFailElseSucceedStatus = false;
-      static const boost::filesystem::path s_path;
-      return s_path;
-    }
-  }
-  
-  PluginInfo i;
-  i.name_ = iPlugin;
-  typedef std::vector<PluginInfo>::iterator PIItr;
-  std::pair<PIItr,PIItr> range = std::equal_range(itFound->second.begin(),
-                                                  itFound->second.end(),
-                                                  i,
-                                                  PICompare() );
-  
-  if(range.first == range.second) {
-    if(throwIfFail) {
-      throw cms::Exception("PluginNotFound")<<"Unable to find plugin '"<<iPlugin
-      <<"' in category '"<<iCategory<<"'. Please check spelling of name.";
-    } else {
-      ioThrowIfFailElseSucceedStatus = false;
-      static const boost::filesystem::path s_path;
-      return s_path;
-    }
+  //
+  // member functions
+  //
+  void PluginManager::newFactory(const PluginFactoryBase*) {}
+  //
+  // const member functions
+  //
+  namespace {
+    struct PICompare {
+      bool operator()(const PluginInfo& iLHS, const PluginInfo& iRHS) const { return iLHS.name_ < iRHS.name_; }
+    };
+  }  // namespace
+
+  const boost::filesystem::path& PluginManager::loadableFor(const std::string& iCategory, const std::string& iPlugin) {
+    bool throwIfFail = true;
+    return loadableFor_(iCategory, iPlugin, throwIfFail);
   }
-  
-  if(range.second - range.first > 1 ) {
-    //see if the come from the same directory
-    if(range.first->loadable_.branch_path() == (range.first+1)->loadable_.branch_path()) {
-      //std::cout<<range.first->name_ <<" " <<(range.first+1)->name_<<std::endl;
-      throw cms::Exception("MultiplePlugins")<<"The plugin '"<<iPlugin<<"' is found in multiple files \n"
-      " '"<<range.first->loadable_.leaf()<<"'\n '"
-      <<(range.first+1)->loadable_.leaf()<<"'\n"
-      "in directory '"<<range.first->loadable_.branch_path().string()<<"'.\n"
-      "The code must be changed so the plugin only appears in one plugin file. "
-      "You will need to remove the macro which registers the plugin so it only appears in"
-      " one of these files.\n"
-      "  If none of these files register such a plugin, "
-      "then the problem originates in a library to which all these files link.\n"
-      "The plugin registration must be removed from that library since plugins are not allowed in regular libraries.";
+
+  const boost::filesystem::path& PluginManager::loadableFor_(const std::string& iCategory,
+                                                             const std::string& iPlugin,
+                                                             bool& ioThrowIfFailElseSucceedStatus) {
+    const bool throwIfFail = ioThrowIfFailElseSucceedStatus;
+    ioThrowIfFailElseSucceedStatus = true;
+    CategoryToInfos::iterator itFound = categoryToInfos_.find(iCategory);
+    if (itFound == categoryToInfos_.end()) {
+      if (throwIfFail) {
+        throw cms::Exception("PluginNotFound") << "Unable to find plugin '" << iPlugin << "' because the category '"
+                                               << iCategory << "' has no known plugins";
+      } else {
+        ioThrowIfFailElseSucceedStatus = false;
+        static const boost::filesystem::path s_path;
+        return s_path;
+      }
     }
-  }
-  
-  return range.first->loadable_;
-}
-
-namespace {
-  class Sentry {
-public:
-    Sentry( std::string& iPath, const std::string& iNewPath):
-      path_(iPath),
-      oldPath_(iPath)
-    {
-      path_ = iNewPath;
+
+    PluginInfo i;
+    i.name_ = iPlugin;
+    typedef std::vector<PluginInfo>::iterator PIItr;
+    std::pair<PIItr, PIItr> range = std::equal_range(itFound->second.begin(), itFound->second.end(), i, PICompare());
+
+    if (range.first == range.second) {
+      if (throwIfFail) {
+        throw cms::Exception("PluginNotFound") << "Unable to find plugin '" << iPlugin << "' in category '" << iCategory
+                                               << "'. Please check spelling of name.";
+      } else {
+        ioThrowIfFailElseSucceedStatus = false;
+        static const boost::filesystem::path s_path;
+        return s_path;
+      }
     }
-    ~Sentry() {
-      path_ = oldPath_;
+
+    if (range.second - range.first > 1) {
+      //see if the come from the same directory
+      if (range.first->loadable_.branch_path() == (range.first + 1)->loadable_.branch_path()) {
+        //std::cout<<range.first->name_ <<" " <<(range.first+1)->name_<<std::endl;
+        throw cms::Exception("MultiplePlugins")
+            << "The plugin '" << iPlugin
+            << "' is found in multiple files \n"
+               " '"
+            << range.first->loadable_.leaf() << "'\n '" << (range.first + 1)->loadable_.leaf()
+            << "'\n"
+               "in directory '"
+            << range.first->loadable_.branch_path().string()
+            << "'.\n"
+               "The code must be changed so the plugin only appears in one plugin file. "
+               "You will need to remove the macro which registers the plugin so it only appears in"
+               " one of these files.\n"
+               "  If none of these files register such a plugin, "
+               "then the problem originates in a library to which all these files link.\n"
+               "The plugin registration must be removed from that library since plugins are not allowed in regular "
+               "libraries.";
+      }
     }
-private:
+
+    return range.first->loadable_;
+  }
+
+  namespace {
+    class Sentry {
+    public:
+      Sentry(std::string& iPath, const std::string& iNewPath) : path_(iPath), oldPath_(iPath) { path_ = iNewPath; }
+      ~Sentry() { path_ = oldPath_; }
+
+    private:
       std::string& path_;
       std::string oldPath_;
-  };
-}
-
-const SharedLibrary& 
-PluginManager::load(const std::string& iCategory,
-                      const std::string& iPlugin)
-{
-  askedToLoadCategoryWithPlugin_(iCategory,iPlugin);
-  const boost::filesystem::path& p = loadableFor(iCategory,iPlugin);
-  
-  //have we already loaded this?
-  auto itLoaded = loadables_.find(p);
-  if(itLoaded == loadables_.end()) {
-    //Need to make sure we only have on SharedLibrary loading at a time
-    std::lock_guard<std::recursive_mutex> guard(pluginLoadMutex());
-    //Another thread may have gotten this while we were waiting on the mutex
-    itLoaded = loadables_.find(p);
-    if(itLoaded == loadables_.end()){
-      //try to make one
-      goingToLoad_(p);
-      Sentry s(loadingLibraryNamed_(), p.string());
-      //boost::filesystem::path native(p.string());
-      std::shared_ptr<SharedLibrary> ptr;
-      {
-	//TEMPORARY: to avoid possible deadlocks from ROOT, we must
-	// take the lock ourselves
-	R__LOCKGUARD2(gInterpreterMutex);
-	ptr.reset( new SharedLibrary(p) );
+    };
+  }  // namespace
+
+  const SharedLibrary& PluginManager::load(const std::string& iCategory, const std::string& iPlugin) {
+    askedToLoadCategoryWithPlugin_(iCategory, iPlugin);
+    const boost::filesystem::path& p = loadableFor(iCategory, iPlugin);
+
+    //have we already loaded this?
+    auto itLoaded = loadables_.find(p);
+    if (itLoaded == loadables_.end()) {
+      //Need to make sure we only have on SharedLibrary loading at a time
+      std::lock_guard<std::recursive_mutex> guard(pluginLoadMutex());
+      //Another thread may have gotten this while we were waiting on the mutex
+      itLoaded = loadables_.find(p);
+      if (itLoaded == loadables_.end()) {
+        //try to make one
+        goingToLoad_(p);
+        Sentry s(loadingLibraryNamed_(), p.string());
+        //boost::filesystem::path native(p.string());
+        std::shared_ptr<SharedLibrary> ptr;
+        {
+          //TEMPORARY: to avoid possible deadlocks from ROOT, we must
+          // take the lock ourselves
+          R__LOCKGUARD2(gInterpreterMutex);
+          ptr.reset(new SharedLibrary(p));
+        }
+        loadables_[p] = ptr;
+        justLoaded_(*ptr);
+        return *ptr;
       }
-      loadables_[p]=ptr;
-      justLoaded_(*ptr);
-      return *ptr;
     }
+    return *(itLoaded->second);
   }
-  return *(itLoaded->second);
-}
-
-const SharedLibrary* 
-PluginManager::tryToLoad(const std::string& iCategory,
-                         const std::string& iPlugin)
-{
-  askedToLoadCategoryWithPlugin_(iCategory,iPlugin);
-  bool ioThrowIfFailElseSucceedStatus = false;
-  const boost::filesystem::path& p = loadableFor_(iCategory,iPlugin, ioThrowIfFailElseSucceedStatus);
-  
-  if( not ioThrowIfFailElseSucceedStatus ) {
-    return nullptr;
-  }
-  
-
-  //have we already loaded this?
-  auto itLoaded = loadables_.find(p);
-  if(itLoaded == loadables_.end()) {
-    //Need to make sure we only have on SharedLibrary loading at a time
-    std::lock_guard<std::recursive_mutex> guard(pluginLoadMutex());
-    //Another thread may have gotten this while we were waiting on the mutex
-    itLoaded = loadables_.find(p);
-    if(itLoaded == loadables_.end()){
-      //try to make one
-      goingToLoad_(p);
-      Sentry s(loadingLibraryNamed_(), p.string());
-      //boost::filesystem::path native(p.string());
-      std::shared_ptr<SharedLibrary> ptr;
-      {
-	//TEMPORARY: to avoid possible deadlocks from ROOT, we must
-	// take the lock ourselves
-	R__LOCKGUARD(gInterpreterMutex);
-	ptr.reset( new SharedLibrary(p) );
+
+  const SharedLibrary* PluginManager::tryToLoad(const std::string& iCategory, const std::string& iPlugin) {
+    askedToLoadCategoryWithPlugin_(iCategory, iPlugin);
+    bool ioThrowIfFailElseSucceedStatus = false;
+    const boost::filesystem::path& p = loadableFor_(iCategory, iPlugin, ioThrowIfFailElseSucceedStatus);
+
+    if (not ioThrowIfFailElseSucceedStatus) {
+      return nullptr;
+    }
+
+    //have we already loaded this?
+    auto itLoaded = loadables_.find(p);
+    if (itLoaded == loadables_.end()) {
+      //Need to make sure we only have on SharedLibrary loading at a time
+      std::lock_guard<std::recursive_mutex> guard(pluginLoadMutex());
+      //Another thread may have gotten this while we were waiting on the mutex
+      itLoaded = loadables_.find(p);
+      if (itLoaded == loadables_.end()) {
+        //try to make one
+        goingToLoad_(p);
+        Sentry s(loadingLibraryNamed_(), p.string());
+        //boost::filesystem::path native(p.string());
+        std::shared_ptr<SharedLibrary> ptr;
+        {
+          //TEMPORARY: to avoid possible deadlocks from ROOT, we must
+          // take the lock ourselves
+          R__LOCKGUARD(gInterpreterMutex);
+          ptr.reset(new SharedLibrary(p));
+        }
+        loadables_[p] = ptr;
+        justLoaded_(*ptr);
+        return ptr.get();
       }
-      loadables_[p]=ptr;
-      justLoaded_(*ptr);
-      return ptr.get();
     }
+    return (itLoaded->second).get();
   }
-  return (itLoaded->second).get();
-}
 
-//
-// static member functions
-//
-PluginManager* 
-PluginManager::get()
-{
-  PluginManager* manager = singleton();
-  if(nullptr==manager) {
-    throw cms::Exception("PluginManagerNotConfigured")<<"PluginManager::get() was called before PluginManager::configure.";
+  //
+  // static member functions
+  //
+  PluginManager* PluginManager::get() {
+    PluginManager* manager = singleton();
+    if (nullptr == manager) {
+      throw cms::Exception("PluginManagerNotConfigured")
+          << "PluginManager::get() was called before PluginManager::configure.";
+    }
+    return manager;
+  }
+
+  PluginManager& PluginManager::configure(const Config& iConfig) {
+    PluginManager*& s = singleton();
+    if (nullptr != s) {
+      throw cms::Exception("PluginManagerReconfigured");
+    }
+
+    const Config& realConfig = iConfig;
+    if (realConfig.searchPath().empty()) {
+      throw cms::Exception("PluginManagerEmptySearchPath");
+    }
+    s = new PluginManager(realConfig);
+    return *s;
   }
-  return manager;
-}
-
-PluginManager& 
-PluginManager::configure(const Config& iConfig )
-{
-  PluginManager*& s = singleton();
-  if( nullptr != s ){
-    throw cms::Exception("PluginManagerReconfigured");
+
+  const std::string& PluginManager::staticallyLinkedLoadingFileName() {
+    static const std::string s_name("static");
+    return s_name;
   }
-  
-  const Config& realConfig = iConfig;
-  if (realConfig.searchPath().empty() ) {
-    throw cms::Exception("PluginManagerEmptySearchPath");
+
+  std::string& PluginManager::loadingLibraryNamed_() {
+    //NOTE: pluginLoadMutex() indirectly guards this since this value
+    // is only accessible via the Sentry call which us guarded by the mutex
+    CMS_THREAD_SAFE static std::string s_name(staticallyLinkedLoadingFileName());
+    return s_name;
   }
-  s = new PluginManager (realConfig);
-  return *s;
-}
-
-
-const std::string& 
-PluginManager::staticallyLinkedLoadingFileName()
-{
-  static const std::string s_name("static");
-  return s_name;
-}
-
-std::string& 
-PluginManager::loadingLibraryNamed_()
-{
-  //NOTE: pluginLoadMutex() indirectly guards this since this value
-  // is only accessible via the Sentry call which us guarded by the mutex
-  CMS_THREAD_SAFE static std::string s_name(staticallyLinkedLoadingFileName());
-  return s_name;
-}
-
-PluginManager*& PluginManager::singleton()
-{
-  CMS_THREAD_SAFE static PluginManager* s_singleton=nullptr;
-  return s_singleton;
-}
-
-bool
-PluginManager::isAvailable()
-{
-  return nullptr != singleton();
-}
-
-}
+
+  PluginManager*& PluginManager::singleton() {
+    CMS_THREAD_SAFE static PluginManager* s_singleton = nullptr;
+    return s_singleton;
+  }
+
+  bool PluginManager::isAvailable() { return nullptr != singleton(); }
+
+}  // namespace edmplugin
diff --git a/FWCore/PluginManager/src/PresenceFactory.cc b/FWCore/PluginManager/src/PresenceFactory.cc
index bbb8b690965fd..4e08ad69698dd 100644
--- a/FWCore/PluginManager/src/PresenceFactory.cc
+++ b/FWCore/PluginManager/src/PresenceFactory.cc
@@ -5,41 +5,32 @@
 
 #include <iostream>
 
-EDM_REGISTER_PLUGINFACTORY(edm::PresencePluginFactory,"CMS EDM Framework Presence");
+EDM_REGISTER_PLUGINFACTORY(edm::PresencePluginFactory, "CMS EDM Framework Presence");
 
 namespace edm {
-  
-  PresenceFactory::~PresenceFactory() {
-  }
 
-  PresenceFactory::PresenceFactory() {
-  }
+  PresenceFactory::~PresenceFactory() {}
 
+  PresenceFactory::PresenceFactory() {}
 
   PresenceFactory* PresenceFactory::get() {
     CMS_THREAD_SAFE static PresenceFactory singleInstance_;
     return &singleInstance_;
   }
 
-  std::unique_ptr<Presence>
-  PresenceFactory::
-  makePresence(std::string const & presence_type) const {
+  std::unique_ptr<Presence> PresenceFactory::makePresence(std::string const& presence_type) const {
     std::unique_ptr<Presence> sp(PresencePluginFactory::get()->create(presence_type));
 
-    if(sp.get()==nullptr) {
-	throw edm::Exception(errors::Configuration, "NoPresenceModule")
-	  << "Presence Factory:\n"
-	  << "Cannot find presence type: "
-	  << presence_type << "\n"
-	  << "Perhaps the name is misspelled or is not a Plugin?\n"
-	  << "Try running EdmPluginDump to obtain a list of available Plugins.";
+    if (sp.get() == nullptr) {
+      throw edm::Exception(errors::Configuration, "NoPresenceModule")
+          << "Presence Factory:\n"
+          << "Cannot find presence type: " << presence_type << "\n"
+          << "Perhaps the name is misspelled or is not a Plugin?\n"
+          << "Try running EdmPluginDump to obtain a list of available Plugins.";
     }
 
-    FDEBUG(1) << "PresenceFactory: created presence "
-	      << presence_type
-	      << std::endl;
+    FDEBUG(1) << "PresenceFactory: created presence " << presence_type << std::endl;
 
     return sp;
   }
-}
-
+}  // namespace edm
diff --git a/FWCore/PluginManager/src/ProblemTracker.cc b/FWCore/PluginManager/src/ProblemTracker.cc
index 24ddf9488c7fc..a180d32ef1c1d 100644
--- a/FWCore/PluginManager/src/ProblemTracker.cc
+++ b/FWCore/PluginManager/src/ProblemTracker.cc
@@ -6,43 +6,34 @@
 
 #include <string>
 
-namespace edm
-{
+namespace edm {
 
   // -----------------------------------------------
 
   //edmplugin::DebugAids::AssertHook ProblemTracker::old_assert_hook_ = 0;
 
-  ProblemTracker::ProblemTracker()
-  {
+  ProblemTracker::ProblemTracker() {
     //old_assert_hook_ = edmplugin::DebugAids::failHook(&failure);
-    if(not edmplugin::PluginManager::isAvailable()) {
+    if (not edmplugin::PluginManager::isAvailable()) {
       edmplugin::PluginManager::Config config(edmplugin::standard::config());
 
       edmplugin::PluginManager::configure(config);
     }
   }
 
-  ProblemTracker::~ProblemTracker()
-  {
+  ProblemTracker::~ProblemTracker() {
     // since this is a singleton, we will not restore the old handle
   }
 
-  ProblemTracker const* ProblemTracker::instance()
-  {
+  ProblemTracker const* ProblemTracker::instance() {
     static ProblemTracker const pt;
     return &pt;
   }
 
   // ---------------------------------------------
 
-  AssertHandler::AssertHandler():pt_(ProblemTracker::instance())
-  {
-  }
-
-  AssertHandler::~AssertHandler()
-  {
-  }
+  AssertHandler::AssertHandler() : pt_(ProblemTracker::instance()) {}
 
+  AssertHandler::~AssertHandler() {}
 
-}
+}  // namespace edm
diff --git a/FWCore/PluginManager/src/SharedLibrary.cc b/FWCore/PluginManager/src/SharedLibrary.cc
index 528667342da3a..e094f3e3fc500 100644
--- a/FWCore/PluginManager/src/SharedLibrary.cc
+++ b/FWCore/PluginManager/src/SharedLibrary.cc
@@ -2,7 +2,7 @@
 //
 // Package:     PluginManager
 // Class  :     SharedLibrary
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -20,69 +20,63 @@
 #include "FWCore/Utilities/interface/Exception.h"
 
 namespace edmplugin {
-//
-// constants, enums and typedefs
-//
+  //
+  // constants, enums and typedefs
+  //
 
-//
-// static data member definitions
-//
+  //
+  // static data member definitions
+  //
 
-//
-// constructors and destructor
-//
-  SharedLibrary::SharedLibrary(const boost::filesystem::path& iName) :
-  libraryHandle_(::dlopen(iName.string().c_str(), RTLD_LAZY | RTLD_GLOBAL)),
-  path_(iName)
-{
-    if(libraryHandle_ == nullptr) {
+  //
+  // constructors and destructor
+  //
+  SharedLibrary::SharedLibrary(const boost::filesystem::path& iName)
+      : libraryHandle_(::dlopen(iName.string().c_str(), RTLD_LAZY | RTLD_GLOBAL)), path_(iName) {
+    if (libraryHandle_ == nullptr) {
       char const* err = dlerror();
-      if(err == nullptr) {
+      if (err == nullptr) {
         throw cms::Exception("PluginLibraryLoadError") << "unable to load " << iName.string();
       }
       throw cms::Exception("PluginLibraryLoadError") << "unable to load " << iName.string() << " because " << err;
     }
-}
+  }
 
-// SharedLibrary::SharedLibrary(const SharedLibrary& rhs)
-// {
-//    // do actual copying here;
-// }
+  // SharedLibrary::SharedLibrary(const SharedLibrary& rhs)
+  // {
+  //    // do actual copying here;
+  // }
 
-SharedLibrary::~SharedLibrary()
-{
-}
+  SharedLibrary::~SharedLibrary() {}
 
-//
-// assignment operators
-//
-// const SharedLibrary& SharedLibrary::operator=(const SharedLibrary& rhs)
-// {
-//   //An exception safe implementation is
-//   SharedLibrary temp(rhs);
-//   swap(rhs);
-//
-//   return *this;
-// }
+  //
+  // assignment operators
+  //
+  // const SharedLibrary& SharedLibrary::operator=(const SharedLibrary& rhs)
+  // {
+  //   //An exception safe implementation is
+  //   SharedLibrary temp(rhs);
+  //   swap(rhs);
+  //
+  //   return *this;
+  // }
 
-//
-// member functions
-//
+  //
+  // member functions
+  //
 
-//
-// const member functions
-//
-bool 
-SharedLibrary::symbol(const std::string& iSymbolName, void*& iSymbol) const
-{
-  if(libraryHandle_ == nullptr) {
-    return false;
+  //
+  // const member functions
+  //
+  bool SharedLibrary::symbol(const std::string& iSymbolName, void*& iSymbol) const {
+    if (libraryHandle_ == nullptr) {
+      return false;
+    }
+    iSymbol = dlsym(libraryHandle_, iSymbolName.c_str());
+    return (iSymbol != nullptr);
   }
-  iSymbol = dlsym(libraryHandle_, iSymbolName.c_str());
-  return (iSymbol != nullptr);
-}
 
-//
-// static member functions
-//
-}
+  //
+  // static member functions
+  //
+}  // namespace edmplugin
diff --git a/FWCore/PluginManager/src/standard.cc b/FWCore/PluginManager/src/standard.cc
index 4028c10fc5d24..cb2b47dfc8123 100644
--- a/FWCore/PluginManager/src/standard.cc
+++ b/FWCore/PluginManager/src/standard.cc
@@ -2,7 +2,7 @@
 //
 // Package:     PluginManager
 // Class  :     standard
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -18,32 +18,32 @@
 namespace edmplugin {
   namespace standard {
 
-    PluginManager::Config config()
-  {
+    PluginManager::Config config() {
       PluginManager::Config returnValue;
-      
+
 #ifdef __APPLE__
-      const char *path = getenv ("DYLD_FALLBACK_LIBRARY_PATH");
+      const char* path = getenv("DYLD_FALLBACK_LIBRARY_PATH");
 #else
-      const char *path = getenv ("LD_LIBRARY_PATH");
+      const char* path = getenv("LD_LIBRARY_PATH");
 #endif
-      if (! path) path = "";
-      
+      if (!path)
+        path = "";
+
       std::string spath(path);
-      std::string::size_type last=0;
-      std::string::size_type i=0;
+      std::string::size_type last = 0;
+      std::string::size_type i = 0;
       std::vector<std::string> paths;
-      while( (i=spath.find_first_of(':',last))!=std::string::npos) {
-        paths.push_back(spath.substr(last,i-last));
-        last = i+1;
+      while ((i = spath.find_first_of(':', last)) != std::string::npos) {
+        paths.push_back(spath.substr(last, i - last));
+        last = i + 1;
         //std::cout <<paths.back()<<std::endl;
       }
-      paths.push_back(spath.substr(last,std::string::npos));
+      paths.push_back(spath.substr(last, std::string::npos));
       returnValue.searchPath(paths);
-      
+
       return returnValue;
-  }
-    
+    }
+
     const boost::filesystem::path& cachefileName() {
       static const boost::filesystem::path s_path(".edmplugincache");
       return s_path;
@@ -53,12 +53,11 @@ namespace edmplugin {
       static const boost::filesystem::path s_path(".poisonededmplugincache");
       return s_path;
     }
-    
-    
+
     const std::string& pluginPrefix() {
       static const std::string s_prefix("plugin");
       return s_prefix;
     }
-    
-  }
-}
+
+  }  // namespace standard
+}  // namespace edmplugin
diff --git a/FWCore/PluginManager/test/DummyFactory.cc b/FWCore/PluginManager/test/DummyFactory.cc
index b06ce984fe863..0d888b06d1764 100644
--- a/FWCore/PluginManager/test/DummyFactory.cc
+++ b/FWCore/PluginManager/test/DummyFactory.cc
@@ -2,7 +2,7 @@
 //
 // Package:     PluginManager
 // Class  :     DummyFactory
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -17,6 +17,6 @@
 
 namespace testedmplugin {
   DummyBase::~DummyBase() {}
-}
+}  // namespace testedmplugin
 
-EDM_REGISTER_PLUGINFACTORY(testedmplugin::DummyFactory,"Test Dummy");
+EDM_REGISTER_PLUGINFACTORY(testedmplugin::DummyFactory, "Test Dummy");
diff --git a/FWCore/PluginManager/test/DummyFactory.h b/FWCore/PluginManager/test/DummyFactory.h
index bd8afd3ad520f..6296796ecd275 100644
--- a/FWCore/PluginManager/test/DummyFactory.h
+++ b/FWCore/PluginManager/test/DummyFactory.h
@@ -4,7 +4,7 @@
 //
 // Package:     PluginManager
 // Class  :     DummyFactory
-// 
+//
 /**\class DummyFactory DummyFactory.h FWCore/PluginManager/interface/DummyFactory.h
 
  Description: <one line class summary>
@@ -30,8 +30,7 @@ namespace testedmplugin {
     virtual int value() const = 0;
   };
 
-
   typedef edmplugin::PluginFactory<DummyBase*(void)> DummyFactory;
-}
+}  // namespace testedmplugin
 
 #endif
diff --git a/FWCore/PluginManager/test/OneDummy.cc b/FWCore/PluginManager/test/OneDummy.cc
index 6b1230adcf657..8990d04d8c66d 100644
--- a/FWCore/PluginManager/test/OneDummy.cc
+++ b/FWCore/PluginManager/test/OneDummy.cc
@@ -2,7 +2,7 @@
 //
 // Package:     PluginManager
 // Class  :     OneDummy
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -17,10 +17,8 @@
 
 namespace testedmplugin {
   struct DummyOne : public DummyBase {
-    int value() const {
-      return 1;
-    }
+    int value() const { return 1; }
   };
-}
+}  // namespace testedmplugin
 
-DEFINE_EDM_PLUGIN(testedmplugin::DummyFactory,testedmplugin::DummyOne,"DummyOne");
+DEFINE_EDM_PLUGIN(testedmplugin::DummyFactory, testedmplugin::DummyOne, "DummyOne");
diff --git a/FWCore/PluginManager/test/TwoDummy.cc b/FWCore/PluginManager/test/TwoDummy.cc
index fca844f71f4d0..6b9649be6438c 100644
--- a/FWCore/PluginManager/test/TwoDummy.cc
+++ b/FWCore/PluginManager/test/TwoDummy.cc
@@ -2,7 +2,7 @@
 //
 // Package:     PluginManager
 // Class  :     TwoDummy
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -17,10 +17,8 @@
 
 namespace testedmplugin {
   struct DummyTwo : public DummyBase {
-    int value() const {
-      return 2;
-    }
+    int value() const { return 2; }
   };
-}
+}  // namespace testedmplugin
 
-DEFINE_EDM_PLUGIN(testedmplugin::DummyFactory,testedmplugin::DummyTwo,"DummyTwo");
+DEFINE_EDM_PLUGIN(testedmplugin::DummyFactory, testedmplugin::DummyTwo, "DummyTwo");
diff --git a/FWCore/PluginManager/test/cacheparser_t.cc b/FWCore/PluginManager/test/cacheparser_t.cc
index 4b4dbf24325f3..4f410597f1cfd 100644
--- a/FWCore/PluginManager/test/cacheparser_t.cc
+++ b/FWCore/PluginManager/test/cacheparser_t.cc
@@ -2,7 +2,7 @@
 //
 // Package:     PluginManager
 // Class  :     loadablemanager_t
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -19,88 +19,84 @@
 // user include files
 #include "FWCore/PluginManager/interface/CacheParser.h"
 
-class TestCacheParser : public CppUnit::TestFixture
-{
+class TestCacheParser : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(TestCacheParser);
   CPPUNIT_TEST(testSpace);
   CPPUNIT_TEST(testReadWrite);
   CPPUNIT_TEST_SUITE_END();
+
 public:
-    void testSpace();
-    void testReadWrite();
-    void setUp() {}
-    void tearDown() {}
+  void testSpace();
+  void testReadWrite();
+  void setUp() {}
+  void tearDown() {}
 };
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(TestCacheParser);
 
-void
-TestCacheParser::testSpace()
-{
+void TestCacheParser::testSpace() {
   using namespace edmplugin;
 
   const std::string kNoSpace("abcDefla");
   std::string unchanged(kNoSpace);
-  
+
   CPPUNIT_ASSERT(kNoSpace == CacheParser::replaceSpaces(unchanged));
   CPPUNIT_ASSERT(kNoSpace == unchanged);
   CPPUNIT_ASSERT(kNoSpace == CacheParser::restoreSpaces(unchanged));
   CPPUNIT_ASSERT(kNoSpace == unchanged);
-  
+
   const std::string kWithSpace("abc Def");
   std::string changed(kWithSpace);
-  
+
   const std::string kSpaceReplaced("abc%Def");
   CPPUNIT_ASSERT(kSpaceReplaced == CacheParser::replaceSpaces(changed));
   CPPUNIT_ASSERT(kSpaceReplaced == changed);
-  
+
   CPPUNIT_ASSERT(kWithSpace == CacheParser::restoreSpaces(changed));
   CPPUNIT_ASSERT(kWithSpace == changed);
 }
 
-void
-TestCacheParser::testReadWrite()
-{
+void TestCacheParser::testReadWrite() {
   using namespace edmplugin;
   std::map<std::string, std::vector<PluginInfo> > categoryToInfos;
   PluginInfo info;
-  info.loadable_="pluginA.so";
-  info.name_="AlphaClass";
+  info.loadable_ = "pluginA.so";
+  info.name_ = "AlphaClass";
   categoryToInfos["Cat One"].push_back(info);
-  info.name_="BetaClass<Itl >";
+  info.name_ = "BetaClass<Itl >";
   categoryToInfos["Cat Two"].push_back(info);
 
   const std::string match("pluginA.so AlphaClass Cat%One\npluginA.so BetaClass<Itl%> Cat%Two\n");
   {
     std::stringstream s;
-    CacheParser::write(categoryToInfos,s);
+    CacheParser::write(categoryToInfos, s);
     CPPUNIT_ASSERT(match == s.str());
   }
-  
+
   //check that the path is removed
   categoryToInfos.clear();
-  
-  info.loadable_="/enee/menee/minee/mo/pluginA.so";
-  info.name_="AlphaClass";
+
+  info.loadable_ = "/enee/menee/minee/mo/pluginA.so";
+  info.name_ = "AlphaClass";
   categoryToInfos["Cat One"].push_back(info);
-  info.name_="BetaClass<Itl >";
+  info.name_ = "BetaClass<Itl >";
   categoryToInfos["Cat Two"].push_back(info);
 
   {
     std::stringstream s;
-    CacheParser::write(categoryToInfos,s);    
+    CacheParser::write(categoryToInfos, s);
     CPPUNIT_ASSERT(match == s.str());
 
-    std::map<std::string, std::vector<PluginInfo> > readValues; 
-    CacheParser::read(s,"/enee/menee/minee/mo",readValues);
+    std::map<std::string, std::vector<PluginInfo> > readValues;
+    CacheParser::read(s, "/enee/menee/minee/mo", readValues);
     CPPUNIT_ASSERT(categoryToInfos.size() == readValues.size());
-    
+
     {
       std::stringstream s;
-      CacheParser::write(readValues,s);
-      std::cout <<s.str()<<std::endl;
+      CacheParser::write(readValues, s);
+      std::cout << s.str() << std::endl;
       CPPUNIT_ASSERT(match == s.str());
     }
   }
-}  
+}
diff --git a/FWCore/PluginManager/test/pluginfactory_t.cc b/FWCore/PluginManager/test/pluginfactory_t.cc
index c2587d0dfc2b3..702789ba78f84 100644
--- a/FWCore/PluginManager/test/pluginfactory_t.cc
+++ b/FWCore/PluginManager/test/pluginfactory_t.cc
@@ -2,7 +2,7 @@
 //
 // Package:     PluginManager
 // Class  :     pluginfactory_t
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -22,23 +22,23 @@
 
 #include "FWCore/PluginManager/interface/PluginFactory.h"
 
-class TestPluginFactory : public CppUnit::TestFixture
-{
+class TestPluginFactory : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(TestPluginFactory);
   CPPUNIT_TEST(test);
   CPPUNIT_TEST(testTry);
   CPPUNIT_TEST_SUITE_END();
+
 public:
-    void test();
-    void testTry();
-    void setUp() {   
-      if (!alreadySetup_) {
-        alreadySetup_=true;
-        edmplugin::PluginManager::configure(edmplugin::standard::config());
-      }
+  void test();
+  void testTry();
+  void setUp() {
+    if (!alreadySetup_) {
+      alreadySetup_ = true;
+      edmplugin::PluginManager::configure(edmplugin::standard::config());
     }
-    void tearDown() {}
-    static bool alreadySetup_;
+  }
+  void tearDown() {}
+  static bool alreadySetup_;
 };
 
 bool TestPluginFactory::alreadySetup_ = false;
@@ -48,30 +48,26 @@ CPPUNIT_TEST_SUITE_REGISTRATION(TestPluginFactory);
 
 namespace edmplugintest {
   struct DummyBase {};
-  
-  struct Dummy: public DummyBase {};
-}
+
+  struct Dummy : public DummyBase {};
+}  // namespace edmplugintest
 
 typedef edmplugin::PluginFactory<edmplugintest::DummyBase*(void)> FactoryType;
-EDM_REGISTER_PLUGINFACTORY(FactoryType,"Test Dummy");
+EDM_REGISTER_PLUGINFACTORY(FactoryType, "Test Dummy");
 
-DEFINE_EDM_PLUGIN(FactoryType,edmplugintest::Dummy,"Dummy");
+DEFINE_EDM_PLUGIN(FactoryType, edmplugintest::Dummy, "Dummy");
 
-void
-TestPluginFactory::test()
-{
+void TestPluginFactory::test() {
   using namespace edmplugin;
-  
+
   std::unique_ptr<edmplugintest::DummyBase> p(FactoryType::get()->create("Dummy"));
   CPPUNIT_ASSERT(0 != p.get());
-}  
+}
 
-void
-TestPluginFactory::testTry()
-{
+void TestPluginFactory::testTry() {
   using namespace edmplugin;
   CPPUNIT_ASSERT(0 == FactoryType::get()->tryToCreate("ThisDoesNotExist"));
-  
+
   std::unique_ptr<edmplugintest::DummyBase> p(FactoryType::get()->tryToCreate("Dummy"));
   CPPUNIT_ASSERT(0 != p.get());
-}  
+}
diff --git a/FWCore/PluginManager/test/pluginfactorymanager_t.cc b/FWCore/PluginManager/test/pluginfactorymanager_t.cc
index 58a4bbc2aae62..c109e6428b7f0 100644
--- a/FWCore/PluginManager/test/pluginfactorymanager_t.cc
+++ b/FWCore/PluginManager/test/pluginfactorymanager_t.cc
@@ -2,7 +2,7 @@
 //
 // Package:     PluginManager
 // Class  :     pluginfactorymanager_t
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -20,15 +20,15 @@
 #include "FWCore/PluginManager/interface/PluginFactoryManager.h"
 #include "FWCore/PluginManager/interface/PluginFactoryBase.h"
 
-class TestPluginFactoryManager : public CppUnit::TestFixture
-{
+class TestPluginFactoryManager : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(TestPluginFactoryManager);
   CPPUNIT_TEST(test);
   CPPUNIT_TEST_SUITE_END();
+
 public:
-    void test();
-    void setUp() {}
-    void tearDown() {}
+  void test();
+  void setUp() {}
+  void tearDown() {}
 };
 
 ///registration of the test so that the runner can find it
@@ -36,37 +36,28 @@ CPPUNIT_TEST_SUITE_REGISTRATION(TestPluginFactoryManager);
 
 class DummyTestPlugin : public edmplugin::PluginFactoryBase {
 public:
-  DummyTestPlugin(const std::string& iName): name_(iName) {
-    finishedConstruction();
-  }
-  const std::string& category() const {return name_;}
-  std::vector<edmplugin::PluginInfo> available() const {
-    return std::vector<edmplugin::PluginInfo>();
-  }
+  DummyTestPlugin(const std::string& iName) : name_(iName) { finishedConstruction(); }
+  const std::string& category() const { return name_; }
+  std::vector<edmplugin::PluginInfo> available() const { return std::vector<edmplugin::PluginInfo>(); }
   const std::string name_;
 };
 
 struct Catcher {
   std::string lastSeen_;
-  
-  void catchIt(const edmplugin::PluginFactoryBase* iFactory) {
-    lastSeen_=iFactory->category();
-  }
+
+  void catchIt(const edmplugin::PluginFactoryBase* iFactory) { lastSeen_ = iFactory->category(); }
 };
 
-void
-TestPluginFactoryManager::test()
-{
+void TestPluginFactoryManager::test() {
   using namespace edmplugin;
   using std::placeholders::_1;
   PluginFactoryManager& pfm = *(PluginFactoryManager::get());
-  CPPUNIT_ASSERT(pfm.begin()==pfm.end());
-  
+  CPPUNIT_ASSERT(pfm.begin() == pfm.end());
+
   Catcher catcher;
-  pfm.newFactory_.connect(std::bind(std::mem_fn(&Catcher::catchIt),&catcher,_1));
-  
+  pfm.newFactory_.connect(std::bind(std::mem_fn(&Catcher::catchIt), &catcher, _1));
+
   DummyTestPlugin one("one");
-  CPPUNIT_ASSERT((pfm.begin()!=pfm.end()));
+  CPPUNIT_ASSERT((pfm.begin() != pfm.end()));
   CPPUNIT_ASSERT(catcher.lastSeen_ == std::string("one"));
-  
 }
diff --git a/FWCore/PluginManager/test/pluginmanager_t.cc b/FWCore/PluginManager/test/pluginmanager_t.cc
index 6a23a2220a6c8..e693f56936f77 100644
--- a/FWCore/PluginManager/test/pluginmanager_t.cc
+++ b/FWCore/PluginManager/test/pluginmanager_t.cc
@@ -2,7 +2,7 @@
 //
 // Package:     PluginManager
 // Class  :     pluginmanager_t
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -23,15 +23,15 @@
 
 #include "FWCore/PluginManager/test/DummyFactory.h"
 
-class TestPluginManager : public CppUnit::TestFixture
-{
+class TestPluginManager : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(TestPluginManager);
   CPPUNIT_TEST(test);
   CPPUNIT_TEST_SUITE_END();
+
 public:
-    void test();
-    void setUp() {}
-    void tearDown() {}
+  void test();
+  void setUp() {}
+  void tearDown() {}
 };
 
 ///registration of the test so that the runner can find it
@@ -39,13 +39,9 @@ CPPUNIT_TEST_SUITE_REGISTRATION(TestPluginManager);
 
 class DummyTestPlugin : public edmplugin::PluginFactoryBase {
 public:
-  DummyTestPlugin(const std::string& iName): name_(iName) {
-    finishedConstruction();
-  }
-  const std::string& category() const {return name_;}
-  std::vector<edmplugin::PluginInfo> available() const {
-    return std::vector<edmplugin::PluginInfo>();
-  }
+  DummyTestPlugin(const std::string& iName) : name_(iName) { finishedConstruction(); }
+  const std::string& category() const { return name_; }
+  std::vector<edmplugin::PluginInfo> available() const { return std::vector<edmplugin::PluginInfo>(); }
   const std::string name_;
 };
 /*
@@ -59,63 +55,59 @@ struct Catcher {
 */
 
 namespace testedmplugin {
-  struct DummyThree: public DummyBase {
-    int value() const {
-      return 3;
-    }
+  struct DummyThree : public DummyBase {
+    int value() const { return 3; }
   };
-}
-
-DEFINE_EDM_PLUGIN(testedmplugin::DummyFactory,testedmplugin::DummyThree,"DummyThree");
+}  // namespace testedmplugin
 
+DEFINE_EDM_PLUGIN(testedmplugin::DummyFactory, testedmplugin::DummyThree, "DummyThree");
 
-void
-TestPluginManager::test()
-{
+void TestPluginManager::test() {
   using namespace edmplugin;
   using namespace testedmplugin;
-  CPPUNIT_ASSERT_THROW(PluginManager::get(), cms::Exception );
+  CPPUNIT_ASSERT_THROW(PluginManager::get(), cms::Exception);
 
   PluginManager::Config config;
-  CPPUNIT_ASSERT_THROW(PluginManager::configure(config), cms::Exception );
+  CPPUNIT_ASSERT_THROW(PluginManager::configure(config), cms::Exception);
 
   edmplugin::PluginManager& db = edmplugin::PluginManager::configure(edmplugin::standard::config());
-  
+
   std::string toLoadCategory("Test Dummy");
   std::string toLoadPlugin;
-  unsigned int nTimesAsked=0;
-  
-  edmplugin::PluginManager::get()->askedToLoadCategoryWithPlugin_.connect([&](std::string const& iCategory, std::string const& iPlugin) {
-    //std::cout <<iCategory<<" "<<iPlugin<<std::endl;
-    CPPUNIT_ASSERT(toLoadCategory == iCategory);
-    CPPUNIT_ASSERT(toLoadPlugin == iPlugin);
-    ++nTimesAsked;
-  });
-
-  unsigned int nTimesGoingToLoad=0;
-  edmplugin::PluginManager::get()->goingToLoad_.connect([&nTimesGoingToLoad](const boost::filesystem::path&){++nTimesGoingToLoad;});
-
-  unsigned int nTimesLoaded=0;
-  edmplugin::PluginManager::get()->justLoaded_.connect([&nTimesLoaded](const edmplugin::SharedLibrary&){++nTimesLoaded;});
-  
-  toLoadPlugin="DummyOne";
+  unsigned int nTimesAsked = 0;
+
+  edmplugin::PluginManager::get()->askedToLoadCategoryWithPlugin_.connect(
+      [&](std::string const& iCategory, std::string const& iPlugin) {
+        //std::cout <<iCategory<<" "<<iPlugin<<std::endl;
+        CPPUNIT_ASSERT(toLoadCategory == iCategory);
+        CPPUNIT_ASSERT(toLoadPlugin == iPlugin);
+        ++nTimesAsked;
+      });
+
+  unsigned int nTimesGoingToLoad = 0;
+  edmplugin::PluginManager::get()->goingToLoad_.connect(
+      [&nTimesGoingToLoad](const boost::filesystem::path&) { ++nTimesGoingToLoad; });
+
+  unsigned int nTimesLoaded = 0;
+  edmplugin::PluginManager::get()->justLoaded_.connect(
+      [&nTimesLoaded](const edmplugin::SharedLibrary&) { ++nTimesLoaded; });
+
+  toLoadPlugin = "DummyOne";
   std::unique_ptr<DummyBase> ptr(DummyFactory::get()->create("DummyOne"));
-  CPPUNIT_ASSERT(1==ptr->value());
+  CPPUNIT_ASSERT(1 == ptr->value());
   CPPUNIT_ASSERT(nTimesAsked == 1);
-  CPPUNIT_ASSERT(nTimesGoingToLoad==1);
-  CPPUNIT_ASSERT(nTimesLoaded==1);
+  CPPUNIT_ASSERT(nTimesGoingToLoad == 1);
+  CPPUNIT_ASSERT(nTimesLoaded == 1);
   CPPUNIT_ASSERT(db.loadableFor("Test Dummy", "DummyThree") == "static");
   std::unique_ptr<DummyBase> ptr2(DummyFactory::get()->create("DummyThree"));
-  CPPUNIT_ASSERT(3==ptr2->value());
-  CPPUNIT_ASSERT(nTimesAsked == 1); //no request to load
-  CPPUNIT_ASSERT(nTimesGoingToLoad==1);
-  CPPUNIT_ASSERT(nTimesLoaded==1);
+  CPPUNIT_ASSERT(3 == ptr2->value());
+  CPPUNIT_ASSERT(nTimesAsked == 1);  //no request to load
+  CPPUNIT_ASSERT(nTimesGoingToLoad == 1);
+  CPPUNIT_ASSERT(nTimesLoaded == 1);
 
- 
-  toLoadPlugin="DoesNotExist";
+  toLoadPlugin = "DoesNotExist";
   CPPUNIT_ASSERT_THROW(DummyFactory::get()->create("DoesNotExist"), cms::Exception);
-  CPPUNIT_ASSERT(nTimesAsked == 2); //request happens even though it failed
-  CPPUNIT_ASSERT(nTimesGoingToLoad==1);
-  CPPUNIT_ASSERT(nTimesLoaded==1);
-  
+  CPPUNIT_ASSERT(nTimesAsked == 2);  //request happens even though it failed
+  CPPUNIT_ASSERT(nTimesGoingToLoad == 1);
+  CPPUNIT_ASSERT(nTimesLoaded == 1);
 }
diff --git a/FWCore/PrescaleService/interface/PrescaleService.h b/FWCore/PrescaleService/interface/PrescaleService.h
index 96d6dfd736de3..a07e81aff0a59 100644
--- a/FWCore/PrescaleService/interface/PrescaleService.h
+++ b/FWCore/PrescaleService/interface/PrescaleService.h
@@ -9,7 +9,6 @@
 #include <vector>
 #include <map>
 
-
 namespace edm {
   class ActivityRegistry;
   class ConfigurationDescriptions;
@@ -18,10 +17,8 @@ namespace edm {
 
   namespace service {
 
-    class PrescaleService : public edm::serviceregistry::SaveConfiguration
-    {
+    class PrescaleService : public edm::serviceregistry::SaveConfiguration {
     public:
-
       //
       // construction/destruction
       //
@@ -34,17 +31,16 @@ namespace edm {
       //
 
       unsigned int getPrescale(std::string const& prescaledPath) const;
-      unsigned int getPrescale(unsigned int lvl1Index,
-                               std::string const& prescaledPath) const;
+      unsigned int getPrescale(unsigned int lvl1Index, std::string const& prescaledPath) const;
 
-      typedef std::vector<std::string>                          VString_t;
+      typedef std::vector<std::string> VString_t;
       typedef std::map<std::string, std::vector<unsigned int> > PrescaleTable_t;
-      unsigned int getLvl1IndexDefault() const {return lvl1Default_;}
-      const VString_t& getLvl1Labels()   const {return lvl1Labels_;}
-      const PrescaleTable_t& getPrescaleTable() const {return prescaleTable_;}
+      unsigned int getLvl1IndexDefault() const { return lvl1Default_; }
+      const VString_t& getLvl1Labels() const { return lvl1Labels_; }
+      const PrescaleTable_t& getPrescaleTable() const { return prescaleTable_; }
 
-      static unsigned int findDefaultIndex(std::string const & label, std::vector<std::string> const & labels);
-      static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
+      static unsigned int findDefaultIndex(std::string const& label, std::vector<std::string> const& labels);
+      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
     private:
       //
@@ -52,19 +48,18 @@ namespace edm {
       //
       void preBeginJob(PathsAndConsumesOfModulesBase const&, ProcessContext const&);
       void postBeginJob();
-      
+
       //
       // member data
       //
-      const bool            forceDefault_;
-      const VString_t       lvl1Labels_; 
-      const unsigned int    lvl1Default_;
+      const bool forceDefault_;
+      const VString_t lvl1Labels_;
+      const unsigned int lvl1Default_;
       const std::vector<ParameterSet> vpsetPrescales_;
       PrescaleTable_t prescaleTable_;
       ParameterSetID processParameterSetID_;
     };
-  }
-}
+  }  // namespace service
+}  // namespace edm
 
 #endif
-
diff --git a/FWCore/PrescaleService/plugins/Module.cc b/FWCore/PrescaleService/plugins/Module.cc
index d9615d2449b85..ddf4234af245f 100644
--- a/FWCore/PrescaleService/plugins/Module.cc
+++ b/FWCore/PrescaleService/plugins/Module.cc
@@ -2,4 +2,3 @@
 #include "FWCore/PrescaleService/interface/PrescaleService.h"
 using edm::service::PrescaleService;
 DEFINE_FWK_SERVICE(PrescaleService);
-
diff --git a/FWCore/PrescaleService/src/PrescaleService.cc b/FWCore/PrescaleService/src/PrescaleService.cc
index ac9541b337e6a..e74a15fcc8b94 100644
--- a/FWCore/PrescaleService/src/PrescaleService.cc
+++ b/FWCore/PrescaleService/src/PrescaleService.cc
@@ -5,7 +5,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-
 #include "FWCore/PrescaleService/interface/PrescaleService.h"
 #include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
@@ -17,66 +16,60 @@
 #include <set>
 #include <algorithm>
 
-
 namespace edm {
   namespace service {
 
     // constructor
-    PrescaleService::PrescaleService(ParameterSet const& iPS,ActivityRegistry& iReg)
-      : forceDefault_(iPS.getParameter<bool>("forceDefault"))
-      , lvl1Labels_(iPS.getParameter<std::vector<std::string> >("lvl1Labels"))
-      , lvl1Default_(findDefaultIndex(iPS.getParameter<std::string>("lvl1DefaultLabel"), lvl1Labels_))
-      , vpsetPrescales_(iPS.getParameterSetVector("prescaleTable"))
-      , prescaleTable_()
-    {
+    PrescaleService::PrescaleService(ParameterSet const& iPS, ActivityRegistry& iReg)
+        : forceDefault_(iPS.getParameter<bool>("forceDefault")),
+          lvl1Labels_(iPS.getParameter<std::vector<std::string> >("lvl1Labels")),
+          lvl1Default_(findDefaultIndex(iPS.getParameter<std::string>("lvl1DefaultLabel"), lvl1Labels_)),
+          vpsetPrescales_(iPS.getParameterSetVector("prescaleTable")),
+          prescaleTable_() {
       iReg.watchPreBeginJob(this, &PrescaleService::preBeginJob);
       iReg.watchPostBeginJob(this, &PrescaleService::postBeginJob);
 
       // Sanity check
       if (lvl1Default_ >= lvl1Labels_.size()) {
         throw cms::Exception("InvalidLvl1Index")
-          <<"lvl1Default_ '" << lvl1Default_ << "' exceeds number of prescale columns " << lvl1Labels_.size() << "!";
+            << "lvl1Default_ '" << lvl1Default_ << "' exceeds number of prescale columns " << lvl1Labels_.size() << "!";
       }
 
       // Check and store Prescale Table
-      for (unsigned int iVPSet=0; iVPSet < vpsetPrescales_.size(); ++iVPSet) {
+      for (unsigned int iVPSet = 0; iVPSet < vpsetPrescales_.size(); ++iVPSet) {
         const ParameterSet& psetPrescales = vpsetPrescales_[iVPSet];
         const std::string pathName = psetPrescales.getParameter<std::string>("pathName");
-	if (prescaleTable_.find(pathName)!=prescaleTable_.end()) {
-	  throw cms::Exception("PrescaleServiceConfigError")
-	    << " Path '" << pathName << "' found more than once!";
-	}
-	std::vector<unsigned int> prescales = psetPrescales.getParameter<std::vector<unsigned int> >("prescales");
-	if (prescales.size()!=lvl1Labels_.size()) {
-	  throw cms::Exception("PrescaleServiceConfigError")
-	    << " Path '" << pathName << "' has " << prescales.size() << " prescales, instead of expected " << lvl1Labels_.size() << "!";
-	}
-	prescaleTable_[pathName] = prescales;
+        if (prescaleTable_.find(pathName) != prescaleTable_.end()) {
+          throw cms::Exception("PrescaleServiceConfigError") << " Path '" << pathName << "' found more than once!";
+        }
+        std::vector<unsigned int> prescales = psetPrescales.getParameter<std::vector<unsigned int> >("prescales");
+        if (prescales.size() != lvl1Labels_.size()) {
+          throw cms::Exception("PrescaleServiceConfigError")
+              << " Path '" << pathName << "' has " << prescales.size() << " prescales, instead of expected "
+              << lvl1Labels_.size() << "!";
+        }
+        prescaleTable_[pathName] = prescales;
       }
-
     }
-      
+
     // destructor
-    PrescaleService::~PrescaleService() {
-    }
+    PrescaleService::~PrescaleService() {}
 
     // member functions
 
-    void PrescaleService::preBeginJob(PathsAndConsumesOfModulesBase const&,
-                                      ProcessContext const& processContext) {
-      if(!processParameterSetID_.isValid()) {
+    void PrescaleService::preBeginJob(PathsAndConsumesOfModulesBase const&, ProcessContext const& processContext) {
+      if (!processParameterSetID_.isValid()) {
         processParameterSetID_ = processContext.parameterSetID();
       }
     }
- 
-    void PrescaleService::postBeginJob() {
 
+    void PrescaleService::postBeginJob() {
       // Acess to Process ParameterSet needed - can't be done in c'tor
       ParameterSet const& prcPS = edm::getParameterSet(processParameterSetID_);
       // Label of HLTPrescaler on each path, keyed on pathName
-      std::map<std::string,std::string> path2module;
+      std::map<std::string, std::string> path2module;
       // Name of path for each HLTPrescaler, keyed on moduleLabel
-      std::map<std::string,std::string> module2path;
+      std::map<std::string, std::string> module2path;
 
       // Check process config:
       // * each path contains at most one HLTPrescaler instance
@@ -84,12 +77,13 @@ namespace edm {
       // * each HLTPrescaler instance is part of at least one ptah
 
       // Find all HLTPrescaler instances
-      const std::vector<std::string> allModules=prcPS.getParameter<std::vector<std::string> >("@all_modules");
-      for(unsigned int i = 0; i < allModules.size(); ++i) {
-        ParameterSet const& pset  = prcPS.getParameterSet(allModules[i]);
-	const std::string moduleLabel = pset.getParameter<std::string>("@module_label");
-	const std::string moduleType  = pset.getParameter<std::string>("@module_type");
-        if (moduleType == "HLTPrescaler") module2path[moduleLabel]="";
+      const std::vector<std::string> allModules = prcPS.getParameter<std::vector<std::string> >("@all_modules");
+      for (unsigned int i = 0; i < allModules.size(); ++i) {
+        ParameterSet const& pset = prcPS.getParameterSet(allModules[i]);
+        const std::string moduleLabel = pset.getParameter<std::string>("@module_label");
+        const std::string moduleType = pset.getParameter<std::string>("@module_type");
+        if (moduleType == "HLTPrescaler")
+          module2path[moduleLabel] = "";
       }
       // Check all modules on all paths
       const std::vector<std::string> allPaths = prcPS.getParameter<std::vector<std::string> >("@paths");
@@ -98,61 +92,63 @@ namespace edm {
         std::vector<std::string> modules = prcPS.getParameter<std::vector<std::string> >(pathName);
         for (unsigned int iM = 0; iM < modules.size(); ++iM) {
           const std::string& moduleLabel = modules[iM];
-	  if (module2path.find(moduleLabel)!=module2path.end()) {
-            if (path2module.find(pathName)==path2module.end()) {
-	      path2module[pathName]=moduleLabel;
-	    } else {
+          if (module2path.find(moduleLabel) != module2path.end()) {
+            if (path2module.find(pathName) == path2module.end()) {
+              path2module[pathName] = moduleLabel;
+            } else {
               throw cms::Exception("PrescaleServiceConfigError")
-		<< "Path '" << pathName << "' with (>1) HLTPrescalers: " << path2module[pathName] << "+" << moduleLabel << "!";
-	    }
-	    if (module2path[moduleLabel]=="") {
-	      module2path[moduleLabel]=pathName;
-	    } else {
+                  << "Path '" << pathName << "' with (>1) HLTPrescalers: " << path2module[pathName] << "+"
+                  << moduleLabel << "!";
+            }
+            if (module2path[moduleLabel].empty()) {
+              module2path[moduleLabel] = pathName;
+            } else {
               throw cms::Exception("PrescaleServiceConfigError")
-                << " HLTPrescaler '" << moduleLabel << "' on (>1) Paths: " << module2path[moduleLabel] << "+" << pathName << "!";
-	    }
-	  }
-	}
+                  << " HLTPrescaler '" << moduleLabel << "' on (>1) Paths: " << module2path[moduleLabel] << "+"
+                  << pathName << "!";
+            }
+          }
+        }
       }
       // Check all HLTPrescaler instances are on a path
-      for (std::map<std::string,std::string>::const_iterator it = module2path.begin(); it!=module2path.end(); ++it) {
-	if (it->second=="") {
-	  throw cms::Exception("PrescaleServiceConfigError")
-	    << " HLTPrescaler '" << it->first << "' not found on any path!";
-	}
+      for (std::map<std::string, std::string>::const_iterator it = module2path.begin(); it != module2path.end(); ++it) {
+        if (it->second.empty()) {
+          throw cms::Exception("PrescaleServiceConfigError")
+              << " HLTPrescaler '" << it->first << "' not found on any path!";
+        }
       }
 
       // Check paths stored Prescale Table: each path is actually in the process config
-      for (std::map<std::string, std::vector<unsigned int> >::const_iterator it = prescaleTable_.begin(); it!=prescaleTable_.end(); ++it) {
-	if (path2module.find(it->first)==path2module.end()) {
+      for (std::map<std::string, std::vector<unsigned int> >::const_iterator it = prescaleTable_.begin();
+           it != prescaleTable_.end();
+           ++it) {
+        if (path2module.find(it->first) == path2module.end()) {
           throw cms::Exception("PrescaleServiceConfigError")
-            << " Path '"<< it->first << "' is unknown or does not contain any HLTPrescaler!";
+              << " Path '" << it->first << "' is unknown or does not contain any HLTPrescaler!";
         }
       }
-
     }
-    
+
     // const method
-    unsigned int PrescaleService::getPrescale(std::string const& prescaledPath) const
-    {
+    unsigned int PrescaleService::getPrescale(std::string const& prescaledPath) const {
       return getPrescale(lvl1Default_, prescaledPath);
     }
-    
+
     // const method
-    unsigned int PrescaleService::getPrescale(unsigned int lvl1Index, std::string const& prescaledPath) const
-    {
-      if (forceDefault_) lvl1Index = lvl1Default_;
+    unsigned int PrescaleService::getPrescale(unsigned int lvl1Index, std::string const& prescaledPath) const {
+      if (forceDefault_)
+        lvl1Index = lvl1Default_;
 
       if (lvl1Index >= lvl1Labels_.size()) {
         throw cms::Exception("InvalidLvl1Index")
-          << "lvl1Index '" << lvl1Index << "' exceeds number of prescale columns " << lvl1Labels_.size() << "!";
+            << "lvl1Index '" << lvl1Index << "' exceeds number of prescale columns " << lvl1Labels_.size() << "!";
       }
       PrescaleTable_t::const_iterator it = prescaleTable_.find(prescaledPath);
       return (it == prescaleTable_.end()) ? 1 : it->second[lvl1Index];
     }
-    
+
     // static method
-    unsigned int PrescaleService::findDefaultIndex(std::string const & label, std::vector<std::string> const & labels) {
+    unsigned int PrescaleService::findDefaultIndex(std::string const& label, std::vector<std::string> const& labels) {
       for (unsigned int i = 0; i < labels.size(); ++i) {
         if (labels[i] == label) {
           return i;
@@ -160,9 +156,9 @@ namespace edm {
       }
       return labels.size();
     }
-    
+
     // static method
-    void PrescaleService::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
+    void PrescaleService::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
       edm::ParameterSetDescription desc;
 
       std::vector<std::string> defaultVector;
@@ -187,10 +183,10 @@ namespace edm {
       desc.addVPSet("prescaleTable", validator, defaultVPSet);
 
       desc.add<std::string>("lvl1DefaultLabel", std::string("default"));
-      desc.add<bool>       ("forceDefault",     false);
+      desc.add<bool>("forceDefault", false);
 
       descriptions.add("PrescaleService", desc);
     }
 
-  } // namespace service
-} // namespace edm
+  }  // namespace service
+}  // namespace edm
diff --git a/FWCore/PyDevParameterSet/interface/MakePyBind11ParameterSets.h b/FWCore/PyDevParameterSet/interface/MakePyBind11ParameterSets.h
index 5681fb4e0b395..e8936e7104604 100644
--- a/FWCore/PyDevParameterSet/interface/MakePyBind11ParameterSets.h
+++ b/FWCore/PyDevParameterSet/interface/MakePyBind11ParameterSets.h
@@ -14,22 +14,18 @@ namespace edm {
   class ParameterSet;
   namespace cmspybind11_p3 {
     // input can either be a python file name or a python config string
-    std::unique_ptr<ParameterSet>
-      readConfig(std::string const& config);
-    
+    std::unique_ptr<ParameterSet> readConfig(std::string const& config);
+
     /// same, but with arguments
-    std::unique_ptr<ParameterSet>
-      readConfig(std::string const& config, int argc, char* argv[]);
+    std::unique_ptr<ParameterSet> readConfig(std::string const& config, int argc, char* argv[]);
 
-  /// essentially the same as the previous method
-    void
-      makeParameterSets(std::string const& configtext,
-			std::unique_ptr<ParameterSet>& main);
+    /// essentially the same as the previous method
+    void makeParameterSets(std::string const& configtext, std::unique_ptr<ParameterSet>& main);
 
     /**finds all the PSets used in the top level module referred as a file or as a string containing
        python commands. These PSets are bundled into a top level PSet from which they can be retrieved
     */
     std::unique_ptr<ParameterSet> readPSetsFrom(std::string const& fileOrString);
-  }
-} // namespace edm
+  }  // namespace cmspybind11_p3
+}  // namespace edm
 #endif
diff --git a/FWCore/PyDevParameterSet/interface/PyBind11ProcessDesc.h b/FWCore/PyDevParameterSet/interface/PyBind11ProcessDesc.h
index a9b9247760b87..77a90e27e351a 100644
--- a/FWCore/PyDevParameterSet/interface/PyBind11ProcessDesc.h
+++ b/FWCore/PyDevParameterSet/interface/PyBind11ProcessDesc.h
@@ -11,49 +11,49 @@
 namespace edm {
   class ParameterSet;
   class ProcessDesc;
-}
+}  // namespace edm
 
 namespace cmspython3 {
 
-class PyBind11ProcessDesc {
-public:
-  PyBind11ProcessDesc();
-  /** This constructor will parse the given file or string
+  class PyBind11ProcessDesc {
+  public:
+    PyBind11ProcessDesc();
+    /** This constructor will parse the given file or string
       and create two objects in python-land:
     * a PythonProcessDesc named 'processDesc'
     * a PythonParameterSet named 'processPSet'
     It decides whether it's a file or string by seeing if
     it ends in '.py'
   */
-  PyBind11ProcessDesc(std::string const& config);
+    PyBind11ProcessDesc(std::string const& config);
 
-  PyBind11ProcessDesc(std::string const& config, int argc, char * argv[]);
+    PyBind11ProcessDesc(std::string const& config, int argc, char* argv[]);
 
-  ~PyBind11ProcessDesc();
+    ~PyBind11ProcessDesc();
 
-  Python11ParameterSet newPSet() const {return Python11ParameterSet();}
+    Python11ParameterSet newPSet() const { return Python11ParameterSet(); }
 
-  Python11ParameterSet& pset() { return theProcessPSet;}
-  
-  std::string dump() const;
+    Python11ParameterSet& pset() { return theProcessPSet; }
 
-  // makes a new (copy) of the ParameterSet
-  std::unique_ptr<edm::ParameterSet> parameterSet() const;
+    std::string dump() const;
 
-  // makes a new (copy) of a ProcessDesc
-  // For backward compatibility only.  Remove when no longer needed.
-  std::unique_ptr<edm::ProcessDesc> processDesc() const;
+    // makes a new (copy) of the ParameterSet
+    std::unique_ptr<edm::ParameterSet> parameterSet() const;
 
-private:
-  void prepareToRead();
-  void read(std::string const& config);
-  void readFile(std::string const& fileName);
-  void readString(std::string const& pyConfig);
+    // makes a new (copy) of a ProcessDesc
+    // For backward compatibility only.  Remove when no longer needed.
+    std::unique_ptr<edm::ProcessDesc> processDesc() const;
 
-  Python11ParameterSet theProcessPSet;
-  pybind11::object theMainModule;
-  bool theOwnsInterpreter;
-};
+  private:
+    void prepareToRead();
+    void read(std::string const& config);
+    void readFile(std::string const& fileName);
+    void readString(std::string const& pyConfig);
 
-}
+    Python11ParameterSet theProcessPSet;
+    pybind11::object theMainModule;
+    bool theOwnsInterpreter;
+  };
+
+}  // namespace cmspython3
 #endif
diff --git a/FWCore/PyDevParameterSet/interface/PyBind11Wrapper.h b/FWCore/PyDevParameterSet/interface/PyBind11Wrapper.h
index 8f8977c36cb17..18e632afee860 100644
--- a/FWCore/PyDevParameterSet/interface/PyBind11Wrapper.h
+++ b/FWCore/PyDevParameterSet/interface/PyBind11Wrapper.h
@@ -8,30 +8,27 @@
 #include <iostream>
 
 namespace cmspython3 {
-void
-  pythonToCppException(const std::string& iType, const std::string& error);
+  void pythonToCppException(const std::string& iType, const std::string& error);
 
   // utility to translate from an STL vector of strings to
   // a Python list
 
-  template<typename T>
-    pybind11::list toPython11List(const std::vector<T> & v) {
-    pybind11::list result=pybind11::cast(v);
+  template <typename T>
+  pybind11::list toPython11List(const std::vector<T>& v) {
+    pybind11::list result = pybind11::cast(v);
     return result;
   }
 
   // and back.  Destroys the input via pop()s - well probably not
-  template<typename T>
-  std::vector<T> toVector(pybind11::list & l)
-  {
+  template <typename T>
+  std::vector<T> toVector(pybind11::list& l) {
     std::vector<T> result;
     result.reserve(l.size());
-    for(unsigned i = 0; i < l.size(); ++i)
-    {
+    for (unsigned i = 0; i < l.size(); ++i) {
       result.push_back(l[i].cast<T>());
     }
     return result;
   }
-}
+}  // namespace cmspython3
 
 #endif
diff --git a/FWCore/PyDevParameterSet/interface/Python11ParameterSet.h b/FWCore/PyDevParameterSet/interface/Python11ParameterSet.h
index 7987ce9b48ec5..73a4f96f482a9 100644
--- a/FWCore/PyDevParameterSet/interface/Python11ParameterSet.h
+++ b/FWCore/PyDevParameterSet/interface/Python11ParameterSet.h
@@ -17,116 +17,106 @@
 #include <vector>
 
 namespace cmspython3 {
-class Python11ParameterSet {
-public:
-  Python11ParameterSet();
-
-  Python11ParameterSet(edm::ParameterSet const& p)
-  : theParameterSet(p) {}
-
-  template<typename T>
-  T
-  getParameter(bool tracked, std::string const& name) const {
-    T result;
-    if(tracked) {
-      result = theParameterSet.template getParameter<T>(name);
-    } else {
-      result = theParameterSet.template getUntrackedParameter<T>(name);
+  class Python11ParameterSet {
+  public:
+    Python11ParameterSet();
+
+    Python11ParameterSet(edm::ParameterSet const& p) : theParameterSet(p) {}
+
+    template <typename T>
+    T getParameter(bool tracked, std::string const& name) const {
+      T result;
+      if (tracked) {
+        result = theParameterSet.template getParameter<T>(name);
+      } else {
+        result = theParameterSet.template getUntrackedParameter<T>(name);
+      }
+      return result;
     }
-    return result;
-  }
-
-
-  template<typename T>
-  void
-  addParameter(bool tracked, std::string const& name, T const& value) {
-   if(tracked) {
-     theParameterSet.template addParameter<T>(name, value);
-   } else {
-     theParameterSet.template addUntrackedParameter<T>(name, value);
-   }
-  }
-
-
-  /// templated on the type of the contained object
-  template<typename T>
-  pybind11::list
-  getParameters(bool tracked, std::string const& name) const {
-    std::vector<T> v = getParameter<std::vector<T> >(tracked, name);
-    return cmspython3::toPython11List(v);
-  }
-
-  /// unfortunate side effect: destroys the original list!
-  template<typename T>
-  void
-  addParameters(bool tracked, std::string const& name,
-                pybind11::list  value) {
-    std::vector<T> v = cmspython3::toVector<T>(value);
-    addParameter(tracked, name, v);
-  }
-
-
-  /// these custom classes do seem to be a hassle
-  /// to wrap, compared to, say, InputTag
-  /// maybe we will need to template these someday
-  void addPSet(bool tracked, std::string const& name,
-               Python11ParameterSet const& ppset) {
-    addParameter(tracked, name, ppset.theParameterSet);
-  }
-
-
-  Python11ParameterSet getPSet(bool tracked, std::string const& name) const {
-    return Python11ParameterSet(getParameter<edm::ParameterSet>(tracked, name));
-  }
-
-
-  void addVPSet(bool tracked, std::string const& name,
-                pybind11::list  value);
-
-  pybind11::list getVPSet(bool tracked, std::string const& name);
-
-  // no way to interface straight into the other python InputTag
-  edm::InputTag newInputTag(std::string const& label,
-                            std::string const& instance,
-                            std::string const& process) {
-    return edm::InputTag(label, instance, process);
-  }
-
-   edm::ESInputTag newESInputTag(std::string const& module,
-                             std::string const& data) {
+
+    template <typename T>
+    void addParameter(bool tracked, std::string const& name, T const& value) {
+      if (tracked) {
+        theParameterSet.template addParameter<T>(name, value);
+      } else {
+        theParameterSet.template addUntrackedParameter<T>(name, value);
+      }
+    }
+
+    /// templated on the type of the contained object
+    template <typename T>
+    pybind11::list getParameters(bool tracked, std::string const& name) const {
+      std::vector<T> v = getParameter<std::vector<T> >(tracked, name);
+      return cmspython3::toPython11List(v);
+    }
+
+    /// unfortunate side effect: destroys the original list!
+    template <typename T>
+    void addParameters(bool tracked, std::string const& name, pybind11::list value) {
+      std::vector<T> v = cmspython3::toVector<T>(value);
+      addParameter(tracked, name, v);
+    }
+
+    /// these custom classes do seem to be a hassle
+    /// to wrap, compared to, say, InputTag
+    /// maybe we will need to template these someday
+    void addPSet(bool tracked, std::string const& name, Python11ParameterSet const& ppset) {
+      addParameter(tracked, name, ppset.theParameterSet);
+    }
+
+    Python11ParameterSet getPSet(bool tracked, std::string const& name) const {
+      return Python11ParameterSet(getParameter<edm::ParameterSet>(tracked, name));
+    }
+
+    void addVPSet(bool tracked, std::string const& name, pybind11::list value);
+
+    pybind11::list getVPSet(bool tracked, std::string const& name);
+
+    // no way to interface straight into the other python InputTag
+    edm::InputTag newInputTag(std::string const& label, std::string const& instance, std::string const& process) {
+      return edm::InputTag(label, instance, process);
+    }
+
+    edm::ESInputTag newESInputTag(std::string const& module, std::string const& data) {
       return edm::ESInputTag(module, data);
-   }
+    }
 
-   edm::EventID newEventID(edm::RunNumber_t run, edm::LuminosityBlockNumber_t lumi, edm::EventNumber_t event) {
-    return edm::EventID(run, lumi, event);
-  }
+    edm::EventID newEventID(edm::RunNumber_t run, edm::LuminosityBlockNumber_t lumi, edm::EventNumber_t event) {
+      return edm::EventID(run, lumi, event);
+    }
 
-  edm::LuminosityBlockID newLuminosityBlockID(unsigned int run, unsigned int lumi) {
-    return edm::LuminosityBlockID(run, lumi);
-  }
+    edm::LuminosityBlockID newLuminosityBlockID(unsigned int run, unsigned int lumi) {
+      return edm::LuminosityBlockID(run, lumi);
+    }
 
-  edm::LuminosityBlockRange newLuminosityBlockRange(unsigned int start, unsigned int startSub,
-                                                    unsigned int end,   unsigned int endSub) {
-    return edm::LuminosityBlockRange(start, startSub, end, endSub);
-  }
+    edm::LuminosityBlockRange newLuminosityBlockRange(unsigned int start,
+                                                      unsigned int startSub,
+                                                      unsigned int end,
+                                                      unsigned int endSub) {
+      return edm::LuminosityBlockRange(start, startSub, end, endSub);
+    }
 
-  edm::EventRange newEventRange(edm::RunNumber_t start, edm::LuminosityBlockNumber_t startLumi, edm::EventNumber_t startSub,
-                                edm::RunNumber_t end,   edm::LuminosityBlockNumber_t endLumi, edm::EventNumber_t endSub) {
-    return edm::EventRange(start, startLumi, startSub, end, endLumi, endSub);
-  }
+    edm::EventRange newEventRange(edm::RunNumber_t start,
+                                  edm::LuminosityBlockNumber_t startLumi,
+                                  edm::EventNumber_t startSub,
+                                  edm::RunNumber_t end,
+                                  edm::LuminosityBlockNumber_t endLumi,
+                                  edm::EventNumber_t endSub) {
+      return edm::EventRange(start, startLumi, startSub, end, endLumi, endSub);
+    }
 
-  void addNewFileInPath(bool tracked, std::string const& name, std::string const& value);
+    void addNewFileInPath(bool tracked, std::string const& name, std::string const& value);
 
-  Python11ParameterSet newPSet() const {return Python11ParameterSet();}
+    Python11ParameterSet newPSet() const { return Python11ParameterSet(); }
 
-  edm::ParameterSet& pset() {return theParameterSet;}
+    edm::ParameterSet& pset() { return theParameterSet; }
 
-  edm::ParameterSet const& pset() const {return theParameterSet;}
+    edm::ParameterSet const& pset() const { return theParameterSet; }
 
-  std::string dump() const {return theParameterSet.dump();}
+    std::string dump() const { return theParameterSet.dump(); }
 
-private:
-  edm::ParameterSet theParameterSet;
-};
-}
+  private:
+    edm::ParameterSet theParameterSet;
+  };
+}  // namespace cmspython3
 #endif
diff --git a/FWCore/PyDevParameterSet/src/MakePyBind11ParameterSets.cc b/FWCore/PyDevParameterSet/src/MakePyBind11ParameterSets.cc
index 8b2bf34f83188..9afb2ee878f1f 100644
--- a/FWCore/PyDevParameterSet/src/MakePyBind11ParameterSets.cc
+++ b/FWCore/PyDevParameterSet/src/MakePyBind11ParameterSets.cc
@@ -6,19 +6,16 @@
 #include "initializePyBind11Module.h"
 #include <pybind11/embed.h>
 
-static
-void
-makePSetsFromFile(std::string const& fileName) { 
-  std::string initCommand("from FWCore.ParameterSet.Types import makeCppPSet\n"
-                          "exec(open('");
+static void makePSetsFromFile(std::string const& fileName) {
+  std::string initCommand(
+      "from FWCore.ParameterSet.Types import makeCppPSet\n"
+      "exec(open('");
   initCommand += fileName + "').read())";
   pybind11::exec(initCommand);
   pybind11::exec("makeCppPSet(locals(), topPSet)");
 }
 
-static
-void
-makePSetsFromString(std::string const& module) { 
+static void makePSetsFromString(std::string const& module) {
   std::string command = module;
   command += "\nfrom FWCore.ParameterSet.Types import makeCppPSet\nmakeCppPSet(locals(), topPSet)";
   pybind11::exec(command);
@@ -26,50 +23,43 @@ makePSetsFromString(std::string const& module) {
 
 namespace edm {
   namespace cmspybind11_p3 {
-    std::unique_ptr<ParameterSet>
-    readConfig(std::string const& config) {
+    std::unique_ptr<ParameterSet> readConfig(std::string const& config) {
       cmspython3::PyBind11ProcessDesc pythonProcessDesc(config);
       return pythonProcessDesc.parameterSet();
     }
 
-    std::unique_ptr<ParameterSet>
-    readConfig(std::string const& config, int argc, char* argv[]) {
+    std::unique_ptr<ParameterSet> readConfig(std::string const& config, int argc, char* argv[]) {
       cmspython3::PyBind11ProcessDesc pythonProcessDesc(config, argc, argv);
       return pythonProcessDesc.parameterSet();
     }
 
-    void
-    makeParameterSets(std::string const& configtext,
-		      std::unique_ptr<ParameterSet>& main) {
+    void makeParameterSets(std::string const& configtext, std::unique_ptr<ParameterSet>& main) {
       cmspython3::PyBind11ProcessDesc pythonProcessDesc(configtext);
       main = pythonProcessDesc.parameterSet();
     }
 
-    std::unique_ptr<ParameterSet>
-    readPSetsFrom(std::string const& module) {
-
+    std::unique_ptr<ParameterSet> readPSetsFrom(std::string const& module) {
       pybind11::scoped_interpreter guard{};
       edm::python3::initializePyBind11Module();
       std::unique_ptr<ParameterSet> retVal;
       {
-	cmspython3::Python11ParameterSet theProcessPSet; 
-	pybind11::object mainModule = pybind11::module::import("__main__");
-	mainModule.attr("topPSet") = pybind11::cast(&theProcessPSet);
-	
-	try {
-	  // if it ends with py, it's a file
-	  if(module.substr(module.size()-3) == ".py") {
-	    makePSetsFromFile(module);
-	  } else {
-	    makePSetsFromString(module);
-	  }
-	}
-	catch( pybind11::error_already_set const &e ) {
-	  cmspython3::pythonToCppException("Configuration",e.what());
-	}
-	retVal=std::make_unique<edm::ParameterSet>(ParameterSet(theProcessPSet.pset()));
+        cmspython3::Python11ParameterSet theProcessPSet;
+        pybind11::object mainModule = pybind11::module::import("__main__");
+        mainModule.attr("topPSet") = pybind11::cast(&theProcessPSet);
+
+        try {
+          // if it ends with py, it's a file
+          if (module.substr(module.size() - 3) == ".py") {
+            makePSetsFromFile(module);
+          } else {
+            makePSetsFromString(module);
+          }
+        } catch (pybind11::error_already_set const& e) {
+          cmspython3::pythonToCppException("Configuration", e.what());
+        }
+        retVal = std::make_unique<edm::ParameterSet>(ParameterSet(theProcessPSet.pset()));
       }
       return retVal;
     }
-  }
-} // namespace edm
+  }  // namespace cmspybind11_p3
+}  // namespace edm
diff --git a/FWCore/PyDevParameterSet/src/PyBind11Module.h b/FWCore/PyDevParameterSet/src/PyBind11Module.h
index 88cf5bff2d662..c6b20b7c6b8ed 100644
--- a/FWCore/PyDevParameterSet/src/PyBind11Module.h
+++ b/FWCore/PyDevParameterSet/src/PyBind11Module.h
@@ -34,153 +34,142 @@
 
 using namespace cmspython3;
 
-PYBIND11_MODULE(libFWCorePyDevParameterSet,m) 
-{
+PYBIND11_MODULE(libFWCorePyDevParameterSet, m) {
   pybind11::register_exception_translator([](std::exception_ptr p) {
-      try {
-        if (p) std::rethrow_exception(p);
-      } catch (const cms::Exception &e) {
-        PyErr_SetString(PyExc_RuntimeError, e.what());
-      }
-    });
-
-  pybind11::class_<edm::InputTag>(m,"InputTag")
-    .def(pybind11::init<>())
-    .def(pybind11::init<const std::string &>())
-    .def(pybind11::init<const std::string &, const std::string &, const std::string &>())
-    .def(pybind11::init<const std::string &, const std::string &>())
-    .def("label",    &edm::InputTag::label, pybind11::return_value_policy::copy) 
-    .def("instance", &edm::InputTag::instance, pybind11::return_value_policy::copy) 
-    .def("process",  &edm::InputTag::process, pybind11::return_value_policy::copy)
-    ; 
-
-  pybind11::class_<edm::ESInputTag>(m,"ESInputTag")
-    .def(pybind11::init<std::string>())
-    .def(pybind11::init<std::string, std::string>())
-    .def("module", &edm::ESInputTag::module, pybind11::return_value_policy::copy)
-    .def("data",   &edm::ESInputTag::data, pybind11::return_value_policy::copy)
-    ;
-
-  pybind11::class_<edm::EventID>(m,"EventID")
-    .def(pybind11::init<edm::RunNumber_t, edm::LuminosityBlockNumber_t, edm::EventNumber_t>())
-    .def("run",   &edm::EventID::run)
-    .def("luminosityBlock", &edm::EventID::luminosityBlock)
-    .def("event", &edm::EventID::event)
-  ;
-
-  pybind11::class_<edm::LuminosityBlockID>(m,"LuminosityBlockID")
-    .def(pybind11::init<unsigned int, unsigned int>())
-    .def("run",    &edm::LuminosityBlockID::run)
-    .def("luminosityBlock", &edm::LuminosityBlockID::luminosityBlock)
-    ;
-
-  pybind11::class_<edm::FileInPath>(m,"FileInPath")
-    .def(pybind11::init<std::string>())
-    .def("fullPath",     &edm::FileInPath::fullPath)
-    .def("relativePath", &edm::FileInPath::relativePath)
-    ;
-  
-  pybind11::class_<edm::LuminosityBlockRange>(m,"LuminosityBlockRange")
-    .def(pybind11::init<unsigned int, unsigned int, unsigned int, unsigned int>())
-    .def("start",    &edm::LuminosityBlockRange::startRun)
-    .def("startSub", &edm::LuminosityBlockRange::startLumi)
-    .def("end",      &edm::LuminosityBlockRange::endRun)
-    .def("endSub",   &edm::LuminosityBlockRange::endLumi)
-    ;
-
-  pybind11::class_<edm::EventRange>(m,"EventRange") 
-    .def(pybind11::init<edm::RunNumber_t, edm::LuminosityBlockNumber_t, edm::EventNumber_t, 
-	                edm::RunNumber_t, edm::LuminosityBlockNumber_t, edm::EventNumber_t>())
-    .def("start",     &edm::EventRange::startRun)
-    .def("startLumi", &edm::EventRange::startLumi)
-    .def("startSub",  &edm::EventRange::startEvent)
-    .def("end",       &edm::EventRange::endRun)
-    .def("endLumi",   &edm::EventRange::endLumi)
-    .def("endSub",    &edm::EventRange::endEvent)
-  ;
-
-  pybind11::class_<Python11ParameterSet>(m,"ParameterSet")
-    .def(pybind11::init<>())
-    .def("addInt32", &Python11ParameterSet::addParameter<int>)
-    .def("getInt32", &Python11ParameterSet::getParameter<int>)
-    .def("addVInt32", &Python11ParameterSet::addParameters<int>)
-    .def("getVInt32", &Python11ParameterSet::getParameters<int>)
-    .def("addUInt32", &Python11ParameterSet::addParameter<unsigned int>)
-    .def("getUInt32", &Python11ParameterSet::getParameter<unsigned int>)
-    .def("addVUInt32", &Python11ParameterSet::addParameters<unsigned int>)
-    .def("getVUInt32", &Python11ParameterSet::getParameters<unsigned int>)
-    .def("addInt64", &Python11ParameterSet::addParameter<long long>)
-    .def("getInt64", &Python11ParameterSet::getParameter<long long>)
-    .def("addUInt64", &Python11ParameterSet::addParameter<unsigned long long>)
-    .def("getUInt64", &Python11ParameterSet::getParameter<unsigned long long>)
-    .def("addVInt64", &Python11ParameterSet::addParameters<long long>)
-    .def("getVInt64", &Python11ParameterSet::getParameters<long long>)
-    .def("addVUInt64", &Python11ParameterSet::addParameters<unsigned long long>)
-    .def("getVUInt64", &Python11ParameterSet::getParameters<unsigned long long>)
-    .def("addDouble", &Python11ParameterSet::addParameter<double>)
-    .def("getDouble", &Python11ParameterSet::getParameter<double>)
-    .def("addVDouble", &Python11ParameterSet::addParameters<double>)
-    .def("getVDouble", &Python11ParameterSet::getParameters<double>)
-    .def("addBool", &Python11ParameterSet::addParameter<bool>)
-    .def("getBool", &Python11ParameterSet::getParameter<bool>)
-    .def("addString", &Python11ParameterSet::addParameter<std::string>)
-    .def("getString", &Python11ParameterSet::getParameter<std::string>)
-    .def("addVString", &Python11ParameterSet::addParameters<std::string>)
-    .def("getVString", &Python11ParameterSet::getParameters<std::string>)
-    .def("addInputTag", &Python11ParameterSet::addParameter<edm::InputTag>)
-    .def("getInputTag", &Python11ParameterSet::getParameter<edm::InputTag>)
-    .def("addVInputTag", &Python11ParameterSet::addParameters<edm::InputTag>)
-    .def("getVInputTag", &Python11ParameterSet::getParameters<edm::InputTag>)
-    .def("addESInputTag", &Python11ParameterSet::addParameter<edm::ESInputTag>)
-    .def("getESInputTag", &Python11ParameterSet::getParameter<edm::ESInputTag>)
-    .def("addVESInputTag", &Python11ParameterSet::addParameters<edm::ESInputTag>)
-    .def("getVESInputTag", &Python11ParameterSet::getParameters<edm::ESInputTag>)
-    .def("addEventID", &Python11ParameterSet::addParameter<edm::EventID>)
-    .def("getEventID", &Python11ParameterSet::getParameter<edm::EventID>)
-    .def("addVEventID", &Python11ParameterSet::addParameters<edm::EventID>)
-    .def("getVEventID", &Python11ParameterSet::getParameters<edm::EventID>)
-    .def("addLuminosityBlockID", &Python11ParameterSet::addParameter<edm::LuminosityBlockID>)
-    .def("getLuminosityBlockID", &Python11ParameterSet::getParameter<edm::LuminosityBlockID>)
-    .def("addVLuminosityBlockID", &Python11ParameterSet::addParameters<edm::LuminosityBlockID>)
-    .def("getVLuminosityBlockID", &Python11ParameterSet::getParameters<edm::LuminosityBlockID>)
-    .def("addLuminosityBlockRange", &Python11ParameterSet::addParameter<edm::LuminosityBlockRange>)
-    .def("getLuminosityBlockRange", &Python11ParameterSet::getParameter<edm::LuminosityBlockRange>)
-    .def("addVLuminosityBlockRange", &Python11ParameterSet::addParameters<edm::LuminosityBlockRange>)
-    .def("getVLuminosityBlockRange", &Python11ParameterSet::getParameters<edm::LuminosityBlockRange>)
-    .def("addEventRange", &Python11ParameterSet::addParameter<edm::EventRange>)
-    .def("getEventRange", &Python11ParameterSet::getParameter<edm::EventRange>)
-    .def("addVEventRange", &Python11ParameterSet::addParameters<edm::EventRange>)
-    .def("getVEventRange", &Python11ParameterSet::getParameters<edm::EventRange>)
-    .def("addPSet", &Python11ParameterSet::addPSet)
-    .def("getPSet", &Python11ParameterSet::getPSet)
-    .def("addVPSet", &Python11ParameterSet::addVPSet)
-    .def("getVPSet", &Python11ParameterSet::getVPSet)
-    .def("addFileInPath", &Python11ParameterSet::addParameter<edm::FileInPath>)
-    .def("getFileInPath", &Python11ParameterSet::getParameter<edm::FileInPath>)
-    .def("newInputTag", &Python11ParameterSet::newInputTag)
-    .def("newESInputTag", &Python11ParameterSet::newESInputTag)
-    .def("newEventID", &Python11ParameterSet::newEventID)
-    .def("newLuminosityBlockID", &Python11ParameterSet::newLuminosityBlockID)
-    .def("newLuminosityBlockRange", &Python11ParameterSet::newLuminosityBlockRange)
-    .def("newEventRange", &Python11ParameterSet::newEventRange)
-    .def("addNewFileInPath", &Python11ParameterSet::addNewFileInPath)
-    .def("newPSet", &Python11ParameterSet::newPSet)
-    .def("dump", &Python11ParameterSet::dump)
-    ;
-
-  pybind11::class_<PyBind11ProcessDesc>(m,"ProcessDesc")//, pybind11::init<>())
-    .def(pybind11::init<>())
-    .def(pybind11::init<std::string>())
-    .def("newPSet", &PyBind11ProcessDesc::newPSet)
-    .def("pset", &PyBind11ProcessDesc::pset, pybind11::return_value_policy::reference)
-    .def("dump", &PyBind11ProcessDesc::dump)
-    ;
-
+    try {
+      if (p)
+        std::rethrow_exception(p);
+    } catch (const cms::Exception &e) {
+      PyErr_SetString(PyExc_RuntimeError, e.what());
+    }
+  });
+
+  pybind11::class_<edm::InputTag>(m, "InputTag")
+      .def(pybind11::init<>())
+      .def(pybind11::init<const std::string &>())
+      .def(pybind11::init<const std::string &, const std::string &, const std::string &>())
+      .def(pybind11::init<const std::string &, const std::string &>())
+      .def("label", &edm::InputTag::label, pybind11::return_value_policy::copy)
+      .def("instance", &edm::InputTag::instance, pybind11::return_value_policy::copy)
+      .def("process", &edm::InputTag::process, pybind11::return_value_policy::copy);
+
+  pybind11::class_<edm::ESInputTag>(m, "ESInputTag")
+      .def(pybind11::init<std::string>())
+      .def(pybind11::init<std::string, std::string>())
+      .def("module", &edm::ESInputTag::module, pybind11::return_value_policy::copy)
+      .def("data", &edm::ESInputTag::data, pybind11::return_value_policy::copy);
+
+  pybind11::class_<edm::EventID>(m, "EventID")
+      .def(pybind11::init<edm::RunNumber_t, edm::LuminosityBlockNumber_t, edm::EventNumber_t>())
+      .def("run", &edm::EventID::run)
+      .def("luminosityBlock", &edm::EventID::luminosityBlock)
+      .def("event", &edm::EventID::event);
+
+  pybind11::class_<edm::LuminosityBlockID>(m, "LuminosityBlockID")
+      .def(pybind11::init<unsigned int, unsigned int>())
+      .def("run", &edm::LuminosityBlockID::run)
+      .def("luminosityBlock", &edm::LuminosityBlockID::luminosityBlock);
+
+  pybind11::class_<edm::FileInPath>(m, "FileInPath")
+      .def(pybind11::init<std::string>())
+      .def("fullPath", &edm::FileInPath::fullPath)
+      .def("relativePath", &edm::FileInPath::relativePath);
+
+  pybind11::class_<edm::LuminosityBlockRange>(m, "LuminosityBlockRange")
+      .def(pybind11::init<unsigned int, unsigned int, unsigned int, unsigned int>())
+      .def("start", &edm::LuminosityBlockRange::startRun)
+      .def("startSub", &edm::LuminosityBlockRange::startLumi)
+      .def("end", &edm::LuminosityBlockRange::endRun)
+      .def("endSub", &edm::LuminosityBlockRange::endLumi);
+
+  pybind11::class_<edm::EventRange>(m, "EventRange")
+      .def(pybind11::init<edm::RunNumber_t,
+                          edm::LuminosityBlockNumber_t,
+                          edm::EventNumber_t,
+                          edm::RunNumber_t,
+                          edm::LuminosityBlockNumber_t,
+                          edm::EventNumber_t>())
+      .def("start", &edm::EventRange::startRun)
+      .def("startLumi", &edm::EventRange::startLumi)
+      .def("startSub", &edm::EventRange::startEvent)
+      .def("end", &edm::EventRange::endRun)
+      .def("endLumi", &edm::EventRange::endLumi)
+      .def("endSub", &edm::EventRange::endEvent);
+
+  pybind11::class_<Python11ParameterSet>(m, "ParameterSet")
+      .def(pybind11::init<>())
+      .def("addInt32", &Python11ParameterSet::addParameter<int>)
+      .def("getInt32", &Python11ParameterSet::getParameter<int>)
+      .def("addVInt32", &Python11ParameterSet::addParameters<int>)
+      .def("getVInt32", &Python11ParameterSet::getParameters<int>)
+      .def("addUInt32", &Python11ParameterSet::addParameter<unsigned int>)
+      .def("getUInt32", &Python11ParameterSet::getParameter<unsigned int>)
+      .def("addVUInt32", &Python11ParameterSet::addParameters<unsigned int>)
+      .def("getVUInt32", &Python11ParameterSet::getParameters<unsigned int>)
+      .def("addInt64", &Python11ParameterSet::addParameter<long long>)
+      .def("getInt64", &Python11ParameterSet::getParameter<long long>)
+      .def("addUInt64", &Python11ParameterSet::addParameter<unsigned long long>)
+      .def("getUInt64", &Python11ParameterSet::getParameter<unsigned long long>)
+      .def("addVInt64", &Python11ParameterSet::addParameters<long long>)
+      .def("getVInt64", &Python11ParameterSet::getParameters<long long>)
+      .def("addVUInt64", &Python11ParameterSet::addParameters<unsigned long long>)
+      .def("getVUInt64", &Python11ParameterSet::getParameters<unsigned long long>)
+      .def("addDouble", &Python11ParameterSet::addParameter<double>)
+      .def("getDouble", &Python11ParameterSet::getParameter<double>)
+      .def("addVDouble", &Python11ParameterSet::addParameters<double>)
+      .def("getVDouble", &Python11ParameterSet::getParameters<double>)
+      .def("addBool", &Python11ParameterSet::addParameter<bool>)
+      .def("getBool", &Python11ParameterSet::getParameter<bool>)
+      .def("addString", &Python11ParameterSet::addParameter<std::string>)
+      .def("getString", &Python11ParameterSet::getParameter<std::string>)
+      .def("addVString", &Python11ParameterSet::addParameters<std::string>)
+      .def("getVString", &Python11ParameterSet::getParameters<std::string>)
+      .def("addInputTag", &Python11ParameterSet::addParameter<edm::InputTag>)
+      .def("getInputTag", &Python11ParameterSet::getParameter<edm::InputTag>)
+      .def("addVInputTag", &Python11ParameterSet::addParameters<edm::InputTag>)
+      .def("getVInputTag", &Python11ParameterSet::getParameters<edm::InputTag>)
+      .def("addESInputTag", &Python11ParameterSet::addParameter<edm::ESInputTag>)
+      .def("getESInputTag", &Python11ParameterSet::getParameter<edm::ESInputTag>)
+      .def("addVESInputTag", &Python11ParameterSet::addParameters<edm::ESInputTag>)
+      .def("getVESInputTag", &Python11ParameterSet::getParameters<edm::ESInputTag>)
+      .def("addEventID", &Python11ParameterSet::addParameter<edm::EventID>)
+      .def("getEventID", &Python11ParameterSet::getParameter<edm::EventID>)
+      .def("addVEventID", &Python11ParameterSet::addParameters<edm::EventID>)
+      .def("getVEventID", &Python11ParameterSet::getParameters<edm::EventID>)
+      .def("addLuminosityBlockID", &Python11ParameterSet::addParameter<edm::LuminosityBlockID>)
+      .def("getLuminosityBlockID", &Python11ParameterSet::getParameter<edm::LuminosityBlockID>)
+      .def("addVLuminosityBlockID", &Python11ParameterSet::addParameters<edm::LuminosityBlockID>)
+      .def("getVLuminosityBlockID", &Python11ParameterSet::getParameters<edm::LuminosityBlockID>)
+      .def("addLuminosityBlockRange", &Python11ParameterSet::addParameter<edm::LuminosityBlockRange>)
+      .def("getLuminosityBlockRange", &Python11ParameterSet::getParameter<edm::LuminosityBlockRange>)
+      .def("addVLuminosityBlockRange", &Python11ParameterSet::addParameters<edm::LuminosityBlockRange>)
+      .def("getVLuminosityBlockRange", &Python11ParameterSet::getParameters<edm::LuminosityBlockRange>)
+      .def("addEventRange", &Python11ParameterSet::addParameter<edm::EventRange>)
+      .def("getEventRange", &Python11ParameterSet::getParameter<edm::EventRange>)
+      .def("addVEventRange", &Python11ParameterSet::addParameters<edm::EventRange>)
+      .def("getVEventRange", &Python11ParameterSet::getParameters<edm::EventRange>)
+      .def("addPSet", &Python11ParameterSet::addPSet)
+      .def("getPSet", &Python11ParameterSet::getPSet)
+      .def("addVPSet", &Python11ParameterSet::addVPSet)
+      .def("getVPSet", &Python11ParameterSet::getVPSet)
+      .def("addFileInPath", &Python11ParameterSet::addParameter<edm::FileInPath>)
+      .def("getFileInPath", &Python11ParameterSet::getParameter<edm::FileInPath>)
+      .def("newInputTag", &Python11ParameterSet::newInputTag)
+      .def("newESInputTag", &Python11ParameterSet::newESInputTag)
+      .def("newEventID", &Python11ParameterSet::newEventID)
+      .def("newLuminosityBlockID", &Python11ParameterSet::newLuminosityBlockID)
+      .def("newLuminosityBlockRange", &Python11ParameterSet::newLuminosityBlockRange)
+      .def("newEventRange", &Python11ParameterSet::newEventRange)
+      .def("addNewFileInPath", &Python11ParameterSet::addNewFileInPath)
+      .def("newPSet", &Python11ParameterSet::newPSet)
+      .def("dump", &Python11ParameterSet::dump);
+
+  pybind11::class_<PyBind11ProcessDesc>(m, "ProcessDesc")  //, pybind11::init<>())
+      .def(pybind11::init<>())
+      .def(pybind11::init<std::string>())
+      .def("newPSet", &PyBind11ProcessDesc::newPSet)
+      .def("pset", &PyBind11ProcessDesc::pset, pybind11::return_value_policy::reference)
+      .def("dump", &PyBind11ProcessDesc::dump);
 }
 
-
-
-
-
-
 #endif
diff --git a/FWCore/PyDevParameterSet/src/PyBind11ProcessDesc.cc b/FWCore/PyDevParameterSet/src/PyBind11ProcessDesc.cc
index f125cf1e61da4..eaaf8065840fa 100644
--- a/FWCore/PyDevParameterSet/src/PyBind11ProcessDesc.cc
+++ b/FWCore/PyDevParameterSet/src/PyBind11ProcessDesc.cc
@@ -10,30 +10,21 @@
 #include <iostream>
 
 namespace cmspython3 {
-  PyBind11ProcessDesc::PyBind11ProcessDesc() :
-    theProcessPSet(),
-    theMainModule(),
-    theOwnsInterpreter(false)
-  {
-  }
-  
-  PyBind11ProcessDesc::PyBind11ProcessDesc(std::string const& config) :
-    theProcessPSet(),
-    theMainModule(),
-    theOwnsInterpreter(true)
-  {
+  PyBind11ProcessDesc::PyBind11ProcessDesc() : theProcessPSet(), theMainModule(), theOwnsInterpreter(false) {}
+
+  PyBind11ProcessDesc::PyBind11ProcessDesc(std::string const& config)
+      : theProcessPSet(), theMainModule(), theOwnsInterpreter(true) {
     pybind11::initialize_interpreter();
     edm::python3::initializePyBind11Module();
     prepareToRead();
     read(config);
   }
-  
 
-  PyBind11ProcessDesc::PyBind11ProcessDesc(std::string const& config, int argc, char* argv[]) :
-    theProcessPSet(),
-    theMainModule(),
-    theOwnsInterpreter(true)
-    
+  PyBind11ProcessDesc::PyBind11ProcessDesc(std::string const& config, int argc, char* argv[])
+      : theProcessPSet(),
+        theMainModule(),
+        theOwnsInterpreter(true)
+
   {
     pybind11::initialize_interpreter();
     edm::python3::initializePyBind11Module();
@@ -42,28 +33,27 @@ namespace cmspython3 {
 #if PY_MAJOR_VERSION >= 3
       typedef std::unique_ptr<wchar_t[], decltype(&PyMem_RawFree)> WArgUPtr;
       std::vector<WArgUPtr> v_argv;
-      std::vector<wchar_t *> vp_argv;
+      std::vector<wchar_t*> vp_argv;
       v_argv.reserve(argc);
       vp_argv.reserve(argc);
       for (int i = 0; i < argc; i++) {
-	v_argv.emplace_back(Py_DecodeLocale(argv[i], nullptr), &PyMem_RawFree);
-	vp_argv.emplace_back(v_argv.back().get());
+        v_argv.emplace_back(Py_DecodeLocale(argv[i], nullptr), &PyMem_RawFree);
+        vp_argv.emplace_back(v_argv.back().get());
       }
 
-      wchar_t **argvt = vp_argv.data();
+      wchar_t** argvt = vp_argv.data();
 #else
-      char **argvt = argv;
+      char** argvt = argv;
 #endif
 
       PySys_SetArgv(argc, argvt);
     }
     read(config);
   }
-  
 
   PyBind11ProcessDesc::~PyBind11ProcessDesc() {
-    if ( theOwnsInterpreter ) {
-      theMainModule=pybind11::object();
+    if (theOwnsInterpreter) {
+      theMainModule = pybind11::object();
       pybind11::finalize_interpreter();
     }
   }
@@ -71,36 +61,35 @@ namespace cmspython3 {
   void PyBind11ProcessDesc::prepareToRead() {
     //  pybind11::scoped_interpreter guard{};
     theMainModule = pybind11::module::import("__main__");
-    theMainModule.attr("processDesc")=this; 
-    theMainModule.attr("processPSet")=&theProcessPSet; 
+    theMainModule.attr("processDesc") = this;
+    theMainModule.attr("processPSet") = &theProcessPSet;
   }
 
   void PyBind11ProcessDesc::read(std::string const& config) {
     try {
       // if it ends with py, it's a file
-      if(config.substr(config.size()-3) == ".py") {
-	readFile(config);
+      if (config.substr(config.size() - 3) == ".py") {
+        readFile(config);
       } else {
-	readString(config);
+        readString(config);
       }
-    }
-    catch(pybind11::error_already_set const&e) {
-      cmspython3::pythonToCppException("Configuration",e.what());
+    } catch (pybind11::error_already_set const& e) {
+      cmspython3::pythonToCppException("Configuration", e.what());
     }
   }
-  
+
   void PyBind11ProcessDesc::readFile(std::string const& fileName) {
     pybind11::eval_file(fileName);
     std::string command("process.fillProcessDesc(processPSet)");
     pybind11::exec(command);
   }
-  
+
   void PyBind11ProcessDesc::readString(std::string const& pyConfig) {
     std::string command = pyConfig;
     command += "\nprocess.fillProcessDesc(processPSet)";
     pybind11::exec(command.c_str());
   }
-  
+
   std::unique_ptr<edm::ParameterSet> PyBind11ProcessDesc::parameterSet() const {
     return std::make_unique<edm::ParameterSet>(theProcessPSet.pset());
   }
@@ -115,4 +104,4 @@ namespace cmspython3 {
   std::unique_ptr<edm::ProcessDesc> PyBind11ProcessDesc::processDesc() const {
     return std::make_unique<edm::ProcessDesc>(parameterSet());
   }
-}
+}  // namespace cmspython3
diff --git a/FWCore/PyDevParameterSet/src/PyBind11Wrapper.cc b/FWCore/PyDevParameterSet/src/PyBind11Wrapper.cc
index 57c23339ae458..8c34663185a7e 100644
--- a/FWCore/PyDevParameterSet/src/PyBind11Wrapper.cc
+++ b/FWCore/PyDevParameterSet/src/PyBind11Wrapper.cc
@@ -3,10 +3,7 @@
 //#include <iostream>
 namespace cmspython3 {
 
-  void pythonToCppException(const std::string& iType, const std::string &error)
- {
-   throw cms::Exception(iType)<<" unknown python problem occurred.\n"<< error << std::endl;
- }
-}
-
-
+  void pythonToCppException(const std::string& iType, const std::string& error) {
+    throw cms::Exception(iType) << " unknown python problem occurred.\n" << error << std::endl;
+  }
+}  // namespace cmspython3
diff --git a/FWCore/PyDevParameterSet/src/Python11ParameterSet.cc b/FWCore/PyDevParameterSet/src/Python11ParameterSet.cc
index 70c4e0758b8ab..079d459808aa5 100644
--- a/FWCore/PyDevParameterSet/src/Python11ParameterSet.cc
+++ b/FWCore/PyDevParameterSet/src/Python11ParameterSet.cc
@@ -2,46 +2,36 @@
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 
 namespace cmspython3 {
-  Python11ParameterSet::Python11ParameterSet()
-    :  theParameterSet()
-  {
-  }
-  
+  Python11ParameterSet::Python11ParameterSet() : theParameterSet() {}
 
-  void Python11ParameterSet::addVPSet(bool tracked, std::string const& name,
-				      pybind11::list  value)
-  {
-    std::vector<Python11ParameterSet> v
-      = cmspython3::toVector<Python11ParameterSet>(value);
+  void Python11ParameterSet::addVPSet(bool tracked, std::string const& name, pybind11::list value) {
+    std::vector<Python11ParameterSet> v = cmspython3::toVector<Python11ParameterSet>(value);
     std::vector<edm::ParameterSet> v2;
     v2.reserve(v.size());
-    for(std::vector<Python11ParameterSet>::iterator ppsetItr = v.begin(), ppsetItrEnd = v.end();
-	ppsetItr != ppsetItrEnd; ++ppsetItr)
-    {
+    for (std::vector<Python11ParameterSet>::iterator ppsetItr = v.begin(), ppsetItrEnd = v.end();
+         ppsetItr != ppsetItrEnd;
+         ++ppsetItr) {
       v2.push_back(ppsetItr->theParameterSet);
     }
     addParameter(tracked, name, v2);
   }
 
-  pybind11::list Python11ParameterSet::getVPSet(bool tracked, std::string const& name)
-  {
+  pybind11::list Python11ParameterSet::getVPSet(bool tracked, std::string const& name) {
     std::vector<edm::ParameterSet> const& v =
-      (tracked ? theParameterSet.getParameterSetVector(name) : theParameterSet.getUntrackedParameterSetVector(name));
-    
+        (tracked ? theParameterSet.getParameterSetVector(name) : theParameterSet.getUntrackedParameterSetVector(name));
+
     // convert to Python11ParameterSets
     pybind11::list l;
-    for(std::vector<edm::ParameterSet>::const_iterator psetItr = v.begin(), psetItrEnd = v.end();
-	psetItr != psetItrEnd; ++psetItr)
-      {
-	l.append(Python11ParameterSet(*psetItr));
-      }
-    
+    for (std::vector<edm::ParameterSet>::const_iterator psetItr = v.begin(), psetItrEnd = v.end();
+         psetItr != psetItrEnd;
+         ++psetItr) {
+      l.append(Python11ParameterSet(*psetItr));
+    }
+
     return l;
   }
-  
-  
-  void  Python11ParameterSet::addNewFileInPath(bool tracked, std::string const & name, std::string const & value)
-  {
+
+  void Python11ParameterSet::addNewFileInPath(bool tracked, std::string const& name, std::string const& value) {
     addParameter(tracked, name, edm::FileInPath(value));
   }
-}
+}  // namespace cmspython3
diff --git a/FWCore/PyDevParameterSet/src/initializePyBind11Module.cc b/FWCore/PyDevParameterSet/src/initializePyBind11Module.cc
index a7aabd481e172..5a3272303fb96 100644
--- a/FWCore/PyDevParameterSet/src/initializePyBind11Module.cc
+++ b/FWCore/PyDevParameterSet/src/initializePyBind11Module.cc
@@ -2,7 +2,7 @@
 //
 // Package:     PyBind11ParameterSet
 // Class  :     initializePyBind11Module
-// 
+//
 
 #include "FWCore/PyDevParameterSet/src/initializePyBind11Module.h"
 #include "PyBind11Module.h"
@@ -10,10 +10,10 @@
 #include <iostream>
 
 namespace edm {
-   namespace python3 {
-      void initializePyBind11Module() {
-	 char *libFWCoreParameterSet = const_cast<char *>("libFWCorePyDevParameterSet");
-	 pybind11::module::import(libFWCoreParameterSet);
-      }
-   }
-}
+  namespace python3 {
+    void initializePyBind11Module() {
+      char *libFWCoreParameterSet = const_cast<char *>("libFWCorePyDevParameterSet");
+      pybind11::module::import(libFWCoreParameterSet);
+    }
+  }  // namespace python3
+}  // namespace edm
diff --git a/FWCore/PyDevParameterSet/src/initializePyBind11Module.h b/FWCore/PyDevParameterSet/src/initializePyBind11Module.h
index d3d231ad6efed..d6663fce5741e 100644
--- a/FWCore/PyDevParameterSet/src/initializePyBind11Module.h
+++ b/FWCore/PyDevParameterSet/src/initializePyBind11Module.h
@@ -7,10 +7,9 @@
 
 // forward declarations
 namespace edm {
-   namespace python3 {
-      void initializePyBind11Module();
-   }
-}
-
+  namespace python3 {
+    void initializePyBind11Module();
+  }
+}  // namespace edm
 
 #endif
diff --git a/FWCore/PyDevParameterSet/test/makeprocess_t.cppunit.cc b/FWCore/PyDevParameterSet/test/makeprocess_t.cppunit.cc
index 11569f63c1d51..7b15c59ff0312 100644
--- a/FWCore/PyDevParameterSet/test/makeprocess_t.cppunit.cc
+++ b/FWCore/PyDevParameterSet/test/makeprocess_t.cppunit.cc
@@ -21,22 +21,23 @@
 #include <algorithm>
 #include <set>
 
-class testmakeprocess: public CppUnit::TestFixture {
-CPPUNIT_TEST_SUITE(testmakeprocess);
-CPPUNIT_TEST(simpleProcessTest);
-CPPUNIT_TEST(usingTest);
-CPPUNIT_TEST(pathTest);
-CPPUNIT_TEST(moduleTest);
-CPPUNIT_TEST(emptyModuleTest);
-CPPUNIT_TEST(taskTest);
-CPPUNIT_TEST(taskTestWithEmptySchedule);
-CPPUNIT_TEST(taskTestWithSchedule);
-//CPPUNIT_TEST(windowsLineEndingTest);
-//CPPUNIT_TEST_EXCEPTION(emptyPsetTest,edm::Exception);
-CPPUNIT_TEST_SUITE_END();
+class testmakeprocess : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testmakeprocess);
+  CPPUNIT_TEST(simpleProcessTest);
+  CPPUNIT_TEST(usingTest);
+  CPPUNIT_TEST(pathTest);
+  CPPUNIT_TEST(moduleTest);
+  CPPUNIT_TEST(emptyModuleTest);
+  CPPUNIT_TEST(taskTest);
+  CPPUNIT_TEST(taskTestWithEmptySchedule);
+  CPPUNIT_TEST(taskTestWithSchedule);
+  //CPPUNIT_TEST(windowsLineEndingTest);
+  //CPPUNIT_TEST_EXCEPTION(emptyPsetTest,edm::Exception);
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
   void simpleProcessTest();
   void usingTest();
   void pathTest();
@@ -47,10 +48,8 @@ CPPUNIT_TEST_SUITE_END();
   void taskTestWithSchedule();
   //void windowsLineEndingTest();
 private:
-
   typedef std::shared_ptr<edm::ParameterSet> ParameterSetPtr;
   ParameterSetPtr pSet(char const* c) {
-
     //ParameterSetPtr result( new edm::ProcessDesc(std::string(c)) );
     ParameterSetPtr result = cmspython3::PyBind11ProcessDesc(std::string(c)).parameterSet();
     CPPUNIT_ASSERT(result->getParameter<std::string>("@process_name") == "test");
@@ -63,670 +62,493 @@ CPPUNIT_TEST_SUITE_END();
 CPPUNIT_TEST_SUITE_REGISTRATION(testmakeprocess);
 
 void testmakeprocess::simpleProcessTest() {
-   char const* kTest = "import FWCore.ParameterSet.Config as cms\n"
-                       "process = cms.Process('test')\n"
-                       "dummy =  cms.PSet(b = cms.bool(True))\n";
-   ParameterSetPtr test = pSet(kTest);
+  char const* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "dummy =  cms.PSet(b = cms.bool(True))\n";
+  ParameterSetPtr test = pSet(kTest);
 }
 
 void testmakeprocess::usingTest() {
-   char const* kTest =  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('test')\n"
-  "process.dummy = cms.PSet(\n"
-  "    b = cms.bool(True)\n"
-  ")\n"
-  "process.dummy2 = cms.PSet(\n"
-  "    d = cms.bool(True)\n"
-  ")\n"
-  "process.m1 = cms.EDFilter('Dummy',\n"
-  "    process.dummy\n"
-  ")\n"
-  "process.m2 = cms.EDFilter('Dummy2',\n"
-  "    process.dummy2\n"
-  ")\n"
-  "process.p = cms.Path(process.m1+process.m2)\n";
-
-   ParameterSetPtr test = pSet(kTest);
-
-   //CPPUNIT_ASSERT(test->getParameterSet("dummy").getBool("b") == true);
-   CPPUNIT_ASSERT(test->getParameterSet("m1").getParameter<bool>("b") == true);
-   CPPUNIT_ASSERT(test->getParameterSet("m2").getParameter<bool>("d") == true);
+  char const* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.dummy = cms.PSet(\n"
+      "    b = cms.bool(True)\n"
+      ")\n"
+      "process.dummy2 = cms.PSet(\n"
+      "    d = cms.bool(True)\n"
+      ")\n"
+      "process.m1 = cms.EDFilter('Dummy',\n"
+      "    process.dummy\n"
+      ")\n"
+      "process.m2 = cms.EDFilter('Dummy2',\n"
+      "    process.dummy2\n"
+      ")\n"
+      "process.p = cms.Path(process.m1+process.m2)\n";
+
+  ParameterSetPtr test = pSet(kTest);
+
+  //CPPUNIT_ASSERT(test->getParameterSet("dummy").getBool("b") == true);
+  CPPUNIT_ASSERT(test->getParameterSet("m1").getParameter<bool>("b") == true);
+  CPPUNIT_ASSERT(test->getParameterSet("m2").getParameter<bool>("d") == true);
 }
 
 void testmakeprocess::pathTest() {
-   char const* kTest =   "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('test')\n"
-  "process.cone5 = cms.EDFilter('PhonyConeJet',\n"
-  "    i = cms.int32(5)\n"
-  ")\n"
-  "process.cone7 = cms.EDFilter('PhonyConeJet',\n"
-  "    i = cms.int32(7)\n"
-  ")\n"
-  "process.jtanalyzer = cms.EDAnalyzer('jtanalyzer')\n"
-  "process.writer = cms.OutputModule('Writer')\n"
-  "process.cones = cms.Sequence(process.cone5*process.cone7)\n"
-  "process.term1 = cms.Path(process.cones+process.jtanalyzer)\n"
-  "process.atEnd = cms.EndPath(process.writer)\n";
-
-
-   ParameterSetPtr test = pSet(kTest);
-   //CPPUNIT_ASSERT(test->pathFragments().size() == 5);
-
-   edm::ParameterSet& myparams = *(test);
-   myparams.registerIt();
-   std::string rep = myparams.toString();
-   edm::ParameterSet copy(rep);
-   CPPUNIT_ASSERT(copy == myparams);
+  char const* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.cone5 = cms.EDFilter('PhonyConeJet',\n"
+      "    i = cms.int32(5)\n"
+      ")\n"
+      "process.cone7 = cms.EDFilter('PhonyConeJet',\n"
+      "    i = cms.int32(7)\n"
+      ")\n"
+      "process.jtanalyzer = cms.EDAnalyzer('jtanalyzer')\n"
+      "process.writer = cms.OutputModule('Writer')\n"
+      "process.cones = cms.Sequence(process.cone5*process.cone7)\n"
+      "process.term1 = cms.Path(process.cones+process.jtanalyzer)\n"
+      "process.atEnd = cms.EndPath(process.writer)\n";
+
+  ParameterSetPtr test = pSet(kTest);
+  //CPPUNIT_ASSERT(test->pathFragments().size() == 5);
+
+  edm::ParameterSet& myparams = *(test);
+  myparams.registerIt();
+  std::string rep = myparams.toString();
+  edm::ParameterSet copy(rep);
+  CPPUNIT_ASSERT(copy == myparams);
 }
 
-
 edm::ParameterSet modulePSet(std::string const& iLabel, std::string const& iType, std::string const& iCppType) {
-   edm::ParameterSet temp;
-   temp.addParameter("s", 1);
-   temp.addParameter("@module_label", iLabel);
-   temp.addParameter("@module_type", iType);
-   temp.addParameter("@module_edm_type", iCppType);
-   return temp;
+  edm::ParameterSet temp;
+  temp.addParameter("s", 1);
+  temp.addParameter("@module_label", iLabel);
+  temp.addParameter("@module_type", iType);
+  temp.addParameter("@module_edm_type", iCppType);
+  return temp;
 }
 
 void testmakeprocess::moduleTest() {
-   char const* kTest =  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('test')\n"
-  "process.cones = cms.EDFilter('Module',\n"
-  "    s = cms.int32(1)\n"
-  ")\n"
-  "process.NoLabelModule = cms.ESProducer('NoLabelModule',\n"
-  "    s = cms.int32(1)\n"
-  ")\n"
-  "process.labeled = cms.ESProducer('LabelModule',\n"
-  "    s = cms.int32(1)\n"
-  ")\n"
-  "process.source = cms.Source('InputSource',\n"
-  "    s = cms.int32(1)\n"
-  ")\n"
-  "process.NoLabelRetriever = cms.ESSource('NoLabelRetriever',\n"
-  "    s = cms.int32(1)\n"
-  ")\n"
-  "process.label = cms.ESSource('LabelRetriever',\n"
-  "    s = cms.int32(1)\n"
-  ")\n"
-  "process.p = cms.Path(process.cones)\n";
-
-
-   ParameterSetPtr test = pSet(kTest);
-
-   static edm::ParameterSet const kEmpty;
-   edm::ParameterSet const kCone(modulePSet("cones", "Module","EDFilter"));
-   std::ostringstream out;
-   out << kCone.toString() << std::endl;
-   out << test->getParameterSet("cones").toString() << std::endl;
-
-   edm::ParameterSet const kMainInput(modulePSet("@main_input","InputSource","Source"));
-
-   edm::ParameterSet const kNoLabelModule(modulePSet("", "NoLabelModule","ESProducer"));
-   edm::ParameterSet const kLabelModule(modulePSet("labeled", "LabelModule","ESProducer"));
-   edm::ParameterSet const kNoLabelRetriever(modulePSet("", "NoLabelRetriever","ESSource"));
-   edm::ParameterSet const kLabelRetriever(modulePSet("label", "LabelRetriever","ESSource"));
-
-   CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("cones")));
-   CPPUNIT_ASSERT(kCone == test->getParameterSet("cones"));
-
-   CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("@main_input")));
-   CPPUNIT_ASSERT(kMainInput == (test->getParameterSet("@main_input")));
-
-   CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("NoLabelModule@")));
-   CPPUNIT_ASSERT(kNoLabelModule == test->getParameterSet("NoLabelModule@"));
-
-   CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("LabelModule@labeled")));
-   CPPUNIT_ASSERT(kLabelModule == test->getParameterSet("LabelModule@labeled"));
-
-   CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("NoLabelRetriever@")));
-   CPPUNIT_ASSERT(kNoLabelRetriever == test->getParameterSet("NoLabelRetriever@"));
-
-   CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("LabelRetriever@label")));
-   CPPUNIT_ASSERT(kLabelRetriever == test->getParameterSet("LabelRetriever@label"));
+  char const* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.cones = cms.EDFilter('Module',\n"
+      "    s = cms.int32(1)\n"
+      ")\n"
+      "process.NoLabelModule = cms.ESProducer('NoLabelModule',\n"
+      "    s = cms.int32(1)\n"
+      ")\n"
+      "process.labeled = cms.ESProducer('LabelModule',\n"
+      "    s = cms.int32(1)\n"
+      ")\n"
+      "process.source = cms.Source('InputSource',\n"
+      "    s = cms.int32(1)\n"
+      ")\n"
+      "process.NoLabelRetriever = cms.ESSource('NoLabelRetriever',\n"
+      "    s = cms.int32(1)\n"
+      ")\n"
+      "process.label = cms.ESSource('LabelRetriever',\n"
+      "    s = cms.int32(1)\n"
+      ")\n"
+      "process.p = cms.Path(process.cones)\n";
+
+  ParameterSetPtr test = pSet(kTest);
+
+  static edm::ParameterSet const kEmpty;
+  edm::ParameterSet const kCone(modulePSet("cones", "Module", "EDFilter"));
+  std::ostringstream out;
+  out << kCone.toString() << std::endl;
+  out << test->getParameterSet("cones").toString() << std::endl;
+
+  edm::ParameterSet const kMainInput(modulePSet("@main_input", "InputSource", "Source"));
+
+  edm::ParameterSet const kNoLabelModule(modulePSet("", "NoLabelModule", "ESProducer"));
+  edm::ParameterSet const kLabelModule(modulePSet("labeled", "LabelModule", "ESProducer"));
+  edm::ParameterSet const kNoLabelRetriever(modulePSet("", "NoLabelRetriever", "ESSource"));
+  edm::ParameterSet const kLabelRetriever(modulePSet("label", "LabelRetriever", "ESSource"));
+
+  CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("cones")));
+  CPPUNIT_ASSERT(kCone == test->getParameterSet("cones"));
+
+  CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("@main_input")));
+  CPPUNIT_ASSERT(kMainInput == (test->getParameterSet("@main_input")));
+
+  CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("NoLabelModule@")));
+  CPPUNIT_ASSERT(kNoLabelModule == test->getParameterSet("NoLabelModule@"));
+
+  CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("LabelModule@labeled")));
+  CPPUNIT_ASSERT(kLabelModule == test->getParameterSet("LabelModule@labeled"));
+
+  CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("NoLabelRetriever@")));
+  CPPUNIT_ASSERT(kNoLabelRetriever == test->getParameterSet("NoLabelRetriever@"));
+
+  CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("LabelRetriever@label")));
+  CPPUNIT_ASSERT(kLabelRetriever == test->getParameterSet("LabelRetriever@label"));
 }
 
 void testmakeprocess::emptyModuleTest() {
-   char const* kTest =
-  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('test')\n"
-  "process.thing = cms.EDFilter('XX')\n"
-  "process.p = cms.Path(process.thing)\n";
-
-   ParameterSetPtr test = pSet(kTest);
-
-   edm::ParameterSet& myparams = *(test);
-   myparams.registerIt();
-   std::string rep = myparams.toString();
-   edm::ParameterSet copy(rep);
-   CPPUNIT_ASSERT(copy == myparams);
+  char const* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.thing = cms.EDFilter('XX')\n"
+      "process.p = cms.Path(process.thing)\n";
+
+  ParameterSetPtr test = pSet(kTest);
+
+  edm::ParameterSet& myparams = *(test);
+  myparams.registerIt();
+  std::string rep = myparams.toString();
+  edm::ParameterSet copy(rep);
+  CPPUNIT_ASSERT(copy == myparams);
 }
 
 void testmakeprocess::taskTest() {
-   char const* kTest =  "import FWCore.ParameterSet.Config as cms\n"
-   "process = cms.Process('test')\n"
-   "process.load(\"FWCore.PyDevParameterSet.test.testTask_cff\")\n"
-   "t10 = cms.Task(process.m29, process.m30, process.f29, process.f30,"
-                   "process.ess27, process.ess28, process.esp27, process.esp28,"
-                   "process.serv27, process.serv28)\n";
-
-   ParameterSetPtr test = pSet(kTest);
-
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("m1") &&
-                  !test->existsAs<edm::ParameterSet>("m2") &&
-                  test->existsAs<edm::ParameterSet>("m3") &&
-                  test->existsAs<edm::ParameterSet>("m4") &&
-                  test->existsAs<edm::ParameterSet>("m5") &&
-                  test->existsAs<edm::ParameterSet>("m6") &&
-                  test->existsAs<edm::ParameterSet>("m7") &&
-                  test->existsAs<edm::ParameterSet>("m8") &&
-                  test->existsAs<edm::ParameterSet>("m9") &&
-                  test->existsAs<edm::ParameterSet>("m10") &&
-                  test->existsAs<edm::ParameterSet>("m11") &&
-                  test->existsAs<edm::ParameterSet>("m12") &&
-                  test->existsAs<edm::ParameterSet>("m13") &&
-                  test->existsAs<edm::ParameterSet>("m14") &&
-                  test->existsAs<edm::ParameterSet>("m15") &&
-                  test->existsAs<edm::ParameterSet>("m16") &&
-                  test->existsAs<edm::ParameterSet>("m17") &&
-                  test->existsAs<edm::ParameterSet>("m18") &&
-                  test->existsAs<edm::ParameterSet>("m19") &&
-                  test->existsAs<edm::ParameterSet>("m20") &&
-                  test->existsAs<edm::ParameterSet>("m21") &&
-                  test->existsAs<edm::ParameterSet>("m22") &&
-                  test->existsAs<edm::ParameterSet>("m23") &&
-                  test->existsAs<edm::ParameterSet>("m24") &&
-                  test->existsAs<edm::ParameterSet>("m25") &&
-                  test->existsAs<edm::ParameterSet>("m26") &&
-                  !test->existsAs<edm::ParameterSet>("m27") &&
-                  !test->existsAs<edm::ParameterSet>("m28") &&
-                  !test->existsAs<edm::ParameterSet>("m29") &&
-                  !test->existsAs<edm::ParameterSet>("m30"));
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("f1") &&
-                  !test->existsAs<edm::ParameterSet>("f2") &&
-                  test->existsAs<edm::ParameterSet>("f3") &&
-                  test->existsAs<edm::ParameterSet>("f4") &&
-                  test->existsAs<edm::ParameterSet>("f5") &&
-                  test->existsAs<edm::ParameterSet>("f6") &&
-                  test->existsAs<edm::ParameterSet>("f7") &&
-                  test->existsAs<edm::ParameterSet>("f8") &&
-                  test->existsAs<edm::ParameterSet>("f9") &&
-                  test->existsAs<edm::ParameterSet>("f10") &&
-                  test->existsAs<edm::ParameterSet>("f11") &&
-                  test->existsAs<edm::ParameterSet>("f12") &&
-                  test->existsAs<edm::ParameterSet>("f13") &&
-                  test->existsAs<edm::ParameterSet>("f14") &&
-                  test->existsAs<edm::ParameterSet>("f15") &&
-                  test->existsAs<edm::ParameterSet>("f16") &&
-                  test->existsAs<edm::ParameterSet>("f17") &&
-                  test->existsAs<edm::ParameterSet>("f18") &&
-                  test->existsAs<edm::ParameterSet>("f19") &&
-                  test->existsAs<edm::ParameterSet>("f20") &&
-                  test->existsAs<edm::ParameterSet>("f21") &&
-                  test->existsAs<edm::ParameterSet>("f22") &&
-                  test->existsAs<edm::ParameterSet>("f23") &&
-                  test->existsAs<edm::ParameterSet>("f24") &&
-                  test->existsAs<edm::ParameterSet>("f25") &&
-                  test->existsAs<edm::ParameterSet>("f26") &&
-                  !test->existsAs<edm::ParameterSet>("f27") &&
-                  !test->existsAs<edm::ParameterSet>("f28") &&
-                  !test->existsAs<edm::ParameterSet>("f29") &&
-                  !test->existsAs<edm::ParameterSet>("f30"));
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("a1") &&
-                  !test->existsAs<edm::ParameterSet>("a2") &&
-                  test->existsAs<edm::ParameterSet>("a3") &&
-                  test->existsAs<edm::ParameterSet>("a4") &&
-                  test->existsAs<edm::ParameterSet>("a5") &&
-                  test->existsAs<edm::ParameterSet>("a6") &&
-                  test->existsAs<edm::ParameterSet>("a7") &&
-                  test->existsAs<edm::ParameterSet>("a8") &&
-                  test->existsAs<edm::ParameterSet>("a9") &&
-                  test->existsAs<edm::ParameterSet>("a10"));
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("o1") &&
-                  !test->existsAs<edm::ParameterSet>("o2") &&
-                  test->existsAs<edm::ParameterSet>("o7") &&
-                  test->existsAs<edm::ParameterSet>("o8") &&
-                  test->existsAs<edm::ParameterSet>("o9") &&
-                  test->existsAs<edm::ParameterSet>("o10"));
-
-   CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("ess@ess1") &&
-                  test->existsAs<edm::ParameterSet>("ess2@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess3") &&
-                  !test->existsAs<edm::ParameterSet>("ess4@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess11") &&
-                  test->existsAs<edm::ParameterSet>("ess12@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess13") &&
-                  test->existsAs<edm::ParameterSet>("ess14@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess15") &&
-                  test->existsAs<edm::ParameterSet>("ess16@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess17") &&
-                  test->existsAs<edm::ParameterSet>("ess18@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess19") &&
-                  test->existsAs<edm::ParameterSet>("ess20@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess21") &&
-                  test->existsAs<edm::ParameterSet>("ess22@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess23") &&
-                  test->existsAs<edm::ParameterSet>("ess24@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess25") &&
-                  test->existsAs<edm::ParameterSet>("ess26@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess27") &&
-                  test->existsAs<edm::ParameterSet>("ess28@"));
-
-   CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("esp@esp1") &&
-                  test->existsAs<edm::ParameterSet>("esp2@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp3") &&
-                  !test->existsAs<edm::ParameterSet>("esp4@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp11") &&
-                  test->existsAs<edm::ParameterSet>("esp12@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp13") &&
-                  test->existsAs<edm::ParameterSet>("esp14@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp15") &&
-                  test->existsAs<edm::ParameterSet>("esp16@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp17") &&
-                  test->existsAs<edm::ParameterSet>("esp18@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp19") &&
-                  test->existsAs<edm::ParameterSet>("esp20@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp21") &&
-                  test->existsAs<edm::ParameterSet>("esp22@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp23") &&
-                  test->existsAs<edm::ParameterSet>("esp24@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp25") &&
-                  test->existsAs<edm::ParameterSet>("esp26@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp27") &&
-                  test->existsAs<edm::ParameterSet>("esp28@"));
-
-   std::vector<edm::ParameterSet> const& vpsetServices = test->getUntrackedParameterSetVector("services");
-   // Note that the vector<ParameterSet> is not sorted. The order
-   // depends on the order of a python iteration through a dictionary
-   // which could be anything.
-   std::set<std::string> serviceNames;
-   for (auto const& pset : vpsetServices) {
-     serviceNames.insert(pset.getParameter<std::string>("@service_type"));
-   }
-   std::vector<std::string> expectedServiceNames;
-   expectedServiceNames.emplace_back("serv1");
-   expectedServiceNames.emplace_back("serv2");
-   expectedServiceNames.emplace_back("serv11");
-   expectedServiceNames.emplace_back("serv12");
-   expectedServiceNames.emplace_back("serv13");
-   expectedServiceNames.emplace_back("serv14");
-   expectedServiceNames.emplace_back("serv15");
-   expectedServiceNames.emplace_back("serv16");
-   expectedServiceNames.emplace_back("serv17");
-   expectedServiceNames.emplace_back("serv18");
-   expectedServiceNames.emplace_back("serv19");
-   expectedServiceNames.emplace_back("serv20");
-   expectedServiceNames.emplace_back("serv21");
-   expectedServiceNames.emplace_back("serv22");
-   expectedServiceNames.emplace_back("serv23");
-   expectedServiceNames.emplace_back("serv24");
-   expectedServiceNames.emplace_back("serv25");
-   expectedServiceNames.emplace_back("serv26");
-   expectedServiceNames.emplace_back("serv27");
-   expectedServiceNames.emplace_back("serv28");
-   bool result = true;
-   for (auto const& name : expectedServiceNames) {
-     if (serviceNames.find(name) == serviceNames.end()) {
-       result = false;
-     }
-   }
-   if (serviceNames.size() != expectedServiceNames.size()) {
-     result = false;
-   }
-   CPPUNIT_ASSERT(result);
+  char const* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.load(\"FWCore.PyDevParameterSet.test.testTask_cff\")\n"
+      "t10 = cms.Task(process.m29, process.m30, process.f29, process.f30,"
+      "process.ess27, process.ess28, process.esp27, process.esp28,"
+      "process.serv27, process.serv28)\n";
+
+  ParameterSetPtr test = pSet(kTest);
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("m1") && !test->existsAs<edm::ParameterSet>("m2") &&
+                 test->existsAs<edm::ParameterSet>("m3") && test->existsAs<edm::ParameterSet>("m4") &&
+                 test->existsAs<edm::ParameterSet>("m5") && test->existsAs<edm::ParameterSet>("m6") &&
+                 test->existsAs<edm::ParameterSet>("m7") && test->existsAs<edm::ParameterSet>("m8") &&
+                 test->existsAs<edm::ParameterSet>("m9") && test->existsAs<edm::ParameterSet>("m10") &&
+                 test->existsAs<edm::ParameterSet>("m11") && test->existsAs<edm::ParameterSet>("m12") &&
+                 test->existsAs<edm::ParameterSet>("m13") && test->existsAs<edm::ParameterSet>("m14") &&
+                 test->existsAs<edm::ParameterSet>("m15") && test->existsAs<edm::ParameterSet>("m16") &&
+                 test->existsAs<edm::ParameterSet>("m17") && test->existsAs<edm::ParameterSet>("m18") &&
+                 test->existsAs<edm::ParameterSet>("m19") && test->existsAs<edm::ParameterSet>("m20") &&
+                 test->existsAs<edm::ParameterSet>("m21") && test->existsAs<edm::ParameterSet>("m22") &&
+                 test->existsAs<edm::ParameterSet>("m23") && test->existsAs<edm::ParameterSet>("m24") &&
+                 test->existsAs<edm::ParameterSet>("m25") && test->existsAs<edm::ParameterSet>("m26") &&
+                 !test->existsAs<edm::ParameterSet>("m27") && !test->existsAs<edm::ParameterSet>("m28") &&
+                 !test->existsAs<edm::ParameterSet>("m29") && !test->existsAs<edm::ParameterSet>("m30"));
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("f1") && !test->existsAs<edm::ParameterSet>("f2") &&
+                 test->existsAs<edm::ParameterSet>("f3") && test->existsAs<edm::ParameterSet>("f4") &&
+                 test->existsAs<edm::ParameterSet>("f5") && test->existsAs<edm::ParameterSet>("f6") &&
+                 test->existsAs<edm::ParameterSet>("f7") && test->existsAs<edm::ParameterSet>("f8") &&
+                 test->existsAs<edm::ParameterSet>("f9") && test->existsAs<edm::ParameterSet>("f10") &&
+                 test->existsAs<edm::ParameterSet>("f11") && test->existsAs<edm::ParameterSet>("f12") &&
+                 test->existsAs<edm::ParameterSet>("f13") && test->existsAs<edm::ParameterSet>("f14") &&
+                 test->existsAs<edm::ParameterSet>("f15") && test->existsAs<edm::ParameterSet>("f16") &&
+                 test->existsAs<edm::ParameterSet>("f17") && test->existsAs<edm::ParameterSet>("f18") &&
+                 test->existsAs<edm::ParameterSet>("f19") && test->existsAs<edm::ParameterSet>("f20") &&
+                 test->existsAs<edm::ParameterSet>("f21") && test->existsAs<edm::ParameterSet>("f22") &&
+                 test->existsAs<edm::ParameterSet>("f23") && test->existsAs<edm::ParameterSet>("f24") &&
+                 test->existsAs<edm::ParameterSet>("f25") && test->existsAs<edm::ParameterSet>("f26") &&
+                 !test->existsAs<edm::ParameterSet>("f27") && !test->existsAs<edm::ParameterSet>("f28") &&
+                 !test->existsAs<edm::ParameterSet>("f29") && !test->existsAs<edm::ParameterSet>("f30"));
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("a1") && !test->existsAs<edm::ParameterSet>("a2") &&
+                 test->existsAs<edm::ParameterSet>("a3") && test->existsAs<edm::ParameterSet>("a4") &&
+                 test->existsAs<edm::ParameterSet>("a5") && test->existsAs<edm::ParameterSet>("a6") &&
+                 test->existsAs<edm::ParameterSet>("a7") && test->existsAs<edm::ParameterSet>("a8") &&
+                 test->existsAs<edm::ParameterSet>("a9") && test->existsAs<edm::ParameterSet>("a10"));
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("o1") && !test->existsAs<edm::ParameterSet>("o2") &&
+                 test->existsAs<edm::ParameterSet>("o7") && test->existsAs<edm::ParameterSet>("o8") &&
+                 test->existsAs<edm::ParameterSet>("o9") && test->existsAs<edm::ParameterSet>("o10"));
+
+  CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("ess@ess1") && test->existsAs<edm::ParameterSet>("ess2@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess3") && !test->existsAs<edm::ParameterSet>("ess4@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess11") && test->existsAs<edm::ParameterSet>("ess12@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess13") && test->existsAs<edm::ParameterSet>("ess14@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess15") && test->existsAs<edm::ParameterSet>("ess16@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess17") && test->existsAs<edm::ParameterSet>("ess18@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess19") && test->existsAs<edm::ParameterSet>("ess20@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess21") && test->existsAs<edm::ParameterSet>("ess22@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess23") && test->existsAs<edm::ParameterSet>("ess24@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess25") && test->existsAs<edm::ParameterSet>("ess26@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess27") && test->existsAs<edm::ParameterSet>("ess28@"));
+
+  CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("esp@esp1") && test->existsAs<edm::ParameterSet>("esp2@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp3") && !test->existsAs<edm::ParameterSet>("esp4@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp11") && test->existsAs<edm::ParameterSet>("esp12@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp13") && test->existsAs<edm::ParameterSet>("esp14@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp15") && test->existsAs<edm::ParameterSet>("esp16@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp17") && test->existsAs<edm::ParameterSet>("esp18@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp19") && test->existsAs<edm::ParameterSet>("esp20@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp21") && test->existsAs<edm::ParameterSet>("esp22@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp23") && test->existsAs<edm::ParameterSet>("esp24@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp25") && test->existsAs<edm::ParameterSet>("esp26@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp27") && test->existsAs<edm::ParameterSet>("esp28@"));
+
+  std::vector<edm::ParameterSet> const& vpsetServices = test->getUntrackedParameterSetVector("services");
+  // Note that the vector<ParameterSet> is not sorted. The order
+  // depends on the order of a python iteration through a dictionary
+  // which could be anything.
+  std::set<std::string> serviceNames;
+  for (auto const& pset : vpsetServices) {
+    serviceNames.insert(pset.getParameter<std::string>("@service_type"));
+  }
+  std::vector<std::string> expectedServiceNames;
+  expectedServiceNames.emplace_back("serv1");
+  expectedServiceNames.emplace_back("serv2");
+  expectedServiceNames.emplace_back("serv11");
+  expectedServiceNames.emplace_back("serv12");
+  expectedServiceNames.emplace_back("serv13");
+  expectedServiceNames.emplace_back("serv14");
+  expectedServiceNames.emplace_back("serv15");
+  expectedServiceNames.emplace_back("serv16");
+  expectedServiceNames.emplace_back("serv17");
+  expectedServiceNames.emplace_back("serv18");
+  expectedServiceNames.emplace_back("serv19");
+  expectedServiceNames.emplace_back("serv20");
+  expectedServiceNames.emplace_back("serv21");
+  expectedServiceNames.emplace_back("serv22");
+  expectedServiceNames.emplace_back("serv23");
+  expectedServiceNames.emplace_back("serv24");
+  expectedServiceNames.emplace_back("serv25");
+  expectedServiceNames.emplace_back("serv26");
+  expectedServiceNames.emplace_back("serv27");
+  expectedServiceNames.emplace_back("serv28");
+  bool result = true;
+  for (auto const& name : expectedServiceNames) {
+    if (serviceNames.find(name) == serviceNames.end()) {
+      result = false;
+    }
+  }
+  if (serviceNames.size() != expectedServiceNames.size()) {
+    result = false;
+  }
+  CPPUNIT_ASSERT(result);
 }
 
 void testmakeprocess::taskTestWithEmptySchedule() {
-   char const* kTest =  "import FWCore.ParameterSet.Config as cms\n"
-   "process = cms.Process('test')\n"
-   "process.load(\"FWCore.PyDevParameterSet.test.testTask_cff\")\n"
-   "t10 = cms.Task(process.m29, process.m30, process.f29, process.f30,"
-                   "process.ess27, process.ess28, process.esp27, process.esp28,"
-                   "process.serv27, process.serv28)\n"
-   "process.schedule = cms.Schedule()\n";
-
-   ParameterSetPtr test = pSet(kTest);
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("m1") &&
-                  !test->existsAs<edm::ParameterSet>("m2") &&
-                  !test->existsAs<edm::ParameterSet>("m3") &&
-                  !test->existsAs<edm::ParameterSet>("m4") &&
-                  !test->existsAs<edm::ParameterSet>("m5") &&
-                  !test->existsAs<edm::ParameterSet>("m6") &&
-                  !test->existsAs<edm::ParameterSet>("m7") &&
-                  !test->existsAs<edm::ParameterSet>("m8") &&
-                  !test->existsAs<edm::ParameterSet>("m9") &&
-                  !test->existsAs<edm::ParameterSet>("m10") &&
-                  !test->existsAs<edm::ParameterSet>("m11") &&
-                  !test->existsAs<edm::ParameterSet>("m12") &&
-                  !test->existsAs<edm::ParameterSet>("m13") &&
-                  !test->existsAs<edm::ParameterSet>("m14") &&
-                  !test->existsAs<edm::ParameterSet>("m15") &&
-                  !test->existsAs<edm::ParameterSet>("m16") &&
-                  !test->existsAs<edm::ParameterSet>("m17") &&
-                  !test->existsAs<edm::ParameterSet>("m18") &&
-                  !test->existsAs<edm::ParameterSet>("m19") &&
-                  !test->existsAs<edm::ParameterSet>("m20") &&
-                  !test->existsAs<edm::ParameterSet>("m21") &&
-                  !test->existsAs<edm::ParameterSet>("m22") &&
-                  !test->existsAs<edm::ParameterSet>("m23") &&
-                  !test->existsAs<edm::ParameterSet>("m24") &&
-                  !test->existsAs<edm::ParameterSet>("m25") &&
-                  !test->existsAs<edm::ParameterSet>("m26") &&
-                  !test->existsAs<edm::ParameterSet>("m27") &&
-                  !test->existsAs<edm::ParameterSet>("m28") &&
-                  !test->existsAs<edm::ParameterSet>("m29") &&
-                  !test->existsAs<edm::ParameterSet>("m30"));
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("f1") &&
-                  !test->existsAs<edm::ParameterSet>("f2") &&
-                  !test->existsAs<edm::ParameterSet>("f3") &&
-                  !test->existsAs<edm::ParameterSet>("f4") &&
-                  !test->existsAs<edm::ParameterSet>("f5") &&
-                  !test->existsAs<edm::ParameterSet>("f6") &&
-                  !test->existsAs<edm::ParameterSet>("f7") &&
-                  !test->existsAs<edm::ParameterSet>("f8") &&
-                  !test->existsAs<edm::ParameterSet>("f9") &&
-                  !test->existsAs<edm::ParameterSet>("f10") &&
-                  !test->existsAs<edm::ParameterSet>("f11") &&
-                  !test->existsAs<edm::ParameterSet>("f12") &&
-                  !test->existsAs<edm::ParameterSet>("f13") &&
-                  !test->existsAs<edm::ParameterSet>("f14") &&
-                  !test->existsAs<edm::ParameterSet>("f15") &&
-                  !test->existsAs<edm::ParameterSet>("f16") &&
-                  !test->existsAs<edm::ParameterSet>("f17") &&
-                  !test->existsAs<edm::ParameterSet>("f18") &&
-                  !test->existsAs<edm::ParameterSet>("f19") &&
-                  !test->existsAs<edm::ParameterSet>("f20") &&
-                  !test->existsAs<edm::ParameterSet>("f21") &&
-                  !test->existsAs<edm::ParameterSet>("f22") &&
-                  !test->existsAs<edm::ParameterSet>("f23") &&
-                  !test->existsAs<edm::ParameterSet>("f24") &&
-                  !test->existsAs<edm::ParameterSet>("f25") &&
-                  !test->existsAs<edm::ParameterSet>("f26") &&
-                  !test->existsAs<edm::ParameterSet>("f27") &&
-                  !test->existsAs<edm::ParameterSet>("f28") &&
-                  !test->existsAs<edm::ParameterSet>("f29") &&
-                  !test->existsAs<edm::ParameterSet>("f30"));
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("a1") &&
-                  !test->existsAs<edm::ParameterSet>("a2") &&
-                  !test->existsAs<edm::ParameterSet>("a3") &&
-                  !test->existsAs<edm::ParameterSet>("a4") &&
-                  !test->existsAs<edm::ParameterSet>("a5") &&
-                  !test->existsAs<edm::ParameterSet>("a6") &&
-                  !test->existsAs<edm::ParameterSet>("a7") &&
-                  !test->existsAs<edm::ParameterSet>("a8") &&
-                  !test->existsAs<edm::ParameterSet>("a9") &&
-                  !test->existsAs<edm::ParameterSet>("a10"));
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("o1") &&
-                  !test->existsAs<edm::ParameterSet>("o2") &&
-                  !test->existsAs<edm::ParameterSet>("o7") &&
-                  !test->existsAs<edm::ParameterSet>("o8") &&
-                  !test->existsAs<edm::ParameterSet>("o9") &&
-                  !test->existsAs<edm::ParameterSet>("o10"));
-
-   CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("ess@ess1") &&
-                  test->existsAs<edm::ParameterSet>("ess2@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess3") &&
-                  !test->existsAs<edm::ParameterSet>("ess4@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess11") &&
-                  !test->existsAs<edm::ParameterSet>("ess12@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess13") &&
-                  !test->existsAs<edm::ParameterSet>("ess14@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess15") &&
-                  !test->existsAs<edm::ParameterSet>("ess16@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess17") &&
-                  !test->existsAs<edm::ParameterSet>("ess18@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess19") &&
-                  !test->existsAs<edm::ParameterSet>("ess20@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess21") &&
-                  !test->existsAs<edm::ParameterSet>("ess22@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess23") &&
-                  !test->existsAs<edm::ParameterSet>("ess24@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess25") &&
-                  !test->existsAs<edm::ParameterSet>("ess26@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess27") &&
-                  test->existsAs<edm::ParameterSet>("ess28@"));
-
-   CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("esp@esp1") &&
-                  test->existsAs<edm::ParameterSet>("esp2@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp3") &&
-                  !test->existsAs<edm::ParameterSet>("esp4@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp11") &&
-                  !test->existsAs<edm::ParameterSet>("esp12@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp13") &&
-                  !test->existsAs<edm::ParameterSet>("esp14@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp15") &&
-                  !test->existsAs<edm::ParameterSet>("esp16@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp17") &&
-                  !test->existsAs<edm::ParameterSet>("esp18@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp19") &&
-                  !test->existsAs<edm::ParameterSet>("esp20@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp21") &&
-                  !test->existsAs<edm::ParameterSet>("esp22@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp23") &&
-                  !test->existsAs<edm::ParameterSet>("esp24@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp25") &&
-                  !test->existsAs<edm::ParameterSet>("esp26@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp27") &&
-                  test->existsAs<edm::ParameterSet>("esp28@"));
-
-   std::vector<edm::ParameterSet> const& vpsetServices = test->getUntrackedParameterSetVector("services");
-   // Note that the vector<ParameterSet> is not sorted. The order
-   // depends on the order of a python iteration through a dictionary
-   // which could be anything.
-   std::set<std::string> serviceNames;
-   for (auto const& pset : vpsetServices) {
-     serviceNames.insert(pset.getParameter<std::string>("@service_type"));
-   }
-   std::vector<std::string> expectedServiceNames;
-   expectedServiceNames.emplace_back("serv1");
-   expectedServiceNames.emplace_back("serv2");
-   expectedServiceNames.emplace_back("serv27");
-   expectedServiceNames.emplace_back("serv28");
-   bool result = true;
-   for (auto const& name : expectedServiceNames) {
-     if (serviceNames.find(name) == serviceNames.end()) {
-       result = false;
-     }
-   }
-   if (serviceNames.size() != expectedServiceNames.size()) {
-     result = false;
-   }
-   CPPUNIT_ASSERT(result);
+  char const* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.load(\"FWCore.PyDevParameterSet.test.testTask_cff\")\n"
+      "t10 = cms.Task(process.m29, process.m30, process.f29, process.f30,"
+      "process.ess27, process.ess28, process.esp27, process.esp28,"
+      "process.serv27, process.serv28)\n"
+      "process.schedule = cms.Schedule()\n";
+
+  ParameterSetPtr test = pSet(kTest);
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("m1") && !test->existsAs<edm::ParameterSet>("m2") &&
+                 !test->existsAs<edm::ParameterSet>("m3") && !test->existsAs<edm::ParameterSet>("m4") &&
+                 !test->existsAs<edm::ParameterSet>("m5") && !test->existsAs<edm::ParameterSet>("m6") &&
+                 !test->existsAs<edm::ParameterSet>("m7") && !test->existsAs<edm::ParameterSet>("m8") &&
+                 !test->existsAs<edm::ParameterSet>("m9") && !test->existsAs<edm::ParameterSet>("m10") &&
+                 !test->existsAs<edm::ParameterSet>("m11") && !test->existsAs<edm::ParameterSet>("m12") &&
+                 !test->existsAs<edm::ParameterSet>("m13") && !test->existsAs<edm::ParameterSet>("m14") &&
+                 !test->existsAs<edm::ParameterSet>("m15") && !test->existsAs<edm::ParameterSet>("m16") &&
+                 !test->existsAs<edm::ParameterSet>("m17") && !test->existsAs<edm::ParameterSet>("m18") &&
+                 !test->existsAs<edm::ParameterSet>("m19") && !test->existsAs<edm::ParameterSet>("m20") &&
+                 !test->existsAs<edm::ParameterSet>("m21") && !test->existsAs<edm::ParameterSet>("m22") &&
+                 !test->existsAs<edm::ParameterSet>("m23") && !test->existsAs<edm::ParameterSet>("m24") &&
+                 !test->existsAs<edm::ParameterSet>("m25") && !test->existsAs<edm::ParameterSet>("m26") &&
+                 !test->existsAs<edm::ParameterSet>("m27") && !test->existsAs<edm::ParameterSet>("m28") &&
+                 !test->existsAs<edm::ParameterSet>("m29") && !test->existsAs<edm::ParameterSet>("m30"));
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("f1") && !test->existsAs<edm::ParameterSet>("f2") &&
+                 !test->existsAs<edm::ParameterSet>("f3") && !test->existsAs<edm::ParameterSet>("f4") &&
+                 !test->existsAs<edm::ParameterSet>("f5") && !test->existsAs<edm::ParameterSet>("f6") &&
+                 !test->existsAs<edm::ParameterSet>("f7") && !test->existsAs<edm::ParameterSet>("f8") &&
+                 !test->existsAs<edm::ParameterSet>("f9") && !test->existsAs<edm::ParameterSet>("f10") &&
+                 !test->existsAs<edm::ParameterSet>("f11") && !test->existsAs<edm::ParameterSet>("f12") &&
+                 !test->existsAs<edm::ParameterSet>("f13") && !test->existsAs<edm::ParameterSet>("f14") &&
+                 !test->existsAs<edm::ParameterSet>("f15") && !test->existsAs<edm::ParameterSet>("f16") &&
+                 !test->existsAs<edm::ParameterSet>("f17") && !test->existsAs<edm::ParameterSet>("f18") &&
+                 !test->existsAs<edm::ParameterSet>("f19") && !test->existsAs<edm::ParameterSet>("f20") &&
+                 !test->existsAs<edm::ParameterSet>("f21") && !test->existsAs<edm::ParameterSet>("f22") &&
+                 !test->existsAs<edm::ParameterSet>("f23") && !test->existsAs<edm::ParameterSet>("f24") &&
+                 !test->existsAs<edm::ParameterSet>("f25") && !test->existsAs<edm::ParameterSet>("f26") &&
+                 !test->existsAs<edm::ParameterSet>("f27") && !test->existsAs<edm::ParameterSet>("f28") &&
+                 !test->existsAs<edm::ParameterSet>("f29") && !test->existsAs<edm::ParameterSet>("f30"));
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("a1") && !test->existsAs<edm::ParameterSet>("a2") &&
+                 !test->existsAs<edm::ParameterSet>("a3") && !test->existsAs<edm::ParameterSet>("a4") &&
+                 !test->existsAs<edm::ParameterSet>("a5") && !test->existsAs<edm::ParameterSet>("a6") &&
+                 !test->existsAs<edm::ParameterSet>("a7") && !test->existsAs<edm::ParameterSet>("a8") &&
+                 !test->existsAs<edm::ParameterSet>("a9") && !test->existsAs<edm::ParameterSet>("a10"));
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("o1") && !test->existsAs<edm::ParameterSet>("o2") &&
+                 !test->existsAs<edm::ParameterSet>("o7") && !test->existsAs<edm::ParameterSet>("o8") &&
+                 !test->existsAs<edm::ParameterSet>("o9") && !test->existsAs<edm::ParameterSet>("o10"));
+
+  CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("ess@ess1") && test->existsAs<edm::ParameterSet>("ess2@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess3") && !test->existsAs<edm::ParameterSet>("ess4@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess11") && !test->existsAs<edm::ParameterSet>("ess12@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess13") && !test->existsAs<edm::ParameterSet>("ess14@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess15") && !test->existsAs<edm::ParameterSet>("ess16@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess17") && !test->existsAs<edm::ParameterSet>("ess18@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess19") && !test->existsAs<edm::ParameterSet>("ess20@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess21") && !test->existsAs<edm::ParameterSet>("ess22@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess23") && !test->existsAs<edm::ParameterSet>("ess24@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess25") && !test->existsAs<edm::ParameterSet>("ess26@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess27") && test->existsAs<edm::ParameterSet>("ess28@"));
+
+  CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("esp@esp1") && test->existsAs<edm::ParameterSet>("esp2@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp3") && !test->existsAs<edm::ParameterSet>("esp4@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp11") && !test->existsAs<edm::ParameterSet>("esp12@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp13") && !test->existsAs<edm::ParameterSet>("esp14@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp15") && !test->existsAs<edm::ParameterSet>("esp16@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp17") && !test->existsAs<edm::ParameterSet>("esp18@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp19") && !test->existsAs<edm::ParameterSet>("esp20@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp21") && !test->existsAs<edm::ParameterSet>("esp22@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp23") && !test->existsAs<edm::ParameterSet>("esp24@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp25") && !test->existsAs<edm::ParameterSet>("esp26@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp27") && test->existsAs<edm::ParameterSet>("esp28@"));
+
+  std::vector<edm::ParameterSet> const& vpsetServices = test->getUntrackedParameterSetVector("services");
+  // Note that the vector<ParameterSet> is not sorted. The order
+  // depends on the order of a python iteration through a dictionary
+  // which could be anything.
+  std::set<std::string> serviceNames;
+  for (auto const& pset : vpsetServices) {
+    serviceNames.insert(pset.getParameter<std::string>("@service_type"));
+  }
+  std::vector<std::string> expectedServiceNames;
+  expectedServiceNames.emplace_back("serv1");
+  expectedServiceNames.emplace_back("serv2");
+  expectedServiceNames.emplace_back("serv27");
+  expectedServiceNames.emplace_back("serv28");
+  bool result = true;
+  for (auto const& name : expectedServiceNames) {
+    if (serviceNames.find(name) == serviceNames.end()) {
+      result = false;
+    }
+  }
+  if (serviceNames.size() != expectedServiceNames.size()) {
+    result = false;
+  }
+  CPPUNIT_ASSERT(result);
 }
 
 void testmakeprocess::taskTestWithSchedule() {
-   char const* kTest =  "import FWCore.ParameterSet.Config as cms\n"
-   "process = cms.Process('test')\n"
-   "process.load(\"FWCore.PyDevParameterSet.test.testTask_cff\")\n"
-   "t10 = cms.Task(process.m29, process.m30, process.f29, process.f30,"
-                   "process.ess27, process.ess28, process.esp27, process.esp28,"
-                   "process.serv27, process.serv28)\n"
-   "process.schedule = cms.Schedule(process.p1, process.p2, process.e1, process.e2,"
-                                    "process.pf1, process.pf2, process.ef1, process.ef2,"
-                                    "process.pa1, process.pa2, process.ea1, process.ea2,"
-                                    "process.eo1, process.eo2, process.pess2, process.eess2,"
-                                    "process.pesp2, process.eesp2, process.pserv2, process.eserv2,"
-                                    "tasks=[process.t9, process.tf9, process.tess10,process.tesp10,"
-                                    "process.tserv10])\n";
-
-   ParameterSetPtr test = pSet(kTest);
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("m1") &&
-                  !test->existsAs<edm::ParameterSet>("m2") &&
-                  test->existsAs<edm::ParameterSet>("m3") &&
-                  test->existsAs<edm::ParameterSet>("m4") &&
-                  test->existsAs<edm::ParameterSet>("m5") &&
-                  test->existsAs<edm::ParameterSet>("m6") &&
-                  test->existsAs<edm::ParameterSet>("m7") &&
-                  test->existsAs<edm::ParameterSet>("m8") &&
-                  test->existsAs<edm::ParameterSet>("m9") &&
-                  test->existsAs<edm::ParameterSet>("m10") &&
-                  test->existsAs<edm::ParameterSet>("m11") &&
-                  test->existsAs<edm::ParameterSet>("m12") &&
-                  test->existsAs<edm::ParameterSet>("m13") &&
-                  test->existsAs<edm::ParameterSet>("m14") &&
-                  test->existsAs<edm::ParameterSet>("m15") &&
-                  test->existsAs<edm::ParameterSet>("m16") &&
-                  test->existsAs<edm::ParameterSet>("m17") &&
-                  test->existsAs<edm::ParameterSet>("m18") &&
-                  test->existsAs<edm::ParameterSet>("m19") &&
-                  test->existsAs<edm::ParameterSet>("m20") &&
-                  test->existsAs<edm::ParameterSet>("m21") &&
-                  test->existsAs<edm::ParameterSet>("m22") &&
-                  test->existsAs<edm::ParameterSet>("m23") &&
-                  test->existsAs<edm::ParameterSet>("m24") &&
-                  test->existsAs<edm::ParameterSet>("m25") &&
-                  test->existsAs<edm::ParameterSet>("m26") &&
-                  test->existsAs<edm::ParameterSet>("m27") &&
-                  test->existsAs<edm::ParameterSet>("m28") &&
-                  !test->existsAs<edm::ParameterSet>("m29") &&
-                  !test->existsAs<edm::ParameterSet>("m30"));
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("f1") &&
-                  !test->existsAs<edm::ParameterSet>("f2") &&
-                  test->existsAs<edm::ParameterSet>("f3") &&
-                  test->existsAs<edm::ParameterSet>("f4") &&
-                  test->existsAs<edm::ParameterSet>("f5") &&
-                  test->existsAs<edm::ParameterSet>("f6") &&
-                  test->existsAs<edm::ParameterSet>("f7") &&
-                  test->existsAs<edm::ParameterSet>("f8") &&
-                  test->existsAs<edm::ParameterSet>("f9") &&
-                  test->existsAs<edm::ParameterSet>("f10") &&
-                  test->existsAs<edm::ParameterSet>("f11") &&
-                  test->existsAs<edm::ParameterSet>("f12") &&
-                  test->existsAs<edm::ParameterSet>("f13") &&
-                  test->existsAs<edm::ParameterSet>("f14") &&
-                  test->existsAs<edm::ParameterSet>("f15") &&
-                  test->existsAs<edm::ParameterSet>("f16") &&
-                  test->existsAs<edm::ParameterSet>("f17") &&
-                  test->existsAs<edm::ParameterSet>("f18") &&
-                  test->existsAs<edm::ParameterSet>("f19") &&
-                  test->existsAs<edm::ParameterSet>("f20") &&
-                  test->existsAs<edm::ParameterSet>("f21") &&
-                  test->existsAs<edm::ParameterSet>("f22") &&
-                  test->existsAs<edm::ParameterSet>("f23") &&
-                  test->existsAs<edm::ParameterSet>("f24") &&
-                  test->existsAs<edm::ParameterSet>("f25") &&
-                  test->existsAs<edm::ParameterSet>("f26") &&
-                  test->existsAs<edm::ParameterSet>("f27") &&
-                  test->existsAs<edm::ParameterSet>("f28") &&
-                  !test->existsAs<edm::ParameterSet>("f29") &&
-                  !test->existsAs<edm::ParameterSet>("f30"));
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("a1") &&
-                  !test->existsAs<edm::ParameterSet>("a2") &&
-                  test->existsAs<edm::ParameterSet>("a3") &&
-                  test->existsAs<edm::ParameterSet>("a4") &&
-                  test->existsAs<edm::ParameterSet>("a5") &&
-                  test->existsAs<edm::ParameterSet>("a6") &&
-                  test->existsAs<edm::ParameterSet>("a7") &&
-                  test->existsAs<edm::ParameterSet>("a8") &&
-                  test->existsAs<edm::ParameterSet>("a9") &&
-                  test->existsAs<edm::ParameterSet>("a10"));
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("o1") &&
-                  !test->existsAs<edm::ParameterSet>("o2") &&
-                  test->existsAs<edm::ParameterSet>("o7") &&
-                  test->existsAs<edm::ParameterSet>("o8") &&
-                  test->existsAs<edm::ParameterSet>("o9") &&
-                  test->existsAs<edm::ParameterSet>("o10"));
-
-   CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("ess@ess1") &&
-                  test->existsAs<edm::ParameterSet>("ess2@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess3") &&
-                  test->existsAs<edm::ParameterSet>("ess4@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess11") &&
-                  test->existsAs<edm::ParameterSet>("ess12@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess13") &&
-                  test->existsAs<edm::ParameterSet>("ess14@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess15") &&
-                  test->existsAs<edm::ParameterSet>("ess16@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess17") &&
-                  test->existsAs<edm::ParameterSet>("ess18@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess19") &&
-                  test->existsAs<edm::ParameterSet>("ess20@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess21") &&
-                  test->existsAs<edm::ParameterSet>("ess22@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess23") &&
-                  test->existsAs<edm::ParameterSet>("ess24@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess25") &&
-                  test->existsAs<edm::ParameterSet>("ess26@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess27") &&
-                  test->existsAs<edm::ParameterSet>("ess28@"));
-
-   CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("esp@esp1") &&
-                  test->existsAs<edm::ParameterSet>("esp2@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp3") &&
-                  test->existsAs<edm::ParameterSet>("esp4@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp11") &&
-                  test->existsAs<edm::ParameterSet>("esp12@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp13") &&
-                  test->existsAs<edm::ParameterSet>("esp14@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp15") &&
-                  test->existsAs<edm::ParameterSet>("esp16@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp17") &&
-                  test->existsAs<edm::ParameterSet>("esp18@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp19") &&
-                  test->existsAs<edm::ParameterSet>("esp20@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp21") &&
-                  test->existsAs<edm::ParameterSet>("esp22@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp23") &&
-                  test->existsAs<edm::ParameterSet>("esp24@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp25") &&
-                  test->existsAs<edm::ParameterSet>("esp26@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp27") &&
-                  test->existsAs<edm::ParameterSet>("esp28@"));
-
-   std::vector<edm::ParameterSet> const& vpsetServices = test->getUntrackedParameterSetVector("services");
-   // Note that the vector<ParameterSet> is not sorted. The order
-   // depends on the order of a python iteration through a dictionary
-   // which could be anything.
-   std::set<std::string> serviceNames;
-   for (auto const& pset : vpsetServices) {
-     serviceNames.insert(pset.getParameter<std::string>("@service_type"));
-   }
-   std::vector<std::string> expectedServiceNames;
-   expectedServiceNames.emplace_back("serv1");
-   expectedServiceNames.emplace_back("serv2");
-   expectedServiceNames.emplace_back("serv3");
-   expectedServiceNames.emplace_back("serv4");
-   expectedServiceNames.emplace_back("serv11");
-   expectedServiceNames.emplace_back("serv12");
-   expectedServiceNames.emplace_back("serv13");
-   expectedServiceNames.emplace_back("serv14");
-   expectedServiceNames.emplace_back("serv15");
-   expectedServiceNames.emplace_back("serv16");
-   expectedServiceNames.emplace_back("serv17");
-   expectedServiceNames.emplace_back("serv18");
-   expectedServiceNames.emplace_back("serv19");
-   expectedServiceNames.emplace_back("serv20");
-   expectedServiceNames.emplace_back("serv21");
-   expectedServiceNames.emplace_back("serv22");
-   expectedServiceNames.emplace_back("serv23");
-   expectedServiceNames.emplace_back("serv24");
-   expectedServiceNames.emplace_back("serv25");
-   expectedServiceNames.emplace_back("serv26");
-   expectedServiceNames.emplace_back("serv27");
-   expectedServiceNames.emplace_back("serv28");
-   bool result = true;
-   for (auto const& name : expectedServiceNames) {
-     if (serviceNames.find(name) == serviceNames.end()) {
-       result = false;
-     }
-   }
-   if (serviceNames.size() != expectedServiceNames.size()) {
-     result = false;
-   }
-   CPPUNIT_ASSERT(result);
+  char const* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.load(\"FWCore.PyDevParameterSet.test.testTask_cff\")\n"
+      "t10 = cms.Task(process.m29, process.m30, process.f29, process.f30,"
+      "process.ess27, process.ess28, process.esp27, process.esp28,"
+      "process.serv27, process.serv28)\n"
+      "process.schedule = cms.Schedule(process.p1, process.p2, process.e1, process.e2,"
+      "process.pf1, process.pf2, process.ef1, process.ef2,"
+      "process.pa1, process.pa2, process.ea1, process.ea2,"
+      "process.eo1, process.eo2, process.pess2, process.eess2,"
+      "process.pesp2, process.eesp2, process.pserv2, process.eserv2,"
+      "tasks=[process.t9, process.tf9, process.tess10,process.tesp10,"
+      "process.tserv10])\n";
+
+  ParameterSetPtr test = pSet(kTest);
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("m1") && !test->existsAs<edm::ParameterSet>("m2") &&
+                 test->existsAs<edm::ParameterSet>("m3") && test->existsAs<edm::ParameterSet>("m4") &&
+                 test->existsAs<edm::ParameterSet>("m5") && test->existsAs<edm::ParameterSet>("m6") &&
+                 test->existsAs<edm::ParameterSet>("m7") && test->existsAs<edm::ParameterSet>("m8") &&
+                 test->existsAs<edm::ParameterSet>("m9") && test->existsAs<edm::ParameterSet>("m10") &&
+                 test->existsAs<edm::ParameterSet>("m11") && test->existsAs<edm::ParameterSet>("m12") &&
+                 test->existsAs<edm::ParameterSet>("m13") && test->existsAs<edm::ParameterSet>("m14") &&
+                 test->existsAs<edm::ParameterSet>("m15") && test->existsAs<edm::ParameterSet>("m16") &&
+                 test->existsAs<edm::ParameterSet>("m17") && test->existsAs<edm::ParameterSet>("m18") &&
+                 test->existsAs<edm::ParameterSet>("m19") && test->existsAs<edm::ParameterSet>("m20") &&
+                 test->existsAs<edm::ParameterSet>("m21") && test->existsAs<edm::ParameterSet>("m22") &&
+                 test->existsAs<edm::ParameterSet>("m23") && test->existsAs<edm::ParameterSet>("m24") &&
+                 test->existsAs<edm::ParameterSet>("m25") && test->existsAs<edm::ParameterSet>("m26") &&
+                 test->existsAs<edm::ParameterSet>("m27") && test->existsAs<edm::ParameterSet>("m28") &&
+                 !test->existsAs<edm::ParameterSet>("m29") && !test->existsAs<edm::ParameterSet>("m30"));
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("f1") && !test->existsAs<edm::ParameterSet>("f2") &&
+                 test->existsAs<edm::ParameterSet>("f3") && test->existsAs<edm::ParameterSet>("f4") &&
+                 test->existsAs<edm::ParameterSet>("f5") && test->existsAs<edm::ParameterSet>("f6") &&
+                 test->existsAs<edm::ParameterSet>("f7") && test->existsAs<edm::ParameterSet>("f8") &&
+                 test->existsAs<edm::ParameterSet>("f9") && test->existsAs<edm::ParameterSet>("f10") &&
+                 test->existsAs<edm::ParameterSet>("f11") && test->existsAs<edm::ParameterSet>("f12") &&
+                 test->existsAs<edm::ParameterSet>("f13") && test->existsAs<edm::ParameterSet>("f14") &&
+                 test->existsAs<edm::ParameterSet>("f15") && test->existsAs<edm::ParameterSet>("f16") &&
+                 test->existsAs<edm::ParameterSet>("f17") && test->existsAs<edm::ParameterSet>("f18") &&
+                 test->existsAs<edm::ParameterSet>("f19") && test->existsAs<edm::ParameterSet>("f20") &&
+                 test->existsAs<edm::ParameterSet>("f21") && test->existsAs<edm::ParameterSet>("f22") &&
+                 test->existsAs<edm::ParameterSet>("f23") && test->existsAs<edm::ParameterSet>("f24") &&
+                 test->existsAs<edm::ParameterSet>("f25") && test->existsAs<edm::ParameterSet>("f26") &&
+                 test->existsAs<edm::ParameterSet>("f27") && test->existsAs<edm::ParameterSet>("f28") &&
+                 !test->existsAs<edm::ParameterSet>("f29") && !test->existsAs<edm::ParameterSet>("f30"));
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("a1") && !test->existsAs<edm::ParameterSet>("a2") &&
+                 test->existsAs<edm::ParameterSet>("a3") && test->existsAs<edm::ParameterSet>("a4") &&
+                 test->existsAs<edm::ParameterSet>("a5") && test->existsAs<edm::ParameterSet>("a6") &&
+                 test->existsAs<edm::ParameterSet>("a7") && test->existsAs<edm::ParameterSet>("a8") &&
+                 test->existsAs<edm::ParameterSet>("a9") && test->existsAs<edm::ParameterSet>("a10"));
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("o1") && !test->existsAs<edm::ParameterSet>("o2") &&
+                 test->existsAs<edm::ParameterSet>("o7") && test->existsAs<edm::ParameterSet>("o8") &&
+                 test->existsAs<edm::ParameterSet>("o9") && test->existsAs<edm::ParameterSet>("o10"));
+
+  CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("ess@ess1") && test->existsAs<edm::ParameterSet>("ess2@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess3") && test->existsAs<edm::ParameterSet>("ess4@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess11") && test->existsAs<edm::ParameterSet>("ess12@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess13") && test->existsAs<edm::ParameterSet>("ess14@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess15") && test->existsAs<edm::ParameterSet>("ess16@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess17") && test->existsAs<edm::ParameterSet>("ess18@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess19") && test->existsAs<edm::ParameterSet>("ess20@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess21") && test->existsAs<edm::ParameterSet>("ess22@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess23") && test->existsAs<edm::ParameterSet>("ess24@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess25") && test->existsAs<edm::ParameterSet>("ess26@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess27") && test->existsAs<edm::ParameterSet>("ess28@"));
+
+  CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("esp@esp1") && test->existsAs<edm::ParameterSet>("esp2@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp3") && test->existsAs<edm::ParameterSet>("esp4@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp11") && test->existsAs<edm::ParameterSet>("esp12@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp13") && test->existsAs<edm::ParameterSet>("esp14@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp15") && test->existsAs<edm::ParameterSet>("esp16@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp17") && test->existsAs<edm::ParameterSet>("esp18@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp19") && test->existsAs<edm::ParameterSet>("esp20@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp21") && test->existsAs<edm::ParameterSet>("esp22@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp23") && test->existsAs<edm::ParameterSet>("esp24@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp25") && test->existsAs<edm::ParameterSet>("esp26@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp27") && test->existsAs<edm::ParameterSet>("esp28@"));
+
+  std::vector<edm::ParameterSet> const& vpsetServices = test->getUntrackedParameterSetVector("services");
+  // Note that the vector<ParameterSet> is not sorted. The order
+  // depends on the order of a python iteration through a dictionary
+  // which could be anything.
+  std::set<std::string> serviceNames;
+  for (auto const& pset : vpsetServices) {
+    serviceNames.insert(pset.getParameter<std::string>("@service_type"));
+  }
+  std::vector<std::string> expectedServiceNames;
+  expectedServiceNames.emplace_back("serv1");
+  expectedServiceNames.emplace_back("serv2");
+  expectedServiceNames.emplace_back("serv3");
+  expectedServiceNames.emplace_back("serv4");
+  expectedServiceNames.emplace_back("serv11");
+  expectedServiceNames.emplace_back("serv12");
+  expectedServiceNames.emplace_back("serv13");
+  expectedServiceNames.emplace_back("serv14");
+  expectedServiceNames.emplace_back("serv15");
+  expectedServiceNames.emplace_back("serv16");
+  expectedServiceNames.emplace_back("serv17");
+  expectedServiceNames.emplace_back("serv18");
+  expectedServiceNames.emplace_back("serv19");
+  expectedServiceNames.emplace_back("serv20");
+  expectedServiceNames.emplace_back("serv21");
+  expectedServiceNames.emplace_back("serv22");
+  expectedServiceNames.emplace_back("serv23");
+  expectedServiceNames.emplace_back("serv24");
+  expectedServiceNames.emplace_back("serv25");
+  expectedServiceNames.emplace_back("serv26");
+  expectedServiceNames.emplace_back("serv27");
+  expectedServiceNames.emplace_back("serv28");
+  bool result = true;
+  for (auto const& name : expectedServiceNames) {
+    if (serviceNames.find(name) == serviceNames.end()) {
+      result = false;
+    }
+  }
+  if (serviceNames.size() != expectedServiceNames.size()) {
+    result = false;
+  }
+  CPPUNIT_ASSERT(result);
 }
 
 /*
diff --git a/FWCore/PyDevParameterSet/test/makepset_t.cppunit.cc b/FWCore/PyDevParameterSet/test/makepset_t.cppunit.cc
index 0b8a0a48adcdc..575e16f9a0354 100644
--- a/FWCore/PyDevParameterSet/test/makepset_t.cppunit.cc
+++ b/FWCore/PyDevParameterSet/test/makepset_t.cppunit.cc
@@ -18,12 +18,12 @@
 #include <algorithm>
 #include <iostream>
 #include <fstream>
-#include <stdlib.h> // for setenv; <cstdlib> is likely to fail
+#include <stdlib.h>  // for setenv; <cstdlib> is likely to fail
 #include <string>
 #include <unistd.h>
 #include <boost/filesystem.hpp>
 
-class testmakepset: public CppUnit::TestFixture {
+class testmakepset : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testmakepset);
   CPPUNIT_TEST(typesTest);
   CPPUNIT_TEST(secsourceTest);
@@ -31,15 +31,15 @@ class testmakepset: public CppUnit::TestFixture {
   CPPUNIT_TEST(fileinpathTest);
   CPPUNIT_TEST_SUITE_END();
 
- public:
-  void setUp(){}
-  void tearDown(){}
+public:
+  void setUp() {}
+  void tearDown() {}
   void typesTest();
   void secsourceTest();
   void usingBlockTest();
   void fileinpathTest();
 
- private:
+private:
   void secsourceAux();
   void usingBlockAux();
   void fileinpathAux();
@@ -49,18 +49,17 @@ class testmakepset: public CppUnit::TestFixture {
 CPPUNIT_TEST_SUITE_REGISTRATION(testmakepset);
 
 void testmakepset::secsourceTest() {
-  try { this->secsourceAux(); }
-  catch (cms::Exception& x) {
+  try {
+    this->secsourceAux();
+  } catch (cms::Exception& x) {
     std::cerr << "testmakepset::secsourceTest() caught a cms::Exception\n";
     std::cerr << x.what() << '\n';
     throw;
-  }
-  catch (std::exception& x) {
+  } catch (std::exception& x) {
     std::cerr << "testmakepset::secsourceTest() caught a std::exception\n";
     std::cerr << x.what() << '\n';
     throw;
-  }
-  catch (...) {
+  } catch (...) {
     std::cerr << "testmakepset::secsourceTest() caught an unidentified exception\n";
     throw;
   }
@@ -68,28 +67,28 @@ void testmakepset::secsourceTest() {
 
 void testmakepset::secsourceAux() {
   char const* kTest =
-  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('PROD')\n"
-  "process.maxEvents = cms.untracked.PSet(\n"
-  "    input = cms.untracked.int32(2)\n"
-  ")\n"
-  "process.source = cms.Source('PoolSource',\n"
-  "    fileNames = cms.untracked.vstring('file:main.root')\n"
-  ")\n"
-  "process.out = cms.OutputModule('PoolOutputModule',\n"
-  "    fileName = cms.string('file:CumHits.root')\n"
-  ")\n"
-  "process.mix = cms.EDFilter('MixingModule',\n"
-  "    input = cms.SecSource('EmbeddedRootSource',\n"
-  "        fileNames = cms.untracked.vstring('file:pileup.root')\n"
-  "    ),\n"
-  "    max_bunch = cms.int32(3),\n"
-  "    average_number = cms.double(14.3),\n"
-  "    min_bunch = cms.int32(-5),\n"
-  "    type = cms.string('fixed')\n"
-  ")\n"
-  "process.p = cms.Path(process.mix)\n"
-  "process.ep = cms.EndPath(process.out)\n";
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('PROD')\n"
+      "process.maxEvents = cms.untracked.PSet(\n"
+      "    input = cms.untracked.int32(2)\n"
+      ")\n"
+      "process.source = cms.Source('PoolSource',\n"
+      "    fileNames = cms.untracked.vstring('file:main.root')\n"
+      ")\n"
+      "process.out = cms.OutputModule('PoolOutputModule',\n"
+      "    fileName = cms.string('file:CumHits.root')\n"
+      ")\n"
+      "process.mix = cms.EDFilter('MixingModule',\n"
+      "    input = cms.SecSource('EmbeddedRootSource',\n"
+      "        fileNames = cms.untracked.vstring('file:pileup.root')\n"
+      "    ),\n"
+      "    max_bunch = cms.int32(3),\n"
+      "    average_number = cms.double(14.3),\n"
+      "    min_bunch = cms.int32(-5),\n"
+      "    type = cms.string('fixed')\n"
+      ")\n"
+      "process.p = cms.Path(process.mix)\n"
+      "process.ep = cms.EndPath(process.out)\n";
 
   std::string config(kTest);
 
@@ -104,17 +103,18 @@ void testmakepset::secsourceAux() {
   edm::ParameterSet const& secondarySourceParams = mixingModuleParams.getParameterSet("input");
   CPPUNIT_ASSERT(secondarySourceParams.getParameter<std::string>("@module_type") == "EmbeddedRootSource");
   CPPUNIT_ASSERT(secondarySourceParams.getParameter<std::string>("@module_label") == "input");
-  CPPUNIT_ASSERT(secondarySourceParams.getUntrackedParameter<std::vector<std::string> >("fileNames")[0] == "file:pileup.root");
+  CPPUNIT_ASSERT(secondarySourceParams.getUntrackedParameter<std::vector<std::string> >("fileNames")[0] ==
+                 "file:pileup.root");
 }
 
 void testmakepset::usingBlockTest() {
-  try { this->usingBlockAux(); }
-  catch (cms::Exception& x) {
+  try {
+    this->usingBlockAux();
+  } catch (cms::Exception& x) {
     std::cerr << "testmakepset::usingBlockTest() caught a cms::Exception\n";
     std::cerr << x.what() << '\n';
     throw;
-  }
-  catch (...) {
+  } catch (...) {
     std::cerr << "testmakepset::usingBlockTest() caught an unidentified exception\n";
     throw;
   }
@@ -122,30 +122,30 @@ void testmakepset::usingBlockTest() {
 
 void testmakepset::usingBlockAux() {
   char const* kTest =
-  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('PROD')\n"
-  "process.maxEvents = cms.untracked.PSet(\n"
-  "    input = cms.untracked.int32(2)\n"
-  ")\n"
-  "process.source = cms.Source('PoolSource',\n"
-  "    fileNames = cms.untracked.vstring('file:main.root')\n"
-  ")\n"
-  "process.b = cms.PSet(\n"
-  "    s = cms.string('original'),\n"
-  "    r = cms.double(1.5)\n"
-  ")\n"
-  "process.m1 = cms.EDFilter('Class1',\n"
-  "    process.b,\n"
-  "    i = cms.int32(1)\n"
-  ")\n"
-  "process.m2 = cms.EDFilter('Class2',\n"
-  "    process.b,\n"
-  "    i = cms.int32(2),\n"
-  "    j = cms.int32(3),\n"
-  "    u = cms.uint64(1011),\n"
-  "    l = cms.int64(101010)\n"
-  ")\n"
-  "process.p = cms.Path(process.m1+process.m2)\n";
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('PROD')\n"
+      "process.maxEvents = cms.untracked.PSet(\n"
+      "    input = cms.untracked.int32(2)\n"
+      ")\n"
+      "process.source = cms.Source('PoolSource',\n"
+      "    fileNames = cms.untracked.vstring('file:main.root')\n"
+      ")\n"
+      "process.b = cms.PSet(\n"
+      "    s = cms.string('original'),\n"
+      "    r = cms.double(1.5)\n"
+      ")\n"
+      "process.m1 = cms.EDFilter('Class1',\n"
+      "    process.b,\n"
+      "    i = cms.int32(1)\n"
+      ")\n"
+      "process.m2 = cms.EDFilter('Class2',\n"
+      "    process.b,\n"
+      "    i = cms.int32(2),\n"
+      "    j = cms.int32(3),\n"
+      "    u = cms.uint64(1011),\n"
+      "    l = cms.int64(101010)\n"
+      ")\n"
+      "process.p = cms.Path(process.m1+process.m2)\n";
 
   std::string config(kTest);
   // Create the ParameterSet object from this configuration string.
@@ -170,13 +170,13 @@ void testmakepset::usingBlockAux() {
 }
 
 void testmakepset::fileinpathTest() {
-  try { this->fileinpathAux(); }
-  catch (cms::Exception& x) {
+  try {
+    this->fileinpathAux();
+  } catch (cms::Exception& x) {
     std::cerr << "testmakepset::fileinpathTest() caught a cms::Exception\n";
     std::cerr << x.what() << '\n';
     throw;
-  }
-  catch (...) {
+  } catch (...) {
     std::cerr << "testmakepset::fileinpathTest() caught an unidentified exception\n";
     throw;
   }
@@ -184,82 +184,83 @@ void testmakepset::fileinpathTest() {
 
 void testmakepset::fileinpathAux() {
   char const* kTest =
-  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('PROD')\n"
-  "process.main = cms.PSet(\n"
-  "    topo = cms.FileInPath('Geometry/TrackerSimData/data/trackersens.xml'),\n"
-  "    fip = cms.FileInPath('FWCore/PyDevParameterSet/test/fip.txt'),\n"
-  "    ufip = cms.untracked.FileInPath('FWCore/PyDevParameterSet/test/ufip.txt'),\n"
-  "    extraneous = cms.int32(12)\n"
-  ")\n"
-  "process.source = cms.Source('EmptySource')\n";
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('PROD')\n"
+      "process.main = cms.PSet(\n"
+      "    topo = cms.FileInPath('Geometry/TrackerSimData/data/trackersens.xml'),\n"
+      "    fip = cms.FileInPath('FWCore/PyDevParameterSet/test/fip.txt'),\n"
+      "    ufip = cms.untracked.FileInPath('FWCore/PyDevParameterSet/test/ufip.txt'),\n"
+      "    extraneous = cms.int32(12)\n"
+      ")\n"
+      "process.source = cms.Source('EmptySource')\n";
 
   std::string config(kTest);
   std::string tmpout;
-  bool localArea=false;
+  bool localArea = false;
   // Create the ParameterSet object from this configuration string.
   {
-  cmspython3::PyBind11ProcessDesc builder(config);
-  std::shared_ptr<edm::ParameterSet> ps = builder.parameterSet();
-  CPPUNIT_ASSERT(nullptr != ps.get());
-
-  edm::ParameterSet const& innerps = ps->getParameterSet("main");
-  edm::FileInPath fip  = innerps.getParameter<edm::FileInPath>("fip");
-  edm::FileInPath ufip = innerps.getUntrackedParameter<edm::FileInPath>("ufip");
-  CPPUNIT_ASSERT(innerps.existsAs<int>("extraneous"));
-  CPPUNIT_ASSERT(!innerps.existsAs<int>("absent"));
-  char *releaseBase = getenv("CMSSW_RELEASE_BASE");
-  char *localBase = getenv("CMSSW_BASE");
-  localArea = (releaseBase != nullptr && strlen(releaseBase) != 0 && strcmp(releaseBase, localBase));
-  if(localArea) {
-    // Need to account for possible symbolic links
-    std::string const src("/src");
-    std::string release = releaseBase + src;
-    std::string local = localBase + src;
-    edm::resolveSymbolicLinks(release);
-    edm::resolveSymbolicLinks(local);
-    localArea = (local != release);
-  }
-
-  if(localArea) {
-    CPPUNIT_ASSERT(fip.location() == edm::FileInPath::Local);
-  }
-  CPPUNIT_ASSERT(fip.relativePath()  == "FWCore/PyDevParameterSet/test/fip.txt");
-  CPPUNIT_ASSERT(ufip.relativePath() == "FWCore/PyDevParameterSet/test/ufip.txt");
-  std::string fullpath = fip.fullPath();
-  std::cerr << "fullPath is: " << fip.fullPath() << std::endl;
-  std::cerr << "copy of fullPath is: " << fullpath << std::endl;
-
-  CPPUNIT_ASSERT(!fullpath.empty());
-
-  tmpout = fullpath.substr(0, fullpath.find("FWCore/PyDevParameterSet/test/fip.txt")) + "tmp.py";
-
-  edm::FileInPath topo = innerps.getParameter<edm::FileInPath>("topo");
-  // if the file is local, then just disable this check as then it is expected to fail
-  {
-    std::string const src("/src");
-    std::string local = localBase + src;
-    std::string localFile = local + "/Geometry/TrackerSimData/data/trackersens.xml";
-    if (!boost::filesystem::exists(localFile) )
-      CPPUNIT_ASSERT(topo.location() != edm::FileInPath::Local);
-    else
-      std::cerr << "Disabling test against local path for trackersens.xml as package is checked out in this test" << std::endl;
-  }
-  CPPUNIT_ASSERT(topo.relativePath() == "Geometry/TrackerSimData/data/trackersens.xml");
-  fullpath = topo.fullPath();
-  CPPUNIT_ASSERT(!fullpath.empty());
-
-  std::vector<edm::FileInPath> v(1);
-  CPPUNIT_ASSERT(innerps.getAllFileInPaths(v) == 3);
-
-  CPPUNIT_ASSERT(v.size() == 4);
-  CPPUNIT_ASSERT(std::count(v.begin(), v.end(), fip) == 1);
-  CPPUNIT_ASSERT(std::count(v.begin(), v.end(), topo) == 1);
-
-  edm::ParameterSet empty;
-  v.clear();
-  CPPUNIT_ASSERT(empty.getAllFileInPaths(v) == 0);
-  CPPUNIT_ASSERT(v.empty());
+    cmspython3::PyBind11ProcessDesc builder(config);
+    std::shared_ptr<edm::ParameterSet> ps = builder.parameterSet();
+    CPPUNIT_ASSERT(nullptr != ps.get());
+
+    edm::ParameterSet const& innerps = ps->getParameterSet("main");
+    edm::FileInPath fip = innerps.getParameter<edm::FileInPath>("fip");
+    edm::FileInPath ufip = innerps.getUntrackedParameter<edm::FileInPath>("ufip");
+    CPPUNIT_ASSERT(innerps.existsAs<int>("extraneous"));
+    CPPUNIT_ASSERT(!innerps.existsAs<int>("absent"));
+    char* releaseBase = getenv("CMSSW_RELEASE_BASE");
+    char* localBase = getenv("CMSSW_BASE");
+    localArea = (releaseBase != nullptr && strlen(releaseBase) != 0 && strcmp(releaseBase, localBase));
+    if (localArea) {
+      // Need to account for possible symbolic links
+      std::string const src("/src");
+      std::string release = releaseBase + src;
+      std::string local = localBase + src;
+      edm::resolveSymbolicLinks(release);
+      edm::resolveSymbolicLinks(local);
+      localArea = (local != release);
+    }
+
+    if (localArea) {
+      CPPUNIT_ASSERT(fip.location() == edm::FileInPath::Local);
+    }
+    CPPUNIT_ASSERT(fip.relativePath() == "FWCore/PyDevParameterSet/test/fip.txt");
+    CPPUNIT_ASSERT(ufip.relativePath() == "FWCore/PyDevParameterSet/test/ufip.txt");
+    std::string fullpath = fip.fullPath();
+    std::cerr << "fullPath is: " << fip.fullPath() << std::endl;
+    std::cerr << "copy of fullPath is: " << fullpath << std::endl;
+
+    CPPUNIT_ASSERT(!fullpath.empty());
+
+    tmpout = fullpath.substr(0, fullpath.find("FWCore/PyDevParameterSet/test/fip.txt")) + "tmp.py";
+
+    edm::FileInPath topo = innerps.getParameter<edm::FileInPath>("topo");
+    // if the file is local, then just disable this check as then it is expected to fail
+    {
+      std::string const src("/src");
+      std::string local = localBase + src;
+      std::string localFile = local + "/Geometry/TrackerSimData/data/trackersens.xml";
+      if (!boost::filesystem::exists(localFile))
+        CPPUNIT_ASSERT(topo.location() != edm::FileInPath::Local);
+      else
+        std::cerr << "Disabling test against local path for trackersens.xml as package is checked out in this test"
+                  << std::endl;
+    }
+    CPPUNIT_ASSERT(topo.relativePath() == "Geometry/TrackerSimData/data/trackersens.xml");
+    fullpath = topo.fullPath();
+    CPPUNIT_ASSERT(!fullpath.empty());
+
+    std::vector<edm::FileInPath> v(1);
+    CPPUNIT_ASSERT(innerps.getAllFileInPaths(v) == 3);
+
+    CPPUNIT_ASSERT(v.size() == 4);
+    CPPUNIT_ASSERT(std::count(v.begin(), v.end(), fip) == 1);
+    CPPUNIT_ASSERT(std::count(v.begin(), v.end(), topo) == 1);
+
+    edm::ParameterSet empty;
+    v.clear();
+    CPPUNIT_ASSERT(empty.getAllFileInPaths(v) == 0);
+    CPPUNIT_ASSERT(v.empty());
   }
   // This last test checks that a FileInPath parameter can be read
   // successfully even if the associated file no longer exists.
@@ -267,12 +268,12 @@ void testmakepset::fileinpathAux() {
   CPPUNIT_ASSERT(!(!out));
 
   char const* kTest2 =
-  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('PROD')\n"
-  "process.main = cms.PSet(\n"
-  "    fip2 = cms.FileInPath('tmp.py')\n"
-  ")\n"
-  "process.source = cms.Source('EmptySource')\n";
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('PROD')\n"
+      "process.main = cms.PSet(\n"
+      "    fip2 = cms.FileInPath('tmp.py')\n"
+      ")\n"
+      "process.source = cms.Source('EmptySource')\n";
 
   std::string config2(kTest2);
   // Create the ParameterSet object from this configuration string.
@@ -295,209 +296,210 @@ void testmakepset::fileinpathAux() {
 }
 
 void testmakepset::typesTest() {
-   //vbool vb = {true, false};
-   char const* kTest =
-  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('t')\n"
-  "process.p = cms.PSet(\n"
-  "    input2 = cms.InputTag('Label2','Instance2'),\n"
-  "    sb3 = cms.string('    '),\n"
-  "    input1 = cms.InputTag('Label1','Instance1'),\n"
-  "    input6 = cms.InputTag('source'),\n"
-  "    ##justasbig = cms.double(inf),\n"
-  "    input4 = cms.InputTag('Label4','Instance4','Process4'),\n"
-  "    input3 = cms.untracked.InputTag('Label3','Instance3'),\n"
-  "    h2 = cms.uint32(255),\n"
-  "    vi = cms.vint32(1, -2),\n"
-  "    input8 = cms.string('deprecatedString:tag'),\n"
-  "    h1 = cms.int32(74),\n"
-  "    vs = cms.vstring('','1', \n"
-  "        '2', \n"
-  "        'a', 'XXX'),\n"
-  "    vs2 = cms.vstring(), vs3 = cms.vstring(''),\n"
-  "    sb2 = cms.string(''),\n"
-  "    input7 = cms.InputTag('source','sink'),\n"
-  "    ps = cms.PSet(\n"
-  "        b2 = cms.untracked.bool(True)\n"
-  "    ),\n"
-  "    input5 = cms.InputTag('Label5','','Process5'),\n"
-  "    h3 = cms.untracked.uint32(3487559679),\n"
-  "    input = cms.InputTag('Label'),\n"
-  "    vps = cms.VPSet(cms.PSet(\n"
-  "        b3 = cms.bool(False)\n"
-  "    )),\n"
-  "    ##indebt = cms.double(-inf),\n"
-  "    ##big = cms.double(inf),\n"
-  "    vinput = cms.VInputTag(cms.InputTag('l1','i1'), cms.InputTag('l2'), cms.InputTag('l3','i3','p3'), cms.InputTag('l4','','p4'), cms.InputTag('source'), \n"
-  "        cms.InputTag('source','sink')),\n"
-  "    ui = cms.uint32(1),\n"
-  "    eventID = cms.EventID(1, 0, 1),\n"
-  "    b = cms.untracked.bool(True),\n"
-  "    d = cms.double(1.0),\n"
-  "    i = cms.int32(1),\n"
-  "    vui = cms.vuint32(1, 2, 1, 255),\n"
-  "    s = cms.string('this string'),\n"
-  "    sb1 = cms.string(''),\n"
-  "    emptyString = cms.untracked.string(''),\n"
-  "    vEventID = cms.VEventID('1:1', '2:2','3:3'),\n"
-  "    lumi = cms.LuminosityBlockID(55, 65),\n"
-  "    vlumis = cms.VLuminosityBlockID('75:85', '95:105'),\n"
-  "    einput1 = cms.ESInputTag(),\n"
-  "    einput2 = cms.ESInputTag(data='blah'),\n"
-  "    einput3 = cms.ESInputTag('ESProd'),\n"
-  "    einput4 = cms.ESInputTag('ESProd','something'),\n"
-  "    einput5 = cms.ESInputTag('ESProd:something'),\n"
-  "    veinput1 = cms.VESInputTag(),\n"
-  "    veinput2 = cms.VESInputTag(cms.ESInputTag(data='blah'),cms.ESInputTag('ESProd'))\n"
-  ")\n"
-
-     ;
-
-   std::string config2(kTest);
-   // Create the ParameterSet object from this configuration string.
-   cmspython3::PyBind11ProcessDesc builder2(config2);
-   std::shared_ptr<edm::ParameterSet> ps2 = builder2.parameterSet();
-   edm::ParameterSet const& test = ps2->getParameterSet("p");
-
-   CPPUNIT_ASSERT(1 == test.getParameter<int>("i"));
-   CPPUNIT_ASSERT(test.retrieve("i").isTracked());
-   CPPUNIT_ASSERT(1 == test.getParameter<unsigned int>("ui"));
-   CPPUNIT_ASSERT(1 == test.getParameter<double>("d"));
-   //CPPUNIT_ASSERT(100000. < test.getParameter<double>("big"));
-   //CPPUNIT_ASSERT(100000. < test.getParameter<double>("justasbig"));
-   //CPPUNIT_ASSERT(-1000000. > test.getParameter<double>("indebt"));
-
-   // test hex numbers
-   CPPUNIT_ASSERT(74 == test.getParameter<int>("h1"));
-   CPPUNIT_ASSERT(255 == test.getParameter<unsigned int>("h2"));
-   CPPUNIT_ASSERT(3487559679U == test.getUntrackedParameter<unsigned int>("h3"));
-
-   CPPUNIT_ASSERT("this string" == test.getParameter<std::string>("s"));
-   CPPUNIT_ASSERT("" == test.getParameter<std::string>("sb1"));
-   CPPUNIT_ASSERT("" == test.getUntrackedParameter<std::string>("emptyString", "default"));
-   CPPUNIT_ASSERT("" == test.getParameter<std::string>("sb2"));
-   CPPUNIT_ASSERT(4  == test.getParameter<std::string>("sb3").size());
-   std::vector<std::string> vs = test.getParameter<std::vector<std::string> >("vs");
-   int vssize = vs.size();
-   //FIXME doesn't do spaces right
-   edm::Entry e(test.retrieve("vs"));
-   CPPUNIT_ASSERT(5 == vssize);
-   CPPUNIT_ASSERT(vssize && "" == vs[0]);
-   CPPUNIT_ASSERT(vssize >1 && "1" == vs[1]);
-   CPPUNIT_ASSERT(vssize >1 && "a" == vs[3]);
-   vs = test.getParameter<std::vector<std::string> >("vs2");
-   CPPUNIT_ASSERT(vs.size() == 0);
-   vs = test.getParameter<std::vector<std::string> >("vs3");
-   CPPUNIT_ASSERT(vs.size() == 1);
-   CPPUNIT_ASSERT(vs[0] == "");
-
-   static unsigned int const vuia[] = {1,2,1,255};
-   static std::vector<unsigned int> const vui(vuia, vuia+sizeof(vuia)/sizeof(unsigned int));
-   CPPUNIT_ASSERT(vui == test.getParameter<std::vector<unsigned int> >("vui"));
-
-   static int const via[] = {1,-2};
-   static std::vector<int> const vi(via, via+sizeof(via)/sizeof(int));
-   test.getParameter<std::vector<int> >("vi");
-   CPPUNIT_ASSERT(true == test.getUntrackedParameter<bool>("b", false));
-   CPPUNIT_ASSERT(test.retrieve("vi").isTracked());
-   //test.getParameter<std::vector<bool> >("vb");
-   edm::ParameterSet const& ps = test.getParameterSet("ps");
-   CPPUNIT_ASSERT(true == ps.getUntrackedParameter<bool>("b2", false));
-   std::vector<edm::ParameterSet> const& vps = test.getParameterSetVector("vps");
-   CPPUNIT_ASSERT(1 == vps.size());
-   CPPUNIT_ASSERT(false == vps.front().getParameter<bool>("b3"));
-
-   // InputTag
-   edm::InputTag inputProduct  = test.getParameter<edm::InputTag>("input");
-   edm::InputTag inputProduct1 = test.getParameter<edm::InputTag>("input1");
-   edm::InputTag inputProduct2 = test.getParameter<edm::InputTag>("input2");
-   edm::InputTag inputProduct3 = test.getUntrackedParameter<edm::InputTag>("input3");
-   edm::InputTag inputProduct4 = test.getParameter<edm::InputTag>("input4");
-   edm::InputTag inputProduct5 = test.getParameter<edm::InputTag>("input5");
-   edm::InputTag inputProduct6 = test.getParameter<edm::InputTag>("input6");
-   edm::InputTag inputProduct7 = test.getParameter<edm::InputTag>("input7");
-   edm::InputTag inputProduct8 = test.getParameter<edm::InputTag>("input8");
-
-   //edm::OutputTag outputProduct = test.getParameter<edm::OutputTag>("output");
-
-   CPPUNIT_ASSERT("Label"    == inputProduct.label());
-   CPPUNIT_ASSERT("Label1"    == inputProduct1.label());
-   CPPUNIT_ASSERT("Label2"    == inputProduct2.label());
-   CPPUNIT_ASSERT("Instance2" == inputProduct2.instance());
-   CPPUNIT_ASSERT("Label3"    == inputProduct3.label());
-   CPPUNIT_ASSERT("Instance3" == inputProduct3.instance());
-   CPPUNIT_ASSERT("Label4" == inputProduct4.label());
-   CPPUNIT_ASSERT("Instance4" == inputProduct4.instance());
-   CPPUNIT_ASSERT("Process4" == inputProduct4.process());
-   CPPUNIT_ASSERT("Label5" == inputProduct5.label());
-   CPPUNIT_ASSERT("" == inputProduct5.instance());
-   CPPUNIT_ASSERT("Process5" == inputProduct5.process());
-   CPPUNIT_ASSERT("source" == inputProduct6.label());
-   CPPUNIT_ASSERT("source" == inputProduct7.label());
-   CPPUNIT_ASSERT("deprecatedString" == inputProduct8.label());
-
-   // vector of InputTags
-
-   std::vector<edm::InputTag> vtags = test.getParameter<std::vector<edm::InputTag> >("vinput");
-   CPPUNIT_ASSERT("l1" == vtags[0].label());
-   CPPUNIT_ASSERT("i1" == vtags[0].instance());
-   CPPUNIT_ASSERT("l2" == vtags[1].label());
-   CPPUNIT_ASSERT("l3" == vtags[2].label());
-   CPPUNIT_ASSERT("i3" == vtags[2].instance());
-   CPPUNIT_ASSERT("p3" == vtags[2].process());
-   CPPUNIT_ASSERT("l4" == vtags[3].label());
-   CPPUNIT_ASSERT(""   == vtags[3].instance());
-   CPPUNIT_ASSERT("p4" == vtags[3].process());
-   CPPUNIT_ASSERT("source" == vtags[4].label());
-   CPPUNIT_ASSERT("source" == vtags[5].label());
-
-   // ESInputTag
-   edm::ESInputTag einput1 = test.getParameter<edm::ESInputTag>("einput1");
-   edm::ESInputTag einput2 = test.getParameter<edm::ESInputTag>("einput2");
-   edm::ESInputTag einput3 = test.getParameter<edm::ESInputTag>("einput3");
-   edm::ESInputTag einput4 = test.getParameter<edm::ESInputTag>("einput4");
-   edm::ESInputTag einput5 = test.getParameter<edm::ESInputTag>("einput5");
-   CPPUNIT_ASSERT("" == einput1.module());
-   CPPUNIT_ASSERT("" == einput1.data());
-   CPPUNIT_ASSERT("" == einput2.module());
-   CPPUNIT_ASSERT("blah" == einput2.data());
-   CPPUNIT_ASSERT("ESProd" == einput3.module());
-   CPPUNIT_ASSERT("" == einput3.data());
-   CPPUNIT_ASSERT("ESProd" == einput4.module());
-   CPPUNIT_ASSERT("something" == einput4.data());
-   CPPUNIT_ASSERT("ESProd" == einput5.module());
-   CPPUNIT_ASSERT("something" == einput5.data());
-
-   std::vector<edm::ESInputTag> veinput1 = test.getParameter<std::vector<edm::ESInputTag> >("veinput1");
-   std::vector<edm::ESInputTag> veinput2 = test.getParameter<std::vector<edm::ESInputTag> >("veinput2");
-   CPPUNIT_ASSERT(0 == veinput1.size());
-   CPPUNIT_ASSERT(2 == veinput2.size());
-   CPPUNIT_ASSERT("" == veinput2[0].module());
-   CPPUNIT_ASSERT("blah" == veinput2[0].data());
-   CPPUNIT_ASSERT("ESProd" == veinput2[1].module());
-   CPPUNIT_ASSERT("" == veinput2[1].data());
-
-   edm::EventID eventID = test.getParameter<edm::EventID>("eventID");
-   std::vector<edm::EventID> vEventID = test.getParameter<std::vector<edm::EventID> >("vEventID");
-   CPPUNIT_ASSERT(1 == eventID.run());
-   CPPUNIT_ASSERT(1 == eventID.event());
-   CPPUNIT_ASSERT(1 == vEventID[0].run());
-   CPPUNIT_ASSERT(1 == vEventID[0].event());
-   CPPUNIT_ASSERT(3 == vEventID[2].run());
-   CPPUNIT_ASSERT(3 == vEventID[2].event());
-
-   edm::LuminosityBlockID lumi = test.getParameter<edm::LuminosityBlockID >("lumi");
-   CPPUNIT_ASSERT(55 == lumi.run());
-   CPPUNIT_ASSERT(65 == lumi.luminosityBlock());
-   std::vector<edm::LuminosityBlockID> vlumis = test.getParameter<std::vector<edm::LuminosityBlockID> >("vlumis");
-   CPPUNIT_ASSERT(vlumis.size() == 2);
-   CPPUNIT_ASSERT(vlumis[0].run() == 75);
-   CPPUNIT_ASSERT(vlumis[0].luminosityBlock() == 85);
-   CPPUNIT_ASSERT(vlumis[1].run() == 95);
-   CPPUNIT_ASSERT(vlumis[1].luminosityBlock() == 105);
-
-   //CPPUNIT_ASSERT("Label2" == outputProduct.label());
-   //CPPUNIT_ASSERT(""       == outputProduct.instance());
-   //CPPUNIT_ASSERT("Alias2" == outputProduct.alias());
-   //BOOST_CHECK_THROW(makePSet(*nodeList), std::runtime_error);
+  //vbool vb = {true, false};
+  char const* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('t')\n"
+      "process.p = cms.PSet(\n"
+      "    input2 = cms.InputTag('Label2','Instance2'),\n"
+      "    sb3 = cms.string('    '),\n"
+      "    input1 = cms.InputTag('Label1','Instance1'),\n"
+      "    input6 = cms.InputTag('source'),\n"
+      "    ##justasbig = cms.double(inf),\n"
+      "    input4 = cms.InputTag('Label4','Instance4','Process4'),\n"
+      "    input3 = cms.untracked.InputTag('Label3','Instance3'),\n"
+      "    h2 = cms.uint32(255),\n"
+      "    vi = cms.vint32(1, -2),\n"
+      "    input8 = cms.string('deprecatedString:tag'),\n"
+      "    h1 = cms.int32(74),\n"
+      "    vs = cms.vstring('','1', \n"
+      "        '2', \n"
+      "        'a', 'XXX'),\n"
+      "    vs2 = cms.vstring(), vs3 = cms.vstring(''),\n"
+      "    sb2 = cms.string(''),\n"
+      "    input7 = cms.InputTag('source','sink'),\n"
+      "    ps = cms.PSet(\n"
+      "        b2 = cms.untracked.bool(True)\n"
+      "    ),\n"
+      "    input5 = cms.InputTag('Label5','','Process5'),\n"
+      "    h3 = cms.untracked.uint32(3487559679),\n"
+      "    input = cms.InputTag('Label'),\n"
+      "    vps = cms.VPSet(cms.PSet(\n"
+      "        b3 = cms.bool(False)\n"
+      "    )),\n"
+      "    ##indebt = cms.double(-inf),\n"
+      "    ##big = cms.double(inf),\n"
+      "    vinput = cms.VInputTag(cms.InputTag('l1','i1'), cms.InputTag('l2'), cms.InputTag('l3','i3','p3'), "
+      "cms.InputTag('l4','','p4'), cms.InputTag('source'), \n"
+      "        cms.InputTag('source','sink')),\n"
+      "    ui = cms.uint32(1),\n"
+      "    eventID = cms.EventID(1, 0, 1),\n"
+      "    b = cms.untracked.bool(True),\n"
+      "    d = cms.double(1.0),\n"
+      "    i = cms.int32(1),\n"
+      "    vui = cms.vuint32(1, 2, 1, 255),\n"
+      "    s = cms.string('this string'),\n"
+      "    sb1 = cms.string(''),\n"
+      "    emptyString = cms.untracked.string(''),\n"
+      "    vEventID = cms.VEventID('1:1', '2:2','3:3'),\n"
+      "    lumi = cms.LuminosityBlockID(55, 65),\n"
+      "    vlumis = cms.VLuminosityBlockID('75:85', '95:105'),\n"
+      "    einput1 = cms.ESInputTag(),\n"
+      "    einput2 = cms.ESInputTag(data='blah'),\n"
+      "    einput3 = cms.ESInputTag('ESProd'),\n"
+      "    einput4 = cms.ESInputTag('ESProd','something'),\n"
+      "    einput5 = cms.ESInputTag('ESProd:something'),\n"
+      "    veinput1 = cms.VESInputTag(),\n"
+      "    veinput2 = cms.VESInputTag(cms.ESInputTag(data='blah'),cms.ESInputTag('ESProd'))\n"
+      ")\n"
+
+      ;
+
+  std::string config2(kTest);
+  // Create the ParameterSet object from this configuration string.
+  cmspython3::PyBind11ProcessDesc builder2(config2);
+  std::shared_ptr<edm::ParameterSet> ps2 = builder2.parameterSet();
+  edm::ParameterSet const& test = ps2->getParameterSet("p");
+
+  CPPUNIT_ASSERT(1 == test.getParameter<int>("i"));
+  CPPUNIT_ASSERT(test.retrieve("i").isTracked());
+  CPPUNIT_ASSERT(1 == test.getParameter<unsigned int>("ui"));
+  CPPUNIT_ASSERT(1 == test.getParameter<double>("d"));
+  //CPPUNIT_ASSERT(100000. < test.getParameter<double>("big"));
+  //CPPUNIT_ASSERT(100000. < test.getParameter<double>("justasbig"));
+  //CPPUNIT_ASSERT(-1000000. > test.getParameter<double>("indebt"));
+
+  // test hex numbers
+  CPPUNIT_ASSERT(74 == test.getParameter<int>("h1"));
+  CPPUNIT_ASSERT(255 == test.getParameter<unsigned int>("h2"));
+  CPPUNIT_ASSERT(3487559679U == test.getUntrackedParameter<unsigned int>("h3"));
+
+  CPPUNIT_ASSERT("this string" == test.getParameter<std::string>("s"));
+  CPPUNIT_ASSERT("" == test.getParameter<std::string>("sb1"));
+  CPPUNIT_ASSERT("" == test.getUntrackedParameter<std::string>("emptyString", "default"));
+  CPPUNIT_ASSERT("" == test.getParameter<std::string>("sb2"));
+  CPPUNIT_ASSERT(4 == test.getParameter<std::string>("sb3").size());
+  std::vector<std::string> vs = test.getParameter<std::vector<std::string> >("vs");
+  int vssize = vs.size();
+  //FIXME doesn't do spaces right
+  edm::Entry e(test.retrieve("vs"));
+  CPPUNIT_ASSERT(5 == vssize);
+  CPPUNIT_ASSERT(vssize && "" == vs[0]);
+  CPPUNIT_ASSERT(vssize > 1 && "1" == vs[1]);
+  CPPUNIT_ASSERT(vssize > 1 && "a" == vs[3]);
+  vs = test.getParameter<std::vector<std::string> >("vs2");
+  CPPUNIT_ASSERT(vs.size() == 0);
+  vs = test.getParameter<std::vector<std::string> >("vs3");
+  CPPUNIT_ASSERT(vs.size() == 1);
+  CPPUNIT_ASSERT(vs[0] == "");
+
+  static unsigned int const vuia[] = {1, 2, 1, 255};
+  static std::vector<unsigned int> const vui(vuia, vuia + sizeof(vuia) / sizeof(unsigned int));
+  CPPUNIT_ASSERT(vui == test.getParameter<std::vector<unsigned int> >("vui"));
+
+  static int const via[] = {1, -2};
+  static std::vector<int> const vi(via, via + sizeof(via) / sizeof(int));
+  test.getParameter<std::vector<int> >("vi");
+  CPPUNIT_ASSERT(true == test.getUntrackedParameter<bool>("b", false));
+  CPPUNIT_ASSERT(test.retrieve("vi").isTracked());
+  //test.getParameter<std::vector<bool> >("vb");
+  edm::ParameterSet const& ps = test.getParameterSet("ps");
+  CPPUNIT_ASSERT(true == ps.getUntrackedParameter<bool>("b2", false));
+  std::vector<edm::ParameterSet> const& vps = test.getParameterSetVector("vps");
+  CPPUNIT_ASSERT(1 == vps.size());
+  CPPUNIT_ASSERT(false == vps.front().getParameter<bool>("b3"));
+
+  // InputTag
+  edm::InputTag inputProduct = test.getParameter<edm::InputTag>("input");
+  edm::InputTag inputProduct1 = test.getParameter<edm::InputTag>("input1");
+  edm::InputTag inputProduct2 = test.getParameter<edm::InputTag>("input2");
+  edm::InputTag inputProduct3 = test.getUntrackedParameter<edm::InputTag>("input3");
+  edm::InputTag inputProduct4 = test.getParameter<edm::InputTag>("input4");
+  edm::InputTag inputProduct5 = test.getParameter<edm::InputTag>("input5");
+  edm::InputTag inputProduct6 = test.getParameter<edm::InputTag>("input6");
+  edm::InputTag inputProduct7 = test.getParameter<edm::InputTag>("input7");
+  edm::InputTag inputProduct8 = test.getParameter<edm::InputTag>("input8");
+
+  //edm::OutputTag outputProduct = test.getParameter<edm::OutputTag>("output");
+
+  CPPUNIT_ASSERT("Label" == inputProduct.label());
+  CPPUNIT_ASSERT("Label1" == inputProduct1.label());
+  CPPUNIT_ASSERT("Label2" == inputProduct2.label());
+  CPPUNIT_ASSERT("Instance2" == inputProduct2.instance());
+  CPPUNIT_ASSERT("Label3" == inputProduct3.label());
+  CPPUNIT_ASSERT("Instance3" == inputProduct3.instance());
+  CPPUNIT_ASSERT("Label4" == inputProduct4.label());
+  CPPUNIT_ASSERT("Instance4" == inputProduct4.instance());
+  CPPUNIT_ASSERT("Process4" == inputProduct4.process());
+  CPPUNIT_ASSERT("Label5" == inputProduct5.label());
+  CPPUNIT_ASSERT("" == inputProduct5.instance());
+  CPPUNIT_ASSERT("Process5" == inputProduct5.process());
+  CPPUNIT_ASSERT("source" == inputProduct6.label());
+  CPPUNIT_ASSERT("source" == inputProduct7.label());
+  CPPUNIT_ASSERT("deprecatedString" == inputProduct8.label());
+
+  // vector of InputTags
+
+  std::vector<edm::InputTag> vtags = test.getParameter<std::vector<edm::InputTag> >("vinput");
+  CPPUNIT_ASSERT("l1" == vtags[0].label());
+  CPPUNIT_ASSERT("i1" == vtags[0].instance());
+  CPPUNIT_ASSERT("l2" == vtags[1].label());
+  CPPUNIT_ASSERT("l3" == vtags[2].label());
+  CPPUNIT_ASSERT("i3" == vtags[2].instance());
+  CPPUNIT_ASSERT("p3" == vtags[2].process());
+  CPPUNIT_ASSERT("l4" == vtags[3].label());
+  CPPUNIT_ASSERT("" == vtags[3].instance());
+  CPPUNIT_ASSERT("p4" == vtags[3].process());
+  CPPUNIT_ASSERT("source" == vtags[4].label());
+  CPPUNIT_ASSERT("source" == vtags[5].label());
+
+  // ESInputTag
+  edm::ESInputTag einput1 = test.getParameter<edm::ESInputTag>("einput1");
+  edm::ESInputTag einput2 = test.getParameter<edm::ESInputTag>("einput2");
+  edm::ESInputTag einput3 = test.getParameter<edm::ESInputTag>("einput3");
+  edm::ESInputTag einput4 = test.getParameter<edm::ESInputTag>("einput4");
+  edm::ESInputTag einput5 = test.getParameter<edm::ESInputTag>("einput5");
+  CPPUNIT_ASSERT("" == einput1.module());
+  CPPUNIT_ASSERT("" == einput1.data());
+  CPPUNIT_ASSERT("" == einput2.module());
+  CPPUNIT_ASSERT("blah" == einput2.data());
+  CPPUNIT_ASSERT("ESProd" == einput3.module());
+  CPPUNIT_ASSERT("" == einput3.data());
+  CPPUNIT_ASSERT("ESProd" == einput4.module());
+  CPPUNIT_ASSERT("something" == einput4.data());
+  CPPUNIT_ASSERT("ESProd" == einput5.module());
+  CPPUNIT_ASSERT("something" == einput5.data());
+
+  std::vector<edm::ESInputTag> veinput1 = test.getParameter<std::vector<edm::ESInputTag> >("veinput1");
+  std::vector<edm::ESInputTag> veinput2 = test.getParameter<std::vector<edm::ESInputTag> >("veinput2");
+  CPPUNIT_ASSERT(0 == veinput1.size());
+  CPPUNIT_ASSERT(2 == veinput2.size());
+  CPPUNIT_ASSERT("" == veinput2[0].module());
+  CPPUNIT_ASSERT("blah" == veinput2[0].data());
+  CPPUNIT_ASSERT("ESProd" == veinput2[1].module());
+  CPPUNIT_ASSERT("" == veinput2[1].data());
+
+  edm::EventID eventID = test.getParameter<edm::EventID>("eventID");
+  std::vector<edm::EventID> vEventID = test.getParameter<std::vector<edm::EventID> >("vEventID");
+  CPPUNIT_ASSERT(1 == eventID.run());
+  CPPUNIT_ASSERT(1 == eventID.event());
+  CPPUNIT_ASSERT(1 == vEventID[0].run());
+  CPPUNIT_ASSERT(1 == vEventID[0].event());
+  CPPUNIT_ASSERT(3 == vEventID[2].run());
+  CPPUNIT_ASSERT(3 == vEventID[2].event());
+
+  edm::LuminosityBlockID lumi = test.getParameter<edm::LuminosityBlockID>("lumi");
+  CPPUNIT_ASSERT(55 == lumi.run());
+  CPPUNIT_ASSERT(65 == lumi.luminosityBlock());
+  std::vector<edm::LuminosityBlockID> vlumis = test.getParameter<std::vector<edm::LuminosityBlockID> >("vlumis");
+  CPPUNIT_ASSERT(vlumis.size() == 2);
+  CPPUNIT_ASSERT(vlumis[0].run() == 75);
+  CPPUNIT_ASSERT(vlumis[0].luminosityBlock() == 85);
+  CPPUNIT_ASSERT(vlumis[1].run() == 95);
+  CPPUNIT_ASSERT(vlumis[1].luminosityBlock() == 105);
+
+  //CPPUNIT_ASSERT("Label2" == outputProduct.label());
+  //CPPUNIT_ASSERT(""       == outputProduct.instance());
+  //CPPUNIT_ASSERT("Alias2" == outputProduct.alias());
+  //BOOST_CHECK_THROW(makePSet(*nodeList), std::runtime_error);
 }
diff --git a/FWCore/PyDevParameterSet/test/processbuilder_t.cppunit.cpp b/FWCore/PyDevParameterSet/test/processbuilder_t.cppunit.cpp
index 7c0223f86ccdb..2f5a6b3bab353 100644
--- a/FWCore/PyDevParameterSet/test/processbuilder_t.cppunit.cpp
+++ b/FWCore/PyDevParameterSet/test/processbuilder_t.cppunit.cpp
@@ -18,8 +18,7 @@
 #include <string>
 #include <iostream>
 
-class testProcessDesc: public CppUnit::TestFixture {
-
+class testProcessDesc : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testProcessDesc);
 
   CPPUNIT_TEST(trivialPathTest);
@@ -57,147 +56,142 @@ CPPUNIT_TEST_SUITE_REGISTRATION(testProcessDesc);
 
 void testProcessDesc::trivialPathTest() {
   std::string str =
-  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('X')\n"
-  "process.a = cms.EDFilter('A',\n"
-  "    p = cms.int32(3)\n"
-  ")\n"
-  "process.b = cms.EDProducer('B')\n"
-  "process.c = cms.EDProducer('C')\n"
-  "process.p = cms.Path(process.a*process.b*process.c)\n";
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('X')\n"
+      "process.a = cms.EDFilter('A',\n"
+      "    p = cms.int32(3)\n"
+      ")\n"
+      "process.b = cms.EDProducer('B')\n"
+      "process.c = cms.EDProducer('C')\n"
+      "process.p = cms.Path(process.a*process.b*process.c)\n";
 
   std::shared_ptr<edm::ParameterSet> test = cmspython3::PyBind11ProcessDesc(str).parameterSet();
 
   typedef std::vector<std::string> Strs;
 
   Strs s = (*test).getParameter<std::vector<std::string> >("p");
-  CPPUNIT_ASSERT(s[0]=="a");
+  CPPUNIT_ASSERT(s[0] == "a");
   //CPPUNIT_ASSERT(b->getDependencies("a")=="");
 }
 
 void testProcessDesc::simplePathTest() {
-
   std::string str =
-  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('X')\n"
-  "process.a = cms.EDFilter('A',\n"
-  "    p = cms.int32(3)\n"
-  ")\n"
-  "process.b = cms.EDFilter('A',\n"
-  "    p = cms.int32(3)\n"
-  ")\n"
-  "process.c = cms.EDFilter('A',\n"
-  "    p = cms.int32(3)\n"
-  ")\n"
-  "process.p = cms.Path(process.a*process.b*process.c)\n";
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('X')\n"
+      "process.a = cms.EDFilter('A',\n"
+      "    p = cms.int32(3)\n"
+      ")\n"
+      "process.b = cms.EDFilter('A',\n"
+      "    p = cms.int32(3)\n"
+      ")\n"
+      "process.c = cms.EDFilter('A',\n"
+      "    p = cms.int32(3)\n"
+      ")\n"
+      "process.p = cms.Path(process.a*process.b*process.c)\n";
 
   std::shared_ptr<edm::ParameterSet> test = cmspython3::PyBind11ProcessDesc(str).parameterSet();
 
   typedef std::vector<std::string> Strs;
 
   Strs s = (*test).getParameter<std::vector<std::string> >("p");
-  CPPUNIT_ASSERT(s[0]=="a");
-  CPPUNIT_ASSERT(s[1]=="b");
-  CPPUNIT_ASSERT(s[2]=="c");
+  CPPUNIT_ASSERT(s[0] == "a");
+  CPPUNIT_ASSERT(s[1] == "b");
+  CPPUNIT_ASSERT(s[2] == "c");
 
   //CPPUNIT_ASSERT (b->getDependencies("a")=="");
   //CPPUNIT_ASSERT (b->getDependencies("b")=="a,");
   //CPPUNIT_ASSERT (b->getDependencies("c")=="a,b,");
 }
 
-void testProcessDesc:: attriggertest () {
-
+void testProcessDesc::attriggertest() {
   std::string str =
-  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('test')\n"
-  "process.cone1 = cms.EDFilter('PhonyConeJet',\n"
-  "    i = cms.int32(5)\n"
-  ")\n"
-  "process.cone2 = cms.EDFilter('PhonyConeJet',\n"
-  "    i = cms.int32(7)\n"
-  ")\n"
-  "process.somejet1 = cms.EDFilter('PhonyJet',\n"
-  "    i = cms.int32(7)\n"
-  ")\n"
-  "process.somejet2 = cms.EDFilter('PhonyJet',\n"
-  "    i = cms.int32(7)\n"
-  ")\n"
-  "process.jtanalyzer = cms.EDFilter('PhonyConeJet',\n"
-  "    i = cms.int32(7)\n"
-  ")\n"
-  "process.output = cms.OutputModule('OutputModule')\n"
-  "process.cones = cms.Sequence(process.cone1*process.cone2)\n"
-  "process.jets = cms.Sequence(process.somejet1*process.somejet2)\n"
-  "process.path1 = cms.Path(process.cones*process.jets*process.jtanalyzer)\n"
-  "process.epath = cms.EndPath(process.output)\n";
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.cone1 = cms.EDFilter('PhonyConeJet',\n"
+      "    i = cms.int32(5)\n"
+      ")\n"
+      "process.cone2 = cms.EDFilter('PhonyConeJet',\n"
+      "    i = cms.int32(7)\n"
+      ")\n"
+      "process.somejet1 = cms.EDFilter('PhonyJet',\n"
+      "    i = cms.int32(7)\n"
+      ")\n"
+      "process.somejet2 = cms.EDFilter('PhonyJet',\n"
+      "    i = cms.int32(7)\n"
+      ")\n"
+      "process.jtanalyzer = cms.EDFilter('PhonyConeJet',\n"
+      "    i = cms.int32(7)\n"
+      ")\n"
+      "process.output = cms.OutputModule('OutputModule')\n"
+      "process.cones = cms.Sequence(process.cone1*process.cone2)\n"
+      "process.jets = cms.Sequence(process.somejet1*process.somejet2)\n"
+      "process.path1 = cms.Path(process.cones*process.jets*process.jtanalyzer)\n"
+      "process.epath = cms.EndPath(process.output)\n";
 
   try {
-  std::shared_ptr<edm::ParameterSet> test = cmspython3::PyBind11ProcessDesc(str).parameterSet();
+    std::shared_ptr<edm::ParameterSet> test = cmspython3::PyBind11ProcessDesc(str).parameterSet();
 
-  typedef std::vector<std::string> Strs;
+    typedef std::vector<std::string> Strs;
 
-  edm::ParameterSet const& trig_pset =
-   (*test).getParameterSet("@trigger_paths");
-  Strs tnames = trig_pset.getParameter<Strs>("@trigger_paths");
-  Strs enames = (*test).getParameter<Strs>("@end_paths");
+    edm::ParameterSet const& trig_pset = (*test).getParameterSet("@trigger_paths");
+    Strs tnames = trig_pset.getParameter<Strs>("@trigger_paths");
+    Strs enames = (*test).getParameter<Strs>("@end_paths");
 
-  CPPUNIT_ASSERT(tnames[0]=="path1");
-  CPPUNIT_ASSERT(enames[0]=="epath");
+    CPPUNIT_ASSERT(tnames[0] == "path1");
+    CPPUNIT_ASSERT(enames[0] == "epath");
 
-  // see if the auto-schedule is correct
-  Strs schedule = (*test).getParameter<Strs>("@paths");
-  CPPUNIT_ASSERT(schedule.size() == 2);
-  CPPUNIT_ASSERT(schedule[0] == "path1");
-  CPPUNIT_ASSERT(schedule[1] == "epath");
+    // see if the auto-schedule is correct
+    Strs schedule = (*test).getParameter<Strs>("@paths");
+    CPPUNIT_ASSERT(schedule.size() == 2);
+    CPPUNIT_ASSERT(schedule[0] == "path1");
+    CPPUNIT_ASSERT(schedule[1] == "epath");
 
-  }
-  catch (cms::Exception& exc) {
+  } catch (cms::Exception& exc) {
     std::cerr << "Got an cms::Exception: " << exc.what() << "\n";
     throw;
-  }
-  catch (std::exception& exc) {
+  } catch (std::exception& exc) {
     std::cerr << "Got an std::exception: " << exc.what() << "\n";
     throw;
-  }
-  catch (...) {
-    std::cerr << "Got an unknown exception: " << "\n";
+  } catch (...) {
+    std::cerr << "Got an unknown exception: "
+              << "\n";
     throw;
   }
 }
 
-void testProcessDesc:: sequenceSubstitutionTest () {
-
-  std::string str = "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('test')\n"
-  "process.cone1 = cms.EDFilter('PhonyConeJet',\n"
-  "    i = cms.int32(5)\n"
-  ")\n"
-  "process.cone2 = cms.EDFilter('PhonyConeJet',\n"
-  "    i = cms.int32(7)\n"
-  ")\n"
-  "process.somejet1 = cms.EDFilter('PhonyJet',\n"
-  "    i = cms.int32(7)\n"
-  ")\n"
-  "process.somejet2 = cms.EDFilter('PhonyJet',\n"
-  "    i = cms.int32(7)\n"
-  ")\n"
-  "process.jtanalyzer = cms.EDFilter('PhonyConeJet',\n"
-  "    i = cms.int32(7)\n"
-  ")\n"
-  "process.cones = cms.Sequence(process.cone1*process.cone2)\n"
-  "process.jets = cms.Sequence(process.somejet1*process.somejet2)\n"
-  "process.path1 = cms.Path(process.cones*process.jets*process.jtanalyzer)\n";
+void testProcessDesc::sequenceSubstitutionTest() {
+  std::string str =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.cone1 = cms.EDFilter('PhonyConeJet',\n"
+      "    i = cms.int32(5)\n"
+      ")\n"
+      "process.cone2 = cms.EDFilter('PhonyConeJet',\n"
+      "    i = cms.int32(7)\n"
+      ")\n"
+      "process.somejet1 = cms.EDFilter('PhonyJet',\n"
+      "    i = cms.int32(7)\n"
+      ")\n"
+      "process.somejet2 = cms.EDFilter('PhonyJet',\n"
+      "    i = cms.int32(7)\n"
+      ")\n"
+      "process.jtanalyzer = cms.EDFilter('PhonyConeJet',\n"
+      "    i = cms.int32(7)\n"
+      ")\n"
+      "process.cones = cms.Sequence(process.cone1*process.cone2)\n"
+      "process.jets = cms.Sequence(process.somejet1*process.somejet2)\n"
+      "process.path1 = cms.Path(process.cones*process.jets*process.jtanalyzer)\n";
 
   std::shared_ptr<edm::ParameterSet> test = cmspython3::PyBind11ProcessDesc(str).parameterSet();
 
   typedef std::vector<std::string> Strs;
 
   Strs s = (*test).getParameter<std::vector<std::string> >("path1");
-  CPPUNIT_ASSERT(s[0]=="cone1");
-  CPPUNIT_ASSERT(s[1]=="cone2");
-  CPPUNIT_ASSERT(s[2]=="somejet1");
-  CPPUNIT_ASSERT(s[3]=="somejet2");
-  CPPUNIT_ASSERT(s[4]=="jtanalyzer");
+  CPPUNIT_ASSERT(s[0] == "cone1");
+  CPPUNIT_ASSERT(s[1] == "cone2");
+  CPPUNIT_ASSERT(s[2] == "somejet1");
+  CPPUNIT_ASSERT(s[3] == "somejet2");
+  CPPUNIT_ASSERT(s[4] == "jtanalyzer");
 
   //CPPUNIT_ASSERT (b->getDependencies("cone1")=="");
   //CPPUNIT_ASSERT (b->getDependencies("cone2")=="cone1,");
@@ -207,25 +201,25 @@ void testProcessDesc:: sequenceSubstitutionTest () {
 }
 
 void testProcessDesc::nestedSequenceSubstitutionTest() {
-
-  std::string str = "import FWCore.ParameterSet.Config as cms\n"
-   "process = cms.Process('test')\n"
-   "process.a = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
-   "process.b = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.c = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-   "process.d = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-   "process.s1 = cms.Sequence( process.a+ process.b)\n"
-   "process.s2 = cms.Sequence(process.s1+ process.c)\n"
-   "process.path1 = cms.Path(process.s2+process.d)\n";
+  std::string str =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.a = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
+      "process.b = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.c = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.d = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.s1 = cms.Sequence( process.a+ process.b)\n"
+      "process.s2 = cms.Sequence(process.s1+ process.c)\n"
+      "process.path1 = cms.Path(process.s2+process.d)\n";
   std::shared_ptr<edm::ParameterSet> test = cmspython3::PyBind11ProcessDesc(str).parameterSet();
 
   typedef std::vector<std::string> Strs;
 
   Strs s = (*test).getParameter<std::vector<std::string> >("path1");
-  CPPUNIT_ASSERT(s[0]=="a");
-  CPPUNIT_ASSERT(s[1]=="b");
-  CPPUNIT_ASSERT(s[2]=="c");
-  CPPUNIT_ASSERT(s[3]=="d");
+  CPPUNIT_ASSERT(s[0] == "a");
+  CPPUNIT_ASSERT(s[1] == "b");
+  CPPUNIT_ASSERT(s[2] == "c");
+  CPPUNIT_ASSERT(s[3] == "d");
 
   //CPPUNIT_ASSERT (b.getDependencies("a")=="");
   //CPPUNIT_ASSERT (b.getDependencies("b")=="a,");
@@ -234,30 +228,30 @@ void testProcessDesc::nestedSequenceSubstitutionTest() {
 }
 
 void testProcessDesc::sequenceSubstitutionTest2() {
-
-  std::string str = "import FWCore.ParameterSet.Config as cms\n"
-   "process = cms.Process('test')\n"
-   "process.cone1 = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
-   "process.cone2 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.cone3 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.somejet1 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-   "process.somejet2 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-   "process.jtanalyzer = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.cones = cms.Sequence(process.cone1+ process.cone2+ process.cone3)\n"
-   "process.jets = cms.Sequence(process.somejet1+ process.somejet2)\n"
-   "process.path1 = cms.Path(process.cones+process.jets+ process.jtanalyzer)\n";
+  std::string str =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.cone1 = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
+      "process.cone2 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.cone3 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.somejet1 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.somejet2 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.jtanalyzer = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.cones = cms.Sequence(process.cone1+ process.cone2+ process.cone3)\n"
+      "process.jets = cms.Sequence(process.somejet1+ process.somejet2)\n"
+      "process.path1 = cms.Path(process.cones+process.jets+ process.jtanalyzer)\n";
 
   std::shared_ptr<edm::ParameterSet> test = cmspython3::PyBind11ProcessDesc(str).parameterSet();
 
   typedef std::vector<std::string> Strs;
 
   Strs s = (*test).getParameter<std::vector<std::string> >("path1");
-  CPPUNIT_ASSERT(s[0]=="cone1");
-  CPPUNIT_ASSERT(s[1]=="cone2");
-  CPPUNIT_ASSERT(s[2]=="cone3");
-  CPPUNIT_ASSERT(s[3]=="somejet1");
-  CPPUNIT_ASSERT(s[4]=="somejet2");
-  CPPUNIT_ASSERT(s[5]=="jtanalyzer");
+  CPPUNIT_ASSERT(s[0] == "cone1");
+  CPPUNIT_ASSERT(s[1] == "cone2");
+  CPPUNIT_ASSERT(s[2] == "cone3");
+  CPPUNIT_ASSERT(s[3] == "somejet1");
+  CPPUNIT_ASSERT(s[4] == "somejet2");
+  CPPUNIT_ASSERT(s[5] == "jtanalyzer");
 
   //CPPUNIT_ASSERT (b.getDependencies("cone1")=="");
   //CPPUNIT_ASSERT (b.getDependencies("cone2")=="cone1,");
@@ -268,46 +262,46 @@ void testProcessDesc::sequenceSubstitutionTest2() {
 }
 
 void testProcessDesc::sequenceSubstitutionTest3() {
-
-   std::string str = "import FWCore.ParameterSet.Config as cms\n"
-   "process = cms.Process('test')\n"
-   "process.a = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
-   "process.b = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.c = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.aa = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-   "process.bb = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-   "process.cc = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.dd = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.aaa = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.bbb = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.ccc = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.ddd = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.eee = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.last = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-
-   "process.s1 = cms.Sequence(process.a* process.b* process.c)\n"
-   "process.s2 = cms.Sequence(process.aa*process.bb*cms.ignore(process.cc)*process.dd)\n"
-   "process.s3 = cms.Sequence(process.aaa*process.bbb*~process.ccc*process.ddd*process.eee)\n"
-   "process.path1 = cms.Path(process.s1+process.s3+process.s2+process.last)\n";
+  std::string str =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.a = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
+      "process.b = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.c = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.aa = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.bb = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.cc = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.dd = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.aaa = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.bbb = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.ccc = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.ddd = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.eee = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.last = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+
+      "process.s1 = cms.Sequence(process.a* process.b* process.c)\n"
+      "process.s2 = cms.Sequence(process.aa*process.bb*cms.ignore(process.cc)*process.dd)\n"
+      "process.s3 = cms.Sequence(process.aaa*process.bbb*~process.ccc*process.ddd*process.eee)\n"
+      "process.path1 = cms.Path(process.s1+process.s3+process.s2+process.last)\n";
 
   std::shared_ptr<edm::ParameterSet> test = cmspython3::PyBind11ProcessDesc(str).parameterSet();
 
   typedef std::vector<std::string> Strs;
 
   Strs s = (*test).getParameter<std::vector<std::string> >("path1");
-  CPPUNIT_ASSERT(s[0]=="a");
-  CPPUNIT_ASSERT(s[1]=="b");
-  CPPUNIT_ASSERT(s[2]=="c");
-  CPPUNIT_ASSERT(s[3]=="aaa");
-  CPPUNIT_ASSERT(s[4]=="bbb");
-  CPPUNIT_ASSERT(s[5]=="!ccc");
-  CPPUNIT_ASSERT(s[6]=="ddd");
-  CPPUNIT_ASSERT(s[7]=="eee");
-  CPPUNIT_ASSERT(s[8]=="aa");
-  CPPUNIT_ASSERT(s[9]=="bb");
-  CPPUNIT_ASSERT(s[10]=="-cc");
-  CPPUNIT_ASSERT(s[11]=="dd");
-  CPPUNIT_ASSERT(s[12]=="last");
+  CPPUNIT_ASSERT(s[0] == "a");
+  CPPUNIT_ASSERT(s[1] == "b");
+  CPPUNIT_ASSERT(s[2] == "c");
+  CPPUNIT_ASSERT(s[3] == "aaa");
+  CPPUNIT_ASSERT(s[4] == "bbb");
+  CPPUNIT_ASSERT(s[5] == "!ccc");
+  CPPUNIT_ASSERT(s[6] == "ddd");
+  CPPUNIT_ASSERT(s[7] == "eee");
+  CPPUNIT_ASSERT(s[8] == "aa");
+  CPPUNIT_ASSERT(s[9] == "bb");
+  CPPUNIT_ASSERT(s[10] == "-cc");
+  CPPUNIT_ASSERT(s[11] == "dd");
+  CPPUNIT_ASSERT(s[12] == "last");
 
   //CPPUNIT_ASSERT (b.getDependencies("a")=="");
   //CPPUNIT_ASSERT (b.getDependencies("b")=="a,");
@@ -322,35 +316,34 @@ void testProcessDesc::sequenceSubstitutionTest3() {
   //CPPUNIT_ASSERT (b.getDependencies("cc")=="a,aa,aaa,b,bb,bbb,c,ccc,ddd,eee,");
   //CPPUNIT_ASSERT (b.getDependencies("dd")=="a,aa,aaa,b,bb,bbb,c,cc,ccc,ddd,eee,");
   //CPPUNIT_ASSERT (b.getDependencies("last")=="a,aa,aaa,b,bb,bbb,c,cc,ccc,dd,ddd,eee,");
-
 }
 
 void testProcessDesc::multiplePathsTest() {
-
-  std::string str = "import FWCore.ParameterSet.Config as cms\n"
-    "process = cms.Process('test')\n"
-    "process.cone1 = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
-    "process.cone2 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-    "process.cone3 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-    "process.somejet1 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-    "process.somejet2 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-    "process.jtanalyzer = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-    "process.anotherjtanalyzer = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-    "process.cones = cms.Sequence(process.cone1* process.cone2* process.cone3)\n"
-    "process.jets = cms.Sequence(process.somejet1* process.somejet2)\n"
-    "process.path1 = cms.Path(process.cones+ process.jtanalyzer)\n"
-    "process.path2 = cms.Path(process.jets+ process.anotherjtanalyzer)\n"
-    "process.schedule = cms.Schedule(process.path2, process.path1)\n";
+  std::string str =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.cone1 = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
+      "process.cone2 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.cone3 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.somejet1 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.somejet2 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.jtanalyzer = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.anotherjtanalyzer = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.cones = cms.Sequence(process.cone1* process.cone2* process.cone3)\n"
+      "process.jets = cms.Sequence(process.somejet1* process.somejet2)\n"
+      "process.path1 = cms.Path(process.cones+ process.jtanalyzer)\n"
+      "process.path2 = cms.Path(process.jets+ process.anotherjtanalyzer)\n"
+      "process.schedule = cms.Schedule(process.path2, process.path1)\n";
 
   std::shared_ptr<edm::ParameterSet> test = cmspython3::PyBind11ProcessDesc(str).parameterSet();
 
   typedef std::vector<std::string> Strs;
 
   Strs s = (*test).getParameter<std::vector<std::string> >("path1");
-  CPPUNIT_ASSERT(s[0]=="cone1");
-  CPPUNIT_ASSERT(s[1]=="cone2");
-  CPPUNIT_ASSERT(s[2]=="cone3");
-  CPPUNIT_ASSERT(s[3]=="jtanalyzer");
+  CPPUNIT_ASSERT(s[0] == "cone1");
+  CPPUNIT_ASSERT(s[1] == "cone2");
+  CPPUNIT_ASSERT(s[2] == "cone3");
+  CPPUNIT_ASSERT(s[3] == "jtanalyzer");
 
   //CPPUNIT_ASSERT (b.getDependencies("cone1")=="");
   //CPPUNIT_ASSERT (b.getDependencies("cone2")=="cone1,");
@@ -358,9 +351,9 @@ void testProcessDesc::multiplePathsTest() {
   //CPPUNIT_ASSERT (b.getDependencies("jtanalyzer")=="cone1,cone2,cone3,");
 
   s = (*test).getParameter<std::vector<std::string> >("path2");
-  CPPUNIT_ASSERT(s[0]=="somejet1");
-  CPPUNIT_ASSERT(s[1]=="somejet2");
-  CPPUNIT_ASSERT(s[2]=="anotherjtanalyzer");
+  CPPUNIT_ASSERT(s[0] == "somejet1");
+  CPPUNIT_ASSERT(s[1] == "somejet2");
+  CPPUNIT_ASSERT(s[2] == "anotherjtanalyzer");
 
   //CPPUNIT_ASSERT (b.getDependencies("somejet1")=="");
   //CPPUNIT_ASSERT (b.getDependencies("somejet2")=="somejet1,");
@@ -368,35 +361,35 @@ void testProcessDesc::multiplePathsTest() {
 
   Strs schedule = (*test).getParameter<std::vector<std::string> >("@paths");
 
-  CPPUNIT_ASSERT (schedule.size() == 2);
-  CPPUNIT_ASSERT (schedule[0] == "path2");
-  CPPUNIT_ASSERT (schedule[1] == "path1");
+  CPPUNIT_ASSERT(schedule.size() == 2);
+  CPPUNIT_ASSERT(schedule[0] == "path2");
+  CPPUNIT_ASSERT(schedule[1] == "path1");
 }
 
 void testProcessDesc::inconsistentPathTest() {
-
-  std::string str = "import FWCore.ParameterSet.Config as cms\n"
-   "process = cms.Process('test')\n"
-   "process.a = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
-   "process.b = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.c = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-   "process.path1 = cms.Path((process.a*process.b)+ (process.c*process.b))\n";
+  std::string str =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.a = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
+      "process.b = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.c = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.path1 = cms.Path((process.a*process.b)+ (process.c*process.b))\n";
   std::shared_ptr<edm::ParameterSet> test = cmspython3::PyBind11ProcessDesc(str).parameterSet();
 }
 
 void testProcessDesc::inconsistentMultiplePathTest() {
-
-   std::string str = "import FWCore.ParameterSet.Config as cms\n"
-   "process = cms.Process('test')\n"
-   "process.cone1 = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
-   "process.cone2 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.somejet1 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-   "process.somejet2 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-   "process.jtanalyzer = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.cones = cms.Sequence(process.cone1+ process.cone2)\n"
-   "process.jets = cms.Sequence(process.somejet1* process.somejet2)\n"
-   "process.path1 = cms.Path(process.cones*process.jtanalyzer)\n"
-   "process.path2 = cms.Path(process.jets*process.jtanalyzer)\n";
+  std::string str =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.cone1 = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
+      "process.cone2 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.somejet1 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.somejet2 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.jtanalyzer = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.cones = cms.Sequence(process.cone1+ process.cone2)\n"
+      "process.jets = cms.Sequence(process.somejet1* process.somejet2)\n"
+      "process.path1 = cms.Path(process.cones*process.jtanalyzer)\n"
+      "process.path2 = cms.Path(process.jets*process.jtanalyzer)\n";
 
   std::shared_ptr<edm::ParameterSet> test = cmspython3::PyBind11ProcessDesc(str).parameterSet();
 }
diff --git a/FWCore/PyDevParameterSet/test/readpsetsfrom_t.cppunit.cc b/FWCore/PyDevParameterSet/test/readpsetsfrom_t.cppunit.cc
index 972efd9400c06..ebe604fafb4fe 100644
--- a/FWCore/PyDevParameterSet/test/readpsetsfrom_t.cppunit.cc
+++ b/FWCore/PyDevParameterSet/test/readpsetsfrom_t.cppunit.cc
@@ -7,7 +7,6 @@
  * 
  */
 
-
 #include <cppunit/extensions/HelperMacros.h>
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -21,33 +20,29 @@
 #include <string>
 #include <vector>
 
-class testreadpsetsfrom: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(testreadpsetsfrom);
-CPPUNIT_TEST(simpleTest);
-CPPUNIT_TEST_SUITE_END();
+class testreadpsetsfrom : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testreadpsetsfrom);
+  CPPUNIT_TEST(simpleTest);
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
   void simpleTest();
-private:
 
+private:
 };
 
-
-
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testreadpsetsfrom);
 
-void testreadpsetsfrom::simpleTest()
-{
-   const char* kTest ="import FWCore.ParameterSet.Config as cms\n"
-                      "dummy =  cms.PSet(b = cms.bool(True))\n"
-                      "foo = cms.PSet(a = cms.string('blah'))\n"
-   ;
-   std::shared_ptr<edm::ParameterSet> test = edm::cmspybind11_p3::readPSetsFrom(kTest);
-   
-   CPPUNIT_ASSERT(test->getParameterSet("dummy").getParameter<bool>("b")==true);
-   CPPUNIT_ASSERT(test->getParameterSet("foo").getParameter<std::string>("a")==std::string("blah"));
-}
+void testreadpsetsfrom::simpleTest() {
+  const char* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "dummy =  cms.PSet(b = cms.bool(True))\n"
+      "foo = cms.PSet(a = cms.string('blah'))\n";
+  std::shared_ptr<edm::ParameterSet> test = edm::cmspybind11_p3::readPSetsFrom(kTest);
 
+  CPPUNIT_ASSERT(test->getParameterSet("dummy").getParameter<bool>("b") == true);
+  CPPUNIT_ASSERT(test->getParameterSet("foo").getParameter<std::string>("a") == std::string("blah"));
+}
diff --git a/FWCore/PythonFramework/interface/PythonEventProcessor.h b/FWCore/PythonFramework/interface/PythonEventProcessor.h
index 95741383b91c2..78fb97da06058 100644
--- a/FWCore/PythonFramework/interface/PythonEventProcessor.h
+++ b/FWCore/PythonFramework/interface/PythonEventProcessor.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/PythonFramework
 // Class  :     PythonEventProcessor
-// 
+//
 /**\class PythonEventProcessor PythonEventProcessor.h "PythonEventProcessor.h"
 
  Description: [one line class summary]
@@ -27,46 +27,37 @@
 // forward declarations
 class PythonProcessDesc;
 
-class PythonEventProcessor
-{
-
-   public:
-      PythonEventProcessor(PyBind11ProcessDesc const&);
-      ~PythonEventProcessor();
-      // ---------- const member functions ---------------------
-      /// Return the number of events this EventProcessor has tried to process
-      /// (inclues both successes and failures, including failures due
-      /// to exceptions during processing).
-      int totalEvents() const {
-         return processor_.totalEvents();
-      }
+class PythonEventProcessor {
+public:
+  PythonEventProcessor(PyBind11ProcessDesc const&);
+  ~PythonEventProcessor();
+  // ---------- const member functions ---------------------
+  /// Return the number of events this EventProcessor has tried to process
+  /// (inclues both successes and failures, including failures due
+  /// to exceptions during processing).
+  int totalEvents() const { return processor_.totalEvents(); }
 
-      /// Return the number of events processed by this EventProcessor
-      /// which have been passed by one or more trigger paths.
-      int totalEventsPassed() const {
-         return processor_.totalEventsPassed();
-      }
+  /// Return the number of events processed by this EventProcessor
+  /// which have been passed by one or more trigger paths.
+  int totalEventsPassed() const { return processor_.totalEventsPassed(); }
 
-      /// Return the number of events that have not passed any trigger.
-      /// (N.B. totalEventsFailed() + totalEventsPassed() == totalEvents()
-      int totalEventsFailed() const {
-         return processor_.totalEventsFailed();
-      }
+  /// Return the number of events that have not passed any trigger.
+  /// (N.B. totalEventsFailed() + totalEventsPassed() == totalEvents()
+  int totalEventsFailed() const { return processor_.totalEventsFailed(); }
 
-      // ---------- static member functions --------------------
+  // ---------- static member functions --------------------
 
-      // ---------- member functions ---------------------------
-      void run();
+  // ---------- member functions ---------------------------
+  void run();
 
-   private:
-      PythonEventProcessor(const PythonEventProcessor&) = delete; // stop default
+private:
+  PythonEventProcessor(const PythonEventProcessor&) = delete;  // stop default
 
-      const PythonEventProcessor& operator=(const PythonEventProcessor&) = delete; // stop default
+  const PythonEventProcessor& operator=(const PythonEventProcessor&) = delete;  // stop default
 
-      // ---------- member data --------------------------------
-      int forcePluginSetupFirst_;
-      edm::EventProcessor processor_;
+  // ---------- member data --------------------------------
+  int forcePluginSetupFirst_;
+  edm::EventProcessor processor_;
 };
 
-
 #endif
diff --git a/FWCore/PythonFramework/src/PythonEventProcessor.cc b/FWCore/PythonFramework/src/PythonEventProcessor.cc
index f2a575753b9b3..7bb027f9990fb 100644
--- a/FWCore/PythonFramework/src/PythonEventProcessor.cc
+++ b/FWCore/PythonFramework/src/PythonEventProcessor.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Subsystem/Package
 // Class  :     PythonEventProcessor
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -29,23 +29,23 @@
 #include "FWCore/PluginManager/interface/standard.h"
 
 namespace {
-   std::once_flag pluginFlag;
-   int setupPluginSystem() {
-      std::call_once(pluginFlag, []() {
-         edmplugin::PluginManager::configure(edmplugin::standard::config());
-         });
-      return 0;
-   }
-  
+  std::once_flag pluginFlag;
+  int setupPluginSystem() {
+    std::call_once(pluginFlag, []() { edmplugin::PluginManager::configure(edmplugin::standard::config()); });
+    return 0;
+  }
+
   std::shared_ptr<edm::ProcessDesc> addDefaultServicesToProcessDesc(std::shared_ptr<edm::ProcessDesc> iDesc) {
     iDesc->addServices(edm::defaultCmsRunServices());
     return iDesc;
   }
 
   edm::ServiceToken createJobReport() {
-    return edm::ServiceRegistry::createContaining(std::make_shared<edm::serviceregistry::ServiceWrapper<edm::JobReport>>(std::make_unique<edm::JobReport>(nullptr)));
+    return edm::ServiceRegistry::createContaining(
+        std::make_shared<edm::serviceregistry::ServiceWrapper<edm::JobReport>>(
+            std::make_unique<edm::JobReport>(nullptr)));
   }
-}
+}  // namespace
 
 //
 // constants, enums and typedefs
@@ -59,30 +59,25 @@ namespace {
 // constructors and destructor
 //
 PythonEventProcessor::PythonEventProcessor(PyBind11ProcessDesc const& iDesc)
-: forcePluginSetupFirst_(setupPluginSystem())
-  ,processor_(addDefaultServicesToProcessDesc(iDesc.processDesc()),createJobReport(),edm::serviceregistry::kOverlapIsError)
-{
-}
+    : forcePluginSetupFirst_(setupPluginSystem()),
+      processor_(addDefaultServicesToProcessDesc(iDesc.processDesc()),
+                 createJobReport(),
+                 edm::serviceregistry::kOverlapIsError) {}
 
-PythonEventProcessor::~PythonEventProcessor()
-{
-   auto gil = PyEval_SaveThread();
-   try {
-      processor_.endJob();
-   }catch(...) {
-
-   }
-   PyEval_RestoreThread(gil);
+PythonEventProcessor::~PythonEventProcessor() {
+  auto gil = PyEval_SaveThread();
+  try {
+    processor_.endJob();
+  } catch (...) {
+  }
+  PyEval_RestoreThread(gil);
 }
 
-void
-PythonEventProcessor::run()
-{
-   auto gil = PyEval_SaveThread();
-   try {
-      (void) processor_.runToCompletion();
-   }catch(...) {
-
-   }
-   PyEval_RestoreThread(gil);
+void PythonEventProcessor::run() {
+  auto gil = PyEval_SaveThread();
+  try {
+    (void)processor_.runToCompletion();
+  } catch (...) {
+  }
+  PyEval_RestoreThread(gil);
 }
diff --git a/FWCore/PythonFramework/src/PythonModule.cc b/FWCore/PythonFramework/src/PythonModule.cc
index 3e8090b79a01a..ee45c90ff1f97 100644
--- a/FWCore/PythonFramework/src/PythonModule.cc
+++ b/FWCore/PythonFramework/src/PythonModule.cc
@@ -1,7 +1,6 @@
 #ifndef FWCore_PythonFramework_PythonModule_h
 #define FWCore_PythonFramework_PythonModule_h
 
-
 #include "FWCore/PythonParameterSet/interface/PyBind11ProcessDesc.h"
 
 #include "FWCore/PythonFramework/interface/PythonEventProcessor.h"
@@ -19,22 +18,21 @@
 // to add module type and label context to the messages being caught
 // here. At this point we did not think it worth the time to implement.
 
-PYBIND11_MODULE(libFWCorePythonFramework,m)
-{
+PYBIND11_MODULE(libFWCorePythonFramework, m) {
   pybind11::register_exception_translator([](std::exception_ptr p) {
-      try {
-        if (p) std::rethrow_exception(p);
-      } catch (const cms::Exception &e) {
-        PyErr_SetString(PyExc_RuntimeError, e.what());
-      }
-    });
+    try {
+      if (p)
+        std::rethrow_exception(p);
+    } catch (const cms::Exception &e) {
+      PyErr_SetString(PyExc_RuntimeError, e.what());
+    }
+  });
 
-  pybind11::class_<PythonEventProcessor>(m,"PythonEventProcessor")
-    .def(pybind11::init<PyBind11ProcessDesc const&>())
-    .def("run", &PythonEventProcessor::run)
-    .def("totalEvents", &PythonEventProcessor::totalEvents)
-    .def("totalEventsPassed", &PythonEventProcessor::totalEventsPassed)
-    .def("totalEventsFailed", &PythonEventProcessor::totalEventsFailed);
-  
+  pybind11::class_<PythonEventProcessor>(m, "PythonEventProcessor")
+      .def(pybind11::init<PyBind11ProcessDesc const &>())
+      .def("run", &PythonEventProcessor::run)
+      .def("totalEvents", &PythonEventProcessor::totalEvents)
+      .def("totalEventsPassed", &PythonEventProcessor::totalEventsPassed)
+      .def("totalEventsFailed", &PythonEventProcessor::totalEventsFailed);
 }
 #endif
diff --git a/FWCore/PythonFramework/test/PythonTestProducer.cc b/FWCore/PythonFramework/test/PythonTestProducer.cc
index 43df6921c0f48..4de96e10df590 100644
--- a/FWCore/PythonFramework/test/PythonTestProducer.cc
+++ b/FWCore/PythonFramework/test/PythonTestProducer.cc
@@ -13,49 +13,46 @@
 
 namespace edmtest {
   class PythonTestProducer : public edm::one::EDProducer<edm::one::SharedResources> {
-    
   public:
     PythonTestProducer(edm::ParameterSet const&);
-    
+
     void produce(edm::Event& iEvent, edm::EventSetup const&) override;
-    
+
   private:
     edm::EDGetTokenT<IntProduct> get_;
     edm::EDPutTokenT<int> put_;
     int value_;
     boost::python::list outputList_;
   };
-  
-  PythonTestProducer::PythonTestProducer(edm::ParameterSet const& iPS):
-  get_(consumes<IntProduct>(iPS.getParameter<edm::InputTag>("source")))
-   {
-     using namespace boost::python;
-    object main_module{ boost::python::handle<>(boost::python::borrowed(PyImport_AddModule(const_cast<char*>("__main__")))) };
+
+  PythonTestProducer::PythonTestProducer(edm::ParameterSet const& iPS)
+      : get_(consumes<IntProduct>(iPS.getParameter<edm::InputTag>("source"))) {
+    using namespace boost::python;
+    object main_module{
+        boost::python::handle<>(boost::python::borrowed(PyImport_AddModule(const_cast<char*>("__main__"))))};
     auto main_namespace = main_module.attr("__dict__");
 
     //NOTE attempts to hold the object directly and read it in `produce` lead to segmentation faults
     value_ = extract<int>(main_namespace[iPS.getParameter<std::string>("inputVariable")]);
-    
-    outputList_ = extract<list>( main_namespace[iPS.getParameter<std::string>("outputListVariable")]);
-    
+
+    outputList_ = extract<list>(main_namespace[iPS.getParameter<std::string>("outputListVariable")]);
+
     put_ = produces<int>();
-    
+
     usesResource("python");
   }
-  
-  void
-    PythonTestProducer::produce(edm::Event& iEvent, edm::EventSetup const& ) {
-      using namespace boost::python;
-
-      edm::Handle<IntProduct> h;
-      iEvent.getByToken(get_, h);
-      
-      outputList_.append(h->value );
-      
-      iEvent.emplace(put_, h->value +value_ );
-    }
-}
+
+  void PythonTestProducer::produce(edm::Event& iEvent, edm::EventSetup const&) {
+    using namespace boost::python;
+
+    edm::Handle<IntProduct> h;
+    iEvent.getByToken(get_, h);
+
+    outputList_.append(h->value);
+
+    iEvent.emplace(put_, h->value + value_);
+  }
+}  // namespace edmtest
 
 //define this as a plug-in
 DEFINE_FWK_MODULE(edmtest::PythonTestProducer);
-
diff --git a/FWCore/PythonParameterSet/interface/MakePyBind11ParameterSets.h b/FWCore/PythonParameterSet/interface/MakePyBind11ParameterSets.h
index 7bd16e71d990e..d672025d120e6 100644
--- a/FWCore/PythonParameterSet/interface/MakePyBind11ParameterSets.h
+++ b/FWCore/PythonParameterSet/interface/MakePyBind11ParameterSets.h
@@ -14,22 +14,18 @@ namespace edm {
   class ParameterSet;
   namespace cmspybind11 {
     // input can either be a python file name or a python config string
-    std::unique_ptr<ParameterSet>
-      readConfig(std::string const& config);
-    
+    std::unique_ptr<ParameterSet> readConfig(std::string const& config);
+
     /// same, but with arguments
-    std::unique_ptr<ParameterSet>
-      readConfig(std::string const& config, int argc, char* argv[]);
+    std::unique_ptr<ParameterSet> readConfig(std::string const& config, int argc, char* argv[]);
 
-  /// essentially the same as the previous method
-    void
-      makeParameterSets(std::string const& configtext,
-			std::unique_ptr<ParameterSet>& main);
+    /// essentially the same as the previous method
+    void makeParameterSets(std::string const& configtext, std::unique_ptr<ParameterSet>& main);
 
     /**finds all the PSets used in the top level module referred as a file or as a string containing
        python commands. These PSets are bundled into a top level PSet from which they can be retrieved
     */
     std::unique_ptr<ParameterSet> readPSetsFrom(std::string const& fileOrString);
-  }
-} // namespace edm
+  }  // namespace cmspybind11
+}  // namespace edm
 #endif
diff --git a/FWCore/PythonParameterSet/interface/PyBind11ProcessDesc.h b/FWCore/PythonParameterSet/interface/PyBind11ProcessDesc.h
index 0019f07c1a167..2f601fea19b69 100644
--- a/FWCore/PythonParameterSet/interface/PyBind11ProcessDesc.h
+++ b/FWCore/PythonParameterSet/interface/PyBind11ProcessDesc.h
@@ -11,7 +11,7 @@
 namespace edm {
   class ParameterSet;
   class ProcessDesc;
-}
+}  // namespace edm
 
 class PyBind11ProcessDesc {
 public:
@@ -25,14 +25,14 @@ class PyBind11ProcessDesc {
   */
   PyBind11ProcessDesc(std::string const& config);
 
-  PyBind11ProcessDesc(std::string const& config, int argc, char * argv[]);
+  PyBind11ProcessDesc(std::string const& config, int argc, char* argv[]);
 
   ~PyBind11ProcessDesc();
 
-  Python11ParameterSet newPSet() const {return Python11ParameterSet();}
+  Python11ParameterSet newPSet() const { return Python11ParameterSet(); }
+
+  Python11ParameterSet& pset() { return theProcessPSet; }
 
-  Python11ParameterSet& pset() { return theProcessPSet;}
-  
   std::string dump() const;
 
   // makes a new (copy) of the ParameterSet
diff --git a/FWCore/PythonParameterSet/interface/PyBind11Wrapper.h b/FWCore/PythonParameterSet/interface/PyBind11Wrapper.h
index 31bbe3031a275..6220ddd90d73d 100644
--- a/FWCore/PythonParameterSet/interface/PyBind11Wrapper.h
+++ b/FWCore/PythonParameterSet/interface/PyBind11Wrapper.h
@@ -8,30 +8,27 @@
 #include <iostream>
 
 namespace edm {
-void
-  pythonToCppException(const std::string& iType, const std::string& error);
+  void pythonToCppException(const std::string& iType, const std::string& error);
 
   // utility to translate from an STL vector of strings to
   // a Python list
 
-  template<typename T>
-    pybind11::list toPython11List(const std::vector<T> & v) {
-    pybind11::list result=pybind11::cast(v);
+  template <typename T>
+  pybind11::list toPython11List(const std::vector<T>& v) {
+    pybind11::list result = pybind11::cast(v);
     return result;
   }
 
   // and back.  Destroys the input via pop()s - well probably not
-  template<typename T>
-  std::vector<T> toVector(pybind11::list & l)
-  {
+  template <typename T>
+  std::vector<T> toVector(pybind11::list& l) {
     std::vector<T> result;
     result.reserve(l.size());
-    for(unsigned i = 0; i < l.size(); ++i)
-    {
+    for (unsigned i = 0; i < l.size(); ++i) {
       result.push_back(l[i].cast<T>());
     }
     return result;
   }
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/PythonParameterSet/interface/Python11ParameterSet.h b/FWCore/PythonParameterSet/interface/Python11ParameterSet.h
index a29477cea83bf..4fd9003285c48 100644
--- a/FWCore/PythonParameterSet/interface/Python11ParameterSet.h
+++ b/FWCore/PythonParameterSet/interface/Python11ParameterSet.h
@@ -20,14 +20,12 @@ class Python11ParameterSet {
 public:
   Python11ParameterSet();
 
-  Python11ParameterSet(edm::ParameterSet const& p)
-  : theParameterSet(p) {}
+  Python11ParameterSet(edm::ParameterSet const& p) : theParameterSet(p) {}
 
-  template<typename T>
-  T
-  getParameter(bool tracked, std::string const& name) const {
+  template <typename T>
+  T getParameter(bool tracked, std::string const& name) const {
     T result;
-    if(tracked) {
+    if (tracked) {
       result = theParameterSet.template getParameter<T>(name);
     } else {
       result = theParameterSet.template getUntrackedParameter<T>(name);
@@ -35,68 +33,54 @@ class Python11ParameterSet {
     return result;
   }
 
-
-  template<typename T>
-  void
-  addParameter(bool tracked, std::string const& name, T const& value) {
-   if(tracked) {
-     theParameterSet.template addParameter<T>(name, value);
-   } else {
-     theParameterSet.template addUntrackedParameter<T>(name, value);
-   }
+  template <typename T>
+  void addParameter(bool tracked, std::string const& name, T const& value) {
+    if (tracked) {
+      theParameterSet.template addParameter<T>(name, value);
+    } else {
+      theParameterSet.template addUntrackedParameter<T>(name, value);
+    }
   }
 
-
   /// templated on the type of the contained object
-  template<typename T>
-  pybind11::list
-  getParameters(bool tracked, std::string const& name) const {
+  template <typename T>
+  pybind11::list getParameters(bool tracked, std::string const& name) const {
     std::vector<T> v = getParameter<std::vector<T> >(tracked, name);
     return edm::toPython11List(v);
   }
 
   /// unfortunate side effect: destroys the original list!
-  template<typename T>
-  void
-  addParameters(bool tracked, std::string const& name,
-                pybind11::list  value) {
+  template <typename T>
+  void addParameters(bool tracked, std::string const& name, pybind11::list value) {
     std::vector<T> v = edm::toVector<T>(value);
     addParameter(tracked, name, v);
   }
 
-
   /// these custom classes do seem to be a hassle
   /// to wrap, compared to, say, InputTag
   /// maybe we will need to template these someday
-  void addPSet(bool tracked, std::string const& name,
-               Python11ParameterSet const& ppset) {
+  void addPSet(bool tracked, std::string const& name, Python11ParameterSet const& ppset) {
     addParameter(tracked, name, ppset.theParameterSet);
   }
 
-
   Python11ParameterSet getPSet(bool tracked, std::string const& name) const {
     return Python11ParameterSet(getParameter<edm::ParameterSet>(tracked, name));
   }
 
-
-  void addVPSet(bool tracked, std::string const& name,
-                pybind11::list  value);
+  void addVPSet(bool tracked, std::string const& name, pybind11::list value);
 
   pybind11::list getVPSet(bool tracked, std::string const& name);
 
   // no way to interface straight into the other python InputTag
-  edm::InputTag newInputTag(std::string const& label,
-                            std::string const& instance,
-                            std::string const& process) {
+  edm::InputTag newInputTag(std::string const& label, std::string const& instance, std::string const& process) {
     return edm::InputTag(label, instance, process);
   }
 
-   edm::ESInputTag newESInputTag(std::string const& module,
-                             std::string const& data) {
-      return edm::ESInputTag(module, data);
-   }
+  edm::ESInputTag newESInputTag(std::string const& module, std::string const& data) {
+    return edm::ESInputTag(module, data);
+  }
 
-   edm::EventID newEventID(edm::RunNumber_t run, edm::LuminosityBlockNumber_t lumi, edm::EventNumber_t event) {
+  edm::EventID newEventID(edm::RunNumber_t run, edm::LuminosityBlockNumber_t lumi, edm::EventNumber_t event) {
     return edm::EventID(run, lumi, event);
   }
 
@@ -104,25 +88,31 @@ class Python11ParameterSet {
     return edm::LuminosityBlockID(run, lumi);
   }
 
-  edm::LuminosityBlockRange newLuminosityBlockRange(unsigned int start, unsigned int startSub,
-                                                    unsigned int end,   unsigned int endSub) {
+  edm::LuminosityBlockRange newLuminosityBlockRange(unsigned int start,
+                                                    unsigned int startSub,
+                                                    unsigned int end,
+                                                    unsigned int endSub) {
     return edm::LuminosityBlockRange(start, startSub, end, endSub);
   }
 
-  edm::EventRange newEventRange(edm::RunNumber_t start, edm::LuminosityBlockNumber_t startLumi, edm::EventNumber_t startSub,
-                                edm::RunNumber_t end,   edm::LuminosityBlockNumber_t endLumi, edm::EventNumber_t endSub) {
+  edm::EventRange newEventRange(edm::RunNumber_t start,
+                                edm::LuminosityBlockNumber_t startLumi,
+                                edm::EventNumber_t startSub,
+                                edm::RunNumber_t end,
+                                edm::LuminosityBlockNumber_t endLumi,
+                                edm::EventNumber_t endSub) {
     return edm::EventRange(start, startLumi, startSub, end, endLumi, endSub);
   }
 
   void addNewFileInPath(bool tracked, std::string const& name, std::string const& value);
 
-  Python11ParameterSet newPSet() const {return Python11ParameterSet();}
+  Python11ParameterSet newPSet() const { return Python11ParameterSet(); }
 
-  edm::ParameterSet& pset() {return theParameterSet;}
+  edm::ParameterSet& pset() { return theParameterSet; }
 
-  edm::ParameterSet const& pset() const {return theParameterSet;}
+  edm::ParameterSet const& pset() const { return theParameterSet; }
 
-  std::string dump() const {return theParameterSet.dump();}
+  std::string dump() const { return theParameterSet.dump(); }
 
 private:
   edm::ParameterSet theParameterSet;
diff --git a/FWCore/PythonParameterSet/src/MakePyBind11ParameterSets.cc b/FWCore/PythonParameterSet/src/MakePyBind11ParameterSets.cc
index d2201d3ab9cab..dc8c22604054e 100644
--- a/FWCore/PythonParameterSet/src/MakePyBind11ParameterSets.cc
+++ b/FWCore/PythonParameterSet/src/MakePyBind11ParameterSets.cc
@@ -6,19 +6,16 @@
 #include "initializePyBind11Module.h"
 #include <pybind11/embed.h>
 
-static
-void
-makePSetsFromFile(std::string const& fileName) { 
-  std::string initCommand("from FWCore.ParameterSet.Types import makeCppPSet\n"
-                          "exec(open('");
+static void makePSetsFromFile(std::string const& fileName) {
+  std::string initCommand(
+      "from FWCore.ParameterSet.Types import makeCppPSet\n"
+      "exec(open('");
   initCommand += fileName + "').read())";
   pybind11::exec(initCommand);
   pybind11::exec("makeCppPSet(locals(), topPSet)");
 }
 
-static
-void
-makePSetsFromString(std::string const& module) { 
+static void makePSetsFromString(std::string const& module) {
   std::string command = module;
   command += "\nfrom FWCore.ParameterSet.Types import makeCppPSet\nmakeCppPSet(locals(), topPSet)";
   pybind11::exec(command);
@@ -26,50 +23,43 @@ makePSetsFromString(std::string const& module) {
 
 namespace edm {
   namespace cmspybind11 {
-    std::unique_ptr<ParameterSet>
-    readConfig(std::string const& config) {
+    std::unique_ptr<ParameterSet> readConfig(std::string const& config) {
       PyBind11ProcessDesc pythonProcessDesc(config);
       return pythonProcessDesc.parameterSet();
     }
 
-    std::unique_ptr<ParameterSet>
-    readConfig(std::string const& config, int argc, char* argv[]) {
+    std::unique_ptr<ParameterSet> readConfig(std::string const& config, int argc, char* argv[]) {
       PyBind11ProcessDesc pythonProcessDesc(config, argc, argv);
       return pythonProcessDesc.parameterSet();
     }
 
-    void
-    makeParameterSets(std::string const& configtext,
-		      std::unique_ptr<ParameterSet>& main) {
+    void makeParameterSets(std::string const& configtext, std::unique_ptr<ParameterSet>& main) {
       PyBind11ProcessDesc pythonProcessDesc(configtext);
       main = pythonProcessDesc.parameterSet();
     }
 
-    std::unique_ptr<ParameterSet>
-    readPSetsFrom(std::string const& module) {
-
+    std::unique_ptr<ParameterSet> readPSetsFrom(std::string const& module) {
       pybind11::scoped_interpreter guard{};
       python::initializePyBind11Module();
       std::unique_ptr<ParameterSet> retVal;
       {
-	Python11ParameterSet theProcessPSet; 
-	pybind11::object mainModule = pybind11::module::import("__main__");
-	mainModule.attr("topPSet") = pybind11::cast(&theProcessPSet);
-	
-	try {
-	  // if it ends with py, it's a file
-	  if(module.substr(module.size()-3) == ".py") {
-	    makePSetsFromFile(module);
-	  } else {
-	    makePSetsFromString(module);
-	  }
-	}
-	catch( pybind11::error_already_set const &e ) {
-	  pythonToCppException("Configuration",e.what());
-	}
-	retVal=std::make_unique<edm::ParameterSet>(ParameterSet(theProcessPSet.pset()));
+        Python11ParameterSet theProcessPSet;
+        pybind11::object mainModule = pybind11::module::import("__main__");
+        mainModule.attr("topPSet") = pybind11::cast(&theProcessPSet);
+
+        try {
+          // if it ends with py, it's a file
+          if (module.substr(module.size() - 3) == ".py") {
+            makePSetsFromFile(module);
+          } else {
+            makePSetsFromString(module);
+          }
+        } catch (pybind11::error_already_set const& e) {
+          pythonToCppException("Configuration", e.what());
+        }
+        retVal = std::make_unique<edm::ParameterSet>(ParameterSet(theProcessPSet.pset()));
       }
       return retVal;
     }
-  }
-} // namespace edm
+  }  // namespace cmspybind11
+}  // namespace edm
diff --git a/FWCore/PythonParameterSet/src/PyBind11Module.h b/FWCore/PythonParameterSet/src/PyBind11Module.h
index 33080d0735f43..dc7ad541da533 100644
--- a/FWCore/PythonParameterSet/src/PyBind11Module.h
+++ b/FWCore/PythonParameterSet/src/PyBind11Module.h
@@ -32,153 +32,142 @@
 
 #include <pybind11/pybind11.h>
 
-PYBIND11_MODULE(libFWCorePythonParameterSet,m) 
-{
+PYBIND11_MODULE(libFWCorePythonParameterSet, m) {
   pybind11::register_exception_translator([](std::exception_ptr p) {
-      try {
-        if (p) std::rethrow_exception(p);
-      } catch (const cms::Exception &e) {
-        PyErr_SetString(PyExc_RuntimeError, e.what());
-      }
-    });
-
-  pybind11::class_<edm::InputTag>(m,"InputTag")
-    .def(pybind11::init<>())
-    .def(pybind11::init<const std::string &>())
-    .def(pybind11::init<const std::string &, const std::string &, const std::string &>())
-    .def(pybind11::init<const std::string &, const std::string &>())
-    .def("label",    &edm::InputTag::label, pybind11::return_value_policy::copy) 
-    .def("instance", &edm::InputTag::instance, pybind11::return_value_policy::copy) 
-    .def("process",  &edm::InputTag::process, pybind11::return_value_policy::copy)
-    ; 
-
-  pybind11::class_<edm::ESInputTag>(m,"ESInputTag")
-    .def(pybind11::init<std::string>())
-    .def(pybind11::init<std::string, std::string>())
-    .def("module", &edm::ESInputTag::module, pybind11::return_value_policy::copy)
-    .def("data",   &edm::ESInputTag::data, pybind11::return_value_policy::copy)
-    ;
-
-  pybind11::class_<edm::EventID>(m,"EventID")
-    .def(pybind11::init<edm::RunNumber_t, edm::LuminosityBlockNumber_t, edm::EventNumber_t>())
-    .def("run",   &edm::EventID::run)
-    .def("luminosityBlock", &edm::EventID::luminosityBlock)
-    .def("event", &edm::EventID::event)
-  ;
-
-  pybind11::class_<edm::LuminosityBlockID>(m,"LuminosityBlockID")
-    .def(pybind11::init<unsigned int, unsigned int>())
-    .def("run",    &edm::LuminosityBlockID::run)
-    .def("luminosityBlock", &edm::LuminosityBlockID::luminosityBlock)
-    ;
-
-  pybind11::class_<edm::FileInPath>(m,"FileInPath")
-    .def(pybind11::init<std::string>())
-    .def("fullPath",     &edm::FileInPath::fullPath)
-    .def("relativePath", &edm::FileInPath::relativePath)
-    ;
-  
-  pybind11::class_<edm::LuminosityBlockRange>(m,"LuminosityBlockRange")
-    .def(pybind11::init<unsigned int, unsigned int, unsigned int, unsigned int>())
-    .def("start",    &edm::LuminosityBlockRange::startRun)
-    .def("startSub", &edm::LuminosityBlockRange::startLumi)
-    .def("end",      &edm::LuminosityBlockRange::endRun)
-    .def("endSub",   &edm::LuminosityBlockRange::endLumi)
-    ;
-
-  pybind11::class_<edm::EventRange>(m,"EventRange") 
-    .def(pybind11::init<edm::RunNumber_t, edm::LuminosityBlockNumber_t, edm::EventNumber_t, 
-	                edm::RunNumber_t, edm::LuminosityBlockNumber_t, edm::EventNumber_t>())
-    .def("start",     &edm::EventRange::startRun)
-    .def("startLumi", &edm::EventRange::startLumi)
-    .def("startSub",  &edm::EventRange::startEvent)
-    .def("end",       &edm::EventRange::endRun)
-    .def("endLumi",   &edm::EventRange::endLumi)
-    .def("endSub",    &edm::EventRange::endEvent)
-  ;
-
-  pybind11::class_<Python11ParameterSet>(m,"ParameterSet")
-    .def(pybind11::init<>())
-    .def("addInt32", &Python11ParameterSet::addParameter<int>)
-    .def("getInt32", &Python11ParameterSet::getParameter<int>)
-    .def("addVInt32", &Python11ParameterSet::addParameters<int>)
-    .def("getVInt32", &Python11ParameterSet::getParameters<int>)
-    .def("addUInt32", &Python11ParameterSet::addParameter<unsigned int>)
-    .def("getUInt32", &Python11ParameterSet::getParameter<unsigned int>)
-    .def("addVUInt32", &Python11ParameterSet::addParameters<unsigned int>)
-    .def("getVUInt32", &Python11ParameterSet::getParameters<unsigned int>)
-    .def("addInt64", &Python11ParameterSet::addParameter<long long>)
-    .def("getInt64", &Python11ParameterSet::getParameter<long long>)
-    .def("addUInt64", &Python11ParameterSet::addParameter<unsigned long long>)
-    .def("getUInt64", &Python11ParameterSet::getParameter<unsigned long long>)
-    .def("addVInt64", &Python11ParameterSet::addParameters<long long>)
-    .def("getVInt64", &Python11ParameterSet::getParameters<long long>)
-    .def("addVUInt64", &Python11ParameterSet::addParameters<unsigned long long>)
-    .def("getVUInt64", &Python11ParameterSet::getParameters<unsigned long long>)
-    .def("addDouble", &Python11ParameterSet::addParameter<double>)
-    .def("getDouble", &Python11ParameterSet::getParameter<double>)
-    .def("addVDouble", &Python11ParameterSet::addParameters<double>)
-    .def("getVDouble", &Python11ParameterSet::getParameters<double>)
-    .def("addBool", &Python11ParameterSet::addParameter<bool>)
-    .def("getBool", &Python11ParameterSet::getParameter<bool>)
-    .def("addString", &Python11ParameterSet::addParameter<std::string>)
-    .def("getString", &Python11ParameterSet::getParameter<std::string>)
-    .def("addVString", &Python11ParameterSet::addParameters<std::string>)
-    .def("getVString", &Python11ParameterSet::getParameters<std::string>)
-    .def("addInputTag", &Python11ParameterSet::addParameter<edm::InputTag>)
-    .def("getInputTag", &Python11ParameterSet::getParameter<edm::InputTag>)
-    .def("addVInputTag", &Python11ParameterSet::addParameters<edm::InputTag>)
-    .def("getVInputTag", &Python11ParameterSet::getParameters<edm::InputTag>)
-    .def("addESInputTag", &Python11ParameterSet::addParameter<edm::ESInputTag>)
-    .def("getESInputTag", &Python11ParameterSet::getParameter<edm::ESInputTag>)
-    .def("addVESInputTag", &Python11ParameterSet::addParameters<edm::ESInputTag>)
-    .def("getVESInputTag", &Python11ParameterSet::getParameters<edm::ESInputTag>)
-    .def("addEventID", &Python11ParameterSet::addParameter<edm::EventID>)
-    .def("getEventID", &Python11ParameterSet::getParameter<edm::EventID>)
-    .def("addVEventID", &Python11ParameterSet::addParameters<edm::EventID>)
-    .def("getVEventID", &Python11ParameterSet::getParameters<edm::EventID>)
-    .def("addLuminosityBlockID", &Python11ParameterSet::addParameter<edm::LuminosityBlockID>)
-    .def("getLuminosityBlockID", &Python11ParameterSet::getParameter<edm::LuminosityBlockID>)
-    .def("addVLuminosityBlockID", &Python11ParameterSet::addParameters<edm::LuminosityBlockID>)
-    .def("getVLuminosityBlockID", &Python11ParameterSet::getParameters<edm::LuminosityBlockID>)
-    .def("addLuminosityBlockRange", &Python11ParameterSet::addParameter<edm::LuminosityBlockRange>)
-    .def("getLuminosityBlockRange", &Python11ParameterSet::getParameter<edm::LuminosityBlockRange>)
-    .def("addVLuminosityBlockRange", &Python11ParameterSet::addParameters<edm::LuminosityBlockRange>)
-    .def("getVLuminosityBlockRange", &Python11ParameterSet::getParameters<edm::LuminosityBlockRange>)
-    .def("addEventRange", &Python11ParameterSet::addParameter<edm::EventRange>)
-    .def("getEventRange", &Python11ParameterSet::getParameter<edm::EventRange>)
-    .def("addVEventRange", &Python11ParameterSet::addParameters<edm::EventRange>)
-    .def("getVEventRange", &Python11ParameterSet::getParameters<edm::EventRange>)
-    .def("addPSet", &Python11ParameterSet::addPSet)
-    .def("getPSet", &Python11ParameterSet::getPSet)
-    .def("addVPSet", &Python11ParameterSet::addVPSet)
-    .def("getVPSet", &Python11ParameterSet::getVPSet)
-    .def("addFileInPath", &Python11ParameterSet::addParameter<edm::FileInPath>)
-    .def("getFileInPath", &Python11ParameterSet::getParameter<edm::FileInPath>)
-    .def("newInputTag", &Python11ParameterSet::newInputTag)
-    .def("newESInputTag", &Python11ParameterSet::newESInputTag)
-    .def("newEventID", &Python11ParameterSet::newEventID)
-    .def("newLuminosityBlockID", &Python11ParameterSet::newLuminosityBlockID)
-    .def("newLuminosityBlockRange", &Python11ParameterSet::newLuminosityBlockRange)
-    .def("newEventRange", &Python11ParameterSet::newEventRange)
-    .def("addNewFileInPath", &Python11ParameterSet::addNewFileInPath)
-    .def("newPSet", &Python11ParameterSet::newPSet)
-    .def("dump", &Python11ParameterSet::dump)
-    ;
-
-  pybind11::class_<PyBind11ProcessDesc>(m,"ProcessDesc")//, pybind11::init<>())
-    .def(pybind11::init<>())
-    .def(pybind11::init<std::string>())
-    .def("newPSet", &PyBind11ProcessDesc::newPSet)
-    .def("pset", &PyBind11ProcessDesc::pset, pybind11::return_value_policy::reference)
-    .def("dump", &PyBind11ProcessDesc::dump)
-    ;
-
+    try {
+      if (p)
+        std::rethrow_exception(p);
+    } catch (const cms::Exception &e) {
+      PyErr_SetString(PyExc_RuntimeError, e.what());
+    }
+  });
+
+  pybind11::class_<edm::InputTag>(m, "InputTag")
+      .def(pybind11::init<>())
+      .def(pybind11::init<const std::string &>())
+      .def(pybind11::init<const std::string &, const std::string &, const std::string &>())
+      .def(pybind11::init<const std::string &, const std::string &>())
+      .def("label", &edm::InputTag::label, pybind11::return_value_policy::copy)
+      .def("instance", &edm::InputTag::instance, pybind11::return_value_policy::copy)
+      .def("process", &edm::InputTag::process, pybind11::return_value_policy::copy);
+
+  pybind11::class_<edm::ESInputTag>(m, "ESInputTag")
+      .def(pybind11::init<std::string>())
+      .def(pybind11::init<std::string, std::string>())
+      .def("module", &edm::ESInputTag::module, pybind11::return_value_policy::copy)
+      .def("data", &edm::ESInputTag::data, pybind11::return_value_policy::copy);
+
+  pybind11::class_<edm::EventID>(m, "EventID")
+      .def(pybind11::init<edm::RunNumber_t, edm::LuminosityBlockNumber_t, edm::EventNumber_t>())
+      .def("run", &edm::EventID::run)
+      .def("luminosityBlock", &edm::EventID::luminosityBlock)
+      .def("event", &edm::EventID::event);
+
+  pybind11::class_<edm::LuminosityBlockID>(m, "LuminosityBlockID")
+      .def(pybind11::init<unsigned int, unsigned int>())
+      .def("run", &edm::LuminosityBlockID::run)
+      .def("luminosityBlock", &edm::LuminosityBlockID::luminosityBlock);
+
+  pybind11::class_<edm::FileInPath>(m, "FileInPath")
+      .def(pybind11::init<std::string>())
+      .def("fullPath", &edm::FileInPath::fullPath)
+      .def("relativePath", &edm::FileInPath::relativePath);
+
+  pybind11::class_<edm::LuminosityBlockRange>(m, "LuminosityBlockRange")
+      .def(pybind11::init<unsigned int, unsigned int, unsigned int, unsigned int>())
+      .def("start", &edm::LuminosityBlockRange::startRun)
+      .def("startSub", &edm::LuminosityBlockRange::startLumi)
+      .def("end", &edm::LuminosityBlockRange::endRun)
+      .def("endSub", &edm::LuminosityBlockRange::endLumi);
+
+  pybind11::class_<edm::EventRange>(m, "EventRange")
+      .def(pybind11::init<edm::RunNumber_t,
+                          edm::LuminosityBlockNumber_t,
+                          edm::EventNumber_t,
+                          edm::RunNumber_t,
+                          edm::LuminosityBlockNumber_t,
+                          edm::EventNumber_t>())
+      .def("start", &edm::EventRange::startRun)
+      .def("startLumi", &edm::EventRange::startLumi)
+      .def("startSub", &edm::EventRange::startEvent)
+      .def("end", &edm::EventRange::endRun)
+      .def("endLumi", &edm::EventRange::endLumi)
+      .def("endSub", &edm::EventRange::endEvent);
+
+  pybind11::class_<Python11ParameterSet>(m, "ParameterSet")
+      .def(pybind11::init<>())
+      .def("addInt32", &Python11ParameterSet::addParameter<int>)
+      .def("getInt32", &Python11ParameterSet::getParameter<int>)
+      .def("addVInt32", &Python11ParameterSet::addParameters<int>)
+      .def("getVInt32", &Python11ParameterSet::getParameters<int>)
+      .def("addUInt32", &Python11ParameterSet::addParameter<unsigned int>)
+      .def("getUInt32", &Python11ParameterSet::getParameter<unsigned int>)
+      .def("addVUInt32", &Python11ParameterSet::addParameters<unsigned int>)
+      .def("getVUInt32", &Python11ParameterSet::getParameters<unsigned int>)
+      .def("addInt64", &Python11ParameterSet::addParameter<long long>)
+      .def("getInt64", &Python11ParameterSet::getParameter<long long>)
+      .def("addUInt64", &Python11ParameterSet::addParameter<unsigned long long>)
+      .def("getUInt64", &Python11ParameterSet::getParameter<unsigned long long>)
+      .def("addVInt64", &Python11ParameterSet::addParameters<long long>)
+      .def("getVInt64", &Python11ParameterSet::getParameters<long long>)
+      .def("addVUInt64", &Python11ParameterSet::addParameters<unsigned long long>)
+      .def("getVUInt64", &Python11ParameterSet::getParameters<unsigned long long>)
+      .def("addDouble", &Python11ParameterSet::addParameter<double>)
+      .def("getDouble", &Python11ParameterSet::getParameter<double>)
+      .def("addVDouble", &Python11ParameterSet::addParameters<double>)
+      .def("getVDouble", &Python11ParameterSet::getParameters<double>)
+      .def("addBool", &Python11ParameterSet::addParameter<bool>)
+      .def("getBool", &Python11ParameterSet::getParameter<bool>)
+      .def("addString", &Python11ParameterSet::addParameter<std::string>)
+      .def("getString", &Python11ParameterSet::getParameter<std::string>)
+      .def("addVString", &Python11ParameterSet::addParameters<std::string>)
+      .def("getVString", &Python11ParameterSet::getParameters<std::string>)
+      .def("addInputTag", &Python11ParameterSet::addParameter<edm::InputTag>)
+      .def("getInputTag", &Python11ParameterSet::getParameter<edm::InputTag>)
+      .def("addVInputTag", &Python11ParameterSet::addParameters<edm::InputTag>)
+      .def("getVInputTag", &Python11ParameterSet::getParameters<edm::InputTag>)
+      .def("addESInputTag", &Python11ParameterSet::addParameter<edm::ESInputTag>)
+      .def("getESInputTag", &Python11ParameterSet::getParameter<edm::ESInputTag>)
+      .def("addVESInputTag", &Python11ParameterSet::addParameters<edm::ESInputTag>)
+      .def("getVESInputTag", &Python11ParameterSet::getParameters<edm::ESInputTag>)
+      .def("addEventID", &Python11ParameterSet::addParameter<edm::EventID>)
+      .def("getEventID", &Python11ParameterSet::getParameter<edm::EventID>)
+      .def("addVEventID", &Python11ParameterSet::addParameters<edm::EventID>)
+      .def("getVEventID", &Python11ParameterSet::getParameters<edm::EventID>)
+      .def("addLuminosityBlockID", &Python11ParameterSet::addParameter<edm::LuminosityBlockID>)
+      .def("getLuminosityBlockID", &Python11ParameterSet::getParameter<edm::LuminosityBlockID>)
+      .def("addVLuminosityBlockID", &Python11ParameterSet::addParameters<edm::LuminosityBlockID>)
+      .def("getVLuminosityBlockID", &Python11ParameterSet::getParameters<edm::LuminosityBlockID>)
+      .def("addLuminosityBlockRange", &Python11ParameterSet::addParameter<edm::LuminosityBlockRange>)
+      .def("getLuminosityBlockRange", &Python11ParameterSet::getParameter<edm::LuminosityBlockRange>)
+      .def("addVLuminosityBlockRange", &Python11ParameterSet::addParameters<edm::LuminosityBlockRange>)
+      .def("getVLuminosityBlockRange", &Python11ParameterSet::getParameters<edm::LuminosityBlockRange>)
+      .def("addEventRange", &Python11ParameterSet::addParameter<edm::EventRange>)
+      .def("getEventRange", &Python11ParameterSet::getParameter<edm::EventRange>)
+      .def("addVEventRange", &Python11ParameterSet::addParameters<edm::EventRange>)
+      .def("getVEventRange", &Python11ParameterSet::getParameters<edm::EventRange>)
+      .def("addPSet", &Python11ParameterSet::addPSet)
+      .def("getPSet", &Python11ParameterSet::getPSet)
+      .def("addVPSet", &Python11ParameterSet::addVPSet)
+      .def("getVPSet", &Python11ParameterSet::getVPSet)
+      .def("addFileInPath", &Python11ParameterSet::addParameter<edm::FileInPath>)
+      .def("getFileInPath", &Python11ParameterSet::getParameter<edm::FileInPath>)
+      .def("newInputTag", &Python11ParameterSet::newInputTag)
+      .def("newESInputTag", &Python11ParameterSet::newESInputTag)
+      .def("newEventID", &Python11ParameterSet::newEventID)
+      .def("newLuminosityBlockID", &Python11ParameterSet::newLuminosityBlockID)
+      .def("newLuminosityBlockRange", &Python11ParameterSet::newLuminosityBlockRange)
+      .def("newEventRange", &Python11ParameterSet::newEventRange)
+      .def("addNewFileInPath", &Python11ParameterSet::addNewFileInPath)
+      .def("newPSet", &Python11ParameterSet::newPSet)
+      .def("dump", &Python11ParameterSet::dump);
+
+  pybind11::class_<PyBind11ProcessDesc>(m, "ProcessDesc")  //, pybind11::init<>())
+      .def(pybind11::init<>())
+      .def(pybind11::init<std::string>())
+      .def("newPSet", &PyBind11ProcessDesc::newPSet)
+      .def("pset", &PyBind11ProcessDesc::pset, pybind11::return_value_policy::reference)
+      .def("dump", &PyBind11ProcessDesc::dump);
 }
 
-
-
-
-
-
 #endif
diff --git a/FWCore/PythonParameterSet/src/PyBind11ProcessDesc.cc b/FWCore/PythonParameterSet/src/PyBind11ProcessDesc.cc
index 7d5c90a7173ff..16c29bf659cd8 100644
--- a/FWCore/PythonParameterSet/src/PyBind11ProcessDesc.cc
+++ b/FWCore/PythonParameterSet/src/PyBind11ProcessDesc.cc
@@ -9,29 +9,20 @@
 #include <sstream>
 #include <iostream>
 
-PyBind11ProcessDesc::PyBind11ProcessDesc() :
-   theProcessPSet(),
-   theMainModule(),
-   theOwnsInterpreter(false)
-{
-}
+PyBind11ProcessDesc::PyBind11ProcessDesc() : theProcessPSet(), theMainModule(), theOwnsInterpreter(false) {}
 
-PyBind11ProcessDesc::PyBind11ProcessDesc(std::string const& config) :
-   theProcessPSet(),
-   theMainModule(),
-   theOwnsInterpreter(true)
-{
+PyBind11ProcessDesc::PyBind11ProcessDesc(std::string const& config)
+    : theProcessPSet(), theMainModule(), theOwnsInterpreter(true) {
   pybind11::initialize_interpreter();
   edm::python::initializePyBind11Module();
   prepareToRead();
   read(config);
 }
 
-
-PyBind11ProcessDesc::PyBind11ProcessDesc(std::string const& config, int argc, char* argv[]) :
-   theProcessPSet(),
-   theMainModule(),
-   theOwnsInterpreter(true)
+PyBind11ProcessDesc::PyBind11ProcessDesc(std::string const& config, int argc, char* argv[])
+    : theProcessPSet(),
+      theMainModule(),
+      theOwnsInterpreter(true)
 
 {
   pybind11::initialize_interpreter();
@@ -39,30 +30,29 @@ PyBind11ProcessDesc::PyBind11ProcessDesc(std::string const& config, int argc, ch
   prepareToRead();
   {
 #if PY_MAJOR_VERSION >= 3
-  typedef std::unique_ptr<wchar_t[], decltype(&PyMem_RawFree)> WArgUPtr;
-  std::vector<WArgUPtr> v_argv;
-  std::vector<wchar_t *> vp_argv;
-  v_argv.reserve(argc);
-  vp_argv.reserve(argc);
-  for (int i = 0; i < argc; i++) {
-    v_argv.emplace_back(Py_DecodeLocale(argv[i], NULL), &PyMem_RawFree);
-    vp_argv.emplace_back(v_argv.back().get());
-  }
+    typedef std::unique_ptr<wchar_t[], decltype(&PyMem_RawFree)> WArgUPtr;
+    std::vector<WArgUPtr> v_argv;
+    std::vector<wchar_t*> vp_argv;
+    v_argv.reserve(argc);
+    vp_argv.reserve(argc);
+    for (int i = 0; i < argc; i++) {
+      v_argv.emplace_back(Py_DecodeLocale(argv[i], NULL), &PyMem_RawFree);
+      vp_argv.emplace_back(v_argv.back().get());
+    }
 
-  wchar_t **argvt = vp_argv.data();
+    wchar_t** argvt = vp_argv.data();
 #else
-  char **argvt = argv;
+    char** argvt = argv;
 #endif
 
-  PySys_SetArgv(argc, argvt);
+    PySys_SetArgv(argc, argvt);
   }
   read(config);
 }
 
-
 PyBind11ProcessDesc::~PyBind11ProcessDesc() {
-  if ( theOwnsInterpreter ) {
-    theMainModule=pybind11::object();
+  if (theOwnsInterpreter) {
+    theMainModule = pybind11::object();
     pybind11::finalize_interpreter();
   }
 }
@@ -70,21 +60,20 @@ PyBind11ProcessDesc::~PyBind11ProcessDesc() {
 void PyBind11ProcessDesc::prepareToRead() {
   //  pybind11::scoped_interpreter guard{};
   theMainModule = pybind11::module::import("__main__");
-  theMainModule.attr("processDesc")=this; 
-  theMainModule.attr("processPSet")=&theProcessPSet; 
+  theMainModule.attr("processDesc") = this;
+  theMainModule.attr("processPSet") = &theProcessPSet;
 }
 
 void PyBind11ProcessDesc::read(std::string const& config) {
   try {
     // if it ends with py, it's a file
-    if(config.substr(config.size()-3) == ".py") {
+    if (config.substr(config.size() - 3) == ".py") {
       readFile(config);
     } else {
       readString(config);
     }
-  }
-  catch(pybind11::error_already_set const&e) {
-    edm::pythonToCppException("Configuration",e.what());
+  } catch (pybind11::error_already_set const& e) {
+    edm::pythonToCppException("Configuration", e.what());
   }
 }
 
diff --git a/FWCore/PythonParameterSet/src/PyBind11Wrapper.cc b/FWCore/PythonParameterSet/src/PyBind11Wrapper.cc
index 9b752c43b17c1..6e2568fe09db2 100644
--- a/FWCore/PythonParameterSet/src/PyBind11Wrapper.cc
+++ b/FWCore/PythonParameterSet/src/PyBind11Wrapper.cc
@@ -3,10 +3,7 @@
 //#include <iostream>
 namespace edm {
 
-  void pythonToCppException(const std::string& iType, const std::string &error)
- {
-   throw cms::Exception(iType)<<" unknown python problem occurred.\n"<< error << std::endl;
- }
-}
-
-
+  void pythonToCppException(const std::string& iType, const std::string& error) {
+    throw cms::Exception(iType) << " unknown python problem occurred.\n" << error << std::endl;
+  }
+}  // namespace edm
diff --git a/FWCore/PythonParameterSet/src/Python11ParameterSet.cc b/FWCore/PythonParameterSet/src/Python11ParameterSet.cc
index 4f879c04bdfaa..2e60d9bf6c6fd 100644
--- a/FWCore/PythonParameterSet/src/Python11ParameterSet.cc
+++ b/FWCore/PythonParameterSet/src/Python11ParameterSet.cc
@@ -1,46 +1,33 @@
 #include "FWCore/PythonParameterSet/interface/Python11ParameterSet.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 
-Python11ParameterSet::Python11ParameterSet()
-:  theParameterSet()
-{
-}
-
+Python11ParameterSet::Python11ParameterSet() : theParameterSet() {}
 
-void Python11ParameterSet::addVPSet(bool tracked, std::string const& name,
-              pybind11::list  value)
-{
-  std::vector<Python11ParameterSet> v
-    = edm::toVector<Python11ParameterSet>(value);
+void Python11ParameterSet::addVPSet(bool tracked, std::string const& name, pybind11::list value) {
+  std::vector<Python11ParameterSet> v = edm::toVector<Python11ParameterSet>(value);
   std::vector<edm::ParameterSet> v2;
   v2.reserve(v.size());
-  for(std::vector<Python11ParameterSet>::iterator ppsetItr = v.begin(), ppsetItrEnd = v.end();
-      ppsetItr != ppsetItrEnd; ++ppsetItr)
-  {
+  for (std::vector<Python11ParameterSet>::iterator ppsetItr = v.begin(), ppsetItrEnd = v.end(); ppsetItr != ppsetItrEnd;
+       ++ppsetItr) {
     v2.push_back(ppsetItr->theParameterSet);
   }
   addParameter(tracked, name, v2);
 }
 
-
-pybind11::list Python11ParameterSet::getVPSet(bool tracked, std::string const& name)
-{
+pybind11::list Python11ParameterSet::getVPSet(bool tracked, std::string const& name) {
   std::vector<edm::ParameterSet> const& v =
-    (tracked ? theParameterSet.getParameterSetVector(name) : theParameterSet.getUntrackedParameterSetVector(name));
+      (tracked ? theParameterSet.getParameterSetVector(name) : theParameterSet.getUntrackedParameterSetVector(name));
 
   // convert to Python11ParameterSets
   pybind11::list l;
-  for(std::vector<edm::ParameterSet>::const_iterator psetItr = v.begin(), psetItrEnd = v.end();
-      psetItr != psetItrEnd; ++psetItr)
-  {
+  for (std::vector<edm::ParameterSet>::const_iterator psetItr = v.begin(), psetItrEnd = v.end(); psetItr != psetItrEnd;
+       ++psetItr) {
     l.append(Python11ParameterSet(*psetItr));
   }
 
   return l;
 }
 
-
-void  Python11ParameterSet::addNewFileInPath(bool tracked, std::string const & name, std::string const & value)
-{
+void Python11ParameterSet::addNewFileInPath(bool tracked, std::string const& name, std::string const& value) {
   addParameter(tracked, name, edm::FileInPath(value));
 }
diff --git a/FWCore/PythonParameterSet/src/initializePyBind11Module.cc b/FWCore/PythonParameterSet/src/initializePyBind11Module.cc
index 89d188d1cedf8..a3dd92e6b0560 100644
--- a/FWCore/PythonParameterSet/src/initializePyBind11Module.cc
+++ b/FWCore/PythonParameterSet/src/initializePyBind11Module.cc
@@ -2,7 +2,7 @@
 //
 // Package:     PyBind11ParameterSet
 // Class  :     initializePyBind11Module
-// 
+//
 
 #include "FWCore/PythonParameterSet/src/initializePyBind11Module.h"
 #include "PyBind11Module.h"
@@ -10,10 +10,10 @@
 #include <iostream>
 
 namespace edm {
-   namespace python {
-      void initializePyBind11Module() {
-	 char *libFWCoreParameterSet = const_cast<char *>("libFWCorePythonParameterSet");
-	 pybind11::module::import(libFWCoreParameterSet);
-      }
-   }
-}
+  namespace python {
+    void initializePyBind11Module() {
+      char *libFWCoreParameterSet = const_cast<char *>("libFWCorePythonParameterSet");
+      pybind11::module::import(libFWCoreParameterSet);
+    }
+  }  // namespace python
+}  // namespace edm
diff --git a/FWCore/PythonParameterSet/src/initializePyBind11Module.h b/FWCore/PythonParameterSet/src/initializePyBind11Module.h
index 6336fcd9255f5..79245a44aa091 100644
--- a/FWCore/PythonParameterSet/src/initializePyBind11Module.h
+++ b/FWCore/PythonParameterSet/src/initializePyBind11Module.h
@@ -7,10 +7,9 @@
 
 // forward declarations
 namespace edm {
-   namespace python {
-      void initializePyBind11Module();
-   }
-}
-
+  namespace python {
+    void initializePyBind11Module();
+  }
+}  // namespace edm
 
 #endif
diff --git a/FWCore/PythonParameterSet/test/makeprocess_t.cppunit.cc b/FWCore/PythonParameterSet/test/makeprocess_t.cppunit.cc
index 974caa52c3895..eb807819edd5c 100644
--- a/FWCore/PythonParameterSet/test/makeprocess_t.cppunit.cc
+++ b/FWCore/PythonParameterSet/test/makeprocess_t.cppunit.cc
@@ -21,22 +21,23 @@
 #include <algorithm>
 #include <set>
 
-class testmakeprocess: public CppUnit::TestFixture {
-CPPUNIT_TEST_SUITE(testmakeprocess);
-CPPUNIT_TEST(simpleProcessTest);
-CPPUNIT_TEST(usingTest);
-CPPUNIT_TEST(pathTest);
-CPPUNIT_TEST(moduleTest);
-CPPUNIT_TEST(emptyModuleTest);
-CPPUNIT_TEST(taskTest);
-CPPUNIT_TEST(taskTestWithEmptySchedule);
-CPPUNIT_TEST(taskTestWithSchedule);
-//CPPUNIT_TEST(windowsLineEndingTest);
-//CPPUNIT_TEST_EXCEPTION(emptyPsetTest,edm::Exception);
-CPPUNIT_TEST_SUITE_END();
+class testmakeprocess : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testmakeprocess);
+  CPPUNIT_TEST(simpleProcessTest);
+  CPPUNIT_TEST(usingTest);
+  CPPUNIT_TEST(pathTest);
+  CPPUNIT_TEST(moduleTest);
+  CPPUNIT_TEST(emptyModuleTest);
+  CPPUNIT_TEST(taskTest);
+  CPPUNIT_TEST(taskTestWithEmptySchedule);
+  CPPUNIT_TEST(taskTestWithSchedule);
+  //CPPUNIT_TEST(windowsLineEndingTest);
+  //CPPUNIT_TEST_EXCEPTION(emptyPsetTest,edm::Exception);
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
   void simpleProcessTest();
   void usingTest();
   void pathTest();
@@ -47,10 +48,8 @@ CPPUNIT_TEST_SUITE_END();
   void taskTestWithSchedule();
   //void windowsLineEndingTest();
 private:
-
   typedef std::shared_ptr<edm::ParameterSet> ParameterSetPtr;
   ParameterSetPtr pSet(char const* c) {
-
     //ParameterSetPtr result( new edm::ProcessDesc(std::string(c)) );
     ParameterSetPtr result = PyBind11ProcessDesc(std::string(c)).parameterSet();
     CPPUNIT_ASSERT(result->getParameter<std::string>("@process_name") == "test");
@@ -63,670 +62,493 @@ CPPUNIT_TEST_SUITE_END();
 CPPUNIT_TEST_SUITE_REGISTRATION(testmakeprocess);
 
 void testmakeprocess::simpleProcessTest() {
-   char const* kTest = "import FWCore.ParameterSet.Config as cms\n"
-                       "process = cms.Process('test')\n"
-                       "dummy =  cms.PSet(b = cms.bool(True))\n";
-   ParameterSetPtr test = pSet(kTest);
+  char const* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "dummy =  cms.PSet(b = cms.bool(True))\n";
+  ParameterSetPtr test = pSet(kTest);
 }
 
 void testmakeprocess::usingTest() {
-   char const* kTest =  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('test')\n"
-  "process.dummy = cms.PSet(\n"
-  "    b = cms.bool(True)\n"
-  ")\n"
-  "process.dummy2 = cms.PSet(\n"
-  "    d = cms.bool(True)\n"
-  ")\n"
-  "process.m1 = cms.EDFilter('Dummy',\n"
-  "    process.dummy\n"
-  ")\n"
-  "process.m2 = cms.EDFilter('Dummy2',\n"
-  "    process.dummy2\n"
-  ")\n"
-  "process.p = cms.Path(process.m1+process.m2)\n";
-
-   ParameterSetPtr test = pSet(kTest);
-
-   //CPPUNIT_ASSERT(test->getParameterSet("dummy").getBool("b") == true);
-   CPPUNIT_ASSERT(test->getParameterSet("m1").getParameter<bool>("b") == true);
-   CPPUNIT_ASSERT(test->getParameterSet("m2").getParameter<bool>("d") == true);
+  char const* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.dummy = cms.PSet(\n"
+      "    b = cms.bool(True)\n"
+      ")\n"
+      "process.dummy2 = cms.PSet(\n"
+      "    d = cms.bool(True)\n"
+      ")\n"
+      "process.m1 = cms.EDFilter('Dummy',\n"
+      "    process.dummy\n"
+      ")\n"
+      "process.m2 = cms.EDFilter('Dummy2',\n"
+      "    process.dummy2\n"
+      ")\n"
+      "process.p = cms.Path(process.m1+process.m2)\n";
+
+  ParameterSetPtr test = pSet(kTest);
+
+  //CPPUNIT_ASSERT(test->getParameterSet("dummy").getBool("b") == true);
+  CPPUNIT_ASSERT(test->getParameterSet("m1").getParameter<bool>("b") == true);
+  CPPUNIT_ASSERT(test->getParameterSet("m2").getParameter<bool>("d") == true);
 }
 
 void testmakeprocess::pathTest() {
-   char const* kTest =   "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('test')\n"
-  "process.cone5 = cms.EDFilter('PhonyConeJet',\n"
-  "    i = cms.int32(5)\n"
-  ")\n"
-  "process.cone7 = cms.EDFilter('PhonyConeJet',\n"
-  "    i = cms.int32(7)\n"
-  ")\n"
-  "process.jtanalyzer = cms.EDAnalyzer('jtanalyzer')\n"
-  "process.writer = cms.OutputModule('Writer')\n"
-  "process.cones = cms.Sequence(process.cone5*process.cone7)\n"
-  "process.term1 = cms.Path(process.cones+process.jtanalyzer)\n"
-  "process.atEnd = cms.EndPath(process.writer)\n";
-
-
-   ParameterSetPtr test = pSet(kTest);
-   //CPPUNIT_ASSERT(test->pathFragments().size() == 5);
-
-   edm::ParameterSet& myparams = *(test);
-   myparams.registerIt();
-   std::string rep = myparams.toString();
-   edm::ParameterSet copy(rep);
-   CPPUNIT_ASSERT(copy == myparams);
+  char const* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.cone5 = cms.EDFilter('PhonyConeJet',\n"
+      "    i = cms.int32(5)\n"
+      ")\n"
+      "process.cone7 = cms.EDFilter('PhonyConeJet',\n"
+      "    i = cms.int32(7)\n"
+      ")\n"
+      "process.jtanalyzer = cms.EDAnalyzer('jtanalyzer')\n"
+      "process.writer = cms.OutputModule('Writer')\n"
+      "process.cones = cms.Sequence(process.cone5*process.cone7)\n"
+      "process.term1 = cms.Path(process.cones+process.jtanalyzer)\n"
+      "process.atEnd = cms.EndPath(process.writer)\n";
+
+  ParameterSetPtr test = pSet(kTest);
+  //CPPUNIT_ASSERT(test->pathFragments().size() == 5);
+
+  edm::ParameterSet& myparams = *(test);
+  myparams.registerIt();
+  std::string rep = myparams.toString();
+  edm::ParameterSet copy(rep);
+  CPPUNIT_ASSERT(copy == myparams);
 }
 
-
 edm::ParameterSet modulePSet(std::string const& iLabel, std::string const& iType, std::string const& iCppType) {
-   edm::ParameterSet temp;
-   temp.addParameter("s", 1);
-   temp.addParameter("@module_label", iLabel);
-   temp.addParameter("@module_type", iType);
-   temp.addParameter("@module_edm_type", iCppType);
-   return temp;
+  edm::ParameterSet temp;
+  temp.addParameter("s", 1);
+  temp.addParameter("@module_label", iLabel);
+  temp.addParameter("@module_type", iType);
+  temp.addParameter("@module_edm_type", iCppType);
+  return temp;
 }
 
 void testmakeprocess::moduleTest() {
-   char const* kTest =  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('test')\n"
-  "process.cones = cms.EDFilter('Module',\n"
-  "    s = cms.int32(1)\n"
-  ")\n"
-  "process.NoLabelModule = cms.ESProducer('NoLabelModule',\n"
-  "    s = cms.int32(1)\n"
-  ")\n"
-  "process.labeled = cms.ESProducer('LabelModule',\n"
-  "    s = cms.int32(1)\n"
-  ")\n"
-  "process.source = cms.Source('InputSource',\n"
-  "    s = cms.int32(1)\n"
-  ")\n"
-  "process.NoLabelRetriever = cms.ESSource('NoLabelRetriever',\n"
-  "    s = cms.int32(1)\n"
-  ")\n"
-  "process.label = cms.ESSource('LabelRetriever',\n"
-  "    s = cms.int32(1)\n"
-  ")\n"
-  "process.p = cms.Path(process.cones)\n";
-
-
-   ParameterSetPtr test = pSet(kTest);
-
-   static edm::ParameterSet const kEmpty;
-   edm::ParameterSet const kCone(modulePSet("cones", "Module","EDFilter"));
-   std::ostringstream out;
-   out << kCone.toString() << std::endl;
-   out << test->getParameterSet("cones").toString() << std::endl;
-
-   edm::ParameterSet const kMainInput(modulePSet("@main_input","InputSource","Source"));
-
-   edm::ParameterSet const kNoLabelModule(modulePSet("", "NoLabelModule","ESProducer"));
-   edm::ParameterSet const kLabelModule(modulePSet("labeled", "LabelModule","ESProducer"));
-   edm::ParameterSet const kNoLabelRetriever(modulePSet("", "NoLabelRetriever","ESSource"));
-   edm::ParameterSet const kLabelRetriever(modulePSet("label", "LabelRetriever","ESSource"));
-
-   CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("cones")));
-   CPPUNIT_ASSERT(kCone == test->getParameterSet("cones"));
-
-   CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("@main_input")));
-   CPPUNIT_ASSERT(kMainInput == (test->getParameterSet("@main_input")));
-
-   CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("NoLabelModule@")));
-   CPPUNIT_ASSERT(kNoLabelModule == test->getParameterSet("NoLabelModule@"));
-
-   CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("LabelModule@labeled")));
-   CPPUNIT_ASSERT(kLabelModule == test->getParameterSet("LabelModule@labeled"));
-
-   CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("NoLabelRetriever@")));
-   CPPUNIT_ASSERT(kNoLabelRetriever == test->getParameterSet("NoLabelRetriever@"));
-
-   CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("LabelRetriever@label")));
-   CPPUNIT_ASSERT(kLabelRetriever == test->getParameterSet("LabelRetriever@label"));
+  char const* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.cones = cms.EDFilter('Module',\n"
+      "    s = cms.int32(1)\n"
+      ")\n"
+      "process.NoLabelModule = cms.ESProducer('NoLabelModule',\n"
+      "    s = cms.int32(1)\n"
+      ")\n"
+      "process.labeled = cms.ESProducer('LabelModule',\n"
+      "    s = cms.int32(1)\n"
+      ")\n"
+      "process.source = cms.Source('InputSource',\n"
+      "    s = cms.int32(1)\n"
+      ")\n"
+      "process.NoLabelRetriever = cms.ESSource('NoLabelRetriever',\n"
+      "    s = cms.int32(1)\n"
+      ")\n"
+      "process.label = cms.ESSource('LabelRetriever',\n"
+      "    s = cms.int32(1)\n"
+      ")\n"
+      "process.p = cms.Path(process.cones)\n";
+
+  ParameterSetPtr test = pSet(kTest);
+
+  static edm::ParameterSet const kEmpty;
+  edm::ParameterSet const kCone(modulePSet("cones", "Module", "EDFilter"));
+  std::ostringstream out;
+  out << kCone.toString() << std::endl;
+  out << test->getParameterSet("cones").toString() << std::endl;
+
+  edm::ParameterSet const kMainInput(modulePSet("@main_input", "InputSource", "Source"));
+
+  edm::ParameterSet const kNoLabelModule(modulePSet("", "NoLabelModule", "ESProducer"));
+  edm::ParameterSet const kLabelModule(modulePSet("labeled", "LabelModule", "ESProducer"));
+  edm::ParameterSet const kNoLabelRetriever(modulePSet("", "NoLabelRetriever", "ESSource"));
+  edm::ParameterSet const kLabelRetriever(modulePSet("label", "LabelRetriever", "ESSource"));
+
+  CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("cones")));
+  CPPUNIT_ASSERT(kCone == test->getParameterSet("cones"));
+
+  CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("@main_input")));
+  CPPUNIT_ASSERT(kMainInput == (test->getParameterSet("@main_input")));
+
+  CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("NoLabelModule@")));
+  CPPUNIT_ASSERT(kNoLabelModule == test->getParameterSet("NoLabelModule@"));
+
+  CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("LabelModule@labeled")));
+  CPPUNIT_ASSERT(kLabelModule == test->getParameterSet("LabelModule@labeled"));
+
+  CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("NoLabelRetriever@")));
+  CPPUNIT_ASSERT(kNoLabelRetriever == test->getParameterSet("NoLabelRetriever@"));
+
+  CPPUNIT_ASSERT(kEmpty != (test->getParameterSet("LabelRetriever@label")));
+  CPPUNIT_ASSERT(kLabelRetriever == test->getParameterSet("LabelRetriever@label"));
 }
 
 void testmakeprocess::emptyModuleTest() {
-   char const* kTest =
-  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('test')\n"
-  "process.thing = cms.EDFilter('XX')\n"
-  "process.p = cms.Path(process.thing)\n";
-
-   ParameterSetPtr test = pSet(kTest);
-
-   edm::ParameterSet& myparams = *(test);
-   myparams.registerIt();
-   std::string rep = myparams.toString();
-   edm::ParameterSet copy(rep);
-   CPPUNIT_ASSERT(copy == myparams);
+  char const* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.thing = cms.EDFilter('XX')\n"
+      "process.p = cms.Path(process.thing)\n";
+
+  ParameterSetPtr test = pSet(kTest);
+
+  edm::ParameterSet& myparams = *(test);
+  myparams.registerIt();
+  std::string rep = myparams.toString();
+  edm::ParameterSet copy(rep);
+  CPPUNIT_ASSERT(copy == myparams);
 }
 
 void testmakeprocess::taskTest() {
-   char const* kTest =  "import FWCore.ParameterSet.Config as cms\n"
-   "process = cms.Process('test')\n"
-   "process.load(\"FWCore.PythonParameterSet.test.testTask_cff\")\n"
-   "t10 = cms.Task(process.m29, process.m30, process.f29, process.f30,"
-                   "process.ess27, process.ess28, process.esp27, process.esp28,"
-                   "process.serv27, process.serv28)\n";
-
-   ParameterSetPtr test = pSet(kTest);
-
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("m1") &&
-                  !test->existsAs<edm::ParameterSet>("m2") &&
-                  test->existsAs<edm::ParameterSet>("m3") &&
-                  test->existsAs<edm::ParameterSet>("m4") &&
-                  test->existsAs<edm::ParameterSet>("m5") &&
-                  test->existsAs<edm::ParameterSet>("m6") &&
-                  test->existsAs<edm::ParameterSet>("m7") &&
-                  test->existsAs<edm::ParameterSet>("m8") &&
-                  test->existsAs<edm::ParameterSet>("m9") &&
-                  test->existsAs<edm::ParameterSet>("m10") &&
-                  test->existsAs<edm::ParameterSet>("m11") &&
-                  test->existsAs<edm::ParameterSet>("m12") &&
-                  test->existsAs<edm::ParameterSet>("m13") &&
-                  test->existsAs<edm::ParameterSet>("m14") &&
-                  test->existsAs<edm::ParameterSet>("m15") &&
-                  test->existsAs<edm::ParameterSet>("m16") &&
-                  test->existsAs<edm::ParameterSet>("m17") &&
-                  test->existsAs<edm::ParameterSet>("m18") &&
-                  test->existsAs<edm::ParameterSet>("m19") &&
-                  test->existsAs<edm::ParameterSet>("m20") &&
-                  test->existsAs<edm::ParameterSet>("m21") &&
-                  test->existsAs<edm::ParameterSet>("m22") &&
-                  test->existsAs<edm::ParameterSet>("m23") &&
-                  test->existsAs<edm::ParameterSet>("m24") &&
-                  test->existsAs<edm::ParameterSet>("m25") &&
-                  test->existsAs<edm::ParameterSet>("m26") &&
-                  !test->existsAs<edm::ParameterSet>("m27") &&
-                  !test->existsAs<edm::ParameterSet>("m28") &&
-                  !test->existsAs<edm::ParameterSet>("m29") &&
-                  !test->existsAs<edm::ParameterSet>("m30"));
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("f1") &&
-                  !test->existsAs<edm::ParameterSet>("f2") &&
-                  test->existsAs<edm::ParameterSet>("f3") &&
-                  test->existsAs<edm::ParameterSet>("f4") &&
-                  test->existsAs<edm::ParameterSet>("f5") &&
-                  test->existsAs<edm::ParameterSet>("f6") &&
-                  test->existsAs<edm::ParameterSet>("f7") &&
-                  test->existsAs<edm::ParameterSet>("f8") &&
-                  test->existsAs<edm::ParameterSet>("f9") &&
-                  test->existsAs<edm::ParameterSet>("f10") &&
-                  test->existsAs<edm::ParameterSet>("f11") &&
-                  test->existsAs<edm::ParameterSet>("f12") &&
-                  test->existsAs<edm::ParameterSet>("f13") &&
-                  test->existsAs<edm::ParameterSet>("f14") &&
-                  test->existsAs<edm::ParameterSet>("f15") &&
-                  test->existsAs<edm::ParameterSet>("f16") &&
-                  test->existsAs<edm::ParameterSet>("f17") &&
-                  test->existsAs<edm::ParameterSet>("f18") &&
-                  test->existsAs<edm::ParameterSet>("f19") &&
-                  test->existsAs<edm::ParameterSet>("f20") &&
-                  test->existsAs<edm::ParameterSet>("f21") &&
-                  test->existsAs<edm::ParameterSet>("f22") &&
-                  test->existsAs<edm::ParameterSet>("f23") &&
-                  test->existsAs<edm::ParameterSet>("f24") &&
-                  test->existsAs<edm::ParameterSet>("f25") &&
-                  test->existsAs<edm::ParameterSet>("f26") &&
-                  !test->existsAs<edm::ParameterSet>("f27") &&
-                  !test->existsAs<edm::ParameterSet>("f28") &&
-                  !test->existsAs<edm::ParameterSet>("f29") &&
-                  !test->existsAs<edm::ParameterSet>("f30"));
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("a1") &&
-                  !test->existsAs<edm::ParameterSet>("a2") &&
-                  test->existsAs<edm::ParameterSet>("a3") &&
-                  test->existsAs<edm::ParameterSet>("a4") &&
-                  test->existsAs<edm::ParameterSet>("a5") &&
-                  test->existsAs<edm::ParameterSet>("a6") &&
-                  test->existsAs<edm::ParameterSet>("a7") &&
-                  test->existsAs<edm::ParameterSet>("a8") &&
-                  test->existsAs<edm::ParameterSet>("a9") &&
-                  test->existsAs<edm::ParameterSet>("a10"));
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("o1") &&
-                  !test->existsAs<edm::ParameterSet>("o2") &&
-                  test->existsAs<edm::ParameterSet>("o7") &&
-                  test->existsAs<edm::ParameterSet>("o8") &&
-                  test->existsAs<edm::ParameterSet>("o9") &&
-                  test->existsAs<edm::ParameterSet>("o10"));
-
-   CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("ess@ess1") &&
-                  test->existsAs<edm::ParameterSet>("ess2@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess3") &&
-                  !test->existsAs<edm::ParameterSet>("ess4@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess11") &&
-                  test->existsAs<edm::ParameterSet>("ess12@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess13") &&
-                  test->existsAs<edm::ParameterSet>("ess14@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess15") &&
-                  test->existsAs<edm::ParameterSet>("ess16@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess17") &&
-                  test->existsAs<edm::ParameterSet>("ess18@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess19") &&
-                  test->existsAs<edm::ParameterSet>("ess20@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess21") &&
-                  test->existsAs<edm::ParameterSet>("ess22@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess23") &&
-                  test->existsAs<edm::ParameterSet>("ess24@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess25") &&
-                  test->existsAs<edm::ParameterSet>("ess26@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess27") &&
-                  test->existsAs<edm::ParameterSet>("ess28@"));
-
-   CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("esp@esp1") &&
-                  test->existsAs<edm::ParameterSet>("esp2@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp3") &&
-                  !test->existsAs<edm::ParameterSet>("esp4@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp11") &&
-                  test->existsAs<edm::ParameterSet>("esp12@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp13") &&
-                  test->existsAs<edm::ParameterSet>("esp14@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp15") &&
-                  test->existsAs<edm::ParameterSet>("esp16@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp17") &&
-                  test->existsAs<edm::ParameterSet>("esp18@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp19") &&
-                  test->existsAs<edm::ParameterSet>("esp20@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp21") &&
-                  test->existsAs<edm::ParameterSet>("esp22@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp23") &&
-                  test->existsAs<edm::ParameterSet>("esp24@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp25") &&
-                  test->existsAs<edm::ParameterSet>("esp26@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp27") &&
-                  test->existsAs<edm::ParameterSet>("esp28@"));
-
-   std::vector<edm::ParameterSet> const& vpsetServices = test->getUntrackedParameterSetVector("services");
-   // Note that the vector<ParameterSet> is not sorted. The order
-   // depends on the order of a python iteration through a dictionary
-   // which could be anything.
-   std::set<std::string> serviceNames;
-   for (auto const& pset : vpsetServices) {
-     serviceNames.insert(pset.getParameter<std::string>("@service_type"));
-   }
-   std::vector<std::string> expectedServiceNames;
-   expectedServiceNames.emplace_back("serv1");
-   expectedServiceNames.emplace_back("serv2");
-   expectedServiceNames.emplace_back("serv11");
-   expectedServiceNames.emplace_back("serv12");
-   expectedServiceNames.emplace_back("serv13");
-   expectedServiceNames.emplace_back("serv14");
-   expectedServiceNames.emplace_back("serv15");
-   expectedServiceNames.emplace_back("serv16");
-   expectedServiceNames.emplace_back("serv17");
-   expectedServiceNames.emplace_back("serv18");
-   expectedServiceNames.emplace_back("serv19");
-   expectedServiceNames.emplace_back("serv20");
-   expectedServiceNames.emplace_back("serv21");
-   expectedServiceNames.emplace_back("serv22");
-   expectedServiceNames.emplace_back("serv23");
-   expectedServiceNames.emplace_back("serv24");
-   expectedServiceNames.emplace_back("serv25");
-   expectedServiceNames.emplace_back("serv26");
-   expectedServiceNames.emplace_back("serv27");
-   expectedServiceNames.emplace_back("serv28");
-   bool result = true;
-   for (auto const& name : expectedServiceNames) {
-     if (serviceNames.find(name) == serviceNames.end()) {
-       result = false;
-     }
-   }
-   if (serviceNames.size() != expectedServiceNames.size()) {
-     result = false;
-   }
-   CPPUNIT_ASSERT(result);
+  char const* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.load(\"FWCore.PythonParameterSet.test.testTask_cff\")\n"
+      "t10 = cms.Task(process.m29, process.m30, process.f29, process.f30,"
+      "process.ess27, process.ess28, process.esp27, process.esp28,"
+      "process.serv27, process.serv28)\n";
+
+  ParameterSetPtr test = pSet(kTest);
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("m1") && !test->existsAs<edm::ParameterSet>("m2") &&
+                 test->existsAs<edm::ParameterSet>("m3") && test->existsAs<edm::ParameterSet>("m4") &&
+                 test->existsAs<edm::ParameterSet>("m5") && test->existsAs<edm::ParameterSet>("m6") &&
+                 test->existsAs<edm::ParameterSet>("m7") && test->existsAs<edm::ParameterSet>("m8") &&
+                 test->existsAs<edm::ParameterSet>("m9") && test->existsAs<edm::ParameterSet>("m10") &&
+                 test->existsAs<edm::ParameterSet>("m11") && test->existsAs<edm::ParameterSet>("m12") &&
+                 test->existsAs<edm::ParameterSet>("m13") && test->existsAs<edm::ParameterSet>("m14") &&
+                 test->existsAs<edm::ParameterSet>("m15") && test->existsAs<edm::ParameterSet>("m16") &&
+                 test->existsAs<edm::ParameterSet>("m17") && test->existsAs<edm::ParameterSet>("m18") &&
+                 test->existsAs<edm::ParameterSet>("m19") && test->existsAs<edm::ParameterSet>("m20") &&
+                 test->existsAs<edm::ParameterSet>("m21") && test->existsAs<edm::ParameterSet>("m22") &&
+                 test->existsAs<edm::ParameterSet>("m23") && test->existsAs<edm::ParameterSet>("m24") &&
+                 test->existsAs<edm::ParameterSet>("m25") && test->existsAs<edm::ParameterSet>("m26") &&
+                 !test->existsAs<edm::ParameterSet>("m27") && !test->existsAs<edm::ParameterSet>("m28") &&
+                 !test->existsAs<edm::ParameterSet>("m29") && !test->existsAs<edm::ParameterSet>("m30"));
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("f1") && !test->existsAs<edm::ParameterSet>("f2") &&
+                 test->existsAs<edm::ParameterSet>("f3") && test->existsAs<edm::ParameterSet>("f4") &&
+                 test->existsAs<edm::ParameterSet>("f5") && test->existsAs<edm::ParameterSet>("f6") &&
+                 test->existsAs<edm::ParameterSet>("f7") && test->existsAs<edm::ParameterSet>("f8") &&
+                 test->existsAs<edm::ParameterSet>("f9") && test->existsAs<edm::ParameterSet>("f10") &&
+                 test->existsAs<edm::ParameterSet>("f11") && test->existsAs<edm::ParameterSet>("f12") &&
+                 test->existsAs<edm::ParameterSet>("f13") && test->existsAs<edm::ParameterSet>("f14") &&
+                 test->existsAs<edm::ParameterSet>("f15") && test->existsAs<edm::ParameterSet>("f16") &&
+                 test->existsAs<edm::ParameterSet>("f17") && test->existsAs<edm::ParameterSet>("f18") &&
+                 test->existsAs<edm::ParameterSet>("f19") && test->existsAs<edm::ParameterSet>("f20") &&
+                 test->existsAs<edm::ParameterSet>("f21") && test->existsAs<edm::ParameterSet>("f22") &&
+                 test->existsAs<edm::ParameterSet>("f23") && test->existsAs<edm::ParameterSet>("f24") &&
+                 test->existsAs<edm::ParameterSet>("f25") && test->existsAs<edm::ParameterSet>("f26") &&
+                 !test->existsAs<edm::ParameterSet>("f27") && !test->existsAs<edm::ParameterSet>("f28") &&
+                 !test->existsAs<edm::ParameterSet>("f29") && !test->existsAs<edm::ParameterSet>("f30"));
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("a1") && !test->existsAs<edm::ParameterSet>("a2") &&
+                 test->existsAs<edm::ParameterSet>("a3") && test->existsAs<edm::ParameterSet>("a4") &&
+                 test->existsAs<edm::ParameterSet>("a5") && test->existsAs<edm::ParameterSet>("a6") &&
+                 test->existsAs<edm::ParameterSet>("a7") && test->existsAs<edm::ParameterSet>("a8") &&
+                 test->existsAs<edm::ParameterSet>("a9") && test->existsAs<edm::ParameterSet>("a10"));
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("o1") && !test->existsAs<edm::ParameterSet>("o2") &&
+                 test->existsAs<edm::ParameterSet>("o7") && test->existsAs<edm::ParameterSet>("o8") &&
+                 test->existsAs<edm::ParameterSet>("o9") && test->existsAs<edm::ParameterSet>("o10"));
+
+  CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("ess@ess1") && test->existsAs<edm::ParameterSet>("ess2@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess3") && !test->existsAs<edm::ParameterSet>("ess4@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess11") && test->existsAs<edm::ParameterSet>("ess12@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess13") && test->existsAs<edm::ParameterSet>("ess14@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess15") && test->existsAs<edm::ParameterSet>("ess16@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess17") && test->existsAs<edm::ParameterSet>("ess18@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess19") && test->existsAs<edm::ParameterSet>("ess20@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess21") && test->existsAs<edm::ParameterSet>("ess22@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess23") && test->existsAs<edm::ParameterSet>("ess24@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess25") && test->existsAs<edm::ParameterSet>("ess26@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess27") && test->existsAs<edm::ParameterSet>("ess28@"));
+
+  CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("esp@esp1") && test->existsAs<edm::ParameterSet>("esp2@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp3") && !test->existsAs<edm::ParameterSet>("esp4@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp11") && test->existsAs<edm::ParameterSet>("esp12@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp13") && test->existsAs<edm::ParameterSet>("esp14@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp15") && test->existsAs<edm::ParameterSet>("esp16@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp17") && test->existsAs<edm::ParameterSet>("esp18@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp19") && test->existsAs<edm::ParameterSet>("esp20@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp21") && test->existsAs<edm::ParameterSet>("esp22@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp23") && test->existsAs<edm::ParameterSet>("esp24@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp25") && test->existsAs<edm::ParameterSet>("esp26@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp27") && test->existsAs<edm::ParameterSet>("esp28@"));
+
+  std::vector<edm::ParameterSet> const& vpsetServices = test->getUntrackedParameterSetVector("services");
+  // Note that the vector<ParameterSet> is not sorted. The order
+  // depends on the order of a python iteration through a dictionary
+  // which could be anything.
+  std::set<std::string> serviceNames;
+  for (auto const& pset : vpsetServices) {
+    serviceNames.insert(pset.getParameter<std::string>("@service_type"));
+  }
+  std::vector<std::string> expectedServiceNames;
+  expectedServiceNames.emplace_back("serv1");
+  expectedServiceNames.emplace_back("serv2");
+  expectedServiceNames.emplace_back("serv11");
+  expectedServiceNames.emplace_back("serv12");
+  expectedServiceNames.emplace_back("serv13");
+  expectedServiceNames.emplace_back("serv14");
+  expectedServiceNames.emplace_back("serv15");
+  expectedServiceNames.emplace_back("serv16");
+  expectedServiceNames.emplace_back("serv17");
+  expectedServiceNames.emplace_back("serv18");
+  expectedServiceNames.emplace_back("serv19");
+  expectedServiceNames.emplace_back("serv20");
+  expectedServiceNames.emplace_back("serv21");
+  expectedServiceNames.emplace_back("serv22");
+  expectedServiceNames.emplace_back("serv23");
+  expectedServiceNames.emplace_back("serv24");
+  expectedServiceNames.emplace_back("serv25");
+  expectedServiceNames.emplace_back("serv26");
+  expectedServiceNames.emplace_back("serv27");
+  expectedServiceNames.emplace_back("serv28");
+  bool result = true;
+  for (auto const& name : expectedServiceNames) {
+    if (serviceNames.find(name) == serviceNames.end()) {
+      result = false;
+    }
+  }
+  if (serviceNames.size() != expectedServiceNames.size()) {
+    result = false;
+  }
+  CPPUNIT_ASSERT(result);
 }
 
 void testmakeprocess::taskTestWithEmptySchedule() {
-   char const* kTest =  "import FWCore.ParameterSet.Config as cms\n"
-   "process = cms.Process('test')\n"
-   "process.load(\"FWCore.PythonParameterSet.test.testTask_cff\")\n"
-   "t10 = cms.Task(process.m29, process.m30, process.f29, process.f30,"
-                   "process.ess27, process.ess28, process.esp27, process.esp28,"
-                   "process.serv27, process.serv28)\n"
-   "process.schedule = cms.Schedule()\n";
-
-   ParameterSetPtr test = pSet(kTest);
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("m1") &&
-                  !test->existsAs<edm::ParameterSet>("m2") &&
-                  !test->existsAs<edm::ParameterSet>("m3") &&
-                  !test->existsAs<edm::ParameterSet>("m4") &&
-                  !test->existsAs<edm::ParameterSet>("m5") &&
-                  !test->existsAs<edm::ParameterSet>("m6") &&
-                  !test->existsAs<edm::ParameterSet>("m7") &&
-                  !test->existsAs<edm::ParameterSet>("m8") &&
-                  !test->existsAs<edm::ParameterSet>("m9") &&
-                  !test->existsAs<edm::ParameterSet>("m10") &&
-                  !test->existsAs<edm::ParameterSet>("m11") &&
-                  !test->existsAs<edm::ParameterSet>("m12") &&
-                  !test->existsAs<edm::ParameterSet>("m13") &&
-                  !test->existsAs<edm::ParameterSet>("m14") &&
-                  !test->existsAs<edm::ParameterSet>("m15") &&
-                  !test->existsAs<edm::ParameterSet>("m16") &&
-                  !test->existsAs<edm::ParameterSet>("m17") &&
-                  !test->existsAs<edm::ParameterSet>("m18") &&
-                  !test->existsAs<edm::ParameterSet>("m19") &&
-                  !test->existsAs<edm::ParameterSet>("m20") &&
-                  !test->existsAs<edm::ParameterSet>("m21") &&
-                  !test->existsAs<edm::ParameterSet>("m22") &&
-                  !test->existsAs<edm::ParameterSet>("m23") &&
-                  !test->existsAs<edm::ParameterSet>("m24") &&
-                  !test->existsAs<edm::ParameterSet>("m25") &&
-                  !test->existsAs<edm::ParameterSet>("m26") &&
-                  !test->existsAs<edm::ParameterSet>("m27") &&
-                  !test->existsAs<edm::ParameterSet>("m28") &&
-                  !test->existsAs<edm::ParameterSet>("m29") &&
-                  !test->existsAs<edm::ParameterSet>("m30"));
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("f1") &&
-                  !test->existsAs<edm::ParameterSet>("f2") &&
-                  !test->existsAs<edm::ParameterSet>("f3") &&
-                  !test->existsAs<edm::ParameterSet>("f4") &&
-                  !test->existsAs<edm::ParameterSet>("f5") &&
-                  !test->existsAs<edm::ParameterSet>("f6") &&
-                  !test->existsAs<edm::ParameterSet>("f7") &&
-                  !test->existsAs<edm::ParameterSet>("f8") &&
-                  !test->existsAs<edm::ParameterSet>("f9") &&
-                  !test->existsAs<edm::ParameterSet>("f10") &&
-                  !test->existsAs<edm::ParameterSet>("f11") &&
-                  !test->existsAs<edm::ParameterSet>("f12") &&
-                  !test->existsAs<edm::ParameterSet>("f13") &&
-                  !test->existsAs<edm::ParameterSet>("f14") &&
-                  !test->existsAs<edm::ParameterSet>("f15") &&
-                  !test->existsAs<edm::ParameterSet>("f16") &&
-                  !test->existsAs<edm::ParameterSet>("f17") &&
-                  !test->existsAs<edm::ParameterSet>("f18") &&
-                  !test->existsAs<edm::ParameterSet>("f19") &&
-                  !test->existsAs<edm::ParameterSet>("f20") &&
-                  !test->existsAs<edm::ParameterSet>("f21") &&
-                  !test->existsAs<edm::ParameterSet>("f22") &&
-                  !test->existsAs<edm::ParameterSet>("f23") &&
-                  !test->existsAs<edm::ParameterSet>("f24") &&
-                  !test->existsAs<edm::ParameterSet>("f25") &&
-                  !test->existsAs<edm::ParameterSet>("f26") &&
-                  !test->existsAs<edm::ParameterSet>("f27") &&
-                  !test->existsAs<edm::ParameterSet>("f28") &&
-                  !test->existsAs<edm::ParameterSet>("f29") &&
-                  !test->existsAs<edm::ParameterSet>("f30"));
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("a1") &&
-                  !test->existsAs<edm::ParameterSet>("a2") &&
-                  !test->existsAs<edm::ParameterSet>("a3") &&
-                  !test->existsAs<edm::ParameterSet>("a4") &&
-                  !test->existsAs<edm::ParameterSet>("a5") &&
-                  !test->existsAs<edm::ParameterSet>("a6") &&
-                  !test->existsAs<edm::ParameterSet>("a7") &&
-                  !test->existsAs<edm::ParameterSet>("a8") &&
-                  !test->existsAs<edm::ParameterSet>("a9") &&
-                  !test->existsAs<edm::ParameterSet>("a10"));
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("o1") &&
-                  !test->existsAs<edm::ParameterSet>("o2") &&
-                  !test->existsAs<edm::ParameterSet>("o7") &&
-                  !test->existsAs<edm::ParameterSet>("o8") &&
-                  !test->existsAs<edm::ParameterSet>("o9") &&
-                  !test->existsAs<edm::ParameterSet>("o10"));
-
-   CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("ess@ess1") &&
-                  test->existsAs<edm::ParameterSet>("ess2@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess3") &&
-                  !test->existsAs<edm::ParameterSet>("ess4@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess11") &&
-                  !test->existsAs<edm::ParameterSet>("ess12@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess13") &&
-                  !test->existsAs<edm::ParameterSet>("ess14@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess15") &&
-                  !test->existsAs<edm::ParameterSet>("ess16@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess17") &&
-                  !test->existsAs<edm::ParameterSet>("ess18@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess19") &&
-                  !test->existsAs<edm::ParameterSet>("ess20@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess21") &&
-                  !test->existsAs<edm::ParameterSet>("ess22@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess23") &&
-                  !test->existsAs<edm::ParameterSet>("ess24@") &&
-                  !test->existsAs<edm::ParameterSet>("ess@ess25") &&
-                  !test->existsAs<edm::ParameterSet>("ess26@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess27") &&
-                  test->existsAs<edm::ParameterSet>("ess28@"));
-
-   CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("esp@esp1") &&
-                  test->existsAs<edm::ParameterSet>("esp2@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp3") &&
-                  !test->existsAs<edm::ParameterSet>("esp4@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp11") &&
-                  !test->existsAs<edm::ParameterSet>("esp12@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp13") &&
-                  !test->existsAs<edm::ParameterSet>("esp14@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp15") &&
-                  !test->existsAs<edm::ParameterSet>("esp16@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp17") &&
-                  !test->existsAs<edm::ParameterSet>("esp18@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp19") &&
-                  !test->existsAs<edm::ParameterSet>("esp20@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp21") &&
-                  !test->existsAs<edm::ParameterSet>("esp22@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp23") &&
-                  !test->existsAs<edm::ParameterSet>("esp24@") &&
-                  !test->existsAs<edm::ParameterSet>("esp@esp25") &&
-                  !test->existsAs<edm::ParameterSet>("esp26@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp27") &&
-                  test->existsAs<edm::ParameterSet>("esp28@"));
-
-   std::vector<edm::ParameterSet> const& vpsetServices = test->getUntrackedParameterSetVector("services");
-   // Note that the vector<ParameterSet> is not sorted. The order
-   // depends on the order of a python iteration through a dictionary
-   // which could be anything.
-   std::set<std::string> serviceNames;
-   for (auto const& pset : vpsetServices) {
-     serviceNames.insert(pset.getParameter<std::string>("@service_type"));
-   }
-   std::vector<std::string> expectedServiceNames;
-   expectedServiceNames.emplace_back("serv1");
-   expectedServiceNames.emplace_back("serv2");
-   expectedServiceNames.emplace_back("serv27");
-   expectedServiceNames.emplace_back("serv28");
-   bool result = true;
-   for (auto const& name : expectedServiceNames) {
-     if (serviceNames.find(name) == serviceNames.end()) {
-       result = false;
-     }
-   }
-   if (serviceNames.size() != expectedServiceNames.size()) {
-     result = false;
-   }
-   CPPUNIT_ASSERT(result);
+  char const* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.load(\"FWCore.PythonParameterSet.test.testTask_cff\")\n"
+      "t10 = cms.Task(process.m29, process.m30, process.f29, process.f30,"
+      "process.ess27, process.ess28, process.esp27, process.esp28,"
+      "process.serv27, process.serv28)\n"
+      "process.schedule = cms.Schedule()\n";
+
+  ParameterSetPtr test = pSet(kTest);
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("m1") && !test->existsAs<edm::ParameterSet>("m2") &&
+                 !test->existsAs<edm::ParameterSet>("m3") && !test->existsAs<edm::ParameterSet>("m4") &&
+                 !test->existsAs<edm::ParameterSet>("m5") && !test->existsAs<edm::ParameterSet>("m6") &&
+                 !test->existsAs<edm::ParameterSet>("m7") && !test->existsAs<edm::ParameterSet>("m8") &&
+                 !test->existsAs<edm::ParameterSet>("m9") && !test->existsAs<edm::ParameterSet>("m10") &&
+                 !test->existsAs<edm::ParameterSet>("m11") && !test->existsAs<edm::ParameterSet>("m12") &&
+                 !test->existsAs<edm::ParameterSet>("m13") && !test->existsAs<edm::ParameterSet>("m14") &&
+                 !test->existsAs<edm::ParameterSet>("m15") && !test->existsAs<edm::ParameterSet>("m16") &&
+                 !test->existsAs<edm::ParameterSet>("m17") && !test->existsAs<edm::ParameterSet>("m18") &&
+                 !test->existsAs<edm::ParameterSet>("m19") && !test->existsAs<edm::ParameterSet>("m20") &&
+                 !test->existsAs<edm::ParameterSet>("m21") && !test->existsAs<edm::ParameterSet>("m22") &&
+                 !test->existsAs<edm::ParameterSet>("m23") && !test->existsAs<edm::ParameterSet>("m24") &&
+                 !test->existsAs<edm::ParameterSet>("m25") && !test->existsAs<edm::ParameterSet>("m26") &&
+                 !test->existsAs<edm::ParameterSet>("m27") && !test->existsAs<edm::ParameterSet>("m28") &&
+                 !test->existsAs<edm::ParameterSet>("m29") && !test->existsAs<edm::ParameterSet>("m30"));
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("f1") && !test->existsAs<edm::ParameterSet>("f2") &&
+                 !test->existsAs<edm::ParameterSet>("f3") && !test->existsAs<edm::ParameterSet>("f4") &&
+                 !test->existsAs<edm::ParameterSet>("f5") && !test->existsAs<edm::ParameterSet>("f6") &&
+                 !test->existsAs<edm::ParameterSet>("f7") && !test->existsAs<edm::ParameterSet>("f8") &&
+                 !test->existsAs<edm::ParameterSet>("f9") && !test->existsAs<edm::ParameterSet>("f10") &&
+                 !test->existsAs<edm::ParameterSet>("f11") && !test->existsAs<edm::ParameterSet>("f12") &&
+                 !test->existsAs<edm::ParameterSet>("f13") && !test->existsAs<edm::ParameterSet>("f14") &&
+                 !test->existsAs<edm::ParameterSet>("f15") && !test->existsAs<edm::ParameterSet>("f16") &&
+                 !test->existsAs<edm::ParameterSet>("f17") && !test->existsAs<edm::ParameterSet>("f18") &&
+                 !test->existsAs<edm::ParameterSet>("f19") && !test->existsAs<edm::ParameterSet>("f20") &&
+                 !test->existsAs<edm::ParameterSet>("f21") && !test->existsAs<edm::ParameterSet>("f22") &&
+                 !test->existsAs<edm::ParameterSet>("f23") && !test->existsAs<edm::ParameterSet>("f24") &&
+                 !test->existsAs<edm::ParameterSet>("f25") && !test->existsAs<edm::ParameterSet>("f26") &&
+                 !test->existsAs<edm::ParameterSet>("f27") && !test->existsAs<edm::ParameterSet>("f28") &&
+                 !test->existsAs<edm::ParameterSet>("f29") && !test->existsAs<edm::ParameterSet>("f30"));
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("a1") && !test->existsAs<edm::ParameterSet>("a2") &&
+                 !test->existsAs<edm::ParameterSet>("a3") && !test->existsAs<edm::ParameterSet>("a4") &&
+                 !test->existsAs<edm::ParameterSet>("a5") && !test->existsAs<edm::ParameterSet>("a6") &&
+                 !test->existsAs<edm::ParameterSet>("a7") && !test->existsAs<edm::ParameterSet>("a8") &&
+                 !test->existsAs<edm::ParameterSet>("a9") && !test->existsAs<edm::ParameterSet>("a10"));
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("o1") && !test->existsAs<edm::ParameterSet>("o2") &&
+                 !test->existsAs<edm::ParameterSet>("o7") && !test->existsAs<edm::ParameterSet>("o8") &&
+                 !test->existsAs<edm::ParameterSet>("o9") && !test->existsAs<edm::ParameterSet>("o10"));
+
+  CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("ess@ess1") && test->existsAs<edm::ParameterSet>("ess2@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess3") && !test->existsAs<edm::ParameterSet>("ess4@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess11") && !test->existsAs<edm::ParameterSet>("ess12@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess13") && !test->existsAs<edm::ParameterSet>("ess14@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess15") && !test->existsAs<edm::ParameterSet>("ess16@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess17") && !test->existsAs<edm::ParameterSet>("ess18@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess19") && !test->existsAs<edm::ParameterSet>("ess20@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess21") && !test->existsAs<edm::ParameterSet>("ess22@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess23") && !test->existsAs<edm::ParameterSet>("ess24@") &&
+                 !test->existsAs<edm::ParameterSet>("ess@ess25") && !test->existsAs<edm::ParameterSet>("ess26@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess27") && test->existsAs<edm::ParameterSet>("ess28@"));
+
+  CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("esp@esp1") && test->existsAs<edm::ParameterSet>("esp2@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp3") && !test->existsAs<edm::ParameterSet>("esp4@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp11") && !test->existsAs<edm::ParameterSet>("esp12@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp13") && !test->existsAs<edm::ParameterSet>("esp14@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp15") && !test->existsAs<edm::ParameterSet>("esp16@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp17") && !test->existsAs<edm::ParameterSet>("esp18@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp19") && !test->existsAs<edm::ParameterSet>("esp20@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp21") && !test->existsAs<edm::ParameterSet>("esp22@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp23") && !test->existsAs<edm::ParameterSet>("esp24@") &&
+                 !test->existsAs<edm::ParameterSet>("esp@esp25") && !test->existsAs<edm::ParameterSet>("esp26@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp27") && test->existsAs<edm::ParameterSet>("esp28@"));
+
+  std::vector<edm::ParameterSet> const& vpsetServices = test->getUntrackedParameterSetVector("services");
+  // Note that the vector<ParameterSet> is not sorted. The order
+  // depends on the order of a python iteration through a dictionary
+  // which could be anything.
+  std::set<std::string> serviceNames;
+  for (auto const& pset : vpsetServices) {
+    serviceNames.insert(pset.getParameter<std::string>("@service_type"));
+  }
+  std::vector<std::string> expectedServiceNames;
+  expectedServiceNames.emplace_back("serv1");
+  expectedServiceNames.emplace_back("serv2");
+  expectedServiceNames.emplace_back("serv27");
+  expectedServiceNames.emplace_back("serv28");
+  bool result = true;
+  for (auto const& name : expectedServiceNames) {
+    if (serviceNames.find(name) == serviceNames.end()) {
+      result = false;
+    }
+  }
+  if (serviceNames.size() != expectedServiceNames.size()) {
+    result = false;
+  }
+  CPPUNIT_ASSERT(result);
 }
 
 void testmakeprocess::taskTestWithSchedule() {
-   char const* kTest =  "import FWCore.ParameterSet.Config as cms\n"
-   "process = cms.Process('test')\n"
-   "process.load(\"FWCore.PythonParameterSet.test.testTask_cff\")\n"
-   "t10 = cms.Task(process.m29, process.m30, process.f29, process.f30,"
-                   "process.ess27, process.ess28, process.esp27, process.esp28,"
-                   "process.serv27, process.serv28)\n"
-   "process.schedule = cms.Schedule(process.p1, process.p2, process.e1, process.e2,"
-                                    "process.pf1, process.pf2, process.ef1, process.ef2,"
-                                    "process.pa1, process.pa2, process.ea1, process.ea2,"
-                                    "process.eo1, process.eo2, process.pess2, process.eess2,"
-                                    "process.pesp2, process.eesp2, process.pserv2, process.eserv2,"
-                                    "tasks=[process.t9, process.tf9, process.tess10,process.tesp10,"
-                                    "process.tserv10])\n";
-
-   ParameterSetPtr test = pSet(kTest);
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("m1") &&
-                  !test->existsAs<edm::ParameterSet>("m2") &&
-                  test->existsAs<edm::ParameterSet>("m3") &&
-                  test->existsAs<edm::ParameterSet>("m4") &&
-                  test->existsAs<edm::ParameterSet>("m5") &&
-                  test->existsAs<edm::ParameterSet>("m6") &&
-                  test->existsAs<edm::ParameterSet>("m7") &&
-                  test->existsAs<edm::ParameterSet>("m8") &&
-                  test->existsAs<edm::ParameterSet>("m9") &&
-                  test->existsAs<edm::ParameterSet>("m10") &&
-                  test->existsAs<edm::ParameterSet>("m11") &&
-                  test->existsAs<edm::ParameterSet>("m12") &&
-                  test->existsAs<edm::ParameterSet>("m13") &&
-                  test->existsAs<edm::ParameterSet>("m14") &&
-                  test->existsAs<edm::ParameterSet>("m15") &&
-                  test->existsAs<edm::ParameterSet>("m16") &&
-                  test->existsAs<edm::ParameterSet>("m17") &&
-                  test->existsAs<edm::ParameterSet>("m18") &&
-                  test->existsAs<edm::ParameterSet>("m19") &&
-                  test->existsAs<edm::ParameterSet>("m20") &&
-                  test->existsAs<edm::ParameterSet>("m21") &&
-                  test->existsAs<edm::ParameterSet>("m22") &&
-                  test->existsAs<edm::ParameterSet>("m23") &&
-                  test->existsAs<edm::ParameterSet>("m24") &&
-                  test->existsAs<edm::ParameterSet>("m25") &&
-                  test->existsAs<edm::ParameterSet>("m26") &&
-                  test->existsAs<edm::ParameterSet>("m27") &&
-                  test->existsAs<edm::ParameterSet>("m28") &&
-                  !test->existsAs<edm::ParameterSet>("m29") &&
-                  !test->existsAs<edm::ParameterSet>("m30"));
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("f1") &&
-                  !test->existsAs<edm::ParameterSet>("f2") &&
-                  test->existsAs<edm::ParameterSet>("f3") &&
-                  test->existsAs<edm::ParameterSet>("f4") &&
-                  test->existsAs<edm::ParameterSet>("f5") &&
-                  test->existsAs<edm::ParameterSet>("f6") &&
-                  test->existsAs<edm::ParameterSet>("f7") &&
-                  test->existsAs<edm::ParameterSet>("f8") &&
-                  test->existsAs<edm::ParameterSet>("f9") &&
-                  test->existsAs<edm::ParameterSet>("f10") &&
-                  test->existsAs<edm::ParameterSet>("f11") &&
-                  test->existsAs<edm::ParameterSet>("f12") &&
-                  test->existsAs<edm::ParameterSet>("f13") &&
-                  test->existsAs<edm::ParameterSet>("f14") &&
-                  test->existsAs<edm::ParameterSet>("f15") &&
-                  test->existsAs<edm::ParameterSet>("f16") &&
-                  test->existsAs<edm::ParameterSet>("f17") &&
-                  test->existsAs<edm::ParameterSet>("f18") &&
-                  test->existsAs<edm::ParameterSet>("f19") &&
-                  test->existsAs<edm::ParameterSet>("f20") &&
-                  test->existsAs<edm::ParameterSet>("f21") &&
-                  test->existsAs<edm::ParameterSet>("f22") &&
-                  test->existsAs<edm::ParameterSet>("f23") &&
-                  test->existsAs<edm::ParameterSet>("f24") &&
-                  test->existsAs<edm::ParameterSet>("f25") &&
-                  test->existsAs<edm::ParameterSet>("f26") &&
-                  test->existsAs<edm::ParameterSet>("f27") &&
-                  test->existsAs<edm::ParameterSet>("f28") &&
-                  !test->existsAs<edm::ParameterSet>("f29") &&
-                  !test->existsAs<edm::ParameterSet>("f30"));
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("a1") &&
-                  !test->existsAs<edm::ParameterSet>("a2") &&
-                  test->existsAs<edm::ParameterSet>("a3") &&
-                  test->existsAs<edm::ParameterSet>("a4") &&
-                  test->existsAs<edm::ParameterSet>("a5") &&
-                  test->existsAs<edm::ParameterSet>("a6") &&
-                  test->existsAs<edm::ParameterSet>("a7") &&
-                  test->existsAs<edm::ParameterSet>("a8") &&
-                  test->existsAs<edm::ParameterSet>("a9") &&
-                  test->existsAs<edm::ParameterSet>("a10"));
-
-   CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("o1") &&
-                  !test->existsAs<edm::ParameterSet>("o2") &&
-                  test->existsAs<edm::ParameterSet>("o7") &&
-                  test->existsAs<edm::ParameterSet>("o8") &&
-                  test->existsAs<edm::ParameterSet>("o9") &&
-                  test->existsAs<edm::ParameterSet>("o10"));
-
-   CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("ess@ess1") &&
-                  test->existsAs<edm::ParameterSet>("ess2@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess3") &&
-                  test->existsAs<edm::ParameterSet>("ess4@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess11") &&
-                  test->existsAs<edm::ParameterSet>("ess12@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess13") &&
-                  test->existsAs<edm::ParameterSet>("ess14@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess15") &&
-                  test->existsAs<edm::ParameterSet>("ess16@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess17") &&
-                  test->existsAs<edm::ParameterSet>("ess18@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess19") &&
-                  test->existsAs<edm::ParameterSet>("ess20@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess21") &&
-                  test->existsAs<edm::ParameterSet>("ess22@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess23") &&
-                  test->existsAs<edm::ParameterSet>("ess24@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess25") &&
-                  test->existsAs<edm::ParameterSet>("ess26@") &&
-                  test->existsAs<edm::ParameterSet>("ess@ess27") &&
-                  test->existsAs<edm::ParameterSet>("ess28@"));
-
-   CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("esp@esp1") &&
-                  test->existsAs<edm::ParameterSet>("esp2@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp3") &&
-                  test->existsAs<edm::ParameterSet>("esp4@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp11") &&
-                  test->existsAs<edm::ParameterSet>("esp12@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp13") &&
-                  test->existsAs<edm::ParameterSet>("esp14@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp15") &&
-                  test->existsAs<edm::ParameterSet>("esp16@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp17") &&
-                  test->existsAs<edm::ParameterSet>("esp18@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp19") &&
-                  test->existsAs<edm::ParameterSet>("esp20@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp21") &&
-                  test->existsAs<edm::ParameterSet>("esp22@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp23") &&
-                  test->existsAs<edm::ParameterSet>("esp24@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp25") &&
-                  test->existsAs<edm::ParameterSet>("esp26@") &&
-                  test->existsAs<edm::ParameterSet>("esp@esp27") &&
-                  test->existsAs<edm::ParameterSet>("esp28@"));
-
-   std::vector<edm::ParameterSet> const& vpsetServices = test->getUntrackedParameterSetVector("services");
-   // Note that the vector<ParameterSet> is not sorted. The order
-   // depends on the order of a python iteration through a dictionary
-   // which could be anything.
-   std::set<std::string> serviceNames;
-   for (auto const& pset : vpsetServices) {
-     serviceNames.insert(pset.getParameter<std::string>("@service_type"));
-   }
-   std::vector<std::string> expectedServiceNames;
-   expectedServiceNames.emplace_back("serv1");
-   expectedServiceNames.emplace_back("serv2");
-   expectedServiceNames.emplace_back("serv3");
-   expectedServiceNames.emplace_back("serv4");
-   expectedServiceNames.emplace_back("serv11");
-   expectedServiceNames.emplace_back("serv12");
-   expectedServiceNames.emplace_back("serv13");
-   expectedServiceNames.emplace_back("serv14");
-   expectedServiceNames.emplace_back("serv15");
-   expectedServiceNames.emplace_back("serv16");
-   expectedServiceNames.emplace_back("serv17");
-   expectedServiceNames.emplace_back("serv18");
-   expectedServiceNames.emplace_back("serv19");
-   expectedServiceNames.emplace_back("serv20");
-   expectedServiceNames.emplace_back("serv21");
-   expectedServiceNames.emplace_back("serv22");
-   expectedServiceNames.emplace_back("serv23");
-   expectedServiceNames.emplace_back("serv24");
-   expectedServiceNames.emplace_back("serv25");
-   expectedServiceNames.emplace_back("serv26");
-   expectedServiceNames.emplace_back("serv27");
-   expectedServiceNames.emplace_back("serv28");
-   bool result = true;
-   for (auto const& name : expectedServiceNames) {
-     if (serviceNames.find(name) == serviceNames.end()) {
-       result = false;
-     }
-   }
-   if (serviceNames.size() != expectedServiceNames.size()) {
-     result = false;
-   }
-   CPPUNIT_ASSERT(result);
+  char const* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.load(\"FWCore.PythonParameterSet.test.testTask_cff\")\n"
+      "t10 = cms.Task(process.m29, process.m30, process.f29, process.f30,"
+      "process.ess27, process.ess28, process.esp27, process.esp28,"
+      "process.serv27, process.serv28)\n"
+      "process.schedule = cms.Schedule(process.p1, process.p2, process.e1, process.e2,"
+      "process.pf1, process.pf2, process.ef1, process.ef2,"
+      "process.pa1, process.pa2, process.ea1, process.ea2,"
+      "process.eo1, process.eo2, process.pess2, process.eess2,"
+      "process.pesp2, process.eesp2, process.pserv2, process.eserv2,"
+      "tasks=[process.t9, process.tf9, process.tess10,process.tesp10,"
+      "process.tserv10])\n";
+
+  ParameterSetPtr test = pSet(kTest);
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("m1") && !test->existsAs<edm::ParameterSet>("m2") &&
+                 test->existsAs<edm::ParameterSet>("m3") && test->existsAs<edm::ParameterSet>("m4") &&
+                 test->existsAs<edm::ParameterSet>("m5") && test->existsAs<edm::ParameterSet>("m6") &&
+                 test->existsAs<edm::ParameterSet>("m7") && test->existsAs<edm::ParameterSet>("m8") &&
+                 test->existsAs<edm::ParameterSet>("m9") && test->existsAs<edm::ParameterSet>("m10") &&
+                 test->existsAs<edm::ParameterSet>("m11") && test->existsAs<edm::ParameterSet>("m12") &&
+                 test->existsAs<edm::ParameterSet>("m13") && test->existsAs<edm::ParameterSet>("m14") &&
+                 test->existsAs<edm::ParameterSet>("m15") && test->existsAs<edm::ParameterSet>("m16") &&
+                 test->existsAs<edm::ParameterSet>("m17") && test->existsAs<edm::ParameterSet>("m18") &&
+                 test->existsAs<edm::ParameterSet>("m19") && test->existsAs<edm::ParameterSet>("m20") &&
+                 test->existsAs<edm::ParameterSet>("m21") && test->existsAs<edm::ParameterSet>("m22") &&
+                 test->existsAs<edm::ParameterSet>("m23") && test->existsAs<edm::ParameterSet>("m24") &&
+                 test->existsAs<edm::ParameterSet>("m25") && test->existsAs<edm::ParameterSet>("m26") &&
+                 test->existsAs<edm::ParameterSet>("m27") && test->existsAs<edm::ParameterSet>("m28") &&
+                 !test->existsAs<edm::ParameterSet>("m29") && !test->existsAs<edm::ParameterSet>("m30"));
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("f1") && !test->existsAs<edm::ParameterSet>("f2") &&
+                 test->existsAs<edm::ParameterSet>("f3") && test->existsAs<edm::ParameterSet>("f4") &&
+                 test->existsAs<edm::ParameterSet>("f5") && test->existsAs<edm::ParameterSet>("f6") &&
+                 test->existsAs<edm::ParameterSet>("f7") && test->existsAs<edm::ParameterSet>("f8") &&
+                 test->existsAs<edm::ParameterSet>("f9") && test->existsAs<edm::ParameterSet>("f10") &&
+                 test->existsAs<edm::ParameterSet>("f11") && test->existsAs<edm::ParameterSet>("f12") &&
+                 test->existsAs<edm::ParameterSet>("f13") && test->existsAs<edm::ParameterSet>("f14") &&
+                 test->existsAs<edm::ParameterSet>("f15") && test->existsAs<edm::ParameterSet>("f16") &&
+                 test->existsAs<edm::ParameterSet>("f17") && test->existsAs<edm::ParameterSet>("f18") &&
+                 test->existsAs<edm::ParameterSet>("f19") && test->existsAs<edm::ParameterSet>("f20") &&
+                 test->existsAs<edm::ParameterSet>("f21") && test->existsAs<edm::ParameterSet>("f22") &&
+                 test->existsAs<edm::ParameterSet>("f23") && test->existsAs<edm::ParameterSet>("f24") &&
+                 test->existsAs<edm::ParameterSet>("f25") && test->existsAs<edm::ParameterSet>("f26") &&
+                 test->existsAs<edm::ParameterSet>("f27") && test->existsAs<edm::ParameterSet>("f28") &&
+                 !test->existsAs<edm::ParameterSet>("f29") && !test->existsAs<edm::ParameterSet>("f30"));
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("a1") && !test->existsAs<edm::ParameterSet>("a2") &&
+                 test->existsAs<edm::ParameterSet>("a3") && test->existsAs<edm::ParameterSet>("a4") &&
+                 test->existsAs<edm::ParameterSet>("a5") && test->existsAs<edm::ParameterSet>("a6") &&
+                 test->existsAs<edm::ParameterSet>("a7") && test->existsAs<edm::ParameterSet>("a8") &&
+                 test->existsAs<edm::ParameterSet>("a9") && test->existsAs<edm::ParameterSet>("a10"));
+
+  CPPUNIT_ASSERT(!test->existsAs<edm::ParameterSet>("o1") && !test->existsAs<edm::ParameterSet>("o2") &&
+                 test->existsAs<edm::ParameterSet>("o7") && test->existsAs<edm::ParameterSet>("o8") &&
+                 test->existsAs<edm::ParameterSet>("o9") && test->existsAs<edm::ParameterSet>("o10"));
+
+  CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("ess@ess1") && test->existsAs<edm::ParameterSet>("ess2@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess3") && test->existsAs<edm::ParameterSet>("ess4@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess11") && test->existsAs<edm::ParameterSet>("ess12@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess13") && test->existsAs<edm::ParameterSet>("ess14@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess15") && test->existsAs<edm::ParameterSet>("ess16@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess17") && test->existsAs<edm::ParameterSet>("ess18@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess19") && test->existsAs<edm::ParameterSet>("ess20@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess21") && test->existsAs<edm::ParameterSet>("ess22@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess23") && test->existsAs<edm::ParameterSet>("ess24@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess25") && test->existsAs<edm::ParameterSet>("ess26@") &&
+                 test->existsAs<edm::ParameterSet>("ess@ess27") && test->existsAs<edm::ParameterSet>("ess28@"));
+
+  CPPUNIT_ASSERT(test->existsAs<edm::ParameterSet>("esp@esp1") && test->existsAs<edm::ParameterSet>("esp2@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp3") && test->existsAs<edm::ParameterSet>("esp4@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp11") && test->existsAs<edm::ParameterSet>("esp12@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp13") && test->existsAs<edm::ParameterSet>("esp14@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp15") && test->existsAs<edm::ParameterSet>("esp16@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp17") && test->existsAs<edm::ParameterSet>("esp18@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp19") && test->existsAs<edm::ParameterSet>("esp20@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp21") && test->existsAs<edm::ParameterSet>("esp22@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp23") && test->existsAs<edm::ParameterSet>("esp24@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp25") && test->existsAs<edm::ParameterSet>("esp26@") &&
+                 test->existsAs<edm::ParameterSet>("esp@esp27") && test->existsAs<edm::ParameterSet>("esp28@"));
+
+  std::vector<edm::ParameterSet> const& vpsetServices = test->getUntrackedParameterSetVector("services");
+  // Note that the vector<ParameterSet> is not sorted. The order
+  // depends on the order of a python iteration through a dictionary
+  // which could be anything.
+  std::set<std::string> serviceNames;
+  for (auto const& pset : vpsetServices) {
+    serviceNames.insert(pset.getParameter<std::string>("@service_type"));
+  }
+  std::vector<std::string> expectedServiceNames;
+  expectedServiceNames.emplace_back("serv1");
+  expectedServiceNames.emplace_back("serv2");
+  expectedServiceNames.emplace_back("serv3");
+  expectedServiceNames.emplace_back("serv4");
+  expectedServiceNames.emplace_back("serv11");
+  expectedServiceNames.emplace_back("serv12");
+  expectedServiceNames.emplace_back("serv13");
+  expectedServiceNames.emplace_back("serv14");
+  expectedServiceNames.emplace_back("serv15");
+  expectedServiceNames.emplace_back("serv16");
+  expectedServiceNames.emplace_back("serv17");
+  expectedServiceNames.emplace_back("serv18");
+  expectedServiceNames.emplace_back("serv19");
+  expectedServiceNames.emplace_back("serv20");
+  expectedServiceNames.emplace_back("serv21");
+  expectedServiceNames.emplace_back("serv22");
+  expectedServiceNames.emplace_back("serv23");
+  expectedServiceNames.emplace_back("serv24");
+  expectedServiceNames.emplace_back("serv25");
+  expectedServiceNames.emplace_back("serv26");
+  expectedServiceNames.emplace_back("serv27");
+  expectedServiceNames.emplace_back("serv28");
+  bool result = true;
+  for (auto const& name : expectedServiceNames) {
+    if (serviceNames.find(name) == serviceNames.end()) {
+      result = false;
+    }
+  }
+  if (serviceNames.size() != expectedServiceNames.size()) {
+    result = false;
+  }
+  CPPUNIT_ASSERT(result);
 }
 
 /*
diff --git a/FWCore/PythonParameterSet/test/makepset_t.cppunit.cc b/FWCore/PythonParameterSet/test/makepset_t.cppunit.cc
index 7b95d7d28c484..40e775e56d6a2 100644
--- a/FWCore/PythonParameterSet/test/makepset_t.cppunit.cc
+++ b/FWCore/PythonParameterSet/test/makepset_t.cppunit.cc
@@ -18,12 +18,12 @@
 #include <algorithm>
 #include <iostream>
 #include <fstream>
-#include <stdlib.h> // for setenv; <cstdlib> is likely to fail
+#include <stdlib.h>  // for setenv; <cstdlib> is likely to fail
 #include <string>
 #include <unistd.h>
 #include <boost/filesystem.hpp>
 
-class testmakepset: public CppUnit::TestFixture {
+class testmakepset : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testmakepset);
   CPPUNIT_TEST(typesTest);
   CPPUNIT_TEST(secsourceTest);
@@ -31,15 +31,15 @@ class testmakepset: public CppUnit::TestFixture {
   CPPUNIT_TEST(fileinpathTest);
   CPPUNIT_TEST_SUITE_END();
 
- public:
-  void setUp(){}
-  void tearDown(){}
+public:
+  void setUp() {}
+  void tearDown() {}
   void typesTest();
   void secsourceTest();
   void usingBlockTest();
   void fileinpathTest();
 
- private:
+private:
   void secsourceAux();
   void usingBlockAux();
   void fileinpathAux();
@@ -49,18 +49,17 @@ class testmakepset: public CppUnit::TestFixture {
 CPPUNIT_TEST_SUITE_REGISTRATION(testmakepset);
 
 void testmakepset::secsourceTest() {
-  try { this->secsourceAux(); }
-  catch (cms::Exception& x) {
+  try {
+    this->secsourceAux();
+  } catch (cms::Exception& x) {
     std::cerr << "testmakepset::secsourceTest() caught a cms::Exception\n";
     std::cerr << x.what() << '\n';
     throw;
-  }
-  catch (std::exception& x) {
+  } catch (std::exception& x) {
     std::cerr << "testmakepset::secsourceTest() caught a std::exception\n";
     std::cerr << x.what() << '\n';
     throw;
-  }
-  catch (...) {
+  } catch (...) {
     std::cerr << "testmakepset::secsourceTest() caught an unidentified exception\n";
     throw;
   }
@@ -68,28 +67,28 @@ void testmakepset::secsourceTest() {
 
 void testmakepset::secsourceAux() {
   char const* kTest =
-  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('PROD')\n"
-  "process.maxEvents = cms.untracked.PSet(\n"
-  "    input = cms.untracked.int32(2)\n"
-  ")\n"
-  "process.source = cms.Source('PoolSource',\n"
-  "    fileNames = cms.untracked.vstring('file:main.root')\n"
-  ")\n"
-  "process.out = cms.OutputModule('PoolOutputModule',\n"
-  "    fileName = cms.string('file:CumHits.root')\n"
-  ")\n"
-  "process.mix = cms.EDFilter('MixingModule',\n"
-  "    input = cms.SecSource('EmbeddedRootSource',\n"
-  "        fileNames = cms.untracked.vstring('file:pileup.root')\n"
-  "    ),\n"
-  "    max_bunch = cms.int32(3),\n"
-  "    average_number = cms.double(14.3),\n"
-  "    min_bunch = cms.int32(-5),\n"
-  "    type = cms.string('fixed')\n"
-  ")\n"
-  "process.p = cms.Path(process.mix)\n"
-  "process.ep = cms.EndPath(process.out)\n";
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('PROD')\n"
+      "process.maxEvents = cms.untracked.PSet(\n"
+      "    input = cms.untracked.int32(2)\n"
+      ")\n"
+      "process.source = cms.Source('PoolSource',\n"
+      "    fileNames = cms.untracked.vstring('file:main.root')\n"
+      ")\n"
+      "process.out = cms.OutputModule('PoolOutputModule',\n"
+      "    fileName = cms.string('file:CumHits.root')\n"
+      ")\n"
+      "process.mix = cms.EDFilter('MixingModule',\n"
+      "    input = cms.SecSource('EmbeddedRootSource',\n"
+      "        fileNames = cms.untracked.vstring('file:pileup.root')\n"
+      "    ),\n"
+      "    max_bunch = cms.int32(3),\n"
+      "    average_number = cms.double(14.3),\n"
+      "    min_bunch = cms.int32(-5),\n"
+      "    type = cms.string('fixed')\n"
+      ")\n"
+      "process.p = cms.Path(process.mix)\n"
+      "process.ep = cms.EndPath(process.out)\n";
 
   std::string config(kTest);
 
@@ -104,17 +103,18 @@ void testmakepset::secsourceAux() {
   edm::ParameterSet const& secondarySourceParams = mixingModuleParams.getParameterSet("input");
   CPPUNIT_ASSERT(secondarySourceParams.getParameter<std::string>("@module_type") == "EmbeddedRootSource");
   CPPUNIT_ASSERT(secondarySourceParams.getParameter<std::string>("@module_label") == "input");
-  CPPUNIT_ASSERT(secondarySourceParams.getUntrackedParameter<std::vector<std::string> >("fileNames")[0] == "file:pileup.root");
+  CPPUNIT_ASSERT(secondarySourceParams.getUntrackedParameter<std::vector<std::string> >("fileNames")[0] ==
+                 "file:pileup.root");
 }
 
 void testmakepset::usingBlockTest() {
-  try { this->usingBlockAux(); }
-  catch (cms::Exception& x) {
+  try {
+    this->usingBlockAux();
+  } catch (cms::Exception& x) {
     std::cerr << "testmakepset::usingBlockTest() caught a cms::Exception\n";
     std::cerr << x.what() << '\n';
     throw;
-  }
-  catch (...) {
+  } catch (...) {
     std::cerr << "testmakepset::usingBlockTest() caught an unidentified exception\n";
     throw;
   }
@@ -122,30 +122,30 @@ void testmakepset::usingBlockTest() {
 
 void testmakepset::usingBlockAux() {
   char const* kTest =
-  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('PROD')\n"
-  "process.maxEvents = cms.untracked.PSet(\n"
-  "    input = cms.untracked.int32(2)\n"
-  ")\n"
-  "process.source = cms.Source('PoolSource',\n"
-  "    fileNames = cms.untracked.vstring('file:main.root')\n"
-  ")\n"
-  "process.b = cms.PSet(\n"
-  "    s = cms.string('original'),\n"
-  "    r = cms.double(1.5)\n"
-  ")\n"
-  "process.m1 = cms.EDFilter('Class1',\n"
-  "    process.b,\n"
-  "    i = cms.int32(1)\n"
-  ")\n"
-  "process.m2 = cms.EDFilter('Class2',\n"
-  "    process.b,\n"
-  "    i = cms.int32(2),\n"
-  "    j = cms.int32(3),\n"
-  "    u = cms.uint64(1011),\n"
-  "    l = cms.int64(101010)\n"
-  ")\n"
-  "process.p = cms.Path(process.m1+process.m2)\n";
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('PROD')\n"
+      "process.maxEvents = cms.untracked.PSet(\n"
+      "    input = cms.untracked.int32(2)\n"
+      ")\n"
+      "process.source = cms.Source('PoolSource',\n"
+      "    fileNames = cms.untracked.vstring('file:main.root')\n"
+      ")\n"
+      "process.b = cms.PSet(\n"
+      "    s = cms.string('original'),\n"
+      "    r = cms.double(1.5)\n"
+      ")\n"
+      "process.m1 = cms.EDFilter('Class1',\n"
+      "    process.b,\n"
+      "    i = cms.int32(1)\n"
+      ")\n"
+      "process.m2 = cms.EDFilter('Class2',\n"
+      "    process.b,\n"
+      "    i = cms.int32(2),\n"
+      "    j = cms.int32(3),\n"
+      "    u = cms.uint64(1011),\n"
+      "    l = cms.int64(101010)\n"
+      ")\n"
+      "process.p = cms.Path(process.m1+process.m2)\n";
 
   std::string config(kTest);
   // Create the ParameterSet object from this configuration string.
@@ -170,13 +170,13 @@ void testmakepset::usingBlockAux() {
 }
 
 void testmakepset::fileinpathTest() {
-  try { this->fileinpathAux(); }
-  catch (cms::Exception& x) {
+  try {
+    this->fileinpathAux();
+  } catch (cms::Exception& x) {
     std::cerr << "testmakepset::fileinpathTest() caught a cms::Exception\n";
     std::cerr << x.what() << '\n';
     throw;
-  }
-  catch (...) {
+  } catch (...) {
     std::cerr << "testmakepset::fileinpathTest() caught an unidentified exception\n";
     throw;
   }
@@ -184,82 +184,83 @@ void testmakepset::fileinpathTest() {
 
 void testmakepset::fileinpathAux() {
   char const* kTest =
-  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('PROD')\n"
-  "process.main = cms.PSet(\n"
-  "    topo = cms.FileInPath('Geometry/TrackerSimData/data/trackersens.xml'),\n"
-  "    fip = cms.FileInPath('FWCore/PythonParameterSet/test/fip.txt'),\n"
-  "    ufip = cms.untracked.FileInPath('FWCore/PythonParameterSet/test/ufip.txt'),\n"
-  "    extraneous = cms.int32(12)\n"
-  ")\n"
-  "process.source = cms.Source('EmptySource')\n";
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('PROD')\n"
+      "process.main = cms.PSet(\n"
+      "    topo = cms.FileInPath('Geometry/TrackerSimData/data/trackersens.xml'),\n"
+      "    fip = cms.FileInPath('FWCore/PythonParameterSet/test/fip.txt'),\n"
+      "    ufip = cms.untracked.FileInPath('FWCore/PythonParameterSet/test/ufip.txt'),\n"
+      "    extraneous = cms.int32(12)\n"
+      ")\n"
+      "process.source = cms.Source('EmptySource')\n";
 
   std::string config(kTest);
   std::string tmpout;
-  bool localArea=false;
+  bool localArea = false;
   // Create the ParameterSet object from this configuration string.
   {
-  PyBind11ProcessDesc builder(config);
-  std::shared_ptr<edm::ParameterSet> ps = builder.parameterSet();
-  CPPUNIT_ASSERT(nullptr != ps.get());
-
-  edm::ParameterSet const& innerps = ps->getParameterSet("main");
-  edm::FileInPath fip  = innerps.getParameter<edm::FileInPath>("fip");
-  edm::FileInPath ufip = innerps.getUntrackedParameter<edm::FileInPath>("ufip");
-  CPPUNIT_ASSERT(innerps.existsAs<int>("extraneous"));
-  CPPUNIT_ASSERT(!innerps.existsAs<int>("absent"));
-  char *releaseBase = getenv("CMSSW_RELEASE_BASE");
-  char *localBase = getenv("CMSSW_BASE");
-  localArea = (releaseBase != nullptr && strlen(releaseBase) != 0 && strcmp(releaseBase, localBase));
-  if(localArea) {
-    // Need to account for possible symbolic links
-    std::string const src("/src");
-    std::string release = releaseBase + src;
-    std::string local = localBase + src;
-    edm::resolveSymbolicLinks(release);
-    edm::resolveSymbolicLinks(local);
-    localArea = (local != release);
-  }
-
-  if(localArea) {
-    CPPUNIT_ASSERT(fip.location() == edm::FileInPath::Local);
-  }
-  CPPUNIT_ASSERT(fip.relativePath()  == "FWCore/PythonParameterSet/test/fip.txt");
-  CPPUNIT_ASSERT(ufip.relativePath() == "FWCore/PythonParameterSet/test/ufip.txt");
-  std::string fullpath = fip.fullPath();
-  std::cerr << "fullPath is: " << fip.fullPath() << std::endl;
-  std::cerr << "copy of fullPath is: " << fullpath << std::endl;
-
-  CPPUNIT_ASSERT(!fullpath.empty());
-
-  tmpout = fullpath.substr(0, fullpath.find("FWCore/PythonParameterSet/test/fip.txt")) + "tmp.py";
-
-  edm::FileInPath topo = innerps.getParameter<edm::FileInPath>("topo");
-  // if the file is local, then just disable this check as then it is expected to fail
-  {
-    std::string const src("/src");
-    std::string local = localBase + src;
-    std::string localFile = local + "/Geometry/TrackerSimData/data/trackersens.xml";
-    if (!boost::filesystem::exists(localFile) )
-      CPPUNIT_ASSERT(topo.location() != edm::FileInPath::Local);
-    else
-      std::cerr << "Disabling test against local path for trackersens.xml as package is checked out in this test" << std::endl;
-  }
-  CPPUNIT_ASSERT(topo.relativePath() == "Geometry/TrackerSimData/data/trackersens.xml");
-  fullpath = topo.fullPath();
-  CPPUNIT_ASSERT(!fullpath.empty());
-
-  std::vector<edm::FileInPath> v(1);
-  CPPUNIT_ASSERT(innerps.getAllFileInPaths(v) == 3);
-
-  CPPUNIT_ASSERT(v.size() == 4);
-  CPPUNIT_ASSERT(std::count(v.begin(), v.end(), fip) == 1);
-  CPPUNIT_ASSERT(std::count(v.begin(), v.end(), topo) == 1);
-
-  edm::ParameterSet empty;
-  v.clear();
-  CPPUNIT_ASSERT(empty.getAllFileInPaths(v) == 0);
-  CPPUNIT_ASSERT(v.empty());
+    PyBind11ProcessDesc builder(config);
+    std::shared_ptr<edm::ParameterSet> ps = builder.parameterSet();
+    CPPUNIT_ASSERT(nullptr != ps.get());
+
+    edm::ParameterSet const& innerps = ps->getParameterSet("main");
+    edm::FileInPath fip = innerps.getParameter<edm::FileInPath>("fip");
+    edm::FileInPath ufip = innerps.getUntrackedParameter<edm::FileInPath>("ufip");
+    CPPUNIT_ASSERT(innerps.existsAs<int>("extraneous"));
+    CPPUNIT_ASSERT(!innerps.existsAs<int>("absent"));
+    char* releaseBase = getenv("CMSSW_RELEASE_BASE");
+    char* localBase = getenv("CMSSW_BASE");
+    localArea = (releaseBase != nullptr && strlen(releaseBase) != 0 && strcmp(releaseBase, localBase));
+    if (localArea) {
+      // Need to account for possible symbolic links
+      std::string const src("/src");
+      std::string release = releaseBase + src;
+      std::string local = localBase + src;
+      edm::resolveSymbolicLinks(release);
+      edm::resolveSymbolicLinks(local);
+      localArea = (local != release);
+    }
+
+    if (localArea) {
+      CPPUNIT_ASSERT(fip.location() == edm::FileInPath::Local);
+    }
+    CPPUNIT_ASSERT(fip.relativePath() == "FWCore/PythonParameterSet/test/fip.txt");
+    CPPUNIT_ASSERT(ufip.relativePath() == "FWCore/PythonParameterSet/test/ufip.txt");
+    std::string fullpath = fip.fullPath();
+    std::cerr << "fullPath is: " << fip.fullPath() << std::endl;
+    std::cerr << "copy of fullPath is: " << fullpath << std::endl;
+
+    CPPUNIT_ASSERT(!fullpath.empty());
+
+    tmpout = fullpath.substr(0, fullpath.find("FWCore/PythonParameterSet/test/fip.txt")) + "tmp.py";
+
+    edm::FileInPath topo = innerps.getParameter<edm::FileInPath>("topo");
+    // if the file is local, then just disable this check as then it is expected to fail
+    {
+      std::string const src("/src");
+      std::string local = localBase + src;
+      std::string localFile = local + "/Geometry/TrackerSimData/data/trackersens.xml";
+      if (!boost::filesystem::exists(localFile))
+        CPPUNIT_ASSERT(topo.location() != edm::FileInPath::Local);
+      else
+        std::cerr << "Disabling test against local path for trackersens.xml as package is checked out in this test"
+                  << std::endl;
+    }
+    CPPUNIT_ASSERT(topo.relativePath() == "Geometry/TrackerSimData/data/trackersens.xml");
+    fullpath = topo.fullPath();
+    CPPUNIT_ASSERT(!fullpath.empty());
+
+    std::vector<edm::FileInPath> v(1);
+    CPPUNIT_ASSERT(innerps.getAllFileInPaths(v) == 3);
+
+    CPPUNIT_ASSERT(v.size() == 4);
+    CPPUNIT_ASSERT(std::count(v.begin(), v.end(), fip) == 1);
+    CPPUNIT_ASSERT(std::count(v.begin(), v.end(), topo) == 1);
+
+    edm::ParameterSet empty;
+    v.clear();
+    CPPUNIT_ASSERT(empty.getAllFileInPaths(v) == 0);
+    CPPUNIT_ASSERT(v.empty());
   }
   // This last test checks that a FileInPath parameter can be read
   // successfully even if the associated file no longer exists.
@@ -267,12 +268,12 @@ void testmakepset::fileinpathAux() {
   CPPUNIT_ASSERT(!(!out));
 
   char const* kTest2 =
-  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('PROD')\n"
-  "process.main = cms.PSet(\n"
-  "    fip2 = cms.FileInPath('tmp.py')\n"
-  ")\n"
-  "process.source = cms.Source('EmptySource')\n";
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('PROD')\n"
+      "process.main = cms.PSet(\n"
+      "    fip2 = cms.FileInPath('tmp.py')\n"
+      ")\n"
+      "process.source = cms.Source('EmptySource')\n";
 
   std::string config2(kTest2);
   // Create the ParameterSet object from this configuration string.
@@ -295,209 +296,210 @@ void testmakepset::fileinpathAux() {
 }
 
 void testmakepset::typesTest() {
-   //vbool vb = {true, false};
-   char const* kTest =
-  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('t')\n"
-  "process.p = cms.PSet(\n"
-  "    input2 = cms.InputTag('Label2','Instance2'),\n"
-  "    sb3 = cms.string('    '),\n"
-  "    input1 = cms.InputTag('Label1','Instance1'),\n"
-  "    input6 = cms.InputTag('source'),\n"
-  "    ##justasbig = cms.double(inf),\n"
-  "    input4 = cms.InputTag('Label4','Instance4','Process4'),\n"
-  "    input3 = cms.untracked.InputTag('Label3','Instance3'),\n"
-  "    h2 = cms.uint32(255),\n"
-  "    vi = cms.vint32(1, -2),\n"
-  "    input8 = cms.string('deprecatedString:tag'),\n"
-  "    h1 = cms.int32(74),\n"
-  "    vs = cms.vstring('','1', \n"
-  "        '2', \n"
-  "        'a', 'XXX'),\n"
-  "    vs2 = cms.vstring(), vs3 = cms.vstring(''),\n"
-  "    sb2 = cms.string(''),\n"
-  "    input7 = cms.InputTag('source','sink'),\n"
-  "    ps = cms.PSet(\n"
-  "        b2 = cms.untracked.bool(True)\n"
-  "    ),\n"
-  "    input5 = cms.InputTag('Label5','','Process5'),\n"
-  "    h3 = cms.untracked.uint32(3487559679),\n"
-  "    input = cms.InputTag('Label'),\n"
-  "    vps = cms.VPSet(cms.PSet(\n"
-  "        b3 = cms.bool(False)\n"
-  "    )),\n"
-  "    ##indebt = cms.double(-inf),\n"
-  "    ##big = cms.double(inf),\n"
-  "    vinput = cms.VInputTag(cms.InputTag('l1','i1'), cms.InputTag('l2'), cms.InputTag('l3','i3','p3'), cms.InputTag('l4','','p4'), cms.InputTag('source'), \n"
-  "        cms.InputTag('source','sink')),\n"
-  "    ui = cms.uint32(1),\n"
-  "    eventID = cms.EventID(1, 0, 1),\n"
-  "    b = cms.untracked.bool(True),\n"
-  "    d = cms.double(1.0),\n"
-  "    i = cms.int32(1),\n"
-  "    vui = cms.vuint32(1, 2, 1, 255),\n"
-  "    s = cms.string('this string'),\n"
-  "    sb1 = cms.string(''),\n"
-  "    emptyString = cms.untracked.string(''),\n"
-  "    vEventID = cms.VEventID('1:1', '2:2','3:3'),\n"
-  "    lumi = cms.LuminosityBlockID(55, 65),\n"
-  "    vlumis = cms.VLuminosityBlockID('75:85', '95:105'),\n"
-  "    einput1 = cms.ESInputTag(),\n"
-  "    einput2 = cms.ESInputTag(data='blah'),\n"
-  "    einput3 = cms.ESInputTag('ESProd'),\n"
-  "    einput4 = cms.ESInputTag('ESProd','something'),\n"
-  "    einput5 = cms.ESInputTag('ESProd:something'),\n"
-  "    veinput1 = cms.VESInputTag(),\n"
-  "    veinput2 = cms.VESInputTag(cms.ESInputTag(data='blah'),cms.ESInputTag('ESProd'))\n"
-  ")\n"
-
-     ;
-
-   std::string config2(kTest);
-   // Create the ParameterSet object from this configuration string.
-   PyBind11ProcessDesc builder2(config2);
-   std::shared_ptr<edm::ParameterSet> ps2 = builder2.parameterSet();
-   edm::ParameterSet const& test = ps2->getParameterSet("p");
-
-   CPPUNIT_ASSERT(1 == test.getParameter<int>("i"));
-   CPPUNIT_ASSERT(test.retrieve("i").isTracked());
-   CPPUNIT_ASSERT(1 == test.getParameter<unsigned int>("ui"));
-   CPPUNIT_ASSERT(1 == test.getParameter<double>("d"));
-   //CPPUNIT_ASSERT(100000. < test.getParameter<double>("big"));
-   //CPPUNIT_ASSERT(100000. < test.getParameter<double>("justasbig"));
-   //CPPUNIT_ASSERT(-1000000. > test.getParameter<double>("indebt"));
-
-   // test hex numbers
-   CPPUNIT_ASSERT(74 == test.getParameter<int>("h1"));
-   CPPUNIT_ASSERT(255 == test.getParameter<unsigned int>("h2"));
-   CPPUNIT_ASSERT(3487559679U == test.getUntrackedParameter<unsigned int>("h3"));
-
-   CPPUNIT_ASSERT("this string" == test.getParameter<std::string>("s"));
-   CPPUNIT_ASSERT("" == test.getParameter<std::string>("sb1"));
-   CPPUNIT_ASSERT("" == test.getUntrackedParameter<std::string>("emptyString", "default"));
-   CPPUNIT_ASSERT("" == test.getParameter<std::string>("sb2"));
-   CPPUNIT_ASSERT(4  == test.getParameter<std::string>("sb3").size());
-   std::vector<std::string> vs = test.getParameter<std::vector<std::string> >("vs");
-   int vssize = vs.size();
-   //FIXME doesn't do spaces right
-   edm::Entry e(test.retrieve("vs"));
-   CPPUNIT_ASSERT(5 == vssize);
-   CPPUNIT_ASSERT(vssize && "" == vs[0]);
-   CPPUNIT_ASSERT(vssize >1 && "1" == vs[1]);
-   CPPUNIT_ASSERT(vssize >1 && "a" == vs[3]);
-   vs = test.getParameter<std::vector<std::string> >("vs2");
-   CPPUNIT_ASSERT(vs.size() == 0);
-   vs = test.getParameter<std::vector<std::string> >("vs3");
-   CPPUNIT_ASSERT(vs.size() == 1);
-   CPPUNIT_ASSERT(vs[0] == "");
-
-   static unsigned int const vuia[] = {1,2,1,255};
-   static std::vector<unsigned int> const vui(vuia, vuia+sizeof(vuia)/sizeof(unsigned int));
-   CPPUNIT_ASSERT(vui == test.getParameter<std::vector<unsigned int> >("vui"));
-
-   static int const via[] = {1,-2};
-   static std::vector<int> const vi(via, via+sizeof(via)/sizeof(int));
-   test.getParameter<std::vector<int> >("vi");
-   CPPUNIT_ASSERT(true == test.getUntrackedParameter<bool>("b", false));
-   CPPUNIT_ASSERT(test.retrieve("vi").isTracked());
-   //test.getParameter<std::vector<bool> >("vb");
-   edm::ParameterSet const& ps = test.getParameterSet("ps");
-   CPPUNIT_ASSERT(true == ps.getUntrackedParameter<bool>("b2", false));
-   std::vector<edm::ParameterSet> const& vps = test.getParameterSetVector("vps");
-   CPPUNIT_ASSERT(1 == vps.size());
-   CPPUNIT_ASSERT(false == vps.front().getParameter<bool>("b3"));
-
-   // InputTag
-   edm::InputTag inputProduct  = test.getParameter<edm::InputTag>("input");
-   edm::InputTag inputProduct1 = test.getParameter<edm::InputTag>("input1");
-   edm::InputTag inputProduct2 = test.getParameter<edm::InputTag>("input2");
-   edm::InputTag inputProduct3 = test.getUntrackedParameter<edm::InputTag>("input3");
-   edm::InputTag inputProduct4 = test.getParameter<edm::InputTag>("input4");
-   edm::InputTag inputProduct5 = test.getParameter<edm::InputTag>("input5");
-   edm::InputTag inputProduct6 = test.getParameter<edm::InputTag>("input6");
-   edm::InputTag inputProduct7 = test.getParameter<edm::InputTag>("input7");
-   edm::InputTag inputProduct8 = test.getParameter<edm::InputTag>("input8");
-
-   //edm::OutputTag outputProduct = test.getParameter<edm::OutputTag>("output");
-
-   CPPUNIT_ASSERT("Label"    == inputProduct.label());
-   CPPUNIT_ASSERT("Label1"    == inputProduct1.label());
-   CPPUNIT_ASSERT("Label2"    == inputProduct2.label());
-   CPPUNIT_ASSERT("Instance2" == inputProduct2.instance());
-   CPPUNIT_ASSERT("Label3"    == inputProduct3.label());
-   CPPUNIT_ASSERT("Instance3" == inputProduct3.instance());
-   CPPUNIT_ASSERT("Label4" == inputProduct4.label());
-   CPPUNIT_ASSERT("Instance4" == inputProduct4.instance());
-   CPPUNIT_ASSERT("Process4" == inputProduct4.process());
-   CPPUNIT_ASSERT("Label5" == inputProduct5.label());
-   CPPUNIT_ASSERT("" == inputProduct5.instance());
-   CPPUNIT_ASSERT("Process5" == inputProduct5.process());
-   CPPUNIT_ASSERT("source" == inputProduct6.label());
-   CPPUNIT_ASSERT("source" == inputProduct7.label());
-   CPPUNIT_ASSERT("deprecatedString" == inputProduct8.label());
-
-   // vector of InputTags
-
-   std::vector<edm::InputTag> vtags = test.getParameter<std::vector<edm::InputTag> >("vinput");
-   CPPUNIT_ASSERT("l1" == vtags[0].label());
-   CPPUNIT_ASSERT("i1" == vtags[0].instance());
-   CPPUNIT_ASSERT("l2" == vtags[1].label());
-   CPPUNIT_ASSERT("l3" == vtags[2].label());
-   CPPUNIT_ASSERT("i3" == vtags[2].instance());
-   CPPUNIT_ASSERT("p3" == vtags[2].process());
-   CPPUNIT_ASSERT("l4" == vtags[3].label());
-   CPPUNIT_ASSERT(""   == vtags[3].instance());
-   CPPUNIT_ASSERT("p4" == vtags[3].process());
-   CPPUNIT_ASSERT("source" == vtags[4].label());
-   CPPUNIT_ASSERT("source" == vtags[5].label());
-
-   // ESInputTag
-   edm::ESInputTag einput1 = test.getParameter<edm::ESInputTag>("einput1");
-   edm::ESInputTag einput2 = test.getParameter<edm::ESInputTag>("einput2");
-   edm::ESInputTag einput3 = test.getParameter<edm::ESInputTag>("einput3");
-   edm::ESInputTag einput4 = test.getParameter<edm::ESInputTag>("einput4");
-   edm::ESInputTag einput5 = test.getParameter<edm::ESInputTag>("einput5");
-   CPPUNIT_ASSERT("" == einput1.module());
-   CPPUNIT_ASSERT("" == einput1.data());
-   CPPUNIT_ASSERT("" == einput2.module());
-   CPPUNIT_ASSERT("blah" == einput2.data());
-   CPPUNIT_ASSERT("ESProd" == einput3.module());
-   CPPUNIT_ASSERT("" == einput3.data());
-   CPPUNIT_ASSERT("ESProd" == einput4.module());
-   CPPUNIT_ASSERT("something" == einput4.data());
-   CPPUNIT_ASSERT("ESProd" == einput5.module());
-   CPPUNIT_ASSERT("something" == einput5.data());
-
-   std::vector<edm::ESInputTag> veinput1 = test.getParameter<std::vector<edm::ESInputTag> >("veinput1");
-   std::vector<edm::ESInputTag> veinput2 = test.getParameter<std::vector<edm::ESInputTag> >("veinput2");
-   CPPUNIT_ASSERT(0 == veinput1.size());
-   CPPUNIT_ASSERT(2 == veinput2.size());
-   CPPUNIT_ASSERT("" == veinput2[0].module());
-   CPPUNIT_ASSERT("blah" == veinput2[0].data());
-   CPPUNIT_ASSERT("ESProd" == veinput2[1].module());
-   CPPUNIT_ASSERT("" == veinput2[1].data());
-
-   edm::EventID eventID = test.getParameter<edm::EventID>("eventID");
-   std::vector<edm::EventID> vEventID = test.getParameter<std::vector<edm::EventID> >("vEventID");
-   CPPUNIT_ASSERT(1 == eventID.run());
-   CPPUNIT_ASSERT(1 == eventID.event());
-   CPPUNIT_ASSERT(1 == vEventID[0].run());
-   CPPUNIT_ASSERT(1 == vEventID[0].event());
-   CPPUNIT_ASSERT(3 == vEventID[2].run());
-   CPPUNIT_ASSERT(3 == vEventID[2].event());
-
-   edm::LuminosityBlockID lumi = test.getParameter<edm::LuminosityBlockID >("lumi");
-   CPPUNIT_ASSERT(55 == lumi.run());
-   CPPUNIT_ASSERT(65 == lumi.luminosityBlock());
-   std::vector<edm::LuminosityBlockID> vlumis = test.getParameter<std::vector<edm::LuminosityBlockID> >("vlumis");
-   CPPUNIT_ASSERT(vlumis.size() == 2);
-   CPPUNIT_ASSERT(vlumis[0].run() == 75);
-   CPPUNIT_ASSERT(vlumis[0].luminosityBlock() == 85);
-   CPPUNIT_ASSERT(vlumis[1].run() == 95);
-   CPPUNIT_ASSERT(vlumis[1].luminosityBlock() == 105);
-
-   //CPPUNIT_ASSERT("Label2" == outputProduct.label());
-   //CPPUNIT_ASSERT(""       == outputProduct.instance());
-   //CPPUNIT_ASSERT("Alias2" == outputProduct.alias());
-   //BOOST_CHECK_THROW(makePSet(*nodeList), std::runtime_error);
+  //vbool vb = {true, false};
+  char const* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('t')\n"
+      "process.p = cms.PSet(\n"
+      "    input2 = cms.InputTag('Label2','Instance2'),\n"
+      "    sb3 = cms.string('    '),\n"
+      "    input1 = cms.InputTag('Label1','Instance1'),\n"
+      "    input6 = cms.InputTag('source'),\n"
+      "    ##justasbig = cms.double(inf),\n"
+      "    input4 = cms.InputTag('Label4','Instance4','Process4'),\n"
+      "    input3 = cms.untracked.InputTag('Label3','Instance3'),\n"
+      "    h2 = cms.uint32(255),\n"
+      "    vi = cms.vint32(1, -2),\n"
+      "    input8 = cms.string('deprecatedString:tag'),\n"
+      "    h1 = cms.int32(74),\n"
+      "    vs = cms.vstring('','1', \n"
+      "        '2', \n"
+      "        'a', 'XXX'),\n"
+      "    vs2 = cms.vstring(), vs3 = cms.vstring(''),\n"
+      "    sb2 = cms.string(''),\n"
+      "    input7 = cms.InputTag('source','sink'),\n"
+      "    ps = cms.PSet(\n"
+      "        b2 = cms.untracked.bool(True)\n"
+      "    ),\n"
+      "    input5 = cms.InputTag('Label5','','Process5'),\n"
+      "    h3 = cms.untracked.uint32(3487559679),\n"
+      "    input = cms.InputTag('Label'),\n"
+      "    vps = cms.VPSet(cms.PSet(\n"
+      "        b3 = cms.bool(False)\n"
+      "    )),\n"
+      "    ##indebt = cms.double(-inf),\n"
+      "    ##big = cms.double(inf),\n"
+      "    vinput = cms.VInputTag(cms.InputTag('l1','i1'), cms.InputTag('l2'), cms.InputTag('l3','i3','p3'), "
+      "cms.InputTag('l4','','p4'), cms.InputTag('source'), \n"
+      "        cms.InputTag('source','sink')),\n"
+      "    ui = cms.uint32(1),\n"
+      "    eventID = cms.EventID(1, 0, 1),\n"
+      "    b = cms.untracked.bool(True),\n"
+      "    d = cms.double(1.0),\n"
+      "    i = cms.int32(1),\n"
+      "    vui = cms.vuint32(1, 2, 1, 255),\n"
+      "    s = cms.string('this string'),\n"
+      "    sb1 = cms.string(''),\n"
+      "    emptyString = cms.untracked.string(''),\n"
+      "    vEventID = cms.VEventID('1:1', '2:2','3:3'),\n"
+      "    lumi = cms.LuminosityBlockID(55, 65),\n"
+      "    vlumis = cms.VLuminosityBlockID('75:85', '95:105'),\n"
+      "    einput1 = cms.ESInputTag(),\n"
+      "    einput2 = cms.ESInputTag(data='blah'),\n"
+      "    einput3 = cms.ESInputTag('ESProd'),\n"
+      "    einput4 = cms.ESInputTag('ESProd','something'),\n"
+      "    einput5 = cms.ESInputTag('ESProd:something'),\n"
+      "    veinput1 = cms.VESInputTag(),\n"
+      "    veinput2 = cms.VESInputTag(cms.ESInputTag(data='blah'),cms.ESInputTag('ESProd'))\n"
+      ")\n"
+
+      ;
+
+  std::string config2(kTest);
+  // Create the ParameterSet object from this configuration string.
+  PyBind11ProcessDesc builder2(config2);
+  std::shared_ptr<edm::ParameterSet> ps2 = builder2.parameterSet();
+  edm::ParameterSet const& test = ps2->getParameterSet("p");
+
+  CPPUNIT_ASSERT(1 == test.getParameter<int>("i"));
+  CPPUNIT_ASSERT(test.retrieve("i").isTracked());
+  CPPUNIT_ASSERT(1 == test.getParameter<unsigned int>("ui"));
+  CPPUNIT_ASSERT(1 == test.getParameter<double>("d"));
+  //CPPUNIT_ASSERT(100000. < test.getParameter<double>("big"));
+  //CPPUNIT_ASSERT(100000. < test.getParameter<double>("justasbig"));
+  //CPPUNIT_ASSERT(-1000000. > test.getParameter<double>("indebt"));
+
+  // test hex numbers
+  CPPUNIT_ASSERT(74 == test.getParameter<int>("h1"));
+  CPPUNIT_ASSERT(255 == test.getParameter<unsigned int>("h2"));
+  CPPUNIT_ASSERT(3487559679U == test.getUntrackedParameter<unsigned int>("h3"));
+
+  CPPUNIT_ASSERT("this string" == test.getParameter<std::string>("s"));
+  CPPUNIT_ASSERT("" == test.getParameter<std::string>("sb1"));
+  CPPUNIT_ASSERT("" == test.getUntrackedParameter<std::string>("emptyString", "default"));
+  CPPUNIT_ASSERT("" == test.getParameter<std::string>("sb2"));
+  CPPUNIT_ASSERT(4 == test.getParameter<std::string>("sb3").size());
+  std::vector<std::string> vs = test.getParameter<std::vector<std::string> >("vs");
+  int vssize = vs.size();
+  //FIXME doesn't do spaces right
+  edm::Entry e(test.retrieve("vs"));
+  CPPUNIT_ASSERT(5 == vssize);
+  CPPUNIT_ASSERT(vssize && "" == vs[0]);
+  CPPUNIT_ASSERT(vssize > 1 && "1" == vs[1]);
+  CPPUNIT_ASSERT(vssize > 1 && "a" == vs[3]);
+  vs = test.getParameter<std::vector<std::string> >("vs2");
+  CPPUNIT_ASSERT(vs.size() == 0);
+  vs = test.getParameter<std::vector<std::string> >("vs3");
+  CPPUNIT_ASSERT(vs.size() == 1);
+  CPPUNIT_ASSERT(vs[0] == "");
+
+  static unsigned int const vuia[] = {1, 2, 1, 255};
+  static std::vector<unsigned int> const vui(vuia, vuia + sizeof(vuia) / sizeof(unsigned int));
+  CPPUNIT_ASSERT(vui == test.getParameter<std::vector<unsigned int> >("vui"));
+
+  static int const via[] = {1, -2};
+  static std::vector<int> const vi(via, via + sizeof(via) / sizeof(int));
+  test.getParameter<std::vector<int> >("vi");
+  CPPUNIT_ASSERT(true == test.getUntrackedParameter<bool>("b", false));
+  CPPUNIT_ASSERT(test.retrieve("vi").isTracked());
+  //test.getParameter<std::vector<bool> >("vb");
+  edm::ParameterSet const& ps = test.getParameterSet("ps");
+  CPPUNIT_ASSERT(true == ps.getUntrackedParameter<bool>("b2", false));
+  std::vector<edm::ParameterSet> const& vps = test.getParameterSetVector("vps");
+  CPPUNIT_ASSERT(1 == vps.size());
+  CPPUNIT_ASSERT(false == vps.front().getParameter<bool>("b3"));
+
+  // InputTag
+  edm::InputTag inputProduct = test.getParameter<edm::InputTag>("input");
+  edm::InputTag inputProduct1 = test.getParameter<edm::InputTag>("input1");
+  edm::InputTag inputProduct2 = test.getParameter<edm::InputTag>("input2");
+  edm::InputTag inputProduct3 = test.getUntrackedParameter<edm::InputTag>("input3");
+  edm::InputTag inputProduct4 = test.getParameter<edm::InputTag>("input4");
+  edm::InputTag inputProduct5 = test.getParameter<edm::InputTag>("input5");
+  edm::InputTag inputProduct6 = test.getParameter<edm::InputTag>("input6");
+  edm::InputTag inputProduct7 = test.getParameter<edm::InputTag>("input7");
+  edm::InputTag inputProduct8 = test.getParameter<edm::InputTag>("input8");
+
+  //edm::OutputTag outputProduct = test.getParameter<edm::OutputTag>("output");
+
+  CPPUNIT_ASSERT("Label" == inputProduct.label());
+  CPPUNIT_ASSERT("Label1" == inputProduct1.label());
+  CPPUNIT_ASSERT("Label2" == inputProduct2.label());
+  CPPUNIT_ASSERT("Instance2" == inputProduct2.instance());
+  CPPUNIT_ASSERT("Label3" == inputProduct3.label());
+  CPPUNIT_ASSERT("Instance3" == inputProduct3.instance());
+  CPPUNIT_ASSERT("Label4" == inputProduct4.label());
+  CPPUNIT_ASSERT("Instance4" == inputProduct4.instance());
+  CPPUNIT_ASSERT("Process4" == inputProduct4.process());
+  CPPUNIT_ASSERT("Label5" == inputProduct5.label());
+  CPPUNIT_ASSERT("" == inputProduct5.instance());
+  CPPUNIT_ASSERT("Process5" == inputProduct5.process());
+  CPPUNIT_ASSERT("source" == inputProduct6.label());
+  CPPUNIT_ASSERT("source" == inputProduct7.label());
+  CPPUNIT_ASSERT("deprecatedString" == inputProduct8.label());
+
+  // vector of InputTags
+
+  std::vector<edm::InputTag> vtags = test.getParameter<std::vector<edm::InputTag> >("vinput");
+  CPPUNIT_ASSERT("l1" == vtags[0].label());
+  CPPUNIT_ASSERT("i1" == vtags[0].instance());
+  CPPUNIT_ASSERT("l2" == vtags[1].label());
+  CPPUNIT_ASSERT("l3" == vtags[2].label());
+  CPPUNIT_ASSERT("i3" == vtags[2].instance());
+  CPPUNIT_ASSERT("p3" == vtags[2].process());
+  CPPUNIT_ASSERT("l4" == vtags[3].label());
+  CPPUNIT_ASSERT("" == vtags[3].instance());
+  CPPUNIT_ASSERT("p4" == vtags[3].process());
+  CPPUNIT_ASSERT("source" == vtags[4].label());
+  CPPUNIT_ASSERT("source" == vtags[5].label());
+
+  // ESInputTag
+  edm::ESInputTag einput1 = test.getParameter<edm::ESInputTag>("einput1");
+  edm::ESInputTag einput2 = test.getParameter<edm::ESInputTag>("einput2");
+  edm::ESInputTag einput3 = test.getParameter<edm::ESInputTag>("einput3");
+  edm::ESInputTag einput4 = test.getParameter<edm::ESInputTag>("einput4");
+  edm::ESInputTag einput5 = test.getParameter<edm::ESInputTag>("einput5");
+  CPPUNIT_ASSERT("" == einput1.module());
+  CPPUNIT_ASSERT("" == einput1.data());
+  CPPUNIT_ASSERT("" == einput2.module());
+  CPPUNIT_ASSERT("blah" == einput2.data());
+  CPPUNIT_ASSERT("ESProd" == einput3.module());
+  CPPUNIT_ASSERT("" == einput3.data());
+  CPPUNIT_ASSERT("ESProd" == einput4.module());
+  CPPUNIT_ASSERT("something" == einput4.data());
+  CPPUNIT_ASSERT("ESProd" == einput5.module());
+  CPPUNIT_ASSERT("something" == einput5.data());
+
+  std::vector<edm::ESInputTag> veinput1 = test.getParameter<std::vector<edm::ESInputTag> >("veinput1");
+  std::vector<edm::ESInputTag> veinput2 = test.getParameter<std::vector<edm::ESInputTag> >("veinput2");
+  CPPUNIT_ASSERT(0 == veinput1.size());
+  CPPUNIT_ASSERT(2 == veinput2.size());
+  CPPUNIT_ASSERT("" == veinput2[0].module());
+  CPPUNIT_ASSERT("blah" == veinput2[0].data());
+  CPPUNIT_ASSERT("ESProd" == veinput2[1].module());
+  CPPUNIT_ASSERT("" == veinput2[1].data());
+
+  edm::EventID eventID = test.getParameter<edm::EventID>("eventID");
+  std::vector<edm::EventID> vEventID = test.getParameter<std::vector<edm::EventID> >("vEventID");
+  CPPUNIT_ASSERT(1 == eventID.run());
+  CPPUNIT_ASSERT(1 == eventID.event());
+  CPPUNIT_ASSERT(1 == vEventID[0].run());
+  CPPUNIT_ASSERT(1 == vEventID[0].event());
+  CPPUNIT_ASSERT(3 == vEventID[2].run());
+  CPPUNIT_ASSERT(3 == vEventID[2].event());
+
+  edm::LuminosityBlockID lumi = test.getParameter<edm::LuminosityBlockID>("lumi");
+  CPPUNIT_ASSERT(55 == lumi.run());
+  CPPUNIT_ASSERT(65 == lumi.luminosityBlock());
+  std::vector<edm::LuminosityBlockID> vlumis = test.getParameter<std::vector<edm::LuminosityBlockID> >("vlumis");
+  CPPUNIT_ASSERT(vlumis.size() == 2);
+  CPPUNIT_ASSERT(vlumis[0].run() == 75);
+  CPPUNIT_ASSERT(vlumis[0].luminosityBlock() == 85);
+  CPPUNIT_ASSERT(vlumis[1].run() == 95);
+  CPPUNIT_ASSERT(vlumis[1].luminosityBlock() == 105);
+
+  //CPPUNIT_ASSERT("Label2" == outputProduct.label());
+  //CPPUNIT_ASSERT(""       == outputProduct.instance());
+  //CPPUNIT_ASSERT("Alias2" == outputProduct.alias());
+  //BOOST_CHECK_THROW(makePSet(*nodeList), std::runtime_error);
 }
diff --git a/FWCore/PythonParameterSet/test/processbuilder_t.cppunit.cpp b/FWCore/PythonParameterSet/test/processbuilder_t.cppunit.cpp
index 03ae5bc66d5ae..c12b785eed1da 100644
--- a/FWCore/PythonParameterSet/test/processbuilder_t.cppunit.cpp
+++ b/FWCore/PythonParameterSet/test/processbuilder_t.cppunit.cpp
@@ -18,8 +18,7 @@
 #include <string>
 #include <iostream>
 
-class testProcessDesc: public CppUnit::TestFixture {
-
+class testProcessDesc : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testProcessDesc);
 
   CPPUNIT_TEST(trivialPathTest);
@@ -57,147 +56,142 @@ CPPUNIT_TEST_SUITE_REGISTRATION(testProcessDesc);
 
 void testProcessDesc::trivialPathTest() {
   std::string str =
-  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('X')\n"
-  "process.a = cms.EDFilter('A',\n"
-  "    p = cms.int32(3)\n"
-  ")\n"
-  "process.b = cms.EDProducer('B')\n"
-  "process.c = cms.EDProducer('C')\n"
-  "process.p = cms.Path(process.a*process.b*process.c)\n";
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('X')\n"
+      "process.a = cms.EDFilter('A',\n"
+      "    p = cms.int32(3)\n"
+      ")\n"
+      "process.b = cms.EDProducer('B')\n"
+      "process.c = cms.EDProducer('C')\n"
+      "process.p = cms.Path(process.a*process.b*process.c)\n";
 
   std::shared_ptr<edm::ParameterSet> test = PyBind11ProcessDesc(str).parameterSet();
 
   typedef std::vector<std::string> Strs;
 
   Strs s = (*test).getParameter<std::vector<std::string> >("p");
-  CPPUNIT_ASSERT(s[0]=="a");
+  CPPUNIT_ASSERT(s[0] == "a");
   //CPPUNIT_ASSERT(b->getDependencies("a")=="");
 }
 
 void testProcessDesc::simplePathTest() {
-
   std::string str =
-  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('X')\n"
-  "process.a = cms.EDFilter('A',\n"
-  "    p = cms.int32(3)\n"
-  ")\n"
-  "process.b = cms.EDFilter('A',\n"
-  "    p = cms.int32(3)\n"
-  ")\n"
-  "process.c = cms.EDFilter('A',\n"
-  "    p = cms.int32(3)\n"
-  ")\n"
-  "process.p = cms.Path(process.a*process.b*process.c)\n";
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('X')\n"
+      "process.a = cms.EDFilter('A',\n"
+      "    p = cms.int32(3)\n"
+      ")\n"
+      "process.b = cms.EDFilter('A',\n"
+      "    p = cms.int32(3)\n"
+      ")\n"
+      "process.c = cms.EDFilter('A',\n"
+      "    p = cms.int32(3)\n"
+      ")\n"
+      "process.p = cms.Path(process.a*process.b*process.c)\n";
 
   std::shared_ptr<edm::ParameterSet> test = PyBind11ProcessDesc(str).parameterSet();
 
   typedef std::vector<std::string> Strs;
 
   Strs s = (*test).getParameter<std::vector<std::string> >("p");
-  CPPUNIT_ASSERT(s[0]=="a");
-  CPPUNIT_ASSERT(s[1]=="b");
-  CPPUNIT_ASSERT(s[2]=="c");
+  CPPUNIT_ASSERT(s[0] == "a");
+  CPPUNIT_ASSERT(s[1] == "b");
+  CPPUNIT_ASSERT(s[2] == "c");
 
   //CPPUNIT_ASSERT (b->getDependencies("a")=="");
   //CPPUNIT_ASSERT (b->getDependencies("b")=="a,");
   //CPPUNIT_ASSERT (b->getDependencies("c")=="a,b,");
 }
 
-void testProcessDesc:: attriggertest () {
-
+void testProcessDesc::attriggertest() {
   std::string str =
-  "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('test')\n"
-  "process.cone1 = cms.EDFilter('PhonyConeJet',\n"
-  "    i = cms.int32(5)\n"
-  ")\n"
-  "process.cone2 = cms.EDFilter('PhonyConeJet',\n"
-  "    i = cms.int32(7)\n"
-  ")\n"
-  "process.somejet1 = cms.EDFilter('PhonyJet',\n"
-  "    i = cms.int32(7)\n"
-  ")\n"
-  "process.somejet2 = cms.EDFilter('PhonyJet',\n"
-  "    i = cms.int32(7)\n"
-  ")\n"
-  "process.jtanalyzer = cms.EDFilter('PhonyConeJet',\n"
-  "    i = cms.int32(7)\n"
-  ")\n"
-  "process.output = cms.OutputModule('OutputModule')\n"
-  "process.cones = cms.Sequence(process.cone1*process.cone2)\n"
-  "process.jets = cms.Sequence(process.somejet1*process.somejet2)\n"
-  "process.path1 = cms.Path(process.cones*process.jets*process.jtanalyzer)\n"
-  "process.epath = cms.EndPath(process.output)\n";
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.cone1 = cms.EDFilter('PhonyConeJet',\n"
+      "    i = cms.int32(5)\n"
+      ")\n"
+      "process.cone2 = cms.EDFilter('PhonyConeJet',\n"
+      "    i = cms.int32(7)\n"
+      ")\n"
+      "process.somejet1 = cms.EDFilter('PhonyJet',\n"
+      "    i = cms.int32(7)\n"
+      ")\n"
+      "process.somejet2 = cms.EDFilter('PhonyJet',\n"
+      "    i = cms.int32(7)\n"
+      ")\n"
+      "process.jtanalyzer = cms.EDFilter('PhonyConeJet',\n"
+      "    i = cms.int32(7)\n"
+      ")\n"
+      "process.output = cms.OutputModule('OutputModule')\n"
+      "process.cones = cms.Sequence(process.cone1*process.cone2)\n"
+      "process.jets = cms.Sequence(process.somejet1*process.somejet2)\n"
+      "process.path1 = cms.Path(process.cones*process.jets*process.jtanalyzer)\n"
+      "process.epath = cms.EndPath(process.output)\n";
 
   try {
-  std::shared_ptr<edm::ParameterSet> test = PyBind11ProcessDesc(str).parameterSet();
+    std::shared_ptr<edm::ParameterSet> test = PyBind11ProcessDesc(str).parameterSet();
 
-  typedef std::vector<std::string> Strs;
+    typedef std::vector<std::string> Strs;
 
-  edm::ParameterSet const& trig_pset =
-   (*test).getParameterSet("@trigger_paths");
-  Strs tnames = trig_pset.getParameter<Strs>("@trigger_paths");
-  Strs enames = (*test).getParameter<Strs>("@end_paths");
+    edm::ParameterSet const& trig_pset = (*test).getParameterSet("@trigger_paths");
+    Strs tnames = trig_pset.getParameter<Strs>("@trigger_paths");
+    Strs enames = (*test).getParameter<Strs>("@end_paths");
 
-  CPPUNIT_ASSERT(tnames[0]=="path1");
-  CPPUNIT_ASSERT(enames[0]=="epath");
+    CPPUNIT_ASSERT(tnames[0] == "path1");
+    CPPUNIT_ASSERT(enames[0] == "epath");
 
-  // see if the auto-schedule is correct
-  Strs schedule = (*test).getParameter<Strs>("@paths");
-  CPPUNIT_ASSERT(schedule.size() == 2);
-  CPPUNIT_ASSERT(schedule[0] == "path1");
-  CPPUNIT_ASSERT(schedule[1] == "epath");
+    // see if the auto-schedule is correct
+    Strs schedule = (*test).getParameter<Strs>("@paths");
+    CPPUNIT_ASSERT(schedule.size() == 2);
+    CPPUNIT_ASSERT(schedule[0] == "path1");
+    CPPUNIT_ASSERT(schedule[1] == "epath");
 
-  }
-  catch (cms::Exception& exc) {
+  } catch (cms::Exception& exc) {
     std::cerr << "Got an cms::Exception: " << exc.what() << "\n";
     throw;
-  }
-  catch (std::exception& exc) {
+  } catch (std::exception& exc) {
     std::cerr << "Got an std::exception: " << exc.what() << "\n";
     throw;
-  }
-  catch (...) {
-    std::cerr << "Got an unknown exception: " << "\n";
+  } catch (...) {
+    std::cerr << "Got an unknown exception: "
+              << "\n";
     throw;
   }
 }
 
-void testProcessDesc:: sequenceSubstitutionTest () {
-
-  std::string str = "import FWCore.ParameterSet.Config as cms\n"
-  "process = cms.Process('test')\n"
-  "process.cone1 = cms.EDFilter('PhonyConeJet',\n"
-  "    i = cms.int32(5)\n"
-  ")\n"
-  "process.cone2 = cms.EDFilter('PhonyConeJet',\n"
-  "    i = cms.int32(7)\n"
-  ")\n"
-  "process.somejet1 = cms.EDFilter('PhonyJet',\n"
-  "    i = cms.int32(7)\n"
-  ")\n"
-  "process.somejet2 = cms.EDFilter('PhonyJet',\n"
-  "    i = cms.int32(7)\n"
-  ")\n"
-  "process.jtanalyzer = cms.EDFilter('PhonyConeJet',\n"
-  "    i = cms.int32(7)\n"
-  ")\n"
-  "process.cones = cms.Sequence(process.cone1*process.cone2)\n"
-  "process.jets = cms.Sequence(process.somejet1*process.somejet2)\n"
-  "process.path1 = cms.Path(process.cones*process.jets*process.jtanalyzer)\n";
+void testProcessDesc::sequenceSubstitutionTest() {
+  std::string str =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.cone1 = cms.EDFilter('PhonyConeJet',\n"
+      "    i = cms.int32(5)\n"
+      ")\n"
+      "process.cone2 = cms.EDFilter('PhonyConeJet',\n"
+      "    i = cms.int32(7)\n"
+      ")\n"
+      "process.somejet1 = cms.EDFilter('PhonyJet',\n"
+      "    i = cms.int32(7)\n"
+      ")\n"
+      "process.somejet2 = cms.EDFilter('PhonyJet',\n"
+      "    i = cms.int32(7)\n"
+      ")\n"
+      "process.jtanalyzer = cms.EDFilter('PhonyConeJet',\n"
+      "    i = cms.int32(7)\n"
+      ")\n"
+      "process.cones = cms.Sequence(process.cone1*process.cone2)\n"
+      "process.jets = cms.Sequence(process.somejet1*process.somejet2)\n"
+      "process.path1 = cms.Path(process.cones*process.jets*process.jtanalyzer)\n";
 
   std::shared_ptr<edm::ParameterSet> test = PyBind11ProcessDesc(str).parameterSet();
 
   typedef std::vector<std::string> Strs;
 
   Strs s = (*test).getParameter<std::vector<std::string> >("path1");
-  CPPUNIT_ASSERT(s[0]=="cone1");
-  CPPUNIT_ASSERT(s[1]=="cone2");
-  CPPUNIT_ASSERT(s[2]=="somejet1");
-  CPPUNIT_ASSERT(s[3]=="somejet2");
-  CPPUNIT_ASSERT(s[4]=="jtanalyzer");
+  CPPUNIT_ASSERT(s[0] == "cone1");
+  CPPUNIT_ASSERT(s[1] == "cone2");
+  CPPUNIT_ASSERT(s[2] == "somejet1");
+  CPPUNIT_ASSERT(s[3] == "somejet2");
+  CPPUNIT_ASSERT(s[4] == "jtanalyzer");
 
   //CPPUNIT_ASSERT (b->getDependencies("cone1")=="");
   //CPPUNIT_ASSERT (b->getDependencies("cone2")=="cone1,");
@@ -207,25 +201,25 @@ void testProcessDesc:: sequenceSubstitutionTest () {
 }
 
 void testProcessDesc::nestedSequenceSubstitutionTest() {
-
-  std::string str = "import FWCore.ParameterSet.Config as cms\n"
-   "process = cms.Process('test')\n"
-   "process.a = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
-   "process.b = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.c = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-   "process.d = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-   "process.s1 = cms.Sequence( process.a+ process.b)\n"
-   "process.s2 = cms.Sequence(process.s1+ process.c)\n"
-   "process.path1 = cms.Path(process.s2+process.d)\n";
+  std::string str =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.a = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
+      "process.b = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.c = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.d = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.s1 = cms.Sequence( process.a+ process.b)\n"
+      "process.s2 = cms.Sequence(process.s1+ process.c)\n"
+      "process.path1 = cms.Path(process.s2+process.d)\n";
   std::shared_ptr<edm::ParameterSet> test = PyBind11ProcessDesc(str).parameterSet();
 
   typedef std::vector<std::string> Strs;
 
   Strs s = (*test).getParameter<std::vector<std::string> >("path1");
-  CPPUNIT_ASSERT(s[0]=="a");
-  CPPUNIT_ASSERT(s[1]=="b");
-  CPPUNIT_ASSERT(s[2]=="c");
-  CPPUNIT_ASSERT(s[3]=="d");
+  CPPUNIT_ASSERT(s[0] == "a");
+  CPPUNIT_ASSERT(s[1] == "b");
+  CPPUNIT_ASSERT(s[2] == "c");
+  CPPUNIT_ASSERT(s[3] == "d");
 
   //CPPUNIT_ASSERT (b.getDependencies("a")=="");
   //CPPUNIT_ASSERT (b.getDependencies("b")=="a,");
@@ -234,30 +228,30 @@ void testProcessDesc::nestedSequenceSubstitutionTest() {
 }
 
 void testProcessDesc::sequenceSubstitutionTest2() {
-
-  std::string str = "import FWCore.ParameterSet.Config as cms\n"
-   "process = cms.Process('test')\n"
-   "process.cone1 = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
-   "process.cone2 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.cone3 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.somejet1 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-   "process.somejet2 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-   "process.jtanalyzer = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.cones = cms.Sequence(process.cone1+ process.cone2+ process.cone3)\n"
-   "process.jets = cms.Sequence(process.somejet1+ process.somejet2)\n"
-   "process.path1 = cms.Path(process.cones+process.jets+ process.jtanalyzer)\n";
+  std::string str =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.cone1 = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
+      "process.cone2 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.cone3 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.somejet1 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.somejet2 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.jtanalyzer = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.cones = cms.Sequence(process.cone1+ process.cone2+ process.cone3)\n"
+      "process.jets = cms.Sequence(process.somejet1+ process.somejet2)\n"
+      "process.path1 = cms.Path(process.cones+process.jets+ process.jtanalyzer)\n";
 
   std::shared_ptr<edm::ParameterSet> test = PyBind11ProcessDesc(str).parameterSet();
 
   typedef std::vector<std::string> Strs;
 
   Strs s = (*test).getParameter<std::vector<std::string> >("path1");
-  CPPUNIT_ASSERT(s[0]=="cone1");
-  CPPUNIT_ASSERT(s[1]=="cone2");
-  CPPUNIT_ASSERT(s[2]=="cone3");
-  CPPUNIT_ASSERT(s[3]=="somejet1");
-  CPPUNIT_ASSERT(s[4]=="somejet2");
-  CPPUNIT_ASSERT(s[5]=="jtanalyzer");
+  CPPUNIT_ASSERT(s[0] == "cone1");
+  CPPUNIT_ASSERT(s[1] == "cone2");
+  CPPUNIT_ASSERT(s[2] == "cone3");
+  CPPUNIT_ASSERT(s[3] == "somejet1");
+  CPPUNIT_ASSERT(s[4] == "somejet2");
+  CPPUNIT_ASSERT(s[5] == "jtanalyzer");
 
   //CPPUNIT_ASSERT (b.getDependencies("cone1")=="");
   //CPPUNIT_ASSERT (b.getDependencies("cone2")=="cone1,");
@@ -268,46 +262,46 @@ void testProcessDesc::sequenceSubstitutionTest2() {
 }
 
 void testProcessDesc::sequenceSubstitutionTest3() {
-
-   std::string str = "import FWCore.ParameterSet.Config as cms\n"
-   "process = cms.Process('test')\n"
-   "process.a = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
-   "process.b = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.c = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.aa = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-   "process.bb = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-   "process.cc = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.dd = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.aaa = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.bbb = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.ccc = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.ddd = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.eee = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.last = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-
-   "process.s1 = cms.Sequence(process.a* process.b* process.c)\n"
-   "process.s2 = cms.Sequence(process.aa*process.bb*cms.ignore(process.cc)*process.dd)\n"
-   "process.s3 = cms.Sequence(process.aaa*process.bbb*~process.ccc*process.ddd*process.eee)\n"
-   "process.path1 = cms.Path(process.s1+process.s3+process.s2+process.last)\n";
+  std::string str =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.a = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
+      "process.b = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.c = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.aa = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.bb = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.cc = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.dd = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.aaa = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.bbb = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.ccc = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.ddd = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.eee = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.last = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+
+      "process.s1 = cms.Sequence(process.a* process.b* process.c)\n"
+      "process.s2 = cms.Sequence(process.aa*process.bb*cms.ignore(process.cc)*process.dd)\n"
+      "process.s3 = cms.Sequence(process.aaa*process.bbb*~process.ccc*process.ddd*process.eee)\n"
+      "process.path1 = cms.Path(process.s1+process.s3+process.s2+process.last)\n";
 
   std::shared_ptr<edm::ParameterSet> test = PyBind11ProcessDesc(str).parameterSet();
 
   typedef std::vector<std::string> Strs;
 
   Strs s = (*test).getParameter<std::vector<std::string> >("path1");
-  CPPUNIT_ASSERT(s[0]=="a");
-  CPPUNIT_ASSERT(s[1]=="b");
-  CPPUNIT_ASSERT(s[2]=="c");
-  CPPUNIT_ASSERT(s[3]=="aaa");
-  CPPUNIT_ASSERT(s[4]=="bbb");
-  CPPUNIT_ASSERT(s[5]=="!ccc");
-  CPPUNIT_ASSERT(s[6]=="ddd");
-  CPPUNIT_ASSERT(s[7]=="eee");
-  CPPUNIT_ASSERT(s[8]=="aa");
-  CPPUNIT_ASSERT(s[9]=="bb");
-  CPPUNIT_ASSERT(s[10]=="-cc");
-  CPPUNIT_ASSERT(s[11]=="dd");
-  CPPUNIT_ASSERT(s[12]=="last");
+  CPPUNIT_ASSERT(s[0] == "a");
+  CPPUNIT_ASSERT(s[1] == "b");
+  CPPUNIT_ASSERT(s[2] == "c");
+  CPPUNIT_ASSERT(s[3] == "aaa");
+  CPPUNIT_ASSERT(s[4] == "bbb");
+  CPPUNIT_ASSERT(s[5] == "!ccc");
+  CPPUNIT_ASSERT(s[6] == "ddd");
+  CPPUNIT_ASSERT(s[7] == "eee");
+  CPPUNIT_ASSERT(s[8] == "aa");
+  CPPUNIT_ASSERT(s[9] == "bb");
+  CPPUNIT_ASSERT(s[10] == "-cc");
+  CPPUNIT_ASSERT(s[11] == "dd");
+  CPPUNIT_ASSERT(s[12] == "last");
 
   //CPPUNIT_ASSERT (b.getDependencies("a")=="");
   //CPPUNIT_ASSERT (b.getDependencies("b")=="a,");
@@ -322,35 +316,34 @@ void testProcessDesc::sequenceSubstitutionTest3() {
   //CPPUNIT_ASSERT (b.getDependencies("cc")=="a,aa,aaa,b,bb,bbb,c,ccc,ddd,eee,");
   //CPPUNIT_ASSERT (b.getDependencies("dd")=="a,aa,aaa,b,bb,bbb,c,cc,ccc,ddd,eee,");
   //CPPUNIT_ASSERT (b.getDependencies("last")=="a,aa,aaa,b,bb,bbb,c,cc,ccc,dd,ddd,eee,");
-
 }
 
 void testProcessDesc::multiplePathsTest() {
-
-  std::string str = "import FWCore.ParameterSet.Config as cms\n"
-    "process = cms.Process('test')\n"
-    "process.cone1 = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
-    "process.cone2 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-    "process.cone3 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-    "process.somejet1 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-    "process.somejet2 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-    "process.jtanalyzer = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-    "process.anotherjtanalyzer = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-    "process.cones = cms.Sequence(process.cone1* process.cone2* process.cone3)\n"
-    "process.jets = cms.Sequence(process.somejet1* process.somejet2)\n"
-    "process.path1 = cms.Path(process.cones+ process.jtanalyzer)\n"
-    "process.path2 = cms.Path(process.jets+ process.anotherjtanalyzer)\n"
-    "process.schedule = cms.Schedule(process.path2, process.path1)\n";
+  std::string str =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.cone1 = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
+      "process.cone2 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.cone3 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.somejet1 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.somejet2 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.jtanalyzer = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.anotherjtanalyzer = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.cones = cms.Sequence(process.cone1* process.cone2* process.cone3)\n"
+      "process.jets = cms.Sequence(process.somejet1* process.somejet2)\n"
+      "process.path1 = cms.Path(process.cones+ process.jtanalyzer)\n"
+      "process.path2 = cms.Path(process.jets+ process.anotherjtanalyzer)\n"
+      "process.schedule = cms.Schedule(process.path2, process.path1)\n";
 
   std::shared_ptr<edm::ParameterSet> test = PyBind11ProcessDesc(str).parameterSet();
 
   typedef std::vector<std::string> Strs;
 
   Strs s = (*test).getParameter<std::vector<std::string> >("path1");
-  CPPUNIT_ASSERT(s[0]=="cone1");
-  CPPUNIT_ASSERT(s[1]=="cone2");
-  CPPUNIT_ASSERT(s[2]=="cone3");
-  CPPUNIT_ASSERT(s[3]=="jtanalyzer");
+  CPPUNIT_ASSERT(s[0] == "cone1");
+  CPPUNIT_ASSERT(s[1] == "cone2");
+  CPPUNIT_ASSERT(s[2] == "cone3");
+  CPPUNIT_ASSERT(s[3] == "jtanalyzer");
 
   //CPPUNIT_ASSERT (b.getDependencies("cone1")=="");
   //CPPUNIT_ASSERT (b.getDependencies("cone2")=="cone1,");
@@ -358,9 +351,9 @@ void testProcessDesc::multiplePathsTest() {
   //CPPUNIT_ASSERT (b.getDependencies("jtanalyzer")=="cone1,cone2,cone3,");
 
   s = (*test).getParameter<std::vector<std::string> >("path2");
-  CPPUNIT_ASSERT(s[0]=="somejet1");
-  CPPUNIT_ASSERT(s[1]=="somejet2");
-  CPPUNIT_ASSERT(s[2]=="anotherjtanalyzer");
+  CPPUNIT_ASSERT(s[0] == "somejet1");
+  CPPUNIT_ASSERT(s[1] == "somejet2");
+  CPPUNIT_ASSERT(s[2] == "anotherjtanalyzer");
 
   //CPPUNIT_ASSERT (b.getDependencies("somejet1")=="");
   //CPPUNIT_ASSERT (b.getDependencies("somejet2")=="somejet1,");
@@ -368,35 +361,35 @@ void testProcessDesc::multiplePathsTest() {
 
   Strs schedule = (*test).getParameter<std::vector<std::string> >("@paths");
 
-  CPPUNIT_ASSERT (schedule.size() == 2);
-  CPPUNIT_ASSERT (schedule[0] == "path2");
-  CPPUNIT_ASSERT (schedule[1] == "path1");
+  CPPUNIT_ASSERT(schedule.size() == 2);
+  CPPUNIT_ASSERT(schedule[0] == "path2");
+  CPPUNIT_ASSERT(schedule[1] == "path1");
 }
 
 void testProcessDesc::inconsistentPathTest() {
-
-  std::string str = "import FWCore.ParameterSet.Config as cms\n"
-   "process = cms.Process('test')\n"
-   "process.a = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
-   "process.b = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.c = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-   "process.path1 = cms.Path((process.a*process.b)+ (process.c*process.b))\n";
+  std::string str =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.a = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
+      "process.b = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.c = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.path1 = cms.Path((process.a*process.b)+ (process.c*process.b))\n";
   std::shared_ptr<edm::ParameterSet> test = PyBind11ProcessDesc(str).parameterSet();
 }
 
 void testProcessDesc::inconsistentMultiplePathTest() {
-
-   std::string str = "import FWCore.ParameterSet.Config as cms\n"
-   "process = cms.Process('test')\n"
-   "process.cone1 = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
-   "process.cone2 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.somejet1 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-   "process.somejet2 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
-   "process.jtanalyzer = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
-   "process.cones = cms.Sequence(process.cone1+ process.cone2)\n"
-   "process.jets = cms.Sequence(process.somejet1* process.somejet2)\n"
-   "process.path1 = cms.Path(process.cones*process.jtanalyzer)\n"
-   "process.path2 = cms.Path(process.jets*process.jtanalyzer)\n";
+  std::string str =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "process = cms.Process('test')\n"
+      "process.cone1 = cms.EDProducer('PhonyConeJet', i = cms.int32(5))\n"
+      "process.cone2 = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.somejet1 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.somejet2 = cms.EDProducer('PhonyJet', i = cms.int32(7))\n"
+      "process.jtanalyzer = cms.EDProducer('PhonyConeJet', i = cms.int32(7))\n"
+      "process.cones = cms.Sequence(process.cone1+ process.cone2)\n"
+      "process.jets = cms.Sequence(process.somejet1* process.somejet2)\n"
+      "process.path1 = cms.Path(process.cones*process.jtanalyzer)\n"
+      "process.path2 = cms.Path(process.jets*process.jtanalyzer)\n";
 
   std::shared_ptr<edm::ParameterSet> test = PyBind11ProcessDesc(str).parameterSet();
 }
diff --git a/FWCore/PythonParameterSet/test/readpsetsfrom_t.cppunit.cc b/FWCore/PythonParameterSet/test/readpsetsfrom_t.cppunit.cc
index 6759388ff38c2..46df3b1b46a0a 100644
--- a/FWCore/PythonParameterSet/test/readpsetsfrom_t.cppunit.cc
+++ b/FWCore/PythonParameterSet/test/readpsetsfrom_t.cppunit.cc
@@ -7,7 +7,6 @@
  * 
  */
 
-
 #include <cppunit/extensions/HelperMacros.h>
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -21,33 +20,29 @@
 #include <string>
 #include <vector>
 
-class testreadpsetsfrom: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(testreadpsetsfrom);
-CPPUNIT_TEST(simpleTest);
-CPPUNIT_TEST_SUITE_END();
+class testreadpsetsfrom : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testreadpsetsfrom);
+  CPPUNIT_TEST(simpleTest);
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
   void simpleTest();
-private:
 
+private:
 };
 
-
-
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testreadpsetsfrom);
 
-void testreadpsetsfrom::simpleTest()
-{
-   const char* kTest ="import FWCore.ParameterSet.Config as cms\n"
-                      "dummy =  cms.PSet(b = cms.bool(True))\n"
-                      "foo = cms.PSet(a = cms.string('blah'))\n"
-   ;
-   std::shared_ptr<edm::ParameterSet> test = edm::cmspybind11::readPSetsFrom(kTest);
-   
-   CPPUNIT_ASSERT(test->getParameterSet("dummy").getParameter<bool>("b")==true);
-   CPPUNIT_ASSERT(test->getParameterSet("foo").getParameter<std::string>("a")==std::string("blah"));
-}
+void testreadpsetsfrom::simpleTest() {
+  const char* kTest =
+      "import FWCore.ParameterSet.Config as cms\n"
+      "dummy =  cms.PSet(b = cms.bool(True))\n"
+      "foo = cms.PSet(a = cms.string('blah'))\n";
+  std::shared_ptr<edm::ParameterSet> test = edm::cmspybind11::readPSetsFrom(kTest);
 
+  CPPUNIT_ASSERT(test->getParameterSet("dummy").getParameter<bool>("b") == true);
+  CPPUNIT_ASSERT(test->getParameterSet("foo").getParameter<std::string>("a") == std::string("blah"));
+}
diff --git a/FWCore/ROOTTests/test/read_threaded_t.cc b/FWCore/ROOTTests/test/read_threaded_t.cc
index 399278947dc99..78e56ce9a0e7c 100644
--- a/FWCore/ROOTTests/test/read_threaded_t.cc
+++ b/FWCore/ROOTTests/test/read_threaded_t.cc
@@ -20,50 +20,49 @@
 
 std::atomic<bool> waitToStart{true};
 
-void printHelp(const char* iName, int iDefaultNThreads)
-{
-  std::cout << iName <<" [number of threads] [filename] [gDebug value]\n\n"
-            <<"[number of threads] number of threads to use in test\n"
-            <<"[filename] name of CMSSW file to read\n"
-            <<"[gDebug value] value of gDebug to pass to ROOT (gDebug=1 is useful)\n"
-            <<"If no arguments are given "<<iDefaultNThreads<<" threads will be used and a dummy file will be created."<<std::endl;
+void printHelp(const char* iName, int iDefaultNThreads) {
+  std::cout << iName << " [number of threads] [filename] [gDebug value]\n\n"
+            << "[number of threads] number of threads to use in test\n"
+            << "[filename] name of CMSSW file to read\n"
+            << "[gDebug value] value of gDebug to pass to ROOT (gDebug=1 is useful)\n"
+            << "If no arguments are given " << iDefaultNThreads
+            << " threads will be used and a dummy file will be created." << std::endl;
 }
 
 const std::string kDefaultFileName("read_test_dummy.root");
 
-std::tuple<int,std::string,int> parseOptions(int argc, char** argv)
-{
+std::tuple<int, std::string, int> parseOptions(int argc, char** argv) {
   constexpr int kDefaultNThreads = 4;
   int kDefaultgDebug = gDebug;
   int nThreads = kDefaultNThreads;
   int newGDebug = kDefaultgDebug;
   std::string fileName(kDefaultFileName);
-  if( argc >= 2 ) {
-    if(strcmp("-h",argv[1]) ==0) {
-      printHelp(argv[0],kDefaultNThreads);
-      exit( 0 );
+  if (argc >= 2) {
+    if (strcmp("-h", argv[1]) == 0) {
+      printHelp(argv[0], kDefaultNThreads);
+      exit(0);
     }
-    
+
     nThreads = atoi(argv[1]);
   }
-  if(argc >=3) {
+  if (argc >= 3) {
     fileName = argv[2];
   }
-  if(argc == 4) {
+  if (argc == 4) {
     newGDebug = atoi(argv[3]);
   }
-  
-  if( argc > 4) {
-    printHelp(argv[0],kDefaultNThreads);
+
+  if (argc > 4) {
+    printHelp(argv[0], kDefaultNThreads);
     exit(1);
   }
-  return std::make_tuple(nThreads, fileName, newGDebug) ;
+  return std::make_tuple(nThreads, fileName, newGDebug);
 }
 
 void createDummyFile() {
   auto theList = new TList();
-  
-  for(unsigned int i=0; i<10;++i) {
+
+  for (unsigned int i = 0; i < 10; ++i) {
     theList->Add(new TList());
     theList->Add(new TMap());
     theList->Add(new TObjString());
@@ -71,23 +70,20 @@ void createDummyFile() {
     theList->Add(new TH1D());
   }
 
+  TFile f(kDefaultFileName.c_str(), "RECREATE", "test");
 
-  TFile f(kDefaultFileName.c_str(), "RECREATE","test");
-        
-  auto listTree = new TTree("Events","TheList");
-  listTree->Branch("theList","TList",&theList);
+  auto listTree = new TTree("Events", "TheList");
+  listTree->Branch("theList", "TList", &theList);
 
-  for(unsigned int i = 0; i<100;++i) {
+  for (unsigned int i = 0; i < 100; ++i) {
     listTree->Fill();
   }
   f.Write();
   f.Close();
 }
 
-
 int main(int argc, char** argv) {
-
-  auto options = parseOptions(argc,argv);
+  auto options = parseOptions(argc, argv);
 
   const int kNThreads = std::get<0>(options);
 
@@ -95,8 +91,6 @@ int main(int argc, char** argv) {
 
   gDebug = std::get<2>(options);
 
-
- 
   FWLiteEnabler::enable();
 
   //Tell Root we want to be multi-threaded
@@ -106,40 +100,35 @@ int main(int argc, char** argv) {
   //Have to avoid having Streamers modify themselves after they have been used
   TVirtualStreamerInfo::Optimize(false);
 
-
-  if(kFileName == kDefaultFileName) {
+  if (kFileName == kDefaultFileName) {
     createDummyFile();
   }
 
-
   std::vector<std::shared_ptr<std::thread>> threads;
   threads.reserve(kNThreads);
 
-  for(int i=0; i< kNThreads; ++i) {
-    threads.push_back(std::make_shared<std::thread>( std::thread([&kFileName]() {
-	static thread_local TThread s_thread_guard;
-	while(waitToStart) ;
-	std::unique_ptr<TFile> f{ TFile::Open(kFileName.c_str()) };
-	assert(f.get());
-
-	TTree* eventTree = dynamic_cast<TTree*>(f.get()->Get("Events"));
-	assert(eventTree);
-	
-	for(Long64_t i = 0, iEnd = eventTree->GetEntries(); 
-	    i != iEnd;
-	    ++i) {
-	  eventTree->GetEntry(i,1);
-	}
-	
-	f.get()->Close();
-	  }) ) );
-      
-  }      
+  for (int i = 0; i < kNThreads; ++i) {
+    threads.push_back(std::make_shared<std::thread>(std::thread([&kFileName]() {
+      static thread_local TThread s_thread_guard;
+      while (waitToStart)
+        ;
+      std::unique_ptr<TFile> f{TFile::Open(kFileName.c_str())};
+      assert(f.get());
+
+      TTree* eventTree = dynamic_cast<TTree*>(f.get()->Get("Events"));
+      assert(eventTree);
+
+      for (Long64_t i = 0, iEnd = eventTree->GetEntries(); i != iEnd; ++i) {
+        eventTree->GetEntry(i, 1);
+      }
+
+      f.get()->Close();
+    })));
+  }
   waitToStart = false;
-  for(auto& t : threads) {
+  for (auto& t : threads) {
     t->join();
   }
 
   return 0;
 }
-
diff --git a/FWCore/SOA/interface/Column.h b/FWCore/SOA/interface/Column.h
index d216ec9ef528e..32d71587a7c80 100644
--- a/FWCore/SOA/interface/Column.h
+++ b/FWCore/SOA/interface/Column.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/SOA
 // Class  :     Column
-// 
+//
 /**\class Column Column.h "Column.h"
 
  Description: Column describes a column in a Table
@@ -50,38 +50,39 @@ SOA_DECLARE_COLUMN(Eta,double, "eta");
 
 // forward declarations
 namespace edm {
-namespace soa {
+  namespace soa {
 
-/**Helper class used to fill a column of a table
+    /**Helper class used to fill a column of a table
   in a 'non standard' way
 */
-template<typename COL, typename F>
-struct ColumnFillerHolder {
-  using Column_type = COL;
-  F m_f;
-};  
-
-template <typename T, typename INHERIT>
-struct Column
-{
-  using type = T;
-  
-  static constexpr const char* const& label() {
-    return INHERIT::kLabel;
-  }
-  
-  template <typename F>
-  static ColumnFillerHolder<INHERIT,F> filler(F&& iF) { return {iF}; }
-  
- private:
-  Column() = default;
-  Column(const Column&) = delete; // stop default
-  
-  const Column& operator=(const Column&) = delete; // stop default
-};
+    template <typename COL, typename F>
+    struct ColumnFillerHolder {
+      using Column_type = COL;
+      F m_f;
+    };
 
-}
-}
-#define SOA_DECLARE_COLUMN(_ClassName_,_Type_,_String_) \
-  struct _ClassName_ : public edm::soa::Column<_Type_,_ClassName_> {static constexpr const char * const kLabel=_String_; }
+    template <typename T, typename INHERIT>
+    struct Column {
+      using type = T;
+
+      static constexpr const char* const& label() { return INHERIT::kLabel; }
+
+      template <typename F>
+      static ColumnFillerHolder<INHERIT, F> filler(F&& iF) {
+        return {iF};
+      }
+
+    private:
+      Column() = default;
+      Column(const Column&) = delete;  // stop default
+
+      const Column& operator=(const Column&) = delete;  // stop default
+    };
+
+  }  // namespace soa
+}  // namespace edm
+#define SOA_DECLARE_COLUMN(_ClassName_, _Type_, _String_)             \
+  struct _ClassName_ : public edm::soa::Column<_Type_, _ClassName_> { \
+    static constexpr const char* const kLabel = _String_;             \
+  }
 #endif
diff --git a/FWCore/SOA/interface/ColumnFillers.h b/FWCore/SOA/interface/ColumnFillers.h
index 8e9647da37887..acf0dceb5085c 100644
--- a/FWCore/SOA/interface/ColumnFillers.h
+++ b/FWCore/SOA/interface/ColumnFillers.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/SOA
 // Class  :     ColumnFillers
-// 
+//
 /**\class ColumnFillers ColumnFillers.h "ColumnFillers.h"
 
  Description: Controls how edm::soa::Table columns can be filled from C++ objects
@@ -39,51 +39,50 @@
 #include <tuple>
 
 namespace edm {
-namespace soa {
+  namespace soa {
 
-  template <typename... Args>
-  class ColumnFillers {
-    using Layout = std::tuple<Args...>;
-    Layout m_fillers;
-    
-    template<int I, typename ELEMENT>
-    decltype(auto) callFiller(ELEMENT&& iEl) {
-      return std::get<I>(m_fillers).m_f(iEl);
-    }
-    
-    template<int I, typename COLUMN, typename ELEMENT>
-    typename COLUMN::type tryValue(ELEMENT&& iEl) {
-      if constexpr( I < sizeof...(Args)) {
-        using Pair = typename std::tuple_element<I,Layout>::type;
-        using COL = typename Pair::Column_type;
-        if constexpr(std::is_same<COL,COLUMN>::value) {
-          return callFiller<I>(iEl);
+    template <typename... Args>
+    class ColumnFillers {
+      using Layout = std::tuple<Args...>;
+      Layout m_fillers;
+
+      template <int I, typename ELEMENT>
+      decltype(auto) callFiller(ELEMENT&& iEl) {
+        return std::get<I>(m_fillers).m_f(iEl);
+      }
+
+      template <int I, typename COLUMN, typename ELEMENT>
+      typename COLUMN::type tryValue(ELEMENT&& iEl) {
+        if constexpr (I < sizeof...(Args)) {
+          using Pair = typename std::tuple_element<I, Layout>::type;
+          using COL = typename Pair::Column_type;
+          if constexpr (std::is_same<COL, COLUMN>::value) {
+            return callFiller<I>(iEl);
+          } else {
+            //try another filler to see if it matches
+            return tryValue<I + 1, COLUMN>(iEl);
+          }
         } else {
-          //try another filler to see if it matches
-          return tryValue<I+1,COLUMN>(iEl);
+          //no matches so call overload function
+          return value_for_column(iEl, static_cast<COLUMN*>(nullptr));
         }
-      } else {
-        //no matches so call overload function
-        return value_for_column(iEl,static_cast<COLUMN*>(nullptr));
       }
-    }
-    
-  public:
-    ColumnFillers(Args... iArgs): m_fillers(std::forward<Args>(iArgs)...) {}
-    
-    template<typename ELEMENT, typename COLUMN>
-    typename COLUMN::type value(ELEMENT&& iEl, COLUMN*) {
-      return tryValue<0,COLUMN>(iEl);
-    }
-  };
 
-  template<typename... Args>
-  ColumnFillers<Args...> column_fillers(Args... iArgs) {
-    return ColumnFillers<Args...>(std::forward<Args>(iArgs)...);
-  }
+    public:
+      ColumnFillers(Args... iArgs) : m_fillers(std::forward<Args>(iArgs)...) {}
 
-}
-}
+      template <typename ELEMENT, typename COLUMN>
+      typename COLUMN::type value(ELEMENT&& iEl, COLUMN*) {
+        return tryValue<0, COLUMN>(iEl);
+      }
+    };
+
+    template <typename... Args>
+    ColumnFillers<Args...> column_fillers(Args... iArgs) {
+      return ColumnFillers<Args...>(std::forward<Args>(iArgs)...);
+    }
 
+  }  // namespace soa
+}  // namespace edm
 
 #endif
diff --git a/FWCore/SOA/interface/ColumnValues.h b/FWCore/SOA/interface/ColumnValues.h
index 3c71d919067aa..0e09adbb73470 100644
--- a/FWCore/SOA/interface/ColumnValues.h
+++ b/FWCore/SOA/interface/ColumnValues.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/SOA
 // Class  :     ColumnValues
-// 
+//
 /**\class ColumnValues ColumnValues.h "ColumnValues.h"
 
  Description: Provides container like access to a column of a Table
@@ -24,38 +24,35 @@
 // forward declarations
 #include <cstddef>
 namespace edm {
-namespace soa {
-
-  
-template<typename T>
-class ColumnValues {
-public:
-  ColumnValues(T const* iBegin, size_t iSize):
-  m_begin(iBegin), m_end(iBegin+iSize) {}
-  
-  T const* begin() const { return m_begin; }
-  T const* end() const { return m_end; }
-  
-private:
-  T const* m_begin = nullptr;
-  T const* m_end = nullptr;
-};
-
-template<typename T>
-class MutableColumnValues {
-public:
-  MutableColumnValues(T* iBegin, size_t iSize):
-  m_begin(iBegin), m_end(iBegin+iSize) {}
-  
-  T* begin() const { return m_begin; }
-  T* end() const { return m_end; }
-
-private:
-  T* m_begin = nullptr;
-  T* m_end = nullptr;
-};
-
-}
-}
+  namespace soa {
+
+    template <typename T>
+    class ColumnValues {
+    public:
+      ColumnValues(T const* iBegin, size_t iSize) : m_begin(iBegin), m_end(iBegin + iSize) {}
+
+      T const* begin() const { return m_begin; }
+      T const* end() const { return m_end; }
+
+    private:
+      T const* m_begin = nullptr;
+      T const* m_end = nullptr;
+    };
+
+    template <typename T>
+    class MutableColumnValues {
+    public:
+      MutableColumnValues(T* iBegin, size_t iSize) : m_begin(iBegin), m_end(iBegin + iSize) {}
+
+      T* begin() const { return m_begin; }
+      T* end() const { return m_end; }
+
+    private:
+      T* m_begin = nullptr;
+      T* m_end = nullptr;
+    };
+
+  }  // namespace soa
+}  // namespace edm
 
 #endif
diff --git a/FWCore/SOA/interface/RowView.h b/FWCore/SOA/interface/RowView.h
index 7e2825002a1e5..bd9dfb338519a 100644
--- a/FWCore/SOA/interface/RowView.h
+++ b/FWCore/SOA/interface/RowView.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/SOA
 // Class  :     RowView
-// 
+//
 /**\class RowView RowView.h "RowView.h"
 
  Description: Provides access to all elements of a row in a edm::soa::Table
@@ -51,99 +51,94 @@
 // forward declarations
 
 namespace edm {
-namespace soa {
-  
-template <typename... Args>
-class RowView {
-  using Layout = std::tuple<Args...>;
-  std::array<void const*, sizeof...(Args)> m_values;
-  
-public:
-  explicit RowView( std::array<void const*, sizeof...(Args)> const& iValues):
-  m_values{iValues} {}
-  
-  template<typename U>
-  typename U::type const& get() const {
-    return *(static_cast<typename U::type const*>(columnAddress<U>()));
-  }
-  
-  template<typename U>
-  void const* columnAddress() const {
-    return m_values[impl::GetIndex<0,U,Layout>::index];
-  }
-  
-};
-
-template <typename... Args>
-class MutableRowView {
-  using Layout = std::tuple<Args...>;
-  std::array<void*, sizeof...(Args)> m_values;
-  
-public:
-  explicit MutableRowView( std::array<void*, sizeof...(Args)>& iValues):
-  m_values{iValues} {}
-  
-  template<typename U>
-  typename U::type& get()  {
-    return *(static_cast<typename U::type*>(columnAddress<U>()));
-  }
-  template<typename U>
-  typename U::type const& get() const  {
-    return *(static_cast<typename U::type const*>(columnAddress<U>()));
-  }
-
-  template<typename U>
-  MutableRowView<Args...>& set( typename U::type const& iValue)  {
-    get<U>() = iValue;
-    return *this;
-  }
-  
-  template<typename U>
-  void * columnAddress()  {
-    return m_values[impl::GetIndex<0,U,Layout>::index];
-  }
-  template<typename U>
-  void const * columnAddress() const {
-    return m_values[impl::GetIndex<0,U,Layout>::index];
-  }
-
-  
-  template<typename O>
-  void copyValuesFrom(O const& iObj) {
-    copyValueFromImpl<0>(iObj);
-  }
-  template<typename O, typename... CArgs>
-  void copyValuesFrom(O const& iObj, ColumnFillers<CArgs...> iFiller) {
-    copyValuesUsingFiller<0>(iFiller, iObj, m_values);
-  }
-  
-private:
-  template<int I, typename O>
-  void copyValueFromImpl(O const& iObj) {
-    if constexpr(I < sizeof...(Args)) {
-      using ColumnType = typename std::tuple_element<I,Layout>::type;
-      using Type = typename ColumnType::type;
-      auto ptr = static_cast<Type*>(m_values[I]);
-      *ptr =value_for_column(iObj, static_cast<ColumnType*>(nullptr));
-      copyValueFromImpl<I+1>(iObj);
-    }
-  }
-  
-  template<int I, typename E, typename F>
-  static void copyValuesUsingFiller(F& iFiller, E const& iItem, std::array<void *, sizeof...(Args)>& oValues) {
-    if constexpr(I < sizeof...(Args)) {
+  namespace soa {
+
+    template <typename... Args>
+    class RowView {
+      using Layout = std::tuple<Args...>;
+      std::array<void const*, sizeof...(Args)> m_values;
+
+    public:
+      explicit RowView(std::array<void const*, sizeof...(Args)> const& iValues) : m_values{iValues} {}
+
+      template <typename U>
+      typename U::type const& get() const {
+        return *(static_cast<typename U::type const*>(columnAddress<U>()));
+      }
+
+      template <typename U>
+      void const* columnAddress() const {
+        return m_values[impl::GetIndex<0, U, Layout>::index];
+      }
+    };
+
+    template <typename... Args>
+    class MutableRowView {
       using Layout = std::tuple<Args...>;
-      using ColumnType = typename std::tuple_element<I,Layout>::type;
-      using Type = typename ColumnType::type;
-      Type* pElement = static_cast<Type*>(oValues[I]);
-      *pElement = iFiller.value(iItem, static_cast<ColumnType*>(nullptr));
-      copyValuesUsingFiller<I+1>(iFiller,iItem, oValues);
-    }
-  }
-};
-
-}
-}
+      std::array<void*, sizeof...(Args)> m_values;
+
+    public:
+      explicit MutableRowView(std::array<void*, sizeof...(Args)>& iValues) : m_values{iValues} {}
+
+      template <typename U>
+      typename U::type& get() {
+        return *(static_cast<typename U::type*>(columnAddress<U>()));
+      }
+      template <typename U>
+      typename U::type const& get() const {
+        return *(static_cast<typename U::type const*>(columnAddress<U>()));
+      }
+
+      template <typename U>
+      MutableRowView<Args...>& set(typename U::type const& iValue) {
+        get<U>() = iValue;
+        return *this;
+      }
+
+      template <typename U>
+      void* columnAddress() {
+        return m_values[impl::GetIndex<0, U, Layout>::index];
+      }
+      template <typename U>
+      void const* columnAddress() const {
+        return m_values[impl::GetIndex<0, U, Layout>::index];
+      }
+
+      template <typename O>
+      void copyValuesFrom(O const& iObj) {
+        copyValueFromImpl<0>(iObj);
+      }
+      template <typename O, typename... CArgs>
+      void copyValuesFrom(O const& iObj, ColumnFillers<CArgs...> iFiller) {
+        copyValuesUsingFiller<0>(iFiller, iObj, m_values);
+      }
+
+    private:
+      template <int I, typename O>
+      void copyValueFromImpl(O const& iObj) {
+        if constexpr (I < sizeof...(Args)) {
+          using ColumnType = typename std::tuple_element<I, Layout>::type;
+          using Type = typename ColumnType::type;
+          auto ptr = static_cast<Type*>(m_values[I]);
+          *ptr = value_for_column(iObj, static_cast<ColumnType*>(nullptr));
+          copyValueFromImpl<I + 1>(iObj);
+        }
+      }
+
+      template <int I, typename E, typename F>
+      static void copyValuesUsingFiller(F& iFiller, E const& iItem, std::array<void*, sizeof...(Args)>& oValues) {
+        if constexpr (I < sizeof...(Args)) {
+          using Layout = std::tuple<Args...>;
+          using ColumnType = typename std::tuple_element<I, Layout>::type;
+          using Type = typename ColumnType::type;
+          Type* pElement = static_cast<Type*>(oValues[I]);
+          *pElement = iFiller.value(iItem, static_cast<ColumnType*>(nullptr));
+          copyValuesUsingFiller<I + 1>(iFiller, iItem, oValues);
+        }
+      }
+    };
 
+  }  // namespace soa
+}  // namespace edm
 
 #endif
diff --git a/FWCore/SOA/interface/Table.h b/FWCore/SOA/interface/Table.h
index 5b8da987b67ba..9761427b0dbc7 100644
--- a/FWCore/SOA/interface/Table.h
+++ b/FWCore/SOA/interface/Table.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/SOA
 // Class  :     Table
-// 
+//
 /**\class Table Table.h "Table.h"
 
  Description: A Table which is a 'structure of arrays'
@@ -131,324 +131,325 @@
 // forward declarations
 
 namespace edm {
-namespace soa {
-  
-  template <typename... Args>
-  class Table {
-  public:
-    static constexpr const unsigned int kNColumns = sizeof...(Args);
-    using Layout = std::tuple<Args...>;
-    using const_iterator = ConstTableItr<Args...>;
-    using iterator = TableItr<Args...>;
-    
-    template <typename T, typename... CArgs>
-    Table(T const& iContainer, CArgs... iArgs): m_size(iContainer.size()) {
-      if constexpr(sizeof...(CArgs)==0) {
-        CtrFillerFromAOS::fill(m_values,iContainer);
-      } else {
-        CtrFillerFromContainers::fill(m_values,iContainer,std::forward<CArgs>(iArgs)...);
+  namespace soa {
+
+    template <typename... Args>
+    class Table {
+    public:
+      static constexpr const unsigned int kNColumns = sizeof...(Args);
+      using Layout = std::tuple<Args...>;
+      using const_iterator = ConstTableItr<Args...>;
+      using iterator = TableItr<Args...>;
+
+      template <typename T, typename... CArgs>
+      Table(T const& iContainer, CArgs... iArgs) : m_size(iContainer.size()) {
+        if constexpr (sizeof...(CArgs) == 0) {
+          CtrFillerFromAOS::fill(m_values, iContainer);
+        } else {
+          CtrFillerFromContainers::fill(m_values, iContainer, std::forward<CArgs>(iArgs)...);
+        }
       }
-    }
-    
-    template<typename T, typename... CArgs>
-    Table(T const& iContainer, ColumnFillers<CArgs...> iFiller) {
-      m_size = iContainer.size();
-      CtrFillerFromAOS::fillUsingFiller(iFiller,m_values, iContainer);
-    }
-    
-    Table( Table<Args...> const& iOther):m_size(iOther.m_size), m_values{{nullptr}} {
-      copyFromToWithResizeAll(m_size,iOther.m_values,m_values, std::make_index_sequence<sizeof...(Args)>{});
-    }
-    
-    Table( Table<Args...>&& iOther):m_size(0), m_values{{nullptr}} {
-      std::swap(m_size,iOther.m_size);
-      std::swap(m_values,iOther.m_values);
-    }
-    
-    Table() : m_size(0) {
-    }
-    
-    ~Table() {
-      dtr<0>(m_values);
-    }
-    
-    Table<Args...>& operator=(Table<Args...>&& iOther) {
-      Table<Args...> cp(std::move(iOther));
-      std::swap(m_size,cp.m_size);
-      std::swap(m_values, cp.m_values);
-      return *this;
-    }
-    Table<Args...>& operator=(Table<Args...> const& iOther) {
-      return operator=( Table<Args...>(iOther));
-    }
-    
-    unsigned int size() const {
-      return m_size;
-    }
-    
-    void resize(unsigned int iNewSize) {
-      if(m_size == iNewSize) { return;}
-      resizeFromTo<0>(m_size,iNewSize,m_values);
-      if(m_size < iNewSize) {
-        //initialize the extra values
-        resetStartingAt<0>(m_size, iNewSize,m_values);
+
+      template <typename T, typename... CArgs>
+      Table(T const& iContainer, ColumnFillers<CArgs...> iFiller) {
+        m_size = iContainer.size();
+        CtrFillerFromAOS::fillUsingFiller(iFiller, m_values, iContainer);
       }
-      m_size = iNewSize;
-    }
-    
-    template<typename U>
-    typename U::type const& get(size_t iRow) const {
-      return *(static_cast<typename U::type const*>(columnAddress<U>())+iRow);
-    }
-    template<typename U>
-    typename U::type & get(size_t iRow)  {
-      return *(static_cast<typename U::type*>(columnAddress<U>())+iRow);
-    }
-    
-    template<typename U>
-    ColumnValues<typename U::type> column() const {
-      return ColumnValues<typename U::type>{static_cast<typename U::type*>(columnAddress<U>()), m_size};
-    }
-    template<typename U>
-    MutableColumnValues<typename U::type> column() {
-      return MutableColumnValues<typename U::type>{static_cast<typename U::type*>(columnAddress<U>()), m_size};
-    }
-    
-    RowView<Args...> row(size_t iRow) const {
-      return *(begin()+iRow);
-    }
-    MutableRowView<Args...> row(size_t iRow)  {
-      return *(begin()+iRow);
-    }
-    
-    const_iterator begin() const { 
-      std::array<void const*, sizeof...(Args)> t;
-      for(size_t i = 0; i<t.size();++i) { t[i] = m_values[i]; }
-      return const_iterator{t}; }
-    const_iterator end() const { 
-      std::array<void const*, sizeof...(Args)> t;
-      for(size_t i = 0; i<t.size();++i) { t[i] = m_values[i]; }
-      return const_iterator{t,size()}; }
-
-    iterator begin() { return iterator{m_values}; }
-    iterator end() { return iterator{m_values,size()}; }
-
-    
-    template<typename U>
-    void const * columnAddressWorkaround( U const*) const {
-      return columnAddress<U>();
-    }
-
-    void const * columnAddressByIndex(unsigned int iIndex) const {
-      return m_values[iIndex];
-    }
-    
-  private:
-    
-    // Member data
-    unsigned int m_size = 0;
-    std::array<void *, sizeof...(Args)> m_values = {{nullptr}}; //! keep ROOT from trying to store this
-    
-    template<typename U>
-    void const* columnAddress() const {
-      return m_values[impl::GetIndex<0,U,Layout>::index];
-    }
-    
-    template<typename U>
-    void * columnAddress() {
-      return m_values[impl::GetIndex<0,U,Layout>::index];
-    }
-
-    //Recursive destructor handling
-    template <int I>
-    static void dtr(std::array<void*, sizeof...(Args)>& iArray) {
-      if constexpr(I<sizeof...(Args)) {
-        using Type = typename std::tuple_element<I,Layout>::type::type;
-        delete [] static_cast<Type*>(iArray[I]);
-        dtr<I+1>(iArray);
+
+      Table(Table<Args...> const& iOther) : m_size(iOther.m_size), m_values{{nullptr}} {
+        copyFromToWithResizeAll(m_size, iOther.m_values, m_values, std::make_index_sequence<sizeof...(Args)>{});
       }
-    }
-
-    //Construct the Table using a container per column
-    struct CtrFillerFromContainers {
-      template<typename T, typename... U>
-      static size_t fill(std::array<void *, sizeof...(Args)>& oValues, T const& iContainer, U... iArgs) {
-        static_assert( sizeof...(Args) == sizeof...(U)+1, "Wrong number of arguments passed to Table constructor");
-        ctrFiller<0>(oValues,iContainer.size(), iContainer,std::forward<U>(iArgs)...);
-        return iContainer.size();
+
+      Table(Table<Args...>&& iOther) : m_size(0), m_values{{nullptr}} {
+        std::swap(m_size, iOther.m_size);
+        std::swap(m_values, iOther.m_values);
       }
-    private:
-      template<int I, typename T, typename... U>
-      static void ctrFiller(std::array<void *, sizeof...(Args)>& oValues, size_t iSize, T const& iContainer, U... iU) {
-        assert(iContainer.size() == iSize);
-        using Type = typename std::tuple_element<I,Layout>::type::type;
-        Type  * temp = new Type [iSize];
-        unsigned int index = 0;
-        for( auto const& v: iContainer) {
-          temp[index] = v;
-          ++index;
+
+      Table() : m_size(0) {}
+
+      ~Table() { dtr<0>(m_values); }
+
+      Table<Args...>& operator=(Table<Args...>&& iOther) {
+        Table<Args...> cp(std::move(iOther));
+        std::swap(m_size, cp.m_size);
+        std::swap(m_values, cp.m_values);
+        return *this;
+      }
+      Table<Args...>& operator=(Table<Args...> const& iOther) { return operator=(Table<Args...>(iOther)); }
+
+      unsigned int size() const { return m_size; }
+
+      void resize(unsigned int iNewSize) {
+        if (m_size == iNewSize) {
+          return;
         }
-        oValues[I] = temp;
-        
-        ctrFiller<I+1>(oValues, iSize, std::forward<U>(iU)... );
+        resizeFromTo<0>(m_size, iNewSize, m_values);
+        if (m_size < iNewSize) {
+          //initialize the extra values
+          resetStartingAt<0>(m_size, iNewSize, m_values);
+        }
+        m_size = iNewSize;
       }
-      
-      template<int I>
-      static void ctrFiller(std::array<void *, sizeof...(Args)>& , size_t  ) {}
-      
-    };
-    
-    //Construct the Table using one container with each entry representing a row
-    struct CtrFillerFromAOS {
-      template<typename T>
-      static size_t fill(std::array<void *, sizeof...(Args)>& oValues, T const& iContainer) {
-        presize<0>(oValues,iContainer.size());
-        unsigned index=0;
-        for(auto&& item: iContainer) {
-          fillElement<0>(item,index,oValues);
-          ++index;
+
+      template <typename U>
+      typename U::type const& get(size_t iRow) const {
+        return *(static_cast<typename U::type const*>(columnAddress<U>()) + iRow);
+      }
+      template <typename U>
+      typename U::type& get(size_t iRow) {
+        return *(static_cast<typename U::type*>(columnAddress<U>()) + iRow);
+      }
+
+      template <typename U>
+      ColumnValues<typename U::type> column() const {
+        return ColumnValues<typename U::type>{static_cast<typename U::type*>(columnAddress<U>()), m_size};
+      }
+      template <typename U>
+      MutableColumnValues<typename U::type> column() {
+        return MutableColumnValues<typename U::type>{static_cast<typename U::type*>(columnAddress<U>()), m_size};
+      }
+
+      RowView<Args...> row(size_t iRow) const { return *(begin() + iRow); }
+      MutableRowView<Args...> row(size_t iRow) { return *(begin() + iRow); }
+
+      const_iterator begin() const {
+        std::array<void const*, sizeof...(Args)> t;
+        for (size_t i = 0; i < t.size(); ++i) {
+          t[i] = m_values[i];
         }
-        return iContainer.size();
+        return const_iterator{t};
       }
-      
-      template<typename T, typename F>
-      static size_t fillUsingFiller(F& iFiller, std::array<void *, sizeof...(Args)>& oValues, T const& iContainer) {
-        presize<0>(oValues,iContainer.size());
-        unsigned index=0;
-        for(auto&& item: iContainer) {
-          fillElementUsingFiller<0>(iFiller, item,index,oValues);
-          ++index;
+      const_iterator end() const {
+        std::array<void const*, sizeof...(Args)> t;
+        for (size_t i = 0; i < t.size(); ++i) {
+          t[i] = m_values[i];
         }
-        return iContainer.size();
+        return const_iterator{t, size()};
+      }
+
+      iterator begin() { return iterator{m_values}; }
+      iterator end() { return iterator{m_values, size()}; }
+
+      template <typename U>
+      void const* columnAddressWorkaround(U const*) const {
+        return columnAddress<U>();
       }
-      
+
+      void const* columnAddressByIndex(unsigned int iIndex) const { return m_values[iIndex]; }
 
     private:
-      template<int I>
-      static void presize(std::array<void *, sizeof...(Args)>& oValues, size_t iSize) {
-        if constexpr(I<sizeof...(Args)) {
-          using Layout = std::tuple<Args...>;
-          using Type = typename std::tuple_element<I,Layout>::type::type;
-          oValues[I] = new Type[iSize];
-          presize<I+1>(oValues,iSize);
+      // Member data
+      unsigned int m_size = 0;
+      std::array<void*, sizeof...(Args)> m_values = {{nullptr}};  //! keep ROOT from trying to store this
+
+      template <typename U>
+      void const* columnAddress() const {
+        return m_values[impl::GetIndex<0, U, Layout>::index];
+      }
+
+      template <typename U>
+      void* columnAddress() {
+        return m_values[impl::GetIndex<0, U, Layout>::index];
+      }
+
+      //Recursive destructor handling
+      template <int I>
+      static void dtr(std::array<void*, sizeof...(Args)>& iArray) {
+        if constexpr (I < sizeof...(Args)) {
+          using Type = typename std::tuple_element<I, Layout>::type::type;
+          delete[] static_cast<Type*>(iArray[I]);
+          dtr<I + 1>(iArray);
         }
       }
-      
-      template<int I, typename E>
-      static void fillElement(E const& iItem, size_t iIndex, std::array<void *, sizeof...(Args)>& oValues) {
-        if constexpr(I<sizeof...(Args)) {
+
+      //Construct the Table using a container per column
+      struct CtrFillerFromContainers {
+        template <typename T, typename... U>
+        static size_t fill(std::array<void*, sizeof...(Args)>& oValues, T const& iContainer, U... iArgs) {
+          static_assert(sizeof...(Args) == sizeof...(U) + 1, "Wrong number of arguments passed to Table constructor");
+          ctrFiller<0>(oValues, iContainer.size(), iContainer, std::forward<U>(iArgs)...);
+          return iContainer.size();
+        }
+
+      private:
+        template <int I, typename T, typename... U>
+        static void ctrFiller(std::array<void*, sizeof...(Args)>& oValues, size_t iSize, T const& iContainer, U... iU) {
+          assert(iContainer.size() == iSize);
+          using Type = typename std::tuple_element<I, Layout>::type::type;
+          Type* temp = new Type[iSize];
+          unsigned int index = 0;
+          for (auto const& v : iContainer) {
+            temp[index] = v;
+            ++index;
+          }
+          oValues[I] = temp;
+
+          ctrFiller<I + 1>(oValues, iSize, std::forward<U>(iU)...);
+        }
+
+        template <int I>
+        static void ctrFiller(std::array<void*, sizeof...(Args)>&, size_t) {}
+      };
+
+      //Construct the Table using one container with each entry representing a row
+      struct CtrFillerFromAOS {
+        template <typename T>
+        static size_t fill(std::array<void*, sizeof...(Args)>& oValues, T const& iContainer) {
+          presize<0>(oValues, iContainer.size());
+          unsigned index = 0;
+          for (auto&& item : iContainer) {
+            fillElement<0>(item, index, oValues);
+            ++index;
+          }
+          return iContainer.size();
+        }
+
+        template <typename T, typename F>
+        static size_t fillUsingFiller(F& iFiller, std::array<void*, sizeof...(Args)>& oValues, T const& iContainer) {
+          presize<0>(oValues, iContainer.size());
+          unsigned index = 0;
+          for (auto&& item : iContainer) {
+            fillElementUsingFiller<0>(iFiller, item, index, oValues);
+            ++index;
+          }
+          return iContainer.size();
+        }
+
+      private:
+        template <int I>
+        static void presize(std::array<void*, sizeof...(Args)>& oValues, size_t iSize) {
+          if constexpr (I < sizeof...(Args)) {
+            using Layout = std::tuple<Args...>;
+            using Type = typename std::tuple_element<I, Layout>::type::type;
+            oValues[I] = new Type[iSize];
+            presize<I + 1>(oValues, iSize);
+          }
+        }
+
+        template <int I, typename E>
+        static void fillElement(E const& iItem, size_t iIndex, std::array<void*, sizeof...(Args)>& oValues) {
+          if constexpr (I < sizeof...(Args)) {
+            using Layout = std::tuple<Args...>;
+            using ColumnType = typename std::tuple_element<I, Layout>::type;
+            using Type = typename ColumnType::type;
+            Type* pElement = static_cast<Type*>(oValues[I]) + iIndex;
+            *pElement = value_for_column(iItem, static_cast<ColumnType*>(nullptr));
+            fillElement<I + 1>(iItem, iIndex, oValues);
+          }
+        }
+
+        template <int I, typename E, typename F>
+        static void fillElementUsingFiller(F& iFiller,
+                                           E const& iItem,
+                                           size_t iIndex,
+                                           std::array<void*, sizeof...(Args)>& oValues) {
+          if constexpr (I < sizeof...(Args)) {
+            using Layout = std::tuple<Args...>;
+            using ColumnType = typename std::tuple_element<I, Layout>::type;
+            using Type = typename ColumnType::type;
+            Type* pElement = static_cast<Type*>(oValues[I]) + iIndex;
+            *pElement = iFiller.value(iItem, static_cast<ColumnType*>(nullptr));
+            fillElementUsingFiller<I + 1>(iFiller, iItem, iIndex, oValues);
+          }
+        }
+      };
+
+      template <size_t... I>
+      static void copyFromToWithResizeAll(size_t iNElements,
+                                          std::array<void*, sizeof...(Args)> const& iFrom,
+                                          std::array<void*, sizeof...(Args)>& oTo,
+                                          std::index_sequence<I...>) {
+        (copyFromToWithResize<I>(iNElements, iFrom, oTo), ...);
+      }
+
+      template <int I>
+      static void copyFromToWithResize(size_t iNElements,
+                                       std::array<void*, sizeof...(Args)> const& iFrom,
+                                       std::array<void*, sizeof...(Args)>& oTo) {
+        using Layout = std::tuple<Args...>;
+        using Type = typename std::tuple_element<I, Layout>::type::type;
+        Type* oldPtr = static_cast<Type*>(oTo[I]);
+        Type* ptr = new Type[iNElements];
+        oTo[I] = ptr;
+        std::copy(static_cast<Type const*>(iFrom[I]), static_cast<Type const*>(iFrom[I]) + iNElements, ptr);
+        delete[] oldPtr;
+      }
+
+      template <int I>
+      static void resizeFromTo(size_t iOldSize, size_t iNewSize, std::array<void*, sizeof...(Args)>& ioArray) {
+        if constexpr (I < sizeof...(Args)) {
           using Layout = std::tuple<Args...>;
-          using ColumnType = typename std::tuple_element<I,Layout>::type;
-          using Type = typename ColumnType::type;
-          Type* pElement = static_cast<Type*>(oValues[I])+iIndex;
-          *pElement = value_for_column(iItem, static_cast<ColumnType*>(nullptr));
-          fillElement<I+1>(iItem, iIndex, oValues);
+          using Type = typename std::tuple_element<I, Layout>::type::type;
+          Type* oldPtr = static_cast<Type*>(ioArray[I]);
+          auto ptr = new Type[iNewSize];
+          auto nToCopy = std::min(iOldSize, iNewSize);
+          std::copy(static_cast<Type const*>(ioArray[I]), static_cast<Type const*>(ioArray[I]) + nToCopy, ptr);
+          resizeFromTo<I + 1>(iOldSize, iNewSize, ioArray);
+
+          delete[] oldPtr;
+          ioArray[I] = ptr;
         }
       }
-      
-      template<int I, typename E, typename F>
-      static void fillElementUsingFiller(F& iFiller, E const& iItem, size_t iIndex, std::array<void *, sizeof...(Args)>& oValues) {
-        if constexpr(I<sizeof...(Args)) {
+
+      template <int I>
+      static void resetStartingAt(size_t iStartIndex, size_t iEndIndex, std::array<void*, sizeof...(Args)>& ioArray) {
+        if constexpr (I < sizeof...(Args)) {
           using Layout = std::tuple<Args...>;
-          using ColumnType = typename std::tuple_element<I,Layout>::type;
-          using Type = typename ColumnType::type;
-          Type* pElement = static_cast<Type*>(oValues[I])+iIndex;
-          *pElement = iFiller.value(iItem, static_cast<ColumnType*>(nullptr));
-          fillElementUsingFiller<I+1>(iFiller,iItem, iIndex, oValues);
+          using Type = typename std::tuple_element<I, Layout>::type::type;
+          auto ptr = static_cast<Type*>(ioArray[I]);
+          auto temp = Type{};
+          std::fill(ptr + iStartIndex, ptr + iEndIndex, temp);
+          resetStartingAt<I + 1>(iStartIndex, iEndIndex, ioArray);
         }
       }
     };
 
-    template<size_t... I>
-    static void copyFromToWithResizeAll(size_t iNElements, std::array<void *, sizeof...(Args)> const& iFrom, std::array<void*, sizeof...(Args)>& oTo,
-                                        std::index_sequence<I...>) {
-      (copyFromToWithResize<I>(iNElements, iFrom, oTo), ...);
-    }
-    
-    template<int I>
-    static void copyFromToWithResize(size_t iNElements, std::array<void *, sizeof...(Args)> const& iFrom, std::array<void*, sizeof...(Args)>& oTo) {
-      using Layout = std::tuple<Args...>;
-      using Type = typename std::tuple_element<I,Layout>::type::type;
-      Type* oldPtr = static_cast<Type*>(oTo[I]);
-      Type* ptr = new Type[iNElements];
-      oTo[I]=ptr;
-      std::copy(static_cast<Type const*>(iFrom[I]), static_cast<Type const*>(iFrom[I])+iNElements, ptr);
-      delete [] oldPtr;
-    }
-    
-    template<int I>
-    static void resizeFromTo(size_t iOldSize, size_t iNewSize, std::array<void *, sizeof...(Args)>& ioArray) {
-      if constexpr(I < sizeof...(Args)) {
-        using Layout = std::tuple<Args...>;
-        using Type = typename std::tuple_element<I,Layout>::type::type;
-        Type* oldPtr = static_cast<Type*>(ioArray[I]);
-        auto ptr = new Type[iNewSize];
-        auto nToCopy = std::min(iOldSize,iNewSize);
-        std::copy(static_cast<Type const*>(ioArray[I]), static_cast<Type const*>(ioArray[I])+nToCopy, ptr);
-        resizeFromTo<I+1>(iOldSize, iNewSize, ioArray );
-        
-        delete [] oldPtr;
-        ioArray[I]=ptr;
-      }
-    }
-    
-    template<int I>
-    static void resetStartingAt(size_t iStartIndex, size_t iEndIndex,std::array<void *, sizeof...(Args)>& ioArray) {
-      if constexpr(I < sizeof...(Args)) {
-        using Layout = std::tuple<Args...>;
-        using Type = typename std::tuple_element<I,Layout>::type::type;
-        auto ptr = static_cast<Type*>(ioArray[I]);
-        auto temp = Type{};
-        std::fill(ptr+iStartIndex, ptr+iEndIndex, temp);
-        resetStartingAt<I+1>(iStartIndex, iEndIndex, ioArray);
-      }
-    }
-
-  };
-  
-    
-  /* Table Type Manipulation */
-  template <typename T1, typename T2> struct AddColumns;
-  template <typename... T1, typename... T2>
-  struct AddColumns<Table<T1...>, std::tuple<T2...>> {
-    using type = Table<T1...,T2...>;
-  };
-  
-  template <typename T1, typename T2>
-  using AddColumns_t = typename AddColumns<T1,T2>::type;
-  
-  namespace impl {
-    template <typename LHS, typename E, typename RHS> struct RemoveColumnCheck;
-    template <typename LHS, typename E, typename T, typename... U>
-    struct RemoveColumnCheck<LHS, E, std::tuple<T,U...>> {
-      using type =   typename std::conditional<std::is_same<E, T>::value,
-      typename AddColumns<LHS,std::tuple<U...>>::type,
-      typename RemoveColumnCheck<typename AddColumns<LHS,std::tuple<T>>::type, E, std::tuple<U...>>::type>::type;
+    /* Table Type Manipulation */
+    template <typename T1, typename T2>
+    struct AddColumns;
+    template <typename... T1, typename... T2>
+    struct AddColumns<Table<T1...>, std::tuple<T2...>> {
+      using type = Table<T1..., T2...>;
     };
-    
-    template <typename LHS, typename E>
-    struct RemoveColumnCheck<LHS, E, std::tuple<>> {
-      using type = LHS;
+
+    template <typename T1, typename T2>
+    using AddColumns_t = typename AddColumns<T1, T2>::type;
+
+    namespace impl {
+      template <typename LHS, typename E, typename RHS>
+      struct RemoveColumnCheck;
+      template <typename LHS, typename E, typename T, typename... U>
+      struct RemoveColumnCheck<LHS, E, std::tuple<T, U...>> {
+        using type = typename std::conditional<
+            std::is_same<E, T>::value,
+            typename AddColumns<LHS, std::tuple<U...>>::type,
+            typename RemoveColumnCheck<typename AddColumns<LHS, std::tuple<T>>::type, E, std::tuple<U...>>::type>::type;
+      };
+
+      template <typename LHS, typename E>
+      struct RemoveColumnCheck<LHS, E, std::tuple<>> {
+        using type = LHS;
+      };
+    }  // namespace impl
+
+    template <typename TABLE, typename E>
+    struct RemoveColumn {
+      using type = typename impl::RemoveColumnCheck<Table<>, E, typename TABLE::Layout>::type;
+    };
+
+    template <typename TABLE, typename E>
+    using RemoveColumn_t = typename RemoveColumn<TABLE, E>::type;
+
+    //This is used by edm::Wrapper
+    template <typename T>
+    struct MakeTableExaminer;
+
+    template <typename... Args>
+    struct MakeTableExaminer<Table<Args...>> {
+      static std::unique_ptr<TableExaminerBase> make(const Table<Args...>* iTable) {
+        return std::make_unique<TableExaminer<Table<Args...>>>(iTable);
+      }
     };
-  }
-    
-  template <typename TABLE, typename E>
-  struct RemoveColumn {
-    using type = typename impl::RemoveColumnCheck<Table<>,E, typename TABLE::Layout>::type;
-  };
-  
-  template <typename TABLE, typename E>
-  using RemoveColumn_t = typename RemoveColumn<TABLE,E>::type;
-
-  //This is used by edm::Wrapper
-  template< typename T> struct MakeTableExaminer;
-  
-  template<typename... Args>
-  struct MakeTableExaminer<Table<Args...>> {
-    static std::unique_ptr<TableExaminerBase> make(const Table<Args...>* iTable) {
-      return std::make_unique<TableExaminer<Table<Args...>> >(iTable);
-    }
-  };
-}
-}
+  }  // namespace soa
+}  // namespace edm
 #endif
diff --git a/FWCore/SOA/interface/TableExaminer.h b/FWCore/SOA/interface/TableExaminer.h
index e5d4def12d311..be86f9e06b79b 100644
--- a/FWCore/SOA/interface/TableExaminer.h
+++ b/FWCore/SOA/interface/TableExaminer.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/SOA
 // Class  :     TableExaminer
-// 
+//
 /**\class TableExaminer TableExaminer.h "TableExaminer.h"
 
  Description: Concrete implementation of TableExaminerBase
@@ -25,75 +25,68 @@
 
 // forward declarations
 namespace edm {
-namespace soa {
-
-template <typename T>
-class TableExaminer : public TableExaminerBase
-{
-
-   public:
-  explicit TableExaminer( T const* iTable):
-  m_table (iTable) {}
-  
-  TableExaminer(const TableExaminer<T>&) = default;
-  
-  TableExaminer<T>& operator=(const TableExaminer<T>&) = default;
-
-  ~TableExaminer() override {}
-
-  // ---------- const member functions ---------------------
-
-  size_t size() const override final { return m_table->size(); }
-  
-  void const* columnAddress(unsigned int iColumnIndex) const override final {
-    return m_table->columnAddressByIndex(iColumnIndex);
-  }
-  
-  std::vector<std::type_index> columnTypes() const override final {
-    std::vector<std::type_index> returnValue;
-    returnValue.reserve(T::kNColumns);
-    columnTypesImpl<0, T::kNColumns>(returnValue);
-    return returnValue;
-  }
-  
-  std::vector<std::pair<char const*, std::type_index>>
-  columnDescriptions() const override final {
-    std::vector<std::pair<char const*, std::type_index>>  returnValue;
-    returnValue.reserve(T::kNColumns);
-    columnDescImpl<0, T::kNColumns>(returnValue);
-    return returnValue;
-  }
-  
-  const std::type_info* typeID() const override final {
-    return &typeid(T);
-  }
-  
-private:
-  template <int I, int S>
-  void columnTypesImpl(std::vector<std::type_index>& iV) const {
-    if constexpr(I != S) {
-      using Layout = typename T::Layout;
-      iV.emplace_back( typeid( typename std::tuple_element<I,Layout>::type ) );
-      columnTypesImpl<I+1, S>(iV);
-    }
-  }
-  
-  template <int I, int S>
-  void columnDescImpl(std::vector<std::pair<char const*, std::type_index>>& iV) const {
-    if constexpr(I != S) {
-      using Layout = typename T::Layout;
-      using ColumnType = typename std::tuple_element<I,Layout>::type;
-      iV.emplace_back( ColumnType::label(), typeid( typename ColumnType::type ) );
-      columnDescImpl<I+1, S>(iV);
-    }
-  }
-
-  // ---------- member data --------------------------------
-  T const* m_table;
-
-};
-
-}
-}
+  namespace soa {
+
+    template <typename T>
+    class TableExaminer : public TableExaminerBase {
+    public:
+      explicit TableExaminer(T const* iTable) : m_table(iTable) {}
+
+      TableExaminer(const TableExaminer<T>&) = default;
+
+      TableExaminer<T>& operator=(const TableExaminer<T>&) = default;
+
+      ~TableExaminer() override {}
+
+      // ---------- const member functions ---------------------
+
+      size_t size() const override final { return m_table->size(); }
+
+      void const* columnAddress(unsigned int iColumnIndex) const override final {
+        return m_table->columnAddressByIndex(iColumnIndex);
+      }
+
+      std::vector<std::type_index> columnTypes() const override final {
+        std::vector<std::type_index> returnValue;
+        returnValue.reserve(T::kNColumns);
+        columnTypesImpl<0, T::kNColumns>(returnValue);
+        return returnValue;
+      }
+
+      std::vector<std::pair<char const*, std::type_index>> columnDescriptions() const override final {
+        std::vector<std::pair<char const*, std::type_index>> returnValue;
+        returnValue.reserve(T::kNColumns);
+        columnDescImpl<0, T::kNColumns>(returnValue);
+        return returnValue;
+      }
+
+      const std::type_info* typeID() const override final { return &typeid(T); }
+
+    private:
+      template <int I, int S>
+      void columnTypesImpl(std::vector<std::type_index>& iV) const {
+        if constexpr (I != S) {
+          using Layout = typename T::Layout;
+          iV.emplace_back(typeid(typename std::tuple_element<I, Layout>::type));
+          columnTypesImpl<I + 1, S>(iV);
+        }
+      }
+
+      template <int I, int S>
+      void columnDescImpl(std::vector<std::pair<char const*, std::type_index>>& iV) const {
+        if constexpr (I != S) {
+          using Layout = typename T::Layout;
+          using ColumnType = typename std::tuple_element<I, Layout>::type;
+          iV.emplace_back(ColumnType::label(), typeid(typename ColumnType::type));
+          columnDescImpl<I + 1, S>(iV);
+        }
+      }
+
+      // ---------- member data --------------------------------
+      T const* m_table;
+    };
+
+  }  // namespace soa
+}  // namespace edm
 
 #endif
diff --git a/FWCore/SOA/interface/TableExaminerBase.h b/FWCore/SOA/interface/TableExaminerBase.h
index 54eb89018746b..a6ef8b69b18bf 100644
--- a/FWCore/SOA/interface/TableExaminerBase.h
+++ b/FWCore/SOA/interface/TableExaminerBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/SOA
 // Class  :     TableExaminerBase
-// 
+//
 /**\class TableExaminerBase TableExaminerBase.h "TableExaminerBase.h"
 
  Description: Base class interface for examining a edm::soa::Table
@@ -29,35 +29,30 @@
 // forward declarations
 
 namespace edm {
-namespace soa {
-  
-class TableExaminerBase
-{
+  namespace soa {
 
-public:
-  TableExaminerBase() = default;
-  virtual ~TableExaminerBase() =default;
-  TableExaminerBase(const TableExaminerBase&) = default;
-  TableExaminerBase& operator=(const TableExaminerBase&) = default;
+    class TableExaminerBase {
+    public:
+      TableExaminerBase() = default;
+      virtual ~TableExaminerBase() = default;
+      TableExaminerBase(const TableExaminerBase&) = default;
+      TableExaminerBase& operator=(const TableExaminerBase&) = default;
 
       // ---------- const member functions ---------------------
-  virtual std::vector<std::type_index> columnTypes() const = 0;
-  
-  virtual std::vector<std::pair<char const*, std::type_index>> columnDescriptions() const = 0;
-  
-  virtual size_t size() const = 0;
-  
-  virtual void const* columnAddress(unsigned int iColumnIndex) const = 0;
-  
-  virtual const std::type_info* typeID() const = 0;
-
-   private:
+      virtual std::vector<std::type_index> columnTypes() const = 0;
 
-      // ---------- member data --------------------------------
+      virtual std::vector<std::pair<char const*, std::type_index>> columnDescriptions() const = 0;
+
+      virtual size_t size() const = 0;
 
-};
-}
-}
+      virtual void const* columnAddress(unsigned int iColumnIndex) const = 0;
 
+      virtual const std::type_info* typeID() const = 0;
+
+    private:
+      // ---------- member data --------------------------------
+    };
+  }  // namespace soa
+}  // namespace edm
 
 #endif
diff --git a/FWCore/SOA/interface/TableItr.h b/FWCore/SOA/interface/TableItr.h
index e0b6216021703..fa3e9b1a8b7c3 100644
--- a/FWCore/SOA/interface/TableItr.h
+++ b/FWCore/SOA/interface/TableItr.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/SOA
 // Class  :     TableItr
-// 
+//
 /**\class TableItr TableItr.h "TableItr.h"
 
  Description: An iterator for edm::soa::Table like classes
@@ -29,149 +29,127 @@
 // forward declarations
 
 namespace edm {
-namespace soa {
-namespace impl {
-  
-  template<int I, typename... Args>
-  struct TableItrAdvance {
-    using Layout = std::tuple<Args...>;
-    static void advance(std::array<void*, sizeof...(Args)>& iArray, long iStep) {
-      using Type = typename std::tuple_element<I,Layout>::type::type;
-      TableItrAdvance<I-1,Args...>::advance(iArray,iStep);
-      auto p = static_cast<Type*>( iArray[I]);
-      iArray[I] = p+iStep;
-    }
-  };
-  
-  template<typename... Args>
-  struct TableItrAdvance<0,Args...> {
-    using Layout = std::tuple<Args...>;
-    static void advance(std::array<void*, sizeof...(Args)>& iArray, long iStep) {
-      using Type = typename std::tuple_element<0,Layout>::type::type;
-      auto p = static_cast<Type*>( iArray[0]);
-      iArray[0] = p+iStep;
+  namespace soa {
+    namespace impl {
+
+      template <int I, typename... Args>
+      struct TableItrAdvance {
+        using Layout = std::tuple<Args...>;
+        static void advance(std::array<void*, sizeof...(Args)>& iArray, long iStep) {
+          using Type = typename std::tuple_element<I, Layout>::type::type;
+          TableItrAdvance<I - 1, Args...>::advance(iArray, iStep);
+          auto p = static_cast<Type*>(iArray[I]);
+          iArray[I] = p + iStep;
+        }
+      };
+
+      template <typename... Args>
+      struct TableItrAdvance<0, Args...> {
+        using Layout = std::tuple<Args...>;
+        static void advance(std::array<void*, sizeof...(Args)>& iArray, long iStep) {
+          using Type = typename std::tuple_element<0, Layout>::type::type;
+          auto p = static_cast<Type*>(iArray[0]);
+          iArray[0] = p + iStep;
+        }
+      };
+
+      template <int I, typename... Args>
+      struct ConstTableItrAdvance {
+        using Layout = std::tuple<Args...>;
+        static void advance(std::array<void const*, sizeof...(Args)>& iArray, long iStep) {
+          using Type = typename std::tuple_element<I, Layout>::type::type;
+          ConstTableItrAdvance<I - 1, Args...>::advance(iArray, iStep);
+          auto p = static_cast<Type const*>(iArray[I]);
+          iArray[I] = p + iStep;
+        }
+      };
+
+      template <typename... Args>
+      struct ConstTableItrAdvance<0, Args...> {
+        using Layout = std::tuple<Args...>;
+        static void advance(std::array<void const*, sizeof...(Args)>& iArray, long iStep) {
+          using Type = typename std::tuple_element<0, Layout>::type::type;
+          auto p = static_cast<Type const*>(iArray[0]);
+          iArray[0] = p + iStep;
+        }
+      };
+    }  // namespace impl
+
+    template <typename... Args>
+    class TableItr {
+      using Layout = std::tuple<Args...>;
+      std::array<void*, sizeof...(Args)> m_values;
+
+    public:
+      using value_type = MutableRowView<Args...>;
+
+      explicit TableItr(std::array<void*, sizeof...(Args)> const& iValues) : m_values{iValues} {}
+
+      explicit TableItr(std::array<void*, sizeof...(Args)> const& iValues, long iOffset) : m_values{iValues} {
+        impl::TableItrAdvance<sizeof...(Args) - 1, Args...>::advance(m_values, iOffset);
+      }
+
+      explicit TableItr(std::array<void*, sizeof...(Args)> const& iValues, unsigned int iOffset) : m_values{iValues} {
+        impl::TableItrAdvance<sizeof...(Args) - 1, Args...>::advance(m_values, static_cast<long>(iOffset));
+      }
+
+      value_type operator*() { return value_type{m_values}; }
+
+      TableItr& operator++() {
+        impl::TableItrAdvance<sizeof...(Args) - 1, Args...>::advance(m_values, 1);
+        return *this;
+      }
+
+      bool operator==(const TableItr<Args...>& iOther) { return m_values[0] == iOther.m_values[0]; }
+
+      bool operator!=(const TableItr<Args...>& iOther) { return m_values[0] != iOther.m_values[0]; }
+
+      TableItr<Args...> makeOffset(long iDiff) const { return TableItr<Args...>{m_values, iDiff}; }
+    };
+
+    template <typename... Args>
+    TableItr<Args...> operator+(TableItr<Args...> const& iLHS, long iDiff) {
+      return iLHS.makeOffset(iDiff);
     }
-  };
-
-  template<int I, typename... Args>
-  struct ConstTableItrAdvance {
-    using Layout = std::tuple<Args...>;
-    static void advance(std::array<void const*, sizeof...(Args)>& iArray, long iStep) {
-      using Type = typename std::tuple_element<I,Layout>::type::type;
-      ConstTableItrAdvance<I-1,Args...>::advance(iArray,iStep);
-      auto p = static_cast<Type const*>( iArray[I]);
-      iArray[I] = p+iStep;
-    }
-  };
-  
-  template<typename... Args>
-  struct ConstTableItrAdvance<0,Args...> {
-    using Layout = std::tuple<Args...>;
-    static void advance(std::array<void const*, sizeof...(Args)>& iArray, long iStep) {
-      using Type = typename std::tuple_element<0,Layout>::type::type;
-      auto p = static_cast<Type const*>( iArray[0]);
-      iArray[0] = p+iStep;
+
+    template <typename... Args>
+    class ConstTableItr {
+      using Layout = std::tuple<Args...>;
+      std::array<void const*, sizeof...(Args)> m_values;
+
+    public:
+      using value_type = RowView<Args...>;
+
+      explicit ConstTableItr(std::array<void const*, sizeof...(Args)> const& iValues) : m_values{iValues} {}
+
+      ConstTableItr(std::array<void const*, sizeof...(Args)> const& iValues, long iOffset) : m_values{iValues} {
+        impl::ConstTableItrAdvance<sizeof...(Args) - 1, Args...>::advance(m_values, iOffset);
+      }
+
+      ConstTableItr(std::array<void const*, sizeof...(Args)> const& iValues, unsigned int iOffset) : m_values{iValues} {
+        impl::ConstTableItrAdvance<sizeof...(Args) - 1, Args...>::advance(m_values, static_cast<long>(iOffset));
+      }
+
+      value_type operator*() const { return value_type{m_values}; }
+
+      ConstTableItr& operator++() {
+        impl::ConstTableItrAdvance<sizeof...(Args) - 1, Args...>::advance(m_values, 1);
+        return *this;
+      }
+
+      bool operator==(const ConstTableItr<Args...>& iOther) { return m_values[0] == iOther.m_values[0]; }
+
+      bool operator!=(const ConstTableItr<Args...>& iOther) { return m_values[0] != iOther.m_values[0]; }
+
+      TableItr<Args...> makeOffset(long iDiff) const { return TableItr<Args...>{m_values, iDiff}; }
+    };
+
+    template <typename... Args>
+    ConstTableItr<Args...> operator+(ConstTableItr<Args...> const& iLHS, long iDiff) {
+      return iLHS.makeOffset(iDiff);
     }
-  };
-}
-  
-  
-template <typename... Args>
-class TableItr {
-  using Layout = std::tuple<Args...>;
-  std::array<void*, sizeof...(Args)> m_values;
-public:
-  using value_type = MutableRowView<Args...>;
-  
-  explicit TableItr( std::array<void*, sizeof...(Args)> const& iValues):
-  m_values{iValues} {}
-  
-  explicit TableItr( std::array<void*, sizeof...(Args)> const& iValues, long iOffset):
-  m_values{iValues} {
-    impl::TableItrAdvance<sizeof...(Args)-1, Args...>::advance(m_values, iOffset);
-  }
-
-  explicit TableItr( std::array<void*, sizeof...(Args)> const& iValues, unsigned int iOffset):
-  m_values{iValues} {
-    impl::TableItrAdvance<sizeof...(Args)-1, Args...>::advance(m_values, static_cast<long>(iOffset));
-  }
-
-  value_type operator*() {
-    return value_type{m_values};
-  }
-  
-  TableItr& operator++() {
-    impl::TableItrAdvance<sizeof...(Args)-1, Args...>::advance(m_values, 1);
-    return *this;
-  }
-  
-  bool operator==( const TableItr<Args...>& iOther) {
-    return m_values[0] == iOther.m_values[0];
-  }
-  
-  bool operator!=( const TableItr<Args...>& iOther) {
-    return m_values[0] != iOther.m_values[0];
-  }
-  
-  TableItr<Args...> makeOffset(long iDiff) const {
-    return TableItr<Args...>{ m_values, iDiff };
-  }
-};
-
-template <typename... Args>
-TableItr<Args...> operator+(TableItr<Args...> const& iLHS, long iDiff) {
-  return iLHS.makeOffset(iDiff);
-}
-  
-template <typename... Args>
-class ConstTableItr {
-  using Layout = std::tuple<Args...>;
-  std::array<void const*, sizeof...(Args)> m_values;
-public:
-  using value_type = RowView<Args...>;
-  
-  explicit ConstTableItr( std::array<void const*, sizeof...(Args)> const& iValues):
-  m_values{iValues} {}
-  
-  ConstTableItr( std::array<void const*, sizeof...(Args)> const& iValues, long iOffset):
-  m_values{iValues} {
-    impl::ConstTableItrAdvance<sizeof...(Args)-1, Args...>::advance(m_values, iOffset);
-  }
-
-  ConstTableItr( std::array<void const*, sizeof...(Args)> const& iValues, unsigned int iOffset):
-  m_values{iValues} {
-    impl::ConstTableItrAdvance<sizeof...(Args)-1, Args...>::advance(m_values, static_cast<long>(iOffset));
-  }
-
-  value_type operator*() const {
-    return value_type{m_values};
-  }
-  
-  ConstTableItr& operator++() {
-    impl::ConstTableItrAdvance<sizeof...(Args)-1, Args...>::advance(m_values, 1);
-    return *this;
-  }
-  
-  bool operator==( const ConstTableItr<Args...>& iOther) {
-    return m_values[0] == iOther.m_values[0];
-  }
-  
-  bool operator!=( const ConstTableItr<Args...>& iOther) {
-    return m_values[0] != iOther.m_values[0];
-  }
-  
-  TableItr<Args...> makeOffset(long iDiff) const {
-    return TableItr<Args...>{ m_values, iDiff };
-  }
-};
-
-template <typename... Args>
-ConstTableItr<Args...> operator+(ConstTableItr<Args...> const& iLHS, long iDiff) {
-  return iLHS.makeOffset(iDiff);
-}
-
-}
-}
 
+  }  // namespace soa
+}  // namespace edm
 
 #endif
diff --git a/FWCore/SOA/interface/TableView.h b/FWCore/SOA/interface/TableView.h
index 732333204a69d..ff32ae49c9ad0 100644
--- a/FWCore/SOA/interface/TableView.h
+++ b/FWCore/SOA/interface/TableView.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/SOA
 // Class  :     TableView
-// 
+//
 /**\class TableView TableView.h "TableView.h"
 
  Description: A view of certain columns of a edm::soa::Table
@@ -45,60 +45,55 @@
 
 namespace edm {
   namespace soa {
-template <typename... Args>
-class TableView {
-  
-public:
-  using Layout = std::tuple<Args...>;
-  static constexpr const size_t kNColumns = sizeof...(Args);
-  using const_iterator = ConstTableItr<Args...>;
-  
-  template <typename... OArgs>
-  TableView( Table<OArgs...> const& iTable):
-  m_size(iTable.size()) {
-    fillArray(iTable, std::make_index_sequence<sizeof...(Args)>{});
-  }
-  TableView( unsigned int iSize, std::array<void*, sizeof...(Args)>& iArray):
-  m_size(iSize),
-  m_values(iArray) {}
-  
-  TableView( unsigned int iSize, std::array<void const*, sizeof...(Args)>& iArray):
-  m_size(iSize),
-  m_values(iArray) {}
-  
-  unsigned int size() const {
-    return m_size;
-  }
-  
-  template<typename U>
-  typename U::type const& get(size_t iRow) const {
-    return static_cast<typename U::type*>(columnAddress<U>())+iRow;
-  }
-  
-  template<typename U>
-  ColumnValues<typename U::type> column() const {
-    return ColumnValues<typename U::type>{static_cast<typename U::type const*>(columnAddress<U>()), m_size};
-  }
-  
-  const_iterator begin() const { return const_iterator{m_values}; }
-  const_iterator end() const { return const_iterator{m_values,size()}; }
-  
-private:
-  std::array<void const*, sizeof...(Args)> m_values;
-  unsigned int m_size;
-  
-  template<typename U>
-  void const* columnAddress() const {
-    return m_values[impl::GetIndex<0,U,Layout>::index];
-  }
-  
-  template <typename T, size_t... I>
-  void fillArray( T const& iTable, std::index_sequence<I...>) {
-    ( (m_values[I] = iTable.columnAddressWorkaround(static_cast<typename std::tuple_element<I, Layout>::type const*>(nullptr))), ...);
-  }
-};
-
-}
-}
+    template <typename... Args>
+    class TableView {
+    public:
+      using Layout = std::tuple<Args...>;
+      static constexpr const size_t kNColumns = sizeof...(Args);
+      using const_iterator = ConstTableItr<Args...>;
+
+      template <typename... OArgs>
+      TableView(Table<OArgs...> const& iTable) : m_size(iTable.size()) {
+        fillArray(iTable, std::make_index_sequence<sizeof...(Args)>{});
+      }
+      TableView(unsigned int iSize, std::array<void*, sizeof...(Args)>& iArray) : m_size(iSize), m_values(iArray) {}
+
+      TableView(unsigned int iSize, std::array<void const*, sizeof...(Args)>& iArray)
+          : m_size(iSize), m_values(iArray) {}
+
+      unsigned int size() const { return m_size; }
+
+      template <typename U>
+      typename U::type const& get(size_t iRow) const {
+        return static_cast<typename U::type*>(columnAddress<U>()) + iRow;
+      }
+
+      template <typename U>
+      ColumnValues<typename U::type> column() const {
+        return ColumnValues<typename U::type>{static_cast<typename U::type const*>(columnAddress<U>()), m_size};
+      }
+
+      const_iterator begin() const { return const_iterator{m_values}; }
+      const_iterator end() const { return const_iterator{m_values, size()}; }
+
+    private:
+      std::array<void const*, sizeof...(Args)> m_values;
+      unsigned int m_size;
+
+      template <typename U>
+      void const* columnAddress() const {
+        return m_values[impl::GetIndex<0, U, Layout>::index];
+      }
+
+      template <typename T, size_t... I>
+      void fillArray(T const& iTable, std::index_sequence<I...>) {
+        ((m_values[I] = iTable.columnAddressWorkaround(
+              static_cast<typename std::tuple_element<I, Layout>::type const*>(nullptr))),
+         ...);
+      }
+    };
+
+  }  // namespace soa
+}  // namespace edm
 
 #endif
diff --git a/FWCore/SOA/interface/tablehelpers.h b/FWCore/SOA/interface/tablehelpers.h
index 1a0637bc74a87..3e068847e2ac3 100644
--- a/FWCore/SOA/interface/tablehelpers.h
+++ b/FWCore/SOA/interface/tablehelpers.h
@@ -26,23 +26,23 @@
 // forward declarations
 
 namespace edm {
-namespace soa {
-namespace impl {
-  
-template<int I>
-struct FoundIndex {
-  static constexpr int index = I;
-};
-
-template <int I, typename T, typename TPL>
-struct GetIndex {
-  static constexpr int index = std::conditional<std::is_same<T, typename std::tuple_element<I,TPL>::type >::value,
-  FoundIndex<I>,
-  GetIndex<I+1, T,TPL>>::type::index;
-};
-
-}
-}
-}
+  namespace soa {
+    namespace impl {
+
+      template <int I>
+      struct FoundIndex {
+        static constexpr int index = I;
+      };
+
+      template <int I, typename T, typename TPL>
+      struct GetIndex {
+        static constexpr int index = std::conditional<std::is_same<T, typename std::tuple_element<I, TPL>::type>::value,
+                                                      FoundIndex<I>,
+                                                      GetIndex<I + 1, T, TPL>>::type::index;
+      };
+
+    }  // namespace impl
+  }    // namespace soa
+}  // namespace edm
 
 #endif
diff --git a/FWCore/SOA/test/table_t.cppunit.cpp b/FWCore/SOA/test/table_t.cppunit.cpp
index 8b6f32283ab24..43c13f84c31a3 100644
--- a/FWCore/SOA/test/table_t.cppunit.cpp
+++ b/FWCore/SOA/test/table_t.cppunit.cpp
@@ -18,10 +18,9 @@ Changed by Viji on 29-06-2005
 #include "FWCore/SOA/interface/TableItr.h"
 #include "FWCore/SOA/interface/TableExaminer.h"
 
-class testTable: public CppUnit::TestFixture
-{
+class testTable : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testTable);
-  
+
   CPPUNIT_TEST(rowviewCtrTest);
   CPPUNIT_TEST(rawTableItrTest);
   CPPUNIT_TEST(tableCtrTest);
@@ -32,9 +31,10 @@ class testTable: public CppUnit::TestFixture
   CPPUNIT_TEST(tableResizeTest);
   CPPUNIT_TEST(mutabilityTest);
   CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void rowviewCtrTest();
   void rawTableItrTest();
@@ -48,8 +48,8 @@ class testTable: public CppUnit::TestFixture
 };
 
 namespace ts {
-  struct Eta : public edm::soa::Column<float,Eta> {
-    static constexpr const char * const kLabel = "eta";
+  struct Eta : public edm::soa::Column<float, Eta> {
+    static constexpr const char* const kLabel = "eta";
   };
 
   SOA_DECLARE_COLUMN(Phi, float, "phi");
@@ -57,52 +57,50 @@ namespace ts {
   SOA_DECLARE_COLUMN(ID, int, "id");
   SOA_DECLARE_COLUMN(Label, std::string, "label");
 
-  SOA_DECLARE_COLUMN(Px,double,"p_x");
-  SOA_DECLARE_COLUMN(Py,double,"p_y");
-  SOA_DECLARE_COLUMN(Pz,double,"p_z");
-  
+  SOA_DECLARE_COLUMN(Px, double, "p_x");
+  SOA_DECLARE_COLUMN(Py, double, "p_y");
+  SOA_DECLARE_COLUMN(Pz, double, "p_z");
+
   using ParticleTable = edm::soa::Table<Px, Py, Pz, Energy>;
-  
-  using JetTable = edm::soa::Table<Eta,Phi>;
+
+  using JetTable = edm::soa::Table<Eta, Phi>;
 
   /* Create a new table that is an extension of an existing table*/
   using MyJetTable = edm::soa::AddColumns_t<JetTable, std::tuple<Label>>;
-  
+
   /* Creat a table that is a sub table of an existing one */
   using MyOtherJetTable = edm::soa::RemoveColumn_t<MyJetTable, Phi>;
-}
+}  // namespace ts
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testTable);
 
-void testTable::rowviewCtrTest()
-{
-  int id=1;
+void testTable::rowviewCtrTest() {
+  int id = 1;
   float eta = 3.14;
   float phi = 1.5;
-  std::string label { "foo" };
-  
-  std::array<void const*, 4> variables{ {&id, &eta, &phi, &label} };
-  
-  edm::soa::RowView<ts::ID,ts::Eta,ts::Phi,ts::Label> rv{variables};
-  
-  CPPUNIT_ASSERT(rv.get<ts::ID>() == id );
-  CPPUNIT_ASSERT(rv.get<ts::Eta>() == eta );
-  CPPUNIT_ASSERT(rv.get<ts::Phi>() == phi );
-  CPPUNIT_ASSERT(rv.get<ts::Label>() == label );
+  std::string label{"foo"};
+
+  std::array<void const*, 4> variables{{&id, &eta, &phi, &label}};
+
+  edm::soa::RowView<ts::ID, ts::Eta, ts::Phi, ts::Label> rv{variables};
+
+  CPPUNIT_ASSERT(rv.get<ts::ID>() == id);
+  CPPUNIT_ASSERT(rv.get<ts::Eta>() == eta);
+  CPPUNIT_ASSERT(rv.get<ts::Phi>() == phi);
+  CPPUNIT_ASSERT(rv.get<ts::Label>() == label);
 }
 
-void testTable::rawTableItrTest()
-{
-  int ids[] = {1,2,3};
+void testTable::rawTableItrTest() {
+  int ids[] = {1, 2, 3};
   float etas[] = {3.14, 2.5, 0.3};
-  float phis[] = {1.5,-0.2, 2.9};
+  float phis[] = {1.5, -0.2, 2.9};
 
-  std::array<void*, 3> variables{ {ids, etas, phis} };
+  std::array<void*, 3> variables{{ids, etas, phis}};
 
   edm::soa::TableItr<ts::ID, ts::Eta, ts::Phi> itr{variables};
-  
-  for(unsigned int i = 0; i < std::size(ids); ++i, ++itr) {
+
+  for (unsigned int i = 0; i < std::size(ids); ++i, ++itr) {
     auto v = *itr;
     CPPUNIT_ASSERT(v.get<ts::ID>() == ids[i]);
     CPPUNIT_ASSERT(v.get<ts::Eta>() == etas[i]);
@@ -111,157 +109,147 @@ void testTable::rawTableItrTest()
 }
 
 namespace {
-  std::vector<double> pTs( edm::soa::TableView<ts::Px,ts::Py> tv) {
+  std::vector<double> pTs(edm::soa::TableView<ts::Px, ts::Py> tv) {
     std::vector<double> results;
     results.reserve(tv.size());
-    
-    for(auto const& r: tv) {
+
+    for (auto const& r : tv) {
       auto px = r.get<ts::Px>();
       auto py = r.get<ts::Py>();
-      results.push_back(std::sqrt(px*px+py*py));
+      results.push_back(std::sqrt(px * px + py * py));
     }
-    
+
     return results;
   }
-  
-  template<typename C>
-  void compareEta( edm::soa::TableView<ts::Eta> iEtas, C const& iContainer) {
+
+  template <typename C>
+  void compareEta(edm::soa::TableView<ts::Eta> iEtas, C const& iContainer) {
     auto it = iContainer.begin();
-    for(auto v: iEtas.column<ts::Eta>() ) {
-      CPPUNIT_ASSERT( v == *it);
+    for (auto v : iEtas.column<ts::Eta>()) {
+      CPPUNIT_ASSERT(v == *it);
       ++it;
     }
   }
-  
+
   struct JetType {
     double eta_;
     double phi_;
   };
-  
-  double value_for_column(JetType const& iJ, ts::Eta*) {
-    return iJ.eta_;
-  }
-  
-  double value_for_column(JetType const& iJ, ts::Phi*) {
-    return iJ.phi_;
-  }
 
-  bool tolerance(double a, double b) {
-    return std::abs(a-b) < 10E-6;
-  }
-}
+  double value_for_column(JetType const& iJ, ts::Eta*) { return iJ.eta_; }
 
-void testTable::tableColumnTest()
-{
+  double value_for_column(JetType const& iJ, ts::Phi*) { return iJ.phi_; }
+
+  bool tolerance(double a, double b) { return std::abs(a - b) < 10E-6; }
+}  // namespace
+
+void testTable::tableColumnTest() {
   using namespace ts;
   using namespace edm::soa;
-  std::array<double,3> eta = {{1.,2.,4.}};
-  std::array<double,3> phi = {{3.14,0.,1.3}};
-  
-  JetTable jets{eta,phi};
+  std::array<double, 3> eta = {{1., 2., 4.}};
+  std::array<double, 3> phi = {{3.14, 0., 1.3}};
+
+  JetTable jets{eta, phi};
   {
     auto it = phi.begin();
-    for(auto v: jets.column<Phi>() ) {
-      CPPUNIT_ASSERT( tolerance(*it, v) );
+    for (auto v : jets.column<Phi>()) {
+      CPPUNIT_ASSERT(tolerance(*it, v));
       ++it;
     }
   }
 
   {
     auto it = eta.begin();
-    for(auto v: jets.column<Eta>() ) {
-      CPPUNIT_ASSERT( tolerance(*it, v) );
+    for (auto v : jets.column<Eta>()) {
+      CPPUNIT_ASSERT(tolerance(*it, v));
       ++it;
     }
   }
-
 }
 
-void testTable::tableViewConversionTest()
-{
+void testTable::tableViewConversionTest() {
   using namespace ts;
   using namespace edm::soa;
-  std::array<double,3> eta = {{1.,2.,4.}};
-  std::array<double,3> phi = {{3.14,0.,1.3}};
-  
-  JetTable jets{eta,phi};
+  std::array<double, 3> eta = {{1., 2., 4.}};
+  std::array<double, 3> phi = {{3.14, 0., 1.3}};
+
+  JetTable jets{eta, phi};
+
+  compareEta(jets, eta);
 
-  compareEta(jets,eta);
-  
   {
-    TableView<Phi,Eta> view{jets};
+    TableView<Phi, Eta> view{jets};
     auto itEta = eta.cbegin();
     auto itPhi = phi.cbegin();
-    for(auto const& v: view) {
-      CPPUNIT_ASSERT(tolerance(*itEta,v.get<Eta>()));
-      CPPUNIT_ASSERT(tolerance(*itPhi,v.get<Phi>()));
+    for (auto const& v : view) {
+      CPPUNIT_ASSERT(tolerance(*itEta, v.get<Eta>()));
+      CPPUNIT_ASSERT(tolerance(*itPhi, v.get<Phi>()));
       ++itEta;
       ++itPhi;
     }
   }
-  
-  std::vector<double> px = { 0.1, 0.9, 1.3 };
-  std::vector<double> py = { 0.8, 1.7, 2.1 };
-  std::vector<double> pz = { 0.4, 1.0, 0.7 };
-  std::vector<double> energy = { 1.4, 3.7, 4.1};
-  
-  ParticleTable particles{px,py,pz,energy};
-  
+
+  std::vector<double> px = {0.1, 0.9, 1.3};
+  std::vector<double> py = {0.8, 1.7, 2.1};
+  std::vector<double> pz = {0.4, 1.0, 0.7};
+  std::vector<double> energy = {1.4, 3.7, 4.1};
+
+  ParticleTable particles{px, py, pz, energy};
+
   {
     std::vector<double> ptCompare;
     ptCompare.reserve(px.size());
-    for(unsigned int i=0; i< px.size();++i) {
-      ptCompare.push_back(sqrt(px[i]*px[i]+py[i]*py[i]));
+    for (unsigned int i = 0; i < px.size(); ++i) {
+      ptCompare.push_back(sqrt(px[i] * px[i] + py[i] * py[i]));
     }
     auto it = ptCompare.begin();
-    for( auto v : pTs( particles ) ) {
-      CPPUNIT_ASSERT(tolerance(*it,v));
+    for (auto v : pTs(particles)) {
+      CPPUNIT_ASSERT(tolerance(*it, v));
       ++it;
     }
   }
-
 }
 
-void testTable::tableCtrTest()
-{
+void testTable::tableCtrTest() {
   using namespace ts;
   using namespace edm::soa;
-  std::array<double,3> eta = {{1.,2.,4.}};
-  std::array<double,3> phi = {{3.14,0.,1.3}};
-  
-  JetTable jets{eta,phi};
-  
+  std::array<double, 3> eta = {{1., 2., 4.}};
+  std::array<double, 3> phi = {{3.14, 0., 1.3}};
+
+  JetTable jets{eta, phi};
+
   {
     auto itEta = eta.begin();
     auto itPhi = phi.begin();
-    for(auto const& v: jets) {
-      CPPUNIT_ASSERT( tolerance(*itEta, v.get<Eta>()));
-      CPPUNIT_ASSERT( tolerance(*itPhi, v.get<Phi>()));
+    for (auto const& v : jets) {
+      CPPUNIT_ASSERT(tolerance(*itEta, v.get<Eta>()));
+      CPPUNIT_ASSERT(tolerance(*itPhi, v.get<Phi>()));
       ++itEta;
       ++itPhi;
     }
   }
-  std::vector<double> px = { 0.1, 0.9, 1.3 };
-  std::vector<double> py = { 0.8, 1.7, 2.1 };
-  std::vector<double> pz = { 0.4, 1.0, 0.7 };
-  std::vector<double> energy = { 1.4, 3.7, 4.1};
-  
-  ParticleTable particles{px,py,pz,energy};
-  
+  std::vector<double> px = {0.1, 0.9, 1.3};
+  std::vector<double> py = {0.8, 1.7, 2.1};
+  std::vector<double> pz = {0.4, 1.0, 0.7};
+  std::vector<double> energy = {1.4, 3.7, 4.1};
+
+  ParticleTable particles{px, py, pz, energy};
+
   {
-    std::vector<JetType> j = {{1.,3.14},{2.,0.},{4.,1.3}};
-    std::vector<std::string> labels = {{"jet0","jet1","jet2"}};
-    
-    int index=0;
-    MyJetTable jt{ j, column_fillers(Label::filler([&index](JetType const&)
-                                                            { std::ostringstream s;
-                                                              s<<"jet"<<index++;
-                                                              return s.str();}) ) };
+    std::vector<JetType> j = {{1., 3.14}, {2., 0.}, {4., 1.3}};
+    std::vector<std::string> labels = {{"jet0", "jet1", "jet2"}};
+
+    int index = 0;
+    MyJetTable jt{j, column_fillers(Label::filler([&index](JetType const&) {
+                    std::ostringstream s;
+                    s << "jet" << index++;
+                    return s.str();
+                  }))};
     auto itJ = j.begin();
     auto itLabels = labels.begin();
-    for(auto const& v: jt) {
-      CPPUNIT_ASSERT(tolerance(itJ->eta_,v.get<Eta>()));
-      CPPUNIT_ASSERT(tolerance(itJ->eta_,v.get<Eta>()));
+    for (auto const& v : jt) {
+      CPPUNIT_ASSERT(tolerance(itJ->eta_, v.get<Eta>()));
+      CPPUNIT_ASSERT(tolerance(itJ->eta_, v.get<Eta>()));
       CPPUNIT_ASSERT(v.get<Label>() == *itLabels);
       ++itJ;
       ++itLabels;
@@ -269,80 +257,75 @@ void testTable::tableCtrTest()
 
     {
       auto itFillIndex = labels.begin();
-      MyJetTable jt{ j, column_fillers(Label::filler([&itFillIndex](JetType const&)
-                                                        {return *(itFillIndex++);}) ) };
+      MyJetTable jt{j, column_fillers(Label::filler([&itFillIndex](JetType const&) { return *(itFillIndex++); }))};
       auto itLabels = labels.begin();
-      for(auto const& v: jt) {
+      for (auto const& v : jt) {
         CPPUNIT_ASSERT(v.get<Label>() == *itLabels);
         ++itLabels;
       }
     }
-
   }
-  
 }
-void testTable::tableStandardOpsTest()
-{
+void testTable::tableStandardOpsTest() {
   using namespace ts;
   using namespace edm::soa;
-  
-  std::vector<double> px = { 0.1, 0.9, 1.3 };
-  std::vector<double> py = { 0.8, 1.7, 2.1 };
-  std::vector<double> pz = { 0.4, 1.0, 0.7 };
-  std::vector<double> energy = { 1.4, 3.7, 4.1};
-  
-  ParticleTable particles{px,py,pz,energy};
+
+  std::vector<double> px = {0.1, 0.9, 1.3};
+  std::vector<double> py = {0.8, 1.7, 2.1};
+  std::vector<double> pz = {0.4, 1.0, 0.7};
+  std::vector<double> energy = {1.4, 3.7, 4.1};
+
+  ParticleTable particles{px, py, pz, energy};
 
   {
     ParticleTable copyTable{particles};
-    
+
     auto compare = [](const ParticleTable& iLHS, const ParticleTable& iRHS) {
       CPPUNIT_ASSERT(iLHS.size() == iRHS.size());
-      for(size_t i = 0; i< iRHS.size(); ++i) {
+      for (size_t i = 0; i < iRHS.size(); ++i) {
         CPPUNIT_ASSERT(iLHS.get<Px>(i) == iRHS.get<Px>(i));
         CPPUNIT_ASSERT(iLHS.get<Py>(i) == iRHS.get<Py>(i));
         CPPUNIT_ASSERT(iLHS.get<Pz>(i) == iRHS.get<Pz>(i));
         CPPUNIT_ASSERT(iLHS.get<Energy>(i) == iRHS.get<Energy>(i));
       }
     };
-    compare(copyTable,particles);
-    
+    compare(copyTable, particles);
+
     ParticleTable moveTable(std::move(copyTable));
-    compare(moveTable,particles);
-    
+    compare(moveTable, particles);
+
     ParticleTable opEqTable;
     opEqTable = particles;
-    compare(opEqTable,particles);
-    
+    compare(opEqTable, particles);
+
     ParticleTable opEqMvTable;
-    opEqMvTable=std::move(moveTable);
-    compare(opEqMvTable,particles);
+    opEqMvTable = std::move(moveTable);
+    compare(opEqMvTable, particles);
   }
-  
 }
 
 namespace {
   void checkColumnTypes(edm::soa::TableExaminerBase& reader) {
     auto columns = reader.columnTypes();
-    std::array<std::type_index,2> const types{ {typeid(ts::Eta), typeid(ts::Phi) } };
+    std::array<std::type_index, 2> const types{{typeid(ts::Eta), typeid(ts::Phi)}};
 
     auto itT = types.begin();
-    for( auto c: columns) {
+    for (auto c : columns) {
       CPPUNIT_ASSERT(c == *itT);
       ++itT;
     }
   };
-  
+
   void checkColumnDescriptions(edm::soa::TableExaminerBase& reader) {
     auto columns = reader.columnDescriptions();
 
-    std::array<std::string,2> const desc{{"eta", "phi"}};
-    std::array<std::type_index,2> const types{ {typeid(float), typeid(float) } };
-    
+    std::array<std::string, 2> const desc{{"eta", "phi"}};
+    std::array<std::type_index, 2> const types{{typeid(float), typeid(float)}};
+
     auto itD = desc.begin();
     auto itT = types.begin();
-    
-    for( auto c: columns) {
+
+    for (auto c : columns) {
       CPPUNIT_ASSERT(c.first == *itD);
       CPPUNIT_ASSERT(c.second == *itT);
       ++itD;
@@ -350,20 +333,19 @@ namespace {
     }
   };
 
-}
+}  // namespace
 
-void testTable::tableExaminerTest()
-{
+void testTable::tableExaminerTest() {
   using namespace edm::soa;
   using namespace ts;
-  
-  std::array<double,3> eta={{1.,2.,4.}};
-  std::array<double,3> phi={{3.14,0.,1.3}};
+
+  std::array<double, 3> eta = {{1., 2., 4.}};
+  std::array<double, 3> phi = {{3.14, 0., 1.3}};
   int size = eta.size();
   CPPUNIT_ASSERT(size == 3);
-  
-  JetTable jets{eta,phi};
-  
+
+  JetTable jets{eta, phi};
+
   TableExaminer<JetTable> r(&jets);
   checkColumnTypes(r);
   checkColumnDescriptions(r);
@@ -373,65 +355,63 @@ void testTable::tableResizeTest() {
   using namespace edm::soa;
   using namespace ts;
 
-  std::vector<double> px = { 0.1, 0.9, 1.3 };
-  std::vector<double> py = { 0.8, 1.7, 2.1 };
-  std::vector<double> pz = { 0.4, 1.0, 0.7 };
-  std::vector<double> energy = { 1.4, 3.7, 4.1};
+  std::vector<double> px = {0.1, 0.9, 1.3};
+  std::vector<double> py = {0.8, 1.7, 2.1};
+  std::vector<double> pz = {0.4, 1.0, 0.7};
+  std::vector<double> energy = {1.4, 3.7, 4.1};
 
-  ParticleTable particlesStandard{px,py,pz,energy};
+  ParticleTable particlesStandard{px, py, pz, energy};
 
-  ParticleTable particles{px,py,pz,energy};
+  ParticleTable particles{px, py, pz, energy};
 
   particles.resize(2);
-  
+
   auto compare = [](const ParticleTable& iLHS, const ParticleTable& iRHS, size_t n) {
-    for(size_t i = 0; i< n; ++i) {
+    for (size_t i = 0; i < n; ++i) {
       CPPUNIT_ASSERT(iLHS.get<Px>(i) == iRHS.get<Px>(i));
       CPPUNIT_ASSERT(iLHS.get<Py>(i) == iRHS.get<Py>(i));
       CPPUNIT_ASSERT(iLHS.get<Pz>(i) == iRHS.get<Pz>(i));
       CPPUNIT_ASSERT(iLHS.get<Energy>(i) == iRHS.get<Energy>(i));
     }
   };
-  
+
   CPPUNIT_ASSERT(particles.size() == 2);
-  compare(particlesStandard,particles,2);
+  compare(particlesStandard, particles, 2);
 
   particles.resize(4);
   CPPUNIT_ASSERT(particles.size() == 4);
-  compare(particles,particlesStandard,2);
-  
-  for(size_t i = 2; i<4; ++i) {
+  compare(particles, particlesStandard, 2);
+
+  for (size_t i = 2; i < 4; ++i) {
     CPPUNIT_ASSERT(particles.get<Px>(i) == 0.);
     CPPUNIT_ASSERT(particles.get<Py>(i) == 0.);
     CPPUNIT_ASSERT(particles.get<Pz>(i) == 0.);
     CPPUNIT_ASSERT(particles.get<Energy>(i) == 0.);
-
   }
-  
 }
 
 void testTable::mutabilityTest() {
   using namespace edm::soa;
   using namespace ts;
-  
-  std::array<double,3> eta={{1.,2.,4.}};
-  std::array<double,3> phi={{3.14,0.,1.3}};
-  JetTable jets{eta,phi};
+
+  std::array<double, 3> eta = {{1., 2., 4.}};
+  std::array<double, 3> phi = {{3.14, 0., 1.3}};
+  JetTable jets{eta, phi};
 
   jets.get<Eta>(0) = 0.;
   CPPUNIT_ASSERT(jets.get<Eta>(0) == 0.);
   jets.get<Phi>(1) = 0.03;
-  CPPUNIT_ASSERT(tolerance(jets.get<Phi>(1),0.03));
+  CPPUNIT_ASSERT(tolerance(jets.get<Phi>(1), 0.03));
 
   auto row = jets.row(2);
   CPPUNIT_ASSERT(row.get<Eta>() == 4.);
-  CPPUNIT_ASSERT(tolerance(row.get<Phi>(),1.3));
-  
+  CPPUNIT_ASSERT(tolerance(row.get<Phi>(), 1.3));
+
   row.copyValuesFrom(JetType{5., 6.});
   CPPUNIT_ASSERT(row.get<Eta>() == 5.);
   CPPUNIT_ASSERT(row.get<Phi>() == 6.);
-  
-  row.copyValuesFrom(JetType{7.,8.}, column_fillers(Phi::filler([](JetType const&) {return 9.;})));
+
+  row.copyValuesFrom(JetType{7., 8.}, column_fillers(Phi::filler([](JetType const&) { return 9.; })));
   CPPUNIT_ASSERT(row.get<Eta>() == 7.);
   CPPUNIT_ASSERT(row.get<Phi>() == 9.);
 
@@ -440,5 +420,4 @@ void testTable::mutabilityTest() {
   CPPUNIT_ASSERT(row.get<Phi>() == 10.);
 }
 
-
 #include <Utilities/Testing/interface/CppUnit_testdriver.icpp>
diff --git a/FWCore/ServiceRegistry/interface/ActivityRegistry.h b/FWCore/ServiceRegistry/interface/ActivityRegistry.h
index 00e00244d0748..d6eee80914b2b 100644
--- a/FWCore/ServiceRegistry/interface/ActivityRegistry.h
+++ b/FWCore/ServiceRegistry/interface/ActivityRegistry.h
@@ -4,7 +4,7 @@
 //
 // Package:     ServiceRegistry
 // Class  :     ActivityRegistry
-// 
+//
 /**\class ActivityRegistry ActivityRegistry.h FWCore/ServiceRegistry/interface/ActivityRegistry.h
 
  Description: Registry holding the signals that Services can subscribe to
@@ -60,583 +60,512 @@ to this file that go beyond the obvious cut and paste type of edits.
 #include "FWCore/Utilities/interface/Signal.h"
 #include "FWCore/Utilities/interface/StreamID.h"
 
-#define AR_WATCH_USING_METHOD_0(method) template<class TClass, class TMethod> void method (TClass* iObject, TMethod iMethod) { method (std::bind(std::mem_fn(iMethod), iObject)); }
-#define AR_WATCH_USING_METHOD_1(method) template<class TClass, class TMethod> void method (TClass* iObject, TMethod iMethod) { method (std::bind(std::mem_fn(iMethod), iObject, std::placeholders::_1)); }
-#define AR_WATCH_USING_METHOD_2(method) template<class TClass, class TMethod> void method (TClass* iObject, TMethod iMethod) { method (std::bind(std::mem_fn(iMethod), iObject, std::placeholders::_1, std::placeholders::_2)); }
-#define AR_WATCH_USING_METHOD_3(method) template<class TClass, class TMethod> void method (TClass* iObject, TMethod iMethod) { method (std::bind(std::mem_fn(iMethod), iObject, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)); }
+#define AR_WATCH_USING_METHOD_0(method)               \
+  template <class TClass, class TMethod>              \
+  void method(TClass* iObject, TMethod iMethod) {     \
+    method(std::bind(std::mem_fn(iMethod), iObject)); \
+  }
+#define AR_WATCH_USING_METHOD_1(method)                                      \
+  template <class TClass, class TMethod>                                     \
+  void method(TClass* iObject, TMethod iMethod) {                            \
+    method(std::bind(std::mem_fn(iMethod), iObject, std::placeholders::_1)); \
+  }
+#define AR_WATCH_USING_METHOD_2(method)                                                             \
+  template <class TClass, class TMethod>                                                            \
+  void method(TClass* iObject, TMethod iMethod) {                                                   \
+    method(std::bind(std::mem_fn(iMethod), iObject, std::placeholders::_1, std::placeholders::_2)); \
+  }
+#define AR_WATCH_USING_METHOD_3(method)                                                                       \
+  template <class TClass, class TMethod>                                                                      \
+  void method(TClass* iObject, TMethod iMethod) {                                                             \
+    method(std::bind(                                                                                         \
+        std::mem_fn(iMethod), iObject, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)); \
+  }
 // forward declarations
 namespace edm {
-   class EventID;
-   class LuminosityBlockID;
-   class RunID;
-   class Timestamp;
-   class ModuleDescription;
-   class Event;
-   class LuminosityBlock;
-   class Run;
-   class EventSetup;
-   class HLTPathStatus;
-   class GlobalContext;
-   class StreamContext;
-   class PathContext;
-   class ProcessContext;
-   class ModuleCallingContext;
-   class PathsAndConsumesOfModulesBase;
-   namespace eventsetup {
-      struct ComponentDescription;
-      class DataKey;
-      class EventSetupRecordKey;
-   }
-   namespace service {
-     class SystemBounds;
-   }
-  
-   namespace signalslot {
-      void throwObsoleteSignalException();
-      
-      template<class T>
-      class ObsoleteSignal {
-      public:
-         typedef std::function<T> slot_type;
-
-         ObsoleteSignal() = default;
-
-         template<typename U>
-         void connect(U /*  iFunc */) {
-            throwObsoleteSignalException();
-         }
-         
-         template<typename U>
-         void connect_front(U /*  iFunc*/) {
-            throwObsoleteSignalException();
-         }
-
-      };
-   }
-   class ActivityRegistry {
-   public:
-      ActivityRegistry() {}
-      ActivityRegistry(ActivityRegistry const&) = delete; // Disallow copying and moving
-      ActivityRegistry& operator=(ActivityRegistry const&) = delete; // Disallow copying and moving
-
-      // ---------- signals ------------------------------------
-      typedef signalslot::Signal<void(service::SystemBounds const&)> Preallocate;
-      ///signal is emitted before beginJob
-      Preallocate preallocateSignal_;
-      void watchPreallocate(Preallocate::slot_type const& iSlot) {
-        preallocateSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreallocate)
-
-
-      typedef signalslot::Signal<void(PathsAndConsumesOfModulesBase const&, ProcessContext const&)> PreBeginJob;
-      ///signal is emitted before all modules have gotten their beginJob called
-      PreBeginJob preBeginJobSignal_;
-      ///convenience function for attaching to signal
-      void watchPreBeginJob(PreBeginJob::slot_type const& iSlot) {
-         preBeginJobSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreBeginJob)
-
-      typedef signalslot::Signal<void()> PostBeginJob;
-      ///signal is emitted after all modules have gotten their beginJob called
-      PostBeginJob postBeginJobSignal_;
-      ///convenience function for attaching to signal
-      void watchPostBeginJob(PostBeginJob::slot_type const& iSlot) {
-         postBeginJobSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_0(watchPostBeginJob)
-
-      typedef signalslot::Signal<void()> PreEndJob;
-      ///signal is emitted before any modules have gotten their endJob called
-      PreEndJob preEndJobSignal_;
-      void watchPreEndJob(PreEndJob::slot_type const& iSlot) {
-         preEndJobSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_0(watchPreEndJob)
-
-      typedef signalslot::Signal<void()> PostEndJob;
-      ///signal is emitted after all modules have gotten their endJob called
-      PostEndJob postEndJobSignal_;
-      void watchPostEndJob(PostEndJob::slot_type const& iSlot) {
-         postEndJobSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_0(watchPostEndJob)
-
-      typedef signalslot::Signal<void()> JobFailure;
-      /// signal is emitted if event processing or end-of-job
-      /// processing fails with an uncaught exception.
-      JobFailure    jobFailureSignal_;
-      ///convenience function for attaching to signal
-      void watchJobFailure(JobFailure::slot_type const& iSlot) {
-         jobFailureSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_0(watchJobFailure)
-      
-      /// signal is emitted before the source starts creating an Event
-      typedef signalslot::Signal<void(StreamID)> PreSourceEvent;
-      PreSourceEvent preSourceSignal_;
-      void watchPreSourceEvent(PreSourceEvent::slot_type const& iSlot) {
-        preSourceSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreSourceEvent)
-
-      /// signal is emitted after the source starts creating an Event
-      typedef signalslot::Signal<void(StreamID)> PostSourceEvent;
-      PostSourceEvent postSourceSignal_;
-      void watchPostSourceEvent(PostSourceEvent::slot_type const& iSlot) {
-         postSourceSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPostSourceEvent)
-        
-      /// signal is emitted before the source starts creating a Lumi
-      typedef signalslot::Signal<void(LuminosityBlockIndex)> PreSourceLumi;
-      PreSourceLumi preSourceLumiSignal_;
-      void watchPreSourceLumi(PreSourceLumi::slot_type const& iSlot) {
-        preSourceLumiSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreSourceLumi)
-
-      /// signal is emitted after the source starts creating a Lumi
-      typedef signalslot::Signal<void(LuminosityBlockIndex)> PostSourceLumi;
-      PostSourceLumi postSourceLumiSignal_;
-      void watchPostSourceLumi(PostSourceLumi::slot_type const& iSlot) {
-         postSourceLumiSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPostSourceLumi)
-        
-      /// signal is emitted before the source starts creating a Run
-      typedef signalslot::Signal<void(RunIndex)> PreSourceRun;
-      PreSourceRun preSourceRunSignal_;
-      void watchPreSourceRun(PreSourceRun::slot_type const& iSlot) {
-        preSourceRunSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreSourceRun)
-
-      /// signal is emitted after the source starts creating a Run
-      typedef signalslot::Signal<void(RunIndex)> PostSourceRun;
-      PostSourceRun postSourceRunSignal_;
-      void watchPostSourceRun(PostSourceRun::slot_type const& iSlot) {
-         postSourceRunSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPostSourceRun)
-        
-      /// signal is emitted before the source opens a file
-      typedef signalslot::Signal<void(std::string const&, bool)> PreOpenFile;
-      PreOpenFile preOpenFileSignal_;
-      void watchPreOpenFile(PreOpenFile::slot_type const& iSlot) {
-        preOpenFileSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreOpenFile)
-
-      /// signal is emitted after the source opens a file
-      //   Note this is only done for a primary file, not a secondary one.
-      typedef signalslot::Signal<void(std::string const&, bool)> PostOpenFile;
-      PostOpenFile postOpenFileSignal_;
-      void watchPostOpenFile(PostOpenFile::slot_type const& iSlot) {
-         postOpenFileSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostOpenFile)
-        
-      /// signal is emitted before the Closesource closes a file
-      //   First argument is the LFN of the file which is being closed.
-      //   Second argument is false if fallback is used; true otherwise.
-      typedef signalslot::Signal<void(std::string const&, bool)> PreCloseFile;
-      PreCloseFile preCloseFileSignal_;
-      void watchPreCloseFile(PreCloseFile::slot_type const& iSlot) {
-        preCloseFileSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreCloseFile)
-
-      /// signal is emitted after the source opens a file
-      typedef signalslot::Signal<void(std::string const&, bool)> PostCloseFile;
-      PostCloseFile postCloseFileSignal_;
-      void watchPostCloseFile(PostCloseFile::slot_type const& iSlot) {
-         postCloseFileSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostCloseFile)
-
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleBeginStream;
-      PreModuleBeginStream preModuleBeginStreamSignal_;
-      void watchPreModuleBeginStream(PreModuleBeginStream::slot_type const& iSlot) {
-         preModuleBeginStreamSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreModuleBeginStream)
-        
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleBeginStream;
-      PostModuleBeginStream postModuleBeginStreamSignal_;
-      void watchPostModuleBeginStream(PostModuleBeginStream::slot_type const& iSlot) {
-         postModuleBeginStreamSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostModuleBeginStream)
-        
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleEndStream;
-      PreModuleEndStream preModuleEndStreamSignal_;
-      void watchPreModuleEndStream(PreModuleEndStream::slot_type const& iSlot) {
-         preModuleEndStreamSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreModuleEndStream)
-        
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleEndStream;
-      PostModuleEndStream postModuleEndStreamSignal_;
-      void watchPostModuleEndStream(PostModuleEndStream::slot_type const& iSlot) {
-         postModuleEndStreamSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostModuleEndStream)
-
-      typedef signalslot::Signal<void(GlobalContext const&)> PreGlobalBeginRun;
-      /// signal is emitted after the Run has been created by the InputSource but before any modules have seen the Run
-      PreGlobalBeginRun preGlobalBeginRunSignal_;
-      void watchPreGlobalBeginRun(PreGlobalBeginRun::slot_type const& iSlot) {
-         preGlobalBeginRunSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreGlobalBeginRun)
-
-      typedef signalslot::Signal<void(GlobalContext const&)> PostGlobalBeginRun;
-      PostGlobalBeginRun postGlobalBeginRunSignal_;
-      void watchPostGlobalBeginRun(PostGlobalBeginRun::slot_type const& iSlot) {
-         postGlobalBeginRunSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPostGlobalBeginRun)
-      
-      typedef signalslot::Signal<void(GlobalContext const&)> PreGlobalEndRun;
-      PreGlobalEndRun preGlobalEndRunSignal_;
-      void watchPreGlobalEndRun(PreGlobalEndRun::slot_type const& iSlot) {
-         preGlobalEndRunSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreGlobalEndRun)
-
-        typedef signalslot::Signal<void(GlobalContext const&)> PostGlobalEndRun;
-      PostGlobalEndRun postGlobalEndRunSignal_;
-      void watchPostGlobalEndRun(PostGlobalEndRun::slot_type const& iSlot) {
-         postGlobalEndRunSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPostGlobalEndRun)
-      
-      typedef signalslot::Signal<void(StreamContext const&)> PreStreamBeginRun;
-      PreStreamBeginRun preStreamBeginRunSignal_;
-      void watchPreStreamBeginRun(PreStreamBeginRun::slot_type const& iSlot) {
-         preStreamBeginRunSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreStreamBeginRun)
-
-      typedef signalslot::Signal<void(StreamContext const&)> PostStreamBeginRun;
-      PostStreamBeginRun postStreamBeginRunSignal_;
-      void watchPostStreamBeginRun(PostStreamBeginRun::slot_type const& iSlot) {
-         postStreamBeginRunSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPostStreamBeginRun)
-      
-      typedef signalslot::Signal<void(StreamContext const&)> PreStreamEndRun;
-      PreStreamEndRun preStreamEndRunSignal_;
-      void watchPreStreamEndRun(PreStreamEndRun::slot_type const& iSlot) {
-         preStreamEndRunSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreStreamEndRun)
-
-      typedef signalslot::Signal<void(StreamContext const&)> PostStreamEndRun;
-      PostStreamEndRun postStreamEndRunSignal_;
-      void watchPostStreamEndRun(PostStreamEndRun::slot_type const& iSlot) {
-         postStreamEndRunSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPostStreamEndRun)
-      
-      typedef signalslot::Signal<void(GlobalContext const&)> PreGlobalBeginLumi;
-      PreGlobalBeginLumi preGlobalBeginLumiSignal_;
-      void watchPreGlobalBeginLumi(PreGlobalBeginLumi::slot_type const& iSlot) {
-         preGlobalBeginLumiSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreGlobalBeginLumi)
-
-      typedef signalslot::Signal<void(GlobalContext const&)> PostGlobalBeginLumi;
-      PostGlobalBeginLumi postGlobalBeginLumiSignal_;
-      void watchPostGlobalBeginLumi(PostGlobalBeginLumi::slot_type const& iSlot) {
-         postGlobalBeginLumiSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPostGlobalBeginLumi)
-      
-      typedef signalslot::Signal<void(GlobalContext const&)> PreGlobalEndLumi;
-      PreGlobalEndLumi preGlobalEndLumiSignal_;
-      void watchPreGlobalEndLumi(PreGlobalEndLumi::slot_type const& iSlot) {
-         preGlobalEndLumiSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreGlobalEndLumi)
-
-      typedef signalslot::Signal<void(GlobalContext const&)> PostGlobalEndLumi;
-      PostGlobalEndLumi postGlobalEndLumiSignal_;
-      void watchPostGlobalEndLumi(PostGlobalEndLumi::slot_type const& iSlot) {
-         postGlobalEndLumiSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPostGlobalEndLumi)
-      
-      typedef signalslot::Signal<void(StreamContext const&)> PreStreamBeginLumi;
-      PreStreamBeginLumi preStreamBeginLumiSignal_;
-      void watchPreStreamBeginLumi(PreStreamBeginLumi::slot_type const& iSlot) {
-         preStreamBeginLumiSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreStreamBeginLumi)
-
-      typedef signalslot::Signal<void(StreamContext const&)> PostStreamBeginLumi;
-      PostStreamBeginLumi postStreamBeginLumiSignal_;
-      void watchPostStreamBeginLumi(PostStreamBeginLumi::slot_type const& iSlot) {
-         postStreamBeginLumiSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPostStreamBeginLumi)
-      
-      typedef signalslot::Signal<void(StreamContext const&)> PreStreamEndLumi;
-      PreStreamEndLumi preStreamEndLumiSignal_;
-      void watchPreStreamEndLumi(PreStreamEndLumi::slot_type const& iSlot) {
-         preStreamEndLumiSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreStreamEndLumi)
-
-      typedef signalslot::Signal<void(StreamContext const&)> PostStreamEndLumi;
-      PostStreamEndLumi postStreamEndLumiSignal_;
-      void watchPostStreamEndLumi(PostStreamEndLumi::slot_type const& iSlot) {
-         postStreamEndLumiSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPostStreamEndLumi)
-
-      typedef signalslot::Signal<void(StreamContext const&)> PreEvent;
-      /// signal is emitted after the Event has been created by the InputSource but before any modules have seen the Event
-      PreEvent preEventSignal_;
-      void watchPreEvent(PreEvent::slot_type const& iSlot) {
-         preEventSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreEvent)
-
-      typedef signalslot::Signal<void(StreamContext const&)> PostEvent;
-      /// signal is emitted after all modules have finished processing the Event
-      PostEvent postEventSignal_;
-      void watchPostEvent(PostEvent::slot_type const& iSlot) {
-         postEventSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPostEvent)
-
-      /// signal is emitted before starting to process a Path for an event
-        typedef signalslot::Signal<void(StreamContext const&, PathContext const&)> PrePathEvent;
-      PrePathEvent prePathEventSignal_;
-      void watchPrePathEvent(PrePathEvent::slot_type const& iSlot) {
-        prePathEventSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPrePathEvent)
-
-      /// signal is emitted after all modules have finished for the Path for an event
-      typedef signalslot::Signal<void(StreamContext const&, PathContext const&, HLTPathStatus const&)> PostPathEvent;
-      PostPathEvent postPathEventSignal_;
-      void watchPostPathEvent(PostPathEvent::slot_type const& iSlot) {
-         postPathEventSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_3(watchPostPathEvent)
-      
-      /// signal is emitted when began processing a stream transition and
-      ///  then we began terminating the application
-      typedef signalslot::Signal<void(StreamContext const&, TerminationOrigin)> PreStreamEarlyTermination;
-      PreStreamEarlyTermination preStreamEarlyTerminationSignal_;
-      void watchPreStreamEarlyTermination(PreStreamEarlyTermination::slot_type const& iSlot) {
-         preStreamEarlyTerminationSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreStreamEarlyTermination)
-
-      /// signal is emitted if a began processing a global transition and
-      ///  then we began terminating the application
-      typedef signalslot::Signal<void(GlobalContext const&, TerminationOrigin)> PreGlobalEarlyTermination;
-      PreGlobalEarlyTermination preGlobalEarlyTerminationSignal_;
-      void watchPreGlobalEarlyTermination(PreGlobalEarlyTermination::slot_type const& iSlot) {
-         preGlobalEarlyTerminationSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreGlobalEarlyTermination)
-
-      /// signal is emitted if while communicating with a source we began terminating
-      ///  the application
-      typedef signalslot::Signal<void(TerminationOrigin)> PreSourceEarlyTermination;
-      PreSourceEarlyTermination preSourceEarlyTerminationSignal_;
-      void watchPreSourceEarlyTermination(PreSourceEarlyTermination::slot_type const& iSlot) {
-         preSourceEarlyTerminationSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreSourceEarlyTermination)
-
-      // OLD DELETE THIS
-      typedef signalslot::ObsoleteSignal<void(EventID const&, Timestamp const&)> PreProcessEvent;
-      /// signal is emitted after the Event has been created by the InputSource but before any modules have seen the Event
-      PreProcessEvent preProcessEventSignal_;
-      void watchPreProcessEvent(PreProcessEvent::slot_type const& iSlot) {
-         preProcessEventSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreProcessEvent)
-      
-      // OLD DELETE THIS
-      typedef signalslot::ObsoleteSignal<void(Event const&, EventSetup const&)> PostProcessEvent;
-      /// signal is emitted after all modules have finished processing the Event
-      PostProcessEvent postProcessEventSignal_;
-      void watchPostProcessEvent(PostProcessEvent::slot_type const& iSlot) {
-         postProcessEventSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostProcessEvent)
-
-      // OLD DELETE THIS
-      typedef signalslot::ObsoleteSignal<void(RunID const&, Timestamp const&)> PreBeginRun;
-      /// signal is emitted after the Run has been created by the InputSource but before any modules have seen the Run
-      PreBeginRun preBeginRunSignal_;
-      void watchPreBeginRun(PreBeginRun::slot_type const& iSlot) {
-         preBeginRunSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreBeginRun)
-      
-      // OLD DELETE THIS
-      typedef signalslot::ObsoleteSignal<void(Run const&, EventSetup const&)> PostBeginRun;
-      /// signal is emitted after all modules have finished processing the beginRun 
-      PostBeginRun postBeginRunSignal_;
-      void watchPostBeginRun(PostBeginRun::slot_type const& iSlot) {
-         postBeginRunSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostBeginRun)
-
-      // OLD DELETE THIS
-      typedef signalslot::ObsoleteSignal<void(RunID const&, Timestamp const&)> PreEndRun;
-      /// signal is emitted before the endRun is processed
-      PreEndRun preEndRunSignal_;
-      void watchPreEndRun(PreEndRun::slot_type const& iSlot) {
-         preEndRunSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreEndRun)
-      
-      // OLD DELETE THIS
-      typedef signalslot::ObsoleteSignal<void(Run const&, EventSetup const&)> PostEndRun;
-      /// signal is emitted after all modules have finished processing the Run
-      PostEndRun postEndRunSignal_;
-      void watchPostEndRun(PostEndRun::slot_type const& iSlot) {
-         postEndRunSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostEndRun)
-
-      // OLD DELETE THIS
-      typedef signalslot::ObsoleteSignal<void(LuminosityBlockID const&, Timestamp const&)> PreBeginLumi;
-      /// signal is emitted after the Lumi has been created by the InputSource but before any modules have seen the Lumi
-      PreBeginLumi preBeginLumiSignal_;
-      void watchPreBeginLumi(PreBeginLumi::slot_type const& iSlot) {
-         preBeginLumiSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreBeginLumi)
-      
-      // OLD DELETE THIS
-      typedef signalslot::ObsoleteSignal<void(LuminosityBlock const&, EventSetup const&)> PostBeginLumi;
-      /// signal is emitted after all modules have finished processing the beginLumi
-      PostBeginLumi postBeginLumiSignal_;
-      void watchPostBeginLumi(PostBeginLumi::slot_type const& iSlot) {
-         postBeginLumiSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostBeginLumi)
-
-      // OLD DELETE THIS
-      typedef signalslot::ObsoleteSignal<void(LuminosityBlockID const&, Timestamp const&)> PreEndLumi;
-      /// signal is emitted before the endLumi is processed
-      PreEndLumi preEndLumiSignal_;
-      void watchPreEndLumi(PreEndLumi::slot_type const& iSlot) {
-         preEndLumiSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreEndLumi)
-      
-      // OLD DELETE THIS
-      typedef signalslot::ObsoleteSignal<void(LuminosityBlock const&, EventSetup const&)> PostEndLumi;
-      /// signal is emitted after all modules have finished processing the Lumi
-      PostEndLumi postEndLumiSignal_;
-      void watchPostEndLumi(PostEndLumi::slot_type const& iSlot) {
-         postEndLumiSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostEndLumi)
-
-      // OLD DELETE THIS
-      /// signal is emitted before starting to process a Path for an event
-      typedef signalslot::ObsoleteSignal<void(std::string const&)> PreProcessPath;
-      PreProcessPath preProcessPathSignal_;
-      void watchPreProcessPath(PreProcessPath::slot_type const& iSlot) {
-        preProcessPathSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreProcessPath)
-        
-      // OLD DELETE THIS
-      /// signal is emitted after all modules have finished for the Path for an event
-      typedef signalslot::ObsoleteSignal<void(std::string const&, HLTPathStatus const&)> PostProcessPath;
-      PostProcessPath postProcessPathSignal_;
-      void watchPostProcessPath(PostProcessPath::slot_type const& iSlot) {
-         postProcessPathSignal_.connect_front(iSlot);
-      }  
-      AR_WATCH_USING_METHOD_2(watchPostProcessPath)
-        
-      // OLD DELETE THIS
-      /// signal is emitted before starting to process a Path for beginRun
-      typedef signalslot::ObsoleteSignal<void(std::string const&)> PrePathBeginRun;
-      PrePathBeginRun prePathBeginRunSignal_;
-      void watchPrePathBeginRun(PrePathBeginRun::slot_type const& iSlot) {
-        prePathBeginRunSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPrePathBeginRun)
-        
-      // OLD DELETE THIS
-      /// signal is emitted after all modules have finished for the Path for beginRun
-      typedef signalslot::ObsoleteSignal<void(std::string const&, HLTPathStatus const&)> PostPathBeginRun;
-      PostPathBeginRun postPathBeginRunSignal_;
-      void watchPostPathBeginRun(PostPathBeginRun::slot_type const& iSlot) {
-         postPathBeginRunSignal_.connect_front(iSlot);
-      }  
-      AR_WATCH_USING_METHOD_2(watchPostPathBeginRun)
-        
-      // OLD DELETE THIS
-      /// signal is emitted before starting to process a Path for endRun
-      typedef signalslot::ObsoleteSignal<void(std::string const&)> PrePathEndRun;
-      PrePathEndRun prePathEndRunSignal_;
-      void watchPrePathEndRun(PrePathEndRun::slot_type const& iSlot) {
-        prePathEndRunSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPrePathEndRun)
-        
-      // OLD DELETE THIS
-      /// signal is emitted after all modules have finished for the Path for endRun
-      typedef signalslot::ObsoleteSignal<void(std::string const&, HLTPathStatus const&)> PostPathEndRun;
-      PostPathEndRun postPathEndRunSignal_;
-      void watchPostPathEndRun(PostPathEndRun::slot_type const& iSlot) {
-         postPathEndRunSignal_.connect_front(iSlot);
-      }  
-      AR_WATCH_USING_METHOD_2(watchPostPathEndRun)
-        
-      // OLD DELETE THIS
-      /// signal is emitted before starting to process a Path for beginLumi
-      typedef signalslot::ObsoleteSignal<void(std::string const&)> PrePathBeginLumi;
-      PrePathBeginLumi prePathBeginLumiSignal_;
-      void watchPrePathBeginLumi(PrePathBeginLumi::slot_type const& iSlot) {
-        prePathBeginLumiSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPrePathBeginLumi)
-        
-      // OLD DELETE THIS
-      /// signal is emitted after all modules have finished for the Path for beginLumi
-      typedef signalslot::ObsoleteSignal<void(std::string const&, HLTPathStatus const&)> PostPathBeginLumi;
-      PostPathBeginLumi postPathBeginLumiSignal_;
-      void watchPostPathBeginLumi(PostPathBeginLumi::slot_type const& iSlot) {
-         postPathBeginLumiSignal_.connect_front(iSlot);
-      }  
-      AR_WATCH_USING_METHOD_2(watchPostPathBeginLumi)
-        
-      // OLD DELETE THIS
-      /// signal is emitted before starting to process a Path for endRun
-      typedef signalslot::ObsoleteSignal<void(std::string const&)> PrePathEndLumi;
-      PrePathEndLumi prePathEndLumiSignal_;
-      void watchPrePathEndLumi(PrePathEndLumi::slot_type const& iSlot) {
-        prePathEndLumiSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPrePathEndLumi)
-        
-      // OLD DELETE THIS
-      /// signal is emitted after all modules have finished for the Path for endRun
-      typedef signalslot::ObsoleteSignal<void(std::string const&, HLTPathStatus const&)> PostPathEndLumi;
-      PostPathEndLumi postPathEndLumiSignal_;
-      void watchPostPathEndLumi(PostPathEndLumi::slot_type const& iSlot) {
-         postPathEndLumiSignal_.connect_front(iSlot);
-      }  
-      AR_WATCH_USING_METHOD_2(watchPostPathEndLumi)
-
-	/* Note M:
+  class EventID;
+  class LuminosityBlockID;
+  class RunID;
+  class Timestamp;
+  class ModuleDescription;
+  class Event;
+  class LuminosityBlock;
+  class Run;
+  class EventSetup;
+  class HLTPathStatus;
+  class GlobalContext;
+  class StreamContext;
+  class PathContext;
+  class ProcessContext;
+  class ModuleCallingContext;
+  class PathsAndConsumesOfModulesBase;
+  namespace eventsetup {
+    struct ComponentDescription;
+    class DataKey;
+    class EventSetupRecordKey;
+  }  // namespace eventsetup
+  namespace service {
+    class SystemBounds;
+  }
+
+  namespace signalslot {
+    void throwObsoleteSignalException();
+
+    template <class T>
+    class ObsoleteSignal {
+    public:
+      typedef std::function<T> slot_type;
+
+      ObsoleteSignal() = default;
+
+      template <typename U>
+      void connect(U /*  iFunc */) {
+        throwObsoleteSignalException();
+      }
+
+      template <typename U>
+      void connect_front(U /*  iFunc*/) {
+        throwObsoleteSignalException();
+      }
+    };
+  }  // namespace signalslot
+  class ActivityRegistry {
+  public:
+    ActivityRegistry() {}
+    ActivityRegistry(ActivityRegistry const&) = delete;             // Disallow copying and moving
+    ActivityRegistry& operator=(ActivityRegistry const&) = delete;  // Disallow copying and moving
+
+    // ---------- signals ------------------------------------
+    typedef signalslot::Signal<void(service::SystemBounds const&)> Preallocate;
+    ///signal is emitted before beginJob
+    Preallocate preallocateSignal_;
+    void watchPreallocate(Preallocate::slot_type const& iSlot) { preallocateSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPreallocate)
+
+    typedef signalslot::Signal<void(PathsAndConsumesOfModulesBase const&, ProcessContext const&)> PreBeginJob;
+    ///signal is emitted before all modules have gotten their beginJob called
+    PreBeginJob preBeginJobSignal_;
+    ///convenience function for attaching to signal
+    void watchPreBeginJob(PreBeginJob::slot_type const& iSlot) { preBeginJobSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPreBeginJob)
+
+    typedef signalslot::Signal<void()> PostBeginJob;
+    ///signal is emitted after all modules have gotten their beginJob called
+    PostBeginJob postBeginJobSignal_;
+    ///convenience function for attaching to signal
+    void watchPostBeginJob(PostBeginJob::slot_type const& iSlot) { postBeginJobSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_0(watchPostBeginJob)
+
+    typedef signalslot::Signal<void()> PreEndJob;
+    ///signal is emitted before any modules have gotten their endJob called
+    PreEndJob preEndJobSignal_;
+    void watchPreEndJob(PreEndJob::slot_type const& iSlot) { preEndJobSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_0(watchPreEndJob)
+
+    typedef signalslot::Signal<void()> PostEndJob;
+    ///signal is emitted after all modules have gotten their endJob called
+    PostEndJob postEndJobSignal_;
+    void watchPostEndJob(PostEndJob::slot_type const& iSlot) { postEndJobSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_0(watchPostEndJob)
+
+    typedef signalslot::Signal<void()> JobFailure;
+    /// signal is emitted if event processing or end-of-job
+    /// processing fails with an uncaught exception.
+    JobFailure jobFailureSignal_;
+    ///convenience function for attaching to signal
+    void watchJobFailure(JobFailure::slot_type const& iSlot) { jobFailureSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_0(watchJobFailure)
+
+    /// signal is emitted before the source starts creating an Event
+    typedef signalslot::Signal<void(StreamID)> PreSourceEvent;
+    PreSourceEvent preSourceSignal_;
+    void watchPreSourceEvent(PreSourceEvent::slot_type const& iSlot) { preSourceSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPreSourceEvent)
+
+    /// signal is emitted after the source starts creating an Event
+    typedef signalslot::Signal<void(StreamID)> PostSourceEvent;
+    PostSourceEvent postSourceSignal_;
+    void watchPostSourceEvent(PostSourceEvent::slot_type const& iSlot) { postSourceSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPostSourceEvent)
+
+    /// signal is emitted before the source starts creating a Lumi
+    typedef signalslot::Signal<void(LuminosityBlockIndex)> PreSourceLumi;
+    PreSourceLumi preSourceLumiSignal_;
+    void watchPreSourceLumi(PreSourceLumi::slot_type const& iSlot) { preSourceLumiSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPreSourceLumi)
+
+    /// signal is emitted after the source starts creating a Lumi
+    typedef signalslot::Signal<void(LuminosityBlockIndex)> PostSourceLumi;
+    PostSourceLumi postSourceLumiSignal_;
+    void watchPostSourceLumi(PostSourceLumi::slot_type const& iSlot) { postSourceLumiSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPostSourceLumi)
+
+    /// signal is emitted before the source starts creating a Run
+    typedef signalslot::Signal<void(RunIndex)> PreSourceRun;
+    PreSourceRun preSourceRunSignal_;
+    void watchPreSourceRun(PreSourceRun::slot_type const& iSlot) { preSourceRunSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPreSourceRun)
+
+    /// signal is emitted after the source starts creating a Run
+    typedef signalslot::Signal<void(RunIndex)> PostSourceRun;
+    PostSourceRun postSourceRunSignal_;
+    void watchPostSourceRun(PostSourceRun::slot_type const& iSlot) { postSourceRunSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPostSourceRun)
+
+    /// signal is emitted before the source opens a file
+    typedef signalslot::Signal<void(std::string const&, bool)> PreOpenFile;
+    PreOpenFile preOpenFileSignal_;
+    void watchPreOpenFile(PreOpenFile::slot_type const& iSlot) { preOpenFileSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPreOpenFile)
+
+    /// signal is emitted after the source opens a file
+    //   Note this is only done for a primary file, not a secondary one.
+    typedef signalslot::Signal<void(std::string const&, bool)> PostOpenFile;
+    PostOpenFile postOpenFileSignal_;
+    void watchPostOpenFile(PostOpenFile::slot_type const& iSlot) { postOpenFileSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPostOpenFile)
+
+    /// signal is emitted before the Closesource closes a file
+    //   First argument is the LFN of the file which is being closed.
+    //   Second argument is false if fallback is used; true otherwise.
+    typedef signalslot::Signal<void(std::string const&, bool)> PreCloseFile;
+    PreCloseFile preCloseFileSignal_;
+    void watchPreCloseFile(PreCloseFile::slot_type const& iSlot) { preCloseFileSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPreCloseFile)
+
+    /// signal is emitted after the source opens a file
+    typedef signalslot::Signal<void(std::string const&, bool)> PostCloseFile;
+    PostCloseFile postCloseFileSignal_;
+    void watchPostCloseFile(PostCloseFile::slot_type const& iSlot) { postCloseFileSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPostCloseFile)
+
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleBeginStream;
+    PreModuleBeginStream preModuleBeginStreamSignal_;
+    void watchPreModuleBeginStream(PreModuleBeginStream::slot_type const& iSlot) {
+      preModuleBeginStreamSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPreModuleBeginStream)
+
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleBeginStream;
+    PostModuleBeginStream postModuleBeginStreamSignal_;
+    void watchPostModuleBeginStream(PostModuleBeginStream::slot_type const& iSlot) {
+      postModuleBeginStreamSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostModuleBeginStream)
+
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleEndStream;
+    PreModuleEndStream preModuleEndStreamSignal_;
+    void watchPreModuleEndStream(PreModuleEndStream::slot_type const& iSlot) {
+      preModuleEndStreamSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPreModuleEndStream)
+
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleEndStream;
+    PostModuleEndStream postModuleEndStreamSignal_;
+    void watchPostModuleEndStream(PostModuleEndStream::slot_type const& iSlot) {
+      postModuleEndStreamSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostModuleEndStream)
+
+    typedef signalslot::Signal<void(GlobalContext const&)> PreGlobalBeginRun;
+    /// signal is emitted after the Run has been created by the InputSource but before any modules have seen the Run
+    PreGlobalBeginRun preGlobalBeginRunSignal_;
+    void watchPreGlobalBeginRun(PreGlobalBeginRun::slot_type const& iSlot) { preGlobalBeginRunSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPreGlobalBeginRun)
+
+    typedef signalslot::Signal<void(GlobalContext const&)> PostGlobalBeginRun;
+    PostGlobalBeginRun postGlobalBeginRunSignal_;
+    void watchPostGlobalBeginRun(PostGlobalBeginRun::slot_type const& iSlot) {
+      postGlobalBeginRunSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_1(watchPostGlobalBeginRun)
+
+    typedef signalslot::Signal<void(GlobalContext const&)> PreGlobalEndRun;
+    PreGlobalEndRun preGlobalEndRunSignal_;
+    void watchPreGlobalEndRun(PreGlobalEndRun::slot_type const& iSlot) { preGlobalEndRunSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPreGlobalEndRun)
+
+    typedef signalslot::Signal<void(GlobalContext const&)> PostGlobalEndRun;
+    PostGlobalEndRun postGlobalEndRunSignal_;
+    void watchPostGlobalEndRun(PostGlobalEndRun::slot_type const& iSlot) {
+      postGlobalEndRunSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_1(watchPostGlobalEndRun)
+
+    typedef signalslot::Signal<void(StreamContext const&)> PreStreamBeginRun;
+    PreStreamBeginRun preStreamBeginRunSignal_;
+    void watchPreStreamBeginRun(PreStreamBeginRun::slot_type const& iSlot) { preStreamBeginRunSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPreStreamBeginRun)
+
+    typedef signalslot::Signal<void(StreamContext const&)> PostStreamBeginRun;
+    PostStreamBeginRun postStreamBeginRunSignal_;
+    void watchPostStreamBeginRun(PostStreamBeginRun::slot_type const& iSlot) {
+      postStreamBeginRunSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_1(watchPostStreamBeginRun)
+
+    typedef signalslot::Signal<void(StreamContext const&)> PreStreamEndRun;
+    PreStreamEndRun preStreamEndRunSignal_;
+    void watchPreStreamEndRun(PreStreamEndRun::slot_type const& iSlot) { preStreamEndRunSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPreStreamEndRun)
+
+    typedef signalslot::Signal<void(StreamContext const&)> PostStreamEndRun;
+    PostStreamEndRun postStreamEndRunSignal_;
+    void watchPostStreamEndRun(PostStreamEndRun::slot_type const& iSlot) {
+      postStreamEndRunSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_1(watchPostStreamEndRun)
+
+    typedef signalslot::Signal<void(GlobalContext const&)> PreGlobalBeginLumi;
+    PreGlobalBeginLumi preGlobalBeginLumiSignal_;
+    void watchPreGlobalBeginLumi(PreGlobalBeginLumi::slot_type const& iSlot) {
+      preGlobalBeginLumiSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_1(watchPreGlobalBeginLumi)
+
+    typedef signalslot::Signal<void(GlobalContext const&)> PostGlobalBeginLumi;
+    PostGlobalBeginLumi postGlobalBeginLumiSignal_;
+    void watchPostGlobalBeginLumi(PostGlobalBeginLumi::slot_type const& iSlot) {
+      postGlobalBeginLumiSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_1(watchPostGlobalBeginLumi)
+
+    typedef signalslot::Signal<void(GlobalContext const&)> PreGlobalEndLumi;
+    PreGlobalEndLumi preGlobalEndLumiSignal_;
+    void watchPreGlobalEndLumi(PreGlobalEndLumi::slot_type const& iSlot) { preGlobalEndLumiSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPreGlobalEndLumi)
+
+    typedef signalslot::Signal<void(GlobalContext const&)> PostGlobalEndLumi;
+    PostGlobalEndLumi postGlobalEndLumiSignal_;
+    void watchPostGlobalEndLumi(PostGlobalEndLumi::slot_type const& iSlot) {
+      postGlobalEndLumiSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_1(watchPostGlobalEndLumi)
+
+    typedef signalslot::Signal<void(StreamContext const&)> PreStreamBeginLumi;
+    PreStreamBeginLumi preStreamBeginLumiSignal_;
+    void watchPreStreamBeginLumi(PreStreamBeginLumi::slot_type const& iSlot) {
+      preStreamBeginLumiSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_1(watchPreStreamBeginLumi)
+
+    typedef signalslot::Signal<void(StreamContext const&)> PostStreamBeginLumi;
+    PostStreamBeginLumi postStreamBeginLumiSignal_;
+    void watchPostStreamBeginLumi(PostStreamBeginLumi::slot_type const& iSlot) {
+      postStreamBeginLumiSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_1(watchPostStreamBeginLumi)
+
+    typedef signalslot::Signal<void(StreamContext const&)> PreStreamEndLumi;
+    PreStreamEndLumi preStreamEndLumiSignal_;
+    void watchPreStreamEndLumi(PreStreamEndLumi::slot_type const& iSlot) { preStreamEndLumiSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPreStreamEndLumi)
+
+    typedef signalslot::Signal<void(StreamContext const&)> PostStreamEndLumi;
+    PostStreamEndLumi postStreamEndLumiSignal_;
+    void watchPostStreamEndLumi(PostStreamEndLumi::slot_type const& iSlot) {
+      postStreamEndLumiSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_1(watchPostStreamEndLumi)
+
+    typedef signalslot::Signal<void(StreamContext const&)> PreEvent;
+    /// signal is emitted after the Event has been created by the InputSource but before any modules have seen the Event
+    PreEvent preEventSignal_;
+    void watchPreEvent(PreEvent::slot_type const& iSlot) { preEventSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPreEvent)
+
+    typedef signalslot::Signal<void(StreamContext const&)> PostEvent;
+    /// signal is emitted after all modules have finished processing the Event
+    PostEvent postEventSignal_;
+    void watchPostEvent(PostEvent::slot_type const& iSlot) { postEventSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPostEvent)
+
+    /// signal is emitted before starting to process a Path for an event
+    typedef signalslot::Signal<void(StreamContext const&, PathContext const&)> PrePathEvent;
+    PrePathEvent prePathEventSignal_;
+    void watchPrePathEvent(PrePathEvent::slot_type const& iSlot) { prePathEventSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPrePathEvent)
+
+    /// signal is emitted after all modules have finished for the Path for an event
+    typedef signalslot::Signal<void(StreamContext const&, PathContext const&, HLTPathStatus const&)> PostPathEvent;
+    PostPathEvent postPathEventSignal_;
+    void watchPostPathEvent(PostPathEvent::slot_type const& iSlot) { postPathEventSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_3(watchPostPathEvent)
+
+    /// signal is emitted when began processing a stream transition and
+    ///  then we began terminating the application
+    typedef signalslot::Signal<void(StreamContext const&, TerminationOrigin)> PreStreamEarlyTermination;
+    PreStreamEarlyTermination preStreamEarlyTerminationSignal_;
+    void watchPreStreamEarlyTermination(PreStreamEarlyTermination::slot_type const& iSlot) {
+      preStreamEarlyTerminationSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPreStreamEarlyTermination)
+
+    /// signal is emitted if a began processing a global transition and
+    ///  then we began terminating the application
+    typedef signalslot::Signal<void(GlobalContext const&, TerminationOrigin)> PreGlobalEarlyTermination;
+    PreGlobalEarlyTermination preGlobalEarlyTerminationSignal_;
+    void watchPreGlobalEarlyTermination(PreGlobalEarlyTermination::slot_type const& iSlot) {
+      preGlobalEarlyTerminationSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPreGlobalEarlyTermination)
+
+    /// signal is emitted if while communicating with a source we began terminating
+    ///  the application
+    typedef signalslot::Signal<void(TerminationOrigin)> PreSourceEarlyTermination;
+    PreSourceEarlyTermination preSourceEarlyTerminationSignal_;
+    void watchPreSourceEarlyTermination(PreSourceEarlyTermination::slot_type const& iSlot) {
+      preSourceEarlyTerminationSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_1(watchPreSourceEarlyTermination)
+
+    // OLD DELETE THIS
+    typedef signalslot::ObsoleteSignal<void(EventID const&, Timestamp const&)> PreProcessEvent;
+    /// signal is emitted after the Event has been created by the InputSource but before any modules have seen the Event
+    PreProcessEvent preProcessEventSignal_;
+    void watchPreProcessEvent(PreProcessEvent::slot_type const& iSlot) { preProcessEventSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPreProcessEvent)
+
+    // OLD DELETE THIS
+    typedef signalslot::ObsoleteSignal<void(Event const&, EventSetup const&)> PostProcessEvent;
+    /// signal is emitted after all modules have finished processing the Event
+    PostProcessEvent postProcessEventSignal_;
+    void watchPostProcessEvent(PostProcessEvent::slot_type const& iSlot) {
+      postProcessEventSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostProcessEvent)
+
+    // OLD DELETE THIS
+    typedef signalslot::ObsoleteSignal<void(RunID const&, Timestamp const&)> PreBeginRun;
+    /// signal is emitted after the Run has been created by the InputSource but before any modules have seen the Run
+    PreBeginRun preBeginRunSignal_;
+    void watchPreBeginRun(PreBeginRun::slot_type const& iSlot) { preBeginRunSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPreBeginRun)
+
+    // OLD DELETE THIS
+    typedef signalslot::ObsoleteSignal<void(Run const&, EventSetup const&)> PostBeginRun;
+    /// signal is emitted after all modules have finished processing the beginRun
+    PostBeginRun postBeginRunSignal_;
+    void watchPostBeginRun(PostBeginRun::slot_type const& iSlot) { postBeginRunSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPostBeginRun)
+
+    // OLD DELETE THIS
+    typedef signalslot::ObsoleteSignal<void(RunID const&, Timestamp const&)> PreEndRun;
+    /// signal is emitted before the endRun is processed
+    PreEndRun preEndRunSignal_;
+    void watchPreEndRun(PreEndRun::slot_type const& iSlot) { preEndRunSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPreEndRun)
+
+    // OLD DELETE THIS
+    typedef signalslot::ObsoleteSignal<void(Run const&, EventSetup const&)> PostEndRun;
+    /// signal is emitted after all modules have finished processing the Run
+    PostEndRun postEndRunSignal_;
+    void watchPostEndRun(PostEndRun::slot_type const& iSlot) { postEndRunSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPostEndRun)
+
+    // OLD DELETE THIS
+    typedef signalslot::ObsoleteSignal<void(LuminosityBlockID const&, Timestamp const&)> PreBeginLumi;
+    /// signal is emitted after the Lumi has been created by the InputSource but before any modules have seen the Lumi
+    PreBeginLumi preBeginLumiSignal_;
+    void watchPreBeginLumi(PreBeginLumi::slot_type const& iSlot) { preBeginLumiSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPreBeginLumi)
+
+    // OLD DELETE THIS
+    typedef signalslot::ObsoleteSignal<void(LuminosityBlock const&, EventSetup const&)> PostBeginLumi;
+    /// signal is emitted after all modules have finished processing the beginLumi
+    PostBeginLumi postBeginLumiSignal_;
+    void watchPostBeginLumi(PostBeginLumi::slot_type const& iSlot) { postBeginLumiSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPostBeginLumi)
+
+    // OLD DELETE THIS
+    typedef signalslot::ObsoleteSignal<void(LuminosityBlockID const&, Timestamp const&)> PreEndLumi;
+    /// signal is emitted before the endLumi is processed
+    PreEndLumi preEndLumiSignal_;
+    void watchPreEndLumi(PreEndLumi::slot_type const& iSlot) { preEndLumiSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPreEndLumi)
+
+    // OLD DELETE THIS
+    typedef signalslot::ObsoleteSignal<void(LuminosityBlock const&, EventSetup const&)> PostEndLumi;
+    /// signal is emitted after all modules have finished processing the Lumi
+    PostEndLumi postEndLumiSignal_;
+    void watchPostEndLumi(PostEndLumi::slot_type const& iSlot) { postEndLumiSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPostEndLumi)
+
+    // OLD DELETE THIS
+    /// signal is emitted before starting to process a Path for an event
+    typedef signalslot::ObsoleteSignal<void(std::string const&)> PreProcessPath;
+    PreProcessPath preProcessPathSignal_;
+    void watchPreProcessPath(PreProcessPath::slot_type const& iSlot) { preProcessPathSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPreProcessPath)
+
+    // OLD DELETE THIS
+    /// signal is emitted after all modules have finished for the Path for an event
+    typedef signalslot::ObsoleteSignal<void(std::string const&, HLTPathStatus const&)> PostProcessPath;
+    PostProcessPath postProcessPathSignal_;
+    void watchPostProcessPath(PostProcessPath::slot_type const& iSlot) { postProcessPathSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPostProcessPath)
+
+    // OLD DELETE THIS
+    /// signal is emitted before starting to process a Path for beginRun
+    typedef signalslot::ObsoleteSignal<void(std::string const&)> PrePathBeginRun;
+    PrePathBeginRun prePathBeginRunSignal_;
+    void watchPrePathBeginRun(PrePathBeginRun::slot_type const& iSlot) { prePathBeginRunSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPrePathBeginRun)
+
+    // OLD DELETE THIS
+    /// signal is emitted after all modules have finished for the Path for beginRun
+    typedef signalslot::ObsoleteSignal<void(std::string const&, HLTPathStatus const&)> PostPathBeginRun;
+    PostPathBeginRun postPathBeginRunSignal_;
+    void watchPostPathBeginRun(PostPathBeginRun::slot_type const& iSlot) {
+      postPathBeginRunSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostPathBeginRun)
+
+    // OLD DELETE THIS
+    /// signal is emitted before starting to process a Path for endRun
+    typedef signalslot::ObsoleteSignal<void(std::string const&)> PrePathEndRun;
+    PrePathEndRun prePathEndRunSignal_;
+    void watchPrePathEndRun(PrePathEndRun::slot_type const& iSlot) { prePathEndRunSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPrePathEndRun)
+
+    // OLD DELETE THIS
+    /// signal is emitted after all modules have finished for the Path for endRun
+    typedef signalslot::ObsoleteSignal<void(std::string const&, HLTPathStatus const&)> PostPathEndRun;
+    PostPathEndRun postPathEndRunSignal_;
+    void watchPostPathEndRun(PostPathEndRun::slot_type const& iSlot) { postPathEndRunSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPostPathEndRun)
+
+    // OLD DELETE THIS
+    /// signal is emitted before starting to process a Path for beginLumi
+    typedef signalslot::ObsoleteSignal<void(std::string const&)> PrePathBeginLumi;
+    PrePathBeginLumi prePathBeginLumiSignal_;
+    void watchPrePathBeginLumi(PrePathBeginLumi::slot_type const& iSlot) { prePathBeginLumiSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPrePathBeginLumi)
+
+    // OLD DELETE THIS
+    /// signal is emitted after all modules have finished for the Path for beginLumi
+    typedef signalslot::ObsoleteSignal<void(std::string const&, HLTPathStatus const&)> PostPathBeginLumi;
+    PostPathBeginLumi postPathBeginLumiSignal_;
+    void watchPostPathBeginLumi(PostPathBeginLumi::slot_type const& iSlot) {
+      postPathBeginLumiSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostPathBeginLumi)
+
+    // OLD DELETE THIS
+    /// signal is emitted before starting to process a Path for endRun
+    typedef signalslot::ObsoleteSignal<void(std::string const&)> PrePathEndLumi;
+    PrePathEndLumi prePathEndLumiSignal_;
+    void watchPrePathEndLumi(PrePathEndLumi::slot_type const& iSlot) { prePathEndLumiSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPrePathEndLumi)
+
+    // OLD DELETE THIS
+    /// signal is emitted after all modules have finished for the Path for endRun
+    typedef signalslot::ObsoleteSignal<void(std::string const&, HLTPathStatus const&)> PostPathEndLumi;
+    PostPathEndLumi postPathEndLumiSignal_;
+    void watchPostPathEndLumi(PostPathEndLumi::slot_type const& iSlot) { postPathEndLumiSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPostPathEndLumi)
+
+    /* Note M:
 	   Concerning use of address of module descriptor
 	   during functions called before/after module or source construction:
 	       Unlike the case in the Run, Lumi, and Event loops,
@@ -647,433 +576,418 @@ namespace edm {
 	       off of address of the descriptor will NOT be valid during 
                such functions.  mf / cj 9/11/09
 	*/
-	
-      /// signal is emitted before the module is constructed
-      typedef signalslot::Signal<void(ModuleDescription const&)> PreModuleConstruction;
-      PreModuleConstruction preModuleConstructionSignal_;
-      void watchPreModuleConstruction(PreModuleConstruction::slot_type const& iSlot) {
-         preModuleConstructionSignal_.connect(iSlot);
-      }
-      // WARNING - ModuleDescription is not in fixed place.  See note M above.
-      AR_WATCH_USING_METHOD_1(watchPreModuleConstruction)
-         
-      /// signal is emitted after the module was construction
-      typedef signalslot::Signal<void(ModuleDescription const&)> PostModuleConstruction;
-      PostModuleConstruction postModuleConstructionSignal_;
-      void watchPostModuleConstruction(PostModuleConstruction::slot_type const& iSlot) {
-         postModuleConstructionSignal_.connect_front(iSlot);
-      }
-      // WARNING - ModuleDescription is not in fixed place.  See note M above.
-      AR_WATCH_USING_METHOD_1(watchPostModuleConstruction)
-
-      /// signal is emitted before the module does beginJob
-      typedef signalslot::Signal<void(ModuleDescription const&)> PreModuleBeginJob;
-      PreModuleBeginJob preModuleBeginJobSignal_;
-      void watchPreModuleBeginJob(PreModuleBeginJob::slot_type const& iSlot) {
-        preModuleBeginJobSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreModuleBeginJob)
-        
-      /// signal is emitted after the module had done beginJob
-      typedef signalslot::Signal<void(ModuleDescription const&)> PostModuleBeginJob;
-      PostModuleBeginJob postModuleBeginJobSignal_;
-      void watchPostModuleBeginJob(PostModuleBeginJob::slot_type const& iSlot) {
-         postModuleBeginJobSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPostModuleBeginJob)
-        
-      /// signal is emitted before the module does endJob
-      typedef signalslot::Signal<void(ModuleDescription const&)> PreModuleEndJob;
-      PreModuleEndJob preModuleEndJobSignal_;
-      void watchPreModuleEndJob(PreModuleEndJob::slot_type const& iSlot) {
-        preModuleEndJobSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreModuleEndJob)
-        
-      /// signal is emitted after the module had done endJob
-      typedef signalslot::Signal<void(ModuleDescription const&)> PostModuleEndJob;
-      PostModuleEndJob postModuleEndJobSignal_;
-      void watchPostModuleEndJob(PostModuleEndJob::slot_type const& iSlot) {
-         postModuleEndJobSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPostModuleEndJob)
-
-      /// signal is emitted before the module starts processing the Event and before prefetching has started
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleEventPrefetching;
-      PreModuleEventPrefetching preModuleEventPrefetchingSignal_;
-      void watchPreModuleEventPrefetching(PreModuleEventPrefetching::slot_type const& iSlot) {
-         preModuleEventPrefetchingSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreModuleEventPrefetching)
-      
-      /// signal is emitted before the module starts processing the Event and after prefetching has finished
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleEventPrefetching;
-      PostModuleEventPrefetching postModuleEventPrefetchingSignal_;
-      void watchPostModuleEventPrefetching(PostModuleEventPrefetching::slot_type const& iSlot) {
-         postModuleEventPrefetchingSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostModuleEventPrefetching)
-
-      /// signal is emitted before the module starts processing the Event
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleEvent;
-      PreModuleEvent preModuleEventSignal_;
-      void watchPreModuleEvent(PreModuleEvent::slot_type const& iSlot) {
-         preModuleEventSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreModuleEvent)
-         
-      /// signal is emitted after the module finished processing the Event
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleEvent;
-      PostModuleEvent postModuleEventSignal_;
-      void watchPostModuleEvent(PostModuleEvent::slot_type const& iSlot) {
-         postModuleEventSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostModuleEvent)
-
-      /// signal is emitted before the module starts the acquire method for the Event
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleEventAcquire;
-      PreModuleEventAcquire preModuleEventAcquireSignal_;
-      void watchPreModuleEventAcquire(PreModuleEventAcquire::slot_type const& iSlot) {
-         preModuleEventAcquireSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreModuleEventAcquire)
-
-      /// signal is emitted after the module finishes the acquire method for the Event
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleEventAcquire;
-      PostModuleEventAcquire postModuleEventAcquireSignal_;
-      void watchPostModuleEventAcquire(PostModuleEventAcquire::slot_type const& iSlot) {
-         postModuleEventAcquireSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostModuleEventAcquire)
 
-      /// signal is emitted after the module starts processing the Event and before a delayed get has started
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleEventDelayedGet;
-      PreModuleEventDelayedGet preModuleEventDelayedGetSignal_;
-      void watchPreModuleEventDelayedGet(PreModuleEventDelayedGet::slot_type const& iSlot) {
-         preModuleEventDelayedGetSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreModuleEventDelayedGet)
-
-      /// signal is emitted after the module starts processing the Event and after a delayed get has finished
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleEventDelayedGet;
-      PostModuleEventDelayedGet postModuleEventDelayedGetSignal_;
-      void watchPostModuleEventDelayedGet(PostModuleEventDelayedGet::slot_type const& iSlot) {
-         postModuleEventDelayedGetSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostModuleEventDelayedGet)
-
-      /// signal is emitted after the module starts processing the Event, after a delayed get has started, and before a source read
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreEventReadFromSource;
-      PreEventReadFromSource preEventReadFromSourceSignal_;
-      void watchPreEventReadFromSource(PreEventReadFromSource::slot_type const& iSlot) {
-         preEventReadFromSourceSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreEventReadFromSource)
-
-      /// signal is emitted after the module starts processing the Event, after a delayed get has started, and after a source read
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostEventReadFromSource;
-      PostEventReadFromSource postEventReadFromSourceSignal_;
-      void watchPostEventReadFromSource(PostEventReadFromSource::slot_type const& iSlot) {
-         postEventReadFromSourceSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostEventReadFromSource)
-
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleStreamBeginRun;
-      PreModuleStreamBeginRun preModuleStreamBeginRunSignal_;
-      void watchPreModuleStreamBeginRun(PreModuleStreamBeginRun::slot_type const& iSlot) {
-         preModuleStreamBeginRunSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreModuleStreamBeginRun)
-         
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleStreamBeginRun;
-      PostModuleStreamBeginRun postModuleStreamBeginRunSignal_;
-      void watchPostModuleStreamBeginRun(PostModuleStreamBeginRun::slot_type const& iSlot) {
-         postModuleStreamBeginRunSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostModuleStreamBeginRun)
-
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleStreamEndRun;
-      PreModuleStreamEndRun preModuleStreamEndRunSignal_;
-      void watchPreModuleStreamEndRun(PreModuleStreamEndRun::slot_type const& iSlot) {
-         preModuleStreamEndRunSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreModuleStreamEndRun)
-         
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleStreamEndRun;
-      PostModuleStreamEndRun postModuleStreamEndRunSignal_;
-      void watchPostModuleStreamEndRun(PostModuleStreamEndRun::slot_type const& iSlot) {
-         postModuleStreamEndRunSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostModuleStreamEndRun)
-
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleStreamBeginLumi;
-      PreModuleStreamBeginLumi preModuleStreamBeginLumiSignal_;
-      void watchPreModuleStreamBeginLumi(PreModuleStreamBeginLumi::slot_type const& iSlot) {
-         preModuleStreamBeginLumiSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreModuleStreamBeginLumi)
-         
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleStreamBeginLumi;
-      PostModuleStreamBeginLumi postModuleStreamBeginLumiSignal_;
-      void watchPostModuleStreamBeginLumi(PostModuleStreamBeginLumi::slot_type const& iSlot) {
-         postModuleStreamBeginLumiSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostModuleStreamBeginLumi)
-
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleStreamEndLumi;
-      PreModuleStreamEndLumi preModuleStreamEndLumiSignal_;
-      void watchPreModuleStreamEndLumi(PreModuleStreamEndLumi::slot_type const& iSlot) {
-         preModuleStreamEndLumiSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreModuleStreamEndLumi)
-         
-      typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleStreamEndLumi;
-      PostModuleStreamEndLumi postModuleStreamEndLumiSignal_;
-      void watchPostModuleStreamEndLumi(PostModuleStreamEndLumi::slot_type const& iSlot) {
-         postModuleStreamEndLumiSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostModuleStreamEndLumi)
-
-      typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PreModuleGlobalBeginRun;
-      PreModuleGlobalBeginRun preModuleGlobalBeginRunSignal_;
-      void watchPreModuleGlobalBeginRun(PreModuleGlobalBeginRun::slot_type const& iSlot) {
-         preModuleGlobalBeginRunSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreModuleGlobalBeginRun)
-         
-      typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PostModuleGlobalBeginRun;
-      PostModuleGlobalBeginRun postModuleGlobalBeginRunSignal_;
-      void watchPostModuleGlobalBeginRun(PostModuleGlobalBeginRun::slot_type const& iSlot) {
-         postModuleGlobalBeginRunSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostModuleGlobalBeginRun)
-
-      typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PreModuleGlobalEndRun;
-      PreModuleGlobalEndRun preModuleGlobalEndRunSignal_;
-      void watchPreModuleGlobalEndRun(PreModuleGlobalEndRun::slot_type const& iSlot) {
-         preModuleGlobalEndRunSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreModuleGlobalEndRun)
-         
-      typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PostModuleGlobalEndRun;
-      PostModuleGlobalEndRun postModuleGlobalEndRunSignal_;
-      void watchPostModuleGlobalEndRun(PostModuleGlobalEndRun::slot_type const& iSlot) {
-         postModuleGlobalEndRunSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostModuleGlobalEndRun)
-
-      typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PreModuleGlobalBeginLumi;
-      PreModuleGlobalBeginLumi preModuleGlobalBeginLumiSignal_;
-      void watchPreModuleGlobalBeginLumi(PreModuleGlobalBeginLumi::slot_type const& iSlot) {
-         preModuleGlobalBeginLumiSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreModuleGlobalBeginLumi)
-         
-      typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PostModuleGlobalBeginLumi;
-      PostModuleGlobalBeginLumi postModuleGlobalBeginLumiSignal_;
-      void watchPostModuleGlobalBeginLumi(PostModuleGlobalBeginLumi::slot_type const& iSlot) {
-         postModuleGlobalBeginLumiSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostModuleGlobalBeginLumi)
-
-      typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PreModuleGlobalEndLumi;
-      PreModuleGlobalEndLumi preModuleGlobalEndLumiSignal_;
-      void watchPreModuleGlobalEndLumi(PreModuleGlobalEndLumi::slot_type const& iSlot) {
-         preModuleGlobalEndLumiSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreModuleGlobalEndLumi)
-         
-      typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PostModuleGlobalEndLumi;
-      PostModuleGlobalEndLumi postModuleGlobalEndLumiSignal_;
-      void watchPostModuleGlobalEndLumi(PostModuleGlobalEndLumi::slot_type const& iSlot) {
-         postModuleGlobalEndLumiSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostModuleGlobalEndLumi)
-
-      typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PreModuleWriteRun;
-      PreModuleWriteRun preModuleWriteRunSignal_;
-      void watchPreModuleWriteRun(PreModuleWriteRun::slot_type const& iSlot) {
-         preModuleWriteRunSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreModuleWriteRun)
-
-      typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PostModuleWriteRun;
-      PostModuleWriteRun postModuleWriteRunSignal_;
-      void watchPostModuleWriteRun(PostModuleWriteRun::slot_type const& iSlot) {
-         postModuleWriteRunSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostModuleWriteRun)
-
-      typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PreModuleWriteLumi;
-      PreModuleWriteLumi preModuleWriteLumiSignal_;
-      void watchPreModuleWriteLumi(PreModuleWriteLumi::slot_type const& iSlot) {
-         preModuleWriteLumiSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPreModuleWriteLumi)
-
-      typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PostModuleWriteLumi;
-      PostModuleWriteLumi postModuleWriteLumiSignal_;
-      void watchPostModuleWriteLumi(PostModuleWriteLumi::slot_type const& iSlot) {
-         postModuleWriteLumiSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_2(watchPostModuleWriteLumi)
-
-      // OLD DELETE THIS
-      /// signal is emitted before the module starts processing the Event
-      typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PreModule;
-      PreModule preModuleSignal_;
-      void watchPreModule(PreModule::slot_type const& iSlot) {
-         preModuleSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreModule)
-         
-      // OLD DELETE THIS
-      /// signal is emitted after the module finished processing the Event
-      typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PostModule;
-      PostModule postModuleSignal_;
-      void watchPostModule(PostModule::slot_type const& iSlot) {
-         postModuleSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPostModule)
-         
-      // OLD DELETE THIS
-      /// signal is emitted before the module starts processing beginRun
-      typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PreModuleBeginRun;
-      PreModuleBeginRun preModuleBeginRunSignal_;
-      void watchPreModuleBeginRun(PreModuleBeginRun::slot_type const& iSlot) {
-         preModuleBeginRunSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreModuleBeginRun)
-         
-      // OLD DELETE THIS
-      /// signal is emitted after the module finished processing beginRun
-      typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PostModuleBeginRun;
-      PostModuleBeginRun postModuleBeginRunSignal_;
-      void watchPostModuleBeginRun(PostModuleBeginRun::slot_type const& iSlot) {
-         postModuleBeginRunSignal_.connect_front(iSlot);
-         
-      }
-      AR_WATCH_USING_METHOD_1(watchPostModuleBeginRun)
-         
-      // OLD DELETE THIS
-      /// signal is emitted before the module starts processing endRun
-      typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PreModuleEndRun;
-      PreModuleEndRun preModuleEndRunSignal_;
-      void watchPreModuleEndRun(PreModuleEndRun::slot_type const& iSlot) {
-         preModuleEndRunSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreModuleEndRun)
-         
-      // OLD DELETE THIS
-      /// signal is emitted after the module finished processing endRun
-      typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PostModuleEndRun;
-      PostModuleEndRun postModuleEndRunSignal_;
-      void watchPostModuleEndRun(PostModuleEndRun::slot_type const& iSlot) {
-         postModuleEndRunSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPostModuleEndRun)
-         
-      // OLD DELETE THIS
-      /// signal is emitted before the module starts processing beginLumi
-      typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PreModuleBeginLumi;
-      PreModuleBeginLumi preModuleBeginLumiSignal_;
-      void watchPreModuleBeginLumi(PreModuleBeginLumi::slot_type const& iSlot) {
-         preModuleBeginLumiSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreModuleBeginLumi)
-         
-      // OLD DELETE THIS
-      /// signal is emitted after the module finished processing beginLumi
-      typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PostModuleBeginLumi;
-      PostModuleBeginLumi postModuleBeginLumiSignal_;
-      void watchPostModuleBeginLumi(PostModuleBeginLumi::slot_type const& iSlot) {
-         postModuleBeginLumiSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPostModuleBeginLumi)
-         
-      // OLD DELETE THIS
-      /// signal is emitted before the module starts processing endLumi
-      typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PreModuleEndLumi;
-      PreModuleEndLumi preModuleEndLumiSignal_;
-      void watchPreModuleEndLumi(PreModuleEndLumi::slot_type const& iSlot) {
-         preModuleEndLumiSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPreModuleEndLumi)
-         
-      // OLD DELETE THIS
-      /// signal is emitted after the module finished processing endLumi
-      typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PostModuleEndLumi;
-      PostModuleEndLumi postModuleEndLumiSignal_;
-      void watchPostModuleEndLumi(PostModuleEndLumi::slot_type const& iSlot) {
-         postModuleEndLumiSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_1(watchPostModuleEndLumi)
-
-      /// signal is emitted before the source is constructed
-      typedef signalslot::Signal<void(ModuleDescription const&)> PreSourceConstruction;
-      PreSourceConstruction preSourceConstructionSignal_;
-      void watchPreSourceConstruction(PreSourceConstruction::slot_type const& iSlot) {
-        preSourceConstructionSignal_.connect(iSlot);
-      }
-      // WARNING - ModuleDescription is not in fixed place.  See note M above.
-      AR_WATCH_USING_METHOD_1(watchPreSourceConstruction)
-        
-      /// signal is emitted after the source was construction
-      typedef signalslot::Signal<void(ModuleDescription const&)> PostSourceConstruction;
-      PostSourceConstruction postSourceConstructionSignal_;
-      void watchPostSourceConstruction(PostSourceConstruction::slot_type const& iSlot) {
-         postSourceConstructionSignal_.connect_front(iSlot);
-      }
-      // WARNING - ModuleDescription is not in fixed place.  See note M above.
-      AR_WATCH_USING_METHOD_1(watchPostSourceConstruction)
-
-      typedef signalslot::Signal<void(eventsetup::ComponentDescription const*, eventsetup::EventSetupRecordKey const&, eventsetup::DataKey const&)> PreLockEventSetupGet;
-      ///signal is emitted before lock taken in EventSetup DataProxy::get function
-      PreLockEventSetupGet preLockEventSetupGetSignal_;
-      void watchPreLockEventSetupGet(PreLockEventSetupGet::slot_type const& iSlot) {
-         preLockEventSetupGetSignal_.connect(iSlot);
-      }
-      AR_WATCH_USING_METHOD_3(watchPreLockEventSetupGet)
-
-      typedef signalslot::Signal<void(eventsetup::ComponentDescription const*, eventsetup::EventSetupRecordKey const&, eventsetup::DataKey const&)> PostLockEventSetupGet;
-      ///signal is emitted after lock taken in EventSetup DataProxy::get function
-      PostLockEventSetupGet postLockEventSetupGetSignal_;
-      void watchPostLockEventSetupGet(PostLockEventSetupGet::slot_type const& iSlot) {
-         postLockEventSetupGetSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_3(watchPostLockEventSetupGet)
-
-      typedef signalslot::Signal<void(eventsetup::ComponentDescription const*, eventsetup::EventSetupRecordKey const&, eventsetup::DataKey const&)> PostEventSetupGet;
-      ///signal is emitted after getImpl has returned in the EventSetup DataProxy::get function
-      PostEventSetupGet postEventSetupGetSignal_;
-      void watchPostEventSetupGet(PostEventSetupGet::slot_type const& iSlot) {
-         postEventSetupGetSignal_.connect_front(iSlot);
-      }
-      AR_WATCH_USING_METHOD_3(watchPostEventSetupGet)
-
-      // ---------- member functions ---------------------------
-      
-      ///forwards our signals to slots connected to iOther
-      void connect(ActivityRegistry& iOther);
-
-      ///forwards our subprocess independent signals to slots connected to iOther
-      ///forwards iOther's subprocess dependent signals to slots connected to this
-      void connectToSubProcess(ActivityRegistry& iOther);
-      
-      ///copy the slots from iOther and connect them directly to our own
-      /// this allows us to 'forward' signals more efficiently,
-      /// BUT if iOther gains new slots after this call, we will not see them
-      /// This is also careful to keep the order of the slots proper
-      /// for services.
-      void copySlotsFrom(ActivityRegistry& iOther);
-      
-   private:
-      // forwards subprocess independent signals to slots connected to iOther
-      void connectGlobals(ActivityRegistry& iOther);
-
-      // forwards subprocess dependent signals to slots connected to iOther
-      void connectLocals(ActivityRegistry& iOther);
-   };
-}
+    /// signal is emitted before the module is constructed
+    typedef signalslot::Signal<void(ModuleDescription const&)> PreModuleConstruction;
+    PreModuleConstruction preModuleConstructionSignal_;
+    void watchPreModuleConstruction(PreModuleConstruction::slot_type const& iSlot) {
+      preModuleConstructionSignal_.connect(iSlot);
+    }
+    // WARNING - ModuleDescription is not in fixed place.  See note M above.
+    AR_WATCH_USING_METHOD_1(watchPreModuleConstruction)
+
+    /// signal is emitted after the module was construction
+    typedef signalslot::Signal<void(ModuleDescription const&)> PostModuleConstruction;
+    PostModuleConstruction postModuleConstructionSignal_;
+    void watchPostModuleConstruction(PostModuleConstruction::slot_type const& iSlot) {
+      postModuleConstructionSignal_.connect_front(iSlot);
+    }
+    // WARNING - ModuleDescription is not in fixed place.  See note M above.
+    AR_WATCH_USING_METHOD_1(watchPostModuleConstruction)
+
+    /// signal is emitted before the module does beginJob
+    typedef signalslot::Signal<void(ModuleDescription const&)> PreModuleBeginJob;
+    PreModuleBeginJob preModuleBeginJobSignal_;
+    void watchPreModuleBeginJob(PreModuleBeginJob::slot_type const& iSlot) { preModuleBeginJobSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPreModuleBeginJob)
+
+    /// signal is emitted after the module had done beginJob
+    typedef signalslot::Signal<void(ModuleDescription const&)> PostModuleBeginJob;
+    PostModuleBeginJob postModuleBeginJobSignal_;
+    void watchPostModuleBeginJob(PostModuleBeginJob::slot_type const& iSlot) {
+      postModuleBeginJobSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_1(watchPostModuleBeginJob)
+
+    /// signal is emitted before the module does endJob
+    typedef signalslot::Signal<void(ModuleDescription const&)> PreModuleEndJob;
+    PreModuleEndJob preModuleEndJobSignal_;
+    void watchPreModuleEndJob(PreModuleEndJob::slot_type const& iSlot) { preModuleEndJobSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPreModuleEndJob)
+
+    /// signal is emitted after the module had done endJob
+    typedef signalslot::Signal<void(ModuleDescription const&)> PostModuleEndJob;
+    PostModuleEndJob postModuleEndJobSignal_;
+    void watchPostModuleEndJob(PostModuleEndJob::slot_type const& iSlot) {
+      postModuleEndJobSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_1(watchPostModuleEndJob)
+
+    /// signal is emitted before the module starts processing the Event and before prefetching has started
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleEventPrefetching;
+    PreModuleEventPrefetching preModuleEventPrefetchingSignal_;
+    void watchPreModuleEventPrefetching(PreModuleEventPrefetching::slot_type const& iSlot) {
+      preModuleEventPrefetchingSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPreModuleEventPrefetching)
+
+    /// signal is emitted before the module starts processing the Event and after prefetching has finished
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleEventPrefetching;
+    PostModuleEventPrefetching postModuleEventPrefetchingSignal_;
+    void watchPostModuleEventPrefetching(PostModuleEventPrefetching::slot_type const& iSlot) {
+      postModuleEventPrefetchingSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostModuleEventPrefetching)
+
+    /// signal is emitted before the module starts processing the Event
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleEvent;
+    PreModuleEvent preModuleEventSignal_;
+    void watchPreModuleEvent(PreModuleEvent::slot_type const& iSlot) { preModuleEventSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPreModuleEvent)
+
+    /// signal is emitted after the module finished processing the Event
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleEvent;
+    PostModuleEvent postModuleEventSignal_;
+    void watchPostModuleEvent(PostModuleEvent::slot_type const& iSlot) { postModuleEventSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPostModuleEvent)
+
+    /// signal is emitted before the module starts the acquire method for the Event
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleEventAcquire;
+    PreModuleEventAcquire preModuleEventAcquireSignal_;
+    void watchPreModuleEventAcquire(PreModuleEventAcquire::slot_type const& iSlot) {
+      preModuleEventAcquireSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPreModuleEventAcquire)
+
+    /// signal is emitted after the module finishes the acquire method for the Event
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleEventAcquire;
+    PostModuleEventAcquire postModuleEventAcquireSignal_;
+    void watchPostModuleEventAcquire(PostModuleEventAcquire::slot_type const& iSlot) {
+      postModuleEventAcquireSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostModuleEventAcquire)
+
+    /// signal is emitted after the module starts processing the Event and before a delayed get has started
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleEventDelayedGet;
+    PreModuleEventDelayedGet preModuleEventDelayedGetSignal_;
+    void watchPreModuleEventDelayedGet(PreModuleEventDelayedGet::slot_type const& iSlot) {
+      preModuleEventDelayedGetSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPreModuleEventDelayedGet)
+
+    /// signal is emitted after the module starts processing the Event and after a delayed get has finished
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleEventDelayedGet;
+    PostModuleEventDelayedGet postModuleEventDelayedGetSignal_;
+    void watchPostModuleEventDelayedGet(PostModuleEventDelayedGet::slot_type const& iSlot) {
+      postModuleEventDelayedGetSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostModuleEventDelayedGet)
+
+    /// signal is emitted after the module starts processing the Event, after a delayed get has started, and before a source read
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreEventReadFromSource;
+    PreEventReadFromSource preEventReadFromSourceSignal_;
+    void watchPreEventReadFromSource(PreEventReadFromSource::slot_type const& iSlot) {
+      preEventReadFromSourceSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPreEventReadFromSource)
+
+    /// signal is emitted after the module starts processing the Event, after a delayed get has started, and after a source read
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostEventReadFromSource;
+    PostEventReadFromSource postEventReadFromSourceSignal_;
+    void watchPostEventReadFromSource(PostEventReadFromSource::slot_type const& iSlot) {
+      postEventReadFromSourceSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostEventReadFromSource)
+
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleStreamBeginRun;
+    PreModuleStreamBeginRun preModuleStreamBeginRunSignal_;
+    void watchPreModuleStreamBeginRun(PreModuleStreamBeginRun::slot_type const& iSlot) {
+      preModuleStreamBeginRunSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPreModuleStreamBeginRun)
+
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleStreamBeginRun;
+    PostModuleStreamBeginRun postModuleStreamBeginRunSignal_;
+    void watchPostModuleStreamBeginRun(PostModuleStreamBeginRun::slot_type const& iSlot) {
+      postModuleStreamBeginRunSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostModuleStreamBeginRun)
+
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleStreamEndRun;
+    PreModuleStreamEndRun preModuleStreamEndRunSignal_;
+    void watchPreModuleStreamEndRun(PreModuleStreamEndRun::slot_type const& iSlot) {
+      preModuleStreamEndRunSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPreModuleStreamEndRun)
+
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleStreamEndRun;
+    PostModuleStreamEndRun postModuleStreamEndRunSignal_;
+    void watchPostModuleStreamEndRun(PostModuleStreamEndRun::slot_type const& iSlot) {
+      postModuleStreamEndRunSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostModuleStreamEndRun)
+
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleStreamBeginLumi;
+    PreModuleStreamBeginLumi preModuleStreamBeginLumiSignal_;
+    void watchPreModuleStreamBeginLumi(PreModuleStreamBeginLumi::slot_type const& iSlot) {
+      preModuleStreamBeginLumiSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPreModuleStreamBeginLumi)
+
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleStreamBeginLumi;
+    PostModuleStreamBeginLumi postModuleStreamBeginLumiSignal_;
+    void watchPostModuleStreamBeginLumi(PostModuleStreamBeginLumi::slot_type const& iSlot) {
+      postModuleStreamBeginLumiSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostModuleStreamBeginLumi)
+
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PreModuleStreamEndLumi;
+    PreModuleStreamEndLumi preModuleStreamEndLumiSignal_;
+    void watchPreModuleStreamEndLumi(PreModuleStreamEndLumi::slot_type const& iSlot) {
+      preModuleStreamEndLumiSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPreModuleStreamEndLumi)
+
+    typedef signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> PostModuleStreamEndLumi;
+    PostModuleStreamEndLumi postModuleStreamEndLumiSignal_;
+    void watchPostModuleStreamEndLumi(PostModuleStreamEndLumi::slot_type const& iSlot) {
+      postModuleStreamEndLumiSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostModuleStreamEndLumi)
+
+    typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PreModuleGlobalBeginRun;
+    PreModuleGlobalBeginRun preModuleGlobalBeginRunSignal_;
+    void watchPreModuleGlobalBeginRun(PreModuleGlobalBeginRun::slot_type const& iSlot) {
+      preModuleGlobalBeginRunSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPreModuleGlobalBeginRun)
+
+    typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PostModuleGlobalBeginRun;
+    PostModuleGlobalBeginRun postModuleGlobalBeginRunSignal_;
+    void watchPostModuleGlobalBeginRun(PostModuleGlobalBeginRun::slot_type const& iSlot) {
+      postModuleGlobalBeginRunSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostModuleGlobalBeginRun)
+
+    typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PreModuleGlobalEndRun;
+    PreModuleGlobalEndRun preModuleGlobalEndRunSignal_;
+    void watchPreModuleGlobalEndRun(PreModuleGlobalEndRun::slot_type const& iSlot) {
+      preModuleGlobalEndRunSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPreModuleGlobalEndRun)
+
+    typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PostModuleGlobalEndRun;
+    PostModuleGlobalEndRun postModuleGlobalEndRunSignal_;
+    void watchPostModuleGlobalEndRun(PostModuleGlobalEndRun::slot_type const& iSlot) {
+      postModuleGlobalEndRunSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostModuleGlobalEndRun)
+
+    typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PreModuleGlobalBeginLumi;
+    PreModuleGlobalBeginLumi preModuleGlobalBeginLumiSignal_;
+    void watchPreModuleGlobalBeginLumi(PreModuleGlobalBeginLumi::slot_type const& iSlot) {
+      preModuleGlobalBeginLumiSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPreModuleGlobalBeginLumi)
+
+    typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PostModuleGlobalBeginLumi;
+    PostModuleGlobalBeginLumi postModuleGlobalBeginLumiSignal_;
+    void watchPostModuleGlobalBeginLumi(PostModuleGlobalBeginLumi::slot_type const& iSlot) {
+      postModuleGlobalBeginLumiSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostModuleGlobalBeginLumi)
+
+    typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PreModuleGlobalEndLumi;
+    PreModuleGlobalEndLumi preModuleGlobalEndLumiSignal_;
+    void watchPreModuleGlobalEndLumi(PreModuleGlobalEndLumi::slot_type const& iSlot) {
+      preModuleGlobalEndLumiSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPreModuleGlobalEndLumi)
+
+    typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PostModuleGlobalEndLumi;
+    PostModuleGlobalEndLumi postModuleGlobalEndLumiSignal_;
+    void watchPostModuleGlobalEndLumi(PostModuleGlobalEndLumi::slot_type const& iSlot) {
+      postModuleGlobalEndLumiSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostModuleGlobalEndLumi)
+
+    typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PreModuleWriteRun;
+    PreModuleWriteRun preModuleWriteRunSignal_;
+    void watchPreModuleWriteRun(PreModuleWriteRun::slot_type const& iSlot) { preModuleWriteRunSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_2(watchPreModuleWriteRun)
+
+    typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PostModuleWriteRun;
+    PostModuleWriteRun postModuleWriteRunSignal_;
+    void watchPostModuleWriteRun(PostModuleWriteRun::slot_type const& iSlot) {
+      postModuleWriteRunSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostModuleWriteRun)
+
+    typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PreModuleWriteLumi;
+    PreModuleWriteLumi preModuleWriteLumiSignal_;
+    void watchPreModuleWriteLumi(PreModuleWriteLumi::slot_type const& iSlot) {
+      preModuleWriteLumiSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPreModuleWriteLumi)
+
+    typedef signalslot::Signal<void(GlobalContext const&, ModuleCallingContext const&)> PostModuleWriteLumi;
+    PostModuleWriteLumi postModuleWriteLumiSignal_;
+    void watchPostModuleWriteLumi(PostModuleWriteLumi::slot_type const& iSlot) {
+      postModuleWriteLumiSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_2(watchPostModuleWriteLumi)
+
+    // OLD DELETE THIS
+    /// signal is emitted before the module starts processing the Event
+    typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PreModule;
+    PreModule preModuleSignal_;
+    void watchPreModule(PreModule::slot_type const& iSlot) { preModuleSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPreModule)
+
+    // OLD DELETE THIS
+    /// signal is emitted after the module finished processing the Event
+    typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PostModule;
+    PostModule postModuleSignal_;
+    void watchPostModule(PostModule::slot_type const& iSlot) { postModuleSignal_.connect_front(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPostModule)
+
+    // OLD DELETE THIS
+    /// signal is emitted before the module starts processing beginRun
+    typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PreModuleBeginRun;
+    PreModuleBeginRun preModuleBeginRunSignal_;
+    void watchPreModuleBeginRun(PreModuleBeginRun::slot_type const& iSlot) { preModuleBeginRunSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPreModuleBeginRun)
+
+    // OLD DELETE THIS
+    /// signal is emitted after the module finished processing beginRun
+    typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PostModuleBeginRun;
+    PostModuleBeginRun postModuleBeginRunSignal_;
+    void watchPostModuleBeginRun(PostModuleBeginRun::slot_type const& iSlot) {
+      postModuleBeginRunSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_1(watchPostModuleBeginRun)
+
+    // OLD DELETE THIS
+    /// signal is emitted before the module starts processing endRun
+    typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PreModuleEndRun;
+    PreModuleEndRun preModuleEndRunSignal_;
+    void watchPreModuleEndRun(PreModuleEndRun::slot_type const& iSlot) { preModuleEndRunSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPreModuleEndRun)
+
+    // OLD DELETE THIS
+    /// signal is emitted after the module finished processing endRun
+    typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PostModuleEndRun;
+    PostModuleEndRun postModuleEndRunSignal_;
+    void watchPostModuleEndRun(PostModuleEndRun::slot_type const& iSlot) {
+      postModuleEndRunSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_1(watchPostModuleEndRun)
+
+    // OLD DELETE THIS
+    /// signal is emitted before the module starts processing beginLumi
+    typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PreModuleBeginLumi;
+    PreModuleBeginLumi preModuleBeginLumiSignal_;
+    void watchPreModuleBeginLumi(PreModuleBeginLumi::slot_type const& iSlot) {
+      preModuleBeginLumiSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_1(watchPreModuleBeginLumi)
+
+    // OLD DELETE THIS
+    /// signal is emitted after the module finished processing beginLumi
+    typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PostModuleBeginLumi;
+    PostModuleBeginLumi postModuleBeginLumiSignal_;
+    void watchPostModuleBeginLumi(PostModuleBeginLumi::slot_type const& iSlot) {
+      postModuleBeginLumiSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_1(watchPostModuleBeginLumi)
+
+    // OLD DELETE THIS
+    /// signal is emitted before the module starts processing endLumi
+    typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PreModuleEndLumi;
+    PreModuleEndLumi preModuleEndLumiSignal_;
+    void watchPreModuleEndLumi(PreModuleEndLumi::slot_type const& iSlot) { preModuleEndLumiSignal_.connect(iSlot); }
+    AR_WATCH_USING_METHOD_1(watchPreModuleEndLumi)
+
+    // OLD DELETE THIS
+    /// signal is emitted after the module finished processing endLumi
+    typedef signalslot::ObsoleteSignal<void(ModuleDescription const&)> PostModuleEndLumi;
+    PostModuleEndLumi postModuleEndLumiSignal_;
+    void watchPostModuleEndLumi(PostModuleEndLumi::slot_type const& iSlot) {
+      postModuleEndLumiSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_1(watchPostModuleEndLumi)
+
+    /// signal is emitted before the source is constructed
+    typedef signalslot::Signal<void(ModuleDescription const&)> PreSourceConstruction;
+    PreSourceConstruction preSourceConstructionSignal_;
+    void watchPreSourceConstruction(PreSourceConstruction::slot_type const& iSlot) {
+      preSourceConstructionSignal_.connect(iSlot);
+    }
+    // WARNING - ModuleDescription is not in fixed place.  See note M above.
+    AR_WATCH_USING_METHOD_1(watchPreSourceConstruction)
+
+    /// signal is emitted after the source was construction
+    typedef signalslot::Signal<void(ModuleDescription const&)> PostSourceConstruction;
+    PostSourceConstruction postSourceConstructionSignal_;
+    void watchPostSourceConstruction(PostSourceConstruction::slot_type const& iSlot) {
+      postSourceConstructionSignal_.connect_front(iSlot);
+    }
+    // WARNING - ModuleDescription is not in fixed place.  See note M above.
+    AR_WATCH_USING_METHOD_1(watchPostSourceConstruction)
+
+    typedef signalslot::Signal<void(
+        eventsetup::ComponentDescription const*, eventsetup::EventSetupRecordKey const&, eventsetup::DataKey const&)>
+        PreLockEventSetupGet;
+    ///signal is emitted before lock taken in EventSetup DataProxy::get function
+    PreLockEventSetupGet preLockEventSetupGetSignal_;
+    void watchPreLockEventSetupGet(PreLockEventSetupGet::slot_type const& iSlot) {
+      preLockEventSetupGetSignal_.connect(iSlot);
+    }
+    AR_WATCH_USING_METHOD_3(watchPreLockEventSetupGet)
+
+    typedef signalslot::Signal<void(
+        eventsetup::ComponentDescription const*, eventsetup::EventSetupRecordKey const&, eventsetup::DataKey const&)>
+        PostLockEventSetupGet;
+    ///signal is emitted after lock taken in EventSetup DataProxy::get function
+    PostLockEventSetupGet postLockEventSetupGetSignal_;
+    void watchPostLockEventSetupGet(PostLockEventSetupGet::slot_type const& iSlot) {
+      postLockEventSetupGetSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_3(watchPostLockEventSetupGet)
+
+    typedef signalslot::Signal<void(
+        eventsetup::ComponentDescription const*, eventsetup::EventSetupRecordKey const&, eventsetup::DataKey const&)>
+        PostEventSetupGet;
+    ///signal is emitted after getImpl has returned in the EventSetup DataProxy::get function
+    PostEventSetupGet postEventSetupGetSignal_;
+    void watchPostEventSetupGet(PostEventSetupGet::slot_type const& iSlot) {
+      postEventSetupGetSignal_.connect_front(iSlot);
+    }
+    AR_WATCH_USING_METHOD_3(watchPostEventSetupGet)
+
+    // ---------- member functions ---------------------------
+
+    ///forwards our signals to slots connected to iOther
+    void connect(ActivityRegistry& iOther);
+
+    ///forwards our subprocess independent signals to slots connected to iOther
+    ///forwards iOther's subprocess dependent signals to slots connected to this
+    void connectToSubProcess(ActivityRegistry& iOther);
+
+    ///copy the slots from iOther and connect them directly to our own
+    /// this allows us to 'forward' signals more efficiently,
+    /// BUT if iOther gains new slots after this call, we will not see them
+    /// This is also careful to keep the order of the slots proper
+    /// for services.
+    void copySlotsFrom(ActivityRegistry& iOther);
+
+  private:
+    // forwards subprocess independent signals to slots connected to iOther
+    void connectGlobals(ActivityRegistry& iOther);
+
+    // forwards subprocess dependent signals to slots connected to iOther
+    void connectLocals(ActivityRegistry& iOther);
+  };
+}  // namespace edm
 #undef AR_WATCH_USING_METHOD
 #endif
diff --git a/FWCore/ServiceRegistry/interface/ConsumesInfo.h b/FWCore/ServiceRegistry/interface/ConsumesInfo.h
index 67391972d56ab..9827667bc4104 100644
--- a/FWCore/ServiceRegistry/interface/ConsumesInfo.h
+++ b/FWCore/ServiceRegistry/interface/ConsumesInfo.h
@@ -22,7 +22,6 @@
 namespace edm {
   class ConsumesInfo {
   public:
-
     ConsumesInfo(TypeID const& iType,
                  char const* iLabel,
                  char const* iInstance,
@@ -52,7 +51,6 @@ namespace edm {
     //    from and it is possible for this to vary from event to event)
 
   private:
-
     TypeID type_;
     std::string label_;
     std::string instance_;
@@ -62,5 +60,5 @@ namespace edm {
     bool alwaysGets_;
     bool skipCurrentProcess_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ServiceRegistry/interface/CurrentModuleOnThread.h b/FWCore/ServiceRegistry/interface/CurrentModuleOnThread.h
index 2c4e2e8dafa86..30ca1b07d29e0 100644
--- a/FWCore/ServiceRegistry/interface/CurrentModuleOnThread.h
+++ b/FWCore/ServiceRegistry/interface/CurrentModuleOnThread.h
@@ -14,16 +14,13 @@ namespace edm {
 
   class CurrentModuleOnThread {
   public:
-    static ModuleCallingContext const* getCurrentModuleOnThread() {
-      return currentModuleOnThread_;
-    }
+    static ModuleCallingContext const* getCurrentModuleOnThread() { return currentModuleOnThread_; }
+
   private:
     friend class ModuleContextSentry;
-    static void setCurrentModuleOnThread(ModuleCallingContext const* v) {
-      currentModuleOnThread_ = v;
-    }
+    static void setCurrentModuleOnThread(ModuleCallingContext const* v) { currentModuleOnThread_ = v; }
 
     static thread_local ModuleCallingContext const* currentModuleOnThread_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ServiceRegistry/interface/GlobalContext.h b/FWCore/ServiceRegistry/interface/GlobalContext.h
index 3bd74a2b04e17..b8b14b99b8dd4 100644
--- a/FWCore/ServiceRegistry/interface/GlobalContext.h
+++ b/FWCore/ServiceRegistry/interface/GlobalContext.h
@@ -27,9 +27,7 @@ namespace edm {
   class ProcessContext;
 
   class GlobalContext {
-
   public:
-
     enum class Transition {
       kBeginJob,
       kBeginRun,
@@ -40,19 +38,19 @@ namespace edm {
       kWriteRun,
       kWriteLuminosityBlock
     };
-    
+
     GlobalContext(Transition transition,
                   LuminosityBlockID const& luminosityBlockID,
                   RunIndex const& runIndex,
-                  LuminosityBlockIndex const& luminosityBlockIndex, 
-                  Timestamp const & timestamp,
+                  LuminosityBlockIndex const& luminosityBlockIndex,
+                  Timestamp const& timestamp,
                   ProcessContext const* processContext);
 
     Transition transition() const { return transition_; }
-    bool isAtEndTransition() const { return transition() == Transition::kEndLuminosityBlock or
-      transition() == Transition::kEndRun or
-      transition() == Transition::kWriteRun or
-      transition() == Transition::kWriteLuminosityBlock;}
+    bool isAtEndTransition() const {
+      return transition() == Transition::kEndLuminosityBlock or transition() == Transition::kEndRun or
+             transition() == Transition::kWriteRun or transition() == Transition::kWriteLuminosityBlock;
+    }
 
     LuminosityBlockID const& luminosityBlockID() const { return luminosityBlockID_; }
     RunIndex const& runIndex() const { return runIndex_; }
@@ -64,12 +62,12 @@ namespace edm {
     Transition transition_;
     LuminosityBlockID luminosityBlockID_;
     RunIndex runIndex_;
-    LuminosityBlockIndex luminosityBlockIndex_; 
+    LuminosityBlockIndex luminosityBlockIndex_;
     Timestamp timestamp_;
     ProcessContext const* processContext_;
   };
 
   void exceptionContext(std::ostream&, GlobalContext const&);
   std::ostream& operator<<(std::ostream&, GlobalContext const&);
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ServiceRegistry/interface/InternalContext.h b/FWCore/ServiceRegistry/interface/InternalContext.h
index 50642b4c7f5e1..456e542f6d650 100644
--- a/FWCore/ServiceRegistry/interface/InternalContext.h
+++ b/FWCore/ServiceRegistry/interface/InternalContext.h
@@ -21,20 +21,17 @@ namespace edm {
   class ModuleCallingContext;
 
   class InternalContext {
-
   public:
+    InternalContext(EventID const& eventID, ModuleCallingContext const*);
 
-    InternalContext(EventID const& eventID,
-                    ModuleCallingContext const*);
-
-    EventID const& eventID() const { return eventID_; } // event#==0 is a lumi, event#==0&lumi#==0 is a run
+    EventID const& eventID() const { return eventID_; }  // event#==0 is a lumi, event#==0&lumi#==0 is a run
     ModuleCallingContext const* moduleCallingContext() const { return moduleCallingContext_; }
 
   private:
-    EventID eventID_; // event#==0 is a lumi, event#==0&lumi#==0 is a run
+    EventID eventID_;  // event#==0 is a lumi, event#==0&lumi#==0 is a run
     ModuleCallingContext const* moduleCallingContext_;
   };
 
   std::ostream& operator<<(std::ostream&, InternalContext const&);
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ServiceRegistry/interface/ModuleCallingContext.h b/FWCore/ServiceRegistry/interface/ModuleCallingContext.h
index bb2ad89a41060..3dba2fe27add7 100644
--- a/FWCore/ServiceRegistry/interface/ModuleCallingContext.h
+++ b/FWCore/ServiceRegistry/interface/ModuleCallingContext.h
@@ -26,10 +26,8 @@ namespace edm {
   class PlaceInPathContext;
   class StreamContext;
 
-
   class ModuleCallingContext {
   public:
-
     typedef ParentContext::Type Type;
 
     enum class State {
@@ -45,9 +43,7 @@ namespace edm {
                          ParentContext const& parent,
                          ModuleCallingContext const* previousOnThread);
 
-    void setContext(State state,
-                    ParentContext const& parent,
-                    ModuleCallingContext const* previousOnThread);
+    void setContext(State state, ParentContext const& parent, ModuleCallingContext const* previousOnThread);
 
     void setState(State state) { state_ = state; }
 
@@ -86,5 +82,5 @@ namespace edm {
   };
 
   std::ostream& operator<<(std::ostream&, ModuleCallingContext const&);
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ServiceRegistry/interface/ParentContext.h b/FWCore/ServiceRegistry/interface/ParentContext.h
index e51407ab7911c..f7abad1af8c57 100644
--- a/FWCore/ServiceRegistry/interface/ParentContext.h
+++ b/FWCore/ServiceRegistry/interface/ParentContext.h
@@ -26,15 +26,7 @@ namespace edm {
 
   class ParentContext {
   public:
-
-    enum class Type {
-      kGlobal,
-      kInternal,
-      kModule,
-      kPlaceInPath,
-      kStream,
-      kInvalid
-    };
+    enum class Type { kGlobal, kInternal, kModule, kPlaceInPath, kStream, kInvalid };
 
     ParentContext();
     ParentContext(GlobalContext const*);
@@ -46,7 +38,7 @@ namespace edm {
     Type type() const { return type_; }
 
     bool isAtEndTransition() const;
-    
+
     GlobalContext const* globalContext() const;
     InternalContext const* internalContext() const;
     ModuleCallingContext const* moduleCallingContext() const;
@@ -66,5 +58,5 @@ namespace edm {
   };
 
   std::ostream& operator<<(std::ostream&, ParentContext const&);
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ServiceRegistry/interface/PathContext.h b/FWCore/ServiceRegistry/interface/PathContext.h
index c499d3b440cd6..9b50830a6a0af 100644
--- a/FWCore/ServiceRegistry/interface/PathContext.h
+++ b/FWCore/ServiceRegistry/interface/PathContext.h
@@ -23,16 +23,9 @@ namespace edm {
 
   class PathContext {
   public:
+    enum class PathType { kPath, kEndPath };
 
-    enum class PathType {
-      kPath,
-      kEndPath
-    };
-
-    PathContext(std::string const& pathName,
-                StreamContext const* streamContext,
-                unsigned int pathID,
-                PathType pathType);
+    PathContext(std::string const& pathName, StreamContext const* streamContext, unsigned int pathID, PathType pathType);
 
     std::string const& pathName() const { return pathName_; }
     StreamContext const* streamContext() const { return streamContext_; }
@@ -49,5 +42,5 @@ namespace edm {
   };
 
   std::ostream& operator<<(std::ostream&, PathContext const&);
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ServiceRegistry/interface/PathsAndConsumesOfModulesBase.h b/FWCore/ServiceRegistry/interface/PathsAndConsumesOfModulesBase.h
index b359bb7533be7..c37eba496d2c1 100644
--- a/FWCore/ServiceRegistry/interface/PathsAndConsumesOfModulesBase.h
+++ b/FWCore/ServiceRegistry/interface/PathsAndConsumesOfModulesBase.h
@@ -33,19 +33,14 @@ namespace edm {
 
   class PathsAndConsumesOfModulesBase {
   public:
-
     virtual ~PathsAndConsumesOfModulesBase();
 
     std::vector<std::string> const& paths() const { return doPaths(); }
     std::vector<std::string> const& endPaths() const { return doEndPaths(); }
 
-    std::vector<ModuleDescription const*> const& allModules() const {
-      return doAllModules();
-    }
+    std::vector<ModuleDescription const*> const& allModules() const { return doAllModules(); }
 
-    ModuleDescription const* moduleDescription(unsigned int moduleID) const {
-      return doModuleDescription(moduleID);
-    }
+    ModuleDescription const* moduleDescription(unsigned int moduleID) const { return doModuleDescription(moduleID); }
 
     std::vector<ModuleDescription const*> const& modulesOnPath(unsigned int pathIndex) const {
       return doModulesOnPath(pathIndex);
@@ -76,20 +71,18 @@ namespace edm {
     // expect this to be called during a normal production job where
     // performance and memory are important. These objects are bigger
     // than just a pointer.
-    std::vector<ConsumesInfo> consumesInfo(unsigned int moduleID) const {
-      return doConsumesInfo(moduleID);
-    }
+    std::vector<ConsumesInfo> consumesInfo(unsigned int moduleID) const { return doConsumesInfo(moduleID); }
 
   private:
-
     virtual std::vector<std::string> const& doPaths() const = 0;
     virtual std::vector<std::string> const& doEndPaths() const = 0;
     virtual std::vector<ModuleDescription const*> const& doAllModules() const = 0;
     virtual ModuleDescription const* doModuleDescription(unsigned int moduleID) const = 0;
     virtual std::vector<ModuleDescription const*> const& doModulesOnPath(unsigned int pathIndex) const = 0;
     virtual std::vector<ModuleDescription const*> const& doModulesOnEndPath(unsigned int endPathIndex) const = 0;
-    virtual std::vector<ModuleDescription const*> const& doModulesWhoseProductsAreConsumedBy(unsigned int moduleID) const = 0;
+    virtual std::vector<ModuleDescription const*> const& doModulesWhoseProductsAreConsumedBy(
+        unsigned int moduleID) const = 0;
     virtual std::vector<ConsumesInfo> doConsumesInfo(unsigned int moduleID) const = 0;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ServiceRegistry/interface/PlaceInPathContext.h b/FWCore/ServiceRegistry/interface/PlaceInPathContext.h
index a39b4f8f94685..d7d2ccac77b9c 100644
--- a/FWCore/ServiceRegistry/interface/PlaceInPathContext.h
+++ b/FWCore/ServiceRegistry/interface/PlaceInPathContext.h
@@ -17,9 +17,7 @@ namespace edm {
   class PathContext;
 
   class PlaceInPathContext {
-
   public:
-
     PlaceInPathContext(unsigned int);
 
     unsigned int placeInPath() const { return placeInPath_; }
@@ -33,5 +31,5 @@ namespace edm {
   };
 
   std::ostream& operator<<(std::ostream&, PlaceInPathContext const&);
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ServiceRegistry/interface/ProcessContext.h b/FWCore/ServiceRegistry/interface/ProcessContext.h
index c5d0f469e9ba5..9fcfec28af0c9 100644
--- a/FWCore/ServiceRegistry/interface/ProcessContext.h
+++ b/FWCore/ServiceRegistry/interface/ProcessContext.h
@@ -25,9 +25,7 @@ to Services as an argument to their callback functions.
 namespace edm {
 
   class ProcessContext {
-
   public:
-
     ProcessContext();
 
     std::string const& processName() const { return processConfiguration_->processName(); }
@@ -40,7 +38,6 @@ namespace edm {
     void setParentProcessContext(ProcessContext const* parentProcessContext);
 
   private:
-
     ProcessConfiguration const* processConfiguration_;
 
     // If this is a SubProcess this points to the parent process,
@@ -49,5 +46,5 @@ namespace edm {
   };
 
   std::ostream& operator<<(std::ostream&, ProcessContext const&);
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ServiceRegistry/interface/RandomEngineSentry.h b/FWCore/ServiceRegistry/interface/RandomEngineSentry.h
index 4b6c66833be38..3bf29b4c64f44 100644
--- a/FWCore/ServiceRegistry/interface/RandomEngineSentry.h
+++ b/FWCore/ServiceRegistry/interface/RandomEngineSentry.h
@@ -24,17 +24,17 @@ namespace edm {
   class LuminosityBlockIndex;
   class StreamID;
 
-  template <class T> class RandomEngineSentry {
+  template <class T>
+  class RandomEngineSentry {
   public:
-
-    explicit RandomEngineSentry(T* t, CLHEP::HepRandomEngine* engine): t_(t), engine_(engine) {
-      if(t) {
+    explicit RandomEngineSentry(T* t, CLHEP::HepRandomEngine* engine) : t_(t), engine_(engine) {
+      if (t) {
         t->setRandomEngine(engine);
       }
     }
 
-    explicit RandomEngineSentry(T* t, StreamID const& streamID): t_(t), engine_(nullptr) {
-      if(t) {
+    explicit RandomEngineSentry(T* t, StreamID const& streamID) : t_(t), engine_(nullptr) {
+      if (t) {
         Service<RandomNumberGenerator> rng;
         if (!rng.isAvailable()) {
           throw cms::Exception("Configuration")
@@ -46,8 +46,8 @@ namespace edm {
       }
     }
 
-    explicit RandomEngineSentry(T* t, LuminosityBlockIndex const& lumi): t_(t), engine_(nullptr) {
-      if(t) {
+    explicit RandomEngineSentry(T* t, LuminosityBlockIndex const& lumi) : t_(t), engine_(nullptr) {
+      if (t) {
         Service<RandomNumberGenerator> rng;
         if (!rng.isAvailable()) {
           throw cms::Exception("Configuration")
@@ -59,14 +59,17 @@ namespace edm {
       }
     }
 
-    ~RandomEngineSentry() { if(t_) t_->setRandomEngine(nullptr); }
+    ~RandomEngineSentry() {
+      if (t_)
+        t_->setRandomEngine(nullptr);
+    }
 
-    CLHEP::HepRandomEngine const* randomEngine() const {return get_underlying_safe(engine_);}
-    CLHEP::HepRandomEngine*& randomEngine() {return get_underlying_safe(engine_);}
+    CLHEP::HepRandomEngine const* randomEngine() const { return get_underlying_safe(engine_); }
+    CLHEP::HepRandomEngine*& randomEngine() { return get_underlying_safe(engine_); }
 
   private:
     edm::propagate_const<T*> t_;
     edm::propagate_const<CLHEP::HepRandomEngine*> engine_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ServiceRegistry/interface/SaveConfiguration.h b/FWCore/ServiceRegistry/interface/SaveConfiguration.h
index 46f59dc98e965..41090c929b329 100644
--- a/FWCore/ServiceRegistry/interface/SaveConfiguration.h
+++ b/FWCore/ServiceRegistry/interface/SaveConfiguration.h
@@ -4,7 +4,7 @@
 //
 // Package:     ServiceRegistry
 // Class  :     SaveConfiguration
-// 
+//
 /**\class SaveConfiguration SaveConfiguration.h FWCore/ServiceRegistry/interface/SaveConfiguration.h
 
  Description: 'Concept' class used to decide if a Service's parameters should be saved
@@ -26,11 +26,9 @@
 // forward declarations
 
 namespace edm {
-   namespace serviceregistry {
-      class SaveConfiguration
-      {
-      };
-   }
-}
+  namespace serviceregistry {
+    class SaveConfiguration {};
+  }  // namespace serviceregistry
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ServiceRegistry/interface/Service.h b/FWCore/ServiceRegistry/interface/Service.h
index a6af123b803e4..377be8e5a2d00 100644
--- a/FWCore/ServiceRegistry/interface/Service.h
+++ b/FWCore/ServiceRegistry/interface/Service.h
@@ -4,7 +4,7 @@
 //
 // Package:     ServiceRegistry
 // Class  :     Service
-// 
+//
 /**\class Service Service.h FWCore/ServiceRegistry/interface/Service.h
 
  Description: Smart pointer used to give easy access to Service's
@@ -26,38 +26,28 @@
 // forward declarations
 
 namespace edm {
-   template<class T>
-   class Service
-{
-   
-   public:
-   Service() {}
-   //virtual ~Service();
-   
-   // ---------- const member functions ---------------------
-   T* operator->() const {
-      return &(ServiceRegistry::instance().template get<T>());
-   }
-
-   T& operator*() const {
-      return ServiceRegistry::instance().template get<T>();
-   }
-   
-   bool isAvailable() const {
-      return ServiceRegistry::instance().template isAvailable<T>();
-   }
-   
-   operator bool() const {
-      return isAvailable();
-   }
-   
-   // ---------- static member functions --------------------
-   
-   // ---------- member functions ---------------------------
-   
-   private:
-};
-
-}
+  template <class T>
+  class Service {
+  public:
+    Service() {}
+    //virtual ~Service();
+
+    // ---------- const member functions ---------------------
+    T* operator->() const { return &(ServiceRegistry::instance().template get<T>()); }
+
+    T& operator*() const { return ServiceRegistry::instance().template get<T>(); }
+
+    bool isAvailable() const { return ServiceRegistry::instance().template isAvailable<T>(); }
+
+    operator bool() const { return isAvailable(); }
+
+    // ---------- static member functions --------------------
+
+    // ---------- member functions ---------------------------
+
+  private:
+  };
+
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ServiceRegistry/interface/ServiceLegacy.h b/FWCore/ServiceRegistry/interface/ServiceLegacy.h
index c9f618bf7db03..484d84f91d2b8 100644
--- a/FWCore/ServiceRegistry/interface/ServiceLegacy.h
+++ b/FWCore/ServiceRegistry/interface/ServiceLegacy.h
@@ -4,7 +4,7 @@
 //
 // Package:     ServiceRegistry
 // Class  :     ServiceLegacy
-// 
+//
 /**\class ServiceLegacy ServiceLegacy.h FWCore/ServiceRegistry/interface/ServiceLegacy.h
 
  Description: Enumeration of how Services inherit from other Service sets
@@ -25,13 +25,9 @@
 // forward declarations
 
 namespace edm {
-   namespace serviceregistry {
-      enum ServiceLegacy {
-         kOverlapIsError,
-         kTokenOverrides,
-         kConfigurationOverrides
-      };
-   }
-}
+  namespace serviceregistry {
+    enum ServiceLegacy { kOverlapIsError, kTokenOverrides, kConfigurationOverrides };
+  }
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ServiceRegistry/interface/ServiceMaker.h b/FWCore/ServiceRegistry/interface/ServiceMaker.h
index 3cf8f21ad9f2f..1ea67e528464e 100644
--- a/FWCore/ServiceRegistry/interface/ServiceMaker.h
+++ b/FWCore/ServiceRegistry/interface/ServiceMaker.h
@@ -32,92 +32,84 @@
 // forward declarations
 
 namespace edm {
-   class ActivityRegistry;
-   class ParameterSet;
-
-   namespace serviceregistry {
-
-      template<typename T, typename TConcrete>
-      struct MakerBase {
-         typedef T interface_t;
-         typedef TConcrete concrete_t;
-      };
-
-      template<typename T, typename TConcrete = T>
-         struct AllArgsMaker : public MakerBase<T, TConcrete> {
-
-         std::unique_ptr<T> make(ParameterSet const& iPS,
-                               ActivityRegistry& iAR) const {
-            return std::make_unique<TConcrete>(iPS, iAR);
-         }
-      };
-
-      template<typename T, typename TConcrete = T>
-      struct ParameterSetMaker : public MakerBase<T, TConcrete> {
-         std::unique_ptr<T> make(ParameterSet const& iPS,
-                               ActivityRegistry& /* iAR */) const {
-            return std::make_unique<TConcrete>(iPS);
-         }
-      };
-
-      template<typename T, typename TConcrete = T>
-      struct NoArgsMaker : public MakerBase<T, TConcrete> {
-         std::unique_ptr<T> make(ParameterSet const& /* iPS */,
-                               ActivityRegistry& /* iAR */) const {
-            return std::make_unique<TConcrete>();
-         }
-      };
-
-      template<typename T, typename TMaker = AllArgsMaker<T> >
-      class ServiceMaker : public ServiceMakerBase {
-
-public:
-         ServiceMaker() {}
-         //virtual ~ServiceMaker();
-
-         // ---------- const member functions ---------------------
-         std::type_info const& serviceType() const override { return typeid(T); }
-
-         bool make(ParameterSet const& iPS,
-                           ActivityRegistry& iAR,
-                           ServicesManager& oSM) const override {
-            TMaker maker;
-            std::unique_ptr<T> pService(maker.make(iPS, iAR));
-            auto ptr = std::make_shared<ServiceWrapper<T> >(std::move(pService));
-            return oSM.put(ptr);
-         }
-
-         bool saveConfiguration() const override {
-            return ServiceMakerBase::testSaveConfiguration(static_cast<typename TMaker::concrete_t const*>(nullptr));
-         }
-
-         bool processWideService() const override {
-            return service::isProcessWideService(static_cast<typename TMaker::concrete_t const*>(nullptr));
-         }
-
-         // ---------- static member functions --------------------
-
-         // ---------- member functions ---------------------------
-
-private:
-         ServiceMaker(ServiceMaker const&) = delete; // stop default
-
-         ServiceMaker const& operator=(ServiceMaker const&) = delete; // stop default
-
-         // ---------- member data --------------------------------
-
-      };
-   }
-}
-
-#define DEFINE_FWK_SERVICE(type) \
-DEFINE_EDM_PLUGIN (edm::serviceregistry::ServicePluginFactory, edm::serviceregistry::ServiceMaker<type>, #type); \
-DEFINE_DESC_FILLER_FOR_SERVICES(type, type)
-
-#define DEFINE_FWK_SERVICE_MAKER(concrete, maker) \
-typedef edm::serviceregistry::ServiceMaker<maker::interface_t, maker> concrete ## _ ## _t; \
-DEFINE_EDM_PLUGIN (edm::serviceregistry::ServicePluginFactory, concrete ## _ ##  _t , #concrete); \
-typedef maker::concrete_t concrete ## _ ## _ ## _t; \
-DEFINE_DESC_FILLER_FOR_SERVICES(concrete, concrete ## _ ## _ ## _t)
+  class ActivityRegistry;
+  class ParameterSet;
+
+  namespace serviceregistry {
+
+    template <typename T, typename TConcrete>
+    struct MakerBase {
+      typedef T interface_t;
+      typedef TConcrete concrete_t;
+    };
+
+    template <typename T, typename TConcrete = T>
+    struct AllArgsMaker : public MakerBase<T, TConcrete> {
+      std::unique_ptr<T> make(ParameterSet const& iPS, ActivityRegistry& iAR) const {
+        return std::make_unique<TConcrete>(iPS, iAR);
+      }
+    };
+
+    template <typename T, typename TConcrete = T>
+    struct ParameterSetMaker : public MakerBase<T, TConcrete> {
+      std::unique_ptr<T> make(ParameterSet const& iPS, ActivityRegistry& /* iAR */) const {
+        return std::make_unique<TConcrete>(iPS);
+      }
+    };
+
+    template <typename T, typename TConcrete = T>
+    struct NoArgsMaker : public MakerBase<T, TConcrete> {
+      std::unique_ptr<T> make(ParameterSet const& /* iPS */, ActivityRegistry& /* iAR */) const {
+        return std::make_unique<TConcrete>();
+      }
+    };
+
+    template <typename T, typename TMaker = AllArgsMaker<T> >
+    class ServiceMaker : public ServiceMakerBase {
+    public:
+      ServiceMaker() {}
+      //virtual ~ServiceMaker();
+
+      // ---------- const member functions ---------------------
+      std::type_info const& serviceType() const override { return typeid(T); }
+
+      bool make(ParameterSet const& iPS, ActivityRegistry& iAR, ServicesManager& oSM) const override {
+        TMaker maker;
+        std::unique_ptr<T> pService(maker.make(iPS, iAR));
+        auto ptr = std::make_shared<ServiceWrapper<T> >(std::move(pService));
+        return oSM.put(ptr);
+      }
+
+      bool saveConfiguration() const override {
+        return ServiceMakerBase::testSaveConfiguration(static_cast<typename TMaker::concrete_t const*>(nullptr));
+      }
+
+      bool processWideService() const override {
+        return service::isProcessWideService(static_cast<typename TMaker::concrete_t const*>(nullptr));
+      }
+
+      // ---------- static member functions --------------------
+
+      // ---------- member functions ---------------------------
+
+    private:
+      ServiceMaker(ServiceMaker const&) = delete;  // stop default
+
+      ServiceMaker const& operator=(ServiceMaker const&) = delete;  // stop default
+
+      // ---------- member data --------------------------------
+    };
+  }  // namespace serviceregistry
+}  // namespace edm
+
+#define DEFINE_FWK_SERVICE(type)                                                                                  \
+  DEFINE_EDM_PLUGIN(edm::serviceregistry::ServicePluginFactory, edm::serviceregistry::ServiceMaker<type>, #type); \
+  DEFINE_DESC_FILLER_FOR_SERVICES(type, type)
+
+#define DEFINE_FWK_SERVICE_MAKER(concrete, maker)                                            \
+  typedef edm::serviceregistry::ServiceMaker<maker::interface_t, maker> concrete##_##_t;     \
+  DEFINE_EDM_PLUGIN(edm::serviceregistry::ServicePluginFactory, concrete##_##_t, #concrete); \
+  typedef maker::concrete_t concrete##_##_##_t;                                              \
+  DEFINE_DESC_FILLER_FOR_SERVICES(concrete, concrete##_##_##_t)
 
 #endif
diff --git a/FWCore/ServiceRegistry/interface/ServiceMakerBase.h b/FWCore/ServiceRegistry/interface/ServiceMakerBase.h
index 45dfb6514656d..49c7e1ceeb248 100644
--- a/FWCore/ServiceRegistry/interface/ServiceMakerBase.h
+++ b/FWCore/ServiceRegistry/interface/ServiceMakerBase.h
@@ -18,58 +18,52 @@
 //         Created:  Mon Sep  5 13:33:00 EDT 2005
 //
 
-
 #include <typeinfo>
 
 // forward declarations
 namespace edm {
-   class ParameterSet;
-   class ActivityRegistry;
-
-   namespace service {
-      inline bool isProcessWideService(void const* /*service*/) {
-        return false;
-      }
-   }
+  class ParameterSet;
+  class ActivityRegistry;
 
-   namespace serviceregistry {
-      class SaveConfiguration;
-      class ServiceWrapperBase;
-      class ServicesManager;
+  namespace service {
+    inline bool isProcessWideService(void const* /*service*/) { return false; }
+  }  // namespace service
 
-      class ServiceMakerBase {
+  namespace serviceregistry {
+    class SaveConfiguration;
+    class ServiceWrapperBase;
+    class ServicesManager;
 
-public:
-         ServiceMakerBase();
-         virtual ~ServiceMakerBase();
+    class ServiceMakerBase {
+    public:
+      ServiceMakerBase();
+      virtual ~ServiceMakerBase();
 
-         // ---------- const member functions ---------------------
-         virtual std::type_info const& serviceType() const = 0;
+      // ---------- const member functions ---------------------
+      virtual std::type_info const& serviceType() const = 0;
 
-         virtual bool make(ParameterSet const&,
-                           ActivityRegistry&,
-                           ServicesManager&) const = 0;
+      virtual bool make(ParameterSet const&, ActivityRegistry&, ServicesManager&) const = 0;
 
-         virtual bool processWideService() const = 0;
+      virtual bool processWideService() const = 0;
 
-         virtual bool saveConfiguration() const = 0;
+      virtual bool saveConfiguration() const = 0;
 
-         // ---------- static member functions --------------------
+      // ---------- static member functions --------------------
 
-         // ---------- member functions ---------------------------
+      // ---------- member functions ---------------------------
 
-protected:
-         bool testSaveConfiguration(SaveConfiguration const*) const {return true;}
-         bool testSaveConfiguration(void const*) const {return false;}
+    protected:
+      bool testSaveConfiguration(SaveConfiguration const*) const { return true; }
+      bool testSaveConfiguration(void const*) const { return false; }
 
-private:
-         ServiceMakerBase(ServiceMakerBase const&) = delete; // stop default
+    private:
+      ServiceMakerBase(ServiceMakerBase const&) = delete;  // stop default
 
-         ServiceMakerBase const& operator=(ServiceMakerBase const&) = delete; // stop default
+      ServiceMakerBase const& operator=(ServiceMakerBase const&) = delete;  // stop default
 
-         // ---------- member data --------------------------------
-      };
-   }
-}
+      // ---------- member data --------------------------------
+    };
+  }  // namespace serviceregistry
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ServiceRegistry/interface/ServicePluginFactory.h b/FWCore/ServiceRegistry/interface/ServicePluginFactory.h
index 8ce559a6819c7..193e8d9ce13f9 100644
--- a/FWCore/ServiceRegistry/interface/ServicePluginFactory.h
+++ b/FWCore/ServiceRegistry/interface/ServicePluginFactory.h
@@ -4,7 +4,7 @@
 //
 // Package:     ServiceRegistry
 // Class  :     ServicePluginFactory
-// 
+//
 /**\class ServicePluginFactory ServicePluginFactory.h FWCore/ServiceRegistry/interface/ServicePluginFactory.h
 
  Description: <one line class summary>
@@ -25,11 +25,11 @@
 
 // forward declarations
 namespace edm {
-   namespace serviceregistry {
-      class ServiceMakerBase;
-      
-     typedef edmplugin::PluginFactory< ServiceMakerBase* ()> ServicePluginFactory;
-   }
-}
+  namespace serviceregistry {
+    class ServiceMakerBase;
+
+    typedef edmplugin::PluginFactory<ServiceMakerBase*()> ServicePluginFactory;
+  }  // namespace serviceregistry
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ServiceRegistry/interface/ServiceRegistry.h b/FWCore/ServiceRegistry/interface/ServiceRegistry.h
index e5e966db3bab7..6ae7ee09d5a8d 100644
--- a/FWCore/ServiceRegistry/interface/ServiceRegistry.h
+++ b/FWCore/ServiceRegistry/interface/ServiceRegistry.h
@@ -29,122 +29,119 @@
 
 // forward declarations
 namespace edm {
-   class FwkImpl;
-   namespace serviceregistry {
-      template< typename T> class ServiceWrapper;
-   }
-
-   class ServiceRegistry {
-   public:
-
-      class Operate {
-      public:
-         Operate(ServiceToken const& iToken) :
-         oldToken_(ServiceRegistry::instance().setContext(iToken)) {}
-         ~Operate() {
-            ServiceRegistry::instance().unsetContext(oldToken_);
-         }
-
-         //override operator new to stop use on heap?
-      private:
-         Operate(Operate const&) = delete; //stop default
-         Operate const& operator=(Operate const&) = delete; //stop default
-         ServiceToken oldToken_;
-      };
-
-      friend class edm::FwkImpl;
-      friend int main(int argc, char* argv[]);
-      friend class Operate;
-
-      virtual ~ServiceRegistry();
-
-      // ---------- const member functions ---------------------
-      template<typename T>
-      T& get() const {
-         if(nullptr == manager_.get()) {
-            Exception::throwThis(errors::NotFound,
-              "Service"
-              " no ServiceRegistry has been set for this thread");
-         }
-         return manager_-> template get<T>();
+  class FwkImpl;
+  namespace serviceregistry {
+    template <typename T>
+    class ServiceWrapper;
+  }
+
+  class ServiceRegistry {
+  public:
+    class Operate {
+    public:
+      Operate(ServiceToken const& iToken) : oldToken_(ServiceRegistry::instance().setContext(iToken)) {}
+      ~Operate() { ServiceRegistry::instance().unsetContext(oldToken_); }
+
+      //override operator new to stop use on heap?
+    private:
+      Operate(Operate const&) = delete;                   //stop default
+      Operate const& operator=(Operate const&) = delete;  //stop default
+      ServiceToken oldToken_;
+    };
+
+    friend class edm::FwkImpl;
+    friend int main(int argc, char* argv[]);
+    friend class Operate;
+
+    virtual ~ServiceRegistry();
+
+    // ---------- const member functions ---------------------
+    template <typename T>
+    T& get() const {
+      if (nullptr == manager_.get()) {
+        Exception::throwThis(errors::NotFound,
+                             "Service"
+                             " no ServiceRegistry has been set for this thread");
       }
-
-      template<typename T>
-      bool isAvailable() const {
-         if(nullptr == manager_.get()) {
-            Exception::throwThis(errors::NotFound,
-              "Service"
-              " no ServiceRegistry has been set for this thread");
-         }
-         return manager_-> template isAvailable<T>();
+      return manager_->template get<T>();
+    }
+
+    template <typename T>
+    bool isAvailable() const {
+      if (nullptr == manager_.get()) {
+        Exception::throwThis(errors::NotFound,
+                             "Service"
+                             " no ServiceRegistry has been set for this thread");
       }
-      /** The token can be passed to another thread in order to have the
+      return manager_->template isAvailable<T>();
+    }
+    /** The token can be passed to another thread in order to have the
          same services available in the other thread.
          */
-      ServiceToken presentToken() const;
-      // ---------- static member functions --------------------
-      static ServiceRegistry& instance();
-
-      // ---------- member functions ---------------------------
-
-      static ServiceToken createServicesFromConfig(std::unique_ptr<ParameterSet> params);
-
-   public: // Made public (temporarily) at the request of Emilio Meschi.
-      static ServiceToken createSet(std::vector<ParameterSet>&);
-      static ServiceToken createSet(std::vector<ParameterSet>&,
-                                    ServiceToken,
-                                    serviceregistry::ServiceLegacy,
-                                    bool associate = true);
-      /// create a service token that holds the service defined by iService
-      template<typename T>
-      static ServiceToken createContaining(std::unique_ptr<T> iService){
-         std::vector<edm::ParameterSet> config;
-         auto manager = std::make_shared<serviceregistry::ServicesManager>(config);
-         auto wrapper = std::make_shared<serviceregistry::ServiceWrapper<T> >(std::move(iService));
-         manager->put(wrapper);
-         return manager;
-      }
-      template<typename T>
-      static ServiceToken createContaining(std::unique_ptr<T> iService,
-                                           ServiceToken iToken,
-                                           serviceregistry::ServiceLegacy iLegacy){
-         std::vector<edm::ParameterSet> config;
-         auto manager = std::make_shared<serviceregistry::ServicesManager>(iToken, iLegacy, config);
-         auto wrapper = std::make_shared<serviceregistry::ServiceWrapper<T> >(std::move(iService));
-         manager->put(wrapper);
-         return manager;
-      }
-      /// create a service token that holds the service held by iWrapper
-      template<typename T>
-      static ServiceToken createContaining(std::shared_ptr<serviceregistry::ServiceWrapper<T> > iWrapper) {
-         std::vector<edm::ParameterSet> config;
-         auto manager = std::make_shared<serviceregistry::ServicesManager>(config);
-         manager->put(iWrapper);
-         return manager;
-      }
-      template<typename T>
-      static ServiceToken createContaining(std::shared_ptr<serviceregistry::ServiceWrapper<T> > iWrapper,
-                                           ServiceToken iToken,
-                                           serviceregistry::ServiceLegacy iLegacy){
-         std::vector<edm::ParameterSet> config;
-         auto manager = std::make_shared<serviceregistry::ServicesManager>(iToken, iLegacy, config);
-         manager->put(iWrapper);
-         return manager;
-      }
-
-private:
-      //returns old token
-      ServiceToken setContext(ServiceToken const& iNewToken);
-      void unsetContext(ServiceToken const& iOldToken);
-
-      ServiceRegistry();
-      ServiceRegistry(ServiceRegistry const&) = delete; // stop default
-
-      ServiceRegistry const& operator=(ServiceRegistry const&) = delete; // stop default
-
-      // ---------- member data --------------------------------
-      std::shared_ptr<serviceregistry::ServicesManager> manager_;
-   };
-}
+    ServiceToken presentToken() const;
+    // ---------- static member functions --------------------
+    static ServiceRegistry& instance();
+
+    // ---------- member functions ---------------------------
+
+    static ServiceToken createServicesFromConfig(std::unique_ptr<ParameterSet> params);
+
+  public:  // Made public (temporarily) at the request of Emilio Meschi.
+    static ServiceToken createSet(std::vector<ParameterSet>&);
+    static ServiceToken createSet(std::vector<ParameterSet>&,
+                                  ServiceToken,
+                                  serviceregistry::ServiceLegacy,
+                                  bool associate = true);
+    /// create a service token that holds the service defined by iService
+    template <typename T>
+    static ServiceToken createContaining(std::unique_ptr<T> iService) {
+      std::vector<edm::ParameterSet> config;
+      auto manager = std::make_shared<serviceregistry::ServicesManager>(config);
+      auto wrapper = std::make_shared<serviceregistry::ServiceWrapper<T> >(std::move(iService));
+      manager->put(wrapper);
+      return manager;
+    }
+    template <typename T>
+    static ServiceToken createContaining(std::unique_ptr<T> iService,
+                                         ServiceToken iToken,
+                                         serviceregistry::ServiceLegacy iLegacy) {
+      std::vector<edm::ParameterSet> config;
+      auto manager = std::make_shared<serviceregistry::ServicesManager>(iToken, iLegacy, config);
+      auto wrapper = std::make_shared<serviceregistry::ServiceWrapper<T> >(std::move(iService));
+      manager->put(wrapper);
+      return manager;
+    }
+    /// create a service token that holds the service held by iWrapper
+    template <typename T>
+    static ServiceToken createContaining(std::shared_ptr<serviceregistry::ServiceWrapper<T> > iWrapper) {
+      std::vector<edm::ParameterSet> config;
+      auto manager = std::make_shared<serviceregistry::ServicesManager>(config);
+      manager->put(iWrapper);
+      return manager;
+    }
+    template <typename T>
+    static ServiceToken createContaining(std::shared_ptr<serviceregistry::ServiceWrapper<T> > iWrapper,
+                                         ServiceToken iToken,
+                                         serviceregistry::ServiceLegacy iLegacy) {
+      std::vector<edm::ParameterSet> config;
+      auto manager = std::make_shared<serviceregistry::ServicesManager>(iToken, iLegacy, config);
+      manager->put(iWrapper);
+      return manager;
+    }
+
+  private:
+    //returns old token
+    ServiceToken setContext(ServiceToken const& iNewToken);
+    void unsetContext(ServiceToken const& iOldToken);
+
+    ServiceRegistry();
+    ServiceRegistry(ServiceRegistry const&) = delete;  // stop default
+
+    ServiceRegistry const& operator=(ServiceRegistry const&) = delete;  // stop default
+
+    // ---------- member data --------------------------------
+    std::shared_ptr<serviceregistry::ServicesManager> manager_;
+  };
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ServiceRegistry/interface/ServiceToken.h b/FWCore/ServiceRegistry/interface/ServiceToken.h
index 39f38b1d5b526..b5f65064bccd0 100644
--- a/FWCore/ServiceRegistry/interface/ServiceToken.h
+++ b/FWCore/ServiceRegistry/interface/ServiceToken.h
@@ -4,7 +4,7 @@
 //
 // Package:     ServiceRegistry
 // Class  :     ServiceToken
-// 
+//
 /**\class ServiceToken ServiceToken.h FWCore/ServiceRegistry/interface/ServiceToken.h
 
  Description: Token used to denote a 'service set' 
@@ -30,52 +30,50 @@ class testServicesManager;
 class TestServicesManagerOrder;
 
 namespace edm {
-   class ServiceRegistry;
-   class ActivityRegistry;
-   
-   namespace serviceregistry {
-      class ServicesManager;
-   }
-   
-   class ServiceToken
-   {
-      friend class edm::ServiceRegistry;
-      friend class edm::serviceregistry::ServicesManager;
-      //for testing
-      friend class ::testServicesManager;
-      friend class ::TestServicesManagerOrder;
-     
-    public:
-      ServiceToken() {}
-      //virtual ~ServiceToken();
-      
-      // ---------- const member functions ---------------------
-
-      // ---------- static member functions --------------------
-
-      // ---------- member functions ---------------------------
-
-      ///the argument's signals are propagated to the Service's held by the token
-      void connectTo(ActivityRegistry&);
-      ///the argument's signals will forward the token's signals
-      void connect(ActivityRegistry&);
-
-      ///copy our Service's slots to the argument's signals
-      void copySlotsTo(ActivityRegistry&);
-      ///the copy the argument's slots to the token's signals
-      void copySlotsFrom(ActivityRegistry&);
-      
-    private:
-      ServiceToken(std::shared_ptr<edm::serviceregistry::ServicesManager>  iManager):
-      manager_(iManager) {}
-      
-      //ServiceToken(const ServiceToken&); // stop default
-
-      //const ServiceToken& operator=(const ServiceToken&); // stop default
-
-      // ---------- member data --------------------------------
-      std::shared_ptr<edm::serviceregistry::ServicesManager> manager_;
-   };
-}
+  class ServiceRegistry;
+  class ActivityRegistry;
+
+  namespace serviceregistry {
+    class ServicesManager;
+  }
+
+  class ServiceToken {
+    friend class edm::ServiceRegistry;
+    friend class edm::serviceregistry::ServicesManager;
+    //for testing
+    friend class ::testServicesManager;
+    friend class ::TestServicesManagerOrder;
+
+  public:
+    ServiceToken() {}
+    //virtual ~ServiceToken();
+
+    // ---------- const member functions ---------------------
+
+    // ---------- static member functions --------------------
+
+    // ---------- member functions ---------------------------
+
+    ///the argument's signals are propagated to the Service's held by the token
+    void connectTo(ActivityRegistry&);
+    ///the argument's signals will forward the token's signals
+    void connect(ActivityRegistry&);
+
+    ///copy our Service's slots to the argument's signals
+    void copySlotsTo(ActivityRegistry&);
+    ///the copy the argument's slots to the token's signals
+    void copySlotsFrom(ActivityRegistry&);
+
+  private:
+    ServiceToken(std::shared_ptr<edm::serviceregistry::ServicesManager> iManager) : manager_(iManager) {}
+
+    //ServiceToken(const ServiceToken&); // stop default
+
+    //const ServiceToken& operator=(const ServiceToken&); // stop default
+
+    // ---------- member data --------------------------------
+    std::shared_ptr<edm::serviceregistry::ServicesManager> manager_;
+  };
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ServiceRegistry/interface/ServiceWrapper.h b/FWCore/ServiceRegistry/interface/ServiceWrapper.h
index 853fb8ea73878..09f3489711046 100644
--- a/FWCore/ServiceRegistry/interface/ServiceWrapper.h
+++ b/FWCore/ServiceRegistry/interface/ServiceWrapper.h
@@ -4,7 +4,7 @@
 //
 // Package:     ServiceRegistry
 // Class  :     ServiceWrapper
-// 
+//
 /**\class ServiceWrapper ServiceWrapper.h FWCore/ServiceRegistry/interface/ServiceWrapper.h
 
  Description: Wrapper around a Service
@@ -27,38 +27,34 @@
 
 // forward declarations
 namespace edm {
-   class ParameterSet;
-   class ActivityRegistry;
+  class ParameterSet;
+  class ActivityRegistry;
+
+  namespace serviceregistry {
+
+    template <class T>
+    class ServiceWrapper : public ServiceWrapperBase {
+    public:
+      ServiceWrapper(std::unique_ptr<T> iService) : service_(std::move(iService)) {}
+      //virtual ~ServiceWrapper();
+
+      // ---------- const member functions ---------------------
+      T const& get() const { return *service_; }
+
+      // ---------- static member functions --------------------
 
-   namespace serviceregistry {
+      // ---------- member functions ---------------------------
+      T& get() { return *service_; }
 
-      template< class T>
-      class ServiceWrapper : public ServiceWrapperBase
-      {
+    private:
+      ServiceWrapper(const ServiceWrapper&) = delete;  // stop default
 
-public:
-         ServiceWrapper(std::unique_ptr<T> iService) :
-         service_(std::move(iService)) {}
-         //virtual ~ServiceWrapper();
-         
-         // ---------- const member functions ---------------------
-         T const& get() const { return *service_; }
-         
-         // ---------- static member functions --------------------
-         
-         // ---------- member functions ---------------------------
-         T& get() { return *service_; }
+      const ServiceWrapper& operator=(const ServiceWrapper&) = delete;  // stop default
 
-private:
-         ServiceWrapper(const ServiceWrapper&) = delete; // stop default
-         
-         const ServiceWrapper& operator=(const ServiceWrapper&) = delete; // stop default
-         
-         // ---------- member data --------------------------------
-         edm::propagate_const<std::unique_ptr<T>> service_;
-         
-      };
-   }
-}
+      // ---------- member data --------------------------------
+      edm::propagate_const<std::unique_ptr<T>> service_;
+    };
+  }  // namespace serviceregistry
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ServiceRegistry/interface/ServiceWrapperBase.h b/FWCore/ServiceRegistry/interface/ServiceWrapperBase.h
index 9839e3fc25036..17599b863dc2c 100644
--- a/FWCore/ServiceRegistry/interface/ServiceWrapperBase.h
+++ b/FWCore/ServiceRegistry/interface/ServiceWrapperBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     ServiceRegistry
 // Class  :     ServiceWrapperBase
-// 
+//
 /**\class ServiceWrapperBase ServiceWrapperBase.h FWCore/ServiceRegistry/interface/ServiceWrapperBase.h
 
  Description: <one line class summary>
@@ -24,30 +24,27 @@
 
 // forward declarations
 namespace edm {
-   namespace serviceregistry {
-      
-      class ServiceWrapperBase
-      {
-
-public:
-         ServiceWrapperBase();
-         virtual ~ServiceWrapperBase();
-
-         // ---------- const member functions ---------------------
-         
-         // ---------- static member functions --------------------
-         
-         // ---------- member functions ---------------------------
-         
-private:
-         ServiceWrapperBase(const ServiceWrapperBase&) = delete; // stop default
-         
-         const ServiceWrapperBase& operator=(const ServiceWrapperBase&) = delete; // stop default
-         
-         // ---------- member data --------------------------------
-         
-      };
-   }
-}
+  namespace serviceregistry {
+
+    class ServiceWrapperBase {
+    public:
+      ServiceWrapperBase();
+      virtual ~ServiceWrapperBase();
+
+      // ---------- const member functions ---------------------
+
+      // ---------- static member functions --------------------
+
+      // ---------- member functions ---------------------------
+
+    private:
+      ServiceWrapperBase(const ServiceWrapperBase&) = delete;  // stop default
+
+      const ServiceWrapperBase& operator=(const ServiceWrapperBase&) = delete;  // stop default
+
+      // ---------- member data --------------------------------
+    };
+  }  // namespace serviceregistry
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ServiceRegistry/interface/ServicesManager.h b/FWCore/ServiceRegistry/interface/ServicesManager.h
index 231ea52a54780..c4f0add8cb8d1 100644
--- a/FWCore/ServiceRegistry/interface/ServicesManager.h
+++ b/FWCore/ServiceRegistry/interface/ServicesManager.h
@@ -35,137 +35,135 @@
 
 // forward declarations
 namespace edm {
-   class ParameterSet;
-   class ServiceToken;
-
-   namespace serviceregistry {
-
-      class ServicesManager {
-public:
-         struct MakerHolder {
-            MakerHolder(std::shared_ptr<ServiceMakerBase> iMaker,
-                        ParameterSet& iPSet,
-                        ActivityRegistry&) ;
-            bool add(ServicesManager&) const;
-
-            edm::propagate_const<std::shared_ptr<ServiceMakerBase>> maker_;
-            ParameterSet* pset_;
-            ActivityRegistry* registry_; // We do not use propagate_const because the registry itself is mutable
-            mutable bool wasAdded_;
-         };
-         typedef std::map<TypeIDBase, std::shared_ptr<ServiceWrapperBase> > Type2Service;
-         typedef std::map<TypeIDBase, MakerHolder> Type2Maker;
-
-         ServicesManager(std::vector<ParameterSet>& iConfiguration);
-
-         /** Takes the services described by iToken and places them into the manager.
+  class ParameterSet;
+  class ServiceToken;
+
+  namespace serviceregistry {
+
+    class ServicesManager {
+    public:
+      struct MakerHolder {
+        MakerHolder(std::shared_ptr<ServiceMakerBase> iMaker, ParameterSet& iPSet, ActivityRegistry&);
+        bool add(ServicesManager&) const;
+
+        edm::propagate_const<std::shared_ptr<ServiceMakerBase>> maker_;
+        ParameterSet* pset_;
+        ActivityRegistry* registry_;  // We do not use propagate_const because the registry itself is mutable
+        mutable bool wasAdded_;
+      };
+      typedef std::map<TypeIDBase, std::shared_ptr<ServiceWrapperBase>> Type2Service;
+      typedef std::map<TypeIDBase, MakerHolder> Type2Maker;
+
+      ServicesManager(std::vector<ParameterSet>& iConfiguration);
+
+      /** Takes the services described by iToken and places them into the manager.
              Conflicts over Services provided by both the iToken and iConfiguration
              are resolved based on the value of iLegacy
          */
-         ServicesManager(ServiceToken iToken,
-                         ServiceLegacy iLegacy,
-                         std::vector<ParameterSet>& iConfiguration,
-                         bool associate = true);
-
-         ~ServicesManager();
-
-         // ---------- const member functions ---------------------
-         template<typename T>
-         T& get() const {
-            Type2Service::const_iterator itFound = type2Service_.find(TypeIDBase(typeid(T)));
-            Type2Maker::const_iterator itFoundMaker ;
-            if(itFound == type2Service_.end()) {
-               //do on demand building of the service
-               if(nullptr == type2Maker_.get() ||
-                   type2Maker_->end() == (itFoundMaker = type2Maker_->find(TypeIDBase(typeid(T))))) {
-                      Exception::throwThis(errors::NotFound,
-                        "Service Request unable to find requested service with compiler type name '",
-                        typeid(T).name(),
-                        "'.\n");
-               } else {
-                  const_cast<ServicesManager&>(*this).createServiceFor(itFoundMaker->second);
-                  itFound = type2Service_.find(TypeIDBase(typeid(T)));
-                  //the 'add()' should have put the service into the list
-                  assert(itFound != type2Service_.end());
-               }
-            }
-            //convert it to its actual type
-            std::shared_ptr<ServiceWrapper<T> > ptr(std::dynamic_pointer_cast<ServiceWrapper<T> >(itFound->second));
-            assert(nullptr != ptr.get());
-            return ptr->get();
-         }
-
-         ///returns true of the particular service is accessible
-         template<typename T>
-         bool isAvailable() const {
-            Type2Service::const_iterator itFound = type2Service_.find(TypeIDBase(typeid(T)));
-            Type2Maker::const_iterator itFoundMaker ;
-            if(itFound == type2Service_.end()) {
-               //do on demand building of the service
-               if(nullptr == type2Maker_.get() ||
-                   type2Maker_->end() == (itFoundMaker = type2Maker_->find(TypeIDBase(typeid(T))))) {
-                  return false;
-               } else {
-                  //Actually create the service in order to 'flush out' any
-                  // configuration errors for the service
-                 const_cast<ServicesManager&>(*this).createServiceFor(itFoundMaker->second);
-                  itFound = type2Service_.find(TypeIDBase(typeid(T)));
-                  //the 'add()' should have put the service into the list
-                  assert(itFound != type2Service_.end());
-               }
-            }
-            return true;
-         }
-
-         // ---------- static member functions --------------------
-
-         // ---------- member functions ---------------------------
-         ///returns false if put fails because a service of this type already exists
-         template<typename T>
-         bool put(std::shared_ptr<ServiceWrapper<T> > iPtr) {
-            Type2Service::const_iterator itFound = type2Service_.find(TypeIDBase(typeid(T)));
-            if(itFound != type2Service_.end()) {
-               return false;
-            }
-            type2Service_[ TypeIDBase(typeid(T)) ] = iPtr;
-            actualCreationOrder_.push_back(TypeIDBase(typeid(T)));
-            return true;
-         }
-
-         ///causes our ActivityRegistry's signals to be forwarded to iOther
-         void connect(ActivityRegistry& iOther);
-
-         ///causes iOther's signals to be forward to us
-         void connectTo(ActivityRegistry& iOther);
-
-         ///copy our Service's slots to the argument's signals
-         void copySlotsTo(ActivityRegistry&);
-         ///the copy the argument's slots to the our signals
-         void copySlotsFrom(ActivityRegistry&);
-
-private:
-         ServicesManager(ServicesManager const&) = delete; // stop default
-
-         ServicesManager const& operator=(ServicesManager const&) = delete; // stop default
-
-         void fillListOfMakers(std::vector<ParameterSet>&);
-         void createServices();
-         void createServiceFor(MakerHolder const&);
-
-         // ---------- member data --------------------------------
-         //hold onto the Manager passed in from the ServiceToken so that
-         // the ActivityRegistry of that Manager does not go out of scope
-         // This must be first to get the Service destructors called in
-         // the correct order.
-         edm::propagate_const<std::shared_ptr<ServicesManager>> associatedManager_;
-
-         ActivityRegistry registry_;
-         Type2Service type2Service_;
-         edm::propagate_const<std::unique_ptr<Type2Maker>> type2Maker_;
-         std::vector<TypeIDBase> requestedCreationOrder_;
-         std::vector<TypeIDBase> actualCreationOrder_;
-      };
-   }
-}
+      ServicesManager(ServiceToken iToken,
+                      ServiceLegacy iLegacy,
+                      std::vector<ParameterSet>& iConfiguration,
+                      bool associate = true);
+
+      ~ServicesManager();
+
+      // ---------- const member functions ---------------------
+      template <typename T>
+      T& get() const {
+        Type2Service::const_iterator itFound = type2Service_.find(TypeIDBase(typeid(T)));
+        Type2Maker::const_iterator itFoundMaker;
+        if (itFound == type2Service_.end()) {
+          //do on demand building of the service
+          if (nullptr == type2Maker_.get() ||
+              type2Maker_->end() == (itFoundMaker = type2Maker_->find(TypeIDBase(typeid(T))))) {
+            Exception::throwThis(errors::NotFound,
+                                 "Service Request unable to find requested service with compiler type name '",
+                                 typeid(T).name(),
+                                 "'.\n");
+          } else {
+            const_cast<ServicesManager&>(*this).createServiceFor(itFoundMaker->second);
+            itFound = type2Service_.find(TypeIDBase(typeid(T)));
+            //the 'add()' should have put the service into the list
+            assert(itFound != type2Service_.end());
+          }
+        }
+        //convert it to its actual type
+        std::shared_ptr<ServiceWrapper<T>> ptr(std::dynamic_pointer_cast<ServiceWrapper<T>>(itFound->second));
+        assert(nullptr != ptr.get());
+        return ptr->get();
+      }
+
+      ///returns true of the particular service is accessible
+      template <typename T>
+      bool isAvailable() const {
+        Type2Service::const_iterator itFound = type2Service_.find(TypeIDBase(typeid(T)));
+        Type2Maker::const_iterator itFoundMaker;
+        if (itFound == type2Service_.end()) {
+          //do on demand building of the service
+          if (nullptr == type2Maker_.get() ||
+              type2Maker_->end() == (itFoundMaker = type2Maker_->find(TypeIDBase(typeid(T))))) {
+            return false;
+          } else {
+            //Actually create the service in order to 'flush out' any
+            // configuration errors for the service
+            const_cast<ServicesManager&>(*this).createServiceFor(itFoundMaker->second);
+            itFound = type2Service_.find(TypeIDBase(typeid(T)));
+            //the 'add()' should have put the service into the list
+            assert(itFound != type2Service_.end());
+          }
+        }
+        return true;
+      }
+
+      // ---------- static member functions --------------------
+
+      // ---------- member functions ---------------------------
+      ///returns false if put fails because a service of this type already exists
+      template <typename T>
+      bool put(std::shared_ptr<ServiceWrapper<T>> iPtr) {
+        Type2Service::const_iterator itFound = type2Service_.find(TypeIDBase(typeid(T)));
+        if (itFound != type2Service_.end()) {
+          return false;
+        }
+        type2Service_[TypeIDBase(typeid(T))] = iPtr;
+        actualCreationOrder_.push_back(TypeIDBase(typeid(T)));
+        return true;
+      }
+
+      ///causes our ActivityRegistry's signals to be forwarded to iOther
+      void connect(ActivityRegistry& iOther);
+
+      ///causes iOther's signals to be forward to us
+      void connectTo(ActivityRegistry& iOther);
+
+      ///copy our Service's slots to the argument's signals
+      void copySlotsTo(ActivityRegistry&);
+      ///the copy the argument's slots to the our signals
+      void copySlotsFrom(ActivityRegistry&);
+
+    private:
+      ServicesManager(ServicesManager const&) = delete;  // stop default
+
+      ServicesManager const& operator=(ServicesManager const&) = delete;  // stop default
+
+      void fillListOfMakers(std::vector<ParameterSet>&);
+      void createServices();
+      void createServiceFor(MakerHolder const&);
+
+      // ---------- member data --------------------------------
+      //hold onto the Manager passed in from the ServiceToken so that
+      // the ActivityRegistry of that Manager does not go out of scope
+      // This must be first to get the Service destructors called in
+      // the correct order.
+      edm::propagate_const<std::shared_ptr<ServicesManager>> associatedManager_;
+
+      ActivityRegistry registry_;
+      Type2Service type2Service_;
+      edm::propagate_const<std::unique_ptr<Type2Maker>> type2Maker_;
+      std::vector<TypeIDBase> requestedCreationOrder_;
+      std::vector<TypeIDBase> actualCreationOrder_;
+    };
+  }  // namespace serviceregistry
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ServiceRegistry/interface/StreamContext.h b/FWCore/ServiceRegistry/interface/StreamContext.h
index 72b5610a4b095..c61460a472ecc 100644
--- a/FWCore/ServiceRegistry/interface/StreamContext.h
+++ b/FWCore/ServiceRegistry/interface/StreamContext.h
@@ -29,9 +29,7 @@ namespace edm {
   class ProcessContext;
 
   class StreamContext {
-
   public:
-
     enum class Transition {
       kBeginStream,
       kBeginRun,
@@ -43,24 +41,22 @@ namespace edm {
       kInvalid
     };
 
-    StreamContext(StreamID const& streamID,
-                  ProcessContext const* processContext);
-    
+    StreamContext(StreamID const& streamID, ProcessContext const* processContext);
+
     StreamContext(StreamID const& streamID,
                   Transition transition,
                   EventID const& eventID,
                   RunIndex const& runIndex,
-                  LuminosityBlockIndex const& luminosityBlockIndex, 
-                  Timestamp const & timestamp,
+                  LuminosityBlockIndex const& luminosityBlockIndex,
+                  Timestamp const& timestamp,
                   ProcessContext const* processContext);
 
     StreamID const& streamID() const { return streamID_; }
     Transition transition() const { return transition_; }
     bool isAtEndTransition() const {
-      return transition() ==Transition::kEndLuminosityBlock or
-             transition() ==Transition::kEndRun;
+      return transition() == Transition::kEndLuminosityBlock or transition() == Transition::kEndRun;
     }
-    EventID const& eventID() const { return eventID_; } // event#==0 is a lumi, event#==0&lumi#==0 is a run
+    EventID const& eventID() const { return eventID_; }  // event#==0 is a lumi, event#==0&lumi#==0 is a run
     RunIndex const& runIndex() const { return runIndex_; }
     LuminosityBlockIndex const& luminosityBlockIndex() const { return luminosityBlockIndex_; }
     Timestamp const& timestamp() const { return timestamp_; }
@@ -75,14 +71,14 @@ namespace edm {
   private:
     StreamID streamID_;
     Transition transition_;
-    EventID eventID_; // event#==0 is a lumi, event#==0&lumi#==0 is a run
+    EventID eventID_;  // event#==0 is a lumi, event#==0&lumi#==0 is a run
     RunIndex runIndex_;
-    LuminosityBlockIndex luminosityBlockIndex_; 
+    LuminosityBlockIndex luminosityBlockIndex_;
     Timestamp timestamp_;
     ProcessContext const* processContext_;
   };
 
   void exceptionContext(std::ostream&, StreamContext const&);
   std::ostream& operator<<(std::ostream&, StreamContext const&);
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/ServiceRegistry/interface/SystemBounds.h b/FWCore/ServiceRegistry/interface/SystemBounds.h
index fa8314cee57a1..f8151d84d83b8 100644
--- a/FWCore/ServiceRegistry/interface/SystemBounds.h
+++ b/FWCore/ServiceRegistry/interface/SystemBounds.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/ServiceRegistry
 // Class  :     SystemBounds
-// 
+//
 /**\class SystemBounds SystemBounds.h "SystemBounds.h"
 
  Description: [one line class summary]
@@ -26,27 +26,18 @@
 
 namespace edm {
   namespace service {
-    class SystemBounds
-    {
-      
+    class SystemBounds {
     public:
-      SystemBounds(unsigned int iNStreams,
-                   unsigned int iNLumis,
-                   unsigned int iNRuns,
-                   unsigned int iNThreads) :
-      m_nStreams(iNStreams),
-      m_nLumis(iNLumis),
-      m_nRuns(iNRuns),
-      m_nThreads(iNThreads){}
-      
+      SystemBounds(unsigned int iNStreams, unsigned int iNLumis, unsigned int iNRuns, unsigned int iNThreads)
+          : m_nStreams(iNStreams), m_nLumis(iNLumis), m_nRuns(iNRuns), m_nThreads(iNThreads) {}
+
       // ---------- const member functions ---------------------
-      unsigned int maxNumberOfStreams() const {return m_nStreams; }
-      unsigned int maxNumberOfConcurrentRuns() const {return m_nRuns;}
-      unsigned int maxNumberOfConcurrentLuminosityBlocks() const {return m_nLumis;}
+      unsigned int maxNumberOfStreams() const { return m_nStreams; }
+      unsigned int maxNumberOfConcurrentRuns() const { return m_nRuns; }
+      unsigned int maxNumberOfConcurrentLuminosityBlocks() const { return m_nLumis; }
       unsigned int maxNumberOfThreads() const { return m_nThreads; }
-      
+
     private:
-      
       // ---------- member data --------------------------------
       unsigned int m_nStreams;
       unsigned int m_nLumis;
@@ -54,8 +45,7 @@ namespace edm {
       unsigned int m_nThreads;
     };
 
-  }
-}
-
+  }  // namespace service
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ServiceRegistry/interface/TerminationOrigin.h b/FWCore/ServiceRegistry/interface/TerminationOrigin.h
index 7aa171cd1dcac..1da67a9918ad9 100644
--- a/FWCore/ServiceRegistry/interface/TerminationOrigin.h
+++ b/FWCore/ServiceRegistry/interface/TerminationOrigin.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/ServiceRegistry
 // Class  :     edm::TerminationOrigin
-// 
+//
 /**\class edm::TerminationOrigin TerminationOrigin.h "TerminationOrigin.h"
 
  Description: Enum for different possible origins of a job termination 'signal'
@@ -25,11 +25,7 @@
 // forward declarations
 
 namespace edm {
-  enum class TerminationOrigin {
-    ExceptionFromThisContext,
-    ExceptionFromAnotherContext,
-    ExternalSignal
-  };
+  enum class TerminationOrigin { ExceptionFromThisContext, ExceptionFromAnotherContext, ExternalSignal };
 }
 
 #endif
diff --git a/FWCore/ServiceRegistry/interface/connect_but_block_self.h b/FWCore/ServiceRegistry/interface/connect_but_block_self.h
index 3d4872a9f9672..1235ebdb6f679 100644
--- a/FWCore/ServiceRegistry/interface/connect_but_block_self.h
+++ b/FWCore/ServiceRegistry/interface/connect_but_block_self.h
@@ -4,7 +4,7 @@
 //
 // Package:     ServiceRegistry
 // Class  :     connect_but_block_self
-// 
+//
 /**\function connect_but_block_self connect_but_block_self.h FWCore/ServiceRegistry/interface/connect_but_block_self.h
 
  Description: Connects a functional object to a signal, but guarantees that the functional object will never see a
@@ -27,41 +27,39 @@
 
 // forward declarations
 namespace edm {
-   namespace serviceregistry {
-      template<typename Func>
-      class BlockingWrapper
-      {
-      
-       public:
-        
-         BlockingWrapper(Func iFunc): func_(iFunc), numBlocks_(0) {}
-         //virtual ~BlockingWrapper();
-         
-         // ---------- const member functions ---------------------
-         template<typename... Args>
-         void operator()(Args&&... args) {
-            std::shared_ptr<void> guard(static_cast<void*>(nullptr), std::bind(&BlockingWrapper::unblock,this) );
-           if( startBlocking() ) { func_(std::forward<Args>(args)...); }
-         }
+  namespace serviceregistry {
+    template <typename Func>
+    class BlockingWrapper {
+    public:
+      BlockingWrapper(Func iFunc) : func_(iFunc), numBlocks_(0) {}
+      //virtual ~BlockingWrapper();
 
-         // ---------- static member functions --------------------
-         
-         // ---------- member functions ---------------------------
-         
-       private:
-         // ---------- member data --------------------------------
-         bool startBlocking() { return 1 == ++numBlocks_; }
-         void unblock() { --numBlocks_;}
-         Func func_;
-         int numBlocks_;
-      };
-     
-      template<class Func, class Signal>
-      void 
-      connect_but_block_self(Signal& oSignal, const Func& iFunc) {
-        oSignal.connect(BlockingWrapper<Func>(iFunc));
+      // ---------- const member functions ---------------------
+      template <typename... Args>
+      void operator()(Args&&... args) {
+        std::shared_ptr<void> guard(static_cast<void*>(nullptr), std::bind(&BlockingWrapper::unblock, this));
+        if (startBlocking()) {
+          func_(std::forward<Args>(args)...);
+        }
       }
-   }
-}
+
+      // ---------- static member functions --------------------
+
+      // ---------- member functions ---------------------------
+
+    private:
+      // ---------- member data --------------------------------
+      bool startBlocking() { return 1 == ++numBlocks_; }
+      void unblock() { --numBlocks_; }
+      Func func_;
+      int numBlocks_;
+    };
+
+    template <class Func, class Signal>
+    void connect_but_block_self(Signal& oSignal, const Func& iFunc) {
+      oSignal.connect(BlockingWrapper<Func>(iFunc));
+    }
+  }  // namespace serviceregistry
+}  // namespace edm
 
 #endif
diff --git a/FWCore/ServiceRegistry/src/ActivityRegistry.cc b/FWCore/ServiceRegistry/src/ActivityRegistry.cc
index 12cc89a3c93f8..e6b679e6c04fd 100644
--- a/FWCore/ServiceRegistry/src/ActivityRegistry.cc
+++ b/FWCore/ServiceRegistry/src/ActivityRegistry.cc
@@ -55,19 +55,15 @@
 //
 namespace edm {
   namespace {
-    template<typename T>
-    inline
-    void
-    copySlotsToFrom(T& iTo, T& iFrom) {
-      for(auto& slot: iFrom.slots()) {
+    template <typename T>
+    inline void copySlotsToFrom(T& iTo, T& iFrom) {
+      for (auto& slot : iFrom.slots()) {
         iTo.connect(slot);
       }
     }
 
-    template<typename T>
-    inline
-    void
-    copySlotsToFromReverse(T& iTo, T& iFrom) {
+    template <typename T>
+    inline void copySlotsToFromReverse(T& iTo, T& iFrom) {
       // This handles service slots that are supposed to be in reverse
       // order of construction. Copying new ones in is a little
       // tricky.  Here is an example of what follows
@@ -79,92 +75,88 @@ namespace edm {
 
       std::reverse(slotsFrom.begin(), slotsFrom.end());
 
-      for(auto& slotFrom: slotsFrom) {
+      for (auto& slotFrom : slotsFrom) {
         iTo.connect_front(slotFrom);
       }
     }
-  }
+  }  // namespace
 
   namespace signalslot {
     void throwObsoleteSignalException() {
       throw cms::Exception("ConnectedToObsoleteServiceSignal")
-      <<"A Service has connected to an obsolete ActivityRegistry signal.";
+          << "A Service has connected to an obsolete ActivityRegistry signal.";
     }
-  }
-  
-  void
-  ActivityRegistry::connectGlobals(ActivityRegistry& iOther) {
-     preallocateSignal_.connect(std::cref(iOther.preallocateSignal_));
-     postBeginJobSignal_.connect(std::cref(iOther.postBeginJobSignal_));
-     preEndJobSignal_.connect(std::cref(iOther.preEndJobSignal_));
-     postEndJobSignal_.connect(std::cref(iOther.postEndJobSignal_));
+  }  // namespace signalslot
+
+  void ActivityRegistry::connectGlobals(ActivityRegistry& iOther) {
+    preallocateSignal_.connect(std::cref(iOther.preallocateSignal_));
+    postBeginJobSignal_.connect(std::cref(iOther.postBeginJobSignal_));
+    preEndJobSignal_.connect(std::cref(iOther.preEndJobSignal_));
+    postEndJobSignal_.connect(std::cref(iOther.postEndJobSignal_));
 
-     jobFailureSignal_.connect(std::cref(iOther.jobFailureSignal_));
+    jobFailureSignal_.connect(std::cref(iOther.jobFailureSignal_));
 
-     preSourceSignal_.connect(std::cref(iOther.preSourceSignal_));
-     postSourceSignal_.connect(std::cref(iOther.postSourceSignal_));
+    preSourceSignal_.connect(std::cref(iOther.preSourceSignal_));
+    postSourceSignal_.connect(std::cref(iOther.postSourceSignal_));
 
-     preSourceLumiSignal_.connect(std::cref(iOther.preSourceLumiSignal_));
-     postSourceLumiSignal_.connect(std::cref(iOther.postSourceLumiSignal_));
+    preSourceLumiSignal_.connect(std::cref(iOther.preSourceLumiSignal_));
+    postSourceLumiSignal_.connect(std::cref(iOther.postSourceLumiSignal_));
 
-     preSourceRunSignal_.connect(std::cref(iOther.preSourceRunSignal_));
-     postSourceRunSignal_.connect(std::cref(iOther.postSourceRunSignal_));
+    preSourceRunSignal_.connect(std::cref(iOther.preSourceRunSignal_));
+    postSourceRunSignal_.connect(std::cref(iOther.postSourceRunSignal_));
 
-     preOpenFileSignal_.connect(std::cref(iOther.preOpenFileSignal_));
-     postOpenFileSignal_.connect(std::cref(iOther.postOpenFileSignal_));
+    preOpenFileSignal_.connect(std::cref(iOther.preOpenFileSignal_));
+    postOpenFileSignal_.connect(std::cref(iOther.postOpenFileSignal_));
 
-     preCloseFileSignal_.connect(std::cref(iOther.preCloseFileSignal_));
-     postCloseFileSignal_.connect(std::cref(iOther.postCloseFileSignal_));
+    preCloseFileSignal_.connect(std::cref(iOther.preCloseFileSignal_));
+    postCloseFileSignal_.connect(std::cref(iOther.postCloseFileSignal_));
 
-     preSourceConstructionSignal_.connect(std::cref(iOther.preSourceConstructionSignal_));
-     postSourceConstructionSignal_.connect(std::cref(iOther.postSourceConstructionSignal_));
+    preSourceConstructionSignal_.connect(std::cref(iOther.preSourceConstructionSignal_));
+    postSourceConstructionSignal_.connect(std::cref(iOther.postSourceConstructionSignal_));
 
     preStreamEarlyTerminationSignal_.connect(std::cref(iOther.preStreamEarlyTerminationSignal_));
     preGlobalEarlyTerminationSignal_.connect(std::cref(iOther.preGlobalEarlyTerminationSignal_));
     preSourceEarlyTerminationSignal_.connect(std::cref(iOther.preSourceEarlyTerminationSignal_));
-
   }
 
-  void
-  ActivityRegistry::connectLocals(ActivityRegistry& iOther) {
-
-     preBeginJobSignal_.connect(std::cref(iOther.preBeginJobSignal_));
+  void ActivityRegistry::connectLocals(ActivityRegistry& iOther) {
+    preBeginJobSignal_.connect(std::cref(iOther.preBeginJobSignal_));
 
-     preModuleBeginStreamSignal_.connect(std::cref(iOther.preModuleBeginStreamSignal_));
-     postModuleBeginStreamSignal_.connect(std::cref(iOther.postModuleBeginStreamSignal_));
+    preModuleBeginStreamSignal_.connect(std::cref(iOther.preModuleBeginStreamSignal_));
+    postModuleBeginStreamSignal_.connect(std::cref(iOther.postModuleBeginStreamSignal_));
 
-     preModuleEndStreamSignal_.connect(std::cref(iOther.preModuleEndStreamSignal_));
-     postModuleEndStreamSignal_.connect(std::cref(iOther.postModuleEndStreamSignal_));
+    preModuleEndStreamSignal_.connect(std::cref(iOther.preModuleEndStreamSignal_));
+    postModuleEndStreamSignal_.connect(std::cref(iOther.postModuleEndStreamSignal_));
 
-     preGlobalBeginRunSignal_.connect(std::cref(iOther.preGlobalBeginRunSignal_));
-     postGlobalBeginRunSignal_.connect(std::cref(iOther.postGlobalBeginRunSignal_));
+    preGlobalBeginRunSignal_.connect(std::cref(iOther.preGlobalBeginRunSignal_));
+    postGlobalBeginRunSignal_.connect(std::cref(iOther.postGlobalBeginRunSignal_));
 
-     preGlobalEndRunSignal_.connect(std::cref(iOther.preGlobalEndRunSignal_));
-     postGlobalEndRunSignal_.connect(std::cref(iOther.postGlobalEndRunSignal_));
+    preGlobalEndRunSignal_.connect(std::cref(iOther.preGlobalEndRunSignal_));
+    postGlobalEndRunSignal_.connect(std::cref(iOther.postGlobalEndRunSignal_));
 
-     preStreamBeginRunSignal_.connect(std::cref(iOther.preStreamBeginRunSignal_));
-     postStreamBeginRunSignal_.connect(std::cref(iOther.postStreamBeginRunSignal_));
+    preStreamBeginRunSignal_.connect(std::cref(iOther.preStreamBeginRunSignal_));
+    postStreamBeginRunSignal_.connect(std::cref(iOther.postStreamBeginRunSignal_));
 
-     preStreamEndRunSignal_.connect(std::cref(iOther.preStreamEndRunSignal_));
-     postStreamEndRunSignal_.connect(std::cref(iOther.postStreamEndRunSignal_));
+    preStreamEndRunSignal_.connect(std::cref(iOther.preStreamEndRunSignal_));
+    postStreamEndRunSignal_.connect(std::cref(iOther.postStreamEndRunSignal_));
 
-     preGlobalBeginLumiSignal_.connect(std::cref(iOther.preGlobalBeginLumiSignal_));
-     postGlobalBeginLumiSignal_.connect(std::cref(iOther.postGlobalBeginLumiSignal_));
+    preGlobalBeginLumiSignal_.connect(std::cref(iOther.preGlobalBeginLumiSignal_));
+    postGlobalBeginLumiSignal_.connect(std::cref(iOther.postGlobalBeginLumiSignal_));
 
-     preGlobalEndLumiSignal_.connect(std::cref(iOther.preGlobalEndLumiSignal_));
-     postGlobalEndLumiSignal_.connect(std::cref(iOther.postGlobalEndLumiSignal_));
+    preGlobalEndLumiSignal_.connect(std::cref(iOther.preGlobalEndLumiSignal_));
+    postGlobalEndLumiSignal_.connect(std::cref(iOther.postGlobalEndLumiSignal_));
 
-     preStreamBeginLumiSignal_.connect(std::cref(iOther.preStreamBeginLumiSignal_));
-     postStreamBeginLumiSignal_.connect(std::cref(iOther.postStreamBeginLumiSignal_));
+    preStreamBeginLumiSignal_.connect(std::cref(iOther.preStreamBeginLumiSignal_));
+    postStreamBeginLumiSignal_.connect(std::cref(iOther.postStreamBeginLumiSignal_));
 
-     preStreamEndLumiSignal_.connect(std::cref(iOther.preStreamEndLumiSignal_));
-     postStreamEndLumiSignal_.connect(std::cref(iOther.postStreamEndLumiSignal_));
+    preStreamEndLumiSignal_.connect(std::cref(iOther.preStreamEndLumiSignal_));
+    postStreamEndLumiSignal_.connect(std::cref(iOther.postStreamEndLumiSignal_));
 
-     preEventSignal_.connect(std::cref(iOther.preEventSignal_));
-     postEventSignal_.connect(std::cref(iOther.postEventSignal_));
+    preEventSignal_.connect(std::cref(iOther.preEventSignal_));
+    postEventSignal_.connect(std::cref(iOther.postEventSignal_));
 
-     prePathEventSignal_.connect(std::cref(iOther.prePathEventSignal_));
-     postPathEventSignal_.connect(std::cref(iOther.postPathEventSignal_));
+    prePathEventSignal_.connect(std::cref(iOther.prePathEventSignal_));
+    postPathEventSignal_.connect(std::cref(iOther.postPathEventSignal_));
 
     //preProcessEventSignal_.connect(std::cref(iOther.preProcessEventSignal_));
     //postProcessEventSignal_.connect(std::cref(iOther.postProcessEventSignal_));
@@ -196,59 +188,59 @@ namespace edm {
     //prePathEndLumiSignal_.connect(std::cref(iOther.prePathEndLumiSignal_));
     //postPathEndLumiSignal_.connect(std::cref(iOther.postPathEndLumiSignal_));
 
-     preModuleConstructionSignal_.connect(std::cref(iOther.preModuleConstructionSignal_));
-     postModuleConstructionSignal_.connect(std::cref(iOther.postModuleConstructionSignal_));
+    preModuleConstructionSignal_.connect(std::cref(iOther.preModuleConstructionSignal_));
+    postModuleConstructionSignal_.connect(std::cref(iOther.postModuleConstructionSignal_));
 
-     preModuleBeginJobSignal_.connect(std::cref(iOther.preModuleBeginJobSignal_));
-     postModuleBeginJobSignal_.connect(std::cref(iOther.postModuleBeginJobSignal_));
+    preModuleBeginJobSignal_.connect(std::cref(iOther.preModuleBeginJobSignal_));
+    postModuleBeginJobSignal_.connect(std::cref(iOther.postModuleBeginJobSignal_));
 
-     preModuleEndJobSignal_.connect(std::cref(iOther.preModuleEndJobSignal_));
-     postModuleEndJobSignal_.connect(std::cref(iOther.postModuleEndJobSignal_));
+    preModuleEndJobSignal_.connect(std::cref(iOther.preModuleEndJobSignal_));
+    postModuleEndJobSignal_.connect(std::cref(iOther.postModuleEndJobSignal_));
 
     preModuleEventPrefetchingSignal_.connect(std::cref(iOther.preModuleEventPrefetchingSignal_));
     postModuleEventPrefetchingSignal_.connect(std::cref(iOther.postModuleEventPrefetchingSignal_));
 
     preModuleEventSignal_.connect(std::cref(iOther.preModuleEventSignal_));
-     postModuleEventSignal_.connect(std::cref(iOther.postModuleEventSignal_));
+    postModuleEventSignal_.connect(std::cref(iOther.postModuleEventSignal_));
 
-     preModuleEventAcquireSignal_.connect(std::cref(iOther.preModuleEventAcquireSignal_));
-     postModuleEventAcquireSignal_.connect(std::cref(iOther.postModuleEventAcquireSignal_));
+    preModuleEventAcquireSignal_.connect(std::cref(iOther.preModuleEventAcquireSignal_));
+    postModuleEventAcquireSignal_.connect(std::cref(iOther.postModuleEventAcquireSignal_));
 
-     preModuleEventDelayedGetSignal_.connect(std::cref(iOther.preModuleEventDelayedGetSignal_));
-     postModuleEventDelayedGetSignal_.connect(std::cref(iOther.postModuleEventDelayedGetSignal_));
+    preModuleEventDelayedGetSignal_.connect(std::cref(iOther.preModuleEventDelayedGetSignal_));
+    postModuleEventDelayedGetSignal_.connect(std::cref(iOther.postModuleEventDelayedGetSignal_));
 
-     preEventReadFromSourceSignal_.connect(std::cref(iOther.preEventReadFromSourceSignal_));
-     postEventReadFromSourceSignal_.connect(std::cref(iOther.postEventReadFromSourceSignal_));
+    preEventReadFromSourceSignal_.connect(std::cref(iOther.preEventReadFromSourceSignal_));
+    postEventReadFromSourceSignal_.connect(std::cref(iOther.postEventReadFromSourceSignal_));
 
-     preModuleStreamBeginRunSignal_.connect(std::cref(iOther.preModuleStreamBeginRunSignal_));
-     postModuleStreamBeginRunSignal_.connect(std::cref(iOther.postModuleStreamBeginRunSignal_));
+    preModuleStreamBeginRunSignal_.connect(std::cref(iOther.preModuleStreamBeginRunSignal_));
+    postModuleStreamBeginRunSignal_.connect(std::cref(iOther.postModuleStreamBeginRunSignal_));
 
-     preModuleStreamEndRunSignal_.connect(std::cref(iOther.preModuleStreamEndRunSignal_));
-     postModuleStreamEndRunSignal_.connect(std::cref(iOther.postModuleStreamEndRunSignal_));
+    preModuleStreamEndRunSignal_.connect(std::cref(iOther.preModuleStreamEndRunSignal_));
+    postModuleStreamEndRunSignal_.connect(std::cref(iOther.postModuleStreamEndRunSignal_));
 
-     preModuleStreamBeginLumiSignal_.connect(std::cref(iOther.preModuleStreamBeginLumiSignal_));
-     postModuleStreamBeginLumiSignal_.connect(std::cref(iOther.postModuleStreamBeginLumiSignal_));
+    preModuleStreamBeginLumiSignal_.connect(std::cref(iOther.preModuleStreamBeginLumiSignal_));
+    postModuleStreamBeginLumiSignal_.connect(std::cref(iOther.postModuleStreamBeginLumiSignal_));
 
-     preModuleStreamEndLumiSignal_.connect(std::cref(iOther.preModuleStreamEndLumiSignal_));
-     postModuleStreamEndLumiSignal_.connect(std::cref(iOther.postModuleStreamEndLumiSignal_));
+    preModuleStreamEndLumiSignal_.connect(std::cref(iOther.preModuleStreamEndLumiSignal_));
+    postModuleStreamEndLumiSignal_.connect(std::cref(iOther.postModuleStreamEndLumiSignal_));
 
-     preModuleGlobalBeginRunSignal_.connect(std::cref(iOther.preModuleGlobalBeginRunSignal_));
-     postModuleGlobalBeginRunSignal_.connect(std::cref(iOther.postModuleGlobalBeginRunSignal_));
+    preModuleGlobalBeginRunSignal_.connect(std::cref(iOther.preModuleGlobalBeginRunSignal_));
+    postModuleGlobalBeginRunSignal_.connect(std::cref(iOther.postModuleGlobalBeginRunSignal_));
 
-     preModuleGlobalEndRunSignal_.connect(std::cref(iOther.preModuleGlobalEndRunSignal_));
-     postModuleGlobalEndRunSignal_.connect(std::cref(iOther.postModuleGlobalEndRunSignal_));
+    preModuleGlobalEndRunSignal_.connect(std::cref(iOther.preModuleGlobalEndRunSignal_));
+    postModuleGlobalEndRunSignal_.connect(std::cref(iOther.postModuleGlobalEndRunSignal_));
 
-     preModuleGlobalBeginLumiSignal_.connect(std::cref(iOther.preModuleGlobalBeginLumiSignal_));
-     postModuleGlobalBeginLumiSignal_.connect(std::cref(iOther.postModuleGlobalBeginLumiSignal_));
+    preModuleGlobalBeginLumiSignal_.connect(std::cref(iOther.preModuleGlobalBeginLumiSignal_));
+    postModuleGlobalBeginLumiSignal_.connect(std::cref(iOther.postModuleGlobalBeginLumiSignal_));
 
-     preModuleGlobalEndLumiSignal_.connect(std::cref(iOther.preModuleGlobalEndLumiSignal_));
-     postModuleGlobalEndLumiSignal_.connect(std::cref(iOther.postModuleGlobalEndLumiSignal_));
+    preModuleGlobalEndLumiSignal_.connect(std::cref(iOther.preModuleGlobalEndLumiSignal_));
+    postModuleGlobalEndLumiSignal_.connect(std::cref(iOther.postModuleGlobalEndLumiSignal_));
 
-     preModuleWriteRunSignal_.connect(std::cref(iOther.preModuleWriteRunSignal_));
-     postModuleWriteRunSignal_.connect(std::cref(iOther.postModuleWriteRunSignal_));
+    preModuleWriteRunSignal_.connect(std::cref(iOther.preModuleWriteRunSignal_));
+    postModuleWriteRunSignal_.connect(std::cref(iOther.postModuleWriteRunSignal_));
 
-     preModuleWriteLumiSignal_.connect(std::cref(iOther.preModuleWriteLumiSignal_));
-     postModuleWriteLumiSignal_.connect(std::cref(iOther.postModuleWriteLumiSignal_));
+    preModuleWriteLumiSignal_.connect(std::cref(iOther.preModuleWriteLumiSignal_));
+    postModuleWriteLumiSignal_.connect(std::cref(iOther.postModuleWriteLumiSignal_));
 
     //preModuleSignal_.connect(std::cref(iOther.preModuleSignal_));
     //postModuleSignal_.connect(std::cref(iOther.postModuleSignal_));
@@ -265,26 +257,23 @@ namespace edm {
     //preModuleEndLumiSignal_.connect(std::cref(iOther.preModuleEndLumiSignal_));
     //postModuleEndLumiSignal_.connect(std::cref(iOther.postModuleEndLumiSignal_));
 
-     preLockEventSetupGetSignal_.connect(std::cref(iOther.preLockEventSetupGetSignal_));
-     postLockEventSetupGetSignal_.connect(std::cref(iOther.postLockEventSetupGetSignal_));
-     postEventSetupGetSignal_.connect(std::cref(iOther.postEventSetupGetSignal_));
+    preLockEventSetupGetSignal_.connect(std::cref(iOther.preLockEventSetupGetSignal_));
+    postLockEventSetupGetSignal_.connect(std::cref(iOther.postLockEventSetupGetSignal_));
+    postEventSetupGetSignal_.connect(std::cref(iOther.postEventSetupGetSignal_));
   }
 
-  void
-  ActivityRegistry::connect(ActivityRegistry& iOther) {
+  void ActivityRegistry::connect(ActivityRegistry& iOther) {
     connectGlobals(iOther);
     connectLocals(iOther);
   }
 
-  void
-  ActivityRegistry::connectToSubProcess(ActivityRegistry& iOther) {
-    connectGlobals(iOther);        // child sees parents global signals
-    iOther.connectLocals(*this);   // parent see childs global signals
+  void ActivityRegistry::connectToSubProcess(ActivityRegistry& iOther) {
+    connectGlobals(iOther);       // child sees parents global signals
+    iOther.connectLocals(*this);  // parent see childs global signals
   }
 
-  void
-  ActivityRegistry::copySlotsFrom(ActivityRegistry& iOther) {
-    copySlotsToFrom(preallocateSignal_,iOther.preallocateSignal_);
+  void ActivityRegistry::copySlotsFrom(ActivityRegistry& iOther) {
+    copySlotsToFrom(preallocateSignal_, iOther.preallocateSignal_);
     copySlotsToFrom(preBeginJobSignal_, iOther.preBeginJobSignal_);
     copySlotsToFrom(postBeginJobSignal_, iOther.postBeginJobSignal_);
     copySlotsToFromReverse(preEndJobSignal_, iOther.preEndJobSignal_);
@@ -389,7 +378,7 @@ namespace edm {
 
     copySlotsToFrom(preModuleEventPrefetchingSignal_, iOther.preModuleEventPrefetchingSignal_);
     copySlotsToFromReverse(postModuleEventPrefetchingSignal_, iOther.postModuleEventPrefetchingSignal_);
-    
+
     copySlotsToFrom(preModuleEventSignal_, iOther.preModuleEventSignal_);
     copySlotsToFromReverse(postModuleEventSignal_, iOther.postModuleEventSignal_);
 
@@ -463,4 +452,4 @@ namespace edm {
   //
   // static member functions
   //
-}
+}  // namespace edm
diff --git a/FWCore/ServiceRegistry/src/ConsumesInfo.cc b/FWCore/ServiceRegistry/src/ConsumesInfo.cc
index f373bebfa17c2..a01f9c346f8b5 100644
--- a/FWCore/ServiceRegistry/src/ConsumesInfo.cc
+++ b/FWCore/ServiceRegistry/src/ConsumesInfo.cc
@@ -9,14 +9,13 @@ namespace edm {
                              BranchType iBranchType,
                              KindOfType iKindOfType,
                              bool iAlwaysGets,
-                             bool iSkipCurrentProcess_) :
-    type_(iType),
-    label_(iLabel),
-    instance_(iInstance),
-    process_(iProcess),
-    branchType_(iBranchType),
-    kindOfType_(iKindOfType),
-    alwaysGets_(iAlwaysGets),
-    skipCurrentProcess_(iSkipCurrentProcess_) {
-  }
-}
+                             bool iSkipCurrentProcess_)
+      : type_(iType),
+        label_(iLabel),
+        instance_(iInstance),
+        process_(iProcess),
+        branchType_(iBranchType),
+        kindOfType_(iKindOfType),
+        alwaysGets_(iAlwaysGets),
+        skipCurrentProcess_(iSkipCurrentProcess_) {}
+}  // namespace edm
diff --git a/FWCore/ServiceRegistry/src/GlobalContext.cc b/FWCore/ServiceRegistry/src/GlobalContext.cc
index b63c1c2305993..0c3ad08b6dae0 100644
--- a/FWCore/ServiceRegistry/src/GlobalContext.cc
+++ b/FWCore/ServiceRegistry/src/GlobalContext.cc
@@ -8,56 +8,54 @@ namespace edm {
   GlobalContext::GlobalContext(Transition transition,
                                LuminosityBlockID const& luminosityBlockID,
                                RunIndex const& runIndex,
-                               LuminosityBlockIndex const& luminosityBlockIndex, 
-                               Timestamp const & timestamp,
-                               ProcessContext const* processContext) :
-    transition_(transition),
-    luminosityBlockID_(luminosityBlockID),
-    runIndex_(runIndex),
-    luminosityBlockIndex_(luminosityBlockIndex),
-    timestamp_(timestamp),
-    processContext_(processContext) {
-  }
+                               LuminosityBlockIndex const& luminosityBlockIndex,
+                               Timestamp const& timestamp,
+                               ProcessContext const* processContext)
+      : transition_(transition),
+        luminosityBlockID_(luminosityBlockID),
+        runIndex_(runIndex),
+        luminosityBlockIndex_(luminosityBlockIndex),
+        timestamp_(timestamp),
+        processContext_(processContext) {}
 
   std::ostream& operator<<(std::ostream& os, GlobalContext const& gc) {
     os << "GlobalContext: transition = ";
     switch (gc.transition()) {
-    case GlobalContext::Transition::kBeginJob:
-      os << "BeginJob";
-      break;
-    case GlobalContext::Transition::kBeginRun:
-      os << "BeginRun";
-      break;
-    case GlobalContext::Transition::kBeginLuminosityBlock:
-      os << "BeginLuminosityBlock";
-      break;
-    case GlobalContext::Transition::kEndLuminosityBlock:
-      os << "EndLuminosityBlock";
-      break;
-    case GlobalContext::Transition::kEndRun:
-      os << "EndRun";
-      break;
-    case GlobalContext::Transition::kEndJob:
-      os << "EndJob";
-      break;
-    case GlobalContext::Transition::kWriteRun:
-      os << "WriteRun";
-      break;
-    case GlobalContext::Transition::kWriteLuminosityBlock:
-      os << "WriteLuminosityBlock";
-      break;
+      case GlobalContext::Transition::kBeginJob:
+        os << "BeginJob";
+        break;
+      case GlobalContext::Transition::kBeginRun:
+        os << "BeginRun";
+        break;
+      case GlobalContext::Transition::kBeginLuminosityBlock:
+        os << "BeginLuminosityBlock";
+        break;
+      case GlobalContext::Transition::kEndLuminosityBlock:
+        os << "EndLuminosityBlock";
+        break;
+      case GlobalContext::Transition::kEndRun:
+        os << "EndRun";
+        break;
+      case GlobalContext::Transition::kEndJob:
+        os << "EndJob";
+        break;
+      case GlobalContext::Transition::kWriteRun:
+        os << "WriteRun";
+        break;
+      case GlobalContext::Transition::kWriteLuminosityBlock:
+        os << "WriteLuminosityBlock";
+        break;
     }
-    os << "\n    " << gc.luminosityBlockID()
-       << "\n    runIndex = " << gc.runIndex().value()
+    os << "\n    " << gc.luminosityBlockID() << "\n    runIndex = " << gc.runIndex().value()
        << "  luminosityBlockIndex = " << gc.luminosityBlockIndex().value()
-       << "  unixTime = " << gc.timestamp().unixTime()
-       << " microsecondOffset = " << gc.timestamp().microsecondOffset() <<"\n";
-    if(gc.processContext()) {
-      os << "    " << *gc.processContext(); 
+       << "  unixTime = " << gc.timestamp().unixTime() << " microsecondOffset = " << gc.timestamp().microsecondOffset()
+       << "\n";
+    if (gc.processContext()) {
+      os << "    " << *gc.processContext();
     }
     return os;
   }
-  
+
   void exceptionContext(std::ostream& os, GlobalContext const& gc) {
     os << "Processing ";
     switch (gc.transition()) {
@@ -65,27 +63,27 @@ namespace edm {
         os << "begin Job";
         break;
       case GlobalContext::Transition::kBeginRun:
-        os << "global begin Run " <<RunID(gc.luminosityBlockID().run());
+        os << "global begin Run " << RunID(gc.luminosityBlockID().run());
         break;
       case GlobalContext::Transition::kBeginLuminosityBlock:
-        os << "global begin LuminosityBlock "<<gc.luminosityBlockID();
+        os << "global begin LuminosityBlock " << gc.luminosityBlockID();
         break;
       case GlobalContext::Transition::kEndLuminosityBlock:
-        os << "global end LuminosityBlock "<<gc.luminosityBlockID();
+        os << "global end LuminosityBlock " << gc.luminosityBlockID();
         break;
       case GlobalContext::Transition::kEndRun:
-        os << "global end Run "<<RunID(gc.luminosityBlockID().run());
+        os << "global end Run " << RunID(gc.luminosityBlockID().run());
         break;
       case GlobalContext::Transition::kEndJob:
         os << "endJob";
         break;
       case GlobalContext::Transition::kWriteRun:
-        os << "write Run "<<RunID(gc.luminosityBlockID().run());
+        os << "write Run " << RunID(gc.luminosityBlockID().run());
         break;
       case GlobalContext::Transition::kWriteLuminosityBlock:
-        os << "write LuminosityBlock "<<gc.luminosityBlockID();
+        os << "write LuminosityBlock " << gc.luminosityBlockID();
         break;
     }
   }
 
-}
+}  // namespace edm
diff --git a/FWCore/ServiceRegistry/src/InternalContext.cc b/FWCore/ServiceRegistry/src/InternalContext.cc
index e7de15dd3bb85..44559aac997b9 100644
--- a/FWCore/ServiceRegistry/src/InternalContext.cc
+++ b/FWCore/ServiceRegistry/src/InternalContext.cc
@@ -5,17 +5,14 @@
 
 namespace edm {
 
-  InternalContext::InternalContext(EventID const& eventID,
-                                   ModuleCallingContext const* moduleCallingContext) :
-    eventID_(eventID),
-    moduleCallingContext_(moduleCallingContext) {
-  }
+  InternalContext::InternalContext(EventID const& eventID, ModuleCallingContext const* moduleCallingContext)
+      : eventID_(eventID), moduleCallingContext_(moduleCallingContext) {}
 
   std::ostream& operator<<(std::ostream& os, InternalContext const& ic) {
     os << "InternalContext " << ic.eventID() << "\n";
-    if(ic.moduleCallingContext()) {
-      os << "    " << *ic.moduleCallingContext(); 
+    if (ic.moduleCallingContext()) {
+      os << "    " << *ic.moduleCallingContext();
     }
     return os;
   }
-}
+}  // namespace edm
diff --git a/FWCore/ServiceRegistry/src/ModuleCallingContext.cc b/FWCore/ServiceRegistry/src/ModuleCallingContext.cc
index 8734e0527fff1..691b6c6b68950 100644
--- a/FWCore/ServiceRegistry/src/ModuleCallingContext.cc
+++ b/FWCore/ServiceRegistry/src/ModuleCallingContext.cc
@@ -9,80 +9,72 @@
 
 namespace edm {
 
-  ModuleCallingContext::ModuleCallingContext(ModuleDescription const* moduleDescription) :
-    previousModuleOnThread_(nullptr),
-    moduleDescription_(moduleDescription),
-    parent_(),
-    state_(State::kInvalid) {
-  }
+  ModuleCallingContext::ModuleCallingContext(ModuleDescription const* moduleDescription)
+      : previousModuleOnThread_(nullptr), moduleDescription_(moduleDescription), parent_(), state_(State::kInvalid) {}
 
   ModuleCallingContext::ModuleCallingContext(ModuleDescription const* moduleDescription,
                                              State state,
                                              ParentContext const& parent,
-                                             ModuleCallingContext const* previousOnThread) :
-    previousModuleOnThread_(previousOnThread),
-    moduleDescription_(moduleDescription),
-    parent_(parent),
-    state_(state) {
-  }
+                                             ModuleCallingContext const* previousOnThread)
+      : previousModuleOnThread_(previousOnThread),
+        moduleDescription_(moduleDescription),
+        parent_(parent),
+        state_(state) {}
 
-  void ModuleCallingContext::setContext(State state, ParentContext const& parent,
+  void ModuleCallingContext::setContext(State state,
+                                        ParentContext const& parent,
                                         ModuleCallingContext const* previousOnThread) {
     state_ = state;
     parent_ = parent;
     previousModuleOnThread_ = previousOnThread;
   }
 
-  StreamContext const*
-  ModuleCallingContext::getStreamContext() const {
+  StreamContext const* ModuleCallingContext::getStreamContext() const {
     ModuleCallingContext const* mcc = getTopModuleCallingContext();
-    if(mcc->type() == ParentContext::Type::kPlaceInPath) {
+    if (mcc->type() == ParentContext::Type::kPlaceInPath) {
       return mcc->placeInPathContext()->pathContext()->streamContext();
     } else if (mcc->type() != ParentContext::Type::kStream) {
       throw Exception(errors::LogicError)
-        << "ModuleCallingContext::getStreamContext() called in context not linked to a StreamContext\n";
+          << "ModuleCallingContext::getStreamContext() called in context not linked to a StreamContext\n";
     }
     return mcc->streamContext();
   }
 
-  GlobalContext const*
-  ModuleCallingContext::getGlobalContext() const {
+  GlobalContext const* ModuleCallingContext::getGlobalContext() const {
     ModuleCallingContext const* mcc = getTopModuleCallingContext();
     if (mcc->type() != ParentContext::Type::kGlobal) {
       throw Exception(errors::LogicError)
-        << "ModuleCallingContext::getGlobalContext() called in context not linked to a GlobalContext\n";
+          << "ModuleCallingContext::getGlobalContext() called in context not linked to a GlobalContext\n";
     }
     return mcc->globalContext();
   }
 
-  ModuleCallingContext const*
-  ModuleCallingContext::getTopModuleCallingContext() const {
+  ModuleCallingContext const* ModuleCallingContext::getTopModuleCallingContext() const {
     ModuleCallingContext const* mcc = this;
-    while(mcc->type() == ParentContext::Type::kModule) {
+    while (mcc->type() == ParentContext::Type::kModule) {
       mcc = mcc->moduleCallingContext();
     }
-    if(mcc->type() == ParentContext::Type::kInternal) {
+    if (mcc->type() == ParentContext::Type::kInternal) {
       mcc = mcc->internalContext()->moduleCallingContext();
     }
-    while(mcc->type() == ParentContext::Type::kModule) {
+    while (mcc->type() == ParentContext::Type::kModule) {
       mcc = mcc->moduleCallingContext();
     }
     return mcc;
   }
 
-  unsigned
-  ModuleCallingContext::depth() const {
+  unsigned ModuleCallingContext::depth() const {
     unsigned depth = 0;
     ModuleCallingContext const* mcc = this;
-    while(mcc->type() == ParentContext::Type::kModule) {
+    while (mcc->type() == ParentContext::Type::kModule) {
       ++depth;
       mcc = mcc->moduleCallingContext();
     }
-    if(mcc->type() == ParentContext::Type::kInternal) {
+    if (mcc->type() == ParentContext::Type::kInternal) {
       ++depth;
       mcc = mcc->internalContext()->moduleCallingContext();
     }
-    while(mcc->type() == ParentContext::Type::kModule) {
+    while (mcc->type() == ParentContext::Type::kModule) {
       ++depth;
       mcc = mcc->moduleCallingContext();
     }
@@ -92,26 +84,26 @@ namespace edm {
   std::ostream& operator<<(std::ostream& os, ModuleCallingContext const& mcc) {
     os << "ModuleCallingContext state = ";
     switch (mcc.state()) {
-    case ModuleCallingContext::State::kInvalid:
-      os << "Invalid";
-      break;
-    case ModuleCallingContext::State::kPrefetching:
-      os << "Prefetching";
-      break;
-    case ModuleCallingContext::State::kRunning:
-      os << "Running";
-      break;
+      case ModuleCallingContext::State::kInvalid:
+        os << "Invalid";
+        break;
+      case ModuleCallingContext::State::kPrefetching:
+        os << "Prefetching";
+        break;
+      case ModuleCallingContext::State::kRunning:
+        os << "Running";
+        break;
     }
     os << "\n";
-    if(mcc.state() == ModuleCallingContext::State::kInvalid) {
+    if (mcc.state() == ModuleCallingContext::State::kInvalid) {
       return os;
     }
-    if(mcc.moduleDescription()) {
+    if (mcc.moduleDescription()) {
       os << "    moduleDescription: " << *mcc.moduleDescription() << "\n";
     }
     os << "    " << mcc.parent();
-    if(mcc.previousModuleOnThread()) {
-      if(mcc.type() == ParentContext::Type::kModule && mcc.moduleCallingContext() == mcc.previousModuleOnThread()) {
+    if (mcc.previousModuleOnThread()) {
+      if (mcc.type() == ParentContext::Type::kModule && mcc.moduleCallingContext() == mcc.previousModuleOnThread()) {
         os << "    previousModuleOnThread: same as parent module\n";
       } else {
         os << "    previousModuleOnThread: " << *mcc.previousModuleOnThread();
@@ -119,4 +111,4 @@ namespace edm {
     }
     return os;
   }
-}
+}  // namespace edm
diff --git a/FWCore/ServiceRegistry/src/ParentContext.cc b/FWCore/ServiceRegistry/src/ParentContext.cc
index 59244a88e1c5e..bffec876da911 100644
--- a/FWCore/ServiceRegistry/src/ParentContext.cc
+++ b/FWCore/ServiceRegistry/src/ParentContext.cc
@@ -12,98 +12,69 @@
 
 namespace edm {
 
-  ParentContext::ParentContext() :
-    type_(Type::kInvalid) {
-    parent_.global = nullptr;
-  }
+  ParentContext::ParentContext() : type_(Type::kInvalid) { parent_.global = nullptr; }
 
-  ParentContext::ParentContext(GlobalContext const* global) :
-    type_(Type::kGlobal) {
-    parent_.global = global;
-  }
+  ParentContext::ParentContext(GlobalContext const* global) : type_(Type::kGlobal) { parent_.global = global; }
 
-  ParentContext::ParentContext(InternalContext const* internal) :
-    type_(Type::kInternal) {
+  ParentContext::ParentContext(InternalContext const* internal) : type_(Type::kInternal) {
     parent_.internal = internal;
   }
 
-  ParentContext::ParentContext(ModuleCallingContext const* module) :
-    type_(Type::kModule) {
-    parent_.module = module;
-  }
+  ParentContext::ParentContext(ModuleCallingContext const* module) : type_(Type::kModule) { parent_.module = module; }
 
-  ParentContext::ParentContext(PlaceInPathContext const* placeInPath) :
-    type_(Type::kPlaceInPath) {
+  ParentContext::ParentContext(PlaceInPathContext const* placeInPath) : type_(Type::kPlaceInPath) {
     parent_.placeInPath = placeInPath;
   }
 
-  ParentContext::ParentContext(StreamContext const* stream) :
-    type_(Type::kStream) {
-    parent_.stream = stream;
-  }
+  ParentContext::ParentContext(StreamContext const* stream) : type_(Type::kStream) { parent_.stream = stream; }
 
-  ModuleCallingContext const*
-  ParentContext::moduleCallingContext() const {
-    if(type_ != Type::kModule) {
-      throw Exception(errors::LogicError)
-        << "ParentContext::moduleCallingContext called for incorrect type of context";
+  ModuleCallingContext const* ParentContext::moduleCallingContext() const {
+    if (type_ != Type::kModule) {
+      throw Exception(errors::LogicError) << "ParentContext::moduleCallingContext called for incorrect type of context";
     }
     return parent_.module;
   }
 
-  PlaceInPathContext const*
-  ParentContext::placeInPathContext() const {
-    if(type_ != Type::kPlaceInPath) {
-      throw Exception(errors::LogicError)
-        << "ParentContext::placeInPathContext called for incorrect type of context";
+  PlaceInPathContext const* ParentContext::placeInPathContext() const {
+    if (type_ != Type::kPlaceInPath) {
+      throw Exception(errors::LogicError) << "ParentContext::placeInPathContext called for incorrect type of context";
     }
     return parent_.placeInPath;
   }
 
-  StreamContext const*
-  ParentContext::streamContext() const {
-    if(type_ != Type::kStream) {
-      throw Exception(errors::LogicError)
-        << "ParentContext::streamContext called for incorrect type of context";
+  StreamContext const* ParentContext::streamContext() const {
+    if (type_ != Type::kStream) {
+      throw Exception(errors::LogicError) << "ParentContext::streamContext called for incorrect type of context";
     }
     return parent_.stream;
   }
 
-  GlobalContext const*
-  ParentContext::globalContext() const {
-    if(type_ != Type::kGlobal) {
-      throw Exception(errors::LogicError)
-        << "ParentContext::globalContext called for incorrect type of context";
+  GlobalContext const* ParentContext::globalContext() const {
+    if (type_ != Type::kGlobal) {
+      throw Exception(errors::LogicError) << "ParentContext::globalContext called for incorrect type of context";
     }
     return parent_.global;
   }
 
-  InternalContext const*
-  ParentContext::internalContext() const {
-    if(type_ != Type::kInternal) {
-      throw Exception(errors::LogicError)
-        << "ParentContext::internalContext called for incorrect type of context";
+  InternalContext const* ParentContext::internalContext() const {
+    if (type_ != Type::kInternal) {
+      throw Exception(errors::LogicError) << "ParentContext::internalContext called for incorrect type of context";
     }
     return parent_.internal;
   }
 
-  bool
-  ParentContext::isAtEndTransition() const {
-    switch(type_) {
-      case Type::kGlobal:
-      {
+  bool ParentContext::isAtEndTransition() const {
+    switch (type_) {
+      case Type::kGlobal: {
         return parent_.global->isAtEndTransition();
       }
-      case Type::kModule:
-      {
+      case Type::kModule: {
         return parent_.module->parent().isAtEndTransition();
       }
-      case Type::kStream:
-      {
+      case Type::kStream: {
         return parent_.stream->isAtEndTransition();
       }
-      case Type::kPlaceInPath:
-      {
+      case Type::kPlaceInPath: {
         return parent_.placeInPath->pathContext()->streamContext()->isAtEndTransition();
       }
       default:
@@ -111,9 +82,9 @@ namespace edm {
     }
     return false;
   }
-  
+
   std::ostream& operator<<(std::ostream& os, ParentContext const& pc) {
-    if(pc.type() == ParentContext::Type::kGlobal && pc.globalContext()) {
+    if (pc.type() == ParentContext::Type::kGlobal && pc.globalContext()) {
       os << *pc.globalContext();
     } else if (pc.type() == ParentContext::Type::kInternal && pc.internalContext()) {
       os << *pc.internalContext();
@@ -128,4 +99,4 @@ namespace edm {
     }
     return os;
   }
-}
+}  // namespace edm
diff --git a/FWCore/ServiceRegistry/src/PathContext.cc b/FWCore/ServiceRegistry/src/PathContext.cc
index d70c4e90dc27d..444feb71ad857 100644
--- a/FWCore/ServiceRegistry/src/PathContext.cc
+++ b/FWCore/ServiceRegistry/src/PathContext.cc
@@ -8,24 +8,19 @@ namespace edm {
   PathContext::PathContext(std::string const& pathName,
                            StreamContext const* streamContext,
                            unsigned int pathID,
-                           PathType pathType) :
-    pathName_(pathName),
-    streamContext_(streamContext),
-    pathID_(pathID),
-    pathType_(pathType) {
-  }
+                           PathType pathType)
+      : pathName_(pathName), streamContext_(streamContext), pathID_(pathID), pathType_(pathType) {}
 
   std::ostream& operator<<(std::ostream& os, PathContext const& pc) {
-    os << "PathContext: pathName = " << pc.pathName()
-       << " pathID = " << pc.pathID();
-    if(pc.pathType() == PathContext::PathType::kEndPath) {
-      os << " (EndPath)\n"; 
+    os << "PathContext: pathName = " << pc.pathName() << " pathID = " << pc.pathID();
+    if (pc.pathType() == PathContext::PathType::kEndPath) {
+      os << " (EndPath)\n";
     } else {
       os << "\n";
     }
-    if(pc.streamContext()) {
-      os << "    " << *pc.streamContext(); 
+    if (pc.streamContext()) {
+      os << "    " << *pc.streamContext();
     }
     return os;
   }
-}
+}  // namespace edm
diff --git a/FWCore/ServiceRegistry/src/PathsAndConsumesOfModulesBase.cc b/FWCore/ServiceRegistry/src/PathsAndConsumesOfModulesBase.cc
index 59ac3b10e6ebc..c5662f08d0fc1 100644
--- a/FWCore/ServiceRegistry/src/PathsAndConsumesOfModulesBase.cc
+++ b/FWCore/ServiceRegistry/src/PathsAndConsumesOfModulesBase.cc
@@ -2,6 +2,5 @@
 
 namespace edm {
 
-  PathsAndConsumesOfModulesBase::~PathsAndConsumesOfModulesBase() {
-  }
-}
+  PathsAndConsumesOfModulesBase::~PathsAndConsumesOfModulesBase() {}
+}  // namespace edm
diff --git a/FWCore/ServiceRegistry/src/PlaceInPathContext.cc b/FWCore/ServiceRegistry/src/PlaceInPathContext.cc
index c7f97b39712f8..86ffe91048fff 100644
--- a/FWCore/ServiceRegistry/src/PlaceInPathContext.cc
+++ b/FWCore/ServiceRegistry/src/PlaceInPathContext.cc
@@ -5,16 +5,13 @@
 
 namespace edm {
 
-  PlaceInPathContext::PlaceInPathContext(unsigned int placeInPath) :
-    placeInPath_(placeInPath),
-    pathContext_(nullptr) {
-  }
+  PlaceInPathContext::PlaceInPathContext(unsigned int placeInPath) : placeInPath_(placeInPath), pathContext_(nullptr) {}
 
   std::ostream& operator<<(std::ostream& os, PlaceInPathContext const& ppc) {
     os << "PlaceInPathContext " << ppc.placeInPath() << "\n";
-    if(ppc.pathContext()) {
-      os << "    " << *ppc.pathContext(); 
+    if (ppc.pathContext()) {
+      os << "    " << *ppc.pathContext();
     }
     return os;
   }
-}
+}  // namespace edm
diff --git a/FWCore/ServiceRegistry/src/ProcessContext.cc b/FWCore/ServiceRegistry/src/ProcessContext.cc
index 939150ffdceb1..342d7e495b867 100644
--- a/FWCore/ServiceRegistry/src/ProcessContext.cc
+++ b/FWCore/ServiceRegistry/src/ProcessContext.cc
@@ -5,42 +5,36 @@
 
 namespace edm {
 
-  ProcessContext::ProcessContext() :
-    processConfiguration_(nullptr),
-    parentProcessContext_(nullptr) {
-  }
+  ProcessContext::ProcessContext() : processConfiguration_(nullptr), parentProcessContext_(nullptr) {}
 
-  ProcessContext const&
-  ProcessContext::parentProcessContext() const {
+  ProcessContext const& ProcessContext::parentProcessContext() const {
     if (!isSubProcess()) {
       throw Exception(errors::LogicError)
-        << "ProcessContext::parentProcessContext This function should only be called for SubProcesses.\n"
-        << "If necessary, you can check this by calling isSubProcess first.\n";
+          << "ProcessContext::parentProcessContext This function should only be called for SubProcesses.\n"
+          << "If necessary, you can check this by calling isSubProcess first.\n";
     }
     return *parentProcessContext_;
   }
 
-  void
-  ProcessContext::setProcessConfiguration(ProcessConfiguration const* processConfiguration) {
+  void ProcessContext::setProcessConfiguration(ProcessConfiguration const* processConfiguration) {
     processConfiguration_ = processConfiguration;
   }
 
-  void
-  ProcessContext::setParentProcessContext(ProcessContext const* parentProcessContext) {
+  void ProcessContext::setParentProcessContext(ProcessContext const* parentProcessContext) {
     parentProcessContext_ = parentProcessContext;
   }
 
   std::ostream& operator<<(std::ostream& os, ProcessContext const& pc) {
     os << "ProcessContext: ";
-    if(pc.processConfiguration()) {
-      os << pc.processConfiguration()->processName() <<  " " << pc.processConfiguration()->parameterSetID()<< "\n";
+    if (pc.processConfiguration()) {
+      os << pc.processConfiguration()->processName() << " " << pc.processConfiguration()->parameterSetID() << "\n";
     } else {
       os << "invalid\n";
       return os;
     }
-    if(pc.isSubProcess()) {
+    if (pc.isSubProcess()) {
       os << "    parent " << pc.parentProcessContext();
     }
     return os;
   }
-}
+}  // namespace edm
diff --git a/FWCore/ServiceRegistry/src/ServiceMakerBase.cc b/FWCore/ServiceRegistry/src/ServiceMakerBase.cc
index 00399f959a239..b00c13c5a8c5e 100644
--- a/FWCore/ServiceRegistry/src/ServiceMakerBase.cc
+++ b/FWCore/ServiceRegistry/src/ServiceMakerBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     ServiceRegistry
 // Class  :     ServiceMakerBase
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -28,18 +28,14 @@ using namespace edm::serviceregistry;
 //
 // constructors and destructor
 //
-ServiceMakerBase::ServiceMakerBase()
-{
-}
+ServiceMakerBase::ServiceMakerBase() {}
 
 // ServiceMakerBase::ServiceMakerBase(const ServiceMakerBase& rhs)
 // {
 //    // do actual copying here;
 // }
 
-ServiceMakerBase::~ServiceMakerBase()
-{
-}
+ServiceMakerBase::~ServiceMakerBase() {}
 
 //
 // assignment operators
diff --git a/FWCore/ServiceRegistry/src/ServicePluginFactory.cc b/FWCore/ServiceRegistry/src/ServicePluginFactory.cc
index 06a73c7f42102..c58bbae93caec 100644
--- a/FWCore/ServiceRegistry/src/ServicePluginFactory.cc
+++ b/FWCore/ServiceRegistry/src/ServicePluginFactory.cc
@@ -2,7 +2,7 @@
 //
 // Package:     ServiceRegistry
 // Class  :     ServicePluginFactory
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -15,5 +15,4 @@
 // user include files
 #include "FWCore/ServiceRegistry/interface/ServicePluginFactory.h"
 
-EDM_REGISTER_PLUGINFACTORY(edm::serviceregistry::ServicePluginFactory,"CMS EDM Framework Service");
-
+EDM_REGISTER_PLUGINFACTORY(edm::serviceregistry::ServicePluginFactory, "CMS EDM Framework Service");
diff --git a/FWCore/ServiceRegistry/src/ServiceRegistry.cc b/FWCore/ServiceRegistry/src/ServiceRegistry.cc
index 18f6bdb954b32..cac730d03050c 100644
--- a/FWCore/ServiceRegistry/src/ServiceRegistry.cc
+++ b/FWCore/ServiceRegistry/src/ServiceRegistry.cc
@@ -2,7 +2,7 @@
 //
 // Package:     ServiceRegistry
 // Class  :     ServiceRegistry
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -16,93 +16,79 @@
 // system include files
 
 namespace edm {
-   //
-   // constants, enums and typedefs
-   //
-
-   //
-   // static data member definitions
-   //
-
-   //
-   // constructors and destructor
-   //
-   ServiceRegistry::ServiceRegistry() {
-   }
-
-   // ServiceRegistry::ServiceRegistry(ServiceRegistry const& rhs) {
-   //    // do actual copying here;
-   // }
-
-   ServiceRegistry::~ServiceRegistry() {
-   }
-
-   //
-   // assignment operators
-   //
-   // ServiceRegistry const& ServiceRegistry::operator=(ServiceRegistry const& rhs) {
-   //   //An exception safe implementation is
-   //   ServiceRegistry temp(rhs);
-   //   swap(rhs);
-   //
-   //   return *this;
-   // }
-
-   //
-   // member functions
-   //
-   ServiceToken 
-   ServiceRegistry::setContext(ServiceToken const& iNewToken) {
-      ServiceToken returnValue(manager_);
-      manager_ = iNewToken.manager_;
-      return returnValue;
-   }
-
-   void 
-   ServiceRegistry::unsetContext(ServiceToken const& iOldToken) {
-      manager_ = iOldToken.manager_;
-   }
-
-   //
-   // const member functions
-   //
-   ServiceToken 
-   ServiceRegistry::presentToken() const {
-      return manager_;
-   }
-
-   //
-   // static member functions
-   //
-
-   ServiceToken
-   ServiceRegistry::createServicesFromConfig(std::unique_ptr<ParameterSet> params) {
-
-      auto serviceSets = params->popVParameterSet(std::string("services"));
-      //create the services
-      return ServiceToken(ServiceRegistry::createSet(serviceSets));
-   }
-
-   ServiceToken 
-   ServiceRegistry::createSet(std::vector<ParameterSet>& iPS) {
-      using namespace serviceregistry;
-      auto returnValue = std::make_shared<ServicesManager>(iPS);
-      return ServiceToken(returnValue);
-   }
-
-   ServiceToken 
-   ServiceRegistry::createSet(std::vector<ParameterSet>& iPS,
-                                   ServiceToken iToken,
-                                   serviceregistry::ServiceLegacy iLegacy,
-                                   bool associate) {
-      using namespace serviceregistry;
-      auto returnValue = std::make_shared<ServicesManager>(iToken, iLegacy, iPS, associate);
-      return ServiceToken(returnValue);
-   }
-
-   ServiceRegistry& 
-   ServiceRegistry::instance() {
-      static thread_local ServiceRegistry s_registry;
-      return s_registry;
-   }
-}
+  //
+  // constants, enums and typedefs
+  //
+
+  //
+  // static data member definitions
+  //
+
+  //
+  // constructors and destructor
+  //
+  ServiceRegistry::ServiceRegistry() {}
+
+  // ServiceRegistry::ServiceRegistry(ServiceRegistry const& rhs) {
+  //    // do actual copying here;
+  // }
+
+  ServiceRegistry::~ServiceRegistry() {}
+
+  //
+  // assignment operators
+  //
+  // ServiceRegistry const& ServiceRegistry::operator=(ServiceRegistry const& rhs) {
+  //   //An exception safe implementation is
+  //   ServiceRegistry temp(rhs);
+  //   swap(rhs);
+  //
+  //   return *this;
+  // }
+
+  //
+  // member functions
+  //
+  ServiceToken ServiceRegistry::setContext(ServiceToken const& iNewToken) {
+    ServiceToken returnValue(manager_);
+    manager_ = iNewToken.manager_;
+    return returnValue;
+  }
+
+  void ServiceRegistry::unsetContext(ServiceToken const& iOldToken) { manager_ = iOldToken.manager_; }
+
+  //
+  // const member functions
+  //
+  ServiceToken ServiceRegistry::presentToken() const { return manager_; }
+
+  //
+  // static member functions
+  //
+
+  ServiceToken ServiceRegistry::createServicesFromConfig(std::unique_ptr<ParameterSet> params) {
+    auto serviceSets = params->popVParameterSet(std::string("services"));
+    //create the services
+    return ServiceToken(ServiceRegistry::createSet(serviceSets));
+  }
+
+  ServiceToken ServiceRegistry::createSet(std::vector<ParameterSet>& iPS) {
+    using namespace serviceregistry;
+    auto returnValue = std::make_shared<ServicesManager>(iPS);
+    return ServiceToken(returnValue);
+  }
+
+  ServiceToken ServiceRegistry::createSet(std::vector<ParameterSet>& iPS,
+                                          ServiceToken iToken,
+                                          serviceregistry::ServiceLegacy iLegacy,
+                                          bool associate) {
+    using namespace serviceregistry;
+    auto returnValue = std::make_shared<ServicesManager>(iToken, iLegacy, iPS, associate);
+    return ServiceToken(returnValue);
+  }
+
+  ServiceRegistry& ServiceRegistry::instance() {
+    static thread_local ServiceRegistry s_registry;
+    return s_registry;
+  }
+}  // namespace edm
diff --git a/FWCore/ServiceRegistry/src/ServiceToken.cc b/FWCore/ServiceRegistry/src/ServiceToken.cc
index 34a8bf38b3a6a..2248d84381b4c 100644
--- a/FWCore/ServiceRegistry/src/ServiceToken.cc
+++ b/FWCore/ServiceRegistry/src/ServiceToken.cc
@@ -2,7 +2,7 @@
 //
 // Package:     ServiceRegistry
 // Class  :     ServiceToken
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -16,7 +16,6 @@
 #include "FWCore/ServiceRegistry/interface/ServiceToken.h"
 #include "FWCore/ServiceRegistry/interface/ServicesManager.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -31,7 +30,7 @@
 //ServiceToken::ServiceToken()
 //{
 //}
-   
+
 // ServiceToken::ServiceToken(const ServiceToken& rhs)
 // {
 //    // do actual copying here;
@@ -40,7 +39,7 @@
 //ServiceToken::~ServiceToken()
 //{
 //}
-   
+
 //
 // assignment operators
 //
@@ -56,32 +55,24 @@
 //
 // member functions
 //
-void
-edm::ServiceToken::connectTo(edm::ActivityRegistry& iConnectTo)
-{
-   if(nullptr!=manager_.get()){
-      manager_->connectTo(iConnectTo);
-   }
+void edm::ServiceToken::connectTo(edm::ActivityRegistry& iConnectTo) {
+  if (nullptr != manager_.get()) {
+    manager_->connectTo(iConnectTo);
+  }
 }
-void
-edm::ServiceToken::connect(edm::ActivityRegistry& iConnectTo)
-{
-   if(nullptr!=manager_.get()){
-      manager_->connect(iConnectTo);
-   }
+void edm::ServiceToken::connect(edm::ActivityRegistry& iConnectTo) {
+  if (nullptr != manager_.get()) {
+    manager_->connect(iConnectTo);
+  }
 }
 
-void
-edm::ServiceToken::copySlotsTo(edm::ActivityRegistry& iConnectTo)
-{
-  if(nullptr!=manager_.get()){
+void edm::ServiceToken::copySlotsTo(edm::ActivityRegistry& iConnectTo) {
+  if (nullptr != manager_.get()) {
     manager_->copySlotsTo(iConnectTo);
   }
 }
-void
-edm::ServiceToken::copySlotsFrom(edm::ActivityRegistry& iConnectTo)
-{
-  if(nullptr!=manager_.get()){
+void edm::ServiceToken::copySlotsFrom(edm::ActivityRegistry& iConnectTo) {
+  if (nullptr != manager_.get()) {
     manager_->copySlotsFrom(iConnectTo);
   }
 }
diff --git a/FWCore/ServiceRegistry/src/ServiceWrapperBase.cc b/FWCore/ServiceRegistry/src/ServiceWrapperBase.cc
index 8b492d9d10371..b4b233daf433f 100644
--- a/FWCore/ServiceRegistry/src/ServiceWrapperBase.cc
+++ b/FWCore/ServiceRegistry/src/ServiceWrapperBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     ServiceRegistry
 // Class  :     ServiceWrapperBase
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -27,18 +27,14 @@ using namespace edm::serviceregistry;
 //
 // constructors and destructor
 //
-ServiceWrapperBase::ServiceWrapperBase()
-{
-}
+ServiceWrapperBase::ServiceWrapperBase() {}
 
 // ServiceWrapperBase::ServiceWrapperBase(const ServiceWrapperBase& rhs)
 // {
 //    // do actual copying here;
 // }
 
-ServiceWrapperBase::~ServiceWrapperBase()
-{
-}
+ServiceWrapperBase::~ServiceWrapperBase() {}
 
 //
 // assignment operators
diff --git a/FWCore/ServiceRegistry/src/ServicesManager.cc b/FWCore/ServiceRegistry/src/ServicesManager.cc
index 3bcb1821aa17f..8f41d7868d043 100644
--- a/FWCore/ServiceRegistry/src/ServicesManager.cc
+++ b/FWCore/ServiceRegistry/src/ServicesManager.cc
@@ -38,304 +38,278 @@
 //
 
 namespace edm {
-   namespace serviceregistry {
-
-      ServicesManager::MakerHolder::MakerHolder(std::shared_ptr<ServiceMakerBase> iMaker,
-                                                ParameterSet& iPSet,
-                                                ActivityRegistry& iRegistry) :
-      maker_(iMaker),
-      pset_(&iPSet),
-      registry_(&iRegistry),
-      wasAdded_(false) {}
-
-      bool
-      ServicesManager::MakerHolder::add(ServicesManager& oManager) const {
-         if(!wasAdded_) {
-            wasAdded_ = maker_->make(*pset_, *registry_, oManager);
-            if(wasAdded_ && maker_->saveConfiguration()) {
-               pset_->addUntrackedParameter("@save_config", true);
-            }
-         }
-         return wasAdded_;
+  namespace serviceregistry {
+
+    ServicesManager::MakerHolder::MakerHolder(std::shared_ptr<ServiceMakerBase> iMaker,
+                                              ParameterSet& iPSet,
+                                              ActivityRegistry& iRegistry)
+        : maker_(iMaker), pset_(&iPSet), registry_(&iRegistry), wasAdded_(false) {}
+
+    bool ServicesManager::MakerHolder::add(ServicesManager& oManager) const {
+      if (!wasAdded_) {
+        wasAdded_ = maker_->make(*pset_, *registry_, oManager);
+        if (wasAdded_ && maker_->saveConfiguration()) {
+          pset_->addUntrackedParameter("@save_config", true);
+        }
       }
-
-      //
-      // static data member definitions
-      //
-
-      //
-      // constructors and destructor
-      //
-      ServicesManager::ServicesManager(std::vector<ParameterSet>& iConfiguration) :
-      type2Maker_(new Type2Maker) {
-         //First create the list of makers
-         fillListOfMakers(iConfiguration);
-
-         createServices();
+      return wasAdded_;
+    }
+
+    //
+    // static data member definitions
+    //
+
+    //
+    // constructors and destructor
+    //
+    ServicesManager::ServicesManager(std::vector<ParameterSet>& iConfiguration) : type2Maker_(new Type2Maker) {
+      //First create the list of makers
+      fillListOfMakers(iConfiguration);
+
+      createServices();
+    }
+
+    ServicesManager::ServicesManager(ServiceToken iToken,
+                                     ServiceLegacy iLegacy,
+                                     std::vector<ParameterSet>& iConfiguration,
+                                     bool associate)
+        : associatedManager_(associate ? iToken.manager_ : std::shared_ptr<ServicesManager>()),
+          type2Maker_(new Type2Maker) {
+      fillListOfMakers(iConfiguration);
+
+      //find overlaps between services in iToken and iConfiguration
+      typedef std::set<TypeIDBase> TypeSet;
+      TypeSet configTypes;
+      for (Type2Maker::iterator itType = type2Maker_->begin(), itTypeEnd = type2Maker_->end(); itType != itTypeEnd;
+           ++itType) {
+        configTypes.insert(itType->first);
       }
 
-      ServicesManager::ServicesManager(ServiceToken iToken,
-                                       ServiceLegacy iLegacy,
-                                       std::vector<ParameterSet>& iConfiguration,
-                                       bool associate) :
-            associatedManager_(associate ? iToken.manager_ : std::shared_ptr<ServicesManager>()),
-            type2Maker_(new Type2Maker) {
-         fillListOfMakers(iConfiguration);
-
-         //find overlaps between services in iToken and iConfiguration
-         typedef std::set< TypeIDBase> TypeSet;
-         TypeSet configTypes;
-         for(Type2Maker::iterator itType = type2Maker_->begin(), itTypeEnd = type2Maker_->end();
+      TypeSet tokenTypes;
+      if (nullptr != iToken.manager_.get()) {
+        for (Type2Service::iterator itType = iToken.manager_->type2Service_.begin(),
+                                    itTypeEnd = iToken.manager_->type2Service_.end();
              itType != itTypeEnd;
              ++itType) {
-            configTypes.insert(itType->first);
-         }
-
-         TypeSet tokenTypes;
-         if(nullptr != iToken.manager_.get()) {
-            for(Type2Service::iterator itType = iToken.manager_->type2Service_.begin(),
-                itTypeEnd = iToken.manager_->type2Service_.end();
-                itType != itTypeEnd;
-                ++itType) {
-               tokenTypes.insert(itType->first);
+          tokenTypes.insert(itType->first);
+        }
+
+        typedef std::set<TypeIDBase> IntersectionType;
+        IntersectionType intersection;
+        std::set_intersection(configTypes.begin(),
+                              configTypes.end(),
+                              tokenTypes.begin(),
+                              tokenTypes.end(),
+                              inserter(intersection, intersection.end()));
+
+        switch (iLegacy) {
+          case kOverlapIsError:
+            if (!intersection.empty()) {
+              throw Exception(errors::Configuration, "Service")
+                  << "the Service "
+                  << (*type2Maker_)
+                         .find(*(intersection.begin()))
+                         ->second.pset_->getParameter<std::string>("@service_type")
+                  << " already has an instance of that type of Service";
+            } else {
+              //get all the services from Token
+              type2Service_ = iToken.manager_->type2Service_;
             }
-
-            typedef std::set<TypeIDBase> IntersectionType;
-            IntersectionType intersection;
-            std::set_intersection(configTypes.begin(), configTypes.end(),
-                                  tokenTypes.begin(), tokenTypes.end(),
-                                  inserter(intersection, intersection.end()));
-
-            switch(iLegacy) {
-               case kOverlapIsError :
-                  if(!intersection.empty()) {
-                     throw Exception(errors::Configuration, "Service")
-                     << "the Service " << (*type2Maker_).find(*(intersection.begin()))->second.pset_->getParameter<std::string>("@service_type")
-                     << " already has an instance of that type of Service";
-                  } else {
-                     //get all the services from Token
-                     type2Service_ = iToken.manager_->type2Service_;
-                  }
-                  break;
-               case kTokenOverrides :
-                  //get all the services from Token
-                  type2Service_ = iToken.manager_->type2Service_;
-
-                  //remove from type2Maker the overlapping services so we never try to make them
-                  for(IntersectionType::iterator itType = intersection.begin(), itTypeEnd = intersection.end();
-                      itType != itTypeEnd;
-                      ++itType) {
-                     Type2Maker::iterator itFound = type2Maker_->find(*itType);
-                     //HLT needs it such that even if a service isn't created we store its PSet if needed
-                     if(itFound->second.maker_->saveConfiguration()) {
-                        itFound->second.pset_->addUntrackedParameter("@save_config", true);
-                     }
-                     type2Maker_->erase(itFound);
-                  }
-                  break;
-               case kConfigurationOverrides:
-                  //get all the services from the Configuration, except process wide services
-                  type2Service_ = iToken.manager_->type2Service_;
-
-                  //now remove the ones we do not want
-                  for(IntersectionType::iterator itType = intersection.begin(), itTypeEnd = intersection.end();
-                      itType != itTypeEnd;
-                      ++itType) {
-                     Type2Maker::iterator itFound = type2Maker_->find(*itType);
-                     if(itFound->second.maker_->processWideService()) {
-                       // This is a process wide service, so the token overrides the configuration.
-                       //HLT needs it such that even if a service isn't created we store its PSet if needed
-                       if(itFound->second.maker_->saveConfiguration()) {
-                         itFound->second.pset_->addUntrackedParameter("@save_config", true);
-                       }
-                       std::string type(typeDemangle(itType->name()));
-                       LogInfo("Configuration") << "Warning: You have reconfigured service\n"
-                                 <<  "'" << type << "' in a subprocess.\n"
-                                 << "This service has already been configured.\n"
-                                 << "This particular service may not be reconfigured in a subprocess.\n"
-                                 << "The reconfiguration will be ignored.\n";
-                       type2Maker_->erase(itFound);
-                     } else {
-                       // This is not a process wide service, so the configuration overrides the token.
-                       type2Service_.erase(type2Service_.find(*itType));
-                     }
-                  }
-                  break;
+            break;
+          case kTokenOverrides:
+            //get all the services from Token
+            type2Service_ = iToken.manager_->type2Service_;
+
+            //remove from type2Maker the overlapping services so we never try to make them
+            for (IntersectionType::iterator itType = intersection.begin(), itTypeEnd = intersection.end();
+                 itType != itTypeEnd;
+                 ++itType) {
+              Type2Maker::iterator itFound = type2Maker_->find(*itType);
+              //HLT needs it such that even if a service isn't created we store its PSet if needed
+              if (itFound->second.maker_->saveConfiguration()) {
+                itFound->second.pset_->addUntrackedParameter("@save_config", true);
+              }
+              type2Maker_->erase(itFound);
             }
-            //make sure our signals are propagated to our 'inherited' Services
-            if (associate) registry_.copySlotsFrom(associatedManager_->registry_);
-         }
-         createServices();
-      }
-
-      // ServicesManager::ServicesManager(ServicesManager const& rhs) {
-      //    // do actual copying here;
-      // }
-
-      ServicesManager::~ServicesManager() {
-         // Force the Service destructors to execute in the reverse order of construction.
-         // Note that services passed in by a token are not included in this loop and
-         // do not get destroyed until the ServicesManager object that created them is destroyed
-         // which occurs after the body of this destructor is executed (the correct order).
-         // Services directly passed in by a put and not created in the constructor
-         // may or not be detroyed in the desired order because this class does not control
-         // their creation (as I'm writing this comment everything in a standard cmsRun
-         // executable is destroyed in the desired order).
-         for(std::vector<TypeIDBase>::const_reverse_iterator idIter = actualCreationOrder_.rbegin(),
-                                                             idEnd = actualCreationOrder_.rend();
-              idIter != idEnd;
-              ++idIter) {
-
-            Type2Service::iterator itService = type2Service_.find(*idIter);
-
-            if(itService != type2Service_.end()) {
-
-               // This will cause the Service's destruction if
-               // there are no other shared pointers around
-               itService->second.reset();
+            break;
+          case kConfigurationOverrides:
+            //get all the services from the Configuration, except process wide services
+            type2Service_ = iToken.manager_->type2Service_;
+
+            //now remove the ones we do not want
+            for (IntersectionType::iterator itType = intersection.begin(), itTypeEnd = intersection.end();
+                 itType != itTypeEnd;
+                 ++itType) {
+              Type2Maker::iterator itFound = type2Maker_->find(*itType);
+              if (itFound->second.maker_->processWideService()) {
+                // This is a process wide service, so the token overrides the configuration.
+                //HLT needs it such that even if a service isn't created we store its PSet if needed
+                if (itFound->second.maker_->saveConfiguration()) {
+                  itFound->second.pset_->addUntrackedParameter("@save_config", true);
+                }
+                std::string type(typeDemangle(itType->name()));
+                LogInfo("Configuration") << "Warning: You have reconfigured service\n"
+                                         << "'" << type << "' in a subprocess.\n"
+                                         << "This service has already been configured.\n"
+                                         << "This particular service may not be reconfigured in a subprocess.\n"
+                                         << "The reconfiguration will be ignored.\n";
+                type2Maker_->erase(itFound);
+              } else {
+                // This is not a process wide service, so the configuration overrides the token.
+                type2Service_.erase(type2Service_.find(*itType));
+              }
             }
-         }
+            break;
+        }
+        //make sure our signals are propagated to our 'inherited' Services
+        if (associate)
+          registry_.copySlotsFrom(associatedManager_->registry_);
       }
-
-      //
-      // assignment operators
-      //
-      // ServicesManager const& ServicesManager::operator=(ServicesManager const& rhs) {
-      //   //An exception safe implementation is
-      //   ServicesManager temp(rhs);
-      //   swap(rhs);
-      //
-      //   return *this;
-      // }
-
-      //
-      // member functions
-      //
-      void
-      ServicesManager::connect(ActivityRegistry& iOther) {
-         registry_.connect(iOther);
+      createServices();
+    }
+
+    // ServicesManager::ServicesManager(ServicesManager const& rhs) {
+    //    // do actual copying here;
+    // }
+
+    ServicesManager::~ServicesManager() {
+      // Force the Service destructors to execute in the reverse order of construction.
+      // Note that services passed in by a token are not included in this loop and
+      // do not get destroyed until the ServicesManager object that created them is destroyed
+      // which occurs after the body of this destructor is executed (the correct order).
+      // Services directly passed in by a put and not created in the constructor
+      // may or not be detroyed in the desired order because this class does not control
+      // their creation (as I'm writing this comment everything in a standard cmsRun
+      // executable is destroyed in the desired order).
+      for (std::vector<TypeIDBase>::const_reverse_iterator idIter = actualCreationOrder_.rbegin(),
+                                                           idEnd = actualCreationOrder_.rend();
+           idIter != idEnd;
+           ++idIter) {
+        Type2Service::iterator itService = type2Service_.find(*idIter);
+
+        if (itService != type2Service_.end()) {
+          // This will cause the Service's destruction if
+          // there are no other shared pointers around
+          itService->second.reset();
+        }
       }
-
-      void
-      ServicesManager::connectTo(ActivityRegistry& iOther) {
-         iOther.connect(registry_);
+    }
+
+    //
+    // assignment operators
+    //
+    // ServicesManager const& ServicesManager::operator=(ServicesManager const& rhs) {
+    //   //An exception safe implementation is
+    //   ServicesManager temp(rhs);
+    //   swap(rhs);
+    //
+    //   return *this;
+    // }
+
+    //
+    // member functions
+    //
+    void ServicesManager::connect(ActivityRegistry& iOther) { registry_.connect(iOther); }
+
+    void ServicesManager::connectTo(ActivityRegistry& iOther) { iOther.connect(registry_); }
+
+    void ServicesManager::copySlotsFrom(ActivityRegistry& iOther) { registry_.copySlotsFrom(iOther); }
+
+    void ServicesManager::copySlotsTo(ActivityRegistry& iOther) { iOther.copySlotsFrom(registry_); }
+
+    void ServicesManager::fillListOfMakers(std::vector<ParameterSet>& iConfiguration) {
+      for (std::vector<ParameterSet>::iterator itParam = iConfiguration.begin(), itParamEnd = iConfiguration.end();
+           itParam != itParamEnd;
+           ++itParam) {
+        std::shared_ptr<ServiceMakerBase> base(
+            ServicePluginFactory::get()->create(itParam->getParameter<std::string>("@service_type")));
+
+        if (nullptr == base.get()) {
+          throw Exception(errors::Configuration, "Service")
+              << "could not find a service named " << itParam->getParameter<std::string>("@service_type")
+              << ". Please check spelling.";
+        }
+        Type2Maker::iterator itFound = type2Maker_->find(TypeIDBase(base->serviceType()));
+        if (itFound != type2Maker_->end()) {
+          throw Exception(errors::Configuration, "Service")
+              << " the service " << itParam->getParameter<std::string>("@service_type")
+              << " provides the same service as " << itFound->second.pset_->getParameter<std::string>("@service_type")
+              << "\n Please reconfigure job to only use one of these services.";
+        }
+        type2Maker_->insert(
+            Type2Maker::value_type(TypeIDBase(base->serviceType()), MakerHolder(base, *itParam, registry_)));
+        requestedCreationOrder_.push_back(TypeIDBase(base->serviceType()));
       }
-
-      void
-      ServicesManager::copySlotsFrom(ActivityRegistry& iOther) {
-        registry_.copySlotsFrom(iOther);
+    }
+
+    namespace {
+      struct NoOp {
+        void operator()(ServicesManager*) {}
+      };
+    }  // namespace
+
+    void ServicesManager::createServiceFor(MakerHolder const& iMaker) {
+      std::string serviceType = iMaker.pset_->getParameter<std::string>("@service_type");
+      std::unique_ptr<ParameterSetDescriptionFillerBase> filler(
+          ParameterSetDescriptionFillerPluginFactory::get()->create(serviceType));
+      ConfigurationDescriptions descriptions(filler->baseType(), serviceType);
+      filler->fill(descriptions);
+
+      try {
+        convertException::wrap([&]() { descriptions.validate(*(iMaker.pset_), serviceType); });
+      } catch (cms::Exception& iException) {
+        std::ostringstream ost;
+        ost << "Validating configuration of service of type " << serviceType;
+        iException.addContext(ost.str());
+        throw;
       }
-
-      void
-      ServicesManager::copySlotsTo(ActivityRegistry& iOther) {
-        iOther.copySlotsFrom(registry_);
+      try {
+        convertException::wrap([&]() {
+          // This creates the service
+          iMaker.add(*this);
+        });
+      } catch (cms::Exception& iException) {
+        std::ostringstream ost;
+        ost << "Constructing service of type " << serviceType;
+        iException.addContext(ost.str());
+        throw;
       }
+    }
 
-      void
-      ServicesManager::fillListOfMakers(std::vector<ParameterSet>& iConfiguration) {
-         for(std::vector<ParameterSet>::iterator itParam = iConfiguration.begin(),
-              itParamEnd = iConfiguration.end();
-              itParam != itParamEnd;
-              ++itParam) {
-            std::shared_ptr<ServiceMakerBase> base(ServicePluginFactory::get()->create(itParam->getParameter<std::string>("@service_type")));
-
-            if(nullptr == base.get()) {
-               throw Exception(errors::Configuration, "Service")
-               << "could not find a service named "
-               << itParam->getParameter<std::string>("@service_type")
-               << ". Please check spelling.";
-            }
-            Type2Maker::iterator itFound = type2Maker_->find(TypeIDBase(base->serviceType()));
-            if(itFound != type2Maker_->end()) {
-               throw Exception(errors::Configuration, "Service")
-               << " the service " << itParam->getParameter<std::string>("@service_type")
-               << " provides the same service as "
-               << itFound->second.pset_->getParameter<std::string>("@service_type")
-               << "\n Please reconfigure job to only use one of these services.";
-            }
-            type2Maker_->insert(Type2Maker::value_type(TypeIDBase(base->serviceType()),
-                                                        MakerHolder(base,
-                                                                    *itParam,
-                                                                    registry_)));
-            requestedCreationOrder_.push_back(TypeIDBase(base->serviceType()));
-         }
-      }
+    void ServicesManager::createServices() {
+      //create a shared_ptr of 'this' that will not delete us
+      std::shared_ptr<ServicesManager> shareThis(this, NoOp());
 
-      namespace {
-         struct NoOp {
-            void operator()(ServicesManager*) {}
-         };
-      }
+      ServiceToken token(shareThis);
 
-      void
-      ServicesManager::createServiceFor(MakerHolder const& iMaker) {
-         std::string serviceType = iMaker.pset_->getParameter<std::string>("@service_type");
-         std::unique_ptr<ParameterSetDescriptionFillerBase> filler(
-                                                                   ParameterSetDescriptionFillerPluginFactory::get()->create(serviceType));
-         ConfigurationDescriptions descriptions(filler->baseType(), serviceType);
-         filler->fill(descriptions);
-         
-         try {
-            convertException::wrap([&]() {
-               descriptions.validate(*(iMaker.pset_), serviceType);
-            });
-         }
-         catch (cms::Exception & iException) {
-            std::ostringstream ost;
-            ost << "Validating configuration of service of type " << serviceType;
-            iException.addContext(ost.str());
-            throw;
-         }
-         try {
-            convertException::wrap([&]() {
-               // This creates the service
-               iMaker.add(*this);
-            });
-         }
-         catch (cms::Exception & iException) {
-            std::ostringstream ost;
-            ost << "Constructing service of type " << serviceType;
-            iException.addContext(ost.str());
-            throw;
-         }
-      }
-     
-      void
-      ServicesManager::createServices() {
-
-         //create a shared_ptr of 'this' that will not delete us
-         std::shared_ptr<ServicesManager> shareThis(this, NoOp());
-
-         ServiceToken token(shareThis);
-
-         //Now make our services to ones obtained via ServiceRegistry
-         // when this goes out of scope, it will revert back to the previous Service set
-         ServiceRegistry::Operate operate(token);
-
-         //Now, make each Service.  If a service depends on a service that has yet to be
-         // created, that other service will automatically be made
-
-         for(std::vector<TypeIDBase>::const_iterator idIter = requestedCreationOrder_.begin(),
-                                                     idEnd = requestedCreationOrder_.end();
-              idIter != idEnd;
-              ++idIter) {
-           Type2Maker::iterator itMaker = type2Maker_->find(*idIter);
-
-           // Check to make sure this maker is still there.  They are deleted
-           // sometimes and that is OK.
-           if(itMaker != type2Maker_->end()) {
-              createServiceFor(itMaker->second);
-           }
-         }
-         //No longer need the makers
-         type2Maker_ = nullptr; // propagate_const<T> has no reset() function
+      //Now make our services to ones obtained via ServiceRegistry
+      // when this goes out of scope, it will revert back to the previous Service set
+      ServiceRegistry::Operate operate(token);
+
+      //Now, make each Service.  If a service depends on a service that has yet to be
+      // created, that other service will automatically be made
+
+      for (std::vector<TypeIDBase>::const_iterator idIter = requestedCreationOrder_.begin(),
+                                                   idEnd = requestedCreationOrder_.end();
+           idIter != idEnd;
+           ++idIter) {
+        Type2Maker::iterator itMaker = type2Maker_->find(*idIter);
+
+        // Check to make sure this maker is still there.  They are deleted
+        // sometimes and that is OK.
+        if (itMaker != type2Maker_->end()) {
+          createServiceFor(itMaker->second);
+        }
       }
-      //
-      // const member functions
-      //
-
-      //
-      // static member functions
-      //
-   }
-}
+      //No longer need the makers
+      type2Maker_ = nullptr;  // propagate_const<T> has no reset() function
+    }
+    //
+    // const member functions
+    //
+
+    //
+    // static member functions
+    //
+  }  // namespace serviceregistry
+}  // namespace edm
diff --git a/FWCore/ServiceRegistry/src/StreamContext.cc b/FWCore/ServiceRegistry/src/StreamContext.cc
index b89f212ae1d01..d5bdacfc0daf8 100644
--- a/FWCore/ServiceRegistry/src/StreamContext.cc
+++ b/FWCore/ServiceRegistry/src/StreamContext.cc
@@ -6,94 +6,89 @@
 
 namespace edm {
 
-  StreamContext::StreamContext(StreamID const& streamID,
-                               ProcessContext const* processContext) :
-    streamID_(streamID),
-    transition_(Transition::kInvalid),
-    eventID_(EventID(0,0,0)),
-    runIndex_(RunIndex::invalidRunIndex()),
-    luminosityBlockIndex_(LuminosityBlockIndex::invalidLuminosityBlockIndex()),
-    timestamp_(),
-    processContext_(processContext) {
-  }
+  StreamContext::StreamContext(StreamID const& streamID, ProcessContext const* processContext)
+      : streamID_(streamID),
+        transition_(Transition::kInvalid),
+        eventID_(EventID(0, 0, 0)),
+        runIndex_(RunIndex::invalidRunIndex()),
+        luminosityBlockIndex_(LuminosityBlockIndex::invalidLuminosityBlockIndex()),
+        timestamp_(),
+        processContext_(processContext) {}
 
   StreamContext::StreamContext(StreamID const& streamID,
                                Transition transition,
                                EventID const& eventID,
                                RunIndex const& runIndex,
-                               LuminosityBlockIndex const& luminosityBlockIndex, 
+                               LuminosityBlockIndex const& luminosityBlockIndex,
                                Timestamp const& timestamp,
-                               ProcessContext const* processContext) :
-    streamID_(streamID),
-    transition_(transition),
-    eventID_(eventID),
-    runIndex_(runIndex),
-    luminosityBlockIndex_(luminosityBlockIndex),
-    timestamp_(timestamp),
-    processContext_(processContext) {
-  }
+                               ProcessContext const* processContext)
+      : streamID_(streamID),
+        transition_(transition),
+        eventID_(eventID),
+        runIndex_(runIndex),
+        luminosityBlockIndex_(luminosityBlockIndex),
+        timestamp_(timestamp),
+        processContext_(processContext) {}
 
   std::ostream& operator<<(std::ostream& os, StreamContext const& sc) {
-    os << "StreamContext: StreamID = " << sc.streamID()
-       << " transition = ";
+    os << "StreamContext: StreamID = " << sc.streamID() << " transition = ";
     switch (sc.transition()) {
-    case StreamContext::Transition::kBeginStream:
-      os << "BeginStream";
-      break;
-    case StreamContext::Transition::kBeginRun:
-      os << "BeginRun";
-      break;
-    case StreamContext::Transition::kBeginLuminosityBlock:
-      os << "BeginLuminosityBlock";
-      break;
-    case StreamContext::Transition::kEvent:
-      os << "Event";
-      break;
-    case StreamContext::Transition::kEndLuminosityBlock:
-      os << "EndLuminosityBlock";
-      break;
-    case StreamContext::Transition::kEndRun:
-      os << "EndRun";
-      break;
-    case StreamContext::Transition::kEndStream:
-      os << "EndStream";
-      break;
-    case StreamContext::Transition::kInvalid:
-      os << "Invalid";
-      break;
+      case StreamContext::Transition::kBeginStream:
+        os << "BeginStream";
+        break;
+      case StreamContext::Transition::kBeginRun:
+        os << "BeginRun";
+        break;
+      case StreamContext::Transition::kBeginLuminosityBlock:
+        os << "BeginLuminosityBlock";
+        break;
+      case StreamContext::Transition::kEvent:
+        os << "Event";
+        break;
+      case StreamContext::Transition::kEndLuminosityBlock:
+        os << "EndLuminosityBlock";
+        break;
+      case StreamContext::Transition::kEndRun:
+        os << "EndRun";
+        break;
+      case StreamContext::Transition::kEndStream:
+        os << "EndStream";
+        break;
+      case StreamContext::Transition::kInvalid:
+        os << "Invalid";
+        break;
     }
-    os << "\n    " << sc.eventID()
-       << "\n    runIndex = " << sc.runIndex().value()
+    os << "\n    " << sc.eventID() << "\n    runIndex = " << sc.runIndex().value()
        << "  luminosityBlockIndex = " << sc.luminosityBlockIndex().value()
-       << "  unixTime = " << sc.timestamp().unixTime()
-       << " microsecondOffset = " << sc.timestamp().microsecondOffset() <<"\n";
-    if(sc.processContext()) {
-      os << "    " << *sc.processContext(); 
+       << "  unixTime = " << sc.timestamp().unixTime() << " microsecondOffset = " << sc.timestamp().microsecondOffset()
+       << "\n";
+    if (sc.processContext()) {
+      os << "    " << *sc.processContext();
     }
     return os;
   }
-  
+
   void exceptionContext(std::ostream& os, StreamContext const& sc) {
-    os << "Processing  " ;
+    os << "Processing  ";
     auto id = sc.eventID();
     switch (sc.transition()) {
       case StreamContext::Transition::kBeginStream:
         os << "begin Stream";
         break;
       case StreamContext::Transition::kBeginRun:
-        os << "stream begin Run " <<RunID(id.run());
+        os << "stream begin Run " << RunID(id.run());
         break;
       case StreamContext::Transition::kBeginLuminosityBlock:
-        os << "stream begin LuminosityBlock "<<LuminosityBlockID(id.run(), id.luminosityBlock());
+        os << "stream begin LuminosityBlock " << LuminosityBlockID(id.run(), id.luminosityBlock());
         break;
       case StreamContext::Transition::kEvent:
-        os << "Event "<<sc.eventID();
+        os << "Event " << sc.eventID();
         break;
       case StreamContext::Transition::kEndLuminosityBlock:
-        os << "stream end LuminosityBlock "<<LuminosityBlockID(id.run(), id.luminosityBlock());
+        os << "stream end LuminosityBlock " << LuminosityBlockID(id.run(), id.luminosityBlock());
         break;
       case StreamContext::Transition::kEndRun:
-        os << "stream end Run "<<RunID(id.run());
+        os << "stream end Run " << RunID(id.run());
         break;
       case StreamContext::Transition::kEndStream:
         os << "end Stream";
@@ -102,7 +97,7 @@ namespace edm {
         os << "Invalid";
         break;
     }
-    os <<" stream: "<<sc.streamID();
+    os << " stream: " << sc.streamID();
   }
 
-}
+}  // namespace edm
diff --git a/FWCore/ServiceRegistry/test/connect_but_block_self_t.cppunit.cc b/FWCore/ServiceRegistry/test/connect_but_block_self_t.cppunit.cc
index f887f06e48b0c..39b911389fcce 100644
--- a/FWCore/ServiceRegistry/test/connect_but_block_self_t.cppunit.cc
+++ b/FWCore/ServiceRegistry/test/connect_but_block_self_t.cppunit.cc
@@ -11,58 +11,56 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
-class testConnectButBlockSelf: public CppUnit::TestFixture
-{
-   CPPUNIT_TEST_SUITE(testConnectButBlockSelf);
-   
-   CPPUNIT_TEST(test);
-   
-   CPPUNIT_TEST_SUITE_END();
+class testConnectButBlockSelf : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testConnectButBlockSelf);
+
+  CPPUNIT_TEST(test);
+
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-      void setUp(){}
-   void tearDown(){}
-   
-   void test();
+  void setUp() {}
+  void tearDown() {}
+
+  void test();
 };
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testConnectButBlockSelf);
 
 namespace {
-   struct ReSignaller {
-      edm::signalslot::Signal<void()>* signal_;
-      int& seen_;
-
-      ReSignaller(edm::signalslot::Signal<void()>&iSig, int& iSee): signal_(&iSig), seen_(iSee){}
-      
-      void operator()() {
-         //std::cout <<"see signal"<<std::endl;
-         ++seen_;
-         (*signal_)();
-      }
-   };
-}
+  struct ReSignaller {
+    edm::signalslot::Signal<void()>* signal_;
+    int& seen_;
+
+    ReSignaller(edm::signalslot::Signal<void()>& iSig, int& iSee) : signal_(&iSig), seen_(iSee) {}
+
+    void operator()() {
+      //std::cout <<"see signal"<<std::endl;
+      ++seen_;
+      (*signal_)();
+    }
+  };
+}  // namespace
+
+void testConnectButBlockSelf::test() {
+  using namespace edm::serviceregistry;
+  edm::signalslot::Signal<void()> theSignal;
+
+  int iOne(0);
+  ReSignaller one(theSignal, iOne);
+  connect_but_block_self(theSignal, one);
+
+  int iTwo(0);
+  ReSignaller two(theSignal, iTwo);
+  connect_but_block_self(theSignal, two);
+
+  theSignal();
+
+  //std::cout <<"one "<<iOne <<std::endl;
+  //std::cout <<"two "<<iTwo <<std::endl;
 
-void
-testConnectButBlockSelf::test()
-{
-   using namespace edm::serviceregistry;
-   edm::signalslot::Signal<void()> theSignal;
-   
-   int iOne(0);
-   ReSignaller one(theSignal,iOne);
-   connect_but_block_self(theSignal, one );
-   
-   int iTwo(0);
-   ReSignaller two(theSignal,iTwo);
-   connect_but_block_self(theSignal, two );
-   
-   theSignal();
-   
-   //std::cout <<"one "<<iOne <<std::endl;
-   //std::cout <<"two "<<iTwo <<std::endl;
-   
-   //Both see two changes, but they never see their 'own' change
-   CPPUNIT_ASSERT(iOne == 2);
-   CPPUNIT_ASSERT(iTwo == 2);
+  //Both see two changes, but they never see their 'own' change
+  CPPUNIT_ASSERT(iOne == 2);
+  CPPUNIT_ASSERT(iTwo == 2);
 }
diff --git a/FWCore/ServiceRegistry/test/serviceregistry_t.cppunit.cpp b/FWCore/ServiceRegistry/test/serviceregistry_t.cppunit.cpp
index 935c4d6b760e3..eed7e95fae1ab 100644
--- a/FWCore/ServiceRegistry/test/serviceregistry_t.cppunit.cpp
+++ b/FWCore/ServiceRegistry/test/serviceregistry_t.cppunit.cpp
@@ -18,286 +18,265 @@
 
 #include <atomic>
 
-class testServiceRegistry: public CppUnit::TestFixture
-{
-   CPPUNIT_TEST_SUITE(testServiceRegistry);
-   
-   CPPUNIT_TEST(loadTest);
-   CPPUNIT_TEST(hierarchyTest);
-   CPPUNIT_TEST(threadTest);
-   CPPUNIT_TEST(externalServiceTest);
-   CPPUNIT_TEST(saveConfigWithExternalTest);
-
-   
-   CPPUNIT_TEST_SUITE_END();
+class testServiceRegistry : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testServiceRegistry);
+
+  CPPUNIT_TEST(loadTest);
+  CPPUNIT_TEST(hierarchyTest);
+  CPPUNIT_TEST(threadTest);
+  CPPUNIT_TEST(externalServiceTest);
+  CPPUNIT_TEST(saveConfigWithExternalTest);
+
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-      void setUp(){}
-   void tearDown(){}
-   
-   void loadTest();
-   void hierarchyTest();
-   void threadTest();
-   void externalServiceTest();
-   void saveConfigWithExternalTest();
+  void setUp() {}
+  void tearDown() {}
+
+  void loadTest();
+  void hierarchyTest();
+  void threadTest();
+  void externalServiceTest();
+  void saveConfigWithExternalTest();
 };
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testServiceRegistry);
 
-void
-testServiceRegistry::loadTest()
-{
-   edm::AssertHandler ah;
-
-   std::vector<edm::ParameterSet> pss;
-   
-   edm::ParameterSet ps;
-   std::string typeName("DummyService");
-   ps.addParameter("@service_type", typeName);
-   int value = 2;
-   ps.addParameter("value", value);
-   pss.push_back(ps);
-
-   edm::ServiceToken token(edm::ServiceRegistry::createSet(pss));
-
-   edm::ServiceRegistry::Operate operate(token);
-   edm::Service<testserviceregistry::DummyService> dummy;
-   CPPUNIT_ASSERT(dummy);
-   CPPUNIT_ASSERT(dummy.isAvailable());
-   CPPUNIT_ASSERT(dummy->value() == 2);
-}
-
-namespace {
-   struct DummyService { int value_; };
-}
+void testServiceRegistry::loadTest() {
+  edm::AssertHandler ah;
 
-void
-testServiceRegistry::externalServiceTest()
-{
-   edm::AssertHandler ah;
-
-   {
-      auto dummyPtr = std::make_unique<DummyService>();
-      dummyPtr->value_ = 2;
-      edm::ServiceToken token(edm::ServiceRegistry::createContaining(std::move(dummyPtr)));
-      {         
-         edm::ServiceRegistry::Operate operate(token);
-         edm::Service<DummyService> dummy;
-         CPPUNIT_ASSERT(dummy);
-         CPPUNIT_ASSERT(dummy.isAvailable());
-         CPPUNIT_ASSERT(dummy->value_ == 2);
-      }
-      {
-         std::vector<edm::ParameterSet> pss;
-         
-         edm::ParameterSet ps;
-         std::string typeName("DummyService");
-         ps.addParameter("@service_type", typeName);
-         int value = 2;
-         ps.addParameter("value", value);
-         pss.push_back(ps);
-      
-         edm::ServiceToken token(edm::ServiceRegistry::createSet(pss));
-         edm::ServiceToken token2(edm::ServiceRegistry::createContaining(std::move(dummyPtr),
-                                                                         token,
-                                                                         edm::serviceregistry::kOverlapIsError));
-         
-         edm::ServiceRegistry::Operate operate(token2);
-         edm::Service<testserviceregistry::DummyService> dummy;
-         CPPUNIT_ASSERT(dummy);
-         CPPUNIT_ASSERT(dummy.isAvailable());
-         CPPUNIT_ASSERT(dummy->value() == 2);
-      }
-   }
+  std::vector<edm::ParameterSet> pss;
 
-   {
-      auto dummyPtr = std::make_unique<DummyService>();
-      auto wrapper = std::make_shared<edm::serviceregistry::ServiceWrapper<DummyService> >(std::move(dummyPtr));
-      edm::ServiceToken token(edm::ServiceRegistry::createContaining(wrapper));
+  edm::ParameterSet ps;
+  std::string typeName("DummyService");
+  ps.addParameter("@service_type", typeName);
+  int value = 2;
+  ps.addParameter("value", value);
+  pss.push_back(ps);
 
-      wrapper->get().value_ = 2;
+  edm::ServiceToken token(edm::ServiceRegistry::createSet(pss));
 
-      {
-         edm::ServiceRegistry::Operate operate(token);
-         edm::Service<DummyService> dummy;
-         CPPUNIT_ASSERT(dummy);
-         CPPUNIT_ASSERT(dummy.isAvailable());
-         CPPUNIT_ASSERT(dummy->value_ == 2);
-      }
-      {
-         std::vector<edm::ParameterSet> pss;
-         
-         edm::ParameterSet ps;
-         std::string typeName("DummyService");
-         ps.addParameter("@service_type", typeName);
-         int value = 2;
-         ps.addParameter("value", value);
-         pss.push_back(ps);
-         
-         edm::ServiceToken token(edm::ServiceRegistry::createSet(pss));
-         edm::ServiceToken token2(edm::ServiceRegistry::createContaining(std::move(dummyPtr),
-                                                                         token,
-                                                                         edm::serviceregistry::kOverlapIsError));
-         
-         edm::ServiceRegistry::Operate operate(token2);
-         edm::Service<testserviceregistry::DummyService> dummy;
-         CPPUNIT_ASSERT(dummy);
-         CPPUNIT_ASSERT(dummy.isAvailable());
-         CPPUNIT_ASSERT(dummy->value() == 2);
-      }
-      
-   }
+  edm::ServiceRegistry::Operate operate(token);
+  edm::Service<testserviceregistry::DummyService> dummy;
+  CPPUNIT_ASSERT(dummy);
+  CPPUNIT_ASSERT(dummy.isAvailable());
+  CPPUNIT_ASSERT(dummy->value() == 2);
 }
 
-void 
-testServiceRegistry::saveConfigWithExternalTest()
-{
-   //In the HLT the PrescaleService is created once and then used again
-   // even if a new EventProcessor is created.  However, the '@save_config' must
-   // still be added to the Service's PSet even if that service is not created
-   edm::AssertHandler ah;
-
-   std::vector<edm::ParameterSet> pss;
-   
-   {
-      edm::ParameterSet ps;
-      std::string typeName("DummyStoreConfigService");
-      ps.addParameter("@service_type", typeName);
-      pss.push_back(ps);
-   }
-   edm::ServiceToken token(edm::ServiceRegistry::createSet(pss));
-   CPPUNIT_ASSERT( pss[0].exists("@save_config") );
-
-   pss.clear();
-
-   {
-      edm::ParameterSet ps;
-      std::string typeName("DummyStoreConfigService");
-      ps.addParameter("@service_type", typeName);
-      pss.push_back(ps);
-   }
-   
-   //create the services
-   edm::ServiceToken token2(edm::ServiceRegistry::createSet(pss, token, edm::serviceregistry::kTokenOverrides));
-
-   CPPUNIT_ASSERT( pss[0].exists("@save_config") );
-   
-}
+namespace {
+  struct DummyService {
+    int value_;
+  };
+}  // namespace
+
+void testServiceRegistry::externalServiceTest() {
+  edm::AssertHandler ah;
+
+  {
+    auto dummyPtr = std::make_unique<DummyService>();
+    dummyPtr->value_ = 2;
+    edm::ServiceToken token(edm::ServiceRegistry::createContaining(std::move(dummyPtr)));
+    {
+      edm::ServiceRegistry::Operate operate(token);
+      edm::Service<DummyService> dummy;
+      CPPUNIT_ASSERT(dummy);
+      CPPUNIT_ASSERT(dummy.isAvailable());
+      CPPUNIT_ASSERT(dummy->value_ == 2);
+    }
+    {
+      std::vector<edm::ParameterSet> pss;
 
-void
-testServiceRegistry::hierarchyTest()
-{
-   edm::AssertHandler ah;
-   
-   std::vector<edm::ParameterSet> pss;
-   {
       edm::ParameterSet ps;
       std::string typeName("DummyService");
       ps.addParameter("@service_type", typeName);
-      int value = 1;
+      int value = 2;
       ps.addParameter("value", value);
       pss.push_back(ps);
-   }
-   edm::ServiceToken token1(edm::ServiceRegistry::createSet(pss));
 
-   pss.clear();
-   {
+      edm::ServiceToken token(edm::ServiceRegistry::createSet(pss));
+      edm::ServiceToken token2(
+          edm::ServiceRegistry::createContaining(std::move(dummyPtr), token, edm::serviceregistry::kOverlapIsError));
+
+      edm::ServiceRegistry::Operate operate(token2);
+      edm::Service<testserviceregistry::DummyService> dummy;
+      CPPUNIT_ASSERT(dummy);
+      CPPUNIT_ASSERT(dummy.isAvailable());
+      CPPUNIT_ASSERT(dummy->value() == 2);
+    }
+  }
+
+  {
+    auto dummyPtr = std::make_unique<DummyService>();
+    auto wrapper = std::make_shared<edm::serviceregistry::ServiceWrapper<DummyService> >(std::move(dummyPtr));
+    edm::ServiceToken token(edm::ServiceRegistry::createContaining(wrapper));
+
+    wrapper->get().value_ = 2;
+
+    {
+      edm::ServiceRegistry::Operate operate(token);
+      edm::Service<DummyService> dummy;
+      CPPUNIT_ASSERT(dummy);
+      CPPUNIT_ASSERT(dummy.isAvailable());
+      CPPUNIT_ASSERT(dummy->value_ == 2);
+    }
+    {
+      std::vector<edm::ParameterSet> pss;
+
       edm::ParameterSet ps;
       std::string typeName("DummyService");
       ps.addParameter("@service_type", typeName);
       int value = 2;
       ps.addParameter("value", value);
       pss.push_back(ps);
-   }
-   edm::ServiceToken token2(edm::ServiceRegistry::createSet(pss));
-   
-   
-   edm::ServiceRegistry::Operate operate1(token1);
-   {
-      edm::Service<testserviceregistry::DummyService> dummy;
-      CPPUNIT_ASSERT(dummy->value() == 1);
-   }
-   {
-      edm::ServiceRegistry::Operate operate2(token2);
+
+      edm::ServiceToken token(edm::ServiceRegistry::createSet(pss));
+      edm::ServiceToken token2(
+          edm::ServiceRegistry::createContaining(std::move(dummyPtr), token, edm::serviceregistry::kOverlapIsError));
+
+      edm::ServiceRegistry::Operate operate(token2);
       edm::Service<testserviceregistry::DummyService> dummy;
+      CPPUNIT_ASSERT(dummy);
+      CPPUNIT_ASSERT(dummy.isAvailable());
       CPPUNIT_ASSERT(dummy->value() == 2);
-   }
-   {
-      edm::Service<testserviceregistry::DummyService> dummy;
-      CPPUNIT_ASSERT(dummy->value() == 1);
-   }
+    }
+  }
 }
 
-namespace {
-   struct UniqueRegistry {
+void testServiceRegistry::saveConfigWithExternalTest() {
+  //In the HLT the PrescaleService is created once and then used again
+  // even if a new EventProcessor is created.  However, the '@save_config' must
+  // still be added to the Service's PSet even if that service is not created
+  edm::AssertHandler ah;
 
-      UniqueRegistry(void* iReg) : otherRegistry_(iReg) {}
-      
-      void operator()(){
-         isUnique_ = (otherRegistry_ != &(edm::ServiceRegistry::instance()));
-      }
-      void* otherRegistry_;
-      static std::atomic<bool> isUnique_;
-   };
-   std::atomic<bool> UniqueRegistry::isUnique_{false};
-
-   struct PassServices {
-      PassServices(edm::ServiceToken iToken,
-                    bool& oSucceeded,
-                    bool& oCaughtException) :
-                    token_(iToken), success_(&oSucceeded), caught_(&oCaughtException)
-   { *success_ = false; *caught_ = false; }
-
-      void operator()() {
-         try  {
-            edm::ServiceRegistry::Operate operate(token_);
-            edm::Service<testserviceregistry::DummyService> dummy;
-            *success_ = dummy->value()==1;
-         } catch(...){
-            *caught_=true;
-         }
-      }
-      
-      edm::ServiceToken token_;
-      bool* success_;
-      bool* caught_;
-      
-   };
-}
+  std::vector<edm::ParameterSet> pss;
 
+  {
+    edm::ParameterSet ps;
+    std::string typeName("DummyStoreConfigService");
+    ps.addParameter("@service_type", typeName);
+    pss.push_back(ps);
+  }
+  edm::ServiceToken token(edm::ServiceRegistry::createSet(pss));
+  CPPUNIT_ASSERT(pss[0].exists("@save_config"));
 
-void 
-testServiceRegistry::threadTest()
-{
-   UniqueRegistry::isUnique_ = false;
-   void* value = &(edm::ServiceRegistry::instance());
-   UniqueRegistry unique(value);
-   std::thread testUniqueness(unique);
-   testUniqueness.join();
-   CPPUNIT_ASSERT(UniqueRegistry::isUnique_);
+  pss.clear();
 
+  {
+    edm::ParameterSet ps;
+    std::string typeName("DummyStoreConfigService");
+    ps.addParameter("@service_type", typeName);
+    pss.push_back(ps);
+  }
 
+  //create the services
+  edm::ServiceToken token2(edm::ServiceRegistry::createSet(pss, token, edm::serviceregistry::kTokenOverrides));
 
-   edm::AssertHandler ah;
-   
-   std::vector<edm::ParameterSet> pss;
-   {
-      edm::ParameterSet ps;
-      std::string typeName("DummyService");
-      ps.addParameter("@service_type", typeName);
-      int value = 1;
-      ps.addParameter("value", value);
-      pss.push_back(ps);
-   }
-   edm::ServiceToken token(edm::ServiceRegistry::createSet(pss));
-   
-   bool succeededToPassServices = false;
-   bool exceptionWasThrown = false;
-   
-   PassServices passRun(token, succeededToPassServices, exceptionWasThrown);
-   std::thread testPassing(passRun);
-   testPassing.join();
-   CPPUNIT_ASSERT(!exceptionWasThrown);
-   CPPUNIT_ASSERT(succeededToPassServices);
+  CPPUNIT_ASSERT(pss[0].exists("@save_config"));
+}
+
+void testServiceRegistry::hierarchyTest() {
+  edm::AssertHandler ah;
+
+  std::vector<edm::ParameterSet> pss;
+  {
+    edm::ParameterSet ps;
+    std::string typeName("DummyService");
+    ps.addParameter("@service_type", typeName);
+    int value = 1;
+    ps.addParameter("value", value);
+    pss.push_back(ps);
+  }
+  edm::ServiceToken token1(edm::ServiceRegistry::createSet(pss));
+
+  pss.clear();
+  {
+    edm::ParameterSet ps;
+    std::string typeName("DummyService");
+    ps.addParameter("@service_type", typeName);
+    int value = 2;
+    ps.addParameter("value", value);
+    pss.push_back(ps);
+  }
+  edm::ServiceToken token2(edm::ServiceRegistry::createSet(pss));
+
+  edm::ServiceRegistry::Operate operate1(token1);
+  {
+    edm::Service<testserviceregistry::DummyService> dummy;
+    CPPUNIT_ASSERT(dummy->value() == 1);
+  }
+  {
+    edm::ServiceRegistry::Operate operate2(token2);
+    edm::Service<testserviceregistry::DummyService> dummy;
+    CPPUNIT_ASSERT(dummy->value() == 2);
+  }
+  {
+    edm::Service<testserviceregistry::DummyService> dummy;
+    CPPUNIT_ASSERT(dummy->value() == 1);
+  }
+}
+
+namespace {
+  struct UniqueRegistry {
+    UniqueRegistry(void* iReg) : otherRegistry_(iReg) {}
+
+    void operator()() { isUnique_ = (otherRegistry_ != &(edm::ServiceRegistry::instance())); }
+    void* otherRegistry_;
+    static std::atomic<bool> isUnique_;
+  };
+  std::atomic<bool> UniqueRegistry::isUnique_{false};
+
+  struct PassServices {
+    PassServices(edm::ServiceToken iToken, bool& oSucceeded, bool& oCaughtException)
+        : token_(iToken), success_(&oSucceeded), caught_(&oCaughtException) {
+      *success_ = false;
+      *caught_ = false;
+    }
+
+    void operator()() {
+      try {
+        edm::ServiceRegistry::Operate operate(token_);
+        edm::Service<testserviceregistry::DummyService> dummy;
+        *success_ = dummy->value() == 1;
+      } catch (...) {
+        *caught_ = true;
+      }
+    }
+
+    edm::ServiceToken token_;
+    bool* success_;
+    bool* caught_;
+  };
+}  // namespace
+
+void testServiceRegistry::threadTest() {
+  UniqueRegistry::isUnique_ = false;
+  void* value = &(edm::ServiceRegistry::instance());
+  UniqueRegistry unique(value);
+  std::thread testUniqueness(unique);
+  testUniqueness.join();
+  CPPUNIT_ASSERT(UniqueRegistry::isUnique_);
+
+  edm::AssertHandler ah;
+
+  std::vector<edm::ParameterSet> pss;
+  {
+    edm::ParameterSet ps;
+    std::string typeName("DummyService");
+    ps.addParameter("@service_type", typeName);
+    int value = 1;
+    ps.addParameter("value", value);
+    pss.push_back(ps);
+  }
+  edm::ServiceToken token(edm::ServiceRegistry::createSet(pss));
+
+  bool succeededToPassServices = false;
+  bool exceptionWasThrown = false;
+
+  PassServices passRun(token, succeededToPassServices, exceptionWasThrown);
+  std::thread testPassing(passRun);
+  testPassing.join();
+  CPPUNIT_ASSERT(!exceptionWasThrown);
+  CPPUNIT_ASSERT(succeededToPassServices);
 }
 #include <Utilities/Testing/interface/CppUnit_testdriver.icpp>
diff --git a/FWCore/ServiceRegistry/test/servicesmanager_order.cpp b/FWCore/ServiceRegistry/test/servicesmanager_order.cpp
index b29bb360ff17a..b8911c3df8ef1 100644
--- a/FWCore/ServiceRegistry/test/servicesmanager_order.cpp
+++ b/FWCore/ServiceRegistry/test/servicesmanager_order.cpp
@@ -57,7 +57,7 @@ int main() try {
   std::string typeName1("DummyServiceA1");
   ps1.addParameter("@service_type", typeName1);
   vps1.push_back(ps1);
-      
+
   // The next two are intentionally swapped to test build
   // on demand feature.  DummyServiceB3 depends on DummyServiceD2
   // so they should end up getting built in the reverse of the
@@ -76,7 +76,6 @@ int main() try {
   auto legacy2 = std::make_shared<ServicesManager>(legacyToken, kTokenOverrides, vps1);
   edm::ServiceToken legacyToken2 = TestServicesManagerOrder::makeToken(legacy2);
 
-
   ServicesManager sm(legacyToken2, kOverlapIsError, vps);
 
   edm::ActivityRegistry ar4;
@@ -84,17 +83,16 @@ int main() try {
   sm.put(std::make_shared<ServiceWrapper<Service4>>(std::make_unique<Service4>(pset4, ar4)));
   sm.copySlotsFrom(ar4);
 
-
   edm::ActivityRegistry actReg;
   sm.connectTo(actReg);
   actReg.postBeginJobSignal_();
   actReg.postEndJobSignal_();
 
   return 0;
-} catch(cms::Exception const& e) {
+} catch (cms::Exception const& e) {
   std::cerr << e.explainSelf() << std::endl;
   return 1;
-} catch(std::exception const& e) {
+} catch (std::exception const& e) {
   std::cerr << e.what() << std::endl;
   return 1;
 }
diff --git a/FWCore/ServiceRegistry/test/servicesmanager_t.cppunit.cc b/FWCore/ServiceRegistry/test/servicesmanager_t.cppunit.cc
index 1b08fef8af47b..232f562872508 100644
--- a/FWCore/ServiceRegistry/test/servicesmanager_t.cppunit.cc
+++ b/FWCore/ServiceRegistry/test/servicesmanager_t.cppunit.cc
@@ -17,314 +17,298 @@
 #include "FWCore/PluginManager/interface/ProblemTracker.h"
 #include <iostream>
 
-class testServicesManager: public CppUnit::TestFixture
-{
-   CPPUNIT_TEST_SUITE(testServicesManager);
-   
-   CPPUNIT_TEST(putGetTest);
-   CPPUNIT_TEST(loadTest);
-   CPPUNIT_TEST(legacyTest);
-   CPPUNIT_TEST(dependencyTest);
-   CPPUNIT_TEST(saveConfigTest);
-   
-   CPPUNIT_TEST_SUITE_END();
+class testServicesManager : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testServicesManager);
+
+  CPPUNIT_TEST(putGetTest);
+  CPPUNIT_TEST(loadTest);
+  CPPUNIT_TEST(legacyTest);
+  CPPUNIT_TEST(dependencyTest);
+  CPPUNIT_TEST(saveConfigTest);
+
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-      void setUp(){}
-   void tearDown(){}
-   
-   void putGetTest();
-   void loadTest();
-   void legacyTest();
-   void dependencyTest();
-   void saveConfigTest();
+  void setUp() {}
+  void tearDown() {}
+
+  void putGetTest();
+  void loadTest();
+  void legacyTest();
+  void dependencyTest();
+  void saveConfigTest();
 };
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testServicesManager);
 
 namespace {
-   struct DummyService {
-      //DummyService(const edm::ParameterSet&,
-      //             edm::ActivityRegistry&) {}
-   };
-}
+  struct DummyService {
+    //DummyService(const edm::ParameterSet&,
+    //             edm::ActivityRegistry&) {}
+  };
+}  // namespace
 
 //namespace edm {
 //   class ActivityRegistry {};
 //}
 
-void
-testServicesManager::putGetTest()
-{
+void testServicesManager::putGetTest() {
+  using namespace edm::serviceregistry;
+
+  std::vector<edm::ParameterSet> ps;
+  ServicesManager sm(ps);
+
+  CPPUNIT_ASSERT(!sm.isAvailable<DummyService>());
+  bool exceptionThrown = true;
+  try {
+    sm.get<DummyService>();
+    exceptionThrown = false;
+  } catch (const edm::Exception&) {
+  }
+  CPPUNIT_ASSERT(exceptionThrown);
+
+  auto ptrWrapper = std::make_shared<ServiceWrapper<DummyService>>(std::make_unique<DummyService>());
+
+  CPPUNIT_ASSERT(sm.put(ptrWrapper));
+
+  CPPUNIT_ASSERT(sm.isAvailable<DummyService>());
+
+  sm.get<DummyService>();
+
+  CPPUNIT_ASSERT(!sm.put(ptrWrapper));
+}
+
+void testServicesManager::loadTest() {
+  typedef testserviceregistry::DummyService TestService;
+
+  using namespace edm::serviceregistry;
+
+  edm::AssertHandler ah;
+
+  {
+    std::vector<edm::ParameterSet> pss;
+
+    edm::ParameterSet ps;
+    std::string typeName("DummyService");
+    ps.addParameter("@service_type", typeName);
+    int value = 1;
+    ps.addParameter("value", value);
+    pss.push_back(ps);
 
-   using namespace edm::serviceregistry;
+    ServicesManager sm(pss);
 
-   std::vector<edm::ParameterSet> ps;
-   ServicesManager sm(ps);
-   
+    CPPUNIT_ASSERT(1 == sm.get<TestService>().value());
+  }
+  {
+    std::vector<edm::ParameterSet> pss;
 
-   CPPUNIT_ASSERT(!sm.isAvailable<DummyService>());
-   bool exceptionThrown = true;
-   try {
-      sm.get<DummyService>();
-      exceptionThrown = false;
-   } catch(const edm::Exception&) {
-   }
-   CPPUNIT_ASSERT(exceptionThrown);
-   
-   auto ptrWrapper = std::make_shared<ServiceWrapper<DummyService>>(std::make_unique<DummyService>());
+    edm::ParameterSet ps;
+    std::string typeName("DoesntExistService");
+    ps.addParameter("@service_type", typeName);
+    pss.push_back(ps);
 
-   CPPUNIT_ASSERT(sm.put(ptrWrapper));
+    bool threwConfigurationException = false;
+    try {
+      ServicesManager sm(pss);
+    } catch (const cms::Exception&) {
+      threwConfigurationException = true;
+    }
+
+    CPPUNIT_ASSERT(threwConfigurationException);
+  }
+  {
+    std::vector<edm::ParameterSet> pss;
 
-   CPPUNIT_ASSERT(sm.isAvailable<DummyService>());
+    edm::ParameterSet ps;
+    std::string typeName("DummyService");
+    ps.addParameter("@service_type", typeName);
+    int value = 1;
+    ps.addParameter("value", value);
+    pss.push_back(ps);
+    pss.push_back(ps);
 
-   sm.get<DummyService>();
+    bool caughtMultipleServiceError = false;
+    try {
+      ServicesManager sm(pss);
+    } catch (const edm::Exception&) {
+      caughtMultipleServiceError = true;
+    }
 
-   CPPUNIT_ASSERT(!sm.put(ptrWrapper));
+    CPPUNIT_ASSERT(caughtMultipleServiceError);
+  }
+  //NEED A TEST FOR SERVICES THAT DEPEND ON OTHER SERVICES
 }
 
+void testServicesManager::legacyTest() {
+  typedef testserviceregistry::DummyService TestService;
+
+  using namespace edm::serviceregistry;
+
+  edm::AssertHandler ah;
+
+  std::vector<edm::ParameterSet> pss;
+
+  edm::ParameterSet ps;
+  std::string typeName("DummyService");
+  ps.addParameter("@service_type", typeName);
+  int value = 1;
+  ps.addParameter("value", value);
+  pss.push_back(ps);
+
+  auto legacy = std::make_shared<ServicesManager>(pss);
+  CPPUNIT_ASSERT(1 == legacy->get<TestService>().value());
+
+  edm::ServiceToken legacyToken(legacy);
+  {
+    std::vector<edm::ParameterSet> pss;
 
-void
-testServicesManager::loadTest()
-{
-   typedef testserviceregistry::DummyService TestService;
+    edm::ParameterSet ps;
+    std::string typeName("DummyService");
+    ps.addParameter("@service_type", typeName);
+    int value = 2;
+    ps.addParameter("value", value);
+    pss.push_back(ps);
 
-   using namespace edm::serviceregistry;
+    bool threwConfigurationException = false;
+    try {
+      ServicesManager sm(legacyToken, kOverlapIsError, pss);
+    } catch (const edm::Exception&) {
+      threwConfigurationException = true;
+    }
 
-   edm::AssertHandler ah;
+    CPPUNIT_ASSERT(threwConfigurationException);
+  }
+  {
+    std::vector<edm::ParameterSet> pss;
 
-   {
+    edm::ParameterSet ps;
+    std::string typeName("DummyService");
+    ps.addParameter("@service_type", typeName);
+    int value = 2;
+    ps.addParameter("value", value);
+    pss.push_back(ps);
+
+    ServicesManager sm(legacyToken, kTokenOverrides, pss);
+
+    CPPUNIT_ASSERT(1 == sm.get<TestService>().value());
+  }
+  {
+    std::vector<edm::ParameterSet> pss;
+
+    edm::ParameterSet ps;
+    std::string typeName("DummyService");
+    ps.addParameter("@service_type", typeName);
+    int value = 2;
+    ps.addParameter("value", value);
+    pss.push_back(ps);
+
+    ServicesManager sm(legacyToken, kConfigurationOverrides, pss);
+
+    CPPUNIT_ASSERT(2 == sm.get<TestService>().value());
+  }
+  {
+    try {
       std::vector<edm::ParameterSet> pss;
-      
+
+      ServicesManager sm(legacyToken, kOverlapIsError, pss);
+
+      CPPUNIT_ASSERT(!sm.get<TestService>().beginJobCalled());
+      edm::ActivityRegistry ar;
+      sm.connectTo(ar);
+      ar.postBeginJobSignal_();
+
+      CPPUNIT_ASSERT(sm.get<TestService>().beginJobCalled());
+    } catch (const edm::Exception& iException) {
+      std::cout << iException.what() << std::endl;
+      throw;
+    } catch (const std::exception& iException) {
+      std::cout << iException.what() << std::endl;
+      throw;
+    }
+  }
+}
+
+void testServicesManager::dependencyTest() {
+  //Try both order of creating services
+  typedef testserviceregistry::DummyService TestService;
+
+  using namespace edm::serviceregistry;
+
+  edm::AssertHandler ah;
+
+  {
+    std::vector<edm::ParameterSet> pss;
+    {
       edm::ParameterSet ps;
       std::string typeName("DummyService");
       ps.addParameter("@service_type", typeName);
       int value = 1;
       ps.addParameter("value", value);
       pss.push_back(ps);
-      
-      ServicesManager sm(pss);
-      
-      CPPUNIT_ASSERT(1 == sm.get<TestService>().value());
-   }
-   {
-      std::vector<edm::ParameterSet> pss;
-      
+    }
+    {
       edm::ParameterSet ps;
-      std::string typeName("DoesntExistService");
+      std::string typeName("DependsOnDummyService");
       ps.addParameter("@service_type", typeName);
       pss.push_back(ps);
-      
-      bool threwConfigurationException = false;
-      try {
-         ServicesManager sm(pss);
-      } catch(const cms::Exception&) {
-         threwConfigurationException = true;
-      }
-      
-      CPPUNIT_ASSERT(threwConfigurationException);
-   }
-   {
-      std::vector<edm::ParameterSet> pss;
-      
+    }
+
+    ServicesManager sm(pss);
+
+    CPPUNIT_ASSERT(1 == sm.get<testserviceregistry::DependsOnDummyService>().value());
+  }
+  {
+    std::vector<edm::ParameterSet> pss;
+    {
       edm::ParameterSet ps;
-      std::string typeName("DummyService");
+      std::string typeName("DependsOnDummyService");
       ps.addParameter("@service_type", typeName);
-      int value = 1;
-      ps.addParameter("value", value);
       pss.push_back(ps);
-      pss.push_back(ps);
-      
-      bool caughtMultipleServiceError = false;
-      try {
-         ServicesManager sm(pss);
-      } catch(const edm::Exception&) {
-         caughtMultipleServiceError = true;
-      }
-      
-      CPPUNIT_ASSERT(caughtMultipleServiceError);
-   }
-   //NEED A TEST FOR SERVICES THAT DEPEND ON OTHER SERVICES
-}   
-
-
-void
-testServicesManager::legacyTest()
-{
-   typedef testserviceregistry::DummyService TestService;
-   
-   using namespace edm::serviceregistry;
-   
-   edm::AssertHandler ah;
-
-   std::vector<edm::ParameterSet> pss;
-   
-   edm::ParameterSet ps;
-   std::string typeName("DummyService");
-   ps.addParameter("@service_type", typeName);
-   int value = 1;
-   ps.addParameter("value", value);
-   pss.push_back(ps);
-   
-   auto legacy = std::make_shared<ServicesManager>(pss);
-   CPPUNIT_ASSERT(1 == legacy->get<TestService>().value());
-   
-   edm::ServiceToken legacyToken(legacy);
-   {
-      std::vector<edm::ParameterSet> pss;
-      
+    }
+    {
       edm::ParameterSet ps;
       std::string typeName("DummyService");
       ps.addParameter("@service_type", typeName);
-      int value = 2;
+      int value = 1;
       ps.addParameter("value", value);
       pss.push_back(ps);
-      
-      bool threwConfigurationException = false;
-      try {
-         ServicesManager sm(legacyToken, kOverlapIsError, pss);
-      } catch(const edm::Exception&) {
-         threwConfigurationException = true;
-      }
-      
-      CPPUNIT_ASSERT(threwConfigurationException);
-   }
-   {
-      std::vector<edm::ParameterSet> pss;
-      
+    }
+
+    ServicesManager sm(pss);
+
+    CPPUNIT_ASSERT(1 == sm.get<testserviceregistry::DependsOnDummyService>().value());
+  }
+}
+
+void testServicesManager::saveConfigTest() {
+  typedef testserviceregistry::DummyService TestService;
+
+  using namespace edm::serviceregistry;
+
+  edm::AssertHandler ah;
+
+  {
+    std::vector<edm::ParameterSet> pss;
+    {
       edm::ParameterSet ps;
       std::string typeName("DummyService");
       ps.addParameter("@service_type", typeName);
-      int value = 2;
+      int value = 1;
       ps.addParameter("value", value);
       pss.push_back(ps);
-      
-      ServicesManager sm(legacyToken, kTokenOverrides, pss);
-      
-      CPPUNIT_ASSERT(1 == sm.get<TestService>().value());
-   }
-   {
-      std::vector<edm::ParameterSet> pss;
-      
+    }
+
+    {
       edm::ParameterSet ps;
-      std::string typeName("DummyService");
+      std::string typeName("DummyStoreConfigService");
       ps.addParameter("@service_type", typeName);
-      int value = 2;
-      ps.addParameter("value", value);
       pss.push_back(ps);
-      
-      ServicesManager sm(legacyToken, kConfigurationOverrides, pss);
-      
-      CPPUNIT_ASSERT(2 == sm.get<TestService>().value());
-   }
-   {
-      try {
-         std::vector<edm::ParameterSet> pss;
-         
-         ServicesManager sm(legacyToken, kOverlapIsError, pss);
-         
-         CPPUNIT_ASSERT(!sm.get<TestService>().beginJobCalled());
-         edm::ActivityRegistry ar;
-         sm.connectTo(ar);
-         ar.postBeginJobSignal_();
-         
-         CPPUNIT_ASSERT(sm.get<TestService>().beginJobCalled());
-      }catch(const edm::Exception& iException) {
-         std::cout<<iException.what()<<std::endl;
-         throw;
-      }catch(const std::exception& iException) {
-         std::cout<<iException.what()<<std::endl;
-         throw;
-      }
-   }
-}   
-
-void
-testServicesManager::dependencyTest()
-{
-   //Try both order of creating services
-   typedef testserviceregistry::DummyService TestService;
-   
-   using namespace edm::serviceregistry;
-   
-   edm::AssertHandler ah;
-   
-   {
-      std::vector<edm::ParameterSet> pss;
-      {
-         edm::ParameterSet ps;
-         std::string typeName("DummyService");
-         ps.addParameter("@service_type", typeName);
-         int value = 1;
-         ps.addParameter("value", value);
-         pss.push_back(ps);
-      }
-      {
-         edm::ParameterSet ps;
-         std::string typeName("DependsOnDummyService");
-         ps.addParameter("@service_type", typeName);
-         pss.push_back(ps);
-      }
-      
-      ServicesManager sm(pss);
-      
-      CPPUNIT_ASSERT(1 == sm.get<testserviceregistry::DependsOnDummyService>().value());
-   }
-   {
-      std::vector<edm::ParameterSet> pss;
-      {
-         edm::ParameterSet ps;
-         std::string typeName("DependsOnDummyService");
-         ps.addParameter("@service_type", typeName);
-         pss.push_back(ps);
-      }
-      {
-         edm::ParameterSet ps;
-         std::string typeName("DummyService");
-         ps.addParameter("@service_type", typeName);
-         int value = 1;
-         ps.addParameter("value", value);
-         pss.push_back(ps);
-      }
-      
-      ServicesManager sm(pss);
-      
-      CPPUNIT_ASSERT(1 == sm.get<testserviceregistry::DependsOnDummyService>().value());
-      
-   }
-}   
-
-void
-testServicesManager::saveConfigTest()
-{
-   typedef testserviceregistry::DummyService TestService;
-   
-   using namespace edm::serviceregistry;
-   
-   edm::AssertHandler ah;
-   
-   {
-      std::vector<edm::ParameterSet> pss;
-      {
-         edm::ParameterSet ps;
-         std::string typeName("DummyService");
-         ps.addParameter("@service_type", typeName);
-         int value = 1;
-         ps.addParameter("value", value);
-         pss.push_back(ps);
-      }
-
-      {
-         edm::ParameterSet ps;
-         std::string typeName("DummyStoreConfigService");
-         ps.addParameter("@service_type", typeName);
-         pss.push_back(ps);
-      }
-      
-      
-      ServicesManager sm(pss);
-      
-      CPPUNIT_ASSERT( !pss[0].exists("@save_config") );
-      CPPUNIT_ASSERT( pss[1].exists("@save_config") );
-   }
+    }
+
+    ServicesManager sm(pss);
+
+    CPPUNIT_ASSERT(!pss[0].exists("@save_config"));
+    CPPUNIT_ASSERT(pss[1].exists("@save_config"));
+  }
 }
diff --git a/FWCore/ServiceRegistry/test/stubs/DependsOnDummyService.cc b/FWCore/ServiceRegistry/test/stubs/DependsOnDummyService.cc
index 19038c304d118..dff0542f8ef2d 100644
--- a/FWCore/ServiceRegistry/test/stubs/DependsOnDummyService.cc
+++ b/FWCore/ServiceRegistry/test/stubs/DependsOnDummyService.cc
@@ -2,7 +2,7 @@
 //
 // Package:     test
 // Class  :     DependsOnDummyService
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -18,17 +18,11 @@
 
 using namespace testserviceregistry;
 
-DependsOnDummyService::DependsOnDummyService():
-value_(edm::Service<DummyService>()->value())
-{
-}
+DependsOnDummyService::DependsOnDummyService() : value_(edm::Service<DummyService>()->value()) {}
 
-DependsOnDummyService::~DependsOnDummyService()
-{
-}
+DependsOnDummyService::~DependsOnDummyService() {}
 
-void DependsOnDummyService::fillDescriptions(edm::ConfigurationDescriptions & descriptions)
-{
+void DependsOnDummyService::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
   descriptions.addDefault(desc);
 }
diff --git a/FWCore/ServiceRegistry/test/stubs/DependsOnDummyService.h b/FWCore/ServiceRegistry/test/stubs/DependsOnDummyService.h
index 8f6bd2bbf0e72..cc258f943ad21 100644
--- a/FWCore/ServiceRegistry/test/stubs/DependsOnDummyService.h
+++ b/FWCore/ServiceRegistry/test/stubs/DependsOnDummyService.h
@@ -4,7 +4,7 @@
 //
 // Package:     ServiceRegistry
 // Class  :     DependsOnDummyService
-// 
+//
 /**\class DependsOnDummyService DependsOnDummyService.h FWCore/ServiceRegistry/test/stubs/DependsOnDummyService.h
 
  Description: <one line class summary>
@@ -19,26 +19,24 @@
 //
 
 namespace edm {
-   class ConfigurationDescriptions;
+  class ConfigurationDescriptions;
 }
 
 namespace testserviceregistry {
-   class DependsOnDummyService
-   {
+  class DependsOnDummyService {
+  public:
+    DependsOnDummyService();
+    virtual ~DependsOnDummyService();
 
-   public:
-      DependsOnDummyService();
-      virtual ~DependsOnDummyService();
+    int value() const { return value_; }
 
-      int value() const { return value_; }
-      
-      static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
+    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
-   private:
-      DependsOnDummyService(const DependsOnDummyService&); // stop default
-      const DependsOnDummyService& operator=(const DependsOnDummyService&); // stop default
+  private:
+    DependsOnDummyService(const DependsOnDummyService&);                   // stop default
+    const DependsOnDummyService& operator=(const DependsOnDummyService&);  // stop default
 
-      int value_;
-   };
-}
+    int value_;
+  };
+}  // namespace testserviceregistry
 #endif
diff --git a/FWCore/ServiceRegistry/test/stubs/DummyService.cc b/FWCore/ServiceRegistry/test/stubs/DummyService.cc
index 864d5d17bb929..3dd4a1c514074 100644
--- a/FWCore/ServiceRegistry/test/stubs/DummyService.cc
+++ b/FWCore/ServiceRegistry/test/stubs/DummyService.cc
@@ -2,7 +2,7 @@
 //
 // Package:     test
 // Class  :     DummyService
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -26,24 +26,20 @@ using namespace testserviceregistry;
 // static data member definitions
 //
 
-void
-DummyService::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
-
-    edm::ParameterSetDescription desc;
+void DummyService::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
 
-    desc.add<int>("value");
+  desc.add<int>("value");
 
-    descriptions.addDefault(desc);
+  descriptions.addDefault(desc);
 }
 
 //
 // constructors and destructor
 //
-DummyService::DummyService(const edm::ParameterSet& iPSet,edm::ActivityRegistry&iAR):
-value_(iPSet.getParameter<int>("value")),
-beginJobCalled_(false)
-{
-   iAR.watchPostBeginJob(this,&DummyService::doOnBeginJob);
+DummyService::DummyService(const edm::ParameterSet& iPSet, edm::ActivityRegistry& iAR)
+    : value_(iPSet.getParameter<int>("value")), beginJobCalled_(false) {
+  iAR.watchPostBeginJob(this, &DummyService::doOnBeginJob);
 }
 
 // DummyService::DummyService(const DummyService& rhs)
@@ -51,9 +47,7 @@ beginJobCalled_(false)
 //    // do actual copying here;
 // }
 
-DummyService::~DummyService()
-{
-}
+DummyService::~DummyService() {}
 
 //
 // assignment operators
diff --git a/FWCore/ServiceRegistry/test/stubs/DummyService.h b/FWCore/ServiceRegistry/test/stubs/DummyService.h
index ad94d255faa97..45645ffe17b81 100644
--- a/FWCore/ServiceRegistry/test/stubs/DummyService.h
+++ b/FWCore/ServiceRegistry/test/stubs/DummyService.h
@@ -4,7 +4,7 @@
 //
 // Package:     ServiceRegistry
 // Class  :     DummyService
-// 
+//
 /**\class DummyService DummyService.h FWCore/ServiceRegistry/test/stubs/DummyService.h
 
  Description: <one line class summary>
@@ -30,34 +30,32 @@ namespace edm {
 
 // forward declarations
 namespace testserviceregistry {
-   class DummyService
-   {
+  class DummyService {
+  public:
+    DummyService(const edm::ParameterSet&, edm::ActivityRegistry&);
+    virtual ~DummyService();
 
-   public:
-      DummyService(const edm::ParameterSet&,edm::ActivityRegistry&);
-      virtual ~DummyService();
+    // ---------- const member functions ---------------------
+    int value() const { return value_; }
 
-      // ---------- const member functions ---------------------
-      int value() const { return value_; }
-      
-      bool beginJobCalled() const {return beginJobCalled_;}
+    bool beginJobCalled() const { return beginJobCalled_; }
 
-      // ---------- static member functions --------------------
+    // ---------- static member functions --------------------
 
-      static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
+    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
-      // ---------- member functions ---------------------------
+    // ---------- member functions ---------------------------
 
-   private:
-      void doOnBeginJob() { beginJobCalled_=true;}
-      DummyService(const DummyService&); // stop default
+  private:
+    void doOnBeginJob() { beginJobCalled_ = true; }
+    DummyService(const DummyService&);  // stop default
 
-      const DummyService& operator=(const DummyService&); // stop default
+    const DummyService& operator=(const DummyService&);  // stop default
 
-      // ---------- member data --------------------------------
-      int value_;
-      bool beginJobCalled_;
-   };
-}
+    // ---------- member data --------------------------------
+    int value_;
+    bool beginJobCalled_;
+  };
+}  // namespace testserviceregistry
 
 #endif
diff --git a/FWCore/ServiceRegistry/test/stubs/DummyServiceE0.cc b/FWCore/ServiceRegistry/test/stubs/DummyServiceE0.cc
index b050370b0925d..d6b4149111c0b 100644
--- a/FWCore/ServiceRegistry/test/stubs/DummyServiceE0.cc
+++ b/FWCore/ServiceRegistry/test/stubs/DummyServiceE0.cc
@@ -29,10 +29,10 @@ void DummyServiceBase::fillDescriptions(edm::ConfigurationDescriptions& descript
   descriptions.addDefault(desc);
 }
 
-DummyServiceE0::DummyServiceE0(edm::ParameterSet const&,
-                             edm::ActivityRegistry& iAR) {
+DummyServiceE0::DummyServiceE0(edm::ParameterSet const&, edm::ActivityRegistry& iAR) {
   std::cout << "DummyServiceE0 Constructor " << testCounter << std::endl;
-  if(testCounter != 0) abort();
+  if (testCounter != 0)
+    abort();
   ++testCounter;
 
   iAR.watchPostBeginJob(this, &testserviceregistry::DummyServiceE0::postBeginJob);
@@ -41,28 +41,31 @@ DummyServiceE0::DummyServiceE0(edm::ParameterSet const&,
 
 void DummyServiceE0::postBeginJob() {
   std::cout << "DummyServiceE0 PostBeginJob " << testCounter << std::endl;
-  if(testCounter != 5) abort();
+  if (testCounter != 5)
+    abort();
   ++testCounter;
 }
 
 void DummyServiceE0::postEndJob() {
   std::cout << "DummyServiceE0 PostEndJob " << testCounter << std::endl;
-  if(testCounter != 14) abort();
+  if (testCounter != 14)
+    abort();
   ++testCounter;
 }
 
 DummyServiceE0::~DummyServiceE0() {
   std::cout << "DummyServiceE0 Destructor " << testCounter << std::endl;
-  if(testCounter != 19) abort();
+  if (testCounter != 19)
+    abort();
   ++testCounter;
 }
 
 // ------------------------------------------------------
 
-DummyServiceA1::DummyServiceA1(edm::ParameterSet const&,
-                             edm::ActivityRegistry& iAR) {
+DummyServiceA1::DummyServiceA1(edm::ParameterSet const&, edm::ActivityRegistry& iAR) {
   std::cout << "DummyServiceA1 Constructor " << testCounter << std::endl;
-  if(testCounter != 1) abort();
+  if (testCounter != 1)
+    abort();
   ++testCounter;
 
   iAR.watchPostBeginJob(this, &testserviceregistry::DummyServiceA1::postBeginJob);
@@ -71,28 +74,31 @@ DummyServiceA1::DummyServiceA1(edm::ParameterSet const&,
 
 void DummyServiceA1::postBeginJob() {
   std::cout << "DummyServiceA1 PostBeginJob " << testCounter << std::endl;
-  if(testCounter != 6) abort();
+  if (testCounter != 6)
+    abort();
   ++testCounter;
 }
 
 void DummyServiceA1::postEndJob() {
   std::cout << "DummyServiceA1 PostEndJob " << testCounter << std::endl;
-  if(testCounter != 13) abort();
+  if (testCounter != 13)
+    abort();
   ++testCounter;
 }
 
 DummyServiceA1::~DummyServiceA1() {
   std::cout << "DummyServiceA1 Destructor " << testCounter << std::endl;
-  if(testCounter != 18) abort();
+  if (testCounter != 18)
+    abort();
   ++testCounter;
 }
 
 // ------------------------------------------------------
 
-DummyServiceD2::DummyServiceD2(edm::ParameterSet const&,
-                             edm::ActivityRegistry& iAR) {
+DummyServiceD2::DummyServiceD2(edm::ParameterSet const&, edm::ActivityRegistry& iAR) {
   std::cout << "DummyServiceD2 Constructor " << testCounter << std::endl;
-  if(testCounter != 2) abort();
+  if (testCounter != 2)
+    abort();
   ++testCounter;
 
   iAR.watchPostBeginJob(this, &testserviceregistry::DummyServiceD2::postBeginJob);
@@ -101,31 +107,34 @@ DummyServiceD2::DummyServiceD2(edm::ParameterSet const&,
 
 void DummyServiceD2::postBeginJob() {
   std::cout << "DummyServiceD2 PostBeginJob " << testCounter << std::endl;
-  if(testCounter != 7) abort();
+  if (testCounter != 7)
+    abort();
   ++testCounter;
 }
 
 void DummyServiceD2::postEndJob() {
   std::cout << "DummyServiceD2 PostEndJob " << testCounter << std::endl;
-  if(testCounter != 12) abort();
+  if (testCounter != 12)
+    abort();
   ++testCounter;
 }
 
 DummyServiceD2::~DummyServiceD2() {
   std::cout << "DummyServiceD2 Destructor " << testCounter << std::endl;
-  if(testCounter != 17) abort();
+  if (testCounter != 17)
+    abort();
   ++testCounter;
 }
 
 // ------------------------------------------------------
 
-DummyServiceB3::DummyServiceB3(edm::ParameterSet const&,
-                             edm::ActivityRegistry& iAR) {
+DummyServiceB3::DummyServiceB3(edm::ParameterSet const&, edm::ActivityRegistry& iAR) {
   // Make this service dependent on service D2 in order to "On Demand Creation"
   edm::Service<DummyServiceD2>().isAvailable();
 
   std::cout << "DummyServiceB3 Constructor " << testCounter << std::endl;
-  if(testCounter != 3) abort();
+  if (testCounter != 3)
+    abort();
   ++testCounter;
 
   iAR.watchPostBeginJob(this, &testserviceregistry::DummyServiceB3::postBeginJob);
@@ -134,28 +143,31 @@ DummyServiceB3::DummyServiceB3(edm::ParameterSet const&,
 
 void DummyServiceB3::postBeginJob() {
   std::cout << "DummyServiceB3 PostBeginJob " << testCounter << std::endl;
-  if(testCounter != 8) abort();
+  if (testCounter != 8)
+    abort();
   ++testCounter;
 }
 
 void DummyServiceB3::postEndJob() {
   std::cout << "DummyServiceB3 PostEndJob " << testCounter << std::endl;
-  if(testCounter != 11) abort();
+  if (testCounter != 11)
+    abort();
   ++testCounter;
 }
 
 DummyServiceB3::~DummyServiceB3() {
   std::cout << "DummyServiceB3 Destructor " << testCounter << std::endl;
-  if(testCounter != 16) abort();
+  if (testCounter != 16)
+    abort();
   ++testCounter;
 }
 
 // ------------------------------------------------------
 
-DummyServiceC4::DummyServiceC4(edm::ParameterSet const&,
-                             edm::ActivityRegistry& iAR) {
+DummyServiceC4::DummyServiceC4(edm::ParameterSet const&, edm::ActivityRegistry& iAR) {
   std::cout << "DummyServiceC4 Constructor " << testCounter << std::endl;
-  if(testCounter != 4) abort();
+  if (testCounter != 4)
+    abort();
   ++testCounter;
 
   iAR.watchPostBeginJob(this, &testserviceregistry::DummyServiceC4::postBeginJob);
@@ -164,18 +176,21 @@ DummyServiceC4::DummyServiceC4(edm::ParameterSet const&,
 
 void DummyServiceC4::postBeginJob() {
   std::cout << "DummyServiceC4 PostBeginJob " << testCounter << std::endl;
-  if(testCounter != 9) abort();
+  if (testCounter != 9)
+    abort();
   ++testCounter;
 }
 
 void DummyServiceC4::postEndJob() {
   std::cout << "DummyServiceC4 PostEndJob " << testCounter << std::endl;
-  if(testCounter != 10) abort();
+  if (testCounter != 10)
+    abort();
   ++testCounter;
 }
 
 DummyServiceC4::~DummyServiceC4() {
   std::cout << "DummyServiceC4 Destructor " << testCounter << std::endl;
-  if(testCounter != 15) abort();
+  if (testCounter != 15)
+    abort();
   ++testCounter;
 }
diff --git a/FWCore/ServiceRegistry/test/stubs/DummyServiceE0.h b/FWCore/ServiceRegistry/test/stubs/DummyServiceE0.h
index 0d72dbee6599b..dc8b891c0c8fe 100644
--- a/FWCore/ServiceRegistry/test/stubs/DummyServiceE0.h
+++ b/FWCore/ServiceRegistry/test/stubs/DummyServiceE0.h
@@ -4,7 +4,7 @@
 //
 // Package:     ServiceRegistry
 // Class  :     DummyServiceE0
-// 
+//
 /**\class DummyServiceE0 DummyServiceE0.h FWCore/ServiceRegistry/test/stubs/DummyServiceE0.h
 
  Description: Used for tests of ServicesManager
@@ -32,55 +32,50 @@ namespace testserviceregistry {
   // depended on the type and I want to be sure this is not
   // true anymore.
 
-   class DummyServiceBase {
-   public:
-     static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
-   };
+  class DummyServiceBase {
+  public:
+    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+  };
 
-   class DummyServiceE0 : public DummyServiceBase
-   {
-   public:
-      DummyServiceE0(const edm::ParameterSet&,edm::ActivityRegistry&);
-      ~DummyServiceE0();
-      void postBeginJob();
-      void postEndJob();
-   };
+  class DummyServiceE0 : public DummyServiceBase {
+  public:
+    DummyServiceE0(const edm::ParameterSet&, edm::ActivityRegistry&);
+    ~DummyServiceE0();
+    void postBeginJob();
+    void postEndJob();
+  };
 
-   class DummyServiceA1 : public DummyServiceBase
-   {
-   public:
-      DummyServiceA1(const edm::ParameterSet&,edm::ActivityRegistry&);
-      ~DummyServiceA1();
-      void postBeginJob();
-      void postEndJob();
-   };
+  class DummyServiceA1 : public DummyServiceBase {
+  public:
+    DummyServiceA1(const edm::ParameterSet&, edm::ActivityRegistry&);
+    ~DummyServiceA1();
+    void postBeginJob();
+    void postEndJob();
+  };
 
-   class DummyServiceD2 : public DummyServiceBase
-   {
-   public:
-      DummyServiceD2(const edm::ParameterSet&,edm::ActivityRegistry&);
-      ~DummyServiceD2();
-      void postBeginJob();
-      void postEndJob();
-   };
+  class DummyServiceD2 : public DummyServiceBase {
+  public:
+    DummyServiceD2(const edm::ParameterSet&, edm::ActivityRegistry&);
+    ~DummyServiceD2();
+    void postBeginJob();
+    void postEndJob();
+  };
 
-   class DummyServiceB3 : public DummyServiceBase
-   {
-   public:
-      DummyServiceB3(const edm::ParameterSet&,edm::ActivityRegistry&);
-      ~DummyServiceB3();
-      void postBeginJob();
-      void postEndJob();
-   };
+  class DummyServiceB3 : public DummyServiceBase {
+  public:
+    DummyServiceB3(const edm::ParameterSet&, edm::ActivityRegistry&);
+    ~DummyServiceB3();
+    void postBeginJob();
+    void postEndJob();
+  };
 
-   class DummyServiceC4 : public DummyServiceBase
-   {
-   public:
-      DummyServiceC4(const edm::ParameterSet&,edm::ActivityRegistry&);
-      ~DummyServiceC4();
-      void postBeginJob();
-      void postEndJob();
-   };
-}
+  class DummyServiceC4 : public DummyServiceBase {
+  public:
+    DummyServiceC4(const edm::ParameterSet&, edm::ActivityRegistry&);
+    ~DummyServiceC4();
+    void postBeginJob();
+    void postEndJob();
+  };
+}  // namespace testserviceregistry
 
 #endif
diff --git a/FWCore/ServiceRegistry/test/stubs/DummyStoreConfigService.cc b/FWCore/ServiceRegistry/test/stubs/DummyStoreConfigService.cc
index 37afad5fd0b65..e170015f5f607 100644
--- a/FWCore/ServiceRegistry/test/stubs/DummyStoreConfigService.cc
+++ b/FWCore/ServiceRegistry/test/stubs/DummyStoreConfigService.cc
@@ -2,7 +2,7 @@
 //
 // Package:     test
 // Class  :     DummyStoreConfigService
-// 
+//
 /**\class DummyStoreConfigService DummyStoreConfigService.h ServiceRegistry/test/interface/DummyStoreConfigService.h
 
  Description: [one line class summary]
@@ -24,11 +24,9 @@
 
 // forward declarations
 
-class DummyStoreConfigService : public edm::serviceregistry::SaveConfiguration
-{
-
-   public:
-   DummyStoreConfigService() {}
+class DummyStoreConfigService : public edm::serviceregistry::SaveConfiguration {
+public:
+  DummyStoreConfigService() {}
 };
 
-DEFINE_FWK_SERVICE_MAKER(DummyStoreConfigService,edm::serviceregistry::NoArgsMaker<DummyStoreConfigService>);
+DEFINE_FWK_SERVICE_MAKER(DummyStoreConfigService, edm::serviceregistry::NoArgsMaker<DummyStoreConfigService>);
diff --git a/FWCore/ServiceRegistry/test/stubs/Modules.cc b/FWCore/ServiceRegistry/test/stubs/Modules.cc
index e4430fd216c2f..0e20d3f7ff6c4 100644
--- a/FWCore/ServiceRegistry/test/stubs/Modules.cc
+++ b/FWCore/ServiceRegistry/test/stubs/Modules.cc
@@ -13,7 +13,7 @@
 
 using namespace testserviceregistry;
 using namespace edm::serviceregistry;
-DEFINE_FWK_SERVICE_MAKER(DependsOnDummyService,NoArgsMaker<DependsOnDummyService>);
+DEFINE_FWK_SERVICE_MAKER(DependsOnDummyService, NoArgsMaker<DependsOnDummyService>);
 DEFINE_FWK_SERVICE(DummyService);
 DEFINE_FWK_SERVICE(DummyServiceE0);
 DEFINE_FWK_SERVICE(DummyServiceA1);
diff --git a/FWCore/Services/bin/cmsGetFnConnect.cc b/FWCore/Services/bin/cmsGetFnConnect.cc
index 03b3718390aab..9174abee7eb74 100644
--- a/FWCore/Services/bin/cmsGetFnConnect.cc
+++ b/FWCore/Services/bin/cmsGetFnConnect.cc
@@ -2,9 +2,9 @@
 //
 // Package:     Utilities
 // Class  :     cmsGetFnConnect
-// 
+//
 // Implementation:
-//     Looks up a frontier connect string 
+//     Looks up a frontier connect string
 //
 // Original Author:  Dave Dykstra
 //         Created:  Tue Feb 22 16:54:06 CST 2011
@@ -19,27 +19,25 @@
 #include <iostream>
 #include <cstring>
 
-int
-main(int argc, char* argv[])
-{
-    if ((argc != 2) || (strncmp(argv[1], "frontier://", 11) != 0))
-    {
-	std::cerr << "Usage: cmsGetFnConnect frontier://shortname" << std::endl;
-	return 2;
-    }
+int main(int argc, char* argv[]) {
+  if ((argc != 2) || (strncmp(argv[1], "frontier://", 11) != 0)) {
+    std::cerr << "Usage: cmsGetFnConnect frontier://shortname" << std::endl;
+    return 2;
+  }
 
-    try {
-      std::unique_ptr<edm::SiteLocalConfig> slcptr = std::make_unique<edm::service::SiteLocalConfigService>(edm::ParameterSet());
-      auto slc = std::make_shared<edm::serviceregistry::ServiceWrapper<edm::SiteLocalConfig> >(std::move(slcptr));
-      edm::ServiceToken slcToken = edm::ServiceRegistry::createContaining(slc);
-      edm::ServiceRegistry::Operate operate(slcToken);
+  try {
+    std::unique_ptr<edm::SiteLocalConfig> slcptr =
+        std::make_unique<edm::service::SiteLocalConfigService>(edm::ParameterSet());
+    auto slc = std::make_shared<edm::serviceregistry::ServiceWrapper<edm::SiteLocalConfig> >(std::move(slcptr));
+    edm::ServiceToken slcToken = edm::ServiceRegistry::createContaining(slc);
+    edm::ServiceRegistry::Operate operate(slcToken);
 
-      edm::Service<edm::SiteLocalConfig> localconfservice;
+    edm::Service<edm::SiteLocalConfig> localconfservice;
 
-      std::cout << localconfservice->lookupCalibConnect(argv[1]) << std::endl;
-    } catch(cms::Exception const& e) {
-      std::cerr << e.explainSelf() << std::endl;
-      return 2;
-    }
-    return 0;
+    std::cout << localconfservice->lookupCalibConnect(argv[1]) << std::endl;
+  } catch (cms::Exception const& e) {
+    std::cerr << e.explainSelf() << std::endl;
+    return 2;
+  }
+  return 0;
 }
diff --git a/FWCore/Services/plugins/CPU.cc b/FWCore/Services/plugins/CPU.cc
index 3c11812267295..9f786a9ca2426 100644
--- a/FWCore/Services/plugins/CPU.cc
+++ b/FWCore/Services/plugins/CPU.cc
@@ -8,7 +8,6 @@
 // Original Author:  Natalia Garcia
 // CPU.cc: v 1.0 2009/01/08 11:31:07
 
-
 #include "FWCore/ServiceRegistry/interface/ServiceMaker.h"
 
 #include "FWCore/MessageLogger/interface/JobReport.h"
@@ -38,54 +37,49 @@ namespace edm {
   namespace service {
     class CPU : public CPUServiceBase {
     public:
-      CPU(ParameterSet const&, ActivityRegistry&);
+      CPU(ParameterSet const &, ActivityRegistry &);
       ~CPU() override;
 
-      static void fillDescriptions(ConfigurationDescriptions& descriptions);
+      static void fillDescriptions(ConfigurationDescriptions &descriptions);
 
       bool cpuInfo(std::string &models, double &avgSpeed) override;
 
     private:
       const bool reportCPUProperties_;
 
-      bool cpuInfoImpl(std::string &models, double &avgSpeed, Service<JobReport>* reportSvc);
+      bool cpuInfoImpl(std::string &models, double &avgSpeed, Service<JobReport> *reportSvc);
       bool parseCPUInfo(std::vector<std::pair<std::string, std::string>> &info);
-      std::string getModels(const std::vector<std::pair<std::string, std::string>> & info);
-      double getAverageSpeed(const std::vector<std::pair<std::string, std::string>> & info);
+      std::string getModels(const std::vector<std::pair<std::string, std::string>> &info);
+      double getAverageSpeed(const std::vector<std::pair<std::string, std::string>> &info);
       void postEndJob();
     };
 
-    inline
-    bool isProcessWideService(CPU const*) {
-      return true;
-    }
-  }
-}
+    inline bool isProcessWideService(CPU const *) { return true; }
+  }  // namespace service
+}  // namespace edm
 
 namespace edm {
   namespace service {
     namespace {
 
-      std::string i2str(int i){
+      std::string i2str(int i) {
         std::ostringstream t;
         t << i;
         return t.str();
       }
 
-      std::string d2str(double d){
+      std::string d2str(double d) {
         std::ostringstream t;
         t << d;
         return t.str();
       }
 
-      double str2d(std::string s){
-        return atof(s.c_str());
-      }
+      double str2d(std::string s) { return atof(s.c_str()); }
 
-      void trim(std::string& s, const std::string& drop = " \t") {
+      void trim(std::string &s, const std::string &drop = " \t") {
         std::string::size_type p = s.find_last_not_of(drop);
-        if(p != std::string::npos) {
-          s = s.erase(p+1);
+        if (p != std::string::npos) {
+          s = s.erase(p + 1);
         }
         s = s.erase(0, s.find_first_not_of(drop));
       }
@@ -93,18 +87,21 @@ namespace edm {
       std::string eraseExtraSpaces(std::string s) {
         bool founded = false;
         std::string aux;
-        for(std::string::const_iterator iter = s.begin(); iter != s.end(); iter++){
-                if(founded){
-                        if(*iter == ' ') founded = true;
-                        else{
-                                aux += " "; aux += *iter;
-                                founded = false;
-                        }
-                }
-                else{
-                        if(*iter == ' ') founded = true;
-                        else aux += *iter;
-                }
+        for (std::string::const_iterator iter = s.begin(); iter != s.end(); iter++) {
+          if (founded) {
+            if (*iter == ' ')
+              founded = true;
+            else {
+              aux += " ";
+              aux += *iter;
+              founded = false;
+            }
+          } else {
+            if (*iter == ' ')
+              founded = true;
+            else
+              aux += *iter;
+          }
         }
         return aux;
       }
@@ -116,7 +113,7 @@ namespace edm {
         cpu_set_t *cpusetp;
         unsigned current_size = 128;
         unsigned cpu_count = 0;
-        while (current_size*2 > current_size) {
+        while (current_size * 2 > current_size) {
           cpusetp = CPU_ALLOC(current_size);
           CPU_ZERO_S(CPU_ALLOC_SIZE(current_size), cpusetp);
 
@@ -138,159 +135,155 @@ namespace edm {
         return false;
 #endif
       }
-    } // namespace {}
-
+    }  // namespace
 
-    CPU::CPU(const ParameterSet& iPS, ActivityRegistry&iRegistry):
-        reportCPUProperties_(iPS.getUntrackedParameter<bool>("reportCPUProperties"))
-    {
-        iRegistry.watchPostEndJob(this,&CPU::postEndJob);
+    CPU::CPU(const ParameterSet &iPS, ActivityRegistry &iRegistry)
+        : reportCPUProperties_(iPS.getUntrackedParameter<bool>("reportCPUProperties")) {
+      iRegistry.watchPostEndJob(this, &CPU::postEndJob);
     }
 
+    CPU::~CPU() {}
 
-    CPU::~CPU()
-    {
-    }
-
-    void CPU::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
+    void CPU::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
       edm::ParameterSetDescription desc;
       desc.addUntracked<bool>("reportCPUProperties", false);
       descriptions.add("CPU", desc);
     }
 
     void CPU::postEndJob() {
-        Service<JobReport> reportSvc;
-
-        std::vector<std::pair<std::string, std::string>> info;
-        if (!parseCPUInfo(info)) {return;}
-
-        std::string models = getModels(info);
-        double avgSpeed = getAverageSpeed(info);
-        unsigned totalNumberCPUs = 0;
-        std::map<std::string, std::string> currentCoreProperties;
-        std::string currentCore;
-
-        for (const auto &entry : info) {
-            if (entry.first == "processor") {
-                if (reportCPUProperties_) {
-                    if (currentCore.empty()) { // first core
-                        currentCore = entry.second;
-                    } else {
-                        reportSvc->reportPerformanceForModule("SystemCPU", "CPU-"+currentCore, currentCoreProperties);
-                        currentCoreProperties.clear();
-                        currentCore = entry.second;
-                    }
-                }
-                totalNumberCPUs++;
-            } else if (reportCPUProperties_) {
-                currentCoreProperties.insert(entry);
-            }
-        }
-        if (!currentCore.empty() && reportCPUProperties_) {
-                reportSvc->reportPerformanceForModule("SystemCPU", "CPU-"+currentCore, currentCoreProperties);
-        }
+      Service<JobReport> reportSvc;
 
+      std::vector<std::pair<std::string, std::string>> info;
+      if (!parseCPUInfo(info)) {
+        return;
+      }
 
-        std::map<std::string, std::string> reportCPUProperties{
-            {"totalCPUs",        i2str(totalNumberCPUs)},
-            {"averageCoreSpeed", d2str(avgSpeed)},
-            {"CPUModels",        models}
-        };
-        unsigned set_size = -1;
-        if (getCpuSetSize(set_size)) {
-          reportCPUProperties.insert(std::make_pair("cpusetCount", i2str(set_size)));
+      std::string models = getModels(info);
+      double avgSpeed = getAverageSpeed(info);
+      unsigned totalNumberCPUs = 0;
+      std::map<std::string, std::string> currentCoreProperties;
+      std::string currentCore;
+
+      for (const auto &entry : info) {
+        if (entry.first == "processor") {
+          if (reportCPUProperties_) {
+            if (currentCore.empty()) {  // first core
+              currentCore = entry.second;
+            } else {
+              reportSvc->reportPerformanceForModule("SystemCPU", "CPU-" + currentCore, currentCoreProperties);
+              currentCoreProperties.clear();
+              currentCore = entry.second;
+            }
+          }
+          totalNumberCPUs++;
+        } else if (reportCPUProperties_) {
+          currentCoreProperties.insert(entry);
         }
-        reportSvc->reportPerformanceSummary("SystemCPU", reportCPUProperties);
+      }
+      if (!currentCore.empty() && reportCPUProperties_) {
+        reportSvc->reportPerformanceForModule("SystemCPU", "CPU-" + currentCore, currentCoreProperties);
+      }
+
+      std::map<std::string, std::string> reportCPUProperties{
+          {"totalCPUs", i2str(totalNumberCPUs)}, {"averageCoreSpeed", d2str(avgSpeed)}, {"CPUModels", models}};
+      unsigned set_size = -1;
+      if (getCpuSetSize(set_size)) {
+        reportCPUProperties.insert(std::make_pair("cpusetCount", i2str(set_size)));
+      }
+      reportSvc->reportPerformanceSummary("SystemCPU", reportCPUProperties);
     }
 
-    bool CPU::cpuInfo(std::string &models, double &avgSpeed)
-    {
-        std::vector<std::pair<std::string, std::string>> info;
-        if (!parseCPUInfo(info)) {return false;}
+    bool CPU::cpuInfo(std::string &models, double &avgSpeed) {
+      std::vector<std::pair<std::string, std::string>> info;
+      if (!parseCPUInfo(info)) {
+        return false;
+      }
 
-        models = getModels(info);
-        avgSpeed = getAverageSpeed(info);
-        return true;
+      models = getModels(info);
+      avgSpeed = getAverageSpeed(info);
+      return true;
     }
 
-    bool CPU::parseCPUInfo(std::vector<std::pair<std::string, std::string>> &info)
-    {
-        info.clear();
-        std::ifstream fcpuinfo ("/proc/cpuinfo");
-        if (!fcpuinfo.is_open()) {
-            return false;
+    bool CPU::parseCPUInfo(std::vector<std::pair<std::string, std::string>> &info) {
+      info.clear();
+      std::ifstream fcpuinfo("/proc/cpuinfo");
+      if (!fcpuinfo.is_open()) {
+        return false;
+      }
+      while (!fcpuinfo.eof()) {
+        std::string buf;
+        std::getline(fcpuinfo, buf);
+
+        std::istringstream iss(buf);
+        std::string token;
+        std::string property;
+        std::string value;
+
+        int time = 1;
+
+        while (std::getline(iss, token, ':')) {
+          switch (time) {
+            case 1:
+              property = token;
+              break;
+            case 2:
+              value = token;
+              break;
+            default:
+              value += token;
+              break;
+          }
+          time++;
+        }
+        trim(property);
+        trim(value);
+        if (property.empty()) {
+          continue;
         }
-        while (!fcpuinfo.eof()) {
-            std::string buf;
-            std::getline(fcpuinfo, buf);
-
-            std::istringstream iss(buf);
-            std::string token;
-            std::string property;
-            std::string value;
-
-            int time = 1;
-
-            while(std::getline(iss, token, ':')) {
-                switch(time){
-                case 1:
-                    property = token;
-                    break;
-                case 2:
-                    value = token;
-                    break;
-                default:
-                    value += token;
-                    break;
-                }
-                time++;
-            }
-            trim(property);
-            trim(value);
-            if (property.empty()) {continue;}
 
-            if (property == "model name"){
-                    value = eraseExtraSpaces(value);
-            }
-            info.emplace_back(property, value);
+        if (property == "model name") {
+          value = eraseExtraSpaces(value);
         }
-        return true;
+        info.emplace_back(property, value);
+      }
+      return true;
     }
 
-    std::string CPU::getModels(const std::vector<std::pair<std::string, std::string>> & info)
-    {
-        std::set<std::string> models;
-        for (const auto &entry : info) {
-            if (entry.first == "model name") {
-                models.insert(entry.second);
-            }
+    std::string CPU::getModels(const std::vector<std::pair<std::string, std::string>> &info) {
+      std::set<std::string> models;
+      for (const auto &entry : info) {
+        if (entry.first == "model name") {
+          models.insert(entry.second);
         }
-        std::stringstream ss;
-        int model = 0;
-        for (const auto &modelname : models) {
-          if (model++ != 0) {ss << ", ";}
-          ss << modelname;
+      }
+      std::stringstream ss;
+      int model = 0;
+      for (const auto &modelname : models) {
+        if (model++ != 0) {
+          ss << ", ";
         }
-        return ss.str();
+        ss << modelname;
+      }
+      return ss.str();
     }
 
-    double CPU::getAverageSpeed(const std::vector<std::pair<std::string, std::string>> & info)
-    {
-        double averageCoreSpeed = 0.0;
-        unsigned coreCount = 0;
-        for (const auto &entry : info) {
-            if (entry.first == "cpu MHz") {
-                averageCoreSpeed += str2d(entry.second);
-                coreCount ++;
-            }
+    double CPU::getAverageSpeed(const std::vector<std::pair<std::string, std::string>> &info) {
+      double averageCoreSpeed = 0.0;
+      unsigned coreCount = 0;
+      for (const auto &entry : info) {
+        if (entry.first == "cpu MHz") {
+          averageCoreSpeed += str2d(entry.second);
+          coreCount++;
         }
-        if (!coreCount) {return 0;}
-        return averageCoreSpeed / static_cast<double>(coreCount);
+      }
+      if (!coreCount) {
+        return 0;
+      }
+      return averageCoreSpeed / static_cast<double>(coreCount);
     }
-  } //service
-}  //edm
-
+  }  // namespace service
+}  // namespace edm
 
 using edm::service::CPU;
-typedef edm::serviceregistry::AllArgsMaker<edm::CPUServiceBase,CPU> CPUMaker;
+typedef edm::serviceregistry::AllArgsMaker<edm::CPUServiceBase, CPU> CPUMaker;
 DEFINE_FWK_SERVICE_MAKER(CPU, CPUMaker);
diff --git a/FWCore/Services/plugins/CheckTransitions.cc b/FWCore/Services/plugins/CheckTransitions.cc
index 5719362695709..e73d96da6e78a 100644
--- a/FWCore/Services/plugins/CheckTransitions.cc
+++ b/FWCore/Services/plugins/CheckTransitions.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Services
 // Class  :     CheckTransitions
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -35,175 +35,163 @@
 #include <iostream>
 
 namespace edm {
-  
+
   namespace service {
     class CheckTransitions {
     public:
-      
-      enum class Phase {
-        kBeginRun,
-        kBeginLumi,
-        kEvent,
-        kEndLumi,
-        kEndRun
-      };
-
-      enum class Transition {
-        IsInvalid,
-        IsStop,
-        IsFile,
-        IsRun,
-        IsLumi,
-        IsEvent
-      };
-
-      CheckTransitions(const ParameterSet&,ActivityRegistry&);
+      enum class Phase { kBeginRun, kBeginLumi, kEvent, kEndLumi, kEndRun };
+
+      enum class Transition { IsInvalid, IsStop, IsFile, IsRun, IsLumi, IsEvent };
+
+      CheckTransitions(const ParameterSet&, ActivityRegistry&);
       ~CheckTransitions() noexcept(false);
-      
-      static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
-      
+
+      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
       void preallocate(service::SystemBounds const&);
-      
+
       void preBeginJob(PathsAndConsumesOfModulesBase const&, ProcessContext const&);
       void postEndJob();
-      
+
       void preOpenFile(std::string const&, bool);
-      
+
       void preCloseFile(std::string const& lfn, bool primary);
-      
+
       void preGlobalBeginRun(GlobalContext const&);
-      
+
       void preGlobalEndRun(GlobalContext const&);
-      
+
       void preStreamBeginRun(StreamContext const&);
-      
+
       void preStreamEndRun(StreamContext const&);
-      
+
       void preGlobalBeginLumi(GlobalContext const&);
-      
+
       void preGlobalEndLumi(GlobalContext const&);
-      
+
       void preStreamBeginLumi(StreamContext const&);
-      
+
       void preStreamEndLumi(StreamContext const&);
-      
+
       void preEvent(StreamContext const&);
-      
+
     private:
-      tbb::concurrent_vector<std::tuple<Phase,edm::EventID,int>> m_seenTransitions;
-      std::vector<std::pair<Transition,edm::EventID>> m_expectedTransitions;
-      int m_nstreams=0;
+      tbb::concurrent_vector<std::tuple<Phase, edm::EventID, int>> m_seenTransitions;
+      std::vector<std::pair<Transition, edm::EventID>> m_expectedTransitions;
+      int m_nstreams = 0;
       bool m_failed = false;
-      
     };
-  }
-}
+  }  // namespace service
+}  // namespace edm
 using namespace edm::service;
 
 namespace {
   using Phase = CheckTransitions::Phase;
   using Transition = CheckTransitions::Transition;
-  
-  Transition stringToType( const std::string& iTrans ) {
-    if (iTrans == "IsStop") { return Transition::IsStop;}
-    if (iTrans == "IsFile") { return Transition::IsFile;}
-    if (iTrans == "IsRun") { return Transition::IsRun;}
-    if (iTrans == "IsLumi") {return Transition::IsLumi;}
-    if (iTrans == "IsEvent") {return Transition::IsEvent;}
-    
-    throw edm::Exception(edm::errors::Configuration)<<"Unknown transition type \'"<<iTrans<<"\'";
-    
+
+  Transition stringToType(const std::string& iTrans) {
+    if (iTrans == "IsStop") {
+      return Transition::IsStop;
+    }
+    if (iTrans == "IsFile") {
+      return Transition::IsFile;
+    }
+    if (iTrans == "IsRun") {
+      return Transition::IsRun;
+    }
+    if (iTrans == "IsLumi") {
+      return Transition::IsLumi;
+    }
+    if (iTrans == "IsEvent") {
+      return Transition::IsEvent;
+    }
+
+    throw edm::Exception(edm::errors::Configuration) << "Unknown transition type \'" << iTrans << "\'";
+
     return Transition::IsInvalid;
   }
 
-  
-  std::vector<std::tuple<Phase,edm::EventID,int>> expectedValues(std::vector<std::pair<Transition,edm::EventID>> const& iTrans, int iNStreams ) {
-    std::vector<std::tuple<Phase,edm::EventID,int>> returnValue;
+  std::vector<std::tuple<Phase, edm::EventID, int>> expectedValues(
+      std::vector<std::pair<Transition, edm::EventID>> const& iTrans, int iNStreams) {
+    std::vector<std::tuple<Phase, edm::EventID, int>> returnValue;
     returnValue.reserve(iTrans.size());
-    
+
     const edm::RunNumber_t maxIDValue = edm::EventID::maxRunNumber();
-    edm::EventID lastRun = {maxIDValue,0,0};
-    edm::EventID lastLumi = {maxIDValue,maxIDValue,0};
-    for(auto const& tran: iTrans) {
-      switch(tran.first) {
-        case Transition::IsFile:
-        {
+    edm::EventID lastRun = {maxIDValue, 0, 0};
+    edm::EventID lastLumi = {maxIDValue, maxIDValue, 0};
+    for (auto const& tran : iTrans) {
+      switch (tran.first) {
+        case Transition::IsFile: {
           break;
         }
-        case Transition::IsRun:
-        {
-          if(tran.second != lastRun) {
-            if(lastRun.run() != maxIDValue) {
+        case Transition::IsRun: {
+          if (tran.second != lastRun) {
+            if (lastRun.run() != maxIDValue) {
               //end transitions
-              for(int i = 0; i<iNStreams;++i) {
-                returnValue.emplace_back(Phase::kEndRun,lastRun,i);
+              for (int i = 0; i < iNStreams; ++i) {
+                returnValue.emplace_back(Phase::kEndRun, lastRun, i);
               }
-              returnValue.emplace_back(Phase::kEndRun,lastRun,1000);
+              returnValue.emplace_back(Phase::kEndRun, lastRun, 1000);
             }
             //begin transitions
-            returnValue.emplace_back(Phase::kBeginRun,tran.second,-1);
-            for(int i = 0; i<iNStreams;++i) {
-              returnValue.emplace_back(Phase::kBeginRun,tran.second,i);
+            returnValue.emplace_back(Phase::kBeginRun, tran.second, -1);
+            for (int i = 0; i < iNStreams; ++i) {
+              returnValue.emplace_back(Phase::kBeginRun, tran.second, i);
             }
             lastRun = tran.second;
           }
           break;
         }
-        case Transition::IsLumi:
-        {
-          if(tran.second != lastLumi) {
-            if(lastLumi.run() != maxIDValue) {
+        case Transition::IsLumi: {
+          if (tran.second != lastLumi) {
+            if (lastLumi.run() != maxIDValue) {
               //end transitions
-              for(int i = 0; i<iNStreams;++i) {
-                returnValue.emplace_back(Phase::kEndLumi,lastLumi,i);
+              for (int i = 0; i < iNStreams; ++i) {
+                returnValue.emplace_back(Phase::kEndLumi, lastLumi, i);
               }
-              returnValue.emplace_back(Phase::kEndLumi,lastLumi,1000);
+              returnValue.emplace_back(Phase::kEndLumi, lastLumi, 1000);
             }
             //begin transitions
-            returnValue.emplace_back(Phase::kBeginLumi,tran.second,-1);
-            for(int i = 0; i<iNStreams;++i) {
-              returnValue.emplace_back(Phase::kBeginLumi,tran.second,i);
+            returnValue.emplace_back(Phase::kBeginLumi, tran.second, -1);
+            for (int i = 0; i < iNStreams; ++i) {
+              returnValue.emplace_back(Phase::kBeginLumi, tran.second, i);
             }
             lastLumi = tran.second;
           }
           break;
-          
         }
-        case Transition::IsEvent:
-        {
-          returnValue.emplace_back(Phase::kEvent,tran.second,-2);
+        case Transition::IsEvent: {
+          returnValue.emplace_back(Phase::kEvent, tran.second, -2);
         }
         case Transition::IsStop:
-        case Transition::IsInvalid:
-        {
+        case Transition::IsInvalid: {
           break;
         }
       }
     }
-    if(lastLumi.run() != maxIDValue) {
+    if (lastLumi.run() != maxIDValue) {
       //end transitions
-      for(int i = 0; i<iNStreams;++i) {
-        returnValue.emplace_back(Phase::kEndLumi,lastLumi,i);
+      for (int i = 0; i < iNStreams; ++i) {
+        returnValue.emplace_back(Phase::kEndLumi, lastLumi, i);
       }
-      returnValue.emplace_back(Phase::kEndLumi,lastLumi,1000);
+      returnValue.emplace_back(Phase::kEndLumi, lastLumi, 1000);
     }
-    if(lastRun.run() != maxIDValue) {
+    if (lastRun.run() != maxIDValue) {
       //end transitions
-      for(int i = 0; i<iNStreams;++i) {
-        returnValue.emplace_back(Phase::kEndRun,lastRun,i);
+      for (int i = 0; i < iNStreams; ++i) {
+        returnValue.emplace_back(Phase::kEndRun, lastRun, i);
       }
-      returnValue.emplace_back(Phase::kEndRun,lastRun,1000);
+      returnValue.emplace_back(Phase::kEndRun, lastRun, 1000);
     }
     return returnValue;
   }
 
-}
+}  // namespace
 
-CheckTransitions::CheckTransitions(ParameterSet const& iPS, ActivityRegistry&iRegistry)
-{
-  for( auto const& p: iPS.getUntrackedParameter<std::vector<edm::ParameterSet>>("transitions")) {
-    m_expectedTransitions.emplace_back( stringToType(p.getUntrackedParameter<std::string>("type")),
-                               p.getUntrackedParameter<EventID>("id"));
+CheckTransitions::CheckTransitions(ParameterSet const& iPS, ActivityRegistry& iRegistry) {
+  for (auto const& p : iPS.getUntrackedParameter<std::vector<edm::ParameterSet>>("transitions")) {
+    m_expectedTransitions.emplace_back(stringToType(p.getUntrackedParameter<std::string>("type")),
+                                       p.getUntrackedParameter<EventID>("id"));
   }
 
   iRegistry.watchPreallocate(this, &CheckTransitions::preallocate);
@@ -235,131 +223,109 @@ CheckTransitions::CheckTransitions(ParameterSet const& iPS, ActivityRegistry&iRe
 
 CheckTransitions::~CheckTransitions() noexcept(false) {
   if (m_failed) {
-    throw edm::Exception(errors::EventProcessorFailure)<<"incorrect transtions";
+    throw edm::Exception(errors::EventProcessorFailure) << "incorrect transtions";
   }
 }
 
-void
-CheckTransitions::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
+void CheckTransitions::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   ParameterSetDescription desc;
   desc.setComment("Checks that the transitions specified occur during the job.");
-  
+
   ParameterSetDescription trans;
   trans.addUntracked<std::string>("type");
   trans.addUntracked<edm::EventID>("id");
-  desc.addVPSetUntracked("transitions",trans, {{}});
+  desc.addVPSetUntracked("transitions", trans, {{}});
   descriptions.add("CheckTransitions", desc);
 }
 
-void
-CheckTransitions::preallocate(service::SystemBounds const& bounds) {
-  m_nstreams = bounds.maxNumberOfStreams();
-}
+void CheckTransitions::preallocate(service::SystemBounds const& bounds) { m_nstreams = bounds.maxNumberOfStreams(); }
+
+void CheckTransitions::postEndJob() {
+  auto expectedV = expectedValues(m_expectedTransitions, m_nstreams);
 
-void
-CheckTransitions::postEndJob() {
-  
-  auto expectedV = expectedValues(m_expectedTransitions,m_nstreams);
-  
-  std::vector<std::tuple<Phase,edm::EventID,int>> orderedSeen;
+  std::vector<std::tuple<Phase, edm::EventID, int>> orderedSeen;
   orderedSeen.reserve(m_seenTransitions.size());
-  for(auto const& i: m_seenTransitions) {
+  for (auto const& i : m_seenTransitions) {
     //      std::cout <<i.first.m_run<<" "<<i.first.m_lumi<<" "<<i.first.m_event<<" "<<i.second<<std::endl;
     auto s = std::get<2>(i);
-    if(std::get<1>(i).event() > 0) {
-      s=-2;
+    if (std::get<1>(i).event() > 0) {
+      s = -2;
     }
-    orderedSeen.emplace_back(std::get<0>(i),std::get<1>(i),s);
+    orderedSeen.emplace_back(std::get<0>(i), std::get<1>(i), s);
   }
-  std::sort(orderedSeen.begin(),orderedSeen.end());
-  
+  std::sort(orderedSeen.begin(), orderedSeen.end());
+
   auto orderedExpected = expectedV;
-  std::sort(orderedExpected.begin(),orderedExpected.end());
+  std::sort(orderedExpected.begin(), orderedExpected.end());
   /*   for(auto const& i: expectedV) {
    std::cout <<i.first.m_run<<" "<<i.first.m_lumi<<" "<<i.first.m_event<<" "<<i.second<<std::endl;
    } */
-  
+
   auto itOS = orderedSeen.begin();
-  for(auto itOE = orderedExpected.begin(); itOE != orderedExpected.end(); ++itOE) {
-    if(itOS == orderedSeen.end()) {
+  for (auto itOE = orderedExpected.begin(); itOE != orderedExpected.end(); ++itOE) {
+    if (itOS == orderedSeen.end()) {
       break;
     }
-    if ( *itOE != *itOS) {
+    if (*itOE != *itOS) {
       auto syncOE = std::get<1>(*itOE);
       auto syncOS = std::get<1>(*itOS);
-      std::cout <<"Different ordering "<<syncOE<<" "<<std::get<2>(*itOE)<<"\n"
-             <<"                   "<<syncOS<<" "<<std::get<2>(*itOS)<<"\n";
-      m_failed=true;
+      std::cout << "Different ordering " << syncOE << " " << std::get<2>(*itOE) << "\n"
+                << "                   " << syncOS << " " << std::get<2>(*itOS) << "\n";
+      m_failed = true;
     }
     ++itOS;
   }
-  
-  if(orderedSeen.size() != orderedExpected.size()) {
-    std::cout <<"Wrong number of transition "<<orderedSeen.size() <<" "<<orderedExpected.size()<<std::endl;
+
+  if (orderedSeen.size() != orderedExpected.size()) {
+    std::cout << "Wrong number of transition " << orderedSeen.size() << " " << orderedExpected.size() << std::endl;
     m_failed = true;
     return;
   }
-
 }
 
-void
-CheckTransitions::preOpenFile(std::string const& lfn, bool b) {
-}
+void CheckTransitions::preOpenFile(std::string const& lfn, bool b) {}
 
-void
-CheckTransitions::preCloseFile(std::string const & lfn, bool b) {
-}
+void CheckTransitions::preCloseFile(std::string const& lfn, bool b) {}
 
-void
-CheckTransitions::preGlobalBeginRun(GlobalContext const& gc) {
-  auto id =gc.luminosityBlockID();
-  m_seenTransitions.emplace_back(Phase::kBeginRun,edm::EventID{id.run(),0,0},-1);
+void CheckTransitions::preGlobalBeginRun(GlobalContext const& gc) {
+  auto id = gc.luminosityBlockID();
+  m_seenTransitions.emplace_back(Phase::kBeginRun, edm::EventID{id.run(), 0, 0}, -1);
 }
 
-void
-CheckTransitions::preGlobalEndRun(GlobalContext const& gc) {
-  auto id =gc.luminosityBlockID();
-  m_seenTransitions.emplace_back(Phase::kEndRun,edm::EventID{id.run(),0,0},1000);
+void CheckTransitions::preGlobalEndRun(GlobalContext const& gc) {
+  auto id = gc.luminosityBlockID();
+  m_seenTransitions.emplace_back(Phase::kEndRun, edm::EventID{id.run(), 0, 0}, 1000);
 }
 
-void
-CheckTransitions::preStreamBeginRun(StreamContext const& sc) {
-  m_seenTransitions.emplace_back(Phase::kBeginRun,sc.eventID(),sc.streamID());
+void CheckTransitions::preStreamBeginRun(StreamContext const& sc) {
+  m_seenTransitions.emplace_back(Phase::kBeginRun, sc.eventID(), sc.streamID());
 }
 
-void
-CheckTransitions::preStreamEndRun(StreamContext const& sc) {
-  m_seenTransitions.emplace_back(Phase::kEndRun,sc.eventID(),sc.streamID());
+void CheckTransitions::preStreamEndRun(StreamContext const& sc) {
+  m_seenTransitions.emplace_back(Phase::kEndRun, sc.eventID(), sc.streamID());
 }
 
-void
-CheckTransitions::preGlobalBeginLumi(GlobalContext const& gc) {
-  auto id =gc.luminosityBlockID();
-  m_seenTransitions.emplace_back(Phase::kBeginLumi,edm::EventID{id.run(),id.luminosityBlock(),0},-1);
+void CheckTransitions::preGlobalBeginLumi(GlobalContext const& gc) {
+  auto id = gc.luminosityBlockID();
+  m_seenTransitions.emplace_back(Phase::kBeginLumi, edm::EventID{id.run(), id.luminosityBlock(), 0}, -1);
 }
 
-void
-CheckTransitions::preGlobalEndLumi(GlobalContext const& gc) {
-  auto id =gc.luminosityBlockID();
-  m_seenTransitions.emplace_back(Phase::kEndLumi,edm::EventID{id.run(),id.luminosityBlock(),0},1000);
+void CheckTransitions::preGlobalEndLumi(GlobalContext const& gc) {
+  auto id = gc.luminosityBlockID();
+  m_seenTransitions.emplace_back(Phase::kEndLumi, edm::EventID{id.run(), id.luminosityBlock(), 0}, 1000);
 }
 
-void
-CheckTransitions::preStreamBeginLumi(StreamContext const& sc) {
-  m_seenTransitions.emplace_back(Phase::kBeginLumi,sc.eventID(),sc.streamID());
+void CheckTransitions::preStreamBeginLumi(StreamContext const& sc) {
+  m_seenTransitions.emplace_back(Phase::kBeginLumi, sc.eventID(), sc.streamID());
 }
 
-void
-CheckTransitions::preStreamEndLumi(StreamContext const& sc) {
-  m_seenTransitions.emplace_back(Phase::kEndLumi,sc.eventID(),sc.streamID());
+void CheckTransitions::preStreamEndLumi(StreamContext const& sc) {
+  m_seenTransitions.emplace_back(Phase::kEndLumi, sc.eventID(), sc.streamID());
 }
 
-void
-CheckTransitions::preEvent(StreamContext const& sc) {
-  m_seenTransitions.emplace_back(Phase::kEvent,sc.eventID(),sc.streamID());
+void CheckTransitions::preEvent(StreamContext const& sc) {
+  m_seenTransitions.emplace_back(Phase::kEvent, sc.eventID(), sc.streamID());
 }
 
 using edm::service::CheckTransitions;
 DEFINE_FWK_SERVICE(CheckTransitions);
-
-
diff --git a/FWCore/Services/plugins/ConcurrentModuleTimer.cc b/FWCore/Services/plugins/ConcurrentModuleTimer.cc
index e88fcf9589499..69ea6273246d7 100644
--- a/FWCore/Services/plugins/ConcurrentModuleTimer.cc
+++ b/FWCore/Services/plugins/ConcurrentModuleTimer.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Subsystem/Package
 // Class  :     ConcurrentModuleTimer
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -23,18 +23,18 @@
 #include "FWCore/ServiceRegistry/interface/ModuleCallingContext.h"
 #include "DataFormats/Provenance/interface/ModuleDescription.h"
 
-
 namespace edm {
   namespace service {
     class ConcurrentModuleTimer {
     public:
       ConcurrentModuleTimer(edm::ParameterSet const& iConfig, edm::ActivityRegistry& iAR);
       ~ConcurrentModuleTimer();
-      static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
+      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
     private:
       void start();
       void stop();
-      
+
       bool trackModule(ModuleCallingContext const& iContext) const;
       std::unique_ptr<std::atomic<std::chrono::high_resolution_clock::rep>[]> m_timeSums;
       std::vector<std::string> m_modulesToExclude;
@@ -46,8 +46,8 @@ namespace edm {
       bool m_startedTiming;
       bool m_excludeSource;
     };
-  }
-}
+  }  // namespace service
+}  // namespace edm
 
 using namespace edm::service;
 // system include files
@@ -65,101 +65,92 @@ using namespace edm::service;
 //
 // constructors and destructor
 //
-ConcurrentModuleTimer::ConcurrentModuleTimer(edm::ParameterSet const& iConfig, edm::ActivityRegistry& iReg):
-m_modulesToExclude(iConfig.getUntrackedParameter<std::vector<std::string>>("modulesToExclude")),
-m_time(),
-m_nModules(0),
-m_spinLock{false},
-m_startedTiming(false),
-m_excludeSource(iConfig.getUntrackedParameter<bool>("excludeSource"))
-{
-  if(not m_modulesToExclude.empty()) {
-    iReg.watchPreModuleConstruction( [this](ModuleDescription const& iMod) {
-      for(auto const& name: m_modulesToExclude) {
-        if( iMod.moduleLabel() == name) {
+ConcurrentModuleTimer::ConcurrentModuleTimer(edm::ParameterSet const& iConfig, edm::ActivityRegistry& iReg)
+    : m_modulesToExclude(iConfig.getUntrackedParameter<std::vector<std::string>>("modulesToExclude")),
+      m_time(),
+      m_nModules(0),
+      m_spinLock{false},
+      m_startedTiming(false),
+      m_excludeSource(iConfig.getUntrackedParameter<bool>("excludeSource")) {
+  if (not m_modulesToExclude.empty()) {
+    iReg.watchPreModuleConstruction([this](ModuleDescription const& iMod) {
+      for (auto const& name : m_modulesToExclude) {
+        if (iMod.moduleLabel() == name) {
           m_excludedModuleIds.push_back(iMod.id());
           break;
         }
       }
     });
-    iReg.watchPreModuleEvent([this](StreamContext const&, ModuleCallingContext const& iContext){
-      if(trackModule(iContext)) {
+    iReg.watchPreModuleEvent([this](StreamContext const&, ModuleCallingContext const& iContext) {
+      if (trackModule(iContext)) {
         start();
       }
     });
-    iReg.watchPostModuleEvent([this](StreamContext const&, ModuleCallingContext const& iContext){
-      if(trackModule(iContext)) {
+    iReg.watchPostModuleEvent([this](StreamContext const&, ModuleCallingContext const& iContext) {
+      if (trackModule(iContext)) {
         stop();
       }
     });
-    
-    iReg.watchPreModuleEventDelayedGet([this](StreamContext const&, ModuleCallingContext const& iContext){
-      if(trackModule(iContext)) {
-        if(iContext.state() == ModuleCallingContext::State::kRunning) {
+
+    iReg.watchPreModuleEventDelayedGet([this](StreamContext const&, ModuleCallingContext const& iContext) {
+      if (trackModule(iContext)) {
+        if (iContext.state() == ModuleCallingContext::State::kRunning) {
           stop();
         }
       }
     });
-    iReg.watchPostModuleEventDelayedGet([this](StreamContext const&, ModuleCallingContext const& iContext){
-      if(trackModule(iContext)) {
-        if(iContext.state() == ModuleCallingContext::State::kRunning) {
+    iReg.watchPostModuleEventDelayedGet([this](StreamContext const&, ModuleCallingContext const& iContext) {
+      if (trackModule(iContext)) {
+        if (iContext.state() == ModuleCallingContext::State::kRunning) {
           start();
         }
       }
     });
-    
+
   } else {
     //apply to all modules so can use faster version
-    iReg.watchPreModuleEvent([this](StreamContext const&, ModuleCallingContext const&){
-      start();
-    });
-    iReg.watchPostModuleEvent([this](StreamContext const&, ModuleCallingContext const&){
-      stop();
-    });
-    
-    iReg.watchPreModuleEventDelayedGet([this](StreamContext const&, ModuleCallingContext const& iContext){
-        if(iContext.state() == ModuleCallingContext::State::kRunning) {
-    stop();
-        }
+    iReg.watchPreModuleEvent([this](StreamContext const&, ModuleCallingContext const&) { start(); });
+    iReg.watchPostModuleEvent([this](StreamContext const&, ModuleCallingContext const&) { stop(); });
+
+    iReg.watchPreModuleEventDelayedGet([this](StreamContext const&, ModuleCallingContext const& iContext) {
+      if (iContext.state() == ModuleCallingContext::State::kRunning) {
+        stop();
+      }
     });
-    iReg.watchPostModuleEventDelayedGet([this](StreamContext const&, ModuleCallingContext const& iContext){
-        if(iContext.state() == ModuleCallingContext::State::kRunning) {
-    start();
-        }
+    iReg.watchPostModuleEventDelayedGet([this](StreamContext const&, ModuleCallingContext const& iContext) {
+      if (iContext.state() == ModuleCallingContext::State::kRunning) {
+        start();
+      }
     });
   }
-    
-  iReg.watchPreallocate([this](edm::service::SystemBounds const& iBounds){
-    m_nTimeSums =iBounds.maxNumberOfThreads()+1;
+
+  iReg.watchPreallocate([this](edm::service::SystemBounds const& iBounds) {
+    m_nTimeSums = iBounds.maxNumberOfThreads() + 1;
     m_timeSums.reset(new std::atomic<std::chrono::high_resolution_clock::rep>[m_nTimeSums]);
-    for(unsigned int i=0; i<m_nTimeSums;++i) {
-      m_timeSums[i]=0;
+    for (unsigned int i = 0; i < m_nTimeSums; ++i) {
+      m_timeSums[i] = 0;
     }
   });
-  
-  iReg.watchPreSourceEvent([this](StreamID){
-    if(not m_startedTiming) {
+
+  iReg.watchPreSourceEvent([this](StreamID) {
+    if (not m_startedTiming) {
       m_time = std::chrono::high_resolution_clock::now();
-      m_startedTiming=true;
+      m_startedTiming = true;
     }
-    if(not m_excludeSource) {
+    if (not m_excludeSource) {
       start();
     }
   });
-  if(not m_excludeSource) {
-    iReg.watchPostSourceEvent([this](StreamID){
-      stop();
-    });
+  if (not m_excludeSource) {
+    iReg.watchPostSourceEvent([this](StreamID) { stop(); });
   }
 }
 
 ConcurrentModuleTimer::~ConcurrentModuleTimer() {
-  
-  std::cout <<"Fraction of time running n Modules simultaneously"<<std::endl;
-  for (unsigned int i=0; i<m_nTimeSums; ++i) {
-    std::cout <<i<<" "<<m_timeSums[i]/double(m_timeSums[0])<<" "<<m_timeSums[i]<<std::endl;
+  std::cout << "Fraction of time running n Modules simultaneously" << std::endl;
+  for (unsigned int i = 0; i < m_nTimeSums; ++i) {
+    std::cout << i << " " << m_timeSums[i] / double(m_timeSums[0]) << " " << m_timeSums[i] << std::endl;
   }
-  
 }
 
 // ConcurrentModuleTimer::ConcurrentModuleTimer(const ConcurrentModuleTimer& rhs)
@@ -182,48 +173,44 @@ ConcurrentModuleTimer::~ConcurrentModuleTimer() {
 //
 // member functions
 //
-void
-ConcurrentModuleTimer::start()
-{
-  auto const newTime =std::chrono::high_resolution_clock::now();
+void ConcurrentModuleTimer::start() {
+  auto const newTime = std::chrono::high_resolution_clock::now();
   std::chrono::high_resolution_clock::time_point oldTime;
   bool expected = false;
   unsigned int nModules;
-  while (not m_spinLock.compare_exchange_strong(expected,true,std::memory_order_acq_rel)){
+  while (not m_spinLock.compare_exchange_strong(expected, true, std::memory_order_acq_rel)) {
     expected = false;
   }
   {
     oldTime = m_time;
     m_time = newTime;
     nModules = ++m_nModules;
-    m_spinLock.store(false,std::memory_order_release);
+    m_spinLock.store(false, std::memory_order_release);
   }
-  assert(nModules <m_nTimeSums);
+  assert(nModules < m_nTimeSums);
   auto diff = newTime - oldTime;
-  for(unsigned int i=0;i<nModules;++i) {
+  for (unsigned int i = 0; i < nModules; ++i) {
     m_timeSums[i].fetch_add(diff.count());
   }
 }
 
-void
-ConcurrentModuleTimer::stop()
-{
-  auto const newTime =std::chrono::high_resolution_clock::now();
+void ConcurrentModuleTimer::stop() {
+  auto const newTime = std::chrono::high_resolution_clock::now();
   std::chrono::high_resolution_clock::time_point oldTime;
   bool expected = false;
   unsigned int nModules;
-  while (not m_spinLock.compare_exchange_weak(expected,true,std::memory_order_acq_rel)){
+  while (not m_spinLock.compare_exchange_weak(expected, true, std::memory_order_acq_rel)) {
     expected = false;
   }
   {
     oldTime = m_time;
     m_time = newTime;
     nModules = m_nModules--;
-    m_spinLock.store(false,std::memory_order_release);
+    m_spinLock.store(false, std::memory_order_release);
   }
-  assert(nModules <m_nTimeSums);
+  assert(nModules < m_nTimeSums);
   auto diff = newTime - oldTime;
-  for(unsigned int i=0;i<=nModules;++i) {
+  for (unsigned int i = 0; i <= nModules; ++i) {
     m_timeSums[i].fetch_add(diff.count());
   }
 }
@@ -231,12 +218,10 @@ ConcurrentModuleTimer::stop()
 //
 // const member functions
 //
-bool
-ConcurrentModuleTimer::trackModule(ModuleCallingContext const& iContext) const
-{
+bool ConcurrentModuleTimer::trackModule(ModuleCallingContext const& iContext) const {
   auto modId = iContext.moduleDescription()->id();
-  for(auto const id: m_excludedModuleIds) {
-    if(modId == id) {
+  for (auto const id : m_excludedModuleIds) {
+    if (modId == id) {
       return false;
     }
   }
@@ -246,14 +231,12 @@ ConcurrentModuleTimer::trackModule(ModuleCallingContext const& iContext) const
 //
 // static member functions
 //
-void
-ConcurrentModuleTimer::fillDescriptions(edm::ConfigurationDescriptions & descriptions)
-{
+void ConcurrentModuleTimer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
-  desc.addUntracked<std::vector<std::string> >("modulesToExclude", std::vector<std::string>{})->setComment("Module labels to exclude from the timing measurements");
-  desc.addUntracked<bool>("excludeSource",false)->setComment("Exclude the time the source is running");
+  desc.addUntracked<std::vector<std::string>>("modulesToExclude", std::vector<std::string>{})
+      ->setComment("Module labels to exclude from the timing measurements");
+  desc.addUntracked<bool>("excludeSource", false)->setComment("Exclude the time the source is running");
   descriptions.add("ConcurrentModuleTimer", desc);
 }
 
 DEFINE_FWK_SERVICE(ConcurrentModuleTimer);
-
diff --git a/FWCore/Services/plugins/CondorStatusUpdater.cc b/FWCore/Services/plugins/CondorStatusUpdater.cc
index fb86619d64333..dcd54e87f5639 100644
--- a/FWCore/Services/plugins/CondorStatusUpdater.cc
+++ b/FWCore/Services/plugins/CondorStatusUpdater.cc
@@ -30,451 +30,392 @@
 
 namespace edm {
 
-    namespace service {
-
-        class CondorStatusService
-        {
-
-        public:
-
-            explicit CondorStatusService(ParameterSet const& pset, edm::ActivityRegistry& ar);
-            ~CondorStatusService() {}
-            CondorStatusService(const CondorStatusService&) = delete;
-            CondorStatusService& operator=(const CondorStatusService&) = delete;
-
-            static void fillDescriptions(ConfigurationDescriptions &descriptions);
-
-        private:
-
-            bool isChirpSupported();
-            template<typename T> bool updateChirp(const std::string &key_suffix, const T &value);
-            bool updateChirpQuoted(const std::string &key_suffix, const std::string &value);
-            bool updateChirpImpl(std::string const &key, std::string const &value);
-            inline void update();
-            void firstUpdate();
-            void lastUpdate();
-            void updateImpl(time_t secsSinceLastUpdate);
-
-            void preSourceConstruction(ModuleDescription const &md, int maxEvents, int maxLumis, int maxSecondsUntilRampdown);
-            void eventPost(StreamContext const& iContext);
-            void lumiPost(GlobalContext const&);
-            void runPost(GlobalContext const&);
-            void beginPre(PathsAndConsumesOfModulesBase const&, ProcessContext const& processContext);
-            void beginPost();
-            void endPost();
-            void filePost(std::string const &, bool);
-
-            bool m_debug;
-            std::atomic_flag m_shouldUpdate;
-            time_t m_beginJob = 0;
-            time_t m_updateInterval = m_defaultUpdateInterval;
-            float m_emaInterval = m_defaultEmaInterval;
-            float m_rate = 0;
-            static constexpr float m_defaultEmaInterval = 15*60; // Time in seconds to average EMA over for event rate.
-            static constexpr unsigned int m_defaultUpdateInterval = 3*60;
-            std::atomic<time_t> m_lastUpdate;
-            std::atomic<std::uint_least64_t> m_events;
-            std::atomic<std::uint_least64_t> m_lumis;
-            std::atomic<std::uint_least64_t> m_runs;
-            std::atomic<std::uint_least64_t> m_files;
-            std::string m_tag;
-            edm::ParameterSetID m_processParameterSetID;
-
-            std::uint_least64_t m_lastEventCount = 0;
-        };
-
-    }
-
-}
+  namespace service {
+
+    class CondorStatusService {
+    public:
+      explicit CondorStatusService(ParameterSet const &pset, edm::ActivityRegistry &ar);
+      ~CondorStatusService() {}
+      CondorStatusService(const CondorStatusService &) = delete;
+      CondorStatusService &operator=(const CondorStatusService &) = delete;
+
+      static void fillDescriptions(ConfigurationDescriptions &descriptions);
+
+    private:
+      bool isChirpSupported();
+      template <typename T>
+      bool updateChirp(const std::string &key_suffix, const T &value);
+      bool updateChirpQuoted(const std::string &key_suffix, const std::string &value);
+      bool updateChirpImpl(std::string const &key, std::string const &value);
+      inline void update();
+      void firstUpdate();
+      void lastUpdate();
+      void updateImpl(time_t secsSinceLastUpdate);
+
+      void preSourceConstruction(ModuleDescription const &md, int maxEvents, int maxLumis, int maxSecondsUntilRampdown);
+      void eventPost(StreamContext const &iContext);
+      void lumiPost(GlobalContext const &);
+      void runPost(GlobalContext const &);
+      void beginPre(PathsAndConsumesOfModulesBase const &, ProcessContext const &processContext);
+      void beginPost();
+      void endPost();
+      void filePost(std::string const &, bool);
+
+      bool m_debug;
+      std::atomic_flag m_shouldUpdate;
+      time_t m_beginJob = 0;
+      time_t m_updateInterval = m_defaultUpdateInterval;
+      float m_emaInterval = m_defaultEmaInterval;
+      float m_rate = 0;
+      static constexpr float m_defaultEmaInterval = 15 * 60;  // Time in seconds to average EMA over for event rate.
+      static constexpr unsigned int m_defaultUpdateInterval = 3 * 60;
+      std::atomic<time_t> m_lastUpdate;
+      std::atomic<std::uint_least64_t> m_events;
+      std::atomic<std::uint_least64_t> m_lumis;
+      std::atomic<std::uint_least64_t> m_runs;
+      std::atomic<std::uint_least64_t> m_files;
+      std::string m_tag;
+      edm::ParameterSetID m_processParameterSetID;
+
+      std::uint_least64_t m_lastEventCount = 0;
+    };
+
+  }  // namespace service
+
+}  // namespace edm
 
 using namespace edm::service;
 
 const unsigned int CondorStatusService::m_defaultUpdateInterval;
 constexpr float CondorStatusService::m_defaultEmaInterval;
 
-CondorStatusService::CondorStatusService(ParameterSet const& pset, edm::ActivityRegistry& ar)
-  :
-    m_debug(false),
-    m_lastUpdate(0),
-    m_events(0),
-    m_lumis(0),
-    m_runs(0),
-    m_files(0)
-{
-    m_shouldUpdate.clear();
-    if (pset.exists("debug"))
-    {
-        m_debug = true;
-    }
-    if (!isChirpSupported()) {return;}
-
-    firstUpdate();
-
-    ar.watchPostCloseFile(this, &CondorStatusService::filePost);
-    ar.watchPostEvent(this, &CondorStatusService::eventPost);
-    ar.watchPostGlobalEndLumi(this, &CondorStatusService::lumiPost);
-    ar.watchPostGlobalEndRun(this, &CondorStatusService::runPost);
-    ar.watchPreBeginJob(this, &CondorStatusService::beginPre);
-    ar.watchPostBeginJob(this, &CondorStatusService::beginPost);
-    ar.watchPostEndJob(this, &CondorStatusService::endPost);
-
-    if (pset.exists("updateIntervalSeconds"))
-    {
-        m_updateInterval = pset.getUntrackedParameter<unsigned int>("updateIntervalSeconds");
-    }
-    if (pset.exists("EMAInterval"))
-    {
-        m_emaInterval = pset.getUntrackedParameter<double>("EMAInterval");
-    }
-    if (pset.exists("tag"))
-    {
-        m_tag = pset.getUntrackedParameter<std::string>("tag");
-    }
+CondorStatusService::CondorStatusService(ParameterSet const &pset, edm::ActivityRegistry &ar)
+    : m_debug(false), m_lastUpdate(0), m_events(0), m_lumis(0), m_runs(0), m_files(0) {
+  m_shouldUpdate.clear();
+  if (pset.exists("debug")) {
+    m_debug = true;
+  }
+  if (!isChirpSupported()) {
+    return;
+  }
+
+  firstUpdate();
+
+  ar.watchPostCloseFile(this, &CondorStatusService::filePost);
+  ar.watchPostEvent(this, &CondorStatusService::eventPost);
+  ar.watchPostGlobalEndLumi(this, &CondorStatusService::lumiPost);
+  ar.watchPostGlobalEndRun(this, &CondorStatusService::runPost);
+  ar.watchPreBeginJob(this, &CondorStatusService::beginPre);
+  ar.watchPostBeginJob(this, &CondorStatusService::beginPost);
+  ar.watchPostEndJob(this, &CondorStatusService::endPost);
+
+  if (pset.exists("updateIntervalSeconds")) {
+    m_updateInterval = pset.getUntrackedParameter<unsigned int>("updateIntervalSeconds");
+  }
+  if (pset.exists("EMAInterval")) {
+    m_emaInterval = pset.getUntrackedParameter<double>("EMAInterval");
+  }
+  if (pset.exists("tag")) {
+    m_tag = pset.getUntrackedParameter<std::string>("tag");
+  }
 }
 
-
-void
-CondorStatusService::eventPost(StreamContext const& iContext)
-{
-    m_events++;
-    update();
+void CondorStatusService::eventPost(StreamContext const &iContext) {
+  m_events++;
+  update();
 }
 
-
-void
-CondorStatusService::lumiPost(GlobalContext const&)
-{
-    m_lumis++;
-    update();
+void CondorStatusService::lumiPost(GlobalContext const &) {
+  m_lumis++;
+  update();
 }
 
-
-void
-CondorStatusService::runPost(GlobalContext const&)
-{
-    m_runs++;
-    update();
+void CondorStatusService::runPost(GlobalContext const &) {
+  m_runs++;
+  update();
 }
 
-
-void
-CondorStatusService::filePost(std::string const & /*lfn*/, bool /*usedFallback*/)
-{
-    m_files++;
-    update();
+void CondorStatusService::filePost(std::string const & /*lfn*/, bool /*usedFallback*/) {
+  m_files++;
+  update();
 }
 
-
-void
-CondorStatusService::beginPre(PathsAndConsumesOfModulesBase const&, ProcessContext const& processContext)
-{
-    if (!m_processParameterSetID.isValid())
-    {
-        m_processParameterSetID = processContext.parameterSetID();
-    }
+void CondorStatusService::beginPre(PathsAndConsumesOfModulesBase const &, ProcessContext const &processContext) {
+  if (!m_processParameterSetID.isValid()) {
+    m_processParameterSetID = processContext.parameterSetID();
+  }
 }
 
-
-void
-CondorStatusService::beginPost()
-{
-    ParameterSet const& processParameterSet = edm::getParameterSet(m_processParameterSetID);
-    const edm::ParameterSet &pset = processParameterSet.getParameterSet("@main_input");
-    // PSet info from edm::ScheduleItems
-    int maxEvents = processParameterSet.getUntrackedParameterSet("maxEvents", ParameterSet()).getUntrackedParameter<int>("input", -1);
-    int maxLumis = processParameterSet.getUntrackedParameterSet("maxLuminosityBlocks", ParameterSet()).getUntrackedParameter<int>("input", -1);
-
-    // lumisToProcess from EventSkipperByID (PoolSource and similar)
-    std::vector<edm::LuminosityBlockRange> toProcess = pset.getUntrackedParameter<std::vector<LuminosityBlockRange> >("lumisToProcess", std::vector<LuminosityBlockRange>());
-    edm::sortAndRemoveOverlaps(toProcess);
-    uint64_t lumiCount = 0;
-    for (auto const &range : toProcess)
-    {
-        if (range.startRun() != range.endRun()) {break;}
-        if (range.endLumi() >= edm::LuminosityBlockID::maxLuminosityBlockNumber()) {break;}
-        lumiCount += (range.endLumi()-range.startLumi());
+void CondorStatusService::beginPost() {
+  ParameterSet const &processParameterSet = edm::getParameterSet(m_processParameterSetID);
+  const edm::ParameterSet &pset = processParameterSet.getParameterSet("@main_input");
+  // PSet info from edm::ScheduleItems
+  int maxEvents =
+      processParameterSet.getUntrackedParameterSet("maxEvents", ParameterSet()).getUntrackedParameter<int>("input", -1);
+  int maxLumis = processParameterSet.getUntrackedParameterSet("maxLuminosityBlocks", ParameterSet())
+                     .getUntrackedParameter<int>("input", -1);
+
+  // lumisToProcess from EventSkipperByID (PoolSource and similar)
+  std::vector<edm::LuminosityBlockRange> toProcess = pset.getUntrackedParameter<std::vector<LuminosityBlockRange>>(
+      "lumisToProcess", std::vector<LuminosityBlockRange>());
+  edm::sortAndRemoveOverlaps(toProcess);
+  uint64_t lumiCount = 0;
+  for (auto const &range : toProcess) {
+    if (range.startRun() != range.endRun()) {
+      break;
     }
-    // Handle sources deriving from ProducerSourceBase
-    unsigned int eventsPerLumi = pset.getUntrackedParameter<unsigned int>("numberEventsInLuminosityBlock", 0);
-    if ((lumiCount == 0) && (maxEvents > 0) && (eventsPerLumi > 0))
-    {
-        lumiCount = static_cast<unsigned int>(std::ceil(static_cast<float>(maxEvents) / static_cast<float>(eventsPerLumi)));
+    if (range.endLumi() >= edm::LuminosityBlockID::maxLuminosityBlockNumber()) {
+      break;
     }
-
-    std::vector<std::string> fileNames = pset.getUntrackedParameter<std::vector<std::string>>("fileNames", std::vector<std::string>());
-    std::stringstream ss_max_files; ss_max_files << fileNames.size();
-    updateChirp("MaxFiles", ss_max_files.str());
-
-    if (lumiCount > 0)
-    {
-        if (maxLumis < 0) {maxLumis = lumiCount;}
-        if (maxLumis > static_cast<int>(lumiCount))
-        {
-            maxLumis = lumiCount;
-        }
-    }
-    if (maxEvents > 0)
-    {
-        std::stringstream ss_max_events; ss_max_events << maxEvents;
-        updateChirp("MaxEvents", ss_max_events.str());
+    lumiCount += (range.endLumi() - range.startLumi());
+  }
+  // Handle sources deriving from ProducerSourceBase
+  unsigned int eventsPerLumi = pset.getUntrackedParameter<unsigned int>("numberEventsInLuminosityBlock", 0);
+  if ((lumiCount == 0) && (maxEvents > 0) && (eventsPerLumi > 0)) {
+    lumiCount = static_cast<unsigned int>(std::ceil(static_cast<float>(maxEvents) / static_cast<float>(eventsPerLumi)));
+  }
+
+  std::vector<std::string> fileNames =
+      pset.getUntrackedParameter<std::vector<std::string>>("fileNames", std::vector<std::string>());
+  std::stringstream ss_max_files;
+  ss_max_files << fileNames.size();
+  updateChirp("MaxFiles", ss_max_files.str());
+
+  if (lumiCount > 0) {
+    if (maxLumis < 0) {
+      maxLumis = lumiCount;
     }
-    if (maxLumis > 0)
-    {
-        std::stringstream ss_max_lumis; ss_max_lumis << maxLumis;
-        updateChirp("MaxLumis", ss_max_lumis.str());
+    if (maxLumis > static_cast<int>(lumiCount)) {
+      maxLumis = lumiCount;
     }
-
-    m_beginJob = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
-    update();
-}
-
-
-void
-CondorStatusService::endPost()
-{
-    lastUpdate();
+  }
+  if (maxEvents > 0) {
+    std::stringstream ss_max_events;
+    ss_max_events << maxEvents;
+    updateChirp("MaxEvents", ss_max_events.str());
+  }
+  if (maxLumis > 0) {
+    std::stringstream ss_max_lumis;
+    ss_max_lumis << maxLumis;
+    updateChirp("MaxLumis", ss_max_lumis.str());
+  }
+
+  m_beginJob = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+  update();
 }
 
+void CondorStatusService::endPost() { lastUpdate(); }
 
-bool
-CondorStatusService::isChirpSupported()
-{
-    if (m_debug) {return true;}
+bool CondorStatusService::isChirpSupported() {
+  if (m_debug) {
+    return true;
+  }
 
-    return getenv("_CONDOR_CHIRP_CONFIG") && updateChirp("Elapsed", "0");
+  return getenv("_CONDOR_CHIRP_CONFIG") && updateChirp("Elapsed", "0");
 }
 
-
-void
-CondorStatusService::firstUpdate()
-{
-    // Note we always update all our statistics to 0 / false / -1
-    // This allows us to overwrite the activities of a previous cmsRun process
-    // within this HTCondor job.
-    updateImpl(0);
-    updateChirp("MaxFiles", "-1");
-    updateChirp("MaxEvents", "-1");
-    updateChirp("MaxLumis", "-1");
-    updateChirp("Done", "false");
-
-    edm::Service<edm::CPUServiceBase> cpusvc;
-    std::string models;
-    double avgSpeed;
-    if (cpusvc.isAvailable() && cpusvc->cpuInfo(models, avgSpeed)) {
-        updateChirpQuoted("CPUModels", models);
-        updateChirp("CPUSpeed", avgSpeed);
-    }
+void CondorStatusService::firstUpdate() {
+  // Note we always update all our statistics to 0 / false / -1
+  // This allows us to overwrite the activities of a previous cmsRun process
+  // within this HTCondor job.
+  updateImpl(0);
+  updateChirp("MaxFiles", "-1");
+  updateChirp("MaxEvents", "-1");
+  updateChirp("MaxLumis", "-1");
+  updateChirp("Done", "false");
+
+  edm::Service<edm::CPUServiceBase> cpusvc;
+  std::string models;
+  double avgSpeed;
+  if (cpusvc.isAvailable() && cpusvc->cpuInfo(models, avgSpeed)) {
+    updateChirpQuoted("CPUModels", models);
+    updateChirp("CPUSpeed", avgSpeed);
+  }
 }
 
-
-void
-CondorStatusService::lastUpdate()
-{
-    time_t now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
-    updateImpl(now - m_lastUpdate);
-    updateChirp("Done", "true");
-    edm::Service<edm::CPUServiceBase> cpusvc;
-    if (!cpusvc.isAvailable()) {
-        std::cout << "At post, CPU service is NOT available.\n";
-    }
+void CondorStatusService::lastUpdate() {
+  time_t now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+  updateImpl(now - m_lastUpdate);
+  updateChirp("Done", "true");
+  edm::Service<edm::CPUServiceBase> cpusvc;
+  if (!cpusvc.isAvailable()) {
+    std::cout << "At post, CPU service is NOT available.\n";
+  }
 }
 
-
-void
-CondorStatusService::update()
-{
-    time_t now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
-    if ((now - m_lastUpdate.load(std::memory_order_relaxed)) > m_updateInterval)
-    {
-        if (!m_shouldUpdate.test_and_set(std::memory_order_acquire))
-        {
-            try
-            {
-                time_t sinceLastUpdate = now - m_lastUpdate;
-                m_lastUpdate = now;
-                updateImpl(sinceLastUpdate);
-                m_shouldUpdate.clear(std::memory_order_release);
-            }
-            catch (...)
-            {
-                m_shouldUpdate.clear(std::memory_order_release);
-                throw;
-            }
-        }
+void CondorStatusService::update() {
+  time_t now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+  if ((now - m_lastUpdate.load(std::memory_order_relaxed)) > m_updateInterval) {
+    if (!m_shouldUpdate.test_and_set(std::memory_order_acquire)) {
+      try {
+        time_t sinceLastUpdate = now - m_lastUpdate;
+        m_lastUpdate = now;
+        updateImpl(sinceLastUpdate);
+        m_shouldUpdate.clear(std::memory_order_release);
+      } catch (...) {
+        m_shouldUpdate.clear(std::memory_order_release);
+        throw;
+      }
     }
+  }
 }
 
-
-void
-CondorStatusService::updateImpl(time_t sinceLastUpdate)
-{
-    time_t now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
-    time_t jobTime = now-m_beginJob;
-
-    edm::Service<edm::TimingServiceBase> timingsvc;
-    if (timingsvc.isAvailable()) {
-        updateChirp("TotalCPU", timingsvc->getTotalCPU());
-    }
-
-    updateChirp("LastUpdate", now);
-
-    if (!m_events || (m_events > m_lastEventCount))
-    {
-        updateChirp("Events", m_events);
-    }
-
-    updateChirp("Lumis", m_lumis);
-
-    updateChirp("Runs", m_runs);
-
-    updateChirp("Files", m_files);
-
-    float ema_coeff = 1 - std::exp(-static_cast<float>(sinceLastUpdate)/std::max(std::min(m_emaInterval, static_cast<float>(jobTime)), 1.0f));
-    if (sinceLastUpdate > 0)
-    {
-        updateChirp("Elapsed", jobTime);
-        m_rate = ema_coeff*static_cast<float>(m_events-m_lastEventCount)/static_cast<float>(sinceLastUpdate) + (1.0-ema_coeff)*m_rate;
-        m_lastEventCount = m_events;
-        updateChirp("EventRate", m_rate);
+void CondorStatusService::updateImpl(time_t sinceLastUpdate) {
+  time_t now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+  time_t jobTime = now - m_beginJob;
+
+  edm::Service<edm::TimingServiceBase> timingsvc;
+  if (timingsvc.isAvailable()) {
+    updateChirp("TotalCPU", timingsvc->getTotalCPU());
+  }
+
+  updateChirp("LastUpdate", now);
+
+  if (!m_events || (m_events > m_lastEventCount)) {
+    updateChirp("Events", m_events);
+  }
+
+  updateChirp("Lumis", m_lumis);
+
+  updateChirp("Runs", m_runs);
+
+  updateChirp("Files", m_files);
+
+  float ema_coeff = 1 - std::exp(-static_cast<float>(sinceLastUpdate) /
+                                 std::max(std::min(m_emaInterval, static_cast<float>(jobTime)), 1.0f));
+  if (sinceLastUpdate > 0) {
+    updateChirp("Elapsed", jobTime);
+    m_rate = ema_coeff * static_cast<float>(m_events - m_lastEventCount) / static_cast<float>(sinceLastUpdate) +
+             (1.0 - ema_coeff) * m_rate;
+    m_lastEventCount = m_events;
+    updateChirp("EventRate", m_rate);
+  }
+
+  // If Xrootd was used, pull the statistics from there.
+  edm::Service<XrdAdaptor::XrdStatisticsService> xrdsvc;
+  if (xrdsvc.isAvailable()) {
+    for (auto const &iter : xrdsvc->condorUpdate()) {
+      std::string site = iter.first;
+      site.erase(std::remove_if(site.begin(), site.end(), [](char x) { return !isalnum(x) && (x != '_'); }),
+                 site.end());
+      auto &iostats = iter.second;
+      updateChirp("IOSite_" + site + "_ReadBytes", iostats.bytesRead);
+      updateChirp("IOSite_" + site + "_ReadTimeMS",
+                  std::chrono::duration_cast<std::chrono::milliseconds>(iostats.transferTime).count());
     }
-
-    // If Xrootd was used, pull the statistics from there.
-    edm::Service<XrdAdaptor::XrdStatisticsService> xrdsvc;
-    if (xrdsvc.isAvailable()) {
-        for (auto const &iter : xrdsvc->condorUpdate()) {
-            std::string site = iter.first;
-            site.erase(std::remove_if(site.begin(), site.end(),
-                       [](char x){return !isalnum(x) && (x != '_');}),
-                       site.end());
-            auto & iostats = iter.second;
-            updateChirp("IOSite_" + site + "_ReadBytes", iostats.bytesRead);
-            updateChirp("IOSite_" + site + "_ReadTimeMS",
-                        std::chrono::duration_cast<std::chrono::milliseconds>(iostats.transferTime).count());
-        }
+  }
+
+  // Update storage account information
+  auto const &stats = StorageAccount::summary();
+  uint64_t readOps = 0;
+  uint64_t readVOps = 0;
+  uint64_t readSegs = 0;
+  uint64_t readBytes = 0;
+  uint64_t readTimeTotal = 0;
+  uint64_t writeBytes = 0;
+  uint64_t writeTimeTotal = 0;
+  const auto token = StorageAccount::tokenForStorageClassName("tstoragefile");
+  for (const auto &storage : stats) {
+    // StorageAccount records statistics for both the TFile layer and the
+    // StorageFactory layer.  However, the StorageFactory statistics tend to
+    // be more accurate as various backends may alter the incoming read requests
+    // (such as when lazy-download is used).
+    if (storage.first == token.value()) {
+      continue;
     }
-
-    // Update storage account information
-    auto const& stats = StorageAccount::summary();
-    uint64_t readOps = 0;
-    uint64_t readVOps = 0;
-    uint64_t readSegs = 0;
-    uint64_t readBytes = 0;
-    uint64_t readTimeTotal = 0;
-    uint64_t writeBytes = 0;
-    uint64_t writeTimeTotal = 0;
-    const auto token = StorageAccount::tokenForStorageClassName("tstoragefile");
-    for (const auto & storage : stats)
-    {
-        // StorageAccount records statistics for both the TFile layer and the
-        // StorageFactory layer.  However, the StorageFactory statistics tend to
-        // be more accurate as various backends may alter the incoming read requests
-        // (such as when lazy-download is used).
-        if (storage.first == token.value()) {continue;}
-        for (const auto & counter : storage.second)
-        {
-            if (counter.first == static_cast<int>(StorageAccount::Operation::read))
-            {
-                readOps += counter.second.successes;
-                readSegs++;
-                readBytes += counter.second.amount;
-                readTimeTotal += counter.second.timeTotal;
-            }
-            else if (counter.first == static_cast<int>(StorageAccount::Operation::readv))
-            {
-                readVOps += counter.second.successes;
-                readSegs += counter.second.vector_count;
-                readBytes += counter.second.amount;
-                readTimeTotal += counter.second.timeTotal;
-            }
-            else if ((counter.first == static_cast<int>(StorageAccount::Operation::write)) || (counter.first == static_cast<int>(StorageAccount::Operation::writev)))
-            {
-                writeBytes += counter.second.amount;
-                writeTimeTotal += counter.second.timeTotal;
-            }
-        }
+    for (const auto &counter : storage.second) {
+      if (counter.first == static_cast<int>(StorageAccount::Operation::read)) {
+        readOps += counter.second.successes;
+        readSegs++;
+        readBytes += counter.second.amount;
+        readTimeTotal += counter.second.timeTotal;
+      } else if (counter.first == static_cast<int>(StorageAccount::Operation::readv)) {
+        readVOps += counter.second.successes;
+        readSegs += counter.second.vector_count;
+        readBytes += counter.second.amount;
+        readTimeTotal += counter.second.timeTotal;
+      } else if ((counter.first == static_cast<int>(StorageAccount::Operation::write)) ||
+                 (counter.first == static_cast<int>(StorageAccount::Operation::writev))) {
+        writeBytes += counter.second.amount;
+        writeTimeTotal += counter.second.timeTotal;
+      }
     }
-    updateChirp("ReadOps", readOps);
-    updateChirp("ReadVOps", readVOps);
-    updateChirp("ReadSegments", readSegs);
-    updateChirp("ReadBytes", readBytes);
-    updateChirp("ReadTimeMsecs", readTimeTotal/(1000*1000));
-    updateChirp("WriteBytes", writeBytes);
-    updateChirp("WriteTimeMsecs", writeTimeTotal/(1000*1000));
+  }
+  updateChirp("ReadOps", readOps);
+  updateChirp("ReadVOps", readVOps);
+  updateChirp("ReadSegments", readSegs);
+  updateChirp("ReadBytes", readBytes);
+  updateChirp("ReadTimeMsecs", readTimeTotal / (1000 * 1000));
+  updateChirp("WriteBytes", writeBytes);
+  updateChirp("WriteTimeMsecs", writeTimeTotal / (1000 * 1000));
 }
 
-
-template<typename T> bool
-CondorStatusService::updateChirp(const std::string &key_suffix, const T &value)
-{
-    std::stringstream ss; ss << value;
-    return updateChirpImpl(key_suffix, ss.str());
+template <typename T>
+bool CondorStatusService::updateChirp(const std::string &key_suffix, const T &value) {
+  std::stringstream ss;
+  ss << value;
+  return updateChirpImpl(key_suffix, ss.str());
 }
 
-bool
-CondorStatusService::updateChirpQuoted(const std::string &key_suffix, const std::string &value)
-{
-    std::string value_copy = value;
-    // Remove double-quotes or the \ character (as it has special escaping semantics in ClassAds).
-    // Make sure we have ASCII characters.
-    // Otherwise, remainder is allowed (including tabs, newlines, single-quotes).
-    value_copy.erase(remove_if(value_copy.begin(), value_copy.end(), [](const char &c) {return !isascii(c) || (c == '"') || (c == '\\');}), value_copy.end());
-    return updateChirpImpl(key_suffix, "\"" + value_copy + "\"");
+bool CondorStatusService::updateChirpQuoted(const std::string &key_suffix, const std::string &value) {
+  std::string value_copy = value;
+  // Remove double-quotes or the \ character (as it has special escaping semantics in ClassAds).
+  // Make sure we have ASCII characters.
+  // Otherwise, remainder is allowed (including tabs, newlines, single-quotes).
+  value_copy.erase(
+      remove_if(
+          value_copy.begin(), value_copy.end(), [](const char &c) { return !isascii(c) || (c == '"') || (c == '\\'); }),
+      value_copy.end());
+  return updateChirpImpl(key_suffix, "\"" + value_copy + "\"");
 }
 
-
-bool
-CondorStatusService::updateChirpImpl(const std::string &key_suffix, const std::string &value)
-{
-    std::stringstream ss; ss << "ChirpCMSSW" << m_tag << key_suffix;
-    std::string key = ss.str();
-    if (m_debug)
-    {
-        std::cout << "condor_chirp set_job_attr_delayed " << key << " " << value << std::endl;
-    }
-    int pid = 0;
-    posix_spawn_file_actions_t file_actions;
-    int devnull_fd = open("/dev/null", O_RDWR);
-    if (devnull_fd == -1) {return false;}
-    posix_spawn_file_actions_init(&file_actions);
-    posix_spawn_file_actions_adddup2(&file_actions, devnull_fd, 1);
-    posix_spawn_file_actions_adddup2(&file_actions, devnull_fd, 2);
-    const std::string chirp_name = "condor_chirp";
-    const std::string set_job_attr = "set_job_attr_delayed";
-    std::vector<const char *> argv;
-    argv.push_back(chirp_name.c_str());
-    argv.push_back(set_job_attr.c_str());
-    argv.push_back(key.c_str());
-    argv.push_back(value.c_str());
-    argv.push_back(nullptr);
-    int status = posix_spawnp(&pid, "condor_chirp", &file_actions, nullptr, const_cast<char* const*>(&argv[0]), environ);
-    close(devnull_fd);
-    posix_spawn_file_actions_destroy(&file_actions);
-    if (status)
-    {
-       return false;
-    }
-    while ((waitpid(pid, &status, 0) == -1) && errno == -EINTR) {}
-    return status == 0;
+bool CondorStatusService::updateChirpImpl(const std::string &key_suffix, const std::string &value) {
+  std::stringstream ss;
+  ss << "ChirpCMSSW" << m_tag << key_suffix;
+  std::string key = ss.str();
+  if (m_debug) {
+    std::cout << "condor_chirp set_job_attr_delayed " << key << " " << value << std::endl;
+  }
+  int pid = 0;
+  posix_spawn_file_actions_t file_actions;
+  int devnull_fd = open("/dev/null", O_RDWR);
+  if (devnull_fd == -1) {
+    return false;
+  }
+  posix_spawn_file_actions_init(&file_actions);
+  posix_spawn_file_actions_adddup2(&file_actions, devnull_fd, 1);
+  posix_spawn_file_actions_adddup2(&file_actions, devnull_fd, 2);
+  const std::string chirp_name = "condor_chirp";
+  const std::string set_job_attr = "set_job_attr_delayed";
+  std::vector<const char *> argv;
+  argv.push_back(chirp_name.c_str());
+  argv.push_back(set_job_attr.c_str());
+  argv.push_back(key.c_str());
+  argv.push_back(value.c_str());
+  argv.push_back(nullptr);
+  int status = posix_spawnp(&pid, "condor_chirp", &file_actions, nullptr, const_cast<char *const *>(&argv[0]), environ);
+  close(devnull_fd);
+  posix_spawn_file_actions_destroy(&file_actions);
+  if (status) {
+    return false;
+  }
+  while ((waitpid(pid, &status, 0) == -1) && errno == -EINTR) {
+  }
+  return status == 0;
 }
 
-
-void
-CondorStatusService::fillDescriptions(ConfigurationDescriptions &descriptions)
-{
-    ParameterSetDescription desc;
-    desc.setComment("Service to update HTCondor with the current CMSSW status.");
-    desc.addOptionalUntracked<unsigned int>("updateIntervalSeconds", m_defaultUpdateInterval)
+void CondorStatusService::fillDescriptions(ConfigurationDescriptions &descriptions) {
+  ParameterSetDescription desc;
+  desc.setComment("Service to update HTCondor with the current CMSSW status.");
+  desc.addOptionalUntracked<unsigned int>("updateIntervalSeconds", m_defaultUpdateInterval)
       ->setComment("Interval, in seconds, for HTCondor updates");
-    desc.addOptionalUntracked<bool>("debug", false)
-      ->setComment("Enable debugging of this service");
-    desc.addOptionalUntracked<double>("EMAInterval", m_defaultEmaInterval)
+  desc.addOptionalUntracked<bool>("debug", false)->setComment("Enable debugging of this service");
+  desc.addOptionalUntracked<double>("EMAInterval", m_defaultEmaInterval)
       ->setComment("Interval, in seconds, to calculate event rate over (using EMA)");
-    desc.addOptionalUntracked<std::string>("tag")
-      ->setComment("Identifier tag for this process (a value of 'Foo' results in ClassAd attributes of the form 'ChirpCMSSWFoo*')");
-    descriptions.add("CondorStatusService", desc);
+  desc.addOptionalUntracked<std::string>("tag")->setComment(
+      "Identifier tag for this process (a value of 'Foo' results in ClassAd attributes of the form 'ChirpCMSSWFoo*')");
+  descriptions.add("CondorStatusService", desc);
 }
 
-
 typedef edm::serviceregistry::AllArgsMaker<edm::service::CondorStatusService> CondorStatusServiceMaker;
-DEFINE_FWK_SERVICE_MAKER(CondorStatusService,CondorStatusServiceMaker);
-
+DEFINE_FWK_SERVICE_MAKER(CondorStatusService, CondorStatusServiceMaker);
diff --git a/FWCore/Services/plugins/DependencyGraph.cc b/FWCore/Services/plugins/DependencyGraph.cc
index 5978b95c09a26..d47c53527a45d 100644
--- a/FWCore/Services/plugins/DependencyGraph.cc
+++ b/FWCore/Services/plugins/DependencyGraph.cc
@@ -41,80 +41,56 @@ using namespace edm::service;
 namespace {
   namespace {
 
-    template<typename T>
-    std::unordered_set<T> make_unordered_set(std::vector<T> && entries) {
+    template <typename T>
+    std::unordered_set<T> make_unordered_set(std::vector<T> &&entries) {
       std::unordered_set<T> u;
-      for (T & entry: entries)
+      for (T &entry : entries)
         u.insert(std::move(entry));
       return u;
     }
 
-  } // (anonymous)
-} // (anonymous)
-
+  }  // namespace
+}  // namespace
 
 class DependencyGraph {
 public:
-  DependencyGraph(const ParameterSet&, ActivityRegistry&);
+  DependencyGraph(const ParameterSet &, ActivityRegistry &);
 
-  static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 
   void preSourceConstruction(ModuleDescription const &);
   void preBeginJob(PathsAndConsumesOfModulesBase const &, ProcessContext const &);
   void postBeginJob();
 
 private:
-  bool highlighted(std::string const & module) {
-    return (m_highlightModules.find(module) != m_highlightModules.end());
-  }
-
-  enum class EDMModuleType {
-    Unknown,
-    Source,
-    ESSource,
-    ESProducer,
-    EDAnalyzer,
-    EDProducer,
-    EDFilter,
-    OutputModule
+  bool highlighted(std::string const &module) { return (m_highlightModules.find(module) != m_highlightModules.end()); }
+
+  enum class EDMModuleType { Unknown, Source, ESSource, ESProducer, EDAnalyzer, EDProducer, EDFilter, OutputModule };
+
+  static constexpr const char *module_type_desc[]{
+      "Unknown", "Source", "ESSource", "ESProducer", "EDAnalyzer", "EDProducer", "EDFilter", "OutputModule"};
+
+  static constexpr const char *shapes[]{
+      "note",      // Unknown
+      "oval",      // Source
+      "cylinder",  // ESSource
+      "cylinder",  // ESProducer
+      "oval",      // EDAnalyzer
+      "box",       // EDProducer
+      "diamond",   // EDFilter
+      "oval",      // OutputModule
   };
 
-  static constexpr
-  const char * module_type_desc[] {
-    "Unknown",
-    "Source",
-    "ESSource",
-    "ESProducer",
-    "EDAnalyzer",
-    "EDProducer",
-    "EDFilter",
-    "OutputModule"
-  };
+  static EDMModuleType edmModuleTypeEnum(edm::ModuleDescription const &module);
 
-  static constexpr
-  const char * shapes[] {
-    "note",     // Unknown
-    "oval",     // Source
-    "cylinder", // ESSource
-    "cylinder", // ESProducer
-    "oval",     // EDAnalyzer
-    "box",      // EDProducer
-    "diamond",  // EDFilter
-    "oval",     // OutputModule
-  };
-
-  static
-  EDMModuleType edmModuleTypeEnum(edm::ModuleDescription const & module);
-
-  static
-  const char * edmModuleType(edm::ModuleDescription const & module);
+  static const char *edmModuleType(edm::ModuleDescription const &module);
 
   struct node {
-    std::string   label;
-    std::string   class_;
-    unsigned int  id;
+    std::string label;
+    std::string class_;
+    unsigned int id;
     EDMModuleType type;
-    bool          scheduled;
+    bool scheduled;
   };
 
   using GraphvizAttributes = std::map<std::string, std::string>;
@@ -127,17 +103,23 @@ class DependencyGraph {
       boost::vecS,
       boost::directedS,
       // vertex properties
-      boost::property<boost::vertex_attribute_t, GraphvizAttributes,        // Graphviz vertex attributes
-      node>,
+      boost::property<boost::vertex_attribute_t,
+                      GraphvizAttributes,  // Graphviz vertex attributes
+                      node>,
       // edge propoerties
-      boost::property<boost::edge_index_t, int,                             // used internally by boost::subgraph
-      boost::property<boost::edge_attribute_t, GraphvizAttributes>>,        // Graphviz edge attributes
+      boost::property<boost::edge_index_t,
+                      int,  // used internally by boost::subgraph
+                      boost::property<boost::edge_attribute_t, GraphvizAttributes>>,  // Graphviz edge attributes
       // graph properties
-      boost::property<boost::graph_name_t, std::string,                     // name each boost::subgraph
-      boost::property<boost::graph_graph_attribute_t, GraphvizAttributes,   // Graphviz graph attributes
-      boost::property<boost::graph_vertex_attribute_t, GraphvizAttributes,
-      boost::property<boost::graph_edge_attribute_t, GraphvizAttributes>>>>
-  >> m_graph;
+      boost::property<
+          boost::graph_name_t,
+          std::string,  // name each boost::subgraph
+          boost::property<boost::graph_graph_attribute_t,
+                          GraphvizAttributes,  // Graphviz graph attributes
+                          boost::property<boost::graph_vertex_attribute_t,
+                                          GraphvizAttributes,
+                                          boost::property<boost::graph_edge_attribute_t, GraphvizAttributes>>>>>>
+      m_graph;
 
   std::string m_filename;
   std::unordered_set<std::string> m_highlightModules;
@@ -146,47 +128,36 @@ class DependencyGraph {
   bool m_initialized;
 };
 
-constexpr
-const char * DependencyGraph::module_type_desc[];
+constexpr const char *DependencyGraph::module_type_desc[];
 
-constexpr
-const char * DependencyGraph::shapes[];
+constexpr const char *DependencyGraph::shapes[];
 
-
-DependencyGraph::EDMModuleType DependencyGraph::edmModuleTypeEnum(edm::ModuleDescription const & module)
-{
-  auto const & registry = * edm::pset::Registry::instance();
-  auto const & pset = * registry.getMapped(module.parameterSetID());
+DependencyGraph::EDMModuleType DependencyGraph::edmModuleTypeEnum(edm::ModuleDescription const &module) {
+  auto const &registry = *edm::pset::Registry::instance();
+  auto const &pset = *registry.getMapped(module.parameterSetID());
 
   if (not pset.existsAs<std::string>("@module_edm_type"))
     return EDMModuleType::Unknown;
 
-  std::string const & t = pset.getParameter<std::string>("@module_edm_type");
-  for (EDMModuleType v: {
-    EDMModuleType::Source,
-    EDMModuleType::ESSource,
-    EDMModuleType::ESProducer,
-    EDMModuleType::EDAnalyzer,
-    EDMModuleType::EDProducer,
-    EDMModuleType::EDFilter,
-    EDMModuleType::OutputModule
-  }) {
+  std::string const &t = pset.getParameter<std::string>("@module_edm_type");
+  for (EDMModuleType v : {EDMModuleType::Source,
+                          EDMModuleType::ESSource,
+                          EDMModuleType::ESProducer,
+                          EDMModuleType::EDAnalyzer,
+                          EDMModuleType::EDProducer,
+                          EDMModuleType::EDFilter,
+                          EDMModuleType::OutputModule}) {
     if (t == module_type_desc[static_cast<std::underlying_type_t<EDMModuleType>>(v)])
       return v;
   }
   return EDMModuleType::Unknown;
 }
 
-
-const char * DependencyGraph::edmModuleType(edm::ModuleDescription const & module)
-{
+const char *DependencyGraph::edmModuleType(edm::ModuleDescription const &module) {
   return module_type_desc[static_cast<std::underlying_type_t<EDMModuleType>>(edmModuleTypeEnum(module))];
 }
 
-
-void
-DependencyGraph::fillDescriptions(edm::ConfigurationDescriptions & descriptions)
-{
+void DependencyGraph::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
   edm::ParameterSetDescription desc;
   desc.addUntracked<std::string>("fileName", "dependency.gv");
   desc.addUntracked<std::vector<std::string>>("highlightModules", {});
@@ -194,43 +165,38 @@ DependencyGraph::fillDescriptions(edm::ConfigurationDescriptions & descriptions)
   descriptions.add("DependencyGraph", desc);
 }
 
-
-DependencyGraph::DependencyGraph(ParameterSet const & config, ActivityRegistry & registry) :
-  m_filename( config.getUntrackedParameter<std::string>("fileName") ),
-  m_highlightModules( make_unordered_set(config.getUntrackedParameter<std::vector<std::string>>("highlightModules")) ),
-  m_showPathDependencies( config.getUntrackedParameter<bool>("showPathDependencies") ),
-  m_initialized( false )
-{
+DependencyGraph::DependencyGraph(ParameterSet const &config, ActivityRegistry &registry)
+    : m_filename(config.getUntrackedParameter<std::string>("fileName")),
+      m_highlightModules(
+          make_unordered_set(config.getUntrackedParameter<std::vector<std::string>>("highlightModules"))),
+      m_showPathDependencies(config.getUntrackedParameter<bool>("showPathDependencies")),
+      m_initialized(false) {
   registry.watchPreSourceConstruction(this, &DependencyGraph::preSourceConstruction);
   registry.watchPreBeginJob(this, &DependencyGraph::preBeginJob);
   registry.watchPostBeginJob(this, &DependencyGraph::postBeginJob);
 }
 
-
 // adaptor to use range-based for loops with boost::graph edges(...) and vertices(...) functions
 template <typename I>
-struct iterator_pair_as_a_range : std::pair<I, I>
-{
+struct iterator_pair_as_a_range : std::pair<I, I> {
 public:
   using std::pair<I, I>::pair;
 
   I begin() { return this->first; }
-  I end()   { return this->second; }
+  I end() { return this->second; }
 };
 
 template <typename I>
-iterator_pair_as_a_range<I> make_range(std::pair<I, I> p)
-{
+iterator_pair_as_a_range<I> make_range(std::pair<I, I> p) {
   return iterator_pair_as_a_range<I>(p);
 }
 
-
-void
-DependencyGraph::preSourceConstruction(ModuleDescription const & module) {
+void DependencyGraph::preSourceConstruction(ModuleDescription const &module) {
   // create graph vertex for the source module and fill its attributes
   boost::add_vertex(m_graph);
-  m_graph.m_graph[module.id()] = node{ module.moduleLabel(), module.moduleName(), module.id(), EDMModuleType::Source, true };
-  auto & attributes = boost::get(boost::get(boost::vertex_attribute, m_graph), 0);
+  m_graph.m_graph[module.id()] =
+      node{module.moduleLabel(), module.moduleName(), module.id(), EDMModuleType::Source, true};
+  auto &attributes = boost::get(boost::get(boost::vertex_attribute, m_graph), 0);
   attributes["label"] = module.moduleLabel();
   attributes["tooltip"] = module.moduleName();
   attributes["shape"] = shapes[static_cast<std::underlying_type_t<EDMModuleType>>(EDMModuleType::Source)];
@@ -239,15 +205,13 @@ DependencyGraph::preSourceConstruction(ModuleDescription const & module) {
   attributes["fillcolor"] = highlighted(module.moduleLabel()) ? "lightgreen" : "white";
 }
 
-
-void
-DependencyGraph::preBeginJob(PathsAndConsumesOfModulesBase const & pathsAndConsumes, ProcessContext const & context) {
-
+void DependencyGraph::preBeginJob(PathsAndConsumesOfModulesBase const &pathsAndConsumes,
+                                  ProcessContext const &context) {
   // if the Service is not in the main Process do not do anything
   if (context.isSubProcess() and not m_initialized) {
-    edm::LogError("DependencyGraph")
-      << "You have requested an instance of the DependencyGraph Service in the \"" << context.processName()
-      << "\" SubProcess, which is not supported.\nPlease move it to the main process.";
+    edm::LogError("DependencyGraph") << "You have requested an instance of the DependencyGraph Service in the \""
+                                     << context.processName()
+                                     << "\" SubProcess, which is not supported.\nPlease move it to the main process.";
     return;
   }
 
@@ -265,7 +229,7 @@ DependencyGraph::preBeginJob(PathsAndConsumesOfModulesBase const & pathsAndConsu
     m_initialized = true;
   } else {
     // create a subgraph to match the subprocess
-    auto & graph = m_graph.create_subgraph();
+    auto &graph = m_graph.create_subgraph();
 
     // set the subgraph name property to the subprocess name
     boost::get_property(graph, boost::graph_name) = "cluster" + context.processName();
@@ -279,10 +243,11 @@ DependencyGraph::preBeginJob(PathsAndConsumesOfModulesBase const & pathsAndConsu
   }
 
   // set the vertices properties (use the module id as the global index into the graph)
-  for (edm::ModuleDescription const * module: pathsAndConsumes.allModules()) {
-    m_graph.m_graph[module->id()] = { module->moduleLabel(), module->moduleName(), module->id(), edmModuleTypeEnum(*module), false };
+  for (edm::ModuleDescription const *module : pathsAndConsumes.allModules()) {
+    m_graph.m_graph[module->id()] = {
+        module->moduleLabel(), module->moduleName(), module->id(), edmModuleTypeEnum(*module), false};
 
-    auto & attributes = boost::get(boost::get(boost::vertex_attribute, m_graph), module->id());
+    auto &attributes = boost::get(boost::get(boost::vertex_attribute, m_graph), module->id());
     attributes["label"] = module->moduleLabel();
     attributes["tooltip"] = module->moduleName();
     attributes["shape"] = shapes[static_cast<std::underlying_type_t<EDMModuleType>>(edmModuleTypeEnum(*module))];
@@ -292,39 +257,41 @@ DependencyGraph::preBeginJob(PathsAndConsumesOfModulesBase const & pathsAndConsu
   }
 
   // paths and endpaths
-  auto const & paths = pathsAndConsumes.paths();
-  auto const & endps = pathsAndConsumes.endPaths();
+  auto const &paths = pathsAndConsumes.paths();
+  auto const &endps = pathsAndConsumes.endPaths();
 
   // add graph edges associated to module dependencies
-  for (edm::ModuleDescription const * consumer: pathsAndConsumes.allModules()) {
-    for (edm::ModuleDescription const * module: pathsAndConsumes.modulesWhoseProductsAreConsumedBy(consumer->id())) {
-      edm::LogInfo("DependencyGraph") << "module " << consumer->moduleLabel() << " depends on module " << module->moduleLabel();
+  for (edm::ModuleDescription const *consumer : pathsAndConsumes.allModules()) {
+    for (edm::ModuleDescription const *module : pathsAndConsumes.modulesWhoseProductsAreConsumedBy(consumer->id())) {
+      edm::LogInfo("DependencyGraph") << "module " << consumer->moduleLabel() << " depends on module "
+                                      << module->moduleLabel();
       auto edge_status = boost::add_edge(consumer->id(), module->id(), m_graph);
       // highlight the arrow between highlighted nodes
       if (highlighted(module->moduleLabel()) and highlighted(consumer->moduleLabel())) {
-        auto const & edge = edge_status.first;
-        auto & attributes = boost::get(boost::get(boost::edge_attribute, m_graph), edge);
+        auto const &edge = edge_status.first;
+        auto &attributes = boost::get(boost::get(boost::edge_attribute, m_graph), edge);
         attributes["color"] = "darkgreen";
       }
     }
   }
 
   // marke the modules in the paths as scheduled, and add a soft dependency to reflect the order of modules along each path
-  edm::ModuleDescription const * previous;
+  edm::ModuleDescription const *previous;
   for (unsigned int i = 0; i < paths.size(); ++i) {
     previous = nullptr;
-    for (edm::ModuleDescription const * module: pathsAndConsumes.modulesOnPath(i)) {
+    for (edm::ModuleDescription const *module : pathsAndConsumes.modulesOnPath(i)) {
       m_graph.m_graph[module->id()].scheduled = true;
-      auto & attributes = boost::get(boost::get(boost::vertex_attribute, m_graph), module->id());
+      auto &attributes = boost::get(boost::get(boost::vertex_attribute, m_graph), module->id());
       attributes["fillcolor"] = highlighted(module->moduleLabel()) ? "lightgreen" : "white";
       if (previous and m_showPathDependencies) {
-        edm::LogInfo("DependencyGraph") << "module " << module->moduleLabel() << " follows module " << previous->moduleLabel() << " in Path " << i;
+        edm::LogInfo("DependencyGraph") << "module " << module->moduleLabel() << " follows module "
+                                        << previous->moduleLabel() << " in Path " << i;
         auto edge_status = boost::lookup_edge(module->id(), previous->id(), m_graph);
         bool found = edge_status.second;
         if (not found) {
           edge_status = boost::add_edge(module->id(), previous->id(), m_graph);
-          auto const & edge = edge_status.first;
-          auto & attributes = boost::get(boost::get(boost::edge_attribute, m_graph), edge);
+          auto const &edge = edge_status.first;
+          auto &attributes = boost::get(boost::get(boost::edge_attribute, m_graph), edge);
           attributes["style"] = "dashed";
           // highlight the arrow between highlighted nodes
           if (highlighted(module->moduleLabel()) and highlighted(previous->moduleLabel()))
@@ -336,18 +303,19 @@ DependencyGraph::preBeginJob(PathsAndConsumesOfModulesBase const & pathsAndConsu
   }
   for (unsigned int i = 0; i < endps.size(); ++i) {
     previous = nullptr;
-    for (edm::ModuleDescription const * module: pathsAndConsumes.modulesOnEndPath(i)) {
+    for (edm::ModuleDescription const *module : pathsAndConsumes.modulesOnEndPath(i)) {
       m_graph.m_graph[module->id()].scheduled = true;
-      auto & attributes = boost::get(boost::get(boost::vertex_attribute, m_graph), module->id());
+      auto &attributes = boost::get(boost::get(boost::vertex_attribute, m_graph), module->id());
       attributes["fillcolor"] = highlighted(module->moduleLabel()) ? "lightgreen" : "white";
       if (previous and m_showPathDependencies) {
-        edm::LogInfo("DependencyGraph") << "module " << module->moduleLabel() << " follows module " << previous->moduleLabel() << " in EndPath " << i;
+        edm::LogInfo("DependencyGraph") << "module " << module->moduleLabel() << " follows module "
+                                        << previous->moduleLabel() << " in EndPath " << i;
         auto edge_status = boost::lookup_edge(module->id(), previous->id(), m_graph);
         bool found = edge_status.second;
         if (not found) {
           edge_status = boost::add_edge(module->id(), previous->id(), m_graph);
-          auto const & edge = edge_status.first;
-          auto & attributes = boost::get(boost::get(boost::edge_attribute, m_graph), edge);
+          auto const &edge = edge_status.first;
+          auto &attributes = boost::get(boost::get(boost::edge_attribute, m_graph), edge);
           attributes["style"] = "dashed";
           // highlight the arrow between highlighted nodes
           if (highlighted(module->moduleLabel()) and highlighted(previous->moduleLabel()))
@@ -359,31 +327,23 @@ DependencyGraph::preBeginJob(PathsAndConsumesOfModulesBase const & pathsAndConsu
   }
 }
 
-void
-DependencyGraph::postBeginJob() {
-
+void DependencyGraph::postBeginJob() {
   if (not m_initialized)
     return;
 
   // draw the dependency graph
   std::ofstream out(m_filename);
-  boost::write_graphviz(
-      out,
-      m_graph
-  );
+  boost::write_graphviz(out, m_graph);
   out.close();
 }
 
 namespace edm {
-namespace service {
+  namespace service {
 
-inline
-bool isProcessWideService(DependencyGraph const *) {
-  return true;
-}
+    inline bool isProcessWideService(DependencyGraph const *) { return true; }
 
-} // namespace service
-} // namespace edm
+  }  // namespace service
+}  // namespace edm
 
 // define as a framework servie
 #include "FWCore/ServiceRegistry/interface/ServiceMaker.h"
diff --git a/FWCore/Services/plugins/InitRootHandlers.cc b/FWCore/Services/plugins/InitRootHandlers.cc
index dd12b9aff264e..f3e6dd5cf9ac8 100644
--- a/FWCore/Services/plugins/InitRootHandlers.cc
+++ b/FWCore/Services/plugins/InitRootHandlers.cc
@@ -57,26 +57,23 @@ namespace {
   // size of static buffer allocated for listing module names following a
   // stacktrace abort
   constexpr std::size_t moduleBufferSize = 128;
-}
+}  // namespace
 
 namespace edm {
   class ConfigurationDescriptions;
   class ParameterSet;
   class ActivityRegistry;
-  
+
   namespace service {
     class InitRootHandlers : public RootHandlers {
-      
-      friend int cmssw_stacktrace(void *);
-      
+      friend int cmssw_stacktrace(void*);
+
     public:
       class ThreadTracker : public tbb::task_scheduler_observer {
       public:
         typedef tbb::concurrent_unordered_set<pthread_t> Container_type;
 
-        ThreadTracker() : tbb::task_scheduler_observer() {
-          observe(true);
-        }
+        ThreadTracker() : tbb::task_scheduler_observer() { observe(true); }
         void on_scheduler_entry(bool) override {
           // ensure thread local has been allocated; not necessary on Linux with
           // the current cmsRun linkage, but could be an issue if the platform
@@ -87,23 +84,24 @@ namespace edm {
           threadIDs_.insert(pthread_self());
         }
         const Container_type& IDs() { return threadIDs_; }
-      
+
       private:
         Container_type threadIDs_;
       };
 
       explicit InitRootHandlers(ParameterSet const& pset, ActivityRegistry& iReg);
       ~InitRootHandlers() override;
-      
+
       static void fillDescriptions(ConfigurationDescriptions& descriptions);
       static void stacktraceFromThread();
       static const ThreadTracker::Container_type& threadIDs() { return threadTracker_.IDs(); }
       static int stackTracePause() { return stackTracePause_; }
 
-      static std::vector<std::array<char,moduleBufferSize>> moduleListBuffers_;
+      static std::vector<std::array<char, moduleBufferSize>> moduleListBuffers_;
       static std::atomic<std::size_t> nextModule_, doneModules_;
+
     private:
-      static char *const *getPstackArgv();
+      static char* const* getPstackArgv();
       void enableWarnings_() override;
       void ignoreWarnings_(edm::RootHandlers::SeverityLevel level) override;
       void willBeUsingThreads() override;
@@ -113,7 +111,7 @@ namespace edm {
 
       static const int pidStringLength_ = 200;
       static char pidString_[pidStringLength_];
-      static char * const pstackArgv_[];
+      static char* const pstackArgv_[];
       static int parentToChild_[2];
       static int childToParent_[2];
       static std::unique_ptr<std::thread> helperThread_;
@@ -130,62 +128,55 @@ namespace edm {
       std::shared_ptr<const void> sigTermHandler_;
       std::shared_ptr<const void> sigAbrtHandler_;
     };
-    
-    inline
-    bool isProcessWideService(InitRootHandlers const*) {
-      return true;
-    }
-    
+
+    inline bool isProcessWideService(InitRootHandlers const*) { return true; }
+
   }  // end of namespace service
 }  // end of namespace edm
 
 namespace edm {
   namespace service {
-    int cmssw_stacktrace(void *);
+    int cmssw_stacktrace(void*);
   }
-}
+}  // namespace edm
 
 namespace {
   thread_local edm::RootHandlers::SeverityLevel s_ignoreWarnings = edm::RootHandlers::SeverityLevel::kInfo;
 
   bool s_ignoreEverything = false;
 
-  template<std::size_t SIZE>
-  bool find_if_string(const std::string& search, const std::array<const char* const,SIZE>& substrs){
-    return (std::find_if(substrs.begin(), substrs.end(), [&search](const char* const s) -> bool { return (search.find(s) != std::string::npos); }) != substrs.end());
+  template <std::size_t SIZE>
+  bool find_if_string(const std::string& search, const std::array<const char* const, SIZE>& substrs) {
+    return (std::find_if(substrs.begin(), substrs.end(), [&search](const char* const s) -> bool {
+              return (search.find(s) != std::string::npos);
+            }) != substrs.end());
   }
 
-  constexpr std::array<const char* const,8> in_message{{
-    "no dictionary for class",
-    "already in TClassTable",
-    "matrix not positive definite",
-    "not a TStreamerInfo object",
-    "Problems declaring payload",
-    "Announced number of args different from the real number of argument passed", // Always printed if gDebug>0 - regardless of whether warning message is real.
-    "nbins is <=0 - set to nbins = 1",
-    "nbinsy is <=0 - set to nbinsy = 1"
-  }};
-
-  constexpr std::array<const char* const,6> in_location{{
-    "Fit",
-    "TDecompChol::Solve",
-    "THistPainter::PaintInit",
-    "TUnixSystem::SetDisplay",
-    "TGClient::GetFontByName",
-    "Inverter::Dinv"
-  }};
-
-  constexpr std::array<const char* const,3> in_message_print{{
-    "number of iterations was insufficient",
-    "bad integrand behavior",
-    "integral is divergent, or slowly convergent"
-  }};
+  constexpr std::array<const char* const, 8> in_message{
+      {"no dictionary for class",
+       "already in TClassTable",
+       "matrix not positive definite",
+       "not a TStreamerInfo object",
+       "Problems declaring payload",
+       "Announced number of args different from the real number of argument passed",  // Always printed if gDebug>0 - regardless of whether warning message is real.
+       "nbins is <=0 - set to nbins = 1",
+       "nbinsy is <=0 - set to nbinsy = 1"}};
+
+  constexpr std::array<const char* const, 6> in_location{{"Fit",
+                                                          "TDecompChol::Solve",
+                                                          "THistPainter::PaintInit",
+                                                          "TUnixSystem::SetDisplay",
+                                                          "TGClient::GetFontByName",
+                                                          "Inverter::Dinv"}};
+
+  constexpr std::array<const char* const, 3> in_message_print{{"number of iterations was insufficient",
+                                                               "bad integrand behavior",
+                                                               "integral is divergent, or slowly convergent"}};
 
   void RootErrorHandlerImpl(int level, char const* location, char const* message) {
+    bool die = false;
 
-  bool die = false;
-
-  // Translate ROOT severity level to MessageLogger severity level
+    // Translate ROOT severity level to MessageLogger severity level
 
     edm::RootHandlers::SeverityLevel el_severity = edm::RootHandlers::SeverityLevel::kInfo;
 
@@ -203,20 +194,22 @@ namespace {
       el_severity = edm::RootHandlers::SeverityLevel::kInfo;
     }
 
-  // Adapt C-strings to std::strings
-  // Arrange to report the error location as furnished by Root
+    // Adapt C-strings to std::strings
+    // Arrange to report the error location as furnished by Root
 
     std::string el_location = "@SUB=?";
-    if (location != nullptr) el_location = std::string("@SUB=")+std::string(location);
+    if (location != nullptr)
+      el_location = std::string("@SUB=") + std::string(location);
 
-    std::string el_message  = "?";
-    if (message != nullptr) el_message  = message;
+    std::string el_message = "?";
+    if (message != nullptr)
+      el_message = message;
 
-  // Try to create a meaningful id string using knowledge of ROOT error messages
-  //
-  // id ==     "ROOT-ClassName" where ClassName is the affected class
-  //      else "ROOT/ClassName" where ClassName is the error-declaring class
-  //      else "ROOT"
+    // Try to create a meaningful id string using knowledge of ROOT error messages
+    //
+    // id ==     "ROOT-ClassName" where ClassName is the affected class
+    //      else "ROOT/ClassName" where ClassName is the error-declaring class
+    //      else "ROOT"
 
     std::string el_identifier = "ROOT";
 
@@ -226,9 +219,9 @@ namespace {
       size_t index2 = index1 + precursor.length();
       size_t index3 = el_message.find_first_of(" :", index2);
       if (index3 != std::string::npos) {
-        size_t substrlen = index3-index2;
+        size_t substrlen = index3 - index2;
         el_identifier += "-";
-        el_identifier += el_message.substr(index2,substrlen);
+        el_identifier += el_message.substr(index2, substrlen);
       }
     } else {
       index1 = el_location.find("::");
@@ -238,39 +231,35 @@ namespace {
       }
     }
 
-  // Intercept some messages and upgrade the severity
-
-      if ((el_location.find("TBranchElement::Fill") != std::string::npos)
-       && (el_message.find("fill branch") != std::string::npos)
-       && (el_message.find("address") != std::string::npos)
-       && (el_message.find("not set") != std::string::npos)) {
-        el_severity = edm::RootHandlers::SeverityLevel::kFatal;
-      }
+    // Intercept some messages and upgrade the severity
 
-      if ((el_message.find("Tree branches") != std::string::npos)
-       && (el_message.find("different numbers of entries") != std::string::npos)) {
-        el_severity = edm::RootHandlers::SeverityLevel::kFatal;
-      }
+    if ((el_location.find("TBranchElement::Fill") != std::string::npos) &&
+        (el_message.find("fill branch") != std::string::npos) && (el_message.find("address") != std::string::npos) &&
+        (el_message.find("not set") != std::string::npos)) {
+      el_severity = edm::RootHandlers::SeverityLevel::kFatal;
+    }
 
+    if ((el_message.find("Tree branches") != std::string::npos) &&
+        (el_message.find("different numbers of entries") != std::string::npos)) {
+      el_severity = edm::RootHandlers::SeverityLevel::kFatal;
+    }
 
-  // Intercept some messages and downgrade the severity
+    // Intercept some messages and downgrade the severity
 
-      if (find_if_string(el_message,in_message) ||
-          find_if_string(el_location,in_location) ||
-          (level < kError and (el_location.find("CINTTypedefBuilder::Setup")!= std::string::npos) and (el_message.find("possible entries are in use!") != std::string::npos)))
-      {
-        el_severity = edm::RootHandlers::SeverityLevel::kInfo;
-      }
+    if (find_if_string(el_message, in_message) || find_if_string(el_location, in_location) ||
+        (level < kError and (el_location.find("CINTTypedefBuilder::Setup") != std::string::npos) and
+         (el_message.find("possible entries are in use!") != std::string::npos))) {
+      el_severity = edm::RootHandlers::SeverityLevel::kInfo;
+    }
 
-      // These are a special case because we do not want them to
-      // be fatal, but we do want an error to print.
-      bool alreadyPrinted = false;
-      if (find_if_string(el_message,in_message_print))
-      {
-        el_severity = edm::RootHandlers::SeverityLevel::kInfo;
-        edm::LogError("Root_Error") << el_location << el_message;
-        alreadyPrinted = true;
-      }
+    // These are a special case because we do not want them to
+    // be fatal, but we do want an error to print.
+    bool alreadyPrinted = false;
+    if (find_if_string(el_message, in_message_print)) {
+      el_severity = edm::RootHandlers::SeverityLevel::kInfo;
+      edm::LogError("Root_Error") << el_location << el_message;
+      alreadyPrinted = true;
+    }
 
     if (el_severity == edm::RootHandlers::SeverityLevel::kInfo) {
       // Don't throw if the message is just informational.
@@ -279,19 +268,18 @@ namespace {
       die = true;
     }
 
-  // Feed the message to the MessageLogger and let it choose to suppress or not.
+    // Feed the message to the MessageLogger and let it choose to suppress or not.
 
-  // Root has declared a fatal error.  Throw an EDMException unless the
-  // message corresponds to a pending signal. In that case, do not throw
-  // but let the OS deal with the signal in the usual way.
+    // Root has declared a fatal error.  Throw an EDMException unless the
+    // message corresponds to a pending signal. In that case, do not throw
+    // but let the OS deal with the signal in the usual way.
     if (die && (el_location != std::string("@SUB=TUnixSystem::DispatchSignals"))) {
-       std::ostringstream sstr;
-       sstr << "Fatal Root Error: " << el_location << "\n" << el_message << '\n';
-       edm::Exception except(edm::errors::FatalRootError, sstr.str());
-       except.addAdditionalInfo(except.message());
-       except.clearMessage();
-       throw except;
-     
+      std::ostringstream sstr;
+      sstr << "Fatal Root Error: " << el_location << "\n" << el_message << '\n';
+      edm::Exception except(edm::errors::FatalRootError, sstr.str());
+      except.addAdditionalInfo(except.message());
+      except.clearMessage();
+      throw except;
     }
 
     // Typically, we get here only for informational messages,
@@ -305,9 +293,9 @@ namespace {
       } else if (el_severity == edm::RootHandlers::SeverityLevel::kError) {
         edm::LogError("Root_Error") << el_location << el_message;
       } else if (el_severity == edm::RootHandlers::SeverityLevel::kWarning) {
-        edm::LogWarning("Root_Warning") << el_location << el_message ;
+        edm::LogWarning("Root_Warning") << el_location << el_message;
       } else if (el_severity == edm::RootHandlers::SeverityLevel::kInfo) {
-        edm::LogInfo("Root_Information") << el_location << el_message ;
+        edm::LogInfo("Root_Information") << el_location << el_message;
       }
     }
   }
@@ -317,116 +305,104 @@ namespace {
   }
 
   extern "C" {
-    void set_default_signals() {
-      signal(SIGILL, SIG_DFL);
-      signal(SIGSEGV, SIG_DFL);
-      signal(SIGBUS, SIG_DFL);
-      signal(SIGTERM, SIG_DFL);
-      signal(SIGABRT, SIG_DFL);
-    }
+  void set_default_signals() {
+    signal(SIGILL, SIG_DFL);
+    signal(SIGSEGV, SIG_DFL);
+    signal(SIGBUS, SIG_DFL);
+    signal(SIGTERM, SIG_DFL);
+    signal(SIGABRT, SIG_DFL);
+  }
 
-    static int full_write(int fd, const char *text)
-    {
-      const char *buffer = text;
-      size_t count = strlen(text);
-      ssize_t written = 0;
-      while (count)
-      {
-        written = write(fd, buffer, count);
-        if (written == -1) 
-        {
-          if (errno == EINTR) {continue;}
-          else {return -errno;}
+  static int full_write(int fd, const char* text) {
+    const char* buffer = text;
+    size_t count = strlen(text);
+    ssize_t written = 0;
+    while (count) {
+      written = write(fd, buffer, count);
+      if (written == -1) {
+        if (errno == EINTR) {
+          continue;
+        } else {
+          return -errno;
         }
-        count -= written;
-        buffer += written;
       }
-      return 0;
+      count -= written;
+      buffer += written;
     }
+    return 0;
+  }
 
-    static int full_read(int fd, char *inbuf, size_t len, int timeout_s=-1)
-    {
-      char *buf = inbuf;
-      size_t count = len;
-      ssize_t complete = 0;
-      std::chrono::time_point<std::chrono::steady_clock> end_time = std::chrono::steady_clock::now() + std::chrono::seconds(timeout_s);
-      int flags;
-      if (timeout_s < 0)
-      {
-        flags = O_NONBLOCK;  // Prevents us from trying to set / restore flags later.
-      }
-      else if ((-1 == (flags = fcntl(fd, F_GETFL))))
-      {
+  static int full_read(int fd, char* inbuf, size_t len, int timeout_s = -1) {
+    char* buf = inbuf;
+    size_t count = len;
+    ssize_t complete = 0;
+    std::chrono::time_point<std::chrono::steady_clock> end_time =
+        std::chrono::steady_clock::now() + std::chrono::seconds(timeout_s);
+    int flags;
+    if (timeout_s < 0) {
+      flags = O_NONBLOCK;  // Prevents us from trying to set / restore flags later.
+    } else if ((-1 == (flags = fcntl(fd, F_GETFL)))) {
+      return -errno;
+    }
+    if ((flags & O_NONBLOCK) != O_NONBLOCK) {
+      if (-1 == fcntl(fd, F_SETFL, flags | O_NONBLOCK)) {
         return -errno;
       }
-      if ((flags & O_NONBLOCK) != O_NONBLOCK)
-      {
-        if (-1 == fcntl(fd, F_SETFL, flags | O_NONBLOCK))
-        {
-          return -errno;
-        }
-      }
-      while (count)
-      {
-        if (timeout_s >= 0)
-        {
-          struct pollfd poll_info{fd, POLLIN, 0};
-          int ms_remaining = std::chrono::duration_cast<std::chrono::milliseconds>(end_time-std::chrono::steady_clock::now()).count();
-          if (ms_remaining > 0)
-          {
-            int rc = poll(&poll_info, 1, ms_remaining);
-            if (rc <= 0)
-            {
-              if (rc < 0) {
-                if (errno == EINTR || errno == EAGAIN) { continue; }
-                rc = -errno;
-              } else {
-                rc = -ETIMEDOUT;
-              }
-              if ((flags & O_NONBLOCK) != O_NONBLOCK)
-              {
-                fcntl(fd, F_SETFL, flags);
+    }
+    while (count) {
+      if (timeout_s >= 0) {
+        struct pollfd poll_info {
+          fd, POLLIN, 0
+        };
+        int ms_remaining =
+            std::chrono::duration_cast<std::chrono::milliseconds>(end_time - std::chrono::steady_clock::now()).count();
+        if (ms_remaining > 0) {
+          int rc = poll(&poll_info, 1, ms_remaining);
+          if (rc <= 0) {
+            if (rc < 0) {
+              if (errno == EINTR || errno == EAGAIN) {
+                continue;
               }
-              return rc;
+              rc = -errno;
+            } else {
+              rc = -ETIMEDOUT;
             }
-          }
-          else if (ms_remaining < 0)
-          {
-            if ((flags & O_NONBLOCK) != O_NONBLOCK)
-            {
+            if ((flags & O_NONBLOCK) != O_NONBLOCK) {
               fcntl(fd, F_SETFL, flags);
             }
-            return -ETIMEDOUT;
+            return rc;
           }
-        }
-        complete = read(fd, buf, count);
-        if (complete == -1)
-        {
-          if (errno == EINTR) {continue;}
-          else if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) {continue;}
-          else
-          {
-            int orig_errno = errno;
-            if ((flags & O_NONBLOCK) != O_NONBLOCK)
-            {
-              fcntl(fd, F_SETFL, flags);
-            }
-            return -orig_errno;
+        } else if (ms_remaining < 0) {
+          if ((flags & O_NONBLOCK) != O_NONBLOCK) {
+            fcntl(fd, F_SETFL, flags);
           }
+          return -ETIMEDOUT;
         }
-        count -= complete;
-        buf += complete;
       }
-      if ((flags & O_NONBLOCK) != O_NONBLOCK) {
-        fcntl(fd, F_SETFL, flags);
+      complete = read(fd, buf, count);
+      if (complete == -1) {
+        if (errno == EINTR) {
+          continue;
+        } else if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) {
+          continue;
+        } else {
+          int orig_errno = errno;
+          if ((flags & O_NONBLOCK) != O_NONBLOCK) {
+            fcntl(fd, F_SETFL, flags);
+          }
+          return -orig_errno;
+        }
       }
-      return 0;
+      count -= complete;
+      buf += complete;
     }
-
-    static int full_cerr_write(const char *text)
-    {
-      return full_write(2, text);
+    if ((flags & O_NONBLOCK) != O_NONBLOCK) {
+      fcntl(fd, F_SETFL, flags);
     }
+    return 0;
+  }
+
+  static int full_cerr_write(const char* text) { return full_write(2, text); }
 
 // these signals are only used inside the stacktrace signal handler,
 // so common signals can be used.  They do have to be different, since
@@ -434,199 +410,202 @@ namespace {
 // cause sleep() to return early.
 #if defined(SIGRTMAX)
 #define PAUSE_SIGNAL SIGRTMAX
-#define RESUME_SIGNAL SIGRTMAX-1
-#elif defined(SIGINFO) // macOS/BSD
+#define RESUME_SIGNAL SIGRTMAX - 1
+#elif defined(SIGINFO)  // macOS/BSD
 #define PAUSE_SIGNAL SIGINFO
 #define RESUME_SIGNAL SIGALRM
 #endif
 
-    // does nothing, here only to interrupt the sleep() in the pause handler
-    void sig_resume_handler(int sig, siginfo_t*, void*) {}
+  // does nothing, here only to interrupt the sleep() in the pause handler
+  void sig_resume_handler(int sig, siginfo_t*, void*) {}
 
-    // pause a thread so that a (slow) stacktrace will capture the current state
-    void sig_pause_for_stacktrace(int sig, siginfo_t*, void*) {
-      using namespace edm::service;
+  // pause a thread so that a (slow) stacktrace will capture the current state
+  void sig_pause_for_stacktrace(int sig, siginfo_t*, void*) {
+    using namespace edm::service;
 
 #ifdef RESUME_SIGNAL
-      sigset_t sigset;
-      sigemptyset(&sigset);
-      sigaddset(&sigset, RESUME_SIGNAL);
-      pthread_sigmask(SIG_UNBLOCK, &sigset, nullptr);
+    sigset_t sigset;
+    sigemptyset(&sigset);
+    sigaddset(&sigset, RESUME_SIGNAL);
+    pthread_sigmask(SIG_UNBLOCK, &sigset, nullptr);
 #endif
-      // sleep interrrupts on a handled delivery of the resume signal
-      sleep(InitRootHandlers::stackTracePause());
-
-      if (InitRootHandlers::doneModules_.is_lock_free() && InitRootHandlers::nextModule_.is_lock_free()) {
-        auto i = InitRootHandlers::nextModule_++;
-        if (i < InitRootHandlers::moduleListBuffers_.size()) {
-          char* buff = InitRootHandlers::moduleListBuffers_[i].data();
-        
-          strlcpy(buff, "\nModule: ", moduleBufferSize);
-          if (edm::CurrentModuleOnThread::getCurrentModuleOnThread() != nullptr) {
-            strlcat(buff, edm::CurrentModuleOnThread::getCurrentModuleOnThread()->moduleDescription()->moduleName().c_str(), moduleBufferSize);
-            strlcat(buff, ":", moduleBufferSize);
-            strlcat(buff, edm::CurrentModuleOnThread::getCurrentModuleOnThread()->moduleDescription()->moduleLabel().c_str(), moduleBufferSize);
-          } else {
-            strlcat(buff, "none", moduleBufferSize);
-          }
-          ++edm::service::InitRootHandlers::doneModules_;
+    // sleep interrrupts on a handled delivery of the resume signal
+    sleep(InitRootHandlers::stackTracePause());
+
+    if (InitRootHandlers::doneModules_.is_lock_free() && InitRootHandlers::nextModule_.is_lock_free()) {
+      auto i = InitRootHandlers::nextModule_++;
+      if (i < InitRootHandlers::moduleListBuffers_.size()) {
+        char* buff = InitRootHandlers::moduleListBuffers_[i].data();
+
+        strlcpy(buff, "\nModule: ", moduleBufferSize);
+        if (edm::CurrentModuleOnThread::getCurrentModuleOnThread() != nullptr) {
+          strlcat(buff,
+                  edm::CurrentModuleOnThread::getCurrentModuleOnThread()->moduleDescription()->moduleName().c_str(),
+                  moduleBufferSize);
+          strlcat(buff, ":", moduleBufferSize);
+          strlcat(buff,
+                  edm::CurrentModuleOnThread::getCurrentModuleOnThread()->moduleDescription()->moduleLabel().c_str(),
+                  moduleBufferSize);
+        } else {
+          strlcat(buff, "none", moduleBufferSize);
         }
+        ++edm::service::InitRootHandlers::doneModules_;
       }
     }
+  }
 
-    void sig_dostack_then_abort(int sig, siginfo_t*, void*) {
-      using namespace edm::service;
+  void sig_dostack_then_abort(int sig, siginfo_t*, void*) {
+    using namespace edm::service;
 
-      const auto& tids = InitRootHandlers::threadIDs();
+    const auto& tids = InitRootHandlers::threadIDs();
 
-      const auto self = pthread_self();
+    const auto self = pthread_self();
 #ifdef PAUSE_SIGNAL
-      if (InitRootHandlers::stackTracePause() > 0 && tids.size() > 1) {
-        // install the "pause" handler
-        struct sigaction act;
-        act.sa_sigaction = sig_pause_for_stacktrace;
-        act.sa_flags = 0;
-        sigemptyset(&act.sa_mask);
-        sigaction(PAUSE_SIGNAL, &act, nullptr);
-
-        // unblock pause signal globally, resume is unblocked in the pause handler
-        sigset_t pausesigset;
-        sigemptyset(&pausesigset);
-        sigaddset(&pausesigset, PAUSE_SIGNAL);
-        sigprocmask(SIG_UNBLOCK, &pausesigset, nullptr);
-
-        // send a pause signal to all CMSSW/TBB threads other than self
-        for (auto id : tids) {
-          if (self != id) {
-            pthread_kill(id, PAUSE_SIGNAL);
-          }
+    if (InitRootHandlers::stackTracePause() > 0 && tids.size() > 1) {
+      // install the "pause" handler
+      struct sigaction act;
+      act.sa_sigaction = sig_pause_for_stacktrace;
+      act.sa_flags = 0;
+      sigemptyset(&act.sa_mask);
+      sigaction(PAUSE_SIGNAL, &act, nullptr);
+
+      // unblock pause signal globally, resume is unblocked in the pause handler
+      sigset_t pausesigset;
+      sigemptyset(&pausesigset);
+      sigaddset(&pausesigset, PAUSE_SIGNAL);
+      sigprocmask(SIG_UNBLOCK, &pausesigset, nullptr);
+
+      // send a pause signal to all CMSSW/TBB threads other than self
+      for (auto id : tids) {
+        if (self != id) {
+          pthread_kill(id, PAUSE_SIGNAL);
         }
+      }
 
 #ifdef RESUME_SIGNAL
-        // install the "resume" handler
-        act.sa_sigaction = sig_resume_handler;
-        sigaction(RESUME_SIGNAL, &act, nullptr);
+      // install the "resume" handler
+      act.sa_sigaction = sig_resume_handler;
+      sigaction(RESUME_SIGNAL, &act, nullptr);
 #endif
-      }
+    }
 #endif
 
-      const char* signalname = "unknown";
-      switch (sig) {
-        case SIGBUS:
-        {
-          signalname = "bus error";
-          break;
-        }
-        case SIGSEGV:
-        {
-          signalname = "segmentation violation";
-          break;
-        }
-        case SIGILL:
-        {
-          signalname = "illegal instruction";
-          break;
-        }
-        case SIGTERM:
-        {
-          signalname = "external termination request";
-          break;
-        }
-        case SIGABRT:
-        {
-          signalname = "abort signal";
-          break;
-        }
-        default:
-          break;
+    const char* signalname = "unknown";
+    switch (sig) {
+      case SIGBUS: {
+        signalname = "bus error";
+        break;
+      }
+      case SIGSEGV: {
+        signalname = "segmentation violation";
+        break;
       }
-      full_cerr_write("\n\nA fatal system signal has occurred: ");
-      full_cerr_write(signalname);
-      full_cerr_write("\nThe following is the call stack containing the origin of the signal.\n\n");
+      case SIGILL: {
+        signalname = "illegal instruction";
+        break;
+      }
+      case SIGTERM: {
+        signalname = "external termination request";
+        break;
+      }
+      case SIGABRT: {
+        signalname = "abort signal";
+        break;
+      }
+      default:
+        break;
+    }
+    full_cerr_write("\n\nA fatal system signal has occurred: ");
+    full_cerr_write(signalname);
+    full_cerr_write("\nThe following is the call stack containing the origin of the signal.\n\n");
 
-      edm::service::InitRootHandlers::stacktraceFromThread();
- 
-      // resume the signal handlers to store the current module; we are not guaranteed they
-      // will have time to store their modules, so there is a race condition; this could be
-      // avoided by storing the module information before sleeping, a change that may be
-      // made when we're convinced accessing the thread-local current module is safe.
+    edm::service::InitRootHandlers::stacktraceFromThread();
+
+    // resume the signal handlers to store the current module; we are not guaranteed they
+    // will have time to store their modules, so there is a race condition; this could be
+    // avoided by storing the module information before sleeping, a change that may be
+    // made when we're convinced accessing the thread-local current module is safe.
 #ifdef RESUME_SIGNAL
-      std::size_t notified = 0;
-      if (InitRootHandlers::stackTracePause() > 0 && tids.size() > 1) {
-        for (auto id : tids) {
-          if (self != id) {
-            if (pthread_kill(id, RESUME_SIGNAL) == 0) ++notified;
-          }
+    std::size_t notified = 0;
+    if (InitRootHandlers::stackTracePause() > 0 && tids.size() > 1) {
+      for (auto id : tids) {
+        if (self != id) {
+          if (pthread_kill(id, RESUME_SIGNAL) == 0)
+            ++notified;
         }
       }
+    }
 #endif
 
-      full_cerr_write("\nCurrent Modules:\n");
-
-      // Checking tids.count(self) ensures that we only try to access the current module in
-      // CMSSW/TBB threads.  Those threads access the thread-local current module at the same
-      // time the thread is registered, so any lazy allocation will have been done at that
-      // point.  Not necessary on Linux with the current cmsRun linkage, as the thread-local
-      // is allocated at exec time, not lazily.
-      if (tids.count(self) > 0) {
-        char buff[moduleBufferSize] = "\nModule: ";
-        if (edm::CurrentModuleOnThread::getCurrentModuleOnThread() != nullptr) {
-          strlcat(buff, edm::CurrentModuleOnThread::getCurrentModuleOnThread()->moduleDescription()->moduleName().c_str(), moduleBufferSize);
-          strlcat(buff, ":", moduleBufferSize);
-          strlcat(buff, edm::CurrentModuleOnThread::getCurrentModuleOnThread()->moduleDescription()->moduleLabel().c_str(), moduleBufferSize);
-        } else {
-          strlcat(buff, "none", moduleBufferSize);
-        }
-        strlcat(buff, " (crashed)", moduleBufferSize);
-        full_cerr_write(buff);
+    full_cerr_write("\nCurrent Modules:\n");
+
+    // Checking tids.count(self) ensures that we only try to access the current module in
+    // CMSSW/TBB threads.  Those threads access the thread-local current module at the same
+    // time the thread is registered, so any lazy allocation will have been done at that
+    // point.  Not necessary on Linux with the current cmsRun linkage, as the thread-local
+    // is allocated at exec time, not lazily.
+    if (tids.count(self) > 0) {
+      char buff[moduleBufferSize] = "\nModule: ";
+      if (edm::CurrentModuleOnThread::getCurrentModuleOnThread() != nullptr) {
+        strlcat(buff,
+                edm::CurrentModuleOnThread::getCurrentModuleOnThread()->moduleDescription()->moduleName().c_str(),
+                moduleBufferSize);
+        strlcat(buff, ":", moduleBufferSize);
+        strlcat(buff,
+                edm::CurrentModuleOnThread::getCurrentModuleOnThread()->moduleDescription()->moduleLabel().c_str(),
+                moduleBufferSize);
       } else {
-        full_cerr_write("\nModule: non-CMSSW (crashed)");
+        strlcat(buff, "none", moduleBufferSize);
       }
+      strlcat(buff, " (crashed)", moduleBufferSize);
+      full_cerr_write(buff);
+    } else {
+      full_cerr_write("\nModule: non-CMSSW (crashed)");
+    }
 
 #ifdef PAUSE_SIGNAL
-      // wait a short interval for the paused threads to resume and fill in their module
-      // information, then print
-      if (InitRootHandlers::doneModules_.is_lock_free()) {
-        int spincount = 0;
-        timespec t = { 0, 1000 };
-        while (++spincount < 1000 && InitRootHandlers::doneModules_ < notified) { nanosleep(&t, nullptr); }
-        for (std::size_t i = 0; i < InitRootHandlers::doneModules_; ++i) {
-          full_cerr_write(InitRootHandlers::moduleListBuffers_[i].data());
-        }
+    // wait a short interval for the paused threads to resume and fill in their module
+    // information, then print
+    if (InitRootHandlers::doneModules_.is_lock_free()) {
+      int spincount = 0;
+      timespec t = {0, 1000};
+      while (++spincount < 1000 && InitRootHandlers::doneModules_ < notified) {
+        nanosleep(&t, nullptr);
       }
-#endif
-
-      full_cerr_write("\n\nA fatal system signal has occurred: ");
-      full_cerr_write(signalname);
-      full_cerr_write("\n");
-
-      // For these five known cases, re-raise the signal to get the correct
-      // exit code.
-      if ((sig == SIGILL) || (sig == SIGSEGV) || (sig == SIGBUS) || (sig == SIGTERM) || (sig == SIGABRT))
-      {
-        signal(sig, SIG_DFL);
-        raise(sig);
-      }
-      else
-      {
-        set_default_signals();
-        ::abort();
+      for (std::size_t i = 0; i < InitRootHandlers::doneModules_; ++i) {
+        full_cerr_write(InitRootHandlers::moduleListBuffers_[i].data());
       }
     }
-    
-    void sig_abort(int sig, siginfo_t*, void*) {
-      full_cerr_write("\n\nFatal system signal has occurred during exit\n");
+#endif
+
+    full_cerr_write("\n\nA fatal system signal has occurred: ");
+    full_cerr_write(signalname);
+    full_cerr_write("\n");
 
-      // re-raise the signal to get the correct exit code
+    // For these five known cases, re-raise the signal to get the correct
+    // exit code.
+    if ((sig == SIGILL) || (sig == SIGSEGV) || (sig == SIGBUS) || (sig == SIGTERM) || (sig == SIGABRT)) {
       signal(sig, SIG_DFL);
       raise(sig);
-
-      // shouldn't get here
+    } else {
       set_default_signals();
-      ::sleep(10);
       ::abort();
     }
   }
+
+  void sig_abort(int sig, siginfo_t*, void*) {
+    full_cerr_write("\n\nFatal system signal has occurred during exit\n");
+
+    // re-raise the signal to get the correct exit code
+    signal(sig, SIG_DFL);
+    raise(sig);
+
+    // shouldn't get here
+    set_default_signals();
+    ::sleep(10);
+    ::abort();
+  }
+  }
 }  // end of unnamed namespace
 
 namespace edm {
@@ -640,17 +619,15 @@ namespace edm {
      */
     static void cmssw_stacktrace_fork();
 
-    void InitRootHandlers::stacktraceHelperThread()
-    {
+    void InitRootHandlers::stacktraceHelperThread() {
       int toParent = childToParent_[1];
       int fromParent = parentToChild_[0];
-      char buf[2]; buf[1] = '\0';
+      char buf[2];
+      buf[1] = '\0';
 
-      while(true)
-      {
+      while (true) {
         int result = full_read(fromParent, buf, 1);
-        if (result < 0)
-        {
+        if (result < 0) {
           // To avoid a deadlock (this function is NOT re-entrant), reset signals
           // We never set them back to the CMSSW handler because we assume the parent
           // thread will abort for us.
@@ -661,27 +638,20 @@ namespace edm {
           full_cerr_write("\n");
           ::abort();
         }
-        if (buf[0] == '1')
-        {
+        if (buf[0] == '1') {
           set_default_signals();
           cmssw_stacktrace_fork();
           full_write(toParent, buf);
-        }
-        else if (buf[0] == '2')
-        {
+        } else if (buf[0] == '2') {
           // We have just finished forking.  Reload the file descriptors for thread
           // communication.
           close(toParent);
           close(fromParent);
           toParent = childToParent_[1];
           fromParent = parentToChild_[0];
-        }
-        else if (buf[0] == '3')
-        {
+        } else if (buf[0] == '3') {
           break;
-        }
-        else
-        {
+        } else {
           set_default_signals();
           close(toParent);
           full_cerr_write("\n\nTraceback helper thread got unknown command from parent: ");
@@ -692,26 +662,21 @@ namespace edm {
       }
     }
 
-    void InitRootHandlers::stacktraceFromThread()
-    {
+    void InitRootHandlers::stacktraceFromThread() {
       int result = full_write(parentToChild_[1], "1");
-      if (result < 0)
-      {
+      if (result < 0) {
         full_cerr_write("\n\nAttempt to request stacktrace failed: ");
         full_cerr_write(strerror(-result));
         full_cerr_write("\n");
         return;
       }
-      char buf[2]; buf[1] = '\0';
-      if ((result = full_read(childToParent_[0], buf, 1, 5*60)) < 0)
-      {
+      char buf[2];
+      buf[1] = '\0';
+      if ((result = full_read(childToParent_[0], buf, 1, 5 * 60)) < 0) {
         full_cerr_write("\n\nWaiting for stacktrace completion failed: ");
-        if (result == -ETIMEDOUT)
-        {
+        if (result == -ETIMEDOUT) {
           full_cerr_write("timed out waiting for GDB to complete.");
-        }
-        else
-        {
+        } else {
           full_cerr_write(strerror(-result));
         }
         full_cerr_write("\n");
@@ -719,45 +684,41 @@ namespace edm {
       }
     }
 
-    void cmssw_stacktrace_fork()
-    {
-      char child_stack[4*1024];
-      char *child_stack_ptr = child_stack + 4*1024;
-        // On Linux, we currently use jemalloc.  This registers pthread_atfork handlers; these
-        // handlers are *not* async-signal safe.  Hence, a deadlock is possible if we invoke
-        // fork() from our signal handlers.  Accordingly, we use clone (not POSIX, but AS-safe)
-        // as that is closer to the 'raw metal' syscall and avoids pthread_atfork handlers.
+    void cmssw_stacktrace_fork() {
+      char child_stack[4 * 1024];
+      char* child_stack_ptr = child_stack + 4 * 1024;
+      // On Linux, we currently use jemalloc.  This registers pthread_atfork handlers; these
+      // handlers are *not* async-signal safe.  Hence, a deadlock is possible if we invoke
+      // fork() from our signal handlers.  Accordingly, we use clone (not POSIX, but AS-safe)
+      // as that is closer to the 'raw metal' syscall and avoids pthread_atfork handlers.
       int pid =
 #ifdef __linux__
-        clone(edm::service::cmssw_stacktrace, child_stack_ptr, CLONE_VM|CLONE_FS|SIGCHLD, nullptr);
+          clone(edm::service::cmssw_stacktrace, child_stack_ptr, CLONE_VM | CLONE_FS | SIGCHLD, nullptr);
 #else
-        fork();
-      if (child_stack_ptr) {} // Suppress 'unused variable' warning on non-Linux
-      if (pid == 0) { edm::service::cmssw_stacktrace(nullptr); }
+          fork();
+      if (child_stack_ptr) {
+      }  // Suppress 'unused variable' warning on non-Linux
+      if (pid == 0) {
+        edm::service::cmssw_stacktrace(nullptr);
+      }
 #endif
-      if (pid == -1)
-      {
+      if (pid == -1) {
         full_cerr_write("(Attempt to perform stack dump failed.)\n");
-      }
-      else
-      {
+      } else {
         int status;
-        if (waitpid(pid, &status, 0) == -1)
-        {
+        if (waitpid(pid, &status, 0) == -1) {
           full_cerr_write("(Failed to wait on stack dump output.)\n");
         }
-        if (status)
-        {
+        if (status) {
           full_cerr_write("(GDB stack trace failed unexpectedly)\n");
         }
       }
     }
 
-    int cmssw_stacktrace(void * /*arg*/)
-    {
+    int cmssw_stacktrace(void* /*arg*/) {
       set_default_signals();
 
-      char *const *argv = edm::service::InitRootHandlers::getPstackArgv();
+      char* const* argv = edm::service::InitRootHandlers::getPstackArgv();
       // NOTE: this is NOT async-signal-safe at CERN's lxplus service.
       // CERN uses LD_PRELOAD to replace execv with a function from libsnoopy which
       // calls dlsym.
@@ -769,31 +730,29 @@ namespace edm {
       ::abort();
       return 1;
     }
-    
+
     static char pstackName[] = "(CMSSW stack trace helper)";
     static char dashC[] = "-c";
     char InitRootHandlers::pidString_[InitRootHandlers::pidStringLength_] = {};
-    char * const InitRootHandlers::pstackArgv_[] = {pstackName, dashC, InitRootHandlers::pidString_, nullptr};
+    char* const InitRootHandlers::pstackArgv_[] = {pstackName, dashC, InitRootHandlers::pidString_, nullptr};
     int InitRootHandlers::parentToChild_[2] = {-1, -1};
     int InitRootHandlers::childToParent_[2] = {-1, -1};
     std::unique_ptr<std::thread> InitRootHandlers::helperThread_;
     int InitRootHandlers::stackTracePause_ = 300;
-    std::vector<std::array<char,moduleBufferSize>> InitRootHandlers::moduleListBuffers_;
+    std::vector<std::array<char, moduleBufferSize>> InitRootHandlers::moduleListBuffers_;
     std::atomic<std::size_t> InitRootHandlers::nextModule_(0), InitRootHandlers::doneModules_(0);
     InitRootHandlers::ThreadTracker InitRootHandlers::threadTracker_;
-    
-
-    InitRootHandlers::InitRootHandlers (ParameterSet const& pset, ActivityRegistry& iReg)
-      : RootHandlers(),
-        unloadSigHandler_(pset.getUntrackedParameter<bool> ("UnloadRootSigHandler")),
-        resetErrHandler_(pset.getUntrackedParameter<bool> ("ResetRootErrHandler")),
-        loadAllDictionaries_(pset.getUntrackedParameter<bool>("LoadAllDictionaries")),
-        autoLibraryLoader_(loadAllDictionaries_ or pset.getUntrackedParameter<bool> ("AutoLibraryLoader"))
-    {
-      stackTracePause_ = pset.getUntrackedParameter<int> ("StackTracePauseTime");
-      
-      if(unloadSigHandler_) {
-      // Deactivate all the Root signal handlers and restore the system defaults
+
+    InitRootHandlers::InitRootHandlers(ParameterSet const& pset, ActivityRegistry& iReg)
+        : RootHandlers(),
+          unloadSigHandler_(pset.getUntrackedParameter<bool>("UnloadRootSigHandler")),
+          resetErrHandler_(pset.getUntrackedParameter<bool>("ResetRootErrHandler")),
+          loadAllDictionaries_(pset.getUntrackedParameter<bool>("LoadAllDictionaries")),
+          autoLibraryLoader_(loadAllDictionaries_ or pset.getUntrackedParameter<bool>("AutoLibraryLoader")) {
+      stackTracePause_ = pset.getUntrackedParameter<int>("StackTracePauseTime");
+
+      if (unloadSigHandler_) {
+        // Deactivate all the Root signal handlers and restore the system defaults
         gSystem->ResetSignal(kSigChild);
         gSystem->ResetSignal(kSigBus);
         gSystem->ResetSignal(kSigSegmentationViolation);
@@ -804,7 +763,7 @@ namespace edm {
         gSystem->ResetSignal(kSigUrgent);
         gSystem->ResetSignal(kSigFloatingException);
         gSystem->ResetSignal(kSigWindowChanged);
-      } else if(pset.getUntrackedParameter<bool>("AbortOnSignal")){
+      } else if (pset.getUntrackedParameter<bool>("AbortOnSignal")) {
         cachePidInfo();
 
         //NOTE: ROOT can also be told to abort on these kinds of problems BUT
@@ -812,42 +771,33 @@ namespace edm {
         gSystem->ResetSignal(kSigBus);
         gSystem->ResetSignal(kSigSegmentationViolation);
         gSystem->ResetSignal(kSigIllegalInstruction);
-        installCustomHandler(SIGBUS,sig_dostack_then_abort);
-        sigBusHandler_ = std::shared_ptr<const void>(nullptr,[](void*) {
-          installCustomHandler(SIGBUS,sig_abort);
-        });
-        installCustomHandler(SIGSEGV,sig_dostack_then_abort);
-        sigSegvHandler_ = std::shared_ptr<const void>(nullptr,[](void*) {
-          installCustomHandler(SIGSEGV,sig_abort);
-        });
-        installCustomHandler(SIGILL,sig_dostack_then_abort);
-        sigIllHandler_ = std::shared_ptr<const void>(nullptr,[](void*) {
-          installCustomHandler(SIGILL,sig_abort);
-        });
-        installCustomHandler(SIGTERM,sig_dostack_then_abort);
-        sigTermHandler_ = std::shared_ptr<const void>(nullptr,[](void*) {
-          installCustomHandler(SIGTERM,sig_abort);
-        });
-        installCustomHandler(SIGABRT,sig_dostack_then_abort);
-        sigAbrtHandler_ = std::shared_ptr<const void>(nullptr,[](void*) {
-          signal(SIGABRT,SIG_DFL); // release SIGABRT to default
+        installCustomHandler(SIGBUS, sig_dostack_then_abort);
+        sigBusHandler_ = std::shared_ptr<const void>(nullptr, [](void*) { installCustomHandler(SIGBUS, sig_abort); });
+        installCustomHandler(SIGSEGV, sig_dostack_then_abort);
+        sigSegvHandler_ = std::shared_ptr<const void>(nullptr, [](void*) { installCustomHandler(SIGSEGV, sig_abort); });
+        installCustomHandler(SIGILL, sig_dostack_then_abort);
+        sigIllHandler_ = std::shared_ptr<const void>(nullptr, [](void*) { installCustomHandler(SIGILL, sig_abort); });
+        installCustomHandler(SIGTERM, sig_dostack_then_abort);
+        sigTermHandler_ = std::shared_ptr<const void>(nullptr, [](void*) { installCustomHandler(SIGTERM, sig_abort); });
+        installCustomHandler(SIGABRT, sig_dostack_then_abort);
+        sigAbrtHandler_ = std::shared_ptr<const void>(nullptr, [](void*) {
+          signal(SIGABRT, SIG_DFL);  // release SIGABRT to default
         });
       }
 
-      iReg.watchPreallocate([](edm::service::SystemBounds const& iBounds){
+      iReg.watchPreallocate([](edm::service::SystemBounds const& iBounds) {
         if (iBounds.maxNumberOfThreads() > moduleListBuffers_.size()) {
           moduleListBuffers_.resize(iBounds.maxNumberOfThreads());
         }
       });
 
-      if(resetErrHandler_) {
-
-      // Replace the Root error handler with one that uses the MessageLogger
+      if (resetErrHandler_) {
+        // Replace the Root error handler with one that uses the MessageLogger
         SetErrorHandler(RootErrorHandler);
       }
 
       // Enable automatic Root library loading.
-      if(autoLibraryLoader_) {
+      if (autoLibraryLoader_) {
         gInterpreter->SetClassAutoloading(1);
       }
 
@@ -860,13 +810,13 @@ namespace edm {
       setRefCoreStreamerInTClass();
 
       // Load the library containing dictionaries for std:: classes, if not already loaded.
-      if (!hasDictionary(typeid(std::vector<std::vector<unsigned int> >))) {
-         TypeWithDict::byName("std::vector<std::vector<unsigned int> >");
+      if (!hasDictionary(typeid(std::vector<std::vector<unsigned int>>))) {
+        TypeWithDict::byName("std::vector<std::vector<unsigned int> >");
       }
 
       int debugLevel = pset.getUntrackedParameter<int>("DebugLevel");
-      if(debugLevel >0) {
-	gDebug = debugLevel;
+      if (debugLevel > 0) {
+        gDebug = debugLevel;
       }
 
       // Enable Root implicit multi-threading
@@ -876,13 +826,13 @@ namespace edm {
       }
     }
 
-    InitRootHandlers::~InitRootHandlers () {
+    InitRootHandlers::~InitRootHandlers() {
       // close all open ROOT files
       TIter iter(gROOT->GetListOfFiles());
-      TObject *obj = nullptr;
-      while(nullptr != (obj = iter.Next())) {
+      TObject* obj = nullptr;
+      while (nullptr != (obj = iter.Next())) {
         TFile* f = dynamic_cast<TFile*>(obj);
-        if(f) {
+        if (f) {
           // We get a new iterator each time,
           // because closing a file can invalidate the iterator
           f->Close();
@@ -890,72 +840,63 @@ namespace edm {
         }
       }
     }
-    
+
     void InitRootHandlers::willBeUsingThreads() {
       //Tell Root we want to be multi-threaded
       ROOT::EnableThreadSafety();
 
       //When threading, also have to keep ROOT from logging all TObjects into a list
       TObject::SetObjectStat(false);
-      
+
       //Have to avoid having Streamers modify themselves after they have been used
       TVirtualStreamerInfo::Optimize(false);
     }
-    
+
     void InitRootHandlers::fillDescriptions(ConfigurationDescriptions& descriptions) {
       ParameterSetDescription desc;
       desc.setComment("Centralized interface to ROOT.");
       desc.addUntracked<bool>("UnloadRootSigHandler", false)
           ->setComment("If True, signals are handled by this service, rather than by ROOT.");
       desc.addUntracked<bool>("ResetRootErrHandler", true)
-          ->setComment("If True, ROOT messages (e.g. errors, warnings) are handled by this service, rather than by ROOT.");
+          ->setComment(
+              "If True, ROOT messages (e.g. errors, warnings) are handled by this service, rather than by ROOT.");
       desc.addUntracked<bool>("AutoLibraryLoader", true)
           ->setComment("If True, enables automatic loading of data dictionaries.");
-      desc.addUntracked<bool>("LoadAllDictionaries",false)
-          ->setComment("If True, loads all ROOT dictionaries.");
-      desc.addUntracked<bool>("EnableIMT",true)
-          ->setComment("If True, calls ROOT::EnableImplicitMT().");
-      desc.addUntracked<bool>("AbortOnSignal",true)
-          ->setComment("If True, do an abort when a signal occurs that causes a crash. If False, ROOT will do an exit which attempts to do a clean shutdown.");
-      desc.addUntracked<int>("DebugLevel",0)
-          ->setComment("Sets ROOT's gDebug value.");
+      desc.addUntracked<bool>("LoadAllDictionaries", false)->setComment("If True, loads all ROOT dictionaries.");
+      desc.addUntracked<bool>("EnableIMT", true)->setComment("If True, calls ROOT::EnableImplicitMT().");
+      desc.addUntracked<bool>("AbortOnSignal", true)
+          ->setComment(
+              "If True, do an abort when a signal occurs that causes a crash. If False, ROOT will do an exit which "
+              "attempts to do a clean shutdown.");
+      desc.addUntracked<int>("DebugLevel", 0)->setComment("Sets ROOT's gDebug value.");
       desc.addUntracked<int>("StackTracePauseTime", 300)
           ->setComment("Seconds to pause other threads during stack trace.");
       descriptions.add("InitRootHandlers", desc);
     }
 
-    char *const *
-    InitRootHandlers::getPstackArgv() {
-      return pstackArgv_;
-    }
+    char* const* InitRootHandlers::getPstackArgv() { return pstackArgv_; }
 
-    void
-    InitRootHandlers::enableWarnings_() {
-      s_ignoreWarnings = edm::RootHandlers::SeverityLevel::kInfo;
-    }
+    void InitRootHandlers::enableWarnings_() { s_ignoreWarnings = edm::RootHandlers::SeverityLevel::kInfo; }
 
-    void
-    InitRootHandlers::ignoreWarnings_(edm::RootHandlers::SeverityLevel level) {
-      s_ignoreWarnings = level;
-    }
+    void InitRootHandlers::ignoreWarnings_(edm::RootHandlers::SeverityLevel level) { s_ignoreWarnings = level; }
 
-    void
-    InitRootHandlers::cachePidInfo()
-    {
-      if(helperThread_) {
+    void InitRootHandlers::cachePidInfo() {
+      if (helperThread_) {
         //Another InitRootHandlers was initialized in this job, possibly
         // because multiple EventProcessors are being used.
         //In that case, we are already all setup
         return;
       }
-      if (snprintf(pidString_, pidStringLength_-1, "date; gdb -quiet -p %d 2>&1 <<EOF |\n"
-        "set width 0\n"
-        "set height 0\n"
-        "set pagination no\n"
-        "thread apply all bt\n"
-        "EOF\n"
-        "/bin/sed -n -e 's/^\\((gdb) \\)*//' -e '/^#/p' -e '/^Thread/p'", getpid()) >= pidStringLength_)
-      {
+      if (snprintf(pidString_,
+                   pidStringLength_ - 1,
+                   "date; gdb -quiet -p %d 2>&1 <<EOF |\n"
+                   "set width 0\n"
+                   "set height 0\n"
+                   "set pagination no\n"
+                   "thread apply all bt\n"
+                   "EOF\n"
+                   "/bin/sed -n -e 's/^\\((gdb) \\)*//' -e '/^#/p' -e '/^Thread/p'",
+                   getpid()) >= pidStringLength_) {
         std::ostringstream sstr;
         sstr << "Unable to pre-allocate stacktrace handler information";
         edm::Exception except(edm::errors::OtherCMS, sstr.str());
@@ -967,23 +908,25 @@ namespace edm {
       // these FDs as they are used internally by the parent.
       close(childToParent_[0]);
       close(childToParent_[1]);
-      childToParent_[0] = -1; childToParent_[1] = -1;
+      childToParent_[0] = -1;
+      childToParent_[1] = -1;
       close(parentToChild_[0]);
       close(parentToChild_[1]);
-      parentToChild_[0] = -1; parentToChild_[1] = -1;
+      parentToChild_[0] = -1;
+      parentToChild_[1] = -1;
 
-      if (-1 == pipe2(childToParent_, O_CLOEXEC))
-      {
+      if (-1 == pipe2(childToParent_, O_CLOEXEC)) {
         std::ostringstream sstr;
         sstr << "Failed to create child-to-parent pipes (errno=" << errno << "): " << strerror(errno);
         edm::Exception except(edm::errors::OtherCMS, sstr.str());
         throw except;
       }
 
-      if (-1 == pipe2(parentToChild_, O_CLOEXEC))
-      {
-        close(childToParent_[0]); close(childToParent_[1]);
-        childToParent_[0] = -1; childToParent_[1] = -1;
+      if (-1 == pipe2(parentToChild_, O_CLOEXEC)) {
+        close(childToParent_[0]);
+        close(childToParent_[1]);
+        childToParent_[0] = -1;
+        childToParent_[1] = -1;
         std::ostringstream sstr;
         sstr << "Failed to create child-to-parent pipes (errno=" << errno << "): " << strerror(errno);
         edm::Exception except(edm::errors::OtherCMS, sstr.str());
@@ -998,6 +941,5 @@ namespace edm {
 }  // end of namespace edm
 
 using edm::service::InitRootHandlers;
-typedef edm::serviceregistry::AllArgsMaker<edm::RootHandlers,InitRootHandlers> RootHandlersMaker;
+typedef edm::serviceregistry::AllArgsMaker<edm::RootHandlers, InitRootHandlers> RootHandlersMaker;
 DEFINE_FWK_SERVICE_MAKER(InitRootHandlers, RootHandlersMaker);
-
diff --git a/FWCore/Services/plugins/LoadAllDictionaries.cc b/FWCore/Services/plugins/LoadAllDictionaries.cc
index 7e32d91eca245..fb399878f96fb 100644
--- a/FWCore/Services/plugins/LoadAllDictionaries.cc
+++ b/FWCore/Services/plugins/LoadAllDictionaries.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Services
 // Class  :     LoadAllDictionaries
-// 
+//
 /**\class LoadAllDictionaries
  
  Description: Loads all Capability dictionaries
@@ -29,30 +29,27 @@
 
 namespace edm {
   namespace service {
-    class LoadAllDictionaries
-    {
-      
+    class LoadAllDictionaries {
     public:
       LoadAllDictionaries(const edm::ParameterSet&);
       //virtual ~LoadAllDictionaries();
-      
+
       // ---------- const member functions ---------------------
-      
+
       // ---------- static member functions --------------------
-      static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
-      
+      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
       // ---------- member functions ---------------------------
-      
+
     private:
-      LoadAllDictionaries(const LoadAllDictionaries&) = delete; // stop default
-      
-      const LoadAllDictionaries& operator=(const LoadAllDictionaries&) = delete; // stop default
-      
+      LoadAllDictionaries(const LoadAllDictionaries&) = delete;  // stop default
+
+      const LoadAllDictionaries& operator=(const LoadAllDictionaries&) = delete;  // stop default
+
       // ---------- member data --------------------------------
-      
     };
-  }
-}
+  }  // namespace service
+}  // namespace edm
 
 //
 // constants, enums and typedefs
@@ -65,47 +62,45 @@ namespace edm {
 //
 // constructors and destructor
 //
-edm::service::LoadAllDictionaries::LoadAllDictionaries(const edm::ParameterSet& iConfig)
-{
-   bool doLoad(iConfig.getUntrackedParameter<bool>("doLoad"));
-   if(doLoad) {
-     edmplugin::PluginManager*db =  edmplugin::PluginManager::get();
-     
-     typedef edmplugin::PluginManager::CategoryToInfos CatToInfos;
-     
-     CatToInfos::const_iterator itFound = db->categoryToInfos().find("Capability");
-     
-     if(itFound == db->categoryToInfos().end()) {
-       return;
-     }
-     std::string lastClass;
-     const std::string mystring("edm::Wrapper");
-
-     for (edmplugin::PluginManager::Infos::const_iterator itInfo = itFound->second.begin(),
-          itInfoEnd = itFound->second.end(); 
-          itInfo != itInfoEnd; ++itInfo)
-     {
-       if (lastClass == itInfo->name_) {
-         continue;
-       }
-       
-       lastClass = itInfo->name_;
-       if (lastClass.find(mystring) != std::string::npos) { 
-         edmplugin::PluginCapabilities::get()->load(lastClass);
-       }
-       //NOTE: since we have the library already, we could be more efficient if we just load it ourselves
-     }
-   }
+edm::service::LoadAllDictionaries::LoadAllDictionaries(const edm::ParameterSet& iConfig) {
+  bool doLoad(iConfig.getUntrackedParameter<bool>("doLoad"));
+  if (doLoad) {
+    edmplugin::PluginManager* db = edmplugin::PluginManager::get();
+
+    typedef edmplugin::PluginManager::CategoryToInfos CatToInfos;
+
+    CatToInfos::const_iterator itFound = db->categoryToInfos().find("Capability");
+
+    if (itFound == db->categoryToInfos().end()) {
+      return;
+    }
+    std::string lastClass;
+    const std::string mystring("edm::Wrapper");
+
+    for (edmplugin::PluginManager::Infos::const_iterator itInfo = itFound->second.begin(),
+                                                         itInfoEnd = itFound->second.end();
+         itInfo != itInfoEnd;
+         ++itInfo) {
+      if (lastClass == itInfo->name_) {
+        continue;
+      }
+
+      lastClass = itInfo->name_;
+      if (lastClass.find(mystring) != std::string::npos) {
+        edmplugin::PluginCapabilities::get()->load(lastClass);
+      }
+      //NOTE: since we have the library already, we could be more efficient if we just load it ourselves
+    }
+  }
 }
 
-void edm::service::LoadAllDictionaries::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
+void edm::service::LoadAllDictionaries::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
   desc.addUntracked<bool>("doLoad", true)->setComment("Only if 'true' do we load all dictionaries");
   descriptions.add("LoadAllDictionaries", desc);
-  descriptions.setComment("This service allows you to force all known dictionaries to be loaded at the beginning of the job");
+  descriptions.setComment(
+      "This service allows you to force all known dictionaries to be loaded at the beginning of the job");
 }
 
 using edm::service::LoadAllDictionaries;
-DEFINE_FWK_SERVICE_MAKER(LoadAllDictionaries,edm::serviceregistry::ParameterSetMaker<LoadAllDictionaries>);
-
-
+DEFINE_FWK_SERVICE_MAKER(LoadAllDictionaries, edm::serviceregistry::ParameterSetMaker<LoadAllDictionaries>);
diff --git a/FWCore/Services/plugins/Module.cc b/FWCore/Services/plugins/Module.cc
index a8cfd738593e0..ad3582c16c6aa 100644
--- a/FWCore/Services/plugins/Module.cc
+++ b/FWCore/Services/plugins/Module.cc
@@ -5,7 +5,7 @@
 using edm::service::JobReportService;
 using edm::service::SiteLocalConfigService;
 
-typedef edm::serviceregistry::ParameterSetMaker<edm::SiteLocalConfig,SiteLocalConfigService> SiteLocalConfigMaker;
-DEFINE_FWK_SERVICE_MAKER(SiteLocalConfigService,SiteLocalConfigMaker);
-typedef edm::serviceregistry::AllArgsMaker<edm::JobReport,JobReportService> JobReportMaker;
+typedef edm::serviceregistry::ParameterSetMaker<edm::SiteLocalConfig, SiteLocalConfigService> SiteLocalConfigMaker;
+DEFINE_FWK_SERVICE_MAKER(SiteLocalConfigService, SiteLocalConfigMaker);
+typedef edm::serviceregistry::AllArgsMaker<edm::JobReport, JobReportService> JobReportMaker;
 DEFINE_FWK_SERVICE_MAKER(JobReportService, JobReportMaker);
diff --git a/FWCore/Services/plugins/PrintLoadingPlugins.cc b/FWCore/Services/plugins/PrintLoadingPlugins.cc
index 6b3bee9c44157..251c91d5b9971 100644
--- a/FWCore/Services/plugins/PrintLoadingPlugins.cc
+++ b/FWCore/Services/plugins/PrintLoadingPlugins.cc
@@ -2,11 +2,11 @@
 //
 // Package:     Services
 // Class  :     PrintLoadingPlugins
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
-// Original Author:  
+// Original Author:
 //         Created:  Thu Dec 13 15:00:49 EST 2007
 //
 
@@ -29,32 +29,28 @@
 #include <string>
 #include <map>
 
-class PrintLoadingPlugins
-{
-  
+class PrintLoadingPlugins {
 public:
   PrintLoadingPlugins();
   virtual ~PrintLoadingPlugins();
-  
+
   void goingToLoad(const boost::filesystem::path&);
-  
-  void askedToLoad(const std::string& ,const std::string& );
-  
+
+  void askedToLoad(const std::string&, const std::string&);
+
   // ---------- const member functions ---------------------
-  
+
   // ---------- static member functions --------------------
-  static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
-  
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
   // ---------- member functions ---------------------------
-  
+
 private:
-  
-  PrintLoadingPlugins(const PrintLoadingPlugins&) = delete; // stop default
-  
-  const PrintLoadingPlugins& operator=(const PrintLoadingPlugins&) = delete; // stop default
-  
+  PrintLoadingPlugins(const PrintLoadingPlugins&) = delete;  // stop default
+
+  const PrintLoadingPlugins& operator=(const PrintLoadingPlugins&) = delete;  // stop default
+
   // ---------- member data --------------------------------
-  
 };
 
 //
@@ -70,18 +66,14 @@ class PrintLoadingPlugins
 //
 using namespace edmplugin;
 
-PrintLoadingPlugins::PrintLoadingPlugins()
-{   
-   using std::placeholders::_1;
-   using std::placeholders::_2;
-   PluginManager *pm = PluginManager::get();
+PrintLoadingPlugins::PrintLoadingPlugins() {
+  using std::placeholders::_1;
+  using std::placeholders::_2;
+  PluginManager* pm = PluginManager::get();
 
-   pm->askedToLoadCategoryWithPlugin_.connect(std::bind(std::mem_fn(&PrintLoadingPlugins::askedToLoad),this, _1,_2));
-   
-   pm->goingToLoad_.connect(std::bind(std::mem_fn(&PrintLoadingPlugins::goingToLoad),this, _1));
+  pm->askedToLoadCategoryWithPlugin_.connect(std::bind(std::mem_fn(&PrintLoadingPlugins::askedToLoad), this, _1, _2));
 
-   
-  
+  pm->goingToLoad_.connect(std::bind(std::mem_fn(&PrintLoadingPlugins::goingToLoad), this, _1));
 }
 
 // PrintLoadingPlugins::PrintLoadingPlugins(const PrintLoadingPlugins& rhs)
@@ -89,11 +81,9 @@ PrintLoadingPlugins::PrintLoadingPlugins()
 //    // do actual copying here;
 // }
 
-PrintLoadingPlugins::~PrintLoadingPlugins()
-{
-}
+PrintLoadingPlugins::~PrintLoadingPlugins() {}
 
-void PrintLoadingPlugins::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
+void PrintLoadingPlugins::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
   descriptions.add("PrintLoadingPlugins", desc);
   descriptions.setComment("This service logs each request to load a plugin.");
@@ -115,57 +105,47 @@ void PrintLoadingPlugins::fillDescriptions(edm::ConfigurationDescriptions & desc
 // member functions
 //
 
- namespace{
-    struct PICompare {
-	  bool operator()(const PluginInfo& iLHS,
-			  const PluginInfo& iRHS) const {
-	     return iLHS.name_ < iRHS.name_;
-	  }
-    };
- }
-
-void PrintLoadingPlugins::askedToLoad(const std::string& iCategory,
-				      const std::string& iPlugin)
-{ 
-   PluginManager *pm = PluginManager::get();
-
-   const PluginManager::CategoryToInfos& category = pm->categoryToInfos();
-
-   PluginManager::CategoryToInfos::const_iterator itFound = category.find(iCategory);
-
-   std::string libname("Not found");
-   
-   if(itFound != category.end()) {
-      
-      PluginInfo i;
-      
-      i.name_ = iPlugin;
-      
-      typedef std::vector<PluginInfo>::const_iterator PIItr;
-      
-      std::pair<PIItr,PIItr> range = std::equal_range(itFound->second.begin(),itFound->second.end(),i,PICompare());
-      
-      if(range.second - range.first > 1){
-	 
-	 const boost::filesystem::path& loadable = range.first->loadable_;
-	 
-	 libname = loadable.string();
-	 
-      }
-      
-      edm::LogAbsolute("GetPlugin")<<"Getting> '"<<iCategory<< "' "<<iPlugin 
-				   <<"\n         from "<<libname <<std::endl;
-   }
-   
+namespace {
+  struct PICompare {
+    bool operator()(const PluginInfo& iLHS, const PluginInfo& iRHS) const { return iLHS.name_ < iRHS.name_; }
+  };
+}  // namespace
+
+void PrintLoadingPlugins::askedToLoad(const std::string& iCategory, const std::string& iPlugin) {
+  PluginManager* pm = PluginManager::get();
+
+  const PluginManager::CategoryToInfos& category = pm->categoryToInfos();
+
+  PluginManager::CategoryToInfos::const_iterator itFound = category.find(iCategory);
+
+  std::string libname("Not found");
+
+  if (itFound != category.end()) {
+    PluginInfo i;
+
+    i.name_ = iPlugin;
+
+    typedef std::vector<PluginInfo>::const_iterator PIItr;
+
+    std::pair<PIItr, PIItr> range = std::equal_range(itFound->second.begin(), itFound->second.end(), i, PICompare());
+
+    if (range.second - range.first > 1) {
+      const boost::filesystem::path& loadable = range.first->loadable_;
+
+      libname = loadable.string();
+    }
+
+    edm::LogAbsolute("GetPlugin") << "Getting> '" << iCategory << "' " << iPlugin << "\n         from " << libname
+                                  << std::endl;
+  }
 }
 
 void PrintLoadingPlugins::goingToLoad(const boost::filesystem::path& Loadable_)
 
 {
-  edm::LogAbsolute("LoadLib")<<"Loading> "<<Loadable_.string()<< std::endl;
+  edm::LogAbsolute("LoadLib") << "Loading> " << Loadable_.string() << std::endl;
 }
 
-
 //
 // const member functions
 //
@@ -176,4 +156,3 @@ void PrintLoadingPlugins::goingToLoad(const boost::filesystem::path& Loadable_)
 
 typedef edm::serviceregistry::NoArgsMaker<PrintLoadingPlugins> PrintLoadingPluginsMaker;
 DEFINE_FWK_SERVICE_MAKER(PrintLoadingPlugins, PrintLoadingPluginsMaker);
-
diff --git a/FWCore/Services/plugins/ProcInfoFetcher.cc b/FWCore/Services/plugins/ProcInfoFetcher.cc
index d55f4774437d9..aac69f4e7d359 100644
--- a/FWCore/Services/plugins/ProcInfoFetcher.cc
+++ b/FWCore/Services/plugins/ProcInfoFetcher.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Services
 // Class  :     ProcInfoFetcher
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -33,7 +33,6 @@
 #include "FWCore/Utilities/interface/get_underlying_safe.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -42,45 +41,45 @@
 // static data member definitions
 //
 
-namespace { 
+namespace {
   struct linux_proc {
-    int pid; // %d
+    int pid;  // %d
     std::string comm;
-    char state; // %c
-    int ppid; // %d
-    int pgrp; // %d
-    int session; // %d
-    int tty; // %d
-    int tpgid; // %d
-    unsigned int flags; // %u [before linux 2.6 %lu]
-    unsigned long minflt; // %lu
-    unsigned long cminflt; // %lu
-    unsigned long majflt; // %lu
-    unsigned long cmajflt; // %lu
-    unsigned long utime; // %lu
-    unsigned long stime; // %lu
-    long cutime; // %ld
-    long cstime; // %ld
-    long priority; // %ld
-    long nice; // %ld
-    long num_threads; // %ld
-    long itrealvalue; // %ld
-    unsigned long long starttime; // %llu [before linux 2.6 %d]
-    unsigned long vsize; // %lu
-    long rss; // %ld
-    unsigned long rlim; // %lu
-    unsigned long startcode; // %lu
-    unsigned long endcode; // %lu
-    unsigned long startstack; // %lu
-    unsigned long kstkesp; // %lu
-    unsigned long kstkeip; // %lu
-    unsigned long signal; // %lu
-    unsigned long blocked; // %lu
-    unsigned long sigignore; // %lu
-    unsigned long sigcatch; // %lu
-    unsigned long wchan; // %lu
+    char state;                    // %c
+    int ppid;                      // %d
+    int pgrp;                      // %d
+    int session;                   // %d
+    int tty;                       // %d
+    int tpgid;                     // %d
+    unsigned int flags;            // %u [before linux 2.6 %lu]
+    unsigned long minflt;          // %lu
+    unsigned long cminflt;         // %lu
+    unsigned long majflt;          // %lu
+    unsigned long cmajflt;         // %lu
+    unsigned long utime;           // %lu
+    unsigned long stime;           // %lu
+    long cutime;                   // %ld
+    long cstime;                   // %ld
+    long priority;                 // %ld
+    long nice;                     // %ld
+    long num_threads;              // %ld
+    long itrealvalue;              // %ld
+    unsigned long long starttime;  // %llu [before linux 2.6 %d]
+    unsigned long vsize;           // %lu
+    long rss;                      // %ld
+    unsigned long rlim;            // %lu
+    unsigned long startcode;       // %lu
+    unsigned long endcode;         // %lu
+    unsigned long startstack;      // %lu
+    unsigned long kstkesp;         // %lu
+    unsigned long kstkeip;         // %lu
+    unsigned long signal;          // %lu
+    unsigned long blocked;         // %lu
+    unsigned long sigignore;       // %lu
+    unsigned long sigcatch;        // %lu
+    unsigned long wchan;           // %lu
   };
-  
+
   class Fetcher {
   public:
     friend Fetcher& operator>>(Fetcher&, int&);
@@ -90,12 +89,9 @@ namespace {
     friend Fetcher& operator>>(Fetcher&, unsigned long long&);
     friend Fetcher& operator>>(Fetcher&, char&);
     friend Fetcher& operator>>(Fetcher&, std::string&);
-    
-    explicit Fetcher(char* buffer) : 
-    buffer_(buffer),
-    save_(nullptr),
-    delims_(" \t\n\f\v\r") {
-    }
+
+    explicit Fetcher(char* buffer) : buffer_(buffer), save_(nullptr), delims_(" \t\n\f\v\r") {}
+
   private:
     int getInt() {
       const char* t = getItem();
@@ -122,27 +118,23 @@ namespace {
       //std::cout <<"ulong '"<<t <<"'"<<std::endl;
       return boost::lexical_cast<unsigned long long>(t);
     }
-    char getChar() {
-      return *getItem();
-    }
-    std::string getString() {
-      return std::string(getItem());
-    }
+    char getChar() { return *getItem(); }
+    std::string getString() { return std::string(getItem()); }
     char* getItem() {
       char* item = strtok_r(buffer_, delims_, &save());
       assert(item);
-      buffer_ = nullptr; // Null for subsequent strtok_r calls.
+      buffer_ = nullptr;  // Null for subsequent strtok_r calls.
       return item;
     }
 
-    char const* save() const {return get_underlying_safe(save_);}
-    char*& save() {return get_underlying_safe(save_);}
+    char const* save() const { return get_underlying_safe(save_); }
+    char*& save() { return get_underlying_safe(save_); }
 
     edm::propagate_const<char*> buffer_;
     edm::propagate_const<char*> save_;
-    char const* const delims_; 
+    char const* const delims_;
   };
-  
+
   Fetcher& operator>>(Fetcher& iFetch, int& oValue) {
     oValue = iFetch.getInt();
     return iFetch;
@@ -153,11 +145,11 @@ namespace {
   }
   Fetcher& operator>>(Fetcher& iFetch, unsigned int& oValue) {
     oValue = iFetch.getUInt();
-    return iFetch;      
+    return iFetch;
   }
   Fetcher& operator>>(Fetcher& iFetch, unsigned long& oValue) {
     oValue = iFetch.getULong();
-    return iFetch;      
+    return iFetch;
   }
   Fetcher& operator>>(Fetcher& iFetch, unsigned long long& oValue) {
     oValue = iFetch.getULongLong();
@@ -171,96 +163,64 @@ namespace {
     oValue = iFetch.getString();
     return iFetch;
   }
-}
+}  // namespace
 
 namespace edm {
   namespace service {
-  
-    ProcInfoFetcher::ProcInfoFetcher():
-    pg_size_(sysconf(_SC_PAGESIZE)) {
+
+    ProcInfoFetcher::ProcInfoFetcher() : pg_size_(sysconf(_SC_PAGESIZE)) {
 #ifdef __linux__
       std::ostringstream ost;
       ost << "/proc/" << getpid() << "/stat";
-      
-      if((fd_ = open(ost.str().c_str(), O_RDONLY)) < 0) {
-        throw Exception(errors::Configuration)
-        << "Failed to open " << ost.str() << std::endl;
+
+      if ((fd_ = open(ost.str().c_str(), O_RDONLY)) < 0) {
+        throw Exception(errors::Configuration) << "Failed to open " << ost.str() << std::endl;
       }
 #endif
     }
     ProcInfoFetcher::~ProcInfoFetcher() {
 #ifdef LINUX
       close(fd_);
-#endif      
+#endif
     }
     ProcInfo ProcInfoFetcher::fetch() const {
       ProcInfo ret;
-      
+
 #ifdef __linux__
       double pr_size = 0.0, pr_rssize = 0.0;
-      
+
       linux_proc pinfo;
       int cnt;
-      
+
       lseek(fd_, 0, SEEK_SET);
-      
-      if((cnt = read(fd_, buf_, sizeof(buf_) - 1)) < 0) {
+
+      if ((cnt = read(fd_, buf_, sizeof(buf_) - 1)) < 0) {
         perror("Read of Proc file failed:");
         return ProcInfo();
       }
-      
-      if(cnt > 0) {
+
+      if (cnt > 0) {
         buf_[cnt] = '\0';
-        
-        
+
         try {
           Fetcher fetcher(buf_);
-          fetcher >> pinfo.pid
-          >> pinfo.comm
-          >> pinfo.state
-          >> pinfo.ppid
-          >> pinfo.pgrp
-          >> pinfo.session
-          >> pinfo.tty
-          >> pinfo.tpgid
-          >> pinfo.flags
-          >> pinfo.minflt
-          >> pinfo.cminflt
-          >> pinfo.majflt
-          >> pinfo.cmajflt
-          >> pinfo.utime
-          >> pinfo.stime
-          >> pinfo.cutime
-          >> pinfo.cstime
-          >> pinfo.priority
-          >> pinfo.nice
-          >> pinfo.num_threads
-          >> pinfo.itrealvalue
-          >> pinfo.starttime
-          >> pinfo.vsize
-          >> pinfo.rss
-          >> pinfo.rlim
-          >> pinfo.startcode
-          >> pinfo.endcode
-          >> pinfo.startstack
-          >> pinfo.kstkesp
-          >> pinfo.kstkeip
-          >> pinfo.signal
-          >> pinfo.blocked
-          >> pinfo.sigignore
-          >> pinfo.sigcatch
-          >> pinfo.wchan;
+          fetcher >> pinfo.pid >> pinfo.comm >> pinfo.state >> pinfo.ppid >> pinfo.pgrp >> pinfo.session >> pinfo.tty >>
+              pinfo.tpgid >> pinfo.flags >> pinfo.minflt >> pinfo.cminflt >> pinfo.majflt >> pinfo.cmajflt >>
+              pinfo.utime >> pinfo.stime >> pinfo.cutime >> pinfo.cstime >> pinfo.priority >> pinfo.nice >>
+              pinfo.num_threads >> pinfo.itrealvalue >> pinfo.starttime >> pinfo.vsize >> pinfo.rss >> pinfo.rlim >>
+              pinfo.startcode >> pinfo.endcode >> pinfo.startstack >> pinfo.kstkesp >> pinfo.kstkeip >> pinfo.signal >>
+              pinfo.blocked >> pinfo.sigignore >> pinfo.sigcatch >> pinfo.wchan;
         } catch (boost::bad_lexical_cast& iE) {
-          LogWarning("ProcInfoFetcher")<<"Parsing of Prof file failed:"<<iE.what()<<std::endl;
+          LogWarning("ProcInfoFetcher") << "Parsing of Prof file failed:" << iE.what() << std::endl;
           return ProcInfo();
         }
-        
+
         // resident set size in pages
         pr_size = (double)pinfo.vsize;
         pr_rssize = (double)pinfo.rss;
-        
-        ret.vsize = pr_size / (1024.0*1024.0);
-        ret.rss   = (pr_rssize * pg_size_) / (1024.0*1024.0);
+
+        ret.vsize = pr_size / (1024.0 * 1024.0);
+        ret.rss = (pr_rssize * pg_size_) / (1024.0 * 1024.0);
       }
 #else
       ret.vsize = 0;
@@ -268,5 +228,5 @@ namespace edm {
 #endif
       return ret;
     }
-  }
-}
+  }  // namespace service
+}  // namespace edm
diff --git a/FWCore/Services/plugins/ProcInfoFetcher.h b/FWCore/Services/plugins/ProcInfoFetcher.h
index 0e6f2e68a50e2..b1939b65860b1 100644
--- a/FWCore/Services/plugins/ProcInfoFetcher.h
+++ b/FWCore/Services/plugins/ProcInfoFetcher.h
@@ -4,7 +4,7 @@
 //
 // Package:     Services
 // Class  :     ProcInfoFetcher
-// 
+//
 /**\class ProcInfoFetcher ProcInfoFetcher.h FWCore/Services/interface/ProcInfoFetcher.h
 
  Description:Class used to fetch process information
@@ -25,35 +25,33 @@
 // forward declarations
 namespace edm {
   namespace service {
-    struct ProcInfo
-    {
-      ProcInfo():vsize(),rss() {}
-      ProcInfo(double sz, double rss_sz): vsize(sz),rss(rss_sz) {}
-      
-      bool operator==(const ProcInfo& p) const
-      { return vsize==p.vsize && rss==p.rss; }
-      
-      bool operator>(const ProcInfo& p) const
-      { return vsize>p.vsize || rss>p.rss; }
-      
+    struct ProcInfo {
+      ProcInfo() : vsize(), rss() {}
+      ProcInfo(double sz, double rss_sz) : vsize(sz), rss(rss_sz) {}
+
+      bool operator==(const ProcInfo& p) const { return vsize == p.vsize && rss == p.rss; }
+
+      bool operator>(const ProcInfo& p) const { return vsize > p.vsize || rss > p.rss; }
+
       // see proc(4) man pages for units and a description
-      double vsize;   // in MB (used to be in pages?)
-      double rss;     // in MB (used to be in pages?)
+      double vsize;  // in MB (used to be in pages?)
+      double rss;    // in MB (used to be in pages?)
     };
-    
+
     class ProcInfoFetcher {
     public:
       ProcInfoFetcher();
       ~ProcInfoFetcher();
       ProcInfoFetcher(ProcInfoFetcher const&) = delete;
       ProcInfoFetcher& operator=(ProcInfoFetcher const&) = delete;
-      
+
       ProcInfo fetch() const;
+
     private:
       double pg_size_;
       int fd_;
       mutable char buf_[500];
     };
-  }
-}
+  }  // namespace service
+}  // namespace edm
 #endif
diff --git a/FWCore/Services/plugins/ProductRegistryDumper.cc b/FWCore/Services/plugins/ProductRegistryDumper.cc
index f51ac5a861c33..1c7d5b50b98ca 100644
--- a/FWCore/Services/plugins/ProductRegistryDumper.cc
+++ b/FWCore/Services/plugins/ProductRegistryDumper.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Services
 // Class  :     ProductRegistryDumper
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -25,14 +25,13 @@
 
 namespace edm {
   namespace service {
-    class ProductRegistryDumper
-    {
+    class ProductRegistryDumper {
     public:
       ProductRegistryDumper(edm::ParameterSet const& iConfig, edm::ActivityRegistry& iAR);
     };
 
-  }
-}
+  }  // namespace service
+}  // namespace edm
 
 //
 // constants, enums and typedefs
@@ -46,16 +45,15 @@ namespace edm {
 // constructors and destructor
 //
 using namespace edm::service;
-ProductRegistryDumper::ProductRegistryDumper(edm::ParameterSet const& iConfig, edm::ActivityRegistry& iAR)
-{
-  iAR.watchPostBeginJob( [] () {
-      Service<ConstProductRegistry> regService;
-      for(auto const& branch: regService->allBranchDescriptions()) {
-        if(branch) {
-          edm::LogSystem("ProductRegistry")<<*branch;
-        }
+ProductRegistryDumper::ProductRegistryDumper(edm::ParameterSet const& iConfig, edm::ActivityRegistry& iAR) {
+  iAR.watchPostBeginJob([]() {
+    Service<ConstProductRegistry> regService;
+    for (auto const& branch : regService->allBranchDescriptions()) {
+      if (branch) {
+        edm::LogSystem("ProductRegistry") << *branch;
       }
-    });
+    }
+  });
 }
 
 DEFINE_FWK_SERVICE(ProductRegistryDumper);
diff --git a/FWCore/Services/plugins/ResourceEnforcer.cc b/FWCore/Services/plugins/ResourceEnforcer.cc
index 9ec9f2520ec4f..dd98c030c3dad 100644
--- a/FWCore/Services/plugins/ResourceEnforcer.cc
+++ b/FWCore/Services/plugins/ResourceEnforcer.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Services
 // Class  :     ResourceEnforcer
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -21,25 +21,24 @@
 #include "FWCore/ServiceRegistry/interface/ServiceMaker.h"
 #include "FWCore/ServiceRegistry/interface/SystemBounds.h"
 
-
 namespace edm {
   class Event;
   class EventSetup;
-  
+
   namespace service {
     class ResourceEnforcer {
     public:
       ResourceEnforcer(edm::ParameterSet const& iConfig, edm::ActivityRegistry& iAR);
-      
-      static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
+
+      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
     private:
       void check();
       void postEventProcessing(edm::StreamContext const&);
-      
+
       ProcInfoFetcher m_fetcher;
       CPUTimer m_timer;
-      
+
       double m_maxVSize;
       double m_maxRSS;
       double m_maxTime;
@@ -47,8 +46,8 @@ namespace edm {
       std::atomic<unsigned int> m_eventCount;
       std::atomic<bool> m_doingCheck;
     };
-  }
-}
+  }  // namespace service
+}  // namespace edm
 
 using namespace edm::service;
 //
@@ -62,22 +61,20 @@ using namespace edm::service;
 //
 // constructors and destructor
 //
-ResourceEnforcer::ResourceEnforcer( edm::ParameterSet const& iConfig,ActivityRegistry& iReg):
-m_maxVSize(iConfig.getUntrackedParameter<double>("maxVSize",0)*1000.), //convert to MB
-m_maxRSS(iConfig.getUntrackedParameter<double>("maxRSS",0)*1000.),
-m_maxTime(iConfig.getUntrackedParameter<double>("maxTime",0)*60.*60.), //convert from hours to seconds
-m_nEventsToSkip(0),
-m_eventCount(0),
-m_doingCheck(false)
-{
+ResourceEnforcer::ResourceEnforcer(edm::ParameterSet const& iConfig, ActivityRegistry& iReg)
+    : m_maxVSize(iConfig.getUntrackedParameter<double>("maxVSize", 0) * 1000.),  //convert to MB
+      m_maxRSS(iConfig.getUntrackedParameter<double>("maxRSS", 0) * 1000.),
+      m_maxTime(iConfig.getUntrackedParameter<double>("maxTime", 0) * 60. * 60.),  //convert from hours to seconds
+      m_nEventsToSkip(0),
+      m_eventCount(0),
+      m_doingCheck(false) {
   iReg.watchPostEvent(this, &ResourceEnforcer::postEventProcessing);
-  iReg.watchPreallocate([this](edm::service::SystemBounds const& iBounds){
+  iReg.watchPreallocate([this](edm::service::SystemBounds const& iBounds) {
     //We do not want the frequency of checking to be dependent on
     // how many parallel streams are running
-    m_nEventsToSkip = iBounds.maxNumberOfStreams()-1;
+    m_nEventsToSkip = iBounds.maxNumberOfStreams() - 1;
   });
   m_timer.start();
-
 }
 
 //
@@ -88,49 +85,49 @@ m_doingCheck(false)
 // const member functions
 //
 
-void 
-ResourceEnforcer::postEventProcessing(StreamContext const&) {
+void ResourceEnforcer::postEventProcessing(StreamContext const&) {
   //If another thread is already doing a check, we don't need to do another one
   auto count = ++m_eventCount;
-  if(count> m_nEventsToSkip) {
+  if (count > m_nEventsToSkip) {
     bool expected = false;
-    if( m_doingCheck.compare_exchange_strong(expected,true,std::memory_order_acq_rel) ) {
+    if (m_doingCheck.compare_exchange_strong(expected, true, std::memory_order_acq_rel)) {
       this->check();
-      m_doingCheck.store(false,std::memory_order_release);
-      m_eventCount.store(0,std::memory_order_release);
+      m_doingCheck.store(false, std::memory_order_release);
+      m_eventCount.store(0, std::memory_order_release);
     }
   }
 }
 
+void ResourceEnforcer::check() {
+  ProcInfo pi = m_fetcher.fetch();
 
-void
-ResourceEnforcer::check()
-{
-  ProcInfo pi =m_fetcher.fetch();
-  
-  if(0!=m_maxVSize && m_maxVSize< pi.vsize) {
-    throw edm::Exception(errors::ExceededResourceVSize)<<"Exceeded maximum allowed VSize of "<<m_maxVSize/1000.<<" GB (VSize is "<<pi.vsize/1000.<<")";
+  if (0 != m_maxVSize && m_maxVSize < pi.vsize) {
+    throw edm::Exception(errors::ExceededResourceVSize)
+        << "Exceeded maximum allowed VSize of " << m_maxVSize / 1000. << " GB (VSize is " << pi.vsize / 1000. << ")";
   }
 
-  if(0!=m_maxRSS && m_maxRSS< pi.rss) {
-    throw edm::Exception(errors::ExceededResourceRSS)<<"Exceeded maximum allowed RSS of "<<m_maxRSS/1000.<<" GB (VSize is "<<pi.rss/1000.<<")";
+  if (0 != m_maxRSS && m_maxRSS < pi.rss) {
+    throw edm::Exception(errors::ExceededResourceRSS)
+        << "Exceeded maximum allowed RSS of " << m_maxRSS / 1000. << " GB (VSize is " << pi.rss / 1000. << ")";
   }
 
-  if(0!=m_maxTime && m_maxTime < m_timer.realTime()) {
-    throw edm::Exception(errors::ExceededResourceTime)<<"Exceeded maximum allowed time of "<<m_maxTime/60./60.<<" hours";
+  if (0 != m_maxTime && m_maxTime < m_timer.realTime()) {
+    throw edm::Exception(errors::ExceededResourceTime)
+        << "Exceeded maximum allowed time of " << m_maxTime / 60. / 60. << " hours";
   }
 }
 
-
 //
 // static member functions
 //
 
 void ResourceEnforcer::fillDescriptions(ConfigurationDescriptions& descriptions) {
   ParameterSetDescription desc;
-  desc.addUntracked<double>("maxVSize", 0.)->setComment("Maximum allowed VSize for the job in GB. Ignored if set to 0.");
+  desc.addUntracked<double>("maxVSize", 0.)
+      ->setComment("Maximum allowed VSize for the job in GB. Ignored if set to 0.");
   desc.addUntracked<double>("maxRSS", 0.)->setComment("Maximum allowd RSS for the job in GB. Ignored if set to 0.");
-  desc.addUntracked<double>("maxTime", 0.)->setComment("Maximum allowd wallclock time for the job in hours. Ignored if set to 0.");
+  desc.addUntracked<double>("maxTime", 0.)
+      ->setComment("Maximum allowd wallclock time for the job in hours. Ignored if set to 0.");
   descriptions.add("ResourceEnforcer", desc);
 }
 
diff --git a/FWCore/Services/plugins/SimpleMemoryCheck.cc b/FWCore/Services/plugins/SimpleMemoryCheck.cc
index eff11075a551f..061c9bf13cd55 100644
--- a/FWCore/Services/plugins/SimpleMemoryCheck.cc
+++ b/FWCore/Services/plugins/SimpleMemoryCheck.cc
@@ -29,7 +29,6 @@
 #include "DataFormats/Provenance/interface/EventID.h"
 #include "FWCore/Services/plugins/ProcInfoFetcher.h"
 
-
 #include "DataFormats/Provenance/interface/ModuleDescription.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/MessageLogger/interface/JobReport.h"
@@ -61,49 +60,43 @@
 namespace edm {
   class EventID;
   class Timestamp;
-  
+
   namespace service {
-    struct smapsInfo
-    {
-      smapsInfo():private_(),pss_() {}
-      smapsInfo(double private_sz, double pss_sz): private_(private_sz),pss_(pss_sz) {}
-      
-      bool operator==(const smapsInfo& p) const
-      { return private_==p.private_ && pss_==p.pss_; }
-      
-      bool operator>(const smapsInfo& p) const
-      { return private_>p.private_ || pss_>p.pss_; }
-      
-      double private_;   // in MB
-      double pss_;     // in MB
+    struct smapsInfo {
+      smapsInfo() : private_(), pss_() {}
+      smapsInfo(double private_sz, double pss_sz) : private_(private_sz), pss_(pss_sz) {}
+
+      bool operator==(const smapsInfo& p) const { return private_ == p.private_ && pss_ == p.pss_; }
+
+      bool operator>(const smapsInfo& p) const { return private_ > p.private_ || pss_ > p.pss_; }
+
+      double private_;  // in MB
+      double pss_;      // in MB
     };
-    
-    
-    class SimpleMemoryCheck
-    {
+
+    class SimpleMemoryCheck {
     public:
-      
-      SimpleMemoryCheck(const ParameterSet&,ActivityRegistry&);
+      SimpleMemoryCheck(const ParameterSet&, ActivityRegistry&);
       ~SimpleMemoryCheck();
-      
-      static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
-      
+
+      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
       void preSourceConstruction(const ModuleDescription&);
       void postSourceConstruction(const ModuleDescription&);
       void postSourceEvent(StreamID);
-      
+
       void postBeginJob();
-      
+
       void postEvent(StreamContext const&);
-      
+
       void postModuleBeginJob(const ModuleDescription&);
       void postModuleConstruction(const ModuleDescription&);
-      
+
       void preModule(StreamContext const&, ModuleCallingContext const&);
       void postModule(StreamContext const&, ModuleCallingContext const&);
-      
+
       void postEndJob();
-      
+
     private:
       ProcInfo fetch();
       smapsInfo fetchSmaps();
@@ -111,23 +104,21 @@ namespace edm {
       double averageGrowthRate(double current, double past, int count);
       void update();
       void updateMax();
-      void andPrint(const std::string& type,
-                    const std::string& mdlabel, const std::string& mdname) const;
-      void updateAndPrint(const std::string& type,
-                          const std::string& mdlabel, const std::string& mdname);
+      void andPrint(const std::string& type, const std::string& mdlabel, const std::string& mdname) const;
+      void updateAndPrint(const std::string& type, const std::string& mdlabel, const std::string& mdname);
       void openFiles();
 
-      char const* smapsLineBuffer() const {return get_underlying_safe(smapsLineBuffer_);}
-      char*& smapsLineBuffer() {return get_underlying_safe(smapsLineBuffer_);}
-      
+      char const* smapsLineBuffer() const { return get_underlying_safe(smapsLineBuffer_); }
+      char*& smapsLineBuffer() { return get_underlying_safe(smapsLineBuffer_); }
+
       ProcInfo a_;
       ProcInfo b_;
       ProcInfo max_;
       edm::propagate_const<ProcInfo*> current_;
       edm::propagate_const<ProcInfo*> previous_;
-      
+
       smapsInfo currentSmaps_;
-      
+
       ProcInfoFetcher piFetcher_;
       double pg_size_;
       int num_to_skip_;
@@ -137,17 +128,16 @@ namespace edm {
       bool jobReportOutputOnly_;
       bool monitorPssAndPrivate_;
       std::atomic<int> count_;
-      
+
       //smaps
       edm::propagate_const<FILE*> smapsFile_;
       edm::propagate_const<char*> smapsLineBuffer_;
       size_t smapsLineBufferLen_;
-      
-      
+
       //Rates of growth
       double growthRateVsize_;
       double growthRateRss_;
-      
+
       // Event summary statistics 				changeLog 1
       struct SignificantEvent {
         int count;
@@ -159,11 +149,18 @@ namespace edm {
         double privateSize;
         double pss;
         edm::EventID event;
-        SignificantEvent() : count(0), vsize(0), deltaVsize(0),
-        rss(0), deltaRss(0), monitorPssAndPrivate(false), privateSize(0), pss(0),event() {}
-        void set (double deltaV, double deltaR,
-                  edm::EventID const & e, SimpleMemoryCheck *t)
-        { count = t->count_;
+        SignificantEvent()
+            : count(0),
+              vsize(0),
+              deltaVsize(0),
+              rss(0),
+              deltaRss(0),
+              monitorPssAndPrivate(false),
+              privateSize(0),
+              pss(0),
+              event() {}
+        void set(double deltaV, double deltaR, edm::EventID const& e, SimpleMemoryCheck* t) {
+          count = t->count_;
           vsize = t->current_->vsize;
           deltaVsize = deltaV;
           rss = t->current_->rss;
@@ -175,11 +172,10 @@ namespace edm {
           }
           event = e;
         }
-      }; // SignificantEvent
+      };  // SignificantEvent
       friend struct SignificantEvent;
-      friend std::ostream & operator<< (std::ostream & os,
-                                        SimpleMemoryCheck::SignificantEvent const & se);
-      
+      friend std::ostream& operator<<(std::ostream& os, SimpleMemoryCheck::SignificantEvent const& se);
+
       /*
        Significative events for deltaVsize:
        - eventM_: Event which makes the biggest value for deltaVsize
@@ -203,7 +199,7 @@ namespace edm {
       SignificantEvent eventT1_;
       SignificantEvent eventT2_;
       SignificantEvent eventT3_;
-      
+
       /*
        Significative event for deltaRss:
        - eventRssT1_: Event whith the biggest value for rss
@@ -222,62 +218,51 @@ namespace edm {
       SignificantEvent eventDeltaRssT1_;
       SignificantEvent eventDeltaRssT2_;
       SignificantEvent eventDeltaRssT3_;
-      
-      
-      void updateEventStats(edm::EventID const & e);
-      std::string eventStatOutput(std::string title,
-                                  SignificantEvent const& e) const;
-      void eventStatOutput(std::string title,
-                           SignificantEvent const& e,
-                           std::map<std::string, std::string> &m) const;
+
+      void updateEventStats(edm::EventID const& e);
+      std::string eventStatOutput(std::string title, SignificantEvent const& e) const;
+      void eventStatOutput(std::string title, SignificantEvent const& e, std::map<std::string, std::string>& m) const;
       std::string mallOutput(std::string title, size_t const& n) const;
-      
+
       // Module summary statistices
       struct SignificantModule {
-        int    postEarlyCount;
+        int postEarlyCount;
         double totalDeltaVsize;
         double maxDeltaVsize;
         edm::EventID eventMaxDeltaV;
         double totalEarlyVsize;
         double maxEarlyVsize;
-        SignificantModule() : postEarlyCount  (0)
-        , totalDeltaVsize (0)
-        , maxDeltaVsize   (0)
-        , eventMaxDeltaV  ()
-        , totalEarlyVsize (0)
-        , maxEarlyVsize   (0)     {}
-        void set (double deltaV, bool early);
-      }; // SignificantModule
+        SignificantModule()
+            : postEarlyCount(0),
+              totalDeltaVsize(0),
+              maxDeltaVsize(0),
+              eventMaxDeltaV(),
+              totalEarlyVsize(0),
+              maxEarlyVsize(0) {}
+        void set(double deltaV, bool early);
+      };  // SignificantModule
       friend struct SignificantModule;
-      friend std::ostream & operator<< (std::ostream & os,
-                                        SimpleMemoryCheck::SignificantModule const & se);
+      friend std::ostream& operator<<(std::ostream& os, SimpleMemoryCheck::SignificantModule const& se);
       bool moduleSummaryRequested_;
-      typedef std::map<std::string,SignificantModule> SignificantModulesMap;
+      typedef std::map<std::string, SignificantModule> SignificantModulesMap;
       SignificantModulesMap modules_;
       double moduleEntryVsize_;
-      void updateModuleMemoryStats(SignificantModule & m, double dv, edm::EventID const&);
-      
+      void updateModuleMemoryStats(SignificantModule& m, double dv, edm::EventID const&);
+
       //Used to guarantee we only do one measurement at a time
       std::atomic<bool> measurementUnderway_;
       std::atomic<bool> moduleMeasurementUnderway_;
       std::atomic<unsigned int> moduleStreamID_;
       std::atomic<unsigned int> moduleID_;
-      
-    }; // SimpleMemoryCheck
-    
-    std::ostream & 
-    operator<< (std::ostream & os, 
-                SimpleMemoryCheck::SignificantEvent const & se); 
-    
-    std::ostream & 
-    operator<< (std::ostream & os, 
-                SimpleMemoryCheck::SignificantModule const & se); 
-    
-  }
-}
 
+    };  // SimpleMemoryCheck
 
+    std::ostream& operator<<(std::ostream& os, SimpleMemoryCheck::SignificantEvent const& se);
 
+    std::ostream& operator<<(std::ostream& os, SimpleMemoryCheck::SignificantModule const& se);
+
+  }  // namespace service
+}  // namespace edm
 
 #ifdef __linux__
 #define LINUX 1
@@ -301,10 +286,8 @@ namespace edm {
       return t.str();
     }
 
-    ProcInfo SimpleMemoryCheck::fetch() {
-      return piFetcher_.fetch();
-    }
-    
+    ProcInfo SimpleMemoryCheck::fetch() { return piFetcher_.fetch(); }
+
     smapsInfo SimpleMemoryCheck::fetchSmaps() {
       smapsInfo ret;
       ret.private_ = 0;
@@ -312,7 +295,7 @@ namespace edm {
 #ifdef LINUX
       fseek(smapsFile_, 0, SEEK_SET);
       ssize_t read;
-      
+
       /*
        The format of the report is
        Private_Clean:        0 kB
@@ -320,18 +303,18 @@ namespace edm {
        Swap:                 0 kB
        Pss:                 72 kB
        */
-      
+
       while ((read = getline(&smapsLineBuffer(), &smapsLineBufferLen_, smapsFile_)) != -1) {
-        if(read > 14) {
+        if (read > 14) {
           //Private
-          if(0==strncmp("Private_",smapsLineBuffer_,8)) {
-            unsigned int value = atoi(smapsLineBuffer_+14);
+          if (0 == strncmp("Private_", smapsLineBuffer_, 8)) {
+            unsigned int value = atoi(smapsLineBuffer_ + 14);
             //Convert from kB to MB
-            ret.private_ += static_cast<double>(value)/1024.;
-          } else if(0==strncmp("Pss:",smapsLineBuffer_,4)) {
-            unsigned int value = atoi(smapsLineBuffer_+4);
+            ret.private_ += static_cast<double>(value) / 1024.;
+          } else if (0 == strncmp("Pss:", smapsLineBuffer_, 4)) {
+            unsigned int value = atoi(smapsLineBuffer_ + 4);
             //Convert from kB to MB
-            ret.pss_ += static_cast<double>(value)/1024.;            
+            ret.pss_ += static_cast<double>(value) / 1024.;
           }
         }
       }
@@ -340,36 +323,36 @@ namespace edm {
     }
 
     double SimpleMemoryCheck::averageGrowthRate(double current, double past, int count) {
-      return(current-past)/(double)count;
+      return (current - past) / (double)count;
     }
 
-    SimpleMemoryCheck::SimpleMemoryCheck(ParameterSet const& iPS,
-                                         ActivityRegistry&iReg)
-    : a_()
-    , b_()
-    , current_(&a_)
-    , previous_(&b_)
-    , pg_size_(sysconf(_SC_PAGESIZE)) // getpagesize()
-    , num_to_skip_(iPS.getUntrackedParameter<int>("ignoreTotal"))
-    , showMallocInfo_(iPS.getUntrackedParameter<bool>("showMallocInfo"))
-    , oncePerEventMode_(iPS.getUntrackedParameter<bool>("oncePerEventMode"))
-    , jobReportOutputOnly_(iPS.getUntrackedParameter<bool>("jobReportOutputOnly"))
-    , monitorPssAndPrivate_(iPS.getUntrackedParameter<bool>("monitorPssAndPrivate"))
-    , count_()
-    , smapsFile_(nullptr)
-    , smapsLineBuffer_(nullptr)
-    , smapsLineBufferLen_(0)
-    , growthRateVsize_()
-    , growthRateRss_()
-    , moduleSummaryRequested_(iPS.getUntrackedParameter<bool>("moduleMemorySummary"))
-    , measurementUnderway_(false){
-                                                                // changelog 2
+    SimpleMemoryCheck::SimpleMemoryCheck(ParameterSet const& iPS, ActivityRegistry& iReg)
+        : a_(),
+          b_(),
+          current_(&a_),
+          previous_(&b_),
+          pg_size_(sysconf(_SC_PAGESIZE))  // getpagesize()
+          ,
+          num_to_skip_(iPS.getUntrackedParameter<int>("ignoreTotal")),
+          showMallocInfo_(iPS.getUntrackedParameter<bool>("showMallocInfo")),
+          oncePerEventMode_(iPS.getUntrackedParameter<bool>("oncePerEventMode")),
+          jobReportOutputOnly_(iPS.getUntrackedParameter<bool>("jobReportOutputOnly")),
+          monitorPssAndPrivate_(iPS.getUntrackedParameter<bool>("monitorPssAndPrivate")),
+          count_(),
+          smapsFile_(nullptr),
+          smapsLineBuffer_(nullptr),
+          smapsLineBufferLen_(0),
+          growthRateVsize_(),
+          growthRateRss_(),
+          moduleSummaryRequested_(iPS.getUntrackedParameter<bool>("moduleMemorySummary")),
+          measurementUnderway_(false) {
+      // changelog 2
       // pg_size = (double)getpagesize();
       std::ostringstream ost;
 
       openFiles();
-      
-      if(!oncePerEventMode_) { // default, prints on increases
+
+      if (!oncePerEventMode_) {  // default, prints on increases
         iReg.watchPreSourceConstruction(this, &SimpleMemoryCheck::preSourceConstruction);
         iReg.watchPostSourceConstruction(this, &SimpleMemoryCheck::postSourceConstruction);
         iReg.watchPostSourceEvent(this, &SimpleMemoryCheck::postSourceEvent);
@@ -383,9 +366,9 @@ namespace edm {
         iReg.watchPostEvent(this, &SimpleMemoryCheck::postEvent);
         iReg.watchPostEndJob(this, &SimpleMemoryCheck::postEndJob);
       }
-      if(moduleSummaryRequested_) {                                // changelog 2
+      if (moduleSummaryRequested_) {  // changelog 2
         iReg.watchPreModuleEvent(this, &SimpleMemoryCheck::preModule);
-        if(oncePerEventMode_) {
+        if (oncePerEventMode_) {
           iReg.watchPostModuleEvent(this, &SimpleMemoryCheck::postModule);
         }
       }
@@ -403,36 +386,36 @@ namespace edm {
       typedef MallocOpts::opt_type opt_type;
       MallocOptionSetter& mopts = getGlobalOptionSetter();
 
-      opt_type
-      p_mmap_max = iPS.getUntrackedParameter<int>("M_MMAP_MAX"),
-      p_trim_thr = iPS.getUntrackedParameter<int>("M_TRIM_THRESHOLD"),
-      p_top_pad = iPS.getUntrackedParameter<int>("M_TOP_PAD"),
-      p_mmap_thr = iPS.getUntrackedParameter<int>("M_MMAP_THRESHOLD");
+      opt_type p_mmap_max = iPS.getUntrackedParameter<int>("M_MMAP_MAX"),
+               p_trim_thr = iPS.getUntrackedParameter<int>("M_TRIM_THRESHOLD"),
+               p_top_pad = iPS.getUntrackedParameter<int>("M_TOP_PAD"),
+               p_mmap_thr = iPS.getUntrackedParameter<int>("M_MMAP_THRESHOLD");
 
-      if(p_mmap_max >= 0) mopts.set_mmap_max(p_mmap_max);
-      if(p_trim_thr >= 0) mopts.set_trim_thr(p_trim_thr);
-      if(p_top_pad >= 0) mopts.set_top_pad(p_top_pad);
-      if(p_mmap_thr >= 0) mopts.set_mmap_thr(p_mmap_thr);
+      if (p_mmap_max >= 0)
+        mopts.set_mmap_max(p_mmap_max);
+      if (p_trim_thr >= 0)
+        mopts.set_trim_thr(p_trim_thr);
+      if (p_top_pad >= 0)
+        mopts.set_top_pad(p_top_pad);
+      if (p_mmap_thr >= 0)
+        mopts.set_mmap_thr(p_mmap_thr);
 
       mopts.adjustMallocParams();
 
-      if(mopts.hasErrors()) {
-        LogWarning("MemoryCheck")
-        << "ERROR: Problem with setting malloc options\n"
-        << mopts.error_message();
+      if (mopts.hasErrors()) {
+        LogWarning("MemoryCheck") << "ERROR: Problem with setting malloc options\n" << mopts.error_message();
       }
 
-      if(iPS.getUntrackedParameter<bool>("dump") == true) {
+      if (iPS.getUntrackedParameter<bool>("dump") == true) {
         MallocOpts mo = mopts.get();
-        LogWarning("MemoryCheck")
-        << "Malloc options: " << mo << "\n";
+        LogWarning("MemoryCheck") << "Malloc options: " << mo << "\n";
       }
 #endif
     }
 
     SimpleMemoryCheck::~SimpleMemoryCheck() {
 #ifdef LINUX
-      if(nullptr != smapsFile_) {
+      if (nullptr != smapsFile_) {
         fclose(smapsFile_);
       }
 #endif
@@ -462,220 +445,202 @@ namespace edm {
 #ifdef LINUX
       if (monitorPssAndPrivate_) {
         std::ostringstream smapsNameOst;
-        smapsNameOst <<"/proc/"<<getpid()<<"/smaps";
-        if((smapsFile_ =fopen(smapsNameOst.str().c_str(), "r"))==nullptr) {
-          throw Exception(errors::Configuration) <<"Failed to open smaps file "<<smapsNameOst.str()<<std::endl;
+        smapsNameOst << "/proc/" << getpid() << "/smaps";
+        if ((smapsFile_ = fopen(smapsNameOst.str().c_str(), "r")) == nullptr) {
+          throw Exception(errors::Configuration) << "Failed to open smaps file " << smapsNameOst.str() << std::endl;
         }
       }
 #endif
     }
 
     void SimpleMemoryCheck::postBeginJob() {
-        growthRateVsize_ = current_->vsize;
-        growthRateRss_ = current_->rss;
+      growthRateVsize_ = current_->vsize;
+      growthRateRss_ = current_->rss;
     }
 
     void SimpleMemoryCheck::preSourceConstruction(ModuleDescription const& md) {
       bool expected = false;
-      if(measurementUnderway_.compare_exchange_strong(expected,true,std::memory_order_acq_rel) ) {
-        std::shared_ptr<void> guard(nullptr,[this](void const*) {
-          measurementUnderway_.store(false,std::memory_order_release);
-        });
+      if (measurementUnderway_.compare_exchange_strong(expected, true, std::memory_order_acq_rel)) {
+        std::shared_ptr<void> guard(
+            nullptr, [this](void const*) { measurementUnderway_.store(false, std::memory_order_release); });
         updateAndPrint("pre-ctor", md.moduleLabel(), md.moduleName());
       }
     }
 
-
     void SimpleMemoryCheck::postSourceConstruction(ModuleDescription const& md) {
       bool expected = false;
-      if(measurementUnderway_.compare_exchange_strong(expected,true,std::memory_order_acq_rel) ) {
-        std::shared_ptr<void> guard(nullptr,[this](void const*) {
-          measurementUnderway_.store(false,std::memory_order_release);
-        });
+      if (measurementUnderway_.compare_exchange_strong(expected, true, std::memory_order_acq_rel)) {
+        std::shared_ptr<void> guard(
+            nullptr, [this](void const*) { measurementUnderway_.store(false, std::memory_order_release); });
         updateAndPrint("ctor", md.moduleLabel(), md.moduleName());
       }
     }
 
     void SimpleMemoryCheck::postSourceEvent(StreamID sid) {
       bool expected = false;
-      if(measurementUnderway_.compare_exchange_strong(expected,true,std::memory_order_acq_rel) ) {
-        std::shared_ptr<void> guard(nullptr,[this](void const*) {
-          measurementUnderway_.store(false,std::memory_order_release);
-        });
+      if (measurementUnderway_.compare_exchange_strong(expected, true, std::memory_order_acq_rel)) {
+        std::shared_ptr<void> guard(
+            nullptr, [this](void const*) { measurementUnderway_.store(false, std::memory_order_release); });
         updateAndPrint("module", "source", "source");
       }
     }
 
     void SimpleMemoryCheck::postModuleConstruction(ModuleDescription const& md) {
       bool expected = false;
-      if(measurementUnderway_.compare_exchange_strong(expected,true,std::memory_order_acq_rel) ) {
-        std::shared_ptr<void> guard(nullptr,[this](void const*) {
-          measurementUnderway_.store(false,std::memory_order_release);
-        });
+      if (measurementUnderway_.compare_exchange_strong(expected, true, std::memory_order_acq_rel)) {
+        std::shared_ptr<void> guard(
+            nullptr, [this](void const*) { measurementUnderway_.store(false, std::memory_order_release); });
         updateAndPrint("ctor", md.moduleLabel(), md.moduleName());
       }
     }
 
     void SimpleMemoryCheck::postModuleBeginJob(ModuleDescription const& md) {
       bool expected = false;
-      if(measurementUnderway_.compare_exchange_strong(expected,true,std::memory_order_acq_rel) ) {
-        std::shared_ptr<void> guard(nullptr,[this](void const*) {
-          measurementUnderway_.store(false,std::memory_order_release);
-        });
+      if (measurementUnderway_.compare_exchange_strong(expected, true, std::memory_order_acq_rel)) {
+        std::shared_ptr<void> guard(
+            nullptr, [this](void const*) { measurementUnderway_.store(false, std::memory_order_release); });
         updateAndPrint("beginJob", md.moduleLabel(), md.moduleName());
       }
     }
 
     void SimpleMemoryCheck::postEndJob() {
-      if(not jobReportOutputOnly_) {
-        LogAbsolute("MemoryReport")                                 // changelog 1
-        << "MemoryReport> Peak virtual size " << eventT1_.vsize << " Mbytes"
-        << "\n"
-        << " Key events increasing vsize: \n"
-        << eventL2_ << "\n"
-        << eventL1_ << "\n"
-        << eventM_  << "\n"
-        << eventR1_ << "\n"
-        << eventR2_ << "\n"
-        << eventT3_ << "\n"
-        << eventT2_ << "\n"
-        << eventT1_ ;
+      if (not jobReportOutputOnly_) {
+        LogAbsolute("MemoryReport")  // changelog 1
+            << "MemoryReport> Peak virtual size " << eventT1_.vsize << " Mbytes"
+            << "\n"
+            << " Key events increasing vsize: \n"
+            << eventL2_ << "\n"
+            << eventL1_ << "\n"
+            << eventM_ << "\n"
+            << eventR1_ << "\n"
+            << eventR2_ << "\n"
+            << eventT3_ << "\n"
+            << eventT2_ << "\n"
+            << eventT1_;
       }
-      if(moduleSummaryRequested_ and not jobReportOutputOnly_) {                                // changelog 1
-        LogAbsolute mmr("ModuleMemoryReport"); // at end of if block, mmr
-                                                    // is destructed, causing
-                                                    // message to be logged
+      if (moduleSummaryRequested_ and not jobReportOutputOnly_) {  // changelog 1
+        LogAbsolute mmr("ModuleMemoryReport");                     // at end of if block, mmr
+                                                                   // is destructed, causing
+                                                                   // message to be logged
         mmr << "ModuleMemoryReport> Each line has module label and: \n";
         mmr << "  (after early ignored events) \n";
-        mmr <<
-        "    count of times module executed; average increase in vsize \n";
-        mmr <<
-        "    maximum increase in vsize; event on which maximum occurred \n";
+        mmr << "    count of times module executed; average increase in vsize \n";
+        mmr << "    maximum increase in vsize; event on which maximum occurred \n";
         mmr << "  (during early ignored events) \n";
         mmr << "    total and maximum vsize increases \n \n";
-        for(SignificantModulesMap::iterator im = modules_.begin();
-            im != modules_.end(); ++im) {
+        for (SignificantModulesMap::iterator im = modules_.begin(); im != modules_.end(); ++im) {
           SignificantModule const& m = im->second;
-          if(m.totalDeltaVsize == 0 && m.totalEarlyVsize == 0) continue;
+          if (m.totalDeltaVsize == 0 && m.totalEarlyVsize == 0)
+            continue;
           mmr << im->first << ": ";
           mmr << "n = " << m.postEarlyCount;
-          if(m.postEarlyCount > 0) {
-            mmr << " avg = " << m.totalDeltaVsize/m.postEarlyCount;
+          if (m.postEarlyCount > 0) {
+            mmr << " avg = " << m.totalDeltaVsize / m.postEarlyCount;
           }
-          mmr <<  " max = " << m.maxDeltaVsize << " " << m.eventMaxDeltaV;
-          if(m.totalEarlyVsize > 0) {
+          mmr << " max = " << m.maxDeltaVsize << " " << m.eventMaxDeltaV;
+          if (m.totalEarlyVsize > 0) {
             mmr << " early total: " << m.totalEarlyVsize;
             mmr << " max: " << m.maxEarlyVsize;
           }
           mmr << "\n";
         }
-      } // end of if; mmr goes out of scope; log message is queued
+      }  // end of if; mmr goes out of scope; log message is queued
 
       Service<JobReport> reportSvc;
-                                                                // changelog 1
+      // changelog 1
 #define SIMPLE_MEMORY_CHECK_ORIGINAL_XML_OUTPUT
-#ifdef  SIMPLE_MEMORY_CHECK_ORIGINAL_XML_OUTPUT
-//     std::map<std::string, double> reportData;
+#ifdef SIMPLE_MEMORY_CHECK_ORIGINAL_XML_OUTPUT
+      //     std::map<std::string, double> reportData;
       std::map<std::string, std::string> reportData;
 
-      if(eventL2_.vsize > 0)
-              eventStatOutput("LargeVsizeIncreaseEventL2", eventL2_, reportData);
-      if(eventL1_.vsize > 0)
-              eventStatOutput("LargeVsizeIncreaseEventL1", eventL1_, reportData);
-      if(eventM_.vsize > 0)
-              eventStatOutput("LargestVsizeIncreaseEvent", eventM_,  reportData);
-      if(eventR1_.vsize > 0)
-              eventStatOutput("LargeVsizeIncreaseEventR1", eventR1_, reportData);
-      if(eventR2_.vsize > 0)
-              eventStatOutput("LargeVsizeIncreaseEventR2", eventR2_, reportData);
-      if(eventT3_.vsize > 0)
-              eventStatOutput("ThirdLargestVsizeEventT3",  eventT3_, reportData);
-      if(eventT2_.vsize > 0)
-              eventStatOutput("SecondLargestVsizeEventT2", eventT2_, reportData);
-      if(eventT1_.vsize > 0)
-              eventStatOutput("LargestVsizeEventT1",       eventT1_, reportData);
-
-      if(eventRssT3_.rss > 0)
+      if (eventL2_.vsize > 0)
+        eventStatOutput("LargeVsizeIncreaseEventL2", eventL2_, reportData);
+      if (eventL1_.vsize > 0)
+        eventStatOutput("LargeVsizeIncreaseEventL1", eventL1_, reportData);
+      if (eventM_.vsize > 0)
+        eventStatOutput("LargestVsizeIncreaseEvent", eventM_, reportData);
+      if (eventR1_.vsize > 0)
+        eventStatOutput("LargeVsizeIncreaseEventR1", eventR1_, reportData);
+      if (eventR2_.vsize > 0)
+        eventStatOutput("LargeVsizeIncreaseEventR2", eventR2_, reportData);
+      if (eventT3_.vsize > 0)
+        eventStatOutput("ThirdLargestVsizeEventT3", eventT3_, reportData);
+      if (eventT2_.vsize > 0)
+        eventStatOutput("SecondLargestVsizeEventT2", eventT2_, reportData);
+      if (eventT1_.vsize > 0)
+        eventStatOutput("LargestVsizeEventT1", eventT1_, reportData);
+
+      if (eventRssT3_.rss > 0)
         eventStatOutput("ThirdLargestRssEvent", eventRssT3_, reportData);
-      if(eventRssT2_.rss > 0)
+      if (eventRssT2_.rss > 0)
         eventStatOutput("SecondLargestRssEvent", eventRssT2_, reportData);
-      if(eventRssT1_.rss > 0)
+      if (eventRssT1_.rss > 0)
         eventStatOutput("LargestRssEvent", eventRssT1_, reportData);
-      if(eventDeltaRssT3_.deltaRss > 0)
+      if (eventDeltaRssT3_.deltaRss > 0)
         eventStatOutput("ThirdLargestIncreaseRssEvent", eventDeltaRssT3_, reportData);
-      if(eventDeltaRssT2_.deltaRss > 0)
+      if (eventDeltaRssT2_.deltaRss > 0)
         eventStatOutput("SecondLargestIncreaseRssEvent", eventDeltaRssT2_, reportData);
-      if(eventDeltaRssT1_.deltaRss > 0)
+      if (eventDeltaRssT1_.deltaRss > 0)
         eventStatOutput("LargestIncreaseRssEvent", eventDeltaRssT1_, reportData);
 
 #ifdef __linux__
       struct mallinfo minfo = mallinfo();
-      reportData.insert(
-        std::make_pair("HEAP_ARENA_SIZE_BYTES", i2str(minfo.arena)));
-      reportData.insert(
-        std::make_pair("HEAP_ARENA_N_UNUSED_CHUNKS", i2str(minfo.ordblks)));
-      reportData.insert(
-        std::make_pair("HEAP_TOP_FREE_BYTES", i2str(minfo.keepcost)));
-      reportData.insert(
-        std::make_pair("HEAP_MAPPED_SIZE_BYTES", i2str(minfo.hblkhd)));
-      reportData.insert(
-        std::make_pair("HEAP_MAPPED_N_CHUNKS", i2str(minfo.hblks)));
-      reportData.insert(
-        std::make_pair("HEAP_USED_BYTES", i2str(minfo.uordblks)));
-      reportData.insert(
-        std::make_pair("HEAP_UNUSED_BYTES", i2str(minfo.fordblks)));
+      reportData.insert(std::make_pair("HEAP_ARENA_SIZE_BYTES", i2str(minfo.arena)));
+      reportData.insert(std::make_pair("HEAP_ARENA_N_UNUSED_CHUNKS", i2str(minfo.ordblks)));
+      reportData.insert(std::make_pair("HEAP_TOP_FREE_BYTES", i2str(minfo.keepcost)));
+      reportData.insert(std::make_pair("HEAP_MAPPED_SIZE_BYTES", i2str(minfo.hblkhd)));
+      reportData.insert(std::make_pair("HEAP_MAPPED_N_CHUNKS", i2str(minfo.hblks)));
+      reportData.insert(std::make_pair("HEAP_USED_BYTES", i2str(minfo.uordblks)));
+      reportData.insert(std::make_pair("HEAP_UNUSED_BYTES", i2str(minfo.fordblks)));
 #endif
 
       // Report Growth rates for VSize and Rss
+      reportData.insert(std::make_pair("AverageGrowthRateVsize",
+                                       d2str(averageGrowthRate(current_->vsize, growthRateVsize_, count_))));
+      reportData.insert(std::make_pair("PeakValueVsize", d2str(eventT1_.vsize)));
       reportData.insert(
-        std::make_pair("AverageGrowthRateVsize", d2str(averageGrowthRate(current_->vsize, growthRateVsize_, count_))));
-      reportData.insert(
-        std::make_pair("PeakValueVsize", d2str(eventT1_.vsize)));
-      reportData.insert(
-        std::make_pair("AverageGrowthRateRss", d2str(averageGrowthRate(current_->rss, growthRateRss_, count_))));
-      reportData.insert(
-        std::make_pair("PeakValueRss", d2str(eventRssT1_.rss)));
+          std::make_pair("AverageGrowthRateRss", d2str(averageGrowthRate(current_->rss, growthRateRss_, count_))));
+      reportData.insert(std::make_pair("PeakValueRss", d2str(eventRssT1_.rss)));
 
-      if(moduleSummaryRequested_) {                                // changelog 2
-        for(SignificantModulesMap::iterator im = modules_.begin();
-            im != modules_.end(); ++im) {
+      if (moduleSummaryRequested_) {  // changelog 2
+        for (SignificantModulesMap::iterator im = modules_.begin(); im != modules_.end(); ++im) {
           SignificantModule const& m = im->second;
-          if(m.totalDeltaVsize == 0 && m.totalEarlyVsize == 0) continue;
-          std::string label = im->first+":";
-          reportData.insert(std::make_pair(label+"PostEarlyCount", i2str(m.postEarlyCount)));
-          if(m.postEarlyCount > 0) {
-            reportData.insert(std::make_pair(label+"AverageDeltaVsize",
-                                             d2str(m.totalDeltaVsize/m.postEarlyCount)));
+          if (m.totalDeltaVsize == 0 && m.totalEarlyVsize == 0)
+            continue;
+          std::string label = im->first + ":";
+          reportData.insert(std::make_pair(label + "PostEarlyCount", i2str(m.postEarlyCount)));
+          if (m.postEarlyCount > 0) {
+            reportData.insert(std::make_pair(label + "AverageDeltaVsize", d2str(m.totalDeltaVsize / m.postEarlyCount)));
           }
-                reportData.insert(std::make_pair(label+"MaxDeltaVsize", d2str(m.maxDeltaVsize)));
-          if(m.totalEarlyVsize > 0) {
-            reportData.insert(std::make_pair(label+"TotalEarlyVsize", d2str(m.totalEarlyVsize)));
-            reportData.insert(std::make_pair(label+"MaxEarlyDeltaVsize", d2str(m.maxEarlyVsize)));
+          reportData.insert(std::make_pair(label + "MaxDeltaVsize", d2str(m.maxDeltaVsize)));
+          if (m.totalEarlyVsize > 0) {
+            reportData.insert(std::make_pair(label + "TotalEarlyVsize", d2str(m.totalEarlyVsize)));
+            reportData.insert(std::make_pair(label + "MaxEarlyDeltaVsize", d2str(m.maxEarlyVsize)));
           }
         }
       }
 
       std::map<std::string, std::string> reportMemoryProperties;
 
-      if(FILE* fmeminfo = fopen("/proc/meminfo", "r")) {
+      if (FILE* fmeminfo = fopen("/proc/meminfo", "r")) {
         char buf[128];
         char space[] = " ";
         size_t value;
-        while(fgets(buf, sizeof(buf), fmeminfo)) {
+        while (fgets(buf, sizeof(buf), fmeminfo)) {
           char* saveptr;
           char* token = nullptr;
           token = strtok_r(buf, space, &saveptr);
-          if(token != nullptr) {
-            value = atol(strtok_r(nullptr, space,&saveptr));
+          if (token != nullptr) {
+            value = atol(strtok_r(nullptr, space, &saveptr));
             std::string category = token;
-            reportMemoryProperties.insert(std::make_pair(category.substr(0, strlen(token)-1), i2str(value)));
+            reportMemoryProperties.insert(std::make_pair(category.substr(0, strlen(token) - 1), i2str(value)));
           }
         }
 
         fclose(fmeminfo);
       }
 
-//      reportSvc->reportMemoryInfo(reportData, reportMemoryProperties);
+      //      reportSvc->reportMemoryInfo(reportData, reportMemoryProperties);
       reportSvc->reportPerformanceSummary("ApplicationMemory", reportData);
       reportSvc->reportPerformanceSummary("SystemMemory", reportMemoryProperties);
 #endif
@@ -683,80 +648,70 @@ namespace edm {
 #ifdef SIMPLE_MEMORY_CHECK_DIFFERENT_XML_OUTPUT
       std::vector<std::string> reportData;
 
-      if(eventL2_.vsize > 0) reportData.push_back(
-              eventStatOutput("LargeVsizeIncreaseEventL2", eventL2_));
-      if(eventL1_.vsize > 0) reportData.push_back(
-              eventStatOutput("LargeVsizeIncreaseEventL1", eventL1_));
-      if(eventM_.vsize > 0) reportData.push_back(
-              eventStatOutput("LargestVsizeIncreaseEvent", eventM_));
-      if(eventR1_.vsize > 0) reportData.push_back(
-              eventStatOutput("LargeVsizeIncreaseEventR1", eventR1_));
-      if(eventR2_.vsize > 0) reportData.push_back(
-              eventStatOutput("LargeVsizeIncreaseEventR2", eventR2_));
-      if(eventT3_.vsize > 0) reportData.push_back(
-              eventStatOutput("ThirdLargestVsizeEventT3", eventT3_));
-      if(eventT2_.vsize > 0) reportData.push_back(
-              eventStatOutput("SecondLargestVsizeEventT2", eventT2_));
-      if(eventT1_.vsize > 0) reportData.push_back(
-              eventStatOutput("LargestVsizeEventT1", eventT1_));
-
-      if(eventRssT3_.rss > 0)
+      if (eventL2_.vsize > 0)
+        reportData.push_back(eventStatOutput("LargeVsizeIncreaseEventL2", eventL2_));
+      if (eventL1_.vsize > 0)
+        reportData.push_back(eventStatOutput("LargeVsizeIncreaseEventL1", eventL1_));
+      if (eventM_.vsize > 0)
+        reportData.push_back(eventStatOutput("LargestVsizeIncreaseEvent", eventM_));
+      if (eventR1_.vsize > 0)
+        reportData.push_back(eventStatOutput("LargeVsizeIncreaseEventR1", eventR1_));
+      if (eventR2_.vsize > 0)
+        reportData.push_back(eventStatOutput("LargeVsizeIncreaseEventR2", eventR2_));
+      if (eventT3_.vsize > 0)
+        reportData.push_back(eventStatOutput("ThirdLargestVsizeEventT3", eventT3_));
+      if (eventT2_.vsize > 0)
+        reportData.push_back(eventStatOutput("SecondLargestVsizeEventT2", eventT2_));
+      if (eventT1_.vsize > 0)
+        reportData.push_back(eventStatOutput("LargestVsizeEventT1", eventT1_));
+
+      if (eventRssT3_.rss > 0)
         eventStatOutput("ThirdLargestRssEvent", eventRssT3_, reportData);
-      if(eventRssT2_.rss > 0)
+      if (eventRssT2_.rss > 0)
         eventStatOutput("SecondLargestRssEvent", eventRssT2_, reportData);
-      if(eventRssT1_.rss > 0)
+      if (eventRssT1_.rss > 0)
         eventStatOutput("LargestRssEvent", eventRssT1_, reportData);
-      if(eventDeltaRssT3_.deltaRss > 0)
+      if (eventDeltaRssT3_.deltaRss > 0)
         eventStatOutput("ThirdLargestIncreaseRssEvent", eventDeltaRssT3_, reportData);
-      if(eventDeltaRssT2_.deltaRss > 0)
+      if (eventDeltaRssT2_.deltaRss > 0)
         eventStatOutput("SecondLargestIncreaseRssEvent", eventDeltaRssT2_, reportData);
-      if(eventDeltaRssT1_.deltaRss > 0)
+      if (eventDeltaRssT1_.deltaRss > 0)
         eventStatOutput("LargestIncreaseRssEvent", eventDeltaRssT1_, reportData);
 
       struct mallinfo minfo = mallinfo();
-      reportData.push_back(
-        mallOutput("HEAP_ARENA_SIZE_BYTES", minfo.arena));
-      reportData.push_back(
-        mallOutput("HEAP_ARENA_N_UNUSED_CHUNKS", minfo.ordblks));
-      reportData.push_back(
-        mallOutput("HEAP_TOP_FREE_BYTES", minfo.keepcost));
-      reportData.push_back(
-        mallOutput("HEAP_MAPPED_SIZE_BYTES", minfo.hblkhd));
-      reportData.push_back(
-        mallOutput("HEAP_MAPPED_N_CHUNKS", minfo.hblks));
-      reportData.push_back(
-        mallOutput("HEAP_USED_BYTES", minfo.uordblks));
-      reportData.push_back(
-        mallOutput("HEAP_UNUSED_BYTES", minfo.fordblks));
+      reportData.push_back(mallOutput("HEAP_ARENA_SIZE_BYTES", minfo.arena));
+      reportData.push_back(mallOutput("HEAP_ARENA_N_UNUSED_CHUNKS", minfo.ordblks));
+      reportData.push_back(mallOutput("HEAP_TOP_FREE_BYTES", minfo.keepcost));
+      reportData.push_back(mallOutput("HEAP_MAPPED_SIZE_BYTES", minfo.hblkhd));
+      reportData.push_back(mallOutput("HEAP_MAPPED_N_CHUNKS", minfo.hblks));
+      reportData.push_back(mallOutput("HEAP_USED_BYTES", minfo.uordblks));
+      reportData.push_back(mallOutput("HEAP_UNUSED_BYTES", minfo.fordblks));
 
       // Report Growth rates for VSize and Rss
+      reportData.insert(std::make_pair("AverageGrowthRateVsize",
+                                       d2str(averageGrowthRate(current_->vsize, growthRateVsize_, count_))));
+      reportData.insert(std::make_pair("PeakValueVsize", d2str(eventT1_.vsize)));
       reportData.insert(
-        std::make_pair("AverageGrowthRateVsize", d2str(averageGrowthRate(current_->vsize, growthRateVsize_, count_))));
-      reportData.insert(
-        std::make_pair("PeakValueVsize", d2str(eventT1_.vsize)));
-      reportData.insert(
-        std::make_pair("AverageGrowthRateRss", d2str(averageGrowthRate(current_->rss, growthRateRss_, count_))));
-      reportData.insert(
-        std::make_pair("PeakValueRss", d2str(eventRssT1_.rss)));
+          std::make_pair("AverageGrowthRateRss", d2str(averageGrowthRate(current_->rss, growthRateRss_, count_))));
+      reportData.insert(std::make_pair("PeakValueRss", d2str(eventRssT1_.rss)));
 
       reportSvc->reportMemoryInfo(reportData);
       // This is a form of reportMemoryInfo taking s vector, not a map
 #endif
-    } // postEndJob
+    }  // postEndJob
 
-    void SimpleMemoryCheck::postEvent(StreamContext const&iContext) {
+    void SimpleMemoryCheck::postEvent(StreamContext const& iContext) {
       ++count_;
       bool expected = false;
-      if(measurementUnderway_.compare_exchange_strong(expected,true,std::memory_order_acq_rel) ) {
-        std::shared_ptr<void> guard(nullptr,[this](void const*) {
-          measurementUnderway_.store(false,std::memory_order_release);
-        });
+      if (measurementUnderway_.compare_exchange_strong(expected, true, std::memory_order_acq_rel)) {
+        std::shared_ptr<void> guard(
+            nullptr, [this](void const*) { measurementUnderway_.store(false, std::memory_order_release); });
         update();
         if (monitorPssAndPrivate_) {
           currentSmaps_ = fetchSmaps();
         }
         updateEventStats(iContext.eventID());
-        if(oncePerEventMode_) {
+        if (oncePerEventMode_) {
           // should probably use be Run:Event or count_ for the label and name
           updateMax();
           andPrint("event", "", "");
@@ -766,54 +721,51 @@ namespace edm {
 
     void SimpleMemoryCheck::preModule(StreamContext const& iStreamContext, ModuleCallingContext const& iModuleContext) {
       bool expected = false;
-      if(measurementUnderway_.compare_exchange_strong(expected,true,std::memory_order_acq_rel) ) {
-        std::shared_ptr<void> guard(nullptr,[this](void const*) {
-          measurementUnderway_.store(false,std::memory_order_release);
-        });
+      if (measurementUnderway_.compare_exchange_strong(expected, true, std::memory_order_acq_rel)) {
+        std::shared_ptr<void> guard(
+            nullptr, [this](void const*) { measurementUnderway_.store(false, std::memory_order_release); });
         bool expected = false;
-        if(moduleMeasurementUnderway_.compare_exchange_strong(expected,true) ) {
+        if (moduleMeasurementUnderway_.compare_exchange_strong(expected, true)) {
           update();
           // changelog 2
           moduleEntryVsize_ = current_->vsize;
           moduleStreamID_.store(iStreamContext.streamID().value(), std::memory_order_release);
-          moduleID_.store(iModuleContext.moduleDescription()->id(),std::memory_order_release);
+          moduleID_.store(iModuleContext.moduleDescription()->id(), std::memory_order_release);
         }
       }
     }
 
-    void SimpleMemoryCheck::postModule(StreamContext const& iStreamContext, ModuleCallingContext const& iModuleContext) {
-      if(!oncePerEventMode_) {
+    void SimpleMemoryCheck::postModule(StreamContext const& iStreamContext,
+                                       ModuleCallingContext const& iModuleContext) {
+      if (!oncePerEventMode_) {
         bool expected = false;
-        if(measurementUnderway_.compare_exchange_strong(expected,true,std::memory_order_acq_rel) ) {
-          std::shared_ptr<void> guard(nullptr,[this](void const*) {
-            measurementUnderway_.store(false,std::memory_order_release);
-          });
+        if (measurementUnderway_.compare_exchange_strong(expected, true, std::memory_order_acq_rel)) {
+          std::shared_ptr<void> guard(
+              nullptr, [this](void const*) { measurementUnderway_.store(false, std::memory_order_release); });
           auto const md = iModuleContext.moduleDescription();
           updateAndPrint("module", md->moduleLabel(), md->moduleName());
         }
       }
-      
-      if(moduleSummaryRequested_) {
+
+      if (moduleSummaryRequested_) {
         //is this the module instance we are measuring?
-        if(moduleMeasurementUnderway_.load(std::memory_order_acquire) and
-           (iStreamContext.streamID().value()==moduleStreamID_.load(std::memory_order_acquire) ) and
-           (iModuleContext.moduleDescription()->id() == moduleID_.load(std::memory_order_acquire))) {
+        if (moduleMeasurementUnderway_.load(std::memory_order_acquire) and
+            (iStreamContext.streamID().value() == moduleStreamID_.load(std::memory_order_acquire)) and
+            (iModuleContext.moduleDescription()->id() == moduleID_.load(std::memory_order_acquire))) {
           //Need to release our module measurement lock
-          std::shared_ptr<void> guard(nullptr,[this](void const*) {
-            moduleMeasurementUnderway_.store(false,std::memory_order_release);
-          });
+          std::shared_ptr<void> guard(
+              nullptr, [this](void const*) { moduleMeasurementUnderway_.store(false, std::memory_order_release); });
           bool expected = false;
-          if(measurementUnderway_.compare_exchange_strong(expected,true,std::memory_order_acq_rel) ) {
-            std::shared_ptr<void> guard(nullptr,[this](void const*) {
-              measurementUnderway_.store(false,std::memory_order_release);
-            });
-            if(oncePerEventMode_) {
+          if (measurementUnderway_.compare_exchange_strong(expected, true, std::memory_order_acq_rel)) {
+            std::shared_ptr<void> guard(
+                nullptr, [this](void const*) { measurementUnderway_.store(false, std::memory_order_release); });
+            if (oncePerEventMode_) {
               update();
             }
             // changelog 2
             double dv = current_->vsize - moduleEntryVsize_;
-            std::string label =  iModuleContext.moduleDescription()->moduleLabel();
-            updateModuleMemoryStats (modules_[label], dv, iStreamContext.eventID());
+            std::string label = iModuleContext.moduleDescription()->moduleLabel();
+            updateModuleMemoryStats(modules_[label], dv, iStreamContext.eventID());
           }
         }
       }
@@ -825,18 +777,19 @@ namespace edm {
     }
 
     void SimpleMemoryCheck::updateMax() {
-      if((*current_ > max_) || oncePerEventMode_) {
-          if(count_ >= num_to_skip_) {
-          }
-          max_ = *current_;
+      if ((*current_ > max_) || oncePerEventMode_) {
+        if (count_ >= num_to_skip_) {
         }
+        max_ = *current_;
+      }
     }
 
     void SimpleMemoryCheck::updateEventStats(EventID const& e) {
-      if(count_ < num_to_skip_) return;
-      if(count_ == num_to_skip_) {
+      if (count_ < num_to_skip_)
+        return;
+      if (count_ == num_to_skip_) {
         eventT1_.set(0, 0, e, this);
-        eventM_.set (0, 0, e, this);
+        eventM_.set(0, 0, e, this);
         eventRssT1_.set(0, 0, e, this);
         eventDeltaRssT1_.set(0, 0, e, this);
         return;
@@ -845,23 +798,23 @@ namespace edm {
       double deltaVsize = vsize - eventT1_.vsize;
 
       // Update significative events for Vsize
-      if(vsize > eventT1_.vsize) {
+      if (vsize > eventT1_.vsize) {
         double deltaRss = current_->rss - eventT1_.rss;
         eventT3_ = eventT2_;
         eventT2_ = eventT1_;
         eventT1_.set(deltaVsize, deltaRss, e, this);
-      } else if(vsize > eventT2_.vsize) {
+      } else if (vsize > eventT2_.vsize) {
         double deltaRss = current_->rss - eventT1_.rss;
         eventT3_ = eventT2_;
         eventT2_.set(deltaVsize, deltaRss, e, this);
-      } else if(vsize > eventT3_.vsize) {
+      } else if (vsize > eventT3_.vsize) {
         double deltaRss = current_->rss - eventT1_.rss;
         eventT3_.set(deltaVsize, deltaRss, e, this);
       }
 
-      if(deltaVsize > eventM_.deltaVsize) {
+      if (deltaVsize > eventM_.deltaVsize) {
         double deltaRss = current_->rss - eventM_.rss;
-        if(eventL1_.deltaVsize >= eventR1_.deltaVsize) {
+        if (eventL1_.deltaVsize >= eventR1_.deltaVsize) {
           eventL2_ = eventL1_;
         } else {
           eventL2_ = eventR1_;
@@ -870,11 +823,11 @@ namespace edm {
         eventM_.set(deltaVsize, deltaRss, e, this);
         eventR1_ = SignificantEvent();
         eventR2_ = SignificantEvent();
-      } else if(deltaVsize > eventR1_.deltaVsize) {
+      } else if (deltaVsize > eventR1_.deltaVsize) {
         double deltaRss = current_->rss - eventM_.rss;
         eventR2_ = eventR1_;
         eventR1_.set(deltaVsize, deltaRss, e, this);
-      } else if(deltaVsize > eventR2_.deltaVsize) {
+      } else if (deltaVsize > eventR2_.deltaVsize) {
         double deltaRss = current_->rss - eventR1_.rss;
         eventR2_.set(deltaVsize, deltaRss, e, this);
       }
@@ -883,121 +836,129 @@ namespace edm {
       double rss = current_->rss;
       double deltaRss = rss - eventRssT1_.rss;
 
-      if(rss > eventRssT1_.rss) {
+      if (rss > eventRssT1_.rss) {
         eventRssT3_ = eventRssT2_;
         eventRssT2_ = eventRssT1_;
         eventRssT1_.set(deltaVsize, deltaRss, e, this);
-      } else if(rss > eventRssT2_.rss) {
+      } else if (rss > eventRssT2_.rss) {
         eventRssT3_ = eventRssT2_;
         eventRssT2_.set(deltaVsize, deltaRss, e, this);
-      } else if(rss > eventRssT3_.rss) {
+      } else if (rss > eventRssT3_.rss) {
         eventRssT3_.set(deltaVsize, deltaRss, e, this);
       }
-      if(deltaRss > eventDeltaRssT1_.deltaRss) {
+      if (deltaRss > eventDeltaRssT1_.deltaRss) {
         eventDeltaRssT3_ = eventDeltaRssT2_;
         eventDeltaRssT2_ = eventDeltaRssT1_;
         eventDeltaRssT1_.set(deltaVsize, deltaRss, e, this);
-      } else if(deltaRss > eventDeltaRssT2_.deltaRss) {
+      } else if (deltaRss > eventDeltaRssT2_.deltaRss) {
         eventDeltaRssT3_ = eventDeltaRssT2_;
         eventDeltaRssT2_.set(deltaVsize, deltaRss, e, this);
-      } else if(deltaRss > eventDeltaRssT3_.deltaRss) {
+      } else if (deltaRss > eventDeltaRssT3_.deltaRss) {
         eventDeltaRssT3_.set(deltaVsize, deltaRss, e, this);
       }
-    } // updateEventStats
+    }  // updateEventStats
 
     void SimpleMemoryCheck::andPrint(std::string const& type,
-                    std::string const& mdlabel, std::string const& mdname) const {
-      if(not jobReportOutputOnly_ && ((*current_ > max_) || oncePerEventMode_)) {
-        if(count_ >= num_to_skip_) {
+                                     std::string const& mdlabel,
+                                     std::string const& mdname) const {
+      if (not jobReportOutputOnly_ && ((*current_ > max_) || oncePerEventMode_)) {
+        if (count_ >= num_to_skip_) {
           double deltaVSIZE = current_->vsize - max_.vsize;
-          double deltaRSS   = current_->rss - max_.rss;
-          if(!showMallocInfo_) {  // default
-            LogWarning("MemoryCheck")
-            << "MemoryCheck: " << type << " "
-            << mdname << ":" << mdlabel
-            << " VSIZE " << current_->vsize << " " << deltaVSIZE
-            << " RSS " << current_->rss << " " << deltaRSS;
+          double deltaRSS = current_->rss - max_.rss;
+          if (!showMallocInfo_) {  // default
+            LogWarning("MemoryCheck") << "MemoryCheck: " << type << " " << mdname << ":" << mdlabel << " VSIZE "
+                                      << current_->vsize << " " << deltaVSIZE << " RSS " << current_->rss << " "
+                                      << deltaRSS;
           } else {
 #ifdef __linux__
             struct mallinfo minfo = mallinfo();
 #endif
-            LogWarning("MemoryCheck")
-            << "MemoryCheck: " << type << " "
-            << mdname << ":" << mdlabel
-            << " VSIZE " << current_->vsize << " " << deltaVSIZE
-            << " RSS " << current_->rss << " " << deltaRSS
+            LogWarning("MemoryCheck") << "MemoryCheck: " << type << " " << mdname << ":" << mdlabel << " VSIZE "
+                                      << current_->vsize << " " << deltaVSIZE << " RSS " << current_->rss << " "
+                                      << deltaRSS
 #ifdef __linux__
-            << " HEAP-ARENA [ SIZE-BYTES " << minfo.arena
-            << " N-UNUSED-CHUNKS " << minfo.ordblks
-            << " TOP-FREE-BYTES " << minfo.keepcost << " ]"
-            << " HEAP-MAPPED [ SIZE-BYTES " << minfo.hblkhd
-            << " N-CHUNKS " << minfo.hblks << " ]"
-            << " HEAP-USED-BYTES " << minfo.uordblks
-            << " HEAP-UNUSED-BYTES " << minfo.fordblks
+                                      << " HEAP-ARENA [ SIZE-BYTES " << minfo.arena << " N-UNUSED-CHUNKS "
+                                      << minfo.ordblks << " TOP-FREE-BYTES " << minfo.keepcost << " ]"
+                                      << " HEAP-MAPPED [ SIZE-BYTES " << minfo.hblkhd << " N-CHUNKS " << minfo.hblks
+                                      << " ]"
+                                      << " HEAP-USED-BYTES " << minfo.uordblks << " HEAP-UNUSED-BYTES "
+                                      << minfo.fordblks
 #endif
-            ;
+                ;
           }
         }
       }
     }
 
     void SimpleMemoryCheck::updateAndPrint(std::string const& type,
-                    std::string const& mdlabel, std::string const& mdname) {
+                                           std::string const& mdlabel,
+                                           std::string const& mdname) {
       update();
       andPrint(type, mdlabel, mdname);
       updateMax();
     }
 
 #ifdef SIMPLE_MEMORY_CHECK_ORIGINAL_XML_OUTPUT
-    void
-    SimpleMemoryCheck::eventStatOutput(std::string title,
-                                       SignificantEvent const& e,
-                                       std::map<std::string, std::string>& m) const {
-      { std::ostringstream os;
+    void SimpleMemoryCheck::eventStatOutput(std::string title,
+                                            SignificantEvent const& e,
+                                            std::map<std::string, std::string>& m) const {
+      {
+        std::ostringstream os;
         os << title << "-a-COUNT";
-        m.insert(std::make_pair(os.str(), i2str(e.count))); }
-      { std::ostringstream os;
+        m.insert(std::make_pair(os.str(), i2str(e.count)));
+      }
+      {
+        std::ostringstream os;
         os << title << "-b-RUN";
-        m.insert(std::make_pair(os.str(), d2str(static_cast<double>(e.event.run())))); }
-      { std::ostringstream os;
+        m.insert(std::make_pair(os.str(), d2str(static_cast<double>(e.event.run()))));
+      }
+      {
+        std::ostringstream os;
         os << title << "-c-EVENT";
-        m.insert(std::make_pair(os.str(), d2str(static_cast<double>(e.event.event())))); }
-      { std::ostringstream os;
+        m.insert(std::make_pair(os.str(), d2str(static_cast<double>(e.event.event()))));
+      }
+      {
+        std::ostringstream os;
         os << title << "-d-VSIZE";
-        m.insert(std::make_pair(os.str(), d2str(e.vsize))); }
-      { std::ostringstream os;
+        m.insert(std::make_pair(os.str(), d2str(e.vsize)));
+      }
+      {
+        std::ostringstream os;
         os << title << "-e-DELTV";
-        m.insert(std::make_pair(os.str(), d2str(e.deltaVsize))); }
-      { std::ostringstream os;
+        m.insert(std::make_pair(os.str(), d2str(e.deltaVsize)));
+      }
+      {
+        std::ostringstream os;
         os << title << "-f-RSS";
-        m.insert(std::make_pair(os.str(), d2str(e.rss))); }
+        m.insert(std::make_pair(os.str(), d2str(e.rss)));
+      }
       if (monitorPssAndPrivate_) {
-        { std::ostringstream os;
+        {
+          std::ostringstream os;
           os << title << "-g-PRIVATE";
-          m.insert(std::make_pair(os.str(), d2str(e.privateSize))); }
-        { std::ostringstream os;
+          m.insert(std::make_pair(os.str(), d2str(e.privateSize)));
+        }
+        {
+          std::ostringstream os;
           os << title << "-h-PSS";
-          m.insert(std::make_pair(os.str(), d2str(e.pss))); }
+          m.insert(std::make_pair(os.str(), d2str(e.pss)));
+        }
       }
-    } // eventStatOutput
+    }  // eventStatOutput
 #endif
 
 #ifdef SIMPLE_MEMORY_CHECK_DIFFERENT_XML_OUTPUT
-    std::string
-    SimpleMemoryCheck::eventStatOutput(std::string title,
-                                           SignificantEvent const& e) const {
+    std::string SimpleMemoryCheck::eventStatOutput(std::string title, SignificantEvent const& e) const {
       std::ostringstream os;
       os << "  <" << title << ">\n";
       os << "    " << e.count << ": " << e.event;
-      os << " vsize " << e.vsize-e.deltaVsize << " + " << e.deltaVsize
-                                              << " = " << e.vsize;
+      os << " vsize " << e.vsize - e.deltaVsize << " + " << e.deltaVsize << " = " << e.vsize;
       os << "  rss: " << e.rss << "\n";
       os << "  </" << title << ">\n";
       return os.str();
-    } // eventStatOutput
+    }  // eventStatOutput
 
-    std::string
-    SimpleMemoryCheck::mallOutput(std::string title, size_t const& n) const {
+    std::string SimpleMemoryCheck::mallOutput(std::string title, size_t const& n) const {
       std::ostringstream os;
       os << "  <" << title << ">\n";
       os << "    " << n << "\n";
@@ -1005,60 +966,51 @@ namespace edm {
       return os.str();
     }
 #endif
-                                                                // changelog 2
-    void
-    SimpleMemoryCheck::updateModuleMemoryStats(SignificantModule& m,
-                                               double dv, edm::EventID const& currentEventID) {
-      if(count_ < num_to_skip_) {
+    // changelog 2
+    void SimpleMemoryCheck::updateModuleMemoryStats(SignificantModule& m,
+                                                    double dv,
+                                                    edm::EventID const& currentEventID) {
+      if (count_ < num_to_skip_) {
         m.totalEarlyVsize += dv;
-        if(dv > m.maxEarlyVsize)  m.maxEarlyVsize = dv;
+        if (dv > m.maxEarlyVsize)
+          m.maxEarlyVsize = dv;
       } else {
         ++m.postEarlyCount;
         m.totalDeltaVsize += dv;
-        if(dv > m.maxDeltaVsize) {
+        if (dv > m.maxDeltaVsize) {
           m.maxDeltaVsize = dv;
           m.eventMaxDeltaV = currentEventID;
         }
       }
-    } //updateModuleMemoryStats
+    }  //updateModuleMemoryStats
 
-    std::ostream&
-    operator<< (std::ostream& os,
-                SimpleMemoryCheck::SignificantEvent const& se) {
-      os << "[" << se.count << "] "
-      << se.event << "  vsize = " << se.vsize
-      << " deltaVsize = " << se.deltaVsize
-      << " rss = " << se.rss << " delta = " << se.deltaRss;
+    std::ostream& operator<<(std::ostream& os, SimpleMemoryCheck::SignificantEvent const& se) {
+      os << "[" << se.count << "] " << se.event << "  vsize = " << se.vsize << " deltaVsize = " << se.deltaVsize
+         << " rss = " << se.rss << " delta = " << se.deltaRss;
 
       if (se.monitorPssAndPrivate) {
-        os <<" private = "<<se.privateSize<<" pss = "<<se.pss;
+        os << " private = " << se.privateSize << " pss = " << se.pss;
       }
       return os;
     }
 
-    std::ostream&
-    operator<< (std::ostream& os,
-                SimpleMemoryCheck::SignificantModule const& sm) {
-      if(sm.postEarlyCount > 0) {
+    std::ostream& operator<<(std::ostream& os, SimpleMemoryCheck::SignificantModule const& sm) {
+      if (sm.postEarlyCount > 0) {
         os << "\nPost Early Events:  TotalDeltaVsize: " << sm.totalDeltaVsize
-        << " (avg: " << sm.totalDeltaVsize/sm.postEarlyCount
-        << "; max: " << sm.maxDeltaVsize
-        << " during " << sm.eventMaxDeltaV << ")";
+           << " (avg: " << sm.totalDeltaVsize / sm.postEarlyCount << "; max: " << sm.maxDeltaVsize << " during "
+           << sm.eventMaxDeltaV << ")";
       }
-      if(sm.totalEarlyVsize > 0) {
-        os << "\n     Early Events:  TotalDeltaVsize: " << sm.totalEarlyVsize
-        << " (max: " << sm.maxEarlyVsize << ")";
+      if (sm.totalEarlyVsize > 0) {
+        os << "\n     Early Events:  TotalDeltaVsize: " << sm.totalEarlyVsize << " (max: " << sm.maxEarlyVsize << ")";
       }
 
       return os;
     }
 
-  } // end namespace service
-} // end namespace edm
-
+  }  // end namespace service
+}  // end namespace edm
 
 #if defined(__linux__)
 using edm::service::SimpleMemoryCheck;
 DEFINE_FWK_SERVICE(SimpleMemoryCheck);
 #endif
-
diff --git a/FWCore/Services/plugins/StallMonitor.cc b/FWCore/Services/plugins/StallMonitor.cc
index 643a077a2c7f6..8cb7fa530aac3 100644
--- a/FWCore/Services/plugins/StallMonitor.cc
+++ b/FWCore/Services/plugins/StallMonitor.cc
@@ -39,20 +39,13 @@ namespace {
   using clock_t = std::chrono::steady_clock;
   auto now = clock_t::now;
 
-  inline auto stream_id(edm::StreamContext const& cs)
-  {
-    return cs.streamID().value();
-  }
+  inline auto stream_id(edm::StreamContext const& cs) { return cs.streamID().value(); }
 
-  inline auto module_id(edm::ModuleCallingContext const& mcc)
-  {
-    return mcc.moduleDescription()->id();
-  }
+  inline auto module_id(edm::ModuleCallingContext const& mcc) { return mcc.moduleDescription()->id(); }
 
   //===============================================================
   class StallStatistics {
   public:
-
     // c'tor receiving 'std::string const&' type not provided since we
     // must be able to call (e.g.) std::vector<StallStatistics>(20),
     // for which a default label is not sensible in this context.
@@ -69,76 +62,73 @@ namespace {
     // Modifiers
     void setLabel(std::string const& label) { label_ = label; }
 
-    void update(duration_t const ms)
-    {
+    void update(duration_t const ms) {
       ++stallCounter_;
       auto const thisTime = ms.count();
       totalTime_ += thisTime;
-      rep_t max {maxTime_};
-      while (thisTime > max && !maxTime_.compare_exchange_strong(max, thisTime));
+      rep_t max{maxTime_};
+      while (thisTime > max && !maxTime_.compare_exchange_strong(max, thisTime))
+        ;
     }
 
   private:
-    std::string label_ {};
-    std::atomic<unsigned> stallCounter_ {};
-    std::atomic<rep_t> totalTime_ {};
-    std::atomic<rep_t> maxTime_ {};
+    std::string label_{};
+    std::atomic<unsigned> stallCounter_{};
+    std::atomic<rep_t> totalTime_{};
+    std::atomic<rep_t> maxTime_{};
   };
 
   //===============================================================
   // Message-assembly utilities
   template <typename T>
-  std::enable_if_t<std::is_integral<T>::value>
-  concatenate(std::ostream& os, T const t)
-  {
+  std::enable_if_t<std::is_integral<T>::value> concatenate(std::ostream& os, T const t) {
     os << ' ' << t;
   }
 
   template <typename H, typename... T>
-  std::enable_if_t<std::is_integral<H>::value>
-  concatenate(std::ostream& os, H const h, T const... t)
-  {
+  std::enable_if_t<std::is_integral<H>::value> concatenate(std::ostream& os, H const h, T const... t) {
     os << ' ' << h;
     concatenate(os, t...);
   }
 
-  enum class step : char { preSourceEvent = 'S',
-                           postSourceEvent = 's',
-                           preEvent = 'E',
-                           postModuleEventPrefetching = 'p',
-                           preModuleEventAcquire = 'A',
-                           postModuleEventAcquire = 'a',
-                           preModuleEvent = 'M',
-                           preEventReadFromSource = 'R',
-                           postEventReadFromSource = 'r',
-                           postModuleEvent = 'm' ,
-                           postEvent = 'e'};
-    
-  enum class Phase : short { globalEndRun = -4,
-                             streamEndRun = -3,
-                             globalEndLumi = -2,
-                             streamEndLumi = -1,
-                             Event = 0,
-                             streamBeginLumi = 1,
-                             globalBeginLumi = 2,
-                             streamBeginRun = 3,
-                             globalBeginRun = 4};
-    
-  std::ostream& operator<<(std::ostream& os, step const s)
-  {
+  enum class step : char {
+    preSourceEvent = 'S',
+    postSourceEvent = 's',
+    preEvent = 'E',
+    postModuleEventPrefetching = 'p',
+    preModuleEventAcquire = 'A',
+    postModuleEventAcquire = 'a',
+    preModuleEvent = 'M',
+    preEventReadFromSource = 'R',
+    postEventReadFromSource = 'r',
+    postModuleEvent = 'm',
+    postEvent = 'e'
+  };
+
+  enum class Phase : short {
+    globalEndRun = -4,
+    streamEndRun = -3,
+    globalEndLumi = -2,
+    streamEndLumi = -1,
+    Event = 0,
+    streamBeginLumi = 1,
+    globalBeginLumi = 2,
+    streamBeginRun = 3,
+    globalBeginRun = 4
+  };
+
+  std::ostream& operator<<(std::ostream& os, step const s) {
     os << static_cast<std::underlying_type_t<step>>(s);
     return os;
   }
 
-  std::ostream& operator<<(std::ostream& os, Phase const s)
-  {
+  std::ostream& operator<<(std::ostream& os, Phase const s) {
     os << static_cast<std::underlying_type_t<Phase>>(s);
     return os;
   }
 
   template <step S, typename... ARGS>
-  std::string assembleMessage(ARGS const... args)
-  {
+  std::string assembleMessage(ARGS const... args) {
     std::ostringstream oss;
     oss << S;
     concatenate(oss, args...);
@@ -148,7 +138,7 @@ namespace {
 
   Phase toTransitionImpl(edm::StreamContext const& iContext) {
     using namespace edm;
-    switch( iContext.transition()) {
+    switch (iContext.transition()) {
       case StreamContext::Transition::kBeginRun:
         return Phase::streamBeginRun;
       case StreamContext::Transition::kBeginLuminosityBlock:
@@ -165,14 +155,14 @@ namespace {
     assert(false);
     return Phase::Event;
   }
-    
+
   auto toTransition(edm::StreamContext const& iContext) -> std::underlying_type_t<Phase> {
     return static_cast<std::underlying_type_t<Phase>>(toTransitionImpl(iContext));
   }
-    
+
   Phase toTransitionImpl(edm::GlobalContext const& iContext) {
     using namespace edm;
-    switch(iContext.transition()) {
+    switch (iContext.transition()) {
       case GlobalContext::Transition::kBeginRun:
         return Phase::globalBeginRun;
       case GlobalContext::Transition::kBeginLuminosityBlock:
@@ -195,7 +185,7 @@ namespace {
     return static_cast<std::underlying_type_t<Phase>>(toTransitionImpl(iContext));
   }
 
-}
+}  // namespace
 
 namespace edm {
   namespace service {
@@ -206,7 +196,6 @@ namespace edm {
       static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
     private:
-
       void preModuleConstruction(edm::ModuleDescription const&);
       void postBeginJob();
       void preSourceEvent(StreamID);
@@ -227,9 +216,9 @@ namespace edm {
       void postEndJob();
 
       ThreadSafeOutputFileStream file_;
-      bool const validFile_; // Separate data member from file to improve efficiency.
+      bool const validFile_;  // Separate data member from file to improve efficiency.
       duration_t const stallThreshold_;
-      decltype(now()) beginTime_ {};
+      decltype(now()) beginTime_{};
 
       // There can be multiple modules per stream.  Therefore, we need
       // the combination of StreamID and ModuleID to correctly track
@@ -237,31 +226,32 @@ namespace edm {
       // for this purpose.
       using StreamID_value = decltype(std::declval<StreamID>().value());
       using ModuleID = decltype(std::declval<ModuleDescription>().id());
-      tbb::concurrent_unordered_map<std::pair<StreamID_value,ModuleID>, std::pair<decltype(beginTime_), bool>> stallStart_ {};
+      tbb::concurrent_unordered_map<std::pair<StreamID_value, ModuleID>, std::pair<decltype(beginTime_), bool>>
+          stallStart_{};
 
-      std::vector<std::string> moduleLabels_ {};
-      std::vector<StallStatistics> moduleStats_ {};
+      std::vector<std::string> moduleLabels_{};
+      std::vector<StallStatistics> moduleStats_{};
       unsigned int numStreams_;
     };
 
-  }
+  }  // namespace service
 
-}
+}  // namespace edm
 
 namespace {
-  constexpr char const* filename_default {""};
-  constexpr double threshold_default {0.1}; //default threashold in seconds
-  std::string const space {"  "};
-}
+  constexpr char const* filename_default{""};
+  constexpr double threshold_default{0.1};  //default threashold in seconds
+  std::string const space{"  "};
+}  // namespace
 
 using edm::service::StallMonitor;
 using namespace std::chrono;
 
 StallMonitor::StallMonitor(ParameterSet const& iPS, ActivityRegistry& iRegistry)
-  : file_{iPS.getUntrackedParameter<std::string>("fileName", filename_default)}
-  , validFile_{file_}
-  ,stallThreshold_{std::chrono::round<duration_t>(duration<double>(iPS.getUntrackedParameter<double>("stallThreshold"))) }
-{
+    : file_{iPS.getUntrackedParameter<std::string>("fileName", filename_default)},
+      validFile_{file_},
+      stallThreshold_{
+          std::chrono::round<duration_t>(duration<double>(iPS.getUntrackedParameter<double>("stallThreshold")))} {
   iRegistry.watchPreModuleConstruction(this, &StallMonitor::preModuleConstruction);
   iRegistry.watchPostBeginJob(this, &StallMonitor::postBeginJob);
   iRegistry.watchPostModuleEventPrefetching(this, &StallMonitor::postModuleEventPrefetching);
@@ -280,76 +270,89 @@ StallMonitor::StallMonitor(ParameterSet const& iPS, ActivityRegistry& iRegistry)
     iRegistry.watchPostModuleEvent(this, &StallMonitor::postModuleEvent);
     iRegistry.watchPostEvent(this, &StallMonitor::postEvent);
 
-    iRegistry.watchPreModuleStreamBeginRun(this,&StallMonitor::preModuleStreamTransition);
-    iRegistry.watchPostModuleStreamBeginRun(this,&StallMonitor::postModuleStreamTransition);
-    iRegistry.watchPreModuleStreamEndRun(this,&StallMonitor::preModuleStreamTransition);
-    iRegistry.watchPostModuleStreamEndRun(this,&StallMonitor::postModuleStreamTransition);
-
-    iRegistry.watchPreModuleStreamBeginLumi(this,&StallMonitor::preModuleStreamTransition);
-    iRegistry.watchPostModuleStreamBeginLumi(this,&StallMonitor::postModuleStreamTransition);
-    iRegistry.watchPreModuleStreamEndLumi(this,&StallMonitor::preModuleStreamTransition);
-    iRegistry.watchPostModuleStreamEndLumi(this,&StallMonitor::postModuleStreamTransition);
-
-    iRegistry.watchPreModuleGlobalBeginRun(this,&StallMonitor::preModuleGlobalTransition);
-    iRegistry.watchPostModuleGlobalBeginRun(this,&StallMonitor::postModuleGlobalTransition);
-    iRegistry.watchPreModuleGlobalEndRun(this,&StallMonitor::preModuleGlobalTransition);
-    iRegistry.watchPostModuleGlobalEndRun(this,&StallMonitor::postModuleGlobalTransition);
-    iRegistry.watchPreModuleWriteRun(this,&StallMonitor::preModuleGlobalTransition);
-    iRegistry.watchPostModuleWriteRun(this,&StallMonitor::postModuleGlobalTransition);
-
-    iRegistry.watchPreModuleGlobalBeginLumi(this,&StallMonitor::preModuleGlobalTransition);
-    iRegistry.watchPostModuleGlobalBeginLumi(this,&StallMonitor::postModuleGlobalTransition);
-    iRegistry.watchPreModuleGlobalEndLumi(this,&StallMonitor::preModuleGlobalTransition);
-    iRegistry.watchPostModuleGlobalEndLumi(this,&StallMonitor::postModuleGlobalTransition);
-    iRegistry.watchPreModuleWriteLumi(this,&StallMonitor::preModuleGlobalTransition);
-    iRegistry.watchPostModuleWriteLumi(this,&StallMonitor::postModuleGlobalTransition);
-
-    iRegistry.preallocateSignal_.connect([this](service::SystemBounds const& iBounds) { numStreams_=iBounds.maxNumberOfStreams(); });
-    
+    iRegistry.watchPreModuleStreamBeginRun(this, &StallMonitor::preModuleStreamTransition);
+    iRegistry.watchPostModuleStreamBeginRun(this, &StallMonitor::postModuleStreamTransition);
+    iRegistry.watchPreModuleStreamEndRun(this, &StallMonitor::preModuleStreamTransition);
+    iRegistry.watchPostModuleStreamEndRun(this, &StallMonitor::postModuleStreamTransition);
+
+    iRegistry.watchPreModuleStreamBeginLumi(this, &StallMonitor::preModuleStreamTransition);
+    iRegistry.watchPostModuleStreamBeginLumi(this, &StallMonitor::postModuleStreamTransition);
+    iRegistry.watchPreModuleStreamEndLumi(this, &StallMonitor::preModuleStreamTransition);
+    iRegistry.watchPostModuleStreamEndLumi(this, &StallMonitor::postModuleStreamTransition);
+
+    iRegistry.watchPreModuleGlobalBeginRun(this, &StallMonitor::preModuleGlobalTransition);
+    iRegistry.watchPostModuleGlobalBeginRun(this, &StallMonitor::postModuleGlobalTransition);
+    iRegistry.watchPreModuleGlobalEndRun(this, &StallMonitor::preModuleGlobalTransition);
+    iRegistry.watchPostModuleGlobalEndRun(this, &StallMonitor::postModuleGlobalTransition);
+    iRegistry.watchPreModuleWriteRun(this, &StallMonitor::preModuleGlobalTransition);
+    iRegistry.watchPostModuleWriteRun(this, &StallMonitor::postModuleGlobalTransition);
+
+    iRegistry.watchPreModuleGlobalBeginLumi(this, &StallMonitor::preModuleGlobalTransition);
+    iRegistry.watchPostModuleGlobalBeginLumi(this, &StallMonitor::postModuleGlobalTransition);
+    iRegistry.watchPreModuleGlobalEndLumi(this, &StallMonitor::preModuleGlobalTransition);
+    iRegistry.watchPostModuleGlobalEndLumi(this, &StallMonitor::postModuleGlobalTransition);
+    iRegistry.watchPreModuleWriteLumi(this, &StallMonitor::preModuleGlobalTransition);
+    iRegistry.watchPostModuleWriteLumi(this, &StallMonitor::postModuleGlobalTransition);
+
+    iRegistry.preallocateSignal_.connect(
+        [this](service::SystemBounds const& iBounds) { numStreams_ = iBounds.maxNumberOfStreams(); });
+
     std::ostringstream oss;
     oss << "# Transition       Symbol\n";
     oss << "#----------------- ------\n";
-    oss << "# globalBeginRun  "<<Phase::globalBeginRun <<"\n"
-        << "# streamBeginRun  "<<Phase::streamBeginRun <<"\n"
-        << "# globalBeginLumi "<<Phase::globalBeginLumi<<"\n"
-        << "# streamBeginLumi "<<Phase::streamBeginLumi<<"\n"
-        << "# Event           "<<Phase::Event<<"\n"
-        << "# streamEndLumi   "<<Phase::streamEndLumi<<"\n"
-        << "# globalEndLumi   "<<Phase::globalEndLumi<<"\n"
-        << "# streamEndRun    "<<Phase::streamEndRun<<"\n"
-        << "# globalEndRun    "<<Phase::globalEndRun<<"\n";
+    oss << "# globalBeginRun  " << Phase::globalBeginRun << "\n"
+        << "# streamBeginRun  " << Phase::streamBeginRun << "\n"
+        << "# globalBeginLumi " << Phase::globalBeginLumi << "\n"
+        << "# streamBeginLumi " << Phase::streamBeginLumi << "\n"
+        << "# Event           " << Phase::Event << "\n"
+        << "# streamEndLumi   " << Phase::streamEndLumi << "\n"
+        << "# globalEndLumi   " << Phase::globalEndLumi << "\n"
+        << "# streamEndRun    " << Phase::streamEndRun << "\n"
+        << "# globalEndRun    " << Phase::globalEndRun << "\n";
     oss << "# Step                       Symbol Entries\n"
         << "# -------------------------- ------ ------------------------------------------\n"
-        << "# preSourceEvent                " << step::preSourceEvent             << "   <Stream ID> <Time since beginJob (ms)>\n"
-        << "# postSourceEvent               " << step::postSourceEvent            << "   <Stream ID> <Time since beginJob (ms)>\n"
-        << "# preEvent                      " << step::preEvent                   << "   <Stream ID> <Run#> <LumiBlock#> <Event#> <Time since beginJob (ms)>\n"
-        << "# postModuleEventPrefetching    " << step::postModuleEventPrefetching << "   <Stream ID> <Module ID> <Time since beginJob (ms)>\n"
-        << "# preModuleEventAcquire         " << step::preModuleEventAcquire      << "   <Stream ID> <Module ID> <Time since beginJob (ms)>\n"
-        << "# postModuleEventAcquire        " << step::postModuleEventAcquire     << "   <Stream ID> <Module ID> <Time since beginJob (ms)>\n"
-        << "# preModuleTransition           " << step::preModuleEvent             << "   <Stream ID> <Module ID> <Transition type> <Time since beginJob (ms)>\n"
-        << "# preEventReadFromSource        " << step::preEventReadFromSource     << "   <Stream ID> <Module ID> <Time since beginJob (ms)>\n"
-        << "# postEventReadFromSource       " << step::postEventReadFromSource    << "   <Stream ID> <Module ID> <Time since beginJob (ms)>\n"
-        << "# postModuleTransition          " << step::postModuleEvent            << "   <Stream ID> <Module ID> <Transition type> <Time since beginJob (ms)>\n"
-        << "# postEvent                     " << step::postEvent                  << "   <Stream ID> <Run#> <LumiBlock#> <Event#> <Time since beginJob (ms)>\n";
+        << "# preSourceEvent                " << step::preSourceEvent << "   <Stream ID> <Time since beginJob (ms)>\n"
+        << "# postSourceEvent               " << step::postSourceEvent << "   <Stream ID> <Time since beginJob (ms)>\n"
+        << "# preEvent                      " << step::preEvent
+        << "   <Stream ID> <Run#> <LumiBlock#> <Event#> <Time since beginJob (ms)>\n"
+        << "# postModuleEventPrefetching    " << step::postModuleEventPrefetching
+        << "   <Stream ID> <Module ID> <Time since beginJob (ms)>\n"
+        << "# preModuleEventAcquire         " << step::preModuleEventAcquire
+        << "   <Stream ID> <Module ID> <Time since beginJob (ms)>\n"
+        << "# postModuleEventAcquire        " << step::postModuleEventAcquire
+        << "   <Stream ID> <Module ID> <Time since beginJob (ms)>\n"
+        << "# preModuleTransition           " << step::preModuleEvent
+        << "   <Stream ID> <Module ID> <Transition type> <Time since beginJob (ms)>\n"
+        << "# preEventReadFromSource        " << step::preEventReadFromSource
+        << "   <Stream ID> <Module ID> <Time since beginJob (ms)>\n"
+        << "# postEventReadFromSource       " << step::postEventReadFromSource
+        << "   <Stream ID> <Module ID> <Time since beginJob (ms)>\n"
+        << "# postModuleTransition          " << step::postModuleEvent
+        << "   <Stream ID> <Module ID> <Transition type> <Time since beginJob (ms)>\n"
+        << "# postEvent                     " << step::postEvent
+        << "   <Stream ID> <Run#> <LumiBlock#> <Event#> <Time since beginJob (ms)>\n";
     file_.write(oss.str());
   }
 }
 
-void StallMonitor::fillDescriptions(ConfigurationDescriptions& descriptions)
-{
+void StallMonitor::fillDescriptions(ConfigurationDescriptions& descriptions) {
   ParameterSetDescription desc;
-  desc.addUntracked<std::string>("fileName", filename_default)->setComment("Name of file to which detailed timing information should be written.\n"
-                                                                           "An empty filename argument (the default) indicates that no extra\n"
-                                                                           "information will be written to a dedicated file, but only the summary\n"
-                                                                           "including stalling-modules information will be logged.");
-  desc.addUntracked<double>("stallThreshold", threshold_default)->setComment("Threshold (in seconds) used to classify modules as stalled.\n"
-                                                                             "Microsecond granularity allowed.");
+  desc.addUntracked<std::string>("fileName", filename_default)
+      ->setComment(
+          "Name of file to which detailed timing information should be written.\n"
+          "An empty filename argument (the default) indicates that no extra\n"
+          "information will be written to a dedicated file, but only the summary\n"
+          "including stalling-modules information will be logged.");
+  desc.addUntracked<double>("stallThreshold", threshold_default)
+      ->setComment(
+          "Threshold (in seconds) used to classify modules as stalled.\n"
+          "Microsecond granularity allowed.");
   descriptions.add("StallMonitor", desc);
-  descriptions.setComment("This service keeps track of various times in event-processing to determine which modules are stalling.");
+  descriptions.setComment(
+      "This service keeps track of various times in event-processing to determine which modules are stalling.");
 }
 
-void StallMonitor::preModuleConstruction(ModuleDescription const& md)
-{
+void StallMonitor::preModuleConstruction(ModuleDescription const& md) {
   // Module labels are dense, so if the module id is greater than the
   // size of moduleLabels_, grow the vector to the correct index and
   // assign the last entry to the desired label.  Note that with the
@@ -364,15 +367,13 @@ void StallMonitor::preModuleConstruction(ModuleDescription const& md)
   auto const mid = md.id();
   if (mid < moduleLabels_.size()) {
     moduleLabels_[mid] = md.moduleLabel();
-  }
-  else {
-    moduleLabels_.resize(mid+1);
+  } else {
+    moduleLabels_.resize(mid + 1);
     moduleLabels_.back() = md.moduleLabel();
   }
 }
 
-void StallMonitor::postBeginJob()
-{
+void StallMonitor::postBeginJob() {
   // Since a (push,emplace)_back cannot be called for a vector of a
   // type containing atomics (like 'StallStatistics')--i.e. atomics
   // have no copy/move-assignment operators, we must specify the size
@@ -383,20 +384,20 @@ void StallMonitor::postBeginJob()
   }
 
   if (validFile_) {
-    std::size_t const width {std::to_string(moduleLabels_.size()).size()};
+    std::size_t const width{std::to_string(moduleLabels_.size()).size()};
 
-    OStreamColumn col0 {"Module ID", width};
-    std::string const lastCol {"Module label"};
+    OStreamColumn col0{"Module ID", width};
+    std::string const lastCol{"Module label"};
 
     std::ostringstream oss;
     oss << "\n#  " << col0 << space << lastCol << '\n';
-    oss << "#  " << std::string(col0.width()+space.size()+lastCol.size(),'-') << '\n';
+    oss << "#  " << std::string(col0.width() + space.size() + lastCol.size(), '-') << '\n';
 
-    for (std::size_t i{} ; i < moduleLabels_.size(); ++i) {
+    for (std::size_t i{}; i < moduleLabels_.size(); ++i) {
       auto const& label = moduleLabels_[i];
-      if (label.empty()) continue; // See comment in filling of moduleLabels_;
-      oss << "#M " << std::setw(width) << std::left << col0(i) << space
-          << std::left << moduleLabels_[i] << '\n';
+      if (label.empty())
+        continue;  // See comment in filling of moduleLabels_;
+      oss << "#M " << std::setw(width) << std::left << col0(i) << space << std::left << moduleLabels_[i] << '\n';
     }
     oss << '\n';
     file_.write(oss.str());
@@ -408,33 +409,29 @@ void StallMonitor::postBeginJob()
   beginTime_ = now();
 }
 
-void StallMonitor::preSourceEvent(StreamID const sid)
-{
-  auto const t = duration_cast<duration_t>(now()-beginTime_).count();
+void StallMonitor::preSourceEvent(StreamID const sid) {
+  auto const t = duration_cast<duration_t>(now() - beginTime_).count();
   auto msg = assembleMessage<step::preSourceEvent>(sid.value(), t);
   file_.write(std::move(msg));
 }
 
-void StallMonitor::postSourceEvent(StreamID const sid)
-{
-  auto const t = duration_cast<duration_t>(now()-beginTime_).count();
+void StallMonitor::postSourceEvent(StreamID const sid) {
+  auto const t = duration_cast<duration_t>(now() - beginTime_).count();
   auto msg = assembleMessage<step::postSourceEvent>(sid.value(), t);
   file_.write(std::move(msg));
 }
 
-void StallMonitor::preEvent(StreamContext const& sc)
-{
-  auto const t = duration_cast<duration_t>(now()-beginTime_).count();
+void StallMonitor::preEvent(StreamContext const& sc) {
+  auto const t = duration_cast<duration_t>(now() - beginTime_).count();
   auto const& eid = sc.eventID();
   auto msg = assembleMessage<step::preEvent>(stream_id(sc), eid.run(), eid.luminosityBlock(), eid.event(), t);
   file_.write(std::move(msg));
 }
 
-void StallMonitor::postModuleEventPrefetching(StreamContext const& sc, ModuleCallingContext const& mcc)
-{
+void StallMonitor::postModuleEventPrefetching(StreamContext const& sc, ModuleCallingContext const& mcc) {
   auto const sid = stream_id(sc);
   auto const mid = module_id(mcc);
-  auto start = stallStart_[std::make_pair(sid,mid)] = std::make_pair(now(), false);
+  auto start = stallStart_[std::make_pair(sid, mid)] = std::make_pair(now(), false);
 
   if (validFile_) {
     auto const t = duration_cast<duration_t>(start.first - beginTime_).count();
@@ -443,146 +440,132 @@ void StallMonitor::postModuleEventPrefetching(StreamContext const& sc, ModuleCal
   }
 }
 
-void StallMonitor::preModuleEventAcquire(StreamContext const& sc, ModuleCallingContext const& mcc)
-{
+void StallMonitor::preModuleEventAcquire(StreamContext const& sc, ModuleCallingContext const& mcc) {
   auto const preModEventAcquire = now();
   auto const sid = stream_id(sc);
   auto const mid = module_id(mcc);
-  auto & start = stallStart_[std::make_pair(sid,mid)];
+  auto& start = stallStart_[std::make_pair(sid, mid)];
   auto startT = start.first.time_since_epoch();
-  start.second = true; // record so the preModuleEvent knows that acquire was called
+  start.second = true;  // record so the preModuleEvent knows that acquire was called
   if (validFile_) {
     auto t = duration_cast<duration_t>(preModEventAcquire - beginTime_).count();
     auto msg = assembleMessage<step::preModuleEventAcquire>(sid, mid, t);
     file_.write(std::move(msg));
   }
   // Check for stalls if prefetch was called
-  if( duration_t::duration::zero() != startT) {
+  if (duration_t::duration::zero() != startT) {
     auto const preFetch_to_preModEventAcquire = duration_cast<duration_t>(preModEventAcquire - start.first);
-    if (preFetch_to_preModEventAcquire < stallThreshold_) return;
+    if (preFetch_to_preModEventAcquire < stallThreshold_)
+      return;
     moduleStats_[mid].update(preFetch_to_preModEventAcquire);
   }
 }
 
-void StallMonitor::postModuleEventAcquire(StreamContext const& sc, ModuleCallingContext const& mcc)
-{
-  auto const postModEventAcquire = duration_cast<duration_t>(now()-beginTime_).count();
+void StallMonitor::postModuleEventAcquire(StreamContext const& sc, ModuleCallingContext const& mcc) {
+  auto const postModEventAcquire = duration_cast<duration_t>(now() - beginTime_).count();
   auto msg = assembleMessage<step::postModuleEventAcquire>(stream_id(sc), module_id(mcc), postModEventAcquire);
   file_.write(std::move(msg));
 }
 
-void StallMonitor::preModuleEvent(StreamContext const& sc, ModuleCallingContext const& mcc)
-{
+void StallMonitor::preModuleEvent(StreamContext const& sc, ModuleCallingContext const& mcc) {
   auto const preModEvent = now();
   auto const sid = stream_id(sc);
   auto const mid = module_id(mcc);
-  auto const& start = stallStart_[std::make_pair(sid,mid)];
+  auto const& start = stallStart_[std::make_pair(sid, mid)];
   auto startT = start.first.time_since_epoch();
   if (validFile_) {
-    auto t = duration_cast<duration_t>(preModEvent-beginTime_).count();
-    auto msg = assembleMessage<step::preModuleEvent>(sid, mid, static_cast<std::underlying_type_t<Phase>>(Phase::Event), t);
+    auto t = duration_cast<duration_t>(preModEvent - beginTime_).count();
+    auto msg =
+        assembleMessage<step::preModuleEvent>(sid, mid, static_cast<std::underlying_type_t<Phase>>(Phase::Event), t);
     file_.write(std::move(msg));
   }
   // Check for stalls if prefetch was called and we did not already check before acquire
-  if( duration_t::duration::zero() != startT && !start.second) {
-    auto const preFetch_to_preModEvent = duration_cast<duration_t>(preModEvent-start.first);
-    if (preFetch_to_preModEvent < stallThreshold_) return;
+  if (duration_t::duration::zero() != startT && !start.second) {
+    auto const preFetch_to_preModEvent = duration_cast<duration_t>(preModEvent - start.first);
+    if (preFetch_to_preModEvent < stallThreshold_)
+      return;
     moduleStats_[mid].update(preFetch_to_preModEvent);
   }
 }
 
-void StallMonitor::preModuleStreamTransition(StreamContext const& sc, ModuleCallingContext const& mcc)
-{
+void StallMonitor::preModuleStreamTransition(StreamContext const& sc, ModuleCallingContext const& mcc) {
   auto const tNow = now();
   auto const sid = stream_id(sc);
   auto const mid = module_id(mcc);
-  auto t = duration_cast<duration_t>(tNow-beginTime_).count();
+  auto t = duration_cast<duration_t>(tNow - beginTime_).count();
   auto msg = assembleMessage<step::preModuleEvent>(sid, mid, toTransition(sc), t);
   file_.write(std::move(msg));
 }
-    
-void StallMonitor::postModuleStreamTransition(StreamContext const& sc, ModuleCallingContext const& mcc)
-{
-  auto const t = duration_cast<duration_t>(now()-beginTime_).count();
+
+void StallMonitor::postModuleStreamTransition(StreamContext const& sc, ModuleCallingContext const& mcc) {
+  auto const t = duration_cast<duration_t>(now() - beginTime_).count();
   auto msg = assembleMessage<step::postModuleEvent>(stream_id(sc), module_id(mcc), toTransition(sc), t);
   file_.write(std::move(msg));
 }
 
-
 void StallMonitor::preModuleGlobalTransition(GlobalContext const& gc, ModuleCallingContext const& mcc) {
-  auto t = duration_cast<duration_t>(now()-beginTime_).count();
+  auto t = duration_cast<duration_t>(now() - beginTime_).count();
   auto msg = assembleMessage<step::preModuleEvent>(numStreams_, module_id(mcc), toTransition(gc), t);
   file_.write(std::move(msg));
 }
 
 void StallMonitor::postModuleGlobalTransition(GlobalContext const& gc, ModuleCallingContext const& mcc) {
-  auto const postModTime = duration_cast<duration_t>(now()-beginTime_).count();
+  auto const postModTime = duration_cast<duration_t>(now() - beginTime_).count();
   auto msg = assembleMessage<step::postModuleEvent>(numStreams_, module_id(mcc), toTransition(gc), postModTime);
   file_.write(std::move(msg));
 }
 
-void StallMonitor::preEventReadFromSource(StreamContext const& sc, ModuleCallingContext const& mcc)
-{
-  auto const t = duration_cast<duration_t>(now()-beginTime_).count();
+void StallMonitor::preEventReadFromSource(StreamContext const& sc, ModuleCallingContext const& mcc) {
+  auto const t = duration_cast<duration_t>(now() - beginTime_).count();
   auto msg = assembleMessage<step::preEventReadFromSource>(stream_id(sc), module_id(mcc), t);
   file_.write(std::move(msg));
 }
 
-void StallMonitor::postEventReadFromSource(StreamContext const& sc, ModuleCallingContext const& mcc)
-{
-  auto const t = duration_cast<duration_t>(now()-beginTime_).count();
+void StallMonitor::postEventReadFromSource(StreamContext const& sc, ModuleCallingContext const& mcc) {
+  auto const t = duration_cast<duration_t>(now() - beginTime_).count();
   auto msg = assembleMessage<step::postEventReadFromSource>(stream_id(sc), module_id(mcc), t);
   file_.write(std::move(msg));
 }
 
-void StallMonitor::postModuleEvent(StreamContext const& sc, ModuleCallingContext const& mcc)
-{
-  auto const postModEvent = duration_cast<duration_t>(now()-beginTime_).count();
-  auto msg = assembleMessage<step::postModuleEvent>(stream_id(sc), module_id(mcc), static_cast<std::underlying_type_t<Phase>>(Phase::Event), postModEvent);
+void StallMonitor::postModuleEvent(StreamContext const& sc, ModuleCallingContext const& mcc) {
+  auto const postModEvent = duration_cast<duration_t>(now() - beginTime_).count();
+  auto msg = assembleMessage<step::postModuleEvent>(
+      stream_id(sc), module_id(mcc), static_cast<std::underlying_type_t<Phase>>(Phase::Event), postModEvent);
   file_.write(std::move(msg));
 }
 
-void StallMonitor::postEvent(StreamContext const& sc)
-{
-  auto const t = duration_cast<duration_t>(now()-beginTime_).count();
+void StallMonitor::postEvent(StreamContext const& sc) {
+  auto const t = duration_cast<duration_t>(now() - beginTime_).count();
   auto const& eid = sc.eventID();
   auto msg = assembleMessage<step::postEvent>(stream_id(sc), eid.run(), eid.luminosityBlock(), eid.event(), t);
   file_.write(std::move(msg));
 }
 
-void StallMonitor::postEndJob()
-{
+void StallMonitor::postEndJob() {
   // Prepare summary
-  std::size_t width {};
+  std::size_t width{};
   edm::for_all(moduleStats_, [&width](auto const& stats) {
-      if (stats.numberOfStalls() == 0u) return;
-      width = std::max(width, stats.label().size());
-    });
-
-  OStreamColumn tag {"StallMonitor>"};
-  OStreamColumn col1 {"Module label", width};
-  OStreamColumn col2 {"# of stalls"};
-  OStreamColumn col3 {"Total stalled time"};
-  OStreamColumn col4 {"Max stalled time"};
-
-  LogAbsolute out {"StallMonitor"};
+    if (stats.numberOfStalls() == 0u)
+      return;
+    width = std::max(width, stats.label().size());
+  });
+
+  OStreamColumn tag{"StallMonitor>"};
+  OStreamColumn col1{"Module label", width};
+  OStreamColumn col2{"# of stalls"};
+  OStreamColumn col3{"Total stalled time"};
+  OStreamColumn col4{"Max stalled time"};
+
+  LogAbsolute out{"StallMonitor"};
   out << '\n';
-  out << tag << space
-      << col1 << space
-      << col2 << space
-      << col3 << space
-      << col4 << '\n';
-
-  out << tag << space
-      << std::setfill('-')
-      << col1(std::string{}) << space
-      << col2(std::string{}) << space
-      << col3(std::string{}) << space
-      << col4(std::string{}) << '\n';
+  out << tag << space << col1 << space << col2 << space << col3 << space << col4 << '\n';
+
+  out << tag << space << std::setfill('-') << col1(std::string{}) << space << col2(std::string{}) << space
+      << col3(std::string{}) << space << col4(std::string{}) << '\n';
 
   using seconds_d = duration<double>;
 
-  auto to_seconds_str = [](auto const& duration){
+  auto to_seconds_str = [](auto const& duration) {
     std::ostringstream oss;
     auto const time = duration_cast<seconds_d>(duration).count();
     oss << time << " s";
@@ -592,13 +575,10 @@ void StallMonitor::postEndJob()
   out << std::setfill(' ');
   for (auto const& stats : moduleStats_) {
     if (stats.label().empty() ||  // See comment in filling of moduleLabels_;
-        stats.numberOfStalls() == 0u) continue;
-    out << std::left
-        << tag << space
-        << col1(stats.label()) << space
-        << std::right
-        << col2(stats.numberOfStalls()) << space
-        << col3(to_seconds_str(stats.totalStalledTime())) << space
+        stats.numberOfStalls() == 0u)
+      continue;
+    out << std::left << tag << space << col1(stats.label()) << space << std::right << col2(stats.numberOfStalls())
+        << space << col3(to_seconds_str(stats.totalStalledTime())) << space
         << col4(to_seconds_str(stats.maxStalledTime())) << '\n';
   }
 }
diff --git a/FWCore/Services/plugins/Timing.cc b/FWCore/Services/plugins/Timing.cc
index 0266bd0e1ebd6..102f251e63cda 100644
--- a/FWCore/Services/plugins/Timing.cc
+++ b/FWCore/Services/plugins/Timing.cc
@@ -40,25 +40,24 @@ namespace edm {
     struct ComponentDescription;
     class DataKey;
     class EventSetupRecordKey;
-  }
+  }  // namespace eventsetup
 
   namespace service {
     class Timing : public TimingServiceBase {
     public:
       Timing(ParameterSet const&, ActivityRegistry&);
       ~Timing() override;
-      
-      static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
-      
+
+      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
       void addToCPUTime(double iTime) override;
       double getTotalCPU() const override;
-      
+
     private:
-      
       void preBeginJob(PathsAndConsumesOfModulesBase const&, ProcessContext const&);
       void postBeginJob();
       void postEndJob();
-           
+
       void preEvent(StreamContext const&);
       void postEvent(StreamContext const&);
       void lastPostEvent(double curr_event_time, unsigned int index, StreamContext const& iStream);
@@ -67,16 +66,16 @@ namespace edm {
 
       void preSourceEvent(StreamID);
       void postSourceEvent(StreamID);
-      
+
       void preSourceLumi(LuminosityBlockIndex);
       void postSourceLumi(LuminosityBlockIndex);
-      
+
       void preSourceRun(RunIndex);
       void postSourceRun(RunIndex);
-     
+
       void preOpenFile(std::string const&, bool);
       void postOpenFile(std::string const&, bool);
-        
+
       void preModule(ModuleDescription const& md);
       void postModule(ModuleDescription const& md);
 
@@ -105,7 +104,7 @@ namespace edm {
 
       struct CountAndTime {
       public:
-        CountAndTime(unsigned int count, double time) : count_(count), time_(time) { }
+        CountAndTime(unsigned int count, double time) : count_(count), time_(time) {}
         unsigned int count_;
         double time_;
       };
@@ -113,10 +112,10 @@ namespace edm {
       void accumulateTimeBegin(std::atomic<CountAndTime*>& countAndTime, double& accumulatedTime);
       void accumulateTimeEnd(std::atomic<CountAndTime*>& countAndTime, double& accumulatedTime);
 
-      double curr_job_time_;    // seconds
-      double curr_job_cpu_;     // seconds
-      std::atomic<double> extra_job_cpu_; //seconds
-                                //use last run time for determining end of processing
+      double curr_job_time_;               // seconds
+      double curr_job_cpu_;                // seconds
+      std::atomic<double> extra_job_cpu_;  //seconds
+                                           //use last run time for determining end of processing
       std::atomic<double> last_run_time_;
       std::atomic<double> last_run_cpu_;
       std::vector<double> curr_events_time_;  // seconds
@@ -126,8 +125,8 @@ namespace edm {
       //
       // Min Max and total event times for each Stream.
       //  Used for summary at end of job
-      std::vector<double> max_events_time_; // seconds
-      std::vector<double> min_events_time_; // seconds
+      std::vector<double> max_events_time_;  // seconds
+      std::vector<double> min_events_time_;  // seconds
       std::vector<double> sum_events_time_;
       std::atomic<unsigned long> total_event_count_;
       std::atomic<unsigned long> begin_lumi_count_;
@@ -149,61 +148,58 @@ namespace edm {
       bool configuredInTopLevelProcess_;
       unsigned int nSubProcesses_;
     };
-  }
-}
+  }  // namespace service
+}  // namespace edm
 
 namespace edm {
   namespace service {
 
     static std::string d2str(double d) {
-        std::stringstream t;
-        t << d;
-        return t.str();
+      std::stringstream t;
+      t << d;
+      return t.str();
     }
-    
+
     static std::string ui2str(unsigned int i) {
       std::stringstream t;
       t << i;
       return t.str();
     }
 
-    
     static double getTime() {
       struct timeval t;
-      if(gettimeofday(&t, nullptr) < 0)
+      if (gettimeofday(&t, nullptr) < 0)
         throw cms::Exception("SysCallFailed", "Failed call to gettimeofday");
       return static_cast<double>(t.tv_sec) + (static_cast<double>(t.tv_usec) * 1E-6);
     }
 
     static double getCPU() {
-        struct rusage usage;
-        getrusage(RUSAGE_SELF, &usage);
+      struct rusage usage;
+      getrusage(RUSAGE_SELF, &usage);
 
-        double totalCPUTime = 0.0;
-        // User code
-        totalCPUTime = (double)usage.ru_utime.tv_sec + (double(usage.ru_utime.tv_usec) * 1E-6);
-        // System functions
-        totalCPUTime += (double)usage.ru_stime.tv_sec + (double(usage.ru_stime.tv_usec) * 1E-6);
+      double totalCPUTime = 0.0;
+      // User code
+      totalCPUTime = (double)usage.ru_utime.tv_sec + (double(usage.ru_utime.tv_usec) * 1E-6);
+      // System functions
+      totalCPUTime += (double)usage.ru_stime.tv_sec + (double(usage.ru_stime.tv_usec) * 1E-6);
 
-        // Additionally, add in CPU usage from our child processes.
-        getrusage(RUSAGE_CHILDREN, &usage);
-        totalCPUTime += (double)usage.ru_utime.tv_sec + (double(usage.ru_utime.tv_usec) * 1E-6);
-        totalCPUTime += (double)usage.ru_stime.tv_sec + (double(usage.ru_stime.tv_usec) * 1E-6);
+      // Additionally, add in CPU usage from our child processes.
+      getrusage(RUSAGE_CHILDREN, &usage);
+      totalCPUTime += (double)usage.ru_utime.tv_sec + (double(usage.ru_utime.tv_usec) * 1E-6);
+      totalCPUTime += (double)usage.ru_stime.tv_sec + (double(usage.ru_stime.tv_usec) * 1E-6);
 
-        return totalCPUTime;
+      return totalCPUTime;
     }
-    
+
     //NOTE: We use a per thread stack for module times since unscheduled
     // exectuion or tbb task spawning can cause a module to run on the
     // same thread as an already running module
-    static
-    std::vector<double>& moduleTimeStack() {
+    static std::vector<double>& moduleTimeStack() {
       static thread_local std::vector<double> s_stack;
       return s_stack;
     }
 
-    static 
-    double popStack() {
+    static double popStack() {
       auto& modStack = moduleTimeStack();
       assert(!modStack.empty());
       double curr_module_time = modStack.back();
@@ -212,8 +208,7 @@ namespace edm {
       return t;
     }
 
-    static 
-    void pushStack(bool configuredInTopLevelProcess) {
+    static void pushStack(bool configuredInTopLevelProcess) {
       if (!configuredInTopLevelProcess) {
         return;
       }
@@ -221,29 +216,28 @@ namespace edm {
       modStack.push_back(getTime());
     }
 
-    Timing::Timing(ParameterSet const& iPS, ActivityRegistry& iRegistry) :
-        curr_job_time_(0.),
-        curr_job_cpu_(0.),
-        extra_job_cpu_(0.0),
-        last_run_time_(0.0),
-        last_run_cpu_(0.0),
-        curr_events_time_(),
-        summary_only_(iPS.getUntrackedParameter<bool>("summaryOnly")),
-        report_summary_(iPS.getUntrackedParameter<bool>("useJobReport")),
-        threshold_(iPS.getUntrackedParameter<double>("excessiveTimeThreshold")),
-        max_events_time_(),
-        min_events_time_(),
-        total_event_count_(0),
-        begin_lumi_count_(0),
-        begin_run_count_(0),
-        countAndTimeZero_{0, 0.0},
-        countAndTimeForLock_{&countAndTimeZero_},
-        accumulatedTimeForLock_{0.0},
-        countAndTimeForGet_{&countAndTimeZero_},
-        accumulatedTimeForGet_{0.0},
-        configuredInTopLevelProcess_{false},
-        nSubProcesses_{0} {
-
+    Timing::Timing(ParameterSet const& iPS, ActivityRegistry& iRegistry)
+        : curr_job_time_(0.),
+          curr_job_cpu_(0.),
+          extra_job_cpu_(0.0),
+          last_run_time_(0.0),
+          last_run_cpu_(0.0),
+          curr_events_time_(),
+          summary_only_(iPS.getUntrackedParameter<bool>("summaryOnly")),
+          report_summary_(iPS.getUntrackedParameter<bool>("useJobReport")),
+          threshold_(iPS.getUntrackedParameter<double>("excessiveTimeThreshold")),
+          max_events_time_(),
+          min_events_time_(),
+          total_event_count_(0),
+          begin_lumi_count_(0),
+          begin_run_count_(0),
+          countAndTimeZero_{0, 0.0},
+          countAndTimeForLock_{&countAndTimeZero_},
+          accumulatedTimeForLock_{0.0},
+          countAndTimeForGet_{&countAndTimeZero_},
+          accumulatedTimeForGet_{0.0},
+          configuredInTopLevelProcess_{false},
+          nSubProcesses_{0} {
       iRegistry.watchPreBeginJob(this, &Timing::preBeginJob);
       iRegistry.watchPostBeginJob(this, &Timing::postBeginJob);
       iRegistry.watchPostEndJob(this, &Timing::postEndJob);
@@ -261,24 +255,24 @@ namespace edm {
         threshold_ = std::numeric_limits<double>::max();
         checkThreshold = false;
       }
-          
-      if( (not summary_only_) || (checkThreshold) ) {
+
+      if ((not summary_only_) || (checkThreshold)) {
         iRegistry.watchPreModuleEvent(this, &Timing::preModuleStream);
         iRegistry.watchPostModuleEvent(this, &Timing::postModuleEvent);
-      } 
-      if(checkThreshold) {
+      }
+      if (checkThreshold) {
         iRegistry.watchPreSourceEvent(this, &Timing::preSourceEvent);
         iRegistry.watchPostSourceEvent(this, &Timing::postSourceEvent);
-      
+
         iRegistry.watchPreSourceLumi(this, &Timing::preSourceLumi);
         iRegistry.watchPostSourceLumi(this, &Timing::postSourceLumi);
-      
+
         iRegistry.watchPreSourceRun(this, &Timing::preSourceRun);
         iRegistry.watchPostSourceRun(this, &Timing::postSourceRun);
-      
+
         iRegistry.watchPreOpenFile(this, &Timing::preOpenFile);
         iRegistry.watchPostOpenFile(this, &Timing::postOpenFile);
-      
+
         iRegistry.watchPreEventReadFromSource(this, &Timing::preModuleStream);
         iRegistry.watchPostEventReadFromSource(this, &Timing::postModuleStream);
 
@@ -318,13 +312,13 @@ namespace edm {
       iRegistry.watchPostGlobalBeginRun(this, &Timing::postGlobalBeginRun);
       iRegistry.watchPostGlobalBeginLumi(this, &Timing::postGlobalBeginLumi);
 
-      iRegistry.preallocateSignal_.connect([this](service::SystemBounds const& iBounds){
+      iRegistry.preallocateSignal_.connect([this](service::SystemBounds const& iBounds) {
         nStreams_ = iBounds.maxNumberOfStreams();
         nThreads_ = iBounds.maxNumberOfThreads();
-        curr_events_time_.resize(nStreams_,0.);
-        sum_events_time_.resize(nStreams_,0.);
-        max_events_time_.resize(nStreams_,0.);
-        min_events_time_.resize(nStreams_,1.E6);
+        curr_events_time_.resize(nStreams_, 0.);
+        sum_events_time_.resize(nStreams_, 0.);
+        max_events_time_.resize(nStreams_, 0.);
+        min_events_time_.resize(nStreams_, 1.E6);
         for (unsigned int i = 0; i < nStreams_; ++i) {
           countSubProcessesPreEvent_.emplace_back(std::make_unique<std::atomic<unsigned int>>(0));
           countSubProcessesPostEvent_.emplace_back(std::make_unique<std::atomic<unsigned int>>(0));
@@ -337,33 +331,30 @@ namespace edm {
       });
     }
 
-    Timing::~Timing() {
-    }
-    
+    Timing::~Timing() {}
+
     void Timing::addToCPUTime(double iTime) {
       //For accounting purposes we effectively can say we started earlier
       double expected = extra_job_cpu_.load();
-      while( not extra_job_cpu_.compare_exchange_strong(expected,expected+iTime) ) {}
+      while (not extra_job_cpu_.compare_exchange_strong(expected, expected + iTime)) {
+      }
     }
 
-    double Timing::getTotalCPU() const {
-      return getCPU();
-    }
+    double Timing::getTotalCPU() const { return getCPU(); }
 
     void Timing::fillDescriptions(ConfigurationDescriptions& descriptions) {
       ParameterSetDescription desc;
-      desc.addUntracked<bool>("summaryOnly", false)->setComment(
-      "If 'true' do not report timing for each event");
-      desc.addUntracked<bool>("useJobReport", true)->setComment(
-       "If 'true' write summary information to JobReport");
-      desc.addUntracked<double>("excessiveTimeThreshold", 0.)->setComment(
-       "Amount of time in seconds before reporting a module or source has taken excessive time. A value of 0.0 turns off this reporting.");
+      desc.addUntracked<bool>("summaryOnly", false)->setComment("If 'true' do not report timing for each event");
+      desc.addUntracked<bool>("useJobReport", true)->setComment("If 'true' write summary information to JobReport");
+      desc.addUntracked<double>("excessiveTimeThreshold", 0.)
+          ->setComment(
+              "Amount of time in seconds before reporting a module or source has taken excessive time. A value of 0.0 "
+              "turns off this reporting.");
       descriptions.add("Timing", desc);
-      descriptions.setComment(
-       "This service reports the time it takes to run each module in a job.");
+      descriptions.setComment("This service reports the time it takes to run each module in a job.");
     }
 
-    void  Timing::preBeginJob(PathsAndConsumesOfModulesBase const& pathsAndConsumes, ProcessContext const& pc) {
+    void Timing::preBeginJob(PathsAndConsumesOfModulesBase const& pathsAndConsumes, ProcessContext const& pc) {
       if (pc.isSubProcess()) {
         ++nSubProcesses_;
       } else {
@@ -378,92 +369,91 @@ namespace edm {
       curr_job_time_ = getTime();
       curr_job_cpu_ = getCPU();
 
-      if(not summary_only_) {
-        LogImportant("TimeReport")
-        << "TimeReport> Report activated" << "\n"
-        << "TimeReport> Report columns headings for events: "
-        << "eventnum runnum timetaken\n"
-        << "TimeReport> Report columns headings for modules: "
-        << "eventnum runnum modulelabel modulename timetakeni\n"
-        << "TimeReport> JobTime=" << curr_job_time_  << " JobCPU=" << curr_job_cpu_  << "\n";
+      if (not summary_only_) {
+        LogImportant("TimeReport") << "TimeReport> Report activated"
+                                   << "\n"
+                                   << "TimeReport> Report columns headings for events: "
+                                   << "eventnum runnum timetaken\n"
+                                   << "TimeReport> Report columns headings for modules: "
+                                   << "eventnum runnum modulelabel modulename timetakeni\n"
+                                   << "TimeReport> JobTime=" << curr_job_time_ << " JobCPU=" << curr_job_cpu_ << "\n";
       }
     }
 
     void Timing::postEndJob() {
-
       if (!configuredInTopLevelProcess_) {
-        LogImportant("TimeReport") << "\nTimeReport> This instance of the Timing Service will be disabled because it is configured in a SubProcess.\n"
-                                   << "If multiple instances of the TimingService were configured only the one in the top level process will function.\n"
+        LogImportant("TimeReport") << "\nTimeReport> This instance of the Timing Service will be disabled because it "
+                                      "is configured in a SubProcess.\n"
+                                   << "If multiple instances of the TimingService were configured only the one in the "
+                                      "top level process will function.\n"
                                    << "The other instance(s) will simply print this message and do nothing.\n\n";
         return;
       }
 
-      const double job_end_time =getTime();
-      const double job_end_cpu =getCPU();
+      const double job_end_time = getTime();
+      const double job_end_cpu = getCPU();
       double total_job_time = job_end_time - jobStartTime();
 
-      double total_job_cpu = job_end_cpu+extra_job_cpu_;
+      double total_job_cpu = job_end_cpu + extra_job_cpu_;
 
       const double total_initialization_time = curr_job_time_ - jobStartTime();
-      const double total_initialization_cpu =  curr_job_cpu_;
-      
-      if( 0.0 == jobStartTime()) {
+      const double total_initialization_cpu = curr_job_cpu_;
+
+      if (0.0 == jobStartTime()) {
         //did not capture beginning time
-        total_job_time =job_end_time - curr_job_time_;
-        total_job_cpu =job_end_cpu + extra_job_cpu_ - curr_job_cpu_ ;
+        total_job_time = job_end_time - curr_job_time_;
+        total_job_cpu = job_end_cpu + extra_job_cpu_ - curr_job_cpu_;
       }
-      
-      double min_event_time = *(std::min_element(min_events_time_.begin(),
-                                                 min_events_time_.end()));
-      double max_event_time = *(std::max_element(max_events_time_.begin(),
-                                               max_events_time_.end()));
+
+      double min_event_time = *(std::min_element(min_events_time_.begin(), min_events_time_.end()));
+      double max_event_time = *(std::max_element(max_events_time_.begin(), max_events_time_.end()));
 
       auto total_loop_time = last_run_time_ - curr_job_time_;
       auto total_loop_cpu = last_run_cpu_ + extra_job_cpu_ - curr_job_cpu_;
 
-      if(last_run_time_ == 0.0) {
+      if (last_run_time_ == 0.0) {
         total_loop_time = 0.0;
         total_loop_cpu = 0.0;
       }
 
       double sum_all_events_time = 0;
-      for(auto t : sum_events_time_) { sum_all_events_time += t; }
+      for (auto t : sum_events_time_) {
+        sum_all_events_time += t;
+      }
 
       double average_event_time = 0.0;
-      if(total_event_count_ != 0) {
+      if (total_event_count_ != 0) {
         average_event_time = sum_all_events_time / total_event_count_;
       }
 
       double event_throughput = 0.0;
-      if(total_loop_time != 0.0) {
+      if (total_loop_time != 0.0) {
         event_throughput = total_event_count_ / total_loop_time;
       }
 
-      LogImportant("TimeReport")
-        << "TimeReport> Time report complete in "
-        << total_job_time << " seconds"
-        << "\n"
-        << " Time Summary: \n"
-        << " - Min event:   " << min_event_time << "\n"
-        << " - Max event:   " << max_event_time << "\n"
-        << " - Avg event:   " << average_event_time << "\n"
-        << " - Total loop:  " << total_loop_time <<"\n"
-        << " - Total init:  " << total_initialization_time <<"\n"
-        << " - Total job:   " << total_job_time << "\n"
-        << " - EventSetup Lock:   " << accumulatedTimeForLock_ << "\n"
-        << " - EventSetup Get:   " << accumulatedTimeForGet_ << "\n"
-        << " Event Throughput: "<< event_throughput <<" ev/s\n"
-        << " CPU Summary: \n"
-        << " - Total loop:  " << total_loop_cpu << "\n"
-        << " - Total init:  " << total_initialization_cpu <<"\n"
-        << " - Total extra: " << extra_job_cpu_ << "\n"
-        << " - Total job:   " << total_job_cpu << "\n"
-        << " Processing Summary: \n"
-        << " - Number of Events:  " << total_event_count_ << "\n"
-        << " - Number of Global Begin Lumi Calls:  " << begin_lumi_count_ << "\n"
-        << " - Number of Global Begin Run Calls: " << begin_run_count_ << "\n";
-
-      if(report_summary_) {
+      LogImportant("TimeReport") << "TimeReport> Time report complete in " << total_job_time << " seconds"
+                                 << "\n"
+                                 << " Time Summary: \n"
+                                 << " - Min event:   " << min_event_time << "\n"
+                                 << " - Max event:   " << max_event_time << "\n"
+                                 << " - Avg event:   " << average_event_time << "\n"
+                                 << " - Total loop:  " << total_loop_time << "\n"
+                                 << " - Total init:  " << total_initialization_time << "\n"
+                                 << " - Total job:   " << total_job_time << "\n"
+                                 << " - EventSetup Lock:   " << accumulatedTimeForLock_ << "\n"
+                                 << " - EventSetup Get:   " << accumulatedTimeForGet_ << "\n"
+                                 << " Event Throughput: " << event_throughput << " ev/s\n"
+                                 << " CPU Summary: \n"
+                                 << " - Total loop:  " << total_loop_cpu << "\n"
+                                 << " - Total init:  " << total_initialization_cpu << "\n"
+                                 << " - Total extra: " << extra_job_cpu_ << "\n"
+                                 << " - Total job:   " << total_job_cpu << "\n"
+                                 << " Processing Summary: \n"
+                                 << " - Number of Events:  " << total_event_count_ << "\n"
+                                 << " - Number of Global Begin Lumi Calls:  " << begin_lumi_count_ << "\n"
+                                 << " - Number of Global Begin Run Calls: " << begin_run_count_ << "\n";
+
+      if (report_summary_) {
         Service<JobReport> reportSvc;
         std::map<std::string, std::string> reportData;
 
@@ -477,10 +467,10 @@ namespace edm {
         reportData.insert(std::make_pair("TotalLoopCPU", d2str(total_loop_cpu)));
         reportData.insert(std::make_pair("TotalInitTime", d2str(total_initialization_time)));
         reportData.insert(std::make_pair("TotalInitCPU", d2str(total_initialization_cpu)));
-        reportData.insert(std::make_pair("NumberOfStreams",ui2str(nStreams_)));
-        reportData.insert(std::make_pair("NumberOfThreads",ui2str(nThreads_)));
-        reportData.insert(std::make_pair("EventSetup Lock",d2str(accumulatedTimeForLock_)));
-        reportData.insert(std::make_pair("EventSetup Get",d2str(accumulatedTimeForGet_)));
+        reportData.insert(std::make_pair("NumberOfStreams", ui2str(nStreams_)));
+        reportData.insert(std::make_pair("NumberOfThreads", ui2str(nThreads_)));
+        reportData.insert(std::make_pair("EventSetup Lock", d2str(accumulatedTimeForLock_)));
+        reportData.insert(std::make_pair("EventSetup Get", d2str(accumulatedTimeForGet_)));
         reportSvc->reportPerformanceSummary("Timing", reportData);
 
         std::map<std::string, std::string> reportData1;
@@ -525,18 +515,16 @@ namespace edm {
     }
 
     void Timing::lastPostEvent(double curr_event_time, unsigned int index, StreamContext const& iStream) {
-      sum_events_time_[index] +=curr_event_time;
-
-      if(not summary_only_) {
-        auto const & eventID = iStream.eventID();
-        LogPrint("TimeEvent")
-          << "TimeEvent> "
-          << eventID.event() << " "
-          << eventID.run() << " "
-          << curr_event_time ;
-      }
-      if(curr_event_time > max_events_time_[index]) max_events_time_[index] = curr_event_time;
-      if(curr_event_time < min_events_time_[index]) min_events_time_[index] = curr_event_time;
+      sum_events_time_[index] += curr_event_time;
+
+      if (not summary_only_) {
+        auto const& eventID = iStream.eventID();
+        LogPrint("TimeEvent") << "TimeEvent> " << eventID.event() << " " << eventID.run() << " " << curr_event_time;
+      }
+      if (curr_event_time > max_events_time_[index])
+        max_events_time_[index] = curr_event_time;
+      if (curr_event_time < min_events_time_[index])
+        min_events_time_[index] = curr_event_time;
       ++total_event_count_;
     }
 
@@ -544,73 +532,42 @@ namespace edm {
       if (!configuredInTopLevelProcess_) {
         return;
       }
-      auto const & eventID = iStream.eventID();
-      auto const & desc = *(iModule.moduleDescription());
+      auto const& eventID = iStream.eventID();
+      auto const& desc = *(iModule.moduleDescription());
       double t = postCommon();
-      if ( not summary_only_) {
-          LogPrint("TimeModule") << "TimeModule> "
-          << eventID.event() << " "
-          << eventID.run() << " "
-          << desc.moduleLabel() << " "
-          << desc.moduleName() << " "
-          << t;
+      if (not summary_only_) {
+        LogPrint("TimeModule") << "TimeModule> " << eventID.event() << " " << eventID.run() << " " << desc.moduleLabel()
+                               << " " << desc.moduleName() << " " << t;
       }
     }
 
-    void Timing::preSourceEvent(StreamID sid) {
-      pushStack(configuredInTopLevelProcess_);
-    }
+    void Timing::preSourceEvent(StreamID sid) { pushStack(configuredInTopLevelProcess_); }
 
-    void Timing::postSourceEvent(StreamID sid) {
-      postCommon();
-    }
+    void Timing::postSourceEvent(StreamID sid) { postCommon(); }
 
-    void Timing::preSourceLumi(LuminosityBlockIndex index) {
-      pushStack(configuredInTopLevelProcess_);
-    }
- 
-    void Timing::postSourceLumi(LuminosityBlockIndex index) {
-      postCommon();
-    }
-  
-    void Timing::preSourceRun(RunIndex index) {
-      pushStack(configuredInTopLevelProcess_);
-    }
+    void Timing::preSourceLumi(LuminosityBlockIndex index) { pushStack(configuredInTopLevelProcess_); }
 
-    void Timing::postSourceRun(RunIndex index) {
-      postCommon();
-    }
+    void Timing::postSourceLumi(LuminosityBlockIndex index) { postCommon(); }
 
-    void Timing::preOpenFile(std::string const& lfn, bool b) {
-      pushStack(configuredInTopLevelProcess_);
-    }
+    void Timing::preSourceRun(RunIndex index) { pushStack(configuredInTopLevelProcess_); }
 
-    void Timing::postOpenFile(std::string const& lfn, bool b) {
-      postCommon();
-    }
+    void Timing::postSourceRun(RunIndex index) { postCommon(); }
 
-    void
-    Timing::preModule(ModuleDescription const&) {
-      pushStack(configuredInTopLevelProcess_);
-    }
+    void Timing::preOpenFile(std::string const& lfn, bool b) { pushStack(configuredInTopLevelProcess_); }
 
-    void
-    Timing::postModule(ModuleDescription const& desc) {
-      postCommon();
-    }
+    void Timing::postOpenFile(std::string const& lfn, bool b) { postCommon(); }
+
+    void Timing::preModule(ModuleDescription const&) { pushStack(configuredInTopLevelProcess_); }
 
-    void
-    Timing::preModuleGlobal(GlobalContext const&, ModuleCallingContext const&) {
+    void Timing::postModule(ModuleDescription const& desc) { postCommon(); }
+
+    void Timing::preModuleGlobal(GlobalContext const&, ModuleCallingContext const&) {
       pushStack(configuredInTopLevelProcess_);
     }
 
-    void
-    Timing::postModuleGlobal(GlobalContext const&, ModuleCallingContext const& mcc) {
-      postCommon();
-    }
+    void Timing::postModuleGlobal(GlobalContext const&, ModuleCallingContext const& mcc) { postCommon(); }
 
-    void
-    Timing::postGlobalBeginRun(GlobalContext const& gc) {
+    void Timing::postGlobalBeginRun(GlobalContext const& gc) {
       if (!configuredInTopLevelProcess_) {
         return;
       }
@@ -619,8 +576,7 @@ namespace edm {
       }
     }
 
-    void
-    Timing::postGlobalBeginLumi(GlobalContext const& gc) {
+    void Timing::postGlobalBeginLumi(GlobalContext const& gc) {
       if (!configuredInTopLevelProcess_) {
         return;
       }
@@ -629,47 +585,38 @@ namespace edm {
       }
     }
 
-    void
-    Timing::preModuleStream(StreamContext const&, ModuleCallingContext const&) {
+    void Timing::preModuleStream(StreamContext const&, ModuleCallingContext const&) {
       pushStack(configuredInTopLevelProcess_);
     }
 
-    void
-    Timing::postModuleStream(StreamContext const&, ModuleCallingContext const& mcc) {
-      postCommon();
-    }
+    void Timing::postModuleStream(StreamContext const&, ModuleCallingContext const& mcc) { postCommon(); }
 
-    double
-    Timing::postCommon() const {
+    double Timing::postCommon() const {
       if (!configuredInTopLevelProcess_) {
         return 0.0;
       }
       double t = popStack();
-      if(t > threshold_) {
+      if (t > threshold_) {
         LogError("ExcessiveTime")
-          << "ExcessiveTime: Module used " << t
-          << " seconds of time which exceeds the error threshold configured in the Timing Service of "
-          << threshold_ << " seconds.";
+            << "ExcessiveTime: Module used " << t
+            << " seconds of time which exceeds the error threshold configured in the Timing Service of " << threshold_
+            << " seconds.";
       }
       return t;
     }
 
-    void
-    Timing::preLockEventSetupGet(eventsetup::ComponentDescription const*,
-                                 eventsetup::EventSetupRecordKey const&,
-                                 eventsetup::DataKey const&) {
-
+    void Timing::preLockEventSetupGet(eventsetup::ComponentDescription const*,
+                                      eventsetup::EventSetupRecordKey const&,
+                                      eventsetup::DataKey const&) {
       if (!configuredInTopLevelProcess_) {
         return;
       }
       accumulateTimeBegin(countAndTimeForLock_, accumulatedTimeForLock_);
     }
 
-    void
-    Timing::postLockEventSetupGet(eventsetup::ComponentDescription const*,
-                                  eventsetup::EventSetupRecordKey const&,
-                                  eventsetup::DataKey const&) {
-
+    void Timing::postLockEventSetupGet(eventsetup::ComponentDescription const*,
+                                       eventsetup::EventSetupRecordKey const&,
+                                       eventsetup::DataKey const&) {
       if (!configuredInTopLevelProcess_) {
         return;
       }
@@ -677,17 +624,13 @@ namespace edm {
       accumulateTimeBegin(countAndTimeForGet_, accumulatedTimeForGet_);
     }
 
-    void
-    Timing::postEventSetupGet(eventsetup::ComponentDescription const*,
-                              eventsetup::EventSetupRecordKey const&,
-                              eventsetup::DataKey const&) {
-
+    void Timing::postEventSetupGet(eventsetup::ComponentDescription const*,
+                                   eventsetup::EventSetupRecordKey const&,
+                                   eventsetup::DataKey const&) {
       accumulateTimeEnd(countAndTimeForGet_, accumulatedTimeForGet_);
     }
 
-    void
-    Timing::accumulateTimeBegin(std::atomic<CountAndTime*>& countAndTime, double& accumulatedTime) {
-
+    void Timing::accumulateTimeBegin(std::atomic<CountAndTime*>& countAndTime, double& accumulatedTime) {
       double newTime = getTime();
       auto newStat = std::make_unique<CountAndTime>(0, newTime);
 
@@ -710,9 +653,7 @@ namespace edm {
       }
     }
 
-    void
-    Timing::accumulateTimeEnd(std::atomic<CountAndTime*>& countAndTime, double& accumulatedTime) {
-
+    void Timing::accumulateTimeEnd(std::atomic<CountAndTime*>& countAndTime, double& accumulatedTime) {
       double newTime = getTime();
 
       CountAndTime* oldStat = countAndTime.load();
@@ -732,17 +673,17 @@ namespace edm {
           auto newStat = std::make_unique<CountAndTime>(oldStat->count_ - 1, newTime);
           accumulatedTime += (newTime - oldStat->time_) * oldStat->count_;
           countAndTime.store(newStat.release());
-        } catch (std::exception &) {
+        } catch (std::exception&) {
           countAndTime.store(oldStat);
           throw;
         }
       }
       delete oldStat;
     }
-  }
-}
+  }  // namespace service
+}  // namespace edm
 
 using edm::service::Timing;
 
-typedef edm::serviceregistry::AllArgsMaker<edm::TimingServiceBase,Timing> TimingMaker;
+typedef edm::serviceregistry::AllArgsMaker<edm::TimingServiceBase, Timing> TimingMaker;
 DEFINE_FWK_SERVICE_MAKER(Timing, TimingMaker);
diff --git a/FWCore/Services/plugins/Tracer.cc b/FWCore/Services/plugins/Tracer.cc
index 0dbf2f82cc47e..30d94da16c5cf 100644
--- a/FWCore/Services/plugins/Tracer.cc
+++ b/FWCore/Services/plugins/Tracer.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Services
 // Class  :     Tracer
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -61,80 +61,80 @@ namespace edm {
   class ProcessContext;
   class Run;
   class StreamContext;
-  
+
   namespace service {
     class Tracer {
     public:
-      Tracer(const ParameterSet&,ActivityRegistry&);
-      
-      static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
-      
+      Tracer(const ParameterSet&, ActivityRegistry&);
+
+      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
       void preallocate(service::SystemBounds const&);
-      
+
       void preBeginJob(PathsAndConsumesOfModulesBase const&, ProcessContext const&);
       void postBeginJob();
       void postEndJob();
-      
+
       void preSourceEvent(StreamID);
       void postSourceEvent(StreamID);
-      
+
       void preSourceLumi(LuminosityBlockIndex);
       void postSourceLumi(LuminosityBlockIndex);
-      
+
       void preSourceRun(RunIndex);
       void postSourceRun(RunIndex);
-      
+
       void preOpenFile(std::string const&, bool);
       void postOpenFile(std::string const&, bool);
-      
+
       void preCloseFile(std::string const& lfn, bool primary);
       void postCloseFile(std::string const&, bool);
-      
+
       void preModuleBeginStream(StreamContext const&, ModuleCallingContext const&);
       void postModuleBeginStream(StreamContext const&, ModuleCallingContext const&);
-      
+
       void preModuleEndStream(StreamContext const&, ModuleCallingContext const&);
       void postModuleEndStream(StreamContext const&, ModuleCallingContext const&);
-      
+
       void preGlobalBeginRun(GlobalContext const&);
       void postGlobalBeginRun(GlobalContext const&);
-      
+
       void preGlobalEndRun(GlobalContext const&);
       void postGlobalEndRun(GlobalContext const&);
-      
+
       void preStreamBeginRun(StreamContext const&);
       void postStreamBeginRun(StreamContext const&);
-      
+
       void preStreamEndRun(StreamContext const&);
       void postStreamEndRun(StreamContext const&);
-      
+
       void preGlobalBeginLumi(GlobalContext const&);
       void postGlobalBeginLumi(GlobalContext const&);
-      
+
       void preGlobalEndLumi(GlobalContext const&);
       void postGlobalEndLumi(GlobalContext const&);
-      
+
       void preStreamBeginLumi(StreamContext const&);
       void postStreamBeginLumi(StreamContext const&);
-      
+
       void preStreamEndLumi(StreamContext const&);
       void postStreamEndLumi(StreamContext const&);
-      
+
       void preEvent(StreamContext const&);
       void postEvent(StreamContext const&);
-      
+
       void prePathEvent(StreamContext const&, PathContext const&);
       void postPathEvent(StreamContext const&, PathContext const&, HLTPathStatus const&);
-      
+
       void preModuleConstruction(ModuleDescription const& md);
       void postModuleConstruction(ModuleDescription const& md);
-      
+
       void preModuleBeginJob(ModuleDescription const& md);
       void postModuleBeginJob(ModuleDescription const& md);
-      
+
       void preModuleEndJob(ModuleDescription const& md);
       void postModuleEndJob(ModuleDescription const& md);
-      
+
       void preModuleEventPrefetching(StreamContext const&, ModuleCallingContext const&);
       void postModuleEventPrefetching(StreamContext const&, ModuleCallingContext const&);
       void preModuleEvent(StreamContext const&, ModuleCallingContext const&);
@@ -145,22 +145,22 @@ namespace edm {
       void postModuleEventDelayedGet(StreamContext const&, ModuleCallingContext const&);
       void preEventReadFromSource(StreamContext const&, ModuleCallingContext const&);
       void postEventReadFromSource(StreamContext const&, ModuleCallingContext const&);
-      
+
       void preModuleStreamBeginRun(StreamContext const&, ModuleCallingContext const&);
       void postModuleStreamBeginRun(StreamContext const&, ModuleCallingContext const&);
       void preModuleStreamEndRun(StreamContext const&, ModuleCallingContext const&);
       void postModuleStreamEndRun(StreamContext const&, ModuleCallingContext const&);
-      
+
       void preModuleStreamBeginLumi(StreamContext const&, ModuleCallingContext const&);
       void postModuleStreamBeginLumi(StreamContext const&, ModuleCallingContext const&);
       void preModuleStreamEndLumi(StreamContext const&, ModuleCallingContext const&);
       void postModuleStreamEndLumi(StreamContext const&, ModuleCallingContext const&);
-      
+
       void preModuleGlobalBeginRun(GlobalContext const&, ModuleCallingContext const&);
       void postModuleGlobalBeginRun(GlobalContext const&, ModuleCallingContext const&);
       void preModuleGlobalEndRun(GlobalContext const&, ModuleCallingContext const&);
       void postModuleGlobalEndRun(GlobalContext const&, ModuleCallingContext const&);
-      
+
       void preModuleGlobalBeginLumi(GlobalContext const&, ModuleCallingContext const&);
       void postModuleGlobalBeginLumi(GlobalContext const&, ModuleCallingContext const&);
       void preModuleGlobalEndLumi(GlobalContext const&, ModuleCallingContext const&);
@@ -168,7 +168,7 @@ namespace edm {
 
       void preModuleWriteRun(GlobalContext const&, ModuleCallingContext const&);
       void postModuleWriteRun(GlobalContext const&, ModuleCallingContext const&);
-      
+
       void preModuleWriteLumi(GlobalContext const&, ModuleCallingContext const&);
       void postModuleWriteLumi(GlobalContext const&, ModuleCallingContext const&);
 
@@ -195,8 +195,8 @@ namespace edm {
       bool printTimestamps_;
       bool dumpEventSetupInfo_;
     };
-  }
-}
+  }  // namespace service
+}  // namespace edm
 
 using namespace edm::service;
 
@@ -204,12 +204,9 @@ namespace {
 
   class TimeStamper {
   public:
-    TimeStamper(bool enable) :
-      enabled_(enable)
-    { }
+    TimeStamper(bool enable) : enabled_(enable) {}
 
-    friend
-    std::ostream & operator<<(std::ostream & out, TimeStamper const & timestamp) {
+    friend std::ostream& operator<<(std::ostream& out, TimeStamper const& timestamp) {
       if (timestamp.enabled_)
         out << std::setprecision(2) << edm::TimeOfDay() << "  ";
       return out;
@@ -219,17 +216,16 @@ namespace {
     bool enabled_;
   };
 
-}
+}  // namespace
 
-Tracer::Tracer(ParameterSet const& iPS, ActivityRegistry&iRegistry) :
-  indention_(iPS.getUntrackedParameter<std::string>("indention")),
-  dumpContextForLabels_(),
-  dumpNonModuleContext_(iPS.getUntrackedParameter<bool>("dumpNonModuleContext")),
-  dumpPathsAndConsumes_(iPS.getUntrackedParameter<bool>("dumpPathsAndConsumes")),
-  printTimestamps_(iPS.getUntrackedParameter<bool>("printTimestamps")),
-  dumpEventSetupInfo_(iPS.getUntrackedParameter<bool>("dumpEventSetupInfo"))
-{
-  for (std::string & label: iPS.getUntrackedParameter<std::vector<std::string>>("dumpContextForLabels"))
+Tracer::Tracer(ParameterSet const& iPS, ActivityRegistry& iRegistry)
+    : indention_(iPS.getUntrackedParameter<std::string>("indention")),
+      dumpContextForLabels_(),
+      dumpNonModuleContext_(iPS.getUntrackedParameter<bool>("dumpNonModuleContext")),
+      dumpPathsAndConsumes_(iPS.getUntrackedParameter<bool>("dumpPathsAndConsumes")),
+      printTimestamps_(iPS.getUntrackedParameter<bool>("printTimestamps")),
+      dumpEventSetupInfo_(iPS.getUntrackedParameter<bool>("dumpEventSetupInfo")) {
+  for (std::string& label : iPS.getUntrackedParameter<std::vector<std::string>>("dumpContextForLabels"))
     dumpContextForLabels_.insert(std::move(label));
 
   iRegistry.watchPreallocate(this, &Tracer::preallocate);
@@ -349,106 +345,114 @@ Tracer::Tracer(ParameterSet const& iPS, ActivityRegistry&iRegistry) :
     out << TimeStamper(printTimestamps_);
     out << indention_ << indention_ << " early termination before processing transition";
   });
-  iRegistry.preStreamEarlyTerminationSignal_.connect([this](edm::StreamContext const& iContext, edm::TerminationOrigin iOrigin) {
-    LogAbsolute out("Tracer");
-    out << TimeStamper(printTimestamps_);
-    if(iContext.eventID().luminosityBlock() ==0) {
-      out << indention_ << indention_ << " early termination of run: stream = " << iContext.streamID()
-      <<" run = " << iContext.eventID().run();
-    }else {
-      if(iContext.eventID().event() == 0) {
-        out << indention_ << indention_ << " early termination of stream lumi: stream = " << iContext.streamID()
-        <<" run = " << iContext.eventID().run()
-        << " lumi = " << iContext.eventID().luminosityBlock() ;
-      } else {
-        out << indention_ << indention_ << " early termination of event: stream = " << iContext.streamID()
-        <<" run = " << iContext.eventID().run()
-        << " lumi = " << iContext.eventID().luminosityBlock()
-        << " event = "<< iContext.eventID().event();
-        
-      }
-    }
-    out<< " : time = " << iContext.timestamp().value();
-    
-  });
-  iRegistry.preGlobalEarlyTerminationSignal_.connect([this](edm::GlobalContext const& iContext, edm::TerminationOrigin iOrigin) {
-    LogAbsolute out("Tracer");
-    out << TimeStamper(printTimestamps_);
-    if(iContext.luminosityBlockID().value() ==0) {
-      out << indention_ << indention_ << " early termination of global run " << iContext.luminosityBlockID().run();
-    }else {
-      out << indention_ << indention_ << " early termination of global lumi run = " << iContext.luminosityBlockID().run()
-          << " lumi = " << iContext.luminosityBlockID().luminosityBlock() ;
-      
-    }
-    out<< " : time = " << iContext.timestamp().value();
-  });
+  iRegistry.preStreamEarlyTerminationSignal_.connect(
+      [this](edm::StreamContext const& iContext, edm::TerminationOrigin iOrigin) {
+        LogAbsolute out("Tracer");
+        out << TimeStamper(printTimestamps_);
+        if (iContext.eventID().luminosityBlock() == 0) {
+          out << indention_ << indention_ << " early termination of run: stream = " << iContext.streamID()
+              << " run = " << iContext.eventID().run();
+        } else {
+          if (iContext.eventID().event() == 0) {
+            out << indention_ << indention_ << " early termination of stream lumi: stream = " << iContext.streamID()
+                << " run = " << iContext.eventID().run() << " lumi = " << iContext.eventID().luminosityBlock();
+          } else {
+            out << indention_ << indention_ << " early termination of event: stream = " << iContext.streamID()
+                << " run = " << iContext.eventID().run() << " lumi = " << iContext.eventID().luminosityBlock()
+                << " event = " << iContext.eventID().event();
+          }
+        }
+        out << " : time = " << iContext.timestamp().value();
+      });
+  iRegistry.preGlobalEarlyTerminationSignal_.connect(
+      [this](edm::GlobalContext const& iContext, edm::TerminationOrigin iOrigin) {
+        LogAbsolute out("Tracer");
+        out << TimeStamper(printTimestamps_);
+        if (iContext.luminosityBlockID().value() == 0) {
+          out << indention_ << indention_ << " early termination of global run " << iContext.luminosityBlockID().run();
+        } else {
+          out << indention_ << indention_
+              << " early termination of global lumi run = " << iContext.luminosityBlockID().run()
+              << " lumi = " << iContext.luminosityBlockID().luminosityBlock();
+        }
+        out << " : time = " << iContext.timestamp().value();
+      });
 }
 
-void
-Tracer::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
+void Tracer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
-  desc.addUntracked<std::string>("indention", "++")->setComment("Prefix characters for output. The characters are repeated to form the indentation.");
-  desc.addUntracked<std::vector<std::string>>("dumpContextForLabels", std::vector<std::string>{})->setComment("Prints context information to cout for the module transitions associated with these modules' labels");
-  desc.addUntracked<bool>("dumpNonModuleContext", false)->setComment("Prints context information to cout for the transitions not associated with any module label");
-  desc.addUntracked<bool>("dumpPathsAndConsumes", false)->setComment("Prints information to cout about paths, endpaths, products consumed by modules and the dependencies between modules created by the products they consume");
+  desc.addUntracked<std::string>("indention", "++")
+      ->setComment("Prefix characters for output. The characters are repeated to form the indentation.");
+  desc.addUntracked<std::vector<std::string>>("dumpContextForLabels", std::vector<std::string>{})
+      ->setComment(
+          "Prints context information to cout for the module transitions associated with these modules' labels");
+  desc.addUntracked<bool>("dumpNonModuleContext", false)
+      ->setComment("Prints context information to cout for the transitions not associated with any module label");
+  desc.addUntracked<bool>("dumpPathsAndConsumes", false)
+      ->setComment(
+          "Prints information to cout about paths, endpaths, products consumed by modules and the dependencies between "
+          "modules created by the products they consume");
   desc.addUntracked<bool>("printTimestamps", false)->setComment("Prints a time stamp for every transition");
-  desc.addUntracked<bool>("dumpEventSetupInfo", false)->setComment("Prints info 3 times when an event setup cache is filled, before the lock, after the lock, and after filling");
+  desc.addUntracked<bool>("dumpEventSetupInfo", false)
+      ->setComment(
+          "Prints info 3 times when an event setup cache is filled, before the lock, after the lock, and after "
+          "filling");
   descriptions.add("Tracer", desc);
-  descriptions.setComment("This service prints each phase the framework is processing, e.g. constructing a module,running a module, etc.");
+  descriptions.setComment(
+      "This service prints each phase the framework is processing, e.g. constructing a module,running a module, etc.");
 }
 
-void
-Tracer::preallocate(service::SystemBounds const& bounds) {
-  LogAbsolute("Tracer") << TimeStamper(printTimestamps_) << indention_ << " preallocate: " << bounds.maxNumberOfConcurrentRuns() << " concurrent runs, "
-                                                          << bounds.maxNumberOfConcurrentLuminosityBlocks() << " concurrent luminosity sections, " 
-                                                          << bounds.maxNumberOfStreams() << " streams";
+void Tracer::preallocate(service::SystemBounds const& bounds) {
+  LogAbsolute("Tracer") << TimeStamper(printTimestamps_) << indention_
+                        << " preallocate: " << bounds.maxNumberOfConcurrentRuns() << " concurrent runs, "
+                        << bounds.maxNumberOfConcurrentLuminosityBlocks() << " concurrent luminosity sections, "
+                        << bounds.maxNumberOfStreams() << " streams";
 }
 
-void 
-Tracer::preBeginJob(PathsAndConsumesOfModulesBase const& pathsAndConsumes, ProcessContext const& pc) {
+void Tracer::preBeginJob(PathsAndConsumesOfModulesBase const& pathsAndConsumes, ProcessContext const& pc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_) << indention_ << " starting: begin job";
-  if(dumpPathsAndConsumes_) {
-    out << "\n" << "Process name = " << pc.processName() << "\n";
+  if (dumpPathsAndConsumes_) {
+    out << "\n"
+        << "Process name = " << pc.processName() << "\n";
     out << "paths:\n";
     std::vector<std::string> const& paths = pathsAndConsumes.paths();
-    for(auto const& path : paths) {
+    for (auto const& path : paths) {
       out << "  " << path << "\n";
     }
     out << "end paths:\n";
     std::vector<std::string> const& endpaths = pathsAndConsumes.endPaths();
-    for(auto const& endpath : endpaths) {
+    for (auto const& endpath : endpaths) {
       out << "  " << endpath << "\n";
     }
-    for(unsigned int j = 0; j < paths.size(); ++j) {
+    for (unsigned int j = 0; j < paths.size(); ++j) {
       std::vector<ModuleDescription const*> const& modulesOnPath = pathsAndConsumes.modulesOnPath(j);
       out << "modules on path " << paths.at(j) << ":\n";
-      for(auto const& desc : modulesOnPath) {
+      for (auto const& desc : modulesOnPath) {
         out << "  " << desc->moduleLabel() << "\n";
       }
     }
-    for(unsigned int j = 0; j < endpaths.size(); ++j) {
+    for (unsigned int j = 0; j < endpaths.size(); ++j) {
       std::vector<ModuleDescription const*> const& modulesOnEndPath = pathsAndConsumes.modulesOnEndPath(j);
       out << "modules on end path " << endpaths.at(j) << ":\n";
-      for(auto const& desc : modulesOnEndPath) {
+      for (auto const& desc : modulesOnEndPath) {
         out << "  " << desc->moduleLabel() << "\n";
       }
     }
-    std::vector<ModuleDescription const*> const& allModules =  pathsAndConsumes.allModules();
+    std::vector<ModuleDescription const*> const& allModules = pathsAndConsumes.allModules();
     out << "All modules and modules in the current process whose products they consume:\n";
     out << "(This does not include modules from previous processes or the source)\n";
-    for(auto const& module : allModules) {
+    for (auto const& module : allModules) {
       out << "  " << module->moduleName() << "/\'" << module->moduleLabel() << "\'";
       unsigned int moduleID = module->id();
-      if(pathsAndConsumes.moduleDescription(moduleID) != module) {
+      if (pathsAndConsumes.moduleDescription(moduleID) != module) {
         throw cms::Exception("TestFailure") << "Tracer::preBeginJob, moduleDescription returns incorrect value";
       }
       std::vector<ModuleDescription const*> const& modulesWhoseProductsAreConsumedBy =
-        pathsAndConsumes.modulesWhoseProductsAreConsumedBy(moduleID);
-      if(!modulesWhoseProductsAreConsumedBy.empty()) {
+          pathsAndConsumes.modulesWhoseProductsAreConsumedBy(moduleID);
+      if (!modulesWhoseProductsAreConsumedBy.empty()) {
         out << " consumes products from these modules:\n";
-        for(auto const& producingModule : modulesWhoseProductsAreConsumedBy) {
+        for (auto const& producingModule : modulesWhoseProductsAreConsumedBy) {
           out << "    " << producingModule->moduleName() << "/\'" << producingModule->moduleLabel() << "\'\n";
         }
       } else {
@@ -461,26 +465,26 @@ Tracer::preBeginJob(PathsAndConsumesOfModulesBase const& pathsAndConsumes, Proce
     out << "For products that are declared with mayConsume, \'may consume\' is added.\n";
     out << "For products consumed for Views, \'element type\' is added\n";
     out << "For products only read from previous processes, \'skip current process\' is added\n";
-    for(auto const* module : allModules) {
+    for (auto const* module : allModules) {
       out << "  " << module->moduleName() << "/\'" << module->moduleLabel() << "\'";
       std::vector<ConsumesInfo> consumesInfo = pathsAndConsumes.consumesInfo(module->id());
-      if(!consumesInfo.empty()) {
+      if (!consumesInfo.empty()) {
         out << " consumes:\n";
-        for(auto const& info : consumesInfo) {
+        for (auto const& info : consumesInfo) {
           out << "    " << info.type() << " \'" << info.label() << "\' \'" << info.instance();
           out << "\' \'" << info.process() << "\'";
-          if(info.branchType() == InLumi) {
+          if (info.branchType() == InLumi) {
             out << ", lumi";
-          } else if(info.branchType() == InRun) {
+          } else if (info.branchType() == InRun) {
             out << ", run";
           }
-          if(!info.alwaysGets()) {
+          if (!info.alwaysGets()) {
             out << ", may consume";
           }
-          if(info.kindOfType() == ELEMENT_TYPE) {
+          if (info.kindOfType() == ELEMENT_TYPE) {
             out << ", element type";
           }
-          if(info.skipCurrentProcess()) {
+          if (info.skipCurrentProcess()) {
             out << ", skip current process";
           }
           out << "\n";
@@ -492,871 +496,842 @@ Tracer::preBeginJob(PathsAndConsumesOfModulesBase const& pathsAndConsumes, Proce
   }
 }
 
-void
-Tracer::postBeginJob() {
+void Tracer::postBeginJob() {
   LogAbsolute("Tracer") << TimeStamper(printTimestamps_) << indention_ << " finished: begin job";
 }
 
-void 
-Tracer::postEndJob() {
+void Tracer::postEndJob() {
   LogAbsolute("Tracer") << TimeStamper(printTimestamps_) << indention_ << " finished: end job";
 }
 
-void
-Tracer::preSourceEvent(StreamID sid) {
+void Tracer::preSourceEvent(StreamID sid) {
   LogAbsolute("Tracer") << TimeStamper(printTimestamps_) << indention_ << indention_ << " starting: source event";
 }
 
-void
-Tracer::postSourceEvent(StreamID sid) {
+void Tracer::postSourceEvent(StreamID sid) {
   LogAbsolute("Tracer") << TimeStamper(printTimestamps_) << indention_ << indention_ << " finished: source event";
 }
 
-void
-Tracer::preSourceLumi(LuminosityBlockIndex index) {
+void Tracer::preSourceLumi(LuminosityBlockIndex index) {
   LogAbsolute("Tracer") << TimeStamper(printTimestamps_) << indention_ << indention_ << " starting: source lumi";
 }
 
-void
-Tracer::postSourceLumi(LuminosityBlockIndex index) {
+void Tracer::postSourceLumi(LuminosityBlockIndex index) {
   LogAbsolute("Tracer") << TimeStamper(printTimestamps_) << indention_ << indention_ << " finished: source lumi";
 }
 
-void
-Tracer::preSourceRun(RunIndex index) {
+void Tracer::preSourceRun(RunIndex index) {
   LogAbsolute("Tracer") << TimeStamper(printTimestamps_) << indention_ << indention_ << " starting: source run";
 }
 
-void
-Tracer::postSourceRun(RunIndex index) {
+void Tracer::postSourceRun(RunIndex index) {
   LogAbsolute("Tracer") << TimeStamper(printTimestamps_) << indention_ << indention_ << " finished: source run";
 }
 
-void
-Tracer::preOpenFile(std::string const& lfn, bool b) {
+void Tracer::preOpenFile(std::string const& lfn, bool b) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_ << indention_ << " starting: open input file: lfn = " << lfn;
-  if(dumpNonModuleContext_) out << " usedFallBack = " << b;
+  if (dumpNonModuleContext_)
+    out << " usedFallBack = " << b;
 }
 
-void
-Tracer::postOpenFile (std::string const& lfn, bool b) {
+void Tracer::postOpenFile(std::string const& lfn, bool b) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_ << indention_ << " finished: open input file: lfn = " << lfn;
-  if(dumpNonModuleContext_) out << " usedFallBack = " << b;
+  if (dumpNonModuleContext_)
+    out << " usedFallBack = " << b;
 }
 
-void
-Tracer::preCloseFile(std::string const & lfn, bool b) {
+void Tracer::preCloseFile(std::string const& lfn, bool b) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_ << indention_ << " starting: close input file: lfn = " << lfn;
-  if(dumpNonModuleContext_) out << " usedFallBack = " << b;
+  if (dumpNonModuleContext_)
+    out << " usedFallBack = " << b;
 }
-void
-Tracer::postCloseFile (std::string const& lfn, bool b) {
+void Tracer::postCloseFile(std::string const& lfn, bool b) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_ << indention_ << " finished: close input file: lfn = " << lfn;
-  if(dumpNonModuleContext_) out << " usedFallBack = " << b;
+  if (dumpNonModuleContext_)
+    out << " usedFallBack = " << b;
 }
 
-void
-Tracer::preModuleBeginStream(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::preModuleBeginStream(StreamContext const& sc, ModuleCallingContext const& mcc) {
   ModuleDescription const& desc = *mcc.moduleDescription();
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
-  out << indention_ << indention_ << " starting: begin stream for module: stream = " << sc.streamID() << " label = '" << desc.moduleLabel() << "' id = " << desc.id();
-  if(dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
+  out << indention_ << indention_ << " starting: begin stream for module: stream = " << sc.streamID() << " label = '"
+      << desc.moduleLabel() << "' id = " << desc.id();
+  if (dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << sc;
     out << mcc;
   }
 }
 
-void
-Tracer::postModuleBeginStream(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::postModuleBeginStream(StreamContext const& sc, ModuleCallingContext const& mcc) {
   ModuleDescription const& desc = *mcc.moduleDescription();
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
-  out << indention_ << indention_ << " finished: begin stream for module: stream = " << sc.streamID() << " label = '" << desc.moduleLabel() << "' id = " << desc.id();
-  if(dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
+  out << indention_ << indention_ << " finished: begin stream for module: stream = " << sc.streamID() << " label = '"
+      << desc.moduleLabel() << "' id = " << desc.id();
+  if (dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << sc;
     out << mcc;
   }
 }
 
-void
-Tracer::preModuleEndStream(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::preModuleEndStream(StreamContext const& sc, ModuleCallingContext const& mcc) {
   ModuleDescription const& desc = *mcc.moduleDescription();
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
-  out << indention_ << indention_ << " starting: end stream for module: stream = " << sc.streamID() << " label = '" << desc.moduleLabel() << "' id = " << desc.id();
-  if(dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
+  out << indention_ << indention_ << " starting: end stream for module: stream = " << sc.streamID() << " label = '"
+      << desc.moduleLabel() << "' id = " << desc.id();
+  if (dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << sc;
     out << mcc;
   }
 }
 
-void
-Tracer::postModuleEndStream(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::postModuleEndStream(StreamContext const& sc, ModuleCallingContext const& mcc) {
   ModuleDescription const& desc = *mcc.moduleDescription();
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
-  out << indention_ << indention_ << " finished: end stream for module: stream = " << sc.streamID() << " label = '" << desc.moduleLabel() << "' id = " << desc.id();
-  if(dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
+  out << indention_ << indention_ << " finished: end stream for module: stream = " << sc.streamID() << " label = '"
+      << desc.moduleLabel() << "' id = " << desc.id();
+  if (dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << sc;
     out << mcc;
   }
 }
 
-void
-Tracer::preGlobalBeginRun(GlobalContext const& gc) {
+void Tracer::preGlobalBeginRun(GlobalContext const& gc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_ << indention_ << " starting: global begin run " << gc.luminosityBlockID().run()
       << " : time = " << gc.timestamp().value();
-  if(dumpNonModuleContext_) {
+  if (dumpNonModuleContext_) {
     out << "\n" << gc;
   }
 }
 
-void
-Tracer::postGlobalBeginRun(GlobalContext const& gc) {
+void Tracer::postGlobalBeginRun(GlobalContext const& gc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_ << indention_ << " finished: global begin run " << gc.luminosityBlockID().run()
       << " : time = " << gc.timestamp().value();
-  if(dumpNonModuleContext_) {
+  if (dumpNonModuleContext_) {
     out << "\n" << gc;
   }
 }
 
-void
-Tracer::preGlobalEndRun(GlobalContext const& gc) {
+void Tracer::preGlobalEndRun(GlobalContext const& gc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_ << indention_ << " starting: global end run " << gc.luminosityBlockID().run()
       << " : time = " << gc.timestamp().value();
-  if(dumpNonModuleContext_) {
+  if (dumpNonModuleContext_) {
     out << "\n" << gc;
   }
 }
 
-void
-Tracer::postGlobalEndRun(GlobalContext const& gc) {
+void Tracer::postGlobalEndRun(GlobalContext const& gc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_ << indention_ << " finished: global end run " << gc.luminosityBlockID().run()
       << " : time = " << gc.timestamp().value();
-  if(dumpNonModuleContext_) {
+  if (dumpNonModuleContext_) {
     out << "\n" << gc;
   }
 }
 
-void
-Tracer::preStreamBeginRun(StreamContext const& sc) {
+void Tracer::preStreamBeginRun(StreamContext const& sc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
-  out << indention_ << indention_ << " starting: begin run: stream = " << sc.streamID() << " run = " << sc.eventID().run()
-      << " time = " << sc.timestamp().value();
-  if(dumpNonModuleContext_) {
+  out << indention_ << indention_ << " starting: begin run: stream = " << sc.streamID()
+      << " run = " << sc.eventID().run() << " time = " << sc.timestamp().value();
+  if (dumpNonModuleContext_) {
     out << "\n" << sc;
   }
 }
 
-void
-Tracer::postStreamBeginRun(StreamContext const& sc) {
+void Tracer::postStreamBeginRun(StreamContext const& sc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
-  out << indention_ << indention_ << " finished: begin run: stream = " << sc.streamID() << " run = " << sc.eventID().run()
-      << " time = " << sc.timestamp().value();
-  if(dumpNonModuleContext_) {
+  out << indention_ << indention_ << " finished: begin run: stream = " << sc.streamID()
+      << " run = " << sc.eventID().run() << " time = " << sc.timestamp().value();
+  if (dumpNonModuleContext_) {
     out << "\n" << sc;
   }
 }
 
-void
-Tracer::preStreamEndRun(StreamContext const& sc) {
+void Tracer::preStreamEndRun(StreamContext const& sc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_ << indention_ << " starting: end run: stream = " << sc.streamID() << " run = " << sc.eventID().run()
       << " time = " << sc.timestamp().value();
-  if(dumpNonModuleContext_) {
+  if (dumpNonModuleContext_) {
     out << "\n" << sc;
   }
 }
 
-void
-Tracer::postStreamEndRun(StreamContext const& sc) {
+void Tracer::postStreamEndRun(StreamContext const& sc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_ << indention_ << " finished: end run: stream = " << sc.streamID() << " run = " << sc.eventID().run()
       << " time = " << sc.timestamp().value();
-  if(dumpNonModuleContext_) {
+  if (dumpNonModuleContext_) {
     out << "\n" << sc;
   }
 }
 
-void
-Tracer::preGlobalBeginLumi(GlobalContext const& gc) {
+void Tracer::preGlobalBeginLumi(GlobalContext const& gc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_ << indention_ << " starting: global begin lumi: run = " << gc.luminosityBlockID().run()
       << " lumi = " << gc.luminosityBlockID().luminosityBlock() << " time = " << gc.timestamp().value();
-  if(dumpNonModuleContext_) {
+  if (dumpNonModuleContext_) {
     out << "\n" << gc;
   }
 }
 
-void
-Tracer::postGlobalBeginLumi(GlobalContext const& gc) {
+void Tracer::postGlobalBeginLumi(GlobalContext const& gc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_ << indention_ << " finished: global begin lumi: run = " << gc.luminosityBlockID().run()
       << " lumi = " << gc.luminosityBlockID().luminosityBlock() << " time = " << gc.timestamp().value();
-  if(dumpNonModuleContext_) {
+  if (dumpNonModuleContext_) {
     out << "\n" << gc;
   }
 }
 
-void
-Tracer::preGlobalEndLumi(GlobalContext const& gc) {
+void Tracer::preGlobalEndLumi(GlobalContext const& gc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_ << indention_ << " starting: global end lumi: run = " << gc.luminosityBlockID().run()
       << " lumi = " << gc.luminosityBlockID().luminosityBlock() << " time = " << gc.timestamp().value();
-  if(dumpNonModuleContext_) {
+  if (dumpNonModuleContext_) {
     out << "\n" << gc;
   }
 }
 
-void
-Tracer::postGlobalEndLumi(GlobalContext const& gc) {
+void Tracer::postGlobalEndLumi(GlobalContext const& gc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_ << indention_ << " finished: global end lumi: run = " << gc.luminosityBlockID().run()
       << " lumi = " << gc.luminosityBlockID().luminosityBlock() << " time = " << gc.timestamp().value();
-  if(dumpNonModuleContext_) {
+  if (dumpNonModuleContext_) {
     out << "\n" << gc;
   }
 }
 
-void
-Tracer::preStreamBeginLumi(StreamContext const& sc) {
+void Tracer::preStreamBeginLumi(StreamContext const& sc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
-  out << indention_ << indention_ << " starting: begin lumi: stream = " << sc.streamID() << " run = " << sc.eventID().run()
-      << " lumi = " << sc.eventID().luminosityBlock() << " time = " << sc.timestamp().value();
-  if(dumpNonModuleContext_) {
+  out << indention_ << indention_ << " starting: begin lumi: stream = " << sc.streamID()
+      << " run = " << sc.eventID().run() << " lumi = " << sc.eventID().luminosityBlock()
+      << " time = " << sc.timestamp().value();
+  if (dumpNonModuleContext_) {
     out << "\n" << sc;
   }
 }
 
-void
-Tracer::postStreamBeginLumi(StreamContext const& sc) {
+void Tracer::postStreamBeginLumi(StreamContext const& sc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
-  out << indention_ << indention_ << " finished: begin lumi: stream = " << sc.streamID() << " run = " << sc.eventID().run()
-      << " lumi = " << sc.eventID().luminosityBlock() << " time = " << sc.timestamp().value();
-  if(dumpNonModuleContext_) {
+  out << indention_ << indention_ << " finished: begin lumi: stream = " << sc.streamID()
+      << " run = " << sc.eventID().run() << " lumi = " << sc.eventID().luminosityBlock()
+      << " time = " << sc.timestamp().value();
+  if (dumpNonModuleContext_) {
     out << "\n" << sc;
   }
 }
 
-void
-Tracer::preStreamEndLumi(StreamContext const& sc) {
+void Tracer::preStreamEndLumi(StreamContext const& sc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
-  out << indention_ << indention_ << " starting: end lumi: stream = " << sc.streamID() << " run = " << sc.eventID().run()
-      << " lumi = " << sc.eventID().luminosityBlock() << " time = " << sc.timestamp().value();
-  if(dumpNonModuleContext_) {
+  out << indention_ << indention_ << " starting: end lumi: stream = " << sc.streamID()
+      << " run = " << sc.eventID().run() << " lumi = " << sc.eventID().luminosityBlock()
+      << " time = " << sc.timestamp().value();
+  if (dumpNonModuleContext_) {
     out << "\n" << sc;
   }
 }
 
-void
-Tracer::postStreamEndLumi(StreamContext const& sc) {
+void Tracer::postStreamEndLumi(StreamContext const& sc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
-  out << indention_ << indention_ << " finished: end lumi: stream = " << sc.streamID() << " run = " << sc.eventID().run()
-      << " lumi = " << sc.eventID().luminosityBlock() << " time = " << sc.timestamp().value();
-  if(dumpNonModuleContext_) {
+  out << indention_ << indention_ << " finished: end lumi: stream = " << sc.streamID()
+      << " run = " << sc.eventID().run() << " lumi = " << sc.eventID().luminosityBlock()
+      << " time = " << sc.timestamp().value();
+  if (dumpNonModuleContext_) {
     out << "\n" << sc;
   }
 }
 
-void
-Tracer::preEvent(StreamContext const& sc) {
+void Tracer::preEvent(StreamContext const& sc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
-  out << indention_ << indention_ << " starting: processing event : stream = " << sc.streamID() << " run = " << sc.eventID().run()
-      << " lumi = " << sc.eventID().luminosityBlock() << " event = " << sc.eventID().event() << " time = " << sc.timestamp().value();
-  if(dumpNonModuleContext_) {
+  out << indention_ << indention_ << " starting: processing event : stream = " << sc.streamID()
+      << " run = " << sc.eventID().run() << " lumi = " << sc.eventID().luminosityBlock()
+      << " event = " << sc.eventID().event() << " time = " << sc.timestamp().value();
+  if (dumpNonModuleContext_) {
     out << "\n" << sc;
   }
 }
 
-void
-Tracer::postEvent(StreamContext const& sc) {
+void Tracer::postEvent(StreamContext const& sc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
-  out << indention_ << indention_ << " finished: processing event : stream = " << sc.streamID() << " run = " << sc.eventID().run()
-      << " lumi = " << sc.eventID().luminosityBlock() << " event = " << sc.eventID().event() << " time = " << sc.timestamp().value();
-  if(dumpNonModuleContext_) {
+  out << indention_ << indention_ << " finished: processing event : stream = " << sc.streamID()
+      << " run = " << sc.eventID().run() << " lumi = " << sc.eventID().luminosityBlock()
+      << " event = " << sc.eventID().event() << " time = " << sc.timestamp().value();
+  if (dumpNonModuleContext_) {
     out << "\n" << sc;
   }
 }
 
-void
-Tracer::prePathEvent(StreamContext const& sc, PathContext const& pc) {
+void Tracer::prePathEvent(StreamContext const& sc, PathContext const& pc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
-  out << indention_ << indention_ << indention_ << " starting: processing path '" << pc.pathName() << "' : stream = " << sc.streamID();
-  if(dumpNonModuleContext_) {
+  out << indention_ << indention_ << indention_ << " starting: processing path '" << pc.pathName()
+      << "' : stream = " << sc.streamID();
+  if (dumpNonModuleContext_) {
     out << "\n" << sc;
     out << pc;
   }
 }
 
-void
-Tracer::postPathEvent(StreamContext const& sc, PathContext const& pc, HLTPathStatus const& hlts) {
+void Tracer::postPathEvent(StreamContext const& sc, PathContext const& pc, HLTPathStatus const& hlts) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
-  out << indention_ << indention_ << indention_ << " finished: processing path '" << pc.pathName() << "' : stream = " << sc.streamID();
-  if(dumpNonModuleContext_) {
+  out << indention_ << indention_ << indention_ << " finished: processing path '" << pc.pathName()
+      << "' : stream = " << sc.streamID();
+  if (dumpNonModuleContext_) {
     out << "\n" << sc;
     out << pc;
   }
 }
 
-void 
-Tracer::preModuleConstruction(ModuleDescription const& desc) {
+void Tracer::preModuleConstruction(ModuleDescription const& desc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
-  out << indention_ << indention_ << " starting: constructing module with label '" << desc.moduleLabel() << "' id = " << desc.id();
-  if(dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
+  out << indention_ << indention_ << " starting: constructing module with label '" << desc.moduleLabel()
+      << "' id = " << desc.id();
+  if (dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << desc;
   }
 }
 
-void 
-Tracer::postModuleConstruction(ModuleDescription const& desc) {
+void Tracer::postModuleConstruction(ModuleDescription const& desc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
-  out << indention_ << indention_ << " finished: constructing module with label '" << desc.moduleLabel() << "' id = " << desc.id();
-  if(dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
+  out << indention_ << indention_ << " finished: constructing module with label '" << desc.moduleLabel()
+      << "' id = " << desc.id();
+  if (dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << desc;
   }
 }
 
-void 
-Tracer::preModuleBeginJob(ModuleDescription const& desc) {
+void Tracer::preModuleBeginJob(ModuleDescription const& desc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_ << indention_;
   out << " starting: begin job for module with label '" << desc.moduleLabel() << "' id = " << desc.id();
-  if(dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
+  if (dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << desc;
   }
 }
 
-void 
-Tracer::postModuleBeginJob(ModuleDescription const& desc) {
+void Tracer::postModuleBeginJob(ModuleDescription const& desc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_ << indention_;
   out << " finished: begin job for module with label '" << desc.moduleLabel() << "' id = " << desc.id();
-  if(dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
+  if (dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << desc;
   }
 }
 
-void 
-Tracer::preModuleEndJob(ModuleDescription const& desc) {
+void Tracer::preModuleEndJob(ModuleDescription const& desc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_ << indention_;
   out << " starting: end job for module with label '" << desc.moduleLabel() << "' id = " << desc.id();
-  if(dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
+  if (dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << desc;
   }
 }
 
-void 
-Tracer::postModuleEndJob(ModuleDescription const& desc) {
+void Tracer::postModuleEndJob(ModuleDescription const& desc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_ << indention_;
   out << " finished: end job for module with label '" << desc.moduleLabel() << "' id = " << desc.id();
-  if(dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
+  if (dumpContextForLabels_.find(desc.moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << desc;
   }
 }
 
-void
-Tracer::preModuleEventPrefetching(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::preModuleEventPrefetching(StreamContext const& sc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 4;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " starting: prefetching before processing event for module: stream = " << sc.streamID() << " label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " starting: prefetching before processing event for module: stream = " << sc.streamID() << " label = '"
+      << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << sc;
     out << mcc;
   }
 }
 
-void
-Tracer::postModuleEventPrefetching(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::postModuleEventPrefetching(StreamContext const& sc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 4;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " finished: prefetching before processing event for module: stream = " << sc.streamID() << " label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " finished: prefetching before processing event for module: stream = " << sc.streamID() << " label = '"
+      << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << sc;
     out << mcc;
   }
 }
 
-
-void 
-Tracer::preModuleEvent(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::preModuleEvent(StreamContext const& sc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 4;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " starting: processing event for module: stream = " << sc.streamID() << " label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " starting: processing event for module: stream = " << sc.streamID() << " label = '"
+      << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << sc;
     out << mcc;
   }
 }
 
-void 
-Tracer::postModuleEvent(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::postModuleEvent(StreamContext const& sc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 4;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " finished: processing event for module: stream = " << sc.streamID() << " label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " finished: processing event for module: stream = " << sc.streamID() << " label = '"
+      << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << sc;
     out << mcc;
   }
 }
 
-void
-Tracer::preModuleEventAcquire(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::preModuleEventAcquire(StreamContext const& sc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 4;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " starting: processing event acquire for module: stream = " << sc.streamID() << " label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
+  out << " starting: processing event acquire for module: stream = " << sc.streamID() << " label = '"
+      << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
 }
 
-void
-Tracer::postModuleEventAcquire(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::postModuleEventAcquire(StreamContext const& sc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 4;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " finished: processing event acquire for module: stream = " << sc.streamID() << " label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
+  out << " finished: processing event acquire for module: stream = " << sc.streamID() << " label = '"
+      << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
 }
 
-void
-Tracer::preModuleEventDelayedGet(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::preModuleEventDelayedGet(StreamContext const& sc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 4;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " starting: delayed processing event for module: stream = " << sc.streamID() << " label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " starting: delayed processing event for module: stream = " << sc.streamID() << " label = '"
+      << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << sc;
     out << mcc;
   }
 }
 
-void
-Tracer::postModuleEventDelayedGet(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::postModuleEventDelayedGet(StreamContext const& sc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 4;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " finished: delayed processing event for module: stream = " << sc.streamID() << " label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " finished: delayed processing event for module: stream = " << sc.streamID() << " label = '"
+      << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << sc;
     out << mcc;
   }
 }
 
-void
-Tracer::preEventReadFromSource(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::preEventReadFromSource(StreamContext const& sc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 5;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " starting: event delayed read from source: stream = " << sc.streamID() << " label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
+  out << " starting: event delayed read from source: stream = " << sc.streamID() << " label = '"
+      << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
 }
 
-void
-Tracer::postEventReadFromSource(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::postEventReadFromSource(StreamContext const& sc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 5;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " finished: event delayed read from source: stream = " << sc.streamID() << " label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
+  out << " finished: event delayed read from source: stream = " << sc.streamID() << " label = '"
+      << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
 }
 
-
-void
-Tracer::preModuleStreamBeginRun(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::preModuleStreamBeginRun(StreamContext const& sc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " starting: begin run for module: stream = " << sc.streamID() <<  " label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " starting: begin run for module: stream = " << sc.streamID() << " label = '"
+      << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << sc;
     out << mcc;
   }
 }
 
-void
-Tracer::postModuleStreamBeginRun(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::postModuleStreamBeginRun(StreamContext const& sc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " finished: begin run for module: stream = " << sc.streamID() <<  " label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " finished: begin run for module: stream = " << sc.streamID() << " label = '"
+      << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << sc;
     out << mcc;
   }
 }
 
-void
-Tracer::preModuleStreamEndRun(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::preModuleStreamEndRun(StreamContext const& sc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " starting: end run for module: stream = " << sc.streamID() << " label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " starting: end run for module: stream = " << sc.streamID() << " label = '"
+      << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << sc;
     out << mcc;
   }
 }
 
-void
-Tracer::postModuleStreamEndRun(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::postModuleStreamEndRun(StreamContext const& sc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " finished: end run for module: stream = " << sc.streamID() << " label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " finished: end run for module: stream = " << sc.streamID() << " label = '"
+      << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << sc;
     out << mcc;
   }
 }
 
-void
-Tracer::preModuleStreamBeginLumi(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::preModuleStreamBeginLumi(StreamContext const& sc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " starting: begin lumi for module: stream = " << sc.streamID() << " label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " starting: begin lumi for module: stream = " << sc.streamID() << " label = '"
+      << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << sc;
     out << mcc;
   }
 }
 
-void
-Tracer::postModuleStreamBeginLumi(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::postModuleStreamBeginLumi(StreamContext const& sc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " finished: begin lumi for module: stream = " << sc.streamID() << " label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " finished: begin lumi for module: stream = " << sc.streamID() << " label = '"
+      << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << sc;
     out << mcc;
   }
 }
 
-void
-Tracer::preModuleStreamEndLumi(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::preModuleStreamEndLumi(StreamContext const& sc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " starting: end lumi for module: stream = " << sc.streamID() << " label = '"<< mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " starting: end lumi for module: stream = " << sc.streamID() << " label = '"
+      << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << sc;
     out << mcc;
   }
 }
 
-void
-Tracer::postModuleStreamEndLumi(StreamContext const& sc, ModuleCallingContext const& mcc) {
+void Tracer::postModuleStreamEndLumi(StreamContext const& sc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " finished: end lumi for module: stream = " << sc.streamID() << " label = '"<< mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " finished: end lumi for module: stream = " << sc.streamID() << " label = '"
+      << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << sc;
     out << mcc;
   }
 }
 
-void
-Tracer::preModuleGlobalBeginRun(GlobalContext const& gc, ModuleCallingContext const& mcc) {
+void Tracer::preModuleGlobalBeginRun(GlobalContext const& gc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " starting: global begin run for module: label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " starting: global begin run for module: label = '" << mcc.moduleDescription()->moduleLabel()
+      << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << gc;
     out << mcc;
   }
 }
 
-void
-Tracer::postModuleGlobalBeginRun(GlobalContext const& gc, ModuleCallingContext const& mcc) {
+void Tracer::postModuleGlobalBeginRun(GlobalContext const& gc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " finished: global begin run for module: label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " finished: global begin run for module: label = '" << mcc.moduleDescription()->moduleLabel()
+      << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << gc;
     out << mcc;
   }
 }
 
-void
-Tracer::preModuleGlobalEndRun(GlobalContext const& gc, ModuleCallingContext const& mcc) {
+void Tracer::preModuleGlobalEndRun(GlobalContext const& gc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " starting: global end run for module: label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " starting: global end run for module: label = '" << mcc.moduleDescription()->moduleLabel()
+      << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << gc;
     out << mcc;
   }
 }
 
-void
-Tracer::postModuleGlobalEndRun(GlobalContext const& gc, ModuleCallingContext const& mcc) {
+void Tracer::postModuleGlobalEndRun(GlobalContext const& gc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " finished: global end run for module: label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " finished: global end run for module: label = '" << mcc.moduleDescription()->moduleLabel()
+      << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << gc;
     out << mcc;
   }
 }
 
-void
-Tracer::preModuleGlobalBeginLumi(GlobalContext const& gc, ModuleCallingContext const& mcc) {
+void Tracer::preModuleGlobalBeginLumi(GlobalContext const& gc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " starting: global begin lumi for module: label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " starting: global begin lumi for module: label = '" << mcc.moduleDescription()->moduleLabel()
+      << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << gc;
     out << mcc;
   }
 }
 
-void
-Tracer::postModuleGlobalBeginLumi(GlobalContext const& gc, ModuleCallingContext const& mcc) {
+void Tracer::postModuleGlobalBeginLumi(GlobalContext const& gc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " finished: global begin lumi for module: label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " finished: global begin lumi for module: label = '" << mcc.moduleDescription()->moduleLabel()
+      << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << gc;
     out << mcc;
   }
 }
 
-void
-Tracer::preModuleGlobalEndLumi(GlobalContext const& gc, ModuleCallingContext const& mcc) {
+void Tracer::preModuleGlobalEndLumi(GlobalContext const& gc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " starting: global end lumi for module: label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " starting: global end lumi for module: label = '" << mcc.moduleDescription()->moduleLabel()
+      << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << gc;
     out << mcc;
   }
 }
 
-void
-Tracer::postModuleGlobalEndLumi(GlobalContext const& gc, ModuleCallingContext const& mcc) {
+void Tracer::postModuleGlobalEndLumi(GlobalContext const& gc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " finished: global end lumi for module: label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " finished: global end lumi for module: label = '" << mcc.moduleDescription()->moduleLabel()
+      << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << gc;
     out << mcc;
   }
 }
 
-void
-Tracer::preModuleWriteRun(GlobalContext const& gc, ModuleCallingContext const& mcc) {
+void Tracer::preModuleWriteRun(GlobalContext const& gc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " starting: write run for module: label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " starting: write run for module: label = '" << mcc.moduleDescription()->moduleLabel()
+      << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << gc;
     out << mcc;
   }
 }
 
-void
-Tracer::postModuleWriteRun(GlobalContext const& gc, ModuleCallingContext const& mcc) {
+void Tracer::postModuleWriteRun(GlobalContext const& gc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " finished: write run for module: label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " finished: write run for module: label = '" << mcc.moduleDescription()->moduleLabel()
+      << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << gc;
     out << mcc;
   }
 }
 
-void
-Tracer::preModuleWriteLumi(GlobalContext const& gc, ModuleCallingContext const& mcc) {
+void Tracer::preModuleWriteLumi(GlobalContext const& gc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " starting: write lumi for module: label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " starting: write lumi for module: label = '" << mcc.moduleDescription()->moduleLabel()
+      << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << gc;
     out << mcc;
   }
 }
 
-void
-Tracer::postModuleWriteLumi(GlobalContext const& gc, ModuleCallingContext const& mcc) {
+void Tracer::postModuleWriteLumi(GlobalContext const& gc, ModuleCallingContext const& mcc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   unsigned int nIndents = mcc.depth() + 3;
-  for(unsigned int i = 0; i < nIndents; ++i) {
+  for (unsigned int i = 0; i < nIndents; ++i) {
     out << indention_;
   }
-  out << " finished: write lumi for module: label = '" << mcc.moduleDescription()->moduleLabel() << "' id = " << mcc.moduleDescription()->id();
-  if(dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
+  out << " finished: write lumi for module: label = '" << mcc.moduleDescription()->moduleLabel()
+      << "' id = " << mcc.moduleDescription()->id();
+  if (dumpContextForLabels_.find(mcc.moduleDescription()->moduleLabel()) != dumpContextForLabels_.end()) {
     out << "\n" << gc;
     out << mcc;
   }
 }
 
-void
-Tracer::preSourceConstruction(ModuleDescription const& desc) {
+void Tracer::preSourceConstruction(ModuleDescription const& desc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_;
   out << " starting: constructing source: " << desc.moduleName();
-  if(dumpNonModuleContext_) {
+  if (dumpNonModuleContext_) {
     out << "\n" << desc;
   }
 }
 
-void
-Tracer::postSourceConstruction(ModuleDescription const& desc) {
+void Tracer::postSourceConstruction(ModuleDescription const& desc) {
   LogAbsolute out("Tracer");
   out << TimeStamper(printTimestamps_);
   out << indention_;
   out << " finished: constructing source: " << desc.moduleName();
-  if(dumpNonModuleContext_) {
+  if (dumpNonModuleContext_) {
     out << "\n" << desc;
   }
 }
 
-void
-Tracer::preLockEventSetupGet(eventsetup::ComponentDescription const* desc,
-                             eventsetup::EventSetupRecordKey const& recordKey,
-                             eventsetup::DataKey const& dataKey) {
+void Tracer::preLockEventSetupGet(eventsetup::ComponentDescription const* desc,
+                                  eventsetup::EventSetupRecordKey const& recordKey,
+                                  eventsetup::DataKey const& dataKey) {
   LogAbsolute out("Tracer");
   out << "preLockEventSetupGet  ";
   out << desc->label_ << "  ";
@@ -1365,10 +1340,9 @@ Tracer::preLockEventSetupGet(eventsetup::ComponentDescription const* desc,
   out << dataKey.name().value();
 }
 
-void
-Tracer::postLockEventSetupGet(eventsetup::ComponentDescription const* desc,
-                              eventsetup::EventSetupRecordKey const& recordKey,
-                              eventsetup::DataKey const& dataKey) {
+void Tracer::postLockEventSetupGet(eventsetup::ComponentDescription const* desc,
+                                   eventsetup::EventSetupRecordKey const& recordKey,
+                                   eventsetup::DataKey const& dataKey) {
   LogAbsolute out("Tracer");
   out << "postLockEventSetupGet  ";
   out << desc->label_ << "  ";
@@ -1377,10 +1351,9 @@ Tracer::postLockEventSetupGet(eventsetup::ComponentDescription const* desc,
   out << dataKey.name().value();
 }
 
-void
-Tracer::postEventSetupGet(eventsetup::ComponentDescription const* desc,
-                          eventsetup::EventSetupRecordKey const& recordKey,
-                          eventsetup::DataKey const& dataKey) {
+void Tracer::postEventSetupGet(eventsetup::ComponentDescription const* desc,
+                               eventsetup::EventSetupRecordKey const& recordKey,
+                               eventsetup::DataKey const& dataKey) {
   LogAbsolute out("Tracer");
   out << "postEventSetupGet  ";
   out << desc->label_ << "  ";
diff --git a/FWCore/Services/plugins/UnixSignalService.cc b/FWCore/Services/plugins/UnixSignalService.cc
index 5bb3079437d00..41f2ad337a1c8 100644
--- a/FWCore/Services/plugins/UnixSignalService.cc
+++ b/FWCore/Services/plugins/UnixSignalService.cc
@@ -17,48 +17,48 @@
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
-
 namespace edm {
   namespace service {
     class UnixSignalService {
     public:
       explicit UnixSignalService(ParameterSet const& ps);
       ~UnixSignalService();
-      
+
       static void fillDescriptions(ConfigurationDescriptions& descriptions);
-      
+
     private:
       bool enableSigInt_;
-    }; // class UnixSignalService
-  }  // end of namespace service
-}    // end of namespace edm
+    };  // class UnixSignalService
+  }     // end of namespace service
+}  // end of namespace edm
 
 namespace edm {
 
   namespace service {
 
     UnixSignalService::UnixSignalService(ParameterSet const& pset)
-      : enableSigInt_(pset.getUntrackedParameter<bool>("EnableCtrlC")) {
+        : enableSigInt_(pset.getUntrackedParameter<bool>("EnableCtrlC")) {
       installCustomHandler(SIGUSR2, ep_sigusr2);
-      if(enableSigInt_)  installCustomHandler(SIGINT, ep_sigusr2);
+      if (enableSigInt_)
+        installCustomHandler(SIGINT, ep_sigusr2);
     }
 
     UnixSignalService::~UnixSignalService() {}
 
     void UnixSignalService::fillDescriptions(ConfigurationDescriptions& descriptions) {
       ParameterSetDescription desc;
-      desc.addUntracked<bool>("EnableCtrlC", true)->setComment(
-        "If 'true', you can stop a cmsRun job gracefully by sending it a '<control> c' keyboard interrupt (i.e. SIGINT).");
+      desc.addUntracked<bool>("EnableCtrlC", true)
+          ->setComment(
+              "If 'true', you can stop a cmsRun job gracefully by sending it a '<control> c' keyboard interrupt (i.e. "
+              "SIGINT).");
       descriptions.add("UnixSignalService", desc);
       descriptions.setComment(
-        "This service sets up unix signal handlers for the unix signal SIGUSR2 and optionally SIGINT"
-        " so that when cmsRun is sent a signal the application will stop processing and shut down gracefully.");
+          "This service sets up unix signal handlers for the unix signal SIGUSR2 and optionally SIGINT"
+          " so that when cmsRun is sent a signal the application will stop processing and shut down gracefully.");
     }
-  } // end of namespace service
-} // end of namespace edm
+  }  // end of namespace service
+}  // end of namespace edm
 
 using edm::service::UnixSignalService;
 typedef edm::serviceregistry::ParameterSetMaker<UnixSignalService> UnixSignalMaker;
 DEFINE_FWK_SERVICE_MAKER(UnixSignalService, UnixSignalMaker);
-
-
diff --git a/FWCore/Services/plugins/ZombieKillerService.cc b/FWCore/Services/plugins/ZombieKillerService.cc
index cfc0eb49c2dd8..e3a20fb3ddbf2 100644
--- a/FWCore/Services/plugins/ZombieKillerService.cc
+++ b/FWCore/Services/plugins/ZombieKillerService.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Services
 // Class  :     ZombieKillerService
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -23,12 +23,11 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/ServiceMaker.h"
 
-
 namespace edm {
   class ZombieKillerService {
   public:
     ZombieKillerService(edm::ParameterSet const&, edm::ActivityRegistry&);
-    
+
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
 
   private:
@@ -40,22 +39,17 @@ namespace edm {
     bool m_jobDone;
     std::atomic<bool> m_stillAlive;
     std::atomic<unsigned int> m_numberChecksWhenNotAlive;
-    
-    
+
     void notAZombieYet();
     void checkForZombie();
     void startThread();
     void stopThread();
   };
-}
+}  // namespace edm
 
 using namespace edm;
 
-inline
-bool isProcessWideService(ZombieKillerService const*) {
-  return true;
-}
-
+inline bool isProcessWideService(ZombieKillerService const*) { return true; }
 
 //
 // constants, enums and typedefs
@@ -68,61 +62,68 @@ bool isProcessWideService(ZombieKillerService const*) {
 //
 // constructors and destructor
 //
-ZombieKillerService::ZombieKillerService(edm::ParameterSet const& iPSet, edm::ActivityRegistry& iRegistry):
-m_checkThreshold(iPSet.getUntrackedParameter<unsigned int>("numberOfAllowedFailedChecksInARow")),
-m_secsBetweenChecks(iPSet.getUntrackedParameter<unsigned int>("secondsBetweenChecks")),
-m_jobDone(false),
-m_stillAlive(true),
-m_numberChecksWhenNotAlive(0)
-{
-  iRegistry.watchPostBeginJob([this](){ startThread(); } );
-  iRegistry.watchPostEndJob([this]() {stopThread(); } );
-  
-  iRegistry.watchPreSourceRun([this](RunIndex){notAZombieYet();});
-  iRegistry.watchPostSourceRun([this](RunIndex){notAZombieYet();});
-  
-  iRegistry.watchPreSourceLumi([this](LuminosityBlockIndex){notAZombieYet();});
-  iRegistry.watchPostSourceLumi([this](LuminosityBlockIndex){notAZombieYet();});
-
-  iRegistry.watchPreSourceEvent([this](StreamID){notAZombieYet();});
-  iRegistry.watchPostSourceEvent([this](StreamID){notAZombieYet();});
-  
-  iRegistry.watchPreModuleBeginStream([this](StreamContext const&, ModuleCallingContext const&){notAZombieYet();});
-  iRegistry.watchPostModuleBeginStream([this](StreamContext const&, ModuleCallingContext const&){notAZombieYet();});
-
-  iRegistry.watchPreModuleEndStream([this](StreamContext const&, ModuleCallingContext const&){notAZombieYet();});
-  iRegistry.watchPostModuleEndStream([this](StreamContext const&, ModuleCallingContext const&){notAZombieYet();});
-  
-  iRegistry.watchPreModuleEndJob([this](ModuleDescription const&) {notAZombieYet();});
-  iRegistry.watchPostModuleEndJob([this](ModuleDescription const&) {notAZombieYet();});
-  iRegistry.watchPreModuleEvent([this](StreamContext const&, ModuleCallingContext const&){notAZombieYet();});
-  iRegistry.watchPostModuleEvent([this](StreamContext const&, ModuleCallingContext const&){notAZombieYet();});
-
-  iRegistry.watchPreModuleStreamBeginRun([this](StreamContext const&, ModuleCallingContext const&){notAZombieYet();});
-  iRegistry.watchPostModuleStreamBeginRun([this](StreamContext const&, ModuleCallingContext const&){notAZombieYet();});
-
-  iRegistry.watchPreModuleStreamEndRun([this](StreamContext const&, ModuleCallingContext const&){notAZombieYet();});
-  iRegistry.watchPostModuleStreamEndRun([this](StreamContext const&, ModuleCallingContext const&){notAZombieYet();});
-
-  iRegistry.watchPreModuleStreamBeginLumi([this](StreamContext const&, ModuleCallingContext const&){notAZombieYet();});
-  iRegistry.watchPostModuleStreamBeginLumi([this](StreamContext const&, ModuleCallingContext const&){notAZombieYet();});
-  
-  iRegistry.watchPreModuleStreamEndLumi([this](StreamContext const&, ModuleCallingContext const&){notAZombieYet();});
-  iRegistry.watchPostModuleStreamEndLumi([this](StreamContext const&, ModuleCallingContext const&){notAZombieYet();});
-
-  iRegistry.watchPreModuleGlobalBeginRun([this](GlobalContext const&, ModuleCallingContext const&){notAZombieYet();});
-  iRegistry.watchPostModuleGlobalBeginRun([this](GlobalContext const&, ModuleCallingContext const&){notAZombieYet();});
-  
-  iRegistry.watchPreModuleGlobalEndRun([this](GlobalContext const&, ModuleCallingContext const&){notAZombieYet();});
-  iRegistry.watchPostModuleGlobalEndRun([this](GlobalContext const&, ModuleCallingContext const&){notAZombieYet();});
-  
-  iRegistry.watchPreModuleGlobalBeginLumi([this](GlobalContext const&, ModuleCallingContext const&){notAZombieYet();});
-  iRegistry.watchPostModuleGlobalBeginLumi([this](GlobalContext const&, ModuleCallingContext const&){notAZombieYet();});
-  
-  iRegistry.watchPreModuleGlobalEndLumi([this](GlobalContext const&, ModuleCallingContext const&){notAZombieYet();});
-  iRegistry.watchPostModuleGlobalEndLumi([this](GlobalContext const&, ModuleCallingContext const&){notAZombieYet();});
-
-  
+ZombieKillerService::ZombieKillerService(edm::ParameterSet const& iPSet, edm::ActivityRegistry& iRegistry)
+    : m_checkThreshold(iPSet.getUntrackedParameter<unsigned int>("numberOfAllowedFailedChecksInARow")),
+      m_secsBetweenChecks(iPSet.getUntrackedParameter<unsigned int>("secondsBetweenChecks")),
+      m_jobDone(false),
+      m_stillAlive(true),
+      m_numberChecksWhenNotAlive(0) {
+  iRegistry.watchPostBeginJob([this]() { startThread(); });
+  iRegistry.watchPostEndJob([this]() { stopThread(); });
+
+  iRegistry.watchPreSourceRun([this](RunIndex) { notAZombieYet(); });
+  iRegistry.watchPostSourceRun([this](RunIndex) { notAZombieYet(); });
+
+  iRegistry.watchPreSourceLumi([this](LuminosityBlockIndex) { notAZombieYet(); });
+  iRegistry.watchPostSourceLumi([this](LuminosityBlockIndex) { notAZombieYet(); });
+
+  iRegistry.watchPreSourceEvent([this](StreamID) { notAZombieYet(); });
+  iRegistry.watchPostSourceEvent([this](StreamID) { notAZombieYet(); });
+
+  iRegistry.watchPreModuleBeginStream([this](StreamContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+  iRegistry.watchPostModuleBeginStream([this](StreamContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+
+  iRegistry.watchPreModuleEndStream([this](StreamContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+  iRegistry.watchPostModuleEndStream([this](StreamContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+
+  iRegistry.watchPreModuleEndJob([this](ModuleDescription const&) { notAZombieYet(); });
+  iRegistry.watchPostModuleEndJob([this](ModuleDescription const&) { notAZombieYet(); });
+  iRegistry.watchPreModuleEvent([this](StreamContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+  iRegistry.watchPostModuleEvent([this](StreamContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+
+  iRegistry.watchPreModuleStreamBeginRun(
+      [this](StreamContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+  iRegistry.watchPostModuleStreamBeginRun(
+      [this](StreamContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+
+  iRegistry.watchPreModuleStreamEndRun([this](StreamContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+  iRegistry.watchPostModuleStreamEndRun([this](StreamContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+
+  iRegistry.watchPreModuleStreamBeginLumi(
+      [this](StreamContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+  iRegistry.watchPostModuleStreamBeginLumi(
+      [this](StreamContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+
+  iRegistry.watchPreModuleStreamEndLumi([this](StreamContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+  iRegistry.watchPostModuleStreamEndLumi(
+      [this](StreamContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+
+  iRegistry.watchPreModuleGlobalBeginRun(
+      [this](GlobalContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+  iRegistry.watchPostModuleGlobalBeginRun(
+      [this](GlobalContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+
+  iRegistry.watchPreModuleGlobalEndRun([this](GlobalContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+  iRegistry.watchPostModuleGlobalEndRun([this](GlobalContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+
+  iRegistry.watchPreModuleGlobalBeginLumi(
+      [this](GlobalContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+  iRegistry.watchPostModuleGlobalBeginLumi(
+      [this](GlobalContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+
+  iRegistry.watchPreModuleGlobalEndLumi([this](GlobalContext const&, ModuleCallingContext const&) { notAZombieYet(); });
+  iRegistry.watchPostModuleGlobalEndLumi(
+      [this](GlobalContext const&, ModuleCallingContext const&) { notAZombieYet(); });
 }
 
 // ZombieKillerService::ZombieKillerService(const ZombieKillerService& rhs)
@@ -149,59 +150,51 @@ m_numberChecksWhenNotAlive(0)
 //
 // member functions
 //
-void
-ZombieKillerService::notAZombieYet() {
+void ZombieKillerService::notAZombieYet() {
   m_numberChecksWhenNotAlive = 0;
   m_stillAlive = true;
 }
 
-void
-ZombieKillerService::checkForZombie() {
+void ZombieKillerService::checkForZombie() {
   if (not m_stillAlive) {
     ++m_numberChecksWhenNotAlive;
-    if(m_numberChecksWhenNotAlive > m_checkThreshold) {
-      edm::LogError("JobStuck")<<"Too long since the job has last made progress.";
+    if (m_numberChecksWhenNotAlive > m_checkThreshold) {
+      edm::LogError("JobStuck") << "Too long since the job has last made progress.";
       std::terminate();
     } else {
-      edm::LogWarning("JobProgressing")<<"It has been "<<m_numberChecksWhenNotAlive*m_secsBetweenChecks<<" seconds since job seen progressing";
+      edm::LogWarning("JobProgressing") << "It has been " << m_numberChecksWhenNotAlive * m_secsBetweenChecks
+                                        << " seconds since job seen progressing";
     }
   }
   m_stillAlive = false;
 }
 
-void
-ZombieKillerService::startThread() {
+void ZombieKillerService::startThread() {
   m_watchingThread = std::thread([this]() {
-
     std::unique_lock<std::mutex> lock(m_jobDoneMutex);
-    while(not m_jobDoneCondition.wait_for(lock,
-                                          std::chrono::seconds(m_secsBetweenChecks),
-                                          [this]()->bool
-                                          {
-                                            return m_jobDone;
-                                          }))
-    {
+    while (not m_jobDoneCondition.wait_for(
+        lock, std::chrono::seconds(m_secsBetweenChecks), [this]() -> bool { return m_jobDone; })) {
       //we timed out
       checkForZombie();
     }
   });
 }
 
-void
-ZombieKillerService::stopThread() {
+void ZombieKillerService::stopThread() {
   {
     std::lock_guard<std::mutex> guard(m_jobDoneMutex);
-    m_jobDone=true;
+    m_jobDone = true;
   }
   m_jobDoneCondition.notify_all();
   m_watchingThread.join();
 }
 
-void
-ZombieKillerService::fillDescriptions(ConfigurationDescriptions& descriptions) {
+void ZombieKillerService::fillDescriptions(ConfigurationDescriptions& descriptions) {
   ParameterSetDescription desc;
-  desc.addUntracked<unsigned int>("secondsBetweenChecks", 60)->setComment("Number of seconds to wait between checking if progress has been made.");
-  desc.addUntracked<unsigned int>("numberOfAllowedFailedChecksInARow", 3)->setComment("Number of allowed checks in a row with no progress.");
+  desc.addUntracked<unsigned int>("secondsBetweenChecks", 60)
+      ->setComment("Number of seconds to wait between checking if progress has been made.");
+  desc.addUntracked<unsigned int>("numberOfAllowedFailedChecksInARow", 3)
+      ->setComment("Number of allowed checks in a row with no progress.");
   descriptions.add("ZombieKillerService", desc);
 }
 
diff --git a/FWCore/Services/src/JobReportService.cc b/FWCore/Services/src/JobReportService.cc
index 6708e7c2cb1be..c3a5a06760156 100644
--- a/FWCore/Services/src/JobReportService.cc
+++ b/FWCore/Services/src/JobReportService.cc
@@ -17,9 +17,7 @@ namespace edm {
 
     JobReportService::~JobReportService() {}
 
-    JobReportService::JobReportService(ParameterSet const&, ActivityRegistry& reg) :
-      JobReport() {
-
+    JobReportService::JobReportService(ParameterSet const&, ActivityRegistry& reg) : JobReport() {
       reg.watchPostEndJob(this, &JobReportService::postEndJob);
       reg.watchJobFailure(this, &JobReportService::frameworkShutdownOnFailure);
 
@@ -28,8 +26,7 @@ namespace edm {
       // did the reading knows this.
     }
 
-    void
-    JobReportService::postEndJob() {
+    void JobReportService::postEndJob() {
       // This will be called at end-of-job (obviously).
       // Dump information to the MessageLogger's JobSummary.
 
@@ -39,14 +36,13 @@ namespace edm {
       // postEndJob() and frameworkShutdownOnFailure(), so that common
       // elements are reported through common code.
 
-        //
-       // Any files that are still open should be flushed to the report
+      //
+      // Any files that are still open should be flushed to the report
       //
       impl()->flushFiles();
     }
 
-    void
-    JobReportService::frameworkShutdownOnFailure() {
+    void JobReportService::frameworkShutdownOnFailure() {
       // Dump information to the MessageLogger's JobSummary
       // about the files that aren't already closed,
       // and whatever summary information is wanted.
@@ -57,11 +53,10 @@ namespace edm {
       impl()->flushFiles();
     }
 
-    void
-    JobReportService::fillDescriptions(ConfigurationDescriptions& descriptions) {
+    void JobReportService::fillDescriptions(ConfigurationDescriptions& descriptions) {
       ParameterSetDescription desc;
       desc.setComment("Enables job reports.");
       descriptions.addDefault(desc);
     }
-  } // namespace service
-} //namspace edm
+  }  // namespace service
+}  // namespace edm
diff --git a/FWCore/Services/src/JobReportService.h b/FWCore/Services/src/JobReportService.h
index ed47d3da9d0fd..557ae4137999b 100644
--- a/FWCore/Services/src/JobReportService.h
+++ b/FWCore/Services/src/JobReportService.h
@@ -4,7 +4,7 @@
 //
 // Package:     Services
 // Class  :     JobReport
-// 
+//
 /**\class JobReportService JobReportService.h FWCore/Services/src/JobReportService.h
 
 Description: A service that collections job handling information.
@@ -40,13 +40,10 @@ namespace edm {
 
       void frameworkShutdownOnFailure();
 
-      static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
+      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
     };
 
-    inline
-    bool isProcessWideService(JobReportService const*) {
-      return true;
-    }
-  }
-}
+    inline bool isProcessWideService(JobReportService const*) { return true; }
+  }  // namespace service
+}  // namespace edm
 #endif
diff --git a/FWCore/Services/src/SiteLocalConfigService.cc b/FWCore/Services/src/SiteLocalConfigService.cc
index f9a66335efac5..ef54f71cde5a0 100644
--- a/FWCore/Services/src/SiteLocalConfigService.cc
+++ b/FWCore/Services/src/SiteLocalConfigService.cc
@@ -27,57 +27,54 @@ using namespace cms::xerces;
 //<<<<<< MEMBER FUNCTION DEFINITIONS                                    >>>>>>
 
 namespace {
-  
+
   // concatenate all the XML node attribute/value pairs into a
   // paren-separated string (for use by CORAL and frontier_client)
-  inline std::string _toParenString(DOMNode const& nodeToConvert) {
-      std::ostringstream oss;
+  inline std::string _toParenString(DOMNode const &nodeToConvert) {
+    std::ostringstream oss;
 
-      DOMNodeList *childList = nodeToConvert.getChildNodes();
+    DOMNodeList *childList = nodeToConvert.getChildNodes();
 
-      XMLSize_t numNodes = childList->getLength();
-      for (XMLSize_t i = 0; i < numNodes; ++i) {
-        DOMNode *childNode = childList->item(i);
-        if (childNode->getNodeType() != DOMNode::ELEMENT_NODE) {
-            continue;
+    XMLSize_t numNodes = childList->getLength();
+    for (XMLSize_t i = 0; i < numNodes; ++i) {
+      DOMNode *childNode = childList->item(i);
+      if (childNode->getNodeType() != DOMNode::ELEMENT_NODE) {
+        continue;
+      }
+      DOMElement *child = static_cast<DOMElement *>(childNode);
+
+      DOMNamedNodeMap *attributes = child->getAttributes();
+      XMLSize_t numAttributes = attributes->getLength();
+      for (XMLSize_t j = 0; j < numAttributes; ++j) {
+        DOMNode *attributeNode = attributes->item(j);
+        if (attributeNode->getNodeType() != DOMNode::ATTRIBUTE_NODE) {
+          continue;
         }
-        DOMElement *child = static_cast<DOMElement *>(childNode);
-
-        DOMNamedNodeMap *attributes = child->getAttributes();
-        XMLSize_t numAttributes = attributes->getLength();
-        for (XMLSize_t j = 0; j < numAttributes; ++j) {
-            DOMNode *attributeNode = attributes->item(j);
-            if (attributeNode->getNodeType() != DOMNode::ATTRIBUTE_NODE) {
-              continue;
-            }
-            DOMAttr *attribute = static_cast<DOMAttr *>(attributeNode);
+        DOMAttr *attribute = static_cast<DOMAttr *>(attributeNode);
 
-            oss << "(" << toString(child->getTagName()) <<
-                          toString(attribute->getName()) << "=" <<
-                          toString(attribute->getValue()) << ")";
-        }
+        oss << "(" << toString(child->getTagName()) << toString(attribute->getName()) << "="
+            << toString(attribute->getValue()) << ")";
       }
-      return oss.str();
+    }
+    return oss.str();
   }
 
-  template<typename T>
-  static
-  void overrideFromPSet(char const* iName, edm::ParameterSet const& iPSet,
-                        T& iHolder, T const*& iPointer) {
-     if(iPSet.exists(iName)) {
-        iHolder = iPSet.getUntrackedParameter<T>(iName);
-        iPointer = &iHolder;
-     }
+  template <typename T>
+  static void overrideFromPSet(char const *iName, edm::ParameterSet const &iPSet, T &iHolder, T const *&iPointer) {
+    if (iPSet.exists(iName)) {
+      iHolder = iPSet.getUntrackedParameter<T>(iName);
+      iPointer = &iHolder;
+    }
   }
-}
+}  // namespace
 
 namespace edm {
   namespace service {
 
     const std::string SiteLocalConfigService::m_statisticsDefaultPort = "3334";
 
-    SiteLocalConfigService::SiteLocalConfigService(ParameterSet const& pset) :
-          m_url("/SITECONF/local/JobConfig/site-local-config.xml"),
+    SiteLocalConfigService::SiteLocalConfigService(ParameterSet const &pset)
+        : m_url("/SITECONF/local/JobConfig/site-local-config.xml"),
           m_dataCatalog(),
           m_fallbackDataCatalog(),
           m_frontierConnect(),
@@ -105,41 +102,42 @@ namespace edm {
           m_statisticsDestination(),
           m_statisticsAddrInfo(nullptr),
           m_statisticsInfoAvail(false),
-          m_siteName()
-    {
-        char* tmp = getenv("CMS_PATH");
+          m_siteName() {
+      char *tmp = getenv("CMS_PATH");
 
-        if (tmp) {
-          m_url = tmp + m_url;
-        }
+      if (tmp) {
+        m_url = tmp + m_url;
+      }
 
-        this->parse(m_url);
-
-        //apply overrides
-        overrideFromPSet("overrideSourceCacheTempDir", pset, m_cacheTempDir, m_cacheTempDirPtr);
-        overrideFromPSet("overrideSourceCacheMinFree", pset, m_cacheMinFree, m_cacheMinFreePtr);
-        overrideFromPSet("overrideSourceCacheHintDir", pset, m_cacheHint, m_cacheHintPtr);
-        overrideFromPSet("overrideSourceCloneCacheHintDir", pset, m_cloneCacheHint, m_cloneCacheHintPtr);
-        overrideFromPSet("overrideSourceReadHint", pset, m_readHint, m_readHintPtr);
-        overrideFromPSet("overrideSourceNativeProtocols", pset, m_nativeProtocols, m_nativeProtocolsPtr);
-        overrideFromPSet("overrideSourceTTreeCacheSize", pset, m_ttreeCacheSize, m_ttreeCacheSizePtr);
-        overrideFromPSet("overrideSourceTimeout", pset, m_timeout, m_timeoutPtr);
-        overrideFromPSet("overridePrefetching", pset, m_enablePrefetching, m_enablePrefetchingPtr);
-        const std::string * tmpStringPtr = nullptr;
-        overrideFromPSet("overrideStatisticsDestination", pset, m_statisticsDestination, tmpStringPtr);
-        this->computeStatisticsDestination();
-        std::vector<std::string> tmpStatisticsInfo; std::vector<std::string> const *tmpStatisticsInfoPtr = nullptr;
-        overrideFromPSet("overrideStatisticsInfo", pset, tmpStatisticsInfo, tmpStatisticsInfoPtr);
-        if (tmpStatisticsInfoPtr) {
-          m_statisticsInfoAvail = true;
-          m_statisticsInfo.clear();
-          for (auto &entry : tmpStatisticsInfo) {m_statisticsInfo.insert(std::move(entry));}
+      this->parse(m_url);
+
+      //apply overrides
+      overrideFromPSet("overrideSourceCacheTempDir", pset, m_cacheTempDir, m_cacheTempDirPtr);
+      overrideFromPSet("overrideSourceCacheMinFree", pset, m_cacheMinFree, m_cacheMinFreePtr);
+      overrideFromPSet("overrideSourceCacheHintDir", pset, m_cacheHint, m_cacheHintPtr);
+      overrideFromPSet("overrideSourceCloneCacheHintDir", pset, m_cloneCacheHint, m_cloneCacheHintPtr);
+      overrideFromPSet("overrideSourceReadHint", pset, m_readHint, m_readHintPtr);
+      overrideFromPSet("overrideSourceNativeProtocols", pset, m_nativeProtocols, m_nativeProtocolsPtr);
+      overrideFromPSet("overrideSourceTTreeCacheSize", pset, m_ttreeCacheSize, m_ttreeCacheSizePtr);
+      overrideFromPSet("overrideSourceTimeout", pset, m_timeout, m_timeoutPtr);
+      overrideFromPSet("overridePrefetching", pset, m_enablePrefetching, m_enablePrefetchingPtr);
+      const std::string *tmpStringPtr = nullptr;
+      overrideFromPSet("overrideStatisticsDestination", pset, m_statisticsDestination, tmpStringPtr);
+      this->computeStatisticsDestination();
+      std::vector<std::string> tmpStatisticsInfo;
+      std::vector<std::string> const *tmpStatisticsInfoPtr = nullptr;
+      overrideFromPSet("overrideStatisticsInfo", pset, tmpStatisticsInfo, tmpStatisticsInfoPtr);
+      if (tmpStatisticsInfoPtr) {
+        m_statisticsInfoAvail = true;
+        m_statisticsInfo.clear();
+        for (auto &entry : tmpStatisticsInfo) {
+          m_statisticsInfo.insert(std::move(entry));
         }
+      }
 
-       if(pset.exists("debugLevel")) {
-            m_debugLevel = pset.getUntrackedParameter<unsigned int>("debugLevel");
-       }
-
+      if (pset.exists("debugLevel")) {
+        m_debugLevel = pset.getUntrackedParameter<unsigned int>("debugLevel");
+      }
     }
 
     SiteLocalConfigService::~SiteLocalConfigService() {
@@ -149,386 +147,343 @@ namespace edm {
       }
     }
 
-    std::string const
-    SiteLocalConfigService::dataCatalog(void) const {
-        if (!m_connected) {
-            //throw cms::Exception("Incomplete configuration")
-            //    << "Valid site-local-config not found at " << m_url;
-            // Return PoolFileCatalog.xml for now
-            return "file:PoolFileCatalog.xml";
-        }
+    std::string const SiteLocalConfigService::dataCatalog(void) const {
+      if (!m_connected) {
+        //throw cms::Exception("Incomplete configuration")
+        //    << "Valid site-local-config not found at " << m_url;
+        // Return PoolFileCatalog.xml for now
+        return "file:PoolFileCatalog.xml";
+      }
 
-        if (m_dataCatalog == "") {
-          throw cms::Exception("Incomplete configuration")
-            << "Did not find catalog in event-data section in " << m_url;
-        }
+      if (m_dataCatalog.empty()) {
+        throw cms::Exception("Incomplete configuration") << "Did not find catalog in event-data section in " << m_url;
+      }
 
-        return m_dataCatalog;
+      return m_dataCatalog;
     }
 
-    std::string const
-    SiteLocalConfigService::fallbackDataCatalog(void) const {
-        if (!m_connected) {
-            //throw cms::Exception("Incomplete configuration")
-            //    << "Valid site-local-config not found at " << m_url;
-            // Return PoolFileCatalog.xml for now
-            return "file:PoolFileCatalog.xml";
-        }
+    std::string const SiteLocalConfigService::fallbackDataCatalog(void) const {
+      if (!m_connected) {
+        //throw cms::Exception("Incomplete configuration")
+        //    << "Valid site-local-config not found at " << m_url;
+        // Return PoolFileCatalog.xml for now
+        return "file:PoolFileCatalog.xml";
+      }
 
-        // Note: Unlike the dataCatalog, the fallbackDataCatalog may be empty!
-        return  m_fallbackDataCatalog;
+      // Note: Unlike the dataCatalog, the fallbackDataCatalog may be empty!
+      return m_fallbackDataCatalog;
     }
 
-    std::string const
-    SiteLocalConfigService::frontierConnect(std::string const& servlet) const {
-        if (!m_connected) {
-          throw cms::Exception("Incomplete configuration")
-            << "Valid site-local-config not found at " << m_url;
-        }
+    std::string const SiteLocalConfigService::frontierConnect(std::string const &servlet) const {
+      if (!m_connected) {
+        throw cms::Exception("Incomplete configuration") << "Valid site-local-config not found at " << m_url;
+      }
 
-        if (m_frontierConnect == "") {
-          throw cms::Exception("Incomplete configuration")
+      if (m_frontierConnect.empty()) {
+        throw cms::Exception("Incomplete configuration")
             << "Did not find frontier-connect in calib-data section in " << m_url;
-        }
+      }
 
-        if (servlet == "") {
-          return m_frontierConnect;
-        }
+      if (servlet.empty()) {
+        return m_frontierConnect;
+      }
 
-        // Replace the last component of every "serverurl=" piece (up to the
-        //   next close-paren) with the servlet
-        std::string::size_type nextparen = 0;
-        std::string::size_type serverurl, lastslash;
-        std::string complexstr = "";
-        while ((serverurl = m_frontierConnect.find("(serverurl=", nextparen)) != std::string::npos) {
-          complexstr.append(m_frontierConnect, nextparen, serverurl - nextparen);
-          nextparen = m_frontierConnect.find(')', serverurl);
-          lastslash = m_frontierConnect.rfind('/', nextparen);
-          complexstr.append(m_frontierConnect, serverurl, lastslash - serverurl + 1);
-          complexstr.append(servlet);
-        }
-        complexstr.append(m_frontierConnect, nextparen, m_frontierConnect.length()-nextparen);
+      // Replace the last component of every "serverurl=" piece (up to the
+      //   next close-paren) with the servlet
+      std::string::size_type nextparen = 0;
+      std::string::size_type serverurl, lastslash;
+      std::string complexstr = "";
+      while ((serverurl = m_frontierConnect.find("(serverurl=", nextparen)) != std::string::npos) {
+        complexstr.append(m_frontierConnect, nextparen, serverurl - nextparen);
+        nextparen = m_frontierConnect.find(')', serverurl);
+        lastslash = m_frontierConnect.rfind('/', nextparen);
+        complexstr.append(m_frontierConnect, serverurl, lastslash - serverurl + 1);
+        complexstr.append(servlet);
+      }
+      complexstr.append(m_frontierConnect, nextparen, m_frontierConnect.length() - nextparen);
 
-        return complexstr;
+      return complexstr;
     }
 
-    std::string const
-    SiteLocalConfigService::lookupCalibConnect(std::string const& input) const {
-        static std::string const proto = "frontier://";
-
-        if (input.substr(0,proto.length()) == proto) {
-          // Replace the part after the frontier:// and before either an open-
-          //  parentheses (which indicates user-supplied options) or the last
-          //  slash (which indicates start of the schema) with the complex
-          //  parenthesized string returned from frontierConnect() (which
-          //  contains all the information needed to connect to frontier),
-          //  if that part is a simple servlet name (non-empty and not
-          //  containing special characters)
-          // Example connect strings where servlet is replaced:
-          //  frontier://cms_conditions_data/CMS_COND_ECAL
-          //  frontier://FrontierInt/CMS_COND_ECAL
-          //  frontier://FrontierInt(retrieve-ziplevel=0)/CMS_COND_ECAL
-          // Example connect strings left untouched:
-          //  frontier://cmsfrontier.cern.ch:8000/FrontierInt/CMS_COND_ECAL
-          //  frontier://(serverurl=cmsfrontier.cern.ch:8000/FrontierInt)/CMS_COND_ECAL
-          std::string::size_type startservlet = proto.length();
-          // if user supplied extra parenthesized options, stop servlet there
-          std::string::size_type endservlet = input.find("(", startservlet);
-          if (endservlet == std::string::npos) {
-              endservlet = input.rfind('/', input.length());
-          }
-          std::string servlet = input.substr(startservlet, endservlet - startservlet);
-          if ((servlet != "") && (servlet.find_first_of(":/)[]") == std::string::npos)) {
-              if (servlet == "cms_conditions_data") {
-                // use the default servlet from site-local-config.xml
-                servlet = "";
-              }
-              return proto + frontierConnect(servlet) + input.substr(endservlet);
+    std::string const SiteLocalConfigService::lookupCalibConnect(std::string const &input) const {
+      static std::string const proto = "frontier://";
+
+      if (input.substr(0, proto.length()) == proto) {
+        // Replace the part after the frontier:// and before either an open-
+        //  parentheses (which indicates user-supplied options) or the last
+        //  slash (which indicates start of the schema) with the complex
+        //  parenthesized string returned from frontierConnect() (which
+        //  contains all the information needed to connect to frontier),
+        //  if that part is a simple servlet name (non-empty and not
+        //  containing special characters)
+        // Example connect strings where servlet is replaced:
+        //  frontier://cms_conditions_data/CMS_COND_ECAL
+        //  frontier://FrontierInt/CMS_COND_ECAL
+        //  frontier://FrontierInt(retrieve-ziplevel=0)/CMS_COND_ECAL
+        // Example connect strings left untouched:
+        //  frontier://cmsfrontier.cern.ch:8000/FrontierInt/CMS_COND_ECAL
+        //  frontier://(serverurl=cmsfrontier.cern.ch:8000/FrontierInt)/CMS_COND_ECAL
+        std::string::size_type startservlet = proto.length();
+        // if user supplied extra parenthesized options, stop servlet there
+        std::string::size_type endservlet = input.find("(", startservlet);
+        if (endservlet == std::string::npos) {
+          endservlet = input.rfind('/', input.length());
+        }
+        std::string servlet = input.substr(startservlet, endservlet - startservlet);
+        if ((!servlet.empty()) && (servlet.find_first_of(":/)[]") == std::string::npos)) {
+          if (servlet == "cms_conditions_data") {
+            // use the default servlet from site-local-config.xml
+            servlet = "";
           }
+          return proto + frontierConnect(servlet) + input.substr(endservlet);
         }
-        return input;
+      }
+      return input;
     }
 
-    std::string const
-    SiteLocalConfigService::rfioType(void) const {
-        return m_rfioType;
-    }
+    std::string const SiteLocalConfigService::rfioType(void) const { return m_rfioType; }
 
-    std::string const*
-    SiteLocalConfigService::sourceCacheTempDir() const {
-       return m_cacheTempDirPtr;
-    }
+    std::string const *SiteLocalConfigService::sourceCacheTempDir() const { return m_cacheTempDirPtr; }
 
-    double const*
-    SiteLocalConfigService::sourceCacheMinFree() const {
-       return m_cacheMinFreePtr;
-    }
+    double const *SiteLocalConfigService::sourceCacheMinFree() const { return m_cacheMinFreePtr; }
 
-    std::string const*
-    SiteLocalConfigService::sourceCacheHint() const {
-       return m_cacheHintPtr;
-    }
+    std::string const *SiteLocalConfigService::sourceCacheHint() const { return m_cacheHintPtr; }
 
-    std::string const*
-    SiteLocalConfigService::sourceCloneCacheHint() const {
-       return m_cloneCacheHintPtr;
-    }
+    std::string const *SiteLocalConfigService::sourceCloneCacheHint() const { return m_cloneCacheHintPtr; }
 
-    std::string const*
-    SiteLocalConfigService::sourceReadHint() const {
-       return m_readHintPtr;
-    }
+    std::string const *SiteLocalConfigService::sourceReadHint() const { return m_readHintPtr; }
 
-    unsigned int const*
-    SiteLocalConfigService::sourceTTreeCacheSize() const {
-       return m_ttreeCacheSizePtr;
-    }
+    unsigned int const *SiteLocalConfigService::sourceTTreeCacheSize() const { return m_ttreeCacheSizePtr; }
 
-    unsigned int const*
-    SiteLocalConfigService::sourceTimeout() const {
-       return m_timeoutPtr;
-    }
+    unsigned int const *SiteLocalConfigService::sourceTimeout() const { return m_timeoutPtr; }
 
-    bool
-    SiteLocalConfigService::enablePrefetching() const {
-       return m_enablePrefetchingPtr ? *m_enablePrefetchingPtr : false;
+    bool SiteLocalConfigService::enablePrefetching() const {
+      return m_enablePrefetchingPtr ? *m_enablePrefetchingPtr : false;
     }
 
-    unsigned int
-    SiteLocalConfigService::debugLevel() const {
-       return m_debugLevel;
-    }
+    unsigned int SiteLocalConfigService::debugLevel() const { return m_debugLevel; }
 
-    std::vector<std::string> const*
-    SiteLocalConfigService::sourceNativeProtocols() const {
-       return m_nativeProtocolsPtr;
+    std::vector<std::string> const *SiteLocalConfigService::sourceNativeProtocols() const {
+      return m_nativeProtocolsPtr;
     }
 
-    struct addrinfo const*
-    SiteLocalConfigService::statisticsDestination() const {
-       return m_statisticsAddrInfo;
+    struct addrinfo const *SiteLocalConfigService::statisticsDestination() const {
+      return m_statisticsAddrInfo;
     }
 
-    std::set<std::string> const*
-    SiteLocalConfigService::statisticsInfo() const {
-       return m_statisticsInfoAvail ? &m_statisticsInfo : nullptr;
+    std::set<std::string> const *SiteLocalConfigService::statisticsInfo() const {
+      return m_statisticsInfoAvail ? &m_statisticsInfo : nullptr;
     }
 
-    std::string const&
-    SiteLocalConfigService::siteName() const {
-       return m_siteName;
-    }
+    std::string const &SiteLocalConfigService::siteName() const { return m_siteName; }
 
-    void
-    SiteLocalConfigService::parse(std::string const& url) {
+    void SiteLocalConfigService::parse(std::string const &url) {
       cms::concurrency::xercesInitialize();
       {
-	auto parser = std::make_unique<XercesDOMParser>();
-	try {
-	  parser->setValidationScheme(XercesDOMParser::Val_Auto);
-	  parser->setDoNamespaces(false);
-
-	  parser->parse(url.c_str());
-	  DOMDocument* doc = parser->getDocument();
-	  if (!doc) {
-	    return;
-	  }
-
-	  // The Site Config has the following format
-	  // <site-local-config>
-	  // <site name="FNAL">
-	  //   <event-data>
-	  //     <catalog url="trivialcatalog_file:/x/y/z.xml"/>
-	  //     <rfiotype value="castor"/>
-	  //   </event-data>
-	  //   <calib-data>
-	  //     <catalog url="trivialcatalog_file:/x/y/z.xml"/>
-	  //     <frontier-connect>
-	  //       ... frontier-interpreted server/proxy xml ...
-	  //     </frontier-connect>
-	  //   </calib-data>
-	  //   <source-config>
-	  //     <cache-temp-dir name="/a/b/c"/>
-            //     <cache-hint value="..."/>
-            //     <read-hint value="..."/>
-            //     <ttree-cache-size value="0"/>
-            //     <native-protocols>
-            //        <protocol  prefix="dcache"/>
-            //        <protocol prefix="file"/>
-            //     </native-protocols>
-            //   </source-config>
-	  // </site>
-	  // </site-local-config>
-	  
-	  // FIXME: should probably use the parser for validating the XML.
-
-	  DOMNodeList *sites = doc->getElementsByTagName(uStr("site").ptr());
-	  XMLSize_t numSites = sites->getLength();
-	  for (XMLSize_t i = 0; i < numSites; ++i) {
-	    DOMElement *site = static_cast<DOMElement *>(sites->item(i));
-	    
-	    // Parse the site name
-	    m_siteName = toString(site->getAttribute(uStr("name").ptr()));
-	    
-	    // Parsing of the event data section
-	    {
-	      DOMNodeList *eventDataList = site->getElementsByTagName(uStr("event-data").ptr());
-	      if (eventDataList->getLength() > 0) {
-		DOMElement *eventData = static_cast<DOMElement *>(eventDataList->item(0));
-		
-		DOMNodeList *catalogs = eventData->getElementsByTagName(uStr("catalog").ptr());
-		
-		if (catalogs->getLength() > 0) {
-		  DOMElement * catalog = static_cast<DOMElement *>(catalogs->item(0));
-		  m_dataCatalog = toString(catalog->getAttribute(uStr("url").ptr()));
-		}
-		
-		if (catalogs->getLength() > 1) {
-		  DOMElement * catalog = static_cast<DOMElement *>(catalogs->item(1));
-		  m_fallbackDataCatalog = toString(catalog->getAttribute(uStr("url").ptr()));
-		}
-		
-		DOMNodeList* rfiotypes = eventData->getElementsByTagName(uStr("rfiotype").ptr());
-		
-		if (rfiotypes->getLength() > 0) {
-		  DOMElement* rfiotype = static_cast<DOMElement *>(rfiotypes->item(0));
-		  m_rfioType = toString(rfiotype->getAttribute(uStr("value").ptr()));
-		}
-	      }
-	    }
-	    
-	    // Parsing of the calib-data section
-	    {
-	      DOMNodeList *calibDataList = site->getElementsByTagName(uStr("calib-data").ptr());
-	      
-	      if (calibDataList->getLength() > 0) {
-		DOMElement *calibData = static_cast<DOMElement *>(calibDataList->item(0));
-		DOMNodeList *frontierConnectList = calibData->getElementsByTagName(uStr("frontier-connect").ptr());
-		
-		if (frontierConnectList->getLength() > 0) {
-		  DOMElement *frontierConnect = static_cast<DOMElement *>(frontierConnectList->item(0));
-		  m_frontierConnect = _toParenString(*frontierConnect);
-		}
-	      }
-	    }
-	    // Parsing of the source config section
-	    {
-	      DOMNodeList *sourceConfigList = site->getElementsByTagName(uStr("source-config").ptr());
-	      
-	      if (sourceConfigList->getLength() > 0) {
-		DOMElement *sourceConfig = static_cast<DOMElement *>(sourceConfigList->item(0));
-		DOMNodeList *cacheTempDirList = sourceConfig->getElementsByTagName(uStr("cache-temp-dir").ptr());
-		
-		if (cacheTempDirList->getLength() > 0) {
-		  DOMElement *cacheTempDir = static_cast<DOMElement *>(cacheTempDirList->item(0));
-		  m_cacheTempDir = toString(cacheTempDir->getAttribute(uStr("name").ptr()));
-		  m_cacheTempDirPtr = &m_cacheTempDir;
-		}
-		
-		DOMNodeList *cacheMinFreeList = sourceConfig->getElementsByTagName(uStr("cache-min-free").ptr());
-		
-		if (cacheMinFreeList->getLength() > 0) {
-		  DOMElement *cacheMinFree = static_cast<DOMElement *>(cacheMinFreeList->item(0));
-		  m_cacheMinFree = toDouble(cacheMinFree->getAttribute(uStr("value").ptr()));
-		  m_cacheMinFreePtr = &m_cacheMinFree;
-		}
-		
-		DOMNodeList *cacheHintList = sourceConfig->getElementsByTagName(uStr("cache-hint").ptr());
-		
-		if (cacheHintList->getLength() > 0) {
-		  DOMElement *cacheHint = static_cast<DOMElement *>(cacheHintList->item(0));
-		  m_cacheHint = toString(cacheHint->getAttribute(uStr("value").ptr()));
-		  m_cacheHintPtr = &m_cacheHint;
-		}
-		
-		DOMNodeList *cloneCacheHintList = sourceConfig->getElementsByTagName(uStr("clone-cache-hint").ptr());
-		
-		if (cloneCacheHintList->getLength() > 0) {
-		  DOMElement *cloneCacheHint = static_cast<DOMElement *>(cloneCacheHintList->item(0));
-		  m_cloneCacheHint = toString(cloneCacheHint->getAttribute(uStr("value").ptr()));
-		  m_cloneCacheHintPtr = &m_cloneCacheHint;
-		}
-		
-		DOMNodeList *readHintList = sourceConfig->getElementsByTagName(uStr("read-hint").ptr());
-		
-		if (readHintList->getLength() > 0) {
-		  DOMElement *readHint = static_cast<DOMElement *>(readHintList->item(0));
-		  m_readHint = toString(readHint->getAttribute(uStr("value").ptr()));
-		  m_readHintPtr = &m_readHint;
-		}
-		
-		DOMNodeList *ttreeCacheSizeList = sourceConfig->getElementsByTagName(uStr("ttree-cache-size").ptr());
-		
-		if (ttreeCacheSizeList->getLength() > 0) {
-		  DOMElement *ttreeCacheSize = static_cast<DOMElement *>(ttreeCacheSizeList->item(0));
-		  m_ttreeCacheSize = toUInt(ttreeCacheSize->getAttribute(uStr("value").ptr()));
-		  m_ttreeCacheSizePtr = &m_ttreeCacheSize;
-		}
-		
-		DOMNodeList *timeoutList = sourceConfig->getElementsByTagName(uStr("timeout-in-seconds").ptr());
-		
-		if (timeoutList->getLength() > 0) {
-		  DOMElement *timeout = static_cast<DOMElement *>(timeoutList->item(0));
-		  m_timeout = toUInt(timeout->getAttribute(uStr("value").ptr()));
-		  m_timeoutPtr = &m_timeout;
-		}
-		
-		DOMNodeList *statsDestList = sourceConfig->getElementsByTagName(uStr("statistics-destination").ptr());
-		
-		if (statsDestList->getLength() > 0) {
-		  DOMElement *statsDest = static_cast<DOMElement *>(statsDestList->item(0));
-		  m_statisticsDestination = toString(statsDest->getAttribute(uStr("endpoint").ptr()));
-		  if (m_statisticsDestination.empty()) {
-		    m_statisticsDestination = toString(statsDest->getAttribute(uStr("name").ptr()));
-		  }
-		  std::string tmpStatisticsInfo = toString(statsDest->getAttribute(uStr("info").ptr()));
-		  boost::split(m_statisticsInfo, tmpStatisticsInfo, boost::is_any_of("\t ,"));
-		  m_statisticsInfoAvail = !tmpStatisticsInfo.empty();
-		}
-		
-		DOMNodeList *prefetchingList = sourceConfig->getElementsByTagName(uStr("prefetching").ptr());
-		
-		if (prefetchingList->getLength() > 0) {
-		  DOMElement *prefetching = static_cast<DOMElement *>(prefetchingList->item(0));
-		  m_enablePrefetching = toBool(prefetching->getAttribute(uStr("value").ptr()));
-		  m_enablePrefetchingPtr = &m_enablePrefetching;
-		}
-		
-		DOMNodeList *nativeProtocolsList = sourceConfig->getElementsByTagName(uStr("native-protocols").ptr());
-		
-		if (nativeProtocolsList->getLength() > 0) {
-		  DOMElement *nativeProtocol = static_cast<DOMElement *>(nativeProtocolsList->item(0));
-		  DOMNodeList *childList = nativeProtocol->getChildNodes();
-		  
-		  XMLSize_t numNodes = childList->getLength();
-		  for (XMLSize_t i = 0; i < numNodes; ++i) {
-		    DOMNode *childNode = childList->item(i);
-		    if (childNode->getNodeType() != DOMNode::ELEMENT_NODE) {
-		      continue;
-		    }
-		    DOMElement *child = static_cast<DOMElement *>(childNode);
-		    m_nativeProtocols.push_back(toString(child->getAttribute(uStr("prefix").ptr())));
-		  }
-		  m_nativeProtocolsPtr = &m_nativeProtocols;
-		}
-	      }
-	    }
-	  }
-	  m_connected = true;
-	}
-	catch (xercesc::DOMException const& e) {
-	}
-      } // The extra pair of braces ensures that
-        // all implicit destructors are called
-        // *before* terminating Xerces-C++.
+        auto parser = std::make_unique<XercesDOMParser>();
+        try {
+          parser->setValidationScheme(XercesDOMParser::Val_Auto);
+          parser->setDoNamespaces(false);
+
+          parser->parse(url.c_str());
+          DOMDocument *doc = parser->getDocument();
+          if (!doc) {
+            return;
+          }
+
+          // The Site Config has the following format
+          // <site-local-config>
+          // <site name="FNAL">
+          //   <event-data>
+          //     <catalog url="trivialcatalog_file:/x/y/z.xml"/>
+          //     <rfiotype value="castor"/>
+          //   </event-data>
+          //   <calib-data>
+          //     <catalog url="trivialcatalog_file:/x/y/z.xml"/>
+          //     <frontier-connect>
+          //       ... frontier-interpreted server/proxy xml ...
+          //     </frontier-connect>
+          //   </calib-data>
+          //   <source-config>
+          //     <cache-temp-dir name="/a/b/c"/>
+          //     <cache-hint value="..."/>
+          //     <read-hint value="..."/>
+          //     <ttree-cache-size value="0"/>
+          //     <native-protocols>
+          //        <protocol  prefix="dcache"/>
+          //        <protocol prefix="file"/>
+          //     </native-protocols>
+          //   </source-config>
+          // </site>
+          // </site-local-config>
+
+          // FIXME: should probably use the parser for validating the XML.
+
+          DOMNodeList *sites = doc->getElementsByTagName(uStr("site").ptr());
+          XMLSize_t numSites = sites->getLength();
+          for (XMLSize_t i = 0; i < numSites; ++i) {
+            DOMElement *site = static_cast<DOMElement *>(sites->item(i));
+
+            // Parse the site name
+            m_siteName = toString(site->getAttribute(uStr("name").ptr()));
+
+            // Parsing of the event data section
+            {
+              DOMNodeList *eventDataList = site->getElementsByTagName(uStr("event-data").ptr());
+              if (eventDataList->getLength() > 0) {
+                DOMElement *eventData = static_cast<DOMElement *>(eventDataList->item(0));
+
+                DOMNodeList *catalogs = eventData->getElementsByTagName(uStr("catalog").ptr());
+
+                if (catalogs->getLength() > 0) {
+                  DOMElement *catalog = static_cast<DOMElement *>(catalogs->item(0));
+                  m_dataCatalog = toString(catalog->getAttribute(uStr("url").ptr()));
+                }
+
+                if (catalogs->getLength() > 1) {
+                  DOMElement *catalog = static_cast<DOMElement *>(catalogs->item(1));
+                  m_fallbackDataCatalog = toString(catalog->getAttribute(uStr("url").ptr()));
+                }
+
+                DOMNodeList *rfiotypes = eventData->getElementsByTagName(uStr("rfiotype").ptr());
+
+                if (rfiotypes->getLength() > 0) {
+                  DOMElement *rfiotype = static_cast<DOMElement *>(rfiotypes->item(0));
+                  m_rfioType = toString(rfiotype->getAttribute(uStr("value").ptr()));
+                }
+              }
+            }
+
+            // Parsing of the calib-data section
+            {
+              DOMNodeList *calibDataList = site->getElementsByTagName(uStr("calib-data").ptr());
+
+              if (calibDataList->getLength() > 0) {
+                DOMElement *calibData = static_cast<DOMElement *>(calibDataList->item(0));
+                DOMNodeList *frontierConnectList = calibData->getElementsByTagName(uStr("frontier-connect").ptr());
+
+                if (frontierConnectList->getLength() > 0) {
+                  DOMElement *frontierConnect = static_cast<DOMElement *>(frontierConnectList->item(0));
+                  m_frontierConnect = _toParenString(*frontierConnect);
+                }
+              }
+            }
+            // Parsing of the source config section
+            {
+              DOMNodeList *sourceConfigList = site->getElementsByTagName(uStr("source-config").ptr());
+
+              if (sourceConfigList->getLength() > 0) {
+                DOMElement *sourceConfig = static_cast<DOMElement *>(sourceConfigList->item(0));
+                DOMNodeList *cacheTempDirList = sourceConfig->getElementsByTagName(uStr("cache-temp-dir").ptr());
+
+                if (cacheTempDirList->getLength() > 0) {
+                  DOMElement *cacheTempDir = static_cast<DOMElement *>(cacheTempDirList->item(0));
+                  m_cacheTempDir = toString(cacheTempDir->getAttribute(uStr("name").ptr()));
+                  m_cacheTempDirPtr = &m_cacheTempDir;
+                }
+
+                DOMNodeList *cacheMinFreeList = sourceConfig->getElementsByTagName(uStr("cache-min-free").ptr());
+
+                if (cacheMinFreeList->getLength() > 0) {
+                  DOMElement *cacheMinFree = static_cast<DOMElement *>(cacheMinFreeList->item(0));
+                  m_cacheMinFree = toDouble(cacheMinFree->getAttribute(uStr("value").ptr()));
+                  m_cacheMinFreePtr = &m_cacheMinFree;
+                }
+
+                DOMNodeList *cacheHintList = sourceConfig->getElementsByTagName(uStr("cache-hint").ptr());
+
+                if (cacheHintList->getLength() > 0) {
+                  DOMElement *cacheHint = static_cast<DOMElement *>(cacheHintList->item(0));
+                  m_cacheHint = toString(cacheHint->getAttribute(uStr("value").ptr()));
+                  m_cacheHintPtr = &m_cacheHint;
+                }
+
+                DOMNodeList *cloneCacheHintList = sourceConfig->getElementsByTagName(uStr("clone-cache-hint").ptr());
+
+                if (cloneCacheHintList->getLength() > 0) {
+                  DOMElement *cloneCacheHint = static_cast<DOMElement *>(cloneCacheHintList->item(0));
+                  m_cloneCacheHint = toString(cloneCacheHint->getAttribute(uStr("value").ptr()));
+                  m_cloneCacheHintPtr = &m_cloneCacheHint;
+                }
+
+                DOMNodeList *readHintList = sourceConfig->getElementsByTagName(uStr("read-hint").ptr());
+
+                if (readHintList->getLength() > 0) {
+                  DOMElement *readHint = static_cast<DOMElement *>(readHintList->item(0));
+                  m_readHint = toString(readHint->getAttribute(uStr("value").ptr()));
+                  m_readHintPtr = &m_readHint;
+                }
+
+                DOMNodeList *ttreeCacheSizeList = sourceConfig->getElementsByTagName(uStr("ttree-cache-size").ptr());
+
+                if (ttreeCacheSizeList->getLength() > 0) {
+                  DOMElement *ttreeCacheSize = static_cast<DOMElement *>(ttreeCacheSizeList->item(0));
+                  m_ttreeCacheSize = toUInt(ttreeCacheSize->getAttribute(uStr("value").ptr()));
+                  m_ttreeCacheSizePtr = &m_ttreeCacheSize;
+                }
+
+                DOMNodeList *timeoutList = sourceConfig->getElementsByTagName(uStr("timeout-in-seconds").ptr());
+
+                if (timeoutList->getLength() > 0) {
+                  DOMElement *timeout = static_cast<DOMElement *>(timeoutList->item(0));
+                  m_timeout = toUInt(timeout->getAttribute(uStr("value").ptr()));
+                  m_timeoutPtr = &m_timeout;
+                }
+
+                DOMNodeList *statsDestList = sourceConfig->getElementsByTagName(uStr("statistics-destination").ptr());
+
+                if (statsDestList->getLength() > 0) {
+                  DOMElement *statsDest = static_cast<DOMElement *>(statsDestList->item(0));
+                  m_statisticsDestination = toString(statsDest->getAttribute(uStr("endpoint").ptr()));
+                  if (m_statisticsDestination.empty()) {
+                    m_statisticsDestination = toString(statsDest->getAttribute(uStr("name").ptr()));
+                  }
+                  std::string tmpStatisticsInfo = toString(statsDest->getAttribute(uStr("info").ptr()));
+                  boost::split(m_statisticsInfo, tmpStatisticsInfo, boost::is_any_of("\t ,"));
+                  m_statisticsInfoAvail = !tmpStatisticsInfo.empty();
+                }
+
+                DOMNodeList *prefetchingList = sourceConfig->getElementsByTagName(uStr("prefetching").ptr());
+
+                if (prefetchingList->getLength() > 0) {
+                  DOMElement *prefetching = static_cast<DOMElement *>(prefetchingList->item(0));
+                  m_enablePrefetching = toBool(prefetching->getAttribute(uStr("value").ptr()));
+                  m_enablePrefetchingPtr = &m_enablePrefetching;
+                }
+
+                DOMNodeList *nativeProtocolsList = sourceConfig->getElementsByTagName(uStr("native-protocols").ptr());
+
+                if (nativeProtocolsList->getLength() > 0) {
+                  DOMElement *nativeProtocol = static_cast<DOMElement *>(nativeProtocolsList->item(0));
+                  DOMNodeList *childList = nativeProtocol->getChildNodes();
+
+                  XMLSize_t numNodes = childList->getLength();
+                  for (XMLSize_t i = 0; i < numNodes; ++i) {
+                    DOMNode *childNode = childList->item(i);
+                    if (childNode->getNodeType() != DOMNode::ELEMENT_NODE) {
+                      continue;
+                    }
+                    DOMElement *child = static_cast<DOMElement *>(childNode);
+                    m_nativeProtocols.push_back(toString(child->getAttribute(uStr("prefix").ptr())));
+                  }
+                  m_nativeProtocolsPtr = &m_nativeProtocols;
+                }
+              }
+            }
+          }
+          m_connected = true;
+        } catch (xercesc::DOMException const &e) {
+        }
+      }  // The extra pair of braces ensures that
+      // all implicit destructors are called
+      // *before* terminating Xerces-C++.
       cms::concurrency::xercesTerminate();
     }
 
-    void
-    SiteLocalConfigService::computeStatisticsDestination() {
+    void SiteLocalConfigService::computeStatisticsDestination() {
       std::vector<std::string> inputStrings;
       boost::split(inputStrings, m_statisticsDestination, boost::is_any_of(":"));
-      const std::string &host=inputStrings[0];
+      const std::string &host = inputStrings[0];
       const std::string &port = (inputStrings.size() > 1) ? inputStrings[1] : m_statisticsDefaultPort;
       struct addrinfo *res;
       struct addrinfo hints;
@@ -544,8 +499,7 @@ namespace edm {
       m_statisticsAddrInfo = res;
     }
 
-    void
-    SiteLocalConfigService::fillDescriptions(ConfigurationDescriptions& descriptions) {
+    void SiteLocalConfigService::fillDescriptions(ConfigurationDescriptions &descriptions) {
       ParameterSetDescription desc;
       desc.setComment("Service to translate logical file names to physical file names.");
 
@@ -553,20 +507,23 @@ namespace edm {
       desc.addOptionalUntracked<double>("overrideSourceCacheMinFree");
       desc.addOptionalUntracked<std::string>("overrideSourceCacheHintDir");
       desc.addOptionalUntracked<std::string>("overrideSourceCloneCacheHintDir")
-        ->setComment("Provide an alternate cache hint for fast cloning.");
+          ->setComment("Provide an alternate cache hint for fast cloning.");
       desc.addOptionalUntracked<std::string>("overrideSourceReadHint");
       desc.addOptionalUntracked<std::vector<std::string> >("overrideSourceNativeProtocols");
       desc.addOptionalUntracked<unsigned int>("overrideSourceTTreeCacheSize");
       desc.addOptionalUntracked<unsigned int>("overrideSourceTimeout");
       desc.addOptionalUntracked<unsigned int>("debugLevel");
       desc.addOptionalUntracked<bool>("overridePrefetching")
-        ->setComment("Request ROOT to asynchronously prefetch I/O during computation.");
+          ->setComment("Request ROOT to asynchronously prefetch I/O during computation.");
       desc.addOptionalUntracked<std::string>("overrideStatisticsDestination")
-        ->setComment("Provide an alternate network destination for I/O statistics (must be in the form of host:port).");
+          ->setComment(
+              "Provide an alternate network destination for I/O statistics (must be in the form of host:port).");
       desc.addOptionalUntracked<std::vector<std::string> >("overrideStatisticsInfo")
-        ->setComment("Provide an alternate listing of statistics to send (comma separated list; current options are 'dn' or 'nodn').  If left blank, all information is snet (including DNs).");
+          ->setComment(
+              "Provide an alternate listing of statistics to send (comma separated list; current options are 'dn' or "
+              "'nodn').  If left blank, all information is snet (including DNs).");
 
       descriptions.add("SiteLocalConfigService", desc);
     }
-  }
-}
+  }  // namespace service
+}  // namespace edm
diff --git a/FWCore/Services/src/SiteLocalConfigService.h b/FWCore/Services/src/SiteLocalConfigService.h
index e0a84097d40e6..3f9aa7113edcd 100644
--- a/FWCore/Services/src/SiteLocalConfigService.h
+++ b/FWCore/Services/src/SiteLocalConfigService.h
@@ -11,7 +11,7 @@
 //<<<<<< PUBLIC CONSTANTS                                               >>>>>>
 //<<<<<< PUBLIC TYPES                                                   >>>>>>
 namespace edm {
-    class ParameterSet;
+  class ParameterSet;
 }
 
 //<<<<<< PUBLIC VARIABLES                                               >>>>>>
@@ -19,82 +19,79 @@ namespace edm {
 //<<<<<< CLASS DECLARATIONS                                             >>>>>>
 
 namespace edm {
-    class ConfigurationDescriptions;
-    namespace service {
-      class SiteLocalConfigService : public SiteLocalConfig {
-        public:
-            explicit SiteLocalConfigService(ParameterSet const& pset);
+  class ConfigurationDescriptions;
+  namespace service {
+    class SiteLocalConfigService : public SiteLocalConfig {
+    public:
+      explicit SiteLocalConfigService(ParameterSet const& pset);
 
-            std::string const dataCatalog(void) const override;
-            std::string const fallbackDataCatalog(void) const override;
-            std::string const lookupCalibConnect(std::string const& input) const override;
-            std::string const rfioType(void) const override;
+      std::string const dataCatalog(void) const override;
+      std::string const fallbackDataCatalog(void) const override;
+      std::string const lookupCalibConnect(std::string const& input) const override;
+      std::string const rfioType(void) const override;
 
-            std::string const* sourceCacheTempDir() const override;
-            double const* sourceCacheMinFree() const override;
-            std::string const* sourceCacheHint() const override;
-            std::string const* sourceCloneCacheHint() const override;
-            std::string const* sourceReadHint() const override;
-            unsigned int const* sourceTTreeCacheSize() const override;
-            unsigned int const* sourceTimeout() const override;
-            bool                enablePrefetching() const override;
-            unsigned int        debugLevel() const override;
-            std::vector<std::string> const* sourceNativeProtocols() const override;
-            struct addrinfo const* statisticsDestination() const override;
-            std::set<std::string> const* statisticsInfo() const override;
-            std::string const&  siteName() const override;
+      std::string const* sourceCacheTempDir() const override;
+      double const* sourceCacheMinFree() const override;
+      std::string const* sourceCacheHint() const override;
+      std::string const* sourceCloneCacheHint() const override;
+      std::string const* sourceReadHint() const override;
+      unsigned int const* sourceTTreeCacheSize() const override;
+      unsigned int const* sourceTimeout() const override;
+      bool enablePrefetching() const override;
+      unsigned int debugLevel() const override;
+      std::vector<std::string> const* sourceNativeProtocols() const override;
+      struct addrinfo const* statisticsDestination() const override;
+      std::set<std::string> const* statisticsInfo() const override;
+      std::string const& siteName() const override;
 
-            // implicit copy constructor
-            // implicit assignment operator
-            ~SiteLocalConfigService() override;
+      // implicit copy constructor
+      // implicit assignment operator
+      ~SiteLocalConfigService() override;
 
-            static void fillDescriptions(ConfigurationDescriptions& descriptions);
+      static void fillDescriptions(ConfigurationDescriptions& descriptions);
 
-        private:
-            void parse (std::string const& url);
-            void computeStatisticsDestination();
-            std::string const frontierConnect(std::string const& servlet) const;
-            std::string         m_url;
-            std::string         m_dataCatalog;
-            std::string         m_fallbackDataCatalog;
-            std::string         m_frontierConnect;
-            std::string         m_rfioType;
-            bool                m_connected;
-            std::string         m_cacheTempDir;
-            std::string const*  m_cacheTempDirPtr;
-            double              m_cacheMinFree;
-            double const*       m_cacheMinFreePtr;
-            std::string         m_cacheHint;
-            std::string const*  m_cacheHintPtr;
-            std::string         m_cloneCacheHint;
-            std::string const*  m_cloneCacheHintPtr;
-            std::string         m_readHint;
-            std::string const*  m_readHintPtr;
-            unsigned int        m_ttreeCacheSize;
-            unsigned int const* m_ttreeCacheSizePtr;
-            unsigned int        m_timeout;
-            unsigned int const* m_timeoutPtr;
-            unsigned int        m_debugLevel;
-            bool                m_enablePrefetching;
-            bool const        * m_enablePrefetchingPtr;
-            std::vector<std::string> m_nativeProtocols;
-            std::vector<std::string> const* m_nativeProtocolsPtr;
-            std::string         m_statisticsDestination;
-            edm::propagate_const<struct addrinfo*> m_statisticsAddrInfo;
-            static const std::string m_statisticsDefaultPort;
-            std::set<std::string> m_statisticsInfo;
-            bool m_statisticsInfoAvail;
-            std::string         m_siteName;
-         };
+    private:
+      void parse(std::string const& url);
+      void computeStatisticsDestination();
+      std::string const frontierConnect(std::string const& servlet) const;
+      std::string m_url;
+      std::string m_dataCatalog;
+      std::string m_fallbackDataCatalog;
+      std::string m_frontierConnect;
+      std::string m_rfioType;
+      bool m_connected;
+      std::string m_cacheTempDir;
+      std::string const* m_cacheTempDirPtr;
+      double m_cacheMinFree;
+      double const* m_cacheMinFreePtr;
+      std::string m_cacheHint;
+      std::string const* m_cacheHintPtr;
+      std::string m_cloneCacheHint;
+      std::string const* m_cloneCacheHintPtr;
+      std::string m_readHint;
+      std::string const* m_readHintPtr;
+      unsigned int m_ttreeCacheSize;
+      unsigned int const* m_ttreeCacheSizePtr;
+      unsigned int m_timeout;
+      unsigned int const* m_timeoutPtr;
+      unsigned int m_debugLevel;
+      bool m_enablePrefetching;
+      bool const* m_enablePrefetchingPtr;
+      std::vector<std::string> m_nativeProtocols;
+      std::vector<std::string> const* m_nativeProtocolsPtr;
+      std::string m_statisticsDestination;
+      edm::propagate_const<struct addrinfo*> m_statisticsAddrInfo;
+      static const std::string m_statisticsDefaultPort;
+      std::set<std::string> m_statisticsInfo;
+      bool m_statisticsInfoAvail;
+      std::string m_siteName;
+    };
 
-         inline
-         bool isProcessWideService(SiteLocalConfigService const*) {
-           return true;
-         }
-    }
-}
+    inline bool isProcessWideService(SiteLocalConfigService const*) { return true; }
+  }  // namespace service
+}  // namespace edm
 
 //<<<<<< INLINE PUBLIC FUNCTIONS                                        >>>>>>
 //<<<<<< INLINE MEMBER FUNCTIONS                                        >>>>>>
 
-#endif // FRAMEWORK_SITE_LOCAL_CONFIG_H
+#endif  // FRAMEWORK_SITE_LOCAL_CONFIG_H
diff --git a/FWCore/Services/test/SiteLocalConfigServiceTester.cc b/FWCore/Services/test/SiteLocalConfigServiceTester.cc
index bdc29d0538a4c..4f3c4e5f8c577 100644
--- a/FWCore/Services/test/SiteLocalConfigServiceTester.cc
+++ b/FWCore/Services/test/SiteLocalConfigServiceTester.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Services
 // Class  :     SiteLocalConfigServiceTester
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -20,21 +20,21 @@
 // user include files
 
 namespace edmtest {
-   class SiteLocalConfigServiceTester : public edm::EDAnalyzer {
-   public:
-      SiteLocalConfigServiceTester(const edm::ParameterSet& iPSet);
-      
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      
-   private:
-      std::string m_cacheHint;
-      std::string m_readHint;
-      std::string m_tempDir;
-      unsigned int m_ttreeCacheSize;
-      std::vector<std::string> m_nativeProtocols;
-      bool m_valuesSet;
-   };
-}
+  class SiteLocalConfigServiceTester : public edm::EDAnalyzer {
+  public:
+    SiteLocalConfigServiceTester(const edm::ParameterSet& iPSet);
+
+    void analyze(const edm::Event&, const edm::EventSetup&) override;
+
+  private:
+    std::string m_cacheHint;
+    std::string m_readHint;
+    std::string m_tempDir;
+    unsigned int m_ttreeCacheSize;
+    std::vector<std::string> m_nativeProtocols;
+    bool m_valuesSet;
+  };
+}  // namespace edmtest
 
 using namespace edmtest;
 
@@ -49,15 +49,13 @@ using namespace edmtest;
 //
 // constructors and destructor
 //
-SiteLocalConfigServiceTester::SiteLocalConfigServiceTester(const edm::ParameterSet& iPSet):
-m_cacheHint(iPSet.getUntrackedParameter<std::string>("sourceCacheHint")),
-m_readHint(iPSet.getUntrackedParameter<std::string>("sourceReadHint")),
-m_tempDir(iPSet.getUntrackedParameter<std::string>("sourceTempDir")),
-m_ttreeCacheSize(iPSet.getUntrackedParameter<unsigned int>("sourceTTreeCacheSize")),
-m_nativeProtocols(iPSet.getUntrackedParameter<std::vector<std::string> >("sourceNativeProtocols")),
-m_valuesSet(iPSet.getUntrackedParameter<bool>("sourceValuesSet",true))
-{
-}
+SiteLocalConfigServiceTester::SiteLocalConfigServiceTester(const edm::ParameterSet& iPSet)
+    : m_cacheHint(iPSet.getUntrackedParameter<std::string>("sourceCacheHint")),
+      m_readHint(iPSet.getUntrackedParameter<std::string>("sourceReadHint")),
+      m_tempDir(iPSet.getUntrackedParameter<std::string>("sourceTempDir")),
+      m_ttreeCacheSize(iPSet.getUntrackedParameter<unsigned int>("sourceTTreeCacheSize")),
+      m_nativeProtocols(iPSet.getUntrackedParameter<std::vector<std::string> >("sourceNativeProtocols")),
+      m_valuesSet(iPSet.getUntrackedParameter<bool>("sourceValuesSet", true)) {}
 
 // SiteLocalConfigServiceTester::SiteLocalConfigServiceTester(const SiteLocalConfigServiceTester& rhs)
 // {
@@ -84,70 +82,72 @@ m_valuesSet(iPSet.getUntrackedParameter<bool>("sourceValuesSet",true))
 // member functions
 //
 static void throwNotSet(const char* iName) {
-   throw cms::Exception("TestFailure")<<"The value "<<iName<<" should have been set but was not";
+  throw cms::Exception("TestFailure") << "The value " << iName << " should have been set but was not";
 }
 
 template <typename T>
-static 
-void throwWrongValue(const char* iName, const T& iExpected, const T& iRetrieved) {
-   throw cms::Exception("TestFailure")<<"The value "<<iName <<" should have been "<<iExpected<<" but instead was "<<iRetrieved;
+static void throwWrongValue(const char* iName, const T& iExpected, const T& iRetrieved) {
+  throw cms::Exception("TestFailure") << "The value " << iName << " should have been " << iExpected
+                                      << " but instead was " << iRetrieved;
 }
 
 namespace {
-   template <typename T>
-   void testValue(const char* iName, const T& iExpected, const T* iRetrieved) {
-      if(nullptr==iRetrieved) {
-         throwNotSet(iName);
-      } else if (*iRetrieved != iExpected) {
-         throwWrongValue(iName, iExpected, *iRetrieved);
-      }
-   }
-
-   template <typename T>
-   void checkNotSet(const char* iName, const T* iRetrieved) {
-      if(nullptr!=iRetrieved) {
-         throw cms::Exception("TestFailure")<<"The value "<<iName<<" should not have been set but was set to "<<*iRetrieved;
-      }
-   }
-
-   void checkNotSet(const char* iName, const std::vector<std::string>* iRetrieved) {
-      if(nullptr!=iRetrieved) {
-         throw cms::Exception("TestFailure")<<"The value "<<iName<<" should not have been set but was set";
-      }
-   }
-   
-}
+  template <typename T>
+  void testValue(const char* iName, const T& iExpected, const T* iRetrieved) {
+    if (nullptr == iRetrieved) {
+      throwNotSet(iName);
+    } else if (*iRetrieved != iExpected) {
+      throwWrongValue(iName, iExpected, *iRetrieved);
+    }
+  }
+
+  template <typename T>
+  void checkNotSet(const char* iName, const T* iRetrieved) {
+    if (nullptr != iRetrieved) {
+      throw cms::Exception("TestFailure")
+          << "The value " << iName << " should not have been set but was set to " << *iRetrieved;
+    }
+  }
+
+  void checkNotSet(const char* iName, const std::vector<std::string>* iRetrieved) {
+    if (nullptr != iRetrieved) {
+      throw cms::Exception("TestFailure") << "The value " << iName << " should not have been set but was set";
+    }
+  }
+
+}  // namespace
 //
 // const member functions
 //
-void SiteLocalConfigServiceTester::analyze(const edm::Event&, const edm::EventSetup&)
-{
-   edm::Service<edm::SiteLocalConfig> pConfig;
-   if(m_valuesSet) {
-      testValue("sourceCacheTempDir",m_tempDir,pConfig->sourceCacheTempDir());
-      testValue("sourceCacheHint",m_cacheHint,pConfig->sourceCacheHint());
-      testValue("sourceReadHint",m_readHint,pConfig->sourceReadHint());
-      testValue("sourceTTreeCacheSize",m_ttreeCacheSize,pConfig->sourceTTreeCacheSize());
-      const std::vector<std::string>* protocols = pConfig->sourceNativeProtocols();
-      if(nullptr==protocols) {
-         throwNotSet("sourceNativeProtocols");
-      }
-      if (protocols->size() != m_nativeProtocols.size()) {
-         throw cms::Exception("TestFailure")<<"The value sourceNativeProtocols has size "
-         <<protocols->size()<<" but should have had size "<<m_nativeProtocols.size();
-      }
-      for (std::vector<std::string>::const_iterator it = protocols->begin(), itEnd = protocols->end(), 
-           itExpect = m_nativeProtocols.begin(); it != itEnd; ++it, ++itExpect) {
-         testValue("sourceNativeProtocols",*itExpect,&(*it));
-      }
-   } else {
-      checkNotSet("sourceCacheTempDir",pConfig->sourceCacheTempDir());
-      checkNotSet("sourceCacheHint",pConfig->sourceCacheHint());
-      checkNotSet("sourceReadHint",pConfig->sourceReadHint());
-      checkNotSet("sourceTTreeCacheSize",pConfig->sourceTTreeCacheSize());
-      checkNotSet("sourceNativeProtocols",pConfig->sourceNativeProtocols());
-   }
-   
+void SiteLocalConfigServiceTester::analyze(const edm::Event&, const edm::EventSetup&) {
+  edm::Service<edm::SiteLocalConfig> pConfig;
+  if (m_valuesSet) {
+    testValue("sourceCacheTempDir", m_tempDir, pConfig->sourceCacheTempDir());
+    testValue("sourceCacheHint", m_cacheHint, pConfig->sourceCacheHint());
+    testValue("sourceReadHint", m_readHint, pConfig->sourceReadHint());
+    testValue("sourceTTreeCacheSize", m_ttreeCacheSize, pConfig->sourceTTreeCacheSize());
+    const std::vector<std::string>* protocols = pConfig->sourceNativeProtocols();
+    if (nullptr == protocols) {
+      throwNotSet("sourceNativeProtocols");
+    }
+    if (protocols->size() != m_nativeProtocols.size()) {
+      throw cms::Exception("TestFailure") << "The value sourceNativeProtocols has size " << protocols->size()
+                                          << " but should have had size " << m_nativeProtocols.size();
+    }
+    for (std::vector<std::string>::const_iterator it = protocols->begin(),
+                                                  itEnd = protocols->end(),
+                                                  itExpect = m_nativeProtocols.begin();
+         it != itEnd;
+         ++it, ++itExpect) {
+      testValue("sourceNativeProtocols", *itExpect, &(*it));
+    }
+  } else {
+    checkNotSet("sourceCacheTempDir", pConfig->sourceCacheTempDir());
+    checkNotSet("sourceCacheHint", pConfig->sourceCacheHint());
+    checkNotSet("sourceReadHint", pConfig->sourceReadHint());
+    checkNotSet("sourceTTreeCacheSize", pConfig->sourceTTreeCacheSize());
+    checkNotSet("sourceNativeProtocols", pConfig->sourceNativeProtocols());
+  }
 }
 
 //
diff --git a/FWCore/Services/test/StuckAnalyzer.cc b/FWCore/Services/test/StuckAnalyzer.cc
index 8d11376cfb017..2a7c5569ddeea 100644
--- a/FWCore/Services/test/StuckAnalyzer.cc
+++ b/FWCore/Services/test/StuckAnalyzer.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Subsystem/Package
 // Class  :     StuckAnalyzer
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -17,15 +17,14 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-
 class StuckAnalyzer : public edm::global::EDAnalyzer<> {
 public:
   StuckAnalyzer(edm::ParameterSet const&) {}
-  
+
   void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const override {
-    while(true) {};
+    while (true) {
+    };
   }
 };
 
-
 DEFINE_FWK_MODULE(StuckAnalyzer);
diff --git a/FWCore/Sources/interface/DaqProvenanceHelper.h b/FWCore/Sources/interface/DaqProvenanceHelper.h
index 32cb7abda2288..7207b7ae37975 100644
--- a/FWCore/Sources/interface/DaqProvenanceHelper.h
+++ b/FWCore/Sources/interface/DaqProvenanceHelper.h
@@ -6,7 +6,6 @@
 #include <vector>
 #include "tbb/concurrent_unordered_map.h"
 
-
 #include "DataFormats/Provenance/interface/BranchDescription.h"
 #include "DataFormats/Provenance/interface/ParentageID.h"
 #include "DataFormats/Provenance/interface/ProcessConfiguration.h"
@@ -21,11 +20,9 @@ namespace edm {
 
   namespace dqh {
     struct parentage_hash {
-      std::size_t operator()(edm::ParentageID const& iKey) const{
-        return iKey.smallHash();
-      }
+      std::size_t operator()(edm::ParentageID const& iKey) const { return iKey.smallHash(); }
     };
-  }
+  }  // namespace dqh
 
   struct DaqProvenanceHelper {
     typedef std::map<ProcessHistoryID, ProcessHistoryID> ProcessHistoryIDMap;
@@ -46,7 +43,7 @@ namespace edm {
     ParentageID const& mapParentageID(ParentageID const& phid) const;
     BranchID const& mapBranchID(BranchID const& branchID) const;
 
-    BranchDescription const& branchDescription() const {return constBranchDescription_;}
+    BranchDescription const& branchDescription() const { return constBranchDescription_; }
     ProcessHistoryID const* oldProcessHistoryID() const { return oldProcessHistoryID_; }
     ProductProvenance const& dummyProvenance() const { return dummyProvenance_; }
 
@@ -64,5 +61,5 @@ namespace edm {
     ProcessHistoryIDMap phidMap_;
     ParentageIDMap parentageIDMap_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Sources/interface/EventSkipperByID.h b/FWCore/Sources/interface/EventSkipperByID.h
index 1e1d775467102..7740a7379aee8 100644
--- a/FWCore/Sources/interface/EventSkipperByID.h
+++ b/FWCore/Sources/interface/EventSkipperByID.h
@@ -19,15 +19,13 @@ namespace edm {
     explicit EventSkipperByID(ParameterSet const& pset);
     ~EventSkipperByID();
     bool skipIt(RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event) const;
-    bool skippingLumis() const {return skippingLumis_;}
-    bool skippingEvents() const {return skippingEvents_;}
-    bool somethingToSkip() const {return somethingToSkip_;}
-    static
-    std::unique_ptr<EventSkipperByID>create(ParameterSet const& pset);
-    static void fillDescription(ParameterSetDescription & desc);
+    bool skippingLumis() const { return skippingLumis_; }
+    bool skippingEvents() const { return skippingEvents_; }
+    bool somethingToSkip() const { return somethingToSkip_; }
+    static std::unique_ptr<EventSkipperByID> create(ParameterSet const& pset);
+    static void fillDescription(ParameterSetDescription& desc);
 
   private:
-
     RunNumber_t firstRun_;
     LuminosityBlockNumber_t firstLumi_;
     EventNumber_t firstEvent_;
@@ -39,6 +37,6 @@ namespace edm {
     bool skippingEvents_;
     bool somethingToSkip_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Sources/interface/FromFiles.h b/FWCore/Sources/interface/FromFiles.h
index 32379fd6ec050..a3e7a9453dd31 100644
--- a/FWCore/Sources/interface/FromFiles.h
+++ b/FWCore/Sources/interface/FromFiles.h
@@ -18,20 +18,19 @@ namespace edm {
     FromFiles(ParameterSet const& pset);
     ~FromFiles();
 
-    std::vector<std::string> const& logicalFileNames() const {return catalog_.logicalFileNames();}
-    std::vector<std::string> const& fileNames() const {return catalog_.fileNames();}
-    InputFileCatalog& catalog() {return catalog_;}
-    
+    std::vector<std::string> const& logicalFileNames() const { return catalog_.logicalFileNames(); }
+    std::vector<std::string> const& fileNames() const { return catalog_.fileNames(); }
+    InputFileCatalog& catalog() { return catalog_; }
+
     static void fillDescription(ParameterSetDescription& desc);
 
-    void incrementFileIndex() {++fileIndex_;}
+    void incrementFileIndex() { ++fileIndex_; }
 
     size_t fileIndex() const;
 
   private:
-
     InputFileCatalog catalog_;
     size_t fileIndex_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Sources/interface/ProducerSourceBase.h b/FWCore/Sources/interface/ProducerSourceBase.h
index 77aa50dfe7f99..935a53f78ec66 100644
--- a/FWCore/Sources/interface/ProducerSourceBase.h
+++ b/FWCore/Sources/interface/ProducerSourceBase.h
@@ -24,22 +24,21 @@ namespace edm {
     explicit ProducerSourceBase(ParameterSet const& pset, InputSourceDescription const& desc, bool realData);
     ~ProducerSourceBase() noexcept(false) override;
 
-    unsigned int numberEventsInRun() const {return numberEventsInRun_;} 
-    unsigned int numberEventsInLumi() const {return numberEventsInLumi_;} 
-    TimeValue_t presentTime() const {return presentTime_;}
-    unsigned int timeBetweenEvents() const {return timeBetweenEvents_;}
-    unsigned int eventCreationDelay() const {return eventCreationDelay_;}
-    unsigned int numberEventsInThisRun() const {return numberEventsInThisRun_;}
-    unsigned int numberEventsInThisLumi() const {return numberEventsInThisLumi_;}
-    EventID const& eventID() const {return eventID_;}
-    RunNumber_t run() const {return eventID_.run();}
-    EventNumber_t event() const {return eventID_.event();}
-    LuminosityBlockNumber_t luminosityBlock() const {return eventID_.luminosityBlock();}
+    unsigned int numberEventsInRun() const { return numberEventsInRun_; }
+    unsigned int numberEventsInLumi() const { return numberEventsInLumi_; }
+    TimeValue_t presentTime() const { return presentTime_; }
+    unsigned int timeBetweenEvents() const { return timeBetweenEvents_; }
+    unsigned int eventCreationDelay() const { return eventCreationDelay_; }
+    unsigned int numberEventsInThisRun() const { return numberEventsInThisRun_; }
+    unsigned int numberEventsInThisLumi() const { return numberEventsInThisLumi_; }
+    EventID const& eventID() const { return eventID_; }
+    RunNumber_t run() const { return eventID_.run(); }
+    EventNumber_t event() const { return eventID_.event(); }
+    LuminosityBlockNumber_t luminosityBlock() const { return eventID_.luminosityBlock(); }
 
     static void fillDescription(ParameterSetDescription& desc);
-    
-  protected:
 
+  protected:
   private:
     ItemType getNextItemType() final;
     virtual void initialize(EventID& id, TimeValue_t& time, TimeValue_t& interval);
@@ -48,7 +47,7 @@ namespace edm {
     virtual bool noFiles() const;
     virtual size_t fileIndex() const;
     void beginJob() override;
-    
+
     void readEvent_(EventPrincipal& eventPrincipal) override;
     std::shared_ptr<LuminosityBlockAuxiliary> readLuminosityBlockAuxiliary_() override;
     std::shared_ptr<RunAuxiliary> readRunAuxiliary_() override;
@@ -65,7 +64,7 @@ namespace edm {
     TimeValue_t presentTime_;
     TimeValue_t origTime_;
     TimeValue_t timeBetweenEvents_;
-    unsigned int eventCreationDelay_;  /* microseconds */
+    unsigned int eventCreationDelay_; /* microseconds */
 
     unsigned int numberEventsInThisRun_;
     unsigned int numberEventsInThisLumi_;
@@ -75,5 +74,5 @@ namespace edm {
     bool isRealData_;
     EventAuxiliary::ExperimentType eType_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Sources/interface/ProducerSourceFromFiles.h b/FWCore/Sources/interface/ProducerSourceFromFiles.h
index 1828197e16a3b..90e6e6001ba52 100644
--- a/FWCore/Sources/interface/ProducerSourceFromFiles.h
+++ b/FWCore/Sources/interface/ProducerSourceFromFiles.h
@@ -19,14 +19,12 @@ namespace edm {
     ProducerSourceFromFiles(ParameterSet const& pset, InputSourceDescription const& desc, bool realData);
     ~ProducerSourceFromFiles() override;
 
-    using FromFiles::logicalFileNames;
-    using FromFiles::fileNames;
     using FromFiles::catalog;
+    using FromFiles::fileNames;
+    using FromFiles::logicalFileNames;
+
+    bool noFiles() const override { return fileNames().empty(); }
 
-    bool noFiles() const override {
-      return fileNames().empty();
-    }
-    
     static void fillDescription(ParameterSetDescription& desc);
 
   protected:
@@ -34,7 +32,6 @@ namespace edm {
 
   private:
     size_t fileIndex() const override;
-
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Sources/interface/PuttableSourceBase.h b/FWCore/Sources/interface/PuttableSourceBase.h
index df3229891f935..b77672166d2ea 100644
--- a/FWCore/Sources/interface/PuttableSourceBase.h
+++ b/FWCore/Sources/interface/PuttableSourceBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Sources
 // Class  :     PuttableSourceBase
-// 
+//
 /**\class PuttableSourceBase PuttableSourceBase.h "PuttableSourceBase.h"
 
  Description: [one line class summary]
@@ -27,47 +27,40 @@
 
 // forward declarations
 namespace edm {
-  class PuttableSourceBase : public InputSource, public ProducerBase
-{
-  
-public:
-  PuttableSourceBase(ParameterSet const&, InputSourceDescription const&);
-  
-  // ---------- const member functions ---------------------
-  
-  // ---------- static member functions --------------------
-  
-  // ---------- member functions ---------------------------
-  using ProducerBase::resolvePutIndicies;
-  using ProducerBase::registerProducts;
-  void registerProducts() final;
-
-  bool hasAbilityToProduceInRuns() const final {
-    return true;
-  }
-
-  bool hasAbilityToProduceInLumis() const final {
-    return true;
-  }
-
-protected:
-  //If inheriting class overrides, they need to call this function as well
-  void beginJob() override;
-private:
-  void doBeginLumi(LuminosityBlockPrincipal& lbp, ProcessContext const*) override;
-  void doBeginRun(RunPrincipal& rp, ProcessContext const*) override;
-  
-  
-  virtual void beginRun(Run&);
-  virtual void beginLuminosityBlock(LuminosityBlock&);
-  
-  PuttableSourceBase(const PuttableSourceBase&) = delete;
-  
-  PuttableSourceBase& operator=(const PuttableSourceBase&) = delete;
-  
-  // ---------- member data --------------------------------
-  
-};
-}
+  class PuttableSourceBase : public InputSource, public ProducerBase {
+  public:
+    PuttableSourceBase(ParameterSet const&, InputSourceDescription const&);
+
+    // ---------- const member functions ---------------------
+
+    // ---------- static member functions --------------------
+
+    // ---------- member functions ---------------------------
+    using ProducerBase::registerProducts;
+    using ProducerBase::resolvePutIndicies;
+    void registerProducts() final;
+
+    bool hasAbilityToProduceInRuns() const final { return true; }
+
+    bool hasAbilityToProduceInLumis() const final { return true; }
+
+  protected:
+    //If inheriting class overrides, they need to call this function as well
+    void beginJob() override;
+
+  private:
+    void doBeginLumi(LuminosityBlockPrincipal& lbp, ProcessContext const*) override;
+    void doBeginRun(RunPrincipal& rp, ProcessContext const*) override;
+
+    virtual void beginRun(Run&);
+    virtual void beginLuminosityBlock(LuminosityBlock&);
+
+    PuttableSourceBase(const PuttableSourceBase&) = delete;
+
+    PuttableSourceBase& operator=(const PuttableSourceBase&) = delete;
+
+    // ---------- member data --------------------------------
+  };
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Sources/interface/RawInputSource.h b/FWCore/Sources/interface/RawInputSource.h
index 38c5b1e74dcde..1b55a1f76fdfa 100644
--- a/FWCore/Sources/interface/RawInputSource.h
+++ b/FWCore/Sources/interface/RawInputSource.h
@@ -24,7 +24,7 @@ namespace edm {
     void makeEvent(EventPrincipal& eventPrincipal, EventAuxiliary const& eventAuxiliary);
     virtual bool checkNextEvent() = 0;
     virtual void read(EventPrincipal& eventPrincipal) = 0;
-    void setInputFileTransitionsEachEvent() {inputFileTransitionsEachEvent_ = true;}
+    void setInputFileTransitionsEachEvent() { inputFileTransitionsEachEvent_ = true; }
 
   private:
     void readEvent_(EventPrincipal& eventPrincipal) override;
@@ -34,10 +34,10 @@ namespace edm {
     void rewind_() override;
     ItemType getNextItemType() override;
     void closeFile_() final;
-    virtual void genuineCloseFile() { }
+    virtual void genuineCloseFile() {}
 
     bool inputFileTransitionsEachEvent_;
     bool fakeInputFileTransition_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Sources/interface/RawInputSourceFromFiles.h b/FWCore/Sources/interface/RawInputSourceFromFiles.h
index 0bf6e1c23c01d..c8e972a3d1413 100644
--- a/FWCore/Sources/interface/RawInputSourceFromFiles.h
+++ b/FWCore/Sources/interface/RawInputSourceFromFiles.h
@@ -19,10 +19,10 @@ namespace edm {
     RawInputSourceFromFiles(ParameterSet const& pset, InputSourceDescription const& desc);
     ~RawInputSourceFromFiles() override;
 
-    using FromFiles::logicalFileNames;
-    using FromFiles::fileNames;
     using FromFiles::catalog;
-    
+    using FromFiles::fileNames;
+    using FromFiles::logicalFileNames;
+
     static void fillDescription(ParameterSetDescription& desc);
 
   protected:
@@ -31,5 +31,5 @@ namespace edm {
   private:
     using FromFiles::fileIndex;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Sources/interface/VectorInputSource.h b/FWCore/Sources/interface/VectorInputSource.h
index dd22d5c3617fd..8bd9c228e441b 100644
--- a/FWCore/Sources/interface/VectorInputSource.h
+++ b/FWCore/Sources/interface/VectorInputSource.h
@@ -29,11 +29,18 @@ namespace edm {
     explicit VectorInputSource(ParameterSet const& pset, VectorInputSourceDescription const& desc);
     virtual ~VectorInputSource();
 
-    template<typename T>
-    size_t loopOverEvents(EventPrincipal& cache, size_t& fileNameHash, size_t number, T eventOperator, CLHEP::HepRandomEngine* = nullptr, EventID const* id = nullptr, bool recycleFiles = true);
-
-    template<typename T, typename Iterator>
-    size_t loopSpecified(EventPrincipal& cache, size_t& fileNameHash, Iterator const& begin, Iterator const& end, T eventOperator);
+    template <typename T>
+    size_t loopOverEvents(EventPrincipal& cache,
+                          size_t& fileNameHash,
+                          size_t number,
+                          T eventOperator,
+                          CLHEP::HepRandomEngine* = nullptr,
+                          EventID const* id = nullptr,
+                          bool recycleFiles = true);
+
+    template <typename T, typename Iterator>
+    size_t loopSpecified(
+        EventPrincipal& cache, size_t& fileNameHash, Iterator const& begin, Iterator const& end, T eventOperator);
 
     void dropUnwantedBranches(std::vector<std::string> const& wantedBranches);
     //
@@ -43,19 +50,21 @@ namespace edm {
     /// Called at end of job
     void doEndJob();
 
-    std::shared_ptr<ProductRegistry const> productRegistry() const {return get_underlying_safe(productRegistry_);}
-    std::shared_ptr<ProductRegistry>& productRegistry() {return get_underlying_safe(productRegistry_);}
-    ProductRegistry& productRegistryUpdate() {return *productRegistry_;}
-    ProcessHistoryRegistry const& processHistoryRegistry() const {return *processHistoryRegistry_;}
-    ProcessHistoryRegistry& processHistoryRegistryForUpdate() {return *processHistoryRegistry_;}
+    std::shared_ptr<ProductRegistry const> productRegistry() const { return get_underlying_safe(productRegistry_); }
+    std::shared_ptr<ProductRegistry>& productRegistry() { return get_underlying_safe(productRegistry_); }
+    ProductRegistry& productRegistryUpdate() { return *productRegistry_; }
+    ProcessHistoryRegistry const& processHistoryRegistry() const { return *processHistoryRegistry_; }
+    ProcessHistoryRegistry& processHistoryRegistryForUpdate() { return *processHistoryRegistry_; }
 
   private:
-
     void clearEventPrincipal(EventPrincipal& cache);
 
   private:
-    virtual bool readOneEvent(EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine*, EventID const* id, bool recycleFiles) = 0;
-    virtual void readOneSpecified(EventPrincipal& cache, size_t& fileNameHash, SecondaryEventIDAndFileInfo const& event) = 0;
+    virtual bool readOneEvent(
+        EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine*, EventID const* id, bool recycleFiles) = 0;
+    virtual void readOneSpecified(EventPrincipal& cache,
+                                  size_t& fileNameHash,
+                                  SecondaryEventIDAndFileInfo const& event) = 0;
     void readOneSpecified(EventPrincipal& cache, size_t& fileNameHash, EventID const& event) {
       SecondaryEventIDAndFileInfo info(event, fileNameHash);
       readOneSpecified(cache, fileNameHash, info);
@@ -72,20 +81,26 @@ namespace edm {
     unsigned int consecutiveRejectionsLimit_;
   };
 
-  template<typename T>
-  size_t VectorInputSource::loopOverEvents(EventPrincipal& cache, size_t& fileNameHash, size_t number, T eventOperator, CLHEP::HepRandomEngine* engine, EventID const* id, bool recycleFiles) {
+  template <typename T>
+  size_t VectorInputSource::loopOverEvents(EventPrincipal& cache,
+                                           size_t& fileNameHash,
+                                           size_t number,
+                                           T eventOperator,
+                                           CLHEP::HepRandomEngine* engine,
+                                           EventID const* id,
+                                           bool recycleFiles) {
     size_t i = 0U;
     unsigned int consecutiveRejections = 0U;
-    while(i < number) {
+    while (i < number) {
       clearEventPrincipal(cache);
       bool found = readOneEvent(cache, fileNameHash, engine, id, recycleFiles);
-      if(!found) break;
+      if (!found)
+        break;
       bool used = eventOperator(cache, fileNameHash);
-      if(used) {
+      if (used) {
         ++i;
         consecutiveRejections = 0U;
-      }
-      else if(consecutiveRejectionsLimit_ > 0) {
+      } else if (consecutiveRejectionsLimit_ > 0) {
         ++consecutiveRejections;
         throwIfOverLimit(consecutiveRejections);
       }
@@ -93,10 +108,11 @@ namespace edm {
     return i;
   }
 
-  template<typename T, typename Iterator>
-  size_t VectorInputSource::loopSpecified(EventPrincipal& cache, size_t& fileNameHash, Iterator const& begin, Iterator const& end, T eventOperator) {
+  template <typename T, typename Iterator>
+  size_t VectorInputSource::loopSpecified(
+      EventPrincipal& cache, size_t& fileNameHash, Iterator const& begin, Iterator const& end, T eventOperator) {
     size_t i = 0U;
-    for(Iterator iter = begin; iter != end; ++iter) {
+    for (Iterator iter = begin; iter != end; ++iter) {
       clearEventPrincipal(cache);
       readOneSpecified(cache, fileNameHash, *iter);
       eventOperator(cache, fileNameHash);
@@ -104,5 +120,5 @@ namespace edm {
     }
     return i;
   }
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Sources/interface/VectorInputSourceDescription.h b/FWCore/Sources/interface/VectorInputSourceDescription.h
index e1751b1678549..1d170327aa649 100644
--- a/FWCore/Sources/interface/VectorInputSourceDescription.h
+++ b/FWCore/Sources/interface/VectorInputSourceDescription.h
@@ -16,17 +16,14 @@ namespace edm {
   class ProductRegistry;
 
   struct VectorInputSourceDescription {
-    VectorInputSourceDescription() :
-      productRegistry_(nullptr) {
-    }
+    VectorInputSourceDescription() : productRegistry_(nullptr) {}
 
-    VectorInputSourceDescription(std::shared_ptr<ProductRegistry> preg, PreallocationConfiguration const& allocations) :
-      productRegistry_(preg), allocations_(&allocations) {
-    }
+    VectorInputSourceDescription(std::shared_ptr<ProductRegistry> preg, PreallocationConfiguration const& allocations)
+        : productRegistry_(preg), allocations_(&allocations) {}
 
     std::shared_ptr<ProductRegistry> productRegistry_;
     PreallocationConfiguration const* allocations_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Sources/interface/VectorInputSourceFactory.h b/FWCore/Sources/interface/VectorInputSourceFactory.h
index 16498863c8487..3a7a406e7f5b3 100644
--- a/FWCore/Sources/interface/VectorInputSourceFactory.h
+++ b/FWCore/Sources/interface/VectorInputSourceFactory.h
@@ -11,7 +11,7 @@ namespace edm {
   struct VectorInputSourceDescription;
   class ParameterSet;
 
-  typedef VectorInputSource* (ISVecFunc)(ParameterSet const&, VectorInputSourceDescription const&);
+  typedef VectorInputSource*(ISVecFunc)(ParameterSet const&, VectorInputSourceDescription const&);
   typedef edmplugin::PluginFactory<ISVecFunc> VectorInputSourcePluginFactory;
 
   class VectorInputSourceFactory {
@@ -20,13 +20,12 @@ namespace edm {
 
     static VectorInputSourceFactory const* get();
 
-    std::unique_ptr<VectorInputSource>
-      makeVectorInputSource(ParameterSet const&,
-                            VectorInputSourceDescription const&) const;
+    std::unique_ptr<VectorInputSource> makeVectorInputSource(ParameterSet const&,
+                                                             VectorInputSourceDescription const&) const;
 
   private:
     VectorInputSourceFactory();
     static VectorInputSourceFactory const singleInstance_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Sources/interface/VectorInputSourceMacros.h b/FWCore/Sources/interface/VectorInputSourceMacros.h
index 752af22632ada..29d7e980ea6c2 100644
--- a/FWCore/Sources/interface/VectorInputSourceMacros.h
+++ b/FWCore/Sources/interface/VectorInputSourceMacros.h
@@ -4,7 +4,6 @@
 #include "FWCore/Sources/interface/VectorInputSourceFactory.h"
 #include "FWCore/Sources/interface/VectorInputSource.h"
 
-#define DEFINE_FWK_VECTOR_INPUT_SOURCE(type) \
-  DEFINE_EDM_PLUGIN (edm::VectorInputSourcePluginFactory,type,#type)
+#define DEFINE_FWK_VECTOR_INPUT_SOURCE(type) DEFINE_EDM_PLUGIN(edm::VectorInputSourcePluginFactory, type, #type)
 
 #endif
diff --git a/FWCore/Sources/src/DaqProvenanceHelper.cc b/FWCore/Sources/src/DaqProvenanceHelper.cc
index 253e9b6bbeb0a..e86e041f6698f 100644
--- a/FWCore/Sources/src/DaqProvenanceHelper.cc
+++ b/FWCore/Sources/src/DaqProvenanceHelper.cc
@@ -16,26 +16,27 @@
 
 namespace edm {
   DaqProvenanceHelper::DaqProvenanceHelper(TypeID const& rawDataType)
-        : constBranchDescription_(BranchDescription(InEvent
-                                                  , "rawDataCollector"
+      : constBranchDescription_(BranchDescription(InEvent,
+                                                  "rawDataCollector"
                                                   //, "source"
-                                                  , "LHC"
+                                                  ,
+                                                  "LHC"
                                                   // , "HLT"
-                                                  , "FEDRawDataCollection"
-                                                  , "FEDRawDataCollection"
-                                                  , ""
-                                                  , "FedRawDataInputSource"
-                                                  , ParameterSetID()
-                                                  , TypeWithDict(rawDataType.typeInfo())
-                                                  , false))
-        , dummyProvenance_(constBranchDescription_.branchID())
-        , processParameterSet_()
-        , oldProcessName_()
-        , oldBranchID_()
-        , newBranchID_()
-        , oldProcessHistoryID_(nullptr)
-        , phidMap_() {
-    
+                                                  ,
+                                                  "FEDRawDataCollection",
+                                                  "FEDRawDataCollection",
+                                                  "",
+                                                  "FedRawDataInputSource",
+                                                  ParameterSetID(),
+                                                  TypeWithDict(rawDataType.typeInfo()),
+                                                  false)),
+        dummyProvenance_(constBranchDescription_.branchID()),
+        processParameterSet_(),
+        oldProcessName_(),
+        oldBranchID_(),
+        newBranchID_(),
+        oldProcessHistoryID_(nullptr),
+        phidMap_() {
     // Now we create a process parameter set for the "LHC" process.
     // We don't currently use the untracked parameters, However, we make them available, just in case.
     std::string const& moduleLabel = constBranchDescription_.moduleLabel();
@@ -73,10 +74,10 @@ namespace edm {
     //std::cerr << processParameterSet_.dump() << std::endl;
   }
 
-  ProcessHistoryID
-  DaqProvenanceHelper::daqInit(ProductRegistry& productRegistry, ProcessHistoryRegistry& processHistoryRegistry) const {
+  ProcessHistoryID DaqProvenanceHelper::daqInit(ProductRegistry& productRegistry,
+                                                ProcessHistoryRegistry& processHistoryRegistry) const {
     // Now we need to set all the metadata
-    // Add the product to the product registry  
+    // Add the product to the product registry
     productRegistry.copyProduct(constBranchDescription_);
 
     // Insert an entry for this process in the process history registry
@@ -88,34 +89,31 @@ namespace edm {
     return ph.setProcessHistoryID();
   }
 
-  bool
-  DaqProvenanceHelper::matchProcesses(ProcessConfiguration const& newPC, ProcessHistory const& ph) const {
-    for(auto const& pc : ph) {
-      if(pc.processName() == oldProcessName_) {
-        return(pc.releaseVersion() == newPC.releaseVersion() && pc.passID() == newPC.passID());
+  bool DaqProvenanceHelper::matchProcesses(ProcessConfiguration const& newPC, ProcessHistory const& ph) const {
+    for (auto const& pc : ph) {
+      if (pc.processName() == oldProcessName_) {
+        return (pc.releaseVersion() == newPC.releaseVersion() && pc.passID() == newPC.passID());
       }
     }
     return false;
   }
 
-  void
-  DaqProvenanceHelper::fixMetaData(std::vector<ProcessConfiguration>& pcv, std::vector<ProcessHistory>& phv) {
-    phv.push_back(ProcessHistory()); // For new processHistory, containing only processConfiguration_
+  void DaqProvenanceHelper::fixMetaData(std::vector<ProcessConfiguration>& pcv, std::vector<ProcessHistory>& phv) {
+    phv.push_back(ProcessHistory());  // For new processHistory, containing only processConfiguration_
     std::vector<ProcessConfiguration> newPCs;
-    for(auto const& pc : pcv) {
-       if(pc.processName() == oldProcessName_) {
-         newPCs.emplace_back(constBranchDescription_.processName(),
-                             processParameterSet_.id(),
-                             pc.releaseVersion(), pc.passID());
-       }
+    for (auto const& pc : pcv) {
+      if (pc.processName() == oldProcessName_) {
+        newPCs.emplace_back(
+            constBranchDescription_.processName(), processParameterSet_.id(), pc.releaseVersion(), pc.passID());
+      }
     }
     assert(!newPCs.empty());
     pcv.reserve(pcv.size() + newPCs.size());
     pcv.insert(pcv.end(), newPCs.begin(), newPCs.end());
     // update existing process histories
-    for(auto& ph : phv) {
-      for(auto const& newPC : newPCs) {
-        if(ph.empty() || matchProcesses(newPC, ph)) {
+    for (auto& ph : phv) {
+      for (auto const& newPC : newPCs) {
+        if (ph.empty() || matchProcesses(newPC, ph)) {
           ProcessHistoryID oldPHID = ph.id();
           ph.push_front(newPC);
           ProcessHistoryID newPHID = ph.id();
@@ -126,52 +124,48 @@ namespace edm {
     }
     // For new process histories, containing only the new process configurations
     phv.reserve(phv.size() + newPCs.size());
-    for(auto const& newPC : newPCs) {
+    for (auto const& newPC : newPCs) {
       phv.emplace_back();
       phv.back().push_front(newPC);
     }
   }
 
-  void
-  DaqProvenanceHelper::fixMetaData(std::vector<BranchID>& branchID) const {
+  void DaqProvenanceHelper::fixMetaData(std::vector<BranchID>& branchID) const {
     std::replace(branchID.begin(), branchID.end(), oldBranchID_, newBranchID_);
   }
 
-  void
-  DaqProvenanceHelper::fixMetaData(BranchIDLists const& branchIDLists) const {
+  void DaqProvenanceHelper::fixMetaData(BranchIDLists const& branchIDLists) const {
     BranchID::value_type oldID = oldBranchID_.id();
     BranchID::value_type newID = newBranchID_.id();
     // The const_cast is ugly, but it beats the alternatives.
     BranchIDLists& lists = const_cast<BranchIDLists&>(branchIDLists);
-    for(auto& list : lists) {
+    for (auto& list : lists) {
       std::replace(list.begin(), list.end(), oldID, newID);
     }
   }
 
-  void
-  DaqProvenanceHelper::fixMetaData(BranchChildren& branchChildren) const {
+  void DaqProvenanceHelper::fixMetaData(BranchChildren& branchChildren) const {
     typedef std::map<BranchID, std::set<BranchID> > BCMap;
     // The const_cast is ugly, but it beats the alternatives.
     BCMap& childLookup = const_cast<BCMap&>(branchChildren.childLookup());
     // First fix any old branchID's in the key.
     {
       BCMap::iterator i = childLookup.find(oldBranchID_);
-      if(i != childLookup.end()) {
+      if (i != childLookup.end()) {
         childLookup.insert(std::make_pair(newBranchID_, i->second));
         childLookup.erase(i);
       }
     }
     // Now fix any old branchID's in the sets;
-    for(auto& child : childLookup) {
-      if(child.second.erase(oldBranchID_) != 0) {
+    for (auto& child : childLookup) {
+      if (child.second.erase(oldBranchID_) != 0) {
         child.second.insert(newBranchID_);
       }
     }
   }
 
   // Replace process history ID.
-  ProcessHistoryID const&
-  DaqProvenanceHelper::mapProcessHistoryID(ProcessHistoryID const& phid) {
+  ProcessHistoryID const& DaqProvenanceHelper::mapProcessHistoryID(ProcessHistoryID const& phid) {
     ProcessHistoryIDMap::const_iterator it = phidMap_.find(phid);
     assert(it != phidMap_.end());
     oldProcessHistoryID_ = &it->first;
@@ -179,23 +173,21 @@ namespace edm {
   }
 
   // Replace parentage ID.
-  ParentageID const&
-  DaqProvenanceHelper::mapParentageID(ParentageID const& parentageID) const {
+  ParentageID const& DaqProvenanceHelper::mapParentageID(ParentageID const& parentageID) const {
     ParentageIDMap::const_iterator it = parentageIDMap_.find(parentageID);
-    if(it == parentageIDMap_.end()) {
+    if (it == parentageIDMap_.end()) {
       return parentageID;
     }
     return it->second;
   }
 
   // Replace branch ID if necessary.
-  BranchID const&
-  DaqProvenanceHelper::mapBranchID(BranchID const& branchID) const {
-    return(branchID == oldBranchID_ ? newBranchID_ : branchID);
+  BranchID const& DaqProvenanceHelper::mapBranchID(BranchID const& branchID) const {
+    return (branchID == oldBranchID_ ? newBranchID_ : branchID);
   }
 
   void DaqProvenanceHelper::setOldParentageIDToNew(ParentageID const& iOld, ParentageID const& iNew) {
     parentageIDMap_.insert(std::make_pair(iOld, iNew));
   }
 
-}
+}  // namespace edm
diff --git a/FWCore/Sources/src/EventSkipperByID.cc b/FWCore/Sources/src/EventSkipperByID.cc
index bdc85a6e8f77b..01bb6c14c6342 100644
--- a/FWCore/Sources/src/EventSkipperByID.cc
+++ b/FWCore/Sources/src/EventSkipperByID.cc
@@ -4,24 +4,29 @@
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 namespace edm {
-  EventSkipperByID::EventSkipperByID(ParameterSet const& pset) :
-	// The default value provided as the second argument to the getUntrackedParameter function call
-	// is not used when the ParameterSet has been validated and the parameters are not optional
-	// in the description.  As soon as all primary input sources and all modules with a secondary
-	// input sources have defined descriptions, the defaults in the getUntrackedParameterSet function
-	// calls can and should be deleted from the code.
+  EventSkipperByID::EventSkipperByID(ParameterSet const& pset)
+      :  // The default value provided as the second argument to the getUntrackedParameter function call
+         // is not used when the ParameterSet has been validated and the parameters are not optional
+         // in the description.  As soon as all primary input sources and all modules with a secondary
+         // input sources have defined descriptions, the defaults in the getUntrackedParameterSet function
+         // calls can and should be deleted from the code.
         firstRun_(pset.getUntrackedParameter<unsigned int>("firstRun", 1U)),
         firstLumi_(pset.getUntrackedParameter<unsigned int>("firstLuminosityBlock", 0U)),
-        firstEvent_(pset.existsAs<unsigned int>("firstEvent", false) ? pset.getUntrackedParameter<unsigned int>("firstEvent") :
-                                                                       pset.getUntrackedParameter<unsigned long long>("firstEvent", 1U)),
-        whichLumisToSkip_(pset.getUntrackedParameter<std::vector<LuminosityBlockRange> >("lumisToSkip", std::vector<LuminosityBlockRange>())),
-        whichLumisToProcess_(pset.getUntrackedParameter<std::vector<LuminosityBlockRange> >("lumisToProcess", std::vector<LuminosityBlockRange>())),
-        whichEventsToSkip_(pset.getUntrackedParameter<std::vector<EventRange> >("eventsToSkip",std::vector<EventRange>())),
-        whichEventsToProcess_(pset.getUntrackedParameter<std::vector<EventRange> >("eventsToProcess",std::vector<EventRange>())),
+        firstEvent_(pset.existsAs<unsigned int>("firstEvent", false)
+                        ? pset.getUntrackedParameter<unsigned int>("firstEvent")
+                        : pset.getUntrackedParameter<unsigned long long>("firstEvent", 1U)),
+        whichLumisToSkip_(pset.getUntrackedParameter<std::vector<LuminosityBlockRange> >(
+            "lumisToSkip", std::vector<LuminosityBlockRange>())),
+        whichLumisToProcess_(pset.getUntrackedParameter<std::vector<LuminosityBlockRange> >(
+            "lumisToProcess", std::vector<LuminosityBlockRange>())),
+        whichEventsToSkip_(
+            pset.getUntrackedParameter<std::vector<EventRange> >("eventsToSkip", std::vector<EventRange>())),
+        whichEventsToProcess_(
+            pset.getUntrackedParameter<std::vector<EventRange> >("eventsToProcess", std::vector<EventRange>())),
         skippingLumis_(!(whichLumisToSkip_.empty() && whichLumisToProcess_.empty())),
         skippingEvents_(!(whichEventsToSkip_.empty() && whichEventsToProcess_.empty())),
-        somethingToSkip_(skippingLumis_ || skippingEvents_ || !(firstRun_ <= 1U && firstLumi_ <= 1U && firstEvent_ <= 1U)) {
-
+        somethingToSkip_(skippingLumis_ || skippingEvents_ ||
+                         !(firstRun_ <= 1U && firstLumi_ <= 1U && firstEvent_ <= 1U)) {
     sortAndRemoveOverlaps(whichLumisToSkip_);
     sortAndRemoveOverlaps(whichLumisToProcess_);
     sortAndRemoveOverlaps(whichEventsToSkip_);
@@ -30,8 +35,7 @@ namespace edm {
 
   EventSkipperByID::~EventSkipperByID() {}
 
-  std::unique_ptr<EventSkipperByID>
-  EventSkipperByID::create(ParameterSet const& pset) {
+  std::unique_ptr<EventSkipperByID> EventSkipperByID::create(ParameterSet const& pset) {
     auto evSkp = std::make_unique<EventSkipperByID>(pset);
     if (!evSkp->somethingToSkip()) {
       evSkp.reset();
@@ -42,31 +46,30 @@ namespace edm {
   // Determines whether a run, lumi, or event will be skipped based on the run, lumi, and event number.
   // This function is called by a predicate, so it must not modify the state of the EventSkipperByID_ object.
   // The mutable lumi_ and event_ data members are just temporary caches, so they may be modified.
-  bool
-  EventSkipperByID::skipIt(RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event) const {
-
-    if(run == 0U) run = 1U; // Correct zero run number
-    if(run < firstRun_) {
+  bool EventSkipperByID::skipIt(RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event) const {
+    if (run == 0U)
+      run = 1U;  // Correct zero run number
+    if (run < firstRun_) {
       // Skip all entries before the first run.
       return true;
     }
-    if(lumi == 0U) {
+    if (lumi == 0U) {
       // This is a run entry that is not before the first run.
       // Keep it, since there are no other parameters to skip runs.
       return false;
     }
     // If we get here, this is a lumi or event entry.
-    if(run == firstRun_) {
+    if (run == firstRun_) {
       // This lumi or event entry is in the first run to be processed.
-      if(lumi < firstLumi_) {
+      if (lumi < firstLumi_) {
         // This lumi or event entry is for a lumi prior to the first lumi to be processed.  Skip it.
         return true;
       }
-      if(firstLumi_ == 0 || lumi == firstLumi_) {
+      if (firstLumi_ == 0 || lumi == firstLumi_) {
         // If we get here, this entry is in the first lumi to be processed in the first run.
-	// Note that if firstLumi_ == 0, we are processing all lumis in the run.
-        if(event != 0U && event < firstEvent_) {
-	  // This is an event entry prior to the first event to be processed. Skip it.
+        // Note that if firstLumi_ == 0, we are processing all lumis in the run.
+        if (event != 0U && event < firstEvent_) {
+          // This is an event entry prior to the first event to be processed. Skip it.
           return true;
         }
       }
@@ -75,17 +78,17 @@ namespace edm {
       // If we get here, the entry was not skipped due to firstRun, firstLuminosityBlock, and/or firstEvent.
       LuminosityBlockID lumiID = LuminosityBlockID(run, lumi);
       LuminosityBlockRange lumiRange = LuminosityBlockRange(lumiID, lumiID);
-      bool(*lt)(LuminosityBlockRange const&, LuminosityBlockRange const&) = &lessThan;
-      if(binary_search_all(whichLumisToSkip_, lumiRange, lt)) {
+      bool (*lt)(LuminosityBlockRange const&, LuminosityBlockRange const&) = &lessThan;
+      if (binary_search_all(whichLumisToSkip_, lumiRange, lt)) {
         // The entry is in a lumi specified in whichLumisToSkip.  Skip it.
         return true;
       }
-      if(!whichLumisToProcess_.empty() && !binary_search_all(whichLumisToProcess_, lumiRange, lt)) {
+      if (!whichLumisToProcess_.empty() && !binary_search_all(whichLumisToProcess_, lumiRange, lt)) {
         // The entry is not in a lumi specified in non-empty whichLumisToProcess.  Skip it.
         return true;
       }
     }
-    if(event == 0U) {
+    if (event == 0U) {
       // The entry is a lumi entry that was not skipped above.  Keep it.
       return false;
     }
@@ -95,12 +98,14 @@ namespace edm {
       EventRange eventRange = EventRange(eventID, eventID);
       EventID eventIDNoLumi = EventID(run, 0U, event);
       EventRange eventRangeNoLumi = EventRange(eventIDNoLumi, eventIDNoLumi);
-      bool(*lt)(EventRange const&, EventRange const&) = &lessThanSpecial;
-      if(binary_search_all(whichEventsToSkip_, eventRange, lt) || binary_search_all(whichEventsToSkip_, eventRangeNoLumi, lt)) {
+      bool (*lt)(EventRange const&, EventRange const&) = &lessThanSpecial;
+      if (binary_search_all(whichEventsToSkip_, eventRange, lt) ||
+          binary_search_all(whichEventsToSkip_, eventRangeNoLumi, lt)) {
         // The entry is an event specified in whichEventsToSkip.  Skip it.
         return true;
       }
-      if(!whichEventsToProcess_.empty() && !binary_search_all(whichEventsToProcess_, eventRange, lt) && !binary_search_all(whichEventsToProcess_, eventRangeNoLumi, lt)) {
+      if (!whichEventsToProcess_.empty() && !binary_search_all(whichEventsToProcess_, eventRange, lt) &&
+          !binary_search_all(whichEventsToProcess_, eventRangeNoLumi, lt)) {
         // The entry is not an event specified in non-empty whichEventsToProcess.  Skip it.
         return true;
       }
@@ -108,30 +113,37 @@ namespace edm {
     return false;
   }
 
-  void
-  EventSkipperByID::fillDescription(ParameterSetDescription & desc) {
-
-    desc.addUntracked<unsigned int>("firstRun", 1U)
-        ->setComment("Skip any run with run number < 'firstRun'.");
+  void EventSkipperByID::fillDescription(ParameterSetDescription& desc) {
+    desc.addUntracked<unsigned int>("firstRun", 1U)->setComment("Skip any run with run number < 'firstRun'.");
     desc.addUntracked<unsigned int>("firstLuminosityBlock", 0U)
         ->setComment("Skip any lumi in run 'firstRun' with lumi number < 'firstLuminosityBlock'.");
 
-    desc.addNode( edm::ParameterDescription<unsigned int>("firstEvent", 1U, false) xor
-                  edm::ParameterDescription<unsigned long long>("firstEvent", 1ULL, false))
-        ->setComment("'firstEvent' is an XOR group because it can have type uint32 or uint64, default:1\n"
-                     "If 'firstLuminosityBlock' == 0, skip any event in run 'firstRun' with event number < 'firstEvent'.\n"
-                     "If 'firstLuminosityBlock' != 0, skip any event in lumi 'firstRun:firstLuminosityBlock' with event number < 'firstEvent'.");
+    desc.addNode(edm::ParameterDescription<unsigned int>("firstEvent", 1U, false) xor
+                 edm::ParameterDescription<unsigned long long>("firstEvent", 1ULL, false))
+        ->setComment(
+            "'firstEvent' is an XOR group because it can have type uint32 or uint64, default:1\n"
+            "If 'firstLuminosityBlock' == 0, skip any event in run 'firstRun' with event number < 'firstEvent'.\n"
+            "If 'firstLuminosityBlock' != 0, skip any event in lumi 'firstRun:firstLuminosityBlock' with event number "
+            "< 'firstEvent'.");
 
     std::vector<LuminosityBlockRange> defaultLumis;
     desc.addUntracked<std::vector<LuminosityBlockRange> >("lumisToSkip", defaultLumis)
-        ->setComment("Skip any lumi inside the specified run:lumi range. In python do 'help(cms.LuminosityBlockRange)' for documentation.");
+        ->setComment(
+            "Skip any lumi inside the specified run:lumi range. In python do 'help(cms.LuminosityBlockRange)' for "
+            "documentation.");
     desc.addUntracked<std::vector<LuminosityBlockRange> >("lumisToProcess", defaultLumis)
-        ->setComment("If not empty, skip any lumi outside the specified run:lumi range. In python do 'help(cms.LuminosityBlockRange)' for documentation.");
+        ->setComment(
+            "If not empty, skip any lumi outside the specified run:lumi range. In python do "
+            "'help(cms.LuminosityBlockRange)' for documentation.");
 
     std::vector<EventRange> defaultEvents;
     desc.addUntracked<std::vector<EventRange> >("eventsToSkip", defaultEvents)
-        ->setComment("Skip any event inside the specified run:event or run:lumi:event range. In python do 'help(cms.EventRange)' for documentation.");
+        ->setComment(
+            "Skip any event inside the specified run:event or run:lumi:event range. In python do "
+            "'help(cms.EventRange)' for documentation.");
     desc.addUntracked<std::vector<EventRange> >("eventsToProcess", defaultEvents)
-        ->setComment("If not empty, skip any event outside the specified run:event or run:lumi:event range. In python do 'help(cms.EventRange)' for documentation.");
+        ->setComment(
+            "If not empty, skip any event outside the specified run:event or run:lumi:event range. In python do "
+            "'help(cms.EventRange)' for documentation.");
   }
-}
+}  // namespace edm
diff --git a/FWCore/Sources/src/FromFiles.cc b/FWCore/Sources/src/FromFiles.cc
index 358acbc8650e1..d2b0bf9568636 100644
--- a/FWCore/Sources/src/FromFiles.cc
+++ b/FWCore/Sources/src/FromFiles.cc
@@ -3,26 +3,19 @@
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 namespace edm {
-  FromFiles::FromFiles(ParameterSet const& pset) :
-    catalog_(pset.getUntrackedParameter<std::vector<std::string> >("fileNames"),
-             pset.getUntrackedParameter<std::string>("overrideCatalog", std::string())),
-    fileIndex_(0) {
-  }
+  FromFiles::FromFiles(ParameterSet const& pset)
+      : catalog_(pset.getUntrackedParameter<std::vector<std::string> >("fileNames"),
+                 pset.getUntrackedParameter<std::string>("overrideCatalog", std::string())),
+        fileIndex_(0) {}
 
   FromFiles::~FromFiles() {}
 
-  void
-  FromFiles::fillDescription(ParameterSetDescription & desc) {
+  void FromFiles::fillDescription(ParameterSetDescription& desc) {
     std::vector<std::string> defaultStrings;
     desc.addUntracked<std::vector<std::string> >("fileNames", defaultStrings)
         ->setComment("Names of files to be processed.");
     desc.addUntracked<std::string>("overrideCatalog", std::string());
   }
 
-  size_t
-  FromFiles::fileIndex() const {
-    return fileIndex_;
-  }
-}
-
-
+  size_t FromFiles::fileIndex() const { return fileIndex_; }
+}  // namespace edm
diff --git a/FWCore/Sources/src/ProducerSourceBase.cc b/FWCore/Sources/src/ProducerSourceBase.cc
index 74cd0b30ad0c7..af1cfd10e506a 100644
--- a/FWCore/Sources/src/ProducerSourceBase.cc
+++ b/FWCore/Sources/src/ProducerSourceBase.cc
@@ -18,89 +18,91 @@
 
 namespace {
   void checkFirstLumiForRuns(std::vector<edm::LuminosityBlockID> const& iFirstLumis) {
-    if (iFirstLumis.empty()) return;
-    
+    if (iFirstLumis.empty())
+      return;
+
     auto previous = iFirstLumis[0].luminosityBlock();
-    for( auto it = iFirstLumis.begin()+1; it != iFirstLumis.end(); ++it) {
-      if( not ( it->luminosityBlock() > previous)) {
-        throw edm::Exception(edm::errors::Configuration)<<"Incorrect ordering of LuminosityBlock numbers in parameter 'firstLuminosityBlockForEachRun'";
+    for (auto it = iFirstLumis.begin() + 1; it != iFirstLumis.end(); ++it) {
+      if (not(it->luminosityBlock() > previous)) {
+        throw edm::Exception(edm::errors::Configuration)
+            << "Incorrect ordering of LuminosityBlock numbers in parameter 'firstLuminosityBlockForEachRun'";
       }
     }
   }
-}
+}  // namespace
 namespace edm {
   //used for defaults
   static unsigned long long constexpr kNanoSecPerSec = 1000000000ULL;
   static unsigned long long constexpr kAveEventPerSec = 200ULL;
-  
-  ProducerSourceBase::ProducerSourceBase(ParameterSet const& pset,
-				       InputSourceDescription const& desc, bool realData) :
-      PuttableSourceBase(pset, desc),
-      firstLumiForRuns_(pset.getUntrackedParameter<std::vector<edm::LuminosityBlockID>>("firstLuminosityBlockForEachRun")),
-      numberEventsInRun_(pset.getUntrackedParameter<unsigned int>("numberEventsInRun", remainingEvents())),
-      numberEventsInLumi_(pset.getUntrackedParameter<unsigned int>("numberEventsInLuminosityBlock", remainingEvents())),
-      presentTime_(pset.getUntrackedParameter<unsigned long long>("firstTime", 1ULL)),  //time in ns
-      origTime_(presentTime_),
-      timeBetweenEvents_(pset.getUntrackedParameter<unsigned long long>("timeBetweenEvents", kNanoSecPerSec/kAveEventPerSec)),
-      eventCreationDelay_(pset.getUntrackedParameter<unsigned int>("eventCreationDelay", 0)),
-      numberEventsInThisRun_(0),
-      numberEventsInThisLumi_(0),
-      zerothEvent_(pset.existsAs<unsigned int>("firstEvent", false) ? pset.getUntrackedParameter<unsigned int>("firstEvent", 1) - 1 :
-                                                                      pset.getUntrackedParameter<unsigned long long>("firstEvent", 1) - 1),
-      eventID_(pset.getUntrackedParameter<unsigned int>("firstRun", 1), pset.getUntrackedParameter<unsigned int>("firstLuminosityBlock", 1), zerothEvent_),
-      origEventID_(eventID_),
-      isRealData_(realData),
-      eType_(EventAuxiliary::Undefined) {
 
+  ProducerSourceBase::ProducerSourceBase(ParameterSet const& pset, InputSourceDescription const& desc, bool realData)
+      : PuttableSourceBase(pset, desc),
+        firstLumiForRuns_(
+            pset.getUntrackedParameter<std::vector<edm::LuminosityBlockID>>("firstLuminosityBlockForEachRun")),
+        numberEventsInRun_(pset.getUntrackedParameter<unsigned int>("numberEventsInRun", remainingEvents())),
+        numberEventsInLumi_(
+            pset.getUntrackedParameter<unsigned int>("numberEventsInLuminosityBlock", remainingEvents())),
+        presentTime_(pset.getUntrackedParameter<unsigned long long>("firstTime", 1ULL)),  //time in ns
+        origTime_(presentTime_),
+        timeBetweenEvents_(
+            pset.getUntrackedParameter<unsigned long long>("timeBetweenEvents", kNanoSecPerSec / kAveEventPerSec)),
+        eventCreationDelay_(pset.getUntrackedParameter<unsigned int>("eventCreationDelay", 0)),
+        numberEventsInThisRun_(0),
+        numberEventsInThisLumi_(0),
+        zerothEvent_(pset.existsAs<unsigned int>("firstEvent", false)
+                         ? pset.getUntrackedParameter<unsigned int>("firstEvent", 1) - 1
+                         : pset.getUntrackedParameter<unsigned long long>("firstEvent", 1) - 1),
+        eventID_(pset.getUntrackedParameter<unsigned int>("firstRun", 1),
+                 pset.getUntrackedParameter<unsigned int>("firstLuminosityBlock", 1),
+                 zerothEvent_),
+        origEventID_(eventID_),
+        isRealData_(realData),
+        eType_(EventAuxiliary::Undefined) {
     setTimestamp(Timestamp(presentTime_));
     checkFirstLumiForRuns(firstLumiForRuns_);
-    if(not firstLumiForRuns_.empty()) {
+    if (not firstLumiForRuns_.empty()) {
       numberEventsInRun_ = -1;
-      eventID_ = EventID(runForLumi(eventID_.luminosityBlock()),eventID_.luminosityBlock(),zerothEvent_);
+      eventID_ = EventID(runForLumi(eventID_.luminosityBlock()), eventID_.luminosityBlock(), zerothEvent_);
     }
   }
 
-  ProducerSourceBase::~ProducerSourceBase() noexcept(false) {
-  }
+  ProducerSourceBase::~ProducerSourceBase() noexcept(false) {}
 
-  
-  std::shared_ptr<RunAuxiliary>
-  ProducerSourceBase::readRunAuxiliary_() {
+  std::shared_ptr<RunAuxiliary> ProducerSourceBase::readRunAuxiliary_() {
     Timestamp ts = Timestamp(presentTime_);
     resetNewRun();
     return std::make_shared<RunAuxiliary>(eventID_.run(), ts, Timestamp::invalidTimestamp());
   }
 
-  std::shared_ptr<LuminosityBlockAuxiliary>
-  ProducerSourceBase::readLuminosityBlockAuxiliary_() {
-    if (processingMode() == Runs) return std::shared_ptr<LuminosityBlockAuxiliary>();
+  std::shared_ptr<LuminosityBlockAuxiliary> ProducerSourceBase::readLuminosityBlockAuxiliary_() {
+    if (processingMode() == Runs)
+      return std::shared_ptr<LuminosityBlockAuxiliary>();
     Timestamp ts = Timestamp(presentTime_);
     resetNewLumi();
-    return std::make_shared<LuminosityBlockAuxiliary>(eventID_.run(), eventID_.luminosityBlock(), ts, Timestamp::invalidTimestamp());
+    return std::make_shared<LuminosityBlockAuxiliary>(
+        eventID_.run(), eventID_.luminosityBlock(), ts, Timestamp::invalidTimestamp());
   }
 
-  void
-  ProducerSourceBase::readEvent_(EventPrincipal& eventPrincipal) {
+  void ProducerSourceBase::readEvent_(EventPrincipal& eventPrincipal) {
     assert(eventCached() || processingMode() != RunsLumisAndEvents);
     EventAuxiliary aux(eventID_, processGUID(), Timestamp(presentTime_), isRealData_, eType_);
     eventPrincipal.fillEventPrincipal(aux, processHistoryRegistry());
     Event e(eventPrincipal, moduleDescription(), nullptr);
-    e.setProducer(this,nullptr);
+    e.setProducer(this, nullptr);
     produce(e);
     e.commit_(std::vector<ProductResolverIndex>());
     resetEventCached();
   }
 
-  void
-  ProducerSourceBase::skip(int offset) {
+  void ProducerSourceBase::skip(int offset) {
     EventID oldEventID = eventID_;
-    for(; offset < 0; ++offset) {
+    for (; offset < 0; ++offset) {
       retreatToPrevious(eventID_, presentTime_);
     }
-    for(; offset > 0; --offset) {
+    for (; offset > 0; --offset) {
       advanceToNext(eventID_, presentTime_);
     }
-    if(eventID_.run() != oldEventID.run()) {
+    if (eventID_.run() != oldEventID.run()) {
       // New Run
       setNewRun();
       setNewLumi();
@@ -111,20 +113,16 @@ namespace edm {
     }
   }
 
-  void
-  ProducerSourceBase::beginJob() {
+  void ProducerSourceBase::beginJob() {
     PuttableSourceBase::beginJob();
     // Initialize cannot be called from the constructor, because it is a virtual function
     // that needs to be invoked from a derived class if the derived class overrides it.
     initialize(eventID_, presentTime_, timeBetweenEvents_);
   }
 
-  void
-  ProducerSourceBase::initialize(EventID&, TimeValue_t&, TimeValue_t&) {
-  }
+  void ProducerSourceBase::initialize(EventID&, TimeValue_t&, TimeValue_t&) {}
 
-  void
-  ProducerSourceBase::rewind_() {
+  void ProducerSourceBase::rewind_() {
     presentTime_ = origTime_;
     eventID_ = origEventID_;
     numberEventsInThisRun_ = 0;
@@ -132,10 +130,9 @@ namespace edm {
     setNewRun();
     setNewLumi();
   }
-    
-  InputSource::ItemType 
-  ProducerSourceBase::getNextItemType() {
-    if(state() == IsInvalid) {
+
+  InputSource::ItemType ProducerSourceBase::getNextItemType() {
+    if (state() == IsInvalid) {
       return noFiles() ? IsStop : IsFile;
     }
     if (newRun()) {
@@ -144,20 +141,22 @@ namespace edm {
     if (newLumi()) {
       return IsLumi;
     }
-    if(eventCached()) {
+    if (eventCached()) {
       return IsEvent;
     }
     EventID oldEventID = eventID_;
     advanceToNext(eventID_, presentTime_);
-    if (eventCreationDelay_ > 0) {usleep(eventCreationDelay_);}
+    if (eventCreationDelay_ > 0) {
+      usleep(eventCreationDelay_);
+    }
     size_t index = fileIndex();
     bool another = setRunAndEventInfo(eventID_, presentTime_, eType_);
-    if(!another) {
+    if (!another) {
       return IsStop;
     }
     bool newFile = (fileIndex() > index);
     setEventCached();
-    if(newRun() || eventID_.run() != oldEventID.run()) {
+    if (newRun() || eventID_.run() != oldEventID.run()) {
       // New Run
       setNewRun();
       setNewLumi();
@@ -178,8 +177,7 @@ namespace edm {
     return newFile ? IsFile : IsEvent;
   }
 
-  void 
-  ProducerSourceBase::advanceToNext(EventID& eventID, TimeValue_t& time)  {
+  void ProducerSourceBase::advanceToNext(EventID& eventID, TimeValue_t& time) {
     if (numberEventsInRun_ < 1 || numberEventsInThisRun_ < numberEventsInRun_) {
       // same run
       ++numberEventsInThisRun_;
@@ -187,12 +185,12 @@ namespace edm {
         // new lumi
         eventID = eventID.next(eventID.luminosityBlock() + 1);
         numberEventsInThisLumi_ = 1;
-        if( not firstLumiForRuns_.empty()) {
+        if (not firstLumiForRuns_.empty()) {
           auto run = runForLumi(eventID.luminosityBlock());
           if (run != eventID.run()) {
             numberEventsInThisRun_ = 1;
             eventID = eventID.nextRunFirstEvent(eventID_.luminosityBlock());
-            
+
             eventID = EventID(run, eventID.luminosityBlock(), eventID.event());
           }
         }
@@ -209,8 +207,7 @@ namespace edm {
     time += timeBetweenEvents_;
   }
 
-  void 
-  ProducerSourceBase::retreatToPrevious(EventID& eventID, TimeValue_t& time)  {
+  void ProducerSourceBase::retreatToPrevious(EventID& eventID, TimeValue_t& time) {
     if (numberEventsInRun_ < 1 || numberEventsInThisRun_ > 0) {
       // same run
       --numberEventsInThisRun_;
@@ -219,12 +216,12 @@ namespace edm {
         // new lumi
         eventID = eventID.previous(eventID.luminosityBlock() - 1);
         numberEventsInThisLumi_ = numberEventsInLumi_;
-        
-        if( not firstLumiForRuns_.empty()) {
+
+        if (not firstLumiForRuns_.empty()) {
           auto run = runForLumi(eventID.luminosityBlock());
           if (run != eventID.run()) {
             eventID = eventID.previousRunLastEvent(eventID_.luminosityBlock());
-            
+
             eventID = EventID(run, eventID.luminosityBlock(), eventID.event());
           }
         }
@@ -234,7 +231,7 @@ namespace edm {
     } else {
       // new run
       assert(numberEventsInLumi_ != 0);
-      eventID = eventID.previousRunLastEvent(origEventID_.luminosityBlock() + numberEventsInRun_/numberEventsInLumi_);
+      eventID = eventID.previousRunLastEvent(origEventID_.luminosityBlock() + numberEventsInRun_ / numberEventsInLumi_);
       eventID = EventID(numberEventsInRun_, eventID.luminosityBlock(), eventID.run());
       numberEventsInThisLumi_ = numberEventsInLumi_;
       numberEventsInThisRun_ = numberEventsInRun_;
@@ -242,45 +239,45 @@ namespace edm {
     time -= timeBetweenEvents_;
   }
 
-  RunNumber_t
-  ProducerSourceBase::runForLumi(LuminosityBlockNumber_t iLumi) const {
-    auto it = std::find_if(firstLumiForRuns_.rbegin(),
-                        firstLumiForRuns_.rend(),
-                        [iLumi](auto const& iV) {return iV.luminosityBlock()<=iLumi;});
-    if(it == firstLumiForRuns_.rend()) {
+  RunNumber_t ProducerSourceBase::runForLumi(LuminosityBlockNumber_t iLumi) const {
+    auto it = std::find_if(firstLumiForRuns_.rbegin(), firstLumiForRuns_.rend(), [iLumi](auto const& iV) {
+      return iV.luminosityBlock() <= iLumi;
+    });
+    if (it == firstLumiForRuns_.rend()) {
       //use first since we are off the end
       return firstLumiForRuns_[0].run();
     }
     return it->run();
   }
 
-  bool
-  ProducerSourceBase::noFiles() const {
-    return false;
-  }
-  
-  size_t
-  ProducerSourceBase::fileIndex() const {
-    return 0UL;
-  }
-  
-  void
-  ProducerSourceBase::fillDescription(ParameterSetDescription& desc) {
-    desc.addOptionalUntracked<unsigned int>("numberEventsInRun")->setComment("Number of events to generate in each run.");
-    desc.addOptionalUntracked<unsigned int>("numberEventsInLuminosityBlock")->setComment("Number of events to generate in each lumi.");
+  bool ProducerSourceBase::noFiles() const { return false; }
+
+  size_t ProducerSourceBase::fileIndex() const { return 0UL; }
+
+  void ProducerSourceBase::fillDescription(ParameterSetDescription& desc) {
+    desc.addOptionalUntracked<unsigned int>("numberEventsInRun")
+        ->setComment("Number of events to generate in each run.");
+    desc.addOptionalUntracked<unsigned int>("numberEventsInLuminosityBlock")
+        ->setComment("Number of events to generate in each lumi.");
     desc.addUntracked<unsigned long long>("firstTime", 1)->setComment("Time before first event (ns) (for timestamp).");
-    desc.addUntracked<unsigned long long>("timeBetweenEvents", kNanoSecPerSec/kAveEventPerSec)->setComment("Time between consecutive events (ns) (for timestamp).");
-    desc.addUntracked<unsigned int>("eventCreationDelay", 0)->setComment("Real time delay between generation of consecutive events (ms).");
+    desc.addUntracked<unsigned long long>("timeBetweenEvents", kNanoSecPerSec / kAveEventPerSec)
+        ->setComment("Time between consecutive events (ns) (for timestamp).");
+    desc.addUntracked<unsigned int>("eventCreationDelay", 0)
+        ->setComment("Real time delay between generation of consecutive events (ms).");
 
-    desc.addNode( edm::ParameterDescription<unsigned int>("firstEvent", 1U, false) xor
-                  edm::ParameterDescription<unsigned long long>("firstEvent", 1ULL, false))
-        ->setComment("'firstEvent' is an XOR group because it can have type uint32 or uint64, default:1\n"
-                     "Event number of first event to generate.");
+    desc.addNode(edm::ParameterDescription<unsigned int>("firstEvent", 1U, false) xor
+                 edm::ParameterDescription<unsigned long long>("firstEvent", 1ULL, false))
+        ->setComment(
+            "'firstEvent' is an XOR group because it can have type uint32 or uint64, default:1\n"
+            "Event number of first event to generate.");
 
-    desc.addUntracked<unsigned int>("firstLuminosityBlock", 1)->setComment("Luminosity block number of first lumi to generate.");
+    desc.addUntracked<unsigned int>("firstLuminosityBlock", 1)
+        ->setComment("Luminosity block number of first lumi to generate.");
     desc.addUntracked<unsigned int>("firstRun", 1)->setComment("Run number of first run to generate.");
-    desc.addUntracked<std::vector<edm::LuminosityBlockID>>("firstLuminosityBlockForEachRun", {})->setComment("When the source makes a new LuminosityBlock, this list is checked to see what Run number should be used. The LuminosityBlock numbers are required to be in ascending order.");
+    desc.addUntracked<std::vector<edm::LuminosityBlockID>>("firstLuminosityBlockForEachRun", {})
+        ->setComment(
+            "When the source makes a new LuminosityBlock, this list is checked to see what Run number should be used. "
+            "The LuminosityBlock numbers are required to be in ascending order.");
     InputSource::fillDescription(desc);
   }
-}
-
+}  // namespace edm
diff --git a/FWCore/Sources/src/ProducerSourceFromFiles.cc b/FWCore/Sources/src/ProducerSourceFromFiles.cc
index 427cf697e8029..69c952c15c1e9 100644
--- a/FWCore/Sources/src/ProducerSourceFromFiles.cc
+++ b/FWCore/Sources/src/ProducerSourceFromFiles.cc
@@ -3,22 +3,17 @@
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 namespace edm {
-  ProducerSourceFromFiles::ProducerSourceFromFiles(ParameterSet const& pset, InputSourceDescription const& desc, bool realData) :
-    ProducerSourceBase(pset, desc, realData),
-    FromFiles(pset) {
-  }
+  ProducerSourceFromFiles::ProducerSourceFromFiles(ParameterSet const& pset,
+                                                   InputSourceDescription const& desc,
+                                                   bool realData)
+      : ProducerSourceBase(pset, desc, realData), FromFiles(pset) {}
 
   ProducerSourceFromFiles::~ProducerSourceFromFiles() {}
 
-  void
-  ProducerSourceFromFiles::fillDescription(ParameterSetDescription & desc) {
+  void ProducerSourceFromFiles::fillDescription(ParameterSetDescription& desc) {
     ProducerSourceBase::fillDescription(desc);
     FromFiles::fillDescription(desc);
   }
 
-  size_t
-  ProducerSourceFromFiles::fileIndex() const {
-    return FromFiles::fileIndex();
-  }
-}
-
+  size_t ProducerSourceFromFiles::fileIndex() const { return FromFiles::fileIndex(); }
+}  // namespace edm
diff --git a/FWCore/Sources/src/PuttableSourceBase.cc b/FWCore/Sources/src/PuttableSourceBase.cc
index 7a79070768061..e1864c7b3fd8a 100644
--- a/FWCore/Sources/src/PuttableSourceBase.cc
+++ b/FWCore/Sources/src/PuttableSourceBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/Sources
 // Class  :     PuttableSourceBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -35,55 +35,41 @@ using namespace edm;
 //
 // constructors and destructor
 //
-PuttableSourceBase::PuttableSourceBase(ParameterSet const& iPSet, InputSourceDescription const& iISD):
-InputSource(iPSet,iISD)
-{
-}
+PuttableSourceBase::PuttableSourceBase(ParameterSet const& iPSet, InputSourceDescription const& iISD)
+    : InputSource(iPSet, iISD) {}
 
-void
-PuttableSourceBase::registerProducts() {
-  registerProducts(this,&productRegistryUpdate(),moduleDescription());
-}
+void PuttableSourceBase::registerProducts() { registerProducts(this, &productRegistryUpdate(), moduleDescription()); }
 
-void
-PuttableSourceBase::beginJob() {
+void PuttableSourceBase::beginJob() {
   auto r = productRegistry();
   auto const runLookup = r->productLookup(InRun);
   auto const lumiLookup = r->productLookup(InLumi);
   auto const eventLookup = r->productLookup(InEvent);
   auto const& processName = moduleDescription().processName();
   auto const& moduleLabel = moduleDescription().moduleLabel();
-  
+
   auto const& runModuleToIndicies = runLookup->indiciesForModulesInProcess(processName);
   auto const& lumiModuleToIndicies = lumiLookup->indiciesForModulesInProcess(processName);
   auto const& eventModuleToIndicies = eventLookup->indiciesForModulesInProcess(processName);
-  resolvePutIndicies(InRun,runModuleToIndicies,moduleLabel);
-  resolvePutIndicies(InLumi,lumiModuleToIndicies,moduleLabel);
-  resolvePutIndicies(InEvent,eventModuleToIndicies,moduleLabel);
+  resolvePutIndicies(InRun, runModuleToIndicies, moduleLabel);
+  resolvePutIndicies(InLumi, lumiModuleToIndicies, moduleLabel);
+  resolvePutIndicies(InEvent, eventModuleToIndicies, moduleLabel);
 }
 
-void
-PuttableSourceBase::doBeginRun(RunPrincipal& rp, ProcessContext const* ) {
+void PuttableSourceBase::doBeginRun(RunPrincipal& rp, ProcessContext const*) {
   Run run(rp, moduleDescription(), nullptr, false);
   run.setProducer(this);
-  callWithTryCatchAndPrint<void>( [this,&run](){ beginRun(run); }, "Calling Source::beginRun" );
+  callWithTryCatchAndPrint<void>([this, &run]() { beginRun(run); }, "Calling Source::beginRun");
   commit_(run);
 }
 
-void
-PuttableSourceBase::doBeginLumi(LuminosityBlockPrincipal& lbp, ProcessContext const* ) {
+void PuttableSourceBase::doBeginLumi(LuminosityBlockPrincipal& lbp, ProcessContext const*) {
   LuminosityBlock lb(lbp, moduleDescription(), nullptr, false);
   lb.setProducer(this);
-  callWithTryCatchAndPrint<void>( [this,&lb](){ beginLuminosityBlock(lb); }, "Calling Source::beginLuminosityBlock" );
+  callWithTryCatchAndPrint<void>([this, &lb]() { beginLuminosityBlock(lb); }, "Calling Source::beginLuminosityBlock");
   commit_(lb);
 }
 
-void
-PuttableSourceBase::beginRun(Run&) {
-}
-
-void
-PuttableSourceBase::beginLuminosityBlock(LuminosityBlock&) {
-}
-
+void PuttableSourceBase::beginRun(Run&) {}
 
+void PuttableSourceBase::beginLuminosityBlock(LuminosityBlock&) {}
diff --git a/FWCore/Sources/src/RawInputSource.cc b/FWCore/Sources/src/RawInputSource.cc
index 708ad22ab3ed1..dcdb4fac4c10b 100644
--- a/FWCore/Sources/src/RawInputSource.cc
+++ b/FWCore/Sources/src/RawInputSource.cc
@@ -12,28 +12,25 @@
 
 namespace edm {
 
-  RawInputSource::RawInputSource(ParameterSet const& pset, InputSourceDescription const& desc) :
-    InputSource(pset, desc),
-    // The default value for the following parameter get defined in at least one derived class
-    // where it has a different default value.
-    inputFileTransitionsEachEvent_(pset.getUntrackedParameter<bool>("inputFileTransitionsEachEvent", false)),
-    fakeInputFileTransition_(false) {
-      setTimestamp(Timestamp::beginOfTime());
+  RawInputSource::RawInputSource(ParameterSet const& pset, InputSourceDescription const& desc)
+      : InputSource(pset, desc),
+        // The default value for the following parameter get defined in at least one derived class
+        // where it has a different default value.
+        inputFileTransitionsEachEvent_(pset.getUntrackedParameter<bool>("inputFileTransitionsEachEvent", false)),
+        fakeInputFileTransition_(false) {
+    setTimestamp(Timestamp::beginOfTime());
   }
 
-  RawInputSource::~RawInputSource() {
-  }
+  RawInputSource::~RawInputSource() {}
 
-  std::shared_ptr<RunAuxiliary>
-  RawInputSource::readRunAuxiliary_() {
+  std::shared_ptr<RunAuxiliary> RawInputSource::readRunAuxiliary_() {
     assert(newRun());
     assert(runAuxiliary());
     resetNewRun();
     return runAuxiliary();
   }
 
-  std::shared_ptr<LuminosityBlockAuxiliary>
-  RawInputSource::readLuminosityBlockAuxiliary_() {
+  std::shared_ptr<LuminosityBlockAuxiliary> RawInputSource::readLuminosityBlockAuxiliary_() {
     assert(!newRun());
     assert(newLumi());
     assert(luminosityBlockAuxiliary());
@@ -41,8 +38,7 @@ namespace edm {
     return luminosityBlockAuxiliary();
   }
 
-  void
-  RawInputSource::readEvent_(EventPrincipal& eventPrincipal) {
+  void RawInputSource::readEvent_(EventPrincipal& eventPrincipal) {
     assert(!newRun());
     assert(!newLumi());
     assert(eventCached());
@@ -50,23 +46,21 @@ namespace edm {
     read(eventPrincipal);
   }
 
-  void
-  RawInputSource::makeEvent(EventPrincipal& eventPrincipal, EventAuxiliary const& eventAuxiliary) {
+  void RawInputSource::makeEvent(EventPrincipal& eventPrincipal, EventAuxiliary const& eventAuxiliary) {
     eventPrincipal.fillEventPrincipal(eventAuxiliary, processHistoryRegistry());
   }
 
-  InputSource::ItemType
-  RawInputSource::getNextItemType() {
-    if(state() == IsInvalid) {
+  InputSource::ItemType RawInputSource::getNextItemType() {
+    if (state() == IsInvalid) {
       return IsFile;
     }
-    if(newRun() && runAuxiliary()) {
+    if (newRun() && runAuxiliary()) {
       return IsRun;
     }
-    if(newLumi() && luminosityBlockAuxiliary()) {
+    if (newLumi() && luminosityBlockAuxiliary()) {
       return IsLumi;
     }
-    if(eventCached()) {
+    if (eventCached()) {
       return IsEvent;
     }
     if (inputFileTransitionsEachEvent_) {
@@ -78,43 +72,36 @@ namespace edm {
       resetLuminosityBlockAuxiliary(newLumi());
     }
     bool another = checkNextEvent();
-    if(!another || (!newLumi() && !eventCached())) {
+    if (!another || (!newLumi() && !eventCached())) {
       return IsStop;
-    } else if(inputFileTransitionsEachEvent_) {
+    } else if (inputFileTransitionsEachEvent_) {
       fakeInputFileTransition_ = true;
       return IsFile;
     }
-    if(newRun()) {
+    if (newRun()) {
       return IsRun;
-    } else if(newLumi()) {
+    } else if (newLumi()) {
       return IsLumi;
     }
     return IsEvent;
   }
 
-  void
-  RawInputSource::reset_() {
-    throw Exception(errors::LogicError)
-      << "RawInputSource::reset()\n"
-      << "Forking is not implemented for this type of RawInputSource\n"
-      << "Contact a Framework Developer\n";
+  void RawInputSource::reset_() {
+    throw Exception(errors::LogicError) << "RawInputSource::reset()\n"
+                                        << "Forking is not implemented for this type of RawInputSource\n"
+                                        << "Contact a Framework Developer\n";
   }
 
-  void
-  RawInputSource::rewind_() {
-    reset_();
-  }
+  void RawInputSource::rewind_() { reset_(); }
 
-  void
-  RawInputSource:: fillDescription(ParameterSetDescription& description) {
+  void RawInputSource::fillDescription(ParameterSetDescription& description) {
     // The default value for "inputFileTransitionsEachEvent" gets defined in the derived class
     // as it depends on the derived class. So, we cannot redefine it here.
     InputSource::fillDescription(description);
   }
 
-  void
-  RawInputSource::closeFile_() {
-    if(!fakeInputFileTransition_) {
+  void RawInputSource::closeFile_() {
+    if (!fakeInputFileTransition_) {
       genuineCloseFile();
     } else {
       // Do nothing because we returned a fake input file transition
@@ -126,4 +113,4 @@ namespace edm {
       fakeInputFileTransition_ = false;
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/Sources/src/RawInputSourceFromFiles.cc b/FWCore/Sources/src/RawInputSourceFromFiles.cc
index 17cd179a32e40..ef7735bb7ae88 100644
--- a/FWCore/Sources/src/RawInputSourceFromFiles.cc
+++ b/FWCore/Sources/src/RawInputSourceFromFiles.cc
@@ -3,17 +3,13 @@
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 namespace edm {
-  RawInputSourceFromFiles::RawInputSourceFromFiles(ParameterSet const& pset, InputSourceDescription const& desc) :
-    RawInputSource(pset, desc),
-    FromFiles(pset) {
-  }
+  RawInputSourceFromFiles::RawInputSourceFromFiles(ParameterSet const& pset, InputSourceDescription const& desc)
+      : RawInputSource(pset, desc), FromFiles(pset) {}
 
   RawInputSourceFromFiles::~RawInputSourceFromFiles() {}
 
-  void
-  RawInputSourceFromFiles::fillDescription(ParameterSetDescription & desc) {
+  void RawInputSourceFromFiles::fillDescription(ParameterSetDescription& desc) {
     RawInputSource::fillDescription(desc);
     FromFiles::fillDescription(desc);
   }
-}
-
+}  // namespace edm
diff --git a/FWCore/Sources/src/VectorInputSource.cc b/FWCore/Sources/src/VectorInputSource.cc
index 6bd869c285e60..b691b037d8a9c 100644
--- a/FWCore/Sources/src/VectorInputSource.cc
+++ b/FWCore/Sources/src/VectorInputSource.cc
@@ -9,40 +9,31 @@ namespace edm {
 
   struct VectorInputSourceDescription;
 
-  VectorInputSource::VectorInputSource(ParameterSet const& pset, VectorInputSourceDescription const& desc) : 
-      productRegistry_(desc.productRegistry_),
-      processHistoryRegistry_(new ProcessHistoryRegistry),
-      consecutiveRejectionsLimit_(pset.getUntrackedParameter<unsigned int>("consecutiveRejectionsLimit", 100)) {
-  }
+  VectorInputSource::VectorInputSource(ParameterSet const& pset, VectorInputSourceDescription const& desc)
+      : productRegistry_(desc.productRegistry_),
+        processHistoryRegistry_(new ProcessHistoryRegistry),
+        consecutiveRejectionsLimit_(pset.getUntrackedParameter<unsigned int>("consecutiveRejectionsLimit", 100)) {}
 
   VectorInputSource::~VectorInputSource() {}
 
-  void
-  VectorInputSource::dropUnwantedBranches(std::vector<std::string> const& wantedBranches) {
+  void VectorInputSource::dropUnwantedBranches(std::vector<std::string> const& wantedBranches) {
     this->dropUnwantedBranches_(wantedBranches);
   }
 
-  void
-  VectorInputSource::clearEventPrincipal(EventPrincipal& cache) {
-    cache.clearEventPrincipal();
-  }
+  void VectorInputSource::clearEventPrincipal(EventPrincipal& cache) { cache.clearEventPrincipal(); }
 
-  void
-  VectorInputSource::doBeginJob() {
-    this->beginJob();
-  }
+  void VectorInputSource::doBeginJob() { this->beginJob(); }
 
-  void
-  VectorInputSource::doEndJob() {
-    this->endJob();
-  }
+  void VectorInputSource::doEndJob() { this->endJob(); }
 
   void VectorInputSource::throwIfOverLimit(unsigned int consecutiveRejections) const {
-    if(consecutiveRejections >= consecutiveRejectionsLimit_) {
-      throw cms::Exception("LogicError") << "VectorInputSource::loopOverEvents() read " << consecutiveRejections << " consecutive pileup events that were rejected by the eventOperator. "
-                                         << "This is likely a sign of misconfiguration (of e.g. the adjusted-to pileup probability profile). "
-                                         << "If you know what you're doing, this exception can be turned off by setting consecutiveRejectionsLimit=0.";
+    if (consecutiveRejections >= consecutiveRejectionsLimit_) {
+      throw cms::Exception("LogicError")
+          << "VectorInputSource::loopOverEvents() read " << consecutiveRejections
+          << " consecutive pileup events that were rejected by the eventOperator. "
+          << "This is likely a sign of misconfiguration (of e.g. the adjusted-to pileup probability profile). "
+          << "If you know what you're doing, this exception can be turned off by setting consecutiveRejectionsLimit=0.";
     }
   }
 
-}
+}  // namespace edm
diff --git a/FWCore/Sources/src/VectorInputSourceFactory.cc b/FWCore/Sources/src/VectorInputSourceFactory.cc
index c20d0b3d0b238..739c81e342ce6 100644
--- a/FWCore/Sources/src/VectorInputSourceFactory.cc
+++ b/FWCore/Sources/src/VectorInputSourceFactory.cc
@@ -7,15 +7,13 @@
 
 #include <iostream>
 
-EDM_REGISTER_PLUGINFACTORY(edm::VectorInputSourcePluginFactory,"CMS EDM Framework VectorInputSource");
+EDM_REGISTER_PLUGINFACTORY(edm::VectorInputSourcePluginFactory, "CMS EDM Framework VectorInputSource");
 
 namespace edm {
 
-  VectorInputSourceFactory::~VectorInputSourceFactory() {
-  }
+  VectorInputSourceFactory::~VectorInputSourceFactory() {}
 
-  VectorInputSourceFactory::VectorInputSourceFactory() {
-  }
+  VectorInputSourceFactory::VectorInputSourceFactory() {}
 
   VectorInputSourceFactory const VectorInputSourceFactory::singleInstance_;
 
@@ -27,27 +25,23 @@ namespace edm {
     return &singleInstance_;
   }
 
-  std::unique_ptr<VectorInputSource>
-  VectorInputSourceFactory::makeVectorInputSource(ParameterSet const& conf,
-					VectorInputSourceDescription const& desc) const {
+  std::unique_ptr<VectorInputSource> VectorInputSourceFactory::makeVectorInputSource(
+      ParameterSet const& conf, VectorInputSourceDescription const& desc) const {
     std::string modtype = conf.getParameter<std::string>("@module_type");
     FDEBUG(1) << "VectorInputSourceFactory: module_type = " << modtype << std::endl;
-    std::unique_ptr<VectorInputSource> wm(VectorInputSourcePluginFactory::get()->create(modtype,conf,desc));
-
-    if(wm.get() == nullptr) {
-	throw edm::Exception(errors::Configuration,"NoSourceModule")
-	  << "VectorInputSource Factory:\n"
-	  << "Cannot find source type from ParameterSet: "
-	  << modtype << "\n"
-	  << "Perhaps your source type is misspelled or is not an EDM Plugin?\n"
-	  << "Try running EdmPluginDump to obtain a list of available Plugins.";
+    std::unique_ptr<VectorInputSource> wm(VectorInputSourcePluginFactory::get()->create(modtype, conf, desc));
+
+    if (wm.get() == nullptr) {
+      throw edm::Exception(errors::Configuration, "NoSourceModule")
+          << "VectorInputSource Factory:\n"
+          << "Cannot find source type from ParameterSet: " << modtype << "\n"
+          << "Perhaps your source type is misspelled or is not an EDM Plugin?\n"
+          << "Try running EdmPluginDump to obtain a list of available Plugins.";
     }
 
-    FDEBUG(1) << "VectorInputSourceFactory: created input source "
-	      << modtype
-	      << std::endl;
+    FDEBUG(1) << "VectorInputSourceFactory: created input source " << modtype << std::endl;
 
     return wm;
   }
 
-}
+}  // namespace edm
diff --git a/FWCore/TFWLiteSelector/interface/TFWLiteSelector.h b/FWCore/TFWLiteSelector/interface/TFWLiteSelector.h
index 8639c3552e8d4..3491915ef2de7 100644
--- a/FWCore/TFWLiteSelector/interface/TFWLiteSelector.h
+++ b/FWCore/TFWLiteSelector/interface/TFWLiteSelector.h
@@ -4,7 +4,7 @@
 //
 // Package:     TFWLiteSelector
 // Class  :     TFWLiteSelector
-// 
+//
 /**\class TFWLiteSelector TFWLiteSelector.h FWCore/TFWLiteSelector/interface/TFWLiteSelector.h
 
  Description: A 'safe' form of a TSelector which uses a Worker helper class to do the processing
@@ -54,37 +54,29 @@ class TList;
 
 // forward declarations
 template <class TWorker>
-class TFWLiteSelector : public TFWLiteSelectorBasic
-{
+class TFWLiteSelector : public TFWLiteSelectorBasic {
+public:
+  TFWLiteSelector() : worker_() {}
+  ~TFWLiteSelector() override {}
 
-   public:
-      TFWLiteSelector() : worker_() {}
-      ~TFWLiteSelector() override {}
+  // ---------- const member functions ---------------------
 
-      // ---------- const member functions ---------------------
+  // ---------- static member functions --------------------
 
-      // ---------- static member functions --------------------
+  // ---------- member functions ---------------------------
 
-      // ---------- member functions ---------------------------
+private:
+  TFWLiteSelector(const TFWLiteSelector&);  // stop default
 
-   private:
-      TFWLiteSelector(const TFWLiteSelector&); // stop default
+  const TFWLiteSelector& operator=(const TFWLiteSelector&);  // stop default
 
-      const TFWLiteSelector& operator=(const TFWLiteSelector&); // stop default
+  void preProcessing(const TList* in, TList& out) override { worker_ = std::make_shared<TWorker>(in, out); }
+  void process(const edm::Event& iEvent) override { worker_->process(iEvent); }
+  void postProcessing(TList& out) override { worker_->postProcess(out); }
 
-      void preProcessing(const TList*in, TList& out) override {
-        worker_ = std::make_shared<TWorker>(in,out);
-      }
-      void process(const edm::Event& iEvent) override {
-        worker_->process(iEvent);
-      }
-      void postProcessing(TList& out) override {
-        worker_->postProcess(out);
-      }
-      
-      // ---------- member data --------------------------------
-      edm::propagate_const<std::shared_ptr<TWorker>> worker_;
-      ClassDefOverride(TFWLiteSelector,2)
+  // ---------- member data --------------------------------
+  edm::propagate_const<std::shared_ptr<TWorker>> worker_;
+  ClassDefOverride(TFWLiteSelector, 2)
 };
 
 #endif
diff --git a/FWCore/TFWLiteSelector/interface/TFWLiteSelectorBasic.h b/FWCore/TFWLiteSelector/interface/TFWLiteSelectorBasic.h
index 8c0ac098b23c9..1a5f7cbb0bfd5 100644
--- a/FWCore/TFWLiteSelector/interface/TFWLiteSelectorBasic.h
+++ b/FWCore/TFWLiteSelector/interface/TFWLiteSelectorBasic.h
@@ -4,7 +4,7 @@
 //
 // Package:     TFWLiteSelector
 // Class  :     TFWLiteSelectorBasic
-// 
+//
 /**\class TFWLiteSelectorBasic TFWLiteSelectorBasic.h FWCore/FWLite/interface/TFWLiteSelectorBasic.h
 
  Description: A ROOT TSelector which accesses data using an edm::Event
@@ -33,75 +33,72 @@ class TTree;
 
 namespace edm {
   class Event;
-  
+
   namespace root {
     struct TFWLiteSelectorMembers;
   }
-}
+}  // namespace edm
 
-class TFWLiteSelectorBasic : public TSelector
-{
+class TFWLiteSelectorBasic : public TSelector {
+public:
+  TFWLiteSelectorBasic();
+  ~TFWLiteSelectorBasic() override;
 
-   public:
-      TFWLiteSelectorBasic();
-      ~TFWLiteSelectorBasic() override;
+  // ---------- const member functions ---------------------
 
-      // ---------- const member functions ---------------------
+  // ---------- static member functions --------------------
 
-      // ---------- static member functions --------------------
-
-      // ---------- member functions ---------------------------
-      /**Called each time the 'client' begins processing (remote 'slaves' do not see this message)
+  // ---------- member functions ---------------------------
+  /**Called each time the 'client' begins processing (remote 'slaves' do not see this message)
         \param in an assignable pointer to a list of objects you want passed to 'preProcessing'. This
          list is used to communicate with remote slaves. NOTE: you are responsible for deleting this TList
          and its content once you are done with it.
         */
-      virtual void begin(TList*& in) = 0;
-      
-      /**Called each time the 'slave' is about to start processing
+  virtual void begin(TList*& in) = 0;
+
+  /**Called each time the 'slave' is about to start processing
         \param in a pointer to the list of objects created in 'begin()'.  The pointer can be 0
         \param out a list of objects that are the result of processing (e.g. histograms).
         You should call 'Add()' for each object you want sent to the 'terminate' method.
         */
-      virtual void preProcessing(const TList* in, TList& out) = 0;
-      
-      /**Call each time the 'slave' gets a new Event
+  virtual void preProcessing(const TList* in, TList& out) = 0;
+
+  /**Call each time the 'slave' gets a new Event
         \param event a standard edm::Event which works just like it does in cmsRun
         */
-      virtual void process(const edm::Event& event) = 0;
-      
-      /**Called each time the 'slave' has seen all the events
+  virtual void process(const edm::Event& event) = 0;
+
+  /**Called each time the 'slave' has seen all the events
         \param out the list of objects that will be sent to 'terminate'.
         You can Add() additional objects to 'out' at this point as well.
         */
-      virtual void postProcessing(TList& out) =0;
-      
-      /**Called each time the 'client' has finished processing.
+  virtual void postProcessing(TList& out) = 0;
+
+  /**Called each time the 'client' has finished processing.
         \param out contains the accumulated output of all slaves.
         */
-      virtual void terminate(TList& out) = 0;
-      
-   private:
-      TFWLiteSelectorBasic(const TFWLiteSelectorBasic&); // stop default
-
-      const TFWLiteSelectorBasic& operator=(const TFWLiteSelectorBasic&); // stop default
-
-      void        Begin(TTree *) override ;
-      void        SlaveBegin(TTree *) override;
-      void        Init(TTree*) override;
-      Bool_t      Notify() override ;
-      Bool_t      Process(Long64_t /*entry*/) override ;
-      void        SlaveTerminate() override;
-      void        Terminate() override;
-      Int_t Version() const override { return 1; }
-      
-      void setupNewFile(TFile&);
-      // ---------- member data --------------------------------
-      edm::propagate_const<std::shared_ptr<edm::root::TFWLiteSelectorMembers>> m_;
-      bool everythingOK_;
-  
-  ClassDefOverride(TFWLiteSelectorBasic,2)
-};
+  virtual void terminate(TList& out) = 0;
+
+private:
+  TFWLiteSelectorBasic(const TFWLiteSelectorBasic&);  // stop default
+
+  const TFWLiteSelectorBasic& operator=(const TFWLiteSelectorBasic&);  // stop default
 
+  void Begin(TTree*) override;
+  void SlaveBegin(TTree*) override;
+  void Init(TTree*) override;
+  Bool_t Notify() override;
+  Bool_t Process(Long64_t /*entry*/) override;
+  void SlaveTerminate() override;
+  void Terminate() override;
+  Int_t Version() const override { return 1; }
+
+  void setupNewFile(TFile&);
+  // ---------- member data --------------------------------
+  edm::propagate_const<std::shared_ptr<edm::root::TFWLiteSelectorMembers>> m_;
+  bool everythingOK_;
+
+  ClassDefOverride(TFWLiteSelectorBasic, 2)
+};
 
 #endif
diff --git a/FWCore/TFWLiteSelector/src/TFWLiteSelectorBasic.cc b/FWCore/TFWLiteSelector/src/TFWLiteSelectorBasic.cc
index cde022d3bff45..9b993bdd7e372 100644
--- a/FWCore/TFWLiteSelector/src/TFWLiteSelectorBasic.cc
+++ b/FWCore/TFWLiteSelector/src/TFWLiteSelectorBasic.cc
@@ -23,7 +23,7 @@
 #include "DataFormats/Provenance/interface/ProductProvenanceRetriever.h"
 #include "DataFormats/Provenance/interface/BranchType.h"
 #include "DataFormats/Provenance/interface/EventAuxiliary.h"
-#include "DataFormats/Provenance/interface/EventEntryDescription.h" // kludge to allow compilation
+#include "DataFormats/Provenance/interface/EventEntryDescription.h"  // kludge to allow compilation
 #include "DataFormats/Provenance/interface/EventSelectionID.h"
 #include "DataFormats/Provenance/interface/FileFormatVersion.h"
 #include "DataFormats/Provenance/interface/LuminosityBlockAuxiliary.h"
@@ -63,12 +63,15 @@
 namespace edm {
   namespace root {
     class FWLiteDelayedReader : public DelayedReader {
-     public:
+    public:
       FWLiteDelayedReader() : entry_(-1), eventTree_(nullptr) {}
       void setEntry(Long64_t iEntry) { entry_ = iEntry; }
-      void setTree(TTree* iTree) {eventTree_ = iTree;}
-      void set(std::shared_ptr<std::unordered_map<unsigned int, BranchDescription const*>> iMap) { bidToDesc_ = std::move(iMap);}
-     private:
+      void setTree(TTree* iTree) { eventTree_ = iTree; }
+      void set(std::shared_ptr<std::unordered_map<unsigned int, BranchDescription const*>> iMap) {
+        bidToDesc_ = std::move(iMap);
+      }
+
+    private:
       std::unique_ptr<WrapperBase> getTheProduct(BranchID const& k) const;
       std::unique_ptr<WrapperBase> getProduct_(BranchID const& k, EDProductGetter const* ep) override;
       virtual std::unique_ptr<EventEntryDescription> getProvenance_(BranchKey const&) const {
@@ -76,11 +79,13 @@ namespace edm {
       }
       void mergeReaders_(DelayedReader*) override {}
       void reset_() override {}
-      
-      signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* preEventReadFromSourceSignal() const override {
+
+      signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* preEventReadFromSourceSignal()
+          const override {
         return nullptr;
       }
-      signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* postEventReadFromSourceSignal() const override {
+      signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* postEventReadFromSourceSignal()
+          const override {
         return nullptr;
       };
 
@@ -89,74 +94,68 @@ namespace edm {
       std::shared_ptr<std::unordered_map<unsigned int, BranchDescription const*>> bidToDesc_;
     };
 
-    std::unique_ptr<WrapperBase>
-    FWLiteDelayedReader::getProduct_(BranchID const& k, EDProductGetter const* /*ep*/) {
+    std::unique_ptr<WrapperBase> FWLiteDelayedReader::getProduct_(BranchID const& k, EDProductGetter const* /*ep*/) {
       return getTheProduct(k);
     }
 
-    std::unique_ptr<WrapperBase>
-    FWLiteDelayedReader::getTheProduct(BranchID const& k) const {
-      auto itFind= bidToDesc_->find(k.id());
-      if(itFind == bidToDesc_->end()) {
+    std::unique_ptr<WrapperBase> FWLiteDelayedReader::getTheProduct(BranchID const& k) const {
+      auto itFind = bidToDesc_->find(k.id());
+      if (itFind == bidToDesc_->end()) {
         throw Exception(errors::ProductNotFound) << "could not find entry for product " << k;
       }
       BranchDescription const& bDesc = *(itFind->second);
 
-      TBranch* branch= eventTree_->GetBranch(bDesc.branchName().c_str());
-      if(nullptr == branch) {
-        throw cms::Exception("MissingBranch")
-        << "could not find branch named '" << bDesc.branchName() << "'"
-        << "\n Perhaps the data being requested was not saved in this file?";
+      TBranch* branch = eventTree_->GetBranch(bDesc.branchName().c_str());
+      if (nullptr == branch) {
+        throw cms::Exception("MissingBranch") << "could not find branch named '" << bDesc.branchName() << "'"
+                                              << "\n Perhaps the data being requested was not saved in this file?";
       }
       //find the class type
       std::string const fullName = wrappedClassName(bDesc.className());
       TypeWithDict classType = TypeWithDict::byName(fullName);
-      if(!bool(classType)) {
-        throw cms::Exception("MissingDictionary")
-        << "could not find dictionary for type '" << fullName << "'"
-        << "\n Please make sure all the necessary libraries are available.";
+      if (!bool(classType)) {
+        throw cms::Exception("MissingDictionary") << "could not find dictionary for type '" << fullName << "'"
+                                                  << "\n Please make sure all the necessary libraries are available.";
       }
 
       //create an instance of it
       ObjectWithDict wrapperObj = classType.construct();
-      if(nullptr == wrapperObj.address()) {
+      if (nullptr == wrapperObj.address()) {
         throw cms::Exception("FailedToCreate") << "could not create an instance of '" << fullName << "'";
       }
       void* address = wrapperObj.address();
       branch->SetAddress(&address);
       ObjectWithDict edProdObj = wrapperObj.castObject(TypeWithDict::byName("edm::WrapperBase"));
 
-      WrapperBase* prod = reinterpret_cast<WrapperBase*>(edProdObj.address()); 	 
-	  	 
-      if(nullptr == prod) { 	 
-        throw cms::Exception("FailedConversion") 	 
-          << "failed to convert a '" << fullName 	 
-          << "' to a edm::WrapperBase." 	 
-          << "Please contact developers since something is very wrong."; 	 
+      WrapperBase* prod = reinterpret_cast<WrapperBase*>(edProdObj.address());
+
+      if (nullptr == prod) {
+        throw cms::Exception("FailedConversion") << "failed to convert a '" << fullName << "' to a edm::WrapperBase."
+                                                 << "Please contact developers since something is very wrong.";
       }
       branch->GetEntry(entry_);
       return std::unique_ptr<WrapperBase>(prod);
     }
 
     struct TFWLiteSelectorMembers {
-      TFWLiteSelectorMembers() :
-      tree_(nullptr),
-      reg_(new ProductRegistry()),
-      bidToDesc_(std::make_shared<std::unordered_map<unsigned int, BranchDescription const*>>()),
-      phreg_(new ProcessHistoryRegistry()),
-      branchIDListHelper_(new BranchIDListHelper()),
-      // Note that thinned collections are not supported yet, the next
-      // line just makes it compile but when the Ref or Ptr tries to
-      // find the thinned collection it will report them not found.
-      // More work needed here if this is needed (we think no one
-      // is using TFWLiteSelector anymore and intend to implement
-      // this properly if it turns out we are wrong)
-      thinnedAssociationsHelper_(new ThinnedAssociationsHelper()),
-      processNames_(),
-      reader_(new FWLiteDelayedReader),
-      prov_(),
-      pointerToBranchBuffer_(),
-      provRetriever_(new edm::ProductProvenanceRetriever(0)) {
+      TFWLiteSelectorMembers()
+          : tree_(nullptr),
+            reg_(new ProductRegistry()),
+            bidToDesc_(std::make_shared<std::unordered_map<unsigned int, BranchDescription const*>>()),
+            phreg_(new ProcessHistoryRegistry()),
+            branchIDListHelper_(new BranchIDListHelper()),
+            // Note that thinned collections are not supported yet, the next
+            // line just makes it compile but when the Ref or Ptr tries to
+            // find the thinned collection it will report them not found.
+            // More work needed here if this is needed (we think no one
+            // is using TFWLiteSelector anymore and intend to implement
+            // this properly if it turns out we are wrong)
+            thinnedAssociationsHelper_(new ThinnedAssociationsHelper()),
+            processNames_(),
+            reader_(new FWLiteDelayedReader),
+            prov_(),
+            pointerToBranchBuffer_(),
+            provRetriever_(new edm::ProductProvenanceRetriever(0)) {
         reader_->set(get_underlying_safe(bidToDesc_));
       }
       void setTree(TTree* iTree) {
@@ -164,18 +163,25 @@ namespace edm {
         reader_->setTree(iTree);
       }
 
-      TTree const* tree() const {return get_underlying_safe(tree_);}
-      TTree*& tree() {return get_underlying_safe(tree_);}
-      std::shared_ptr<ProductRegistry const> reg() const {return get_underlying_safe(reg_);}
-      std::shared_ptr<ProductRegistry>& reg() {return get_underlying_safe(reg_);}
-      std::shared_ptr<BranchIDListHelper const> branchIDListHelper() const {return get_underlying_safe(branchIDListHelper_);}
-      std::shared_ptr<BranchIDListHelper>& branchIDListHelper() {return get_underlying_safe(branchIDListHelper_);}
-      std::shared_ptr<ThinnedAssociationsHelper const> thinnedAssociationsHelper() const {return get_underlying_safe(thinnedAssociationsHelper_);}
-      std::shared_ptr<ThinnedAssociationsHelper>& thinnedAssociationsHelper() {return get_underlying_safe(thinnedAssociationsHelper_);}
+      TTree const* tree() const { return get_underlying_safe(tree_); }
+      TTree*& tree() { return get_underlying_safe(tree_); }
+      std::shared_ptr<ProductRegistry const> reg() const { return get_underlying_safe(reg_); }
+      std::shared_ptr<ProductRegistry>& reg() { return get_underlying_safe(reg_); }
+      std::shared_ptr<BranchIDListHelper const> branchIDListHelper() const {
+        return get_underlying_safe(branchIDListHelper_);
+      }
+      std::shared_ptr<BranchIDListHelper>& branchIDListHelper() { return get_underlying_safe(branchIDListHelper_); }
+      std::shared_ptr<ThinnedAssociationsHelper const> thinnedAssociationsHelper() const {
+        return get_underlying_safe(thinnedAssociationsHelper_);
+      }
+      std::shared_ptr<ThinnedAssociationsHelper>& thinnedAssociationsHelper() {
+        return get_underlying_safe(thinnedAssociationsHelper_);
+      }
 
       edm::propagate_const<TTree*> tree_;
       edm::propagate_const<std::shared_ptr<ProductRegistry>> reg_;
-      edm::propagate_const<std::shared_ptr<std::unordered_map<unsigned int, BranchDescription const*>>> bidToDesc_;      edm::propagate_const<std::shared_ptr<ProcessHistoryRegistry>> phreg_;
+      edm::propagate_const<std::shared_ptr<std::unordered_map<unsigned int, BranchDescription const*>>> bidToDesc_;
+      edm::propagate_const<std::shared_ptr<ProcessHistoryRegistry>> phreg_;
       edm::propagate_const<std::shared_ptr<BranchIDListHelper>> branchIDListHelper_;
       edm::propagate_const<std::shared_ptr<ThinnedAssociationsHelper>> thinnedAssociationsHelper_;
       ProcessHistory processNames_;
@@ -189,9 +195,8 @@ namespace edm {
       edm::propagate_const<std::shared_ptr<edm::EventPrincipal>> ep_;
       edm::ModuleDescription md_;
     };
-  }
-}
-
+  }  // namespace root
+}  // namespace edm
 
 //
 // constants, enums and typedefs
@@ -204,17 +209,14 @@ namespace edm {
 //
 // constructors and destructor
 //
-TFWLiteSelectorBasic::TFWLiteSelectorBasic() : m_(new edm::root::TFWLiteSelectorMembers),
-                                     everythingOK_(false) {
-}
+TFWLiteSelectorBasic::TFWLiteSelectorBasic() : m_(new edm::root::TFWLiteSelectorMembers), everythingOK_(false) {}
 
 // TFWLiteSelectorBasic::TFWLiteSelectorBasic(TFWLiteSelectorBasic const& rhs)
 // {
 //    // do actual copying here;
 // }
 
-TFWLiteSelectorBasic::~TFWLiteSelectorBasic() {
-}
+TFWLiteSelectorBasic::~TFWLiteSelectorBasic() {}
 
 //
 // assignment operators
@@ -231,249 +233,232 @@ TFWLiteSelectorBasic::~TFWLiteSelectorBasic() {
 //
 // member functions
 //
-void
-TFWLiteSelectorBasic::Begin(TTree * iTree) {
+void TFWLiteSelectorBasic::Begin(TTree* iTree) {
   Init(iTree);
   begin(fInput);
 }
 
-void
-TFWLiteSelectorBasic::SlaveBegin(TTree *iTree) {
+void TFWLiteSelectorBasic::SlaveBegin(TTree* iTree) {
   Init(iTree);
   preProcessing(fInput, *fOutput);
 }
 
-void
-TFWLiteSelectorBasic::Init(TTree *iTree) {
-  if(iTree == nullptr) return;
+void TFWLiteSelectorBasic::Init(TTree* iTree) {
+  if (iTree == nullptr)
+    return;
   m_->setTree(iTree);
 }
 
-
-Bool_t
-TFWLiteSelectorBasic::Notify() {
+Bool_t TFWLiteSelectorBasic::Notify() {
   //std::cout << "Notify start" << std::endl;
   //we have switched to a new file
   //get new file from Tree
-  if(nullptr == m_->tree_) {
+  if (nullptr == m_->tree_) {
     std::cout << "No tree" << std::endl;
     return kFALSE;
   }
   TFile* file = m_->tree_->GetCurrentFile();
-  if(nullptr == file) {
-     //When in Rome, do as the Romans
-     TChain* chain = dynamic_cast<TChain*>(m_->tree());
-     if(nullptr == chain) {
-        std::cout << "No file" << std::endl;
-        return kFALSE;
-     }
-     file = chain->GetFile();
-     if(nullptr == file) {
-        std::cout << "No file" << std::endl;
-        return kFALSE;
-     }
+  if (nullptr == file) {
+    //When in Rome, do as the Romans
+    TChain* chain = dynamic_cast<TChain*>(m_->tree());
+    if (nullptr == chain) {
+      std::cout << "No file" << std::endl;
+      return kFALSE;
+    }
+    file = chain->GetFile();
+    if (nullptr == file) {
+      std::cout << "No file" << std::endl;
+      return kFALSE;
+    }
   }
   setupNewFile(*file);
-  return everythingOK_ ? kTRUE: kFALSE;
+  return everythingOK_ ? kTRUE : kFALSE;
 }
 
-namespace  {
-   struct Operate {
-      Operate(edm::EDProductGetter const* iGetter): old_(setRefCoreStreamer(iGetter)) {
-      }
+namespace {
+  struct Operate {
+    Operate(edm::EDProductGetter const* iGetter) : old_(setRefCoreStreamer(iGetter)) {}
 
-      ~Operate() {setRefCoreStreamer(old_);}
-   private:
-      edm::EDProductGetter const* old_;
-   };
-}
+    ~Operate() { setRefCoreStreamer(old_); }
 
-Bool_t
-TFWLiteSelectorBasic::Process(Long64_t iEntry) {
-   //std::cout << "Process start" << std::endl;
-   if(everythingOK_) {
-      std::unique_ptr<edm::EventAuxiliary> eaux = std::make_unique<edm::EventAuxiliary>();
-      edm::EventAuxiliary& aux = *eaux;
-      edm::EventAuxiliary* pAux= eaux.get();
-      TBranch* branch = m_->tree_->GetBranch(edm::BranchTypeToAuxiliaryBranchName(edm::InEvent).c_str());
-
-      branch->SetAddress(&pAux);
-      branch->GetEntry(iEntry);
-
-//NEW      m_->processNames_ = aux.processHistory();
-
-//      std::cout << "ProcessNames\n";
-//      for(auto const& name : m_->processNames_) {
-//         std::cout << "  " << name << std::endl;
-//     }
-
-      edm::EventSelectionIDVector eventSelectionIDs;
-      edm::EventSelectionIDVector* pEventSelectionIDVector = &eventSelectionIDs;
-      TBranch* eventSelectionsBranch = m_->tree_->GetBranch(edm::poolNames::eventSelectionsBranchName().c_str());
-      if(!eventSelectionsBranch) {
-        throw edm::Exception(edm::errors::FatalRootError)
-            << "Failed to find event Selections branch in event tree";
-      }
-      eventSelectionsBranch->SetAddress(&pEventSelectionIDVector);
-      eventSelectionsBranch->GetEntry(iEntry);
-
-      edm::BranchListIndexes branchListIndexes;
-      edm::BranchListIndexes* pBranchListIndexes = &branchListIndexes;
-      TBranch* branchListIndexBranch = m_->tree_->GetBranch(edm::poolNames::branchListIndexesBranchName().c_str());
-      if(!branchListIndexBranch) {
-        throw edm::Exception(edm::errors::FatalRootError)
-            << "Failed to find branch list index branch in event tree";
-      }
-      branchListIndexBranch->SetAddress(&pBranchListIndexes);
-      branchListIndexBranch->GetEntry(iEntry);
-      m_->branchIDListHelper_->fixBranchListIndexes(branchListIndexes);
-
-      try {
-         m_->reader_->setEntry(iEntry);
-         auto runAux = std::make_shared<edm::RunAuxiliary>(aux.run(), aux.time(), aux.time());
-         auto rp = std::make_shared<edm::RunPrincipal>(runAux, m_->reg(), m_->pc_, nullptr, 0);
-         auto lbp = std::make_shared<edm::LuminosityBlockPrincipal>(m_->reg(), m_->pc_, nullptr, 0);
-        lbp->setAux(edm::LuminosityBlockAuxiliary(rp->run(), 1, aux.time(), aux.time()));
-        m_->ep_->fillEventPrincipal(*eaux,
-                                    *m_->phreg_,
-                                    std::move(eventSelectionIDs),
-                                    std::move(branchListIndexes),
-                                    *(m_->provRetriever_),
-                                    m_->reader_.get());
-         lbp->setRunPrincipal(rp);
-         m_->ep_->setLuminosityBlockPrincipal(lbp.get());
-         m_->processNames_ = m_->ep_->processHistory();
-
-         edm::Event event(*m_->ep_, m_->md_, nullptr);
-
-         //Make the event principal accessible to edm::Ref's
-         Operate sentry(m_->ep_->prodGetter());
-         process(event);
-      } catch(std::exception const& iEx) {
-         std::cout << "While processing entry " << iEntry << " the following exception was caught \n"
-                   << iEx.what() << std::endl;
-      } catch(...) {
-         std::cout << "While processing entry " << iEntry << " an unknown exception was caught" << std::endl;
-      }
+  private:
+    edm::EDProductGetter const* old_;
+  };
+}  // namespace
+
+Bool_t TFWLiteSelectorBasic::Process(Long64_t iEntry) {
+  //std::cout << "Process start" << std::endl;
+  if (everythingOK_) {
+    std::unique_ptr<edm::EventAuxiliary> eaux = std::make_unique<edm::EventAuxiliary>();
+    edm::EventAuxiliary& aux = *eaux;
+    edm::EventAuxiliary* pAux = eaux.get();
+    TBranch* branch = m_->tree_->GetBranch(edm::BranchTypeToAuxiliaryBranchName(edm::InEvent).c_str());
+
+    branch->SetAddress(&pAux);
+    branch->GetEntry(iEntry);
+
+    //NEW      m_->processNames_ = aux.processHistory();
+
+    //      std::cout << "ProcessNames\n";
+    //      for(auto const& name : m_->processNames_) {
+    //         std::cout << "  " << name << std::endl;
+    //     }
+
+    edm::EventSelectionIDVector eventSelectionIDs;
+    edm::EventSelectionIDVector* pEventSelectionIDVector = &eventSelectionIDs;
+    TBranch* eventSelectionsBranch = m_->tree_->GetBranch(edm::poolNames::eventSelectionsBranchName().c_str());
+    if (!eventSelectionsBranch) {
+      throw edm::Exception(edm::errors::FatalRootError) << "Failed to find event Selections branch in event tree";
+    }
+    eventSelectionsBranch->SetAddress(&pEventSelectionIDVector);
+    eventSelectionsBranch->GetEntry(iEntry);
+
+    edm::BranchListIndexes branchListIndexes;
+    edm::BranchListIndexes* pBranchListIndexes = &branchListIndexes;
+    TBranch* branchListIndexBranch = m_->tree_->GetBranch(edm::poolNames::branchListIndexesBranchName().c_str());
+    if (!branchListIndexBranch) {
+      throw edm::Exception(edm::errors::FatalRootError) << "Failed to find branch list index branch in event tree";
+    }
+    branchListIndexBranch->SetAddress(&pBranchListIndexes);
+    branchListIndexBranch->GetEntry(iEntry);
+    m_->branchIDListHelper_->fixBranchListIndexes(branchListIndexes);
+
+    try {
+      m_->reader_->setEntry(iEntry);
+      auto runAux = std::make_shared<edm::RunAuxiliary>(aux.run(), aux.time(), aux.time());
+      auto rp = std::make_shared<edm::RunPrincipal>(runAux, m_->reg(), m_->pc_, nullptr, 0);
+      auto lbp = std::make_shared<edm::LuminosityBlockPrincipal>(m_->reg(), m_->pc_, nullptr, 0);
+      lbp->setAux(edm::LuminosityBlockAuxiliary(rp->run(), 1, aux.time(), aux.time()));
+      m_->ep_->fillEventPrincipal(*eaux,
+                                  *m_->phreg_,
+                                  std::move(eventSelectionIDs),
+                                  std::move(branchListIndexes),
+                                  *(m_->provRetriever_),
+                                  m_->reader_.get());
+      lbp->setRunPrincipal(rp);
+      m_->ep_->setLuminosityBlockPrincipal(lbp.get());
+      m_->processNames_ = m_->ep_->processHistory();
+
+      edm::Event event(*m_->ep_, m_->md_, nullptr);
+
+      //Make the event principal accessible to edm::Ref's
+      Operate sentry(m_->ep_->prodGetter());
+      process(event);
+    } catch (std::exception const& iEx) {
+      std::cout << "While processing entry " << iEntry << " the following exception was caught \n"
+                << iEx.what() << std::endl;
+    } catch (...) {
+      std::cout << "While processing entry " << iEntry << " an unknown exception was caught" << std::endl;
+    }
   }
-  return everythingOK_ ? kTRUE: kFALSE;
+  return everythingOK_ ? kTRUE : kFALSE;
 }
 
-void
-TFWLiteSelectorBasic::SlaveTerminate() {
-  postProcessing(*fOutput);
-}
+void TFWLiteSelectorBasic::SlaveTerminate() { postProcessing(*fOutput); }
 
-void
-TFWLiteSelectorBasic::Terminate() {
-  terminate(*fOutput);
-}
+void TFWLiteSelectorBasic::Terminate() { terminate(*fOutput); }
 
-void
-TFWLiteSelectorBasic::setupNewFile(TFile& iFile) {
+void TFWLiteSelectorBasic::setupNewFile(TFile& iFile) {
   //look up meta-data
   //get product registry
 
   //std::vector<edm::EventProcessHistoryID> eventProcessHistoryIDs_;
   TTree* metaDataTree = dynamic_cast<TTree*>(iFile.Get(edm::poolNames::metaDataTreeName().c_str()));
-  if(!metaDataTree) {
+  if (!metaDataTree) {
     std::cout << "could not find TTree " << edm::poolNames::metaDataTreeName() << std::endl;
     everythingOK_ = false;
     return;
   }
   edm::FileFormatVersion* fftPtr = &(m_->fileFormatVersion_);
-  if(metaDataTree->FindBranch(edm::poolNames::fileFormatVersionBranchName().c_str()) != nullptr) {
+  if (metaDataTree->FindBranch(edm::poolNames::fileFormatVersionBranchName().c_str()) != nullptr) {
     metaDataTree->SetBranchAddress(edm::poolNames::fileFormatVersionBranchName().c_str(), &fftPtr);
-    }
-
+  }
 
   edm::ProductRegistry* pReg = &(*m_->reg_);
   metaDataTree->SetBranchAddress(edm::poolNames::productDescriptionBranchName().c_str(), &(pReg));
 
   typedef std::map<edm::ParameterSetID, edm::ParameterSetBlob> PsetMap;
   PsetMap psetMap;
-  PsetMap *psetMapPtr = &psetMap;
-  if(metaDataTree->FindBranch(edm::poolNames::parameterSetMapBranchName().c_str()) != nullptr) {
+  PsetMap* psetMapPtr = &psetMap;
+  if (metaDataTree->FindBranch(edm::poolNames::parameterSetMapBranchName().c_str()) != nullptr) {
     metaDataTree->SetBranchAddress(edm::poolNames::parameterSetMapBranchName().c_str(), &psetMapPtr);
   } else {
-    TTree* psetTree = dynamic_cast<TTree *>(iFile.Get(edm::poolNames::parameterSetsTreeName().c_str()));
-    if(nullptr == psetTree) {
-      throw edm::Exception(edm::errors::FileReadError) << "Could not find tree " << edm::poolNames::parameterSetsTreeName()
-      << " in the input file.\n";
+    TTree* psetTree = dynamic_cast<TTree*>(iFile.Get(edm::poolNames::parameterSetsTreeName().c_str()));
+    if (nullptr == psetTree) {
+      throw edm::Exception(edm::errors::FileReadError)
+          << "Could not find tree " << edm::poolNames::parameterSetsTreeName() << " in the input file.\n";
     }
     typedef std::pair<edm::ParameterSetID, edm::ParameterSetBlob> IdToBlobs;
     IdToBlobs idToBlob;
     IdToBlobs* pIdToBlob = &idToBlob;
     psetTree->SetBranchAddress(edm::poolNames::idToParameterSetBlobsBranchName().c_str(), &pIdToBlob);
-    for(long long i = 0; i != psetTree->GetEntries(); ++i) {
+    for (long long i = 0; i != psetTree->GetEntries(); ++i) {
       psetTree->GetEntry(i);
       psetMap.insert(idToBlob);
     }
   }
 
   edm::ProcessHistoryRegistry::vector_type pHistVector;
-  edm::ProcessHistoryRegistry::vector_type *pHistVectorPtr = &pHistVector;
-  if(metaDataTree->FindBranch(edm::poolNames::processHistoryBranchName().c_str()) != nullptr) {
-     metaDataTree->SetBranchAddress(edm::poolNames::processHistoryBranchName().c_str(), &pHistVectorPtr);
+  edm::ProcessHistoryRegistry::vector_type* pHistVectorPtr = &pHistVector;
+  if (metaDataTree->FindBranch(edm::poolNames::processHistoryBranchName().c_str()) != nullptr) {
+    metaDataTree->SetBranchAddress(edm::poolNames::processHistoryBranchName().c_str(), &pHistVectorPtr);
   }
 
-
   edm::ProcessConfigurationVector procConfigVector;
   edm::ProcessConfigurationVector* procConfigVectorPtr = &procConfigVector;
-  if(metaDataTree->FindBranch(edm::poolNames::processConfigurationBranchName().c_str()) != nullptr) {
-     metaDataTree->SetBranchAddress(edm::poolNames::processConfigurationBranchName().c_str(), &procConfigVectorPtr);
+  if (metaDataTree->FindBranch(edm::poolNames::processConfigurationBranchName().c_str()) != nullptr) {
+    metaDataTree->SetBranchAddress(edm::poolNames::processConfigurationBranchName().c_str(), &procConfigVectorPtr);
   }
 
   auto branchIDListsHelper = std::make_shared<edm::BranchIDListHelper>();
   edm::BranchIDLists const* branchIDListsPtr = &branchIDListsHelper->branchIDLists();
-  if(metaDataTree->FindBranch(edm::poolNames::branchIDListBranchName().c_str()) != nullptr) {
+  if (metaDataTree->FindBranch(edm::poolNames::branchIDListBranchName().c_str()) != nullptr) {
     metaDataTree->SetBranchAddress(edm::poolNames::branchIDListBranchName().c_str(), &branchIDListsPtr);
   }
 
   metaDataTree->GetEntry(0);
 
-  for(auto& prod : m_->reg_->productListUpdator()) {
+  for (auto& prod : m_->reg_->productListUpdator()) {
     prod.second.init();
     setIsMergeable(prod.second);
   }
 
   // Merge into the registries. For now, we do NOT merge the product registry.
   edm::pset::Registry& psetRegistry = *edm::pset::Registry::instance();
-  for(auto const& entry : psetMap) {
+  for (auto const& entry : psetMap) {
     edm::ParameterSet pset(entry.second.pset());
     pset.setID(entry.first);
     psetRegistry.insertMapped(pset);
   }
 
-  for(auto const& ph : pHistVector) {
-     m_->phreg_->registerProcessHistory(ph);
+  for (auto const& ph : pHistVector) {
+    m_->phreg_->registerProcessHistory(ph);
   }
 
-  m_->pointerToBranchBuffer_.erase(m_->pointerToBranchBuffer_.begin(),
-                                   m_->pointerToBranchBuffer_.end());
+  m_->pointerToBranchBuffer_.erase(m_->pointerToBranchBuffer_.begin(), m_->pointerToBranchBuffer_.end());
 
   std::unique_ptr<edm::ProductRegistry> newReg = std::make_unique<edm::ProductRegistry>();
 
   edm::ProductRegistry::ProductList& prodList = m_->reg_->productListUpdator();
   {
-     for(auto& item : prodList) {
-         edm::BranchDescription& prod = item.second;
-         //std::cout << "productname = " << item.second << " end " << std::endl;
-         std::string newFriendlyName = edm::friendlyname::friendlyName(prod.className());
-         if(newFriendlyName == prod.friendlyClassName()) {
-           newReg->copyProduct(prod);
-         } else {
-           if(m_->fileFormatVersion_.splitProductIDs()) {
-             throw edm::Exception(edm::errors::UnimplementedFeature)
-               << "Cannot change friendly class name algorithm without more development work\n"
-               << "to update BranchIDLists.  Contact the framework group.\n";
-           }
-           edm::BranchDescription newBD(prod);
-           newBD.updateFriendlyClassName();
-           newReg->copyProduct(newBD);
-         }
-         prod.init();
-       }
+    for (auto& item : prodList) {
+      edm::BranchDescription& prod = item.second;
+      //std::cout << "productname = " << item.second << " end " << std::endl;
+      std::string newFriendlyName = edm::friendlyname::friendlyName(prod.className());
+      if (newFriendlyName == prod.friendlyClassName()) {
+        newReg->copyProduct(prod);
+      } else {
+        if (m_->fileFormatVersion_.splitProductIDs()) {
+          throw edm::Exception(edm::errors::UnimplementedFeature)
+              << "Cannot change friendly class name algorithm without more development work\n"
+              << "to update BranchIDLists.  Contact the framework group.\n";
+        }
+        edm::BranchDescription newBD(prod);
+        newBD.updateFriendlyClassName();
+        newReg->copyProduct(newBD);
+      }
+      prod.init();
+    }
 
     m_->reg().reset(newReg.release());
   }
@@ -483,12 +468,12 @@ TFWLiteSelectorBasic::setupNewFile(TFile& iFile) {
   m_->prov_.swap(temp);
   m_->pointerToBranchBuffer_.reserve(prodList2.size());
 
-  for(auto& item : prodList2) {
+  for (auto& item : prodList2) {
     edm::BranchDescription& prod = item.second;
-    if(prod.branchType() == edm::InEvent) {
+    if (prod.branchType() == edm::InEvent) {
       prod.init();
       //NEED to do this and check to see if branch exists
-      if(m_->tree_->GetBranch(prod.branchName().c_str()) == nullptr) {
+      if (m_->tree_->GetBranch(prod.branchName().c_str()) == nullptr) {
         prod.setDropped(true);
       }
 
@@ -503,10 +488,11 @@ TFWLiteSelectorBasic::setupNewFile(TFile& iFile) {
   m_->branchIDListHelper_->updateFromInput(*branchIDListsPtr);
   m_->reg_->setFrozen();
   m_->bidToDesc_->clear();
-  for(auto const&p: m_->reg_->productList()) {
-    m_->bidToDesc_->emplace(p.second.branchID().id(),&p.second);
+  for (auto const& p : m_->reg_->productList()) {
+    m_->bidToDesc_->emplace(p.second.branchID().id(), &p.second);
   }
-  m_->ep_ = std::make_shared<edm::EventPrincipal>(m_->reg(), m_->branchIDListHelper(), m_->thinnedAssociationsHelper(), m_->pc_, nullptr);
+  m_->ep_ = std::make_shared<edm::EventPrincipal>(
+      m_->reg(), m_->branchIDListHelper(), m_->thinnedAssociationsHelper(), m_->pc_, nullptr);
   everythingOK_ = true;
 }
 
diff --git a/FWCore/TFWLiteSelectorTest/src/ThingsTSelector.cc b/FWCore/TFWLiteSelectorTest/src/ThingsTSelector.cc
index 98bf527e6fc32..6441372c631d1 100644
--- a/FWCore/TFWLiteSelectorTest/src/ThingsTSelector.cc
+++ b/FWCore/TFWLiteSelectorTest/src/ThingsTSelector.cc
@@ -11,29 +11,27 @@ using namespace tfwliteselectortest;
 
 static const char* kA = "a";
 static const char* kRefA = "refA";
-void ThingsTSelector::begin(TList*&)
-{
-}
+void ThingsTSelector::begin(TList*&) {}
 
-void ThingsTSelector::preProcessing(const TList*, TList& out ) {
-  if(nullptr != h_a) {
-     out.Remove(h_a);
-     delete h_a.get();
-     h_a = nullptr;
+void ThingsTSelector::preProcessing(const TList*, TList& out) {
+  if (nullptr != h_a) {
+    out.Remove(h_a);
+    delete h_a.get();
+    h_a = nullptr;
   }
-  h_a  = new TH1F( kA , "a"  , 100,  0, 20 );
+  h_a = new TH1F(kA, "a", 100, 0, 20);
   out.Add(h_a);
 
-  if(nullptr != h_refA) {
-     out.Remove(h_refA);
-     delete h_refA.get();
-     h_refA = nullptr;
+  if (nullptr != h_refA) {
+    out.Remove(h_refA);
+    delete h_refA.get();
+    h_refA = nullptr;
   }
-  h_refA  = new TH1F( kRefA , "refA"  , 100,  0, 20 );
+  h_refA = new TH1F(kRefA, "refA", 100, 0, 20);
   out.Add(h_refA);
 }
 
-void ThingsTSelector::process( const edm::Event& iEvent ) {
+void ThingsTSelector::process(const edm::Event& iEvent) {
   std::cout << "processing event " << std::endl;
   //  chain->GetEntry( entry );
   using namespace edmtest;
@@ -43,19 +41,19 @@ void ThingsTSelector::process( const edm::Event& iEvent ) {
     iEvent.getByLabel("OtherThing", "testUserTag", hOThings);
     std::cout << ">> other things found:" << hOThings->size() << std::endl;
 
-    for ( size_t i = 0; i < hOThings->size(); ++i ) {
-      const OtherThing & thing = (*hOThings)[ i ];
-      h_refA ->Fill( thing.ref->a );
+    for (size_t i = 0; i < hOThings->size(); ++i) {
+      const OtherThing& thing = (*hOThings)[i];
+      h_refA->Fill(thing.ref->a);
       std::cout << ">> ref->a:  " << thing.ref->a << std::endl;
     }
 
     edm::Handle<ThingCollection> hThings;
-    iEvent.getByLabel("Thing",hThings);
+    iEvent.getByLabel("Thing", hThings);
     const ThingCollection& things = *hThings;
     std::cout << ">> things found:" << things.size() << std::endl;
-    for ( size_t i = 0; i < things.size(); ++i ) {
-      const Thing & thing = things[ i ];
-      h_a ->Fill( thing.a );
+    for (size_t i = 0; i < things.size(); ++i) {
+      const Thing& thing = things[i];
+      h_a->Fill(thing.a);
       std::cout << ">> a:  " << thing.a << std::endl;
     }
   } catch (cms::Exception& x) {
@@ -70,33 +68,30 @@ void ThingsTSelector::process( const edm::Event& iEvent ) {
     std::cout << std::endl << "Failed with unknown exception" << std::endl;
     abort();
   }
-
 }
 
-void ThingsTSelector::postProcessing(TList&)
-{
-}
+void ThingsTSelector::postProcessing(TList&) {}
 
 void ThingsTSelector::terminate(TList& out) {
   std::cout << "terminate" << std::endl;
-  TCanvas * canvas = new TCanvas( );
+  TCanvas* canvas = new TCanvas();
   {
-     TObject* hist = out.FindObject(kA);
-     if(nullptr != hist) {
-	hist->Draw();
-	canvas->SaveAs( "a.jpg" );
-     } else {
-	std::cout <<"no '"<<kA<<"' histogram"<< std::endl;
-     }
+    TObject* hist = out.FindObject(kA);
+    if (nullptr != hist) {
+      hist->Draw();
+      canvas->SaveAs("a.jpg");
+    } else {
+      std::cout << "no '" << kA << "' histogram" << std::endl;
+    }
   }
   {
-     TObject* hist = out.FindObject(kRefA);
-     if(nullptr != hist) {
-	hist->Draw();
-	canvas->SaveAs( "refA.jpg" );
-     } else {
-	std::cout <<"no '"<<kRefA<<"' histogram"<< std::endl;
-     }
+    TObject* hist = out.FindObject(kRefA);
+    if (nullptr != hist) {
+      hist->Draw();
+      canvas->SaveAs("refA.jpg");
+    } else {
+      std::cout << "no '" << kRefA << "' histogram" << std::endl;
+    }
   }
   delete canvas;
 }
diff --git a/FWCore/TFWLiteSelectorTest/src/ThingsTSelector.h b/FWCore/TFWLiteSelectorTest/src/ThingsTSelector.h
index cf5c9f5bf8acb..fbaa2591aa68e 100644
--- a/FWCore/TFWLiteSelectorTest/src/ThingsTSelector.h
+++ b/FWCore/TFWLiteSelectorTest/src/ThingsTSelector.h
@@ -13,24 +13,24 @@
 #include "FWCore/Utilities/interface/propagate_const.h"
 
 namespace tfwliteselectortest {
-class ThingsTSelector : public TFWLiteSelectorBasic {
-public :
-      ThingsTSelector() : h_a(nullptr), h_refA(nullptr) {}
-      void begin(TList*&) override;
-      void preProcessing(const TList*, TList&) override;
-      void process(const edm::Event&) override;
-      void postProcessing(TList&) override;
-      void terminate(TList&) override;
+  class ThingsTSelector : public TFWLiteSelectorBasic {
+  public:
+    ThingsTSelector() : h_a(nullptr), h_refA(nullptr) {}
+    void begin(TList*&) override;
+    void preProcessing(const TList*, TList&) override;
+    void process(const edm::Event&) override;
+    void postProcessing(TList&) override;
+    void terminate(TList&) override;
 
-private:
-  /// histograms
-  edm::propagate_const<TH1F*> h_a;
-  edm::propagate_const<TH1F*> h_refA;
+  private:
+    /// histograms
+    edm::propagate_const<TH1F*> h_a;
+    edm::propagate_const<TH1F*> h_refA;
 
-  ThingsTSelector(ThingsTSelector const&);
-  ThingsTSelector operator=(ThingsTSelector const&);
-  
-  ClassDefOverride(ThingsTSelector,2)
-};
-}
+    ThingsTSelector(ThingsTSelector const&);
+    ThingsTSelector operator=(ThingsTSelector const&);
+
+    ClassDefOverride(ThingsTSelector, 2)
+  };
+}  // namespace tfwliteselectortest
 #endif
diff --git a/FWCore/TFWLiteSelectorTest/src/ThingsTSelector2.cc b/FWCore/TFWLiteSelectorTest/src/ThingsTSelector2.cc
index 0c6fe2e46ea4b..2a7b37f3cdfa1 100644
--- a/FWCore/TFWLiteSelectorTest/src/ThingsTSelector2.cc
+++ b/FWCore/TFWLiteSelectorTest/src/ThingsTSelector2.cc
@@ -13,42 +13,37 @@ using namespace tfwliteselectortest;
 static const char* kA = "a";
 static const char* kRefA = "refA";
 
+ThingsWorker::ThingsWorker(const TList*, TList& out) {
+  std::cout << "begin" << std::endl;
+  h_a = new TH1F(kA, "a", 100, 0, 20);
+  out.Add(h_a);
 
-
-ThingsWorker::ThingsWorker(const TList*, TList& out ) {
-    std::cout << "begin" << std::endl;
-    h_a  = new TH1F( kA , "a"  , 100,  0, 20 );
-    out.Add(h_a);
-    
-    h_refA  = new TH1F( kRefA , "refA"  , 100,  0, 20 );
-    out.Add(h_refA);
+  h_refA = new TH1F(kRefA, "refA", 100, 0, 20);
+  out.Add(h_refA);
 }
-  
-  
-  
-void 
-ThingsWorker::process( const edm::Event& iEvent ) {
+
+void ThingsWorker::process(const edm::Event& iEvent) {
   std::cout << "processing event " << std::endl;
   //  chain->GetEntry( entry );
   using namespace edmtest;
   edm::Handle<OtherThingCollection> hOThings;
   try {
     iEvent.getByLabel("OtherThing", "testUserTag", hOThings);
-    
+
     std::cout << ">> other things found:" << hOThings->size() << std::endl;
-    for ( size_t i = 0; i < hOThings->size(); ++i ) {
-      const OtherThing & thing = (*hOThings)[ i ];
-      h_refA ->Fill( thing.ref->a );
+    for (size_t i = 0; i < hOThings->size(); ++i) {
+      const OtherThing& thing = (*hOThings)[i];
+      h_refA->Fill(thing.ref->a);
       std::cout << ">> ref->a:  " << thing.ref->a << std::endl;
     }
-    
+
     edm::Handle<ThingCollection> hThings;
-    iEvent.getByLabel("Thing",hThings);
+    iEvent.getByLabel("Thing", hThings);
     const ThingCollection& things = *hThings;
     std::cout << ">> things found:" << things.size() << std::endl;
-    for ( size_t i = 0; i < things.size(); ++i ) {
-      const Thing & thing = things[ i ];
-      h_a ->Fill( thing.a );
+    for (size_t i = 0; i < things.size(); ++i) {
+      const Thing& thing = things[i];
+      h_a->Fill(thing.a);
       std::cout << ">> a:  " << thing.a << std::endl;
     }
   } catch (cms::Exception& x) {
@@ -64,41 +59,32 @@ ThingsWorker::process( const edm::Event& iEvent ) {
     abort();
   }
 }
-  
-void 
-ThingsWorker::postProcess(TList&)
-{
-}
 
+void ThingsWorker::postProcess(TList&) {}
 
-
-void ThingsTSelector2::begin(TList*&)
-{
-}
+void ThingsTSelector2::begin(TList*&) {}
 
 void ThingsTSelector2::terminate(TList& out) {
   std::cout << "terminate" << std::endl;
-  TCanvas * canvas = new TCanvas( );
+  TCanvas* canvas = new TCanvas();
   {
-     TObject* hist = out.FindObject(kA);
-     if(nullptr != hist) {
-	hist->Draw();
-	canvas->SaveAs( "a.jpg" );
-     } else {
-	std::cout <<"no '"<<kA<<"' histogram"<< std::endl;
-     }
+    TObject* hist = out.FindObject(kA);
+    if (nullptr != hist) {
+      hist->Draw();
+      canvas->SaveAs("a.jpg");
+    } else {
+      std::cout << "no '" << kA << "' histogram" << std::endl;
+    }
   }
-  std::cout <<"refA"<< std::endl;
+  std::cout << "refA" << std::endl;
   {
-     TObject* hist = out.FindObject(kRefA);
-     if(nullptr != hist) {
-	hist->Draw();
-	canvas->SaveAs( "refA.jpg" );
-     } else {
-	std::cout <<"no '"<<kRefA<<"' histogram"<< std::endl;
-     }
+    TObject* hist = out.FindObject(kRefA);
+    if (nullptr != hist) {
+      hist->Draw();
+      canvas->SaveAs("refA.jpg");
+    } else {
+      std::cout << "no '" << kRefA << "' histogram" << std::endl;
+    }
   }
   delete canvas;
 }
-
-
diff --git a/FWCore/TFWLiteSelectorTest/src/ThingsTSelector2.h b/FWCore/TFWLiteSelectorTest/src/ThingsTSelector2.h
index f2f199217ca11..5ddcb396366a9 100644
--- a/FWCore/TFWLiteSelectorTest/src/ThingsTSelector2.h
+++ b/FWCore/TFWLiteSelectorTest/src/ThingsTSelector2.h
@@ -13,25 +13,24 @@
 
 namespace tfwliteselectortest {
   struct ThingsWorker {
-	ThingsWorker(const TList*, TList&);
-	void process( const edm::Event& iEvent );
-	void postProcess(TList&);
-        edm::propagate_const<TH1F*> h_a;
-        edm::propagate_const<TH1F*> h_refA;
+    ThingsWorker(const TList*, TList&);
+    void process(const edm::Event& iEvent);
+    void postProcess(TList&);
+    edm::propagate_const<TH1F*> h_a;
+    edm::propagate_const<TH1F*> h_refA;
   };
 
   class ThingsTSelector2 : public TFWLiteSelector<ThingsWorker> {
-public :
+  public:
     ThingsTSelector2() {}
     void begin(TList*&) override;
     void terminate(TList&) override;
-    
-private:
-    
+
+  private:
     ThingsTSelector2(ThingsTSelector2 const&);
     ThingsTSelector2 operator=(ThingsTSelector2 const&);
-    
-    ClassDefOverride(ThingsTSelector2,2)
+
+    ClassDefOverride(ThingsTSelector2, 2)
   };
-}
+}  // namespace tfwliteselectortest
 #endif
diff --git a/FWCore/TestProcessor/interface/ESProduceEntry.h b/FWCore/TestProcessor/interface/ESProduceEntry.h
index 49a35cda83104..43c69794040a6 100644
--- a/FWCore/TestProcessor/interface/ESProduceEntry.h
+++ b/FWCore/TestProcessor/interface/ESProduceEntry.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework/TestProcessor
 // Class  :     ESProduceEntry
-// 
+//
 /**\class ESProduceEntry ESProduceEntry.h "ESProduceEntry.h"
 
  Description: [one line class summary]
@@ -28,16 +28,16 @@
 #include "FWCore/Framework/interface/DataProxy.h"
 #include <memory>
 namespace edm {
-namespace test {
-struct ESProduceEntry {
-  ESProduceEntry(edm::eventsetup::EventSetupRecordKey const& iRecKey,
-                 edm::eventsetup::DataKey const& iDataKey,
-                 std::shared_ptr<edm::eventsetup::DataProxy> iProxy):
-  recordKey_(iRecKey), dataKey_(iDataKey), proxy_(std::move(iProxy)) {}
-  edm::eventsetup::EventSetupRecordKey recordKey_;
-  edm::eventsetup::DataKey dataKey_;
-  std::shared_ptr<edm::eventsetup::DataProxy> proxy_;
-};
-}
-}
+  namespace test {
+    struct ESProduceEntry {
+      ESProduceEntry(edm::eventsetup::EventSetupRecordKey const& iRecKey,
+                     edm::eventsetup::DataKey const& iDataKey,
+                     std::shared_ptr<edm::eventsetup::DataProxy> iProxy)
+          : recordKey_(iRecKey), dataKey_(iDataKey), proxy_(std::move(iProxy)) {}
+      edm::eventsetup::EventSetupRecordKey recordKey_;
+      edm::eventsetup::DataKey dataKey_;
+      std::shared_ptr<edm::eventsetup::DataProxy> proxy_;
+    };
+  }  // namespace test
+}  // namespace edm
 #endif
diff --git a/FWCore/TestProcessor/interface/ESPutTokenT.h b/FWCore/TestProcessor/interface/ESPutTokenT.h
index cbc72f62f7fa2..d7b9d49ecd1ca 100644
--- a/FWCore/TestProcessor/interface/ESPutTokenT.h
+++ b/FWCore/TestProcessor/interface/ESPutTokenT.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework/TestProcessor
 // Class  :     ESPutTokenT
-// 
+//
 /**\class ESPutTokenT ESPutTokenT.h "ESPutTokenT.h"
 
  Description: [one line class summary]
@@ -24,25 +24,26 @@
 
 // forward declarations
 namespace edm {
-namespace test {
-class TestProcessorConfig;
-  
-template <typename T>
-class ESPutTokenT {
-public:
-  friend class TestProcessorConfig;
-  ESPutTokenT(): index_{undefinedIndex()} {}
-  
-  int index() const { return index_;}
-  
-  static int undefinedIndex() { return -1;}
-private:
-  ESPutTokenT(int iIndex): index_{iIndex} {};
-  
-  int index_;
-};
-
-}
-}
+  namespace test {
+    class TestProcessorConfig;
+
+    template <typename T>
+    class ESPutTokenT {
+    public:
+      friend class TestProcessorConfig;
+      ESPutTokenT() : index_{undefinedIndex()} {}
+
+      int index() const { return index_; }
+
+      static int undefinedIndex() { return -1; }
+
+    private:
+      ESPutTokenT(int iIndex) : index_{iIndex} {};
+
+      int index_;
+    };
+
+  }  // namespace test
+}  // namespace edm
 
 #endif
diff --git a/FWCore/TestProcessor/interface/Event.h b/FWCore/TestProcessor/interface/Event.h
index 7b1838ec18fd1..9663744a27b24 100644
--- a/FWCore/TestProcessor/interface/Event.h
+++ b/FWCore/TestProcessor/interface/Event.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/TestProcessor
 // Class  :     Event
-// 
+//
 /**\class Event Event.h "Event.h"
 
  Description: [one line class summary]
@@ -26,57 +26,50 @@
 #include "FWCore/Framework/interface/EventPrincipal.h"
 #include "FWCore/Utilities/interface/TypeID.h"
 
-
 // forward declarations
 
 namespace edm {
   class EventPrincipal;
-  
-namespace test {
-  
-class Event
-{
 
-public:
-  Event(EventPrincipal const& iPrincipal, std::string iModuleLabel, std::string iProcessName, bool modulePassed);
-  
-  // ---------- const member functions ---------------------
-  template<typename T>
-  TestHandle<T> get() const {
-    static const std::string s_null;
-    return get<T>(s_null);
-  }
-  
-  template<typename T>
-  TestHandle<T> get(std::string const& iInstanceLabel) const {
-    auto h = principal_->getByLabel(edm::PRODUCT_TYPE, edm::TypeID(typeid(T)),
-                                    label_, iInstanceLabel, processName_,
-                                    nullptr,nullptr,nullptr
-                                    );
-    if(h.failedToGet()) {
-      return TestHandle<T>(std::move(h.whyFailedFactory()));
-    }
-    void const* basicWrapper = h.wrapper();
-    assert(basicWrapper);
-    Wrapper<T> const* wrapper = static_cast<Wrapper<T> const*>(basicWrapper);
-    return TestHandle<T>(wrapper->product());
-  }
-  
-  bool modulePassed() const { return modulePassed_;}
-  // ---------- static member functions --------------------
-  
-  // ---------- member functions ---------------------------
-  
-private:
-  
-  // ---------- member data --------------------------------
-  EventPrincipal const* principal_;
-  std::string label_;
-  std::string processName_;
-  bool modulePassed_;
-};
-}
-}
+  namespace test {
+
+    class Event {
+    public:
+      Event(EventPrincipal const& iPrincipal, std::string iModuleLabel, std::string iProcessName, bool modulePassed);
+
+      // ---------- const member functions ---------------------
+      template <typename T>
+      TestHandle<T> get() const {
+        static const std::string s_null;
+        return get<T>(s_null);
+      }
+
+      template <typename T>
+      TestHandle<T> get(std::string const& iInstanceLabel) const {
+        auto h = principal_->getByLabel(
+            edm::PRODUCT_TYPE, edm::TypeID(typeid(T)), label_, iInstanceLabel, processName_, nullptr, nullptr, nullptr);
+        if (h.failedToGet()) {
+          return TestHandle<T>(std::move(h.whyFailedFactory()));
+        }
+        void const* basicWrapper = h.wrapper();
+        assert(basicWrapper);
+        Wrapper<T> const* wrapper = static_cast<Wrapper<T> const*>(basicWrapper);
+        return TestHandle<T>(wrapper->product());
+      }
+
+      bool modulePassed() const { return modulePassed_; }
+      // ---------- static member functions --------------------
+
+      // ---------- member functions ---------------------------
 
+    private:
+      // ---------- member data --------------------------------
+      EventPrincipal const* principal_;
+      std::string label_;
+      std::string processName_;
+      bool modulePassed_;
+    };
+  }  // namespace test
+}  // namespace edm
 
 #endif
diff --git a/FWCore/TestProcessor/interface/EventSetupTestHelper.h b/FWCore/TestProcessor/interface/EventSetupTestHelper.h
index 2b53376248d61..21aa3e8e6e109 100644
--- a/FWCore/TestProcessor/interface/EventSetupTestHelper.h
+++ b/FWCore/TestProcessor/interface/EventSetupTestHelper.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/TestProcessor
 // Class  :     EventSetupTestHelper
-// 
+//
 /**\class EventSetupTestHelper EventSetupTestHelper.h "EventSetupTestHelper.h"
 
  Description: [one line class summary]
@@ -29,44 +29,37 @@
 
 // forward declarations
 namespace edm {
-namespace test {
-  
-  class EventSetupTestHelper : public eventsetup::DataProxyProvider, public EventSetupRecordIntervalFinder
-{
+  namespace test {
 
-   public:
-  EventSetupTestHelper(std::vector<ESProduceEntry>);
+    class EventSetupTestHelper : public eventsetup::DataProxyProvider, public EventSetupRecordIntervalFinder {
+    public:
+      EventSetupTestHelper(std::vector<ESProduceEntry>);
 
       // ---------- const member functions ---------------------
 
       // ---------- static member functions --------------------
 
       // ---------- member functions ---------------------------
-  void newInterval(const eventsetup::EventSetupRecordKey& iRecordType,
-                   const ValidityInterval& iInterval) final;
+      void newInterval(const eventsetup::EventSetupRecordKey& iRecordType, const ValidityInterval& iInterval) final;
 
-  std::shared_ptr<eventsetup::DataProxy> getProxy(unsigned int index );
-  
-  void resetAllProxies();
-protected:
-  void setIntervalFor(const eventsetup::EventSetupRecordKey&,
-                      const IOVSyncValue& ,
-                      ValidityInterval&) final;
+      std::shared_ptr<eventsetup::DataProxy> getProxy(unsigned int index);
 
-  void registerProxies(const eventsetup::EventSetupRecordKey& iRecordKey ,
-                       KeyedProxies& aProxyList) final ;
+      void resetAllProxies();
 
+    protected:
+      void setIntervalFor(const eventsetup::EventSetupRecordKey&, const IOVSyncValue&, ValidityInterval&) final;
 
-   private:
-      EventSetupTestHelper(const EventSetupTestHelper&) = delete; // stop default
+      void registerProxies(const eventsetup::EventSetupRecordKey& iRecordKey, KeyedProxies& aProxyList) final;
 
-      const EventSetupTestHelper& operator=(const EventSetupTestHelper&) = delete; // stop default
+    private:
+      EventSetupTestHelper(const EventSetupTestHelper&) = delete;  // stop default
 
-      // ---------- member data --------------------------------
-  std::vector<ESProduceEntry> proxies_;
-};
-}
-}
+      const EventSetupTestHelper& operator=(const EventSetupTestHelper&) = delete;  // stop default
 
+      // ---------- member data --------------------------------
+      std::vector<ESProduceEntry> proxies_;
+    };
+  }  // namespace test
+}  // namespace edm
 
 #endif
diff --git a/FWCore/TestProcessor/interface/TestDataProxy.h b/FWCore/TestProcessor/interface/TestDataProxy.h
index 17dcc3683c7cf..7b7053da520ed 100644
--- a/FWCore/TestProcessor/interface/TestDataProxy.h
+++ b/FWCore/TestProcessor/interface/TestDataProxy.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/TestProcessor
 // Class  :     TestDataProxy
-// 
+//
 /**\class TestDataProxy TestDataProxy.h "TestDataProxy.h"
 
  Description: [one line class summary]
@@ -27,32 +27,26 @@
 // forward declarations
 
 namespace edm {
-namespace test {
-
-template< typename T>
-  class TestDataProxy : public eventsetup::DataProxy
-{
-
-  public:
-  TestDataProxy() {}
-
-  void setData(std::unique_ptr<T> iData) {
-    data_ = std::move(iData);
-  }
-  
-  void const* getImpl(eventsetup::EventSetupRecordImpl const&, eventsetup::DataKey const& iKey) final {
-    return data_.get();
-  }
-  
-  void invalidateCache() final {
-    data_.reset();
-  }
-
-  private:
-  std::unique_ptr<T> data_;
-};
-}
-
-}
+  namespace test {
+
+    template <typename T>
+    class TestDataProxy : public eventsetup::DataProxy {
+    public:
+      TestDataProxy() {}
+
+      void setData(std::unique_ptr<T> iData) { data_ = std::move(iData); }
+
+      void const* getImpl(eventsetup::EventSetupRecordImpl const&, eventsetup::DataKey const& iKey) final {
+        return data_.get();
+      }
+
+      void invalidateCache() final { data_.reset(); }
+
+    private:
+      std::unique_ptr<T> data_;
+    };
+  }  // namespace test
+
+}  // namespace edm
 
 #endif
diff --git a/FWCore/TestProcessor/interface/TestHandle.h b/FWCore/TestProcessor/interface/TestHandle.h
index 70e89da5c69eb..775e2e1b86543 100644
--- a/FWCore/TestProcessor/interface/TestHandle.h
+++ b/FWCore/TestProcessor/interface/TestHandle.h
@@ -4,7 +4,7 @@
 //
 // Package:     Subsystem/Package
 // Class  :     TestHandle
-// 
+//
 /**\class TestHandle TestHandle.h "TestHandle.h"
 
  Description: [one line class summary]
@@ -28,55 +28,38 @@
 // forward declarations
 
 namespace edm {
-namespace test {
-  template<typename T>
-  class TestHandle {
-  public:
-    explicit TestHandle(T const* product):
-    product_{product}
-    {}
-    
-    explicit TestHandle(std::shared_ptr<HandleExceptionFactory> iFailed):
-    product_{nullptr},
-    whyFailedFactory_{std::move(iFailed)}
-    {}
-    
-    operator bool() {
-      return product_!=nullptr;
-    }
-    
-    bool isValid() const {
-      return product_ != nullptr;
-    }
-    
-    T const*
-    product() const {
-      return productStorage();
-    }
-    
-    T const*
-    operator->() const {
-      return product();
-    }
-    
-    T const&
-    operator*() const {
-      return *product();
-    }
-    
-  private:
-    T const* productStorage() const {
-      if(product_) {
-        return product_;
+  namespace test {
+    template <typename T>
+    class TestHandle {
+    public:
+      explicit TestHandle(T const* product) : product_{product} {}
+
+      explicit TestHandle(std::shared_ptr<HandleExceptionFactory> iFailed)
+          : product_{nullptr}, whyFailedFactory_{std::move(iFailed)} {}
+
+      operator bool() { return product_ != nullptr; }
+
+      bool isValid() const { return product_ != nullptr; }
+
+      T const* product() const { return productStorage(); }
+
+      T const* operator->() const { return product(); }
+
+      T const& operator*() const { return *product(); }
+
+    private:
+      T const* productStorage() const {
+        if (product_) {
+          return product_;
+        }
+        throw *(whyFailedFactory_->make());
       }
-      throw *(whyFailedFactory_->make());
-    }
-    
-    T const* product_;
-    std::shared_ptr<HandleExceptionFactory> whyFailedFactory_;
-  };
-
-}
-}
+
+      T const* product_;
+      std::shared_ptr<HandleExceptionFactory> whyFailedFactory_;
+    };
+
+  }  // namespace test
+}  // namespace edm
 
 #endif
diff --git a/FWCore/TestProcessor/interface/TestProcessor.h b/FWCore/TestProcessor/interface/TestProcessor.h
index 7cbbe407453f9..b9080bf327745 100644
--- a/FWCore/TestProcessor/interface/TestProcessor.h
+++ b/FWCore/TestProcessor/interface/TestProcessor.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/TestProcessor
 // Class  :     TestProcessor
-// 
+//
 /**\class TestProcessor TestProcessor.h "TestProcessor.h"
 
  Description: [one line class summary]
@@ -37,7 +37,6 @@
 #include "FWCore/ServiceRegistry/interface/ServiceLegacy.h"
 #include "FWCore/ServiceRegistry/interface/ServiceToken.h"
 
-
 #include "DataFormats/Provenance/interface/RunLumiEventNumber.h"
 #include "DataFormats/Provenance/interface/ProcessHistoryRegistry.h"
 #include "DataFormats/Common/interface/Wrapper.h"
@@ -60,222 +59,219 @@ namespace edm {
   namespace eventsetup {
     class EventSetupProvider;
     class EventSetupsController;
-  }
-
-namespace test {
-  class TestProcessorConfig;
-  class EventSetupTestHelper;
-  
-  class ProcessToken {
-    friend TestProcessorConfig;
-  public:
-    ProcessToken() : index_{undefinedIndex() } {}
-    
-    int index() const { return index_;}
-    
-    static int undefinedIndex() { return -1;}
-  private:
-    explicit ProcessToken(int index): index_{index} {}
-    
-    int index_;
-  };
-    
-class TestProcessorConfig {
-  public:
-    TestProcessorConfig(std::string const& iPythonConfiguration):
-    config_(iPythonConfiguration)
-    {}
-    std::string const& pythonConfiguration() const { return config_;}
-    void setPythonConfiguration(std::string iConfig) { config_ = std::move(iConfig);}
-    
-    /** add a Process name to the Process history. If multiple calls are made to addProcess,
+  }  // namespace eventsetup
+
+  namespace test {
+    class TestProcessorConfig;
+    class EventSetupTestHelper;
+
+    class ProcessToken {
+      friend TestProcessorConfig;
+
+    public:
+      ProcessToken() : index_{undefinedIndex()} {}
+
+      int index() const { return index_; }
+
+      static int undefinedIndex() { return -1; }
+
+    private:
+      explicit ProcessToken(int index) : index_{index} {}
+
+      int index_;
+    };
+
+    class TestProcessorConfig {
+    public:
+      TestProcessorConfig(std::string const& iPythonConfiguration) : config_(iPythonConfiguration) {}
+      std::string const& pythonConfiguration() const { return config_; }
+      void setPythonConfiguration(std::string iConfig) { config_ = std::move(iConfig); }
+
+      /** add a Process name to the Process history. If multiple calls are made to addProcess,
      then the call order will be the order of the Processes in the history.*/
-    ProcessToken addExtraProcess(std::string const& iProcessName) {
-      extraProcesses_.emplace_back(iProcessName);
-      return ProcessToken( extraProcesses_.size() -1);
-    }
-    
-    std::vector<std::string> const& extraProcesses() const { return extraProcesses_;}
-    
-    /** A blank iProcessName means it produces in the primary process.
+      ProcessToken addExtraProcess(std::string const& iProcessName) {
+        extraProcesses_.emplace_back(iProcessName);
+        return ProcessToken(extraProcesses_.size() - 1);
+      }
+
+      std::vector<std::string> const& extraProcesses() const { return extraProcesses_; }
+
+      /** A blank iProcessName means it produces in the primary process.
      The use of any other name requires that it is first added via `addExtraProcess`.
      */
-    template<typename T>
-    edm::EDPutTokenT<T> produces(std::string iModuleLabel,
-                                 std::string iProductInstanceLabel = std::string(),
-                                 ProcessToken iToken= ProcessToken()) {
-      produceEntries_.emplace_back(edm::TypeID(typeid(T)), std::move(iModuleLabel),
-                                   std::move(iProductInstanceLabel),
-                                   processName(iToken));
-      return edm::EDPutTokenT<T>(produceEntries_.size()-1);
-    }
-  
-    template<typename REC, typename T>
-    edm::test::ESPutTokenT<T> esProduces(std::string iLabel = std::string()) {
-      auto rk = eventsetup::EventSetupRecordKey::makeKey<REC>();
-      eventsetup::DataKey dk( eventsetup::DataKey::makeTypeTag<T>(), iLabel.c_str());
-      esProduceEntries_.emplace_back(rk, dk, std::make_shared<TestDataProxy<T>>());
-      return edm::test::ESPutTokenT<T>(esProduceEntries_.size()-1);
-    }
-  
-    struct ProduceEntry {
-      ProduceEntry(edm::TypeID const& iType,
-                   std::string moduleLabel,
-                   std::string instanceLabel,
-                   std::string processName):
-      type_{iType},
-      moduleLabel_{std::move(moduleLabel)},
-      instanceLabel_{std::move(instanceLabel)},
-      processName_{std::move(processName)} {}
-      edm::TypeID type_;
-      std::string moduleLabel_;
-      std::string instanceLabel_;
-      std::string processName_;
+      template <typename T>
+      edm::EDPutTokenT<T> produces(std::string iModuleLabel,
+                                   std::string iProductInstanceLabel = std::string(),
+                                   ProcessToken iToken = ProcessToken()) {
+        produceEntries_.emplace_back(
+            edm::TypeID(typeid(T)), std::move(iModuleLabel), std::move(iProductInstanceLabel), processName(iToken));
+        return edm::EDPutTokenT<T>(produceEntries_.size() - 1);
+      }
+
+      template <typename REC, typename T>
+      edm::test::ESPutTokenT<T> esProduces(std::string iLabel = std::string()) {
+        auto rk = eventsetup::EventSetupRecordKey::makeKey<REC>();
+        eventsetup::DataKey dk(eventsetup::DataKey::makeTypeTag<T>(), iLabel.c_str());
+        esProduceEntries_.emplace_back(rk, dk, std::make_shared<TestDataProxy<T>>());
+        return edm::test::ESPutTokenT<T>(esProduceEntries_.size() - 1);
+      }
+
+      struct ProduceEntry {
+        ProduceEntry(edm::TypeID const& iType,
+                     std::string moduleLabel,
+                     std::string instanceLabel,
+                     std::string processName)
+            : type_{iType},
+              moduleLabel_{std::move(moduleLabel)},
+              instanceLabel_{std::move(instanceLabel)},
+              processName_{std::move(processName)} {}
+        edm::TypeID type_;
+        std::string moduleLabel_;
+        std::string instanceLabel_;
+        std::string processName_;
+      };
+
+      std::vector<ProduceEntry> const& produceEntries() const { return produceEntries_; }
+
+      std::vector<ESProduceEntry> const& esProduceEntries() const { return esProduceEntries_; }
+
+    private:
+      std::string config_;
+      std::vector<std::string> extraProcesses_;
+      std::vector<ProduceEntry> produceEntries_;
+      std::vector<ESProduceEntry> esProduceEntries_;
+
+      std::string processName(ProcessToken iToken) {
+        if (iToken.index() == ProcessToken::undefinedIndex()) {
+          return std::string();
+        }
+        return extraProcesses_[iToken.index()];
+      }
     };
-  
-  std::vector<ProduceEntry> const& produceEntries() const { return produceEntries_;}
-  
-  std::vector<ESProduceEntry> const& esProduceEntries() const {
-    return esProduceEntries_;
-  }
-
-  private:
-    std::string config_;
-    std::vector<std::string> extraProcesses_;
-    std::vector<ProduceEntry> produceEntries_;
-    std::vector<ESProduceEntry> esProduceEntries_;
-  
-  std::string processName(ProcessToken iToken) {
-    if(iToken.index() == ProcessToken::undefinedIndex()) {
-      return std::string();
-    }
-    return extraProcesses_[iToken.index()];
-  }
-  };
-
-class TestProcessor
-{
-  public:
-  using Config = TestProcessorConfig;
-  
-  TestProcessor(Config const& iConfig);
-  ~TestProcessor() noexcept(false);
-
-  /** Run the test. The function arguments are the data products to be added to the
+
+    class TestProcessor {
+    public:
+      using Config = TestProcessorConfig;
+
+      TestProcessor(Config const& iConfig);
+      ~TestProcessor() noexcept(false);
+
+      /** Run the test. The function arguments are the data products to be added to the
      Event for this particular test.
      */
-  template< typename... T>
-  edm::test::Event test(T&&... iArgs) {
-    return testImpl(std::forward<T>(iArgs)...);
-  }
- 
-  /** Run only beginJob and endJob. Once this is used, you should not attempt to run any further tests.
+      template <typename... T>
+      edm::test::Event test(T&&... iArgs) {
+        return testImpl(std::forward<T>(iArgs)...);
+      }
+
+      /** Run only beginJob and endJob. Once this is used, you should not attempt to run any further tests.
 This simulates a problem happening early in the job which causes processing not to proceed.
    */
-  void testBeginAndEndJobOnly() { beginJob(); endJob();}
-  
-  void testRunWithNoLuminosityBlocks() {
-    beginJob();
-    beginRun();
-    endRun();
-    endJob();
-  }
-
-  void testLuminosityBlockWithNoEvents() {
-    beginJob();
-    beginRun();
-    beginLuminosityBlock();
-    endLuminosityBlock();
-    endRun();
-    endJob();
-  }
-  void setRunNumber(edm::RunNumber_t);
-  void setLuminosityBlockNumber(edm::LuminosityBlockNumber_t);
-  void setEventNumber(edm::EventNumber_t);
-
-  std::string const& labelOfTestModule() const {
-    return labelOfTestModule_;
-  }
-  
-  private:
-  TestProcessor(const TestProcessor&) = delete; // stop default
-
-  const TestProcessor& operator=(const TestProcessor&) = delete; // stop default
-
-  template< typename T, typename... U>
-  edm::test::Event testImpl(std::pair<edm::EDPutTokenT<T>,std::unique_ptr<T>>&& iPut, U&&... iArgs) {
-    put(std::move(iPut));
-    return testImpl(std::forward<U>(iArgs)...);
-  }
-
-  template<typename T, typename... U>
-  edm::test::Event testImpl(std::pair<edm::test::ESPutTokenT<T>,std::unique_ptr<T>>&& iPut, U&&... iArgs) {
-    put(std::move(iPut));
-    return testImpl(std::forward<U>(iArgs)...);
-  }
-
-  template< typename T>
-  void put(std::pair<edm::EDPutTokenT<T>,std::unique_ptr<T>>&& iPut) {
-    put(iPut.first.index(), std::make_unique<edm::Wrapper<T>>(std::move(iPut.second)));
-  }
-
-  template<typename T>
-  void put(std::pair<edm::test::ESPutTokenT<T>,std::unique_ptr<T>>&& iPut) {
-    dynamic_cast<TestDataProxy<T>*>(esHelper_->getProxy(iPut.first.index()).get())->setData(std::move(iPut.second));
-  }
-
-  void put(unsigned int, std::unique_ptr<WrapperBase>);
-  
-  edm::test::Event testImpl();
-  
-  void setupProcessing();
-  void teardownProcessing();
-  
-  void beginJob();
-  void beginRun();
-  void beginLuminosityBlock();
-  void event();
-  void endLuminosityBlock();
-  void endRun();
-  void endJob();
-  
-  // ---------- member data --------------------------------
-  std::string labelOfTestModule_;
-  std::shared_ptr<ActivityRegistry> actReg_; // We do not use propagate_const because the registry itself is mutable.
-  std::shared_ptr<ProductRegistry> preg_;
-  std::shared_ptr<BranchIDListHelper> branchIDListHelper_;
-  std::shared_ptr<ThinnedAssociationsHelper> thinnedAssociationsHelper_;
-  ServiceToken serviceToken_;
-  std::unique_ptr<eventsetup::EventSetupsController> espController_;
-  std::shared_ptr<eventsetup::EventSetupProvider> esp_;
-  std::shared_ptr<EventSetupTestHelper> esHelper_;
-  
-  std::unique_ptr<ExceptionToActionTable const>          act_table_;
-  std::shared_ptr<ProcessConfiguration const>       processConfiguration_;
-  ProcessContext                                processContext_;
-
-  ProcessHistoryRegistry processHistoryRegistry_;
-  std::unique_ptr<HistoryAppender> historyAppender_;
-
-  PrincipalCache                                principalCache_;
-  PreallocationConfiguration                    preallocations_;
-
-  std::shared_ptr<ModuleRegistry> moduleRegistry_;
-  std::unique_ptr<Schedule> schedule_;
-  std::shared_ptr<LuminosityBlockPrincipal> lumiPrincipal_;
-  
-  std::vector<std::pair<edm::BranchDescription,std::unique_ptr<WrapperBase>>> dataProducts_;
-  
-  RunNumber_t runNumber_=1;
-  LuminosityBlockNumber_t lumiNumber_=1;
-  EventNumber_t eventNumber_=1;
-  bool beginJobCalled_ = false;
-  bool beginRunCalled_ = false;
-  bool beginLumiCalled_ = false;
-  bool newRun_ = true;
-  bool newLumi_ = true;
-};
-}
-}
+      void testBeginAndEndJobOnly() {
+        beginJob();
+        endJob();
+      }
+
+      void testRunWithNoLuminosityBlocks() {
+        beginJob();
+        beginRun();
+        endRun();
+        endJob();
+      }
+
+      void testLuminosityBlockWithNoEvents() {
+        beginJob();
+        beginRun();
+        beginLuminosityBlock();
+        endLuminosityBlock();
+        endRun();
+        endJob();
+      }
+      void setRunNumber(edm::RunNumber_t);
+      void setLuminosityBlockNumber(edm::LuminosityBlockNumber_t);
+      void setEventNumber(edm::EventNumber_t);
+
+      std::string const& labelOfTestModule() const { return labelOfTestModule_; }
+
+    private:
+      TestProcessor(const TestProcessor&) = delete;  // stop default
+
+      const TestProcessor& operator=(const TestProcessor&) = delete;  // stop default
+
+      template <typename T, typename... U>
+      edm::test::Event testImpl(std::pair<edm::EDPutTokenT<T>, std::unique_ptr<T>>&& iPut, U&&... iArgs) {
+        put(std::move(iPut));
+        return testImpl(std::forward<U>(iArgs)...);
+      }
+
+      template <typename T, typename... U>
+      edm::test::Event testImpl(std::pair<edm::test::ESPutTokenT<T>, std::unique_ptr<T>>&& iPut, U&&... iArgs) {
+        put(std::move(iPut));
+        return testImpl(std::forward<U>(iArgs)...);
+      }
+
+      template <typename T>
+      void put(std::pair<edm::EDPutTokenT<T>, std::unique_ptr<T>>&& iPut) {
+        put(iPut.first.index(), std::make_unique<edm::Wrapper<T>>(std::move(iPut.second)));
+      }
+
+      template <typename T>
+      void put(std::pair<edm::test::ESPutTokenT<T>, std::unique_ptr<T>>&& iPut) {
+        dynamic_cast<TestDataProxy<T>*>(esHelper_->getProxy(iPut.first.index()).get())->setData(std::move(iPut.second));
+      }
+
+      void put(unsigned int, std::unique_ptr<WrapperBase>);
+
+      edm::test::Event testImpl();
+
+      void setupProcessing();
+      void teardownProcessing();
+
+      void beginJob();
+      void beginRun();
+      void beginLuminosityBlock();
+      void event();
+      void endLuminosityBlock();
+      void endRun();
+      void endJob();
+
+      // ---------- member data --------------------------------
+      std::string labelOfTestModule_;
+      std::shared_ptr<ActivityRegistry> actReg_;  // We do not use propagate_const because the registry itself is mutable.
+      std::shared_ptr<ProductRegistry> preg_;
+      std::shared_ptr<BranchIDListHelper> branchIDListHelper_;
+      std::shared_ptr<ThinnedAssociationsHelper> thinnedAssociationsHelper_;
+      ServiceToken serviceToken_;
+      std::unique_ptr<eventsetup::EventSetupsController> espController_;
+      std::shared_ptr<eventsetup::EventSetupProvider> esp_;
+      std::shared_ptr<EventSetupTestHelper> esHelper_;
+
+      std::unique_ptr<ExceptionToActionTable const> act_table_;
+      std::shared_ptr<ProcessConfiguration const> processConfiguration_;
+      ProcessContext processContext_;
+
+      ProcessHistoryRegistry processHistoryRegistry_;
+      std::unique_ptr<HistoryAppender> historyAppender_;
+
+      PrincipalCache principalCache_;
+      PreallocationConfiguration preallocations_;
+
+      std::shared_ptr<ModuleRegistry> moduleRegistry_;
+      std::unique_ptr<Schedule> schedule_;
+      std::shared_ptr<LuminosityBlockPrincipal> lumiPrincipal_;
+
+      std::vector<std::pair<edm::BranchDescription, std::unique_ptr<WrapperBase>>> dataProducts_;
+
+      RunNumber_t runNumber_ = 1;
+      LuminosityBlockNumber_t lumiNumber_ = 1;
+      EventNumber_t eventNumber_ = 1;
+      bool beginJobCalled_ = false;
+      bool beginRunCalled_ = false;
+      bool beginLumiCalled_ = false;
+      bool newRun_ = true;
+      bool newLumi_ = true;
+    };
+  }  // namespace test
+}  // namespace edm
 
 #endif
diff --git a/FWCore/TestProcessor/src/Event.cc b/FWCore/TestProcessor/src/Event.cc
index 007ec119c31e6..c96f6a4098863 100644
--- a/FWCore/TestProcessor/src/Event.cc
+++ b/FWCore/TestProcessor/src/Event.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/TestProcessor
 // Class  :     Event
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -16,38 +16,36 @@
 #include "FWCore/TestProcessor/interface/Event.h"
 
 namespace edm {
-namespace test {
-    
-//
-// constants, enums and typedefs
-//
-
-//
-// static data member definitions
-//
-
-//
-// constructors and destructor
-//
-  Event::Event(EventPrincipal const& iPrincipal, std::string iModuleLabel, std::string iProcessName,
-               bool modulePassed):
-  principal_{&iPrincipal},
-  label_{std::move(iModuleLabel)},
-  processName_{std::move(iProcessName)},
-  modulePassed_(modulePassed){}
-
-
-//
-// member functions
-//
-
-//
-// const member functions
-//
-
-//
-// static member functions
-//
-
-}
-}
+  namespace test {
+
+    //
+    // constants, enums and typedefs
+    //
+
+    //
+    // static data member definitions
+    //
+
+    //
+    // constructors and destructor
+    //
+    Event::Event(EventPrincipal const& iPrincipal, std::string iModuleLabel, std::string iProcessName, bool modulePassed)
+        : principal_{&iPrincipal},
+          label_{std::move(iModuleLabel)},
+          processName_{std::move(iProcessName)},
+          modulePassed_(modulePassed) {}
+
+    //
+    // member functions
+    //
+
+    //
+    // const member functions
+    //
+
+    //
+    // static member functions
+    //
+
+  }  // namespace test
+}  // namespace edm
diff --git a/FWCore/TestProcessor/src/EventSetupTestHelper.cc b/FWCore/TestProcessor/src/EventSetupTestHelper.cc
index a68b7a88f0776..5b8d777e2161a 100644
--- a/FWCore/TestProcessor/src/EventSetupTestHelper.cc
+++ b/FWCore/TestProcessor/src/EventSetupTestHelper.cc
@@ -2,7 +2,7 @@
 //
 // Package:     FWCore/TestProcessor
 // Class  :     EventSetupTestHelper
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -18,76 +18,66 @@
 
 namespace edm {
   namespace test {
-    
-//
-// constants, enums and typedefs
-//
 
-//
-// static data member definitions
-//
+    //
+    // constants, enums and typedefs
+    //
 
-//
-// constructors and destructor
-//
-EventSetupTestHelper::EventSetupTestHelper(std::vector<ESProduceEntry> iProxies):
-  proxies_{std::move(iProxies)}
-{
-  //Deal with duplicates
-  std::set<eventsetup::EventSetupRecordKey> records;
-  for(auto const& p: proxies_) {
-    records.insert(p.recordKey_);
-  }
-  for(auto const&k: records) {
-    usingRecordWithKey(k);
-    findingRecordWithKey(k);
-  }
-}
-    
-void
-EventSetupTestHelper::newInterval(const eventsetup::EventSetupRecordKey& iRecordType,
-                                  const ValidityInterval& )  {
-}
+    //
+    // static data member definitions
+    //
 
-void
-EventSetupTestHelper::setIntervalFor(const eventsetup::EventSetupRecordKey&,
-                                     const IOVSyncValue& iSync,
-                                     ValidityInterval& oIOV) {
-  if(iSync.luminosityBlockNumber()==0) {
-    //make valid through first run
-    oIOV = ValidityInterval(iSync,
-                            IOVSyncValue(EventID(iSync.eventID().run(),1,1)));
-  } else if(iSync.eventID().event() == 0) {
-    oIOV = ValidityInterval(iSync,
-                            IOVSyncValue(EventID(iSync.eventID().run(),iSync.eventID().luminosityBlock(),1)));
-  } else {
-    //Make valid for only this point
-    oIOV = ValidityInterval(iSync,iSync);
-  }
-}
-    
-void
-EventSetupTestHelper::registerProxies(const eventsetup::EventSetupRecordKey& iRecordKey ,
-                                      KeyedProxies& aProxyList) {
-  for(auto const& p: proxies_) {
-    if(p.recordKey_ == iRecordKey) {
-      aProxyList.emplace_back(p.dataKey_,p.proxy_);
+    //
+    // constructors and destructor
+    //
+    EventSetupTestHelper::EventSetupTestHelper(std::vector<ESProduceEntry> iProxies) : proxies_{std::move(iProxies)} {
+      //Deal with duplicates
+      std::set<eventsetup::EventSetupRecordKey> records;
+      for (auto const& p : proxies_) {
+        records.insert(p.recordKey_);
+      }
+      for (auto const& k : records) {
+        usingRecordWithKey(k);
+        findingRecordWithKey(k);
+      }
     }
-  }
-}
 
-std::shared_ptr<eventsetup::DataProxy>
-EventSetupTestHelper::getProxy(unsigned int iIndex) {
-  return proxies_[iIndex].proxy_;
-}
-    
-void
-EventSetupTestHelper::resetAllProxies() {
-  for(auto const& p: proxies_) {
-    p.proxy_->invalidate();
-  }
-}
+    void EventSetupTestHelper::newInterval(const eventsetup::EventSetupRecordKey& iRecordType,
+                                           const ValidityInterval&) {}
 
+    void EventSetupTestHelper::setIntervalFor(const eventsetup::EventSetupRecordKey&,
+                                              const IOVSyncValue& iSync,
+                                              ValidityInterval& oIOV) {
+      if (iSync.luminosityBlockNumber() == 0) {
+        //make valid through first run
+        oIOV = ValidityInterval(iSync, IOVSyncValue(EventID(iSync.eventID().run(), 1, 1)));
+      } else if (iSync.eventID().event() == 0) {
+        oIOV =
+            ValidityInterval(iSync, IOVSyncValue(EventID(iSync.eventID().run(), iSync.eventID().luminosityBlock(), 1)));
+      } else {
+        //Make valid for only this point
+        oIOV = ValidityInterval(iSync, iSync);
+      }
+    }
+
+    void EventSetupTestHelper::registerProxies(const eventsetup::EventSetupRecordKey& iRecordKey,
+                                               KeyedProxies& aProxyList) {
+      for (auto const& p : proxies_) {
+        if (p.recordKey_ == iRecordKey) {
+          aProxyList.emplace_back(p.dataKey_, p.proxy_);
+        }
+      }
+    }
+
+    std::shared_ptr<eventsetup::DataProxy> EventSetupTestHelper::getProxy(unsigned int iIndex) {
+      return proxies_[iIndex].proxy_;
+    }
+
+    void EventSetupTestHelper::resetAllProxies() {
+      for (auto const& p : proxies_) {
+        p.proxy_->invalidate();
+      }
+    }
 
-  }
-}
+  }  // namespace test
+}  // namespace edm
diff --git a/FWCore/TestProcessor/src/TestProcessor.cc b/FWCore/TestProcessor/src/TestProcessor.cc
index c46dad91b475c..fa993a2ef4dc5 100644
--- a/FWCore/TestProcessor/src/TestProcessor.cc
+++ b/FWCore/TestProcessor/src/TestProcessor.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Subsystem/Package
 // Class  :     TestProcessor
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -22,6 +22,7 @@
 #include "FWCore/Framework/interface/ExceptionActions.h"
 #include "FWCore/Framework/interface/HistoryAppender.h"
 #include "FWCore/Framework/interface/PathsAndConsumesOfModules.h"
+#include "FWCore/Framework/interface/ESRecordsToProxyIndices.h"
 #include "FWCore/Framework/src/EventSetupsController.h"
 #include "FWCore/Framework/src/streamTransitionAsync.h"
 #include "FWCore/Framework/src/globalTransitionAsync.h"
@@ -46,565 +47,529 @@
 #define xstr(s) str(s)
 #define str(s) #s
 
-
 namespace edm {
-namespace test {
-  
-//
-// constants, enums and typedefs
-//
+  namespace test {
 
-//
-// static data member definitions
-//
-  namespace {
-    
-    bool oneTimeInitializationImpl() {
-      
-      edmplugin::PluginManager::configure(edmplugin::standard::config());
-
-      static std::unique_ptr<tbb::task_scheduler_init> tsiPtr = std::make_unique<tbb::task_scheduler_init>(1);
-
-      // register the empty parentage vector , once and for all
-      ParentageRegistry::instance()->insertMapped(Parentage());
-      
-      // register the empty parameter set, once and for all.
-      ParameterSet().registerIt();
-      return true;
+    //
+    // constants, enums and typedefs
+    //
+
+    //
+    // static data member definitions
+    //
+    namespace {
+
+      bool oneTimeInitializationImpl() {
+        edmplugin::PluginManager::configure(edmplugin::standard::config());
+
+        static std::unique_ptr<tbb::task_scheduler_init> tsiPtr = std::make_unique<tbb::task_scheduler_init>(1);
+
+        // register the empty parentage vector , once and for all
+        ParentageRegistry::instance()->insertMapped(Parentage());
+
+        // register the empty parameter set, once and for all.
+        ParameterSet().registerIt();
+        return true;
+      }
+
+      bool oneTimeInitialization() {
+        static const bool s_init{oneTimeInitializationImpl()};
+        return s_init;
+      }
+    }  // namespace
+
+    //
+    // constructors and destructor
+    //
+    TestProcessor::TestProcessor(Config const& iConfig)
+        : espController_(std::make_unique<eventsetup::EventSetupsController>()),
+          historyAppender_(std::make_unique<HistoryAppender>()),
+          moduleRegistry_(std::make_shared<ModuleRegistry>()) {
+      //Setup various singletons
+      (void)oneTimeInitialization();
+
+      ProcessDescImpl desc(iConfig.pythonConfiguration());
+
+      auto psetPtr = desc.parameterSet();
+
+      validateTopLevelParameterSets(psetPtr.get());
+
+      labelOfTestModule_ = psetPtr->getParameter<std::string>("@moduleToTest");
+
+      auto procDesc = desc.processDesc();
+      // Now do general initialization
+      ScheduleItems items;
+
+      //initialize the services
+      auto& serviceSets = procDesc->getServicesPSets();
+      ServiceToken token =
+          items.initServices(serviceSets, *psetPtr, ServiceToken(), serviceregistry::kOverlapIsError, true);
+      serviceToken_ = items.addCPRandTNS(*psetPtr, token);
+
+      //make the services available
+      ServiceRegistry::Operate operate(serviceToken_);
+
+      // intialize miscellaneous items
+      std::shared_ptr<CommonParams> common(items.initMisc(*psetPtr));
+
+      // intialize the event setup provider
+      esp_ = espController_->makeProvider(*psetPtr, items.actReg_.get());
+
+      if (not iConfig.esProduceEntries().empty()) {
+        esHelper_ = std::make_unique<EventSetupTestHelper>(iConfig.esProduceEntries());
+        esp_->add(std::dynamic_pointer_cast<eventsetup::DataProxyProvider>(esHelper_));
+        esp_->add(std::dynamic_pointer_cast<EventSetupRecordIntervalFinder>(esHelper_));
+      }
+
+      auto nThreads = 1U;
+      auto nStreams = 1U;
+      auto nConcurrentLumis = 1U;
+      auto nConcurrentRuns = 1U;
+      preallocations_ = PreallocationConfiguration{nThreads, nStreams, nConcurrentLumis, nConcurrentRuns};
+
+      preg_ = items.preg();
+      processConfiguration_ = items.processConfiguration();
+
+      edm::ParameterSet emptyPSet;
+      emptyPSet.registerIt();
+      auto psetid = emptyPSet.id();
+
+      ProcessHistory oldHistory;
+      for (auto const& p : iConfig.extraProcesses()) {
+        oldHistory.emplace_back(p, psetid, xstr(PROJECT_VERSION), "0");
+        processHistoryRegistry_.registerProcessHistory(oldHistory);
+      }
+
+      //setup the products we will be adding to the event
+      for (auto const& produce : iConfig.produceEntries()) {
+        auto processName = produce.processName_;
+        if (processName.empty()) {
+          processName = processConfiguration_->processName();
+        }
+        edm::TypeWithDict twd(produce.type_.typeInfo());
+        edm::BranchDescription product(edm::InEvent,
+                                       produce.moduleLabel_,
+                                       processName,
+                                       twd.userClassName(),
+                                       twd.friendlyClassName(),
+                                       produce.instanceLabel_,
+                                       "",
+                                       psetid,
+                                       twd,
+                                       true  //force this to come from 'source'
+        );
+        product.init();
+        dataProducts_.emplace_back(product, std::unique_ptr<WrapperBase>());
+        preg_->addProduct(product);
+      }
+
+      schedule_ = items.initSchedule(*psetPtr, false, preallocations_, &processContext_);
+      // set the data members
+      act_table_ = std::move(items.act_table_);
+      actReg_ = items.actReg_;
+      branchIDListHelper_ = items.branchIDListHelper();
+      thinnedAssociationsHelper_ = items.thinnedAssociationsHelper();
+      processContext_.setProcessConfiguration(processConfiguration_.get());
+      principalCache_.setProcessHistoryRegistry(processHistoryRegistry_);
+
+      principalCache_.setNumberOfConcurrentPrincipals(preallocations_);
+
+      preg_->setFrozen();
+      for (unsigned int index = 0; index < preallocations_.numberOfStreams(); ++index) {
+        // Reusable event principal
+        auto ep = std::make_shared<EventPrincipal>(preg_,
+                                                   branchIDListHelper_,
+                                                   thinnedAssociationsHelper_,
+                                                   *processConfiguration_,
+                                                   historyAppender_.get(),
+                                                   index);
+        principalCache_.insert(std::move(ep));
+      }
+
+      for (unsigned int index = 0; index < preallocations_.numberOfLuminosityBlocks(); ++index) {
+        auto lp =
+            std::make_unique<LuminosityBlockPrincipal>(preg_, *processConfiguration_, historyAppender_.get(), index);
+        principalCache_.insert(std::move(lp));
+      }
     }
-    
-    bool oneTimeInitialization() {
-      static const bool s_init{ oneTimeInitializationImpl()};
-      return s_init;
+
+    TestProcessor::~TestProcessor() noexcept(false) { teardownProcessing(); }
+    //
+    // member functions
+    //
+
+    void TestProcessor::put(unsigned int index, std::unique_ptr<WrapperBase> iWrapper) {
+      if (index >= dataProducts_.size()) {
+        throw cms::Exception("LogicError") << "Products must be declared to the TestProcessor::Config object\n"
+                                              "with a call to the function \'produces\' BEFORE passing the\n"
+                                              "TestProcessor::Config object to the TestProcessor constructor";
+      }
+      dataProducts_[index].second = std::move(iWrapper);
     }
-  }
-  
-//
-// constructors and destructor
-//
-TestProcessor::TestProcessor(Config const& iConfig):
-  espController_(std::make_unique<eventsetup::EventSetupsController>()),
-  historyAppender_(std::make_unique<HistoryAppender>()),
-  moduleRegistry_(std::make_shared<ModuleRegistry>())
-{
-  //Setup various singletons
-  (void) oneTimeInitialization();
-  
-  ProcessDescImpl desc(iConfig.pythonConfiguration());
-  
-  auto psetPtr = desc.parameterSet();
-  
-  validateTopLevelParameterSets(psetPtr.get());
-
-  labelOfTestModule_ = psetPtr->getParameter<std::string>("@moduleToTest");
-  
-  auto procDesc = desc.processDesc();
-  // Now do general initialization
-  ScheduleItems items;
-
-  //initialize the services
-  auto& serviceSets = procDesc->getServicesPSets();
-  ServiceToken token = items.initServices(serviceSets, *psetPtr, ServiceToken(), serviceregistry::kOverlapIsError, true);
-  serviceToken_ = items.addCPRandTNS(*psetPtr, token);
-  
-  //make the services available
-  ServiceRegistry::Operate operate(serviceToken_);
-
-  // intialize miscellaneous items
-  std::shared_ptr<CommonParams> common(items.initMisc(*psetPtr));
-  
-  // intialize the event setup provider
-  esp_ = espController_->makeProvider(*psetPtr, items.actReg_.get());
-
-  if(not iConfig.esProduceEntries().empty()) {
-    esHelper_ = std::make_unique<EventSetupTestHelper>(iConfig.esProduceEntries());
-    esp_->add( std::dynamic_pointer_cast<eventsetup::DataProxyProvider>(esHelper_));
-    esp_->add( std::dynamic_pointer_cast<EventSetupRecordIntervalFinder>(esHelper_));
-  }
-
-  auto nThreads = 1U;
-  auto nStreams = 1U;
-  auto nConcurrentLumis = 1U;
-  auto nConcurrentRuns = 1U;
-  preallocations_ = PreallocationConfiguration{nThreads,nStreams,nConcurrentLumis,nConcurrentRuns};
-
-  preg_ = items.preg();
-  processConfiguration_ = items.processConfiguration();
-
-
-  edm::ParameterSet emptyPSet;
-  emptyPSet.registerIt();
-  auto psetid = emptyPSet.id();
-
-  ProcessHistory oldHistory;
-  for(auto const&p: iConfig.extraProcesses() ) {
-    oldHistory.emplace_back(p, psetid, xstr(PROJECT_VERSION), "0");
-    processHistoryRegistry_.registerProcessHistory(oldHistory);
-  }
-  
-  //setup the products we will be adding to the event
-  for(auto const& produce: iConfig.produceEntries()) {
-    auto processName = produce.processName_;
-    if(processName.empty()) {
-      processName =processConfiguration_->processName();
+
+    edm::test::Event TestProcessor::testImpl() {
+      setupProcessing();
+      event();
+
+      bool result = schedule_->totalEventsPassed() > 0;
+      schedule_->clearCounters();
+      if (esHelper_) {
+        //We want each test to have its own ES data products
+        esHelper_->resetAllProxies();
+      }
+      return edm::test::Event(
+          principalCache_.eventPrincipal(0), labelOfTestModule_, processConfiguration_->processName(), result);
     }
-    edm::TypeWithDict twd( produce.type_.typeInfo());
-    edm::BranchDescription product(edm::InEvent,
-                                   produce.moduleLabel_,
-                                   processName,
-                                   twd.userClassName(),
-                                   twd.friendlyClassName(),
-                                   produce.instanceLabel_,
-                                   "",
-                                   psetid,
-                                   twd,
-                                   true //force this to come from 'source'
-                                   );
-    product.init();
-    dataProducts_.emplace_back(product, std::unique_ptr<WrapperBase>());
-    preg_->addProduct(product);
-  }
-
-  
-  schedule_ = items.initSchedule(*psetPtr,false,preallocations_,&processContext_);
-  // set the data members
-  act_table_ = std::move(items.act_table_);
-  actReg_ = items.actReg_;
-  branchIDListHelper_ = items.branchIDListHelper();
-  thinnedAssociationsHelper_ = items.thinnedAssociationsHelper();
-  processContext_.setProcessConfiguration(processConfiguration_.get());
-  principalCache_.setProcessHistoryRegistry(processHistoryRegistry_);
-
-  principalCache_.setNumberOfConcurrentPrincipals(preallocations_);
-
-
-  
-  preg_->setFrozen();
-  for(unsigned int index = 0; index<preallocations_.numberOfStreams(); ++index ) {
-    // Reusable event principal
-    auto ep = std::make_shared<EventPrincipal>(preg_, branchIDListHelper_,
-                                               thinnedAssociationsHelper_, *processConfiguration_, historyAppender_.get(), index);
-    principalCache_.insert(std::move(ep));
-  }
-  
-  for(unsigned int index =0; index < preallocations_.numberOfLuminosityBlocks(); ++index) {
-    auto lp = std::make_unique<LuminosityBlockPrincipal>(preg_, *processConfiguration_,
-                                                         historyAppender_.get(), index);
-    principalCache_.insert(std::move(lp));
-  }
-}
-
-TestProcessor::~TestProcessor() noexcept(false) {
-  teardownProcessing();
-}
-//
-// member functions
-//
-  
-  
-void
-TestProcessor::put(unsigned int index, std::unique_ptr<WrapperBase> iWrapper) {
-  if (index >= dataProducts_.size()) {
-    throw cms::Exception("LogicError")
-      << "Products must be declared to the TestProcessor::Config object\n"
-         "with a call to the function \'produces\' BEFORE passing the\n"
-         "TestProcessor::Config object to the TestProcessor constructor";
-  }
-  dataProducts_[index].second = std::move(iWrapper);
-}
-
-edm::test::Event
-TestProcessor::testImpl() {
-  setupProcessing();
-  event();
-  
-  bool result = schedule_->totalEventsPassed()> 0;
-  schedule_->clearCounters();
-  if(esHelper_) {
-    //We want each test to have its own ES data products
-    esHelper_->resetAllProxies();
-  }
-  return edm::test::Event(principalCache_.eventPrincipal(0),labelOfTestModule_,processConfiguration_->processName(), result);
-}
-
-
-void
-TestProcessor::setupProcessing() {
-  if(not beginJobCalled_) {
-    beginJob();
-  }
-  if(not beginRunCalled_) {
-    beginRun();
-  }
-  if(not beginLumiCalled_) {
-    beginLuminosityBlock();
-  }
-}
-
-void
-TestProcessor::teardownProcessing() {
-  if(beginLumiCalled_) {
-    endLuminosityBlock();
-    beginLumiCalled_ = false;
-  }
-  if(beginRunCalled_) {
-    endRun();
-    beginRunCalled_ = false;
-  }
-  if(beginJobCalled_) {
-    endJob();
-  }
-}
-
-void
-TestProcessor::beginJob() {
-  ServiceRegistry::Operate operate(serviceToken_);
-  
-  service::SystemBounds bounds(preallocations_.numberOfStreams(),
-                               preallocations_.numberOfLuminosityBlocks(),
-                               preallocations_.numberOfRuns(),
-                               preallocations_.numberOfThreads());
-  actReg_->preallocateSignal_(bounds);
-  schedule_->convertCurrentProcessAlias(processConfiguration_->processName());
-  PathsAndConsumesOfModules  pathsAndConsumesOfModules;
-
-  //The code assumes only modules make data in the current process
-  // Since the test os also allowed to do so, it can lead to problems.
-  //pathsAndConsumesOfModules.initialize(schedule_.get(), preg_);
-  
-  //NOTE: this may throw
-  //checkForModuleDependencyCorrectness(pathsAndConsumesOfModules, false);
-  actReg_->preBeginJobSignal_(pathsAndConsumesOfModules, processContext_);
-
-  schedule_->beginJob(*preg_);
-  actReg_->postBeginJobSignal_();
-  
-  for(unsigned int i=0; i<preallocations_.numberOfStreams();++i) {
-    schedule_->beginStream(i);
-  }
-  beginJobCalled_ = true;
-}
-
-void
-TestProcessor::beginRun() {
-  ProcessHistoryID phid;
-  auto aux = std::make_shared<RunAuxiliary>(runNumber_,Timestamp(),Timestamp());
-  auto rp = std::make_shared<RunPrincipal>(aux, preg_, *processConfiguration_, historyAppender_.get(), 0);
-
-  principalCache_.insert(rp);
-  RunPrincipal& runPrincipal = principalCache_.runPrincipal(phid, runNumber_);
-  
-  IOVSyncValue ts(EventID(runPrincipal.run(), 0, 0),
-                  runPrincipal.beginTime());
-  espController_->eventSetupForInstance(ts);
-  
-  auto const& es = esp_->eventSetup();
-
-  std::vector<edm::SubProcess> emptyList;
-  {
-    typedef OccurrenceTraits<RunPrincipal, BranchActionGlobalBegin> Traits;
-    auto globalWaitTask = make_empty_waiting_task();
-    globalWaitTask->increment_ref_count();
-    beginGlobalTransitionAsync<Traits>(WaitingTaskHolder(globalWaitTask.get()),
-                                       *schedule_,
-                                       runPrincipal,
-                                       ts,
-                                       es,
-                                       serviceToken_,
-                                       emptyList);
-    globalWaitTask->wait_for_all();
-    if(globalWaitTask->exceptionPtr() != nullptr) {
-      std::rethrow_exception(* (globalWaitTask->exceptionPtr()) );
+
+    void TestProcessor::setupProcessing() {
+      if (not beginJobCalled_) {
+        beginJob();
+      }
+      if (not beginRunCalled_) {
+        beginRun();
+      }
+      if (not beginLumiCalled_) {
+        beginLuminosityBlock();
+      }
+    }
+
+    void TestProcessor::teardownProcessing() {
+      if (beginLumiCalled_) {
+        endLuminosityBlock();
+        beginLumiCalled_ = false;
+      }
+      if (beginRunCalled_) {
+        endRun();
+        beginRunCalled_ = false;
+      }
+      if (beginJobCalled_) {
+        endJob();
+      }
     }
-  }
-  {
-    //To wait, the ref count has to be 1+#streams
-    auto streamLoopWaitTask = make_empty_waiting_task();
-    streamLoopWaitTask->increment_ref_count();
-    
-    typedef OccurrenceTraits<RunPrincipal, BranchActionStreamBegin> Traits;
-    
-    beginStreamsTransitionAsync<Traits>(streamLoopWaitTask.get(),
-                                        *schedule_,
-                                        preallocations_.numberOfStreams(),
-                                        runPrincipal,
-                                        ts,
-                                        es,
-                                        serviceToken_,
-                                        emptyList);
-    
-    streamLoopWaitTask->wait_for_all();
-    if(streamLoopWaitTask->exceptionPtr() != nullptr) {
-      std::rethrow_exception(* (streamLoopWaitTask->exceptionPtr()) );
+
+    void TestProcessor::beginJob() {
+      ServiceRegistry::Operate operate(serviceToken_);
+
+      service::SystemBounds bounds(preallocations_.numberOfStreams(),
+                                   preallocations_.numberOfLuminosityBlocks(),
+                                   preallocations_.numberOfRuns(),
+                                   preallocations_.numberOfThreads());
+      actReg_->preallocateSignal_(bounds);
+      schedule_->convertCurrentProcessAlias(processConfiguration_->processName());
+      PathsAndConsumesOfModules pathsAndConsumesOfModules;
+
+      //The code assumes only modules make data in the current process
+      // Since the test os also allowed to do so, it can lead to problems.
+      //pathsAndConsumesOfModules.initialize(schedule_.get(), preg_);
+
+      //NOTE: this may throw
+      //checkForModuleDependencyCorrectness(pathsAndConsumesOfModules, false);
+      actReg_->preBeginJobSignal_(pathsAndConsumesOfModules, processContext_);
+
+      schedule_->beginJob(*preg_, esp_->recordsToProxyIndices());
+      actReg_->postBeginJobSignal_();
+
+      for (unsigned int i = 0; i < preallocations_.numberOfStreams(); ++i) {
+        schedule_->beginStream(i);
+      }
+      beginJobCalled_ = true;
     }
-  }
-  beginRunCalled_ = true;
-}
-
-void
-TestProcessor::beginLuminosityBlock() {
-  LuminosityBlockAuxiliary aux(runNumber_,lumiNumber_,Timestamp(), Timestamp());
-  lumiPrincipal_ = principalCache_.getAvailableLumiPrincipalPtr();
-  assert(lumiPrincipal_);
-  lumiPrincipal_->setAux(aux);
-  
-  lumiPrincipal_->setRunPrincipal(principalCache_.runPrincipalPtr());
-  
-  IOVSyncValue ts(EventID(runNumber_, lumiNumber_, eventNumber_),
-                  lumiPrincipal_->beginTime());
-  espController_->eventSetupForInstance(ts);
-  
-  auto const& es = esp_->eventSetup();
-  
-  std::vector<edm::SubProcess> emptyList;
-  {
-    typedef OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalBegin> Traits;
-    auto globalWaitTask = make_empty_waiting_task();
-    globalWaitTask->increment_ref_count();
-    beginGlobalTransitionAsync<Traits>(WaitingTaskHolder(globalWaitTask.get()),
-                                       *schedule_,
-                                       *lumiPrincipal_,
-                                       ts,
-                                       es,
-                                       serviceToken_,
-                                       emptyList);
-    globalWaitTask->wait_for_all();
-    if(globalWaitTask->exceptionPtr() != nullptr) {
-      std::rethrow_exception(* (globalWaitTask->exceptionPtr()) );
+
+    void TestProcessor::beginRun() {
+      ProcessHistoryID phid;
+      auto aux = std::make_shared<RunAuxiliary>(runNumber_, Timestamp(), Timestamp());
+      auto rp = std::make_shared<RunPrincipal>(aux, preg_, *processConfiguration_, historyAppender_.get(), 0);
+
+      principalCache_.insert(rp);
+      RunPrincipal& runPrincipal = principalCache_.runPrincipal(phid, runNumber_);
+
+      IOVSyncValue ts(EventID(runPrincipal.run(), 0, 0), runPrincipal.beginTime());
+      espController_->eventSetupForInstance(ts);
+
+      auto const& es = esp_->eventSetup();
+
+      std::vector<edm::SubProcess> emptyList;
+      {
+        typedef OccurrenceTraits<RunPrincipal, BranchActionGlobalBegin> Traits;
+        auto globalWaitTask = make_empty_waiting_task();
+        globalWaitTask->increment_ref_count();
+        beginGlobalTransitionAsync<Traits>(
+            WaitingTaskHolder(globalWaitTask.get()), *schedule_, runPrincipal, ts, es, serviceToken_, emptyList);
+        globalWaitTask->wait_for_all();
+        if (globalWaitTask->exceptionPtr() != nullptr) {
+          std::rethrow_exception(*(globalWaitTask->exceptionPtr()));
+        }
+      }
+      {
+        //To wait, the ref count has to be 1+#streams
+        auto streamLoopWaitTask = make_empty_waiting_task();
+        streamLoopWaitTask->increment_ref_count();
+
+        typedef OccurrenceTraits<RunPrincipal, BranchActionStreamBegin> Traits;
+
+        beginStreamsTransitionAsync<Traits>(streamLoopWaitTask.get(),
+                                            *schedule_,
+                                            preallocations_.numberOfStreams(),
+                                            runPrincipal,
+                                            ts,
+                                            es,
+                                            serviceToken_,
+                                            emptyList);
+
+        streamLoopWaitTask->wait_for_all();
+        if (streamLoopWaitTask->exceptionPtr() != nullptr) {
+          std::rethrow_exception(*(streamLoopWaitTask->exceptionPtr()));
+        }
+      }
+      beginRunCalled_ = true;
     }
-  }
-  {
-    //To wait, the ref count has to be 1+#streams
-    auto streamLoopWaitTask = make_empty_waiting_task();
-    streamLoopWaitTask->increment_ref_count();
-    
-    typedef OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamBegin> Traits;
-    
-    beginStreamsTransitionAsync<Traits>(streamLoopWaitTask.get(),
-                                        *schedule_,
-                                        preallocations_.numberOfStreams(),
-                                        *lumiPrincipal_,
-                                        ts,
-                                        es,
-                                        serviceToken_,
-                                        emptyList);
-    
-    streamLoopWaitTask->wait_for_all();
-    if(streamLoopWaitTask->exceptionPtr() != nullptr) {
-      std::rethrow_exception(* (streamLoopWaitTask->exceptionPtr()) );
+
+    void TestProcessor::beginLuminosityBlock() {
+      LuminosityBlockAuxiliary aux(runNumber_, lumiNumber_, Timestamp(), Timestamp());
+      lumiPrincipal_ = principalCache_.getAvailableLumiPrincipalPtr();
+      assert(lumiPrincipal_);
+      lumiPrincipal_->setAux(aux);
+
+      lumiPrincipal_->setRunPrincipal(principalCache_.runPrincipalPtr());
+
+      IOVSyncValue ts(EventID(runNumber_, lumiNumber_, eventNumber_), lumiPrincipal_->beginTime());
+      espController_->eventSetupForInstance(ts);
+
+      auto const& es = esp_->eventSetup();
+
+      std::vector<edm::SubProcess> emptyList;
+      {
+        typedef OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalBegin> Traits;
+        auto globalWaitTask = make_empty_waiting_task();
+        globalWaitTask->increment_ref_count();
+        beginGlobalTransitionAsync<Traits>(
+            WaitingTaskHolder(globalWaitTask.get()), *schedule_, *lumiPrincipal_, ts, es, serviceToken_, emptyList);
+        globalWaitTask->wait_for_all();
+        if (globalWaitTask->exceptionPtr() != nullptr) {
+          std::rethrow_exception(*(globalWaitTask->exceptionPtr()));
+        }
+      }
+      {
+        //To wait, the ref count has to be 1+#streams
+        auto streamLoopWaitTask = make_empty_waiting_task();
+        streamLoopWaitTask->increment_ref_count();
+
+        typedef OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamBegin> Traits;
+
+        beginStreamsTransitionAsync<Traits>(streamLoopWaitTask.get(),
+                                            *schedule_,
+                                            preallocations_.numberOfStreams(),
+                                            *lumiPrincipal_,
+                                            ts,
+                                            es,
+                                            serviceToken_,
+                                            emptyList);
+
+        streamLoopWaitTask->wait_for_all();
+        if (streamLoopWaitTask->exceptionPtr() != nullptr) {
+          std::rethrow_exception(*(streamLoopWaitTask->exceptionPtr()));
+        }
+      }
+      beginLumiCalled_ = true;
     }
-  }
-  beginLumiCalled_ = true;
-}
-
-void
-TestProcessor::event() {
-  auto pep = &(principalCache_.eventPrincipal(0));
-
-  //this resets the EventPrincipal (if it had been used before)
-  pep->clearEventPrincipal();
-  pep->fillEventPrincipal(edm::EventAuxiliary(EventID(runNumber_,lumiNumber_,eventNumber_), "", Timestamp(),
-                                              false),
-                          processHistoryRegistry_,
-                          nullptr
-                          );
-  assert(lumiPrincipal_.get() != nullptr);
-  pep->setLuminosityBlockPrincipal(lumiPrincipal_.get());
-  
-  for(auto& p: dataProducts_) {
-    if(p.second) {
-      pep->put(p.first, std::move(p.second), ProductProvenance(p.first.branchID()));
-    } else {
-      //The data product was not set so we need to
-      // tell the ProductResolver not to wait
-      auto r = pep->getProductResolver(p.first.branchID());
-      r->putProduct(std::unique_ptr<WrapperBase>());
+
+    void TestProcessor::event() {
+      auto pep = &(principalCache_.eventPrincipal(0));
+
+      //this resets the EventPrincipal (if it had been used before)
+      pep->clearEventPrincipal();
+      pep->fillEventPrincipal(
+          edm::EventAuxiliary(EventID(runNumber_, lumiNumber_, eventNumber_), "", Timestamp(), false),
+          processHistoryRegistry_,
+          nullptr);
+      assert(lumiPrincipal_.get() != nullptr);
+      pep->setLuminosityBlockPrincipal(lumiPrincipal_.get());
+
+      for (auto& p : dataProducts_) {
+        if (p.second) {
+          pep->put(p.first, std::move(p.second), ProductProvenance(p.first.branchID()));
+        } else {
+          //The data product was not set so we need to
+          // tell the ProductResolver not to wait
+          auto r = pep->getProductResolver(p.first.branchID());
+          r->putProduct(std::unique_ptr<WrapperBase>());
+        }
+      }
+
+      ServiceRegistry::Operate operate(serviceToken_);
+
+      auto waitTask = make_empty_waiting_task();
+      waitTask->increment_ref_count();
+
+      schedule_->processOneEventAsync(
+          edm::WaitingTaskHolder(waitTask.get()), 0, *pep, esp_->eventSetup(), serviceToken_);
+
+      waitTask->wait_for_all();
+      if (waitTask->exceptionPtr() != nullptr) {
+        std::rethrow_exception(*(waitTask->exceptionPtr()));
+      }
+      ++eventNumber_;
     }
-  }
-  
-  ServiceRegistry::Operate operate(serviceToken_);
-
-  auto waitTask = make_empty_waiting_task();
-  waitTask->increment_ref_count();
-
-  schedule_->processOneEventAsync(edm::WaitingTaskHolder(waitTask.get()),
-                                  0,*pep, esp_->eventSetup(), serviceToken_);
-
-  waitTask->wait_for_all();
-  if(waitTask->exceptionPtr() != nullptr) {
-    std::rethrow_exception(* (waitTask->exceptionPtr()) );
-  }
-  ++eventNumber_;
-}
-  
-void
-TestProcessor::endLuminosityBlock() {
-  if(beginLumiCalled_) {
-    beginLumiCalled_ = false;
-    auto lumiPrincipal = lumiPrincipal_;
-    lumiPrincipal_.reset();
-
-    IOVSyncValue ts(EventID(runNumber_, lumiNumber_, eventNumber_),
-                    lumiPrincipal->endTime());
-    espController_->eventSetupForInstance(ts);
-    
-    auto const& es = esp_->eventSetup();
-
-    std::vector<edm::SubProcess> emptyList;
-
-    //To wait, the ref count has to be 1+#streams
-    {
-      auto streamLoopWaitTask = make_empty_waiting_task();
-      streamLoopWaitTask->increment_ref_count();
-      
-      using Traits = OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamEnd>;
-      
-      endStreamsTransitionAsync<Traits>(WaitingTaskHolder(streamLoopWaitTask.get()),
-                                        *schedule_,
-                                        preallocations_.numberOfStreams(),
-                                        *lumiPrincipal,
-                                        ts,
-                                        es,
-                                        serviceToken_,
-                                        emptyList,
-                                        false);
-      
-      streamLoopWaitTask->wait_for_all();
-      if(streamLoopWaitTask->exceptionPtr() != nullptr) {
-        std::rethrow_exception(* (streamLoopWaitTask->exceptionPtr()) );
+
+    void TestProcessor::endLuminosityBlock() {
+      if (beginLumiCalled_) {
+        beginLumiCalled_ = false;
+        auto lumiPrincipal = lumiPrincipal_;
+        lumiPrincipal_.reset();
+
+        IOVSyncValue ts(EventID(runNumber_, lumiNumber_, eventNumber_), lumiPrincipal->endTime());
+        espController_->eventSetupForInstance(ts);
+
+        auto const& es = esp_->eventSetup();
+
+        std::vector<edm::SubProcess> emptyList;
+
+        //To wait, the ref count has to be 1+#streams
+        {
+          auto streamLoopWaitTask = make_empty_waiting_task();
+          streamLoopWaitTask->increment_ref_count();
+
+          using Traits = OccurrenceTraits<LuminosityBlockPrincipal, BranchActionStreamEnd>;
+
+          endStreamsTransitionAsync<Traits>(WaitingTaskHolder(streamLoopWaitTask.get()),
+                                            *schedule_,
+                                            preallocations_.numberOfStreams(),
+                                            *lumiPrincipal,
+                                            ts,
+                                            es,
+                                            serviceToken_,
+                                            emptyList,
+                                            false);
+
+          streamLoopWaitTask->wait_for_all();
+          if (streamLoopWaitTask->exceptionPtr() != nullptr) {
+            std::rethrow_exception(*(streamLoopWaitTask->exceptionPtr()));
+          }
+        }
+        {
+          auto globalWaitTask = make_empty_waiting_task();
+          globalWaitTask->increment_ref_count();
+
+          typedef OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalEnd> Traits;
+          endGlobalTransitionAsync<Traits>(WaitingTaskHolder(globalWaitTask.get()),
+                                           *schedule_,
+                                           *lumiPrincipal,
+                                           ts,
+                                           es,
+                                           serviceToken_,
+                                           emptyList,
+                                           false);
+          globalWaitTask->wait_for_all();
+          if (globalWaitTask->exceptionPtr() != nullptr) {
+            std::rethrow_exception(*(globalWaitTask->exceptionPtr()));
+          }
+        }
       }
     }
-    {
-      auto globalWaitTask = make_empty_waiting_task();
-      globalWaitTask->increment_ref_count();
-      
-      typedef OccurrenceTraits<LuminosityBlockPrincipal, BranchActionGlobalEnd> Traits;
-      endGlobalTransitionAsync<Traits>(WaitingTaskHolder(globalWaitTask.get()),
-                                       *schedule_,
-                                       *lumiPrincipal,
-                                       ts,
-                                       es,
-                                       serviceToken_,
-                                       emptyList,
-                                       false);
-      globalWaitTask->wait_for_all();
-      if(globalWaitTask->exceptionPtr() != nullptr) {
-        std::rethrow_exception(* (globalWaitTask->exceptionPtr()) );
+
+    void TestProcessor::endRun() {
+      if (beginRunCalled_) {
+        beginRunCalled_ = false;
+        ProcessHistoryID phid;
+
+        RunPrincipal& runPrincipal = principalCache_.runPrincipal(phid, runNumber_);
+
+        IOVSyncValue ts(
+            EventID(runPrincipal.run(), LuminosityBlockID::maxLuminosityBlockNumber(), EventID::maxEventNumber()),
+            runPrincipal.endTime());
+        espController_->eventSetupForInstance(ts);
+
+        auto const& es = esp_->eventSetup();
+
+        std::vector<edm::SubProcess> emptyList;
+
+        //To wait, the ref count has to be 1+#streams
+        {
+          auto streamLoopWaitTask = make_empty_waiting_task();
+          streamLoopWaitTask->increment_ref_count();
+
+          using Traits = OccurrenceTraits<RunPrincipal, BranchActionStreamEnd>;
+
+          endStreamsTransitionAsync<Traits>(WaitingTaskHolder(streamLoopWaitTask.get()),
+                                            *schedule_,
+                                            preallocations_.numberOfStreams(),
+                                            runPrincipal,
+                                            ts,
+                                            es,
+                                            serviceToken_,
+                                            emptyList,
+                                            false);
+
+          streamLoopWaitTask->wait_for_all();
+          if (streamLoopWaitTask->exceptionPtr() != nullptr) {
+            std::rethrow_exception(*(streamLoopWaitTask->exceptionPtr()));
+          }
+        }
+        {
+          auto globalWaitTask = make_empty_waiting_task();
+          globalWaitTask->increment_ref_count();
+
+          typedef OccurrenceTraits<RunPrincipal, BranchActionGlobalEnd> Traits;
+          endGlobalTransitionAsync<Traits>(WaitingTaskHolder(globalWaitTask.get()),
+                                           *schedule_,
+                                           runPrincipal,
+                                           ts,
+                                           es,
+                                           serviceToken_,
+                                           emptyList,
+                                           false);
+          globalWaitTask->wait_for_all();
+          if (globalWaitTask->exceptionPtr() != nullptr) {
+            std::rethrow_exception(*(globalWaitTask->exceptionPtr()));
+          }
+        }
+
+        principalCache_.deleteRun(phid, runNumber_);
       }
     }
-  }
-}
-
-void
-TestProcessor::endRun() {
-  if(beginRunCalled_) {
-    beginRunCalled_ = false;
-    ProcessHistoryID phid;
-    
-    RunPrincipal& runPrincipal = principalCache_.runPrincipal(phid, runNumber_);
-    
-    IOVSyncValue ts(EventID(runPrincipal.run(), LuminosityBlockID::maxLuminosityBlockNumber(), EventID::maxEventNumber()),
-                    runPrincipal.endTime());
-    espController_->eventSetupForInstance(ts);
-    
-    auto const& es = esp_->eventSetup();
-    
-    std::vector<edm::SubProcess> emptyList;
-    
-    //To wait, the ref count has to be 1+#streams
-    {
-      auto streamLoopWaitTask = make_empty_waiting_task();
-      streamLoopWaitTask->increment_ref_count();
-      
-      using Traits = OccurrenceTraits<RunPrincipal, BranchActionStreamEnd>;
-      
-      endStreamsTransitionAsync<Traits>(WaitingTaskHolder(streamLoopWaitTask.get()),
-                                        *schedule_,
-                                        preallocations_.numberOfStreams(),
-                                        runPrincipal,
-                                        ts,
-                                        es,
-                                        serviceToken_,
-                                        emptyList,
-                                        false);
-      
-      streamLoopWaitTask->wait_for_all();
-      if(streamLoopWaitTask->exceptionPtr() != nullptr) {
-        std::rethrow_exception(* (streamLoopWaitTask->exceptionPtr()) );
+
+    void TestProcessor::endJob() {
+      // Collects exceptions, so we don't throw before all operations are performed.
+      ExceptionCollector c(
+          "Multiple exceptions were thrown while executing endJob. An exception message follows for each.\n");
+
+      //make the services available
+      ServiceRegistry::Operate operate(serviceToken_);
+
+      //NOTE: this really should go elsewhere in the future
+      for (unsigned int i = 0; i < preallocations_.numberOfStreams(); ++i) {
+        c.call([this, i]() { this->schedule_->endStream(i); });
+      }
+      auto actReg = actReg_.get();
+      c.call([actReg]() { actReg->preEndJobSignal_(); });
+      schedule_->endJob(c);
+      c.call([actReg]() { actReg->postEndJobSignal_(); });
+      if (c.hasThrown()) {
+        c.rethrow();
       }
     }
-    {
-      auto globalWaitTask = make_empty_waiting_task();
-      globalWaitTask->increment_ref_count();
-      
-      typedef OccurrenceTraits<RunPrincipal, BranchActionGlobalEnd> Traits;
-      endGlobalTransitionAsync<Traits>(WaitingTaskHolder(globalWaitTask.get()),
-                                       *schedule_,
-                                       runPrincipal,
-                                       ts,
-                                       es,
-                                       serviceToken_,
-                                       emptyList,
-                                       false);
-      globalWaitTask->wait_for_all();
-      if(globalWaitTask->exceptionPtr() != nullptr) {
-        std::rethrow_exception(* (globalWaitTask->exceptionPtr()) );
+
+    void TestProcessor::setRunNumber(edm::RunNumber_t iRun) {
+      if (beginRunCalled_) {
+        endLuminosityBlock();
+        endRun();
       }
+      runNumber_ = iRun;
+    }
+    void TestProcessor::setLuminosityBlockNumber(edm::LuminosityBlockNumber_t iLumi) {
+      endLuminosityBlock();
+      lumiNumber_ = iLumi;
     }
-    
-    principalCache_.deleteRun(phid, runNumber_);
-  }
-}
-
-void
-TestProcessor::endJob() {
-  // Collects exceptions, so we don't throw before all operations are performed.
-  ExceptionCollector c("Multiple exceptions were thrown while executing endJob. An exception message follows for each.\n");
-  
-  //make the services available
-  ServiceRegistry::Operate operate(serviceToken_);
-  
-  //NOTE: this really should go elsewhere in the future
-  for(unsigned int i=0; i<preallocations_.numberOfStreams();++i) {
-    c.call([this,i](){this->schedule_->endStream(i);});
-  }
-  auto actReg = actReg_.get();
-  c.call([actReg](){actReg->preEndJobSignal_();});
-  schedule_->endJob(c);
-  c.call([actReg](){actReg->postEndJobSignal_();});
-  if(c.hasThrown()) {
-    c.rethrow();
-  }
-}
-
-void
-TestProcessor::setRunNumber(edm::RunNumber_t iRun) {
-  if(beginRunCalled_) {
-    endLuminosityBlock();
-    endRun();
-  }
-  runNumber_=iRun;
-
-}
-void
-TestProcessor::setLuminosityBlockNumber(edm::LuminosityBlockNumber_t iLumi) {
-  endLuminosityBlock();
-  lumiNumber_ = iLumi;
-}
-
-void
-TestProcessor::setEventNumber(edm::EventNumber_t iEv) {
-  eventNumber_ = iEv;
-}
 
-//
-// const member functions
-//
+    void TestProcessor::setEventNumber(edm::EventNumber_t iEv) { eventNumber_ = iEv; }
 
-//
-// static member functions
-//
-  
-}
-}
+    //
+    // const member functions
+    //
+
+    //
+    // static member functions
+    //
 
+  }  // namespace test
+}  // namespace edm
diff --git a/FWCore/TestProcessor/test/testprocessor_t.cppunit.cc b/FWCore/TestProcessor/test/testprocessor_t.cppunit.cc
index b10ca6daace60..c01b47dc83653 100644
--- a/FWCore/TestProcessor/test/testprocessor_t.cppunit.cc
+++ b/FWCore/TestProcessor/test/testprocessor_t.cppunit.cc
@@ -26,7 +26,7 @@
 #include <algorithm>
 #include <set>
 
-class testTestProcessor: public CppUnit::TestFixture {
+class testTestProcessor : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testTestProcessor);
   CPPUNIT_TEST(simpleProcessTest);
   CPPUNIT_TEST(addProductTest);
@@ -39,10 +39,11 @@ class testTestProcessor: public CppUnit::TestFixture {
   CPPUNIT_TEST(emptyRunTest);
   CPPUNIT_TEST(emptyLumiTest);
 
-CPPUNIT_TEST_SUITE_END();
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
   void simpleProcessTest();
   void addProductTest();
   void missingProductTest();
@@ -53,164 +54,169 @@ CPPUNIT_TEST_SUITE_END();
   void taskTest();
   void emptyRunTest();
   void emptyLumiTest();
-private:
 
+private:
 };
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testTestProcessor);
 
 void testTestProcessor::simpleProcessTest() {
-   char const* kTest = "from FWCore.TestProcessor.TestProcess import *\n"
-                       "process = TestProcess()\n"
-                       "process.foo = cms.EDProducer('IntProducer', ivalue=cms.int32(1))\n"
-                       "process.moduleToTest(process.foo)\n";
+  char const* kTest =
+      "from FWCore.TestProcessor.TestProcess import *\n"
+      "process = TestProcess()\n"
+      "process.foo = cms.EDProducer('IntProducer', ivalue=cms.int32(1))\n"
+      "process.moduleToTest(process.foo)\n";
   edm::test::TestProcessor::Config config(kTest);
   edm::test::TestProcessor tester(config);
   CPPUNIT_ASSERT(tester.labelOfTestModule() == "foo");
-  
-  auto event=tester.test();
-  
+
+  auto event = tester.test();
+
   CPPUNIT_ASSERT(event.get<edmtest::IntProduct>()->value == 1);
 
   CPPUNIT_ASSERT(not event.get<edmtest::IntProduct>("doesNotExist"));
-  CPPUNIT_ASSERT_THROW( *event.get<edmtest::IntProduct>("doesNotExist"), cms::Exception);
+  CPPUNIT_ASSERT_THROW(*event.get<edmtest::IntProduct>("doesNotExist"), cms::Exception);
 }
 
 void testTestProcessor::addProductTest() {
-  char const* kTest = "from FWCore.TestProcessor.TestProcess import *\n"
-  "process = TestProcess()\n"
-  "process.add = cms.EDProducer('AddIntsProducer', labels=cms.vstring('in'))\n"
-  "process.moduleToTest(process.add)\n";
+  char const* kTest =
+      "from FWCore.TestProcessor.TestProcess import *\n"
+      "process = TestProcess()\n"
+      "process.add = cms.EDProducer('AddIntsProducer', labels=cms.vstring('in'))\n"
+      "process.moduleToTest(process.add)\n";
   edm::test::TestProcessor::Config config(kTest);
   auto token = config.produces<edmtest::IntProduct>("in");
 
   edm::test::TestProcessor tester(config);
 
   {
-    auto event=tester.test(std::make_pair(token,std::make_unique<edmtest::IntProduct>(1)));
-  
+    auto event = tester.test(std::make_pair(token, std::make_unique<edmtest::IntProduct>(1)));
+
     CPPUNIT_ASSERT(event.get<edmtest::IntProduct>()->value == 1);
   }
-  
+
   {
-    auto event=tester.test(std::make_pair(token,std::make_unique<edmtest::IntProduct>(2)));
-    
+    auto event = tester.test(std::make_pair(token, std::make_unique<edmtest::IntProduct>(2)));
+
     CPPUNIT_ASSERT(event.get<edmtest::IntProduct>()->value == 2);
   }
 
   //Check that event gets reset so the data product is not available
-  CPPUNIT_ASSERT_THROW( tester.test(), cms::Exception);
-  
+  CPPUNIT_ASSERT_THROW(tester.test(), cms::Exception);
 }
 
 void testTestProcessor::missingProductTest() {
-  char const* kTest = "from FWCore.TestProcessor.TestProcess import *\n"
-  "process = TestProcess()\n"
-  "process.add = cms.EDProducer('AddIntsProducer', labels=cms.vstring('in'))\n"
-  "process.moduleToTest(process.add)\n";
+  char const* kTest =
+      "from FWCore.TestProcessor.TestProcess import *\n"
+      "process = TestProcess()\n"
+      "process.add = cms.EDProducer('AddIntsProducer', labels=cms.vstring('in'))\n"
+      "process.moduleToTest(process.add)\n";
   edm::test::TestProcessor::Config config(kTest);
-  
+
   edm::test::TestProcessor tester(config);
-  
+
   CPPUNIT_ASSERT_THROW(tester.test(), cms::Exception);
-  
 }
 
 void testTestProcessor::filterTest() {
-  char const* kTest = "from FWCore.TestProcessor.TestProcess import *\n"
-  "process = TestProcess()\n"
-  "process.foo = cms.EDFilter('TestFilterModule', acceptValue=cms.untracked.int32(2),\n"
-  "   onlyOne = cms.untracked.bool(True))\n"
-  "process.moduleToTest(process.foo)\n";
+  char const* kTest =
+      "from FWCore.TestProcessor.TestProcess import *\n"
+      "process = TestProcess()\n"
+      "process.foo = cms.EDFilter('TestFilterModule', acceptValue=cms.untracked.int32(2),\n"
+      "   onlyOne = cms.untracked.bool(True))\n"
+      "process.moduleToTest(process.foo)\n";
   edm::test::TestProcessor::Config config(kTest);
   edm::test::TestProcessor tester(config);
   CPPUNIT_ASSERT(tester.labelOfTestModule() == "foo");
-  
+
   CPPUNIT_ASSERT(not tester.test().modulePassed());
   CPPUNIT_ASSERT(tester.test().modulePassed());
   CPPUNIT_ASSERT(not tester.test().modulePassed());
   CPPUNIT_ASSERT(tester.test().modulePassed());
-
 }
 
 void testTestProcessor::extraProcessTest() {
-  char const* kTest = "from FWCore.TestProcessor.TestProcess import *\n"
-  "process = TestProcess()\n"
-  "process.add = cms.EDProducer('AddIntsProducer', labels=cms.vstring('in'))\n"
-  "process.moduleToTest(process.add)\n";
+  char const* kTest =
+      "from FWCore.TestProcessor.TestProcess import *\n"
+      "process = TestProcess()\n"
+      "process.add = cms.EDProducer('AddIntsProducer', labels=cms.vstring('in'))\n"
+      "process.moduleToTest(process.add)\n";
   edm::test::TestProcessor::Config config(kTest);
   auto processToken = config.addExtraProcess("HLT");
-  auto token = config.produces<edmtest::IntProduct>("in","",processToken);
-  
+  auto token = config.produces<edmtest::IntProduct>("in", "", processToken);
+
   edm::test::TestProcessor tester(config);
-  
+
   {
-    auto event=tester.test(std::make_pair(token,std::make_unique<edmtest::IntProduct>(1)));
-    
+    auto event = tester.test(std::make_pair(token, std::make_unique<edmtest::IntProduct>(1)));
+
     CPPUNIT_ASSERT(event.get<edmtest::IntProduct>()->value == 1);
   }
-  
 }
 
 void testTestProcessor::eventSetupTest() {
-  char const* kTest = "from FWCore.TestProcessor.TestProcess import *\n"
-  "process = TestProcess()\n"
-  "process.emptyESSourceA1 = cms.ESSource('EmptyESSource',"
-                                         "recordName = cms.string('ESTestRecordA'),"
-                                         "firstValid = cms.vuint32(1,2),"
-                                         "iovIsRunNotTime = cms.bool(True)"
-                                         ")\n"
-
-  "process.add_(cms.ESProducer('ESTestProducerA') )\n"
-  "process.add = cms.EDAnalyzer('ESTestAnalyzerA', runsToGetDataFor = cms.vint32(1,2), expectedValues=cms.untracked.vint32(1,2))\n"
-  "process.moduleToTest(process.add)\n";
+  char const* kTest =
+      "from FWCore.TestProcessor.TestProcess import *\n"
+      "process = TestProcess()\n"
+      "process.emptyESSourceA1 = cms.ESSource('EmptyESSource',"
+      "recordName = cms.string('ESTestRecordA'),"
+      "firstValid = cms.vuint32(1,2),"
+      "iovIsRunNotTime = cms.bool(True)"
+      ")\n"
+
+      "process.add_(cms.ESProducer('ESTestProducerA') )\n"
+      "process.add = cms.EDAnalyzer('ESTestAnalyzerA', runsToGetDataFor = cms.vint32(1,2), "
+      "expectedValues=cms.untracked.vint32(1,2))\n"
+      "process.moduleToTest(process.add)\n";
   edm::test::TestProcessor::Config config(kTest);
-  
+
   edm::test::TestProcessor tester(config);
-  
-  (void) tester.test();
+
+  (void)tester.test();
 
   tester.setRunNumber(2);
-  (void) tester.test();
+  (void)tester.test();
 }
 
 void testTestProcessor::eventSetupPutTest() {
-  char const* kTest = "from FWCore.TestProcessor.TestProcess import *\n"
-  "process = TestProcess()\n"
-  "process.add = cms.EDAnalyzer('ESTestAnalyzerA', runsToGetDataFor = cms.vint32(1,2,3), expectedValues=cms.untracked.vint32(1,2,2))\n"
-  "process.moduleToTest(process.add)\n";
+  char const* kTest =
+      "from FWCore.TestProcessor.TestProcess import *\n"
+      "process = TestProcess()\n"
+      "process.add = cms.EDAnalyzer('ESTestAnalyzerA', runsToGetDataFor = cms.vint32(1,2,3), "
+      "expectedValues=cms.untracked.vint32(1,2,2))\n"
+      "process.moduleToTest(process.add)\n";
   edm::test::TestProcessor::Config config(kTest);
-  auto estoken = config.esProduces<ESTestRecordA,edmtest::ESTestDataA>();
+  auto estoken = config.esProduces<ESTestRecordA, edmtest::ESTestDataA>();
 
   edm::test::TestProcessor tester(config);
-  
-  (void) tester.test(std::make_pair(estoken, std::make_unique<edmtest::ESTestDataA>(1)));
-  
+
+  (void)tester.test(std::make_pair(estoken, std::make_unique<edmtest::ESTestDataA>(1)));
+
   tester.setRunNumber(2);
-  (void) tester.test(std::make_pair(estoken, std::make_unique<edmtest::ESTestDataA>(2)));
-  
+  (void)tester.test(std::make_pair(estoken, std::make_unique<edmtest::ESTestDataA>(2)));
+
   tester.setRunNumber(3);
   CPPUNIT_ASSERT_THROW(tester.test(), cms::Exception);
 }
 
 void testTestProcessor::taskTest() {
-  char const* kTest = "from FWCore.TestProcessor.TestProcess import *\n"
-  "process = TestProcess()\n"
-  "process.mid = cms.EDProducer('AddIntsProducer', labels=cms.vstring('in'))\n"
-  "process.add = cms.EDProducer('AddIntsProducer', labels=cms.vstring('mid','in'))\n"
-  "process.moduleToTest(process.add,cms.Task(process.mid))\n";
+  char const* kTest =
+      "from FWCore.TestProcessor.TestProcess import *\n"
+      "process = TestProcess()\n"
+      "process.mid = cms.EDProducer('AddIntsProducer', labels=cms.vstring('in'))\n"
+      "process.add = cms.EDProducer('AddIntsProducer', labels=cms.vstring('mid','in'))\n"
+      "process.moduleToTest(process.add,cms.Task(process.mid))\n";
   edm::test::TestProcessor::Config config(kTest);
   auto token = config.produces<edmtest::IntProduct>("in");
-  
+
   edm::test::TestProcessor tester(config);
-  
+
   {
-    auto event=tester.test(std::make_pair(token,std::make_unique<edmtest::IntProduct>(1)));
-    
+    auto event = tester.test(std::make_pair(token, std::make_unique<edmtest::IntProduct>(1)));
+
     CPPUNIT_ASSERT(event.get<edmtest::IntProduct>()->value == 2);
   }
-
 }
 
 void testTestProcessor::emptyRunTest() {
@@ -222,11 +228,10 @@ process.toTest = cms.EDAnalyzer('RunLumiEventChecker',
 process.moduleToTest(process.toTest)
 )_";
   edm::test::TestProcessor::Config config(kTest);
-  
+
   edm::test::TestProcessor tester(config);
-  
+
   tester.testRunWithNoLuminosityBlocks();
-  
 }
 void testTestProcessor::emptyLumiTest() {
   auto const kTest = R"_(from FWCore.TestProcessor.TestProcess import *
@@ -238,12 +243,10 @@ process.toTest = cms.EDAnalyzer('RunLumiEventChecker',
 process.moduleToTest(process.toTest)
 )_";
   edm::test::TestProcessor::Config config(kTest);
-  
+
   edm::test::TestProcessor tester(config);
-  
+
   tester.testLuminosityBlockWithNoEvents();
-  
 }
 
 #include <Utilities/Testing/interface/CppUnit_testdriver.icpp>
-
diff --git a/FWCore/Utilities/bin/edmToFriendlyClassName.cc b/FWCore/Utilities/bin/edmToFriendlyClassName.cc
index 115fdfd9a486b..f6f350f1be291 100644
--- a/FWCore/Utilities/bin/edmToFriendlyClassName.cc
+++ b/FWCore/Utilities/bin/edmToFriendlyClassName.cc
@@ -17,14 +17,12 @@
 #include <iostream>
 #include <stdexcept>
 
-int
-main(int argc, char* argv[]) try {
-  for(int index = 1; index < argc; ++index) {
+int main(int argc, char* argv[]) try {
+  for (int index = 1; index < argc; ++index) {
     std::cout << edm::friendlyname::friendlyName(argv[index]) << std::endl;
   }
   return 0;
-}
-catch(std::exception const& e) {
+} catch (std::exception const& e) {
   std::cerr << e.what() << std::endl;
   return 1;
 }
diff --git a/FWCore/Utilities/interface/Adler32Calculator.h b/FWCore/Utilities/interface/Adler32Calculator.h
index 827bd1186524a..9d4bc99477a75 100644
--- a/FWCore/Utilities/interface/Adler32Calculator.h
+++ b/FWCore/Utilities/interface/Adler32Calculator.h
@@ -13,5 +13,5 @@ namespace cms {
 
   void Adler32(char const* data, size_t len, uint32_t& a, uint32_t& b);
   uint32_t Adler32(char const* data, size_t len);
-}
+}  // namespace cms
 #endif
diff --git a/FWCore/Utilities/interface/Algorithms.h b/FWCore/Utilities/interface/Algorithms.h
index b4714e3ed6647..50bb398690efb 100644
--- a/FWCore/Utilities/interface/Algorithms.h
+++ b/FWCore/Utilities/interface/Algorithms.h
@@ -11,136 +11,102 @@ namespace edm {
 
   /// wrapper for std::for_each
   template <typename ForwardSequence, typename Func>
-  inline
-  Func
-  for_all(ForwardSequence& s, Func f) {
+  inline Func for_all(ForwardSequence& s, Func f) {
     return std::for_each(s.begin(), s.end(), f);
   }
 
   /// wrappers for copy
   template <typename ForwardSequence, typename Func>
-  inline
-  Func
-  copy_all(ForwardSequence& s, Func f) {
+  inline Func copy_all(ForwardSequence& s, Func f) {
     return std::copy(s.begin(), s.end(), f);
   }
 
   /// wrappers for std::find
   template <typename ForwardSequence, typename Datum>
-  inline
-  typename ForwardSequence::const_iterator
-  find_in_all(ForwardSequence const& s, Datum const& d) {
+  inline typename ForwardSequence::const_iterator find_in_all(ForwardSequence const& s, Datum const& d) {
     return std::find(s.begin(), s.end(), d);
   }
 
   template <typename ForwardSequence, typename Datum>
-  inline
-  typename ForwardSequence::iterator
-  find_in_all(ForwardSequence& s, Datum const& d) {
+  inline typename ForwardSequence::iterator find_in_all(ForwardSequence& s, Datum const& d) {
     return std::find(s.begin(), s.end(), d);
   }
 
   template <typename ForwardSequence, typename Datum>
-  inline
-  bool
-  search_all(ForwardSequence const& s, Datum const& d) {
+  inline bool search_all(ForwardSequence const& s, Datum const& d) {
     return std::find(s.begin(), s.end(), d) != s.end();
   }
 
   /// wrappers for std::find
   template <typename ForwardSequence, typename Predicate>
-  inline
-  typename ForwardSequence::const_iterator
-  find_if_in_all(ForwardSequence const& s, Predicate const& p) {
+  inline typename ForwardSequence::const_iterator find_if_in_all(ForwardSequence const& s, Predicate const& p) {
     return std::find_if(s.begin(), s.end(), p);
   }
 
   template <typename ForwardSequence, typename Predicate>
-  inline
-  typename ForwardSequence::iterator
-  find_if_in_all(ForwardSequence& s, Predicate const& p) {
+  inline typename ForwardSequence::iterator find_if_in_all(ForwardSequence& s, Predicate const& p) {
     return std::find_if(s.begin(), s.end(), p);
   }
 
   template <typename ForwardSequence, typename Predicate>
-  inline
-  bool
-  search_if_in_all(ForwardSequence const& s, Predicate const& p) {
+  inline bool search_if_in_all(ForwardSequence const& s, Predicate const& p) {
     return std::find_if(s.begin(), s.end(), p) != s.end();
   }
 
   /// wrappers for std::binary_search
   template <typename ForwardSequence, typename Datum>
-  inline
-  bool
-  binary_search_all(ForwardSequence const& s, Datum const& d) {
+  inline bool binary_search_all(ForwardSequence const& s, Datum const& d) {
     return std::binary_search(s.begin(), s.end(), d);
   }
 
   template <typename ForwardSequence, typename Datum, typename Predicate>
-  inline
-  bool
-  binary_search_all(ForwardSequence const& s, Datum const& d, Predicate p) {
+  inline bool binary_search_all(ForwardSequence const& s, Datum const& d, Predicate p) {
     return std::binary_search(s.begin(), s.end(), d, p);
   }
 
   /// wrappers for std::lower_bound
   template <typename ForwardSequence, typename Datum>
-  inline
-  typename ForwardSequence::const_iterator
-  lower_bound_all(ForwardSequence const& s, Datum const& d) {
+  inline typename ForwardSequence::const_iterator lower_bound_all(ForwardSequence const& s, Datum const& d) {
     return std::lower_bound(s.begin(), s.end(), d);
   }
 
   template <typename ForwardSequence, typename Datum>
-  inline
-  typename ForwardSequence::iterator
-  lower_bound_all(ForwardSequence& s, Datum const& d) {
+  inline typename ForwardSequence::iterator lower_bound_all(ForwardSequence& s, Datum const& d) {
     return std::lower_bound(s.begin(), s.end(), d);
   }
 
   template <typename ForwardSequence, typename Datum, typename Predicate>
-  inline
-  typename ForwardSequence::const_iterator
-  lower_bound_all(ForwardSequence const& s, Datum const& d, Predicate p) {
+  inline typename ForwardSequence::const_iterator lower_bound_all(ForwardSequence const& s,
+                                                                  Datum const& d,
+                                                                  Predicate p) {
     return std::lower_bound(s.begin(), s.end(), d, p);
   }
 
   template <typename ForwardSequence, typename Datum, typename Predicate>
-  inline
-  typename ForwardSequence::iterator
-  lower_bound_all(ForwardSequence& s, Datum const& d, Predicate p) {
+  inline typename ForwardSequence::iterator lower_bound_all(ForwardSequence& s, Datum const& d, Predicate p) {
     return std::lower_bound(s.begin(), s.end(), d, p);
   }
 
   /// wrappers for std::sort
   template <typename RandomAccessSequence>
-  inline
-  void
-  sort_all(RandomAccessSequence & s) {
+  inline void sort_all(RandomAccessSequence& s) {
     std::sort(s.begin(), s.end());
   }
 
   template <typename RandomAccessSequence, typename Predicate>
-  inline
-  void
-  sort_all(RandomAccessSequence & s, Predicate p) {
+  inline void sort_all(RandomAccessSequence& s, Predicate p) {
     std::sort(s.begin(), s.end(), p);
   }
 
   /// wrappers for std::stable_sort
   template <typename RandomAccessSequence>
-  inline
-  void
-  stable_sort_all(RandomAccessSequence & s) {
+  inline void stable_sort_all(RandomAccessSequence& s) {
     std::stable_sort(s.begin(), s.end());
   }
 
   template <typename RandomAccessSequence, typename Predicate>
-  inline
-  void
-  stable_sort_all(RandomAccessSequence & s, Predicate p) {
+  inline void stable_sort_all(RandomAccessSequence& s, Predicate p) {
     std::stable_sort(s.begin(), s.end(), p);
   }
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/BaseWithDict.h b/FWCore/Utilities/interface/BaseWithDict.h
index 35ceaa5defb61..55d8fb5f4c929 100644
--- a/FWCore/Utilities/interface/BaseWithDict.h
+++ b/FWCore/Utilities/interface/BaseWithDict.h
@@ -7,29 +7,29 @@ BaseWithDict:  A holder for a base class
 
 ----------------------------------------------------------------------*/
 
-
 #include <string>
 
 class TBaseClass;
 
 namespace edm {
 
-class TypeWithDict;
+  class TypeWithDict;
+
+  class BaseWithDict {
+  private:
+    TBaseClass* baseClass_;
 
-class BaseWithDict {
-private:
-  TBaseClass* baseClass_;
-public:
-  BaseWithDict();
-  explicit BaseWithDict(TBaseClass*);
-  bool isPublic() const;
-  std::string name() const;
-  TypeWithDict typeOf() const;
-  size_t offset() const;
-};
+  public:
+    BaseWithDict();
+    explicit BaseWithDict(TBaseClass*);
+    bool isPublic() const;
+    std::string name() const;
+    TypeWithDict typeOf() const;
+    size_t offset() const;
+  };
 
-} // namespace edm
+}  // namespace edm
 
 #include "FWCore/Utilities/interface/TypeWithDict.h"
 
-#endif // FWCore_Utilities_BaseWithDict_h
+#endif  // FWCore_Utilities_BaseWithDict_h
diff --git a/FWCore/Utilities/interface/BranchType.h b/FWCore/Utilities/interface/BranchType.h
index 0ffd6fe007f9e..115634057b242 100644
--- a/FWCore/Utilities/interface/BranchType.h
+++ b/FWCore/Utilities/interface/BranchType.h
@@ -8,11 +8,6 @@ BranchType: The type of a Branch (Event, LuminosityBlock, or Run)
 
 namespace edm {
   // Note: These enum values are used as subscripts for a fixed size array, so they must not change.
-  enum BranchType {
-    InEvent = 0,
-    InLumi = 1,
-    InRun = 2,
-    NumBranchTypes
-  };
-}
+  enum BranchType { InEvent = 0, InLumi = 1, InRun = 2, NumBranchTypes };
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/CPUServiceBase.h b/FWCore/Utilities/interface/CPUServiceBase.h
index 7c040c8509e70..77fe54403d878 100644
--- a/FWCore/Utilities/interface/CPUServiceBase.h
+++ b/FWCore/Utilities/interface/CPUServiceBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Utilities
 // Class  :     CPUServiceBase
-// 
+//
 /**\class CPUServiceBase CPUServiceBase.h "CPUServiceBase.h"
 
  Description: Base class for CPU Services
@@ -24,23 +24,20 @@
 
 // forward declarations
 namespace edm {
-  class CPUServiceBase
-  {
-    
+  class CPUServiceBase {
   public:
     CPUServiceBase();
     virtual ~CPUServiceBase();
-    
+
     // ---------- member functions ---------------------------
     ///CPU information - the models present and average speed.
     virtual bool cpuInfo(std::string &models, double &avgSpeed) = 0;
 
   private:
-    CPUServiceBase(const CPUServiceBase&) = delete; // stop default
-    
-    const CPUServiceBase& operator=(const CPUServiceBase&) = delete; // stop default
-  };
-}
+    CPUServiceBase(const CPUServiceBase &) = delete;  // stop default
 
+    const CPUServiceBase &operator=(const CPUServiceBase &) = delete;  // stop default
+  };
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/CPUTimer.h b/FWCore/Utilities/interface/CPUTimer.h
index ade12ac8e144b..454ac110cf620 100644
--- a/FWCore/Utilities/interface/CPUTimer.h
+++ b/FWCore/Utilities/interface/CPUTimer.h
@@ -4,7 +4,7 @@
 //
 // Package:     Utilities
 // Class  :     CPUTimer
-// 
+//
 /**\class CPUTimer CPUTimer.h FWCore/Utilities/interface/CPUTimer.h
 
  Description: Timer which measures the CPU and wallclock time
@@ -34,54 +34,51 @@
 
 // forward declarations
 namespace edm {
-class CPUTimer
-{
-
-   public:
-      CPUTimer();
-      ~CPUTimer();
-      CPUTimer(CPUTimer&&) = default;
-  
-      struct Times {
-         Times():real_(0),cpu_(0) {}
-         double real_;
-         double cpu_;
-      };
-   
-   
-      // ---------- const member functions ---------------------
-      double realTime() const ;
-      double cpuTime() const ;
-      
-      // ---------- static member functions --------------------
-
-      // ---------- member functions ---------------------------
-      void start();
-      Times stop(); //returns delta time
-      void reset();
-      
-      void add(const Times& t);
-   private:
-      CPUTimer(const CPUTimer&) = delete; // stop default
-
-      const CPUTimer& operator=(const CPUTimer&) = delete; // stop default
-
-      Times calculateDeltaTime() const;
-      
-      // ---------- member data --------------------------------
-      enum State {kRunning, kStopped} state_;
+  class CPUTimer {
+  public:
+    CPUTimer();
+    ~CPUTimer();
+    CPUTimer(CPUTimer&&) = default;
+
+    struct Times {
+      Times() : real_(0), cpu_(0) {}
+      double real_;
+      double cpu_;
+    };
+
+    // ---------- const member functions ---------------------
+    double realTime() const;
+    double cpuTime() const;
+
+    // ---------- static member functions --------------------
+
+    // ---------- member functions ---------------------------
+    void start();
+    Times stop();  //returns delta time
+    void reset();
+
+    void add(const Times& t);
+
+  private:
+    CPUTimer(const CPUTimer&) = delete;  // stop default
+
+    const CPUTimer& operator=(const CPUTimer&) = delete;  // stop default
+
+    Times calculateDeltaTime() const;
+
+    // ---------- member data --------------------------------
+    enum State { kRunning, kStopped } state_;
 #ifdef USE_CLOCK_GETTIME
-      struct timespec startRealTime_;
-      struct timespec startCPUTime_;
+    struct timespec startRealTime_;
+    struct timespec startCPUTime_;
 #else
-      struct timeval startRealTime_;
-      struct timeval startCPUTime_;
+    struct timeval startRealTime_;
+    struct timeval startCPUTime_;
 #endif
-   
-      double accumulatedRealTime_;
-      double accumulatedCPUTime_;
-      
-};
-}
+
+    double accumulatedRealTime_;
+    double accumulatedCPUTime_;
+  };
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/CRC16.h b/FWCore/Utilities/interface/CRC16.h
index bf65a4e32229e..3f19f812abaf1 100644
--- a/FWCore/Utilities/interface/CRC16.h
+++ b/FWCore/Utilities/interface/CRC16.h
@@ -3,90 +3,64 @@
 
 //
 // Calculates the 16bit CRC (applied to 64-bit words) used in the daq hardware
-// Do not modify without contacting Philipp Schieferdecker/Emilio Meschi 
+// Do not modify without contacting Philipp Schieferdecker/Emilio Meschi
 // It is in FWCore/Utilities to avoid dependencies on xdaq
 //
 #include <cassert>
 
-namespace evf
-{
-  unsigned short compute_crc(unsigned char* buffer,unsigned int bufSize);
-  unsigned short compute_crc_8bit(unsigned short crc,unsigned char data);
-  unsigned short compute_crc_64bit(unsigned short crc,unsigned char* p);
-  
-  
-  const unsigned short crc_table[256] =
-    {
-      0x0000, 0x8005, 0x800F, 0x000A, 0x801B, 0x001E, 0x0014, 0x8011,
-      0x8033, 0x0036, 0x003C, 0x8039, 0x0028, 0x802D, 0x8027, 0x0022,
-      0x8063, 0x0066, 0x006C, 0x8069, 0x0078, 0x807D, 0x8077, 0x0072,
-      0x0050, 0x8055, 0x805F, 0x005A, 0x804B, 0x004E, 0x0044, 0x8041,
-      0x80C3, 0x00C6, 0x00CC, 0x80C9, 0x00D8, 0x80DD, 0x80D7, 0x00D2,
-      0x00F0, 0x80F5, 0x80FF, 0x00FA, 0x80EB, 0x00EE, 0x00E4, 0x80E1,
-      0x00A0, 0x80A5, 0x80AF, 0x00AA, 0x80BB, 0x00BE, 0x00B4, 0x80B1,
-      0x8093, 0x0096, 0x009C, 0x8099, 0x0088, 0x808D, 0x8087, 0x0082,
-      0x8183, 0x0186, 0x018C, 0x8189, 0x0198, 0x819D, 0x8197, 0x0192,
-      0x01B0, 0x81B5, 0x81BF, 0x01BA, 0x81AB, 0x01AE, 0x01A4, 0x81A1,
-      0x01E0, 0x81E5, 0x81EF, 0x01EA, 0x81FB, 0x01FE, 0x01F4, 0x81F1,
-      0x81D3, 0x01D6, 0x01DC, 0x81D9, 0x01C8, 0x81CD, 0x81C7, 0x01C2,
-      0x0140, 0x8145, 0x814F, 0x014A, 0x815B, 0x015E, 0x0154, 0x8151,
-      0x8173, 0x0176, 0x017C, 0x8179, 0x0168, 0x816D, 0x8167, 0x0162,
-      0x8123, 0x0126, 0x012C, 0x8129, 0x0138, 0x813D, 0x8137, 0x0132,
-      0x0110, 0x8115, 0x811F, 0x011A, 0x810B, 0x010E, 0x0104, 0x8101,
-      0x8303, 0x0306, 0x030C, 0x8309, 0x0318, 0x831D, 0x8317, 0x0312,
-      0x0330, 0x8335, 0x833F, 0x033A, 0x832B, 0x032E, 0x0324, 0x8321,
-      0x0360, 0x8365, 0x836F, 0x036A, 0x837B, 0x037E, 0x0374, 0x8371,
-      0x8353, 0x0356, 0x035C, 0x8359, 0x0348, 0x834D, 0x8347, 0x0342,
-      0x03C0, 0x83C5, 0x83CF, 0x03CA, 0x83DB, 0x03DE, 0x03D4, 0x83D1,
-      0x83F3, 0x03F6, 0x03FC, 0x83F9, 0x03E8, 0x83ED, 0x83E7, 0x03E2,
-      0x83A3, 0x03A6, 0x03AC, 0x83A9, 0x03B8, 0x83BD, 0x83B7, 0x03B2,
-      0x0390, 0x8395, 0x839F, 0x039A, 0x838B, 0x038E, 0x0384, 0x8381,
-      0x0280, 0x8285, 0x828F, 0x028A, 0x829B, 0x029E, 0x0294, 0x8291,
-      0x82B3, 0x02B6, 0x02BC, 0x82B9, 0x02A8, 0x82AD, 0x82A7, 0x02A2,
-      0x82E3, 0x02E6, 0x02EC, 0x82E9, 0x02F8, 0x82FD, 0x82F7, 0x02F2,
-      0x02D0, 0x82D5, 0x82DF, 0x02DA, 0x82CB, 0x02CE, 0x02C4, 0x82C1,
-      0x8243, 0x0246, 0x024C, 0x8249, 0x0258, 0x825D, 0x8257, 0x0252,
-      0x0270, 0x8275, 0x827F, 0x027A, 0x826B, 0x026E, 0x0264, 0x8261,
-      0x0220, 0x8225, 0x822F, 0x022A, 0x823B, 0x023E, 0x0234, 0x8231,
-      0x8213, 0x0216, 0x021C, 0x8219, 0x0208, 0x820D, 0x8207, 0x0202
-    };
-  
-  
-}
+namespace evf {
+  unsigned short compute_crc(unsigned char* buffer, unsigned int bufSize);
+  unsigned short compute_crc_8bit(unsigned short crc, unsigned char data);
+  unsigned short compute_crc_64bit(unsigned short crc, unsigned char* p);
 
+  const unsigned short crc_table[256] = {
+      0x0000, 0x8005, 0x800F, 0x000A, 0x801B, 0x001E, 0x0014, 0x8011, 0x8033, 0x0036, 0x003C, 0x8039, 0x0028, 0x802D,
+      0x8027, 0x0022, 0x8063, 0x0066, 0x006C, 0x8069, 0x0078, 0x807D, 0x8077, 0x0072, 0x0050, 0x8055, 0x805F, 0x005A,
+      0x804B, 0x004E, 0x0044, 0x8041, 0x80C3, 0x00C6, 0x00CC, 0x80C9, 0x00D8, 0x80DD, 0x80D7, 0x00D2, 0x00F0, 0x80F5,
+      0x80FF, 0x00FA, 0x80EB, 0x00EE, 0x00E4, 0x80E1, 0x00A0, 0x80A5, 0x80AF, 0x00AA, 0x80BB, 0x00BE, 0x00B4, 0x80B1,
+      0x8093, 0x0096, 0x009C, 0x8099, 0x0088, 0x808D, 0x8087, 0x0082, 0x8183, 0x0186, 0x018C, 0x8189, 0x0198, 0x819D,
+      0x8197, 0x0192, 0x01B0, 0x81B5, 0x81BF, 0x01BA, 0x81AB, 0x01AE, 0x01A4, 0x81A1, 0x01E0, 0x81E5, 0x81EF, 0x01EA,
+      0x81FB, 0x01FE, 0x01F4, 0x81F1, 0x81D3, 0x01D6, 0x01DC, 0x81D9, 0x01C8, 0x81CD, 0x81C7, 0x01C2, 0x0140, 0x8145,
+      0x814F, 0x014A, 0x815B, 0x015E, 0x0154, 0x8151, 0x8173, 0x0176, 0x017C, 0x8179, 0x0168, 0x816D, 0x8167, 0x0162,
+      0x8123, 0x0126, 0x012C, 0x8129, 0x0138, 0x813D, 0x8137, 0x0132, 0x0110, 0x8115, 0x811F, 0x011A, 0x810B, 0x010E,
+      0x0104, 0x8101, 0x8303, 0x0306, 0x030C, 0x8309, 0x0318, 0x831D, 0x8317, 0x0312, 0x0330, 0x8335, 0x833F, 0x033A,
+      0x832B, 0x032E, 0x0324, 0x8321, 0x0360, 0x8365, 0x836F, 0x036A, 0x837B, 0x037E, 0x0374, 0x8371, 0x8353, 0x0356,
+      0x035C, 0x8359, 0x0348, 0x834D, 0x8347, 0x0342, 0x03C0, 0x83C5, 0x83CF, 0x03CA, 0x83DB, 0x03DE, 0x03D4, 0x83D1,
+      0x83F3, 0x03F6, 0x03FC, 0x83F9, 0x03E8, 0x83ED, 0x83E7, 0x03E2, 0x83A3, 0x03A6, 0x03AC, 0x83A9, 0x03B8, 0x83BD,
+      0x83B7, 0x03B2, 0x0390, 0x8395, 0x839F, 0x039A, 0x838B, 0x038E, 0x0384, 0x8381, 0x0280, 0x8285, 0x828F, 0x028A,
+      0x829B, 0x029E, 0x0294, 0x8291, 0x82B3, 0x02B6, 0x02BC, 0x82B9, 0x02A8, 0x82AD, 0x82A7, 0x02A2, 0x82E3, 0x02E6,
+      0x02EC, 0x82E9, 0x02F8, 0x82FD, 0x82F7, 0x02F2, 0x02D0, 0x82D5, 0x82DF, 0x02DA, 0x82CB, 0x02CE, 0x02C4, 0x82C1,
+      0x8243, 0x0246, 0x024C, 0x8249, 0x0258, 0x825D, 0x8257, 0x0252, 0x0270, 0x8275, 0x827F, 0x027A, 0x826B, 0x026E,
+      0x0264, 0x8261, 0x0220, 0x8225, 0x822F, 0x022A, 0x823B, 0x023E, 0x0234, 0x8231, 0x8213, 0x0216, 0x021C, 0x8219,
+      0x0208, 0x820D, 0x8207, 0x0202};
 
-#endif
+}  // namespace evf
 
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // inline implementations
 ////////////////////////////////////////////////////////////////////////////////
 
 //______________________________________________________________________________
-inline
-unsigned short evf::compute_crc(unsigned char* buffer,unsigned int bufSize)
-{
-  assert(0==bufSize%8);
+inline unsigned short evf::compute_crc(unsigned char* buffer, unsigned int bufSize) {
+  assert(0 == bufSize % 8);
   unsigned short crc(0xffff);
-  bufSize/=8;
-  for (unsigned int i=0;i<bufSize;i++) crc=evf::compute_crc_64bit(crc,&buffer[i*8]);
+  bufSize /= 8;
+  for (unsigned int i = 0; i < bufSize; i++)
+    crc = evf::compute_crc_64bit(crc, &buffer[i * 8]);
   return crc;
 }
 
-
 //______________________________________________________________________________
-inline
-unsigned short evf::compute_crc_8bit(unsigned short crc,unsigned char data)
-{
+inline unsigned short evf::compute_crc_8bit(unsigned short crc, unsigned char data) {
   return (evf::crc_table[((crc >> 8) ^ data) & 0xFF] ^ (crc << 8));
 }
 
-
 //______________________________________________________________________________
-inline
-unsigned short evf::compute_crc_64bit(unsigned short crc,unsigned char *p64)
-{
+inline unsigned short evf::compute_crc_64bit(unsigned short crc, unsigned char* p64) {
   unsigned short result(crc);
-  for (int i=7;i>=0;i--) result=evf::compute_crc_8bit(result,p64[i]);
+  for (int i = 7; i >= 0; i--)
+    result = evf::compute_crc_8bit(result, p64[i]);
   return result;
 }
diff --git a/FWCore/Utilities/interface/CRC32Calculator.h b/FWCore/Utilities/interface/CRC32Calculator.h
index f185417acb529..e05bebb151a15 100644
--- a/FWCore/Utilities/interface/CRC32Calculator.h
+++ b/FWCore/Utilities/interface/CRC32Calculator.h
@@ -60,16 +60,13 @@ from the original code follow below to attribute the source.
 namespace cms {
 
   class CRC32Calculator {
-
   public:
-
     CRC32Calculator(std::string const& message);
 
     std::uint32_t checksum() { return checksum_; }
 
   private:
-
     std::uint32_t checksum_;
   };
-}
+}  // namespace cms
 #endif
diff --git a/FWCore/Utilities/interface/CallNTimesNoWait.h b/FWCore/Utilities/interface/CallNTimesNoWait.h
index 1e5a453146a5c..6000e5ad65971 100644
--- a/FWCore/Utilities/interface/CallNTimesNoWait.h
+++ b/FWCore/Utilities/interface/CallNTimesNoWait.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Utilities
 // Class  :     CallNTimesNoWait
-// 
+//
 /**\class edm::CallNTimesNoWait CallNTimesNoWait.h "CallNTimesNoWait.h"
 
  Description: Thread safe way to do something N times
@@ -29,33 +29,31 @@
 //
 
 // system include files
-#include<atomic>
+#include <atomic>
 
 // user include files
 
 // forward declarations
 namespace edm {
-  class CallNTimesNoWait
-  {
-    
+  class CallNTimesNoWait {
   public:
-    CallNTimesNoWait( unsigned short iNTimes ): m_ntimes(static_cast<int>(iNTimes)-1), m_done(false){}
-    
+    CallNTimesNoWait(unsigned short iNTimes) : m_ntimes(static_cast<int>(iNTimes) - 1), m_done(false) {}
+
     template <typename T>
     void operator()(T iCall) {
-      if(not m_done.load(std::memory_order_acquire) ) {
-        if(m_ntimes.fetch_sub(1,std::memory_order_acq_rel)<0) {
-          m_done.store(true,std::memory_order_release);
+      if (not m_done.load(std::memory_order_acquire)) {
+        if (m_ntimes.fetch_sub(1, std::memory_order_acq_rel) < 0) {
+          m_done.store(true, std::memory_order_release);
           return;
         };
         iCall();
       }
     }
-    
-	private:
+
+  private:
     std::atomic<int> m_ntimes;
     std::atomic<bool> m_done;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/CallOnceNoWait.h b/FWCore/Utilities/interface/CallOnceNoWait.h
index f8a65f2110175..b1bb4778b9d60 100644
--- a/FWCore/Utilities/interface/CallOnceNoWait.h
+++ b/FWCore/Utilities/interface/CallOnceNoWait.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Utilities
 // Class  :     CallOnceNoWait
-// 
+//
 /**\class edm::CallOnceNoWait CallOnceNoWait.h "FWCore/Utilities/interface/CallOnceNoWait.h"
 
  Description: Thread safe way to do something 1 time
@@ -37,23 +37,21 @@
 // forward declarations
 
 namespace edm {
-  class CallOnceNoWait
-  {
+  class CallOnceNoWait {
   public:
     CallOnceNoWait() : m_called(false) {}
-    
+
     template <typename T>
     void operator()(T iCall) {
       bool expected = false;
-      if(m_called.compare_exchange_strong(expected, true, std::memory_order_acq_rel)) {
+      if (m_called.compare_exchange_strong(expected, true, std::memory_order_acq_rel)) {
         iCall();
       }
     }
-    
+
   private:
     std::atomic<bool> m_called;
   };
-}
-
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/ConstRespectingPtr.h b/FWCore/Utilities/interface/ConstRespectingPtr.h
index 16fed99c16cce..24eaa58a82b12 100644
--- a/FWCore/Utilities/interface/ConstRespectingPtr.h
+++ b/FWCore/Utilities/interface/ConstRespectingPtr.h
@@ -25,9 +25,7 @@ namespace edm {
 
   template <typename T>
   class ConstRespectingPtr {
-
   public:
-
     ConstRespectingPtr();
     explicit ConstRespectingPtr(T*);
     ~ConstRespectingPtr();
@@ -48,44 +46,45 @@ namespace edm {
     void reset();
 
   private:
-
     ConstRespectingPtr(ConstRespectingPtr<T> const&) = delete;
     ConstRespectingPtr& operator=(ConstRespectingPtr<T> const&) = delete;
 
     edm::propagate_const<T*> m_data;
   };
 
-  template<typename T>
+  template <typename T>
   ConstRespectingPtr<T>::ConstRespectingPtr() : m_data(nullptr) {}
 
-  template<typename T>
+  template <typename T>
   ConstRespectingPtr<T>::ConstRespectingPtr(T* v) : m_data(v) {}
 
-  template<typename T>
+  template <typename T>
   ConstRespectingPtr<T>::~ConstRespectingPtr() {
     delete m_data.get();
   }
 
-  template<typename T>
-  bool ConstRespectingPtr<T>::isSet() const { return nullptr != m_data; }
+  template <typename T>
+  bool ConstRespectingPtr<T>::isSet() const {
+    return nullptr != m_data;
+  }
 
-  template<typename T>
+  template <typename T>
   void ConstRespectingPtr<T>::set(std::unique_ptr<T> iNewValue) {
     delete m_data;
     m_data = iNewValue.release();
   }
 
-  template<typename T>
+  template <typename T>
   T* ConstRespectingPtr<T>::release() {
     T* tmp = m_data;
     m_data = nullptr;
     return tmp;
   }
 
-  template<typename T>
+  template <typename T>
   void ConstRespectingPtr<T>::reset() {
     delete m_data;
     m_data = nullptr;
   }
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/ConvertException.h b/FWCore/Utilities/interface/ConvertException.h
index 1d41ce2efea40..90497d45c3981 100644
--- a/FWCore/Utilities/interface/ConvertException.h
+++ b/FWCore/Utilities/interface/ConvertException.h
@@ -14,22 +14,28 @@ namespace edm {
     void charPtrToEDM(char const* c);
     void unknownToEDM();
 
-    template<typename F>
-    auto wrap(F iFunc) -> decltype( iFunc() ) {
+    template <typename F>
+    auto wrap(F iFunc) -> decltype(iFunc()) {
       try {
         return iFunc();
+      } catch (cms::Exception&) {
+        throw;
+      } catch (std::bad_alloc&) {
+        convertException::badAllocToEDM();
+      } catch (std::exception& e) {
+        convertException::stdToEDM(e);
+      } catch (std::string& s) {
+        convertException::stringToEDM(s);
+      } catch (char const* c) {
+        convertException::charPtrToEDM(c);
+      } catch (...) {
+        convertException::unknownToEDM();
       }
-      catch (cms::Exception&)  { throw; }
-      catch(std::bad_alloc&) { convertException::badAllocToEDM(); }
-      catch (std::exception& e) { convertException::stdToEDM(e); }
-      catch(std::string& s) { convertException::stringToEDM(s); }
-      catch(char const* c) { convertException::charPtrToEDM(c); }
-      catch (...) { convertException::unknownToEDM(); }
       //Never gets here
-      typedef decltype(iFunc()) ReturnType;      
+      typedef decltype(iFunc()) ReturnType;
       return ReturnType();
     }
-  }
-}
+  }  // namespace convertException
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/DebugMacros.h b/FWCore/Utilities/interface/DebugMacros.h
index 334fa5c002553..aa9f895431f7d 100644
--- a/FWCore/Utilities/interface/DebugMacros.h
+++ b/FWCore/Utilities/interface/DebugMacros.h
@@ -5,18 +5,19 @@
 
 namespace edm {
   struct debugvalue {
-
     debugvalue();
 
     int operator()() { return value_; }
-    
+
     const char* cvalue_;
     int value_;
   };
 
-CMS_THREAD_SAFE extern debugvalue debugit;
-}
+  CMS_THREAD_SAFE extern debugvalue debugit;
+}  // namespace edm
 
-#define FDEBUG(lev) if(lev <= debugit()) std::cerr
+#define FDEBUG(lev)     \
+  if (lev <= debugit()) \
+  std::cerr
 
 #endif
diff --git a/FWCore/Utilities/interface/DictionaryTools.h b/FWCore/Utilities/interface/DictionaryTools.h
index 5dc22144dc6dc..572cd82d7a066 100644
--- a/FWCore/Utilities/interface/DictionaryTools.h
+++ b/FWCore/Utilities/interface/DictionaryTools.h
@@ -20,21 +20,17 @@ namespace edm {
   class TypeID;
   class TypeWithDict;
 
-  bool checkDictionary(std::vector<std::string>& missingDictionaries,
-                       TypeID const& typeID);
+  bool checkDictionary(std::vector<std::string>& missingDictionaries, TypeID const& typeID);
 
-  bool checkDictionaryOfWrappedType(std::vector<std::string>& missingDictionaries,
-                                    TypeID const& unwrappedTypeID);
+  bool checkDictionaryOfWrappedType(std::vector<std::string>& missingDictionaries, TypeID const& unwrappedTypeID);
 
-  bool checkDictionaryOfWrappedType(std::vector<std::string>& missingDictionaries,
-                                    std::string const& unwrappedName);
+  bool checkDictionaryOfWrappedType(std::vector<std::string>& missingDictionaries, std::string const& unwrappedName);
 
   bool checkDictionary(std::vector<std::string>& missingDictionaries,
                        std::string const& name,
                        TypeWithDict const& typeWithDict);
 
-  bool checkClassDictionaries(std::vector<std::string>& missingDictionaries,
-                              TypeID const& typeID);
+  bool checkClassDictionaries(std::vector<std::string>& missingDictionaries, TypeID const& typeID);
 
   bool checkClassDictionaries(std::vector<std::string>& missingDictionaries,
                               std::string const& name,
@@ -44,8 +40,7 @@ namespace edm {
                                          std::vector<std::string>& missingDictionaries,
                                          std::string const& context);
 
-  void throwMissingDictionariesException(std::vector<std::string>& missingDictionaries,
-                                         std::string const& context);
+  void throwMissingDictionariesException(std::vector<std::string>& missingDictionaries, std::string const& context);
 
   void throwMissingDictionariesException(std::vector<std::string>& missingDictionaries,
                                          std::string const& context,
@@ -65,6 +60,6 @@ namespace edm {
   bool public_base_classes(std::vector<std::string>& missingDictionaries,
                            TypeID const& typeID,
                            std::vector<TypeWithDict>& baseTypes);
-} // namespace edm
+}  // namespace edm
 
-#endif // FWCore_Utilities_DictionaryTools_h
+#endif  // FWCore_Utilities_DictionaryTools_h
diff --git a/FWCore/Utilities/interface/Digest.h b/FWCore/Utilities/interface/Digest.h
index 0fe1594520b5d..a707352aebf9a 100644
--- a/FWCore/Utilities/interface/Digest.h
+++ b/FWCore/Utilities/interface/Digest.h
@@ -6,12 +6,9 @@
 #include <iosfwd>
 #include <string>
 
+namespace cms {
 
-namespace cms
-{
-
-  struct MD5Result
-  {
+  struct MD5Result {
     // The default-constructed MD5Result is invalid; all others are
     // valid. The MD5 digest of the empty string is the value of the
     // default-constructed MD5Result.
@@ -35,36 +32,30 @@ namespace cms
   };
 
   bool operator==(MD5Result const& a, MD5Result const& b);
-  bool operator< (MD5Result const& a, MD5Result const& b);
+  bool operator<(MD5Result const& a, MD5Result const& b);
 
-  inline bool operator!=(MD5Result const& a, MD5Result const& b)
-  {
-    return !(a==b);
-  }
+  inline bool operator!=(MD5Result const& a, MD5Result const& b) { return !(a == b); }
 
-  inline
-  std::ostream& operator<< (std::ostream& os, MD5Result const& r)
-  {
+  inline std::ostream& operator<<(std::ostream& os, MD5Result const& r) {
     os << r.toString();
     return os;
   }
 
   // Digest creates an MD5 digest of the given string. The digest can
   // be updated by using 'append'.
-  class Digest
-  {
+  class Digest {
   public:
     Digest();
     explicit Digest(std::string const& s);
 
     void append(std::string const& s);
-    void append(const char *data, size_t size);
+    void append(const char* data, size_t size);
 
     MD5Result digest() const;
 
   private:
     mutable md5_state_t state_;
   };
-}
+}  // namespace cms
 
 #endif
diff --git a/FWCore/Utilities/interface/ECGetterBase.h b/FWCore/Utilities/interface/ECGetterBase.h
index 98dc8efe1c92c..5891356aa96ae 100644
--- a/FWCore/Utilities/interface/ECGetterBase.h
+++ b/FWCore/Utilities/interface/ECGetterBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     Utilities
 // Class  :     ECGetterBase
-// 
+//
 /**\class ECGetterBase ECGetterBase.h FWCore/Utilities/interface/ECGetterBase.h
 
  Description: Helper class for the implementation of edm::ExtensionCord
@@ -26,45 +26,41 @@
 namespace edm {
   namespace extensioncord {
     template <class T>
-    class ECGetterBase
-    {
-      
-     public:
-      ECGetterBase(): data_(0) {}
+    class ECGetterBase {
+    public:
+      ECGetterBase() : data_(0) {}
       virtual ~ECGetterBase() {}
 
       // ---------- const member functions ---------------------
-      const T* get() const  {
-        if(data_==0) {
+      const T* get() const {
+        if (data_ == 0) {
           data_ = this->getImpl();
         }
         return data_;
       }
-      
-     private:
+
+    private:
       //ECGetterBase(const ECGetterBase&); // allow default
 
       //const ECGetterBase& operator=(const ECGetterBase&); // allow default
-      
+
       //the actual method which is used to get the requested data
       virtual const T* getImpl() const = 0;
 
       // ---------- member data --------------------------------
       //does not own the data
       mutable const T* data_;
-
     };
-  }
+  }  // namespace extensioncord
   template <class T>
   class ValueHolderECGetter : public extensioncord::ECGetterBase<T> {
   public:
     ValueHolderECGetter(const T& iValue) : value_(&iValue) {}
+
   private:
-    virtual const T* getImpl() const {
-      return value_;
-    }
+    virtual const T* getImpl() const { return value_; }
     const T* value_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/EDGetToken.h b/FWCore/Utilities/interface/EDGetToken.h
index e3037894394f1..13a2bebd9386f 100644
--- a/FWCore/Utilities/interface/EDGetToken.h
+++ b/FWCore/Utilities/interface/EDGetToken.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Utilities
 // Class  :     EDGetToken
-// 
+//
 /**\class EDGetToken EDGetToken.h "FWCore/Utilities/interface/EDGetToken.h"
 
  Description: A Token used to get data from the EDM
@@ -29,18 +29,17 @@ The templated form, EDGetTokenT<T>, is the same as EDGetToken except when used t
 // forward declarations
 namespace edm {
   class EDConsumerBase;
-  template <typename T> class EDGetTokenT;
-  
-  class EDGetToken
-  {
+  template <typename T>
+  class EDGetTokenT;
+
+  class EDGetToken {
     friend class EDConsumerBase;
-    
+
   public:
-    
     EDGetToken() : m_value{s_uninitializedValue} {}
 
-    template<typename T>
-    EDGetToken(EDGetTokenT<T> iOther): m_value{iOther.m_value} {}
+    template <typename T>
+    EDGetToken(EDGetTokenT<T> iOther) : m_value{iOther.m_value} {}
 
     // ---------- const member functions ---------------------
     unsigned int index() const { return m_value; }
@@ -49,25 +48,23 @@ namespace edm {
   private:
     //for testing
     friend class TestEDGetToken;
-    
+
     static const unsigned int s_uninitializedValue = 0xFFFFFFFF;
 
-    explicit EDGetToken(unsigned int iValue) : m_value(iValue) { }
+    explicit EDGetToken(unsigned int iValue) : m_value(iValue) {}
 
     // ---------- member data --------------------------------
     unsigned int m_value;
   };
 
-  template<typename T>
-  class EDGetTokenT
-  {
+  template <typename T>
+  class EDGetTokenT {
     friend class EDConsumerBase;
     friend class EDGetToken;
 
   public:
-
     EDGetTokenT() : m_value{s_uninitializedValue} {}
-  
+
     // ---------- const member functions ---------------------
     unsigned int index() const { return m_value; }
     bool isUninitialized() const { return m_value == s_uninitializedValue; }
@@ -78,11 +75,11 @@ namespace edm {
 
     static const unsigned int s_uninitializedValue = 0xFFFFFFFF;
 
-    explicit EDGetTokenT(unsigned int iValue) : m_value(iValue) { }
+    explicit EDGetTokenT(unsigned int iValue) : m_value(iValue) {}
 
     // ---------- member data --------------------------------
     unsigned int m_value;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/EDMException.h b/FWCore/Utilities/interface/EDMException.h
index 8464e16a3881a..e092475f849b4 100644
--- a/FWCore/Utilities/interface/EDMException.h
+++ b/FWCore/Utilities/interface/EDMException.h
@@ -21,57 +21,57 @@ namespace edm {
     // fragment FWCore/Framework/python/test/cmsExceptionsFatalOption_cff.py.
 
     enum ErrorCodes {
-       CommandLineProcessing = 7000,
-       ConfigFileNotFound = 7001,
-       ConfigFileReadError = 7002,
-
-       OtherCMS = 8001,
-       StdException = 8002,
-       Unknown = 8003,
-       BadAlloc = 8004,
-       BadExceptionType = 8005,
-
-       ProductNotFound = 8006,
-       DictionaryNotFound = 8007,
-       InsertFailure = 8008,
-       Configuration = 8009,
-       LogicError = 8010,
-       UnimplementedFeature = 8011,
-       InvalidReference = 8012,
-       NullPointerError = 8013,
-       NoProductSpecified = 8014,
-       EventTimeout = 8015,
-       EventCorruption = 8016,
-
-       ScheduleExecutionFailure = 8017,
-       EventProcessorFailure = 8018,
-
-       FileInPathError = 8019,
-       FileOpenError = 8020,
-       FileReadError = 8021,
-       FatalRootError = 8022,
-       MismatchedInputFiles = 8023,
-
-       ProductDoesNotSupportViews = 8024,
-       ProductDoesNotSupportPtr = 8025,
-
-       NotFound = 8026,
-       FormatIncompatibility = 8027,
-       FallbackFileOpenError = 8028,
-       NoSecondaryFiles = 8029,
-      
-       ExceededResourceVSize = 8030,
-       ExceededResourceRSS = 8031,
-       ExceededResourceTime = 8032,
-
-       FileWriteError = 8033,
-      
-       EventGenerationFailure = 8501,
-
-       CaughtSignal = 9000
+      CommandLineProcessing = 7000,
+      ConfigFileNotFound = 7001,
+      ConfigFileReadError = 7002,
+
+      OtherCMS = 8001,
+      StdException = 8002,
+      Unknown = 8003,
+      BadAlloc = 8004,
+      BadExceptionType = 8005,
+
+      ProductNotFound = 8006,
+      DictionaryNotFound = 8007,
+      InsertFailure = 8008,
+      Configuration = 8009,
+      LogicError = 8010,
+      UnimplementedFeature = 8011,
+      InvalidReference = 8012,
+      NullPointerError = 8013,
+      NoProductSpecified = 8014,
+      EventTimeout = 8015,
+      EventCorruption = 8016,
+
+      ScheduleExecutionFailure = 8017,
+      EventProcessorFailure = 8018,
+
+      FileInPathError = 8019,
+      FileOpenError = 8020,
+      FileReadError = 8021,
+      FatalRootError = 8022,
+      MismatchedInputFiles = 8023,
+
+      ProductDoesNotSupportViews = 8024,
+      ProductDoesNotSupportPtr = 8025,
+
+      NotFound = 8026,
+      FormatIncompatibility = 8027,
+      FallbackFileOpenError = 8028,
+      NoSecondaryFiles = 8029,
+
+      ExceededResourceVSize = 8030,
+      ExceededResourceRSS = 8031,
+      ExceededResourceTime = 8032,
+
+      FileWriteError = 8033,
+
+      EventGenerationFailure = 8501,
+
+      CaughtSignal = 9000
     };
 
-  }
+  }  // namespace errors
 
   class dso_export Exception : public cms::Exception {
   public:
@@ -80,18 +80,16 @@ namespace edm {
     explicit Exception(Code category);
 
     Exception(Code category, std::string const& message);
-    Exception(Code category, char const*        message);
+    Exception(Code category, char const* message);
 
     Exception(Code category, std::string const& message, cms::Exception const& another);
-    Exception(Code category, char const*        message, cms::Exception const& another);
+    Exception(Code category, char const* message, cms::Exception const& another);
 
     Exception(Exception const& other);
 
     ~Exception() noexcept override;
 
-    void swap(Exception& other) {
-      std::swap(category_, other.category_);
-    }
+    void swap(Exception& other) { std::swap(category_, other.category_); }
 
     Exception& operator=(Exception const& other);
 
@@ -110,12 +108,11 @@ namespace edm {
     Exception* clone() const override;
 
   private:
-
     void rethrow() override;
     int returnCode_() const override;
 
     Code category_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/EDPutToken.h b/FWCore/Utilities/interface/EDPutToken.h
index f9ccbe30953ef..de878e3ccf289 100644
--- a/FWCore/Utilities/interface/EDPutToken.h
+++ b/FWCore/Utilities/interface/EDPutToken.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Utilities
 // Class  :     EDPutToken
-// 
+//
 /**\class EDPutToken EDPutToken.h "FWCore/Utilities/interface/EDPutToken.h"
 
  Description: A Token used to put data into the EDM
@@ -29,22 +29,22 @@ The templated form, EDPutTokenT<T>, is the same as EDPutToken except when used t
 // forward declarations
 namespace edm {
   class ProductRegistryHelper;
-  template <typename T> class EDPutTokenT;
+  template <typename T>
+  class EDPutTokenT;
   namespace test {
     class TestProcessorConfig;
   }
-  
-  class EDPutToken
-  {
+
+  class EDPutToken {
     friend class ProductRegistryHelper;
-    
+
   public:
     using value_type = unsigned int;
-    
+
     EDPutToken() : m_value{s_uninitializedValue} {}
 
-    template<typename T>
-    EDPutToken(EDPutTokenT<T> iOther): m_value{iOther.m_value} {}
+    template <typename T>
+    EDPutToken(EDPutTokenT<T> iOther) : m_value{iOther.m_value} {}
 
     // ---------- const member functions ---------------------
     value_type index() const { return m_value; }
@@ -53,18 +53,17 @@ namespace edm {
   private:
     //for testing
     friend class TestEDPutToken;
-    
+
     static const unsigned int s_uninitializedValue = 0xFFFFFFFF;
 
-    explicit EDPutToken(unsigned int iValue) : m_value(iValue) { }
+    explicit EDPutToken(unsigned int iValue) : m_value(iValue) {}
 
     // ---------- member data --------------------------------
     value_type m_value;
   };
 
-  template<typename T>
-  class EDPutTokenT
-  {
+  template <typename T>
+  class EDPutTokenT {
     friend class ProductRegistryHelper;
     friend class EDPutToken;
     friend class edm::test::TestProcessorConfig;
@@ -72,9 +71,8 @@ namespace edm {
   public:
     using value_type = EDPutToken::value_type;
 
-    
     EDPutTokenT() : m_value{s_uninitializedValue} {}
-  
+
     // ---------- const member functions ---------------------
     value_type index() const { return m_value; }
     bool isUninitialized() const { return m_value == s_uninitializedValue; }
@@ -85,11 +83,11 @@ namespace edm {
 
     static const unsigned int s_uninitializedValue = 0xFFFFFFFF;
 
-    explicit EDPutTokenT(unsigned int iValue) : m_value(iValue) { }
+    explicit EDPutTokenT(unsigned int iValue) : m_value(iValue) {}
 
     // ---------- member data --------------------------------
     value_type m_value;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/ESGetToken.h b/FWCore/Utilities/interface/ESGetToken.h
index 51d9100343cf1..62a6c323f28cf 100644
--- a/FWCore/Utilities/interface/ESGetToken.h
+++ b/FWCore/Utilities/interface/ESGetToken.h
@@ -15,6 +15,8 @@
 */
 
 #include "FWCore/Utilities/interface/ESInputTag.h"
+#include "FWCore/Utilities/interface/ESIndices.h"
+#include <limits>
 
 namespace edm {
   class EDConsumerBase;
@@ -28,7 +30,7 @@ namespace edm {
 
   // A ESGetToken is created by calls to 'esConsumes' from an EDM
   // module.
-  template<typename ESProduct, typename ESRecord>
+  template <typename ESProduct, typename ESRecord>
   class ESGetToken {
     friend class EDConsumerBase;
     friend class ESProducer;
@@ -38,14 +40,30 @@ namespace edm {
     friend class eventsetup::EventSetupRecord;
 
   public:
-    ESGetToken() = default;
+    constexpr ESGetToken() noexcept = default;
+
+    constexpr ESGetToken(ESGetToken<ESProduct, ESRecord> const&) noexcept = default;
+    constexpr ESGetToken(ESGetToken<ESProduct, ESRecord>&&) noexcept = default;
+
+    constexpr ESGetToken<ESProduct, ESRecord>& operator=(ESGetToken<ESProduct, ESRecord>&&) noexcept = default;
+    constexpr ESGetToken<ESProduct, ESRecord>& operator=(ESGetToken<ESProduct, ESRecord> const&) noexcept = default;
+
+    constexpr unsigned int transitionID() const noexcept { return m_transitionID; }
+    constexpr bool isInitialized() const noexcept { return transitionID() != std::numeric_limits<unsigned int>::max(); }
+    constexpr ESTokenIndex index() const noexcept { return m_index; }
+    constexpr bool hasValidIndex() const noexcept { return index() != invalidIndex(); }
+    static constexpr ESTokenIndex invalidIndex() noexcept { return ESTokenIndex{std::numeric_limits<int>::max()}; }
 
   private:
-    explicit ESGetToken(ESInputTag const& tag) : m_tag{tag} {}
+    explicit constexpr ESGetToken(unsigned int transitionID, ESTokenIndex index, char const* label) noexcept
+        : m_label{label}, m_transitionID{transitionID}, m_index{index} {}
 
-    ESInputTag m_tag{};
+    constexpr char const* name() const noexcept { return m_label; }
+    char const* m_label{nullptr};
+    unsigned int m_transitionID{std::numeric_limits<unsigned int>::max()};
+    ESTokenIndex m_index{std::numeric_limits<int>::max()};
   };
 
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/ESIndices.h b/FWCore/Utilities/interface/ESIndices.h
new file mode 100644
index 0000000000000..b42e3b9148d29
--- /dev/null
+++ b/FWCore/Utilities/interface/ESIndices.h
@@ -0,0 +1,105 @@
+#ifndef FWCore_Utilities_ESIndices_h
+#define FWCore_Utilities_ESIndices_h
+// -*- C++ -*-
+//
+// Package:     Framework
+// Class  :     ESIndices
+//
+/**\class ESProxyIndex ESIndices.h FWCore/Utilities/interface/ESIndices.h
+   \class ESTokenIndex ESIndices.h FWCore/Utilities/interface/ESIndices.h
+   \class ESRecordIndex ESIndices.h FWCore/Utilities/interface/ESIndices.h
+
+ Description: Classes representing indices used in the EventSetup System
+
+ Usage:
+    <usage>
+
+*/
+//
+// Author:      Chris Jones
+// Created:     Sat Apr  6 14:47:35 EST 2019
+//
+
+// system include files
+#include <ostream>
+
+// user include files
+
+namespace edm {
+  class ESProxyIndex {
+  public:
+    using Value_t = int;
+    constexpr ESProxyIndex() noexcept = default;
+    constexpr explicit ESProxyIndex(Value_t iValue) noexcept : index_{iValue} {}
+    constexpr ESProxyIndex(ESProxyIndex const&) noexcept = default;
+    constexpr ESProxyIndex(ESProxyIndex&&) noexcept = default;
+
+    constexpr ESProxyIndex& operator=(ESProxyIndex const&) noexcept = default;
+    constexpr ESProxyIndex& operator=(ESProxyIndex&&) noexcept = default;
+
+    constexpr bool operator==(ESProxyIndex iOther) const noexcept { return iOther.index_ == index_; }
+    constexpr bool operator!=(ESProxyIndex iOther) const noexcept { return iOther.index_ != index_; }
+
+    constexpr Value_t value() const noexcept { return index_; }
+
+  private:
+    Value_t index_ = std::numeric_limits<int>::max();
+  };
+
+  inline std::ostream& operator<<(std::ostream& iOS, ESProxyIndex const& iIndex) {
+    iOS << iIndex.value();
+    return iOS;
+  }
+
+  class ESTokenIndex {
+  public:
+    using Value_t = int;
+
+    constexpr ESTokenIndex() noexcept = default;
+    constexpr explicit ESTokenIndex(Value_t iValue) noexcept : index_{iValue} {}
+    constexpr ESTokenIndex(ESTokenIndex const&) noexcept = default;
+    constexpr ESTokenIndex(ESTokenIndex&&) noexcept = default;
+
+    constexpr ESTokenIndex& operator=(ESTokenIndex const&) noexcept = default;
+    constexpr ESTokenIndex& operator=(ESTokenIndex&&) noexcept = default;
+
+    constexpr bool operator==(ESTokenIndex iOther) const noexcept { return iOther.index_ == index_; }
+    constexpr bool operator!=(ESTokenIndex iOther) const noexcept { return iOther.index_ != index_; }
+
+    constexpr Value_t value() const noexcept { return index_; }
+
+  private:
+    Value_t index_ = std::numeric_limits<Value_t>::max();
+  };
+  inline std::ostream& operator<<(std::ostream& iOS, ESTokenIndex const& iIndex) {
+    iOS << iIndex.value();
+    return iOS;
+  }
+
+  class ESRecordIndex {
+  public:
+    using Value_t = unsigned int;
+
+    constexpr ESRecordIndex() noexcept = default;
+    constexpr explicit ESRecordIndex(unsigned int iValue) noexcept : index_{iValue} {}
+    constexpr ESRecordIndex(ESRecordIndex const&) noexcept = default;
+    constexpr ESRecordIndex(ESRecordIndex&&) noexcept = default;
+
+    constexpr ESRecordIndex& operator=(ESRecordIndex const&) noexcept = default;
+    constexpr ESRecordIndex& operator=(ESRecordIndex&&) noexcept = default;
+
+    constexpr bool operator==(ESRecordIndex iOther) const noexcept { return iOther.index_ == index_; }
+    constexpr bool operator!=(ESRecordIndex iOther) const noexcept { return iOther.index_ != index_; }
+
+    constexpr Value_t value() const noexcept { return index_; }
+
+  private:
+    Value_t index_ = std::numeric_limits<int>::max();
+  };
+  inline std::ostream& operator<<(std::ostream& iOS, ESRecordIndex const& iIndex) {
+    iOS << iIndex.value();
+    return iOS;
+  }
+
+}  // namespace edm
+#endif
diff --git a/FWCore/Utilities/interface/ESInputTag.h b/FWCore/Utilities/interface/ESInputTag.h
index de9961ef9905f..d1ead42c85638 100644
--- a/FWCore/Utilities/interface/ESInputTag.h
+++ b/FWCore/Utilities/interface/ESInputTag.h
@@ -84,37 +84,36 @@
 
 // forward declarations
 namespace edm {
-   class ESInputTag {
-   public:
-      ESInputTag();
-      ESInputTag(const std::string& iModuleLabel, const std::string& iDataLabel);
-      ESInputTag(const std::string& iEncodedValue);
+  class ESInputTag {
+  public:
+    explicit ESInputTag();
+    explicit ESInputTag(const std::string& iModuleLabel, const std::string& iDataLabel);
+    explicit ESInputTag(const std::string& iEncodedValue);
 
-      // ---------- const member functions ---------------------
+    // ---------- const member functions ---------------------
 
-      /**Returns the label assigned to the module for the data to be retrieved.
+    /**Returns the label assigned to the module for the data to be retrieved.
        If the value matches the defaultModule value (which is the empty string)
        Then no match is attempted with the module label.
        */
-      const std::string& module() const { return module_;}
+    const std::string& module() const { return module_; }
 
-      /**Returns the label used to access the data from the EventSetup.
+    /**Returns the label used to access the data from the EventSetup.
        The empty string is an allowed (and default) value.
        */
-      const std::string& data() const {return data_;}
+    const std::string& data() const { return data_; }
 
-      bool operator==(const edm::ESInputTag& iRHS) const;
+    bool operator==(const edm::ESInputTag& iRHS) const;
 
-      std::string encode() const;
+    std::string encode() const;
 
-   private:
+  private:
+    // ---------- member data --------------------------------
+    std::string module_;
+    std::string data_;
+  };
 
-      // ---------- member data --------------------------------
-      std::string module_;
-      std::string data_;
-   };
-
-   std::ostream& operator<<(std::ostream&, ESInputTag const&);
-}
+  std::ostream& operator<<(std::ostream&, ESInputTag const&);
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/Exception.h b/FWCore/Utilities/interface/Exception.h
index 6f748482e58c3..b5b64137884fc 100644
--- a/FWCore/Utilities/interface/Exception.h
+++ b/FWCore/Utilities/interface/Exception.h
@@ -48,42 +48,36 @@ namespace cms {
     // member template needed to support streaming output to an object
     // of type cms::Exception, or a subclass of cms::Exception.
 
-    template <typename T, bool b> struct Desired;
-    template <typename T> struct Desired<T, true> { typedef T type; };
-
+    template <typename T, bool b>
+    struct Desired;
+    template <typename T>
+    struct Desired<T, true> {
+      typedef T type;
+    };
 
     // The following struct template is a metafunction which combines
     // two of the boost type_traits metafunctions.
 
     template <typename BASE, typename DERIVED>
     struct is_derived_or_same {
-      static bool const value = 
-	std::is_base_of<BASE,DERIVED>::value || std::is_same<BASE,DERIVED>::value;
+      static bool const value = std::is_base_of<BASE, DERIVED>::value || std::is_same<BASE, DERIVED>::value;
     };
 
-  }
-
+  }  // namespace detail
 
   class dso_export Exception : public std::exception {
   public:
-
     explicit Exception(std::string const& aCategory);
-    explicit Exception(char const*        aCategory);
-
-    Exception(std::string const& aCategory,
-	      std::string const& message);
-    Exception(char const*        aCategory,
-	      std::string const& message);
-    Exception(std::string const& aCategory,
-	      char const*        message);
-    Exception(char const*        aCategory,
-	      char const*        message);
-
-    Exception(std::string const& aCategory,
-              std::string const& message,
-              Exception const& another);
-
-    Exception(Exception const& other); 
+    explicit Exception(char const* aCategory);
+
+    Exception(std::string const& aCategory, std::string const& message);
+    Exception(char const* aCategory, std::string const& message);
+    Exception(std::string const& aCategory, char const* message);
+    Exception(char const* aCategory, char const* message);
+
+    Exception(std::string const& aCategory, std::string const& message, Exception const& another);
+
+    Exception(Exception const& other);
     ~Exception() noexcept override;
 
     void swap(Exception& other);
@@ -101,7 +95,7 @@ namespace cms {
     std::list<std::string> const& additionalInfo() const;
     int returnCode() const;
 
-    void raise() {rethrow();}
+    void raise() { rethrow(); }
 
     void append(Exception const& another);
     void append(std::string const& more_information);
@@ -112,10 +106,10 @@ namespace cms {
     void clearAdditionalInfo();
 
     void addContext(std::string const& context);
-    void addContext(char const*        context);
+    void addContext(char const* context);
 
     void addAdditionalInfo(std::string const& info);
-    void addAdditionalInfo(char const*        info);
+    void addAdditionalInfo(char const* info);
 
     void setContext(std::list<std::string> const& context);
     void setAdditionalInfo(std::list<std::string> const& info);
@@ -146,20 +140,16 @@ namespace cms {
     // object is a real danger.
 
     template <typename E, typename T>
-    friend
-    typename detail::Desired<E, detail::is_derived_or_same<Exception,std::remove_reference_t<E>>::value>::type &
+    friend typename detail::Desired<E, detail::is_derived_or_same<Exception, std::remove_reference_t<E>>::value>::type&
     operator<<(E&& e, T const& stuff);
 
     template <typename E>
-    friend
-    typename detail::Desired<E, detail::is_derived_or_same<Exception,std::remove_reference_t<E>>::value>::type &
-    operator<<(E&& e, std::ostream&(*f)(std::ostream&));
+    friend typename detail::Desired<E, detail::is_derived_or_same<Exception, std::remove_reference_t<E>>::value>::type&
+    operator<<(E&& e, std::ostream& (*f)(std::ostream&));
 
-  
     template <typename E>
-    friend
-    typename detail::Desired<E, detail::is_derived_or_same<Exception,std::remove_reference_t<E>>::value>::type &
-    operator<<(E&& e, std::ios_base&(*f)(std::ios_base&));
+    friend typename detail::Desired<E, detail::is_derived_or_same<Exception, std::remove_reference_t<E>>::value>::type&
+    operator<<(E&& e, std::ios_base& (*f)(std::ios_base&));
 
     // The following two function templates should be included, to help
     // reduce the number of function templates instantiated. However,
@@ -171,7 +161,7 @@ namespace cms {
     //     typename detail::Desired<E, (std::is_base_of<Exception,E>::value ||
     // 				 std::is_same<Exception,E>::value)>::type &
     //     operator<<(E& e, const char*);
-  
+
     //    template <typename E>
     //    friend
     //    typename detail::Desired<E, (std::is_base_of<Exception,E>::value ||
@@ -183,7 +173,6 @@ namespace cms {
     std::list<std::string> history() const;
 
   private:
-
     void init(std::string const& message);
     virtual void rethrow();
     virtual int returnCode_() const;
@@ -197,10 +186,7 @@ namespace cms {
     bool alreadyPrinted_;
   };
 
-  inline 
-  std::ostream& 
-  operator<<(std::ostream& ost, Exception const& e)
-  {
+  inline std::ostream& operator<<(std::ostream& ost, Exception const& e) {
     ost << e.explainSelf();
     return ost;
   }
@@ -208,41 +194,34 @@ namespace cms {
   // -------- implementation ---------
 
   template <typename E, typename T>
-  inline
-  typename detail::Desired<E, detail::is_derived_or_same<Exception,std::remove_reference_t<E>>::value>::type &
-  operator<<(E&& e, T const& stuff)
-  {
+  inline typename detail::Desired<E, detail::is_derived_or_same<Exception, std::remove_reference_t<E>>::value>::type&
+  operator<<(E&& e, T const& stuff) {
     e.ost_ << stuff;
     return e;
   }
 
   template <typename E>
-  inline 
-  typename detail::Desired<E, detail::is_derived_or_same<Exception,std::remove_reference_t<E>>::value>::type &
-  operator<<(E&& e, std::ostream&(*f)(std::ostream&))
-  {
+  inline typename detail::Desired<E, detail::is_derived_or_same<Exception, std::remove_reference_t<E>>::value>::type&
+  operator<<(E&& e, std::ostream& (*f)(std::ostream&)) {
     f(e.ost_);
     return e;
   }
 
   template <typename E>
-  inline
-  typename detail::Desired<E, detail::is_derived_or_same<Exception,std::remove_reference_t<E>>::value>::type &
-  operator<<(E&& e, std::ios_base&(*f)(std::ios_base&))
-  {
+  inline typename detail::Desired<E, detail::is_derived_or_same<Exception, std::remove_reference_t<E>>::value>::type&
+  operator<<(E&& e, std::ios_base& (*f)(std::ios_base&)) {
     f(e.ost_);
     return e;
   }
 
-
   // The following four function templates should be included, to help
   // reduce the number of function templates instantiated. However,
   // GCC 3.2.3 crashes with an internal compiler error when
   // instantiating these functions.
 
   // template <typename E>
-  // inline 
-  // typename detail::Desired<E, detail::is_derived_or_same<Exception,E>::value>::type & 
+  // inline
+  // typename detail::Desired<E, detail::is_derived_or_same<Exception,E>::value>::type &
   // operator<<(E& e, char const* c)
   // {
   //   e.ost_ << c;
@@ -250,8 +229,8 @@ namespace cms {
   // }
 
   // template <typename E>
-  // inline 
-  // typename detail::Desired<E, detail::is_derived_or_same<Exception,E>::value>::type const& 
+  // inline
+  // typename detail::Desired<E, detail::is_derived_or_same<Exception,E>::value>::type const&
   // operator<<(E const& e, char const* c)
   // {
   //   E& ref = const_cast<E&>(e);
@@ -260,8 +239,8 @@ namespace cms {
   // }
 
   //  template <typename E>
-  //  inline 
-  //  typename detail::Desired<E, detail::is_derived_or_same<Exception,E>::value>::type & 
+  //  inline
+  //  typename detail::Desired<E, detail::is_derived_or_same<Exception,E>::value>::type &
   //  operator<<(E& e, char* c)
   //  {
   //    e.ost_ << c;
@@ -269,14 +248,14 @@ namespace cms {
   //  }
 
   //  template <typename E>
-  //  inline 
-  //  typename detail::Desired<E, detail::is_derived_or_same<Exception,E>::value>::type const& 
+  //  inline
+  //  typename detail::Desired<E, detail::is_derived_or_same<Exception,E>::value>::type const&
   //  operator<<(E const& e, char* c)
   //  {
   //    E& ref = const_cast<E&>(e);
   //    ref.ost_ << c;
   //    return e;
   //  }
-}
+}  // namespace cms
 
 #endif
diff --git a/FWCore/Utilities/interface/ExceptionCollector.h b/FWCore/Utilities/interface/ExceptionCollector.h
index 90d4df3bccb2a..2b018f1530495 100644
--- a/FWCore/Utilities/interface/ExceptionCollector.h
+++ b/FWCore/Utilities/interface/ExceptionCollector.h
@@ -45,6 +45,6 @@ namespace edm {
     std::unique_ptr<cms::Exception> accumulatedExceptions_;
     int nExceptions_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/ExceptionPropagate.h b/FWCore/Utilities/interface/ExceptionPropagate.h
index 50aca65048e09..368808fbfc57b 100644
--- a/FWCore/Utilities/interface/ExceptionPropagate.h
+++ b/FWCore/Utilities/interface/ExceptionPropagate.h
@@ -7,7 +7,7 @@ namespace edm {
   namespace threadLocalException {
     void setException(std::exception_ptr e);
     std::exception_ptr getException();
-  }
-}
+  }  // namespace threadLocalException
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/ExtensionCord.h b/FWCore/Utilities/interface/ExtensionCord.h
index bd84f6d36630c..c43777e67f907 100644
--- a/FWCore/Utilities/interface/ExtensionCord.h
+++ b/FWCore/Utilities/interface/ExtensionCord.h
@@ -4,7 +4,7 @@
 //
 // Package:     Utilities
 // Class  :     ExtensionCord
-// 
+//
 /**\class ExtensionCord ExtensionCord.h FWCore/Utilities/interface/ExtensionCord.h
 
  Description: Allows passing data from an edm::OutletBase to the holder of the ExtensionCord
@@ -28,61 +28,51 @@
 // forward declarations
 
 namespace edm {
-  template <class T> class OutletBase;
-  
   template <class T>
-  class ExtensionCord
-  {
+  class OutletBase;
+
+  template <class T>
+  class ExtensionCord {
     //only something that inherits from OutletBase<T> will
     // be allowed to call 'setGetter'
     friend class OutletBase<T>;
-    
-   public:
-      struct Holder {
-        extensioncord::ECGetterBase<T>* getter_;
-      };
-
-    
-      ExtensionCord(): holder_(new Holder()) {}
-      //virtual ~ExtensionCord();
-
-      // ---------- const member functions ---------------------
-      const T* operator->() const {
-        return this->get();
-      }
-      
-      const T* get() const {
-        if (!this->connected()) {
-          throw cms::Exception("InvalidExtensionCord")<<"an edm::ExtensionCord for type "<<typeid(T).name()
-          <<" was not connected to an outlet. This is a programming error.";
-        }
-        return holder_->getter_->get();
-      }
-        
-      const T& operator*() const {
-        return *(this->get());
-      }
 
-      ///Returns true if the ExtensionCord is connected to an outlet and can therefore deliver data
-      bool connected() const {
-        return 0 != holder_->getter_;
+  public:
+    struct Holder {
+      extensioncord::ECGetterBase<T>* getter_;
+    };
+
+    ExtensionCord() : holder_(new Holder()) {}
+    //virtual ~ExtensionCord();
+
+    // ---------- const member functions ---------------------
+    const T* operator->() const { return this->get(); }
+
+    const T* get() const {
+      if (!this->connected()) {
+        throw cms::Exception("InvalidExtensionCord") << "an edm::ExtensionCord for type " << typeid(T).name()
+                                                     << " was not connected to an outlet. This is a programming error.";
       }
-      // ---------- static member functions --------------------
+      return holder_->getter_->get();
+    }
 
-      // ---------- member functions ---------------------------
+    const T& operator*() const { return *(this->get()); }
 
-   private:
-      //ExtensionCord(const ExtensionCord&); // allow default
+    ///Returns true if the ExtensionCord is connected to an outlet and can therefore deliver data
+    bool connected() const { return 0 != holder_->getter_; }
+    // ---------- static member functions --------------------
 
-      //const ExtensionCord& operator=(const ExtensionCord&); // allow default
+    // ---------- member functions ---------------------------
 
-        void setGetter(extensioncord::ECGetterBase<T>* iGetter ) {
-        holder_->getter_ = iGetter;
-      }
-      // ---------- member data --------------------------------
-      std::shared_ptr< Holder > holder_;
-      
+  private:
+    //ExtensionCord(const ExtensionCord&); // allow default
+
+    //const ExtensionCord& operator=(const ExtensionCord&); // allow default
+
+    void setGetter(extensioncord::ECGetterBase<T>* iGetter) { holder_->getter_ = iGetter; }
+    // ---------- member data --------------------------------
+    std::shared_ptr<Holder> holder_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/FriendlyName.h b/FWCore/Utilities/interface/FriendlyName.h
index 715d132468c6a..88fd81cbf4dd3 100644
--- a/FWCore/Utilities/interface/FriendlyName.h
+++ b/FWCore/Utilities/interface/FriendlyName.h
@@ -13,5 +13,5 @@ namespace edm {
   namespace friendlyname {
     std::string friendlyName(std::string const& iFullName);
   }
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/FunctionWithDict.h b/FWCore/Utilities/interface/FunctionWithDict.h
index c7412b0d19925..ff55dcef3bc22 100644
--- a/FWCore/Utilities/interface/FunctionWithDict.h
+++ b/FWCore/Utilities/interface/FunctionWithDict.h
@@ -21,36 +21,38 @@ FunctionWithDict:  A holder for a class member function
 
 namespace edm {
 
-class ObjectWithDict;
-class TypeWithDict;
-
-class FunctionWithDict {
-private:
-  TMethod* function_;
-  TInterpreter::CallFuncIFacePtr_t funcptr_;
-
-public:
-  FunctionWithDict();
-  explicit FunctionWithDict(TMethod*);
-  explicit operator bool() const;
-  std::string name() const;
-  std::string typeName() const;
-  TypeWithDict finalReturnType() const;
-  bool isConst() const;
-  bool isConstructor() const;
-  bool isDestructor() const;
-  bool isOperator() const;
-  bool isPublic() const;
-  bool isStatic() const;
-  TypeWithDict declaringType() const;
-  size_t functionParameterSize(bool required = false) const;
-  size_t size() const;
-  void invoke(ObjectWithDict const& obj, ObjectWithDict* ret = nullptr, std::vector<void*> const& values = std::vector<void*>()) const;
-  void invoke(ObjectWithDict* ret = nullptr, std::vector<void*> const& values = std::vector<void*>()) const;
-  IterWithDict<TMethodArg> begin() const;
-  IterWithDict<TMethodArg> end() const;
-};
-
-} // namespace edm
-
-#endif // FWCore_Utilities_FunctionWithDict_h
+  class ObjectWithDict;
+  class TypeWithDict;
+
+  class FunctionWithDict {
+  private:
+    TMethod* function_;
+    TInterpreter::CallFuncIFacePtr_t funcptr_;
+
+  public:
+    FunctionWithDict();
+    explicit FunctionWithDict(TMethod*);
+    explicit operator bool() const;
+    std::string name() const;
+    std::string typeName() const;
+    TypeWithDict finalReturnType() const;
+    bool isConst() const;
+    bool isConstructor() const;
+    bool isDestructor() const;
+    bool isOperator() const;
+    bool isPublic() const;
+    bool isStatic() const;
+    TypeWithDict declaringType() const;
+    size_t functionParameterSize(bool required = false) const;
+    size_t size() const;
+    void invoke(ObjectWithDict const& obj,
+                ObjectWithDict* ret = nullptr,
+                std::vector<void*> const& values = std::vector<void*>()) const;
+    void invoke(ObjectWithDict* ret = nullptr, std::vector<void*> const& values = std::vector<void*>()) const;
+    IterWithDict<TMethodArg> begin() const;
+    IterWithDict<TMethodArg> end() const;
+  };
+
+}  // namespace edm
+
+#endif  // FWCore_Utilities_FunctionWithDict_h
diff --git a/FWCore/Utilities/interface/GCC11Compatibility.h b/FWCore/Utilities/interface/GCC11Compatibility.h
index 74b185d79ea52..66a790c42dc90 100644
--- a/FWCore/Utilities/interface/GCC11Compatibility.h
+++ b/FWCore/Utilities/interface/GCC11Compatibility.h
@@ -9,35 +9,34 @@
 #include "FWCore/Utilities/interface/Visibility.h"
 #include "FWCore/Utilities/interface/Likely.h"
 
-
 #if defined(__GCCXML__) || defined(__CINT__)
-  #define CMS_NOCXX11
+#define CMS_NOCXX11
 #endif
-#if !GCC_PREREQUISITE(4,6,0) && !defined(__clang__)
-  #define CMS_NOCXX11
+#if !GCC_PREREQUISITE(4, 6, 0) && !defined(__clang__)
+#define CMS_NOCXX11
 #endif
 
 #ifndef CMS_NOCXX11
-  #if GCC_PREREQUISITE(4,7,0)
-     #define GCC11_FINAL final
-     #define GCC11_OVERRIDE override
-  #elif __clang__
-     // FIXME: do not know how to query for final support. It's there in any
-     //        clang version we will ever use, so it's fine.
-     #define GCC11_FINAL final
-     #if __has_feature(cxx_override_control)
-      #define GCC11_OVERRIDE override
-     #endif
-  #else
-     #define GCC11_FINAL
-     #define GCC11_OVERRIDE
-  #endif // gcc 4.7
+#if GCC_PREREQUISITE(4, 7, 0)
+#define GCC11_FINAL final
+#define GCC11_OVERRIDE override
+#elif __clang__
+// FIXME: do not know how to query for final support. It's there in any
+//        clang version we will ever use, so it's fine.
+#define GCC11_FINAL final
+#if __has_feature(cxx_override_control)
+#define GCC11_OVERRIDE override
+#endif
+#else
+#define GCC11_FINAL
+#define GCC11_OVERRIDE
+#endif  // gcc 4.7
 #else
-  #define constexpr
-  #define noexcept
-  #define nullptr 0
-  #define GCC11_FINAL
-  #define GCC11_OVERRIDE
-#endif // NOCXX11
+#define constexpr
+#define noexcept
+#define nullptr 0
+#define GCC11_FINAL
+#define GCC11_OVERRIDE
+#endif  // NOCXX11
 
 #endif  // FWCORE_GCC11COMPATIBILITY_H
diff --git a/FWCore/Utilities/interface/GCCPrerequisite.h b/FWCore/Utilities/interface/GCCPrerequisite.h
index 2af517341e6d1..f68c4e830123e 100644
--- a/FWCore/Utilities/interface/GCCPrerequisite.h
+++ b/FWCore/Utilities/interface/GCCPrerequisite.h
@@ -9,13 +9,12 @@
    Note - it won't work for gcc1 since the _MINOR macros
    were not defined then.  */
 #if defined __GNUC__ && defined __GNUC_MINOR__ && defined __GNUC_PATCHLEVEL__
-# define GCC_PREREQUISITE(maj, min, patch) \
-        ((__GNUC__ << 16) + (__GNUC_MINOR__ << 8) + __GNUC_PATCHLEVEL__ >= ((maj) << 16) + ((min) << 8) + (patch))
-#elif defined __GNUC__ && defined __GNUC_MINOR__ 
-# define GCC_PREREQUISITE(maj, min, patch) \
-        ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+#define GCC_PREREQUISITE(maj, min, patch) \
+  ((__GNUC__ << 16) + (__GNUC_MINOR__ << 8) + __GNUC_PATCHLEVEL__ >= ((maj) << 16) + ((min) << 8) + (patch))
+#elif defined __GNUC__ && defined __GNUC_MINOR__
+#define GCC_PREREQUISITE(maj, min, patch) ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
 #else
-# define GCC_PREREQUISITE(maj, min, patch) 0
+#define GCC_PREREQUISITE(maj, min, patch) 0
 #endif
 
 #endif
diff --git a/FWCore/Utilities/interface/GetEnvironmentVariable.h b/FWCore/Utilities/interface/GetEnvironmentVariable.h
index 0e14bd52c634f..665d53252c2eb 100644
--- a/FWCore/Utilities/interface/GetEnvironmentVariable.h
+++ b/FWCore/Utilities/interface/GetEnvironmentVariable.h
@@ -5,10 +5,9 @@
 #include <string>
 
 namespace edm {
-  inline
-  std::string getEnvironmentVariable (std::string const& name, std::string const& defaultValue = std::string()) {
-    char *p = ::getenv(name.c_str());
-    return (p ? std::string(p) : defaultValue); 
+  inline std::string getEnvironmentVariable(std::string const& name, std::string const& defaultValue = std::string()) {
+    char* p = ::getenv(name.c_str());
+    return (p ? std::string(p) : defaultValue);
   }
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/GetPassID.h b/FWCore/Utilities/interface/GetPassID.h
index f74eaf35bf21e..be0567da12e7f 100644
--- a/FWCore/Utilities/interface/GetPassID.h
+++ b/FWCore/Utilities/interface/GetPassID.h
@@ -4,11 +4,10 @@
 #include <string>
 
 namespace edm {
-  inline
-  std::string getPassID () {
+  inline std::string getPassID() {
     static std::string const passID;
     // return empty string for now.
-    return passID; 
+    return passID;
   }
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/HRRealTime.h b/FWCore/Utilities/interface/HRRealTime.h
index 93eb1fe31ab89..a9e5cf30eb067 100644
--- a/FWCore/Utilities/interface/HRRealTime.h
+++ b/FWCore/Utilities/interface/HRRealTime.h
@@ -1,5 +1,5 @@
-#ifndef  FWCore_Utilities_HRRealTime_H
-#define  FWCore_Utilities_HRRealTime_H
+#ifndef FWCore_Utilities_HRRealTime_H
+#define FWCore_Utilities_HRRealTime_H
 /*  
  *  High Resolution Real Timer
  *  inline high-resolution real timer
@@ -14,83 +14,73 @@
 
 namespace edm {
   namespace details {
-    
+
     //
     //  defines "rdtsc"
     //
 #if defined(__i386__)
 
-    static __inline__ unsigned long long rdtsc(void)
-    {
+    static __inline__ unsigned long long rdtsc(void) {
       unsigned long long int x;
-      __asm__ volatile (".byte 0x0f, 0x31" : "=A" (x));
+      __asm__ volatile(".byte 0x0f, 0x31" : "=A"(x));
       return x;
     }
 #elif defined(__x86_64__)
 
-
-    static __inline__ unsigned long long rdtsc(void)
-    {
+    static __inline__ unsigned long long rdtsc(void) {
       unsigned hi, lo;
-      __asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi));
-      return ( (unsigned long long)lo)|( ((unsigned long long)hi)<<32 );
+      __asm__ __volatile__("rdtsc" : "=a"(lo), "=d"(hi));
+      return ((unsigned long long)lo) | (((unsigned long long)hi) << 32);
     }
 
 #elif defined(__powerpc__)
 
-
-    static __inline__ unsigned long long rdtsc(void)
-    {
-      unsigned long long int result=0;
-      unsigned long int upper, lower,tmp;
+    static __inline__ unsigned long long rdtsc(void) {
+      unsigned long long int result = 0;
+      unsigned long int upper, lower, tmp;
       __asm__ volatile(
-		       "0:                  \n"
-		       "\tmftbu   %0           \n"
-		       "\tmftb    %1           \n"
-		       "\tmftbu   %2           \n"
-		       "\tcmpw    %2,%0        \n"
-		       "\tbne     0b         \n"
-		       : "=r"(upper),"=r"(lower),"=r"(tmp)
-		       );
+          "0:                  \n"
+          "\tmftbu   %0           \n"
+          "\tmftb    %1           \n"
+          "\tmftbu   %2           \n"
+          "\tcmpw    %2,%0        \n"
+          "\tbne     0b         \n"
+          : "=r"(upper), "=r"(lower), "=r"(tmp));
       result = upper;
-      result = result<<32;
-      result = result|lower;
-      
-      return(result);
+      result = result << 32;
+      result = result | lower;
+
+      return (result);
     }
 #elif defined(__arm__)
 #warning unsigned long long rdtsc(void) is not implemented on ARMv7 architecture. Returning 0 by default.
-    static __inline__ unsigned long long rdtsc(void)
-    {
-      return 0;
-    }
+    static __inline__ unsigned long long rdtsc(void) { return 0; }
 #elif defined(__aarch64__)
-    static __inline__ unsigned long long rdtsc(void)
-    {
+    static __inline__ unsigned long long rdtsc(void) {
       // We will be reading CNTVCT_EL0 (the virtual counter), which is prepared for us by OS.
       // The system counter sits outside multiprocessor in SOC and runs on a different frequency.
       // Increments at a fixed frequency, typically in the range 1-50MHz.
       // Applications can figure out system counter configuration via CNTFRQ_EL0.
-      // 
+      //
       // Notice:
-      // Reads of CNTVCT_EL0 can occur speculatively and out of order relative to other 
+      // Reads of CNTVCT_EL0 can occur speculatively and out of order relative to other
       // instructions executed on the same PE.
-      // For example, if a read from memory is used to obtain a signal from another agent 
-      // that indicates that CNTVCT_EL0 must be read, an ISB is used to ensure that the 
+      // For example, if a read from memory is used to obtain a signal from another agent
+      // that indicates that CNTVCT_EL0 must be read, an ISB is used to ensure that the
       // read of CNTVCT_EL0 occurs after the signal has been read from memory
       //
       // More details:
       // Chapter D6: The Generic Timer in AArch64 state
       // ARM DDI 0487B.a, ID033117 (file: DDI0487B_a_armv8_arm.pdf)
-      unsigned long long ret; // unsigned 64-bit value
-      __asm__ __volatile__ ("isb; mrs %0, cntvct_el0" : "=r" (ret));
+      unsigned long long ret;  // unsigned 64-bit value
+      __asm__ __volatile__("isb; mrs %0, cntvct_el0" : "=r"(ret));
       return ret;
     }
 #else
 #error The file FWCore/Utilities/interface/HRRealTime.h needs to be set up for your CPU type.
 #endif
- }
-}
+  }  // namespace details
+}  // namespace edm
 
 namespace edm {
 
@@ -98,11 +88,8 @@ namespace edm {
   typedef unsigned long long int HRTimeType;
 
   // High Precision real time in clock-units
-  inline HRTimeType hrRealTime() {
-    return details::rdtsc();
-  }
-
-}
+  inline HRTimeType hrRealTime() { return details::rdtsc(); }
 
+}  // namespace edm
 
-#endif //   FWCore_Utilities__HRRealTime_H
+#endif  //   FWCore_Utilities__HRRealTime_H
diff --git a/FWCore/Utilities/interface/IndexSet.h b/FWCore/Utilities/interface/IndexSet.h
index 463da9c7cebe8..3aebbb5c4eb69 100644
--- a/FWCore/Utilities/interface/IndexSet.h
+++ b/FWCore/Utilities/interface/IndexSet.h
@@ -3,7 +3,6 @@
 
 #include <vector>
 
-
 namespace edm {
   /**
    * A simple class representing a set of indices to another container
@@ -23,7 +22,7 @@ namespace edm {
   class IndexSet {
   public:
     /// Construct empty set
-    IndexSet(): numTrueElements_(0) {}
+    IndexSet() : numTrueElements_(0) {}
 
     /// Check if the set is empty
     bool empty() const { return numTrueElements_ == 0; }
@@ -33,7 +32,7 @@ namespace edm {
 
     /// Reserve memory for the set
     void reserve(unsigned int size) {
-      if(size >= content_.size()) {
+      if (size >= content_.size()) {
         content_.resize(size, false);
       }
     }
@@ -46,20 +45,19 @@ namespace edm {
 
     /// Insert an element (=index) to the set
     void insert(unsigned int index) {
-      reserve(index+1);
-      numTrueElements_ += !content_[index]; // count increases if value was false
+      reserve(index + 1);
+      numTrueElements_ += !content_[index];  // count increases if value was false
       content_[index] = true;
     }
 
     /// Check if an element (=index) is in the set
-    bool has(unsigned int index) const {
-      return index < content_.size() && content_[index];
-    }
+    bool has(unsigned int index) const { return index < content_.size() && content_[index]; }
 
   private:
-    std::vector<bool> content_;    /// Each possible element of the set corresponds an index in this vector. The value of an element tells if that index exists in the set (true) or not (false).
-    unsigned int numTrueElements_; /// Count of true elements is equivalent of "size()" of std::set
+    std::vector<bool>
+        content_;  /// Each possible element of the set corresponds an index in this vector. The value of an element tells if that index exists in the set (true) or not (false).
+    unsigned int numTrueElements_;  /// Count of true elements is equivalent of "size()" of std::set
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/InputTag.h b/FWCore/Utilities/interface/InputTag.h
index 301d686127e76..642f6d38fdcff 100644
--- a/FWCore/Utilities/interface/InputTag.h
+++ b/FWCore/Utilities/interface/InputTag.h
@@ -33,25 +33,27 @@ namespace edm {
 
     std::string encode() const;
 
-    std::string const& label() const {return label_;} 
-    std::string const& instance() const {return instance_;}
-    ///an empty string means find the most recently produced 
+    std::string const& label() const { return label_; }
+    std::string const& instance() const { return instance_; }
+    ///an empty string means find the most recently produced
     ///product with the label and instance
-    std::string const& process() const {return process_;} 
+    std::string const& process() const { return process_; }
 
     bool willSkipCurrentProcess() const { return skipCurrentProcess_; }
-    
+
     bool operator==(InputTag const& tag) const;
 
     ProductResolverIndex indexFor(TypeID const& typeID, BranchType branchType, void const* productRegistry) const;
 
-    void tryToCacheIndex(ProductResolverIndex index, TypeID const& typeID, BranchType branchType, void const* productRegistry) const;
+    void tryToCacheIndex(ProductResolverIndex index,
+                         TypeID const& typeID,
+                         BranchType branchType,
+                         void const* productRegistry) const;
 
     static const std::string kSkipCurrentProcess;
     static const std::string kCurrentProcess;
 
   private:
-
     bool calcSkipCurrentProcess() const;
 
     std::string label_;
@@ -69,5 +71,5 @@ namespace edm {
   };
 
   std::ostream& operator<<(std::ostream& ost, InputTag const& tag);
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/InputType.h b/FWCore/Utilities/interface/InputType.h
index 7351d1cde1d2b..8b1680ed1aa62 100644
--- a/FWCore/Utilities/interface/InputType.h
+++ b/FWCore/Utilities/interface/InputType.h
@@ -2,10 +2,6 @@
 #define FWCore_Utilities_InputType_h
 
 namespace edm {
-  enum class InputType {
-    Primary,
-    SecondaryFile,
-    SecondarySource
-  };
+  enum class InputType { Primary, SecondaryFile, SecondarySource };
 }
 #endif
diff --git a/FWCore/Utilities/interface/IterWithDict.h b/FWCore/Utilities/interface/IterWithDict.h
index 9a3081047b083..acfb186131fac 100644
--- a/FWCore/Utilities/interface/IterWithDict.h
+++ b/FWCore/Utilities/interface/IterWithDict.h
@@ -11,33 +11,33 @@ IterWithDict:  An iterator for a TList so a range for loop can be used
 
 namespace edm {
 
-class IterWithDictBase {
-private:
-  TIter iter_;
-  bool atEnd_;
-protected:
-  void advance();
-  TIter const& iter() const;
-public:
-  IterWithDictBase();
-  explicit IterWithDictBase(TList*);
-  bool operator!=(IterWithDictBase const&) const;
-};
-
-template<typename T>
-class IterWithDict : public IterWithDictBase {
-public:
-  IterWithDict() : IterWithDictBase() {}
-  explicit IterWithDict(TList* list) : IterWithDictBase(list) {}
-  IterWithDict<T>& operator++() {
-    advance();
-    return *this;
-  }
-  T* operator*() const {
-    return static_cast<T*>(*iter());
-  }
-};
-
-} // namespace edm
-
-#endif // FWCore_Utilities_IterWithDict_h
+  class IterWithDictBase {
+  private:
+    TIter iter_;
+    bool atEnd_;
+
+  protected:
+    void advance();
+    TIter const& iter() const;
+
+  public:
+    IterWithDictBase();
+    explicit IterWithDictBase(TList*);
+    bool operator!=(IterWithDictBase const&) const;
+  };
+
+  template <typename T>
+  class IterWithDict : public IterWithDictBase {
+  public:
+    IterWithDict() : IterWithDictBase() {}
+    explicit IterWithDict(TList* list) : IterWithDictBase(list) {}
+    IterWithDict<T>& operator++() {
+      advance();
+      return *this;
+    }
+    T* operator*() const { return static_cast<T*>(*iter()); }
+  };
+
+}  // namespace edm
+
+#endif  // FWCore_Utilities_IterWithDict_h
diff --git a/FWCore/Utilities/interface/JobMode.h b/FWCore/Utilities/interface/JobMode.h
index f097a169608fb..341450a55fde9 100644
--- a/FWCore/Utilities/interface/JobMode.h
+++ b/FWCore/Utilities/interface/JobMode.h
@@ -12,12 +12,7 @@
 
 namespace edm {
 
-  enum JobMode {
-         GridJobMode
-       , ReleaseValidationJobMode
-       , AnalysisJobMode
-       , NilJobMode
-  };
+  enum JobMode { GridJobMode, ReleaseValidationJobMode, AnalysisJobMode, NilJobMode };
 
 }
-#endif // FWCore_Utilities_JobMode_h
+#endif  // FWCore_Utilities_JobMode_h
diff --git a/FWCore/Utilities/interface/Likely.h b/FWCore/Utilities/interface/Likely.h
index 75ed610395a3e..a57d90f9f363e 100644
--- a/FWCore/Utilities/interface/Likely.h
+++ b/FWCore/Utilities/interface/Likely.h
@@ -2,11 +2,11 @@
 #define FWCore_Utilities_Likely_h
 #include "FWCore/Utilities/interface/GCCPrerequisite.h"
 
-#if GCC_PREREQUISITE(3,0,0)
+#if GCC_PREREQUISITE(3, 0, 0)
 
 #if defined(NO_LIKELY)
 #define LIKELY(x) (x)
-#define UNLIKELY(x) (x)   
+#define UNLIKELY(x) (x)
 #elif defined(REVERSE_LIKELY)
 #define UNLIKELY(x) (__builtin_expect(x, true))
 #define LIKELY(x) (__builtin_expect(x, false))
@@ -17,7 +17,7 @@
 
 #else
 #define NO_LIKELY
-#define LIKELY(x) (x)  
+#define LIKELY(x) (x)
 #define UNLIKELY(x) (x)
 #endif
 
diff --git a/FWCore/Utilities/interface/LuminosityBlockIndex.h b/FWCore/Utilities/interface/LuminosityBlockIndex.h
index 11d6b4bc4682f..64b4d8206ede9 100644
--- a/FWCore/Utilities/interface/LuminosityBlockIndex.h
+++ b/FWCore/Utilities/interface/LuminosityBlockIndex.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Utilities
 // Class  :     edm::LuminosityBlockIndex
-// 
+//
 /**\class edm::LuminosityBlockIndex LuminosityBlockIndex.h "FWCore/Utilities/interface/LuminosityBlockIndex.h"
 
  Description: Identifies a 'slot' being used to hold an active LuminosityBlock
@@ -29,44 +29,37 @@
 // forward declarations
 namespace edm {
   class LuminosityBlockPrincipal;
-  
-  class LuminosityBlockIndex
-  {
-    
+
+  class LuminosityBlockIndex {
   public:
     LuminosityBlockIndex(const LuminosityBlockIndex&) = default;
     LuminosityBlockIndex& operator=(const LuminosityBlockIndex&) = default;
     ~LuminosityBlockIndex() = default;
-    
+
     // ---------- const member functions ---------------------
-    operator unsigned int() const {
-      return value_;
-    }
-    
-    bool operator==(LuminosityBlockIndex const& iRHS) const {
-      return value() == iRHS.value();
-    }
+    operator unsigned int() const { return value_; }
+
+    bool operator==(LuminosityBlockIndex const& iRHS) const { return value() == iRHS.value(); }
 
     /** \return value ranging from 0 to one less than max number of simultaneous luminosityblocks.
      */
-    unsigned int value() const { return value_;}
-    
+    unsigned int value() const { return value_; }
+
     static LuminosityBlockIndex invalidLuminosityBlockIndex();
 
   private:
     ///Only the LuminosityBlockPrincipal is allowed to make one of these
     friend class LuminosityBlockPrincipal;
 
-    explicit LuminosityBlockIndex(unsigned int iValue): value_{iValue} {}
-    
-    LuminosityBlockIndex()= delete;
-    
+    explicit LuminosityBlockIndex(unsigned int iValue) : value_{iValue} {}
+
+    LuminosityBlockIndex() = delete;
+
     // ---------- member data --------------------------------
     unsigned int value_;
-    
-    static const unsigned int invalidValue_;    
-  };
-}
 
+    static const unsigned int invalidValue_;
+  };
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/MallocOpts.h b/FWCore/Utilities/interface/MallocOpts.h
index 20f4f7afeef8a..c076962624c82 100644
--- a/FWCore/Utilities/interface/MallocOpts.h
+++ b/FWCore/Utilities/interface/MallocOpts.h
@@ -5,7 +5,7 @@
 //
 // Package:     Utilities
 // Class  :     MallocOpts
-// 
+//
 // Original Author:  Jim Kowalkowski
 //
 // ------------------ malloc option setter -----------------------
@@ -28,58 +28,55 @@
 #include <string>
 #include <ostream>
 
-namespace edm
-{
-  struct MallocOpts
-  {
+namespace edm {
+  struct MallocOpts {
     typedef int opt_type;
-    
-    MallocOpts():
-      mmap_max_(),trim_thr_(),top_pad_(),mmap_thr_()
-    {}
-    MallocOpts(opt_type max,opt_type trim,opt_type pad,opt_type mmap_thr):
-      mmap_max_(max),trim_thr_(trim),top_pad_(pad),mmap_thr_(mmap_thr)
-    {}
-    
+
+    MallocOpts() : mmap_max_(), trim_thr_(), top_pad_(), mmap_thr_() {}
+    MallocOpts(opt_type max, opt_type trim, opt_type pad, opt_type mmap_thr)
+        : mmap_max_(max), trim_thr_(trim), top_pad_(pad), mmap_thr_(mmap_thr) {}
+
     opt_type mmap_max_;
     opt_type trim_thr_;
     opt_type top_pad_;
     opt_type mmap_thr_;
 
-    bool operator==(const MallocOpts& opts) const 
-    {
-      return
-	mmap_max_ == opts.mmap_max_ && 
-	trim_thr_ == opts.trim_thr_ && 
-	top_pad_ == opts.top_pad_ &&
-	mmap_thr_ == opts.mmap_thr_;
+    bool operator==(const MallocOpts& opts) const {
+      return mmap_max_ == opts.mmap_max_ && trim_thr_ == opts.trim_thr_ && top_pad_ == opts.top_pad_ &&
+             mmap_thr_ == opts.mmap_thr_;
     }
-    bool operator!=(const MallocOpts& opts) const
-    { return !operator==(opts); }
+    bool operator!=(const MallocOpts& opts) const { return !operator==(opts); }
   };
 
-  std::ostream& operator<<(std::ostream& ost,const MallocOpts&);
+  std::ostream& operator<<(std::ostream& ost, const MallocOpts&);
 
-  class MallocOptionSetter
-  {
+  class MallocOptionSetter {
   public:
     typedef MallocOpts::opt_type opt_type;
     MallocOptionSetter();
 
-    bool retrieveFromCpuType(); 
+    bool retrieveFromCpuType();
     bool retrieveFromEnv();
     void adjustMallocParams();
     bool hasErrors() const { return !error_message_.empty(); }
     std::string error_message() const { return error_message_; }
 
-    void set_mmap_max(opt_type mmap_max)
-    { values_.mmap_max_=mmap_max; changed_=true; }
-    void set_trim_thr(opt_type trim_thr)
-    { values_.trim_thr_=trim_thr; changed_=true; }
-    void set_top_pad(opt_type top_pad)
-    { values_.top_pad_=top_pad; changed_=true; }
-    void set_mmap_thr(opt_type mmap_thr)
-    { values_.mmap_thr_=mmap_thr; changed_=true; }
+    void set_mmap_max(opt_type mmap_max) {
+      values_.mmap_max_ = mmap_max;
+      changed_ = true;
+    }
+    void set_trim_thr(opt_type trim_thr) {
+      values_.trim_thr_ = trim_thr;
+      changed_ = true;
+    }
+    void set_top_pad(opt_type top_pad) {
+      values_.top_pad_ = top_pad;
+      changed_ = true;
+    }
+    void set_mmap_thr(opt_type mmap_thr) {
+      values_.mmap_thr_ = mmap_thr;
+      changed_ = true;
+    }
 
     MallocOpts get() const { return values_; }
 
@@ -92,8 +89,6 @@ namespace edm
 
   MallocOptionSetter& getGlobalOptionSetter();
 
-}
-
-
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/Map.h b/FWCore/Utilities/interface/Map.h
index 9ea5c44cf0150..e6eed7dcf5c04 100644
--- a/FWCore/Utilities/interface/Map.h
+++ b/FWCore/Utilities/interface/Map.h
@@ -13,9 +13,7 @@ namespace edm {
   // This silly little function documents the fact
   // a possible insert into the map is intentional.
   template <typename Key, typename Value>
-  inline
-  Value&
-  findOrInsert(std::map<Key, Value>& m, Key const& k) {
+  inline Value& findOrInsert(std::map<Key, Value>& m, Key const& k) {
     return m[k];
   }
 
@@ -23,17 +21,13 @@ namespace edm {
   // If the element is not found, it returns the supplied default value
   // Comes in const and non-const versions
   template <typename Key, typename Value>
-  inline
-  Value const&
-  findOrDefault(std::map<Key, Value> const& m, Key const& k, Value const& defaultValue) {
+  inline Value const& findOrDefault(std::map<Key, Value> const& m, Key const& k, Value const& defaultValue) {
     typename std::map<Key, Value>::const_iterator it = m.find(k);
     return (it == m.end() ? defaultValue : it->second);
   }
 
   template <typename Key, typename Value>
-  inline
-  Value&
-  findOrDefault(std::map<Key, Value>& m, Key const& k, Value& defaultValue) {
+  inline Value& findOrDefault(std::map<Key, Value>& m, Key const& k, Value& defaultValue) {
     typename std::map<Key, Value>::const_iterator it = m.find(k);
     return (it == m.end() ? defaultValue : it->second);
   }
@@ -42,9 +36,7 @@ namespace edm {
   // If the element is not found, it returns a default constructed value
   // Note that the return is by value, so if the element is found, it is copied.
   template <typename Key, typename Value>
-  inline
-  Value
-  findOrDefault(std::map<Key, Value> const& m, Key const& k) {
+  inline Value findOrDefault(std::map<Key, Value> const& m, Key const& k) {
     typename std::map<Key, Value>::const_iterator it = m.find(k);
     return (it == m.end() ? Value() : it->second);
   }
@@ -53,21 +45,19 @@ namespace edm {
   // If the element is not found, it asserts.
   // Comes in const and non-const versions
   template <typename Key, typename Value>
-  inline
-  Value const&
-  findOrAssert(std::map<Key, Value> const& m, Key const& k) {
+  inline Value const& findOrAssert(std::map<Key, Value> const& m, Key const& k) {
     typename std::map<Key, Value>::const_iterator it = m.find(k);
-    if (it == m.end()) assert("findOrAssert" && 0);
+    if (it == m.end())
+      assert("findOrAssert" && 0);
     return it->second;
   }
 
   template <typename Key, typename Value>
-  inline
-  Value&
-  findOrAssert(std::map<Key, Value>& m, Key const& k) {
+  inline Value& findOrAssert(std::map<Key, Value>& m, Key const& k) {
     typename std::map<Key, Value>::const_iterator it = m.find(k);
-    if (it == m.end()) assert("findOrAssert" && 0);
+    if (it == m.end())
+      assert("findOrAssert" && 0);
     return it->second;
   }
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/MemberWithDict.h b/FWCore/Utilities/interface/MemberWithDict.h
index 8969aa3ed8ac2..0cbb0a5cfc8a9 100644
--- a/FWCore/Utilities/interface/MemberWithDict.h
+++ b/FWCore/Utilities/interface/MemberWithDict.h
@@ -7,39 +7,39 @@ MemberWithDict:  A holder for a class member
 
 ----------------------------------------------------------------------*/
 
-
 #include <string>
 
 class TDataMember;
 
 namespace edm {
 
-class ObjectWithDict;
-class TypeWithDict;
-
-class MemberWithDict {
-private:
-  TDataMember* dataMember_;
-public:
-  MemberWithDict();
-  explicit MemberWithDict(TDataMember*);
-  explicit operator bool() const;
-  std::string name() const;
-  bool isArray() const;
-  bool isConst() const;
-  bool isPublic() const;
-  bool isStatic() const;
-  bool isTransient() const;
-  size_t offset() const;
-  TypeWithDict declaringType() const;
-  TypeWithDict typeOf() const;
-  ObjectWithDict get() const;
-  ObjectWithDict get(ObjectWithDict const&) const;
-};
-
-} // namespace edm
+  class ObjectWithDict;
+  class TypeWithDict;
+
+  class MemberWithDict {
+  private:
+    TDataMember* dataMember_;
+
+  public:
+    MemberWithDict();
+    explicit MemberWithDict(TDataMember*);
+    explicit operator bool() const;
+    std::string name() const;
+    bool isArray() const;
+    bool isConst() const;
+    bool isPublic() const;
+    bool isStatic() const;
+    bool isTransient() const;
+    size_t offset() const;
+    TypeWithDict declaringType() const;
+    TypeWithDict typeOf() const;
+    ObjectWithDict get() const;
+    ObjectWithDict get(ObjectWithDict const&) const;
+  };
+
+}  // namespace edm
 
 #include "FWCore/Utilities/interface/ObjectWithDict.h"
 #include "FWCore/Utilities/interface/TypeWithDict.h"
 
-#endif // FWCore_Utilities_MemberWithDict_h
+#endif  // FWCore_Utilities_MemberWithDict_h
diff --git a/FWCore/Utilities/interface/OStreamColumn.h b/FWCore/Utilities/interface/OStreamColumn.h
index fdc943dc6c47b..1f3150cdee276 100644
--- a/FWCore/Utilities/interface/OStreamColumn.h
+++ b/FWCore/Utilities/interface/OStreamColumn.h
@@ -56,8 +56,7 @@ namespace edm {
     explicit OStreamColumn(std::string const& t, std::size_t const w);
 
     template <typename T>
-    auto operator()(T const& t) const
-    {
+    auto operator()(T const& t) const {
       return OStreamColumnEntry<T>{*this, t};
     }
 
@@ -76,12 +75,11 @@ namespace edm {
   std::ostream& operator<<(std::ostream& t, OStreamColumn const& c);
 
   template <typename E>
-  std::ostream& operator<<(std::ostream& t, OStreamColumnEntry<E> const& ce)
-  {
+  std::ostream& operator<<(std::ostream& t, OStreamColumnEntry<E> const& ce) {
     t << std::setw(ce.col.width_) << ce.t;
     return t;
   }
 
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/ObjectWithDict.h b/FWCore/Utilities/interface/ObjectWithDict.h
index 3ca178d1452d7..b94f02c90cfdb 100644
--- a/FWCore/Utilities/interface/ObjectWithDict.h
+++ b/FWCore/Utilities/interface/ObjectWithDict.h
@@ -14,32 +14,32 @@ ObjectWithDict:  A holder for an object and its type information.
 
 namespace edm {
 
-class ObjectWithDict {
-private:
-  TypeWithDict type_;
-  void* address_;
-public:
-  static ObjectWithDict byType(TypeWithDict const&);
-public:
-  ObjectWithDict();
-  explicit ObjectWithDict(TypeWithDict const&, void* address);
-  explicit ObjectWithDict(std::type_info const&, void* address);
-  explicit operator bool() const;
-  void* address() const;
-  TypeWithDict typeOf() const;
-  TypeWithDict dynamicType() const;
-  ObjectWithDict castObject(TypeWithDict const&) const;
-  ObjectWithDict get(std::string const& memberName) const;
-  //ObjectWithDict construct() const;
-  void destruct(bool dealloc) const;
-  template<typename T>
-  T
-  objectCast() {
-    return *reinterpret_cast<T*>(address_);
-  }
-};
-
-} // namespace edm
-
-
-#endif // FWCore_Utilities_ObjectWithDict_h
+  class ObjectWithDict {
+  private:
+    TypeWithDict type_;
+    void* address_;
+
+  public:
+    static ObjectWithDict byType(TypeWithDict const&);
+
+  public:
+    ObjectWithDict();
+    explicit ObjectWithDict(TypeWithDict const&, void* address);
+    explicit ObjectWithDict(std::type_info const&, void* address);
+    explicit operator bool() const;
+    void* address() const;
+    TypeWithDict typeOf() const;
+    TypeWithDict dynamicType() const;
+    ObjectWithDict castObject(TypeWithDict const&) const;
+    ObjectWithDict get(std::string const& memberName) const;
+    //ObjectWithDict construct() const;
+    void destruct(bool dealloc) const;
+    template <typename T>
+    T objectCast() {
+      return *reinterpret_cast<T*>(address_);
+    }
+  };
+
+}  // namespace edm
+
+#endif  // FWCore_Utilities_ObjectWithDict_h
diff --git a/FWCore/Utilities/interface/OffsetToBase.h b/FWCore/Utilities/interface/OffsetToBase.h
index 8a559f9d3efd8..932f4ce990c86 100644
--- a/FWCore/Utilities/interface/OffsetToBase.h
+++ b/FWCore/Utilities/interface/OffsetToBase.h
@@ -35,23 +35,20 @@
  *
 */
 
-
 namespace edm {
-  template<typename T>
+  template <typename T>
   class OffsetToBase {
   public:
-    OffsetToBase() {} 
-    size_t offsetToBase(std::type_info const& baseTypeInfo) const {
-      return 0;
-    }
+    OffsetToBase() {}
+    size_t offsetToBase(std::type_info const& baseTypeInfo) const { return 0; }
   };
 
-  template<typename T>
+  template <typename T>
   void const* pointerToBase(std::type_info const& baseTypeInfo, T const* address) {
     OffsetToBase<T> offsetToBase;
     int offset = offsetToBase.offsetToBase(baseTypeInfo);
     void const* ptr = address;
     return static_cast<char const*>(ptr) + offset;
   }
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/OutletBase.h b/FWCore/Utilities/interface/OutletBase.h
index 6705f4f1481ea..dad7806e79eb0 100644
--- a/FWCore/Utilities/interface/OutletBase.h
+++ b/FWCore/Utilities/interface/OutletBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     Utilities
 // Class  :     OutletBase
-// 
+//
 /**\class OutletBase OutletBase.h FWCore/Utilities/interface/OutletBase.h
 
  Description: Base class for 'outlets' which can be used to send data through edm::ExtensionCords
@@ -25,28 +25,22 @@
 
 // forward declarations
 namespace edm {
-template <class T>
-class OutletBase
-{
-
-   protected:
-      OutletBase( ExtensionCord<T>& iCord) : cord_(iCord) {}
-      virtual ~OutletBase() { this->setGetter(0); }
-
-      void setGetter( extensioncord::ECGetterBase<T>* iGetter) {
-        cord_.setGetter(iGetter);
-      }
+  template <class T>
+  class OutletBase {
+  protected:
+    OutletBase(ExtensionCord<T>& iCord) : cord_(iCord) {}
+    virtual ~OutletBase() { this->setGetter(0); }
 
+    void setGetter(extensioncord::ECGetterBase<T>* iGetter) { cord_.setGetter(iGetter); }
 
-  
-   private:
-      OutletBase(const OutletBase&); // stop default
+  private:
+    OutletBase(const OutletBase&);  // stop default
 
-      const OutletBase& operator=(const OutletBase&); // stop default
+    const OutletBase& operator=(const OutletBase&);  // stop default
 
-      // ---------- member data --------------------------------
-      ExtensionCord<T>& cord_;
-};
-}
+    // ---------- member data --------------------------------
+    ExtensionCord<T>& cord_;
+  };
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/Parse.h b/FWCore/Utilities/interface/Parse.h
index 84f5836d64161..0111210cd9524 100644
--- a/FWCore/Utilities/interface/Parse.h
+++ b/FWCore/Utilities/interface/Parse.h
@@ -4,15 +4,15 @@
 #include <string>
 #include <vector>
 namespace edm {
-      /// only does the yacc interpretation
-      std::string read_whole_file(std::string const& filename);
+  /// only does the yacc interpretation
+  std::string read_whole_file(std::string const& filename);
 
-      void read_from_cin(std::string & output);
+  void read_from_cin(std::string& output);
 
-      std::string withoutQuotes(std::string const& from);
+  std::string withoutQuotes(std::string const& from);
 
-      /// breaks the input string into tokens, delimited by the separator
-      std::vector<std::string> tokenize(std::string const& input, std::string const& separator);
-}
+  /// breaks the input string into tokens, delimited by the separator
+  std::vector<std::string> tokenize(std::string const& input, std::string const& separator);
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/Presence.h b/FWCore/Utilities/interface/Presence.h
index 2679207f6b407..30ed88f95077e 100644
--- a/FWCore/Utilities/interface/Presence.h
+++ b/FWCore/Utilities/interface/Presence.h
@@ -23,5 +23,5 @@ namespace edm {
     Presence() {}
     virtual ~Presence() = 0;
   };
-}
-#endif // FWCore_Utilities_Presence_h
+}  // namespace edm
+#endif  // FWCore_Utilities_Presence_h
diff --git a/FWCore/Utilities/interface/ProductLabels.h b/FWCore/Utilities/interface/ProductLabels.h
index d397029e606b0..2675774e5388c 100644
--- a/FWCore/Utilities/interface/ProductLabels.h
+++ b/FWCore/Utilities/interface/ProductLabels.h
@@ -1,10 +1,10 @@
 #ifndef FWCore_Utilities_ProductLabels_h
 #define FWCore_Utilities_ProductLabels_h
 namespace edm {
-    struct ProductLabels {
-      char const*  module;
-      char const*  productInstance;
-      char const*  process;
-    };
-}
+  struct ProductLabels {
+    char const* module;
+    char const* productInstance;
+    char const* process;
+  };
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/ProductResolverIndex.h b/FWCore/Utilities/interface/ProductResolverIndex.h
index 18df89efc833f..da4944f0b54d0 100644
--- a/FWCore/Utilities/interface/ProductResolverIndex.h
+++ b/FWCore/Utilities/interface/ProductResolverIndex.h
@@ -10,12 +10,12 @@ namespace edm {
   enum ProductResolverIndexValues {
 
     // All values of the ProductResolverIndex in this enumeration should
-    // have this bit set to 1, 
+    // have this bit set to 1,
     ProductResolverIndexValuesBit = 1U << 30,
 
     ProductResolverIndexInvalid = std::numeric_limits<unsigned int>::max(),
     ProductResolverIndexInitializing = std::numeric_limits<unsigned int>::max() - 1,
     ProductResolverIndexAmbiguous = std::numeric_limits<unsigned int>::max() - 2
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/RandomNumberGenerator.h b/FWCore/Utilities/interface/RandomNumberGenerator.h
index aa3e84e551a3e..c66b99144bc81 100644
--- a/FWCore/Utilities/interface/RandomNumberGenerator.h
+++ b/FWCore/Utilities/interface/RandomNumberGenerator.h
@@ -143,10 +143,8 @@ namespace edm {
   class LuminosityBlockIndex;
   class StreamID;
 
-  class RandomNumberGenerator
-  {
+  class RandomNumberGenerator {
   public:
-
     RandomNumberGenerator() {}
     virtual ~RandomNumberGenerator();
 
@@ -190,9 +188,8 @@ namespace edm {
     virtual void print(std::ostream& os) const = 0;
 
   private:
-
     RandomNumberGenerator(RandomNumberGenerator const&) = delete;
     RandomNumberGenerator const& operator=(RandomNumberGenerator const&) = delete;
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/Range.h b/FWCore/Utilities/interface/Range.h
index f5138757c6af6..59fc1a23de9d4 100644
--- a/FWCore/Utilities/interface/Range.h
+++ b/FWCore/Utilities/interface/Range.h
@@ -1,28 +1,26 @@
 #ifndef FWCore_Utilities_Range_h
 #define FWCore_Utilities_Range_h
 
-namespace edm
-{
-     /*
+namespace edm {
+  /*
       *class which implements begin() and end() to use range-based loop with
       pairs of iterators or pointers.
       */
 
-     template<class T>
-     class Range
-     {
-       public:
-         Range(T begin, T end) : begin_(begin), end_(end) {}
+  template <class T>
+  class Range {
+  public:
+    Range(T begin, T end) : begin_(begin), end_(end) {}
 
-         T begin() const { return begin_; }
-         T end() const { return end_; }
+    T begin() const { return begin_; }
+    T end() const { return end_; }
 
-         bool empty() const { return begin_ == end_; }
+    bool empty() const { return begin_ == end_; }
 
-       private:
-         const T begin_;
-         const T end_;
-     };
- };
+  private:
+    const T begin_;
+    const T end_;
+  };
+};  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/RegexMatch.h b/FWCore/Utilities/interface/RegexMatch.h
index 5d70ce62c2d7c..a1927dba10a09 100644
--- a/FWCore/Utilities/interface/RegexMatch.h
+++ b/FWCore/Utilities/interface/RegexMatch.h
@@ -7,20 +7,17 @@
 
 namespace edm {
 
-  bool
-  untaintString(char const* pattern, char const* regexp);
+  bool untaintString(char const* pattern, char const* regexp);
 
-  bool
-  is_glob(std::string const& pattern);
+  bool is_glob(std::string const& pattern);
 
-  std::string
-  glob2reg(std::string const& pattern);
+  std::string glob2reg(std::string const& pattern);
 
-  std::vector<std::vector<std::string>::const_iterator>
-  regexMatch(std::vector<std::string> const& strings, std::regex const& regexp);
+  std::vector<std::vector<std::string>::const_iterator> regexMatch(std::vector<std::string> const& strings,
+                                                                   std::regex const& regexp);
 
-  std::vector<std::vector<std::string>::const_iterator>
-  regexMatch(std::vector<std::string> const& strings, std::string const& pattern);
-}
+  std::vector<std::vector<std::string>::const_iterator> regexMatch(std::vector<std::string> const& strings,
+                                                                   std::string const& pattern);
+}  // namespace edm
 
-#endif // FWCore_Utilities_RegexMatch_h
+#endif  // FWCore_Utilities_RegexMatch_h
diff --git a/FWCore/Utilities/interface/ReleaseVersion.h b/FWCore/Utilities/interface/ReleaseVersion.h
index d38fec616282a..1a84ed3c48879 100644
--- a/FWCore/Utilities/interface/ReleaseVersion.h
+++ b/FWCore/Utilities/interface/ReleaseVersion.h
@@ -10,19 +10,20 @@ namespace edm {
     public:
       explicit DecomposedReleaseVersion(std::string releaseVersion);
       bool operator<(DecomposedReleaseVersion const& other) const;
+
     private:
       bool irregular_;
       unsigned int major_;
       unsigned int minor_;
-//      unsigned int point_;
-//      unsigned int patch_;
-//      unsigned int pre_;
+      //      unsigned int point_;
+      //      unsigned int patch_;
+      //      unsigned int pre_;
     };
 
     bool isEarlierRelease(std::string const& a, std::string const& b);
     bool isEarlierRelease(DecomposedReleaseVersion const& a, std::string const& b);
     bool isEarlierRelease(std::string const& a, DecomposedReleaseVersion const& b);
     bool isEarlierRelease(DecomposedReleaseVersion const& a, DecomposedReleaseVersion const& b);
-  }
-}
+  }  // namespace releaseversion
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/ReusableObjectHolder.h b/FWCore/Utilities/interface/ReusableObjectHolder.h
index 203354ca89fcf..89402094f7baa 100644
--- a/FWCore/Utilities/interface/ReusableObjectHolder.h
+++ b/FWCore/Utilities/interface/ReusableObjectHolder.h
@@ -71,84 +71,80 @@
 #include "tbb/task.h"
 #include "tbb/concurrent_queue.h"
 
-
 namespace edm {
-  template<class T>
+  template <class T>
   class ReusableObjectHolder {
   public:
-    ReusableObjectHolder():m_outstandingObjects(0){}
-    ReusableObjectHolder(ReusableObjectHolder&& iOther):
-    m_availableQueue(std::move(iOther.m_availableQueue)),
-    m_outstandingObjects(0) {
-      assert(0== iOther.m_outstandingObjects);
+    ReusableObjectHolder() : m_outstandingObjects(0) {}
+    ReusableObjectHolder(ReusableObjectHolder&& iOther)
+        : m_availableQueue(std::move(iOther.m_availableQueue)), m_outstandingObjects(0) {
+      assert(0 == iOther.m_outstandingObjects);
     }
     ~ReusableObjectHolder() {
-      assert(0==m_outstandingObjects);
-   		T* item = 0;
-      while(  m_availableQueue.try_pop(item)) {
+      assert(0 == m_outstandingObjects);
+      T* item = 0;
+      while (m_availableQueue.try_pop(item)) {
         delete item;
       }
     }
-    
+
     ///Adds the item to the cache.
     /// Use this function if you know ahead of time
     /// how many cached items you will need.
-   	void add(std::unique_ptr<T> iItem){
-   		if(0!=iItem) {
-   			m_availableQueue.push(iItem.release());
-   		}
-   	}
-    
+    void add(std::unique_ptr<T> iItem) {
+      if (0 != iItem) {
+        m_availableQueue.push(iItem.release());
+      }
+    }
+
     ///Tries to get an already created object,
-   	/// if none are available, returns an empty shared_ptr.
+    /// if none are available, returns an empty shared_ptr.
     /// Use this function in conjunction with add()
-   	std::shared_ptr<T> tryToGet() {
-   		T* item = 0;
-   		m_availableQueue.try_pop(item);
-   		if (0==item) {
-   			return std::shared_ptr<T>{};
-   		}
-   		//instead of deleting, hand back to queue
+    std::shared_ptr<T> tryToGet() {
+      T* item = 0;
+      m_availableQueue.try_pop(item);
+      if (0 == item) {
+        return std::shared_ptr<T>{};
+      }
+      //instead of deleting, hand back to queue
       auto pHolder = this;
       ++m_outstandingObjects;
-   		return std::shared_ptr<T>{item, [pHolder](T* iItem) {pHolder->addBack(iItem);} };
-   	}
-    
+      return std::shared_ptr<T>{item, [pHolder](T* iItem) { pHolder->addBack(iItem); }};
+    }
+
     ///If there isn't an object already available, creates a new one using iFunc
-   	template< typename F>
-   	std::shared_ptr<T> makeOrGet( F iFunc) {
-   		std::shared_ptr<T> returnValue;
-   		while ( ! ( returnValue = tryToGet()) ) {
-   			add( std::unique_ptr<T>(iFunc()) );
-   		}
-   		return returnValue;
-   	}
-    
+    template <typename F>
+    std::shared_ptr<T> makeOrGet(F iFunc) {
+      std::shared_ptr<T> returnValue;
+      while (!(returnValue = tryToGet())) {
+        add(std::unique_ptr<T>(iFunc()));
+      }
+      return returnValue;
+    }
+
     ///If there is an object already available, passes the object to iClearFunc and then
     /// returns the object.
     ///If there is not an object already available, creates a new one using iMakeFunc
-   	template< typename FM, typename FC>
-   	std::shared_ptr<T> makeOrGetAndClear( FM iMakeFunc, FC iClearFunc) {
-   		std::shared_ptr<T> returnValue;
-   		while ( ! ( returnValue = tryToGet()) ) {
-   			add( std::unique_ptr<T>(iMakeFunc()) );
-   		}
-   		iClearFunc(returnValue.get());
-   		return returnValue;
-   	}
-    
+    template <typename FM, typename FC>
+    std::shared_ptr<T> makeOrGetAndClear(FM iMakeFunc, FC iClearFunc) {
+      std::shared_ptr<T> returnValue;
+      while (!(returnValue = tryToGet())) {
+        add(std::unique_ptr<T>(iMakeFunc()));
+      }
+      iClearFunc(returnValue.get());
+      return returnValue;
+    }
+
   private:
-    void addBack(T* iItem){
-   		m_availableQueue.push(iItem);
+    void addBack(T* iItem) {
+      m_availableQueue.push(iItem);
       --m_outstandingObjects;
-   	}
-   	
-   	tbb::concurrent_queue<T*> m_availableQueue;
+    }
+
+    tbb::concurrent_queue<T*> m_availableQueue;
     std::atomic<size_t> m_outstandingObjects;
   };
-  
-}
-
 
+}  // namespace edm
 
 #endif /* end of include guard: FWCore_Utilities_ReusableObjectHolder_h */
diff --git a/FWCore/Utilities/interface/RootHandlers.h b/FWCore/Utilities/interface/RootHandlers.h
index 42796e1f15a38..9ec8ada8c1ef8 100644
--- a/FWCore/Utilities/interface/RootHandlers.h
+++ b/FWCore/Utilities/interface/RootHandlers.h
@@ -6,42 +6,34 @@ namespace edm {
   class EventProcessor;
   class RootHandlers {
   public:
-    enum class SeverityLevel {
-      kInfo,
-      kWarning,
-      kError,
-      kSysError,
-      kFatal
-    };
+    enum class SeverityLevel { kInfo, kWarning, kError, kSysError, kFatal };
 
   private:
     struct WarningSentry {
-      WarningSentry(RootHandlers* iHandler, SeverityLevel level): m_handler(iHandler){
+      WarningSentry(RootHandlers* iHandler, SeverityLevel level) : m_handler(iHandler) {
         m_handler->ignoreWarnings_(level);
       };
-      ~WarningSentry() {
-        m_handler->enableWarnings_();
-      }
+      ~WarningSentry() { m_handler->enableWarnings_(); }
       edm::propagate_const<RootHandlers*> m_handler;
     };
     friend struct edm::RootHandlers::WarningSentry;
     friend class edm::EventProcessor;
 
   public:
-    virtual ~RootHandlers () {}
+    virtual ~RootHandlers() {}
 
-    template<typename F>
-    void ignoreWarningsWhileDoing(F iFunc, SeverityLevel level=SeverityLevel::kWarning) {
-      WarningSentry sentry(this,level);
+    template <typename F>
+    void ignoreWarningsWhileDoing(F iFunc, SeverityLevel level = SeverityLevel::kWarning) {
+      WarningSentry sentry(this, level);
       iFunc();
     }
-    
+
   private:
     virtual void willBeUsingThreads() = 0;
-    
+
     virtual void enableWarnings_() = 0;
     virtual void ignoreWarnings_(SeverityLevel level) = 0;
   };
 }  // end of namespace edm
 
-#endif // InitRootHandlers_H
+#endif  // InitRootHandlers_H
diff --git a/FWCore/Utilities/interface/RunIndex.h b/FWCore/Utilities/interface/RunIndex.h
index 75ad761ca8cd9..739f147436898 100644
--- a/FWCore/Utilities/interface/RunIndex.h
+++ b/FWCore/Utilities/interface/RunIndex.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Utilities
 // Class  :     edm::RunIndex
-// 
+//
 /**\class edm::RunIndex RunIndex.h "FWCore/Utilities/interface/RunIndex.h"
 
  Description: Identifies a 'slot' being used to hold an active Run
@@ -28,26 +28,20 @@
 // forward declarations
 namespace edm {
   class RunPrincipal;
-  
-  class RunIndex
-  {
-    
+
+  class RunIndex {
   public:
     ~RunIndex() = default;
     RunIndex(const RunIndex&) = default;
     RunIndex& operator=(const RunIndex&) = default;
-    
+
     // ---------- const member functions ---------------------
-    bool operator==(const RunIndex& iIndex) const {
-      return value() == iIndex.value();
-    }
-    operator unsigned int() const {
-      return value_;
-    }
-    
+    bool operator==(const RunIndex& iIndex) const { return value() == iIndex.value(); }
+    operator unsigned int() const { return value_; }
+
     /** \return value ranging from 0 to one less than max number of simultaneous runs.
      */
-    unsigned int value() const { return value_;}
+    unsigned int value() const { return value_; }
 
     static RunIndex invalidRunIndex();
 
@@ -57,13 +51,12 @@ namespace edm {
     explicit RunIndex(unsigned int iIndex) : value_(iIndex) {}
 
     RunIndex() = delete;
-    
+
     // ---------- member data --------------------------------
     unsigned int value_;
 
-    static const unsigned int invalidValue_;    
+    static const unsigned int invalidValue_;
   };
-}
-
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/RunningAverage.h b/FWCore/Utilities/interface/RunningAverage.h
index 4fffb3a9d57e5..c60d51fbbb83d 100644
--- a/FWCore/Utilities/interface/RunningAverage.h
+++ b/FWCore/Utilities/interface/RunningAverage.h
@@ -9,43 +9,45 @@ namespace test_average {
   namespace running_average {
     int test();
   }
-}
+}  // namespace test_average
 
 namespace edm {
-// keeps the running average of the last N entries
-// thread safe, fast: does not garantee precise update in case of collision
+  // keeps the running average of the last N entries
+  // thread safe, fast: does not garantee precise update in case of collision
   class RunningAverage {
     // For tests
     friend int ::test_average::running_average::test();
 
   public:
     static constexpr int N = 16;  // better be a power of 2
-    explicit RunningAverage(unsigned int k=4) : m_mean(N*k), m_curr(0) {
-      for (auto & i : m_buffer) i=k; 
+    explicit RunningAverage(unsigned int k = 4) : m_mean(N * k), m_curr(0) {
+      for (auto& i : m_buffer)
+        i = k;
     }
 
-    int mean() const { return m_mean/N;}
+    int mean() const { return m_mean / N; }
 
-    int upper() const { auto lm = mean(); return lm+=(std::abs(m_buffer[0]-lm)+std::abs(m_buffer[N/2]-lm)); }  // about 2 sigma
+    int upper() const {
+      auto lm = mean();
+      return lm += (std::abs(m_buffer[0] - lm) + std::abs(m_buffer[N / 2] - lm));
+    }  // about 2 sigma
 
-   void update(unsigned int q) {
-      int e=m_curr;
-      while(!m_curr.compare_exchange_weak(e,e+1)); 
-      int k = (N-1)&e;
+    void update(unsigned int q) {
+      int e = m_curr;
+      while (!m_curr.compare_exchange_weak(e, e + 1))
+        ;
+      int k = (N - 1) & e;
       int old = m_buffer[k];
-      if (!m_buffer[k].compare_exchange_strong(old,q)) return;
-      m_mean+= (q-old); 
+      if (!m_buffer[k].compare_exchange_strong(old, q))
+        return;
+      m_mean += (q - old);
     }
 
-
-private:
-    std::array<std::atomic<int>,N> m_buffer;
+  private:
+    std::array<std::atomic<int>, N> m_buffer;
     std::atomic<int> m_mean;
     std::atomic<int> m_curr;
-
   };
-}
+}  // namespace edm
 
 #endif
-
-
diff --git a/FWCore/Utilities/interface/Signal.h b/FWCore/Utilities/interface/Signal.h
index eff125cbe43c6..f9e742f3643fa 100644
--- a/FWCore/Utilities/interface/Signal.h
+++ b/FWCore/Utilities/interface/Signal.h
@@ -4,7 +4,7 @@
 //
 // Package:     ServiceRegistry
 // Class  :     Signal
-// 
+//
 /**\class Signal Signal.h FWCore/ServiceRegistry/interface/Signal.h
 
  Description: A simple implementation of the signal/slot pattern
@@ -32,54 +32,51 @@
 namespace edm {
   namespace signalslot {
     template <typename T>
-    class Signal
-    {
-      
+    class Signal {
     public:
       typedef std::function<T> slot_type;
       typedef std::vector<slot_type> slot_list_type;
-      
+
       Signal() = default;
       ~Signal() = default;
       Signal(Signal&&) = default;
-      
+
       // ---------- const member functions ---------------------
-      template<typename... Args>
+      template <typename... Args>
       void emit(Args&&... args) const {
-        for(auto& slot:m_slots) {
+        for (auto& slot : m_slots) {
           slot(std::forward<Args>(args)...);
         }
       }
-      
-      template<typename... Args>
+
+      template <typename... Args>
       void operator()(Args&&... args) const {
         emit(std::forward<Args>(args)...);
       }
-      
-      slot_list_type const& slots() const {return m_slots;}
+
+      slot_list_type const& slots() const { return m_slots; }
       // ---------- static member functions --------------------
-      
+
       // ---------- member functions ---------------------------
-      template<typename U>
+      template <typename U>
       void connect(U iFunc) {
         m_slots.push_back(std::function<T>(iFunc));
       }
 
-      template<typename U>
+      template <typename U>
       void connect_front(U iFunc) {
-        m_slots.insert(m_slots.begin(),std::function<T>(iFunc));
+        m_slots.insert(m_slots.begin(), std::function<T>(iFunc));
       }
 
     private:
-      Signal(const Signal&) = delete; // stop default
-      
-      const Signal& operator=(const Signal&) = delete; // stop default
-      
+      Signal(const Signal&) = delete;  // stop default
+
+      const Signal& operator=(const Signal&) = delete;  // stop default
+
       // ---------- member data --------------------------------
       slot_list_type m_slots;
-      
     };
-  }
-}
+  }  // namespace signalslot
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/SimpleOutlet.h b/FWCore/Utilities/interface/SimpleOutlet.h
index f2644a873fb73..cd6d000f9f201 100644
--- a/FWCore/Utilities/interface/SimpleOutlet.h
+++ b/FWCore/Utilities/interface/SimpleOutlet.h
@@ -4,7 +4,7 @@
 //
 // Package:     Utilities
 // Class  :     SimpleOutlet
-// 
+//
 /**\class SimpleOutlet SimpleOutlet.h FWCore/Utilities/interface/SimpleOutlet.h
 
  Description: A simple outlet that works with the edm::ExtensionCord
@@ -26,23 +26,18 @@
 
 // forward declarations
 namespace edm {
-  template<class T>
-  class SimpleOutlet : private OutletBase<T>
-  {
-    
-    public:
-      SimpleOutlet( extensioncord::ECGetterBase<T>& iGetter,
-                    ExtensionCord<T>& iCord) :
-        OutletBase<T>(iCord) {
-          this->setGetter(&iGetter);
-      }
-
-   private:
-      SimpleOutlet(const SimpleOutlet&); // stop default
+  template <class T>
+  class SimpleOutlet : private OutletBase<T> {
+  public:
+    SimpleOutlet(extensioncord::ECGetterBase<T>& iGetter, ExtensionCord<T>& iCord) : OutletBase<T>(iCord) {
+      this->setGetter(&iGetter);
+    }
 
-      const SimpleOutlet& operator=(const SimpleOutlet&); // stop default
+  private:
+    SimpleOutlet(const SimpleOutlet&);  // stop default
 
-};
+    const SimpleOutlet& operator=(const SimpleOutlet&);  // stop default
+  };
 
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/SingleConsumerQ.h b/FWCore/Utilities/interface/SingleConsumerQ.h
index bca2b3ba3b0fe..17a20962eff7f 100644
--- a/FWCore/Utilities/interface/SingleConsumerQ.h
+++ b/FWCore/Utilities/interface/SingleConsumerQ.h
@@ -40,13 +40,11 @@
 
 namespace edm {
 
-  class SingleConsumerQ
-  {
+  class SingleConsumerQ {
   public:
-    struct Buffer
-    {
-      Buffer():ptr_(),len_() { }
-      Buffer(void* p,int len):ptr_(p),len_(len) { }
+    struct Buffer {
+      Buffer() : ptr_(), len_() {}
+      Buffer(void* p, int len) : ptr_(p), len_(len) {}
 
       void* ptr_;
       int len_;
@@ -55,37 +53,32 @@ namespace edm {
     SingleConsumerQ(int max_event_size, int max_queue_depth);
     ~SingleConsumerQ();
 
-    struct ConsumerType
-    {
-      static SingleConsumerQ::Buffer get(SingleConsumerQ& b)
-      { return b.getConsumerBuffer(); }
-      static void release(SingleConsumerQ& b, void* v)
-      { b.releaseConsumerBuffer(v); }
-      static void commit(SingleConsumerQ& b, void* v,int size)
-      { b.commitConsumerBuffer(v,size); }
+    struct ConsumerType {
+      static SingleConsumerQ::Buffer get(SingleConsumerQ& b) { return b.getConsumerBuffer(); }
+      static void release(SingleConsumerQ& b, void* v) { b.releaseConsumerBuffer(v); }
+      static void commit(SingleConsumerQ& b, void* v, int size) { b.commitConsumerBuffer(v, size); }
     };
-    struct ProducerType
-    {
-      static SingleConsumerQ::Buffer get(SingleConsumerQ& b)
-      { return b.getProducerBuffer(); }
-      static void release(SingleConsumerQ& b, void* v)
-      { b.releaseProducerBuffer(v); }
-      static void commit(SingleConsumerQ& b, void* v,int size)
-      { b.commitProducerBuffer(v,size); }
+    struct ProducerType {
+      static SingleConsumerQ::Buffer get(SingleConsumerQ& b) { return b.getProducerBuffer(); }
+      static void release(SingleConsumerQ& b, void* v) { b.releaseProducerBuffer(v); }
+      static void commit(SingleConsumerQ& b, void* v, int size) { b.commitProducerBuffer(v, size); }
     };
 
     template <class T>
-    class OperateBuffer
-    {
+    class OperateBuffer {
     public:
-      explicit OperateBuffer(SingleConsumerQ& b):
-	b_(b),v_(T::get(b)),committed_(false) { }
-      ~OperateBuffer()
-      { if(!committed_) T::release(b_,v_.ptr_); }
+      explicit OperateBuffer(SingleConsumerQ& b) : b_(b), v_(T::get(b)), committed_(false) {}
+      ~OperateBuffer() {
+        if (!committed_)
+          T::release(b_, v_.ptr_);
+      }
 
       void* buffer() const { return v_.ptr_; }
       int size() const { return v_.len_; }
-      void commit(int theSize=0) { T::commit(b_, v_.ptr_, theSize); committed_=true; }
+      void commit(int theSize = 0) {
+        T::commit(b_, v_.ptr_, theSize);
+        committed_ = true;
+      }
 
     private:
       SingleConsumerQ& b_;
@@ -98,11 +91,11 @@ namespace edm {
 
     Buffer getProducerBuffer();
     void releaseProducerBuffer(void*);
-    void commitProducerBuffer(void*,int);
+    void commitProducerBuffer(void*, int);
 
     Buffer getConsumerBuffer();
     void releaseConsumerBuffer(void*);
-    void commitConsumerBuffer(void*,int);
+    void commitConsumerBuffer(void*, int);
 
     int maxEventSize() const { return max_event_size_; }
     int maxQueueDepth() const { return max_queue_depth_; }
@@ -120,20 +113,18 @@ namespace edm {
 
     int max_event_size_;
     int max_queue_depth_;
-    int pos_; // use pool as stack of avaiable buffers
+    int pos_;  // use pool as stack of avaiable buffers
     ByteArray mem_;
     Pool buffer_pool_;
     Queue queue_;
-    unsigned int fpos_, bpos_; // positions for queue - front and back
+    unsigned int fpos_, bpos_;  // positions for queue - front and back
 
     std::mutex pool_lock_;
     std::mutex queue_lock_;
     std::condition_variable pool_cond_;
     std::condition_variable pop_cond_;
     std::condition_variable push_cond_;
-
   };
 
-
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/SoATuple.h b/FWCore/Utilities/interface/SoATuple.h
index ff496d1064065..f0ff5e1e725cf 100644
--- a/FWCore/Utilities/interface/SoATuple.h
+++ b/FWCore/Utilities/interface/SoATuple.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Utilities
 // Class  :     SoATuple
-// 
+//
 /**\class SoATuple SoATuple.h "FWCore/Utilities/interface/SoATuple.h"
 
  Description: Structure of Arrays Tuple
@@ -92,40 +92,39 @@ Explicitly aligned types and defaultly aligned types can be freely mixed in any
 #include "FWCore/Utilities/interface/SoATupleHelper.h"
 #include "FWCore/Utilities/interface/GCCPrerequisite.h"
 
-
 // forward declarations
 
 namespace edm {
 
   //The class Aligned is used to specify a non-default alignment for a class
   using edm::soahelper::Aligned;
-  
+
   //Proper alignment for doing vectorized operations on CPU
-  template<typename T> using AlignedVec = Aligned<T,16>;
-  
+  template <typename T>
+  using AlignedVec = Aligned<T, 16>;
+
   template <typename... Args>
-  class SoATuple
-  {
-    
+  class SoATuple {
   public:
     typedef typename std::tuple<Args...> element;
 
-    SoATuple(): m_size(0),m_reserved(0){
-      for(auto& v : m_values) {
+    SoATuple() : m_size(0), m_reserved(0) {
+      for (auto& v : m_values) {
         v = nullptr;
       }
     }
-    SoATuple(const SoATuple<Args...>& iOther):m_size(0),m_reserved(0) {
-      for(auto& v : m_values) {
+    SoATuple(const SoATuple<Args...>& iOther) : m_size(0), m_reserved(0) {
+      for (auto& v : m_values) {
         v = nullptr;
       }
       reserve(iOther.m_size);
-      soahelper::SoATupleHelper<sizeof...(Args),Args...>::copyToNew(static_cast<char*>(m_values[0]),iOther.m_size,m_reserved,iOther.m_values,m_values);
+      soahelper::SoATupleHelper<sizeof...(Args), Args...>::copyToNew(
+          static_cast<char*>(m_values[0]), iOther.m_size, m_reserved, iOther.m_values, m_values);
       m_size = iOther.m_size;
     }
 
-    SoATuple(SoATuple<Args...>&& iOther):m_size(0),m_reserved(0) {
-      for(auto& v : m_values) {
+    SoATuple(SoATuple<Args...>&& iOther) : m_size(0), m_reserved(0) {
+      for (auto& v : m_values) {
         v = nullptr;
       }
       this->swap(iOther);
@@ -138,113 +137,123 @@ namespace edm {
     }
 
     ~SoATuple() {
-      soahelper::SoATupleHelper<sizeof...(Args),Args...>::destroy(m_values,m_size);
-      typedef std::aligned_storage<soahelper::SoATupleHelper<sizeof...(Args),Args...>::max_alignment,
-      soahelper::SoATupleHelper<sizeof...(Args),Args...>::max_alignment> AlignedType;
+      soahelper::SoATupleHelper<sizeof...(Args), Args...>::destroy(m_values, m_size);
+      typedef std::aligned_storage<soahelper::SoATupleHelper<sizeof...(Args), Args...>::max_alignment,
+                                   soahelper::SoATupleHelper<sizeof...(Args), Args...>::max_alignment>
+          AlignedType;
 
-      delete [] static_cast<AlignedType*>(m_values[0]);
+      delete[] static_cast<AlignedType*>(m_values[0]);
     }
-    
+
     // ---------- const member functions ---------------------
-    size_t size() const { return m_size;}
-    size_t capacity() const {return m_reserved;}
+    size_t size() const { return m_size; }
+    size_t capacity() const { return m_reserved; }
 
     /** Returns const access to data element I of item iIndex */
-    template<unsigned int I>
-    typename soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type>::Type const& get(unsigned int iIndex) const {
-      typedef typename soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type>::Type ReturnType;
-      return *(static_cast<ReturnType const*>(m_values[I])+iIndex);
+    template <unsigned int I>
+    typename soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type>::Type const& get(
+        unsigned int iIndex) const {
+      typedef typename soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type>::Type
+          ReturnType;
+      return *(static_cast<ReturnType const*>(m_values[I]) + iIndex);
     }
 
     /** Returns the beginning of the container holding all Ith data elements*/
-    template<unsigned int I>
-    typename soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type>::Type const* begin() const {
+    template <unsigned int I>
+    typename soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type>::Type const* begin()
+        const {
       typedef soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type> Helper;
       typedef typename Helper::Type ReturnType;
-#if GCC_PREREQUISITE(4,7,0)
-      return static_cast<ReturnType const*>(__builtin_assume_aligned(m_values[I],Helper::kAlignment));
+#if GCC_PREREQUISITE(4, 7, 0)
+      return static_cast<ReturnType const*>(__builtin_assume_aligned(m_values[I], Helper::kAlignment));
 #else
       return static_cast<ReturnType const*>(m_values[I]);
 #endif
     }
     /** Returns the end of the container holding all Ith data elements*/
-    template<unsigned int I>
-    typename soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type>::Type const* end() const {
-      typedef typename soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type>::Type ReturnType;
-      return static_cast<ReturnType const*>(m_values[I])+m_size;
+    template <unsigned int I>
+    typename soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type>::Type const* end()
+        const {
+      typedef typename soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type>::Type
+          ReturnType;
+      return static_cast<ReturnType const*>(m_values[I]) + m_size;
     }
 
     // ---------- member functions ---------------------------
     /** Makes sure to hold enough memory to contain at least iToSize entries. */
     void reserve(unsigned int iToSize) {
-      if(iToSize > m_reserved) {
+      if (iToSize > m_reserved) {
         changeSize(iToSize);
       }
     }
-    
+
     /** Shrinks the amount of memory used so as to only have just enough to hold all entries.*/
     void shrink_to_fit() {
-      if(m_reserved > m_size) {
+      if (m_reserved > m_size) {
         changeSize(m_size);
       }
     }
 
     /** Adds one entry to the end of the list. Memory grows as needed.*/
     void push_back(element const& values) {
-      if(size()+1>capacity()) {
-        reserve(size()*2+1);
+      if (size() + 1 > capacity()) {
+        reserve(size() * 2 + 1);
       }
-      soahelper::SoATupleHelper<sizeof...(Args),Args...>::push_back(m_values,m_size,values);
+      soahelper::SoATupleHelper<sizeof...(Args), Args...>::push_back(m_values, m_size, values);
       ++m_size;
     }
 
     /** Adds one entry to the end of the list. The arguments are used to instantiate each data element in the order defined in the template arguments.*/
-    template< typename... FArgs>
+    template <typename... FArgs>
     void emplace_back(FArgs&&... values) {
-      if(size()+1>capacity()) {
-        reserve(size()*2+1);
+      if (size() + 1 > capacity()) {
+        reserve(size() * 2 + 1);
       }
-      soahelper::SoATupleHelper<sizeof...(Args),Args...>::emplace_back(m_values,m_size,std::forward<FArgs>(values)...);
+      soahelper::SoATupleHelper<sizeof...(Args), Args...>::emplace_back(
+          m_values, m_size, std::forward<FArgs>(values)...);
       ++m_size;
     }
 
     /** Returns access to data element I of item iIndex */
-    template<unsigned int I>
-    typename soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type>::Type& get(unsigned int iIndex) {
-      typedef typename soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type>::Type ReturnType;
-      return *(static_cast<ReturnType*>(m_values[I])+iIndex);
+    template <unsigned int I>
+    typename soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type>::Type& get(
+        unsigned int iIndex) {
+      typedef typename soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type>::Type
+          ReturnType;
+      return *(static_cast<ReturnType*>(m_values[I]) + iIndex);
     }
-    
+
     /** Returns the beginning of the container holding all Ith data elements*/
-    template<unsigned int I>
+    template <unsigned int I>
     typename soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type>::Type* begin() {
       typedef soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type> Helper;
       typedef typename Helper::Type ReturnType;
-#if GCC_PREREQUISITE(4,7,0)
-      return static_cast<ReturnType*>(__builtin_assume_aligned(m_values[I],Helper::kAlignment));
+#if GCC_PREREQUISITE(4, 7, 0)
+      return static_cast<ReturnType*>(__builtin_assume_aligned(m_values[I], Helper::kAlignment));
 #else
       return static_cast<ReturnType*>(m_values[I]);
 #endif
     }
     /** Returns the end of the container holding all Ith data elements*/
-    template<unsigned int I>
+    template <unsigned int I>
     typename soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type>::Type* end() {
-      typedef typename soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type>::Type ReturnType;
-      return static_cast<ReturnType*>(m_values[I])+m_size;
+      typedef typename soahelper::AlignmentHelper<typename std::tuple_element<I, std::tuple<Args...>>::type>::Type
+          ReturnType;
+      return static_cast<ReturnType*>(m_values[I]) + m_size;
     }
-    
+
     void swap(SoATuple<Args...>& iOther) {
-      std::swap(m_size,iOther.m_size);
-      std::swap(m_reserved,iOther.m_reserved);
-      for(unsigned int i=0; i<sizeof...(Args);++i) {
-        std::swap(m_values[i],iOther.m_values[i]);
+      std::swap(m_size, iOther.m_size);
+      std::swap(m_reserved, iOther.m_reserved);
+      for (unsigned int i = 0; i < sizeof...(Args); ++i) {
+        std::swap(m_values[i], iOther.m_values[i]);
       }
     }
+
   private:
-        
     void changeSize(unsigned int iToSize) {
-      assert(m_size<=iToSize);
-      const size_t memoryNeededInBytes = soahelper::SoATupleHelper<sizeof...(Args),Args...>::spaceNeededFor(iToSize);
+      assert(m_size <= iToSize);
+      const size_t memoryNeededInBytes = soahelper::SoATupleHelper<sizeof...(Args), Args...>::spaceNeededFor(iToSize);
       //align memory of the array to be on the strictest alignment boundary for any type in the Tuple
       // This is done by creating an array of a type that has that same alignment restriction and minimum size.
       // This has the draw back of possibly padding the array by one extra element if the memoryNeededInBytes is not
@@ -254,16 +263,17 @@ namespace edm {
       // if the array were for 64 bytes and the strictest requirement of any object was 8 bytes then the entire
       // char array would be aligned on an 8 byte boundary. However, if the SoATuple<char,char> only 1 byte alignment
       // is needed. The following algorithm would require only 1 byte alignment
-      const std::size_t max_alignment = soahelper::SoATupleHelper<sizeof...(Args),Args...>::max_alignment;
-      typedef std::aligned_storage<soahelper::SoATupleHelper<sizeof...(Args),Args...>::max_alignment,
-                                   soahelper::SoATupleHelper<sizeof...(Args),Args...>::max_alignment> AlignedType;
+      const std::size_t max_alignment = soahelper::SoATupleHelper<sizeof...(Args), Args...>::max_alignment;
+      typedef std::aligned_storage<soahelper::SoATupleHelper<sizeof...(Args), Args...>::max_alignment,
+                                   soahelper::SoATupleHelper<sizeof...(Args), Args...>::max_alignment>
+          AlignedType;
       //If needed, pad the number of items by 1
-      const size_t itemsNeeded = (memoryNeededInBytes+max_alignment-1)/sizeof(AlignedType);
-      char * newMemory = static_cast<char*>(static_cast<void*>(new AlignedType[itemsNeeded]));
-      void * oldMemory =m_values[0];
-      soahelper::SoATupleHelper<sizeof...(Args),Args...>::moveToNew(newMemory,m_size, iToSize, m_values);
+      const size_t itemsNeeded = (memoryNeededInBytes + max_alignment - 1) / sizeof(AlignedType);
+      char* newMemory = static_cast<char*>(static_cast<void*>(new AlignedType[itemsNeeded]));
+      void* oldMemory = m_values[0];
+      soahelper::SoATupleHelper<sizeof...(Args), Args...>::moveToNew(newMemory, m_size, iToSize, m_values);
       m_reserved = iToSize;
-      delete [] static_cast<AlignedType*>(oldMemory);
+      delete[] static_cast<AlignedType*>(oldMemory);
     }
     // ---------- member data --------------------------------
     //Pointers to where each column starts in the shared memory array
@@ -272,7 +282,6 @@ namespace edm {
     size_t m_size;
     size_t m_reserved;
   };
-}
-
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/SoATupleHelper.h b/FWCore/Utilities/interface/SoATupleHelper.h
index 399e2ed60bf6f..950602391f6d3 100644
--- a/FWCore/Utilities/interface/SoATupleHelper.h
+++ b/FWCore/Utilities/interface/SoATupleHelper.h
@@ -4,7 +4,7 @@
 //
 // Package:     Package
 // Class  :     SoATupleHelper
-// 
+//
 /**\class SoATupleHelper SoATupleHelper.h "SoATupleHelper.h"
 
  Description: Helper classes for SoATuple
@@ -27,53 +27,48 @@
 // forward declarations
 namespace edm {
   namespace soahelper {
-    
+
     /**Given a leading memory size, iSizeSoFar, and an alignment boundary requirement of iBoundary, returns how much additional memory padding is needed.
      This function assumes that when iSizeSoFar==0 that we are already properly aligned.*/
     constexpr unsigned int padding_needed(size_t iSizeSoFar, unsigned int iBoundary) {
       return (iBoundary - iSizeSoFar % iBoundary) % iBoundary;
     }
-    
+
     /**
      Given a starting value of I=0, and the index to the argument you want to get, J,
      will recursively step through the arguments, Args, until it hits the one you want, Jth, and then will return it as return type Ret.
      */
-    
-    template<unsigned int I, unsigned int J, typename Ret, typename... Args>
+
+    template <unsigned int I, unsigned int J, typename Ret, typename... Args>
     struct arg_puller;
-    
+
     /**Given a variable number of arguments, returns the 'J'th one. The first caller must use I=0.*/
-    template<unsigned int I, unsigned int J, typename Ret, typename F, typename... Args>
-    struct arg_puller<I,J,Ret,F, Args...> {
-      static Ret pull(F const&, const Args&... args) {
-        return arg_puller<I+1, J,Ret,Args...>::pull(args...);
-      }
+    template <unsigned int I, unsigned int J, typename Ret, typename F, typename... Args>
+    struct arg_puller<I, J, Ret, F, Args...> {
+      static Ret pull(F const&, const Args&... args) { return arg_puller<I + 1, J, Ret, Args...>::pull(args...); }
     };
-    
+
     /**End condition of the template recursion */
-    template<unsigned int I, typename Ret, typename F, typename... Args>
-    struct arg_puller<I,I,Ret,F, Args...> {
-      static Ret pull(F const& iV, const Args&...) {
-        return iV;
-      }
+    template <unsigned int I, typename Ret, typename F, typename... Args>
+    struct arg_puller<I, I, Ret, F, Args...> {
+      static Ret pull(F const& iV, const Args&...) { return iV; }
     };
 
     /** A decorator class used in SoATuple's template argument list to denote that
      the type T should be stored with an unusual byte alignment given by ALIGNMENT.
      NOTE: It is up to the user to be sure sizeof(T) >= ALIGNMENT.
      */
-    template<typename T, unsigned int ALIGNMENT>
+    template <typename T, unsigned int ALIGNMENT>
     struct Aligned {
       static const unsigned int kAlignment = ALIGNMENT;
       typedef T Type;
     };
-    
-    
+
     /** Class used by SoATupleHelper to determine the proper alignment of the requested type.
      The default is to just use 'alignof(T)'. Users can change the alignment by instead using
      Aligned<T,ALIGNMENT> for which AlignmentHelper has a specialization.
      */
-    template<typename T>
+    template <typename T>
     struct AlignmentHelper {
       static const std::size_t kAlignment = alignof(T);
       typedef T Type;
@@ -82,154 +77,150 @@ namespace edm {
     /** Specialization of ALignmentHelper for Aligned<T, ALIGNMENT>. This allows users
      to specify non-default alignment values for the internal arrays of SoATuple.
      */
-    template<typename T, unsigned int ALIGNMENT>
-    struct AlignmentHelper<Aligned<T,ALIGNMENT>> {
+    template <typename T, unsigned int ALIGNMENT>
+    struct AlignmentHelper<Aligned<T, ALIGNMENT>> {
       static const std::size_t kAlignment = ALIGNMENT;
       typedef T Type;
     };
-    
+
     /**Implements most of the internal functions used by SoATuple. The argument I is used to recursively step
      through each arugment Args when doing the work. SoATupleHelper<I,Args> actually operates on the I-1 argument.
      There is a specialization of SoATulpeHelper with I=0 which is used to stop the template recursion.
      */
-    template<unsigned int I, typename... Args>
-    struct SoATupleHelper
-    {
-      typedef AlignmentHelper<typename std::tuple_element<I-1, std::tuple<Args...>>::type> AlignmentInfo;
+    template <unsigned int I, typename... Args>
+    struct SoATupleHelper {
+      typedef AlignmentHelper<typename std::tuple_element<I - 1, std::tuple<Args...>>::type> AlignmentInfo;
       typedef typename AlignmentInfo::Type Type;
-      typedef SoATupleHelper<I-1,Args...> NextHelper;
+      typedef SoATupleHelper<I - 1, Args...> NextHelper;
+
+      static const std::size_t max_alignment =
+          AlignmentInfo::kAlignment > NextHelper::max_alignment ? AlignmentInfo::kAlignment : NextHelper::max_alignment;
 
-      static const std::size_t max_alignment = AlignmentInfo::kAlignment > NextHelper::max_alignment ?
-                                               AlignmentInfo::kAlignment: NextHelper::max_alignment;
-      
       // ---------- static member functions --------------------
       static size_t moveToNew(char* iNewMemory, size_t iSize, size_t iReserve, void** oToSet);
       static size_t copyToNew(char* iNewMemory, size_t iSize, size_t iReserve, void* const* iFrom, void** oToSet);
       static size_t spaceNeededFor(unsigned int iNElements);
       static void push_back(void** iToSet, size_t iSize, std::tuple<Args...> const& iValues);
-      template<typename... FArgs>
+      template <typename... FArgs>
       static void emplace_back(void** iToSet, size_t iSize, FArgs... iValues);
       static void destroy(void** iToSet, size_t iSize);
-      
+
       // ---------- member functions ---------------------------
-      SoATupleHelper(const SoATupleHelper&) = delete; // stop default
-      
-      const SoATupleHelper& operator=(const SoATupleHelper&) = delete; // stop default
-      
+      SoATupleHelper(const SoATupleHelper&) = delete;  // stop default
+
+      const SoATupleHelper& operator=(const SoATupleHelper&) = delete;  // stop default
     };
-    
+
     //Specialization used to stop recursion
-    template<typename... Args>
-    struct SoATupleHelper<0,Args...> {
+    template <typename... Args>
+    struct SoATupleHelper<0, Args...> {
       static const std::size_t max_alignment = 0;
-      static void destroy(void** /*iToSet*/, size_t /*iSize*/) {
-      }
-      
-      static void push_back(void** /*iToSet*/, size_t /*iSize*/, std::tuple<Args...> const& /*values*/) {
-      }
+      static void destroy(void** /*iToSet*/, size_t /*iSize*/) {}
+
+      static void push_back(void** /*iToSet*/, size_t /*iSize*/, std::tuple<Args...> const& /*values*/) {}
 
-      template<typename... FArgs>
+      template <typename... FArgs>
       static void emplace_back(void** iToSet, size_t iSize, FArgs... iValues) {}
 
-      static size_t spaceNeededFor(unsigned int /*iNElements*/) {
-        return 0;
-      }
-      
+      static size_t spaceNeededFor(unsigned int /*iNElements*/) { return 0; }
+
       static size_t moveToNew(char* /*iNewMemory*/, size_t /*iSize*/, size_t /*iReserve*/, void** /*oToSet*/) {
         return 0;
       }
-      
-      static size_t copyToNew(char* /*iNewMemory*/, size_t /*iSize*/, size_t /*iReserve*/, void* const* /*iFrom*/, void** /*oToSet*/) {
+
+      static size_t copyToNew(
+          char* /*iNewMemory*/, size_t /*iSize*/, size_t /*iReserve*/, void* const* /*iFrom*/, void** /*oToSet*/) {
         return 0;
       }
     };
 
-    template<unsigned int I, typename... Args>
-    size_t SoATupleHelper<I,Args...>::moveToNew(char* iNewMemory, size_t iSize, size_t iReserve, void** oToSet) {
-      size_t usedSoFar = NextHelper::moveToNew(iNewMemory,iSize, iReserve, oToSet);
-      
+    template <unsigned int I, typename... Args>
+    size_t SoATupleHelper<I, Args...>::moveToNew(char* iNewMemory, size_t iSize, size_t iReserve, void** oToSet) {
+      size_t usedSoFar = NextHelper::moveToNew(iNewMemory, iSize, iReserve, oToSet);
+
       //find new start
       const unsigned int boundary = AlignmentInfo::kAlignment;
-      
-      Type* newStart = reinterpret_cast<Type*>(iNewMemory+usedSoFar+padding_needed(usedSoFar,boundary));
-      
-      void** oldStart = oToSet+I-1;
-      
+
+      Type* newStart = reinterpret_cast<Type*>(iNewMemory + usedSoFar + padding_needed(usedSoFar, boundary));
+
+      void** oldStart = oToSet + I - 1;
+
       Type* oldValues = static_cast<Type*>(*oldStart);
-      if(oldValues != nullptr ) {
+      if (oldValues != nullptr) {
         auto ptr = newStart;
-        for(auto it = oldValues; it != oldValues+iSize; ++it,++ptr) {
+        for (auto it = oldValues; it != oldValues + iSize; ++it, ++ptr) {
           new (ptr) Type(std::move(*it));
         }
-        for(auto it = oldValues; it != oldValues+iSize; ++it) {
+        for (auto it = oldValues; it != oldValues + iSize; ++it) {
           it->~Type();
         }
       }
       *oldStart = newStart;
-      unsigned int additionalSize = padding_needed(usedSoFar,boundary) + iReserve*sizeof(Type);
-      return usedSoFar+additionalSize;
+      unsigned int additionalSize = padding_needed(usedSoFar, boundary) + iReserve * sizeof(Type);
+      return usedSoFar + additionalSize;
     }
 
-    template<unsigned int I, typename... Args>
-    size_t SoATupleHelper<I,Args...>::copyToNew(char* iNewMemory, size_t iSize, size_t iReserve, void* const* iFrom, void** oToSet) {
-      size_t usedSoFar = NextHelper::copyToNew(iNewMemory,iSize, iReserve, iFrom, oToSet);
-      
+    template <unsigned int I, typename... Args>
+    size_t SoATupleHelper<I, Args...>::copyToNew(
+        char* iNewMemory, size_t iSize, size_t iReserve, void* const* iFrom, void** oToSet) {
+      size_t usedSoFar = NextHelper::copyToNew(iNewMemory, iSize, iReserve, iFrom, oToSet);
+
       //find new start
       const unsigned int boundary = AlignmentInfo::kAlignment;
-      
-      Type* newStart = reinterpret_cast<Type*>(iNewMemory+usedSoFar+padding_needed(usedSoFar,boundary));
-      
-      void* const* oldStart = iFrom+I-1;
-      
+
+      Type* newStart = reinterpret_cast<Type*>(iNewMemory + usedSoFar + padding_needed(usedSoFar, boundary));
+
+      void* const* oldStart = iFrom + I - 1;
+
       Type* oldValues = static_cast<Type*>(*oldStart);
-      if(oldValues != nullptr ) {
+      if (oldValues != nullptr) {
         auto ptr = newStart;
-        for(auto it = oldValues; it != oldValues+iSize; ++it,++ptr) {
+        for (auto it = oldValues; it != oldValues + iSize; ++it, ++ptr) {
           new (ptr) Type(*it);
         }
       }
-      *(oToSet+I-1) = newStart;
-      unsigned int additionalSize = padding_needed(usedSoFar,boundary) + iReserve*sizeof(Type);
-      return usedSoFar+additionalSize;
+      *(oToSet + I - 1) = newStart;
+      unsigned int additionalSize = padding_needed(usedSoFar, boundary) + iReserve * sizeof(Type);
+      return usedSoFar + additionalSize;
     }
 
-    
-    template<unsigned int I, typename... Args>
-    size_t SoATupleHelper<I,Args...>::spaceNeededFor(unsigned int iNElements) {
+    template <unsigned int I, typename... Args>
+    size_t SoATupleHelper<I, Args...>::spaceNeededFor(unsigned int iNElements) {
       size_t usedSoFar = NextHelper::spaceNeededFor(iNElements);
       const unsigned int boundary = AlignmentInfo::kAlignment;
-      unsigned int additionalSize = padding_needed(usedSoFar,boundary) + iNElements*sizeof(Type);
-      return usedSoFar+additionalSize;
+      unsigned int additionalSize = padding_needed(usedSoFar, boundary) + iNElements * sizeof(Type);
+      return usedSoFar + additionalSize;
     }
-    
-    template<unsigned int I, typename... Args>
-    void SoATupleHelper<I,Args...>::push_back(void** iToSet, size_t iSize, std::tuple<Args...> const& iValues) {
-      new (static_cast<Type*>(*(iToSet+I-1))+iSize) Type(std::get<I-1>(iValues));
-      
-      NextHelper::push_back(iToSet,iSize,iValues);
+
+    template <unsigned int I, typename... Args>
+    void SoATupleHelper<I, Args...>::push_back(void** iToSet, size_t iSize, std::tuple<Args...> const& iValues) {
+      new (static_cast<Type*>(*(iToSet + I - 1)) + iSize) Type(std::get<I - 1>(iValues));
+
+      NextHelper::push_back(iToSet, iSize, iValues);
     }
 
-    template<unsigned int I, typename... Args>
-    template<typename ... FArgs>
-    void SoATupleHelper<I,Args...>::emplace_back(void** iToSet, size_t iSize, FArgs... iValues) {
-      new (static_cast<Type*>(*(iToSet+I-1))+iSize) Type(arg_puller<0,I-1,Type const&, FArgs...>::pull(std::forward<FArgs>(iValues)...));
-      
-      NextHelper::emplace_back(iToSet,iSize,std::forward<FArgs>(iValues)...);
+    template <unsigned int I, typename... Args>
+    template <typename... FArgs>
+    void SoATupleHelper<I, Args...>::emplace_back(void** iToSet, size_t iSize, FArgs... iValues) {
+      new (static_cast<Type*>(*(iToSet + I - 1)) + iSize)
+          Type(arg_puller<0, I - 1, Type const&, FArgs...>::pull(std::forward<FArgs>(iValues)...));
+
+      NextHelper::emplace_back(iToSet, iSize, std::forward<FArgs>(iValues)...);
     }
 
-    template<unsigned int I, typename... Args>
-    void SoATupleHelper<I,Args...>::destroy(void** iToSet, size_t iSize) {
-      void** start = iToSet+I-1;
+    template <unsigned int I, typename... Args>
+    void SoATupleHelper<I, Args...>::destroy(void** iToSet, size_t iSize) {
+      void** start = iToSet + I - 1;
       Type* values = static_cast<Type*>(*start);
-      
-      for(auto it = values; it != values+iSize; ++it) {
+
+      for (auto it = values; it != values + iSize; ++it) {
         it->~Type();
       }
-      
-      NextHelper::destroy(iToSet,iSize);
+
+      NextHelper::destroy(iToSet, iSize);
     }
 
-  }
-}
+  }  // namespace soahelper
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/StreamID.h b/FWCore/Utilities/interface/StreamID.h
index 34da9e0b818c2..a50da27369d7c 100644
--- a/FWCore/Utilities/interface/StreamID.h
+++ b/FWCore/Utilities/interface/StreamID.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Utilities
 // Class  :     edm::StreamID
-// 
+//
 /**\class edm::StreamID StreamID.h "FWCore/Utilities/interface/StreamID.h"
 
  Description: Identifies an edm stream
@@ -26,41 +26,34 @@
 namespace edm {
   class Schedule;
   class EventPrincipal;
-  
-  class StreamID
-  {
-    
+
+  class StreamID {
   public:
     ~StreamID() = default;
     StreamID(const StreamID&) = default;
     StreamID& operator=(const StreamID&) = default;
-    
-    bool operator==(const StreamID& iID) const {
-      return iID.value_ == value_;
-    }
 
-    operator unsigned int() const {return value_;}
-    
+    bool operator==(const StreamID& iID) const { return iID.value_ == value_; }
+
+    operator unsigned int() const { return value_; }
+
     /** \return value ranging from 0 to one less than max number of streams.
      */
     unsigned int value() const { return value_; }
-    
-    static StreamID invalidStreamID() {
-      return StreamID(0xFFFFFFFFU);
-    }
-    
+
+    static StreamID invalidStreamID() { return StreamID(0xFFFFFFFFU); }
+
   private:
     ///Only a Schedule is allowed to create one of these
     friend class Schedule;
     friend class EventPrincipal;
     explicit StreamID(unsigned int iValue) : value_(iValue) {}
-    
+
     StreamID() = delete;
-    
+
     // ---------- member data --------------------------------
     unsigned int value_;
   };
-}
-
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/TestHelper.h b/FWCore/Utilities/interface/TestHelper.h
index dd540434111c1..7768da00522de 100644
--- a/FWCore/Utilities/interface/TestHelper.h
+++ b/FWCore/Utilities/interface/TestHelper.h
@@ -6,11 +6,11 @@
 //
 // Function to drive test programs and scripts.
 //
-// Write your test program with whatever name you want; the 
+// Write your test program with whatever name you want; the
 // implementation should be:
 //
 //    int main(int argc, char* argv[]) { return ptomaine(argc, argv); }
-//    
+//
 //
 // Asumming you call your program RunThis, invocation of this program
 // should look like:
@@ -26,6 +26,8 @@
 
 int ptomaine(int argc, char* argv[], char** env);
 
-#define RUNTEST() extern "C" char** environ; int main(int argc, char* argv[]) { return ptomaine(argc, argv, environ); }
+#define RUNTEST()            \
+  extern "C" char** environ; \
+  int main(int argc, char* argv[]) { return ptomaine(argc, argv, environ); }
 
 #endif
diff --git a/FWCore/Utilities/interface/ThreadSafeRegistry.h b/FWCore/Utilities/interface/ThreadSafeRegistry.h
index 8912ce9cff4b4..958a1b590b448 100644
--- a/FWCore/Utilities/interface/ThreadSafeRegistry.h
+++ b/FWCore/Utilities/interface/ThreadSafeRegistry.h
@@ -33,10 +33,10 @@ namespace edm {
     template <typename KEY, typename T>
     class ThreadSafeRegistry {
     public:
-      typedef KEY   key_type;
-      typedef T     value_type;
+      typedef KEY key_type;
+      typedef T value_type;
       typedef typename std::map<key_type, value_type> collection_type;
-      typedef typename collection_type::size_type      size_type;
+      typedef typename collection_type::size_type size_type;
 
       typedef typename std::vector<value_type> vector_type;
 
@@ -48,7 +48,7 @@ namespace edm {
       /// If we return 'false, no matching key was found, and
       /// the value of 'result' is undefined.
       bool getMapped(key_type const& k, value_type& result) const;
-      
+
       /** Retrieve a pointer to the value_type object with the given key.
        If there is no object associated with the given key 0 is returned.
        */
@@ -85,83 +85,67 @@ namespace edm {
       ~ThreadSafeRegistry();
 
       // The following two are not implemented.
-      ThreadSafeRegistry(ThreadSafeRegistry<KEY,T> const&) = delete; 
-    
-      ThreadSafeRegistry<KEY,T>& 
-      operator= (ThreadSafeRegistry<KEY,T> const&) = delete;
+      ThreadSafeRegistry(ThreadSafeRegistry<KEY, T> const&) = delete;
+
+      ThreadSafeRegistry<KEY, T>& operator=(ThreadSafeRegistry<KEY, T> const&) = delete;
 
       mutable std::mutex mutex_;
       collection_type data_;
     };
 
     template <typename KEY, typename T, typename E>
-    inline
-    std::ostream&
-    operator<< (std::ostream& os, ThreadSafeRegistry<KEY,T> const& reg) {
+    inline std::ostream& operator<<(std::ostream& os, ThreadSafeRegistry<KEY, T> const& reg) {
       reg.print(os);
       return os;
     }
 
     template <typename KEY, typename T>
-    void 
-    ThreadSafeRegistry<KEY,T>::insertCollection(collection_type const& c) {
-      for (auto const& item: c ) {
-	insertMapped(item.second);
+    void ThreadSafeRegistry<KEY, T>::insertCollection(collection_type const& c) {
+      for (auto const& item : c) {
+        insertMapped(item.second);
       }
     }
 
     template <typename KEY, typename T>
-    void 
-    ThreadSafeRegistry<KEY,T>::insertCollection(vector_type const& c) {
-      for (auto const& item: c) {
-	insertMapped(item);
+    void ThreadSafeRegistry<KEY, T>::insertCollection(vector_type const& c) {
+      for (auto const& item : c) {
+        insertMapped(item);
       }
     }
 
     template <typename KEY, typename T>
-    inline
-    bool
-    ThreadSafeRegistry<KEY,T>::empty() const {
+    inline bool ThreadSafeRegistry<KEY, T>::empty() const {
       std::lock_guard<std::mutex> guard(mutex_);
       return data_.empty();
     }
-    
+
     template <typename KEY, typename T>
-    inline
-    bool
-    ThreadSafeRegistry<KEY,T>::notEmpty() const {
+    inline bool ThreadSafeRegistry<KEY, T>::notEmpty() const {
       return !empty();
     }
 
     template <typename KEY, typename T>
-    inline
-    typename ThreadSafeRegistry<KEY,T>::size_type
-    ThreadSafeRegistry<KEY,T>::size() const {
+    inline typename ThreadSafeRegistry<KEY, T>::size_type ThreadSafeRegistry<KEY, T>::size() const {
       std::lock_guard<std::mutex> guard(mutex_);
       return data_.size();
     }
 
     template <typename KEY, typename T>
-    void
-    ThreadSafeRegistry<KEY,T>::print(std::ostream& os) const {
+    void ThreadSafeRegistry<KEY, T>::print(std::ostream& os) const {
       std::lock_guard<std::mutex> guard(mutex_);
       os << "Registry with " << size() << " entries\n";
-      for (auto const& item: data_) {
-	  os << item.first << " " << item.second << '\n';
+      for (auto const& item : data_) {
+        os << item.first << " " << item.second << '\n';
       }
     }
 
-    template <typename KEY, typename T> 
-    ThreadSafeRegistry<KEY,T>::ThreadSafeRegistry() : 
-      data_()
-    { }
-
+    template <typename KEY, typename T>
+    ThreadSafeRegistry<KEY, T>::ThreadSafeRegistry() : data_() {}
 
-    template <typename KEY, typename T> 
-    ThreadSafeRegistry<KEY,T>::~ThreadSafeRegistry() 
-    { }
+    template <typename KEY, typename T>
+    ThreadSafeRegistry<KEY, T>::~ThreadSafeRegistry() {}
 
-  } // namespace detail
-} // namespace edm
+  }  // namespace detail
+}  // namespace edm
 #pragma GCC visibility pop
-#endif //  FWCore_Utilities_ThreadSafeRegistry_h
+#endif  //  FWCore_Utilities_ThreadSafeRegistry_h
diff --git a/FWCore/Utilities/interface/ThreadSafeRegistry.icc b/FWCore/Utilities/interface/ThreadSafeRegistry.icc
index f637c50a194dc..ec458020d9eb9 100644
--- a/FWCore/Utilities/interface/ThreadSafeRegistry.icc
+++ b/FWCore/Utilities/interface/ThreadSafeRegistry.icc
@@ -9,15 +9,13 @@ namespace edm {
   namespace detail {
     // ----------------------------------------------------------------------
     template <typename KEY, typename T>
-    ThreadSafeRegistry<KEY,T>*
-    ThreadSafeRegistry<KEY,T>::instance() {
-      CMS_THREAD_SAFE static ThreadSafeRegistry<KEY,T> me;
+    ThreadSafeRegistry<KEY, T>* ThreadSafeRegistry<KEY, T>::instance() {
+      CMS_THREAD_SAFE static ThreadSafeRegistry<KEY, T> me;
       return &me;
     }
 
     template <typename KEY, typename T>
-    bool
-    ThreadSafeRegistry<KEY,T>::getMapped(key_type const& k, value_type& result) const {
+    bool ThreadSafeRegistry<KEY, T>::getMapped(key_type const& k, value_type& result) const {
       bool found;
       typename collection_type::const_iterator i;
       {
@@ -27,52 +25,56 @@ namespace edm {
         i = data_.find(k);
         found = (i != data_.end());
       }
-      if (found) result = i->second;
+      if (found)
+        result = i->second;
       return found;
     }
 
     template <typename KEY, typename T>
-    typename ThreadSafeRegistry<KEY,T>::value_type const*
-    ThreadSafeRegistry<KEY,T>::getMapped(key_type const& k) const {
+    typename ThreadSafeRegistry<KEY, T>::value_type const* ThreadSafeRegistry<KEY, T>::getMapped(
+        key_type const& k) const {
       bool found;
       typename collection_type::const_iterator i;
       {
-         // This scope limits the lifetime of the lock to the shorted
-         // required interval.
-         std::lock_guard<std::mutex> lock(mutex_);
-         i = data_.find(k);
-         found = (i != data_.end());
+        // This scope limits the lifetime of the lock to the shorted
+        // required interval.
+        std::lock_guard<std::mutex> lock(mutex_);
+        i = data_.find(k);
+        found = (i != data_.end());
       }
-      return found ? &(i->second) : static_cast<value_type const*> (nullptr);
+      return found ? &(i->second) : static_cast<value_type const*>(nullptr);
     }
 
     template <typename KEY, typename T>
-    bool
-    ThreadSafeRegistry<KEY,T>::insertMapped(value_type const& v) {
+    bool ThreadSafeRegistry<KEY, T>::insertMapped(value_type const& v) {
       bool newly_added = false;
       std::lock_guard<std::mutex> lock(mutex_);
 
       key_type id = v.id();
       if (data_.find(id) == data_.end()) {
-          data_[id] = v;
-          newly_added = true;
+        data_[id] = v;
+        newly_added = true;
       }
       return newly_added;
     }
 
-  } // namespace detail
-} // namespace edm
+  }  // namespace detail
+}  // namespace edm
 
 // To be used to explicitly instanciate the template code and
 // static variables, so that they work even in the case of hidden symbol visibility
 // in plugins.
-#define DEFINE_THREAD_SAFE_REGISTRY_INSTANCE(X) \
-  namespace edm { namespace detail { \
-  template ThreadSafeRegistry<X::key_type,X::value_type> *\
-             ThreadSafeRegistry<X::key_type,X::value_type>::instance(); \
-  template bool ThreadSafeRegistry<X::key_type,X::value_type>::getMapped(X::key_type const &, X::value_type &) const;\
-  template X::value_type const *ThreadSafeRegistry<X::key_type,X::value_type>::getMapped(X::key_type const &) const;\
-  template bool ThreadSafeRegistry<X::key_type,X::value_type>::insertMapped(X::value_type const &); \
-  }}
+#define DEFINE_THREAD_SAFE_REGISTRY_INSTANCE(X)                                                         \
+  namespace edm {                                                                                       \
+    namespace detail {                                                                                  \
+      template ThreadSafeRegistry<X::key_type, X::value_type>*                                          \
+      ThreadSafeRegistry<X::key_type, X::value_type>::instance();                                       \
+      template bool ThreadSafeRegistry<X::key_type, X::value_type>::getMapped(X::key_type const&,       \
+                                                                              X::value_type&) const;    \
+      template X::value_type const* ThreadSafeRegistry<X::key_type, X::value_type>::getMapped(          \
+          X::key_type const&) const;                                                                    \
+      template bool ThreadSafeRegistry<X::key_type, X::value_type>::insertMapped(X::value_type const&); \
+    }                                                                                                   \
+  }
 
-#endif //  FWCore_Utilities_ThreadSafeRegistry_icc
+#endif  //  FWCore_Utilities_ThreadSafeRegistry_icc
diff --git a/FWCore/Utilities/interface/TimeOfDay.h b/FWCore/Utilities/interface/TimeOfDay.h
index 2452be091f840..b512d9a3e0e92 100644
--- a/FWCore/Utilities/interface/TimeOfDay.h
+++ b/FWCore/Utilities/interface/TimeOfDay.h
@@ -10,12 +10,12 @@ namespace edm {
     explicit TimeOfDay(struct timeval const& tv);
 
     struct timeval tv_;
+
   private:
     static struct timeval setTime_();
   };
 
-  std::ostream&
-  operator<<(std::ostream& os, TimeOfDay const& tod);
-}
+  std::ostream& operator<<(std::ostream& os, TimeOfDay const& tod);
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/TimingServiceBase.h b/FWCore/Utilities/interface/TimingServiceBase.h
index c1ddd8b491b5a..2f50f59f869af 100644
--- a/FWCore/Utilities/interface/TimingServiceBase.h
+++ b/FWCore/Utilities/interface/TimingServiceBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Utilities
 // Class  :     TimingServiceBase
-// 
+//
 /**\class TimingServiceBase TimingServiceBase.h "TimingServiceBase.h"
 
  Description: Base class for Timing Services
@@ -25,13 +25,11 @@
 
 // forward declarations
 namespace edm {
-  class TimingServiceBase
-  {
-    
+  class TimingServiceBase {
   public:
     TimingServiceBase();
     virtual ~TimingServiceBase();
-    
+
     // ---------- member functions ---------------------------
     ///Extra CPU time used by a job but not seen by cmsRun
     /// The value should be in seconds.
@@ -43,16 +41,16 @@ namespace edm {
     virtual double getTotalCPU() const = 0;
 
     static void jobStarted();
-    
+
     static double jobStartTime() { return s_jobStartTime; }
+
   private:
-    TimingServiceBase(const TimingServiceBase&) =delete; // stop default
-    
-    const TimingServiceBase& operator=(const TimingServiceBase&) =delete; // stop default
-    
+    TimingServiceBase(const TimingServiceBase&) = delete;  // stop default
+
+    const TimingServiceBase& operator=(const TimingServiceBase&) = delete;  // stop default
+
     static double s_jobStartTime;
   };
-}
-
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/Transition.h b/FWCore/Utilities/interface/Transition.h
index a577dadb5463e..014423a1bddbc 100644
--- a/FWCore/Utilities/interface/Transition.h
+++ b/FWCore/Utilities/interface/Transition.h
@@ -9,28 +9,22 @@ Transition: The allowed framework transitions
 #include <type_traits>
 
 namespace edm {
-  enum class Transition {
-    Event,
-    BeginLuminosityBlock,
-    EndLuminosityBlock,
-    BeginRun,
-    EndRun
-  };
-  
+  enum class Transition { Event, BeginLuminosityBlock, EndLuminosityBlock, BeginRun, EndRun, NumberOfTransitions };
+
   //Useful for converting EndBranchType to BranchType
   constexpr BranchType convertToBranchType(Transition iValue) {
-    constexpr BranchType branches[]={InEvent,InLumi,InLumi,InRun,InRun};
+    constexpr BranchType branches[] = {InEvent, InLumi, InLumi, InRun, InRun};
     return branches[static_cast<std::underlying_type<Transition>::type>(iValue)];
   }
 
   constexpr Transition convertToTransition(BranchType iValue) {
-    constexpr Transition trans[]={Transition::Event,Transition::BeginLuminosityBlock,Transition::BeginRun};
+    constexpr Transition trans[] = {Transition::Event, Transition::BeginLuminosityBlock, Transition::BeginRun};
     return trans[iValue];
   }
 
   constexpr bool isEndTransition(Transition iValue) {
-    return iValue==Transition::EndLuminosityBlock or iValue==Transition::EndRun;
+    return iValue == Transition::EndLuminosityBlock or iValue == Transition::EndRun;
   }
-  
-}
+
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/TypeDemangler.h b/FWCore/Utilities/interface/TypeDemangler.h
index d6ae626f85eee..cdf04e30c80bf 100644
--- a/FWCore/Utilities/interface/TypeDemangler.h
+++ b/FWCore/Utilities/interface/TypeDemangler.h
@@ -4,9 +4,7 @@
 #include <string>
 
 namespace edm {
-  std::string
-  typeDemangle(char const* mangledName);
-  void
-  replaceString(std::string& demangledName, std::string const& from, std::string const& to);
-}
+  std::string typeDemangle(char const* mangledName);
+  void replaceString(std::string& demangledName, std::string const& from, std::string const& to);
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/TypeID.h b/FWCore/Utilities/interface/TypeID.h
index 26683d75467b2..08e39f7820ca9 100644
--- a/FWCore/Utilities/interface/TypeID.h
+++ b/FWCore/Utilities/interface/TypeID.h
@@ -21,15 +21,12 @@ namespace edm {
 
   class TypeID : private TypeIDBase {
   public:
-
     TypeID() : TypeIDBase() {}
 
-    explicit TypeID(std::type_info const& t) : TypeIDBase(t) {
-    }
+    explicit TypeID(std::type_info const& t) : TypeIDBase(t) {}
 
     template <typename T>
-    explicit TypeID(T const& t) : TypeIDBase(typeid(t)) {
-    }
+    explicit TypeID(T const& t) : TypeIDBase(typeid(t)) {}
 
     // Print out the name of the type, using the dictionary class name.
     void print(std::ostream& os) const;
@@ -41,27 +38,22 @@ namespace edm {
     std::string friendlyClassName() const;
 
     explicit operator bool() const;
-    
+
     using TypeIDBase::name;
 
     bool operator<(TypeID const& b) const { return this->TypeIDBase::operator<(b); }
 
-    bool operator==(TypeID const& b) const {return this->TypeIDBase::operator==(b);}
+    bool operator==(TypeID const& b) const { return this->TypeIDBase::operator==(b); }
 
     using TypeIDBase::typeInfo;
 
   private:
-
   };
 
-  inline bool operator>(TypeID const& a, TypeID const& b) {
-    return b < a;
-  }
+  inline bool operator>(TypeID const& a, TypeID const& b) { return b < a; }
 
-  inline bool operator!=(TypeID const& a, TypeID const& b) {
-    return !(a == b);
-  }
+  inline bool operator!=(TypeID const& a, TypeID const& b) { return !(a == b); }
 
   std::ostream& operator<<(std::ostream& os, TypeID const& id);
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/TypeIDBase.h b/FWCore/Utilities/interface/TypeIDBase.h
index 7824c4467b1d1..fd728d8edbc93 100644
--- a/FWCore/Utilities/interface/TypeIDBase.h
+++ b/FWCore/Utilities/interface/TypeIDBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     Utilities
 // Class  :     TypeIDBase
-// 
+//
 /**\class TypeIDBase TypeIDBase.h FWCore/Utilities/interface/TypeIDBase.h
 
  Description: Base class for classes used to compare C++ types
@@ -26,54 +26,43 @@
 
 // forward declarations
 namespace edm {
-   class TypeIDBase 
-   {
-   
-    public:
-      struct Def { };
-   
-      TypeIDBase() :
-         t_(&(typeid(Def))) 
-      { }
-      
-      explicit TypeIDBase(const std::type_info& t) :
-         t_(&t)
-      { }
-            
-      explicit TypeIDBase(const std::type_info* t) :
-         t_(t == nullptr ? &(typeid(Def)) : t)
-      { }
-            
-      // ---------- const member functions ---------------------
-      
-      /** Returned C-style string owned by system; do not delete[] it.
+  class TypeIDBase {
+  public:
+    struct Def {};
+
+    TypeIDBase() : t_(&(typeid(Def))) {}
+
+    explicit TypeIDBase(const std::type_info& t) : t_(&t) {}
+
+    explicit TypeIDBase(const std::type_info* t) : t_(t == nullptr ? &(typeid(Def)) : t) {}
+
+    // ---------- const member functions ---------------------
+
+    /** Returned C-style string owned by system; do not delete[] it.
          This is the (horrible, mangled, platform-dependent) name of
          the type. */
-      const char* name() const { return t_->name(); }
-      
-      bool operator<(const TypeIDBase& b) const { return t_->before(*(b.t_)); }
-      bool operator==(const TypeIDBase& b) const { return (*t_) == *(b.t_); }
-
-    protected:
-      const std::type_info& typeInfo() const {return *t_;}
-
-    private:
-   
-      //const TypeIDBase& operator=(const TypeIDBase&); // stop default
-
-      // ---------- member data --------------------------------
-      //NOTE: since the compiler generates the type_info's and they have a lifetime
-      //  good for the entire application, we do not have to delete it
-      //  We also are using a pointer rather than a reference so that operator= will work
-      const std::type_info* t_;
-   };
-
-   inline bool operator>(const TypeIDBase& a, const TypeIDBase& b)
-   { return b<a; }
-   
-   inline bool operator!=(const TypeIDBase& a, const TypeIDBase& b)
-   { return !(a==b); }
-   
-}
+    const char* name() const { return t_->name(); }
+
+    bool operator<(const TypeIDBase& b) const { return t_->before(*(b.t_)); }
+    bool operator==(const TypeIDBase& b) const { return (*t_) == *(b.t_); }
+
+  protected:
+    const std::type_info& typeInfo() const { return *t_; }
+
+  private:
+    //const TypeIDBase& operator=(const TypeIDBase&); // stop default
+
+    // ---------- member data --------------------------------
+    //NOTE: since the compiler generates the type_info's and they have a lifetime
+    //  good for the entire application, we do not have to delete it
+    //  We also are using a pointer rather than a reference so that operator= will work
+    const std::type_info* t_;
+  };
+
+  inline bool operator>(const TypeIDBase& a, const TypeIDBase& b) { return b < a; }
+
+  inline bool operator!=(const TypeIDBase& a, const TypeIDBase& b) { return !(a == b); }
+
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/TypeToGet.h b/FWCore/Utilities/interface/TypeToGet.h
index f666576862271..1c3c385a0a4c4 100644
--- a/FWCore/Utilities/interface/TypeToGet.h
+++ b/FWCore/Utilities/interface/TypeToGet.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Utilities
 // Class  :     TypeToGet
-// 
+//
 /**\class TypeToGet TypeToGet.h "FWCore/Utilities/interface/TypeToGet.h"
 
  Description: [one line class summary]
@@ -26,51 +26,54 @@
 
 // forward declarations
 namespace edm {
-  template< typename T> class View;
+  template <typename T>
+  class View;
 
-  class TypeToGet
-  {
-    
+  class TypeToGet {
   public:
-    
     /**If the type is is a edm::View<T> then
      iID should be typeid(T) and iKind should be
      edm::ELEMENT_TYPE. Else TypeID should be the full type
      and iKind should be edm::ProductType **/
-    TypeToGet(TypeID const& iID, KindOfType iKind):
-    m_type(iID), m_kind(iKind) {}
+    TypeToGet(TypeID const& iID, KindOfType iKind) : m_type(iID), m_kind(iKind) {}
 
     // ---------- const member functions ---------------------
-    TypeID const& type() const {return m_type;}
-    KindOfType kind() const {return m_kind;}
-    
+    TypeID const& type() const { return m_type; }
+    KindOfType kind() const { return m_kind; }
+
     // ---------- static member functions --------------------
-    template<typename T>
+    template <typename T>
     static TypeToGet make() {
-      return TypeToGet(edm::TypeID(typeIdFor(static_cast<T*>(nullptr))),kindOfTypeFor(static_cast<T*>(nullptr)));
+      return TypeToGet(edm::TypeID(typeIdFor(static_cast<T*>(nullptr))), kindOfTypeFor(static_cast<T*>(nullptr)));
     }
 
   private:
+    template <typename T>
+    static std::type_info const& typeIdFor(T*) {
+      return typeid(T);
+    }
 
-    template<typename T>
-    static std::type_info const& typeIdFor(T*) { return typeid(T); }
+    template <typename T>
+    static std::type_info const& typeIdFor(edm::View<T>*) {
+      return typeid(T);
+    }
 
-    template<typename T>
-    static std::type_info const& typeIdFor(edm::View<T>*) { return typeid(T); }
+    template <typename T>
+    static KindOfType kindOfTypeFor(T*) {
+      return PRODUCT_TYPE;
+    }
 
-    template<typename T>
-    static KindOfType kindOfTypeFor(T*) { return PRODUCT_TYPE; }
-    
-    template<typename T>
-    static KindOfType kindOfTypeFor(edm::View<T>*) { return ELEMENT_TYPE; }
+    template <typename T>
+    static KindOfType kindOfTypeFor(edm::View<T>*) {
+      return ELEMENT_TYPE;
+    }
 
-    
     TypeToGet() = delete;
-    
+
     // ---------- member data --------------------------------
     TypeID m_type;
     KindOfType m_kind;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/TypeWithDict.h b/FWCore/Utilities/interface/TypeWithDict.h
index e466b3a814e86..8dfb9c5ed2fb6 100644
--- a/FWCore/Utilities/interface/TypeWithDict.h
+++ b/FWCore/Utilities/interface/TypeWithDict.h
@@ -27,170 +27,166 @@ persisted across invocations of the program.
 
 namespace edm {
 
-class FunctionWithDict;
-class MemberWithDict;
-class ObjectWithDict;
-
-class TypeBases;
-class TypeDataMembers;
-class TypeFunctionMembers;
-
-class TypeWithDict {
-  friend class TypeBases;
-  friend class TypeDataMembers;
-  friend class TypeFunctionMembers;
-  friend bool operator==(TypeWithDict const&, std::type_info const&);
-  typedef enum{} dummyType; // Tag for valid type, but no type_info information
-  typedef dummyType** invalidType; // Tag for invalid type
-private:
-  std::type_info const* ti_;
-  TClass* class_;
-  TEnum* enum_;
-  TDataType* dataType_;
-  value_ptr<std::vector<size_t> > arrayDimensions_;
-  long property_;
-public:
-  static TypeWithDict byName(std::string const& name);
-  static TypeWithDict byTypeInfo(std::type_info const& ti);
-private:
-  static TypeWithDict byName(std::string const& name, long property);
-public:
-  TypeWithDict();
-  TypeWithDict(TypeWithDict const&);
-  explicit TypeWithDict(TClass* type);
-  explicit TypeWithDict(TEnum* type);
-  explicit TypeWithDict(std::type_info const&);
-  explicit TypeWithDict(TMethodArg* arg);
-private:
-  explicit TypeWithDict(std::type_info const&, long property);
-  explicit TypeWithDict(TClass* type, long property);
-  explicit TypeWithDict(TEnum* type, long property);
-  explicit TypeWithDict(TMethodArg* arg, long property);
-public:
-  TypeWithDict& operator=(TypeWithDict const&);
-  TypeWithDict& stripConstRef();
-  explicit operator bool() const;
-  bool invalidTypeInfo() const;
-  std::type_info const& typeInfo() const;
-  //Do not check is 'invalidTypeInfo()' would return true
-  std::type_info const& unvalidatedTypeInfo() const {
-    return *ti_;
-  }
-  TClass* getClass() const;
-  TEnum* getEnum() const;
-  TDataType* getDataType() const;
-  long getProperty() const;
-  bool isClass() const;
-  bool isConst() const;
-  bool isArray() const;
-  bool isEnum() const;
-  bool isFundamental() const;
-  bool isPointer() const;
-  bool isReference() const;
-  bool isTemplateInstance() const;
-  bool isTypedef() const;
-  bool isVirtual() const;
-  std::string qualifiedName() const;
-  std::string cppName() const;
-  std::string unscopedName() const;
-  std::string name() const;
-  std::string userClassName() const;
-  std::string friendlyClassName() const;
-  std::string templateName() const;
-  size_t size() const;
-  size_t arrayLength() const;
-  size_t arrayDimension() const;
-  size_t maximumIndex(size_t dim) const;
-  size_t dataMemberSize() const;
-  size_t functionMemberSize() const;
-  MemberWithDict dataMemberByName(std::string const&) const;
-  // Note: Used only by FWCore/Modules/src/EventContentAnalyzer.cc
-  FunctionWithDict functionMemberByName(std::string const&) const;
-  // Note: Used only by Fireworks/Core/src/FWModelContextMenuHandler.cc:262
-  //FunctionWithDict functionMemberByName(std::string const& name, TypeWithDict const& signature, int mods, TypeMemberQuery memberQuery) const;
-  // Note: Used only by CondFormats/PhysicsToolsObjects/src/MVAComputer.cc
-  FunctionWithDict functionMemberByName(std::string const& name, std::string const& proto, bool isConst) const;
-  TypeWithDict nestedType(char const*) const;
-  TypeWithDict nestedType(std::string const&) const;
-  TypeWithDict finalType() const;
-  TypeWithDict toType() const;
-  void print(std::ostream& os) const;
-  bool hasBase(std::string const&) const;
-  bool hasBase(TypeWithDict const& basety) const;
-  int getBaseClassOffset(TypeWithDict const& baseClass) const;
-  TypeWithDict templateArgumentAt(size_t index) const;
-  void const* pointerToBaseType(void const* ptr, TypeWithDict const& derivedType) const;
-  void const* pointerToContainedType(void const* ptr, TypeWithDict const& derivedType) const;
-  int stringToEnumValue(std::string const&) const;
-  void* allocate() const;
-  void deallocate(void* address) const;
-  ObjectWithDict construct() const;
-  void destruct(void* address, bool dealloc = true) const;
-};
-
-// A related free function
-bool hasDictionary(std::type_info const&);
-
-inline bool operator<(TypeWithDict const& a, TypeWithDict const& b) {
-  return a.name() < b.name();
-}
-
-bool operator==(TypeWithDict const& a, TypeWithDict const& b);
-
-inline bool operator!=(TypeWithDict const& a, TypeWithDict const& b) {
-  return !(a == b);
-}
-
-bool operator==(TypeWithDict const& a, std::type_info const& b);
-
-inline bool operator!=(TypeWithDict const& a, std::type_info const& b) {
-  return !(a == b);
-}
-
-inline bool operator==(std::type_info const& a, TypeWithDict const& b) {
-  return b == a;
-}
-
-inline bool operator!=(std::type_info const& a, TypeWithDict const& b) {
-  return !(b == a);
-}
-
-std::ostream& operator<<(std::ostream& os, TypeWithDict const& id);
-
-class TypeBases {
-private:
-  TClass* class_;
-public:
-  explicit TypeBases(TypeWithDict const&);
-  IterWithDict<TBaseClass> begin() const;
-  IterWithDict<TBaseClass> end() const;
-  size_t size() const;
-};
-
-class TypeDataMembers {
-private:
-  TClass* class_;
-public:
-  explicit TypeDataMembers(TypeWithDict const&);
-  IterWithDict<TDataMember> begin() const;
-  IterWithDict<TDataMember> end() const;
-  size_t size() const;
-};
-
-class TypeFunctionMembers {
-private:
-  TClass* class_;
-public:
-  explicit TypeFunctionMembers(TypeWithDict const&);
-  IterWithDict<TMethod> begin() const;
-  IterWithDict<TMethod> end() const;
-  size_t size() const;
-};
-
-} // namespace edm
+  class FunctionWithDict;
+  class MemberWithDict;
+  class ObjectWithDict;
+
+  class TypeBases;
+  class TypeDataMembers;
+  class TypeFunctionMembers;
+
+  class TypeWithDict {
+    friend class TypeBases;
+    friend class TypeDataMembers;
+    friend class TypeFunctionMembers;
+    friend bool operator==(TypeWithDict const&, std::type_info const&);
+    typedef enum {} dummyType;        // Tag for valid type, but no type_info information
+    typedef dummyType** invalidType;  // Tag for invalid type
+  private:
+    std::type_info const* ti_;
+    TClass* class_;
+    TEnum* enum_;
+    TDataType* dataType_;
+    value_ptr<std::vector<size_t> > arrayDimensions_;
+    long property_;
+
+  public:
+    static TypeWithDict byName(std::string const& name);
+    static TypeWithDict byTypeInfo(std::type_info const& ti);
+
+  private:
+    static TypeWithDict byName(std::string const& name, long property);
+
+  public:
+    TypeWithDict();
+    TypeWithDict(TypeWithDict const&);
+    explicit TypeWithDict(TClass* type);
+    explicit TypeWithDict(TEnum* type);
+    explicit TypeWithDict(std::type_info const&);
+    explicit TypeWithDict(TMethodArg* arg);
+
+  private:
+    explicit TypeWithDict(std::type_info const&, long property);
+    explicit TypeWithDict(TClass* type, long property);
+    explicit TypeWithDict(TEnum* type, long property);
+    explicit TypeWithDict(TMethodArg* arg, long property);
+
+  public:
+    TypeWithDict& operator=(TypeWithDict const&);
+    TypeWithDict& stripConstRef();
+    explicit operator bool() const;
+    bool invalidTypeInfo() const;
+    std::type_info const& typeInfo() const;
+    //Do not check is 'invalidTypeInfo()' would return true
+    std::type_info const& unvalidatedTypeInfo() const { return *ti_; }
+    TClass* getClass() const;
+    TEnum* getEnum() const;
+    TDataType* getDataType() const;
+    long getProperty() const;
+    bool isClass() const;
+    bool isConst() const;
+    bool isArray() const;
+    bool isEnum() const;
+    bool isFundamental() const;
+    bool isPointer() const;
+    bool isReference() const;
+    bool isTemplateInstance() const;
+    bool isTypedef() const;
+    bool isVirtual() const;
+    std::string qualifiedName() const;
+    std::string cppName() const;
+    std::string unscopedName() const;
+    std::string name() const;
+    std::string userClassName() const;
+    std::string friendlyClassName() const;
+    std::string templateName() const;
+    size_t size() const;
+    size_t arrayLength() const;
+    size_t arrayDimension() const;
+    size_t maximumIndex(size_t dim) const;
+    size_t dataMemberSize() const;
+    size_t functionMemberSize() const;
+    MemberWithDict dataMemberByName(std::string const&) const;
+    // Note: Used only by FWCore/Modules/src/EventContentAnalyzer.cc
+    FunctionWithDict functionMemberByName(std::string const&) const;
+    // Note: Used only by Fireworks/Core/src/FWModelContextMenuHandler.cc:262
+    //FunctionWithDict functionMemberByName(std::string const& name, TypeWithDict const& signature, int mods, TypeMemberQuery memberQuery) const;
+    // Note: Used only by CondFormats/PhysicsToolsObjects/src/MVAComputer.cc
+    FunctionWithDict functionMemberByName(std::string const& name, std::string const& proto, bool isConst) const;
+    TypeWithDict nestedType(char const*) const;
+    TypeWithDict nestedType(std::string const&) const;
+    TypeWithDict finalType() const;
+    TypeWithDict toType() const;
+    void print(std::ostream& os) const;
+    bool hasBase(std::string const&) const;
+    bool hasBase(TypeWithDict const& basety) const;
+    int getBaseClassOffset(TypeWithDict const& baseClass) const;
+    TypeWithDict templateArgumentAt(size_t index) const;
+    void const* pointerToBaseType(void const* ptr, TypeWithDict const& derivedType) const;
+    void const* pointerToContainedType(void const* ptr, TypeWithDict const& derivedType) const;
+    int stringToEnumValue(std::string const&) const;
+    void* allocate() const;
+    void deallocate(void* address) const;
+    ObjectWithDict construct() const;
+    void destruct(void* address, bool dealloc = true) const;
+  };
+
+  // A related free function
+  bool hasDictionary(std::type_info const&);
+
+  inline bool operator<(TypeWithDict const& a, TypeWithDict const& b) { return a.name() < b.name(); }
+
+  bool operator==(TypeWithDict const& a, TypeWithDict const& b);
+
+  inline bool operator!=(TypeWithDict const& a, TypeWithDict const& b) { return !(a == b); }
+
+  bool operator==(TypeWithDict const& a, std::type_info const& b);
+
+  inline bool operator!=(TypeWithDict const& a, std::type_info const& b) { return !(a == b); }
+
+  inline bool operator==(std::type_info const& a, TypeWithDict const& b) { return b == a; }
+
+  inline bool operator!=(std::type_info const& a, TypeWithDict const& b) { return !(b == a); }
+
+  std::ostream& operator<<(std::ostream& os, TypeWithDict const& id);
+
+  class TypeBases {
+  private:
+    TClass* class_;
+
+  public:
+    explicit TypeBases(TypeWithDict const&);
+    IterWithDict<TBaseClass> begin() const;
+    IterWithDict<TBaseClass> end() const;
+    size_t size() const;
+  };
+
+  class TypeDataMembers {
+  private:
+    TClass* class_;
+
+  public:
+    explicit TypeDataMembers(TypeWithDict const&);
+    IterWithDict<TDataMember> begin() const;
+    IterWithDict<TDataMember> end() const;
+    size_t size() const;
+  };
+
+  class TypeFunctionMembers {
+  private:
+    TClass* class_;
+
+  public:
+    explicit TypeFunctionMembers(TypeWithDict const&);
+    IterWithDict<TMethod> begin() const;
+    IterWithDict<TMethod> end() const;
+    size_t size() const;
+  };
+
+}  // namespace edm
 
 #include "FWCore/Utilities/interface/FunctionWithDict.h"
 #include "FWCore/Utilities/interface/MemberWithDict.h"
 #include "FWCore/Utilities/interface/ObjectWithDict.h"
 
-#endif // FWCore_Utilities_TypeWithDict_h
+#endif  // FWCore_Utilities_TypeWithDict_h
diff --git a/FWCore/Utilities/interface/UnixSignalHandlers.h b/FWCore/Utilities/interface/UnixSignalHandlers.h
index a16c5ddd0f633..9c113c4fd6c12 100644
--- a/FWCore/Utilities/interface/UnixSignalHandlers.h
+++ b/FWCore/Utilities/interface/UnixSignalHandlers.h
@@ -13,21 +13,21 @@ and manipulate Unix-style signal handling.
 
 namespace edm {
 
-    extern volatile std::atomic<bool> shutdown_flag;
-
-    extern "C" {
-      void ep_sigusr2(int,siginfo_t*,void*);
-      typedef void(*CFUNC)(int,siginfo_t*,void*);
-    }
-
-    void disableAllSigs(sigset_t* oldset);
-    void disableRTSigs();
-    void enableSignal(sigset_t* newset, int signum);
-    void disableSignal(sigset_t* newset, int signum);
-    void reenableSigs(sigset_t* oldset);
-    void installSig(int signum, CFUNC func);
-    void installCustomHandler(int signum, CFUNC func);
-    void sigInventory();
+  extern volatile std::atomic<bool> shutdown_flag;
+
+  extern "C" {
+  void ep_sigusr2(int, siginfo_t*, void*);
+  typedef void (*CFUNC)(int, siginfo_t*, void*);
+  }
+
+  void disableAllSigs(sigset_t* oldset);
+  void disableRTSigs();
+  void enableSignal(sigset_t* newset, int signum);
+  void disableSignal(sigset_t* newset, int signum);
+  void reenableSigs(sigset_t* oldset);
+  void installSig(int signum, CFUNC func);
+  void installCustomHandler(int signum, CFUNC func);
+  void sigInventory();
 
 }  // end of namespace edm
 #endif
diff --git a/FWCore/Utilities/interface/VecArray.h b/FWCore/Utilities/interface/VecArray.h
index 6532b05543ba4..282c9dda880f1 100644
--- a/FWCore/Utilities/interface/VecArray.h
+++ b/FWCore/Utilities/interface/VecArray.h
@@ -40,7 +40,7 @@ namespace edm {
     using iterator = value_type*;
     using const_iterator = const value_type*;
 
-    VecArray(): data_{}, size_{0} {}
+    VecArray() : data_{}, size_{0} {}
 
     // Not range-checked, undefined behaviour if access beyond size()
     reference operator[](size_type pos) { return data_[pos]; }
@@ -52,9 +52,9 @@ namespace edm {
     const_reference front() const { return data_[0]; }
 
     // Undefined behaviour if size()==0
-    reference back() { return data_[size_-1]; }
+    reference back() { return data_[size_ - 1]; }
     // Undefined behaviour if size()==0
-    const_reference back() const { return data_[size_-1]; }
+    const_reference back() const { return data_[size_ - 1]; }
     pointer data() { return data_; }
     const_pointer data() const { return data_; }
 
@@ -62,22 +62,20 @@ namespace edm {
     const_iterator begin() const noexcept { return data_; }
     const_iterator cbegin() const noexcept { return data_; }
 
-    iterator end() noexcept { return begin()+size_; }
-    const_iterator end() const noexcept { return begin()+size_; }
-    const_iterator cend() const noexcept { return cbegin()+size_; }
+    iterator end() noexcept { return begin() + size_; }
+    const_iterator end() const noexcept { return begin() + size_; }
+    const_iterator cend() const noexcept { return cbegin() + size_; }
 
     constexpr bool empty() const noexcept { return size_ == 0; }
     constexpr size_type size() const noexcept { return size_; }
     static constexpr size_type capacity() noexcept { return N; }
 
-    void clear() {
-      size_ = 0;
-    }
+    void clear() { size_ = 0; }
 
     // Throws if size()==N
     void push_back(const T& value) {
-      if(size_ >= N)
-        throw std::length_error("push_back on already-full VecArray (N="+std::to_string(N)+")");
+      if (size_ >= N)
+        throw std::length_error("push_back on already-full VecArray (N=" + std::to_string(N) + ")");
       push_back_unchecked(value);
     }
 
@@ -88,42 +86,39 @@ namespace edm {
     }
 
     // Throws if size()==N
-    template <typename ...Args>
+    template <typename... Args>
     void emplace_back(Args&&... args) {
-      if(size_ >= N)
-        throw std::length_error("emplace_back on already-full VecArray (N="+std::to_string(N)+")");
+      if (size_ >= N)
+        throw std::length_error("emplace_back on already-full VecArray (N=" + std::to_string(N) + ")");
       emplace_back_unchecked(std::forward<Args>(args)...);
     }
 
     // Undefined behaviour if size()==N
-    template <typename ...Args>
+    template <typename... Args>
     void emplace_back_unchecked(Args&&... args) {
       data_[size_] = T(std::forward<Args>(args)...);
       ++size_;
     }
 
     // Undefined behaviour if size()==0
-    void pop_back() {
-      --size_;
-    }
+    void pop_back() { --size_; }
 
     void resize(unsigned int size) {
-      if(size > N)
-        throw std::length_error("Requesting size "+std::to_string(size)+" while maximum allowed is "+std::to_string(N));
+      if (size > N)
+        throw std::length_error("Requesting size " + std::to_string(size) + " while maximum allowed is " +
+                                std::to_string(N));
 
-      while(size < size_)
+      while (size < size_)
         pop_back();
       size_ = size;
     }
 
-    void swap(VecArray& other)
-      noexcept(noexcept(std::swap(data_, other.data_)) &&
-               noexcept(std::swap(size_, other.size_)))
-    {
+    void swap(VecArray& other) noexcept(noexcept(std::swap(data_, other.data_)) &&
+                                        noexcept(std::swap(size_, other.size_))) {
       std::swap(data_, other.data_);
       std::swap(size_, other.size_);
     }
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/Visibility.h b/FWCore/Utilities/interface/Visibility.h
index ceed001189f57..ce8e1cf43ca45 100644
--- a/FWCore/Utilities/interface/Visibility.h
+++ b/FWCore/Utilities/interface/Visibility.h
@@ -2,18 +2,16 @@
 #define VISIBILITY_MACROS_H
 #include "FWCore/Utilities/interface/GCCPrerequisite.h"
 
-#if GCC_PREREQUISITE(4,4,0)
-#define dso_export    __attribute__ ((visibility ("default")))
-#define dso_hidden    __attribute__ ((visibility ("hidden")))
-#define dso_internal  __attribute__ ((visibility ("hidden")))
-#define dso_protected __attribute__ ((visibility ("protected")))
+#if GCC_PREREQUISITE(4, 4, 0)
+#define dso_export __attribute__((visibility("default")))
+#define dso_hidden __attribute__((visibility("hidden")))
+#define dso_internal __attribute__((visibility("hidden")))
+#define dso_protected __attribute__((visibility("protected")))
 #else
-#define dso_export  
-#define dso_hidden   
-#define dso_internal 
+#define dso_export
+#define dso_hidden
+#define dso_internal
 #define dso_protected
 #endif
 
-
-#endif // VISIBILITY
-
+#endif  // VISIBILITY
diff --git a/FWCore/Utilities/interface/WallclockTimer.h b/FWCore/Utilities/interface/WallclockTimer.h
index 03d226f423b23..42818413068e1 100644
--- a/FWCore/Utilities/interface/WallclockTimer.h
+++ b/FWCore/Utilities/interface/WallclockTimer.h
@@ -4,7 +4,7 @@
 //
 // Package:     Utilities
 // Class  :     WallclockTimer
-// 
+//
 /**\class WallclockTimer WallclockTimer.h FWCore/Utilities/interface/WallclockTimer.h
 
  Description: Timer which measures the CPU and wallclock time
@@ -34,43 +34,41 @@
 
 // forward declarations
 namespace edm {
-  class WallclockTimer
-  {
-    
+  class WallclockTimer {
   public:
     WallclockTimer();
     ~WallclockTimer();
     WallclockTimer(WallclockTimer&&) = default;
-    
+
     // ---------- const member functions ---------------------
-    double realTime() const ;
-    
+    double realTime() const;
+
     // ---------- static member functions --------------------
-    
+
     // ---------- member functions ---------------------------
     void start();
-    double stop(); //returns delta time
+    double stop();  //returns delta time
     void reset();
-    
+
     void add(double t);
+
   private:
-    WallclockTimer(const WallclockTimer&) = delete; // stop default
-    
-    const WallclockTimer& operator=(const WallclockTimer&) = delete; // stop default
-    
+    WallclockTimer(const WallclockTimer&) = delete;  // stop default
+
+    const WallclockTimer& operator=(const WallclockTimer&) = delete;  // stop default
+
     double calculateDeltaTime() const;
-    
+
     // ---------- member data --------------------------------
-    enum State {kRunning, kStopped} state_;
+    enum State { kRunning, kStopped } state_;
 #ifdef USE_CLOCK_GETTIME
     struct timespec startRealTime_;
 #else
     struct timeval startRealTime_;
 #endif
-    
+
     double accumulatedRealTime_;
-    
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/atomic_value_ptr.h b/FWCore/Utilities/interface/atomic_value_ptr.h
index 8e7d824fb2f09..e921b634669c4 100644
--- a/FWCore/Utilities/interface/atomic_value_ptr.h
+++ b/FWCore/Utilities/interface/atomic_value_ptr.h
@@ -30,7 +30,6 @@ namespace edm {
   //
   // --------------------------------------------------------------------
 
-
   template <typename T>
   struct atomic_value_ptr_traits {
     static T* clone(T const* p) { return new T(*p); }
@@ -42,27 +41,22 @@ namespace edm {
   //
   // --------------------------------------------------------------------
 
-
   template <typename T>
   class atomic_value_ptr {
-
   public:
-
     // --------------------------------------------------
     // Default constructor/destructor:
     // --------------------------------------------------
 
-    atomic_value_ptr() : myP(nullptr) { }
-    explicit atomic_value_ptr(T* p) : myP(p) { }
+    atomic_value_ptr() : myP(nullptr) {}
+    explicit atomic_value_ptr(T* p) : myP(p) {}
     ~atomic_value_ptr() { delete myP.load(); }
 
     // --------------------------------------------------
     // Copy constructor/copy assignment:
     // --------------------------------------------------
 
-    atomic_value_ptr(atomic_value_ptr const& orig) :
-      myP(createFrom(orig.myP.load())) {
-    }
+    atomic_value_ptr(atomic_value_ptr const& orig) : myP(createFrom(orig.myP.load())) {}
 
     atomic_value_ptr& operator=(atomic_value_ptr const& orig) {
       atomic_value_ptr<T> local(orig);
@@ -70,8 +64,7 @@ namespace edm {
       return *this;
     }
 
-    atomic_value_ptr(atomic_value_ptr&& orig) :
-      myP(orig.myP.load()) { orig.myP.store(nullptr); }
+    atomic_value_ptr(atomic_value_ptr&& orig) : myP(orig.myP.load()) { orig.myP.store(nullptr); }
 
     atomic_value_ptr& operator=(atomic_value_ptr&& orig) {
       atomic_value_ptr<T> local(orig);
@@ -91,9 +84,7 @@ namespace edm {
     // --------------------------------------------------
 
     template <typename U>
-    atomic_value_ptr(atomic_value_ptr<U> const& orig) :
-      myP(createFrom(orig.operator->())) {
-    }
+    atomic_value_ptr(atomic_value_ptr<U> const& orig) : myP(createFrom(orig.operator->())) {}
 
     template <typename U>
     atomic_value_ptr& operator=(atomic_value_ptr<U> const& orig) {
@@ -106,10 +97,7 @@ namespace edm {
     // move-like construct/assign from unique_ptr<>:
     // --------------------------------------------------
 
-    atomic_value_ptr(std::unique_ptr<T> orig) :
-      myP(orig.release()) {
-      orig = nullptr;
-    }
+    atomic_value_ptr(std::unique_ptr<T> orig) : myP(orig.release()) { orig = nullptr; }
 
     atomic_value_ptr& operator=(std::unique_ptr<T> orig) {
       atomic_value_ptr<T> local(std::move(orig));
@@ -117,32 +105,26 @@ namespace edm {
       return *this;
     }
 
-  T* load() const {
-    return myP.load();
-  }
+    T* load() const { return myP.load(); }
 
-  bool compare_exchange_strong(T*& oldValue, T* newValue) {
-   return myP.compare_exchange_strong(oldValue, newValue); 
-  }
+    bool compare_exchange_strong(T*& oldValue, T* newValue) { return myP.compare_exchange_strong(oldValue, newValue); }
 
-  // The following typedef, function, and operator definition
-  // support the following syntax:
-  //   atomic_value_ptr<T> ptr(..);
-  //   if (ptr) { ...
-  // Where the conditional will evaluate as true if and only if the
-  // pointer atomic_value_ptr contains is not null.
+    // The following typedef, function, and operator definition
+    // support the following syntax:
+    //   atomic_value_ptr<T> ptr(..);
+    //   if (ptr) { ...
+    // Where the conditional will evaluate as true if and only if the
+    // pointer atomic_value_ptr contains is not null.
   private:
     typedef void (atomic_value_ptr::*bool_type)() const;
     void this_type_does_not_support_comparisons() const {}
 
   public:
     operator bool_type() const {
-      return myP != nullptr ?
-        &atomic_value_ptr<T>::this_type_does_not_support_comparisons : nullptr;
+      return myP != nullptr ? &atomic_value_ptr<T>::this_type_does_not_support_comparisons : nullptr;
     }
 
   private:
-
     // --------------------------------------------------
     // Manipulation:
     // --------------------------------------------------
@@ -159,11 +141,8 @@ namespace edm {
     // --------------------------------------------------
 
     template <typename U>
-    static T*
-    createFrom(U const* p) {
-      return p
-	? atomic_value_ptr_traits<U>::clone(p)
-	: nullptr;
+    static T* createFrom(U const* p) {
+      return p ? atomic_value_ptr_traits<U>::clone(p) : nullptr;
     }
 
     // --------------------------------------------------
@@ -172,7 +151,7 @@ namespace edm {
 
     mutable std::atomic<T*> myP;
 
-  }; // atomic_value_ptr
+  };  // atomic_value_ptr
 
   // Do not allow nonsensical comparisons that the bool_type
   // conversion operator definition above would otherwise allow.
@@ -181,28 +160,27 @@ namespace edm {
   // instantiate these 4 operators.
   template <typename T, typename U>
   inline bool operator==(atomic_value_ptr<T> const& lhs, U const& rhs) {
-    lhs.this_type_does_not_support_comparisons();	
-    return false;	
+    lhs.this_type_does_not_support_comparisons();
+    return false;
   }
 
   template <typename T, typename U>
   inline bool operator!=(atomic_value_ptr<T> const& lhs, U const& rhs) {
-    lhs.this_type_does_not_support_comparisons();	
-    return false;	
+    lhs.this_type_does_not_support_comparisons();
+    return false;
   }
 
   template <typename T, typename U>
   inline bool operator==(U const& lhs, atomic_value_ptr<T> const& rhs) {
-    rhs.this_type_does_not_support_comparisons();	
-    return false;	
+    rhs.this_type_does_not_support_comparisons();
+    return false;
   }
 
   template <typename T, typename U>
   inline bool operator!=(U const& lhs, atomic_value_ptr<T> const& rhs) {
-    rhs.this_type_does_not_support_comparisons();	
-    return false;	
+    rhs.this_type_does_not_support_comparisons();
+    return false;
   }
-}
-
+}  // namespace edm
 
-#endif // FWCoreUtilities_atomic_value_ptr_h
+#endif  // FWCoreUtilities_atomic_value_ptr_h
diff --git a/FWCore/Utilities/interface/clone_ptr.h b/FWCore/Utilities/interface/clone_ptr.h
index a8b18d93868fd..98d24a66464f9 100644
--- a/FWCore/Utilities/interface/clone_ptr.h
+++ b/FWCore/Utilities/interface/clone_ptr.h
@@ -1,49 +1,50 @@
 #ifndef FWCore_Utilities_clone_ptr_h
 #define FWCore_Utilities_clone_ptr_h
 
-#include<memory>
+#include <memory>
 
 namespace extstd {
 
   /* modify unique_ptr behaviour adding a "cloning" copy-constructor and assignment-operator
    */
-  template<typename T>
+  template <typename T>
   struct clone_ptr : public std::unique_ptr<T> {
-    
-    template<typename... Args>
-    explicit clone_ptr(Args&& ... args)  noexcept : std::unique_ptr<T>(std::forward<Args>(args)...){}
-    
-    clone_ptr(clone_ptr const & rh) : std::unique_ptr<T>(rh? rh->clone() : nullptr){}
-    clone_ptr(clone_ptr && rh) noexcept : std::unique_ptr<T>(std::move(rh)) {}
-    
-    clone_ptr & operator=(clone_ptr const & rh) {
-      if (&rh!=this) this->reset(rh? rh->clone() : nullptr);
+    template <typename... Args>
+    explicit clone_ptr(Args&&... args) noexcept : std::unique_ptr<T>(std::forward<Args>(args)...) {}
+
+    clone_ptr(clone_ptr const& rh) : std::unique_ptr<T>(rh ? rh->clone() : nullptr) {}
+    clone_ptr(clone_ptr&& rh) noexcept : std::unique_ptr<T>(std::move(rh)) {}
+
+    clone_ptr& operator=(clone_ptr const& rh) {
+      if (&rh != this)
+        this->reset(rh ? rh->clone() : nullptr);
       return *this;
     }
-    clone_ptr & operator=(clone_ptr && rh) noexcept {
-      if (&rh!=this) std::unique_ptr<T>::operator=(std::move(rh));
+    clone_ptr& operator=(clone_ptr&& rh) noexcept {
+      if (&rh != this)
+        std::unique_ptr<T>::operator=(std::move(rh));
       return *this;
     }
-    
-    
-    template<typename U>   
-    clone_ptr(clone_ptr<U> const & rh) : std::unique_ptr<T>(rh ? rh->clone() : nullptr){}
-    template<typename U>
-    clone_ptr(clone_ptr<U> && rh)  noexcept : std::unique_ptr<T>(std::move(rh)) {}
-    
-    template<typename U>
-    clone_ptr & operator=(clone_ptr<U> const & rh) {
-      if (&rh!=this) this->reset(rh? rh->clone() : nullptr);
+
+    template <typename U>
+    clone_ptr(clone_ptr<U> const& rh) : std::unique_ptr<T>(rh ? rh->clone() : nullptr) {}
+    template <typename U>
+    clone_ptr(clone_ptr<U>&& rh) noexcept : std::unique_ptr<T>(std::move(rh)) {}
+
+    template <typename U>
+    clone_ptr& operator=(clone_ptr<U> const& rh) {
+      if (&rh != this)
+        this->reset(rh ? rh->clone() : nullptr);
       return *this;
     }
-    template<typename U>
-    clone_ptr & operator=(clone_ptr<U> && rh) noexcept {
-      if (&rh!=this) std::unique_ptr<T>::operator=(std::move(rh));
+    template <typename U>
+    clone_ptr& operator=(clone_ptr<U>&& rh) noexcept {
+      if (&rh != this)
+        std::unique_ptr<T>::operator=(std::move(rh));
       return *this;
     }
-    
   };
 
-}
+}  // namespace extstd
 
 #endif
diff --git a/FWCore/Utilities/interface/do_nothing_deleter.h b/FWCore/Utilities/interface/do_nothing_deleter.h
index 69f8efd7a0cad..96e6a01f3de10 100644
--- a/FWCore/Utilities/interface/do_nothing_deleter.h
+++ b/FWCore/Utilities/interface/do_nothing_deleter.h
@@ -34,6 +34,6 @@ namespace edm {
   struct do_nothing_deleter {
     void operator()(void const*) const {}
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/getAnyPtr.h b/FWCore/Utilities/interface/getAnyPtr.h
index 09fd1b7c43d5f..7e2c60a35bdbb 100644
--- a/FWCore/Utilities/interface/getAnyPtr.h
+++ b/FWCore/Utilities/interface/getAnyPtr.h
@@ -6,20 +6,19 @@
 
 namespace edm {
   template <typename T>
-  inline
-  std::unique_ptr<T> getAnyPtr(void* p, int offset) {
-    // A union is used to avoid possible copies during the triple cast that would otherwise be needed. 	 
-    // std::unique_ptr<T> edp(static_cast<T*>(static_cast<void *>(static_cast<unsigned char *>(p) + offset))); 	 
-    union { 	 
-      void* vp; 	 
-      unsigned char* ucp; 	 
-      T* tp; 	 
-    } pointerUnion; 	 
+  inline std::unique_ptr<T> getAnyPtr(void* p, int offset) {
+    // A union is used to avoid possible copies during the triple cast that would otherwise be needed.
+    // std::unique_ptr<T> edp(static_cast<T*>(static_cast<void *>(static_cast<unsigned char *>(p) + offset)));
+    union {
+      void* vp;
+      unsigned char* ucp;
+      T* tp;
+    } pointerUnion;
     assert(p != nullptr);
-    pointerUnion.vp = p; 	 
-    pointerUnion.ucp += offset; 	 
+    pointerUnion.vp = p;
+    pointerUnion.ucp += offset;
     return std::unique_ptr<T>(pointerUnion.tp);
   }
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/get_underlying_safe.h b/FWCore/Utilities/interface/get_underlying_safe.h
index f0c979412a648..da985897f283e 100644
--- a/FWCore/Utilities/interface/get_underlying_safe.h
+++ b/FWCore/Utilities/interface/get_underlying_safe.h
@@ -36,18 +36,39 @@
 namespace edm {
 
   // for std::shared_ptr
-  template<typename T> std::shared_ptr<T>& get_underlying_safe(propagate_const<std::shared_ptr<T>>& iP) {return get_underlying(iP);}
-  template<typename T> std::shared_ptr<T const> get_underlying_safe(propagate_const<std::shared_ptr<T>> const& iP ) {std::shared_ptr<T const> copy = get_underlying(iP); return copy;}
+  template <typename T>
+  std::shared_ptr<T>& get_underlying_safe(propagate_const<std::shared_ptr<T>>& iP) {
+    return get_underlying(iP);
+  }
+  template <typename T>
+  std::shared_ptr<T const> get_underlying_safe(propagate_const<std::shared_ptr<T>> const& iP) {
+    std::shared_ptr<T const> copy = get_underlying(iP);
+    return copy;
+  }
 
   // for bare pointer
-  template<typename T> T*& get_underlying_safe(propagate_const<T*>& iP) {return get_underlying(iP);}
-  template<typename T> T const* get_underlying_safe(propagate_const<T*> const& iP) {T const* copy = get_underlying(iP); return copy;}
+  template <typename T>
+  T*& get_underlying_safe(propagate_const<T*>& iP) {
+    return get_underlying(iP);
+  }
+  template <typename T>
+  T const* get_underlying_safe(propagate_const<T*> const& iP) {
+    T const* copy = get_underlying(iP);
+    return copy;
+  }
 
   // for std::unique_ptr
-  template<typename T> std::unique_ptr<T>& get_underlying_safe(propagate_const<std::unique_ptr<T>>& iP) {return get_underlying(iP);}
+  template <typename T>
+  std::unique_ptr<T>& get_underlying_safe(propagate_const<std::unique_ptr<T>>& iP) {
+    return get_underlying(iP);
+  }
   // This template below will deliberately not compile.
-  template<typename T> std::unique_ptr<T const> get_underlying_safe(propagate_const<std::unique_ptr<T>> const& iP) {std::unique_ptr<T const> copy = get_underlying(iP); return copy;}
+  template <typename T>
+  std::unique_ptr<T const> get_underlying_safe(propagate_const<std::unique_ptr<T>> const& iP) {
+    std::unique_ptr<T const> copy = get_underlying(iP);
+    return copy;
+  }
 
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/isFinite.h b/FWCore/Utilities/interface/isFinite.h
index 59e684f1d1c8e..2c91a3e546ff1 100644
--- a/FWCore/Utilities/interface/isFinite.h
+++ b/FWCore/Utilities/interface/isFinite.h
@@ -3,39 +3,39 @@
 
 namespace edm {
   template <typename T>
-  constexpr
-  bool isFinite(T x);
+  constexpr bool isFinite(T x);
 
   template <typename T>
-  constexpr
-  bool isNotFinite(T x) {
+  constexpr bool isNotFinite(T x) {
     return !isFinite(x);
   }
-  
-  template<>
-  constexpr
-  bool isFinite(float x) {
-    const unsigned int mask =  0x7f800000;
-    union { unsigned int l; float d;} v = { .d = x };
-    return (v.l&mask)!=mask;
+
+  template <>
+  constexpr bool isFinite(float x) {
+    const unsigned int mask = 0x7f800000;
+    union {
+      unsigned int l;
+      float d;
+    } v = {.d = x};
+    return (v.l & mask) != mask;
   }
-  
-  template<>
-  constexpr
-  bool isFinite(double x) {
+
+  template <>
+  constexpr bool isFinite(double x) {
     const unsigned long long mask = 0x7FF0000000000000LL;
-    union { unsigned long long l; double d;} v = { .d = x };
-    return (v.l&mask)!=mask;
+    union {
+      unsigned long long l;
+      double d;
+    } v = {.d = x};
+    return (v.l & mask) != mask;
   }
 
-  template<>
-  constexpr
-  bool isFinite(long double x) {
-    double xx=x;
+  template <>
+  constexpr bool isFinite(long double x) {
+    double xx = x;
     return isFinite(xx);
   }
 
-}
-
-#endif // FWCORE_Utilities_isFinite_H
+}  // namespace edm
 
+#endif  // FWCORE_Utilities_isFinite_H
diff --git a/FWCore/Utilities/interface/make_sentry.h b/FWCore/Utilities/interface/make_sentry.h
index 842ce1914e277..a9cad5951bad4 100644
--- a/FWCore/Utilities/interface/make_sentry.h
+++ b/FWCore/Utilities/interface/make_sentry.h
@@ -4,7 +4,7 @@
 //
 // Package:     Framework/Utilities
 // Class  :     make_sentry
-// 
+//
 /**\function make_sentry make_sentry.h "FWCore/Utilities/interface/make_sentry.h"
 
  Description: Creates a std::unique_ptr from a lambda to be used as a sentry
@@ -26,9 +26,10 @@
 
 namespace edm {
   ///NOTE: if iObject is null, then iFunc will not be called
-  template<typename T, typename F> std::unique_ptr<T, F> make_sentry(T* iObject, F iFunc) {
+  template <typename T, typename F>
+  std::unique_ptr<T, F> make_sentry(T* iObject, F iFunc) {
     return std::unique_ptr<T, F>(iObject, iFunc);
   }
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/propagate_const.h b/FWCore/Utilities/interface/propagate_const.h
index 823fab7cdd4b7..234cfaac5a38e 100644
--- a/FWCore/Utilities/interface/propagate_const.h
+++ b/FWCore/Utilities/interface/propagate_const.h
@@ -4,7 +4,7 @@
 //
 // Package:     FWCore/Utilities
 // Class  :     propagate_const
-// 
+//
 /**\class propagate_const propagate_const.h "FWCore/Utilities/interface/propagate_const.h"
 
  Description: propagate const to pointer like objects. Based on C++ experimental std::propagate_const.
@@ -28,66 +28,66 @@
 
 namespace edm {
 
-  template<typename T>
+  template <typename T>
   class propagate_const;
 
-  template<typename T> T& get_underlying( propagate_const<T>& );
-  template<typename T> T const& get_underlying( propagate_const<T> const& );
-  
-  
-  template<typename T>
-  class propagate_const
-  {
-    
+  template <typename T>
+  T& get_underlying(propagate_const<T>&);
+  template <typename T>
+  T const& get_underlying(propagate_const<T> const&);
+
+  template <typename T>
+  class propagate_const {
   public:
-    friend T& get_underlying<T>( propagate_const<T>& );
-    friend T const& get_underlying<T>( propagate_const<T> const& );
-    
+    friend T& get_underlying<T>(propagate_const<T>&);
+    friend T const& get_underlying<T>(propagate_const<T> const&);
+
     using element_type = typename std::remove_reference<decltype(*std::declval<T&>())>::type;
-    
+
     propagate_const() = default;
-    
-    propagate_const( propagate_const<T>&&) = default;
-    propagate_const( propagate_const<T> const&) = delete;
-    template<typename U>
-    propagate_const( U&& iValue) : m_value(std::forward<U>(iValue)) {}
 
-    
+    propagate_const(propagate_const<T>&&) = default;
+    propagate_const(propagate_const<T> const&) = delete;
+    template <typename U>
+    propagate_const(U&& iValue) : m_value(std::forward<U>(iValue)) {}
+
     propagate_const<T>& operator=(propagate_const&&) = default;
     propagate_const<T>& operator=(propagate_const<T> const&) = delete;
-    
-    template<typename U>
+
+    template <typename U>
     propagate_const& operator=(U&& iValue) {
       m_value = std::forward<U>(iValue);
       return *this;
     }
-    
-    
-    
+
     // ---------- const member functions ---------------------
     element_type const* get() const { return &(*m_value); }
     element_type const* operator->() const { return this->get(); }
     element_type const& operator*() const { return *m_value; }
-    
-    operator element_type const* () const { return this->get(); }
-    
+
+    operator element_type const*() const { return this->get(); }
+
     // ---------- member functions ---------------------------
     element_type* get() { return &(*m_value); }
     element_type* operator->() { return this->get(); }
     element_type& operator*() { return *m_value; }
 
-    operator element_type* () { return this->get(); }
-    
+    operator element_type*() { return this->get(); }
+
   private:
-    
     // ---------- member data --------------------------------
     T m_value;
   };
-  
-  template<typename T> T& get_underlying( propagate_const<T>& iP) { return iP.m_value;}
-  template<typename T> T const& get_underlying( propagate_const<T> const& iP ) {return iP.m_value;}
 
-}
+  template <typename T>
+  T& get_underlying(propagate_const<T>& iP) {
+    return iP.m_value;
+  }
+  template <typename T>
+  T const& get_underlying(propagate_const<T> const& iP) {
+    return iP.m_value;
+  }
 
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/resolveSymbolicLinks.h b/FWCore/Utilities/interface/resolveSymbolicLinks.h
index 38154bda78fea..bc6632bde96b7 100644
--- a/FWCore/Utilities/interface/resolveSymbolicLinks.h
+++ b/FWCore/Utilities/interface/resolveSymbolicLinks.h
@@ -8,6 +8,6 @@ namespace edm {
   // fullPath will not be modified.
 
   void resolveSymbolicLinks(std::string& fullPath);
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Utilities/interface/thread_safety_macros.h b/FWCore/Utilities/interface/thread_safety_macros.h
index e8f524074320a..4234e8bb5794f 100644
--- a/FWCore/Utilities/interface/thread_safety_macros.h
+++ b/FWCore/Utilities/interface/thread_safety_macros.h
@@ -1,9 +1,9 @@
-#ifndef FWCore_Utilites_thread_safe_macros_h 
-#define FWCore_Utilites_thread_safe_macros_h 
-#if ! defined __ROOTCLING__ && ! defined __INTEL_COMPILER && ! defined __NVCC__
+#ifndef FWCore_Utilites_thread_safe_macros_h
+#define FWCore_Utilites_thread_safe_macros_h
+#if !defined __ROOTCLING__ && !defined __INTEL_COMPILER && !defined __NVCC__
 #define CMS_THREAD_SAFE [[cms::thread_safe]]
 #define CMS_THREAD_GUARD(_var_) [[cms::thread_guard(#_var_)]]
-#else 
+#else
 #define CMS_THREAD_SAFE
 #define CMS_THREAD_GUARD(_var_)
 #endif
diff --git a/FWCore/Utilities/interface/transform.h b/FWCore/Utilities/interface/transform.h
index 9ab21b7c518da..f7b4e3e07af60 100644
--- a/FWCore/Utilities/interface/transform.h
+++ b/FWCore/Utilities/interface/transform.h
@@ -8,16 +8,17 @@ namespace edm {
 
   // helper template function to build a vector applying a transformation to the elements of an input vector
   template <typename InputType, typename Function>
-  auto vector_transform(std::vector<InputType> const & input, Function predicate) -> std::vector<typename std::remove_cv<typename std::remove_reference<decltype(predicate(input.front()))>::type>::type>
-  {
-    using ReturnType = typename std::remove_cv<typename std::remove_reference<decltype(predicate(input.front()))>::type>::type;
+  auto vector_transform(std::vector<InputType> const& input, Function predicate) -> std::vector<
+      typename std::remove_cv<typename std::remove_reference<decltype(predicate(input.front()))>::type>::type> {
+    using ReturnType =
+        typename std::remove_cv<typename std::remove_reference<decltype(predicate(input.front()))>::type>::type;
     std::vector<ReturnType> output;
-    output.reserve( input.size() );
-    for (auto const & element : input)
+    output.reserve(input.size());
+    for (auto const& element : input)
       output.push_back(predicate(element));
     return output;
   }
 
-} // namespace edm
+}  // namespace edm
 
-#endif // FWCore_Utilities_transform_h
+#endif  // FWCore_Utilities_transform_h
diff --git a/FWCore/Utilities/interface/typedefs.h b/FWCore/Utilities/interface/typedefs.h
index b0ce1fdc183b0..883011a9d4d1b 100644
--- a/FWCore/Utilities/interface/typedefs.h
+++ b/FWCore/Utilities/interface/typedefs.h
@@ -16,4 +16,4 @@ typedef unsigned int cms_uint32_t;
 typedef long long cms_int64_t;
 typedef unsigned long long cms_uint64_t;
 
-#endif 
+#endif
diff --git a/FWCore/Utilities/interface/typelookup.h b/FWCore/Utilities/interface/typelookup.h
index b20ae1c29a35e..21b6c4cb2f320 100644
--- a/FWCore/Utilities/interface/typelookup.h
+++ b/FWCore/Utilities/interface/typelookup.h
@@ -4,7 +4,7 @@
 //
 // Package:     Utilities
 // Class  :     typelookup
-// 
+//
 /**\class typelookup typelookup.h FWCore/Utilities/interface/typelookup.h
 
  Description: Allow looking up a c++ type_info via its name
@@ -47,54 +47,60 @@
 // user include files
 
 namespace edm {
-   class TypeIDBase;
-   
-   namespace typelookup
-   {
-      /**Returns a std::type_info and a long lived const char* containing the name 
+  class TypeIDBase;
+
+  namespace typelookup {
+    /**Returns a std::type_info and a long lived const char* containing the name 
        associated with the string iClassName. If the string is not associated with a known 
        type then returns two null pointers */
-       std::pair<const char*, const std::type_info*> findType(const char* iClassName);
-      
-      /**Returns the registered string (usually the class name) for the type T
+    std::pair<const char*, const std::type_info*> findType(const char* iClassName);
+
+    /**Returns the registered string (usually the class name) for the type T
        */
-      template <typename T>
-      const char* className();
+    template <typename T>
+    const char* className();
 
-      /**Returns the std::type_info for the class T.  This is done just by calling
+    /**Returns the std::type_info for the class T.  This is done just by calling
        typeid(T).  So why bother? The call to typeid(T) requires one to include the
        header file which defines class T while the call to classTypeInfo<T>() does not.
        */
-      template <typename T>
-      const std::type_info& classTypeInfo();
+    template <typename T>
+    const std::type_info& classTypeInfo();
 
-      /**Used to create file static variables which register the string iTypeName to the C++ class
+    /**Used to create file static variables which register the string iTypeName to the C++ class
        type associated to the std::type_info.
        */
-      class NameRegistrar {
-      public:
-         NameRegistrar(const char* iTypeName,const std::type_info& iInfo);
-      };
-      
-   }
-}
-
-#define TYPELOOKUP_METHODS(Tname) \
-namespace edm { namespace typelookup { \
-template<> const char* className< Tname >() \
-{ return #Tname ; } \
-template<> const std::type_info& classTypeInfo< Tname > () \
-{ return typeid( Tname ); } } }
+    class NameRegistrar {
+    public:
+      NameRegistrar(const char* iTypeName, const std::type_info& iInfo);
+    };
 
+  }  // namespace typelookup
+}  // namespace edm
 
-#define EDM_TYPELOOKUP_SYM(x,y) EDM_TYPELOOKUP_SYM2(x,y)
-#define EDM_TYPELOOKUP_SYM2(x,y) x ## y
+#define TYPELOOKUP_METHODS(Tname)                    \
+  namespace edm {                                    \
+    namespace typelookup {                           \
+      template <>                                    \
+      const char* className<Tname>() {               \
+        return #Tname;                               \
+      }                                              \
+      template <>                                    \
+      const std::type_info& classTypeInfo<Tname>() { \
+        return typeid(Tname);                        \
+      }                                              \
+    }                                                \
+  }
 
-#define DEFINE_TYPELOOKUP_REGISTRATION(type) \
-static const edm::typelookup::NameRegistrar EDM_TYPELOOKUP_SYM(s_register , __LINE__ ) (edm::typelookup::className<type>(),typeid(type))
+#define EDM_TYPELOOKUP_SYM(x, y) EDM_TYPELOOKUP_SYM2(x, y)
+#define EDM_TYPELOOKUP_SYM2(x, y) x##y
 
-#define TYPELOOKUP_DATA_REG(_dataclass_) TYPELOOKUP_METHODS(_dataclass_) \
-DEFINE_TYPELOOKUP_REGISTRATION(_dataclass_)
+#define DEFINE_TYPELOOKUP_REGISTRATION(type)                                            \
+  static const edm::typelookup::NameRegistrar EDM_TYPELOOKUP_SYM(s_register, __LINE__)( \
+      edm::typelookup::className<type>(), typeid(type))
 
+#define TYPELOOKUP_DATA_REG(_dataclass_) \
+  TYPELOOKUP_METHODS(_dataclass_)        \
+  DEFINE_TYPELOOKUP_REGISTRATION(_dataclass_)
 
 #endif
diff --git a/FWCore/Utilities/interface/value_ptr.h b/FWCore/Utilities/interface/value_ptr.h
index 937e309e3ea76..16db1902fa527 100644
--- a/FWCore/Utilities/interface/value_ptr.h
+++ b/FWCore/Utilities/interface/value_ptr.h
@@ -32,7 +32,7 @@
 //
 // ----------------------------------------------------------------------
 
-#include <algorithm> // for std::swap()
+#include <algorithm>  // for std::swap()
 #include <memory>
 #include "FWCore/Utilities/interface/get_underlying_safe.h"
 #include "FWCore/Utilities/interface/propagate_const.h"
@@ -47,7 +47,6 @@ namespace edm {
   //
   // --------------------------------------------------------------------
 
-
   template <typename T>
   struct value_ptr_traits {
     static T* clone(T const* p) { return new T(*p); }
@@ -60,27 +59,22 @@ namespace edm {
   //
   // --------------------------------------------------------------------
 
-
   template <typename T>
   class value_ptr {
-
   public:
-
     // --------------------------------------------------
     // Default constructor/destructor:
     // --------------------------------------------------
 
-    value_ptr() : myP(nullptr) { }
-    explicit value_ptr(T* p) : myP(p) { }
+    value_ptr() : myP(nullptr) {}
+    explicit value_ptr(T* p) : myP(p) {}
     ~value_ptr() { value_ptr_traits<T>::destroy(myP.get()); }
 
     // --------------------------------------------------
     // Copy constructor/copy assignment:
     // --------------------------------------------------
 
-    value_ptr(value_ptr const& orig) :
-      myP(createFrom(get_underlying_safe(orig.myP))) {
-    }
+    value_ptr(value_ptr const& orig) : myP(createFrom(get_underlying_safe(orig.myP))) {}
 
     value_ptr& operator=(value_ptr const& orig) {
       value_ptr<T> temp(orig);
@@ -92,15 +86,14 @@ namespace edm {
     // Move constructor/move assignment:
     // --------------------------------------------------
 
-    value_ptr(value_ptr&& orig) :
-      myP(orig.myP) { orig.myP=nullptr; }
+    value_ptr(value_ptr&& orig) : myP(orig.myP) { orig.myP = nullptr; }
 
     value_ptr& operator=(value_ptr&& orig) {
-      if (myP!=orig.myP) {
+      if (myP != orig.myP) {
         delete myP.get();
-        myP=orig.myP;
-        orig.myP=nullptr;
-      } 
+        myP = orig.myP;
+        orig.myP = nullptr;
+      }
       return *this;
     }
 
@@ -124,9 +117,7 @@ namespace edm {
     // --------------------------------------------------
 
     template <typename U>
-    value_ptr(value_ptr<U> const& orig) :
-      myP(createFrom(orig.operator->())) {
-    }
+    value_ptr(value_ptr<U> const& orig) : myP(createFrom(orig.operator->())) {}
 
     template <typename U>
     value_ptr& operator=(value_ptr<U> const& orig) {
@@ -139,8 +130,7 @@ namespace edm {
     // Move-like construct/assign from unique_ptr<>:
     // --------------------------------------------------
 
-    value_ptr(std::unique_ptr<T> orig) :
-      myP(orig.release()) { orig=nullptr; }
+    value_ptr(std::unique_ptr<T> orig) : myP(orig.release()) { orig = nullptr; }
 
     value_ptr& operator=(std::unique_ptr<T> orig) {
       value_ptr<T> temp(std::move(orig));
@@ -148,34 +138,29 @@ namespace edm {
       return *this;
     }
 
-  // The following typedef, function, and operator definition
-  // support the following syntax:
-  //   value_ptr<T> ptr(..);
-  //   if (ptr) { ...
-  // Where the conditional will evaluate as true if and only if the
-  // pointer value_ptr contains is not null.
+    // The following typedef, function, and operator definition
+    // support the following syntax:
+    //   value_ptr<T> ptr(..);
+    //   if (ptr) { ...
+    // Where the conditional will evaluate as true if and only if the
+    // pointer value_ptr contains is not null.
   private:
     typedef void (value_ptr::*bool_type)() const;
     void this_type_does_not_support_comparisons() const {}
 
   public:
     operator bool_type() const {
-      return myP != nullptr ?
-        &value_ptr<T>::this_type_does_not_support_comparisons : nullptr;
+      return myP != nullptr ? &value_ptr<T>::this_type_does_not_support_comparisons : nullptr;
     }
 
   private:
-
     // --------------------------------------------------
     // Implementation aid:
     // --------------------------------------------------
 
     template <typename U>
-    static T*
-    createFrom(U const* p) {
-      return p
-	? value_ptr_traits<U>::clone(p)
-	: nullptr;
+    static T* createFrom(U const* p) {
+      return p ? value_ptr_traits<U>::clone(p) : nullptr;
     }
 
     // --------------------------------------------------
@@ -184,8 +169,7 @@ namespace edm {
 
     edm::propagate_const<T*> myP;
 
-  }; // value_ptr
-
+  };  // value_ptr
 
   // --------------------------------------------------------------------
   //
@@ -194,9 +178,9 @@ namespace edm {
   // --------------------------------------------------------------------
 
   template <typename T>
-  inline
-  void
-  swap(value_ptr<T>& vp1, value_ptr<T>& vp2) { vp1.swap(vp2); }
+  inline void swap(value_ptr<T>& vp1, value_ptr<T>& vp2) {
+    vp1.swap(vp2);
+  }
 
   // Do not allow nonsensical comparisons that the bool_type
   // conversion operator definition above would otherwise allow.
@@ -205,28 +189,27 @@ namespace edm {
   // instantiate these 4 operators.
   template <typename T, typename U>
   inline bool operator==(value_ptr<T> const& lhs, U const& rhs) {
-    lhs.this_type_does_not_support_comparisons();	
-    return false;	
+    lhs.this_type_does_not_support_comparisons();
+    return false;
   }
 
   template <typename T, typename U>
   inline bool operator!=(value_ptr<T> const& lhs, U const& rhs) {
-    lhs.this_type_does_not_support_comparisons();	
-    return false;	
+    lhs.this_type_does_not_support_comparisons();
+    return false;
   }
 
   template <typename T, typename U>
   inline bool operator==(U const& lhs, value_ptr<T> const& rhs) {
-    rhs.this_type_does_not_support_comparisons();	
-    return false;	
+    rhs.this_type_does_not_support_comparisons();
+    return false;
   }
 
   template <typename T, typename U>
   inline bool operator!=(U const& lhs, value_ptr<T> const& rhs) {
-    rhs.this_type_does_not_support_comparisons();	
-    return false;	
+    rhs.this_type_does_not_support_comparisons();
+    return false;
   }
-}
-
+}  // namespace edm
 
-#endif // FWCoreUtilities_value_ptr_h
+#endif  // FWCoreUtilities_value_ptr_h
diff --git a/FWCore/Utilities/src/Adler32Calculator.cc b/FWCore/Utilities/src/Adler32Calculator.cc
index 0a2c28a229b09..cd0896e29438b 100644
--- a/FWCore/Utilities/src/Adler32Calculator.cc
+++ b/FWCore/Utilities/src/Adler32Calculator.cc
@@ -3,16 +3,15 @@
 namespace cms {
 
   //-------------------------------------------------------
-  // the following is adapted from 
+  // the following is adapted from
   // http://en.wikipedia.org/wiki/Adler-32
   //-------------------------------------------------------
-  
-  void
-  Adler32(char const* data, size_t len, uint32_t& a, uint32_t& b) {
-   /* data: Pointer to the data to be summed; len is in bytes */
-  
-    #define MOD_ADLER 65521
-   
+
+  void Adler32(char const* data, size_t len, uint32_t& a, uint32_t& b) {
+    /* data: Pointer to the data to be summed; len is in bytes */
+
+#define MOD_ADLER 65521
+
     unsigned char const* ptr = static_cast<unsigned char const*>(static_cast<void const*>(data));
     while (len > 0) {
       size_t tlen = (len > 5552 ? 5552 : len);
@@ -21,19 +20,18 @@ namespace cms {
         a += *ptr++;
         b += a;
       } while (--tlen);
-      
+
       a %= MOD_ADLER;
       b %= MOD_ADLER;
     }
-  
-    #undef MOD_ADLER
+
+#undef MOD_ADLER
   }
-  
-  uint32_t
-  Adler32(char const* data, size_t len) {
-   /* data: Pointer to the data to be summed; len is in bytes */
+
+  uint32_t Adler32(char const* data, size_t len) {
+    /* data: Pointer to the data to be summed; len is in bytes */
     uint32_t a = 1, b = 0;
     Adler32(data, len, a, b);
     return (b << 16) | a;
   }
-}
+}  // namespace cms
diff --git a/FWCore/Utilities/src/BaseWithDict.cc b/FWCore/Utilities/src/BaseWithDict.cc
index ef2e63ff27c6d..2034bba94dbac 100644
--- a/FWCore/Utilities/src/BaseWithDict.cc
+++ b/FWCore/Utilities/src/BaseWithDict.cc
@@ -6,30 +6,16 @@
 
 namespace edm {
 
-  BaseWithDict::BaseWithDict() : baseClass_(nullptr) {
-  }
+  BaseWithDict::BaseWithDict() : baseClass_(nullptr) {}
 
-  BaseWithDict::BaseWithDict(TBaseClass* baseClass) : baseClass_(baseClass) {
-  }
+  BaseWithDict::BaseWithDict(TBaseClass* baseClass) : baseClass_(baseClass) {}
 
-  bool
-  BaseWithDict::isPublic() const {
-    return baseClass_->Property() & kIsPublic;
-  }
+  bool BaseWithDict::isPublic() const { return baseClass_->Property() & kIsPublic; }
 
-  std::string
-  BaseWithDict::name() const {
-    return baseClass_->GetName();
-  }
+  std::string BaseWithDict::name() const { return baseClass_->GetName(); }
 
-  TypeWithDict
-  BaseWithDict::typeOf() const {
-    return TypeWithDict(baseClass_->GetClassPointer());
-  }
+  TypeWithDict BaseWithDict::typeOf() const { return TypeWithDict(baseClass_->GetClassPointer()); }
 
-  size_t
-  BaseWithDict::offset() const {
-    return static_cast<size_t>(baseClass_->GetDelta());
-  }
+  size_t BaseWithDict::offset() const { return static_cast<size_t>(baseClass_->GetDelta()); }
 
-} // namespace edm
+}  // namespace edm
diff --git a/FWCore/Utilities/src/CPUServiceBase.cc b/FWCore/Utilities/src/CPUServiceBase.cc
index fa1376f1e2e0e..ea4f886f7e637 100644
--- a/FWCore/Utilities/src/CPUServiceBase.cc
+++ b/FWCore/Utilities/src/CPUServiceBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Subsystem/Package
 // Class  :     CPUServiceBase
-// 
+//
 // Implementation:
 //     Stub class information for CPU service.
 //
@@ -23,10 +23,6 @@ using namespace edm;
 //
 // constructors and destructor
 //
-CPUServiceBase::CPUServiceBase()
-{
-}
+CPUServiceBase::CPUServiceBase() {}
 
-CPUServiceBase::~CPUServiceBase()
-{
-}
+CPUServiceBase::~CPUServiceBase() {}
diff --git a/FWCore/Utilities/src/CPUTimer.cc b/FWCore/Utilities/src/CPUTimer.cc
index 44faead19f0c4..1c68f0acc59f8 100644
--- a/FWCore/Utilities/src/CPUTimer.cc
+++ b/FWCore/Utilities/src/CPUTimer.cc
@@ -30,22 +30,18 @@ using namespace edm;
 //
 // constructors and destructor
 //
-CPUTimer::CPUTimer() :
-state_(kStopped),
-startRealTime_(),
-startCPUTime_(),
-accumulatedRealTime_(0),
-accumulatedCPUTime_(0) {
+CPUTimer::CPUTimer()
+    : state_(kStopped), startRealTime_(), startCPUTime_(), accumulatedRealTime_(0), accumulatedCPUTime_(0) {
 #ifdef USE_CLOCK_GETTIME
-  startRealTime_.tv_sec=0;
-  startRealTime_.tv_nsec=0;
-  startCPUTime_.tv_sec=0;
-  startCPUTime_.tv_nsec=0;
+  startRealTime_.tv_sec = 0;
+  startRealTime_.tv_nsec = 0;
+  startCPUTime_.tv_sec = 0;
+  startCPUTime_.tv_nsec = 0;
 #else
-  startRealTime_.tv_sec=0;
-  startRealTime_.tv_usec=0;
-  startCPUTime_.tv_sec=0;
-  startCPUTime_.tv_usec=0;
+  startRealTime_.tv_sec = 0;
+  startRealTime_.tv_usec = 0;
+  startCPUTime_.tv_sec = 0;
+  startCPUTime_.tv_usec = 0;
 #endif
 }
 
@@ -53,8 +49,7 @@ accumulatedCPUTime_(0) {
 //    // do actual copying here;
 // }
 
-CPUTimer::~CPUTimer() {
-}
+CPUTimer::~CPUTimer() {}
 
 //
 // assignment operators
@@ -70,9 +65,8 @@ CPUTimer::~CPUTimer() {
 //
 // member functions
 //
-void
-CPUTimer::start() {
-  if(kStopped == state_) {
+void CPUTimer::start() {
+  if (kStopped == state_) {
 #ifdef USE_CLOCK_GETTIME
     clock_gettime(CLOCK_MONOTONIC, &startRealTime_);
     clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &startCPUTime_);
@@ -80,43 +74,39 @@ CPUTimer::start() {
     gettimeofday(&startRealTime_, 0);
 
     rusage theUsage;
-    if(0 != getrusage(RUSAGE_SELF, &theUsage)) {
-      throw cms::Exception("CPUTimerFailed")<<errno;
+    if (0 != getrusage(RUSAGE_SELF, &theUsage)) {
+      throw cms::Exception("CPUTimerFailed") << errno;
     }
-    startCPUTime_.tv_sec  = theUsage.ru_stime.tv_sec  + theUsage.ru_utime.tv_sec;
+    startCPUTime_.tv_sec = theUsage.ru_stime.tv_sec + theUsage.ru_utime.tv_sec;
     startCPUTime_.tv_usec = theUsage.ru_stime.tv_usec + theUsage.ru_utime.tv_usec;
 #endif
     state_ = kRunning;
   }
 }
 
-CPUTimer::Times
-CPUTimer::stop() {
-  if(kRunning == state_) {
+CPUTimer::Times CPUTimer::stop() {
+  if (kRunning == state_) {
     Times t = calculateDeltaTime();
     accumulatedCPUTime_ += t.cpu_;
     accumulatedRealTime_ += t.real_;
 
-    state_=kStopped;
+    state_ = kStopped;
     return t;
   }
   return Times();
 }
 
-void
-CPUTimer::reset() {
+void CPUTimer::reset() {
   accumulatedCPUTime_ = 0;
   accumulatedRealTime_ = 0;
 }
 
-void
-CPUTimer::add(CPUTimer::Times const& t) {
+void CPUTimer::add(CPUTimer::Times const& t) {
   accumulatedCPUTime_ += t.cpu_;
   accumulatedRealTime_ += t.real_;
 }
 
-CPUTimer::Times
-CPUTimer::calculateDeltaTime() const {
+CPUTimer::Times CPUTimer::calculateDeltaTime() const {
   Times returnValue;
 #ifdef USE_CLOCK_GETTIME
   double const nanosecToSec = 1E-9;
@@ -129,7 +119,7 @@ CPUTimer::calculateDeltaTime() const {
   returnValue.real_ = tp.tv_sec - startRealTime_.tv_sec + nanosecToSec * (tp.tv_nsec - startRealTime_.tv_nsec);
 #else
   rusage theUsage;
-  if(0 != getrusage(RUSAGE_SELF, &theUsage)) {
+  if (0 != getrusage(RUSAGE_SELF, &theUsage)) {
     throw cms::Exception("CPUTimerFailed") << errno;
   }
   double const microsecToSec = 1E-6;
@@ -146,17 +136,15 @@ CPUTimer::calculateDeltaTime() const {
 //
 // const member functions
 //
-double
-CPUTimer::realTime() const {
-  if(kStopped == state_) {
+double CPUTimer::realTime() const {
+  if (kStopped == state_) {
     return accumulatedRealTime_;
   }
   return accumulatedRealTime_ + calculateDeltaTime().real_;
 }
 
-double
-CPUTimer::cpuTime() const {
-  if(kStopped == state_) {
+double CPUTimer::cpuTime() const {
+  if (kStopped == state_) {
     return accumulatedCPUTime_;
   }
   return accumulatedCPUTime_ + calculateDeltaTime().cpu_;
diff --git a/FWCore/Utilities/src/CRC32Calculator.cc b/FWCore/Utilities/src/CRC32Calculator.cc
index 25cf00f0aa538..f08e7be261b50 100644
--- a/FWCore/Utilities/src/CRC32Calculator.cc
+++ b/FWCore/Utilities/src/CRC32Calculator.cc
@@ -1,7 +1,6 @@
 
 #include "FWCore/Utilities/interface/CRC32Calculator.h"
 
-
 namespace cms {
 
   namespace {
@@ -9,77 +8,42 @@ namespace cms {
     const std::uint32_t CRC32_XINIT = 0xFFFFFFFFL;
     const std::uint32_t CRC32_XOROT = 0xFFFFFFFFL;
 
-    const std::uint32_t crctable[256] =
-    {
-      0x00000000L, 0x77073096L, 0xEE0E612CL, 0x990951BAL,
-      0x076DC419L, 0x706AF48FL, 0xE963A535L, 0x9E6495A3L,
-      0x0EDB8832L, 0x79DCB8A4L, 0xE0D5E91EL, 0x97D2D988L,
-      0x09B64C2BL, 0x7EB17CBDL, 0xE7B82D07L, 0x90BF1D91L,
-      0x1DB71064L, 0x6AB020F2L, 0xF3B97148L, 0x84BE41DEL,
-      0x1ADAD47DL, 0x6DDDE4EBL, 0xF4D4B551L, 0x83D385C7L,
-      0x136C9856L, 0x646BA8C0L, 0xFD62F97AL, 0x8A65C9ECL,
-      0x14015C4FL, 0x63066CD9L, 0xFA0F3D63L, 0x8D080DF5L,
-      0x3B6E20C8L, 0x4C69105EL, 0xD56041E4L, 0xA2677172L,
-      0x3C03E4D1L, 0x4B04D447L, 0xD20D85FDL, 0xA50AB56BL,
-      0x35B5A8FAL, 0x42B2986CL, 0xDBBBC9D6L, 0xACBCF940L,
-      0x32D86CE3L, 0x45DF5C75L, 0xDCD60DCFL, 0xABD13D59L,
-      0x26D930ACL, 0x51DE003AL, 0xC8D75180L, 0xBFD06116L,
-      0x21B4F4B5L, 0x56B3C423L, 0xCFBA9599L, 0xB8BDA50FL,
-      0x2802B89EL, 0x5F058808L, 0xC60CD9B2L, 0xB10BE924L,
-      0x2F6F7C87L, 0x58684C11L, 0xC1611DABL, 0xB6662D3DL,
-      0x76DC4190L, 0x01DB7106L, 0x98D220BCL, 0xEFD5102AL,
-      0x71B18589L, 0x06B6B51FL, 0x9FBFE4A5L, 0xE8B8D433L,
-      0x7807C9A2L, 0x0F00F934L, 0x9609A88EL, 0xE10E9818L,
-      0x7F6A0DBBL, 0x086D3D2DL, 0x91646C97L, 0xE6635C01L,
-      0x6B6B51F4L, 0x1C6C6162L, 0x856530D8L, 0xF262004EL,
-      0x6C0695EDL, 0x1B01A57BL, 0x8208F4C1L, 0xF50FC457L,
-      0x65B0D9C6L, 0x12B7E950L, 0x8BBEB8EAL, 0xFCB9887CL,
-      0x62DD1DDFL, 0x15DA2D49L, 0x8CD37CF3L, 0xFBD44C65L,
-      0x4DB26158L, 0x3AB551CEL, 0xA3BC0074L, 0xD4BB30E2L,
-      0x4ADFA541L, 0x3DD895D7L, 0xA4D1C46DL, 0xD3D6F4FBL,
-      0x4369E96AL, 0x346ED9FCL, 0xAD678846L, 0xDA60B8D0L,
-      0x44042D73L, 0x33031DE5L, 0xAA0A4C5FL, 0xDD0D7CC9L,
-      0x5005713CL, 0x270241AAL, 0xBE0B1010L, 0xC90C2086L,
-      0x5768B525L, 0x206F85B3L, 0xB966D409L, 0xCE61E49FL,
-      0x5EDEF90EL, 0x29D9C998L, 0xB0D09822L, 0xC7D7A8B4L,
-      0x59B33D17L, 0x2EB40D81L, 0xB7BD5C3BL, 0xC0BA6CADL,
-      0xEDB88320L, 0x9ABFB3B6L, 0x03B6E20CL, 0x74B1D29AL,
-      0xEAD54739L, 0x9DD277AFL, 0x04DB2615L, 0x73DC1683L,
-      0xE3630B12L, 0x94643B84L, 0x0D6D6A3EL, 0x7A6A5AA8L,
-      0xE40ECF0BL, 0x9309FF9DL, 0x0A00AE27L, 0x7D079EB1L,
-      0xF00F9344L, 0x8708A3D2L, 0x1E01F268L, 0x6906C2FEL,
-      0xF762575DL, 0x806567CBL, 0x196C3671L, 0x6E6B06E7L,
-      0xFED41B76L, 0x89D32BE0L, 0x10DA7A5AL, 0x67DD4ACCL,
-      0xF9B9DF6FL, 0x8EBEEFF9L, 0x17B7BE43L, 0x60B08ED5L,
-      0xD6D6A3E8L, 0xA1D1937EL, 0x38D8C2C4L, 0x4FDFF252L,
-      0xD1BB67F1L, 0xA6BC5767L, 0x3FB506DDL, 0x48B2364BL,
-      0xD80D2BDAL, 0xAF0A1B4CL, 0x36034AF6L, 0x41047A60L,
-      0xDF60EFC3L, 0xA867DF55L, 0x316E8EEFL, 0x4669BE79L,
-      0xCB61B38CL, 0xBC66831AL, 0x256FD2A0L, 0x5268E236L,
-      0xCC0C7795L, 0xBB0B4703L, 0x220216B9L, 0x5505262FL,
-      0xC5BA3BBEL, 0xB2BD0B28L, 0x2BB45A92L, 0x5CB36A04L,
-      0xC2D7FFA7L, 0xB5D0CF31L, 0x2CD99E8BL, 0x5BDEAE1DL,
-      0x9B64C2B0L, 0xEC63F226L, 0x756AA39CL, 0x026D930AL,
-      0x9C0906A9L, 0xEB0E363FL, 0x72076785L, 0x05005713L,
-      0x95BF4A82L, 0xE2B87A14L, 0x7BB12BAEL, 0x0CB61B38L,
-      0x92D28E9BL, 0xE5D5BE0DL, 0x7CDCEFB7L, 0x0BDBDF21L,
-      0x86D3D2D4L, 0xF1D4E242L, 0x68DDB3F8L, 0x1FDA836EL,
-      0x81BE16CDL, 0xF6B9265BL, 0x6FB077E1L, 0x18B74777L,
-      0x88085AE6L, 0xFF0F6A70L, 0x66063BCAL, 0x11010B5CL,
-      0x8F659EFFL, 0xF862AE69L, 0x616BFFD3L, 0x166CCF45L,
-      0xA00AE278L, 0xD70DD2EEL, 0x4E048354L, 0x3903B3C2L,
-      0xA7672661L, 0xD06016F7L, 0x4969474DL, 0x3E6E77DBL,
-      0xAED16A4AL, 0xD9D65ADCL, 0x40DF0B66L, 0x37D83BF0L,
-      0xA9BCAE53L, 0xDEBB9EC5L, 0x47B2CF7FL, 0x30B5FFE9L,
-      0xBDBDF21CL, 0xCABAC28AL, 0x53B39330L, 0x24B4A3A6L,
-      0xBAD03605L, 0xCDD70693L, 0x54DE5729L, 0x23D967BFL,
-      0xB3667A2EL, 0xC4614AB8L, 0x5D681B02L, 0x2A6F2B94L,
-      0xB40BBE37L, 0xC30C8EA1L, 0x5A05DF1BL, 0x2D02EF8DL
-    };
-  }
+    const std::uint32_t crctable[256] = {
+        0x00000000L, 0x77073096L, 0xEE0E612CL, 0x990951BAL, 0x076DC419L, 0x706AF48FL, 0xE963A535L, 0x9E6495A3L,
+        0x0EDB8832L, 0x79DCB8A4L, 0xE0D5E91EL, 0x97D2D988L, 0x09B64C2BL, 0x7EB17CBDL, 0xE7B82D07L, 0x90BF1D91L,
+        0x1DB71064L, 0x6AB020F2L, 0xF3B97148L, 0x84BE41DEL, 0x1ADAD47DL, 0x6DDDE4EBL, 0xF4D4B551L, 0x83D385C7L,
+        0x136C9856L, 0x646BA8C0L, 0xFD62F97AL, 0x8A65C9ECL, 0x14015C4FL, 0x63066CD9L, 0xFA0F3D63L, 0x8D080DF5L,
+        0x3B6E20C8L, 0x4C69105EL, 0xD56041E4L, 0xA2677172L, 0x3C03E4D1L, 0x4B04D447L, 0xD20D85FDL, 0xA50AB56BL,
+        0x35B5A8FAL, 0x42B2986CL, 0xDBBBC9D6L, 0xACBCF940L, 0x32D86CE3L, 0x45DF5C75L, 0xDCD60DCFL, 0xABD13D59L,
+        0x26D930ACL, 0x51DE003AL, 0xC8D75180L, 0xBFD06116L, 0x21B4F4B5L, 0x56B3C423L, 0xCFBA9599L, 0xB8BDA50FL,
+        0x2802B89EL, 0x5F058808L, 0xC60CD9B2L, 0xB10BE924L, 0x2F6F7C87L, 0x58684C11L, 0xC1611DABL, 0xB6662D3DL,
+        0x76DC4190L, 0x01DB7106L, 0x98D220BCL, 0xEFD5102AL, 0x71B18589L, 0x06B6B51FL, 0x9FBFE4A5L, 0xE8B8D433L,
+        0x7807C9A2L, 0x0F00F934L, 0x9609A88EL, 0xE10E9818L, 0x7F6A0DBBL, 0x086D3D2DL, 0x91646C97L, 0xE6635C01L,
+        0x6B6B51F4L, 0x1C6C6162L, 0x856530D8L, 0xF262004EL, 0x6C0695EDL, 0x1B01A57BL, 0x8208F4C1L, 0xF50FC457L,
+        0x65B0D9C6L, 0x12B7E950L, 0x8BBEB8EAL, 0xFCB9887CL, 0x62DD1DDFL, 0x15DA2D49L, 0x8CD37CF3L, 0xFBD44C65L,
+        0x4DB26158L, 0x3AB551CEL, 0xA3BC0074L, 0xD4BB30E2L, 0x4ADFA541L, 0x3DD895D7L, 0xA4D1C46DL, 0xD3D6F4FBL,
+        0x4369E96AL, 0x346ED9FCL, 0xAD678846L, 0xDA60B8D0L, 0x44042D73L, 0x33031DE5L, 0xAA0A4C5FL, 0xDD0D7CC9L,
+        0x5005713CL, 0x270241AAL, 0xBE0B1010L, 0xC90C2086L, 0x5768B525L, 0x206F85B3L, 0xB966D409L, 0xCE61E49FL,
+        0x5EDEF90EL, 0x29D9C998L, 0xB0D09822L, 0xC7D7A8B4L, 0x59B33D17L, 0x2EB40D81L, 0xB7BD5C3BL, 0xC0BA6CADL,
+        0xEDB88320L, 0x9ABFB3B6L, 0x03B6E20CL, 0x74B1D29AL, 0xEAD54739L, 0x9DD277AFL, 0x04DB2615L, 0x73DC1683L,
+        0xE3630B12L, 0x94643B84L, 0x0D6D6A3EL, 0x7A6A5AA8L, 0xE40ECF0BL, 0x9309FF9DL, 0x0A00AE27L, 0x7D079EB1L,
+        0xF00F9344L, 0x8708A3D2L, 0x1E01F268L, 0x6906C2FEL, 0xF762575DL, 0x806567CBL, 0x196C3671L, 0x6E6B06E7L,
+        0xFED41B76L, 0x89D32BE0L, 0x10DA7A5AL, 0x67DD4ACCL, 0xF9B9DF6FL, 0x8EBEEFF9L, 0x17B7BE43L, 0x60B08ED5L,
+        0xD6D6A3E8L, 0xA1D1937EL, 0x38D8C2C4L, 0x4FDFF252L, 0xD1BB67F1L, 0xA6BC5767L, 0x3FB506DDL, 0x48B2364BL,
+        0xD80D2BDAL, 0xAF0A1B4CL, 0x36034AF6L, 0x41047A60L, 0xDF60EFC3L, 0xA867DF55L, 0x316E8EEFL, 0x4669BE79L,
+        0xCB61B38CL, 0xBC66831AL, 0x256FD2A0L, 0x5268E236L, 0xCC0C7795L, 0xBB0B4703L, 0x220216B9L, 0x5505262FL,
+        0xC5BA3BBEL, 0xB2BD0B28L, 0x2BB45A92L, 0x5CB36A04L, 0xC2D7FFA7L, 0xB5D0CF31L, 0x2CD99E8BL, 0x5BDEAE1DL,
+        0x9B64C2B0L, 0xEC63F226L, 0x756AA39CL, 0x026D930AL, 0x9C0906A9L, 0xEB0E363FL, 0x72076785L, 0x05005713L,
+        0x95BF4A82L, 0xE2B87A14L, 0x7BB12BAEL, 0x0CB61B38L, 0x92D28E9BL, 0xE5D5BE0DL, 0x7CDCEFB7L, 0x0BDBDF21L,
+        0x86D3D2D4L, 0xF1D4E242L, 0x68DDB3F8L, 0x1FDA836EL, 0x81BE16CDL, 0xF6B9265BL, 0x6FB077E1L, 0x18B74777L,
+        0x88085AE6L, 0xFF0F6A70L, 0x66063BCAL, 0x11010B5CL, 0x8F659EFFL, 0xF862AE69L, 0x616BFFD3L, 0x166CCF45L,
+        0xA00AE278L, 0xD70DD2EEL, 0x4E048354L, 0x3903B3C2L, 0xA7672661L, 0xD06016F7L, 0x4969474DL, 0x3E6E77DBL,
+        0xAED16A4AL, 0xD9D65ADCL, 0x40DF0B66L, 0x37D83BF0L, 0xA9BCAE53L, 0xDEBB9EC5L, 0x47B2CF7FL, 0x30B5FFE9L,
+        0xBDBDF21CL, 0xCABAC28AL, 0x53B39330L, 0x24B4A3A6L, 0xBAD03605L, 0xCDD70693L, 0x54DE5729L, 0x23D967BFL,
+        0xB3667A2EL, 0xC4614AB8L, 0x5D681B02L, 0x2A6F2B94L, 0xB40BBE37L, 0xC30C8EA1L, 0x5A05DF1BL, 0x2D02EF8DL};
+  }  // namespace
 
   CRC32Calculator::CRC32Calculator(std::string const& message) {
-
     /* initialize value */
     checksum_ = CRC32_XINIT;
 
@@ -94,4 +58,4 @@ namespace cms {
     /* return XOR out value */
     checksum_ = checksum_ ^ CRC32_XOROT;
   }
-}
+}  // namespace cms
diff --git a/FWCore/Utilities/src/ConvertException.cc b/FWCore/Utilities/src/ConvertException.cc
index ba3c5c4d21dcc..9db2618dbe53a 100644
--- a/FWCore/Utilities/src/ConvertException.cc
+++ b/FWCore/Utilities/src/ConvertException.cc
@@ -15,22 +15,19 @@ namespace edm {
 
   void convertException::stdToEDM(std::exception const& e) {
     edm::Exception ex(edm::errors::StdException);
-    ex << "A std::exception was thrown.\n"
-       << e.what();
+    ex << "A std::exception was thrown.\n" << e.what();
     throw ex;
   }
 
   void convertException::stringToEDM(std::string& s) {
     edm::Exception e(edm::errors::BadExceptionType);
-    e << "A std::string was thrown as an exception.\n"
-      << s;
+    e << "A std::string was thrown as an exception.\n" << s;
     throw e;
   }
 
   void convertException::charPtrToEDM(char const* c) {
     edm::Exception e(edm::errors::BadExceptionType);
-    e << "A const char* was thrown as an exception.\n"
-      << c;
+    e << "A const char* was thrown as an exception.\n" << c;
     throw e;
   }
 
@@ -39,4 +36,4 @@ namespace edm {
     e << "An exception of unknown type was thrown.\n";
     throw e;
   }
-}
+}  // namespace edm
diff --git a/FWCore/Utilities/src/DebugMacros.cc b/FWCore/Utilities/src/DebugMacros.cc
index be6bbaabf782a..66e4236304bf6 100644
--- a/FWCore/Utilities/src/DebugMacros.cc
+++ b/FWCore/Utilities/src/DebugMacros.cc
@@ -5,11 +5,8 @@
 
 namespace edm {
 
-  debugvalue::debugvalue():
-    cvalue_(getenv("PROC_DEBUG")),
-    value_(cvalue_==nullptr ? 0 : atoi(cvalue_))
-  { }
-  
+  debugvalue::debugvalue() : cvalue_(getenv("PROC_DEBUG")), value_(cvalue_ == nullptr ? 0 : atoi(cvalue_)) {}
+
   debugvalue debugit;
-  
-}
+
+}  // namespace edm
diff --git a/FWCore/Utilities/src/DictionaryTools.cc b/FWCore/Utilities/src/DictionaryTools.cc
index b84e7fd6ea193..a7e2db3a3b32d 100644
--- a/FWCore/Utilities/src/DictionaryTools.cc
+++ b/FWCore/Utilities/src/DictionaryTools.cc
@@ -64,10 +64,7 @@ to have dictionaries.
 
 namespace edm {
 
-  bool
-  checkDictionary(std::vector<std::string>& missingDictionaries,
-                  TypeID const& typeID) {
-
+  bool checkDictionary(std::vector<std::string>& missingDictionaries, TypeID const& typeID) {
     TClass::GetClass(typeID.typeInfo());
     if (!hasDictionary(typeID.typeInfo())) {
       // a second attempt to load
@@ -80,24 +77,21 @@ namespace edm {
     return true;
   }
 
-  bool checkDictionaryOfWrappedType(std::vector<std::string>& missingDictionaries,
-                                    TypeID const& unwrappedTypeID) {
+  bool checkDictionaryOfWrappedType(std::vector<std::string>& missingDictionaries, TypeID const& unwrappedTypeID) {
     std::string wrappedName = wrappedClassName(unwrappedTypeID.className());
     TypeWithDict wrappedTypeWithDict = TypeWithDict::byName(wrappedName);
     return checkDictionary(missingDictionaries, wrappedName, wrappedTypeWithDict);
   }
 
-  bool checkDictionaryOfWrappedType(std::vector<std::string>& missingDictionaries,
-                                    std::string const& unwrappedName) {
+  bool checkDictionaryOfWrappedType(std::vector<std::string>& missingDictionaries, std::string const& unwrappedName) {
     std::string wrappedName = wrappedClassName(unwrappedName);
     TypeWithDict wrappedTypeWithDict = TypeWithDict::byName(wrappedName);
     return checkDictionary(missingDictionaries, wrappedName, wrappedTypeWithDict);
   }
 
-  bool
-  checkDictionary(std::vector<std::string>& missingDictionaries,
-                  std::string const& name,
-                  TypeWithDict const& typeWithDict) {
+  bool checkDictionary(std::vector<std::string>& missingDictionaries,
+                       std::string const& name,
+                       TypeWithDict const& typeWithDict) {
     if (!bool(typeWithDict) || typeWithDict.invalidTypeInfo()) {
       missingDictionaries.emplace_back(name);
       return false;
@@ -105,10 +99,7 @@ namespace edm {
     return true;
   }
 
-  bool
-  checkClassDictionaries(std::vector<std::string>& missingDictionaries,
-                         TypeID const& typeID) {
-
+  bool checkClassDictionaries(std::vector<std::string>& missingDictionaries, TypeID const& typeID) {
     // For a class type with a dictionary the TClass* will be
     // non-null and hasDictionary will return true.
     // For a type like "int", the TClass* pointer will be a
@@ -137,7 +128,7 @@ namespace edm {
     bool recursive = true;
     tClass->GetMissingDictionaries(hashTable, recursive);
 
-    for(auto const& item : hashTable) {
+    for (auto const& item : hashTable) {
       TClass const* cl = static_cast<TClass const*>(item);
       missingDictionaries.emplace_back(cl->GetName());
       result = false;
@@ -145,16 +136,15 @@ namespace edm {
     return result;
   }
 
-  bool
-  checkClassDictionaries(std::vector<std::string>& missingDictionaries,
-                         std::string const& name,
-                         TypeWithDict const& typeWithDict) {
+  bool checkClassDictionaries(std::vector<std::string>& missingDictionaries,
+                              std::string const& name,
+                              TypeWithDict const& typeWithDict) {
     if (!bool(typeWithDict) || typeWithDict.invalidTypeInfo()) {
       missingDictionaries.emplace_back(name);
       return false;
     }
 
-    TClass *tClass = typeWithDict.getClass();
+    TClass* tClass = typeWithDict.getClass();
     if (tClass == nullptr) {
       missingDictionaries.emplace_back(name);
       return false;
@@ -166,7 +156,7 @@ namespace edm {
 
     bool result = true;
 
-    for(auto const& item : hashTable) {
+    for (auto const& item : hashTable) {
       TClass const* cl = static_cast<TClass const*>(item);
       missingDictionaries.emplace_back(cl->GetName());
       result = false;
@@ -177,12 +167,12 @@ namespace edm {
   void addToMissingDictionariesException(edm::Exception& exception,
                                          std::vector<std::string>& missingDictionaries,
                                          std::string const& context) {
-
     std::sort(missingDictionaries.begin(), missingDictionaries.end());
-    missingDictionaries.erase(std::unique(missingDictionaries.begin(), missingDictionaries.end()), missingDictionaries.end());
+    missingDictionaries.erase(std::unique(missingDictionaries.begin(), missingDictionaries.end()),
+                              missingDictionaries.end());
 
     std::ostringstream ostr;
-    for(auto const& item : missingDictionaries) {
+    for (auto const& item : missingDictionaries) {
       ostr << "  " << item << "\n";
     }
     exception << "No data dictionary found for the following classes:\n\n"
@@ -200,8 +190,7 @@ namespace edm {
     }
   }
 
-  void throwMissingDictionariesException(std::vector<std::string>& missingDictionaries,
-                                         std::string const& context) {
+  void throwMissingDictionariesException(std::vector<std::string>& missingDictionaries, std::string const& context) {
     std::vector<std::string> empty;
     throwMissingDictionariesException(missingDictionaries, context, empty);
   }
@@ -209,7 +198,6 @@ namespace edm {
   void throwMissingDictionariesException(std::vector<std::string>& missingDictionaries,
                                          std::string const& context,
                                          std::vector<std::string>& producedTypes) {
-
     edm::Exception exception(errors::DictionaryNotFound);
     addToMissingDictionariesException(exception, missingDictionaries, context);
 
@@ -218,7 +206,7 @@ namespace edm {
       producedTypes.erase(std::unique(producedTypes.begin(), producedTypes.end()), producedTypes.end());
 
       std::ostringstream ostr;
-      for(auto const& item : producedTypes) {
+      for (auto const& item : producedTypes) {
         ostr << "  " << item << "\n";
       }
       exception << "\nA type listed above might or might not be the same as a\n"
@@ -233,14 +221,11 @@ namespace edm {
     throw exception;
   }
 
-
   void throwMissingDictionariesException(std::vector<std::string>& missingDictionaries,
                                          std::string const& context,
                                          std::vector<std::string>& producedTypes,
                                          std::vector<std::string>& branchNames,
                                          bool fromStreamerSource) {
-
-
     edm::Exception exception(errors::DictionaryNotFound);
     addToMissingDictionariesException(exception, missingDictionaries, context);
 
@@ -249,7 +234,7 @@ namespace edm {
       producedTypes.erase(std::unique(producedTypes.begin(), producedTypes.end()), producedTypes.end());
 
       std::ostringstream ostr;
-      for(auto const& item : producedTypes) {
+      for (auto const& item : producedTypes) {
         ostr << "  " << item << "\n";
       }
       if (fromStreamerSource) {
@@ -272,24 +257,22 @@ namespace edm {
     }
 
     if (!branchNames.empty()) {
-
       std::sort(branchNames.begin(), branchNames.end());
       branchNames.erase(std::unique(branchNames.begin(), branchNames.end()), branchNames.end());
 
       std::ostringstream ostr;
-      for(auto const& item : branchNames) {
+      for (auto const& item : branchNames) {
         ostr << "  " << item << "\n";
       }
       if (fromStreamerSource) {
-        exception  << "Missing dictionaries are associated with these branch names:\n\n"
-                   << ostr.str() << "\n";
+        exception << "Missing dictionaries are associated with these branch names:\n\n" << ostr.str() << "\n";
       } else {
-        exception  << "Missing dictionaries are associated with these branch names:\n\n"
-                   << ostr.str() << "\n"
-                   << "If you do not need these branches and they are not produced\n"
-                   << "in the current process, an alternate solution to adding\n"
-                   << "dictionaries is to drop these branches on input using the\n"
-                   << "inputCommands parameter of the PoolSource.";
+        exception << "Missing dictionaries are associated with these branch names:\n\n"
+                  << ostr.str() << "\n"
+                  << "If you do not need these branches and they are not produced\n"
+                  << "in the current process, an alternate solution to adding\n"
+                  << "dictionaries is to drop these branches on input using the\n"
+                  << "inputCommands parameter of the PoolSource.";
       }
     }
     throw exception;
@@ -299,14 +282,12 @@ namespace edm {
                                          std::string const& context,
                                          std::set<std::string>& producedTypes,
                                          bool consumedWithView) {
-
     edm::Exception exception(errors::DictionaryNotFound);
     addToMissingDictionariesException(exception, missingDictionaries, context);
 
     if (!producedTypes.empty()) {
-
       std::ostringstream ostr;
-      for(auto const& item : producedTypes) {
+      for (auto const& item : producedTypes) {
         ostr << "  " << item << "\n";
       }
       if (consumedWithView) {
@@ -335,12 +316,9 @@ namespace edm {
     throw exception;
   }
 
-
-  bool
-  public_base_classes(std::vector<std::string>& missingDictionaries,
-                      TypeID const& typeID,
-                      std::vector<TypeWithDict>& baseTypes) {
-
+  bool public_base_classes(std::vector<std::string>& missingDictionaries,
+                           TypeID const& typeID,
+                           std::vector<TypeWithDict>& baseTypes) {
     if (!checkDictionary(missingDictionaries, typeID)) {
       return false;
     }
@@ -396,4 +374,4 @@ namespace edm {
     return returnValue;
   }
 
-} // namespace edm
+}  // namespace edm
diff --git a/FWCore/Utilities/src/Digest.cc b/FWCore/Utilities/src/Digest.cc
index ef0c501c5ecd8..e077fdc1e6d41 100644
--- a/FWCore/Utilities/src/Digest.cc
+++ b/FWCore/Utilities/src/Digest.cc
@@ -4,45 +4,56 @@
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/Utilities/interface/Digest.h"
 
-namespace cms
-{
-  namespace
-  {
-    MD5Result const& invalidResult()
-    {
-      static const MD5Result val;      
+namespace cms {
+  namespace {
+    MD5Result const& invalidResult() {
+      static const MD5Result val;
       return val;
     }
 
-    char unhexify(char hexed)
-    {
-      switch (hexed) 
-	{
-	case '0': case '1': case '2': case '3': case '4':
-	case '5': case '6': case '7': case '8': case '9':
-	  return hexed - '0';
-	case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-	  return hexed - 'a' + 10;
-	case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-	  return hexed - 'A' + 10;
-	default:
-	  throw edm::Exception(edm::errors::LogicError)
-	    << "Non-hex character in Hash "
-	    << "Please report this to the core framework developers";
-	}
+    char unhexify(char hexed) {
+      switch (hexed) {
+        case '0':
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+        case '5':
+        case '6':
+        case '7':
+        case '8':
+        case '9':
+          return hexed - '0';
+        case 'a':
+        case 'b':
+        case 'c':
+        case 'd':
+        case 'e':
+        case 'f':
+          return hexed - 'a' + 10;
+        case 'A':
+        case 'B':
+        case 'C':
+        case 'D':
+        case 'E':
+        case 'F':
+          return hexed - 'A' + 10;
+        default:
+          throw edm::Exception(edm::errors::LogicError) << "Non-hex character in Hash "
+                                                        << "Please report this to the core framework developers";
+      }
       // We never get here; return put in place to calm the compiler's
       // anxieties.
       return '\0';
     }
-  }
+  }  // namespace
 
   //--------------------------------------------------------------------
   //
   // MD5Result and associated free functions
   //
 
-  void set_to_default(MD5Result& val)
-  {
+  void set_to_default(MD5Result& val) {
     val.bytes[0] = 0xd4;
     val.bytes[1] = 0x1d;
     val.bytes[2] = 0x8c;
@@ -61,140 +72,105 @@ namespace cms
     val.bytes[15] = 0x7e;
   }
 
-  MD5Result::MD5Result() 
-  {
-    set_to_default(*this);
-  }
-
-  static const char * s_hexValues =
-  "000102030405060708090a0b0c0d0e0f"
-  "101112131415161718191a1b1c1d1e1f"
-  "202122232425262728292a2b2c2d2e2f"
-  "303132333435363738393a3b3c3d3e3f"
-  "404142434445464748494a4b4c4d4e4f"
-  "505152535455565758595a5b5c5d5e5f"
-  "606162636465666768696a6b6c6d6e6f"
-  "707172737475767778797a7b7c7d7e7f"
-  "808182838485868788898a8b8c8d8e8f"
-  "909192939495969798999a9b9c9d9e9f"
-  "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf"
-  "b0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
-  "c0c1c2c3c4c5c6c7c8c9cacbcccdcecf"
-  "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf"
-  "e0e1e2e3e4e5e6e7e8e9eaebecedeeef"
-  "f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff";
-
-  std::string MD5Result::toString() const
-  {
-    char buf[16*2];
-    char* pBuf=buf;
-    for(unsigned int i=0; i<sizeof(bytes);++i){
-      const char* p = s_hexValues+2*bytes[i];
+  MD5Result::MD5Result() { set_to_default(*this); }
+
+  static const char* s_hexValues =
+      "000102030405060708090a0b0c0d0e0f"
+      "101112131415161718191a1b1c1d1e1f"
+      "202122232425262728292a2b2c2d2e2f"
+      "303132333435363738393a3b3c3d3e3f"
+      "404142434445464748494a4b4c4d4e4f"
+      "505152535455565758595a5b5c5d5e5f"
+      "606162636465666768696a6b6c6d6e6f"
+      "707172737475767778797a7b7c7d7e7f"
+      "808182838485868788898a8b8c8d8e8f"
+      "909192939495969798999a9b9c9d9e9f"
+      "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf"
+      "b0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
+      "c0c1c2c3c4c5c6c7c8c9cacbcccdcecf"
+      "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf"
+      "e0e1e2e3e4e5e6e7e8e9eaebecedeeef"
+      "f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff";
+
+  std::string MD5Result::toString() const {
+    char buf[16 * 2];
+    char* pBuf = buf;
+    for (unsigned int i = 0; i < sizeof(bytes); ++i) {
+      const char* p = s_hexValues + 2 * bytes[i];
       *pBuf = *p;
       ++pBuf;
       ++p;
-      *pBuf=*p;
+      *pBuf = *p;
       ++pBuf;
     }
     return std::string(buf, sizeof(buf));
   }
 
-  std::string MD5Result::compactForm() const
-  {
+  std::string MD5Result::compactForm() const {
     // This is somewhat dangerous, because the conversion of 'unsigned
     // char' to 'char' may be undefined if 'char' is a signed type
     // (4.7p3 in the Standard).
     const char* p = reinterpret_cast<const char*>(&bytes[0]);
-    return std::string(p, p+sizeof(bytes));
+    return std::string(p, p + sizeof(bytes));
   }
 
-  void MD5Result::fromHexifiedString(std::string const& hexy)
-  {
-    switch (hexy.size())
-      {
-      case 0:
-	{
-	  set_to_default(*this);
-	}
-	break;
-      case 32:
-	{
-	  std::string::const_iterator it = hexy.begin();
-	  for (size_t i = 0; i != 16; ++i)
-	    {
-	      // first nybble
-	      bytes[i] = ( unhexify(*it++) << 4 );
-	      // second nybble
-	      bytes[i] += ( unhexify(*it++) );
-	    }
-	}
-	break;
-      default:
-	{
-	  // Not really sure of what sort of exception to throw...
-	  throw edm::Exception(edm::errors::LogicError)
-	    << "String of illegal length: "
-	    << hexy.size()
-	    << " given to MD5Result::fromHexifiedString";	  
-	}
+  void MD5Result::fromHexifiedString(std::string const& hexy) {
+    switch (hexy.size()) {
+      case 0: {
+        set_to_default(*this);
+      } break;
+      case 32: {
+        std::string::const_iterator it = hexy.begin();
+        for (size_t i = 0; i != 16; ++i) {
+          // first nybble
+          bytes[i] = (unhexify(*it++) << 4);
+          // second nybble
+          bytes[i] += (unhexify(*it++));
+        }
+      } break;
+      default: {
+        // Not really sure of what sort of exception to throw...
+        throw edm::Exception(edm::errors::LogicError)
+            << "String of illegal length: " << hexy.size() << " given to MD5Result::fromHexifiedString";
       }
+    }
   }
 
-  bool MD5Result::isValid() const
-  {
-    return (*this != invalidResult());
-  }
+  bool MD5Result::isValid() const { return (*this != invalidResult()); }
 
-  bool operator==(MD5Result const& a, MD5Result const& b)
-  {
-    return std::equal(a.bytes, a.bytes+sizeof(a.bytes), b.bytes);
+  bool operator==(MD5Result const& a, MD5Result const& b) {
+    return std::equal(a.bytes, a.bytes + sizeof(a.bytes), b.bytes);
   }
 
-
-  bool operator< (MD5Result const& a, MD5Result const& b)
-  {
-    return std::lexicographical_compare(a.bytes, 
-					a.bytes+sizeof(a.bytes), 
-					b.bytes,
-					b.bytes+sizeof(b.bytes));
+  bool operator<(MD5Result const& a, MD5Result const& b) {
+    return std::lexicographical_compare(a.bytes, a.bytes + sizeof(a.bytes), b.bytes, b.bytes + sizeof(b.bytes));
   }
 
-
-
   //--------------------------------------------------------------------
   //
   // Digest
   //
 
-  Digest::Digest() :
-    state_()
-  {
-    md5_init(&state_);
-  }
+  Digest::Digest() : state_() { md5_init(&state_); }
 
-  Digest::Digest(std::string const& s) :
-    state_()
-  {
+  Digest::Digest(std::string const& s) : state_() {
     md5_init(&state_);
     this->append(s);
   }
 
-  void Digest::append(std::string const& s) 
-  {
+  void Digest::append(std::string const& s) {
     const md5_byte_t* data = reinterpret_cast<const md5_byte_t*>(s.data());
     md5_append(&state_, const_cast<md5_byte_t*>(data), s.size());
   }
 
-  void Digest::append(const char *s, size_t size)
-  {
+  void Digest::append(const char* s, size_t size) {
     const md5_byte_t* data = reinterpret_cast<const md5_byte_t*>(s);
     md5_append(&state_, const_cast<md5_byte_t*>(data), size);
   }
 
-  MD5Result Digest::digest() const
-  {
+  MD5Result Digest::digest() const {
     MD5Result aDigest;
     md5_finish(&state_, aDigest.bytes);
     return aDigest;
   }
-}
+}  // namespace cms
diff --git a/FWCore/Utilities/src/EDMException.cc b/FWCore/Utilities/src/EDMException.cc
index ad275d65ce1a6..0b16f8641a702 100644
--- a/FWCore/Utilities/src/EDMException.cc
+++ b/FWCore/Utilities/src/EDMException.cc
@@ -1,130 +1,102 @@
 
 #include "FWCore/Utilities/interface/EDMException.h"
 
-#define FILLENTRY( name ) {name, #name }
+#define FILLENTRY(name) \
+  { name, #name }
 
 namespace edm {
   namespace errors {
-    static const std::map<ErrorCodes, std::string> codeMap =
-    {
-      FILLENTRY(CommandLineProcessing),
-      FILLENTRY(ConfigFileNotFound),
-      FILLENTRY(ConfigFileReadError),
-      FILLENTRY(OtherCMS),
-      FILLENTRY(StdException),
-      FILLENTRY(Unknown),
-      FILLENTRY(BadAlloc),
-      FILLENTRY(BadExceptionType),
-      FILLENTRY(ProductNotFound),
-      FILLENTRY(DictionaryNotFound),
-      FILLENTRY(NoProductSpecified),
-      FILLENTRY(InsertFailure),
-      FILLENTRY(Configuration),
-      FILLENTRY(LogicError),
-      FILLENTRY(UnimplementedFeature),
-      FILLENTRY(InvalidReference),
-      FILLENTRY(NullPointerError),
-      FILLENTRY(EventTimeout),
-      FILLENTRY(EventCorruption),
-      FILLENTRY(ScheduleExecutionFailure),
-      FILLENTRY(EventProcessorFailure),
-      FILLENTRY(FileInPathError),
-      FILLENTRY(FileOpenError),
-      FILLENTRY(FileReadError),
-      FILLENTRY(FatalRootError),
-      FILLENTRY(MismatchedInputFiles),
-      FILLENTRY(ProductDoesNotSupportViews),
-      FILLENTRY(ProductDoesNotSupportPtr),
-      FILLENTRY(NotFound),
-      FILLENTRY(FormatIncompatibility),
-      FILLENTRY(FallbackFileOpenError),
-      FILLENTRY(NoSecondaryFiles),
-      FILLENTRY(ExceededResourceVSize),
-      FILLENTRY(ExceededResourceRSS),
-      FILLENTRY(ExceededResourceTime),
-      FILLENTRY(FileWriteError),
-      FILLENTRY(EventGenerationFailure),
-      FILLENTRY(CaughtSignal)
-    };
+    static const std::map<ErrorCodes, std::string> codeMap = {FILLENTRY(CommandLineProcessing),
+                                                              FILLENTRY(ConfigFileNotFound),
+                                                              FILLENTRY(ConfigFileReadError),
+                                                              FILLENTRY(OtherCMS),
+                                                              FILLENTRY(StdException),
+                                                              FILLENTRY(Unknown),
+                                                              FILLENTRY(BadAlloc),
+                                                              FILLENTRY(BadExceptionType),
+                                                              FILLENTRY(ProductNotFound),
+                                                              FILLENTRY(DictionaryNotFound),
+                                                              FILLENTRY(NoProductSpecified),
+                                                              FILLENTRY(InsertFailure),
+                                                              FILLENTRY(Configuration),
+                                                              FILLENTRY(LogicError),
+                                                              FILLENTRY(UnimplementedFeature),
+                                                              FILLENTRY(InvalidReference),
+                                                              FILLENTRY(NullPointerError),
+                                                              FILLENTRY(EventTimeout),
+                                                              FILLENTRY(EventCorruption),
+                                                              FILLENTRY(ScheduleExecutionFailure),
+                                                              FILLENTRY(EventProcessorFailure),
+                                                              FILLENTRY(FileInPathError),
+                                                              FILLENTRY(FileOpenError),
+                                                              FILLENTRY(FileReadError),
+                                                              FILLENTRY(FatalRootError),
+                                                              FILLENTRY(MismatchedInputFiles),
+                                                              FILLENTRY(ProductDoesNotSupportViews),
+                                                              FILLENTRY(ProductDoesNotSupportPtr),
+                                                              FILLENTRY(NotFound),
+                                                              FILLENTRY(FormatIncompatibility),
+                                                              FILLENTRY(FallbackFileOpenError),
+                                                              FILLENTRY(NoSecondaryFiles),
+                                                              FILLENTRY(ExceededResourceVSize),
+                                                              FILLENTRY(ExceededResourceRSS),
+                                                              FILLENTRY(ExceededResourceTime),
+                                                              FILLENTRY(FileWriteError),
+                                                              FILLENTRY(EventGenerationFailure),
+                                                              FILLENTRY(CaughtSignal)};
     static const std::string kUnknownCode("unknownCode");
-  }
+  }  // namespace errors
   /// -------------- implementation details ------------------
 
   const std::string& Exception::codeToString(errors::ErrorCodes c) {
     auto i(errors::codeMap.find(c));
-    return i!=errors::codeMap.end() ? i->second : errors::kUnknownCode;
+    return i != errors::codeMap.end() ? i->second : errors::kUnknownCode;
   }
 
-  Exception::Exception(errors::ErrorCodes aCategory):
-    cms::Exception(codeToString(aCategory)),
-    category_(aCategory) {
-  }
+  Exception::Exception(errors::ErrorCodes aCategory) : cms::Exception(codeToString(aCategory)), category_(aCategory) {}
 
-  Exception::Exception(errors::ErrorCodes aCategory, std::string const& message):
-    cms::Exception(codeToString(aCategory),message),
-    category_(aCategory) {
-  }
+  Exception::Exception(errors::ErrorCodes aCategory, std::string const& message)
+      : cms::Exception(codeToString(aCategory), message), category_(aCategory) {}
 
-  Exception::Exception(errors::ErrorCodes aCategory, char const* message):
-    cms::Exception(codeToString(aCategory), std::string(message)),
-    category_(aCategory) {
-  }
+  Exception::Exception(errors::ErrorCodes aCategory, char const* message)
+      : cms::Exception(codeToString(aCategory), std::string(message)), category_(aCategory) {}
 
-  Exception::Exception(errors::ErrorCodes aCategory, std::string const& message, cms::Exception const& another):
-    cms::Exception(codeToString(aCategory),message,another),
-    category_(aCategory) {
-  }
+  Exception::Exception(errors::ErrorCodes aCategory, std::string const& message, cms::Exception const& another)
+      : cms::Exception(codeToString(aCategory), message, another), category_(aCategory) {}
 
-  Exception::Exception(errors::ErrorCodes aCategory, char const* message, cms::Exception const& another):
-    cms::Exception(codeToString(aCategory), std::string(message), another),
-    category_(aCategory) {
-  }
+  Exception::Exception(errors::ErrorCodes aCategory, char const* message, cms::Exception const& another)
+      : cms::Exception(codeToString(aCategory), std::string(message), another), category_(aCategory) {}
 
-  Exception::Exception(Exception const& other):
-    cms::Exception(other),
-    category_(other.category_) {
-  }
+  Exception::Exception(Exception const& other) : cms::Exception(other), category_(other.category_) {}
 
-  Exception::~Exception() noexcept {
-  }
+  Exception::~Exception() noexcept {}
 
-  Exception&
-  Exception::operator=(Exception const& other) {
+  Exception& Exception::operator=(Exception const& other) {
     Exception temp(other);
     this->swap(temp);
     return *this;
   }
-  
-  int
-  Exception::returnCode_() const {
-    return static_cast<int>(category_);
-  }
 
-  void
-  Exception::throwThis(errors::ErrorCodes aCategory,
-                       char const* message0,
-                       char const* message1,
-                       char const* message2,
-                       char const* message3,
-                       char const* message4) {
+  int Exception::returnCode_() const { return static_cast<int>(category_); }
+
+  void Exception::throwThis(errors::ErrorCodes aCategory,
+                            char const* message0,
+                            char const* message1,
+                            char const* message2,
+                            char const* message3,
+                            char const* message4) {
     Exception e(aCategory, std::string(message0));
     e << message1 << message2 << message3 << message4;
     throw e;
   }
 
-  void
-  Exception::throwThis(errors::ErrorCodes aCategory, char const* message0, int intVal, char const* message1) {
+  void Exception::throwThis(errors::ErrorCodes aCategory, char const* message0, int intVal, char const* message1) {
     Exception e(aCategory, std::string(message0));
     e << intVal << message1;
     throw e;
   }
 
-  Exception* Exception::clone() const {
-    return new Exception(*this);
-  }
+  Exception* Exception::clone() const { return new Exception(*this); }
 
-  void
-  Exception::rethrow() {
-    throw *this;
-  }
-}
+  void Exception::rethrow() { throw *this; }
+}  // namespace edm
diff --git a/FWCore/Utilities/src/ESInputTag.cc b/FWCore/Utilities/src/ESInputTag.cc
index 5034c55eca02e..fcbdd2dc2ce87 100644
--- a/FWCore/Utilities/src/ESInputTag.cc
+++ b/FWCore/Utilities/src/ESInputTag.cc
@@ -23,50 +23,42 @@ using namespace edm;
 
 ESInputTag::ESInputTag() = default;
 
-ESInputTag::ESInputTag(const std::string& moduleLabel, const std::string& dataLabel):
-module_(moduleLabel),
-data_(dataLabel)
-{
-}
+ESInputTag::ESInputTag(const std::string& moduleLabel, const std::string& dataLabel)
+    : module_(moduleLabel), data_(dataLabel) {}
 
-ESInputTag::ESInputTag(const std::string& iEncodedValue)
-{
-   // string is delimited by colons
-   std::vector<std::string> tokens = tokenize(iEncodedValue, ":");
-   int nwords = tokens.size();
-   if(nwords > 2) {
-      throw edm::Exception(errors::Configuration,"ESInputTag")
-      << "ESInputTag " << iEncodedValue << " has " << nwords << " tokens but only up two 2 are allowed.";
-   }
-   if(nwords > 0) module_ = tokens[0];
-   if(nwords > 1) data_ = tokens[1];
+ESInputTag::ESInputTag(const std::string& iEncodedValue) {
+  // string is delimited by colons
+  std::vector<std::string> tokens = tokenize(iEncodedValue, ":");
+  int nwords = tokens.size();
+  if (nwords > 2) {
+    throw edm::Exception(errors::Configuration, "ESInputTag")
+        << "ESInputTag " << iEncodedValue << " has " << nwords << " tokens but only up two 2 are allowed.";
+  }
+  if (nwords > 0)
+    module_ = tokens[0];
+  if (nwords > 1)
+    data_ = tokens[1];
 }
 
 //
 // const member functions
 //
-bool
-ESInputTag::operator==(const edm::ESInputTag& iRHS) const
-{
-  return module_ == iRHS.module_ &&
-    data_ == iRHS.data_;
+bool ESInputTag::operator==(const edm::ESInputTag& iRHS) const {
+  return module_ == iRHS.module_ && data_ == iRHS.data_;
 }
 
 std::string ESInputTag::encode() const {
-   static std::string const separator(":");
-   std::string result = module_;
-   if(!data_.empty()) {
-      result += separator + data_;
-   }
-   return result;
+  static std::string const separator(":");
+  std::string result = module_;
+  if (!data_.empty()) {
+    result += separator + data_;
+  }
+  return result;
 }
 
 namespace edm {
-  std::ostream&
-  operator<<(std::ostream& os, ESInputTag const& tag)
-  {
-    os << "Module label: " << tag.module()
-       << " Data label: " << tag.data();
+  std::ostream& operator<<(std::ostream& os, ESInputTag const& tag) {
+    os << "Module label: " << tag.module() << " Data label: " << tag.data();
     return os;
   }
-}
+}  // namespace edm
diff --git a/FWCore/Utilities/src/Exception.cc b/FWCore/Utilities/src/Exception.cc
index 6b154a5698871..51f2840739720 100644
--- a/FWCore/Utilities/src/Exception.cc
+++ b/FWCore/Utilities/src/Exception.cc
@@ -3,126 +3,89 @@
 
 namespace cms {
 
-  Exception::Exception(std::string const& aCategory) :
-    std::exception(),
-    ost_(),
-    category_(aCategory),
-    what_(),
-    context_(),
-    additionalInfo_(),
-    alreadyPrinted_(false)
-  {
-  }
-
-  Exception::Exception(char const* aCategory)  :
-    std::exception(),
-    ost_(),
-    category_(std::string(aCategory)),
-    what_(),
-    context_(),
-    additionalInfo_(),
-    alreadyPrinted_(false)
-  {
-  }
-
-  Exception::Exception(std::string const& aCategory,
-		       std::string const& message) :
-    std::exception(),
-    ost_(),
-    category_(aCategory),
-    what_(),
-    context_(),
-    additionalInfo_(),
-    alreadyPrinted_(false)
-  {
+  Exception::Exception(std::string const& aCategory)
+      : std::exception(), ost_(), category_(aCategory), what_(), context_(), additionalInfo_(), alreadyPrinted_(false) {}
+
+  Exception::Exception(char const* aCategory)
+      : std::exception(),
+        ost_(),
+        category_(std::string(aCategory)),
+        what_(),
+        context_(),
+        additionalInfo_(),
+        alreadyPrinted_(false) {}
+
+  Exception::Exception(std::string const& aCategory, std::string const& message)
+      : std::exception(), ost_(), category_(aCategory), what_(), context_(), additionalInfo_(), alreadyPrinted_(false) {
     init(message);
   }
 
-  Exception::Exception(char const* aCategory,
-	               std::string const& message) :
-    std::exception(),
-    ost_(),
-    category_(std::string(aCategory)),
-    what_(),
-    context_(),
-    additionalInfo_(),
-    alreadyPrinted_(false)
-  {
+  Exception::Exception(char const* aCategory, std::string const& message)
+      : std::exception(),
+        ost_(),
+        category_(std::string(aCategory)),
+        what_(),
+        context_(),
+        additionalInfo_(),
+        alreadyPrinted_(false) {
     init(message);
   }
 
-
-  Exception::Exception(std::string const& aCategory,
-                       char const* message) :
-    std::exception(),
-    ost_(),
-    category_(aCategory),
-    what_(),
-    context_(),
-    additionalInfo_(),
-    alreadyPrinted_(false)
-  {
+  Exception::Exception(std::string const& aCategory, char const* message)
+      : std::exception(), ost_(), category_(aCategory), what_(), context_(), additionalInfo_(), alreadyPrinted_(false) {
     init(std::string(message));
   }
 
-
-  Exception::Exception(char const* aCategory,
-                       char const* message) :
-    std::exception(),
-    ost_(),
-    category_(std::string(aCategory)),
-    what_(),
-    context_(),
-    additionalInfo_(),
-    alreadyPrinted_(false)
-  {
+  Exception::Exception(char const* aCategory, char const* message)
+      : std::exception(),
+        ost_(),
+        category_(std::string(aCategory)),
+        what_(),
+        context_(),
+        additionalInfo_(),
+        alreadyPrinted_(false) {
     init(std::string(message));
   }
 
   void Exception::init(std::string const& message) {
     ost_ << message;
-    if(!message.empty()) {
-	unsigned sz = message.size()-1;
-	if(message[sz] != '\n' && message[sz] != ' ') ost_ << " ";
+    if (!message.empty()) {
+      unsigned sz = message.size() - 1;
+      if (message[sz] != '\n' && message[sz] != ' ')
+        ost_ << " ";
     }
   }
 
-  Exception::Exception(std::string const& aCategory,
-                       std::string const& message,
-                       Exception const& another) :
-    std::exception(),
-    ost_(),
-    category_(aCategory),
-    what_(),
-    context_(another.context()),
-    additionalInfo_(another.additionalInfo()),
-    alreadyPrinted_(false)
-  {
+  Exception::Exception(std::string const& aCategory, std::string const& message, Exception const& another)
+      : std::exception(),
+        ost_(),
+        category_(aCategory),
+        what_(),
+        context_(another.context()),
+        additionalInfo_(another.additionalInfo()),
+        alreadyPrinted_(false) {
     ost_ << message;
     // check for newline at end of message first
-    if(!message.empty() && message[message.size()-1]!='\n') {
+    if (!message.empty() && message[message.size() - 1] != '\n') {
       ost_ << "\n";
     }
     append(another);
   }
 
-  Exception::Exception(Exception const& other):
-    std::exception(),
-    ost_(),
-    category_(other.category_),
-    what_(other.what_),
-    context_(other.context_),
-    additionalInfo_(other.additionalInfo_),
-    alreadyPrinted_(other.alreadyPrinted_)
-  {
+  Exception::Exception(Exception const& other)
+      : std::exception(),
+        ost_(),
+        category_(other.category_),
+        what_(other.what_),
+        context_(other.context_),
+        additionalInfo_(other.additionalInfo_),
+        alreadyPrinted_(other.alreadyPrinted_) {
     ost_ << other.ost_.str();
   }
 
-  Exception::~Exception() noexcept {
-  }
+  Exception::~Exception() noexcept {}
 
-  void
-  Exception::swap(Exception& other) {
+  void Exception::swap(Exception& other) {
     ost_ << other.ost_.str();
     category_.swap(other.category_);
     what_.swap(other.what_);
@@ -131,13 +94,12 @@ namespace cms {
     std::swap(alreadyPrinted_, other.alreadyPrinted_);
   }
 
-  Exception&
-  Exception::operator=(Exception const& other) {
+  Exception& Exception::operator=(Exception const& other) {
     Exception temp(other);
     this->swap(temp);
     return *this;
   }
-  
+
   char const* Exception::what() const noexcept {
     what_ = explainSelf();
     return what_.c_str();
@@ -148,13 +110,11 @@ namespace cms {
 
     if (context_.empty()) {
       ost << "An exception of category '" << category_ << "' occurred.\n";
-    }
-    else {
+    } else {
       ost << "An exception of category '" << category_ << "' occurred while\n";
       int count = 0;
-      for (std::list<std::string>::const_reverse_iterator i = context_.rbegin(),
-	     iEnd = context_.rend();
-           i != iEnd; ++i, ++count) {
+      for (std::list<std::string>::const_reverse_iterator i = context_.rbegin(), iEnd = context_.rend(); i != iEnd;
+           ++i, ++count) {
         ost << "   [" << count << "] " << *i << "\n";
       }
     }
@@ -171,106 +131,62 @@ namespace cms {
     if (!additionalInfo_.empty()) {
       ost << "   Additional Info:\n";
       char c = 'a';
-      for (std::list<std::string>::const_reverse_iterator i = additionalInfo_.rbegin(),
-	     iEnd = additionalInfo_.rend();
-           i != iEnd; ++i, ++c) {
+      for (std::list<std::string>::const_reverse_iterator i = additionalInfo_.rbegin(), iEnd = additionalInfo_.rend();
+           i != iEnd;
+           ++i, ++c) {
         ost << "      [" << c << "] " << *i << "\n";
       }
     }
     return ost.str();
   }
 
-  std::string const& Exception::category() const {
-    return category_;
-  }
-  
-  std::string Exception::message() const {
-    return ost_.str();
-  }
+  std::string const& Exception::category() const { return category_; }
 
-  std::list<std::string> const& Exception::context() const {
-    return context_;
-  }
+  std::string Exception::message() const { return ost_.str(); }
 
-  std::list<std::string> const& Exception::additionalInfo() const {
-    return additionalInfo_;
-  }
+  std::list<std::string> const& Exception::context() const { return context_; }
 
-  int  Exception::returnCode() const {
-    return returnCode_();
-  }
+  std::list<std::string> const& Exception::additionalInfo() const { return additionalInfo_; }
 
-  void Exception::append(Exception const& another) {
-    ost_ << another.message();
-  }
+  int Exception::returnCode() const { return returnCode_(); }
 
-  void Exception::append(std::string const& more_information) {
-    ost_ << more_information;
-  }
+  void Exception::append(Exception const& another) { ost_ << another.message(); }
 
-  void Exception::append(char const* more_information) {
-    ost_ << more_information;
-  }
+  void Exception::append(std::string const& more_information) { ost_ << more_information; }
 
-  void Exception::clearMessage() {
-    ost_.str("");
-  }
+  void Exception::append(char const* more_information) { ost_ << more_information; }
 
-  void Exception::clearContext() {
-    context_.clear();
-  }
+  void Exception::clearMessage() { ost_.str(""); }
 
-  void Exception::clearAdditionalInfo() {
-    additionalInfo_.clear();
-  }
+  void Exception::clearContext() { context_.clear(); }
 
-  void Exception::addContext(std::string const& context) {
-    context_.push_back(context);
-  }
+  void Exception::clearAdditionalInfo() { additionalInfo_.clear(); }
 
-  void Exception::addContext(char const* context) {
-    context_.push_back(std::string(context));
-  }
+  void Exception::addContext(std::string const& context) { context_.push_back(context); }
 
-  void Exception::addAdditionalInfo(std::string const& info) {
-    additionalInfo_.push_back(info);
-  }
+  void Exception::addContext(char const* context) { context_.push_back(std::string(context)); }
 
-  void Exception::addAdditionalInfo(char const* info) {
-    additionalInfo_.push_back(std::string(info));
-  }
+  void Exception::addAdditionalInfo(std::string const& info) { additionalInfo_.push_back(info); }
 
-  void Exception::setContext(std::list<std::string> const& context) {
-    context_ = context;
-  }
+  void Exception::addAdditionalInfo(char const* info) { additionalInfo_.push_back(std::string(info)); }
 
-  void Exception::setAdditionalInfo(std::list<std::string> const& info) {
-    additionalInfo_ = info;
-  }
+  void Exception::setContext(std::list<std::string> const& context) { context_ = context; }
 
-  bool Exception::alreadyPrinted() const {
-    return alreadyPrinted_;
-  }
+  void Exception::setAdditionalInfo(std::list<std::string> const& info) { additionalInfo_ = info; }
 
-  void Exception::setAlreadyPrinted(bool value) {
-    alreadyPrinted_ = value;
-  }
+  bool Exception::alreadyPrinted() const { return alreadyPrinted_; }
 
-  Exception* Exception::clone() const {
-    return new Exception(*this);
-  }
+  void Exception::setAlreadyPrinted(bool value) { alreadyPrinted_ = value; }
 
-  void Exception::rethrow() {
-    throw *this;
-  }
+  Exception* Exception::clone() const { return new Exception(*this); }
 
-  int  Exception::returnCode_() const {
-    return 8001;
-  }
+  void Exception::rethrow() { throw *this; }
+
+  int Exception::returnCode_() const { return 8001; }
 
   std::list<std::string> Exception::history() const {
     std::list<std::string> returnValue;
     returnValue.push_back(category_);
     return returnValue;
   }
-}
+}  // namespace cms
diff --git a/FWCore/Utilities/src/ExceptionCollector.cc b/FWCore/Utilities/src/ExceptionCollector.cc
index bd5fc218a2934..fc5d062e85546 100644
--- a/FWCore/Utilities/src/ExceptionCollector.cc
+++ b/FWCore/Utilities/src/ExceptionCollector.cc
@@ -8,68 +8,46 @@ namespace edm {
 
   class MultipleException : public cms::Exception {
   public:
-    MultipleException(int iReturnValue,
-                      std::string const& iMessage):
-    cms::Exception("MultipleExceptions", iMessage),
-    returnValue_(iReturnValue) {}
-    
-    Exception* clone() const override {
-      return new MultipleException(*this);
-    }
+    MultipleException(int iReturnValue, std::string const& iMessage)
+        : cms::Exception("MultipleExceptions", iMessage), returnValue_(iReturnValue) {}
+
+    Exception* clone() const override { return new MultipleException(*this); }
 
   private:
-    int returnCode_() const override {
-      return returnValue_;
-    }
+    int returnCode_() const override { return returnValue_; }
 
     int returnValue_;
   };
-  
-  ExceptionCollector::ExceptionCollector(std::string const& initialMessage) :
-    initialMessage_(initialMessage),
-    firstException_(),
-    accumulatedExceptions_(),
-    nExceptions_(0) {
-  }
 
-  ExceptionCollector::~ExceptionCollector() {
-  }
+  ExceptionCollector::ExceptionCollector(std::string const& initialMessage)
+      : initialMessage_(initialMessage), firstException_(), accumulatedExceptions_(), nExceptions_(0) {}
 
-  bool
-  ExceptionCollector::hasThrown() const {
-    return nExceptions_ > 0;
-  }
+  ExceptionCollector::~ExceptionCollector() {}
+
+  bool ExceptionCollector::hasThrown() const { return nExceptions_ > 0; }
 
-  void
-  ExceptionCollector::rethrow() const {
+  void ExceptionCollector::rethrow() const {
     if (nExceptions_ == 1) {
       firstException_->raise();
-    }
-    else if (nExceptions_ > 1) {
+    } else if (nExceptions_ > 1) {
       accumulatedExceptions_->raise();
     }
   }
 
-  void
-  ExceptionCollector::call(std::function<void(void)> f) {
+  void ExceptionCollector::call(std::function<void(void)> f) {
     try {
-      convertException::wrap([&f]() {
-        f();
-      });
-    }
-    catch (cms::Exception const& ex) {
+      convertException::wrap([&f]() { f(); });
+    } catch (cms::Exception const& ex) {
       ++nExceptions_;
       if (nExceptions_ == 1) {
         firstException_.reset(ex.clone());
         accumulatedExceptions_.reset(new MultipleException(ex.returnCode(), initialMessage_));
       }
-      *accumulatedExceptions_ << nExceptions_ << "\n"
-                              << ex.explainSelf();
+      *accumulatedExceptions_ << nExceptions_ << "\n" << ex.explainSelf();
     }
   }
 
-  void
-  ExceptionCollector::addException(cms::Exception const& exception) {
+  void ExceptionCollector::addException(cms::Exception const& exception) {
     ++nExceptions_;
     if (nExceptions_ == 1) {
       firstException_.reset(exception.clone());
@@ -79,4 +57,4 @@ namespace edm {
                             << "\n"
                             << exception.explainSelf();
   }
-}
+}  // namespace edm
diff --git a/FWCore/Utilities/src/ExceptionPropagate.cc b/FWCore/Utilities/src/ExceptionPropagate.cc
index bdca1748af0f9..8937dd2ebc257 100644
--- a/FWCore/Utilities/src/ExceptionPropagate.cc
+++ b/FWCore/Utilities/src/ExceptionPropagate.cc
@@ -3,13 +3,8 @@
 namespace edm {
   namespace threadLocalException {
     static thread_local std::exception_ptr stdExceptionPtr;
-    void setException(std::exception_ptr e) {
-      stdExceptionPtr = e;
-    }
-    std::exception_ptr getException() {
-      return stdExceptionPtr;
-    }
-  }
-
-}
+    void setException(std::exception_ptr e) { stdExceptionPtr = e; }
+    std::exception_ptr getException() { return stdExceptionPtr; }
+  }  // namespace threadLocalException
 
+}  // namespace edm
diff --git a/FWCore/Utilities/src/FunctionWithDict.cc b/FWCore/Utilities/src/FunctionWithDict.cc
index 417bae34a958f..22a524a41e864 100644
--- a/FWCore/Utilities/src/FunctionWithDict.cc
+++ b/FWCore/Utilities/src/FunctionWithDict.cc
@@ -10,21 +10,19 @@
 
 #include "tbb/concurrent_unordered_map.h"
 
-
 namespace edm {
   namespace {
     typedef tbb::concurrent_unordered_map<TMethod const*, TypeWithDict> Map;
     Map returnTypeMap;
-  }
+  }  // namespace
 
-  FunctionWithDict::FunctionWithDict() : function_(nullptr) {
-  }
+  FunctionWithDict::FunctionWithDict() : function_(nullptr) {}
 
   FunctionWithDict::FunctionWithDict(TMethod* meth) : function_(meth) {
     if (meth and isPublic() and not isDestructor() and not isConstructor()) {
-      TMethodCall caller( meth );
+      TMethodCall caller(meth);
       auto callFunc = caller.GetCallFunc();
-      funcptr_ = gInterpreter->CallFunc_IFacePtr( callFunc );
+      funcptr_ = gInterpreter->CallFunc_IFacePtr(callFunc);
     }
   }
 
@@ -35,78 +33,48 @@ namespace edm {
     return function_->IsValid();
   }
 
-  std::string FunctionWithDict::name() const {
-    return function_->GetName();
-  }
+  std::string FunctionWithDict::name() const { return function_->GetName(); }
 
-  std::string
-  FunctionWithDict::typeName() const {
-    return function_->GetReturnTypeNormalizedName();
-  }
+  std::string FunctionWithDict::typeName() const { return function_->GetReturnTypeNormalizedName(); }
 
-  TypeWithDict
-  FunctionWithDict::finalReturnType() const {
+  TypeWithDict FunctionWithDict::finalReturnType() const {
     auto const& item = returnTypeMap.find(function_);
-    if(item != returnTypeMap.end()) {
-       return item->second;
+    if (item != returnTypeMap.end()) {
+      return item->second;
     }
     TypeWithDict theType = TypeWithDict::byName(function_->GetReturnTypeNormalizedName());
     returnTypeMap.insert(std::make_pair(function_, theType));
     return theType;
   }
 
-  TypeWithDict
-  FunctionWithDict::declaringType() const {
-    return TypeWithDict(function_->GetClass());
-  }
+  TypeWithDict FunctionWithDict::declaringType() const { return TypeWithDict(function_->GetClass()); }
 
-  bool
-  FunctionWithDict::isConst() const {
-    return function_->Property() & kIsConstMethod;
-  }
+  bool FunctionWithDict::isConst() const { return function_->Property() & kIsConstMethod; }
 
-  bool
-  FunctionWithDict::isConstructor() const {
-    return function_->ExtraProperty() & kIsConstructor;
-  }
+  bool FunctionWithDict::isConstructor() const { return function_->ExtraProperty() & kIsConstructor; }
 
-  bool
-  FunctionWithDict::isDestructor() const {
-    return function_->ExtraProperty() & kIsDestructor;
-  }
+  bool FunctionWithDict::isDestructor() const { return function_->ExtraProperty() & kIsDestructor; }
 
-  bool
-  FunctionWithDict::isOperator() const {
-    return function_->ExtraProperty() & kIsOperator;
-  }
+  bool FunctionWithDict::isOperator() const { return function_->ExtraProperty() & kIsOperator; }
 
-  bool
-  FunctionWithDict::isPublic() const {
-    return function_->Property() & kIsPublic;
-  }
+  bool FunctionWithDict::isPublic() const { return function_->Property() & kIsPublic; }
 
-  bool FunctionWithDict::isStatic() const {
-    return function_->Property() & kIsStatic;
-  }
+  bool FunctionWithDict::isStatic() const { return function_->Property() & kIsStatic; }
 
-  size_t
-  FunctionWithDict::functionParameterSize(bool required/*= false*/) const {
+  size_t FunctionWithDict::functionParameterSize(bool required /*= false*/) const {
     if (required) {
       return function_->GetNargs() - function_->GetNargsOpt();
     }
     return function_->GetNargs();
   }
 
-  size_t
-  FunctionWithDict::size() const {
-    return function_->GetNargs();
-  }
+  size_t FunctionWithDict::size() const { return function_->GetNargs(); }
 
   /// Call a member function.
-  void
-  FunctionWithDict::invoke(ObjectWithDict const& obj, ObjectWithDict* ret/*=nullptr*/,
-         std::vector<void*> const& values/*=std::vector<void*>()*/) const {
-    void ** data = const_cast<void**>(values.data());
+  void FunctionWithDict::invoke(ObjectWithDict const& obj,
+                                ObjectWithDict* ret /*=nullptr*/,
+                                std::vector<void*> const& values /*=std::vector<void*>()*/) const {
+    void** data = const_cast<void**>(values.data());
     assert(funcptr_.fGeneric);
     if (ret == nullptr) {
       (*funcptr_.fGeneric)(obj.address(), values.size(), data, nullptr);
@@ -116,10 +84,9 @@ namespace edm {
   }
 
   /// Call a static function.
-  void
-  FunctionWithDict::invoke(ObjectWithDict* ret/*=nullptr*/,
-         std::vector<void*> const& values/*=std::vector<void*>()*/) const {
-    void ** data = const_cast<void **>(values.data());
+  void FunctionWithDict::invoke(ObjectWithDict* ret /*=nullptr*/,
+                                std::vector<void*> const& values /*=std::vector<void*>()*/) const {
+    void** data = const_cast<void**>(values.data());
     assert(funcptr_.fGeneric);
     if (ret == nullptr) {
       (*funcptr_.fGeneric)(nullptr, values.size(), data, nullptr);
@@ -128,17 +95,13 @@ namespace edm {
     (*funcptr_.fGeneric)(nullptr, values.size(), data, ret->address());
   }
 
-  IterWithDict<TMethodArg>
-  FunctionWithDict::begin() const {
+  IterWithDict<TMethodArg> FunctionWithDict::begin() const {
     if (function_ == nullptr) {
       return IterWithDict<TMethodArg>();
     }
     return IterWithDict<TMethodArg>(function_->GetListOfMethodArgs());
   }
 
-  IterWithDict<TMethodArg>
-  FunctionWithDict::end() const {
-    return IterWithDict<TMethodArg>();
-  }
+  IterWithDict<TMethodArg> FunctionWithDict::end() const { return IterWithDict<TMethodArg>(); }
 
-} // namespace edm
+}  // namespace edm
diff --git a/FWCore/Utilities/src/GlobalIdentifier.cc b/FWCore/Utilities/src/GlobalIdentifier.cc
index 88a23852762fe..071747a2a91e9 100644
--- a/FWCore/Utilities/src/GlobalIdentifier.cc
+++ b/FWCore/Utilities/src/GlobalIdentifier.cc
@@ -2,9 +2,8 @@
 #include "Guid.h"
 
 namespace edm {
-  std::string
-  createGlobalIdentifier() {
+  std::string createGlobalIdentifier() {
     Guid guid;
     return guid.toString();
   }
-}
+}  // namespace edm
diff --git a/FWCore/Utilities/src/Guid.cc b/FWCore/Utilities/src/Guid.cc
index cbd602d00c99c..95f965c381fb0 100644
--- a/FWCore/Utilities/src/Guid.cc
+++ b/FWCore/Utilities/src/Guid.cc
@@ -18,33 +18,41 @@
 #include "uuid/uuid.h"
 
 namespace edm {
-  static char const* fmt_Guid =
-    "%08lX-%04hX-%04hX-%02hhX%02hhX-%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX";
+  static char const* fmt_Guid = "%08lX-%04hX-%04hX-%02hhX%02hhX-%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX";
 
   static int const bufSize = 128;
 
   /// Initialize a new Guid
-  void Guid::init()   {
+  void Guid::init() {
     uuid_t me_;
     ::uuid_generate_random(me_);
-    unsigned int*   d1 = reinterpret_cast<unsigned int*>(me_);
-    unsigned short* d2 = reinterpret_cast<unsigned short*>(me_+4);
-    unsigned short* d3 = reinterpret_cast<unsigned short*>(me_+6);
+    unsigned int* d1 = reinterpret_cast<unsigned int*>(me_);
+    unsigned short* d2 = reinterpret_cast<unsigned short*>(me_ + 4);
+    unsigned short* d3 = reinterpret_cast<unsigned short*>(me_ + 6);
     Data1 = *d1;
     Data2 = *d2;
     Data3 = *d3;
-    for(int i = 0; i < 8; ++i){
+    for (int i = 0; i < 8; ++i) {
       Data4[i] = me_[i + 8];
     }
   }
 
   std::string const Guid::toString() const {
     char text[bufSize];
-    ::snprintf(text, sizeof(text),
-              fmt_Guid,
-              Data1, Data2, Data3,
-              Data4[0], Data4[1], Data4[2], Data4[3],
-              Data4[4], Data4[5], Data4[6], Data4[7]);
+    ::snprintf(text,
+               sizeof(text),
+               fmt_Guid,
+               Data1,
+               Data2,
+               Data3,
+               Data4[0],
+               Data4[1],
+               Data4[2],
+               Data4[3],
+               Data4[4],
+               Data4[5],
+               Data4[6],
+               Data4[7]);
     return text;
   }
 
@@ -57,13 +65,13 @@ namespace edm {
     size_t offset = 0;
     Data1 = strtol(source.substr(offset, iSize).c_str(), nullptr, 16);
     offset += iSize;
-    assert(dash == source[offset++]); 
+    assert(dash == source[offset++]);
     Data2 = strtol(source.substr(offset, sSize).c_str(), nullptr, 16);
     offset += sSize;
-    assert(dash == source[offset++]); 
+    assert(dash == source[offset++]);
     Data3 = strtol(source.substr(offset, sSize).c_str(), nullptr, 16);
     offset += sSize;
-    assert(dash == source[offset++]); 
+    assert(dash == source[offset++]);
     Data4[0] = strtol(source.substr(offset, cSize).c_str(), nullptr, 16);
     offset += cSize;
     Data4[1] = strtol(source.substr(offset, cSize).c_str(), nullptr, 16);
@@ -85,7 +93,5 @@ namespace edm {
     return *this;
   }
 
-  bool Guid::operator<(Guid const& g) const {
-    return ::memcmp(&g.Data1, &Data1, 16) < 0;
-  }
-}
+  bool Guid::operator<(Guid const& g) const { return ::memcmp(&g.Data1, &Data1, 16) < 0; }
+}  // namespace edm
diff --git a/FWCore/Utilities/src/Guid.h b/FWCore/Utilities/src/Guid.h
index 7c1c65e594b29..d909e9d120cbd 100644
--- a/FWCore/Utilities/src/Guid.h
+++ b/FWCore/Utilities/src/Guid.h
@@ -6,7 +6,7 @@
 /*
  *  copied from pool
  */
-namespace edm  {
+namespace edm {
 
   /** @class Guid Guid.h POOLCore/Guid.h
     *
@@ -20,33 +20,33 @@ namespace edm  {
     * @version  1.1
     * @date     03/09/2002
     */
-  class Guid {          // size is 16
+  class Guid {  // size is 16
   public:
-    unsigned int  Data1;
+    unsigned int Data1;
     unsigned short Data2;
     unsigned short Data3;
-    unsigned char  Data4[8];
+    unsigned char Data4[8];
 
     /// Standard constructor (With initializaton)
     Guid() { init(); }
     /// Standard constructor (With initialization)
-    explicit Guid(bool)  { init(); }
+    explicit Guid(bool) { init(); }
     /// Constructor for Guid from char*
-    explicit Guid(char const* s)        { fromString(s);          }
+    explicit Guid(char const* s) { fromString(s); }
     /// Constructor for Guid from string
-    explicit Guid(std::string const& s) { fromString(s);          }
+    explicit Guid(std::string const& s) { fromString(s); }
     /// Copy constructor
-    Guid(Guid const& c)                 { *this = c;              }
+    Guid(Guid const& c) { *this = c; }
     /// Assignment operator
     Guid& operator=(Guid const& g) {
-      if (this != &g)  {
+      if (this != &g) {
         Data1 = g.Data1;
         Data2 = g.Data2;
         Data3 = g.Data3;
-        unsigned int      * p = reinterpret_cast<unsigned int *>(&Data4[0]);
+        unsigned int* p = reinterpret_cast<unsigned int*>(&Data4[0]);
         unsigned int const* q = reinterpret_cast<unsigned int const*>(&g.Data4[0]);
-        *(p+1) = *(q+1);
-        *p     = *q;
+        *(p + 1) = *(q + 1);
+        *p = *q;
       }
       return *this;
     }
@@ -54,27 +54,28 @@ namespace edm  {
     bool operator<(Guid const& g) const;
     /// Equality operator
     bool operator==(Guid const& g) const {
-      if (this != & g)  {
-        if (Data1 != g.Data1) return false;
-        if (Data2 != g.Data2) return false;
-        if (Data3 != g.Data3) return false;
+      if (this != &g) {
+        if (Data1 != g.Data1)
+          return false;
+        if (Data2 != g.Data2)
+          return false;
+        if (Data3 != g.Data3)
+          return false;
         unsigned int const* p = reinterpret_cast<unsigned int const*>(&Data4[0]);
         unsigned int const* q = reinterpret_cast<unsigned int const*>(&g.Data4[0]);
-        return *p == *q && *(p+1) == *(q+1);
+        return *p == *q && *(p + 1) == *(q + 1);
       }
       return true;
     }
     /// Non-equality operator
-    bool operator!=(Guid const& g) const {
-      return !(this->operator == (g));
-    }
+    bool operator!=(Guid const& g) const { return !(this->operator==(g)); }
     /// Automatic conversion from string reprentation
     std::string const toString() const;
     /// Automatic conversion to string representation
     Guid const& fromString(std::string const& s);
     /// initialize a new Guid
-    private:
+  private:
     void init();
   };
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Utilities/src/InputTag.cc b/FWCore/Utilities/src/InputTag.cc
index ce70f7962b94b..9ced17a6c5525 100644
--- a/FWCore/Utilities/src/InputTag.cc
+++ b/FWCore/Utilities/src/InputTag.cc
@@ -9,74 +9,70 @@ namespace edm {
   static std::string const separator(":");
 
   InputTag::InputTag()
-  : label_(),
-    instance_(),
-    process_(),
-    typeID_(),
-    productRegistry_(nullptr),
-    index_(ProductResolverIndexInvalid),
-    branchType_(NumBranchTypes),
-    skipCurrentProcess_(false) {
-  }
-
+      : label_(),
+        instance_(),
+        process_(),
+        typeID_(),
+        productRegistry_(nullptr),
+        index_(ProductResolverIndexInvalid),
+        branchType_(NumBranchTypes),
+        skipCurrentProcess_(false) {}
 
   InputTag::InputTag(std::string const& label, std::string const& instance, std::string const& processName)
-  : label_(label),
-    instance_(instance),
-    process_(processName),
-    typeID_(),
-    productRegistry_(nullptr),
-    index_(ProductResolverIndexInvalid),
-    branchType_(NumBranchTypes),
-    skipCurrentProcess_(calcSkipCurrentProcess()) {
-  }
+      : label_(label),
+        instance_(instance),
+        process_(processName),
+        typeID_(),
+        productRegistry_(nullptr),
+        index_(ProductResolverIndexInvalid),
+        branchType_(NumBranchTypes),
+        skipCurrentProcess_(calcSkipCurrentProcess()) {}
 
   InputTag::InputTag(char const* label, char const* instance, char const* processName)
-  : label_(label),
-    instance_(instance),
-    process_(processName),
-    typeID_(),
-    productRegistry_(nullptr),
-    index_(ProductResolverIndexInvalid),
-    branchType_(NumBranchTypes),
-    skipCurrentProcess_(calcSkipCurrentProcess()) {
-  }
-
-  InputTag::InputTag(std::string const& s) 
-  : label_(),
-    instance_(),
-    process_(),
-    typeID_(),
-    productRegistry_(nullptr),
-    index_(ProductResolverIndexInvalid),
-    branchType_(NumBranchTypes),
-    skipCurrentProcess_(false) {
-
+      : label_(label),
+        instance_(instance),
+        process_(processName),
+        typeID_(),
+        productRegistry_(nullptr),
+        index_(ProductResolverIndexInvalid),
+        branchType_(NumBranchTypes),
+        skipCurrentProcess_(calcSkipCurrentProcess()) {}
+
+  InputTag::InputTag(std::string const& s)
+      : label_(),
+        instance_(),
+        process_(),
+        typeID_(),
+        productRegistry_(nullptr),
+        index_(ProductResolverIndexInvalid),
+        branchType_(NumBranchTypes),
+        skipCurrentProcess_(false) {
     // string is delimited by colons
     std::vector<std::string> tokens = tokenize(s, separator);
     size_t nwords = tokens.size();
-    if(nwords > 3) {
-      throw edm::Exception(errors::Configuration,"InputTag")
-        << "Input tag " << s << " has " << nwords << " tokens";
+    if (nwords > 3) {
+      throw edm::Exception(errors::Configuration, "InputTag") << "Input tag " << s << " has " << nwords << " tokens";
     }
-    if(nwords > 0) label_ = tokens[0];
-    if(nwords > 1) instance_ = tokens[1];
-    if(nwords > 2) process_=tokens[2];
+    if (nwords > 0)
+      label_ = tokens[0];
+    if (nwords > 1)
+      instance_ = tokens[1];
+    if (nwords > 2)
+      process_ = tokens[2];
     skipCurrentProcess_ = calcSkipCurrentProcess();
   }
 
   InputTag::~InputTag() {}
 
-  InputTag::InputTag(InputTag const& other) :
-    label_(other.label()),
-    instance_(other.instance()),
-    process_(other.process()),
-    typeID_(),
-    productRegistry_(nullptr),
-    index_(ProductResolverIndexInvalid),
-    branchType_(NumBranchTypes),
-    skipCurrentProcess_(other.willSkipCurrentProcess()) {
-
+  InputTag::InputTag(InputTag const& other)
+      : label_(other.label()),
+        instance_(other.instance()),
+        process_(other.process()),
+        typeID_(),
+        productRegistry_(nullptr),
+        index_(ProductResolverIndexInvalid),
+        branchType_(NumBranchTypes),
+        skipCurrentProcess_(other.willSkipCurrentProcess()) {
     ProductResolverIndex otherIndex = other.index_.load();
     if (otherIndex < ProductResolverIndexInitializing) {
       branchType_ = other.branchType_;
@@ -86,16 +82,15 @@ namespace edm {
     }
   }
 
-  InputTag::InputTag(InputTag&& other) :
-    label_(std::move(other.label())),
-    instance_(std::move(other.instance())),
-    process_(std::move(other.process())),
-    typeID_(),
-    productRegistry_(nullptr),
-    index_(ProductResolverIndexInvalid),
-    branchType_(NumBranchTypes),
-    skipCurrentProcess_(other.willSkipCurrentProcess()) {
-
+  InputTag::InputTag(InputTag&& other)
+      : label_(std::move(other.label())),
+        instance_(std::move(other.instance())),
+        process_(std::move(other.process())),
+        typeID_(),
+        productRegistry_(nullptr),
+        index_(ProductResolverIndexInvalid),
+        branchType_(NumBranchTypes),
+        skipCurrentProcess_(other.willSkipCurrentProcess()) {
     ProductResolverIndex otherIndex = other.index_.load();
     if (otherIndex < ProductResolverIndexInitializing) {
       branchType_ = other.branchType_;
@@ -107,7 +102,6 @@ namespace edm {
 
   InputTag& InputTag::operator=(InputTag const& other) {
     if (this != &other) {
-
       label_ = other.label_;
       instance_ = other.instance_;
       process_ = other.process_;
@@ -131,7 +125,6 @@ namespace edm {
 
   InputTag& InputTag::operator=(InputTag&& other) {
     if (this != &other) {
-
       label_ = std::move(other.label_);
       instance_ = std::move(other.instance_);
       process_ = std::move(other.process_);
@@ -168,61 +161,57 @@ namespace edm {
     // to change it so that not specifying a process would cause two colons to appear in the
     // encoding and thus not being backwards compatible
     std::string result = label_;
-    if(!instance_.empty() || !process_.empty()) {
+    if (!instance_.empty() || !process_.empty()) {
       result += separator + instance_;
     }
-    if(!process_.empty()) {
+    if (!process_.empty()) {
       result += separator + process_;
     }
     return result;
   }
 
   bool InputTag::operator==(InputTag const& tag) const {
-    return (label_ == tag.label_)  
-        && (instance_ == tag.instance_)
-        && (process_ == tag.process_);
+    return (label_ == tag.label_) && (instance_ == tag.instance_) && (process_ == tag.process_);
   }
 
-  ProductResolverIndex
-  InputTag::indexFor(TypeID const& typeID, BranchType branchType, void const* productRegistry) const {
-
+  ProductResolverIndex InputTag::indexFor(TypeID const& typeID,
+                                          BranchType branchType,
+                                          void const* productRegistry) const {
     ProductResolverIndex index = index_.load();
 
     // This will no longer be necessary when the compiler supports the memory
     // order associated with atomics.
     __sync_synchronize();
 
-    if (index < ProductResolverIndexInitializing &&
-        typeID_ == typeID &&
-        branchType_ == branchType &&
+    if (index < ProductResolverIndexInitializing && typeID_ == typeID && branchType_ == branchType &&
         productRegistry_ == productRegistry) {
       return index;
     }
     return ProductResolverIndexInvalid;
   }
 
-  void
-  InputTag::tryToCacheIndex(ProductResolverIndex index, TypeID const& typeID, BranchType branchType, void const* productRegistry) const {
+  void InputTag::tryToCacheIndex(ProductResolverIndex index,
+                                 TypeID const& typeID,
+                                 BranchType branchType,
+                                 void const* productRegistry) const {
     unsigned int invalidValue = static_cast<unsigned int>(ProductResolverIndexInvalid);
-    if (index_.compare_exchange_strong(invalidValue,
-                                       static_cast<unsigned int>(ProductResolverIndexInitializing))) {
-        typeID_ = typeID;
-        branchType_ = branchType;
-        productRegistry_ = productRegistry;
+    if (index_.compare_exchange_strong(invalidValue, static_cast<unsigned int>(ProductResolverIndexInitializing))) {
+      typeID_ = typeID;
+      branchType_ = branchType;
+      productRegistry_ = productRegistry;
 
-        // This will no longer be necessary when the compiler supports the memory
-        // order associated with atomics.
-        __sync_synchronize();
+      // This will no longer be necessary when the compiler supports the memory
+      // order associated with atomics.
+      __sync_synchronize();
 
-        index_.store(index);
+      index_.store(index);
     }
   }
 
   std::ostream& operator<<(std::ostream& ost, InputTag const& tag) {
     static std::string const process(", process = ");
     ost << "InputTag:  label = " << tag.label() << ", instance = " << tag.instance()
-    << (tag.process().empty() ? std::string() : (process + tag.process()));
+        << (tag.process().empty() ? std::string() : (process + tag.process()));
     return ost;
   }
-}
-
+}  // namespace edm
diff --git a/FWCore/Utilities/src/IterWithDict.cc b/FWCore/Utilities/src/IterWithDict.cc
index d8c3d460e4596..da0198154f1c5 100644
--- a/FWCore/Utilities/src/IterWithDict.cc
+++ b/FWCore/Utilities/src/IterWithDict.cc
@@ -3,8 +3,7 @@
 
 namespace edm {
 
-  void
-  IterWithDictBase::advance() {
+  void IterWithDictBase::advance() {
     if (atEnd_) {
       return;
     }
@@ -14,10 +13,7 @@ namespace edm {
     }
   }
 
-  TIter const&
-  IterWithDictBase::iter() const {
-    return iter_;
-  }
+  TIter const& IterWithDictBase::iter() const { return iter_; }
 
   IterWithDictBase::IterWithDictBase() : iter_(static_cast<TList*>(nullptr)), atEnd_(true) {
     // This ctor is used by the framework for the end of a range,
@@ -34,8 +30,7 @@ namespace edm {
     }
   }
 
-  bool
-  IterWithDictBase::operator!=(IterWithDictBase const& rhs) const {
+  bool IterWithDictBase::operator!=(IterWithDictBase const& rhs) const {
     // The special cases are needed because TIter::operator!=()
     // dereferences a null pointer (i.e. segfaults) if the left hand TIter
     // was constucted with a nullptr argument (the first constructor above).
@@ -51,4 +46,4 @@ namespace edm {
     return iter_ != rhs.iter_;
   }
 
-} // namespace edm
+}  // namespace edm
diff --git a/FWCore/Utilities/src/LuminosityBlockIndex.cc b/FWCore/Utilities/src/LuminosityBlockIndex.cc
index 1b107d6b31487..dfd602abb3a29 100644
--- a/FWCore/Utilities/src/LuminosityBlockIndex.cc
+++ b/FWCore/Utilities/src/LuminosityBlockIndex.cc
@@ -4,9 +4,9 @@
 
 namespace edm {
 
-  const unsigned int LuminosityBlockIndex::invalidValue_ = std::numeric_limits<unsigned int>::max();    
+  const unsigned int LuminosityBlockIndex::invalidValue_ = std::numeric_limits<unsigned int>::max();
 
   LuminosityBlockIndex LuminosityBlockIndex::invalidLuminosityBlockIndex() {
     return LuminosityBlockIndex(invalidValue_);
   }
-}
+}  // namespace edm
diff --git a/FWCore/Utilities/src/MallocOpts.cc b/FWCore/Utilities/src/MallocOpts.cc
index 7809c6ce90c1f..37dc5e9cfd0d7 100644
--- a/FWCore/Utilities/src/MallocOpts.cc
+++ b/FWCore/Utilities/src/MallocOpts.cc
@@ -4,12 +4,11 @@
 //
 // Package:     Utilities
 // Class  :     MallocOpts
-// 
+//
 // Original Author:  Jim Kowalkowski
 //
 // ------------------ resetting malloc options -----------------------
 
-
 #include "FWCore/Utilities/interface/MallocOpts.h"
 
 #if !defined(__APPLE__)
@@ -20,24 +19,18 @@
 #include <cstdlib>
 #include <cstring>
 
-namespace edm
-{
+namespace edm {
 
-  std::ostream& operator<<(std::ostream& ost,const MallocOpts& opts)
-  {
-    ost << "mmap_max=" << opts.mmap_max_
-	<< " trim_threshold=" << opts.trim_thr_
-	<< " top_padding=" << opts.top_pad_
-	<< " mmap_threshold=" << opts.mmap_thr_;
+  std::ostream& operator<<(std::ostream& ost, const MallocOpts& opts) {
+    ost << "mmap_max=" << opts.mmap_max_ << " trim_threshold=" << opts.trim_thr_ << " top_padding=" << opts.top_pad_
+        << " mmap_threshold=" << opts.mmap_thr_;
     return ost;
   }
 
-  namespace 
-  {
-    typedef enum { UNKNOWN_CPU=0, AMD_CPU=1, INTEL_CPU=2 } cpu_type;
-  
-    cpu_type get_cpu_type()
-    {
+  namespace {
+    typedef enum { UNKNOWN_CPU = 0, AMD_CPU = 1, INTEL_CPU = 2 } cpu_type;
+
+    cpu_type get_cpu_type() {
       // issue: these need to be static.  The asm instruction combined
       // with optimization on the 64 bit platform moves the stack data
       // member around in such a way that the =m directive misses the
@@ -45,13 +38,14 @@ namespace edm
       // multithread safe.
       static volatile int ans[4];
 #if defined(__i386__) || defined(__x86_64__)
-      static volatile int op=0,a;
+      static volatile int op = 0, a;
 #endif
 
-// Still some problem on x86_64, so only i386 for now    
+// Still some problem on x86_64, so only i386 for now
 #if defined(__x86_64__)
 
-      __asm__ __volatile__ ("pushq %%rdx;\
+      __asm__ __volatile__(
+          "pushq %%rdx;\
  pushq %%rcx;				 \
  pushq %%rsi;				 \
  pushq %%rbx;				 \
@@ -65,14 +59,13 @@ namespace edm
  popq  %%rsi;				 \
  popq  %%rcx;				 \
  popq  %%rdx;"
-                            : "=m"(ans[2]), "=m"(ans[1]), "=m"(ans[0]), "=m"(a)
-                            : "a"(op)
-			    );
+          : "=m"(ans[2]), "=m"(ans[1]), "=m"(ans[0]), "=m"(a)
+          : "a"(op));
 
 #elif defined(__i386__)
 
-
-      __asm__ __volatile__ ("pushl %%edx;\
+      __asm__ __volatile__(
+          "pushl %%edx;\
  pushl %%ecx;				 \
  pushl %%esi;				 \
  pushl %%ebx;				 \
@@ -86,143 +79,121 @@ namespace edm
  popl  %%esi;				 \
  popl  %%ecx;				 \
  popl  %%edx;"
-                            : "=m"(ans[2]), "=m"(ans[1]), "=m"(ans[0]), "=m"(a)
-                            : "a"(op)
-			    );
+          : "=m"(ans[2]), "=m"(ans[1]), "=m"(ans[0]), "=m"(a)
+          : "a"(op));
 
-    
 #else
       const char* unknown_str = "Unknown";
       // int unknown_sz = strlen(unknown_str);
-      strcpy((char*)&ans[0],unknown_str);
+      strcpy((char*)&ans[0], unknown_str);
 #endif
-      
+
       const char* amd_str = "AuthenticAMD";
       int amd_sz = strlen(amd_str);
       const char* intel_str = "GenuineIntel";
       int intel_sz = strlen(intel_str);
-    
+
       char* str = (char*)&ans[0];
-      ans[3]=0;
+      ans[3] = 0;
 
-      return strncmp(str,amd_str,amd_sz)==0?AMD_CPU:
-	strncmp(str,intel_str,intel_sz)==0?INTEL_CPU:UNKNOWN_CPU;
+      return strncmp(str, amd_str, amd_sz) == 0 ? AMD_CPU
+                                                : strncmp(str, intel_str, intel_sz) == 0 ? INTEL_CPU : UNKNOWN_CPU;
     }
 
     // values determined experimentally for each architecture
     const MallocOpts intel_opts(262144, 524288, 5242880, 131072);
     const MallocOpts amd_opts(0, 8388608, 131072, 10485760);
 
-  }
+  }  // namespace
 
+  bool MallocOptionSetter::retrieveFromCpuType() {
+    bool rc = true;
 
-  bool MallocOptionSetter::retrieveFromCpuType()
-  {
-    bool rc=true;
-
-    switch(get_cpu_type())
-      {
-      case AMD_CPU:
-	{
-	  values_ = amd_opts;
-	  changed_=true;
-	  break;
-	}
-      case INTEL_CPU:
-	{
-	  values_ = intel_opts;
-	  changed_=true;
-	  break;
-	}
+    switch (get_cpu_type()) {
+      case AMD_CPU: {
+        values_ = amd_opts;
+        changed_ = true;
+        break;
+      }
+      case INTEL_CPU: {
+        values_ = intel_opts;
+        changed_ = true;
+        break;
+      }
       case UNKNOWN_CPU:
       default:
-	rc=false;
-      }
+        rc = false;
+    }
 
     return rc;
   }
 
-  MallocOptionSetter::MallocOptionSetter():
-    changed_(false)
-  {
-    if(retrieveFromEnv() || retrieveFromCpuType())
-      {
-	adjustMallocParams();
-	if(hasErrors())
-	  {
-	    std::cerr << "ERROR: Reset of malloc options has fails:\n"
-		      << error_message_ << "\n";
-	  }
+  MallocOptionSetter::MallocOptionSetter() : changed_(false) {
+    if (retrieveFromEnv() || retrieveFromCpuType()) {
+      adjustMallocParams();
+      if (hasErrors()) {
+        std::cerr << "ERROR: Reset of malloc options has fails:\n" << error_message_ << "\n";
       }
+    }
   }
 
-  void MallocOptionSetter::adjustMallocParams()
-  {
-    if(changed_==false) return; // only adjust if they changed
+  void MallocOptionSetter::adjustMallocParams() {
+    if (changed_ == false)
+      return;  // only adjust if they changed
     error_message_.clear();
     changed_ = false;
 
 #ifndef __SANITIZE_ADDRESS__
 #ifdef M_MMAP_MAX
-    if(mallopt(M_MMAP_MAX,values_.mmap_max_)<0)
-      error_message_ += "Could not set M_MMAP_MAX\n"; 
+    if (mallopt(M_MMAP_MAX, values_.mmap_max_) < 0)
+      error_message_ += "Could not set M_MMAP_MAX\n";
 #endif
 #ifdef M_TRIM_THRESHOLD
-    if(mallopt(M_TRIM_THRESHOLD,values_.trim_thr_)<0)
-      error_message_ += "Could not set M_TRIM_THRESHOLD\n"; 
+    if (mallopt(M_TRIM_THRESHOLD, values_.trim_thr_) < 0)
+      error_message_ += "Could not set M_TRIM_THRESHOLD\n";
 #endif
 #ifdef M_TOP_PAD
-    if(mallopt(M_TOP_PAD,values_.top_pad_)<0)
+    if (mallopt(M_TOP_PAD, values_.top_pad_) < 0)
       error_message_ += "ERROR: Could not set M_TOP_PAD\n";
 #endif
 #ifdef M_MMAP_THRESHOLD
-    if(mallopt(M_MMAP_THRESHOLD,values_.mmap_thr_)<0)
+    if (mallopt(M_MMAP_THRESHOLD, values_.mmap_thr_) < 0)
       error_message_ += "ERROR: Could not set M_MMAP_THRESHOLD\n";
 #endif
 #endif
   }
 
-  bool MallocOptionSetter::retrieveFromEnv()
-  {
+  bool MallocOptionSetter::retrieveFromEnv() {
     const char* par = getenv("CMSRUN_MALLOC_RESET");
-    if(par==nullptr) return false; // leave quickly here
+    if (par == nullptr)
+      return false;  // leave quickly here
     std::string spar(par);
     bool rc = false;
-      
+
     // CMSRUN_MALLOC_RESET = "mmap_max trim_thres top_pad mmap_thres"
-      
-    if(spar.size()>1)
-      {
-	std::istringstream ist(spar);
-	ist >> values_.mmap_max_ >> values_.trim_thr_
-	    >> values_.top_pad_ >> values_.mmap_thr_;
-
-	if(ist.bad())
-	  {
-	    std::cerr << "bad malloc options in CMSRUN_MALLOC_RESET: "
-		      << spar << "\n"
-		      << "format is: "
-		      << "CMSRUN_MALLOC_RESET=\"mmap_max trim_thres top_pad mmap_thres\"\n";
-	  }
-	else
-	  {
-	    std::cout << "MALLOC_OPTIONS> Reset options: "
-		      << "CMSRUN_MALLOC_RESET=" << par << "\n";
-	  }
-	rc=true;
-	changed_=true;
+
+    if (spar.size() > 1) {
+      std::istringstream ist(spar);
+      ist >> values_.mmap_max_ >> values_.trim_thr_ >> values_.top_pad_ >> values_.mmap_thr_;
+
+      if (ist.bad()) {
+        std::cerr << "bad malloc options in CMSRUN_MALLOC_RESET: " << spar << "\n"
+                  << "format is: "
+                  << "CMSRUN_MALLOC_RESET=\"mmap_max trim_thres top_pad mmap_thres\"\n";
+      } else {
+        std::cout << "MALLOC_OPTIONS> Reset options: "
+                  << "CMSRUN_MALLOC_RESET=" << par << "\n";
       }
+      rc = true;
+      changed_ = true;
+    }
 
     return rc;
   }
 
   MallocOptionSetter global_malloc_options;
 
-  MallocOptionSetter& getGlobalOptionSetter()
-  {
-    return global_malloc_options;
-  }
-
+  MallocOptionSetter& getGlobalOptionSetter() { return global_malloc_options; }
 
   // ----------------------------------------------------------------
-}
+}  // namespace edm
diff --git a/FWCore/Utilities/src/MemberWithDict.cc b/FWCore/Utilities/src/MemberWithDict.cc
index fe0dd5a0eae88..b55ede8f45cd6 100644
--- a/FWCore/Utilities/src/MemberWithDict.cc
+++ b/FWCore/Utilities/src/MemberWithDict.cc
@@ -7,79 +7,48 @@
 
 namespace edm {
 
-  MemberWithDict::MemberWithDict() : dataMember_(nullptr) {
-  }
+  MemberWithDict::MemberWithDict() : dataMember_(nullptr) {}
 
-  MemberWithDict::MemberWithDict(TDataMember* dataMember) : dataMember_(dataMember) {
-  }
+  MemberWithDict::MemberWithDict(TDataMember* dataMember) : dataMember_(dataMember) {}
 
-  MemberWithDict::operator bool() const {
-    return dataMember_ != nullptr;
-  }
+  MemberWithDict::operator bool() const { return dataMember_ != nullptr; }
 
-  std::string
-  MemberWithDict::name() const {
-    return dataMember_->GetName();
-  }
+  std::string MemberWithDict::name() const { return dataMember_->GetName(); }
 
-  TypeWithDict
-  MemberWithDict::typeOf() const {
-    if(isArray()) {
+  TypeWithDict MemberWithDict::typeOf() const {
+    if (isArray()) {
       std::ostringstream name;
       name << dataMember_->GetTrueTypeName();
-      for(int i = 0; i < dataMember_->GetArrayDim(); ++i) {
+      for (int i = 0; i < dataMember_->GetArrayDim(); ++i) {
         name << '[';
         name << dataMember_->GetMaxIndex(i);
         name << ']';
       }
       return TypeWithDict::byName(name.str());
-    } 
+    }
     return TypeWithDict::byName(dataMember_->GetTrueTypeName());
   }
 
-  TypeWithDict
-  MemberWithDict::declaringType() const {
-    return TypeWithDict(dataMember_->GetClass());
-  }
+  TypeWithDict MemberWithDict::declaringType() const { return TypeWithDict(dataMember_->GetClass()); }
 
-  bool
-  MemberWithDict::isArray() const {
-    return dataMember_->Property() & kIsArray;
-  }
+  bool MemberWithDict::isArray() const { return dataMember_->Property() & kIsArray; }
 
-  bool
-  MemberWithDict::isConst() const {
-    return dataMember_->Property() & kIsConstant;
-  }
+  bool MemberWithDict::isConst() const { return dataMember_->Property() & kIsConstant; }
 
-  bool
-  MemberWithDict::isPublic() const {
-    return dataMember_->Property() & kIsPublic;
-  }
+  bool MemberWithDict::isPublic() const { return dataMember_->Property() & kIsPublic; }
 
-  bool
-  MemberWithDict::isStatic() const {
-    return dataMember_->Property() & kIsStatic;
-  }
+  bool MemberWithDict::isStatic() const { return dataMember_->Property() & kIsStatic; }
 
-  bool
-  MemberWithDict::isTransient() const {
-    return !dataMember_->IsPersistent();
-  }
+  bool MemberWithDict::isTransient() const { return !dataMember_->IsPersistent(); }
 
-  size_t
-  MemberWithDict::offset() const {
-    return dataMember_->GetOffset();
-  }
+  size_t MemberWithDict::offset() const { return dataMember_->GetOffset(); }
 
-  ObjectWithDict
-  MemberWithDict::get() const {
+  ObjectWithDict MemberWithDict::get() const {
     return ObjectWithDict(typeOf(), reinterpret_cast<void*>(dataMember_->GetOffset()));
   }
 
-  ObjectWithDict
-  MemberWithDict::get(ObjectWithDict const& obj) const {
+  ObjectWithDict MemberWithDict::get(ObjectWithDict const& obj) const {
     return ObjectWithDict(typeOf(), reinterpret_cast<char*>(obj.address()) + dataMember_->GetOffset());
   }
 
-} // namespace edm
+}  // namespace edm
diff --git a/FWCore/Utilities/src/OStreamColumn.cc b/FWCore/Utilities/src/OStreamColumn.cc
index a3fa5fbb28a12..f6e47034ab8bf 100644
--- a/FWCore/Utilities/src/OStreamColumn.cc
+++ b/FWCore/Utilities/src/OStreamColumn.cc
@@ -4,20 +4,14 @@
 
 namespace edm {
 
-  OStreamColumn::OStreamColumn(std::string const& t)
-    : OStreamColumn{t,0}
-  {}
+  OStreamColumn::OStreamColumn(std::string const& t) : OStreamColumn{t, 0} {}
 
-  OStreamColumn::OStreamColumn(std::string const& t,
-                               std::size_t const w)
-    : title_{t}
-    , width_{std::max(w, title_.size())}
-  {}
+  OStreamColumn::OStreamColumn(std::string const& t, std::size_t const w)
+      : title_{t}, width_{std::max(w, title_.size())} {}
 
-  std::ostream& operator<<(std::ostream& t, OStreamColumn const& c)
-  {
+  std::ostream& operator<<(std::ostream& t, OStreamColumn const& c) {
     t << std::setw(c.width_) << c.title_;
     return t;
   }
 
-}
+}  // namespace edm
diff --git a/FWCore/Utilities/src/ObjectWithDict.cc b/FWCore/Utilities/src/ObjectWithDict.cc
index f0cd1e4098ae1..4750a5f41993b 100644
--- a/FWCore/Utilities/src/ObjectWithDict.cc
+++ b/FWCore/Utilities/src/ObjectWithDict.cc
@@ -10,49 +10,32 @@
 
 namespace edm {
 
-  ObjectWithDict
-  ObjectWithDict::byType(TypeWithDict const& type) {
+  ObjectWithDict ObjectWithDict::byType(TypeWithDict const& type) {
     ObjectWithDict obj(type.construct());
     return obj;
   }
 
-  ObjectWithDict::ObjectWithDict() : type_(), address_(nullptr) {
-  }
+  ObjectWithDict::ObjectWithDict() : type_(), address_(nullptr) {}
 
-  ObjectWithDict::ObjectWithDict(TypeWithDict const& type, void* address) :
-    type_(type),
-    address_(address) {
-  }
+  ObjectWithDict::ObjectWithDict(TypeWithDict const& type, void* address) : type_(type), address_(address) {}
 
-  ObjectWithDict::ObjectWithDict(std::type_info const& ti, void* address) :
-    type_(TypeWithDict(ti)),
-    address_(address) {
-  }
+  ObjectWithDict::ObjectWithDict(std::type_info const& ti, void* address)
+      : type_(TypeWithDict(ti)), address_(address) {}
 
-  ObjectWithDict::operator bool() const {
-    return bool(type_) && (address_ != nullptr);
-  }
+  ObjectWithDict::operator bool() const { return bool(type_) && (address_ != nullptr); }
 
-  void*
-  ObjectWithDict::address() const {
-    return address_;
-  }
+  void* ObjectWithDict::address() const { return address_; }
 
-  TypeWithDict
-  ObjectWithDict::typeOf() const {
-    return type_;
-  }
+  TypeWithDict ObjectWithDict::typeOf() const { return type_; }
 
   class DummyVT {
   public:
     virtual ~DummyVT();
   };
 
-  DummyVT::~DummyVT() {
-  }
+  DummyVT::~DummyVT() {}
 
-  TypeWithDict
-  ObjectWithDict::dynamicType() const {
+  TypeWithDict ObjectWithDict::dynamicType() const {
     if (!type_.isVirtual()) {
       return type_;
     }
@@ -61,13 +44,11 @@ namespace edm {
     return TypeWithDict::byTypeInfo(typeid(*(DummyVT*)address_));
   }
 
-  ObjectWithDict
-  ObjectWithDict::get(std::string const& memberName) const {
+  ObjectWithDict ObjectWithDict::get(std::string const& memberName) const {
     return type_.dataMemberByName(memberName).get(*this);
   }
 
-  ObjectWithDict
-  ObjectWithDict::castObject(TypeWithDict const& to) const {
+  ObjectWithDict ObjectWithDict::castObject(TypeWithDict const& to) const {
     TypeWithDict from = typeOf();
 
     // Same type
@@ -75,17 +56,20 @@ namespace edm {
       return *this;
     }
 
-    if (to.hasBase(from)) { // down cast
+    if (to.hasBase(from)) {  // down cast
 #ifndef _LIBCPP_VERSION
       // use the internal dynamic casting of the compiler (e.g. libstdc++.so)
-      void* address = abi::__dynamic_cast(address_, static_cast<abi::__class_type_info const*>(&from.typeInfo()), static_cast<abi::__class_type_info const*>(&to.typeInfo()), -1);
+      void* address = abi::__dynamic_cast(address_,
+                                          static_cast<abi::__class_type_info const*>(&from.typeInfo()),
+                                          static_cast<abi::__class_type_info const*>(&to.typeInfo()),
+                                          -1);
       return ObjectWithDict(to, address);
 #else
       return ObjectWithDict(to, address_);
 #endif
     }
 
-    if (from.hasBase(to)) { // up cast
+    if (from.hasBase(to)) {  // up cast
       size_t offset = from.getBaseClassOffset(to);
       size_t address = reinterpret_cast<size_t>(address_) + offset;
       return ObjectWithDict(to, reinterpret_cast<void*>(address));
@@ -93,7 +77,7 @@ namespace edm {
 
     // if everything fails return the dummy object
     return ObjectWithDict();
-  } // castObject
+  }  // castObject
 
   //ObjectWithDict
   //ObjectWithDict::construct() const {
@@ -105,8 +89,7 @@ namespace edm {
   //  return ObjectWithDict(ty, new char[ty.size()]);
   //}
 
-  void
-  ObjectWithDict::destruct(bool dealloc) const {
+  void ObjectWithDict::destruct(bool dealloc) const {
     TClass* cl = type_.getClass();
     if (cl != nullptr) {
       cl->Destructor(address_, !dealloc);
@@ -121,4 +104,4 @@ namespace edm {
     }
   }
 
-} // namespace edm
+}  // namespace edm
diff --git a/FWCore/Utilities/src/Parse.cc b/FWCore/Utilities/src/Parse.cc
index 49b746c262a8a..276fc82d93239 100644
--- a/FWCore/Utilities/src/Parse.cc
+++ b/FWCore/Utilities/src/Parse.cc
@@ -7,63 +7,57 @@
 
 namespace edm {
 
-    std::string  read_whole_file(std::string const& filename) {
-      std::string result;
-      std::ifstream input(filename.c_str());
-      if (!input) {
-       throw edm::Exception(errors::Configuration,"MissingFile")
-         << "Cannot read file " << filename;
-      }
-      std::string buffer;
-      while (getline(input, buffer)) {
-          // getline strips newlines; we have to put them back by hand.
-          result += buffer;
-          result += '\n';
-      }
-      return result; 
+  std::string read_whole_file(std::string const& filename) {
+    std::string result;
+    std::ifstream input(filename.c_str());
+    if (!input) {
+      throw edm::Exception(errors::Configuration, "MissingFile") << "Cannot read file " << filename;
     }
-
-
-    void read_from_cin(std::string & output) {
-      std::string line;
-      while (getline(std::cin, line)) {
-        output += line;
-        output += '\n';
-      }
+    std::string buffer;
+    while (getline(input, buffer)) {
+      // getline strips newlines; we have to put them back by hand.
+      result += buffer;
+      result += '\n';
     }
+    return result;
+  }
+
+  void read_from_cin(std::string& output) {
+    std::string line;
+    while (getline(std::cin, line)) {
+      output += line;
+      output += '\n';
+    }
+  }
 
-
-    std::string withoutQuotes(const std::string& from) {
-      std::string result = from;
-      if(!result.empty()) {
+  std::string withoutQuotes(const std::string& from) {
+    std::string result = from;
+    if (!result.empty()) {
       // get rid of leading quotes
-        if(result[0] == '"' || result[0] == '\'') {
-          result.erase(0,1);
-        }
+      if (result[0] == '"' || result[0] == '\'') {
+        result.erase(0, 1);
       }
+    }
 
-      if(!result.empty()) {
-       // and trailing quotes
-        int lastpos = result.size()-1;
-        if(result[lastpos] == '"' || result[lastpos] == '\'') {
-          result.erase(lastpos, 1);
-        }
+    if (!result.empty()) {
+      // and trailing quotes
+      int lastpos = result.size() - 1;
+      if (result[lastpos] == '"' || result[lastpos] == '\'') {
+        result.erase(lastpos, 1);
       }
-     return result;
     }
+    return result;
+  }
 
+  std::vector<std::string> tokenize(const std::string& input, const std::string& separator) {
+    typedef boost::char_separator<char> separator_t;
+    typedef boost::tokenizer<separator_t> tokenizer_t;
 
-    std::vector<std::string> 
-    tokenize(const std::string & input, const std::string &separator) {
-      typedef boost::char_separator<char>   separator_t;
-      typedef boost::tokenizer<separator_t> tokenizer_t;
-
-      std::vector<std::string> result;
-      separator_t  sep(separator.c_str(), "", boost::keep_empty_tokens); // separator for elements in path
-      tokenizer_t  tokens(input, sep);
-      copy_all(tokens, std::back_inserter<std::vector<std::string> >(result));
-      return result;
-    }
-
-} // namespace edm
+    std::vector<std::string> result;
+    separator_t sep(separator.c_str(), "", boost::keep_empty_tokens);  // separator for elements in path
+    tokenizer_t tokens(input, sep);
+    copy_all(tokens, std::back_inserter<std::vector<std::string> >(result));
+    return result;
+  }
 
+}  // namespace edm
diff --git a/FWCore/Utilities/src/Presence.cc b/FWCore/Utilities/src/Presence.cc
index 0919432d05849..f9c124f707713 100644
--- a/FWCore/Utilities/src/Presence.cc
+++ b/FWCore/Utilities/src/Presence.cc
@@ -5,4 +5,4 @@
 
 namespace edm {
   Presence::~Presence() {}
-}
+}  // namespace edm
diff --git a/FWCore/Utilities/src/RegexMatch.cc b/FWCore/Utilities/src/RegexMatch.cc
index ae123ff3ab135..2cb7e1aef974e 100644
--- a/FWCore/Utilities/src/RegexMatch.cc
+++ b/FWCore/Utilities/src/RegexMatch.cc
@@ -9,15 +9,12 @@ namespace edm {
 
   // checks that a tainted string is valid.
   // Needed to satisfy Coverity.
-  bool
-  untaintString(char const* pattern, char const* regexp) {
+  bool untaintString(char const* pattern, char const* regexp) {
     std::regex rexp(regexp);
     return std::regex_match(pattern, rexp);
   }
 
-  bool is_glob(std::string const& pattern) {
-    return (pattern.find_first_of("*?") != pattern.npos);
-  }
+  bool is_glob(std::string const& pattern) { return (pattern.find_first_of("*?") != pattern.npos); }
 
   std::string glob2reg(std::string const& pattern) {
     std::string regexp = pattern;
@@ -26,9 +23,9 @@ namespace edm {
     return regexp;
   }
 
-  std::vector<std::vector<std::string>::const_iterator>
-  regexMatch(std::vector<std::string> const& strings, std::regex const& regexp) {
-    std::vector< std::vector<std::string>::const_iterator> matches;
+  std::vector<std::vector<std::string>::const_iterator> regexMatch(std::vector<std::string> const& strings,
+                                                                   std::regex const& regexp) {
+    std::vector<std::vector<std::string>::const_iterator> matches;
     for (std::vector<std::string>::const_iterator i = strings.begin(), iEnd = strings.end(); i != iEnd; ++i) {
       if (std::regex_match((*i), regexp)) {
         matches.push_back(i);
@@ -37,10 +34,10 @@ namespace edm {
     return matches;
   }
 
-  std::vector<std::vector<std::string>::const_iterator>
-  regexMatch(std::vector<std::string> const& strings, std::string const& pattern) {
+  std::vector<std::vector<std::string>::const_iterator> regexMatch(std::vector<std::string> const& strings,
+                                                                   std::string const& pattern) {
     std::regex regexp(glob2reg(pattern));
     return regexMatch(strings, regexp);
   }
 
-}
+}  // namespace edm
diff --git a/FWCore/Utilities/src/ReleaseVersion.cc b/FWCore/Utilities/src/ReleaseVersion.cc
index 7d0bb899b224a..eefd8da07d4a4 100644
--- a/FWCore/Utilities/src/ReleaseVersion.cc
+++ b/FWCore/Utilities/src/ReleaseVersion.cc
@@ -10,30 +10,27 @@
 
 namespace edm {
   namespace releaseversion {
-    
+
     struct IsNotDigit {
-      bool operator()(char const c) const {
-        return !isdigit(c);
-      } 
+      bool operator()(char const c) const { return !isdigit(c); }
     };
 
     struct IsEmpty {
-      bool operator()(std::string const& s) const {
-        return s.empty();
-      } 
+      bool operator()(std::string const& s) const { return s.empty(); }
     };
 
-    DecomposedReleaseVersion::DecomposedReleaseVersion(std::string releaseVersion) : irregular_(true), major_(0), minor_(0)/*, point_(0), patch_(0), pre_(0)*/ {
+    DecomposedReleaseVersion::DecomposedReleaseVersion(std::string releaseVersion)
+        : irregular_(true), major_(0), minor_(0) /*, point_(0), patch_(0), pre_(0)*/ {
       try {
         std::vector<std::string> parts;
         parts.reserve(releaseVersion.size());
         boost::algorithm::split(parts, releaseVersion, IsNotDigit(), boost::algorithm::token_compress_on);
         parts.erase(remove_if(parts.begin(), parts.end(), IsEmpty()), parts.end());
 
-        if(parts.size() < 3) {
-	  return;
+        if (parts.size() < 3) {
+          return;
         }
-/*
+        /*
         if(parts.size() == 4) {
           if(releaseVersion.find("patch") != std::string::npos) {
             patch_ = boost::lexical_cast<unsigned int>(parts[3]);
@@ -46,46 +43,43 @@ namespace edm {
 */
         major_ = boost::lexical_cast<unsigned int>(parts[0]);
         minor_ = boost::lexical_cast<unsigned int>(parts[1]);
-//        point_ = boost::lexical_cast<unsigned int>(parts[2]);
+        //        point_ = boost::lexical_cast<unsigned int>(parts[2]);
         irregular_ = false;
-      } catch(std::exception const&) {
+      } catch (std::exception const&) {
       }
     }
 
-
     bool DecomposedReleaseVersion::operator<(DecomposedReleaseVersion const& other) const {
-      if(irregular_ || other.irregular_) return false;
-      if(major_ < other.major_) return true;
-      if(major_ > other.major_) return false;
-      if(minor_ < other.minor_) return true;
-//      if(minor_ > other.minor_) return false;
-//      if(point_ < other.point_) return true;
-//      if(point_ > other.point_) return false;
-//      if(patch_ < other.patch_) return true;
-//      if(patch_ > other.patch_) return false;
-//      if(pre_ < other.pre_) return true;
+      if (irregular_ || other.irregular_)
+        return false;
+      if (major_ < other.major_)
+        return true;
+      if (major_ > other.major_)
+        return false;
+      if (minor_ < other.minor_)
+        return true;
+      //      if(minor_ > other.minor_) return false;
+      //      if(point_ < other.point_) return true;
+      //      if(point_ > other.point_) return false;
+      //      if(patch_ < other.patch_) return true;
+      //      if(patch_ > other.patch_) return false;
+      //      if(pre_ < other.pre_) return true;
       return false;
     }
 
-    bool
-    isEarlierRelease(std::string const& a, std::string const& b) {
-      return(DecomposedReleaseVersion(a) < DecomposedReleaseVersion(b));
+    bool isEarlierRelease(std::string const& a, std::string const& b) {
+      return (DecomposedReleaseVersion(a) < DecomposedReleaseVersion(b));
     }
 
-    bool
-    isEarlierRelease(DecomposedReleaseVersion const& a, std::string const& b) {
-      return(a < DecomposedReleaseVersion(b));
+    bool isEarlierRelease(DecomposedReleaseVersion const& a, std::string const& b) {
+      return (a < DecomposedReleaseVersion(b));
     }
 
-    bool
-    isEarlierRelease(std::string const& a, DecomposedReleaseVersion const& b) {
-      return(DecomposedReleaseVersion(a) < b);
+    bool isEarlierRelease(std::string const& a, DecomposedReleaseVersion const& b) {
+      return (DecomposedReleaseVersion(a) < b);
     }
 
-    bool
-    isEarlierRelease(DecomposedReleaseVersion const& a, DecomposedReleaseVersion const& b) {
-      return(a < b);
-    }
+    bool isEarlierRelease(DecomposedReleaseVersion const& a, DecomposedReleaseVersion const& b) { return (a < b); }
 
-  }
-}
+  }  // namespace releaseversion
+}  // namespace edm
diff --git a/FWCore/Utilities/src/RunIndex.cc b/FWCore/Utilities/src/RunIndex.cc
index af069c0600766..5affdeb805cb9 100644
--- a/FWCore/Utilities/src/RunIndex.cc
+++ b/FWCore/Utilities/src/RunIndex.cc
@@ -4,9 +4,7 @@
 
 namespace edm {
 
-  const unsigned int RunIndex::invalidValue_ = std::numeric_limits<unsigned int>::max();    
+  const unsigned int RunIndex::invalidValue_ = std::numeric_limits<unsigned int>::max();
 
-  RunIndex RunIndex::invalidRunIndex() {
-    return RunIndex(invalidValue_);
-  }
-}
+  RunIndex RunIndex::invalidRunIndex() { return RunIndex(invalidValue_); }
+}  // namespace edm
diff --git a/FWCore/Utilities/src/SingleConsumerQ.cc b/FWCore/Utilities/src/SingleConsumerQ.cc
index e05a6c0204857..659d864c8fb9d 100644
--- a/FWCore/Utilities/src/SingleConsumerQ.cc
+++ b/FWCore/Utilities/src/SingleConsumerQ.cc
@@ -1,46 +1,42 @@
 #include "FWCore/Utilities/interface/SingleConsumerQ.h"
 
-namespace edm
-{
+namespace edm {
 
-  SingleConsumerQ::SingleConsumerQ(int max_event_size, int max_queue_depth):
-    max_event_size_(max_event_size),max_queue_depth_(max_queue_depth),
-    pos_(max_queue_depth-1),mem_(max_event_size * max_queue_depth),
-    buffer_pool_(),
-    queue_(max_queue_depth),
-    fpos_(),
-    bpos_(),
-    pool_lock_(),
-    queue_lock_(),
-    pool_cond_(),
-    pop_cond_(),
-    push_cond_()
-  {
+  SingleConsumerQ::SingleConsumerQ(int max_event_size, int max_queue_depth)
+      : max_event_size_(max_event_size),
+        max_queue_depth_(max_queue_depth),
+        pos_(max_queue_depth - 1),
+        mem_(max_event_size * max_queue_depth),
+        buffer_pool_(),
+        queue_(max_queue_depth),
+        fpos_(),
+        bpos_(),
+        pool_lock_(),
+        queue_lock_(),
+        pool_cond_(),
+        pop_cond_(),
+        push_cond_() {
     // throw if event size 0 or queue depth 0
 
-    for(char* i=&mem_[0];i<&mem_[mem_.size()];i+=max_event_size)
+    for (char* i = &mem_[0]; i < &mem_[mem_.size()]; i += max_event_size)
       buffer_pool_.push_back(i);
-
   }
 
-  SingleConsumerQ::~SingleConsumerQ() { }
+  SingleConsumerQ::~SingleConsumerQ() {}
 
-  SingleConsumerQ::Buffer SingleConsumerQ::getProducerBuffer()
-  {
+  SingleConsumerQ::Buffer SingleConsumerQ::getProducerBuffer() {
     // get lock
     std::unique_lock<std::mutex> sl(pool_lock_);
     // wait for buffer to appear
-    while(pos_ < 0)
-      {
-	pool_cond_.wait(sl);
-      }
+    while (pos_ < 0) {
+      pool_cond_.wait(sl);
+    }
     void* v = buffer_pool_[pos_];
     --pos_;
-    return Buffer(v,max_event_size_);
+    return Buffer(v, max_event_size_);
   }
 
-  void SingleConsumerQ::releaseProducerBuffer(void* v)
-  {
+  void SingleConsumerQ::releaseProducerBuffer(void* v) {
     // get lock
     std::lock_guard<std::mutex> sl(pool_lock_);
     ++pos_;
@@ -48,32 +44,28 @@ namespace edm
     pool_cond_.notify_all();
   }
 
-  void SingleConsumerQ::commitProducerBuffer(void* v, int len)
-  {
+  void SingleConsumerQ::commitProducerBuffer(void* v, int len) {
     // get lock
     std::unique_lock<std::mutex> sl(queue_lock_);
     // if full, wait for item to be removed
-    while((bpos_+max_queue_depth_)==fpos_)
-      {
-	push_cond_.wait(sl);
-      }
+    while ((bpos_ + max_queue_depth_) == fpos_) {
+      push_cond_.wait(sl);
+    }
 
     // put buffer into queue
-    queue_[fpos_ % max_queue_depth_]=Buffer(v,len);
+    queue_[fpos_ % max_queue_depth_] = Buffer(v, len);
     ++fpos_;
     // signal consumer
     pop_cond_.notify_all();
   }
 
-  SingleConsumerQ::Buffer SingleConsumerQ::getConsumerBuffer()
-  {
+  SingleConsumerQ::Buffer SingleConsumerQ::getConsumerBuffer() {
     // get lock
     std::unique_lock<std::mutex> sl(queue_lock_);
     // if empty, wait for item to appear
-    while(bpos_==fpos_)
-      {
-	pop_cond_.wait(sl);
-      }
+    while (bpos_ == fpos_) {
+      pop_cond_.wait(sl);
+    }
     // get a buffer from the queue and return it
     Buffer v = queue_[bpos_ % max_queue_depth_];
     ++bpos_;
@@ -83,8 +75,7 @@ namespace edm
     return v;
   }
 
-  void SingleConsumerQ::releaseConsumerBuffer(void* v)
-  {
+  void SingleConsumerQ::releaseConsumerBuffer(void* v) {
     // should the buffer be placed back onto the queue and not released?
     // we got here because a commit did to occur in the consumer.
     // we will allow consumers to call or not call commit for now, meaning
@@ -93,8 +84,5 @@ namespace edm
     releaseProducerBuffer(v);
   }
 
-  void SingleConsumerQ::commitConsumerBuffer(void* v, int)
-  {
-    releaseProducerBuffer(v);
-  }
-}
+  void SingleConsumerQ::commitConsumerBuffer(void* v, int) { releaseProducerBuffer(v); }
+}  // namespace edm
diff --git a/FWCore/Utilities/src/TestHelper.cc b/FWCore/Utilities/src/TestHelper.cc
index 00588dda2d0ad..5827f4164723a 100644
--- a/FWCore/Utilities/src/TestHelper.cc
+++ b/FWCore/Utilities/src/TestHelper.cc
@@ -24,31 +24,31 @@ int run_script(std::string const& shell, std::string const& script) {
   pid_t pid = 0;
   int status = 0;
 
-  if((pid = fork()) < 0) {
-      std::cerr << "fork failed, to run " << script << std::endl;
-      return -1;
+  if ((pid = fork()) < 0) {
+    std::cerr << "fork failed, to run " << script << std::endl;
+    return -1;
   }
 
-  if(pid == 0) { // child
+  if (pid == 0) {  // child
     execlp(shell.c_str(), "sh", "-c", script.c_str(), static_cast<char const*>(nullptr));
     std::cerr << "child failed becuase '" << strerror(errno) << "'\n";
-    _exit(127); // signal parent and children processes
-  } else { // parent
-    while(waitpid(pid, &status, 0) < 0) {
-      if(errno != EINTR) {
+    _exit(127);  // signal parent and children processes
+  } else {       // parent
+    while (waitpid(pid, &status, 0) < 0) {
+      if (errno != EINTR) {
         std::cerr << "child process failed " << strerror(errno) << "\n";
         status = -1;
         break;
       } else {
-        if(WIFSIGNALED(status)) {
+        if (WIFSIGNALED(status)) {
           std::cerr << "child existed because of a signal " << WTERMSIG(status) << "\n";
         }
       }
     }
-    if(WIFSIGNALED(status)) {
+    if (WIFSIGNALED(status)) {
       std::cerr << "child existed because of a signal " << WTERMSIG(status) << "\n";
     }
-    if(WIFEXITED(status)) {
+    if (WIFEXITED(status)) {
     }
   }
   return status;
@@ -57,7 +57,7 @@ int run_script(std::string const& shell, std::string const& script) {
 int do_work(int argc, char* argv[], char** env) {
   bf::path currentPath(bf::initial_path().string());
 
-  if(argc < 4) {
+  if (argc < 4) {
     std::cout << "Usage: " << argv[0] << " shell subdir script1 script2 ... scriptN\n\n"
               << "where shell is the path+shell (e.g., /bin/bash) intended to run the scripts\n"
               << "and subdir is the subsystem/package/subdir in which the scripts are found\n"
@@ -67,7 +67,8 @@ int do_work(int argc, char* argv[], char** env) {
     std::cout << "Current directory is: " << currentPath.string() << '\n';
     std::cout << "Current environment:\n";
     std::cout << "---------------------\n";
-    for(int i = 0; env[i] != nullptr; ++i) std::cout << env[i] << '\n';
+    for (int i = 0; env[i] != nullptr; ++i)
+      std::cout << env[i] << '\n';
     std::cout << "---------------------\n";
     std::cout << "Executable name: " << argv[0] << '\n';
     return -1;
@@ -75,7 +76,7 @@ int do_work(int argc, char* argv[], char** env) {
 
   char const* goodDirectory = "[A-Za-z0-9/_.-]+";
 
-  for(int i = 0; i < argc; ++i) {
+  for (int i = 0; i < argc; ++i) {
     std::cout << "argument " << i << ": " << argv[i] << '\n';
   }
 
@@ -86,14 +87,14 @@ int do_work(int argc, char* argv[], char** env) {
   // It is unclear about which of these environment variables should
   // be used.
   char const* topdir = getenv("SCRAMRT_LOCALRT");
-  if(!topdir) topdir = getenv("LOCALRT");
+  if (!topdir)
+    topdir = getenv("LOCALRT");
   try {
-    if(!edm::untaintString(topdir, goodDirectory)) {
+    if (!edm::untaintString(topdir, goodDirectory)) {
       std::cerr << "Invalid top directory '" << topdir << "'" << std::endl;
       return -1;
     }
-  }
-  catch(std::runtime_error const& e) {
+  } catch (std::runtime_error const& e) {
     std::cerr << "Invalid top directory '" << topdir << "'" << std::endl;
     std::cerr << "e.what" << std::endl;
     return -1;
@@ -101,7 +102,7 @@ int do_work(int argc, char* argv[], char** env) {
 
   char const* arch = getenv("SCRAM_ARCH");
 
-  if(!arch) {
+  if (!arch) {
     // Try to synthesize SCRAM_ARCH value.
     bf::path exepath(argv[0]);
 #if (BOOST_VERSION / 100000) >= 1 && ((BOOST_VERSION / 100) % 1000) >= 47
@@ -109,7 +110,7 @@ int do_work(int argc, char* argv[], char** env) {
 #else
     std::string maybe_arch = exepath.branch_path().leaf();
 #endif
-    if(setenv("SCRAM_ARCH", maybe_arch.c_str(), 1) != 0) {
+    if (setenv("SCRAM_ARCH", maybe_arch.c_str(), 1) != 0) {
       std::cerr << "SCRAM_ARCH not set and attempt to set it failed\n";
       return -1;
     }
@@ -118,52 +119,57 @@ int do_work(int argc, char* argv[], char** env) {
 
   int rc = 0;
 
-  if(!topdir) {
+  if (!topdir) {
     std::cerr << "Neither SCRAMRT_LOCALRT nor LOCALRT is defined" << std::endl;
     return -1;
   }
 
   try {
-    if(!edm::untaintString(argv[2], goodDirectory)) {
+    if (!edm::untaintString(argv[2], goodDirectory)) {
       std::cerr << "Invalid test directory '" << argv[2] << "'" << std::endl;
       return -1;
     }
-  }
-  catch(std::runtime_error const& e) {
+  } catch (std::runtime_error const& e) {
     std::cerr << "Invalid test directory '" << argv[2] << "'" << std::endl;
     std::cerr << "e.what" << std::endl;
     return -1;
   }
 
-  std::string testdir(topdir); testdir += "/src/"; testdir += argv[2];
-  std::string tmpdir(topdir);  tmpdir += "/tmp/";   tmpdir += arch;
-  std::string testbin(topdir); testbin += "/test/"; testbin += arch;
+  std::string testdir(topdir);
+  testdir += "/src/";
+  testdir += argv[2];
+  std::string tmpdir(topdir);
+  tmpdir += "/tmp/";
+  tmpdir += arch;
+  std::string testbin(topdir);
+  testbin += "/test/";
+  testbin += arch;
 
   std::cout << "topdir is: " << topdir << '\n';
   std::cout << "testdir is: " << testdir << '\n';
   std::cout << "tmpdir is: " << tmpdir << '\n';
   std::cout << "testbin is: " << testbin << '\n';
 
-  if(setenv("LOCAL_TEST_DIR", testdir.c_str(),1) != 0) {
+  if (setenv("LOCAL_TEST_DIR", testdir.c_str(), 1) != 0) {
     std::cerr << "Could not set LOCAL_TEST_DIR to " << testdir << std::endl;
     return -1;
   }
-  if(setenv("LOCAL_TMP_DIR", tmpdir.c_str(),1) != 0) {
+  if (setenv("LOCAL_TMP_DIR", tmpdir.c_str(), 1) != 0) {
     std::cerr << "Could not set LOCAL_TMP_DIR to " << tmpdir << std::endl;
     return -1;
   }
-  if(setenv("LOCAL_TOP_DIR", topdir,1) != 0) {
+  if (setenv("LOCAL_TOP_DIR", topdir, 1) != 0) {
     std::cerr << "Could not set LOCAL_TOP_DIR to " << topdir << std::endl;
     return -1;
   }
-  if(setenv("LOCAL_TEST_BIN", testbin.c_str(),1) != 0) {
+  if (setenv("LOCAL_TEST_BIN", testbin.c_str(), 1) != 0) {
     std::cerr << "Could not set LOCAL_TEST_BIN to " << testbin << std::endl;
     return -1;
   }
 
   testdir += "/";
 
-  for(int i = 3; i < argc && rc == 0; ++i) {
+  for (int i = 3; i < argc && rc == 0; ++i) {
     std::string scriptname(testdir);
     scriptname += argv[i];
     std::cout << "Running script: " << scriptname << std::endl;
@@ -178,25 +184,14 @@ int ptomaine(int argc, char* argv[], char** env) {
   int rc = 1;
   try {
     rc = do_work(argc, argv, env);
-  }
-  catch(edm::Exception& x) {
-    std::cerr << "Caught an edm::Exception in "
-              << argv[0] << '\n'
-              << x;
-  }
-  catch(cms::Exception& x) {
-    std::cerr << "Caught a cms::Exception in "
-              << argv[0] << '\n'
-              << x;
-    }
-  catch(std::exception& x) {
-    std::cerr << "Caught a std::exception in "
-              << argv[0] << '\n'
-              << x.what();
-  }
-  catch(...) {
-    std::cerr << "Caught an unknown exception in "
-              << argv[0];
+  } catch (edm::Exception& x) {
+    std::cerr << "Caught an edm::Exception in " << argv[0] << '\n' << x;
+  } catch (cms::Exception& x) {
+    std::cerr << "Caught a cms::Exception in " << argv[0] << '\n' << x;
+  } catch (std::exception& x) {
+    std::cerr << "Caught a std::exception in " << argv[0] << '\n' << x.what();
+  } catch (...) {
+    std::cerr << "Caught an unknown exception in " << argv[0];
   }
   return rc;
 }
diff --git a/FWCore/Utilities/src/TimeOfDay.cc b/FWCore/Utilities/src/TimeOfDay.cc
index 8b914e665f10d..7962798f693f3 100644
--- a/FWCore/Utilities/src/TimeOfDay.cc
+++ b/FWCore/Utilities/src/TimeOfDay.cc
@@ -5,44 +5,40 @@
 #include <ctime>
 
 namespace {
-  int const power[] = {1000*1000, 100*1000, 10*1000, 1000, 100, 10, 1};
+  int const power[] = {1000 * 1000, 100 * 1000, 10 * 1000, 1000, 100, 10, 1};
 }
 
 namespace edm {
 
-  TimeOfDay::TimeOfDay() : tv_(TimeOfDay::setTime_()) {
-  }
+  TimeOfDay::TimeOfDay() : tv_(TimeOfDay::setTime_()) {}
 
-  TimeOfDay::TimeOfDay(struct timeval const& tv) : tv_(tv) {
-  }
+  TimeOfDay::TimeOfDay(struct timeval const& tv) : tv_(tv) {}
 
-  timeval
-  TimeOfDay::setTime_() {
+  timeval TimeOfDay::setTime_() {
     timeval tv;
     gettimeofday(&tv, nullptr);
     return tv;
   }
 
-  std::ostream&
-  operator<<(std::ostream& os, TimeOfDay const& tod) {
-    std::ios::fmtflags oldflags = os.flags(); // Save stream formats so they can be left unchanged.
+  std::ostream& operator<<(std::ostream& os, TimeOfDay const& tod) {
+    std::ios::fmtflags oldflags = os.flags();  // Save stream formats so they can be left unchanged.
     struct tm timebuf;
     localtime_r(&tod.tv_.tv_sec, &timebuf);
     typedef std::ostreambuf_iterator<char, std::char_traits<char> > Iter;
     std::time_put<char, Iter> const& tp = std::use_facet<std::time_put<char, Iter> >(std::locale());
     int precision = os.precision();
     Iter begin(os);
-    if(precision == 0) {
+    if (precision == 0) {
       char const pattern[] = "%d-%b-%Y %H:%M:%S %Z";
       tp.put(begin, os, ' ', &timebuf, pattern, pattern + sizeof(pattern) - 1);
     } else {
       char const pattern[] = "%d-%b-%Y %H:%M:%S.";
       tp.put(begin, os, ' ', &timebuf, pattern, pattern + sizeof(pattern) - 1);
       precision = std::min(precision, 6);
-      os << std::setfill('0') << std::setw(precision) << tod.tv_.tv_usec/power[precision] << ' ';
+      os << std::setfill('0') << std::setw(precision) << tod.tv_.tv_usec / power[precision] << ' ';
       tp.put(begin, os, ' ', &timebuf, 'Z');
     }
     os.flags(oldflags);
     return os;
   }
-}
+}  // namespace edm
diff --git a/FWCore/Utilities/src/TimingServiceBase.cc b/FWCore/Utilities/src/TimingServiceBase.cc
index c4468f8b9328a..0c6b457aa7a93 100644
--- a/FWCore/Utilities/src/TimingServiceBase.cc
+++ b/FWCore/Utilities/src/TimingServiceBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Subsystem/Package
 // Class  :     TimingServiceBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -26,7 +26,7 @@ double TimingServiceBase::s_jobStartTime = 0.0;
 void TimingServiceBase::jobStarted() {
   if (0.0 == s_jobStartTime) {
     struct timeval t;
-    if(gettimeofday(&t, nullptr) < 0) {
+    if (gettimeofday(&t, nullptr) < 0) {
       return;
     }
     s_jobStartTime = static_cast<double>(t.tv_sec) + (static_cast<double>(t.tv_usec) * 1E-6);
@@ -36,10 +36,6 @@ void TimingServiceBase::jobStarted() {
 //
 // constructors and destructor
 //
-TimingServiceBase::TimingServiceBase()
-{
-}
+TimingServiceBase::TimingServiceBase() {}
 
-TimingServiceBase::~TimingServiceBase()
-{
-}
+TimingServiceBase::~TimingServiceBase() {}
diff --git a/FWCore/Utilities/src/TypeDemangler.cc b/FWCore/Utilities/src/TypeDemangler.cc
index a7c7d93698881..3920bd41d35e2 100644
--- a/FWCore/Utilities/src/TypeDemangler.cc
+++ b/FWCore/Utilities/src/TypeDemangler.cc
@@ -25,17 +25,15 @@
 
 ********************************************************************/
 namespace {
-  void
-  reformatter(std::string& input, char const* exp, char const* format) {
+  void reformatter(std::string& input, char const* exp, char const* format) {
     std::regex regexp(exp, std::regex::egrep);
-    while(std::regex_match(input, regexp)) {
+    while (std::regex_match(input, regexp)) {
       std::string newstring = std::regex_replace(input, regexp, format);
       input.swap(newstring);
     }
   }
 
-  void
-  removeParameter(std::string& demangledName, std::string const& toRemove) {
+  void removeParameter(std::string& demangledName, std::string const& toRemove) {
     std::string::size_type const asize = toRemove.size();
     char const* const delimiters = "<>";
     std::string::size_type index = std::string::npos;
@@ -57,11 +55,10 @@ namespace {
         }
         ++inx;
       }
-    } 
+    }
   }
 
-  void
-  constBeforeIdentifier(std::string& demangledName) {
+  void constBeforeIdentifier(std::string& demangledName) {
     std::string const toBeMoved(" const");
     std::string::size_type const asize = toBeMoved.size();
     std::string::size_type index = std::string::npos;
@@ -73,7 +70,8 @@ namespace {
         if (c == '>') {
           ++depth;
         } else if (depth > 0) {
-          if (c == '<') --depth;
+          if (c == '<')
+            --depth;
         } else if (c == '<' || c == ',') {
           demangledName.insert(inx + 1, "const ");
           break;
@@ -81,30 +79,28 @@ namespace {
       }
     }
   }
-}
+}  // namespace
 
 namespace edm {
-  void
-  replaceString(std::string& demangledName, std::string const& from, std::string const& to) {
+  void replaceString(std::string& demangledName, std::string const& from, std::string const& to) {
     // from must not be a substring of to.
-    std::string::size_type length = from.size(); 
+    std::string::size_type length = from.size();
     std::string::size_type pos = 0;
-    while((pos = demangledName.find(from, pos)) != std::string::npos) {
-       demangledName.replace(pos, length, to); 
+    while ((pos = demangledName.find(from, pos)) != std::string::npos) {
+      demangledName.replace(pos, length, to);
     }
   }
 
-  std::string
-  typeDemangle(char const* mangledName) {
+  std::string typeDemangle(char const* mangledName) {
     int status = 0;
     size_t* const nullSize = nullptr;
     char* const null = nullptr;
-    
+
     // The demangled C style string is allocated with malloc, so it must be deleted with free().
     char* demangled = abi::__cxa_demangle(mangledName, null, nullSize, &status);
     if (status != 0) {
       throw cms::Exception("Demangling error") << " '" << mangledName << "'\n";
-    } 
+    }
     std::string demangledName(demangled);
     free(demangled);
     // We must use the same conventions previously used by REFLEX.
@@ -125,7 +121,7 @@ namespace edm {
     removeParameter(demangledName, comparator);
     // Put const qualifier before identifier.
     constBeforeIdentifier(demangledName);
-    // No two consecutive '>' 
+    // No two consecutive '>'
     replaceString(demangledName, ">>", "> >");
     // No u or l qualifiers for integers.
     reformatter(demangledName, "(.*[<,][0-9]+)[ul]l*([,>].*)", "$1$2");
@@ -135,4 +131,4 @@ namespace edm {
     replaceString(demangledName, "long long", "Long64_t");
     return demangledName;
   }
-}
+}  // namespace edm
diff --git a/FWCore/Utilities/src/TypeID.cc b/FWCore/Utilities/src/TypeID.cc
index 64923a1374de3..91b25170cc27e 100644
--- a/FWCore/Utilities/src/TypeID.cc
+++ b/FWCore/Utilities/src/TypeID.cc
@@ -10,8 +10,7 @@
 #include "FWCore/Utilities/interface/TypeDemangler.h"
 
 namespace edm {
-  void
-  TypeID::print(std::ostream& os) const {
+  void TypeID::print(std::ostream& os) const {
     try {
       os << className();
     } catch (cms::Exception const&) {
@@ -19,21 +18,21 @@ namespace edm {
     }
   }
 
-namespace {
+  namespace {
 
-  TypeID const nullTypeID;
+    TypeID const nullTypeID;
 
-  std::string typeToClassName(std::type_info const& iType) {
-    try {
-      return typeDemangle(iType.name());
-    } catch (cms::Exception const& e) {
-      cms::Exception theError("Name Demangling Error");
-      theError << "TypeID::typeToClassName: can't demangle " << iType.name() << '\n';
-      theError.append(e);
-      throw theError;
+    std::string typeToClassName(std::type_info const& iType) {
+      try {
+        return typeDemangle(iType.name());
+      } catch (cms::Exception const& e) {
+        cms::Exception theError("Name Demangling Error");
+        theError << "TypeID::typeToClassName: can't demangle " << iType.name() << '\n';
+        theError.append(e);
+        throw theError;
+      }
     }
-  }
-}
+  }  // namespace
   struct TypeIDHasher {
     size_t operator()(TypeID const& tid) const {
       tbb::tbb_hash<std::string> hasher;
@@ -41,21 +40,18 @@ namespace {
     }
   };
 
-
-  std::string const&
-  TypeID::className() const {
+  std::string const& TypeID::className() const {
     typedef tbb::concurrent_unordered_map<edm::TypeID, std::string, TypeIDHasher> Map;
     static Map s_typeToName;
 
     auto itFound = s_typeToName.find(*this);
-    if(s_typeToName.end() == itFound) {
+    if (s_typeToName.end() == itFound) {
       itFound = s_typeToName.insert(Map::value_type(*this, typeToClassName(typeInfo()))).first;
     }
     return itFound->second;
   }
 
-  std::string
-  TypeID::userClassName() const {
+  std::string TypeID::userClassName() const {
     std::string theName = className();
     if (theName.find("edm::Wrapper") == 0) {
       stripTemplate(theName);
@@ -63,13 +59,9 @@ namespace {
     return theName;
   }
 
-  std::string
-  TypeID::friendlyClassName() const {
-    return friendlyname::friendlyName(className());
-  }
+  std::string TypeID::friendlyClassName() const { return friendlyname::friendlyName(className()); }
 
-  bool
-  stripTemplate(std::string& theName) {
+  bool stripTemplate(std::string& theName) {
     std::string const spec("<,>");
     char const space = ' ';
     std::string::size_type idx = theName.find_first_of(spec);
@@ -80,57 +72,53 @@ namespace {
     std::string::size_type after = idx;
     if (theName[idx] == '<') {
       after = theName.rfind('>');
-      assert (after != std::string::npos);
+      assert(after != std::string::npos);
       first = ++idx;
     } else {
       theName = theName.substr(0, idx);
     }
     std::string::size_type idxa = after;
-    while (space == theName[--idxa]) --after;
+    while (space == theName[--idxa])
+      --after;
     std::string::size_type idxf = first;
-    while (space == theName[idxf++]) ++first;
+    while (space == theName[idxf++])
+      ++first;
     theName = theName.substr(first, after - first);
     return true;
   }
 
-  std::string
-  stripNamespace(std::string const& theName) {
+  std::string stripNamespace(std::string const& theName) {
     // Find last colon
     std::string::size_type colonIndex = theName.rfind(':');
-    if(colonIndex == std::string::npos) {
+    if (colonIndex == std::string::npos) {
       // No colons, so no namespace to strip
       return theName;
     }
     std::string::size_type bracketIndex = theName.rfind('>');
-    if(bracketIndex == std::string::npos || bracketIndex < colonIndex) {
+    if (bracketIndex == std::string::npos || bracketIndex < colonIndex) {
       // No '>' after last colon.  Strip up to and including last colon.
-      return theName.substr(colonIndex+1);
+      return theName.substr(colonIndex + 1);
     }
     // There is a '>' after the last colon.
     int depth = 1;
-    for(size_t index = bracketIndex; index != 0; --index) {
-      char c = theName[index - 1]; 
-      if(c == '>') {
+    for (size_t index = bracketIndex; index != 0; --index) {
+      char c = theName[index - 1];
+      if (c == '>') {
         ++depth;
-      } else if(c == '<') {
+      } else if (c == '<') {
         --depth;
         assert(depth >= 0);
-      } else if(depth == 0 && c == ':') {
+      } else if (depth == 0 && c == ':') {
         return theName.substr(index);
       }
     }
     return theName;
   }
 
-  TypeID::operator bool() const {
-    return !(*this == nullTypeID);
-  }
-
+  TypeID::operator bool() const { return !(*this == nullTypeID); }
 
-  std::ostream&
-  operator<<(std::ostream& os, TypeID const& id) {
+  std::ostream& operator<<(std::ostream& os, TypeID const& id) {
     id.print(os);
     return os;
   }
-}
-
+}  // namespace edm
diff --git a/FWCore/Utilities/src/TypeWithDict.cc b/FWCore/Utilities/src/TypeWithDict.cc
index 3e6b0716078e6..1300c4516dcf2 100644
--- a/FWCore/Utilities/src/TypeWithDict.cc
+++ b/FWCore/Utilities/src/TypeWithDict.cc
@@ -39,59 +39,50 @@ namespace edm {
     FunctionMap functionMap;
 
     struct TypeIndexHash {
-      std::size_t operator()(std::type_index ti) const {
-        return ti.hash_code();
-      }
+      std::size_t operator()(std::type_index ti) const { return ti.hash_code(); }
     };
- 
+
     using TypeIndexMap = tbb::concurrent_unordered_map<std::type_index, TypeWithDict, TypeIndexHash>;
     TypeIndexMap typeIndexMap;
+  }  // namespace
+  static void throwTypeException(std::string const& function, std::string const& typeName) {
+    throw Exception(errors::DictionaryNotFound) << "Function " << function << ",\n"
+                                                << "no data dictionary found for type:\n\n"
+                                                << typeName << "\nMost likely the dictionary was never generated,\n"
+                                                << "but it may be that it was generated in the wrong package.\n"
+                                                << "Please add (or move) the specification\n"
+                                                << "<class name=\"whatever\"/>\n"
+                                                << "to the appropriate classes_def.xml file.\n"
+                                                << "If the class is a template instance, you may need\n"
+                                                << "to define a dummy variable of this type in classes.h.\n"
+                                                << "Also, if this class has any transient members,\n"
+                                                << "you need to specify them in classes_def.xml.";
+  }
+
+  TypeWithDict TypeWithDict::byTypeInfo(std::type_info const& ti) {
+    // This is a public static function.
+    auto index = std::type_index(ti);
+    auto const& item = typeIndexMap.find(index);
+    if (item != typeIndexMap.end()) {
+      return item->second;
+    }
+    TypeWithDict theType(ti, 0L);
+    typeIndexMap.insert(std::make_pair(index, theType));
+    return theType;
   }
-   static
-   void throwTypeException(std::string const& function, std::string const& typeName) {
-      throw Exception(errors::DictionaryNotFound)
-         << "Function " << function << ",\n"
-         << "no data dictionary found for type:\n\n"
-         <<  typeName
-         << "\nMost likely the dictionary was never generated,\n"
-         << "but it may be that it was generated in the wrong package.\n"
-         << "Please add (or move) the specification\n"
-         << "<class name=\"whatever\"/>\n"
-         << "to the appropriate classes_def.xml file.\n"
-         << "If the class is a template instance, you may need\n"
-         << "to define a dummy variable of this type in classes.h.\n"
-         << "Also, if this class has any transient members,\n"
-         << "you need to specify them in classes_def.xml.";
-
-   }
-
-   TypeWithDict
-   TypeWithDict::byTypeInfo(std::type_info const& ti) {
-     // This is a public static function.
-     auto index = std::type_index(ti);
-     auto const& item = typeIndexMap.find(index);
-     if(item != typeIndexMap.end()) {
-        return item->second;
-     }
-     TypeWithDict theType(ti, 0L);
-     typeIndexMap.insert(std::make_pair(index, theType));
-     return theType;
-   }
-
-  TypeWithDict
-  TypeWithDict::byName(std::string const& name) {
+
+  TypeWithDict TypeWithDict::byName(std::string const& name) {
     // This is a public static function.
     auto const& item = typeMap.find(name);
-    if(item != typeMap.end()) {
-       return item->second;
+    if (item != typeMap.end()) {
+      return item->second;
     }
     TypeWithDict theType = TypeWithDict::byName(name, 0L);
     typeMap.insert(std::make_pair(name, theType));
     return theType;
   }
 
-  TypeWithDict
-  TypeWithDict::byName(std::string const& name, long property) {
+  TypeWithDict TypeWithDict::byName(std::string const& name, long property) {
     // This is a private static function.
 
     static std::string const constPrefix("const ");
@@ -100,45 +91,45 @@ namespace edm {
     static size_t const constSuffixSize(constSuffix.size());
 
     // Handle references
-    if(name.back() == '&') {
+    if (name.back() == '&') {
       assert(property == 0L);
       property |= kIsReference;
       return byName(name.substr(0, name.size() - 1), property);
     }
 
     // Handle const qualifier
-    if(name.size() > constSuffixSize && name.back() != '*') {
-      if(name.substr(0, constPrefixSize) == constPrefix) {
+    if (name.size() > constSuffixSize && name.back() != '*') {
+      if (name.substr(0, constPrefixSize) == constPrefix) {
         property |= kIsConstant;
         return byName(name.substr(constPrefixSize), property);
       }
-      if(name.substr(name.size() - constSuffixSize) == constSuffix) {
+      if (name.substr(name.size() - constSuffixSize) == constSuffix) {
         property |= kIsConstant;
         return byName(name.substr(0, name.size() - constSuffixSize), property);
       }
     }
 
     // Handle pointers
-    if(name.back() == '*') {
+    if (name.back() == '*') {
       // pointer to pointer not supported
-      assert(!(property & (long) kIsPointer));
+      assert(!(property & (long)kIsPointer));
       // C-style array of pointers is not supported
-      assert(!(property & (long) kIsArray));
+      assert(!(property & (long)kIsArray));
       property |= kIsPointer;
-      if(property & (long) kIsConstant) {
-        property &= ~((long) kIsConstant);
+      if (property & (long)kIsConstant) {
+        property &= ~((long)kIsConstant);
         property |= kIsConstPointer;
       }
       return byName(name.substr(0, name.size() - 1), property);
     }
 
     // Handle C-style arrays
-    if(name.back() == ']') {
+    if (name.back() == ']') {
       // pointer to array not supported
-      assert(!(property & (long) kIsPointer));
+      assert(!(property & (long)kIsPointer));
       // Protect against the remote possibility of '[' nested in a class type
       size_t begin = name.find_last_of("<>:,()");
-      if(begin == std::string::npos) {
+      if (begin == std::string::npos) {
         begin = 0;
       } else {
         ++begin;
@@ -151,16 +142,16 @@ namespace edm {
       ret.arrayDimensions_ = value_ptr<std::vector<size_t> >(new std::vector<size_t>);
       std::string const dimensions = name.substr(first);
       char const* s = dimensions.c_str();
-      while(true) {
+      while (true) {
         size_t x = 0;
         int count = sscanf(s, "[%lu]", &x);
         assert(count == 1);
         ret.arrayDimensions_->push_back(x);
         ++s;
-        while(*s != '\0' && *s != '[') {
+        while (*s != '\0' && *s != '[') {
           ++s;
         }
-        if(*s == '\0') {
+        if (*s == '\0') {
           break;
         }
       }
@@ -175,68 +166,68 @@ namespace edm {
 
     // Handle enums
     TEnum* theEnum = TEnum::GetEnum(name.c_str(), TEnum::kAutoload);
-    if(theEnum) {
+    if (theEnum) {
       return TypeWithDict(theEnum, property);
     }
 
     // Handle built-ins
     TDataType* theDataType = gROOT->GetType(name.c_str());
-    if(theDataType) {
-      switch(theDataType->GetType()) {
-      case kUInt_t:
-        return TypeWithDict(typeid(unsigned int), property);
-      case kInt_t:
-        return TypeWithDict(typeid(int), property);
-      case kULong_t:
-        return TypeWithDict(typeid(unsigned long), property);
-      case kLong_t:
-        return TypeWithDict(typeid(long), property);
-      case kULong64_t:
-        return TypeWithDict(typeid(unsigned long long), property);
-      case kLong64_t:
-        return TypeWithDict(typeid(long long), property);
-      case kUShort_t:
-        return TypeWithDict(typeid(unsigned short), property);
-      case kShort_t:
-        return TypeWithDict(typeid(short), property);
-      case kUChar_t:
-        return TypeWithDict(typeid(unsigned char), property);
-      case kChar_t:
-        return TypeWithDict(typeid(char), property);
-      case kBool_t:
-        return TypeWithDict(typeid(bool), property);
-      case kFloat_t:
-        return TypeWithDict(typeid(float), property);
-      case kFloat16_t:
-        return TypeWithDict(typeid(Float16_t), property);
-      case kDouble_t:
-        return TypeWithDict(typeid(double), property);
-      case kDouble32_t:
-        return TypeWithDict(typeid(Double32_t), property);
-      case kCharStar:
-        return TypeWithDict(typeid(char*), property);
-      case kDataTypeAliasSignedChar_t:
-        return TypeWithDict(typeid(signed char), property);
+    if (theDataType) {
+      switch (theDataType->GetType()) {
+        case kUInt_t:
+          return TypeWithDict(typeid(unsigned int), property);
+        case kInt_t:
+          return TypeWithDict(typeid(int), property);
+        case kULong_t:
+          return TypeWithDict(typeid(unsigned long), property);
+        case kLong_t:
+          return TypeWithDict(typeid(long), property);
+        case kULong64_t:
+          return TypeWithDict(typeid(unsigned long long), property);
+        case kLong64_t:
+          return TypeWithDict(typeid(long long), property);
+        case kUShort_t:
+          return TypeWithDict(typeid(unsigned short), property);
+        case kShort_t:
+          return TypeWithDict(typeid(short), property);
+        case kUChar_t:
+          return TypeWithDict(typeid(unsigned char), property);
+        case kChar_t:
+          return TypeWithDict(typeid(char), property);
+        case kBool_t:
+          return TypeWithDict(typeid(bool), property);
+        case kFloat_t:
+          return TypeWithDict(typeid(float), property);
+        case kFloat16_t:
+          return TypeWithDict(typeid(Float16_t), property);
+        case kDouble_t:
+          return TypeWithDict(typeid(double), property);
+        case kDouble32_t:
+          return TypeWithDict(typeid(Double32_t), property);
+        case kCharStar:
+          return TypeWithDict(typeid(char*), property);
+        case kDataTypeAliasSignedChar_t:
+          return TypeWithDict(typeid(signed char), property);
       }
     }
 
-    if(name == "void") {
+    if (name == "void") {
       return TypeWithDict(typeid(void), property);
     }
 
     // For a reason not understood, TClass::GetClass sometimes cannot find std::type_info
     // by name.  This simple workaround bypasses the problem.
     // The problem really should be debugged.  (testORA12)
-    if(name == "std::type_info") {
+    if (name == "std::type_info") {
       return TypeWithDict(typeid(std::type_info), property);
     }
 
     // For a reason not understood, TClass::GetClass sometimes cannot find std::vector<T>::value_type
     // when T is a nested class.
-    if(stripNamespace(name) == "value_type") {
+    if (stripNamespace(name) == "value_type") {
       size_t begin = name.find('<');
       size_t end = name.rfind('>');
-      if(begin != std::string::npos && end != std::string::npos && end > ++begin) {
+      if (begin != std::string::npos && end != std::string::npos && end > ++begin) {
         return TypeWithDict::byName(name.substr(begin, end - begin), property);
       }
     }
@@ -244,36 +235,32 @@ namespace edm {
     return TypeWithDict();
   }
 
-  TypeWithDict::TypeWithDict() :
-    ti_(&typeid(TypeWithDict::invalidType)),
-    class_(nullptr),
-    enum_(nullptr),
-    dataType_(nullptr),
-    arrayDimensions_(nullptr),
-    property_(0L) {
-  }
-
-  TypeWithDict::TypeWithDict(TypeWithDict const& rhs) :
-    ti_(rhs.ti_),
-    class_(rhs.class_),
-    enum_(rhs.enum_),
-    dataType_(rhs.dataType_),
-    arrayDimensions_(rhs.arrayDimensions_),
-    property_(rhs.property_) {
-  }
-
-  TypeWithDict&
-  TypeWithDict::stripConstRef() {
-    if(isPointer()) {
-      property_ &= ~((long) kIsReference | (long) kIsConstPointer);
+  TypeWithDict::TypeWithDict()
+      : ti_(&typeid(TypeWithDict::invalidType)),
+        class_(nullptr),
+        enum_(nullptr),
+        dataType_(nullptr),
+        arrayDimensions_(nullptr),
+        property_(0L) {}
+
+  TypeWithDict::TypeWithDict(TypeWithDict const& rhs)
+      : ti_(rhs.ti_),
+        class_(rhs.class_),
+        enum_(rhs.enum_),
+        dataType_(rhs.dataType_),
+        arrayDimensions_(rhs.arrayDimensions_),
+        property_(rhs.property_) {}
+
+  TypeWithDict& TypeWithDict::stripConstRef() {
+    if (isPointer()) {
+      property_ &= ~((long)kIsReference | (long)kIsConstPointer);
     } else {
-      property_ &= ~((long) kIsConstant | (long) kIsReference);
+      property_ &= ~((long)kIsConstant | (long)kIsReference);
     }
     return *this;
   }
 
-  TypeWithDict&
-  TypeWithDict::operator=(TypeWithDict const& rhs) {
+  TypeWithDict& TypeWithDict::operator=(TypeWithDict const& rhs) {
     if (this != &rhs) {
       ti_ = rhs.ti_;
       class_ = rhs.class_;
@@ -285,18 +272,16 @@ namespace edm {
     return *this;
   }
 
-  TypeWithDict::TypeWithDict(std::type_info const& ti) : TypeWithDict(ti, 0L) {
-  }
+  TypeWithDict::TypeWithDict(std::type_info const& ti) : TypeWithDict(ti, 0L) {}
 
-  TypeWithDict::TypeWithDict(std::type_info const& ti, long property /*= 0L*/) :
-    ti_(&ti),
-    class_(TClass::GetClass(ti)),
-    enum_(nullptr),
-    dataType_(TDataType::GetDataType(TDataType::GetType(ti))),
-    arrayDimensions_(nullptr),
-    property_(property) {
-
-    if(class_ != nullptr) {
+  TypeWithDict::TypeWithDict(std::type_info const& ti, long property /*= 0L*/)
+      : ti_(&ti),
+        class_(TClass::GetClass(ti)),
+        enum_(nullptr),
+        dataType_(TDataType::GetDataType(TDataType::GetType(ti))),
+        arrayDimensions_(nullptr),
+        property_(property) {
+    if (class_ != nullptr) {
       return;
     }
 
@@ -308,16 +293,16 @@ namespace edm {
       return;
     }
 
-    if(dataType_ != nullptr) {
+    if (dataType_ != nullptr) {
       return;
     }
 
     enum_ = TEnum::GetEnum(ti, TEnum::kAutoload);
-    if(enum_ != nullptr) {
+    if (enum_ != nullptr) {
       return;
     }
 
-    if(ti == typeid(void)) {
+    if (ti == typeid(void)) {
       // For some reason, "void" has a data type if accessed by name, but not by type_info.
       dataType_ = gROOT->GetType("void");
       return;
@@ -325,42 +310,37 @@ namespace edm {
 
     // std::cerr << "DEBUG BY TI: " << name() << std::endl;
 
-     throwTypeException("TypeWithDict): ", name());
+    throwTypeException("TypeWithDict): ", name());
   }
 
-  TypeWithDict::TypeWithDict(TClass *cl) : TypeWithDict(cl, 0L) {
-  }
+  TypeWithDict::TypeWithDict(TClass* cl) : TypeWithDict(cl, 0L) {}
 
-  TypeWithDict::TypeWithDict(TClass* cl, long property) :
-    ti_(cl->GetTypeInfo()),
-    class_(cl),
-    enum_(nullptr),
-    dataType_(nullptr),
-    arrayDimensions_(nullptr),
-    property_(property) {
-    if(ti_ == nullptr) {
+  TypeWithDict::TypeWithDict(TClass* cl, long property)
+      : ti_(cl->GetTypeInfo()),
+        class_(cl),
+        enum_(nullptr),
+        dataType_(nullptr),
+        arrayDimensions_(nullptr),
+        property_(property) {
+    if (ti_ == nullptr) {
       ti_ = &typeid(TypeWithDict::dummyType);
     }
   }
 
-  TypeWithDict::TypeWithDict(TEnum *enm) : TypeWithDict(enm, 0L) {
-  }
+  TypeWithDict::TypeWithDict(TEnum* enm) : TypeWithDict(enm, 0L) {}
 
-  TypeWithDict::TypeWithDict(TEnum* enm, long property) :
-    ti_(&typeid(TypeWithDict::dummyType)),
-    class_(nullptr),
-    enum_(enm),
-    dataType_(nullptr),
-    arrayDimensions_(nullptr),
-    property_(property) {
-  }
+  TypeWithDict::TypeWithDict(TEnum* enm, long property)
+      : ti_(&typeid(TypeWithDict::dummyType)),
+        class_(nullptr),
+        enum_(enm),
+        dataType_(nullptr),
+        arrayDimensions_(nullptr),
+        property_(property) {}
 
-  TypeWithDict::TypeWithDict(TMethodArg* arg) : TypeWithDict(arg, 0L) {
-  }
+  TypeWithDict::TypeWithDict(TMethodArg* arg) : TypeWithDict(arg, 0L) {}
 
-  TypeWithDict::TypeWithDict(TMethodArg* arg, long property) :
-    TypeWithDict(byName(arg->GetTypeName(), arg->Property() | property)) {
-  }
+  TypeWithDict::TypeWithDict(TMethodArg* arg, long property)
+      : TypeWithDict(byName(arg->GetTypeName(), arg->Property() | property)) {}
 
   TypeWithDict::operator bool() const {
     if (*ti_ == typeid(invalidType)) {
@@ -372,126 +352,85 @@ namespace edm {
     return false;
   }
 
-  bool TypeWithDict::invalidTypeInfo() const {
-    return *ti_ == typeid(dummyType) || isPointer() || isArray();
-  }
+  bool TypeWithDict::invalidTypeInfo() const { return *ti_ == typeid(dummyType) || isPointer() || isArray(); }
 
-  std::type_info const&
-  TypeWithDict::typeInfo() const {
-    if(*ti_ == typeid(dummyType) || isPointer() || isArray()) {
+  std::type_info const& TypeWithDict::typeInfo() const {
+    if (*ti_ == typeid(dummyType) || isPointer() || isArray()) {
       // No accurate type_info
-      if(qualifiedName().c_str() != nullptr) {
+      if (qualifiedName().c_str() != nullptr) {
         std::string category("unknown");
-        if(isPointer()) {
+        if (isPointer()) {
           category = "a pointer";
-        } else if(isArray()) {
+        } else if (isArray()) {
           category = "an array";
-        } else if(isEnum()) {
+        } else if (isEnum()) {
           category = "an enum";
-        } else if(isClass()) {
-          throw Exception(errors::DictionaryNotFound)
-          << "No Dictionary for class: '" << name() << "'" << std::endl;
+        } else if (isClass()) {
+          throw Exception(errors::DictionaryNotFound) << "No Dictionary for class: '" << name() << "'" << std::endl;
         }
         throw Exception(errors::LogicError)
-          << "Function TypeWithDict::typeInfo: Type\n"
-          << qualifiedName()
-          << "\ndoes not have valid type_info information in ROOT\n"
-          << "because it is " << category << ".\n";
+            << "Function TypeWithDict::typeInfo: Type\n"
+            << qualifiedName() << "\ndoes not have valid type_info information in ROOT\n"
+            << "because it is " << category << ".\n";
       }
     }
     return *ti_;
   }
 
-  TClass*
-  TypeWithDict::getClass() const {
-    if(isPointer() || isArray()) {
+  TClass* TypeWithDict::getClass() const {
+    if (isPointer() || isArray()) {
       return nullptr;
     }
     return class_;
   }
 
-  TEnum*
-  TypeWithDict::getEnum() const {
-    if(isPointer() || isArray()) {
+  TEnum* TypeWithDict::getEnum() const {
+    if (isPointer() || isArray()) {
       return nullptr;
     }
     return enum_;
   }
 
-  TDataType*
-  TypeWithDict::getDataType() const {
-    if(isPointer() || isArray()) {
+  TDataType* TypeWithDict::getDataType() const {
+    if (isPointer() || isArray()) {
       return nullptr;
     }
     return dataType_;
   }
 
-  long
-  TypeWithDict::getProperty() const {
-    return property_;
-  }
+  long TypeWithDict::getProperty() const { return property_; }
 
-  bool
-  TypeWithDict::isClass() const {
+  bool TypeWithDict::isClass() const {
     // Note: This really means is class, struct, or union.
     return class_ != nullptr && !isPointer() && !isArray();
   }
 
-  bool
-  TypeWithDict::isConst() const {
-    return (property_ & (long) kIsConstant);
-  }
+  bool TypeWithDict::isConst() const { return (property_ & (long)kIsConstant); }
 
-  bool
-  TypeWithDict::isArray() const {
-    return (property_ & (long) kIsArray);
-  }
+  bool TypeWithDict::isArray() const { return (property_ & (long)kIsArray); }
 
-  bool
-  TypeWithDict::isEnum() const {
-    return enum_ != nullptr && !isPointer() && !isArray();
-  }
+  bool TypeWithDict::isEnum() const { return enum_ != nullptr && !isPointer() && !isArray(); }
 
-  bool
-  TypeWithDict::isFundamental() const {
-    return dataType_ != nullptr && !isPointer() && !isArray();
-  }
+  bool TypeWithDict::isFundamental() const { return dataType_ != nullptr && !isPointer() && !isArray(); }
 
-  bool
-  TypeWithDict::isPointer() const {
-    return (property_ & (long) kIsPointer);
-  }
+  bool TypeWithDict::isPointer() const { return (property_ & (long)kIsPointer); }
 
-  bool
-  TypeWithDict::isReference() const {
-    return (property_ & (long) kIsReference);
-  }
+  bool TypeWithDict::isReference() const { return (property_ & (long)kIsReference); }
 
-  bool
-  TypeWithDict::isTemplateInstance() const {
-    return (isClass() && name().back() == '>');
-  }
+  bool TypeWithDict::isTemplateInstance() const { return (isClass() && name().back() == '>'); }
 
-  bool
-  TypeWithDict::isTypedef() const {
+  bool TypeWithDict::isTypedef() const {
     if (class_ != nullptr || dataType_ != nullptr || enum_ != nullptr || *ti_ == typeid(invalidType)) {
       return false;
     }
     return true;
   }
 
-  bool
-  TypeWithDict::isVirtual() const {
-    return isClass() && (class_->ClassProperty() & (long) kClassHasVirtual);
-  }
+  bool TypeWithDict::isVirtual() const { return isClass() && (class_->ClassProperty() & (long)kClassHasVirtual); }
 
-  void
-  TypeWithDict::print(std::ostream& os) const {
-    os << name();
-  }
+  void TypeWithDict::print(std::ostream& os) const { os << name(); }
 
-  std::string
-  TypeWithDict::cppName() const {
+  std::string TypeWithDict::cppName() const {
     std::string cName = qualifiedName();
     // Get rid of silly ROOT typedefs
     replaceString(cName, "ULong64_t", "unsigned long long");
@@ -499,8 +438,7 @@ namespace edm {
     return cName;
   }
 
-  std::string
-  TypeWithDict::qualifiedName() const {
+  std::string TypeWithDict::qualifiedName() const {
     std::string qname(name());
     if (isConst() && !isPointer()) {
       qname = "const " + qname;
@@ -513,36 +451,32 @@ namespace edm {
     return qname;
   }
 
-  std::string
-  TypeWithDict::unscopedName() const {
-    return stripNamespace(name());
-  }
+  std::string TypeWithDict::unscopedName() const { return stripNamespace(name()); }
 
-  std::string
-  TypeWithDict::name() const {
+  std::string TypeWithDict::name() const {
     if (*ti_ == typeid(invalidType)) {
       return std::string();
     }
     std::ostringstream out;
-    if(isPointer() && isConst()) {
+    if (isPointer() && isConst()) {
       out << "const ";
     }
-    if(enum_ != nullptr) {
-      if(enum_->GetClass()) {
-         out << std::string(enum_->GetClass()->GetName());
-         out <<  "::";
+    if (enum_ != nullptr) {
+      if (enum_->GetClass()) {
+        out << std::string(enum_->GetClass()->GetName());
+        out << "::";
       }
       out << enum_->GetName();
-    } else if (*ti_ == typeid(dummyType) && isClass())  {
+    } else if (*ti_ == typeid(dummyType) && isClass()) {
       out << class_->GetName();
     } else {
       out << TypeID(*ti_).className();
     }
-    if(isPointer()) {
+    if (isPointer()) {
       out << '*';
     }
-    if(isArray()) {
-      for(size_t i = 0; i < arrayDimension(); ++i) {
+    if (isArray()) {
+      for (size_t i = 0; i < arrayDimension(); ++i) {
         out << '[';
         out << std::dec << maximumIndex(i);
         out << ']';
@@ -551,58 +485,47 @@ namespace edm {
     return out.str();
   }
 
-  std::string
-  TypeWithDict::userClassName() const {
-    return name();
-  }
+  std::string TypeWithDict::userClassName() const { return name(); }
 
-  std::string
-  TypeWithDict::friendlyClassName() const {
-    return friendlyname::friendlyName(name());
-  }
+  std::string TypeWithDict::friendlyClassName() const { return friendlyname::friendlyName(name()); }
 
-  size_t
-  TypeWithDict::size() const {
+  size_t TypeWithDict::size() const {
     size_t nBytes = 0;
-    if(isPointer()) {
+    if (isPointer()) {
       nBytes = sizeof(void*);
-    } else if(class_ != nullptr) {
+    } else if (class_ != nullptr) {
       nBytes = class_->GetClassSize();
-    } else if(dataType_ != nullptr) {
+    } else if (dataType_ != nullptr) {
       nBytes = dataType_->Size();
-    } else if(enum_ != nullptr) {
+    } else if (enum_ != nullptr) {
       nBytes = sizeof(int);
     }
-    if(isArray()) {
+    if (isArray()) {
       nBytes *= arrayLength();
     }
     return nBytes;
   }
 
-  size_t
-  TypeWithDict::arrayLength() const {
+  size_t TypeWithDict::arrayLength() const {
     assert(isArray());
     size_t theLength = 1;
-    for(size_t i = 0; i < arrayDimension(); ++i) {
+    for (size_t i = 0; i < arrayDimension(); ++i) {
       theLength *= maximumIndex(i);
     }
     return theLength;
   }
 
-  size_t
-  TypeWithDict::arrayDimension() const {
+  size_t TypeWithDict::arrayDimension() const {
     assert(isArray());
     return arrayDimensions_->size();
   }
 
-  size_t
-  TypeWithDict::maximumIndex(size_t dim) const {
+  size_t TypeWithDict::maximumIndex(size_t dim) const {
     assert(isArray());
     return (*arrayDimensions_)[dim];
   }
 
-  size_t
-  TypeWithDict::dataMemberSize() const {
+  size_t TypeWithDict::dataMemberSize() const {
     if (isClass()) {
       return class_->GetListOfDataMembers()->GetSize();
     }
@@ -612,17 +535,15 @@ namespace edm {
     return 0;
   }
 
-  size_t
-  TypeWithDict::functionMemberSize() const {
+  size_t TypeWithDict::functionMemberSize() const {
     if (isClass()) {
       return class_->GetListOfMethods()->GetSize();
     }
     return 0;
   }
 
-  void const*
-  TypeWithDict::pointerToBaseType(void const* ptr, TypeWithDict const& derivedType) const {
-    if(!isClass()) {
+  void const* TypeWithDict::pointerToBaseType(void const* ptr, TypeWithDict const& derivedType) const {
+    if (!isClass()) {
       return ptr;
     }
     if (this->ti_ == derivedType.ti_ || *this->ti_ == *derivedType.ti_) {
@@ -635,32 +556,26 @@ namespace edm {
     return static_cast<char const*>(ptr) + offset;
   }
 
-  void const*
-  TypeWithDict::pointerToContainedType(void const* ptr, TypeWithDict const& derivedType) const {
-    if(!isClass()) {
+  void const* TypeWithDict::pointerToContainedType(void const* ptr, TypeWithDict const& derivedType) const {
+    if (!isClass()) {
       return ptr;
     }
     return pointerToBaseType(ptr, derivedType);
   }
 
-  TypeWithDict
-  TypeWithDict::nestedType(char const* nestedName) const {
-    return byName(name() + "::" + nestedName);
-  }
+  TypeWithDict TypeWithDict::nestedType(char const* nestedName) const { return byName(name() + "::" + nestedName); }
 
-  TypeWithDict
-  TypeWithDict::nestedType(std::string const& nestedName) const {
+  TypeWithDict TypeWithDict::nestedType(std::string const& nestedName) const {
     return byName(name() + "::" + nestedName);
   }
 
-  MemberWithDict
-  TypeWithDict::dataMemberByName(std::string const& member) const {
+  MemberWithDict TypeWithDict::dataMemberByName(std::string const& member) const {
     if (isClass()) {
       TDataMember* dataMember = class_->GetDataMember(member.c_str());
-      if(dataMember == nullptr) {
+      if (dataMember == nullptr) {
         // Look for indirect data members
         TRealData* realDataMember = class_->GetRealData(member.c_str());
-        if(realDataMember != nullptr) {
+        if (realDataMember != nullptr) {
           dataMember = realDataMember->GetDataMember();
         }
       }
@@ -673,30 +588,30 @@ namespace edm {
     return MemberWithDict();
   }
 
-  FunctionWithDict
-  TypeWithDict::functionMemberByName(std::string const& member) const {
+  FunctionWithDict TypeWithDict::functionMemberByName(std::string const& member) const {
     if (!isClass()) {
       return FunctionWithDict();
     }
-    TMethod* meth = reinterpret_cast<TMethod*>(
-      class_->GetListOfMethods()->FindObject(member.c_str()));
+    TMethod* meth = reinterpret_cast<TMethod*>(class_->GetListOfMethods()->FindObject(member.c_str()));
     if (meth == nullptr) {
       return FunctionWithDict();
     }
     return FunctionWithDict(meth);
   }
 
-  FunctionWithDict
-  TypeWithDict::functionMemberByName(std::string const& functionName, std::string const& proto, bool isConst) const {
+  FunctionWithDict TypeWithDict::functionMemberByName(std::string const& functionName,
+                                                      std::string const& proto,
+                                                      bool isConst) const {
     if (!isClass()) {
       return FunctionWithDict();
     }
     std::string const& key = name() + '#' + functionName + '#' + proto;
     auto const& item = functionMap.find(key);
-    if(item != functionMap.end()) {
-       return item->second;
+    if (item != functionMap.end()) {
+      return item->second;
     }
-    TMethod* meth = class_->GetMethodWithPrototype(functionName.c_str(), proto.c_str(), /*objectIsConst=*/isConst, /*mode=*/ROOT::kConversionMatch);
+    TMethod* meth = class_->GetMethodWithPrototype(
+        functionName.c_str(), proto.c_str(), /*objectIsConst=*/isConst, /*mode=*/ROOT::kConversionMatch);
     if (meth == nullptr) {
       return FunctionWithDict();
     }
@@ -705,43 +620,41 @@ namespace edm {
     return theFunction;
   }
 
-  TypeWithDict
-  TypeWithDict::finalType() const {
+  TypeWithDict TypeWithDict::finalType() const {
     if (*ti_ == typeid(invalidType)) {
       return TypeWithDict();
     }
-    if(!isClass() && !isFundamental()) {
+    if (!isClass() && !isFundamental()) {
       return *this;
     }
     return TypeWithDict(*ti_);
   }
 
-  TypeWithDict
-  TypeWithDict::toType() const {
+  TypeWithDict TypeWithDict::toType() const {
     if (*ti_ == typeid(invalidType)) {
       return TypeWithDict();
     }
-    if(isReference()) {
+    if (isReference()) {
       TypeWithDict newType = *this;
-      newType.property_ &= ~((long) kIsReference);
+      newType.property_ &= ~((long)kIsReference);
       return newType;
     }
-    if(isPointer()) {
+    if (isPointer()) {
       TypeWithDict newType = *this;
-      newType.property_ &= ~((long) kIsPointer | (long) kIsConstPointer);
+      newType.property_ &= ~((long)kIsPointer | (long)kIsConstPointer);
       return newType;
     }
-    if(isArray()) {
+    if (isArray()) {
       TypeWithDict newType = *this;
       size_t size = newType.arrayDimensions_->size();
-      if(size == 1) {
-        newType.property_ &= ~((long) kIsArray);
+      if (size == 1) {
+        newType.property_ &= ~((long)kIsArray);
         value_ptr<std::vector<size_t> > emptyVec;
         newType.arrayDimensions_ = emptyVec;
       } else {
         std::vector<size_t>& dims = *newType.arrayDimensions_;
-        for(size_t i = 0; i != size; ++i) {
-          dims[i] = dims[i+1];
+        for (size_t i = 0; i != size; ++i) {
+          dims[i] = dims[i + 1];
         }
         newType.arrayDimensions_->resize(size - 1);
       }
@@ -750,8 +663,7 @@ namespace edm {
     return *this;
   }
 
-  std::string
-  TypeWithDict::templateName() const {
+  std::string TypeWithDict::templateName() const {
     if (!isTemplateInstance()) {
       return "";
     }
@@ -773,8 +685,7 @@ namespace edm {
             begin = idx;
           }
           ++depth;
-        }
-        else if (c == '>') {
+        } else if (c == '>') {
           --depth;
           assert(depth >= 0);
         }
@@ -783,9 +694,8 @@ namespace edm {
     return templateName.substr(0, begin);
   }
 
-  TypeWithDict
-  TypeWithDict::templateArgumentAt(size_t index) const {
-    if(!isClass()) {
+  TypeWithDict TypeWithDict::templateArgumentAt(size_t index) const {
+    if (!isClass()) {
       return TypeWithDict();
     }
     std::string className(unscopedName());
@@ -803,17 +713,14 @@ namespace edm {
       char c = className[idx];
       if (c == '<') {
         ++depth;
-      }
-      else if (c == '>') {
+      } else if (c == '>') {
         --depth;
         assert(depth >= 0);
-      }
-      else if ((depth == 0) && (c == ',')) {
+      } else if ((depth == 0) && (c == ',')) {
         if (argCount < index) {
           begin = idx + 1;
           ++argCount;
-        }
-        else {
+        } else {
           end = idx;
           break;
         }
@@ -826,9 +733,8 @@ namespace edm {
     return byName(className.substr(begin, end - begin));
   }
 
-  bool
-  TypeWithDict::hasBase(std::string const& basename) const {
-    if(!isClass()) {
+  bool TypeWithDict::hasBase(std::string const& basename) const {
+    if (!isClass()) {
       return false;
     }
     TClass* cl = class_->GetBaseClass(basename.c_str());
@@ -838,9 +744,8 @@ namespace edm {
     return false;
   }
 
-  bool
-  TypeWithDict::hasBase(TypeWithDict const& basety) const {
-    if(!isClass()) {
+  bool TypeWithDict::hasBase(TypeWithDict const& basety) const {
+    if (!isClass()) {
       return false;
     }
     if (basety.class_ == nullptr) {
@@ -853,62 +758,44 @@ namespace edm {
     return false;
   }
 
-  int
-  TypeWithDict::getBaseClassOffset(TypeWithDict const& baseClass) const {
-    if(!isClass()) {
-      throw Exception(errors::LogicError)
-        << "Function TypeWithDict::getBaseClassOffset(), type\n"
-        << name()
-        << "\nis not a class\n";
+  int TypeWithDict::getBaseClassOffset(TypeWithDict const& baseClass) const {
+    if (!isClass()) {
+      throw Exception(errors::LogicError) << "Function TypeWithDict::getBaseClassOffset(), type\n"
+                                          << name() << "\nis not a class\n";
     }
     if (baseClass.class_ == nullptr) {
-      throw Exception(errors::LogicError)
-        << "Function TypeWithDict::getBaseClassOffset(), base type\n"
-        << name()
-        << "\nis not a class\n";
+      throw Exception(errors::LogicError) << "Function TypeWithDict::getBaseClassOffset(), base type\n"
+                                          << name() << "\nis not a class\n";
     }
     int offset = class_->GetBaseClassOffset(baseClass.class_);
     return offset;
   }
 
-  int
-  TypeWithDict::stringToEnumValue(std::string const& name) const {
+  int TypeWithDict::stringToEnumValue(std::string const& name) const {
     if (!isEnum()) {
-      throw Exception(errors::LogicError)
-        << "Function TypeWithDict::stringToEnumValue(), type\n"
-        << name
-        << "\nis not an enum\n";
+      throw Exception(errors::LogicError) << "Function TypeWithDict::stringToEnumValue(), type\n"
+                                          << name << "\nis not an enum\n";
     }
     TEnumConstant const* ec = enum_->GetConstant(name.c_str());
     if (!ec) {
-      throw Exception(errors::LogicError)
-        << "Function TypeWithDict::stringToEnumValue(), type\n"
-        << name
-        << "\nis not an enum constant\n";
+      throw Exception(errors::LogicError) << "Function TypeWithDict::stringToEnumValue(), type\n"
+                                          << name << "\nis not an enum constant\n";
     }
     return static_cast<int>(ec->GetValue());
   }
 
-  void*
-  TypeWithDict::allocate() const {
-    return new char[size()];
-  }
+  void* TypeWithDict::allocate() const { return new char[size()]; }
 
-  void
-  TypeWithDict::deallocate(void* address) const {
-    delete[] reinterpret_cast<char*>(address);
-  }
+  void TypeWithDict::deallocate(void* address) const { delete[] reinterpret_cast<char*>(address); }
 
-  ObjectWithDict
-  TypeWithDict::construct() const {
+  ObjectWithDict TypeWithDict::construct() const {
     if (isClass()) {
       return ObjectWithDict(*this, class_->New());
     }
     return ObjectWithDict(*this, new char[size()]);
   }
 
-  void
-  TypeWithDict::destruct(void* address, bool dealloc) const {
+  void TypeWithDict::destruct(void* address, bool dealloc) const {
     if (isClass()) {
       class_->Destructor(address, !dealloc);
       return;
@@ -919,8 +806,7 @@ namespace edm {
   }
 
   // A related free function
-  bool
-  hasDictionary(std::type_info const& ti) {
+  bool hasDictionary(std::type_info const& ti) {
     if (ti.name()[1] == '\0') {
       // returns true for built in types (single character mangled names)
       return true;
@@ -928,22 +814,17 @@ namespace edm {
     return (TClassTable::GetDict(ti) != nullptr);
   }
 
-  bool
-  operator==(TypeWithDict const& a, TypeWithDict const& b) {
-    return a.name() == b.name();
-  }
+  bool operator==(TypeWithDict const& a, TypeWithDict const& b) { return a.name() == b.name(); }
 
-  bool
-  operator==(TypeWithDict const& a, std::type_info const& b) {
-    if(*a.ti_ == typeid(TypeWithDict::dummyType) || a.isPointer() || a.isArray()) {
+  bool operator==(TypeWithDict const& a, std::type_info const& b) {
+    if (*a.ti_ == typeid(TypeWithDict::dummyType) || a.isPointer() || a.isArray()) {
       // No accurate type_info
       return a.name() == TypeID(b).className();
     }
     return *a.ti_ == b;
   }
 
-  std::ostream&
-  operator<<(std::ostream& os, TypeWithDict const& ty) {
+  std::ostream& operator<<(std::ostream& os, TypeWithDict const& ty) {
     ty.print(os);
     return os;
   }
@@ -952,25 +833,18 @@ namespace edm {
   //
   //
 
-  TypeBases::TypeBases(TypeWithDict const& type) :
-    class_(type.getClass()) {
-  }
+  TypeBases::TypeBases(TypeWithDict const& type) : class_(type.getClass()) {}
 
-  IterWithDict<TBaseClass>
-  TypeBases::begin() const {
+  IterWithDict<TBaseClass> TypeBases::begin() const {
     if (class_ == nullptr) {
       return IterWithDict<TBaseClass>();
     }
     return IterWithDict<TBaseClass>(class_->GetListOfBases());
   }
 
-  IterWithDict<TBaseClass>
-  TypeBases::end() const {
-    return IterWithDict<TBaseClass>();
-  }
+  IterWithDict<TBaseClass> TypeBases::end() const { return IterWithDict<TBaseClass>(); }
 
-  size_t
-  TypeBases::size() const {
+  size_t TypeBases::size() const {
     if (class_ == nullptr) {
       return 0;
     }
@@ -981,25 +855,18 @@ namespace edm {
   //
   //
 
-  TypeDataMembers::TypeDataMembers(TypeWithDict const& type) :
-    class_(type.getClass()) {
-  }
+  TypeDataMembers::TypeDataMembers(TypeWithDict const& type) : class_(type.getClass()) {}
 
-  IterWithDict<TDataMember>
-  TypeDataMembers::begin() const {
+  IterWithDict<TDataMember> TypeDataMembers::begin() const {
     if (class_ == nullptr) {
       return IterWithDict<TDataMember>();
     }
     return IterWithDict<TDataMember>(class_->GetListOfDataMembers());
   }
 
-  IterWithDict<TDataMember>
-  TypeDataMembers::end() const {
-    return IterWithDict<TDataMember>();
-  }
+  IterWithDict<TDataMember> TypeDataMembers::end() const { return IterWithDict<TDataMember>(); }
 
-  size_t
-  TypeDataMembers::size() const {
+  size_t TypeDataMembers::size() const {
     if (class_ == nullptr) {
       return 0;
     }
@@ -1010,29 +877,22 @@ namespace edm {
   //
   //
 
-  TypeFunctionMembers::TypeFunctionMembers(TypeWithDict const& type) :
-    class_(type.getClass()) {
-  }
+  TypeFunctionMembers::TypeFunctionMembers(TypeWithDict const& type) : class_(type.getClass()) {}
 
-  IterWithDict<TMethod>
-  TypeFunctionMembers::begin() const {
+  IterWithDict<TMethod> TypeFunctionMembers::begin() const {
     if (class_ == nullptr) {
       return IterWithDict<TMethod>();
     }
     return IterWithDict<TMethod>(class_->GetListOfMethods());
   }
 
-  IterWithDict<TMethod>
-  TypeFunctionMembers::end() const {
-    return IterWithDict<TMethod>();
-  }
+  IterWithDict<TMethod> TypeFunctionMembers::end() const { return IterWithDict<TMethod>(); }
 
-  size_t
-  TypeFunctionMembers::size() const {
+  size_t TypeFunctionMembers::size() const {
     if (class_ == nullptr) {
       return 0;
     }
     return class_->GetListOfMethods(kFALSE)->GetSize();
   }
 
-} // namespace edm
+}  // namespace edm
diff --git a/FWCore/Utilities/src/UnixSignalHandlers.cc b/FWCore/Utilities/src/UnixSignalHandlers.cc
index afc69e1e879e2..fc24bc683d999 100644
--- a/FWCore/Utilities/src/UnixSignalHandlers.cc
+++ b/FWCore/Utilities/src/UnixSignalHandlers.cc
@@ -17,148 +17,140 @@
 
 namespace edm {
 
-//--------------------------------------------------------------
-
-    volatile std::atomic<bool> shutdown_flag{false};
+  //--------------------------------------------------------------
+
+  volatile std::atomic<bool> shutdown_flag{false};
+
+  extern "C" {
+  void ep_sigusr2(int, siginfo_t*, void*) {
+    FDEBUG(1) << "in sigusr2 handler\n";
+    shutdown_flag.store(true);
+  }
+  }
+#define MUST_BE_ZERO(fun)                                           \
+  if ((fun) != 0) {                                                 \
+    perror("UnixSignalHandlers::setupSignal: sig function failed"); \
+    abort();                                                        \
+  }
+
+  //--------------------------------------------------------------
+
+  void disableAllSigs(sigset_t* oldset) {
+    sigset_t myset;
+    // all blocked for now
+    MUST_BE_ZERO(sigfillset(&myset));
+    MUST_BE_ZERO(pthread_sigmask(SIG_SETMASK, &myset, oldset));
+  }
+
+  //--------------------------------------------------------------
+
+  void disableRTSigs() {
+#if defined(__linux__)
+    // ignore all the RT signals
+    sigset_t myset;
+    MUST_BE_ZERO(sigemptyset(&myset));
 
-    extern "C" {
-      void ep_sigusr2(int,siginfo_t*,void*)
-      {
-	FDEBUG(1) << "in sigusr2 handler\n";
-	shutdown_flag.store(true);
-      }
-    }
-#define MUST_BE_ZERO(fun) if((fun) != 0)					\
-{ perror("UnixSignalHandlers::setupSignal: sig function failed"); abort(); }
+    struct sigaction tmpact;
+    memset(&tmpact, 0, sizeof(tmpact));
+    tmpact.sa_handler = SIG_IGN;
 
-//--------------------------------------------------------------
+    for (int num = SIGRTMIN; num <= SIGRTMAX; ++num) {
+      // signal 38 is used by Intel Amplifier
+      if (num == 38)
+        continue;
 
-    void disableAllSigs( sigset_t* oldset )
-    {
-      sigset_t myset;
-      // all blocked for now
-      MUST_BE_ZERO(sigfillset(&myset));
-      MUST_BE_ZERO(pthread_sigmask(SIG_SETMASK,&myset,oldset));
+      MUST_BE_ZERO(sigaddset(&myset, num));
+      MUST_BE_ZERO(sigaction(num, &tmpact, nullptr));
     }
 
-//--------------------------------------------------------------
-
-    void disableRTSigs()
-    {
-#if defined(__linux__)
-      // ignore all the RT signals
-      sigset_t myset;
-      MUST_BE_ZERO(sigemptyset(&myset));
-      
-      struct sigaction tmpact;
-      memset(&tmpact,0,sizeof(tmpact));
-      tmpact.sa_handler = SIG_IGN;
-
-      for(int num = SIGRTMIN; num <= SIGRTMAX; ++num) {
-          // signal 38 is used by Intel Amplifier
-          if( num == 38) continue;
-
-
-	  MUST_BE_ZERO(sigaddset(&myset,num));
-	  MUST_BE_ZERO(sigaction(num,&tmpact,nullptr));
-      }
-      
-      MUST_BE_ZERO(pthread_sigmask(SIG_BLOCK,&myset,nullptr));
+    MUST_BE_ZERO(pthread_sigmask(SIG_BLOCK, &myset, nullptr));
 #endif
-    }
+  }
 
-//--------------------------------------------------------------
+  //--------------------------------------------------------------
 
-    void reenableSigs( sigset_t* oldset )
-    {
-      // reenable the signals
-      MUST_BE_ZERO(pthread_sigmask(SIG_SETMASK,oldset,nullptr));
-    }
+  void reenableSigs(sigset_t* oldset) {
+    // reenable the signals
+    MUST_BE_ZERO(pthread_sigmask(SIG_SETMASK, oldset, nullptr));
+  }
 
-//--------------------------------------------------------------
+  //--------------------------------------------------------------
 
-    void enableSignal( sigset_t* newset, const int signum )
-    {
-      // enable the specified signal
-      MUST_BE_ZERO(sigaddset(newset, signum));
-    }
+  void enableSignal(sigset_t* newset, const int signum) {
+    // enable the specified signal
+    MUST_BE_ZERO(sigaddset(newset, signum));
+  }
 
+  //--------------------------------------------------------------
 
-//--------------------------------------------------------------
-
-    void disableSignal( sigset_t* newset, const int signum )
-    {
-      // disable the specified signal
-      MUST_BE_ZERO(sigdelset(newset, signum));
-    }
+  void disableSignal(sigset_t* newset, const int signum) {
+    // disable the specified signal
+    MUST_BE_ZERO(sigdelset(newset, signum));
+  }
 
-//--------------------------------------------------------------
+  //--------------------------------------------------------------
 
-    void installCustomHandler( const int signum, CFUNC func )
-    {
-      sigset_t oldset;
-      edm::disableAllSigs(&oldset);
+  void installCustomHandler(const int signum, CFUNC func) {
+    sigset_t oldset;
+    edm::disableAllSigs(&oldset);
 #if defined(__linux__)
-      edm::disableRTSigs();
+    edm::disableRTSigs();
 #endif
-      edm::installSig(signum,func);
-      edm::reenableSigs(&oldset);
+    edm::installSig(signum, func);
+    edm::reenableSigs(&oldset);
+  }
+
+  //--------------------------------------------------------------
+
+  void installSig(const int signum, CFUNC func) {
+    // set up my RT signal now
+    struct sigaction act;
+    memset(&act, 0, sizeof(act));
+    act.sa_sigaction = func;
+    act.sa_flags = SA_RESTART;
+
+    // get my signal number
+    int mysig = signum;
+    if (mysig == SIGKILL) {
+      perror("Cannot install handler for KILL signal");
+      return;
+    } else if (mysig == SIGSTOP) {
+      perror("Cannot install handler for STOP signal");
+      return;
     }
 
-//--------------------------------------------------------------
-
-    void installSig( const int signum, CFUNC func )
-    {
-      // set up my RT signal now
-      struct sigaction act;
-      memset(&act,0,sizeof(act));
-      act.sa_sigaction = func;
-      act.sa_flags = SA_RESTART;
-      
-      // get my signal number
-      int mysig = signum;
-      if( mysig == SIGKILL ) {
-	perror("Cannot install handler for KILL signal");
-	return;
-      } else if( mysig == SIGSTOP ) {
-	 perror("Cannot install handler for STOP signal");
-	return;
-      }
-      
-      if(sigaction(mysig,&act,nullptr) != 0) {
-	  perror("sigaction failed");
-	  abort();
-      }
-      
-      sigset_t newset;
-      MUST_BE_ZERO(sigemptyset(&newset));
-      MUST_BE_ZERO(sigaddset(&newset,mysig));
-      MUST_BE_ZERO(pthread_sigmask(SIG_UNBLOCK,&newset,nullptr));
+    if (sigaction(mysig, &act, nullptr) != 0) {
+      perror("sigaction failed");
+      abort();
     }
 
-//--------------------------------------------------------------
-
-    void sigInventory()
-    {
-      sigset_t tmpset, oldset;
-//    Make a full house set of signals, except for SIGKILL = 9
-//    and SIGSTOP = 19 which cannot be blocked
-      MUST_BE_ZERO(sigfillset(&tmpset));
-      MUST_BE_ZERO(sigdelset(&tmpset, SIGKILL));
-      MUST_BE_ZERO(sigdelset(&tmpset, SIGSTOP));
-//    Swap it with the current sigset_t
-      MUST_BE_ZERO(pthread_sigmask( SIG_SETMASK, &tmpset, &oldset ));
-//    Now see what's included in the set
-      for(int k=1; k<NSIG; ++k) {
-        std::cerr << "sigismember is " << sigismember( &tmpset, k )
-                  << " for signal " << std::setw(2) << k
+    sigset_t newset;
+    MUST_BE_ZERO(sigemptyset(&newset));
+    MUST_BE_ZERO(sigaddset(&newset, mysig));
+    MUST_BE_ZERO(pthread_sigmask(SIG_UNBLOCK, &newset, nullptr));
+  }
+
+  //--------------------------------------------------------------
+
+  void sigInventory() {
+    sigset_t tmpset, oldset;
+    //    Make a full house set of signals, except for SIGKILL = 9
+    //    and SIGSTOP = 19 which cannot be blocked
+    MUST_BE_ZERO(sigfillset(&tmpset));
+    MUST_BE_ZERO(sigdelset(&tmpset, SIGKILL));
+    MUST_BE_ZERO(sigdelset(&tmpset, SIGSTOP));
+    //    Swap it with the current sigset_t
+    MUST_BE_ZERO(pthread_sigmask(SIG_SETMASK, &tmpset, &oldset));
+    //    Now see what's included in the set
+    for (int k = 1; k < NSIG; ++k) {
+      std::cerr << "sigismember is " << sigismember(&tmpset, k) << " for signal " << std::setw(2) << k
 #if defined(__linux__)
-                  << " (" << strsignal(k) << ")"
+                << " (" << strsignal(k) << ")"
 #endif
-                  << std::endl;
-      }
-//    Finally put the original sigset_t back
-      MUST_BE_ZERO(pthread_sigmask( SIG_SETMASK, &oldset, &tmpset));
+                << std::endl;
     }
+    //    Finally put the original sigset_t back
+    MUST_BE_ZERO(pthread_sigmask(SIG_SETMASK, &oldset, &tmpset));
+  }
 
-} // end of namespace edm
+}  // end of namespace edm
diff --git a/FWCore/Utilities/src/WallclockTimer.cc b/FWCore/Utilities/src/WallclockTimer.cc
index 1122387dba409..9a1d0f735d2e9 100644
--- a/FWCore/Utilities/src/WallclockTimer.cc
+++ b/FWCore/Utilities/src/WallclockTimer.cc
@@ -30,17 +30,13 @@ using namespace edm;
 //
 // constructors and destructor
 //
-WallclockTimer::WallclockTimer() :
-state_(kStopped),
-startRealTime_(),
-accumulatedRealTime_(0)
-{
+WallclockTimer::WallclockTimer() : state_(kStopped), startRealTime_(), accumulatedRealTime_(0) {
 #ifdef USE_CLOCK_GETTIME
-  startRealTime_.tv_sec=0;
-  startRealTime_.tv_nsec=0;
+  startRealTime_.tv_sec = 0;
+  startRealTime_.tv_nsec = 0;
 #else
-  startRealTime_.tv_sec=0;
-  startRealTime_.tv_usec=0;
+  startRealTime_.tv_sec = 0;
+  startRealTime_.tv_usec = 0;
 #endif
 }
 
@@ -48,8 +44,7 @@ accumulatedRealTime_(0)
 //    // do actual copying here;
 // }
 
-WallclockTimer::~WallclockTimer() {
-}
+WallclockTimer::~WallclockTimer() {}
 
 //
 // assignment operators
@@ -65,9 +60,8 @@ WallclockTimer::~WallclockTimer() {
 //
 // member functions
 //
-void
-WallclockTimer::start() {
-  if(kStopped == state_) {
+void WallclockTimer::start() {
+  if (kStopped == state_) {
 #ifdef USE_CLOCK_GETTIME
     clock_gettime(CLOCK_MONOTONIC, &startRealTime_);
 #else
@@ -77,30 +71,22 @@ WallclockTimer::start() {
   }
 }
 
-double
-WallclockTimer::stop() {
-  if(kRunning == state_) {
+double WallclockTimer::stop() {
+  if (kRunning == state_) {
     auto t = calculateDeltaTime();
     accumulatedRealTime_ += t;
 
-    state_=kStopped;
+    state_ = kStopped;
     return t;
   }
   return 0.;
 }
 
-void
-WallclockTimer::reset() {
-  accumulatedRealTime_ = 0;
-}
+void WallclockTimer::reset() { accumulatedRealTime_ = 0; }
 
-void
-WallclockTimer::add(double t) {
-  accumulatedRealTime_ += t;
-}
+void WallclockTimer::add(double t) { accumulatedRealTime_ += t; }
 
-double
-WallclockTimer::calculateDeltaTime() const {
+double WallclockTimer::calculateDeltaTime() const {
   double returnValue;
 #ifdef USE_CLOCK_GETTIME
   double const nanosecToSec = 1E-9;
@@ -121,9 +107,8 @@ WallclockTimer::calculateDeltaTime() const {
 //
 // const member functions
 //
-double
-WallclockTimer::realTime() const {
-  if(kStopped == state_) {
+double WallclockTimer::realTime() const {
+  if (kStopped == state_) {
     return accumulatedRealTime_;
   }
   return accumulatedRealTime_ + calculateDeltaTime();
diff --git a/FWCore/Utilities/src/WrappedClassName.cc b/FWCore/Utilities/src/WrappedClassName.cc
index f5fc67472d2c1..b062fdcb24586 100644
--- a/FWCore/Utilities/src/WrappedClassName.cc
+++ b/FWCore/Utilities/src/WrappedClassName.cc
@@ -1,12 +1,11 @@
 #include "FWCore/Utilities/interface/WrappedClassName.h"
 
 namespace edm {
-  std::string
-  wrappedClassName(std::string const& className) {
+  std::string wrappedClassName(std::string const& className) {
     std::string const wrapperBegin("edm::Wrapper<");
     std::string const wrapperEnd1(">");
     std::string const wrapperEnd2(" >");
-    std::string const& wrapperEnd = (className[className.size()-1] == '>' ? wrapperEnd2 : wrapperEnd1);
+    std::string const& wrapperEnd = (className[className.size() - 1] == '>' ? wrapperEnd2 : wrapperEnd1);
     std::string wrapped;
     wrapped.reserve(wrapperBegin.size() + className.size() + wrapperEnd.size());
     wrapped += wrapperBegin;
@@ -14,4 +13,4 @@ namespace edm {
     wrapped += wrapperEnd;
     return wrapped;
   }
-}
+}  // namespace edm
diff --git a/FWCore/Utilities/src/resolveSymbolicLinks.cc b/FWCore/Utilities/src/resolveSymbolicLinks.cc
index c751a6dc0b6da..00d24ca2f62e1 100644
--- a/FWCore/Utilities/src/resolveSymbolicLinks.cc
+++ b/FWCore/Utilities/src/resolveSymbolicLinks.cc
@@ -11,12 +11,14 @@ namespace edm {
   namespace {
     namespace bf = boost::filesystem;
     bool resolveOneSymbolicLink(std::string& fullPath) {
-      if(fullPath.empty()) return false;
-      if(fullPath[0] != '/') return false;
+      if (fullPath.empty())
+        return false;
+      if (fullPath[0] != '/')
+        return false;
       std::string pathToResolve;
       std::vector<std::string> pathElements = edm::tokenize(fullPath, "/");
-      for(auto const& path : pathElements) {
-        if(!path.empty()) {
+      for (auto const& path : pathElements) {
+        if (!path.empty()) {
           pathToResolve += "/";
           pathToResolve += path;
           bf::path symLinkPath(pathToResolve);
@@ -24,14 +26,14 @@ namespace edm {
             bf::path resolved = bf::read_symlink(symLinkPath);
             // This check is needed because in weird filesystems
             // (e.g. AFS), the resolved link may not be accessible.
-            if(!bf::exists(resolved)) {
+            if (!bf::exists(resolved)) {
               continue;
             }
             std::string resolvedPath = resolved.string();
             auto begin = fullPath.begin();
             auto end = begin + pathToResolve.size();
             // resolvedPath may or may not contain the leading "/".
-            if(resolvedPath[0] == '/') {
+            if (resolvedPath[0] == '/') {
               fullPath.replace(begin, end, resolvedPath);
             } else {
               fullPath.replace(begin + 1, end, resolvedPath);
@@ -42,13 +44,13 @@ namespace edm {
       }
       return false;
     }
-  }
+  }  // namespace
 
   // Resolves symlinks recursively from anywhere in fullPath.
   void resolveSymbolicLinks(std::string& fullPath) {
     bool found = resolveOneSymbolicLink(fullPath);
-    if(found) {
+    if (found) {
       resolveSymbolicLinks(fullPath);
     }
   }
-}
+}  // namespace edm
diff --git a/FWCore/Utilities/src/typelookup.cc b/FWCore/Utilities/src/typelookup.cc
index 96b8a99e229a0..e6747e788eb38 100644
--- a/FWCore/Utilities/src/typelookup.cc
+++ b/FWCore/Utilities/src/typelookup.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Utilities
 // Class  :     typelookup
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -17,7 +17,6 @@
 // user include files
 #include "FWCore/Utilities/interface/typelookup.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -28,58 +27,51 @@
 //This class hides the use of map from all classes that use HCTypeTag
 namespace {
   struct StringEqual {
-      bool operator()(const char* iLHS, const char* iRHS)   const {
-         return (std::strcmp(iLHS, iRHS) == 0);
-       }
+    bool operator()(const char* iLHS, const char* iRHS) const { return (std::strcmp(iLHS, iRHS) == 0); }
+  };
 
-   };
-   
-   //NOTE: The following hash calculation was taken from
-   // the hash calculation for std::string in tbb
+  //NOTE: The following hash calculation was taken from
+  // the hash calculation for std::string in tbb
 
-   //! A template to select either 32-bit or 64-bit constant as compile time, depending on machine word size.
-   template <unsigned u, unsigned long long ull >
-   struct select_size_t_constant {
-      //Explicit cast is needed to avoid compiler warnings about possible truncation.
-      //The value of the right size,   which is selected by ?:, is anyway not truncated or promoted.
-      static constexpr size_t value = (size_t)((sizeof(size_t)==sizeof(u)) ? u : ull);
-   };
-   
-   constexpr size_t hash_multiplier = select_size_t_constant<2654435769U, 11400714819323198485ULL>::value;
+  //! A template to select either 32-bit or 64-bit constant as compile time, depending on machine word size.
+  template <unsigned u, unsigned long long ull>
+  struct select_size_t_constant {
+    //Explicit cast is needed to avoid compiler warnings about possible truncation.
+    //The value of the right size,   which is selected by ?:, is anyway not truncated or promoted.
+    static constexpr size_t value = (size_t)((sizeof(size_t) == sizeof(u)) ? u : ull);
+  };
 
-   struct StringHash {
-      inline size_t operator()( const char* s) const {
-         size_t h = 0;
-         for( const char* c = s; *c; ++c )
-            h = static_cast<size_t>(*c) ^ (h * hash_multiplier);
-         return h;
-      }
-   };
+  constexpr size_t hash_multiplier = select_size_t_constant<2654435769U, 11400714819323198485ULL>::value;
 
-   //NOTE: the use of const char* does not lead to a memory leak because the data
-   // for the strings are assigned at compile time via a macro call
-   using TypeNameToValueMap = tbb::concurrent_unordered_map<const char*, const std::type_info*, StringHash, StringEqual>;
+  struct StringHash {
+    inline size_t operator()(const char* s) const {
+      size_t h = 0;
+      for (const char* c = s; *c; ++c)
+        h = static_cast<size_t>(*c) ^ (h * hash_multiplier);
+      return h;
+    }
+  };
 
-   TypeNameToValueMap& typeNameToValueMap() {
-      static TypeNameToValueMap s_map;
-      return s_map;
-   }
-}
+  //NOTE: the use of const char* does not lead to a memory leak because the data
+  // for the strings are assigned at compile time via a macro call
+  using TypeNameToValueMap = tbb::concurrent_unordered_map<const char*, const std::type_info*, StringHash, StringEqual>;
+
+  TypeNameToValueMap& typeNameToValueMap() {
+    static TypeNameToValueMap s_map;
+    return s_map;
+  }
+}  // namespace
 
-edm::typelookup::NameRegistrar::NameRegistrar(const char* iTypeName,const std::type_info& iInfo)
-{
-   typeNameToValueMap().insert(std::pair<const char*, const std::type_info*>(iTypeName,&iInfo));
+edm::typelookup::NameRegistrar::NameRegistrar(const char* iTypeName, const std::type_info& iInfo) {
+  typeNameToValueMap().insert(std::pair<const char*, const std::type_info*>(iTypeName, &iInfo));
 }
 
+std::pair<const char*, const std::type_info*> edm::typelookup::findType(const char* iTypeName) {
+  auto itFind = typeNameToValueMap().find(iTypeName);
 
-std::pair<const char*, const std::type_info*> 
-edm::typelookup::findType(const char* iTypeName) {
+  if (itFind == typeNameToValueMap().end()) {
+    return std::make_pair(static_cast<const char*>(nullptr), static_cast<std::type_info*>(nullptr));
+  }
 
-   auto itFind = typeNameToValueMap().find(iTypeName);
-   
-   if(itFind == typeNameToValueMap().end()) {
-      return std::make_pair(static_cast<const char*>(nullptr), static_cast<std::type_info*> (nullptr));
-   }
-   
-   return (*itFind);
+  return (*itFind);
 }
diff --git a/FWCore/Utilities/test/CRC32Calculator_t.cpp b/FWCore/Utilities/test/CRC32Calculator_t.cpp
index 1822c38d5b751..f4c90ef4c2805 100644
--- a/FWCore/Utilities/test/CRC32Calculator_t.cpp
+++ b/FWCore/Utilities/test/CRC32Calculator_t.cpp
@@ -3,13 +3,12 @@
 #include "FWCore/Utilities/interface/CRC32Calculator.h"
 
 int main() {
-
   cms::CRC32Calculator crc32("type_label_instance_process");
 
   //std::cout << "checksum = " << crc32.checksum() << std::endl;
 
   // This known result was calculated using python as a cross check
-  unsigned int  knownResult = 1215348599;
+  unsigned int knownResult = 1215348599;
   assert(crc32.checksum() == knownResult);
 
   cms::CRC32Calculator emptyString_crc32("");
diff --git a/FWCore/Utilities/test/Digest_t.cpp b/FWCore/Utilities/test/Digest_t.cpp
index 039ec30f75f0c..950c7a8ca4aea 100644
--- a/FWCore/Utilities/test/Digest_t.cpp
+++ b/FWCore/Utilities/test/Digest_t.cpp
@@ -17,7 +17,7 @@ void testGivenString(std::string const& s) {
   assert(r1 == r2);
 
   // The result should be valid *iff* s is non-empty.
-  assert(r1.isValid() == !s.empty() );
+  assert(r1.isValid() == !s.empty());
   assert(r1.toString().size() == 32);
   assert(r1.compactForm().size() == 16);
 }
@@ -38,9 +38,9 @@ void testConversions() {
   //check the MD5Result lookup table
   MD5Result lookup;
   MD5Result fromHex;
-  for(unsigned int i=0; i<256; ++i) {
-    for(unsigned int j=0; j<16; ++j) {
-      lookup.bytes[j]=static_cast<char>(i);
+  for (unsigned int i = 0; i < 256; ++i) {
+    for (unsigned int j = 0; j < 16; ++j) {
+      lookup.bytes[j] = static_cast<char>(i);
       fromHex.fromHexifiedString(lookup.toString());
       assert(lookup == fromHex);
       assert(lookup.toString() == fromHex.toString());
@@ -82,9 +82,8 @@ int main() {
   testEmptyString();
   try {
     testConversions();
-  }
-  catch(cms::Exception const& e) {
-    std::cerr << e.explainSelf() << std::endl; 
+  } catch (cms::Exception const& e) {
+    std::cerr << e.explainSelf() << std::endl;
     return 1;
   }
   return 0;
diff --git a/FWCore/Utilities/test/EDGetToken_t.cpp b/FWCore/Utilities/test/EDGetToken_t.cpp
index 0dd979de676ef..826606724752d 100644
--- a/FWCore/Utilities/test/EDGetToken_t.cpp
+++ b/FWCore/Utilities/test/EDGetToken_t.cpp
@@ -5,52 +5,46 @@ namespace edm {
   class TestEDGetToken {
   public:
     template <typename... Args>
-    static edm::EDGetToken makeToken( Args&&... iArgs) {
+    static edm::EDGetToken makeToken(Args&&... iArgs) {
       return edm::EDGetToken(std::forward<Args>(iArgs)...);
     }
-  
+
     template <typename T, typename... Args>
-    static edm::EDGetTokenT<T> makeTokenT( Args&&... iArgs) {
+    static edm::EDGetTokenT<T> makeTokenT(Args&&... iArgs) {
       return edm::EDGetTokenT<T>(std::forward<Args>(iArgs)...);
     }
   };
-}
+}  // namespace edm
 
 #include <iostream>
 
 int main() {
-
   edm::EDGetTokenT<int> token1 = edm::TestEDGetToken::makeTokenT<int>();
-  if(!token1.isUninitialized() ||
-     !(token1.index() == 0xFFFFFFFF)) {
+  if (!token1.isUninitialized() || !(token1.index() == 0xFFFFFFFF)) {
     std::cout << "EDGetTokenT no argument constructor failed 1" << std::endl;
     abort();
   }
 
   edm::EDGetTokenT<int> token2 = edm::TestEDGetToken::makeTokenT<int>(11);
-  if(token2.isUninitialized() ||
-     !(token2.index() == 11)) {
+  if (token2.isUninitialized() || !(token2.index() == 11)) {
     std::cout << "EDGetTokenT 1 argument constructor failed 2" << std::endl;
     abort();
   }
 
   edm::EDGetToken token10 = edm::TestEDGetToken::makeToken();
-  if(!token10.isUninitialized() ||
-     !(token10.index() == 0xFFFFFFFF)) {
+  if (!token10.isUninitialized() || !(token10.index() == 0xFFFFFFFF)) {
     std::cout << "EDGetToken no argument constructor failed 10" << std::endl;
     abort();
   }
 
   edm::EDGetToken token11 = edm::TestEDGetToken::makeToken(100);
-  if(token11.isUninitialized() ||
-     !(token11.index() == 100)) {
+  if (token11.isUninitialized() || !(token11.index() == 100)) {
     std::cout << "EDGetToken 1 argument constructor failed 11" << std::endl;
     abort();
   }
 
   edm::EDGetToken token12(token2);
-  if(token12.isUninitialized() ||
-     !(token12.index() == 11)) {
+  if (token12.isUninitialized() || !(token12.index() == 11)) {
     std::cout << "EDGetToken 1 argument constructor failed 12" << std::endl;
     abort();
   }
diff --git a/FWCore/Utilities/test/EDMException_t.cpp b/FWCore/Utilities/test/EDMException_t.cpp
index 1872777cb2385..f24c80d1922e8 100644
--- a/FWCore/Utilities/test/EDMException_t.cpp
+++ b/FWCore/Utilities/test/EDMException_t.cpp
@@ -7,8 +7,7 @@
 #include <typeinfo>
 #include <memory>
 
-void func3()
-{
+void func3() {
   edm::Exception ex(edm::errors::NotFound);
   ex << "This is just a test";
   ex.addContext("new1");
@@ -22,17 +21,12 @@ void func3()
   throw ex;
 }
 
-void func2()
-{
-  func3();
-}
+void func2() { func3(); }
 
-void func1()
-{
+void func1() {
   try {
-      func2();
-  }
-  catch (edm::Exception& e) {
+    func2();
+  } catch (edm::Exception& e) {
     edm::Exception toThrow(edm::errors::Unknown, "In func2", e);
     edm::Exception toThrowString(edm::errors::Unknown, std::string("In func2"), e);
     if (toThrow.explainSelf() != toThrowString.explainSelf()) {
@@ -52,39 +46,34 @@ void func1()
   }
 }
 
-const char answer[] = 
-  "An exception of category 'Unknown' occurred while\n"
-  "   [0] new2\n"
-  "   [1] new1\n"
-  "Exception Message:\n"
-  "In func2\n"
-  "This is just a test\n"
-  "Gave up\n"
-  "   Additional Info:\n"
-  "      [a] info2\n"
-  "      [b] info1\n";
+const char answer[] =
+    "An exception of category 'Unknown' occurred while\n"
+    "   [0] new2\n"
+    "   [1] new1\n"
+    "Exception Message:\n"
+    "In func2\n"
+    "This is just a test\n"
+    "Gave up\n"
+    "   Additional Info:\n"
+    "      [a] info2\n"
+    "      [b] info1\n";
 
-int main()
-{
+int main() {
   try {
     func1();
-  }
-  catch (edm::Exception& e) {
-    if(e.explainSelf() != answer) {
-	std::cerr << "Exception message incorrect.\n"
-               "==expected==\n"
-      << answer <<
-      "\n==message==\n"
-      <<e.explainSelf()
-	     << std::endl;
-	abort();
+  } catch (edm::Exception& e) {
+    if (e.explainSelf() != answer) {
+      std::cerr << "Exception message incorrect.\n"
+                   "==expected==\n"
+                << answer << "\n==message==\n"
+                << e.explainSelf() << std::endl;
+      abort();
     }
     edm::Exception ecopy(e);
     if (e.explainSelf() != ecopy.explainSelf()) {
       abort();
     }
-  }
-  catch (cms::Exception& e) {
+  } catch (cms::Exception& e) {
     abort();
   }
 
@@ -108,30 +97,24 @@ int main()
     abort();
   }
   try {
-    edm::Exception::throwThis(edm::errors::ProductNotFound,
-			      "a", "b", "c", "d", "e");
-  }
-  catch (edm::Exception & ex) {
-    if (ex.explainSelf() != std::string(
-      "An exception of category 'ProductNotFound' occurred.\n"
-      "Exception Message:\n"
-      "a bcde\n")) {
+    edm::Exception::throwThis(edm::errors::ProductNotFound, "a", "b", "c", "d", "e");
+  } catch (edm::Exception& ex) {
+    if (ex.explainSelf() != std::string("An exception of category 'ProductNotFound' occurred.\n"
+                                        "Exception Message:\n"
+                                        "a bcde\n")) {
       abort();
     }
   }
 
   try {
     edm::Exception::throwThis(edm::errors::ProductNotFound, "a", 1, "b");
-  }
-  catch (edm::Exception & ex) {
-    if (ex.explainSelf() != std::string(
-      "An exception of category 'ProductNotFound' occurred.\n"
-      "Exception Message:\n"
-      "a 1b\n")) {
+  } catch (edm::Exception& ex) {
+    if (ex.explainSelf() != std::string("An exception of category 'ProductNotFound' occurred.\n"
+                                        "Exception Message:\n"
+                                        "a 1b\n")) {
       abort();
     }
   }
 
-
-  return 0; 
+  return 0;
 }
diff --git a/FWCore/Utilities/test/Exception_t.cpp b/FWCore/Utilities/test/Exception_t.cpp
index 78d697f7b92b4..c58e7dbcd8082 100644
--- a/FWCore/Utilities/test/Exception_t.cpp
+++ b/FWCore/Utilities/test/Exception_t.cpp
@@ -8,8 +8,8 @@
 #include <string>
 
 struct Thing {
-  Thing():x() { }
-  explicit Thing(int xx):x(xx) { }
+  Thing() : x() {}
+  explicit Thing(int xx) : x(xx) {}
   int x;
 };
 
@@ -18,30 +18,30 @@ std::ostream& operator<<(std::ostream& os, const Thing& t) {
   return os;
 }
 
-const char expected[] =   "An exception of category 'InfiniteLoop' occurred.\n"
-                           "Exception Message:\n"
-                           "In func1\n"
-                           "This is just a test: \n"
-                           "double: 1.11111\n"
-                           "float:  2.22222\n"
-                           "uint:   75\n"
-                           "string: a string\n"
-                           "char*:  a nonconst pointer\n"
-                           "char[]: a c-style array\n"
-                           "Thing:  Thing(4)\n"
-                           "\n"
-                           "double: 1.111110e+00\n"
-                           "float:  2.22e+00\n"
-                           "char*:  ..a nonconst pointer\n"
-                           "\n"
-                           "Gave up\n";
+const char expected[] =
+    "An exception of category 'InfiniteLoop' occurred.\n"
+    "Exception Message:\n"
+    "In func1\n"
+    "This is just a test: \n"
+    "double: 1.11111\n"
+    "float:  2.22222\n"
+    "uint:   75\n"
+    "string: a string\n"
+    "char*:  a nonconst pointer\n"
+    "char[]: a c-style array\n"
+    "Thing:  Thing(4)\n"
+    "\n"
+    "double: 1.111110e+00\n"
+    "float:  2.22e+00\n"
+    "char*:  ..a nonconst pointer\n"
+    "\n"
+    "Gave up\n";
 
-static void errorMessage(std::string  const& iE, std::string const& iExpected) {
-  std::cerr<<"The exception message doesn't match expectation\n"
-             "==exception==\n"
-             <<iE
-             <<"\n==expected==\n"
-             <<iExpected <<"\n";
+static void errorMessage(std::string const& iE, std::string const& iExpected) {
+  std::cerr << "The exception message doesn't match expectation\n"
+               "==exception==\n"
+            << iE << "\n==expected==\n"
+            << iExpected << "\n";
 }
 
 void func3() {
@@ -49,7 +49,7 @@ void func3() {
   float f = 2.22222;
   unsigned int i = 75U;
   std::string s("a string");
-  char* c1 = const_cast<char *>("a nonconst pointer");
+  char* c1 = const_cast<char*>("a nonconst pointer");
   char c2[] = "a c-style array";
   Thing thing(4);
 
@@ -72,15 +72,12 @@ void func3() {
   throw e;
 }
 
-void func2() {
-  func3();
-}
+void func2() { func3(); }
 
 void func1() {
   try {
     func2();
-  }
-  catch (cms::Exception& e) {
+  } catch (cms::Exception& e) {
     cms::Exception toThrow("InfiniteLoop", "In func1", e);
     toThrow << "Gave up";
     throw toThrow;
@@ -90,33 +87,34 @@ void func1() {
 int main() {
   try {
     func1();
-  }
-  catch (cms::Exception& e) {
-    if (e.explainSelf() != expected ) {
-      errorMessage(e.explainSelf(),expected);
+  } catch (cms::Exception& e) {
+    if (e.explainSelf() != expected) {
+      errorMessage(e.explainSelf(), expected);
       abort();
     }
-    if(e.explainSelf() != std::string(e.what())) {
+    if (e.explainSelf() != std::string(e.what())) {
       std::cerr << "explainSelf and what do not agree"
-      <<"\n==explainSelf==\n"
-      <<e.explainSelf()
-      <<"\n==what==\n"
-      <<e.what();
+                << "\n==explainSelf==\n"
+                << e.explainSelf() << "\n==what==\n"
+                << e.what();
       abort();
     }
   }
 
   cms::Exception e1("ABC");
-  if (e1.alreadyPrinted()) abort();
+  if (e1.alreadyPrinted())
+    abort();
   e1.setAlreadyPrinted(true);
-  if (!e1.alreadyPrinted()) abort();
+  if (!e1.alreadyPrinted())
+    abort();
 
   cms::Exception e1s(std::string("ABC"));
-  if (e1s.alreadyPrinted()) abort();
+  if (e1s.alreadyPrinted())
+    abort();
   {
     const std::string expected("An exception of category 'ABC' occurred.\n");
     if (e1.explainSelf() != expected) {
-      errorMessage(e1.explainSelf(),expected);
+      errorMessage(e1.explainSelf(), expected);
       abort();
     }
   }
@@ -128,18 +126,23 @@ int main() {
   cms::Exception e2cs("ABC", std::string("foo"));
   cms::Exception e2sc(std::string("ABC"), "foo");
   cms::Exception e2ss(std::string("ABC"), std::string("foo"));
-  if (e2.alreadyPrinted()) abort();
-  if (e2cs.alreadyPrinted()) abort();
-  if (e2sc.alreadyPrinted()) abort();
-  if (e2ss.alreadyPrinted()) abort();
+  if (e2.alreadyPrinted())
+    abort();
+  if (e2cs.alreadyPrinted())
+    abort();
+  if (e2sc.alreadyPrinted())
+    abort();
+  if (e2ss.alreadyPrinted())
+    abort();
   e2 << "bar";
   e2cs << "bar";
   e2sc << "bar";
   e2ss << "bar";
   {
-    const std::string expected("An exception of category 'ABC' occurred.\n"
-                               "Exception Message:\n"
-                               "foo bar\n");
+    const std::string expected(
+        "An exception of category 'ABC' occurred.\n"
+        "Exception Message:\n"
+        "foo bar\n");
     if (e2.explainSelf() != expected) {
       errorMessage(e2.explainSelf(), expected);
       abort();
@@ -158,22 +161,24 @@ int main() {
   cms::Exception e3("ABC", "foo ");
   e3 << "bar\n";
   {
-    const std::string expected("An exception of category 'ABC' occurred.\n"
-                                "Exception Message:\n"
-                                "foo bar\n");
+    const std::string expected(
+        "An exception of category 'ABC' occurred.\n"
+        "Exception Message:\n"
+        "foo bar\n");
     if (e3.explainSelf() != expected) {
-      errorMessage(e3.explainSelf(),expected);
+      errorMessage(e3.explainSelf(), expected);
       abort();
     }
   }
   cms::Exception e4("ABC", "foo\n");
   e4 << "bar";
   {
-    const std::string expected("An exception of category 'ABC' occurred.\n"
-                               "Exception Message:\n"
-                               "foo\nbar\n");
+    const std::string expected(
+        "An exception of category 'ABC' occurred.\n"
+        "Exception Message:\n"
+        "foo\nbar\n");
     if (e4.explainSelf() != expected) {
-      errorMessage(e4.explainSelf(),expected);
+      errorMessage(e4.explainSelf(), expected);
       abort();
     }
   }
@@ -183,42 +188,47 @@ int main() {
   e2.addAdditionalInfo("info1");
   e2.addAdditionalInfo(std::string("info2"));
   {
-    const std::string expected("An exception of category 'ABC' occurred while\n"
-                               "   [0] context2\n"
-                               "   [1] context1\n"
-                               "Exception Message:\n"
-                               "foo bar\n"
-                               "   Additional Info:\n"
-                               "      [a] info2\n"
-                               "      [b] info1\n");
+    const std::string expected(
+        "An exception of category 'ABC' occurred while\n"
+        "   [0] context2\n"
+        "   [1] context1\n"
+        "Exception Message:\n"
+        "foo bar\n"
+        "   Additional Info:\n"
+        "      [a] info2\n"
+        "      [b] info1\n");
     if (e2.explainSelf() != expected) {
-      errorMessage(e2.explainSelf(),expected);
+      errorMessage(e2.explainSelf(), expected);
       abort();
     }
   }
   cms::Exception e5("DEF", "start\n", e2);
-  if (e5.alreadyPrinted()) abort();
+  if (e5.alreadyPrinted())
+    abort();
   cms::Exception e6("DEF", "start", e2);
-  std::string expected5("An exception of category 'DEF' occurred while\n"
-                        "   [0] context2\n"
-                        "   [1] context1\n"
-                        "Exception Message:\n"
-                        "start\n"
-                        "foo bar"
-                        "finish\n"
-                        "   Additional Info:\n"
-                        "      [a] info2\n"
-                        "      [b] info1\n");
+  std::string expected5(
+      "An exception of category 'DEF' occurred while\n"
+      "   [0] context2\n"
+      "   [1] context1\n"
+      "Exception Message:\n"
+      "start\n"
+      "foo bar"
+      "finish\n"
+      "   Additional Info:\n"
+      "      [a] info2\n"
+      "      [b] info1\n");
   e5 << "finish";
   e6 << "finish";
   cms::Exception e7(e6);
-  if (e7.alreadyPrinted()) abort();
+  if (e7.alreadyPrinted())
+    abort();
   e6.setAlreadyPrinted(true);
   cms::Exception e9(e6);
-  if (!e9.alreadyPrinted()) abort();
+  if (!e9.alreadyPrinted())
+    abort();
 
   if (e7.explainSelf() != expected5) {
-    errorMessage(e7.explainSelf(),expected5);
+    errorMessage(e7.explainSelf(), expected5);
     abort();
   }
 
@@ -231,16 +241,17 @@ int main() {
     abort();
   }
   e7.clearContext();
-  std::string expected7_1("An exception of category 'DEF' occurred.\n"
-                          "Exception Message:\n"
-                          "start\n"
-                          "foo bar"
-                          "finish\n"
-                          "   Additional Info:\n"
-                          "      [a] info2\n"
-                          "      [b] info1\n");
+  std::string expected7_1(
+      "An exception of category 'DEF' occurred.\n"
+      "Exception Message:\n"
+      "start\n"
+      "foo bar"
+      "finish\n"
+      "   Additional Info:\n"
+      "      [a] info2\n"
+      "      [b] info1\n");
   if (e7.explainSelf() != expected7_1) {
-    errorMessage(e7.explainSelf(),expected7_1);
+    errorMessage(e7.explainSelf(), expected7_1);
     abort();
   }
   std::list<std::string> newContext;
@@ -249,21 +260,22 @@ int main() {
   newContext.push_back("new3");
   e7.setContext(newContext);
   if (e7.context() != newContext) {
-    std::cerr<<e7;
+    std::cerr << e7;
     abort();
   }
 
   e7.clearAdditionalInfo();
-  std::string expected7_2("An exception of category 'DEF' occurred while\n"
-                          "   [0] new3\n"
-                          "   [1] new2\n"
-                          "   [2] new1\n"
-                          "Exception Message:\n"
-                          "start\n"
-                          "foo bar"
-                          "finish\n");
+  std::string expected7_2(
+      "An exception of category 'DEF' occurred while\n"
+      "   [0] new3\n"
+      "   [1] new2\n"
+      "   [2] new1\n"
+      "Exception Message:\n"
+      "start\n"
+      "foo bar"
+      "finish\n");
   if (e7.explainSelf() != expected7_2) {
-    errorMessage(e7.explainSelf(),expected7_2);
+    errorMessage(e7.explainSelf(), expected7_2);
     abort();
   }
   std::list<std::string> newAdditionalInfo;
@@ -272,23 +284,24 @@ int main() {
   newAdditionalInfo.push_back("newInfo3");
   e7.setAdditionalInfo(newAdditionalInfo);
   if (e7.additionalInfo() != newAdditionalInfo) {
-    std::cerr<<e7;
+    std::cerr << e7;
     abort();
   }
-  std::string expected7_3("An exception of category 'DEF' occurred while\n"
-                          "   [0] new3\n"
-                          "   [1] new2\n"
-                          "   [2] new1\n"
-                          "Exception Message:\n"
-                          "start\n"
-                          "foo bar"
-                          "finish\n"
-                          "   Additional Info:\n"
-                          "      [a] newInfo3\n"
-                          "      [b] newInfo2\n"
-                          "      [c] newInfo1\n");
+  std::string expected7_3(
+      "An exception of category 'DEF' occurred while\n"
+      "   [0] new3\n"
+      "   [1] new2\n"
+      "   [2] new1\n"
+      "Exception Message:\n"
+      "start\n"
+      "foo bar"
+      "finish\n"
+      "   Additional Info:\n"
+      "      [a] newInfo3\n"
+      "      [b] newInfo2\n"
+      "      [c] newInfo1\n");
   if (e7.explainSelf() != expected7_3) {
-    errorMessage(e7.explainSelf(),expected7_3);
+    errorMessage(e7.explainSelf(), expected7_3);
     abort();
   }
   if (e7.returnCode() != 8001) {
@@ -298,56 +311,58 @@ int main() {
   e7.append("Y");
   cms::Exception e8("ZZZ", "Z");
   e7.append(e8);
-  std::string expected7_4("An exception of category 'DEF' occurred while\n"
-                          "   [0] new3\n"
-                          "   [1] new2\n"
-                          "   [2] new1\n"
-                          "Exception Message:\n"
-                          "start\n"
-                          "foo bar"
-                          "finish XYZ \n"
-                          "   Additional Info:\n"
-                          "      [a] newInfo3\n"
-                          "      [b] newInfo2\n"
-                          "      [c] newInfo1\n");
+  std::string expected7_4(
+      "An exception of category 'DEF' occurred while\n"
+      "   [0] new3\n"
+      "   [1] new2\n"
+      "   [2] new1\n"
+      "Exception Message:\n"
+      "start\n"
+      "foo bar"
+      "finish XYZ \n"
+      "   Additional Info:\n"
+      "      [a] newInfo3\n"
+      "      [b] newInfo2\n"
+      "      [c] newInfo1\n");
   if (e7.explainSelf() != expected7_4) {
-    errorMessage(e7.explainSelf(),expected7_4);
+    errorMessage(e7.explainSelf(), expected7_4);
     abort();
   }
   std::unique_ptr<cms::Exception> ptr(e7.clone());
   e7.clearMessage();
-  std::string expected7_5("An exception of category 'DEF' occurred while\n"
-                          "   [0] new3\n"
-                          "   [1] new2\n"
-                          "   [2] new1\n"
-                          "   Additional Info:\n"
-                          "      [a] newInfo3\n"
-                          "      [b] newInfo2\n"
-                          "      [c] newInfo1\n");
+  std::string expected7_5(
+      "An exception of category 'DEF' occurred while\n"
+      "   [0] new3\n"
+      "   [1] new2\n"
+      "   [2] new1\n"
+      "   Additional Info:\n"
+      "      [a] newInfo3\n"
+      "      [b] newInfo2\n"
+      "      [c] newInfo1\n");
   if (e7.explainSelf() != expected7_5) {
-    errorMessage(e7.explainSelf(),expected7_5);
+    errorMessage(e7.explainSelf(), expected7_5);
     abort();
   }
 
   try {
     ptr->raise();
-  }
-  catch (cms::Exception& ex) {
+  } catch (cms::Exception& ex) {
     ex << "last one ";
-    std::string expected7_6("An exception of category 'DEF' occurred while\n"
-                            "   [0] new3\n"
-                            "   [1] new2\n"
-                            "   [2] new1\n"
-                            "Exception Message:\n"
-                            "start\n"
-                            "foo bar"
-                            "finish XYZ last one \n"
-                            "   Additional Info:\n"
-                            "      [a] newInfo3\n"
-                            "      [b] newInfo2\n"
-                            "      [c] newInfo1\n");
+    std::string expected7_6(
+        "An exception of category 'DEF' occurred while\n"
+        "   [0] new3\n"
+        "   [1] new2\n"
+        "   [2] new1\n"
+        "Exception Message:\n"
+        "start\n"
+        "foo bar"
+        "finish XYZ last one \n"
+        "   Additional Info:\n"
+        "      [a] newInfo3\n"
+        "      [b] newInfo2\n"
+        "      [c] newInfo1\n");
     if (ex.explainSelf() != expected7_6) {
-      errorMessage(ex.explainSelf(),expected7_6);
+      errorMessage(ex.explainSelf(), expected7_6);
       abort();
     }
   }
diff --git a/FWCore/Utilities/test/Guid_t.cpp b/FWCore/Utilities/test/Guid_t.cpp
index e022ce19c8d39..2eb03cd54dd53 100644
--- a/FWCore/Utilities/test/Guid_t.cpp
+++ b/FWCore/Utilities/test/Guid_t.cpp
@@ -5,15 +5,15 @@
 #include <iostream>
 
 int main() {
-	edm::Guid guid;
-	std::string guidString = guid.toString();
-	edm::Guid guid2;
-	guid2.fromString(guidString);
-	edm::Guid guid3(guid2);
-	assert(guid == guid2);
-	assert(guid == guid3);
-	std::string guidString2 = guid2.toString();
-	std::string guidString3 = guid3.toString();
-	assert(guidString2 == guidString);
-	assert(guidString3 == guidString);
+  edm::Guid guid;
+  std::string guidString = guid.toString();
+  edm::Guid guid2;
+  guid2.fromString(guidString);
+  edm::Guid guid3(guid2);
+  assert(guid == guid2);
+  assert(guid == guid3);
+  std::string guidString2 = guid2.toString();
+  std::string guidString3 = guid3.toString();
+  assert(guidString2 == guidString);
+  assert(guidString3 == guidString);
 }
diff --git a/FWCore/Utilities/test/HRTime_t.cpp b/FWCore/Utilities/test/HRTime_t.cpp
index 4bea292a6ca6d..9c59e18b1a6f4 100644
--- a/FWCore/Utilities/test/HRTime_t.cpp
+++ b/FWCore/Utilities/test/HRTime_t.cpp
@@ -1,26 +1,22 @@
 
 #include "FWCore/Utilities/interface/HRRealTime.h"
 
-
 #include <ctime>
 #include <cmath>
-#include <typeinfo> 
+#include <typeinfo>
 #include <iostream>
 
-
 #include <Utilities/Testing/interface/CppUnit_testdriver.icpp>
 #include <cppunit/extensions/HelperMacros.h>
 
-
-
 namespace {
 
-  double gcrap=0;
+  double gcrap = 0;
   void waiste() {
-    for (double i=1;i<100000;i++)
-      gcrap+=std::log(std::sqrt(i));
+    for (double i = 1; i < 100000; i++)
+      gcrap += std::log(std::sqrt(i));
   }
-}
+}  // namespace
 
 // FIXME
 // I would have preferred check by features....
@@ -29,8 +25,9 @@ class TestTimers : public CppUnit::TestFixture {
   CPPUNIT_TEST(check_stdclock);
   CPPUNIT_TEST(check_RealTime);
   CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){}
+  void setUp() {}
   void tearDown() {}
   void check_stdclock();
   void check_RealTime();
@@ -38,53 +35,44 @@ class TestTimers : public CppUnit::TestFixture {
 
 CPPUNIT_TEST_SUITE_REGISTRATION(TestTimers);
 
-
-template<typename S>
+template <typename S>
 void checkTime(S source, bool hr) {
-  
-//  typedef typename boost::function_traits<S>::result_type T;
+  //  typedef typename boost::function_traits<S>::result_type T;
   // typedef typename boost::function_types::result_type<S>::type T;
   typedef edm::HRTimeDiffType T;
 
   T i = source();
 
-  CPPUNIT_ASSERT(!( i<0 ));
-  
+  CPPUNIT_ASSERT(!(i < 0));
+
   // source()-source()  it seems that this may be negative...
-  
+
   waiste();
-  
+
   T a = source();
   T b = source();
-  CPPUNIT_ASSERT(!( (a-i)<0 ));
-  CPPUNIT_ASSERT(!( (b-a)<0 ));
-  if (hr) CPPUNIT_ASSERT(a>i); // not obvious if low resolution
-  
-  waiste();
-  
-  T c = source();
-  double d = double(source()-c);
-  CPPUNIT_ASSERT(!(d<0));
-  
- 
-  T e = source();
-  CPPUNIT_ASSERT(!( (c-i)<(b-i) ));
-  CPPUNIT_ASSERT(!( (e-i)<(c-i) ));
-  if (hr) CPPUNIT_ASSERT( (e-i)>(b-i) ); // not obvious if low resolution...
-
-}
+  CPPUNIT_ASSERT(!((a - i) < 0));
+  CPPUNIT_ASSERT(!((b - a) < 0));
+  if (hr)
+    CPPUNIT_ASSERT(a > i);  // not obvious if low resolution
 
-#define CHECKTIME(S,HR) \
-  std::cout << "checking source " << #S << std::endl;	\
-  checkTime(&S,HR)
+  waiste();
 
+  T c = source();
+  double d = double(source() - c);
+  CPPUNIT_ASSERT(!(d < 0));
 
-void TestTimers::check_stdclock() {
-  CHECKTIME(std::clock,false);
+  T e = source();
+  CPPUNIT_ASSERT(!((c - i) < (b - i)));
+  CPPUNIT_ASSERT(!((e - i) < (c - i)));
+  if (hr)
+    CPPUNIT_ASSERT((e - i) > (b - i));  // not obvious if low resolution...
 }
 
-void TestTimers::check_RealTime() {
-  CHECKTIME(edm::hrRealTime,true);
-}
+#define CHECKTIME(S, HR)                              \
+  std::cout << "checking source " << #S << std::endl; \
+  checkTime(&S, HR)
 
+void TestTimers::check_stdclock() { CHECKTIME(std::clock, false); }
 
+void TestTimers::check_RealTime() { CHECKTIME(edm::hrRealTime, true); }
diff --git a/FWCore/Utilities/test/InputTag_t.cpp b/FWCore/Utilities/test/InputTag_t.cpp
index 7e3feb75878df..eac4f266b5cfc 100644
--- a/FWCore/Utilities/test/InputTag_t.cpp
+++ b/FWCore/Utilities/test/InputTag_t.cpp
@@ -18,8 +18,8 @@ namespace edm {
 edm::ProductRegistry* reg1 = reinterpret_cast<edm::ProductRegistry*>(1);
 edm::ProductRegistry* reg2 = reinterpret_cast<edm::ProductRegistry*>(2);
 
-class TypeToTestInputTag1 { };
-class TypeToTestInputTag2 { };
+class TypeToTestInputTag1 {};
+class TypeToTestInputTag2 {};
 TypeToTestInputTag1 typeToTestInputTag1;
 TypeToTestInputTag2 typeToTestInputTag2;
 
@@ -27,17 +27,17 @@ edm::TypeID testTypeID1(typeToTestInputTag1);
 edm::TypeID testTypeID2(typeToTestInputTag2);
 
 class InputTagModifier {
-
   edm::InputTag* inputTag;
 
 public:
-  InputTagModifier(edm::InputTag* i) : inputTag(i) { }
+  InputTagModifier(edm::InputTag* i) : inputTag(i) {}
 
-  void operator() ( tbb::blocked_range<int> const& r ) const {
-    for ( int i = r.begin(); i != r.end(); i++ ) {
+  void operator()(tbb::blocked_range<int> const& r) const {
+    for (int i = r.begin(); i != r.end(); i++) {
       for (unsigned int j = 0; j < 10000; ++j) {
         unsigned int index = inputTag->indexFor(testTypeID1, edm::InRun, reg1);
-        if (index != 5 && index != edm::ProductResolverIndexInvalid) abort();
+        if (index != 5 && index != edm::ProductResolverIndexInvalid)
+          abort();
         // std::cout << "a\n";
       }
       for (unsigned int j = 0; j < 100; ++j) {
@@ -48,81 +48,58 @@ class InputTagModifier {
         unsigned int index = inputTag->indexFor(testTypeID1, edm::InRun, reg1);
         // if (index != 5) abort(); // This can fail!
         // std::cout << index << " c\n";
-        if (index != 5 && index != edm::ProductResolverIndexInvalid) abort();
+        if (index != 5 && index != edm::ProductResolverIndexInvalid)
+          abort();
       }
     }
   }
-
 };
 
 int main() {
-
   edm::InputTag tag1;
-  if (tag1.label() != "" ||
-      tag1.instance() != "" ||
-      tag1.process() != "" ||
-      tag1.willSkipCurrentProcess()) {
+  if (tag1.label() != "" || tag1.instance() != "" || tag1.process() != "" || tag1.willSkipCurrentProcess()) {
     std::cout << "InputTag() failed" << std::endl;
     abort();
   }
 
   edm::InputTag tag2(std::string("a"), std::string("b"), std::string("c"));
-  if (tag2.label() != "a" ||
-      tag2.instance() != "b" ||
-      tag2.process() != "c" ||
-      tag2.willSkipCurrentProcess()) {
+  if (tag2.label() != "a" || tag2.instance() != "b" || tag2.process() != "c" || tag2.willSkipCurrentProcess()) {
     std::cout << "InputTag(string,string,string) failed" << std::endl;
     abort();
   }
 
   edm::InputTag tag3("d", "e", "f");
-  if (tag3.label() != "d" ||
-      tag3.instance() != "e" ||
-      tag3.process() != "f" ||
-      tag3.willSkipCurrentProcess()) {
+  if (tag3.label() != "d" || tag3.instance() != "e" || tag3.process() != "f" || tag3.willSkipCurrentProcess()) {
     std::cout << "InputTag(char*,char*,char*) failed" << std::endl;
     abort();
   }
 
   edm::InputTag tag4("g:h:i");
-  if (tag4.label() != "g" ||
-      tag4.instance() != "h" ||
-      tag4.process() != "i" ||
-      tag4.willSkipCurrentProcess()) {
+  if (tag4.label() != "g" || tag4.instance() != "h" || tag4.process() != "i" || tag4.willSkipCurrentProcess()) {
     std::cout << "InputTag(string) 1 failed" << std::endl;
     abort();
   }
 
   edm::InputTag tag5("g:h");
-  if (tag5.label() != "g" ||
-      tag5.instance() != "h" ||
-      tag5.process() != "" ||
-      tag5.willSkipCurrentProcess()) {
+  if (tag5.label() != "g" || tag5.instance() != "h" || tag5.process() != "" || tag5.willSkipCurrentProcess()) {
     std::cout << "InputTag(string) 2 failed" << std::endl;
     abort();
   }
 
   edm::InputTag tag6("g");
-  if (tag6.label() != "g" ||
-      tag6.instance() != "" ||
-      tag6.process() != "" ||
-      tag6.willSkipCurrentProcess()) {
+  if (tag6.label() != "g" || tag6.instance() != "" || tag6.process() != "" || tag6.willSkipCurrentProcess()) {
     std::cout << "InputTag(string) 3 failed" << std::endl;
     abort();
   }
 
   edm::InputTag tag7(std::string("a"), std::string("b"), std::string("c"));
   edm::InputTag tag8(std::string("x"), std::string("b"), std::string("c"));
-  if (!(tag2 == tag7) ||
-      tag4 == tag5 ||
-      tag5 == tag6 ||
-      tag7 == tag8) {
+  if (!(tag2 == tag7) || tag4 == tag5 || tag5 == tag6 || tag7 == tag8) {
     std::cout << "InputTag::operator== failed" << std::endl;
     abort();
   }
 
-  if (tag7.encode() != std::string("a:b:c") ||
-      tag5.encode() != std::string("g:h") ||
+  if (tag7.encode() != std::string("a:b:c") || tag5.encode() != std::string("g:h") ||
       tag6.encode() != std::string("g")) {
     std::cout << "InputTag::encode failed " << std::endl;
     abort();
@@ -133,36 +110,27 @@ int main() {
   edm::InputTag tag10(std::move(tag11));
   tag6 = tag10;
   tag5 = edm::InputTag("a:b:c");
-  if (!(tag8 == tag9) ||
-      !(tag10 == tag7) ||
-      !(tag6 == tag10) ||
-      !(tag5 == tag10)) {
+  if (!(tag8 == tag9) || !(tag10 == tag7) || !(tag6 == tag10) || !(tag5 == tag10)) {
     std::cout << "InputTag::operator= or constructor, move or copy failed" << std::endl;
     abort();
   }
 
   edm::InputTag tag12("d", "e", "@skipCurrentProcess");
-  if (tag12.label() != "d" ||
-      tag12.instance() != "e" ||
-      tag12.process() != "@skipCurrentProcess" ||
+  if (tag12.label() != "d" || tag12.instance() != "e" || tag12.process() != "@skipCurrentProcess" ||
       !tag12.willSkipCurrentProcess()) {
     std::cout << "Test of tag12 failed" << std::endl;
     abort();
   }
 
   edm::InputTag tag12a(std::string("d"), std::string("e"), std::string("@skipCurrentProcess"));
-  if (tag12a.label() != "d" ||
-      tag12a.instance() != "e" ||
-      tag12a.process() != "@skipCurrentProcess" ||
+  if (tag12a.label() != "d" || tag12a.instance() != "e" || tag12a.process() != "@skipCurrentProcess" ||
       !tag12a.willSkipCurrentProcess()) {
     std::cout << "Test of tag12a failed" << std::endl;
     abort();
   }
 
   edm::InputTag tag12b("d:e:@skipCurrentProcess");
-  if (tag12b.label() != "d" ||
-      tag12b.instance() != "e" ||
-      tag12b.process() != "@skipCurrentProcess" ||
+  if (tag12b.label() != "d" || tag12b.instance() != "e" || tag12b.process() != "@skipCurrentProcess" ||
       !tag12b.willSkipCurrentProcess()) {
     std::cout << "Test of tag12b failed" << std::endl;
     abort();
@@ -224,8 +192,7 @@ int main() {
   for (unsigned int k = 0; k < 500; ++k) {
     edm::InputTag tag21("a:b:c");
     InputTagModifier inputTagModifier(&tag21);
-    tbb::parallel_for(tbb::blocked_range<int>(0, 20, 1),
-                      inputTagModifier);
+    tbb::parallel_for(tbb::blocked_range<int>(0, 20, 1), inputTagModifier);
   }
   return 0;
 }
diff --git a/FWCore/Utilities/test/MallocOpts_t.cpp b/FWCore/Utilities/test/MallocOpts_t.cpp
index 8dcc8f7a2f8ae..61bb852bc442e 100644
--- a/FWCore/Utilities/test/MallocOpts_t.cpp
+++ b/FWCore/Utilities/test/MallocOpts_t.cpp
@@ -4,23 +4,22 @@
 #include <cassert>
 using namespace std;
 
-int main()
-{
+int main() {
   edm::MallocOptionSetter& mo = edm::getGlobalOptionSetter();
 #if defined(__x86_64__) || defined(__i386__)
   edm::MallocOpts mycopy = mo.get(), defaultt;
 #endif /* defined(__x86_64__) || defined(__i386__) */
 
-  assert(mo.retrieveFromEnv()==false);
-  assert(mo.hasErrors()==false);
+  assert(mo.retrieveFromEnv() == false);
+  assert(mo.hasErrors() == false);
   mo.set_mmap_max(1);
   mo.adjustMallocParams();
-  assert(mo.hasErrors()==false);  
+  assert(mo.hasErrors() == false);
 
 #if defined(__x86_64__) || defined(__i386__)
-  assert(mo.retrieveFromCpuType()==true);
-  assert(mo.get()==mycopy);
-  assert(defaultt!=mycopy);
+  assert(mo.retrieveFromCpuType() == true);
+  assert(mo.get() == mycopy);
+  assert(defaultt != mycopy);
 #endif /* defined(__x86_64__) || defined(__i386__) */
 
   return 0;
diff --git a/FWCore/Utilities/test/RunningAverage_t.cpp b/FWCore/Utilities/test/RunningAverage_t.cpp
index b2b04bd303166..e6b566ed5257b 100644
--- a/FWCore/Utilities/test/RunningAverage_t.cpp
+++ b/FWCore/Utilities/test/RunningAverage_t.cpp
@@ -18,61 +18,49 @@ namespace {
 namespace test_average {
   namespace running_average {
     int test() {
-    
-    
       //tbb::task_scheduler_init init;  // Automatic number of threads
       tbb::task_scheduler_init init(tbb::task_scheduler_init::default_num_threads());  // Explicit number of threads
-    
+
       // std::random_device rd;
-      std::mt19937 e2; // (rd());
+      std::mt19937 e2;  // (rd());
       std::normal_distribution<> normal_dist(1000., 200.);
-    
-    
-    
-      thread_local std::vector<float> v;  
-    
-      
-    
-      int kk=0;
-    
-    
-      int n=2000;
-    
+
+      thread_local std::vector<float> v;
+
+      int kk = 0;
+
+      int n = 2000;
+
       int res[n];
-      int qq[n]; for (auto & y:qq) y = std::max(0.,normal_dist(e2));
-    
+      int qq[n];
+      for (auto& y : qq)
+        y = std::max(0., normal_dist(e2));
+
       auto theLoop = [&](int i) {
         kk++;
-        v.reserve(res[i]=localRA.upper());
+        v.reserve(res[i] = localRA.upper());
         v.resize(qq[i]);
         localRA.update(v.size());
         decltype(v) t;
-        swap(v,t);
+        swap(v, t);
       };
-    
-    
-      tbb::parallel_for(
-    		    tbb::blocked_range<size_t>(0,n),
-    		    [&](const tbb::blocked_range<size_t>& r) {
-    		      for (size_t i=r.begin();i<r.end();++i) theLoop(i);
-        }
-      );
-    
-    
-      auto mm = std::max_element(res,res+n);
+
+      tbb::parallel_for(tbb::blocked_range<size_t>(0, n), [&](const tbb::blocked_range<size_t>& r) {
+        for (size_t i = r.begin(); i < r.end(); ++i)
+          theLoop(i);
+      });
+
+      auto mm = std::max_element(res, res + n);
       std::cout << kk << ' ' << localRA.m_curr << ' ' << localRA.mean() << std::endl;
-      for (auto & i : localRA.m_buffer) std::cout << i << ' ';
+      for (auto& i : localRA.m_buffer)
+        std::cout << i << ' ';
       std::cout << std::endl;
-      std::cout << std::accumulate(res,res+n,0)/n 
-    	    << ' ' << *std::min_element(res+16,res+n) << ',' << *mm << std::endl;
-    
+      std::cout << std::accumulate(res, res + n, 0) / n << ' ' << *std::min_element(res + 16, res + n) << ',' << *mm
+                << std::endl;
+
       return 0;
-    
-    
     }
-  }
-}
+  }  // namespace running_average
+}  // namespace test_average
 
-int main() {
-  return ::test_average::running_average::test();
-}
+int main() { return ::test_average::running_average::test(); }
diff --git a/FWCore/Utilities/test/TestHelper_t.cpp b/FWCore/Utilities/test/TestHelper_t.cpp
index b7d37e28c3445..2f0e0c40064da 100644
--- a/FWCore/Utilities/test/TestHelper_t.cpp
+++ b/FWCore/Utilities/test/TestHelper_t.cpp
@@ -1,3 +1,2 @@
 #include "FWCore/Utilities/interface/TestHelper.h"
 RUNTEST()
-
diff --git a/FWCore/Utilities/test/atomic_value_ptr_t.cpp b/FWCore/Utilities/test/atomic_value_ptr_t.cpp
index bff852250e870..c81912194b63c 100644
--- a/FWCore/Utilities/test/atomic_value_ptr_t.cpp
+++ b/FWCore/Utilities/test/atomic_value_ptr_t.cpp
@@ -4,18 +4,27 @@
 #include <cassert>
 #include <atomic>
 
-class simple
-{
+class simple {
   int i;
- public:
+
+public:
   static std::atomic<int> count;
   static std::atomic<int> count1;
-  simple() : i(0) { ++count; ++count1; }
-  explicit simple(int j) : i(j) { ++count; ++count1; }
-  simple(simple const& s) : i(s.i) { ++count; ++count1; }
+  simple() : i(0) {
+    ++count;
+    ++count1;
+  }
+  explicit simple(int j) : i(j) {
+    ++count;
+    ++count1;
+  }
+  simple(simple const& s) : i(s.i) {
+    ++count;
+    ++count1;
+  }
   ~simple() { --count; }
   bool operator==(simple const& o) const { return i == o.i; }
-  bool isSame(simple const& o) const {return &o == this; }
+  bool isSame(simple const& o) const { return &o == this; }
   simple& operator=(simple const& o) {
     simple temp(o);
     std::swap(*this, temp);
@@ -26,19 +35,17 @@ class simple
 std::atomic<int> simple::count{0};
 std::atomic<int> simple::count1{0};
 
-
-int main()
-{
+int main() {
   assert(simple::count == 0);
   {
     edm::atomic_value_ptr<simple> a(new simple(10));
     assert(simple::count == 1);
     edm::atomic_value_ptr<simple> b(a);
     assert(simple::count == 2);
-    
+
     assert(*a == *b);
     assert(a->isSame(*b) == false);
-  } // a and b destroyed
+  }  // a and b destroyed
   assert(simple::count == 0);
 
   {
@@ -57,16 +64,14 @@ int main()
     edm::atomic_value_ptr<simple> f;
     if (f) {
       assert(0);
-    }
-    else {
+    } else {
     }
     f = std::move(d);
     assert(d.get() == nullptr);
     assert(*e == *f);
     assert(f.operator->() == pd);
     if (f) {
-    }
-    else {
+    } else {
       assert(0);
     }
 
diff --git a/FWCore/Utilities/test/callxnowait_t.cppunit.cpp b/FWCore/Utilities/test/callxnowait_t.cppunit.cpp
index 3642b1dae8266..29ee24d9eaec0 100644
--- a/FWCore/Utilities/test/callxnowait_t.cppunit.cpp
+++ b/FWCore/Utilities/test/callxnowait_t.cppunit.cpp
@@ -13,23 +13,23 @@ Changed by Viji on 29-06-2005
 #include <thread>
 #include <atomic>
 
-class testCallXNoWait: public CppUnit::TestFixture
-{
+class testCallXNoWait : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testCallXNoWait);
-  
+
   CPPUNIT_TEST(onceTest);
   CPPUNIT_TEST(nTimesTest);
   CPPUNIT_TEST(onceThreadedTest);
   CPPUNIT_TEST(nTimesThreadedTest);
-  
+
   CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){}
-  void tearDown(){}
-  
+  void setUp() {}
+  void tearDown() {}
+
   void onceTest();
   void nTimesTest();
-  
+
   void onceThreadedTest();
   void nTimesThreadedTest();
 };
@@ -37,89 +37,81 @@ class testCallXNoWait: public CppUnit::TestFixture
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testCallXNoWait);
 
-void testCallXNoWait::onceTest()
-{
-
+void testCallXNoWait::onceTest() {
   edm::CallOnceNoWait guard;
-  
-  unsigned int iCount=0;
-  
-  guard([&iCount](){ ++iCount; });
-  
-  CPPUNIT_ASSERT(iCount == 1);
 
-  guard([&iCount](){ ++iCount; });
+  unsigned int iCount = 0;
+
+  guard([&iCount]() { ++iCount; });
+
   CPPUNIT_ASSERT(iCount == 1);
 
+  guard([&iCount]() { ++iCount; });
+  CPPUNIT_ASSERT(iCount == 1);
 }
 
-void testCallXNoWait::nTimesTest()
-{
+void testCallXNoWait::nTimesTest() {
   edm::CallNTimesNoWait guard{3};
-  
-  unsigned int iCount=0;
-  
-  for(unsigned int i=0; i<6; ++i) {
-    guard([&iCount](){ ++iCount; });
-    if(i<3) {
-      CPPUNIT_ASSERT(iCount == i+1);
+
+  unsigned int iCount = 0;
+
+  for (unsigned int i = 0; i < 6; ++i) {
+    guard([&iCount]() { ++iCount; });
+    if (i < 3) {
+      CPPUNIT_ASSERT(iCount == i + 1);
     } else {
       CPPUNIT_ASSERT(iCount == 3);
     }
   }
 }
 
-
-void testCallXNoWait::onceThreadedTest()
-{
-  
+void testCallXNoWait::onceThreadedTest() {
   edm::CallOnceNoWait guard;
-  
+
   std::atomic<unsigned int> iCount{0};
-  
+
   std::vector<std::thread> threads;
-  
+
   std::atomic<bool> start{false};
 
-  for(unsigned int i=0; i<4; ++i) {
-    threads.emplace_back([&guard,&iCount,&start](){
-      while(not start) {}
-      guard([&iCount](){ ++iCount; });
+  for (unsigned int i = 0; i < 4; ++i) {
+    threads.emplace_back([&guard, &iCount, &start]() {
+      while (not start) {
+      }
+      guard([&iCount]() { ++iCount; });
     });
   }
   CPPUNIT_ASSERT(iCount == 0);
-  
+
   start = true;
-  for(auto& t : threads) {
+  for (auto& t : threads) {
     t.join();
   }
   CPPUNIT_ASSERT(iCount == 1);
 }
 
-
-void testCallXNoWait::nTimesThreadedTest()
-{
-  const unsigned short kMaxTimes=3;
+void testCallXNoWait::nTimesThreadedTest() {
+  const unsigned short kMaxTimes = 3;
   edm::CallNTimesNoWait guard(kMaxTimes);
-  
+
   std::atomic<unsigned int> iCount{0};
-  
+
   std::vector<std::thread> threads;
-  
+
   std::atomic<bool> start{false};
-  
-  for(unsigned int i=0; i<2*kMaxTimes; ++i) {
-    threads.emplace_back([&guard,&iCount,&start](){
-      while(not start) {}
-      guard([&iCount](){ ++iCount; });
+
+  for (unsigned int i = 0; i < 2 * kMaxTimes; ++i) {
+    threads.emplace_back([&guard, &iCount, &start]() {
+      while (not start) {
+      }
+      guard([&iCount]() { ++iCount; });
     });
   }
   CPPUNIT_ASSERT(iCount == 0);
-  
+
   start = true;
-  for(auto& t : threads) {
+  for (auto& t : threads) {
     t.join();
   }
   CPPUNIT_ASSERT(iCount == kMaxTimes);
 }
-
diff --git a/FWCore/Utilities/test/clone_ptr_t.cpp b/FWCore/Utilities/test/clone_ptr_t.cpp
index caea83a11f849..83267ba857064 100644
--- a/FWCore/Utilities/test/clone_ptr_t.cpp
+++ b/FWCore/Utilities/test/clone_ptr_t.cpp
@@ -1,87 +1,92 @@
 #include "FWCore/Utilities/interface/clone_ptr.h"
 
-#include<iostream>
-#include<algorithm>
-#include<cassert>
+#include <iostream>
+#include <algorithm>
+#include <cassert>
 
-int cla=0;
+int cla = 0;
 
-struct A{
-   A(){}
-   A(int j) : i(j){}
+struct A {
+  A() {}
+  A(int j) : i(j) {}
 
-  A * clone() const { cla++; /*std::cout<< "c A " << i << std::endl;*/ return new A(*this);}
+  A *clone() const {
+    cla++; /*std::cout<< "c A " << i << std::endl;*/
+    return new A(*this);
+  }
 
-  int i=3;
+  int i = 3;
 };
 
+int da = 0;
+int da0 = 0;
+struct B {
+  B() {}
+  B(B const &b) : a(b.a) {}
+  B(B &&b) noexcept : a(std::move(b.a)) {}
 
-int da=0;
-int da0=0;
-struct B{
-
-  B(){}
-  B(B const &b) : a(b.a){}
-  B(B &&b)   noexcept : a(std::move(b.a)){}
-
-  B & operator=(B const &b) {
-    a=b.a;
+  B &operator=(B const &b) {
+    a = b.a;
     return *this;
   }
-  B & operator=(B&&b)  noexcept {
-    a=std::move(b.a);
+  B &operator=(B &&b) noexcept {
+    a = std::move(b.a);
     return *this;
   }
 
-  ~B() {if(a) da++; else da0++; /*std::cout<< "d B " << (a ? a->i : -99) << std::endl;*/}
+  ~B() {
+    if (a)
+      da++;
+    else
+      da0++; /*std::cout<< "d B " << (a ? a->i : -99) << std::endl;*/
+  }
 
   extstd::clone_ptr<A> a;
 };
 
-
-#include<vector>
+#include <vector>
 int main() {
+  B b;
+  b.a.reset(new A(2));
 
-  B b; b.a.reset(new A(2));
-
-  assert(cla==0);
+  assert(cla == 0);
   B c = b;
-  assert(cla==1);
+  assert(cla == 1);
   B d = b;
-  assert(cla==2);
+  assert(cla == 2);
 
   b.a.reset(new A(-2));
 
   //std::cout<< c.a->i << std::endl;
   assert(c.a->i == 2);
   assert(b.a->i == -2);
-  
+
   c = b;
-  assert(cla==3);
+  assert(cla == 3);
 
   assert(c.a->i == -2);
   //std::cout<< c.a->i << std::endl;
   c.a.reset(new A(-7));
   assert(c.a->i == -7);
-  assert(cla==3);
-  
+  assert(cla == 3);
+
   //std::cout << cla << " " << da << " " << da0 << std::endl;
 
-  std::vector<B> vb(1); 
+  std::vector<B> vb(1);
   vb.push_back(b);
-  assert(cla==4);
+  assert(cla == 4);
 
   int expectedCla = cla;
   int cValue = c.a->i;
   vb.push_back(std::move(c));
   //some compilers will still cause a clone to be called and others won't
   //assert(cla==expectedCla);
-  assert((*vb.back().a).i ==cValue);
-  expectedCla = cla+1;
-  vb[0]=d;
+  assert((*vb.back().a).i == cValue);
+  expectedCla = cla + 1;
+  vb[0] = d;
 
   //std::cout <<cla <<" "<<expectedCla<<std::endl;
-  assert(cla==expectedCla);
+  assert(cla == expectedCla);
   assert(vb[0].a->i == d.a->i);
   // assert(cla==5);
   // assert(da==0);
@@ -89,15 +94,14 @@ int main() {
 
   //std::cout<< vb[0].a->i << std::endl;
   assert(vb[0].a->i == 2);
-  std::sort(vb.begin(),vb.end(),[](B const & rh, B const & lh){return rh.a->i<lh.a->i;});
-  assert( (*vb[0].a).i == -7);
-  assert(cla==expectedCla);
+  std::sort(vb.begin(), vb.end(), [](B const &rh, B const &lh) { return rh.a->i < lh.a->i; });
+  assert((*vb[0].a).i == -7);
+  assert(cla == expectedCla);
   //std::cout<< (*vb[0].a).i << std::endl;
-  std::swap(b,d);
-  assert(cla==expectedCla);
+  std::swap(b, d);
+  assert(cla == expectedCla);
   // assert(da==0);
   //std::cout << cla << " " << da << " " << da0 << std::endl;
 
-
   return 0;
 }
diff --git a/FWCore/Utilities/test/cputimer_t.cppunit.cpp b/FWCore/Utilities/test/cputimer_t.cppunit.cpp
index 3934a31b0d0c3..2018266789a0e 100644
--- a/FWCore/Utilities/test/cputimer_t.cppunit.cpp
+++ b/FWCore/Utilities/test/cputimer_t.cppunit.cpp
@@ -13,16 +13,16 @@ Changed by Viji on 29-06-2005
 #include <cppunit/extensions/HelperMacros.h>
 #include "FWCore/Utilities/interface/CPUTimer.h"
 
-class testCPUTimer: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(testCPUTimer);
+class testCPUTimer : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testCPUTimer);
+
+  CPPUNIT_TEST(testTiming);
 
-CPPUNIT_TEST(testTiming);
+  CPPUNIT_TEST_SUITE_END();
 
-CPPUNIT_TEST_SUITE_END();
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void testTiming();
 };
@@ -38,66 +38,63 @@ void testCPUTimer::testTiming()
 {
   edm::CPUTimer timer;
   CPPUNIT_ASSERT(timer.realTime() == 0.0);
-  CPPUNIT_ASSERT(timer.cpuTime()==0.0);
-  
+  CPPUNIT_ASSERT(timer.cpuTime() == 0.0);
+
   timer.start();
   sleep(2);
   timer.stop();
   //Consider good enough if times are within 1%. Closer than that causes test failures
-  if((timer.realTime()<=2.0) or (timer.cpuTime()+2.0-0.02 > timer.realTime())) {
-    std::cerr <<"real "<<timer.realTime()<<" cpu "<<timer.cpuTime()<< std::endl;
+  if ((timer.realTime() <= 2.0) or (timer.cpuTime() + 2.0 - 0.02 > timer.realTime())) {
+    std::cerr << "real " << timer.realTime() << " cpu " << timer.cpuTime() << std::endl;
   }
   CPPUNIT_ASSERT(timer.realTime() > 2.0);
-  CPPUNIT_ASSERT(timer.cpuTime()+2.0-0.02 <= timer.realTime());
+  CPPUNIT_ASSERT(timer.cpuTime() + 2.0 - 0.02 <= timer.realTime());
 
   timer.start();
   sleep(2);
-  if(timer.realTime() <= 4.0 ) {
-    std::cerr <<"real "<<timer.realTime()<<" cpu "<<timer.cpuTime()<< std::endl;
+  if (timer.realTime() <= 4.0) {
+    std::cerr << "real " << timer.realTime() << " cpu " << timer.cpuTime() << std::endl;
   }
   CPPUNIT_ASSERT(timer.realTime() > 4.0);
   //this should do nothing
   timer.start();
   CPPUNIT_ASSERT(timer.realTime() > 4.0);
-  
+
   sleep(2);
 
   timer.stop();
-  
+
   double real = timer.realTime();
   double cpu = timer.cpuTime();
 
-  
   //this should do nothing
   timer.stop();
-  CPPUNIT_ASSERT(timer.realTime()==real);
-  CPPUNIT_ASSERT(timer.cpuTime()==cpu);
+  CPPUNIT_ASSERT(timer.realTime() == real);
+  CPPUNIT_ASSERT(timer.cpuTime() == cpu);
 
   timer.reset();
   CPPUNIT_ASSERT(timer.realTime() == 0.0);
-  CPPUNIT_ASSERT(timer.cpuTime()==0.0);
-  
+  CPPUNIT_ASSERT(timer.cpuTime() == 0.0);
+
   rusage theUsage;
-  getrusage(RUSAGE_SELF, &theUsage) ;
+  getrusage(RUSAGE_SELF, &theUsage);
   struct timeval startTime;
-  startTime.tv_sec =theUsage.ru_utime.tv_sec;
-  startTime.tv_usec =theUsage.ru_utime.tv_usec;
-  
+  startTime.tv_sec = theUsage.ru_utime.tv_sec;
+  startTime.tv_usec = theUsage.ru_utime.tv_usec;
+
   timer.start();
   struct timeval nowTime;
   do {
     rusage theUsage2;
-    getrusage(RUSAGE_SELF, &theUsage2) ;
-    nowTime.tv_sec =theUsage2.ru_utime.tv_sec;
-    nowTime.tv_usec =theUsage2.ru_utime.tv_usec;
-  }while(nowTime.tv_sec -startTime.tv_sec +1E-6*(nowTime.tv_usec-startTime.tv_usec) <1);
+    getrusage(RUSAGE_SELF, &theUsage2);
+    nowTime.tv_sec = theUsage2.ru_utime.tv_sec;
+    nowTime.tv_usec = theUsage2.ru_utime.tv_usec;
+  } while (nowTime.tv_sec - startTime.tv_sec + 1E-6 * (nowTime.tv_usec - startTime.tv_usec) < 1);
   timer.stop();
 
-  if( (timer.realTime() < 1.0) or (timer.cpuTime() <1.0)) {
-    std::cerr <<"real "<<timer.realTime()<<" cpu "<<timer.cpuTime()<< std::endl;
+  if ((timer.realTime() < 1.0) or (timer.cpuTime() < 1.0)) {
+    std::cerr << "real " << timer.realTime() << " cpu " << timer.cpuTime() << std::endl;
   }
   CPPUNIT_ASSERT(timer.realTime() >= 1.0);
-  CPPUNIT_ASSERT(timer.cpuTime()>=1.0);
-
+  CPPUNIT_ASSERT(timer.cpuTime() >= 1.0);
 }
-
diff --git a/FWCore/Utilities/test/esinputtag.cppunit.cpp b/FWCore/Utilities/test/esinputtag.cppunit.cpp
index d97b054414622..439926e8ba916 100644
--- a/FWCore/Utilities/test/esinputtag.cppunit.cpp
+++ b/FWCore/Utilities/test/esinputtag.cppunit.cpp
@@ -4,13 +4,14 @@
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/Utilities/interface/ESInputTag.h"
 
-class testESInputTag: public CppUnit::TestFixture {
+class testESInputTag : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testESInputTag);
   CPPUNIT_TEST(emptyTags);
   CPPUNIT_TEST(twoStringConstructor);
   CPPUNIT_TEST(encodedTags);
   CPPUNIT_TEST(mixedConstructors);
   CPPUNIT_TEST_SUITE_END();
+
 public:
   void setUp() {}
   void tearDown() {}
@@ -27,8 +28,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(testESInputTag);
 using edm::ESInputTag;
 using namespace std::string_literals;
 
-void testESInputTag::emptyTags()
-{
+void testESInputTag::emptyTags() {
   auto require_empty = [](ESInputTag const& tag) {
     CPPUNIT_ASSERT(tag.module().empty());
     CPPUNIT_ASSERT(tag.data().empty());
@@ -50,18 +50,14 @@ void testESInputTag::emptyTags()
   CPPUNIT_ASSERT_EQUAL(empty1, empty4);
 }
 
-void testESInputTag::twoStringConstructor()
-{
+void testESInputTag::twoStringConstructor() {
   ESInputTag const tag{"ML", "DL"};
   CPPUNIT_ASSERT_EQUAL(tag.module(), "ML"s);
   CPPUNIT_ASSERT_EQUAL(tag.data(), "DL"s);
 }
 
-void testESInputTag::encodedTags()
-{
-  auto require_labels = [](ESInputTag const& tag,
-                           std::string const& module_label,
-                           std::string const& data_label) {
+void testESInputTag::encodedTags() {
+  auto require_labels = [](ESInputTag const& tag, std::string const& module_label, std::string const& data_label) {
     CPPUNIT_ASSERT_EQUAL(tag.module(), module_label);
     CPPUNIT_ASSERT_EQUAL(tag.data(), data_label);
   };
@@ -80,8 +76,7 @@ void testESInputTag::encodedTags()
   CPPUNIT_ASSERT_THROW((ESInputTag{"ML:DL:"}), cms::Exception);
 }
 
-void testESInputTag::mixedConstructors()
-{
+void testESInputTag::mixedConstructors() {
   // No module label
   CPPUNIT_ASSERT_EQUAL((ESInputTag{"", "DL"}), (ESInputTag{":DL"}));
 
diff --git a/FWCore/Utilities/test/extensioncord_t.cppunit.cpp b/FWCore/Utilities/test/extensioncord_t.cppunit.cpp
index 53fb7b70bb61b..4fe54bada002f 100644
--- a/FWCore/Utilities/test/extensioncord_t.cppunit.cpp
+++ b/FWCore/Utilities/test/extensioncord_t.cppunit.cpp
@@ -9,18 +9,18 @@ Created by Chris Jones on 22-09-2006
 #include "FWCore/Utilities/interface/ExtensionCord.h"
 #include "FWCore/Utilities/interface/SimpleOutlet.h"
 
-class testExtensionCord: public CppUnit::TestFixture
-{
+class testExtensionCord : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testExtensionCord);
-  
+
   CPPUNIT_TEST(unpluggedTest);
   CPPUNIT_TEST(pluggedTest);
   CPPUNIT_TEST(copyTest);
-  
+
   CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void unpluggedTest();
   void pluggedTest();
@@ -30,9 +30,7 @@ class testExtensionCord: public CppUnit::TestFixture
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testExtensionCord);
 
-
-void testExtensionCord::unpluggedTest()
-{
+void testExtensionCord::unpluggedTest() {
   edm::ExtensionCord<int> dangling;
   CPPUNIT_ASSERT(!dangling.connected());
 
@@ -40,33 +38,31 @@ void testExtensionCord::unpluggedTest()
   CPPUNIT_ASSERT_THROW(dangling.operator->(), cms::Exception);
 }
 
-void testExtensionCord::pluggedTest()
-{
+void testExtensionCord::pluggedTest() {
   edm::ExtensionCord<int> cord;
-  
+
   {
     int value(1);
     edm::ValueHolderECGetter<int> getter(value);
-    
-    edm::SimpleOutlet<int> outlet( getter, cord );
-    
-    CPPUNIT_ASSERT( 1 == *cord);
+
+    edm::SimpleOutlet<int> outlet(getter, cord);
+
+    CPPUNIT_ASSERT(1 == *cord);
   }
   CPPUNIT_ASSERT(!cord.connected());
 }
 
-void testExtensionCord::copyTest()
-{
+void testExtensionCord::copyTest() {
   edm::ExtensionCord<int> cord1;
   edm::ExtensionCord<int> cord2(cord1);
-  
+
   {
     int value(1);
     edm::ValueHolderECGetter<int> getter(value);
-    
-    edm::SimpleOutlet<int> outlet(getter, cord1 );
-    
-    CPPUNIT_ASSERT( 1 == *cord2);
+
+    edm::SimpleOutlet<int> outlet(getter, cord1);
+
+    CPPUNIT_ASSERT(1 == *cord2);
   }
   CPPUNIT_ASSERT(!cord2.connected());
 }
diff --git a/FWCore/Utilities/test/friendlyname_t.cppunit.cpp b/FWCore/Utilities/test/friendlyname_t.cppunit.cpp
index fbbfa30758531..03820e1369153 100644
--- a/FWCore/Utilities/test/friendlyname_t.cppunit.cpp
+++ b/FWCore/Utilities/test/friendlyname_t.cppunit.cpp
@@ -12,100 +12,146 @@
 
 using namespace edm;
 
-class testfriendlyName: public CppUnit::TestFixture
-{
-   CPPUNIT_TEST_SUITE(testfriendlyName);
-   
-   CPPUNIT_TEST(test);
-   
-   CPPUNIT_TEST_SUITE_END();
+class testfriendlyName : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testfriendlyName);
+
+  CPPUNIT_TEST(test);
+
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-      void setUp(){}
-   void tearDown(){}
-   
-   void test();
+  void setUp() {}
+  void tearDown() {}
+
+  void test();
 };
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testfriendlyName);
 
-
-void testfriendlyName::test()
-{
-  typedef std::pair<std::string,std::string> Values; 
+void testfriendlyName::test() {
+  typedef std::pair<std::string, std::string> Values;
   std::map<std::string, std::string> classToFriendly;
-  classToFriendly.insert( Values("Foo","Foo") );
-  classToFriendly.insert( Values("bar::Foo","barFoo") );
-  classToFriendly.insert( Values("std::vector<Foo>","Foos") );
-  classToFriendly.insert( Values("std::vector<bar::Foo>","barFoos") );
-  classToFriendly.insert( Values("std::shared_ptr<Foo>","FooSharedPtr"));
-  classToFriendly.insert( Values("std::shared_ptr<bar::Foo>","barFooSharedPtr"));
-  classToFriendly.insert( Values("std::basic_string<char>","String"));
-  classToFriendly.insert( Values("std::string","String"));
-  classToFriendly.insert( Values("std::__cxx11::basic_string<char>","String"));
-  classToFriendly.insert( Values("std::__cxx11::basic_string<char,std::char_traits<char> >","String"));
-  classToFriendly.insert( Values("std::list<int>","intstdlist"));
-  classToFriendly.insert( Values("std::__cxx11::list<int>","intstdlist"));
-  classToFriendly.insert( Values("std::vector<std::shared_ptr<bar::Foo>>","barFooSharedPtrs"));
-  classToFriendly.insert( Values("std::vector<std::basic_string<char>>","Strings"));
-  classToFriendly.insert( Values("std::__cxx11::vector<std::__cxx11::basic_string<char>>","Strings"));
-  classToFriendly.insert( Values("std::unique_ptr<Foo>","FooUniquePtr"));
-  classToFriendly.insert( Values("std::unique_ptr<bar::Foo>","barFooUniquePtr"));
-  classToFriendly.insert( Values("std::vector<std::unique_ptr<bar::Foo>>","barFooUniquePtrs"));
-  classToFriendly.insert( Values("V<A,B>","ABV") );
-  classToFriendly.insert( Values("edm::ExtCollection<std::vector<reco::SuperCluster>,reco::SuperClusterRefProds>","recoSuperClustersrecoSuperClusterRefProdsedmExtCollection") );
-  classToFriendly.insert( Values("edm::SortedCollection<EcalUncalibratedRecHit,edm::StrictWeakOrdering<EcalUncalibratedRecHit> >","EcalUncalibratedRecHitsSorted") );
-  classToFriendly.insert( Values("edm::OwnVector<aod::Candidate,edm::ClonePolicy<aod::Candidate> >","aodCandidatesOwned") );
-  classToFriendly.insert( Values("edm::OwnVector<Foo,edm::ClonePolicy<Foo> >","FoosOwned") );
-  classToFriendly.insert( Values("edm::OwnVector<My<int>, edm::ClonePolicy<My<int> > >","intMysOwned") );
-  classToFriendly.insert( Values("std::vector<edm::OwnVector<My<int>, edm::ClonePolicy<My<int> > > >","intMysOwneds") );
-  classToFriendly.insert( Values("edm::Wrapper<MuonDigiCollection<CSCDetId,CSCALCTDigi> >","CSCDetIdCSCALCTDigiMuonDigiCollection") );
-  classToFriendly.insert( Values("edm::AssociationMap<edm::OneToMany<std::vector<CaloJet>,std::vector<reco::Track>,unsigned int> >","CaloJetsToManyrecoTracksAssociation") );
-  classToFriendly.insert( Values("edm::AssociationMap<edm::OneToOne<std::vector<reco::Track>,std::vector<reco::TrackInfo>,unsigned int> >","recoTracksToOnerecoTrackInfosAssociation") );
-  classToFriendly.insert( Values("edm::AssociationMap<edm::OneToValue<std::vector<reco::Electron>,float,unsigned int> >",
-                                 "recoElectronsToValuefloatAssociation"));
-  classToFriendly.insert( Values("edm::AssociationMap<edm::OneToManyWithQuality<edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::Candidate> >,edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::Candidate> >,double,unsigned int> >",
-                                 "recoCandidatesOwnedToManyrecoCandidatesOwnedWithQuantitydoubleAssociation"));
-  classToFriendly.insert( Values("edm::AssociationVector<edm::RefProd<std::vector<reco::CaloJet> >,std::vector<int>,edm::Ref<std::vector<reco::CaloJet>,reco::CaloJet,edm::refhelper::FindUsingAdvance<std::vector<reco::CaloJet>,reco::CaloJet> >,unsigned int,edm::helper::AssociationIdenticalKeyReference>",
-                                 "recoCaloJetsedmRefProdTointsAssociationVector") );
-  classToFriendly.insert( Values("edm::AssociationVector<edm::RefProd<edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::Candidate> > >,std::vector<double>,edm::Ref<edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::Candidate> >,reco::Candidate,edm::refhelper::FindUsingAdvance<edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::Candidate> >,reco::Candidate> >,unsigned int,edm::helper::AssociationIdenticalKeyReference>",
-                                 "recoCandidatesOwnededmRefProdTodoublesAssociationVector") );
-  classToFriendly.insert( Values("edm::AssociationMap<edm::OneToOne<std::vector<reco::Track>,std::vector<std::pair<double,double> >,unsigned int> >",
-                                 "recoTracksToOnedoubledoublestdpairsAssociation"));
-  classToFriendly.insert( Values("edm::AssociationMap<edm::OneToOne<std::vector<reco::Track>,std::vector<std::pair<Point3DBase<float,GlobalTag>,GlobalErrorBase<double,ErrorMatrixTag> > >,unsigned int> >",
-                                 "recoTracksToOnefloatGlobalTagPoint3DBasedoubleErrorMatrixTagGlobalErrorBasestdpairsAssociation"));
-  classToFriendly.insert( Values("A<B<C>, D<E> >","CBEDA"));
-  classToFriendly.insert( Values("A<B<C<D> > >","DCBA"));
-  classToFriendly.insert( Values("A<B<C,D>, E<F> >","CDBFEA"));
-  classToFriendly.insert( Values("Aa<Bb<Cc>, Dd<Ee> >","CcBbEeDdAa"));
-  classToFriendly.insert( Values("Aa<Bb<Cc<Dd> > >","DdCcBbAa"));
-  classToFriendly.insert( Values("Aa<Bb<Cc,Dd>, Ee<Ff> >","CcDdBbFfEeAa"));
-  classToFriendly.insert( Values("Aa<Bb<Cc,Dd>, Ee<Ff,Gg> >","CcDdBbFfGgEeAa"));
-  classToFriendly.insert( Values("edm::RangeMap<DetId,edm::OwnVector<SiPixelRecHit,edm::ClonePolicy<SiPixelRecHit> >,edm::ClonePolicy<SiPixelRecHit> >","DetIdSiPixelRecHitsOwnedRangeMap"));
-  classToFriendly.insert( Values("std::vector<edm::RangeMap<DetId,edm::OwnVector<SiPixelRecHit,edm::ClonePolicy<SiPixelRecHit> >,edm::ClonePolicy<SiPixelRecHit> > >","DetIdSiPixelRecHitsOwnedRangeMaps"));
-  classToFriendly.insert( Values("edm::RefVector< edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::Candidate> >,reco::Candidate, edm::refhelper::FindUsingAdvance<edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::Candidate> >, reco::Candidate> >","recoCandidatesOwnedRefs"));
-  classToFriendly.insert( Values("edm::RefVector< std::vector<reco::Track>, reco::Track, edm::refhelper::FindUsingAdvance<std::vector<reco::Track>, reco::Track> >","recoTracksRefs"));
-  classToFriendly.insert( Values("edm::RefVector<Col, Type, edm::refhelper::FindUsingAdvance<Col, Type> >","ColTypeRefs"));
-  classToFriendly.insert( Values("edm::AssociationMap<edm::OneToMany<std::vector<reco::PixelMatchGsfElectron>,edm::SortedCollection<EcalRecHit,edm::StrictWeakOrdering<EcalRecHit> >,unsigned int> >",
-                                 "recoPixelMatchGsfElectronsToManyEcalRecHitsSortedAssociation"));
-  classToFriendly.insert( Values("edm::AssociationVector<edm::RefToBaseProd<reco::Candidate>,std::vector<double>,edm::RefToBase<reco::Candidate>,unsigned int,edm::helper::AssociationIdenticalKeyReference>",
-                                 "recoCandidateedmRefToBaseProdTodoublesAssociationVector"));
-  classToFriendly.insert( Values("edm::RefVector<edm::AssociationMap<edm::OneToOne<std::vector<reco::BasicCluster>,std::vector<reco::ClusterShape>,unsigned int> >,edm::helpers::KeyVal<edm::Ref<std::vector<reco::BasicCluster>,reco::BasicCluster,edm::refhelper::FindUsingAdvance<std::vector<reco::BasicCluster>,reco::BasicCluster> >,edm::Ref<std::vector<reco::ClusterShape>,reco::ClusterShape,edm::refhelper::FindUsingAdvance<std::vector<reco::ClusterShape>,reco::ClusterShape> > >,edm::AssociationMap<edm::OneToOne<std::vector<reco::BasicCluster>,std::vector<reco::ClusterShape>,unsigned int> >::Find>",
-                                 "recoBasicClustersToOnerecoClusterShapesAssociationRefs"));
-  classToFriendly.insert( Values("std::vector<std::pair<const pat::Muon *, TLorentzVector>>","constpatMuonptrTLorentzVectorstdpairs") );
-  classToFriendly.insert( Values("int[]", "intAs") );
-  classToFriendly.insert( Values("foo<int[]>", "intAsfoo") );
-  classToFriendly.insert( Values("bar<foo<int[]>>", "intAsfoobar") );
-  
-  
-  for(std::map<std::string, std::string>::iterator itInfo = classToFriendly.begin(),
-      itInfoEnd = classToFriendly.end();
-      itInfo != itInfoEnd;
-      ++itInfo) {
+  classToFriendly.insert(Values("Foo", "Foo"));
+  classToFriendly.insert(Values("bar::Foo", "barFoo"));
+  classToFriendly.insert(Values("std::vector<Foo>", "Foos"));
+  classToFriendly.insert(Values("std::vector<bar::Foo>", "barFoos"));
+  classToFriendly.insert(Values("std::shared_ptr<Foo>", "FooSharedPtr"));
+  classToFriendly.insert(Values("std::shared_ptr<bar::Foo>", "barFooSharedPtr"));
+  classToFriendly.insert(Values("std::basic_string<char>", "String"));
+  classToFriendly.insert(Values("std::string", "String"));
+  classToFriendly.insert(Values("std::__cxx11::basic_string<char>", "String"));
+  classToFriendly.insert(Values("std::__cxx11::basic_string<char,std::char_traits<char> >", "String"));
+  classToFriendly.insert(Values("std::list<int>", "intstdlist"));
+  classToFriendly.insert(Values("std::__cxx11::list<int>", "intstdlist"));
+  classToFriendly.insert(Values("std::vector<std::shared_ptr<bar::Foo>>", "barFooSharedPtrs"));
+  classToFriendly.insert(Values("std::vector<std::basic_string<char>>", "Strings"));
+  classToFriendly.insert(Values("std::__cxx11::vector<std::__cxx11::basic_string<char>>", "Strings"));
+  classToFriendly.insert(Values("std::unique_ptr<Foo>", "FooUniquePtr"));
+  classToFriendly.insert(Values("std::unique_ptr<bar::Foo>", "barFooUniquePtr"));
+  classToFriendly.insert(Values("std::vector<std::unique_ptr<bar::Foo>>", "barFooUniquePtrs"));
+  classToFriendly.insert(Values("V<A,B>", "ABV"));
+  classToFriendly.insert(Values("edm::ExtCollection<std::vector<reco::SuperCluster>,reco::SuperClusterRefProds>",
+                                "recoSuperClustersrecoSuperClusterRefProdsedmExtCollection"));
+  classToFriendly.insert(
+      Values("edm::SortedCollection<EcalUncalibratedRecHit,edm::StrictWeakOrdering<EcalUncalibratedRecHit> >",
+             "EcalUncalibratedRecHitsSorted"));
+  classToFriendly.insert(
+      Values("edm::OwnVector<aod::Candidate,edm::ClonePolicy<aod::Candidate> >", "aodCandidatesOwned"));
+  classToFriendly.insert(Values("edm::OwnVector<Foo,edm::ClonePolicy<Foo> >", "FoosOwned"));
+  classToFriendly.insert(Values("edm::OwnVector<My<int>, edm::ClonePolicy<My<int> > >", "intMysOwned"));
+  classToFriendly.insert(Values("std::vector<edm::OwnVector<My<int>, edm::ClonePolicy<My<int> > > >", "intMysOwneds"));
+  classToFriendly.insert(
+      Values("edm::Wrapper<MuonDigiCollection<CSCDetId,CSCALCTDigi> >", "CSCDetIdCSCALCTDigiMuonDigiCollection"));
+  classToFriendly.insert(
+      Values("edm::AssociationMap<edm::OneToMany<std::vector<CaloJet>,std::vector<reco::Track>,unsigned int> >",
+             "CaloJetsToManyrecoTracksAssociation"));
+  classToFriendly.insert(
+      Values("edm::AssociationMap<edm::OneToOne<std::vector<reco::Track>,std::vector<reco::TrackInfo>,unsigned int> >",
+             "recoTracksToOnerecoTrackInfosAssociation"));
+  classToFriendly.insert(Values("edm::AssociationMap<edm::OneToValue<std::vector<reco::Electron>,float,unsigned int> >",
+                                "recoElectronsToValuefloatAssociation"));
+  classToFriendly.insert(
+      Values("edm::AssociationMap<edm::OneToManyWithQuality<edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::"
+             "Candidate> >,edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::Candidate> >,double,unsigned int> >",
+             "recoCandidatesOwnedToManyrecoCandidatesOwnedWithQuantitydoubleAssociation"));
+  classToFriendly.insert(
+      Values("edm::AssociationVector<edm::RefProd<std::vector<reco::CaloJet> "
+             ">,std::vector<int>,edm::Ref<std::vector<reco::CaloJet>,reco::CaloJet,edm::refhelper::FindUsingAdvance<"
+             "std::vector<reco::CaloJet>,reco::CaloJet> >,unsigned int,edm::helper::AssociationIdenticalKeyReference>",
+             "recoCaloJetsedmRefProdTointsAssociationVector"));
+  classToFriendly.insert(
+      Values("edm::AssociationVector<edm::RefProd<edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::Candidate> > "
+             ">,std::vector<double>,edm::Ref<edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::Candidate> "
+             ">,reco::Candidate,edm::refhelper::FindUsingAdvance<edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::"
+             "Candidate> >,reco::Candidate> >,unsigned int,edm::helper::AssociationIdenticalKeyReference>",
+             "recoCandidatesOwnededmRefProdTodoublesAssociationVector"));
+  classToFriendly.insert(
+      Values("edm::AssociationMap<edm::OneToOne<std::vector<reco::Track>,std::vector<std::pair<double,double> "
+             ">,unsigned int> >",
+             "recoTracksToOnedoubledoublestdpairsAssociation"));
+  classToFriendly.insert(
+      Values("edm::AssociationMap<edm::OneToOne<std::vector<reco::Track>,std::vector<std::pair<Point3DBase<float,"
+             "GlobalTag>,GlobalErrorBase<double,ErrorMatrixTag> > >,unsigned int> >",
+             "recoTracksToOnefloatGlobalTagPoint3DBasedoubleErrorMatrixTagGlobalErrorBasestdpairsAssociation"));
+  classToFriendly.insert(Values("A<B<C>, D<E> >", "CBEDA"));
+  classToFriendly.insert(Values("A<B<C<D> > >", "DCBA"));
+  classToFriendly.insert(Values("A<B<C,D>, E<F> >", "CDBFEA"));
+  classToFriendly.insert(Values("Aa<Bb<Cc>, Dd<Ee> >", "CcBbEeDdAa"));
+  classToFriendly.insert(Values("Aa<Bb<Cc<Dd> > >", "DdCcBbAa"));
+  classToFriendly.insert(Values("Aa<Bb<Cc,Dd>, Ee<Ff> >", "CcDdBbFfEeAa"));
+  classToFriendly.insert(Values("Aa<Bb<Cc,Dd>, Ee<Ff,Gg> >", "CcDdBbFfGgEeAa"));
+  classToFriendly.insert(
+      Values("edm::RangeMap<DetId,edm::OwnVector<SiPixelRecHit,edm::ClonePolicy<SiPixelRecHit> "
+             ">,edm::ClonePolicy<SiPixelRecHit> >",
+             "DetIdSiPixelRecHitsOwnedRangeMap"));
+  classToFriendly.insert(
+      Values("std::vector<edm::RangeMap<DetId,edm::OwnVector<SiPixelRecHit,edm::ClonePolicy<SiPixelRecHit> "
+             ">,edm::ClonePolicy<SiPixelRecHit> > >",
+             "DetIdSiPixelRecHitsOwnedRangeMaps"));
+  classToFriendly.insert(
+      Values("edm::RefVector< edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::Candidate> >,reco::Candidate, "
+             "edm::refhelper::FindUsingAdvance<edm::OwnVector<reco::Candidate,edm::ClonePolicy<reco::Candidate> >, "
+             "reco::Candidate> >",
+             "recoCandidatesOwnedRefs"));
+  classToFriendly.insert(
+      Values("edm::RefVector< std::vector<reco::Track>, reco::Track, "
+             "edm::refhelper::FindUsingAdvance<std::vector<reco::Track>, reco::Track> >",
+             "recoTracksRefs"));
+  classToFriendly.insert(
+      Values("edm::RefVector<Col, Type, edm::refhelper::FindUsingAdvance<Col, Type> >", "ColTypeRefs"));
+  classToFriendly.insert(
+      Values("edm::AssociationMap<edm::OneToMany<std::vector<reco::PixelMatchGsfElectron>,edm::SortedCollection<"
+             "EcalRecHit,edm::StrictWeakOrdering<EcalRecHit> >,unsigned int> >",
+             "recoPixelMatchGsfElectronsToManyEcalRecHitsSortedAssociation"));
+  classToFriendly.insert(
+      Values("edm::AssociationVector<edm::RefToBaseProd<reco::Candidate>,std::vector<double>,edm::RefToBase<reco::"
+             "Candidate>,unsigned int,edm::helper::AssociationIdenticalKeyReference>",
+             "recoCandidateedmRefToBaseProdTodoublesAssociationVector"));
+  classToFriendly.insert(
+      Values("edm::RefVector<edm::AssociationMap<edm::OneToOne<std::vector<reco::BasicCluster>,std::vector<reco::"
+             "ClusterShape>,unsigned int> "
+             ">,edm::helpers::KeyVal<edm::Ref<std::vector<reco::BasicCluster>,reco::BasicCluster,edm::refhelper::"
+             "FindUsingAdvance<std::vector<reco::BasicCluster>,reco::BasicCluster> "
+             ">,edm::Ref<std::vector<reco::ClusterShape>,reco::ClusterShape,edm::refhelper::FindUsingAdvance<std::"
+             "vector<reco::ClusterShape>,reco::ClusterShape> > "
+             ">,edm::AssociationMap<edm::OneToOne<std::vector<reco::BasicCluster>,std::vector<reco::ClusterShape>,"
+             "unsigned int> >::Find>",
+             "recoBasicClustersToOnerecoClusterShapesAssociationRefs"));
+  classToFriendly.insert(
+      Values("std::vector<std::pair<const pat::Muon *, TLorentzVector>>", "constpatMuonptrTLorentzVectorstdpairs"));
+  classToFriendly.insert(Values("int[]", "intAs"));
+  classToFriendly.insert(Values("foo<int[]>", "intAsfoo"));
+  classToFriendly.insert(Values("bar<foo<int[]>>", "intAsfoobar"));
+
+  for (std::map<std::string, std::string>::iterator itInfo = classToFriendly.begin(), itInfoEnd = classToFriendly.end();
+       itInfo != itInfoEnd;
+       ++itInfo) {
     //std::cout <<itInfo->first<<std::endl;
-    if( itInfo->second != edm::friendlyname::friendlyName(itInfo->first) ) {
-      std::cout <<"class name: '"<<itInfo->first<<"' has wrong friendly name \n"
-      <<"expect: '"<<itInfo->second<<"' got: '"<<edm::friendlyname::friendlyName(itInfo->first)<<"'"<<std::endl;
+    if (itInfo->second != edm::friendlyname::friendlyName(itInfo->first)) {
+      std::cout << "class name: '" << itInfo->first << "' has wrong friendly name \n"
+                << "expect: '" << itInfo->second << "' got: '" << edm::friendlyname::friendlyName(itInfo->first) << "'"
+                << std::endl;
       CPPUNIT_ASSERT(0 && "expected friendly name does not match actual friendly name");
     }
   }
diff --git a/FWCore/Utilities/test/indexset.cppunit.cpp b/FWCore/Utilities/test/indexset.cppunit.cpp
index 6f0fad7498a39..1f6549e16456d 100644
--- a/FWCore/Utilities/test/indexset.cppunit.cpp
+++ b/FWCore/Utilities/test/indexset.cppunit.cpp
@@ -2,10 +2,11 @@
 
 #include "FWCore/Utilities/interface/IndexSet.h"
 
-class testIndexSet: public CppUnit::TestFixture {
+class testIndexSet : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testIndexSet);
   CPPUNIT_TEST(test);
   CPPUNIT_TEST_SUITE_END();
+
 public:
   void setUp() {}
   void tearDown() {}
@@ -15,7 +16,6 @@ class testIndexSet: public CppUnit::TestFixture {
   void testIterators(T& array);
   template <typename T>
   void testIterator(T iter, T end);
-
 };
 
 ///registration of the test so that the runner can find it
diff --git a/FWCore/Utilities/test/isFinite_t.cpp b/FWCore/Utilities/test/isFinite_t.cpp
index 3d6f9ece2f634..5c59d6882f11c 100644
--- a/FWCore/Utilities/test/isFinite_t.cpp
+++ b/FWCore/Utilities/test/isFinite_t.cpp
@@ -1,44 +1,43 @@
 #include "FWCore/Utilities/interface/isFinite.h"
 
-#include<limits>
-#include<cmath>
-#include<cstdlib>
-#include<cassert>
+#include <limits>
+#include <cmath>
+#include <cstdlib>
+#include <cassert>
 
 int main(int n, const char**) {
   using namespace edm;
   typedef long double LD;
-  
+
   double zero = atof("0");
-  
-  assert(isFinite(double(0)) );
-  assert(isFinite(float(0)) );
-  assert(isFinite(double(-3.14)) );
-  assert(isFinite(float(-3.14)) );
-  assert(!isFinite(std::sqrt(-double(n))) );
-  assert(!isFinite(std::sqrt(-float(n))) );
-  assert(!isFinite(1./zero) );
-  assert(!isFinite(float(1.)/float(zero)) );
-  assert(!isFinite(-1./zero) );
-  assert(!isFinite(-1.f/float(zero)) );
+
+  assert(isFinite(double(0)));
+  assert(isFinite(float(0)));
+  assert(isFinite(double(-3.14)));
+  assert(isFinite(float(-3.14)));
+  assert(!isFinite(std::sqrt(-double(n))));
+  assert(!isFinite(std::sqrt(-float(n))));
+  assert(!isFinite(1. / zero));
+  assert(!isFinite(float(1.) / float(zero)));
+  assert(!isFinite(-1. / zero));
+  assert(!isFinite(-1.f / float(zero)));
 
   //
 
-  assert(!isNotFinite(double(0)) );
-  assert(!isNotFinite(float(0)) );
-  assert(!isNotFinite(double(-3.14)) );
-  assert(!isNotFinite(float(-3.14)) );
-  assert(isNotFinite(std::sqrt(-double(n))) );
-  assert(isNotFinite(std::sqrt(-float(n))) );
-  assert(isNotFinite(-1.f/float(zero)) );
-  assert(isNotFinite(float(1.)/float(zero)) );
-  assert(isNotFinite(-1./zero) );
-  assert(isNotFinite(-1.f/float(zero)) );
-
-  assert(!isNotFinite(LD(3.14)) );
-  assert(isNotFinite(-1/LD(zero)) );
-  assert(isNotFinite(std::sqrt(-LD(n))) );
+  assert(!isNotFinite(double(0)));
+  assert(!isNotFinite(float(0)));
+  assert(!isNotFinite(double(-3.14)));
+  assert(!isNotFinite(float(-3.14)));
+  assert(isNotFinite(std::sqrt(-double(n))));
+  assert(isNotFinite(std::sqrt(-float(n))));
+  assert(isNotFinite(-1.f / float(zero)));
+  assert(isNotFinite(float(1.) / float(zero)));
+  assert(isNotFinite(-1. / zero));
+  assert(isNotFinite(-1.f / float(zero)));
+
+  assert(!isNotFinite(LD(3.14)));
+  assert(isNotFinite(-1 / LD(zero)));
+  assert(isNotFinite(std::sqrt(-LD(n))));
 
   return 0;
 }
-
diff --git a/FWCore/Utilities/test/propagate_const_t.cppunit.cpp b/FWCore/Utilities/test/propagate_const_t.cppunit.cpp
index 06d01392c059f..95a9667922e2b 100644
--- a/FWCore/Utilities/test/propagate_const_t.cppunit.cpp
+++ b/FWCore/Utilities/test/propagate_const_t.cppunit.cpp
@@ -8,16 +8,16 @@ Test program for edm::propagate_const class.
 #include <memory>
 #include "FWCore/Utilities/interface/get_underlying_safe.h"
 
-class test_propagate_const: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(test_propagate_const);
+class test_propagate_const : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(test_propagate_const);
 
-CPPUNIT_TEST(test);
+  CPPUNIT_TEST(test);
+
+  CPPUNIT_TEST_SUITE_END();
 
-CPPUNIT_TEST_SUITE_END();
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void test();
 };
@@ -26,66 +26,62 @@ CPPUNIT_TEST_SUITE_END();
 CPPUNIT_TEST_SUITE_REGISTRATION(test_propagate_const);
 
 namespace {
-   class ConstChecker {
-   public:
-      int value() { return 0;}
-      
-      int const value() const { return 1;}
-      
-   };
-}
-
-
-void test_propagate_const::test()
-{
-   {
-      ConstChecker checker;
-      edm::propagate_const<ConstChecker*> pChecker(&checker);
-
-      CPPUNIT_ASSERT(0 == pChecker.get()->value());
-      CPPUNIT_ASSERT( pChecker.get()->value() == pChecker->value());
-      CPPUNIT_ASSERT( pChecker.get()->value() == (*pChecker).value());
-      CPPUNIT_ASSERT(0 == get_underlying_safe(pChecker)->value());
-
-      const edm::propagate_const<ConstChecker*> pConstChecker(&checker);
-
-      CPPUNIT_ASSERT(1 == pConstChecker.get()->value());
-      CPPUNIT_ASSERT( pConstChecker.get()->value() == pConstChecker->value());
-      CPPUNIT_ASSERT( pConstChecker.get()->value() == (*pConstChecker).value());
-      CPPUNIT_ASSERT(1 == get_underlying_safe(pConstChecker)->value());
-   }
-   
-   {
-      auto checker = std::make_shared<ConstChecker>();
-      edm::propagate_const<std::shared_ptr<ConstChecker>> pChecker(checker);
-      
-      CPPUNIT_ASSERT(0 == pChecker.get()->value());
-      CPPUNIT_ASSERT( pChecker.get()->value() == pChecker->value());
-      CPPUNIT_ASSERT( pChecker.get()->value() == (*pChecker).value());
-      CPPUNIT_ASSERT(0 == get_underlying_safe(pChecker)->value());
-
-      const edm::propagate_const<std::shared_ptr<ConstChecker>> pConstChecker(checker);
-      
-      CPPUNIT_ASSERT(1 == pConstChecker.get()->value());
-      CPPUNIT_ASSERT( pConstChecker.get()->value() == pConstChecker->value());
-      CPPUNIT_ASSERT( pConstChecker.get()->value() == (*pConstChecker).value());
-      CPPUNIT_ASSERT(1 == get_underlying_safe(pConstChecker)->value());
-   }
-   
-   {
-      auto checker = std::make_unique<ConstChecker>();
-      edm::propagate_const<std::unique_ptr<ConstChecker>> pChecker(std::move(checker));
-      
-      CPPUNIT_ASSERT(0 == pChecker.get()->value());
-      CPPUNIT_ASSERT( pChecker.get()->value() == pChecker->value());
-      CPPUNIT_ASSERT( pChecker.get()->value() == (*pChecker).value());
-      CPPUNIT_ASSERT(0 == get_underlying_safe(pChecker)->value());
-
-      const edm::propagate_const<std::unique_ptr<ConstChecker>> pConstChecker(std::make_unique<ConstChecker>());
-      
-      CPPUNIT_ASSERT(1 == pConstChecker.get()->value());
-      CPPUNIT_ASSERT( pConstChecker.get()->value() == pConstChecker->value());
-      CPPUNIT_ASSERT( pConstChecker.get()->value() == (*pConstChecker).value());
-   }
-
+  class ConstChecker {
+  public:
+    int value() { return 0; }
+
+    int const value() const { return 1; }
+  };
+}  // namespace
+
+void test_propagate_const::test() {
+  {
+    ConstChecker checker;
+    edm::propagate_const<ConstChecker*> pChecker(&checker);
+
+    CPPUNIT_ASSERT(0 == pChecker.get()->value());
+    CPPUNIT_ASSERT(pChecker.get()->value() == pChecker->value());
+    CPPUNIT_ASSERT(pChecker.get()->value() == (*pChecker).value());
+    CPPUNIT_ASSERT(0 == get_underlying_safe(pChecker)->value());
+
+    const edm::propagate_const<ConstChecker*> pConstChecker(&checker);
+
+    CPPUNIT_ASSERT(1 == pConstChecker.get()->value());
+    CPPUNIT_ASSERT(pConstChecker.get()->value() == pConstChecker->value());
+    CPPUNIT_ASSERT(pConstChecker.get()->value() == (*pConstChecker).value());
+    CPPUNIT_ASSERT(1 == get_underlying_safe(pConstChecker)->value());
+  }
+
+  {
+    auto checker = std::make_shared<ConstChecker>();
+    edm::propagate_const<std::shared_ptr<ConstChecker>> pChecker(checker);
+
+    CPPUNIT_ASSERT(0 == pChecker.get()->value());
+    CPPUNIT_ASSERT(pChecker.get()->value() == pChecker->value());
+    CPPUNIT_ASSERT(pChecker.get()->value() == (*pChecker).value());
+    CPPUNIT_ASSERT(0 == get_underlying_safe(pChecker)->value());
+
+    const edm::propagate_const<std::shared_ptr<ConstChecker>> pConstChecker(checker);
+
+    CPPUNIT_ASSERT(1 == pConstChecker.get()->value());
+    CPPUNIT_ASSERT(pConstChecker.get()->value() == pConstChecker->value());
+    CPPUNIT_ASSERT(pConstChecker.get()->value() == (*pConstChecker).value());
+    CPPUNIT_ASSERT(1 == get_underlying_safe(pConstChecker)->value());
+  }
+
+  {
+    auto checker = std::make_unique<ConstChecker>();
+    edm::propagate_const<std::unique_ptr<ConstChecker>> pChecker(std::move(checker));
+
+    CPPUNIT_ASSERT(0 == pChecker.get()->value());
+    CPPUNIT_ASSERT(pChecker.get()->value() == pChecker->value());
+    CPPUNIT_ASSERT(pChecker.get()->value() == (*pChecker).value());
+    CPPUNIT_ASSERT(0 == get_underlying_safe(pChecker)->value());
+
+    const edm::propagate_const<std::unique_ptr<ConstChecker>> pConstChecker(std::make_unique<ConstChecker>());
+
+    CPPUNIT_ASSERT(1 == pConstChecker.get()->value());
+    CPPUNIT_ASSERT(pConstChecker.get()->value() == pConstChecker->value());
+    CPPUNIT_ASSERT(pConstChecker.get()->value() == (*pConstChecker).value());
+  }
 }
diff --git a/FWCore/Utilities/test/reusableobjectholder_t.cppunit.cpp b/FWCore/Utilities/test/reusableobjectholder_t.cppunit.cpp
index 3eb3ac86273ff..dcaa68afae010 100644
--- a/FWCore/Utilities/test/reusableobjectholder_t.cppunit.cpp
+++ b/FWCore/Utilities/test/reusableobjectholder_t.cppunit.cpp
@@ -8,160 +8,156 @@
 #define CXX_THREAD_AVAILABLE
 #endif
 
-
 class reusableobjectholder_test : public CppUnit::TestFixture {
-      CPPUNIT_TEST_SUITE(reusableobjectholder_test);
-      CPPUNIT_TEST(testConstruction);
-      CPPUNIT_TEST(testDeletion);
-      CPPUNIT_TEST(testSimultaneousUse);
-      CPPUNIT_TEST_SUITE_END();
-   public:
-
-      void testConstruction();
-      void testDeletion();
-      void testSimultaneousUse();
-
-      void setUp(){}
-      void tearDown(){}   
+  CPPUNIT_TEST_SUITE(reusableobjectholder_test);
+  CPPUNIT_TEST(testConstruction);
+  CPPUNIT_TEST(testDeletion);
+  CPPUNIT_TEST(testSimultaneousUse);
+  CPPUNIT_TEST_SUITE_END();
+
+public:
+  void testConstruction();
+  void testDeletion();
+  void testSimultaneousUse();
+
+  void setUp() {}
+  void tearDown() {}
 };
 
-void reusableobjectholder_test::testConstruction()
-{
-   {
-      edm::ReusableObjectHolder<int> intHolder;
+void reusableobjectholder_test::testConstruction() {
+  {
+    edm::ReusableObjectHolder<int> intHolder;
+    auto p = intHolder.tryToGet();
+    CPPUNIT_ASSERT(p.get() == 0);
+
+    intHolder.add(std::make_unique<int>(1));
+    p = intHolder.tryToGet();
+    CPPUNIT_ASSERT(p.get() != 0);
+    CPPUNIT_ASSERT(*p == 1);
+
+    auto p2 = intHolder.tryToGet();
+    CPPUNIT_ASSERT(p2.get() == 0);
+  }
+  {
+    edm::ReusableObjectHolder<int> intHolder;
+    auto p = intHolder.makeOrGet([]() -> int* { return new int(1); });
+    CPPUNIT_ASSERT(p.get() != 0);
+    CPPUNIT_ASSERT(*p == 1);
+
+    auto p2 = intHolder.tryToGet();
+    CPPUNIT_ASSERT(p2.get() == 0);
+  }
+  {
+    edm::ReusableObjectHolder<int> intHolder;
+    auto p = intHolder.makeOrGetAndClear([]() -> int* { return new int(1); }, [](int* iV) { *iV = 0; });
+    CPPUNIT_ASSERT(p.get() != 0);
+    CPPUNIT_ASSERT(*p == 0);
+
+    auto p2 = intHolder.tryToGet();
+    CPPUNIT_ASSERT(p2.get() == 0);
+  }
+}
+
+void reusableobjectholder_test::testDeletion() {
+  //should also test that makeOrGetAndClear actually does a clear on returned objects
+  {
+    edm::ReusableObjectHolder<int> intHolder;
+    intHolder.add(std::make_unique<int>(1));
+    {
       auto p = intHolder.tryToGet();
-      CPPUNIT_ASSERT(p.get() ==0);
-   
-      intHolder.add(std::make_unique<int>(1));
-      p = intHolder.tryToGet();
       CPPUNIT_ASSERT(p.get() != 0);
       CPPUNIT_ASSERT(*p == 1);
-      
+
       auto p2 = intHolder.tryToGet();
-      CPPUNIT_ASSERT(p2.get() ==0);
-   }
-   {
-      edm::ReusableObjectHolder<int> intHolder;
-      auto p = intHolder.makeOrGet([]()->int* {return new int(1);});
+      CPPUNIT_ASSERT(p2.get() == 0);
+
+      *p = 2;
+    }
+    {
+      auto p = intHolder.tryToGet();
+      CPPUNIT_ASSERT(p.get() != 0);
+      CPPUNIT_ASSERT(*p == 2);
+
+      auto p2 = intHolder.tryToGet();
+      CPPUNIT_ASSERT(p2.get() == 0);
+    }
+  }
+
+  {
+    edm::ReusableObjectHolder<int> intHolder;
+    {
+      auto p = intHolder.makeOrGet([]() -> int* { return new int(1); });
       CPPUNIT_ASSERT(p.get() != 0);
       CPPUNIT_ASSERT(*p == 1);
+      *p = 2;
 
       auto p2 = intHolder.tryToGet();
-      CPPUNIT_ASSERT(p2.get() ==0);
-   }
-   {
-      edm::ReusableObjectHolder<int> intHolder;
-      auto p = intHolder.makeOrGetAndClear([]()->int* { return new int(1);}, [](int* iV){*iV=0;});
+      CPPUNIT_ASSERT(p2.get() == 0);
+    }
+    {
+      auto p = intHolder.makeOrGet([]() -> int* { return new int(1); });
       CPPUNIT_ASSERT(p.get() != 0);
-      CPPUNIT_ASSERT(*p == 0);
+      CPPUNIT_ASSERT(*p == 2);
 
       auto p2 = intHolder.tryToGet();
-      CPPUNIT_ASSERT(p2.get() ==0);      
-   }
-}
+      CPPUNIT_ASSERT(p2.get() == 0);
+
+      auto p3 = intHolder.makeOrGet([]() -> int* { return new int(1); });
+      CPPUNIT_ASSERT(p3.get() != 0);
+      CPPUNIT_ASSERT(*p3 == 1);
+    }
+  }
+
+  {
+    edm::ReusableObjectHolder<int> intHolder;
+    int* address = 0;
+    {
+      auto p = intHolder.makeOrGetAndClear([]() -> int* { return new int(1); }, [](int* iV) { *iV = 0; });
+      CPPUNIT_ASSERT(p.get() != 0);
+      CPPUNIT_ASSERT(*p == 0);
+      address = p.get();
+      *p = 2;
 
-void reusableobjectholder_test::testDeletion()
-{
-   //should also test that makeOrGetAndClear actually does a clear on returned objects
-   {
-      edm::ReusableObjectHolder<int> intHolder;
-      intHolder.add(std::make_unique<int>(1));
-      {
-         auto p = intHolder.tryToGet();
-         CPPUNIT_ASSERT(p.get() != 0);
-         CPPUNIT_ASSERT(*p == 1);
-      
-         auto p2 = intHolder.tryToGet();
-         CPPUNIT_ASSERT(p2.get() ==0);
-         
-         *p = 2;
-      }
-      {
-         auto p = intHolder.tryToGet();
-         CPPUNIT_ASSERT(p.get() != 0);
-         CPPUNIT_ASSERT(*p == 2);
-      
-         auto p2 = intHolder.tryToGet();
-         CPPUNIT_ASSERT(p2.get() ==0);
-      }      
-   }
-   
-   {
-      edm::ReusableObjectHolder<int> intHolder;
-      {
-         auto p = intHolder.makeOrGet([]()->int* {return new int(1);});
-         CPPUNIT_ASSERT(p.get() != 0);
-         CPPUNIT_ASSERT(*p == 1);
-         *p=2;
-
-         auto p2 = intHolder.tryToGet();
-         CPPUNIT_ASSERT(p2.get() ==0);
-      }
-      {
-         auto p = intHolder.makeOrGet([]()->int* {return new int(1);});
-         CPPUNIT_ASSERT(p.get() != 0);
-         CPPUNIT_ASSERT(*p == 2);
-
-         auto p2 = intHolder.tryToGet();
-         CPPUNIT_ASSERT(p2.get() ==0);  
-         
-         auto p3 = intHolder.makeOrGet([]()->int* {return new int(1);});
-         CPPUNIT_ASSERT(p3.get() != 0);
-         CPPUNIT_ASSERT(*p3 == 1);        
-      }
-   }
-   
-   {
-      edm::ReusableObjectHolder<int> intHolder;
-      int* address = 0;
-      {
-         auto p = intHolder.makeOrGetAndClear([]()->int* { return new int(1);}, [](int* iV){*iV=0;});
-         CPPUNIT_ASSERT(p.get() != 0);
-         CPPUNIT_ASSERT(*p == 0);
-         address = p.get();
-         *p=2;
-
-         auto p2 = intHolder.tryToGet();
-         CPPUNIT_ASSERT(p2.get() ==0);
-      }
-      {
-         auto p = intHolder.makeOrGetAndClear([]()->int* { return new int(1);}, [](int* iV){*iV=0;});
-         CPPUNIT_ASSERT(p.get() != 0);
-         CPPUNIT_ASSERT(*p == 0);
-         CPPUNIT_ASSERT(address == p.get());
-      }
-   }
+      auto p2 = intHolder.tryToGet();
+      CPPUNIT_ASSERT(p2.get() == 0);
+    }
+    {
+      auto p = intHolder.makeOrGetAndClear([]() -> int* { return new int(1); }, [](int* iV) { *iV = 0; });
+      CPPUNIT_ASSERT(p.get() != 0);
+      CPPUNIT_ASSERT(*p == 0);
+      CPPUNIT_ASSERT(address == p.get());
+    }
+  }
 }
-void reusableobjectholder_test::testSimultaneousUse()
-{
+void reusableobjectholder_test::testSimultaneousUse() {
 #if defined(CXX_THREAD_AVAILABLE)
 
-   std::set<int*> t1ItemsSeen, t2ItemsSeen;
-   edm::ReusableObjectHolder<int> intHolder;
-   
-   const unsigned int kNGets=10000000;
-   
-   std::thread t1([&](){
-      for(unsigned int i=0; i<kNGets;++i) {
-         auto p = intHolder.makeOrGet([]()->int* {return new int(1);});
-         t1ItemsSeen.insert(p.get());
-      }
-   });
-
-   std::thread t2([&](){
-      for(unsigned int i=0; i<kNGets;++i) {
-         auto p = intHolder.makeOrGet([]()->int* {return new int(1);});
-         t2ItemsSeen.insert(p.get());
-      }
-   });
-
-   t1.join();
-   t2.join();
-   
-   CPPUNIT_ASSERT(t1ItemsSeen.size() >0 && t1ItemsSeen.size()<3);
-   CPPUNIT_ASSERT(t2ItemsSeen.size() > 0 && t2ItemsSeen.size()<3);
-   //std::cout <<" # seen: "<<t1ItemsSeen.size() <<" "<<t2ItemsSeen.size()<<std::endl;
+  std::set<int*> t1ItemsSeen, t2ItemsSeen;
+  edm::ReusableObjectHolder<int> intHolder;
+
+  const unsigned int kNGets = 10000000;
+
+  std::thread t1([&]() {
+    for (unsigned int i = 0; i < kNGets; ++i) {
+      auto p = intHolder.makeOrGet([]() -> int* { return new int(1); });
+      t1ItemsSeen.insert(p.get());
+    }
+  });
+
+  std::thread t2([&]() {
+    for (unsigned int i = 0; i < kNGets; ++i) {
+      auto p = intHolder.makeOrGet([]() -> int* { return new int(1); });
+      t2ItemsSeen.insert(p.get());
+    }
+  });
+
+  t1.join();
+  t2.join();
+
+  CPPUNIT_ASSERT(t1ItemsSeen.size() > 0 && t1ItemsSeen.size() < 3);
+  CPPUNIT_ASSERT(t2ItemsSeen.size() > 0 && t2ItemsSeen.size() < 3);
+  //std::cout <<" # seen: "<<t1ItemsSeen.size() <<" "<<t2ItemsSeen.size()<<std::endl;
 #endif
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION( reusableobjectholder_test );
+CPPUNIT_TEST_SUITE_REGISTRATION(reusableobjectholder_test);
diff --git a/FWCore/Utilities/test/signal_t.cppunit.cpp b/FWCore/Utilities/test/signal_t.cppunit.cpp
index c338da34a90b4..fb3fd00182eb6 100644
--- a/FWCore/Utilities/test/signal_t.cppunit.cpp
+++ b/FWCore/Utilities/test/signal_t.cppunit.cpp
@@ -10,17 +10,17 @@ Test program for edm::signalslot::Signal class.
 #include <cppunit/extensions/HelperMacros.h>
 #include "FWCore/Utilities/interface/Signal.h"
 
-class testSignal: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(testSignal);
+class testSignal : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testSignal);
+
+  CPPUNIT_TEST(connectTest);
+  CPPUNIT_TEST(emitTest);
 
-CPPUNIT_TEST(connectTest);
-CPPUNIT_TEST(emitTest);
+  CPPUNIT_TEST_SUITE_END();
 
-CPPUNIT_TEST_SUITE_END();
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void connectTest();
   void emitTest();
@@ -30,48 +30,47 @@ CPPUNIT_TEST_SUITE_END();
 CPPUNIT_TEST_SUITE_REGISTRATION(testSignal);
 
 static int s_value = 0;
-static void setValueFunct(int iValue) { s_value = iValue;}
+static void setValueFunct(int iValue) { s_value = iValue; }
 
 void testSignal::connectTest()
 
 {
-   edm::signalslot::Signal<void(int)> sig;
-   CPPUNIT_ASSERT(sig.slots().size()==0);
-   
-   int value1 = 0;
-   sig.connect([&](int iValue)->void{ value1=iValue;});
-   
-   CPPUNIT_ASSERT(sig.slots().size()==1);
-
-   int value2=0;
-   sig.connect([&](int iValue){value2=iValue;});
-   CPPUNIT_ASSERT(sig.slots().size()==2);
-
-   sig.connect(setValueFunct);
-   //see that the slots we created are actually there
-   for(auto const& slot: sig.slots()) {
-      slot(5);
-   }
-   CPPUNIT_ASSERT(value1==5);
-   CPPUNIT_ASSERT(value2==5);
-   CPPUNIT_ASSERT(value2==s_value);
+  edm::signalslot::Signal<void(int)> sig;
+  CPPUNIT_ASSERT(sig.slots().size() == 0);
+
+  int value1 = 0;
+  sig.connect([&](int iValue) -> void { value1 = iValue; });
+
+  CPPUNIT_ASSERT(sig.slots().size() == 1);
+
+  int value2 = 0;
+  sig.connect([&](int iValue) { value2 = iValue; });
+  CPPUNIT_ASSERT(sig.slots().size() == 2);
+
+  sig.connect(setValueFunct);
+  //see that the slots we created are actually there
+  for (auto const& slot : sig.slots()) {
+    slot(5);
+  }
+  CPPUNIT_ASSERT(value1 == 5);
+  CPPUNIT_ASSERT(value2 == 5);
+  CPPUNIT_ASSERT(value2 == s_value);
 }
 
-void testSignal::emitTest()
-{
-   edm::signalslot::Signal<void(int)> sig;
-   
-   int value1 = 0;
-   sig.connect([&](int iValue){ value1=iValue;});
-   
-   int value2=0;
-   sig.connect([&](int iValue){value2=iValue;});
-   
-   sig.emit(5);
-   CPPUNIT_ASSERT(value1==5);
-   CPPUNIT_ASSERT(value2==5);
-
-   sig.emit(1);
-   CPPUNIT_ASSERT(value1==1);
-   CPPUNIT_ASSERT(value2==1);
+void testSignal::emitTest() {
+  edm::signalslot::Signal<void(int)> sig;
+
+  int value1 = 0;
+  sig.connect([&](int iValue) { value1 = iValue; });
+
+  int value2 = 0;
+  sig.connect([&](int iValue) { value2 = iValue; });
+
+  sig.emit(5);
+  CPPUNIT_ASSERT(value1 == 5);
+  CPPUNIT_ASSERT(value2 == 5);
+
+  sig.emit(1);
+  CPPUNIT_ASSERT(value1 == 1);
+  CPPUNIT_ASSERT(value2 == 1);
 }
diff --git a/FWCore/Utilities/test/soatuple_t.cppunit.cpp b/FWCore/Utilities/test/soatuple_t.cppunit.cpp
index 384636147b6a7..435440b9c3ac7 100644
--- a/FWCore/Utilities/test/soatuple_t.cppunit.cpp
+++ b/FWCore/Utilities/test/soatuple_t.cppunit.cpp
@@ -12,10 +12,9 @@ Changed by Viji on 29-06-2005
 #include <cppunit/extensions/HelperMacros.h>
 #include "FWCore/Utilities/interface/SoATuple.h"
 
-class testSoATuple: public CppUnit::TestFixture
-{
+class testSoATuple : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testSoATuple);
-  
+
   CPPUNIT_TEST(builtinTest);
   CPPUNIT_TEST(classTest);
   CPPUNIT_TEST(badPaddingTest);
@@ -25,11 +24,12 @@ class testSoATuple: public CppUnit::TestFixture
   CPPUNIT_TEST(assignmentTest);
   CPPUNIT_TEST(emplace_backTest);
   CPPUNIT_TEST(alignmentTest);
-  
+
   CPPUNIT_TEST_SUITE_END();
+
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void builtinTest();
   void badPaddingTest();
@@ -45,311 +45,297 @@ class testSoATuple: public CppUnit::TestFixture
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testSoATuple);
 
-void testSoATuple::builtinTest()
-{
-  edm::SoATuple<int,float,bool> s;
-  
+void testSoATuple::builtinTest() {
+  edm::SoATuple<int, float, bool> s;
+
   s.reserve(3);
   CPPUNIT_ASSERT(s.size() == 0);
-  
-  s.push_back(std::make_tuple(int{1},float{3.2},false));
+
+  s.push_back(std::make_tuple(int{1}, float{3.2}, false));
   //std::cout <<s.get<1>(0)<<std::endl;
   CPPUNIT_ASSERT(s.size() == 1);
-  CPPUNIT_ASSERT(1==s.get<0>(0));
-  CPPUNIT_ASSERT(float{3.2}==s.get<1>(0));
-  CPPUNIT_ASSERT(false==s.get<2>(0));
-    
-  s.push_back(std::make_tuple(int{2},float{3.1415},true));
+  CPPUNIT_ASSERT(1 == s.get<0>(0));
+  CPPUNIT_ASSERT(float{3.2} == s.get<1>(0));
+  CPPUNIT_ASSERT(false == s.get<2>(0));
+
+  s.push_back(std::make_tuple(int{2}, float{3.1415}, true));
   CPPUNIT_ASSERT(s.size() == 2);
-  CPPUNIT_ASSERT(1==s.get<0>(0));
-  CPPUNIT_ASSERT(float{3.2}==s.get<1>(0));
-  CPPUNIT_ASSERT(false==s.get<2>(0));
-  CPPUNIT_ASSERT(2==s.get<0>(1));
-  CPPUNIT_ASSERT(float{3.1415}==s.get<1>(1));
-  CPPUNIT_ASSERT(true==s.get<2>(1));
-  
-  s.push_back(std::make_tuple(int{-1},float{58.6},true));
+  CPPUNIT_ASSERT(1 == s.get<0>(0));
+  CPPUNIT_ASSERT(float{3.2} == s.get<1>(0));
+  CPPUNIT_ASSERT(false == s.get<2>(0));
+  CPPUNIT_ASSERT(2 == s.get<0>(1));
+  CPPUNIT_ASSERT(float{3.1415} == s.get<1>(1));
+  CPPUNIT_ASSERT(true == s.get<2>(1));
+
+  s.push_back(std::make_tuple(int{-1}, float{58.6}, true));
   CPPUNIT_ASSERT(s.size() == 3);
-  CPPUNIT_ASSERT(1==s.get<0>(0));
-  CPPUNIT_ASSERT(float{3.2}==s.get<1>(0));
-  CPPUNIT_ASSERT(false==s.get<2>(0));
-  CPPUNIT_ASSERT(2==s.get<0>(1));
-  CPPUNIT_ASSERT(float{3.1415}==s.get<1>(1));
-  CPPUNIT_ASSERT(true==s.get<2>(1));
-  CPPUNIT_ASSERT(-1==s.get<0>(2));
-  CPPUNIT_ASSERT(float{58.6}==s.get<1>(2));
-  CPPUNIT_ASSERT(true==s.get<2>(2));
+  CPPUNIT_ASSERT(1 == s.get<0>(0));
+  CPPUNIT_ASSERT(float{3.2} == s.get<1>(0));
+  CPPUNIT_ASSERT(false == s.get<2>(0));
+  CPPUNIT_ASSERT(2 == s.get<0>(1));
+  CPPUNIT_ASSERT(float{3.1415} == s.get<1>(1));
+  CPPUNIT_ASSERT(true == s.get<2>(1));
+  CPPUNIT_ASSERT(-1 == s.get<0>(2));
+  CPPUNIT_ASSERT(float{58.6} == s.get<1>(2));
+  CPPUNIT_ASSERT(true == s.get<2>(2));
 }
 
-void testSoATuple::badPaddingTest()
-{
-  edm::SoATuple<bool,int,double> s;
-  
+void testSoATuple::badPaddingTest() {
+  edm::SoATuple<bool, int, double> s;
+
   s.reserve(3);
   CPPUNIT_ASSERT(s.size() == 0);
-  
-  s.push_back(std::make_tuple(false,int{1},double{3.2}));
+
+  s.push_back(std::make_tuple(false, int{1}, double{3.2}));
   //std::cout <<s.get<1>(0)<<std::endl;
   CPPUNIT_ASSERT(s.size() == 1);
-  CPPUNIT_ASSERT(1==s.get<1>(0));
-  CPPUNIT_ASSERT(double{3.2}==s.get<2>(0));
-  CPPUNIT_ASSERT(false==s.get<0>(0));
-  
-  s.push_back(std::make_tuple(true,int{2},double{3.1415}));
+  CPPUNIT_ASSERT(1 == s.get<1>(0));
+  CPPUNIT_ASSERT(double{3.2} == s.get<2>(0));
+  CPPUNIT_ASSERT(false == s.get<0>(0));
+
+  s.push_back(std::make_tuple(true, int{2}, double{3.1415}));
   CPPUNIT_ASSERT(s.size() == 2);
-  CPPUNIT_ASSERT(1==s.get<1>(0));
-  CPPUNIT_ASSERT(double{3.2}==s.get<2>(0));
-  CPPUNIT_ASSERT(false==s.get<0>(0));
-  CPPUNIT_ASSERT(2==s.get<1>(1));
-  CPPUNIT_ASSERT(double{3.1415}==s.get<2>(1));
-  CPPUNIT_ASSERT(true==s.get<0>(1));
-  
-  s.push_back(std::make_tuple(true,int{-1},double{58.6}));
+  CPPUNIT_ASSERT(1 == s.get<1>(0));
+  CPPUNIT_ASSERT(double{3.2} == s.get<2>(0));
+  CPPUNIT_ASSERT(false == s.get<0>(0));
+  CPPUNIT_ASSERT(2 == s.get<1>(1));
+  CPPUNIT_ASSERT(double{3.1415} == s.get<2>(1));
+  CPPUNIT_ASSERT(true == s.get<0>(1));
+
+  s.push_back(std::make_tuple(true, int{-1}, double{58.6}));
   CPPUNIT_ASSERT(s.size() == 3);
-  CPPUNIT_ASSERT(1==s.get<1>(0));
-  CPPUNIT_ASSERT(double{3.2}==s.get<2>(0));
-  CPPUNIT_ASSERT(false==s.get<0>(0));
-  CPPUNIT_ASSERT(2==s.get<1>(1));
-  CPPUNIT_ASSERT(double{3.1415}==s.get<2>(1));
-  CPPUNIT_ASSERT(true==s.get<0>(1));
-  CPPUNIT_ASSERT(-1==s.get<1>(2));
-  CPPUNIT_ASSERT(double{58.6}==s.get<2>(2));
-  CPPUNIT_ASSERT(true==s.get<0>(2));
+  CPPUNIT_ASSERT(1 == s.get<1>(0));
+  CPPUNIT_ASSERT(double{3.2} == s.get<2>(0));
+  CPPUNIT_ASSERT(false == s.get<0>(0));
+  CPPUNIT_ASSERT(2 == s.get<1>(1));
+  CPPUNIT_ASSERT(double{3.1415} == s.get<2>(1));
+  CPPUNIT_ASSERT(true == s.get<0>(1));
+  CPPUNIT_ASSERT(-1 == s.get<1>(2));
+  CPPUNIT_ASSERT(double{58.6} == s.get<2>(2));
+  CPPUNIT_ASSERT(true == s.get<0>(2));
 }
 
 namespace {
   struct ConstructDestructCounter {
     static unsigned int s_constructorCalls;
     static unsigned int s_destructorCalls;
-    
+
     //make sure the destructor is being called on the correct memory location
     void* originalThis;
 
-    ConstructDestructCounter(): originalThis(this) {
-      ++s_constructorCalls;
-    }
+    ConstructDestructCounter() : originalThis(this) { ++s_constructorCalls; }
 
-    ConstructDestructCounter(ConstructDestructCounter const&):originalThis(this) {
-      ++s_constructorCalls;
-    }
+    ConstructDestructCounter(ConstructDestructCounter const&) : originalThis(this) { ++s_constructorCalls; }
+
+    ConstructDestructCounter(ConstructDestructCounter&&) : originalThis(this) { ++s_constructorCalls; }
 
-    ConstructDestructCounter(ConstructDestructCounter&&):originalThis(this) {
-      ++s_constructorCalls;
-    }
-    
     ~ConstructDestructCounter() {
-      CPPUNIT_ASSERT(originalThis==this);
+      CPPUNIT_ASSERT(originalThis == this);
       ++s_destructorCalls;
     }
-    
   };
   unsigned int ConstructDestructCounter::s_constructorCalls = 0;
   unsigned int ConstructDestructCounter::s_destructorCalls = 0;
-}
-
+}  // namespace
 
-void testSoATuple::classTest()
-{
+void testSoATuple::classTest() {
   ConstructDestructCounter::s_constructorCalls = 0;
   ConstructDestructCounter::s_destructorCalls = 0;
-  CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls==ConstructDestructCounter::s_destructorCalls);
+  CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls == ConstructDestructCounter::s_destructorCalls);
   {
     edm::SoATuple<std::string, ConstructDestructCounter> s;
-    
+
     s.reserve(3);
     const std::string kFoo{"foo"};
     CPPUNIT_ASSERT(s.size() == 0);
     {
       ConstructDestructCounter dummy;
-      s.push_back(std::make_tuple(kFoo,dummy));
+      s.push_back(std::make_tuple(kFoo, dummy));
     }
-    CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls==ConstructDestructCounter::s_destructorCalls+1);
-    CPPUNIT_ASSERT(s.size()==1);
-    CPPUNIT_ASSERT(kFoo==s.get<0>(0));
+    CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls == ConstructDestructCounter::s_destructorCalls + 1);
+    CPPUNIT_ASSERT(s.size() == 1);
+    CPPUNIT_ASSERT(kFoo == s.get<0>(0));
 
     const std::string kBar{"bar"};
     {
       ConstructDestructCounter dummy;
-      s.push_back(std::make_tuple(kBar,dummy));
+      s.push_back(std::make_tuple(kBar, dummy));
     }
-    CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls==ConstructDestructCounter::s_destructorCalls+2);
-    CPPUNIT_ASSERT(s.size()==2);
-    CPPUNIT_ASSERT(kFoo==s.get<0>(0));
-    CPPUNIT_ASSERT(kBar==s.get<0>(1));
+    CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls == ConstructDestructCounter::s_destructorCalls + 2);
+    CPPUNIT_ASSERT(s.size() == 2);
+    CPPUNIT_ASSERT(kFoo == s.get<0>(0));
+    CPPUNIT_ASSERT(kBar == s.get<0>(1));
   }
-  CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls==ConstructDestructCounter::s_destructorCalls);
+  CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls == ConstructDestructCounter::s_destructorCalls);
 }
 
-void testSoATuple::growthTest()
-{
+void testSoATuple::growthTest() {
   ConstructDestructCounter::s_constructorCalls = 0;
   ConstructDestructCounter::s_destructorCalls = 0;
-  CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls==ConstructDestructCounter::s_destructorCalls);
+  CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls == ConstructDestructCounter::s_destructorCalls);
   {
     edm::SoATuple<unsigned int, ConstructDestructCounter> s;
     CPPUNIT_ASSERT(s.size() == 0);
     CPPUNIT_ASSERT(s.capacity() == 0);
-    for(unsigned int i= 0; i< 100; ++i) {
+    for (unsigned int i = 0; i < 100; ++i) {
       {
         ConstructDestructCounter dummy;
-        s.push_back(std::make_tuple(i,dummy));
+        s.push_back(std::make_tuple(i, dummy));
       }
-      CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls==ConstructDestructCounter::s_destructorCalls+i+1);
-      CPPUNIT_ASSERT(s.size()==i+1);
-      CPPUNIT_ASSERT(s.capacity()>=i+1);
-      for(unsigned int j=0; j<s.size(); ++j) {
-        CPPUNIT_ASSERT(j==s.get<0>(j));
+      CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls ==
+                     ConstructDestructCounter::s_destructorCalls + i + 1);
+      CPPUNIT_ASSERT(s.size() == i + 1);
+      CPPUNIT_ASSERT(s.capacity() >= i + 1);
+      for (unsigned int j = 0; j < s.size(); ++j) {
+        CPPUNIT_ASSERT(j == s.get<0>(j));
       }
     }
-    
+
     s.shrink_to_fit();
-    CPPUNIT_ASSERT(s.capacity()==s.size());
-    CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls-ConstructDestructCounter::s_destructorCalls == s.size());
-    for(unsigned int j=0; j<s.size(); ++j) {
-      CPPUNIT_ASSERT(j==s.get<0>(j));
+    CPPUNIT_ASSERT(s.capacity() == s.size());
+    CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls - ConstructDestructCounter::s_destructorCalls ==
+                   s.size());
+    for (unsigned int j = 0; j < s.size(); ++j) {
+      CPPUNIT_ASSERT(j == s.get<0>(j));
     }
-
   }
-  
-  CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls==ConstructDestructCounter::s_destructorCalls);
+
+  CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls == ConstructDestructCounter::s_destructorCalls);
 }
 
-void testSoATuple::copyConstructorTest()
-{
+void testSoATuple::copyConstructorTest() {
   ConstructDestructCounter::s_constructorCalls = 0;
   ConstructDestructCounter::s_destructorCalls = 0;
-  CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls==ConstructDestructCounter::s_destructorCalls);
+  CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls == ConstructDestructCounter::s_destructorCalls);
   {
     edm::SoATuple<unsigned int, ConstructDestructCounter> s;
     CPPUNIT_ASSERT(s.size() == 0);
     CPPUNIT_ASSERT(s.capacity() == 0);
-    for(unsigned int i= 0; i< 100; ++i) {
+    for (unsigned int i = 0; i < 100; ++i) {
       {
         ConstructDestructCounter dummy;
-        s.push_back(std::make_tuple(i,dummy));
+        s.push_back(std::make_tuple(i, dummy));
       }
       edm::SoATuple<unsigned int, ConstructDestructCounter> sCopy(s);
-      CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls==ConstructDestructCounter::s_destructorCalls+2*i+2);
-      CPPUNIT_ASSERT(s.size()==i+1);
-      CPPUNIT_ASSERT(s.capacity()>=i+1);
-      CPPUNIT_ASSERT(sCopy.size()==i+1);
-      CPPUNIT_ASSERT(sCopy.capacity()>=i+1);
-
-      for(unsigned int j=0; j<s.size(); ++j) {
-        CPPUNIT_ASSERT(j==s.get<0>(j));
-        CPPUNIT_ASSERT(j==sCopy.get<0>(j));
+      CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls ==
+                     ConstructDestructCounter::s_destructorCalls + 2 * i + 2);
+      CPPUNIT_ASSERT(s.size() == i + 1);
+      CPPUNIT_ASSERT(s.capacity() >= i + 1);
+      CPPUNIT_ASSERT(sCopy.size() == i + 1);
+      CPPUNIT_ASSERT(sCopy.capacity() >= i + 1);
+
+      for (unsigned int j = 0; j < s.size(); ++j) {
+        CPPUNIT_ASSERT(j == s.get<0>(j));
+        CPPUNIT_ASSERT(j == sCopy.get<0>(j));
       }
     }
   }
-  CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls==ConstructDestructCounter::s_destructorCalls);
+  CPPUNIT_ASSERT(ConstructDestructCounter::s_constructorCalls == ConstructDestructCounter::s_destructorCalls);
 }
 
-void testSoATuple::assignmentTest()
-{
-  const std::vector<std::string> sValues = {"foo","fii","fee"};
+void testSoATuple::assignmentTest() {
+  const std::vector<std::string> sValues = {"foo", "fii", "fee"};
   edm::SoATuple<std::string, int> s;
   s.reserve(sValues.size());
   int i = 0;
-  for(auto const& v: sValues) {
-    s.push_back(std::make_tuple(v,i));
+  for (auto const& v : sValues) {
+    s.push_back(std::make_tuple(v, i));
     ++i;
   }
-  
-  edm::SoATuple<std::string,int> sAssign;
+
+  edm::SoATuple<std::string, int> sAssign;
   sAssign.reserve(2);
-  sAssign.push_back(std::make_tuple("barney",10));
-  sAssign.push_back(std::make_tuple("fred",7));
-  CPPUNIT_ASSERT(sAssign.size()==2);
-  
+  sAssign.push_back(std::make_tuple("barney", 10));
+  sAssign.push_back(std::make_tuple("fred", 7));
+  CPPUNIT_ASSERT(sAssign.size() == 2);
+
   sAssign = s;
-  CPPUNIT_ASSERT(sAssign.size()==s.size());
-  CPPUNIT_ASSERT(sAssign.size()==sValues.size());
+  CPPUNIT_ASSERT(sAssign.size() == s.size());
+  CPPUNIT_ASSERT(sAssign.size() == sValues.size());
 
   i = 0;
-  for(auto const& v: sValues) {
+  for (auto const& v : sValues) {
     CPPUNIT_ASSERT(v == sAssign.get<0>(i));
     CPPUNIT_ASSERT(i == sAssign.get<1>(i));
     ++i;
   }
 }
 
-
-void testSoATuple::loopTest()
-{
-  edm::SoATuple<int,int,int> s;
+void testSoATuple::loopTest() {
+  edm::SoATuple<int, int, int> s;
   s.reserve(50);
-  for(int i=0; i<50;++i) {
-    s.push_back(std::make_tuple(i,i+1,i+2));
+  for (int i = 0; i < 50; ++i) {
+    s.push_back(std::make_tuple(i, i + 1, i + 2));
   }
-  CPPUNIT_ASSERT(50==s.size());
-  int index=0;
-  for(auto it =s.begin<0>(), itEnd = s.end<0>(); it!=itEnd;++it,++index) {
+  CPPUNIT_ASSERT(50 == s.size());
+  int index = 0;
+  for (auto it = s.begin<0>(), itEnd = s.end<0>(); it != itEnd; ++it, ++index) {
     CPPUNIT_ASSERT(index == *it);
   }
   index = 1;
-  for(auto it =s.begin<1>(), itEnd = s.end<1>(); it!=itEnd;++it,++index) {
+  for (auto it = s.begin<1>(), itEnd = s.end<1>(); it != itEnd; ++it, ++index) {
     CPPUNIT_ASSERT(index == *it);
   }
 
   index = 2;
-  for(auto it =s.begin<2>(), itEnd = s.end<2>(); it!=itEnd;++it,++index) {
+  for (auto it = s.begin<2>(), itEnd = s.end<2>(); it != itEnd; ++it, ++index) {
     CPPUNIT_ASSERT(index == *it);
   }
 }
 
-void testSoATuple::emplace_backTest()
-{
-  const std::vector<std::string> sValues = {"foo","fii","fee"};
+void testSoATuple::emplace_backTest() {
+  const std::vector<std::string> sValues = {"foo", "fii", "fee"};
   edm::SoATuple<std::string, int> s;
   s.reserve(sValues.size());
   int i = 0;
-  for(auto const& v: sValues) {
-    s.emplace_back(v,i);
+  for (auto const& v : sValues) {
+    s.emplace_back(v, i);
     ++i;
   }
   i = 0;
-  for(auto const& v: sValues) {
+  for (auto const& v : sValues) {
     CPPUNIT_ASSERT(v == s.get<0>(i));
     CPPUNIT_ASSERT(i == s.get<1>(i));
     ++i;
   }
 }
 
-namespace  {
+namespace {
   struct CharDummy {
     char i;
     char j;
   };
-  
+
   struct ComplexDummy {
-    char * p;
+    char* p;
     double f;
   };
-}
-void testSoATuple::alignmentTest()
-{
-  CPPUNIT_ASSERT((alignof(double)==edm::soahelper::SoATupleHelper<2,double,bool>::max_alignment));
-  CPPUNIT_ASSERT((alignof(double)==edm::soahelper::SoATupleHelper<2,bool,double>::max_alignment));
-  CPPUNIT_ASSERT((alignof(float)==edm::soahelper::SoATupleHelper<2,float,bool>::max_alignment));
-  CPPUNIT_ASSERT((alignof(float)==edm::soahelper::SoATupleHelper<2,bool,float>::max_alignment));
+}  // namespace
+void testSoATuple::alignmentTest() {
+  CPPUNIT_ASSERT((alignof(double) == edm::soahelper::SoATupleHelper<2, double, bool>::max_alignment));
+  CPPUNIT_ASSERT((alignof(double) == edm::soahelper::SoATupleHelper<2, bool, double>::max_alignment));
+  CPPUNIT_ASSERT((alignof(float) == edm::soahelper::SoATupleHelper<2, float, bool>::max_alignment));
+  CPPUNIT_ASSERT((alignof(float) == edm::soahelper::SoATupleHelper<2, bool, float>::max_alignment));
   //std::cout <<"alignment of CharDummy "<<alignof(CharDummy)<<" alignment of char "<<alignof(char)<<std::endl;
-  CPPUNIT_ASSERT((alignof(CharDummy)==edm::soahelper::SoATupleHelper<2,char,CharDummy>::max_alignment));
-  CPPUNIT_ASSERT((alignof(CharDummy)==edm::soahelper::SoATupleHelper<2,CharDummy,char>::max_alignment));
-  CPPUNIT_ASSERT((alignof(ComplexDummy)==edm::soahelper::SoATupleHelper<2,char,ComplexDummy>::max_alignment));
-  CPPUNIT_ASSERT((alignof(ComplexDummy)==edm::soahelper::SoATupleHelper<2,ComplexDummy,char>::max_alignment));
-  
-  CPPUNIT_ASSERT((alignof(float)==edm::soahelper::SoATupleHelper<2,float,float>::max_alignment));
-  CPPUNIT_ASSERT((16==edm::soahelper::SoATupleHelper<2,edm::AlignedVec<float>,edm::AlignedVec<float>>::max_alignment));
-
-  CPPUNIT_ASSERT((alignof(double)==edm::soahelper::SoATupleHelper<2,double,double>::max_alignment));
-  CPPUNIT_ASSERT((16==edm::soahelper::SoATupleHelper<2,edm::AlignedVec<double>,edm::AlignedVec<double>>::max_alignment));
-
-  edm::SoATuple<edm::AlignedVec<float>,edm::AlignedVec<float>,edm::AlignedVec<float>> vFloats;
+  CPPUNIT_ASSERT((alignof(CharDummy) == edm::soahelper::SoATupleHelper<2, char, CharDummy>::max_alignment));
+  CPPUNIT_ASSERT((alignof(CharDummy) == edm::soahelper::SoATupleHelper<2, CharDummy, char>::max_alignment));
+  CPPUNIT_ASSERT((alignof(ComplexDummy) == edm::soahelper::SoATupleHelper<2, char, ComplexDummy>::max_alignment));
+  CPPUNIT_ASSERT((alignof(ComplexDummy) == edm::soahelper::SoATupleHelper<2, ComplexDummy, char>::max_alignment));
+
+  CPPUNIT_ASSERT((alignof(float) == edm::soahelper::SoATupleHelper<2, float, float>::max_alignment));
+  CPPUNIT_ASSERT(
+      (16 == edm::soahelper::SoATupleHelper<2, edm::AlignedVec<float>, edm::AlignedVec<float>>::max_alignment));
+
+  CPPUNIT_ASSERT((alignof(double) == edm::soahelper::SoATupleHelper<2, double, double>::max_alignment));
+  CPPUNIT_ASSERT(
+      (16 == edm::soahelper::SoATupleHelper<2, edm::AlignedVec<double>, edm::AlignedVec<double>>::max_alignment));
+
+  edm::SoATuple<edm::AlignedVec<float>, edm::AlignedVec<float>, edm::AlignedVec<float>> vFloats;
   vFloats.reserve(50);
-  for(unsigned int i=0; i<50;++i) {
-    vFloats.emplace_back(1.0f,2.0f,3.0f);
+  for (unsigned int i = 0; i < 50; ++i) {
+    vFloats.emplace_back(1.0f, 2.0f, 3.0f);
   }
-  CPPUNIT_ASSERT(reinterpret_cast<std::intptr_t>(vFloats.begin<0>()) %16 == 0);
-  CPPUNIT_ASSERT(reinterpret_cast<std::intptr_t>(vFloats.begin<1>()) %16 == 0);
-  CPPUNIT_ASSERT(reinterpret_cast<std::intptr_t>(vFloats.begin<2>()) %16 == 0);
+  CPPUNIT_ASSERT(reinterpret_cast<std::intptr_t>(vFloats.begin<0>()) % 16 == 0);
+  CPPUNIT_ASSERT(reinterpret_cast<std::intptr_t>(vFloats.begin<1>()) % 16 == 0);
+  CPPUNIT_ASSERT(reinterpret_cast<std::intptr_t>(vFloats.begin<2>()) % 16 == 0);
 }
diff --git a/FWCore/Utilities/test/transform.cppunit.cpp b/FWCore/Utilities/test/transform.cppunit.cpp
index 1fe76f38c7e5c..f6d29311c69ea 100644
--- a/FWCore/Utilities/test/transform.cppunit.cpp
+++ b/FWCore/Utilities/test/transform.cppunit.cpp
@@ -12,9 +12,7 @@ Test program for edm::vector_transform class.
 
 #include "FWCore/Utilities/interface/transform.h"
 
-
-class testTransform: public CppUnit::TestFixture
-{
+class testTransform : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testTransform);
 
   CPPUNIT_TEST(valueTest);
@@ -31,38 +29,24 @@ class testTransform: public CppUnit::TestFixture
 // register the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testTransform);
 
+std::string byvalue_toupper(std::string const& value) { return boost::to_upper_copy(value); }
 
-std::string byvalue_toupper(std::string const & value)
-{
-  return boost::to_upper_copy( value );
-}
-
-const std::string byconstvalue_toupper(std::string const & value)
-{
-  return boost::to_upper_copy( value );
-}
+const std::string byconstvalue_toupper(std::string const& value) { return boost::to_upper_copy(value); }
 
-std::string & byref_toupper(std::string const & value)
-{
-  return * new std::string(boost::to_upper_copy( value ));
-}
+std::string& byref_toupper(std::string const& value) { return *new std::string(boost::to_upper_copy(value)); }
 
-std::string & byconstref_toupper(std::string const & value)
-{
-  return * new std::string(boost::to_upper_copy( value ));
-}
+std::string& byconstref_toupper(std::string const& value) { return *new std::string(boost::to_upper_copy(value)); }
 
-void testTransform::valueTest()
-{
-  const std::vector<std::string> input { "Hello", "World" };
-  const std::vector<std::string> upper { "HELLO", "WORLD" };
-  const std::vector<std::string::size_type> size  { 5, 5 };
+void testTransform::valueTest() {
+  const std::vector<std::string> input{"Hello", "World"};
+  const std::vector<std::string> upper{"HELLO", "WORLD"};
+  const std::vector<std::string::size_type> size{5, 5};
 
-  auto test_lambda = edm::vector_transform( input, [](std::string const & value) { return value.size(); } );
-  CPPUNIT_ASSERT( size  == test_lambda );
+  auto test_lambda = edm::vector_transform(input, [](std::string const& value) { return value.size(); });
+  CPPUNIT_ASSERT(size == test_lambda);
 
-  CPPUNIT_ASSERT( upper == edm::vector_transform(input, byvalue_toupper) );
-  CPPUNIT_ASSERT( upper == edm::vector_transform(input, byconstvalue_toupper) );
-  CPPUNIT_ASSERT( upper == edm::vector_transform(input, byref_toupper) );
-  CPPUNIT_ASSERT( upper == edm::vector_transform(input, byconstref_toupper) );
+  CPPUNIT_ASSERT(upper == edm::vector_transform(input, byvalue_toupper));
+  CPPUNIT_ASSERT(upper == edm::vector_transform(input, byconstvalue_toupper));
+  CPPUNIT_ASSERT(upper == edm::vector_transform(input, byref_toupper));
+  CPPUNIT_ASSERT(upper == edm::vector_transform(input, byconstref_toupper));
 }
diff --git a/FWCore/Utilities/test/typedefs_t.cpp b/FWCore/Utilities/test/typedefs_t.cpp
index 52c910cd145f9..e71d7c37e9036 100644
--- a/FWCore/Utilities/test/typedefs_t.cpp
+++ b/FWCore/Utilities/test/typedefs_t.cpp
@@ -2,12 +2,12 @@
 
 // Will fail compilation if any assert is violated.
 int main() {
-   static_assert(sizeof(cms_int8_t) == 1,"type does not match size problem");
-   static_assert(sizeof(cms_uint8_t) == 1,"type does not match size problem");
-   static_assert(sizeof(cms_int16_t) == 2,"type does not match size problem");
-   static_assert(sizeof(cms_uint16_t) == 2,"type does not match size problem");
-   static_assert(sizeof(cms_int32_t) == 4,"type does not match size problem");
-   static_assert(sizeof(cms_uint32_t) == 4,"type does not match size problem");
-   static_assert(sizeof(cms_int64_t) == 8,"type does not match size problem");
-   static_assert(sizeof(cms_uint64_t) == 8,"type does not match size problem");
+  static_assert(sizeof(cms_int8_t) == 1, "type does not match size problem");
+  static_assert(sizeof(cms_uint8_t) == 1, "type does not match size problem");
+  static_assert(sizeof(cms_int16_t) == 2, "type does not match size problem");
+  static_assert(sizeof(cms_uint16_t) == 2, "type does not match size problem");
+  static_assert(sizeof(cms_int32_t) == 4, "type does not match size problem");
+  static_assert(sizeof(cms_uint32_t) == 4, "type does not match size problem");
+  static_assert(sizeof(cms_int64_t) == 8, "type does not match size problem");
+  static_assert(sizeof(cms_uint64_t) == 8, "type does not match size problem");
 }
diff --git a/FWCore/Utilities/test/typeid_t.cppunit.cpp b/FWCore/Utilities/test/typeid_t.cppunit.cpp
index 2f0a7222e7f61..e7297ae52aae4 100644
--- a/FWCore/Utilities/test/typeid_t.cppunit.cpp
+++ b/FWCore/Utilities/test/typeid_t.cppunit.cpp
@@ -11,17 +11,17 @@ Changed by Viji on 29-06-2005
 #include <cppunit/extensions/HelperMacros.h>
 #include "FWCore/Utilities/interface/TypeID.h"
 
-class testTypeid: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(testTypeid);
+class testTypeid : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testTypeid);
+
+  CPPUNIT_TEST(equalityTest);
+  CPPUNIT_TEST(copyTest);
 
-CPPUNIT_TEST(equalityTest);
-CPPUNIT_TEST(copyTest);
+  CPPUNIT_TEST_SUITE_END();
 
-CPPUNIT_TEST_SUITE_END();
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void equalityTest();
   void copyTest();
@@ -31,8 +31,8 @@ CPPUNIT_TEST_SUITE_END();
 CPPUNIT_TEST_SUITE_REGISTRATION(testTypeid);
 
 namespace edmtest {
-  struct empty { };
-}
+  struct empty {};
+}  // namespace edmtest
 
 using std::cerr;
 using std::endl;
@@ -43,26 +43,25 @@ void testTypeid::equalityTest()
   edmtest::empty e;
   edm::TypeID id1(e);
   edm::TypeID id2(e);
-  
+
   CPPUNIT_ASSERT(!(id1 < id2));
   CPPUNIT_ASSERT(!(id2 < id1));
 
   std::string n1(id1.name());
   std::string n2(id2.name());
 
-  CPPUNIT_ASSERT(n1==n2);
+  CPPUNIT_ASSERT(n1 == n2);
 }
 
-void testTypeid::copyTest()
-{
+void testTypeid::copyTest() {
   edmtest::empty e;
   edm::TypeID id1(e);
 
-  edm::TypeID id3=id1;
+  edm::TypeID id3 = id1;
   CPPUNIT_ASSERT(!(id1 < id3));
   CPPUNIT_ASSERT(!(id3 < id1));
 
   std::string n1(id1.name());
   std::string n3(id3.name());
-  CPPUNIT_ASSERT(n1== n3);
+  CPPUNIT_ASSERT(n1 == n3);
 }
diff --git a/FWCore/Utilities/test/typeidbase_t.cppunit.cpp b/FWCore/Utilities/test/typeidbase_t.cppunit.cpp
index 929b32e9e4dec..c7911fcd7937b 100644
--- a/FWCore/Utilities/test/typeidbase_t.cppunit.cpp
+++ b/FWCore/Utilities/test/typeidbase_t.cppunit.cpp
@@ -11,17 +11,17 @@ Changed by Viji on 29-06-2005
 #include <cppunit/extensions/HelperMacros.h>
 #include "FWCore/Utilities/interface/TypeIDBase.h"
 
-class testTypeIDBase: public CppUnit::TestFixture
-{
-CPPUNIT_TEST_SUITE(testTypeIDBase);
+class testTypeIDBase : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testTypeIDBase);
+
+  CPPUNIT_TEST(equalityTest);
+  CPPUNIT_TEST(copyTest);
 
-CPPUNIT_TEST(equalityTest);
-CPPUNIT_TEST(copyTest);
+  CPPUNIT_TEST_SUITE_END();
 
-CPPUNIT_TEST_SUITE_END();
 public:
-  void setUp(){}
-  void tearDown(){}
+  void setUp() {}
+  void tearDown() {}
 
   void equalityTest();
   void copyTest();
@@ -31,8 +31,8 @@ CPPUNIT_TEST_SUITE_END();
 CPPUNIT_TEST_SUITE_REGISTRATION(testTypeIDBase);
 
 namespace edmtest {
-  struct empty { };
-}
+  struct empty {};
+}  // namespace edmtest
 
 void testTypeIDBase::equalityTest()
 
@@ -40,27 +40,26 @@ void testTypeIDBase::equalityTest()
   edmtest::empty e;
   edm::TypeIDBase id1(typeid(e));
   edm::TypeIDBase id2(typeid(e));
-  
+
   CPPUNIT_ASSERT(!(id1 < id2));
   CPPUNIT_ASSERT(!(id2 < id1));
 
   std::string n1(id1.name());
   std::string n2(id2.name());
 
-  CPPUNIT_ASSERT(n1==n2);
+  CPPUNIT_ASSERT(n1 == n2);
 }
 
-void testTypeIDBase::copyTest()
-{
+void testTypeIDBase::copyTest() {
   edmtest::empty e;
   edm::TypeIDBase id1(typeid(e));
 
-  edm::TypeIDBase id3=id1;
+  edm::TypeIDBase id3 = id1;
   CPPUNIT_ASSERT(!(id1 < id3));
   CPPUNIT_ASSERT(!(id3 < id1));
 
   std::string n1(id1.name());
   std::string n3(id3.name());
-  CPPUNIT_ASSERT(n1== n3);
+  CPPUNIT_ASSERT(n1 == n3);
 }
 #include <Utilities/Testing/interface/CppUnit_testdriver.icpp>
diff --git a/FWCore/Utilities/test/value_ptr_t.cpp b/FWCore/Utilities/test/value_ptr_t.cpp
index 374dbf7661385..4533d31773f7a 100644
--- a/FWCore/Utilities/test/value_ptr_t.cpp
+++ b/FWCore/Utilities/test/value_ptr_t.cpp
@@ -4,18 +4,27 @@
 #include <cassert>
 #include <atomic>
 
-class simple
-{
+class simple {
   int i;
- public:
+
+public:
   static std::atomic<int> count;
   static std::atomic<int> count1;
-  simple() : i(0) { ++count; ++count1; }
-  explicit simple(int j) : i(j) { ++count; ++count1; }
-  simple(simple const& s) : i(s.i) { ++count; ++count1; }
+  simple() : i(0) {
+    ++count;
+    ++count1;
+  }
+  explicit simple(int j) : i(j) {
+    ++count;
+    ++count1;
+  }
+  simple(simple const& s) : i(s.i) {
+    ++count;
+    ++count1;
+  }
   ~simple() { --count; }
   bool operator==(simple const& o) const { return i == o.i; }
-  bool isSame(simple const& o) const {return &o == this; }
+  bool isSame(simple const& o) const { return &o == this; }
   simple& operator=(simple const& o) {
     simple temp(o);
     std::swap(*this, temp);
@@ -26,19 +35,17 @@ class simple
 std::atomic<int> simple::count{0};
 std::atomic<int> simple::count1{0};
 
-
-int main()
-{
+int main() {
   assert(simple::count == 0);
   {
     edm::value_ptr<simple> a(new simple(10));
     assert(simple::count == 1);
     edm::value_ptr<simple> b(a);
     assert(simple::count == 2);
-    
-    assert(*a==*b);
+
+    assert(*a == *b);
     assert(a->isSame(*b) == false);
-  } // a and b destroyed
+  }  // a and b destroyed
   assert(simple::count == 0);
 
   {
@@ -57,16 +64,14 @@ int main()
     edm::value_ptr<simple> f;
     if (f) {
       assert(0);
-    }
-    else {
+    } else {
     }
     f = std::move(d);
     assert(d.get() == nullptr);
     assert(*e == *f);
     assert(f.operator->() == pd);
     if (f) {
-    }
-    else {
+    } else {
       assert(0);
     }
 
diff --git a/FWCore/Utilities/test/vecarray.cppunit.cpp b/FWCore/Utilities/test/vecarray.cppunit.cpp
index f404ce64a631f..0434e285043b1 100644
--- a/FWCore/Utilities/test/vecarray.cppunit.cpp
+++ b/FWCore/Utilities/test/vecarray.cppunit.cpp
@@ -2,10 +2,11 @@
 
 #include "FWCore/Utilities/interface/VecArray.h"
 
-class testVecArray: public CppUnit::TestFixture {
+class testVecArray : public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(testVecArray);
   CPPUNIT_TEST(test);
   CPPUNIT_TEST_SUITE_END();
+
 public:
   void setUp() {}
   void tearDown() {}
@@ -15,7 +16,6 @@ class testVecArray: public CppUnit::TestFixture {
   void testIterators(T& array);
   template <typename T>
   void testIterator(T iter, T end);
-
 };
 
 ///registration of the test so that the runner can find it
@@ -83,10 +83,10 @@ void testVecArray::test() {
 
   ptr = array.data();
   ptr[1] = 10;
-  iter = array.begin()+1;
+  iter = array.begin() + 1;
   CPPUNIT_ASSERT(*iter == 10);
 
-  iter = array.begin()+2;
+  iter = array.begin() + 2;
   *iter = 50;
   CPPUNIT_ASSERT(array[0] == 1 && array[1] == 10 && array[2] == 50 && array[3] == 4);
 
diff --git a/FWCore/Version/interface/GetFileFormatVersion.h b/FWCore/Version/interface/GetFileFormatVersion.h
index 9b160ac7c0353..95939bc013227 100644
--- a/FWCore/Version/interface/GetFileFormatVersion.h
+++ b/FWCore/Version/interface/GetFileFormatVersion.h
@@ -1,11 +1,10 @@
 #ifndef FWCore_Version_GetFileFormatVersion_h
 #define FWCore_Version_GetFileFormatVersion_h
 
-namespace edm 
-{
+namespace edm {
   // We do not inline this function to help avoid inconsistent
   // versions being inlined into different libraries.
-  
+
   int getFileFormatVersion();
-}
+}  // namespace edm
 #endif
diff --git a/FWCore/Version/src/GetFileFormatVersion.cc b/FWCore/Version/src/GetFileFormatVersion.cc
index d5ea483c913e7..bd4579e303d44 100644
--- a/FWCore/Version/src/GetFileFormatVersion.cc
+++ b/FWCore/Version/src/GetFileFormatVersion.cc
@@ -2,4 +2,4 @@
 
 namespace edm {
   int getFileFormatVersion() { return 20; }
-}
+}  // namespace edm
diff --git a/FWCore/Version/src/GetReleaseVersion.cc b/FWCore/Version/src/GetReleaseVersion.cc
index f0d969787bc90..14b2dfce59852 100644
--- a/FWCore/Version/src/GetReleaseVersion.cc
+++ b/FWCore/Version/src/GetReleaseVersion.cc
@@ -6,6 +6,6 @@
 namespace edm {
   std::string getReleaseVersion() {
     static std::string const releaseVersion(STRINGIFY(PROJECT_VERSION));
-    return releaseVersion; 
+    return releaseVersion;
   }
-}
+}  // namespace edm
diff --git a/FastSimulation/CTPPSFastTrackingProducer/plugins/CTPPSFastTrackingProducer.cc b/FastSimulation/CTPPSFastTrackingProducer/plugins/CTPPSFastTrackingProducer.cc
index da7b646259e3b..c3cba0f6cb32e 100644
--- a/FastSimulation/CTPPSFastTrackingProducer/plugins/CTPPSFastTrackingProducer.cc
+++ b/FastSimulation/CTPPSFastTrackingProducer/plugins/CTPPSFastTrackingProducer.cc
@@ -101,10 +101,6 @@ CTPPSFastTrackingProducer::CTPPSFastTrackingProducer(const edm::ParameterSet& iC
     detToF_F =std::unique_ptr<CTPPSToFDetector>(new CTPPSToFDetector(fToFNCellX,fToFNCellY,vToFCellWidth,fToFCellHeight,fToFPitchX,fToFPitchY,pos_tof,fTimeSigma)); 
     detToF_B =std::unique_ptr<CTPPSToFDetector>(new CTPPSToFDetector(fToFNCellX,fToFNCellY,vToFCellWidth,fToFCellHeight,fToFPitchX,fToFPitchY,pos_tof,fTimeSigma)); 
 //
-    PPSTools::fBeamMomentum=fBeamMomentum;
-    PPSTools::fBeamEnergy=fBeamEnergy;
-    PPSTools::fCrossingAngleBeam1=fCrossingAngleBeam1;
-    PPSTools::fCrossingAngleBeam2=fCrossingAngleBeam2;
 }
 CTPPSFastTrackingProducer::~CTPPSFastTrackingProducer()
 {
@@ -340,9 +336,12 @@ void CTPPSFastTrackingProducer::FastReco(int Direction,H_RecRPObject* station)
                 double  e = sqrt(partP*partP+PPSTools::ProtonMassSQ);
                 TLorentzVector p(px,py,pz,e);
                 // Invert the Lorentz boost made to take into account the crossing angle during simulation
-                if (fCrossAngleCorr) PPSTools::LorentzBoost(p,"MC");
+                if (fCrossAngleCorr) {
+                  PPSTools::LorentzBoost(p,"MC", {fCrossingAngleBeam1,
+                        fCrossingAngleBeam2,fBeamMomentum,fBeamEnergy});
+                }
                 //Getting the Xi and t (squared four momentum transferred) of the reconstructed track
-                PPSTools::Get_t_and_xi(const_cast<TLorentzVector*>(&p),t,xi);
+                PPSTools::Get_t_and_xi(const_cast<TLorentzVector*>(&p),t,xi, {fBeamMomentum,fBeamEnergy});
                 double pxx = p.Px(); double pyy = p.Py(); double pzz = p.Pz();
                 math::XYZVector momentum (pxx,pyy,pzz);
                 math::XYZPoint vertex (x0,y0,0);
diff --git a/FastSimulation/Event/src/FSimVertex.cc b/FastSimulation/Event/src/FSimVertex.cc
index b5aaecff4eeb6..5c43165469fac 100644
--- a/FastSimulation/Event/src/FSimVertex.cc
+++ b/FastSimulation/Event/src/FSimVertex.cc
@@ -10,5 +10,5 @@ FSimVertex::FSimVertex(const XYZTLorentzVector& v, int im, int id, FBaseSimEvent
   position_(v) {;}
 
 std::ostream& operator <<(std::ostream& o , const FSimVertex& t) {
-  return o << t;
+  return o << static_cast<SimVertex const&>(t);
 }
diff --git a/FastSimulation/Muons/plugins/FastTSGFromPropagation.cc b/FastSimulation/Muons/plugins/FastTSGFromPropagation.cc
index 12944a8e2d57a..866cff37f3f65 100644
--- a/FastSimulation/Muons/plugins/FastTSGFromPropagation.cc
+++ b/FastSimulation/Muons/plugins/FastTSGFromPropagation.cc
@@ -371,7 +371,7 @@ void FastTSGFromPropagation::setEvent(const edm::Event& iEvent) {
     trackerGeomChanged = true;
   }
 
-  if ( trackerGeomChanged && (&*theTracker) ) {
+  if ( trackerGeomChanged && theTracker.product() ) {
     theNavigation.reset(new DirectTrackerNavigation(theTracker));
   }
 }
diff --git a/FastSimulation/Muons/plugins/FastTSGFromPropagation.h b/FastSimulation/Muons/plugins/FastTSGFromPropagation.h
index a691e7c18570b..af87b7d0b08b2 100644
--- a/FastSimulation/Muons/plugins/FastTSGFromPropagation.h
+++ b/FastSimulation/Muons/plugins/FastTSGFromPropagation.h
@@ -41,7 +41,7 @@ class Propagator;
 class MeasurementTracker;
 class GeometricSearchTracker;
 class DirectTrackerNavigation;
-class TrajectoryStateTransform;
+struct TrajectoryStateTransform;
 class SimTrack;
 class TrackerGeometry;
 class TrackerTopology;
diff --git a/Fireworks/Calo/plugins/FWCaloClusterProxyBuilder.cc b/Fireworks/Calo/plugins/FWCaloClusterProxyBuilder.cc
index 17ccb78e8671f..f2e032769d44a 100644
--- a/Fireworks/Calo/plugins/FWCaloClusterProxyBuilder.cc
+++ b/Fireworks/Calo/plugins/FWCaloClusterProxyBuilder.cc
@@ -158,33 +158,7 @@ void FWCaloClusterProxyBuilder::build(const reco::CaloCluster &iData, unsigned i
             marker->SetLineWidth(1);
 
             // center of RecHit
-            float center[3] = {
-                corners[0], corners[1], corners[2] + shapes[3] * 0.5f};
-
-            if (isScintillator)
-            {
-               constexpr int offset = 9;
-
-               center[0] = (corners[6] + corners[6 + offset]) / 2;
-               center[1] = (corners[7] + corners[7 + offset]) / 2;
-            }
-            else
-            {
-               float min[2] = {1e3f, 1e3f};
-               float max[2] = {-1e3f, -1e3f};
-
-               for (int i = 0; i < total_points; ++i)
-               {
-                  min[0] = fmin(min[0], corners[i * 3]);
-                  min[1] = fmin(min[1], corners[i * 3 + 1]);
-
-                  max[0] = fmax(max[0], corners[i * 3]);
-                  max[1] = fmax(max[1], corners[i * 3 + 1]);
-               }
-
-               center[0] = (min[0] + max[0]) / 2.0f;
-               center[1] = (min[1] + max[1]) / 2.0f;
-            }
+            const float center[3] = { corners[total_points*3 + 0], corners[total_points*3+ 1], corners[total_points*3 + 2] + shapes[3] * 0.5f };
 
             // draw 3D cross
             const float crossScale = 1.0f + fmin(iData.energy(), 5.0f);
diff --git a/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py b/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py
index 40421834f76d1..bad6eb8d2a1bc 100644
--- a/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py
+++ b/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py
@@ -5,7 +5,7 @@
 from FWCore.Utilities.Enumerate import Enumerate
 from Configuration.Geometry.dict2023Geometry import detectorVersionDict
 
-varType = Enumerate ("Run1 2015 2017 2019 2023 MaPSA")
+varType = Enumerate ("Run1 2015 2017 2021 2023 MaPSA")
 defaultVersion=str();
 
 def help():
@@ -64,13 +64,13 @@ def recoGeoLoad(score):
        process.GlobalTag.globaltag = autoCond['upgrade2017']
        process.load('Configuration.Geometry.GeometryExtended2017Reco_cff')
        
-    elif  score == "2019":
+    elif  score == "2021":
        process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
        from Configuration.AlCa.autoCond import autoCond
-       process.GlobalTag.globaltag = autoCond['upgrade2019']
+       process.GlobalTag.globaltag = autoCond['upgrade2021']
        ## NOTE: There is no PTrackerParameters Rcd in this GT yet
        process.load('Geometry.TrackerGeometryBuilder.trackerParameters_cfi')
-       process.load('Configuration.Geometry.GeometryExtended2019Reco_cff')
+       process.load('Configuration.Geometry.GeometryExtended2021Reco_cff')
        ## NOTE: There are no Muon alignement records in the GT yet
        process.DTGeometryESModule.applyAlignment = cms.bool(False)
        process.CSCGeometryESModule.applyAlignment = cms.bool(False)
diff --git a/Fireworks/Geometry/python/dumpSimGeometry_cfg.py b/Fireworks/Geometry/python/dumpSimGeometry_cfg.py
index 0b615de10f684..b5c8ec9b87fa8 100644
--- a/Fireworks/Geometry/python/dumpSimGeometry_cfg.py
+++ b/Fireworks/Geometry/python/dumpSimGeometry_cfg.py
@@ -5,7 +5,7 @@
 from FWCore.Utilities.Enumerate import Enumerate
 from Configuration.Geometry.dict2023Geometry import detectorVersionDict
 
-varType = Enumerate ("Run1 2015 2015dev 2017 2017Muon 2019 2023")
+varType = Enumerate ("Run1 2015 2015dev 2017 2017Muon 2021 2023")
 defaultVersion=str();
 
 def help():
@@ -46,8 +46,8 @@ def simGeoLoad(score):
     elif score == "2017Muon":
        process.load("Geometry.CMSCommonData.cmsExtendedGeometry2017MuonXML_cfi")
 
-    elif score == "2019":
-       process.load("Geometry.CMSCommonData.cmsExtendedGeometry2019XML_cfi")
+    elif score == "2021":
+       process.load("Geometry.CMSCommonData.cmsExtendedGeometry2021XML_cfi")
 
     elif score == "2023":
        versionCheck(options.version)
diff --git a/Fireworks/Geometry/src/FWRecoGeometryESProducer.cc b/Fireworks/Geometry/src/FWRecoGeometryESProducer.cc
index 349215524d107..4e77073f73d78 100644
--- a/Fireworks/Geometry/src/FWRecoGeometryESProducer.cc
+++ b/Fireworks/Geometry/src/FWRecoGeometryESProducer.cc
@@ -29,6 +29,7 @@
 #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetType.h"
+#include "Geometry/CommonTopologies/interface/PixelTopology.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/CommonTopologies/interface/RectangularStripTopology.h"
 #include "Geometry/CommonTopologies/interface/TrapezoidalStripTopology.h"
@@ -56,33 +57,50 @@ void FWRecoGeometryESProducer::ADD_PIXEL_TOPOLOGY( unsigned int rawid,
    }
 }
 
+using Phase2TrackerGeomDetUnit = PixelGeomDetUnit;
+using Phase2TrackerTopology = PixelTopology;
+
 # define ADD_SISTRIP_TOPOLOGY( rawid, detUnit )			\
   const StripGeomDetUnit* det = dynamic_cast<const StripGeomDetUnit*>( detUnit ); \
-  if( det )                                                     \
+  if( det )							\
   {                                                             \
-    const StripTopology* topo = dynamic_cast<const StripTopology*>( &det->specificTopology() ); \
-    fwRecoGeometry.idToName[rawid].topology[0] = 0;            		    \
-    fwRecoGeometry.idToName[rawid].topology[1] = topo->nstrips();            \
-    fwRecoGeometry.idToName[rawid].topology[2] = topo->stripLength();        \
-    if( const RadialStripTopology* rtop = dynamic_cast<const RadialStripTopology*>( &(det->specificType().specificTopology()) ) ) \
-      {									\
+    if( const StripTopology* topo = dynamic_cast<const StripTopology*>( &det->specificTopology())) \
+    {                                                                   \
+      fwRecoGeometry.idToName[rawid].topology[0] = 0;			\
+      fwRecoGeometry.idToName[rawid].topology[1] = topo->nstrips();	\
+      fwRecoGeometry.idToName[rawid].topology[2] = topo->stripLength();	\
+    } else                                                              \
+    if( const RadialStripTopology* rtop = dynamic_cast<const RadialStripTopology*>( &(det->specificType().specificTopology()))) \
+    {									\
       fwRecoGeometry.idToName[rawid].topology[0] = 1;			\
       fwRecoGeometry.idToName[rawid].topology[3] = rtop->yAxisOrientation(); \
       fwRecoGeometry.idToName[rawid].topology[4] = rtop->originToIntersection(); \
       fwRecoGeometry.idToName[rawid].topology[5] = rtop->phiOfOneEdge(); \
       fwRecoGeometry.idToName[rawid].topology[6] = rtop->angularWidth(); \
     }                                                                   \
-    else if( dynamic_cast<const RectangularStripTopology*>( &(det->specificType().specificTopology()) ) )     \
+    else if( dynamic_cast<const RectangularStripTopology*>( &(det->specificType().specificTopology()))) \
     {                                                                   \
       fwRecoGeometry.idToName[rawid].topology[0] = 2;			\
       fwRecoGeometry.idToName[rawid].topology[3] = topo->pitch();	\
     }									\
-    else if( dynamic_cast<const TrapezoidalStripTopology*>( &(det->specificType().specificTopology()) ) )     \
+    else if( dynamic_cast<const TrapezoidalStripTopology*>( &(det->specificType().specificTopology()))) \
     {                                                                   \
       fwRecoGeometry.idToName[rawid].topology[0] = 3;			\
       fwRecoGeometry.idToName[rawid].topology[3] = topo->pitch();	\
-    }									\
+    }                                                                   \
   }                                                                     \
+  else								        \
+  {                                                                     \
+    const Phase2TrackerGeomDetUnit* det = dynamic_cast<const Phase2TrackerGeomDetUnit*>( detUnit ); \
+    if( det ) 								\
+    {                                                                   \
+      if( const Phase2TrackerTopology *topo = dynamic_cast<const Phase2TrackerTopology *>( &(det->specificTopology())))   \
+      {                                                                   \
+        fwRecoGeometry.idToName[rawid].topology[0] = topo->pitch().first; \
+        fwRecoGeometry.idToName[rawid].topology[1] = topo->pitch().second;\
+      }                                                                   \
+    }                                                                     \
+  }                                                                       \
 
 namespace {
   const std::array<std::string,3> hgcal_geom_names =  { { "HGCalEESensitive",
@@ -565,6 +583,12 @@ FWRecoGeometryESProducer::addCaloGeometry( FWRecoGeometry& fwRecoGeometry )
         fwRecoGeometry.idToName[id].points[i*3+2] = cor[i].z();
       }
 
+      // center
+      auto center = geom->getPosition(*it);
+      fwRecoGeometry.idToName[id].points[(cor.size()-1)*3 + 0] = center.x();
+      fwRecoGeometry.idToName[id].points[(cor.size()-1)*3 + 1] = center.y();
+      fwRecoGeometry.idToName[id].points[(cor.size()-1)*3 + 2] = center.z();
+
       // thickness
       fwRecoGeometry.idToName[id].shape[3] = cor[cor.size()-1].z();
 
diff --git a/Fireworks/Tracks/interface/TrackUtils.h b/Fireworks/Tracks/interface/TrackUtils.h
index 7c5696bb2306b..964bcca01584d 100644
--- a/Fireworks/Tracks/interface/TrackUtils.h
+++ b/Fireworks/Tracks/interface/TrackUtils.h
@@ -67,6 +67,9 @@ TEveTrack* prepareTrack( const reco::Track& track,
 float pixelLocalX( const double mpx, const float* );
 float pixelLocalY( const double mpy, const float* );
 
+float phase2PixelLocalX( const double mpx, const float*, const float* );
+float phase2PixelLocalY( const double mpy, const float*, const float* );
+
 void localSiStrip( short strip, float* localTop, float* localBottom, const float* pars, unsigned int id );
 
 void pushPixelHits( std::vector<TVector3> &pixelPoints, const FWEventItem &iItem, const reco::Track &t );   
diff --git a/Fireworks/Tracks/plugins/FWItemTrackAccessors.cc b/Fireworks/Tracks/plugins/FWItemTrackAccessors.cc
index 5e27d2287fd30..01f96b8471b2b 100644
--- a/Fireworks/Tracks/plugins/FWItemTrackAccessors.cc
+++ b/Fireworks/Tracks/plugins/FWItemTrackAccessors.cc
@@ -19,6 +19,7 @@
 #include "DataFormats/SiStripDigi/interface/SiStripDigi.h"
 #include "DataFormats/SiStripCluster/interface/SiStripCluster.h"
 #include "DataFormats/SiPixelCluster/interface/SiPixelCluster.h"
+#include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h"
 
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
 
@@ -36,5 +37,6 @@ REGISTER_TEMPLATE_FWITEMACCESSOR( FWItemDetSetAccessor<edm::DetSetVector<SiStrip
 REGISTER_TEMPLATE_FWITEMACCESSOR( FWItemDetSetAccessor<edm::DetSetVector<PixelDigi> >, edm::DetSetVector<PixelDigi>, "SiPixelDigiCollectionAccessor" );
 REGISTER_TEMPLATE_FWITEMACCESSOR( FWItemNewDetSetAccessor<edmNew::DetSetVector<SiStripCluster> >, edmNew::DetSetVector<SiStripCluster>, "SiStripClusterCollectionNewAccessor" );
 REGISTER_TEMPLATE_FWITEMACCESSOR( FWItemNewDetSetAccessor<edmNew::DetSetVector<SiPixelCluster> >, edmNew::DetSetVector<SiPixelCluster>, "SiPixelClusterCollectionNewAccessor" );
+REGISTER_TEMPLATE_FWITEMACCESSOR( FWItemNewDetSetAccessor<edmNew::DetSetVector<Phase2TrackerCluster1D> >, edmNew::DetSetVector<Phase2TrackerCluster1D>, "Phase2TrackerCluster1DCollectionNewAccessor" );
 
 REGISTER_FWITEMACCESSOR(BeamSpotSingleAccessor, reco::BeamSpot, "BeamSpotAccessor");
diff --git a/Fireworks/Tracks/plugins/FWPhase2TrackerCluster1DDetProxyBuilder.cc b/Fireworks/Tracks/plugins/FWPhase2TrackerCluster1DDetProxyBuilder.cc
new file mode 100644
index 0000000000000..b5e5f976ffc04
--- /dev/null
+++ b/Fireworks/Tracks/plugins/FWPhase2TrackerCluster1DDetProxyBuilder.cc
@@ -0,0 +1,64 @@
+// -*- C++ -*-
+//
+// Package:     Tracks
+// Class  :     FWPhase2TrackerCluster1DDetProxyBuilder
+//
+//
+
+#include "TEveGeoNode.h"
+
+#include "Fireworks/Core/interface/FWProxyBuilderBase.h"
+#include "Fireworks/Core/interface/FWEventItem.h"
+#include "Fireworks/Core/interface/FWGeometry.h"
+
+#include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h"
+#include "DataFormats/DetId/interface/DetId.h"
+
+class FWPhase2TrackerCluster1DDetProxyBuilder : public FWProxyBuilderBase
+{
+public:
+  FWPhase2TrackerCluster1DDetProxyBuilder() {}
+  ~FWPhase2TrackerCluster1DDetProxyBuilder() override {}
+  
+  REGISTER_PROXYBUILDER_METHODS();
+
+private:
+  using FWProxyBuilderBase::build;
+  void build(const FWEventItem* iItem, TEveElementList* product, const FWViewContext*) override;
+  FWPhase2TrackerCluster1DDetProxyBuilder(const FWPhase2TrackerCluster1DDetProxyBuilder&) = delete;
+  const FWPhase2TrackerCluster1DDetProxyBuilder& operator=(const FWPhase2TrackerCluster1DDetProxyBuilder&) = delete;
+};
+
+void FWPhase2TrackerCluster1DDetProxyBuilder::build( const FWEventItem* iItem, TEveElementList* product , const FWViewContext*)
+{
+  const Phase2TrackerCluster1DCollectionNew* pixels = nullptr;
+  
+  iItem->get(pixels);
+  
+  if( ! pixels ) 
+    return;
+  
+  const FWGeometry* geom = iItem->getGeom();
+  
+  for( Phase2TrackerCluster1DCollectionNew::const_iterator set = pixels->begin(), setEnd = pixels->end();
+       set != setEnd; ++set) {
+    unsigned int id = set->detId();
+    DetId detid(id);
+    
+    if( geom->contains( detid )) {
+      const edmNew::DetSet<Phase2TrackerCluster1D> & clusters = *set;
+	
+      for( edmNew::DetSet<Phase2TrackerCluster1D>::const_iterator itc = clusters.begin(), edc = clusters.end(); 
+           itc != edc; ++itc ) {
+        TEveGeoShape* shape = geom->getEveShape(detid);
+	
+        if ( shape ) {
+          shape->SetMainTransparency(50);
+          setupAddElement(shape, product);
+        }
+      }
+    }
+  }
+}
+
+REGISTER_FWPROXYBUILDER( FWPhase2TrackerCluster1DDetProxyBuilder, Phase2TrackerCluster1DCollectionNew, "Phase2TrackerCluster1DDets", FWViewType::kAll3DBits | FWViewType::kAllRPZBits );
diff --git a/Fireworks/Tracks/plugins/FWPhase2TrackerCluster1DProxyBuilder.cc b/Fireworks/Tracks/plugins/FWPhase2TrackerCluster1DProxyBuilder.cc
new file mode 100644
index 0000000000000..edea40b34c95d
--- /dev/null
+++ b/Fireworks/Tracks/plugins/FWPhase2TrackerCluster1DProxyBuilder.cc
@@ -0,0 +1,89 @@
+
+// -*- C++ -*-
+//
+// Package:     Tracks
+// Class  :     FWPhase2TrackerCluster1DProxyBuilder
+//
+//
+
+#include "TEvePointSet.h"
+#include "TEveStraightLineSet.h"
+#include "TEveCompound.h"
+#include "TEveBox.h"
+#include "Fireworks/Core/interface/FWProxyBuilderBase.h"
+#include "Fireworks/Core/interface/FWEventItem.h"
+#include "Fireworks/Core/interface/FWGeometry.h"
+#include "Fireworks/Core/interface/fwLog.h"
+#include "Fireworks/Tracks/interface/TrackUtils.h"
+
+#include "DataFormats/Phase2TrackerCluster/interface/Phase2TrackerCluster1D.h"
+
+class FWPhase2TrackerCluster1DProxyBuilder : public FWProxyBuilderBase
+{
+public:
+  FWPhase2TrackerCluster1DProxyBuilder( void ) {}
+  ~FWPhase2TrackerCluster1DProxyBuilder( void ) override {}
+
+  REGISTER_PROXYBUILDER_METHODS();
+
+  FWPhase2TrackerCluster1DProxyBuilder( const FWPhase2TrackerCluster1DProxyBuilder& ) = delete;
+  const FWPhase2TrackerCluster1DProxyBuilder& operator=( const FWPhase2TrackerCluster1DProxyBuilder& ) = delete;
+
+private:
+  using FWProxyBuilderBase::build;
+  void build( const FWEventItem* iItem, TEveElementList* product, const FWViewContext* ) override;
+};
+
+void
+FWPhase2TrackerCluster1DProxyBuilder::build( const FWEventItem* iItem, TEveElementList* product , const FWViewContext* )
+{
+  const Phase2TrackerCluster1DCollectionNew* pixels = nullptr;
+  
+  iItem->get( pixels );
+  
+  if( ! pixels ) {    
+    fwLog( fwlog::kWarning ) << "failed get SiPixelDigis" << std::endl;
+    return;
+  }
+
+  for( Phase2TrackerCluster1DCollectionNew::const_iterator set = pixels->begin(), setEnd = pixels->end();
+       set != setEnd; ++set ) {    
+    unsigned int id = set->detId();
+    
+    const FWGeometry *geom = iItem->getGeom();
+    const float* pars = geom->getParameters( id );
+    const float* shape = geom->getShapePars( id );
+
+    const edmNew::DetSet<Phase2TrackerCluster1D> & clusters = *set;
+      
+    for( edmNew::DetSet<Phase2TrackerCluster1D>::const_iterator itc = clusters.begin(), edc = clusters.end(); 
+	 itc != edc; ++itc ) {
+      TEveElement* itemHolder = createCompound();
+      product->AddElement(itemHolder);
+      
+      TEvePointSet* pointSet = new TEvePointSet;
+      
+      if( ! geom->contains( id )) {
+	fwLog( fwlog::kWarning ) 
+	  << "failed get geometry of Phase2TrackerCluster1D with detid: "
+	  << id << std::endl;
+	continue;
+      }
+      
+      float localPoint[3] = {     
+	fireworks::phase2PixelLocalX(( *itc ).center(), pars, shape ),
+	fireworks::phase2PixelLocalY(( *itc ).column(), pars, shape ),
+	0.0
+      };
+
+      float globalPoint[3];
+      geom->localToGlobal( id, localPoint, globalPoint );
+      
+      pointSet->SetNextPoint( globalPoint[0], globalPoint[1], globalPoint[2] );
+      
+      setupAddElement( pointSet, itemHolder );
+    }
+  }    
+}
+
+REGISTER_FWPROXYBUILDER( FWPhase2TrackerCluster1DProxyBuilder, Phase2TrackerCluster1DCollectionNew, "Phase2TrackerCluster1D", FWViewType::kAll3DBits | FWViewType::kAllRPZBits );
diff --git a/Fireworks/Tracks/src/TrackUtils.cc b/Fireworks/Tracks/src/TrackUtils.cc
index f9331b482da5b..16dcaa7a90357 100644
--- a/Fireworks/Tracks/src/TrackUtils.cc
+++ b/Fireworks/Tracks/src/TrackUtils.cc
@@ -256,6 +256,22 @@ pixelLocalY( const double mpy, const float* par )
   return lpY;
 }
 
+// Transform measurement to local coordinates in X dimension
+float
+phase2PixelLocalX( const double mpx, const float* par, const float* shape )
+{
+  // The final position in local coordinates
+  return (-shape[1] + mpx * par[0]);
+}
+
+// Transform measurement to local coordinates in Y dimension
+float
+phase2PixelLocalY( const double mpy, const float* par, const float* shape )
+{
+  // The final position in local coordinates
+  return (-shape[2] + mpy * par[1]);
+}
+
 //
 // Returns strip geometry in local coordinates of a detunit.
 // The strip is a line from a localTop to a localBottom point.
diff --git a/GeneratorInterface/EvtGenInterface/BuildFile.xml b/GeneratorInterface/EvtGenInterface/BuildFile.xml
index 55214e8757d09..06e578d58cde3 100644
--- a/GeneratorInterface/EvtGenInterface/BuildFile.xml
+++ b/GeneratorInterface/EvtGenInterface/BuildFile.xml
@@ -4,6 +4,7 @@
 <use name="hepmc"/>
 <use name="clhep"/>
 <use name="heppdt"/>
+<use name="evtgen"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/GeneratorInterface/EvtGenInterface/interface/EvtGenLHCInterface.h b/GeneratorInterface/EvtGenInterface/interface/EvtGenLHCInterface.h
deleted file mode 100644
index 09bffa58610db..0000000000000
--- a/GeneratorInterface/EvtGenInterface/interface/EvtGenLHCInterface.h
+++ /dev/null
@@ -1,99 +0,0 @@
-#ifndef gen_EvtGenLHCInterface_h
-#define gen_EvtGenLHCInterface_h
-
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include <memory>
-#include <string>
-
-// user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
-
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-
-#include "EvtGen/EvtGen.hh"     
-#include "EvtGenBase/EvtId.hh"
-#include "EvtGenBase/EvtPDL.hh"
-#include "EvtGenBase/EvtDecayTable.hh"
-#include "EvtGenBase/EvtSpinType.hh"
-#include "EvtGenBase/EvtVector4R.hh"
-#include "EvtGenBase/EvtParticle.hh"
-#include "EvtGenBase/EvtScalarParticle.hh"
-#include "EvtGenBase/EvtStringParticle.hh"
-#include "EvtGenBase/EvtDiracParticle.hh"
-#include "EvtGenBase/EvtVectorParticle.hh"
-#include "EvtGenBase/EvtRaritaSchwingerParticle.hh"
-#include "EvtGenBase/EvtTensorParticle.hh"
-#include "EvtGenBase/EvtHighSpinParticle.hh"
-#include "EvtGenBase/EvtStdHep.hh"
-#include "EvtGenBase/EvtSecondary.hh"
-#include "EvtGenModels/EvtPythia.hh"
-#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
-#include "GeneratorInterface/EvtGenInterface/interface/EvtGenInterfaceBase.h"
-
-class myEvtRandomEngine;
-
-
-namespace HepMC {
-  class GenParticle;
-  class GenEvent;
-}
-
-namespace gen {
-   class Pythia6Service;
-
-   class EvtGenLHCInterface : public EvtGenInterfaceBase {
-     public:
-     
-      // ctor & dtor
-      EvtGenLHCInterface( const edm::ParameterSet& );
-      ~EvtGenLHCInterface();
-
-      void init();
-      const std::vector<int>& operatesOnParticles() { return m_PDGs; }      
-      HepMC::GenEvent* decay( HepMC::GenEvent* );
-      void addToHepMC(HepMC::GenParticle* partHep, EvtId idEvt, HepMC::GenEvent* theEvent, bool del_daug);
-      void go_through_daughters(EvtParticle* part);
-      void update_candlist( int theIndex, HepMC::GenParticle *thePart );
-      void setRandomEngine(CLHEP::HepRandomEngine* v);
-      static double flat();
-
-      // from Pythia
-      // void call_pygive(const std::string& iParm );
-
-      private:
-      
-      Pythia6Service* m_Py6Service;
-            
-      EvtGen *m_EvtGen;
-      std::vector<EvtId> forced_Evt;     // EvtId's of particles with forced decay
-      std::vector<int> forced_Hep;       // HepId's of particles with forced decay
-      int nforced;                       // number of particles with forced decay
-      int ntotal, npartial, nevent;      // generic counters
-      
-      int nPythia;
-      bool usePythia;
-      // std::vector<std::string> pythia_params;  // Pythia stuff
-
-      // Adding parameters for polarization of spin-1/2 particles
-      std::vector<int> polarize_ids;
-      std::vector<double> polarize_pol;
-      std::map<int, float> polarizations;
-      
-      int nlist; 
-      HepMC::GenParticle *listp[10]; 
-      int index[10];                     // list of candidates to be forced
-
-      myEvtRandomEngine* the_engine;
-
-      bool useDefault;
-      std::string decay_table_s;
-      std::string pdt_s;
-      std::string user_decay_s;
-      std::vector<std::string> forced_names;
-
-      static CLHEP::HepRandomEngine* fRandomEngine;
-   };
-}
-#endif
diff --git a/GeneratorInterface/GenFilters/src/HeavyQuarkFromMPIFilterAlgo.cc b/GeneratorInterface/GenFilters/src/HeavyQuarkFromMPIFilterAlgo.cc
index 460b9ee8ed6af..6de74798cf47e 100644
--- a/GeneratorInterface/GenFilters/src/HeavyQuarkFromMPIFilterAlgo.cc
+++ b/GeneratorInterface/GenFilters/src/HeavyQuarkFromMPIFilterAlgo.cc
@@ -38,9 +38,9 @@ bool HeavyQuarkFromMPIFilterAlgo::filter(const edm::Event& iEvent)  {
 //		cout<<"Note: it has "<<mothers.size()<<" mothers"<<endl;
 		for( reco::GenParticleRefVector::const_iterator im = mothers.begin(); im!=mothers.end(); ++im) {
 			const reco::GenParticle& part = **im;
-//			cout<<"--->Going to a mother, having eta="<<part.eta()<<endl;
+//                      cout<<"--->Going to a mother, having eta="<<part.eta()<<endl;
 			if( hasMPIAncestor( &part) ){
-//				cout<<"------>Found one ancestor with status of 3X (eta="<<gp.eta()<<")==>fromMPI=true"<<endl;
+//                              cout<<"------>Found one ancestor with status of 3X (eta="<<gp.eta()<<")==>fromMPI=true"<<endl;
 				fromMPI=true;
 			}
 		} 
diff --git a/GeneratorInterface/GenFilters/test/test_doubleEMEnrichingHepMCfilter.py b/GeneratorInterface/GenFilters/test/test_doubleEMEnrichingHepMCfilter.py
index 9249df25c8a6c..cb3cf7457ca89 100644
--- a/GeneratorInterface/GenFilters/test/test_doubleEMEnrichingHepMCfilter.py
+++ b/GeneratorInterface/GenFilters/test/test_doubleEMEnrichingHepMCfilter.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('GEN2',eras.Run2_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process('GEN2',Run2_2017)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/GeneratorInterface/Herwig7Interface/test/Herwig7Test_ConfigFile_GEN_SIM.py b/GeneratorInterface/Herwig7Interface/test/Herwig7Test_ConfigFile_GEN_SIM.py
index e54b72ce4e520..592305537463c 100644
--- a/GeneratorInterface/Herwig7Interface/test/Herwig7Test_ConfigFile_GEN_SIM.py
+++ b/GeneratorInterface/Herwig7Interface/test/Herwig7Test_ConfigFile_GEN_SIM.py
@@ -5,9 +5,9 @@
 # with command line options: GeneratorInterface/Herwig7Interface/python/Herwig7_Dummy_ConfigFile_cff.py --fileout file:Herwigpp_ConfigFile_GEN_SIM.root --mc --eventcontent RAWSIM --datatier GEN-SIM --conditions auto:run2_mc --beamspot Realistic25ns13TeVEarly2017Collision --step GEN,SIM --nThreads 8 --geometry DB:Extended --era Run2_2017 --python_filename Herwig7Test_ConfigFile_GEN_SIM.py --no_exec --customise Configuration/DataProcessing/Utils.addMonitoring -n 100
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('SIM',eras.Run2_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process('SIM',Run2_2017)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/GeneratorInterface/Herwig7Interface/test/Herwig7_Matchbox_90X_ppToee_GEN_SIM.py b/GeneratorInterface/Herwig7Interface/test/Herwig7_Matchbox_90X_ppToee_GEN_SIM.py
index 215eb469d3a09..18816ed52eaf4 100644
--- a/GeneratorInterface/Herwig7Interface/test/Herwig7_Matchbox_90X_ppToee_GEN_SIM.py
+++ b/GeneratorInterface/Herwig7Interface/test/Herwig7_Matchbox_90X_ppToee_GEN_SIM.py
@@ -5,9 +5,9 @@
 # with command line options: GeneratorInterface/Herwig7Interface/python/Herwig7_Dummy_Matchbox_90X_ppToee.py --fileout file:Matchbox_90X_ppToee.root --mc --eventcontent RAWSIM --datatier GEN-SIM --conditions auto:run2_mc --beamspot Realistic25ns13TeVEarly2017Collision --step GEN,SIM --nThreads 1 --geometry DB:Extended --era Run2_2017 --python_filename Herwig7_Matchbox_90X_ppToee_GEN_SIM.py --no_exec --customise Configuration/DataProcessing/Utils.addMonitoring -n 5
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('SIM',eras.Run2_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process('SIM',Run2_2017)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/GeneratorInterface/Hydjet2Interface/src/EquationSolver.icc b/GeneratorInterface/Hydjet2Interface/src/EquationSolver.icc
index dd02c8f01511d..892a0231a4ed4 100644
--- a/GeneratorInterface/Hydjet2Interface/src/EquationSolver.icc
+++ b/GeneratorInterface/Hydjet2Interface/src/EquationSolver.icc
@@ -1,5 +1,5 @@
-/*                                                                            
-                                                                            
+/*
+
         Nikolai Amelin, Ludmila Malinina, Timur Pocheptsov (C) JINR/Dubna
       amelin@sunhe.jinr.ru, malinina@sunhe.jinr.ru, pocheptsov@sunhe.jinr.ru 
                            November. 2, 2006                                
diff --git a/GeneratorInterface/Pythia8Interface/interface/RandomP8.h b/GeneratorInterface/Pythia8Interface/interface/RandomP8.h
deleted file mode 100644
index 6138ee43887fb..0000000000000
--- a/GeneratorInterface/Pythia8Interface/interface/RandomP8.h
+++ /dev/null
@@ -1 +0,0 @@
-#error RandomP8.h is an obsolete header, should not be used anymore
diff --git a/GeneratorInterface/ReggeGribovPartonMCInterface/src/LzmaDec.h b/GeneratorInterface/ReggeGribovPartonMCInterface/src/LzmaDec.h
index 6741a644b6076..c13687f671fb1 100755
--- a/GeneratorInterface/ReggeGribovPartonMCInterface/src/LzmaDec.h
+++ b/GeneratorInterface/ReggeGribovPartonMCInterface/src/LzmaDec.h
@@ -159,7 +159,7 @@ void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
 */
 
 /* LzmaDec_DecodeToDic
-   
+
    The decoding to internal dictionary buffer (CLzmaDec::dic).
    You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
 
diff --git a/GeneratorInterface/RivetInterface/interface/RivetAnalysis.h b/GeneratorInterface/RivetInterface/interface/RivetAnalysis.h
index 513c81b6e31c8..76823abb7b3cc 100644
--- a/GeneratorInterface/RivetInterface/interface/RivetAnalysis.h
+++ b/GeneratorInterface/RivetInterface/interface/RivetAnalysis.h
@@ -23,7 +23,7 @@ namespace Rivet {
   class RivetAnalysis : public Analysis {
 
     public:
-      std::vector<DressedLepton> leptons() const {return _leptons;}
+      ParticleVector leptons() const {return _leptons;}
       ParticleVector photons() const {return _photons;}
       ParticleVector neutrinos() const {return _neutrinos;}
       Jets jets() const {return _jets;}
@@ -40,8 +40,7 @@ namespace Rivet {
       double _jetConeSize, _jetMinPt, _jetMaxEta;
       double _fatJetConeSize, _fatJetMinPt, _fatJetMaxEta;
       
-      std::vector<DressedLepton> _leptons;
-      ParticleVector _photons, _neutrinos;
+      ParticleVector _leptons, _photons, _neutrinos;
       Jets _jets, _fatjets;
       Vector3 _met;
 
@@ -85,6 +84,7 @@ namespace Rivet {
         PromptFinalState prompt_leptons(charged_leptons);
         prompt_leptons.acceptMuonDecays(true);
         prompt_leptons.acceptTauDecays(true);
+        addProjection(prompt_leptons, "PromptLeptons");
         
         PromptFinalState prompt_photons(photons);
         prompt_photons.acceptMuonDecays(true);
@@ -151,7 +151,24 @@ namespace Rivet {
         Cut jet_cut    = (Cuts::abseta < _jetMaxEta)    and (Cuts::pT > _jetMinPt*GeV);
         Cut fatjet_cut = (Cuts::abseta < _fatJetMaxEta) and (Cuts::pT > _fatJetMinPt*GeV);
         
-        _leptons   = applyProjection<DressedLeptons>(event, "DressedLeptons").dressedLeptons();
+        _leptons   = applyProjection<DressedLeptons>(event, "DressedLeptons").particlesByPt();
+        // search tau ancestors
+        Particles promptleptons = applyProjection<PromptFinalState>(event, "PromptLeptons").particles();
+        for ( auto & lepton : _leptons ) {
+          const auto & cl = lepton.constituents().front(); // this has no ancestors anymore :(
+          for ( auto const & pl : promptleptons ) {
+            if (cl.momentum() == pl.momentum()) {
+              for ( auto & p : pl.ancestors()) {
+                if (p.abspid() == 15) {
+                  p.setMomentum(p.momentum()*10e-20);
+                  lepton.addConstituent(p, false);
+                }
+              }
+              break;
+            }
+          }
+        }
+        
         _jets      = applyProjection<FastJets>(event, "Jets").jetsByPt(jet_cut);
         _fatjets   = applyProjection<FastJets>(event, "FatJets").jetsByPt(fatjet_cut);
         _photons   = applyProjection<FinalState>(event, "Photons").particlesByPt();
diff --git a/GeneratorInterface/RivetInterface/interface/RivetAnalyzer.h b/GeneratorInterface/RivetInterface/interface/RivetAnalyzer.h
index 4388192b2e07a..c1b38af6079b2 100644
--- a/GeneratorInterface/RivetInterface/interface/RivetAnalyzer.h
+++ b/GeneratorInterface/RivetInterface/interface/RivetAnalyzer.h
@@ -1,7 +1,7 @@
 #ifndef GeneratorInterface_RivetInterface_RivetAnalyzer
 #define GeneratorInterface_RivetInterface_RivetAnalyzer
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "Rivet/AnalysisHandler.hh"
 
 //DQM services
@@ -18,10 +18,9 @@
 #include <vector>
 #include <string>
 
-class RivetAnalyzer : public edm::EDAnalyzer
-{
-  public:
-  RivetAnalyzer(const edm::ParameterSet&);
+class RivetAnalyzer : public edm::one::EDAnalyzer<edm::one::WatchRuns, edm::one::SharedResources> {
+public:
+  RivetAnalyzer(const edm::ParameterSet &);
 
   ~RivetAnalyzer() override;
 
@@ -29,36 +28,34 @@ class RivetAnalyzer : public edm::EDAnalyzer
 
   void endJob() override;
 
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
-  void beginRun(const edm::Run&, const edm::EventSetup&) override;
+  void beginRun(const edm::Run &, const edm::EventSetup &) override;
 
-  void endRun(const edm::Run&, const edm::EventSetup&) override;
-  
-  private:
+  void endRun(const edm::Run &, const edm::EventSetup &) override;
 
+private:
   void normalizeTree();
 
   edm::EDGetTokenT<edm::HepMCProduct> _hepmcCollection;
-  bool                     _useExternalWeight;
-  bool                     _useLHEweights;
-  int                      _LHEweightNumber;
-  bool                     _useGENweights;
-  int                      _GENweightNumber;
+  bool _useExternalWeight;
+  bool _useLHEweights;
+  int _LHEweightNumber;
+  bool _useGENweights;
+  int _GENweightNumber;
   edm::EDGetTokenT<LHEEventProduct> _LHECollection;
   edm::EDGetTokenT<GenEventInfoProduct> _genEventInfoCollection;
-  Rivet::AnalysisHandler   _analysisHandler;   
-  bool                     _isFirstEvent;
-  std::string              _outFileName;
-  bool                     _doFinalize;
-  bool                     _produceDQM;
-  double                   _xsection;     
+  Rivet::AnalysisHandler _analysisHandler;
+  bool _isFirstEvent;
+  std::string _outFileName;
+  bool _doFinalize;
+  bool _produceDQM;
+  double _xsection;
 
   DQMStore *dbe;
   std::vector<MonitorElement *> _mes;
 };
 
-
 /*
 template<class YODATYPE, class ROOTTYPE> 
 ROOTTYPE* 
diff --git a/GeneratorInterface/RivetInterface/plugins/HTXSRivetProducer.cc b/GeneratorInterface/RivetInterface/plugins/HTXSRivetProducer.cc
index 2f0788da0b622..b208f4769e215 100644
--- a/GeneratorInterface/RivetInterface/plugins/HTXSRivetProducer.cc
+++ b/GeneratorInterface/RivetInterface/plugins/HTXSRivetProducer.cc
@@ -23,224 +23,224 @@
 #include <cstdio>
 #include <cstring>
 
-
 using namespace Rivet;
 using namespace edm;
 using namespace std;
 
-class HTXSRivetProducer : public edm::one::EDProducer<edm::one::WatchRuns> {
+class HTXSRivetProducer : public edm::one::EDProducer<edm::one::WatchRuns, edm::one::SharedResources> {
 public:
-    
-    explicit HTXSRivetProducer(const edm::ParameterSet& cfg) : 
-        _hepmcCollection(consumes<HepMCProduct>(cfg.getParameter<edm::InputTag>("HepMCCollection"))),
-        _lheRunInfo(consumes<LHERunInfoProduct,edm::InRun>(cfg.getParameter<edm::InputTag>("LHERunInfo")))
-    {
-        _HTXS = new Rivet::HiggsTemplateCrossSections();
-        
-        _isFirstEvent = true;
-        _prodMode = cfg.getParameter<string>("ProductionMode");
-        m_HiggsProdMode = HTXS::UNKNOWN;
-        
-        produces<HTXS::HiggsClassification>("HiggsClassification").setBranchAlias("HiggsClassification");
+  explicit HTXSRivetProducer(const edm::ParameterSet& cfg)
+      : _hepmcCollection(consumes<HepMCProduct>(cfg.getParameter<edm::InputTag>("HepMCCollection"))),
+        _lheRunInfo(consumes<LHERunInfoProduct, edm::InRun>(cfg.getParameter<edm::InputTag>("LHERunInfo"))) {
+    usesResource("Rivet");
+
+    _HTXS = new Rivet::HiggsTemplateCrossSections();
+
+    _isFirstEvent = true;
+    _prodMode = cfg.getParameter<string>("ProductionMode");
+    m_HiggsProdMode = HTXS::UNKNOWN;
+
+    produces<HTXS::HiggsClassification>("HiggsClassification").setBranchAlias("HiggsClassification");
+  }
 
-    }
-    
 private:
-    
-    void produce( edm::Event&, const edm::EventSetup&) override;
-    
-    void beginRun(edm::Run const& iRun, edm::EventSetup const& es) override ;
-    void endRun(edm::Run const& iRun, edm::EventSetup const& es) override ;
-    
-    edm::EDGetTokenT<edm::HepMCProduct> _hepmcCollection;
-    edm::EDGetTokenT<LHERunInfoProduct> _lheRunInfo;
-    
-    Rivet::AnalysisHandler _analysisHandler;
-    Rivet::HiggsTemplateCrossSections* _HTXS;
-    
-    bool _isFirstEvent;
-    std::string _prodMode;
-    HTXS::HiggsProdMode m_HiggsProdMode;
-    
-    HTXS::HiggsClassification cat_;
-    
+  void produce(edm::Event&, const edm::EventSetup&) override;
+
+  void beginRun(edm::Run const& iRun, edm::EventSetup const& es) override;
+  void endRun(edm::Run const& iRun, edm::EventSetup const& es) override;
+
+  edm::EDGetTokenT<edm::HepMCProduct> _hepmcCollection;
+  edm::EDGetTokenT<LHERunInfoProduct> _lheRunInfo;
+
+  Rivet::AnalysisHandler _analysisHandler;
+  Rivet::HiggsTemplateCrossSections* _HTXS;
+
+  bool _isFirstEvent;
+  std::string _prodMode;
+  HTXS::HiggsProdMode m_HiggsProdMode;
+
+  HTXS::HiggsClassification cat_;
 };
 
-void HTXSRivetProducer::produce( edm::Event & iEvent, const edm::EventSetup & ) {
-    
-    //get the hepmc product from the event
-    edm::Handle<HepMCProduct> evt;
-
-    bool product_exists = iEvent.getByToken(_hepmcCollection, evt);
-    if( product_exists ){
-    
-      // get HepMC GenEvent
-      const HepMC::GenEvent *myGenEvent = evt->GetEvent();
-      
-      if (_prodMode == "AUTO") {
-          
-          // for these prod modes, don't change what is set in BeginRun
-          if (m_HiggsProdMode != HTXS::GGF && m_HiggsProdMode != HTXS::VBF && m_HiggsProdMode != HTXS::GG2ZH) {
-              
-              unsigned nWs = 0;
-              unsigned nZs = 0;
-              unsigned nTs = 0;
-              unsigned nBs = 0;
-              unsigned nHs = 0;
-              
-              HepMC::GenVertex *HSvtx = myGenEvent->signal_process_vertex();
-              
-              if(HSvtx){
-                for (auto ptcl:particles(HSvtx,HepMC::children)) {
-                    if (std::abs(ptcl->pdg_id()) == 24) ++nWs;
-                    if (ptcl->pdg_id() == 23) ++nZs;
-                    if (abs(ptcl->pdg_id()) == 6) ++nTs;
-                    if (abs(ptcl->pdg_id()) == 5) ++nBs;
-                    if (ptcl->pdg_id() == 25) ++nHs;
-                }
-              }
-                          
-              if (nZs==1 && nHs==1 && (nWs+nTs)==0) {
-                  m_HiggsProdMode = HTXS::QQ2ZH;
-              } else if (nWs==1 && nHs==1 && (nZs+nTs)==0) {
-                  m_HiggsProdMode = HTXS::WH; 
-              } else if (nTs==2 && nHs==1 && nZs==0) {
-                  m_HiggsProdMode = HTXS::TTH; 
-              } else if (nTs==1 && nHs==1 && nZs==0) {
-                  m_HiggsProdMode = HTXS::TH; 
-              } else if (nBs==2 && nHs==1 && nZs==0) {
-                  m_HiggsProdMode = HTXS::BBH; 
-              }
-              
-              _HTXS->setHiggsProdMode(m_HiggsProdMode);
-              
-          }
-      }
-      
-
-      if (_isFirstEvent){
-
-	_analysisHandler.addAnalysis(_HTXS);
-
-          // set the production mode if not done already
-          if      ( _prodMode == "GGF"   ) m_HiggsProdMode = HTXS::GGF;
-          else if ( _prodMode == "VBF"   ) m_HiggsProdMode = HTXS::VBF;
-          else if ( _prodMode == "WH"    ) m_HiggsProdMode = HTXS::WH;
-          else if ( _prodMode == "ZH"    ) m_HiggsProdMode = HTXS::QQ2ZH;
-          else if ( _prodMode == "QQ2ZH" ) m_HiggsProdMode = HTXS::QQ2ZH;
-          else if ( _prodMode == "GG2ZH" ) m_HiggsProdMode = HTXS::GG2ZH;
-          else if ( _prodMode == "TTH"   ) m_HiggsProdMode = HTXS::TTH;
-          else if ( _prodMode == "BBH"   ) m_HiggsProdMode = HTXS::BBH;
-          else if ( _prodMode == "TH"    ) m_HiggsProdMode = HTXS::TH;
-          else if ( _prodMode == "AUTO"  ) {
-              edm::LogInfo ("HTXSRivetProducer") <<"Using AUTO for HiggsProdMode, found it to be: "<<m_HiggsProdMode<< "\n";
-              edm::LogInfo ("HTXSRivetProducer") <<"(UNKNOWN=0, GGF=1, VBF=2, WH=3, QQ2ZH=4, GG2ZH=5, TTH=6, BBH=7, TH=8)"<<endl;
-          } else {
-              throw cms::Exception("HTXSRivetProducer") << "ProductionMode must be one of: GGF,VBF,WH,ZH,QQ2ZH,GG2ZH,TTH,BBH,TH,AUTO " ; 
+void HTXSRivetProducer::produce(edm::Event& iEvent, const edm::EventSetup&) {
+  //get the hepmc product from the event
+  edm::Handle<HepMCProduct> evt;
+
+  bool product_exists = iEvent.getByToken(_hepmcCollection, evt);
+  if (product_exists) {
+    // get HepMC GenEvent
+    const HepMC::GenEvent* myGenEvent = evt->GetEvent();
+
+    if (_prodMode == "AUTO") {
+      // for these prod modes, don't change what is set in BeginRun
+      if (m_HiggsProdMode != HTXS::GGF && m_HiggsProdMode != HTXS::VBF && m_HiggsProdMode != HTXS::GG2ZH) {
+        unsigned nWs = 0;
+        unsigned nZs = 0;
+        unsigned nTs = 0;
+        unsigned nBs = 0;
+        unsigned nHs = 0;
+
+        HepMC::GenVertex* HSvtx = myGenEvent->signal_process_vertex();
+
+        if (HSvtx) {
+          for (auto ptcl : particles(HSvtx, HepMC::children)) {
+            if (std::abs(ptcl->pdg_id()) == 24)
+              ++nWs;
+            if (ptcl->pdg_id() == 23)
+              ++nZs;
+            if (abs(ptcl->pdg_id()) == 6)
+              ++nTs;
+            if (abs(ptcl->pdg_id()) == 5)
+              ++nBs;
+            if (ptcl->pdg_id() == 25)
+              ++nHs;
           }
-          _HTXS->setHiggsProdMode(m_HiggsProdMode);
-
-          // at this point the production mode must be known
-          if (m_HiggsProdMode == HTXS::UNKNOWN) {
-              edm::LogInfo ("HTXSRivetProducer") << "HTXSRivetProducer WARNING: HiggsProduction mode is UNKNOWN" << endl;
-          }            
+        }
 
-          // initialize rivet analysis
-          _analysisHandler.init(*myGenEvent);
-          _isFirstEvent = false;
+        if (nZs == 1 && nHs == 1 && (nWs + nTs) == 0) {
+          m_HiggsProdMode = HTXS::QQ2ZH;
+        } else if (nWs == 1 && nHs == 1 && (nZs + nTs) == 0) {
+          m_HiggsProdMode = HTXS::WH;
+        } else if (nTs == 2 && nHs == 1 && nZs == 0) {
+          m_HiggsProdMode = HTXS::TTH;
+        } else if (nTs == 1 && nHs == 1 && nZs == 0) {
+          m_HiggsProdMode = HTXS::TH;
+        } else if (nBs == 2 && nHs == 1 && nZs == 0) {
+          m_HiggsProdMode = HTXS::BBH;
+        }
 
+        _HTXS->setHiggsProdMode(m_HiggsProdMode);
       }
+    }
 
-      // classify the event
-      Rivet::HiggsClassification rivet_cat = _HTXS->classifyEvent(*myGenEvent,m_HiggsProdMode);
-      cat_ = HTXS::Rivet2Root(rivet_cat);
+    if (_isFirstEvent) {
+      _analysisHandler.addAnalysis(_HTXS);
+
+      // set the production mode if not done already
+      if (_prodMode == "GGF")
+        m_HiggsProdMode = HTXS::GGF;
+      else if (_prodMode == "VBF")
+        m_HiggsProdMode = HTXS::VBF;
+      else if (_prodMode == "WH")
+        m_HiggsProdMode = HTXS::WH;
+      else if (_prodMode == "ZH")
+        m_HiggsProdMode = HTXS::QQ2ZH;
+      else if (_prodMode == "QQ2ZH")
+        m_HiggsProdMode = HTXS::QQ2ZH;
+      else if (_prodMode == "GG2ZH")
+        m_HiggsProdMode = HTXS::GG2ZH;
+      else if (_prodMode == "TTH")
+        m_HiggsProdMode = HTXS::TTH;
+      else if (_prodMode == "BBH")
+        m_HiggsProdMode = HTXS::BBH;
+      else if (_prodMode == "TH")
+        m_HiggsProdMode = HTXS::TH;
+      else if (_prodMode == "AUTO") {
+        edm::LogInfo("HTXSRivetProducer")
+            << "Using AUTO for HiggsProdMode, found it to be: " << m_HiggsProdMode << "\n";
+        edm::LogInfo("HTXSRivetProducer")
+            << "(UNKNOWN=0, GGF=1, VBF=2, WH=3, QQ2ZH=4, GG2ZH=5, TTH=6, BBH=7, TH=8)" << endl;
+      } else {
+        throw cms::Exception("HTXSRivetProducer")
+            << "ProductionMode must be one of: GGF,VBF,WH,ZH,QQ2ZH,GG2ZH,TTH,BBH,TH,AUTO ";
+      }
+      _HTXS->setHiggsProdMode(m_HiggsProdMode);
 
-      unique_ptr<HTXS::HiggsClassification> cat( new HTXS::HiggsClassification( cat_ ) ); 
+      // at this point the production mode must be known
+      if (m_HiggsProdMode == HTXS::UNKNOWN) {
+        edm::LogInfo("HTXSRivetProducer") << "HTXSRivetProducer WARNING: HiggsProduction mode is UNKNOWN" << endl;
+      }
 
-      iEvent.put(std::move(cat),"HiggsClassification");
+      // initialize rivet analysis
+      _analysisHandler.init(*myGenEvent);
+      _isFirstEvent = false;
     }
-}
 
-void HTXSRivetProducer::endRun(edm::Run const& iRun, edm::EventSetup const& es) 
-{
-  _HTXS->printClassificationSummary();
+    // classify the event
+    Rivet::HiggsClassification rivet_cat = _HTXS->classifyEvent(*myGenEvent, m_HiggsProdMode);
+    cat_ = HTXS::Rivet2Root(rivet_cat);
+
+    unique_ptr<HTXS::HiggsClassification> cat(new HTXS::HiggsClassification(cat_));
+
+    iEvent.put(std::move(cat), "HiggsClassification");
+  }
 }
 
-void HTXSRivetProducer::beginRun(edm::Run const& iRun, edm::EventSetup const& es) {
+void HTXSRivetProducer::endRun(edm::Run const& iRun, edm::EventSetup const& es) { _HTXS->printClassificationSummary(); }
 
-    if (_prodMode == "AUTO") {    
-
-        edm::Handle<LHERunInfoProduct> run;
-        bool product_exists = iRun.getByLabel( edm::InputTag("externalLHEProducer"), run );
-        if( product_exists ){
-           
-          typedef std::vector<LHERunInfoProduct::Header>::const_iterator headers_const_iterator;
-          LHERunInfoProduct myLHERunInfoProduct = *(run.product());
-          for (headers_const_iterator iter=myLHERunInfoProduct.headers_begin(); iter!=myLHERunInfoProduct.headers_end(); iter++){
-              std::vector<std::string> lines = iter->lines();
-              for (unsigned int iLine = 0; iLine<lines.size(); iLine++) {
-                  std::string line=lines.at(iLine);
-                  // POWHEG
-                  if (line.find("gg_H_quark-mass-effects") != std::string::npos) {
-                      edm::LogInfo ("HTXSRivetProducer") <<iLine<< " "<<line<<std::endl;
-                      m_HiggsProdMode = HTXS::GGF;
-                      break;
-                  }
-                  if (line.find("Process: HJ") != std::string::npos) {
-                      edm::LogInfo ("HTXSRivetProducer") <<iLine<< " "<<line<<std::endl;
-                      m_HiggsProdMode = HTXS::GGF;
-                      break;
-                  }
-                  if (line.find("Process: HJJ") != std::string::npos) {
-                      edm::LogInfo ("HTXSRivetProducer") <<iLine<< " "<<line<<std::endl;
-                      m_HiggsProdMode = HTXS::GGF;
-                      break;
-                  }
-                  if (line.find("VBF_H") != std::string::npos) {
-                      edm::LogInfo ("HTXSRivetProducer") <<iLine<< " "<<line<<std::endl;
-                      m_HiggsProdMode = HTXS::VBF;
-                      break;
-                  }
-                  if (line.find("HZJ") != std::string::npos) {
-                      edm::LogInfo ("HTXSRivetProducer") <<iLine<< " "<<line<<std::endl;
-                      m_HiggsProdMode = HTXS::QQ2ZH;
-                      break;
-                  }
-                  if (line.find("ggHZ") != std::string::npos) {
-                      edm::LogInfo ("HTXSRivetProducer") <<iLine<< " "<<line<<std::endl;
-                      m_HiggsProdMode = HTXS::GG2ZH;
-                      break;
-                  }
-                  // MC@NLO
-                  if (line.find("ggh012j") != std::string::npos) {
-                      edm::LogInfo ("HTXSRivetProducer") <<iLine<< " "<<line<<std::endl;
-                      m_HiggsProdMode = HTXS::GGF;
-                      break;
-                  }
-                  if (line.find("vbfh") != std::string::npos) {
-                      edm::LogInfo ("HTXSRivetProducer") <<iLine<< " "<<line<<std::endl;
-                      m_HiggsProdMode = HTXS::VBF;
-                      break;
-                  }
-                  if (line.find("zh012j") != std::string::npos) {
-                      edm::LogInfo ("HTXSRivetProducer") <<iLine<< " "<<line<<std::endl;
-                      m_HiggsProdMode = HTXS::QQ2ZH;
-                      break;
-                  }
-                  if (line.find("ggzh01j") != std::string::npos) {
-                      edm::LogInfo ("HTXSRivetProducer") <<iLine<< " "<<line<<std::endl;
-                      m_HiggsProdMode = HTXS::GG2ZH;
-                      break;
-                  }
-              }
-                
-              if ( m_HiggsProdMode != HTXS::UNKNOWN) break;
+void HTXSRivetProducer::beginRun(edm::Run const& iRun, edm::EventSetup const& es) {
+  if (_prodMode == "AUTO") {
+    edm::Handle<LHERunInfoProduct> run;
+    bool product_exists = iRun.getByLabel(edm::InputTag("externalLHEProducer"), run);
+    if (product_exists) {
+      typedef std::vector<LHERunInfoProduct::Header>::const_iterator headers_const_iterator;
+      LHERunInfoProduct myLHERunInfoProduct = *(run.product());
+      for (headers_const_iterator iter = myLHERunInfoProduct.headers_begin(); iter != myLHERunInfoProduct.headers_end();
+           iter++) {
+        std::vector<std::string> lines = iter->lines();
+        for (unsigned int iLine = 0; iLine < lines.size(); iLine++) {
+          std::string line = lines.at(iLine);
+          // POWHEG
+          if (line.find("gg_H_quark-mass-effects") != std::string::npos) {
+            edm::LogInfo("HTXSRivetProducer") << iLine << " " << line << std::endl;
+            m_HiggsProdMode = HTXS::GGF;
+            break;
+          }
+          if (line.find("Process: HJ") != std::string::npos) {
+            edm::LogInfo("HTXSRivetProducer") << iLine << " " << line << std::endl;
+            m_HiggsProdMode = HTXS::GGF;
+            break;
+          }
+          if (line.find("Process: HJJ") != std::string::npos) {
+            edm::LogInfo("HTXSRivetProducer") << iLine << " " << line << std::endl;
+            m_HiggsProdMode = HTXS::GGF;
+            break;
+          }
+          if (line.find("VBF_H") != std::string::npos) {
+            edm::LogInfo("HTXSRivetProducer") << iLine << " " << line << std::endl;
+            m_HiggsProdMode = HTXS::VBF;
+            break;
+          }
+          if (line.find("HZJ") != std::string::npos) {
+            edm::LogInfo("HTXSRivetProducer") << iLine << " " << line << std::endl;
+            m_HiggsProdMode = HTXS::QQ2ZH;
+            break;
+          }
+          if (line.find("ggHZ") != std::string::npos) {
+            edm::LogInfo("HTXSRivetProducer") << iLine << " " << line << std::endl;
+            m_HiggsProdMode = HTXS::GG2ZH;
+            break;
+          }
+          // MC@NLO
+          if (line.find("ggh012j") != std::string::npos) {
+            edm::LogInfo("HTXSRivetProducer") << iLine << " " << line << std::endl;
+            m_HiggsProdMode = HTXS::GGF;
+            break;
+          }
+          if (line.find("vbfh") != std::string::npos) {
+            edm::LogInfo("HTXSRivetProducer") << iLine << " " << line << std::endl;
+            m_HiggsProdMode = HTXS::VBF;
+            break;
+          }
+          if (line.find("zh012j") != std::string::npos) {
+            edm::LogInfo("HTXSRivetProducer") << iLine << " " << line << std::endl;
+            m_HiggsProdMode = HTXS::QQ2ZH;
+            break;
+          }
+          if (line.find("ggzh01j") != std::string::npos) {
+            edm::LogInfo("HTXSRivetProducer") << iLine << " " << line << std::endl;
+            m_HiggsProdMode = HTXS::GG2ZH;
+            break;
+          }
         }
+
+        if (m_HiggsProdMode != HTXS::UNKNOWN)
+          break;
       }
     }
+  }
 }
 
-
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-DEFINE_FWK_MODULE( HTXSRivetProducer );
+DEFINE_FWK_MODULE(HTXSRivetProducer);
diff --git a/GeneratorInterface/RivetInterface/plugins/ParticleLevelProducer.cc b/GeneratorInterface/RivetInterface/plugins/ParticleLevelProducer.cc
index 702df735bf292..b91493f58d8da 100644
--- a/GeneratorInterface/RivetInterface/plugins/ParticleLevelProducer.cc
+++ b/GeneratorInterface/RivetInterface/plugins/ParticleLevelProducer.cc
@@ -16,13 +16,12 @@ using namespace edm;
 using namespace reco;
 using namespace Rivet;
 
-ParticleLevelProducer::ParticleLevelProducer(const edm::ParameterSet& pset):
-  srcToken_(consumes<edm::HepMCProduct>(pset.getParameter<edm::InputTag>("src"))),
-  rivetAnalysis_(new Rivet::RivetAnalysis(pset))
-{
-  usesResource();
+ParticleLevelProducer::ParticleLevelProducer(const edm::ParameterSet& pset)
+    : srcToken_(consumes<edm::HepMCProduct>(pset.getParameter<edm::InputTag>("src"))),
+      rivetAnalysis_(new Rivet::RivetAnalysis(pset)) {
+  usesResource("Rivet");
 
-  genVertex_ = reco::Particle::Point(0,0,0);
+  genVertex_ = reco::Particle::Point(0, 0, 0);
 
   produces<reco::GenParticleCollection>("neutrinos");
   produces<reco::GenParticleCollection>("photons");
@@ -32,53 +31,65 @@ ParticleLevelProducer::ParticleLevelProducer(const edm::ParameterSet& pset):
   produces<reco::GenParticleCollection>("consts");
   produces<reco::GenParticleCollection>("tags");
   produces<reco::METCollection>("mets");
-  
+
   analysisHandler_.setIgnoreBeams(true);
   analysisHandler_.addAnalysis(rivetAnalysis_);
 }
 
-void ParticleLevelProducer::addGenJet(Rivet::Jet jet, std::unique_ptr<reco::GenJetCollection> &jets,
-                                      std::unique_ptr<reco::GenParticleCollection> &consts, edm::RefProd<reco::GenParticleCollection>& constsRefHandle, int &iConstituent,
-                                      std::unique_ptr<reco::GenParticleCollection> &tags, edm::RefProd<reco::GenParticleCollection>& tagsRefHandle, int &iTag)
-{
+void ParticleLevelProducer::addGenJet(Rivet::Jet jet,
+                                      std::unique_ptr<reco::GenJetCollection>& jets,
+                                      std::unique_ptr<reco::GenParticleCollection>& consts,
+                                      edm::RefProd<reco::GenParticleCollection>& constsRefHandle,
+                                      int& iConstituent,
+                                      std::unique_ptr<reco::GenParticleCollection>& tags,
+                                      edm::RefProd<reco::GenParticleCollection>& tagsRefHandle,
+                                      int& iTag) {
   const auto pjet = jet.pseudojet();
 
   reco::GenJet genJet;
   genJet.setP4(p4(jet));
   genJet.setVertex(genVertex_);
-  if ( jet.bTagged() ) genJet.setPdgId(5);
-  else if ( jet.cTagged() ) genJet.setPdgId(4);
+  if (jet.bTagged())
+    genJet.setPdgId(5);
+  else if (jet.cTagged())
+    genJet.setPdgId(4);
   genJet.setJetArea(pjet.has_area() ? pjet.area() : 0);
-  
-  for ( auto const & p : jet.particles()) {
+
+  for (auto const& p : jet.particles()) {
     auto pp4 = p4(p);
-    bool match = false; int iMatch = -1;
-    for ( auto const & q : *consts ) {
+    bool match = false;
+    int iMatch = -1;
+    for (auto const& q : *consts) {
       ++iMatch;
-      if (q.p4() == pp4) { match = true; break; }
+      if (q.p4() == pp4) {
+        match = true;
+        break;
+      }
     }
-    if (match){
+    if (match) {
       genJet.addDaughter(edm::refToPtr(reco::GenParticleRef(constsRefHandle, iMatch)));
-    }
-    else {
+    } else {
       consts->push_back(reco::GenParticle(p.charge(), pp4, genVertex_, p.pdgId(), 1, true));
       genJet.addDaughter(edm::refToPtr(reco::GenParticleRef(constsRefHandle, ++iConstituent)));
     }
   }
-  for ( auto const & p : jet.tags()) {
+  for (auto const& p : jet.tags()) {
     // The tag particles are accessible as jet daughters, so scale down p4 for safety.
     // p4 needs to be multiplied by 1e20 for fragmentation analysis.
-    auto pp4 = p4(p)*1e-20;
-    bool match = false; int iMatch = -1;
-    for ( auto const & q : *tags ) {
+    auto pp4 = p4(p) * 1e-20;
+    bool match = false;
+    int iMatch = -1;
+    for (auto const& q : *tags) {
       ++iMatch;
-      if (q.p4() == pp4) { match = true; break; }
+      if (q.p4() == pp4) {
+        match = true;
+        break;
+      }
     }
-    if (match){
+    if (match) {
       genJet.addDaughter(edm::refToPtr(reco::GenParticleRef(tagsRefHandle, iMatch)));
-    }
-    else {    
-      tags->push_back(reco::GenParticle(p.charge(), p4(p)*1e-20, genVertex_, p.pdgId(), 2, true));
+    } else {
+      tags->push_back(reco::GenParticle(p.charge(), p4(p) * 1e-20, genVertex_, p.pdgId(), 2, true));
       genJet.addDaughter(edm::refToPtr(reco::GenParticleRef(tagsRefHandle, ++iTag)));
     }
   }
@@ -86,8 +97,7 @@ void ParticleLevelProducer::addGenJet(Rivet::Jet jet, std::unique_ptr<reco::GenJ
   jets->push_back(genJet);
 }
 
-void ParticleLevelProducer::produce(edm::Event& event, const edm::EventSetup& eventSetup)
-{
+void ParticleLevelProducer::produce(edm::Event& event, const edm::EventSetup& eventSetup) {
   using namespace Rivet;
   typedef reco::Candidate::LorentzVector LorentzVector;
 
@@ -110,50 +120,57 @@ void ParticleLevelProducer::produce(edm::Event& event, const edm::EventSetup& ev
 
   // Convert into edm objects
   // Prompt neutrinos
-  for ( auto const & p : rivetAnalysis_->neutrinos() ) {
+  for (auto const& p : rivetAnalysis_->neutrinos()) {
     neutrinos->push_back(reco::GenParticle(p.charge(), p4(p), genVertex_, p.pdgId(), 1, true));
   }
   std::sort(neutrinos->begin(), neutrinos->end(), GreaterByPt<reco::Candidate>());
-  
+
   // Photons
-  for ( auto const & p : rivetAnalysis_->photons() ) {
+  for (auto const& p : rivetAnalysis_->photons()) {
     photons->push_back(reco::GenParticle(p.charge(), p4(p), genVertex_, p.pdgId(), 1, true));
   }
   std::sort(photons->begin(), photons->end(), GreaterByPt<reco::Candidate>());
 
   // Prompt leptons
   int iConstituent = -1;
-  for ( auto const & lepton : rivetAnalysis_->leptons() ) {
+  int iTag = -1;
+  for (auto const& lepton : rivetAnalysis_->leptons()) {
     reco::GenJet lepJet;
     lepJet.setP4(p4(lepton));
     lepJet.setVertex(genVertex_);
     lepJet.setPdgId(lepton.pdgId());
     lepJet.setCharge(lepton.charge());
-    
-    const auto& cl = lepton.constituentLepton();
-    consts->push_back(reco::GenParticle(cl.charge(), p4(cl), genVertex_, cl.pdgId(), 1, true));
-    lepJet.addDaughter(edm::refToPtr(reco::GenParticleRef(constsRefHandle, ++iConstituent)));
-    
-    for ( auto const & p : lepton.constituentPhotons()) {
-      consts->push_back(reco::GenParticle(p.charge(), p4(p), genVertex_, p.pdgId(), 1, true));
-      lepJet.addDaughter(edm::refToPtr(reco::GenParticleRef(constsRefHandle, ++iConstituent)));
+
+    for (auto const & p : lepton.constituents()) {
+      // ghost taus (momentum scaled with 10e-20 in RivetAnalysis.h already)
+      if (p.abspid() == 15) {
+        tags->push_back(reco::GenParticle(p.charge(), p4(p), genVertex_, p.pdgId(), 2, true));
+        lepJet.addDaughter(edm::refToPtr(reco::GenParticleRef(tagsRefHandle, ++iTag)));
+      }
+      // electrons, muons, photons
+      else {
+        consts->push_back(reco::GenParticle(p.charge(), p4(p), genVertex_, p.pdgId(), 1, true));
+        lepJet.addDaughter(edm::refToPtr(reco::GenParticleRef(constsRefHandle, ++iConstituent)));
+      }
     }
-    
+
     leptons->push_back(lepJet);
   }
   std::sort(leptons->begin(), leptons->end(), GreaterByPt<reco::GenJet>());
 
   // Jets with constituents and tag particles
-  int iTag = -1;
-  for ( auto jet : rivetAnalysis_->jets() ) {
+  for (auto jet : rivetAnalysis_->jets()) {
     addGenJet(jet, jets, consts, constsRefHandle, iConstituent, tags, tagsRefHandle, iTag);
   }
-  for ( auto jet : rivetAnalysis_->fatjets() ) {
+  for (auto jet : rivetAnalysis_->fatjets()) {
     addGenJet(jet, fatjets, consts, constsRefHandle, iConstituent, tags, tagsRefHandle, iTag);
   }
-  
+
   // MET
-  reco::Candidate::LorentzVector metP4(rivetAnalysis_->met().x(), rivetAnalysis_->met().y(), 0., sqrt(pow(rivetAnalysis_->met().x(), 2) + pow(rivetAnalysis_->met().y(), 2)));
+  reco::Candidate::LorentzVector metP4(rivetAnalysis_->met().x(),
+                                       rivetAnalysis_->met().y(),
+                                       0.,
+                                       sqrt(pow(rivetAnalysis_->met().x(), 2) + pow(rivetAnalysis_->met().y(), 2)));
   mets->push_back(reco::MET(metP4, genVertex_));
 
   event.put(std::move(neutrinos), "neutrinos");
diff --git a/GeneratorInterface/RivetInterface/plugins/RivetAnalyzer.cc b/GeneratorInterface/RivetInterface/plugins/RivetAnalyzer.cc
index 18a364724377c..177e36f766bb0 100644
--- a/GeneratorInterface/RivetInterface/plugins/RivetAnalyzer.cc
+++ b/GeneratorInterface/RivetInterface/plugins/RivetAnalyzer.cc
@@ -12,193 +12,181 @@
 using namespace Rivet;
 using namespace edm;
 
-RivetAnalyzer::RivetAnalyzer(const edm::ParameterSet& pset) : 
-_analysisHandler(),
-_isFirstEvent(true),
-_outFileName(pset.getParameter<std::string>("OutputFile")),
-//decide whether to finlaize tthe plots or not.
-//deciding not to finalize them can be useful for further harvesting of many jobs
-_doFinalize(pset.getParameter<bool>("DoFinalize")),
-_produceDQM(pset.getParameter<bool>("ProduceDQMOutput")),
-_xsection(-1.)
-{
+RivetAnalyzer::RivetAnalyzer(const edm::ParameterSet& pset)
+    : _analysisHandler(),
+      _isFirstEvent(true),
+      _outFileName(pset.getParameter<std::string>("OutputFile")),
+      //decide whether to finlaize tthe plots or not.
+      //deciding not to finalize them can be useful for further harvesting of many jobs
+      _doFinalize(pset.getParameter<bool>("DoFinalize")),
+      _produceDQM(pset.getParameter<bool>("ProduceDQMOutput")),
+      _xsection(-1.) {
+  usesResource("Rivet");
+
   //retrive the analysis name from paarmeter set
   std::vector<std::string> analysisNames = pset.getParameter<std::vector<std::string> >("AnalysisNames");
-  
+
   _hepmcCollection = consumes<HepMCProduct>(pset.getParameter<edm::InputTag>("HepMCCollection"));
 
   _useExternalWeight = pset.getParameter<bool>("UseExternalWeight");
   if (_useExternalWeight) {
-    if (!pset.exists("GenEventInfoCollection")){
-      throw cms::Exception("RivetAnalyzer") << "when using an external event weight you have to specify the GenEventInfoProduct collection from which the weight has to be taken " ; 
+    if (!pset.exists("GenEventInfoCollection")) {
+      throw cms::Exception("RivetAnalyzer") << "when using an external event weight you have to specify the "
+                                               "GenEventInfoProduct collection from which the weight has to be taken ";
     }
- 
+
     _genEventInfoCollection = consumes<GenEventInfoProduct>(pset.getParameter<edm::InputTag>("GenEventInfoCollection"));
-    _useGENweights          = pset.getParameter<bool>("useGENweights");
-    _GENweightNumber        = pset.getParameter<int>("GENweightNumber");
-    _LHECollection          = consumes<LHEEventProduct>(pset.getParameter<edm::InputTag>("LHECollection"));
-    _useLHEweights          = pset.getParameter<bool>("useLHEweights");
-    _LHEweightNumber        = pset.getParameter<int>("LHEweightNumber");
-    
+    _useGENweights = pset.getParameter<bool>("useGENweights");
+    _GENweightNumber = pset.getParameter<int>("GENweightNumber");
+    _LHECollection = consumes<LHEEventProduct>(pset.getParameter<edm::InputTag>("LHECollection"));
+    _useLHEweights = pset.getParameter<bool>("useLHEweights");
+    _LHEweightNumber = pset.getParameter<int>("LHEweightNumber");
   }
 
   //get the analyses
   _analysisHandler.addAnalyses(analysisNames);
 
   //go through the analyses and check those that need the cross section
-  const std::set< AnaHandle, CmpAnaHandle > & analyses = _analysisHandler.analyses();
+  const std::set<AnaHandle, CmpAnaHandle>& analyses = _analysisHandler.analyses();
 
-  std::set< AnaHandle, CmpAnaHandle >::const_iterator ibeg = analyses.begin();
-  std::set< AnaHandle, CmpAnaHandle >::const_iterator iend = analyses.end();
-  std::set< AnaHandle, CmpAnaHandle >::const_iterator iana; 
+  std::set<AnaHandle, CmpAnaHandle>::const_iterator ibeg = analyses.begin();
+  std::set<AnaHandle, CmpAnaHandle>::const_iterator iend = analyses.end();
+  std::set<AnaHandle, CmpAnaHandle>::const_iterator iana;
   _xsection = pset.getParameter<double>("CrossSection");
-  for (iana = ibeg; iana != iend; ++iana){
+  for (iana = ibeg; iana != iend; ++iana) {
     if ((*iana)->needsCrossSection())
       (*iana)->setCrossSection(_xsection);
   }
-  if (_produceDQM){
+  if (_produceDQM) {
     // book stuff needed for DQM
     dbe = nullptr;
     dbe = edm::Service<DQMStore>().operator->();
     dbe->setVerbose(50);
-  }  
-
+  }
 }
 
-RivetAnalyzer::~RivetAnalyzer(){
-}
+RivetAnalyzer::~RivetAnalyzer() {}
 
-void RivetAnalyzer::beginJob(){
+void RivetAnalyzer::beginJob() {
   //set the environment, very ugly but rivet is monolithic when it comes to paths
-  char * cmsswbase    = getenv("CMSSW_BASE");
-  char * cmsswrelease = getenv("CMSSW_RELEASE_BASE");
-  if ( !getenv("RIVET_REF_PATH") )
-  {
-    const std::string rivetref = "RIVET_REF_PATH=" + string(cmsswbase) + "/src/GeneratorInterface/RivetInterface/data:" + string(cmsswrelease) + "/src/GeneratorInterface/RivetInterface/data";
-    char *rivetrefCstr = strdup(rivetref.c_str());
+  char* cmsswbase = getenv("CMSSW_BASE");
+  char* cmsswrelease = getenv("CMSSW_RELEASE_BASE");
+  if (!getenv("RIVET_REF_PATH")) {
+    const std::string rivetref = "RIVET_REF_PATH=" + string(cmsswbase) +
+                                 "/src/GeneratorInterface/RivetInterface/data:" + string(cmsswrelease) +
+                                 "/src/GeneratorInterface/RivetInterface/data";
+    char* rivetrefCstr = strdup(rivetref.c_str());
     putenv(rivetrefCstr);
     free(rivetrefCstr);
   }
-  if ( !getenv("RIVET_INFO_PATH") )
-  {
-    const std::string rivetinfo = "RIVET_INFO_PATH=" + string(cmsswbase) + "/src/GeneratorInterface/RivetInterface/data:" + string(cmsswrelease) + "/src/GeneratorInterface/RivetInterface/data";
-    char *rivetinfoCstr = strdup(rivetinfo.c_str());
+  if (!getenv("RIVET_INFO_PATH")) {
+    const std::string rivetinfo = "RIVET_INFO_PATH=" + string(cmsswbase) +
+                                  "/src/GeneratorInterface/RivetInterface/data:" + string(cmsswrelease) +
+                                  "/src/GeneratorInterface/RivetInterface/data";
+    char* rivetinfoCstr = strdup(rivetinfo.c_str());
     putenv(rivetinfoCstr);
     free(rivetinfoCstr);
   }
 }
 
-void RivetAnalyzer::beginRun(const edm::Run& iRun,const edm::EventSetup& iSetup){
-  return;
-}
+void RivetAnalyzer::beginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) { return; }
 
-void RivetAnalyzer::analyze(const edm::Event& iEvent,const edm::EventSetup& iSetup){
-  
+void RivetAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   //get the hepmc product from the event
   edm::Handle<HepMCProduct> evt;
   iEvent.getByToken(_hepmcCollection, evt);
 
   // get HepMC GenEvent
-  const HepMC::GenEvent *myGenEvent = evt->GetEvent();
+  const HepMC::GenEvent* myGenEvent = evt->GetEvent();
   std::unique_ptr<HepMC::GenEvent> tmpGenEvtPtr;
-  //if you want to use an external weight or set the cross section we have to clone the GenEvent and change the weight  
-  if ( _useExternalWeight || _xsection > 0 ){
+  //if you want to use an external weight or set the cross section we have to clone the GenEvent and change the weight
+  if (_useExternalWeight || _xsection > 0) {
     tmpGenEvtPtr = std::make_unique<HepMC::GenEvent>(*(evt->GetEvent()));
 
-    if (_xsection > 0){
+    if (_xsection > 0) {
       HepMC::GenCrossSection xsec;
       xsec.set_cross_section(_xsection);
       tmpGenEvtPtr->set_cross_section(xsec);
-    } 
+    }
 
-    if ( _useExternalWeight ){
+    if (_useExternalWeight) {
       if (tmpGenEvtPtr->weights().empty()) {
-	throw cms::Exception("RivetAnalyzer") << "Original weight container has 0 size ";
+        throw cms::Exception("RivetAnalyzer") << "Original weight container has 0 size ";
       }
       if (tmpGenEvtPtr->weights().size() > 1) {
-	edm::LogWarning("RivetAnalyzer") << "Original event weight size is " << tmpGenEvtPtr->weights().size() << ". Will change only the first one ";  
+        edm::LogWarning("RivetAnalyzer") << "Original event weight size is " << tmpGenEvtPtr->weights().size()
+                                         << ". Will change only the first one ";
       }
-    
+
       edm::Handle<GenEventInfoProduct> genEventInfoProduct;
       iEvent.getByToken(_genEventInfoCollection, genEventInfoProduct);
       double weightForRivet = genEventInfoProduct->weight();
-      
-      if(_useGENweights){
+
+      if (_useGENweights) {
         weightForRivet = genEventInfoProduct->weights().at(_GENweightNumber);
       }
-      if(_useLHEweights){
+      if (_useLHEweights) {
         edm::Handle<LHEEventProduct> lheEventHandle;
-        iEvent.getByToken(_LHECollection,lheEventHandle);
-        weightForRivet *= lheEventHandle->weights().at(_LHEweightNumber).wgt/lheEventHandle->originalXWGTUP();
+        iEvent.getByToken(_LHECollection, lheEventHandle);
+        weightForRivet *= lheEventHandle->weights().at(_LHEweightNumber).wgt / lheEventHandle->originalXWGTUP();
       }
-      
+
       tmpGenEvtPtr->weights()[0] = weightForRivet;
     }
     myGenEvent = tmpGenEvtPtr.get();
-
   }
-  
 
   //aaply the beams initialization on the first event
-  if (_isFirstEvent){
+  if (_isFirstEvent) {
     _analysisHandler.init(*myGenEvent);
     _isFirstEvent = false;
   }
 
   //run the analysis
   _analysisHandler.analyze(*myGenEvent);
-
 }
 
-
-void RivetAnalyzer::endRun(const edm::Run& iRun,const edm::EventSetup& iSetup){
+void RivetAnalyzer::endRun(const edm::Run& iRun, const edm::EventSetup& iSetup) {
   if (_doFinalize)
-  _analysisHandler.finalize();
+    _analysisHandler.finalize();
   else {
     //if we don't finalize we just want to do the transformation from histograms to DPS
     ////normalizeTree(_analysisHandler.tree());
     //normalizeTree();
-
   }
   _analysisHandler.writeData(_outFileName);
 
   return;
 }
 
-
-
 //from Rivet 2.X: Analysis.hh (cls 18Feb2014)
 /// List of registered analysis data objects
 //const vector<AnalysisObjectPtr>& analysisObjects() const {
 //return _analysisobjects;
 //}
 
+void RivetAnalyzer::endJob() {}
 
-
-void RivetAnalyzer::endJob(){
-}
-
-
-void RivetAnalyzer::normalizeTree()    {
+void RivetAnalyzer::normalizeTree() {
   using namespace YODA;
   std::vector<string> analyses = _analysisHandler.analysisNames();
-  
+
   //tree.ls(".", true);
   const string tmpdir = "/RivetNormalizeTmp";
   //tree.mkdir(tmpdir);
   foreach (const string& analysis, analyses) {
-    if (_produceDQM){
-      dbe->setCurrentFolder("Rivet/"+analysis);
+    if (_produceDQM) {
+      dbe->setCurrentFolder("Rivet/" + analysis);
       //global variables that are always present
       //sumOfWeights
       TH1F nevent("nEvt", "n analyzed Events", 1, 0., 1.);
-      nevent.SetBinContent(1,_analysisHandler.sumOfWeights());
-      _mes.push_back(dbe->book1D("nEvt",&nevent));
-    }  
+      nevent.SetBinContent(1, _analysisHandler.sumOfWeights());
+      _mes.push_back(dbe->book1D("nEvt", &nevent));
+    }
     //cross section
     //TH1F xsection("xSection", "Cross Section", 1, 0., 1.);
     //xsection.SetBinContent(1,_analysisHandler.crossSection());
-    //_mes.push_back(dbe->book1D("xSection",&xsection)); 
+    //_mes.push_back(dbe->book1D("xSection",&xsection));
     //now loop over the histograms
 
     /*
@@ -251,10 +239,7 @@ void RivetAnalyzer::normalizeTree()    {
     }
     */
   }
-  //tree.rmdir(tmpdir);  
-  
+  //tree.rmdir(tmpdir);
 }
 
-
-
 DEFINE_FWK_MODULE(RivetAnalyzer);
diff --git a/GeneratorInterface/TauolaInterface/BuildFile.xml b/GeneratorInterface/TauolaInterface/BuildFile.xml
index a3fd250a6d8cf..7b2d1daf1fff4 100644
--- a/GeneratorInterface/TauolaInterface/BuildFile.xml
+++ b/GeneratorInterface/TauolaInterface/BuildFile.xml
@@ -5,6 +5,7 @@
 <use name="hepmc"/>
 <use name="clhep"/>
 <use name="heppdt"/>
+<use name="tauolapp"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
new file mode 100644
index 0000000000000..807e3ea06a4cb
--- /dev/null
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py
@@ -0,0 +1,285 @@
+import FWCore.ParameterSet.Config as cms
+
+## 2015 + new phase 1 pixel detector
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring(
+        'Geometry/CMSCommonData/data/materials.xml',
+        'Geometry/CMSCommonData/data/rotations.xml',
+        'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
+        'Geometry/CMSCommonData/data/cms/2019/v2/cms.xml',
+        'Geometry/CMSCommonData/data/cmsMother.xml',
+        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
+        'Geometry/CMSCommonData/data/cmsTracker.xml',
+        'Geometry/CMSCommonData/data/caloBase/2017/v1/caloBase.xml',
+        'Geometry/CMSCommonData/data/cmsCalo.xml',
+        'Geometry/CMSCommonData/data/muonBase/2017/v1/muonBase.xml',
+        'Geometry/CMSCommonData/data/cmsMuon.xml',
+        'Geometry/CMSCommonData/data/mgnt.xml',
+        'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/muonMB.xml',
+        'Geometry/CMSCommonData/data/muonMagnet.xml',
+        'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
+        'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
+        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixfwdMaterials.xml',
+        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixfwdCylinder.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixfwd.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixfwdDisks.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixfwdSupportRingParameters.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDiskZplus.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDiskZminus.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDiskZplus.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDiskZminus.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeInnerZplus.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeInnerZminus.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeOuterZplus.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeOuterZminus.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull1.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull2.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull3.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer0.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer1.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer2.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer3.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbar.xml',
+        'Geometry/TrackerCommonData/data/Run2/trackerpatchpannel.xml',
+        'Geometry/TrackerCommonData/data/Run2/trackerpixelnose.xml',
+        'Geometry/TrackerCommonData/data/tibtidcommonmaterial.xml',
+        'Geometry/TrackerCommonData/data/tibmaterial.xml',
+        'Geometry/TrackerCommonData/data/tibmodpar.xml',
+        'Geometry/TrackerCommonData/data/tibmodule0.xml',
+        'Geometry/TrackerCommonData/data/tibmodule0a.xml',
+        'Geometry/TrackerCommonData/data/tibmodule0b.xml',
+        'Geometry/TrackerCommonData/data/tibmodule2.xml',
+        'Geometry/TrackerCommonData/data/tibstringpar.xml',
+        'Geometry/TrackerCommonData/data/tibstring0ll.xml',
+        'Geometry/TrackerCommonData/data/tibstring0lr.xml',
+        'Geometry/TrackerCommonData/data/tibstring0ul.xml',
+        'Geometry/TrackerCommonData/data/tibstring0ur.xml',
+        'Geometry/TrackerCommonData/data/tibstring0.xml',
+        'Geometry/TrackerCommonData/data/tibstring1ll.xml',
+        'Geometry/TrackerCommonData/data/tibstring1lr.xml',
+        'Geometry/TrackerCommonData/data/tibstring1ul.xml',
+        'Geometry/TrackerCommonData/data/tibstring1ur.xml',
+        'Geometry/TrackerCommonData/data/tibstring1.xml',
+        'Geometry/TrackerCommonData/data/tibstring2ll.xml',
+        'Geometry/TrackerCommonData/data/tibstring2lr.xml',
+        'Geometry/TrackerCommonData/data/tibstring2ul.xml',
+        'Geometry/TrackerCommonData/data/tibstring2ur.xml',
+        'Geometry/TrackerCommonData/data/tibstring2.xml',
+        'Geometry/TrackerCommonData/data/tibstring3ll.xml',
+        'Geometry/TrackerCommonData/data/tibstring3lr.xml',
+        'Geometry/TrackerCommonData/data/tibstring3ul.xml',
+        'Geometry/TrackerCommonData/data/tibstring3ur.xml',
+        'Geometry/TrackerCommonData/data/tibstring3.xml',
+        'Geometry/TrackerCommonData/data/tiblayerpar.xml',
+        'Geometry/TrackerCommonData/data/tiblayer0.xml',
+        'Geometry/TrackerCommonData/data/tiblayer1.xml',
+        'Geometry/TrackerCommonData/data/tiblayer2.xml',
+        'Geometry/TrackerCommonData/data/tiblayer3.xml',
+        'Geometry/TrackerCommonData/data/tib.xml',
+        'Geometry/TrackerCommonData/data/tidmaterial.xml',
+        'Geometry/TrackerCommonData/data/tidmodpar.xml',
+        'Geometry/TrackerCommonData/data/tidmodule0.xml',
+        'Geometry/TrackerCommonData/data/tidmodule0r.xml',
+        'Geometry/TrackerCommonData/data/tidmodule0l.xml',
+        'Geometry/TrackerCommonData/data/tidmodule1.xml',
+        'Geometry/TrackerCommonData/data/tidmodule1r.xml',
+        'Geometry/TrackerCommonData/data/tidmodule1l.xml',
+        'Geometry/TrackerCommonData/data/tidmodule2.xml',
+        'Geometry/TrackerCommonData/data/tidringpar.xml',
+        'Geometry/TrackerCommonData/data/tidring0.xml',
+        'Geometry/TrackerCommonData/data/tidring0f.xml',
+        'Geometry/TrackerCommonData/data/tidring0b.xml',
+        'Geometry/TrackerCommonData/data/tidring1.xml',
+        'Geometry/TrackerCommonData/data/tidring1f.xml',
+        'Geometry/TrackerCommonData/data/tidring1b.xml',
+        'Geometry/TrackerCommonData/data/tidring2.xml',
+        'Geometry/TrackerCommonData/data/tid.xml',
+        'Geometry/TrackerCommonData/data/tidf.xml',
+        'Geometry/TrackerCommonData/data/tidb.xml',
+        'Geometry/TrackerCommonData/data/tibtidservices.xml',
+        'Geometry/TrackerCommonData/data/tibtidservicesf.xml',
+        'Geometry/TrackerCommonData/data/tibtidservicesb.xml',
+        'Geometry/TrackerCommonData/data/tobmaterial.xml',
+        'Geometry/TrackerCommonData/data/tobmodpar.xml',
+        'Geometry/TrackerCommonData/data/tobmodule0.xml',
+        'Geometry/TrackerCommonData/data/tobmodule2.xml',
+        'Geometry/TrackerCommonData/data/tobmodule4.xml',
+        'Geometry/TrackerCommonData/data/tobrodpar.xml',
+        'Geometry/TrackerCommonData/data/tobrod0c.xml',
+        'Geometry/TrackerCommonData/data/tobrod0l.xml',
+        'Geometry/TrackerCommonData/data/tobrod0h.xml',
+        'Geometry/TrackerCommonData/data/tobrod0.xml',
+        'Geometry/TrackerCommonData/data/tobrod1l.xml',
+        'Geometry/TrackerCommonData/data/tobrod1h.xml',
+        'Geometry/TrackerCommonData/data/tobrod1.xml',
+        'Geometry/TrackerCommonData/data/tobrod2c.xml',
+        'Geometry/TrackerCommonData/data/tobrod2l.xml',
+        'Geometry/TrackerCommonData/data/tobrod2h.xml',
+        'Geometry/TrackerCommonData/data/tobrod2.xml',
+        'Geometry/TrackerCommonData/data/tobrod3l.xml',
+        'Geometry/TrackerCommonData/data/tobrod3h.xml',
+        'Geometry/TrackerCommonData/data/tobrod3.xml',
+        'Geometry/TrackerCommonData/data/tobrod4c.xml',
+        'Geometry/TrackerCommonData/data/tobrod4l.xml',
+        'Geometry/TrackerCommonData/data/tobrod4h.xml',
+        'Geometry/TrackerCommonData/data/tobrod4.xml',
+        'Geometry/TrackerCommonData/data/tobrod5l.xml',
+        'Geometry/TrackerCommonData/data/tobrod5h.xml',
+        'Geometry/TrackerCommonData/data/tobrod5.xml',
+        'Geometry/TrackerCommonData/data/v2/tob.xml',
+        'Geometry/TrackerCommonData/data/tecmaterial.xml',
+        'Geometry/TrackerCommonData/data/tecmodpar.xml',
+        'Geometry/TrackerCommonData/data/tecmodule0.xml',
+        'Geometry/TrackerCommonData/data/tecmodule0r.xml',
+        'Geometry/TrackerCommonData/data/tecmodule0s.xml',
+        'Geometry/TrackerCommonData/data/tecmodule1.xml',
+        'Geometry/TrackerCommonData/data/tecmodule1r.xml',
+        'Geometry/TrackerCommonData/data/tecmodule1s.xml',
+        'Geometry/TrackerCommonData/data/tecmodule2.xml',
+        'Geometry/TrackerCommonData/data/tecmodule3.xml',
+        'Geometry/TrackerCommonData/data/tecmodule4.xml',
+        'Geometry/TrackerCommonData/data/tecmodule4r.xml',
+        'Geometry/TrackerCommonData/data/tecmodule4s.xml',
+        'Geometry/TrackerCommonData/data/tecmodule5.xml',
+        'Geometry/TrackerCommonData/data/tecmodule6.xml',
+        'Geometry/TrackerCommonData/data/tecpetpar.xml',
+        'Geometry/TrackerCommonData/data/tecring0.xml',
+        'Geometry/TrackerCommonData/data/tecring1.xml',
+        'Geometry/TrackerCommonData/data/tecring2.xml',
+        'Geometry/TrackerCommonData/data/tecring3.xml',
+        'Geometry/TrackerCommonData/data/tecring4.xml',
+        'Geometry/TrackerCommonData/data/tecring5.xml',
+        'Geometry/TrackerCommonData/data/tecring6.xml',
+        'Geometry/TrackerCommonData/data/tecring0f.xml',
+        'Geometry/TrackerCommonData/data/tecring1f.xml',
+        'Geometry/TrackerCommonData/data/tecring2f.xml',
+        'Geometry/TrackerCommonData/data/tecring3f.xml',
+        'Geometry/TrackerCommonData/data/tecring4f.xml',
+        'Geometry/TrackerCommonData/data/tecring5f.xml',
+        'Geometry/TrackerCommonData/data/tecring6f.xml',
+        'Geometry/TrackerCommonData/data/tecring0b.xml',
+        'Geometry/TrackerCommonData/data/tecring1b.xml',
+        'Geometry/TrackerCommonData/data/tecring2b.xml',
+        'Geometry/TrackerCommonData/data/tecring3b.xml',
+        'Geometry/TrackerCommonData/data/tecring4b.xml',
+        'Geometry/TrackerCommonData/data/tecring5b.xml',
+        'Geometry/TrackerCommonData/data/tecring6b.xml',
+        'Geometry/TrackerCommonData/data/tecpetalf.xml',
+        'Geometry/TrackerCommonData/data/tecpetalb.xml',
+        'Geometry/TrackerCommonData/data/tecpetal0.xml',
+        'Geometry/TrackerCommonData/data/tecpetal0f.xml',
+        'Geometry/TrackerCommonData/data/tecpetal0b.xml',
+        'Geometry/TrackerCommonData/data/tecpetal3.xml',
+        'Geometry/TrackerCommonData/data/tecpetal3f.xml',
+        'Geometry/TrackerCommonData/data/tecpetal3b.xml',
+        'Geometry/TrackerCommonData/data/tecpetal6f.xml',
+        'Geometry/TrackerCommonData/data/tecpetal6b.xml',
+        'Geometry/TrackerCommonData/data/tecpetal8f.xml',
+        'Geometry/TrackerCommonData/data/tecpetal8b.xml',
+        'Geometry/TrackerCommonData/data/tecwheel.xml',
+        'Geometry/TrackerCommonData/data/tecwheela.xml',
+        'Geometry/TrackerCommonData/data/tecwheelb.xml',
+        'Geometry/TrackerCommonData/data/tecwheelc.xml',
+        'Geometry/TrackerCommonData/data/tecwheeld.xml',
+        'Geometry/TrackerCommonData/data/tecwheel6.xml',
+        'Geometry/TrackerCommonData/data/tecservices.xml',
+        'Geometry/TrackerCommonData/data/tecbackplate.xml',
+        'Geometry/TrackerCommonData/data/tec.xml',
+        'Geometry/TrackerCommonData/data/Run2/trackermaterial.xml',
+        'Geometry/TrackerCommonData/data/Run2/tracker.xml',
+        'Geometry/TrackerCommonData/data/trackerpixbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/trackerpixfwd.xml',
+        'Geometry/TrackerCommonData/data/trackertibtidservices.xml',
+        'Geometry/TrackerCommonData/data/trackertib.xml',
+        'Geometry/TrackerCommonData/data/trackertid.xml',
+        'Geometry/TrackerCommonData/data/trackertob.xml',
+        'Geometry/TrackerCommonData/data/trackertec.xml',
+        'Geometry/TrackerCommonData/data/v2/trackerbulkhead.xml',
+        'Geometry/TrackerCommonData/data/trackerother.xml',
+        'Geometry/EcalCommonData/data/Run2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ebalgo.xml',
+        'Geometry/EcalCommonData/data/ebcon.xml',
+        'Geometry/EcalCommonData/data/ebrot.xml',
+        'Geometry/EcalCommonData/data/eecon.xml',
+        'Geometry/EcalCommonData/data/eefixed.xml',
+        'Geometry/EcalCommonData/data/eehier.xml',
+        'Geometry/EcalCommonData/data/eealgo.xml',
+        'Geometry/EcalCommonData/data/escon.xml',
+        'Geometry/EcalCommonData/data/esalgo.xml',
+        'Geometry/EcalCommonData/data/eeF.xml',
+        'Geometry/EcalCommonData/data/eeB.xml',
+        'Geometry/EcalCommonData/data/ectkcable.xml',
+        'Geometry/HcalCommonData/data/hcalrotations.xml',
+        'Geometry/HcalCommonData/data/hcal/PhaseI/hcalalgo.xml',
+        'Geometry/HcalCommonData/data/hcalcablealgo.xml',
+        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+        'Geometry/HcalCommonData/data/hcalendcap/PhaseI/hcalendcapalgo.xml',
+        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
+        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+        'Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml', 
+        'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
+        'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
+        'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
+        'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
+        'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
+        'Geometry/MuonCommonData/data/design/muonYoke.xml',
+        'Geometry/MuonCommonData/data/mf/2017/v2/mf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml',
+        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
+        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
+        'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
+        'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
+        'Geometry/ForwardCommonData/data/brmrotations.xml',
+        'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
+        'Geometry/ForwardCommonData/data/zdcmaterials.xml',
+        'Geometry/ForwardCommonData/data/lumimaterials.xml',
+        'Geometry/ForwardCommonData/data/zdcrotations.xml',
+        'Geometry/ForwardCommonData/data/lumirotations.xml',
+        'Geometry/ForwardCommonData/data/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring(
+        'Geometry/MuonCommonData/data/muonNumbering/2017/v1/muonNumbering.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
+        'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
+        'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
+        'Geometry/EcalSimData/data/ecalsens.xml',
+        'Geometry/HcalCommonData/data/hcalsenspmf.xml',
+        'Geometry/HcalSimData/data/hf.xml',
+        'Geometry/HcalSimData/data/hfpmt.xml',
+        'Geometry/HcalSimData/data/hffibrebundle.xml',
+        'Geometry/HcalSimData/data/CaloUtil.xml',
+        'Geometry/MuonSimData/data/v2/muonSens.xml',
+        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml',
+        'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter17.xml',
+        'Geometry/GEMGeometryBuilder/data/v4/GEMSpecs.xml',
+        'Geometry/ForwardCommonData/data/brmsens.xml',
+        'Geometry/ForwardSimData/data/zdcsens.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts.xml',
+        'Geometry/EcalSimData/data/EcalProdCuts.xml',
+        'Geometry/EcalSimData/data/ESProdCuts.xml',
+        'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
+        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
+        'Geometry/MuonSimData/data/2021/muonProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
+        'Geometry/CMSCommonData/data/FieldParameters.xml'),
+    rootNodeName = cms.string('cms:OCMS')
+)
+
+
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D36XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D36XML_cfi.py
deleted file mode 100644
index 11107953a4eb5..0000000000000
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D36XML_cfi.py
+++ /dev/null
@@ -1,120 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-# This config was generated automatically using generate2023Geometry.py
-# If you notice a mistake, please update the generating script, not just this config
-
-XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
-    geomXMLFiles = cms.vstring(
-        'Geometry/CMSCommonData/data/materials.xml',
-        'Geometry/CMSCommonData/data/rotations.xml',
-        'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
-        'Geometry/CMSCommonData/data/cms/2023/v1/cms.xml',
-        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
-        'Geometry/CMSCommonData/data/cmsMother.xml',
-        'Geometry/CMSCommonData/data/cmsTracker.xml',
-        'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml',
-        'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase/2023/v2/muonBase.xml',
-        'Geometry/CMSCommonData/data/cmsMuon.xml',
-        'Geometry/CMSCommonData/data/mgnt.xml',
-        'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml',
-        'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml',
-        'Geometry/CMSCommonData/data/muonMB.xml',
-        'Geometry/CMSCommonData/data/muonMagnet.xml',
-        'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml',
-        'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml',
-        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
-        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/pixfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml',
-        'Geometry/TrackerCommonData/data/trackermaterial.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/tracker.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/pixel.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker461/trackerRecoMaterial.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
-        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
-        'Geometry/EcalCommonData/data/ectkcable.xml',
-        'Geometry/EcalCommonData/data/PhaseII/eregalgo.xml',
-        'Geometry/EcalCommonData/data/ebalgo.xml',
-        'Geometry/EcalCommonData/data/ebcon.xml',
-        'Geometry/EcalCommonData/data/ebrot.xml',
-        'Geometry/EcalCommonData/data/eecon.xml',
-        'Geometry/EcalCommonData/data/PhaseII/escon.xml',
-        'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
-        'Geometry/HcalCommonData/data/hcalrotations.xml',
-        'Geometry/HcalCommonData/data/hcal/HGCal/hcalalgo.xml',
-        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
-        'Geometry/HcalCommonData/data/hcalendcap/SSAbsorber/hcalendcapalgo.xml',
-        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
-        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
-        'Geometry/HcalCommonData/data/hcalSimNumbering/2023/hcalSimNumbering.xml',
-        'Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml',
-        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HGCalCommonData/data/hgcal/v8/hgcal.xml',
-        'Geometry/HGCalCommonData/data/hgcalEE/v8/hgcalEE.xml',
-        'Geometry/HGCalCommonData/data/hgcalHEsil/v8/hgcalHEsil.xml',
-        'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
-        'Geometry/HGCalCommonData/data/hgcalCons/v8/hgcalCons.xml',
-        'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
-        'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
-        'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
-        'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml',
-        'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml',
-        'Geometry/MuonCommonData/data/design/muonYoke.xml',
-        'Geometry/MuonCommonData/data/mf/2023/v2/mf.xml',
-        'Geometry/MuonCommonData/data/rpcf/2023/v1/rpcf.xml',
-        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
-        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
-        'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
-        'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml',
-        'Geometry/MuonCommonData/data/mfshield/2023/v1/mfshield.xml',
-        'Geometry/MuonCommonData/data/me0/TDR_Dev/me0.xml',
-        'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
-        'Geometry/ForwardCommonData/data/brmrotations.xml',
-        'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
-        'Geometry/ForwardCommonData/data/zdcmaterials.xml',
-        'Geometry/ForwardCommonData/data/lumimaterials.xml',
-        'Geometry/ForwardCommonData/data/zdcrotations.xml',
-        'Geometry/ForwardCommonData/data/lumirotations.xml',
-        'Geometry/ForwardCommonData/data/zdc.xml',
-        'Geometry/ForwardCommonData/data/zdclumi.xml',
-        'Geometry/ForwardCommonData/data/cmszdc.xml',
-    )+
-    cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
-        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
-        'Geometry/HcalCommonData/data/hcalsens/HGCal/hcalsenspmf.xml',
-        'Geometry/HcalSimData/data/hf.xml',
-        'Geometry/HcalSimData/data/hfpmt.xml',
-        'Geometry/HcalSimData/data/hffibrebundle.xml',
-        'Geometry/HcalSimData/data/CaloUtil.xml',
-        'Geometry/HGCalSimData/data/hgcsensv8.xml',
-        'Geometry/HGCalSimData/data/hgccons.xml',
-        'Geometry/HGCalSimData/data/hgcProdCuts.xml',
-        'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
-        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
-        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
-        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
-        'Geometry/RPCGeometryBuilder/data/PhaseII/RPCSpecs.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
-        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
-        'Geometry/ForwardCommonData/data/brmsens.xml',
-        'Geometry/ForwardSimData/data/zdcsens.xml',
-        'Geometry/HcalSimData/data/HcalProdCuts.xml',
-        'Geometry/EcalSimData/data/EcalProdCuts.xml',
-        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
-        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
-        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
-        'Geometry/CMSCommonData/data/FieldParameters.xml',
-    ),
-    rootNodeName = cms.string('cms:OCMS')
-)
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D37XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D42XML_cfi.py
similarity index 92%
rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2023D37XML_cfi.py
rename to Geometry/CMSCommonData/python/cmsExtendedGeometry2023D42XML_cfi.py
index 0437af3b53c5e..482bfadc5b7e8 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D37XML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023D42XML_cfi.py
@@ -26,19 +26,19 @@
         'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
         'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
         'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/pixfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml',
         'Geometry/TrackerCommonData/data/trackermaterial.xml',
         'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/tracker.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker460/pixel.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixel.xml',
         'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
         'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
         'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixelStructureTopology.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
         'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
         'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker461/trackerRecoMaterial.xml',
+        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml',
         'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
         'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
diff --git a/Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.cc b/Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.cc
index fbf18288b2649..77e4d11d2922d 100644
--- a/Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.cc
+++ b/Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.cc
@@ -4,24 +4,8 @@
 #include "Geometry/CSCGeometryBuilder/src/CSCGeometryBuilder.h"
 #include "Geometry/CSCGeometry/interface/CSCChamberSpecs.h"
 
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
-#include "Geometry/Records/interface/MuonNumberingRecord.h"
-
-#include "Geometry/Records/interface/CSCRecoGeometryRcd.h"
-#include "Geometry/Records/interface/CSCRecoDigiParametersRcd.h"
-#include "CondFormats/GeometryObjects/interface/RecoIdealGeometry.h"
-#include "CondFormats/GeometryObjects/interface/CSCRecoDigiParameters.h"
-#include "DetectorDescription/Core/interface/DDCompactView.h"
-
-// Alignments
-#include "CondFormats/Alignment/interface/DetectorGlobalPosition.h"
-#include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
-#include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h"
-#include "CondFormats/AlignmentRecord/interface/CSCAlignmentRcd.h"
-#include "CondFormats/AlignmentRecord/interface/CSCAlignmentErrorExtendedRcd.h"
 #include "Geometry/CommonTopologies/interface/GeometryAligner.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESTransientHandle.h"
 #include "FWCore/Framework/interface/ModuleFactory.h"
 
@@ -33,6 +17,7 @@ CSCGeometryESModule::CSCGeometryESModule(const edm::ParameterSet & p)
   : alignmentsLabel_(p.getParameter<std::string>("alignmentsLabel")),
     myLabel_(p.getParameter<std::string>("appendToDataLabel"))
 {
+  auto cc = setWhatProduced(this);
 
   // Choose wire geometry modelling
   // We now _require_ some wire geometry specification in the CSCOrcaSpec.xml file
@@ -64,16 +49,28 @@ CSCGeometryESModule::CSCGeometryESModule(const edm::ParameterSet & p)
 
   // Find out if using the DDD or CondDB Geometry source.
   useDDD_ = p.getParameter<bool>("useDDD");
+  if(useDDD_) {
+    cpvToken_ = cc.consumesFrom<DDCompactView, IdealGeometryRecord>(edm::ESInputTag{});
+    mdcToken_ = cc.consumesFrom<MuonDDDConstants, MuonNumberingRecord>(edm::ESInputTag{});
+  }
+  else {
+    rigToken_ = cc.consumesFrom<RecoIdealGeometry, CSCRecoGeometryRcd>(edm::ESInputTag{});
+    rdpToken_ = cc.consumesFrom<CSCRecoDigiParameters, CSCRecoDigiParametersRcd>(edm::ESInputTag{});
+  }
 
   // Feed these value to where I need them
   applyAlignment_ = p.getParameter<bool>("applyAlignment");
+  if(applyAlignment_) {
+    globalPositionToken_ = cc.consumesFrom<Alignments, GlobalPositionRcd>(edm::ESInputTag{"", alignmentsLabel_});
+    alignmentsToken_ = cc.consumesFrom<Alignments, CSCAlignmentRcd>(edm::ESInputTag{"", alignmentsLabel_});
+    alignmentErrorsToken_ = cc.consumesFrom<AlignmentErrorsExtended, CSCAlignmentErrorExtendedRcd>(edm::ESInputTag{"", alignmentsLabel_});
+  }
 
 
   edm::LogInfo("Geometry") << "@SUB=CSCGeometryESModule" 
 			   << "Label '" << myLabel_ << "' "
 			   << (applyAlignment_ ? "looking for" : "IGNORING")
 			   << " alignment labels '" << alignmentsLabel_ << "'.";
-  setWhatProduced(this);
 }
 
 
@@ -97,22 +94,19 @@ std::shared_ptr<CSCGeometry> CSCGeometryESModule::produce(const MuonGeometryReco
   if ( applyAlignment_ ) {
     // applyAlignment_ is scheduled for removal. 
     // Ideal geometry obtained by using 'fake alignment' (with applyAlignment_ = true)
-    edm::ESHandle<Alignments> globalPosition;
-    record.getRecord<GlobalPositionRcd>().get(alignmentsLabel_, globalPosition);
-    edm::ESHandle<Alignments> alignments;
-    record.getRecord<CSCAlignmentRcd>().get(alignmentsLabel_, alignments);
-    edm::ESHandle<AlignmentErrorsExtended> alignmentErrors;
-    record.getRecord<CSCAlignmentErrorExtendedRcd>().get(alignmentsLabel_,  alignmentErrors);
+    const auto& globalPosition = record.get(globalPositionToken_);
+    const auto& alignments = record.get(alignmentsToken_);
+    const auto& alignmentErrors = record.get(alignmentErrorsToken_);
     // Only apply alignment if values exist
-    if (alignments->empty() && alignmentErrors->empty() && globalPosition->empty()) {
+    if (alignments.empty() && alignmentErrors.empty() && globalPosition.empty()) {
       edm::LogInfo("Config") << "@SUB=CSCGeometryRecord::produce"
 			     << "Alignment(Error)s and global position (label '"
 			     << alignmentsLabel_ << "') empty: Geometry producer (label "
 			     << "'" << myLabel_ << "') assumes fake and does not apply.";
     } else {
       GeometryAligner aligner;
-      aligner.applyAlignments<CSCGeometry>( &(*host), &(*alignments), &(*alignmentErrors),
-	                    align::DetectorGlobalPosition(*globalPosition, DetId(DetId::Muon)) );
+      aligner.applyAlignments<CSCGeometry>( &(*host), &alignments, &alignmentErrors,
+	                    align::DetectorGlobalPosition(globalPosition, DetId(DetId::Muon)) );
     }
   }
   return host; // automatically converts to std::shared_ptr<CSCGeometry>
@@ -124,14 +118,12 @@ void CSCGeometryESModule::initCSCGeometry_( const MuonGeometryRecord& record, st
   if ( useDDD_ ) {
 
     host->ifRecordChanges<MuonNumberingRecord>(record,
-                                               [&host, &record](auto const& rec) {
+                                               [&host, &record, this](auto const& rec) {
       host->clear();
-      edm::ESTransientHandle<DDCompactView> cpv;
-      edm::ESHandle<MuonDDDConstants> mdc;
-      record.getRecord<IdealGeometryRecord>().get(cpv);
-      rec.get(mdc);
+      edm::ESTransientHandle<DDCompactView> cpv = record.getTransientHandle(cpvToken_);
+      const auto& mdc = rec.get(mdcToken_);
       CSCGeometryBuilderFromDDD builder;
-      builder.build(*host, &(*cpv), *mdc);
+      builder.build(*host, cpv.product(), mdc);
     });
   } else {
     bool recreateGeometry = false;
@@ -148,12 +140,10 @@ void CSCGeometryESModule::initCSCGeometry_( const MuonGeometryRecord& record, st
 
     if (recreateGeometry) {
       host->clear();
-      edm::ESHandle<RecoIdealGeometry> rig;
-      edm::ESHandle<CSCRecoDigiParameters> rdp;
-      record.getRecord<CSCRecoGeometryRcd>().get(rig);
-      record.getRecord<CSCRecoDigiParametersRcd>().get(rdp);
+      const auto& rig = record.get(rigToken_);
+      const auto& rdp = record.get(rdpToken_);
       CSCGeometryBuilder cscgb;
-      cscgb.build(*host, *rig, *rdp);
+      cscgb.build(*host, rig, rdp);
     }
   }
 }
diff --git a/Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.h b/Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.h
index 0b8ed7cdd2fbb..09bf22407371a 100644
--- a/Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.h
+++ b/Geometry/CSCGeometryBuilder/plugins/CSCGeometryESModule.h
@@ -11,9 +11,28 @@
 #include <FWCore/Framework/interface/ESProducer.h>
 #include "FWCore/Framework/interface/ESProductHost.h"
 #include <FWCore/ParameterSet/interface/ParameterSet.h>
+#include "FWCore/Utilities/interface/ESGetToken.h"
 #include "FWCore/Utilities/interface/ReusableObjectHolder.h"
 #include <Geometry/Records/interface/MuonGeometryRecord.h>
 #include <Geometry/CSCGeometry/interface/CSCGeometry.h>
+#include "DetectorDescription/Core/interface/DDCompactView.h"
+
+#include "Geometry/Records/interface/IdealGeometryRecord.h"
+#include "Geometry/Records/interface/MuonNumberingRecord.h"
+
+#include "Geometry/Records/interface/CSCRecoGeometryRcd.h"
+#include "Geometry/Records/interface/CSCRecoDigiParametersRcd.h"
+#include "Geometry/MuonNumbering/interface/MuonDDDConstants.h"
+#include "CondFormats/GeometryObjects/interface/RecoIdealGeometry.h"
+#include "CondFormats/GeometryObjects/interface/CSCRecoDigiParameters.h"
+#include "DetectorDescription/Core/interface/DDCompactView.h"
+
+// Alignments
+#include "CondFormats/Alignment/interface/DetectorGlobalPosition.h"
+#include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
+#include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h"
+#include "CondFormats/AlignmentRecord/interface/CSCAlignmentRcd.h"
+#include "CondFormats/AlignmentRecord/interface/CSCAlignmentErrorExtendedRcd.h"
 
 #include <memory>
 #include <string>
@@ -41,6 +60,16 @@ class CSCGeometryESModule : public edm::ESProducer {
 
   edm::ReusableObjectHolder<HostType> holder_;
 
+  edm::ESGetToken<DDCompactView, IdealGeometryRecord> cpvToken_;
+  edm::ESGetToken<MuonDDDConstants, MuonNumberingRecord> mdcToken_;
+
+  edm::ESGetToken<RecoIdealGeometry, CSCRecoGeometryRcd> rigToken_;
+  edm::ESGetToken<CSCRecoDigiParameters, CSCRecoDigiParametersRcd> rdpToken_;
+
+  edm::ESGetToken<Alignments, GlobalPositionRcd> globalPositionToken_;
+  edm::ESGetToken<Alignments, CSCAlignmentRcd> alignmentsToken_;
+  edm::ESGetToken<AlignmentErrorsExtended, CSCAlignmentErrorExtendedRcd> alignmentErrorsToken_;
+
   // Flags for controlling geometry modelling during build of CSCGeometry
   bool useRealWireGeometry;
   bool useOnlyWiresInME1a;
diff --git a/Geometry/CaloEventSetup/plugins/CaloTopologyBuilder.cc b/Geometry/CaloEventSetup/plugins/CaloTopologyBuilder.cc
index e46d56de1178e..237d176b37893 100644
--- a/Geometry/CaloEventSetup/plugins/CaloTopologyBuilder.cc
+++ b/Geometry/CaloEventSetup/plugins/CaloTopologyBuilder.cc
@@ -38,12 +38,12 @@ CaloTopologyBuilder::produceCalo( const CaloTopologyRecord& iRecord )
    //ECAL parts      
    ct->setSubdetTopology( DetId::Ecal,
 			  EcalBarrel,
-			  new EcalBarrelTopology( theGeometry ) ) ;
+			  std::make_unique<EcalBarrelTopology>( *theGeometry ) ) ;
    ct->setSubdetTopology( DetId::Ecal,
 			  EcalEndcap,
-			  new EcalEndcapTopology( theGeometry ) ) ;
+			  std::make_unique<EcalEndcapTopology>( *theGeometry ) ) ;
    ct->setSubdetTopology( DetId::Ecal,
 			  EcalPreshower,
-			  new EcalPreshowerTopology(theGeometry));
+			  std::make_unique<EcalPreshowerTopology>());
    return ct ;
 }
diff --git a/Geometry/CaloEventSetup/test/TestWriteESAlignments.cc b/Geometry/CaloEventSetup/test/TestWriteESAlignments.cc
index ec84b96ae4bc1..928f523b79ae5 100644
--- a/Geometry/CaloEventSetup/test/TestWriteESAlignments.cc
+++ b/Geometry/CaloEventSetup/test/TestWriteESAlignments.cc
@@ -1,5 +1,6 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -15,7 +16,7 @@ class TestWriteESAlignments : public edm::one::EDAnalyzer<>
 public:
 
   explicit TestWriteESAlignments(const edm::ParameterSet& /*iConfig*/)
-    : nEventCalls_(0) {}
+    : writer_{consumesCollector()}, nEventCalls_{0} {}
   ~TestWriteESAlignments() override {}
   
   void beginJob() override {}
@@ -23,7 +24,7 @@ class TestWriteESAlignments : public edm::one::EDAnalyzer<>
   void endJob() override {}
 
 private:
-  
+  WriteESAlignments writer_;
   unsigned int nEventCalls_;
 };
   
@@ -48,14 +49,14 @@ void TestWriteESAlignments::analyze(const edm::Event& /*evt*/, const edm::EventS
    DVec ytranslVec ( nA, 0 ) ;
    DVec ztranslVec ( nA, 0 ) ;
 
-   const WriteESAlignments wea( evtSetup   ,
-				alphaVec   ,
-				betaVec    ,
-				gammaVec   ,
-				xtranslVec ,
-				ytranslVec ,
-				ztranslVec  ) ;
-   
+   writer_.writeAlignments( evtSetup   ,
+                            alphaVec   ,
+                            betaVec    ,
+                            gammaVec   ,
+                            xtranslVec ,
+                            ytranslVec ,
+                            ztranslVec  ) ;
+
    edm::LogInfo("TestWriteESAlignments") << "Done!";
    nEventCalls_++;
 }
diff --git a/Geometry/CaloTopology/interface/CaloTopology.h b/Geometry/CaloTopology/interface/CaloTopology.h
index 6858b9763ba19..2b9f6baef0731 100644
--- a/Geometry/CaloTopology/interface/CaloTopology.h
+++ b/Geometry/CaloTopology/interface/CaloTopology.h
@@ -4,6 +4,7 @@
 #include "DataFormats/DetId/interface/DetId.h"
 #include "Geometry/CaloTopology/interface/CaloDirection.h"
 #include <map>
+#include <memory>
 #include <vector>
 
 class CaloSubdetectorTopology;
@@ -18,13 +19,13 @@ class CaloSubdetectorTopology;
 class CaloTopology {
 public:
 
-      typedef std::map<int, const CaloSubdetectorTopology*> TopMap ;
+  typedef std::map<int, std::unique_ptr<const CaloSubdetectorTopology>> TopMap ;
 
   CaloTopology();
 
   ~CaloTopology();
   /// Register a subdetector Topology
-  void setSubdetTopology(DetId::Detector det, int subdet, const CaloSubdetectorTopology* geom);
+  void setSubdetTopology(DetId::Detector det, int subdet, std::unique_ptr<const CaloSubdetectorTopology> geom);
   /// access the subdetector Topology for the given subdetector directly
   const CaloSubdetectorTopology* getSubdetectorTopology(const DetId& id) const;
   /// access the subdetector Topology for the given subdetector directly
diff --git a/Geometry/CaloTopology/interface/EcalBarrelTopology.h b/Geometry/CaloTopology/interface/EcalBarrelTopology.h
index d05097c27d3a4..cd0e9e5ebfe7a 100644
--- a/Geometry/CaloTopology/interface/EcalBarrelTopology.h
+++ b/Geometry/CaloTopology/interface/EcalBarrelTopology.h
@@ -8,7 +8,6 @@
 #include "Geometry/CaloTopology/interface/CaloSubdetectorTopology.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
 class EcalBarrelTopology final : public CaloSubdetectorTopology
 {
@@ -21,8 +20,8 @@ class EcalBarrelTopology final : public CaloSubdetectorTopology
   ~EcalBarrelTopology() override { }  
 
   /// create a new Topology from geometry
-  EcalBarrelTopology(edm::ESHandle<CaloGeometry> theGeom) {
-    theGeom_ = theGeom->getSubdetectorGeometry(DetId::Ecal,EcalBarrel);
+  EcalBarrelTopology(CaloGeometry const& theGeom) {
+    theGeom_ = theGeom.getSubdetectorGeometry(DetId::Ecal,EcalBarrel);
   }
   
  /// move the Topology north (increment iphi)
diff --git a/Geometry/CaloTopology/interface/EcalEndcapTopology.h b/Geometry/CaloTopology/interface/EcalEndcapTopology.h
index 8c54ba12f7317..f6aa8e50e7183 100644
--- a/Geometry/CaloTopology/interface/EcalEndcapTopology.h
+++ b/Geometry/CaloTopology/interface/EcalEndcapTopology.h
@@ -20,8 +20,8 @@ class EcalEndcapTopology final : public CaloSubdetectorTopology {
   ~EcalEndcapTopology() override { }  
   
   /// create a new Topology from geometry
-  EcalEndcapTopology(edm::ESHandle<CaloGeometry> theGeom) {
-    theGeom_ = theGeom.product()->getSubdetectorGeometry(DetId::Ecal,EcalEndcap);
+  EcalEndcapTopology(CaloGeometry const& theGeom) {
+    theGeom_ = theGeom.getSubdetectorGeometry(DetId::Ecal,EcalEndcap);
   }
 
   /// move the Topology north (increment iy)  
diff --git a/Geometry/CaloTopology/interface/EcalPreshowerTopology.h b/Geometry/CaloTopology/interface/EcalPreshowerTopology.h
index 6569ad1ff4a87..502fffb7ca860 100644
--- a/Geometry/CaloTopology/interface/EcalPreshowerTopology.h
+++ b/Geometry/CaloTopology/interface/EcalPreshowerTopology.h
@@ -13,16 +13,11 @@ class EcalPreshowerTopology final : public CaloSubdetectorTopology {
 
  public:
   /// create a new Topology
-  EcalPreshowerTopology() : theGeom_(nullptr) {};
+  EcalPreshowerTopology() = default;
 
   /// virtual destructor
   ~EcalPreshowerTopology() override { }  
   
-  /// create a new Topology from geometry
-  EcalPreshowerTopology(edm::ESHandle<CaloGeometry> theGeom) : theGeom_(std::move(theGeom))
-    {
-    }
-
   
   /// move the Topology north (increment iy)  
   DetId  goNorth(const DetId& id) const override {
@@ -119,8 +114,6 @@ class EcalPreshowerTopology final : public CaloSubdetectorTopology {
 
   /// move the nagivator to smaller iz
   ESDetId decrementIz(const ESDetId& id) const;
-
-  edm::ESHandle<CaloGeometry> theGeom_;
 };
 
 #endif
diff --git a/Geometry/CaloTopology/interface/HGCalTopology.h b/Geometry/CaloTopology/interface/HGCalTopology.h
index 8ee6753c929b2..039f56d2589b9 100644
--- a/Geometry/CaloTopology/interface/HGCalTopology.h
+++ b/Geometry/CaloTopology/interface/HGCalTopology.h
@@ -100,6 +100,10 @@ class HGCalTopology : public CaloSubdetectorTopology {
   unsigned int totalGeomModules() const {return (unsigned int)(2*kHGeomHalf_);}
   unsigned int allGeomModules() const;
 
+  bool maskCell(const DetId& id, int corners=3) const {
+    return dddConstants().maskCell(id, corners);
+  }
+
   const HGCalDDDConstants& dddConstants () const {return hdcons_;}
   
   /** returns a new DetId offset by nrStepsX and nrStepsY (can be negative),
diff --git a/Geometry/CaloTopology/src/CaloTopology.cc b/Geometry/CaloTopology/src/CaloTopology.cc
index 4ae65779b4d40..ad77acfe0ebca 100644
--- a/Geometry/CaloTopology/src/CaloTopology.cc
+++ b/Geometry/CaloTopology/src/CaloTopology.cc
@@ -5,31 +5,26 @@
 CaloTopology::CaloTopology() {
 }
 
-CaloTopology::~CaloTopology() 
-{
-   for(auto & theTopologie : theTopologies_)
-   {
-      delete theTopologie.second ;
-   }
-}
+CaloTopology::~CaloTopology() = default;
+
 
 int CaloTopology::makeIndex(DetId::Detector det, int subdet) const {
   return (int(det)<<4) | (subdet&0xF);
 }
 
-void CaloTopology::setSubdetTopology(DetId::Detector det, int subdet, const CaloSubdetectorTopology* geom) {
+void CaloTopology::setSubdetTopology(DetId::Detector det, int subdet, std::unique_ptr<const CaloSubdetectorTopology> geom) {
   int index=makeIndex(det,subdet);
-  theTopologies_[index]=geom;
+  theTopologies_[index]=std::move(geom);
 }
 
 const CaloSubdetectorTopology* CaloTopology::getSubdetectorTopology(const DetId& id) const {
-  std::map<int, const CaloSubdetectorTopology*>::const_iterator i=theTopologies_.find(makeIndex(id.det(),id.subdetId()));
-  return (i==theTopologies_.end())?(nullptr):(i->second);
+  auto i=theTopologies_.find(makeIndex(id.det(),id.subdetId()));
+  return (i==theTopologies_.end())?(nullptr):(i->second.get());
 }
 
 const CaloSubdetectorTopology* CaloTopology::getSubdetectorTopology(DetId::Detector det, int subdet) const {
-    std::map<int, const CaloSubdetectorTopology*>::const_iterator i=theTopologies_.find(makeIndex(det,subdet));
-    return (i==theTopologies_.end())?(nullptr):(i->second);
+    auto i=theTopologies_.find(makeIndex(det,subdet));
+    return (i==theTopologies_.end())?(nullptr):(i->second.get());
 }
 
 static const std::vector<DetId> emptyDetIdVector;
diff --git a/Geometry/CaloTopology/src/HGCalTopology.cc b/Geometry/CaloTopology/src/HGCalTopology.cc
index 8bf546db2973b..816fa174fbd8d 100644
--- a/Geometry/CaloTopology/src/HGCalTopology.cc
+++ b/Geometry/CaloTopology/src/HGCalTopology.cc
@@ -34,7 +34,7 @@ HGCalTopology::HGCalTopology(const HGCalDDDConstants& hdcons,
   } else if (mode_ == HGCalGeometryMode::Trapezoid) {
     det_        = (DetId::Detector)(det);
     subdet_     = ForwardEmpty;
-    kHGeomHalf_ = sectors_*layers_*cells_;
+    kHGeomHalf_ = sectors_*layers_*cellMax_;
     types_      = 2;
   } else {
     det_        = (DetId::Detector)(det);
diff --git a/Geometry/CommonTopologies/BuildFile.xml b/Geometry/CommonTopologies/BuildFile.xml
index 342a0662404b6..cd989e08c726e 100644
--- a/Geometry/CommonTopologies/BuildFile.xml
+++ b/Geometry/CommonTopologies/BuildFile.xml
@@ -1,4 +1,5 @@
 <use   name="FWCore/MessageLogger"/>
+<use   name="CondFormats/Alignment"/>
 <use   name="vdt_headers"/>
 <export>
   <lib   name="1"/>
diff --git a/Geometry/DTGeometryBuilder/data/dtSpecsFilter/2019/v1/dtSpecsFilter.xml b/Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml
similarity index 100%
rename from Geometry/DTGeometryBuilder/data/dtSpecsFilter/2019/v1/dtSpecsFilter.xml
rename to Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml
diff --git a/Geometry/DTGeometryBuilder/plugins/DTGeometryESModule.cc b/Geometry/DTGeometryBuilder/plugins/DTGeometryESModule.cc
index b598e91beb244..9f81bacfcbdb4 100644
--- a/Geometry/DTGeometryBuilder/plugins/DTGeometryESModule.cc
+++ b/Geometry/DTGeometryBuilder/plugins/DTGeometryESModule.cc
@@ -7,21 +7,10 @@
 #include <Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromDDD.h>
 #include <Geometry/DTGeometryBuilder/src/DTGeometryBuilderFromCondDB.h>
 
-#include <Geometry/Records/interface/IdealGeometryRecord.h>
-#include <Geometry/Records/interface/MuonNumberingRecord.h>
-#include "CondFormats/GeometryObjects/interface/RecoIdealGeometry.h"
-#include "Geometry/Records/interface/DTRecoGeometryRcd.h"
-
 // Alignments
 #include "CondFormats/Alignment/interface/DetectorGlobalPosition.h"
-#include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
-#include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h"
-#include "CondFormats/AlignmentRecord/interface/DTAlignmentRcd.h"
-#include "CondFormats/AlignmentRecord/interface/DTAlignmentErrorRcd.h"
-#include "CondFormats/AlignmentRecord/interface/DTAlignmentErrorExtendedRcd.h"
 #include "Geometry/CommonTopologies/interface/GeometryAligner.h"
 
-#include <FWCore/Framework/interface/ESHandle.h>
 #include <FWCore/Framework/interface/ESTransientHandle.h>
 #include <FWCore/Framework/interface/ModuleFactory.h>
 
@@ -39,7 +28,19 @@ DTGeometryESModule::DTGeometryESModule(const edm::ParameterSet & p)
 
   applyAlignment_ = p.getParameter<bool>("applyAlignment");
 
-  setWhatProduced(this);
+  auto cc = setWhatProduced(this);
+  if(applyAlignment_) {
+    globalPositionToken_ = cc.consumesFrom<Alignments, GlobalPositionRcd>(edm::ESInputTag{"", alignmentsLabel_});
+    alignmentsToken_ = cc.consumesFrom<Alignments, DTAlignmentRcd>(edm::ESInputTag{"", alignmentsLabel_});
+    alignmentErrorsToken_ = cc.consumesFrom<AlignmentErrorsExtended, DTAlignmentErrorExtendedRcd>(edm::ESInputTag{"", alignmentsLabel_});
+  }
+  if(fromDDD_) {
+    mdcToken_ = cc.consumesFrom<MuonDDDConstants, MuonNumberingRecord>(edm::ESInputTag{});
+    cpvToken_ = cc.consumesFrom<DDCompactView, IdealGeometryRecord>(edm::ESInputTag{});
+  }
+  else {
+    rigToken_ = cc.consumesFrom<RecoIdealGeometry, DTRecoGeometryRcd>(edm::ESInputTag{});
+  }
 
   edm::LogInfo("Geometry") << "@SUB=DTGeometryESModule"
     << "Label '" << myLabel_ << "' "
@@ -73,14 +74,11 @@ DTGeometryESModule::produce(const MuonGeometryRecord & record) {
   if ( applyAlignment_ ) {
     // applyAlignment_ is scheduled for removal. 
     // Ideal geometry obtained by using 'fake alignment' (with applyAlignment_ = true)
-    edm::ESHandle<Alignments> globalPosition;
-    record.getRecord<GlobalPositionRcd>().get(alignmentsLabel_, globalPosition);
-    edm::ESHandle<Alignments> alignments;
-    record.getRecord<DTAlignmentRcd>().get(alignmentsLabel_, alignments);
-    edm::ESHandle<AlignmentErrorsExtended> alignmentErrors;
-    record.getRecord<DTAlignmentErrorExtendedRcd>().get(alignmentsLabel_, alignmentErrors);
+    const auto& globalPosition = record.get(globalPositionToken_);
+    const auto& alignments = record.get(alignmentsToken_);
+    const auto& alignmentErrors = record.get(alignmentErrorsToken_);
     // Only apply alignment if values exist
-    if (alignments->empty() && alignmentErrors->empty() && globalPosition->empty()) {
+    if (alignments.empty() && alignmentErrors.empty() && globalPosition.empty()) {
       edm::LogInfo("Config") << "@SUB=DTGeometryRecord::produce"
         << "Alignment(Error)s and global position (label '"
         << alignmentsLabel_ << "') empty: Geometry producer (label "
@@ -88,8 +86,8 @@ DTGeometryESModule::produce(const MuonGeometryRecord & record) {
     } else {
       GeometryAligner aligner;
       aligner.applyAlignments<DTGeometry>( &(*host),
-                                           &(*alignments), &(*alignmentErrors),
-                                           align::DetectorGlobalPosition(*globalPosition, DetId(DetId::Muon)));
+                                           &alignments, &alignmentErrors,
+                                           align::DetectorGlobalPosition(globalPosition, DetId(DetId::Muon)));
     }
   }
 
@@ -105,14 +103,11 @@ void DTGeometryESModule::setupGeometry( const MuonNumberingRecord& record,
 
   host->clear();
 
-  edm::ESHandle<MuonDDDConstants> mdc;
-  record.get( mdc );
-
-  edm::ESTransientHandle<DDCompactView> cpv;
-  record.getRecord<IdealGeometryRecord>().get(cpv);
+  const auto& mdc = record.get(mdcToken_);
+  edm::ESTransientHandle<DDCompactView> cpv = record.getTransientHandle(cpvToken_);
 
   DTGeometryBuilderFromDDD builder;
-  builder.build(*host, &(*cpv), *mdc);
+  builder.build(*host, cpv.product(), mdc);
 }
 
 void DTGeometryESModule::setupDBGeometry( const DTRecoGeometryRcd& record,
@@ -123,11 +118,10 @@ void DTGeometryESModule::setupDBGeometry( const DTRecoGeometryRcd& record,
 
   host->clear();
 
-  edm::ESHandle<RecoIdealGeometry> rig;
-  record.get(rig);
+  const auto& rig = record.get(rigToken_);
   
   DTGeometryBuilderFromCondDB builder;
-  builder.build(host, *rig);
+  builder.build(host, rig);
 }
 
 DEFINE_FWK_EVENTSETUP_MODULE(DTGeometryESModule);
diff --git a/Geometry/DTGeometryBuilder/plugins/DTGeometryESModule.h b/Geometry/DTGeometryBuilder/plugins/DTGeometryESModule.h
index c823b0475cb60..62f8171b3d0f7 100644
--- a/Geometry/DTGeometryBuilder/plugins/DTGeometryESModule.h
+++ b/Geometry/DTGeometryBuilder/plugins/DTGeometryESModule.h
@@ -12,10 +12,26 @@
 #include "FWCore/Framework/interface/ESProductHost.h"
 #include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
 #include <FWCore/ParameterSet/interface/ParameterSet.h>
+#include "FWCore/Utilities/interface/ESGetToken.h"
 #include "FWCore/Utilities/interface/ReusableObjectHolder.h"
 #include <Geometry/Records/interface/MuonGeometryRecord.h>
 #include <Geometry/DTGeometry/interface/DTGeometry.h>
 
+#include "Geometry/Records/interface/IdealGeometryRecord.h"
+#include "Geometry/MuonNumbering/interface/MuonDDDConstants.h"
+#include "Geometry/Records/interface/MuonNumberingRecord.h"
+#include "CondFormats/GeometryObjects/interface/RecoIdealGeometry.h"
+#include "Geometry/Records/interface/DTRecoGeometryRcd.h"
+
+// Alignments
+#include "CondFormats/Alignment/interface/Alignments.h"
+#include "CondFormats/Alignment/interface/AlignmentErrors.h"
+#include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
+#include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h"
+#include "CondFormats/AlignmentRecord/interface/DTAlignmentRcd.h"
+#include "CondFormats/AlignmentRecord/interface/DTAlignmentErrorRcd.h"
+#include "CondFormats/AlignmentRecord/interface/DTAlignmentErrorExtendedRcd.h"
+
 #include <memory>
 #include <string>
 
@@ -41,6 +57,13 @@ class DTGeometryESModule : public edm::ESProducer {
 
   edm::ReusableObjectHolder<HostType> holder_;
 
+  edm::ESGetToken<Alignments, GlobalPositionRcd> globalPositionToken_;
+  edm::ESGetToken<Alignments, DTAlignmentRcd> alignmentsToken_;
+  edm::ESGetToken<AlignmentErrorsExtended, DTAlignmentErrorExtendedRcd> alignmentErrorsToken_;
+  edm::ESGetToken<MuonDDDConstants, MuonNumberingRecord> mdcToken_;
+  edm::ESGetToken<DDCompactView, IdealGeometryRecord> cpvToken_;
+  edm::ESGetToken<RecoIdealGeometry, DTRecoGeometryRcd> rigToken_;
+
   bool applyAlignment_; // Switch to apply alignment corrections
   const std::string alignmentsLabel_;
   const std::string myLabel_;
diff --git a/Geometry/DTGeometryBuilder/plugins/DTGeometryValidate.cc b/Geometry/DTGeometryBuilder/plugins/DTGeometryValidate.cc
index d6d550194524f..6ea0afbbeeb6d 100644
--- a/Geometry/DTGeometryBuilder/plugins/DTGeometryValidate.cc
+++ b/Geometry/DTGeometryBuilder/plugins/DTGeometryValidate.cc
@@ -69,6 +69,7 @@ class DTGeometryValidate : public one::EDAnalyzer<>
     thicknesses_.clear();
   }
   
+  edm::ESGetToken<DTGeometry, MuonGeometryRecord> dtGeometryToken_;
   edm::ESHandle<DTGeometry> dtGeometry_;
   FWGeometry                fwGeometry_;
   TFile*                    outFile_;
@@ -84,7 +85,8 @@ class DTGeometryValidate : public one::EDAnalyzer<>
 
 
 DTGeometryValidate::DTGeometryValidate(const edm::ParameterSet& iConfig)
-  : infileName_(iConfig.getUntrackedParameter<string>("infileName", "cmsGeom10.root")),
+  : dtGeometryToken_{esConsumes<DTGeometry, MuonGeometryRecord>(edm::ESInputTag{})},
+    infileName_(iConfig.getUntrackedParameter<string>("infileName", "cmsGeom10.root")),
     outfileName_(iConfig.getUntrackedParameter<string>("outfileName", "validateDTGeometry.root")),
     tolerance_(iConfig.getUntrackedParameter<int>("tolerance", 6))
 {
@@ -95,7 +97,7 @@ DTGeometryValidate::DTGeometryValidate(const edm::ParameterSet& iConfig)
 void 
 DTGeometryValidate::analyze(const edm::Event& event, const edm::EventSetup& eventSetup)
 {
-  eventSetup.get<MuonGeometryRecord>().get(dtGeometry_);
+  dtGeometry_ = eventSetup.getHandle(dtGeometryToken_);
 
   if(dtGeometry_.isValid()) {
     LogVerbatim("DTGeometry") << "Validating DT chamber geometry";
diff --git a/Geometry/DTGeometryBuilder/plugins/dd4hep/DTGeometryESProducer.cc b/Geometry/DTGeometryBuilder/plugins/dd4hep/DTGeometryESProducer.cc
index 49a7b52cbdd21..d8010d7411842 100644
--- a/Geometry/DTGeometryBuilder/plugins/dd4hep/DTGeometryESProducer.cc
+++ b/Geometry/DTGeometryBuilder/plugins/dd4hep/DTGeometryESProducer.cc
@@ -28,13 +28,13 @@
 #include "DataFormats/GeometrySurface/interface/Bounds.h"
 #include "DataFormats/GeometrySurface/interface/RectangularPlaneBounds.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESTransientHandle.h"
 #include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/ESProductHost.h"
 #include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 #include "FWCore/Utilities/interface/ReusableObjectHolder.h"
 #include "Geometry/MuonNumbering/interface/DD4hep_MuonNumbering.h"
 #include "Geometry/Records/interface/MuonNumberingRecord.h"
@@ -78,6 +78,12 @@ class DTGeometryESProducer : public ESProducer {
 
   ReusableObjectHolder<HostType> m_holder;
 
+  edm::ESGetToken<Alignments, GlobalPositionRcd> m_globalPositionToken;
+  edm::ESGetToken<Alignments, DTAlignmentRcd> m_alignmentsToken;
+  edm::ESGetToken<AlignmentErrorsExtended, DTAlignmentErrorExtendedRcd> m_alignmentErrorsToken;
+  edm::ESGetToken<MuonNumbering, MuonNumberingRecord> m_mdcToken;
+  edm::ESGetToken<DDDetector, GeometryFileRcd> m_cpvToken;
+  edm::ESGetToken<DDSpecParRegistry, DDSpecParRegistryRcd> m_registryToken;
   const ESInputTag m_tag;
   const string m_alignmentsLabel;
   const string m_myLabel;
@@ -97,7 +103,19 @@ DTGeometryESProducer::DTGeometryESProducer(const ParameterSet & iConfig)
 {
   m_applyAlignment = iConfig.getParameter<bool>("applyAlignment");
 
-  setWhatProduced(this);
+  auto cc = setWhatProduced(this);
+
+  if(m_applyAlignment) {
+    m_globalPositionToken = cc.consumesFrom<Alignments, GlobalPositionRcd>(edm::ESInputTag{"", m_alignmentsLabel});
+    m_alignmentsToken = cc.consumesFrom<Alignments, DTAlignmentRcd>(edm::ESInputTag{"", m_alignmentsLabel});
+    m_alignmentErrorsToken = cc.consumesFrom<AlignmentErrorsExtended, DTAlignmentErrorExtendedRcd>(edm::ESInputTag{"", m_alignmentsLabel});
+  }
+
+  if(m_fromDDD) {
+    m_mdcToken = cc.consumesFrom<MuonNumbering, MuonNumberingRecord>(edm::ESInputTag{});
+    m_cpvToken = cc.consumesFrom<DDDetector, GeometryFileRcd>(m_tag);
+    m_registryToken = cc.consumesFrom<DDSpecParRegistry, DDSpecParRegistryRcd>(m_tag);
+  }
 
   edm::LogInfo("Geometry") << "@SUB=DTGeometryESProducer"
     << "Label '" << m_myLabel << "' "
@@ -163,14 +181,11 @@ DTGeometryESProducer::setupGeometry(const MuonNumberingRecord& record,
 				    shared_ptr<HostType>& host) {
   host->clear();
   
-  edm::ESHandle<MuonNumbering> mdc;
-  record.get(mdc);
+  const auto& mdc = record.get(m_mdcToken);
   
-  edm::ESTransientHandle<DDDetector> cpv;
-  record.getRecord<GeometryFileRcd>().get(m_tag.module(), cpv);
+  edm::ESTransientHandle<DDDetector> cpv = record.getTransientHandle(m_cpvToken);
   
-  ESTransientHandle<DDSpecParRegistry> registry;
-  record.getRecord<DDSpecParRegistryRcd>().get(m_tag.module(), registry);
+  ESTransientHandle<DDSpecParRegistry> registry = record.getTransientHandle(m_registryToken);
   
   DDSpecParRefs myReg;
   {
@@ -179,7 +194,7 @@ DTGeometryESProducer::setupGeometry(const MuonNumberingRecord& record,
   }
   
   DTGeometryBuilder builder;
-  builder.build(*host, &(*cpv), *mdc, myReg);
+  builder.build(*host, cpv.product(), mdc, myReg);
 }
 
 void
diff --git a/Geometry/DTGeometryBuilder/plugins/dd4hep/DTGeometryTest.cc b/Geometry/DTGeometryBuilder/plugins/dd4hep/DTGeometryTest.cc
index f3fcb359d1975..43c9bc2600a6e 100644
--- a/Geometry/DTGeometryBuilder/plugins/dd4hep/DTGeometryTest.cc
+++ b/Geometry/DTGeometryBuilder/plugins/dd4hep/DTGeometryTest.cc
@@ -23,18 +23,19 @@ class DTGeometryTest : public one::EDAnalyzer<> {
 
 private:  
   const string m_label;
+  const edm::ESGetToken<DTGeometry, MuonGeometryRecord> m_token;
 };
 
 DTGeometryTest::DTGeometryTest(const ParameterSet& iConfig)
-  : m_label(iConfig.getUntrackedParameter<string>("fromDataLabel", ""))
+  : m_label(iConfig.getUntrackedParameter<string>("fromDataLabel", "")),
+    m_token(esConsumes<DTGeometry, MuonGeometryRecord>(edm::ESInputTag{"", m_label}))
 {}
 
 void
 DTGeometryTest::analyze(const Event&, const EventSetup& iEventSetup)
 {
   LogVerbatim("Geometry") << "DTGeometryTest::analyze: " << m_label;
-  ESTransientHandle<DTGeometry> pDD;
-  iEventSetup.get<MuonGeometryRecord>().get(m_label, pDD);
+  ESTransientHandle<DTGeometry> pDD = iEventSetup.getTransientHandle(m_token);
   
   LogVerbatim("Geometry") << " Geometry node for DTGeom is  " << &(*pDD);   
   LogVerbatim("Geometry") << " I have " << pDD->detTypes().size()    << " detTypes";
diff --git a/Geometry/EcalAlgo/interface/WriteESAlignments.h b/Geometry/EcalAlgo/interface/WriteESAlignments.h
index 3cf6117ea42ca..141632b2557c1 100644
--- a/Geometry/EcalAlgo/interface/WriteESAlignments.h
+++ b/Geometry/EcalAlgo/interface/WriteESAlignments.h
@@ -3,10 +3,14 @@
 
 namespace edm
 {
+   class ConsumesCollector;
    class EventSetup ;
 }
 
+#include "FWCore/Utilities/interface/ESGetToken.h"
 #include "CondFormats/Alignment/interface/Alignments.h"
+#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
+#include "Geometry/Records/interface/CaloGeometryRecord.h"
 
 
 class WriteESAlignments
@@ -23,15 +27,15 @@ class WriteESAlignments
 
       static const unsigned int k_nA ;
 
-      WriteESAlignments( const edm::EventSetup& eventSetup ,
-			 const DVec&            alphaVec   ,
-			 const DVec&            betaVec    ,
-			 const DVec&            gammaVec   ,
-			 const DVec&            xtranslVec ,
-			 const DVec&            ytranslVec ,
-			 const DVec&            ztranslVec  ) ;
+      WriteESAlignments(edm::ConsumesCollector&& cc);
 
-      ~WriteESAlignments() ;
+      void writeAlignments( const edm::EventSetup& eventSetup ,
+                            const DVec&            alphaVec   ,
+                            const DVec&            betaVec    ,
+                            const DVec&            gammaVec   ,
+                            const DVec&            xtranslVec ,
+                            const DVec&            ytranslVec ,
+                            const DVec&            ztranslVec  ) ;
 
    private:
 
@@ -45,6 +49,9 @@ class WriteESAlignments
 		    AliVec&                va  ) ;
 
       void write( AliPtr aliPtr ) ;
+
+  edm::ESGetToken<CaloGeometry, CaloGeometryRecord> geometryToken_;
+  edm::ESGetToken<Alignments, ESAlignmentRcd> alignmentToken_;
 };
 
 #endif
diff --git a/Geometry/EcalAlgo/src/WriteESAlignments.cc b/Geometry/EcalAlgo/src/WriteESAlignments.cc
index 7d5db2ee2426c..f70b20e03ade4 100644
--- a/Geometry/EcalAlgo/src/WriteESAlignments.cc
+++ b/Geometry/EcalAlgo/src/WriteESAlignments.cc
@@ -1,6 +1,6 @@
 #include "Geometry/EcalAlgo/interface/WriteESAlignments.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
@@ -8,22 +8,23 @@
 #include "CondCore/CondDB/interface/Serialization.h"
 
 #include "Geometry/EcalAlgo/interface/EcalPreshowerGeometry.h"
-#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
-#include "Geometry/Records/interface/CaloGeometryRecord.h"
 
 typedef WriteESAlignments WEA ;
 
 const unsigned int WEA::k_nA = EcalPreshowerGeometry::numberOfAlignments() ;
 
-WEA::~WriteESAlignments(){}
-
-WEA::WriteESAlignments( const edm::EventSetup& eventSetup ,
-			const WEA::DVec&       alphaVec   ,
-			const WEA::DVec&       betaVec    ,
-			const WEA::DVec&       gammaVec   ,
-			const WEA::DVec&       xtranslVec ,
-			const WEA::DVec&       ytranslVec ,
-			const WEA::DVec&       ztranslVec  ) 
+WEA::WriteESAlignments(edm::ConsumesCollector&& cc):
+  geometryToken_{cc.esConsumes<CaloGeometry, CaloGeometryRecord>(edm::ESInputTag{})},
+  alignmentToken_{cc.esConsumes<Alignments, ESAlignmentRcd>(edm::ESInputTag{})}
+{}
+
+void WEA::writeAlignments( const edm::EventSetup& eventSetup ,
+                           const WEA::DVec&       alphaVec   ,
+                           const WEA::DVec&       betaVec    ,
+                           const WEA::DVec&       gammaVec   ,
+                           const WEA::DVec&       xtranslVec ,
+                           const WEA::DVec&       ytranslVec ,
+                           const WEA::DVec&       ztranslVec  )
 {
    assert( alphaVec.size()   == k_nA ) ;
    assert( betaVec.size()    == k_nA ) ;
@@ -72,14 +73,12 @@ WEA::convert( const edm::EventSetup& eS ,
 	      const WEA::DVec&       z  ,
 	      WEA::AliVec&           va   ) 
 {
-   edm::ESHandle<CaloGeometry>       pG   ;
-   eS.get<CaloGeometryRecord>().get( pG ) ;
+   const auto& pG = eS.getData(geometryToken_);
 
-   const CaloSubdetectorGeometry* geom(pG->getSubdetectorGeometry( DetId::Ecal, EcalPreshower) ) ;
+   const CaloSubdetectorGeometry* geom(pG.getSubdetectorGeometry( DetId::Ecal, EcalPreshower) ) ;
 
-   edm::ESHandle<Alignments>  pA ;
-   eS.get<ESAlignmentRcd>().get( pA ) ;
-   const AliVec& vaPrev ( pA->m_align ) ;
+   const auto& pA = eS.getData(alignmentToken_);
+   const AliVec& vaPrev ( pA.m_align ) ;
 
    va.reserve( k_nA ) ;
    for( unsigned int i ( 0 ) ; i != k_nA ; ++i )
diff --git a/Geometry/EcalMapping/plugins/EcalElectronicsMappingBuilder.cc b/Geometry/EcalMapping/plugins/EcalElectronicsMappingBuilder.cc
index f1b7f97c11c35..b0a520ca3babe 100644
--- a/Geometry/EcalMapping/plugins/EcalElectronicsMappingBuilder.cc
+++ b/Geometry/EcalMapping/plugins/EcalElectronicsMappingBuilder.cc
@@ -4,15 +4,11 @@
 #include "DataFormats/EcalDetId/interface/EcalTriggerElectronicsId.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "CondFormats/DataRecord/interface/EcalMappingElectronicsRcd.h"
 
-EcalElectronicsMappingBuilder::EcalElectronicsMappingBuilder(const edm::ParameterSet&)
-{
-  //the following line is needed to tell the framework what
-  // data is being produced
-  setWhatProduced(this);
-}
+EcalElectronicsMappingBuilder::EcalElectronicsMappingBuilder(const edm::ParameterSet&):
+  eeToken_{setWhatProduced(this).consumesFrom<EcalMappingElectronics, EcalMappingElectronicsRcd>(edm::ESInputTag{})}
+{}
 
 // ------------ method called to produce the data  ------------
 EcalElectronicsMappingBuilder::ReturnType
@@ -20,11 +16,9 @@ EcalElectronicsMappingBuilder::produce(const EcalMappingRcd& iRecord)
 {
    auto prod = std::make_unique<EcalElectronicsMapping>();
 
-   const EcalMappingElectronicsRcd& fRecord = iRecord.getRecord<EcalMappingElectronicsRcd>();
-   edm::ESHandle <EcalMappingElectronics> item;
-   fRecord.get(item);
+   const auto& item = iRecord.get(eeToken_);
 
-   const std::vector<EcalMappingElement>& ee = item->endcapItems();
+   const std::vector<EcalMappingElement>& ee = item.endcapItems();
    FillFromDatabase(ee,*prod);
    return prod;
 }
diff --git a/Geometry/EcalMapping/plugins/EcalElectronicsMappingBuilder.h b/Geometry/EcalMapping/plugins/EcalElectronicsMappingBuilder.h
index d50ab98302d13..078ed53d8b680 100644
--- a/Geometry/EcalMapping/plugins/EcalElectronicsMappingBuilder.h
+++ b/Geometry/EcalMapping/plugins/EcalElectronicsMappingBuilder.h
@@ -6,6 +6,7 @@
 
 #include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 
 #include "Geometry/EcalMapping/interface/EcalMappingRcd.h"
 #include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h"
@@ -27,5 +28,7 @@ class EcalElectronicsMappingBuilder : public edm::ESProducer
  private:
   void FillFromDatabase(const std::vector<EcalMappingElement>& ee,
                         EcalElectronicsMapping& theMap);
+
+  edm::ESGetToken<EcalMappingElectronics, EcalMappingElectronicsRcd> eeToken_;
 };
 #endif
diff --git a/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.cc b/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.cc
index 0c29336b739a1..c1586c9f85090 100755
--- a/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.cc
+++ b/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.cc
@@ -30,7 +30,10 @@ EcalTBGeometryBuilder::EcalTBGeometryBuilder(const edm::ParameterSet& iConfig)
 {
    //the following line is needed to tell the framework what
    // data is being produced
-   setWhatProduced(this);
+   auto cc = setWhatProduced(this);
+
+   barrelToken_ = cc.consumes<CaloSubdetectorGeometry>(edm::ESInputTag{"", "EcalBarrel"});
+   hodoscopeToken_ = cc.consumes<CaloSubdetectorGeometry>(edm::ESInputTag{"", "EcalLaserPnDiode"});
 
    //now do what ever other initialization is needed
 }
@@ -54,16 +57,16 @@ EcalTBGeometryBuilder::produce(const IdealGeometryRecord& iRecord)
    auto pCaloGeom = std::make_unique<CaloGeometry>();
 
    // TODO: Look for ECAL parts
-   try {
-     iRecord.get("EcalBarrel", pG); 
+   if(auto pG = iRecord.getHandle(barrelToken_)) {
      pCaloGeom->setSubdetGeometry(DetId::Ecal,EcalBarrel,pG.product());
-   } catch (...) {
+   }
+   else {
      edm::LogWarning("MissingInput") << "No Ecal Barrel Geometry found";     
    }
-   try {
-     iRecord.get("EcalLaserPnDiode", pG); 
+   if(auto pG = iRecord.getHandle(hodoscopeToken_)) {
      pCaloGeom->setSubdetGeometry(DetId::Ecal,EcalLaserPnDiode,pG.product());
-   } catch (...) {
+   }
+   else {
      edm::LogWarning("MissingInput") << "No Ecal TB Hodoscope Geometry found";     
    }
 
diff --git a/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.h b/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.h
index 934afa51a4c0a..7af7e0cdfaac5 100755
--- a/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.h
+++ b/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.h
@@ -25,8 +25,10 @@
 
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
+#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 
 //
 // class decleration
@@ -42,5 +44,7 @@ class EcalTBGeometryBuilder : public edm::ESProducer {
   ReturnType produce(const IdealGeometryRecord&);
 private:
       // ----------member data ---------------------------
+  edm::ESGetToken<CaloSubdetectorGeometry, IdealGeometryRecord> barrelToken_;
+  edm::ESGetToken<CaloSubdetectorGeometry, IdealGeometryRecord> hodoscopeToken_;
 };
 
diff --git a/Geometry/EcalTestBeam/plugins/EcalTBHodoscopeGeometryEP.cc b/Geometry/EcalTestBeam/plugins/EcalTBHodoscopeGeometryEP.cc
index d811fa7d62a41..a36ee4c9587cc 100755
--- a/Geometry/EcalTestBeam/plugins/EcalTBHodoscopeGeometryEP.cc
+++ b/Geometry/EcalTestBeam/plugins/EcalTBHodoscopeGeometryEP.cc
@@ -16,9 +16,7 @@
 //
 
 #include "Geometry/EcalTestBeam/plugins/EcalTBHodoscopeGeometryEP.h"
-#include "Geometry/EcalTestBeam/plugins/EcalTBHodoscopeGeometryLoaderFromDDD.h"
 
-#include <iostream>
 //
 // constants, enums and typedefs
 //
@@ -30,20 +28,9 @@
 //
 // constructors and destructor
 //
-EcalTBHodoscopeGeometryEP::EcalTBHodoscopeGeometryEP(const edm::ParameterSet& iConfig)
-{
-   //the following line is needed to tell the framework what
-   // data is being produced
-  setWhatProduced(this,"EcalLaserPnDiode");
-  //now do what ever other initialization is needed
-  loader_=new EcalTBHodoscopeGeometryLoaderFromDDD(); 
-}
-
-
-EcalTBHodoscopeGeometryEP::~EcalTBHodoscopeGeometryEP()
-{ 
-  delete loader_;
-}
+EcalTBHodoscopeGeometryEP::EcalTBHodoscopeGeometryEP(const edm::ParameterSet& iConfig):
+  cpvToken_{setWhatProduced(this,"EcalLaserPnDiode").consumes<DDCompactView>(edm::ESInputTag{})}
+{}
 
 
 //
@@ -55,11 +42,10 @@ EcalTBHodoscopeGeometryEP::ReturnType
 EcalTBHodoscopeGeometryEP::produce(const IdealGeometryRecord& iRecord)
 {
 
-   edm::ESTransientHandle<DDCompactView> cpv;
-   iRecord.get( cpv );
+   edm::ESTransientHandle<DDCompactView> cpv = iRecord.getTransientHandle(cpvToken_);
    
-   std::cout << "[EcalTBHodoscopeGeometryEP]::Constructing EcalTBHodoscopeGeometry" <<  std::endl;
-   return std::unique_ptr<CaloSubdetectorGeometry>(loader_->load(&(*cpv)));
+   LogDebug("EcalTBHodoscopeGeometryEP") << "[EcalTBHodoscopeGeometryEP]::Constructing EcalTBHodoscopeGeometry";
+   return std::unique_ptr<CaloSubdetectorGeometry>(loader_.load(&(*cpv)));
 }
 
 
diff --git a/Geometry/EcalTestBeam/plugins/EcalTBHodoscopeGeometryEP.h b/Geometry/EcalTestBeam/plugins/EcalTBHodoscopeGeometryEP.h
index 0269b1e3c7814..af590b917dd7b 100755
--- a/Geometry/EcalTestBeam/plugins/EcalTBHodoscopeGeometryEP.h
+++ b/Geometry/EcalTestBeam/plugins/EcalTBHodoscopeGeometryEP.h
@@ -10,13 +10,12 @@
 #include "FWCore/Framework/interface/ESProducer.h"
 
 #include "FWCore/Framework/interface/ESTransientHandle.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-
-
-//Forward declaration
-class EcalTBHodoscopeGeometryLoaderFromDDD;
+#include "DetectorDescription/Core/interface/DDCompactView.h"
+#include "Geometry/EcalTestBeam/plugins/EcalTBHodoscopeGeometryLoaderFromDDD.h"
 
 //
 // class declaration
@@ -25,7 +24,7 @@ class EcalTBHodoscopeGeometryLoaderFromDDD;
 class EcalTBHodoscopeGeometryEP : public edm::ESProducer {
  public:
   EcalTBHodoscopeGeometryEP(const edm::ParameterSet&);
-  ~EcalTBHodoscopeGeometryEP() override;
+  ~EcalTBHodoscopeGeometryEP() override = default;
   
   typedef std::unique_ptr<CaloSubdetectorGeometry> ReturnType;
   
@@ -34,7 +33,8 @@ class EcalTBHodoscopeGeometryEP : public edm::ESProducer {
  private:
 
   // ----------member data ---------------------------
-  EcalTBHodoscopeGeometryLoaderFromDDD* loader_;
+  EcalTBHodoscopeGeometryLoaderFromDDD loader_;
+  edm::ESGetToken<DDCompactView, IdealGeometryRecord> cpvToken_;
 };
 
 
diff --git a/Geometry/EcalTestBeam/test/CrystalCenterDump.cc b/Geometry/EcalTestBeam/test/CrystalCenterDump.cc
index f3593edb3939c..4a4b031383537 100644
--- a/Geometry/EcalTestBeam/test/CrystalCenterDump.cc
+++ b/Geometry/EcalTestBeam/test/CrystalCenterDump.cc
@@ -23,9 +23,9 @@
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
@@ -60,6 +60,8 @@ class CrystalCenterDump : public edm::one::EDAnalyzer<>
   double beamEnergy_;
 
   double crystalDepth(){ return A_*(B_+log(beamEnergy_)); }
+
+  edm::ESGetToken<CaloGeometry, CaloGeometryRecord> geometryToken_;
 };
 
 CrystalCenterDump::CrystalCenterDump( const edm::ParameterSet& iConfig )
@@ -74,6 +76,7 @@ CrystalCenterDump::CrystalCenterDump( const edm::ParameterSet& iConfig )
   edm::LogInfo("CrysInfo") << "Position computed according to the depth " << crystalDepth() << 
     " based on:" << "\n A = " << A_ << " cm " << "\n B = " << B_ << "\n BeamEnergy = " << beamEnergy_ << " GeV";
 
+  geometryToken_ = esConsumes<CaloGeometry, CaloGeometryRecord>(edm::ESInputTag{});
 }
 
 
@@ -135,13 +138,12 @@ CrystalCenterDump::analyze( const edm::Event& iEvent, const edm::EventSetup& iSe
    
    std::cout << "Writing the center (eta,phi) for crystals in barrel SM 1 " << std::endl;
 
-   edm::ESHandle<CaloGeometry> pG;
-   iSetup.get<CaloGeometryRecord>().get(pG);     
+   const auto& pG = iSetup.getData(geometryToken_);
    //
    // get the ecal & hcal geometry
    //
    if (pass_==0) {
-     build(*pG,DetId::Ecal,EcalBarrel,"BarrelSM1CrystalCenter.dat");
+     build(pG,DetId::Ecal,EcalBarrel,"BarrelSM1CrystalCenter.dat");
    }
 
    pass_++;
diff --git a/Geometry/EcalTestBeam/test/EcalTBHodoscopeGeometryAnalyzer.cc b/Geometry/EcalTestBeam/test/EcalTBHodoscopeGeometryAnalyzer.cc
index 7906ee43d9423..ca785017411ec 100755
--- a/Geometry/EcalTestBeam/test/EcalTBHodoscopeGeometryAnalyzer.cc
+++ b/Geometry/EcalTestBeam/test/EcalTBHodoscopeGeometryAnalyzer.cc
@@ -22,9 +22,9 @@
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
@@ -63,6 +63,7 @@ class EcalTBHodoscopeGeometryAnalyzer : public edm::one::EDAnalyzer<>
   double phi_;
   CLHEP::HepRotation * fromCMStoTB_;
 
+  edm::ESGetToken<CaloGeometry, CaloGeometryRecord> geometryToken_;
 };
 
 //
@@ -85,6 +86,8 @@ EcalTBHodoscopeGeometryAnalyzer::EcalTBHodoscopeGeometryAnalyzer( const edm::Par
   phi_ = iConfig.getUntrackedParameter<double>("phi",0.115052);
 
   fromCMStoTB_ = fromCMStoTB( eta_ , phi_ );
+
+  geometryToken_ = esConsumes<CaloGeometry, CaloGeometryRecord>(edm::ESInputTag{});
 }
 
 
@@ -127,14 +130,13 @@ EcalTBHodoscopeGeometryAnalyzer::analyze( const edm::Event& iEvent, const edm::E
 {
    std::cout << "Here I am " << std::endl;
 
-   edm::ESHandle<CaloGeometry> pG;
-   iSetup.get<CaloGeometryRecord>().get(pG);     
+   auto const pG = iSetup.getData(geometryToken_);
    //
    // get the ecal & hcal geometry
    //
 
    if (pass_==0) {
-     build(*pG,DetId::Ecal,EcalLaserPnDiode);
+     build(pG,DetId::Ecal,EcalLaserPnDiode);
    }
 
    pass_++;
diff --git a/Geometry/EcalTestBeam/test/ee/CaloGeometryEPtest.h b/Geometry/EcalTestBeam/test/ee/CaloGeometryEPtest.h
index 66d2dfdd41767..577e1dfba822f 100644
--- a/Geometry/EcalTestBeam/test/ee/CaloGeometryEPtest.h
+++ b/Geometry/EcalTestBeam/test/ee/CaloGeometryEPtest.h
@@ -8,7 +8,7 @@
 #include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 #include "FWCore/Framework/interface/ESTransientHandle.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h"
@@ -35,9 +35,14 @@ class CaloGeometryEPtest : public edm::ESProducer
       CaloGeometryEPtest<T>( const edm::ParameterSet& ps ) :
 	 m_applyAlignment ( ps.getParameter<bool>("applyAlignment") )
       {
-	 setWhatProduced( this,
-			  &CaloGeometryEPtest<T>::produceAligned,
-			  edm::es::Label( T::producerTag() ) ) ;
+         auto cc = setWhatProduced( this,
+                                    &CaloGeometryEPtest<T>::produceAligned,
+                                    edm::es::Label( T::producerTag() ) ) ;
+         if(m_applyAlignment) {
+           m_alignmentsToken = cc.template consumesFrom<Alignments, typename T::AlignmentRecord>(edm::ESInputTag{});
+           m_globalsToken = cc.template consumesFrom<Alignments, GlobalPositionRcd>(edm::ESInputTag{});
+         }
+         m_geometryToken = cc.template consumesFrom<DDCompactView, IdealGeometryRecord>(edm::ESInputTag{});
       }
 
       ~CaloGeometryEPtest<T>() override {}
@@ -47,28 +52,25 @@ class CaloGeometryEPtest : public edm::ESProducer
 	 const Alignments* globalPtr ( nullptr ) ;
 	 if( m_applyAlignment ) // get ptr if necessary
 	 {
-	    edm::ESHandle< Alignments >                                      alignments ;
-	    iRecord.template getRecord< typename T::AlignmentRecord >().get( alignments ) ;
+           const auto& alignments = iRecord.get(m_alignmentsToken);
 
-	    assert( alignments.isValid() && // require valid alignments and expected size
-		    ( alignments->m_align.size() == T::numberOfAlignments() ) ) ;
-	    alignPtr = alignments.product() ;
+           // require expected size
+           assert( alignments.m_align.size() == T::numberOfAlignments() ) ;
+           alignPtr = &alignments ;
 
-	    edm::ESHandle< Alignments >                          globals   ;
-	    iRecord.template getRecord<GlobalPositionRcd>().get( globals ) ;
-
-	    assert( globals.isValid() ) ;
-	    globalPtr = globals.product() ;
+           globalPtr = &(iRecord.get(m_globalsToken));
 	 }
-	 edm::ESTransientHandle<DDCompactView> cpv ;
-	 iRecord.template getRecord<IdealGeometryRecord>().get( cpv ) ;
+	 edm::ESTransientHandle<DDCompactView> cpv = iRecord.getTransientHandle(m_geometryToken);
 
 	 LoaderType loader ;
-	 return loader.load( &(*cpv), alignPtr, globalPtr);
+	 return loader.load( cpv.product(), alignPtr, globalPtr);
       }
 
    private:
 
+      edm::ESGetToken<Alignments, typename T::AlignmentRecord> m_alignmentsToken;
+      edm::ESGetToken<Alignments, GlobalPositionRcd> m_globalsToken;
+      edm::ESGetToken<DDCompactView, IdealGeometryRecord> m_geometryToken;
 
       bool        m_applyAlignment ;
 };
diff --git a/Geometry/EcalTestBeam/test/ee/SurveyToTransforms.cc b/Geometry/EcalTestBeam/test/ee/SurveyToTransforms.cc
index c7dd932149ef8..98b29705006e5 100644
--- a/Geometry/EcalTestBeam/test/ee/SurveyToTransforms.cc
+++ b/Geometry/EcalTestBeam/test/ee/SurveyToTransforms.cc
@@ -1,7 +1,7 @@
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
 #include "Geometry/EcalAlgo/interface/EcalBarrelGeometry.h"
 #include "Geometry/EcalAlgo/interface/EcalEndcapGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
@@ -40,6 +40,8 @@ class SurveyToTransforms : public edm::one::EDAnalyzer<edm::one::SharedResources
   TProfile* h_phi;
 
   TH1D* h_diffs[10][12];
+
+  edm::ESGetToken<CaloGeometry, CaloGeometryRecord> geometryToken_;
 };
 
 SurveyToTransforms::SurveyToTransforms( const edm::ParameterSet& iConfig )
@@ -67,15 +69,16 @@ SurveyToTransforms::SurveyToTransforms( const edm::ParameterSet& iConfig )
 					  200, -200., 200. ) ;
      }
   }
+
+  geometryToken_ = esConsumes<CaloGeometry, CaloGeometryRecord>(edm::ESInputTag{});
 }
 
 void
 SurveyToTransforms::analyze( const edm::Event& iEvent, const edm::EventSetup& iSetup )
 {
-   edm::ESHandle<CaloGeometry> pG;
-   iSetup.get<CaloGeometryRecord>().get(pG);     
+  const auto& pG = iSetup.getData(geometryToken_);
 
-   pG->getSubdetectorGeometry( DetId::Ecal, EcalEndcap ) ;
+  pG.getSubdetectorGeometry( DetId::Ecal, EcalEndcap ) ;
 }
 
 DEFINE_FWK_MODULE(SurveyToTransforms);
diff --git a/Geometry/ForwardCommonData/python/totemTest2019XML_cfi.py b/Geometry/ForwardCommonData/python/totemTest2021XML_cfi.py
similarity index 98%
rename from Geometry/ForwardCommonData/python/totemTest2019XML_cfi.py
rename to Geometry/ForwardCommonData/python/totemTest2021XML_cfi.py
index d9d0138c9c155..bbea4840febe7 100644
--- a/Geometry/ForwardCommonData/python/totemTest2019XML_cfi.py
+++ b/Geometry/ForwardCommonData/python/totemTest2021XML_cfi.py
@@ -227,8 +227,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/hcalSimNumbering/2019/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/hcalRecNumbering/2019/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
@@ -246,7 +246,7 @@
         'Geometry/ForwardCommonData/data/PostLS2/bcml2.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
         'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
-        'Geometry/ForwardCommonData/data/totemTest/2019/totemTest.xml',
+        'Geometry/ForwardCommonData/data/totemTest/2021/totemTest.xml',
         'Geometry/ForwardCommonData/data/zdcmaterials.xml',
         'Geometry/ForwardCommonData/data/lumimaterials.xml',
         'Geometry/ForwardCommonData/data/zdcrotations.xml',
@@ -254,7 +254,7 @@
         'Geometry/ForwardCommonData/data/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/2019/v2/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/muonNumbering/2021/v1/muonNumbering.xml',
         'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
         'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
diff --git a/Geometry/ForwardCommonData/python/totemTest2019_cff.py b/Geometry/ForwardCommonData/python/totemTest2021_cff.py
similarity index 81%
rename from Geometry/ForwardCommonData/python/totemTest2019_cff.py
rename to Geometry/ForwardCommonData/python/totemTest2021_cff.py
index 1223aee56bb45..616b3547d4344 100644
--- a/Geometry/ForwardCommonData/python/totemTest2019_cff.py
+++ b/Geometry/ForwardCommonData/python/totemTest2021_cff.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 # Geometry for simulation
-from Geometry.ForwardCommonData.totemTest2019XML_cfi import *
+from Geometry.ForwardCommonData.totemTest2021XML_cfi import *
 from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
 from Geometry.HcalCommonData.hcalParameters_cfi      import *
 from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import *
diff --git a/Geometry/GlobalTrackingGeometryBuilder/plugins/GlobalTrackingGeometryESProducer.cc b/Geometry/GlobalTrackingGeometryBuilder/plugins/GlobalTrackingGeometryESProducer.cc
index 4529fcd058b2d..e37f2daaa4fe5 100644
--- a/Geometry/GlobalTrackingGeometryBuilder/plugins/GlobalTrackingGeometryESProducer.cc
+++ b/Geometry/GlobalTrackingGeometryBuilder/plugins/GlobalTrackingGeometryESProducer.cc
@@ -20,7 +20,14 @@
 using namespace edm;
 
 GlobalTrackingGeometryESProducer::GlobalTrackingGeometryESProducer(const edm::ParameterSet & p){
-  setWhatProduced(this);
+  auto cc = setWhatProduced(this);
+  trackerToken_ = cc.consumesFrom<TrackerGeometry, TrackerDigiGeometryRecord>(edm::ESInputTag{});
+  mtdToken_ = cc.consumesFrom<MTDGeometry, MTDDigiGeometryRecord>(edm::ESInputTag{});
+  dtToken_ = cc.consumesFrom<DTGeometry, MuonGeometryRecord>(edm::ESInputTag{});
+  cscToken_ = cc.consumesFrom<CSCGeometry, MuonGeometryRecord>(edm::ESInputTag{});
+  rpcToken_ = cc.consumesFrom<RPCGeometry, MuonGeometryRecord>(edm::ESInputTag{});
+  gemToken_ = cc.consumesFrom<GEMGeometry, MuonGeometryRecord>(edm::ESInputTag{});
+  me0Token_ = cc.consumesFrom<ME0Geometry, MuonGeometryRecord>(edm::ESInputTag{});
 }
 
 GlobalTrackingGeometryESProducer::~GlobalTrackingGeometryESProducer(){}
@@ -36,10 +43,8 @@ GlobalTrackingGeometryESProducer::produce(const GlobalTrackingGeometryRecord& re
   GEMGeometry const* gem = nullptr;
   ME0Geometry const* me0 = nullptr;
 
-  edm::ESHandle<TrackerGeometry> tkH;
   if( auto tkRecord = record.tryToGetRecord<TrackerDigiGeometryRecord>() ) {
-    tkRecord->get(tkH);
-    if(tkH.isValid()) {
+    if(auto tkH = tkRecord->getHandle(trackerToken_)) {
       tk = tkH.product();
     } else {
       LogWarning("GeometryGlobalTrackingGeometryBuilder") << "No Tracker geometry is available.";
@@ -48,10 +53,8 @@ GlobalTrackingGeometryESProducer::produce(const GlobalTrackingGeometryRecord& re
     LogWarning("GeometryGlobalTrackingGeometryBuilder") << "No TrackerDigiGeometryRecord is available.";    
   }
 
-  edm::ESHandle<MTDGeometry> mtdH;
   if( auto mtdRecord = record.tryToGetRecord<MTDDigiGeometryRecord>() ) {
-    mtdRecord->get(mtdH);
-    if( mtdH.isValid() ) {
+    if(auto mtdH = mtdRecord->getHandle(mtdToken_)) {
       mtd = mtdH.product();
     } else {
       LogInfo("GeometryGlobalTrackingGeometryBuilder") << "No MTD geometry is available.";
@@ -60,42 +63,32 @@ GlobalTrackingGeometryESProducer::produce(const GlobalTrackingGeometryRecord& re
      LogInfo("GeometryGlobalTrackingGeometryBuilder") << "No MTDDigiGeometryRecord is available.";
   }
   
-  edm::ESHandle<DTGeometry> dtH;
-  edm::ESHandle<CSCGeometry> cscH;
-  edm::ESHandle<RPCGeometry> rpcH;
-  edm::ESHandle<GEMGeometry> gemH;
-  edm::ESHandle<ME0Geometry> me0H;
   if( auto muonRecord = record.tryToGetRecord<MuonGeometryRecord>() ) {
-    muonRecord->get(dtH);
-    if(dtH.isValid()) {
+    if(auto dtH = muonRecord->getHandle(dtToken_)) {
       dt = dtH.product();
     } else {
       LogWarning("GeometryGlobalTrackingGeometryBuilder") << "No DT geometry is available.";
     }
     
-    muonRecord->get(cscH);
-    if(cscH.isValid()) {
+    if(auto cscH = muonRecord->getHandle(cscToken_)) {
       csc = cscH.product();
     } else {
       LogWarning("GeometryGlobalTrackingGeometryBuilder") << "No CSC geometry is available.";
     }    
     
-    muonRecord->get(rpcH);
-    if(rpcH.isValid()) {
+    if(auto rpcH = muonRecord->getHandle(rpcToken_)) {
       rpc = rpcH.product();
     } else {
       LogWarning("GeometryGlobalTrackingGeometryBuilder") << "No RPC geometry is available.";
     }
     
-    muonRecord->get(gemH);
-    if(gemH.isValid()) {
+    if(auto gemH = muonRecord->getHandle(gemToken_)) {
       gem = gemH.product();
     } else {
       LogInfo("GeometryGlobalTrackingGeometryBuilder") << "No GEM geometry is available.";
     }
     
-    muonRecord->get(me0H);
-    if(me0H.isValid()) {
+    if(auto me0H = muonRecord->getHandle(me0Token_)) {
       me0 = me0H.product();
     } else {
       LogInfo("GeometryGlobalTrackingGeometryBuilder") << "No ME0 geometry is available.";
diff --git a/Geometry/GlobalTrackingGeometryBuilder/plugins/GlobalTrackingGeometryESProducer.h b/Geometry/GlobalTrackingGeometryBuilder/plugins/GlobalTrackingGeometryESProducer.h
index 5301ee4180daa..f3f26e1bc184c 100644
--- a/Geometry/GlobalTrackingGeometryBuilder/plugins/GlobalTrackingGeometryESProducer.h
+++ b/Geometry/GlobalTrackingGeometryBuilder/plugins/GlobalTrackingGeometryESProducer.h
@@ -16,6 +16,16 @@
 #include <string>
 
 class GlobalTrackingGeometry;
+class TrackerGeometry;
+class MTDGeometry;
+class DTGeometry;
+class CSCGeometry;
+class RPCGeometry;
+class GEMGeometry;
+class ME0Geometry;
+class TrackerDigiGeometryRecord;
+class MTDDigiGeometryRecord;
+class MuonGeometryRecord;
 
 class GlobalTrackingGeometryESProducer : public edm::ESProducer {
 public:
@@ -31,6 +41,13 @@ class GlobalTrackingGeometryESProducer : public edm::ESProducer {
 
 private:  
 
+  edm::ESGetToken<TrackerGeometry, TrackerDigiGeometryRecord> trackerToken_;
+  edm::ESGetToken<MTDGeometry, MTDDigiGeometryRecord> mtdToken_;
+  edm::ESGetToken<DTGeometry, MuonGeometryRecord> dtToken_;
+  edm::ESGetToken<CSCGeometry, MuonGeometryRecord> cscToken_;
+  edm::ESGetToken<RPCGeometry, MuonGeometryRecord> rpcToken_;
+  edm::ESGetToken<GEMGeometry, MuonGeometryRecord> gemToken_;
+  edm::ESGetToken<ME0Geometry, MuonGeometryRecord> me0Token_;
 };
 #endif
 
diff --git a/Geometry/GlobalTrackingGeometryBuilder/test/GlobalTrackingGeometryTest.cc b/Geometry/GlobalTrackingGeometryBuilder/test/GlobalTrackingGeometryTest.cc
index 84af4101f435b..e039bc1d3db6c 100644
--- a/Geometry/GlobalTrackingGeometryBuilder/test/GlobalTrackingGeometryTest.cc
+++ b/Geometry/GlobalTrackingGeometryBuilder/test/GlobalTrackingGeometryTest.cc
@@ -47,10 +47,13 @@ class GlobalTrackingGeometryTest : public edm::one::EDAnalyzer<>
   void analyzeTracker(const GlobalTrackingGeometry* geo, const TrackerGeometry* tkGeometry);
   const std::string& myName() { return my_name; }
   std::string my_name;    
+  edm::ESGetToken<GlobalTrackingGeometry, GlobalTrackingGeometryRecord> geometryToken_;
 };
 
 GlobalTrackingGeometryTest::GlobalTrackingGeometryTest( const edm::ParameterSet& /*iConfig*/)
- : my_name( "GlobalTrackingGeometryTest" ) {}
+  : my_name( "GlobalTrackingGeometryTest" ),
+    geometryToken_{esConsumes<GlobalTrackingGeometry, GlobalTrackingGeometryRecord>(edm::ESInputTag{})}
+ {}
 
 GlobalTrackingGeometryTest::~GlobalTrackingGeometryTest() {}
 
@@ -196,14 +199,13 @@ void GlobalTrackingGeometryTest::analyze( const edm::Event& /*iEvent*/, const ed
 {
   std::cout << myName() << ": Analyzer..." << std::endl;
 
-  edm::ESHandle<GlobalTrackingGeometry> geo;
-  iSetup.get<GlobalTrackingGeometryRecord>().get(geo);     
+  const auto& geo = iSetup.getData(geometryToken_);
     
   DetId detId1(DetId::Tracker, 0);
   const TrackerGeometry* trackerGeometry = nullptr;
   std::cout << "Pointer to Tracker Geometry: ";
   try {
-    trackerGeometry = (const TrackerGeometry*) geo->slaveGeometry(detId1);
+    trackerGeometry = (const TrackerGeometry*) geo.slaveGeometry(detId1);
     std::cout << trackerGeometry << std::endl;
   } catch (...) {
     std::cout << "N/A" << std::endl;
@@ -213,7 +215,7 @@ void GlobalTrackingGeometryTest::analyze( const edm::Event& /*iEvent*/, const ed
   const MTDGeometry* mtdGeometry = nullptr;
   std::cout << "Pointer to MTD Geometry: ";
   try {
-    mtdGeometry = (const MTDGeometry*) geo->slaveGeometry(detId6);
+    mtdGeometry = (const MTDGeometry*) geo.slaveGeometry(detId6);
     std::cout << mtdGeometry << std::endl;
   } catch (...) {
     std::cout << "N/A" << std::endl;
@@ -223,7 +225,7 @@ void GlobalTrackingGeometryTest::analyze( const edm::Event& /*iEvent*/, const ed
   const DTGeometry* dtGeometry = nullptr;
   std::cout << "Pointer to DT Geometry: ";
   try {
-    dtGeometry = (const DTGeometry*) geo->slaveGeometry(detId2);
+    dtGeometry = (const DTGeometry*) geo.slaveGeometry(detId2);
     std::cout << dtGeometry << std::endl;
   } catch (...) {
     std::cout << "N/A" << std::endl;
@@ -233,7 +235,7 @@ void GlobalTrackingGeometryTest::analyze( const edm::Event& /*iEvent*/, const ed
   const CSCGeometry* cscGeometry = nullptr;
   std::cout << "Pointer to CSC Geometry: "; 
   try {
-    cscGeometry = (const CSCGeometry*) geo->slaveGeometry(detId3);
+    cscGeometry = (const CSCGeometry*) geo.slaveGeometry(detId3);
     std::cout << cscGeometry << std::endl;
   } catch (...) {
     std::cout << "N/A" << std::endl;
@@ -243,7 +245,7 @@ void GlobalTrackingGeometryTest::analyze( const edm::Event& /*iEvent*/, const ed
   const RPCGeometry* rpcGeometry = nullptr;
   std::cout << "Pointer to RPC Geometry: ";
   try {
-    rpcGeometry = (const RPCGeometry*) geo->slaveGeometry(detId4);
+    rpcGeometry = (const RPCGeometry*) geo.slaveGeometry(detId4);
     std::cout <<  rpcGeometry << std::endl;
   } catch (...) {
     std::cout << "N/A" << std::endl;
@@ -253,18 +255,18 @@ void GlobalTrackingGeometryTest::analyze( const edm::Event& /*iEvent*/, const ed
   const GEMGeometry* gemGeometry = nullptr;
   std::cout << "Pointer to GEM Geometry: ";
   try {
-    gemGeometry = (const GEMGeometry*) geo->slaveGeometry(detId5);
+    gemGeometry = (const GEMGeometry*) geo.slaveGeometry(detId5);
     std::cout <<  gemGeometry << std::endl;
   } catch (...) {
     std::cout << "N/A" << std::endl;
   }
 
-  if (cscGeometry) analyzeCSC(geo.product(), cscGeometry);
-  if (dtGeometry) analyzeDT(geo.product(), dtGeometry);
-  if (rpcGeometry) analyzeRPC(geo.product(), rpcGeometry);
-  if (gemGeometry) analyzeGEM(geo.product(), gemGeometry);
-  if (mtdGeometry) analyzeMTD(geo.product(), mtdGeometry);
-  if (trackerGeometry) analyzeTracker(geo.product(), trackerGeometry);
+  if (cscGeometry) analyzeCSC(&geo, cscGeometry);
+  if (dtGeometry) analyzeDT(&geo, dtGeometry);
+  if (rpcGeometry) analyzeRPC(&geo, rpcGeometry);
+  if (gemGeometry) analyzeGEM(&geo, gemGeometry);
+  if (mtdGeometry) analyzeMTD(&geo, mtdGeometry);
+  if (trackerGeometry) analyzeTracker(&geo, trackerGeometry);
 }
 
 //define this as a plug-in
diff --git a/Geometry/HGCalCommonData/data/TB181/Oct182/ahcal.xml b/Geometry/HGCalCommonData/data/TB181/Oct182/ahcal.xml
new file mode 100644
index 0000000000000..af45331ae1ce7
--- /dev/null
+++ b/Geometry/HGCalCommonData/data/TB181/Oct182/ahcal.xml
@@ -0,0 +1,209 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+<ConstantsSection label="ahcal.xml" eval="true">
+  <Constant name="absorberThick" value="17.2*mm"/>
+  <Constant name="radiatorThick" value="17.2*mm"/>
+  <Constant name="airgapThick"   value="1.285*mm"/>
+  <Constant name="cassetteThick" value="0.5*mm"/>
+  <Constant name="cableThick"    value="1.5*mm"/>
+  <Constant name="pcbThick"      value="0.7*mm"/>
+  <Constant name="foilThick"     value="0.115*mm"/>
+  <Constant name="scintThick"    value="3.0*mm"/>
+  <Constant name="passiveHeight" value="72.0*cm"/>
+  <Constant name="passiveWidth"  value="72.0*cm"/>
+  <Constant name="activeHeight"  value="72.0*cm"/>
+  <Constant name="activeWidth"   value="72.0*cm"/>
+  <Constant name="tileGap"       value="30.0*mm"/>
+  <Constant name="tileHeight"    value="30*mm"/>
+  <Constant name="tileWidth"     value="30*mm"/>
+  <Constant name="tileEdge"      value="0.1*mm"/>
+</ConstantsSection>
+
+<MaterialSection label="ahcal.xml">
+  <CompositeMaterial name="Steel235" density="7.87*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.9843">
+      <rMaterial name="materials:Iron"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0017">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0140">
+      <rMaterial name="materials:Manganese"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PCB" density="1.70*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.180774">
+      <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.405633">
+      <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.278042">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0684428">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0671091">
+      <rMaterial name="materials:Bromine"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Polystyrene" density="1.060*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.077418">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.922582">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PVC" density="1.35*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.048384">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.384378">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.567238">
+      <rMaterial name="materials:Chlorine"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Polystyrole" density="1.065*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.077421">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.922579">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="CFM" density="0.120*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.009">
+      <rMaterial name="materials:Air"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.872">
+      <rMaterial name="ahcal:PVC"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.119">
+      <rMaterial name="ahcal:Polystyrole"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+
+<SolidSection label="ahcal.xml">
+  <Box name="AHcalTileSensitive" dx="[tileWidth]/2" dy="[tileHeight]/2"
+       dz="[scintThick]/2"/>
+</SolidSection>
+
+<LogicalPartSection label="ahcal.xml">
+  <LogicalPart name="AHcalTileSensitive" category="unspecified">
+    <rSolid name="AHcalTileSensitive"/>
+    <rMaterial name="ahcal:Polystyrene"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="ahcal.xml">
+  <Algorithm name="hgcal:DDAHcalModuleAlgo">
+    <rParent name="hgcal:HGCalAH"/>
+    <String name="TileName" value="ahcal:AHcalTileSensitive"/>
+    <Vector name="MaterialNames" type="string" nEntries="9">
+      ahcal:Steel235, materials:Air, ahcal:Steel235, ahcal:CFM, ahcal:PCB, 
+      ahcal:Polystyrole, ahcal:Polystyrene, ahcal:Steel235, ahcal:Steel235</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="9">
+      AHcalRadiator, AHcalAirGap, AHcalCassette, AHcalCable, AHcalPCB,
+      AHcalFoil, AHcalActive, AHcalAbsorber, AHcalAbsorberLastCover</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="9">
+      [ahcal:radiatorThick], [ahcal:airgapThick], [ahcal:cassetteThick], 
+      [ahcal:cableThick], [ahcal:pcbThick], [ahcal:foilThick], 
+      [ahcal:scintThick], [ahcal:absorberThick], 5.0*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="22"> 
+      20, 20, 20, 20, 20, 
+      20, 20, 20, 20, 20, 
+      20, 20, 20, 20, 20, 
+      20, 20, 20, 20, 4,
+      12, 3</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="22"> 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 
+      52.4*mm, 52.4*mm, 52.4*mm, 52.4*mm, 36.97*mm,
+      44.685*mm, 23.485*mm
+      </Vector>
+    <Vector name="LayerType" type="numeric" nEntries="399"> 
+      7, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 
+      0, 1, 0, 1, 
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 
+      0, 1, 8
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="399">
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 
+      0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 
+      0, 0, 0
+    </Vector>
+    <Vector name="Widths" type="numeric" nEntries="2">
+      [ahcal:passiveWidth], [ahcal:activeWidth] </Vector>
+    <Vector name="Heights" type="numeric" nEntries="2">
+      [ahcal:passiveHeight], [ahcal:activeHeight] </Vector>
+    <Vector name="TileN" type="numeric" nEntries="2">
+      24, 24 </Vector>
+    <Vector name="TileStep" type="numeric" nEntries="2">
+      [ahcal:tileGap], [ahcal:tileGap] </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminAH]"/>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="ahcal.xml" eval="true">
+  <SpecPar name="AHcal">
+    <PartSelector path="//AHcalTileSensitive.*"/>
+    <Parameter name="Volume" value="AHcalTileSensitive" eval="false"/>
+    <Parameter name="SensitiveDetector" value="AHcalSensitiveDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsAHcal">
+    <PartSelector path="//HGCalAH"/>
+    <Parameter name="CMSCutsRegion" value="HGCalAHcalRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/TB181/Oct182/hgcal.xml b/Geometry/HGCalCommonData/data/TB181/Oct182/hgcal.xml
new file mode 100644
index 0000000000000..7fc8b6dfbe395
--- /dev/null
+++ b/Geometry/HGCalCommonData/data/TB181/Oct182/hgcal.xml
@@ -0,0 +1,259 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+<ConstantsSection label="hgcal.xml" eval="true">
+  <Constant name="rmin"          value="0.0*fm"/>
+  <Constant name="rmax"          value="52.0*cm"/>
+  <Constant name="zCaloFront"    value="2500*cm"/>
+  <Constant name="rminEE"        value="0.0*fm"/>
+  <Constant name="rmaxEE"        value="8.0*cm"/>
+  <Constant name="rmaxEEF"       value="9.5*cm"/>
+  <Constant name="zminEE"        value="0.0*fm"/>
+  <Constant name="zmaxEE"        value="63.0*cm"/>
+  <Constant name="rminHE"        value="0.0*fm"/>
+  <Constant name="rmaxHE"        value="19.5*cm"/>
+  <Constant name="rmaxHEF"       value="26.5*cm"/>
+  <Constant name="zminHE"        value="0.0*fm"/>
+  <Constant name="zmaxHE"        value="94.5*cm"/>
+  <Constant name="rminAH"        value="0.0*fm"/>
+  <Constant name="rmaxAH"        value="[rmax]"/>
+  <Constant name="zminAH"        value="0.0*fm"/>
+  <Constant name="zmaxAH"        value="110.1*cm"/>
+  <Constant name="zgapEEFH"      value="3.5*cm"/>
+  <Constant name="zgapFHBH"      value="36.5*cm"/>
+  <Constant name="zCalor"        value="([zmaxEE]+[zgapEEFH]+[zmaxHE]+[zgapFHBH]+
+					[zmaxAH])/2.0"/>
+  <Constant name="zposCalo"      value="([zCaloFront]+[zCalor])"/>
+  <Constant name="zposEE"        value="-[zCalor]"/>
+  <Constant name="zposHE"        value="[zposEE]+[zmaxEE]+[zgapEEFH]"/>
+  <Constant name="zposAH"        value="[zposHE]+[zmaxHE]+[zgapFHBH]"/>
+  <Constant name="thSilicon"     value="0.1*mm"/>
+  <Constant name="thPCB"         value="1.3*mm"/>
+  <Constant name="thKapton"      value="0.075*mm"/>
+  <Constant name="thCuKapton"    value="0.025*mm"/>
+  <Constant name="thCuPCB"       value="0.175*mm"/>
+  <Constant name="thAbsEE"       value="1.2*mm"/>
+  <Constant name="thAbsEE48To63" value="0.55*mm"/>
+  <Constant name="thAbsEE52To70" value="0.61*mm"/>
+  <Constant name="thAbsEE59To62" value="0.61*mm"/>
+  <Constant name="thAbsEE68To74" value="0.71*mm"/>
+  <Constant name="thAbsCuEE"     value="1.2*mm"/>
+  <Constant name="thAbsHE"       value="1.2*mm"/>
+  <Constant name="thAbsCuHE"     value="1.2*mm"/>
+  <Constant name="thAbsPCBHE"    value="1.2*mm"/>
+  <Constant name="WaferW"        value="123.7*mm"/>
+  <Constant name="tan30deg"      value="tan(30.0*deg)"/>
+</ConstantsSection>
+
+<MaterialSection label="hgcal.xml">
+  <CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75">
+      <rMaterial name="materials:Tungsten"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.25">
+      <rMaterial name="materials:Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+<SolidSection label="hgcal.xml">
+  <Tubs name="HGCal" rMin="[rmin]" rMax="[rmax]" dz="[zCalor]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Polycone name="HGCalEE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+    <ZSection z="[zmaxEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+  </Polycone>
+  <Polycone name="HGCalHE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+    <ZSection z="[zmaxHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+  </Polycone>
+  <Polycone name="HGCalAH" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+    <ZSection z="[zmaxAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+  </Polycone>
+  <Polyhedra name="HGCalEESensitive" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHESiliconSensitive" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalCuKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thCuKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thCuKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalCuPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thCuPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thCuPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs48To63" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE48To63]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE48To63]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs52To70" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE52To70]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE52To70]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs59To62" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE59To62]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE59To62]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs68To74" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE68To74]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE68To74]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEECuAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsCuEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsCuEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHECuAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsCuHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsCuHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHEPCBAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsPCBHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsPCBHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+</SolidSection>
+
+<LogicalPartSection label="hgcal.xml">
+  <LogicalPart name="HGCal" category="unspecified">
+    <rSolid name="HGCal"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEE" category="unspecified">
+    <rSolid name="HGCalEE"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHE" category="unspecified">
+    <rSolid name="HGCalHE"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalAH" category="unspecified">
+    <rSolid name="HGCalAH"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEESensitive" category="unspecified">
+    <rSolid name="HGCalEESensitive"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHESiliconSensitive" category="unspecified">
+    <rSolid name="HGCalHESiliconSensitive"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuKapton" category="unspecified">
+    <rSolid name="HGCalCuKapton"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuPCB" category="unspecified">
+    <rSolid name="HGCalCuPCB"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHECuKapton" category="unspecified">
+    <rSolid name="HGCalCuKapton"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHECuPCB" category="unspecified">
+    <rSolid name="HGCalCuPCB"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber" category="unspecified">
+    <rSolid name="HGCalEEAbs"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber48To63" category="unspecified">
+    <rSolid name="HGCalEEAbs48To63"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber52To70" category="unspecified">
+    <rSolid name="HGCalEEAbs52To70"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber59To62" category="unspecified">
+    <rSolid name="HGCalEEAbs59To62"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber68To74" category="unspecified">
+    <rSolid name="HGCalEEAbs68To74"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuAbsorber" category="unspecified">
+    <rSolid name="HGCalEECuAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEAbsorber" category="unspecified">
+    <rSolid name="HGCalHEAbs"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHECuAbsorber" category="unspecified">
+    <rSolid name="HGCalHECuAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEPCBAbsorber" category="unspecified">
+    <rSolid name="HGCalHEPCBAbs"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEAirAbsorber" category="unspecified">
+    <rSolid name="HGCalHEPCBAbs"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcal.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcal:HGCal"/>
+    <Translation x="0*fm" y="0*fm" z="[zposCalo]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalEE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposEE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalHE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposHE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalAH"/>
+    <Translation x="0*fm" y="0*fm" z="[zposAH]"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/TB181/Oct182/hgcalBeam.xml b/Geometry/HGCalCommonData/data/TB181/Oct182/hgcalBeam.xml
new file mode 100644
index 0000000000000..b2f6738453afd
--- /dev/null
+++ b/Geometry/HGCalCommonData/data/TB181/Oct182/hgcalBeam.xml
@@ -0,0 +1,430 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+<ConstantsSection label="hgcalBeam.xml" eval="true">
+  <Constant name="upstreamDxby2" value="100.0*cm"/>
+  <Constant name="upstreamDyby2" value="100.0*cm"/>
+  <Constant name="upstreamDzby2" value="400.0*cm"/>
+  <Constant name="upstreamZ" value="-400.0*cm"/>
+  <Constant name="tol" value="0.0*mm"/>
+  <Constant name="chambDxby2" value="11.0*cm"/>
+  <Constant name="chambAlT" value="5.0*mm"/>
+  <Constant name="chambKapW" value="11.0*cm"/>
+  <Constant name="chambKapT" value="0.025*mm"/>
+  <Constant name="chambVetW" value="25.0*mm"/>
+  <Constant name="chambVetT" value="5.0*mm"/>
+  <Constant name="chambVetGap" value="12.0*cm"/>
+  <Constant name="chambVetL" value="0.5*([chambVetGap]+[chambVetW])"/>
+  <Constant name="chambVetX" value="0.5*[chambVetW]"/>
+  <Constant name="chambVetZ" value="20.0*mm"/>
+  <Constant name="chambGasGap" value="([chambVetZ]+0.5*[chambVetT]+[tol])"/>
+  <Constant name="chambGasW" value="([chambVetW]+0.5*[chambVetGap]+[tol])"/>
+  <Constant name="chambDzby2" value="([chambGasGap]+[chambAlT]+2*[tol])"/>
+  <Constant name="chambAl1L" value="0.5*([chambDxby2]+0.5*[chambKapW])"/>
+  <Constant name="chambAl1W" value="0.5*([chambDxby2]-0.5*[chambKapW])"/>
+  <Constant name="chambAl1X" value="([chambDxby2]-[chambAl1L])"/>
+  <Constant name="chambAl1Y" value="([chambDxby2]-[chambAl1W])"/>
+  <Constant name="chambAl1Z" value="([chambGasGap]+0.5*[chambAlT]+[tol])"/>
+  <Constant name="chambAl2L" value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chambAl2X" value="([chambDxby2]-[chambAl2L])"/>
+  <Constant name="chambAl2Y" value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chamb1Z" value="-507.6*cm"/>
+  <Constant name="chamb2Z" value="-400.3*cm"/>
+  <Constant name="chamb3Z" value="-200.5*cm"/>
+  <Constant name="s1Dxby2" value="7.0*cm"/>
+  <Constant name="s1Dzby2" value="5.0*mm"/>
+  <Constant name="s1Z" value="-375.4*cm"/>
+  <Constant name="s2Dxby2" value="2.0*cm"/>
+  <Constant name="s2Dzby2" value="5.0*mm"/>
+  <Constant name="s2Z" value="-360.5*cm"/>
+  <Constant name="s3Dxby2" value="1.0*cm"/>
+  <Constant name="s3Dzby2" value="5.0*mm"/>
+  <Constant name="s3Z" value="-345.6*cm"/>
+  <Constant name="s4Z" value="-240.8*cm"/>
+  <Constant name="bhDxby2" value="50.0*cm"/>
+  <Constant name="bhDyby2" value="15.0*cm"/>
+  <Constant name="bhDzby2" value="0.5*cm"/>
+  <Constant name="bhGap" value="7.5*cm"/>
+  <Constant name="bhX" value="([bhDxby2]-0.5*[bhGap])"/>
+  <Constant name="bhY" value="([bhDyby2]+0.5*[bhGap])"/>
+  <Constant name="bhZ1" value="-229.3*cm"/>
+  <Constant name="bhZ2" value="-221.3*cm"/>
+  <Constant name="ck3Rad" value="8.35*cm"/>
+  <Constant name="ck3L" value="200.0*cm"/>
+  <Constant name="ck3Z" value="-569.0*cm"/>
+  <Constant name="downstreamDxby2" value="50.0*cm"/>
+  <Constant name="downstreamDyby2" value="50.0*cm"/>
+  <Constant name="downstreamDzby2" value="370.0*cm"/>
+  <Constant name="downstreamZ" value="1980.0*cm"/>
+  <Constant name="chamb4Z" value="1620*cm"/>
+  <Constant name="chamb5Z" value="2340.0*cm"/>
+  <Constant name="mcDxby2" value="40.0*cm"/>
+  <Constant name="mcDzby2" value="20.0*mm"/>
+  <Constant name="mc1Z" value="([hgcal:zCaloFront]-18*cm-4.6*cm)"/>
+  <Constant name="mc2Z" value="([hgcal:zCaloFront]-4.6*cm)"/>
+  <Constant name="s5Dxby2" value="9.5*cm"/>
+  <Constant name="s5Dzby2" value="2.0*cm"/>
+  <Constant name="s5Z"     value="([hgcal:zCaloFront]-[s5Dzby2])"/>
+</ConstantsSection>
+
+<SolidSection label="hgcalBeam.xml">
+  <Box name="HGCalBeam" dx="[upstreamDxby2]" dy="[upstreamDyby2]" dz="[upstreamDzby2]"/>
+  <Box name="HGCalBeamWChamb" dx="[chambDxby2]" dy="[chambDxby2]" dz="[chambDzby2]"/>
+  <Box name="HGCalBeamWChambGas" dx="[chambGasW]" dy="[chambGasW]" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamWChambVet" dx="[chambVetL]" dy="[chambVetW]/2" dz="[chambVetT]/2"/>
+  <Box name="HGCalBeamWChambWindow" dx="[chambKapW]/2" dy="[chambKapW]/2" dz="[chambKapT]/2"/>
+  <Box name="HGCalBeamWChambAl1" dx="[chambAl1L]" dy="[chambAl1W]" dz="[chambAlT]/2"/>
+  <Box name="HGCalBeamWChambAl2" dx="[chambAl2L]" dy="[chambAlT]/2" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamS1" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamS2" dx="[s2Dxby2]" dy="[s2Dxby2]" dz="[s2Dzby2]"/>
+  <Box name="HGCalBeamS3" dx="[s3Dxby2]" dy="[s3Dxby2]" dz="[s3Dzby2]"/>
+  <Box name="HGCalBeamS4" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamS5" dx="[s5Dxby2]" dy="[s5Dxby2]" dz="[s5Dzby2]"/>
+  <Box name="HGCalBeamS6" dx="[s5Dxby2]" dy="[s5Dxby2]" dz="[s5Dzby2]"/>
+  <Box name="HGCalBeamHaloCounter" dx="[bhDxby2]" dy="[bhDyby2]" dz="[bhDzby2]"/>
+  <Tubs name="HGCalBeamCK3" rMin="0*fm" rMax="[ck3Rad]" dz="[ck3L]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Box name="HGCalBeamDown" dx="[downstreamDxby2]" dy="[downstreamDyby2]" dz="[downstreamDzby2]"/>
+  <Box name="HGCalBeamMuonCounter" dx="[mcDxby2]" dy="[mcDxby2]" dz="[mcDzby2]"/>
+</SolidSection>
+
+<LogicalPartSection label="hgcalBeam.xml">
+  <LogicalPart name="HGCalBeam" category="unspecified">
+    <rSolid name="HGCalBeam"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChamb" category="unspecified">
+    <rSolid name="HGCalBeamWChamb"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambGas" category="unspecified">
+    <rSolid name="HGCalBeamWChambGas"/>
+    <rMaterial name="materials:Ar 50pct plus CO_2 50pct"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambVet" category="unspecified">
+    <rSolid name="HGCalBeamWChambVet"/>
+    <rMaterial name="materials:Polyethylene"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambWindow" category="unspecified">
+    <rSolid name="HGCalBeamWChambWindow"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl1" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl1"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl2" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl2"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS1" category="unspecified">
+    <rSolid name="HGCalBeamS1"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS2" category="unspecified">
+    <rSolid name="HGCalBeamS2"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS3" category="unspecified">
+    <rSolid name="HGCalBeamS3"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS4" category="unspecified">
+    <rSolid name="HGCalBeamS4"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS5" category="unspecified">
+    <rSolid name="HGCalBeamS5"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS6" category="unspecified">
+    <rSolid name="HGCalBeamS6"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamHaloCounter" category="unspecified">
+    <rSolid name="HGCalBeamHaloCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamCK3" category="unspecified">
+    <rSolid name="HGCalBeamCK3"/>
+    <rMaterial name="materials:Freon-12"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamDown" category="unspecified">
+    <rSolid name="HGCalBeamDown"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamMuonCounter" category="unspecified">
+    <rSolid name="HGCalBeamMuonCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<RotationSection label="hgcalBeam.xml">
+  <Rotation name="R1" phiX="90*deg" thetaX="90*deg" phiY="180*deg" thetaY="90*deg" phiZ="0*deg" thetaZ="0*deg"/>
+</RotationSection>
+
+<PosPartSection label="hgcalBeam.xml">
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambGas"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2X]" y="[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2Y]" y="[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2X]" y="-[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2Y]" y="-[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="-([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="9">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="10">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb1Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb2Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb3Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS1"/>
+    <Translation x="0*fm" y="0*fm" z="([s1Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS2"/>
+    <Translation x="0*fm" y="0*fm" z="([s2Z]-[upstreamZ]-[s2Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS3"/>
+    <Translation x="0*fm" y="0*fm" z="([s3Z]-[upstreamZ]-[s3Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS4"/>
+    <Translation x="0*fm" y="0*fm" z="([s4Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="-[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="13">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="-[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="14">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="0">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamCK3"/>
+    <Translation x="0*fm" y="0*fm" z="([ck3Z]-[upstreamZ]-0.5*[ck3L])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb4Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb5Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeam"/>
+    <Translation x="0*fm" y="0*fm" z="[upstreamZ]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamDown"/>
+    <Translation x="0*fm" y="0*fm" z="[downstreamZ]"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamS5"/>
+    <Translation x="0*fm" y="0*fm" z="([mc1Z])"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamS6"/>
+    <Translation x="0*fm" y="0*fm" z="([mc2Z])"/>
+  </PosPart>
+</PosPartSection>
+
+<SpecParSection label="hgcalBeam.xml" eval="true">
+  <SpecPar name="hgcalbeam">
+    <PartSelector path="//HGCalBeamS.*"/>
+    <PartSelector path="//HGCalBeamHaloCounter"/>
+    <PartSelector path="//HGCalBeamMuonCounter"/>
+    <PartSelector path="//HGCalBeamCK3"/>
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="SensitiveDetector" value="HcalTB06BeamDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalTB06BeamHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcalbeamWC">
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="Volume" value="WireChamber" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsBeam">
+    <PartSelector path="//HGCalBeam"/>
+    <PartSelector path="//HGCalBeamDown"/>
+    <Parameter name="CMSCutsRegion" value="HGCalBeamRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/TB181/Oct182/hgcalEE.xml b/Geometry/HGCalCommonData/data/TB181/Oct182/hgcalEE.xml
new file mode 100644
index 0000000000000..f07fb34183049
--- /dev/null
+++ b/Geometry/HGCalCommonData/data/TB181/Oct182/hgcalEE.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+<ConstantsSection label="hgcalEE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*cm"/>
+  <Constant name="rMaxMiddle" value="120.0*cm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="0.0*fm"/>
+  <Constant name="rMax"       value="[hgcal:rmaxEE]"/>
+  <Constant name="rMaxB"      value="[hgcal:rmaxEEF]"/>
+  <Constant name="absorbW"    value="0.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="[hgcal:WaferW]*[hgcal:tan30deg]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalEE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModuleX">
+    <rParent name="hgcal:HGCalEE"/>
+    <String name="GeneralMaterial" value="materials:Air"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="11">
+      hgcal:HGCalEESensitive,      hgcal:HGCalEEPCB,
+      hgcal:HGCalEEKapton,           hgcal:HGCalEEAbsorber,
+      hgcal:HGCalEECuAbsorber,       hgcal:HGCalEEAbsorber48To63,
+      hgcal:HGCalEEAbsorber52To70,   hgcal:HGCalEEAbsorber59To62,
+      hgcal:HGCalEEAbsorber68To74,   hgcal:HGCalEECuKapton,
+      hgcal:HGCalEECuPCB</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="29">
+      materials:Air,       materials:Air,    materials:Air, 
+      materials:Air,       materials:Air,    materials:Air,
+      materials:Air,       materials:Air,    materials:StainlessSteel, 
+      materials:Lead,      materials:Copper, materials:Air, 
+      materials:Aluminium, materials:Air,    materials:Air,   
+      materials:Air,       materials:Air,    materials:Air,
+      materials:Air,       materials:Air,    materials:Air,
+      materials:Air,       materials:Air,    materials:Air,
+      materials:Iron,      materials:Air,    materials:Air,
+      materials:Air,       materials:Aluminium</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="29">
+      EEPCB,             EEKapton,          EECuWShield, 
+      EECuShield,        EECuWShield48To63, EECuWShield52To70,
+      EECuWShield59To62, EECuWShield68To74, EEFeAbsorber, 
+      EEPbAbsorber,      EECuHeatShield,    EESensitive, 
+      EEAlcase,          EEgap1,            EEgap2,      
+      EEgap3,            EEgap4,            EEgap5,      
+      EEgap6,            EEgap7,            EEgap8,      
+      EEgap9,            EEgap10,           EEgap11,      
+      EEFHAbs,           EECuKapton,        EECuPCB,
+      EEgap12,           EEMCPAl</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="29">
+      [hgcal:thPCB],         [hgcal:thKapton],      [hgcal:thAbsEE], 
+      [hgcal:thAbsCuEE],     [hgcal:thAbsEE48To63], [hgcal:thAbsEE52To70],
+      [hgcal:thAbsEE59To62], [hgcal:thAbsEE68To74], 0.3*mm,        
+      4.9*mm,                6.0*mm,                [hgcal:thSilicon],   
+      2.1*mm,                3.095*mm,              3.145*mm, 
+      3.7*mm,                4.7*mm,                5.5*mm,
+      6.7*mm,                7.7*mm,                8.7*mm,
+      9.5*mm,                10.09*mm,              119.7*mm,
+      40.0*mm,               [hgcal:thCuKapton],    [hgcal:thCuPCB],
+      84.0*mm,               5.0*mm</Vector>
+    <Numeric name="InOut"   value="1"/>
+    <Vector name="LayerFrontIn" type="numeric" nEntries="15"> 
+       0, 24, 46, 68, 90,112,134,156,178,200,222,246,270,294,318</Vector>
+    <Vector name="LayerBackIn" type="numeric" nEntries="15"> 
+      23, 45, 67, 89,111,133,155,177,199,221,245,269,293,317,319</Vector>
+    <Vector name="BlockThick" type="numeric" nEntries="15"> 
+      149.15*mm, 29.05*mm,  29.05*mm, 
+      30.05*mm,  30.05*mm,  30.05*mm, 
+      28.05*mm,  28.05*mm,  28.05*mm, 
+      28.05*mm,  32.25*mm,  35.05*mm, 
+      31.455*mm, 32.155*mm, 86.1*mm
+    </Vector>
+    <Vector name="LayerType" type="numeric" nEntries="320"> 
+      28, 12, 23, 8,  9, 8, 16,  0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26, 0,
+      19,  8,  9, 8, 15, 0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26,  0,
+      19,  8,  9, 8, 15, 0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26,  0,
+      20,  8,  9, 8, 15, 0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26,  0,
+      20,  8,  9, 8, 15, 0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26,  0,
+      20,  8,  9, 8, 15, 0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26,  0,
+      18,  8,  9, 8, 15, 0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26,  0,
+      18,  8,  9, 8, 15, 0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26,  0,
+      18,  8,  9, 8, 15, 0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26,  0,
+      18,  8,  9, 8, 15, 0, 26, 11, 11, 11, 25,  1,  2, 10,  2,  1, 25, 11, 11, 11, 26,  0,
+      18,  8,  9, 8, 17, 0, 26, 11, 11, 11, 25,  1,  3,  2, 10,  2,  3,  1, 25, 11, 11, 11, 26, 0,
+      21,  8,  9, 8, 17, 0, 26, 11, 11, 11, 25,  1,  3,  2, 10,  2,  3,  1, 25, 11, 11, 11, 26, 0,
+      21,  8,  9, 8, 14, 0, 26, 11, 11, 11, 25,  1,  2,  4, 10,  5,  2,  1, 25, 11, 11, 11, 26, 0,
+      22,  8,  9, 8, 13, 0, 26, 11, 11, 11, 25,  1,  2,  6, 10,  7,  2,  1, 25, 11, 11, 11, 26, 0,
+      27, 12
+    </Vector>
+    <Vector name="MaxModule" nEntries="321">
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="320">
+      0, 0, 0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 0, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 5, 4, 0, 4, 5, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 5, 4, 0, 4, 5, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 6, 0, 7, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0, 0, 0, 0, 2, 11, 1, 1, 1,10, 3, 4, 8, 0, 9, 4, 3,10, 1, 1, 1,11, 2,
+      0, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="absorberW"   value="[hgcalEE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalEE:absorbH]"/>
+    <Numeric name="rMax"        value="[rMax]"/>
+    <Numeric name="rMaxB"       value="[rMaxB]"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalEE.xml" eval="true">
+  <SpecPar name="HGCalEE">
+    <PartSelector path="//HGCalEESensitive.*"/>    
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/TB181/Oct182/hgcalHE.xml b/Geometry/HGCalCommonData/data/TB181/Oct182/hgcalHE.xml
new file mode 100644
index 0000000000000..082396146be3f
--- /dev/null
+++ b/Geometry/HGCalCommonData/data/TB181/Oct182/hgcalHE.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+<ConstantsSection label="hgcalHE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*fm"/>
+  <Constant name="rMaxMiddle" value="0.0*fm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="[hgcal:rminHE]"/>
+  <Constant name="rMax"       value="[hgcal:rmaxHE]"/>
+  <Constant name="rMaxB"      value="[hgcal:rmaxHEF]"/>
+  <Constant name="absorbW"    value="1.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="1.5*[hgcal:WaferW]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalHE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModuleX">
+    <rParent name="hgcal:HGCalHE"/>
+    <String name="GeneralMaterial" value="materials:Air"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalHEWaferFine, hgcalwafer:HGCalHEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="9">
+      hgcal:HGCalHESiliconSensitive, hgcal:HGCalHEPCB,
+      hgcal:HGCalHEKapton,           hgcal:HGCalHEAbsorber,
+      hgcal:HGCalHECuAbsorber,       hgcal:HGCalHEPCBAbsorber,
+      hgcal:HGCalHECuKapton,         hgcal:HGCalHECuPCB,
+      hgcal:HGCalHEAirAbsorber</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="60">
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Iron, 
+      materials:Copper, materials:Air,    materials:Iron,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Iron, 
+      materials:Copper, materials:Air,    materials:Iron,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air
+    </Vector>
+    <Vector name="VolumeNames" type="string" nEntries="60">
+      HEPCB,          HEKapton,           HECuWShield, 
+      HECuShield,     HEPCBShield,        HEFeAbsorber,
+      HECuHeatShield, HESiliconSensitive, HEFeBox, 
+      HEAirGap1,      HEAirGap2,          HEAirGap3, 
+      HEAirGap4,      HEAirGap5,          HEAirGap6, 
+      HEAirGap7,      HEAirGap8,          HEAirGap9,
+      HEAirGap10,     HEAirGap11,         HEAirGap12,
+      HEAirGap13,     HEAirGap14,         HEAirGap15,
+      HEAirGap16,     HECuKapton,         HECuPCB,
+      HEAirGap17,     HEAirGap18,         HEAirGap19,
+      HEPCB,          HEKapton,           HECuWShield, 
+      HECuShield,     HEPCBShield,        HEFeAbsorber,
+      HECuHeatShield, HESiliconSensitive, HEFeBox, 
+      HEAirGap1,      HEAirGap2,          HEAirGap3, 
+      HEAirGap4,      HEAirGap5,          HEAirGap6, 
+      HEAirGap7,      HEAirGap8,          HEAirGap9,
+      HEAirGap10,     HEAirGap11,         HEAirGap12,
+      HEAirGap13,     HEAirGap14,         HEAirGap15,
+      HEAirGap16,     HECuKapton,         HECuPCB,
+      HEAirGap17,     HEAirGap18,         HEAirGap19
+    </Vector>
+    <Vector name="Thickness" type="numeric" nEntries="60">
+      [hgcal:thPCB],     [hgcal:thKapton],   [hgcal:thAbsHE], 
+      [hgcal:thAbsCuHE], [hgcal:thAbsPCBHE], 40.0*mm,
+      6.0*mm,            [hgcal:thSilicon],  9.0*mm, 
+      10.7*mm,           11.7*mm,            3.0*mm, 
+      13.8*mm,           16.0*mm,            5.0*mm, 
+      6.0*mm,            7.0*mm,             8.0*mm, 
+      9.0*mm,            10.0*mm,            20.0*mm,
+      45.0*mm,           47.0*mm,            100.0*mm,
+      124.0*mm,          [hgcal:thCuKapton], [hgcal:thCuPCB],
+      8.8*mm,            9.8*mm,             [hgcal:thAbsCuHE],
+      [hgcal:thPCB],     [hgcal:thKapton],   [hgcal:thAbsHE], 
+      [hgcal:thAbsCuHE], [hgcal:thAbsPCBHE], 40.0*mm,
+      6.0*mm,            [hgcal:thSilicon],  9.0*mm, 
+      10.7*mm,           11.7*mm,            3.0*mm, 
+      13.8*mm,           16.0*mm,            5.0*mm, 
+      6.0*mm,            7.0*mm,             8.0*mm, 
+      9.0*mm,            10.0*mm,            20.0*mm,
+      45.0*mm,           47.0*mm,            100.0*mm,
+      124.0*mm,          [hgcal:thCuKapton], [hgcal:thCuPCB],
+      8.8*mm,            9.8*mm,             [hgcal:thAbsCuHE]
+    </Vector>
+    <Vector name="BlockThick" type="numeric" nEntries="11"> 
+      34.075*mm, 133.075*mm, 73.075*mm, 
+      68.975*mm, 69.075*mm,  174.075*mm, 
+      65.075*mm, 72.075*mm,  66.975*mm, 
+      70.975*mm, 97.075*mm
+    </Vector>
+    <Numeric name="InOut"   value="2"/>
+    <Vector name="LayerFrontIn" type="numeric" nEntries="11"> 
+       0, 11, 21, 34, 45, 60, 77, 90,103,116,129</Vector>
+    <Vector name="LayerBackIn" type="numeric" nEntries="11"> 
+      10, 20, 33, 44, 59, 76, 89,102,115,128,143</Vector>
+    <Vector name="LayerFrontOut" type="numeric" nEntries="11"> 
+     144,155,165,178,189,204,221,234,247,260,273</Vector>
+    <Vector name="LayerBackOut" type="numeric" nEntries="11"> 
+     154,164,177,188,203,220,233,246,259,272,287</Vector>
+    <Vector name="LayerType" type="numeric" nEntries="288"> 
+      8,  13,  0, 26,  7,  7,  7, 25,  1,  2,  6,
+      24,  0, 26,  7,  7,  7, 25,  1,  3,  6,
+      18,  5, 12,  0, 26,  7,  7,  7, 25,  1,  3, 3,  6,
+      19,  5, 27,  0, 26,  7,  7,  7,  4,  3,  6,
+      16,  5, 10,  0, 26,  7,  7,  7, 25,  1, 25,  1,  3,  3,  6,
+      14,  8, 22,  5, 21,  8, 27,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6,
+      15,  5, 27,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6, 
+      17,  5, 12,  0, 26,  7,  7,  7, 25,  1,  2,  3,  6, 
+      15,  5,  9,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6,
+      18,  5, 10,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6,
+      17,  5, 28,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6, 20,  8,
+      38, 43, 30, 56, 37, 37, 37, 55, 31, 59, 36,
+      54, 30, 56, 37, 37, 37, 55, 31, 59, 36,
+      48, 35, 42, 30, 56, 37, 37, 37, 55, 31, 33, 59, 36,
+      49, 35, 57, 30, 56, 37, 37, 37, 34, 59, 36,
+      46, 35, 40, 30, 56, 37, 37, 37, 55, 31, 55, 31, 33, 59, 36,
+      44, 38, 52, 35, 51, 38, 57, 30, 56, 37, 37, 37, 55, 31, 33, 59, 36,
+      45, 35, 57, 30, 56, 37, 37, 37, 55, 31, 33, 59, 36, 
+      47, 35, 42, 30, 56, 37, 37, 37, 55, 31, 32, 59, 36, 
+      45, 35, 39, 30, 56, 37, 37, 37, 55, 31, 33, 59, 36,
+      48, 35, 40, 30, 56, 37, 37, 37, 55, 31, 33, 59, 36,
+      47, 35, 58, 30, 56, 37, 37, 37, 55, 31, 33, 59, 36, 50, 38
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="288">
+      0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 0,
+      0, 2, 8, 1, 1, 1, 7, 3, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 6, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 7, 3, 5, 5, 0,
+      0, 0, 0, 0, 0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0, 0, 0,
+      0, 0, 2, 8, 1, 1, 1, 7, 3, 9, 0,
+      0, 2, 8, 1, 1, 1, 7, 3, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 6, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 7, 3, 5, 9, 0,
+      0, 0, 0, 0, 0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0, 0, 0
+    </Vector>
+    <Vector name="MaxModule" type="numeric" nEntries="288">
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminHE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="1.0*mm"/>
+    <Numeric name="absorberW"   value="[hgcalHE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalHE:absorbH]"/>
+    <Numeric name="rMax"        value="[rMax]"/>
+    <Numeric name="rMaxB"       value="[rMaxB]"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalHE.xml" eval="true">
+  <SpecPar name="HGCalHE">
+    <PartSelector path="//HGCalHESiliconSensitive.*"/>
+    <Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/TB181/Oct183/ahcal.xml b/Geometry/HGCalCommonData/data/TB181/Oct183/ahcal.xml
new file mode 100644
index 0000000000000..d1057e7f5e7cf
--- /dev/null
+++ b/Geometry/HGCalCommonData/data/TB181/Oct183/ahcal.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+<ConstantsSection label="ahcal.xml" eval="true">
+  <Constant name="absorberThick" value="12.1*mm"/>
+  <Constant name="radiatorThick" value="74.0*mm"/>
+  <Constant name="airgapThick"   value="0.535*mm"/>
+  <Constant name="cassetteThick" value="0.5*mm"/>
+  <Constant name="cableThick"    value="1.5*mm"/>
+  <Constant name="pcbThick"      value="0.7*mm"/>
+  <Constant name="foilThick"     value="0.115*mm"/>
+  <Constant name="scintThick"    value="3.0*mm"/>
+  <Constant name="passiveHeight" value="39.0*cm"/>
+  <Constant name="passiveWidth"  value="42.0*cm"/>
+  <Constant name="activeHeight"  value="36.0*cm"/>
+  <Constant name="activeWidth"   value="36.0*cm"/>
+  <Constant name="tileGap"       value="30.0*mm"/>
+  <Constant name="tileHeight"    value="29.8*mm"/>
+  <Constant name="tileWidth"     value="29.8*mm"/>
+  <Constant name="tileEdge"      value="0.1*mm"/>
+</ConstantsSection>
+
+<MaterialSection label="ahcal.xml">
+  <CompositeMaterial name="Steel235" density="7.87*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.9843">
+      <rMaterial name="materials:Iron"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0017">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0140">
+      <rMaterial name="materials:Manganese"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PCB" density="1.70*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.180774">
+      <rMaterial name="materials:Silicon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.405633">
+      <rMaterial name="materials:Oxygen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.278042">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0684428">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.0671091">
+      <rMaterial name="materials:Bromine"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Polystyrene" density="1.060*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.077418">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.922582">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PVC" density="1.35*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.048384">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.384378">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.567238">
+      <rMaterial name="materials:Chlorine"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="Polystyrole" density="1.065*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.077421">
+      <rMaterial name="materials:Hydrogen"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.922579">
+      <rMaterial name="materials:Carbon"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="CFM" density="0.120*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.009">
+      <rMaterial name="materials:Air"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.872">
+      <rMaterial name="ahcal:PVC"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.119">
+      <rMaterial name="ahcal:Polystyrole"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+
+<SolidSection label="ahcal.xml">
+  <Box name="AHcalTileSensitive" dx="[tileWidth]/2" dy="[tileHeight]/2"
+       dz="[scintThick]/2"/>
+</SolidSection>
+
+<LogicalPartSection label="ahcal.xml">
+  <LogicalPart name="AHcalTileSensitive" category="unspecified">
+    <rSolid name="AHcalTileSensitive"/>
+    <rMaterial name="ahcal:Polystyrene"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="ahcal.xml">
+  <Algorithm name="hgcal:DDAHcalModuleAlgo">
+    <rParent name="hgcal:HGCalAH"/>
+    <String name="TileName" value="ahcal:AHcalTileSensitive"/>
+    <Vector name="MaterialNames" type="string" nEntries="9">
+      ahcal:Steel235, materials:Air, ahcal:Steel235, ahcal:CFM, ahcal:PCB, 
+      ahcal:Polystyrole, ahcal:Polystyrene, ahcal:Steel235, ahcal:Steel235</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="9">
+      AHcalRadiator, AHcalAirGap, AHcalCassette, AHcalCable, AHcalPCB,
+      AHcalFoil, AHcalActive, AHcalAbsorber, AHcalAbsorberLastCover</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="9">
+      [ahcal:radiatorThick], [ahcal:airgapThick], [ahcal:cassetteThick], 
+      [ahcal:cableThick], [ahcal:pcbThick], [ahcal:foilThick], 
+      [ahcal:scintThick], [ahcal:absorberThick], 5.0*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="12"> 
+      10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11</Vector>
+    <Vector name="LayerThick" type="numeric" nEntries="12"> 
+      19.6*mm, 81.5*mm, 81.5*mm, 81.5*mm, 81.5*mm, 81.5*mm, 81.5*mm, 81.5*mm,
+      81.5*mm, 81.5*mm, 81.5*mm, 86.5*mm</Vector>
+    <Vector name="LayerType" type="numeric" nEntries="121"> 
+      7, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1,
+      0, 1, 2, 3, 4, 5, 6, 5, 2, 1,  0, 1, 2, 3, 4, 5, 6, 5, 2, 1, 8
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="121">
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 1, 0, 0, 0,  0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0
+    </Vector>
+    <Vector name="Widths" type="numeric" nEntries="2">
+      [ahcal:passiveWidth], [ahcal:activeWidth] </Vector>
+    <Vector name="Heights" type="numeric" nEntries="2">
+      [ahcal:passiveHeight], [ahcal:activeHeight] </Vector>
+    <Vector name="TileN" type="numeric" nEntries="2">
+      12, 12 </Vector>
+    <Vector name="TileStep" type="numeric" nEntries="2">
+      [ahcal:tileGap], [ahcal:tileGap] </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminAH]"/>
+    <String name="RotNameSpace" value="hgcalmodule"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="ahcal.xml" eval="true">
+  <SpecPar name="AHcal">
+    <PartSelector path="//AHcalTileSensitive.*"/>
+    <Parameter name="Volume" value="AHcalTileSensitive" eval="false"/>
+    <Parameter name="SensitiveDetector" value="AHcalSensitiveDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsAHcal">
+    <PartSelector path="//HGCalAH"/>
+    <Parameter name="CMSCutsRegion" value="HGCalAHcalRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/TB181/Oct183/hgcal.xml b/Geometry/HGCalCommonData/data/TB181/Oct183/hgcal.xml
new file mode 100644
index 0000000000000..ce437b9adcadf
--- /dev/null
+++ b/Geometry/HGCalCommonData/data/TB181/Oct183/hgcal.xml
@@ -0,0 +1,253 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+<ConstantsSection label="hgcal.xml" eval="true">
+  <Constant name="rmin"          value="0.0*fm"/>
+  <Constant name="rmax"          value="52.0*cm"/>
+  <Constant name="zCaloFront"    value="2500*cm"/>
+  <Constant name="rminEE"        value="0.0*fm"/>
+  <Constant name="rmaxEE"        value="8.0*cm"/>
+  <Constant name="rmaxEEF"       value="9.5*cm"/>
+  <Constant name="zminEE"        value="0.0*fm"/>
+  <Constant name="zmaxEE"        value="66.2*cm"/>
+  <Constant name="rminHE"        value="0.0*fm"/>
+  <Constant name="rmaxHE"        value="19.5*cm"/>
+  <Constant name="rmaxHEF"       value="26.5*cm"/>
+  <Constant name="zminHE"        value="0.0*fm"/>
+  <Constant name="zmaxHE"        value="103.2*cm"/>
+  <Constant name="rminAH"        value="0.0*fm"/>
+  <Constant name="rmaxAH"        value="[rmax]"/>
+  <Constant name="zminAH"        value="0.0*fm"/>
+  <Constant name="zmaxAH"        value="92.2*cm"/>
+  <Constant name="zgapEEFH"      value="3.5*cm"/>
+  <Constant name="zgapFHBH"      value="3.0*cm"/>
+  <Constant name="zCalor"        value="([zmaxEE]+[zgapEEFH]+[zmaxHE]+[zgapFHBH]+
+					[zmaxAH])/2.0"/>
+  <Constant name="zposCalo"      value="([zCaloFront]+[zCalor])"/>
+  <Constant name="zposEE"        value="-[zCalor]"/>
+  <Constant name="zposHE"        value="[zposEE]+[zmaxEE]+[zgapEEFH]"/>
+  <Constant name="zposAH"        value="[zposHE]+[zmaxHE]+[zgapFHBH]"/>
+  <Constant name="thSilicon"     value="0.1*mm"/>
+  <Constant name="thPCB"         value="1.3*mm"/>
+  <Constant name="thKapton"      value="0.075*mm"/>
+  <Constant name="thCuKapton"    value="0.025*mm"/>
+  <Constant name="thCuPCB"       value="0.175*mm"/>
+  <Constant name="thAbsEE"       value="1.2*mm"/>
+  <Constant name="thAbsEE48To63" value="0.55*mm"/>
+  <Constant name="thAbsEE52To70" value="0.61*mm"/>
+  <Constant name="thAbsEE59To62" value="0.61*mm"/>
+  <Constant name="thAbsEE68To74" value="0.71*mm"/>
+  <Constant name="thAbsCuEE"     value="1.2*mm"/>
+  <Constant name="thAbsHE"       value="1.2*mm"/>
+  <Constant name="thAbsCuHE"     value="1.2*mm"/>
+  <Constant name="thAbsPCBHE"    value="1.2*mm"/>
+  <Constant name="WaferW"        value="123.7*mm"/>
+  <Constant name="tan30deg"      value="tan(30.0*deg)"/>
+</ConstantsSection>
+
+<MaterialSection label="hgcal.xml">
+  <CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
+    <MaterialFraction fraction="0.75">
+      <rMaterial name="materials:Tungsten"/>
+    </MaterialFraction>
+    <MaterialFraction fraction="0.25">
+      <rMaterial name="materials:Copper"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+</MaterialSection>
+
+<SolidSection label="hgcal.xml">
+  <Tubs name="HGCal" rMin="[rmin]" rMax="[rmax]" dz="[zCalor]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Polycone name="HGCalEE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+    <ZSection z="[zmaxEE]" rMin="[rminEE]" rMax="[rmaxEEF]"/>
+  </Polycone>
+  <Polycone name="HGCalHE" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+    <ZSection z="[zmaxHE]" rMin="[rminHE]" rMax="[rmaxHEF]"/>
+  </Polycone>
+  <Polycone name="HGCalAH" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[zminAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+    <ZSection z="[zmaxAH]" rMin="[rminAH]" rMax="[rmaxAH]"/>
+  </Polycone>
+  <Polyhedra name="HGCalEESensitive" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHESiliconSensitive" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thSilicon]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalCuKapton" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thCuKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thCuKapton]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalCuPCB" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thCuPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thCuPCB]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs48To63" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE48To63]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE48To63]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs52To70" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE52To70]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE52To70]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs59To62" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE59To62]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE59To62]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEEAbs68To74" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsEE68To74]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsEE68To74]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalEECuAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsCuEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsCuEE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHEAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHECuAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsCuHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsCuHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+  <Polyhedra name="HGCalHEPCBAbs" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
+    <ZSection z="-[thAbsPCBHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+    <ZSection z= "[thAbsPCBHE]/2" rMin="0*fm" rMax="[WaferW]/2"/>
+  </Polyhedra>
+</SolidSection>
+
+<LogicalPartSection label="hgcal.xml">
+  <LogicalPart name="HGCal" category="unspecified">
+    <rSolid name="HGCal"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEE" category="unspecified">
+    <rSolid name="HGCalEE"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHE" category="unspecified">
+    <rSolid name="HGCalHE"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalAH" category="unspecified">
+    <rSolid name="HGCalAH"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEESensitive" category="unspecified">
+    <rSolid name="HGCalEESensitive"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHESiliconSensitive" category="unspecified">
+    <rSolid name="HGCalHESiliconSensitive"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEPCB" category="unspecified">
+    <rSolid name="HGCalPCB"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuKapton" category="unspecified">
+    <rSolid name="HGCalCuKapton"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuPCB" category="unspecified">
+    <rSolid name="HGCalCuPCB"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEKapton" category="unspecified">
+    <rSolid name="HGCalKapton"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHECuKapton" category="unspecified">
+    <rSolid name="HGCalCuKapton"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHECuPCB" category="unspecified">
+    <rSolid name="HGCalCuPCB"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber" category="unspecified">
+    <rSolid name="HGCalEEAbs"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber48To63" category="unspecified">
+    <rSolid name="HGCalEEAbs48To63"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber52To70" category="unspecified">
+    <rSolid name="HGCalEEAbs52To70"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber59To62" category="unspecified">
+    <rSolid name="HGCalEEAbs59To62"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEEAbsorber68To74" category="unspecified">
+    <rSolid name="HGCalEEAbs68To74"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalEECuAbsorber" category="unspecified">
+    <rSolid name="HGCalEECuAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEAbsorber" category="unspecified">
+    <rSolid name="HGCalHEAbs"/>
+    <rMaterial name="hgcal:WCu"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHECuAbsorber" category="unspecified">
+    <rSolid name="HGCalHECuAbs"/>
+    <rMaterial name="materials:Copper"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEPCBAbsorber" category="unspecified">
+    <rSolid name="HGCalHEPCBAbs"/>
+    <rMaterial name="materials:G10"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalHEAirAbsorber" category="unspecified">
+    <rSolid name="HGCalHEPCBAbs"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="hgcal.xml">
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcal:HGCal"/>
+    <Translation x="0*fm" y="0*fm" z="[zposCalo]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalEE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposEE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcal:HGCal"/>
+    <rChild name="hgcal:HGCalHE"/>
+    <Translation x="0*fm" y="0*fm" z="[zposHE]"/>
+    <rRotation name="rotations:R090"/>
+  </PosPart>
+</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/TB181/Oct183/hgcalBeam.xml b/Geometry/HGCalCommonData/data/TB181/Oct183/hgcalBeam.xml
new file mode 100644
index 0000000000000..e2d895539bff1
--- /dev/null
+++ b/Geometry/HGCalCommonData/data/TB181/Oct183/hgcalBeam.xml
@@ -0,0 +1,430 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+<ConstantsSection label="hgcalBeam.xml" eval="true">
+  <Constant name="upstreamDxby2" value="100.0*cm"/>
+  <Constant name="upstreamDyby2" value="100.0*cm"/>
+  <Constant name="upstreamDzby2" value="400.0*cm"/>
+  <Constant name="upstreamZ" value="-400.0*cm"/>
+  <Constant name="tol" value="0.0*mm"/>
+  <Constant name="chambDxby2" value="11.0*cm"/>
+  <Constant name="chambAlT" value="5.0*mm"/>
+  <Constant name="chambKapW" value="11.0*cm"/>
+  <Constant name="chambKapT" value="0.025*mm"/>
+  <Constant name="chambVetW" value="25.0*mm"/>
+  <Constant name="chambVetT" value="5.0*mm"/>
+  <Constant name="chambVetGap" value="12.0*cm"/>
+  <Constant name="chambVetL" value="0.5*([chambVetGap]+[chambVetW])"/>
+  <Constant name="chambVetX" value="0.5*[chambVetW]"/>
+  <Constant name="chambVetZ" value="20.0*mm"/>
+  <Constant name="chambGasGap" value="([chambVetZ]+0.5*[chambVetT]+[tol])"/>
+  <Constant name="chambGasW" value="([chambVetW]+0.5*[chambVetGap]+[tol])"/>
+  <Constant name="chambDzby2" value="([chambGasGap]+[chambAlT]+2*[tol])"/>
+  <Constant name="chambAl1L" value="0.5*([chambDxby2]+0.5*[chambKapW])"/>
+  <Constant name="chambAl1W" value="0.5*([chambDxby2]-0.5*[chambKapW])"/>
+  <Constant name="chambAl1X" value="([chambDxby2]-[chambAl1L])"/>
+  <Constant name="chambAl1Y" value="([chambDxby2]-[chambAl1W])"/>
+  <Constant name="chambAl1Z" value="([chambGasGap]+0.5*[chambAlT]+[tol])"/>
+  <Constant name="chambAl2L" value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chambAl2X" value="([chambDxby2]-[chambAl2L])"/>
+  <Constant name="chambAl2Y" value="([chambDxby2]-0.5*[chambAlT])"/>
+  <Constant name="chamb1Z" value="-507.6*cm"/>
+  <Constant name="chamb2Z" value="-400.3*cm"/>
+  <Constant name="chamb3Z" value="-200.5*cm"/>
+  <Constant name="s1Dxby2" value="7.0*cm"/>
+  <Constant name="s1Dzby2" value="5.0*mm"/>
+  <Constant name="s1Z" value="-375.4*cm"/>
+  <Constant name="s2Dxby2" value="2.0*cm"/>
+  <Constant name="s2Dzby2" value="5.0*mm"/>
+  <Constant name="s2Z" value="-360.5*cm"/>
+  <Constant name="s3Dxby2" value="1.0*cm"/>
+  <Constant name="s3Dzby2" value="5.0*mm"/>
+  <Constant name="s3Z" value="-345.6*cm"/>
+  <Constant name="s4Z" value="-240.8*cm"/>
+  <Constant name="bhDxby2" value="50.0*cm"/>
+  <Constant name="bhDyby2" value="15.0*cm"/>
+  <Constant name="bhDzby2" value="0.5*cm"/>
+  <Constant name="bhGap" value="7.5*cm"/>
+  <Constant name="bhX" value="([bhDxby2]-0.5*[bhGap])"/>
+  <Constant name="bhY" value="([bhDyby2]+0.5*[bhGap])"/>
+  <Constant name="bhZ1" value="-229.3*cm"/>
+  <Constant name="bhZ2" value="-221.3*cm"/>
+  <Constant name="ck3Rad" value="8.35*cm"/>
+  <Constant name="ck3L" value="200.0*cm"/>
+  <Constant name="ck3Z" value="-569.0*cm"/>
+  <Constant name="downstreamDxby2" value="50.0*cm"/>
+  <Constant name="downstreamDyby2" value="50.0*cm"/>
+  <Constant name="downstreamDzby2" value="100.0*cm"/>
+  <Constant name="downstreamZ" value="900.0*cm"/>
+  <Constant name="chamb4Z" value="840.8*cm"/>
+  <Constant name="chamb5Z" value="966.8*cm"/>
+  <Constant name="mcDxby2" value="40.0*cm"/>
+  <Constant name="mcDzby2" value="20.0*mm"/>
+  <Constant name="mc1Z" value="892.8*cm"/>
+  <Constant name="mc2Z" value="984.8*cm"/>
+  <Constant name="s5Dxby2" value="9.5*cm"/>
+  <Constant name="s5Dzby2" value="2.0*cm"/>
+  <Constant name="s5Z"     value="([hgcal:zCaloFront]-[s5Dzby2])"/>
+</ConstantsSection>
+
+<SolidSection label="hgcalBeam.xml">
+  <Box name="HGCalBeam" dx="[upstreamDxby2]" dy="[upstreamDyby2]" dz="[upstreamDzby2]"/>
+  <Box name="HGCalBeamWChamb" dx="[chambDxby2]" dy="[chambDxby2]" dz="[chambDzby2]"/>
+  <Box name="HGCalBeamWChambGas" dx="[chambGasW]" dy="[chambGasW]" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamWChambVet" dx="[chambVetL]" dy="[chambVetW]/2" dz="[chambVetT]/2"/>
+  <Box name="HGCalBeamWChambWindow" dx="[chambKapW]/2" dy="[chambKapW]/2" dz="[chambKapT]/2"/>
+  <Box name="HGCalBeamWChambAl1" dx="[chambAl1L]" dy="[chambAl1W]" dz="[chambAlT]/2"/>
+  <Box name="HGCalBeamWChambAl2" dx="[chambAl2L]" dy="[chambAlT]/2" dz="[chambGasGap]"/>
+  <Box name="HGCalBeamS1" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamS2" dx="[s2Dxby2]" dy="[s2Dxby2]" dz="[s2Dzby2]"/>
+  <Box name="HGCalBeamS3" dx="[s3Dxby2]" dy="[s3Dxby2]" dz="[s3Dzby2]"/>
+  <Box name="HGCalBeamS4" dx="[s1Dxby2]" dy="[s1Dxby2]" dz="[s1Dzby2]"/>
+  <Box name="HGCalBeamS5" dx="[s5Dxby2]" dy="[s5Dxby2]" dz="[s5Dzby2]"/>
+  <Box name="HGCalBeamHaloCounter" dx="[bhDxby2]" dy="[bhDyby2]" dz="[bhDzby2]"/>
+  <Tubs name="HGCalBeamCK3" rMin="0*fm" rMax="[ck3Rad]" dz="[ck3L]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Box name="HGCalBeamDown" dx="[downstreamDxby2]" dy="[downstreamDyby2]" dz="[downstreamDzby2]"/>
+  <Box name="HGCalBeamMuonCounter" dx="[mcDxby2]" dy="[mcDxby2]" dz="[mcDzby2]"/>
+</SolidSection>
+
+<LogicalPartSection label="hgcalBeam.xml">
+  <LogicalPart name="HGCalBeam" category="unspecified">
+    <rSolid name="HGCalBeam"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChamb" category="unspecified">
+    <rSolid name="HGCalBeamWChamb"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambGas" category="unspecified">
+    <rSolid name="HGCalBeamWChambGas"/>
+    <rMaterial name="materials:Ar 50pct plus CO_2 50pct"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambVet" category="unspecified">
+    <rSolid name="HGCalBeamWChambVet"/>
+    <rMaterial name="materials:Polyethylene"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambWindow" category="unspecified">
+    <rSolid name="HGCalBeamWChambWindow"/>
+    <rMaterial name="materials:Kapton"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl1" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl1"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamWChambAl2" category="unspecified">
+    <rSolid name="HGCalBeamWChambAl2"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS1" category="unspecified">
+    <rSolid name="HGCalBeamS1"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS2" category="unspecified">
+    <rSolid name="HGCalBeamS2"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS3" category="unspecified">
+    <rSolid name="HGCalBeamS3"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS4" category="unspecified">
+    <rSolid name="HGCalBeamS4"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamS5" category="unspecified">
+    <rSolid name="HGCalBeamS5"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamHaloCounter" category="unspecified">
+    <rSolid name="HGCalBeamHaloCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamCK3" category="unspecified">
+    <rSolid name="HGCalBeamCK3"/>
+    <rMaterial name="materials:Freon-12"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamDown" category="unspecified">
+    <rSolid name="HGCalBeamDown"/>
+    <rMaterial name="materials:Air"/>
+  </LogicalPart>
+  <LogicalPart name="HGCalBeamMuonCounter" category="unspecified">
+    <rSolid name="HGCalBeamMuonCounter"/>
+    <rMaterial name="materials:Scintillator"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<RotationSection label="hgcalBeam.xml">
+  <Rotation name="R1" phiX="90*deg" thetaX="90*deg" phiY="180*deg" thetaY="90*deg" phiZ="0*deg" thetaZ="0*deg"/>
+</RotationSection>
+
+<PosPartSection label="hgcalBeam.xml">
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambGas"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1X]" y="[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1Y]" y="[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="-[chambAl1X]" y="-[chambAl1Y]" z="-[chambAl1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl1"/>
+    <Translation x="[chambAl1Y]" y="-[chambAl1X]" z="-[chambAl1Z]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2X]" y="[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2Y]" y="[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="-[chambAl2X]" y="-[chambAl2Y]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambAl2"/>
+    <Translation x="[chambAl2Y]" y="-[chambAl2X]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChamb"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambWindow"/>
+    <Translation x="0*fm" y="0*fm" z="-([chambDzby2]-0.5*[chambKapT])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="0*fm"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="0*fm"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="9">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetX]" y="[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="10">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetL]" y="[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="-[chambVetX]" y="-[chambVetL]" z="-[chambVetZ]"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeamWChambGas"/>
+    <rChild name="hgcalBeam:HGCalBeamWChambVet"/>
+    <Translation x="[chambVetL]" y="-[chambVetX]" z="-[chambVetZ]"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb1Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb2Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb3Z]-[upstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS1"/>
+    <Translation x="0*fm" y="0*fm" z="([s1Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS2"/>
+    <Translation x="0*fm" y="0*fm" z="([s2Z]-[upstreamZ]-[s2Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS3"/>
+    <Translation x="0*fm" y="0*fm" z="([s3Z]-[upstreamZ]-[s3Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamS4"/>
+    <Translation x="0*fm" y="0*fm" z="([s4Z]-[upstreamZ]-[s1Dzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="0*fm" y="-[bhY]" z="([bhZ2]+[bhDzby2]-[upstreamZ])"/>
+  </PosPart>
+  <PosPart copyNumber="13">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="-[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="14">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamHaloCounter"/>
+    <Translation x="[bhY]" y="0*fm" z="([bhZ1]+[bhDzby2]-[upstreamZ])"/>
+    <rRotation name="hgcalBeam:R1"/>
+  </PosPart>
+  <PosPart copyNumber="0">
+    <rParent name="hgcalBeam:HGCalBeam"/>
+    <rChild name="hgcalBeam:HGCalBeamCK3"/>
+    <Translation x="0*fm" y="0*fm" z="([ck3Z]-[upstreamZ]-0.5*[ck3L])"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb4Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamWChamb"/>
+    <Translation x="0*fm" y="0*fm" z="([chamb5Z]-[downstreamZ]-[chambDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamMuonCounter"/>
+    <Translation x="0*fm" y="0*fm" z="([mc1Z]-[downstreamZ]-[mcDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="hgcalBeam:HGCalBeamDown"/>
+    <rChild name="hgcalBeam:HGCalBeamMuonCounter"/>
+    <Translation x="0*fm" y="0*fm" z="([mc2Z]-[downstreamZ]-[mcDzby2])"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeam"/>
+    <Translation x="0*fm" y="0*fm" z="[upstreamZ]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamDown"/>
+    <Translation x="0*fm" y="0*fm" z="[downstreamZ]"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="cms:CMSE"/>
+    <rChild name="hgcalBeam:HGCalBeamS5"/>
+    <Translation x="0*fm" y="0*fm" z="[s5Z]"/>
+  </PosPart>
+</PosPartSection>
+
+<SpecParSection label="hgcalBeam.xml" eval="true">
+  <SpecPar name="hgcalbeam">
+    <PartSelector path="//HGCalBeamS.*"/>
+    <PartSelector path="//HGCalBeamHaloCounter"/>
+    <PartSelector path="//HGCalBeamMuonCounter"/>
+    <PartSelector path="//HGCalBeamCK3"/>
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="SensitiveDetector" value="HcalTB06BeamDetector" eval="false"/>
+    <Parameter name="ReadOutName" value="HcalTB06BeamHits" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcalbeamWC">
+    <PartSelector path="//HGCalBeamWChambGas"/>
+    <Parameter name="Volume" value="WireChamber" eval="false"/>
+  </SpecPar>
+  <SpecPar name="hgcProdCutsBeam">
+    <PartSelector path="//HGCalBeam"/>
+    <PartSelector path="//HGCalBeamDown"/>
+    <Parameter name="CMSCutsRegion" value="HGCalBeamRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1.0*mm"/>
+    <Parameter name="ProdCutsForGamma"     value="1.0*mm"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/TB181/Oct183/hgcalEE.xml b/Geometry/HGCalCommonData/data/TB181/Oct183/hgcalEE.xml
new file mode 100644
index 0000000000000..e73e3c17e41a0
--- /dev/null
+++ b/Geometry/HGCalCommonData/data/TB181/Oct183/hgcalEE.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+<ConstantsSection label="hgcalEE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*cm"/>
+  <Constant name="rMaxMiddle" value="120.0*cm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="0.0*fm"/>
+  <Constant name="rMax"       value="[hgcal:rmaxEE]"/>
+  <Constant name="rMaxB"      value="[hgcal:rmaxEEF]"/>
+  <Constant name="absorbW"    value="0.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="[hgcal:WaferW]*[hgcal:tan30deg]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalEE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModuleX">
+    <rParent name="hgcal:HGCalEE"/>
+    <String name="GeneralMaterial" value="materials:Air"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="11">
+      hgcal:HGCalEESensitive,        hgcal:HGCalEEPCB,
+      hgcal:HGCalEEKapton,           hgcal:HGCalEEAbsorber,
+      hgcal:HGCalEECuAbsorber,       hgcal:HGCalEEAbsorber48To63,
+      hgcal:HGCalEEAbsorber52To70,   hgcal:HGCalEEAbsorber59To62, 
+      hgcal:HGCalEEAbsorber68To74,   hgcal:HGCalEECuKapton, 
+      hgcal:HGCalEECuPCB</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="43">
+      materials:Air,       materials:Air,       materials:Air, 
+      materials:Air,       materials:Air,       materials:Air,
+      materials:Air,       materials:Air,       materials:StainlessSteel, 
+      materials:Lead,      materials:Copper,    materials:Air, 
+      materials:Aluminium, materials:Air,       materials:Air,   
+      materials:Air,       materials:Air,       materials:Air,
+      materials:Air,       materials:Air,       materials:Air,
+      materials:Air,       materials:Air,       materials:Air,
+      materials:Air,       materials:Air,       materials:Air,
+      materials:Air,       materials:Air,       materials:Air,
+      materials:Air,       materials:Air,       materials:Air,
+      materials:Air,       materials:Air,       materials:Air,
+      materials:Iron,      materials:Tungsten,  materials:Tungsten, 
+      materials:Air,       materials:Air,       materials:Air,
+      materials:Aluminium</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="43">
+      EEPCB,             EEKapton,          EECuWShield, 
+      EECuShield,        EECuWShield48To63, EECuWShield52To70,
+      EECuWShield59To62, EECuWShield68To74, EEFeAbsorber, 
+      EEPbAbsorber,      EECuHeatShield,    EESensitive, 
+      EEAlcase,          EEgap1,            EEgap2,      
+      EEgap3,            EEgap4,            EEgap5,      
+      EEgap6,            EEgap7,            EEgap8,      
+      EEgap9,            EEgap10,           EEgap11,      
+      EEgap12,           EEgap13,           EEgap14,      
+      EEgap15,           EEgap16,           EEgap17,      
+      EEgap18,           EEgap19,           EEgap20,      
+      EEgap21,           EEgap22,           EEgap23,      
+      EEFHAbs,           EETungsten2,       EETunsten2p8,
+      EECuKapton,        EECuPCB,           EEgap24,
+      EEMCPAl</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="43">
+      [hgcal:thPCB],         [hgcal:thKapton],      [hgcal:thAbsEE], 
+      [hgcal:thAbsCuEE],     [hgcal:thAbsEE48To63], [hgcal:thAbsEE52To70],
+      [hgcal:thAbsEE59To62], [hgcal:thAbsEE68To74], 0.3*mm,        
+      4.9*mm,                6.0*mm,                [hgcal:thSilicon],   
+      2.1*mm,                1.6*mm,                1.9*mm, 
+      2.2*mm,                2.6*mm,                2.7*mm,
+      2.8*mm,                3.2*mm,                3.6*mm, 
+      3.7*mm,                3.8*mm,                4.09*mm, 
+      4.3*mm,                4.69*mm,               5.0*mm, 
+      5.5*mm,                6.5*mm,                6.9*mm, 
+      7.4*mm,                7.8*mm,                8.99*mm, 
+      9.0*mm,                12.0*mm,               184.0*mm, 
+      40.0*mm,               2.0*mm,                2.8*mm, 
+      [hgcal:thCuKapton],    [hgcal:thCuPCB],       6.8*mm,
+      5.0*mm</Vector>
+    <Vector name="Layers" type="numeric" nEntries="8"> 
+      22, 17, 17, 17, 17, 17, 28, 35</Vector>
+    <Numeric name="InOut"   value="1"/>
+    <Vector name="LayerFrontIn" type="numeric" nEntries="8"> 
+       0, 22, 39, 56, 73, 90,107,135</Vector>
+    <Vector name="LayerBackIn" type="numeric" nEntries="8"> 
+      21, 38, 55, 72, 89,106,134,169</Vector>
+    <Vector name="BlockThick" type="numeric" nEntries="8"> 
+      238.375*mm, 37.775*mm, 32.775*mm, 
+      35.575*mm,  33.775*mm, 32.825*mm, 
+      71.675*mm,  88.575*mm
+    </Vector>
+    <Vector name="LayerType" type="numeric" nEntries="170"> 
+      42, 12, 35, 8, 9, 8, 17, 10, 28,  8,  9,  8, 34,  0, 40, 11, 11, 11, 39, 1,  2, 10,
+      31, 37, 21, 8, 9, 8, 32,  0, 40, 11, 11, 11, 39,  1,  2,  7, 10,
+      31, 37, 21, 8, 9, 8, 23,  0, 40, 11, 11, 11, 39,  1,  2,  6, 10,
+      31, 38, 21, 8, 9, 8, 27,  0, 40, 11, 11, 11, 39,  1,  3,  2, 10,
+      41, 38, 24, 8, 9, 8, 25,  0, 40, 11, 11, 11, 39,  1,  2,  5, 10,
+      30, 38, 21, 8, 9, 8, 22,  0, 40, 11, 11, 11, 39,  1,  2,  4, 10,
+      41, 38, 22, 8, 9, 8, 17, 10, 16,  8,  9,  8, 18, 10, 20,  8,  9,  8, 33, 0, 40, 11, 11, 11, 39, 1, 2, 10,
+      29, 38, 26, 8, 9, 8, 14, 10, 30, 8, 9, 8, 17, 10, 15, 8, 9, 8, 19, 10, 13, 8, 9, 8, 21, 0, 40, 11, 11, 11, 39, 1, 2, 10, 12
+    </Vector>
+    <Vector name="MaxModule" nEntries="171">
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+      </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="170">
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,11, 1, 1, 1,10, 3, 4, 0,
+      0, 0, 0, 0, 0, 0, 0, 2,11, 1, 1, 1,10, 3, 4, 9, 0,
+      0, 0, 0, 0, 0, 0, 0, 2,11, 1, 1, 1,10, 3, 4, 8, 0,
+      0, 0, 0, 0, 0, 0, 0, 2,11, 1, 1, 1,10, 3, 5, 4, 0,
+      0, 0, 0, 0, 0, 0, 0, 2,11, 1, 1, 1,10, 3, 4, 7, 0,
+      0, 0, 0, 0, 0, 0, 0, 2,11, 1, 1, 1,10, 3, 4, 6, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,11, 1, 1, 1,10, 3, 4, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,11, 1, 1, 1,10, 3, 4, 0, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminEE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="0.0*fm"/>
+    <Numeric name="absorberW"   value="[hgcalEE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalEE:absorbH]"/>
+    <Numeric name="rMax"        value="[rMax]"/>
+    <Numeric name="rMaxB"       value="[rMaxB]"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalEE.xml" eval="true">
+  <SpecPar name="HGCalEE">
+    <PartSelector path="//HGCalEESensitive.*"/>    
+    <Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/TB181/Oct183/hgcalHE.xml b/Geometry/HGCalCommonData/data/TB181/Oct183/hgcalHE.xml
new file mode 100644
index 0000000000000..321a4c7dd47a4
--- /dev/null
+++ b/Geometry/HGCalCommonData/data/TB181/Oct183/hgcalHE.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+<ConstantsSection label="hgcalHE.xml" eval="true">
+  <Constant name="rMinFine"   value="0.0*fm"/>
+  <Constant name="rMaxFine"   value="0.0*fm"/>
+  <Constant name="rMaxMiddle" value="0.0*fm"/>
+  <Constant name="rMaxCoarse" value="2000.0*cm"/>
+  <Constant name="rMin"       value="[hgcal:rminHE]"/>
+  <Constant name="rMax"       value="[hgcal:rmaxHE]"/>
+  <Constant name="rMaxB"      value="[hgcal:rmaxHEF]"/>
+  <Constant name="absorbW"    value="1.5*[hgcal:WaferW]"/>
+  <Constant name="absorbH"    value="1.5*[hgcal:WaferW]"/>
+</ConstantsSection>
+
+<PosPartSection label="hgcalHE.xml">
+  <Algorithm name="hgcal:DDHGCalTBModuleX">
+    <rParent name="hgcal:HGCalHE"/>
+    <String name="GeneralMaterial" value="materials:Air"/>
+    <Vector name="WaferName" type="string" nEntries="2">
+      hgcalwafer:HGCalHEWaferFine, hgcalwafer:HGCalHEWaferCoarse</Vector>
+    <Vector name="CoverName" type="string" nEntries="9">
+      hgcal:HGCalHESiliconSensitive, hgcal:HGCalHEPCB, 
+      hgcal:HGCalHEKapton,           hgcal:HGCalHEAbsorber, 
+      hgcal:HGCalHECuAbsorber,       hgcal:HGCalHEPCBAbsorber,
+      hgcal:HGCalHECuKapton,         hgcal:HGCalHECuPCB,
+      hgcal:HGCalHEAirAbsorber</Vector>
+    <Vector name="MaterialNames" type="string" nEntries="66">
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Iron, 
+      materials:Copper, materials:Air,    materials:Iron,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air, 
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Iron, 
+      materials:Copper, materials:Air,    materials:Iron,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air, 
+      materials:Air,    materials:Air,    materials:Air,
+      materials:Air,    materials:Air,    materials:Air</Vector>
+    <Vector name="VolumeNames" type="string" nEntries="66">
+      HEPCB,          HEKapton,           HECuWShield, 
+      HECuShield,     HEPCBShield,        HEFeAbsorber,
+      HECuHeatShield, HESiliconSensitive, HEFeBox, 
+      HEAirGap1,      HEAirGap2,          HEAirGap3, 
+      HEAirGap4,      HEAirGap5,          HEAirGap6, 
+      HEAirGap7,      HEAirGap8,          HEAirGap9,
+      HEAirGap10,     HEAirGap11,         HEAirGap12,
+      HEAirGap13,     HEAirGap14,         HEAirGap15,
+      HEAirGap16,     HECuKapton,         HECuPCB, 
+      HEAirGap17,     HEAirGap18,         HEAirGap19,
+      HEAirGap20,     HEAirGap21,         HEAirGap22,
+      HEPCB,          HEKapton,           HECuWShield, 
+      HECuShield,     HEPCBShield,        HEFeAbsorber,
+      HECuHeatShield, HESiliconSensitive, HEFeBox, 
+      HEAirGap1,      HEAirGap2,          HEAirGap3, 
+      HEAirGap4,      HEAirGap5,          HEAirGap6, 
+      HEAirGap7,      HEAirGap8,          HEAirGap9,
+      HEAirGap10,     HEAirGap11,         HEAirGap12,
+      HEAirGap13,     HEAirGap14,         HEAirGap15,
+      HEAirGap16,     HECuKapton,         HECuPCB, 
+      HEAirGap17,     HEAirGap18,         HEAirGap19,
+      HEAirGap20,     HEAirGap21,         HEAirGap22</Vector>
+    <Vector name="Thickness" type="numeric" nEntries="66">
+      [hgcal:thPCB],     [hgcal:thKapton],   [hgcal:thAbsHE], 
+      [hgcal:thAbsCuHE], [hgcal:thAbsPCBHE], 40.0*mm,
+      6.0*mm,            [hgcal:thSilicon],  9.0*mm, 
+      10.2*mm,           10.8*mm,            12.7*mm, 
+      12.8*mm,           14.8*mm,            15.2*mm,
+      5.0*mm,            6.0*mm,             7.0*mm, 
+      7.1*mm,            8.0*mm,             8.5*mm,
+      8.6*mm,            10.0*mm,            40.0*mm, 
+      52*mm,             [hgcal:thCuKapton], [hgcal:thCuPCB], 
+      7.45*mm,           11.8*mm,            25.0*mm,
+      9.1*mm,            9.8*mm,             [hgcal:thAbsCuHE],
+      [hgcal:thPCB],     [hgcal:thKapton],   [hgcal:thAbsHE], 
+      [hgcal:thAbsCuHE], [hgcal:thAbsPCBHE], 40.0*mm,
+      6.0*mm,            [hgcal:thSilicon],  9.0*mm, 
+      10.2*mm,           10.8*mm,            12.7*mm, 
+      12.8*mm,           14.8*mm,            15.2*mm,
+      5.0*mm,            6.0*mm,             7.0*mm, 
+      7.1*mm,            8.0*mm,             8.5*mm,
+      8.6*mm,            10.0*mm,            40.0*mm, 
+      52*mm,             [hgcal:thCuKapton], [hgcal:thCuPCB], 
+      7.45*mm,           11.8*mm,            25.0*mm,
+      9.1*mm,            9.8*mm,             [hgcal:thAbsCuHE]
+    </Vector>
+    <Vector name="BlockThick" type="numeric" nEntries="12"> 
+      29.075*mm, 68.975*mm, 68.075*mm, 
+      71.075*mm, 68.575*mm, 176.1*mm, 
+      69.075*mm, 67.075*mm, 73.475*mm, 
+      66.475*mm, 75.075*mm, 103.525*mm
+    </Vector>
+    <Numeric name="InOut"   value="2"/>
+    <Vector name="LayerFrontIn" type="numeric" nEntries="12"> 
+       0, 12, 25, 38, 51, 62, 82, 95,108,121,134,147</Vector>
+    <Vector name="LayerBackIn" type="numeric" nEntries="12"> 
+      11, 24, 37, 50, 61, 81, 94,107,120,133,146,161</Vector>
+    <Vector name="LayerFrontOut" type="numeric" nEntries="12"> 
+     162,174,187,200,213,224,244,257,270,283,296,309</Vector>
+    <Vector name="LayerBackOut" type="numeric" nEntries="12"> 
+     173,186,199,212,223,243,256,269,282,295,308,323</Vector>
+    <Vector name="LayerType" type="numeric" nEntries="324"> 
+       8, 31,  0, 26,  7,  7,  7, 25,  1,  3,  2,  6,
+      20,  5,  9,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6,
+      19,  5, 31,  0, 26,  7,  7,  7, 25,  1,  3,  2,  6,
+      19,  5, 12,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6,
+      21,  5, 31,  0, 26,  7,  7,  7,  4,  3,  6,
+      17,  5, 11,  0, 26,  7,  7,  7, 25,  1, 25,  3, 25,  1,  3,  6, 15,  8, 24,  5,
+      23,  8, 31,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6,
+      16,  5, 10,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6,
+      19,  5, 14,  0, 26,  7,  7,  7, 25,  1,  2,  3,  6,
+      18,  5, 30,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6,
+      22,  5, 13,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6,
+      27,  5, 28,  0, 26,  7,  7,  7, 25,  1,  3,  3,  6, 29,  8,
+      41, 64, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39,
+      53, 38, 42, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39,
+      52, 38, 64, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39,
+      52, 38, 45, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39,
+      54, 38, 64, 33, 59, 40, 40, 40, 37, 65, 39,
+      50, 38, 44, 33, 59, 40, 40, 40, 58, 34, 58, 36, 58, 34, 65, 39, 48, 41, 57, 38,
+      56, 41, 64, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39,
+      49, 38, 43, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39,
+      52, 38, 47, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39,
+      51, 38, 63, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39,
+      55, 38, 46, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39,
+      60, 38, 61, 33, 59, 40, 40, 40, 58, 34, 36, 65, 39, 62, 41
+    </Vector>
+    <Vector name="LayerSense" type="numeric" nEntries="324">
+      0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 4, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 4, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 6, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 7, 5, 7, 3, 5, 0, 0, 0, 0, 0, 
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0, 0, 0,
+      0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 6, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 7, 5, 7, 3, 9, 0, 0, 0, 0, 0, 
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 4, 5, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0,
+      0, 0, 0, 2, 8, 1, 1, 1, 7, 3, 5, 9, 0, 0, 0
+    </Vector>
+    <Vector name="MaxModule" type="numeric" nEntries="324">
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0, 0, 0, 
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0,
+      0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 0, 0
+    </Vector>
+    <Numeric name="zMinBlock"   value="[hgcal:zminHE]"/>
+    <Numeric name="rMaxFine"    value="[rMaxFine]"/>
+    <Numeric name="waferW"      value="[hgcal:WaferW]"/>
+    <Numeric name="waferGap"    value="1.0*mm"/>
+    <Numeric name="absorberW"   value="[hgcalHE:absorbW]"/>
+    <Numeric name="absorberH"   value="[hgcalHE:absorbH]"/>
+    <Numeric name="rMax"        value="[rMax]"/>
+    <Numeric name="rMaxB"       value="[rMaxB]"/>
+  </Algorithm>
+</PosPartSection> 
+
+<SpecParSection label="hgcalHE.xml" eval="true">
+  <SpecPar name="HGCalHE">
+    <PartSelector path="//HGCalHESiliconSensitive.*"/>
+    <Parameter name="Volume" value="HGCalHESiliconSensitive" eval="false"/>
+    <Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
+    <Parameter name="RadiusBound"  value="[rMinFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxFine]"/>
+    <Parameter name="RadiusBound"  value="[rMaxMiddle]"/>
+    <Parameter name="RadiusBound"  value="[rMaxCoarse]"/>
+    <Parameter name="RadiusLimits" value="[rMin]"/>
+    <Parameter name="RadiusLimits" value="[rMax]"/>
+    <Parameter name="LevelTop"     value="99"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HGCalCommonData/data/hgcal/v10/hgcal.xml b/Geometry/HGCalCommonData/data/hgcal/v10/hgcal.xml
index 34cdbe29069d4..79b9d96ac18f7 100644
--- a/Geometry/HGCalCommonData/data/hgcal/v10/hgcal.xml
+++ b/Geometry/HGCalCommonData/data/hgcal/v10/hgcal.xml
@@ -27,20 +27,20 @@
   <Constant name="ChoiceType"            value="0"/>
   <Constant name="NCornerCut"            value="2"/>
   <Constant name="FracAreaMin"           value="0.2"/>
-  <Constant name="radMixL0"              value="1450.0*mm"/>
-  <Constant name="radMixL1"              value="1450.0*mm"/>
-  <Constant name="radMixL2"              value="1450.0*mm"/>
-  <Constant name="radMixL3"              value="1450.0*mm"/>
-  <Constant name="radMixL4"              value="1305.0*mm"/>
-  <Constant name="radMixL5"              value="1305.0*mm"/>
-  <Constant name="radMixL6"              value="1160.0*mm"/>
-  <Constant name="radMixL7"              value="1160.0*mm"/>
-  <Constant name="radMixL8"              value="1160.0*mm"/>
-  <Constant name="radMixL9"              value="1160.0*mm"/>
-  <Constant name="radMixL10"             value="1005.0*mm"/>
-  <Constant name="radMixL11"             value="1005.0*mm"/>
-  <Constant name="radMixL12"             value="1005.0*mm"/>
-  <Constant name="radMixL13"             value="1005.0*mm"/>
+  <Constant name="radMixL0"              value="1537.0*mm"/>
+  <Constant name="radMixL1"              value="1537.0*mm"/>
+  <Constant name="radMixL2"              value="1537.0*mm"/>
+  <Constant name="radMixL3"              value="1537.0*mm"/>
+  <Constant name="radMixL4"              value="1378.2*mm"/>
+  <Constant name="radMixL5"              value="1378.2*mm"/>
+  <Constant name="radMixL6"              value="1183.0*mm"/>
+  <Constant name="radMixL7"              value="1183.0*mm"/>
+  <Constant name="radMixL8"              value="1183.0*mm"/>
+  <Constant name="radMixL9"              value="1183.0*mm"/>
+  <Constant name="radMixL10"             value="1037.8*mm"/>
+  <Constant name="radMixL11"             value="1037.8*mm"/>
+  <Constant name="radMixL12"             value="1037.8*mm"/>
+  <Constant name="radMixL13"             value="1037.8*mm"/>
   <Constant name="slope1"                value="[etaMax:slope]"/>
   <Constant name="slope2"                value="[caloBase:slope20]"/>
   <Constant name="slope3"                value="[caloBase:slope30]"/>
diff --git a/Geometry/HGCalCommonData/data/hgcalCons/v10/hgcalCons.xml b/Geometry/HGCalCommonData/data/hgcalCons/v10/hgcalCons.xml
index 533bb83c53f8a..c3f617eece205 100644
--- a/Geometry/HGCalCommonData/data/hgcalCons/v10/hgcalCons.xml
+++ b/Geometry/HGCalCommonData/data/hgcalCons/v10/hgcalCons.xml
@@ -129,10 +129,10 @@
     <Parameter name="DetectorType"        value="3"/>
     <Parameter name="WaferThickness"      value="[hgcal:ScintillatorThickness]"/>
     <Parameter name="MinimumTileSize"     value="[MinimumTileSize]"/>
+    <Parameter name="NPhiBinBH"           value="360"/>
     <Parameter name="NPhiBinBH"           value="288"/>
-    <Parameter name="NPhiBinBH"           value="288"/>
     <Parameter name="LayerFrontBH"        value="[hgcal:FirstMixedLayer]"/>
-    <Parameter name="LayerFrontBH"        value="([hgcal:FirstMixedLayer]+4)"/>
+    <Parameter name="LayerFrontBH"        value="[hgcal:FirstMixedLayer]"/>
     <Parameter name="RMinLayerBH"         value="[hgcal:radMixL3]"/>
     <Parameter name="RMinLayerBH"         value="[hgcal:radMixL13]"/>
     <Parameter name="SlopeBottom"         value="0"/>
diff --git a/Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml b/Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml
index 511e5fb841b83..fca584c08fa88 100644
--- a/Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml
+++ b/Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml
@@ -46,20 +46,20 @@
       0, 1, 2, 3, 4, 3, 2, 1, 7, 8, 9, 10, 11, 10, 11, 10, 12, 10, 13, 14, 13, 10, 12, 10, 11, 10, 11, 10, 9, 8, 7, 0, 15     
     </Vector>
     <Vector name="LayerSense" type="numeric" nEntries="448">
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+      0,-2,-2,-2,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0,-2,-2,-2,-2,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0,-2,-2,-2,-2,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0,-2,-2,-2,-2,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0,-2,-2,-2,-2,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0,-2,-2,-2,-2,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0,-2,-2,-2,-2,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0,-2,-2,-2,-2,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0,-2,-2,-2,-2,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0,-2,-2,-2,-2,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0,-2,-2,-2,-2,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0,-2,-2,-2,-2,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0,-2,-2,-2,-2,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+      0,-2,-2,-2,-2,-2,-2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,-2
     </Vector>
     <Numeric name="FirstLayer"       value="1"/>
     <Numeric name="AbsorberMode"     value="0"/>
diff --git a/Geometry/HGCalCommonData/data/hgcalHEmix/v10/hgcalHEmix.xml b/Geometry/HGCalCommonData/data/hgcalHEmix/v10/hgcalHEmix.xml
index 478d92caef779..80496b70f69c6 100644
--- a/Geometry/HGCalCommonData/data/hgcalHEmix/v10/hgcalHEmix.xml
+++ b/Geometry/HGCalCommonData/data/hgcalHEmix/v10/hgcalHEmix.xml
@@ -35,11 +35,11 @@
       1, 2, 3, 4, 5,  1, 2, 3, 4, 5,  1, 2, 3, 4, 5,
       1, 2, 3, 4, 5,  1, 2, 3, 4, 5</Vector>
     <Vector name="LayerSense" type="numeric" nEntries="70">
-      -1, 0, 0, 1, 0, -1, 0, 0, 1, 0, -1, 0, 0, 1, 0,
-      -1, 0, 0, 1, 0, -1, 0, 0, 1, 0, -1, 0, 0, 1, 0,
-      -1, 0, 0, 1, 0, -1, 0, 0, 1, 0, -1, 0, 0, 1, 0,
-      -1, 0, 0, 1, 0, -1, 0, 0, 1, 0, -1, 0, 0, 1, 0,
-      -1, 0, 0, 1, 0, -1, 0, 0, 1, 0</Vector>
+      -1, 0, -1, 1, -2, -1, 0, -1, 1, -2, -1, 0, -1, 1, -2,
+      -1, 0, -1, 1, -2, -1, 0, -1, 1, -2, -1, 0, -1, 1, -2,
+      -1, 0, -1, 1, -2, -1, 0, -1, 1, -2, -1, 0, -1, 1, -2,
+      -1, 0, -1, 1, -2, -1, 0, -1, 1, -2, -1, 0, -1, 1, -2,
+      -1, 0, -1, 1, -2, -1, 0, -1, 1, -2</Vector>
     <Numeric name="FirstLayer"       value="[hgcal:FirstMixedLayer]"/>
     <Numeric name="AbsorberMode"     value="1"/>
     <Vector name="TopMaterialNames" type="string" nEntries="6">
diff --git a/Geometry/HGCalCommonData/data/hgcalHEsil/v10/hgcalHEsil.xml b/Geometry/HGCalCommonData/data/hgcalHEsil/v10/hgcalHEsil.xml
index 167c8c1c072eb..ede3cd4d301a4 100644
--- a/Geometry/HGCalCommonData/data/hgcalHEsil/v10/hgcalHEsil.xml
+++ b/Geometry/HGCalCommonData/data/hgcalHEsil/v10/hgcalHEsil.xml
@@ -36,14 +36,14 @@
       1, 2, 3, 4, 5, 6, 8, 7, 8, 9, 8, 10, 11,
       1, 2, 3, 4, 5, 6, 8, 7, 8, 9, 8, 10, 11 </Vector>
     <Vector name="LayerSense" type="numeric" nEntries="104">
-      -1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
-      -1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
-      -1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
-      -1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
-      -1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
-      -1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
-      -1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0,
-      -1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0</Vector>
+      -1, 0, -2, 0, 0, 0, 0, 1, 0, 0, 0, 0, -2,
+      -1, 0, -2, 0, 0, 0, 0, 1, 0, 0, 0, 0, -2,
+      -1, 0, -2, 0, 0, 0, 0, 1, 0, 0, 0, 0, -2,
+      -1, 0, -2, 0, 0, 0, 0, 1, 0, 0, 0, 0, -2,
+      -1, 0, -2, 0, 0, 0, 0, 1, 0, 0, 0, 0, -2,
+      -1, 0, -2, 0, 0, 0, 0, 1, 0, 0, 0, 0, -2,
+      -1, 0, -2, 0, 0, 0, 0, 1, 0, 0, 0, 0, -2,
+      -1, 0, -2, 0, 0, 0, 0, 1, 0, 0, 0, 0, -2</Vector>
     <Numeric name="FirstLayer"       value="1"/>
     <Numeric name="AbsorberMode"     value="1"/>
     <Numeric name="zMinBlock"        value="[hgcal:zHGCalHEsil1]"/>
diff --git a/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h b/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h
index c78fbdccf3f1e..d9cba2052ba7f 100644
--- a/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h
+++ b/Geometry/HGCalCommonData/interface/HGCalDDDConstants.h
@@ -47,12 +47,13 @@ class HGCalDDDConstants {
   std::array<int, 5> assignCellHex(float x, float y, int lay, bool reco) const;
   std::array<int, 3> assignCellTrap(float x, float y, float z, int lay,
                                     bool reco) const;
+  std::pair<double, double> cellEtaPhiTrap(int type, int irad) const;
   bool cellInLayer(int waferU, int waferV, int cellU, int cellV, int lay,
                    bool reco) const;
   double cellSizeHex(int type) const;
   std::pair<double, double> cellSizeTrap(int type, int irad) const {
-    return std::pair<double, double>(hgpar_->radiusLayer_[type][irad - 1],
-                                     hgpar_->radiusLayer_[type][irad]);
+    return std::make_pair(hgpar_->radiusLayer_[type][irad - 1],
+			  hgpar_->radiusLayer_[type][irad]);
   }
   double cellThickness(int layer, int waferU, int waferV) const;
   CellType cellType(int type, int waferU, int waferV) const;
@@ -70,6 +71,11 @@ class HGCalDDDConstants {
   const HGCalParameters* getParameter() const { return hgpar_; }
   int getPhiBins(int lay) const;
   std::pair<int, int> getREtaRange(int lay) const;
+  const std::vector<double> & getRadiusLayer(int layer) const {
+    int type = ((mode_ == HGCalGeometryMode::Trapezoid) ? 
+		hgpar_->scintType(layer) : 0);
+    return hgpar_->radiusLayer_[type];
+  }
   HGCalParameters::hgtrform getTrForm(unsigned int k) const {
     return hgpar_->getTrForm(k);
   }
diff --git a/Geometry/HGCalCommonData/interface/HGCalGeomTools.h b/Geometry/HGCalCommonData/interface/HGCalGeomTools.h
index 03934b66ab781..f225e349e04e7 100644
--- a/Geometry/HGCalCommonData/interface/HGCalGeomTools.h
+++ b/Geometry/HGCalCommonData/interface/HGCalGeomTools.h
@@ -8,12 +8,23 @@ class HGCalGeomTools {
  public:
   HGCalGeomTools() {}
   ~HGCalGeomTools() {}
+  static void radius(double zf, double zb, 
+		     std::vector<double> const& zFront1,
+		     std::vector<double> const& rFront1,
+		     std::vector<double> const& slope1,
+		     std::vector<double> const& zFront2,
+		     std::vector<double> const& rFront2,
+		     std::vector<double> const& slope2, int flag,
+		     std::vector<double>& zz, std::vector<double>& rin,
+		     std::vector<double>& rout);
   static double radius(double z, std::vector<double> const& zFront,
                        std::vector<double> const& rFront,
                        std::vector<double> const& slope);
   static double radius(double z, int layer0, int layerf,
                        std::vector<double> const& zFront,
                        std::vector<double> const& rFront);
+  static double slope(double z, std::vector<double> const& zFront,
+		      std::vector<double> const& slope);
   static std::pair<double, double> zradius(double z1, double z2,
                                            std::vector<double> const& zFront,
                                            std::vector<double> const& rFront);
diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.cc b/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.cc
index 83cd584861849..14d59a005c992 100644
--- a/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.cc
+++ b/Geometry/HGCalCommonData/plugins/DDHGCalEEAlgo.cc
@@ -15,7 +15,6 @@
 #include "Geometry/HGCalCommonData/interface/HGCalParameters.h"
 
 //#define EDM_ML_DEBUG
-using namespace geant_units;
 using namespace geant_units::operators;
 
 DDHGCalEEAlgo::DDHGCalEEAlgo() {
@@ -102,7 +101,7 @@ void DDHGCalEEAlgo::initialize(const DDNumericArguments& nArgs,
   waferSize_ = nArgs["waferSize"];
   waferSepar_ = nArgs["SensorSeparation"];
   sectors_ = (int)(nArgs["Sectors"]);
-  alpha_ = piRadians / sectors_;
+  alpha_ = (1._pi) / sectors_;
   cosAlpha_ = cos(alpha_);
 #ifdef EDM_ML_DEBUG
   edm::LogVerbatim("HGCalGeom")
@@ -184,8 +183,6 @@ void DDHGCalEEAlgo::constructLayers(const DDLogicalPart& module,
       int copy = copyNumber_[ii];
       double hthick = 0.5 * thick_[ii];
       double rinB = HGCalGeomTools::radius(zo, zFrontB_, rMinFront_, slopeB_);
-      std::pair<double, double> zr =
-          HGCalGeomTools::zradius(zz, zz + thick_[ii], zFrontT_, rMaxFront_);
       zz += hthick;
       thickTot += thick_[ii];
 
@@ -201,32 +198,23 @@ void DDHGCalEEAlgo::constructLayers(const DDLogicalPart& module,
       DDMaterial matter(matName);
       DDLogicalPart glog;
       if (layerSense_[ly] < 1) {
-        int nsec =
-            (layerSense_[ly] == 0 || absorbMode_ == 0 || zr.first < 0) ? 2 : 3;
-        std::vector<double> pgonZ(nsec), pgonRin(nsec), pgonRout(nsec);
+        std::vector<double> pgonZ, pgonRin, pgonRout;
         if (layerSense_[ly] == 0 || absorbMode_ == 0) {
           double rmax = routF * cosAlpha_ - tol;
-          pgonZ[0] = -hthick;
-          pgonZ[1] = hthick;
-          pgonRin[0] = rinB;
-          pgonRin[1] = rinB;
-          pgonRout[0] = rmax;
-          pgonRout[1] = rmax;
+          pgonZ.emplace_back(-hthick);
+          pgonZ.emplace_back(hthick);
+          pgonRin.emplace_back(rinB);
+	  pgonRin.emplace_back(rinB);
+          pgonRout.emplace_back(rmax);
+          pgonRout.emplace_back(rmax);
         } else {
-          for (int isec = 0; isec < nsec; ++isec) {
-            double zs =
-                ((isec == 0) ? (zz - hthick)
-                             : (isec == nsec - 1) ? (zz + hthick) : zr.first);
-            double rm =
-                (((isec == 0) || (isec == nsec - 1))
-                     ? HGCalGeomTools::radius(zs, zFrontT_, rMaxFront_, slopeT_)
-                     : zr.second) *
-                    cosAlpha_ -
-                tol;
-            pgonZ[isec] = zs - zz;
-            pgonRin[isec] = rinB;
-            pgonRout[isec] = rm;
-          }
+	  HGCalGeomTools::radius(zz-hthick, zz+hthick, zFrontB_, rMinFront_, 
+				 slopeB_,  zFrontT_, rMaxFront_, slopeT_, 
+				 -layerSense_[ly], pgonZ, pgonRin, pgonRout);
+          for (unsigned int isec=0; isec < pgonZ.size(); ++isec) {
+	    pgonZ[isec]   -= zz;
+            pgonRout[isec] = pgonRout[isec]*cosAlpha_ - tol;
+	  }
         }
         DDSolid solid =
             DDSolidFactory::polyhedra(DDName(name, nameSpace_), sectors_,
diff --git a/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc b/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc
index 38f40f3fbc961..c8f6d23f7298a 100644
--- a/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc
+++ b/Geometry/HGCalCommonData/plugins/DDHGCalHEAlgo.cc
@@ -13,9 +13,8 @@
 #include "Geometry/HGCalCommonData/interface/HGCalGeomTools.h"
 #include "Geometry/HGCalCommonData/interface/HGCalParameters.h"
 
-using namespace geant_units;
-using namespace geant_units::operators;
 //#define EDM_ML_DEBUG
+using namespace geant_units::operators;
 
 DDHGCalHEAlgo::DDHGCalHEAlgo() {
 #ifdef EDM_ML_DEBUG
@@ -146,7 +145,7 @@ void DDHGCalHEAlgo::initialize(const DDNumericArguments& nArgs,
   waferSize_ = nArgs["waferSize"];
   waferSepar_ = nArgs["SensorSeparation"];
   sectors_ = (int)(nArgs["Sectors"]);
-  alpha_ = piRadians / sectors_;
+  alpha_ = (1._pi) / sectors_;
   cosAlpha_ = cos(alpha_);
 #ifdef EDM_ML_DEBUG
   edm::LogVerbatim("HGCalGeom")
@@ -228,8 +227,6 @@ void DDHGCalHEAlgo::constructLayers(const DDLogicalPart& module,
       int copy = copyNumber_[ii];
       double hthick = 0.5 * thick_[ii];
       double rinB = HGCalGeomTools::radius(zo, zFrontB_, rMinFront_, slopeB_);
-      std::pair<double, double> zr =
-          HGCalGeomTools::zradius(zz, zz + thick_[ii], zFrontT_, rMaxFront_);
       zz += hthick;
       thickTot += thick_[ii];
 
@@ -245,36 +242,27 @@ void DDHGCalHEAlgo::constructLayers(const DDLogicalPart& module,
       DDMaterial matter(matName);
       DDLogicalPart glog;
       if (layerSense_[ly] < 1) {
-        int nsec =
-            (layerSense_[ly] == 0 || absorbMode_ == 0 || zr.first < 0) ? 2 : 3;
-        std::vector<double> pgonZ(nsec), pgonRin(nsec), pgonRout(nsec);
+        std::vector<double> pgonZ, pgonRin, pgonRout;
         if (layerSense_[ly] == 0 || absorbMode_ == 0) {
           double rmax =
               (std::min(routF, HGCalGeomTools::radius(zz + hthick, zFrontT_,
                                                       rMaxFront_, slopeT_)) *
                cosAlpha_) -
               tol;
-          pgonZ[0] = -hthick;
-          pgonZ[1] = hthick;
-          pgonRin[0] = rinB;
-          pgonRin[1] = rinB;
-          pgonRout[0] = rmax;
-          pgonRout[1] = rmax;
+          pgonZ.emplace_back(-hthick);
+          pgonZ.emplace_back(hthick);
+          pgonRin.emplace_back(rinB);
+          pgonRin.emplace_back(rinB);
+          pgonRout.emplace_back(rmax);
+          pgonRout.emplace_back(rmax);
         } else {
-          for (int isec = 0; isec < nsec; ++isec) {
-            double zs =
-                ((isec == 0) ? (zz - hthick)
-                             : (isec == nsec - 1) ? (zz + hthick) : zr.first);
-            double rm =
-                (((isec == 0) || (isec == nsec - 1))
-                     ? HGCalGeomTools::radius(zs, zFrontT_, rMaxFront_, slopeT_)
-                     : zr.second) *
-                    cosAlpha_ -
-                tol;
-            pgonZ[isec] = zs - zz;
-            pgonRin[isec] = rinB;
-            pgonRout[isec] = rm;
-          }
+	  HGCalGeomTools::radius(zz-hthick, zz+hthick, zFrontB_, rMinFront_, 
+				 slopeB_,  zFrontT_, rMaxFront_, slopeT_, 
+				 -layerSense_[ly], pgonZ, pgonRin, pgonRout);
+          for (unsigned int isec=0; isec < pgonZ.size(); ++isec) {
+	    pgonZ[isec]   -= zz;
+            pgonRout[isec] = pgonRout[isec]*cosAlpha_ - tol;
+	  }
         }
         DDSolid solid =
             DDSolidFactory::polyhedra(DDName(name, nameSpace_), sectors_,
@@ -546,9 +534,9 @@ void DDHGCalHEAlgo::positionSensitive(const DDLogicalPart& glog, double rin,
 #ifdef EDM_ML_DEBUG
           ++ntype[type];
           edm::LogVerbatim("HGCalGeom")
-              << "DDHGCalHEAlgo: " << name << " number " << copy
-              << " positioned in " << glog.ddname() << " at " << tran
-              << " with " << rotation;
+            << "DDHGCalHEAlgo: " << name << " number " << copy
+            << " positioned in " << glog.ddname() << " at " << tran
+            << " with " << rotation;
 #endif
         }
       }
diff --git a/Geometry/HGCalCommonData/plugins/FastTimeNumberingInitialization.cc b/Geometry/HGCalCommonData/plugins/FastTimeNumberingInitialization.cc
index cae2b31eeaf09..9bb7764c32889 100644
--- a/Geometry/HGCalCommonData/plugins/FastTimeNumberingInitialization.cc
+++ b/Geometry/HGCalCommonData/plugins/FastTimeNumberingInitialization.cc
@@ -21,7 +21,6 @@
 
 // user include files
 #include <FWCore/Framework/interface/ESProducer.h>
-#include <FWCore/Framework/interface/ESTransientHandle.h>
 #include <FWCore/Framework/interface/ModuleFactory.h>
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -43,15 +42,18 @@ class FastTimeNumberingInitialization : public edm::ESProducer {
   using ReturnType = std::unique_ptr<FastTimeDDDConstants>;
 
   ReturnType produce(const IdealGeometryRecord&);
+
+private:
+  edm::ESGetToken<FastTimeParameters, IdealGeometryRecord> ftParToken_;
 };
 
-FastTimeNumberingInitialization::FastTimeNumberingInitialization(
-    const edm::ParameterSet&) {
+FastTimeNumberingInitialization::FastTimeNumberingInitialization(const edm::ParameterSet&):
+  ftParToken_{setWhatProduced(this).consumes<FastTimeParameters>(edm::ESInputTag{})}
+{
 #ifdef EDM_ML_DEBUG
   edm::LogVerbatim("HGCalGeom") 
     << "constructing FastTimeNumberingInitialization";
 #endif
-  setWhatProduced(this);
 }
 
 FastTimeNumberingInitialization::~FastTimeNumberingInitialization() {}
@@ -63,9 +65,8 @@ FastTimeNumberingInitialization::produce(const IdealGeometryRecord& iRecord) {
   edm::LogVerbatim("HGCalGeom")
     << "in FastTimeNumberingInitialization::produce";
 #endif
-  edm::ESHandle<FastTimeParameters> pFTpar;
-  iRecord.get(pFTpar);
-  return std::make_unique<FastTimeDDDConstants>(&(*pFTpar));
+  const auto& pFTpar = iRecord.get(ftParToken_);
+  return std::make_unique<FastTimeDDDConstants>(&pFTpar);
 }
 
 // define this as a plug-in
diff --git a/Geometry/HGCalCommonData/plugins/FastTimeParametersESModule.cc b/Geometry/HGCalCommonData/plugins/FastTimeParametersESModule.cc
index fcbf7f0bf516d..25104d0dfa66a 100644
--- a/Geometry/HGCalCommonData/plugins/FastTimeParametersESModule.cc
+++ b/Geometry/HGCalCommonData/plugins/FastTimeParametersESModule.cc
@@ -22,12 +22,14 @@ class FastTimeParametersESModule : public edm::ESProducer {
   ReturnType produce(const IdealGeometryRecord&);
 
  private:
+  edm::ESGetToken<DDCompactView, IdealGeometryRecord> cpvToken_;
   std::vector<std::string> name_;
   std::vector<int> type_;
 };
 
-FastTimeParametersESModule::FastTimeParametersESModule(
-    const edm::ParameterSet& iC) {
+FastTimeParametersESModule::FastTimeParametersESModule(const edm::ParameterSet& iC):
+  cpvToken_{setWhatProduced(this).consumes<DDCompactView>(edm::ESInputTag{})}
+{
   name_ = iC.getUntrackedParameter<std::vector<std::string> >("Names");
   type_ = iC.getUntrackedParameter<std::vector<int> >("Types");
 #ifdef EDM_ML_DEBUG
@@ -37,7 +39,6 @@ FastTimeParametersESModule::FastTimeParametersESModule(
     edm::LogVerbatim("HGCalGeom") 
       << " [" << k << "] " << name_[k] << ":" << type_[k];
 #endif
-  setWhatProduced(this);
 }
 
 FastTimeParametersESModule::~FastTimeParametersESModule() {}
@@ -46,13 +47,12 @@ FastTimeParametersESModule::ReturnType FastTimeParametersESModule::produce(
     const IdealGeometryRecord& iRecord) {
   edm::LogVerbatim("HGCalGeom") 
     << "FastTimeParametersESModule::produce(const IdealGeometryRecord& iRecord)";
-  edm::ESTransientHandle<DDCompactView> cpv;
-  iRecord.get(cpv);
+  edm::ESTransientHandle<DDCompactView> cpv = iRecord.getTransientHandle(cpvToken_);
 
   auto ptp = std::make_unique<FastTimeParameters>();
   FastTimeParametersFromDD builder;
   for (unsigned int k = 0; k < name_.size(); ++k)
-    builder.build(&(*cpv), *ptp, name_[k], type_[k]);
+    builder.build(cpv.product(), *ptp, name_[k], type_[k]);
 
 #ifdef EDM_ML_DEBUG
   edm::LogVerbatim("HGCalGeom") 
diff --git a/Geometry/HGCalCommonData/plugins/HGCalNumberingInitialization.cc b/Geometry/HGCalCommonData/plugins/HGCalNumberingInitialization.cc
index d6caf8a96df3f..ccb289f1fefc5 100644
--- a/Geometry/HGCalCommonData/plugins/HGCalNumberingInitialization.cc
+++ b/Geometry/HGCalCommonData/plugins/HGCalNumberingInitialization.cc
@@ -17,7 +17,6 @@
 //
 
 // user include files
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -39,19 +38,19 @@ class HGCalNumberingInitialization : public edm::ESProducer {
   ReturnType produce(const IdealGeometryRecord&);
 
  private:
-  HGCalDDDConstants* hgcalDDDConst_;
+  edm::ESGetToken<HGCalParameters, IdealGeometryRecord> hgParToken_;
   std::string name_;
 };
 
 HGCalNumberingInitialization::HGCalNumberingInitialization(
-    const edm::ParameterSet& iConfig)
-    : hgcalDDDConst_(nullptr) {
+    const edm::ParameterSet& iConfig) {
   name_ = iConfig.getUntrackedParameter<std::string>("Name");
 #ifdef EDM_ML_DEBUG
   edm::LogVerbatim("HGCalGeom")
     << "HGCalNumberingInitialization for " << name_;
 #endif
-  setWhatProduced(this, name_);
+  auto cc = setWhatProduced(this, name_);
+  hgParToken_ = cc.consumes<HGCalParameters>(edm::ESInputTag{"", name_});
 }
 
 HGCalNumberingInitialization::~HGCalNumberingInitialization() {}
@@ -60,12 +59,8 @@ HGCalNumberingInitialization::~HGCalNumberingInitialization() {}
 HGCalNumberingInitialization::ReturnType HGCalNumberingInitialization::produce(
     const IdealGeometryRecord& iRecord) {
   edm::LogVerbatim("HGCalGeom") << "in HGCalNumberingInitialization::produce";
-  if (hgcalDDDConst_ == nullptr) {
-    edm::ESHandle<HGCalParameters> pHGpar;
-    iRecord.get(name_, pHGpar);
-    hgcalDDDConst_ = new HGCalDDDConstants(&(*pHGpar), name_);
-  }
-  return ReturnType(hgcalDDDConst_);
+  const auto& pHGpar = iRecord.get(hgParToken_);
+  return std::make_unique<HGCalDDDConstants>(&pHGpar, name_);
 }
 
 // define this as a plug-in
diff --git a/Geometry/HGCalCommonData/plugins/HGCalParametersESModule.cc b/Geometry/HGCalCommonData/plugins/HGCalParametersESModule.cc
index 69516b72f5cfb..9e02d0b5ff32f 100644
--- a/Geometry/HGCalCommonData/plugins/HGCalParametersESModule.cc
+++ b/Geometry/HGCalCommonData/plugins/HGCalParametersESModule.cc
@@ -21,6 +21,7 @@ class HGCalParametersESModule : public edm::ESProducer {
 
  private:
   std::string name_, namew_, namec_, namet_;
+  edm::ESGetToken<DDCompactView, IdealGeometryRecord> cpvToken_;
 };
 
 HGCalParametersESModule::HGCalParametersESModule(const edm::ParameterSet& iC) {
@@ -33,7 +34,8 @@ HGCalParametersESModule::HGCalParametersESModule(const edm::ParameterSet& iC) {
     << "HGCalParametersESModule for " << name_ << ":" << namew_ << ":"
     << namec_ << ":" << namet_;
 #endif
-  setWhatProduced(this, name_);
+  auto cc = setWhatProduced(this, name_);
+  cpvToken_ = cc.consumes<DDCompactView>(edm::ESInputTag{});
 }
 
 HGCalParametersESModule::~HGCalParametersESModule() {}
@@ -42,12 +44,11 @@ HGCalParametersESModule::ReturnType HGCalParametersESModule::produce(
     const IdealGeometryRecord& iRecord) {
   edm::LogVerbatim("HGCalGeom")
       << "HGCalParametersESModule::produce(const IdealGeometryRecord& iRecord)";
-  edm::ESTransientHandle<DDCompactView> cpv;
-  iRecord.get(cpv);
+  edm::ESTransientHandle<DDCompactView> cpv = iRecord.getTransientHandle(cpvToken_);
 
   auto ptp = std::make_unique<HGCalParameters>(name_);
   HGCalParametersFromDD builder;
-  builder.build(&(*cpv), *ptp, name_, namew_, namec_, namet_);
+  builder.build(cpv.product(), *ptp, name_, namew_, namec_, namet_);
 
   return ptp;
 }
diff --git a/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc b/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc
index 8d9ff4cbdded9..e50f463322bbc 100644
--- a/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc
+++ b/Geometry/HGCalCommonData/src/HGCalDDDConstants.cc
@@ -201,6 +201,19 @@ std::array<int, 3> HGCalDDDConstants::assignCellTrap(float x, float y, float z,
   return std::array<int, 3>{{irad, iphi, type}};
 }
 
+std::pair<double, double> HGCalDDDConstants::cellEtaPhiTrap(int type, 
+							    int irad) const {
+  double dr(0), df(0);
+  if (mode_ == HGCalGeometryMode::Trapezoid) {
+    double r = 0.5*((hgpar_->radiusLayer_[type][irad-1] +
+		     hgpar_->radiusLayer_[type][irad]));
+    dr       = (hgpar_->radiusLayer_[type][irad] - 
+		hgpar_->radiusLayer_[type][irad-1]);
+    df       = r * hgpar_->cellSize_[type];
+  }
+  return std::make_pair(dr,df);
+}
+
 bool HGCalDDDConstants::cellInLayer(int waferU, int waferV, int cellU,
                                     int cellV, int lay, bool reco) const {
   const auto& indx = getIndex(lay, true);
@@ -387,14 +400,14 @@ int HGCalDDDConstants::getLayer(double z, bool reco) const {
   double zz =
       (reco ? std::abs(z) : HGCalParameters::k_ScaleFromDDD * std::abs(z));
   const auto& zLayerHex = hgpar_->zLayerHex_;
-  std::find_if(zLayerHex.begin() + 1, zLayerHex.end(),
-               [&k, &zz, &zLayerHex](double zLayer) {
-                 ++k;
-                 return zz < 0.5 * (zLayerHex[k - 1] + zLayerHex[k]);
-               });
-  int lay = k;
+  auto itr = std::find_if(zLayerHex.begin() + 1, zLayerHex.end(),
+			  [&k, &zz, &zLayerHex](double zLayer) {
+			    ++k;
+			    return zz < 0.5 * (zLayerHex[k-1] + zLayerHex[k]);
+			  });
+  int lay = (itr == zLayerHex.end()) ? static_cast<int>(zLayerHex.size()) :  k;
   if (((mode_ == HGCalGeometryMode::Hexagon) ||
-       (mode_ == HGCalGeometryMode::HexagonFull)) &
+       (mode_ == HGCalGeometryMode::HexagonFull)) &&
       reco) {
     int indx = layerIndex(lay, false);
     if (indx >= 0) lay = hgpar_->layerGroup_[indx];
@@ -1039,17 +1052,20 @@ std::pair<double, double> HGCalDDDConstants::rangeR(double z, bool reco) const {
       rmin = HGCalGeomTools::radius(zz, hgpar_->zFrontMin_, hgpar_->rMinFront_,
                                     hgpar_->slopeMin_);
     } else {
-      rmin = HGCalGeomTools::radius(
-          zz, hgpar_->firstLayer_, hgpar_->firstMixedLayer_, hgpar_->zLayerHex_,
-          hgpar_->radiusMixBoundary_);
+      rmin = HGCalGeomTools::radius(zz, hgpar_->firstLayer_, 
+				    hgpar_->firstMixedLayer_, 
+				    hgpar_->zLayerHex_,
+				    hgpar_->radiusMixBoundary_);
     }
     if ((hgpar_->detectorType_ == 2) &&
         (zz >= hgpar_->zLayerHex_[hgpar_->firstMixedLayer_ - 1])) {
-      rmax = HGCalGeomTools::radius(
-          zz, hgpar_->firstLayer_, hgpar_->firstMixedLayer_, hgpar_->zLayerHex_,
-          hgpar_->radiusMixBoundary_);
+      rmax = HGCalGeomTools::radius(zz, hgpar_->firstLayer_, 
+				    hgpar_->firstMixedLayer_, 
+				    hgpar_->zLayerHex_,
+				    hgpar_->radiusMixBoundary_);
     } else {
-      rmax = HGCalGeomTools::radius(zz, hgpar_->zFrontTop_, hgpar_->rMaxFront_,
+      rmax = HGCalGeomTools::radius(zz, hgpar_->zFrontTop_, 
+				    hgpar_->rMaxFront_,
                                     hgpar_->slopeTop_);
     }
   }
@@ -1061,7 +1077,7 @@ std::pair<double, double> HGCalDDDConstants::rangeR(double z, bool reco) const {
   edm::LogVerbatim("HGCalGeom") << "HGCalDDDConstants:rangeR: " << z << ":"
                                 << zz << " R " << rmin << ":" << rmax;
 #endif
-  return std::pair<double, double>(rmin, rmax);
+  return std::make_pair(rmin, rmax);
 }
 
 std::pair<double, double> HGCalDDDConstants::rangeZ(bool reco) const {
@@ -1076,7 +1092,7 @@ std::pair<double, double> HGCalDDDConstants::rangeZ(bool reco) const {
     zmin *= HGCalParameters::k_ScaleToDDD;
     zmax *= HGCalParameters::k_ScaleToDDD;
   }
-  return std::pair<double, double>(zmin, zmax);
+  return std::make_pair(zmin, zmax);
 }
 
 std::pair<int, int> HGCalDDDConstants::rowColumnWafer(int wafer) const {
diff --git a/Geometry/HGCalCommonData/src/HGCalGeomTools.cc b/Geometry/HGCalCommonData/src/HGCalGeomTools.cc
index 33714ed8ddbc2..3b0d685863a5d 100644
--- a/Geometry/HGCalCommonData/src/HGCalGeomTools.cc
+++ b/Geometry/HGCalCommonData/src/HGCalGeomTools.cc
@@ -6,23 +6,128 @@
 
 //#define EDM_ML_DEBUG
 
-double HGCalGeomTools::radius(double z, std::vector<double> const& zFront,
-                              std::vector<double> const& rFront,
-                              std::vector<double> const& slope) {
-  double r = rFront[0];
+void HGCalGeomTools::radius(double zf, double zb,
+			    std::vector<double> const& zFront1,
+			    std::vector<double> const& rFront1,
+			    std::vector<double> const& slope1,
+			    std::vector<double> const& zFront2,
+			    std::vector<double> const& rFront2,
+			    std::vector<double> const& slope2, int flag,
+			    std::vector<double>& zz, 
+			    std::vector<double>& rin,
+			    std::vector<double>& rout) {
+
+  double dz1(0), dz2(0);
+  auto zf1 = std::lower_bound(zFront1.begin(), zFront1.end(), zf);
+  if (zf1 != zFront1.begin()) --zf1;
+  if (std::abs(*(zf1+1) - zf) < tol) { ++zf1; dz1 = 2*tol;}
+  auto zf2 = std::lower_bound(zFront2.begin(), zFront2.end(), zf);
+  if (zf2 != zFront2.begin()) --zf2;
+  auto zb1 = std::lower_bound(zFront1.begin(), zFront1.end(), zb);
+  if (zb1 != zFront1.begin()) --zb1;
+  if (std::abs(*zb1 - zb) < tol) {--zb1; dz2 =-2*tol;}
+  auto zb2 = std::lower_bound(zFront2.begin(), zFront2.end(), zb);
+  if (zb2 != zFront2.begin()) --zb2;
 #ifdef EDM_ML_DEBUG
-  unsigned int ik(0);
+  edm::LogVerbatim("HGCalGeom") 
+    << "HGCalGeomTools::radius:zf " << zf << " : " << *zf1 << " : " << *zf2 
+    << " zb " << zb << " : " << *zb1 << " : " << *zb2 << " Flag " << flag;
+#endif
+  if ((zf1==zb1) && (zf2==zb2)) {
+#ifdef EDM_ML_DEBUG
+    edm::LogVerbatim("HGCalGeom") << "HGCalGeomTools::radius:Try " << zf << ":"
+				  << zb << " dz " << dz1 << ":" << dz2;
 #endif
-  for (unsigned int k = 0; k < slope.size(); ++k) {
-    if (z < zFront[k] + tol) break;
-    r = rFront[k] + (z - zFront[k]) * slope[k];
+    zz.emplace_back(zf);
+    rin.emplace_back(radius(zf+dz1,zFront1,rFront1,slope1));
+    rout.emplace_back(radius(zf,zFront2,rFront2,slope2));
+    zz.emplace_back(zb);
+    rin.emplace_back(radius(zb+dz2,zFront1,rFront1,slope1));
+    rout.emplace_back(radius(zb,zFront2,rFront2,slope2));
+  } else if (zf1 == zb1) {
 #ifdef EDM_ML_DEBUG
-    ik = k;
+    double z1 = std::max(*zf2,*zb2);
+    edm::LogVerbatim("HGCalGeom") << "HGCalGeomTools::radius:Try " << zf << ":"
+				  << *zb2 << " (" << z1 << ") : " << zb;
 #endif
+    zz.emplace_back(zf);
+    rin.emplace_back(radius(zf,zFront1,rFront1,slope1));
+    rout.emplace_back(radius(zf,zFront2,rFront2,slope2));
+    if (slope(*zb2,zFront2,slope2) < tol) {
+      zz.emplace_back(*zb2);
+      rin.emplace_back(radius(*zb2,zFront1,rFront1,slope1));
+      rout.emplace_back(radius(*zb2-tol,zFront2,rFront2,slope2));
+    }
+    zz.emplace_back(*zb2);
+    rin.emplace_back(radius(*zb2,zFront1,rFront1,slope1));
+    rout.emplace_back(radius(*zb2,zFront2,rFront2,slope2));
+    zz.emplace_back(zb);
+    rin.emplace_back(radius(zb,zFront1,rFront1,slope1));
+    rout.emplace_back(radius(zb,zFront2,rFront2,slope2));
+  } else if (zf2 == zb2) {
+#ifdef EDM_ML_DEBUG
+    edm::LogVerbatim("HGCalGeom") << "HGCalGeomTools::radius:Try " << zf << ":"
+				  << *zb1 << ":" << zb;
+#endif
+    zz.emplace_back(zf);
+    rin.emplace_back(radius(zf,zFront1,rFront1,slope1));
+    rout.emplace_back(radius(zf,zFront2,rFront2,slope2));
+    if (slope(*zb1,zFront1,slope1) < tol) {
+      zz.emplace_back(*zb1);
+      rin.emplace_back(radius(*zb1-tol,zFront1,rFront1,slope1));
+      rout.emplace_back(radius(*zb1,zFront2,rFront2,slope2));
+    }
+    zz.emplace_back(*zb1);
+    rin.emplace_back(radius(*zb1,zFront1,rFront1,slope1));
+    rout.emplace_back(radius(*zb1,zFront2,rFront2,slope2));
+    zz.emplace_back(zb);
+    rin.emplace_back(radius(zb,zFront1,rFront1,slope1));
+    rout.emplace_back(radius(zb,zFront2,rFront2,slope2));
+  } else {
+    double z1 = std::min(*zf2,*zb1);
+    double z2 = std::max(*zf2,*zb1);
+#ifdef EDM_ML_DEBUG
+    edm::LogVerbatim("HGCalGeom") << "HGCalGeomTools::radius:Try " << zf << ":"
+				  << z1 << " : " << z2 << ":" << zb;
+#endif
+    zz.emplace_back(zf);
+    rin.emplace_back(radius(zf,zFront1,rFront1,slope1));
+    rout.emplace_back(radius(zf,zFront2,rFront2,slope2));
+    zz.emplace_back(z1);
+    rin.emplace_back(radius(z1,zFront1,rFront1,slope1));
+    rout.emplace_back(radius(z1,zFront2,rFront2,slope2));
+    zz.emplace_back(z2);
+    rin.emplace_back(radius(z2,zFront1,rFront1,slope1));
+    rout.emplace_back(radius(z2,zFront2,rFront2,slope2));
+    zz.emplace_back(zb);
+    rin.emplace_back(radius(zb,zFront1,rFront1,slope1));
+    rout.emplace_back(radius(zb,zFront2,rFront2,slope2));
+  }
+  double rmin = *(std::min_element(rout.begin(),rout.end()));
+  if (flag > 1) {
+    for (auto& rr : rout) rr = rmin;
   }
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HGCalGeom") 
+    << "HGCalGeomTools::radius has " << zz.size() << " sections: "<< rmin;
+  for (unsigned int k=0; k<zz.size(); ++k) 
+    edm::LogVerbatim("HGCalGeom") 
+      << "[" << k << "] Z = " << zz[k] << " R = " << rin[k] << ":" << rout[k];
+#endif
+}
+
+double HGCalGeomTools::radius(double z, std::vector<double> const& zFront,
+                              std::vector<double> const& rFront,
+                              std::vector<double> const& slope) {
+
+  auto itrz = std::lower_bound(zFront.begin(), zFront.end(), z);
+  if (itrz != zFront.begin()) --itrz;
+  unsigned int ik = static_cast<unsigned int>(itrz-zFront.begin());
+  if (ik < zFront.size() && std::abs(z-zFront[ik+1]) < tol) ++ik;
+  double r = rFront[ik] + (z - zFront[ik]) * slope[ik];
 #ifdef EDM_ML_DEBUG
   edm::LogVerbatim("HGCalGeom")
-      << "DDHGCalGeomTools: Z " << z << ":" << ik << " R " << r;
+      << "DDHGCalGeomTools: Z " << z << " k " << ik << " R " << r;
 #endif
   return r;
 }
@@ -37,11 +142,11 @@ double HGCalGeomTools::radius(double z, int layer0, int layerf,
   for (unsigned int k = 0; k < rFront.size(); ++k) {
     int k1 = layerf - layer0 + (int)(k);
     if (k1 < (int)(zFront.size())) {
-      if (z < zFront[k1] + tol) break;
       r = rFront[k];
 #ifdef EDM_ML_DEBUG
       ik = k;
 #endif
+      if (z < zFront[k1] + tol) break;
     }
   }
 #ifdef EDM_ML_DEBUG
@@ -51,6 +156,20 @@ double HGCalGeomTools::radius(double z, int layer0, int layerf,
   return r;
 }
 
+double HGCalGeomTools::slope(double z, std::vector<double> const& zFront,
+			     std::vector<double> const& slope) {
+
+  auto itrz = std::lower_bound(zFront.begin(), zFront.end(), z);
+  if (itrz != zFront.begin()) --itrz;
+  unsigned int ik = static_cast<unsigned int>(itrz-zFront.begin());
+  //  if (ik < zFront.size() && std::abs(z-zFront[ik+1]) < tol) ++ik;
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HGCalGeom") << "HGCalGeomTools::slope:z " << z << " k " 
+				<< ik << " Slope " << slope[ik];
+#endif
+  return slope[ik];
+}
+
 std::pair<double, double> HGCalGeomTools::zradius(
     double z1, double z2, std::vector<double> const& zF,
     std::vector<double> const& rF) {
diff --git a/Geometry/HGCalCommonData/test/FastTimeNumberingTester.cc b/Geometry/HGCalCommonData/test/FastTimeNumberingTester.cc
index 317d53803fffb..c57b8b1482edd 100644
--- a/Geometry/HGCalCommonData/test/FastTimeNumberingTester.cc
+++ b/Geometry/HGCalCommonData/test/FastTimeNumberingTester.cc
@@ -29,8 +29,6 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/ESTransientHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -51,19 +49,20 @@ class FastTimeNumberingTester : public edm::one::EDAnalyzer<> {
   void beginJob() override {}
   void analyze(edm::Event const& iEvent, edm::EventSetup const&) override;
   void endJob() override {}
+private:
+  edm::ESGetToken<FastTimeDDDConstants, IdealGeometryRecord> token_;
 };
 
-FastTimeNumberingTester::FastTimeNumberingTester(const edm::ParameterSet&) {}
+FastTimeNumberingTester::FastTimeNumberingTester(const edm::ParameterSet&):
+  token_{esConsumes<FastTimeDDDConstants, IdealGeometryRecord>(edm::ESInputTag{})}
+ {}
 
 FastTimeNumberingTester::~FastTimeNumberingTester() {}
 
 // ------------ method called to produce the data  ------------
 void FastTimeNumberingTester::analyze(const edm::Event& iEvent,
                                       const edm::EventSetup& iSetup) {
-  edm::ESHandle<FastTimeDDDConstants> pFTNDC;
-
-  iSetup.get<IdealGeometryRecord>().get(pFTNDC);
-  const FastTimeDDDConstants fTnDC(*pFTNDC);
+  const FastTimeDDDConstants& fTnDC = iSetup.getData(token_);
   std::cout << "Fast timing device with " << fTnDC.getCells(1) << ":"
             << fTnDC.getCells(2) << " cells"
             << " for barrel and endcap\n";
diff --git a/Geometry/HGCalCommonData/test/HGCGeometryTester.cc b/Geometry/HGCalCommonData/test/HGCGeometryTester.cc
index 2901fbcada278..971fd918012f2 100644
--- a/Geometry/HGCalCommonData/test/HGCGeometryTester.cc
+++ b/Geometry/HGCalCommonData/test/HGCGeometryTester.cc
@@ -26,8 +26,6 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/ESTransientHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -49,10 +47,13 @@ class HGCGeometryTester : public edm::one::EDAnalyzer<> {
   void endJob() override {}
 
  private:
+  edm::ESGetToken<DDCompactView, IdealGeometryRecord> ddToken_;
   bool square;
 };
 
-HGCGeometryTester::HGCGeometryTester(const edm::ParameterSet& iC) {
+HGCGeometryTester::HGCGeometryTester(const edm::ParameterSet& iC):
+  ddToken_{esConsumes<DDCompactView, IdealGeometryRecord>(edm::ESInputTag{})}
+{
   square = iC.getUntrackedParameter<bool>("SquareType", true);
 }
 
@@ -61,11 +62,10 @@ HGCGeometryTester::~HGCGeometryTester() {}
 // ------------ method called to produce the data  ------------
 void HGCGeometryTester::analyze(const edm::Event& iEvent,
                                 const edm::EventSetup& iSetup) {
-  edm::ESTransientHandle<DDCompactView> pDD;
-  iSetup.get<IdealGeometryRecord>().get(pDD);
+  const auto& pDD = iSetup.getData(ddToken_);
 
   // parse the DD for sensitive volumes
-  DDExpandedView eview(*pDD);
+  DDExpandedView eview(pDD);
   std::map<std::string, std::pair<double, double> > svPars;
   do {
     const DDLogicalPart& logPart = eview.logicalPart();
diff --git a/Geometry/HGCalCommonData/test/HGCalNumberingTester.cc b/Geometry/HGCalCommonData/test/HGCalNumberingTester.cc
index e4a5a690b9a53..6ae79825cda7f 100644
--- a/Geometry/HGCalCommonData/test/HGCalNumberingTester.cc
+++ b/Geometry/HGCalCommonData/test/HGCalNumberingTester.cc
@@ -28,8 +28,6 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/ESTransientHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -51,6 +49,7 @@ class HGCalNumberingTester : public edm::one::EDAnalyzer<> {
   void endJob() override {}
 
  private:
+  edm::ESGetToken<HGCalDDDConstants, IdealGeometryRecord> dddToken_;
   std::string nameSense_, nameDetector_;
   std::vector<double> positionX_, positionY_;
   int increment_, detType_;
@@ -65,6 +64,9 @@ HGCalNumberingTester::HGCalNumberingTester(const edm::ParameterSet& iC) {
   increment_ = iC.getParameter<int>("Increment");
   detType_ = iC.getParameter<int>("DetType");
   reco_ = iC.getParameter<bool>("Reco");
+
+  dddToken_ = esConsumes<HGCalDDDConstants, IdealGeometryRecord>(edm::ESInputTag{"", nameSense_});
+
   std::string unit("mm");
   if (reco_) {
     for (unsigned int k = 0; k < positionX_.size(); ++k) {
@@ -92,10 +94,7 @@ HGCalNumberingTester::~HGCalNumberingTester() {}
 // ------------ method called to produce the data  ------------
 void HGCalNumberingTester::analyze(const edm::Event& iEvent,
                                    const edm::EventSetup& iSetup) {
-  edm::ESHandle<HGCalDDDConstants> pHGNDC;
-
-  iSetup.get<IdealGeometryRecord>().get(nameSense_, pHGNDC);
-  const HGCalDDDConstants hgdc(*pHGNDC);
+  const HGCalDDDConstants& hgdc = iSetup.getData(dddToken_);
   std::cout << nameDetector_ << " Layers = " << hgdc.layers(reco_)
             << " Sectors = " << hgdc.sectors()
             << " Minimum Slope = " << hgdc.minSlope() << std::endl;
diff --git a/Geometry/HGCalCommonData/test/HGCalParameterTester.cc b/Geometry/HGCalCommonData/test/HGCalParameterTester.cc
index fd1b72b3aeb1b..bbadc1c07b905 100644
--- a/Geometry/HGCalCommonData/test/HGCalParameterTester.cc
+++ b/Geometry/HGCalCommonData/test/HGCalParameterTester.cc
@@ -1,7 +1,6 @@
 #include <iostream>
 #include <map>
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -27,15 +26,17 @@ class HGCalParameterTester : public edm::one::EDAnalyzer<> {
                std::vector<double> const& obj2, int n) const;
   void myPrint(std::string const& s, HGCalParameters::wafer_map const& obj,
                int n) const;
-  void printTrform(edm::ESHandle<HGCalParameters> const&) const;
-  void printWaferType(edm::ESHandle<HGCalParameters> const& phgp) const;
+  void printTrform(HGCalParameters const*) const;
+  void printWaferType(HGCalParameters const* phgp) const;
 
   const std::string name_;
+  edm::ESGetToken<HGCalParameters, IdealGeometryRecord> token_;
   const int mode_;
 };
 
 HGCalParameterTester::HGCalParameterTester(const edm::ParameterSet& ic)
     : name_(ic.getUntrackedParameter<std::string>("Name")),
+      token_(esConsumes<HGCalParameters, IdealGeometryRecord>(edm::ESInputTag{"", name_})),
       mode_(ic.getUntrackedParameter<int>("Mode")) {}
 
 void HGCalParameterTester::analyze(const edm::Event& iEvent,
@@ -43,8 +44,8 @@ void HGCalParameterTester::analyze(const edm::Event& iEvent,
   edm::LogVerbatim("HGCalGeomr") << "HGCalParameter::Here I am";
   auto start = std::chrono::high_resolution_clock::now();
 
-  edm::ESHandle<HGCalParameters> phgp;
-  iSetup.get<IdealGeometryRecord>().get(name_, phgp);
+  const auto& hgp = iSetup.getData(token_);
+  const auto* phgp = &hgp;
 
   std::cout << phgp->name_ << "\n";
   if (mode_ == 0) {
@@ -309,7 +310,7 @@ void HGCalParameterTester::myPrint(std::string const& s,
 }
 
 void HGCalParameterTester::printTrform(
-    edm::ESHandle<HGCalParameters> const& phgp) const {
+    HGCalParameters const* phgp) const {
   int k(0);
   std::cout << "TrformIndex with " << phgp->trformIndex_.size()
             << " elements\n";
@@ -326,7 +327,7 @@ void HGCalParameterTester::printTrform(
 }
 
 void HGCalParameterTester::printWaferType(
-    edm::ESHandle<HGCalParameters> const& phgp) const {
+    HGCalParameters const* phgp) const {
   int k(0);
   std::cout << "waferTypes with " << phgp->waferTypes_.size() << " elements\n";
   std::map<std::pair<int, int>, int> kounts;
diff --git a/Geometry/HGCalCommonData/test/HGCalParametersAnalyzer.cc b/Geometry/HGCalCommonData/test/HGCalParametersAnalyzer.cc
index 8e667cfbbbea3..59680bb9160c4 100644
--- a/Geometry/HGCalCommonData/test/HGCalParametersAnalyzer.cc
+++ b/Geometry/HGCalCommonData/test/HGCalParametersAnalyzer.cc
@@ -1,6 +1,5 @@
 #include <iostream>
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -11,20 +10,22 @@
 
 class HGCalParametersAnalyzer : public edm::one::EDAnalyzer<> {
  public:
-  explicit HGCalParametersAnalyzer(const edm::ParameterSet&) {}
+  explicit HGCalParametersAnalyzer(const edm::ParameterSet&):
+    token_{esConsumes<PHGCalParameters, PHGCalParametersRcd>(edm::ESInputTag{})}
+  {}
   ~HGCalParametersAnalyzer() override {}
 
-  void beginJob() override {}
   void analyze(edm::Event const& iEvent, edm::EventSetup const&) override;
-  void endJob() override {}
+ private:
+  edm::ESGetToken<PHGCalParameters, PHGCalParametersRcd> token_;
 };
 
 void HGCalParametersAnalyzer::analyze(const edm::Event& iEvent,
                                       const edm::EventSetup& iSetup) {
   edm::LogInfo("HGCalParametersAnalyzer") << "Here I am";
 
-  edm::ESHandle<PHGCalParameters> phgp;
-  iSetup.get<PHGCalParametersRcd>().get(phgp);
+  const auto& hgp = iSetup.getData(token_);
+  const auto* phgp = &hgp;
 
   std::cout << phgp->name_ << "\n";
   for (auto it : phgp->cellSize_) std::cout << it << ", ";
diff --git a/Geometry/HGCalCommonData/test/testHGCalNumbering_cfg.py b/Geometry/HGCalCommonData/test/testHGCalNumbering_cfg.py
index 9c07ed72187e7..70aa065ad15d3 100644
--- a/Geometry/HGCalCommonData/test/testHGCalNumbering_cfg.py
+++ b/Geometry/HGCalCommonData/test/testHGCalNumbering_cfg.py
@@ -5,7 +5,7 @@
 #process.load("Geometry.CMSCommonData.cmsExtendedGeometry2023D17XML_cfi")
 #process.load("Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi")
 #process.load("Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi")
-process.load("Geometry.HGCalCommonData.testHGCXML_cfi")
+process.load("Geometry.HGCalCommonData.testHGCV10XML_cfi")
 process.load("Geometry.HGCalCommonData.hgcalParametersInitialization_cfi")
 process.load("Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi")
 process.load('FWCore.MessageService.MessageLogger_cfi')
diff --git a/Geometry/HGCalGeometry/BuildFile.xml b/Geometry/HGCalGeometry/BuildFile.xml
index bd7d790b88a26..af82f72f25f26 100644
--- a/Geometry/HGCalGeometry/BuildFile.xml
+++ b/Geometry/HGCalGeometry/BuildFile.xml
@@ -1,6 +1,7 @@
 <use   name="DataFormats/EcalDetId"/>
 <use   name="DataFormats/ForwardDetId"/>
 <use   name="DataFormats/Common"/>
+<use   name="CommonTools/UtilAlgos"/>
 <use   name="FWCore/Framework"/>
 <use   name="FWCore/ParameterSet"/>
 <use   name="FWCore/PluginManager"/>
diff --git a/Geometry/HGCalGeometry/plugins/FastTimeGeometryESProducer.cc b/Geometry/HGCalGeometry/plugins/FastTimeGeometryESProducer.cc
index c7dc22aa2f6ca..9911567e5c4dc 100644
--- a/Geometry/HGCalGeometry/plugins/FastTimeGeometryESProducer.cc
+++ b/Geometry/HGCalGeometry/plugins/FastTimeGeometryESProducer.cc
@@ -22,7 +22,6 @@
 // user include files
 #include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 #include "Geometry/CaloTopology/interface/FastTimeTopology.h"
@@ -47,20 +46,20 @@ class FastTimeGeometryESProducer : public edm::ESProducer {
 
 private:
   // ----------member data ---------------------------
-  std::string        name_;
-  int                type_;
+  edm::ESGetToken<FastTimeTopology, IdealGeometryRecord> topologyToken_;
 };
 
 
 FastTimeGeometryESProducer::FastTimeGeometryESProducer(const edm::ParameterSet& iConfig) {
 
-  name_     = iConfig.getUntrackedParameter<std::string>("Name");
-  type_     = iConfig.getUntrackedParameter<int>("Type");
+  auto name     = iConfig.getUntrackedParameter<std::string>("Name");
 #ifdef EDM_ML_DEBUG
-  std::cout <<"constructing FastTimeGeometry for " << name_ << " Type "
-	    << type_ << std::endl;
+  auto type     = iConfig.getUntrackedParameter<int>("Type");
+  std::cout <<"constructing FastTimeGeometry for " << name << " Type "
+	    << type << std::endl;
 #endif
-  setWhatProduced(this, name_);
+  auto cc = setWhatProduced(this, name);
+  topologyToken_ = cc.consumes<FastTimeTopology>(edm::ESInputTag{"", name});
 }
 
 
@@ -75,14 +74,13 @@ FastTimeGeometryESProducer::~FastTimeGeometryESProducer() { }
 FastTimeGeometryESProducer::ReturnType
 FastTimeGeometryESProducer::produce(const IdealGeometryRecord& iRecord ) {
 
-  edm::ESHandle<FastTimeTopology> topo;
-  iRecord.get(name_,topo);
+  const auto& topo = iRecord.get(topologyToken_);
 
   FastTimeGeometryLoader builder;
 #ifdef EDM_ML_DEBUG
-  std::cout << "Create FastTimeGeometry (*topo)" << std::endl;
+  std::cout << "Create FastTimeGeometry (topo)" << std::endl;
 #endif
-  return ReturnType(builder.build(*topo));
+  return ReturnType(builder.build(topo));
 }
 
 DEFINE_FWK_EVENTSETUP_MODULE(FastTimeGeometryESProducer);
diff --git a/Geometry/HGCalGeometry/plugins/HGCalGeometryESProducer.cc b/Geometry/HGCalGeometry/plugins/HGCalGeometryESProducer.cc
index 13fd6dd53c6d8..86c3b889e897e 100644
--- a/Geometry/HGCalGeometry/plugins/HGCalGeometryESProducer.cc
+++ b/Geometry/HGCalGeometry/plugins/HGCalGeometryESProducer.cc
@@ -22,7 +22,6 @@
 // user include files
 #include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
@@ -48,17 +47,18 @@ class HGCalGeometryESProducer : public edm::ESProducer {
 
 private:
   // ----------member data ---------------------------
-  std::string        name_;
+  edm::ESGetToken<HGCalTopology, IdealGeometryRecord> topologyToken_;
 };
 
 
 HGCalGeometryESProducer::HGCalGeometryESProducer(const edm::ParameterSet& iConfig) {
 
-  name_     = iConfig.getUntrackedParameter<std::string>("Name");
+  auto name     = iConfig.getUntrackedParameter<std::string>("Name");
 #ifdef EDM_ML_DEBUG
-  edm::LogVerbatim("HGCalGeom") << "Constructing HGCalGeometry for " << name_;
+  edm::LogVerbatim("HGCalGeom") << "Constructing HGCalGeometry for " << name;
 #endif
-  setWhatProduced(this, name_);
+  auto cc = setWhatProduced(this, name);
+  topologyToken_ = cc.consumes<HGCalTopology>(edm::ESInputTag{"", name});
 }
 
 
@@ -73,15 +73,13 @@ HGCalGeometryESProducer::~HGCalGeometryESProducer() { }
 HGCalGeometryESProducer::ReturnType
 HGCalGeometryESProducer::produce(const IdealGeometryRecord& iRecord ) {
 
-  edm::ESHandle<HGCalTopology> topo;
-  iRecord.get(name_,topo);
+  const auto& topo = iRecord.get(topologyToken_);
 #ifdef EDM_ML_DEBUG
-    edm::LogVerbatim("HGCalGeom") << "Create HGCalGeometry (*topo) with " 
-				  << topo.isValid();
+  edm::LogVerbatim("HGCalGeom") << "Create HGCalGeometry (*topo)";
 #endif
 
   HGCalGeometryLoader builder;
-  return ReturnType(builder.build(*topo));
+  return ReturnType(builder.build(topo));
 }
 
 DEFINE_FWK_EVENTSETUP_MODULE(HGCalGeometryESProducer);
diff --git a/Geometry/HGCalGeometry/test/CaloCellGeometryTester.cc b/Geometry/HGCalGeometry/test/CaloCellGeometryTester.cc
index 0e30394c5f5f8..9fcb0503e1007 100644
--- a/Geometry/HGCalGeometry/test/CaloCellGeometryTester.cc
+++ b/Geometry/HGCalGeometry/test/CaloCellGeometryTester.cc
@@ -1,7 +1,6 @@
 #include "DataFormats/DetId/interface/DetId.h"
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
@@ -17,21 +16,25 @@ class CaloCellGeometryTester : public edm::one::EDAnalyzer<> {
   explicit CaloCellGeometryTester( const edm::ParameterSet& );
   ~CaloCellGeometryTester( void ) override {}
     
-  void beginJob() override {}
   void analyze(edm::Event const&, edm::EventSetup const&) override;
-  void endJob() override {}
+private:
+  edm::ESGetToken<CaloGeometry, CaloGeometryRecord> caloToken_;
+  std::array<edm::ESGetToken<FastTimeGeometry, IdealGeometryRecord>, 2> fastTimeTokens_;
 };
 
-CaloCellGeometryTester::CaloCellGeometryTester(const edm::ParameterSet&) { }
+CaloCellGeometryTester::CaloCellGeometryTester(const edm::ParameterSet&):
+  caloToken_{esConsumes<CaloGeometry, CaloGeometryRecord>(edm::ESInputTag{})},
+  fastTimeTokens_{{esConsumes<FastTimeGeometry, IdealGeometryRecord>(edm::ESInputTag{"", "FastTimeBarrel"}),
+                   esConsumes<FastTimeGeometry, IdealGeometryRecord>(edm::ESInputTag{"", "SFBX"})}}
+ { }
 
 void CaloCellGeometryTester::analyze(const edm::Event& /*iEvent*/, 
 				     const edm::EventSetup& iSetup) {
 
 
   // get handles to calogeometry and calotopology
-  edm::ESHandle<CaloGeometry> pG;
-  iSetup.get<CaloGeometryRecord>().get(pG);
-  const CaloGeometry* geo = pG.product();
+  const auto& pG = iSetup.getData(caloToken_);
+  const CaloGeometry* geo = &pG;
 
   int         dets[9] = {3,3,3,4,4,4,4,6,6};
   int         subd[9] = {1,2,3,1,2,4,3,3,4};
@@ -47,14 +50,11 @@ void CaloCellGeometryTester::analyze(const edm::Event& /*iEvent*/,
     }
   }
 
-  std::string named1[2] = {"FastTimeBarrel","SFBX"};
-  std::string named2[2] = {"FTBarrel","FTEndcap"};
+  std::string named[2] = {"FTBarrel","FTEndcap"};
   for (int k=0; k<2; ++k) {
-    edm::ESHandle<FastTimeGeometry> fgeom;
-    iSetup.get<IdealGeometryRecord>().get(named1[k],fgeom);
-    if (fgeom.isValid()) {
+    if (auto fgeom = iSetup.getHandle(fastTimeTokens_[k])) {
       const FastTimeGeometry* geom = (fgeom.product());
-      std::cout << named2[k] << " has " << geom->getValidDetIds().size() << " valid cells" << std::endl;
+      std::cout << named[k] << " has " << geom->getValidDetIds().size() << " valid cells" << std::endl;
       std::cout << "Number of valid GeomID " 
 		<< geom->getValidGeomDetIds().size() << std::endl;
     }
diff --git a/Geometry/HGCalGeometry/test/FastTimeGeometryTester.cc b/Geometry/HGCalGeometry/test/FastTimeGeometryTester.cc
index f191eabbfcfed..13052e208052e 100644
--- a/Geometry/HGCalGeometry/test/FastTimeGeometryTester.cc
+++ b/Geometry/HGCalGeometry/test/FastTimeGeometryTester.cc
@@ -8,8 +8,6 @@
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESTransientHandle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
@@ -23,13 +21,12 @@ class FastTimeGeometryTester : public edm::one::EDAnalyzer<> {
   explicit FastTimeGeometryTester(const edm::ParameterSet& );
   ~FastTimeGeometryTester() override;
 
-  void beginJob() override {}
   void analyze(edm::Event const& iEvent, edm::EventSetup const&) override;
-  void endJob() override {}
   
 private:
   void doTest(const FastTimeGeometry* geom, ForwardSubdetector subdet);
-  
+
+  edm::ESGetToken<FastTimeGeometry, IdealGeometryRecord> geomToken_;
   std::string    name_;
   int            type_;
 };
@@ -37,6 +34,7 @@ class FastTimeGeometryTester : public edm::one::EDAnalyzer<> {
 FastTimeGeometryTester::FastTimeGeometryTester(const edm::ParameterSet& iC) {
   name_ = iC.getParameter<std::string>("Detector");
   type_ = (name_ == "FastTimeBarrel") ? 1 : 2;
+  geomToken_ = esConsumes<FastTimeGeometry, IdealGeometryRecord>(edm::ESInputTag{"", name_});
 }
 
 
@@ -47,13 +45,10 @@ void FastTimeGeometryTester::analyze(const edm::Event& ,
 
   ForwardSubdetector subdet = FastTime;
 
-  edm::ESHandle<FastTimeGeometry> geomH;
-  iSetup.get<IdealGeometryRecord>().get(name_,geomH);
-  const FastTimeGeometry* geom = (geomH.product());
+  const auto& geomR = iSetup.getData(geomToken_);
+  const FastTimeGeometry* geom = &geomR;
 
-  if (geomH.isValid()) doTest(geom, subdet);
-  else                 std::cout << "Cannot get valid FastTimeGeometry Object "
-				 << "for " << name_ << std::endl;
+  doTest(geom, subdet);
 }
 
 void FastTimeGeometryTester::doTest(const FastTimeGeometry* geom, 
diff --git a/Geometry/HGCalGeometry/test/HGCalGeometryCheck.cc b/Geometry/HGCalGeometry/test/HGCalGeometryCheck.cc
new file mode 100644
index 0000000000000..718ebeef09ef1
--- /dev/null
+++ b/Geometry/HGCalGeometry/test/HGCalGeometryCheck.cc
@@ -0,0 +1,165 @@
+#include <cmath>
+#include <iostream>
+#include <string>
+#include <vector>
+
+#include "CommonTools/UtilAlgos/interface/TFileService.h"
+
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Utilities/interface/transform.h"
+
+#include "Geometry/Records/interface/IdealGeometryRecord.h"
+#include "Geometry/HGCalCommonData/interface/HGCalGeometryMode.h"
+#include "Geometry/HGCalGeometry/interface/HGCalGeometry.h"
+#include "DataFormats/ForwardDetId/interface/ForwardSubdetector.h"
+#include "DataFormats/ForwardDetId/interface/HFNoseDetId.h"
+#include "DataFormats/ForwardDetId/interface/HGCalDetId.h"
+#include "DataFormats/ForwardDetId/interface/HGCScintillatorDetId.h"
+#include "DataFormats/ForwardDetId/interface/HGCSiliconDetId.h"
+
+#include "TH1D.h"
+#include "TH2D.h"
+
+class HGCalGeometryCheck : public edm::one::EDAnalyzer<edm::one::WatchRuns,edm::one::SharedResources> {
+public:
+  explicit HGCalGeometryCheck(const edm::ParameterSet& );
+  ~HGCalGeometryCheck() override;
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
+  void beginRun(edm::Run const&, edm::EventSetup const&) override;
+  void analyze(edm::Event const& iEvent, edm::EventSetup const&) override {}
+  void endRun(edm::Run const&, edm::EventSetup const&) override {}
+  
+private:
+  void doTest(const HGCalGeometry* geom, ForwardSubdetector subdet);
+  void doTestWafer(const HGCalGeometry* geom, DetId::Detector det);
+  void doTestScint(const HGCalGeometry* geom, DetId::Detector det);
+  
+  const std::vector<std::string>        nameDetectors_;
+  const std::vector<edm::ESGetToken<HGCalGeometry, IdealGeometryRecord>> geomTokens_;
+  const double                          rmin_, rmax_, zmin_, zmax_;
+  const int                             nbinR_, nbinZ_;
+  const bool                            ifNose_, verbose_;
+  std::vector<unsigned int>             modHF_;
+  std::vector<TH2D*>                    h_RZ_;
+  std::vector<TH1D*>                    h_Mod_;
+};
+
+HGCalGeometryCheck::HGCalGeometryCheck(const edm::ParameterSet& iC)  :
+  nameDetectors_(iC.getParameter<std::vector<std::string> >("detectorNames")),
+  geomTokens_{edm::vector_transform(nameDetectors_, [this](const std::string& name) {
+      return esConsumes<HGCalGeometry, IdealGeometryRecord>(edm::ESInputTag{"", name});
+    })},
+  rmin_(iC.getUntrackedParameter<double>("rMin",0.0)),
+  rmax_(iC.getUntrackedParameter<double>("rMax",300.0)),
+  zmin_(iC.getUntrackedParameter<double>("zMin",300.0)),
+  zmax_(iC.getUntrackedParameter<double>("zMax",600.0)),
+  nbinR_(iC.getUntrackedParameter<int>("nBinR",300)),
+  nbinZ_(iC.getUntrackedParameter<int>("nBinZ",600)),
+  ifNose_(iC.getUntrackedParameter<bool>("ifNose",false)),
+  verbose_(iC.getUntrackedParameter<bool>("verbosity",false)) {
+  usesResource(TFileService::kSharedResource);
+}
+
+HGCalGeometryCheck::~HGCalGeometryCheck() {}
+
+void HGCalGeometryCheck::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  std::vector<std::string> names   = {"HGCalEESensitive",
+                                      "HGCalHESiliconSensitive",
+                                      "HGCalHEScintillatorSensitive"};
+  desc.add<std::vector<std::string> >("detectorNames", names);
+  desc.addUntracked<double>("rMin",0.0);
+  desc.addUntracked<double>("rMax",300.0);
+  desc.addUntracked<double>("zMin",300.0);
+  desc.addUntracked<double>("zMax",600.0);
+  desc.addUntracked<int>("nBinR",300);
+  desc.addUntracked<int>("nBinZ",600);
+  desc.addUntracked<bool>("ifNose",false);
+  desc.addUntracked<bool>("verbosity",false);
+  descriptions.add("hgcalGeometryCheck",desc);
+}
+
+void HGCalGeometryCheck::beginRun(const edm::Run&, 
+				  const edm::EventSetup& iSetup) {
+
+  edm::Service<TFileService> fs;
+  char name[100], title[200];
+  sprintf (name, "RZ_All");
+  sprintf (title, "R vs Z for All Detectors");
+  h_RZ_.emplace_back(fs->make<TH2D>(name, title,nbinZ_,zmin_,zmax_,
+				    nbinR_,rmin_,rmax_));
+
+  for (unsigned int ih=0; ih <nameDetectors_.size(); ++ih) {
+    const auto& geomR = iSetup.getData(geomTokens_[ih]);
+    const HGCalGeometry* geom = &geomR;
+    int layerF = geom->topology().dddConstants().firstLayer();
+    int layerL = geom->topology().dddConstants().lastLayer(true);
+    edm::LogVerbatim("HGCalGeom") 
+      << nameDetectors_[ih] << " with layers in the range " << layerF << ":"
+      << layerL;
+    sprintf (name, "RZ_%s", nameDetectors_[ih].c_str());
+    sprintf (title, "R vs Z for %s", nameDetectors_[ih].c_str());
+    h_RZ_.emplace_back(fs->make<TH2D>(name, title,nbinZ_,zmin_,zmax_,
+      				nbinR_,rmin_,rmax_));
+    HGCalGeometryMode::GeometryMode mode = geom->topology().dddConstants().geomMode();
+    unsigned int k(0);
+    for (int lay=layerF; lay<=layerL; ++lay, ++k) {
+      sprintf (name, "Mod_%s_L%d", nameDetectors_[ih].c_str(), lay);
+      sprintf (title, "Modules in layer %d in %s", lay, nameDetectors_[ih].c_str());
+      h_Mod_.emplace_back(fs->make<TH1D>(name,title,200,-50,50));
+      
+      auto zz = geom->topology().dddConstants().waferZ(lay,true);
+      auto rr = geom->topology().dddConstants().rangeR(zz, true);
+      edm::LogVerbatim("HGCalGeom") 
+        << "Layer " << lay << " R " << rr.first << ":" << rr.second
+        << " Z " << zz;
+      double r = rr.first;
+      while (r <= rr.second) {
+        h_RZ_[0]->Fill(zz,r);
+        h_RZ_[ih+1]->Fill(zz,r);
+        for (int k=0; k<100; ++k) {
+          double phi = 2*k*M_PI/100.0;
+          GlobalPoint global1(r*cos(phi),r*sin(phi),zz);
+          DetId       id = geom->getClosestCell(global1);
+          if (ifNose_) {
+            HFNoseDetId detId = HFNoseDetId(id);
+            h_Mod_.back()->Fill(detId.waferU());
+            h_Mod_.back()->Fill(detId.waferV());
+            if (verbose_) 
+              edm::LogVerbatim("HGCalGeom") << "R: " << r << " ID " << detId;
+          } else if ((mode == HGCalGeometryMode::Hexagon) ||
+      	       (mode == HGCalGeometryMode::HexagonFull)) {
+            HGCalDetId detId = HGCalDetId(id);
+            h_Mod_.back()->Fill(detId.wafer());
+            if (verbose_) 
+              edm::LogVerbatim("HGCalGeom") << "R: " << r << " ID " << detId;
+          } else if (mode == HGCalGeometryMode::Trapezoid) {
+            HGCScintillatorDetId detId = HGCScintillatorDetId(id);
+            h_Mod_.back()->Fill(detId.ieta());
+            if (verbose_) 
+              edm::LogVerbatim("HGCalGeom") << "R: " << r << " ID " << detId;
+          } else {
+            HGCSiliconDetId detId = HGCSiliconDetId(id);
+            h_Mod_.back()->Fill(detId.waferU());
+            h_Mod_.back()->Fill(detId.waferV());
+            if (verbose_) 
+              edm::LogVerbatim("HGCalGeom") << "R: " << r << " ID " << detId;
+          }
+        }
+        r += 1.0;
+      }
+    }
+  }
+}
+
+//define this as a plug-in
+#include "FWCore/Framework/interface/MakerMacros.h"
+DEFINE_FWK_MODULE(HGCalGeometryCheck);
diff --git a/Geometry/HGCalGeometry/test/HGCalGeometryCornerTester.cc b/Geometry/HGCalGeometry/test/HGCalGeometryCornerTester.cc
index cb2ecb2ba0a7a..97a0de7d3e4b6 100644
--- a/Geometry/HGCalGeometry/test/HGCalGeometryCornerTester.cc
+++ b/Geometry/HGCalGeometry/test/HGCalGeometryCornerTester.cc
@@ -8,8 +8,6 @@
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESTransientHandle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
@@ -23,18 +21,16 @@ class HGCalGeometryCornerTester : public edm::one::EDAnalyzer<> {
   explicit HGCalGeometryCornerTester(const edm::ParameterSet& );
   ~HGCalGeometryCornerTester() override;
 
-  void beginJob() override {}
   void analyze(edm::Event const& iEvent, edm::EventSetup const&) override;
-  void endJob() override {}
   
 private:
   void doTest(const HGCalGeometry* geom);
-  const std::string    name_;
+  const edm::ESGetToken<HGCalGeometry, IdealGeometryRecord> geomToken_;
   const int            cornerType_;
 };
 
 HGCalGeometryCornerTester::HGCalGeometryCornerTester(const edm::ParameterSet& iC) : 
-  name_(iC.getParameter<std::string>("detector")),
+  geomToken_{esConsumes<HGCalGeometry, IdealGeometryRecord>(edm::ESInputTag{"", iC.getParameter<std::string>("detector")})},
   cornerType_(iC.getParameter<int>("cornerType")) { }
 
 HGCalGeometryCornerTester::~HGCalGeometryCornerTester() {}
@@ -42,15 +38,8 @@ HGCalGeometryCornerTester::~HGCalGeometryCornerTester() {}
 void HGCalGeometryCornerTester::analyze(const edm::Event& , 
 					const edm::EventSetup& iSetup ) {
 
-  edm::ESHandle<HGCalGeometry> geomH;
-  iSetup.get<IdealGeometryRecord>().get(name_,geomH);
-  const HGCalGeometry* geom = (geomH.product());
-  if (!geomH.isValid()) {
-    std::cout << "Cannot get valid HGCalGeometry Object for " << name_
-	      << std::endl;
-  } else {
-    doTest(geom);
-  }
+  const HGCalGeometry& geom = iSetup.getData(geomToken_);
+  doTest(&geom);
 }
 
 void HGCalGeometryCornerTester::doTest(const HGCalGeometry* geom) {
diff --git a/Geometry/HGCalGeometry/test/HGCalGeometryTester.cc b/Geometry/HGCalGeometry/test/HGCalGeometryTester.cc
index b6a70e2ed6e8d..6168ecbc2e8b5 100644
--- a/Geometry/HGCalGeometry/test/HGCalGeometryTester.cc
+++ b/Geometry/HGCalGeometry/test/HGCalGeometryTester.cc
@@ -8,8 +8,6 @@
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESTransientHandle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
@@ -26,9 +24,7 @@ class HGCalGeometryTester : public edm::one::EDAnalyzer<> {
   explicit HGCalGeometryTester(const edm::ParameterSet& );
   ~HGCalGeometryTester() override;
 
-  void beginJob() override {}
   void analyze(edm::Event const& iEvent, edm::EventSetup const&) override;
-  void endJob() override {}
   
 private:
   void doTest(const HGCalGeometry* geom, ForwardSubdetector subdet);
@@ -36,11 +32,13 @@ class HGCalGeometryTester : public edm::one::EDAnalyzer<> {
   void doTestScint(const HGCalGeometry* geom, DetId::Detector det);
   
   std::string    name;
+  edm::ESGetToken<HGCalGeometry, IdealGeometryRecord> geomToken_;
 };
 
-HGCalGeometryTester::HGCalGeometryTester(const edm::ParameterSet& iC) {
-  name       = iC.getParameter<std::string>("Detector");
-}
+HGCalGeometryTester::HGCalGeometryTester(const edm::ParameterSet& iC):
+  name{iC.getParameter<std::string>("Detector")},
+  geomToken_{esConsumes<HGCalGeometry, IdealGeometryRecord>(edm::ESInputTag{"", name})}
+{}
 
 
 HGCalGeometryTester::~HGCalGeometryTester() {}
@@ -48,35 +46,29 @@ HGCalGeometryTester::~HGCalGeometryTester() {}
 void HGCalGeometryTester::analyze(const edm::Event& , 
 				  const edm::EventSetup& iSetup ) {
 
-  edm::ESHandle<HGCalGeometry> geomH;
-  iSetup.get<IdealGeometryRecord>().get(name,geomH);
-  const HGCalGeometry* geom = (geomH.product());
-  if (!geomH.isValid()) {
-    std::cout << "Cannot get valid HGCalGeometry Object for " << name 
-	      << std::endl;
+  const auto& geomR = iSetup.getData(geomToken_);
+  const HGCalGeometry* geom = &geomR;
+  HGCalGeometryMode::GeometryMode mode = geom->topology().dddConstants().geomMode();
+  if ((mode == HGCalGeometryMode::Hexagon) ||
+      (mode == HGCalGeometryMode::HexagonFull)) {
+    ForwardSubdetector subdet;
+    if      (name == "HGCalHESiliconSensitive")      subdet = HGCHEF;
+    else if (name == "HGCalHEScintillatorSensitive") subdet = HGCHEB;
+    else                                             subdet = HGCEE;
+    std::cout << "Perform test for " << name << " Detector:Subdetector "
+              << DetId::Forward << ":" << subdet << std::endl;
+    doTest(geom, subdet);
   } else {
-    HGCalGeometryMode::GeometryMode mode = geom->topology().dddConstants().geomMode();
-    if ((mode == HGCalGeometryMode::Hexagon) ||
-	(mode == HGCalGeometryMode::HexagonFull)) {
-      ForwardSubdetector subdet;
-      if      (name == "HGCalHESiliconSensitive")      subdet = HGCHEF;
-      else if (name == "HGCalHEScintillatorSensitive") subdet = HGCHEB;
-      else                                             subdet = HGCEE;
-      std::cout << "Perform test for " << name << " Detector:Subdetector "
-		<< DetId::Forward << ":" << subdet << std::endl;
-      doTest(geom, subdet);
+    DetId::Detector det;
+    if      (name == "HGCalHESiliconSensitive")      det = DetId::HGCalHSi;
+    else if (name == "HGCalHEScintillatorSensitive") det = DetId::HGCalHSc;
+    else                                             det = DetId::HGCalEE;
+    std::cout << "Perform test for " << name << " Detector " << det
+              << std::endl;
+    if (name == "HGCalHEScintillatorSensitive") {
+      doTestScint(geom, det);
     } else {
-      DetId::Detector det;
-      if      (name == "HGCalHESiliconSensitive")      det = DetId::HGCalHSi;
-      else if (name == "HGCalHEScintillatorSensitive") det = DetId::HGCalHSc;
-      else                                             det = DetId::HGCalEE;
-      std::cout << "Perform test for " << name << " Detector " << det
-		<< std::endl;
-      if (name == "HGCalHEScintillatorSensitive") {
-	doTestScint(geom, det);
-      } else {
-	doTestWafer(geom,det);
-      }
+      doTestWafer(geom,det);
     }
   }
 }
@@ -106,14 +98,16 @@ void HGCalGeometryTester::doTest(const HGCalGeometry* geom,
 	    auto        icell1  = geom->getGeometry(id1);
 	    GlobalPoint global1 = geom->getPosition(id1);
 	    DetId       idc1    = geom->getClosestCell(global1);
+	    GlobalPoint global2 = geom->getPosition(idc1);
 	    std::cout << "DetId (" << subdet << ":" << zside << ":" << layer
 		      << ":" << sector << ":0:" << cell << ") Geom " << icell1
 		      << " position (" << global1.x() << ", " << global1.y()
 		      << ", " << global1.z() << ") ids " << std::hex 
 		      << id1.rawId() << ":" << idc1.rawId() << std::dec
 		      << ":" << HGCalDetId(id1) << ":" << HGCalDetId(idc1)
- 		      << " parameter[3] = " << icell1->param()[2] << ":"
-		      << icell1->param()[2];
+		      << " new position (" << global2.x() << ", " << global2.y()
+		      << ", " << global2.z() << ") parameter[3] = " 
+		      << icell1->param()[2] << ":" << icell1->param()[2];
 	    if (id1.rawId() != idc1.rawId()) 
 	      std::cout << "***** ERROR *****" << std::endl;
 	    else
@@ -156,6 +150,7 @@ void HGCalGeometryTester::doTestWafer(const HGCalGeometry* geom,
 		auto        icell1  = geom->getGeometry(id1);
 		GlobalPoint global1 = geom->getPosition(id1);
 		DetId       idc1    = geom->getClosestCell(global1);
+		GlobalPoint global2 = geom->getPosition(idc1);
 		std::cout << "DetId (" << det << ":" << zside << ":" 
 			  << type << ":" << layer << ":" << waferU << ":"
 			  << waferV << ":" << cellU << ":" << cellV 
@@ -164,7 +159,9 @@ void HGCalGeometryTester::doTestWafer(const HGCalGeometry* geom,
 			  << ", " << global1.z() << ") ids " << std::hex 
 			  << id1.rawId() << ":" << idc1.rawId() << std::dec
 			  << ":" << HGCSiliconDetId(id1) << ":" 
-			  << HGCSiliconDetId(idc1) << " parameter[3] = " 
+			  << HGCSiliconDetId(idc1) << " new position (" 
+			  << global2.x() << ", " << global2.y()
+			  << ", " << global2.z() << ") parameter[3] = " 
 			  << icell1->param()[2] << ":" << icell1->param()[2];
 		if (id1.rawId() != idc1.rawId()) 
 		  std::cout << "***** ERROR *****" << std::endl;
@@ -205,15 +202,18 @@ void HGCalGeometryTester::doTestScint(const HGCalGeometry* geom,
 	    auto        icell1  = geom->getGeometry(id1);
 	    GlobalPoint global1 = geom->getPosition(id1);
 	    DetId       idc1    = geom->getClosestCell(global1);
+	    GlobalPoint global2 = geom->getPosition(idc1);
 	    std::cout << "DetId (" << det << ":" << zside << ":" << type 
 		      << ":" << layer << ":" << ieta << ":" << iphi
 		      << ") Geom " << icell1 << " position (" << global1.x() 
 		      << ", " << global1.y() << ", " << global1.z() 
-		      << ") ids " << std::hex  << id1.rawId() << ":" 
-		      << idc1.rawId() << std::dec << ":" 
-		      << HGCScintillatorDetId(id1) << ":" 
-		      << HGCScintillatorDetId(idc1)
-		      << " parameter[11] = " << icell1->param()[10] << ":"
+		      << ":" << global1.perp() << ") ids " << std::hex  
+		      << id1.rawId() << ":"  << idc1.rawId() << std::dec 
+		      << ":"  << HGCScintillatorDetId(id1) << ":" 
+		      << HGCScintillatorDetId(idc1) << " new position (" 
+		      << global2.x() << ", " << global2.y() << ", " 
+		      << global2.z() << ":" << global2.perp() 
+		      << ") parameter[11] = "  << icell1->param()[10] << ":" 
 		      << icell1->param()[10];
 	    if (id1.rawId() != idc1.rawId()) 
 	      std::cout << "***** ERROR *****" << std::endl;
@@ -230,6 +230,15 @@ void HGCalGeometryTester::doTestScint(const HGCalGeometry* geom,
       }
     }
   }
+  for (int layer = geom->topology().dddConstants().firstLayer();
+       layer <= geom->topology().dddConstants().lastLayer(true); ++layer) {
+    HGCScintillatorDetId id(geom->topology().dddConstants().getTypeTrap(layer),
+			    layer, 20, 1);
+    GlobalPoint global1 = geom->getPosition(id);
+    std::cout << "Layer " << layer << " DetId " << id << " position ("
+	      << global1.x() << ", " << global1.y() << ", " << global1.z() 
+	      << ", " << global1.perp() << ")" << std::endl;
+  }
 }
 
 //define this as a plug-in
diff --git a/Geometry/HGCalGeometry/test/HGCalSizeTester.cc b/Geometry/HGCalGeometry/test/HGCalSizeTester.cc
index 732f8e5a9f969..b56ea97c44217 100644
--- a/Geometry/HGCalGeometry/test/HGCalSizeTester.cc
+++ b/Geometry/HGCalGeometry/test/HGCalSizeTester.cc
@@ -8,8 +8,6 @@
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESTransientHandle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
@@ -26,20 +24,20 @@ class HGCalSizeTester : public edm::one::EDAnalyzer<> {
   explicit HGCalSizeTester(const edm::ParameterSet& );
   ~HGCalSizeTester() override;
 
-  void beginJob() override {}
   void analyze(edm::Event const& iEvent, edm::EventSetup const&) override;
-  void endJob() override {}
   
 private:
   void doTestWafer(const HGCalGeometry* geom, DetId::Detector det);
   void doTestScint(const HGCalGeometry* geom, DetId::Detector det);
   
   std::string    name;
+  edm::ESGetToken<HGCalGeometry, IdealGeometryRecord> geomToken_;
 };
 
-HGCalSizeTester::HGCalSizeTester(const edm::ParameterSet& iC) {
-  name       = iC.getParameter<std::string>("detector");
-}
+HGCalSizeTester::HGCalSizeTester(const edm::ParameterSet& iC):
+  name{iC.getParameter<std::string>("detector")},
+  geomToken_{esConsumes<HGCalGeometry, IdealGeometryRecord>(edm::ESInputTag{"", name})}
+{}
 
 
 HGCalSizeTester::~HGCalSizeTester() {}
@@ -47,28 +45,22 @@ HGCalSizeTester::~HGCalSizeTester() {}
 void HGCalSizeTester::analyze(const edm::Event& , 
 			      const edm::EventSetup& iSetup ) {
 
-  edm::ESHandle<HGCalGeometry> geomH;
-  iSetup.get<IdealGeometryRecord>().get(name,geomH);
-  const HGCalGeometry* geom = (geomH.product());
-  if (!geomH.isValid()) {
-    std::cout << "Cannot get valid HGCalGeometry Object for " << name 
-	      << std::endl;
+  const auto& geomR = iSetup.getData(geomToken_);
+  const HGCalGeometry* geom = &geomR;
+  HGCalGeometryMode::GeometryMode mode = geom->topology().dddConstants().geomMode();
+  if ((mode == HGCalGeometryMode::Hexagon) ||
+      (mode == HGCalGeometryMode::HexagonFull)) {
   } else {
-    HGCalGeometryMode::GeometryMode mode = geom->topology().dddConstants().geomMode();
-    if ((mode == HGCalGeometryMode::Hexagon) ||
-	(mode == HGCalGeometryMode::HexagonFull)) {
+    DetId::Detector det;
+    if      (name == "HGCalHESiliconSensitive")      det = DetId::HGCalHSi;
+    else if (name == "HGCalHEScintillatorSensitive") det = DetId::HGCalHSc;
+    else                                             det = DetId::HGCalEE;
+    std::cout << "Perform test for " << name << " Detector " << det
+              << std::endl;
+    if (name == "HGCalHEScintillatorSensitive") {
+      doTestScint(geom, det);
     } else {
-      DetId::Detector det;
-      if      (name == "HGCalHESiliconSensitive")      det = DetId::HGCalHSi;
-      else if (name == "HGCalHEScintillatorSensitive") det = DetId::HGCalHSc;
-      else                                             det = DetId::HGCalEE;
-      std::cout << "Perform test for " << name << " Detector " << det
-		<< std::endl;
-      if (name == "HGCalHEScintillatorSensitive") {
-	doTestScint(geom, det);
-      } else {
-	doTestWafer(geom,det);
-      }
+      doTestWafer(geom,det);
     }
   }
 }
diff --git a/Geometry/HGCalGeometry/test/HGCalTestNeighbor.cc b/Geometry/HGCalGeometry/test/HGCalTestNeighbor.cc
index e7728cf5c737e..b121d71b084cc 100644
--- a/Geometry/HGCalGeometry/test/HGCalTestNeighbor.cc
+++ b/Geometry/HGCalGeometry/test/HGCalTestNeighbor.cc
@@ -13,8 +13,6 @@
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESTransientHandle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -33,9 +31,7 @@ class HGCalTestNeighbor : public edm::one::EDAnalyzer<> {
   ~HGCalTestNeighbor() override;
 
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-  void beginJob() override {}
   void analyze(edm::Event const& iEvent, edm::EventSetup const&) override;
-  void endJob() override {}
   
 private:
   void doTest(const HGCalGeometry* geom, ForwardSubdetector subdet, 
@@ -47,6 +43,8 @@ class HGCalTestNeighbor : public edm::one::EDAnalyzer<> {
   
   std::string         name_;
   std::vector<double> px_, py_, pz_;
+  edm::ESGetToken<MagneticField, IdealMagneticFieldRecord> fieldToken_;
+  edm::ESGetToken<HGCalGeometry, IdealGeometryRecord> geomToken_;
 };
 
 HGCalTestNeighbor::HGCalTestNeighbor(const edm::ParameterSet& iC) {
@@ -54,6 +52,8 @@ HGCalTestNeighbor::HGCalTestNeighbor(const edm::ParameterSet& iC) {
   px_        = iC.getParameter<std::vector<double> >("pX");
   py_        = iC.getParameter<std::vector<double> >("pY");
   pz_        = iC.getParameter<std::vector<double> >("pZ");
+  fieldToken_ = esConsumes<MagneticField, IdealMagneticFieldRecord>(edm::ESInputTag{});
+  geomToken_  = esConsumes<HGCalGeometry, IdealGeometryRecord>(edm::ESInputTag{"", name_});
 }
 
 HGCalTestNeighbor::~HGCalTestNeighbor() {}
@@ -74,39 +74,32 @@ void HGCalTestNeighbor::fillDescriptions(edm::ConfigurationDescriptions& descrip
 void HGCalTestNeighbor::analyze(const edm::Event& , 
 				const edm::EventSetup& iSetup ) {
 
-  edm::ESHandle<MagneticField> bFieldH;
-  iSetup.get<IdealMagneticFieldRecord>().get(bFieldH);
-  const MagneticField *bField = bFieldH.product();
-
-  edm::ESHandle<HGCalGeometry> geomH;
-  iSetup.get<IdealGeometryRecord>().get(name_,geomH);
-  const HGCalGeometry* geom = (geomH.product());
-  if (!geomH.isValid()) {
-    std::cout << "Cannot get valid HGCalGeometry Object for " << name_
-	      << std::endl;
+  const auto& bFieldR = iSetup.getData(fieldToken_);
+  const MagneticField *bField = &bFieldR;
+
+  const auto& geomR = iSetup.getData(geomToken_);
+  const HGCalGeometry* geom = &geomR;
+  HGCalGeometryMode::GeometryMode mode = geom->topology().dddConstants().geomMode();
+  if ((mode == HGCalGeometryMode::Hexagon) ||
+      (mode == HGCalGeometryMode::HexagonFull)) {
+    ForwardSubdetector subdet;
+    if      (name_ == "HGCalHESiliconSensitive")      subdet = HGCHEF;
+    else if (name_ == "HGCalHEScintillatorSensitive") subdet = HGCHEB;
+    else                                             subdet = HGCEE;
+    std::cout << "Perform test for " << name_ << " Detector:Subdetector "
+              << DetId::Forward << ":" << subdet << std::endl;
+    doTest(geom, subdet, bField);
   } else {
-    HGCalGeometryMode::GeometryMode mode = geom->topology().dddConstants().geomMode();
-    if ((mode == HGCalGeometryMode::Hexagon) ||
-	(mode == HGCalGeometryMode::HexagonFull)) {
-      ForwardSubdetector subdet;
-      if      (name_ == "HGCalHESiliconSensitive")      subdet = HGCHEF;
-      else if (name_ == "HGCalHEScintillatorSensitive") subdet = HGCHEB;
-      else                                             subdet = HGCEE;
-      std::cout << "Perform test for " << name_ << " Detector:Subdetector "
-		<< DetId::Forward << ":" << subdet << std::endl;
-      doTest(geom, subdet, bField);
+    DetId::Detector det;
+    if      (name_ == "HGCalHESiliconSensitive")      det = DetId::HGCalHSi;
+    else if (name_ == "HGCalHEScintillatorSensitive") det = DetId::HGCalHSc;
+    else                                              det = DetId::HGCalEE;
+    std::cout << "Perform test for " << name_ << " Detector " << det
+              << std::endl;
+    if (name_ == "HGCalHEScintillatorSensitive") {
+      doTestScint(geom, det, bField);
     } else {
-      DetId::Detector det;
-      if      (name_ == "HGCalHESiliconSensitive")      det = DetId::HGCalHSi;
-      else if (name_ == "HGCalHEScintillatorSensitive") det = DetId::HGCalHSc;
-      else                                              det = DetId::HGCalEE;
-      std::cout << "Perform test for " << name_ << " Detector " << det
-		<< std::endl;
-      if (name_ == "HGCalHEScintillatorSensitive") {
-	doTestScint(geom, det, bField);
-      } else {
-	doTestWafer(geom, det, bField);
-      }
+      doTestWafer(geom, det, bField);
     }
   }
 }
diff --git a/Geometry/HGCalGeometry/test/HGCalTestRecHitTool.cc b/Geometry/HGCalGeometry/test/HGCalTestRecHitTool.cc
index 1a2537a2a2418..c407f035fc2f0 100644
--- a/Geometry/HGCalGeometry/test/HGCalTestRecHitTool.cc
+++ b/Geometry/HGCalGeometry/test/HGCalTestRecHitTool.cc
@@ -8,7 +8,6 @@
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESTransientHandle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -32,9 +31,7 @@ class HGCalTestRecHitTool : public edm::one::EDAnalyzer<> {
   explicit HGCalTestRecHitTool(const edm::ParameterSet& );
   ~HGCalTestRecHitTool() override;
 
-  void beginJob() override {}
   void analyze(edm::Event const& iEvent, edm::EventSetup const&) override;
-  void endJob() override {}
   
 private:
   std::vector<double> retrieveLayerPositions(unsigned int);
@@ -46,12 +43,14 @@ class HGCalTestRecHitTool : public edm::one::EDAnalyzer<> {
   double      getLayerZ(int type, int layer) const;
   GlobalPoint getPosition(DetId const&) const;
 
+  const edm::ESGetToken<CaloGeometry, CaloGeometryRecord> geomToken_;
   const CaloGeometry *geom_;
   const int           mode_;
   int                 layerEE_, layerFH_, layerBH_;
 };
 
 HGCalTestRecHitTool::HGCalTestRecHitTool(const edm::ParameterSet& iC) : 
+  geomToken_{esConsumes<CaloGeometry, CaloGeometryRecord>(edm::ESInputTag{})},
   geom_(nullptr), mode_(iC.getParameter<int>("Mode")) { }
 
 
@@ -60,10 +59,7 @@ HGCalTestRecHitTool::~HGCalTestRecHitTool() {}
 void HGCalTestRecHitTool::analyze(const edm::Event& , 
 				  const edm::EventSetup& iSetup) {
 
-  edm::ESHandle<CaloGeometry> pG;
-  iSetup.get<CaloGeometryRecord>().get(pG);
-
-  if (pG.isValid()) {
+  if (auto pG = iSetup.getHandle(geomToken_)) {
     geom_ = pG.product();
     auto geomEE = ((mode_ == 0) ?
 		   static_cast<const HGCalGeometry*>(geom_->getSubdetectorGeometry(DetId::Forward,ForwardSubdetector::HGCEE)) :
diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeometryCheck_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeometryCheck_cfg.py
new file mode 100644
index 0000000000000..85a0d589d21b9
--- /dev/null
+++ b/Geometry/HGCalGeometry/test/python/testHGCalGeometryCheck_cfg.py
@@ -0,0 +1,51 @@
+import FWCore.ParameterSet.Config as cms
+
+#from Configuration.Eras.Era_Phase2C4_cff import Phase2C4
+#process = cms.Process('PROD',Phase2C4)
+#process.load('Configuration.Geometry.GeometryExtended2023D28_cff')
+#process.load('Configuration.Geometry.GeometryExtended2023D28Reco_cff')
+
+from Configuration.Eras.Era_Phase2C4_timing_layer_bar_cff import Phase2C4_timing_layer_bar
+process = cms.Process('PROD',Phase2C4_timing_layer_bar)
+process.load('Configuration.Geometry.GeometryExtended2023D41_cff')
+process.load('Configuration.Geometry.GeometryExtended2023D41Reco_cff')
+
+process.load("SimGeneral.HepPDTESSource.pdt_cfi")
+process.load('Geometry.HGCalGeometry.hgcalGeometryCheck_cfi')
+process.load('FWCore.MessageService.MessageLogger_cfi')
+
+if hasattr(process,'MessageLogger'):
+    process.MessageLogger.categories.append('HGCalGeom')
+
+process.load("IOMC.RandomEngine.IOMC_cff")
+process.RandomNumberGeneratorService.generator.initialSeed = 456789
+
+process.source = cms.Source("EmptySource")
+
+process.generator = cms.EDProducer("FlatRandomEGunProducer",
+    PGunParameters = cms.PSet(
+        PartID = cms.vint32(14),
+        MinEta = cms.double(-3.5),
+        MaxEta = cms.double(3.5),
+        MinPhi = cms.double(-3.14159265359),
+        MaxPhi = cms.double(3.14159265359),
+        MinE   = cms.double(9.99),
+        MaxE   = cms.double(10.01)
+    ),
+    AddAntiParticle = cms.bool(False),
+    Verbosity       = cms.untracked.int32(0),
+    firstRun        = cms.untracked.uint32(1)
+)
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(1)
+)
+
+process.TFileService = cms.Service("TFileService",
+                                   fileName = cms.string('hgcGeomStudy.root'),
+                                   closeFileFast = cms.untracked.bool(True)
+                                   )
+
+#process.hgcalGeometryCheck.verbosity = True
+
+process.p1 = cms.Path(process.generator*process.hgcalGeometryCheck)
diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeometry_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeometry_cfg.py
index 5c4740b883df0..6e152c7cbd823 100644
--- a/Geometry/HGCalGeometry/test/python/testHGCalGeometry_cfg.py
+++ b/Geometry/HGCalGeometry/test/python/testHGCalGeometry_cfg.py
@@ -3,15 +3,16 @@
 process = cms.Process("PROD")
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
 
-#process.load("Geometry.CMSCommonData.cmsExtendedGeometry2023D17XML_cfi")
+process.load("Configuration.Geometry.GeometryExtended2023D41Reco_cff")
+#process.load("Geometry.CMSCommonData.cmsExtendedGeometry2023D41XML_cfi")
 #process.load("Geometry.HGCalCommonData.hgcalV6NumberingInitialization_cfi")
 #process.load("Geometry.HGCalCommonData.hgcalV6ParametersInitialization_cfi")
 #process.load("Geometry.CaloEventSetup.HGCalV6Topology_cfi")
-process.load("Geometry.HGCalCommonData.testHGCXML_cfi")
-process.load("Geometry.HGCalCommonData.hgcalParametersInitialization_cfi")
-process.load("Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi")
-process.load("Geometry.CaloEventSetup.HGCalV9Topology_cfi")
-process.load("Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi")
+#process.load("Geometry.HGCalCommonData.testHGCV10XML_cfi")
+#process.load("Geometry.HGCalCommonData.hgcalParametersInitialization_cfi")
+#process.load("Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi")
+#process.load("Geometry.CaloEventSetup.HGCalV9Topology_cfi")
+#process.load("Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi")
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
 if hasattr(process,'MessageLogger'):
@@ -55,3 +56,4 @@
 
 #process.p1 = cms.Path(process.generator*process.prodEE*process.prodHEF)
 process.p1 = cms.Path(process.generator*process.prodEE*process.prodHEF*process.prodHEB)
+#process.p1 = cms.Path(process.generator*process.prodHEB)
diff --git a/Geometry/HGCalGeometry/test/python/testHGCalNeighbor_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalNeighbor_cfg.py
index 2fa941f424155..d1d0d2f4ad929 100644
--- a/Geometry/HGCalGeometry/test/python/testHGCalNeighbor_cfg.py
+++ b/Geometry/HGCalGeometry/test/python/testHGCalNeighbor_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("PROD",eras.Phase2C4)
+from Configuration.Eras.Era_Phase2C4_cff import Phase2C4
+process = cms.Process("PROD",Phase2C4)
 
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
 process.load("Configuration.Geometry.GeometryExtended2023D28Reco_cff")
diff --git a/Geometry/HcalAlgo/plugins/DDHCalAngular.cc b/Geometry/HcalAlgo/plugins/DDHCalAngular.cc
index 7ce1cb9ebc7e6..e3142586c141c 100644
--- a/Geometry/HcalAlgo/plugins/DDHCalAngular.cc
+++ b/Geometry/HcalAlgo/plugins/DDHCalAngular.cc
@@ -12,7 +12,6 @@
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"
 #include "DetectorDescription/Core/interface/DDTypes.h"
 #include "Geometry/HcalAlgo/plugins/DDHCalAngular.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
 
 //#define EDM_ML_DEBUG                                                         
 using namespace geant_units::operators;
diff --git a/Geometry/HcalAlgo/plugins/DDHCalBarrelAlgo.cc b/Geometry/HcalAlgo/plugins/DDHCalBarrelAlgo.cc
index 45c86ec83581b..0cbb8ed159792 100644
--- a/Geometry/HcalAlgo/plugins/DDHCalBarrelAlgo.cc
+++ b/Geometry/HcalAlgo/plugins/DDHCalBarrelAlgo.cc
@@ -18,7 +18,6 @@
 #include "Geometry/HcalAlgo/plugins/DDHCalBarrelAlgo.h"
 
 //#define EDM_ML_DEBUG                                                         
-using namespace geant_units;
 using namespace geant_units::operators;
 
 DDHCalBarrelAlgo::DDHCalBarrelAlgo():
@@ -224,7 +223,7 @@ void DDHCalBarrelAlgo::constructGeneralVolume(DDCompactView& cpv) {
 
   DDRotation rot = DDRotation();
 
-  double alpha = piRadians/getNsectors();
+  double alpha = (1._pi)/getNsectors();
   double dphi  = getNsectortot()*(2._pi)/getNsectors();
   int nsec, ntot=15;
   if (getNhalf() == 1)
@@ -425,7 +424,7 @@ void DDHCalBarrelAlgo::constructInsideSector(const DDLogicalPart& sector, DDComp
   edm::LogVerbatim("HCalGeom") << "DDHCalBarrelAlgo: Layers (" << getNLayers()
 			       << ") ...";
 #endif
-  double alpha = piRadians/getNsectors();
+  double alpha = (1._pi)/getNsectors();
   double rin   = getRin();
   for (int i = 0; i < getNLayers(); i++) {
     std::string  name   = idName + getLayerLabel(i);
diff --git a/Geometry/HcalAlgo/plugins/DDHCalEndcapAlgo.cc b/Geometry/HcalAlgo/plugins/DDHCalEndcapAlgo.cc
index e3b7d7419f33f..5d0e9a67686b9 100644
--- a/Geometry/HcalAlgo/plugins/DDHCalEndcapAlgo.cc
+++ b/Geometry/HcalAlgo/plugins/DDHCalEndcapAlgo.cc
@@ -7,8 +7,8 @@
 #include <cmath>
 #include <algorithm>
 
-namespace std{} using namespace std;
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "DataFormats/Math/interface/GeantUnits.h"
 #include "DetectorDescription/Core/interface/DDutils.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
@@ -16,8 +16,9 @@ namespace std{} using namespace std;
 #include "DetectorDescription/Core/interface/DDCurrentNamespace.h"
 #include "DetectorDescription/Core/interface/DDSplit.h"
 #include "Geometry/HcalAlgo/plugins/DDHCalEndcapAlgo.h"
-#include "CLHEP/Units/GlobalPhysicalConstants.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+
+//#define EDM_ML_DEBUG
+using namespace geant_units::operators;
 
 DDHCalEndcapAlgo::DDHCalEndcapAlgo():
   modMat(0),modType(0),sectionModule(0),layerN(0),layerN0(0),layerN1(0),
@@ -26,7 +27,7 @@ DDHCalEndcapAlgo::DDHCalEndcapAlgo():
   rinBlock2(0),routBlock2(0),layerType(0),layerT(0),scintT(0) {
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo info: Creating an instance";
+  edm::LogVerbatim("HCalGeom") << "DDHCalEndcapAlgo: Creating an instance";
 #endif
 }
 
@@ -108,21 +109,17 @@ void DDHCalEndcapAlgo::initialize(const DDNumericArguments & nArgs,
   angGap        = nArgs["AngGap"];
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo debug: General material " 
-			   << genMaterial << "\tSectors "  << nsectors << ",  " 
-			   << nsectortot << "\tEndcaps " << nEndcap  
-			   << "\tRotation matrix for half " << rotns 
-			   << ":" << rotHalf << "\n\tzFront " << zFront 
-			   << " zEnd " << zEnd << " ziNose " << ziNose 
-			   << " ziL0Nose " << ziL0Nose << " ziBody " << ziBody
-			   << " ziL0Body " << ziL0Body << " z0Beam " << z0Beam 
-			   << " ziDip " << ziDip << " dzStep " << dzStep 
-			   << " Gap " << gap << " z1 " << z1 << "\n\tr1 " << r1
-			   << " rout " << rout << " HeboxDepth " << heboxDepth 
-			   << " drEnd " << drEnd << "\tetamin " << etamin 
-			   << " Bottom angle " << angBot << " Gap angle " 
-			   << angGap << " Z-Shift " << zShift << " " 
-			   << zShiftHac2;
+  edm::LogVerbatim("HCalGeom")
+    << "DDHCalEndcapAlgo: General material " << genMaterial << "\tSectors "  
+    << nsectors << ",  " << nsectortot << "\tEndcaps " << nEndcap  
+    << "\tRotation matrix for half " << rotns << ":" << rotHalf << "\n\tzFront "
+    << zFront << " zEnd " << zEnd << " ziNose " << ziNose << " ziL0Nose " 
+    << ziL0Nose << " ziBody " << ziBody << " ziL0Body " << ziL0Body << " z0Beam "
+    << z0Beam << " ziDip " << ziDip << " dzStep " << dzStep << " Gap " << gap 
+    << " z1 " << z1 << "\n\tr1 " << r1 << " rout " << rout << " HeboxDepth " 
+    << heboxDepth << " drEnd " << drEnd << "\tetamin " << etamin 
+    << " Bottom angle " << angBot << " Gap angle " << angGap << " Z-Shift "
+    << zShift << " " << zShiftHac2;
 #endif
   
   //Derived quantities
@@ -136,12 +133,11 @@ void DDHCalEndcapAlgo::initialize(const DDNumericArguments & nArgs,
   dzShift  = (z1Beam - z0Beam) - gap/sin(angGap);
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo debug: angTop " 
-			   << angTop/CLHEP::deg  <<"\tSlope " << slope 
-			   << "\tDzShift " << dzShift << "\n\tz1Beam " << z1Beam
-			   << "\tziKink" << ziKink << "\triKink " << riKink 
-			   << "\triDip " << riDip << "\n\troDip " << roDip 
-			   << "\tRotation " << rotation;
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapAlgo: angTop " << convertRadToDeg(angTop)  <<"\tSlope " 
+    << slope << "\tDzShift " << dzShift << "\n\tz1Beam " << z1Beam
+    << "\tziKink" << ziKink << "\triKink " << riKink << "\triDip " << riDip 
+    << "\n\troDip " << roDip << "\tRotation " << rotation;
 #endif
   
   ///////////////////////////////////////////////////////////////
@@ -150,8 +146,9 @@ void DDHCalEndcapAlgo::initialize(const DDNumericArguments & nArgs,
   modules       = int(nArgs["Modules"]);
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo debug: Number of modules " 
-			   << modules << " and absorber material " << absMat;
+  edm::LogVerbatim("HCalGeom")
+    << "DDHCalEndcapAlgo: Number of modules " << modules 
+    << " and absorber material " << absMat;
 #endif
   
   modName       = vsArgs["ModuleName"];
@@ -172,35 +169,36 @@ void DDHCalEndcapAlgo::initialize(const DDNumericArguments & nArgs,
 
 #ifdef EDM_ML_DEBUG
   for (int i = 0; i < modules; i++) {
-    edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo debug: " << modName[i] 
-			     << " type " << modType[i] << " Sections " 
-			     << sectionModule[i] <<" thickness of absorber/air "
-			     << thick[i] << " trim " << trimLeft[i] << ", " 
-			     << trimRight[i] << " equip module " << eModule[i]
-			     << " with " << layerN[i] << " layers";
+    edm::LogVerbatim("HCalGeom") 
+      << "DDHCalEndcapAlgo: " << modName[i] << " type " << modType[i]
+      << " Sections "  << sectionModule[i] <<" thickness of absorber/air "
+      << thick[i] << " trim " << trimLeft[i] << ", " << trimRight[i] 
+      << " equip module " << eModule[i] << " with " << layerN[i] << " layers";
     if (i == 0) {
       for (int j = 0; j < layerN[i]; j++) {
-	edm::LogInfo("HCalGeom") << "\t " << layerN0[j] << "/" << layerN0[j+1];
+	edm::LogVerbatim("HCalGeom") 
+	  << "\t " << layerN0[j] << "/" << layerN0[j+1];
       }
     } else if (i == 1) {
       for (int j = 0; j < layerN[i]; j++) {
-	edm::LogInfo("HCalGeom") << "\t " << layerN1[j] << "/" << layerN1[j+1];
+	edm::LogVerbatim("HCalGeom") 
+	  << "\t " << layerN1[j] << "/" << layerN1[j+1];
       }
     } else if (i == 2) {
       for (int j = 0; j < layerN[i]; j++) {
-	edm::LogInfo("HCalGeom") << "\t " << layerN2[j];
+	edm::LogVerbatim("HCalGeom") << "\t " << layerN2[j];
       }
     } else if (i == 3) {
       for (int j = 0; j < layerN[i]; j++) {
-	edm::LogInfo("HCalGeom") << "\t " << layerN3[j];
+	edm::LogVerbatim("HCalGeom") << "\t " << layerN3[j];
       }
     } else if (i == 4) {
       for (int j = 0; j < layerN[i]; j++) {
-	edm::LogInfo("HCalGeom") << "\t " << layerN4[j];
+	edm::LogVerbatim("HCalGeom") << "\t " << layerN4[j];
       }
     } else if (i == 5) {
       for (int j = 0; j < layerN[i]; j++) {
-	edm::LogInfo("HCalGeom") << "\t " << layerN5[j];
+	edm::LogVerbatim("HCalGeom") << "\t " << layerN5[j];
       }
     }
   }
@@ -220,17 +218,18 @@ void DDHCalEndcapAlgo::initialize(const DDNumericArguments & nArgs,
   rotmat      = sArgs["RotMat"];
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo debug: Phi Sections " 
-			   << phiSections;
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapAlgo: Phi Sections " << phiSections;
   for (int i = 0; i < phiSections; i++) 
-    edm::LogInfo("HCalGeom") << "\tName[" << i << "] : " << phiName[i];
-  edm::LogInfo("HCalGeom") << "\tPlastic: " << plastMat << "\tScintillator: "
-			   << scintMat << "\tRotation matrix " << rotns << ":" 
-			   << rotmat << "\n\tNumber of layers " << layers;
+    edm::LogVerbatim("HCalGeom") << "\tName[" << i << "] : " << phiName[i];
+  edm::LogVerbatim("HCalGeom") 
+    << "\tPlastic: " << plastMat << "\tScintillator: " << scintMat 
+    << "\tRotation matrix " << rotns << ":"  << rotmat << "\n\tNumber of layers "
+    << layers;
   for (int i = 0; i < layers; i++) {
-    edm::LogInfo("HCalGeom") << "\t" << layerName[i] << "\tType " 
-			     << layerType[i] << "\tThickness " << layerT[i] 
-			     << "\tScint.Thick " << scintT[i];
+    edm::LogVerbatim("HCalGeom") 
+      << "\t" << layerName[i] << "\tType " << layerType[i] << "\tThickness " 
+      << layerT[i] << "\tScint.Thick " << scintT[i];
   }
 #endif
   
@@ -305,11 +304,10 @@ void DDHCalEndcapAlgo::initialize(const DDNumericArguments & nArgs,
 
 #ifdef EDM_ML_DEBUG
   for (int i = 0; i < module; i++)
-    edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo debug: Module " << i 
-			     << "\tZ/Rin/Rout " << zminBlock[i] << ", " 
-			     << zmaxBlock[i] << "/ " << rinBlock1[i] << ", " 
-			     << rinBlock2[i] << "/ " << routBlock1[i] << ", " 
-			     << routBlock2[i];
+    edm::LogVerbatim("HCalGeom") 
+      << "DDHCalEndcapAlgo: Module " << i << "\tZ/Rin/Rout " << zminBlock[i] 
+      << ", " << zmaxBlock[i] << "/ " << rinBlock1[i] << ", " << rinBlock2[i] 
+      << "/ " << routBlock1[i] << ", " << routBlock2[i];
 #endif
 
   idName      = sArgs["MotherName"];
@@ -317,18 +315,18 @@ void DDHCalEndcapAlgo::initialize(const DDNumericArguments & nArgs,
   idOffset = int (nArgs["IdOffset"]); 
 
 #ifdef EDM_ML_DEBUG
-  DDName parentName = parent().name(); 
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo debug: Parent " << parentName 
-			   << " idName " << idName << " NameSpace " 
-			   << idNameSpace << " Offset " << idOffset;
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapAlgo: Parent " << parent().name() << " idName " << idName 
+    << " NameSpace " << idNameSpace << " Offset " << idOffset;
 #endif
 
   tolPos      = nArgs["TolPos"];
   tolAbs      = nArgs["TolAbs"];
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") <<"DDHCalEndcapAlgo debug: Tolerances - Positioning "
-			   << tolPos << " Absorber " << tolAbs;
+  edm::LogVerbatim("HCalGeom") 
+    <<"DDHCalEndcapAlgo: Tolerances - Positioning " << tolPos << " Absorber " 
+    << tolAbs;
 #endif
 }
 
@@ -339,13 +337,13 @@ void DDHCalEndcapAlgo::initialize(const DDNumericArguments & nArgs,
 void DDHCalEndcapAlgo::execute(DDCompactView& cpv) {
   
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "==>> Constructing DDHCalEndcapAlgo...";
+  edm::LogVerbatim("HCalGeom") << "==>> Constructing DDHCalEndcapAlgo...";
 #endif
 
   constructGeneralVolume(cpv);
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "<<== End of DDHCalEndcapAlgo construction ...";
+  edm::LogVerbatim("HCalGeom") << "<<== End of DDHCalEndcapAlgo construction ...";
 #endif
 }
 
@@ -354,7 +352,7 @@ void DDHCalEndcapAlgo::execute(DDCompactView& cpv) {
 void DDHCalEndcapAlgo::constructGeneralVolume(DDCompactView& cpv) {
   
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: General volume...";
+  edm::LogVerbatim("HCalGeom") << "DDHCalEndcapAlgo: General volume...";
 #endif
 
   bool proto = true;
@@ -366,20 +364,20 @@ void DDHCalEndcapAlgo::constructGeneralVolume(DDCompactView& cpv) {
   else rot = DDRotation(DDName(DDSplit(getRotation()).first,DDSplit(getRotation()).second));
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << " First " << DDSplit(getRotation()).first
-			   << " Second " << DDSplit(getRotation()).second 
-			   << " Rotation " << rot;
+  edm::LogVerbatim("HCalGeom") 
+    << " First " << DDSplit(getRotation()).first << " Second " 
+    << DDSplit(getRotation()).second << " Rotation " << rot;
 #endif
   
   DDTranslation r0(0,0,getZShift());
-  double alpha = CLHEP::pi/getNsectors();
-  double dphi  = getNsectortot()*CLHEP::twopi/getNsectors();
+  double alpha = (1._pi)/getNsectors();
+  double dphi  = getNsectortot()*(2._pi)/getNsectors();
 
   //!!!!!!!!!!!!!!!!!Should be zero. And removed as soon as
   //vertical walls are allowed in SolidPolyhedra
   double delz = 0;
 
-  vector<double> pgonZ, pgonRmin, pgonRmax;
+  std::vector<double> pgonZ, pgonRmin, pgonRmax;
   if (proto) {
     double zf = getZiBody() + getZShiftHac2();
     pgonZ.emplace_back(zf - getDzShift()); 
@@ -412,22 +410,21 @@ void DDHCalEndcapAlgo::constructGeneralVolume(DDCompactView& cpv) {
   pgonRmin.emplace_back(getZEnd() * tan(getAngBot())); 
   pgonRmax.emplace_back(getRoutDip()); 
 
-  string name("Null");
+  std::string name("Null");
   DDSolid solid;
   solid = DDSolidFactory::polyhedra(DDName(idName, idNameSpace),
 				    getNsectortot(), -alpha, dphi, pgonZ, 
 				    pgonRmin, pgonRmax);
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: " 
-			   << DDName(idName, idNameSpace) 
-			   << " Polyhedra made of " << getGenMat() << " with " 
-			   << getNsectortot() << " sectors from " 
-			   << -alpha/CLHEP::deg << " to " 
-			   << (-alpha+dphi)/CLHEP::deg << " and with " 
-			   << pgonZ.size() << " sections";
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapAlgo: " << DDName(idName, idNameSpace) 
+    << " Polyhedra made of " << getGenMat() << " with " << getNsectortot() 
+    << " sectors from " << convertRadToDeg(-alpha) << " to " 
+    << convertRadToDeg(-alpha+dphi) << " and with " << pgonZ.size() <<" sections";
   for (unsigned int i = 0; i <pgonZ.size(); i++) 
-    edm::LogInfo("HCalGeom") << "\t\tZ = " << pgonZ[i] << "\tRmin = " 
-			     << pgonRmin[i] << "\tRmax = " << pgonRmax[i];
+    edm::LogVerbatim("HCalGeom") 
+      << "\t\tZ = " << pgonZ[i] << "\tRmin = " << pgonRmin[i] << "\tRmax = " 
+      << pgonRmax[i];
 #endif
 
   DDName matname(DDSplit(getGenMat()).first, DDSplit(getGenMat()).second); 
@@ -438,10 +435,9 @@ void DDHCalEndcapAlgo::constructGeneralVolume(DDCompactView& cpv) {
   cpv.position(DDName(idName, idNameSpace), parentName, 1, r0, rot);
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: " 
-			   << DDName(idName, idNameSpace)
-			   << " number 1 positioned in " << parentName 
-			   << " at " << r0 << " with " << rot;
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapAlgo: " << DDName(idName, idNameSpace)
+    << " number 1 positioned in " << parentName << " at " << r0 << " with " <<rot;
 #endif
   
   if (getEndcaps() != 1) {
@@ -449,17 +445,16 @@ void DDHCalEndcapAlgo::constructGeneralVolume(DDCompactView& cpv) {
     cpv.position(DDName(idName, idNameSpace), parentName, 2, r0, rot);
 
 #ifdef EDM_ML_DEBUG
-    edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: " 
-			     << DDName(idName, idNameSpace) << " number 2 "
-			     << "positioned in " << parentName  << " at " << r0
-			     << " with " << rot;
+    edm::LogVerbatim("HCalGeom") 
+      << "DDHCalEndcapAlgo: " << DDName(idName, idNameSpace) << " number 2 "
+      << "positioned in " << parentName  << " at " << r0 << " with " << rot;
 #endif
 
   }
 
   //Forward half
   name  = idName + "Front";
-  vector<double> pgonZMod, pgonRminMod, pgonRmaxMod;
+  std::vector<double> pgonZMod, pgonRminMod, pgonRmaxMod;
   for (unsigned int i=0; i < (pgonZ.size()-1); i++) {
     pgonZMod.emplace_back(pgonZ[i] + getDzShift()); 
     pgonRminMod.emplace_back(pgonRmin[i]); 
@@ -470,15 +465,15 @@ void DDHCalEndcapAlgo::constructGeneralVolume(DDCompactView& cpv) {
 				    pgonRminMod, pgonRmaxMod);
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: "
-			   << DDName(name,idNameSpace) << " Polyhedra made of "
-			   << getGenMat() << " with " << getNsectortot() 
-			   << " sectors from " << -alpha/CLHEP::deg << " to " 
-			   << (-alpha+dphi)/CLHEP::deg << " and with "
-			   << pgonZMod.size() << " sections ";
+  edm::LogVerbatim("HCalGeom")
+    << "DDHCalEndcapAlgo: " << DDName(name,idNameSpace) << " Polyhedra made of "
+    << getGenMat() << " with " << getNsectortot() << " sectors from " 
+    << convertRadToDeg(-alpha) << " to " << convertRadToDeg(-alpha+dphi)
+    << " and with " << pgonZMod.size() << " sections ";
   for (unsigned int i = 0; i < pgonZMod.size(); i++) 
-    edm::LogInfo("HCalGeom") << "\t\tZ = " << pgonZMod[i] << "\tRmin = " 
-			     << pgonRminMod[i] << "\tRmax = " << pgonRmaxMod[i];
+    edm::LogVerbatim("HCalGeom") 
+      << "\t\tZ = " << pgonZMod[i] << "\tRmin = " << pgonRminMod[i] << "\tRmax = "
+      << pgonRmaxMod[i];
 #endif
   
   DDLogicalPart genlogich(DDName(name, idNameSpace), matter, solid);
@@ -487,10 +482,9 @@ void DDHCalEndcapAlgo::constructGeneralVolume(DDCompactView& cpv) {
 	DDRotation());
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: " << genlogich.name() 
-			   << " number 1 positioned in " << genlogic.name() 
-			   << " at (0,0," << -getDzShift()
-			   << ") with no rotation";
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapAlgo: " << genlogich.name() << " number 1 positioned in " 
+    << genlogic.name() << " at (0,0," << -getDzShift()<< ") with no rotation";
 #endif
   
   //Construct sector (from -alpha to +alpha)
@@ -499,51 +493,43 @@ void DDHCalEndcapAlgo::constructGeneralVolume(DDCompactView& cpv) {
 				      1, -alpha, 2*alpha, pgonZMod,
 				      pgonRminMod, pgonRmaxMod);
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: "
-			   << DDName(name,idNameSpace)<< " Polyhedra made of "
-			   << getGenMat() <<" with 1 sector from " 
-			   << -alpha/CLHEP::deg << " to " << alpha/CLHEP::deg
-			   << " and with " << pgonZMod.size() << " sections";
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapAlgo: " << DDName(name,idNameSpace)<< " Polyhedra made of "
+    << getGenMat() <<" with 1 sector from " << convertRadToDeg(-alpha) << " to " 
+    << convertRadToDeg(alpha) << " and with " << pgonZMod.size() << " sections";
   for (unsigned int i = 0; i < pgonZMod.size(); i++) 
-    edm::LogInfo("HCalGeom") << "\t\tZ = " << pgonZMod[i] << "\tRmin = " 
-			     << pgonRminMod[i] << "\tRmax = " << pgonRmaxMod[i];
+    edm::LogVerbatim("HCalGeom")
+      << "\t\tZ = " << pgonZMod[i] << "\tRmin = " << pgonRminMod[i] << "\tRmax = "
+      << pgonRmaxMod[i];
 #endif
   
   DDLogicalPart seclogic(DDName(name, idNameSpace), matter, solid);
   
   for (int ii=0; ii<getNsectortot(); ii++) {
     double phi    = ii*2*alpha;
-    double phideg = phi/CLHEP::deg;
-    
     DDRotation rotation;
-    string rotstr("NULL");
-    if (phideg != 0) {
-      rotstr = "R"; 
-      if (phideg < 100)	rotstr = "R0"; 
-      rotstr = rotstr + std::to_string(phideg);
+    std::string rotstr("NULL");
+    if (phi != 0) {
+      rotstr = "R" + formatAsDegreesInInteger(phi);
       rotation = DDRotation(DDName(rotstr, rotns)); 
       if (!rotation) {
-
 #ifdef EDM_ML_DEBUG
-	edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: Creating a new "
-				 << "rotation " << rotstr << "\t" << 90 << "," 
-				 << phideg << ","  << 90 << "," << (phideg+90)
-				 << ", 0, 0";
+	edm::LogVerbatim("HCalGeom")
+	  << "DDHCalEndcapAlgo: Creating a new rotation " << rotstr 
+	  << "\t 90," << convertRadToDeg(phi) << ", 90," 
+	  << convertRadToDeg(phi+90._deg) << ", 0, 0";
 #endif
-	
-	rotation = DDrot(DDName(rotstr, rotns), 90*CLHEP::deg, 
-			 phideg*CLHEP::deg, 90*CLHEP::deg, 
-			 (90+phideg)*CLHEP::deg, 0*CLHEP::deg,  0*CLHEP::deg);
+	rotation = DDrot(DDName(rotstr, rotns), 90._deg, phi, 90._deg,
+			 (90._deg+phi), 0,  0);
       } //if !rotation
-    } //if phideg!=0
+    } //if phi!=0
   
    cpv.position(seclogic, genlogich, ii+1, DDTranslation(0.0, 0.0, 0.0), rotation);
 
 #ifdef EDM_ML_DEBUG
-    edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: " << seclogic.name() 
-			     << " number " << ii+1 << " positioned in " 
-			     << genlogich.name() << " at (0,0,0) with " 
-			     << rotation;
+    edm::LogVerbatim("HCalGeom") 
+      << "DDHCalEndcapAlgo: " << seclogic.name() << " number " << ii+1 
+      << " positioned in " << genlogich.name() << " at (0,0,0) with " << rotation;
 #endif
     
   }
@@ -553,7 +539,7 @@ void DDHCalEndcapAlgo::constructGeneralVolume(DDCompactView& cpv) {
 
   //Backward half
   name  = idName + "Back";
-  vector<double> pgonZBack, pgonRminBack, pgonRmaxBack;
+  std::vector<double> pgonZBack, pgonRminBack, pgonRmaxBack;
   pgonZBack.emplace_back(getZEnd() - getDzShift()); 
   pgonRminBack.emplace_back(pgonZBack[0]*tan(getAngBot()) + getDrEnd()); 
   pgonRmaxBack.emplace_back(getRoutDip()); 
@@ -565,16 +551,15 @@ void DDHCalEndcapAlgo::constructGeneralVolume(DDCompactView& cpv) {
 				    pgonRminBack, pgonRmaxBack);
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: "
-			   << DDName(name,idNameSpace) << " Polyhedra made of " 
-			   << getAbsMat() << " with " << getNsectortot() 
-			   << " sectors from " << -alpha/CLHEP::deg << " to " 
-			   << (-alpha+dphi)/CLHEP::deg << " and with " 
-			   << pgonZBack.size()	<< " sections";
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapAlgo: " << DDName(name,idNameSpace) << " Polyhedra made of " 
+    << getAbsMat() << " with " << getNsectortot() << " sectors from " 
+    << convertRadToDeg(-alpha) << " to " << convertRadToDeg(-alpha+dphi)
+    << " and with "  << pgonZBack.size() << " sections";
   for (unsigned int i = 0; i < pgonZBack.size(); i++) 
-    edm::LogInfo("HCalGeom") << "\t\tZ = " << pgonZBack[i] << "\tRmin = " 
-			     << pgonRminBack[i] << "\tRmax = " 
-			     << pgonRmaxBack[i];
+    edm::LogVerbatim("HCalGeom") 
+      << "\t\tZ = " << pgonZBack[i] << "\tRmin = " << pgonRminBack[i] 
+      << "\tRmax = " << pgonRmaxBack[i];
 #endif
   
   DDName absMatname(DDSplit(getAbsMat()).first, DDSplit(getAbsMat()).second); 
@@ -584,9 +569,9 @@ void DDHCalEndcapAlgo::constructGeneralVolume(DDCompactView& cpv) {
   cpv.position(glog, genlogic, 1, DDTranslation(0.0, 0.0, 0.0), DDRotation());
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: " << glog.name() 
-			   << " number 1 positioned in "  << genlogic.name() 
-			   << " at (0,0,0) with no rotation";
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapAlgo: " << glog.name() << " number 1 positioned in "
+    << genlogic.name() << " at (0,0,0) with no rotation";
 #endif
 }
 
@@ -594,14 +579,14 @@ void DDHCalEndcapAlgo::constructGeneralVolume(DDCompactView& cpv) {
 void DDHCalEndcapAlgo::constructInsideSector(const DDLogicalPart& sector, DDCompactView& cpv) {
   
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: Modules (" << getModules()
-			   << ") ...";
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapAlgo: Modules (" << getModules() << ") ...";
 #endif
 
-  double alpha = CLHEP::pi/getNsectors();
+  double alpha = (1._pi)/getNsectors();
 
   for (int i = 0; i < getModules(); i++) {
-    string  name   = idName + getModName(i);
+    std::string  name   = idName + getModName(i);
     DDName matname(DDSplit(getModMat(i)).first, DDSplit(getModMat(i)).second); 
     DDMaterial matter(matname);
     
@@ -612,7 +597,7 @@ void DDHCalEndcapAlgo::constructInsideSector(const DDLogicalPart& sector, DDComp
       //vertical walls are allowed in SolidPolyhedra
       double deltaz = 0;
     
-      vector<double> pgonZ, pgonRmin, pgonRmax;
+      std::vector<double> pgonZ, pgonRmin, pgonRmax;
       if (nsec == 3) {
 	double zf = getZminBlock(i) + getZShiftHac2();
 	pgonZ.emplace_back(zf);
@@ -645,15 +630,15 @@ void DDHCalEndcapAlgo::constructInsideSector(const DDLogicalPart& sector, DDComp
 					pgonZ, pgonRmin, pgonRmax);
 
 #ifdef EDM_ML_DEBUG
-      edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: " 
-			       << DDName(name,idNameSpace) 
-			       << " Polyhedra made of " << getModMat(i) 
-			       << " with 1 sector from " << -alpha/CLHEP::deg 
-			       << " to " << alpha/CLHEP::deg << " and with "
-			       << nsec << " sections";
+      edm::LogVerbatim("HCalGeom") 
+	<< "DDHCalEndcapAlgo: " << DDName(name,idNameSpace) 
+	<< " Polyhedra made of " << getModMat(i) << " with 1 sector from " 
+	<< convertRadToDeg(-alpha) << " to " << convertRadToDeg(alpha)
+	<< " and with " << nsec << " sections";
       for (unsigned int k=0; k<pgonZ.size(); k++)
-	edm::LogInfo("HCalGeom") << "\t\tZ = " << pgonZ[k] << "\tRmin = "
-				 << pgonRmin[k] << "\tRmax = " << pgonRmax[k];
+	edm::LogVerbatim("HCalGeom")
+	  << "\t\tZ = " << pgonZ[k] << "\tRmin = " << pgonRmin[k] << "\tRmax = "
+	  << pgonRmax[k];
 #endif
       
       DDLogicalPart glog(DDName(name, idNameSpace), matter, solid);
@@ -661,9 +646,9 @@ void DDHCalEndcapAlgo::constructInsideSector(const DDLogicalPart& sector, DDComp
       cpv.position(glog, sector, i+1, DDTranslation(0.0, 0.0, 0.0), DDRotation());
 
 #ifdef EDM_ML_DEBUG
-      edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: " << glog.name() 
-			       << " number " << i+1 << " positioned in " 
-			       <<sector.name() <<" at (0,0,0) with no rotation";
+      edm::LogVerbatim("HCalGeom") 
+	<< "DDHCalEndcapAlgo: " << glog.name() << " number " << i+1 
+	<< " positioned in " << sector.name() <<" at (0,0,0) with no rotation";
 #endif
       
       if (getModType(i) == 0) 
@@ -681,11 +666,12 @@ void DDHCalEndcapAlgo::parameterLayer0(int mod, int layer, int iphi,
 
   //Given module and layer number compute parameters of trapezoid
   //and positioning parameters
-  double alpha = CLHEP::pi/getNsectors();
+  double alpha = (1._pi)/getNsectors();
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "Input " << iphi << " " << layer << " " << iphi
-			   << " Alpha " << alpha/CLHEP::deg;
+  edm::LogVerbatim("HCalGeom") 
+    << "Input " << iphi << " " << layer << " " << iphi << " Alpha " 
+    << convertRadToDeg(alpha);
 #endif
   
   double zi, zo;
@@ -721,9 +707,9 @@ void DDHCalEndcapAlgo::parameterLayer0(int mod, int layer, int iphi,
   }
   
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "Output Dimensions " << yh << " " << bl << " "
-			   << tl << " " << alp/CLHEP::deg << " Position " 
-			   << xpos << " " << ypos << " " << zpos;
+  edm::LogVerbatim("HCalGeom") 
+    << "Output Dimensions " << yh << " " << bl << " " << tl << " " 
+    << convertRadToDeg(alp) << " Position " << xpos << " " << ypos << " " << zpos;
 #endif
 }
 
@@ -737,13 +723,13 @@ void DDHCalEndcapAlgo::parameterLayer(int iphi, double rinF, double routF,
 
   //Given rin, rout compute parameters of the trapezoid and 
   //position of the trapezoid for a standrd layer
-  double alpha = CLHEP::pi/getNsectors();
+  double alpha = (1._pi)/getNsectors();
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "Input " << iphi << " Front " << rinF << " " 
-			   << routF << " " << zi << " Back " << rinB << " " 
-			   << routB << " " << zo << " Alpha " 
-			   << alpha/CLHEP::deg;
+  edm::LogVerbatim("HCalGeom") 
+    << "Input " << iphi << " Front " << rinF << " " << routF << " " << zi 
+    << " Back " << rinB << " " << routB << " " << zo << " Alpha " 
+    << convertRadToDeg(alpha);
 #endif
   
   yh1 = 0.5 * (routF - rinB);
@@ -770,11 +756,11 @@ void DDHCalEndcapAlgo::parameterLayer(int iphi, double rinF, double routF,
   phi  = atan2 (dy, dx);
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "Output Dimensions " << yh1 << " " << bl1 << " "
-			   << tl1 << " " << yh2 << " " << bl2 << " " << tl2
-			   << " " << alp/CLHEP::deg << " " << theta/CLHEP::deg
-			   << " " << phi/CLHEP::deg << " Position " << xpos 
-			   << " " << ypos << " " << zpos;
+  edm::LogVerbatim("HCalGeom") 
+    << "Output Dimensions " << yh1 << " " << bl1 << " " << tl1 << " " << yh2 
+    << " " << bl2 << " " << tl2 << " " << convertRadToDeg(alp) << " " 
+    << convertRadToDeg(theta) << " " << convertRadToDeg(phi) << " Position "
+    << xpos << " " << ypos << " " << zpos;
 #endif
 }
 
@@ -782,13 +768,13 @@ void DDHCalEndcapAlgo::parameterLayer(int iphi, double rinF, double routF,
 void DDHCalEndcapAlgo::constructInsideModule0(const DDLogicalPart& module, int mod, DDCompactView& cpv) {
   
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: \t\tInside module0 ..."
-			   << mod;
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapAlgo: \t\tInside module0 ..." << mod;
 #endif
   
   ///////////////////////////////////////////////////////////////
   //Pointers to the Rotation Matrices and to the Materials
-  string rotstr = getRotMat();
+  std::string rotstr = getRotMat();
   DDRotation rot(DDName(rotstr, rotns));
   DDName matName(DDSplit(getAbsMat()).first, DDSplit(getAbsMat()).second);
   DDMaterial matabsorbr(matName);
@@ -797,7 +783,7 @@ void DDHCalEndcapAlgo::constructInsideModule0(const DDLogicalPart& module, int m
 
   int     layer  = getLayer(mod,0);
   int     layer0 = getLayer(mod,1);
-  string  name;
+  std::string  name;
   double  xpos, ypos, zpos;
   DDSolid solid;
   DDLogicalPart glog, plog;
@@ -810,12 +796,11 @@ void DDHCalEndcapAlgo::constructInsideModule0(const DDLogicalPart& module, int m
 				 bl, tl, alp, yh, bl, tl, alp);
 
 #ifdef EDM_ML_DEBUG
-    edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: " << solid.name() 
-			     << " Trap made of " << getPlastMat() 
-			     << " of dimensions " << 0.5*getLayerT(layer) 
-			     << ", 0, 0, " << yh << ", " << bl << ", " << tl 
-			     << ", " << alp/CLHEP::deg << ", " << yh << ", " 
-			     << bl << ", " << tl << ", " << alp/CLHEP::deg;
+    edm::LogVerbatim("HCalGeom") 
+      << "DDHCalEndcapAlgo: " << solid.name() << " Trap made of " << getPlastMat()
+      << " of dimensions " << 0.5*getLayerT(layer) << ", 0, 0, " << yh << ", "
+      << bl << ", " << tl << ", " << convertRadToDeg(alp) << ", " << yh << ", " 
+      << bl << ", " << tl << ", " << convertRadToDeg(alp);
 #endif
 
     glog = DDLogicalPart(solid.ddname(), matplastic, solid);
@@ -824,10 +809,9 @@ void DDHCalEndcapAlgo::constructInsideModule0(const DDLogicalPart& module, int m
     cpv.position(glog, module, idOffset+layer+1, r1, rot);
 
 #ifdef EDM_ML_DEBUG
-    edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: " << glog.name() 
-			     << " number " << idOffset+layer+1 
-			     << " positioned in " << module.name() << " at "
-			     << r1 << " with " << rot;
+    edm::LogVerbatim("HCalGeom") 
+      << "DDHCalEndcapAlgo: " << glog.name() << " number " << idOffset+layer+1 
+      << " positioned in " << module.name() << " at " << r1 << " with " << rot;
 #endif
 
     //Now construct the layer of scintillator inside this
@@ -853,9 +837,9 @@ void DDHCalEndcapAlgo::constructInsideModule0(const DDLogicalPart& module, int m
   }
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: Module " << mod 
-			   << " Front " << zi << ", " << rinF << ", " << routF
-			   << " Back " << zo << ", " << rinB << ", " << routB;
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapAlgo: Module " << mod << " Front " << zi << ", " << rinF
+    << ", " << routF << " Back " << zo << ", " << rinB << ", " << routB;
 #endif
   
   double yh1, bl1, tl1, yh2, bl2, tl2, theta, phi, alp;
@@ -864,9 +848,9 @@ void DDHCalEndcapAlgo::constructInsideModule0(const DDLogicalPart& module, int m
   double fact = getTolAbs();
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: Trim " << fact 
-			   << " Param " << yh1 << ", " << bl1 << ", " << tl1 
-			   << ", " << yh2 << ", " << bl2 << ", " << tl2;
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapAlgo: Trim " << fact << " Param " << yh1 << ", " << bl1 
+    << ", " << tl1 << ", " << yh2 << ", " << bl2 << ", " << tl2;
 #endif
   
   bl1 -= fact;
@@ -879,13 +863,12 @@ void DDHCalEndcapAlgo::constructInsideModule0(const DDLogicalPart& module, int m
 			       0.5*getThick(mod), theta, phi, yh1,
 			       bl1, tl1, alp, yh2, bl2, tl2, alp);
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: " << solid.name() 
-			   << " Trap made of " << getAbsMat() 
-			   << " of dimensions " << 0.5*getThick(mod) << ", "
-			   << theta/CLHEP::deg << ", " << phi/CLHEP::deg << ", "
-			   << yh1 << ", " << bl1 << ", " << tl1 << ", " 
-			   << alp/CLHEP::deg << ", " << yh2 << ", "
-			   << bl2 << ", " << tl2 << ", " << alp/CLHEP::deg;
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapAlgo: " << solid.name() << " Trap made of " << getAbsMat() 
+    << " of dimensions " << 0.5*getThick(mod) << ", " << convertRadToDeg(theta)
+    << ", " << convertRadToDeg(phi) << ", " << yh1 << ", " << bl1 << ", " << tl1
+    << ", " << convertRadToDeg(alp) << ", " << yh2 << ", " << bl2 << ", " << tl2
+    << ", " << convertRadToDeg(alp);
 #endif
   
   glog = DDLogicalPart(solid.ddname(), matabsorbr, solid);
@@ -894,9 +877,9 @@ void DDHCalEndcapAlgo::constructInsideModule0(const DDLogicalPart& module, int m
   cpv.position(glog, module, 1, r2, rot);
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: " << glog.name() 
-			   << " number 1 positioned in " << module.name() 
-			   << " at " << r2 << " with " << rot;
+  edm::LogVerbatim("HCalGeom")
+    << "DDHCalEndcapAlgo: " << glog.name() << " number 1 positioned in " 
+    << module.name() << " at " << r2 << " with " << rot;
 #endif
 }
 
@@ -904,24 +887,24 @@ void DDHCalEndcapAlgo::constructInsideModule0(const DDLogicalPart& module, int m
 void DDHCalEndcapAlgo::constructInsideModule(const DDLogicalPart& module, int mod, DDCompactView& cpv) {
   
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: \t\tInside module ..." 
-			   << mod;
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapAlgo: \t\tInside module ..." << mod;
 #endif
   
   ///////////////////////////////////////////////////////////////
   //Pointers to the Rotation Matrices and to the Materials
-  string rotstr = getRotMat();
+  std::string rotstr = getRotMat();
   DDRotation rot(DDName(rotstr, rotns));
   DDName matName(DDSplit(getGenMat()).first, DDSplit(getGenMat()).second);
   DDMaterial matter(matName);
   DDName plasName(DDSplit(getPlastMat()).first, DDSplit(getPlastMat()).second);
   DDMaterial matplastic(plasName);
 
-  double  alpha = CLHEP::pi/getNsectors();
+  double  alpha = (1._pi)/getNsectors();
   double  zi    = getZminBlock(mod);
 
   for (int i = 0; i < getLayerN(mod); i++) {
-    string name;
+    std::string name;
     DDSolid solid;
     DDLogicalPart glog, plog;
     int     layer  = getLayer(mod,i);
@@ -943,10 +926,10 @@ void DDHCalEndcapAlgo::constructInsideModule(const DDLogicalPart& module, int mo
       if (routB > getRoutBlock2(mod)) routB =  getRoutBlock2(mod);
 
 #ifdef EDM_ML_DEBUG
-      edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: Layer " << i <<" Phi "
-			       << iphi << " Front " << ziAir << ", " << rinF
-			       << ", " << routF << " Back " << zo << ", "
-			       << rinB << ", " << routB;
+      edm::LogVerbatim("HCalGeom") 
+	<< "DDHCalEndcapAlgo: Layer " << i <<" Phi " << iphi << " Front " 
+	<< ziAir << ", " << rinF << ", " << routF << " Back " << zo << ", "
+	<< rinB << ", " << routB;
 #endif
 
       double yh1, bl1, tl1, yh2, bl2, tl2, theta, phi, alp;
@@ -960,13 +943,12 @@ void DDHCalEndcapAlgo::constructInsideModule(const DDLogicalPart& module, int mo
 				   bl1, tl1, alp, yh2, bl2, tl2, alp);
 
 #ifdef EDM_ML_DEBUG
-      edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: " << solid.name() 
-			       << " Trap made of " << getGenMat() 
-			       << " of dimensions " << 0.5*getThick(mod) << ", "
-			       << theta/CLHEP::deg << ", " << phi/CLHEP::deg
-			       << ", " << yh1 << ", " << bl1 << ", " << tl1 
-			       << ", " << alp/CLHEP::deg << ", " << yh2 << ", "
-			       << bl2 << ", " << tl2 << ", " << alp/CLHEP::deg;
+      edm::LogVerbatim("HCalGeom")
+	<< "DDHCalEndcapAlgo: " << solid.name() << " Trap made of " << getGenMat()
+	<< " of dimensions " << 0.5*getThick(mod) << ", "<< convertRadToDeg(theta)
+	<< ", " << convertRadToDeg(phi) << ", " << yh1 << ", " << bl1 << ", " 
+	<< tl1 << ", " << convertRadToDeg(alp) << ", " << yh2 << ", " << bl2 
+	<< ", " << tl2 << ", " << convertRadToDeg(alp);
 #endif
 
       glog = DDLogicalPart(solid.ddname(), matter, solid);
@@ -975,10 +957,9 @@ void DDHCalEndcapAlgo::constructInsideModule(const DDLogicalPart& module, int mo
       cpv.position(glog, module, layer+1, r1, rot);
 
 #ifdef EDM_ML_DEBUG
-      edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: " << glog.name() 
-			       << " number " << layer+1 << " positioned in " 
-			       << module.name() << " at " << r1 << " with "
-			       << rot;
+      edm::LogVerbatim("HCalGeom") 
+	<< "DDHCalEndcapAlgo: " << glog.name() << " number " << layer+1 
+	<< " positioned in " << module.name() << " at " << r1 << " with " << rot;
 #endif
       
       //Now the plastic with scintillators
@@ -991,12 +972,12 @@ void DDHCalEndcapAlgo::constructInsideModule(const DDLogicalPart& module, int mo
 				   bl, tl, alp, yh, bl, tl, alp);
 
 #ifdef EDM_ML_DEBUG
-      edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: " << solid.name() 
-			       << " Trap made of " << getPlastMat() 
-			       << " of dimensions " << 0.5*getLayerT(layer) 
-			       << ", 0, 0, " << yh << ", " << bl << ", " << tl
-			       << ", " << alp/CLHEP::deg << ", " << yh << ", " 
-			       << bl << ", " << tl << ", " << alp/CLHEP::deg;
+      edm::LogVerbatim("HCalGeom") 
+	<< "DDHCalEndcapAlgo: " << solid.name() << " Trap made of " 
+	<< getPlastMat() << " of dimensions " << 0.5*getLayerT(layer) 
+	<< ", 0, 0, " << yh << ", " << bl << ", " << tl  << ", " 
+	<< convertRadToDeg(alp) << ", " << yh << ", " << bl << ", " << tl << ", " 
+	<< convertRadToDeg(alp);
 #endif
 
       plog = DDLogicalPart(solid.ddname(), matplastic, solid);
@@ -1006,10 +987,9 @@ void DDHCalEndcapAlgo::constructInsideModule(const DDLogicalPart& module, int mo
       cpv.position(plog, glog, idOffset+layer+1, r2, DDRotation());
 
 #ifdef EDM_ML_DEBUG
-      edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: " << plog.name() 
-			       << " number " << idOffset+layer+1 
-			       << " positioned in " << glog.name() << " at " 
-			       << r2 << " with no rotation";
+      edm::LogVerbatim("HCalGeom") 
+	<< "DDHCalEndcapAlgo: " << plog.name() << " number " << idOffset+layer+1 
+	<< " positioned in " << glog.name() << " at " << r2 <<" with no rotation";
 #endif
       
       //Constructin the scintillators inside
@@ -1023,24 +1003,25 @@ void DDHCalEndcapAlgo::constructInsideModule(const DDLogicalPart& module, int mo
 }
 
  
-void DDHCalEndcapAlgo::constructScintLayer(const DDLogicalPart& detector, double dz,
-                                           double yh, double bl, double tl, 
-					   double alp, const string& nm, int id, DDCompactView& cpv) {
+void DDHCalEndcapAlgo::constructScintLayer(const DDLogicalPart& detector,
+					   double dz, double yh, double bl, 
+					   double tl, double alp, 
+					   const std::string& nm, int id, 
+					   DDCompactView& cpv) {
 
   DDName matname(DDSplit(getScintMat()).first, DDSplit(getScintMat()).second);
   DDMaterial matter(matname);
-  string name = idName+"Scintillator"+nm;
+  std::string name = idName+"Scintillator"+nm;
 
   DDSolid solid = DDSolidFactory::trap(DDName(name, idNameSpace), 0.5*dz, 0, 0,
 				       yh, bl, tl, alp, yh, bl, tl, alp);
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: " 
-			   << DDName(name,idNameSpace) << " Trap made of " 
-			   << getScintMat() <<" of dimensions " << 0.5*dz 
-			   << ", 0, 0, " << yh << ", "  << bl << ", "  << tl 
-			   << ", " << alp/CLHEP::deg << ", " << yh << ", " 
-			   << bl << ", " << tl << ", " << alp/CLHEP::deg;
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapAlgo: " << DDName(name,idNameSpace) << " Trap made of " 
+    << getScintMat() <<" of dimensions " << 0.5*dz << ", 0, 0, " << yh << ", "
+    << bl << ", "  << tl  << ", " << convertRadToDeg(alp) << ", " << yh << ", " 
+    << bl << ", " << tl << ", " << convertRadToDeg(alp);
 #endif
   
   DDLogicalPart glog(solid.ddname(), matter, solid); 
@@ -1048,8 +1029,8 @@ void DDHCalEndcapAlgo::constructScintLayer(const DDLogicalPart& detector, double
   cpv.position(glog, detector, id, DDTranslation(0,0,0), DDRotation());
 
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapAlgo test: " << glog.name() 
-			   << " number " << id << " positioned in " 
-			   << detector.name() << " at (0,0,0) with no rotation";
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapAlgo: " << glog.name() << " number " << id 
+    << " positioned in " << detector.name() << " at (0,0,0) with no rotation";
 #endif
 }
diff --git a/Geometry/HcalAlgo/plugins/DDHCalEndcapModuleAlgo.cc b/Geometry/HcalAlgo/plugins/DDHCalEndcapModuleAlgo.cc
index 575449d45ff6b..046acea07ac65 100644
--- a/Geometry/HcalAlgo/plugins/DDHCalEndcapModuleAlgo.cc
+++ b/Geometry/HcalAlgo/plugins/DDHCalEndcapModuleAlgo.cc
@@ -8,6 +8,7 @@
 #include <algorithm>
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "DataFormats/Math/interface/GeantUnits.h"
 #include "DetectorDescription/Core/interface/DDutils.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
@@ -15,11 +16,14 @@
 #include "DetectorDescription/Core/interface/DDCurrentNamespace.h"
 #include "DetectorDescription/Core/interface/DDSplit.h"
 #include "Geometry/HcalAlgo/plugins/DDHCalEndcapModuleAlgo.h"
-#include "CLHEP/Units/GlobalPhysicalConstants.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+
+//#define EDM_ML_DEBUG
+using namespace geant_units::operators;
 
 DDHCalEndcapModuleAlgo::DDHCalEndcapModuleAlgo() {
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo info: Creating an instance";
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") << "DDHCalEndcapModuleAlgo: Creating an instance";
+#endif
 }
 
 DDHCalEndcapModuleAlgo::~DDHCalEndcapModuleAlgo() {}
@@ -36,12 +40,12 @@ void DDHCalEndcapModuleAlgo::initialize(const DDNumericArguments & nArgs,
   scintMat      = sArgs["ScintMat"];
   rotstr        = sArgs["Rotation"];
   sectors       = int (nArgs["Sectors"]);
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo: General material " 
-			   << genMaterial << "\tAbsorber " << absorberMat
-			   << "\tPlastic " << plasticMat << "\tScintillator "
-			   << scintMat << "\tRotation " << rotstr
-			   << "\tSectors "  << sectors;
-
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapModuleAlgo: General material " << genMaterial << "\tAbsorber "
+    << absorberMat << "\tPlastic " << plasticMat << "\tScintillator "
+    << scintMat << "\tRotation " << rotstr << "\tSectors "  << sectors;
+#endif
   zMinBlock     = nArgs["ZMinBlock"];
   zMaxBlock     = nArgs["ZMaxBlock"];
   z1Beam        = nArgs["Z1Beam"];
@@ -50,61 +54,68 @@ void DDHCalEndcapModuleAlgo::initialize(const DDNumericArguments & nArgs,
   moduleThick   = nArgs["ModuleThick"];
   layerThick    = nArgs["LayerThick"];
   scintThick    = nArgs["ScintThick"];
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo: Zmin " << zMinBlock
-			   << "\tZmax " << zMaxBlock << "\tZ1Beam " << z1Beam
-			   << "\tZiDip " << ziDip << "\tDzStep " << dzStep
-			   << "\tModuleThick " << moduleThick <<"\tLayerThick "
-			   << layerThick << "\tScintThick " << scintThick;
-
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapModuleAlgo: Zmin " << zMinBlock << "\tZmax " << zMaxBlock 
+    << "\tZ1Beam " << z1Beam << "\tZiDip " << ziDip << "\tDzStep " << dzStep
+    << "\tModuleThick " << moduleThick <<"\tLayerThick " << layerThick 
+    << "\tScintThick " << scintThick;
+#endif
   rMaxFront     = nArgs["RMaxFront"];
   rMaxBack      = nArgs["RMaxBack"];
   trimLeft      = nArgs["TrimLeft"];
   trimRight     = nArgs["TrimRight"];
   tolAbs        = nArgs["TolAbs"];
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo: RMaxFront " << rMaxFront
-			   <<"\tRmaxBack " << rMaxBack << "\tTrims " <<trimLeft
-			   << ":" << trimRight << "\tTolAbs " << tolAbs;
-
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapModuleAlgo: RMaxFront " << rMaxFront <<"\tRmaxBack " 
+    << rMaxBack << "\tTrims " <<trimLeft << ":" << trimRight << "\tTolAbs "
+    << tolAbs;
+#endif
   slopeBot      = nArgs["SlopeBottom"];
   slopeTop      = nArgs["SlopeTop"];
   slopeTopF     = nArgs["SlopeTopFront"];
   modType       = (int)(nArgs["ModType"]);
   modNumber     = (int)(nArgs["ModNumber"]);
   layerType     = (int)(nArgs["LayerType"]);
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo: slopeBot " << slopeBot
-			   << "\tslopeTop " << slopeTop << "\tslopeTopF "
-			   << slopeTopF << "\tmodType " << modType
-			   << "\tmodNumber " << modNumber << "\tlayerType "
-			   << layerType;
-
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapModuleAlgo: slopeBot " << slopeBot << "\tslopeTop " 
+    << slopeTop << "\tslopeTopF " << slopeTopF << "\tmodType " << modType
+    << "\tmodNumber " << modNumber << "\tlayerType " << layerType;
+#endif
   layerNumber   = dbl_to_int(vArgs["LayerNumber"]);
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo: " << layerNumber.size()
-			   << " layer Numbers";
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapModuleAlgo: " << layerNumber.size() << " layer Numbers";
   for (unsigned int i=0; i<layerNumber.size(); ++i)
-    edm::LogInfo("HCalGeom") << "LayerNumber[" << i << "] = " <<layerNumber[i];
-
+    edm::LogVerbatim("HCalGeom") 
+      << "LayerNumber[" << i << "] = " <<layerNumber[i];
+#endif
   phiName       = vsArgs["PhiName"];
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo: " << phiName.size()
-			   << " phi sectors";
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapModuleAlgo: " << phiName.size() << " phi sectors";
   for (unsigned int i=0; i<phiName.size(); ++i)
-    edm::LogInfo("HCalGeom") << "PhiName[" << i << "] = " << phiName[i];
-
+    edm::LogVerbatim("HCalGeom") << "PhiName[" << i << "] = " << phiName[i];
+#endif
   layerName     = vsArgs["LayerName"];
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo: " << layerName.size()
-			   << " layers";
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapModuleAlgo: " << layerName.size() << " layers";
   for (unsigned int i=0; i<layerName.size(); ++i)
-    edm::LogInfo("HCalGeom") << "LayerName[" << i << "] = " << layerName[i];
-
+    edm::LogVerbatim("HCalGeom") << "LayerName[" << i << "] = " << layerName[i];
+#endif
   idName      = sArgs["MotherName"];
   idNameSpace = DDCurrentNamespace::ns();
   idOffset    = int (nArgs["IdOffset"]); 
-  DDName parentName = parent().name(); 
   modName     = sArgs["ModName"];
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo debug: Parent " 
-			   << parentName << "   " << modName << " idName " 
-			   << idName << " NameSpace " << idNameSpace
-			   << " Offset " << idOffset;
-
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapModuleAlgo: Parent " << parent().name() << "   " << modName
+    << " idName " << idName << " NameSpace " << idNameSpace << " Offset " 
+    << idOffset;
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -113,19 +124,25 @@ void DDHCalEndcapModuleAlgo::initialize(const DDNumericArguments & nArgs,
 
 void DDHCalEndcapModuleAlgo::execute(DDCompactView& cpv) {
   
-  edm::LogInfo("HCalGeom") << "==>> Constructing DDHCalEndcapModuleAlgo...";
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") << "==>> Constructing DDHCalEndcapModuleAlgo...";
+#endif
   if (modType == 0) 
     constructInsideModule0 (parent(), cpv);
   else
     constructInsideModule  (parent(), cpv);
-  edm::LogInfo("HCalGeom") << "<<== End of DDHCalEndcapModuleAlgo construction ...";
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "<<== End of DDHCalEndcapModuleAlgo construction ...";
+#endif
 }
 
 
 void DDHCalEndcapModuleAlgo::constructInsideModule0(const DDLogicalPart& module, DDCompactView& cpv) {
   
-  edm::LogInfo("HCalGeom") <<"DDHCalEndcapModuleAlgo test: \t\tInside module0";
-
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") << "DDHCalEndcapModuleAlgo: \t\tInside module0";
+#endif
   ///////////////////////////////////////////////////////////////
   //Pointers to the Rotation Matrices and to the Materials
   DDRotation rot(DDName(DDSplit(rotstr).first, DDSplit(rotstr).second));
@@ -146,20 +163,24 @@ void DDHCalEndcapModuleAlgo::constructInsideModule0(const DDLogicalPart& module,
 				 0.5*layerThick, 0, 0, parm.yh1, parm.bl1, 
 				 parm.tl1, parm.alp, parm.yh2, parm.bl1, 
 				 parm.tl2, parm.alp);
-    edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo test: " << solid.name()
-			     << " Trap made of " << plasName
-			     << " of dimensions " << 0.5*layerThick
-			     << ", 0, 0, " << parm.yh1 << ", " << parm.bl1 
-			     << ", " << parm.tl1 << ", " << parm.alp/CLHEP::deg
-			     << ", " << parm.yh2 << ", " << parm.bl2 << ", " 
-			     << parm.tl2 << ", " << parm.alp/CLHEP::deg;
+#ifdef EDM_ML_DEBUG
+    edm::LogVerbatim("HCalGeom") 
+      << "DDHCalEndcapModuleAlgo: " << solid.name() << " Trap made of " 
+      << plasName << " of dimensions " << 0.5*layerThick << ", 0, 0, " 
+      << parm.yh1 << ", " << parm.bl1 << ", " << parm.tl1 << ", " 
+      << convertRadToDeg(parm.alp) << ", " << parm.yh2 << ", " << parm.bl2 
+      << ", " << parm.tl2 << ", " << convertRadToDeg(parm.alp);
+#endif
     glog = DDLogicalPart(solid.ddname(), matplastic, solid);
 
     DDTranslation r1(parm.xpos, parm.ypos, parm.zpos);
     cpv.position(glog, module, idOffset+layer+1, r1, rot);
-    edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo test: " << glog.name() 
-			 << " number " << idOffset+layer+1 << " positioned in "
-			 << module.name() << " at " << r1 << " with " << rot;
+#ifdef EDM_ML_DEBUG
+    edm::LogVerbatim("HCalGeom") 
+      << "DDHCalEndcapModuleAlgo: " << glog.name() << " number " 
+      << idOffset+layer+1 << " positioned in " << module.name() << " at " << r1
+      << " with " << rot;
+#endif
     //Now construct the layer of scintillator inside this
     int copyNo = layer0*10 + layerType;
     name = modName+layerName[0]+phiName[iphi];
@@ -186,16 +207,19 @@ void DDHCalEndcapModuleAlgo::constructInsideModule0(const DDLogicalPart& module,
     rinB  = zo * slopeBot;
     routB = (zo - z1Beam) * slopeTop;
   }
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo test: Front "
-			   << zi << ", " << rinF << ", " << routF << " Back "
-			   << zo << ", " << rinB << ", " << routB;
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapModuleAlgo: Front " << zi << ", " << rinF << ", " << routF 
+    << " Back " << zo << ", " << rinB << ", " << routB;
+#endif
   DDHCalEndcapModuleAlgo::HcalEndcapPar parm = parameterLayer(0, rinF, routF, 
-							      rinB, routB, zi, 
-							      zo);
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo test: Trim " << tolAbs
-			   << " Param " << parm.yh1 << ", " << parm.bl1 << ", "
-			   << parm.tl1 << ", " << parm.yh2 << ", " << parm.bl2 
-			   << ", " << parm.tl2;
+							      rinB, routB, zi,zo);
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapModuleAlgo: Trim " << tolAbs << " Param " << parm.yh1 << ", "
+    << parm.bl1 << ", " << parm.tl1 << ", " << parm.yh2 << ", " << parm.bl2 
+    << ", " << parm.tl2;
+#endif
   parm.bl1 -= tolAbs;
   parm.tl1 -= tolAbs;
   parm.bl2 -= tolAbs;
@@ -206,28 +230,31 @@ void DDHCalEndcapModuleAlgo::constructInsideModule0(const DDLogicalPart& module,
 			       0.5*moduleThick, parm.theta, parm.phi, parm.yh1,
 			       parm.bl1, parm.tl1, parm.alp, parm.yh2, 
 			       parm.bl2, parm.tl2, parm.alp);
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo test: " << solid.name() 
-			   << " Trap made of " << matName << " of dimensions " 
-			   << 0.5*moduleThick << ", " << parm.theta/CLHEP::deg 
-			   << ", " << parm.phi/CLHEP::deg << ", " << parm.yh1 
-			   << ", " << parm.bl1 << ", "  << parm.tl1 << ", " 
-			   << parm.alp/CLHEP::deg << ", " << parm.yh2 << ", "
-			   << parm.bl2 << ", " << parm.tl2 << ", " 
-			   << parm.alp/CLHEP::deg;
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapModuleAlgo: " << solid.name() << " Trap made of " << matName 
+    << " of dimensions " << 0.5*moduleThick << ", " << convertRadToDeg(parm.theta)
+    << ", " << convertRadToDeg(parm.phi) << ", " << parm.yh1 << ", " << parm.bl1
+    << ", "  << parm.tl1 << ", " << convertRadToDeg(parm.alp) << ", " << parm.yh2
+    << ", " << parm.bl2 << ", " << parm.tl2 << ", " << convertRadToDeg(parm.alp);
+#endif
   glog = DDLogicalPart(solid.ddname(), matabsorbr, solid);
 
   DDTranslation r2(parm.xpos, parm.ypos, parm.zpos);
   cpv.position(glog, module, 1, r2, rot);
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo test: " << glog.name() 
-			   << " number 1 positioned in " << module.name() 
-			   << " at " << r2 << " with " << rot;
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom")
+    << "DDHCalEndcapModuleAlgo: " << glog.name() << " number 1 positioned in " 
+    << module.name() << " at " << r2 << " with " << rot;
+#endif
 }
 
 
 void DDHCalEndcapModuleAlgo::constructInsideModule(const DDLogicalPart& module, DDCompactView& cpv) {
   
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo test: \t\tInside module";
-
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") << "DDHCalEndcapModuleAlgo: \t\tInside module";
+#endif
   ///////////////////////////////////////////////////////////////
   //Pointers to the Rotation Matrices and to the Materials
   DDRotation rot(DDName(DDSplit(rotstr).first, DDSplit(rotstr).second));
@@ -236,7 +263,7 @@ void DDHCalEndcapModuleAlgo::constructInsideModule(const DDLogicalPart& module,
   DDName plasName(DDSplit(plasticMat).first, DDSplit(plasticMat).second);
   DDMaterial matplastic(plasName);
 
-  double  alpha = CLHEP::pi/sectors;
+  double  alpha = (1._pi)/sectors;
   double  zi    = zMinBlock;
 
   for (unsigned int i=0; i<layerName.size(); i++) {
@@ -258,10 +285,12 @@ void DDHCalEndcapModuleAlgo::constructInsideModule(const DDLogicalPart& module,
       }
       double routF = getRout(ziAir);
       double routB = getRout(zo);
-      edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo test: Layer " << i 
-			       << " Phi "  << iphi << " Front " << ziAir <<", "
-			       << rinF << ", " << routF << " Back " << zo 
-			       << ", " << rinB << ", " << routB;
+#ifdef EDM_ML_DEBUG
+      edm::LogVerbatim("HCalGeom") 
+	<< "DDHCalEndcapModuleAlgo: Layer " << i << " Phi "  << iphi << " Front "
+	<< ziAir <<", " << rinF << ", " << routF << " Back " << zo << ", " << rinB
+	<< ", " << routB;
+#endif
       DDHCalEndcapModuleAlgo::HcalEndcapPar parm = parameterLayer(iphi, rinF, 
 								  routF, rinB, 
 								  routB, ziAir,
@@ -272,24 +301,24 @@ void DDHCalEndcapModuleAlgo::constructInsideModule(const DDLogicalPart& module,
 				   0.5*moduleThick, parm.theta, parm.phi, 
 				   parm.yh1, parm.bl1, parm.tl1, parm.alp, 
 				   parm.yh2, parm.bl2, parm.tl2, parm.alp);
-      edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo test: " 
-			       << solid.name() << " Trap made of " << matName
-			       << " of dimensions " << 0.5*moduleThick << ", "
-			       << parm.theta/CLHEP::deg << ", " 
-			       << parm.phi/CLHEP::deg << ", " << parm.yh1 
-			       << ", " << parm.bl1 << ", " << parm.tl1 << ", "
-			       << parm.alp/CLHEP::deg << ", " << parm.yh2 
-			       << ", " << parm.bl2 << ", " << parm.tl2 << ", " 
-			       << parm.alp/CLHEP::deg;
+#ifdef EDM_ML_DEBUG
+      edm::LogVerbatim("HCalGeom") 
+	<< "DDHCalEndcapModuleAlgo: " << solid.name() << " Trap made of " 
+	<< matName << " of dimensions " << 0.5*moduleThick << ", "
+	<< convertRadToDeg(parm.theta) << ", " << convertRadToDeg(parm.phi) 
+	<< ", " << parm.yh1 << ", " << parm.bl1 << ", " << parm.tl1 << ", "
+	<< convertRadToDeg(parm.alp) << ", " << parm.yh2 << ", " << parm.bl2 
+	<< ", " << parm.tl2 << ", " << convertRadToDeg(parm.alp);
+#endif
       glog = DDLogicalPart(solid.ddname(), matter, solid);
 
       DDTranslation r1(parm.xpos, parm.ypos, parm.zpos);
       cpv.position(glog, module, layer+1, r1, rot);
-      edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo test: " <<glog.name()
-			       << " number " << layer+1 << " positioned in " 
-			       << module.name() << " at " << r1 << " with " 
-			       << rot;
-
+#ifdef EDM_ML_DEBUG
+      edm::LogVerbatim("HCalGeom") 
+	<< "DDHCalEndcapModuleAlgo: " <<glog.name() << " number " << layer+1 
+	<< " positioned in " << module.name() << " at " << r1 << " with " << rot;
+#endif
       //Now the plastic with scintillators
       parm.yh1 = 0.5 * (routF - rinB) - getTrim(iphi);
       parm.bl1 = 0.5 * rinB  * tan(alpha) - getTrim(iphi);
@@ -299,23 +328,25 @@ void DDHCalEndcapModuleAlgo::constructInsideModule(const DDLogicalPart& module,
 				   0.5*layerThick, 0, 0, parm.yh1,
 				   parm.bl1, parm.tl1, parm.alp, parm.yh1, 
 				   parm.bl1, parm.tl1, parm.alp);
-      edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo test: "<<solid.name()
-			       << " Trap made of " << plasName
-			       << " of dimensions " << 0.5*layerThick
-			       << ", 0, 0, " << parm.yh1 << ", " << parm.bl1 
-			       << ", " << parm.tl1 <<", "<< parm.alp/CLHEP::deg
-			       << ", " << parm.yh1 << ", " << parm.bl1 << ", " 
-			       << parm.tl1 << ", " << parm.alp/CLHEP::deg;
+#ifdef EDM_ML_DEBUG
+      edm::LogVerbatim("HCalGeom") 
+	<< "DDHCalEndcapModuleAlgo: "<< solid.name() << " Trap made of " 
+	<< plasName << " of dimensions " << 0.5*layerThick << ", 0, 0, " 
+	<< parm.yh1 << ", " << parm.bl1 << ", " << parm.tl1 <<", "
+	<< convertRadToDeg(parm.alp) << ", " << parm.yh1 << ", " << parm.bl1 
+	<< ", " << parm.tl1 << ", " << convertRadToDeg(parm.alp);
+#endif
       plog = DDLogicalPart(solid.ddname(), matplastic, solid);
 
       double ypos = 0.5*(routF+rinB) - parm.xpos;
       DDTranslation r2(0., ypos, 0.);
       cpv.position(plog, glog, idOffset+layer+1, r2, DDRotation());
-      edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo test: " <<plog.name()
-			       << " number " << idOffset+layer+1 
-			       << " positioned in " << glog.name() << " at " 
-			       << r2 << " with no rotation";
-
+#ifdef EDM_ML_DEBUG
+      edm::LogVerbatim("HCalGeom") 
+	<< "DDHCalEndcapModuleAlgo: " << plog.name() << " number " 
+	<< idOffset+layer+1 << " positioned in " << glog.name() << " at " 
+	<< r2 << " with no rotation";
+#endif
       //Constructin the scintillators inside
       int copyNo = layer*10 + layerType;
       name = modName+layerName[i]+phiName[iphi];
@@ -333,9 +364,11 @@ DDHCalEndcapModuleAlgo::parameterLayer0(unsigned int iphi) {
   DDHCalEndcapModuleAlgo::HcalEndcapPar parm;
   //Given module and layer number compute parameters of trapezoid
   //and positioning parameters
-  double alpha = CLHEP::pi/sectors;
-  edm::LogInfo("HCalGeom") << "Input " << iphi << " Alpha " <<alpha/CLHEP::deg;
-
+  double alpha = (1._pi)/sectors;
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "Input " << iphi << " Alpha " << convertRadToDeg(alpha);
+#endif
   double zi, zo;
   if (iphi == 0) {
     zi = zMinBlock;
@@ -355,7 +388,12 @@ DDHCalEndcapModuleAlgo::parameterLayer0(unsigned int iphi) {
     rin  = zo * slopeBot;
     rout = (zi - z1Beam) * slopeTop;
   }
-  edm::LogInfo("HCalGeom") << "ModNumber " << modNumber << " " << zi << " " << zo << " " << slopeTopF << " " << slopeTop << " " << slopeBot << " " << rin << " " << rout << " " << getTrim(iphi);
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "ModNumber " << modNumber << " " << zi << " " << zo << " " << slopeTopF 
+    << " " << slopeTop << " " << slopeBot << " " << rin << " " << rout << " " 
+    << getTrim(iphi);
+#endif
   double yh   = 0.5 * (rout - rin);
   double bl   = 0.5 * rin * tan (alpha);
   double tl   = 0.5 * rout * tan(alpha);
@@ -371,14 +409,15 @@ DDHCalEndcapModuleAlgo::parameterLayer0(unsigned int iphi) {
   } else {
     parm.alp  = -parm.alp;
   }
-  edm::LogInfo("HCalGeom") << "Output Dimensions " << parm.yh1 << " " 
-			   << parm.bl1 << " " << parm.tl1 << " " 
-			   << parm.alp/CLHEP::deg << " Position " << parm.xpos 
-			   << " " << parm.ypos << " " << parm.zpos;
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "Output Dimensions " << parm.yh1 << " " << parm.bl1 << " " << parm.tl1 
+    << " " << convertRadToDeg(parm.alp) << " Position " << parm.xpos << " "
+    << parm.ypos << " " << parm.zpos;
+#endif
   return parm;
 }
 
-
 DDHCalEndcapModuleAlgo::HcalEndcapPar 
 DDHCalEndcapModuleAlgo::parameterLayer(unsigned int iphi, double rinF, 
 				       double routF, double rinB, double routB,
@@ -387,11 +426,13 @@ DDHCalEndcapModuleAlgo::parameterLayer(unsigned int iphi, double rinF,
   DDHCalEndcapModuleAlgo::HcalEndcapPar parm;
   //Given rin, rout compute parameters of the trapezoid and 
   //position of the trapezoid for a standrd layer
-  double alpha = CLHEP::pi/sectors;
-  edm::LogInfo("HCalGeom") << "Input " << iphi << " Front " << rinF << " " 
-			   << routF << " " << zi << " Back " << rinB << " " 
-			   << routB << " " << zo<<" Alpha " <<alpha/CLHEP::deg;
-
+  double alpha = (1._pi)/sectors;
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "Input " << iphi << " Front " << rinF << " " << routF << " " << zi 
+    << " Back " << rinB << " " << routB << " " << zo << " Alpha " 
+    << convertRadToDeg(alpha);
+#endif
   parm.yh1    = 0.5 * (routF - rinB);
   parm.bl1    = 0.5 * rinB  * tan(alpha);
   parm.tl1    = 0.5 * routF * tan(alpha);
@@ -411,22 +452,25 @@ DDHCalEndcapModuleAlgo::parameterLayer(unsigned int iphi, double rinF,
     dx        = -dx;
   }
   double r    = sqrt (dx*dx + dy*dy);
-  edm::LogInfo("HCalGeom") << "dx|dy|r " << dx << ":" << dy << ":" << r;
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") << "dx|dy|r " << dx << ":" << dy << ":" << r;
+#endif
   if (r > 1.0e-8) {
     parm.theta  = atan (r/(zo-zi));
     parm.phi    = atan2 (dy, dx);
   } else {
     parm.theta  = parm.phi = 0;
   }
-  edm::LogInfo("HCalGeom") << "Output Dimensions " << parm.yh1 << " " 
-			   << parm.bl1 << " " << parm.tl1 << " " << parm.yh2 
-			   << " " << parm.bl2 << " " << parm.tl2 << " " 
-			   << parm.alp/CLHEP::deg <<" " <<parm.theta/CLHEP::deg
-			   << " " << parm.phi/CLHEP::deg << " Position " 
-			   << parm.xpos << " " << parm.ypos << " " <<parm.zpos;
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "Output Dimensions " << parm.yh1 << " " << parm.bl1 << " " << parm.tl1 
+    << " " << parm.yh2 << " " << parm.bl2 << " " << parm.tl2 << " " 
+    << convertRadToDeg(parm.alp) <<" " << convertRadToDeg(parm.theta) << " " 
+    << convertRadToDeg(parm.phi) << " Position " << parm.xpos << " " << parm.ypos
+    << " " <<parm.zpos;
+#endif
   return parm;
 }
-
  
 void DDHCalEndcapModuleAlgo::constructScintLayer(const DDLogicalPart& detector, double dz,
 						 DDHCalEndcapModuleAlgo::HcalEndcapPar parm,
@@ -439,21 +483,21 @@ void DDHCalEndcapModuleAlgo::constructScintLayer(const DDLogicalPart& detector,
   DDSolid solid = DDSolidFactory::trap(DDName(name, idNameSpace), 0.5*dz, 0, 0,
 				       parm.yh1, parm.bl1, parm.tl1, parm.alp, 
 				       parm.yh1, parm.bl1, parm.tl1, parm.alp);
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo test: " << solid.name()
-			   << " Trap made of " << scintMat << " of dimensions "
-			   << 0.5*dz << ", 0, 0, " << parm.yh1 << ", "  
-			   << parm.bl1 << ", " << parm.tl1 << ", " 
-			   << parm.alp/CLHEP::deg << ", " << parm.yh1 << ", " 
-			   << parm.bl1 << ", " << parm.tl1 << ", " 
-			   << parm.alp/CLHEP::deg;
-
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapModuleAlgo: " << solid.name() << " Trap made of " << scintMat
+    << " of dimensions " << 0.5*dz << ", 0, 0, " << parm.yh1 << ", " << parm.bl1 
+    << ", " << parm.tl1 << ", " << convertRadToDeg(parm.alp) << ", " << parm.yh1 
+    << ", " << parm.bl1 << ", " << parm.tl1 << ", " << convertRadToDeg(parm.alp);
+#endif
   DDLogicalPart glog(solid.ddname(), matter, solid); 
 
   cpv.position(glog, detector, id, DDTranslation(0,0,0), DDRotation());
-  edm::LogInfo("HCalGeom") << "DDHCalEndcapModuleAlgo test: " << glog.name() 
-			   << " number " << id << " positioned in " 
-			   << detector.name() <<" at (0,0,0) with no rotation";
-
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HCalGeom") 
+    << "DDHCalEndcapModuleAlgo: " << glog.name() << " number " << id 
+    << " positioned in " << detector.name() <<" at (0,0,0) with no rotation";
+#endif
 }
 
 double DDHCalEndcapModuleAlgo::getTrim(unsigned int j) const {
diff --git a/Geometry/HcalAlgo/plugins/DDHCalXtalAlgo.cc b/Geometry/HcalAlgo/plugins/DDHCalXtalAlgo.cc
index 418307e443504..f0016e2ec0cee 100644
--- a/Geometry/HcalAlgo/plugins/DDHCalXtalAlgo.cc
+++ b/Geometry/HcalAlgo/plugins/DDHCalXtalAlgo.cc
@@ -11,7 +11,6 @@
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"
 #include "DetectorDescription/Core/interface/DDCurrentNamespace.h"
 #include "Geometry/HcalAlgo/plugins/DDHCalXtalAlgo.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
 
 //#define EDM_ML_DEBUG
 using namespace geant_units::operators;
@@ -83,7 +82,7 @@ void DDHCalXtalAlgo::execute(DDCompactView& cpv) {
     DDTranslation tran(pos[0], pos[1], pos[2]);
     DDName parentName = parent().name(); 
 
-    static const double tol = 0.000174523292; // 0.01 degree
+    static const double tol = 0.01_deg; // 0.01 degree
     if (std::abs(angle) > tol) {
 #ifdef EDM_ML_DEBUG
       edm::LogVerbatim("HCalGeom") << "DDHCalXtalAlgo: Creating a rotation " 
diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/2019/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/2019/hcalRecNumbering.xml
index f42f64ac0a028..523688c6716b6 100644
--- a/Geometry/HcalCommonData/data/hcalRecNumbering/2019/hcalRecNumbering.xml
+++ b/Geometry/HcalCommonData/data/hcalRecNumbering/2019/hcalRecNumbering.xml
@@ -35,7 +35,7 @@
     <PartSelector path="//HCal"/>
     <Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
     <Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
-    <Parameter name="TriggerMode"  value="HcalTopologyMode::TriggerMode_2019" eval="false"/>
+    <Parameter name="TriggerMode"  value="HcalTopologyMode::TriggerMode_2021" eval="false"/>
   </SpecPar>
 </SpecParSection>
 
diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml
new file mode 100644
index 0000000000000..523688c6716b6
--- /dev/null
+++ b/Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+<ConstantsSection  label="hcalRecNumbering.xml" eval="true">
+  <Vector name="etagroup" type="numeric" nEntries="29">
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+  </Vector>
+  <Vector name="phigroup" type="numeric" nEntries="29">
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+  </Vector>
+  <Vector name="layerGroupRecEta1" type="numeric" nEntries="19">
+    1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4
+  </Vector>
+  <Vector name="layerGroupRecEta16" type="numeric" nEntries="19">
+    1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
+  </Vector>
+  <Vector name="layerGroupRecEta17" type="numeric" nEntries="19">
+    2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
+  </Vector>
+  <Vector name="layerGroupRecEta18" type="numeric" nEntries="19">
+    1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5
+  </Vector>
+  <Vector name="layerGroupRecEta19" type="numeric" nEntries="19">
+    1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6
+  </Vector>
+  <Vector name="layerGroupRecEta26" type="numeric" nEntries="19">
+    1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7
+  </Vector>
+</ConstantsSection>
+
+<SpecParSection label="hcalRecNumbering.xml" eval="true">
+  <SpecPar name="hcal">
+    <PartSelector path="//HCal"/>
+    <Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
+    <Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
+    <Parameter name="TriggerMode"  value="HcalTopologyMode::TriggerMode_2021" eval="false"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml
index d48c85f8f1a60..5d831661835d5 100644
--- a/Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml
+++ b/Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml
@@ -36,7 +36,7 @@
     <PartSelector path="//HCal"/>
     <Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
     <Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
-    <Parameter name="TriggerMode"  value="HcalTopologyMode::TriggerMode_2019" eval="false"/>
+    <Parameter name="TriggerMode"  value="HcalTopologyMode::TriggerMode_2021" eval="false"/>
   </SpecPar>
 </SpecParSection>
 
diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/Eta4/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/Eta4/hcalRecNumbering.xml
index f233b798b3b3b..b741e0e096b7c 100644
--- a/Geometry/HcalCommonData/data/hcalRecNumbering/Eta4/hcalRecNumbering.xml
+++ b/Geometry/HcalCommonData/data/hcalRecNumbering/Eta4/hcalRecNumbering.xml
@@ -32,7 +32,7 @@
     <PartSelector path="//HCal"/>
     <Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
     <Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
-    <Parameter name="TriggerMode"  value="HcalTopologyMode::TriggerMode_2019" eval="false"/>
+    <Parameter name="TriggerMode"  value="HcalTopologyMode::TriggerMode_2021" eval="false"/>
   </SpecPar>
 </SpecParSection>
 </DDDefinition>
diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/HGCal/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/HGCal/hcalRecNumbering.xml
index e92475aa14235..876e93ae9e770 100644
--- a/Geometry/HcalCommonData/data/hcalRecNumbering/HGCal/hcalRecNumbering.xml
+++ b/Geometry/HcalCommonData/data/hcalRecNumbering/HGCal/hcalRecNumbering.xml
@@ -34,7 +34,7 @@
     <PartSelector path="//HCal"/>
     <Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
     <Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
-    <Parameter name="TriggerMode"  value="HcalTopologyMode::TriggerMode_2019" eval="false"/>
+    <Parameter name="TriggerMode"  value="HcalTopologyMode::TriggerMode_2021" eval="false"/>
   </SpecPar>
 </SpecParSection>
 </DDDefinition>
diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml
index 4975cb93fbd55..32cbf5280ea5d 100644
--- a/Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml
+++ b/Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml
@@ -21,7 +21,7 @@
     <PartSelector path="//HCal"/>
     <Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
     <Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
-    <Parameter name="TriggerMode"  value="HcalTopologyMode::TriggerMode_2019" eval="false"/>
+    <Parameter name="TriggerMode"  value="HcalTopologyMode::TriggerMode_2021" eval="false"/>
   </SpecPar>
 </SpecParSection>
 
diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/PhaseII/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/PhaseII/hcalRecNumbering.xml
index 113830b823d1e..3a6946c34be2b 100644
--- a/Geometry/HcalCommonData/data/hcalRecNumbering/PhaseII/hcalRecNumbering.xml
+++ b/Geometry/HcalCommonData/data/hcalRecNumbering/PhaseII/hcalRecNumbering.xml
@@ -28,7 +28,7 @@
     <PartSelector path="//HCal"/>
     <Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
     <Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
-    <Parameter name="TriggerMode"  value="HcalTopologyMode::TriggerMode_2019" eval="false"/>
+    <Parameter name="TriggerMode"  value="HcalTopologyMode::TriggerMode_2021" eval="false"/>
   </SpecPar>
 </SpecParSection>
 
diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/Rebuild/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/Rebuild/hcalRecNumbering.xml
index 667a0e3b875a4..4960536d49d33 100644
--- a/Geometry/HcalCommonData/data/hcalRecNumbering/Rebuild/hcalRecNumbering.xml
+++ b/Geometry/HcalCommonData/data/hcalRecNumbering/Rebuild/hcalRecNumbering.xml
@@ -28,7 +28,7 @@
     <PartSelector path="//HCal"/>
     <Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
     <Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
-    <Parameter name="TriggerMode"  value="HcalTopologyMode::TriggerMode_2019" eval="false"/>
+    <Parameter name="TriggerMode"  value="HcalTopologyMode::TriggerMode_2021" eval="false"/>
   </SpecPar>
 </SpecParSection>
 </DDDefinition>
diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/RebuildHE/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/RebuildHE/hcalRecNumbering.xml
index 93a020727e7b7..2f47fcbda4e51 100644
--- a/Geometry/HcalCommonData/data/hcalRecNumbering/RebuildHE/hcalRecNumbering.xml
+++ b/Geometry/HcalCommonData/data/hcalRecNumbering/RebuildHE/hcalRecNumbering.xml
@@ -37,7 +37,7 @@
     <PartSelector path="//HCal"/>
     <Parameter name="OnlyForHcalRecNumbering" value="HCAL" eval="false"/>
     <Parameter name="TopologyMode" value="HcalTopologyMode::SLHC" eval="false"/>
-    <Parameter name="TriggerMode"  value="HcalTopologyMode::TriggerMode_2019" eval="false"/>
+    <Parameter name="TriggerMode"  value="HcalTopologyMode::TriggerMode_2021" eval="false"/>
   </SpecPar>
 </SpecParSection>
 </DDDefinition>
diff --git a/Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml b/Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml
new file mode 100644
index 0000000000000..6e83def0e1c8a
--- /dev/null
+++ b/Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+<ConstantsSection  label="hcalSimNumbering.xml" eval="true">
+  <Vector name="phioff" type="numeric" nEntries="5">
+    0.0*deg, 0.0*deg, 0.0*deg, 10.0*deg, 10.0*deg
+  </Vector>
+  <Vector name="etaTable" type="numeric" nEntries="30">
+    0.000, 0.087, 0.174, 0.261, 0.348, 0.435, 0.522, 0.609, 0.696,
+    0.783, 0.870, 0.957, 1.044, 1.131, 1.218, 1.305, 1.392, 1.479,
+    1.566, 1.653, 1.740, 1.830, 1.930, 2.043, 2.172, 2.322, 2.500,
+    2.650, 2.868, 3.000
+  </Vector>
+  <Vector name="rTable" type="numeric" nEntries="14">
+    12.50*cm, 16.90*cm, 20.10*cm, 24.00*cm, 28.60*cm, 34.00*cm,
+    40.60*cm, 48.30*cm, 57.60*cm, 68.60*cm, 81.80*cm, 97.50*cm,
+    116.20*cm, 130.00*cm
+  </Vector>
+  <Vector name="phibin" type="numeric" nEntries="29">
+    5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg,
+    5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg,
+    5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 10.0*deg,
+    10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg,
+    10.0*deg, 10.0*deg 
+  </Vector>
+  <Vector name="phitable" type="numeric" nEntries="13">
+    10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg,
+    10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 20.0*deg,
+    20.0*deg
+  </Vector>
+  <Vector name="layerGroupSimEta1" type="numeric" nEntries="19">
+    1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4
+  </Vector>
+  <Vector name="layerGroupSimEta16" type="numeric" nEntries="19">
+    1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
+  </Vector>
+  <Vector name="layerGroupSimEta17" type="numeric" nEntries="19">
+    2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
+  </Vector>
+  <Vector name="layerGroupSimEta18" type="numeric" nEntries="19">
+    1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5
+  </Vector>
+  <Vector name="layerGroupSimEta19" type="numeric" nEntries="19">
+    1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6
+  </Vector>
+  <Vector name="layerGroupSimEta26" type="numeric" nEntries="19">
+    1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7
+  </Vector>
+  <Vector name="etaMin" type="numeric" nEntries="4">
+    1, 16, 29, 1
+  </Vector>
+  <Vector name="etaMax" type="numeric" nEntries="4">
+    16, 29, 41, 15
+  </Vector>
+  <Vector name="MaxDepth" type="numeric" nEntries="4">
+     4,  7,  4,  4
+  </Vector>
+  <Vector name="etaRange" type="numeric" nEntries="4">
+    1.392, 3.000, 5.500, 1.305
+  </Vector>
+  <Vector name="gparHF" type="numeric" nEntries="7">
+    22.0*cm, 165.0*cm, 30.0*cm, 0.0*cm, 1115.0*cm, 0.375*cm,
+    1137.0*cm
+  </Vector>
+  <Vector name="noff" type="numeric" nEntries="18">
+    15, 29,  4, 10,  5,  2,  4, 18, 19, 11, 12, 13, 14,  3,  4,  3,  1,  0
+  </Vector>
+  <Vector name="Layer0Wt" type="numeric" nEntries="2">
+    1.2, 1.2
+  </Vector>
+  <Vector name="HBGains" type="numeric" nEntries="4">
+    117.0, 117.0, 117.0, 217.0
+  </Vector>
+  <Vector name="HBShift" type="numeric" nEntries="4">
+    0, 0, 0, 0
+  </Vector>
+  <Vector name="HEGains" type="numeric" nEntries="7">
+    178.0, 178.0, 178.0, 178.0, 178.0, 178.0, 178.0
+  </Vector>
+  <Vector name="HEShift" type="numeric" nEntries="7">
+    0, 0, 0, 0, 0, 0, 0
+  </Vector>
+  <Vector name="HFGains" type="numeric" nEntries="4">
+    2.840, 2.090, 2.840, 2.090
+  </Vector>
+  <Vector name="HFShift" type="numeric" nEntries="4">
+    0, 0, 0, 0
+  </Vector>
+</ConstantsSection>
+
+<SpecParSection label="hcalSimNumbering.xml" eval="true">
+  <SpecPar name="hcal">
+    <PartSelector path="//HBS.*"/>
+    <PartSelector path="//HTS.*"/>
+    <PartSelector path="//.*HES.*"/>
+    <PartSelector path="//HVQF"/>
+    <Parameter name="OnlyForHcalSimNumbering" value="HCAL" eval="false"/>
+  </SpecPar>
+</SpecParSection>
+
+</DDDefinition>
diff --git a/Geometry/HcalCommonData/interface/HcalTopologyMode.h b/Geometry/HcalCommonData/interface/HcalTopologyMode.h
index 20deaf77cf958..b054afae89d13 100644
--- a/Geometry/HcalCommonData/interface/HcalTopologyMode.h
+++ b/Geometry/HcalCommonData/interface/HcalTopologyMode.h
@@ -33,7 +33,7 @@ namespace HcalTopologyMode {
     TriggerMode_2017=3,         // HF upgraded to QIE10
     TriggerMode_2017plan1=4,    // HF upgraded to QIE10, 1 RBX of HE to QIE11
     TriggerMode_2018=5,         // HF upgraded to QIE10, HE to QIE11
-    TriggerMode_2019=6          // HF upgraded to QIE10, HBHE to QIE11
+    TriggerMode_2021=6          // HF upgraded to QIE10, HBHE to QIE11
   };
 }
 
diff --git a/Geometry/HcalCommonData/plugins/HcalDDDRecConstantsESMoudle.cc b/Geometry/HcalCommonData/plugins/HcalDDDRecConstantsESMoudle.cc
index ada1e125dcc43..2af2166914b4a 100644
--- a/Geometry/HcalCommonData/plugins/HcalDDDRecConstantsESMoudle.cc
+++ b/Geometry/HcalCommonData/plugins/HcalDDDRecConstantsESMoudle.cc
@@ -24,7 +24,6 @@
 // user include files
 #include <FWCore/Framework/interface/ModuleFactory.h>
 #include <FWCore/Framework/interface/ESProducer.h>
-#include <FWCore/Framework/interface/ESHandle.h>
 #include <FWCore/MessageLogger/interface/MessageLogger.h>
 
 #include <CondFormats/GeometryObjects/interface/HcalParameters.h>
@@ -46,13 +45,18 @@ class HcalDDDRecConstantsESModule : public edm::ESProducer {
 
   ReturnType produce(const HcalRecNumberingRecord&);
 
+private:
+  edm::ESGetToken<HcalParameters, HcalParametersRcd> parToken_;
+  edm::ESGetToken<HcalDDDSimConstants, HcalSimNumberingRecord> hdcToken_;
 };
 
 HcalDDDRecConstantsESModule::HcalDDDRecConstantsESModule(const edm::ParameterSet& iConfig) {
 #ifdef EDM_ML_DEBUG
   edm::LogVerbatim("HcalGeom") <<"constructing HcalDDDRecConstantsESModule";
 #endif
-  setWhatProduced(this);
+  auto cc = setWhatProduced(this);
+  parToken_ = cc.consumesFrom<HcalParameters, HcalParametersRcd>(edm::ESInputTag{});
+  hdcToken_ = cc.consumesFrom<HcalDDDSimConstants, HcalSimNumberingRecord>(edm::ESInputTag{});
 }
 
 HcalDDDRecConstantsESModule::~HcalDDDRecConstantsESModule() {}
@@ -68,12 +72,10 @@ HcalDDDRecConstantsESModule::produce(const HcalRecNumberingRecord& iRecord) {
 #ifdef EDM_ML_DEBUG
   edm::LogVerbatim("HcalGeom") << "in HcalDDDRecConstantsESModule::produce";
 #endif
-  edm::ESHandle<HcalParameters>         parHandle;
-  iRecord.getRecord<HcalParametersRcd>().get(parHandle);
-  edm::ESHandle<HcalDDDSimConstants>    hdc;
-  iRecord.getRecord<HcalSimNumberingRecord>().get(hdc);
+  const auto& par = iRecord.get(parToken_);
+  const auto& hdc = iRecord.get(hdcToken_);
 
-  return std::make_unique<HcalDDDRecConstants>(&(*parHandle), *hdc);
+  return std::make_unique<HcalDDDRecConstants>(&par, hdc);
 }
 
 //define this as a plug-in
diff --git a/Geometry/HcalCommonData/plugins/HcalDDDSimConstantsESModule.cc b/Geometry/HcalCommonData/plugins/HcalDDDSimConstantsESModule.cc
index 0d23249a5394b..69f6eaeab168e 100644
--- a/Geometry/HcalCommonData/plugins/HcalDDDSimConstantsESModule.cc
+++ b/Geometry/HcalCommonData/plugins/HcalDDDSimConstantsESModule.cc
@@ -20,7 +20,6 @@
 
 #include <FWCore/Framework/interface/ModuleFactory.h>
 #include <FWCore/Framework/interface/ESProducer.h>
-#include <FWCore/Framework/interface/ESHandle.h>
 
 #include <Geometry/HcalCommonData/interface/HcalDDDSimConstants.h>
 #include <Geometry/Records/interface/HcalSimNumberingRecord.h>
@@ -35,11 +34,13 @@ class HcalDDDSimConstantsESModule : public edm::ESProducer {
   static void fillDescriptions( edm::ConfigurationDescriptions & );
 
   ReturnType produce(const HcalSimNumberingRecord&);
+
+private:
+  edm::ESGetToken<HcalParameters, HcalParametersRcd> parToken_;
 };
 
-HcalDDDSimConstantsESModule::HcalDDDSimConstantsESModule(const edm::ParameterSet&) {
-  setWhatProduced(this);
-}
+HcalDDDSimConstantsESModule::HcalDDDSimConstantsESModule(const edm::ParameterSet&)
+    : parToken_{setWhatProduced(this).consumesFrom<HcalParameters, HcalParametersRcd>(edm::ESInputTag{})} {}
 
 void HcalDDDSimConstantsESModule::fillDescriptions( edm::ConfigurationDescriptions & descriptions ) {
   edm::ParameterSetDescription desc;
@@ -47,14 +48,9 @@ void HcalDDDSimConstantsESModule::fillDescriptions( edm::ConfigurationDescriptio
 }
 
 // ------------ method called to produce the data  ------------
-HcalDDDSimConstantsESModule::ReturnType
-HcalDDDSimConstantsESModule::produce(const HcalSimNumberingRecord& iRecord) {
-
-  const HcalParametersRcd& parRecord = iRecord.getRecord<HcalParametersRcd>();
-  edm::ESHandle<HcalParameters> parHandle;
-  parRecord.get(parHandle);
-
-  return std::make_unique<HcalDDDSimConstants>(parHandle.product());
+HcalDDDSimConstantsESModule::ReturnType HcalDDDSimConstantsESModule::produce(const HcalSimNumberingRecord& iRecord) {
+  const auto& par = iRecord.get(parToken_);
+  return std::make_unique<HcalDDDSimConstants>(&par);
 }
 
 //define this as a plug-in
diff --git a/Geometry/HcalCommonData/plugins/HcalParametersESModule.cc b/Geometry/HcalCommonData/plugins/HcalParametersESModule.cc
index ae1e171cc078d..893b901166254 100644
--- a/Geometry/HcalCommonData/plugins/HcalParametersESModule.cc
+++ b/Geometry/HcalCommonData/plugins/HcalParametersESModule.cc
@@ -1,7 +1,6 @@
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/Framework/interface/ModuleFactory.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/ESTransientHandle.h"
 #include "CondFormats/GeometryObjects/interface/HcalParameters.h"
@@ -23,12 +22,14 @@ class  HcalParametersESModule : public edm::ESProducer {
   static void fillDescriptions( edm::ConfigurationDescriptions & );
   
   ReturnType produce( const HcalParametersRcd & );
+
+private:
+  edm::ESGetToken<DDCompactView, IdealGeometryRecord> cpvToken_;
 };
 
-HcalParametersESModule::HcalParametersESModule( const edm::ParameterSet& ) {
+HcalParametersESModule::HcalParametersESModule( const edm::ParameterSet& )
+    : cpvToken_{setWhatProduced(this).consumesFrom<DDCompactView, IdealGeometryRecord>(edm::ESInputTag{})} {
   edm::LogInfo("HCAL") << "HcalParametersESModule::HcalParametersESModule";
-
-  setWhatProduced(this);
 }
 
 HcalParametersESModule::~HcalParametersESModule() {}
@@ -42,8 +43,7 @@ HcalParametersESModule::ReturnType
 HcalParametersESModule::produce( const HcalParametersRcd& iRecord ) {
   edm::LogInfo("HcalESModule")
     <<  "HcalParametersESModule::produce(const HcalParametersRcd& iRecord)";
-  edm::ESTransientHandle<DDCompactView> cpv;
-  iRecord.getRecord<IdealGeometryRecord>().get( cpv );
+  edm::ESTransientHandle<DDCompactView> cpv = iRecord.getTransientHandle(cpvToken_);
   
   auto ptp = std::make_unique<HcalParameters>();
   HcalParametersFromDD builder;
diff --git a/Geometry/HcalCommonData/python/testPhase1GeometryXML_cfi.py b/Geometry/HcalCommonData/python/testPhase1GeometryXML_cfi.py
index 7acaefb33e8d5..dfa468c711d0e 100644
--- a/Geometry/HcalCommonData/python/testPhase1GeometryXML_cfi.py
+++ b/Geometry/HcalCommonData/python/testPhase1GeometryXML_cfi.py
@@ -224,8 +224,8 @@
         'Geometry/HcalCommonData/data/hcalouteralgo.xml',
         'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
         'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
-        'Geometry/HcalCommonData/data/hcalSimNumbering/2019/hcalSimNumbering.xml', 
-        'Geometry/HcalCommonData/data/hcalRecNumbering/2019/hcalRecNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml', 
+        'Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml', 
         'Geometry/MuonCommonData/data/mbCommon/2017/v1/mbCommon.xml',
         'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml',
         'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml',
@@ -248,7 +248,7 @@
         'Geometry/ForwardCommonData/data/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring(
-        'Geometry/MuonCommonData/data/muonNumbering/2019/v1/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/muonNumbering/2021/v1/muonNumbering.xml',
         'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
         'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
         'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
diff --git a/Geometry/HcalCommonData/src/HcalTopologyMode.cc b/Geometry/HcalCommonData/src/HcalTopologyMode.cc
index 55a5bc26bcd7f..c52ac83e6deec 100644
--- a/Geometry/HcalCommonData/src/HcalTopologyMode.cc
+++ b/Geometry/HcalCommonData/src/HcalTopologyMode.cc
@@ -15,5 +15,5 @@ StringToEnumParser<HcalTopologyMode::TriggerMode>::StringToEnumParser() {
   enumMap["HcalTopologyMode::TriggerMode_2017"] = HcalTopologyMode::TriggerMode_2017;
   enumMap["HcalTopologyMode::TriggerMode_2017plan1"] = HcalTopologyMode::TriggerMode_2017plan1;
   enumMap["HcalTopologyMode::TriggerMode_2018"] = HcalTopologyMode::TriggerMode_2018;
-  enumMap["HcalTopologyMode::TriggerMode_2019"] = HcalTopologyMode::TriggerMode_2019;
+  enumMap["HcalTopologyMode::TriggerMode_2021"] = HcalTopologyMode::TriggerMode_2021;
 }
diff --git a/Geometry/HcalCommonData/test/HcalParametersAnalyzer.cc b/Geometry/HcalCommonData/test/HcalParametersAnalyzer.cc
index db828c3199ec4..533c2ce1bc83b 100644
--- a/Geometry/HcalCommonData/test/HcalParametersAnalyzer.cc
+++ b/Geometry/HcalCommonData/test/HcalParametersAnalyzer.cc
@@ -1,6 +1,5 @@
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "CondFormats/GeometryObjects/interface/HcalParameters.h"
 #include "Geometry/Records/interface/HcalParametersRcd.h"
@@ -11,19 +10,20 @@ class HcalParametersAnalyzer : public edm::one::EDAnalyzer<> {
   explicit HcalParametersAnalyzer( const edm::ParameterSet& );
   ~HcalParametersAnalyzer( void ) override;
   
-  void beginJob() override {}
   void analyze(edm::Event const& iEvent, edm::EventSetup const&) override;
-  void endJob() override {}    
+
+private:
+  edm::ESGetToken<HcalParameters, HcalParametersRcd> parToken_;
 };
 
-HcalParametersAnalyzer::HcalParametersAnalyzer( const edm::ParameterSet& ) {}
+HcalParametersAnalyzer::HcalParametersAnalyzer( const edm::ParameterSet& )
+  : parToken_{esConsumes<HcalParameters, HcalParametersRcd>(edm::ESInputTag{})} {}
 
 HcalParametersAnalyzer::~HcalParametersAnalyzer( void ) {}
 
 void HcalParametersAnalyzer::analyze( const edm::Event& /*iEvent*/, const edm::EventSetup& iSetup ) {
-  edm::ESHandle<HcalParameters> parHandle;
-  iSetup.get<HcalParametersRcd>().get( parHandle );
-  const HcalParameters* pars ( parHandle.product());
+  const auto& parR = iSetup.getData(parToken_);
+  const HcalParameters* pars = &parR;
 
   std::cout << "rHB: ";
   for( const auto& it : pars->rHB ) {
diff --git a/Geometry/HcalCommonData/test/HcalRecNumberingTester.cc b/Geometry/HcalCommonData/test/HcalRecNumberingTester.cc
index 0c672305ec127..79d88795e3838 100644
--- a/Geometry/HcalCommonData/test/HcalRecNumberingTester.cc
+++ b/Geometry/HcalCommonData/test/HcalRecNumberingTester.cc
@@ -45,24 +45,23 @@ class HcalRecNumberingTester : public edm::one::EDAnalyzer<> {
   explicit HcalRecNumberingTester( const edm::ParameterSet& );
   ~HcalRecNumberingTester() override;
 
-  void beginJob() override {}
   void analyze(edm::Event const& iEvent, edm::EventSetup const&) override;
-  void endJob() override {}
+
+private:
+  edm::ESGetToken<HcalDDDRecConstants, HcalRecNumberingRecord> token_;
 };
 
-HcalRecNumberingTester::HcalRecNumberingTester(const edm::ParameterSet& ) {}
+HcalRecNumberingTester::HcalRecNumberingTester(const edm::ParameterSet& ):
+  token_{esConsumes<HcalDDDRecConstants, HcalRecNumberingRecord>(edm::ESInputTag{})} {}
 
 HcalRecNumberingTester::~HcalRecNumberingTester() {}
 
 // ------------ method called to produce the data  ------------
 void HcalRecNumberingTester::analyze( const edm::Event& iEvent, const edm::EventSetup& iSetup ) {
 
-  edm::ESHandle<HcalDDDRecConstants> pHSNDC;
-  iSetup.get<HcalRecNumberingRecord>().get(pHSNDC);
-
-  if (pHSNDC.isValid()) {
+  if (auto pHSNDC = iSetup.getHandle(token_)) {
     edm::LogVerbatim("HcalGeom") << "about to de-reference the edm::ESHandle<HcalDDDRecConstants> pHSNDC";
-    const HcalDDDRecConstants hdc (*pHSNDC);
+    const HcalDDDRecConstants& hdc (*pHSNDC);
     edm::LogVerbatim("HcalGeom") << "about to getPhiOff and getPhiBin for 0..2";
     int neta = hdc.getNEta();
     edm::LogVerbatim("HcalGeom") << neta << " eta bins with phi off set for "
diff --git a/Geometry/HcalCommonData/test/HcalSimNumberingTester.cc b/Geometry/HcalCommonData/test/HcalSimNumberingTester.cc
index 0007f6ec18268..eb27bcd9ff3b1 100644
--- a/Geometry/HcalCommonData/test/HcalSimNumberingTester.cc
+++ b/Geometry/HcalCommonData/test/HcalSimNumberingTester.cc
@@ -44,12 +44,14 @@ class HcalSimNumberingTester : public edm::one::EDAnalyzer<> {
   explicit HcalSimNumberingTester( const edm::ParameterSet& );
   ~HcalSimNumberingTester() override;
 
-  void beginJob() override {}
   void analyze(edm::Event const& iEvent, edm::EventSetup const&) override;
-  void endJob() override {}
+
+private:
+  edm::ESGetToken<HcalDDDSimConstants, HcalSimNumberingRecord> token_;
 };
 
-HcalSimNumberingTester::HcalSimNumberingTester(const edm::ParameterSet& ) {}
+HcalSimNumberingTester::HcalSimNumberingTester(const edm::ParameterSet& )
+  : token_{esConsumes<HcalDDDSimConstants, HcalSimNumberingRecord>(edm::ESInputTag{})} {}
 
 
 HcalSimNumberingTester::~HcalSimNumberingTester() {}
@@ -57,10 +59,7 @@ HcalSimNumberingTester::~HcalSimNumberingTester() {}
 // ------------ method called to produce the data  ------------
 void HcalSimNumberingTester::analyze( const edm::Event& iEvent, const edm::EventSetup& iSetup ) {
 
-  edm::ESHandle<HcalDDDSimConstants> pHSNDC;
-  iSetup.get<HcalSimNumberingRecord>().get( pHSNDC );
-
-  if (pHSNDC.isValid()) {
+  if (auto pHSNDC = iSetup.getHandle(token_)) {
     edm::LogVerbatim("HcalGeom") << "about to de-reference the edm::ESHandle<HcalDDDSimConstants> pHSNDC";
     const HcalDDDSimConstants hdc (*pHSNDC);
     edm::LogVerbatim("HcalGeom") << "about to getConst for 0..1";
diff --git a/Geometry/MTDGeometryBuilder/test/python/testMTDGeometry.py b/Geometry/MTDGeometryBuilder/test/python/testMTDGeometry.py
index 11e3098e00637..37674d1d40bab 100644
--- a/Geometry/MTDGeometryBuilder/test/python/testMTDGeometry.py
+++ b/Geometry/MTDGeometryBuilder/test/python/testMTDGeometry.py
@@ -57,6 +57,6 @@
 
 process.dump = cms.EDAnalyzer("DDTestDumpFile",
                               DDDetector = cms.ESInputTag('MTD')
-)
+                              )
 
 process.p = cms.Path(process.test+process.dump)
diff --git a/Geometry/MTDNumberingBuilder/test/MTDModuleNumbering.cc b/Geometry/MTDNumberingBuilder/test/MTDModuleNumbering.cc
index 5cd4c3443a658..bcc541ee20840 100644
--- a/Geometry/MTDNumberingBuilder/test/MTDModuleNumbering.cc
+++ b/Geometry/MTDNumberingBuilder/test/MTDModuleNumbering.cc
@@ -891,7 +891,7 @@ MTDModuleNumbering::analyze( const edm::Event& iEvent, const edm::EventSetup& iS
 			// TEC+
 		      case 2:
 			{
-			  phiRad = phiRad;
+			  //phiRad unchanged
 			  break;
 			}
 			// TEC-
diff --git a/Geometry/MuonCommonData/data/muonNumbering/2021/v1/muonNumbering.xml b/Geometry/MuonCommonData/data/muonNumbering/2021/v1/muonNumbering.xml
new file mode 100644
index 0000000000000..02568b19d6e71
--- /dev/null
+++ b/Geometry/MuonCommonData/data/muonNumbering/2021/v1/muonNumbering.xml
@@ -0,0 +1,439 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
+ <ConstantsSection label="muonconstants">
+  <Constant name="xml_starts_with_copyno" value="1"/>
+  <Constant name="level" value="1000"/>
+  <Constant name="super" value="100"/>
+  <Constant name="base" value="1"/>
+  <Constant name="mb_region" value="1*[level]"/>
+  <Constant name="mb_wheel" value="2*[level]"/>
+  <Constant name="mb_station" value="3*[level]"/>
+  <Constant name="mb_superlayer" value="4*[level]"/>
+  <Constant name="mb_layer" value="5*[level]"/>
+  <Constant name="mb_wire" value="6*[level]"/>
+  <Constant name="me_region" value="[mb_region]"/>
+  <Constant name="me_station" value="2*[level]"/>
+  <Constant name="me_subring" value="3*[level]"/>
+  <Constant name="me_sector" value="4*[level]"/>
+  <Constant name="me_ring" value="5*[level]"/>
+  <Constant name="me_layer" value="6*[level]"/>
+  <Constant name="mr_region" value="[mb_region]"/>
+  <Constant name="mr_bwheel" value="[mb_wheel]"/>
+  <Constant name="mr_bstation" value="[mb_station]"/>
+  <Constant name="mr_bplane" value="4*[level]"/>
+  <Constant name="mr_bchamber" value="5*[level]"/>
+  <Constant name="mr_estation" value="[me_station]"/>
+  <Constant name="mr_eplane" value="3*[level]"/>
+  <Constant name="mr_esector" value="4*[level]"/>
+  <Constant name="mr_eroll" value="5*[level]"/>
+  <Constant name="mg_region" value="[mb_region]"/>
+  <Constant name="mg_station" value="[me_station]"/>
+  <Constant name="mg_ring" value="3*[level]"/>
+  <Constant name="mg_sector" value="4*[level]"/>
+  <Constant name="mg_roll" value="5*[level]"/>
+ </ConstantsSection>
+ <SpecParSection label="muonregionnumbering" eval="true">
+  <SpecPar name="MuonCommonNumbering">
+   <PartSelector path="//MUON"/>
+   <Parameter name="OnlyForMuonNumbering" value="justputsomethingheretonotfind" eval="false"/>
+   <Parameter name="xml_starts_with_copyno" value="[xml_starts_with_copyno]"/>
+   <Parameter name="level" value="[level]"/>
+   <Parameter name="super" value="[super]"/>
+   <Parameter name="base" value="[base]"/>
+   <Parameter name="mb_region" value="[mb_region]"/>
+   <Parameter name="mb_wheel"      value="[mb_wheel]"/>
+   <Parameter name="mb_station"    value="[mb_station]"/>
+   <Parameter name="mb_superlayer" value="[mb_superlayer]"/>
+   <Parameter name="mb_layer"      value="[mb_layer]"/>
+   <Parameter name="mb_wire"       value="[mb_wire]"/>
+   <Parameter name="me_region"     value="[me_region]"/>
+   <Parameter name="me_station"    value="[me_station]"/>
+   <Parameter name="me_subring"    value="[me_subring]"/>
+   <Parameter name="me_sector"     value="[me_sector]"/>
+   <Parameter name="me_ring"       value="[me_ring]"/>
+   <Parameter name="me_layer"      value="[me_layer]"/>
+   <Parameter name="mr_region"     value="[mr_region]"/>
+   <Parameter name="mr_bwheel"     value="[mr_bwheel]"/>
+   <Parameter name="mr_bstation"   value="[mr_bstation]"/>
+   <Parameter name="mr_bplane"     value="[mr_bplane]"/>
+   <Parameter name="mr_bchamber"   value="[mr_bchamber]"/>
+   <Parameter name="mr_estation"   value="[mr_estation]"/>
+   <Parameter name="mr_eplane"     value="[mr_eplane]"/>
+   <Parameter name="mr_esector"    value="[mr_esector]"/>
+   <Parameter name="mr_eroll"      value="[mr_eroll]"/>
+   <Parameter name="mg_region"     value="[mg_region]"/>
+   <Parameter name="mg_station"    value="[mg_station]"/>
+   <Parameter name="mg_ring"       value="[mg_ring]"/>
+   <Parameter name="mg_sector"     value="[mg_sector]"/>
+   <Parameter name="mg_roll"       value="[mg_roll]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrel">
+   <PartSelector path="//MB"/>
+   <Parameter name="CopyNoTag" value="[mb_region]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcap">
+   <PartSelector path="//MEP"/>
+   <PartSelector path="//MEN"/>
+   <Parameter name="CopyNoTag" value="[me_region]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+ </SpecParSection>
+ <SpecParSection label="muonbarrelnumbering" eval="true">
+  <SpecPar name="MuonBarrelWheels">
+   <PartSelector path="//MBWheel_.*"/>
+   <Parameter name="CopyNoTag" value="[mb_wheel]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelStation1">
+   <PartSelector path="//MB1N0P"/>
+   <PartSelector path="//MB1P"/>
+   <PartSelector path="//MB1P0"/>
+   <PartSelector path="//MB1ChimP"/>
+   <PartSelector path="//MB1N"/>
+   <PartSelector path="//MB1ChimN"/>
+   <Parameter name="CopyNoTag" value="[mb_station]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelStation2">
+   <PartSelector path="//MB2N32P"/>
+   <PartSelector path="//MB2P32P"/>
+   <PartSelector path="//MB2ChimP"/>
+   <PartSelector path="//MB2N32N"/>
+   <PartSelector path="//MB2ChimN"/>
+   <PartSelector path="//MB2P23P"/>
+   <PartSelector path="//MB2N23N"/>
+   <Parameter name="CopyNoTag" value="[mb_station]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelStation3">
+   <PartSelector path="//MB3P"/>
+   <PartSelector path="//MB3N"/>
+   <PartSelector path="//MB3ChimP"/>
+   <PartSelector path="//MB3ChimN"/>
+   <Parameter name="CopyNoTag" value="[mb_station]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelStation4">
+   <PartSelector path="//MB4BigLeftP"/>
+   <PartSelector path="//MB4BigRightP"/>
+   <PartSelector path="//MB4BigLeftN"/>
+   <PartSelector path="//MB4BigChimN"/>
+   <PartSelector path="//MB4BigRightN"/>
+   <PartSelector path="//MB4SmallRightP"/>
+   <PartSelector path="//MB4SmallLeftP"/>
+   <PartSelector path="//MB4SmallRightN"/>
+   <PartSelector path="//MB4SmallLeftN"/>
+   <PartSelector path="//MB4TopP"/>
+   <PartSelector path="//MB4TopChimP"/>
+   <PartSelector path="//MB4TopN"/>
+   <PartSelector path="//MB4BottomLeftP"/>
+   <PartSelector path="//MB4BottomRightP"/>
+   <PartSelector path="//MB4BottomRightN"/>
+   <PartSelector path="//MB4BottomLeftN"/>
+   <PartSelector path="//MB4FeetP"/>
+   <PartSelector path="//MB4FeetN"/>
+   <Parameter name="CopyNoTag" value="[mb_station]"/>
+   <Parameter name="CopyNoOffset" value="4*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelSuperLayer">
+   <PartSelector path="//MB.*SuperLayer.*"/>
+   <Parameter name="CopyNoTag" value="[mb_superlayer]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelLayer">
+   <PartSelector path="//MB.*SLPhiLayer.*"/>
+   <PartSelector path="//MB.*SLZLayer.*"/>
+   <Parameter name="CopyNoTag" value="[mb_layer]"/>
+  </SpecPar>
+  <SpecPar name="MuonBarrelWire">
+   <PartSelector path="//MBSLPhiGas"/>
+   <PartSelector path="//MBChimSLPhiGas"/>
+   <PartSelector path="//MB.*SLZGas"/>
+   <Parameter name="CopyNoTag" value="[mb_wire]"/>
+  </SpecPar>
+ </SpecParSection>
+ <SpecParSection label="muonrpcnumbering" eval="true">
+  <SpecPar name="MuonRpcPlane1I">
+   <PartSelector path="//MB1RPC_IP"/>
+   <PartSelector path="//MB1RPC_IN"/>
+   <PartSelector path="//MB1ChimRPC_IP"/>
+   <PartSelector path="//MB1ChimRPC_IN"/>
+   <Parameter name="CopyNoTag" value="[mr_bplane]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcPlane1O">
+   <PartSelector path="//MB1RPC_OP"/>
+   <PartSelector path="//MB1RPC_ON"/>
+   <PartSelector path="//MB1ChimRPC_OP"/>
+   <PartSelector path="//MB1ChimRPC_ON"/>
+   <Parameter name="CopyNoTag" value="[mr_bplane]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcPlane2I">
+   <PartSelector path="//MB22RPC_IP"/>
+   <PartSelector path="//MB22RPC_IN"/>
+   <PartSelector path="//MB23RPC_IP"/>
+   <PartSelector path="//MB23RPC_IN"/>
+   <PartSelector path="//MB2ChimRPC_IP"/>
+   <PartSelector path="//MB2ChimRPC_IN"/>
+   <Parameter name="CopyNoTag" value="[mr_bplane]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcPlane2O">
+   <PartSelector path="//MB22RPC_OP"/>
+   <PartSelector path="//MB22RPC_ON"/>
+   <PartSelector path="//MB23RPC_OP"/>
+   <PartSelector path="//MB23RPC_ON"/>
+   <PartSelector path="//MB2ChimRPC_OP"/>
+   <PartSelector path="//MB2ChimRPC_ON"/>
+   <Parameter name="CopyNoTag" value="[mr_bplane]"/>
+   <Parameter name="CopyNoOffset" value="4*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcPlane3S">
+   <PartSelector path="//MB3RPC_P"/>
+   <PartSelector path="//MB3RPC_N"/>
+   <PartSelector path="//MB3ChimRPC_P"/>
+   <PartSelector path="//MB3ChimRPC_N"/>
+   <Parameter name="CopyNoTag" value="[mr_bplane]"/>
+   <Parameter name="CopyNoOffset" value="5*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcPlane4">
+   <PartSelector path="//MB4RPC_P"/>
+   <PartSelector path="//MB4RPC_N"/>
+   <PartSelector path="//MB4SmallRPC_PS8"/>
+   <PartSelector path="//MB4SmallRPC_NS8"/>
+   <PartSelector path="//MB4SmallRPC_PS12"/>
+   <PartSelector path="//MB4SmallRPC_NS12"/>
+   <PartSelector path="//MB4TopRPC_P"/>
+   <PartSelector path="//MB4TopRPC_N"/>
+   <PartSelector path="//MB4FeetRPC_P"/>
+   <PartSelector path="//MB4FeetRPC_N"/>
+   <PartSelector path="//MB4BottomRPC_P"/>
+   <PartSelector path="//MB4BottomRPC_N"/>
+   <PartSelector path="//MB4TopChimRPC_P"/>
+   <PartSelector path="//MB4BigChimRPC_N"/>
+   <Parameter name="CopyNoTag" value="[mr_bplane]"/>
+   <Parameter name="CopyNoOffset" value="6*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcChamberLeft">
+   <PartSelector path="//MB.*RPC.*GasLeft"/>
+   <Parameter name="CopyNoTag" value="[mr_bchamber]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcChamberMiddle">
+   <PartSelector path="//MB.*RPC.*GasMiddle"/>
+   <Parameter name="CopyNoTag" value="[mr_bchamber]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcChamberRight">
+   <PartSelector path="//MB.*RPC.*GasRight"/>
+   <Parameter name="CopyNoTag" value="[mr_bchamber]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcap1">
+   <PartSelector path="//RR12"/>
+   <PartSelector path="//RR12N"/>
+   <PartSelector path="//RR13"/>
+   <Parameter name="CopyNoTag" value="[mr_eplane]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcap2">
+   <PartSelector path="//RR2X"/>
+   <Parameter name="CopyNoTag" value="[mr_eplane]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcap3">
+   <PartSelector path="//RR3X"/>
+   <Parameter name="CopyNoTag" value="[mr_eplane]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcap4">
+   <PartSelector path="//RR4XP"/>
+   <PartSelector path="//RR4XN"/>
+   <Parameter name="CopyNoTag" value="[mr_eplane]"/>
+   <Parameter name="CopyNoOffset" value="4*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapSector">
+   <PartSelector path="//RT1B"/>
+   <PartSelector path="//RT1BN"/>
+   <PartSelector path="//RT1C"/>
+   <PartSelector path="//RTXU"/>
+   <PartSelector path="//RTXUR"/>
+   <Parameter name="CopyNoTag" value="[mr_esector]"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberB1">
+   <PartSelector path="//REB1"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]+0"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberB2">
+   <PartSelector path="//REB2"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]+1"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberB3">
+   <PartSelector path="//REB3"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]+2"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberC1">
+   <PartSelector path="//REC1"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]+0"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberC2">
+   <PartSelector path="//REC2"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]+1"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberC3">
+   <PartSelector path="//REC3"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]+2"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberE1">
+   <PartSelector path="//REE1"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="5*[super]+0"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberE2">
+   <PartSelector path="//REE2"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="5*[super]+1"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberE3">
+   <PartSelector path="//REE3"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="5*[super]+2"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberF1">
+   <PartSelector path="//REF1"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="6*[super]+0"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberF2">
+   <PartSelector path="//REF2"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="6*[super]+1"/>
+  </SpecPar>
+  <SpecPar name="MuonRpcEndcapChamberF3">
+   <PartSelector path="//REF3"/>
+   <Parameter name="CopyNoTag" value="[mr_eroll]"/>
+   <Parameter name="CopyNoOffset" value="6*[super]+2"/>
+  </SpecPar>
+ </SpecParSection>
+ <SpecParSection label="muonendcapnumbering" eval="true">
+  <SpecPar name="MuonEndcapStation1">
+   <PartSelector path="//ME1RingP"/>
+   <PartSelector path="//ME1RingN"/>
+   <PartSelector path="//ME12RingP"/>
+   <PartSelector path="//ME12RingN"/>
+   <PartSelector path="//ME13RingP"/>
+   <PartSelector path="//ME13RingN"/>
+   <Parameter name="CopyNoTag" value="[me_station]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapStation2">
+   <PartSelector path="//ME2RingP"/>
+   <PartSelector path="//ME2RingN"/>
+   <Parameter name="CopyNoTag" value="[me_station]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapStation3">
+   <PartSelector path="//ME3RingP"/>
+   <PartSelector path="//ME3RingN"/>
+   <Parameter name="CopyNoTag" value="[me_station]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapStation4">
+   <PartSelector path="//ME4RingP"/>
+   <PartSelector path="//ME4RingN"/>
+   <Parameter name="CopyNoTag" value="[me_station]"/>
+   <Parameter name="CopyNoOffset" value="4*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapSubrings">
+   <PartSelector path="//ME11Space"/>
+   <PartSelector path="//ME12Space"/>
+   <PartSelector path="//ME13Space"/>
+   <PartSelector path="//ME21Space"/>
+   <PartSelector path="//ME22Space"/>
+   <PartSelector path="//ME31Space"/>
+   <PartSelector path="//ME32Space"/>
+   <PartSelector path="//ME41Space"/>
+   <PartSelector path="//ME42Space"/>
+   <Parameter name="CopyNoTag" value="[me_subring]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapSectors">
+   <PartSelector path="//ME11SpaceDivision"/>
+   <PartSelector path="//ME12SpaceDivision"/>
+   <PartSelector path="//ME13SpaceDivision"/>
+   <PartSelector path="//ME21SpaceDivision"/>
+   <PartSelector path="//ME22SpaceDivision"/>
+   <PartSelector path="//ME31SpaceDivision"/>
+   <PartSelector path="//ME32SpaceDivision"/>
+   <PartSelector path="//ME41SpaceDivision"/>
+   <PartSelector path="//ME42SpaceDivision"/>
+   <Parameter name="CopyNoTag" value="[me_sector]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapLayers">
+   <PartSelector path="//ME11Layer"/>
+   <PartSelector path="//ME12Layer"/>
+   <PartSelector path="//ME13Layer"/>
+   <PartSelector path="//ME21Layer"/>
+   <PartSelector path="//ME22Layer"/>
+   <PartSelector path="//ME31Layer"/>
+   <PartSelector path="//ME32Layer"/>
+   <PartSelector path="//ME41Layer"/>
+   <PartSelector path="//ME42Layer"/>
+   <Parameter name="CopyNoTag" value="[me_layer]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapRing1">
+   <PartSelector path="//ME11AlumFrame"/>
+   <PartSelector path="//ME21AlumFrame"/>
+   <PartSelector path="//ME31AlumFrame"/>
+   <PartSelector path="//ME41AlumFrame"/>
+   <Parameter name="CopyNoTag" value="[me_ring]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapRing2">
+   <PartSelector path="//ME12AlumFrame"/>
+   <PartSelector path="//ME22AlumFrame"/>
+   <PartSelector path="//ME32AlumFrame"/>
+   <PartSelector path="//ME42AlumFrame"/>
+   <Parameter name="CopyNoTag" value="[me_ring]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapRing3">
+   <PartSelector path="//ME13AlumFrame"/>
+   <Parameter name="CopyNoTag" value="[me_ring]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonEndcapRingA">
+   <PartSelector path="//ME1A_ActiveGasVol"/>
+   <Parameter name="CopyNoTag" value="[me_ring]"/>
+   <Parameter name="CopyNoOffset" value="4*[super]"/>
+  </SpecPar>
+ </SpecParSection>
+ <SpecParSection label="muonGEMnumbering" eval="true">
+  <SpecPar name="MuonGEMEndcap">
+   <PartSelector path="//GEMDisk11.*"/>
+   <PartSelector path="//GEMDisk21S.*"/>
+   <Parameter name="CopyNoTag" value="[mg_ring]"/>
+   <Parameter name="CopyNoOffset" value="1*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonGEMEndcap2">
+   <PartSelector path="//GEMDisk21L.*"/>
+   <Parameter name="CopyNoTag" value="[mg_ring]"/>
+   <Parameter name="CopyNoOffset" value="2*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonGEMSector">
+   <PartSelector path="//GEMBox.*"/>
+   <Parameter name="CopyNoTag" value="[mg_sector]"/>
+   <Parameter name="CopyNoOffset" value="3*[super]"/>
+  </SpecPar>
+  <SpecPar name="MuonGEMChamber">
+   <PartSelector path="//GHA.*"/>
+   <Parameter name="CopyNoTag" value="[mg_roll]"/>
+   <Parameter name="CopyNoOffset" value="4*[super]"/>
+  </SpecPar>
+ </SpecParSection>
+</DDDefinition>
diff --git a/Geometry/MuonCommonData/plugins/DDGEMAngular.cc b/Geometry/MuonCommonData/plugins/DDGEMAngular.cc
index 7cd84d0d49682..49629e7ba1e7d 100644
--- a/Geometry/MuonCommonData/plugins/DDGEMAngular.cc
+++ b/Geometry/MuonCommonData/plugins/DDGEMAngular.cc
@@ -13,24 +13,23 @@
 #include "DataFormats/Math/interface/GeantUnits.h"
 #include "Geometry/MuonCommonData/plugins/DDGEMAngular.h"
 
-using namespace geant_units;
 using namespace geant_units::operators;
 
 //#define EDM_ML_DEBUG
 
 DDGEMAngular::DDGEMAngular() {
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("MuonGeom") << "DDGEMAngular test: Creating an instance";
+  edm::LogVerbatim("MuonGeom") << "DDGEMAngular: Creating an instance";
 #endif
 }
 
 DDGEMAngular::~DDGEMAngular() {}
 
 void DDGEMAngular::initialize(const DDNumericArguments & nArgs,
-			       const DDVectorArguments & ,
-			       const DDMapArguments & ,
-			       const DDStringArguments & sArgs,
-			       const DDStringVectorArguments & ) {
+			      const DDVectorArguments & ,
+			      const DDMapArguments & ,
+			      const DDStringArguments & sArgs,
+			      const DDStringVectorArguments & ) {
 
   startAngle  = nArgs["startAngle"];
   stepAngle   = nArgs["stepAngle"];
@@ -41,22 +40,22 @@ void DDGEMAngular::initialize(const DDNumericArguments & nArgs,
   startCopyNo = int (nArgs["startCopyNo"]);
   incrCopyNo  = int (nArgs["incrCopyNo"]);
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("MuonGeom") << "DDGEMAngular debug: Parameters for positioning-- "
-			   << n << " copies in steps of " << convertRadToDeg( stepAngle )
-			   << " from " << convertRadToDeg( startAngle )
-			   << " (inversion flag " << invert << ") \trPos " << rPos
-			   << " Zoffest " << zoffset << "\tStart and inremental "
-			   << "copy nos " << startCopyNo << ", " << incrCopyNo;
+  edm::LogVerbatim("MuonGeom") 
+    << "DDGEMAngular: Parameters for positioning-- " << n 
+    << " copies in steps of " << convertRadToDeg( stepAngle )
+    << " from " << convertRadToDeg( startAngle )
+    << " (inversion flag " << invert << ") \trPos " << rPos
+    << " Zoffest " << zoffset << "\tStart and inremental "
+    << "copy nos " << startCopyNo << ", " << incrCopyNo;
 #endif
 
   rotns       = sArgs["RotNameSpace"];
   idNameSpace = DDCurrentNamespace::ns();
   childName   = sArgs["ChildName"]; 
 #ifdef EDM_ML_DEBUG
-  DDName parentName = parent().name(); 
-  edm::LogInfo("MuonGeom") << "DDGEMAngular debug: Parent " << parentName 
-			   << "\tChild " << childName << "\tNameSpace "
-			   << idNameSpace << "\tRotation Namespace " << rotns;
+  edm::LogVerbatim("MuonGeom") 
+    << "DDGEMAngular: Parent " << parent().name() << "\tChild " << childName 
+    << "\tNameSpace " << idNameSpace << "\tRotation Namespace " << rotns;
 #endif
 }
 
@@ -81,10 +80,12 @@ void DDGEMAngular::execute(DDCompactView& cpv) {
       double thetay = invert==0 ? 0.0 : 180.0_deg;
       double phiz   = phitmp;
 #ifdef EDM_ML_DEBUG
-      edm::LogInfo("MuonGeom") << "DDGEMAngular test: Creating a new rotation "
-			       << DDName(rotstr, idNameSpace) << "\t " 
-			       << convertRadToDeg( thetax ) << ", " << convertRadToDeg(  phix ) << ", " << convertRadToDeg(  thetay )
-			       << ", 0, " << convertRadToDeg( thetax )<< ", " << convertRadToDeg(  phiz );
+      edm::LogVerbatim("MuonGeom") 
+	<< "DDGEMAngular: Creating a new rotation "
+	<< DDName(rotstr, idNameSpace) << "\t " 
+	<< convertRadToDeg( thetax ) << ", " << convertRadToDeg(  phix ) <<", "
+	<< convertRadToDeg(  thetay ) << ", 0, " << convertRadToDeg( thetax )
+	<< ", " << convertRadToDeg(  phiz );
 #endif
       rotation = DDrot(DDName(rotstr, rotns), thetax, phix, thetay, 0., thetax, phiz);
     } 
@@ -94,11 +95,10 @@ void DDGEMAngular::execute(DDCompactView& cpv) {
     DDName parentName = parent().name(); 
     cpv.position(DDName(childName,idNameSpace), parentName, copyNo, tran, rotation);
 #ifdef EDM_ML_DEBUG
-    edm::LogInfo("MuonGeom") << "DDGEMAngular test: " 
-			     << DDName(childName, idNameSpace) << " number " 
-			     << copyNo << " positioned in " << parentName 
-			     << " at " << tran << " with " << rotstr << " "
-			     << rotation;
+    edm::LogVerbatim("MuonGeom") 
+      << "DDGEMAngular: " << DDName(childName, idNameSpace) << " number " 
+      << copyNo << " positioned in " << parentName 
+      << " at " << tran << " with " << rotstr << " " << rotation;
 #endif
     phi    += stepAngle;
     copyNo += incrCopyNo;
diff --git a/Geometry/MuonCommonData/plugins/DDMuonAngular.cc b/Geometry/MuonCommonData/plugins/DDMuonAngular.cc
index 83c33aa8d5ad5..e126c02b0b054 100644
--- a/Geometry/MuonCommonData/plugins/DDMuonAngular.cc
+++ b/Geometry/MuonCommonData/plugins/DDMuonAngular.cc
@@ -12,14 +12,13 @@
 #include "DataFormats/Math/interface/GeantUnits.h"
 #include "Geometry/MuonCommonData/plugins/DDMuonAngular.h"
 
-using namespace geant_units;
 using namespace geant_units::operators;
 
 //#define EDM_ML_DEBUG
 
 DDMuonAngular::DDMuonAngular() {
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("MuonGeom") << "DDMuonAngular test: Creating an instance";
+  edm::LogVerbatim("MuonGeom") << "DDMuonAngular: Creating an instance";
 #endif
 }
 
@@ -38,20 +37,21 @@ void DDMuonAngular::initialize(const DDNumericArguments & nArgs,
   startCopyNo = int (nArgs["startCopyNo"]);
   incrCopyNo  = int (nArgs["incrCopyNo"]);
 #ifdef EDM_ML_DEBUG
-  edm::LogInfo("MuonGeom") << "DDMuonAngular debug: Parameters for positioning-- "
-			   << n << " copies in steps of " << convertRadToDeg( stepAngle )
-			   << " from " << convertRadToDeg( startAngle ) << " \tZoffest "
-			   << zoffset << "\tStart and inremental copy nos " 
-			   << startCopyNo << ", " << incrCopyNo;
+  edm::LogVerbatim("MuonGeom") 
+    << "DDMuonAngular: Parameters for positioning-- "  << n 
+    << " copies in steps of " << convertRadToDeg( stepAngle )
+    << " from " << convertRadToDeg( startAngle ) << " \tZoffest "
+    << zoffset << "\tStart and inremental copy nos " 
+    << startCopyNo << ", " << incrCopyNo;
 #endif
   rotns       = sArgs["RotNameSpace"];
   idNameSpace = DDCurrentNamespace::ns();
   childName   = sArgs["ChildName"]; 
 #ifdef EDM_ML_DEBUG
-  DDName parentName = parent().name(); 
-  edm::LogInfo("MuonGeom") << "DDMuonAngular debug: Parent " << parentName 
-			   << "\tChild " << childName << "\tNameSpace "
-			   << idNameSpace << "\tRotation Namespace " << rotns;
+  edm::LogVerbatim("MuonGeom") 
+    << "DDMuonAngular debug: Parent " << parent().name()
+    << "\tChild " << childName << "\tNameSpace "
+    << idNameSpace << "\tRotation Namespace " << rotns;
 #endif
 }
 
@@ -68,14 +68,15 @@ void DDMuonAngular::execute(DDCompactView& cpv) {
     std::string rotstr("NULL");
 
     if (std::abs(phitmp) >= 1.0_deg) {
-      rotstr = "R"; 
-      rotstr  += formatAsDegrees(phitmp);
+      rotstr = "R" + formatAsDegrees(phitmp);
       rotation = DDRotation(DDName(rotstr, rotns)); 
       if (!rotation) {
 #ifdef EDM_ML_DEBUG
-        edm::LogInfo("MuonGeom") << "DDMuonAngular test: Creating a new rotation "
-				 << DDName(rotstr, idNameSpace) << "\t90, " 
-				 << convertRadToDeg( phitmp ) << ", 90, " << convertRadToDeg( phitmp + 90._deg ) << ", 0, 0";
+        edm::LogVerbatim("MuonGeom") 
+	  << "DDMuonAngular: Creating a new rotation "
+	  << DDName(rotstr, idNameSpace) << "\t90, " 
+	  << convertRadToDeg( phitmp ) << ", 90, "
+	  << convertRadToDeg( phitmp + 90._deg ) << ", 0, 0";
 #endif
         rotation = DDrot(DDName(rotstr, rotns), 90._deg, phitmp, 90._deg, 90._deg + phitmp, 0., 0.);
       } 
@@ -86,11 +87,10 @@ void DDMuonAngular::execute(DDCompactView& cpv) {
     DDName parentName = parent().name(); 
     cpv.position(DDName(childName,idNameSpace), parentName, copyNo, tran, rotation);
 #ifdef EDM_ML_DEBUG
-    edm::LogInfo("MuonGeom") << "DDMuonAngular test: " 
-			     << DDName(childName, idNameSpace) << " number " 
-			     << copyNo << " positioned in " << parentName 
-			     << " at " << tran << " with " << rotstr << " " 
-			     << rotation;
+    edm::LogVerbatim("MuonGeom") 
+      << "DDMuonAngular: " << DDName(childName, idNameSpace) << " number " 
+      << copyNo << " positioned in " << parentName 
+      << " at " << tran << " with " << rotstr << " " << rotation;
 #endif
     phi    += stepAngle;
     copyNo += incrCopyNo;
diff --git a/Geometry/MuonCommonData/python/testMFXML_cfi.py b/Geometry/MuonCommonData/python/testMFXML_cfi.py
index 35b67bb28a2aa..4d8b6c9f5dbbd 100644
--- a/Geometry/MuonCommonData/python/testMFXML_cfi.py
+++ b/Geometry/MuonCommonData/python/testMFXML_cfi.py
@@ -26,20 +26,25 @@
         'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
         'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
         'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixbar.xml',
         'Geometry/TrackerCommonData/data/trackermaterial.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/tracker.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixel.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerbar.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerfwd.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/trackerStructureTopology.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4026/pixelStructureTopology.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackersens.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelsens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4026/trackerRecoMaterial.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/trackerProdCuts.xml',
-        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4026/pixelProdCuts.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/tracker.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixel.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/trackerStructureTopology.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker4025/pixelStructureTopology.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/trackersens.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelsens.xml',
+        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4025/trackerRecoMaterial.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/trackerProdCuts.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelProdCuts.xml',
+        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelsens.xml',
+        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker4025/trackerRecoMaterial.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/trackerProdCuts.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker4025/pixelProdCuts.xml',
         'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
         'Geometry/EcalCommonData/data/ectkcable.xml',
         'Geometry/EcalCommonData/data/PhaseII/eregalgo.xml',
diff --git a/Geometry/MuonCommonData/test/runME_cfg.py b/Geometry/MuonCommonData/test/runME_cfg.py
index d5ea28372430c..5172de6173055 100644
--- a/Geometry/MuonCommonData/test/runME_cfg.py
+++ b/Geometry/MuonCommonData/test/runME_cfg.py
@@ -10,6 +10,8 @@
 process.load("Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi")
 process.load("Geometry.HcalCommonData.hcalParameters_cfi")
 process.load("Geometry.HcalCommonData.hcalDDDSimConstants_cfi")
+process.load("Geometry.HGCalCommonData.hgcalParametersInitialization_cfi")
+process.load("Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi")
 
 process.load('Configuration.StandardSequences.Generator_cff')
 process.load('Configuration.StandardSequences.SimIdeal_cff')
@@ -19,21 +21,11 @@
 from Configuration.AlCa.autoCond import autoCond
 process.GlobalTag.globaltag = autoCond['run1_mc']
 
-process.MessageLogger = cms.Service("MessageLogger",
-    destinations = cms.untracked.vstring('cout'),
-    categories = cms.untracked.vstring('G4cout', 'G4cerr'),
-    cout = cms.untracked.PSet(
-        default = cms.untracked.PSet(
-            limit = cms.untracked.int32(0)
-        ),
-        G4cout = cms.untracked.PSet(
-            limit = cms.untracked.int32(-1)
-        ),
-        G4cerr = cms.untracked.PSet(
-            limit = cms.untracked.int32(-1)
-        )
-    )
-)
+process.load('FWCore.MessageService.MessageLogger_cfi')
+if 'MessageLogger' in process.__dict__:
+    process.MessageLogger.categories.append('G4cerr')
+    process.MessageLogger.categories.append('G4cout')
+    process.MessageLogger.categories.append('MuonGeom')
 
 process.load("IOMC.RandomEngine.IOMC_cff")
 process.RandomNumberGeneratorService.generator.initialSeed = 456789
diff --git a/Geometry/MuonNumbering/plugins/DDTestMuonNumbering.cc b/Geometry/MuonNumbering/plugins/DDTestMuonNumbering.cc
index 1f317d5e4deb4..bd7b6d07a8a50 100644
--- a/Geometry/MuonNumbering/plugins/DDTestMuonNumbering.cc
+++ b/Geometry/MuonNumbering/plugins/DDTestMuonNumbering.cc
@@ -6,30 +6,24 @@
 #include "Geometry/Records/interface/MuonNumberingRecord.h"
 #include "Geometry/MuonNumbering/interface/DD4hep_MuonNumbering.h"
 
-#include <iostream>
-
-using namespace std;
-using namespace cms;
-using namespace edm;
-
-class DDTestMuonNumbering : public one::EDAnalyzer<> {
+class DDTestMuonNumbering : public edm::one::EDAnalyzer<> {
 public:
-  explicit DDTestMuonNumbering(const ParameterSet&){}
+  explicit DDTestMuonNumbering(const edm::ParameterSet&){}
 
   void beginJob() override {}
-  void analyze(Event const& iEvent, EventSetup const&) override;
+  void analyze(edm::Event const& iEvent, edm::EventSetup const&) override;
   void endJob() override {}
 };
 
 void
-DDTestMuonNumbering::analyze(const Event&, const EventSetup& iEventSetup)
+DDTestMuonNumbering::analyze(const edm::Event&, const edm::EventSetup& iEventSetup)
 {
-  LogVerbatim("Geometry") << "DDTestMuonNumbering::analyze";
-  ESTransientHandle<MuonNumbering> numbering;
+  edm::LogVerbatim("Geometry") << "DDTestMuonNumbering::analyze";
+  edm::ESTransientHandle<cms::MuonNumbering> numbering;
   iEventSetup.get<MuonNumberingRecord>().get(numbering);
 
-  LogVerbatim("Geometry") << "MuonNumbering size: " << numbering->values().size();
-  LogVerbatim("Geometry").log([&numbering](auto& log) {
+  edm::LogVerbatim("Geometry") << "MuonNumbering size: " << numbering->values().size();
+  edm::LogVerbatim("Geometry").log([&numbering](auto& log) {
       for(const auto& i: numbering->values()) {
 	log << " " << i.first << " = " << i.second;
 	log << '\n';
diff --git a/Geometry/MuonNumbering/plugins/MuonNumberingESProducer.cc b/Geometry/MuonNumbering/plugins/MuonNumberingESProducer.cc
index 2d4f073c32c90..da4f6f5d1b0d6 100644
--- a/Geometry/MuonNumbering/plugins/MuonNumberingESProducer.cc
+++ b/Geometry/MuonNumbering/plugins/MuonNumberingESProducer.cc
@@ -17,7 +17,6 @@
 //
 
 #include <memory>
-#include <iostream>
 
 #include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
@@ -28,25 +27,21 @@
 #include "Geometry/Records/interface/DDSpecParRegistryRcd.h"
 #include "DetectorDescription/DDCMS/interface/DDSpecParRegistry.h"
 
-using namespace std;
-using namespace cms;
-using namespace edm;
-
-class MuonNumberingESProducer : public ESProducer {
+class MuonNumberingESProducer : public edm::ESProducer {
 public:
-  MuonNumberingESProducer(const ParameterSet&);
+  MuonNumberingESProducer(const edm::ParameterSet&);
   ~MuonNumberingESProducer() override;
   
-  using ReturnType = unique_ptr<MuonNumbering>;
+  using ReturnType = std::unique_ptr<cms::MuonNumbering>;
   
   ReturnType produce(const MuonNumberingRecord&);
 
 private:
-  const string m_label;
-  const string m_key;
+  const std::string m_label;
+  const std::string m_key;
 };
 
-MuonNumberingESProducer::MuonNumberingESProducer(const ParameterSet& iConfig)
+MuonNumberingESProducer::MuonNumberingESProducer(const edm::ParameterSet& iConfig)
   : m_label(iConfig.getParameter<std::string>("label")),
     m_key(iConfig.getParameter<std::string>("key"))
 
@@ -61,9 +56,9 @@ MuonNumberingESProducer::ReturnType
 MuonNumberingESProducer::produce(const MuonNumberingRecord& iRecord)
 {
   LogDebug("Geometry") << "MuonNumberingESProducer::produce from " << m_label << " with " << m_key;
-  auto product = make_unique<MuonNumbering>();
+  auto product = std::make_unique<cms::MuonNumbering>();
 
-  ESHandle<DDSpecParRegistry> registry;
+  edm::ESHandle<cms::DDSpecParRegistry> registry;
   iRecord.getRecord<DDSpecParRegistryRcd>().get(m_label, registry);
   auto it = registry->specpars.find(m_key);
   if(it != end(registry->specpars)) {
diff --git a/Geometry/MuonNumbering/src/CSCNumberingScheme.cc b/Geometry/MuonNumbering/src/CSCNumberingScheme.cc
index d5e8517496394..701a728fe24aa 100644
--- a/Geometry/MuonNumbering/src/CSCNumberingScheme.cc
+++ b/Geometry/MuonNumbering/src/CSCNumberingScheme.cc
@@ -4,8 +4,6 @@
 #include "Geometry/MuonNumbering/interface/MuonDDDConstants.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include <iostream>
-
 //#define LOCAL_DEBUG
 
 CSCNumberingScheme::CSCNumberingScheme( const MuonDDDConstants& muonConstants ) {
@@ -27,23 +25,24 @@ void CSCNumberingScheme::initMe (  const MuonDDDConstants& muonConstants ) {
   theRingLevel=muonConstants.getValue("me_ring")/theLevelPart;
   theLayerLevel=muonConstants.getValue("me_layer")/theLevelPart;
 #ifdef LOCAL_DEBUG
-  std::cout << "Initialize CSCNumberingScheme" << std::endl;
-  std::cout << "theRegionLevel " << theRegionLevel <<std::endl;
-  std::cout << "theStationLevel " << theStationLevel <<std::endl;
-  std::cout << "theSubringLevel " << theSubringLevel <<std::endl;
-  std::cout << "theSectorLevel " << theSectorLevel <<std::endl;
-  std::cout << "theRingLevel " << theRingLevel <<std::endl;
-  std::cout << "theLayerLevel " << theLayerLevel <<std::endl;
+  edm::LogVerbatim("CSCNumbering") 
+    << "Initialize CSCNumberingScheme" 
+    << "\ntheRegionLevel " << theRegionLevel
+    << "\ntheStationLevel " << theStationLevel
+    << "\ntheSubringLevel " << theSubringLevel
+    << "\ntheSectorLevel " << theSectorLevel
+    << "\ntheRingLevel " << theRingLevel
+    << "\ntheLayerLevel " << theLayerLevel;
 #endif
 }
 
 int CSCNumberingScheme::baseNumberToUnitNumber(const MuonBaseNumber& num){
 
 #ifdef LOCAL_DEBUG
-  std::cout << "CSCNumbering "<<num.getLevels()<<std::endl;
+  edm::LogVerbatim("CSCNumbering") << "CSCNumbering " << num.getLevels();
   for (int level=1;level<=num.getLevels();level++) {
-    std::cout << level << " " << num.getSuperNo(level)
-	 << " " << num.getBaseNo(level) << std::endl;
+    edm::LogVerbatim("CSCNumbering") 
+      << level << " " << num.getSuperNo(level) << " " << num.getBaseNo(level);
   }
 #endif
 
@@ -121,30 +120,25 @@ int CSCNumberingScheme::baseNumberToUnitNumber(const MuonBaseNumber& num){
   // find appropriate chamber label
     
    int chamber_id=chamberIndex(station_id, ring_id,
-			      subring_id, sector_id);
+			       subring_id, sector_id);
     
   // convert into raw id of appropriate DetId
     
   int intIndex=CSCDetId::rawIdMaker(fwbw_id, station_id, ring_id,
-		     chamber_id, layer_id);
+				    chamber_id, layer_id);
 
 #ifdef LOCAL_DEBUG
-  std::cout << "CSCNumberingScheme : ";
-  std::cout << " fw/bw " <<  fwbw_id;
-  std::cout << " station " <<  station_id;
-  std::cout << " ring " <<  ring_id;
-  std::cout << " subring " <<  subring_id;
-  std::cout << " chamber " <<  chamber_id;
-  std::cout << " sector " <<  sector_id;
-  std::cout << " layer " <<  layer_id;
-  std::cout << std::endl;
+  edm::LogVerbatim("CSCNumbering") 
+    << "CSCNumberingScheme :  fw/bw " <<  fwbw_id << " station " <<  station_id
+    << " ring " <<  ring_id << " subring " <<  subring_id << " chamber " 
+    <<  chamber_id << " sector " <<  sector_id << " layer " <<  layer_id;
 #endif
 
   return intIndex;
 }
 
-int CSCNumberingScheme::chamberIndex(int station_id,  
-           int ring_id, int subring_id, int sector_id) const {
+int CSCNumberingScheme::chamberIndex(int station_id,  int ring_id, int subring_id,
+				     int sector_id) const {
 
   int chamber_id=0;
 
diff --git a/Geometry/MuonNumbering/src/DD4hep_MuonNumbering.cc b/Geometry/MuonNumbering/src/DD4hep_MuonNumbering.cc
index cba1f8ddbf064..9e547b63865ca 100644
--- a/Geometry/MuonNumbering/src/DD4hep_MuonNumbering.cc
+++ b/Geometry/MuonNumbering/src/DD4hep_MuonNumbering.cc
@@ -2,10 +2,7 @@
 #include "Geometry/MuonNumbering/interface/MuonBaseNumber.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include <iostream>
-
 using namespace cms;
-using namespace std;
 using namespace edm;
 
 const MuonBaseNumber
@@ -19,20 +16,20 @@ MuonNumbering::geoHistoryToBaseNumber(const cms::ExpandedNodes &nodes) const {
 
   // some consistency checks
   if(basePart != 1) {
-    LogError("Geometry") << "MuonNumbering finds unusual base constant:"
-			 << basePart;
+    edm::LogError("Geometry") << "MuonNumbering finds unusual base constant:"
+			      << basePart;
   }
   if(superPart < 100) {
-    LogError("Geometry") << "MuonNumbering finds unusual super constant:"
-			 << superPart;
+    edm::LogError("Geometry") << "MuonNumbering finds unusual super constant:"
+			      << superPart;
   }
   if(levelPart < 10*superPart) {
-    LogError("Geometry") << "MuonNumbering finds unusual level constant:"
-			 << levelPart;
+    edm::LogError("Geometry") << "MuonNumbering finds unusual level constant:"
+			      << levelPart;
   }
   if((startCopyNo !=0 ) && (startCopyNo != 1)) {
-    LogError("Geometry") << "MuonNumbering finds unusual start value for copy numbers:"
-			 << startCopyNo;
+    edm::LogError("Geometry") << "MuonNumbering finds unusual start value for copy numbers:"
+			      << startCopyNo;
   }
   int ctr(0);
   for(auto const& it : nodes.tags) {
@@ -58,7 +55,7 @@ MuonNumbering::get(const char* key) const {
 }
 
 void
-MuonNumbering::put(string_view str, int num) {
+MuonNumbering::put(std::string_view str, int num) {
   values_.emplace(str, num);
 }
 
diff --git a/Geometry/MuonNumbering/src/DTNumberingScheme.cc b/Geometry/MuonNumbering/src/DTNumberingScheme.cc
index f6ac1573251d7..0a034e251248f 100644
--- a/Geometry/MuonNumbering/src/DTNumberingScheme.cc
+++ b/Geometry/MuonNumbering/src/DTNumberingScheme.cc
@@ -2,7 +2,7 @@
 #include "DataFormats/MuonDetId/interface/DTWireId.h"
 #include "Geometry/MuonNumbering/interface/MuonBaseNumber.h"
 #include "Geometry/MuonNumbering/interface/MuonDDDConstants.h"
-#include <iostream>
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 //#define LOCAL_DEBUG
 
@@ -24,13 +24,14 @@ void DTNumberingScheme::initMe ( const MuonDDDConstants& muonConstants ) {
   theLayerLevel=muonConstants.getValue("mb_layer")/theLevelPart;
   theWireLevel=muonConstants.getValue("mb_wire")/theLevelPart;
 #ifdef LOCAL_DEBUG
-  std::cout << "Initialize DTNumberingScheme" << std::endl;
-  std::cout << "theRegionLevel " << theRegionLevel <<std::endl;
-  std::cout << "theWheelLevel " << theWheelLevel <<std::endl;
-  std::cout << "theStationLevel " << theStationLevel <<std::endl;
-  std::cout << "theSuperLayerLevel " << theSuperLayerLevel <<std::endl;
-  std::cout << "theLayerLevel " << theLayerLevel <<std::endl;
-  std::cout << "theWireLevel " << theWireLevel <<std::endl;
+  edm::LogVerbatim("DTNumberingScheme") 
+    << "Initialize DTNumberingScheme"
+    << "\ntheRegionLevel " << theRegionLevel
+    << "\ntheWheelLevel " << theWheelLevel
+    << "\ntheStationLevel " << theStationLevel
+    << "\ntheSuperLayerLevel " << theSuperLayerLevel
+    << "\ntheLayerLevel " << theLayerLevel
+    << "\ntheWireLevel " << theWireLevel;
 #endif
 
 }
@@ -38,16 +39,16 @@ void DTNumberingScheme::initMe ( const MuonDDDConstants& muonConstants ) {
 int DTNumberingScheme::baseNumberToUnitNumber(const MuonBaseNumber& num){
   
 #ifdef LOCAL_DEBUG
-  std::cout << "DTNumbering "<<num.getLevels()<<std::endl;
+  edm::LogVerbatim("DTNumberingScheme") << "DTNumbering " << num.getLevels();
   for (int level=1;level<=num.getLevels();level++) {
-    std::cout << level << " " << num.getSuperNo(level)
-	      << " " << num.getBaseNo(level) << std::endl;
+    edm::LogVerbatim("DTNumberingScheme") 
+      << level << " " << num.getSuperNo(level) << " " << num.getBaseNo(level);
   }
 #endif
   if (num.getLevels()!=theWireLevel) {
-    std::cout << "DTNS::BNToUN "
-	      << "BaseNumber has " << num.getLevels() << " levels,"
-	      << "need "<<theWireLevel<<std::endl;
+    edm::LogWarning("DTNumberingScheme") 
+      << "DTNumberingScheme::BNToUN: BaseNumber has " << num.getLevels() 
+      << " levels, need "<< theWireLevel;
     return 0;
   }
   
@@ -117,7 +118,7 @@ int DTNumberingScheme::getDetId(const MuonBaseNumber& num) const {
   DTWireId id(wheel_id,station_id,sector_id,superlayer_id,layer_id,wire_id);
   
 #ifdef LOCAL_DEBUG
-  std::cout << "DTNumberingScheme: " << id << std::endl;
+  edm::LogVerbatim("DTNumberingScheme") << "DTNumberingScheme: " << id;
 #endif
   
   return id.rawId();
diff --git a/Geometry/MuonNumbering/src/GEMNumberingScheme.cc b/Geometry/MuonNumbering/src/GEMNumberingScheme.cc
index bd3225c5dc80c..fe2a7ef55394c 100644
--- a/Geometry/MuonNumbering/src/GEMNumberingScheme.cc
+++ b/Geometry/MuonNumbering/src/GEMNumberingScheme.cc
@@ -2,7 +2,7 @@
 #include "Geometry/MuonNumbering/interface/MuonBaseNumber.h"
 #include "Geometry/MuonNumbering/interface/MuonDDDConstants.h"
 #include "DataFormats/MuonDetId/interface/GEMDetId.h"
-#include <iostream>
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 //#define LOCAL_DEBUG
 
@@ -23,30 +23,31 @@ void GEMNumberingScheme::initMe ( const MuonDDDConstants& muonConstants ) {
   theSectorLevel  = muonConstants.getValue("mg_sector")/theLevelPart;
   theRollLevel    = muonConstants.getValue("mg_roll")/theLevelPart;
 #ifdef LOCAL_DEBUG
-  std::cout << "Initialize GEMNumberingScheme" <<std::endl;
-  std::cout << "theRegionLevel " << theRegionLevel <<std::endl;
-  std::cout << "theStationLevel "<< theStationLevel<<std::endl;
-  std::cout << "theRingLevel "   << theRingLevel   <<std::endl;
-  std::cout << "theSectorLevel " << theSectorLevel <<std::endl;
-  std::cout << "theRollLevel "   << theRollLevel   <<std::endl;
+  edm::LogVerbatim("GEMNumberingScheme") 
+    << "Initialize GEMNumberingScheme" 
+    << "\ntheRegionLevel " << theRegionLevel 
+    << "\ntheStationLevel "<< theStationLevel
+    << "\ntheRingLevel "   << theRingLevel   
+    << "\ntheSectorLevel " << theSectorLevel 
+    << "\ntheRollLevel "   << theRollLevel;
 #endif
 }
 
 int GEMNumberingScheme::baseNumberToUnitNumber(const MuonBaseNumber& num) {
 
 #ifdef LOCAL_DEBUG
-  std::cout << "GEMNumbering "<<num.getLevels()<<std::endl;
+  edm::LogVerbatim("GEMNumberingScheme") << "GEMNumbering " << num.getLevels();
   for (int level=1;level<=num.getLevels();level++) {
-    std::cout << level << " " << num.getSuperNo(level)
-	      << " " << num.getBaseNo(level) << std::endl;
+    edm::LogVerbatim("GEMNumberingScheme") 
+      << level << " " << num.getSuperNo(level) << " " << num.getBaseNo(level);
   }
 #endif
 
   int maxLevel = theRollLevel;
   if (num.getLevels()!=maxLevel) {
-    std::cout << "MuonGEMNS::BNToUN "
-	      << "BaseNumber has " << num.getLevels() << " levels,"
-	      << "need "<<maxLevel<<std::endl;
+    edm::LogWarning("GEMNumberingScheme") 
+      << "MuonGEMNumberingScheme::BNToUN: BaseNumber has " << num.getLevels() 
+      << " levels, need " << maxLevel;
     return 0;
   }
 
@@ -66,8 +67,9 @@ int GEMNumberingScheme::baseNumberToUnitNumber(const MuonBaseNumber& num) {
   ring = 1;
   station = num.getSuperNo(theStationLevel);
 #ifdef LOCAL_DEBUG
-  std::cout << "GEMNumbering: Ring " << ring << " Station " 
-	    << num.getSuperNo(theStationLevel) << ":" << station << std::endl;
+  edm::LogVerbatim("GEMNumberingScheme") 
+    << "GEMNumbering: Ring " << ring << " Station "
+    << num.getSuperNo(theStationLevel) << ":" << station;
 #endif
   
   roll    = num.getBaseNo(theRollLevel)+1;
@@ -94,9 +96,10 @@ int GEMNumberingScheme::baseNumberToUnitNumber(const MuonBaseNumber& num) {
   // collect all info
   
 #ifdef LOCAL_DEBUG
-  std::cout << "GEMNumberingScheme: Region " << region << " Ring "
-	    << ring << " Station " << station << " Layer " << layer
-	    << " Chamber " << chamber << " Roll " << roll << std::endl;
+  edm::LogVerbatim("GEMNumberingScheme") 
+    << "GEMNumberingScheme: Region " << region << " Ring "
+    << ring << " Station " << station << " Layer " << layer
+    << " Chamber " << chamber << " Roll " << roll;
 #endif
 
   // Build the actual numbering
@@ -104,7 +107,7 @@ int GEMNumberingScheme::baseNumberToUnitNumber(const MuonBaseNumber& num) {
   
   
 #ifdef LOCAL_DEBUG
-  std::cout << id.rawId() << " DetId " << id << std::endl;
+  edm::LogVerbatim("GEMNumberingScheme") << id.rawId() << " DetId " << id;
 #endif
       
   return id.rawId();
diff --git a/Geometry/MuonNumbering/src/ME0NumberingScheme.cc b/Geometry/MuonNumbering/src/ME0NumberingScheme.cc
index d0aaf909226f1..bc9502429686e 100644
--- a/Geometry/MuonNumbering/src/ME0NumberingScheme.cc
+++ b/Geometry/MuonNumbering/src/ME0NumberingScheme.cc
@@ -5,8 +5,6 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-#include <iostream>
-
 //#define LOCAL_DEBUG
 
 ME0NumberingScheme::ME0NumberingScheme( const MuonDDDConstants& muonConstants ) {
@@ -27,56 +25,33 @@ void ME0NumberingScheme::initMe ( const MuonDDDConstants& muonConstants ) {
   theNEtaPart     = muonConstants.getValue("m0_nroll");
 
   // Debug using LOCAL_DEBUG
-  #ifdef LOCAL_DEBUG
-    std::cout << "Initialize ME0NumberingScheme" <<std::endl;
-    std::cout << "theRegionLevel " << theRegionLevel <<std::endl;
-    std::cout << "theLayerLevel "  << theLayerLevel   <<std::endl;
-    std::cout << "theSectorLevel " << theSectorLevel <<std::endl;
-    std::cout << "theRollLevel "   << theRollLevel   <<std::endl;
-    std::cout << "theNEtaPart  "   << theNEtaPart    <<std::endl;
-  #endif
+#ifdef LOCAL_DEBUG
+  edm::LogVerbatim("ME0NumberingScheme") 
+    << "Initialize ME0NumberingScheme" 
+    << "\ntheRegionLevel " << theRegionLevel
+    << "\ntheLayerLevel "  << theLayerLevel 
+    << "\ntheSectorLevel " << theSectorLevel
+    << "\ntheRollLevel "   << theRollLevel
+    << "\ntheNEtaPart  "   << theNEtaPart;
+#endif
   // -----------------------
-
-  // Debug using LogDebug
-  std::stringstream DebugStringStream;
-  DebugStringStream << "Initialize ME0NumberingScheme" <<std::endl;
-  DebugStringStream << "theRegionLevel " << theRegionLevel <<std::endl;
-  DebugStringStream << "theLayerLevel "  << theLayerLevel   <<std::endl;
-  DebugStringStream << "theSectorLevel " << theSectorLevel <<std::endl;
-  DebugStringStream << "theRollLevel "   << theRollLevel   <<std::endl;
-  DebugStringStream << "theNEtaPart  "   << theNEtaPart    <<std::endl;
-  std::string DebugString = DebugStringStream.str();
-  edm::LogVerbatim("ME0NumberingScheme")<<DebugString;
-  // --------------------
 }
 
 int ME0NumberingScheme::baseNumberToUnitNumber(const MuonBaseNumber& num) {
 
-    edm::LogVerbatim("ME0NumberingScheme")<<"ME0NumberingScheme::baseNumberToUnitNumber BEGIN "<<std::endl;
+    edm::LogVerbatim("ME0NumberingScheme")
+      << "ME0NumberingScheme::baseNumberToUnitNumber BEGIN ";
   // Debug using LOCAL_DEBUG
-  #ifdef LOCAL_DEBUG
-    std::cout << "ME0Numbering "<<num.getLevels()<<std::endl;
+#ifdef LOCAL_DEBUG
+    edm::LogVerbatim("ME0NumberingScheme") << "ME0Numbering "<< num.getLevels();
     for (int level=1;level<=num.getLevels();level++) {
-      std::cout << "level "<<level << " " << num.getSuperNo(level)
-  	      << " " << num.getBaseNo(level) << std::endl;
+      edm::LogVerbatim("ME0NumberingScheme") 
+	<< "level "<<level << " " << num.getSuperNo(level)
+	<< " " << num.getBaseNo(level);
     }
-  #endif
+#endif
   // -----------------------
 
-  // Debug using LogDebug
-  std::stringstream DebugStringStream;
-  DebugStringStream << "ME0Numbering :: number of levels = "<<num.getLevels()<<std::endl;
-  DebugStringStream << "Level \t SuperNo \t BaseNo"<<std::endl;
-  for (int level=1;level<=num.getLevels();level++) {
-    DebugStringStream <<level << " \t " << num.getSuperNo(level)
-		      << " \t " << num.getBaseNo(level) << std::endl;
-  }
-  std::string DebugString = DebugStringStream.str();
-  edm::LogVerbatim("ME0NumberingScheme")<<DebugString;
-  // -----------------------
-
-
-
   int maxLevel = theRollLevel;
   if (num.getLevels()!=maxLevel) {
     throw cms::Exception("MuonNumbering") << "MuonME0NS::BNToUN "
@@ -100,35 +75,21 @@ int ME0NumberingScheme::baseNumberToUnitNumber(const MuonBaseNumber& num) {
   // collect all info
   
   // Debug using LOCAL_DEBUG
-  #ifdef LOCAL_DEBUG
-    std::cout << "ME0NumberingScheme: Region " << region 
-	      << " Layer " << layer
-	      << " Chamber " << chamber << " Roll " << roll << std::endl;
-  #endif
+#ifdef LOCAL_DEBUG
+  edm::LogVerbatim("ME0NumberingScheme") 
+    << "ME0NumberingScheme: Region " << region << " Layer " << layer
+    << " Chamber " << chamber << " Roll " << roll;
+#endif
   // -----------------------
 
-  // Debug using LogDebug
-  edm::LogVerbatim("ME0NumberingScheme") << "ME0NumberingScheme: Region " << region 
-					 << " Layer " << layer
-					 << " Chamber " << chamber << " Roll " << roll << std::endl;
-  // -----------------------                                  
-
   // Build the actual numbering
   ME0DetId id(region,layer,chamber,roll);
   
   // Debug using LOCAL_DEBUG  
-  #ifdef LOCAL_DEBUG
-    std::cout << " DetId " << id << std::endl;
-  #endif
+#ifdef LOCAL_DEBUG
+  edm::LogVerbatim("ME0NumberingScheme") << " DetId " << id;
+#endif
   // ---------------------
     
-  // Debug using LogDebug
-  edm::LogVerbatim("ME0NumberingScheme")<< " DetId " << id << std::endl;
-  // -----------------------                                    
-    
   return id.rawId();
 }
-
-
-
-
diff --git a/Geometry/MuonNumbering/src/MuonBaseNumber.cc b/Geometry/MuonNumbering/src/MuonBaseNumber.cc
index 31b2f5cc6f9eb..4c8f76b05b8bd 100644
--- a/Geometry/MuonNumbering/src/MuonBaseNumber.cc
+++ b/Geometry/MuonNumbering/src/MuonBaseNumber.cc
@@ -1,6 +1,5 @@
 #include "Geometry/MuonNumbering/interface/MuonBaseNumber.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include <iostream>
 
 //#define LOCAL_DEBUG
 
@@ -13,14 +12,11 @@ void MuonBaseNumber::addBase(const LevelBaseNumber& num){
   while (cur!=end) {
     if (num.level()==(*cur).level()) {
 #ifdef LOCAL_DEBUG
-      std::cout << "MuonBaseNumber::addBase was asked to add "
-		<<num.level()<<" "
-		<<num.super()<<" "
-		<<num.base()
-		<<" to existing level "
-		<<(*cur).level()<<" "
-		<<(*cur).super()<<" "
-		<<(*cur).base() << " but refused.";
+      edm::LogVerbatim("Geometry") 
+	<< "MuonBaseNumber::addBase was asked to add " << num.level() << " "
+	<< num.super() << " " << num.base() << " to existing level "
+	<< (*cur).level() << " " << (*cur).super() << " " << (*cur).base() 
+	<< " but refused.";
 #endif
       return; // don't overwrite current volume stored
     }
@@ -37,15 +33,14 @@ void MuonBaseNumber::addBase(const LevelBaseNumber& num){
 #ifdef LOCAL_DEBUG
   cur=sortedBaseNumber.begin();
   end=sortedBaseNumber.end();
-  std::cout << "MuonBaseNumber::AddBase ";
+  edm::LogVerbatim("Geometry") << "MuonBaseNumber::AddBase ";
+  unsigned int k(0);
   while (cur!=end) {
-    std::cout<<(*cur).level()<<" ";
-    std::cout<<(*cur).super()<<" ";
-    std::cout<<(*cur).base();
-    std::cout<<",";
-    cur++;
+    edm::LogVerbatim("Geometry") 
+      << "[" << k << "] " << (*cur).level() << " "  << (*cur).super() << " "
+      << (*cur).base();
+    cur++; ++k;
   }
-  std::cout <<std::endl;
 #endif
 
 }
diff --git a/Geometry/MuonNumbering/src/MuonDDDConstants.cc b/Geometry/MuonNumbering/src/MuonDDDConstants.cc
index fa72fc292adad..4a0b6a8f76aa9 100644
--- a/Geometry/MuonNumbering/src/MuonDDDConstants.cc
+++ b/Geometry/MuonNumbering/src/MuonDDDConstants.cc
@@ -6,12 +6,12 @@
 #include "DetectorDescription/Core/interface/DDValue.h"
 #include "DetectorDescription/Core/interface/DDFilteredView.h"
 
-
 //#define LOCAL_DEBUG
 
 MuonDDDConstants::MuonDDDConstants( const DDCompactView& cpv ) {
 #ifdef LOCAL_DEBUG
-  std::cout << "MuonDDDConstants;:MuonDDDConstants ( const DDCompactView& cpv ) constructor " << std::endl;
+  edm::LogVerbatim("Geometry") 
+    << "MuonDDDConstants;:MuonDDDConstants ( const DDCompactView& cpv ) constructor ";
 #endif
   std::string attribute = "OnlyForMuonNumbering"; 
   
@@ -25,12 +25,13 @@ MuonDDDConstants::MuonDDDConstants( const DDCompactView& cpv ) {
   
   const DDsvalues_type mySpecs (fview.mergedSpecifics());
 #ifdef LOCAL_DEBUG
-  std::cout << "mySpecs.size() = " << mySpecs.size() << std::endl;
+  edm::LogVerbatim("Geometry") 
+    << "MuonDDDConstants::mySpecs.size() = " << mySpecs.size();
 #endif
   if ( mySpecs.size() < 25 ) {
-    edm::LogError("MuonDDDConstants") << " MuonDDDConstants: Missing SpecPars from DetectorDescription." << std::endl;
-    std::string msg = "MuonDDDConstants does not have the appropriate number of SpecPars associated";
-    msg+= " with the part //MUON.";
+    edm::LogError("MuonDDDConstants") 
+      << " MuonDDDConstants: Missing SpecPars from DetectorDescription.";
+    std::string msg = "MuonDDDConstants does not have the appropriate number of SpecPars associated with the part //MUON.";
     throw cms::Exception("GeometryBuildFailure", msg);
   }
 
@@ -40,7 +41,9 @@ MuonDDDConstants::MuonDDDConstants( const DDCompactView& cpv ) {
     if ( bit->second.isEvaluated() ) {
       this->addValue( bit->second.name(), int(bit->second.doubles()[0]) );
 #ifdef LOCAL_DEBUG
-      std::cout << "adding DDConstant of " << bit->second.name() << " = " << int(bit->second.doubles()[0]) << std::endl;
+      edm::LogVerbatim("Geometry") 
+	<< "MuonDDDConstants::adding DDConstant of " << bit->second.name() 
+	<< " = " << int(bit->second.doubles()[0]);
 #endif
     }
   }  
@@ -48,21 +51,22 @@ MuonDDDConstants::MuonDDDConstants( const DDCompactView& cpv ) {
 
 int MuonDDDConstants::getValue( const std::string& name ) const {
 #ifdef LOCAL_DEBUG
-  std::cout << "about to look for ... " << name << std::endl;
+  edm::LogVerbatim("Geometry") << "about to look for ... " << name << std::endl;
 #endif
   if ( namesAndValues_.empty() ) {
-    std::cout << "MuonDDDConstants::getValue HAS NO VALUES!" << std::endl;
+    edm::LogWarning("Geometry") << "MuonDDDConstants::getValue HAS NO VALUES!";
     throw cms::Exception("GeometryBuildFailure", "MuonDDDConstants does not have requested value for " + name);
   }
 
   std::map<std::string, int>::const_iterator findIt = namesAndValues_.find(name);
 
   if ( findIt == namesAndValues_.end() ) {
-    std::cout << "MuonDDDConstants::getValue was asked for " << name << " and had NO clue!" << std::endl;
+    edm::LogWarning("Geometry") << "MuonDDDConstants::getValue was asked for " << name << " and had NO clue!";
     throw cms::Exception("GeometryBuildFailure", "MuonDDDConstants does not have requested value for " + name);
   }
 #ifdef LOCAL_DEBUG
-  std::cout << "Value for " << name << " is " << findIt->second << std::endl;
+  edm::LogVerbatim("Geometry") 
+    << "MuonDDDConstants::Value for " << name << " is " << findIt->second;
 #endif
   return findIt->second;
 }
diff --git a/Geometry/MuonNumbering/src/MuonDDDNumbering.cc b/Geometry/MuonNumbering/src/MuonDDDNumbering.cc
index fec9b5d85c834..18631b6939814 100644
--- a/Geometry/MuonNumbering/src/MuonDDDNumbering.cc
+++ b/Geometry/MuonNumbering/src/MuonDDDNumbering.cc
@@ -1,8 +1,7 @@
 #include "Geometry/MuonNumbering/interface/MuonDDDNumbering.h"
 #include "Geometry/MuonNumbering/interface/MuonBaseNumber.h"
 #include "Geometry/MuonNumbering/interface/MuonDDDConstants.h"
-
-#include <iostream>
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 //#define LOCAL_DEBUG
 
@@ -16,28 +15,28 @@ MuonDDDNumbering::MuonDDDNumbering( const MuonDDDConstants& muonConstants ){
   // some consistency checks
 
   if (theBasePart!=1) {
-    std::cout << "MuonDDDNumbering finds unusual base constant:"
-	 <<theBasePart<<std::endl;
+    edm::LogWarning("Geometry") 
+      << "MuonDDDNumbering finds unusual base constant:" << theBasePart;
   }
   if (theSuperPart<100) {
-    std::cout << "MuonDDDNumbering finds unusual super constant:"
-	 <<theSuperPart<<std::endl;
+    edm::LogWarning("Geometry") 
+      << "MuonDDDNumbering finds unusual super constant:" << theSuperPart;
   }
   if (theLevelPart<10*theSuperPart) {
-    std::cout << "MuonDDDNumbering finds unusual level constant:"
-	 <<theLevelPart<<std::endl;
+    edm::LogWarning("Geometry") 
+      << "MuonDDDNumbering finds unusual level constant:" << theLevelPart;
   }
   if ((theStartCopyNo!=0)&&(theStartCopyNo!=1)) {
-    std::cout << "MuonDDDNumbering finds unusual start value for copy numbers:"
-	 <<theStartCopyNo<<std::endl;
+    edm::LogWarning("Geometry") 
+      << "MuonDDDNumbering finds unusual start value for copy numbers:"
+      << theStartCopyNo;
   }
 
 #ifdef LOCAL_DEBUG
-  std::cout << "MuonDDDNumbering configured with"<<std::endl;
-  std::cout << "Level = "<<theLevelPart<<" ";
-  std::cout << "Super = "<<theSuperPart<<" ";
-  std::cout << "Base = "<<theBasePart<<" ";
-  std::cout << "StartCopyNo = "<<theStartCopyNo<<std::endl;
+  edm::LogVerbatim("Geometry")
+    << "MuonDDDNumbering configured with"
+    << " Level = " << theLevelPart << " Super = " << theSuperPart
+    << " Base = " << theBasePart << " StartCopyNo = " << theStartCopyNo;
 #endif
 
 }
@@ -46,8 +45,8 @@ MuonBaseNumber MuonDDDNumbering::geoHistoryToBaseNumber(const DDGeoHistory & his
   MuonBaseNumber num;
 
 #ifdef LOCAL_DEBUG
-  std::cout << "MuonDDDNumbering create MuonBaseNumber for"<<std::endl;
-  std::cout << history <<std::endl;
+  edm::LogVerbatim("Geometry") 
+    << "MuonDDDNumbering create MuonBaseNumber for " << history;
 #endif
 
   //loop over all parents and check
@@ -66,9 +65,10 @@ MuonBaseNumber MuonDDDNumbering::geoHistoryToBaseNumber(const DDGeoHistory & his
   }
 
 #ifdef LOCAL_DEBUG
-  std::cout << num.getLevels() <<std::endl;
+  edm::LogVerbatim("Geometry") << "MuonDDDNumbering::" <<  num.getLevels();
   for (int i=1;i<=num.getLevels();i++) {
-    std::cout << num.getSuperNo(i)<<" "<<num.getBaseNo(i)<<std::endl;
+    edm::LogVerbatim("Geometry") 
+      << "[" << i << "] " << num.getSuperNo(i) << " " << num.getBaseNo(i);
   }
 #endif
  
@@ -91,7 +91,9 @@ int MuonDDDNumbering::getInt(const std::string & s, const DDLogicalPart & part)
       std::vector<double> temp = val.doubles();
       if (temp.size() != 1)
       {
-	std::cout << " ERROR: I need only 1 " << s << " in DDLogicalPart " << part.name() << std::endl;
+	edm::LogError("Geometry") 
+	  << "MuonDDDNumbering:: ERROR: I need only 1 " << s 
+	  << " in DDLogicalPart " << part.name();
 	 abort();
       }      
       return int(temp[0]);
diff --git a/Geometry/MuonNumbering/src/MuonNumberingScheme.cc b/Geometry/MuonNumbering/src/MuonNumberingScheme.cc
index 58e7027ee21bf..64665f39b1967 100644
--- a/Geometry/MuonNumbering/src/MuonNumberingScheme.cc
+++ b/Geometry/MuonNumbering/src/MuonNumberingScheme.cc
@@ -1,8 +1,6 @@
 #include "Geometry/MuonNumbering/interface/MuonNumberingScheme.h"
 #include "Geometry/MuonNumbering/interface/MuonBaseNumber.h"
 
-//#define LOCAL_DEBUG
-
 int MuonNumberingScheme::baseNumberToUnitNumber(const MuonBaseNumber&) {
   return 0;  
 }
diff --git a/Geometry/MuonNumbering/src/MuonSimHitNumberingScheme.cc b/Geometry/MuonNumbering/src/MuonSimHitNumberingScheme.cc
index ccb59ab2a9eea..4ed78a0b4aea7 100644
--- a/Geometry/MuonNumbering/src/MuonSimHitNumberingScheme.cc
+++ b/Geometry/MuonNumbering/src/MuonSimHitNumberingScheme.cc
@@ -8,8 +8,6 @@
 #include "Geometry/MuonNumbering/interface/MuonSubDetector.h"
 #include "Geometry/MuonNumbering/interface/MuonDDDConstants.h"
 
-//#define LOCAL_DEBUG
-
 MuonSimHitNumberingScheme::MuonSimHitNumberingScheme(MuonSubDetector* d, const DDCompactView& cpv) :
   MuonSimHitNumberingScheme(d,MuonDDDConstants(cpv)){ }
 
diff --git a/Geometry/MuonNumbering/src/MuonSubDetector.cc b/Geometry/MuonNumbering/src/MuonSubDetector.cc
index fe8769c355166..7255c336a305a 100644
--- a/Geometry/MuonNumbering/src/MuonSubDetector.cc
+++ b/Geometry/MuonNumbering/src/MuonSubDetector.cc
@@ -1,5 +1,5 @@
 #include "Geometry/MuonNumbering/interface/MuonSubDetector.h"
-#include <iostream>
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 
 MuonSubDetector::MuonSubDetector(const std::string& name) 
@@ -15,8 +15,8 @@ MuonSubDetector::MuonSubDetector(const std::string& name)
   } else if (name=="MuonME0Hits") {
     detector=me0;
   } else {
-    std::cout << "MuonSubDetector::MuonSubDetector does not recognize ";
-    std::cout << name <<std::endl;
+    edm::LogWarning("Geometry") 
+      << "MuonSubDetector::MuonSubDetector does not recognize " << name;
     detector=nodef;
   } 
 }
diff --git a/Geometry/MuonNumbering/src/RPCNumberingScheme.cc b/Geometry/MuonNumbering/src/RPCNumberingScheme.cc
index 8ed9df257b1e9..5c6d446c23486 100644
--- a/Geometry/MuonNumbering/src/RPCNumberingScheme.cc
+++ b/Geometry/MuonNumbering/src/RPCNumberingScheme.cc
@@ -2,7 +2,7 @@
 #include "Geometry/MuonNumbering/interface/MuonBaseNumber.h"
 #include "Geometry/MuonNumbering/interface/MuonDDDConstants.h"
 #include "DataFormats/MuonDetId/interface/RPCDetId.h"
-#include <iostream>
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 //#define LOCAL_DEBUG
 
@@ -26,24 +26,25 @@ void RPCNumberingScheme::initMe ( const MuonDDDConstants& muonConstants ) {
   theESectorLevel=muonConstants.getValue("mr_esector")/theLevelPart;
   theERollLevel=muonConstants.getValue("mr_eroll")/theLevelPart;
 #ifdef LOCAL_DEBUG
-  std::cout << "theRegionLevel " << theRegionLevel <<std::endl;
-  std::cout << "theBWheelLevel " << theBWheelLevel <<std::endl;
-  std::cout << "theBStationLevel " << theBStationLevel <<std::endl;
-  std::cout << "theBPlaneLevel " << theBPlaneLevel <<std::endl;
-  std::cout << "theBChamberLevel " << theBChamberLevel <<std::endl;
-  std::cout << "theEPlaneLevel " << theEPlaneLevel <<std::endl;
-  std::cout << "theESectorLevel " << theESectorLevel <<std::endl;
-  std::cout << "theERollLevel " << theERollLevel <<std::endl;
+  edm::LogVerbatim("RPCNumberingScheme") 
+    << "RPCNumberingScheme::theRegionLevel " << theRegionLevel
+    << "\ntheBWheelLevel " << theBWheelLevel
+    << "\ntheBStationLevel " << theBStationLevel
+    << "\ntheBPlaneLevel " << theBPlaneLevel
+    << "\ntheBChamberLevel " << theBChamberLevel
+    << "\ntheEPlaneLevel " << theEPlaneLevel
+    << "\ntheESectorLevel " << theESectorLevel
+    << "\ntheERollLevel " << theERollLevel;
 #endif
 }
 
 int RPCNumberingScheme::baseNumberToUnitNumber(const MuonBaseNumber& num) {
 
 #ifdef LOCAL_DEBUG
-  std::cout << "RPCNumbering "<<num.getLevels()<<std::endl;
+  edm::LogVerbatim("RPCNumberingScheme") << "RPCNumbering " << num.getLevels();
   for (int level=1;level<=num.getLevels();level++) {
-    std::cout << level << " " << num.getSuperNo(level)
-	 << " " << num.getBaseNo(level) << std::endl;
+    edm::LogVerbatim("RPCNumberingScheme") 
+      << level << " " << num.getSuperNo(level) << " " << num.getBaseNo(level);
   }
 #endif
 
@@ -57,9 +58,9 @@ int RPCNumberingScheme::baseNumberToUnitNumber(const MuonBaseNumber& num) {
   }
 
   if (num.getLevels()!=maxLevel) {
-    std::cout << "MuonRpcNS::BNToUN "
-	 << "BaseNumber has " << num.getLevels() << " levels,"
-	 << "need "<<maxLevel<<std::endl;
+    edm::LogWarning("RPCNumberingScheme")
+      << "RPCNumberingScheme::BNToUN: BaseNumber has " << num.getLevels() 
+      << " levels, need " << maxLevel;
     return 0;
   }
 
@@ -196,25 +197,21 @@ int RPCNumberingScheme::baseNumberToUnitNumber(const MuonBaseNumber& num) {
 
   // collect all info
   
-  int trIndex=(eta_id*10000+plane_id*1000+sector_id*10+copy_id)*10+
-    roll_id;
+  int trIndex=(eta_id*10000+plane_id*1000+sector_id*10+copy_id)*10+roll_id;
   
 #ifdef LOCAL_DEBUG
   if (barrel_muon) {
-    std::cout << "RPCNumberingScheme (barrel): ";
+    edm::LogVerbatim("RPCNumberingScheme") << "RPCNumberingScheme (barrel): ";
   } else {
     if (forward) {
-      std::cout << "RPCNumberingScheme (forward): ";
+      edm::LogVerbatim("RPCNumberingScheme") << "RPCNumberingScheme (forward): ";
     } else {
-      std::cout << "RPCNumberingScheme (backward): ";
+      edm::LogVerbatim("RPCNumberingScheme") << "RPCNumberingScheme (backward): ";
     }
   }
-  std::cout << " roll " << roll_id;
-  std::cout << " copy " << copy_id;
-  std::cout << " sector " << sector_id;
-  std::cout << " plane " << plane_id;
-  std::cout << " eta " << eta_id;
-  std::cout << " rr12 " << rr12_id;
+  edm::LogVerbatim("RPCNumberingScheme") 
+    << " roll " << roll_id << " copy " << copy_id << " sector " << sector_id
+    << " plane " << plane_id << " eta " << eta_id << " rr12 " << rr12_id;
 #endif
 
   // Build the actual numbering
@@ -223,8 +220,7 @@ int RPCNumberingScheme::baseNumberToUnitNumber(const MuonBaseNumber& num) {
   
   
 #ifdef LOCAL_DEBUG
-  std::cout << " DetId " << id;  
-  std::cout << std::endl;
+  edm::LogVerbatim("RPCNumberingScheme") << "RPCNumberingScheme:: DetId " << id;  
 #endif
       
   return id.rawId();
diff --git a/Geometry/MuonSimData/data/2021/v1/muonProdCuts.xml b/Geometry/MuonSimData/data/2021/v1/muonProdCuts.xml
new file mode 100644
index 0000000000000..eb262412498f3
--- /dev/null
+++ b/Geometry/MuonSimData/data/2021/v1/muonProdCuts.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
+ <SpecParSection label="ProductionCuts" eval="true">
+  <SpecPar name="Muon">
+   <PartSelector path="//MUON"/>
+   <Parameter name="CMSCutsRegion" value="Muon" eval="false"/>
+   <Parameter name="ProdCutsForGamma" value="100.*mm"/>
+   <Parameter name="ProdCutsForElectrons" value="10.*mm"/>
+   <Parameter name="ProdCutsForPositrons" value="10.*mm"/>
+  </SpecPar>
+  <SpecPar name="MuonIron">
+   <PartSelector path="//MGNT"/>
+   <PartSelector path="//YBSepar.*"/>
+   <PartSelector path="//COI.*"/>
+   <PartSelector path="//COCF"/>
+   <PartSelector path="//YB.*"/>
+   <PartSelector path="//ZStopSpace"/>
+   <PartSelector path="//SupportTubeForHE.*"/>
+   <PartSelector path="//YN.*"/>
+   <PartSelector path="//YE1.*"/>
+   <PartSelector path="//YE2.*"/>
+   <PartSelector path="//YE3.*"/>
+   <!-- if you want to re-stage YE4, then remove the comments around this element   <PartSelector path="//YE4.*"/>   -->
+   <PartSelector path="//ShieldingME4.*"/>
+   <PartSelector path="//ShieldingBoronPoly.*"/>
+   <PartSelector path="//ME11SupportDisk"/>
+   <Parameter name="CMSCutsRegion" value="MuonIron" eval="false"/>
+   <Parameter name="ProdCutsForGamma" value="1.*mm"/>
+   <Parameter name="ProdCutsForElectrons" value="1.*mm"/>
+   <Parameter name="ProdCutsForPositrons" value="1.*mm"/>
+  </SpecPar>
+  <SpecPar name="MuonChamber">
+   <PartSelector path="//MB.*N"/>
+   <PartSelector path="//MB.*P"/>
+   <PartSelector path="//ME.*Space"/>
+   <PartSelector path="//RR.*"/>
+   <PartSelector path="//GE.*"/>
+   <Parameter name="CMSCutsRegion" value="MuonChamber" eval="false"/>
+   <Parameter name="ProdCutsForGamma" value="1.*mm"/>
+   <Parameter name="ProdCutsForElectrons" value="0.002*mm"/>
+   <Parameter name="ProdCutsForPositrons" value="0.002*mm"/>
+  </SpecPar>
+  <SpecPar name="MuonSensitive_DT-CSC">
+   <!-- 1 keV for gamma/e-, 1 MeV for e+ -->
+   <PartSelector path="//MB.*PhiGas"/>
+   <PartSelector path="//MB.*ZGas"/>
+   <PartSelector path="//ME.*ActiveGasVol"/>
+   <Parameter name="CMSCutsRegion" value="MuonSensitive_DT-CSC" eval="false"/>
+   <Parameter name="ProdCutsForGamma" value="25.*mm"/>
+   <Parameter name="ProdCutsForElectrons" value="1.*mm"/>
+   <Parameter name="ProdCutsForPositrons" value="2.5*m"/>
+  </SpecPar>
+  <SpecPar name="MuonSensitive_RPC">
+   <!-- 10 keV for gamma/e-, 1 MeV for e+ -->
+   <PartSelector path="//MB.*RPC_.*Gas.*"/>
+   <!--    <PartSelector path="//REA.*"/>  -->
+   <PartSelector path="//REB.*"/>
+   <PartSelector path="//REC.*"/>
+   <!--    <PartSelector path="//RED.*"/>  -->
+   <PartSelector path="//REE.*"/>
+   <PartSelector path="//REF.*"/>
+   <!--    <PartSelector path="//REG.*"/>  -->
+   <!--    <PartSelector path="//REH.*"/>  -->
+   <Parameter name="CMSCutsRegion" value="MuonSensitive_RPC" eval="false"/>
+   <Parameter name="ProdCutsForGamma" value="8.5*m"/>
+   <Parameter name="ProdCutsForElectrons" value="8.*mm"/>
+   <Parameter name="ProdCutsForPositrons" value="2.5*m"/>
+  </SpecPar>
+ </SpecParSection>
+</DDDefinition>
diff --git a/Geometry/Records/interface/GeometricDetExtraRcd.h b/Geometry/Records/interface/GeometricDetExtraRcd.h
deleted file mode 100644
index 50e8efdea5e8b..0000000000000
--- a/Geometry/Records/interface/GeometricDetExtraRcd.h
+++ /dev/null
@@ -1 +0,0 @@
-#error do not use this include!
diff --git a/Geometry/TrackerCommonData/data/Materials/mixture.py b/Geometry/TrackerCommonData/data/Materials/mixture.py
new file mode 100755
index 0000000000000..c40105ba43792
--- /dev/null
+++ b/Geometry/TrackerCommonData/data/Materials/mixture.py
@@ -0,0 +1,385 @@
+#!/usr/bin/env python3
+
+"""
+mixture.py replaces the functionality of mixture.f
+
+Usage:
+
+$ python3 mixture.py filename.in
+
+Where `filename.in` contains a set of mixtures and its components:
+
+The format for `filename.in` is as follows:
+
+Each mixture description starts with a hash symbol (#) and contains
+the following information in a single line:
+
+ * Name (name of mixture of components)
+ * GMIX name ()
+ * MC Volume
+ * MC Area
+
+A mixture definition is followed by a set of compounds, which is the
+set of components that the mixture is made from.
+
+Each compound description starts with an asterisk (*) and contains
+the following information:
+
+ * Item number (An index for the list)
+ * Comment (A human readable name for the material)
+ * Material (Component name)
+ * Volume
+ * Multiplicity (How many times the material is in the mixture)
+ * Type (see below)
+
+Type stands for a classification of the Material using the following
+convention:
+
+ * SUP: Support
+ * COL: Cooling
+ * ELE: Electronics
+ * CAB: Cables
+ * SEN: Sensitive volumes
+
+Each Material (component of the mixture) belongs to a single category.
+`mixture.py` uses these information to compute how the mixture as a whole
+contributes to each of the categories in terms of radiation length (x0)
+and nuclear interaction length (l0) \lambda_{0}.
+
+The radiation length or the nuclear interaction lenght become relevant
+depending if we are talking about particles that interact with the detector
+mainly throgh electromagnetic forces (x0) or either strong interaction or nuclear
+forces (l0). Notice that these quantities are different and therefore the
+contribution for each category will depend on them.
+
+Any line in `filename.in` is therefore ignored unless it begins with
+a hash or an asterisk.
+
+Hardcoded in `mixture.py` are the files `mixed_materials.input` and
+`pure_materials.input`. These files act as a database that provides
+information about the compounds. From each compound defined in
+`filename.in` `mixture.py` matches the content of `Material` with a
+single element of the database and extracts the following information
+(the format of the mentioned .input files):
+
+ * Name (which should match with Material)
+ * Weight (Atomic Mass) [g/mol]
+ * Number (Atomic number)
+ * Density (g/cm^3)
+ * RadLen (Radiation lenght) (cm)
+ * IntLen (Nuclear interaction lenght) (cm)
+
+With these information `material.py` computes for each mixture:
+
+ * The radiation lenght for the mixture
+ * The nuclear interaction lenght for the mixture
+ * The mixture density
+ * The mixture volume
+ * The total weight
+ * The relative contribution in each categorio on x0 and l0
+ * Normalized quantities based on MC Volume and MC Area values
+
+As well for the compounds:
+
+ * The relative volume within the mixture
+ * The relative weight
+ * The relative radiation lenght
+ * The relative nuclear interaction length
+
+"""
+
+import re
+import pandas as pd
+import sys
+
+def getMixture(line) :
+    mixture = re.search(
+        r'^#\s*"(?P<MixtureName>[^"]+)"\s+"(?P<GMIXName>[^"]+)"\s+(?P<MCVolume>[0-9.Ee\-+]+)\s+(?P<MCArea>[0-9.Ee\-+]+)',
+        line
+    )
+    return {
+        'mixture_name' : mixture.group("MixtureName"),
+        'gmix_name' : mixture.group("GMIXName"),
+        'mc_volume' : float(mixture.group("MCVolume")),
+        'mc_area' : float(mixture.group("MCArea")),
+    }
+
+
+def getCompound(line) :
+    compound = re.search(
+        r'^\*\s*(?P<Index>[0-9]+)\s+"(?P<Comment>[^"]+)"\s+"(?P<Material>[^"]+)"\s+(?P<Volume>[0-9.Ee\-+]+)\s+(?P<Mult>[0-9.]+)\s+(?P<Type>[^ ]{3})',
+        line
+    )
+    return {
+        'item_number' : int(compound.group("Index")),
+        'comment' : compound.group("Comment"),
+        'material' : compound.group("Material"),
+        'volume' : float(compound.group("Volume")),
+        'multiplicity' : float(compound.group("Mult")),
+        'category' : compound.group("Type"),
+    }
+
+def getMixtures(inputFile) :
+
+    """
+    Returns a `dict` of Mixtures. Each
+    mixture contains a list of compounds.
+    """
+
+    inFile = open(inputFile,"r")
+
+    mixtures = []
+    mixture = {}
+
+    counter = 0
+    prevCounter = 0
+
+    for line in inFile.readlines():
+
+        if line[0] == "#":
+            if mixture:
+                mixtures.append(dict(mixture)) #Just to make a copy
+            mixture.clear()
+            mixture = getMixture(line)
+            mixture.update({ 'components' : [] })
+
+        if line[0] == "*":
+            mixture['components'].append(dict(getCompound(line)))
+
+    inFile.close()
+
+    return mixtures
+
+def loadMaterialsFile(inputFile):
+
+    mixMatFile = open(inputFile,"r")
+
+    mixMats = []
+
+    for line in mixMatFile.readlines():
+
+        if line[0] == '"':
+            mixMat = re.search(
+                r'^"(?P<name>[^"]+)"\s+(?P<weight>[0-9.Ee-]+)\s+(?P<number>[0-9.Ee-]+)\s+(?P<density>[0-9.Ee-]+)\s+(?P<x0>[0-9.Ee-]+)\s+(?P<l0>[0-9Ee.-]+)',
+                line
+                )
+
+            mixMats.append({
+                    "name" : mixMat.group("name"),
+                    "weight" : float(mixMat.group("weight")),
+                    "number" : float(mixMat.group("number")),
+                    "density" : float(mixMat.group("density")),
+                    "x0" : float(mixMat.group("x0")),
+                    "l0" : float(mixMat.group("l0")),
+                    })
+
+    return mixMats
+
+def main(argv):
+
+    listOfMixtures = getMixtures(str(argv[1]))
+
+    fname = re.search("(?P<filename>[a-zA-Z0-9_]+)",str(argv[1]))
+
+    fname = str(fname.group("filename"))
+    radLenFile = open(fname + ".x0","w");
+    intLenFile = open(fname + ".l0","w");
+
+    listOfMixedMaterials = loadMaterialsFile(inputFile="mixed_materials.input")
+    listOfPureMaterials = loadMaterialsFile(inputFile="pure_materials.input")
+    listOfMaterials = listOfMixedMaterials + listOfPureMaterials
+
+    dfAllMaterials = pd.DataFrame(listOfMaterials)
+
+    for index in range(len(listOfMixtures)):
+
+        gmixName = listOfMixtures[index]["gmix_name"]
+        print("================================")
+        print(gmixName)
+
+        components = pd.DataFrame(listOfMixtures[index]['components'])
+
+        components["volume"] = components["multiplicity"]*components["volume"]
+        totalVolume = sum(
+            components["volume"]
+            )
+
+        components["percentVolume"] = components["volume"] / totalVolume
+
+        components = pd.merge(
+            components,
+            dfAllMaterials[["name","density","x0","l0"]],
+            left_on="material",
+            right_on="name"
+            )
+
+        components["weight"] = components["density"] * components["volume"]
+
+        totalDensity = sum(
+            components["percentVolume"] * components["density"]
+            )
+
+        totalWeight = totalDensity * totalVolume
+
+        components["percentWeight"] = (
+            components["density"] * components["volume"] / totalWeight
+            )
+
+        components["ws"] = (
+            components["percentWeight"] / (components["density"]*components["x0"])
+            )
+
+        components["ws2"] = (
+            components["percentWeight"] / (components["density"]*components["l0"])
+            )
+
+        totalRadLen = 1 / ( sum(components["ws"]) * totalDensity )
+
+        totalIntLen = 1/ ( sum(components["ws2"]) * totalDensity )
+
+        components["percentRadLen"] = (
+            components["ws"] * totalRadLen * totalDensity
+            )
+
+        components["percentIntLen"] = (
+            components["ws2"] * totalIntLen * totalDensity
+            )
+
+        displayDf = components[[
+                    "comment",
+                    "material","volume",
+                    "percentVolume","percentWeight",
+                    "density","weight","x0","percentRadLen",
+                    "l0","percentIntLen"
+                    ]].copy()
+
+        displayDf["percentVolume"] *= 100.
+        displayDf["percentWeight"] *= 100.
+        displayDf["percentRadLen"] *= 100.
+        displayDf["percentIntLen"] *= 100.
+
+        displayDf = displayDf.rename(
+            columns = {
+                "comment" : "Component",
+                "material" : "Material",
+                "volume" : "Volume [cm^3]",
+                "percentVolume" : "Volume %",
+                "density" : "Density",
+                "weight" : "Weight",
+                "percentWeight" : "Weight %",
+                "x0" : "X_0 [cm]",
+                "percentRadLen" : "X_0 %",
+                "l0": "lambda_0 [cm]",
+                "percentIntLen" : "lambda_0 %",
+                }
+            )
+
+        print(displayDf)
+
+
+        # Normalized vars:
+
+        mcVolume = listOfMixtures[index]["mc_volume"]
+        mcArea = listOfMixtures[index]["mc_area"]
+        normalizationFactor = -1.
+
+        if mcVolume > 0:
+            normalizationFactor = totalVolume / mcVolume
+        else:
+            normalizationFactor = 1.
+
+        normalizedDensity = totalDensity * normalizationFactor
+        normalizedRadLen = totalRadLen / normalizationFactor
+        normalizedIntLen = totalIntLen / normalizationFactor
+
+        percentRadL = -1.
+        percentIntL = -1.
+
+        if mcArea > 0:
+            percentRadL = mcVolume / (mcArea*normalizedRadLen)
+            percentIntL = mcVolume / (mcArea*normalizedIntLen)
+
+        pSupRadLen = 0.
+        pSenRadLen = 0.
+        pCabRadLen = 0.
+        pColRadLen = 0.
+        pEleRadLen = 0.
+
+        pSupIntLen = 0.
+        pSenIntLen = 0.
+        pCabIntLen = 0.
+        pColIntLen = 0.
+        pEleIntLen = 0.
+
+        for index, component in components.iterrows():
+            catg = component["category"]
+            prl = component["percentRadLen"]
+            irl = component["percentIntLen"]
+            if catg.upper() == "SUP":
+                pSupRadLen += prl
+                pSupIntLen += irl
+            elif catg.upper() == "SEN":
+                pSenRadLen += prl
+                pSenIntLen += irl
+            elif catg.upper() == "CAB":
+                pCabRadLen += prl
+                pCabIntLen += irl
+            elif catg.upper() == "COL":
+                pColRadLen += prl
+                pColIntLen += irl
+            elif catg.upper() == "ELE":
+                pEleRadLen += prl
+                pEleIntLen += irl
+
+        print("================================")
+        print("Mixture Density       [g/cm^3]: " , totalDensity)
+        print("Norm. mixture density [g/cm^3]: ", normalizedDensity)
+        print("Mixture Volume        [cm^3]: ", totalVolume)
+        print("MC Volume             [cm^3]: ", mcVolume)
+        print("MC Area               [cm^2]: ", mcArea)
+        print("Normalization Factor:       ",  normalizationFactor)
+        print("Mixture x0            [cm]: ", totalRadLen)
+        print("Norm. Mixture x0      [cm]: ", normalizedRadLen)
+        if mcArea > 0 :
+            print("Norm. Mixture x0      [%]: ", 100. * percentRadL)
+        print("Mixture l0            [cm]: ", totalIntLen)
+        print("Norm. Mixture l0      [cm]: ", normalizedIntLen)
+        if mcArea > 0 :
+            print("Norm. Mixture l0      [%]: ", 100. * percentIntL)
+        print("Total Weight          [g]: ", totalWeight)
+
+        print("================================")
+        print("X0 Contribution: ")
+        print("Support     :", pSupRadLen)
+        print("Sensitive   :", pSenRadLen)
+        print("Cables      :", pCabRadLen)
+        print("Cooling     :", pColRadLen)
+        print("Electronics :", pEleRadLen)
+
+        print("================================")
+        print("l0 Contribution: ")
+        print("Support     :", pSupIntLen)
+        print("Sensitive   :", pSenIntLen)
+        print("Cables      :", pCabIntLen)
+        print("Cooling     :", pColIntLen)
+        print("Electronics :", pEleIntLen)
+
+        radLenFile.write("{0:<50}{1:>8}{2:>8}{3:>8}{4:>8}{5:>8}\n".format(
+                gmixName,
+                round(pSupRadLen,3), round(pSenRadLen,3),
+                round(pCabRadLen,3), round(pColRadLen,3),
+                round(pEleRadLen,3)
+                ))
+
+        intLenFile.write("{0:<50}{1:>8}{2:>8}{3:>8}{4:>8}{5:>8}\n".format(
+                gmixName,
+                round(pSupIntLen,3), round(pSenIntLen,3),
+                round(pCabIntLen,3), round(pColIntLen,3),
+                round(pEleIntLen,3)
+                ))
+
+    radLenFile.close()
+    intLenFile.close()
+
+if __name__== "__main__":
+    main(sys.argv)
diff --git a/Geometry/TrackerCommonData/data/PhaseII/TiltedTracker460/pixel.xml b/Geometry/TrackerCommonData/data/PhaseII/TiltedTracker460/pixel.xml
deleted file mode 100644
index f87cd4e9cc5d5..0000000000000
--- a/Geometry/TrackerCommonData/data/PhaseII/TiltedTracker460/pixel.xml
+++ /dev/null
@@ -1,13634 +0,0 @@
-<?xml version="1.0"?>
-<!--
-============= XML GENERATION METADATA HEADER =============
-tkLayout revision: dev_gabie-2972-e516bb8 on git@github.com:ghugo83/tkLayout.git
-generated by: Gabrielle Hugo (ghugo on hpsilicon2.dyndns.cern.ch)
-generation date: 2018-11-26.14:45:14
-note: see OT614_200_IT460_2018_11_26.cfg for full config files
-=========== END XML GENERATION METADATA HEADER ===========
--->
-<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.cern.ch/www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
-<MaterialSection label="pixel.xml">
-<CompositeMaterial name="hybridcompositeBModule1Layer1Hybrid" density="4.44803*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.367387">
-<rMaterial name="tracker:tkLayout_Al-CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.165467">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.201438">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.108587">
-<rMaterial name="tracker:tkLayout_PS-FEH-mix"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.157121">
-<rMaterial name="tracker:tkLayout_Si"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="hybridcompositeBModule1Layer1Chip" density="1.2626*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.226398">
-<rMaterial name="tracker:tkLayout_Pix_Bumps"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.773602">
-<rMaterial name="tracker:tkLayout_Pix_Caps"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="hybridcompositeBModule1Layer1DeadAreaRight" density="3.03185*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="1">
-<rMaterial name="tracker:tkLayout_Si"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="hybridcompositeBModule1Layer2Hybrid" density="3.87486*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.27381">
-<rMaterial name="tracker:tkLayout_Al-CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.189943">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.231234">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.12465">
-<rMaterial name="tracker:tkLayout_PS-FEH-mix"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.180363">
-<rMaterial name="tracker:tkLayout_Si"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="hybridcompositeBModule1Layer3Hybrid" density="3.1654*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.111049">
-<rMaterial name="tracker:tkLayout_Al-CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.232514">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.283061">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.152588">
-<rMaterial name="tracker:tkLayout_PS-FEH-mix"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.220788">
-<rMaterial name="tracker:tkLayout_Si"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="hybridcompositeBModule1Layer3Chip" density="1.25712*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.227464">
-<rMaterial name="tracker:tkLayout_Pix_Bumps"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.772536">
-<rMaterial name="tracker:tkLayout_Pix_Caps"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="hybridcompositeBModule1Layer3DeadAreaRight" density="3.62032*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="1">
-<rMaterial name="tracker:tkLayout_Si"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="hybridcompositeEModule1Disc1Hybrid" density="2.81388*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.261561">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.318422">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.171649">
-<rMaterial name="tracker:tkLayout_PS-FEH-mix"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.248369">
-<rMaterial name="tracker:tkLayout_Si"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR176Z1425" density="1.82095*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00806091">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.311289">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0238256">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0511131">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00308644">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00529105">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00771611">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0108026">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0620199">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00434461">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00521353">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00391015">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00347569">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00690935">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00146164">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.410835">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0522926">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00325354">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0055775">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00813386">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0113874">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR248Z1609" density="1.2593*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00867211">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.313056">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0236181">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0506679">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00305956">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00524497">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00764891">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0107085">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0630372">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00743324">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.426911">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0518372">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00322521">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00552893">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00806302">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0112882">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR228Z1609" density="1.37096*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00867211">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.313056">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0236181">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0506679">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00305956">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00524497">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00764891">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0107085">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0630372">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00743324">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.426911">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0518372">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00322521">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00552893">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00806302">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0112882">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR209Z1609" density="1.49252*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00867211">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.313056">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0236181">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0506679">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00305956">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00524497">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00764891">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0107085">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0630372">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00743324">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.426911">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0518372">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00322521">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00552893">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00806302">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0112882">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR192Z1609" density="1.62485*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00867211">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.313056">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0236181">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0506679">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00305956">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00524497">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00764891">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0107085">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0630372">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00743324">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.426911">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0518372">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00322521">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00552893">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00806302">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0112882">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR176Z1609" density="1.76892*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00867211">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.313056">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0236181">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0506679">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00305956">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00524497">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00764891">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0107085">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0630372">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00743324">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.426911">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0518372">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00322521">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00552893">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00806302">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0112882">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR270Z2087" density="1.20312*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00867211">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.313056">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0236181">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0506679">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00305956">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00524497">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00764891">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0107085">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0630372">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00743324">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.426911">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0518372">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00322521">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00552893">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00806302">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0112882">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR270Z2567" density="1.82529*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00700171">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.32735">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0236394">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0661973">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00199865">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00342626">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00499663">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00699528">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.062693">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00281339">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00393874">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00253205">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00281339">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00337606">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R5"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00600146">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00133031">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.386812">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.067725">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00210686">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00361176">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00526714">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.007374">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR277Z2580" density="1.79547*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00700171">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.32735">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0236394">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0661973">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00199865">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00342626">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00499663">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00699528">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.062693">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00281339">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00393874">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00253205">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00281339">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00337606">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R5"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00600146">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00133031">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.386812">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.067725">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00210686">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00361176">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00526714">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.007374">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR176Z165" density="0.510623*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.235424">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0337686">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0110005">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0188579">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0275012">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0385016">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0439717">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0812948">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0696813">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0580677">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0541965">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0226841">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.203999">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.011596">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0198789">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0289901">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0405861">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR181Z165" density="0.585054*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00987954">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.265768">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0288087">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00938474">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0160881">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0234618">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0328466">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0600951">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00846818">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.45899">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00989283">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0169591">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0247321">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0346249">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR178Z818" density="0.591882*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00987954">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.265768">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0288087">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00938474">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0160881">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0234618">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0328466">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0600951">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00846818">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.45899">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00989283">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0169591">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0247321">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0346249">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR34Z207" density="0.311445*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.126807">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0285316">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0650613">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0275619">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.480811">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0416475">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.160996">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0685837">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR34Z11" density="0.684929*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0809429">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0182122">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.268641">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.249177">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0175932">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.102766">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.262668">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR176Z109" density="0.598534*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00987954">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.265768">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0288087">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00938474">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0160881">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0234618">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0328466">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0600951">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00846818">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.45899">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00989283">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0169591">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0247321">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0346249">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR179Z110" density="2.57417*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.650302">
-<rMaterial name="tracker:tkLayout_2S-SEH-mix"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.127291">
-<rMaterial name="tracker:tkLayout_CFRP"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.212522">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00988559">
-<rMaterial name="tracker:tkLayout_Epoxy"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR34Z44" density="0.730613*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0758817">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0170734">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.251843">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.233597">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0164931">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0575436">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00498439">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.09634">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.246244">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR34Z88" density="0.776297*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0714162">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0160686">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.237023">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.21985">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0155225">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.108315">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00938213">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0906706">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.231753">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR34Z133" density="0.82198*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0674471">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0151756">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.22385">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.207631">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0146598">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.153442">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.013291">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0856313">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.218872">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR34Z177" density="0.867664*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0638959">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0143766">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.212064">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.196699">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.013888">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.193817">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0167883">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0811227">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.207348">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR34Z202" density="0.913348*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0606999">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0136575">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.201457">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.186861">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0131933">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.230154">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0199358">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0770651">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.196977">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR64Z207" density="0.427554*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.160892">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0362007">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0275164">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.047171">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0349704">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.20335">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.1743">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0325991">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.20427">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0290061">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0497248">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR64Z11" density="0.720521*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0824116">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0185426">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.255371">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.253698">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0179124">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.10463">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.267434">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR64Z44" density="0.741478*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0800823">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0180185">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.248153">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.246528">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0174061">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0260267">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00223759">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.101673">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.259875">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR64Z88" density="0.762436*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.077881">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0175232">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.241332">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.239751">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0169277">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0506227">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00435218">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0988784">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.252732">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR64Z133" density="0.783393*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0757976">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0170545">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.234876">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.233338">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0164748">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0739026">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00635362">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0962332">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.245971">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR64Z177" density="0.804351*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0738226">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0166101">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.228756">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.227258">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0160456">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0959694">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00825077">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0937258">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.239562">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR64Z202" density="0.825308*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.071948">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0161883">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.222947">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.221487">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0156381">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.116916">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0100516">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0913458">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.233478">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR105Z207" density="0.480656*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.204814">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0339999">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0166137">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0284806">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0415342">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0399871">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.122777">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.105238">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0876981">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0272221">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.200317">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0175132">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0300226">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0437829">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR105Z11" density="0.498908*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.122027">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0137618">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.368805">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.188287">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0213892">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0872479">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.198481">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR105Z44" density="0.509678*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.119449">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.013471">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.361012">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.184309">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0209372">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0194581">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00167287">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0854042">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.194287">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR105Z88" density="0.520448*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.116977">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0131922">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.353541">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.180495">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.020504">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0381108">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0032765">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0836369">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.190267">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR105Z133" density="0.531218*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.114605">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0129248">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.346374">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.176835">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0200883">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0560073">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0048151">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0819412">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.186409">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR105Z177" density="0.541988*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.112328">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0126679">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.339491">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.173321">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0196891">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0731924">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00629256">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.080313">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.182705">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR105Z202" density="0.552758*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.110139">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0124211">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.332876">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.169944">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0193055">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0897079">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00771245">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0787481">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.179145">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR145Z207" density="0.564751*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.235424">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0337686">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0110005">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0188579">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0275012">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0385016">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0439717">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0812948">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0696813">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0580677">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0541965">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0226841">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.203999">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.011596">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0198789">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0289901">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0405861">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR145Z11" density="0.505226*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.122919">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0138623">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.364193">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.189663">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0215455">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0878853">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.199932">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR145Z44" density="0.51255*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.121162">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0136642">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.358989">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.186953">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0212376">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0131582">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00113124">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0866295">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.197075">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR145Z88" density="0.519874*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.119455">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0134717">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.353932">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.184319">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0209384">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0259456">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00223061">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0854091">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.194298">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR145Z133" density="0.527198*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.117796">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0132846">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.349015">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.181759">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0206475">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0383777">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00329944">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0842225">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.191599">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR145Z177" density="0.534522*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.116182">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0131026">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.344233">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.179268">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0203646">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0504691">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00433897">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0830685">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.188974">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR145Z202" density="0.541846*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.114611">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0129255">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.33958">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.176845">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0200894">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0622337">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00535041">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0819457">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.186419">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z271" density="0.147821*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.315382">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0235408">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0838439">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0512738">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0570139">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0684166">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0513125">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0456111">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0191809">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.198646">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0857788">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR28Z259" density="1.04106*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.115267">
-<rMaterial name="tracker:tkLayout_Airex"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.149911">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0172974">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.353485">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.107444">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0265005">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.000145788">
-<rMaterial name="tracker:tkLayout_FPIX_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.08819e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="3.87575e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="2.37017e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="9.18254e-05">
-<rMaterial name="tracker:tkLayout_FPIX_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="3.96519e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.116536">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.113209">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z306" density="0.164864*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00808806">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.33593">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0211073">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0751766">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0644604">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00693263">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.411394">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0769115">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR168Z284" density="2.95408*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.650302">
-<rMaterial name="tracker:tkLayout_2S-SEH-mix"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.127291">
-<rMaterial name="tracker:tkLayout_CFRP"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.212522">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00988559">
-<rMaterial name="tracker:tkLayout_Epoxy"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z385" density="0.329728*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00808806">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.33593">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0211073">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0751766">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0644604">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00693263">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.411394">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0769115">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z487" density="0.494592*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00808806">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.33593">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0211073">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0751766">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0644604">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00693263">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.411394">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0769115">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z617" density="0.659455*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00808806">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.33593">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0211073">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0751766">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0644604">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00693263">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.411394">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0769115">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z783" density="0.824319*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00808806">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.33593">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0211073">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0751766">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0644604">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00693263">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.411394">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0769115">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z996" density="0.989183*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00808806">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.33593">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0211073">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0751766">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0644604">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00693263">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.411394">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0769115">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z1268" density="1.15405*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00808806">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.33593">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0211073">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0751766">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0644604">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00693263">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.411394">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0769115">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR176Z1521" density="1.83694*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00867211">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.313056">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0236181">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0506679">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00305956">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00524497">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00764891">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0107085">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0630372">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00743324">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.426911">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0518372">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00322521">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00552893">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00806302">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0112882">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR178Z1434" density="2.77514*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.650302">
-<rMaterial name="tracker:tkLayout_2S-SEH-mix"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.127291">
-<rMaterial name="tracker:tkLayout_CFRP"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.212522">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00988559">
-<rMaterial name="tracker:tkLayout_Epoxy"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR73Z259" density="0.846135*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.141821">
-<rMaterial name="tracker:tkLayout_Airex"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.113326">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0130761">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.434919">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0812228">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0200333">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0199233">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.000110209">
-<rMaterial name="tracker:tkLayout_FPIX_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="8.22626e-06">
-<rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="2.9299e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.79175e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="6.94161e-05">
-<rMaterial name="tracker:tkLayout_FPIX_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="2.99751e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0017354">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0880962">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0855816">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR93Z259" density="0.774661*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.154906">
-<rMaterial name="tracker:tkLayout_Airex"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0933524">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0107714">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.475046">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0669072">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0165024">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0164118">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0196942">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="9.07847e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="6.77637e-06">
-<rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="2.4135e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.47595e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="5.71814e-05">
-<rMaterial name="tracker:tkLayout_FPIX_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="2.4692e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0031227">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0725691">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0704976">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR128Z259" density="0.717207*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.167316">
-<rMaterial name="tracker:tkLayout_Airex"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0772721">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00891601">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.513102">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0553821">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0136598">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0135848">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0163018">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0122263">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="7.51467e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="5.60911e-06">
-<rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.99777e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.22171e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="4.73317e-05">
-<rMaterial name="tracker:tkLayout_FPIX_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="2.04387e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00363593">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0600687">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0583541">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR160Z259" density="0.699413*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.171573">
-<rMaterial name="tracker:tkLayout_Airex"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0704836">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00813272">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.526156">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0505167">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0124597">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0123914">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0148696">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0111522">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00991308">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="6.85449e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="5.11634e-06">
-<rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.82226e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.11438e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="4.31735e-05">
-<rMaterial name="tracker:tkLayout_FPIX_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.86431e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00416876">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0547916">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0532276">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z341" density="0.312685*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00426445">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.326216">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0222577">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0792741">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0582265">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0269532">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0323438">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0242579">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0215625">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00365524">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00906773">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.310817">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0811035">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z430" density="0.477549*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00558447">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.32957">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0218606">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0778595">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0603786">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0176482">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0211778">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0158833">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0141185">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00478669">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00593729">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.345539">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0796563">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z544" density="0.642413*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00622698">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.331202">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0216672">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.077171">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0614261">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0131191">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0157429">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0118072">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0104953">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00533741">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00441359">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.36244">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0789519">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z690" density="0.807277*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00660705">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.332167">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0215529">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0767637">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0620458">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0104399">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0125278">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00939588">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00835189">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00566319">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00351223">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.372437">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0785352">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z877" density="0.97214*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00685821">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.332805">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0214773">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0764946">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0624553">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00866938">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0104033">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00780244">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00693551">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00587847">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0029166">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.379044">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0782598">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z1116" density="1.137*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00703654">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.333258">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0214237">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0763035">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.062746">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00741234">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0088948">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0066711">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00592987">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00603132">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0024937">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.383734">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0780643">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z1412" density="1.30187*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0071697">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.333597">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0213836">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0761608">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0629631">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00647366">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0077684">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0058263">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00517893">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00614546">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0021779">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.387237">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0779183">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR259Z1776" density="0.165155*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.3313">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0238491">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0961361">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0536143">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0326863">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0457608">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0294176">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0326863">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0392235">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R5"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0154557">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.201516">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0983546">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR63Z1759" density="1.24696*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0962344">
-<rMaterial name="tracker:tkLayout_Airex"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.118854">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0493464">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.295119">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0908588">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0337552">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.000132971">
-<rMaterial name="tracker:tkLayout_FPIX_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="9.57211e-06">
-<rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="3.85852e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="2.15187e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="8.08806e-05">
-<rMaterial name="tracker:tkLayout_FPIX_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="3.94757e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.219735">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0957743">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR259Z1894" density="0.16673*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00512764">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.361865">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0236238">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0952276">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.064828">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00439512">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.347508">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0974252">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR261Z1795" density="1.63617*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.650302">
-<rMaterial name="tracker:tkLayout_2S-SEH-mix"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.127291">
-<rMaterial name="tracker:tkLayout_CFRP"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.212522">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00988559">
-<rMaterial name="tracker:tkLayout_Epoxy"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR259Z2144" density="0.333461*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00512764">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.361865">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0236238">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0952276">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.064828">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00439512">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.347508">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0974252">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR261Z2030" density="1.6362*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.650302">
-<rMaterial name="tracker:tkLayout_2S-SEH-mix"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.127291">
-<rMaterial name="tracker:tkLayout_CFRP"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.212522">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00988559">
-<rMaterial name="tracker:tkLayout_Epoxy"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR259Z2427" density="0.500191*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00512764">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.361865">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0236238">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0952276">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.064828">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00439512">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.347508">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0974252">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR277Z2625" density="1.79695*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00744116">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.330007">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0236201">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.066143">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00199701">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00342345">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00499253">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00698954">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0636592">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00637813">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.399335">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0676694">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00210513">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00360879">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00526282">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00736795">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR279Z2595" density="1.5318*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.650302">
-<rMaterial name="tracker:tkLayout_2S-SEH-mix"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.127291">
-<rMaterial name="tracker:tkLayout_CFRP"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.212522">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00988559">
-<rMaterial name="tracker:tkLayout_Epoxy"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR108Z1759" density="1.00698*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.119168">
-<rMaterial name="tracker:tkLayout_Airex"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0983395">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0408291">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.36545">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0751765">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.027929">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0108546">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00011002">
-<rMaterial name="tracker:tkLayout_FPIX_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="7.91995e-06">
-<rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="3.19254e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.78045e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="6.69205e-05">
-<rMaterial name="tracker:tkLayout_FPIX_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="3.26621e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.000933203">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.181809">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0792435">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR149Z1759" density="0.895516*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.134001">
-<rMaterial name="tracker:tkLayout_Airex"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.084136">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0349321">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.410936">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0643185">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0238952">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00928687">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0130016">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="9.41293e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="6.77605e-06">
-<rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="2.73143e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.5233e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="5.7255e-05">
-<rMaterial name="tracker:tkLayout_FPIX_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="2.79446e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0019162">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.15555">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0677981">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR189Z1759" density="0.821482*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.146077">
-<rMaterial name="tracker:tkLayout_Airex"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0735881">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0305527">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.447971">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0562551">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0208995">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00812259">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0113716">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00731033">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="8.23285e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="5.92655e-06">
-<rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="2.389e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.33233e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="5.00771e-05">
-<rMaterial name="tracker:tkLayout_FPIX_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="2.44413e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00230446">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.136049">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0592984">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR232Z1759" density="0.783039*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.153249">
-<rMaterial name="tracker:tkLayout_Airex"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0668487">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0277546">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.469964">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0511031">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0189855">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00737871">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0103302">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00664084">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00737871">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="7.47887e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="5.38379e-06">
-<rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="2.17021e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.21031e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="4.54909e-05">
-<rMaterial name="tracker:tkLayout_FPIX_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="2.22029e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00272779">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.123589">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0538678">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR254Z1759" density="0.775773*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.154684">
-<rMaterial name="tracker:tkLayout_Airex"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0641754">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0266447">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.474366">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0490594">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0182262">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00708362">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00991707">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00637526">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00708362">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00850035">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R5"/>
-</MaterialFraction>
-<MaterialFraction fraction="7.17978e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="5.16848e-06">
-<rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="2.08342e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.16191e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="4.36717e-05">
-<rMaterial name="tracker:tkLayout_FPIX_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="2.1315e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0033495">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.118647">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0517135">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR259Z2012" density="0.331885*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00257599">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.346655">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0237359">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0956797">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0592478">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0162655">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0227718">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.014639">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0162655">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0195187">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R5"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00220799">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00769118">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.274858">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0978877">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR259Z2277" density="0.498615*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00342923">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.351741">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0236984">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0955285">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0611138">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0108266">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0151572">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00974391">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0108266">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0129919">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R5"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00293934">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00511935">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.299151">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.097733">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR259Z2562" density="0.665346*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00385484">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.354278">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0236797">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0954531">
-<rMaterial name="tracker:tkLayout_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0620445">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00811352">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0113589">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00730216">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00811352">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00973622">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R5"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00330415">
-<rMaterial name="tracker:tkLayout_Glass"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00383648">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.311269">
-<rMaterial name="tracker:tkLayout_PE"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0976559">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="supportcompositeR188Z113" density="1.94695*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0346439">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.874188">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0911682">
-<rMaterial name="tracker:tkLayout_Kevlar"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="supportcompositeR172Z835" density="0.92*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="1">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="supportcompositeR38Z101" density="0.304*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.394737">
-<rMaterial name="tracker:tkLayout_Airex"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.605263">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-</CompositeMaterial>
-</MaterialSection>
-<RotationSection label="pixel.xml">
-<Rotation name="INNERTRACKERRODTOFLIPPEDMODULE" thetaX="90*deg" phiX="90*deg" thetaY="180*deg" phiY="0*deg" thetaZ="90*deg" phiZ="180*deg"/>
-<Rotation name="INNERTRACKERRODTOMODULE" thetaX="90*deg" phiX="270*deg" thetaY="180*deg" phiY="0*deg" thetaZ="90*deg" phiZ="0*deg"/>
-<Rotation name="Y180" thetaX="90*deg" phiX="180*deg" thetaY="90*deg" phiY="90*deg" thetaZ="180*deg" phiZ="0*deg"/>
-</RotationSection>
-<LogicalPartSection label="pixel.xml">
-<LogicalPart name="BModule1Layer1" category="unspecified">
-<rSolid name="pixel:BModule1Layer1"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer1InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule1Layer1InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer1InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule1Layer1InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer1Hybrid" category="unspecified">
-<rSolid name="pixel:BModule1Layer1Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer1Chip" category="unspecified">
-<rSolid name="pixel:BModule1Layer1Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer1DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule1Layer1DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer1DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule1Layer1DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer1DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule1Layer1DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer1DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule1Layer1DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer1" category="unspecified">
-<rSolid name="pixel:BModule2Layer1"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer1InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule2Layer1InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer1InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule2Layer1InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer1Hybrid" category="unspecified">
-<rSolid name="pixel:BModule2Layer1Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer1Chip" category="unspecified">
-<rSolid name="pixel:BModule2Layer1Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer1DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule2Layer1DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer1DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule2Layer1DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer1DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule2Layer1DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer1DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule2Layer1DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer1" category="unspecified">
-<rSolid name="pixel:BModule3Layer1"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer1InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule3Layer1InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer1InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule3Layer1InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer1Hybrid" category="unspecified">
-<rSolid name="pixel:BModule3Layer1Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer1Chip" category="unspecified">
-<rSolid name="pixel:BModule3Layer1Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer1DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule3Layer1DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer1DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule3Layer1DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer1DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule3Layer1DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer1DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule3Layer1DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer1" category="unspecified">
-<rSolid name="pixel:BModule4Layer1"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer1InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule4Layer1InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer1InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule4Layer1InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer1Hybrid" category="unspecified">
-<rSolid name="pixel:BModule4Layer1Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer1Chip" category="unspecified">
-<rSolid name="pixel:BModule4Layer1Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer1DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule4Layer1DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer1DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule4Layer1DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer1DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule4Layer1DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer1DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule4Layer1DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer1" category="unspecified">
-<rSolid name="pixel:BModule5Layer1"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer1InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule5Layer1InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer1InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule5Layer1InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer1Hybrid" category="unspecified">
-<rSolid name="pixel:BModule5Layer1Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer1Chip" category="unspecified">
-<rSolid name="pixel:BModule5Layer1Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer1DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule5Layer1DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer1DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule5Layer1DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer1DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule5Layer1DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer1DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule5Layer1DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="RodFlipped1" category="unspecified">
-<rSolid name="pixel:RodFlipped1"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="RodUnflipped1" category="unspecified">
-<rSolid name="pixel:RodUnflipped1"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Layer1" category="unspecified">
-<rSolid name="pixel:Layer1"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer2" category="unspecified">
-<rSolid name="pixel:BModule1Layer2"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer2InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule1Layer2InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer2InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule1Layer2InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer2Hybrid" category="unspecified">
-<rSolid name="pixel:BModule1Layer2Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer2Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer2Chip" category="unspecified">
-<rSolid name="pixel:BModule1Layer2Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer2DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule1Layer2DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer2DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule1Layer2DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer2DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule1Layer2DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer2DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule1Layer2DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer2" category="unspecified">
-<rSolid name="pixel:BModule2Layer2"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer2InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule2Layer2InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer2InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule2Layer2InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer2Hybrid" category="unspecified">
-<rSolid name="pixel:BModule2Layer2Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer2Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer2Chip" category="unspecified">
-<rSolid name="pixel:BModule2Layer2Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer2DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule2Layer2DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer2DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule2Layer2DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer2DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule2Layer2DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer2DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule2Layer2DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer2" category="unspecified">
-<rSolid name="pixel:BModule3Layer2"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer2InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule3Layer2InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer2InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule3Layer2InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer2Hybrid" category="unspecified">
-<rSolid name="pixel:BModule3Layer2Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer2Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer2Chip" category="unspecified">
-<rSolid name="pixel:BModule3Layer2Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer2DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule3Layer2DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer2DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule3Layer2DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer2DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule3Layer2DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer2DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule3Layer2DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer2" category="unspecified">
-<rSolid name="pixel:BModule4Layer2"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer2InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule4Layer2InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer2InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule4Layer2InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer2Hybrid" category="unspecified">
-<rSolid name="pixel:BModule4Layer2Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer2Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer2Chip" category="unspecified">
-<rSolid name="pixel:BModule4Layer2Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer2DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule4Layer2DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer2DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule4Layer2DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer2DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule4Layer2DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer2DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule4Layer2DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer2" category="unspecified">
-<rSolid name="pixel:BModule5Layer2"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer2InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule5Layer2InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer2InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule5Layer2InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer2Hybrid" category="unspecified">
-<rSolid name="pixel:BModule5Layer2Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer2Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer2Chip" category="unspecified">
-<rSolid name="pixel:BModule5Layer2Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer2DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule5Layer2DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer2DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule5Layer2DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer2DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule5Layer2DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer2DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule5Layer2DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="RodFlipped2" category="unspecified">
-<rSolid name="pixel:RodFlipped2"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="RodUnflipped2" category="unspecified">
-<rSolid name="pixel:RodUnflipped2"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Layer2" category="unspecified">
-<rSolid name="pixel:Layer2"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer3" category="unspecified">
-<rSolid name="pixel:BModule1Layer3"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer3InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule1Layer3InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer3InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule1Layer3InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer3Hybrid" category="unspecified">
-<rSolid name="pixel:BModule1Layer3Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer3Chip" category="unspecified">
-<rSolid name="pixel:BModule1Layer3Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer3DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule1Layer3DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer3DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule1Layer3DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer3DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule1Layer3DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer3DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule1Layer3DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer3" category="unspecified">
-<rSolid name="pixel:BModule2Layer3"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer3InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule2Layer3InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer3InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule2Layer3InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer3Hybrid" category="unspecified">
-<rSolid name="pixel:BModule2Layer3Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer3Chip" category="unspecified">
-<rSolid name="pixel:BModule2Layer3Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer3DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule2Layer3DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer3DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule2Layer3DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer3DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule2Layer3DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer3DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule2Layer3DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer3" category="unspecified">
-<rSolid name="pixel:BModule3Layer3"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer3InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule3Layer3InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer3InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule3Layer3InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer3Hybrid" category="unspecified">
-<rSolid name="pixel:BModule3Layer3Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer3Chip" category="unspecified">
-<rSolid name="pixel:BModule3Layer3Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer3DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule3Layer3DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer3DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule3Layer3DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer3DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule3Layer3DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer3DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule3Layer3DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer3" category="unspecified">
-<rSolid name="pixel:BModule4Layer3"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer3InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule4Layer3InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer3InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule4Layer3InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer3Hybrid" category="unspecified">
-<rSolid name="pixel:BModule4Layer3Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer3Chip" category="unspecified">
-<rSolid name="pixel:BModule4Layer3Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer3DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule4Layer3DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer3DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule4Layer3DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer3DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule4Layer3DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer3DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule4Layer3DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer3" category="unspecified">
-<rSolid name="pixel:BModule5Layer3"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer3InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule5Layer3InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer3InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule5Layer3InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer3Hybrid" category="unspecified">
-<rSolid name="pixel:BModule5Layer3Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer3Chip" category="unspecified">
-<rSolid name="pixel:BModule5Layer3Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer3DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule5Layer3DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer3DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule5Layer3DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer3DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule5Layer3DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer3DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule5Layer3DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="RodFlipped3" category="unspecified">
-<rSolid name="pixel:RodFlipped3"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="RodUnflipped3" category="unspecified">
-<rSolid name="pixel:RodUnflipped3"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Layer3" category="unspecified">
-<rSolid name="pixel:Layer3"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer4" category="unspecified">
-<rSolid name="pixel:BModule1Layer4"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer4InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule1Layer4InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer4InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule1Layer4InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer4Hybrid" category="unspecified">
-<rSolid name="pixel:BModule1Layer4Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer4Chip" category="unspecified">
-<rSolid name="pixel:BModule1Layer4Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer4DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule1Layer4DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer4DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule1Layer4DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer4DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule1Layer4DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule1Layer4DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule1Layer4DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer4" category="unspecified">
-<rSolid name="pixel:BModule2Layer4"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer4InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule2Layer4InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer4InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule2Layer4InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer4Hybrid" category="unspecified">
-<rSolid name="pixel:BModule2Layer4Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer4Chip" category="unspecified">
-<rSolid name="pixel:BModule2Layer4Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer4DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule2Layer4DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer4DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule2Layer4DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer4DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule2Layer4DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule2Layer4DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule2Layer4DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer4" category="unspecified">
-<rSolid name="pixel:BModule3Layer4"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer4InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule3Layer4InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer4InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule3Layer4InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer4Hybrid" category="unspecified">
-<rSolid name="pixel:BModule3Layer4Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer4Chip" category="unspecified">
-<rSolid name="pixel:BModule3Layer4Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer4DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule3Layer4DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer4DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule3Layer4DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer4DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule3Layer4DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule3Layer4DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule3Layer4DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer4" category="unspecified">
-<rSolid name="pixel:BModule4Layer4"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer4InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule4Layer4InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer4InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule4Layer4InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer4Hybrid" category="unspecified">
-<rSolid name="pixel:BModule4Layer4Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer4Chip" category="unspecified">
-<rSolid name="pixel:BModule4Layer4Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer4DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule4Layer4DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer4DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule4Layer4DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer4DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule4Layer4DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule4Layer4DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule4Layer4DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer4" category="unspecified">
-<rSolid name="pixel:BModule5Layer4"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer4InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:BModule5Layer4InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer4InnerPixelActive" category="unspecified">
-<rSolid name="pixel:BModule5Layer4InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer4Hybrid" category="unspecified">
-<rSolid name="pixel:BModule5Layer4Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer4Chip" category="unspecified">
-<rSolid name="pixel:BModule5Layer4Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer4DeadAreaRight" category="unspecified">
-<rSolid name="pixel:BModule5Layer4DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer4DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:BModule5Layer4DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer4DeadAreaFront" category="unspecified">
-<rSolid name="pixel:BModule5Layer4DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="BModule5Layer4DeadAreaBack" category="unspecified">
-<rSolid name="pixel:BModule5Layer4DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="RodFlipped4" category="unspecified">
-<rSolid name="pixel:RodFlipped4"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="RodUnflipped4" category="unspecified">
-<rSolid name="pixel:RodUnflipped4"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Layer4" category="unspecified">
-<rSolid name="pixel:Layer4"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc1" category="unspecified">
-<rSolid name="pixel:EModule1Disc1"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc1InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule1Disc1InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc1InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule1Disc1InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc1Hybrid" category="unspecified">
-<rSolid name="pixel:EModule1Disc1Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc1Chip" category="unspecified">
-<rSolid name="pixel:EModule1Disc1Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc1DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule1Disc1DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc1DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule1Disc1DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc1DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule1Disc1DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc1DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule1Disc1DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc1" category="unspecified">
-<rSolid name="pixel:EModule2Disc1"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc1InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule2Disc1InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc1InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule2Disc1InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc1Hybrid" category="unspecified">
-<rSolid name="pixel:EModule2Disc1Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc1Chip" category="unspecified">
-<rSolid name="pixel:EModule2Disc1Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc1DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule2Disc1DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc1DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule2Disc1DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc1DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule2Disc1DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc1DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule2Disc1DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc1" category="unspecified">
-<rSolid name="pixel:EModule3Disc1"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc1InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule3Disc1InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc1InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule3Disc1InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc1Hybrid" category="unspecified">
-<rSolid name="pixel:EModule3Disc1Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc1Chip" category="unspecified">
-<rSolid name="pixel:EModule3Disc1Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc1DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule3Disc1DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc1DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule3Disc1DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc1DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule3Disc1DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc1DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule3Disc1DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc1" category="unspecified">
-<rSolid name="pixel:EModule4Disc1"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc1InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule4Disc1InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc1InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule4Disc1InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc1Hybrid" category="unspecified">
-<rSolid name="pixel:EModule4Disc1Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc1Chip" category="unspecified">
-<rSolid name="pixel:EModule4Disc1Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc1DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule4Disc1DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc1DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule4Disc1DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc1DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule4Disc1DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc1DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule4Disc1DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="Ring1Disc1" category="unspecified">
-<rSolid name="pixel:Ring1Disc1"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring2Disc1" category="unspecified">
-<rSolid name="pixel:Ring2Disc1"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring3Disc1" category="unspecified">
-<rSolid name="pixel:Ring3Disc1"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring4Disc1" category="unspecified">
-<rSolid name="pixel:Ring4Disc1"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Disc1" category="unspecified">
-<rSolid name="pixel:Disc1"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc2" category="unspecified">
-<rSolid name="pixel:EModule1Disc2"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc2InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule1Disc2InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc2InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule1Disc2InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc2Hybrid" category="unspecified">
-<rSolid name="pixel:EModule1Disc2Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc2Chip" category="unspecified">
-<rSolid name="pixel:EModule1Disc2Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc2DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule1Disc2DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc2DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule1Disc2DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc2DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule1Disc2DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc2DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule1Disc2DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc2" category="unspecified">
-<rSolid name="pixel:EModule2Disc2"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc2InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule2Disc2InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc2InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule2Disc2InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc2Hybrid" category="unspecified">
-<rSolid name="pixel:EModule2Disc2Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc2Chip" category="unspecified">
-<rSolid name="pixel:EModule2Disc2Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc2DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule2Disc2DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc2DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule2Disc2DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc2DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule2Disc2DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc2DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule2Disc2DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc2" category="unspecified">
-<rSolid name="pixel:EModule3Disc2"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc2InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule3Disc2InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc2InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule3Disc2InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc2Hybrid" category="unspecified">
-<rSolid name="pixel:EModule3Disc2Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc2Chip" category="unspecified">
-<rSolid name="pixel:EModule3Disc2Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc2DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule3Disc2DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc2DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule3Disc2DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc2DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule3Disc2DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc2DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule3Disc2DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc2" category="unspecified">
-<rSolid name="pixel:EModule4Disc2"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc2InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule4Disc2InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc2InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule4Disc2InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc2Hybrid" category="unspecified">
-<rSolid name="pixel:EModule4Disc2Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc2Chip" category="unspecified">
-<rSolid name="pixel:EModule4Disc2Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc2DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule4Disc2DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc2DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule4Disc2DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc2DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule4Disc2DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc2DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule4Disc2DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="Ring1Disc2" category="unspecified">
-<rSolid name="pixel:Ring1Disc2"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring2Disc2" category="unspecified">
-<rSolid name="pixel:Ring2Disc2"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring3Disc2" category="unspecified">
-<rSolid name="pixel:Ring3Disc2"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring4Disc2" category="unspecified">
-<rSolid name="pixel:Ring4Disc2"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Disc2" category="unspecified">
-<rSolid name="pixel:Disc2"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc3" category="unspecified">
-<rSolid name="pixel:EModule1Disc3"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc3InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule1Disc3InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc3InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule1Disc3InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc3Hybrid" category="unspecified">
-<rSolid name="pixel:EModule1Disc3Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc3Chip" category="unspecified">
-<rSolid name="pixel:EModule1Disc3Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc3DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule1Disc3DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc3DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule1Disc3DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc3DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule1Disc3DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc3DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule1Disc3DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc3" category="unspecified">
-<rSolid name="pixel:EModule2Disc3"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc3InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule2Disc3InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc3InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule2Disc3InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc3Hybrid" category="unspecified">
-<rSolid name="pixel:EModule2Disc3Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc3Chip" category="unspecified">
-<rSolid name="pixel:EModule2Disc3Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc3DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule2Disc3DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc3DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule2Disc3DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc3DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule2Disc3DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc3DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule2Disc3DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc3" category="unspecified">
-<rSolid name="pixel:EModule3Disc3"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc3InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule3Disc3InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc3InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule3Disc3InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc3Hybrid" category="unspecified">
-<rSolid name="pixel:EModule3Disc3Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc3Chip" category="unspecified">
-<rSolid name="pixel:EModule3Disc3Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc3DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule3Disc3DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc3DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule3Disc3DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc3DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule3Disc3DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc3DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule3Disc3DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc3" category="unspecified">
-<rSolid name="pixel:EModule4Disc3"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc3InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule4Disc3InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc3InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule4Disc3InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc3Hybrid" category="unspecified">
-<rSolid name="pixel:EModule4Disc3Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc3Chip" category="unspecified">
-<rSolid name="pixel:EModule4Disc3Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc3DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule4Disc3DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc3DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule4Disc3DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc3DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule4Disc3DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc3DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule4Disc3DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="Ring1Disc3" category="unspecified">
-<rSolid name="pixel:Ring1Disc3"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring2Disc3" category="unspecified">
-<rSolid name="pixel:Ring2Disc3"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring3Disc3" category="unspecified">
-<rSolid name="pixel:Ring3Disc3"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring4Disc3" category="unspecified">
-<rSolid name="pixel:Ring4Disc3"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Disc3" category="unspecified">
-<rSolid name="pixel:Disc3"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc4" category="unspecified">
-<rSolid name="pixel:EModule1Disc4"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc4InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule1Disc4InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc4InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule1Disc4InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc4Hybrid" category="unspecified">
-<rSolid name="pixel:EModule1Disc4Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc4Chip" category="unspecified">
-<rSolid name="pixel:EModule1Disc4Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc4DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule1Disc4DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc4DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule1Disc4DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc4DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule1Disc4DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc4DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule1Disc4DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc4" category="unspecified">
-<rSolid name="pixel:EModule2Disc4"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc4InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule2Disc4InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc4InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule2Disc4InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc4Hybrid" category="unspecified">
-<rSolid name="pixel:EModule2Disc4Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc4Chip" category="unspecified">
-<rSolid name="pixel:EModule2Disc4Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc4DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule2Disc4DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc4DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule2Disc4DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc4DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule2Disc4DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc4DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule2Disc4DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc4" category="unspecified">
-<rSolid name="pixel:EModule3Disc4"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc4InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule3Disc4InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc4InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule3Disc4InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc4Hybrid" category="unspecified">
-<rSolid name="pixel:EModule3Disc4Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc4Chip" category="unspecified">
-<rSolid name="pixel:EModule3Disc4Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc4DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule3Disc4DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc4DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule3Disc4DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc4DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule3Disc4DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc4DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule3Disc4DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc4" category="unspecified">
-<rSolid name="pixel:EModule4Disc4"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc4InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule4Disc4InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc4InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule4Disc4InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc4Hybrid" category="unspecified">
-<rSolid name="pixel:EModule4Disc4Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc4Chip" category="unspecified">
-<rSolid name="pixel:EModule4Disc4Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc4DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule4Disc4DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc4DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule4Disc4DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc4DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule4Disc4DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc4DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule4Disc4DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="Ring1Disc4" category="unspecified">
-<rSolid name="pixel:Ring1Disc4"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring2Disc4" category="unspecified">
-<rSolid name="pixel:Ring2Disc4"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring3Disc4" category="unspecified">
-<rSolid name="pixel:Ring3Disc4"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring4Disc4" category="unspecified">
-<rSolid name="pixel:Ring4Disc4"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Disc4" category="unspecified">
-<rSolid name="pixel:Disc4"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc5" category="unspecified">
-<rSolid name="pixel:EModule1Disc5"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc5InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule1Disc5InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc5InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule1Disc5InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc5Hybrid" category="unspecified">
-<rSolid name="pixel:EModule1Disc5Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc5Chip" category="unspecified">
-<rSolid name="pixel:EModule1Disc5Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc5DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule1Disc5DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc5DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule1Disc5DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc5DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule1Disc5DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc5DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule1Disc5DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc5" category="unspecified">
-<rSolid name="pixel:EModule2Disc5"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc5InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule2Disc5InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc5InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule2Disc5InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc5Hybrid" category="unspecified">
-<rSolid name="pixel:EModule2Disc5Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc5Chip" category="unspecified">
-<rSolid name="pixel:EModule2Disc5Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc5DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule2Disc5DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc5DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule2Disc5DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc5DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule2Disc5DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc5DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule2Disc5DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc5" category="unspecified">
-<rSolid name="pixel:EModule3Disc5"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc5InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule3Disc5InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc5InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule3Disc5InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc5Hybrid" category="unspecified">
-<rSolid name="pixel:EModule3Disc5Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc5Chip" category="unspecified">
-<rSolid name="pixel:EModule3Disc5Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc5DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule3Disc5DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc5DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule3Disc5DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc5DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule3Disc5DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc5DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule3Disc5DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc5" category="unspecified">
-<rSolid name="pixel:EModule4Disc5"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc5InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule4Disc5InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc5InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule4Disc5InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc5Hybrid" category="unspecified">
-<rSolid name="pixel:EModule4Disc5Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc5Chip" category="unspecified">
-<rSolid name="pixel:EModule4Disc5Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc5DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule4Disc5DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc5DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule4Disc5DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc5DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule4Disc5DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc5DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule4Disc5DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="Ring1Disc5" category="unspecified">
-<rSolid name="pixel:Ring1Disc5"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring2Disc5" category="unspecified">
-<rSolid name="pixel:Ring2Disc5"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring3Disc5" category="unspecified">
-<rSolid name="pixel:Ring3Disc5"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring4Disc5" category="unspecified">
-<rSolid name="pixel:Ring4Disc5"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Disc5" category="unspecified">
-<rSolid name="pixel:Disc5"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc6" category="unspecified">
-<rSolid name="pixel:EModule1Disc6"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc6InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule1Disc6InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc6InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule1Disc6InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc6Hybrid" category="unspecified">
-<rSolid name="pixel:EModule1Disc6Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc6Chip" category="unspecified">
-<rSolid name="pixel:EModule1Disc6Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc6DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule1Disc6DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc6DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule1Disc6DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc6DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule1Disc6DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc6DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule1Disc6DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc6" category="unspecified">
-<rSolid name="pixel:EModule2Disc6"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc6InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule2Disc6InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc6InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule2Disc6InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc6Hybrid" category="unspecified">
-<rSolid name="pixel:EModule2Disc6Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc6Chip" category="unspecified">
-<rSolid name="pixel:EModule2Disc6Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc6DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule2Disc6DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc6DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule2Disc6DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc6DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule2Disc6DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc6DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule2Disc6DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc6" category="unspecified">
-<rSolid name="pixel:EModule3Disc6"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc6InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule3Disc6InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc6InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule3Disc6InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc6Hybrid" category="unspecified">
-<rSolid name="pixel:EModule3Disc6Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc6Chip" category="unspecified">
-<rSolid name="pixel:EModule3Disc6Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc6DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule3Disc6DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc6DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule3Disc6DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc6DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule3Disc6DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc6DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule3Disc6DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc6" category="unspecified">
-<rSolid name="pixel:EModule4Disc6"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc6InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule4Disc6InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc6InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule4Disc6InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc6Hybrid" category="unspecified">
-<rSolid name="pixel:EModule4Disc6Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc6Chip" category="unspecified">
-<rSolid name="pixel:EModule4Disc6Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc6DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule4Disc6DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc6DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule4Disc6DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc6DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule4Disc6DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc6DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule4Disc6DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="Ring1Disc6" category="unspecified">
-<rSolid name="pixel:Ring1Disc6"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring2Disc6" category="unspecified">
-<rSolid name="pixel:Ring2Disc6"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring3Disc6" category="unspecified">
-<rSolid name="pixel:Ring3Disc6"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring4Disc6" category="unspecified">
-<rSolid name="pixel:Ring4Disc6"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Disc6" category="unspecified">
-<rSolid name="pixel:Disc6"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc7" category="unspecified">
-<rSolid name="pixel:EModule1Disc7"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc7InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule1Disc7InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc7InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule1Disc7InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc7Hybrid" category="unspecified">
-<rSolid name="pixel:EModule1Disc7Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc7Chip" category="unspecified">
-<rSolid name="pixel:EModule1Disc7Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc7DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule1Disc7DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc7DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule1Disc7DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc7DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule1Disc7DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc7DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule1Disc7DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc7" category="unspecified">
-<rSolid name="pixel:EModule2Disc7"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc7InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule2Disc7InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc7InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule2Disc7InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc7Hybrid" category="unspecified">
-<rSolid name="pixel:EModule2Disc7Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc7Chip" category="unspecified">
-<rSolid name="pixel:EModule2Disc7Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc7DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule2Disc7DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc7DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule2Disc7DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc7DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule2Disc7DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc7DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule2Disc7DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc7" category="unspecified">
-<rSolid name="pixel:EModule3Disc7"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc7InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule3Disc7InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc7InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule3Disc7InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc7Hybrid" category="unspecified">
-<rSolid name="pixel:EModule3Disc7Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc7Chip" category="unspecified">
-<rSolid name="pixel:EModule3Disc7Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc7DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule3Disc7DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc7DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule3Disc7DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc7DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule3Disc7DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc7DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule3Disc7DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc7" category="unspecified">
-<rSolid name="pixel:EModule4Disc7"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc7InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule4Disc7InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc7InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule4Disc7InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc7Hybrid" category="unspecified">
-<rSolid name="pixel:EModule4Disc7Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc7Chip" category="unspecified">
-<rSolid name="pixel:EModule4Disc7Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc7DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule4Disc7DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc7DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule4Disc7DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc7DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule4Disc7DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc7DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule4Disc7DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="Ring1Disc7" category="unspecified">
-<rSolid name="pixel:Ring1Disc7"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring2Disc7" category="unspecified">
-<rSolid name="pixel:Ring2Disc7"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring3Disc7" category="unspecified">
-<rSolid name="pixel:Ring3Disc7"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring4Disc7" category="unspecified">
-<rSolid name="pixel:Ring4Disc7"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Disc7" category="unspecified">
-<rSolid name="pixel:Disc7"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc8" category="unspecified">
-<rSolid name="pixel:EModule1Disc8"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc8InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule1Disc8InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc8InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule1Disc8InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc8Hybrid" category="unspecified">
-<rSolid name="pixel:EModule1Disc8Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc8Chip" category="unspecified">
-<rSolid name="pixel:EModule1Disc8Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc8DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule1Disc8DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc8DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule1Disc8DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc8DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule1Disc8DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc8DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule1Disc8DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc8" category="unspecified">
-<rSolid name="pixel:EModule2Disc8"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc8InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule2Disc8InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc8InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule2Disc8InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc8Hybrid" category="unspecified">
-<rSolid name="pixel:EModule2Disc8Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc8Chip" category="unspecified">
-<rSolid name="pixel:EModule2Disc8Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc8DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule2Disc8DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc8DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule2Disc8DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc8DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule2Disc8DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc8DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule2Disc8DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc8" category="unspecified">
-<rSolid name="pixel:EModule3Disc8"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc8InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule3Disc8InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc8InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule3Disc8InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc8Hybrid" category="unspecified">
-<rSolid name="pixel:EModule3Disc8Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc8Chip" category="unspecified">
-<rSolid name="pixel:EModule3Disc8Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc8DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule3Disc8DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc8DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule3Disc8DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc8DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule3Disc8DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc8DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule3Disc8DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc8" category="unspecified">
-<rSolid name="pixel:EModule4Disc8"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc8InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule4Disc8InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc8InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule4Disc8InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc8Hybrid" category="unspecified">
-<rSolid name="pixel:EModule4Disc8Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc8Chip" category="unspecified">
-<rSolid name="pixel:EModule4Disc8Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc8DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule4Disc8DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc8DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule4Disc8DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc8DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule4Disc8DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc8DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule4Disc8DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="Ring1Disc8" category="unspecified">
-<rSolid name="pixel:Ring1Disc8"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring2Disc8" category="unspecified">
-<rSolid name="pixel:Ring2Disc8"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring3Disc8" category="unspecified">
-<rSolid name="pixel:Ring3Disc8"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring4Disc8" category="unspecified">
-<rSolid name="pixel:Ring4Disc8"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Disc8" category="unspecified">
-<rSolid name="pixel:Disc8"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc9" category="unspecified">
-<rSolid name="pixel:EModule1Disc9"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc9InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule1Disc9InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc9InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule1Disc9InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc9Hybrid" category="unspecified">
-<rSolid name="pixel:EModule1Disc9Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc9Chip" category="unspecified">
-<rSolid name="pixel:EModule1Disc9Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc9DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule1Disc9DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc9DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule1Disc9DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc9DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule1Disc9DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc9DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule1Disc9DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc9" category="unspecified">
-<rSolid name="pixel:EModule2Disc9"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc9InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule2Disc9InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc9InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule2Disc9InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc9Hybrid" category="unspecified">
-<rSolid name="pixel:EModule2Disc9Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc9Chip" category="unspecified">
-<rSolid name="pixel:EModule2Disc9Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc9DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule2Disc9DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc9DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule2Disc9DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc9DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule2Disc9DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc9DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule2Disc9DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc9" category="unspecified">
-<rSolid name="pixel:EModule3Disc9"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc9InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule3Disc9InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc9InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule3Disc9InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc9Hybrid" category="unspecified">
-<rSolid name="pixel:EModule3Disc9Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc9Chip" category="unspecified">
-<rSolid name="pixel:EModule3Disc9Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc9DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule3Disc9DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc9DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule3Disc9DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc9DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule3Disc9DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc9DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule3Disc9DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc9" category="unspecified">
-<rSolid name="pixel:EModule4Disc9"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc9InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule4Disc9InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc9InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule4Disc9InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc9Hybrid" category="unspecified">
-<rSolid name="pixel:EModule4Disc9Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc9Chip" category="unspecified">
-<rSolid name="pixel:EModule4Disc9Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc9DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule4Disc9DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc9DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule4Disc9DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc9DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule4Disc9DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc9DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule4Disc9DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc9" category="unspecified">
-<rSolid name="pixel:EModule5Disc9"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc9InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule5Disc9InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc9InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule5Disc9InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc9Hybrid" category="unspecified">
-<rSolid name="pixel:EModule5Disc9Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc9Chip" category="unspecified">
-<rSolid name="pixel:EModule5Disc9Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc9DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule5Disc9DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc9DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule5Disc9DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc9DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule5Disc9DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc9DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule5Disc9DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="Ring1Disc9" category="unspecified">
-<rSolid name="pixel:Ring1Disc9"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring2Disc9" category="unspecified">
-<rSolid name="pixel:Ring2Disc9"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring3Disc9" category="unspecified">
-<rSolid name="pixel:Ring3Disc9"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring4Disc9" category="unspecified">
-<rSolid name="pixel:Ring4Disc9"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring5Disc9" category="unspecified">
-<rSolid name="pixel:Ring5Disc9"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Disc9" category="unspecified">
-<rSolid name="pixel:Disc9"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc10" category="unspecified">
-<rSolid name="pixel:EModule1Disc10"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc10InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule1Disc10InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc10InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule1Disc10InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc10Hybrid" category="unspecified">
-<rSolid name="pixel:EModule1Disc10Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc10Chip" category="unspecified">
-<rSolid name="pixel:EModule1Disc10Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc10DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule1Disc10DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc10DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule1Disc10DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc10DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule1Disc10DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc10DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule1Disc10DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc10" category="unspecified">
-<rSolid name="pixel:EModule2Disc10"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc10InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule2Disc10InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc10InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule2Disc10InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc10Hybrid" category="unspecified">
-<rSolid name="pixel:EModule2Disc10Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc10Chip" category="unspecified">
-<rSolid name="pixel:EModule2Disc10Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc10DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule2Disc10DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc10DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule2Disc10DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc10DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule2Disc10DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc10DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule2Disc10DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc10" category="unspecified">
-<rSolid name="pixel:EModule3Disc10"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc10InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule3Disc10InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc10InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule3Disc10InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc10Hybrid" category="unspecified">
-<rSolid name="pixel:EModule3Disc10Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc10Chip" category="unspecified">
-<rSolid name="pixel:EModule3Disc10Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc10DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule3Disc10DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc10DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule3Disc10DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc10DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule3Disc10DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc10DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule3Disc10DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc10" category="unspecified">
-<rSolid name="pixel:EModule4Disc10"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc10InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule4Disc10InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc10InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule4Disc10InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc10Hybrid" category="unspecified">
-<rSolid name="pixel:EModule4Disc10Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc10Chip" category="unspecified">
-<rSolid name="pixel:EModule4Disc10Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc10DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule4Disc10DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc10DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule4Disc10DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc10DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule4Disc10DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc10DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule4Disc10DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc10" category="unspecified">
-<rSolid name="pixel:EModule5Disc10"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc10InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule5Disc10InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc10InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule5Disc10InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc10Hybrid" category="unspecified">
-<rSolid name="pixel:EModule5Disc10Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc10Chip" category="unspecified">
-<rSolid name="pixel:EModule5Disc10Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc10DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule5Disc10DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc10DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule5Disc10DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc10DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule5Disc10DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc10DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule5Disc10DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="Ring1Disc10" category="unspecified">
-<rSolid name="pixel:Ring1Disc10"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring2Disc10" category="unspecified">
-<rSolid name="pixel:Ring2Disc10"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring3Disc10" category="unspecified">
-<rSolid name="pixel:Ring3Disc10"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring4Disc10" category="unspecified">
-<rSolid name="pixel:Ring4Disc10"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring5Disc10" category="unspecified">
-<rSolid name="pixel:Ring5Disc10"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Disc10" category="unspecified">
-<rSolid name="pixel:Disc10"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc11" category="unspecified">
-<rSolid name="pixel:EModule1Disc11"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc11InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule1Disc11InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc11InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule1Disc11InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc11Hybrid" category="unspecified">
-<rSolid name="pixel:EModule1Disc11Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc11Chip" category="unspecified">
-<rSolid name="pixel:EModule1Disc11Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc11DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule1Disc11DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc11DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule1Disc11DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc11DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule1Disc11DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc11DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule1Disc11DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc11" category="unspecified">
-<rSolid name="pixel:EModule2Disc11"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc11InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule2Disc11InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc11InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule2Disc11InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc11Hybrid" category="unspecified">
-<rSolid name="pixel:EModule2Disc11Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc11Chip" category="unspecified">
-<rSolid name="pixel:EModule2Disc11Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc11DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule2Disc11DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc11DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule2Disc11DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc11DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule2Disc11DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc11DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule2Disc11DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc11" category="unspecified">
-<rSolid name="pixel:EModule3Disc11"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc11InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule3Disc11InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc11InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule3Disc11InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc11Hybrid" category="unspecified">
-<rSolid name="pixel:EModule3Disc11Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc11Chip" category="unspecified">
-<rSolid name="pixel:EModule3Disc11Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc11DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule3Disc11DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc11DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule3Disc11DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc11DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule3Disc11DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc11DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule3Disc11DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc11" category="unspecified">
-<rSolid name="pixel:EModule4Disc11"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc11InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule4Disc11InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc11InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule4Disc11InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc11Hybrid" category="unspecified">
-<rSolid name="pixel:EModule4Disc11Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc11Chip" category="unspecified">
-<rSolid name="pixel:EModule4Disc11Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc11DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule4Disc11DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc11DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule4Disc11DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc11DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule4Disc11DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc11DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule4Disc11DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc11" category="unspecified">
-<rSolid name="pixel:EModule5Disc11"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc11InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule5Disc11InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc11InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule5Disc11InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc11Hybrid" category="unspecified">
-<rSolid name="pixel:EModule5Disc11Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc11Chip" category="unspecified">
-<rSolid name="pixel:EModule5Disc11Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc11DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule5Disc11DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc11DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule5Disc11DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc11DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule5Disc11DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc11DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule5Disc11DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="Ring1Disc11" category="unspecified">
-<rSolid name="pixel:Ring1Disc11"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring2Disc11" category="unspecified">
-<rSolid name="pixel:Ring2Disc11"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring3Disc11" category="unspecified">
-<rSolid name="pixel:Ring3Disc11"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring4Disc11" category="unspecified">
-<rSolid name="pixel:Ring4Disc11"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring5Disc11" category="unspecified">
-<rSolid name="pixel:Ring5Disc11"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Disc11" category="unspecified">
-<rSolid name="pixel:Disc11"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc12" category="unspecified">
-<rSolid name="pixel:EModule1Disc12"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc12InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule1Disc12InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc12InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule1Disc12InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc12Hybrid" category="unspecified">
-<rSolid name="pixel:EModule1Disc12Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc12Chip" category="unspecified">
-<rSolid name="pixel:EModule1Disc12Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc12DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule1Disc12DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc12DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule1Disc12DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc12DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule1Disc12DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule1Disc12DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule1Disc12DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc12" category="unspecified">
-<rSolid name="pixel:EModule2Disc12"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc12InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule2Disc12InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc12InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule2Disc12InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc12Hybrid" category="unspecified">
-<rSolid name="pixel:EModule2Disc12Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc12Chip" category="unspecified">
-<rSolid name="pixel:EModule2Disc12Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc12DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule2Disc12DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc12DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule2Disc12DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc12DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule2Disc12DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule2Disc12DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule2Disc12DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc12" category="unspecified">
-<rSolid name="pixel:EModule3Disc12"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc12InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule3Disc12InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc12InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule3Disc12InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc12Hybrid" category="unspecified">
-<rSolid name="pixel:EModule3Disc12Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc12Chip" category="unspecified">
-<rSolid name="pixel:EModule3Disc12Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc12DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule3Disc12DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc12DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule3Disc12DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc12DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule3Disc12DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule3Disc12DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule3Disc12DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc12" category="unspecified">
-<rSolid name="pixel:EModule4Disc12"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc12InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule4Disc12InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc12InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule4Disc12InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc12Hybrid" category="unspecified">
-<rSolid name="pixel:EModule4Disc12Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc12Chip" category="unspecified">
-<rSolid name="pixel:EModule4Disc12Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc12DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule4Disc12DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc12DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule4Disc12DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc12DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule4Disc12DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule4Disc12DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule4Disc12DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc12" category="unspecified">
-<rSolid name="pixel:EModule5Disc12"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc12InnerPixelwafer" category="unspecified">
-<rSolid name="pixel:EModule5Disc12InnerPixelwafer"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc12InnerPixelActive" category="unspecified">
-<rSolid name="pixel:EModule5Disc12InnerPixelActive"/>
-<rMaterial name="tracker:tkLayout_SenSi"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc12Hybrid" category="unspecified">
-<rSolid name="pixel:EModule5Disc12Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc12Chip" category="unspecified">
-<rSolid name="pixel:EModule5Disc12Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc12DeadAreaRight" category="unspecified">
-<rSolid name="pixel:EModule5Disc12DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc12DeadAreaLeft" category="unspecified">
-<rSolid name="pixel:EModule5Disc12DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc12DeadAreaFront" category="unspecified">
-<rSolid name="pixel:EModule5Disc12DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="EModule5Disc12DeadAreaBack" category="unspecified">
-<rSolid name="pixel:EModule5Disc12DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
-</LogicalPart>
-<LogicalPart name="Ring1Disc12" category="unspecified">
-<rSolid name="pixel:Ring1Disc12"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring2Disc12" category="unspecified">
-<rSolid name="pixel:Ring2Disc12"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring3Disc12" category="unspecified">
-<rSolid name="pixel:Ring3Disc12"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring4Disc12" category="unspecified">
-<rSolid name="pixel:Ring4Disc12"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Ring5Disc12" category="unspecified">
-<rSolid name="pixel:Ring5Disc12"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="Disc12" category="unspecified">
-<rSolid name="pixel:Disc12"/>
-<rMaterial name="materials:Air"/>
-</LogicalPart>
-<LogicalPart name="serviceR176Z1425" category="unspecified">
-<rSolid name="pixel:serviceR176Z1425"/>
-<rMaterial name="pixel:servicecompositeR176Z1425"/>
-</LogicalPart>
-<LogicalPart name="serviceR248Z1609" category="unspecified">
-<rSolid name="pixel:serviceR248Z1609"/>
-<rMaterial name="pixel:servicecompositeR248Z1609"/>
-</LogicalPart>
-<LogicalPart name="serviceR228Z1609" category="unspecified">
-<rSolid name="pixel:serviceR228Z1609"/>
-<rMaterial name="pixel:servicecompositeR228Z1609"/>
-</LogicalPart>
-<LogicalPart name="serviceR209Z1609" category="unspecified">
-<rSolid name="pixel:serviceR209Z1609"/>
-<rMaterial name="pixel:servicecompositeR209Z1609"/>
-</LogicalPart>
-<LogicalPart name="serviceR192Z1609" category="unspecified">
-<rSolid name="pixel:serviceR192Z1609"/>
-<rMaterial name="pixel:servicecompositeR192Z1609"/>
-</LogicalPart>
-<LogicalPart name="serviceR176Z1609" category="unspecified">
-<rSolid name="pixel:serviceR176Z1609"/>
-<rMaterial name="pixel:servicecompositeR176Z1609"/>
-</LogicalPart>
-<LogicalPart name="serviceR270Z2087" category="unspecified">
-<rSolid name="pixel:serviceR270Z2087"/>
-<rMaterial name="pixel:servicecompositeR270Z2087"/>
-</LogicalPart>
-<LogicalPart name="serviceR270Z2567" category="unspecified">
-<rSolid name="pixel:serviceR270Z2567"/>
-<rMaterial name="pixel:servicecompositeR270Z2567"/>
-</LogicalPart>
-<LogicalPart name="serviceR277Z2580" category="unspecified">
-<rSolid name="pixel:serviceR277Z2580"/>
-<rMaterial name="pixel:servicecompositeR277Z2580"/>
-</LogicalPart>
-<LogicalPart name="serviceR176Z165" category="unspecified">
-<rSolid name="pixel:serviceR176Z165"/>
-<rMaterial name="pixel:servicecompositeR176Z165"/>
-</LogicalPart>
-<LogicalPart name="serviceR181Z165" category="unspecified">
-<rSolid name="pixel:serviceR181Z165"/>
-<rMaterial name="pixel:servicecompositeR181Z165"/>
-</LogicalPart>
-<LogicalPart name="serviceR178Z818BarrelPart" category="unspecified">
-<rSolid name="pixel:serviceR178Z818BarrelPart"/>
-<rMaterial name="pixel:servicecompositeR178Z818"/>
-</LogicalPart>
-<LogicalPart name="serviceR178Z818EndcapsPart" category="unspecified">
-<rSolid name="pixel:serviceR178Z818EndcapsPart"/>
-<rMaterial name="pixel:servicecompositeR178Z818"/>
-</LogicalPart>
-<LogicalPart name="serviceR34Z207" category="unspecified">
-<rSolid name="pixel:serviceR34Z207"/>
-<rMaterial name="pixel:servicecompositeR34Z207"/>
-</LogicalPart>
-<LogicalPart name="serviceR34Z11" category="unspecified">
-<rSolid name="pixel:serviceR34Z11"/>
-<rMaterial name="pixel:servicecompositeR34Z11"/>
-</LogicalPart>
-<LogicalPart name="serviceR176Z109" category="unspecified">
-<rSolid name="pixel:serviceR176Z109"/>
-<rMaterial name="pixel:servicecompositeR176Z109"/>
-</LogicalPart>
-<LogicalPart name="serviceR179Z110" category="unspecified">
-<rSolid name="pixel:serviceR179Z110"/>
-<rMaterial name="pixel:servicecompositeR179Z110"/>
-</LogicalPart>
-<LogicalPart name="serviceR34Z44" category="unspecified">
-<rSolid name="pixel:serviceR34Z44"/>
-<rMaterial name="pixel:servicecompositeR34Z44"/>
-</LogicalPart>
-<LogicalPart name="serviceR34Z88" category="unspecified">
-<rSolid name="pixel:serviceR34Z88"/>
-<rMaterial name="pixel:servicecompositeR34Z88"/>
-</LogicalPart>
-<LogicalPart name="serviceR34Z133" category="unspecified">
-<rSolid name="pixel:serviceR34Z133"/>
-<rMaterial name="pixel:servicecompositeR34Z133"/>
-</LogicalPart>
-<LogicalPart name="serviceR34Z177" category="unspecified">
-<rSolid name="pixel:serviceR34Z177"/>
-<rMaterial name="pixel:servicecompositeR34Z177"/>
-</LogicalPart>
-<LogicalPart name="serviceR34Z202" category="unspecified">
-<rSolid name="pixel:serviceR34Z202"/>
-<rMaterial name="pixel:servicecompositeR34Z202"/>
-</LogicalPart>
-<LogicalPart name="serviceR64Z207" category="unspecified">
-<rSolid name="pixel:serviceR64Z207"/>
-<rMaterial name="pixel:servicecompositeR64Z207"/>
-</LogicalPart>
-<LogicalPart name="serviceR64Z11" category="unspecified">
-<rSolid name="pixel:serviceR64Z11"/>
-<rMaterial name="pixel:servicecompositeR64Z11"/>
-</LogicalPart>
-<LogicalPart name="serviceR64Z44" category="unspecified">
-<rSolid name="pixel:serviceR64Z44"/>
-<rMaterial name="pixel:servicecompositeR64Z44"/>
-</LogicalPart>
-<LogicalPart name="serviceR64Z88" category="unspecified">
-<rSolid name="pixel:serviceR64Z88"/>
-<rMaterial name="pixel:servicecompositeR64Z88"/>
-</LogicalPart>
-<LogicalPart name="serviceR64Z133" category="unspecified">
-<rSolid name="pixel:serviceR64Z133"/>
-<rMaterial name="pixel:servicecompositeR64Z133"/>
-</LogicalPart>
-<LogicalPart name="serviceR64Z177" category="unspecified">
-<rSolid name="pixel:serviceR64Z177"/>
-<rMaterial name="pixel:servicecompositeR64Z177"/>
-</LogicalPart>
-<LogicalPart name="serviceR64Z202" category="unspecified">
-<rSolid name="pixel:serviceR64Z202"/>
-<rMaterial name="pixel:servicecompositeR64Z202"/>
-</LogicalPart>
-<LogicalPart name="serviceR105Z207" category="unspecified">
-<rSolid name="pixel:serviceR105Z207"/>
-<rMaterial name="pixel:servicecompositeR105Z207"/>
-</LogicalPart>
-<LogicalPart name="serviceR105Z11" category="unspecified">
-<rSolid name="pixel:serviceR105Z11"/>
-<rMaterial name="pixel:servicecompositeR105Z11"/>
-</LogicalPart>
-<LogicalPart name="serviceR105Z44" category="unspecified">
-<rSolid name="pixel:serviceR105Z44"/>
-<rMaterial name="pixel:servicecompositeR105Z44"/>
-</LogicalPart>
-<LogicalPart name="serviceR105Z88" category="unspecified">
-<rSolid name="pixel:serviceR105Z88"/>
-<rMaterial name="pixel:servicecompositeR105Z88"/>
-</LogicalPart>
-<LogicalPart name="serviceR105Z133" category="unspecified">
-<rSolid name="pixel:serviceR105Z133"/>
-<rMaterial name="pixel:servicecompositeR105Z133"/>
-</LogicalPart>
-<LogicalPart name="serviceR105Z177" category="unspecified">
-<rSolid name="pixel:serviceR105Z177"/>
-<rMaterial name="pixel:servicecompositeR105Z177"/>
-</LogicalPart>
-<LogicalPart name="serviceR105Z202" category="unspecified">
-<rSolid name="pixel:serviceR105Z202"/>
-<rMaterial name="pixel:servicecompositeR105Z202"/>
-</LogicalPart>
-<LogicalPart name="serviceR145Z207" category="unspecified">
-<rSolid name="pixel:serviceR145Z207"/>
-<rMaterial name="pixel:servicecompositeR145Z207"/>
-</LogicalPart>
-<LogicalPart name="serviceR145Z11" category="unspecified">
-<rSolid name="pixel:serviceR145Z11"/>
-<rMaterial name="pixel:servicecompositeR145Z11"/>
-</LogicalPart>
-<LogicalPart name="serviceR145Z44" category="unspecified">
-<rSolid name="pixel:serviceR145Z44"/>
-<rMaterial name="pixel:servicecompositeR145Z44"/>
-</LogicalPart>
-<LogicalPart name="serviceR145Z88" category="unspecified">
-<rSolid name="pixel:serviceR145Z88"/>
-<rMaterial name="pixel:servicecompositeR145Z88"/>
-</LogicalPart>
-<LogicalPart name="serviceR145Z133" category="unspecified">
-<rSolid name="pixel:serviceR145Z133"/>
-<rMaterial name="pixel:servicecompositeR145Z133"/>
-</LogicalPart>
-<LogicalPart name="serviceR145Z177" category="unspecified">
-<rSolid name="pixel:serviceR145Z177"/>
-<rMaterial name="pixel:servicecompositeR145Z177"/>
-</LogicalPart>
-<LogicalPart name="serviceR145Z202" category="unspecified">
-<rSolid name="pixel:serviceR145Z202"/>
-<rMaterial name="pixel:servicecompositeR145Z202"/>
-</LogicalPart>
-<LogicalPart name="serviceR165Z271" category="unspecified">
-<rSolid name="pixel:serviceR165Z271"/>
-<rMaterial name="pixel:servicecompositeR165Z271"/>
-</LogicalPart>
-<LogicalPart name="serviceR28Z259" category="unspecified">
-<rSolid name="pixel:serviceR28Z259"/>
-<rMaterial name="pixel:servicecompositeR28Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR165Z306" category="unspecified">
-<rSolid name="pixel:serviceR165Z306"/>
-<rMaterial name="pixel:servicecompositeR165Z306"/>
-</LogicalPart>
-<LogicalPart name="serviceR168Z284" category="unspecified">
-<rSolid name="pixel:serviceR168Z284"/>
-<rMaterial name="pixel:servicecompositeR168Z284"/>
-</LogicalPart>
-<LogicalPart name="serviceR165Z385" category="unspecified">
-<rSolid name="pixel:serviceR165Z385"/>
-<rMaterial name="pixel:servicecompositeR165Z385"/>
-</LogicalPart>
-<LogicalPart name="serviceR168Z354" category="unspecified">
-<rSolid name="pixel:serviceR168Z354"/>
-<rMaterial name="pixel:servicecompositeR168Z284"/>
-</LogicalPart>
-<LogicalPart name="serviceR165Z487" category="unspecified">
-<rSolid name="pixel:serviceR165Z487"/>
-<rMaterial name="pixel:servicecompositeR165Z487"/>
-</LogicalPart>
-<LogicalPart name="serviceR168Z443" category="unspecified">
-<rSolid name="pixel:serviceR168Z443"/>
-<rMaterial name="pixel:servicecompositeR168Z284"/>
-</LogicalPart>
-<LogicalPart name="serviceR165Z617" category="unspecified">
-<rSolid name="pixel:serviceR165Z617"/>
-<rMaterial name="pixel:servicecompositeR165Z617"/>
-</LogicalPart>
-<LogicalPart name="serviceR168Z557" category="unspecified">
-<rSolid name="pixel:serviceR168Z557"/>
-<rMaterial name="pixel:servicecompositeR168Z284"/>
-</LogicalPart>
-<LogicalPart name="serviceR165Z783" category="unspecified">
-<rSolid name="pixel:serviceR165Z783"/>
-<rMaterial name="pixel:servicecompositeR165Z783"/>
-</LogicalPart>
-<LogicalPart name="serviceR168Z703" category="unspecified">
-<rSolid name="pixel:serviceR168Z703"/>
-<rMaterial name="pixel:servicecompositeR168Z284"/>
-</LogicalPart>
-<LogicalPart name="serviceR165Z996" category="unspecified">
-<rSolid name="pixel:serviceR165Z996"/>
-<rMaterial name="pixel:servicecompositeR165Z996"/>
-</LogicalPart>
-<LogicalPart name="serviceR168Z890" category="unspecified">
-<rSolid name="pixel:serviceR168Z890"/>
-<rMaterial name="pixel:servicecompositeR168Z284"/>
-</LogicalPart>
-<LogicalPart name="serviceR165Z1268" category="unspecified">
-<rSolid name="pixel:serviceR165Z1268"/>
-<rMaterial name="pixel:servicecompositeR165Z1268"/>
-</LogicalPart>
-<LogicalPart name="serviceR168Z1129" category="unspecified">
-<rSolid name="pixel:serviceR168Z1129"/>
-<rMaterial name="pixel:servicecompositeR168Z284"/>
-</LogicalPart>
-<LogicalPart name="serviceR176Z1521" category="unspecified">
-<rSolid name="pixel:serviceR176Z1521"/>
-<rMaterial name="pixel:servicecompositeR176Z1521"/>
-</LogicalPart>
-<LogicalPart name="serviceR178Z1434" category="unspecified">
-<rSolid name="pixel:serviceR178Z1434"/>
-<rMaterial name="pixel:servicecompositeR178Z1434"/>
-</LogicalPart>
-<LogicalPart name="serviceR73Z259" category="unspecified">
-<rSolid name="pixel:serviceR73Z259"/>
-<rMaterial name="pixel:servicecompositeR73Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR93Z259" category="unspecified">
-<rSolid name="pixel:serviceR93Z259"/>
-<rMaterial name="pixel:servicecompositeR93Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR128Z259" category="unspecified">
-<rSolid name="pixel:serviceR128Z259"/>
-<rMaterial name="pixel:servicecompositeR128Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR160Z259" category="unspecified">
-<rSolid name="pixel:serviceR160Z259"/>
-<rMaterial name="pixel:servicecompositeR160Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR165Z341" category="unspecified">
-<rSolid name="pixel:serviceR165Z341"/>
-<rMaterial name="pixel:servicecompositeR165Z341"/>
-</LogicalPart>
-<LogicalPart name="serviceR28Z329" category="unspecified">
-<rSolid name="pixel:serviceR28Z329"/>
-<rMaterial name="pixel:servicecompositeR28Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR73Z329" category="unspecified">
-<rSolid name="pixel:serviceR73Z329"/>
-<rMaterial name="pixel:servicecompositeR73Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR93Z329" category="unspecified">
-<rSolid name="pixel:serviceR93Z329"/>
-<rMaterial name="pixel:servicecompositeR93Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR128Z329" category="unspecified">
-<rSolid name="pixel:serviceR128Z329"/>
-<rMaterial name="pixel:servicecompositeR128Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR160Z329" category="unspecified">
-<rSolid name="pixel:serviceR160Z329"/>
-<rMaterial name="pixel:servicecompositeR160Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR165Z430" category="unspecified">
-<rSolid name="pixel:serviceR165Z430"/>
-<rMaterial name="pixel:servicecompositeR165Z430"/>
-</LogicalPart>
-<LogicalPart name="serviceR28Z418" category="unspecified">
-<rSolid name="pixel:serviceR28Z418"/>
-<rMaterial name="pixel:servicecompositeR28Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR73Z418" category="unspecified">
-<rSolid name="pixel:serviceR73Z418"/>
-<rMaterial name="pixel:servicecompositeR73Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR93Z418" category="unspecified">
-<rSolid name="pixel:serviceR93Z418"/>
-<rMaterial name="pixel:servicecompositeR93Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR128Z418" category="unspecified">
-<rSolid name="pixel:serviceR128Z418"/>
-<rMaterial name="pixel:servicecompositeR128Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR160Z418" category="unspecified">
-<rSolid name="pixel:serviceR160Z418"/>
-<rMaterial name="pixel:servicecompositeR160Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR165Z544" category="unspecified">
-<rSolid name="pixel:serviceR165Z544"/>
-<rMaterial name="pixel:servicecompositeR165Z544"/>
-</LogicalPart>
-<LogicalPart name="serviceR28Z532" category="unspecified">
-<rSolid name="pixel:serviceR28Z532"/>
-<rMaterial name="pixel:servicecompositeR28Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR73Z532" category="unspecified">
-<rSolid name="pixel:serviceR73Z532"/>
-<rMaterial name="pixel:servicecompositeR73Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR93Z532" category="unspecified">
-<rSolid name="pixel:serviceR93Z532"/>
-<rMaterial name="pixel:servicecompositeR93Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR128Z532" category="unspecified">
-<rSolid name="pixel:serviceR128Z532"/>
-<rMaterial name="pixel:servicecompositeR128Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR160Z532" category="unspecified">
-<rSolid name="pixel:serviceR160Z532"/>
-<rMaterial name="pixel:servicecompositeR160Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR165Z690" category="unspecified">
-<rSolid name="pixel:serviceR165Z690"/>
-<rMaterial name="pixel:servicecompositeR165Z690"/>
-</LogicalPart>
-<LogicalPart name="serviceR28Z678" category="unspecified">
-<rSolid name="pixel:serviceR28Z678"/>
-<rMaterial name="pixel:servicecompositeR28Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR73Z678" category="unspecified">
-<rSolid name="pixel:serviceR73Z678"/>
-<rMaterial name="pixel:servicecompositeR73Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR93Z678" category="unspecified">
-<rSolid name="pixel:serviceR93Z678"/>
-<rMaterial name="pixel:servicecompositeR93Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR128Z678" category="unspecified">
-<rSolid name="pixel:serviceR128Z678"/>
-<rMaterial name="pixel:servicecompositeR128Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR160Z678" category="unspecified">
-<rSolid name="pixel:serviceR160Z678"/>
-<rMaterial name="pixel:servicecompositeR160Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR165Z877" category="unspecified">
-<rSolid name="pixel:serviceR165Z877"/>
-<rMaterial name="pixel:servicecompositeR165Z877"/>
-</LogicalPart>
-<LogicalPart name="serviceR28Z865" category="unspecified">
-<rSolid name="pixel:serviceR28Z865"/>
-<rMaterial name="pixel:servicecompositeR28Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR73Z865" category="unspecified">
-<rSolid name="pixel:serviceR73Z865"/>
-<rMaterial name="pixel:servicecompositeR73Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR93Z865" category="unspecified">
-<rSolid name="pixel:serviceR93Z865"/>
-<rMaterial name="pixel:servicecompositeR93Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR128Z865" category="unspecified">
-<rSolid name="pixel:serviceR128Z865"/>
-<rMaterial name="pixel:servicecompositeR128Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR160Z865" category="unspecified">
-<rSolid name="pixel:serviceR160Z865"/>
-<rMaterial name="pixel:servicecompositeR160Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR165Z1116" category="unspecified">
-<rSolid name="pixel:serviceR165Z1116"/>
-<rMaterial name="pixel:servicecompositeR165Z1116"/>
-</LogicalPart>
-<LogicalPart name="serviceR28Z1104" category="unspecified">
-<rSolid name="pixel:serviceR28Z1104"/>
-<rMaterial name="pixel:servicecompositeR28Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR73Z1104" category="unspecified">
-<rSolid name="pixel:serviceR73Z1104"/>
-<rMaterial name="pixel:servicecompositeR73Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR93Z1104" category="unspecified">
-<rSolid name="pixel:serviceR93Z1104"/>
-<rMaterial name="pixel:servicecompositeR93Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR128Z1104" category="unspecified">
-<rSolid name="pixel:serviceR128Z1104"/>
-<rMaterial name="pixel:servicecompositeR128Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR160Z1104" category="unspecified">
-<rSolid name="pixel:serviceR160Z1104"/>
-<rMaterial name="pixel:servicecompositeR160Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR165Z1412" category="unspecified">
-<rSolid name="pixel:serviceR165Z1412"/>
-<rMaterial name="pixel:servicecompositeR165Z1412"/>
-</LogicalPart>
-<LogicalPart name="serviceR28Z1409" category="unspecified">
-<rSolid name="pixel:serviceR28Z1409"/>
-<rMaterial name="pixel:servicecompositeR28Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR73Z1409" category="unspecified">
-<rSolid name="pixel:serviceR73Z1409"/>
-<rMaterial name="pixel:servicecompositeR73Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR93Z1409" category="unspecified">
-<rSolid name="pixel:serviceR93Z1409"/>
-<rMaterial name="pixel:servicecompositeR93Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR128Z1409" category="unspecified">
-<rSolid name="pixel:serviceR128Z1409"/>
-<rMaterial name="pixel:servicecompositeR128Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR160Z1409" category="unspecified">
-<rSolid name="pixel:serviceR160Z1409"/>
-<rMaterial name="pixel:servicecompositeR160Z259"/>
-</LogicalPart>
-<LogicalPart name="serviceR259Z1776" category="unspecified">
-<rSolid name="pixel:serviceR259Z1776"/>
-<rMaterial name="pixel:servicecompositeR259Z1776"/>
-</LogicalPart>
-<LogicalPart name="serviceR63Z1759" category="unspecified">
-<rSolid name="pixel:serviceR63Z1759"/>
-<rMaterial name="pixel:servicecompositeR63Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR259Z1894" category="unspecified">
-<rSolid name="pixel:serviceR259Z1894"/>
-<rMaterial name="pixel:servicecompositeR259Z1894"/>
-</LogicalPart>
-<LogicalPart name="serviceR261Z1795" category="unspecified">
-<rSolid name="pixel:serviceR261Z1795"/>
-<rMaterial name="pixel:servicecompositeR261Z1795"/>
-</LogicalPart>
-<LogicalPart name="serviceR259Z2144" category="unspecified">
-<rSolid name="pixel:serviceR259Z2144"/>
-<rMaterial name="pixel:servicecompositeR259Z2144"/>
-</LogicalPart>
-<LogicalPart name="serviceR261Z2030" category="unspecified">
-<rSolid name="pixel:serviceR261Z2030"/>
-<rMaterial name="pixel:servicecompositeR261Z2030"/>
-</LogicalPart>
-<LogicalPart name="serviceR259Z2427" category="unspecified">
-<rSolid name="pixel:serviceR259Z2427"/>
-<rMaterial name="pixel:servicecompositeR259Z2427"/>
-</LogicalPart>
-<LogicalPart name="serviceR261Z2295" category="unspecified">
-<rSolid name="pixel:serviceR261Z2295"/>
-<rMaterial name="pixel:servicecompositeR261Z1795"/>
-</LogicalPart>
-<LogicalPart name="serviceR277Z2625" category="unspecified">
-<rSolid name="pixel:serviceR277Z2625"/>
-<rMaterial name="pixel:servicecompositeR277Z2625"/>
-</LogicalPart>
-<LogicalPart name="serviceR279Z2595" category="unspecified">
-<rSolid name="pixel:serviceR279Z2595"/>
-<rMaterial name="pixel:servicecompositeR279Z2595"/>
-</LogicalPart>
-<LogicalPart name="serviceR108Z1759" category="unspecified">
-<rSolid name="pixel:serviceR108Z1759"/>
-<rMaterial name="pixel:servicecompositeR108Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR149Z1759" category="unspecified">
-<rSolid name="pixel:serviceR149Z1759"/>
-<rMaterial name="pixel:servicecompositeR149Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR189Z1759" category="unspecified">
-<rSolid name="pixel:serviceR189Z1759"/>
-<rMaterial name="pixel:servicecompositeR189Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR232Z1759" category="unspecified">
-<rSolid name="pixel:serviceR232Z1759"/>
-<rMaterial name="pixel:servicecompositeR232Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR254Z1759" category="unspecified">
-<rSolid name="pixel:serviceR254Z1759"/>
-<rMaterial name="pixel:servicecompositeR254Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR259Z2012" category="unspecified">
-<rSolid name="pixel:serviceR259Z2012"/>
-<rMaterial name="pixel:servicecompositeR259Z2012"/>
-</LogicalPart>
-<LogicalPart name="serviceR63Z1995" category="unspecified">
-<rSolid name="pixel:serviceR63Z1995"/>
-<rMaterial name="pixel:servicecompositeR63Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR108Z1995" category="unspecified">
-<rSolid name="pixel:serviceR108Z1995"/>
-<rMaterial name="pixel:servicecompositeR108Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR149Z1995" category="unspecified">
-<rSolid name="pixel:serviceR149Z1995"/>
-<rMaterial name="pixel:servicecompositeR149Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR189Z1995" category="unspecified">
-<rSolid name="pixel:serviceR189Z1995"/>
-<rMaterial name="pixel:servicecompositeR189Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR232Z1995" category="unspecified">
-<rSolid name="pixel:serviceR232Z1995"/>
-<rMaterial name="pixel:servicecompositeR232Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR254Z1995" category="unspecified">
-<rSolid name="pixel:serviceR254Z1995"/>
-<rMaterial name="pixel:servicecompositeR254Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR259Z2277" category="unspecified">
-<rSolid name="pixel:serviceR259Z2277"/>
-<rMaterial name="pixel:servicecompositeR259Z2277"/>
-</LogicalPart>
-<LogicalPart name="serviceR63Z2260" category="unspecified">
-<rSolid name="pixel:serviceR63Z2260"/>
-<rMaterial name="pixel:servicecompositeR63Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR108Z2260" category="unspecified">
-<rSolid name="pixel:serviceR108Z2260"/>
-<rMaterial name="pixel:servicecompositeR108Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR149Z2260" category="unspecified">
-<rSolid name="pixel:serviceR149Z2260"/>
-<rMaterial name="pixel:servicecompositeR149Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR189Z2260" category="unspecified">
-<rSolid name="pixel:serviceR189Z2260"/>
-<rMaterial name="pixel:servicecompositeR189Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR232Z2260" category="unspecified">
-<rSolid name="pixel:serviceR232Z2260"/>
-<rMaterial name="pixel:servicecompositeR232Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR254Z2260" category="unspecified">
-<rSolid name="pixel:serviceR254Z2260"/>
-<rMaterial name="pixel:servicecompositeR254Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR259Z2562" category="unspecified">
-<rSolid name="pixel:serviceR259Z2562"/>
-<rMaterial name="pixel:servicecompositeR259Z2562"/>
-</LogicalPart>
-<LogicalPart name="serviceR63Z2559" category="unspecified">
-<rSolid name="pixel:serviceR63Z2559"/>
-<rMaterial name="pixel:servicecompositeR63Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR108Z2559" category="unspecified">
-<rSolid name="pixel:serviceR108Z2559"/>
-<rMaterial name="pixel:servicecompositeR108Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR149Z2559" category="unspecified">
-<rSolid name="pixel:serviceR149Z2559"/>
-<rMaterial name="pixel:servicecompositeR149Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR189Z2559" category="unspecified">
-<rSolid name="pixel:serviceR189Z2559"/>
-<rMaterial name="pixel:servicecompositeR189Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR232Z2559" category="unspecified">
-<rSolid name="pixel:serviceR232Z2559"/>
-<rMaterial name="pixel:servicecompositeR232Z1759"/>
-</LogicalPart>
-<LogicalPart name="serviceR254Z2559" category="unspecified">
-<rSolid name="pixel:serviceR254Z2559"/>
-<rMaterial name="pixel:servicecompositeR254Z1759"/>
-</LogicalPart>
-<LogicalPart name="supportR188Z113" category="unspecified">
-<rSolid name="pixel:supportR188Z113"/>
-<rMaterial name="pixel:supportcompositeR188Z113"/>
-</LogicalPart>
-<LogicalPart name="supportR188Z914" category="unspecified">
-<rSolid name="pixel:supportR188Z914"/>
-<rMaterial name="pixel:supportcompositeR188Z113"/>
-</LogicalPart>
-<LogicalPart name="supportR188Z1603" category="unspecified">
-<rSolid name="pixel:supportR188Z1603"/>
-<rMaterial name="pixel:supportcompositeR188Z113"/>
-</LogicalPart>
-<LogicalPart name="supportR284Z2129" category="unspecified">
-<rSolid name="pixel:supportR284Z2129"/>
-<rMaterial name="pixel:supportcompositeR188Z113"/>
-</LogicalPart>
-<LogicalPart name="supportR172Z835" category="unspecified">
-<rSolid name="pixel:supportR172Z835"/>
-<rMaterial name="pixel:supportcompositeR172Z835"/>
-</LogicalPart>
-<LogicalPart name="supportR264Z2160" category="unspecified">
-<rSolid name="pixel:supportR264Z2160"/>
-<rMaterial name="pixel:supportcompositeR172Z835"/>
-</LogicalPart>
-<LogicalPart name="supportR38Z101" category="unspecified">
-<rSolid name="pixel:supportR38Z101"/>
-<rMaterial name="pixel:supportcompositeR38Z101"/>
-</LogicalPart>
-<LogicalPart name="supportR68Z101" category="unspecified">
-<rSolid name="pixel:supportR68Z101"/>
-<rMaterial name="pixel:supportcompositeR38Z101"/>
-</LogicalPart>
-<LogicalPart name="supportR109Z101" category="unspecified">
-<rSolid name="pixel:supportR109Z101"/>
-<rMaterial name="pixel:supportcompositeR38Z101"/>
-</LogicalPart>
-<LogicalPart name="supportR38Z221" category="unspecified">
-<rSolid name="pixel:supportR38Z221"/>
-<rMaterial name="pixel:supportcompositeR38Z101"/>
-</LogicalPart>
-<LogicalPart name="supportR68Z221" category="unspecified">
-<rSolid name="pixel:supportR68Z221"/>
-<rMaterial name="pixel:supportcompositeR38Z101"/>
-</LogicalPart>
-<LogicalPart name="supportR109Z221" category="unspecified">
-<rSolid name="pixel:supportR109Z221"/>
-<rMaterial name="pixel:supportcompositeR38Z101"/>
-</LogicalPart>
-</LogicalPartSection>
-<SolidSection label="pixel.xml">
-<Box name="BModule1Layer1" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule1Layer1InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer1InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer1Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule1Layer1Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule1Layer1DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer1DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer1DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer1DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer1" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule2Layer1InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer1InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer1Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule2Layer1Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule2Layer1DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer1DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer1DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer1DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer1" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule3Layer1InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer1InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer1Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule3Layer1Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule3Layer1DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer1DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer1DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer1DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer1" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule4Layer1InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer1InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer1Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule4Layer1Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule4Layer1DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer1DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer1DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer1DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer1" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule5Layer1InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer1InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer1Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule5Layer1Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule5Layer1DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer1DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer1DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer1DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="RodFlipped1" dx="0.585*mm" dy="9.21*mm" dz="199.8*mm"/>
-<Box name="RodUnflipped1" dx="0.585*mm" dy="9.21*mm" dz="199.8*mm"/>
-<Tubs name="Layer1" rMin="26.905*mm" rMax="32.4283*mm" dz="199.81*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="BModule1Layer2" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule1Layer2InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer2InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer2Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule1Layer2Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule1Layer2DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer2DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer2DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer2DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer2" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule2Layer2InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer2InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer2Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule2Layer2Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule2Layer2DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer2DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer2DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer2DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer2" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule3Layer2InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer2InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer2Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule3Layer2Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule3Layer2DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer2DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer2DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer2DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer2" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule4Layer2InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer2InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer2Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule4Layer2Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule4Layer2DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer2DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer2DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer2DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer2" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule5Layer2InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer2InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer2Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule5Layer2Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule5Layer2DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer2DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer2DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer2DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="RodFlipped2" dx="0.585*mm" dy="9.21*mm" dz="199.8*mm"/>
-<Box name="RodUnflipped2" dx="0.585*mm" dy="9.21*mm" dz="199.8*mm"/>
-<Tubs name="Layer2" rMin="57.905*mm" rMax="62.7731*mm" dz="199.81*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="BModule1Layer3" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule1Layer3InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer3InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer3Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule1Layer3Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule1Layer3DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer3DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer3DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer3DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer3" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule2Layer3InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer3InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer3Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule2Layer3Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule2Layer3DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer3DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer3DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer3DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer3" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule3Layer3InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer3InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer3Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule3Layer3Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule3Layer3DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer3DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer3DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer3DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer3" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule4Layer3InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer3InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer3Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule4Layer3Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule4Layer3DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer3DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer3DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer3DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer3" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule5Layer3InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer3InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer3Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule5Layer3Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule5Layer3DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer3DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer3DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer3DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="RodFlipped3" dx="0.585*mm" dy="17.51*mm" dz="199.8*mm"/>
-<Box name="RodUnflipped3" dx="0.585*mm" dy="17.51*mm" dz="199.8*mm"/>
-<Tubs name="Layer3" rMin="97.905*mm" rMax="103.584*mm" dz="199.81*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="BModule1Layer4" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule1Layer4InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer4InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer4Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule1Layer4Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule1Layer4DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer4DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer4DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer4DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer4" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule2Layer4InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer4InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer4Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule2Layer4Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule2Layer4DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer4DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer4DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer4DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer4" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule3Layer4InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer4InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer4Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule3Layer4Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule3Layer4DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer4DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer4DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer4DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer4" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule4Layer4InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer4InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer4Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule4Layer4Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule4Layer4DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer4DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer4DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer4DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer4" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule5Layer4InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer4InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer4Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule5Layer4Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule5Layer4DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer4DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer4DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer4DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="RodFlipped4" dx="0.585*mm" dy="17.51*mm" dz="199.8*mm"/>
-<Box name="RodUnflipped4" dx="0.585*mm" dy="17.51*mm" dz="199.8*mm"/>
-<Tubs name="Layer4" rMin="137.905*mm" rMax="143.169*mm" dz="199.81*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc1" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc1InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc1InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc1Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc1Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc1DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc1DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc1DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc1DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc1" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc1InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc1InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc1Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc1Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc1DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc1DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc1DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc1DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc1" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc1InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc1InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc1Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc1Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc1DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc1DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc1DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc1DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc1" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc1InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc1InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc1Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc1Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc1DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc1DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc1DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc1DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc1" rMin="28.9*mm" rMax="73.8752*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc1" rMin="48.7*mm" rMax="93.5535*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc1" rMin="82.7*mm" rMax="128.299*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc1" rMin="115.69*mm" rMax="161.044*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc1" rMin="28.89*mm" rMax="161.054*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc2" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc2InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc2InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc2Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc2Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc2DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc2DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc2DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc2DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc2" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc2InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc2InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc2Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc2Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc2DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc2DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc2DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc2DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc2" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc2InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc2InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc2Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc2Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc2DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc2DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc2DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc2DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc2" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc2InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc2InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc2Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc2Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc2DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc2DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc2DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc2DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc2" rMin="28.9*mm" rMax="73.8752*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc2" rMin="48.7*mm" rMax="93.5535*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc2" rMin="82.7*mm" rMax="128.299*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc2" rMin="115.69*mm" rMax="161.044*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc2" rMin="28.89*mm" rMax="161.054*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc3" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc3InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc3InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc3Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc3Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc3DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc3DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc3DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc3DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc3" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc3InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc3InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc3Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc3Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc3DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc3DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc3DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc3DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc3" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc3InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc3InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc3Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc3Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc3DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc3DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc3DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc3DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc3" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc3InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc3InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc3Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc3Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc3DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc3DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc3DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc3DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc3" rMin="28.9*mm" rMax="73.8752*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc3" rMin="48.7*mm" rMax="93.5535*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc3" rMin="82.7*mm" rMax="128.299*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc3" rMin="115.69*mm" rMax="161.044*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc3" rMin="28.89*mm" rMax="161.054*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc4" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc4InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc4InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc4Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc4Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc4DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc4DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc4DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc4DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc4" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc4InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc4InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc4Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc4Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc4DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc4DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc4DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc4DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc4" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc4InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc4InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc4Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc4Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc4DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc4DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc4DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc4DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc4" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc4InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc4InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc4Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc4Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc4DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc4DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc4DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc4DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc4" rMin="28.9*mm" rMax="73.8752*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc4" rMin="48.7*mm" rMax="93.5535*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc4" rMin="82.7*mm" rMax="128.299*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc4" rMin="115.69*mm" rMax="161.044*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc4" rMin="28.89*mm" rMax="161.054*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc5" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc5InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc5InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc5Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc5Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc5DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc5DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc5DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc5DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc5" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc5InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc5InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc5Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc5Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc5DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc5DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc5DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc5DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc5" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc5InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc5InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc5Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc5Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc5DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc5DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc5DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc5DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc5" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc5InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc5InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc5Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc5Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc5DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc5DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc5DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc5DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc5" rMin="28.9*mm" rMax="73.8752*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc5" rMin="48.7*mm" rMax="93.5535*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc5" rMin="82.7*mm" rMax="128.299*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc5" rMin="115.69*mm" rMax="161.044*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc5" rMin="28.89*mm" rMax="161.054*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc6" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc6InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc6InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc6Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc6Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc6DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc6DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc6DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc6DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc6" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc6InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc6InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc6Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc6Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc6DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc6DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc6DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc6DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc6" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc6InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc6InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc6Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc6Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc6DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc6DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc6DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc6DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc6" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc6InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc6InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc6Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc6Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc6DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc6DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc6DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc6DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc6" rMin="28.9*mm" rMax="73.8752*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc6" rMin="48.7*mm" rMax="93.5535*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc6" rMin="82.7*mm" rMax="128.299*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc6" rMin="115.69*mm" rMax="161.044*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc6" rMin="28.89*mm" rMax="161.054*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc7" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc7InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc7InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc7Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc7Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc7DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc7DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc7DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc7DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc7" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc7InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc7InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc7Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc7Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc7DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc7DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc7DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc7DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc7" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc7InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc7InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc7Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc7Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc7DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc7DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc7DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc7DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc7" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc7InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc7InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc7Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc7Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc7DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc7DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc7DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc7DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc7" rMin="28.9*mm" rMax="73.8752*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc7" rMin="48.7*mm" rMax="93.5535*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc7" rMin="82.7*mm" rMax="128.299*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc7" rMin="115.69*mm" rMax="161.044*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc7" rMin="28.89*mm" rMax="161.054*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc8" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc8InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc8InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc8Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc8Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc8DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc8DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc8DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc8DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc8" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc8InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc8InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc8Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc8Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc8DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc8DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc8DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc8DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc8" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc8InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc8InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc8Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc8Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc8DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc8DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc8DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc8DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc8" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc8InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc8InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc8Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc8Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc8DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc8DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc8DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc8DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc8" rMin="28.9*mm" rMax="73.8752*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc8" rMin="48.7*mm" rMax="93.5535*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc8" rMin="82.7*mm" rMax="128.299*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc8" rMin="115.69*mm" rMax="161.044*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc8" rMin="28.89*mm" rMax="161.054*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc9" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc9InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc9InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc9Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc9Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc9DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc9DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc9DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc9DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc9" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc9InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc9InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc9Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc9Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc9DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc9DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc9DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc9DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc9" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc9InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc9InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc9Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc9Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc9DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc9DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc9DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc9DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc9" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc9InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc9InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc9Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc9Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc9DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc9DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc9DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc9DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc9" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule5Disc9InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc9InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc9Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule5Disc9Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule5Disc9DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc9DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc9DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc9DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc9" rMin="63.7*mm" rMax="108.491*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc9" rMin="104.7*mm" rMax="149.384*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc9" rMin="144.2*mm" rMax="189.41*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc9" rMin="187.7*mm" rMax="232.759*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring5Disc9" rMin="209.69*mm" rMax="254.692*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc9" rMin="63.69*mm" rMax="254.702*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc10" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc10InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc10InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc10Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc10Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc10DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc10DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc10DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc10DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc10" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc10InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc10InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc10Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc10Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc10DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc10DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc10DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc10DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc10" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc10InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc10InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc10Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc10Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc10DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc10DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc10DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc10DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc10" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc10InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc10InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc10Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc10Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc10DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc10DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc10DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc10DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc10" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule5Disc10InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc10InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc10Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule5Disc10Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule5Disc10DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc10DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc10DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc10DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc10" rMin="63.7*mm" rMax="108.491*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc10" rMin="104.7*mm" rMax="149.384*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc10" rMin="144.2*mm" rMax="189.41*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc10" rMin="187.7*mm" rMax="232.759*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring5Disc10" rMin="209.69*mm" rMax="254.692*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc10" rMin="63.69*mm" rMax="254.702*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc11" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc11InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc11InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc11Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc11Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc11DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc11DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc11DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc11DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc11" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc11InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc11InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc11Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc11Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc11DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc11DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc11DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc11DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc11" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc11InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc11InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc11Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc11Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc11DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc11DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc11DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc11DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc11" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc11InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc11InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc11Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc11Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc11DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc11DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc11DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc11DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc11" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule5Disc11InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc11InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc11Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule5Disc11Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule5Disc11DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc11DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc11DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc11DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc11" rMin="63.7*mm" rMax="108.491*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc11" rMin="104.7*mm" rMax="149.384*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc11" rMin="144.2*mm" rMax="189.41*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc11" rMin="187.7*mm" rMax="232.759*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring5Disc11" rMin="209.69*mm" rMax="254.692*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc11" rMin="63.69*mm" rMax="254.702*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc12" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc12InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc12InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc12Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc12Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc12DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc12DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc12DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc12DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc12" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc12InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc12InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc12Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc12Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc12DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc12DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc12DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc12DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc12" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc12InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc12InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc12Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc12Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc12DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc12DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc12DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc12DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc12" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc12InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc12InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc12Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc12Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc12DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc12DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc12DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc12DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc12" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule5Disc12InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc12InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc12Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule5Disc12Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule5Disc12DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc12DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc12DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc12DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc12" rMin="63.7*mm" rMax="108.491*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc12" rMin="104.7*mm" rMax="149.384*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc12" rMin="144.2*mm" rMax="189.41*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc12" rMin="187.7*mm" rMax="232.759*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring5Disc12" rMin="209.69*mm" rMax="254.692*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc12" rMin="63.69*mm" rMax="254.702*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR176Z1425" rMin="176.838*mm" rMax="178.838*mm" dz="8.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR248Z1609" rMin="248.4*mm" rMax="270.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR228Z1609" rMin="228.169*mm" rMax="248.4*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR209Z1609" rMin="209.586*mm" rMax="228.169*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR192Z1609" rMin="192.517*mm" rMax="209.586*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR176Z1609" rMin="176.837*mm" rMax="192.517*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR270Z2087" rMin="270.525*mm" rMax="272.525*mm" dz="479.238*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR270Z2567" rMin="270.525*mm" rMax="277.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR277Z2580" rMin="277.525*mm" rMax="279.525*mm" dz="14.1625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR176Z165" rMin="176.938*mm" rMax="178.938*mm" dz="55.05*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR181Z165" rMin="181.038*mm" rMax="183.038*mm" dz="55.65*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR178Z818BarrelPart" rMin="178.938*mm" rMax="180.938*mm" dz="3.14*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR178Z818EndcapsPart" rMin="178.938*mm" rMax="180.938*mm" dz="594.728*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR34Z207" rMin="34.138*mm" rMax="64.514*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR34Z11" rMin="34.138*mm" rMax="36.138*mm" dz="10.95*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR176Z109" rMin="176.938*mm" rMax="178.938*mm" dz="0.55*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR179Z110" rMin="179.038*mm" rMax="181.038*mm" dz="109.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR34Z44" rMin="34.138*mm" rMax="36.138*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR34Z88" rMin="34.138*mm" rMax="36.138*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR34Z133" rMin="34.138*mm" rMax="36.138*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR34Z177" rMin="34.138*mm" rMax="36.138*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR34Z202" rMin="34.138*mm" rMax="36.138*mm" dz="2.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR64Z207" rMin="64.614*mm" rMax="105.299*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR64Z11" rMin="64.614*mm" rMax="66.614*mm" dz="10.95*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR64Z44" rMin="64.614*mm" rMax="66.614*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR64Z88" rMin="64.614*mm" rMax="66.614*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR64Z133" rMin="64.614*mm" rMax="66.614*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR64Z177" rMin="64.614*mm" rMax="66.614*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR64Z202" rMin="64.614*mm" rMax="66.614*mm" dz="2.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR105Z207" rMin="105.399*mm" rMax="144.929*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR105Z11" rMin="105.399*mm" rMax="107.399*mm" dz="10.95*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR105Z44" rMin="105.399*mm" rMax="107.399*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR105Z88" rMin="105.399*mm" rMax="107.399*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR105Z133" rMin="105.399*mm" rMax="107.399*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR105Z177" rMin="105.399*mm" rMax="107.399*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR105Z202" rMin="105.399*mm" rMax="107.399*mm" dz="2.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR145Z207" rMin="145.029*mm" rMax="176.738*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR145Z11" rMin="145.029*mm" rMax="147.029*mm" dz="10.95*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR145Z44" rMin="145.029*mm" rMax="147.029*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR145Z88" rMin="145.029*mm" rMax="147.029*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR145Z133" rMin="145.029*mm" rMax="147.029*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR145Z177" rMin="145.029*mm" rMax="147.029*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR145Z202" rMin="145.029*mm" rMax="147.029*mm" dz="2.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z271" rMin="165.938*mm" rMax="167.938*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR28Z259" rMin="28.999*mm" rMax="73.557*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z306" rMin="165.938*mm" rMax="167.938*mm" dz="21.8675*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR168Z284" rMin="168.038*mm" rMax="170.038*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z385" rMin="165.938*mm" rMax="167.938*mm" dz="31.6025*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR168Z354" rMin="168.038*mm" rMax="170.038*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z487" rMin="165.938*mm" rMax="167.938*mm" dz="44.0475*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR168Z443" rMin="168.038*mm" rMax="170.038*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z617" rMin="165.938*mm" rMax="167.938*mm" dz="59.9725*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR168Z557" rMin="168.038*mm" rMax="170.038*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z783" rMin="165.938*mm" rMax="167.938*mm" dz="80.3375*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR168Z703" rMin="168.038*mm" rMax="170.038*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z996" rMin="165.938*mm" rMax="167.938*mm" dz="106.382*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR168Z890" rMin="168.038*mm" rMax="170.038*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z1268" rMin="165.938*mm" rMax="167.938*mm" dz="139.702*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR168Z1129" rMin="168.038*mm" rMax="170.038*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR176Z1521" rMin="176.838*mm" rMax="178.838*mm" dz="86.7*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR178Z1434" rMin="178.938*mm" rMax="180.938*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR73Z259" rMin="73.657*mm" rMax="93.26*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR93Z259" rMin="93.36*mm" rMax="127.967*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR128Z259" rMin="128.067*mm" rMax="160.738*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR160Z259" rMin="160.838*mm" rMax="163.838*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z341" rMin="165.938*mm" rMax="167.938*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR28Z329" rMin="28.999*mm" rMax="73.557*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR73Z329" rMin="73.657*mm" rMax="93.26*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR93Z329" rMin="93.36*mm" rMax="127.967*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR128Z329" rMin="128.067*mm" rMax="160.738*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR160Z329" rMin="160.838*mm" rMax="163.838*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z430" rMin="165.938*mm" rMax="167.938*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR28Z418" rMin="28.999*mm" rMax="73.557*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR73Z418" rMin="73.657*mm" rMax="93.26*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR93Z418" rMin="93.36*mm" rMax="127.967*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR128Z418" rMin="128.067*mm" rMax="160.738*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR160Z418" rMin="160.838*mm" rMax="163.838*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z544" rMin="165.938*mm" rMax="167.938*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR28Z532" rMin="28.999*mm" rMax="73.557*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR73Z532" rMin="73.657*mm" rMax="93.26*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR93Z532" rMin="93.36*mm" rMax="127.967*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR128Z532" rMin="128.067*mm" rMax="160.738*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR160Z532" rMin="160.838*mm" rMax="163.838*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z690" rMin="165.938*mm" rMax="167.938*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR28Z678" rMin="28.999*mm" rMax="73.557*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR73Z678" rMin="73.657*mm" rMax="93.26*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR93Z678" rMin="93.36*mm" rMax="127.967*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR128Z678" rMin="128.067*mm" rMax="160.738*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR160Z678" rMin="160.838*mm" rMax="163.838*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z877" rMin="165.938*mm" rMax="167.938*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR28Z865" rMin="28.999*mm" rMax="73.557*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR73Z865" rMin="73.657*mm" rMax="93.26*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR93Z865" rMin="93.36*mm" rMax="127.967*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR128Z865" rMin="128.067*mm" rMax="160.738*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR160Z865" rMin="160.838*mm" rMax="163.838*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z1116" rMin="165.938*mm" rMax="167.938*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR28Z1104" rMin="28.999*mm" rMax="73.557*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR73Z1104" rMin="73.657*mm" rMax="93.26*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR93Z1104" rMin="93.36*mm" rMax="127.967*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR128Z1104" rMin="128.067*mm" rMax="160.738*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR160Z1104" rMin="160.838*mm" rMax="163.838*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z1412" rMin="165.938*mm" rMax="167.938*mm" dz="3.95*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR28Z1409" rMin="28.999*mm" rMax="73.557*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR73Z1409" rMin="73.657*mm" rMax="93.26*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR93Z1409" rMin="93.36*mm" rMax="127.967*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR128Z1409" rMin="128.067*mm" rMax="160.738*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR160Z1409" rMin="160.838*mm" rMax="163.838*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR259Z1776" rMin="259.625*mm" rMax="261.625*mm" dz="18.1625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR63Z1759" rMin="63.799*mm" rMax="108.21*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR259Z1894" rMin="259.625*mm" rMax="261.625*mm" dz="99.4525*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR261Z1795" rMin="261.725*mm" rMax="263.725*mm" dz="25*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR259Z2144" rMin="259.625*mm" rMax="261.625*mm" dz="114.438*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR261Z2030" rMin="261.725*mm" rMax="263.725*mm" dz="24.9995*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR259Z2427" rMin="259.625*mm" rMax="261.625*mm" dz="131.322*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR261Z2295" rMin="261.725*mm" rMax="263.725*mm" dz="25*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR277Z2625" rMin="277.525*mm" rMax="279.525*mm" dz="30.7875*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR279Z2595" rMin="279.625*mm" rMax="281.625*mm" dz="25*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR108Z1759" rMin="108.31*mm" rMax="149.125*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR149Z1759" rMin="149.225*mm" rMax="189.12*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR189Z1759" rMin="189.22*mm" rMax="232.486*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR232Z1759" rMin="232.586*mm" rMax="254.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR254Z1759" rMin="254.525*mm" rMax="257.525*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR259Z2012" rMin="259.625*mm" rMax="261.625*mm" dz="18.162*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR63Z1995" rMin="63.799*mm" rMax="108.21*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR108Z1995" rMin="108.31*mm" rMax="149.125*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR149Z1995" rMin="149.225*mm" rMax="189.12*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR189Z1995" rMin="189.22*mm" rMax="232.486*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR232Z1995" rMin="232.586*mm" rMax="254.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR254Z1995" rMin="254.525*mm" rMax="257.525*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR259Z2277" rMin="259.625*mm" rMax="261.625*mm" dz="18.163*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR63Z2260" rMin="63.799*mm" rMax="108.21*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR108Z2260" rMin="108.31*mm" rMax="149.125*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR149Z2260" rMin="149.225*mm" rMax="189.12*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR189Z2260" rMin="189.22*mm" rMax="232.486*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR232Z2260" rMin="232.586*mm" rMax="254.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR254Z2260" rMin="254.525*mm" rMax="257.525*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR259Z2562" rMin="259.625*mm" rMax="261.625*mm" dz="3.95*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR63Z2559" rMin="63.799*mm" rMax="108.21*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR108Z2559" rMin="108.31*mm" rMax="149.125*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR149Z2559" rMin="149.225*mm" rMax="189.12*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR189Z2559" rMin="189.22*mm" rMax="232.486*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR232Z2559" rMin="232.586*mm" rMax="254.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR254Z2559" rMin="254.525*mm" rMax="257.525*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR188Z113" rMin="188*mm" rMax="190*mm" dz="113.495*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR188Z914" rMin="188*mm" rMax="190*mm" dz="687.495*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR188Z1603" rMin="188*mm" rMax="286*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR284Z2129" rMin="284*mm" rMax="286*mm" dz="525*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR172Z835" rMin="172*mm" rMax="174*mm" dz="575*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR264Z2160" rMin="264*mm" rMax="266*mm" dz="400*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR38Z101" rMin="38.1387*mm" rMax="56.925*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR68Z101" rMin="68.6143*mm" rMax="96.925*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR109Z101" rMin="109.4*mm" rMax="136.925*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR38Z221" rMin="38.1387*mm" rMax="56.925*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR68Z221" rMin="68.6143*mm" rMax="96.925*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR109Z221" rMin="109.4*mm" rMax="136.925*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-</SolidSection>
-<PosPartSection label="pixel.xml">
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped1"/>
-<rChild name="pixel:BModule1Layer1"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer1"/>
-<rChild name="pixel:BModule1Layer1InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer1InnerPixelwafer"/>
-<rChild name="pixel:BModule1Layer1InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer1"/>
-<rChild name="pixel:BModule1Layer1Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer1"/>
-<rChild name="pixel:BModule1Layer1Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer1"/>
-<rChild name="pixel:BModule1Layer1DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer1"/>
-<rChild name="pixel:BModule1Layer1DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer1"/>
-<rChild name="pixel:BModule1Layer1DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer1"/>
-<rChild name="pixel:BModule1Layer1DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped1"/>
-<rChild name="pixel:BModule2Layer1"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="44.4*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodFlipped1"/>
-<rChild name="pixel:BModule2Layer1"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-44.4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer1"/>
-<rChild name="pixel:BModule2Layer1InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer1InnerPixelwafer"/>
-<rChild name="pixel:BModule2Layer1InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer1"/>
-<rChild name="pixel:BModule2Layer1Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer1"/>
-<rChild name="pixel:BModule2Layer1Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer1"/>
-<rChild name="pixel:BModule2Layer1DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer1"/>
-<rChild name="pixel:BModule2Layer1DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer1"/>
-<rChild name="pixel:BModule2Layer1DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer1"/>
-<rChild name="pixel:BModule2Layer1DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped1"/>
-<rChild name="pixel:BModule3Layer1"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodFlipped1"/>
-<rChild name="pixel:BModule3Layer1"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer1"/>
-<rChild name="pixel:BModule3Layer1InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer1InnerPixelwafer"/>
-<rChild name="pixel:BModule3Layer1InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer1"/>
-<rChild name="pixel:BModule3Layer1Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer1"/>
-<rChild name="pixel:BModule3Layer1Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer1"/>
-<rChild name="pixel:BModule3Layer1DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer1"/>
-<rChild name="pixel:BModule3Layer1DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer1"/>
-<rChild name="pixel:BModule3Layer1DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer1"/>
-<rChild name="pixel:BModule3Layer1DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped1"/>
-<rChild name="pixel:BModule4Layer1"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="133.2*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodFlipped1"/>
-<rChild name="pixel:BModule4Layer1"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-133.2*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer1"/>
-<rChild name="pixel:BModule4Layer1InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer1InnerPixelwafer"/>
-<rChild name="pixel:BModule4Layer1InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer1"/>
-<rChild name="pixel:BModule4Layer1Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer1"/>
-<rChild name="pixel:BModule4Layer1Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer1"/>
-<rChild name="pixel:BModule4Layer1DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer1"/>
-<rChild name="pixel:BModule4Layer1DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer1"/>
-<rChild name="pixel:BModule4Layer1DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer1"/>
-<rChild name="pixel:BModule4Layer1DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped1"/>
-<rChild name="pixel:BModule5Layer1"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="177.6*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodFlipped1"/>
-<rChild name="pixel:BModule5Layer1"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-177.6*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer1"/>
-<rChild name="pixel:BModule5Layer1InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer1InnerPixelwafer"/>
-<rChild name="pixel:BModule5Layer1InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer1"/>
-<rChild name="pixel:BModule5Layer1Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer1"/>
-<rChild name="pixel:BModule5Layer1Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer1"/>
-<rChild name="pixel:BModule5Layer1DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer1"/>
-<rChild name="pixel:BModule5Layer1DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer1"/>
-<rChild name="pixel:BModule5Layer1DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer1"/>
-<rChild name="pixel:BModule5Layer1DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped1"/>
-<rChild name="pixel:BModule1Layer1"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="3.55271e-15*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped1"/>
-<rChild name="pixel:BModule2Layer1"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="44.4*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodUnflipped1"/>
-<rChild name="pixel:BModule2Layer1"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-44.4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped1"/>
-<rChild name="pixel:BModule3Layer1"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodUnflipped1"/>
-<rChild name="pixel:BModule3Layer1"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped1"/>
-<rChild name="pixel:BModule4Layer1"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="133.2*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodUnflipped1"/>
-<rChild name="pixel:BModule4Layer1"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-133.2*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped1"/>
-<rChild name="pixel:BModule5Layer1"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="177.6*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodUnflipped1"/>
-<rChild name="pixel:BModule5Layer1"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-177.6*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:Layer1"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped2"/>
-<rChild name="pixel:BModule1Layer2"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="3.55271e-15*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer2"/>
-<rChild name="pixel:BModule1Layer2InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer2InnerPixelwafer"/>
-<rChild name="pixel:BModule1Layer2InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer2"/>
-<rChild name="pixel:BModule1Layer2Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer2"/>
-<rChild name="pixel:BModule1Layer2Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer2"/>
-<rChild name="pixel:BModule1Layer2DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer2"/>
-<rChild name="pixel:BModule1Layer2DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer2"/>
-<rChild name="pixel:BModule1Layer2DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer2"/>
-<rChild name="pixel:BModule1Layer2DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped2"/>
-<rChild name="pixel:BModule2Layer2"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="44.4*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodFlipped2"/>
-<rChild name="pixel:BModule2Layer2"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-44.4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer2"/>
-<rChild name="pixel:BModule2Layer2InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer2InnerPixelwafer"/>
-<rChild name="pixel:BModule2Layer2InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer2"/>
-<rChild name="pixel:BModule2Layer2Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer2"/>
-<rChild name="pixel:BModule2Layer2Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer2"/>
-<rChild name="pixel:BModule2Layer2DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer2"/>
-<rChild name="pixel:BModule2Layer2DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer2"/>
-<rChild name="pixel:BModule2Layer2DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer2"/>
-<rChild name="pixel:BModule2Layer2DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped2"/>
-<rChild name="pixel:BModule3Layer2"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodFlipped2"/>
-<rChild name="pixel:BModule3Layer2"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer2"/>
-<rChild name="pixel:BModule3Layer2InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer2InnerPixelwafer"/>
-<rChild name="pixel:BModule3Layer2InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer2"/>
-<rChild name="pixel:BModule3Layer2Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer2"/>
-<rChild name="pixel:BModule3Layer2Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer2"/>
-<rChild name="pixel:BModule3Layer2DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer2"/>
-<rChild name="pixel:BModule3Layer2DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer2"/>
-<rChild name="pixel:BModule3Layer2DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer2"/>
-<rChild name="pixel:BModule3Layer2DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped2"/>
-<rChild name="pixel:BModule4Layer2"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="133.2*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodFlipped2"/>
-<rChild name="pixel:BModule4Layer2"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-133.2*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer2"/>
-<rChild name="pixel:BModule4Layer2InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer2InnerPixelwafer"/>
-<rChild name="pixel:BModule4Layer2InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer2"/>
-<rChild name="pixel:BModule4Layer2Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer2"/>
-<rChild name="pixel:BModule4Layer2Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer2"/>
-<rChild name="pixel:BModule4Layer2DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer2"/>
-<rChild name="pixel:BModule4Layer2DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer2"/>
-<rChild name="pixel:BModule4Layer2DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer2"/>
-<rChild name="pixel:BModule4Layer2DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped2"/>
-<rChild name="pixel:BModule5Layer2"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="177.6*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodFlipped2"/>
-<rChild name="pixel:BModule5Layer2"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-177.6*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer2"/>
-<rChild name="pixel:BModule5Layer2InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer2InnerPixelwafer"/>
-<rChild name="pixel:BModule5Layer2InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer2"/>
-<rChild name="pixel:BModule5Layer2Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer2"/>
-<rChild name="pixel:BModule5Layer2Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer2"/>
-<rChild name="pixel:BModule5Layer2DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer2"/>
-<rChild name="pixel:BModule5Layer2DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer2"/>
-<rChild name="pixel:BModule5Layer2DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer2"/>
-<rChild name="pixel:BModule5Layer2DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped2"/>
-<rChild name="pixel:BModule1Layer2"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="3.55271e-15*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped2"/>
-<rChild name="pixel:BModule2Layer2"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="44.4*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodUnflipped2"/>
-<rChild name="pixel:BModule2Layer2"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-44.4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped2"/>
-<rChild name="pixel:BModule3Layer2"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodUnflipped2"/>
-<rChild name="pixel:BModule3Layer2"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped2"/>
-<rChild name="pixel:BModule4Layer2"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="133.2*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodUnflipped2"/>
-<rChild name="pixel:BModule4Layer2"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-133.2*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped2"/>
-<rChild name="pixel:BModule5Layer2"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="177.6*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodUnflipped2"/>
-<rChild name="pixel:BModule5Layer2"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-177.6*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:Layer2"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped3"/>
-<rChild name="pixel:BModule1Layer3"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="7.10543e-15*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer3"/>
-<rChild name="pixel:BModule1Layer3InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer3InnerPixelwafer"/>
-<rChild name="pixel:BModule1Layer3InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer3"/>
-<rChild name="pixel:BModule1Layer3Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer3"/>
-<rChild name="pixel:BModule1Layer3Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer3"/>
-<rChild name="pixel:BModule1Layer3DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer3"/>
-<rChild name="pixel:BModule1Layer3DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer3"/>
-<rChild name="pixel:BModule1Layer3DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer3"/>
-<rChild name="pixel:BModule1Layer3DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped3"/>
-<rChild name="pixel:BModule2Layer3"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="44.4*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodFlipped3"/>
-<rChild name="pixel:BModule2Layer3"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-44.4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer3"/>
-<rChild name="pixel:BModule2Layer3InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer3InnerPixelwafer"/>
-<rChild name="pixel:BModule2Layer3InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer3"/>
-<rChild name="pixel:BModule2Layer3Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer3"/>
-<rChild name="pixel:BModule2Layer3Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer3"/>
-<rChild name="pixel:BModule2Layer3DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer3"/>
-<rChild name="pixel:BModule2Layer3DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer3"/>
-<rChild name="pixel:BModule2Layer3DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer3"/>
-<rChild name="pixel:BModule2Layer3DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped3"/>
-<rChild name="pixel:BModule3Layer3"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodFlipped3"/>
-<rChild name="pixel:BModule3Layer3"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer3"/>
-<rChild name="pixel:BModule3Layer3InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer3InnerPixelwafer"/>
-<rChild name="pixel:BModule3Layer3InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer3"/>
-<rChild name="pixel:BModule3Layer3Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer3"/>
-<rChild name="pixel:BModule3Layer3Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer3"/>
-<rChild name="pixel:BModule3Layer3DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer3"/>
-<rChild name="pixel:BModule3Layer3DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer3"/>
-<rChild name="pixel:BModule3Layer3DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer3"/>
-<rChild name="pixel:BModule3Layer3DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped3"/>
-<rChild name="pixel:BModule4Layer3"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="133.2*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodFlipped3"/>
-<rChild name="pixel:BModule4Layer3"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-133.2*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer3"/>
-<rChild name="pixel:BModule4Layer3InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer3InnerPixelwafer"/>
-<rChild name="pixel:BModule4Layer3InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer3"/>
-<rChild name="pixel:BModule4Layer3Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer3"/>
-<rChild name="pixel:BModule4Layer3Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer3"/>
-<rChild name="pixel:BModule4Layer3DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer3"/>
-<rChild name="pixel:BModule4Layer3DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer3"/>
-<rChild name="pixel:BModule4Layer3DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer3"/>
-<rChild name="pixel:BModule4Layer3DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped3"/>
-<rChild name="pixel:BModule5Layer3"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="177.6*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodFlipped3"/>
-<rChild name="pixel:BModule5Layer3"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-177.6*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer3"/>
-<rChild name="pixel:BModule5Layer3InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer3InnerPixelwafer"/>
-<rChild name="pixel:BModule5Layer3InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer3"/>
-<rChild name="pixel:BModule5Layer3Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer3"/>
-<rChild name="pixel:BModule5Layer3Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer3"/>
-<rChild name="pixel:BModule5Layer3DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer3"/>
-<rChild name="pixel:BModule5Layer3DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer3"/>
-<rChild name="pixel:BModule5Layer3DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer3"/>
-<rChild name="pixel:BModule5Layer3DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped3"/>
-<rChild name="pixel:BModule1Layer3"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="7.10543e-15*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped3"/>
-<rChild name="pixel:BModule2Layer3"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="44.4*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodUnflipped3"/>
-<rChild name="pixel:BModule2Layer3"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-44.4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped3"/>
-<rChild name="pixel:BModule3Layer3"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodUnflipped3"/>
-<rChild name="pixel:BModule3Layer3"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped3"/>
-<rChild name="pixel:BModule4Layer3"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="133.2*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodUnflipped3"/>
-<rChild name="pixel:BModule4Layer3"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-133.2*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped3"/>
-<rChild name="pixel:BModule5Layer3"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="177.6*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodUnflipped3"/>
-<rChild name="pixel:BModule5Layer3"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-177.6*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:Layer3"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped4"/>
-<rChild name="pixel:BModule1Layer4"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="7.10543e-15*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer4"/>
-<rChild name="pixel:BModule1Layer4InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer4InnerPixelwafer"/>
-<rChild name="pixel:BModule1Layer4InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer4"/>
-<rChild name="pixel:BModule1Layer4Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer4"/>
-<rChild name="pixel:BModule1Layer4Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer4"/>
-<rChild name="pixel:BModule1Layer4DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer4"/>
-<rChild name="pixel:BModule1Layer4DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer4"/>
-<rChild name="pixel:BModule1Layer4DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule1Layer4"/>
-<rChild name="pixel:BModule1Layer4DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped4"/>
-<rChild name="pixel:BModule2Layer4"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="44.4*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodFlipped4"/>
-<rChild name="pixel:BModule2Layer4"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-44.4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer4"/>
-<rChild name="pixel:BModule2Layer4InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer4InnerPixelwafer"/>
-<rChild name="pixel:BModule2Layer4InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer4"/>
-<rChild name="pixel:BModule2Layer4Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer4"/>
-<rChild name="pixel:BModule2Layer4Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer4"/>
-<rChild name="pixel:BModule2Layer4DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer4"/>
-<rChild name="pixel:BModule2Layer4DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer4"/>
-<rChild name="pixel:BModule2Layer4DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule2Layer4"/>
-<rChild name="pixel:BModule2Layer4DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped4"/>
-<rChild name="pixel:BModule3Layer4"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodFlipped4"/>
-<rChild name="pixel:BModule3Layer4"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer4"/>
-<rChild name="pixel:BModule3Layer4InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer4InnerPixelwafer"/>
-<rChild name="pixel:BModule3Layer4InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer4"/>
-<rChild name="pixel:BModule3Layer4Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer4"/>
-<rChild name="pixel:BModule3Layer4Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer4"/>
-<rChild name="pixel:BModule3Layer4DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer4"/>
-<rChild name="pixel:BModule3Layer4DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer4"/>
-<rChild name="pixel:BModule3Layer4DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule3Layer4"/>
-<rChild name="pixel:BModule3Layer4DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped4"/>
-<rChild name="pixel:BModule4Layer4"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="133.2*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodFlipped4"/>
-<rChild name="pixel:BModule4Layer4"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-133.2*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer4"/>
-<rChild name="pixel:BModule4Layer4InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer4InnerPixelwafer"/>
-<rChild name="pixel:BModule4Layer4InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer4"/>
-<rChild name="pixel:BModule4Layer4Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer4"/>
-<rChild name="pixel:BModule4Layer4Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer4"/>
-<rChild name="pixel:BModule4Layer4DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer4"/>
-<rChild name="pixel:BModule4Layer4DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer4"/>
-<rChild name="pixel:BModule4Layer4DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule4Layer4"/>
-<rChild name="pixel:BModule4Layer4DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodFlipped4"/>
-<rChild name="pixel:BModule5Layer4"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="177.6*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodFlipped4"/>
-<rChild name="pixel:BModule5Layer4"/>
-<rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-177.6*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer4"/>
-<rChild name="pixel:BModule5Layer4InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer4InnerPixelwafer"/>
-<rChild name="pixel:BModule5Layer4InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer4"/>
-<rChild name="pixel:BModule5Layer4Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer4"/>
-<rChild name="pixel:BModule5Layer4Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer4"/>
-<rChild name="pixel:BModule5Layer4DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer4"/>
-<rChild name="pixel:BModule5Layer4DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer4"/>
-<rChild name="pixel:BModule5Layer4DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:BModule5Layer4"/>
-<rChild name="pixel:BModule5Layer4DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped4"/>
-<rChild name="pixel:BModule1Layer4"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="7.10543e-15*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped4"/>
-<rChild name="pixel:BModule2Layer4"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="44.4*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodUnflipped4"/>
-<rChild name="pixel:BModule2Layer4"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-44.4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped4"/>
-<rChild name="pixel:BModule3Layer4"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodUnflipped4"/>
-<rChild name="pixel:BModule3Layer4"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped4"/>
-<rChild name="pixel:BModule4Layer4"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="133.2*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodUnflipped4"/>
-<rChild name="pixel:BModule4Layer4"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-133.2*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:RodUnflipped4"/>
-<rChild name="pixel:BModule5Layer4"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="177.6*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixel:RodUnflipped4"/>
-<rChild name="pixel:BModule5Layer4"/>
-<rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-177.6*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:Layer4"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc1"/>
-<rChild name="pixel:EModule1Disc1InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc1InnerPixelwafer"/>
-<rChild name="pixel:EModule1Disc1InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc1"/>
-<rChild name="pixel:EModule1Disc1Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc1"/>
-<rChild name="pixel:EModule1Disc1Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc1"/>
-<rChild name="pixel:EModule1Disc1DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc1"/>
-<rChild name="pixel:EModule1Disc1DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc1"/>
-<rChild name="pixel:EModule1Disc1DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc1"/>
-<rChild name="pixel:EModule1Disc1DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc1"/>
-<rChild name="pixel:EModule2Disc1InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc1InnerPixelwafer"/>
-<rChild name="pixel:EModule2Disc1InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc1"/>
-<rChild name="pixel:EModule2Disc1Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc1"/>
-<rChild name="pixel:EModule2Disc1Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc1"/>
-<rChild name="pixel:EModule2Disc1DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc1"/>
-<rChild name="pixel:EModule2Disc1DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc1"/>
-<rChild name="pixel:EModule2Disc1DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc1"/>
-<rChild name="pixel:EModule2Disc1DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc1"/>
-<rChild name="pixel:EModule3Disc1InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc1InnerPixelwafer"/>
-<rChild name="pixel:EModule3Disc1InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc1"/>
-<rChild name="pixel:EModule3Disc1Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc1"/>
-<rChild name="pixel:EModule3Disc1Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc1"/>
-<rChild name="pixel:EModule3Disc1DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc1"/>
-<rChild name="pixel:EModule3Disc1DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc1"/>
-<rChild name="pixel:EModule3Disc1DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc1"/>
-<rChild name="pixel:EModule3Disc1DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc1"/>
-<rChild name="pixel:EModule4Disc1InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc1InnerPixelwafer"/>
-<rChild name="pixel:EModule4Disc1InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc1"/>
-<rChild name="pixel:EModule4Disc1Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc1"/>
-<rChild name="pixel:EModule4Disc1Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc1"/>
-<rChild name="pixel:EModule4Disc1DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc1"/>
-<rChild name="pixel:EModule4Disc1DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc1"/>
-<rChild name="pixel:EModule4Disc1DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc1"/>
-<rChild name="pixel:EModule4Disc1DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc1"/>
-<rChild name="pixel:Ring1Disc1"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc1"/>
-<rChild name="pixel:Ring2Disc1"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc1"/>
-<rChild name="pixel:Ring3Disc1"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc1"/>
-<rChild name="pixel:Ring4Disc1"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:Disc1"/>
-<Translation x="0*mm" y="0*mm" z="-41*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc2"/>
-<rChild name="pixel:EModule1Disc2InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc2InnerPixelwafer"/>
-<rChild name="pixel:EModule1Disc2InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc2"/>
-<rChild name="pixel:EModule1Disc2Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc2"/>
-<rChild name="pixel:EModule1Disc2Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc2"/>
-<rChild name="pixel:EModule1Disc2DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc2"/>
-<rChild name="pixel:EModule1Disc2DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc2"/>
-<rChild name="pixel:EModule1Disc2DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc2"/>
-<rChild name="pixel:EModule1Disc2DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc2"/>
-<rChild name="pixel:EModule2Disc2InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc2InnerPixelwafer"/>
-<rChild name="pixel:EModule2Disc2InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc2"/>
-<rChild name="pixel:EModule2Disc2Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc2"/>
-<rChild name="pixel:EModule2Disc2Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc2"/>
-<rChild name="pixel:EModule2Disc2DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc2"/>
-<rChild name="pixel:EModule2Disc2DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc2"/>
-<rChild name="pixel:EModule2Disc2DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc2"/>
-<rChild name="pixel:EModule2Disc2DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc2"/>
-<rChild name="pixel:EModule3Disc2InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc2InnerPixelwafer"/>
-<rChild name="pixel:EModule3Disc2InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc2"/>
-<rChild name="pixel:EModule3Disc2Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc2"/>
-<rChild name="pixel:EModule3Disc2Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc2"/>
-<rChild name="pixel:EModule3Disc2DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc2"/>
-<rChild name="pixel:EModule3Disc2DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc2"/>
-<rChild name="pixel:EModule3Disc2DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc2"/>
-<rChild name="pixel:EModule3Disc2DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc2"/>
-<rChild name="pixel:EModule4Disc2InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc2InnerPixelwafer"/>
-<rChild name="pixel:EModule4Disc2InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc2"/>
-<rChild name="pixel:EModule4Disc2Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc2"/>
-<rChild name="pixel:EModule4Disc2Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc2"/>
-<rChild name="pixel:EModule4Disc2DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc2"/>
-<rChild name="pixel:EModule4Disc2DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc2"/>
-<rChild name="pixel:EModule4Disc2DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc2"/>
-<rChild name="pixel:EModule4Disc2DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc2"/>
-<rChild name="pixel:Ring1Disc2"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc2"/>
-<rChild name="pixel:Ring2Disc2"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc2"/>
-<rChild name="pixel:Ring3Disc2"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc2"/>
-<rChild name="pixel:Ring4Disc2"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:Disc2"/>
-<Translation x="0*mm" y="0*mm" z="28.76*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc3"/>
-<rChild name="pixel:EModule1Disc3InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc3InnerPixelwafer"/>
-<rChild name="pixel:EModule1Disc3InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc3"/>
-<rChild name="pixel:EModule1Disc3Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc3"/>
-<rChild name="pixel:EModule1Disc3Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc3"/>
-<rChild name="pixel:EModule1Disc3DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc3"/>
-<rChild name="pixel:EModule1Disc3DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc3"/>
-<rChild name="pixel:EModule1Disc3DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc3"/>
-<rChild name="pixel:EModule1Disc3DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc3"/>
-<rChild name="pixel:EModule2Disc3InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc3InnerPixelwafer"/>
-<rChild name="pixel:EModule2Disc3InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc3"/>
-<rChild name="pixel:EModule2Disc3Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc3"/>
-<rChild name="pixel:EModule2Disc3Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc3"/>
-<rChild name="pixel:EModule2Disc3DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc3"/>
-<rChild name="pixel:EModule2Disc3DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc3"/>
-<rChild name="pixel:EModule2Disc3DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc3"/>
-<rChild name="pixel:EModule2Disc3DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc3"/>
-<rChild name="pixel:EModule3Disc3InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc3InnerPixelwafer"/>
-<rChild name="pixel:EModule3Disc3InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc3"/>
-<rChild name="pixel:EModule3Disc3Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc3"/>
-<rChild name="pixel:EModule3Disc3Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc3"/>
-<rChild name="pixel:EModule3Disc3DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc3"/>
-<rChild name="pixel:EModule3Disc3DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc3"/>
-<rChild name="pixel:EModule3Disc3DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc3"/>
-<rChild name="pixel:EModule3Disc3DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc3"/>
-<rChild name="pixel:EModule4Disc3InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc3InnerPixelwafer"/>
-<rChild name="pixel:EModule4Disc3InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc3"/>
-<rChild name="pixel:EModule4Disc3Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc3"/>
-<rChild name="pixel:EModule4Disc3Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc3"/>
-<rChild name="pixel:EModule4Disc3DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc3"/>
-<rChild name="pixel:EModule4Disc3DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc3"/>
-<rChild name="pixel:EModule4Disc3DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc3"/>
-<rChild name="pixel:EModule4Disc3DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc3"/>
-<rChild name="pixel:Ring1Disc3"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc3"/>
-<rChild name="pixel:Ring2Disc3"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc3"/>
-<rChild name="pixel:Ring3Disc3"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc3"/>
-<rChild name="pixel:Ring4Disc3"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:Disc3"/>
-<Translation x="0*mm" y="0*mm" z="117.99*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc4"/>
-<rChild name="pixel:EModule1Disc4InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc4InnerPixelwafer"/>
-<rChild name="pixel:EModule1Disc4InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc4"/>
-<rChild name="pixel:EModule1Disc4Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc4"/>
-<rChild name="pixel:EModule1Disc4Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc4"/>
-<rChild name="pixel:EModule1Disc4DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc4"/>
-<rChild name="pixel:EModule1Disc4DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc4"/>
-<rChild name="pixel:EModule1Disc4DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc4"/>
-<rChild name="pixel:EModule1Disc4DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc4"/>
-<rChild name="pixel:EModule2Disc4InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc4InnerPixelwafer"/>
-<rChild name="pixel:EModule2Disc4InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc4"/>
-<rChild name="pixel:EModule2Disc4Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc4"/>
-<rChild name="pixel:EModule2Disc4Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc4"/>
-<rChild name="pixel:EModule2Disc4DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc4"/>
-<rChild name="pixel:EModule2Disc4DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc4"/>
-<rChild name="pixel:EModule2Disc4DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc4"/>
-<rChild name="pixel:EModule2Disc4DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc4"/>
-<rChild name="pixel:EModule3Disc4InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc4InnerPixelwafer"/>
-<rChild name="pixel:EModule3Disc4InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc4"/>
-<rChild name="pixel:EModule3Disc4Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc4"/>
-<rChild name="pixel:EModule3Disc4Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc4"/>
-<rChild name="pixel:EModule3Disc4DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc4"/>
-<rChild name="pixel:EModule3Disc4DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc4"/>
-<rChild name="pixel:EModule3Disc4DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc4"/>
-<rChild name="pixel:EModule3Disc4DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc4"/>
-<rChild name="pixel:EModule4Disc4InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc4InnerPixelwafer"/>
-<rChild name="pixel:EModule4Disc4InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc4"/>
-<rChild name="pixel:EModule4Disc4Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc4"/>
-<rChild name="pixel:EModule4Disc4Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc4"/>
-<rChild name="pixel:EModule4Disc4DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc4"/>
-<rChild name="pixel:EModule4Disc4DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc4"/>
-<rChild name="pixel:EModule4Disc4DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc4"/>
-<rChild name="pixel:EModule4Disc4DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc4"/>
-<rChild name="pixel:Ring1Disc4"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc4"/>
-<rChild name="pixel:Ring2Disc4"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc4"/>
-<rChild name="pixel:Ring3Disc4"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc4"/>
-<rChild name="pixel:Ring4Disc4"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:Disc4"/>
-<Translation x="0*mm" y="0*mm" z="232.11*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc5"/>
-<rChild name="pixel:EModule1Disc5InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc5InnerPixelwafer"/>
-<rChild name="pixel:EModule1Disc5InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc5"/>
-<rChild name="pixel:EModule1Disc5Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc5"/>
-<rChild name="pixel:EModule1Disc5Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc5"/>
-<rChild name="pixel:EModule1Disc5DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc5"/>
-<rChild name="pixel:EModule1Disc5DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc5"/>
-<rChild name="pixel:EModule1Disc5DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc5"/>
-<rChild name="pixel:EModule1Disc5DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc5"/>
-<rChild name="pixel:EModule2Disc5InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc5InnerPixelwafer"/>
-<rChild name="pixel:EModule2Disc5InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc5"/>
-<rChild name="pixel:EModule2Disc5Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc5"/>
-<rChild name="pixel:EModule2Disc5Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc5"/>
-<rChild name="pixel:EModule2Disc5DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc5"/>
-<rChild name="pixel:EModule2Disc5DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc5"/>
-<rChild name="pixel:EModule2Disc5DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc5"/>
-<rChild name="pixel:EModule2Disc5DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc5"/>
-<rChild name="pixel:EModule3Disc5InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc5InnerPixelwafer"/>
-<rChild name="pixel:EModule3Disc5InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc5"/>
-<rChild name="pixel:EModule3Disc5Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc5"/>
-<rChild name="pixel:EModule3Disc5Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc5"/>
-<rChild name="pixel:EModule3Disc5DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc5"/>
-<rChild name="pixel:EModule3Disc5DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc5"/>
-<rChild name="pixel:EModule3Disc5DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc5"/>
-<rChild name="pixel:EModule3Disc5DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc5"/>
-<rChild name="pixel:EModule4Disc5InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc5InnerPixelwafer"/>
-<rChild name="pixel:EModule4Disc5InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc5"/>
-<rChild name="pixel:EModule4Disc5Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc5"/>
-<rChild name="pixel:EModule4Disc5Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc5"/>
-<rChild name="pixel:EModule4Disc5DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc5"/>
-<rChild name="pixel:EModule4Disc5DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc5"/>
-<rChild name="pixel:EModule4Disc5DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc5"/>
-<rChild name="pixel:EModule4Disc5DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc5"/>
-<rChild name="pixel:Ring1Disc5"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc5"/>
-<rChild name="pixel:Ring2Disc5"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc5"/>
-<rChild name="pixel:Ring3Disc5"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc5"/>
-<rChild name="pixel:Ring4Disc5"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:Disc5"/>
-<Translation x="0*mm" y="0*mm" z="378.08*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc6"/>
-<rChild name="pixel:EModule1Disc6InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc6InnerPixelwafer"/>
-<rChild name="pixel:EModule1Disc6InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc6"/>
-<rChild name="pixel:EModule1Disc6Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc6"/>
-<rChild name="pixel:EModule1Disc6Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc6"/>
-<rChild name="pixel:EModule1Disc6DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc6"/>
-<rChild name="pixel:EModule1Disc6DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc6"/>
-<rChild name="pixel:EModule1Disc6DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc6"/>
-<rChild name="pixel:EModule1Disc6DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc6"/>
-<rChild name="pixel:EModule2Disc6InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc6InnerPixelwafer"/>
-<rChild name="pixel:EModule2Disc6InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc6"/>
-<rChild name="pixel:EModule2Disc6Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc6"/>
-<rChild name="pixel:EModule2Disc6Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc6"/>
-<rChild name="pixel:EModule2Disc6DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc6"/>
-<rChild name="pixel:EModule2Disc6DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc6"/>
-<rChild name="pixel:EModule2Disc6DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc6"/>
-<rChild name="pixel:EModule2Disc6DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc6"/>
-<rChild name="pixel:EModule3Disc6InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc6InnerPixelwafer"/>
-<rChild name="pixel:EModule3Disc6InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc6"/>
-<rChild name="pixel:EModule3Disc6Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc6"/>
-<rChild name="pixel:EModule3Disc6Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc6"/>
-<rChild name="pixel:EModule3Disc6DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc6"/>
-<rChild name="pixel:EModule3Disc6DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc6"/>
-<rChild name="pixel:EModule3Disc6DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc6"/>
-<rChild name="pixel:EModule3Disc6DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc6"/>
-<rChild name="pixel:EModule4Disc6InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc6InnerPixelwafer"/>
-<rChild name="pixel:EModule4Disc6InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc6"/>
-<rChild name="pixel:EModule4Disc6Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc6"/>
-<rChild name="pixel:EModule4Disc6Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc6"/>
-<rChild name="pixel:EModule4Disc6DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc6"/>
-<rChild name="pixel:EModule4Disc6DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc6"/>
-<rChild name="pixel:EModule4Disc6DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc6"/>
-<rChild name="pixel:EModule4Disc6DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc6"/>
-<rChild name="pixel:Ring1Disc6"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc6"/>
-<rChild name="pixel:Ring2Disc6"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc6"/>
-<rChild name="pixel:Ring3Disc6"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc6"/>
-<rChild name="pixel:Ring4Disc6"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:Disc6"/>
-<Translation x="0*mm" y="0*mm" z="564.78*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc7"/>
-<rChild name="pixel:EModule1Disc7InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc7InnerPixelwafer"/>
-<rChild name="pixel:EModule1Disc7InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc7"/>
-<rChild name="pixel:EModule1Disc7Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc7"/>
-<rChild name="pixel:EModule1Disc7Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc7"/>
-<rChild name="pixel:EModule1Disc7DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc7"/>
-<rChild name="pixel:EModule1Disc7DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc7"/>
-<rChild name="pixel:EModule1Disc7DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc7"/>
-<rChild name="pixel:EModule1Disc7DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc7"/>
-<rChild name="pixel:EModule2Disc7InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc7InnerPixelwafer"/>
-<rChild name="pixel:EModule2Disc7InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc7"/>
-<rChild name="pixel:EModule2Disc7Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc7"/>
-<rChild name="pixel:EModule2Disc7Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc7"/>
-<rChild name="pixel:EModule2Disc7DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc7"/>
-<rChild name="pixel:EModule2Disc7DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc7"/>
-<rChild name="pixel:EModule2Disc7DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc7"/>
-<rChild name="pixel:EModule2Disc7DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc7"/>
-<rChild name="pixel:EModule3Disc7InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc7InnerPixelwafer"/>
-<rChild name="pixel:EModule3Disc7InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc7"/>
-<rChild name="pixel:EModule3Disc7Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc7"/>
-<rChild name="pixel:EModule3Disc7Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc7"/>
-<rChild name="pixel:EModule3Disc7DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc7"/>
-<rChild name="pixel:EModule3Disc7DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc7"/>
-<rChild name="pixel:EModule3Disc7DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc7"/>
-<rChild name="pixel:EModule3Disc7DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc7"/>
-<rChild name="pixel:EModule4Disc7InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc7InnerPixelwafer"/>
-<rChild name="pixel:EModule4Disc7InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc7"/>
-<rChild name="pixel:EModule4Disc7Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc7"/>
-<rChild name="pixel:EModule4Disc7Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc7"/>
-<rChild name="pixel:EModule4Disc7DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc7"/>
-<rChild name="pixel:EModule4Disc7DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc7"/>
-<rChild name="pixel:EModule4Disc7DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc7"/>
-<rChild name="pixel:EModule4Disc7DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc7"/>
-<rChild name="pixel:Ring1Disc7"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc7"/>
-<rChild name="pixel:Ring2Disc7"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc7"/>
-<rChild name="pixel:Ring3Disc7"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc7"/>
-<rChild name="pixel:Ring4Disc7"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:Disc7"/>
-<Translation x="0*mm" y="0*mm" z="803.57*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc8"/>
-<rChild name="pixel:EModule1Disc8InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc8InnerPixelwafer"/>
-<rChild name="pixel:EModule1Disc8InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc8"/>
-<rChild name="pixel:EModule1Disc8Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc8"/>
-<rChild name="pixel:EModule1Disc8Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc8"/>
-<rChild name="pixel:EModule1Disc8DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc8"/>
-<rChild name="pixel:EModule1Disc8DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc8"/>
-<rChild name="pixel:EModule1Disc8DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc8"/>
-<rChild name="pixel:EModule1Disc8DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc8"/>
-<rChild name="pixel:EModule2Disc8InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc8InnerPixelwafer"/>
-<rChild name="pixel:EModule2Disc8InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc8"/>
-<rChild name="pixel:EModule2Disc8Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc8"/>
-<rChild name="pixel:EModule2Disc8Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc8"/>
-<rChild name="pixel:EModule2Disc8DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc8"/>
-<rChild name="pixel:EModule2Disc8DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc8"/>
-<rChild name="pixel:EModule2Disc8DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc8"/>
-<rChild name="pixel:EModule2Disc8DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc8"/>
-<rChild name="pixel:EModule3Disc8InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc8InnerPixelwafer"/>
-<rChild name="pixel:EModule3Disc8InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc8"/>
-<rChild name="pixel:EModule3Disc8Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc8"/>
-<rChild name="pixel:EModule3Disc8Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc8"/>
-<rChild name="pixel:EModule3Disc8DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc8"/>
-<rChild name="pixel:EModule3Disc8DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc8"/>
-<rChild name="pixel:EModule3Disc8DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc8"/>
-<rChild name="pixel:EModule3Disc8DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc8"/>
-<rChild name="pixel:EModule4Disc8InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc8InnerPixelwafer"/>
-<rChild name="pixel:EModule4Disc8InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc8"/>
-<rChild name="pixel:EModule4Disc8Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc8"/>
-<rChild name="pixel:EModule4Disc8Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc8"/>
-<rChild name="pixel:EModule4Disc8DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc8"/>
-<rChild name="pixel:EModule4Disc8DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc8"/>
-<rChild name="pixel:EModule4Disc8DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc8"/>
-<rChild name="pixel:EModule4Disc8DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc8"/>
-<rChild name="pixel:Ring1Disc8"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc8"/>
-<rChild name="pixel:Ring2Disc8"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc8"/>
-<rChild name="pixel:Ring3Disc8"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc8"/>
-<rChild name="pixel:Ring4Disc8"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:Disc8"/>
-<Translation x="0*mm" y="0*mm" z="1109*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc9"/>
-<rChild name="pixel:EModule1Disc9InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc9InnerPixelwafer"/>
-<rChild name="pixel:EModule1Disc9InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc9"/>
-<rChild name="pixel:EModule1Disc9Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc9"/>
-<rChild name="pixel:EModule1Disc9Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc9"/>
-<rChild name="pixel:EModule1Disc9DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc9"/>
-<rChild name="pixel:EModule1Disc9DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc9"/>
-<rChild name="pixel:EModule1Disc9DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc9"/>
-<rChild name="pixel:EModule1Disc9DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc9"/>
-<rChild name="pixel:EModule2Disc9InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc9InnerPixelwafer"/>
-<rChild name="pixel:EModule2Disc9InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc9"/>
-<rChild name="pixel:EModule2Disc9Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc9"/>
-<rChild name="pixel:EModule2Disc9Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc9"/>
-<rChild name="pixel:EModule2Disc9DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc9"/>
-<rChild name="pixel:EModule2Disc9DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc9"/>
-<rChild name="pixel:EModule2Disc9DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc9"/>
-<rChild name="pixel:EModule2Disc9DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc9"/>
-<rChild name="pixel:EModule3Disc9InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc9InnerPixelwafer"/>
-<rChild name="pixel:EModule3Disc9InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc9"/>
-<rChild name="pixel:EModule3Disc9Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc9"/>
-<rChild name="pixel:EModule3Disc9Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc9"/>
-<rChild name="pixel:EModule3Disc9DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc9"/>
-<rChild name="pixel:EModule3Disc9DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc9"/>
-<rChild name="pixel:EModule3Disc9DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc9"/>
-<rChild name="pixel:EModule3Disc9DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc9"/>
-<rChild name="pixel:EModule4Disc9InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc9InnerPixelwafer"/>
-<rChild name="pixel:EModule4Disc9InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc9"/>
-<rChild name="pixel:EModule4Disc9Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc9"/>
-<rChild name="pixel:EModule4Disc9Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc9"/>
-<rChild name="pixel:EModule4Disc9DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc9"/>
-<rChild name="pixel:EModule4Disc9DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc9"/>
-<rChild name="pixel:EModule4Disc9DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc9"/>
-<rChild name="pixel:EModule4Disc9DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc9"/>
-<rChild name="pixel:EModule5Disc9InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc9InnerPixelwafer"/>
-<rChild name="pixel:EModule5Disc9InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc9"/>
-<rChild name="pixel:EModule5Disc9Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc9"/>
-<rChild name="pixel:EModule5Disc9Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc9"/>
-<rChild name="pixel:EModule5Disc9DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc9"/>
-<rChild name="pixel:EModule5Disc9DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc9"/>
-<rChild name="pixel:EModule5Disc9DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc9"/>
-<rChild name="pixel:EModule5Disc9DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc9"/>
-<rChild name="pixel:Ring1Disc9"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc9"/>
-<rChild name="pixel:Ring2Disc9"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc9"/>
-<rChild name="pixel:Ring3Disc9"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc9"/>
-<rChild name="pixel:Ring4Disc9"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc9"/>
-<rChild name="pixel:Ring5Disc9"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:Disc9"/>
-<Translation x="0*mm" y="0*mm" z="1459*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc10"/>
-<rChild name="pixel:EModule1Disc10InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc10InnerPixelwafer"/>
-<rChild name="pixel:EModule1Disc10InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc10"/>
-<rChild name="pixel:EModule1Disc10Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc10"/>
-<rChild name="pixel:EModule1Disc10Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc10"/>
-<rChild name="pixel:EModule1Disc10DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc10"/>
-<rChild name="pixel:EModule1Disc10DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc10"/>
-<rChild name="pixel:EModule1Disc10DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc10"/>
-<rChild name="pixel:EModule1Disc10DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc10"/>
-<rChild name="pixel:EModule2Disc10InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc10InnerPixelwafer"/>
-<rChild name="pixel:EModule2Disc10InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc10"/>
-<rChild name="pixel:EModule2Disc10Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc10"/>
-<rChild name="pixel:EModule2Disc10Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc10"/>
-<rChild name="pixel:EModule2Disc10DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc10"/>
-<rChild name="pixel:EModule2Disc10DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc10"/>
-<rChild name="pixel:EModule2Disc10DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc10"/>
-<rChild name="pixel:EModule2Disc10DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc10"/>
-<rChild name="pixel:EModule3Disc10InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc10InnerPixelwafer"/>
-<rChild name="pixel:EModule3Disc10InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc10"/>
-<rChild name="pixel:EModule3Disc10Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc10"/>
-<rChild name="pixel:EModule3Disc10Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc10"/>
-<rChild name="pixel:EModule3Disc10DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc10"/>
-<rChild name="pixel:EModule3Disc10DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc10"/>
-<rChild name="pixel:EModule3Disc10DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc10"/>
-<rChild name="pixel:EModule3Disc10DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc10"/>
-<rChild name="pixel:EModule4Disc10InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc10InnerPixelwafer"/>
-<rChild name="pixel:EModule4Disc10InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc10"/>
-<rChild name="pixel:EModule4Disc10Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc10"/>
-<rChild name="pixel:EModule4Disc10Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc10"/>
-<rChild name="pixel:EModule4Disc10DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc10"/>
-<rChild name="pixel:EModule4Disc10DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc10"/>
-<rChild name="pixel:EModule4Disc10DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc10"/>
-<rChild name="pixel:EModule4Disc10DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc10"/>
-<rChild name="pixel:EModule5Disc10InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc10InnerPixelwafer"/>
-<rChild name="pixel:EModule5Disc10InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc10"/>
-<rChild name="pixel:EModule5Disc10Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc10"/>
-<rChild name="pixel:EModule5Disc10Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc10"/>
-<rChild name="pixel:EModule5Disc10DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc10"/>
-<rChild name="pixel:EModule5Disc10DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc10"/>
-<rChild name="pixel:EModule5Disc10DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc10"/>
-<rChild name="pixel:EModule5Disc10DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc10"/>
-<rChild name="pixel:Ring1Disc10"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc10"/>
-<rChild name="pixel:Ring2Disc10"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc10"/>
-<rChild name="pixel:Ring3Disc10"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc10"/>
-<rChild name="pixel:Ring4Disc10"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc10"/>
-<rChild name="pixel:Ring5Disc10"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:Disc10"/>
-<Translation x="0*mm" y="0*mm" z="1694.43*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc11"/>
-<rChild name="pixel:EModule1Disc11InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc11InnerPixelwafer"/>
-<rChild name="pixel:EModule1Disc11InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc11"/>
-<rChild name="pixel:EModule1Disc11Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc11"/>
-<rChild name="pixel:EModule1Disc11Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc11"/>
-<rChild name="pixel:EModule1Disc11DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc11"/>
-<rChild name="pixel:EModule1Disc11DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc11"/>
-<rChild name="pixel:EModule1Disc11DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc11"/>
-<rChild name="pixel:EModule1Disc11DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc11"/>
-<rChild name="pixel:EModule2Disc11InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc11InnerPixelwafer"/>
-<rChild name="pixel:EModule2Disc11InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc11"/>
-<rChild name="pixel:EModule2Disc11Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc11"/>
-<rChild name="pixel:EModule2Disc11Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc11"/>
-<rChild name="pixel:EModule2Disc11DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc11"/>
-<rChild name="pixel:EModule2Disc11DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc11"/>
-<rChild name="pixel:EModule2Disc11DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc11"/>
-<rChild name="pixel:EModule2Disc11DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc11"/>
-<rChild name="pixel:EModule3Disc11InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc11InnerPixelwafer"/>
-<rChild name="pixel:EModule3Disc11InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc11"/>
-<rChild name="pixel:EModule3Disc11Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc11"/>
-<rChild name="pixel:EModule3Disc11Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc11"/>
-<rChild name="pixel:EModule3Disc11DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc11"/>
-<rChild name="pixel:EModule3Disc11DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc11"/>
-<rChild name="pixel:EModule3Disc11DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc11"/>
-<rChild name="pixel:EModule3Disc11DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc11"/>
-<rChild name="pixel:EModule4Disc11InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc11InnerPixelwafer"/>
-<rChild name="pixel:EModule4Disc11InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc11"/>
-<rChild name="pixel:EModule4Disc11Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc11"/>
-<rChild name="pixel:EModule4Disc11Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc11"/>
-<rChild name="pixel:EModule4Disc11DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc11"/>
-<rChild name="pixel:EModule4Disc11DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc11"/>
-<rChild name="pixel:EModule4Disc11DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc11"/>
-<rChild name="pixel:EModule4Disc11DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc11"/>
-<rChild name="pixel:EModule5Disc11InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc11InnerPixelwafer"/>
-<rChild name="pixel:EModule5Disc11InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc11"/>
-<rChild name="pixel:EModule5Disc11Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc11"/>
-<rChild name="pixel:EModule5Disc11Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc11"/>
-<rChild name="pixel:EModule5Disc11DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc11"/>
-<rChild name="pixel:EModule5Disc11DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc11"/>
-<rChild name="pixel:EModule5Disc11DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc11"/>
-<rChild name="pixel:EModule5Disc11DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc11"/>
-<rChild name="pixel:Ring1Disc11"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc11"/>
-<rChild name="pixel:Ring2Disc11"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc11"/>
-<rChild name="pixel:Ring3Disc11"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc11"/>
-<rChild name="pixel:Ring4Disc11"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc11"/>
-<rChild name="pixel:Ring5Disc11"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:Disc11"/>
-<Translation x="0*mm" y="0*mm" z="1959.83*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc12"/>
-<rChild name="pixel:EModule1Disc12InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc12InnerPixelwafer"/>
-<rChild name="pixel:EModule1Disc12InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc12"/>
-<rChild name="pixel:EModule1Disc12Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc12"/>
-<rChild name="pixel:EModule1Disc12Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc12"/>
-<rChild name="pixel:EModule1Disc12DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc12"/>
-<rChild name="pixel:EModule1Disc12DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc12"/>
-<rChild name="pixel:EModule1Disc12DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule1Disc12"/>
-<rChild name="pixel:EModule1Disc12DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc12"/>
-<rChild name="pixel:EModule2Disc12InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc12InnerPixelwafer"/>
-<rChild name="pixel:EModule2Disc12InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc12"/>
-<rChild name="pixel:EModule2Disc12Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc12"/>
-<rChild name="pixel:EModule2Disc12Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc12"/>
-<rChild name="pixel:EModule2Disc12DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc12"/>
-<rChild name="pixel:EModule2Disc12DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc12"/>
-<rChild name="pixel:EModule2Disc12DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule2Disc12"/>
-<rChild name="pixel:EModule2Disc12DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc12"/>
-<rChild name="pixel:EModule3Disc12InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc12InnerPixelwafer"/>
-<rChild name="pixel:EModule3Disc12InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc12"/>
-<rChild name="pixel:EModule3Disc12Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc12"/>
-<rChild name="pixel:EModule3Disc12Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc12"/>
-<rChild name="pixel:EModule3Disc12DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc12"/>
-<rChild name="pixel:EModule3Disc12DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc12"/>
-<rChild name="pixel:EModule3Disc12DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule3Disc12"/>
-<rChild name="pixel:EModule3Disc12DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc12"/>
-<rChild name="pixel:EModule4Disc12InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc12InnerPixelwafer"/>
-<rChild name="pixel:EModule4Disc12InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc12"/>
-<rChild name="pixel:EModule4Disc12Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc12"/>
-<rChild name="pixel:EModule4Disc12Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc12"/>
-<rChild name="pixel:EModule4Disc12DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc12"/>
-<rChild name="pixel:EModule4Disc12DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc12"/>
-<rChild name="pixel:EModule4Disc12DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule4Disc12"/>
-<rChild name="pixel:EModule4Disc12DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc12"/>
-<rChild name="pixel:EModule5Disc12InnerPixelwafer"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc12InnerPixelwafer"/>
-<rChild name="pixel:EModule5Disc12InnerPixelActive"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc12"/>
-<rChild name="pixel:EModule5Disc12Hybrid"/>
-<Translation x="0*mm" y="0*mm" z="0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc12"/>
-<rChild name="pixel:EModule5Disc12Chip"/>
-<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc12"/>
-<rChild name="pixel:EModule5Disc12DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc12"/>
-<rChild name="pixel:EModule5Disc12DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc12"/>
-<rChild name="pixel:EModule5Disc12DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:EModule5Disc12"/>
-<rChild name="pixel:EModule5Disc12DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc12"/>
-<rChild name="pixel:Ring1Disc12"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc12"/>
-<rChild name="pixel:Ring2Disc12"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc12"/>
-<rChild name="pixel:Ring3Disc12"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc12"/>
-<rChild name="pixel:Ring4Disc12"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixel:Disc12"/>
-<rChild name="pixel:Ring5Disc12"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:Disc12"/>
-<Translation x="0*mm" y="0*mm" z="2259*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR176Z1425"/>
-<Translation x="0*mm" y="0*mm" z="1134.49*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR248Z1609"/>
-<Translation x="0*mm" y="0*mm" z="1318*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR228Z1609"/>
-<Translation x="0*mm" y="0*mm" z="1318*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR209Z1609"/>
-<Translation x="0*mm" y="0*mm" z="1318*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR192Z1609"/>
-<Translation x="0*mm" y="0*mm" z="1318*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR176Z1609"/>
-<Translation x="0*mm" y="0*mm" z="1318*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR270Z2087"/>
-<Translation x="0*mm" y="0*mm" z="1796.24*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR270Z2567"/>
-<Translation x="0*mm" y="0*mm" z="2276.57*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR277Z2580"/>
-<Translation x="0*mm" y="0*mm" z="2289.74*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR176Z165"/>
-<Translation x="0*mm" y="0*mm" z="165.65*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR176Z165"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-165.65*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR181Z165"/>
-<Translation x="0*mm" y="0*mm" z="165.05*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR181Z165"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-165.05*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR178Z818BarrelPart"/>
-<Translation x="0*mm" y="0*mm" z="223.85*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR178Z818BarrelPart"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-223.85*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR178Z818EndcapsPart"/>
-<Translation x="0*mm" y="0*mm" z="530.738*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z207"/>
-<Translation x="0*mm" y="0*mm" z="207.8*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z207"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-207.8*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z11"/>
-<Translation x="0*mm" y="0*mm" z="11.05*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z11"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-11.05*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR176Z109"/>
-<Translation x="0*mm" y="0*mm" z="109.95*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR176Z109"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-109.95*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR179Z110"/>
-<Translation x="0*mm" y="0*mm" z="110.5*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR179Z110"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-110.5*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z44"/>
-<Translation x="0*mm" y="0*mm" z="44.25*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z44"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-44.25*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z88"/>
-<Translation x="0*mm" y="0*mm" z="88.65*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z88"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-88.65*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z133"/>
-<Translation x="0*mm" y="0*mm" z="133.05*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z133"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-133.05*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z177"/>
-<Translation x="0*mm" y="0*mm" z="177.45*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z177"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-177.45*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z202"/>
-<Translation x="0*mm" y="0*mm" z="202.2*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z202"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-202.2*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z207"/>
-<Translation x="0*mm" y="0*mm" z="207.8*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z207"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-207.8*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z11"/>
-<Translation x="0*mm" y="0*mm" z="11.05*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z11"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-11.05*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z44"/>
-<Translation x="0*mm" y="0*mm" z="44.25*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z44"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-44.25*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z88"/>
-<Translation x="0*mm" y="0*mm" z="88.65*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z88"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-88.65*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z133"/>
-<Translation x="0*mm" y="0*mm" z="133.05*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z133"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-133.05*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z177"/>
-<Translation x="0*mm" y="0*mm" z="177.45*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z177"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-177.45*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z202"/>
-<Translation x="0*mm" y="0*mm" z="202.2*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z202"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-202.2*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z207"/>
-<Translation x="0*mm" y="0*mm" z="207.8*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z207"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-207.8*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z11"/>
-<Translation x="0*mm" y="0*mm" z="11.05*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z11"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-11.05*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z44"/>
-<Translation x="0*mm" y="0*mm" z="44.25*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z44"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-44.25*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z88"/>
-<Translation x="0*mm" y="0*mm" z="88.65*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z88"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-88.65*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z133"/>
-<Translation x="0*mm" y="0*mm" z="133.05*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z133"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-133.05*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z177"/>
-<Translation x="0*mm" y="0*mm" z="177.45*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z177"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-177.45*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z202"/>
-<Translation x="0*mm" y="0*mm" z="202.2*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z202"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-202.2*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z207"/>
-<Translation x="0*mm" y="0*mm" z="207.8*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z207"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-207.8*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z11"/>
-<Translation x="0*mm" y="0*mm" z="11.05*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z11"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-11.05*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z44"/>
-<Translation x="0*mm" y="0*mm" z="44.25*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z44"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-44.25*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z88"/>
-<Translation x="0*mm" y="0*mm" z="88.65*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z88"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-88.65*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z133"/>
-<Translation x="0*mm" y="0*mm" z="133.05*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z133"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-133.05*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z177"/>
-<Translation x="0*mm" y="0*mm" z="177.45*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z177"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-177.45*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z202"/>
-<Translation x="0*mm" y="0*mm" z="202.2*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z202"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-202.2*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR165Z271"/>
-<Translation x="0*mm" y="0*mm" z="-19.5125*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR28Z259"/>
-<Translation x="0*mm" y="0*mm" z="-31.425*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR165Z306"/>
-<Translation x="0*mm" y="0*mm" z="15.3675*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR168Z284"/>
-<Translation x="0*mm" y="0*mm" z="-6.5*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR165Z385"/>
-<Translation x="0*mm" y="0*mm" z="94.8625*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR168Z354"/>
-<Translation x="0*mm" y="0*mm" z="63.26*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR165Z487"/>
-<Translation x="0*mm" y="0*mm" z="196.538*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR168Z443"/>
-<Translation x="0*mm" y="0*mm" z="152.49*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR165Z617"/>
-<Translation x="0*mm" y="0*mm" z="326.582*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR168Z557"/>
-<Translation x="0*mm" y="0*mm" z="266.61*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR165Z783"/>
-<Translation x="0*mm" y="0*mm" z="492.918*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR168Z703"/>
-<Translation x="0*mm" y="0*mm" z="412.58*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR165Z996"/>
-<Translation x="0*mm" y="0*mm" z="705.662*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR168Z890"/>
-<Translation x="0*mm" y="0*mm" z="599.28*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR165Z1268"/>
-<Translation x="0*mm" y="0*mm" z="977.773*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR168Z1129"/>
-<Translation x="0*mm" y="0*mm" z="838.07*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR176Z1521"/>
-<Translation x="0*mm" y="0*mm" z="1230.2*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR178Z1434"/>
-<Translation x="0*mm" y="0*mm" z="1143.5*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR73Z259"/>
-<Translation x="0*mm" y="0*mm" z="-31.425*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR93Z259"/>
-<Translation x="0*mm" y="0*mm" z="-31.425*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR128Z259"/>
-<Translation x="0*mm" y="0*mm" z="-31.425*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR160Z259"/>
-<Translation x="0*mm" y="0*mm" z="-31.425*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR165Z341"/>
-<Translation x="0*mm" y="0*mm" z="50.2475*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR28Z329"/>
-<Translation x="0*mm" y="0*mm" z="38.335*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR73Z329"/>
-<Translation x="0*mm" y="0*mm" z="38.335*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR93Z329"/>
-<Translation x="0*mm" y="0*mm" z="38.335*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR128Z329"/>
-<Translation x="0*mm" y="0*mm" z="38.335*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR160Z329"/>
-<Translation x="0*mm" y="0*mm" z="38.335*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR165Z430"/>
-<Translation x="0*mm" y="0*mm" z="139.478*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR28Z418"/>
-<Translation x="0*mm" y="0*mm" z="127.565*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR73Z418"/>
-<Translation x="0*mm" y="0*mm" z="127.565*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR93Z418"/>
-<Translation x="0*mm" y="0*mm" z="127.565*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR128Z418"/>
-<Translation x="0*mm" y="0*mm" z="127.565*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR160Z418"/>
-<Translation x="0*mm" y="0*mm" z="127.565*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR165Z544"/>
-<Translation x="0*mm" y="0*mm" z="253.597*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR28Z532"/>
-<Translation x="0*mm" y="0*mm" z="241.685*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR73Z532"/>
-<Translation x="0*mm" y="0*mm" z="241.685*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR93Z532"/>
-<Translation x="0*mm" y="0*mm" z="241.685*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR128Z532"/>
-<Translation x="0*mm" y="0*mm" z="241.685*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR160Z532"/>
-<Translation x="0*mm" y="0*mm" z="241.685*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR165Z690"/>
-<Translation x="0*mm" y="0*mm" z="399.567*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR28Z678"/>
-<Translation x="0*mm" y="0*mm" z="387.655*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR73Z678"/>
-<Translation x="0*mm" y="0*mm" z="387.655*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR93Z678"/>
-<Translation x="0*mm" y="0*mm" z="387.655*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR128Z678"/>
-<Translation x="0*mm" y="0*mm" z="387.655*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR160Z678"/>
-<Translation x="0*mm" y="0*mm" z="387.655*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR165Z877"/>
-<Translation x="0*mm" y="0*mm" z="586.268*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR28Z865"/>
-<Translation x="0*mm" y="0*mm" z="574.355*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR73Z865"/>
-<Translation x="0*mm" y="0*mm" z="574.355*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR93Z865"/>
-<Translation x="0*mm" y="0*mm" z="574.355*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR128Z865"/>
-<Translation x="0*mm" y="0*mm" z="574.355*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR160Z865"/>
-<Translation x="0*mm" y="0*mm" z="574.355*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR165Z1116"/>
-<Translation x="0*mm" y="0*mm" z="825.057*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR28Z1104"/>
-<Translation x="0*mm" y="0*mm" z="813.145*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR73Z1104"/>
-<Translation x="0*mm" y="0*mm" z="813.145*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR93Z1104"/>
-<Translation x="0*mm" y="0*mm" z="813.145*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR128Z1104"/>
-<Translation x="0*mm" y="0*mm" z="813.145*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR160Z1104"/>
-<Translation x="0*mm" y="0*mm" z="813.145*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR165Z1412"/>
-<Translation x="0*mm" y="0*mm" z="1121.53*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR28Z1409"/>
-<Translation x="0*mm" y="0*mm" z="1118.58*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR73Z1409"/>
-<Translation x="0*mm" y="0*mm" z="1118.58*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR93Z1409"/>
-<Translation x="0*mm" y="0*mm" z="1118.58*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR128Z1409"/>
-<Translation x="0*mm" y="0*mm" z="1118.58*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR160Z1409"/>
-<Translation x="0*mm" y="0*mm" z="1118.58*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR259Z1776"/>
-<Translation x="0*mm" y="0*mm" z="1485.74*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR63Z1759"/>
-<Translation x="0*mm" y="0*mm" z="1468.58*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR259Z1894"/>
-<Translation x="0*mm" y="0*mm" z="1603.45*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR261Z1795"/>
-<Translation x="0*mm" y="0*mm" z="1504*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR259Z2144"/>
-<Translation x="0*mm" y="0*mm" z="1853.87*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR261Z2030"/>
-<Translation x="0*mm" y="0*mm" z="1739.43*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR259Z2427"/>
-<Translation x="0*mm" y="0*mm" z="2136.15*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR261Z2295"/>
-<Translation x="0*mm" y="0*mm" z="2004.83*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR277Z2625"/>
-<Translation x="0*mm" y="0*mm" z="2334.79*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR279Z2595"/>
-<Translation x="0*mm" y="0*mm" z="2304*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR108Z1759"/>
-<Translation x="0*mm" y="0*mm" z="1468.58*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR149Z1759"/>
-<Translation x="0*mm" y="0*mm" z="1468.58*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR189Z1759"/>
-<Translation x="0*mm" y="0*mm" z="1468.58*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR232Z1759"/>
-<Translation x="0*mm" y="0*mm" z="1468.58*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR254Z1759"/>
-<Translation x="0*mm" y="0*mm" z="1468.58*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR259Z2012"/>
-<Translation x="0*mm" y="0*mm" z="1721.17*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR63Z1995"/>
-<Translation x="0*mm" y="0*mm" z="1704.01*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR108Z1995"/>
-<Translation x="0*mm" y="0*mm" z="1704.01*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR149Z1995"/>
-<Translation x="0*mm" y="0*mm" z="1704.01*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR189Z1995"/>
-<Translation x="0*mm" y="0*mm" z="1704.01*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR232Z1995"/>
-<Translation x="0*mm" y="0*mm" z="1704.01*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR254Z1995"/>
-<Translation x="0*mm" y="0*mm" z="1704.01*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR259Z2277"/>
-<Translation x="0*mm" y="0*mm" z="1986.57*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR63Z2260"/>
-<Translation x="0*mm" y="0*mm" z="1969.4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR108Z2260"/>
-<Translation x="0*mm" y="0*mm" z="1969.4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR149Z2260"/>
-<Translation x="0*mm" y="0*mm" z="1969.4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR189Z2260"/>
-<Translation x="0*mm" y="0*mm" z="1969.4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR232Z2260"/>
-<Translation x="0*mm" y="0*mm" z="1969.4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR254Z2260"/>
-<Translation x="0*mm" y="0*mm" z="1969.4*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR259Z2562"/>
-<Translation x="0*mm" y="0*mm" z="2271.52*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR63Z2559"/>
-<Translation x="0*mm" y="0*mm" z="2268.57*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR108Z2559"/>
-<Translation x="0*mm" y="0*mm" z="2268.57*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR149Z2559"/>
-<Translation x="0*mm" y="0*mm" z="2268.57*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR189Z2559"/>
-<Translation x="0*mm" y="0*mm" z="2268.57*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR232Z2559"/>
-<Translation x="0*mm" y="0*mm" z="2268.57*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR254Z2559"/>
-<Translation x="0*mm" y="0*mm" z="2268.57*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR188Z113"/>
-<Translation x="0*mm" y="0*mm" z="113.495*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR188Z113"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-113.495*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:supportR188Z914"/>
-<Translation x="0*mm" y="0*mm" z="623.505*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:supportR188Z1603"/>
-<Translation x="0*mm" y="0*mm" z="1312.01*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:supportR284Z2129"/>
-<Translation x="0*mm" y="0*mm" z="1838.02*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:supportR172Z835"/>
-<Translation x="0*mm" y="0*mm" z="544*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:supportR264Z2160"/>
-<Translation x="0*mm" y="0*mm" z="1869*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR38Z101"/>
-<Translation x="0*mm" y="0*mm" z="101*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR38Z101"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-101*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR68Z101"/>
-<Translation x="0*mm" y="0*mm" z="101*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR68Z101"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-101*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR109Z101"/>
-<Translation x="0*mm" y="0*mm" z="101*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR109Z101"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-101*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR38Z221"/>
-<Translation x="0*mm" y="0*mm" z="221*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR38Z221"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-221*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR68Z221"/>
-<Translation x="0*mm" y="0*mm" z="221*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR68Z221"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-221*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR109Z221"/>
-<Translation x="0*mm" y="0*mm" z="221*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR109Z221"/>
-<rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-221*mm"/>
-</PosPart>
-<Algorithm name="track:DDTrackerAngular">
-<rParent name="pixel:Layer1"/>
-<String name="ChildName" value="pixel:RodFlipped1"/>
-<Numeric name="StartAngle" value="105.011*deg"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="Radius" value="27.5*mm"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,0</Vector>
-<Numeric name="N" value="6"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerAngular">
-<rParent name="pixel:Layer1"/>
-<String name="ChildName" value="pixel:RodUnflipped1"/>
-<Numeric name="StartAngle" value="135.011*deg"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="Radius" value="30.5*mm"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,0</Vector>
-<Numeric name="N" value="6"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerAngular">
-<rParent name="pixel:Layer2"/>
-<String name="ChildName" value="pixel:RodFlipped2"/>
-<Numeric name="StartAngle" value="96.4171*deg"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="Radius" value="58.5*mm"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,0</Vector>
-<Numeric name="N" value="12"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerAngular">
-<rParent name="pixel:Layer2"/>
-<String name="ChildName" value="pixel:RodUnflipped2"/>
-<Numeric name="StartAngle" value="111.417*deg"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="Radius" value="61.5*mm"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,0</Vector>
-<Numeric name="N" value="12"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerAngular">
-<rParent name="pixel:Layer3"/>
-<String name="ChildName" value="pixel:RodFlipped3"/>
-<Numeric name="StartAngle" value="97.5057*deg"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="Radius" value="98.5*mm"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,0</Vector>
-<Numeric name="N" value="10"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerAngular">
-<rParent name="pixel:Layer3"/>
-<String name="ChildName" value="pixel:RodUnflipped3"/>
-<Numeric name="StartAngle" value="115.506*deg"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="Radius" value="101.5*mm"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,0</Vector>
-<Numeric name="N" value="10"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerAngular">
-<rParent name="pixel:Layer4"/>
-<String name="ChildName" value="pixel:RodFlipped4"/>
-<Numeric name="StartAngle" value="95.615*deg"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="Radius" value="138.5*mm"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,0</Vector>
-<Numeric name="N" value="14"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerAngular">
-<rParent name="pixel:Layer4"/>
-<String name="ChildName" value="pixel:RodUnflipped4"/>
-<Numeric name="StartAngle" value="108.472*deg"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="Radius" value="141.5*mm"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,0</Vector>
-<Numeric name="N" value="14"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc1"/>
-<String name="ChildName" value="pixel:EModule1Disc1"/>
-<Numeric name="N" value="10"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="99*deg"/>
-<Numeric name="Radius" value="51.1"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc1"/>
-<String name="ChildName" value="pixel:EModule1Disc1"/>
-<Numeric name="N" value="10"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="117*deg"/>
-<Numeric name="Radius" value="51.1"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc1"/>
-<String name="ChildName" value="pixel:EModule2Disc1"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="70.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc1"/>
-<String name="ChildName" value="pixel:EModule2Disc1"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="70.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc1"/>
-<String name="ChildName" value="pixel:EModule3Disc1"/>
-<Numeric name="N" value="12"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="97.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc1"/>
-<String name="ChildName" value="pixel:EModule3Disc1"/>
-<Numeric name="N" value="12"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="112.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc1"/>
-<String name="ChildName" value="pixel:EModule4Disc1"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="137.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc1"/>
-<String name="ChildName" value="pixel:EModule4Disc1"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="137.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc2"/>
-<String name="ChildName" value="pixel:EModule1Disc2"/>
-<Numeric name="N" value="10"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="99*deg"/>
-<Numeric name="Radius" value="51.1"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc2"/>
-<String name="ChildName" value="pixel:EModule1Disc2"/>
-<Numeric name="N" value="10"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="117*deg"/>
-<Numeric name="Radius" value="51.1"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc2"/>
-<String name="ChildName" value="pixel:EModule2Disc2"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="70.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc2"/>
-<String name="ChildName" value="pixel:EModule2Disc2"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="70.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc2"/>
-<String name="ChildName" value="pixel:EModule3Disc2"/>
-<Numeric name="N" value="12"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="97.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc2"/>
-<String name="ChildName" value="pixel:EModule3Disc2"/>
-<Numeric name="N" value="12"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="112.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc2"/>
-<String name="ChildName" value="pixel:EModule4Disc2"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="137.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc2"/>
-<String name="ChildName" value="pixel:EModule4Disc2"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="137.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc3"/>
-<String name="ChildName" value="pixel:EModule1Disc3"/>
-<Numeric name="N" value="10"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="99*deg"/>
-<Numeric name="Radius" value="51.1"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc3"/>
-<String name="ChildName" value="pixel:EModule1Disc3"/>
-<Numeric name="N" value="10"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="117*deg"/>
-<Numeric name="Radius" value="51.1"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc3"/>
-<String name="ChildName" value="pixel:EModule2Disc3"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="70.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc3"/>
-<String name="ChildName" value="pixel:EModule2Disc3"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="70.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc3"/>
-<String name="ChildName" value="pixel:EModule3Disc3"/>
-<Numeric name="N" value="12"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="97.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc3"/>
-<String name="ChildName" value="pixel:EModule3Disc3"/>
-<Numeric name="N" value="12"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="112.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc3"/>
-<String name="ChildName" value="pixel:EModule4Disc3"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="137.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc3"/>
-<String name="ChildName" value="pixel:EModule4Disc3"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="137.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc4"/>
-<String name="ChildName" value="pixel:EModule1Disc4"/>
-<Numeric name="N" value="10"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="99*deg"/>
-<Numeric name="Radius" value="51.1"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc4"/>
-<String name="ChildName" value="pixel:EModule1Disc4"/>
-<Numeric name="N" value="10"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="117*deg"/>
-<Numeric name="Radius" value="51.1"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc4"/>
-<String name="ChildName" value="pixel:EModule2Disc4"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="70.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc4"/>
-<String name="ChildName" value="pixel:EModule2Disc4"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="70.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc4"/>
-<String name="ChildName" value="pixel:EModule3Disc4"/>
-<Numeric name="N" value="12"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="97.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc4"/>
-<String name="ChildName" value="pixel:EModule3Disc4"/>
-<Numeric name="N" value="12"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="112.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc4"/>
-<String name="ChildName" value="pixel:EModule4Disc4"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="137.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc4"/>
-<String name="ChildName" value="pixel:EModule4Disc4"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="137.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc5"/>
-<String name="ChildName" value="pixel:EModule1Disc5"/>
-<Numeric name="N" value="10"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="99*deg"/>
-<Numeric name="Radius" value="51.1"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc5"/>
-<String name="ChildName" value="pixel:EModule1Disc5"/>
-<Numeric name="N" value="10"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="117*deg"/>
-<Numeric name="Radius" value="51.1"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc5"/>
-<String name="ChildName" value="pixel:EModule2Disc5"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="70.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc5"/>
-<String name="ChildName" value="pixel:EModule2Disc5"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="70.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc5"/>
-<String name="ChildName" value="pixel:EModule3Disc5"/>
-<Numeric name="N" value="12"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="97.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc5"/>
-<String name="ChildName" value="pixel:EModule3Disc5"/>
-<Numeric name="N" value="12"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="112.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc5"/>
-<String name="ChildName" value="pixel:EModule4Disc5"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="137.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc5"/>
-<String name="ChildName" value="pixel:EModule4Disc5"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="137.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc6"/>
-<String name="ChildName" value="pixel:EModule1Disc6"/>
-<Numeric name="N" value="10"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="99*deg"/>
-<Numeric name="Radius" value="51.1"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc6"/>
-<String name="ChildName" value="pixel:EModule1Disc6"/>
-<Numeric name="N" value="10"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="117*deg"/>
-<Numeric name="Radius" value="51.1"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc6"/>
-<String name="ChildName" value="pixel:EModule2Disc6"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="70.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc6"/>
-<String name="ChildName" value="pixel:EModule2Disc6"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="70.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc6"/>
-<String name="ChildName" value="pixel:EModule3Disc6"/>
-<Numeric name="N" value="12"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="97.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc6"/>
-<String name="ChildName" value="pixel:EModule3Disc6"/>
-<Numeric name="N" value="12"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="112.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc6"/>
-<String name="ChildName" value="pixel:EModule4Disc6"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="137.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc6"/>
-<String name="ChildName" value="pixel:EModule4Disc6"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="137.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc7"/>
-<String name="ChildName" value="pixel:EModule1Disc7"/>
-<Numeric name="N" value="10"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="99*deg"/>
-<Numeric name="Radius" value="51.1"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc7"/>
-<String name="ChildName" value="pixel:EModule1Disc7"/>
-<Numeric name="N" value="10"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="117*deg"/>
-<Numeric name="Radius" value="51.1"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc7"/>
-<String name="ChildName" value="pixel:EModule2Disc7"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="70.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc7"/>
-<String name="ChildName" value="pixel:EModule2Disc7"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="70.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc7"/>
-<String name="ChildName" value="pixel:EModule3Disc7"/>
-<Numeric name="N" value="12"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="97.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc7"/>
-<String name="ChildName" value="pixel:EModule3Disc7"/>
-<Numeric name="N" value="12"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="112.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc7"/>
-<String name="ChildName" value="pixel:EModule4Disc7"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="137.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc7"/>
-<String name="ChildName" value="pixel:EModule4Disc7"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="137.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc8"/>
-<String name="ChildName" value="pixel:EModule1Disc8"/>
-<Numeric name="N" value="10"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="99*deg"/>
-<Numeric name="Radius" value="51.1"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc8"/>
-<String name="ChildName" value="pixel:EModule1Disc8"/>
-<Numeric name="N" value="10"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="117*deg"/>
-<Numeric name="Radius" value="51.1"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc8"/>
-<String name="ChildName" value="pixel:EModule2Disc8"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="70.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc8"/>
-<String name="ChildName" value="pixel:EModule2Disc8"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="70.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc8"/>
-<String name="ChildName" value="pixel:EModule3Disc8"/>
-<Numeric name="N" value="12"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="97.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc8"/>
-<String name="ChildName" value="pixel:EModule3Disc8"/>
-<Numeric name="N" value="12"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="112.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc8"/>
-<String name="ChildName" value="pixel:EModule4Disc8"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="137.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc8"/>
-<String name="ChildName" value="pixel:EModule4Disc8"/>
-<Numeric name="N" value="16"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="137.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc9"/>
-<String name="ChildName" value="pixel:EModule1Disc9"/>
-<Numeric name="N" value="20"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="94.5*deg"/>
-<Numeric name="Radius" value="85.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc9"/>
-<String name="ChildName" value="pixel:EModule1Disc9"/>
-<Numeric name="N" value="20"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="103.5*deg"/>
-<Numeric name="Radius" value="85.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc9"/>
-<String name="ChildName" value="pixel:EModule2Disc9"/>
-<Numeric name="N" value="28"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="93.2143*deg"/>
-<Numeric name="Radius" value="126.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc9"/>
-<String name="ChildName" value="pixel:EModule2Disc9"/>
-<Numeric name="N" value="28"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="99.6429*deg"/>
-<Numeric name="Radius" value="126.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc9"/>
-<String name="ChildName" value="pixel:EModule3Disc9"/>
-<Numeric name="N" value="18"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95*deg"/>
-<Numeric name="Radius" value="166.4"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc9"/>
-<String name="ChildName" value="pixel:EModule3Disc9"/>
-<Numeric name="N" value="18"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="105*deg"/>
-<Numeric name="Radius" value="166.4"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc9"/>
-<String name="ChildName" value="pixel:EModule4Disc9"/>
-<Numeric name="N" value="20"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="94.5*deg"/>
-<Numeric name="Radius" value="209.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc9"/>
-<String name="ChildName" value="pixel:EModule4Disc9"/>
-<Numeric name="N" value="20"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="103.5*deg"/>
-<Numeric name="Radius" value="209.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring5Disc9"/>
-<String name="ChildName" value="pixel:EModule5Disc9"/>
-<Numeric name="N" value="24"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="93.75*deg"/>
-<Numeric name="Radius" value="231.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring5Disc9"/>
-<String name="ChildName" value="pixel:EModule5Disc9"/>
-<Numeric name="N" value="24"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="101.25*deg"/>
-<Numeric name="Radius" value="231.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc10"/>
-<String name="ChildName" value="pixel:EModule1Disc10"/>
-<Numeric name="N" value="20"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="94.5*deg"/>
-<Numeric name="Radius" value="85.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc10"/>
-<String name="ChildName" value="pixel:EModule1Disc10"/>
-<Numeric name="N" value="20"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="103.5*deg"/>
-<Numeric name="Radius" value="85.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc10"/>
-<String name="ChildName" value="pixel:EModule2Disc10"/>
-<Numeric name="N" value="28"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="93.2143*deg"/>
-<Numeric name="Radius" value="126.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc10"/>
-<String name="ChildName" value="pixel:EModule2Disc10"/>
-<Numeric name="N" value="28"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="99.6429*deg"/>
-<Numeric name="Radius" value="126.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc10"/>
-<String name="ChildName" value="pixel:EModule3Disc10"/>
-<Numeric name="N" value="18"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95*deg"/>
-<Numeric name="Radius" value="166.4"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc10"/>
-<String name="ChildName" value="pixel:EModule3Disc10"/>
-<Numeric name="N" value="18"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="105*deg"/>
-<Numeric name="Radius" value="166.4"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc10"/>
-<String name="ChildName" value="pixel:EModule4Disc10"/>
-<Numeric name="N" value="20"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="94.5*deg"/>
-<Numeric name="Radius" value="209.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc10"/>
-<String name="ChildName" value="pixel:EModule4Disc10"/>
-<Numeric name="N" value="20"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="103.5*deg"/>
-<Numeric name="Radius" value="209.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring5Disc10"/>
-<String name="ChildName" value="pixel:EModule5Disc10"/>
-<Numeric name="N" value="24"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="93.75*deg"/>
-<Numeric name="Radius" value="231.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring5Disc10"/>
-<String name="ChildName" value="pixel:EModule5Disc10"/>
-<Numeric name="N" value="24"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="101.25*deg"/>
-<Numeric name="Radius" value="231.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc11"/>
-<String name="ChildName" value="pixel:EModule1Disc11"/>
-<Numeric name="N" value="20"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="94.5*deg"/>
-<Numeric name="Radius" value="85.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc11"/>
-<String name="ChildName" value="pixel:EModule1Disc11"/>
-<Numeric name="N" value="20"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="103.5*deg"/>
-<Numeric name="Radius" value="85.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc11"/>
-<String name="ChildName" value="pixel:EModule2Disc11"/>
-<Numeric name="N" value="28"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="93.2143*deg"/>
-<Numeric name="Radius" value="126.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc11"/>
-<String name="ChildName" value="pixel:EModule2Disc11"/>
-<Numeric name="N" value="28"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="99.6429*deg"/>
-<Numeric name="Radius" value="126.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc11"/>
-<String name="ChildName" value="pixel:EModule3Disc11"/>
-<Numeric name="N" value="18"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95*deg"/>
-<Numeric name="Radius" value="166.4"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc11"/>
-<String name="ChildName" value="pixel:EModule3Disc11"/>
-<Numeric name="N" value="18"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="105*deg"/>
-<Numeric name="Radius" value="166.4"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc11"/>
-<String name="ChildName" value="pixel:EModule4Disc11"/>
-<Numeric name="N" value="20"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="94.5*deg"/>
-<Numeric name="Radius" value="209.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc11"/>
-<String name="ChildName" value="pixel:EModule4Disc11"/>
-<Numeric name="N" value="20"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="103.5*deg"/>
-<Numeric name="Radius" value="209.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring5Disc11"/>
-<String name="ChildName" value="pixel:EModule5Disc11"/>
-<Numeric name="N" value="24"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="93.75*deg"/>
-<Numeric name="Radius" value="231.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring5Disc11"/>
-<String name="ChildName" value="pixel:EModule5Disc11"/>
-<Numeric name="N" value="24"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="101.25*deg"/>
-<Numeric name="Radius" value="231.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc12"/>
-<String name="ChildName" value="pixel:EModule1Disc12"/>
-<Numeric name="N" value="20"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="94.5*deg"/>
-<Numeric name="Radius" value="85.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring1Disc12"/>
-<String name="ChildName" value="pixel:EModule1Disc12"/>
-<Numeric name="N" value="20"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="103.5*deg"/>
-<Numeric name="Radius" value="85.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc12"/>
-<String name="ChildName" value="pixel:EModule2Disc12"/>
-<Numeric name="N" value="28"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="93.2143*deg"/>
-<Numeric name="Radius" value="126.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring2Disc12"/>
-<String name="ChildName" value="pixel:EModule2Disc12"/>
-<Numeric name="N" value="28"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="99.6429*deg"/>
-<Numeric name="Radius" value="126.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc12"/>
-<String name="ChildName" value="pixel:EModule3Disc12"/>
-<Numeric name="N" value="18"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="95*deg"/>
-<Numeric name="Radius" value="166.4"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring3Disc12"/>
-<String name="ChildName" value="pixel:EModule3Disc12"/>
-<Numeric name="N" value="18"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="105*deg"/>
-<Numeric name="Radius" value="166.4"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc12"/>
-<String name="ChildName" value="pixel:EModule4Disc12"/>
-<Numeric name="N" value="20"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="94.5*deg"/>
-<Numeric name="Radius" value="209.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring4Disc12"/>
-<String name="ChildName" value="pixel:EModule4Disc12"/>
-<Numeric name="N" value="20"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="103.5*deg"/>
-<Numeric name="Radius" value="209.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring5Disc12"/>
-<String name="ChildName" value="pixel:EModule5Disc12"/>
-<Numeric name="N" value="24"/>
-<Numeric name="StartCopyNo" value="1"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="93.75*deg"/>
-<Numeric name="Radius" value="231.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
-</Algorithm>
-<Algorithm name="track:DDTrackerRingAlgo">
-<rParent name="pixel:Ring5Disc12"/>
-<String name="ChildName" value="pixel:EModule5Disc12"/>
-<Numeric name="N" value="24"/>
-<Numeric name="StartCopyNo" value="2"/>
-<Numeric name="IncrCopyNo" value="2"/>
-<Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="101.25*deg"/>
-<Numeric name="Radius" value="231.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
-<Numeric name="IsZPlus" value="1"/>
-<Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
-</Algorithm>
-</PosPartSection>
-</DDDefinition>
diff --git a/Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml b/Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml
new file mode 100644
index 0000000000000..c25ed5d72d141
--- /dev/null
+++ b/Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0"?>
+<!--
+============= XML GENERATION METADATA HEADER =============
+tkLayout revision: XMLs_2019_04_25_IT_MB_boom-3166-96d0380 on git@github.com:ghugo83/tkLayout.git
+generated by: Gabrielle Hugo (ghugo on hpsilicon2.dyndns.cern.ch)
+generation date: 2019-04-25.18:00:02
+note: see OT616_200_IT613_2019_04_25.cfg for full config files
+=========== END XML GENERATION METADATA HEADER ===========
+-->
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
+  <ConstantsSection label="pixbar.xml" eval="true">
+    <Constant name="zero" value="0.0*fm"/>
+    <Constant name="Rin1" value="2.6*cm"/>
+    <Constant name="Rin2" value="18.00*cm"/>
+    <Constant name="Rin3" value="18.6*cm"/>
+    <Constant name="RinSupTubCab"      value="15.00*cm"/>
+    <!--<Constant name="Rout1" value="20.35*cm"/>-->
+    <Constant name="Rout1" value="21.2*cm"/> <!-- 21.35*cm-->
+    <Constant name="Rout2" value="21.00*cm"/>
+    <Constant name="Zv1" value="22.70*cm"/> <!-- For Tilted Inner Tracker 501: value="41.50*cm"  -->
+    <Constant name="Zv2" value="56.00*cm"/>
+    <Constant name="Zv3" value="110.5*cm"/>
+    <Constant name="Zv4" value="282.0*cm"/>
+    <Constant name="ZvSupTubCab" value="248.0*cm"/>
+    <Constant name="SupportL" value="221.0*cm"/>
+    <Constant name="SupportRin" value="20.2*cm"/> <!-- 21.2*cm-->
+    <Constant name="SupportL_cut" value="[FlangeT]"/>
+    <Constant name="SupportW_cut" value="7.00*cm"/>
+    <Constant name="SupportW" value="20.00*cm"/>
+    <Constant name="SupportT" value="0.350*cm"/>
+    <Constant name="SupportY_base" value="19.00*cm"/>
+    <Constant name="SupportY"          value="[SupportY_base]+[SupportT]/2"/>
+    <Constant name="ShieldL" value="54.0*cm"/>
+    <Constant name="Shield1Rin" value="[FlangeRin]"/>
+    <Constant name="Shield1Rout" value="[FlangeRin]+[ShieldAL_T]"/>
+    <Constant name="Shield2Rout" value="[FlangeRin]+[ShieldAL_T]+[ShieldKevlar_T]"/>
+    <Constant name="Shield3Rin" value="[FlangeRout]-[ShieldAL_T]-[ShieldKevlar_T]"/>
+    <Constant name="Shield3Rout" value="[FlangeRout]-[ShieldKevlar_T]"/>
+    <Constant name="Shield4Rout" value="[FlangeRout]"/>
+    <Constant name="ShieldAL_T" value="0.005*cm"/>
+    <Constant name="ShieldKevlar_T" value="0.025*cm"/>
+    <Constant name="FlangeRin" value="2.500*cm"/>
+    <Constant name="FlangeRout" value="18.980*cm"/>
+    <Constant name="FlangeR12" value="4.900*cm"/>
+    <Constant name="FlangeR23" value="8.850*cm"/>
+    <Constant name="FlangeR34" value="13.450*cm"/>
+    <Constant name="FlangeT_Airex" value="0.400*cm"/>
+    <Constant name="FlangeT_CFK" value="0.020*cm"/>
+    <Constant name="FlangeT" value="[FlangeT_Airex]+2*[FlangeT_CFK]"/>
+    <Constant name="FlangeZ" value="27.22*cm"/>
+    <Constant name="FlangeHCT" value="0.528*cm"/>
+    <Constant name="CableSignal1Rin" value="3.00*cm"/>
+    <Constant name="CableSignal1T1" value="0.00335*cm"/>
+    <Constant name="CableSignal1T2" value="0.02088*cm"/>
+    <Constant name="CableSignal2Rin" value="6.800*cm"/>
+    <Constant name="CableSignal2T1" value="0.0114*cm"/>
+    <Constant name="CableSignal2T2" value="0.03135*cm"/>
+    <Constant name="CableSignal3Rin" value="10.90*cm"/>
+    <Constant name="CableSignal3T1" value="0.0203*cm"/>
+    <Constant name="CableSignal3T2" value="0.034827*cm"/>
+    <Constant name="CableSignal4Rin" value="16.0*cm"/>
+    <Constant name="CableSignal4T1" value="0.0308*cm"/>
+    <Constant name="CableSignal4T2" value="0.035998*cm"/>
+    <Constant name="CableRout" value="18.70*cm"/>
+    <Constant name="CableSignal4Z1" value="[FlangeZ]+[FlangeT]/2+[CoolT]+[CoolRadialDZp]"/>
+    <Constant name="CableSignal4Z2" value="[CableSignal4Z1]+[CableSignal4T1]"/>
+    <Constant name="CableSignal4Z3" value="[CableSignal4Z1]+[CableSignal4T2]"/>
+    <Constant name="CableSignal3Z1" value="[CableSignal4Z3]"/>
+    <Constant name="CableSignal3Z2" value="[CableSignal3Z1]+[CableSignal3T1]"/>
+    <Constant name="CableSignal3Z3" value="[CableSignal3Z1]+[CableSignal3T2]"/>
+    <Constant name="CableSignal2Z1" value="[CableSignal3Z3]"/>
+    <Constant name="CableSignal2Z2" value="[CableSignal2Z1]+[CableSignal2T1]"/>
+    <Constant name="CableSignal2Z3" value="[CableSignal2Z1]+[CableSignal2T2]"/>
+    <Constant name="CableSignal1Z1" value="[CableSignal2Z3]"/>
+    <Constant name="CableSignal1Z2" value="[CableSignal1Z1]+[CableSignal1T1]"/>
+    <Constant name="CableSignal1Z3" value="[CableSignal1Z1]+[CableSignal1T2]"/>
+    <Constant name="CablePower1Rin" value="3.00*cm"/>
+    <Constant name="CablePower1T1" value="0.0098*cm"/>
+    <Constant name="CablePower1T2" value="0.0611*cm"/>
+    <Constant name="CablePower2Rin" value="6.800*cm"/>
+    <Constant name="CablePower2T1" value="0.0334*cm"/>
+    <Constant name="CablePower2T2" value="0.09185*cm"/>
+    <Constant name="CablePower3Rin" value="10.90*cm"/>
+    <Constant name="CablePower3T1" value="0.0593*cm"/>
+    <Constant name="CablePower3T2" value="0.101735*cm"/>
+    <Constant name="CablePower4Rin" value="16.0*cm"/>
+    <Constant name="CablePower4T1" value="0.0902*cm"/>
+    <Constant name="CablePower4T2" value="0.105421*cm"/>
+    <Constant name="CablePower4Z1" value="[CableSignal1Z3]"/>
+    <Constant name="CablePower4Z2" value="[CablePower4Z1]+[CablePower4T1]"/>
+    <Constant name="CablePower4Z3" value="[CablePower4Z1]+[CablePower4T2]"/>
+    <Constant name="CablePower3Z1" value="[CablePower4Z3]"/>
+    <Constant name="CablePower3Z2" value="[CablePower3Z1]+[CablePower3T1]"/>
+    <Constant name="CablePower3Z3" value="[CablePower3Z1]+[CablePower3T2]"/>
+    <Constant name="CablePower2Z1" value="[CablePower3Z3]"/>
+    <Constant name="CablePower2Z2" value="[CablePower2Z1]+[CablePower2T1]"/>
+    <Constant name="CablePower2Z3" value="[CablePower2Z1]+[CablePower2T2]"/>
+    <Constant name="CablePower1Z1" value="[CablePower2Z3]"/>
+    <Constant name="CablePower1Z2" value="[CablePower1Z1]+[CablePower1T1]"/>
+    <Constant name="CablePower1Z3" value="[CablePower1Z1]+[CablePower1T2]"/>
+    <Constant name="CableSignalFlangeToST_L" value="1.680*cm"/>
+    <Constant name="CablePowerFlangeToST_L" value="1.680*cm"/>
+    <Constant name="CableSignalFlangeToST_dR" value="0.087*cm"/>
+    <Constant name="CablePowerFlangeToST_dR" value="0.258*cm"/>
+    <Constant name="CableSignalFlangeToST_Rmin" value="[CableRout]"/>
+    <Constant name="CableSignalFlangeToST_Rmax" value="[CableSignalFlangeToST_Rmin]+[CableSignalFlangeToST_dR]"/>
+    <Constant name="CablePowerFlangeToST_Rmin" value="[CableSignalFlangeToST_Rmax]"/>
+    <Constant name="CablePowerFlangeToST_Rmax" value="[CablePowerFlangeToST_Rmin]+[CablePowerFlangeToST_dR]"/>
+    <Constant name="PixelBarrelCableSignal_FlangeToST_Z" value="[FlangeZ]+[FlangeT]/2+[CableSignalFlangeToST_L]/2"/>
+    <Constant name="PixelBarrelCablePower_FlangeToST_Z" value="[FlangeZ]+[FlangeT]/2+[CablePowerFlangeToST_L]/2"/>
+    <Constant name="PipeFlangeToST_L" value="1.680*cm"/>
+    <Constant name="PipeFlangeToST_dR" value="0.0742*cm"/>
+    <Constant name="PipeFlangeToST_Rmin" value="[CablePowerFlangeToST_Rmax]"/>
+    <Constant name="PipeFlangeToST_Rmax" value="[PipeFlangeToST_Rmin]+[PipeFlangeToST_dR]"/>
+    <Constant name="PixelBarrelPipe_FlangeToST_Z" value="[FlangeZ]+[FlangeT]/2+[PipeFlangeToST_L]/2"/>
+    <Constant name="Conn1T" value="0.190*cm"/>
+    <Constant name="Cool1Rin" value="3.0*cm"/>
+    <Constant name="Cool2Rin" value="6.80*cm"/>
+    <Constant name="Cool3Rin" value="10.90*cm"/>
+    <Constant name="Cool4Rin" value="16.00*cm"/>
+    <Constant name="CoolRout" value="18.70*cm"/>
+    <Constant name="Cool1DRZp" value="0.195*cm"/>
+    <Constant name="Cool1DRZm" value="0.245*cm"/>
+    <Constant name="Cool2DRZp" value="0.178*cm"/>
+    <Constant name="Cool2DRZm" value="0.240*cm"/>
+    <Constant name="Cool3DRZp" value="0.170*cm"/>
+    <Constant name="Cool3DRZm" value="0.227*cm"/>
+    <Constant name="Cool4DRZp" value="0.1685*cm"/>
+    <Constant name="Cool4DRZm" value="0.221*cm"/>
+    <Constant name="CoolRadialDZp" value="0.00439*cm"/>
+    <Constant name="CoolRadialDZm" value="0.00365*cm"/>
+    <Constant name="CoolT" value="0.050*cm"/>
+    <Constant name="CoolZ" value="[FlangeZ]+[FlangeT]/2+[CoolT]/2"/>
+    <Constant name="CoolRadialZp" value="[CoolZ]+[CoolT]/2+[CoolRadialDZp]/2"/>
+    <Constant name="CoolRadialZm" value="[CoolZ]+[CoolT]/2+[CoolRadialDZm]/2"/>
+    <Constant name="Cool1RoutZp" value="[Cool1Rin]+[Cool1DRZp]"/>
+    <Constant name="Cool2RoutZp" value="[Cool2Rin]+[Cool2DRZp]"/>
+    <Constant name="Cool3RoutZp" value="[Cool3Rin]+[Cool3DRZp]"/>
+    <Constant name="Cool4RoutZp" value="[Cool4Rin]+[Cool4DRZp]"/>
+    <Constant name="Cool1RoutZm" value="[Cool1Rin]+[Cool1DRZm]"/>
+    <Constant name="Cool2RoutZm" value="[Cool2Rin]+[Cool2DRZm]"/>
+    <Constant name="Cool3RoutZm" value="[Cool3Rin]+[Cool3DRZm]"/>
+    <Constant name="Cool4RoutZm" value="[Cool4Rin]+[Cool4DRZm]"/>
+    <Constant name="Conn1Rin" value="12.00*cm"/>
+    <Constant name="Conn2Rin" value="11.00*cm"/>
+    <Constant name="Conn1Z" value="[FlangeZ]-[FlangeT]/2-[Conn1T]/2"/>
+    <Constant name="Conn2Z" value="[FlangeZ]+[FlangeT]/2+[Conn1T]/2"/>
+    <Constant name="ConnToSTT" value="3.00*cm"/>
+    <Constant name="ConnToSTRin" value="18.0*cm"/>
+    <Constant name="ConnToSTRout" value="18.8*cm"/>
+    <Constant name="RadialCoolZ" value="29.5*cm"/>
+    <Constant name="RadialCoolDZ" value="1.0*cm"/>
+    <Constant name="RadialCoolRin" value="4.0*cm"/>
+    <Constant name="Tracker2SOuterRadius" value="116.0*cm"/>
+  </ConstantsSection>
+  <RotationSection label="pixbar.xml">
+    <Rotation name="180D" thetaX="90*deg" phiX="180*deg" thetaY="90*deg" phiY="90*deg" thetaZ="180*deg" phiZ="0*deg"/>
+  </RotationSection>
+  <SolidSection label="pixbar.xml">
+    <Polycone name="Barrel" startPhi="0*deg" deltaPhi="360*deg">  <!-- TEMPORARY!! Should be defined automatically -->
+      <ZSection z="-125.0*cm" rMin="[pixfwd:RootRadius1]" rMax="[Tracker2SOuterRadius]"/>
+      <ZSection z="-[Zv1]" rMin="[pixfwd:RootRadius1]" rMax="[Tracker2SOuterRadius]"/>
+      <ZSection z="-[Zv1]" rMin="[Rin1]" rMax="[Tracker2SOuterRadius]"/>
+      <ZSection z="[Zv1]" rMin="[Rin1]" rMax="[Tracker2SOuterRadius]"/>
+      <ZSection z="[Zv1]" rMin="[pixfwd:RootRadius1]" rMax="[Tracker2SOuterRadius]"/>
+      <ZSection z="125.0*cm" rMin="[pixfwd:RootRadius1]" rMax="[Tracker2SOuterRadius]"/>
+    </Polycone>
+    <Polycone name="Phase2PixelBarrel" startPhi="0*deg" deltaPhi="360*deg">
+      <ZSection z="-[Zv1]"         rMin="[Rin1]"          rMax="[Rout1]" />
+      <ZSection z="[Zv1]"          rMin="[Rin1]"          rMax="[Rout1]" />
+    </Polycone>
+    <SubtractionSolid name="Phase2OTBarrel">
+      <rSolid name="Barrel"/>
+      <rSolid name="Phase2PixelBarrel"/>
+      <Translation x="0*cm" y="0*cm" z="0*cm"/>
+    </SubtractionSolid> 
+  </SolidSection>
+  <LogicalPartSection label="pixbar.xml">
+    <LogicalPart name="Phase2PixelBarrel" category="unspecified">
+      <rSolid name="Phase2PixelBarrel"/>
+      <rMaterial name="materials:Air"/>
+    </LogicalPart>
+    <LogicalPart name="Phase2OTBarrel" category="unspecified">
+      <rSolid name="Phase2OTBarrel"/>
+      <rMaterial name="materials:Air"/>
+    </LogicalPart>
+  </LogicalPartSection>
+</DDDefinition>
diff --git a/Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/pixel.xml b/Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixel.xml
similarity index 64%
rename from Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/pixel.xml
rename to Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixel.xml
index 21658b60f84a0..0839d21f5023f 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/pixel.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixel.xml
@@ -1,765 +1,544 @@
 <?xml version="1.0"?>
 <!--
 ============= XML GENERATION METADATA HEADER =============
-tkLayout revision: dev_gabie-2972-e516bb8 on git@github.com:ghugo83/tkLayout.git
+tkLayout revision: XMLs_2019_04_25_IT_MB_boom-3166-96d0380 on git@github.com:ghugo83/tkLayout.git
 generated by: Gabrielle Hugo (ghugo on hpsilicon2.dyndns.cern.ch)
-generation date: 2018-11-26.14:40:52
-note: see OT614_200_IT461_2018_11_26.cfg for full config files
+generation date: 2019-04-25.18:00:02
+note: see OT616_200_IT613_2019_04_25.cfg for full config files
 =========== END XML GENERATION METADATA HEADER ===========
 -->
 <DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.cern.ch/www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
 <MaterialSection label="pixel.xml">
-<CompositeMaterial name="hybridcompositeBModule1Layer1Hybrid" density="4.44803*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.367387">
-<rMaterial name="tracker:tkLayout_Al-CF"/>
+<CompositeMaterial name="hybridcompositeBModule1Layer1Hybrid" density="1.25201*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0555907">
+<rMaterial name="tracker:tkLayout_Epoxy"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.560348">
+<rMaterial name="tracker:tkLayout_IT-HDI-mix"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.384062">
+<rMaterial name="tracker:tkLayout_Pix_Caps"/>
+</MaterialFraction>
+</CompositeMaterial>
+<CompositeMaterial name="hybridcompositeBModule1Layer1Chip" density="6.34533*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.101884">
+<rMaterial name="tracker:tkLayout_AlN"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.0652058">
+<rMaterial name="tracker:tkLayout_Brass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.165467">
+<MaterialFraction fraction="0.366783">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.201438">
-<rMaterial name="tracker:tkLayout_Cu"/>
+<MaterialFraction fraction="0.0407536">
+<rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.108587">
-<rMaterial name="tracker:tkLayout_PS-FEH-mix"/>
+<MaterialFraction fraction="0.171573">
+<rMaterial name="tracker:tkLayout_Carbon_foam_BPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.157121">
-<rMaterial name="tracker:tkLayout_Si"/>
+<MaterialFraction fraction="0.0103525">
+<rMaterial name="tracker:tkLayout_Epoxy"/>
 </MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="hybridcompositeBModule1Layer1Chip" density="1.2626*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.226398">
+<MaterialFraction fraction="0.0131905">
 <rMaterial name="tracker:tkLayout_Pix_Bumps"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.773602">
-<rMaterial name="tracker:tkLayout_Pix_Caps"/>
+<MaterialFraction fraction="0.116148">
+<rMaterial name="tracker:tkLayout_Si"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.11411">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="hybridcompositeBModule1Layer1DeadAreaRight" density="3.03185*g/cm3" method="mixture by weight">
+<CompositeMaterial name="hybridcompositeBModule1Layer1DeadAreaRight" density="2.34291*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="1">
 <rMaterial name="tracker:tkLayout_Si"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="hybridcompositeBModule1Layer2Hybrid" density="3.87486*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.27381">
-<rMaterial name="tracker:tkLayout_Al-CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.189943">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.231234">
-<rMaterial name="tracker:tkLayout_Cu"/>
+<CompositeMaterial name="hybridcompositeBModule1Layer3Hybrid" density="1.22194*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0569586">
+<rMaterial name="tracker:tkLayout_Epoxy"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.12465">
-<rMaterial name="tracker:tkLayout_PS-FEH-mix"/>
+<MaterialFraction fraction="0.574136">
+<rMaterial name="tracker:tkLayout_IT-HDI-mix"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.180363">
-<rMaterial name="tracker:tkLayout_Si"/>
+<MaterialFraction fraction="0.368905">
+<rMaterial name="tracker:tkLayout_Pix_Caps"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="hybridcompositeBModule1Layer3Hybrid" density="3.1654*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.111049">
-<rMaterial name="tracker:tkLayout_Al-CF"/>
+<CompositeMaterial name="hybridcompositeBModule1Layer3Chip" density="4.59195*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.156582">
+<rMaterial name="tracker:tkLayout_AlN"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.232514">
+<MaterialFraction fraction="0.0447378">
+<rMaterial name="tracker:tkLayout_Brass"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.363494">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.283061">
-<rMaterial name="tracker:tkLayout_Cu"/>
+<MaterialFraction fraction="0.0279611">
+<rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.152588">
-<rMaterial name="tracker:tkLayout_PS-FEH-mix"/>
+<MaterialFraction fraction="0.137009">
+<rMaterial name="tracker:tkLayout_Carbon_foam_BPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.220788">
-<rMaterial name="tracker:tkLayout_Si"/>
+<MaterialFraction fraction="0.0143114">
+<rMaterial name="tracker:tkLayout_Epoxy"/>
 </MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="hybridcompositeBModule1Layer3Chip" density="1.25712*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.227464">
+<MaterialFraction fraction="0.0182347">
 <rMaterial name="tracker:tkLayout_Pix_Bumps"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.772536">
-<rMaterial name="tracker:tkLayout_Pix_Caps"/>
+<MaterialFraction fraction="0.159378">
+<rMaterial name="tracker:tkLayout_Si"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.0782911">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="hybridcompositeBModule1Layer3DeadAreaRight" density="3.62032*g/cm3" method="mixture by weight">
+<CompositeMaterial name="hybridcompositeBModule1Layer3DeadAreaRight" density="2.32662*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="1">
 <rMaterial name="tracker:tkLayout_Si"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="hybridcompositeEModule1Disc1Hybrid" density="2.81388*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.261561">
-<rMaterial name="tracker:tkLayout_CF"/>
+<CompositeMaterial name="hybridcompositeEModule1Disc1Chip" density="3.29816*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.125449">
+<rMaterial name="tracker:tkLayout_Brass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.318422">
-<rMaterial name="tracker:tkLayout_Cu"/>
+<MaterialFraction fraction="0.0199171">
+<rMaterial name="tracker:tkLayout_Epoxy"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.171649">
-<rMaterial name="tracker:tkLayout_PS-FEH-mix"/>
+<MaterialFraction fraction="0.142659">
+<rMaterial name="tracker:tkLayout_Graphite_FPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.248369">
+<MaterialFraction fraction="0.0253772">
+<rMaterial name="tracker:tkLayout_Pix_Bumps"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.223457">
 <rMaterial name="tracker:tkLayout_Si"/>
 </MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR176Z1425" density="1.82095*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00806091">
-<rMaterial name="tracker:tkLayout_Acrylate"/>
+<MaterialFraction fraction="0.400416">
+<rMaterial name="tracker:tkLayout_Si3N4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.311289">
-<rMaterial name="tracker:tkLayout_Al"/>
+<MaterialFraction fraction="0.0627246">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0238256">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
+</CompositeMaterial>
+<CompositeMaterial name="hybridcompositeEModule3Disc1Chip" density="2.98135*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0689062">
+<rMaterial name="tracker:tkLayout_Brass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0511131">
-<rMaterial name="tracker:tkLayout_CO2"/>
+<MaterialFraction fraction="0.0220427">
+<rMaterial name="tracker:tkLayout_Epoxy"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00308644">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
+<MaterialFraction fraction="0.157884">
+<rMaterial name="tracker:tkLayout_Graphite_FPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00529105">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
+<MaterialFraction fraction="0.0280855">
+<rMaterial name="tracker:tkLayout_Pix_Bumps"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00771611">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
+<MaterialFraction fraction="0.245478">
+<rMaterial name="tracker:tkLayout_Si"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0108026">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
+<MaterialFraction fraction="0.44315">
+<rMaterial name="tracker:tkLayout_Si3N4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0620199">
-<rMaterial name="tracker:tkLayout_Cu"/>
+<MaterialFraction fraction="0.0344531">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00434461">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
+</CompositeMaterial>
+<CompositeMaterial name="hybridcompositeEModule1Disc9Hybrid" density="1.85154*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0311092">
+<rMaterial name="tracker:tkLayout_Airex"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00521353">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
+<MaterialFraction fraction="0.308932">
+<rMaterial name="tracker:tkLayout_CFRP_module"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00391015">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
+<MaterialFraction fraction="0.0375903">
+<rMaterial name="tracker:tkLayout_Epoxy"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00347569">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
+<MaterialFraction fraction="0.378906">
+<rMaterial name="tracker:tkLayout_IT-HDI-mix"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00690935">
-<rMaterial name="tracker:tkLayout_Glass"/>
+<MaterialFraction fraction="0.243462">
+<rMaterial name="tracker:tkLayout_Pix_Caps"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00146164">
-<rMaterial name="tracker:tkLayout_Kapton"/>
+</CompositeMaterial>
+<CompositeMaterial name="hybridcompositeEModule1Disc9Chip" density="7.95643*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.263074">
+<rMaterial name="tracker:tkLayout_AlN"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.410835">
-<rMaterial name="tracker:tkLayout_PE"/>
+<MaterialFraction fraction="0.0258198">
+<rMaterial name="tracker:tkLayout_Brass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0522926">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.00825962">
+<rMaterial name="tracker:tkLayout_Epoxy"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00325354">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
+<MaterialFraction fraction="0.58743">
+<rMaterial name="tracker:tkLayout_Graphite_EPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0055775">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
+<MaterialFraction fraction="0.0105239">
+<rMaterial name="tracker:tkLayout_Pix_Bumps"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00813386">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
+<MaterialFraction fraction="0.091983">
+<rMaterial name="tracker:tkLayout_Si"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0113874">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.0129099">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR248Z1609" density="1.2593*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00867211">
+<CompositeMaterial name="servicecompositeR176Z1535" density="1.93943*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00821183">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.313056">
+<MaterialFraction fraction="0.29644">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0236181">
+<MaterialFraction fraction="0.0223645">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0506679">
+<MaterialFraction fraction="0.075106">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00305956">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00524497">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00764891">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0107085">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0630372">
+<MaterialFraction fraction="0.0596915">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00743324">
+<MaterialFraction fraction="0.00703871">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.426911">
+<MaterialFraction fraction="0.404252">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0518372">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00322521">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00552893">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00806302">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0112882">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.126895">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR228Z1609" density="1.37096*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00867211">
+<CompositeMaterial name="servicecompositeR254Z1605" density="1.2953*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00821183">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.313056">
+<MaterialFraction fraction="0.29644">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0236181">
+<MaterialFraction fraction="0.0223645">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0506679">
+<MaterialFraction fraction="0.075106">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00305956">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00524497">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00764891">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0107085">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0630372">
+<MaterialFraction fraction="0.0596915">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00743324">
+<MaterialFraction fraction="0.00703871">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.426911">
+<MaterialFraction fraction="0.404252">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0518372">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00322521">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00552893">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00806302">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0112882">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.126895">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR209Z1609" density="1.49252*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00867211">
+<CompositeMaterial name="servicecompositeR232Z1605" density="1.41831*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00821183">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.313056">
+<MaterialFraction fraction="0.29644">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0236181">
+<MaterialFraction fraction="0.0223645">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0506679">
+<MaterialFraction fraction="0.075106">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00305956">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00524497">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00764891">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0107085">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0630372">
+<MaterialFraction fraction="0.0596915">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00743324">
+<MaterialFraction fraction="0.00703871">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.426911">
+<MaterialFraction fraction="0.404252">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0518372">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00322521">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00552893">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00806302">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0112882">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.126895">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR192Z1609" density="1.62485*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00867211">
+<CompositeMaterial name="servicecompositeR212Z1605" density="1.553*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00821183">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.313056">
+<MaterialFraction fraction="0.29644">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0236181">
+<MaterialFraction fraction="0.0223645">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0506679">
+<MaterialFraction fraction="0.075106">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00305956">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00524497">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00764891">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0107085">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0630372">
+<MaterialFraction fraction="0.0596915">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00743324">
+<MaterialFraction fraction="0.00703871">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.426911">
+<MaterialFraction fraction="0.404252">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0518372">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00322521">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00552893">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00806302">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0112882">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.126895">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR176Z1609" density="1.76892*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00867211">
+<CompositeMaterial name="servicecompositeR193Z1605" density="1.70049*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00821183">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.313056">
+<MaterialFraction fraction="0.29644">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0236181">
+<MaterialFraction fraction="0.0223645">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0506679">
+<MaterialFraction fraction="0.075106">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00305956">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00524497">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00764891">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0107085">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0630372">
+<MaterialFraction fraction="0.0596915">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00743324">
+<MaterialFraction fraction="0.00703871">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.426911">
+<MaterialFraction fraction="0.404252">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0518372">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00322521">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00552893">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00806302">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0112882">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.126895">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR270Z2087" density="1.20312*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00867211">
+<CompositeMaterial name="servicecompositeR176Z1605" density="1.86198*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00821183">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.313056">
+<MaterialFraction fraction="0.29644">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0236181">
+<MaterialFraction fraction="0.0223645">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0506679">
+<MaterialFraction fraction="0.075106">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00305956">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00524497">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00764891">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0107085">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0630372">
+<MaterialFraction fraction="0.0596915">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00743324">
+<MaterialFraction fraction="0.00703871">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.426911">
+<MaterialFraction fraction="0.404252">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0518372">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00322521">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00552893">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00806302">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0112882">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.126895">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR270Z2567" density="1.82529*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00700171">
+<CompositeMaterial name="servicecompositeR278Z2169" density="1.23425*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00821183">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.32735">
+<MaterialFraction fraction="0.29644">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0236394">
+<MaterialFraction fraction="0.0223645">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0661973">
+<MaterialFraction fraction="0.075106">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00199865">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00342626">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00499663">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00699528">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.062693">
+<MaterialFraction fraction="0.0596915">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00281339">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00393874">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00253205">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00281339">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00337606">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R5"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00600146">
+<MaterialFraction fraction="0.00703871">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00133031">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.386812">
+<MaterialFraction fraction="0.404252">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.067725">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00210686">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00361176">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00526714">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.007374">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.126895">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR277Z2580" density="1.79547*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00700171">
+<CompositeMaterial name="servicecompositeR278Z2736" density="1.90845*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00729113">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.32735">
+<MaterialFraction fraction="0.310768">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0236394">
+<MaterialFraction fraction="0.0220864">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0661973">
+<MaterialFraction fraction="0.0781435">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00199865">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
+<MaterialFraction fraction="0.0602872">
+<rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00342626">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
+<MaterialFraction fraction="0.00624954">
+<rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00499663">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
+<MaterialFraction fraction="0.383014">
+<rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00699528">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
+<MaterialFraction fraction="0.13216">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.062693">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00281339">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
+</CompositeMaterial>
+<CompositeMaterial name="servicecompositeR282Z2745" density="1.88792*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00729113">
+<rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00393874">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
+<MaterialFraction fraction="0.310768">
+<rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00253205">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R3"/>
+<MaterialFraction fraction="0.0220864">
+<rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00281339">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R4"/>
+<MaterialFraction fraction="0.0781435">
+<rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00337606">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R5"/>
+<MaterialFraction fraction="0.0602872">
+<rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00600146">
+<MaterialFraction fraction="0.00624954">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00133031">
-<rMaterial name="tracker:tkLayout_Kapton"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.386812">
+<MaterialFraction fraction="0.383014">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.067725">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00210686">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00361176">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00526714">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.007374">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.13216">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR176Z355" density="0.51091*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.235424">
+<CompositeMaterial name="servicecompositeR176Z355" density="0.561111*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.214308">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0337686">
+<MaterialFraction fraction="0.0307398">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0110005">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0188579">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0275012">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0385016">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
+<MaterialFraction fraction="0.100141">
+<rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0439717">
+<MaterialFraction fraction="0.0400278">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0812948">
+<MaterialFraction fraction="0.0740032">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0696813">
+<MaterialFraction fraction="0.0634313">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0580677">
+<MaterialFraction fraction="0.0528594">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0541965">
+<MaterialFraction fraction="0.0493355">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0226841">
+<MaterialFraction fraction="0.0206495">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.203999">
+<MaterialFraction fraction="0.185702">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.011596">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0198789">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0289901">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0405861">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.168803">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR34Z207" density="0.311445*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.126807">
+<CompositeMaterial name="servicecompositeR40Z208" density="0.284282*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.121803">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0285316">
+<MaterialFraction fraction="0.0274056">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0650613">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
+<MaterialFraction fraction="0.0625134">
+<rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0275619">
+<MaterialFraction fraction="0.0264742">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.480811">
+<MaterialFraction fraction="0.461835">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0416475">
+<MaterialFraction fraction="0.0400038">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.160996">
+<MaterialFraction fraction="0.154642">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0685837">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
+<MaterialFraction fraction="0.105323">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR34Z11" density="0.684929*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0809429">
+<CompositeMaterial name="servicecompositeR40Z10" density="0.126683*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.36855">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0182122">
+<MaterialFraction fraction="0.0829237">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.268641">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.249177">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
+<MaterialFraction fraction="0.000189153">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0175932">
+<MaterialFraction fraction="0.0801053">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.102766">
+<MaterialFraction fraction="0.467914">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.262668">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
+<MaterialFraction fraction="0.000318687">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR176Z547" density="0.540121*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00347956">
+<CompositeMaterial name="servicecompositeR176Z547" density="0.590315*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0031829">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.245557">
+<MaterialFraction fraction="0.224622">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0319423">
+<MaterialFraction fraction="0.0292191">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0104055">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0178381">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0260138">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0364194">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
+<MaterialFraction fraction="0.095187">
+<rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0495469">
+<MaterialFraction fraction="0.0453227">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0659128">
+<MaterialFraction fraction="0.0602933">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0549273">
+<MaterialFraction fraction="0.0502444">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0512655">
+<MaterialFraction fraction="0.0468948">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00298248">
+<MaterialFraction fraction="0.0027282">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0147964">
+<MaterialFraction fraction="0.0135349">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.293327">
+<MaterialFraction fraction="0.268319">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0109689">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0188038">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0274222">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0383911">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.160452">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR178Z489" density="4.16676*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR178Z489" density="4.16574*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.650302">
 <rMaterial name="tracker:tkLayout_2S-SEH-mix"/>
 </MaterialFraction>
@@ -773,60 +552,42 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rMaterial name="tracker:tkLayout_Epoxy"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR176Z629" density="0.567542*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00625494">
+<CompositeMaterial name="servicecompositeR176Z629" density="0.617729*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00574534">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.253036">
+<MaterialFraction fraction="0.232421">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.030399">
+<MaterialFraction fraction="0.0279223">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00990278">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0169762">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.024757">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0346597">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
+<MaterialFraction fraction="0.0909627">
+<rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.053881">
+<MaterialFraction fraction="0.0494912">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0522735">
+<MaterialFraction fraction="0.0480146">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0487886">
+<MaterialFraction fraction="0.0448136">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00536138">
+<MaterialFraction fraction="0.00492458">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00868859">
+<MaterialFraction fraction="0.00798071">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.364053">
+<MaterialFraction fraction="0.334393">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0104389">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0178953">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0260973">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0365362">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.153331">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR178Z606" density="3.70379*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR178Z606" density="3.70288*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.650302">
 <rMaterial name="tracker:tkLayout_2S-SEH-mix"/>
 </MaterialFraction>
@@ -840,57 +601,39 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rMaterial name="tracker:tkLayout_Epoxy"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR176Z700" density="0.590393*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00837083">
+<CompositeMaterial name="servicecompositeR176Z700" density="0.640575*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00771316">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.258738">
+<MaterialFraction fraction="0.23841">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0292224">
+<MaterialFraction fraction="0.0269265">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0095195">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0163191">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0237988">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0333183">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
+<MaterialFraction fraction="0.0877186">
+<rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0571853">
+<MaterialFraction fraction="0.0526924">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0469002">
+<MaterialFraction fraction="0.0432154">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.007175">
+<MaterialFraction fraction="0.00661128">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00403215">
+<MaterialFraction fraction="0.00371535">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.417974">
+<MaterialFraction fraction="0.385135">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0100349">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0172027">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0250872">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0351221">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.147863">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR178Z652" density="3.08649*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR178Z652" density="3.08573*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.650302">
 <rMaterial name="tracker:tkLayout_2S-SEH-mix"/>
 </MaterialFraction>
@@ -904,51 +647,33 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rMaterial name="tracker:tkLayout_Epoxy"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR176Z1083" density="0.598871*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00987954">
+<CompositeMaterial name="servicecompositeR176Z1108" density="0.649051*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00911348">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.265768">
+<MaterialFraction fraction="0.24516">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0288087">
+<MaterialFraction fraction="0.0265749">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00938474">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0160881">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0234618">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0328466">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
+<MaterialFraction fraction="0.0865731">
+<rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0600951">
+<MaterialFraction fraction="0.0554352">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00846818">
+<MaterialFraction fraction="0.00781155">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.45899">
+<MaterialFraction fraction="0.4234">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00989283">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0169591">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0247321">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0346249">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.145932">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR178Z749" density="2.16054*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR178Z749" density="2.16001*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.650302">
 <rMaterial name="tracker:tkLayout_2S-SEH-mix"/>
 </MaterialFraction>
@@ -962,893 +687,793 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rMaterial name="tracker:tkLayout_Epoxy"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR34Z44" density="0.730613*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0758817">
+<CompositeMaterial name="servicecompositeR40Z44" density="0.165156*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.282697">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0170734">
+<MaterialFraction fraction="0.0636068">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.251843">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.233597">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
+<MaterialFraction fraction="0.00014509">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0164931">
+<MaterialFraction fraction="0.061445">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0575436">
+<MaterialFraction fraction="0.214378">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00498439">
+<MaterialFraction fraction="0.0185693">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.09634">
+<MaterialFraction fraction="0.358914">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.246244">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
+<MaterialFraction fraction="0.00024445">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR34Z88" density="0.776297*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0714162">
+<CompositeMaterial name="servicecompositeR40Z88" density="0.203629*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.229285">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0160686">
+<MaterialFraction fraction="0.0515892">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.237023">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.21985">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
+<MaterialFraction fraction="0.000117677">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0155225">
+<MaterialFraction fraction="0.0498358">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.108315">
+<MaterialFraction fraction="0.347749">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00938213">
+<MaterialFraction fraction="0.0301218">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0906706">
+<MaterialFraction fraction="0.291102">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.231753">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
+<MaterialFraction fraction="0.000198264">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR34Z133" density="0.82198*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0674471">
+<CompositeMaterial name="servicecompositeR40Z133" density="0.242102*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.192849">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0151756">
+<MaterialFraction fraction="0.0433911">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.22385">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.207631">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
+<MaterialFraction fraction="9.8977e-05">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0146598">
+<MaterialFraction fraction="0.0419164">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.153442">
+<MaterialFraction fraction="0.438732">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.013291">
+<MaterialFraction fraction="0.0380026">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0856313">
+<MaterialFraction fraction="0.244843">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.218872">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
+<MaterialFraction fraction="0.000166758">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR34Z177" density="0.867664*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0638959">
+<CompositeMaterial name="servicecompositeR40Z178" density="0.280574*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.166405">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0143766">
+<MaterialFraction fraction="0.0374412">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.212064">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.196699">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
+<MaterialFraction fraction="8.54052e-05">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.013888">
+<MaterialFraction fraction="0.0361687">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.193817">
+<MaterialFraction fraction="0.504763">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0167883">
+<MaterialFraction fraction="0.0437222">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0811227">
+<MaterialFraction fraction="0.21127">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.207348">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
+<MaterialFraction fraction="0.000143892">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR34Z202" density="0.913348*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0606999">
+<CompositeMaterial name="servicecompositeR40Z203" density="0.319047*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.146339">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0136575">
+<MaterialFraction fraction="0.0329263">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.201457">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.186861">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
+<MaterialFraction fraction="7.51065e-05">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0131933">
+<MaterialFraction fraction="0.0318073">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.230154">
+<MaterialFraction fraction="0.55487">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0199358">
+<MaterialFraction fraction="0.0480624">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0770651">
+<MaterialFraction fraction="0.185793">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.196977">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
+<MaterialFraction fraction="0.00012654">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR64Z207" density="0.427554*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.160892">
+<CompositeMaterial name="servicecompositeR71Z208" density="0.413801*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.150608">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0362007">
+<MaterialFraction fraction="0.0338869">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0275164">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.047171">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
+<MaterialFraction fraction="0.0772975">
+<rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0349704">
+<MaterialFraction fraction="0.0327352">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.20335">
+<MaterialFraction fraction="0.190352">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.1743">
+<MaterialFraction fraction="0.163159">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0325991">
+<MaterialFraction fraction="0.0305154">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.20427">
+<MaterialFraction fraction="0.191214">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0290061">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0497248">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
+<MaterialFraction fraction="0.130232">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR64Z11" density="0.720521*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0824116">
+<CompositeMaterial name="servicecompositeR71Z10" density="0.145023*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.36855">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0185426">
+<MaterialFraction fraction="0.0829237">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.255371">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.253698">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
+<MaterialFraction fraction="0.000189153">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0179124">
+<MaterialFraction fraction="0.0801053">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.10463">
+<MaterialFraction fraction="0.467914">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.267434">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
+<MaterialFraction fraction="0.000318687">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR64Z44" density="0.741478*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0800823">
+<CompositeMaterial name="servicecompositeR71Z44" density="0.163887*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.326128">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0180185">
+<MaterialFraction fraction="0.0733788">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.248153">
-<rMaterial name="tracker:tkLayout_CF"/>
+<MaterialFraction fraction="0.00016738">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.246528">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0174061">
+<MaterialFraction fraction="0.0708849">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0260267">
+<MaterialFraction fraction="0.105992">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00223759">
+<MaterialFraction fraction="0.0091124">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.101673">
+<MaterialFraction fraction="0.414055">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.259875">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
+<MaterialFraction fraction="0.000282005">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR64Z88" density="0.762436*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.077881">
+<CompositeMaterial name="servicecompositeR71Z88" density="0.182752*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.292464">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0175232">
+<MaterialFraction fraction="0.0658045">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.241332">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.239751">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
+<MaterialFraction fraction="0.000150103">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0169277">
+<MaterialFraction fraction="0.063568">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0506227">
+<MaterialFraction fraction="0.190102">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00435218">
+<MaterialFraction fraction="0.0163436">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0988784">
+<MaterialFraction fraction="0.371315">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.252732">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
+<MaterialFraction fraction="0.000252896">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR64Z133" density="0.783393*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0757976">
+<CompositeMaterial name="servicecompositeR71Z133" density="0.201616*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.2651">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0170545">
+<MaterialFraction fraction="0.0596475">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.234876">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.233338">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
+<MaterialFraction fraction="0.000136059">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0164748">
+<MaterialFraction fraction="0.0576203">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0739026">
+<MaterialFraction fraction="0.258472">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00635362">
+<MaterialFraction fraction="0.0222216">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0962332">
+<MaterialFraction fraction="0.336573">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.245971">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
+<MaterialFraction fraction="0.000229233">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR64Z177" density="0.804351*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0738226">
+<CompositeMaterial name="servicecompositeR71Z178" density="0.22048*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.242418">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0166101">
+<MaterialFraction fraction="0.0545441">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.228756">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.227258">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
+<MaterialFraction fraction="0.000124418">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0160456">
+<MaterialFraction fraction="0.0526903">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0959694">
+<MaterialFraction fraction="0.315144">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00825077">
+<MaterialFraction fraction="0.0270938">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0937258">
+<MaterialFraction fraction="0.307776">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.239562">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
+<MaterialFraction fraction="0.00020962">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR64Z202" density="0.825308*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.071948">
+<CompositeMaterial name="servicecompositeR71Z203" density="0.239344*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.223312">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0161883">
+<MaterialFraction fraction="0.0502451">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.222947">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.221487">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
+<MaterialFraction fraction="0.000114611">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0156381">
+<MaterialFraction fraction="0.0485375">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.116916">
+<MaterialFraction fraction="0.362882">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0100516">
+<MaterialFraction fraction="0.031198">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0913458">
+<MaterialFraction fraction="0.283518">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.233478">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
+<MaterialFraction fraction="0.000193099">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR105Z207" density="0.480656*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.204814">
+<CompositeMaterial name="servicecompositeR115Z208" density="0.480158*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.187942">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0339999">
+<MaterialFraction fraction="0.0311991">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0166137">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0284806">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0415342">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
+<MaterialFraction fraction="0.0914853">
+<rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0399871">
+<MaterialFraction fraction="0.0366931">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.122777">
+<MaterialFraction fraction="0.112663">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.105238">
+<MaterialFraction fraction="0.0965686">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0876981">
+<MaterialFraction fraction="0.0804738">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0272221">
+<MaterialFraction fraction="0.0249797">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.200317">
+<MaterialFraction fraction="0.183815">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0175132">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0300226">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0437829">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
+<MaterialFraction fraction="0.15418">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR105Z11" density="0.498908*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.122027">
+<CompositeMaterial name="servicecompositeR115Z10" density="0.111201*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.49893">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0137618">
+<MaterialFraction fraction="0.0562675">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.368805">
-<rMaterial name="tracker:tkLayout_CF"/>
+<MaterialFraction fraction="0.000230954">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.188287">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0213892">
+<MaterialFraction fraction="0.0874537">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0872479">
+<MaterialFraction fraction="0.356729">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.198481">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
+<MaterialFraction fraction="0.000389337">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR105Z44" density="0.509678*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.119449">
+<CompositeMaterial name="servicecompositeR115Z44" density="0.121015*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.458464">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.013471">
+<MaterialFraction fraction="0.051704">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.361012">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.184309">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
+<MaterialFraction fraction="0.000212223">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0209372">
+<MaterialFraction fraction="0.0803608">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0194581">
+<MaterialFraction fraction="0.0746835">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00167287">
+<MaterialFraction fraction="0.00642076">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0854042">
+<MaterialFraction fraction="0.327796">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.194287">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
+<MaterialFraction fraction="0.00035776">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR105Z88" density="0.520448*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.116977">
+<CompositeMaterial name="servicecompositeR115Z88" density="0.13083*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.424071">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0131922">
+<MaterialFraction fraction="0.0478252">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.353541">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.180495">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
+<MaterialFraction fraction="0.000196302">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.020504">
+<MaterialFraction fraction="0.0743322">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0381108">
+<MaterialFraction fraction="0.138162">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0032765">
+<MaterialFraction fraction="0.0118781">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0836369">
+<MaterialFraction fraction="0.303205">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.190267">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
+<MaterialFraction fraction="0.000330921">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR105Z133" density="0.531218*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.114605">
+<CompositeMaterial name="servicecompositeR115Z133" density="0.140645*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.394477">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129248">
+<MaterialFraction fraction="0.0444877">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.346374">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.176835">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
+<MaterialFraction fraction="0.000182603">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0200883">
+<MaterialFraction fraction="0.0691449">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0560073">
+<MaterialFraction fraction="0.19278">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0048151">
+<MaterialFraction fraction="0.0165738">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0819412">
+<MaterialFraction fraction="0.282046">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.186409">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
+<MaterialFraction fraction="0.000307828">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR105Z177" density="0.541988*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.112328">
+<CompositeMaterial name="servicecompositeR115Z178" density="0.15046*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.368744">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0126679">
+<MaterialFraction fraction="0.0415857">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.339491">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.173321">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
+<MaterialFraction fraction="0.000170691">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0196891">
+<MaterialFraction fraction="0.0646344">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0731924">
+<MaterialFraction fraction="0.240273">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00629256">
+<MaterialFraction fraction="0.0206569">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.080313">
+<MaterialFraction fraction="0.263648">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.182705">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
+<MaterialFraction fraction="0.000287747">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR105Z202" density="0.552758*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.110139">
+<CompositeMaterial name="servicecompositeR115Z203" density="0.160275*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.346163">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0124211">
+<MaterialFraction fraction="0.039039">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.332876">
-<rMaterial name="tracker:tkLayout_CF"/>
+<MaterialFraction fraction="0.000160239">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.169944">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0193055">
+<MaterialFraction fraction="0.0606764">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0897079">
+<MaterialFraction fraction="0.281949">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00771245">
+<MaterialFraction fraction="0.0242399">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0787481">
+<MaterialFraction fraction="0.247502">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.179145">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
+<MaterialFraction fraction="0.000270126">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR145Z207" density="0.564751*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.235424">
+<CompositeMaterial name="servicecompositeR157Z208" density="0.597295*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.214308">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0337686">
+<MaterialFraction fraction="0.0307398">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0110005">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0188579">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0275012">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0385016">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
+<MaterialFraction fraction="0.100141">
+<rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0439717">
+<MaterialFraction fraction="0.0400278">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0812948">
+<MaterialFraction fraction="0.0740032">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0696813">
+<MaterialFraction fraction="0.0634313">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0580677">
+<MaterialFraction fraction="0.0528594">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0541965">
+<MaterialFraction fraction="0.0493355">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0226841">
+<MaterialFraction fraction="0.0206495">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.203999">
+<MaterialFraction fraction="0.185702">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.011596">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0198789">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0289901">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0405861">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.168803">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR145Z11" density="0.505226*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.122919">
+<CompositeMaterial name="servicecompositeR157Z10" density="0.114724*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.498945">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0138623">
+<MaterialFraction fraction="0.0562692">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.364193">
-<rMaterial name="tracker:tkLayout_CF"/>
+<MaterialFraction fraction="0.000219928">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.189663">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0215455">
+<MaterialFraction fraction="0.0874563">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0878853">
+<MaterialFraction fraction="0.356739">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.199932">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.000370837">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR145Z44" density="0.51255*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.121162">
+<CompositeMaterial name="servicecompositeR157Z44" density="0.121474*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.471216">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0136642">
+<MaterialFraction fraction="0.0531421">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.358989">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.186953">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
+<MaterialFraction fraction="0.000207706">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0212376">
+<MaterialFraction fraction="0.082596">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0131582">
+<MaterialFraction fraction="0.0511739">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00113124">
+<MaterialFraction fraction="0.00439956">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0866295">
+<MaterialFraction fraction="0.336914">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.197075">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.000350228">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR145Z88" density="0.519874*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.119455">
+<CompositeMaterial name="servicecompositeR157Z88" density="0.128225*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.446408">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0134717">
+<MaterialFraction fraction="0.0503443">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.353932">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.184319">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
+<MaterialFraction fraction="0.000196771">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0209384">
+<MaterialFraction fraction="0.0782475">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0259456">
+<MaterialFraction fraction="0.0969594">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00223061">
+<MaterialFraction fraction="0.00833588">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0854091">
+<MaterialFraction fraction="0.319176">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.194298">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.00033179">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR145Z133" density="0.527198*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.117796">
+<CompositeMaterial name="servicecompositeR157Z133" density="0.134976*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.424081">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0132846">
+<MaterialFraction fraction="0.0478264">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.349015">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.181759">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
+<MaterialFraction fraction="0.000186929">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0206475">
+<MaterialFraction fraction="0.074334">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0383777">
+<MaterialFraction fraction="0.138165">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00329944">
+<MaterialFraction fraction="0.0118784">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0842225">
+<MaterialFraction fraction="0.303213">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.191599">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.000315195">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR145Z177" density="0.534522*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.116182">
+<CompositeMaterial name="servicecompositeR157Z178" density="0.141727*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.403881">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0131026">
+<MaterialFraction fraction="0.0455483">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.344233">
-<rMaterial name="tracker:tkLayout_CF"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.179268">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
+<MaterialFraction fraction="0.000178025">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0203646">
+<MaterialFraction fraction="0.0707933">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0504691">
+<MaterialFraction fraction="0.175445">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00433897">
+<MaterialFraction fraction="0.0150835">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0830685">
+<MaterialFraction fraction="0.28877">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.188974">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.000300182">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR145Z202" density="0.541846*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.114611">
+<CompositeMaterial name="servicecompositeR157Z203" density="0.148477*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.385518">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129255">
+<MaterialFraction fraction="0.0434774">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.33958">
-<rMaterial name="tracker:tkLayout_CF"/>
+<MaterialFraction fraction="0.000169931">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.176845">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0200894">
+<MaterialFraction fraction="0.0675746">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0622337">
+<MaterialFraction fraction="0.209335">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00535041">
+<MaterialFraction fraction="0.0179972">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0819457">
+<MaterialFraction fraction="0.275641">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.186419">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.000286534">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z271" density="0.147821*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.315382">
+<CompositeMaterial name="servicecompositeR165Z271" density="0.154788*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.301108">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0235408">
+<MaterialFraction fraction="0.0224754">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0838439">
+<MaterialFraction fraction="0.0769704">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0512738">
+<MaterialFraction fraction="0.0489532">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0570139">
+<MaterialFraction fraction="0.0544335">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0684166">
+<MaterialFraction fraction="0.0653202">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0513125">
+<MaterialFraction fraction="0.0489901">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0456111">
+<MaterialFraction fraction="0.0435468">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0191809">
+<MaterialFraction fraction="0.0183128">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.198646">
+<MaterialFraction fraction="0.189655">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0857788">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.130234">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR28Z259" density="1.04106*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.115267">
-<rMaterial name="tracker:tkLayout_Airex"/>
+<CompositeMaterial name="servicecompositeR163Z258" density="2.60464*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="1">
+<rMaterial name="tracker:tkLayout_CFRP_EPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.149911">
+</CompositeMaterial>
+<CompositeMaterial name="servicecompositeR30Z259" density="2.68941*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0310051">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0172974">
+<MaterialFraction fraction="0.00357751">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.353485">
-<rMaterial name="tracker:tkLayout_CF"/>
+<MaterialFraction fraction="0.445153">
+<rMaterial name="tracker:tkLayout_CFRP_FPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.107444">
+<MaterialFraction fraction="0.0403617">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0265005">
+<MaterialFraction fraction="1.39808e-05">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.382299">
+<rMaterial name="tracker:tkLayout_Carbon_foam_FPX"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.00548094">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000145788">
+<MaterialFraction fraction="5.46928e-05">
 <rMaterial name="tracker:tkLayout_FPIX_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.08819e-05">
+<MaterialFraction fraction="4.08238e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.87575e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="2.37017e-05">
+<MaterialFraction fraction="8.89177e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="9.18254e-05">
+<MaterialFraction fraction="3.44486e-05">
 <rMaterial name="tracker:tkLayout_FPIX_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.96519e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.116536">
+<MaterialFraction fraction="0.0241024">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.113209">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.067881">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
+</MaterialFraction>
+<MaterialFraction fraction="2.36555e-05">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z306" density="0.164864*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00808806">
+<CompositeMaterial name="servicecompositeR165Z306" density="0.171826*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00775831">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.33593">
+<MaterialFraction fraction="0.322234">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0211073">
+<MaterialFraction fraction="0.0202467">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0751766">
+<MaterialFraction fraction="0.0693381">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0644604">
+<MaterialFraction fraction="0.0618323">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00693263">
+<MaterialFraction fraction="0.00664998">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.411394">
+<MaterialFraction fraction="0.394621">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0769115">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.11732">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR168Z284" density="2.95408*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR168Z284" density="2.95332*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.650302">
 <rMaterial name="tracker:tkLayout_2S-SEH-mix"/>
 </MaterialFraction>
@@ -1862,840 +1487,798 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rMaterial name="tracker:tkLayout_Epoxy"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z385" density="0.329728*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00808806">
+<CompositeMaterial name="servicecompositeR165Z385" density="0.343652*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00775831">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.33593">
+<MaterialFraction fraction="0.322234">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0211073">
+<MaterialFraction fraction="0.0202467">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0751766">
+<MaterialFraction fraction="0.0693381">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0644604">
+<MaterialFraction fraction="0.0618323">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00693263">
+<MaterialFraction fraction="0.00664998">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.411394">
+<MaterialFraction fraction="0.394621">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0769115">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.11732">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z487" density="0.494592*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00808806">
+<CompositeMaterial name="servicecompositeR165Z487" density="0.515478*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00775831">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.33593">
+<MaterialFraction fraction="0.322234">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0211073">
+<MaterialFraction fraction="0.0202467">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0751766">
+<MaterialFraction fraction="0.0693381">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0644604">
+<MaterialFraction fraction="0.0618323">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00693263">
+<MaterialFraction fraction="0.00664998">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.411394">
+<MaterialFraction fraction="0.394621">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0769115">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.11732">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z617" density="0.659455*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00808806">
+<CompositeMaterial name="servicecompositeR165Z617" density="0.687304*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00775831">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.33593">
+<MaterialFraction fraction="0.322234">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0211073">
+<MaterialFraction fraction="0.0202467">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0751766">
+<MaterialFraction fraction="0.0693381">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0644604">
+<MaterialFraction fraction="0.0618323">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00693263">
+<MaterialFraction fraction="0.00664998">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.411394">
+<MaterialFraction fraction="0.394621">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0769115">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.11732">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z783" density="0.824319*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00808806">
+<CompositeMaterial name="servicecompositeR165Z783" density="0.859129*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00775831">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.33593">
+<MaterialFraction fraction="0.322234">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0211073">
+<MaterialFraction fraction="0.0202467">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0751766">
+<MaterialFraction fraction="0.0693381">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0644604">
+<MaterialFraction fraction="0.0618323">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00693263">
+<MaterialFraction fraction="0.00664998">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.411394">
+<MaterialFraction fraction="0.394621">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0769115">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.11732">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z996" density="0.989183*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00808806">
+<CompositeMaterial name="servicecompositeR165Z996" density="1.03096*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00775831">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.33593">
+<MaterialFraction fraction="0.322234">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0211073">
+<MaterialFraction fraction="0.0202467">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0751766">
+<MaterialFraction fraction="0.0693381">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0644604">
+<MaterialFraction fraction="0.0618323">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00693263">
+<MaterialFraction fraction="0.00664998">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.411394">
+<MaterialFraction fraction="0.394621">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0769115">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.11732">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z1268" density="1.15405*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00808806">
+<CompositeMaterial name="servicecompositeR165Z1268" density="1.20278*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00775831">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.33593">
+<MaterialFraction fraction="0.322234">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0211073">
+<MaterialFraction fraction="0.0202467">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0751766">
+<MaterialFraction fraction="0.0693381">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0644604">
+<MaterialFraction fraction="0.0618323">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00693263">
+<MaterialFraction fraction="0.00664998">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.411394">
+<MaterialFraction fraction="0.394621">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0769115">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.11732">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR176Z1521" density="1.83694*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00867211">
+<CompositeMaterial name="servicecompositeR165Z1450" density="1.37461*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00775831">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.313056">
+<MaterialFraction fraction="0.322234">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0236181">
+<MaterialFraction fraction="0.0202467">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0506679">
+<MaterialFraction fraction="0.0693381">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00305956">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00524497">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00764891">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0107085">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0630372">
+<MaterialFraction fraction="0.0618323">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00743324">
+<MaterialFraction fraction="0.00664998">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.426911">
+<MaterialFraction fraction="0.394621">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0518372">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00322521">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00552893">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00806302">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0112882">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.11732">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR178Z1434" density="2.77514*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.650302">
-<rMaterial name="tracker:tkLayout_2S-SEH-mix"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.127291">
-<rMaterial name="tracker:tkLayout_CFRP"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.212522">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00988559">
-<rMaterial name="tracker:tkLayout_Epoxy"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR73Z259" density="0.846135*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.141821">
-<rMaterial name="tracker:tkLayout_Airex"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.113326">
+<CompositeMaterial name="servicecompositeR74Z259" density="2.70752*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0307978">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0130761">
+<MaterialFraction fraction="0.00355359">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.434919">
-<rMaterial name="tracker:tkLayout_CF"/>
+<MaterialFraction fraction="0.442176">
+<rMaterial name="tracker:tkLayout_CFRP_FPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0812228">
+<MaterialFraction fraction="0.0400918">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0200333">
+<MaterialFraction fraction="8.76556e-06">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.379742">
+<rMaterial name="tracker:tkLayout_Carbon_foam_FPX"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.00544428">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0199233">
+<MaterialFraction fraction="0.00619901">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000110209">
+<MaterialFraction fraction="3.42909e-05">
 <rMaterial name="tracker:tkLayout_FPIX_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="8.22626e-06">
+<MaterialFraction fraction="2.55954e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.9299e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.79175e-05">
+<MaterialFraction fraction="5.5749e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.94161e-05">
+<MaterialFraction fraction="2.15984e-05">
 <rMaterial name="tracker:tkLayout_FPIX_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.99751e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0017354">
+<MaterialFraction fraction="0.000539959">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0880962">
+<MaterialFraction fraction="0.0239412">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0855816">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.0674271">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR93Z259" density="0.774661*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.154906">
-<rMaterial name="tracker:tkLayout_Airex"/>
+<MaterialFraction fraction="1.48313e-05">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0933524">
+</CompositeMaterial>
+<CompositeMaterial name="servicecompositeR92Z259" density="2.71972*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0306596">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0107714">
+<MaterialFraction fraction="0.00353765">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.475046">
-<rMaterial name="tracker:tkLayout_CF"/>
+<MaterialFraction fraction="0.440192">
+<rMaterial name="tracker:tkLayout_CFRP_FPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0669072">
+<MaterialFraction fraction="0.0399119">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0165024">
+<MaterialFraction fraction="6.63465e-06">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.378039">
+<rMaterial name="tracker:tkLayout_Carbon_foam_FPX"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.00541986">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0164118">
+<MaterialFraction fraction="0.00469202">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0196942">
+<MaterialFraction fraction="0.00563043">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
 </MaterialFraction>
-<MaterialFraction fraction="9.07847e-05">
+<MaterialFraction fraction="2.59547e-05">
 <rMaterial name="tracker:tkLayout_FPIX_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.77637e-06">
+<MaterialFraction fraction="1.93732e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.4135e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.47595e-05">
+<MaterialFraction fraction="4.21963e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.71814e-05">
+<MaterialFraction fraction="1.63478e-05">
 <rMaterial name="tracker:tkLayout_FPIX_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.4692e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0031227">
+<MaterialFraction fraction="0.000892758">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0725691">
+<MaterialFraction fraction="0.0238338">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0704976">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.0671246">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR128Z259" density="0.717207*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.167316">
-<rMaterial name="tracker:tkLayout_Airex"/>
+<MaterialFraction fraction="1.12258e-05">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0772721">
+</CompositeMaterial>
+<CompositeMaterial name="servicecompositeR127Z259" density="2.72201*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0306338">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00891601">
+<MaterialFraction fraction="0.00353467">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.513102">
-<rMaterial name="tracker:tkLayout_CF"/>
+<MaterialFraction fraction="0.439821">
+<rMaterial name="tracker:tkLayout_CFRP_FPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0553821">
+<MaterialFraction fraction="0.0398783">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0136598">
+<MaterialFraction fraction="5.06569e-06">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.37772">
+<rMaterial name="tracker:tkLayout_Carbon_foam_FPX"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.00541529">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0135848">
+<MaterialFraction fraction="0.00358245">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0163018">
+<MaterialFraction fraction="0.00429894">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0122263">
+<MaterialFraction fraction="0.00322421">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
 </MaterialFraction>
-<MaterialFraction fraction="7.51467e-05">
+<MaterialFraction fraction="1.9817e-05">
 <rMaterial name="tracker:tkLayout_FPIX_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.60911e-06">
+<MaterialFraction fraction="1.47918e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.99777e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.22171e-05">
+<MaterialFraction fraction="3.22178e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.73317e-05">
+<MaterialFraction fraction="1.24819e-05">
 <rMaterial name="tracker:tkLayout_FPIX_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.04387e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00363593">
+<MaterialFraction fraction="0.000958833">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0600687">
+<MaterialFraction fraction="0.0238137">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0583541">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.067068">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR160Z259" density="0.699413*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.171573">
-<rMaterial name="tracker:tkLayout_Airex"/>
+<MaterialFraction fraction="8.57114e-06">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0704836">
+</CompositeMaterial>
+<CompositeMaterial name="servicecompositeR160Z259" density="2.72586*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0305905">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00813272">
+<MaterialFraction fraction="0.00352967">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.526156">
-<rMaterial name="tracker:tkLayout_CF"/>
+<MaterialFraction fraction="0.4392">
+<rMaterial name="tracker:tkLayout_CFRP_FPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0505167">
+<MaterialFraction fraction="0.039822">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0124597">
+<MaterialFraction fraction="4.49457e-06">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.377186">
+<rMaterial name="tracker:tkLayout_Carbon_foam_FPX"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.00540764">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123914">
+<MaterialFraction fraction="0.00317856">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0148696">
+<MaterialFraction fraction="0.00381427">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0111522">
+<MaterialFraction fraction="0.0028607">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00991308">
+<MaterialFraction fraction="0.00254285">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.85449e-05">
+<MaterialFraction fraction="1.75828e-05">
 <rMaterial name="tracker:tkLayout_FPIX_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.11634e-06">
+<MaterialFraction fraction="1.31241e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.82226e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.11438e-05">
+<MaterialFraction fraction="2.85855e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.31735e-05">
+<MaterialFraction fraction="1.10746e-05">
 <rMaterial name="tracker:tkLayout_FPIX_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.86431e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00416876">
+<MaterialFraction fraction="0.00106935">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0547916">
+<MaterialFraction fraction="0.02378">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0532276">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.0669733">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
+</MaterialFraction>
+<MaterialFraction fraction="7.60481e-06">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z341" density="0.312685*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00426445">
+<CompositeMaterial name="servicecompositeR165Z341" density="0.326614*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00408151">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.326216">
+<MaterialFraction fraction="0.312222">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0222577">
+<MaterialFraction fraction="0.0213029">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0792741">
+<MaterialFraction fraction="0.0729552">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0582265">
+<MaterialFraction fraction="0.0557287">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0269532">
+<MaterialFraction fraction="0.025797">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0323438">
+<MaterialFraction fraction="0.0309563">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0242579">
+<MaterialFraction fraction="0.0232173">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0215625">
+<MaterialFraction fraction="0.0206376">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00365524">
+<MaterialFraction fraction="0.00349844">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00906773">
+<MaterialFraction fraction="0.00867875">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.310817">
+<MaterialFraction fraction="0.297484">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0811035">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.12344">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z430" density="0.477549*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00558447">
+<CompositeMaterial name="servicecompositeR165Z430" density="0.49844*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00534901">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.32957">
+<MaterialFraction fraction="0.315673">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0218606">
+<MaterialFraction fraction="0.0209388">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0778595">
+<MaterialFraction fraction="0.0717083">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0603786">
+<MaterialFraction fraction="0.0578328">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0176482">
+<MaterialFraction fraction="0.016904">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0211778">
+<MaterialFraction fraction="0.0202848">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0158833">
+<MaterialFraction fraction="0.0152136">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0141185">
+<MaterialFraction fraction="0.0135232">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00478669">
+<MaterialFraction fraction="0.00458486">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00593729">
+<MaterialFraction fraction="0.00568694">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.345539">
+<MaterialFraction fraction="0.33097">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0796563">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.12133">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z544" density="0.642413*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00622698">
+<CompositeMaterial name="servicecompositeR165Z544" density="0.670265*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00596664">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.331202">
+<MaterialFraction fraction="0.317355">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0216672">
+<MaterialFraction fraction="0.0207614">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.077171">
+<MaterialFraction fraction="0.0711007">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0614261">
+<MaterialFraction fraction="0.0588581">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0131191">
+<MaterialFraction fraction="0.0125706">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0157429">
+<MaterialFraction fraction="0.0150847">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0118072">
+<MaterialFraction fraction="0.0113135">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0104953">
+<MaterialFraction fraction="0.0100565">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00533741">
+<MaterialFraction fraction="0.00511427">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00441359">
+<MaterialFraction fraction="0.00422907">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.36244">
+<MaterialFraction fraction="0.347287">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0789519">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.120302">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z690" density="0.807277*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00660705">
+<CompositeMaterial name="servicecompositeR165Z690" density="0.842091*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00633223">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.332167">
+<MaterialFraction fraction="0.318351">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0215529">
+<MaterialFraction fraction="0.0206564">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0767637">
+<MaterialFraction fraction="0.070741">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0620458">
+<MaterialFraction fraction="0.0594649">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0104399">
+<MaterialFraction fraction="0.0100056">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0125278">
+<MaterialFraction fraction="0.0120067">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00939588">
+<MaterialFraction fraction="0.00900505">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00835189">
+<MaterialFraction fraction="0.00800449">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00566319">
+<MaterialFraction fraction="0.00542762">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00351223">
+<MaterialFraction fraction="0.00336614">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.372437">
+<MaterialFraction fraction="0.356945">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0785352">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.119694">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z877" density="0.97214*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00685821">
+<CompositeMaterial name="servicecompositeR165Z877" density="1.01392*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0065739">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.332805">
+<MaterialFraction fraction="0.319009">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0214773">
+<MaterialFraction fraction="0.020587">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0764946">
+<MaterialFraction fraction="0.0705033">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0624553">
+<MaterialFraction fraction="0.0598661">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00866938">
+<MaterialFraction fraction="0.00830999">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0104033">
+<MaterialFraction fraction="0.00997198">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00780244">
+<MaterialFraction fraction="0.00747899">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00693551">
+<MaterialFraction fraction="0.00664799">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00587847">
+<MaterialFraction fraction="0.00563477">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0029166">
+<MaterialFraction fraction="0.00279569">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.379044">
+<MaterialFraction fraction="0.36333">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0782598">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.119292">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z1116" density="1.137*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00703654">
+<CompositeMaterial name="servicecompositeR165Z1116" density="1.18574*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00674553">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.333258">
+<MaterialFraction fraction="0.319476">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0214237">
+<MaterialFraction fraction="0.0205377">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0763035">
+<MaterialFraction fraction="0.0703344">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.062746">
+<MaterialFraction fraction="0.0601511">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00741234">
+<MaterialFraction fraction="0.00710579">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0088948">
+<MaterialFraction fraction="0.00852694">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0066711">
+<MaterialFraction fraction="0.00639521">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00592987">
+<MaterialFraction fraction="0.00568463">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00603132">
+<MaterialFraction fraction="0.00578188">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0024937">
+<MaterialFraction fraction="0.00239057">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.383734">
+<MaterialFraction fraction="0.367864">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0780643">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.119006">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR165Z1412" density="1.30187*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0071697">
+<CompositeMaterial name="servicecompositeR165Z1421" density="1.35757*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00687372">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.333597">
+<MaterialFraction fraction="0.319825">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0213836">
+<MaterialFraction fraction="0.0205008">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0761608">
+<MaterialFraction fraction="0.0702083">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0629631">
+<MaterialFraction fraction="0.0603638">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00647366">
+<MaterialFraction fraction="0.00620642">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R1"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0077684">
+<MaterialFraction fraction="0.0074477">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0058263">
+<MaterialFraction fraction="0.00558577">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00517893">
+<MaterialFraction fraction="0.00496513">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TFPX_R4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00614546">
+<MaterialFraction fraction="0.00589176">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0021779">
+<MaterialFraction fraction="0.002088">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.387237">
+<MaterialFraction fraction="0.371251">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0779183">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.118792">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR259Z1776" density="0.165155*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.3313">
+<CompositeMaterial name="servicecompositeR259Z1776" density="0.17027*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.321361">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0238491">
+<MaterialFraction fraction="0.0231337">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0961361">
+<MaterialFraction fraction="0.0896655">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0536143">
+<MaterialFraction fraction="0.052006">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0326863">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
+<MaterialFraction fraction="0.0317057">
+<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1_4chipmodules"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0457608">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
+<MaterialFraction fraction="0.033291">
+<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2_4chipmodules"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0294176">
+<MaterialFraction fraction="0.0285352">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0326863">
+<MaterialFraction fraction="0.0348763">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0392235">
+<MaterialFraction fraction="0.0380469">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R5"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0154557">
+<MaterialFraction fraction="1.43106e-05">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.201516">
+<MaterialFraction fraction="0.195471">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0983546">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.151893">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR63Z1759" density="1.24696*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0962344">
-<rMaterial name="tracker:tkLayout_Airex"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.118854">
-<rMaterial name="tracker:tkLayout_Al"/>
+<CompositeMaterial name="servicecompositeR257Z1758" density="1.66163*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="1">
+<rMaterial name="tracker:tkLayout_CFRP_EPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0493464">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
+</CompositeMaterial>
+<CompositeMaterial name="servicecompositeR62Z1759" density="2.45168*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0542928">
+<rMaterial name="tracker:tkLayout_Airex"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.295119">
-<rMaterial name="tracker:tkLayout_CF"/>
+<MaterialFraction fraction="0.313228">
+<rMaterial name="tracker:tkLayout_CFRP_EPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0908588">
+<MaterialFraction fraction="0.0707895">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0337552">
-<rMaterial name="tracker:tkLayout_Cu"/>
+<MaterialFraction fraction="1.90386e-05">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000132971">
+<MaterialFraction fraction="6.82343e-05">
 <rMaterial name="tracker:tkLayout_FPIX_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="9.57211e-06">
+<MaterialFraction fraction="4.91195e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.85852e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="2.15187e-05">
+<MaterialFraction fraction="1.10424e-05">
 <rMaterial name="tracker:tkLayout_FPIX_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="8.08806e-05">
+<MaterialFraction fraction="4.15041e-05">
 <rMaterial name="tracker:tkLayout_FPIX_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.94757e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
+<MaterialFraction fraction="0.442695">
+<rMaterial name="tracker:tkLayout_PCB_panel_EPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.219735">
-<rMaterial name="tracker:tkLayout_PE"/>
+<MaterialFraction fraction="0.118818">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0957743">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="3.22514e-05">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR259Z1894" density="0.16673*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00512764">
+<CompositeMaterial name="servicecompositeR259Z1906" density="0.182512*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00562168">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.361865">
+<MaterialFraction fraction="0.336749">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0236238">
+<MaterialFraction fraction="0.021582">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0952276">
+<MaterialFraction fraction="0.0836513">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.064828">
+<MaterialFraction fraction="0.0613673">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00439512">
+<MaterialFraction fraction="0.00481859">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.347508">
+<MaterialFraction fraction="0.344505">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0974252">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.141705">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR261Z1795" density="1.63617*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR261Z1795" density="1.9636*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.650302">
 <rMaterial name="tracker:tkLayout_2S-SEH-mix"/>
 </MaterialFraction>
@@ -2709,570 +2292,477 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rMaterial name="tracker:tkLayout_Epoxy"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR259Z2144" density="0.333461*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00512764">
+<CompositeMaterial name="servicecompositeR259Z2185" density="0.365024*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00562168">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.361865">
+<MaterialFraction fraction="0.336749">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0236238">
+<MaterialFraction fraction="0.021582">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0952276">
+<MaterialFraction fraction="0.0836513">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.064828">
+<MaterialFraction fraction="0.0613673">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00439512">
+<MaterialFraction fraction="0.00481859">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.347508">
+<MaterialFraction fraction="0.344505">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0974252">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR261Z2030" density="1.6362*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.650302">
-<rMaterial name="tracker:tkLayout_2S-SEH-mix"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.127291">
-<rMaterial name="tracker:tkLayout_CFRP"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.212522">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00988559">
-<rMaterial name="tracker:tkLayout_Epoxy"/>
+<MaterialFraction fraction="0.141705">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR259Z2427" density="0.500191*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00512764">
+<CompositeMaterial name="servicecompositeR259Z2505" density="0.547536*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00562168">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.361865">
+<MaterialFraction fraction="0.336749">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0236238">
+<MaterialFraction fraction="0.021582">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0952276">
+<MaterialFraction fraction="0.0836513">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.064828">
+<MaterialFraction fraction="0.0613673">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00439512">
+<MaterialFraction fraction="0.00481859">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.347508">
+<MaterialFraction fraction="0.344505">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0974252">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.141705">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR277Z2625" density="1.79695*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00744116">
+<CompositeMaterial name="servicecompositeR259Z2714" density="0.730048*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00562168">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.330007">
+<MaterialFraction fraction="0.336749">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0236201">
+<MaterialFraction fraction="0.021582">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.066143">
+<MaterialFraction fraction="0.0836513">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00199701">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00342345">
-<rMaterial name="tracker:tkLayout_CO2_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00499253">
-<rMaterial name="tracker:tkLayout_CO2_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00698954">
-<rMaterial name="tracker:tkLayout_CO2_L4"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0636592">
+<MaterialFraction fraction="0.0613673">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00637813">
+<MaterialFraction fraction="0.00481859">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.399335">
+<MaterialFraction fraction="0.344505">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0676694">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00210513">
-<rMaterial name="tracker:tkLayout_Ti_L1"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00360879">
-<rMaterial name="tracker:tkLayout_Ti_L2"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00526282">
-<rMaterial name="tracker:tkLayout_Ti_L3"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00736795">
-<rMaterial name="tracker:tkLayout_Ti_L4"/>
+<MaterialFraction fraction="0.141705">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR279Z2595" density="1.5318*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.650302">
-<rMaterial name="tracker:tkLayout_2S-SEH-mix"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.127291">
-<rMaterial name="tracker:tkLayout_CFRP"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.212522">
-<rMaterial name="tracker:tkLayout_Cu"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00988559">
-<rMaterial name="tracker:tkLayout_Epoxy"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="servicecompositeR108Z1759" density="1.00698*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.119168">
+<CompositeMaterial name="servicecompositeR107Z1759" density="2.45155*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0542957">
 <rMaterial name="tracker:tkLayout_Airex"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0983395">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0408291">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.36545">
-<rMaterial name="tracker:tkLayout_CF"/>
+<MaterialFraction fraction="0.313244">
+<rMaterial name="tracker:tkLayout_CFRP_EPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0751765">
+<MaterialFraction fraction="0.0707932">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.027929">
-<rMaterial name="tracker:tkLayout_Cu"/>
+<MaterialFraction fraction="1.28514e-05">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0108546">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
+<MaterialFraction fraction="4.54427e-06">
+<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1_4chipmodules"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00011002">
+<MaterialFraction fraction="4.60595e-05">
 <rMaterial name="tracker:tkLayout_FPIX_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="7.91995e-06">
+<MaterialFraction fraction="3.31567e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.19254e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.78045e-05">
+<MaterialFraction fraction="7.45383e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.69205e-05">
+<MaterialFraction fraction="2.80161e-05">
 <rMaterial name="tracker:tkLayout_FPIX_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.26621e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.000933203">
+<MaterialFraction fraction="3.90683e-07">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.181809">
-<rMaterial name="tracker:tkLayout_PE"/>
+<MaterialFraction fraction="0.442719">
+<rMaterial name="tracker:tkLayout_PCB_panel_EPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0792435">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.118824">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
+</MaterialFraction>
+<MaterialFraction fraction="2.17703e-05">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR149Z1759" density="0.895516*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.134001">
+<CompositeMaterial name="servicecompositeR144Z1759" density="2.45149*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.054297">
 <rMaterial name="tracker:tkLayout_Airex"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.084136">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0349321">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.410936">
-<rMaterial name="tracker:tkLayout_CF"/>
+<MaterialFraction fraction="0.313252">
+<rMaterial name="tracker:tkLayout_CFRP_EPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0643185">
+<MaterialFraction fraction="0.0707949">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0238952">
-<rMaterial name="tracker:tkLayout_Cu"/>
+<MaterialFraction fraction="9.92749e-06">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00928687">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
+<MaterialFraction fraction="3.51036e-06">
+<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1_4chipmodules"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0130016">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
+<MaterialFraction fraction="3.68588e-06">
+<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2_4chipmodules"/>
 </MaterialFraction>
-<MaterialFraction fraction="9.41293e-05">
+<MaterialFraction fraction="3.55801e-05">
 <rMaterial name="tracker:tkLayout_FPIX_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.77605e-06">
+<MaterialFraction fraction="2.56129e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.73143e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.5233e-05">
+<MaterialFraction fraction="5.75794e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.7255e-05">
+<MaterialFraction fraction="2.16419e-05">
 <rMaterial name="tracker:tkLayout_FPIX_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.79446e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0019162">
+<MaterialFraction fraction="6.18681e-07">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.15555">
-<rMaterial name="tracker:tkLayout_PE"/>
+<MaterialFraction fraction="0.442729">
+<rMaterial name="tracker:tkLayout_PCB_panel_EPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0677981">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.118827">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
+</MaterialFraction>
+<MaterialFraction fraction="1.68172e-05">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR189Z1759" density="0.821482*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.146077">
+<CompositeMaterial name="servicecompositeR182Z1759" density="2.45146*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0542978">
 <rMaterial name="tracker:tkLayout_Airex"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0735881">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0305527">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.447971">
-<rMaterial name="tracker:tkLayout_CF"/>
+<MaterialFraction fraction="0.313257">
+<rMaterial name="tracker:tkLayout_CFRP_EPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0562551">
+<MaterialFraction fraction="0.070796">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0208995">
-<rMaterial name="tracker:tkLayout_Cu"/>
+<MaterialFraction fraction="8.1043e-06">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00812259">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
+<MaterialFraction fraction="2.86568e-06">
+<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1_4chipmodules"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0113716">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
+<MaterialFraction fraction="3.00897e-06">
+<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2_4chipmodules"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00731033">
+<MaterialFraction fraction="2.57911e-06">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R3"/>
 </MaterialFraction>
-<MaterialFraction fraction="8.23285e-05">
+<MaterialFraction fraction="2.90458e-05">
 <rMaterial name="tracker:tkLayout_FPIX_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.92655e-06">
+<MaterialFraction fraction="2.09091e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.389e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.33233e-05">
+<MaterialFraction fraction="4.7005e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.00771e-05">
+<MaterialFraction fraction="1.76674e-05">
 <rMaterial name="tracker:tkLayout_FPIX_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.44413e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00230446">
+<MaterialFraction fraction="7.26794e-07">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.136049">
-<rMaterial name="tracker:tkLayout_PE"/>
+<MaterialFraction fraction="0.442736">
+<rMaterial name="tracker:tkLayout_PCB_panel_EPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0592984">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.118829">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
+</MaterialFraction>
+<MaterialFraction fraction="1.37287e-05">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR232Z1759" density="0.783039*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.153249">
+<CompositeMaterial name="servicecompositeR218Z1759" density="2.45143*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0542984">
 <rMaterial name="tracker:tkLayout_Airex"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0668487">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0277546">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.469964">
-<rMaterial name="tracker:tkLayout_CF"/>
+<MaterialFraction fraction="0.31326">
+<rMaterial name="tracker:tkLayout_CFRP_EPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0511031">
+<MaterialFraction fraction="0.0707967">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0189855">
-<rMaterial name="tracker:tkLayout_Cu"/>
+<MaterialFraction fraction="6.86337e-06">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00737871">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
+<MaterialFraction fraction="2.42689e-06">
+<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1_4chipmodules"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0103302">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
+<MaterialFraction fraction="2.54823e-06">
+<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2_4chipmodules"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00664084">
+<MaterialFraction fraction="2.1842e-06">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00737871">
+<MaterialFraction fraction="2.66958e-06">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R4"/>
 </MaterialFraction>
-<MaterialFraction fraction="7.47887e-05">
+<MaterialFraction fraction="2.45983e-05">
 <rMaterial name="tracker:tkLayout_FPIX_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.38379e-06">
+<MaterialFraction fraction="1.77075e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.17021e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.21031e-05">
+<MaterialFraction fraction="3.98076e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.54909e-05">
+<MaterialFraction fraction="1.49622e-05">
 <rMaterial name="tracker:tkLayout_FPIX_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.22029e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.00272779">
+<MaterialFraction fraction="8.45019e-07">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.123589">
-<rMaterial name="tracker:tkLayout_PE"/>
+<MaterialFraction fraction="0.442741">
+<rMaterial name="tracker:tkLayout_PCB_panel_EPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0538678">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.11883">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
+</MaterialFraction>
+<MaterialFraction fraction="1.16266e-05">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR254Z1759" density="0.775773*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.154684">
+<CompositeMaterial name="servicecompositeR254Z1759" density="2.45143*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0542985">
 <rMaterial name="tracker:tkLayout_Airex"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0641754">
-<rMaterial name="tracker:tkLayout_Al"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0266447">
-<rMaterial name="tracker:tkLayout_Al_HV"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.474366">
-<rMaterial name="tracker:tkLayout_CF"/>
+<MaterialFraction fraction="0.313261">
+<rMaterial name="tracker:tkLayout_CFRP_EPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0490594">
+<MaterialFraction fraction="0.0707969">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0182262">
-<rMaterial name="tracker:tkLayout_Cu"/>
+<MaterialFraction fraction="6.33986e-06">
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00708362">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
+<MaterialFraction fraction="2.24177e-06">
+<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1_4chipmodules"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00991707">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
+<MaterialFraction fraction="2.35386e-06">
+<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2_4chipmodules"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00637526">
+<MaterialFraction fraction="2.0176e-06">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00708362">
+<MaterialFraction fraction="2.46595e-06">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00850035">
+<MaterialFraction fraction="2.69013e-06">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R5"/>
 </MaterialFraction>
-<MaterialFraction fraction="7.17978e-05">
+<MaterialFraction fraction="2.2722e-05">
 <rMaterial name="tracker:tkLayout_FPIX_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.16848e-06">
+<MaterialFraction fraction="1.63568e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.08342e-05">
-<rMaterial name="tracker:tkLayout_FPIX_CO2"/>
-</MaterialFraction>
-<MaterialFraction fraction="1.16191e-05">
+<MaterialFraction fraction="3.67712e-06">
 <rMaterial name="tracker:tkLayout_FPIX_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.36717e-05">
+<MaterialFraction fraction="1.38209e-05">
 <rMaterial name="tracker:tkLayout_FPIX_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.1315e-05">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-<MaterialFraction fraction="0.0033495">
+<MaterialFraction fraction="1.01184e-06">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.118647">
-<rMaterial name="tracker:tkLayout_PE"/>
+<MaterialFraction fraction="0.442742">
+<rMaterial name="tracker:tkLayout_PCB_panel_EPX"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0517135">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.11883">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
+</MaterialFraction>
+<MaterialFraction fraction="1.07397e-05">
+<rMaterial name="tracker:tkLayout_StainlessSteel_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR259Z2012" density="0.331885*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00257599">
+<CompositeMaterial name="servicecompositeR259Z2036" density="0.352782*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00290838">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.346655">
+<MaterialFraction fraction="0.329322">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0237359">
+<MaterialFraction fraction="0.0223309">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0956797">
+<MaterialFraction fraction="0.086554">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0592478">
+<MaterialFraction fraction="0.0568491">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0162655">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
+<MaterialFraction fraction="0.0153028">
+<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1_4chipmodules"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0227718">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
+<MaterialFraction fraction="0.0160679">
+<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2_4chipmodules"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.014639">
+<MaterialFraction fraction="0.0137725">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0162655">
+<MaterialFraction fraction="0.016833">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0195187">
+<MaterialFraction fraction="0.0183633">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R5"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00220799">
+<MaterialFraction fraction="0.0024929">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00769118">
+<MaterialFraction fraction="6.90701e-06">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.274858">
+<MaterialFraction fraction="0.272574">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0978877">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.146623">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR259Z2277" density="0.498615*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00342923">
+<CompositeMaterial name="servicecompositeR259Z2334" density="0.535294*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0038335">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.351741">
+<MaterialFraction fraction="0.331854">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0236984">
+<MaterialFraction fraction="0.0220756">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0955285">
+<MaterialFraction fraction="0.0855643">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0611138">
+<MaterialFraction fraction="0.0583896">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0108266">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
+<MaterialFraction fraction="0.0100852">
+<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1_4chipmodules"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0151572">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
+<MaterialFraction fraction="0.0105894">
+<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2_4chipmodules"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00974391">
+<MaterialFraction fraction="0.00907666">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0108266">
+<MaterialFraction fraction="0.0110937">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129919">
+<MaterialFraction fraction="0.0121022">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R5"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00293934">
+<MaterialFraction fraction="0.00328586">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00511935">
+<MaterialFraction fraction="4.55202e-06">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.299151">
+<MaterialFraction fraction="0.297099">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.097733">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.144946">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR259Z2562" density="0.665346*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00385484">
+<CompositeMaterial name="servicecompositeR259Z2676" density="0.717806*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00428817">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.354278">
+<MaterialFraction fraction="0.333099">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0236797">
+<MaterialFraction fraction="0.0219501">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0954531">
+<MaterialFraction fraction="0.0850779">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0620445">
+<MaterialFraction fraction="0.0591467">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00811352">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1"/>
+<MaterialFraction fraction="0.00752089">
+<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R1_4chipmodules"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0113589">
-<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2"/>
+<MaterialFraction fraction="0.00789693">
+<rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R2_4chipmodules"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00730216">
+<MaterialFraction fraction="0.0067688">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R3"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00811352">
+<MaterialFraction fraction="0.00827298">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R4"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00973622">
+<MaterialFraction fraction="0.00902506">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TEPX_R5"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00330415">
+<MaterialFraction fraction="0.00367557">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00383648">
+<MaterialFraction fraction="3.39461e-06">
 <rMaterial name="tracker:tkLayout_Kapton"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.311269">
+<MaterialFraction fraction="0.309153">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0976559">
-<rMaterial name="tracker:tkLayout_Ti"/>
+<MaterialFraction fraction="0.144122">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="supportcompositeR188Z113" density="1.94695*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0346439">
-<rMaterial name="tracker:tkLayout_Al"/>
+<CompositeMaterial name="supportcompositeR208Z113" density="2.433*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="1">
+<rMaterial name="tracker:tkLayout_CFRP_ITST"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.874188">
-<rMaterial name="tracker:tkLayout_CF"/>
+</CompositeMaterial>
+<CompositeMaterial name="supportcompositeR172Z916" density="0.811*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="1">
+<rMaterial name="tracker:tkLayout_CFRP_ITST"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0911682">
-<rMaterial name="tracker:tkLayout_Kevlar"/>
+</CompositeMaterial>
+<CompositeMaterial name="supportcompositeR170Z237" density="1.622*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="1">
+<rMaterial name="tracker:tkLayout_CFRP_ITST"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="supportcompositeR172Z835" density="0.92*g/cm3" method="mixture by weight">
+<CompositeMaterial name="supportcompositeR161Z100" density="2.5025*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="1">
-<rMaterial name="tracker:tkLayout_CF"/>
+<rMaterial name="tracker:tkLayout_CFRP"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="supportcompositeR38Z101" density="0.304*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.394737">
+<CompositeMaterial name="supportcompositeR44Z41" density="0.875*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.182857">
 <rMaterial name="tracker:tkLayout_Airex"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.605263">
-<rMaterial name="tracker:tkLayout_CF"/>
+<MaterialFraction fraction="0.817143">
+<rMaterial name="tracker:tkLayout_CFRP"/>
 </MaterialFraction>
 </CompositeMaterial>
 </MaterialSection>
@@ -3488,7 +2978,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="BModule1Layer2Hybrid" category="unspecified">
 <rSolid name="pixel:BModule1Layer2Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer2Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="BModule1Layer2Chip" category="unspecified">
 <rSolid name="pixel:BModule1Layer2Chip"/>
@@ -3524,7 +3014,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="BModule2Layer2Hybrid" category="unspecified">
 <rSolid name="pixel:BModule2Layer2Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer2Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="BModule2Layer2Chip" category="unspecified">
 <rSolid name="pixel:BModule2Layer2Chip"/>
@@ -3560,7 +3050,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="BModule3Layer2Hybrid" category="unspecified">
 <rSolid name="pixel:BModule3Layer2Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer2Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="BModule3Layer2Chip" category="unspecified">
 <rSolid name="pixel:BModule3Layer2Chip"/>
@@ -3596,7 +3086,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="BModule4Layer2Hybrid" category="unspecified">
 <rSolid name="pixel:BModule4Layer2Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer2Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="BModule4Layer2Chip" category="unspecified">
 <rSolid name="pixel:BModule4Layer2Chip"/>
@@ -3632,7 +3122,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="BModule5Layer2Hybrid" category="unspecified">
 <rSolid name="pixel:BModule5Layer2Hybrid"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer2Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="BModule5Layer2Chip" category="unspecified">
 <rSolid name="pixel:BModule5Layer2Chip"/>
@@ -4064,11 +3554,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule1Disc1Hybrid" category="unspecified">
 <rSolid name="pixel:EModule1Disc1Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc1Chip" category="unspecified">
 <rSolid name="pixel:EModule1Disc1Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc1DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule1Disc1DeadAreaRight"/>
@@ -4100,11 +3590,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule2Disc1Hybrid" category="unspecified">
 <rSolid name="pixel:EModule2Disc1Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc1Chip" category="unspecified">
 <rSolid name="pixel:EModule2Disc1Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc1DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule2Disc1DeadAreaRight"/>
@@ -4136,11 +3626,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule3Disc1Hybrid" category="unspecified">
 <rSolid name="pixel:EModule3Disc1Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc1Chip" category="unspecified">
 <rSolid name="pixel:EModule3Disc1Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule3Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc1DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule3Disc1DeadAreaRight"/>
@@ -4172,11 +3662,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule4Disc1Hybrid" category="unspecified">
 <rSolid name="pixel:EModule4Disc1Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc1Chip" category="unspecified">
 <rSolid name="pixel:EModule4Disc1Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule3Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc1DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule4Disc1DeadAreaRight"/>
@@ -4228,11 +3718,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule1Disc2Hybrid" category="unspecified">
 <rSolid name="pixel:EModule1Disc2Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc2Chip" category="unspecified">
 <rSolid name="pixel:EModule1Disc2Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc2DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule1Disc2DeadAreaRight"/>
@@ -4264,11 +3754,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule2Disc2Hybrid" category="unspecified">
 <rSolid name="pixel:EModule2Disc2Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc2Chip" category="unspecified">
 <rSolid name="pixel:EModule2Disc2Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc2DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule2Disc2DeadAreaRight"/>
@@ -4300,11 +3790,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule3Disc2Hybrid" category="unspecified">
 <rSolid name="pixel:EModule3Disc2Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc2Chip" category="unspecified">
 <rSolid name="pixel:EModule3Disc2Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule3Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc2DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule3Disc2DeadAreaRight"/>
@@ -4336,11 +3826,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule4Disc2Hybrid" category="unspecified">
 <rSolid name="pixel:EModule4Disc2Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc2Chip" category="unspecified">
 <rSolid name="pixel:EModule4Disc2Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule3Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc2DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule4Disc2DeadAreaRight"/>
@@ -4392,11 +3882,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule1Disc3Hybrid" category="unspecified">
 <rSolid name="pixel:EModule1Disc3Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc3Chip" category="unspecified">
 <rSolid name="pixel:EModule1Disc3Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc3DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule1Disc3DeadAreaRight"/>
@@ -4428,11 +3918,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule2Disc3Hybrid" category="unspecified">
 <rSolid name="pixel:EModule2Disc3Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc3Chip" category="unspecified">
 <rSolid name="pixel:EModule2Disc3Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc3DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule2Disc3DeadAreaRight"/>
@@ -4464,11 +3954,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule3Disc3Hybrid" category="unspecified">
 <rSolid name="pixel:EModule3Disc3Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc3Chip" category="unspecified">
 <rSolid name="pixel:EModule3Disc3Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule3Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc3DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule3Disc3DeadAreaRight"/>
@@ -4500,11 +3990,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule4Disc3Hybrid" category="unspecified">
 <rSolid name="pixel:EModule4Disc3Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc3Chip" category="unspecified">
 <rSolid name="pixel:EModule4Disc3Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule3Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc3DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule4Disc3DeadAreaRight"/>
@@ -4556,11 +4046,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule1Disc4Hybrid" category="unspecified">
 <rSolid name="pixel:EModule1Disc4Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc4Chip" category="unspecified">
 <rSolid name="pixel:EModule1Disc4Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc4DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule1Disc4DeadAreaRight"/>
@@ -4592,11 +4082,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule2Disc4Hybrid" category="unspecified">
 <rSolid name="pixel:EModule2Disc4Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc4Chip" category="unspecified">
 <rSolid name="pixel:EModule2Disc4Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc4DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule2Disc4DeadAreaRight"/>
@@ -4628,11 +4118,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule3Disc4Hybrid" category="unspecified">
 <rSolid name="pixel:EModule3Disc4Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc4Chip" category="unspecified">
 <rSolid name="pixel:EModule3Disc4Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule3Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc4DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule3Disc4DeadAreaRight"/>
@@ -4664,11 +4154,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule4Disc4Hybrid" category="unspecified">
 <rSolid name="pixel:EModule4Disc4Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc4Chip" category="unspecified">
 <rSolid name="pixel:EModule4Disc4Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule3Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc4DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule4Disc4DeadAreaRight"/>
@@ -4720,11 +4210,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule1Disc5Hybrid" category="unspecified">
 <rSolid name="pixel:EModule1Disc5Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc5Chip" category="unspecified">
 <rSolid name="pixel:EModule1Disc5Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc5DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule1Disc5DeadAreaRight"/>
@@ -4756,11 +4246,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule2Disc5Hybrid" category="unspecified">
 <rSolid name="pixel:EModule2Disc5Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc5Chip" category="unspecified">
 <rSolid name="pixel:EModule2Disc5Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc5DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule2Disc5DeadAreaRight"/>
@@ -4792,11 +4282,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule3Disc5Hybrid" category="unspecified">
 <rSolid name="pixel:EModule3Disc5Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc5Chip" category="unspecified">
 <rSolid name="pixel:EModule3Disc5Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule3Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc5DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule3Disc5DeadAreaRight"/>
@@ -4828,11 +4318,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule4Disc5Hybrid" category="unspecified">
 <rSolid name="pixel:EModule4Disc5Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc5Chip" category="unspecified">
 <rSolid name="pixel:EModule4Disc5Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule3Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc5DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule4Disc5DeadAreaRight"/>
@@ -4884,11 +4374,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule1Disc6Hybrid" category="unspecified">
 <rSolid name="pixel:EModule1Disc6Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc6Chip" category="unspecified">
 <rSolid name="pixel:EModule1Disc6Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc6DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule1Disc6DeadAreaRight"/>
@@ -4920,11 +4410,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule2Disc6Hybrid" category="unspecified">
 <rSolid name="pixel:EModule2Disc6Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc6Chip" category="unspecified">
 <rSolid name="pixel:EModule2Disc6Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc6DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule2Disc6DeadAreaRight"/>
@@ -4956,11 +4446,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule3Disc6Hybrid" category="unspecified">
 <rSolid name="pixel:EModule3Disc6Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc6Chip" category="unspecified">
 <rSolid name="pixel:EModule3Disc6Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule3Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc6DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule3Disc6DeadAreaRight"/>
@@ -4992,11 +4482,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule4Disc6Hybrid" category="unspecified">
 <rSolid name="pixel:EModule4Disc6Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc6Chip" category="unspecified">
 <rSolid name="pixel:EModule4Disc6Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule3Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc6DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule4Disc6DeadAreaRight"/>
@@ -5048,11 +4538,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule1Disc7Hybrid" category="unspecified">
 <rSolid name="pixel:EModule1Disc7Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc7Chip" category="unspecified">
 <rSolid name="pixel:EModule1Disc7Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc7DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule1Disc7DeadAreaRight"/>
@@ -5084,11 +4574,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule2Disc7Hybrid" category="unspecified">
 <rSolid name="pixel:EModule2Disc7Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc7Chip" category="unspecified">
 <rSolid name="pixel:EModule2Disc7Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc7DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule2Disc7DeadAreaRight"/>
@@ -5120,11 +4610,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule3Disc7Hybrid" category="unspecified">
 <rSolid name="pixel:EModule3Disc7Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc7Chip" category="unspecified">
 <rSolid name="pixel:EModule3Disc7Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule3Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc7DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule3Disc7DeadAreaRight"/>
@@ -5156,11 +4646,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule4Disc7Hybrid" category="unspecified">
 <rSolid name="pixel:EModule4Disc7Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc7Chip" category="unspecified">
 <rSolid name="pixel:EModule4Disc7Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule3Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc7DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule4Disc7DeadAreaRight"/>
@@ -5212,11 +4702,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule1Disc8Hybrid" category="unspecified">
 <rSolid name="pixel:EModule1Disc8Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc8Chip" category="unspecified">
 <rSolid name="pixel:EModule1Disc8Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc8DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule1Disc8DeadAreaRight"/>
@@ -5248,11 +4738,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule2Disc8Hybrid" category="unspecified">
 <rSolid name="pixel:EModule2Disc8Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer1Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc8Chip" category="unspecified">
 <rSolid name="pixel:EModule2Disc8Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc8DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule2Disc8DeadAreaRight"/>
@@ -5284,11 +4774,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule3Disc8Hybrid" category="unspecified">
 <rSolid name="pixel:EModule3Disc8Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc8Chip" category="unspecified">
 <rSolid name="pixel:EModule3Disc8Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule3Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc8DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule3Disc8DeadAreaRight"/>
@@ -5320,11 +4810,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule4Disc8Hybrid" category="unspecified">
 <rSolid name="pixel:EModule4Disc8Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc8Chip" category="unspecified">
 <rSolid name="pixel:EModule4Disc8Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule3Disc1Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc8DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule4Disc8DeadAreaRight"/>
@@ -5376,27 +4866,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule1Disc9Hybrid" category="unspecified">
 <rSolid name="pixel:EModule1Disc9Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc9Chip" category="unspecified">
 <rSolid name="pixel:EModule1Disc9Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc9DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule1Disc9DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc9DeadAreaLeft" category="unspecified">
 <rSolid name="pixel:EModule1Disc9DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc9DeadAreaFront" category="unspecified">
 <rSolid name="pixel:EModule1Disc9DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc9DeadAreaBack" category="unspecified">
 <rSolid name="pixel:EModule1Disc9DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc9" category="unspecified">
 <rSolid name="pixel:EModule2Disc9"/>
@@ -5412,27 +4902,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule2Disc9Hybrid" category="unspecified">
 <rSolid name="pixel:EModule2Disc9Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc9Chip" category="unspecified">
 <rSolid name="pixel:EModule2Disc9Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc9DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule2Disc9DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc9DeadAreaLeft" category="unspecified">
 <rSolid name="pixel:EModule2Disc9DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc9DeadAreaFront" category="unspecified">
 <rSolid name="pixel:EModule2Disc9DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc9DeadAreaBack" category="unspecified">
 <rSolid name="pixel:EModule2Disc9DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc9" category="unspecified">
 <rSolid name="pixel:EModule3Disc9"/>
@@ -5448,11 +4938,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule3Disc9Hybrid" category="unspecified">
 <rSolid name="pixel:EModule3Disc9Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc9Chip" category="unspecified">
 <rSolid name="pixel:EModule3Disc9Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc9DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule3Disc9DeadAreaRight"/>
@@ -5484,11 +4974,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule4Disc9Hybrid" category="unspecified">
 <rSolid name="pixel:EModule4Disc9Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc9Chip" category="unspecified">
 <rSolid name="pixel:EModule4Disc9Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc9DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule4Disc9DeadAreaRight"/>
@@ -5520,11 +5010,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule5Disc9Hybrid" category="unspecified">
 <rSolid name="pixel:EModule5Disc9Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule5Disc9Chip" category="unspecified">
 <rSolid name="pixel:EModule5Disc9Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule5Disc9DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule5Disc9DeadAreaRight"/>
@@ -5580,27 +5070,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule1Disc10Hybrid" category="unspecified">
 <rSolid name="pixel:EModule1Disc10Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc10Chip" category="unspecified">
 <rSolid name="pixel:EModule1Disc10Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc10DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule1Disc10DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc10DeadAreaLeft" category="unspecified">
 <rSolid name="pixel:EModule1Disc10DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc10DeadAreaFront" category="unspecified">
 <rSolid name="pixel:EModule1Disc10DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc10DeadAreaBack" category="unspecified">
 <rSolid name="pixel:EModule1Disc10DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc10" category="unspecified">
 <rSolid name="pixel:EModule2Disc10"/>
@@ -5616,27 +5106,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule2Disc10Hybrid" category="unspecified">
 <rSolid name="pixel:EModule2Disc10Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc10Chip" category="unspecified">
 <rSolid name="pixel:EModule2Disc10Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc10DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule2Disc10DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc10DeadAreaLeft" category="unspecified">
 <rSolid name="pixel:EModule2Disc10DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc10DeadAreaFront" category="unspecified">
 <rSolid name="pixel:EModule2Disc10DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc10DeadAreaBack" category="unspecified">
 <rSolid name="pixel:EModule2Disc10DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc10" category="unspecified">
 <rSolid name="pixel:EModule3Disc10"/>
@@ -5652,11 +5142,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule3Disc10Hybrid" category="unspecified">
 <rSolid name="pixel:EModule3Disc10Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc10Chip" category="unspecified">
 <rSolid name="pixel:EModule3Disc10Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc10DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule3Disc10DeadAreaRight"/>
@@ -5688,11 +5178,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule4Disc10Hybrid" category="unspecified">
 <rSolid name="pixel:EModule4Disc10Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc10Chip" category="unspecified">
 <rSolid name="pixel:EModule4Disc10Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc10DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule4Disc10DeadAreaRight"/>
@@ -5724,11 +5214,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule5Disc10Hybrid" category="unspecified">
 <rSolid name="pixel:EModule5Disc10Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule5Disc10Chip" category="unspecified">
 <rSolid name="pixel:EModule5Disc10Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule5Disc10DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule5Disc10DeadAreaRight"/>
@@ -5784,27 +5274,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule1Disc11Hybrid" category="unspecified">
 <rSolid name="pixel:EModule1Disc11Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc11Chip" category="unspecified">
 <rSolid name="pixel:EModule1Disc11Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc11DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule1Disc11DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc11DeadAreaLeft" category="unspecified">
 <rSolid name="pixel:EModule1Disc11DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc11DeadAreaFront" category="unspecified">
 <rSolid name="pixel:EModule1Disc11DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc11DeadAreaBack" category="unspecified">
 <rSolid name="pixel:EModule1Disc11DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc11" category="unspecified">
 <rSolid name="pixel:EModule2Disc11"/>
@@ -5820,27 +5310,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule2Disc11Hybrid" category="unspecified">
 <rSolid name="pixel:EModule2Disc11Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc11Chip" category="unspecified">
 <rSolid name="pixel:EModule2Disc11Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc11DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule2Disc11DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc11DeadAreaLeft" category="unspecified">
 <rSolid name="pixel:EModule2Disc11DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc11DeadAreaFront" category="unspecified">
 <rSolid name="pixel:EModule2Disc11DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc11DeadAreaBack" category="unspecified">
 <rSolid name="pixel:EModule2Disc11DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc11" category="unspecified">
 <rSolid name="pixel:EModule3Disc11"/>
@@ -5856,11 +5346,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule3Disc11Hybrid" category="unspecified">
 <rSolid name="pixel:EModule3Disc11Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc11Chip" category="unspecified">
 <rSolid name="pixel:EModule3Disc11Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc11DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule3Disc11DeadAreaRight"/>
@@ -5892,11 +5382,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule4Disc11Hybrid" category="unspecified">
 <rSolid name="pixel:EModule4Disc11Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc11Chip" category="unspecified">
 <rSolid name="pixel:EModule4Disc11Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc11DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule4Disc11DeadAreaRight"/>
@@ -5928,11 +5418,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule5Disc11Hybrid" category="unspecified">
 <rSolid name="pixel:EModule5Disc11Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule5Disc11Chip" category="unspecified">
 <rSolid name="pixel:EModule5Disc11Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule5Disc11DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule5Disc11DeadAreaRight"/>
@@ -5988,27 +5478,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule1Disc12Hybrid" category="unspecified">
 <rSolid name="pixel:EModule1Disc12Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc12Chip" category="unspecified">
 <rSolid name="pixel:EModule1Disc12Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc12DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule1Disc12DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc12DeadAreaLeft" category="unspecified">
 <rSolid name="pixel:EModule1Disc12DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc12DeadAreaFront" category="unspecified">
 <rSolid name="pixel:EModule1Disc12DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule1Disc12DeadAreaBack" category="unspecified">
 <rSolid name="pixel:EModule1Disc12DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc12" category="unspecified">
 <rSolid name="pixel:EModule2Disc12"/>
@@ -6024,27 +5514,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule2Disc12Hybrid" category="unspecified">
 <rSolid name="pixel:EModule2Disc12Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc12Chip" category="unspecified">
 <rSolid name="pixel:EModule2Disc12Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc12DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule2Disc12DeadAreaRight"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc12DeadAreaLeft" category="unspecified">
 <rSolid name="pixel:EModule2Disc12DeadAreaLeft"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc12DeadAreaFront" category="unspecified">
 <rSolid name="pixel:EModule2Disc12DeadAreaFront"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule2Disc12DeadAreaBack" category="unspecified">
 <rSolid name="pixel:EModule2Disc12DeadAreaBack"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer1DeadAreaRight"/>
+<rMaterial name="pixel:hybridcompositeBModule1Layer3DeadAreaRight"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc12" category="unspecified">
 <rSolid name="pixel:EModule3Disc12"/>
@@ -6060,11 +5550,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule3Disc12Hybrid" category="unspecified">
 <rSolid name="pixel:EModule3Disc12Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc12Chip" category="unspecified">
 <rSolid name="pixel:EModule3Disc12Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule3Disc12DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule3Disc12DeadAreaRight"/>
@@ -6096,11 +5586,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule4Disc12Hybrid" category="unspecified">
 <rSolid name="pixel:EModule4Disc12Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc12Chip" category="unspecified">
 <rSolid name="pixel:EModule4Disc12Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule4Disc12DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule4Disc12DeadAreaRight"/>
@@ -6132,11 +5622,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </LogicalPart>
 <LogicalPart name="EModule5Disc12Hybrid" category="unspecified">
 <rSolid name="pixel:EModule5Disc12Hybrid"/>
-<rMaterial name="pixel:hybridcompositeEModule1Disc1Hybrid"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Hybrid"/>
 </LogicalPart>
 <LogicalPart name="EModule5Disc12Chip" category="unspecified">
 <rSolid name="pixel:EModule5Disc12Chip"/>
-<rMaterial name="pixel:hybridcompositeBModule1Layer3Chip"/>
+<rMaterial name="pixel:hybridcompositeEModule1Disc9Chip"/>
 </LogicalPart>
 <LogicalPart name="EModule5Disc12DeadAreaRight" category="unspecified">
 <rSolid name="pixel:EModule5Disc12DeadAreaRight"/>
@@ -6178,41 +5668,41 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rSolid name="pixel:Disc12"/>
 <rMaterial name="materials:Air"/>
 </LogicalPart>
-<LogicalPart name="serviceR176Z1425" category="unspecified">
-<rSolid name="pixel:serviceR176Z1425"/>
-<rMaterial name="pixel:servicecompositeR176Z1425"/>
+<LogicalPart name="serviceR176Z1535" category="unspecified">
+<rSolid name="pixel:serviceR176Z1535"/>
+<rMaterial name="pixel:servicecompositeR176Z1535"/>
 </LogicalPart>
-<LogicalPart name="serviceR248Z1609" category="unspecified">
-<rSolid name="pixel:serviceR248Z1609"/>
-<rMaterial name="pixel:servicecompositeR248Z1609"/>
+<LogicalPart name="serviceR254Z1605" category="unspecified">
+<rSolid name="pixel:serviceR254Z1605"/>
+<rMaterial name="pixel:servicecompositeR254Z1605"/>
 </LogicalPart>
-<LogicalPart name="serviceR228Z1609" category="unspecified">
-<rSolid name="pixel:serviceR228Z1609"/>
-<rMaterial name="pixel:servicecompositeR228Z1609"/>
+<LogicalPart name="serviceR232Z1605" category="unspecified">
+<rSolid name="pixel:serviceR232Z1605"/>
+<rMaterial name="pixel:servicecompositeR232Z1605"/>
 </LogicalPart>
-<LogicalPart name="serviceR209Z1609" category="unspecified">
-<rSolid name="pixel:serviceR209Z1609"/>
-<rMaterial name="pixel:servicecompositeR209Z1609"/>
+<LogicalPart name="serviceR212Z1605" category="unspecified">
+<rSolid name="pixel:serviceR212Z1605"/>
+<rMaterial name="pixel:servicecompositeR212Z1605"/>
 </LogicalPart>
-<LogicalPart name="serviceR192Z1609" category="unspecified">
-<rSolid name="pixel:serviceR192Z1609"/>
-<rMaterial name="pixel:servicecompositeR192Z1609"/>
+<LogicalPart name="serviceR193Z1605" category="unspecified">
+<rSolid name="pixel:serviceR193Z1605"/>
+<rMaterial name="pixel:servicecompositeR193Z1605"/>
 </LogicalPart>
-<LogicalPart name="serviceR176Z1609" category="unspecified">
-<rSolid name="pixel:serviceR176Z1609"/>
-<rMaterial name="pixel:servicecompositeR176Z1609"/>
+<LogicalPart name="serviceR176Z1605" category="unspecified">
+<rSolid name="pixel:serviceR176Z1605"/>
+<rMaterial name="pixel:servicecompositeR176Z1605"/>
 </LogicalPart>
-<LogicalPart name="serviceR270Z2087" category="unspecified">
-<rSolid name="pixel:serviceR270Z2087"/>
-<rMaterial name="pixel:servicecompositeR270Z2087"/>
+<LogicalPart name="serviceR278Z2169" category="unspecified">
+<rSolid name="pixel:serviceR278Z2169"/>
+<rMaterial name="pixel:servicecompositeR278Z2169"/>
 </LogicalPart>
-<LogicalPart name="serviceR270Z2567" category="unspecified">
-<rSolid name="pixel:serviceR270Z2567"/>
-<rMaterial name="pixel:servicecompositeR270Z2567"/>
+<LogicalPart name="serviceR278Z2736" category="unspecified">
+<rSolid name="pixel:serviceR278Z2736"/>
+<rMaterial name="pixel:servicecompositeR278Z2736"/>
 </LogicalPart>
-<LogicalPart name="serviceR277Z2580" category="unspecified">
-<rSolid name="pixel:serviceR277Z2580"/>
-<rMaterial name="pixel:servicecompositeR277Z2580"/>
+<LogicalPart name="serviceR282Z2745" category="unspecified">
+<rSolid name="pixel:serviceR282Z2745"/>
+<rMaterial name="pixel:servicecompositeR282Z2745"/>
 </LogicalPart>
 <LogicalPart name="serviceR176Z355BarrelPart" category="unspecified">
 <rSolid name="pixel:serviceR176Z355BarrelPart"/>
@@ -6222,13 +5712,13 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rSolid name="pixel:serviceR176Z355EndcapsPart"/>
 <rMaterial name="pixel:servicecompositeR176Z355"/>
 </LogicalPart>
-<LogicalPart name="serviceR34Z207" category="unspecified">
-<rSolid name="pixel:serviceR34Z207"/>
-<rMaterial name="pixel:servicecompositeR34Z207"/>
+<LogicalPart name="serviceR40Z208" category="unspecified">
+<rSolid name="pixel:serviceR40Z208"/>
+<rMaterial name="pixel:servicecompositeR40Z208"/>
 </LogicalPart>
-<LogicalPart name="serviceR34Z11" category="unspecified">
-<rSolid name="pixel:serviceR34Z11"/>
-<rMaterial name="pixel:servicecompositeR34Z11"/>
+<LogicalPart name="serviceR40Z10" category="unspecified">
+<rSolid name="pixel:serviceR40Z10"/>
+<rMaterial name="pixel:servicecompositeR40Z10"/>
 </LogicalPart>
 <LogicalPart name="serviceR176Z547" category="unspecified">
 <rSolid name="pixel:serviceR176Z547"/>
@@ -6254,125 +5744,129 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rSolid name="pixel:serviceR178Z652"/>
 <rMaterial name="pixel:servicecompositeR178Z652"/>
 </LogicalPart>
-<LogicalPart name="serviceR176Z1083" category="unspecified">
-<rSolid name="pixel:serviceR176Z1083"/>
-<rMaterial name="pixel:servicecompositeR176Z1083"/>
+<LogicalPart name="serviceR176Z1108" category="unspecified">
+<rSolid name="pixel:serviceR176Z1108"/>
+<rMaterial name="pixel:servicecompositeR176Z1108"/>
 </LogicalPart>
 <LogicalPart name="serviceR178Z749" category="unspecified">
 <rSolid name="pixel:serviceR178Z749"/>
 <rMaterial name="pixel:servicecompositeR178Z749"/>
 </LogicalPart>
-<LogicalPart name="serviceR34Z44" category="unspecified">
-<rSolid name="pixel:serviceR34Z44"/>
-<rMaterial name="pixel:servicecompositeR34Z44"/>
+<LogicalPart name="serviceR40Z44" category="unspecified">
+<rSolid name="pixel:serviceR40Z44"/>
+<rMaterial name="pixel:servicecompositeR40Z44"/>
 </LogicalPart>
-<LogicalPart name="serviceR34Z88" category="unspecified">
-<rSolid name="pixel:serviceR34Z88"/>
-<rMaterial name="pixel:servicecompositeR34Z88"/>
+<LogicalPart name="serviceR40Z88" category="unspecified">
+<rSolid name="pixel:serviceR40Z88"/>
+<rMaterial name="pixel:servicecompositeR40Z88"/>
 </LogicalPart>
-<LogicalPart name="serviceR34Z133" category="unspecified">
-<rSolid name="pixel:serviceR34Z133"/>
-<rMaterial name="pixel:servicecompositeR34Z133"/>
+<LogicalPart name="serviceR40Z133" category="unspecified">
+<rSolid name="pixel:serviceR40Z133"/>
+<rMaterial name="pixel:servicecompositeR40Z133"/>
 </LogicalPart>
-<LogicalPart name="serviceR34Z177" category="unspecified">
-<rSolid name="pixel:serviceR34Z177"/>
-<rMaterial name="pixel:servicecompositeR34Z177"/>
+<LogicalPart name="serviceR40Z178" category="unspecified">
+<rSolid name="pixel:serviceR40Z178"/>
+<rMaterial name="pixel:servicecompositeR40Z178"/>
 </LogicalPart>
-<LogicalPart name="serviceR34Z202" category="unspecified">
-<rSolid name="pixel:serviceR34Z202"/>
-<rMaterial name="pixel:servicecompositeR34Z202"/>
+<LogicalPart name="serviceR40Z203" category="unspecified">
+<rSolid name="pixel:serviceR40Z203"/>
+<rMaterial name="pixel:servicecompositeR40Z203"/>
 </LogicalPart>
-<LogicalPart name="serviceR64Z207" category="unspecified">
-<rSolid name="pixel:serviceR64Z207"/>
-<rMaterial name="pixel:servicecompositeR64Z207"/>
+<LogicalPart name="serviceR71Z208" category="unspecified">
+<rSolid name="pixel:serviceR71Z208"/>
+<rMaterial name="pixel:servicecompositeR71Z208"/>
 </LogicalPart>
-<LogicalPart name="serviceR64Z11" category="unspecified">
-<rSolid name="pixel:serviceR64Z11"/>
-<rMaterial name="pixel:servicecompositeR64Z11"/>
+<LogicalPart name="serviceR71Z10" category="unspecified">
+<rSolid name="pixel:serviceR71Z10"/>
+<rMaterial name="pixel:servicecompositeR71Z10"/>
 </LogicalPart>
-<LogicalPart name="serviceR64Z44" category="unspecified">
-<rSolid name="pixel:serviceR64Z44"/>
-<rMaterial name="pixel:servicecompositeR64Z44"/>
+<LogicalPart name="serviceR71Z44" category="unspecified">
+<rSolid name="pixel:serviceR71Z44"/>
+<rMaterial name="pixel:servicecompositeR71Z44"/>
 </LogicalPart>
-<LogicalPart name="serviceR64Z88" category="unspecified">
-<rSolid name="pixel:serviceR64Z88"/>
-<rMaterial name="pixel:servicecompositeR64Z88"/>
+<LogicalPart name="serviceR71Z88" category="unspecified">
+<rSolid name="pixel:serviceR71Z88"/>
+<rMaterial name="pixel:servicecompositeR71Z88"/>
 </LogicalPart>
-<LogicalPart name="serviceR64Z133" category="unspecified">
-<rSolid name="pixel:serviceR64Z133"/>
-<rMaterial name="pixel:servicecompositeR64Z133"/>
+<LogicalPart name="serviceR71Z133" category="unspecified">
+<rSolid name="pixel:serviceR71Z133"/>
+<rMaterial name="pixel:servicecompositeR71Z133"/>
 </LogicalPart>
-<LogicalPart name="serviceR64Z177" category="unspecified">
-<rSolid name="pixel:serviceR64Z177"/>
-<rMaterial name="pixel:servicecompositeR64Z177"/>
+<LogicalPart name="serviceR71Z178" category="unspecified">
+<rSolid name="pixel:serviceR71Z178"/>
+<rMaterial name="pixel:servicecompositeR71Z178"/>
 </LogicalPart>
-<LogicalPart name="serviceR64Z202" category="unspecified">
-<rSolid name="pixel:serviceR64Z202"/>
-<rMaterial name="pixel:servicecompositeR64Z202"/>
+<LogicalPart name="serviceR71Z203" category="unspecified">
+<rSolid name="pixel:serviceR71Z203"/>
+<rMaterial name="pixel:servicecompositeR71Z203"/>
 </LogicalPart>
-<LogicalPart name="serviceR105Z207" category="unspecified">
-<rSolid name="pixel:serviceR105Z207"/>
-<rMaterial name="pixel:servicecompositeR105Z207"/>
+<LogicalPart name="serviceR115Z208" category="unspecified">
+<rSolid name="pixel:serviceR115Z208"/>
+<rMaterial name="pixel:servicecompositeR115Z208"/>
 </LogicalPart>
-<LogicalPart name="serviceR105Z11" category="unspecified">
-<rSolid name="pixel:serviceR105Z11"/>
-<rMaterial name="pixel:servicecompositeR105Z11"/>
+<LogicalPart name="serviceR115Z10" category="unspecified">
+<rSolid name="pixel:serviceR115Z10"/>
+<rMaterial name="pixel:servicecompositeR115Z10"/>
 </LogicalPart>
-<LogicalPart name="serviceR105Z44" category="unspecified">
-<rSolid name="pixel:serviceR105Z44"/>
-<rMaterial name="pixel:servicecompositeR105Z44"/>
+<LogicalPart name="serviceR115Z44" category="unspecified">
+<rSolid name="pixel:serviceR115Z44"/>
+<rMaterial name="pixel:servicecompositeR115Z44"/>
 </LogicalPart>
-<LogicalPart name="serviceR105Z88" category="unspecified">
-<rSolid name="pixel:serviceR105Z88"/>
-<rMaterial name="pixel:servicecompositeR105Z88"/>
+<LogicalPart name="serviceR115Z88" category="unspecified">
+<rSolid name="pixel:serviceR115Z88"/>
+<rMaterial name="pixel:servicecompositeR115Z88"/>
 </LogicalPart>
-<LogicalPart name="serviceR105Z133" category="unspecified">
-<rSolid name="pixel:serviceR105Z133"/>
-<rMaterial name="pixel:servicecompositeR105Z133"/>
+<LogicalPart name="serviceR115Z133" category="unspecified">
+<rSolid name="pixel:serviceR115Z133"/>
+<rMaterial name="pixel:servicecompositeR115Z133"/>
 </LogicalPart>
-<LogicalPart name="serviceR105Z177" category="unspecified">
-<rSolid name="pixel:serviceR105Z177"/>
-<rMaterial name="pixel:servicecompositeR105Z177"/>
+<LogicalPart name="serviceR115Z178" category="unspecified">
+<rSolid name="pixel:serviceR115Z178"/>
+<rMaterial name="pixel:servicecompositeR115Z178"/>
 </LogicalPart>
-<LogicalPart name="serviceR105Z202" category="unspecified">
-<rSolid name="pixel:serviceR105Z202"/>
-<rMaterial name="pixel:servicecompositeR105Z202"/>
+<LogicalPart name="serviceR115Z203" category="unspecified">
+<rSolid name="pixel:serviceR115Z203"/>
+<rMaterial name="pixel:servicecompositeR115Z203"/>
 </LogicalPart>
-<LogicalPart name="serviceR145Z207" category="unspecified">
-<rSolid name="pixel:serviceR145Z207"/>
-<rMaterial name="pixel:servicecompositeR145Z207"/>
+<LogicalPart name="serviceR157Z208" category="unspecified">
+<rSolid name="pixel:serviceR157Z208"/>
+<rMaterial name="pixel:servicecompositeR157Z208"/>
 </LogicalPart>
-<LogicalPart name="serviceR145Z11" category="unspecified">
-<rSolid name="pixel:serviceR145Z11"/>
-<rMaterial name="pixel:servicecompositeR145Z11"/>
+<LogicalPart name="serviceR157Z10" category="unspecified">
+<rSolid name="pixel:serviceR157Z10"/>
+<rMaterial name="pixel:servicecompositeR157Z10"/>
 </LogicalPart>
-<LogicalPart name="serviceR145Z44" category="unspecified">
-<rSolid name="pixel:serviceR145Z44"/>
-<rMaterial name="pixel:servicecompositeR145Z44"/>
+<LogicalPart name="serviceR157Z44" category="unspecified">
+<rSolid name="pixel:serviceR157Z44"/>
+<rMaterial name="pixel:servicecompositeR157Z44"/>
 </LogicalPart>
-<LogicalPart name="serviceR145Z88" category="unspecified">
-<rSolid name="pixel:serviceR145Z88"/>
-<rMaterial name="pixel:servicecompositeR145Z88"/>
+<LogicalPart name="serviceR157Z88" category="unspecified">
+<rSolid name="pixel:serviceR157Z88"/>
+<rMaterial name="pixel:servicecompositeR157Z88"/>
 </LogicalPart>
-<LogicalPart name="serviceR145Z133" category="unspecified">
-<rSolid name="pixel:serviceR145Z133"/>
-<rMaterial name="pixel:servicecompositeR145Z133"/>
+<LogicalPart name="serviceR157Z133" category="unspecified">
+<rSolid name="pixel:serviceR157Z133"/>
+<rMaterial name="pixel:servicecompositeR157Z133"/>
 </LogicalPart>
-<LogicalPart name="serviceR145Z177" category="unspecified">
-<rSolid name="pixel:serviceR145Z177"/>
-<rMaterial name="pixel:servicecompositeR145Z177"/>
+<LogicalPart name="serviceR157Z178" category="unspecified">
+<rSolid name="pixel:serviceR157Z178"/>
+<rMaterial name="pixel:servicecompositeR157Z178"/>
 </LogicalPart>
-<LogicalPart name="serviceR145Z202" category="unspecified">
-<rSolid name="pixel:serviceR145Z202"/>
-<rMaterial name="pixel:servicecompositeR145Z202"/>
+<LogicalPart name="serviceR157Z203" category="unspecified">
+<rSolid name="pixel:serviceR157Z203"/>
+<rMaterial name="pixel:servicecompositeR157Z203"/>
 </LogicalPart>
 <LogicalPart name="serviceR165Z271" category="unspecified">
 <rSolid name="pixel:serviceR165Z271"/>
 <rMaterial name="pixel:servicecompositeR165Z271"/>
 </LogicalPart>
-<LogicalPart name="serviceR28Z259" category="unspecified">
-<rSolid name="pixel:serviceR28Z259"/>
-<rMaterial name="pixel:servicecompositeR28Z259"/>
+<LogicalPart name="serviceR163Z258" category="unspecified">
+<rSolid name="pixel:serviceR163Z258"/>
+<rMaterial name="pixel:servicecompositeR163Z258"/>
+</LogicalPart>
+<LogicalPart name="serviceR30Z259" category="unspecified">
+<rSolid name="pixel:serviceR30Z259"/>
+<rMaterial name="pixel:servicecompositeR30Z259"/>
 </LogicalPart>
 <LogicalPart name="serviceR165Z306" category="unspecified">
 <rSolid name="pixel:serviceR165Z306"/>
@@ -6430,25 +5924,25 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rSolid name="pixel:serviceR168Z1129"/>
 <rMaterial name="pixel:servicecompositeR168Z284"/>
 </LogicalPart>
-<LogicalPart name="serviceR176Z1521" category="unspecified">
-<rSolid name="pixel:serviceR176Z1521"/>
-<rMaterial name="pixel:servicecompositeR176Z1521"/>
+<LogicalPart name="serviceR165Z1450" category="unspecified">
+<rSolid name="pixel:serviceR165Z1450"/>
+<rMaterial name="pixel:servicecompositeR165Z1450"/>
 </LogicalPart>
-<LogicalPart name="serviceR178Z1434" category="unspecified">
-<rSolid name="pixel:serviceR178Z1434"/>
-<rMaterial name="pixel:servicecompositeR178Z1434"/>
+<LogicalPart name="serviceR168Z1434" category="unspecified">
+<rSolid name="pixel:serviceR168Z1434"/>
+<rMaterial name="pixel:servicecompositeR168Z284"/>
 </LogicalPart>
-<LogicalPart name="serviceR73Z259" category="unspecified">
-<rSolid name="pixel:serviceR73Z259"/>
-<rMaterial name="pixel:servicecompositeR73Z259"/>
+<LogicalPart name="serviceR74Z259" category="unspecified">
+<rSolid name="pixel:serviceR74Z259"/>
+<rMaterial name="pixel:servicecompositeR74Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR93Z259" category="unspecified">
-<rSolid name="pixel:serviceR93Z259"/>
-<rMaterial name="pixel:servicecompositeR93Z259"/>
+<LogicalPart name="serviceR92Z259" category="unspecified">
+<rSolid name="pixel:serviceR92Z259"/>
+<rMaterial name="pixel:servicecompositeR92Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR128Z259" category="unspecified">
-<rSolid name="pixel:serviceR128Z259"/>
-<rMaterial name="pixel:servicecompositeR128Z259"/>
+<LogicalPart name="serviceR127Z259" category="unspecified">
+<rSolid name="pixel:serviceR127Z259"/>
+<rMaterial name="pixel:servicecompositeR127Z259"/>
 </LogicalPart>
 <LogicalPart name="serviceR160Z259" category="unspecified">
 <rSolid name="pixel:serviceR160Z259"/>
@@ -6458,21 +5952,25 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rSolid name="pixel:serviceR165Z341"/>
 <rMaterial name="pixel:servicecompositeR165Z341"/>
 </LogicalPart>
-<LogicalPart name="serviceR28Z329" category="unspecified">
-<rSolid name="pixel:serviceR28Z329"/>
-<rMaterial name="pixel:servicecompositeR28Z259"/>
+<LogicalPart name="serviceR163Z328" category="unspecified">
+<rSolid name="pixel:serviceR163Z328"/>
+<rMaterial name="pixel:servicecompositeR163Z258"/>
+</LogicalPart>
+<LogicalPart name="serviceR30Z329" category="unspecified">
+<rSolid name="pixel:serviceR30Z329"/>
+<rMaterial name="pixel:servicecompositeR30Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR73Z329" category="unspecified">
-<rSolid name="pixel:serviceR73Z329"/>
-<rMaterial name="pixel:servicecompositeR73Z259"/>
+<LogicalPart name="serviceR74Z329" category="unspecified">
+<rSolid name="pixel:serviceR74Z329"/>
+<rMaterial name="pixel:servicecompositeR74Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR93Z329" category="unspecified">
-<rSolid name="pixel:serviceR93Z329"/>
-<rMaterial name="pixel:servicecompositeR93Z259"/>
+<LogicalPart name="serviceR92Z329" category="unspecified">
+<rSolid name="pixel:serviceR92Z329"/>
+<rMaterial name="pixel:servicecompositeR92Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR128Z329" category="unspecified">
-<rSolid name="pixel:serviceR128Z329"/>
-<rMaterial name="pixel:servicecompositeR128Z259"/>
+<LogicalPart name="serviceR127Z329" category="unspecified">
+<rSolid name="pixel:serviceR127Z329"/>
+<rMaterial name="pixel:servicecompositeR127Z259"/>
 </LogicalPart>
 <LogicalPart name="serviceR160Z329" category="unspecified">
 <rSolid name="pixel:serviceR160Z329"/>
@@ -6482,21 +5980,25 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rSolid name="pixel:serviceR165Z430"/>
 <rMaterial name="pixel:servicecompositeR165Z430"/>
 </LogicalPart>
-<LogicalPart name="serviceR28Z418" category="unspecified">
-<rSolid name="pixel:serviceR28Z418"/>
-<rMaterial name="pixel:servicecompositeR28Z259"/>
+<LogicalPart name="serviceR163Z417" category="unspecified">
+<rSolid name="pixel:serviceR163Z417"/>
+<rMaterial name="pixel:servicecompositeR163Z258"/>
 </LogicalPart>
-<LogicalPart name="serviceR73Z418" category="unspecified">
-<rSolid name="pixel:serviceR73Z418"/>
-<rMaterial name="pixel:servicecompositeR73Z259"/>
+<LogicalPart name="serviceR30Z418" category="unspecified">
+<rSolid name="pixel:serviceR30Z418"/>
+<rMaterial name="pixel:servicecompositeR30Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR93Z418" category="unspecified">
-<rSolid name="pixel:serviceR93Z418"/>
-<rMaterial name="pixel:servicecompositeR93Z259"/>
+<LogicalPart name="serviceR74Z418" category="unspecified">
+<rSolid name="pixel:serviceR74Z418"/>
+<rMaterial name="pixel:servicecompositeR74Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR128Z418" category="unspecified">
-<rSolid name="pixel:serviceR128Z418"/>
-<rMaterial name="pixel:servicecompositeR128Z259"/>
+<LogicalPart name="serviceR92Z418" category="unspecified">
+<rSolid name="pixel:serviceR92Z418"/>
+<rMaterial name="pixel:servicecompositeR92Z259"/>
+</LogicalPart>
+<LogicalPart name="serviceR127Z418" category="unspecified">
+<rSolid name="pixel:serviceR127Z418"/>
+<rMaterial name="pixel:servicecompositeR127Z259"/>
 </LogicalPart>
 <LogicalPart name="serviceR160Z418" category="unspecified">
 <rSolid name="pixel:serviceR160Z418"/>
@@ -6506,21 +6008,25 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rSolid name="pixel:serviceR165Z544"/>
 <rMaterial name="pixel:servicecompositeR165Z544"/>
 </LogicalPart>
-<LogicalPart name="serviceR28Z532" category="unspecified">
-<rSolid name="pixel:serviceR28Z532"/>
-<rMaterial name="pixel:servicecompositeR28Z259"/>
+<LogicalPart name="serviceR163Z531" category="unspecified">
+<rSolid name="pixel:serviceR163Z531"/>
+<rMaterial name="pixel:servicecompositeR163Z258"/>
+</LogicalPart>
+<LogicalPart name="serviceR30Z532" category="unspecified">
+<rSolid name="pixel:serviceR30Z532"/>
+<rMaterial name="pixel:servicecompositeR30Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR73Z532" category="unspecified">
-<rSolid name="pixel:serviceR73Z532"/>
-<rMaterial name="pixel:servicecompositeR73Z259"/>
+<LogicalPart name="serviceR74Z532" category="unspecified">
+<rSolid name="pixel:serviceR74Z532"/>
+<rMaterial name="pixel:servicecompositeR74Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR93Z532" category="unspecified">
-<rSolid name="pixel:serviceR93Z532"/>
-<rMaterial name="pixel:servicecompositeR93Z259"/>
+<LogicalPart name="serviceR92Z532" category="unspecified">
+<rSolid name="pixel:serviceR92Z532"/>
+<rMaterial name="pixel:servicecompositeR92Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR128Z532" category="unspecified">
-<rSolid name="pixel:serviceR128Z532"/>
-<rMaterial name="pixel:servicecompositeR128Z259"/>
+<LogicalPart name="serviceR127Z532" category="unspecified">
+<rSolid name="pixel:serviceR127Z532"/>
+<rMaterial name="pixel:servicecompositeR127Z259"/>
 </LogicalPart>
 <LogicalPart name="serviceR160Z532" category="unspecified">
 <rSolid name="pixel:serviceR160Z532"/>
@@ -6530,21 +6036,25 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rSolid name="pixel:serviceR165Z690"/>
 <rMaterial name="pixel:servicecompositeR165Z690"/>
 </LogicalPart>
-<LogicalPart name="serviceR28Z678" category="unspecified">
-<rSolid name="pixel:serviceR28Z678"/>
-<rMaterial name="pixel:servicecompositeR28Z259"/>
+<LogicalPart name="serviceR163Z677" category="unspecified">
+<rSolid name="pixel:serviceR163Z677"/>
+<rMaterial name="pixel:servicecompositeR163Z258"/>
 </LogicalPart>
-<LogicalPart name="serviceR73Z678" category="unspecified">
-<rSolid name="pixel:serviceR73Z678"/>
-<rMaterial name="pixel:servicecompositeR73Z259"/>
+<LogicalPart name="serviceR30Z678" category="unspecified">
+<rSolid name="pixel:serviceR30Z678"/>
+<rMaterial name="pixel:servicecompositeR30Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR93Z678" category="unspecified">
-<rSolid name="pixel:serviceR93Z678"/>
-<rMaterial name="pixel:servicecompositeR93Z259"/>
+<LogicalPart name="serviceR74Z678" category="unspecified">
+<rSolid name="pixel:serviceR74Z678"/>
+<rMaterial name="pixel:servicecompositeR74Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR128Z678" category="unspecified">
-<rSolid name="pixel:serviceR128Z678"/>
-<rMaterial name="pixel:servicecompositeR128Z259"/>
+<LogicalPart name="serviceR92Z678" category="unspecified">
+<rSolid name="pixel:serviceR92Z678"/>
+<rMaterial name="pixel:servicecompositeR92Z259"/>
+</LogicalPart>
+<LogicalPart name="serviceR127Z678" category="unspecified">
+<rSolid name="pixel:serviceR127Z678"/>
+<rMaterial name="pixel:servicecompositeR127Z259"/>
 </LogicalPart>
 <LogicalPart name="serviceR160Z678" category="unspecified">
 <rSolid name="pixel:serviceR160Z678"/>
@@ -6554,21 +6064,25 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rSolid name="pixel:serviceR165Z877"/>
 <rMaterial name="pixel:servicecompositeR165Z877"/>
 </LogicalPart>
-<LogicalPart name="serviceR28Z865" category="unspecified">
-<rSolid name="pixel:serviceR28Z865"/>
-<rMaterial name="pixel:servicecompositeR28Z259"/>
+<LogicalPart name="serviceR163Z864" category="unspecified">
+<rSolid name="pixel:serviceR163Z864"/>
+<rMaterial name="pixel:servicecompositeR163Z258"/>
+</LogicalPart>
+<LogicalPart name="serviceR30Z865" category="unspecified">
+<rSolid name="pixel:serviceR30Z865"/>
+<rMaterial name="pixel:servicecompositeR30Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR73Z865" category="unspecified">
-<rSolid name="pixel:serviceR73Z865"/>
-<rMaterial name="pixel:servicecompositeR73Z259"/>
+<LogicalPart name="serviceR74Z865" category="unspecified">
+<rSolid name="pixel:serviceR74Z865"/>
+<rMaterial name="pixel:servicecompositeR74Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR93Z865" category="unspecified">
-<rSolid name="pixel:serviceR93Z865"/>
-<rMaterial name="pixel:servicecompositeR93Z259"/>
+<LogicalPart name="serviceR92Z865" category="unspecified">
+<rSolid name="pixel:serviceR92Z865"/>
+<rMaterial name="pixel:servicecompositeR92Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR128Z865" category="unspecified">
-<rSolid name="pixel:serviceR128Z865"/>
-<rMaterial name="pixel:servicecompositeR128Z259"/>
+<LogicalPart name="serviceR127Z865" category="unspecified">
+<rSolid name="pixel:serviceR127Z865"/>
+<rMaterial name="pixel:servicecompositeR127Z259"/>
 </LogicalPart>
 <LogicalPart name="serviceR160Z865" category="unspecified">
 <rSolid name="pixel:serviceR160Z865"/>
@@ -6578,45 +6092,53 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rSolid name="pixel:serviceR165Z1116"/>
 <rMaterial name="pixel:servicecompositeR165Z1116"/>
 </LogicalPart>
-<LogicalPart name="serviceR28Z1104" category="unspecified">
-<rSolid name="pixel:serviceR28Z1104"/>
-<rMaterial name="pixel:servicecompositeR28Z259"/>
+<LogicalPart name="serviceR163Z1103" category="unspecified">
+<rSolid name="pixel:serviceR163Z1103"/>
+<rMaterial name="pixel:servicecompositeR163Z258"/>
 </LogicalPart>
-<LogicalPart name="serviceR73Z1104" category="unspecified">
-<rSolid name="pixel:serviceR73Z1104"/>
-<rMaterial name="pixel:servicecompositeR73Z259"/>
+<LogicalPart name="serviceR30Z1104" category="unspecified">
+<rSolid name="pixel:serviceR30Z1104"/>
+<rMaterial name="pixel:servicecompositeR30Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR93Z1104" category="unspecified">
-<rSolid name="pixel:serviceR93Z1104"/>
-<rMaterial name="pixel:servicecompositeR93Z259"/>
+<LogicalPart name="serviceR74Z1104" category="unspecified">
+<rSolid name="pixel:serviceR74Z1104"/>
+<rMaterial name="pixel:servicecompositeR74Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR128Z1104" category="unspecified">
-<rSolid name="pixel:serviceR128Z1104"/>
-<rMaterial name="pixel:servicecompositeR128Z259"/>
+<LogicalPart name="serviceR92Z1104" category="unspecified">
+<rSolid name="pixel:serviceR92Z1104"/>
+<rMaterial name="pixel:servicecompositeR92Z259"/>
+</LogicalPart>
+<LogicalPart name="serviceR127Z1104" category="unspecified">
+<rSolid name="pixel:serviceR127Z1104"/>
+<rMaterial name="pixel:servicecompositeR127Z259"/>
 </LogicalPart>
 <LogicalPart name="serviceR160Z1104" category="unspecified">
 <rSolid name="pixel:serviceR160Z1104"/>
 <rMaterial name="pixel:servicecompositeR160Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR165Z1412" category="unspecified">
-<rSolid name="pixel:serviceR165Z1412"/>
-<rMaterial name="pixel:servicecompositeR165Z1412"/>
+<LogicalPart name="serviceR165Z1421" category="unspecified">
+<rSolid name="pixel:serviceR165Z1421"/>
+<rMaterial name="pixel:servicecompositeR165Z1421"/>
+</LogicalPart>
+<LogicalPart name="serviceR163Z1408" category="unspecified">
+<rSolid name="pixel:serviceR163Z1408"/>
+<rMaterial name="pixel:servicecompositeR163Z258"/>
 </LogicalPart>
-<LogicalPart name="serviceR28Z1409" category="unspecified">
-<rSolid name="pixel:serviceR28Z1409"/>
-<rMaterial name="pixel:servicecompositeR28Z259"/>
+<LogicalPart name="serviceR30Z1409" category="unspecified">
+<rSolid name="pixel:serviceR30Z1409"/>
+<rMaterial name="pixel:servicecompositeR30Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR73Z1409" category="unspecified">
-<rSolid name="pixel:serviceR73Z1409"/>
-<rMaterial name="pixel:servicecompositeR73Z259"/>
+<LogicalPart name="serviceR74Z1409" category="unspecified">
+<rSolid name="pixel:serviceR74Z1409"/>
+<rMaterial name="pixel:servicecompositeR74Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR93Z1409" category="unspecified">
-<rSolid name="pixel:serviceR93Z1409"/>
-<rMaterial name="pixel:servicecompositeR93Z259"/>
+<LogicalPart name="serviceR92Z1409" category="unspecified">
+<rSolid name="pixel:serviceR92Z1409"/>
+<rMaterial name="pixel:servicecompositeR92Z259"/>
 </LogicalPart>
-<LogicalPart name="serviceR128Z1409" category="unspecified">
-<rSolid name="pixel:serviceR128Z1409"/>
-<rMaterial name="pixel:servicecompositeR128Z259"/>
+<LogicalPart name="serviceR127Z1409" category="unspecified">
+<rSolid name="pixel:serviceR127Z1409"/>
+<rMaterial name="pixel:servicecompositeR127Z259"/>
 </LogicalPart>
 <LogicalPart name="serviceR160Z1409" category="unspecified">
 <rSolid name="pixel:serviceR160Z1409"/>
@@ -6626,1079 +6148,1302 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rSolid name="pixel:serviceR259Z1776"/>
 <rMaterial name="pixel:servicecompositeR259Z1776"/>
 </LogicalPart>
-<LogicalPart name="serviceR63Z1759" category="unspecified">
-<rSolid name="pixel:serviceR63Z1759"/>
-<rMaterial name="pixel:servicecompositeR63Z1759"/>
+<LogicalPart name="serviceR257Z1758" category="unspecified">
+<rSolid name="pixel:serviceR257Z1758"/>
+<rMaterial name="pixel:servicecompositeR257Z1758"/>
 </LogicalPart>
-<LogicalPart name="serviceR259Z1894" category="unspecified">
-<rSolid name="pixel:serviceR259Z1894"/>
-<rMaterial name="pixel:servicecompositeR259Z1894"/>
+<LogicalPart name="serviceR62Z1759" category="unspecified">
+<rSolid name="pixel:serviceR62Z1759"/>
+<rMaterial name="pixel:servicecompositeR62Z1759"/>
+</LogicalPart>
+<LogicalPart name="serviceR259Z1906" category="unspecified">
+<rSolid name="pixel:serviceR259Z1906"/>
+<rMaterial name="pixel:servicecompositeR259Z1906"/>
 </LogicalPart>
 <LogicalPart name="serviceR261Z1795" category="unspecified">
 <rSolid name="pixel:serviceR261Z1795"/>
 <rMaterial name="pixel:servicecompositeR261Z1795"/>
 </LogicalPart>
-<LogicalPart name="serviceR259Z2144" category="unspecified">
-<rSolid name="pixel:serviceR259Z2144"/>
-<rMaterial name="pixel:servicecompositeR259Z2144"/>
+<LogicalPart name="serviceR259Z2185" category="unspecified">
+<rSolid name="pixel:serviceR259Z2185"/>
+<rMaterial name="pixel:servicecompositeR259Z2185"/>
 </LogicalPart>
-<LogicalPart name="serviceR261Z2030" category="unspecified">
-<rSolid name="pixel:serviceR261Z2030"/>
-<rMaterial name="pixel:servicecompositeR261Z2030"/>
+<LogicalPart name="serviceR261Z2054" category="unspecified">
+<rSolid name="pixel:serviceR261Z2054"/>
+<rMaterial name="pixel:servicecompositeR261Z1795"/>
 </LogicalPart>
-<LogicalPart name="serviceR259Z2427" category="unspecified">
-<rSolid name="pixel:serviceR259Z2427"/>
-<rMaterial name="pixel:servicecompositeR259Z2427"/>
+<LogicalPart name="serviceR259Z2505" category="unspecified">
+<rSolid name="pixel:serviceR259Z2505"/>
+<rMaterial name="pixel:servicecompositeR259Z2505"/>
 </LogicalPart>
-<LogicalPart name="serviceR261Z2295" category="unspecified">
-<rSolid name="pixel:serviceR261Z2295"/>
+<LogicalPart name="serviceR261Z2352" category="unspecified">
+<rSolid name="pixel:serviceR261Z2352"/>
 <rMaterial name="pixel:servicecompositeR261Z1795"/>
 </LogicalPart>
-<LogicalPart name="serviceR277Z2625" category="unspecified">
-<rSolid name="pixel:serviceR277Z2625"/>
-<rMaterial name="pixel:servicecompositeR277Z2625"/>
+<LogicalPart name="serviceR259Z2714" category="unspecified">
+<rSolid name="pixel:serviceR259Z2714"/>
+<rMaterial name="pixel:servicecompositeR259Z2714"/>
 </LogicalPart>
-<LogicalPart name="serviceR279Z2595" category="unspecified">
-<rSolid name="pixel:serviceR279Z2595"/>
-<rMaterial name="pixel:servicecompositeR279Z2595"/>
+<LogicalPart name="serviceR261Z2695" category="unspecified">
+<rSolid name="pixel:serviceR261Z2695"/>
+<rMaterial name="pixel:servicecompositeR261Z1795"/>
 </LogicalPart>
-<LogicalPart name="serviceR108Z1759" category="unspecified">
-<rSolid name="pixel:serviceR108Z1759"/>
-<rMaterial name="pixel:servicecompositeR108Z1759"/>
+<LogicalPart name="serviceR107Z1759" category="unspecified">
+<rSolid name="pixel:serviceR107Z1759"/>
+<rMaterial name="pixel:servicecompositeR107Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR149Z1759" category="unspecified">
-<rSolid name="pixel:serviceR149Z1759"/>
-<rMaterial name="pixel:servicecompositeR149Z1759"/>
+<LogicalPart name="serviceR144Z1759" category="unspecified">
+<rSolid name="pixel:serviceR144Z1759"/>
+<rMaterial name="pixel:servicecompositeR144Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR189Z1759" category="unspecified">
-<rSolid name="pixel:serviceR189Z1759"/>
-<rMaterial name="pixel:servicecompositeR189Z1759"/>
+<LogicalPart name="serviceR182Z1759" category="unspecified">
+<rSolid name="pixel:serviceR182Z1759"/>
+<rMaterial name="pixel:servicecompositeR182Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR232Z1759" category="unspecified">
-<rSolid name="pixel:serviceR232Z1759"/>
-<rMaterial name="pixel:servicecompositeR232Z1759"/>
+<LogicalPart name="serviceR218Z1759" category="unspecified">
+<rSolid name="pixel:serviceR218Z1759"/>
+<rMaterial name="pixel:servicecompositeR218Z1759"/>
 </LogicalPart>
 <LogicalPart name="serviceR254Z1759" category="unspecified">
 <rSolid name="pixel:serviceR254Z1759"/>
 <rMaterial name="pixel:servicecompositeR254Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR259Z2012" category="unspecified">
-<rSolid name="pixel:serviceR259Z2012"/>
-<rMaterial name="pixel:servicecompositeR259Z2012"/>
+<LogicalPart name="serviceR259Z2036" category="unspecified">
+<rSolid name="pixel:serviceR259Z2036"/>
+<rMaterial name="pixel:servicecompositeR259Z2036"/>
+</LogicalPart>
+<LogicalPart name="serviceR257Z2018" category="unspecified">
+<rSolid name="pixel:serviceR257Z2018"/>
+<rMaterial name="pixel:servicecompositeR257Z1758"/>
 </LogicalPart>
-<LogicalPart name="serviceR63Z1995" category="unspecified">
-<rSolid name="pixel:serviceR63Z1995"/>
-<rMaterial name="pixel:servicecompositeR63Z1759"/>
+<LogicalPart name="serviceR62Z2019" category="unspecified">
+<rSolid name="pixel:serviceR62Z2019"/>
+<rMaterial name="pixel:servicecompositeR62Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR108Z1995" category="unspecified">
-<rSolid name="pixel:serviceR108Z1995"/>
-<rMaterial name="pixel:servicecompositeR108Z1759"/>
+<LogicalPart name="serviceR107Z2019" category="unspecified">
+<rSolid name="pixel:serviceR107Z2019"/>
+<rMaterial name="pixel:servicecompositeR107Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR149Z1995" category="unspecified">
-<rSolid name="pixel:serviceR149Z1995"/>
-<rMaterial name="pixel:servicecompositeR149Z1759"/>
+<LogicalPart name="serviceR144Z2019" category="unspecified">
+<rSolid name="pixel:serviceR144Z2019"/>
+<rMaterial name="pixel:servicecompositeR144Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR189Z1995" category="unspecified">
-<rSolid name="pixel:serviceR189Z1995"/>
-<rMaterial name="pixel:servicecompositeR189Z1759"/>
+<LogicalPart name="serviceR182Z2019" category="unspecified">
+<rSolid name="pixel:serviceR182Z2019"/>
+<rMaterial name="pixel:servicecompositeR182Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR232Z1995" category="unspecified">
-<rSolid name="pixel:serviceR232Z1995"/>
-<rMaterial name="pixel:servicecompositeR232Z1759"/>
+<LogicalPart name="serviceR218Z2019" category="unspecified">
+<rSolid name="pixel:serviceR218Z2019"/>
+<rMaterial name="pixel:servicecompositeR218Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR254Z1995" category="unspecified">
-<rSolid name="pixel:serviceR254Z1995"/>
+<LogicalPart name="serviceR254Z2019" category="unspecified">
+<rSolid name="pixel:serviceR254Z2019"/>
 <rMaterial name="pixel:servicecompositeR254Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR259Z2277" category="unspecified">
-<rSolid name="pixel:serviceR259Z2277"/>
-<rMaterial name="pixel:servicecompositeR259Z2277"/>
+<LogicalPart name="serviceR259Z2334" category="unspecified">
+<rSolid name="pixel:serviceR259Z2334"/>
+<rMaterial name="pixel:servicecompositeR259Z2334"/>
 </LogicalPart>
-<LogicalPart name="serviceR63Z2260" category="unspecified">
-<rSolid name="pixel:serviceR63Z2260"/>
-<rMaterial name="pixel:servicecompositeR63Z1759"/>
+<LogicalPart name="serviceR257Z2316" category="unspecified">
+<rSolid name="pixel:serviceR257Z2316"/>
+<rMaterial name="pixel:servicecompositeR257Z1758"/>
 </LogicalPart>
-<LogicalPart name="serviceR108Z2260" category="unspecified">
-<rSolid name="pixel:serviceR108Z2260"/>
-<rMaterial name="pixel:servicecompositeR108Z1759"/>
+<LogicalPart name="serviceR62Z2317" category="unspecified">
+<rSolid name="pixel:serviceR62Z2317"/>
+<rMaterial name="pixel:servicecompositeR62Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR149Z2260" category="unspecified">
-<rSolid name="pixel:serviceR149Z2260"/>
-<rMaterial name="pixel:servicecompositeR149Z1759"/>
+<LogicalPart name="serviceR107Z2317" category="unspecified">
+<rSolid name="pixel:serviceR107Z2317"/>
+<rMaterial name="pixel:servicecompositeR107Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR189Z2260" category="unspecified">
-<rSolid name="pixel:serviceR189Z2260"/>
-<rMaterial name="pixel:servicecompositeR189Z1759"/>
+<LogicalPart name="serviceR144Z2317" category="unspecified">
+<rSolid name="pixel:serviceR144Z2317"/>
+<rMaterial name="pixel:servicecompositeR144Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR232Z2260" category="unspecified">
-<rSolid name="pixel:serviceR232Z2260"/>
-<rMaterial name="pixel:servicecompositeR232Z1759"/>
+<LogicalPart name="serviceR182Z2317" category="unspecified">
+<rSolid name="pixel:serviceR182Z2317"/>
+<rMaterial name="pixel:servicecompositeR182Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR254Z2260" category="unspecified">
-<rSolid name="pixel:serviceR254Z2260"/>
+<LogicalPart name="serviceR218Z2317" category="unspecified">
+<rSolid name="pixel:serviceR218Z2317"/>
+<rMaterial name="pixel:servicecompositeR218Z1759"/>
+</LogicalPart>
+<LogicalPart name="serviceR254Z2317" category="unspecified">
+<rSolid name="pixel:serviceR254Z2317"/>
 <rMaterial name="pixel:servicecompositeR254Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR259Z2562" category="unspecified">
-<rSolid name="pixel:serviceR259Z2562"/>
-<rMaterial name="pixel:servicecompositeR259Z2562"/>
+<LogicalPart name="serviceR259Z2676" category="unspecified">
+<rSolid name="pixel:serviceR259Z2676"/>
+<rMaterial name="pixel:servicecompositeR259Z2676"/>
+</LogicalPart>
+<LogicalPart name="serviceR257Z2658" category="unspecified">
+<rSolid name="pixel:serviceR257Z2658"/>
+<rMaterial name="pixel:servicecompositeR257Z1758"/>
 </LogicalPart>
-<LogicalPart name="serviceR63Z2559" category="unspecified">
-<rSolid name="pixel:serviceR63Z2559"/>
-<rMaterial name="pixel:servicecompositeR63Z1759"/>
+<LogicalPart name="serviceR62Z2659" category="unspecified">
+<rSolid name="pixel:serviceR62Z2659"/>
+<rMaterial name="pixel:servicecompositeR62Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR108Z2559" category="unspecified">
-<rSolid name="pixel:serviceR108Z2559"/>
-<rMaterial name="pixel:servicecompositeR108Z1759"/>
+<LogicalPart name="serviceR107Z2659" category="unspecified">
+<rSolid name="pixel:serviceR107Z2659"/>
+<rMaterial name="pixel:servicecompositeR107Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR149Z2559" category="unspecified">
-<rSolid name="pixel:serviceR149Z2559"/>
-<rMaterial name="pixel:servicecompositeR149Z1759"/>
+<LogicalPart name="serviceR144Z2659" category="unspecified">
+<rSolid name="pixel:serviceR144Z2659"/>
+<rMaterial name="pixel:servicecompositeR144Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR189Z2559" category="unspecified">
-<rSolid name="pixel:serviceR189Z2559"/>
-<rMaterial name="pixel:servicecompositeR189Z1759"/>
+<LogicalPart name="serviceR182Z2659" category="unspecified">
+<rSolid name="pixel:serviceR182Z2659"/>
+<rMaterial name="pixel:servicecompositeR182Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR232Z2559" category="unspecified">
-<rSolid name="pixel:serviceR232Z2559"/>
-<rMaterial name="pixel:servicecompositeR232Z1759"/>
+<LogicalPart name="serviceR218Z2659" category="unspecified">
+<rSolid name="pixel:serviceR218Z2659"/>
+<rMaterial name="pixel:servicecompositeR218Z1759"/>
 </LogicalPart>
-<LogicalPart name="serviceR254Z2559" category="unspecified">
-<rSolid name="pixel:serviceR254Z2559"/>
+<LogicalPart name="serviceR254Z2659" category="unspecified">
+<rSolid name="pixel:serviceR254Z2659"/>
 <rMaterial name="pixel:servicecompositeR254Z1759"/>
 </LogicalPart>
-<LogicalPart name="supportR188Z113" category="unspecified">
-<rSolid name="pixel:supportR188Z113"/>
-<rMaterial name="pixel:supportcompositeR188Z113"/>
+<LogicalPart name="supportR208Z113" category="unspecified">
+<rSolid name="pixel:supportR208Z113"/>
+<rMaterial name="pixel:supportcompositeR208Z113"/>
+</LogicalPart>
+<LogicalPart name="supportR208Z914" category="unspecified">
+<rSolid name="pixel:supportR208Z914"/>
+<rMaterial name="pixel:supportcompositeR208Z113"/>
+</LogicalPart>
+<LogicalPart name="supportR208Z1602" category="unspecified">
+<rSolid name="pixel:supportR208Z1602"/>
+<rMaterial name="pixel:supportcompositeR208Z113"/>
+</LogicalPart>
+<LogicalPart name="supportR303Z2169" category="unspecified">
+<rSolid name="pixel:supportR303Z2169"/>
+<rMaterial name="pixel:supportcompositeR208Z113"/>
+</LogicalPart>
+<LogicalPart name="supportR172Z916" category="unspecified">
+<rSolid name="pixel:supportR172Z916"/>
+<rMaterial name="pixel:supportcompositeR172Z916"/>
+</LogicalPart>
+<LogicalPart name="supportR172Z1607" category="unspecified">
+<rSolid name="pixel:supportR172Z1607"/>
+<rMaterial name="pixel:supportcompositeR172Z916"/>
+</LogicalPart>
+<LogicalPart name="supportR276Z2170" category="unspecified">
+<rSolid name="pixel:supportR276Z2170"/>
+<rMaterial name="pixel:supportcompositeR172Z916"/>
 </LogicalPart>
-<LogicalPart name="supportR188Z914" category="unspecified">
-<rSolid name="pixel:supportR188Z914"/>
-<rMaterial name="pixel:supportcompositeR188Z113"/>
+<LogicalPart name="supportR170Z237" category="unspecified">
+<rSolid name="pixel:supportR170Z237"/>
+<rMaterial name="pixel:supportcompositeR170Z237"/>
 </LogicalPart>
-<LogicalPart name="supportR188Z1603" category="unspecified">
-<rSolid name="pixel:supportR188Z1603"/>
-<rMaterial name="pixel:supportcompositeR188Z113"/>
+<LogicalPart name="supportR170Z710" category="unspecified">
+<rSolid name="pixel:supportR170Z710"/>
+<rMaterial name="pixel:supportcompositeR170Z237"/>
 </LogicalPart>
-<LogicalPart name="supportR284Z2129" category="unspecified">
-<rSolid name="pixel:supportR284Z2129"/>
-<rMaterial name="pixel:supportcompositeR188Z113"/>
+<LogicalPart name="supportR170Z910" category="unspecified">
+<rSolid name="pixel:supportR170Z910"/>
+<rMaterial name="pixel:supportcompositeR170Z237"/>
 </LogicalPart>
-<LogicalPart name="supportR172Z835" category="unspecified">
-<rSolid name="pixel:supportR172Z835"/>
-<rMaterial name="pixel:supportcompositeR172Z835"/>
+<LogicalPart name="supportR170Z1160" category="unspecified">
+<rSolid name="pixel:supportR170Z1160"/>
+<rMaterial name="pixel:supportcompositeR170Z237"/>
 </LogicalPart>
-<LogicalPart name="supportR264Z2160" category="unspecified">
-<rSolid name="pixel:supportR264Z2160"/>
-<rMaterial name="pixel:supportcompositeR172Z835"/>
+<LogicalPart name="supportR170Z1600" category="unspecified">
+<rSolid name="pixel:supportR170Z1600"/>
+<rMaterial name="pixel:supportcompositeR170Z237"/>
 </LogicalPart>
-<LogicalPart name="supportR38Z101" category="unspecified">
-<rSolid name="pixel:supportR38Z101"/>
-<rMaterial name="pixel:supportcompositeR38Z101"/>
+<LogicalPart name="supportR161Z100" category="unspecified">
+<rSolid name="pixel:supportR161Z100"/>
+<rMaterial name="pixel:supportcompositeR161Z100"/>
 </LogicalPart>
-<LogicalPart name="supportR68Z101" category="unspecified">
-<rSolid name="pixel:supportR68Z101"/>
-<rMaterial name="pixel:supportcompositeR38Z101"/>
+<LogicalPart name="supportR44Z41" category="unspecified">
+<rSolid name="pixel:supportR44Z41"/>
+<rMaterial name="pixel:supportcompositeR44Z41"/>
 </LogicalPart>
-<LogicalPart name="supportR109Z101" category="unspecified">
-<rSolid name="pixel:supportR109Z101"/>
-<rMaterial name="pixel:supportcompositeR38Z101"/>
+<LogicalPart name="supportR75Z41" category="unspecified">
+<rSolid name="pixel:supportR75Z41"/>
+<rMaterial name="pixel:supportcompositeR44Z41"/>
 </LogicalPart>
-<LogicalPart name="supportR38Z221" category="unspecified">
-<rSolid name="pixel:supportR38Z221"/>
-<rMaterial name="pixel:supportcompositeR38Z101"/>
+<LogicalPart name="supportR119Z41" category="unspecified">
+<rSolid name="pixel:supportR119Z41"/>
+<rMaterial name="pixel:supportcompositeR44Z41"/>
 </LogicalPart>
-<LogicalPart name="supportR68Z221" category="unspecified">
-<rSolid name="pixel:supportR68Z221"/>
-<rMaterial name="pixel:supportcompositeR38Z101"/>
+<LogicalPart name="supportR44Z216" category="unspecified">
+<rSolid name="pixel:supportR44Z216"/>
+<rMaterial name="pixel:supportcompositeR44Z41"/>
 </LogicalPart>
-<LogicalPart name="supportR109Z221" category="unspecified">
-<rSolid name="pixel:supportR109Z221"/>
-<rMaterial name="pixel:supportcompositeR38Z101"/>
+<LogicalPart name="supportR75Z216" category="unspecified">
+<rSolid name="pixel:supportR75Z216"/>
+<rMaterial name="pixel:supportcompositeR44Z41"/>
+</LogicalPart>
+<LogicalPart name="supportR119Z216" category="unspecified">
+<rSolid name="pixel:supportR119Z216"/>
+<rMaterial name="pixel:supportcompositeR44Z41"/>
 </LogicalPart>
 </LogicalPartSection>
 <SolidSection label="pixel.xml">
-<Box name="BModule1Layer1" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule1Layer1InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer1InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer1Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule1Layer1Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule1Layer1DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer1DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer1DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer1DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer1" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule2Layer1InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer1InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer1Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule2Layer1Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule2Layer1DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer1DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer1DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer1DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer1" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule3Layer1InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer1InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer1Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule3Layer1Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule3Layer1DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer1DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer1DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer1DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer1" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule4Layer1InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer1InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer1Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule4Layer1Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule4Layer1DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer1DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer1DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer1DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer1" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule5Layer1InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer1InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer1Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule5Layer1Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule5Layer1DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer1DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer1DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer1DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="RodFlipped1" dx="0.585*mm" dy="9.21*mm" dz="199.8*mm"/>
-<Box name="RodUnflipped1" dx="0.585*mm" dy="9.21*mm" dz="199.8*mm"/>
-<Tubs name="Layer1" rMin="26.905*mm" rMax="32.4283*mm" dz="199.81*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="BModule1Layer2" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule1Layer2InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer2InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer2Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule1Layer2Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule1Layer2DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer2DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer2DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer2DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer2" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule2Layer2InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer2InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer2Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule2Layer2Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule2Layer2DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer2DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer2DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer2DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer2" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule3Layer2InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer2InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer2Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule3Layer2Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule3Layer2DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer2DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer2DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer2DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer2" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule4Layer2InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer2InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer2Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule4Layer2Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule4Layer2DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer2DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer2DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer2DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer2" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule5Layer2InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer2InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer2Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule5Layer2Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule5Layer2DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer2DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer2DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer2DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="RodFlipped2" dx="0.585*mm" dy="9.21*mm" dz="199.8*mm"/>
-<Box name="RodUnflipped2" dx="0.585*mm" dy="9.21*mm" dz="199.8*mm"/>
-<Tubs name="Layer2" rMin="57.905*mm" rMax="62.7731*mm" dz="199.81*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="BModule1Layer3" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule1Layer3InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer3InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer3Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule1Layer3Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule1Layer3DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer3DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer3DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer3DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer3" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule2Layer3InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer3InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer3Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule2Layer3Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule2Layer3DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer3DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer3DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer3DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer3" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule3Layer3InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer3InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer3Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule3Layer3Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule3Layer3DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer3DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer3DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer3DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer3" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule4Layer3InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer3InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer3Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule4Layer3Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule4Layer3DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer3DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer3DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer3DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer3" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule5Layer3InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer3InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer3Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule5Layer3Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule5Layer3DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer3DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer3DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer3DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="RodFlipped3" dx="0.585*mm" dy="17.51*mm" dz="199.8*mm"/>
-<Box name="RodUnflipped3" dx="0.585*mm" dy="17.51*mm" dz="199.8*mm"/>
-<Tubs name="Layer3" rMin="97.905*mm" rMax="103.584*mm" dz="199.81*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="BModule1Layer4" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule1Layer4InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer4InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer4Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule1Layer4Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule1Layer4DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer4DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer4DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule1Layer4DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer4" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule2Layer4InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer4InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer4Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule2Layer4Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule2Layer4DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer4DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer4DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule2Layer4DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer4" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule3Layer4InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer4InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer4Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule3Layer4Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule3Layer4DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer4DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer4DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule3Layer4DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer4" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule4Layer4InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer4InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer4Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule4Layer4Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule4Layer4DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer4DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer4DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule4Layer4DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer4" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="BModule5Layer4InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer4InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer4Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule5Layer4Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="BModule5Layer4DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer4DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer4DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="BModule5Layer4DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="RodFlipped4" dx="0.585*mm" dy="17.51*mm" dz="199.8*mm"/>
-<Box name="RodUnflipped4" dx="0.585*mm" dy="17.51*mm" dz="199.8*mm"/>
-<Tubs name="Layer4" rMin="137.905*mm" rMax="143.169*mm" dz="199.81*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc1" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc1InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc1InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc1Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc1Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc1DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc1DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc1DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc1DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc1" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc1InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc1InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc1Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc1Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc1DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc1DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc1DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc1DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc1" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc1InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc1InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc1Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc1Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc1DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc1DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc1DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc1DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc1" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc1InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc1InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc1Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc1Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc1DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc1DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc1DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc1DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc1" rMin="28.9*mm" rMax="73.8752*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc1" rMin="48.7*mm" rMax="93.5535*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc1" rMin="82.7*mm" rMax="128.299*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc1" rMin="115.69*mm" rMax="161.044*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc1" rMin="28.89*mm" rMax="161.054*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc2" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc2InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc2InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc2Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc2Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc2DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc2DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc2DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc2DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc2" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc2InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc2InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc2Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc2Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc2DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc2DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc2DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc2DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc2" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc2InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc2InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc2Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc2Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc2DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc2DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc2DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc2DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc2" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc2InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc2InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc2Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc2Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc2DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc2DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc2DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc2DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc2" rMin="28.9*mm" rMax="73.8752*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc2" rMin="48.7*mm" rMax="93.5535*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc2" rMin="82.7*mm" rMax="128.299*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc2" rMin="115.69*mm" rMax="161.044*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc2" rMin="28.89*mm" rMax="161.054*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc3" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc3InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc3InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc3Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc3Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc3DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc3DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc3DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc3DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc3" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc3InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc3InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc3Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc3Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc3DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc3DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc3DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc3DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc3" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc3InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc3InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc3Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc3Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc3DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc3DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc3DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc3DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc3" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc3InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc3InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc3Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc3Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc3DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc3DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc3DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc3DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc3" rMin="28.9*mm" rMax="73.8752*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc3" rMin="48.7*mm" rMax="93.5535*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc3" rMin="82.7*mm" rMax="128.299*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc3" rMin="115.69*mm" rMax="161.044*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc3" rMin="28.89*mm" rMax="161.054*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc4" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc4InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc4InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc4Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc4Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc4DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc4DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc4DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc4DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc4" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc4InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc4InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc4Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc4Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc4DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc4DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc4DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc4DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc4" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc4InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc4InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc4Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc4Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc4DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc4DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc4DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc4DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc4" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc4InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc4InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc4Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc4Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc4DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc4DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc4DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc4DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc4" rMin="28.9*mm" rMax="73.8752*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc4" rMin="48.7*mm" rMax="93.5535*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc4" rMin="82.7*mm" rMax="128.299*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc4" rMin="115.69*mm" rMax="161.044*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc4" rMin="28.89*mm" rMax="161.054*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc5" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc5InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc5InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc5Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc5Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc5DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc5DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc5DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc5DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc5" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc5InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc5InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc5Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc5Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc5DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc5DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc5DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc5DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc5" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc5InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc5InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc5Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc5Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc5DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc5DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc5DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc5DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc5" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc5InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc5InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc5Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc5Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc5DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc5DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc5DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc5DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc5" rMin="28.9*mm" rMax="73.8752*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc5" rMin="48.7*mm" rMax="93.5535*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc5" rMin="82.7*mm" rMax="128.299*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc5" rMin="115.69*mm" rMax="161.044*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc5" rMin="28.89*mm" rMax="161.054*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc6" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc6InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc6InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc6Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc6Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc6DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc6DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc6DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc6DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc6" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc6InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc6InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc6Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc6Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc6DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc6DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc6DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc6DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc6" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc6InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc6InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc6Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc6Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc6DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc6DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc6DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc6DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc6" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc6InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc6InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc6Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc6Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc6DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc6DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc6DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc6DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc6" rMin="28.9*mm" rMax="73.8752*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc6" rMin="48.7*mm" rMax="93.5535*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc6" rMin="82.7*mm" rMax="128.299*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc6" rMin="115.69*mm" rMax="161.044*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc6" rMin="28.89*mm" rMax="161.054*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc7" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc7InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc7InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc7Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc7Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc7DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc7DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc7DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc7DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc7" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc7InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc7InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc7Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc7Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc7DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc7DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc7DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc7DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc7" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc7InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc7InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc7Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc7Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc7DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc7DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc7DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc7DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc7" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc7InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc7InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc7Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc7Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc7DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc7DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc7DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc7DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc7" rMin="28.9*mm" rMax="73.8752*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc7" rMin="48.7*mm" rMax="93.5535*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc7" rMin="82.7*mm" rMax="128.299*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc7" rMin="115.69*mm" rMax="161.044*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc7" rMin="28.89*mm" rMax="161.054*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc8" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc8InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc8InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc8Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc8Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc8DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc8DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc8DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc8DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc8" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc8InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc8InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc8Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc8Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc8DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc8DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc8DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc8DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc8" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc8InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc8InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc8Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc8Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc8DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc8DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc8DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc8DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc8" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc8InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc8InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc8Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc8Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc8DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc8DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc8DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc8DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc8" rMin="28.9*mm" rMax="73.8752*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc8" rMin="48.7*mm" rMax="93.5535*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc8" rMin="82.7*mm" rMax="128.299*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc8" rMin="115.69*mm" rMax="161.044*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc8" rMin="28.89*mm" rMax="161.054*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc9" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc9InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc9InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc9Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc9Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc9DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc9DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc9DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc9DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc9" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc9InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc9InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc9Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc9Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc9DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc9DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc9DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc9DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc9" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc9InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc9InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc9Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc9Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc9DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc9DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc9DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc9DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc9" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc9InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc9InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc9Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc9Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc9DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc9DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc9DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc9DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc9" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule5Disc9InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc9InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc9Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule5Disc9Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule5Disc9DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc9DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc9DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc9DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc9" rMin="63.7*mm" rMax="108.491*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc9" rMin="104.7*mm" rMax="149.384*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc9" rMin="144.2*mm" rMax="189.41*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc9" rMin="187.7*mm" rMax="232.759*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring5Disc9" rMin="209.69*mm" rMax="254.692*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc9" rMin="63.69*mm" rMax="254.702*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc10" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc10InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc10InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc10Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc10Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc10DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc10DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc10DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc10DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc10" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc10InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc10InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc10Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc10Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc10DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc10DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc10DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc10DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc10" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc10InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc10InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc10Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc10Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc10DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc10DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc10DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc10DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc10" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc10InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc10InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc10Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc10Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc10DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc10DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc10DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc10DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc10" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule5Disc10InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc10InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc10Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule5Disc10Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule5Disc10DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc10DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc10DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc10DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc10" rMin="63.7*mm" rMax="108.491*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc10" rMin="104.7*mm" rMax="149.384*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc10" rMin="144.2*mm" rMax="189.41*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc10" rMin="187.7*mm" rMax="232.759*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring5Disc10" rMin="209.69*mm" rMax="254.692*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc10" rMin="63.69*mm" rMax="254.702*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc11" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc11InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc11InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc11Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc11Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc11DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc11DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc11DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc11DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc11" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc11InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc11InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc11Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc11Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc11DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc11DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc11DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc11DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc11" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc11InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc11InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc11Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc11Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc11DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc11DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc11DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc11DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc11" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc11InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc11InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc11Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc11Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc11DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc11DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc11DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc11DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc11" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule5Disc11InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc11InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc11Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule5Disc11Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule5Disc11DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc11DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc11DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc11DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc11" rMin="63.7*mm" rMax="108.491*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc11" rMin="104.7*mm" rMax="149.384*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc11" rMin="144.2*mm" rMax="189.41*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc11" rMin="187.7*mm" rMax="232.759*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring5Disc11" rMin="209.69*mm" rMax="254.692*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc11" rMin="63.69*mm" rMax="254.702*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Box name="EModule1Disc12" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule1Disc12InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc12InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc12Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc12Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule1Disc12DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc12DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc12DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule1Disc12DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc12" dx="9.2*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule2Disc12InnerPixelwafer" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc12InnerPixelActive" dx="8.2*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc12Hybrid" dx="8.2*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc12Chip" dx="8.7*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule2Disc12DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc12DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc12DeadAreaFront" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule2Disc12DeadAreaBack" dx="8.7*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc12" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule3Disc12InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc12InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc12Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc12Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule3Disc12DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc12DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc12DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule3Disc12DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc12" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule4Disc12InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc12InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc12Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc12Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule4Disc12DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc12DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc12DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule4Disc12DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc12" dx="17.5*mm" dy="22.19*mm" dz="0.575*mm"/>
-<Box name="EModule5Disc12InnerPixelwafer" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc12InnerPixelActive" dx="16.5*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc12Hybrid" dx="16.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule5Disc12Chip" dx="17.5*mm" dy="22.1*mm" dz="0.25*mm"/>
-<Box name="EModule5Disc12DeadAreaRight" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc12DeadAreaLeft" dx="0.25*mm" dy="22.1*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc12DeadAreaFront" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Box name="EModule5Disc12DeadAreaBack" dx="17*mm" dy="0.045*mm" dz="0.075*mm"/>
-<Tubs name="Ring1Disc12" rMin="63.7*mm" rMax="108.491*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc12" rMin="104.7*mm" rMax="149.384*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc12" rMin="144.2*mm" rMax="189.41*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc12" rMin="187.7*mm" rMax="232.759*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring5Disc12" rMin="209.69*mm" rMax="254.692*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc12" rMin="63.69*mm" rMax="254.702*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR176Z1425" rMin="176.838*mm" rMax="178.838*mm" dz="8.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR248Z1609" rMin="248.4*mm" rMax="270.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR228Z1609" rMin="228.169*mm" rMax="248.4*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR209Z1609" rMin="209.586*mm" rMax="228.169*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR192Z1609" rMin="192.517*mm" rMax="209.586*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR176Z1609" rMin="176.837*mm" rMax="192.517*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR270Z2087" rMin="270.525*mm" rMax="272.525*mm" dz="479.238*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR270Z2567" rMin="270.525*mm" rMax="277.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR277Z2580" rMin="277.525*mm" rMax="279.525*mm" dz="14.1625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR176Z355BarrelPart" rMin="176.838*mm" rMax="178.838*mm" dz="3.14*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR176Z355EndcapsPart" rMin="176.838*mm" rMax="178.838*mm" dz="131.185*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR34Z207" rMin="34.138*mm" rMax="64.514*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR34Z11" rMin="34.138*mm" rMax="36.138*mm" dz="10.95*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR176Z547" rMin="176.838*mm" rMax="178.838*mm" dz="58.26*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR178Z489" rMin="178.938*mm" rMax="180.938*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR176Z629" rMin="176.838*mm" rMax="178.838*mm" dz="22.95*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR178Z606" rMin="178.938*mm" rMax="180.938*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR176Z700" rMin="176.838*mm" rMax="178.838*mm" dz="48.685*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR178Z652" rMin="178.938*mm" rMax="180.938*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR176Z1083" rMin="176.838*mm" rMax="178.838*mm" dz="333.447*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR178Z749" rMin="178.938*mm" rMax="180.938*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR34Z44" rMin="34.138*mm" rMax="36.138*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR34Z88" rMin="34.138*mm" rMax="36.138*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR34Z133" rMin="34.138*mm" rMax="36.138*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR34Z177" rMin="34.138*mm" rMax="36.138*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR34Z202" rMin="34.138*mm" rMax="36.138*mm" dz="2.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR64Z207" rMin="64.614*mm" rMax="105.299*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR64Z11" rMin="64.614*mm" rMax="66.614*mm" dz="10.95*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR64Z44" rMin="64.614*mm" rMax="66.614*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR64Z88" rMin="64.614*mm" rMax="66.614*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR64Z133" rMin="64.614*mm" rMax="66.614*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR64Z177" rMin="64.614*mm" rMax="66.614*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR64Z202" rMin="64.614*mm" rMax="66.614*mm" dz="2.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR105Z207" rMin="105.399*mm" rMax="144.929*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR105Z11" rMin="105.399*mm" rMax="107.399*mm" dz="10.95*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR105Z44" rMin="105.399*mm" rMax="107.399*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR105Z88" rMin="105.399*mm" rMax="107.399*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR105Z133" rMin="105.399*mm" rMax="107.399*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR105Z177" rMin="105.399*mm" rMax="107.399*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR105Z202" rMin="105.399*mm" rMax="107.399*mm" dz="2.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR145Z207" rMin="145.029*mm" rMax="176.738*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR145Z11" rMin="145.029*mm" rMax="147.029*mm" dz="10.95*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR145Z44" rMin="145.029*mm" rMax="147.029*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR145Z88" rMin="145.029*mm" rMax="147.029*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR145Z133" rMin="145.029*mm" rMax="147.029*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR145Z177" rMin="145.029*mm" rMax="147.029*mm" dz="22.15*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR145Z202" rMin="145.029*mm" rMax="147.029*mm" dz="2.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z271" rMin="165.938*mm" rMax="167.938*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR28Z259" rMin="28.999*mm" rMax="73.557*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z306" rMin="165.938*mm" rMax="167.938*mm" dz="21.8675*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR168Z284" rMin="168.038*mm" rMax="170.038*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z385" rMin="165.938*mm" rMax="167.938*mm" dz="31.6025*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR168Z354" rMin="168.038*mm" rMax="170.038*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z487" rMin="165.938*mm" rMax="167.938*mm" dz="44.0475*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR168Z443" rMin="168.038*mm" rMax="170.038*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z617" rMin="165.938*mm" rMax="167.938*mm" dz="59.9725*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR168Z557" rMin="168.038*mm" rMax="170.038*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z783" rMin="165.938*mm" rMax="167.938*mm" dz="80.3375*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR168Z703" rMin="168.038*mm" rMax="170.038*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z996" rMin="165.938*mm" rMax="167.938*mm" dz="106.382*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR168Z890" rMin="168.038*mm" rMax="170.038*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z1268" rMin="165.938*mm" rMax="167.938*mm" dz="139.702*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR168Z1129" rMin="168.038*mm" rMax="170.038*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR176Z1521" rMin="176.838*mm" rMax="178.838*mm" dz="86.7*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR178Z1434" rMin="178.938*mm" rMax="180.938*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR73Z259" rMin="73.657*mm" rMax="93.26*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR93Z259" rMin="93.36*mm" rMax="127.967*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR128Z259" rMin="128.067*mm" rMax="160.738*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR160Z259" rMin="160.838*mm" rMax="163.838*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z341" rMin="165.938*mm" rMax="167.938*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR28Z329" rMin="28.999*mm" rMax="73.557*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR73Z329" rMin="73.657*mm" rMax="93.26*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR93Z329" rMin="93.36*mm" rMax="127.967*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR128Z329" rMin="128.067*mm" rMax="160.738*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR160Z329" rMin="160.838*mm" rMax="163.838*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z430" rMin="165.938*mm" rMax="167.938*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR28Z418" rMin="28.999*mm" rMax="73.557*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR73Z418" rMin="73.657*mm" rMax="93.26*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR93Z418" rMin="93.36*mm" rMax="127.967*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR128Z418" rMin="128.067*mm" rMax="160.738*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR160Z418" rMin="160.838*mm" rMax="163.838*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z544" rMin="165.938*mm" rMax="167.938*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR28Z532" rMin="28.999*mm" rMax="73.557*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR73Z532" rMin="73.657*mm" rMax="93.26*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR93Z532" rMin="93.36*mm" rMax="127.967*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR128Z532" rMin="128.067*mm" rMax="160.738*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR160Z532" rMin="160.838*mm" rMax="163.838*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z690" rMin="165.938*mm" rMax="167.938*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR28Z678" rMin="28.999*mm" rMax="73.557*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR73Z678" rMin="73.657*mm" rMax="93.26*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR93Z678" rMin="93.36*mm" rMax="127.967*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR128Z678" rMin="128.067*mm" rMax="160.738*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR160Z678" rMin="160.838*mm" rMax="163.838*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z877" rMin="165.938*mm" rMax="167.938*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR28Z865" rMin="28.999*mm" rMax="73.557*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR73Z865" rMin="73.657*mm" rMax="93.26*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR93Z865" rMin="93.36*mm" rMax="127.967*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR128Z865" rMin="128.067*mm" rMax="160.738*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR160Z865" rMin="160.838*mm" rMax="163.838*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z1116" rMin="165.938*mm" rMax="167.938*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR28Z1104" rMin="28.999*mm" rMax="73.557*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR73Z1104" rMin="73.657*mm" rMax="93.26*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR93Z1104" rMin="93.36*mm" rMax="127.967*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR128Z1104" rMin="128.067*mm" rMax="160.738*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR160Z1104" rMin="160.838*mm" rMax="163.838*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR165Z1412" rMin="165.938*mm" rMax="167.938*mm" dz="3.95*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR28Z1409" rMin="28.999*mm" rMax="73.557*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR73Z1409" rMin="73.657*mm" rMax="93.26*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR93Z1409" rMin="93.36*mm" rMax="127.967*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR128Z1409" rMin="128.067*mm" rMax="160.738*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR160Z1409" rMin="160.838*mm" rMax="163.838*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR259Z1776" rMin="259.625*mm" rMax="261.625*mm" dz="18.1625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR63Z1759" rMin="63.799*mm" rMax="108.21*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR259Z1894" rMin="259.625*mm" rMax="261.625*mm" dz="99.4525*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR261Z1795" rMin="261.725*mm" rMax="263.725*mm" dz="25*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR259Z2144" rMin="259.625*mm" rMax="261.625*mm" dz="114.438*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR261Z2030" rMin="261.725*mm" rMax="263.725*mm" dz="24.9995*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR259Z2427" rMin="259.625*mm" rMax="261.625*mm" dz="131.322*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR261Z2295" rMin="261.725*mm" rMax="263.725*mm" dz="25*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR277Z2625" rMin="277.525*mm" rMax="279.525*mm" dz="30.7875*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR279Z2595" rMin="279.625*mm" rMax="281.625*mm" dz="25*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR108Z1759" rMin="108.31*mm" rMax="149.125*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR149Z1759" rMin="149.225*mm" rMax="189.12*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR189Z1759" rMin="189.22*mm" rMax="232.486*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR232Z1759" rMin="232.586*mm" rMax="254.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR254Z1759" rMin="254.525*mm" rMax="257.525*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR259Z2012" rMin="259.625*mm" rMax="261.625*mm" dz="18.162*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR63Z1995" rMin="63.799*mm" rMax="108.21*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR108Z1995" rMin="108.31*mm" rMax="149.125*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR149Z1995" rMin="149.225*mm" rMax="189.12*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR189Z1995" rMin="189.22*mm" rMax="232.486*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR232Z1995" rMin="232.586*mm" rMax="254.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR254Z1995" rMin="254.525*mm" rMax="257.525*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR259Z2277" rMin="259.625*mm" rMax="261.625*mm" dz="18.163*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR63Z2260" rMin="63.799*mm" rMax="108.21*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR108Z2260" rMin="108.31*mm" rMax="149.125*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR149Z2260" rMin="149.225*mm" rMax="189.12*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR189Z2260" rMin="189.22*mm" rMax="232.486*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR232Z2260" rMin="232.586*mm" rMax="254.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR254Z2260" rMin="254.525*mm" rMax="257.525*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR259Z2562" rMin="259.625*mm" rMax="261.625*mm" dz="3.95*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR63Z2559" rMin="63.799*mm" rMax="108.21*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR108Z2559" rMin="108.31*mm" rMax="149.125*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR149Z2559" rMin="149.225*mm" rMax="189.12*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR189Z2559" rMin="189.22*mm" rMax="232.486*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR232Z2559" rMin="232.586*mm" rMax="254.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR254Z2559" rMin="254.525*mm" rMax="257.525*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR188Z113" rMin="188*mm" rMax="190*mm" dz="113.495*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR188Z914" rMin="188*mm" rMax="190*mm" dz="687.495*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR188Z1603" rMin="188*mm" rMax="286*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR284Z2129" rMin="284*mm" rMax="286*mm" dz="525*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR172Z835" rMin="172*mm" rMax="174*mm" dz="575*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR264Z2160" rMin="264*mm" rMax="266*mm" dz="400*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR38Z101" rMin="38.1387*mm" rMax="56.925*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR68Z101" rMin="68.6143*mm" rMax="96.925*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR109Z101" rMin="109.4*mm" rMax="136.925*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR38Z221" rMin="38.1387*mm" rMax="56.925*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR68Z221" rMin="68.6143*mm" rMax="96.925*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR109Z221" rMin="109.4*mm" rMax="136.925*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="BModule1Layer1" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule1Layer1InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer1InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer1Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule1Layer1Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule1Layer1DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer1DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer1DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer1DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer1" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule2Layer1InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer1InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer1Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule2Layer1Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule2Layer1DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer1DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer1DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer1DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer1" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule3Layer1InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer1InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer1Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule3Layer1Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule3Layer1DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer1DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer1DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer1DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer1" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule4Layer1InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer1InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer1Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule4Layer1Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule4Layer1DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer1DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer1DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer1DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer1" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule5Layer1InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer1InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer1Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule5Layer1Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule5Layer1DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer1DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer1DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer1DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="RodFlipped1" dx="0.585*mm" dy="9.41*mm" dz="201.235*mm"/>
+<Box name="RodUnflipped1" dx="0.585*mm" dy="9.41*mm" dz="201.235*mm"/>
+<Tubs name="Layer1" rMin="26.905*mm" rMax="34.4048*mm" dz="201.245*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="BModule1Layer2" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule1Layer2InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer2InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer2Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule1Layer2Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule1Layer2DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer2DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer2DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer2DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer2" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule2Layer2InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer2InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer2Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule2Layer2Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule2Layer2DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer2DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer2DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer2DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer2" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule3Layer2InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer2InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer2Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule3Layer2Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule3Layer2DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer2DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer2DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer2DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer2" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule4Layer2InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer2InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer2Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule4Layer2Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule4Layer2DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer2DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer2DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer2DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer2" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule5Layer2InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer2InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer2Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule5Layer2Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule5Layer2DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer2DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer2DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer2DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="RodFlipped2" dx="0.585*mm" dy="9.41*mm" dz="201.235*mm"/>
+<Box name="RodUnflipped2" dx="0.585*mm" dy="9.41*mm" dz="201.235*mm"/>
+<Tubs name="Layer2" rMin="58.405*mm" rMax="65.2756*mm" dz="201.245*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="BModule1Layer3" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule1Layer3InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer3InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer3Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule1Layer3Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule1Layer3DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer3DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer3DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer3DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer3" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule2Layer3InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer3InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer3Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule2Layer3Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule2Layer3DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer3DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer3DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer3DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer3" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule3Layer3InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer3InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer3Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule3Layer3Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule3Layer3DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer3DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer3DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer3DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer3" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule4Layer3InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer3InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer3Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule4Layer3Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule4Layer3DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer3DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer3DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer3DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer3" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule5Layer3InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer3InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer3Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule5Layer3Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule5Layer3DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer3DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer3DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer3DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="RodFlipped3" dx="0.585*mm" dy="17.935*mm" dz="201.235*mm"/>
+<Box name="RodUnflipped3" dx="0.585*mm" dy="17.935*mm" dz="201.235*mm"/>
+<Tubs name="Layer3" rMin="101.405*mm" rMax="109.078*mm" dz="201.245*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="BModule1Layer4" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule1Layer4InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer4InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer4Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule1Layer4Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule1Layer4DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer4DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer4DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule1Layer4DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer4" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule2Layer4InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer4InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer4Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule2Layer4Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule2Layer4DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer4DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer4DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule2Layer4DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer4" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule3Layer4InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer4InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer4Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule3Layer4Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule3Layer4DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer4DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer4DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule3Layer4DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer4" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule4Layer4InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer4InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer4Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule4Layer4Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule4Layer4DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer4DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer4DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule4Layer4DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer4" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="BModule5Layer4InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer4InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer4Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule5Layer4Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="BModule5Layer4DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer4DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer4DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="BModule5Layer4DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="RodFlipped4" dx="0.585*mm" dy="17.935*mm" dz="201.235*mm"/>
+<Box name="RodUnflipped4" dx="0.585*mm" dy="17.935*mm" dz="201.235*mm"/>
+<Tubs name="Layer4" rMin="143.405*mm" rMax="150.665*mm" dz="201.245*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="EModule1Disc1" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule1Disc1InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc1InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc1Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc1Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc1DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc1DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc1DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc1DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc1" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule2Disc1InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc1InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc1Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc1Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc1DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc1DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc1DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc1DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc1" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule3Disc1InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc1InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc1Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc1Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc1DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc1DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc1DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc1DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc1" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule4Disc1InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc1InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc1Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc1Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc1DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc1DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc1DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc1DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Tubs name="Ring1Disc1" rMin="30.49*mm" rMax="75.5472*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc1" rMin="48.49*mm" rMax="93.4341*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc1" rMin="82.69*mm" rMax="128.417*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc1" rMin="116.03*mm" rMax="161.498*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Disc1" rMin="30.48*mm" rMax="161.508*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="EModule1Disc2" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule1Disc2InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc2InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc2Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc2Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc2DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc2DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc2DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc2DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc2" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule2Disc2InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc2InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc2Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc2Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc2DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc2DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc2DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc2DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc2" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule3Disc2InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc2InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc2Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc2Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc2DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc2DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc2DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc2DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc2" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule4Disc2InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc2InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc2Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc2Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc2DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc2DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc2DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc2DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Tubs name="Ring1Disc2" rMin="30.49*mm" rMax="75.5472*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc2" rMin="48.49*mm" rMax="93.4341*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc2" rMin="82.69*mm" rMax="128.417*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc2" rMin="116.03*mm" rMax="161.498*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Disc2" rMin="30.48*mm" rMax="161.508*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="EModule1Disc3" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule1Disc3InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc3InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc3Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc3Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc3DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc3DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc3DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc3DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc3" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule2Disc3InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc3InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc3Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc3Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc3DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc3DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc3DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc3DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc3" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule3Disc3InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc3InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc3Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc3Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc3DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc3DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc3DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc3DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc3" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule4Disc3InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc3InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc3Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc3Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc3DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc3DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc3DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc3DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Tubs name="Ring1Disc3" rMin="30.49*mm" rMax="75.5472*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc3" rMin="48.49*mm" rMax="93.4341*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc3" rMin="82.69*mm" rMax="128.417*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc3" rMin="116.03*mm" rMax="161.498*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Disc3" rMin="30.48*mm" rMax="161.508*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="EModule1Disc4" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule1Disc4InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc4InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc4Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc4Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc4DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc4DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc4DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc4DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc4" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule2Disc4InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc4InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc4Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc4Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc4DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc4DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc4DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc4DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc4" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule3Disc4InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc4InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc4Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc4Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc4DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc4DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc4DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc4DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc4" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule4Disc4InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc4InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc4Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc4Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc4DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc4DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc4DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc4DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Tubs name="Ring1Disc4" rMin="30.49*mm" rMax="75.5472*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc4" rMin="48.49*mm" rMax="93.4341*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc4" rMin="82.69*mm" rMax="128.417*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc4" rMin="116.03*mm" rMax="161.498*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Disc4" rMin="30.48*mm" rMax="161.508*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="EModule1Disc5" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule1Disc5InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc5InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc5Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc5Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc5DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc5DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc5DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc5DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc5" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule2Disc5InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc5InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc5Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc5Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc5DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc5DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc5DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc5DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc5" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule3Disc5InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc5InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc5Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc5Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc5DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc5DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc5DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc5DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc5" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule4Disc5InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc5InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc5Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc5Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc5DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc5DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc5DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc5DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Tubs name="Ring1Disc5" rMin="30.49*mm" rMax="75.5472*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc5" rMin="48.49*mm" rMax="93.4341*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc5" rMin="82.69*mm" rMax="128.417*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc5" rMin="116.03*mm" rMax="161.498*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Disc5" rMin="30.48*mm" rMax="161.508*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="EModule1Disc6" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule1Disc6InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc6InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc6Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc6Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc6DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc6DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc6DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc6DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc6" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule2Disc6InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc6InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc6Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc6Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc6DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc6DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc6DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc6DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc6" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule3Disc6InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc6InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc6Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc6Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc6DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc6DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc6DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc6DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc6" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule4Disc6InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc6InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc6Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc6Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc6DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc6DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc6DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc6DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Tubs name="Ring1Disc6" rMin="30.49*mm" rMax="75.5472*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc6" rMin="48.49*mm" rMax="93.4341*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc6" rMin="82.69*mm" rMax="128.417*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc6" rMin="116.03*mm" rMax="161.498*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Disc6" rMin="30.48*mm" rMax="161.508*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="EModule1Disc7" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule1Disc7InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc7InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc7Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc7Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc7DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc7DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc7DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc7DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc7" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule2Disc7InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc7InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc7Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc7Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc7DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc7DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc7DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc7DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc7" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule3Disc7InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc7InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc7Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc7Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc7DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc7DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc7DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc7DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc7" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule4Disc7InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc7InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc7Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc7Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc7DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc7DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc7DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc7DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Tubs name="Ring1Disc7" rMin="30.49*mm" rMax="75.5472*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc7" rMin="48.49*mm" rMax="93.4341*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc7" rMin="82.69*mm" rMax="128.417*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc7" rMin="116.03*mm" rMax="161.498*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Disc7" rMin="30.48*mm" rMax="161.508*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="EModule1Disc8" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule1Disc8InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc8InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc8Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc8Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc8DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc8DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc8DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc8DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc8" dx="9.4*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule2Disc8InnerPixelwafer" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc8InnerPixelActive" dx="8.4*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc8Hybrid" dx="8.4*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc8Chip" dx="8.9*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc8DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc8DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc8DeadAreaFront" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc8DeadAreaBack" dx="8.9*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc8" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule3Disc8InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc8InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc8Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc8Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc8DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc8DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc8DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc8DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc8" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule4Disc8InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc8InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc8Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc8Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc8DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc8DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc8DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc8DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Tubs name="Ring1Disc8" rMin="30.49*mm" rMax="75.5472*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc8" rMin="48.49*mm" rMax="93.4341*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc8" rMin="82.69*mm" rMax="128.417*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc8" rMin="116.03*mm" rMax="161.498*mm" dz="2.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Disc8" rMin="30.48*mm" rMax="161.508*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="EModule1Disc9" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule1Disc9InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc9InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc9Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc9Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc9DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc9DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc9DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc9DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc9" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule2Disc9InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc9InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc9Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc9Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc9DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc9DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc9DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc9DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc9" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule3Disc9InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc9InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc9Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc9Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc9DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc9DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc9DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc9DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc9" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule4Disc9InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc9InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc9Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc9Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc9DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc9DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc9DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc9DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc9" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule5Disc9InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc9InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc9Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule5Disc9Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule5Disc9DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc9DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc9DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc9DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Tubs name="Ring1Disc9Full" rMin="62.39*mm" rMax="108.353*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring1Disc9OuterCut" rMin="100.03*mm" rMax="108.363*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc9Full" rMin="100.04*mm" rMax="145.618*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc9InnerCut" rMin="100.03*mm" rMax="108.363*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc9OuterCut" rMin="137.33*mm" rMax="145.628*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc9Full" rMin="137.34*mm" rMax="182.692*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc9InnerCut" rMin="137.33*mm" rMax="145.628*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc9OuterCut" rMin="173.93*mm" rMax="182.702*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc9Full" rMin="173.94*mm" rMax="219.144*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc9InnerCut" rMin="173.93*mm" rMax="182.702*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc9OuterCut" rMin="209.98*mm" rMax="219.154*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring5Disc9Full" rMin="209.99*mm" rMax="255.091*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring5Disc9InnerCut" rMin="209.98*mm" rMax="219.154*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Disc9" rMin="62.38*mm" rMax="255.101*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="EModule1Disc10" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule1Disc10InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc10InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc10Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc10Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc10DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc10DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc10DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc10DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc10" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule2Disc10InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc10InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc10Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc10Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc10DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc10DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc10DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc10DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc10" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule3Disc10InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc10InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc10Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc10Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc10DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc10DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc10DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc10DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc10" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule4Disc10InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc10InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc10Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc10Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc10DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc10DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc10DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc10DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc10" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule5Disc10InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc10InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc10Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule5Disc10Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule5Disc10DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc10DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc10DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc10DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Tubs name="Ring1Disc10Full" rMin="62.39*mm" rMax="108.353*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring1Disc10OuterCut" rMin="100.03*mm" rMax="108.363*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc10Full" rMin="100.04*mm" rMax="145.618*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc10InnerCut" rMin="100.03*mm" rMax="108.363*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc10OuterCut" rMin="137.33*mm" rMax="145.628*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc10Full" rMin="137.34*mm" rMax="182.692*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc10InnerCut" rMin="137.33*mm" rMax="145.628*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc10OuterCut" rMin="173.93*mm" rMax="182.702*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc10Full" rMin="173.94*mm" rMax="219.144*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc10InnerCut" rMin="173.93*mm" rMax="182.702*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc10OuterCut" rMin="209.98*mm" rMax="219.154*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring5Disc10Full" rMin="209.99*mm" rMax="255.091*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring5Disc10InnerCut" rMin="209.98*mm" rMax="219.154*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Disc10" rMin="62.38*mm" rMax="255.101*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="EModule1Disc11" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule1Disc11InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc11InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc11Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc11Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc11DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc11DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc11DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc11DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc11" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule2Disc11InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc11InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc11Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc11Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc11DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc11DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc11DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc11DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc11" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule3Disc11InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc11InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc11Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc11Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc11DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc11DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc11DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc11DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc11" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule4Disc11InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc11InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc11Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc11Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc11DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc11DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc11DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc11DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc11" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule5Disc11InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc11InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc11Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule5Disc11Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule5Disc11DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc11DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc11DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc11DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Tubs name="Ring1Disc11Full" rMin="62.39*mm" rMax="108.353*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring1Disc11OuterCut" rMin="100.03*mm" rMax="108.363*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc11Full" rMin="100.04*mm" rMax="145.618*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc11InnerCut" rMin="100.03*mm" rMax="108.363*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc11OuterCut" rMin="137.33*mm" rMax="145.628*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc11Full" rMin="137.34*mm" rMax="182.692*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc11InnerCut" rMin="137.33*mm" rMax="145.628*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc11OuterCut" rMin="173.93*mm" rMax="182.702*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc11Full" rMin="173.94*mm" rMax="219.144*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc11InnerCut" rMin="173.93*mm" rMax="182.702*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc11OuterCut" rMin="209.98*mm" rMax="219.154*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring5Disc11Full" rMin="209.99*mm" rMax="255.091*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring5Disc11InnerCut" rMin="209.98*mm" rMax="219.154*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Disc11" rMin="62.38*mm" rMax="255.101*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="EModule1Disc12" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule1Disc12InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc12InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc12Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc12Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule1Disc12DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc12DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc12DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule1Disc12DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc12" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule2Disc12InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc12InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc12Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc12Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule2Disc12DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc12DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc12DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule2Disc12DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc12" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule3Disc12InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc12InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc12Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc12Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule3Disc12DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc12DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc12DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule3Disc12DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc12" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule4Disc12InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc12InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc12Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc12Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule4Disc12DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc12DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc12DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule4Disc12DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc12" dx="17.925*mm" dy="22.225*mm" dz="0.575*mm"/>
+<Box name="EModule5Disc12InnerPixelwafer" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc12InnerPixelActive" dx="16.925*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc12Hybrid" dx="16.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule5Disc12Chip" dx="17.925*mm" dy="21.725*mm" dz="0.25*mm"/>
+<Box name="EModule5Disc12DeadAreaRight" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc12DeadAreaLeft" dx="0.25*mm" dy="21.725*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc12DeadAreaFront" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Box name="EModule5Disc12DeadAreaBack" dx="17.425*mm" dy="0.25*mm" dz="0.075*mm"/>
+<Tubs name="Ring1Disc12Full" rMin="62.39*mm" rMax="108.353*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring1Disc12OuterCut" rMin="100.03*mm" rMax="108.363*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc12Full" rMin="100.04*mm" rMax="145.618*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc12InnerCut" rMin="100.03*mm" rMax="108.363*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc12OuterCut" rMin="137.33*mm" rMax="145.628*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc12Full" rMin="137.34*mm" rMax="182.692*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc12InnerCut" rMin="137.33*mm" rMax="145.628*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc12OuterCut" rMin="173.93*mm" rMax="182.702*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc12Full" rMin="173.94*mm" rMax="219.144*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc12InnerCut" rMin="173.93*mm" rMax="182.702*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc12OuterCut" rMin="209.98*mm" rMax="219.154*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring5Disc12Full" rMin="209.99*mm" rMax="255.091*mm" dz="4.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring5Disc12InnerCut" rMin="209.98*mm" rMax="219.154*mm" dz="3.415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Disc12" rMin="62.38*mm" rMax="255.101*mm" dz="6.595*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR176Z1535" rMin="176.882*mm" rMax="178.882*mm" dz="68.6625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR254Z1605" rMin="254.266*mm" rMax="278.413*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR232Z1605" rMin="232.213*mm" rMax="254.266*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR212Z1605" rMin="212.073*mm" rMax="232.213*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR193Z1605" rMin="193.68*mm" rMax="212.073*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR176Z1605" rMin="176.882*mm" rMax="193.68*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR278Z2169" rMin="278.513*mm" rMax="280.513*mm" dz="565.452*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR278Z2736" rMin="278.513*mm" rMax="282.413*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR282Z2745" rMin="282.513*mm" rMax="284.513*mm" dz="10.785*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR176Z355BarrelPart" rMin="176.882*mm" rMax="178.882*mm" dz="2.6275*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR176Z355EndcapsPart" rMin="176.882*mm" rMax="178.882*mm" dz="131.185*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR40Z208" rMin="40.724*mm" rMax="71.795*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR40Z10" rMin="40.724*mm" rMax="42.724*mm" dz="10.7625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR176Z547" rMin="176.882*mm" rMax="178.882*mm" dz="58.26*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR178Z489" rMin="178.982*mm" rMax="180.982*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR176Z629" rMin="176.882*mm" rMax="178.882*mm" dz="22.95*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR178Z606" rMin="178.982*mm" rMax="180.982*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR176Z700" rMin="176.882*mm" rMax="178.882*mm" dz="48.685*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR178Z652" rMin="178.982*mm" rMax="180.982*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR176Z1108" rMin="176.882*mm" rMax="178.882*mm" dz="358.447*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR178Z749" rMin="178.982*mm" rMax="180.982*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR40Z44" rMin="40.724*mm" rMax="42.724*mm" dz="22.325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR40Z88" rMin="40.724*mm" rMax="42.724*mm" dz="22.325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR40Z133" rMin="40.724*mm" rMax="42.724*mm" dz="22.325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR40Z178" rMin="40.724*mm" rMax="42.724*mm" dz="22.325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR40Z203" rMin="40.724*mm" rMax="42.724*mm" dz="2.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR71Z208" rMin="71.895*mm" rMax="115.653*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR71Z10" rMin="71.895*mm" rMax="73.895*mm" dz="10.7625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR71Z44" rMin="71.895*mm" rMax="73.895*mm" dz="22.325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR71Z88" rMin="71.895*mm" rMax="73.895*mm" dz="22.325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR71Z133" rMin="71.895*mm" rMax="73.895*mm" dz="22.325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR71Z178" rMin="71.895*mm" rMax="73.895*mm" dz="22.325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR71Z203" rMin="71.895*mm" rMax="73.895*mm" dz="2.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR115Z208" rMin="115.753*mm" rMax="157.33*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR115Z10" rMin="115.753*mm" rMax="117.753*mm" dz="10.7625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR115Z44" rMin="115.753*mm" rMax="117.753*mm" dz="22.325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR115Z88" rMin="115.753*mm" rMax="117.753*mm" dz="22.325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR115Z133" rMin="115.753*mm" rMax="117.753*mm" dz="22.325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR115Z178" rMin="115.753*mm" rMax="117.753*mm" dz="22.325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR115Z203" rMin="115.753*mm" rMax="117.753*mm" dz="2.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR157Z208" rMin="157.43*mm" rMax="176.782*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR157Z10" rMin="157.43*mm" rMax="159.43*mm" dz="10.7625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR157Z44" rMin="157.43*mm" rMax="159.43*mm" dz="22.325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR157Z88" rMin="157.43*mm" rMax="159.43*mm" dz="22.325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR157Z133" rMin="157.43*mm" rMax="159.43*mm" dz="22.325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR157Z178" rMin="157.43*mm" rMax="159.43*mm" dz="22.325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR157Z203" rMin="157.43*mm" rMax="159.43*mm" dz="2.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR165Z271" rMin="165.982*mm" rMax="167.982*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR163Z258" rMin="163.982*mm" rMax="165.982*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR30Z259" rMin="30.999*mm" rMax="74.822*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR165Z306" rMin="165.982*mm" rMax="167.982*mm" dz="21.8675*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR168Z284" rMin="168.082*mm" rMax="170.082*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR165Z385" rMin="165.982*mm" rMax="167.982*mm" dz="31.6025*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR168Z354" rMin="168.082*mm" rMax="170.082*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR165Z487" rMin="165.982*mm" rMax="167.982*mm" dz="44.0475*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR168Z443" rMin="168.082*mm" rMax="170.082*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR165Z617" rMin="165.982*mm" rMax="167.982*mm" dz="59.9725*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR168Z557" rMin="168.082*mm" rMax="170.082*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR165Z783" rMin="165.982*mm" rMax="167.982*mm" dz="80.3375*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR168Z703" rMin="168.082*mm" rMax="170.082*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR165Z996" rMin="165.982*mm" rMax="167.982*mm" dz="106.382*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR168Z890" rMin="168.082*mm" rMax="170.082*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR165Z1268" rMin="165.982*mm" rMax="167.982*mm" dz="139.702*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR168Z1129" rMin="168.082*mm" rMax="170.082*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR165Z1450" rMin="165.982*mm" rMax="167.982*mm" dz="15.9875*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR168Z1434" rMin="168.082*mm" rMax="170.082*mm" dz="21.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR74Z259" rMin="74.922*mm" rMax="92.73*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR92Z259" rMin="92.83*mm" rMax="127.675*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR127Z259" rMin="127.775*mm" rMax="160.782*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR160Z259" rMin="160.882*mm" rMax="163.882*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR165Z341" rMin="165.982*mm" rMax="167.982*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR163Z328" rMin="163.982*mm" rMax="165.982*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR30Z329" rMin="30.999*mm" rMax="74.822*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR74Z329" rMin="74.922*mm" rMax="92.73*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR92Z329" rMin="92.83*mm" rMax="127.675*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR127Z329" rMin="127.775*mm" rMax="160.782*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR160Z329" rMin="160.882*mm" rMax="163.882*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR165Z430" rMin="165.982*mm" rMax="167.982*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR163Z417" rMin="163.982*mm" rMax="165.982*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR30Z418" rMin="30.999*mm" rMax="74.822*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR74Z418" rMin="74.922*mm" rMax="92.73*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR92Z418" rMin="92.83*mm" rMax="127.675*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR127Z418" rMin="127.775*mm" rMax="160.782*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR160Z418" rMin="160.882*mm" rMax="163.882*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR165Z544" rMin="165.982*mm" rMax="167.982*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR163Z531" rMin="163.982*mm" rMax="165.982*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR30Z532" rMin="30.999*mm" rMax="74.822*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR74Z532" rMin="74.922*mm" rMax="92.73*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR92Z532" rMin="92.83*mm" rMax="127.675*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR127Z532" rMin="127.775*mm" rMax="160.782*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR160Z532" rMin="160.882*mm" rMax="163.882*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR165Z690" rMin="165.982*mm" rMax="167.982*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR163Z677" rMin="163.982*mm" rMax="165.982*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR30Z678" rMin="30.999*mm" rMax="74.822*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR74Z678" rMin="74.922*mm" rMax="92.73*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR92Z678" rMin="92.83*mm" rMax="127.675*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR127Z678" rMin="127.775*mm" rMax="160.782*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR160Z678" rMin="160.882*mm" rMax="163.882*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR165Z877" rMin="165.982*mm" rMax="167.982*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR163Z864" rMin="163.982*mm" rMax="165.982*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR30Z865" rMin="30.999*mm" rMax="74.822*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR74Z865" rMin="74.922*mm" rMax="92.73*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR92Z865" rMin="92.83*mm" rMax="127.675*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR127Z865" rMin="127.775*mm" rMax="160.782*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR160Z865" rMin="160.882*mm" rMax="163.882*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR165Z1116" rMin="165.982*mm" rMax="167.982*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR163Z1103" rMin="163.982*mm" rMax="165.982*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR30Z1104" rMin="30.999*mm" rMax="74.822*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR74Z1104" rMin="74.922*mm" rMax="92.73*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR92Z1104" rMin="92.83*mm" rMax="127.675*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR127Z1104" rMin="127.775*mm" rMax="160.782*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR160Z1104" rMin="160.882*mm" rMax="163.882*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR165Z1421" rMin="165.982*mm" rMax="167.982*mm" dz="12.9125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR163Z1408" rMin="163.982*mm" rMax="165.982*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR30Z1409" rMin="30.999*mm" rMax="74.822*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR74Z1409" rMin="74.922*mm" rMax="92.73*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR92Z1409" rMin="92.83*mm" rMax="127.675*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR127Z1409" rMin="127.775*mm" rMax="160.782*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR160Z1409" rMin="160.882*mm" rMax="163.882*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR259Z1776" rMin="259.613*mm" rMax="261.613*mm" dz="18.1625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR257Z1758" rMin="257.613*mm" rMax="259.613*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR62Z1759" rMin="62.899*mm" rMax="107.588*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR259Z1906" rMin="259.613*mm" rMax="261.613*mm" dz="111.532*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR261Z1795" rMin="261.713*mm" rMax="263.713*mm" dz="25*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR259Z2185" rMin="259.613*mm" rMax="261.613*mm" dz="130.787*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR261Z2054" rMin="261.713*mm" rMax="263.713*mm" dz="25*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR259Z2505" rMin="259.613*mm" rMax="261.613*mm" dz="152.893*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR261Z2352" rMin="261.713*mm" rMax="263.713*mm" dz="25*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR259Z2714" rMin="259.613*mm" rMax="261.613*mm" dz="19.9525*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR261Z2695" rMin="261.713*mm" rMax="263.713*mm" dz="25*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR107Z1759" rMin="107.688*mm" rMax="144.891*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR144Z1759" rMin="144.991*mm" rMax="181.988*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR182Z1759" rMin="182.088*mm" rMax="218.456*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR218Z1759" rMin="218.556*mm" rMax="254.413*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR254Z1759" rMin="254.513*mm" rMax="257.513*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR259Z2036" rMin="259.613*mm" rMax="261.613*mm" dz="18.1625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR257Z2018" rMin="257.613*mm" rMax="259.613*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR62Z2019" rMin="62.899*mm" rMax="107.588*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR107Z2019" rMin="107.688*mm" rMax="144.891*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR144Z2019" rMin="144.991*mm" rMax="181.988*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR182Z2019" rMin="182.088*mm" rMax="218.456*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR218Z2019" rMin="218.556*mm" rMax="254.413*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR254Z2019" rMin="254.513*mm" rMax="257.513*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR259Z2334" rMin="259.613*mm" rMax="261.613*mm" dz="18.1625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR257Z2316" rMin="257.613*mm" rMax="259.613*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR62Z2317" rMin="62.899*mm" rMax="107.588*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR107Z2317" rMin="107.688*mm" rMax="144.891*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR144Z2317" rMin="144.991*mm" rMax="181.988*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR182Z2317" rMin="182.088*mm" rMax="218.456*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR218Z2317" rMin="218.556*mm" rMax="254.413*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR254Z2317" rMin="254.513*mm" rMax="257.513*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR259Z2676" rMin="259.613*mm" rMax="261.613*mm" dz="18.1625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR257Z2658" rMin="257.613*mm" rMax="259.613*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR62Z2659" rMin="62.899*mm" rMax="107.588*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR107Z2659" rMin="107.688*mm" rMax="144.891*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR144Z2659" rMin="144.991*mm" rMax="181.988*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR182Z2659" rMin="182.088*mm" rMax="218.456*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR218Z2659" rMin="218.556*mm" rMax="254.413*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR254Z2659" rMin="254.513*mm" rMax="257.513*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR208Z113" rMin="208.5*mm" rMax="210.5*mm" dz="113.495*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR208Z914" rMin="208.5*mm" rMax="210.5*mm" dz="687.245*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR208Z1602" rMin="208.5*mm" rMax="303.5*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR303Z2169" rMin="303.52*mm" rMax="305.52*mm" dz="565.74*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR172Z916" rMin="172.1*mm" rMax="174.1*mm" dz="689.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR172Z1607" rMin="172.1*mm" rMax="276*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR276Z2170" rMin="276*mm" rMax="278*mm" dz="564.49*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR170Z237" rMin="170.1*mm" rMax="172.1*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR170Z710" rMin="170.1*mm" rMax="172.1*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR170Z910" rMin="170.1*mm" rMax="172.1*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR170Z1160" rMin="170.1*mm" rMax="172.1*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR170Z1600" rMin="170.1*mm" rMax="172.1*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR161Z100" rMin="161.43*mm" rMax="163.43*mm" dz="100.363*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR44Z41" rMin="44.7245*mm" rMax="57.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR75Z41" rMin="75.896*mm" rMax="100.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR119Z41" rMin="119.754*mm" rMax="142.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR44Z216" rMin="44.7245*mm" rMax="57.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR75Z216" rMin="75.896*mm" rMax="100.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR119Z216" rMin="119.754*mm" rMax="142.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<SubtractionSolid name="Ring1Disc9">
+<rSolid name="Ring1Disc9Full"/>
+<rSolid name="Ring1Disc9OuterCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring2Disc9SubtractionIntermediate">
+<rSolid name="Ring2Disc9Full"/>
+<rSolid name="Ring2Disc9InnerCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring2Disc9">
+<rSolid name="Ring2Disc9SubtractionIntermediate"/>
+<rSolid name="Ring2Disc9OuterCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring3Disc9SubtractionIntermediate">
+<rSolid name="Ring3Disc9Full"/>
+<rSolid name="Ring3Disc9InnerCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring3Disc9">
+<rSolid name="Ring3Disc9SubtractionIntermediate"/>
+<rSolid name="Ring3Disc9OuterCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring4Disc9SubtractionIntermediate">
+<rSolid name="Ring4Disc9Full"/>
+<rSolid name="Ring4Disc9InnerCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring4Disc9">
+<rSolid name="Ring4Disc9SubtractionIntermediate"/>
+<rSolid name="Ring4Disc9OuterCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring5Disc9">
+<rSolid name="Ring5Disc9Full"/>
+<rSolid name="Ring5Disc9InnerCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring1Disc10">
+<rSolid name="Ring1Disc10Full"/>
+<rSolid name="Ring1Disc10OuterCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring2Disc10SubtractionIntermediate">
+<rSolid name="Ring2Disc10Full"/>
+<rSolid name="Ring2Disc10InnerCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring2Disc10">
+<rSolid name="Ring2Disc10SubtractionIntermediate"/>
+<rSolid name="Ring2Disc10OuterCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring3Disc10SubtractionIntermediate">
+<rSolid name="Ring3Disc10Full"/>
+<rSolid name="Ring3Disc10InnerCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring3Disc10">
+<rSolid name="Ring3Disc10SubtractionIntermediate"/>
+<rSolid name="Ring3Disc10OuterCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring4Disc10SubtractionIntermediate">
+<rSolid name="Ring4Disc10Full"/>
+<rSolid name="Ring4Disc10InnerCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring4Disc10">
+<rSolid name="Ring4Disc10SubtractionIntermediate"/>
+<rSolid name="Ring4Disc10OuterCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring5Disc10">
+<rSolid name="Ring5Disc10Full"/>
+<rSolid name="Ring5Disc10InnerCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring1Disc11">
+<rSolid name="Ring1Disc11Full"/>
+<rSolid name="Ring1Disc11OuterCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring2Disc11SubtractionIntermediate">
+<rSolid name="Ring2Disc11Full"/>
+<rSolid name="Ring2Disc11InnerCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring2Disc11">
+<rSolid name="Ring2Disc11SubtractionIntermediate"/>
+<rSolid name="Ring2Disc11OuterCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring3Disc11SubtractionIntermediate">
+<rSolid name="Ring3Disc11Full"/>
+<rSolid name="Ring3Disc11InnerCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring3Disc11">
+<rSolid name="Ring3Disc11SubtractionIntermediate"/>
+<rSolid name="Ring3Disc11OuterCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring4Disc11SubtractionIntermediate">
+<rSolid name="Ring4Disc11Full"/>
+<rSolid name="Ring4Disc11InnerCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring4Disc11">
+<rSolid name="Ring4Disc11SubtractionIntermediate"/>
+<rSolid name="Ring4Disc11OuterCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring5Disc11">
+<rSolid name="Ring5Disc11Full"/>
+<rSolid name="Ring5Disc11InnerCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring1Disc12">
+<rSolid name="Ring1Disc12Full"/>
+<rSolid name="Ring1Disc12OuterCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring2Disc12SubtractionIntermediate">
+<rSolid name="Ring2Disc12Full"/>
+<rSolid name="Ring2Disc12InnerCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring2Disc12">
+<rSolid name="Ring2Disc12SubtractionIntermediate"/>
+<rSolid name="Ring2Disc12OuterCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring3Disc12SubtractionIntermediate">
+<rSolid name="Ring3Disc12Full"/>
+<rSolid name="Ring3Disc12InnerCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring3Disc12">
+<rSolid name="Ring3Disc12SubtractionIntermediate"/>
+<rSolid name="Ring3Disc12OuterCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring4Disc12SubtractionIntermediate">
+<rSolid name="Ring4Disc12Full"/>
+<rSolid name="Ring4Disc12InnerCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring4Disc12">
+<rSolid name="Ring4Disc12SubtractionIntermediate"/>
+<rSolid name="Ring4Disc12OuterCut"/>
+</SubtractionSolid>
+<SubtractionSolid name="Ring5Disc12">
+<rSolid name="Ring5Disc12Full"/>
+<rSolid name="Ring5Disc12InnerCut"/>
+</SubtractionSolid>
 </SolidSection>
 <PosPartSection label="pixel.xml">
 <PosPart copyNumber="1">
@@ -7727,34 +7472,34 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule1Layer1"/>
 <rChild name="pixel:BModule1Layer1DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule1Layer1"/>
 <rChild name="pixel:BModule1Layer1DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule1Layer1"/>
 <rChild name="pixel:BModule1Layer1DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule1Layer1"/>
 <rChild name="pixel:BModule1Layer1DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodFlipped1"/>
 <rChild name="pixel:BModule2Layer1"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="44.4*mm"/>
+<Translation x="0*mm" y="0*mm" z="44.75*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodFlipped1"/>
 <rChild name="pixel:BModule2Layer1"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-44.4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-44.75*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer1"/>
@@ -7777,34 +7522,34 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer1"/>
 <rChild name="pixel:BModule2Layer1DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer1"/>
 <rChild name="pixel:BModule2Layer1DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer1"/>
 <rChild name="pixel:BModule2Layer1DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer1"/>
 <rChild name="pixel:BModule2Layer1DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodFlipped1"/>
 <rChild name="pixel:BModule3Layer1"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="89.5*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodFlipped1"/>
 <rChild name="pixel:BModule3Layer1"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="-89.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer1"/>
@@ -7827,34 +7572,34 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer1"/>
 <rChild name="pixel:BModule3Layer1DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer1"/>
 <rChild name="pixel:BModule3Layer1DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer1"/>
 <rChild name="pixel:BModule3Layer1DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer1"/>
 <rChild name="pixel:BModule3Layer1DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodFlipped1"/>
 <rChild name="pixel:BModule4Layer1"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="133.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="134.25*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodFlipped1"/>
 <rChild name="pixel:BModule4Layer1"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-133.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="-134.25*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer1"/>
@@ -7877,34 +7622,34 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer1"/>
 <rChild name="pixel:BModule4Layer1DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer1"/>
 <rChild name="pixel:BModule4Layer1DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer1"/>
 <rChild name="pixel:BModule4Layer1DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer1"/>
 <rChild name="pixel:BModule4Layer1DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodFlipped1"/>
 <rChild name="pixel:BModule5Layer1"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="177.6*mm"/>
+<Translation x="0*mm" y="0*mm" z="179*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodFlipped1"/>
 <rChild name="pixel:BModule5Layer1"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-177.6*mm"/>
+<Translation x="0*mm" y="0*mm" z="-179*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer1"/>
@@ -7927,22 +7672,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer1"/>
 <rChild name="pixel:BModule5Layer1DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer1"/>
 <rChild name="pixel:BModule5Layer1DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer1"/>
 <rChild name="pixel:BModule5Layer1DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer1"/>
 <rChild name="pixel:BModule5Layer1DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodUnflipped1"/>
@@ -7954,49 +7699,49 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rParent name="pixel:RodUnflipped1"/>
 <rChild name="pixel:BModule2Layer1"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="44.4*mm"/>
+<Translation x="0*mm" y="0*mm" z="44.75*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodUnflipped1"/>
 <rChild name="pixel:BModule2Layer1"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-44.4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-44.75*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodUnflipped1"/>
 <rChild name="pixel:BModule3Layer1"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="89.5*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodUnflipped1"/>
 <rChild name="pixel:BModule3Layer1"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="-89.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodUnflipped1"/>
 <rChild name="pixel:BModule4Layer1"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="133.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="134.25*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodUnflipped1"/>
 <rChild name="pixel:BModule4Layer1"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-133.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="-134.25*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodUnflipped1"/>
 <rChild name="pixel:BModule5Layer1"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="177.6*mm"/>
+<Translation x="0*mm" y="0*mm" z="179*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodUnflipped1"/>
 <rChild name="pixel:BModule5Layer1"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-177.6*mm"/>
+<Translation x="0*mm" y="0*mm" z="-179*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
@@ -8029,34 +7774,34 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule1Layer2"/>
 <rChild name="pixel:BModule1Layer2DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule1Layer2"/>
 <rChild name="pixel:BModule1Layer2DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule1Layer2"/>
 <rChild name="pixel:BModule1Layer2DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule1Layer2"/>
 <rChild name="pixel:BModule1Layer2DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodFlipped2"/>
 <rChild name="pixel:BModule2Layer2"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="44.4*mm"/>
+<Translation x="0*mm" y="0*mm" z="44.75*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodFlipped2"/>
 <rChild name="pixel:BModule2Layer2"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-44.4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-44.75*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer2"/>
@@ -8079,34 +7824,34 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer2"/>
 <rChild name="pixel:BModule2Layer2DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer2"/>
 <rChild name="pixel:BModule2Layer2DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer2"/>
 <rChild name="pixel:BModule2Layer2DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer2"/>
 <rChild name="pixel:BModule2Layer2DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodFlipped2"/>
 <rChild name="pixel:BModule3Layer2"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="89.5*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodFlipped2"/>
 <rChild name="pixel:BModule3Layer2"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="-89.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer2"/>
@@ -8129,34 +7874,34 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer2"/>
 <rChild name="pixel:BModule3Layer2DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer2"/>
 <rChild name="pixel:BModule3Layer2DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer2"/>
 <rChild name="pixel:BModule3Layer2DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer2"/>
 <rChild name="pixel:BModule3Layer2DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodFlipped2"/>
 <rChild name="pixel:BModule4Layer2"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="133.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="134.25*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodFlipped2"/>
 <rChild name="pixel:BModule4Layer2"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-133.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="-134.25*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer2"/>
@@ -8179,34 +7924,34 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer2"/>
 <rChild name="pixel:BModule4Layer2DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer2"/>
 <rChild name="pixel:BModule4Layer2DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer2"/>
 <rChild name="pixel:BModule4Layer2DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer2"/>
 <rChild name="pixel:BModule4Layer2DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodFlipped2"/>
 <rChild name="pixel:BModule5Layer2"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="177.6*mm"/>
+<Translation x="0*mm" y="0*mm" z="179*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodFlipped2"/>
 <rChild name="pixel:BModule5Layer2"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-177.6*mm"/>
+<Translation x="0*mm" y="0*mm" z="-179*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer2"/>
@@ -8229,22 +7974,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer2"/>
 <rChild name="pixel:BModule5Layer2DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer2"/>
 <rChild name="pixel:BModule5Layer2DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer2"/>
 <rChild name="pixel:BModule5Layer2DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer2"/>
 <rChild name="pixel:BModule5Layer2DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodUnflipped2"/>
@@ -8256,49 +8001,49 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rParent name="pixel:RodUnflipped2"/>
 <rChild name="pixel:BModule2Layer2"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="44.4*mm"/>
+<Translation x="0*mm" y="0*mm" z="44.75*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodUnflipped2"/>
 <rChild name="pixel:BModule2Layer2"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-44.4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-44.75*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodUnflipped2"/>
 <rChild name="pixel:BModule3Layer2"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="89.5*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodUnflipped2"/>
 <rChild name="pixel:BModule3Layer2"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="-89.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodUnflipped2"/>
 <rChild name="pixel:BModule4Layer2"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="133.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="134.25*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodUnflipped2"/>
 <rChild name="pixel:BModule4Layer2"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-133.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="-134.25*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodUnflipped2"/>
 <rChild name="pixel:BModule5Layer2"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="177.6*mm"/>
+<Translation x="0*mm" y="0*mm" z="179*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodUnflipped2"/>
 <rChild name="pixel:BModule5Layer2"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-177.6*mm"/>
+<Translation x="0*mm" y="0*mm" z="-179*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
@@ -8331,34 +8076,34 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule1Layer3"/>
 <rChild name="pixel:BModule1Layer3DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule1Layer3"/>
 <rChild name="pixel:BModule1Layer3DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule1Layer3"/>
 <rChild name="pixel:BModule1Layer3DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule1Layer3"/>
 <rChild name="pixel:BModule1Layer3DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodFlipped3"/>
 <rChild name="pixel:BModule2Layer3"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="44.4*mm"/>
+<Translation x="0*mm" y="0*mm" z="44.75*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodFlipped3"/>
 <rChild name="pixel:BModule2Layer3"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-44.4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-44.75*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer3"/>
@@ -8381,34 +8126,34 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer3"/>
 <rChild name="pixel:BModule2Layer3DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer3"/>
 <rChild name="pixel:BModule2Layer3DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer3"/>
 <rChild name="pixel:BModule2Layer3DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer3"/>
 <rChild name="pixel:BModule2Layer3DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodFlipped3"/>
 <rChild name="pixel:BModule3Layer3"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="89.5*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodFlipped3"/>
 <rChild name="pixel:BModule3Layer3"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="-89.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer3"/>
@@ -8431,34 +8176,34 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer3"/>
 <rChild name="pixel:BModule3Layer3DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer3"/>
 <rChild name="pixel:BModule3Layer3DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer3"/>
 <rChild name="pixel:BModule3Layer3DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer3"/>
 <rChild name="pixel:BModule3Layer3DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodFlipped3"/>
 <rChild name="pixel:BModule4Layer3"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="133.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="134.25*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodFlipped3"/>
 <rChild name="pixel:BModule4Layer3"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-133.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="-134.25*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer3"/>
@@ -8481,34 +8226,34 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer3"/>
 <rChild name="pixel:BModule4Layer3DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer3"/>
 <rChild name="pixel:BModule4Layer3DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer3"/>
 <rChild name="pixel:BModule4Layer3DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer3"/>
 <rChild name="pixel:BModule4Layer3DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodFlipped3"/>
 <rChild name="pixel:BModule5Layer3"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="177.6*mm"/>
+<Translation x="0*mm" y="0*mm" z="179*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodFlipped3"/>
 <rChild name="pixel:BModule5Layer3"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-177.6*mm"/>
+<Translation x="0*mm" y="0*mm" z="-179*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer3"/>
@@ -8531,22 +8276,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer3"/>
 <rChild name="pixel:BModule5Layer3DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer3"/>
 <rChild name="pixel:BModule5Layer3DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer3"/>
 <rChild name="pixel:BModule5Layer3DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer3"/>
 <rChild name="pixel:BModule5Layer3DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodUnflipped3"/>
@@ -8558,49 +8303,49 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <rParent name="pixel:RodUnflipped3"/>
 <rChild name="pixel:BModule2Layer3"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="44.4*mm"/>
+<Translation x="0*mm" y="0*mm" z="44.75*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodUnflipped3"/>
 <rChild name="pixel:BModule2Layer3"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-44.4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-44.75*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodUnflipped3"/>
 <rChild name="pixel:BModule3Layer3"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="89.5*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodUnflipped3"/>
 <rChild name="pixel:BModule3Layer3"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="-89.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodUnflipped3"/>
 <rChild name="pixel:BModule4Layer3"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="133.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="134.25*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodUnflipped3"/>
 <rChild name="pixel:BModule4Layer3"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-133.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="-134.25*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodUnflipped3"/>
 <rChild name="pixel:BModule5Layer3"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="177.6*mm"/>
+<Translation x="0*mm" y="0*mm" z="179*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodUnflipped3"/>
 <rChild name="pixel:BModule5Layer3"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-177.6*mm"/>
+<Translation x="0*mm" y="0*mm" z="-179*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
@@ -8633,34 +8378,34 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule1Layer4"/>
 <rChild name="pixel:BModule1Layer4DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule1Layer4"/>
 <rChild name="pixel:BModule1Layer4DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule1Layer4"/>
 <rChild name="pixel:BModule1Layer4DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule1Layer4"/>
 <rChild name="pixel:BModule1Layer4DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodFlipped4"/>
 <rChild name="pixel:BModule2Layer4"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="44.4*mm"/>
+<Translation x="0*mm" y="0*mm" z="44.75*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodFlipped4"/>
 <rChild name="pixel:BModule2Layer4"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-44.4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-44.75*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer4"/>
@@ -8683,34 +8428,34 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer4"/>
 <rChild name="pixel:BModule2Layer4DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer4"/>
 <rChild name="pixel:BModule2Layer4DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer4"/>
 <rChild name="pixel:BModule2Layer4DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule2Layer4"/>
 <rChild name="pixel:BModule2Layer4DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodFlipped4"/>
 <rChild name="pixel:BModule3Layer4"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="89.5*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodFlipped4"/>
 <rChild name="pixel:BModule3Layer4"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="-89.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer4"/>
@@ -8733,34 +8478,34 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer4"/>
 <rChild name="pixel:BModule3Layer4DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer4"/>
 <rChild name="pixel:BModule3Layer4DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer4"/>
 <rChild name="pixel:BModule3Layer4DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule3Layer4"/>
 <rChild name="pixel:BModule3Layer4DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodFlipped4"/>
 <rChild name="pixel:BModule4Layer4"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="133.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="134.25*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodFlipped4"/>
 <rChild name="pixel:BModule4Layer4"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-133.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="-134.25*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer4"/>
@@ -8783,34 +8528,34 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer4"/>
 <rChild name="pixel:BModule4Layer4DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer4"/>
 <rChild name="pixel:BModule4Layer4DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer4"/>
 <rChild name="pixel:BModule4Layer4DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule4Layer4"/>
 <rChild name="pixel:BModule4Layer4DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodFlipped4"/>
 <rChild name="pixel:BModule5Layer4"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="177.6*mm"/>
+<Translation x="0*mm" y="0*mm" z="179*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodFlipped4"/>
 <rChild name="pixel:BModule5Layer4"/>
 <rRotation name="pixel:INNERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-177.6*mm"/>
+<Translation x="0*mm" y="0*mm" z="-179*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer4"/>
@@ -8833,76 +8578,76 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer4"/>
 <rChild name="pixel:BModule5Layer4DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer4"/>
 <rChild name="pixel:BModule5Layer4DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer4"/>
 <rChild name="pixel:BModule5Layer4DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:BModule5Layer4"/>
 <rChild name="pixel:BModule5Layer4DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodUnflipped4"/>
 <rChild name="pixel:BModule1Layer4"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="7.10543e-15*mm"/>
+<Translation x="0*mm" y="0*mm" z="1.06581e-14*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodUnflipped4"/>
 <rChild name="pixel:BModule2Layer4"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="44.4*mm"/>
+<Translation x="0*mm" y="0*mm" z="44.75*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodUnflipped4"/>
 <rChild name="pixel:BModule2Layer4"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-44.4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-44.75*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodUnflipped4"/>
 <rChild name="pixel:BModule3Layer4"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="89.5*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodUnflipped4"/>
 <rChild name="pixel:BModule3Layer4"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="-89.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodUnflipped4"/>
 <rChild name="pixel:BModule4Layer4"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="133.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="134.25*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodUnflipped4"/>
 <rChild name="pixel:BModule4Layer4"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-133.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="-134.25*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:RodUnflipped4"/>
 <rChild name="pixel:BModule5Layer4"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="177.6*mm"/>
+<Translation x="0*mm" y="0*mm" z="179*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixel:RodUnflipped4"/>
 <rChild name="pixel:BModule5Layer4"/>
 <rRotation name="pixel:INNERTRACKERRODTOMODULE"/>
-<Translation x="0*mm" y="0*mm" z="-177.6*mm"/>
+<Translation x="0*mm" y="0*mm" z="-179*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
@@ -8929,22 +8674,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc1"/>
 <rChild name="pixel:EModule1Disc1DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc1"/>
 <rChild name="pixel:EModule1Disc1DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc1"/>
 <rChild name="pixel:EModule1Disc1DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc1"/>
 <rChild name="pixel:EModule1Disc1DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc1"/>
@@ -8967,22 +8712,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc1"/>
 <rChild name="pixel:EModule2Disc1DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc1"/>
 <rChild name="pixel:EModule2Disc1DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc1"/>
 <rChild name="pixel:EModule2Disc1DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc1"/>
 <rChild name="pixel:EModule2Disc1DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc1"/>
@@ -9005,22 +8750,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc1"/>
 <rChild name="pixel:EModule3Disc1DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc1"/>
 <rChild name="pixel:EModule3Disc1DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc1"/>
 <rChild name="pixel:EModule3Disc1DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc1"/>
 <rChild name="pixel:EModule3Disc1DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc1"/>
@@ -9043,22 +8788,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc1"/>
 <rChild name="pixel:EModule4Disc1DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc1"/>
 <rChild name="pixel:EModule4Disc1DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc1"/>
 <rChild name="pixel:EModule4Disc1DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc1"/>
 <rChild name="pixel:EModule4Disc1DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc1"/>
@@ -9106,22 +8851,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc2"/>
 <rChild name="pixel:EModule1Disc2DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc2"/>
 <rChild name="pixel:EModule1Disc2DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc2"/>
 <rChild name="pixel:EModule1Disc2DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc2"/>
 <rChild name="pixel:EModule1Disc2DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc2"/>
@@ -9144,22 +8889,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc2"/>
 <rChild name="pixel:EModule2Disc2DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc2"/>
 <rChild name="pixel:EModule2Disc2DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc2"/>
 <rChild name="pixel:EModule2Disc2DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc2"/>
 <rChild name="pixel:EModule2Disc2DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc2"/>
@@ -9182,22 +8927,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc2"/>
 <rChild name="pixel:EModule3Disc2DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc2"/>
 <rChild name="pixel:EModule3Disc2DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc2"/>
 <rChild name="pixel:EModule3Disc2DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc2"/>
 <rChild name="pixel:EModule3Disc2DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc2"/>
@@ -9220,22 +8965,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc2"/>
 <rChild name="pixel:EModule4Disc2DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc2"/>
 <rChild name="pixel:EModule4Disc2DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc2"/>
 <rChild name="pixel:EModule4Disc2DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc2"/>
 <rChild name="pixel:EModule4Disc2DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc2"/>
@@ -9283,22 +9028,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc3"/>
 <rChild name="pixel:EModule1Disc3DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc3"/>
 <rChild name="pixel:EModule1Disc3DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc3"/>
 <rChild name="pixel:EModule1Disc3DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc3"/>
 <rChild name="pixel:EModule1Disc3DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc3"/>
@@ -9321,22 +9066,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc3"/>
 <rChild name="pixel:EModule2Disc3DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc3"/>
 <rChild name="pixel:EModule2Disc3DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc3"/>
 <rChild name="pixel:EModule2Disc3DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc3"/>
 <rChild name="pixel:EModule2Disc3DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc3"/>
@@ -9359,22 +9104,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc3"/>
 <rChild name="pixel:EModule3Disc3DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc3"/>
 <rChild name="pixel:EModule3Disc3DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc3"/>
 <rChild name="pixel:EModule3Disc3DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc3"/>
 <rChild name="pixel:EModule3Disc3DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc3"/>
@@ -9397,22 +9142,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc3"/>
 <rChild name="pixel:EModule4Disc3DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc3"/>
 <rChild name="pixel:EModule4Disc3DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc3"/>
 <rChild name="pixel:EModule4Disc3DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc3"/>
 <rChild name="pixel:EModule4Disc3DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc3"/>
@@ -9460,22 +9205,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc4"/>
 <rChild name="pixel:EModule1Disc4DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc4"/>
 <rChild name="pixel:EModule1Disc4DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc4"/>
 <rChild name="pixel:EModule1Disc4DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc4"/>
 <rChild name="pixel:EModule1Disc4DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc4"/>
@@ -9498,22 +9243,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc4"/>
 <rChild name="pixel:EModule2Disc4DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc4"/>
 <rChild name="pixel:EModule2Disc4DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc4"/>
 <rChild name="pixel:EModule2Disc4DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc4"/>
 <rChild name="pixel:EModule2Disc4DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc4"/>
@@ -9536,22 +9281,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc4"/>
 <rChild name="pixel:EModule3Disc4DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc4"/>
 <rChild name="pixel:EModule3Disc4DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc4"/>
 <rChild name="pixel:EModule3Disc4DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc4"/>
 <rChild name="pixel:EModule3Disc4DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc4"/>
@@ -9574,22 +9319,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc4"/>
 <rChild name="pixel:EModule4Disc4DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc4"/>
 <rChild name="pixel:EModule4Disc4DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc4"/>
 <rChild name="pixel:EModule4Disc4DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc4"/>
 <rChild name="pixel:EModule4Disc4DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc4"/>
@@ -9637,22 +9382,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc5"/>
 <rChild name="pixel:EModule1Disc5DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc5"/>
 <rChild name="pixel:EModule1Disc5DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc5"/>
 <rChild name="pixel:EModule1Disc5DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc5"/>
 <rChild name="pixel:EModule1Disc5DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc5"/>
@@ -9675,22 +9420,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc5"/>
 <rChild name="pixel:EModule2Disc5DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc5"/>
 <rChild name="pixel:EModule2Disc5DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc5"/>
 <rChild name="pixel:EModule2Disc5DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc5"/>
 <rChild name="pixel:EModule2Disc5DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc5"/>
@@ -9713,22 +9458,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc5"/>
 <rChild name="pixel:EModule3Disc5DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc5"/>
 <rChild name="pixel:EModule3Disc5DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc5"/>
 <rChild name="pixel:EModule3Disc5DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc5"/>
 <rChild name="pixel:EModule3Disc5DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc5"/>
@@ -9751,22 +9496,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc5"/>
 <rChild name="pixel:EModule4Disc5DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc5"/>
 <rChild name="pixel:EModule4Disc5DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc5"/>
 <rChild name="pixel:EModule4Disc5DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc5"/>
 <rChild name="pixel:EModule4Disc5DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc5"/>
@@ -9814,22 +9559,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc6"/>
 <rChild name="pixel:EModule1Disc6DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc6"/>
 <rChild name="pixel:EModule1Disc6DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc6"/>
 <rChild name="pixel:EModule1Disc6DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc6"/>
 <rChild name="pixel:EModule1Disc6DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc6"/>
@@ -9852,22 +9597,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc6"/>
 <rChild name="pixel:EModule2Disc6DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc6"/>
 <rChild name="pixel:EModule2Disc6DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc6"/>
 <rChild name="pixel:EModule2Disc6DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc6"/>
 <rChild name="pixel:EModule2Disc6DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc6"/>
@@ -9890,22 +9635,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc6"/>
 <rChild name="pixel:EModule3Disc6DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc6"/>
 <rChild name="pixel:EModule3Disc6DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc6"/>
 <rChild name="pixel:EModule3Disc6DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc6"/>
 <rChild name="pixel:EModule3Disc6DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc6"/>
@@ -9928,22 +9673,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc6"/>
 <rChild name="pixel:EModule4Disc6DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc6"/>
 <rChild name="pixel:EModule4Disc6DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc6"/>
 <rChild name="pixel:EModule4Disc6DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc6"/>
 <rChild name="pixel:EModule4Disc6DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc6"/>
@@ -9991,22 +9736,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc7"/>
 <rChild name="pixel:EModule1Disc7DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc7"/>
 <rChild name="pixel:EModule1Disc7DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc7"/>
 <rChild name="pixel:EModule1Disc7DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc7"/>
 <rChild name="pixel:EModule1Disc7DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc7"/>
@@ -10029,22 +9774,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc7"/>
 <rChild name="pixel:EModule2Disc7DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc7"/>
 <rChild name="pixel:EModule2Disc7DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc7"/>
 <rChild name="pixel:EModule2Disc7DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc7"/>
 <rChild name="pixel:EModule2Disc7DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc7"/>
@@ -10067,22 +9812,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc7"/>
 <rChild name="pixel:EModule3Disc7DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc7"/>
 <rChild name="pixel:EModule3Disc7DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc7"/>
 <rChild name="pixel:EModule3Disc7DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc7"/>
 <rChild name="pixel:EModule3Disc7DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc7"/>
@@ -10105,22 +9850,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc7"/>
 <rChild name="pixel:EModule4Disc7DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc7"/>
 <rChild name="pixel:EModule4Disc7DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc7"/>
 <rChild name="pixel:EModule4Disc7DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc7"/>
 <rChild name="pixel:EModule4Disc7DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc7"/>
@@ -10168,22 +9913,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc8"/>
 <rChild name="pixel:EModule1Disc8DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc8"/>
 <rChild name="pixel:EModule1Disc8DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc8"/>
 <rChild name="pixel:EModule1Disc8DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc8"/>
 <rChild name="pixel:EModule1Disc8DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc8"/>
@@ -10206,22 +9951,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc8"/>
 <rChild name="pixel:EModule2Disc8DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc8"/>
 <rChild name="pixel:EModule2Disc8DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-8.65*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc8"/>
 <rChild name="pixel:EModule2Disc8DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc8"/>
 <rChild name="pixel:EModule2Disc8DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc8"/>
@@ -10244,22 +9989,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc8"/>
 <rChild name="pixel:EModule3Disc8DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc8"/>
 <rChild name="pixel:EModule3Disc8DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc8"/>
 <rChild name="pixel:EModule3Disc8DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc8"/>
 <rChild name="pixel:EModule3Disc8DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc8"/>
@@ -10282,22 +10027,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc8"/>
 <rChild name="pixel:EModule4Disc8DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc8"/>
 <rChild name="pixel:EModule4Disc8DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc8"/>
 <rChild name="pixel:EModule4Disc8DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc8"/>
 <rChild name="pixel:EModule4Disc8DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc8"/>
@@ -10340,27 +10085,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc9"/>
 <rChild name="pixel:EModule1Disc9Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
+<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc9"/>
 <rChild name="pixel:EModule1Disc9DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc9"/>
 <rChild name="pixel:EModule1Disc9DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc9"/>
 <rChild name="pixel:EModule1Disc9DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc9"/>
 <rChild name="pixel:EModule1Disc9DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc9"/>
@@ -10378,27 +10123,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc9"/>
 <rChild name="pixel:EModule2Disc9Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
+<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc9"/>
 <rChild name="pixel:EModule2Disc9DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc9"/>
 <rChild name="pixel:EModule2Disc9DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc9"/>
 <rChild name="pixel:EModule2Disc9DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc9"/>
 <rChild name="pixel:EModule2Disc9DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc9"/>
@@ -10421,22 +10166,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc9"/>
 <rChild name="pixel:EModule3Disc9DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc9"/>
 <rChild name="pixel:EModule3Disc9DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc9"/>
 <rChild name="pixel:EModule3Disc9DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc9"/>
 <rChild name="pixel:EModule3Disc9DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc9"/>
@@ -10459,22 +10204,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc9"/>
 <rChild name="pixel:EModule4Disc9DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc9"/>
 <rChild name="pixel:EModule4Disc9DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc9"/>
 <rChild name="pixel:EModule4Disc9DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc9"/>
 <rChild name="pixel:EModule4Disc9DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc9"/>
@@ -10497,47 +10242,47 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc9"/>
 <rChild name="pixel:EModule5Disc9DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc9"/>
 <rChild name="pixel:EModule5Disc9DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc9"/>
 <rChild name="pixel:EModule5Disc9DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc9"/>
 <rChild name="pixel:EModule5Disc9DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc9"/>
 <rChild name="pixel:Ring1Disc9"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc9"/>
 <rChild name="pixel:Ring2Disc9"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
+<Translation x="0*mm" y="0*mm" z="2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc9"/>
 <rChild name="pixel:Ring3Disc9"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc9"/>
 <rChild name="pixel:Ring4Disc9"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
+<Translation x="0*mm" y="0*mm" z="2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc9"/>
 <rChild name="pixel:Ring5Disc9"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
@@ -10560,27 +10305,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc10"/>
 <rChild name="pixel:EModule1Disc10Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
+<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc10"/>
 <rChild name="pixel:EModule1Disc10DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc10"/>
 <rChild name="pixel:EModule1Disc10DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc10"/>
 <rChild name="pixel:EModule1Disc10DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc10"/>
 <rChild name="pixel:EModule1Disc10DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc10"/>
@@ -10598,27 +10343,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc10"/>
 <rChild name="pixel:EModule2Disc10Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
+<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc10"/>
 <rChild name="pixel:EModule2Disc10DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc10"/>
 <rChild name="pixel:EModule2Disc10DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc10"/>
 <rChild name="pixel:EModule2Disc10DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc10"/>
 <rChild name="pixel:EModule2Disc10DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc10"/>
@@ -10641,22 +10386,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc10"/>
 <rChild name="pixel:EModule3Disc10DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc10"/>
 <rChild name="pixel:EModule3Disc10DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc10"/>
 <rChild name="pixel:EModule3Disc10DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc10"/>
 <rChild name="pixel:EModule3Disc10DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc10"/>
@@ -10679,22 +10424,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc10"/>
 <rChild name="pixel:EModule4Disc10DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc10"/>
 <rChild name="pixel:EModule4Disc10DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc10"/>
 <rChild name="pixel:EModule4Disc10DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc10"/>
 <rChild name="pixel:EModule4Disc10DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc10"/>
@@ -10717,52 +10462,52 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc10"/>
 <rChild name="pixel:EModule5Disc10DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc10"/>
 <rChild name="pixel:EModule5Disc10DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc10"/>
 <rChild name="pixel:EModule5Disc10DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc10"/>
 <rChild name="pixel:EModule5Disc10DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc10"/>
 <rChild name="pixel:Ring1Disc10"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc10"/>
 <rChild name="pixel:Ring2Disc10"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
+<Translation x="0*mm" y="0*mm" z="2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc10"/>
 <rChild name="pixel:Ring3Disc10"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc10"/>
 <rChild name="pixel:Ring4Disc10"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
+<Translation x="0*mm" y="0*mm" z="2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc10"/>
 <rChild name="pixel:Ring5Disc10"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
 <rChild name="pixel:Disc10"/>
-<Translation x="0*mm" y="0*mm" z="1694.43*mm"/>
+<Translation x="0*mm" y="0*mm" z="1718.59*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc11"/>
@@ -10780,27 +10525,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc11"/>
 <rChild name="pixel:EModule1Disc11Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
+<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc11"/>
 <rChild name="pixel:EModule1Disc11DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc11"/>
 <rChild name="pixel:EModule1Disc11DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc11"/>
 <rChild name="pixel:EModule1Disc11DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc11"/>
 <rChild name="pixel:EModule1Disc11DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc11"/>
@@ -10818,27 +10563,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc11"/>
 <rChild name="pixel:EModule2Disc11Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
+<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc11"/>
 <rChild name="pixel:EModule2Disc11DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc11"/>
 <rChild name="pixel:EModule2Disc11DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc11"/>
 <rChild name="pixel:EModule2Disc11DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc11"/>
 <rChild name="pixel:EModule2Disc11DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc11"/>
@@ -10861,22 +10606,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc11"/>
 <rChild name="pixel:EModule3Disc11DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc11"/>
 <rChild name="pixel:EModule3Disc11DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc11"/>
 <rChild name="pixel:EModule3Disc11DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc11"/>
 <rChild name="pixel:EModule3Disc11DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc11"/>
@@ -10899,22 +10644,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc11"/>
 <rChild name="pixel:EModule4Disc11DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc11"/>
 <rChild name="pixel:EModule4Disc11DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc11"/>
 <rChild name="pixel:EModule4Disc11DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc11"/>
 <rChild name="pixel:EModule4Disc11DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc11"/>
@@ -10937,52 +10682,52 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc11"/>
 <rChild name="pixel:EModule5Disc11DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc11"/>
 <rChild name="pixel:EModule5Disc11DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc11"/>
 <rChild name="pixel:EModule5Disc11DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc11"/>
 <rChild name="pixel:EModule5Disc11DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc11"/>
 <rChild name="pixel:Ring1Disc11"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc11"/>
 <rChild name="pixel:Ring2Disc11"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
+<Translation x="0*mm" y="0*mm" z="2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc11"/>
 <rChild name="pixel:Ring3Disc11"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc11"/>
 <rChild name="pixel:Ring4Disc11"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
+<Translation x="0*mm" y="0*mm" z="2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc11"/>
 <rChild name="pixel:Ring5Disc11"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
 <rChild name="pixel:Disc11"/>
-<Translation x="0*mm" y="0*mm" z="1959.83*mm"/>
+<Translation x="0*mm" y="0*mm" z="2016.69*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc12"/>
@@ -11000,27 +10745,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc12"/>
 <rChild name="pixel:EModule1Disc12Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
+<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc12"/>
 <rChild name="pixel:EModule1Disc12DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc12"/>
 <rChild name="pixel:EModule1Disc12DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc12"/>
 <rChild name="pixel:EModule1Disc12DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule1Disc12"/>
 <rChild name="pixel:EModule1Disc12DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc12"/>
@@ -11038,27 +10783,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc12"/>
 <rChild name="pixel:EModule2Disc12Chip"/>
-<Translation x="0.5*mm" y="0*mm" z="-0.325*mm"/>
+<Translation x="0*mm" y="0*mm" z="-0.325*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc12"/>
 <rChild name="pixel:EModule2Disc12DeadAreaRight"/>
-<Translation x="8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc12"/>
 <rChild name="pixel:EModule2Disc12DeadAreaLeft"/>
-<Translation x="-8.45*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc12"/>
 <rChild name="pixel:EModule2Disc12DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule2Disc12"/>
 <rChild name="pixel:EModule2Disc12DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc12"/>
@@ -11081,22 +10826,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc12"/>
 <rChild name="pixel:EModule3Disc12DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc12"/>
 <rChild name="pixel:EModule3Disc12DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc12"/>
 <rChild name="pixel:EModule3Disc12DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule3Disc12"/>
 <rChild name="pixel:EModule3Disc12DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc12"/>
@@ -11119,22 +10864,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc12"/>
 <rChild name="pixel:EModule4Disc12DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc12"/>
 <rChild name="pixel:EModule4Disc12DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc12"/>
 <rChild name="pixel:EModule4Disc12DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule4Disc12"/>
 <rChild name="pixel:EModule4Disc12DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc12"/>
@@ -11157,108 +10902,108 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc12"/>
 <rChild name="pixel:EModule5Disc12DeadAreaRight"/>
-<Translation x="16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc12"/>
 <rChild name="pixel:EModule5Disc12DeadAreaLeft"/>
-<Translation x="-16.75*mm" y="0*mm" z="0*mm"/>
+<Translation x="-17.175*mm" y="0*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc12"/>
 <rChild name="pixel:EModule5Disc12DeadAreaFront"/>
-<Translation x="0*mm" y="22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:EModule5Disc12"/>
 <rChild name="pixel:EModule5Disc12DeadAreaBack"/>
-<Translation x="0*mm" y="-22.145*mm" z="0*mm"/>
+<Translation x="0*mm" y="-21.975*mm" z="0*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc12"/>
 <rChild name="pixel:Ring1Disc12"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc12"/>
 <rChild name="pixel:Ring2Disc12"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
+<Translation x="0*mm" y="0*mm" z="2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc12"/>
 <rChild name="pixel:Ring3Disc12"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc12"/>
 <rChild name="pixel:Ring4Disc12"/>
-<Translation x="0*mm" y="0*mm" z="4*mm"/>
+<Translation x="0*mm" y="0*mm" z="2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixel:Disc12"/>
 <rChild name="pixel:Ring5Disc12"/>
-<Translation x="0*mm" y="0*mm" z="-4*mm"/>
+<Translation x="0*mm" y="0*mm" z="-2*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
 <rChild name="pixel:Disc12"/>
-<Translation x="0*mm" y="0*mm" z="2259*mm"/>
+<Translation x="0*mm" y="0*mm" z="2359*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR176Z1425"/>
-<Translation x="0*mm" y="0*mm" z="1134.49*mm"/>
+<rChild name="pixel:serviceR176Z1535"/>
+<Translation x="0*mm" y="0*mm" z="1244.24*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR248Z1609"/>
-<Translation x="0*mm" y="0*mm" z="1318*mm"/>
+<rChild name="pixel:serviceR254Z1605"/>
+<Translation x="0*mm" y="0*mm" z="1314*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR228Z1609"/>
-<Translation x="0*mm" y="0*mm" z="1318*mm"/>
+<rChild name="pixel:serviceR232Z1605"/>
+<Translation x="0*mm" y="0*mm" z="1314*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR209Z1609"/>
-<Translation x="0*mm" y="0*mm" z="1318*mm"/>
+<rChild name="pixel:serviceR212Z1605"/>
+<Translation x="0*mm" y="0*mm" z="1314*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR192Z1609"/>
-<Translation x="0*mm" y="0*mm" z="1318*mm"/>
+<rChild name="pixel:serviceR193Z1605"/>
+<Translation x="0*mm" y="0*mm" z="1314*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR176Z1609"/>
-<Translation x="0*mm" y="0*mm" z="1318*mm"/>
+<rChild name="pixel:serviceR176Z1605"/>
+<Translation x="0*mm" y="0*mm" z="1314*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR270Z2087"/>
-<Translation x="0*mm" y="0*mm" z="1796.24*mm"/>
+<rChild name="pixel:serviceR278Z2169"/>
+<Translation x="0*mm" y="0*mm" z="1878.45*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR270Z2567"/>
-<Translation x="0*mm" y="0*mm" z="2276.57*mm"/>
+<rChild name="pixel:serviceR278Z2736"/>
+<Translation x="0*mm" y="0*mm" z="2445.01*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR277Z2580"/>
-<Translation x="0*mm" y="0*mm" z="2289.74*mm"/>
+<rChild name="pixel:serviceR282Z2745"/>
+<Translation x="0*mm" y="0*mm" z="2454.79*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
 <rChild name="pixel:serviceR176Z355BarrelPart"/>
-<Translation x="0*mm" y="0*mm" z="223.85*mm"/>
+<Translation x="0*mm" y="0*mm" z="224.362*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
 <rChild name="pixel:serviceR176Z355BarrelPart"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-223.85*mm"/>
+<Translation x="0*mm" y="0*mm" z="-224.362*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
@@ -11267,25 +11012,25 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z207"/>
-<Translation x="0*mm" y="0*mm" z="207.8*mm"/>
+<rChild name="pixel:serviceR40Z208"/>
+<Translation x="0*mm" y="0*mm" z="208.825*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z207"/>
+<rChild name="pixel:serviceR40Z208"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-207.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="-208.825*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z11"/>
-<Translation x="0*mm" y="0*mm" z="11.05*mm"/>
+<rChild name="pixel:serviceR40Z10"/>
+<Translation x="0*mm" y="0*mm" z="10.8625*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z11"/>
+<rChild name="pixel:serviceR40Z10"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-11.05*mm"/>
+<Translation x="0*mm" y="0*mm" z="-10.8625*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
@@ -11319,8 +11064,8 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR176Z1083"/>
-<Translation x="0*mm" y="0*mm" z="792.028*mm"/>
+<rChild name="pixel:serviceR176Z1108"/>
+<Translation x="0*mm" y="0*mm" z="817.028*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
@@ -11329,289 +11074,289 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z44"/>
-<Translation x="0*mm" y="0*mm" z="44.25*mm"/>
+<rChild name="pixel:serviceR40Z44"/>
+<Translation x="0*mm" y="0*mm" z="44.05*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z44"/>
+<rChild name="pixel:serviceR40Z44"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-44.25*mm"/>
+<Translation x="0*mm" y="0*mm" z="-44.05*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z88"/>
-<Translation x="0*mm" y="0*mm" z="88.65*mm"/>
+<rChild name="pixel:serviceR40Z88"/>
+<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z88"/>
+<rChild name="pixel:serviceR40Z88"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-88.65*mm"/>
+<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z133"/>
-<Translation x="0*mm" y="0*mm" z="133.05*mm"/>
+<rChild name="pixel:serviceR40Z133"/>
+<Translation x="0*mm" y="0*mm" z="133.55*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z133"/>
+<rChild name="pixel:serviceR40Z133"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-133.05*mm"/>
+<Translation x="0*mm" y="0*mm" z="-133.55*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z177"/>
-<Translation x="0*mm" y="0*mm" z="177.45*mm"/>
+<rChild name="pixel:serviceR40Z178"/>
+<Translation x="0*mm" y="0*mm" z="178.3*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z177"/>
+<rChild name="pixel:serviceR40Z178"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-177.45*mm"/>
+<Translation x="0*mm" y="0*mm" z="-178.3*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z202"/>
-<Translation x="0*mm" y="0*mm" z="202.2*mm"/>
+<rChild name="pixel:serviceR40Z203"/>
+<Translation x="0*mm" y="0*mm" z="203.225*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR34Z202"/>
+<rChild name="pixel:serviceR40Z203"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-202.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="-203.225*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z207"/>
-<Translation x="0*mm" y="0*mm" z="207.8*mm"/>
+<rChild name="pixel:serviceR71Z208"/>
+<Translation x="0*mm" y="0*mm" z="208.825*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z207"/>
+<rChild name="pixel:serviceR71Z208"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-207.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="-208.825*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z11"/>
-<Translation x="0*mm" y="0*mm" z="11.05*mm"/>
+<rChild name="pixel:serviceR71Z10"/>
+<Translation x="0*mm" y="0*mm" z="10.8625*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z11"/>
+<rChild name="pixel:serviceR71Z10"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-11.05*mm"/>
+<Translation x="0*mm" y="0*mm" z="-10.8625*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z44"/>
-<Translation x="0*mm" y="0*mm" z="44.25*mm"/>
+<rChild name="pixel:serviceR71Z44"/>
+<Translation x="0*mm" y="0*mm" z="44.05*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z44"/>
+<rChild name="pixel:serviceR71Z44"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-44.25*mm"/>
+<Translation x="0*mm" y="0*mm" z="-44.05*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z88"/>
-<Translation x="0*mm" y="0*mm" z="88.65*mm"/>
+<rChild name="pixel:serviceR71Z88"/>
+<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z88"/>
+<rChild name="pixel:serviceR71Z88"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-88.65*mm"/>
+<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z133"/>
-<Translation x="0*mm" y="0*mm" z="133.05*mm"/>
+<rChild name="pixel:serviceR71Z133"/>
+<Translation x="0*mm" y="0*mm" z="133.55*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z133"/>
+<rChild name="pixel:serviceR71Z133"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-133.05*mm"/>
+<Translation x="0*mm" y="0*mm" z="-133.55*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z177"/>
-<Translation x="0*mm" y="0*mm" z="177.45*mm"/>
+<rChild name="pixel:serviceR71Z178"/>
+<Translation x="0*mm" y="0*mm" z="178.3*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z177"/>
+<rChild name="pixel:serviceR71Z178"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-177.45*mm"/>
+<Translation x="0*mm" y="0*mm" z="-178.3*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z202"/>
-<Translation x="0*mm" y="0*mm" z="202.2*mm"/>
+<rChild name="pixel:serviceR71Z203"/>
+<Translation x="0*mm" y="0*mm" z="203.225*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR64Z202"/>
+<rChild name="pixel:serviceR71Z203"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-202.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="-203.225*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z207"/>
-<Translation x="0*mm" y="0*mm" z="207.8*mm"/>
+<rChild name="pixel:serviceR115Z208"/>
+<Translation x="0*mm" y="0*mm" z="208.825*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z207"/>
+<rChild name="pixel:serviceR115Z208"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-207.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="-208.825*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z11"/>
-<Translation x="0*mm" y="0*mm" z="11.05*mm"/>
+<rChild name="pixel:serviceR115Z10"/>
+<Translation x="0*mm" y="0*mm" z="10.8625*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z11"/>
+<rChild name="pixel:serviceR115Z10"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-11.05*mm"/>
+<Translation x="0*mm" y="0*mm" z="-10.8625*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z44"/>
-<Translation x="0*mm" y="0*mm" z="44.25*mm"/>
+<rChild name="pixel:serviceR115Z44"/>
+<Translation x="0*mm" y="0*mm" z="44.05*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z44"/>
+<rChild name="pixel:serviceR115Z44"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-44.25*mm"/>
+<Translation x="0*mm" y="0*mm" z="-44.05*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z88"/>
-<Translation x="0*mm" y="0*mm" z="88.65*mm"/>
+<rChild name="pixel:serviceR115Z88"/>
+<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z88"/>
+<rChild name="pixel:serviceR115Z88"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-88.65*mm"/>
+<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z133"/>
-<Translation x="0*mm" y="0*mm" z="133.05*mm"/>
+<rChild name="pixel:serviceR115Z133"/>
+<Translation x="0*mm" y="0*mm" z="133.55*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z133"/>
+<rChild name="pixel:serviceR115Z133"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-133.05*mm"/>
+<Translation x="0*mm" y="0*mm" z="-133.55*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z177"/>
-<Translation x="0*mm" y="0*mm" z="177.45*mm"/>
+<rChild name="pixel:serviceR115Z178"/>
+<Translation x="0*mm" y="0*mm" z="178.3*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z177"/>
+<rChild name="pixel:serviceR115Z178"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-177.45*mm"/>
+<Translation x="0*mm" y="0*mm" z="-178.3*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z202"/>
-<Translation x="0*mm" y="0*mm" z="202.2*mm"/>
+<rChild name="pixel:serviceR115Z203"/>
+<Translation x="0*mm" y="0*mm" z="203.225*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR105Z202"/>
+<rChild name="pixel:serviceR115Z203"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-202.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="-203.225*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z207"/>
-<Translation x="0*mm" y="0*mm" z="207.8*mm"/>
+<rChild name="pixel:serviceR157Z208"/>
+<Translation x="0*mm" y="0*mm" z="208.825*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z207"/>
+<rChild name="pixel:serviceR157Z208"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-207.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="-208.825*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z11"/>
-<Translation x="0*mm" y="0*mm" z="11.05*mm"/>
+<rChild name="pixel:serviceR157Z10"/>
+<Translation x="0*mm" y="0*mm" z="10.8625*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z11"/>
+<rChild name="pixel:serviceR157Z10"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-11.05*mm"/>
+<Translation x="0*mm" y="0*mm" z="-10.8625*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z44"/>
-<Translation x="0*mm" y="0*mm" z="44.25*mm"/>
+<rChild name="pixel:serviceR157Z44"/>
+<Translation x="0*mm" y="0*mm" z="44.05*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z44"/>
+<rChild name="pixel:serviceR157Z44"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-44.25*mm"/>
+<Translation x="0*mm" y="0*mm" z="-44.05*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z88"/>
-<Translation x="0*mm" y="0*mm" z="88.65*mm"/>
+<rChild name="pixel:serviceR157Z88"/>
+<Translation x="0*mm" y="0*mm" z="88.8*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z88"/>
+<rChild name="pixel:serviceR157Z88"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-88.65*mm"/>
+<Translation x="0*mm" y="0*mm" z="-88.8*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z133"/>
-<Translation x="0*mm" y="0*mm" z="133.05*mm"/>
+<rChild name="pixel:serviceR157Z133"/>
+<Translation x="0*mm" y="0*mm" z="133.55*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z133"/>
+<rChild name="pixel:serviceR157Z133"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-133.05*mm"/>
+<Translation x="0*mm" y="0*mm" z="-133.55*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z177"/>
-<Translation x="0*mm" y="0*mm" z="177.45*mm"/>
+<rChild name="pixel:serviceR157Z178"/>
+<Translation x="0*mm" y="0*mm" z="178.3*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z177"/>
+<rChild name="pixel:serviceR157Z178"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-177.45*mm"/>
+<Translation x="0*mm" y="0*mm" z="-178.3*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z202"/>
-<Translation x="0*mm" y="0*mm" z="202.2*mm"/>
+<rChild name="pixel:serviceR157Z203"/>
+<Translation x="0*mm" y="0*mm" z="203.225*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:serviceR145Z202"/>
+<rChild name="pixel:serviceR157Z203"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-202.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="-203.225*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
@@ -11620,7 +11365,12 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR28Z259"/>
+<rChild name="pixel:serviceR163Z258"/>
+<Translation x="0*mm" y="0*mm" z="-32.425*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixfwd:Phase2PixelEndcap"/>
+<rChild name="pixel:serviceR30Z259"/>
 <Translation x="0*mm" y="0*mm" z="-31.425*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
@@ -11695,27 +11445,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR176Z1521"/>
-<Translation x="0*mm" y="0*mm" z="1230.2*mm"/>
+<rChild name="pixel:serviceR165Z1450"/>
+<Translation x="0*mm" y="0*mm" z="1159.49*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR178Z1434"/>
+<rChild name="pixel:serviceR168Z1434"/>
 <Translation x="0*mm" y="0*mm" z="1143.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR73Z259"/>
+<rChild name="pixel:serviceR74Z259"/>
 <Translation x="0*mm" y="0*mm" z="-31.425*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR93Z259"/>
+<rChild name="pixel:serviceR92Z259"/>
 <Translation x="0*mm" y="0*mm" z="-31.425*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR128Z259"/>
+<rChild name="pixel:serviceR127Z259"/>
 <Translation x="0*mm" y="0*mm" z="-31.425*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
@@ -11730,22 +11480,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR28Z329"/>
+<rChild name="pixel:serviceR163Z328"/>
+<Translation x="0*mm" y="0*mm" z="37.335*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixfwd:Phase2PixelEndcap"/>
+<rChild name="pixel:serviceR30Z329"/>
 <Translation x="0*mm" y="0*mm" z="38.335*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR73Z329"/>
+<rChild name="pixel:serviceR74Z329"/>
 <Translation x="0*mm" y="0*mm" z="38.335*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR93Z329"/>
+<rChild name="pixel:serviceR92Z329"/>
 <Translation x="0*mm" y="0*mm" z="38.335*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR128Z329"/>
+<rChild name="pixel:serviceR127Z329"/>
 <Translation x="0*mm" y="0*mm" z="38.335*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
@@ -11760,22 +11515,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR28Z418"/>
+<rChild name="pixel:serviceR163Z417"/>
+<Translation x="0*mm" y="0*mm" z="126.565*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixfwd:Phase2PixelEndcap"/>
+<rChild name="pixel:serviceR30Z418"/>
 <Translation x="0*mm" y="0*mm" z="127.565*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR73Z418"/>
+<rChild name="pixel:serviceR74Z418"/>
 <Translation x="0*mm" y="0*mm" z="127.565*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR93Z418"/>
+<rChild name="pixel:serviceR92Z418"/>
 <Translation x="0*mm" y="0*mm" z="127.565*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR128Z418"/>
+<rChild name="pixel:serviceR127Z418"/>
 <Translation x="0*mm" y="0*mm" z="127.565*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
@@ -11790,22 +11550,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR28Z532"/>
+<rChild name="pixel:serviceR163Z531"/>
+<Translation x="0*mm" y="0*mm" z="240.685*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixfwd:Phase2PixelEndcap"/>
+<rChild name="pixel:serviceR30Z532"/>
 <Translation x="0*mm" y="0*mm" z="241.685*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR73Z532"/>
+<rChild name="pixel:serviceR74Z532"/>
 <Translation x="0*mm" y="0*mm" z="241.685*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR93Z532"/>
+<rChild name="pixel:serviceR92Z532"/>
 <Translation x="0*mm" y="0*mm" z="241.685*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR128Z532"/>
+<rChild name="pixel:serviceR127Z532"/>
 <Translation x="0*mm" y="0*mm" z="241.685*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
@@ -11820,22 +11585,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR28Z678"/>
+<rChild name="pixel:serviceR163Z677"/>
+<Translation x="0*mm" y="0*mm" z="386.655*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixfwd:Phase2PixelEndcap"/>
+<rChild name="pixel:serviceR30Z678"/>
 <Translation x="0*mm" y="0*mm" z="387.655*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR73Z678"/>
+<rChild name="pixel:serviceR74Z678"/>
 <Translation x="0*mm" y="0*mm" z="387.655*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR93Z678"/>
+<rChild name="pixel:serviceR92Z678"/>
 <Translation x="0*mm" y="0*mm" z="387.655*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR128Z678"/>
+<rChild name="pixel:serviceR127Z678"/>
 <Translation x="0*mm" y="0*mm" z="387.655*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
@@ -11850,22 +11620,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR28Z865"/>
+<rChild name="pixel:serviceR163Z864"/>
+<Translation x="0*mm" y="0*mm" z="573.355*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixfwd:Phase2PixelEndcap"/>
+<rChild name="pixel:serviceR30Z865"/>
 <Translation x="0*mm" y="0*mm" z="574.355*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR73Z865"/>
+<rChild name="pixel:serviceR74Z865"/>
 <Translation x="0*mm" y="0*mm" z="574.355*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR93Z865"/>
+<rChild name="pixel:serviceR92Z865"/>
 <Translation x="0*mm" y="0*mm" z="574.355*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR128Z865"/>
+<rChild name="pixel:serviceR127Z865"/>
 <Translation x="0*mm" y="0*mm" z="574.355*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
@@ -11880,22 +11655,27 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR28Z1104"/>
+<rChild name="pixel:serviceR163Z1103"/>
+<Translation x="0*mm" y="0*mm" z="812.145*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixfwd:Phase2PixelEndcap"/>
+<rChild name="pixel:serviceR30Z1104"/>
 <Translation x="0*mm" y="0*mm" z="813.145*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR73Z1104"/>
+<rChild name="pixel:serviceR74Z1104"/>
 <Translation x="0*mm" y="0*mm" z="813.145*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR93Z1104"/>
+<rChild name="pixel:serviceR92Z1104"/>
 <Translation x="0*mm" y="0*mm" z="813.145*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR128Z1104"/>
+<rChild name="pixel:serviceR127Z1104"/>
 <Translation x="0*mm" y="0*mm" z="813.145*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
@@ -11905,27 +11685,32 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR165Z1412"/>
-<Translation x="0*mm" y="0*mm" z="1121.53*mm"/>
+<rChild name="pixel:serviceR165Z1421"/>
+<Translation x="0*mm" y="0*mm" z="1130.49*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixfwd:Phase2PixelEndcap"/>
+<rChild name="pixel:serviceR163Z1408"/>
+<Translation x="0*mm" y="0*mm" z="1117.58*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR28Z1409"/>
+<rChild name="pixel:serviceR30Z1409"/>
 <Translation x="0*mm" y="0*mm" z="1118.58*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR73Z1409"/>
+<rChild name="pixel:serviceR74Z1409"/>
 <Translation x="0*mm" y="0*mm" z="1118.58*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR93Z1409"/>
+<rChild name="pixel:serviceR92Z1409"/>
 <Translation x="0*mm" y="0*mm" z="1118.58*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR128Z1409"/>
+<rChild name="pixel:serviceR127Z1409"/>
 <Translation x="0*mm" y="0*mm" z="1118.58*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
@@ -11940,13 +11725,18 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR63Z1759"/>
+<rChild name="pixel:serviceR257Z1758"/>
+<Translation x="0*mm" y="0*mm" z="1467.58*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixfwd:Phase2PixelEndcap"/>
+<rChild name="pixel:serviceR62Z1759"/>
 <Translation x="0*mm" y="0*mm" z="1468.58*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR259Z1894"/>
-<Translation x="0*mm" y="0*mm" z="1603.45*mm"/>
+<rChild name="pixel:serviceR259Z1906"/>
+<Translation x="0*mm" y="0*mm" z="1615.53*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
@@ -11955,52 +11745,52 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR259Z2144"/>
-<Translation x="0*mm" y="0*mm" z="1853.87*mm"/>
+<rChild name="pixel:serviceR259Z2185"/>
+<Translation x="0*mm" y="0*mm" z="1894.38*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR261Z2030"/>
-<Translation x="0*mm" y="0*mm" z="1739.43*mm"/>
+<rChild name="pixel:serviceR261Z2054"/>
+<Translation x="0*mm" y="0*mm" z="1763.59*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR259Z2427"/>
-<Translation x="0*mm" y="0*mm" z="2136.15*mm"/>
+<rChild name="pixel:serviceR259Z2505"/>
+<Translation x="0*mm" y="0*mm" z="2214.58*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR261Z2295"/>
-<Translation x="0*mm" y="0*mm" z="2004.83*mm"/>
+<rChild name="pixel:serviceR261Z2352"/>
+<Translation x="0*mm" y="0*mm" z="2061.69*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR277Z2625"/>
-<Translation x="0*mm" y="0*mm" z="2334.79*mm"/>
+<rChild name="pixel:serviceR259Z2714"/>
+<Translation x="0*mm" y="0*mm" z="2423.95*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR279Z2595"/>
-<Translation x="0*mm" y="0*mm" z="2304*mm"/>
+<rChild name="pixel:serviceR261Z2695"/>
+<Translation x="0*mm" y="0*mm" z="2404*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR108Z1759"/>
+<rChild name="pixel:serviceR107Z1759"/>
 <Translation x="0*mm" y="0*mm" z="1468.58*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR149Z1759"/>
+<rChild name="pixel:serviceR144Z1759"/>
 <Translation x="0*mm" y="0*mm" z="1468.58*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR189Z1759"/>
+<rChild name="pixel:serviceR182Z1759"/>
 <Translation x="0*mm" y="0*mm" z="1468.58*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR232Z1759"/>
+<rChild name="pixel:serviceR218Z1759"/>
 <Translation x="0*mm" y="0*mm" z="1468.58*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
@@ -12010,215 +11800,271 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR259Z2012"/>
-<Translation x="0*mm" y="0*mm" z="1721.17*mm"/>
+<rChild name="pixel:serviceR259Z2036"/>
+<Translation x="0*mm" y="0*mm" z="1745.33*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixfwd:Phase2PixelEndcap"/>
+<rChild name="pixel:serviceR257Z2018"/>
+<Translation x="0*mm" y="0*mm" z="1727.16*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixfwd:Phase2PixelEndcap"/>
+<rChild name="pixel:serviceR62Z2019"/>
+<Translation x="0*mm" y="0*mm" z="1728.16*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixfwd:Phase2PixelEndcap"/>
+<rChild name="pixel:serviceR107Z2019"/>
+<Translation x="0*mm" y="0*mm" z="1728.16*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR63Z1995"/>
-<Translation x="0*mm" y="0*mm" z="1704.01*mm"/>
+<rChild name="pixel:serviceR144Z2019"/>
+<Translation x="0*mm" y="0*mm" z="1728.16*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR108Z1995"/>
-<Translation x="0*mm" y="0*mm" z="1704.01*mm"/>
+<rChild name="pixel:serviceR182Z2019"/>
+<Translation x="0*mm" y="0*mm" z="1728.16*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR149Z1995"/>
-<Translation x="0*mm" y="0*mm" z="1704.01*mm"/>
+<rChild name="pixel:serviceR218Z2019"/>
+<Translation x="0*mm" y="0*mm" z="1728.16*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR189Z1995"/>
-<Translation x="0*mm" y="0*mm" z="1704.01*mm"/>
+<rChild name="pixel:serviceR254Z2019"/>
+<Translation x="0*mm" y="0*mm" z="1728.16*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR232Z1995"/>
-<Translation x="0*mm" y="0*mm" z="1704.01*mm"/>
+<rChild name="pixel:serviceR259Z2334"/>
+<Translation x="0*mm" y="0*mm" z="2043.43*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR254Z1995"/>
-<Translation x="0*mm" y="0*mm" z="1704.01*mm"/>
+<rChild name="pixel:serviceR257Z2316"/>
+<Translation x="0*mm" y="0*mm" z="2025.26*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR259Z2277"/>
-<Translation x="0*mm" y="0*mm" z="1986.57*mm"/>
+<rChild name="pixel:serviceR62Z2317"/>
+<Translation x="0*mm" y="0*mm" z="2026.26*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR63Z2260"/>
-<Translation x="0*mm" y="0*mm" z="1969.4*mm"/>
+<rChild name="pixel:serviceR107Z2317"/>
+<Translation x="0*mm" y="0*mm" z="2026.26*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR108Z2260"/>
-<Translation x="0*mm" y="0*mm" z="1969.4*mm"/>
+<rChild name="pixel:serviceR144Z2317"/>
+<Translation x="0*mm" y="0*mm" z="2026.26*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR149Z2260"/>
-<Translation x="0*mm" y="0*mm" z="1969.4*mm"/>
+<rChild name="pixel:serviceR182Z2317"/>
+<Translation x="0*mm" y="0*mm" z="2026.26*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR189Z2260"/>
-<Translation x="0*mm" y="0*mm" z="1969.4*mm"/>
+<rChild name="pixel:serviceR218Z2317"/>
+<Translation x="0*mm" y="0*mm" z="2026.26*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR232Z2260"/>
-<Translation x="0*mm" y="0*mm" z="1969.4*mm"/>
+<rChild name="pixel:serviceR254Z2317"/>
+<Translation x="0*mm" y="0*mm" z="2026.26*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR254Z2260"/>
-<Translation x="0*mm" y="0*mm" z="1969.4*mm"/>
+<rChild name="pixel:serviceR259Z2676"/>
+<Translation x="0*mm" y="0*mm" z="2385.74*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR259Z2562"/>
-<Translation x="0*mm" y="0*mm" z="2271.52*mm"/>
+<rChild name="pixel:serviceR257Z2658"/>
+<Translation x="0*mm" y="0*mm" z="2367.57*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR63Z2559"/>
-<Translation x="0*mm" y="0*mm" z="2268.57*mm"/>
+<rChild name="pixel:serviceR62Z2659"/>
+<Translation x="0*mm" y="0*mm" z="2368.57*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR108Z2559"/>
-<Translation x="0*mm" y="0*mm" z="2268.57*mm"/>
+<rChild name="pixel:serviceR107Z2659"/>
+<Translation x="0*mm" y="0*mm" z="2368.57*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR149Z2559"/>
-<Translation x="0*mm" y="0*mm" z="2268.57*mm"/>
+<rChild name="pixel:serviceR144Z2659"/>
+<Translation x="0*mm" y="0*mm" z="2368.57*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR189Z2559"/>
-<Translation x="0*mm" y="0*mm" z="2268.57*mm"/>
+<rChild name="pixel:serviceR182Z2659"/>
+<Translation x="0*mm" y="0*mm" z="2368.57*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR232Z2559"/>
-<Translation x="0*mm" y="0*mm" z="2268.57*mm"/>
+<rChild name="pixel:serviceR218Z2659"/>
+<Translation x="0*mm" y="0*mm" z="2368.57*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:serviceR254Z2559"/>
-<Translation x="0*mm" y="0*mm" z="2268.57*mm"/>
+<rChild name="pixel:serviceR254Z2659"/>
+<Translation x="0*mm" y="0*mm" z="2368.57*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR188Z113"/>
+<rChild name="pixel:supportR208Z113"/>
 <Translation x="0*mm" y="0*mm" z="113.495*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR188Z113"/>
+<rChild name="pixel:supportR208Z113"/>
 <rRotation name="pixel:Y180"/>
 <Translation x="0*mm" y="0*mm" z="-113.495*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:supportR188Z914"/>
-<Translation x="0*mm" y="0*mm" z="623.505*mm"/>
+<rChild name="pixel:supportR208Z914"/>
+<Translation x="0*mm" y="0*mm" z="623.255*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixfwd:Phase2PixelEndcap"/>
+<rChild name="pixel:supportR208Z1602"/>
+<Translation x="0*mm" y="0*mm" z="1311.51*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixfwd:Phase2PixelEndcap"/>
+<rChild name="pixel:supportR303Z2169"/>
+<Translation x="0*mm" y="0*mm" z="1878.26*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:supportR188Z1603"/>
-<Translation x="0*mm" y="0*mm" z="1312.01*mm"/>
+<rChild name="pixel:supportR172Z916"/>
+<Translation x="0*mm" y="0*mm" z="625.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:supportR284Z2129"/>
-<Translation x="0*mm" y="0*mm" z="1838.02*mm"/>
+<rChild name="pixel:supportR172Z1607"/>
+<Translation x="0*mm" y="0*mm" z="1316.01*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:supportR172Z835"/>
-<Translation x="0*mm" y="0*mm" z="544*mm"/>
+<rChild name="pixel:supportR276Z2170"/>
+<Translation x="0*mm" y="0*mm" z="1879.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2PixelEndcap"/>
-<rChild name="pixel:supportR264Z2160"/>
-<Translation x="0*mm" y="0*mm" z="1869*mm"/>
+<rChild name="pixel:supportR170Z237"/>
+<Translation x="0*mm" y="0*mm" z="-54*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixfwd:Phase2PixelEndcap"/>
+<rChild name="pixel:supportR170Z710"/>
+<Translation x="0*mm" y="0*mm" z="419*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixfwd:Phase2PixelEndcap"/>
+<rChild name="pixel:supportR170Z910"/>
+<Translation x="0*mm" y="0*mm" z="619*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixfwd:Phase2PixelEndcap"/>
+<rChild name="pixel:supportR170Z1160"/>
+<Translation x="0*mm" y="0*mm" z="869*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixfwd:Phase2PixelEndcap"/>
+<rChild name="pixel:supportR170Z1600"/>
+<Translation x="0*mm" y="0*mm" z="1309*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixbar:Phase2PixelBarrel"/>
+<rChild name="pixel:supportR161Z100"/>
+<Translation x="0*mm" y="0*mm" z="100.363*mm"/>
+</PosPart>
+<PosPart copyNumber="2">
+<rParent name="pixbar:Phase2PixelBarrel"/>
+<rChild name="pixel:supportR161Z100"/>
+<rRotation name="pixel:Y180"/>
+<Translation x="0*mm" y="0*mm" z="-100.363*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR38Z101"/>
-<Translation x="0*mm" y="0*mm" z="101*mm"/>
+<rChild name="pixel:supportR44Z41"/>
+<Translation x="0*mm" y="0*mm" z="41*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR38Z101"/>
+<rChild name="pixel:supportR44Z41"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-101*mm"/>
+<Translation x="0*mm" y="0*mm" z="-41*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR68Z101"/>
-<Translation x="0*mm" y="0*mm" z="101*mm"/>
+<rChild name="pixel:supportR75Z41"/>
+<Translation x="0*mm" y="0*mm" z="41*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR68Z101"/>
+<rChild name="pixel:supportR75Z41"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-101*mm"/>
+<Translation x="0*mm" y="0*mm" z="-41*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR109Z101"/>
-<Translation x="0*mm" y="0*mm" z="101*mm"/>
+<rChild name="pixel:supportR119Z41"/>
+<Translation x="0*mm" y="0*mm" z="41*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR109Z101"/>
+<rChild name="pixel:supportR119Z41"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-101*mm"/>
+<Translation x="0*mm" y="0*mm" z="-41*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR38Z221"/>
-<Translation x="0*mm" y="0*mm" z="221*mm"/>
+<rChild name="pixel:supportR44Z216"/>
+<Translation x="0*mm" y="0*mm" z="216*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR38Z221"/>
+<rChild name="pixel:supportR44Z216"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-221*mm"/>
+<Translation x="0*mm" y="0*mm" z="-216*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR68Z221"/>
-<Translation x="0*mm" y="0*mm" z="221*mm"/>
+<rChild name="pixel:supportR75Z216"/>
+<Translation x="0*mm" y="0*mm" z="216*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR68Z221"/>
+<rChild name="pixel:supportR75Z216"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-221*mm"/>
+<Translation x="0*mm" y="0*mm" z="-216*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR109Z221"/>
-<Translation x="0*mm" y="0*mm" z="221*mm"/>
+<rChild name="pixel:supportR119Z216"/>
+<Translation x="0*mm" y="0*mm" z="216*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2PixelBarrel"/>
-<rChild name="pixel:supportR109Z221"/>
+<rChild name="pixel:supportR119Z216"/>
 <rRotation name="pixel:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-221*mm"/>
+<Translation x="0*mm" y="0*mm" z="-216*mm"/>
 </PosPart>
 <Algorithm name="track:DDTrackerAngular">
 <rParent name="pixel:Layer1"/>
 <String name="ChildName" value="pixel:RodFlipped1"/>
-<Numeric name="StartAngle" value="105.011*deg"/>
+<Numeric name="StartAngle" value="105.0*deg"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="Radius" value="27.5*mm"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,0</Vector>
@@ -12229,9 +12075,9 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Algorithm name="track:DDTrackerAngular">
 <rParent name="pixel:Layer1"/>
 <String name="ChildName" value="pixel:RodUnflipped1"/>
-<Numeric name="StartAngle" value="135.011*deg"/>
+<Numeric name="StartAngle" value="135.0*deg"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="Radius" value="30.5*mm"/>
+<Numeric name="Radius" value="32.5*mm"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,0</Vector>
 <Numeric name="N" value="6"/>
 <Numeric name="StartCopyNo" value="2"/>
@@ -12240,9 +12086,9 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Algorithm name="track:DDTrackerAngular">
 <rParent name="pixel:Layer2"/>
 <String name="ChildName" value="pixel:RodFlipped2"/>
-<Numeric name="StartAngle" value="96.4171*deg"/>
+<Numeric name="StartAngle" value="97.5*deg"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="Radius" value="58.5*mm"/>
+<Numeric name="Radius" value="59*mm"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,0</Vector>
 <Numeric name="N" value="12"/>
 <Numeric name="StartCopyNo" value="1"/>
@@ -12251,9 +12097,9 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Algorithm name="track:DDTrackerAngular">
 <rParent name="pixel:Layer2"/>
 <String name="ChildName" value="pixel:RodUnflipped2"/>
-<Numeric name="StartAngle" value="111.417*deg"/>
+<Numeric name="StartAngle" value="112.5*deg"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="Radius" value="61.5*mm"/>
+<Numeric name="Radius" value="64*mm"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,0</Vector>
 <Numeric name="N" value="12"/>
 <Numeric name="StartCopyNo" value="2"/>
@@ -12262,9 +12108,9 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Algorithm name="track:DDTrackerAngular">
 <rParent name="pixel:Layer3"/>
 <String name="ChildName" value="pixel:RodFlipped3"/>
-<Numeric name="StartAngle" value="97.5057*deg"/>
+<Numeric name="StartAngle" value="99.0*deg"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="Radius" value="98.5*mm"/>
+<Numeric name="Radius" value="102*mm"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,0</Vector>
 <Numeric name="N" value="10"/>
 <Numeric name="StartCopyNo" value="1"/>
@@ -12273,9 +12119,9 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Algorithm name="track:DDTrackerAngular">
 <rParent name="pixel:Layer3"/>
 <String name="ChildName" value="pixel:RodUnflipped3"/>
-<Numeric name="StartAngle" value="115.506*deg"/>
+<Numeric name="StartAngle" value="117.0*deg"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="Radius" value="101.5*mm"/>
+<Numeric name="Radius" value="107*mm"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,0</Vector>
 <Numeric name="N" value="10"/>
 <Numeric name="StartCopyNo" value="2"/>
@@ -12284,9 +12130,9 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Algorithm name="track:DDTrackerAngular">
 <rParent name="pixel:Layer4"/>
 <String name="ChildName" value="pixel:RodFlipped4"/>
-<Numeric name="StartAngle" value="95.615*deg"/>
+<Numeric name="StartAngle" value="96.4285714286*deg"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="Radius" value="138.5*mm"/>
+<Numeric name="Radius" value="144*mm"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,0</Vector>
 <Numeric name="N" value="14"/>
 <Numeric name="StartCopyNo" value="1"/>
@@ -12295,9 +12141,9 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Algorithm name="track:DDTrackerAngular">
 <rParent name="pixel:Layer4"/>
 <String name="ChildName" value="pixel:RodUnflipped4"/>
-<Numeric name="StartAngle" value="108.472*deg"/>
+<Numeric name="StartAngle" value="109.285714286*deg"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="Radius" value="141.5*mm"/>
+<Numeric name="Radius" value="149*mm"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,0</Vector>
 <Numeric name="N" value="14"/>
 <Numeric name="StartCopyNo" value="2"/>
@@ -12311,7 +12157,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="99*deg"/>
-<Numeric name="Radius" value="51.1"/>
+<Numeric name="Radius" value="52.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12325,7 +12171,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="117*deg"/>
-<Numeric name="Radius" value="51.1"/>
+<Numeric name="Radius" value="52.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12339,7 +12185,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="70.9"/>
+<Numeric name="Radius" value="70.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12353,7 +12199,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="70.9"/>
+<Numeric name="Radius" value="70.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12367,7 +12213,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="97.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
+<Numeric name="Radius" value="104.925"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12381,7 +12227,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="112.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
+<Numeric name="Radius" value="104.925"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12395,7 +12241,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="137.89"/>
+<Numeric name="Radius" value="138.265"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12409,7 +12255,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="137.89"/>
+<Numeric name="Radius" value="138.265"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12423,7 +12269,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="99*deg"/>
-<Numeric name="Radius" value="51.1"/>
+<Numeric name="Radius" value="52.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12437,7 +12283,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="117*deg"/>
-<Numeric name="Radius" value="51.1"/>
+<Numeric name="Radius" value="52.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12451,7 +12297,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="70.9"/>
+<Numeric name="Radius" value="70.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12465,7 +12311,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="70.9"/>
+<Numeric name="Radius" value="70.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12479,7 +12325,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="97.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
+<Numeric name="Radius" value="104.925"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12493,7 +12339,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="112.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
+<Numeric name="Radius" value="104.925"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12507,7 +12353,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="137.89"/>
+<Numeric name="Radius" value="138.265"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12521,7 +12367,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="137.89"/>
+<Numeric name="Radius" value="138.265"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12535,7 +12381,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="99*deg"/>
-<Numeric name="Radius" value="51.1"/>
+<Numeric name="Radius" value="52.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12549,7 +12395,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="117*deg"/>
-<Numeric name="Radius" value="51.1"/>
+<Numeric name="Radius" value="52.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12563,7 +12409,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="70.9"/>
+<Numeric name="Radius" value="70.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12577,7 +12423,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="70.9"/>
+<Numeric name="Radius" value="70.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12591,7 +12437,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="97.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
+<Numeric name="Radius" value="104.925"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12605,7 +12451,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="112.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
+<Numeric name="Radius" value="104.925"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12619,7 +12465,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="137.89"/>
+<Numeric name="Radius" value="138.265"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12633,7 +12479,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="137.89"/>
+<Numeric name="Radius" value="138.265"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12647,7 +12493,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="99*deg"/>
-<Numeric name="Radius" value="51.1"/>
+<Numeric name="Radius" value="52.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12661,7 +12507,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="117*deg"/>
-<Numeric name="Radius" value="51.1"/>
+<Numeric name="Radius" value="52.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12675,7 +12521,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="70.9"/>
+<Numeric name="Radius" value="70.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12689,7 +12535,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="70.9"/>
+<Numeric name="Radius" value="70.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12703,7 +12549,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="97.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
+<Numeric name="Radius" value="104.925"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12717,7 +12563,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="112.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
+<Numeric name="Radius" value="104.925"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12731,7 +12577,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="137.89"/>
+<Numeric name="Radius" value="138.265"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12745,7 +12591,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="137.89"/>
+<Numeric name="Radius" value="138.265"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12759,7 +12605,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="99*deg"/>
-<Numeric name="Radius" value="51.1"/>
+<Numeric name="Radius" value="52.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12773,7 +12619,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="117*deg"/>
-<Numeric name="Radius" value="51.1"/>
+<Numeric name="Radius" value="52.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12787,7 +12633,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="70.9"/>
+<Numeric name="Radius" value="70.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12801,7 +12647,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="70.9"/>
+<Numeric name="Radius" value="70.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12815,7 +12661,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="97.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
+<Numeric name="Radius" value="104.925"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12829,7 +12675,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="112.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
+<Numeric name="Radius" value="104.925"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12843,7 +12689,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="137.89"/>
+<Numeric name="Radius" value="138.265"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12857,7 +12703,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="137.89"/>
+<Numeric name="Radius" value="138.265"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12871,7 +12717,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="99*deg"/>
-<Numeric name="Radius" value="51.1"/>
+<Numeric name="Radius" value="52.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12885,7 +12731,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="117*deg"/>
-<Numeric name="Radius" value="51.1"/>
+<Numeric name="Radius" value="52.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12899,7 +12745,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="70.9"/>
+<Numeric name="Radius" value="70.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12913,7 +12759,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="70.9"/>
+<Numeric name="Radius" value="70.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12927,7 +12773,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="97.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
+<Numeric name="Radius" value="104.925"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12941,7 +12787,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="112.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
+<Numeric name="Radius" value="104.925"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12955,7 +12801,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="137.89"/>
+<Numeric name="Radius" value="138.265"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12969,7 +12815,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="137.89"/>
+<Numeric name="Radius" value="138.265"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12983,7 +12829,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="99*deg"/>
-<Numeric name="Radius" value="51.1"/>
+<Numeric name="Radius" value="52.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -12997,7 +12843,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="117*deg"/>
-<Numeric name="Radius" value="51.1"/>
+<Numeric name="Radius" value="52.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -13011,7 +12857,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="70.9"/>
+<Numeric name="Radius" value="70.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -13025,7 +12871,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="70.9"/>
+<Numeric name="Radius" value="70.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -13039,7 +12885,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="97.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
+<Numeric name="Radius" value="104.925"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -13053,7 +12899,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="112.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
+<Numeric name="Radius" value="104.925"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -13067,7 +12913,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="137.89"/>
+<Numeric name="Radius" value="138.265"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -13081,7 +12927,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="137.89"/>
+<Numeric name="Radius" value="138.265"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -13095,7 +12941,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="99*deg"/>
-<Numeric name="Radius" value="51.1"/>
+<Numeric name="Radius" value="52.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -13109,7 +12955,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="117*deg"/>
-<Numeric name="Radius" value="51.1"/>
+<Numeric name="Radius" value="52.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -13123,7 +12969,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="70.9"/>
+<Numeric name="Radius" value="70.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -13137,7 +12983,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="70.9"/>
+<Numeric name="Radius" value="70.725"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -13151,7 +12997,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="97.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
+<Numeric name="Radius" value="104.925"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -13165,7 +13011,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="112.5*deg"/>
-<Numeric name="Radius" value="104.9"/>
+<Numeric name="Radius" value="104.925"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -13179,7 +13025,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95.625*deg"/>
-<Numeric name="Radius" value="137.89"/>
+<Numeric name="Radius" value="138.265"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -13193,7 +13039,7 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="106.875*deg"/>
-<Numeric name="Radius" value="137.89"/>
+<Numeric name="Radius" value="138.265"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -13202,13 +13048,13 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring1Disc9"/>
 <String name="ChildName" value="pixel:EModule1Disc9"/>
-<Numeric name="N" value="20"/>
+<Numeric name="N" value="10"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="94.5*deg"/>
-<Numeric name="Radius" value="85.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="StartAngle" value="99*deg"/>
+<Numeric name="Radius" value="84.625"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="1"/>
@@ -13216,41 +13062,41 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring1Disc9"/>
 <String name="ChildName" value="pixel:EModule1Disc9"/>
-<Numeric name="N" value="20"/>
+<Numeric name="N" value="10"/>
 <Numeric name="StartCopyNo" value="2"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="103.5*deg"/>
-<Numeric name="Radius" value="85.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="StartAngle" value="117*deg"/>
+<Numeric name="Radius" value="84.625"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring2Disc9"/>
 <String name="ChildName" value="pixel:EModule2Disc9"/>
-<Numeric name="N" value="28"/>
+<Numeric name="N" value="14"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="93.2143*deg"/>
-<Numeric name="Radius" value="126.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="StartAngle" value="96.4286*deg"/>
+<Numeric name="Radius" value="122.275"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring2Disc9"/>
 <String name="ChildName" value="pixel:EModule2Disc9"/>
-<Numeric name="N" value="28"/>
+<Numeric name="N" value="14"/>
 <Numeric name="StartCopyNo" value="2"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="99.6429*deg"/>
-<Numeric name="Radius" value="126.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="StartAngle" value="109.286*deg"/>
+<Numeric name="Radius" value="122.275"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="0"/>
@@ -13263,8 +13109,8 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95*deg"/>
-<Numeric name="Radius" value="166.4"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="Radius" value="159.575"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="1"/>
@@ -13277,36 +13123,36 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="105*deg"/>
-<Numeric name="Radius" value="166.4"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="Radius" value="159.575"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring4Disc9"/>
 <String name="ChildName" value="pixel:EModule4Disc9"/>
-<Numeric name="N" value="20"/>
+<Numeric name="N" value="22"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="94.5*deg"/>
-<Numeric name="Radius" value="209.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="StartAngle" value="94.0909*deg"/>
+<Numeric name="Radius" value="196.175"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring4Disc9"/>
 <String name="ChildName" value="pixel:EModule4Disc9"/>
-<Numeric name="N" value="20"/>
+<Numeric name="N" value="22"/>
 <Numeric name="StartCopyNo" value="2"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="103.5*deg"/>
-<Numeric name="Radius" value="209.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="StartAngle" value="102.273*deg"/>
+<Numeric name="Radius" value="196.175"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="0"/>
@@ -13319,8 +13165,8 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="93.75*deg"/>
-<Numeric name="Radius" value="231.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="Radius" value="232.225"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="1"/>
@@ -13333,22 +13179,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="101.25*deg"/>
-<Numeric name="Radius" value="231.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="Radius" value="232.225"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring1Disc10"/>
 <String name="ChildName" value="pixel:EModule1Disc10"/>
-<Numeric name="N" value="20"/>
+<Numeric name="N" value="10"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="94.5*deg"/>
-<Numeric name="Radius" value="85.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="StartAngle" value="99*deg"/>
+<Numeric name="Radius" value="84.625"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="1"/>
@@ -13356,41 +13202,41 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring1Disc10"/>
 <String name="ChildName" value="pixel:EModule1Disc10"/>
-<Numeric name="N" value="20"/>
+<Numeric name="N" value="10"/>
 <Numeric name="StartCopyNo" value="2"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="103.5*deg"/>
-<Numeric name="Radius" value="85.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="StartAngle" value="117*deg"/>
+<Numeric name="Radius" value="84.625"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring2Disc10"/>
 <String name="ChildName" value="pixel:EModule2Disc10"/>
-<Numeric name="N" value="28"/>
+<Numeric name="N" value="14"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="93.2143*deg"/>
-<Numeric name="Radius" value="126.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="StartAngle" value="96.4286*deg"/>
+<Numeric name="Radius" value="122.275"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring2Disc10"/>
 <String name="ChildName" value="pixel:EModule2Disc10"/>
-<Numeric name="N" value="28"/>
+<Numeric name="N" value="14"/>
 <Numeric name="StartCopyNo" value="2"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="99.6429*deg"/>
-<Numeric name="Radius" value="126.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="StartAngle" value="109.286*deg"/>
+<Numeric name="Radius" value="122.275"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="0"/>
@@ -13403,8 +13249,8 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95*deg"/>
-<Numeric name="Radius" value="166.4"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="Radius" value="159.575"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="1"/>
@@ -13417,36 +13263,36 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="105*deg"/>
-<Numeric name="Radius" value="166.4"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="Radius" value="159.575"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring4Disc10"/>
 <String name="ChildName" value="pixel:EModule4Disc10"/>
-<Numeric name="N" value="20"/>
+<Numeric name="N" value="22"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="94.5*deg"/>
-<Numeric name="Radius" value="209.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="StartAngle" value="94.0909*deg"/>
+<Numeric name="Radius" value="196.175"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring4Disc10"/>
 <String name="ChildName" value="pixel:EModule4Disc10"/>
-<Numeric name="N" value="20"/>
+<Numeric name="N" value="22"/>
 <Numeric name="StartCopyNo" value="2"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="103.5*deg"/>
-<Numeric name="Radius" value="209.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="StartAngle" value="102.273*deg"/>
+<Numeric name="Radius" value="196.175"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="0"/>
@@ -13459,8 +13305,8 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="93.75*deg"/>
-<Numeric name="Radius" value="231.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="Radius" value="232.225"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="1"/>
@@ -13473,22 +13319,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="101.25*deg"/>
-<Numeric name="Radius" value="231.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="Radius" value="232.225"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring1Disc11"/>
 <String name="ChildName" value="pixel:EModule1Disc11"/>
-<Numeric name="N" value="20"/>
+<Numeric name="N" value="10"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="94.5*deg"/>
-<Numeric name="Radius" value="85.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="StartAngle" value="99*deg"/>
+<Numeric name="Radius" value="84.625"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="1"/>
@@ -13496,41 +13342,41 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring1Disc11"/>
 <String name="ChildName" value="pixel:EModule1Disc11"/>
-<Numeric name="N" value="20"/>
+<Numeric name="N" value="10"/>
 <Numeric name="StartCopyNo" value="2"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="103.5*deg"/>
-<Numeric name="Radius" value="85.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="StartAngle" value="117*deg"/>
+<Numeric name="Radius" value="84.625"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring2Disc11"/>
 <String name="ChildName" value="pixel:EModule2Disc11"/>
-<Numeric name="N" value="28"/>
+<Numeric name="N" value="14"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="93.2143*deg"/>
-<Numeric name="Radius" value="126.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="StartAngle" value="96.4286*deg"/>
+<Numeric name="Radius" value="122.275"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring2Disc11"/>
 <String name="ChildName" value="pixel:EModule2Disc11"/>
-<Numeric name="N" value="28"/>
+<Numeric name="N" value="14"/>
 <Numeric name="StartCopyNo" value="2"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="99.6429*deg"/>
-<Numeric name="Radius" value="126.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="StartAngle" value="109.286*deg"/>
+<Numeric name="Radius" value="122.275"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="0"/>
@@ -13543,8 +13389,8 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95*deg"/>
-<Numeric name="Radius" value="166.4"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="Radius" value="159.575"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="1"/>
@@ -13557,36 +13403,36 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="105*deg"/>
-<Numeric name="Radius" value="166.4"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="Radius" value="159.575"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring4Disc11"/>
 <String name="ChildName" value="pixel:EModule4Disc11"/>
-<Numeric name="N" value="20"/>
+<Numeric name="N" value="22"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="94.5*deg"/>
-<Numeric name="Radius" value="209.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="StartAngle" value="94.0909*deg"/>
+<Numeric name="Radius" value="196.175"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring4Disc11"/>
 <String name="ChildName" value="pixel:EModule4Disc11"/>
-<Numeric name="N" value="20"/>
+<Numeric name="N" value="22"/>
 <Numeric name="StartCopyNo" value="2"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="103.5*deg"/>
-<Numeric name="Radius" value="209.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="StartAngle" value="102.273*deg"/>
+<Numeric name="Radius" value="196.175"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="0"/>
@@ -13599,8 +13445,8 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="93.75*deg"/>
-<Numeric name="Radius" value="231.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="Radius" value="232.225"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="1"/>
@@ -13613,22 +13459,22 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="101.25*deg"/>
-<Numeric name="Radius" value="231.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="Radius" value="232.225"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring1Disc12"/>
 <String name="ChildName" value="pixel:EModule1Disc12"/>
-<Numeric name="N" value="20"/>
+<Numeric name="N" value="10"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="94.5*deg"/>
-<Numeric name="Radius" value="85.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="StartAngle" value="99*deg"/>
+<Numeric name="Radius" value="84.625"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="1"/>
@@ -13636,41 +13482,41 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring1Disc12"/>
 <String name="ChildName" value="pixel:EModule1Disc12"/>
-<Numeric name="N" value="20"/>
+<Numeric name="N" value="10"/>
 <Numeric name="StartCopyNo" value="2"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="103.5*deg"/>
-<Numeric name="Radius" value="85.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="StartAngle" value="117*deg"/>
+<Numeric name="Radius" value="84.625"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring2Disc12"/>
 <String name="ChildName" value="pixel:EModule2Disc12"/>
-<Numeric name="N" value="28"/>
+<Numeric name="N" value="14"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="93.2143*deg"/>
-<Numeric name="Radius" value="126.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="StartAngle" value="96.4286*deg"/>
+<Numeric name="Radius" value="122.275"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring2Disc12"/>
 <String name="ChildName" value="pixel:EModule2Disc12"/>
-<Numeric name="N" value="28"/>
+<Numeric name="N" value="14"/>
 <Numeric name="StartCopyNo" value="2"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="99.6429*deg"/>
-<Numeric name="Radius" value="126.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="StartAngle" value="109.286*deg"/>
+<Numeric name="Radius" value="122.275"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="0"/>
@@ -13683,8 +13529,8 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="95*deg"/>
-<Numeric name="Radius" value="166.4"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="Radius" value="159.575"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="1"/>
@@ -13697,36 +13543,36 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="105*deg"/>
-<Numeric name="Radius" value="166.4"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="Radius" value="159.575"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring4Disc12"/>
 <String name="ChildName" value="pixel:EModule4Disc12"/>
-<Numeric name="N" value="20"/>
+<Numeric name="N" value="22"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="94.5*deg"/>
-<Numeric name="Radius" value="209.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="StartAngle" value="94.0909*deg"/>
+<Numeric name="Radius" value="196.175"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="pixel:Ring4Disc12"/>
 <String name="ChildName" value="pixel:EModule4Disc12"/>
-<Numeric name="N" value="20"/>
+<Numeric name="N" value="22"/>
 <Numeric name="StartCopyNo" value="2"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="103.5*deg"/>
-<Numeric name="Radius" value="209.9"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="StartAngle" value="102.273*deg"/>
+<Numeric name="Radius" value="196.175"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="0"/>
@@ -13739,8 +13585,8 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="93.75*deg"/>
-<Numeric name="Radius" value="231.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-2</Vector>
+<Numeric name="Radius" value="232.225"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
 <Numeric name="IsFlipped" value="1"/>
@@ -13753,11 +13599,11 @@ note: see OT614_200_IT461_2018_11_26.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="101.25*deg"/>
-<Numeric name="Radius" value="231.89"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,2</Vector>
+<Numeric name="Radius" value="232.225"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 </PosPartSection>
 </DDDefinition>
diff --git a/Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/pixfwd.xml b/Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml
similarity index 92%
rename from Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/pixfwd.xml
rename to Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml
index c1922e9a81620..4bb4c66e00da6 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/pixfwd.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!--
 ============= XML GENERATION METADATA HEADER =============
-tkLayout revision: dev_gabie-2972-e516bb8 on git@github.com:ghugo83/tkLayout.git
+tkLayout revision: XMLs_2019_04_25_IT_MB_boom-3166-96d0380 on git@github.com:ghugo83/tkLayout.git
 generated by: Gabrielle Hugo (ghugo on hpsilicon2.dyndns.cern.ch)
-generation date: 2018-11-22.18:27:10
-note: see OT614_200_IT461_2018_11_22.cfg for full config files
+generation date: 2019-04-25.18:00:02
+note: see OT616_200_IT613_2019_04_25.cfg for full config files
 =========== END XML GENERATION METADATA HEADER ===========
 -->
 <DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
@@ -14,8 +14,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
  <Constant name="zero" value="0.0*fm"/>
  <!-- <Constant name="RootRadius"     value="[pixfwdCylinder:CylindersOuterRmax]"/>-->
  <!--<Constant name="RootRadius"     value="20.1*cm"/>-->
- <Constant name="RootRadius1"     value="19.65*cm"/>
- <Constant name="RootRadius2"     value="28.8*cm"/> <!-- For Pixel 1_1_1 : RootRadius2 = RootRadius1 -->
+ <Constant name="RootRadius1"     value="21.2*cm"/>
+ <Constant name="RootRadius2"     value="30.7*cm"/> <!-- For Pixel 1_1_1 : RootRadius2 = RootRadius1 -->
 
  <Constant name="AnchorZ"        value="0.*mm"/>
  <Constant name="ZPixelForward"  value="291.*mm"/>
diff --git a/Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/tracker.xml b/Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml
similarity index 91%
rename from Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/tracker.xml
rename to Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml
index def301ea6af00..2afa4ffb02033 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/TiltedTracker461/tracker.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!--
 ============= XML GENERATION METADATA HEADER =============
-tkLayout revision: dev_gabie-2972-e516bb8 on git@github.com:ghugo83/tkLayout.git
+tkLayout revision: XMLs_2019_04_25_IT_MB_boom-3166-96d0380 on git@github.com:ghugo83/tkLayout.git
 generated by: Gabrielle Hugo (ghugo on hpsilicon2.dyndns.cern.ch)
-generation date: 2018-11-22.18:27:10
-note: see OT614_200_IT461_2018_11_22.cfg for full config files
+generation date: 2019-04-25.18:00:02
+note: see OT616_200_IT613_2019_04_25.cfg for full config files
 =========== END XML GENERATION METADATA HEADER ===========
 -->
 <DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.cern.ch/www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
@@ -362,7 +362,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_C5O2H8"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="tkLayout_Airex" density="0.06*g/cm3" method="mixture by weight">
+<CompositeMaterial name="tkLayout_Airex" density="0.08*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.655834">
 <rMaterial name="tracker:tkLayout_C"/>
 </MaterialFraction>
@@ -392,6 +392,14 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_O"/>
 </MaterialFraction>
 </CompositeMaterial>
+<CompositeMaterial name="tkLayout_AlN" density="3.26*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.65827">
+<rMaterial name="tracker:tkLayout_Al"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.34173">
+<rMaterial name="tracker:tkLayout_N"/>
+</MaterialFraction>
+</CompositeMaterial>
 <CompositeMaterial name="tkLayout_Al_HV" density="2.698*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="1">
 <rMaterial name="tracker:tkLayout_Al"/>
@@ -459,22 +467,62 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_H"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="tkLayout_CF" density="1.84*g/cm3" method="mixture by weight">
+<CompositeMaterial name="tkLayout_C8H8C4H6C3H3N" density="1.052*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.852618">
+<rMaterial name="tracker:tkLayout_C"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.0810949">
+<rMaterial name="tracker:tkLayout_H"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.0662871">
+<rMaterial name="tracker:tkLayout_N"/>
+</MaterialFraction>
+</CompositeMaterial>
+<CompositeMaterial name="tkLayout_CF" density="1.91*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="1">
-<rMaterial name="tracker:tkLayout_CFRP"/>
+<rMaterial name="tracker:tkLayout_C"/>
+</MaterialFraction>
+</CompositeMaterial>
+<CompositeMaterial name="tkLayout_CFRP" density="1.43*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="1">
+<rMaterial name="tracker:tkLayout_CFRP_EPX"/>
+</MaterialFraction>
+</CompositeMaterial>
+<CompositeMaterial name="tkLayout_CFRP_EPX" density="1.43*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.71">
+<rMaterial name="tracker:tkLayout_C"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.29">
+<rMaterial name="tracker:tkLayout_Epoxy"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="tkLayout_CFRP" density="1.84*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.780488">
+<CompositeMaterial name="tkLayout_CFRP_FPX" density="2.198*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.71">
+<rMaterial name="tracker:tkLayout_C"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.29">
+<rMaterial name="tracker:tkLayout_Epoxy"/>
+</MaterialFraction>
+</CompositeMaterial>
+<CompositeMaterial name="tkLayout_CFRP_ITST" density="1.622*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.71">
 <rMaterial name="tracker:tkLayout_C"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.219512">
+<MaterialFraction fraction="0.29">
 <rMaterial name="tracker:tkLayout_Epoxy"/>
 </MaterialFraction>
 </CompositeMaterial>
 <CompositeMaterial name="tkLayout_CFRP_OTST" density="1.55*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.71">
+<rMaterial name="tracker:tkLayout_C"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.29">
+<rMaterial name="tracker:tkLayout_Epoxy"/>
+</MaterialFraction>
+</CompositeMaterial>
+<CompositeMaterial name="tkLayout_CFRP_module" density="1.43*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="1">
-<rMaterial name="tracker:tkLayout_CFRP"/>
+<rMaterial name="tracker:tkLayout_CFRP_EPX"/>
 </MaterialFraction>
 </CompositeMaterial>
 <CompositeMaterial name="tkLayout_CH2OCN" density="1.16*g/cm3" method="mixture by weight">
@@ -499,24 +547,19 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_O"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="tkLayout_CO2_L1" density="1*g/cm3" method="mixture by weight">
+<CompositeMaterial name="tkLayout_CO2_fake1000factor" density="1*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="1">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="tkLayout_CO2_L2" density="1*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="1">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="tkLayout_CO2_L3" density="1*g/cm3" method="mixture by weight">
+<CompositeMaterial name="tkLayout_Carbon_foam_BPX" density="0.55*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="1">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
+<rMaterial name="tracker:tkLayout_C"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="tkLayout_CO2_L4" density="1*g/cm3" method="mixture by weight">
+<CompositeMaterial name="tkLayout_Carbon_foam_FPX" density="0.249*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="1">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
+<rMaterial name="tracker:tkLayout_C"/>
 </MaterialFraction>
 </CompositeMaterial>
 <CompositeMaterial name="tkLayout_Cu_Elinks_TBPX_L1" density="8.96*g/cm3" method="mixture by weight">
@@ -639,11 +682,6 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="tkLayout_FPIX_CO2" density="1*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="1">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
-</MaterialFraction>
-</CompositeMaterial>
 <CompositeMaterial name="tkLayout_FPIX_Cu" density="8.96*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="1">
 <rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
@@ -654,11 +692,6 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="tkLayout_FPIX_Ti" density="4.54*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="1">
-<rMaterial name="tracker:tkLayout_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
 <CompositeMaterial name="tkLayout_FR4" density="1.85*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.0671091">
 <rMaterial name="tracker:tkLayout_Br"/>
@@ -690,11 +723,79 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Si"/>
 </MaterialFraction>
 </CompositeMaterial>
+<CompositeMaterial name="tkLayout_Graphite_EPX" density="1.65*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="1">
+<rMaterial name="tracker:tkLayout_C"/>
+</MaterialFraction>
+</CompositeMaterial>
+<CompositeMaterial name="tkLayout_Graphite_FPX" density="2.266*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="1">
+<rMaterial name="tracker:tkLayout_C"/>
+</MaterialFraction>
+</CompositeMaterial>
 <CompositeMaterial name="tkLayout_HexWebHRH10_OTST" density="0.0496*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="1">
 <rMaterial name="tracker:tkLayout_Airex"/>
 </MaterialFraction>
 </CompositeMaterial>
+<CompositeMaterial name="tkLayout_IT-HDI-mix" density="2.63744*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.587491">
+<rMaterial name="tracker:tkLayout_IT_HDI_Copper_layers"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.0526256">
+<rMaterial name="tracker:tkLayout_IT_HDI_Coverlay_Kapton"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.084811">
+<rMaterial name="tracker:tkLayout_IT_HDI_Coverlay_glue"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.084811">
+<rMaterial name="tracker:tkLayout_IT_HDI_Glue_for_lamination"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.109299">
+<rMaterial name="tracker:tkLayout_IT_HDI_Polyimide_layers"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.0404812">
+<rMaterial name="tracker:tkLayout_IT_HDI_photoimage_mask_layer_bottom"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.0404812">
+<rMaterial name="tracker:tkLayout_IT_HDI_photoimage_mask_layer_top"/>
+</MaterialFraction>
+</CompositeMaterial>
+<CompositeMaterial name="tkLayout_IT_HDI_Copper_layers" density="8.96*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="1">
+<rMaterial name="tracker:tkLayout_Cu_Elinks_TBPX_L1"/>
+</MaterialFraction>
+</CompositeMaterial>
+<CompositeMaterial name="tkLayout_IT_HDI_Coverlay_Kapton" density="1.42*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="1">
+<rMaterial name="tracker:tkLayout_2S_FEH_Polyimide_core"/>
+</MaterialFraction>
+</CompositeMaterial>
+<CompositeMaterial name="tkLayout_IT_HDI_Coverlay_glue" density="1.19*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="1">
+<rMaterial name="tracker:tkLayout_2S_FEH_Glue_for_lamination"/>
+</MaterialFraction>
+</CompositeMaterial>
+<CompositeMaterial name="tkLayout_IT_HDI_Glue_for_lamination" density="1.19*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="1">
+<rMaterial name="tracker:tkLayout_2S_FEH_Glue_for_lamination"/>
+</MaterialFraction>
+</CompositeMaterial>
+<CompositeMaterial name="tkLayout_IT_HDI_Polyimide_layers" density="1.42*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="1">
+<rMaterial name="tracker:tkLayout_2S_FEH_Polyimide_core"/>
+</MaterialFraction>
+</CompositeMaterial>
+<CompositeMaterial name="tkLayout_IT_HDI_photoimage_mask_layer_bottom" density="1.42*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="1">
+<rMaterial name="tracker:tkLayout_2S_FEH_Polyimide_core"/>
+</MaterialFraction>
+</CompositeMaterial>
+<CompositeMaterial name="tkLayout_IT_HDI_photoimage_mask_layer_top" density="1.42*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="1">
+<rMaterial name="tracker:tkLayout_2S_FEH_Polyimide_core"/>
+</MaterialFraction>
+</CompositeMaterial>
 <CompositeMaterial name="tkLayout_Kapton" density="1.42*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.599851">
 <rMaterial name="tracker:tkLayout_C"/>
@@ -731,11 +832,33 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Ni"/>
 </MaterialFraction>
 </CompositeMaterial>
+<CompositeMaterial name="tkLayout_LCP" density="1.633*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.52">
+<rMaterial name="tracker:tkLayout_C"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.01">
+<rMaterial name="tracker:tkLayout_H"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.39">
+<rMaterial name="tracker:tkLayout_O"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.08">
+<rMaterial name="tracker:tkLayout_Si"/>
+</MaterialFraction>
+</CompositeMaterial>
 <CompositeMaterial name="tkLayout_Oxetane" density="1.36*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="1">
 <rMaterial name="tracker:tkLayout_C3H6O"/>
 </MaterialFraction>
 </CompositeMaterial>
+<CompositeMaterial name="tkLayout_PCB_panel_EPX" density="1.9*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.34">
+<rMaterial name="tracker:tkLayout_Cu"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.66">
+<rMaterial name="tracker:tkLayout_FR4"/>
+</MaterialFraction>
+</CompositeMaterial>
 <CompositeMaterial name="tkLayout_PE" density="0.89*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="1">
 <rMaterial name="tracker:tkLayout_2S_DCDC_LCP"/>
@@ -1000,15 +1123,15 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_C8H8"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="tkLayout_Pix_Bumps" density="8.92*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.506">
-<rMaterial name="tracker:tkLayout_Pb"/>
+<CompositeMaterial name="tkLayout_Pix_Bumps" density="7.39*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.035">
+<rMaterial name="tracker:tkLayout_Ag"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.494">
+<MaterialFraction fraction="0.965">
 <rMaterial name="tracker:tkLayout_Sn"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="tkLayout_Pix_Caps" density="6.33*g/cm3" method="mixture by weight">
+<CompositeMaterial name="tkLayout_Pix_Caps" density="15.6*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="1">
 <rMaterial name="tracker:tkLayout_SMDCapacitors"/>
 </MaterialFraction>
@@ -1062,6 +1185,14 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Scint"/>
 </MaterialFraction>
 </CompositeMaterial>
+<CompositeMaterial name="tkLayout_Si3N4" density="3.183*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.399393">
+<rMaterial name="tracker:tkLayout_N"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.600607">
+<rMaterial name="tracker:tkLayout_Si"/>
+</MaterialFraction>
+</CompositeMaterial>
 <CompositeMaterial name="tkLayout_Siliconeglue" density="1.5*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="1">
 <rMaterial name="tracker:tkLayout_(C6H5)2SiO"/>
@@ -1075,6 +1206,28 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Sn"/>
 </MaterialFraction>
 </CompositeMaterial>
+<CompositeMaterial name="tkLayout_StainlessSteel" density="8.02*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0004">
+<rMaterial name="tracker:tkLayout_C"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.19">
+<rMaterial name="tracker:tkLayout_Cr"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.6996">
+<rMaterial name="tracker:tkLayout_Fe"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.01">
+<rMaterial name="tracker:tkLayout_Mn"/>
+</MaterialFraction>
+<MaterialFraction fraction="0.1">
+<rMaterial name="tracker:tkLayout_Ni"/>
+</MaterialFraction>
+</CompositeMaterial>
+<CompositeMaterial name="tkLayout_StainlessSteel_fake1000factor" density="8.02*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="1">
+<rMaterial name="tracker:tkLayout_StainlessSteel"/>
+</MaterialFraction>
+</CompositeMaterial>
 <CompositeMaterial name="tkLayout_Steel" density="7.8*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.000699739">
 <rMaterial name="tracker:tkLayout_Al"/>
@@ -1111,7 +1264,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 </CompositeMaterial>
 <CompositeMaterial name="tkLayout_TEDD_CO2" density="1*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="1">
-<rMaterial name="tracker:tkLayout_CO2_L1"/>
+<rMaterial name="tracker:tkLayout_CO2_fake1000factor"/>
 </MaterialFraction>
 </CompositeMaterial>
 <CompositeMaterial name="tkLayout_TEDD_Cu" density="8.96*g/cm3" method="mixture by weight">
@@ -1129,24 +1282,9 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="tkLayout_Ti_L1" density="4.54*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="1">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="tkLayout_Ti_L2" density="4.54*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="1">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="tkLayout_Ti_L3" density="4.54*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="1">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
-</MaterialFraction>
-</CompositeMaterial>
-<CompositeMaterial name="tkLayout_Ti_L4" density="4.54*g/cm3" method="mixture by weight">
+<CompositeMaterial name="tkLayout_TPG" density="2.26*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="1">
-<rMaterial name="tracker:tkLayout_FPIX_Ti"/>
+<rMaterial name="tracker:tkLayout_C"/>
 </MaterialFraction>
 </CompositeMaterial>
 <CompositeMaterial name="tkLayout_WB-enc" density="1.5*g/cm3" method="mixture by weight">
@@ -2045,53 +2183,53 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Epoxy"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1139Z2686" density="2.33783*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00351911">
+<CompositeMaterial name="servicecompositeR1112Z2687" density="2.35637*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00351322">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.200333">
+<MaterialFraction fraction="0.200117">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0264736">
+<MaterialFraction fraction="0.0268095">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.097954">
+<MaterialFraction fraction="0.0979117">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00301638">
+<MaterialFraction fraction="0.00301133">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.600247">
+<MaterialFraction fraction="0.599312">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0684569">
+<MaterialFraction fraction="0.0693257">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1151Z2730" density="9.39586*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00353489">
+<CompositeMaterial name="servicecompositeR1131Z2731" density="9.49461*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00353387">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.196908">
+<MaterialFraction fraction="0.196875">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0338914">
+<MaterialFraction fraction="0.0339388">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0939798">
+<MaterialFraction fraction="0.0939776">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00302991">
+<MaterialFraction fraction="0.00302903">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.600577">
+<MaterialFraction fraction="0.600418">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0680799">
+<MaterialFraction fraction="0.0682274">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1139Z1586" density="1.75387*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR1112Z1587" density="1.79021*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.00357079">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
@@ -2114,30 +2252,30 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1151Z2135" density="7.07275*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00354008">
+<CompositeMaterial name="servicecompositeR1131Z2136" density="7.16019*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0035406">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.195783">
+<MaterialFraction fraction="0.195818">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0363278">
+<MaterialFraction fraction="0.0362632">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0926744">
+<MaterialFraction fraction="0.0926949">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00303435">
+<MaterialFraction fraction="0.0030348">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.600685">
+<MaterialFraction fraction="0.600779">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0679561">
+<MaterialFraction fraction="0.0678694">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1140Z1220" density="3.41699*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR1115Z1220" density="3.44781*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.00343867">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
@@ -2160,7 +2298,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1151Z1224" density="3.39758*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR1131Z1224" density="3.42027*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.00343867">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
@@ -2183,7 +2321,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1043Z1230" density="2.02941*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR1028Z1230" density="2.06275*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.00369069">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
@@ -2206,7 +2344,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR945Z1230" density="2.23961*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR933Z1230" density="2.27072*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.00369069">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
@@ -2229,7 +2367,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR856Z1230" density="2.47157*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR848Z1230" density="2.49966*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.00369069">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
@@ -2252,7 +2390,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR776Z1230" density="2.72756*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR770Z1230" density="2.75167*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.00369069">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
@@ -2275,7 +2413,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR703Z1230" density="3.01006*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR700Z1230" density="3.02909*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.00369069">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
@@ -2298,7 +2436,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR637Z1230" density="3.32181*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR636Z1230" density="3.33448*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.00369069">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
@@ -2321,7 +2459,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR577Z1230" density="3.66586*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR577Z1230" density="3.67066*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.00369069">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
@@ -2344,26 +2482,26 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1151Z1407" density="5.32992*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00353004">
+<CompositeMaterial name="servicecompositeR1131Z1408" density="5.38665*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00353067">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.193674">
+<MaterialFraction fraction="0.193707">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0405141">
+<MaterialFraction fraction="0.0404571">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0908267">
+<MaterialFraction fraction="0.0908412">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00302575">
+<MaterialFraction fraction="0.00302629">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.598144">
+<MaterialFraction fraction="0.598252">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0702851">
+<MaterialFraction fraction="0.0701859">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
@@ -2407,443 +2545,443 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR710Z1" density="0.946166*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0693391">
+<CompositeMaterial name="servicecompositeR710Z1" density="0.946056*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0693384">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.833674">
+<MaterialFraction fraction="0.833664">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0356122">
+<MaterialFraction fraction="0.0356163">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00192238">
+<MaterialFraction fraction="0.0019226">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00110012">
+<MaterialFraction fraction="0.00110025">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0583518">
+<MaterialFraction fraction="0.0583586">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR710Z152" density="0.990329*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.000758498">
+<CompositeMaterial name="servicecompositeR710Z152" density="0.990219*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.000758583">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0662469">
+<MaterialFraction fraction="0.066246">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00248679">
+<MaterialFraction fraction="0.00248707">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00663144">
+<MaterialFraction fraction="0.00663218">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.796497">
+<MaterialFraction fraction="0.796483">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0340241">
+<MaterialFraction fraction="0.0340279">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00508736">
+<MaterialFraction fraction="0.00508793">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000650141">
+<MaterialFraction fraction="0.000650214">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0318678">
+<MaterialFraction fraction="0.0318713">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0557496">
+<MaterialFraction fraction="0.0557559">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR710Z252" density="1.01241*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00111293">
+<CompositeMaterial name="servicecompositeR710Z252" density="1.0123*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00111305">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.064802">
+<MaterialFraction fraction="0.0648009">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00364883">
+<MaterialFraction fraction="0.00364923">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00973021">
+<MaterialFraction fraction="0.00973127">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.779125">
+<MaterialFraction fraction="0.779109">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.033282">
+<MaterialFraction fraction="0.0332856">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0065663">
+<MaterialFraction fraction="0.00656702">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000953942">
+<MaterialFraction fraction="0.000954046">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.046245">
+<MaterialFraction fraction="0.04625">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0545337">
+<MaterialFraction fraction="0.0545396">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR710Z351" density="1.03449*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00145224">
+<CompositeMaterial name="servicecompositeR710Z351" density="1.03438*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00145239">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0634188">
+<MaterialFraction fraction="0.0634176">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00476126">
+<MaterialFraction fraction="0.00476177">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0126967">
+<MaterialFraction fraction="0.012698">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.762494">
+<MaterialFraction fraction="0.762477">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0325716">
+<MaterialFraction fraction="0.032575">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00798211">
+<MaterialFraction fraction="0.00798296">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00124477">
+<MaterialFraction fraction="0.00124491">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0600084">
+<MaterialFraction fraction="0.0600149">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0533696">
+<MaterialFraction fraction="0.0533754">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR710Z450" density="1.05657*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00177736">
+<CompositeMaterial name="servicecompositeR710Z450" density="1.05646*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00177754">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0620934">
+<MaterialFraction fraction="0.0620921">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00582719">
+<MaterialFraction fraction="0.0058278">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0155392">
+<MaterialFraction fraction="0.0155408">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.746559">
+<MaterialFraction fraction="0.74654">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0318908">
+<MaterialFraction fraction="0.0318942">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00933874">
+<MaterialFraction fraction="0.00933971">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00152345">
+<MaterialFraction fraction="0.00152361">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0731966">
+<MaterialFraction fraction="0.0732043">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0522543">
+<MaterialFraction fraction="0.0522597">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR710Z548" density="1.07866*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00208917">
+<CompositeMaterial name="servicecompositeR710Z548" density="1.07854*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00208938">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0608223">
+<MaterialFraction fraction="0.0608208">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00684948">
+<MaterialFraction fraction="0.00685018">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0182653">
+<MaterialFraction fraction="0.0182671">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.731276">
+<MaterialFraction fraction="0.731256">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.031238">
+<MaterialFraction fraction="0.0312412">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0106398">
+<MaterialFraction fraction="0.0106409">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00179071">
+<MaterialFraction fraction="0.0017909">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0858448">
+<MaterialFraction fraction="0.0858536">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0511846">
+<MaterialFraction fraction="0.0511898">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR710Z647" density="1.10074*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00238846">
+<CompositeMaterial name="servicecompositeR710Z647" density="1.10063*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0023887">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0596021">
+<MaterialFraction fraction="0.0596006">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00783075">
+<MaterialFraction fraction="0.00783154">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.020882">
+<MaterialFraction fraction="0.0208841">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.716606">
+<MaterialFraction fraction="0.716585">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0306113">
+<MaterialFraction fraction="0.0306144">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0118887">
+<MaterialFraction fraction="0.0118899">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00204726">
+<MaterialFraction fraction="0.00204746">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0979855">
+<MaterialFraction fraction="0.0979954">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0501578">
+<MaterialFraction fraction="0.0501628">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR710Z744" density="1.12282*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00267599">
+<CompositeMaterial name="servicecompositeR710Z744" density="1.12271*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00267626">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.05843">
+<MaterialFraction fraction="0.0584284">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00877343">
+<MaterialFraction fraction="0.00877429">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0233958">
+<MaterialFraction fraction="0.0233981">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.702513">
+<MaterialFraction fraction="0.702491">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0300093">
+<MaterialFraction fraction="0.0300123">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0130885">
+<MaterialFraction fraction="0.0130898">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00229371">
+<MaterialFraction fraction="0.00229393">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.109649">
+<MaterialFraction fraction="0.10966">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0491713">
+<MaterialFraction fraction="0.0491762">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR710Z842" density="1.1449*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00295243">
+<CompositeMaterial name="servicecompositeR710Z842" density="1.14479*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00295271">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0573031">
+<MaterialFraction fraction="0.0573014">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00967975">
+<MaterialFraction fraction="0.00968068">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0258127">
+<MaterialFraction fraction="0.0258151">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.688964">
+<MaterialFraction fraction="0.688941">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0294305">
+<MaterialFraction fraction="0.0294334">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0142419">
+<MaterialFraction fraction="0.0142433">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00253065">
+<MaterialFraction fraction="0.0025309">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.120862">
+<MaterialFraction fraction="0.120874">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.048223">
+<MaterialFraction fraction="0.0482276">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR710Z938" density="1.16698*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0032184">
+<CompositeMaterial name="servicecompositeR710Z938" density="1.16687*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00321871">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0562188">
+<MaterialFraction fraction="0.056217">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0105518">
+<MaterialFraction fraction="0.0105528">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.028138">
+<MaterialFraction fraction="0.0281407">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.675927">
+<MaterialFraction fraction="0.675904">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0288737">
+<MaterialFraction fraction="0.0288764">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0153518">
+<MaterialFraction fraction="0.0153532">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00275863">
+<MaterialFraction fraction="0.00275889">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.131651">
+<MaterialFraction fraction="0.131664">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473105">
+<MaterialFraction fraction="0.047315">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR710Z1035" density="1.18906*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0034745">
+<CompositeMaterial name="servicecompositeR710Z1035" density="1.18895*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00347482">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0551748">
+<MaterialFraction fraction="0.0551729">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0113914">
+<MaterialFraction fraction="0.0113925">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.030377">
+<MaterialFraction fraction="0.0303799">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.663375">
+<MaterialFraction fraction="0.663351">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0283375">
+<MaterialFraction fraction="0.0283401">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0164204">
+<MaterialFraction fraction="0.0164219">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00297814">
+<MaterialFraction fraction="0.00297842">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.142039">
+<MaterialFraction fraction="0.142053">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0464319">
+<MaterialFraction fraction="0.0464363">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR710Z1131" density="1.21114*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00372126">
+<CompositeMaterial name="servicecompositeR710Z1131" density="1.21103*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0037216">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0541688">
+<MaterialFraction fraction="0.0541669">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0122004">
+<MaterialFraction fraction="0.0122015">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0325344">
+<MaterialFraction fraction="0.0325374">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.65128">
+<MaterialFraction fraction="0.651255">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0278208">
+<MaterialFraction fraction="0.0278234">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.01745">
+<MaterialFraction fraction="0.0174516">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00318965">
+<MaterialFraction fraction="0.00318994">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.152049">
+<MaterialFraction fraction="0.152063">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0455854">
+<MaterialFraction fraction="0.0455896">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR710Z1189" density="1.23323*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00395918">
+<CompositeMaterial name="servicecompositeR710Z1190" density="1.23312*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00395953">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0531989">
+<MaterialFraction fraction="0.053197">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129804">
+<MaterialFraction fraction="0.0129816">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0346145">
+<MaterialFraction fraction="0.0346176">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.639619">
+<MaterialFraction fraction="0.639593">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0273227">
+<MaterialFraction fraction="0.0273251">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0184428">
+<MaterialFraction fraction="0.0184445">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00339358">
+<MaterialFraction fraction="0.00339389">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.1617">
+<MaterialFraction fraction="0.161714">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0447692">
+<MaterialFraction fraction="0.0447732">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR710Z53" density="0.968248*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.000387898">
+<CompositeMaterial name="servicecompositeR710Z53" density="0.968137*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.000387943">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0677577">
+<MaterialFraction fraction="0.0677569">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00127175">
+<MaterialFraction fraction="0.0012719">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00339134">
+<MaterialFraction fraction="0.00339173">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.814662">
+<MaterialFraction fraction="0.814649">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0348">
+<MaterialFraction fraction="0.034804">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00354096">
+<MaterialFraction fraction="0.00354136">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000332484">
+<MaterialFraction fraction="0.000332522">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0168348">
+<MaterialFraction fraction="0.0168367">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.057021">
+<MaterialFraction fraction="0.0570276">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR883Z1206" density="2.25841*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR883Z1206" density="2.28675*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.00343867">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
@@ -2883,443 +3021,443 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR883Z1" density="0.952072*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0693391">
+<CompositeMaterial name="servicecompositeR883Z1" density="0.95196*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0693384">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.833674">
+<MaterialFraction fraction="0.833664">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0356122">
+<MaterialFraction fraction="0.0356163">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00192238">
+<MaterialFraction fraction="0.0019226">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00110012">
+<MaterialFraction fraction="0.00110025">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0583518">
+<MaterialFraction fraction="0.0583586">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR883Z152" density="0.99651*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.000758498">
+<CompositeMaterial name="servicecompositeR883Z152" density="0.996399*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.000758583">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0662469">
+<MaterialFraction fraction="0.066246">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00248679">
+<MaterialFraction fraction="0.00248707">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00663144">
+<MaterialFraction fraction="0.00663218">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.796497">
+<MaterialFraction fraction="0.796483">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0340241">
+<MaterialFraction fraction="0.0340279">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00508736">
+<MaterialFraction fraction="0.00508793">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000650141">
+<MaterialFraction fraction="0.000650214">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0318678">
+<MaterialFraction fraction="0.0318713">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0557496">
+<MaterialFraction fraction="0.0557559">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR883Z252" density="1.01873*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00111293">
+<CompositeMaterial name="servicecompositeR883Z252" density="1.01862*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00111305">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.064802">
+<MaterialFraction fraction="0.0648009">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00364883">
+<MaterialFraction fraction="0.00364923">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00973021">
+<MaterialFraction fraction="0.00973127">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.779125">
+<MaterialFraction fraction="0.779109">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.033282">
+<MaterialFraction fraction="0.0332856">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0065663">
+<MaterialFraction fraction="0.00656702">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000953942">
+<MaterialFraction fraction="0.000954046">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.046245">
+<MaterialFraction fraction="0.04625">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0545337">
+<MaterialFraction fraction="0.0545396">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR883Z351" density="1.04095*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00145224">
+<CompositeMaterial name="servicecompositeR883Z351" density="1.04084*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00145239">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0634188">
+<MaterialFraction fraction="0.0634176">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00476126">
+<MaterialFraction fraction="0.00476177">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0126967">
+<MaterialFraction fraction="0.012698">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.762494">
+<MaterialFraction fraction="0.762477">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0325716">
+<MaterialFraction fraction="0.032575">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00798211">
+<MaterialFraction fraction="0.00798296">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00124477">
+<MaterialFraction fraction="0.00124491">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0600084">
+<MaterialFraction fraction="0.0600149">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0533696">
+<MaterialFraction fraction="0.0533754">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR883Z450" density="1.06317*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00177736">
+<CompositeMaterial name="servicecompositeR883Z450" density="1.06306*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00177754">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0620934">
+<MaterialFraction fraction="0.0620921">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00582719">
+<MaterialFraction fraction="0.0058278">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0155392">
+<MaterialFraction fraction="0.0155408">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.746559">
+<MaterialFraction fraction="0.74654">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0318908">
+<MaterialFraction fraction="0.0318942">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00933874">
+<MaterialFraction fraction="0.00933971">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00152345">
+<MaterialFraction fraction="0.00152361">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0731966">
+<MaterialFraction fraction="0.0732043">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0522543">
+<MaterialFraction fraction="0.0522597">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR883Z548" density="1.08539*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00208917">
+<CompositeMaterial name="servicecompositeR883Z548" density="1.08528*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00208938">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0608223">
+<MaterialFraction fraction="0.0608208">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00684948">
+<MaterialFraction fraction="0.00685018">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0182653">
+<MaterialFraction fraction="0.0182671">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.731276">
+<MaterialFraction fraction="0.731256">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.031238">
+<MaterialFraction fraction="0.0312412">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0106398">
+<MaterialFraction fraction="0.0106409">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00179071">
+<MaterialFraction fraction="0.0017909">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0858448">
+<MaterialFraction fraction="0.0858536">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0511846">
+<MaterialFraction fraction="0.0511898">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR883Z647" density="1.10761*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00238846">
+<CompositeMaterial name="servicecompositeR883Z647" density="1.1075*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0023887">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0596021">
+<MaterialFraction fraction="0.0596006">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00783075">
+<MaterialFraction fraction="0.00783154">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.020882">
+<MaterialFraction fraction="0.0208841">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.716606">
+<MaterialFraction fraction="0.716585">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0306113">
+<MaterialFraction fraction="0.0306144">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0118887">
+<MaterialFraction fraction="0.0118899">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00204726">
+<MaterialFraction fraction="0.00204746">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0979855">
+<MaterialFraction fraction="0.0979954">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0501578">
+<MaterialFraction fraction="0.0501628">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR883Z744" density="1.12983*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00267599">
+<CompositeMaterial name="servicecompositeR883Z744" density="1.12971*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00267626">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.05843">
+<MaterialFraction fraction="0.0584284">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00877343">
+<MaterialFraction fraction="0.00877429">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0233958">
+<MaterialFraction fraction="0.0233981">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.702513">
+<MaterialFraction fraction="0.702491">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0300093">
+<MaterialFraction fraction="0.0300123">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0130885">
+<MaterialFraction fraction="0.0130898">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00229371">
+<MaterialFraction fraction="0.00229393">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.109649">
+<MaterialFraction fraction="0.10966">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0491713">
+<MaterialFraction fraction="0.0491762">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR883Z842" density="1.15205*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00295243">
+<CompositeMaterial name="servicecompositeR883Z842" density="1.15193*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00295271">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0573031">
+<MaterialFraction fraction="0.0573014">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00967975">
+<MaterialFraction fraction="0.00968068">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0258127">
+<MaterialFraction fraction="0.0258151">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.688964">
+<MaterialFraction fraction="0.688941">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0294305">
+<MaterialFraction fraction="0.0294334">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0142419">
+<MaterialFraction fraction="0.0142433">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00253065">
+<MaterialFraction fraction="0.0025309">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.120862">
+<MaterialFraction fraction="0.120874">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.048223">
+<MaterialFraction fraction="0.0482276">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR883Z938" density="1.17426*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0032184">
+<CompositeMaterial name="servicecompositeR883Z938" density="1.17415*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00321871">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0562188">
+<MaterialFraction fraction="0.056217">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0105518">
+<MaterialFraction fraction="0.0105528">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.028138">
+<MaterialFraction fraction="0.0281407">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.675927">
+<MaterialFraction fraction="0.675904">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0288737">
+<MaterialFraction fraction="0.0288764">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0153518">
+<MaterialFraction fraction="0.0153532">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00275863">
+<MaterialFraction fraction="0.00275889">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.131651">
+<MaterialFraction fraction="0.131664">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473105">
+<MaterialFraction fraction="0.047315">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR883Z1035" density="1.19648*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0034745">
+<CompositeMaterial name="servicecompositeR883Z1035" density="1.19637*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00347482">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0551748">
+<MaterialFraction fraction="0.0551729">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0113914">
+<MaterialFraction fraction="0.0113925">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.030377">
+<MaterialFraction fraction="0.0303799">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.663375">
+<MaterialFraction fraction="0.663351">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0283375">
+<MaterialFraction fraction="0.0283401">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0164204">
+<MaterialFraction fraction="0.0164219">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00297814">
+<MaterialFraction fraction="0.00297842">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.142039">
+<MaterialFraction fraction="0.142053">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0464319">
+<MaterialFraction fraction="0.0464363">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR883Z1131" density="1.2187*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00372126">
+<CompositeMaterial name="servicecompositeR883Z1131" density="1.21859*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0037216">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0541688">
+<MaterialFraction fraction="0.0541669">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0122004">
+<MaterialFraction fraction="0.0122015">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0325344">
+<MaterialFraction fraction="0.0325374">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.65128">
+<MaterialFraction fraction="0.651255">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0278208">
+<MaterialFraction fraction="0.0278234">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.01745">
+<MaterialFraction fraction="0.0174516">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00318965">
+<MaterialFraction fraction="0.00318994">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.152049">
+<MaterialFraction fraction="0.152063">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0455854">
+<MaterialFraction fraction="0.0455896">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR883Z1189" density="1.24092*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00395918">
+<CompositeMaterial name="servicecompositeR883Z1190" density="1.24081*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00395953">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0531989">
+<MaterialFraction fraction="0.053197">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129804">
+<MaterialFraction fraction="0.0129816">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0346145">
+<MaterialFraction fraction="0.0346176">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.639619">
+<MaterialFraction fraction="0.639593">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0273227">
+<MaterialFraction fraction="0.0273251">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0184428">
+<MaterialFraction fraction="0.0184445">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00339358">
+<MaterialFraction fraction="0.00339389">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.1617">
+<MaterialFraction fraction="0.161714">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0447692">
+<MaterialFraction fraction="0.0447732">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR883Z53" density="0.974291*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.000387898">
+<CompositeMaterial name="servicecompositeR883Z53" density="0.97418*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.000387943">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0677577">
+<MaterialFraction fraction="0.0677569">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00127175">
+<MaterialFraction fraction="0.0012719">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00339134">
+<MaterialFraction fraction="0.00339173">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.814662">
+<MaterialFraction fraction="0.814649">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0348">
+<MaterialFraction fraction="0.034804">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00354096">
+<MaterialFraction fraction="0.00354136">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000332484">
+<MaterialFraction fraction="0.000332522">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0168348">
+<MaterialFraction fraction="0.0168367">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.057021">
+<MaterialFraction fraction="0.0570276">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1130Z1206" density="3.44858*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR1105Z1206" density="3.48816*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.00343867">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
@@ -3342,7 +3480,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1120Z1204" density="8.44812*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR1095Z1204" density="8.41729*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.31311">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
@@ -3359,439 +3497,439 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1130Z1" density="0.967042*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0693391">
+<CompositeMaterial name="servicecompositeR1105Z1" density="0.963381*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0693384">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.833674">
+<MaterialFraction fraction="0.833664">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0356122">
+<MaterialFraction fraction="0.0356163">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00192238">
+<MaterialFraction fraction="0.0019226">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00110012">
+<MaterialFraction fraction="0.00110025">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0583518">
+<MaterialFraction fraction="0.0583586">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1130Z152" density="1.01218*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.000758498">
+<CompositeMaterial name="servicecompositeR1105Z152" density="1.00835*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.000758583">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0662469">
+<MaterialFraction fraction="0.066246">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00248679">
+<MaterialFraction fraction="0.00248707">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00663144">
+<MaterialFraction fraction="0.00663218">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.796497">
+<MaterialFraction fraction="0.796483">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0340241">
+<MaterialFraction fraction="0.0340279">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00508736">
+<MaterialFraction fraction="0.00508793">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000650141">
+<MaterialFraction fraction="0.000650214">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0318678">
+<MaterialFraction fraction="0.0318713">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0557496">
+<MaterialFraction fraction="0.0557559">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1130Z252" density="1.03475*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00111293">
+<CompositeMaterial name="servicecompositeR1105Z252" density="1.03084*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00111305">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.064802">
+<MaterialFraction fraction="0.0648009">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00364883">
+<MaterialFraction fraction="0.00364923">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00973021">
+<MaterialFraction fraction="0.00973127">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.779125">
+<MaterialFraction fraction="0.779109">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.033282">
+<MaterialFraction fraction="0.0332856">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0065663">
+<MaterialFraction fraction="0.00656702">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000953942">
+<MaterialFraction fraction="0.000954046">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.046245">
+<MaterialFraction fraction="0.04625">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0545337">
+<MaterialFraction fraction="0.0545396">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1130Z351" density="1.05732*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00145224">
+<CompositeMaterial name="servicecompositeR1105Z351" density="1.05332*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00145239">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0634188">
+<MaterialFraction fraction="0.0634176">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00476126">
+<MaterialFraction fraction="0.00476177">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0126967">
+<MaterialFraction fraction="0.012698">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.762494">
+<MaterialFraction fraction="0.762477">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0325716">
+<MaterialFraction fraction="0.032575">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00798211">
+<MaterialFraction fraction="0.00798296">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00124477">
+<MaterialFraction fraction="0.00124491">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0600084">
+<MaterialFraction fraction="0.0600149">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0533696">
+<MaterialFraction fraction="0.0533754">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1130Z450" density="1.07989*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00177736">
+<CompositeMaterial name="servicecompositeR1105Z450" density="1.07581*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00177754">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0620934">
+<MaterialFraction fraction="0.0620921">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00582719">
+<MaterialFraction fraction="0.0058278">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0155392">
+<MaterialFraction fraction="0.0155408">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.746559">
+<MaterialFraction fraction="0.74654">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0318908">
+<MaterialFraction fraction="0.0318942">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00933874">
+<MaterialFraction fraction="0.00933971">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00152345">
+<MaterialFraction fraction="0.00152361">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0731966">
+<MaterialFraction fraction="0.0732043">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0522543">
+<MaterialFraction fraction="0.0522597">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1130Z548" density="1.10245*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00208917">
+<CompositeMaterial name="servicecompositeR1105Z548" density="1.0983*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00208938">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0608223">
+<MaterialFraction fraction="0.0608208">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00684948">
+<MaterialFraction fraction="0.00685018">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0182653">
+<MaterialFraction fraction="0.0182671">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.731276">
+<MaterialFraction fraction="0.731256">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.031238">
+<MaterialFraction fraction="0.0312412">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0106398">
+<MaterialFraction fraction="0.0106409">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00179071">
+<MaterialFraction fraction="0.0017909">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0858448">
+<MaterialFraction fraction="0.0858536">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0511846">
+<MaterialFraction fraction="0.0511898">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1130Z647" density="1.12502*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00238846">
+<CompositeMaterial name="servicecompositeR1105Z647" density="1.12078*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0023887">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0596021">
+<MaterialFraction fraction="0.0596006">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00783075">
+<MaterialFraction fraction="0.00783154">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.020882">
+<MaterialFraction fraction="0.0208841">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.716606">
+<MaterialFraction fraction="0.716585">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0306113">
+<MaterialFraction fraction="0.0306144">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0118887">
+<MaterialFraction fraction="0.0118899">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00204726">
+<MaterialFraction fraction="0.00204746">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0979855">
+<MaterialFraction fraction="0.0979954">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0501578">
+<MaterialFraction fraction="0.0501628">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1130Z744" density="1.14759*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00267599">
+<CompositeMaterial name="servicecompositeR1105Z744" density="1.14327*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00267626">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.05843">
+<MaterialFraction fraction="0.0584284">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00877343">
+<MaterialFraction fraction="0.00877429">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0233958">
+<MaterialFraction fraction="0.0233981">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.702513">
+<MaterialFraction fraction="0.702491">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0300093">
+<MaterialFraction fraction="0.0300123">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0130885">
+<MaterialFraction fraction="0.0130898">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00229371">
+<MaterialFraction fraction="0.00229393">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.109649">
+<MaterialFraction fraction="0.10966">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0491713">
+<MaterialFraction fraction="0.0491762">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1130Z842" density="1.17016*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00295243">
+<CompositeMaterial name="servicecompositeR1105Z842" density="1.16575*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00295271">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0573031">
+<MaterialFraction fraction="0.0573014">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00967975">
+<MaterialFraction fraction="0.00968068">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0258127">
+<MaterialFraction fraction="0.0258151">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.688964">
+<MaterialFraction fraction="0.688941">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0294305">
+<MaterialFraction fraction="0.0294334">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0142419">
+<MaterialFraction fraction="0.0142433">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00253065">
+<MaterialFraction fraction="0.0025309">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.120862">
+<MaterialFraction fraction="0.120874">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.048223">
+<MaterialFraction fraction="0.0482276">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1130Z938" density="1.19273*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0032184">
+<CompositeMaterial name="servicecompositeR1105Z938" density="1.18824*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00321871">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0562188">
+<MaterialFraction fraction="0.056217">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0105518">
+<MaterialFraction fraction="0.0105528">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.028138">
+<MaterialFraction fraction="0.0281407">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.675927">
+<MaterialFraction fraction="0.675904">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0288737">
+<MaterialFraction fraction="0.0288764">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0153518">
+<MaterialFraction fraction="0.0153532">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00275863">
+<MaterialFraction fraction="0.00275889">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.131651">
+<MaterialFraction fraction="0.131664">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473105">
+<MaterialFraction fraction="0.047315">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1130Z1035" density="1.2153*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0034745">
+<CompositeMaterial name="servicecompositeR1105Z1035" density="1.21073*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00347482">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0551748">
+<MaterialFraction fraction="0.0551729">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0113914">
+<MaterialFraction fraction="0.0113925">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.030377">
+<MaterialFraction fraction="0.0303799">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.663375">
+<MaterialFraction fraction="0.663351">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0283375">
+<MaterialFraction fraction="0.0283401">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0164204">
+<MaterialFraction fraction="0.0164219">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00297814">
+<MaterialFraction fraction="0.00297842">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.142039">
+<MaterialFraction fraction="0.142053">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0464319">
+<MaterialFraction fraction="0.0464363">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1130Z1131" density="1.23787*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00372126">
+<CompositeMaterial name="servicecompositeR1105Z1131" density="1.23321*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0037216">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0541688">
+<MaterialFraction fraction="0.0541669">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0122004">
+<MaterialFraction fraction="0.0122015">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0325344">
+<MaterialFraction fraction="0.0325374">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.65128">
+<MaterialFraction fraction="0.651255">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0278208">
+<MaterialFraction fraction="0.0278234">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.01745">
+<MaterialFraction fraction="0.0174516">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00318965">
+<MaterialFraction fraction="0.00318994">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.152049">
+<MaterialFraction fraction="0.152063">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0455854">
+<MaterialFraction fraction="0.0455896">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1130Z1189" density="1.26043*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00395918">
+<CompositeMaterial name="servicecompositeR1105Z1190" density="1.2557*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00395953">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0531989">
+<MaterialFraction fraction="0.053197">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129804">
+<MaterialFraction fraction="0.0129816">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0346145">
+<MaterialFraction fraction="0.0346176">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.639619">
+<MaterialFraction fraction="0.639593">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0273227">
+<MaterialFraction fraction="0.0273251">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0184428">
+<MaterialFraction fraction="0.0184445">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00339358">
+<MaterialFraction fraction="0.00339389">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.1617">
+<MaterialFraction fraction="0.161714">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0447692">
+<MaterialFraction fraction="0.0447732">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1130Z53" density="0.98961*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.000387898">
+<CompositeMaterial name="servicecompositeR1105Z53" density="0.985867*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.000387943">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0677577">
+<MaterialFraction fraction="0.0677569">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00127175">
+<MaterialFraction fraction="0.0012719">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00339134">
+<MaterialFraction fraction="0.00339173">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.814662">
+<MaterialFraction fraction="0.814649">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0348">
+<MaterialFraction fraction="0.034804">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00354096">
+<MaterialFraction fraction="0.00354136">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000332484">
+<MaterialFraction fraction="0.000332522">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0168348">
+<MaterialFraction fraction="0.0168367">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.057021">
+<MaterialFraction fraction="0.0570276">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
@@ -3924,699 +4062,699 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z193" density="0.11103*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0134842">
+<CompositeMaterial name="servicecompositeR300Z216" density="0.123111*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0135122">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00393823">
+<MaterialFraction fraction="0.00389924">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0442088">
+<MaterialFraction fraction="0.0443007">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.11789">
+<MaterialFraction fraction="0.118135">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0746979">
+<MaterialFraction fraction="0.0741241">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0618345">
+<MaterialFraction fraction="0.0619245">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0115578">
+<MaterialFraction fraction="0.0115819">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.550175">
+<MaterialFraction fraction="0.551298">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.122214">
+<MaterialFraction fraction="0.121224">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z238" density="0.135191*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0135352">
+<CompositeMaterial name="servicecompositeR300Z264" density="0.147272*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0135545">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00386721">
+<MaterialFraction fraction="0.00384044">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0443763">
+<MaterialFraction fraction="0.0444394">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.118337">
+<MaterialFraction fraction="0.118505">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0736528">
+<MaterialFraction fraction="0.0732589">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0619985">
+<MaterialFraction fraction="0.0620603">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0116016">
+<MaterialFraction fraction="0.0116182">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.552221">
+<MaterialFraction fraction="0.552992">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.120411">
+<MaterialFraction fraction="0.119731">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z289" density="0.159352*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0135708">
+<CompositeMaterial name="servicecompositeR300Z311" density="0.171433*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0135849">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00381773">
+<MaterialFraction fraction="0.00379822">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.044493">
+<MaterialFraction fraction="0.044539">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.118648">
+<MaterialFraction fraction="0.118771">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0729247">
+<MaterialFraction fraction="0.0726375">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0621127">
+<MaterialFraction fraction="0.0621578">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0116322">
+<MaterialFraction fraction="0.0116442">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.553646">
+<MaterialFraction fraction="0.554208">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.119155">
+<MaterialFraction fraction="0.11866">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z334" density="0.183513*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0135971">
+<CompositeMaterial name="servicecompositeR300Z364" density="0.195594*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0136078">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00378128">
+<MaterialFraction fraction="0.00376643">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.044579">
+<MaterialFraction fraction="0.044614">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.118877">
+<MaterialFraction fraction="0.118971">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0723882">
+<MaterialFraction fraction="0.0721697">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0621969">
+<MaterialFraction fraction="0.0622312">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0116546">
+<MaterialFraction fraction="0.0116638">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.554696">
+<MaterialFraction fraction="0.555124">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.11823">
+<MaterialFraction fraction="0.117853">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z393" density="0.207675*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0136172">
+<CompositeMaterial name="servicecompositeR300Z428" density="0.219755*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0136256">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00375331">
+<MaterialFraction fraction="0.00374163">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.044645">
+<MaterialFraction fraction="0.0446725">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.119053">
+<MaterialFraction fraction="0.119127">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0719766">
+<MaterialFraction fraction="0.0718047">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0622615">
+<MaterialFraction fraction="0.0622885">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0116719">
+<MaterialFraction fraction="0.0116791">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.555502">
+<MaterialFraction fraction="0.555838">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.11752">
+<MaterialFraction fraction="0.117223">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z463" density="0.231836*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0136331">
+<CompositeMaterial name="servicecompositeR300Z504" density="0.243916*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0136399">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00373117">
+<MaterialFraction fraction="0.00372175">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0446972">
+<MaterialFraction fraction="0.0447194">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.119192">
+<MaterialFraction fraction="0.119252">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0716508">
+<MaterialFraction fraction="0.0715121">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0623126">
+<MaterialFraction fraction="0.0623344">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0116855">
+<MaterialFraction fraction="0.0116913">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.556139">
+<MaterialFraction fraction="0.556411">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.116958">
+<MaterialFraction fraction="0.116719">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z546" density="0.255997*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.013646">
+<CompositeMaterial name="servicecompositeR300Z585" density="0.268077*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0136516">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00371321">
+<MaterialFraction fraction="0.00370544">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0447395">
+<MaterialFraction fraction="0.0447579">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.119305">
+<MaterialFraction fraction="0.119354">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0713865">
+<MaterialFraction fraction="0.0712722">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0623541">
+<MaterialFraction fraction="0.062372">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0116966">
+<MaterialFraction fraction="0.0117014">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.556657">
+<MaterialFraction fraction="0.55688">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.116502">
+<MaterialFraction fraction="0.116305">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z625" density="0.280158*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0136567">
+<CompositeMaterial name="servicecompositeR300Z680" density="0.292238*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0136614">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00369835">
+<MaterialFraction fraction="0.00369184">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0447746">
+<MaterialFraction fraction="0.04479">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.119399">
+<MaterialFraction fraction="0.11944">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0711677">
+<MaterialFraction fraction="0.0710719">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0623884">
+<MaterialFraction fraction="0.0624034">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0117058">
+<MaterialFraction fraction="0.0117098">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.557085">
+<MaterialFraction fraction="0.557272">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.116125">
+<MaterialFraction fraction="0.115959">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z734" density="0.304319*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0136657">
+<CompositeMaterial name="servicecompositeR300Z800" density="0.3164*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0136697">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00368584">
+<MaterialFraction fraction="0.00368031">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0448041">
+<MaterialFraction fraction="0.0448171">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.119478">
+<MaterialFraction fraction="0.119512">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0709837">
+<MaterialFraction fraction="0.0709023">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0624173">
+<MaterialFraction fraction="0.0624301">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0117135">
+<MaterialFraction fraction="0.0117169">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.557445">
+<MaterialFraction fraction="0.557604">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.115807">
+<MaterialFraction fraction="0.115667">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z865" density="0.32848*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0136734">
+<CompositeMaterial name="servicecompositeR300Z942" density="0.340561*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0136768">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00367518">
+<MaterialFraction fraction="0.00367042">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0448292">
+<MaterialFraction fraction="0.0448405">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.119545">
+<MaterialFraction fraction="0.119575">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0708268">
+<MaterialFraction fraction="0.0707567">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0624419">
+<MaterialFraction fraction="0.0624529">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0117201">
+<MaterialFraction fraction="0.011723">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.557752">
+<MaterialFraction fraction="0.557889">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.115537">
+<MaterialFraction fraction="0.115416">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z1018" density="0.352641*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.01368">
+<CompositeMaterial name="servicecompositeR300Z1107" density="0.364722*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.013683">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00366598">
+<MaterialFraction fraction="0.00366183">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.044851">
+<MaterialFraction fraction="0.0448607">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.119603">
+<MaterialFraction fraction="0.119629">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0706914">
+<MaterialFraction fraction="0.0706304">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0624631">
+<MaterialFraction fraction="0.0624727">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0117257">
+<MaterialFraction fraction="0.0117283">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.558017">
+<MaterialFraction fraction="0.558137">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.115303">
+<MaterialFraction fraction="0.115198">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z1196" density="0.376802*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0136858">
+<CompositeMaterial name="servicecompositeR300Z1208" density="0.388883*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0136884">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00365796">
+<MaterialFraction fraction="0.00365432">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0448699">
+<MaterialFraction fraction="0.0448785">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.119653">
+<MaterialFraction fraction="0.119676">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0705733">
+<MaterialFraction fraction="0.0705198">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0624817">
+<MaterialFraction fraction="0.0624901">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0117307">
+<MaterialFraction fraction="0.0117329">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.558248">
+<MaterialFraction fraction="0.558353">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.115099">
+<MaterialFraction fraction="0.115007">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z216" density="0.123111*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0135122">
+<CompositeMaterial name="servicecompositeR300Z193" density="0.11103*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0134842">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00389924">
+<MaterialFraction fraction="0.00393823">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0443007">
+<MaterialFraction fraction="0.0442088">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.118135">
+<MaterialFraction fraction="0.11789">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0741241">
+<MaterialFraction fraction="0.0746979">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0619245">
+<MaterialFraction fraction="0.0618345">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0115819">
+<MaterialFraction fraction="0.0115578">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.551298">
+<MaterialFraction fraction="0.550175">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.121224">
+<MaterialFraction fraction="0.122214">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z264" density="0.147272*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0135545">
+<CompositeMaterial name="servicecompositeR300Z238" density="0.135191*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0135352">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00384044">
+<MaterialFraction fraction="0.00386721">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0444394">
+<MaterialFraction fraction="0.0443763">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.118505">
+<MaterialFraction fraction="0.118337">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0732589">
+<MaterialFraction fraction="0.0736528">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0620603">
+<MaterialFraction fraction="0.0619985">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0116182">
+<MaterialFraction fraction="0.0116016">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.552992">
+<MaterialFraction fraction="0.552221">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.119731">
+<MaterialFraction fraction="0.120411">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z311" density="0.171433*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0135849">
+<CompositeMaterial name="servicecompositeR300Z289" density="0.159352*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0135708">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00379822">
+<MaterialFraction fraction="0.00381773">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.044539">
+<MaterialFraction fraction="0.044493">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.118771">
+<MaterialFraction fraction="0.118648">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0726375">
+<MaterialFraction fraction="0.0729247">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0621578">
+<MaterialFraction fraction="0.0621127">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0116442">
+<MaterialFraction fraction="0.0116322">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.554208">
+<MaterialFraction fraction="0.553646">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.11866">
+<MaterialFraction fraction="0.119155">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z364" density="0.195594*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0136078">
+<CompositeMaterial name="servicecompositeR300Z334" density="0.183513*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0135971">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00376643">
+<MaterialFraction fraction="0.00378128">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.044614">
+<MaterialFraction fraction="0.044579">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.118971">
+<MaterialFraction fraction="0.118877">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0721697">
+<MaterialFraction fraction="0.0723882">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0622312">
+<MaterialFraction fraction="0.0621969">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0116638">
+<MaterialFraction fraction="0.0116546">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.555124">
+<MaterialFraction fraction="0.554696">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.117853">
+<MaterialFraction fraction="0.11823">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z428" density="0.219755*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0136256">
+<CompositeMaterial name="servicecompositeR300Z393" density="0.207675*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0136172">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00374163">
+<MaterialFraction fraction="0.00375331">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0446725">
+<MaterialFraction fraction="0.044645">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.119127">
+<MaterialFraction fraction="0.119053">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0718047">
+<MaterialFraction fraction="0.0719766">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0622885">
+<MaterialFraction fraction="0.0622615">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0116791">
+<MaterialFraction fraction="0.0116719">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.555838">
+<MaterialFraction fraction="0.555502">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.117223">
+<MaterialFraction fraction="0.11752">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z504" density="0.243916*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0136399">
+<CompositeMaterial name="servicecompositeR300Z463" density="0.231836*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0136331">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00372175">
+<MaterialFraction fraction="0.00373117">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0447194">
+<MaterialFraction fraction="0.0446972">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.119252">
+<MaterialFraction fraction="0.119192">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0715121">
+<MaterialFraction fraction="0.0716508">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0623344">
+<MaterialFraction fraction="0.0623126">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0116913">
+<MaterialFraction fraction="0.0116855">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.556411">
+<MaterialFraction fraction="0.556139">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.116719">
+<MaterialFraction fraction="0.116958">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z585" density="0.268077*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0136516">
+<CompositeMaterial name="servicecompositeR300Z546" density="0.255997*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.013646">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00370544">
+<MaterialFraction fraction="0.00371321">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0447579">
+<MaterialFraction fraction="0.0447395">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.119354">
+<MaterialFraction fraction="0.119305">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0712722">
+<MaterialFraction fraction="0.0713865">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.062372">
+<MaterialFraction fraction="0.0623541">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0117014">
+<MaterialFraction fraction="0.0116966">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.55688">
+<MaterialFraction fraction="0.556657">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.116305">
+<MaterialFraction fraction="0.116502">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z680" density="0.292238*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0136614">
+<CompositeMaterial name="servicecompositeR300Z625" density="0.280158*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0136567">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00369184">
+<MaterialFraction fraction="0.00369835">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.04479">
+<MaterialFraction fraction="0.0447746">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.11944">
+<MaterialFraction fraction="0.119399">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0710719">
+<MaterialFraction fraction="0.0711677">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0624034">
+<MaterialFraction fraction="0.0623884">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0117098">
+<MaterialFraction fraction="0.0117058">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.557272">
+<MaterialFraction fraction="0.557085">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.115959">
+<MaterialFraction fraction="0.116125">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z800" density="0.3164*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0136697">
+<CompositeMaterial name="servicecompositeR300Z734" density="0.304319*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0136657">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00368031">
+<MaterialFraction fraction="0.00368584">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0448171">
+<MaterialFraction fraction="0.0448041">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.119512">
+<MaterialFraction fraction="0.119478">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0709023">
+<MaterialFraction fraction="0.0709837">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0624301">
+<MaterialFraction fraction="0.0624173">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0117169">
+<MaterialFraction fraction="0.0117135">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.557604">
+<MaterialFraction fraction="0.557445">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.115667">
+<MaterialFraction fraction="0.115807">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z942" density="0.340561*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0136768">
+<CompositeMaterial name="servicecompositeR300Z865" density="0.32848*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0136734">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00367042">
+<MaterialFraction fraction="0.00367518">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0448405">
+<MaterialFraction fraction="0.0448292">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.119575">
+<MaterialFraction fraction="0.119545">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0707567">
+<MaterialFraction fraction="0.0708268">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0624529">
+<MaterialFraction fraction="0.0624419">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.011723">
+<MaterialFraction fraction="0.0117201">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.557889">
+<MaterialFraction fraction="0.557752">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.115416">
+<MaterialFraction fraction="0.115537">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z1107" density="0.364722*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.013683">
+<CompositeMaterial name="servicecompositeR300Z1018" density="0.352641*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.01368">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00366183">
+<MaterialFraction fraction="0.00366598">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0448607">
+<MaterialFraction fraction="0.044851">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.119629">
+<MaterialFraction fraction="0.119603">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0706304">
+<MaterialFraction fraction="0.0706914">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0624727">
+<MaterialFraction fraction="0.0624631">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0117283">
+<MaterialFraction fraction="0.0117257">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.558137">
+<MaterialFraction fraction="0.558017">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.115198">
+<MaterialFraction fraction="0.115303">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR300Z1208" density="0.388883*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0136884">
+<CompositeMaterial name="servicecompositeR300Z1196" density="0.376802*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0136858">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00365432">
+<MaterialFraction fraction="0.00365796">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0448785">
+<MaterialFraction fraction="0.0448699">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.119676">
+<MaterialFraction fraction="0.119653">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0705198">
+<MaterialFraction fraction="0.0705733">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0624901">
+<MaterialFraction fraction="0.0624817">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0117329">
+<MaterialFraction fraction="0.0117307">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.558353">
+<MaterialFraction fraction="0.558248">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.115007">
+<MaterialFraction fraction="0.115099">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
@@ -4720,7 +4858,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z181" density="0.0812941*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR417Z182" density="0.0812941*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.0170089">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
@@ -4740,7 +4878,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z225" density="0.101618*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR417Z226" density="0.101618*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.0170089">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
@@ -4789,699 +4927,699 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z292" density="0.155436*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144556">
+<CompositeMaterial name="servicecompositeR417Z318" density="0.167415*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144536">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00284346">
+<MaterialFraction fraction="0.00283173">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473936">
+<MaterialFraction fraction="0.0473873">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126383">
+<MaterialFraction fraction="0.126366">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0536921">
+<MaterialFraction fraction="0.05339">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0648595">
+<MaterialFraction fraction="0.0648349">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123905">
+<MaterialFraction fraction="0.0123888">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.589978">
+<MaterialFraction fraction="0.590741">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0880043">
+<MaterialFraction fraction="0.0876067">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z344" density="0.179394*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.014452">
+<CompositeMaterial name="servicecompositeR417Z372" density="0.191373*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144505">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00282157">
+<MaterialFraction fraction="0.00281269">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473818">
+<MaterialFraction fraction="0.047377">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126351">
+<MaterialFraction fraction="0.126339">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0531282">
+<MaterialFraction fraction="0.0528991">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0648136">
+<MaterialFraction fraction="0.064795">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123874">
+<MaterialFraction fraction="0.0123861">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.591402">
+<MaterialFraction fraction="0.59198">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0872623">
+<MaterialFraction fraction="0.086961">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z400" density="0.203353*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144492">
+<CompositeMaterial name="servicecompositeR417Z425" density="0.215332*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144481">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00280484">
+<MaterialFraction fraction="0.00279788">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473727">
+<MaterialFraction fraction="0.047369">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126327">
+<MaterialFraction fraction="0.126317">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0526971">
+<MaterialFraction fraction="0.0525175">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0647786">
+<MaterialFraction fraction="0.064764">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.012385">
+<MaterialFraction fraction="0.012384">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.59249">
+<MaterialFraction fraction="0.592943">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0866952">
+<MaterialFraction fraction="0.086459">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z450" density="0.227311*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.014447">
+<CompositeMaterial name="servicecompositeR417Z482" density="0.23929*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144461">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00279164">
+<MaterialFraction fraction="0.00278603">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473656">
+<MaterialFraction fraction="0.0473626">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126308">
+<MaterialFraction fraction="0.1263">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0523569">
+<MaterialFraction fraction="0.0522123">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0647509">
+<MaterialFraction fraction="0.0647391">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123832">
+<MaterialFraction fraction="0.0123824">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.593349">
+<MaterialFraction fraction="0.593714">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0862476">
+<MaterialFraction fraction="0.0860575">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z514" density="0.251269*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144453">
+<CompositeMaterial name="servicecompositeR417Z550" density="0.263248*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144445">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00278096">
+<MaterialFraction fraction="0.00277634">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473598">
+<MaterialFraction fraction="0.0473573">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126293">
+<MaterialFraction fraction="0.126286">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0520815">
+<MaterialFraction fraction="0.0519627">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0647285">
+<MaterialFraction fraction="0.0647188">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123816">
+<MaterialFraction fraction="0.012381">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.594044">
+<MaterialFraction fraction="0.594344">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0858854">
+<MaterialFraction fraction="0.085729">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z586" density="0.275227*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144438">
+<CompositeMaterial name="servicecompositeR417Z625" density="0.287206*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144432">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00277213">
+<MaterialFraction fraction="0.00276827">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.047355">
+<MaterialFraction fraction="0.0473529">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.12628">
+<MaterialFraction fraction="0.126275">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0518541">
+<MaterialFraction fraction="0.0517547">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.06471">
+<MaterialFraction fraction="0.0647019">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123804">
+<MaterialFraction fraction="0.0123799">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.594618">
+<MaterialFraction fraction="0.594869">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0855863">
+<MaterialFraction fraction="0.0854554">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z665" density="0.299185*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144426">
+<CompositeMaterial name="servicecompositeR417Z702" density="0.311164*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.014442">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00276472">
+<MaterialFraction fraction="0.00276144">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.047351">
+<MaterialFraction fraction="0.0473493">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126269">
+<MaterialFraction fraction="0.126265">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0516632">
+<MaterialFraction fraction="0.0515787">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0646945">
+<MaterialFraction fraction="0.0646876">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123794">
+<MaterialFraction fraction="0.0123789">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.5951">
+<MaterialFraction fraction="0.595313">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.085335">
+<MaterialFraction fraction="0.0852239">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z741" density="0.323143*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144415">
+<CompositeMaterial name="servicecompositeR417Z789" density="0.335122*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144411">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00275841">
+<MaterialFraction fraction="0.00275559">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473476">
+<MaterialFraction fraction="0.0473461">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.12626">
+<MaterialFraction fraction="0.126256">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0515005">
+<MaterialFraction fraction="0.0514279">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0646813">
+<MaterialFraction fraction="0.0646754">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123785">
+<MaterialFraction fraction="0.0123781">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.595511">
+<MaterialFraction fraction="0.595694">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.085121">
+<MaterialFraction fraction="0.0850255">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z836" density="0.347101*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144406">
+<CompositeMaterial name="servicecompositeR417Z890" density="0.35908*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144402">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00275297">
+<MaterialFraction fraction="0.00275052">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473447">
+<MaterialFraction fraction="0.0473433">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126252">
+<MaterialFraction fraction="0.126249">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0513603">
+<MaterialFraction fraction="0.0512972">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0646699">
+<MaterialFraction fraction="0.0646647">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123777">
+<MaterialFraction fraction="0.0123773">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.595865">
+<MaterialFraction fraction="0.596024">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0849366">
+<MaterialFraction fraction="0.0848536">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z943" density="0.371059*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144399">
+<CompositeMaterial name="servicecompositeR417Z1004" density="0.383038*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144395">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00274823">
+<MaterialFraction fraction="0.00274608">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473421">
+<MaterialFraction fraction="0.0473409">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126246">
+<MaterialFraction fraction="0.126243">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0512382">
+<MaterialFraction fraction="0.0511829">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0646599">
+<MaterialFraction fraction="0.0646555">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.012377">
+<MaterialFraction fraction="0.0123767">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.596173">
+<MaterialFraction fraction="0.596313">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0847759">
+<MaterialFraction fraction="0.0847032">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z1064" density="0.395017*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144392">
+<CompositeMaterial name="servicecompositeR417Z1131" density="0.406996*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144389">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00274407">
+<MaterialFraction fraction="0.00274217">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473398">
+<MaterialFraction fraction="0.0473388">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.12624">
+<MaterialFraction fraction="0.126237">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0511309">
+<MaterialFraction fraction="0.051082">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0646512">
+<MaterialFraction fraction="0.0646472">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123764">
+<MaterialFraction fraction="0.0123762">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.596444">
+<MaterialFraction fraction="0.596567">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0846348">
+<MaterialFraction fraction="0.0845704">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z1197" density="0.418975*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144386">
+<CompositeMaterial name="servicecompositeR417Z1208" density="0.430955*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144383">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00274038">
+<MaterialFraction fraction="0.00273869">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473379">
+<MaterialFraction fraction="0.0473369">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126234">
+<MaterialFraction fraction="0.126232">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0510359">
+<MaterialFraction fraction="0.0509923">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0646435">
+<MaterialFraction fraction="0.06464">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123759">
+<MaterialFraction fraction="0.0123757">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.596684">
+<MaterialFraction fraction="0.596794">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0845098">
+<MaterialFraction fraction="0.0844525">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z318" density="0.167415*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144536">
+<CompositeMaterial name="servicecompositeR417Z292" density="0.155436*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144556">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00283173">
+<MaterialFraction fraction="0.00284346">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473873">
+<MaterialFraction fraction="0.0473936">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126366">
+<MaterialFraction fraction="0.126383">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.05339">
+<MaterialFraction fraction="0.0536921">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0648349">
+<MaterialFraction fraction="0.0648595">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123888">
+<MaterialFraction fraction="0.0123905">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.590741">
+<MaterialFraction fraction="0.589978">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0876067">
+<MaterialFraction fraction="0.0880043">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z372" density="0.191373*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144505">
+<CompositeMaterial name="servicecompositeR417Z344" density="0.179394*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.014452">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00281269">
+<MaterialFraction fraction="0.00282157">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.047377">
+<MaterialFraction fraction="0.0473818">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126339">
+<MaterialFraction fraction="0.126351">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0528991">
+<MaterialFraction fraction="0.0531282">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.064795">
+<MaterialFraction fraction="0.0648136">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123861">
+<MaterialFraction fraction="0.0123874">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.59198">
+<MaterialFraction fraction="0.591402">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.086961">
+<MaterialFraction fraction="0.0872623">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z425" density="0.215332*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144481">
+<CompositeMaterial name="servicecompositeR417Z400" density="0.203353*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144492">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00279788">
+<MaterialFraction fraction="0.00280484">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.047369">
+<MaterialFraction fraction="0.0473727">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126317">
+<MaterialFraction fraction="0.126327">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0525175">
+<MaterialFraction fraction="0.0526971">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.064764">
+<MaterialFraction fraction="0.0647786">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.012384">
+<MaterialFraction fraction="0.012385">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.592943">
+<MaterialFraction fraction="0.59249">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.086459">
+<MaterialFraction fraction="0.0866952">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z482" density="0.23929*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144461">
+<CompositeMaterial name="servicecompositeR417Z450" density="0.227311*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.014447">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00278603">
+<MaterialFraction fraction="0.00279164">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473626">
+<MaterialFraction fraction="0.0473656">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.1263">
+<MaterialFraction fraction="0.126308">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0522123">
+<MaterialFraction fraction="0.0523569">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0647391">
+<MaterialFraction fraction="0.0647509">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123824">
+<MaterialFraction fraction="0.0123832">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.593714">
+<MaterialFraction fraction="0.593349">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0860575">
+<MaterialFraction fraction="0.0862476">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z550" density="0.263248*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144445">
+<CompositeMaterial name="servicecompositeR417Z514" density="0.251269*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144453">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00277634">
+<MaterialFraction fraction="0.00278096">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473573">
+<MaterialFraction fraction="0.0473598">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126286">
+<MaterialFraction fraction="0.126293">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0519627">
+<MaterialFraction fraction="0.0520815">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0647188">
+<MaterialFraction fraction="0.0647285">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.012381">
+<MaterialFraction fraction="0.0123816">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.594344">
+<MaterialFraction fraction="0.594044">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.085729">
+<MaterialFraction fraction="0.0858854">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z625" density="0.287206*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144432">
+<CompositeMaterial name="servicecompositeR417Z586" density="0.275227*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144438">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00276827">
+<MaterialFraction fraction="0.00277213">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473529">
+<MaterialFraction fraction="0.047355">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126275">
+<MaterialFraction fraction="0.12628">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0517547">
+<MaterialFraction fraction="0.0518541">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0647019">
+<MaterialFraction fraction="0.06471">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123799">
+<MaterialFraction fraction="0.0123804">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.594869">
+<MaterialFraction fraction="0.594618">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0854554">
+<MaterialFraction fraction="0.0855863">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z702" density="0.311164*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.014442">
+<CompositeMaterial name="servicecompositeR417Z665" density="0.299185*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144426">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00276144">
+<MaterialFraction fraction="0.00276472">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473493">
+<MaterialFraction fraction="0.047351">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126265">
+<MaterialFraction fraction="0.126269">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0515787">
+<MaterialFraction fraction="0.0516632">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0646876">
+<MaterialFraction fraction="0.0646945">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123789">
+<MaterialFraction fraction="0.0123794">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.595313">
+<MaterialFraction fraction="0.5951">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0852239">
+<MaterialFraction fraction="0.085335">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z789" density="0.335122*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144411">
+<CompositeMaterial name="servicecompositeR417Z741" density="0.323143*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144415">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00275559">
+<MaterialFraction fraction="0.00275841">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473461">
+<MaterialFraction fraction="0.0473476">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126256">
+<MaterialFraction fraction="0.12626">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0514279">
+<MaterialFraction fraction="0.0515005">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0646754">
+<MaterialFraction fraction="0.0646813">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123781">
+<MaterialFraction fraction="0.0123785">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.595694">
+<MaterialFraction fraction="0.595511">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0850255">
+<MaterialFraction fraction="0.085121">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z890" density="0.35908*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144402">
+<CompositeMaterial name="servicecompositeR417Z836" density="0.347101*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144406">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00275052">
+<MaterialFraction fraction="0.00275297">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473433">
+<MaterialFraction fraction="0.0473447">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126249">
+<MaterialFraction fraction="0.126252">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0512972">
+<MaterialFraction fraction="0.0513603">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0646647">
+<MaterialFraction fraction="0.0646699">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123773">
+<MaterialFraction fraction="0.0123777">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.596024">
+<MaterialFraction fraction="0.595865">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0848536">
+<MaterialFraction fraction="0.0849366">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z1004" density="0.383038*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144395">
+<CompositeMaterial name="servicecompositeR417Z943" density="0.371059*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144399">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00274608">
+<MaterialFraction fraction="0.00274823">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473409">
+<MaterialFraction fraction="0.0473421">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126243">
+<MaterialFraction fraction="0.126246">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0511829">
+<MaterialFraction fraction="0.0512382">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0646555">
+<MaterialFraction fraction="0.0646599">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123767">
+<MaterialFraction fraction="0.012377">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.596313">
+<MaterialFraction fraction="0.596173">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0847032">
+<MaterialFraction fraction="0.0847759">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z1131" density="0.406996*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144389">
+<CompositeMaterial name="servicecompositeR417Z1064" density="0.395017*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144392">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00274217">
+<MaterialFraction fraction="0.00274407">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473388">
+<MaterialFraction fraction="0.0473398">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126237">
+<MaterialFraction fraction="0.12624">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.051082">
+<MaterialFraction fraction="0.0511309">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0646472">
+<MaterialFraction fraction="0.0646512">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123762">
+<MaterialFraction fraction="0.0123764">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.596567">
+<MaterialFraction fraction="0.596444">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0845704">
+<MaterialFraction fraction="0.0846348">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z1208" density="0.430955*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0144383">
+<CompositeMaterial name="servicecompositeR417Z1197" density="0.418975*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0144386">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00273869">
+<MaterialFraction fraction="0.00274038">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0473369">
+<MaterialFraction fraction="0.0473379">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.126232">
+<MaterialFraction fraction="0.126234">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0509923">
+<MaterialFraction fraction="0.0510359">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.06464">
+<MaterialFraction fraction="0.0646435">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0123757">
+<MaterialFraction fraction="0.0123759">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.596794">
+<MaterialFraction fraction="0.596684">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0844525">
+<MaterialFraction fraction="0.0845098">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
@@ -5625,7 +5763,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z274" density="0.124371*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR567Z273" density="0.124371*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.0170089">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
@@ -5665,7 +5803,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z360" density="0.187774*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR567Z359" density="0.187774*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.0150211">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
@@ -5694,703 +5832,703 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z384" density="0.199382*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0150307">
+<CompositeMaterial name="servicecompositeR567Z411" density="0.21099*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0150392">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00221292">
+<MaterialFraction fraction="0.00220098">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0492791">
+<MaterialFraction fraction="0.0493071">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.131411">
+<MaterialFraction fraction="0.131486">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0419343">
+<MaterialFraction fraction="0.0417756">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0666831">
+<MaterialFraction fraction="0.0667072">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0128834">
+<MaterialFraction fraction="0.0128908">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.61198">
+<MaterialFraction fraction="0.61232">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0685853">
+<MaterialFraction fraction="0.0682732">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z438" density="0.222599*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0150469">
+<CompositeMaterial name="servicecompositeR567Z466" density="0.234207*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0150538">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00219028">
+<MaterialFraction fraction="0.00218065">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0493322">
+<MaterialFraction fraction="0.0493548">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.131553">
+<MaterialFraction fraction="0.131613">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0416334">
+<MaterialFraction fraction="0.0415054">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0667289">
+<MaterialFraction fraction="0.0667484">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0128973">
+<MaterialFraction fraction="0.0129032">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.612625">
+<MaterialFraction fraction="0.612899">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0679937">
+<MaterialFraction fraction="0.0677419">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z494" density="0.245815*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.01506">
+<CompositeMaterial name="servicecompositeR567Z524" density="0.257424*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0150657">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00217192">
+<MaterialFraction fraction="0.00216398">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0493753">
+<MaterialFraction fraction="0.0493939">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.131668">
+<MaterialFraction fraction="0.131717">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0413894">
+<MaterialFraction fraction="0.0412839">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.066766">
+<MaterialFraction fraction="0.0667821">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129086">
+<MaterialFraction fraction="0.0129135">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.613147">
+<MaterialFraction fraction="0.613373">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0675139">
+<MaterialFraction fraction="0.0673065">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z554" density="0.269032*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0150709">
+<CompositeMaterial name="servicecompositeR567Z586" density="0.28064*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0150756">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00215673">
+<MaterialFraction fraction="0.00215007">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.049411">
+<MaterialFraction fraction="0.0494266">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.131763">
+<MaterialFraction fraction="0.131804">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0411875">
+<MaterialFraction fraction="0.0410991">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0667968">
+<MaterialFraction fraction="0.0668102">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129179">
+<MaterialFraction fraction="0.012922">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.61358">
+<MaterialFraction fraction="0.613769">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0671169">
+<MaterialFraction fraction="0.0669431">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z619" density="0.292249*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.01508">
+<CompositeMaterial name="servicecompositeR567Z653" density="0.303857*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0150841">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00214395">
+<MaterialFraction fraction="0.00213829">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.049441">
+<MaterialFraction fraction="0.0494542">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.131843">
+<MaterialFraction fraction="0.131878">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0410177">
+<MaterialFraction fraction="0.0409425">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0668226">
+<MaterialFraction fraction="0.0668341">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129257">
+<MaterialFraction fraction="0.0129292">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.613943">
+<MaterialFraction fraction="0.614104">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.066783">
+<MaterialFraction fraction="0.0666352">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z686" density="0.315465*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0150878">
+<CompositeMaterial name="servicecompositeR567Z715" density="0.327074*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0150913">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00213305">
+<MaterialFraction fraction="0.00212818">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0494665">
+<MaterialFraction fraction="0.049478">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.131911">
+<MaterialFraction fraction="0.131941">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0408729">
+<MaterialFraction fraction="0.0408082">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0668447">
+<MaterialFraction fraction="0.0668545">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129324">
+<MaterialFraction fraction="0.0129354">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.614254">
+<MaterialFraction fraction="0.614392">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0664982">
+<MaterialFraction fraction="0.066371">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z745" density="0.338682*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0150946">
+<CompositeMaterial name="servicecompositeR567Z783" density="0.35029*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0150976">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00212365">
+<MaterialFraction fraction="0.00211941">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0494886">
+<MaterialFraction fraction="0.0494985">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.13197">
+<MaterialFraction fraction="0.131996">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0407479">
+<MaterialFraction fraction="0.0406916">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0668637">
+<MaterialFraction fraction="0.0668723">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129382">
+<MaterialFraction fraction="0.0129408">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.614521">
+<MaterialFraction fraction="0.614642">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0662525">
+<MaterialFraction fraction="0.0661418">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z822" density="0.361899*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0151004">
+<CompositeMaterial name="servicecompositeR567Z864" density="0.373507*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0151031">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00211545">
+<MaterialFraction fraction="0.00211174">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0495078">
+<MaterialFraction fraction="0.0495166">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.132021">
+<MaterialFraction fraction="0.132044">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.040639">
+<MaterialFraction fraction="0.0405896">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0668803">
+<MaterialFraction fraction="0.0668878">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129432">
+<MaterialFraction fraction="0.0129455">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.614755">
+<MaterialFraction fraction="0.61486">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0660383">
+<MaterialFraction fraction="0.0659412">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z905" density="0.385116*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0151056">
+<CompositeMaterial name="servicecompositeR567Z950" density="0.396724*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0151079">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00210824">
+<MaterialFraction fraction="0.00210496">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0495248">
+<MaterialFraction fraction="0.0495325">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.132066">
+<MaterialFraction fraction="0.132087">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0405431">
+<MaterialFraction fraction="0.0404995">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0668949">
+<MaterialFraction fraction="0.0669015">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129477">
+<MaterialFraction fraction="0.0129497">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.61496">
+<MaterialFraction fraction="0.615053">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0658499">
+<MaterialFraction fraction="0.065764">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z995" density="0.408332*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0151102">
+<CompositeMaterial name="servicecompositeR567Z1044" density="0.419941*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0151123">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00210185">
+<MaterialFraction fraction="0.00209893">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0495398">
+<MaterialFraction fraction="0.0495466">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.132106">
+<MaterialFraction fraction="0.132124">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0404582">
+<MaterialFraction fraction="0.0404193">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0669078">
+<MaterialFraction fraction="0.0669137">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129516">
+<MaterialFraction fraction="0.0129534">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.615142">
+<MaterialFraction fraction="0.615225">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.065683">
+<MaterialFraction fraction="0.0656064">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z1092" density="0.431549*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0151142">
+<CompositeMaterial name="servicecompositeR567Z1144" density="0.443157*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0151161">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00209615">
+<MaterialFraction fraction="0.00209353">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0495531">
+<MaterialFraction fraction="0.0495593">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.132142">
+<MaterialFraction fraction="0.132158">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0403825">
+<MaterialFraction fraction="0.0403476">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0669193">
+<MaterialFraction fraction="0.0669247">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129551">
+<MaterialFraction fraction="0.0129567">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.615304">
+<MaterialFraction fraction="0.615379">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.065534">
+<MaterialFraction fraction="0.0654653">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z1197" density="0.454766*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0151179">
+<CompositeMaterial name="servicecompositeR567Z1207" density="0.466374*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0151196">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00209103">
+<MaterialFraction fraction="0.00208867">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0495652">
+<MaterialFraction fraction="0.0495707">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.132174">
+<MaterialFraction fraction="0.132189">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0403144">
+<MaterialFraction fraction="0.040283">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0669297">
+<MaterialFraction fraction="0.0669345">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129582">
+<MaterialFraction fraction="0.0129597">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.61545">
+<MaterialFraction fraction="0.615517">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0654002">
+<MaterialFraction fraction="0.0653383">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z411" density="0.21099*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0150392">
+<CompositeMaterial name="servicecompositeR567Z384" density="0.199382*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0150307">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00220098">
+<MaterialFraction fraction="0.00221292">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0493071">
+<MaterialFraction fraction="0.0492791">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.131486">
+<MaterialFraction fraction="0.131411">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0417756">
+<MaterialFraction fraction="0.0419343">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0667072">
+<MaterialFraction fraction="0.0666831">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0128908">
+<MaterialFraction fraction="0.0128834">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.61232">
+<MaterialFraction fraction="0.61198">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0682732">
+<MaterialFraction fraction="0.0685853">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z466" density="0.234207*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0150538">
+<CompositeMaterial name="servicecompositeR567Z438" density="0.222599*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0150469">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00218065">
+<MaterialFraction fraction="0.00219028">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0493548">
+<MaterialFraction fraction="0.0493322">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.131613">
+<MaterialFraction fraction="0.131553">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0415054">
+<MaterialFraction fraction="0.0416334">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0667484">
+<MaterialFraction fraction="0.0667289">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129032">
+<MaterialFraction fraction="0.0128973">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.612899">
+<MaterialFraction fraction="0.612625">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0677419">
+<MaterialFraction fraction="0.0679937">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z524" density="0.257424*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0150657">
+<CompositeMaterial name="servicecompositeR567Z494" density="0.245815*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.01506">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00216398">
+<MaterialFraction fraction="0.00217192">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0493939">
+<MaterialFraction fraction="0.0493753">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.131717">
+<MaterialFraction fraction="0.131668">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0412839">
+<MaterialFraction fraction="0.0413894">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0667821">
+<MaterialFraction fraction="0.066766">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129135">
+<MaterialFraction fraction="0.0129086">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.613373">
+<MaterialFraction fraction="0.613147">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0673065">
+<MaterialFraction fraction="0.0675139">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z586" density="0.28064*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0150756">
+<CompositeMaterial name="servicecompositeR567Z554" density="0.269032*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0150709">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00215007">
+<MaterialFraction fraction="0.00215673">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0494266">
+<MaterialFraction fraction="0.049411">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.131804">
+<MaterialFraction fraction="0.131763">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0410991">
+<MaterialFraction fraction="0.0411875">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0668102">
+<MaterialFraction fraction="0.0667968">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.012922">
+<MaterialFraction fraction="0.0129179">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.613769">
+<MaterialFraction fraction="0.61358">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0669431">
+<MaterialFraction fraction="0.0671169">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z653" density="0.303857*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0150841">
+<CompositeMaterial name="servicecompositeR567Z619" density="0.292249*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.01508">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00213829">
+<MaterialFraction fraction="0.00214395">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0494542">
+<MaterialFraction fraction="0.049441">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.131878">
+<MaterialFraction fraction="0.131843">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0409425">
+<MaterialFraction fraction="0.0410177">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0668341">
+<MaterialFraction fraction="0.0668226">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129292">
+<MaterialFraction fraction="0.0129257">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.614104">
+<MaterialFraction fraction="0.613943">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0666352">
+<MaterialFraction fraction="0.066783">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z715" density="0.327074*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0150913">
+<CompositeMaterial name="servicecompositeR567Z686" density="0.315465*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0150878">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00212818">
+<MaterialFraction fraction="0.00213305">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.049478">
+<MaterialFraction fraction="0.0494665">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.131941">
+<MaterialFraction fraction="0.131911">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0408082">
+<MaterialFraction fraction="0.0408729">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0668545">
+<MaterialFraction fraction="0.0668447">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129354">
+<MaterialFraction fraction="0.0129324">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.614392">
+<MaterialFraction fraction="0.614254">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.066371">
+<MaterialFraction fraction="0.0664982">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z783" density="0.35029*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0150976">
+<CompositeMaterial name="servicecompositeR567Z745" density="0.338682*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0150946">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00211941">
+<MaterialFraction fraction="0.00212365">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0494985">
+<MaterialFraction fraction="0.0494886">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.131996">
+<MaterialFraction fraction="0.13197">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0406916">
+<MaterialFraction fraction="0.0407479">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0668723">
+<MaterialFraction fraction="0.0668637">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129408">
+<MaterialFraction fraction="0.0129382">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.614642">
+<MaterialFraction fraction="0.614521">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0661418">
+<MaterialFraction fraction="0.0662525">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z864" density="0.373507*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0151031">
+<CompositeMaterial name="servicecompositeR567Z822" density="0.361899*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0151004">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00211174">
+<MaterialFraction fraction="0.00211545">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0495166">
+<MaterialFraction fraction="0.0495078">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.132044">
+<MaterialFraction fraction="0.132021">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0405896">
+<MaterialFraction fraction="0.040639">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0668878">
+<MaterialFraction fraction="0.0668803">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129455">
+<MaterialFraction fraction="0.0129432">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.61486">
+<MaterialFraction fraction="0.614755">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0659412">
+<MaterialFraction fraction="0.0660383">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z950" density="0.396724*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0151079">
+<CompositeMaterial name="servicecompositeR567Z905" density="0.385116*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0151056">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00210496">
+<MaterialFraction fraction="0.00210824">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0495325">
+<MaterialFraction fraction="0.0495248">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.132087">
+<MaterialFraction fraction="0.132066">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0404995">
+<MaterialFraction fraction="0.0405431">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0669015">
+<MaterialFraction fraction="0.0668949">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129497">
+<MaterialFraction fraction="0.0129477">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.615053">
+<MaterialFraction fraction="0.61496">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.065764">
+<MaterialFraction fraction="0.0658499">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z1044" density="0.419941*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0151123">
+<CompositeMaterial name="servicecompositeR567Z995" density="0.408332*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0151102">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00209893">
+<MaterialFraction fraction="0.00210185">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0495466">
+<MaterialFraction fraction="0.0495398">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.132124">
+<MaterialFraction fraction="0.132106">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0404193">
+<MaterialFraction fraction="0.0404582">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0669137">
+<MaterialFraction fraction="0.0669078">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129534">
+<MaterialFraction fraction="0.0129516">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.615225">
+<MaterialFraction fraction="0.615142">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0656064">
+<MaterialFraction fraction="0.065683">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z1144" density="0.443157*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0151161">
+<CompositeMaterial name="servicecompositeR567Z1092" density="0.431549*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0151142">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00209353">
+<MaterialFraction fraction="0.00209615">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0495593">
+<MaterialFraction fraction="0.0495531">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.132158">
+<MaterialFraction fraction="0.132142">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0403476">
+<MaterialFraction fraction="0.0403825">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0669247">
+<MaterialFraction fraction="0.0669193">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129567">
+<MaterialFraction fraction="0.0129551">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.615379">
+<MaterialFraction fraction="0.615304">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0654653">
+<MaterialFraction fraction="0.065534">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR567Z1207" density="0.466374*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0151196">
+<CompositeMaterial name="servicecompositeR567Z1197" density="0.454766*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0151179">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00208867">
+<MaterialFraction fraction="0.00209103">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0495707">
+<MaterialFraction fraction="0.0495652">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.132189">
+<MaterialFraction fraction="0.132174">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.040283">
+<MaterialFraction fraction="0.0403144">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0669345">
+<MaterialFraction fraction="0.0669297">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0129597">
+<MaterialFraction fraction="0.0129582">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.615517">
+<MaterialFraction fraction="0.61545">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0653383">
+<MaterialFraction fraction="0.0654002">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1128Z1458" density="0.889404*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR1102Z1459" density="0.910809*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.00357079">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
@@ -6413,7 +6551,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1126Z1339" density="1.88618*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR1100Z1340" density="1.93166*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.542169">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
@@ -6421,747 +6559,747 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR217Z1340" density="2.30483*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0014235">
+<CompositeMaterial name="servicecompositeR224Z1341" density="1.49502*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.000855392">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.399162">
+<MaterialFraction fraction="0.638789">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.168371">
+<MaterialFraction fraction="0.101175">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00145412">
+<MaterialFraction fraction="0.000873788">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00082655">
+<MaterialFraction fraction="0.000496679">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.428581">
+<MaterialFraction fraction="0.257538">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.29212e-05">
+<MaterialFraction fraction="1.9337e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.12646e-05">
+<MaterialFraction fraction="6.17538e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.31991e-05">
+<MaterialFraction fraction="1.97529e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="7.50266e-06">
+<MaterialFraction fraction="1.1228e-05">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000106704">
+<MaterialFraction fraction="0.000159687">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR279Z1340" density="2.07253*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.000176667">
+<CompositeMaterial name="servicecompositeR287Z1341" density="1.51602*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.000236427">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0012929">
+<MaterialFraction fraction="0.000843543">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000579214">
+<MaterialFraction fraction="0.000775142">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00154457">
+<MaterialFraction fraction="0.00206705">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.443902">
+<MaterialFraction fraction="0.62994">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.152923">
+<MaterialFraction fraction="0.0997739">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00207784">
+<MaterialFraction fraction="0.00187494">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000151429">
+<MaterialFraction fraction="0.000202652">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00792843">
+<MaterialFraction fraction="0.0100955">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.389259">
+<MaterialFraction fraction="0.25397">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.17357e-05">
+<MaterialFraction fraction="1.57055e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.74786e-05">
+<MaterialFraction fraction="5.01563e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.19881e-05">
+<MaterialFraction fraction="1.60433e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.81429e-06">
+<MaterialFraction fraction="9.11932e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="9.69143e-05">
+<MaterialFraction fraction="0.000129697">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR328Z1340" density="1.954*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.000361739">
+<CompositeMaterial name="servicecompositeR334Z1341" density="1.53597*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.000454741">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00120332">
+<MaterialFraction fraction="0.000832584">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00118599">
+<MaterialFraction fraction="0.0014909">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00316263">
+<MaterialFraction fraction="0.00397574">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.470829">
+<MaterialFraction fraction="0.621757">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.142328">
+<MaterialFraction fraction="0.0984777">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00277951">
+<MaterialFraction fraction="0.00279938">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000310062">
+<MaterialFraction fraction="0.000389778">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0153956">
+<MaterialFraction fraction="0.0189589">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.36229">
+<MaterialFraction fraction="0.250671">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.09226e-05">
+<MaterialFraction fraction="1.37308e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.4882e-05">
+<MaterialFraction fraction="4.385e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.11575e-05">
+<MaterialFraction fraction="1.40261e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.34218e-06">
+<MaterialFraction fraction="7.97273e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="9.01999e-05">
+<MaterialFraction fraction="0.00011339">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR364Z1340" density="1.86042*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.000522574">
+<CompositeMaterial name="servicecompositeR367Z1341" density="1.55168*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.000622643">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00112481">
+<MaterialFraction fraction="0.000824157">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0017133">
+<MaterialFraction fraction="0.00204138">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00456879">
+<MaterialFraction fraction="0.00544368">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.494513">
+<MaterialFraction fraction="0.615463">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.133042">
+<MaterialFraction fraction="0.0974809">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0033886">
+<MaterialFraction fraction="0.00351035">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00044792">
+<MaterialFraction fraction="0.000533694">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0218845">
+<MaterialFraction fraction="0.0257756">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.338651">
+<MaterialFraction fraction="0.248133">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.021e-05">
+<MaterialFraction fraction="1.21651e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.2606e-05">
+<MaterialFraction fraction="3.88498e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.04295e-05">
+<MaterialFraction fraction="1.24267e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.92836e-06">
+<MaterialFraction fraction="7.06359e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="8.43144e-05">
+<MaterialFraction fraction="0.00010046">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR414Z1340" density="1.79134*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.000692588">
+<CompositeMaterial name="servicecompositeR416Z1341" density="1.56772*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0007906">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00105595">
+<MaterialFraction fraction="0.000815723">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0022707">
+<MaterialFraction fraction="0.00259204">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00605519">
+<MaterialFraction fraction="0.0069121">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.513582">
+<MaterialFraction fraction="0.609165">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.124897">
+<MaterialFraction fraction="0.0964833">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00404689">
+<MaterialFraction fraction="0.00422155">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000593646">
+<MaterialFraction fraction="0.000677657">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.028752">
+<MaterialFraction fraction="0.0325946">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.31792">
+<MaterialFraction fraction="0.245594">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="9.58492e-06">
+<MaterialFraction fraction="1.09413e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.06099e-05">
+<MaterialFraction fraction="3.49417e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="9.79104e-06">
+<MaterialFraction fraction="1.11766e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.56544e-06">
+<MaterialFraction fraction="6.35304e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="7.91529e-05">
+<MaterialFraction fraction="9.03543e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR447Z1340" density="1.7366*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.000868483">
+<CompositeMaterial name="servicecompositeR446Z1341" density="1.58377*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.000955172">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000993094">
+<MaterialFraction fraction="0.000807456">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00284738">
+<MaterialFraction fraction="0.0031316">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00759303">
+<MaterialFraction fraction="0.00835093">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.52977">
+<MaterialFraction fraction="0.602992">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.117463">
+<MaterialFraction fraction="0.0955056">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00473652">
+<MaterialFraction fraction="0.00491841">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000744414">
+<MaterialFraction fraction="0.000818719">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0358619">
+<MaterialFraction fraction="0.0392761">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.298996">
+<MaterialFraction fraction="0.243105">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="9.01439e-06">
+<MaterialFraction fraction="9.91417e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.87879e-05">
+<MaterialFraction fraction="3.16614e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="9.20825e-06">
+<MaterialFraction fraction="1.01274e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.23416e-06">
+<MaterialFraction fraction="5.75661e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="7.44414e-05">
+<MaterialFraction fraction="8.18719e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR497Z1340" density="1.69291*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00102618">
+<CompositeMaterial name="servicecompositeR496Z1341" density="1.59747*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00109306">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000938735">
+<MaterialFraction fraction="0.00080053">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00336441">
+<MaterialFraction fraction="0.00358366">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00897176">
+<MaterialFraction fraction="0.00955643">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.543442">
+<MaterialFraction fraction="0.597819">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.111033">
+<MaterialFraction fraction="0.0946863">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00535685">
+<MaterialFraction fraction="0.00550227">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000879585">
+<MaterialFraction fraction="0.000936905">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0422374">
+<MaterialFraction fraction="0.0448741">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.28263">
+<MaterialFraction fraction="0.24102">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="8.52098e-06">
+<MaterialFraction fraction="9.07627e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.72122e-05">
+<MaterialFraction fraction="2.89855e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="8.70422e-06">
+<MaterialFraction fraction="9.27146e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.94766e-06">
+<MaterialFraction fraction="5.27009e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="7.03668e-05">
+<MaterialFraction fraction="7.49524e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR528Z1340" density="1.65757*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.0011898">
+<CompositeMaterial name="servicecompositeR524Z1341" density="1.6115*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00123179">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000888497">
+<MaterialFraction fraction="0.00079356">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00390084">
+<MaterialFraction fraction="0.00403853">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0104022">
+<MaterialFraction fraction="0.0107694">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.555028">
+<MaterialFraction fraction="0.592614">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.105091">
+<MaterialFraction fraction="0.0938619">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00600674">
+<MaterialFraction fraction="0.00608974">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00101983">
+<MaterialFraction fraction="0.00105582">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0488557">
+<MaterialFraction fraction="0.0505068">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.267504">
+<MaterialFraction fraction="0.238921">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="8.06495e-06">
+<MaterialFraction fraction="8.34963e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.57558e-05">
+<MaterialFraction fraction="2.66649e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="8.23839e-06">
+<MaterialFraction fraction="8.52919e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.68288e-06">
+<MaterialFraction fraction="4.84817e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.66009e-05">
+<MaterialFraction fraction="6.89518e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR579Z1340" density="1.63096*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00135983">
+<CompositeMaterial name="servicecompositeR575Z1341" density="1.62605*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00137302">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000843356">
+<MaterialFraction fraction="0.000786463">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00445829">
+<MaterialFraction fraction="0.00450155">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0118888">
+<MaterialFraction fraction="0.0120041">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.564084">
+<MaterialFraction fraction="0.587314">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0997518">
+<MaterialFraction fraction="0.0930225">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00668933">
+<MaterialFraction fraction="0.00668775">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00116557">
+<MaterialFraction fraction="0.00117687">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0557376">
+<MaterialFraction fraction="0.0562405">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.253914">
+<MaterialFraction fraction="0.236784">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="7.65521e-06">
+<MaterialFraction fraction="7.72947e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.44473e-05">
+<MaterialFraction fraction="2.46844e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="7.81984e-06">
+<MaterialFraction fraction="7.8957e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.44496e-06">
+<MaterialFraction fraction="4.48808e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.32172e-05">
+<MaterialFraction fraction="6.38305e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR606Z1340" density="1.6053*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00151046">
+<CompositeMaterial name="servicecompositeR602Z1341" density="1.63839*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0014909">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000801014">
+<MaterialFraction fraction="0.000780539">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00495216">
+<MaterialFraction fraction="0.00488804">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0132058">
+<MaterialFraction fraction="0.0130348">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.5731">
+<MaterialFraction fraction="0.582891">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0947436">
+<MaterialFraction fraction="0.0923218">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00729166">
+<MaterialFraction fraction="0.00718691">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00129468">
+<MaterialFraction fraction="0.00127792">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0618331">
+<MaterialFraction fraction="0.0610265">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.241165">
+<MaterialFraction fraction="0.235001">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="7.27087e-06">
+<MaterialFraction fraction="7.17671e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.32199e-05">
+<MaterialFraction fraction="2.29192e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="7.42723e-06">
+<MaterialFraction fraction="7.33105e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.22179e-06">
+<MaterialFraction fraction="4.16712e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.00433e-05">
+<MaterialFraction fraction="5.92658e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR661Z1340" density="1.55877*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00162711">
+<CompositeMaterial name="servicecompositeR656Z1341" density="1.64471*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00155071">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000744228">
+<MaterialFraction fraction="0.000777539">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0053346">
+<MaterialFraction fraction="0.00508413">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0142256">
+<MaterialFraction fraction="0.0135577">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.59021">
+<MaterialFraction fraction="0.58065">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.088027">
+<MaterialFraction fraction="0.091967">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00773357">
+<MaterialFraction fraction="0.00744018">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00139467">
+<MaterialFraction fraction="0.00132918">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0665394">
+<MaterialFraction fraction="0.0634548">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.224069">
+<MaterialFraction fraction="0.234098">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.75542e-06">
+<MaterialFraction fraction="6.43824e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.15738e-05">
+<MaterialFraction fraction="2.05608e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.9007e-06">
+<MaterialFraction fraction="6.57669e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.9225e-06">
+<MaterialFraction fraction="3.73833e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.57867e-05">
+<MaterialFraction fraction="5.31674e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR744Z1340" density="1.50412*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00172703">
+<CompositeMaterial name="servicecompositeR741Z1341" density="1.64894*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00159054">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000679509">
+<MaterialFraction fraction="0.000775545">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00566218">
+<MaterialFraction fraction="0.00521471">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0150992">
+<MaterialFraction fraction="0.0139059">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.611653">
+<MaterialFraction fraction="0.579161">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.080372">
+<MaterialFraction fraction="0.0917311">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00809567">
+<MaterialFraction fraction="0.00760884">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00148031">
+<MaterialFraction fraction="0.00136332">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0705612">
+<MaterialFraction fraction="0.0650718">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.204583">
+<MaterialFraction fraction="0.233497">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.16796e-06">
+<MaterialFraction fraction="5.68051e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.96977e-05">
+<MaterialFraction fraction="1.8141e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.3006e-06">
+<MaterialFraction fraction="5.80267e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.58139e-06">
+<MaterialFraction fraction="3.29836e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.09354e-05">
+<MaterialFraction fraction="4.691e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR851Z1340" density="1.46678*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00184727">
+<CompositeMaterial name="servicecompositeR839Z1341" density="1.65687*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00166453">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000625871">
+<MaterialFraction fraction="0.00077183">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0060564">
+<MaterialFraction fraction="0.00545729">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0161504">
+<MaterialFraction fraction="0.0145528">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.627223">
+<MaterialFraction fraction="0.576387">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0740278">
+<MaterialFraction fraction="0.0912917">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0085562">
+<MaterialFraction fraction="0.00792214">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00158337">
+<MaterialFraction fraction="0.00142674">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0754153">
+<MaterialFraction fraction="0.0680757">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.188434">
+<MaterialFraction fraction="0.232379">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.68108e-06">
+<MaterialFraction fraction="5.1191e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.81428e-05">
+<MaterialFraction fraction="1.63481e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.80326e-06">
+<MaterialFraction fraction="5.22918e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.29869e-06">
+<MaterialFraction fraction="2.97238e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.69148e-05">
+<MaterialFraction fraction="4.22738e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR924Z1340" density="1.43731*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00196303">
+<CompositeMaterial name="servicecompositeR905Z1341" density="1.6639*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00172945">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000579273">
+<MaterialFraction fraction="0.00076857">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00643593">
+<MaterialFraction fraction="0.00567011">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0171625">
+<MaterialFraction fraction="0.0151203">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.640086">
+<MaterialFraction fraction="0.573952">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0685162">
+<MaterialFraction fraction="0.0909061">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00900471">
+<MaterialFraction fraction="0.00819701">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0016826">
+<MaterialFraction fraction="0.00148238">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0800914">
+<MaterialFraction fraction="0.0707112">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.174405">
+<MaterialFraction fraction="0.231397">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.25811e-06">
+<MaterialFraction fraction="4.63244e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.6792e-05">
+<MaterialFraction fraction="1.47939e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.37119e-06">
+<MaterialFraction fraction="4.73207e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.0531e-06">
+<MaterialFraction fraction="2.68981e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.34218e-05">
+<MaterialFraction fraction="3.8255e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1033Z1340" density="1.41672*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00209248">
+<CompositeMaterial name="servicecompositeR1014Z1341" density="1.67283*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00181107">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000539202">
+<MaterialFraction fraction="0.000764469">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00686035">
+<MaterialFraction fraction="0.00593774">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0182943">
+<MaterialFraction fraction="0.015834">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.649388">
+<MaterialFraction fraction="0.570889">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0637766">
+<MaterialFraction fraction="0.090421">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00951857">
+<MaterialFraction fraction="0.00854266">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00179355">
+<MaterialFraction fraction="0.00155235">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0853276">
+<MaterialFraction fraction="0.0740253">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.162341">
+<MaterialFraction fraction="0.230163">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.89438e-06">
+<MaterialFraction fraction="4.23617e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.56304e-05">
+<MaterialFraction fraction="1.35284e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.99964e-06">
+<MaterialFraction fraction="4.32727e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.8419e-06">
+<MaterialFraction fraction="2.45971e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.04181e-05">
+<MaterialFraction fraction="3.49825e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1100Z1340" density="1.41838*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00227097">
+<CompositeMaterial name="servicecompositeR1074Z1341" density="1.68871*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00195402">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000516137">
+<MaterialFraction fraction="0.00075728">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00744555">
+<MaterialFraction fraction="0.00640641">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0198548">
+<MaterialFraction fraction="0.0170838">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.648629">
+<MaterialFraction fraction="0.565521">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0610485">
+<MaterialFraction fraction="0.0895708">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.01026">
+<MaterialFraction fraction="0.00914796">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00194655">
+<MaterialFraction fraction="0.00167488">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0925661">
+<MaterialFraction fraction="0.0798289">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.155396">
+<MaterialFraction fraction="0.227998">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.68502e-06">
+<MaterialFraction fraction="4.03115e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.49618e-05">
+<MaterialFraction fraction="1.28737e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.78577e-06">
+<MaterialFraction fraction="4.11784e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.72033e-06">
+<MaterialFraction fraction="2.34067e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.86892e-05">
+<MaterialFraction fraction="3.32895e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1128Z1581" density="1.77881*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR1102Z1582" density="1.82162*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.00357079">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
@@ -7184,30 +7322,30 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1128Z2062" density="0.790357*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00351911">
+<CompositeMaterial name="servicecompositeR1102Z2063" density="0.799236*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00351322">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.200333">
+<MaterialFraction fraction="0.200117">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0264736">
+<MaterialFraction fraction="0.0268095">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.097954">
+<MaterialFraction fraction="0.0979117">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00301638">
+<MaterialFraction fraction="0.00301133">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.600247">
+<MaterialFraction fraction="0.599312">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0684569">
+<MaterialFraction fraction="0.0693257">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1126Z1881" density="1.65187*g/cm3" method="mixture by weight">
+<CompositeMaterial name="servicecompositeR1100Z1881" density="1.6677*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="0.542169">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
@@ -7215,660 +7353,660 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR317Z1882" density="2.03119*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00129614">
+<CompositeMaterial name="servicecompositeR319Z1882" density="1.52003*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.000880483">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.452937">
+<MaterialFraction fraction="0.628279">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.153307">
+<MaterialFraction fraction="0.104143">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00132402">
+<MaterialFraction fraction="0.000899419">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000752598">
+<MaterialFraction fraction="0.000511248">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.390236">
+<MaterialFraction fraction="0.265092">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.04742e-05">
+<MaterialFraction fraction="1.38912e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.34498e-05">
+<MaterialFraction fraction="4.43621e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.06994e-05">
+<MaterialFraction fraction="1.41899e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.08178e-06">
+<MaterialFraction fraction="8.06584e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="8.64965e-05">
+<MaterialFraction fraction="0.000114714">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR378Z1882" density="1.91397*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.000204697">
+<CompositeMaterial name="servicecompositeR381Z1882" density="1.54303*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.000253951">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00120191">
+<MaterialFraction fraction="0.000867358">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000671115">
+<MaterialFraction fraction="0.000832596">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00178964">
+<MaterialFraction fraction="0.00222026">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.480675">
+<MaterialFraction fraction="0.618913">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.142161">
+<MaterialFraction fraction="0.102591">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00210503">
+<MaterialFraction fraction="0.00197437">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000175455">
+<MaterialFraction fraction="0.000217672">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00901445">
+<MaterialFraction fraction="0.0108213">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.361865">
+<MaterialFraction fraction="0.26114">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="9.71268e-06">
+<MaterialFraction fraction="1.20497e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.10179e-05">
+<MaterialFraction fraction="3.84813e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="9.92156e-06">
+<MaterialFraction fraction="1.23088e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.63962e-06">
+<MaterialFraction fraction="6.99661e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="8.0208e-05">
+<MaterialFraction fraction="9.95073e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR417Z1882" density="1.83481*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.000384144">
+<CompositeMaterial name="servicecompositeR414Z1882" density="1.56174*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.000454987">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00112778">
+<MaterialFraction fraction="0.000856964">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00125944">
+<MaterialFraction fraction="0.00149171">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00335852">
+<MaterialFraction fraction="0.00397789">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.501414">
+<MaterialFraction fraction="0.611496">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.133393">
+<MaterialFraction fraction="0.101361">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00279836">
+<MaterialFraction fraction="0.00282534">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000329266">
+<MaterialFraction fraction="0.000389989">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0162621">
+<MaterialFraction fraction="0.0189831">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.339546">
+<MaterialFraction fraction="0.258011">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="9.11362e-06">
+<MaterialFraction fraction="1.07943e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.91048e-05">
+<MaterialFraction fraction="3.44722e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="9.30961e-06">
+<MaterialFraction fraction="1.10265e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.29178e-06">
+<MaterialFraction fraction="6.26768e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="7.52608e-05">
+<MaterialFraction fraction="8.91403e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR467Z1882" density="1.77468*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.000568372">
+<CompositeMaterial name="servicecompositeR463Z1882" density="1.57998*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.000646315">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00106186">
+<MaterialFraction fraction="0.000847071">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00186345">
+<MaterialFraction fraction="0.00211899">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00496919">
+<MaterialFraction fraction="0.00565064">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.518404">
+<MaterialFraction fraction="0.604437">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.125596">
+<MaterialFraction fraction="0.100191">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00352057">
+<MaterialFraction fraction="0.00363521">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000487176">
+<MaterialFraction fraction="0.000553984">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0237087">
+<MaterialFraction fraction="0.0267507">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.319699">
+<MaterialFraction fraction="0.255032">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="8.58094e-06">
+<MaterialFraction fraction="9.75767e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.74036e-05">
+<MaterialFraction fraction="3.11616e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="8.76547e-06">
+<MaterialFraction fraction="9.96752e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.98248e-06">
+<MaterialFraction fraction="5.66575e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="7.08619e-05">
+<MaterialFraction fraction="8.05795e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR504Z1882" density="1.72657*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.000755425">
+<CompositeMaterial name="servicecompositeR496Z1882" density="1.59532*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.000803803">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00100158">
+<MaterialFraction fraction="0.000838927">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00247671">
+<MaterialFraction fraction="0.00263533">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00660457">
+<MaterialFraction fraction="0.00702753">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.532848">
+<MaterialFraction fraction="0.598626">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.118467">
+<MaterialFraction fraction="0.099228">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00426066">
+<MaterialFraction fraction="0.00430184">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000647507">
+<MaterialFraction fraction="0.000688974">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0312734">
+<MaterialFraction fraction="0.0331445">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.301552">
+<MaterialFraction fraction="0.25258">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="8.09384e-06">
+<MaterialFraction fraction="8.89925e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.58481e-05">
+<MaterialFraction fraction="2.84202e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="8.2679e-06">
+<MaterialFraction fraction="9.09063e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.69965e-06">
+<MaterialFraction fraction="5.1673e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.68394e-05">
+<MaterialFraction fraction="7.34906e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR554Z1882" density="1.68722*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.000923323">
+<CompositeMaterial name="servicecompositeR545Z1882" density="1.61092*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.000960906">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000948748">
+<MaterialFraction fraction="0.000830802">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00302718">
+<MaterialFraction fraction="0.0031504">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00807248">
+<MaterialFraction fraction="0.00840107">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.545277">
+<MaterialFraction fraction="0.592828">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.112218">
+<MaterialFraction fraction="0.0982669">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00492625">
+<MaterialFraction fraction="0.00496684">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00079142">
+<MaterialFraction fraction="0.000823634">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0380642">
+<MaterialFraction fraction="0.0395227">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.285645">
+<MaterialFraction fraction="0.250134">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="7.66688e-06">
+<MaterialFraction fraction="8.18354e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.44846e-05">
+<MaterialFraction fraction="2.61345e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="7.83176e-06">
+<MaterialFraction fraction="8.35953e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.45174e-06">
+<MaterialFraction fraction="4.75173e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.33136e-05">
+<MaterialFraction fraction="6.75802e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR589Z1882" density="1.65463*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00109424">
+<CompositeMaterial name="servicecompositeR577Z1882" density="1.62646*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00111435">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000899496">
+<MaterialFraction fraction="0.000822865">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00358754">
+<MaterialFraction fraction="0.00365346">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00956677">
+<MaterialFraction fraction="0.00974256">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.556016">
+<MaterialFraction fraction="0.587165">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.106392">
+<MaterialFraction fraction="0.0973281">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00560843">
+<MaterialFraction fraction="0.00561633">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000937919">
+<MaterialFraction fraction="0.000955153">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0449796">
+<MaterialFraction fraction="0.045752">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.270816">
+<MaterialFraction fraction="0.247744">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="7.26887e-06">
+<MaterialFraction fraction="7.55351e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.32135e-05">
+<MaterialFraction fraction="2.41225e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="7.42519e-06">
+<MaterialFraction fraction="7.71595e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.22063e-06">
+<MaterialFraction fraction="4.38591e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.00268e-05">
+<MaterialFraction fraction="6.23773e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR641Z1882" density="1.60137*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00123985">
+<CompositeMaterial name="servicecompositeR627Z1882" density="1.63683*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0012152">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000835403">
+<MaterialFraction fraction="0.000817654">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00406493">
+<MaterialFraction fraction="0.00398411">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0108398">
+<MaterialFraction fraction="0.0106243">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.574507">
+<MaterialFraction fraction="0.583446">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0988111">
+<MaterialFraction fraction="0.0967117">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.006167">
+<MaterialFraction fraction="0.00604323">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00106273">
+<MaterialFraction fraction="0.0010416">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0508583">
+<MaterialFraction fraction="0.0498465">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.251519">
+<MaterialFraction fraction="0.246175">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.75093e-06">
+<MaterialFraction fraction="6.72699e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.15594e-05">
+<MaterialFraction fraction="2.1483e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.89611e-06">
+<MaterialFraction fraction="6.87165e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.91989e-06">
+<MaterialFraction fraction="3.90599e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.57496e-05">
+<MaterialFraction fraction="5.55519e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR728Z1882" density="1.53956*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00137243">
+<CompositeMaterial name="servicecompositeR716Z1882" density="1.6444*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00128814">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000762284">
+<MaterialFraction fraction="0.000813888">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00449962">
+<MaterialFraction fraction="0.00422325">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.011999">
+<MaterialFraction fraction="0.011262">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.597573">
+<MaterialFraction fraction="0.580759">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0901626">
+<MaterialFraction fraction="0.0962663">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00666053">
+<MaterialFraction fraction="0.00635198">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00117637">
+<MaterialFraction fraction="0.00110412">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0562026">
+<MaterialFraction fraction="0.0528078">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.229505">
+<MaterialFraction fraction="0.245042">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.16005e-06">
+<MaterialFraction fraction="5.8609e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.96724e-05">
+<MaterialFraction fraction="1.87171e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="6.29253e-06">
+<MaterialFraction fraction="5.98694e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.5768e-06">
+<MaterialFraction fraction="3.4031e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.08701e-05">
+<MaterialFraction fraction="4.83997e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR832Z1882" density="1.49403*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00150128">
+<CompositeMaterial name="servicecompositeR819Z1882" density="1.65275*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00136769">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000701192">
+<MaterialFraction fraction="0.000809777">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00492206">
+<MaterialFraction fraction="0.00448406">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0131255">
+<MaterialFraction fraction="0.0119575">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.615783">
+<MaterialFraction fraction="0.577825">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0829367">
+<MaterialFraction fraction="0.0957801">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00715034">
+<MaterialFraction fraction="0.00668871">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00128681">
+<MaterialFraction fraction="0.0011723">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0614021">
+<MaterialFraction fraction="0.0560374">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.211111">
+<MaterialFraction fraction="0.243804">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.66637e-06">
+<MaterialFraction fraction="5.22147e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.80958e-05">
+<MaterialFraction fraction="1.6675e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.78822e-06">
+<MaterialFraction fraction="5.33376e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.29015e-06">
+<MaterialFraction fraction="3.03182e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.67932e-05">
+<MaterialFraction fraction="4.31192e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR915Z1882" density="1.45945*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00163843">
+<CompositeMaterial name="servicecompositeR895Z1882" density="1.66209*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0014557">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000647519">
+<MaterialFraction fraction="0.000805226">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00537172">
+<MaterialFraction fraction="0.00477262">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0143246">
+<MaterialFraction fraction="0.012727">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.630373">
+<MaterialFraction fraction="0.574578">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0765883">
+<MaterialFraction fraction="0.0952418">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0076833">
+<MaterialFraction fraction="0.00706127">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00140437">
+<MaterialFraction fraction="0.00124774">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0669432">
+<MaterialFraction fraction="0.0596107">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.194952">
+<MaterialFraction fraction="0.242434">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.23263e-06">
+<MaterialFraction fraction="4.69419e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.67107e-05">
+<MaterialFraction fraction="1.49911e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="5.34516e-06">
+<MaterialFraction fraction="4.79514e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.0383e-06">
+<MaterialFraction fraction="2.72566e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.32114e-05">
+<MaterialFraction fraction="3.87649e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1022Z1882" density="1.4346*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00178471">
+<CompositeMaterial name="servicecompositeR1001Z1882" density="1.67131*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00154163">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000601265">
+<MaterialFraction fraction="0.000800783">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00585131">
+<MaterialFraction fraction="0.00505434">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0156035">
+<MaterialFraction fraction="0.0134782">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.641295">
+<MaterialFraction fraction="0.571407">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0711174">
+<MaterialFraction fraction="0.0947162">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00826297">
+<MaterialFraction fraction="0.00742498">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00152976">
+<MaterialFraction fraction="0.0013214">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0728595">
+<MaterialFraction fraction="0.0630991">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.181026">
+<MaterialFraction fraction="0.241096">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.85885e-06">
+<MaterialFraction fraction="4.26701e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.5517e-05">
+<MaterialFraction fraction="1.36269e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.96335e-06">
+<MaterialFraction fraction="4.35877e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.82127e-06">
+<MaterialFraction fraction="2.47762e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.01247e-05">
+<MaterialFraction fraction="3.52372e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1100Z1882" density="1.43292*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00196867">
+<CompositeMaterial name="servicecompositeR1074Z1882" density="1.68732*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.0016884">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.000573867">
+<MaterialFraction fraction="0.000793186">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00645443">
+<MaterialFraction fraction="0.00553555">
 <rMaterial name="tracker:tkLayout_Al_HV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0172118">
+<MaterialFraction fraction="0.0147615">
 <rMaterial name="tracker:tkLayout_Al_MV"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.642044">
+<MaterialFraction fraction="0.565987">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0678768">
+<MaterialFraction fraction="0.0938177">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00902337">
+<MaterialFraction fraction="0.00804626">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00168743">
+<MaterialFraction fraction="0.0014472">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0803175">
+<MaterialFraction fraction="0.069058">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.172777">
+<MaterialFraction fraction="0.238809">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.63745e-06">
+<MaterialFraction fraction="4.03447e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="1.48099e-05">
+<MaterialFraction fraction="1.28843e-05">
 <rMaterial name="tracker:tkLayout_TEDD_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="4.73718e-06">
+<MaterialFraction fraction="4.12123e-06">
 <rMaterial name="tracker:tkLayout_TEDD_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="2.69271e-06">
+<MaterialFraction fraction="2.3426e-06">
 <rMaterial name="tracker:tkLayout_TEDD_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="3.82964e-05">
+<MaterialFraction fraction="3.33169e-05">
 <rMaterial name="tracker:tkLayout_TEDD_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1128Z2460" density="1.58071*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00351911">
+<CompositeMaterial name="servicecompositeR1102Z2461" density="1.59847*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00351322">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.200333">
+<MaterialFraction fraction="0.200117">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0264736">
+<MaterialFraction fraction="0.0268095">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.097954">
+<MaterialFraction fraction="0.0979117">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00301638">
+<MaterialFraction fraction="0.00301133">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.600247">
+<MaterialFraction fraction="0.599312">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0684569">
+<MaterialFraction fraction="0.0693257">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="servicecompositeR1128Z2681" density="2.37107*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.00351911">
+<CompositeMaterial name="servicecompositeR1102Z2682" density="2.39771*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.00351322">
 <rMaterial name="tracker:tkLayout_Acrylate"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.200333">
+<MaterialFraction fraction="0.200117">
 <rMaterial name="tracker:tkLayout_Al"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0264736">
+<MaterialFraction fraction="0.0268095">
 <rMaterial name="tracker:tkLayout_CO2"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.097954">
+<MaterialFraction fraction="0.0979117">
 <rMaterial name="tracker:tkLayout_Cu"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.00301638">
+<MaterialFraction fraction="0.00301133">
 <rMaterial name="tracker:tkLayout_Glass"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.600247">
+<MaterialFraction fraction="0.599312">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0684569">
+<MaterialFraction fraction="0.0693257">
 <rMaterial name="tracker:tkLayout_Steel"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="supportcompositeR1155Z1564" density="1.01405*g/cm3" method="mixture by weight">
-<MaterialFraction fraction="0.925398">
+<CompositeMaterial name="supportcompositeR1155Z1564" density="1.04975*g/cm3" method="mixture by weight">
+<MaterialFraction fraction="0.927935">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
-<MaterialFraction fraction="0.0746018">
+<MaterialFraction fraction="0.0720648">
 <rMaterial name="tracker:tkLayout_PE"/>
 </MaterialFraction>
 </CompositeMaterial>
-<CompositeMaterial name="supportcompositeR714Z291" density="2.484*g/cm3" method="mixture by weight">
+<CompositeMaterial name="supportcompositeR714Z291" density="2.5785*g/cm3" method="mixture by weight">
 <MaterialFraction fraction="1">
 <rMaterial name="tracker:tkLayout_CF"/>
 </MaterialFraction>
@@ -15124,65 +15262,65 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rSolid name="tracker:Disc5"/>
 <rMaterial name="materials:Air"/>
 </LogicalPart>
-<LogicalPart name="serviceR1139Z2686" category="unspecified">
-<rSolid name="tracker:serviceR1139Z2686"/>
-<rMaterial name="tracker:servicecompositeR1139Z2686"/>
+<LogicalPart name="serviceR1112Z2687" category="unspecified">
+<rSolid name="tracker:serviceR1112Z2687"/>
+<rMaterial name="tracker:servicecompositeR1112Z2687"/>
 </LogicalPart>
-<LogicalPart name="serviceR1151Z2730" category="unspecified">
-<rSolid name="tracker:serviceR1151Z2730"/>
-<rMaterial name="tracker:servicecompositeR1151Z2730"/>
+<LogicalPart name="serviceR1131Z2731" category="unspecified">
+<rSolid name="tracker:serviceR1131Z2731"/>
+<rMaterial name="tracker:servicecompositeR1131Z2731"/>
 </LogicalPart>
-<LogicalPart name="serviceR1139Z1586" category="unspecified">
-<rSolid name="tracker:serviceR1139Z1586"/>
-<rMaterial name="tracker:servicecompositeR1139Z1586"/>
+<LogicalPart name="serviceR1112Z1587" category="unspecified">
+<rSolid name="tracker:serviceR1112Z1587"/>
+<rMaterial name="tracker:servicecompositeR1112Z1587"/>
 </LogicalPart>
-<LogicalPart name="serviceR1151Z2135" category="unspecified">
-<rSolid name="tracker:serviceR1151Z2135"/>
-<rMaterial name="tracker:servicecompositeR1151Z2135"/>
+<LogicalPart name="serviceR1131Z2136" category="unspecified">
+<rSolid name="tracker:serviceR1131Z2136"/>
+<rMaterial name="tracker:servicecompositeR1131Z2136"/>
 </LogicalPart>
-<LogicalPart name="serviceR1140Z1220" category="unspecified">
-<rSolid name="tracker:serviceR1140Z1220"/>
-<rMaterial name="tracker:servicecompositeR1140Z1220"/>
+<LogicalPart name="serviceR1115Z1220" category="unspecified">
+<rSolid name="tracker:serviceR1115Z1220"/>
+<rMaterial name="tracker:servicecompositeR1115Z1220"/>
 </LogicalPart>
-<LogicalPart name="serviceR1151Z1224" category="unspecified">
-<rSolid name="tracker:serviceR1151Z1224"/>
-<rMaterial name="tracker:servicecompositeR1151Z1224"/>
+<LogicalPart name="serviceR1131Z1224" category="unspecified">
+<rSolid name="tracker:serviceR1131Z1224"/>
+<rMaterial name="tracker:servicecompositeR1131Z1224"/>
 </LogicalPart>
-<LogicalPart name="serviceR1043Z1230" category="unspecified">
-<rSolid name="tracker:serviceR1043Z1230"/>
-<rMaterial name="tracker:servicecompositeR1043Z1230"/>
+<LogicalPart name="serviceR1028Z1230" category="unspecified">
+<rSolid name="tracker:serviceR1028Z1230"/>
+<rMaterial name="tracker:servicecompositeR1028Z1230"/>
 </LogicalPart>
-<LogicalPart name="serviceR945Z1230" category="unspecified">
-<rSolid name="tracker:serviceR945Z1230"/>
-<rMaterial name="tracker:servicecompositeR945Z1230"/>
+<LogicalPart name="serviceR933Z1230" category="unspecified">
+<rSolid name="tracker:serviceR933Z1230"/>
+<rMaterial name="tracker:servicecompositeR933Z1230"/>
 </LogicalPart>
-<LogicalPart name="serviceR856Z1230" category="unspecified">
-<rSolid name="tracker:serviceR856Z1230"/>
-<rMaterial name="tracker:servicecompositeR856Z1230"/>
+<LogicalPart name="serviceR848Z1230" category="unspecified">
+<rSolid name="tracker:serviceR848Z1230"/>
+<rMaterial name="tracker:servicecompositeR848Z1230"/>
 </LogicalPart>
-<LogicalPart name="serviceR776Z1230" category="unspecified">
-<rSolid name="tracker:serviceR776Z1230"/>
-<rMaterial name="tracker:servicecompositeR776Z1230"/>
+<LogicalPart name="serviceR770Z1230" category="unspecified">
+<rSolid name="tracker:serviceR770Z1230"/>
+<rMaterial name="tracker:servicecompositeR770Z1230"/>
 </LogicalPart>
-<LogicalPart name="serviceR703Z1230" category="unspecified">
-<rSolid name="tracker:serviceR703Z1230"/>
-<rMaterial name="tracker:servicecompositeR703Z1230"/>
+<LogicalPart name="serviceR700Z1230" category="unspecified">
+<rSolid name="tracker:serviceR700Z1230"/>
+<rMaterial name="tracker:servicecompositeR700Z1230"/>
 </LogicalPart>
-<LogicalPart name="serviceR637Z1230" category="unspecified">
-<rSolid name="tracker:serviceR637Z1230"/>
-<rMaterial name="tracker:servicecompositeR637Z1230"/>
+<LogicalPart name="serviceR636Z1230" category="unspecified">
+<rSolid name="tracker:serviceR636Z1230"/>
+<rMaterial name="tracker:servicecompositeR636Z1230"/>
 </LogicalPart>
 <LogicalPart name="serviceR577Z1230" category="unspecified">
 <rSolid name="tracker:serviceR577Z1230"/>
 <rMaterial name="tracker:servicecompositeR577Z1230"/>
 </LogicalPart>
-<LogicalPart name="serviceR1151Z1407BarrelPart" category="unspecified">
-<rSolid name="tracker:serviceR1151Z1407BarrelPart"/>
-<rMaterial name="tracker:servicecompositeR1151Z1407"/>
+<LogicalPart name="serviceR1131Z1408BarrelPart" category="unspecified">
+<rSolid name="tracker:serviceR1131Z1408BarrelPart"/>
+<rMaterial name="tracker:servicecompositeR1131Z1408"/>
 </LogicalPart>
-<LogicalPart name="serviceR1151Z1407EndcapsPart" category="unspecified">
-<rSolid name="tracker:serviceR1151Z1407EndcapsPart"/>
-<rMaterial name="tracker:servicecompositeR1151Z1407"/>
+<LogicalPart name="serviceR1131Z1408EndcapsPart" category="unspecified">
+<rSolid name="tracker:serviceR1131Z1408EndcapsPart"/>
+<rMaterial name="tracker:servicecompositeR1131Z1408"/>
 </LogicalPart>
 <LogicalPart name="serviceR710Z1206" category="unspecified">
 <rSolid name="tracker:serviceR710Z1206"/>
@@ -15240,9 +15378,9 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rSolid name="tracker:serviceR710Z1131"/>
 <rMaterial name="tracker:servicecompositeR710Z1131"/>
 </LogicalPart>
-<LogicalPart name="serviceR710Z1189" category="unspecified">
-<rSolid name="tracker:serviceR710Z1189"/>
-<rMaterial name="tracker:servicecompositeR710Z1189"/>
+<LogicalPart name="serviceR710Z1190" category="unspecified">
+<rSolid name="tracker:serviceR710Z1190"/>
+<rMaterial name="tracker:servicecompositeR710Z1190"/>
 </LogicalPart>
 <LogicalPart name="serviceR710Z53" category="unspecified">
 <rSolid name="tracker:serviceR710Z53"/>
@@ -15304,77 +15442,77 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rSolid name="tracker:serviceR883Z1131"/>
 <rMaterial name="tracker:servicecompositeR883Z1131"/>
 </LogicalPart>
-<LogicalPart name="serviceR883Z1189" category="unspecified">
-<rSolid name="tracker:serviceR883Z1189"/>
-<rMaterial name="tracker:servicecompositeR883Z1189"/>
+<LogicalPart name="serviceR883Z1190" category="unspecified">
+<rSolid name="tracker:serviceR883Z1190"/>
+<rMaterial name="tracker:servicecompositeR883Z1190"/>
 </LogicalPart>
 <LogicalPart name="serviceR883Z53" category="unspecified">
 <rSolid name="tracker:serviceR883Z53"/>
 <rMaterial name="tracker:servicecompositeR883Z53"/>
 </LogicalPart>
-<LogicalPart name="serviceR1130Z1206" category="unspecified">
-<rSolid name="tracker:serviceR1130Z1206"/>
-<rMaterial name="tracker:servicecompositeR1130Z1206"/>
+<LogicalPart name="serviceR1105Z1206" category="unspecified">
+<rSolid name="tracker:serviceR1105Z1206"/>
+<rMaterial name="tracker:servicecompositeR1105Z1206"/>
 </LogicalPart>
-<LogicalPart name="serviceR1120Z1204" category="unspecified">
-<rSolid name="tracker:serviceR1120Z1204"/>
-<rMaterial name="tracker:servicecompositeR1120Z1204"/>
+<LogicalPart name="serviceR1095Z1204" category="unspecified">
+<rSolid name="tracker:serviceR1095Z1204"/>
+<rMaterial name="tracker:servicecompositeR1095Z1204"/>
 </LogicalPart>
-<LogicalPart name="serviceR1130Z1" category="unspecified">
-<rSolid name="tracker:serviceR1130Z1"/>
-<rMaterial name="tracker:servicecompositeR1130Z1"/>
+<LogicalPart name="serviceR1105Z1" category="unspecified">
+<rSolid name="tracker:serviceR1105Z1"/>
+<rMaterial name="tracker:servicecompositeR1105Z1"/>
 </LogicalPart>
-<LogicalPart name="serviceR1130Z152" category="unspecified">
-<rSolid name="tracker:serviceR1130Z152"/>
-<rMaterial name="tracker:servicecompositeR1130Z152"/>
+<LogicalPart name="serviceR1105Z152" category="unspecified">
+<rSolid name="tracker:serviceR1105Z152"/>
+<rMaterial name="tracker:servicecompositeR1105Z152"/>
 </LogicalPart>
-<LogicalPart name="serviceR1130Z252" category="unspecified">
-<rSolid name="tracker:serviceR1130Z252"/>
-<rMaterial name="tracker:servicecompositeR1130Z252"/>
+<LogicalPart name="serviceR1105Z252" category="unspecified">
+<rSolid name="tracker:serviceR1105Z252"/>
+<rMaterial name="tracker:servicecompositeR1105Z252"/>
 </LogicalPart>
-<LogicalPart name="serviceR1130Z351" category="unspecified">
-<rSolid name="tracker:serviceR1130Z351"/>
-<rMaterial name="tracker:servicecompositeR1130Z351"/>
+<LogicalPart name="serviceR1105Z351" category="unspecified">
+<rSolid name="tracker:serviceR1105Z351"/>
+<rMaterial name="tracker:servicecompositeR1105Z351"/>
 </LogicalPart>
-<LogicalPart name="serviceR1130Z450" category="unspecified">
-<rSolid name="tracker:serviceR1130Z450"/>
-<rMaterial name="tracker:servicecompositeR1130Z450"/>
+<LogicalPart name="serviceR1105Z450" category="unspecified">
+<rSolid name="tracker:serviceR1105Z450"/>
+<rMaterial name="tracker:servicecompositeR1105Z450"/>
 </LogicalPart>
-<LogicalPart name="serviceR1130Z548" category="unspecified">
-<rSolid name="tracker:serviceR1130Z548"/>
-<rMaterial name="tracker:servicecompositeR1130Z548"/>
+<LogicalPart name="serviceR1105Z548" category="unspecified">
+<rSolid name="tracker:serviceR1105Z548"/>
+<rMaterial name="tracker:servicecompositeR1105Z548"/>
 </LogicalPart>
-<LogicalPart name="serviceR1130Z647" category="unspecified">
-<rSolid name="tracker:serviceR1130Z647"/>
-<rMaterial name="tracker:servicecompositeR1130Z647"/>
+<LogicalPart name="serviceR1105Z647" category="unspecified">
+<rSolid name="tracker:serviceR1105Z647"/>
+<rMaterial name="tracker:servicecompositeR1105Z647"/>
 </LogicalPart>
-<LogicalPart name="serviceR1130Z744" category="unspecified">
-<rSolid name="tracker:serviceR1130Z744"/>
-<rMaterial name="tracker:servicecompositeR1130Z744"/>
+<LogicalPart name="serviceR1105Z744" category="unspecified">
+<rSolid name="tracker:serviceR1105Z744"/>
+<rMaterial name="tracker:servicecompositeR1105Z744"/>
 </LogicalPart>
-<LogicalPart name="serviceR1130Z842" category="unspecified">
-<rSolid name="tracker:serviceR1130Z842"/>
-<rMaterial name="tracker:servicecompositeR1130Z842"/>
+<LogicalPart name="serviceR1105Z842" category="unspecified">
+<rSolid name="tracker:serviceR1105Z842"/>
+<rMaterial name="tracker:servicecompositeR1105Z842"/>
 </LogicalPart>
-<LogicalPart name="serviceR1130Z938" category="unspecified">
-<rSolid name="tracker:serviceR1130Z938"/>
-<rMaterial name="tracker:servicecompositeR1130Z938"/>
+<LogicalPart name="serviceR1105Z938" category="unspecified">
+<rSolid name="tracker:serviceR1105Z938"/>
+<rMaterial name="tracker:servicecompositeR1105Z938"/>
 </LogicalPart>
-<LogicalPart name="serviceR1130Z1035" category="unspecified">
-<rSolid name="tracker:serviceR1130Z1035"/>
-<rMaterial name="tracker:servicecompositeR1130Z1035"/>
+<LogicalPart name="serviceR1105Z1035" category="unspecified">
+<rSolid name="tracker:serviceR1105Z1035"/>
+<rMaterial name="tracker:servicecompositeR1105Z1035"/>
 </LogicalPart>
-<LogicalPart name="serviceR1130Z1131" category="unspecified">
-<rSolid name="tracker:serviceR1130Z1131"/>
-<rMaterial name="tracker:servicecompositeR1130Z1131"/>
+<LogicalPart name="serviceR1105Z1131" category="unspecified">
+<rSolid name="tracker:serviceR1105Z1131"/>
+<rMaterial name="tracker:servicecompositeR1105Z1131"/>
 </LogicalPart>
-<LogicalPart name="serviceR1130Z1189" category="unspecified">
-<rSolid name="tracker:serviceR1130Z1189"/>
-<rMaterial name="tracker:servicecompositeR1130Z1189"/>
+<LogicalPart name="serviceR1105Z1190" category="unspecified">
+<rSolid name="tracker:serviceR1105Z1190"/>
+<rMaterial name="tracker:servicecompositeR1105Z1190"/>
 </LogicalPart>
-<LogicalPart name="serviceR1130Z53" category="unspecified">
-<rSolid name="tracker:serviceR1130Z53"/>
-<rMaterial name="tracker:servicecompositeR1130Z53"/>
+<LogicalPart name="serviceR1105Z53" category="unspecified">
+<rSolid name="tracker:serviceR1105Z53"/>
+<rMaterial name="tracker:servicecompositeR1105Z53"/>
 </LogicalPart>
 <LogicalPart name="serviceR300Z1216" category="unspecified">
 <rSolid name="tracker:serviceR300Z1216"/>
@@ -15400,54 +15538,6 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rSolid name="tracker:serviceR300Z170"/>
 <rMaterial name="tracker:servicecompositeR300Z170"/>
 </LogicalPart>
-<LogicalPart name="serviceR300Z193" category="unspecified">
-<rSolid name="tracker:serviceR300Z193"/>
-<rMaterial name="tracker:servicecompositeR300Z193"/>
-</LogicalPart>
-<LogicalPart name="serviceR300Z238" category="unspecified">
-<rSolid name="tracker:serviceR300Z238"/>
-<rMaterial name="tracker:servicecompositeR300Z238"/>
-</LogicalPart>
-<LogicalPart name="serviceR300Z289" category="unspecified">
-<rSolid name="tracker:serviceR300Z289"/>
-<rMaterial name="tracker:servicecompositeR300Z289"/>
-</LogicalPart>
-<LogicalPart name="serviceR300Z334" category="unspecified">
-<rSolid name="tracker:serviceR300Z334"/>
-<rMaterial name="tracker:servicecompositeR300Z334"/>
-</LogicalPart>
-<LogicalPart name="serviceR300Z393" category="unspecified">
-<rSolid name="tracker:serviceR300Z393"/>
-<rMaterial name="tracker:servicecompositeR300Z393"/>
-</LogicalPart>
-<LogicalPart name="serviceR300Z463" category="unspecified">
-<rSolid name="tracker:serviceR300Z463"/>
-<rMaterial name="tracker:servicecompositeR300Z463"/>
-</LogicalPart>
-<LogicalPart name="serviceR300Z546" category="unspecified">
-<rSolid name="tracker:serviceR300Z546"/>
-<rMaterial name="tracker:servicecompositeR300Z546"/>
-</LogicalPart>
-<LogicalPart name="serviceR300Z625" category="unspecified">
-<rSolid name="tracker:serviceR300Z625"/>
-<rMaterial name="tracker:servicecompositeR300Z625"/>
-</LogicalPart>
-<LogicalPart name="serviceR300Z734" category="unspecified">
-<rSolid name="tracker:serviceR300Z734"/>
-<rMaterial name="tracker:servicecompositeR300Z734"/>
-</LogicalPart>
-<LogicalPart name="serviceR300Z865" category="unspecified">
-<rSolid name="tracker:serviceR300Z865"/>
-<rMaterial name="tracker:servicecompositeR300Z865"/>
-</LogicalPart>
-<LogicalPart name="serviceR300Z1018" category="unspecified">
-<rSolid name="tracker:serviceR300Z1018"/>
-<rMaterial name="tracker:servicecompositeR300Z1018"/>
-</LogicalPart>
-<LogicalPart name="serviceR300Z1196" category="unspecified">
-<rSolid name="tracker:serviceR300Z1196"/>
-<rMaterial name="tracker:servicecompositeR300Z1196"/>
-</LogicalPart>
 <LogicalPart name="serviceR300Z216" category="unspecified">
 <rSolid name="tracker:serviceR300Z216"/>
 <rMaterial name="tracker:servicecompositeR300Z216"/>
@@ -15496,6 +15586,54 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rSolid name="tracker:serviceR300Z1208"/>
 <rMaterial name="tracker:servicecompositeR300Z1208"/>
 </LogicalPart>
+<LogicalPart name="serviceR300Z193" category="unspecified">
+<rSolid name="tracker:serviceR300Z193"/>
+<rMaterial name="tracker:servicecompositeR300Z193"/>
+</LogicalPart>
+<LogicalPart name="serviceR300Z238" category="unspecified">
+<rSolid name="tracker:serviceR300Z238"/>
+<rMaterial name="tracker:servicecompositeR300Z238"/>
+</LogicalPart>
+<LogicalPart name="serviceR300Z289" category="unspecified">
+<rSolid name="tracker:serviceR300Z289"/>
+<rMaterial name="tracker:servicecompositeR300Z289"/>
+</LogicalPart>
+<LogicalPart name="serviceR300Z334" category="unspecified">
+<rSolid name="tracker:serviceR300Z334"/>
+<rMaterial name="tracker:servicecompositeR300Z334"/>
+</LogicalPart>
+<LogicalPart name="serviceR300Z393" category="unspecified">
+<rSolid name="tracker:serviceR300Z393"/>
+<rMaterial name="tracker:servicecompositeR300Z393"/>
+</LogicalPart>
+<LogicalPart name="serviceR300Z463" category="unspecified">
+<rSolid name="tracker:serviceR300Z463"/>
+<rMaterial name="tracker:servicecompositeR300Z463"/>
+</LogicalPart>
+<LogicalPart name="serviceR300Z546" category="unspecified">
+<rSolid name="tracker:serviceR300Z546"/>
+<rMaterial name="tracker:servicecompositeR300Z546"/>
+</LogicalPart>
+<LogicalPart name="serviceR300Z625" category="unspecified">
+<rSolid name="tracker:serviceR300Z625"/>
+<rMaterial name="tracker:servicecompositeR300Z625"/>
+</LogicalPart>
+<LogicalPart name="serviceR300Z734" category="unspecified">
+<rSolid name="tracker:serviceR300Z734"/>
+<rMaterial name="tracker:servicecompositeR300Z734"/>
+</LogicalPart>
+<LogicalPart name="serviceR300Z865" category="unspecified">
+<rSolid name="tracker:serviceR300Z865"/>
+<rMaterial name="tracker:servicecompositeR300Z865"/>
+</LogicalPart>
+<LogicalPart name="serviceR300Z1018" category="unspecified">
+<rSolid name="tracker:serviceR300Z1018"/>
+<rMaterial name="tracker:servicecompositeR300Z1018"/>
+</LogicalPart>
+<LogicalPart name="serviceR300Z1196" category="unspecified">
+<rSolid name="tracker:serviceR300Z1196"/>
+<rMaterial name="tracker:servicecompositeR300Z1196"/>
+</LogicalPart>
 <LogicalPart name="serviceR417Z1216" category="unspecified">
 <rSolid name="tracker:serviceR417Z1216"/>
 <rMaterial name="tracker:servicecompositeR417Z1216"/>
@@ -15516,66 +15654,18 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rSolid name="tracker:serviceR417Z136"/>
 <rMaterial name="tracker:servicecompositeR417Z136"/>
 </LogicalPart>
-<LogicalPart name="serviceR417Z181" category="unspecified">
-<rSolid name="tracker:serviceR417Z181"/>
-<rMaterial name="tracker:servicecompositeR417Z181"/>
+<LogicalPart name="serviceR417Z182" category="unspecified">
+<rSolid name="tracker:serviceR417Z182"/>
+<rMaterial name="tracker:servicecompositeR417Z182"/>
 </LogicalPart>
-<LogicalPart name="serviceR417Z225" category="unspecified">
-<rSolid name="tracker:serviceR417Z225"/>
-<rMaterial name="tracker:servicecompositeR417Z225"/>
+<LogicalPart name="serviceR417Z226" category="unspecified">
+<rSolid name="tracker:serviceR417Z226"/>
+<rMaterial name="tracker:servicecompositeR417Z226"/>
 </LogicalPart>
 <LogicalPart name="serviceR417Z267" category="unspecified">
 <rSolid name="tracker:serviceR417Z267"/>
 <rMaterial name="tracker:servicecompositeR417Z267"/>
 </LogicalPart>
-<LogicalPart name="serviceR417Z292" category="unspecified">
-<rSolid name="tracker:serviceR417Z292"/>
-<rMaterial name="tracker:servicecompositeR417Z292"/>
-</LogicalPart>
-<LogicalPart name="serviceR417Z344" category="unspecified">
-<rSolid name="tracker:serviceR417Z344"/>
-<rMaterial name="tracker:servicecompositeR417Z344"/>
-</LogicalPart>
-<LogicalPart name="serviceR417Z400" category="unspecified">
-<rSolid name="tracker:serviceR417Z400"/>
-<rMaterial name="tracker:servicecompositeR417Z400"/>
-</LogicalPart>
-<LogicalPart name="serviceR417Z450" category="unspecified">
-<rSolid name="tracker:serviceR417Z450"/>
-<rMaterial name="tracker:servicecompositeR417Z450"/>
-</LogicalPart>
-<LogicalPart name="serviceR417Z514" category="unspecified">
-<rSolid name="tracker:serviceR417Z514"/>
-<rMaterial name="tracker:servicecompositeR417Z514"/>
-</LogicalPart>
-<LogicalPart name="serviceR417Z586" category="unspecified">
-<rSolid name="tracker:serviceR417Z586"/>
-<rMaterial name="tracker:servicecompositeR417Z586"/>
-</LogicalPart>
-<LogicalPart name="serviceR417Z665" category="unspecified">
-<rSolid name="tracker:serviceR417Z665"/>
-<rMaterial name="tracker:servicecompositeR417Z665"/>
-</LogicalPart>
-<LogicalPart name="serviceR417Z741" category="unspecified">
-<rSolid name="tracker:serviceR417Z741"/>
-<rMaterial name="tracker:servicecompositeR417Z741"/>
-</LogicalPart>
-<LogicalPart name="serviceR417Z836" category="unspecified">
-<rSolid name="tracker:serviceR417Z836"/>
-<rMaterial name="tracker:servicecompositeR417Z836"/>
-</LogicalPart>
-<LogicalPart name="serviceR417Z943" category="unspecified">
-<rSolid name="tracker:serviceR417Z943"/>
-<rMaterial name="tracker:servicecompositeR417Z943"/>
-</LogicalPart>
-<LogicalPart name="serviceR417Z1064" category="unspecified">
-<rSolid name="tracker:serviceR417Z1064"/>
-<rMaterial name="tracker:servicecompositeR417Z1064"/>
-</LogicalPart>
-<LogicalPart name="serviceR417Z1197" category="unspecified">
-<rSolid name="tracker:serviceR417Z1197"/>
-<rMaterial name="tracker:servicecompositeR417Z1197"/>
-</LogicalPart>
 <LogicalPart name="serviceR417Z318" category="unspecified">
 <rSolid name="tracker:serviceR417Z318"/>
 <rMaterial name="tracker:servicecompositeR417Z318"/>
@@ -15624,6 +15714,54 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rSolid name="tracker:serviceR417Z1208"/>
 <rMaterial name="tracker:servicecompositeR417Z1208"/>
 </LogicalPart>
+<LogicalPart name="serviceR417Z292" category="unspecified">
+<rSolid name="tracker:serviceR417Z292"/>
+<rMaterial name="tracker:servicecompositeR417Z292"/>
+</LogicalPart>
+<LogicalPart name="serviceR417Z344" category="unspecified">
+<rSolid name="tracker:serviceR417Z344"/>
+<rMaterial name="tracker:servicecompositeR417Z344"/>
+</LogicalPart>
+<LogicalPart name="serviceR417Z400" category="unspecified">
+<rSolid name="tracker:serviceR417Z400"/>
+<rMaterial name="tracker:servicecompositeR417Z400"/>
+</LogicalPart>
+<LogicalPart name="serviceR417Z450" category="unspecified">
+<rSolid name="tracker:serviceR417Z450"/>
+<rMaterial name="tracker:servicecompositeR417Z450"/>
+</LogicalPart>
+<LogicalPart name="serviceR417Z514" category="unspecified">
+<rSolid name="tracker:serviceR417Z514"/>
+<rMaterial name="tracker:servicecompositeR417Z514"/>
+</LogicalPart>
+<LogicalPart name="serviceR417Z586" category="unspecified">
+<rSolid name="tracker:serviceR417Z586"/>
+<rMaterial name="tracker:servicecompositeR417Z586"/>
+</LogicalPart>
+<LogicalPart name="serviceR417Z665" category="unspecified">
+<rSolid name="tracker:serviceR417Z665"/>
+<rMaterial name="tracker:servicecompositeR417Z665"/>
+</LogicalPart>
+<LogicalPart name="serviceR417Z741" category="unspecified">
+<rSolid name="tracker:serviceR417Z741"/>
+<rMaterial name="tracker:servicecompositeR417Z741"/>
+</LogicalPart>
+<LogicalPart name="serviceR417Z836" category="unspecified">
+<rSolid name="tracker:serviceR417Z836"/>
+<rMaterial name="tracker:servicecompositeR417Z836"/>
+</LogicalPart>
+<LogicalPart name="serviceR417Z943" category="unspecified">
+<rSolid name="tracker:serviceR417Z943"/>
+<rMaterial name="tracker:servicecompositeR417Z943"/>
+</LogicalPart>
+<LogicalPart name="serviceR417Z1064" category="unspecified">
+<rSolid name="tracker:serviceR417Z1064"/>
+<rMaterial name="tracker:servicecompositeR417Z1064"/>
+</LogicalPart>
+<LogicalPart name="serviceR417Z1197" category="unspecified">
+<rSolid name="tracker:serviceR417Z1197"/>
+<rMaterial name="tracker:servicecompositeR417Z1197"/>
+</LogicalPart>
 <LogicalPart name="serviceR567Z1216" category="unspecified">
 <rSolid name="tracker:serviceR567Z1216"/>
 <rMaterial name="tracker:servicecompositeR567Z1216"/>
@@ -15652,65 +15790,17 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rSolid name="tracker:serviceR567Z228"/>
 <rMaterial name="tracker:servicecompositeR567Z228"/>
 </LogicalPart>
-<LogicalPart name="serviceR567Z274" category="unspecified">
-<rSolid name="tracker:serviceR567Z274"/>
-<rMaterial name="tracker:servicecompositeR567Z274"/>
+<LogicalPart name="serviceR567Z273" category="unspecified">
+<rSolid name="tracker:serviceR567Z273"/>
+<rMaterial name="tracker:servicecompositeR567Z273"/>
 </LogicalPart>
 <LogicalPart name="serviceR567Z318" category="unspecified">
 <rSolid name="tracker:serviceR567Z318"/>
 <rMaterial name="tracker:servicecompositeR567Z318"/>
 </LogicalPart>
-<LogicalPart name="serviceR567Z360" category="unspecified">
-<rSolid name="tracker:serviceR567Z360"/>
-<rMaterial name="tracker:servicecompositeR567Z360"/>
-</LogicalPart>
-<LogicalPart name="serviceR567Z384" category="unspecified">
-<rSolid name="tracker:serviceR567Z384"/>
-<rMaterial name="tracker:servicecompositeR567Z384"/>
-</LogicalPart>
-<LogicalPart name="serviceR567Z438" category="unspecified">
-<rSolid name="tracker:serviceR567Z438"/>
-<rMaterial name="tracker:servicecompositeR567Z438"/>
-</LogicalPart>
-<LogicalPart name="serviceR567Z494" category="unspecified">
-<rSolid name="tracker:serviceR567Z494"/>
-<rMaterial name="tracker:servicecompositeR567Z494"/>
-</LogicalPart>
-<LogicalPart name="serviceR567Z554" category="unspecified">
-<rSolid name="tracker:serviceR567Z554"/>
-<rMaterial name="tracker:servicecompositeR567Z554"/>
-</LogicalPart>
-<LogicalPart name="serviceR567Z619" category="unspecified">
-<rSolid name="tracker:serviceR567Z619"/>
-<rMaterial name="tracker:servicecompositeR567Z619"/>
-</LogicalPart>
-<LogicalPart name="serviceR567Z686" category="unspecified">
-<rSolid name="tracker:serviceR567Z686"/>
-<rMaterial name="tracker:servicecompositeR567Z686"/>
-</LogicalPart>
-<LogicalPart name="serviceR567Z745" category="unspecified">
-<rSolid name="tracker:serviceR567Z745"/>
-<rMaterial name="tracker:servicecompositeR567Z745"/>
-</LogicalPart>
-<LogicalPart name="serviceR567Z822" category="unspecified">
-<rSolid name="tracker:serviceR567Z822"/>
-<rMaterial name="tracker:servicecompositeR567Z822"/>
-</LogicalPart>
-<LogicalPart name="serviceR567Z905" category="unspecified">
-<rSolid name="tracker:serviceR567Z905"/>
-<rMaterial name="tracker:servicecompositeR567Z905"/>
-</LogicalPart>
-<LogicalPart name="serviceR567Z995" category="unspecified">
-<rSolid name="tracker:serviceR567Z995"/>
-<rMaterial name="tracker:servicecompositeR567Z995"/>
-</LogicalPart>
-<LogicalPart name="serviceR567Z1092" category="unspecified">
-<rSolid name="tracker:serviceR567Z1092"/>
-<rMaterial name="tracker:servicecompositeR567Z1092"/>
-</LogicalPart>
-<LogicalPart name="serviceR567Z1197" category="unspecified">
-<rSolid name="tracker:serviceR567Z1197"/>
-<rMaterial name="tracker:servicecompositeR567Z1197"/>
+<LogicalPart name="serviceR567Z359" category="unspecified">
+<rSolid name="tracker:serviceR567Z359"/>
+<rMaterial name="tracker:servicecompositeR567Z359"/>
 </LogicalPart>
 <LogicalPart name="serviceR567Z411" category="unspecified">
 <rSolid name="tracker:serviceR567Z411"/>
@@ -15756,333 +15846,381 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rSolid name="tracker:serviceR567Z1144"/>
 <rMaterial name="tracker:servicecompositeR567Z1144"/>
 </LogicalPart>
-<LogicalPart name="serviceR567Z1207" category="unspecified">
-<rSolid name="tracker:serviceR567Z1207"/>
-<rMaterial name="tracker:servicecompositeR567Z1207"/>
-</LogicalPart>
-<LogicalPart name="serviceR1128Z1458" category="unspecified">
-<rSolid name="tracker:serviceR1128Z1458"/>
-<rMaterial name="tracker:servicecompositeR1128Z1458"/>
-</LogicalPart>
-<LogicalPart name="serviceR1126Z1339" category="unspecified">
-<rSolid name="tracker:serviceR1126Z1339"/>
-<rMaterial name="tracker:servicecompositeR1126Z1339"/>
-</LogicalPart>
-<LogicalPart name="serviceR217Z1340" category="unspecified">
-<rSolid name="tracker:serviceR217Z1340"/>
-<rMaterial name="tracker:servicecompositeR217Z1340"/>
-</LogicalPart>
-<LogicalPart name="serviceR279Z1340" category="unspecified">
-<rSolid name="tracker:serviceR279Z1340"/>
-<rMaterial name="tracker:servicecompositeR279Z1340"/>
+<LogicalPart name="serviceR567Z1207" category="unspecified">
+<rSolid name="tracker:serviceR567Z1207"/>
+<rMaterial name="tracker:servicecompositeR567Z1207"/>
 </LogicalPart>
-<LogicalPart name="serviceR328Z1340" category="unspecified">
-<rSolid name="tracker:serviceR328Z1340"/>
-<rMaterial name="tracker:servicecompositeR328Z1340"/>
+<LogicalPart name="serviceR567Z384" category="unspecified">
+<rSolid name="tracker:serviceR567Z384"/>
+<rMaterial name="tracker:servicecompositeR567Z384"/>
 </LogicalPart>
-<LogicalPart name="serviceR364Z1340" category="unspecified">
-<rSolid name="tracker:serviceR364Z1340"/>
-<rMaterial name="tracker:servicecompositeR364Z1340"/>
+<LogicalPart name="serviceR567Z438" category="unspecified">
+<rSolid name="tracker:serviceR567Z438"/>
+<rMaterial name="tracker:servicecompositeR567Z438"/>
 </LogicalPart>
-<LogicalPart name="serviceR414Z1340" category="unspecified">
-<rSolid name="tracker:serviceR414Z1340"/>
-<rMaterial name="tracker:servicecompositeR414Z1340"/>
+<LogicalPart name="serviceR567Z494" category="unspecified">
+<rSolid name="tracker:serviceR567Z494"/>
+<rMaterial name="tracker:servicecompositeR567Z494"/>
 </LogicalPart>
-<LogicalPart name="serviceR447Z1340" category="unspecified">
-<rSolid name="tracker:serviceR447Z1340"/>
-<rMaterial name="tracker:servicecompositeR447Z1340"/>
+<LogicalPart name="serviceR567Z554" category="unspecified">
+<rSolid name="tracker:serviceR567Z554"/>
+<rMaterial name="tracker:servicecompositeR567Z554"/>
 </LogicalPart>
-<LogicalPart name="serviceR497Z1340" category="unspecified">
-<rSolid name="tracker:serviceR497Z1340"/>
-<rMaterial name="tracker:servicecompositeR497Z1340"/>
+<LogicalPart name="serviceR567Z619" category="unspecified">
+<rSolid name="tracker:serviceR567Z619"/>
+<rMaterial name="tracker:servicecompositeR567Z619"/>
 </LogicalPart>
-<LogicalPart name="serviceR528Z1340" category="unspecified">
-<rSolid name="tracker:serviceR528Z1340"/>
-<rMaterial name="tracker:servicecompositeR528Z1340"/>
+<LogicalPart name="serviceR567Z686" category="unspecified">
+<rSolid name="tracker:serviceR567Z686"/>
+<rMaterial name="tracker:servicecompositeR567Z686"/>
 </LogicalPart>
-<LogicalPart name="serviceR579Z1340" category="unspecified">
-<rSolid name="tracker:serviceR579Z1340"/>
-<rMaterial name="tracker:servicecompositeR579Z1340"/>
+<LogicalPart name="serviceR567Z745" category="unspecified">
+<rSolid name="tracker:serviceR567Z745"/>
+<rMaterial name="tracker:servicecompositeR567Z745"/>
 </LogicalPart>
-<LogicalPart name="serviceR606Z1340" category="unspecified">
-<rSolid name="tracker:serviceR606Z1340"/>
-<rMaterial name="tracker:servicecompositeR606Z1340"/>
+<LogicalPart name="serviceR567Z822" category="unspecified">
+<rSolid name="tracker:serviceR567Z822"/>
+<rMaterial name="tracker:servicecompositeR567Z822"/>
 </LogicalPart>
-<LogicalPart name="serviceR661Z1340" category="unspecified">
-<rSolid name="tracker:serviceR661Z1340"/>
-<rMaterial name="tracker:servicecompositeR661Z1340"/>
+<LogicalPart name="serviceR567Z905" category="unspecified">
+<rSolid name="tracker:serviceR567Z905"/>
+<rMaterial name="tracker:servicecompositeR567Z905"/>
 </LogicalPart>
-<LogicalPart name="serviceR744Z1340" category="unspecified">
-<rSolid name="tracker:serviceR744Z1340"/>
-<rMaterial name="tracker:servicecompositeR744Z1340"/>
+<LogicalPart name="serviceR567Z995" category="unspecified">
+<rSolid name="tracker:serviceR567Z995"/>
+<rMaterial name="tracker:servicecompositeR567Z995"/>
 </LogicalPart>
-<LogicalPart name="serviceR851Z1340" category="unspecified">
-<rSolid name="tracker:serviceR851Z1340"/>
-<rMaterial name="tracker:servicecompositeR851Z1340"/>
+<LogicalPart name="serviceR567Z1092" category="unspecified">
+<rSolid name="tracker:serviceR567Z1092"/>
+<rMaterial name="tracker:servicecompositeR567Z1092"/>
 </LogicalPart>
-<LogicalPart name="serviceR924Z1340" category="unspecified">
-<rSolid name="tracker:serviceR924Z1340"/>
-<rMaterial name="tracker:servicecompositeR924Z1340"/>
+<LogicalPart name="serviceR567Z1197" category="unspecified">
+<rSolid name="tracker:serviceR567Z1197"/>
+<rMaterial name="tracker:servicecompositeR567Z1197"/>
 </LogicalPart>
-<LogicalPart name="serviceR1033Z1340" category="unspecified">
-<rSolid name="tracker:serviceR1033Z1340"/>
-<rMaterial name="tracker:servicecompositeR1033Z1340"/>
+<LogicalPart name="serviceR1102Z1459" category="unspecified">
+<rSolid name="tracker:serviceR1102Z1459"/>
+<rMaterial name="tracker:servicecompositeR1102Z1459"/>
 </LogicalPart>
 <LogicalPart name="serviceR1100Z1340" category="unspecified">
 <rSolid name="tracker:serviceR1100Z1340"/>
 <rMaterial name="tracker:servicecompositeR1100Z1340"/>
 </LogicalPart>
-<LogicalPart name="serviceR1128Z1581" category="unspecified">
-<rSolid name="tracker:serviceR1128Z1581"/>
-<rMaterial name="tracker:servicecompositeR1128Z1581"/>
+<LogicalPart name="serviceR224Z1341" category="unspecified">
+<rSolid name="tracker:serviceR224Z1341"/>
+<rMaterial name="tracker:servicecompositeR224Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR1126Z1577" category="unspecified">
-<rSolid name="tracker:serviceR1126Z1577"/>
-<rMaterial name="tracker:servicecompositeR1126Z1339"/>
+<LogicalPart name="serviceR287Z1341" category="unspecified">
+<rSolid name="tracker:serviceR287Z1341"/>
+<rMaterial name="tracker:servicecompositeR287Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR217Z1578" category="unspecified">
-<rSolid name="tracker:serviceR217Z1578"/>
-<rMaterial name="tracker:servicecompositeR217Z1340"/>
+<LogicalPart name="serviceR334Z1341" category="unspecified">
+<rSolid name="tracker:serviceR334Z1341"/>
+<rMaterial name="tracker:servicecompositeR334Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR279Z1578" category="unspecified">
-<rSolid name="tracker:serviceR279Z1578"/>
-<rMaterial name="tracker:servicecompositeR279Z1340"/>
+<LogicalPart name="serviceR367Z1341" category="unspecified">
+<rSolid name="tracker:serviceR367Z1341"/>
+<rMaterial name="tracker:servicecompositeR367Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR328Z1578" category="unspecified">
-<rSolid name="tracker:serviceR328Z1578"/>
-<rMaterial name="tracker:servicecompositeR328Z1340"/>
+<LogicalPart name="serviceR416Z1341" category="unspecified">
+<rSolid name="tracker:serviceR416Z1341"/>
+<rMaterial name="tracker:servicecompositeR416Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR364Z1578" category="unspecified">
-<rSolid name="tracker:serviceR364Z1578"/>
-<rMaterial name="tracker:servicecompositeR364Z1340"/>
+<LogicalPart name="serviceR446Z1341" category="unspecified">
+<rSolid name="tracker:serviceR446Z1341"/>
+<rMaterial name="tracker:servicecompositeR446Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR414Z1578" category="unspecified">
-<rSolid name="tracker:serviceR414Z1578"/>
-<rMaterial name="tracker:servicecompositeR414Z1340"/>
+<LogicalPart name="serviceR496Z1341" category="unspecified">
+<rSolid name="tracker:serviceR496Z1341"/>
+<rMaterial name="tracker:servicecompositeR496Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR447Z1578" category="unspecified">
-<rSolid name="tracker:serviceR447Z1578"/>
-<rMaterial name="tracker:servicecompositeR447Z1340"/>
+<LogicalPart name="serviceR524Z1341" category="unspecified">
+<rSolid name="tracker:serviceR524Z1341"/>
+<rMaterial name="tracker:servicecompositeR524Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR497Z1578" category="unspecified">
-<rSolid name="tracker:serviceR497Z1578"/>
-<rMaterial name="tracker:servicecompositeR497Z1340"/>
+<LogicalPart name="serviceR575Z1341" category="unspecified">
+<rSolid name="tracker:serviceR575Z1341"/>
+<rMaterial name="tracker:servicecompositeR575Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR528Z1578" category="unspecified">
-<rSolid name="tracker:serviceR528Z1578"/>
-<rMaterial name="tracker:servicecompositeR528Z1340"/>
+<LogicalPart name="serviceR602Z1341" category="unspecified">
+<rSolid name="tracker:serviceR602Z1341"/>
+<rMaterial name="tracker:servicecompositeR602Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR579Z1578" category="unspecified">
-<rSolid name="tracker:serviceR579Z1578"/>
-<rMaterial name="tracker:servicecompositeR579Z1340"/>
+<LogicalPart name="serviceR656Z1341" category="unspecified">
+<rSolid name="tracker:serviceR656Z1341"/>
+<rMaterial name="tracker:servicecompositeR656Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR606Z1578" category="unspecified">
-<rSolid name="tracker:serviceR606Z1578"/>
-<rMaterial name="tracker:servicecompositeR606Z1340"/>
+<LogicalPart name="serviceR741Z1341" category="unspecified">
+<rSolid name="tracker:serviceR741Z1341"/>
+<rMaterial name="tracker:servicecompositeR741Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR661Z1578" category="unspecified">
-<rSolid name="tracker:serviceR661Z1578"/>
-<rMaterial name="tracker:servicecompositeR661Z1340"/>
+<LogicalPart name="serviceR839Z1341" category="unspecified">
+<rSolid name="tracker:serviceR839Z1341"/>
+<rMaterial name="tracker:servicecompositeR839Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR744Z1578" category="unspecified">
-<rSolid name="tracker:serviceR744Z1578"/>
-<rMaterial name="tracker:servicecompositeR744Z1340"/>
+<LogicalPart name="serviceR905Z1341" category="unspecified">
+<rSolid name="tracker:serviceR905Z1341"/>
+<rMaterial name="tracker:servicecompositeR905Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR851Z1578" category="unspecified">
-<rSolid name="tracker:serviceR851Z1578"/>
-<rMaterial name="tracker:servicecompositeR851Z1340"/>
+<LogicalPart name="serviceR1014Z1341" category="unspecified">
+<rSolid name="tracker:serviceR1014Z1341"/>
+<rMaterial name="tracker:servicecompositeR1014Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR924Z1578" category="unspecified">
-<rSolid name="tracker:serviceR924Z1578"/>
-<rMaterial name="tracker:servicecompositeR924Z1340"/>
+<LogicalPart name="serviceR1074Z1341" category="unspecified">
+<rSolid name="tracker:serviceR1074Z1341"/>
+<rMaterial name="tracker:servicecompositeR1074Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR1033Z1578" category="unspecified">
-<rSolid name="tracker:serviceR1033Z1578"/>
-<rMaterial name="tracker:servicecompositeR1033Z1340"/>
+<LogicalPart name="serviceR1102Z1582" category="unspecified">
+<rSolid name="tracker:serviceR1102Z1582"/>
+<rMaterial name="tracker:servicecompositeR1102Z1582"/>
 </LogicalPart>
 <LogicalPart name="serviceR1100Z1578" category="unspecified">
 <rSolid name="tracker:serviceR1100Z1578"/>
 <rMaterial name="tracker:servicecompositeR1100Z1340"/>
 </LogicalPart>
-<LogicalPart name="serviceR1128Z2062" category="unspecified">
-<rSolid name="tracker:serviceR1128Z2062"/>
-<rMaterial name="tracker:servicecompositeR1128Z2062"/>
+<LogicalPart name="serviceR224Z1579" category="unspecified">
+<rSolid name="tracker:serviceR224Z1579"/>
+<rMaterial name="tracker:servicecompositeR224Z1341"/>
+</LogicalPart>
+<LogicalPart name="serviceR287Z1579" category="unspecified">
+<rSolid name="tracker:serviceR287Z1579"/>
+<rMaterial name="tracker:servicecompositeR287Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR1126Z1881" category="unspecified">
-<rSolid name="tracker:serviceR1126Z1881"/>
-<rMaterial name="tracker:servicecompositeR1126Z1881"/>
+<LogicalPart name="serviceR334Z1579" category="unspecified">
+<rSolid name="tracker:serviceR334Z1579"/>
+<rMaterial name="tracker:servicecompositeR334Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR317Z1882" category="unspecified">
-<rSolid name="tracker:serviceR317Z1882"/>
-<rMaterial name="tracker:servicecompositeR317Z1882"/>
+<LogicalPart name="serviceR367Z1579" category="unspecified">
+<rSolid name="tracker:serviceR367Z1579"/>
+<rMaterial name="tracker:servicecompositeR367Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR378Z1882" category="unspecified">
-<rSolid name="tracker:serviceR378Z1882"/>
-<rMaterial name="tracker:servicecompositeR378Z1882"/>
+<LogicalPart name="serviceR416Z1579" category="unspecified">
+<rSolid name="tracker:serviceR416Z1579"/>
+<rMaterial name="tracker:servicecompositeR416Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR417Z1882" category="unspecified">
-<rSolid name="tracker:serviceR417Z1882"/>
-<rMaterial name="tracker:servicecompositeR417Z1882"/>
+<LogicalPart name="serviceR446Z1579" category="unspecified">
+<rSolid name="tracker:serviceR446Z1579"/>
+<rMaterial name="tracker:servicecompositeR446Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR467Z1882" category="unspecified">
-<rSolid name="tracker:serviceR467Z1882"/>
-<rMaterial name="tracker:servicecompositeR467Z1882"/>
+<LogicalPart name="serviceR496Z1579" category="unspecified">
+<rSolid name="tracker:serviceR496Z1579"/>
+<rMaterial name="tracker:servicecompositeR496Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR504Z1882" category="unspecified">
-<rSolid name="tracker:serviceR504Z1882"/>
-<rMaterial name="tracker:servicecompositeR504Z1882"/>
+<LogicalPart name="serviceR524Z1579" category="unspecified">
+<rSolid name="tracker:serviceR524Z1579"/>
+<rMaterial name="tracker:servicecompositeR524Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR554Z1882" category="unspecified">
-<rSolid name="tracker:serviceR554Z1882"/>
-<rMaterial name="tracker:servicecompositeR554Z1882"/>
+<LogicalPart name="serviceR575Z1579" category="unspecified">
+<rSolid name="tracker:serviceR575Z1579"/>
+<rMaterial name="tracker:servicecompositeR575Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR589Z1882" category="unspecified">
-<rSolid name="tracker:serviceR589Z1882"/>
-<rMaterial name="tracker:servicecompositeR589Z1882"/>
+<LogicalPart name="serviceR602Z1579" category="unspecified">
+<rSolid name="tracker:serviceR602Z1579"/>
+<rMaterial name="tracker:servicecompositeR602Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR641Z1882" category="unspecified">
-<rSolid name="tracker:serviceR641Z1882"/>
-<rMaterial name="tracker:servicecompositeR641Z1882"/>
+<LogicalPart name="serviceR656Z1579" category="unspecified">
+<rSolid name="tracker:serviceR656Z1579"/>
+<rMaterial name="tracker:servicecompositeR656Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR728Z1882" category="unspecified">
-<rSolid name="tracker:serviceR728Z1882"/>
-<rMaterial name="tracker:servicecompositeR728Z1882"/>
+<LogicalPart name="serviceR741Z1579" category="unspecified">
+<rSolid name="tracker:serviceR741Z1579"/>
+<rMaterial name="tracker:servicecompositeR741Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR832Z1882" category="unspecified">
-<rSolid name="tracker:serviceR832Z1882"/>
-<rMaterial name="tracker:servicecompositeR832Z1882"/>
+<LogicalPart name="serviceR839Z1579" category="unspecified">
+<rSolid name="tracker:serviceR839Z1579"/>
+<rMaterial name="tracker:servicecompositeR839Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR915Z1882" category="unspecified">
-<rSolid name="tracker:serviceR915Z1882"/>
-<rMaterial name="tracker:servicecompositeR915Z1882"/>
+<LogicalPart name="serviceR905Z1579" category="unspecified">
+<rSolid name="tracker:serviceR905Z1579"/>
+<rMaterial name="tracker:servicecompositeR905Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR1022Z1882" category="unspecified">
-<rSolid name="tracker:serviceR1022Z1882"/>
-<rMaterial name="tracker:servicecompositeR1022Z1882"/>
+<LogicalPart name="serviceR1014Z1579" category="unspecified">
+<rSolid name="tracker:serviceR1014Z1579"/>
+<rMaterial name="tracker:servicecompositeR1014Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR1100Z1882" category="unspecified">
-<rSolid name="tracker:serviceR1100Z1882"/>
-<rMaterial name="tracker:servicecompositeR1100Z1882"/>
+<LogicalPart name="serviceR1074Z1579" category="unspecified">
+<rSolid name="tracker:serviceR1074Z1579"/>
+<rMaterial name="tracker:servicecompositeR1074Z1341"/>
 </LogicalPart>
-<LogicalPart name="serviceR1128Z2460" category="unspecified">
-<rSolid name="tracker:serviceR1128Z2460"/>
-<rMaterial name="tracker:servicecompositeR1128Z2460"/>
+<LogicalPart name="serviceR1102Z2063" category="unspecified">
+<rSolid name="tracker:serviceR1102Z2063"/>
+<rMaterial name="tracker:servicecompositeR1102Z2063"/>
 </LogicalPart>
-<LogicalPart name="serviceR1126Z2243" category="unspecified">
-<rSolid name="tracker:serviceR1126Z2243"/>
-<rMaterial name="tracker:servicecompositeR1126Z1881"/>
+<LogicalPart name="serviceR1100Z1881" category="unspecified">
+<rSolid name="tracker:serviceR1100Z1881"/>
+<rMaterial name="tracker:servicecompositeR1100Z1881"/>
 </LogicalPart>
-<LogicalPart name="serviceR317Z2244" category="unspecified">
-<rSolid name="tracker:serviceR317Z2244"/>
-<rMaterial name="tracker:servicecompositeR317Z1882"/>
+<LogicalPart name="serviceR319Z1882" category="unspecified">
+<rSolid name="tracker:serviceR319Z1882"/>
+<rMaterial name="tracker:servicecompositeR319Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR378Z2244" category="unspecified">
-<rSolid name="tracker:serviceR378Z2244"/>
-<rMaterial name="tracker:servicecompositeR378Z1882"/>
+<LogicalPart name="serviceR381Z1882" category="unspecified">
+<rSolid name="tracker:serviceR381Z1882"/>
+<rMaterial name="tracker:servicecompositeR381Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR417Z2244" category="unspecified">
-<rSolid name="tracker:serviceR417Z2244"/>
-<rMaterial name="tracker:servicecompositeR417Z1882"/>
+<LogicalPart name="serviceR414Z1882" category="unspecified">
+<rSolid name="tracker:serviceR414Z1882"/>
+<rMaterial name="tracker:servicecompositeR414Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR467Z2244" category="unspecified">
-<rSolid name="tracker:serviceR467Z2244"/>
-<rMaterial name="tracker:servicecompositeR467Z1882"/>
+<LogicalPart name="serviceR463Z1882" category="unspecified">
+<rSolid name="tracker:serviceR463Z1882"/>
+<rMaterial name="tracker:servicecompositeR463Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR504Z2244" category="unspecified">
-<rSolid name="tracker:serviceR504Z2244"/>
-<rMaterial name="tracker:servicecompositeR504Z1882"/>
+<LogicalPart name="serviceR496Z1882" category="unspecified">
+<rSolid name="tracker:serviceR496Z1882"/>
+<rMaterial name="tracker:servicecompositeR496Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR554Z2244" category="unspecified">
-<rSolid name="tracker:serviceR554Z2244"/>
-<rMaterial name="tracker:servicecompositeR554Z1882"/>
+<LogicalPart name="serviceR545Z1882" category="unspecified">
+<rSolid name="tracker:serviceR545Z1882"/>
+<rMaterial name="tracker:servicecompositeR545Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR589Z2244" category="unspecified">
-<rSolid name="tracker:serviceR589Z2244"/>
-<rMaterial name="tracker:servicecompositeR589Z1882"/>
+<LogicalPart name="serviceR577Z1882" category="unspecified">
+<rSolid name="tracker:serviceR577Z1882"/>
+<rMaterial name="tracker:servicecompositeR577Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR641Z2244" category="unspecified">
-<rSolid name="tracker:serviceR641Z2244"/>
-<rMaterial name="tracker:servicecompositeR641Z1882"/>
+<LogicalPart name="serviceR627Z1882" category="unspecified">
+<rSolid name="tracker:serviceR627Z1882"/>
+<rMaterial name="tracker:servicecompositeR627Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR728Z2244" category="unspecified">
-<rSolid name="tracker:serviceR728Z2244"/>
-<rMaterial name="tracker:servicecompositeR728Z1882"/>
+<LogicalPart name="serviceR716Z1882" category="unspecified">
+<rSolid name="tracker:serviceR716Z1882"/>
+<rMaterial name="tracker:servicecompositeR716Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR832Z2244" category="unspecified">
-<rSolid name="tracker:serviceR832Z2244"/>
-<rMaterial name="tracker:servicecompositeR832Z1882"/>
+<LogicalPart name="serviceR819Z1882" category="unspecified">
+<rSolid name="tracker:serviceR819Z1882"/>
+<rMaterial name="tracker:servicecompositeR819Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR915Z2244" category="unspecified">
-<rSolid name="tracker:serviceR915Z2244"/>
-<rMaterial name="tracker:servicecompositeR915Z1882"/>
+<LogicalPart name="serviceR895Z1882" category="unspecified">
+<rSolid name="tracker:serviceR895Z1882"/>
+<rMaterial name="tracker:servicecompositeR895Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR1022Z2244" category="unspecified">
-<rSolid name="tracker:serviceR1022Z2244"/>
-<rMaterial name="tracker:servicecompositeR1022Z1882"/>
+<LogicalPart name="serviceR1001Z1882" category="unspecified">
+<rSolid name="tracker:serviceR1001Z1882"/>
+<rMaterial name="tracker:servicecompositeR1001Z1882"/>
+</LogicalPart>
+<LogicalPart name="serviceR1074Z1882" category="unspecified">
+<rSolid name="tracker:serviceR1074Z1882"/>
+<rMaterial name="tracker:servicecompositeR1074Z1882"/>
+</LogicalPart>
+<LogicalPart name="serviceR1102Z2461" category="unspecified">
+<rSolid name="tracker:serviceR1102Z2461"/>
+<rMaterial name="tracker:servicecompositeR1102Z2461"/>
 </LogicalPart>
 <LogicalPart name="serviceR1100Z2244" category="unspecified">
 <rSolid name="tracker:serviceR1100Z2244"/>
-<rMaterial name="tracker:servicecompositeR1100Z1882"/>
+<rMaterial name="tracker:servicecompositeR1100Z1881"/>
 </LogicalPart>
-<LogicalPart name="serviceR1128Z2681" category="unspecified">
-<rSolid name="tracker:serviceR1128Z2681"/>
-<rMaterial name="tracker:servicecompositeR1128Z2681"/>
+<LogicalPart name="serviceR319Z2245" category="unspecified">
+<rSolid name="tracker:serviceR319Z2245"/>
+<rMaterial name="tracker:servicecompositeR319Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR1126Z2677" category="unspecified">
-<rSolid name="tracker:serviceR1126Z2677"/>
-<rMaterial name="tracker:servicecompositeR1126Z1881"/>
+<LogicalPart name="serviceR381Z2245" category="unspecified">
+<rSolid name="tracker:serviceR381Z2245"/>
+<rMaterial name="tracker:servicecompositeR381Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR317Z2678" category="unspecified">
-<rSolid name="tracker:serviceR317Z2678"/>
-<rMaterial name="tracker:servicecompositeR317Z1882"/>
+<LogicalPart name="serviceR414Z2245" category="unspecified">
+<rSolid name="tracker:serviceR414Z2245"/>
+<rMaterial name="tracker:servicecompositeR414Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR378Z2678" category="unspecified">
-<rSolid name="tracker:serviceR378Z2678"/>
-<rMaterial name="tracker:servicecompositeR378Z1882"/>
+<LogicalPart name="serviceR463Z2245" category="unspecified">
+<rSolid name="tracker:serviceR463Z2245"/>
+<rMaterial name="tracker:servicecompositeR463Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR417Z2678" category="unspecified">
-<rSolid name="tracker:serviceR417Z2678"/>
-<rMaterial name="tracker:servicecompositeR417Z1882"/>
+<LogicalPart name="serviceR496Z2245" category="unspecified">
+<rSolid name="tracker:serviceR496Z2245"/>
+<rMaterial name="tracker:servicecompositeR496Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR467Z2678" category="unspecified">
-<rSolid name="tracker:serviceR467Z2678"/>
-<rMaterial name="tracker:servicecompositeR467Z1882"/>
+<LogicalPart name="serviceR545Z2245" category="unspecified">
+<rSolid name="tracker:serviceR545Z2245"/>
+<rMaterial name="tracker:servicecompositeR545Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR504Z2678" category="unspecified">
-<rSolid name="tracker:serviceR504Z2678"/>
-<rMaterial name="tracker:servicecompositeR504Z1882"/>
+<LogicalPart name="serviceR577Z2245" category="unspecified">
+<rSolid name="tracker:serviceR577Z2245"/>
+<rMaterial name="tracker:servicecompositeR577Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR554Z2678" category="unspecified">
-<rSolid name="tracker:serviceR554Z2678"/>
-<rMaterial name="tracker:servicecompositeR554Z1882"/>
+<LogicalPart name="serviceR627Z2245" category="unspecified">
+<rSolid name="tracker:serviceR627Z2245"/>
+<rMaterial name="tracker:servicecompositeR627Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR589Z2678" category="unspecified">
-<rSolid name="tracker:serviceR589Z2678"/>
-<rMaterial name="tracker:servicecompositeR589Z1882"/>
+<LogicalPart name="serviceR716Z2245" category="unspecified">
+<rSolid name="tracker:serviceR716Z2245"/>
+<rMaterial name="tracker:servicecompositeR716Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR641Z2678" category="unspecified">
-<rSolid name="tracker:serviceR641Z2678"/>
-<rMaterial name="tracker:servicecompositeR641Z1882"/>
+<LogicalPart name="serviceR819Z2245" category="unspecified">
+<rSolid name="tracker:serviceR819Z2245"/>
+<rMaterial name="tracker:servicecompositeR819Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR728Z2678" category="unspecified">
-<rSolid name="tracker:serviceR728Z2678"/>
-<rMaterial name="tracker:servicecompositeR728Z1882"/>
+<LogicalPart name="serviceR895Z2245" category="unspecified">
+<rSolid name="tracker:serviceR895Z2245"/>
+<rMaterial name="tracker:servicecompositeR895Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR832Z2678" category="unspecified">
-<rSolid name="tracker:serviceR832Z2678"/>
-<rMaterial name="tracker:servicecompositeR832Z1882"/>
+<LogicalPart name="serviceR1001Z2245" category="unspecified">
+<rSolid name="tracker:serviceR1001Z2245"/>
+<rMaterial name="tracker:servicecompositeR1001Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR915Z2678" category="unspecified">
-<rSolid name="tracker:serviceR915Z2678"/>
-<rMaterial name="tracker:servicecompositeR915Z1882"/>
+<LogicalPart name="serviceR1074Z2245" category="unspecified">
+<rSolid name="tracker:serviceR1074Z2245"/>
+<rMaterial name="tracker:servicecompositeR1074Z1882"/>
 </LogicalPart>
-<LogicalPart name="serviceR1022Z2678" category="unspecified">
-<rSolid name="tracker:serviceR1022Z2678"/>
-<rMaterial name="tracker:servicecompositeR1022Z1882"/>
+<LogicalPart name="serviceR1102Z2682" category="unspecified">
+<rSolid name="tracker:serviceR1102Z2682"/>
+<rMaterial name="tracker:servicecompositeR1102Z2682"/>
 </LogicalPart>
 <LogicalPart name="serviceR1100Z2678" category="unspecified">
 <rSolid name="tracker:serviceR1100Z2678"/>
-<rMaterial name="tracker:servicecompositeR1100Z1882"/>
+<rMaterial name="tracker:servicecompositeR1100Z1881"/>
+</LogicalPart>
+<LogicalPart name="serviceR319Z2679" category="unspecified">
+<rSolid name="tracker:serviceR319Z2679"/>
+<rMaterial name="tracker:servicecompositeR319Z1882"/>
+</LogicalPart>
+<LogicalPart name="serviceR381Z2679" category="unspecified">
+<rSolid name="tracker:serviceR381Z2679"/>
+<rMaterial name="tracker:servicecompositeR381Z1882"/>
+</LogicalPart>
+<LogicalPart name="serviceR414Z2679" category="unspecified">
+<rSolid name="tracker:serviceR414Z2679"/>
+<rMaterial name="tracker:servicecompositeR414Z1882"/>
+</LogicalPart>
+<LogicalPart name="serviceR463Z2679" category="unspecified">
+<rSolid name="tracker:serviceR463Z2679"/>
+<rMaterial name="tracker:servicecompositeR463Z1882"/>
+</LogicalPart>
+<LogicalPart name="serviceR496Z2679" category="unspecified">
+<rSolid name="tracker:serviceR496Z2679"/>
+<rMaterial name="tracker:servicecompositeR496Z1882"/>
+</LogicalPart>
+<LogicalPart name="serviceR545Z2679" category="unspecified">
+<rSolid name="tracker:serviceR545Z2679"/>
+<rMaterial name="tracker:servicecompositeR545Z1882"/>
+</LogicalPart>
+<LogicalPart name="serviceR577Z2679" category="unspecified">
+<rSolid name="tracker:serviceR577Z2679"/>
+<rMaterial name="tracker:servicecompositeR577Z1882"/>
+</LogicalPart>
+<LogicalPart name="serviceR627Z2679" category="unspecified">
+<rSolid name="tracker:serviceR627Z2679"/>
+<rMaterial name="tracker:servicecompositeR627Z1882"/>
+</LogicalPart>
+<LogicalPart name="serviceR716Z2679" category="unspecified">
+<rSolid name="tracker:serviceR716Z2679"/>
+<rMaterial name="tracker:servicecompositeR716Z1882"/>
+</LogicalPart>
+<LogicalPart name="serviceR819Z2679" category="unspecified">
+<rSolid name="tracker:serviceR819Z2679"/>
+<rMaterial name="tracker:servicecompositeR819Z1882"/>
+</LogicalPart>
+<LogicalPart name="serviceR895Z2679" category="unspecified">
+<rSolid name="tracker:serviceR895Z2679"/>
+<rMaterial name="tracker:servicecompositeR895Z1882"/>
+</LogicalPart>
+<LogicalPart name="serviceR1001Z2679" category="unspecified">
+<rSolid name="tracker:serviceR1001Z2679"/>
+<rMaterial name="tracker:servicecompositeR1001Z1882"/>
+</LogicalPart>
+<LogicalPart name="serviceR1074Z2679" category="unspecified">
+<rSolid name="tracker:serviceR1074Z2679"/>
+<rMaterial name="tracker:servicecompositeR1074Z1882"/>
 </LogicalPart>
 <LogicalPart name="supportR1155Z1564" category="unspecified">
 <rSolid name="tracker:supportR1155Z1564"/>
@@ -16112,8 +16250,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rSolid name="tracker:supportR887Z1176"/>
 <rMaterial name="tracker:supportcompositeR714Z291"/>
 </LogicalPart>
-<LogicalPart name="supportR1134Z599" category="unspecified">
-<rSolid name="tracker:supportR1134Z599"/>
+<LogicalPart name="supportR1109Z599" category="unspecified">
+<rSolid name="tracker:supportR1109Z599"/>
 <rMaterial name="tracker:supportcompositeR1155Z1564"/>
 </LogicalPart>
 <LogicalPart name="supportR664Z599" category="unspecified">
@@ -16124,12 +16262,12 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rSolid name="tracker:supportR571Z604"/>
 <rMaterial name="tracker:supportcompositeR1155Z1564"/>
 </LogicalPart>
-<LogicalPart name="supportR210Z604" category="unspecified">
-<rSolid name="tracker:supportR210Z604"/>
+<LogicalPart name="supportR212Z604" category="unspecified">
+<rSolid name="tracker:supportR212Z604"/>
 <rMaterial name="tracker:supportcompositeR1155Z1564"/>
 </LogicalPart>
-<LogicalPart name="supportR214Z1430" category="unspecified">
-<rSolid name="tracker:supportR214Z1430"/>
+<LogicalPart name="supportR221Z1430" category="unspecified">
+<rSolid name="tracker:supportR221Z1430"/>
 <rMaterial name="tracker:supportcompositeR1155Z1564"/>
 </LogicalPart>
 </LogicalPartSection>
@@ -16328,8 +16466,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Box name="BModule16Layer1RSide" dx="60*mm" dy="5.75*mm" dz="0.5*mm"/>
 <Box name="BModule16Layer1Between" dx="48*mm" dy="23.472*mm" dz="0.5*mm"/>
 <Box name="BModule16Layer1SupportPlate" dx="60*mm" dy="34.972*mm" dz="0.5*mm"/>
-<Box name="Rod1Full" dx="6.0725*mm" dy="60.01*mm" dz="163.745*mm"/>
-<Box name="Rod1Air" dx="3.03625*mm" dy="60.02*mm" dz="19.5352*mm"/>
+<Box name="Rod1Full" dx="6.0575*mm" dy="60.01*mm" dz="163.782*mm"/>
+<Box name="Rod1Air" dx="3.02875*mm" dy="60.02*mm" dz="19.5469*mm"/>
 <Cone name="Ring5Layer1MinusCone" rMax1="248.492*mm" rMax2="314.093*mm" rMin1="210.259*mm" rMin2="275.861*mm" dz="30.5873*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="Ring5Layer1MinusTub" rMin="224.708*mm" rMax="298.387*mm" dz="30.5873*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Cone name="Ring6Layer1MinusCone" rMax1="248.492*mm" rMax2="314.093*mm" rMin1="210.259*mm" rMin2="275.861*mm" dz="30.5873*mm" startPhi="0*deg" deltaPhi="360*deg"/>
@@ -16344,16 +16482,16 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Tubs name="Ring10Layer1MinusTub" rMin="217.103*mm" rMax="297.02*mm" dz="26.226*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Cone name="Ring11Layer1MinusCone" rMax1="238.018*mm" rMax2="328.868*mm" rMin1="186.82*mm" rMin2="277.669*mm" dz="26.226*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="Ring11Layer1MinusTub" rMin="217.103*mm" rMax="297.02*mm" dz="26.226*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Cone name="Ring12Layer1MinusCone" rMax1="229.29*mm" rMax2="360.951*mm" rMin1="149.04*mm" rMin2="280.7*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring12Layer1MinusTub" rMin="213.491*mm" rMax="294.682*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Cone name="Ring13Layer1MinusCone" rMax1="229.29*mm" rMax2="360.951*mm" rMin1="149.04*mm" rMin2="280.7*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring13Layer1MinusTub" rMin="213.491*mm" rMax="294.682*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Cone name="Ring14Layer1MinusCone" rMax1="229.29*mm" rMax2="360.951*mm" rMin1="149.04*mm" rMin2="280.7*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring14Layer1MinusTub" rMin="213.491*mm" rMax="294.682*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Cone name="Ring15Layer1MinusCone" rMax1="229.29*mm" rMax2="360.951*mm" rMin1="149.04*mm" rMin2="280.7*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring15Layer1MinusTub" rMin="213.491*mm" rMax="294.682*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Cone name="Ring16Layer1MinusCone" rMax1="229.29*mm" rMax2="360.951*mm" rMin1="149.04*mm" rMin2="280.7*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring16Layer1MinusTub" rMin="213.491*mm" rMax="294.682*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Cone name="Ring12Layer1MinusCone" rMax1="231.221*mm" rMax2="362.882*mm" rMin1="151.04*mm" rMin2="282.7*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring12Layer1MinusTub" rMin="215.491*mm" rMax="296.641*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Cone name="Ring13Layer1MinusCone" rMax1="231.221*mm" rMax2="362.882*mm" rMin1="151.04*mm" rMin2="282.7*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring13Layer1MinusTub" rMin="215.491*mm" rMax="296.641*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Cone name="Ring14Layer1MinusCone" rMax1="231.221*mm" rMax2="362.882*mm" rMin1="151.04*mm" rMin2="282.7*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring14Layer1MinusTub" rMin="215.491*mm" rMax="296.641*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Cone name="Ring15Layer1MinusCone" rMax1="231.221*mm" rMax2="362.882*mm" rMin1="151.04*mm" rMin2="282.7*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring15Layer1MinusTub" rMin="215.491*mm" rMax="296.641*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Cone name="Ring16Layer1MinusCone" rMax1="231.221*mm" rMax2="362.882*mm" rMin1="151.04*mm" rMin2="282.7*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring16Layer1MinusTub" rMin="215.491*mm" rMax="296.641*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Cone name="Ring5Layer1PlusCone" rMax1="314.093*mm" rMax2="248.492*mm" rMin1="275.861*mm" rMin2="210.259*mm" dz="30.5873*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="Ring5Layer1PlusTub" rMin="224.708*mm" rMax="298.387*mm" dz="30.5873*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Cone name="Ring6Layer1PlusCone" rMax1="314.093*mm" rMax2="248.492*mm" rMin1="275.861*mm" rMin2="210.259*mm" dz="30.5873*mm" startPhi="0*deg" deltaPhi="360*deg"/>
@@ -16368,17 +16506,17 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Tubs name="Ring10Layer1PlusTub" rMin="217.103*mm" rMax="297.02*mm" dz="26.226*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Cone name="Ring11Layer1PlusCone" rMax1="328.868*mm" rMax2="238.018*mm" rMin1="277.669*mm" rMin2="186.82*mm" dz="26.226*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="Ring11Layer1PlusTub" rMin="217.103*mm" rMax="297.02*mm" dz="26.226*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Cone name="Ring12Layer1PlusCone" rMax1="360.951*mm" rMax2="229.29*mm" rMin1="280.7*mm" rMin2="149.04*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring12Layer1PlusTub" rMin="213.491*mm" rMax="294.682*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Cone name="Ring13Layer1PlusCone" rMax1="360.951*mm" rMax2="229.29*mm" rMin1="280.7*mm" rMin2="149.04*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring13Layer1PlusTub" rMin="213.491*mm" rMax="294.682*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Cone name="Ring14Layer1PlusCone" rMax1="360.951*mm" rMax2="229.29*mm" rMin1="280.7*mm" rMin2="149.04*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring14Layer1PlusTub" rMin="213.491*mm" rMax="294.682*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Cone name="Ring15Layer1PlusCone" rMax1="360.951*mm" rMax2="229.29*mm" rMin1="280.7*mm" rMin2="149.04*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring15Layer1PlusTub" rMin="213.491*mm" rMax="294.682*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Cone name="Ring16Layer1PlusCone" rMax1="360.951*mm" rMax2="229.29*mm" rMin1="280.7*mm" rMin2="149.04*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring16Layer1PlusTub" rMin="213.491*mm" rMax="294.682*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Layer1" rMin="213.481*mm" rMax="298.397*mm" dz="1207.37*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Cone name="Ring12Layer1PlusCone" rMax1="362.882*mm" rMax2="231.221*mm" rMin1="282.7*mm" rMin2="151.04*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring12Layer1PlusTub" rMin="215.491*mm" rMax="296.641*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Cone name="Ring13Layer1PlusCone" rMax1="362.882*mm" rMax2="231.221*mm" rMin1="282.7*mm" rMin2="151.04*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring13Layer1PlusTub" rMin="215.491*mm" rMax="296.641*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Cone name="Ring14Layer1PlusCone" rMax1="362.882*mm" rMax2="231.221*mm" rMin1="282.7*mm" rMin2="151.04*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring14Layer1PlusTub" rMin="215.491*mm" rMax="296.641*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Cone name="Ring15Layer1PlusCone" rMax1="362.882*mm" rMax2="231.221*mm" rMin1="282.7*mm" rMin2="151.04*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring15Layer1PlusTub" rMin="215.491*mm" rMax="296.641*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Cone name="Ring16Layer1PlusCone" rMax1="362.882*mm" rMax2="231.221*mm" rMin1="282.7*mm" rMin2="151.04*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring16Layer1PlusTub" rMin="215.491*mm" rMax="296.641*mm" dz="18.8765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Layer1" rMin="215.032*mm" rMax="298.397*mm" dz="1207.37*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Box name="BModule1Layer2" dx="60*mm" dy="34.972*mm" dz="2*mm"/>
 <Box name="BModule1Layer2Lowerwafer" dx="48*mm" dy="23.472*mm" dz="0.1*mm"/>
 <Box name="BModule1Layer2Upperwafer" dx="48*mm" dy="23.472*mm" dz="0.1*mm"/>
@@ -16577,8 +16715,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Box name="BModule18Layer2RSide" dx="60*mm" dy="5.75*mm" dz="0.5*mm"/>
 <Box name="BModule18Layer2Between" dx="48*mm" dy="23.472*mm" dz="0.5*mm"/>
 <Box name="BModule18Layer2SupportPlate" dx="60*mm" dy="34.972*mm" dz="0.5*mm"/>
-<Box name="Rod2Full" dx="5.48*mm" dy="60.01*mm" dz="257.548*mm"/>
-<Box name="Rod2Air" dx="2.74*mm" dy="60.02*mm" dz="20.1516*mm"/>
+<Box name="Rod2Full" dx="5.0575*mm" dy="60.01*mm" dz="258.658*mm"/>
+<Box name="Rod2Air" dx="2.52875*mm" dy="60.02*mm" dz="20.4719*mm"/>
 <Cone name="Ring7Layer2MinusCone" rMax1="371.324*mm" rMax2="425.294*mm" rMin1="340.585*mm" rMin2="394.556*mm" dz="32.1599*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="Ring7Layer2MinusTub" rMin="349.595*mm" rMax="415.757*mm" dz="32.1599*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Cone name="Ring8Layer2MinusCone" rMax1="371.324*mm" rMax2="425.294*mm" rMin1="340.585*mm" rMin2="394.556*mm" dz="32.1599*mm" startPhi="0*deg" deltaPhi="360*deg"/>
@@ -16848,8 +16986,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Box name="BModule20Layer3RSide" dx="60*mm" dy="5.75*mm" dz="0.5*mm"/>
 <Box name="BModule20Layer3Between" dx="48*mm" dy="23.472*mm" dz="0.5*mm"/>
 <Box name="BModule20Layer3SupportPlate" dx="60*mm" dy="34.972*mm" dz="0.5*mm"/>
-<Box name="Rod3Full" dx="5.48*mm" dy="60.01*mm" dz="350.716*mm"/>
-<Box name="Rod3Air" dx="2.74*mm" dy="60.02*mm" dz="20.3698*mm"/>
+<Box name="Rod3Full" dx="5.5944*mm" dy="60.01*mm" dz="350.419*mm"/>
+<Box name="Rod3Air" dx="2.7972*mm" dy="60.02*mm" dz="20.2884*mm"/>
 <Cone name="Ring9Layer3MinusCone" rMax1="517.504*mm" rMax2="577.281*mm" rMin1="487.209*mm" rMin2="546.986*mm" dz="30.9504*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="Ring9Layer3MinusTub" rMin="498.398*mm" rMax="565.792*mm" dz="30.9504*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Cone name="Ring10Layer3MinusCone" rMax1="517.504*mm" rMax2="577.281*mm" rMin1="487.209*mm" rMin2="546.986*mm" dz="30.9504*mm" startPhi="0*deg" deltaPhi="360*deg"/>
@@ -17019,8 +17157,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Box name="BModule12Layer4LSide" dx="62.5*mm" dy="10.8625*mm" dz="0.5*mm"/>
 <Box name="BModule12Layer4RSide" dx="62.5*mm" dy="10.8625*mm" dz="0.5*mm"/>
 <Box name="BModule12Layer4Between" dx="45.72*mm" dy="50.25*mm" dz="0.5*mm"/>
-<Box name="Rod4" dx="3.36*mm" dy="62.51*mm" dz="1198.34*mm"/>
-<Tubs name="Layer4" rMin="667.83*mm" rMax="708.93*mm" dz="1198.35*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="Rod4" dx="3.36*mm" dy="62.51*mm" dz="1198.5*mm"/>
+<Tubs name="Layer4" rMin="667.83*mm" rMax="708.93*mm" dz="1198.51*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Box name="BModule1Layer5" dx="62.5*mm" dy="71.975*mm" dz="1.1*mm"/>
 <Box name="BModule1Layer5Lowerwafer" dx="45.72*mm" dy="50.25*mm" dz="0.1*mm"/>
 <Box name="BModule1Layer5Upperwafer" dx="45.72*mm" dy="50.25*mm" dz="0.1*mm"/>
@@ -17141,8 +17279,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Box name="BModule12Layer5LSide" dx="62.5*mm" dy="10.8625*mm" dz="0.5*mm"/>
 <Box name="BModule12Layer5RSide" dx="62.5*mm" dy="10.8625*mm" dz="0.5*mm"/>
 <Box name="BModule12Layer5Between" dx="45.72*mm" dy="50.25*mm" dz="0.5*mm"/>
-<Box name="Rod5" dx="3.36*mm" dy="62.51*mm" dz="1198.34*mm"/>
-<Tubs name="Layer5" rMin="840.83*mm" rMax="881.389*mm" dz="1198.35*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="Rod5" dx="3.36*mm" dy="62.51*mm" dz="1198.5*mm"/>
+<Tubs name="Layer5" rMin="840.83*mm" rMax="881.389*mm" dz="1198.51*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Box name="BModule1Layer6" dx="62.5*mm" dy="71.975*mm" dz="1.1*mm"/>
 <Box name="BModule1Layer6Lowerwafer" dx="45.72*mm" dy="50.25*mm" dz="0.1*mm"/>
 <Box name="BModule1Layer6Upperwafer" dx="45.72*mm" dy="50.25*mm" dz="0.1*mm"/>
@@ -17263,8 +17401,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Box name="BModule12Layer6LSide" dx="62.5*mm" dy="10.8625*mm" dz="0.5*mm"/>
 <Box name="BModule12Layer6RSide" dx="62.5*mm" dy="10.8625*mm" dz="0.5*mm"/>
 <Box name="BModule12Layer6Between" dx="45.72*mm" dy="50.25*mm" dz="0.5*mm"/>
-<Box name="Rod6" dx="3.36*mm" dy="62.51*mm" dz="1198.34*mm"/>
-<Tubs name="Layer6" rMin="1088.83*mm" rMax="1128.9*mm" dz="1198.35*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Box name="Rod6" dx="3.36*mm" dy="62.51*mm" dz="1198.5*mm"/>
+<Tubs name="Layer6" rMin="1063.83*mm" rMax="1103.94*mm" dz="1198.51*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Box name="EModule1Disc1" dx="60*mm" dy="34.972*mm" dz="3.2*mm"/>
 <Box name="EModule1Disc1Lowerwafer" dx="48*mm" dy="23.472*mm" dz="0.1*mm"/>
 <Box name="EModule1Disc1Upperwafer" dx="48*mm" dy="23.472*mm" dz="0.1*mm"/>
@@ -17425,22 +17563,22 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Box name="EModule15Disc1LSide" dx="62.5*mm" dy="10.8625*mm" dz="0.5*mm"/>
 <Box name="EModule15Disc1RSide" dx="62.5*mm" dy="10.8625*mm" dz="0.5*mm"/>
 <Box name="EModule15Disc1Between" dx="45.72*mm" dy="50.25*mm" dz="0.5*mm"/>
-<Tubs name="Ring1Disc1" rMin="217.247*mm" rMax="293.411*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc1" rMin="266.821*mm" rMax="342.088*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc1" rMin="303.185*mm" rMax="377.942*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc1" rMin="353.285*mm" rMax="427.481*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring5Disc1" rMin="386.597*mm" rMax="460.487*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring6Disc1" rMin="437.207*mm" rMax="510.708*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring7Disc1" rMin="467.557*mm" rMax="540.859*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring8Disc1" rMin="523.663*mm" rMax="586.703*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring9Disc1" rMin="546.137*mm" rMax="619.016*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring10Disc1" rMin="596.302*mm" rMax="679.371*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring11Disc1" rMin="620.36*mm" rMax="766.881*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring12Disc1" rMin="728.071*mm" rMax="874.278*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring13Disc1" rMin="801.459*mm" rMax="947.493*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring14Disc1" rMin="910.53*mm" rMax="1056.35*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring15Disc1" rMin="977.765*mm" rMax="1123.47*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc1" rMin="217.237*mm" rMax="1123.48*mm" dz="25.67*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring1Disc1" rMin="224.798*mm" rMax="300.807*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc1" rMin="272.546*mm" rMax="347.726*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc1" rMin="305.853*mm" rMax="380.577*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc1" rMin="355.546*mm" rMax="429.719*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring5Disc1" rMin="385.191*mm" rMax="459.093*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring6Disc1" rMin="435.746*mm" rMax="509.257*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring7Disc1" rMin="463.771*mm" rMax="537.097*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring8Disc1" rMin="520.246*mm" rMax="583.304*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring9Disc1" rMin="541.687*mm" rMax="614.587*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring10Disc1" rMin="591.421*mm" rMax="674.509*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring11Disc1" rMin="617.406*mm" rMax="763.937*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring12Disc1" rMin="715.765*mm" rMax="862.004*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring13Disc1" rMin="782.565*mm" rMax="928.641*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring14Disc1" rMin="891.165*mm" rMax="1037.02*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring15Disc1" rMin="951.175*mm" rMax="1096.93*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Disc1" rMin="224.788*mm" rMax="1096.94*mm" dz="26.35*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Box name="EModule1Disc2" dx="60*mm" dy="34.972*mm" dz="3.2*mm"/>
 <Box name="EModule1Disc2Lowerwafer" dx="48*mm" dy="23.472*mm" dz="0.1*mm"/>
 <Box name="EModule1Disc2Upperwafer" dx="48*mm" dy="23.472*mm" dz="0.1*mm"/>
@@ -17601,22 +17739,22 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Box name="EModule15Disc2LSide" dx="62.5*mm" dy="10.8625*mm" dz="0.5*mm"/>
 <Box name="EModule15Disc2RSide" dx="62.5*mm" dy="10.8625*mm" dz="0.5*mm"/>
 <Box name="EModule15Disc2Between" dx="45.72*mm" dy="50.25*mm" dz="0.5*mm"/>
-<Tubs name="Ring1Disc2" rMin="217.247*mm" rMax="293.411*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring2Disc2" rMin="266.821*mm" rMax="342.088*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring3Disc2" rMin="303.185*mm" rMax="377.942*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring4Disc2" rMin="353.285*mm" rMax="427.481*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring5Disc2" rMin="386.597*mm" rMax="460.487*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring6Disc2" rMin="437.207*mm" rMax="510.708*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring7Disc2" rMin="467.557*mm" rMax="540.859*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring8Disc2" rMin="523.663*mm" rMax="586.703*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring9Disc2" rMin="546.137*mm" rMax="619.016*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring10Disc2" rMin="596.302*mm" rMax="679.371*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring11Disc2" rMin="620.36*mm" rMax="766.881*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring12Disc2" rMin="728.071*mm" rMax="874.278*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring13Disc2" rMin="801.459*mm" rMax="947.493*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring14Disc2" rMin="910.53*mm" rMax="1056.35*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring15Disc2" rMin="977.765*mm" rMax="1123.47*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc2" rMin="217.237*mm" rMax="1123.48*mm" dz="25.67*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring1Disc2" rMin="224.798*mm" rMax="300.807*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring2Disc2" rMin="272.546*mm" rMax="347.726*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring3Disc2" rMin="305.853*mm" rMax="380.577*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc2" rMin="355.546*mm" rMax="429.719*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring5Disc2" rMin="385.191*mm" rMax="459.093*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring6Disc2" rMin="435.746*mm" rMax="509.257*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring7Disc2" rMin="463.771*mm" rMax="537.097*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring8Disc2" rMin="520.246*mm" rMax="583.304*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring9Disc2" rMin="541.687*mm" rMax="614.587*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring10Disc2" rMin="591.421*mm" rMax="674.509*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring11Disc2" rMin="617.406*mm" rMax="763.937*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring12Disc2" rMin="715.765*mm" rMax="862.004*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring13Disc2" rMin="782.565*mm" rMax="928.641*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring14Disc2" rMin="891.165*mm" rMax="1037.02*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring15Disc2" rMin="951.175*mm" rMax="1096.93*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Disc2" rMin="224.788*mm" rMax="1096.94*mm" dz="26.35*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Box name="EModule4Disc3" dx="60*mm" dy="34.972*mm" dz="3.2*mm"/>
 <Box name="EModule4Disc3Lowerwafer" dx="48*mm" dy="23.472*mm" dz="0.1*mm"/>
 <Box name="EModule4Disc3Upperwafer" dx="48*mm" dy="23.472*mm" dz="0.1*mm"/>
@@ -17744,19 +17882,19 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Box name="EModule15Disc3LSide" dx="62.5*mm" dy="10.8625*mm" dz="0.5*mm"/>
 <Box name="EModule15Disc3RSide" dx="62.5*mm" dy="10.8625*mm" dz="0.5*mm"/>
 <Box name="EModule15Disc3Between" dx="45.72*mm" dy="50.25*mm" dz="0.5*mm"/>
-<Tubs name="Ring4Disc3" rMin="317.15*mm" rMax="391.736*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring5Disc3" rMin="356.431*mm" rMax="430.596*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring6Disc3" rMin="406.682*mm" rMax="480.408*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring7Disc3" rMin="443.714*mm" rMax="517.17*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring8Disc3" rMin="499.276*mm" rMax="562.45*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring9Disc3" rMin="529.109*mm" rMax="602.07*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring10Disc3" rMin="575.755*mm" rMax="658.907*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring11Disc3" rMin="604.332*mm" rMax="750.908*mm" dz="10.76*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring12Disc3" rMin="709.315*mm" rMax="855.571*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring13Disc3" rMin="792.308*mm" rMax="938.362*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring14Disc3" rMin="899.331*mm" rMax="1045.17*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring15Disc3" rMin="977.765*mm" rMax="1123.47*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc3" rMin="317.14*mm" rMax="1123.48*mm" dz="25.845*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc3" rMin="319.798*mm" rMax="394.353*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring5Disc3" rMin="353.647*mm" rMax="427.839*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring6Disc3" rMin="402.272*mm" rMax="476.032*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring7Disc3" rMin="436.177*mm" rMax="509.685*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring8Disc3" rMin="490.139*mm" rMax="553.365*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring9Disc3" rMin="516.699*mm" rMax="589.723*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring10Disc3" rMin="562.221*mm" rMax="645.43*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring11Disc3" rMin="592.918*mm" rMax="739.534*mm" dz="10.76*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring12Disc3" rMin="695.765*mm" rMax="842.058*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring13Disc3" rMin="772.577*mm" rMax="918.676*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring14Disc3" rMin="877.935*mm" rMax="1023.81*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring15Disc3" rMin="951.175*mm" rMax="1096.93*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Disc3" rMin="319.788*mm" rMax="1096.94*mm" dz="26.525*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Box name="EModule4Disc4" dx="60*mm" dy="34.972*mm" dz="3.2*mm"/>
 <Box name="EModule4Disc4Lowerwafer" dx="48*mm" dy="23.472*mm" dz="0.1*mm"/>
 <Box name="EModule4Disc4Upperwafer" dx="48*mm" dy="23.472*mm" dz="0.1*mm"/>
@@ -17884,19 +18022,19 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Box name="EModule15Disc4LSide" dx="62.5*mm" dy="10.8625*mm" dz="0.5*mm"/>
 <Box name="EModule15Disc4RSide" dx="62.5*mm" dy="10.8625*mm" dz="0.5*mm"/>
 <Box name="EModule15Disc4Between" dx="45.72*mm" dy="50.25*mm" dz="0.5*mm"/>
-<Tubs name="Ring4Disc4" rMin="317.15*mm" rMax="391.736*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring5Disc4" rMin="356.431*mm" rMax="430.596*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring6Disc4" rMin="406.682*mm" rMax="480.408*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring7Disc4" rMin="443.714*mm" rMax="517.17*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring8Disc4" rMin="499.276*mm" rMax="562.45*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring9Disc4" rMin="529.109*mm" rMax="602.07*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring10Disc4" rMin="575.755*mm" rMax="658.907*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring11Disc4" rMin="604.332*mm" rMax="750.908*mm" dz="10.76*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring12Disc4" rMin="709.315*mm" rMax="855.571*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring13Disc4" rMin="792.308*mm" rMax="938.362*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring14Disc4" rMin="899.331*mm" rMax="1045.17*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring15Disc4" rMin="977.765*mm" rMax="1123.47*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc4" rMin="317.14*mm" rMax="1123.48*mm" dz="25.845*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc4" rMin="319.798*mm" rMax="394.353*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring5Disc4" rMin="353.647*mm" rMax="427.839*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring6Disc4" rMin="402.272*mm" rMax="476.032*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring7Disc4" rMin="436.177*mm" rMax="509.685*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring8Disc4" rMin="490.139*mm" rMax="553.365*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring9Disc4" rMin="516.699*mm" rMax="589.723*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring10Disc4" rMin="562.221*mm" rMax="645.43*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring11Disc4" rMin="592.918*mm" rMax="739.534*mm" dz="10.76*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring12Disc4" rMin="695.765*mm" rMax="842.058*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring13Disc4" rMin="772.577*mm" rMax="918.676*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring14Disc4" rMin="877.935*mm" rMax="1023.81*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring15Disc4" rMin="951.175*mm" rMax="1096.93*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Disc4" rMin="319.788*mm" rMax="1096.94*mm" dz="26.525*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Box name="EModule4Disc5" dx="60*mm" dy="34.972*mm" dz="3.2*mm"/>
 <Box name="EModule4Disc5Lowerwafer" dx="48*mm" dy="23.472*mm" dz="0.1*mm"/>
 <Box name="EModule4Disc5Upperwafer" dx="48*mm" dy="23.472*mm" dz="0.1*mm"/>
@@ -18024,100 +18162,88 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Box name="EModule15Disc5LSide" dx="62.5*mm" dy="10.8625*mm" dz="0.5*mm"/>
 <Box name="EModule15Disc5RSide" dx="62.5*mm" dy="10.8625*mm" dz="0.5*mm"/>
 <Box name="EModule15Disc5Between" dx="45.72*mm" dy="50.25*mm" dz="0.5*mm"/>
-<Tubs name="Ring4Disc5" rMin="317.15*mm" rMax="391.736*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring5Disc5" rMin="356.431*mm" rMax="430.596*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring6Disc5" rMin="406.682*mm" rMax="480.408*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring7Disc5" rMin="443.714*mm" rMax="517.17*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring8Disc5" rMin="499.276*mm" rMax="562.45*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring9Disc5" rMin="529.109*mm" rMax="602.07*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring10Disc5" rMin="575.755*mm" rMax="658.907*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring11Disc5" rMin="604.332*mm" rMax="750.908*mm" dz="10.76*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring12Disc5" rMin="709.315*mm" rMax="855.571*mm" dz="10.76*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring13Disc5" rMin="792.308*mm" rMax="938.362*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring14Disc5" rMin="899.331*mm" rMax="1045.17*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Ring15Disc5" rMin="977.765*mm" rMax="1123.47*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="Disc5" rMin="317.14*mm" rMax="1123.48*mm" dz="25.845*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1139Z2686" rMin="1139.46*mm" rMax="1151.78*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1151Z2730" rMin="1151.88*mm" rMax="1153.88*mm" dz="45*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1139Z1586" rMin="1139.46*mm" rMax="1151.78*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1151Z2135" rMin="1151.88*mm" rMax="1153.88*mm" dz="550.038*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1140Z1220" rMin="1140.88*mm" rMax="1151.78*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1151Z1224" rMin="1151.88*mm" rMax="1153.88*mm" dz="5.1915*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1043Z1230" rMin="1043.68*mm" rMax="1151.78*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR945Z1230" rMin="945.732*mm" rMax="1043.68*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR856Z1230" rMin="856.973*mm" rMax="945.732*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR776Z1230" rMin="776.544*mm" rMax="856.973*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR703Z1230" rMin="703.664*mm" rMax="776.544*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR637Z1230" rMin="637.624*mm" rMax="703.664*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR577Z1230" rMin="577.782*mm" rMax="637.624*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1151Z1407BarrelPart" rMin="1151.88*mm" rMax="1153.88*mm" dz="10.084*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1151Z1407EndcapsPart" rMin="1151.88*mm" rMax="1153.88*mm" dz="167.765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring4Disc5" rMin="319.798*mm" rMax="394.353*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring5Disc5" rMin="353.647*mm" rMax="427.839*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring6Disc5" rMin="402.272*mm" rMax="476.032*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring7Disc5" rMin="436.177*mm" rMax="509.685*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring8Disc5" rMin="490.139*mm" rMax="553.365*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring9Disc5" rMin="516.699*mm" rMax="589.723*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring10Disc5" rMin="562.221*mm" rMax="645.43*mm" dz="10.585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring11Disc5" rMin="592.918*mm" rMax="739.534*mm" dz="10.76*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring12Disc5" rMin="695.765*mm" rMax="842.058*mm" dz="10.76*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring13Disc5" rMin="772.577*mm" rMax="918.676*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring14Disc5" rMin="877.935*mm" rMax="1023.81*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Ring15Disc5" rMin="951.175*mm" rMax="1096.93*mm" dz="8.56*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="Disc5" rMin="319.788*mm" rMax="1096.94*mm" dz="26.525*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1112Z2687" rMin="1112.92*mm" rMax="1131.82*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1131Z2731" rMin="1131.92*mm" rMax="1133.92*mm" dz="45*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1112Z1587" rMin="1112.92*mm" rMax="1131.82*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1131Z2136" rMin="1131.92*mm" rMax="1133.92*mm" dz="550.037*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1115Z1220" rMin="1115.92*mm" rMax="1131.82*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1131Z1224" rMin="1131.92*mm" rMax="1133.92*mm" dz="5.1135*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1028Z1230" rMin="1028.16*mm" rMax="1131.82*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR933Z1230" rMin="933.995*mm" rMax="1028.16*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR848Z1230" rMin="848.454*mm" rMax="933.995*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR770Z1230" rMin="770.748*mm" rMax="848.454*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR700Z1230" rMin="700.158*mm" rMax="770.748*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR636Z1230" rMin="636.033*mm" rMax="700.158*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR577Z1230" rMin="577.782*mm" rMax="636.033*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1131Z1408BarrelPart" rMin="1131.92*mm" rMax="1133.92*mm" dz="10.084*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1131Z1408EndcapsPart" rMin="1131.92*mm" rMax="1133.92*mm" dz="168.105*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR710Z1206" rMin="710.91*mm" rMax="883.268*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR700Z1204" rMin="700.91*mm" rMax="720.91*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR710Z1" rMin="710.91*mm" rMax="712.91*mm" dz="1.483*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR710Z1" rMin="710.91*mm" rMax="712.91*mm" dz="1.49*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR710Z152" rMin="710.91*mm" rMax="712.91*mm" dz="49.3915*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR710Z252" rMin="710.91*mm" rMax="712.91*mm" dz="50.359*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR710Z252" rMin="710.91*mm" rMax="712.91*mm" dz="50.3625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR710Z351" rMin="710.91*mm" rMax="712.91*mm" dz="48.4585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR710Z450" rMin="710.91*mm" rMax="712.91*mm" dz="50.597*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR710Z548" rMin="710.91*mm" rMax="712.91*mm" dz="47.5325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR710Z647" rMin="710.91*mm" rMax="712.91*mm" dz="50.833*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR710Z450" rMin="710.91*mm" rMax="712.91*mm" dz="50.606*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR710Z548" rMin="710.91*mm" rMax="712.91*mm" dz="47.532*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR710Z647" rMin="710.91*mm" rMax="712.91*mm" dz="50.8475*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR710Z744" rMin="710.91*mm" rMax="712.91*mm" dz="46.45*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR710Z842" rMin="710.91*mm" rMax="712.91*mm" dz="51.067*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR710Z842" rMin="710.91*mm" rMax="712.91*mm" dz="51.087*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR710Z938" rMin="710.91*mm" rMax="712.91*mm" dz="45.45*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR710Z1035" rMin="710.91*mm" rMax="712.91*mm" dz="51.2995*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR710Z1131" rMin="710.91*mm" rMax="712.91*mm" dz="44.796*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR710Z1189" rMin="710.91*mm" rMax="712.91*mm" dz="13.3625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR710Z1035" rMin="710.91*mm" rMax="712.91*mm" dz="51.3245*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR710Z1131" rMin="710.91*mm" rMax="712.91*mm" dz="44.7955*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR710Z1190" rMin="710.91*mm" rMax="712.91*mm" dz="13.3625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR710Z53" rMin="710.91*mm" rMax="712.91*mm" dz="49.885*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR883Z1206" rMin="883.368*mm" rMax="1130.78*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR883Z1206" rMin="883.368*mm" rMax="1105.82*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR873Z1204" rMin="873.368*mm" rMax="893.368*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR883Z1" rMin="883.368*mm" rMax="885.368*mm" dz="1.483*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR883Z1" rMin="883.368*mm" rMax="885.368*mm" dz="1.49*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR883Z152" rMin="883.368*mm" rMax="885.368*mm" dz="49.3915*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR883Z252" rMin="883.368*mm" rMax="885.368*mm" dz="50.359*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR883Z252" rMin="883.368*mm" rMax="885.368*mm" dz="50.3625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR883Z351" rMin="883.368*mm" rMax="885.368*mm" dz="48.4585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR883Z450" rMin="883.368*mm" rMax="885.368*mm" dz="50.597*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR883Z548" rMin="883.368*mm" rMax="885.368*mm" dz="47.5325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR883Z647" rMin="883.368*mm" rMax="885.368*mm" dz="50.833*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR883Z450" rMin="883.368*mm" rMax="885.368*mm" dz="50.606*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR883Z548" rMin="883.368*mm" rMax="885.368*mm" dz="47.532*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR883Z647" rMin="883.368*mm" rMax="885.368*mm" dz="50.8475*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR883Z744" rMin="883.368*mm" rMax="885.368*mm" dz="46.45*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR883Z842" rMin="883.368*mm" rMax="885.368*mm" dz="51.067*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR883Z842" rMin="883.368*mm" rMax="885.368*mm" dz="51.087*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR883Z938" rMin="883.368*mm" rMax="885.368*mm" dz="45.45*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR883Z1035" rMin="883.368*mm" rMax="885.368*mm" dz="51.2995*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR883Z1131" rMin="883.368*mm" rMax="885.368*mm" dz="44.796*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR883Z1189" rMin="883.368*mm" rMax="885.368*mm" dz="13.3625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR883Z1035" rMin="883.368*mm" rMax="885.368*mm" dz="51.3245*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR883Z1131" rMin="883.368*mm" rMax="885.368*mm" dz="44.7955*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR883Z1190" rMin="883.368*mm" rMax="885.368*mm" dz="13.3625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR883Z53" rMin="883.368*mm" rMax="885.368*mm" dz="49.885*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1130Z1206" rMin="1130.88*mm" rMax="1140.78*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1120Z1204" rMin="1120.88*mm" rMax="1140.88*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1130Z1" rMin="1130.88*mm" rMax="1132.88*mm" dz="1.483*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1130Z152" rMin="1130.88*mm" rMax="1132.88*mm" dz="49.3915*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1130Z252" rMin="1130.88*mm" rMax="1132.88*mm" dz="50.359*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1130Z351" rMin="1130.88*mm" rMax="1132.88*mm" dz="48.4585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1130Z450" rMin="1130.88*mm" rMax="1132.88*mm" dz="50.597*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1130Z548" rMin="1130.88*mm" rMax="1132.88*mm" dz="47.5325*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1130Z647" rMin="1130.88*mm" rMax="1132.88*mm" dz="50.833*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1130Z744" rMin="1130.88*mm" rMax="1132.88*mm" dz="46.45*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1130Z842" rMin="1130.88*mm" rMax="1132.88*mm" dz="51.067*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1130Z938" rMin="1130.88*mm" rMax="1132.88*mm" dz="45.45*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1130Z1035" rMin="1130.88*mm" rMax="1132.88*mm" dz="51.2995*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1130Z1131" rMin="1130.88*mm" rMax="1132.88*mm" dz="44.796*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1130Z1189" rMin="1130.88*mm" rMax="1132.88*mm" dz="13.3625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1130Z53" rMin="1130.88*mm" rMax="1132.88*mm" dz="49.885*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1105Z1206" rMin="1105.92*mm" rMax="1115.82*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1095Z1204" rMin="1095.92*mm" rMax="1115.92*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1105Z1" rMin="1105.92*mm" rMax="1107.92*mm" dz="1.49*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1105Z152" rMin="1105.92*mm" rMax="1107.92*mm" dz="49.3915*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1105Z252" rMin="1105.92*mm" rMax="1107.92*mm" dz="50.3625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1105Z351" rMin="1105.92*mm" rMax="1107.92*mm" dz="48.4585*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1105Z450" rMin="1105.92*mm" rMax="1107.92*mm" dz="50.606*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1105Z548" rMin="1105.92*mm" rMax="1107.92*mm" dz="47.532*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1105Z647" rMin="1105.92*mm" rMax="1107.92*mm" dz="50.8475*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1105Z744" rMin="1105.92*mm" rMax="1107.92*mm" dz="46.45*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1105Z842" rMin="1105.92*mm" rMax="1107.92*mm" dz="51.087*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1105Z938" rMin="1105.92*mm" rMax="1107.92*mm" dz="45.45*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1105Z1035" rMin="1105.92*mm" rMax="1107.92*mm" dz="51.3245*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1105Z1131" rMin="1105.92*mm" rMax="1107.92*mm" dz="44.7955*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1105Z1190" rMin="1105.92*mm" rMax="1107.92*mm" dz="13.3625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1105Z53" rMin="1105.92*mm" rMax="1107.92*mm" dz="49.885*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR300Z1216" rMin="300.376*mm" rMax="417.874*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR290Z1214" rMin="290.376*mm" rMax="310.376*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR300Z44" rMin="300.376*mm" rMax="302.376*mm" dz="21.4105*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR300Z89" rMin="300.376*mm" rMax="302.376*mm" dz="23.3405*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR300Z132" rMin="300.376*mm" rMax="302.376*mm" dz="19.4805*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR300Z170" rMin="300.376*mm" rMax="302.376*mm" dz="18.3955*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR300Z193" rMin="300.376*mm" rMax="302.376*mm" dz="4.848*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR300Z238" rMin="300.376*mm" rMax="302.376*mm" dz="4.848*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR300Z289" rMin="300.376*mm" rMax="302.376*mm" dz="4.848*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR300Z334" rMin="300.376*mm" rMax="302.376*mm" dz="5.9085*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR300Z393" rMin="300.376*mm" rMax="302.376*mm" dz="5.9085*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR300Z463" rMin="300.376*mm" rMax="302.376*mm" dz="5.9085*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR300Z546" rMin="300.376*mm" rMax="302.376*mm" dz="5.9085*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR300Z625" rMin="300.376*mm" rMax="302.376*mm" dz="6.101*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR300Z734" rMin="300.376*mm" rMax="302.376*mm" dz="6.101*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR300Z865" rMin="300.376*mm" rMax="302.376*mm" dz="6.101*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR300Z1018" rMin="300.376*mm" rMax="302.376*mm" dz="6.101*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR300Z1196" rMin="300.376*mm" rMax="302.376*mm" dz="6.101*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR300Z44" rMin="300.376*mm" rMax="302.376*mm" dz="21.4165*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR300Z89" rMin="300.376*mm" rMax="302.376*mm" dz="23.3415*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR300Z132" rMin="300.376*mm" rMax="302.376*mm" dz="19.4915*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR300Z170" rMin="300.376*mm" rMax="302.376*mm" dz="18.3775*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR300Z216" rMin="300.376*mm" rMax="302.376*mm" dz="17.5635*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR300Z264" rMin="300.376*mm" rMax="302.376*mm" dz="20.487*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR300Z311" rMin="300.376*mm" rMax="302.376*mm" dz="16.9115*mm" startPhi="0*deg" deltaPhi="360*deg"/>
@@ -18130,26 +18256,26 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Tubs name="serviceR300Z942" rMin="300.376*mm" rMax="302.376*mm" dz="70.593*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR300Z1107" rMin="300.376*mm" rMax="302.376*mm" dz="82.8625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR300Z1208" rMin="300.376*mm" rMax="302.376*mm" dz="5.345*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR300Z193" rMin="300.376*mm" rMax="302.376*mm" dz="4.848*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR300Z238" rMin="300.376*mm" rMax="302.376*mm" dz="4.848*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR300Z289" rMin="300.376*mm" rMax="302.376*mm" dz="4.848*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR300Z334" rMin="300.376*mm" rMax="302.376*mm" dz="5.9085*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR300Z393" rMin="300.376*mm" rMax="302.376*mm" dz="5.9085*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR300Z463" rMin="300.376*mm" rMax="302.376*mm" dz="5.9085*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR300Z546" rMin="300.376*mm" rMax="302.376*mm" dz="5.9085*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR300Z625" rMin="300.376*mm" rMax="302.376*mm" dz="6.101*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR300Z734" rMin="300.376*mm" rMax="302.376*mm" dz="6.101*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR300Z865" rMin="300.376*mm" rMax="302.376*mm" dz="6.101*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR300Z1018" rMin="300.376*mm" rMax="302.376*mm" dz="6.101*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR300Z1196" rMin="300.376*mm" rMax="302.376*mm" dz="6.101*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR417Z1216" rMin="417.974*mm" rMax="567.682*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR407Z1214" rMin="407.974*mm" rMax="427.974*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z45" rMin="417.974*mm" rMax="419.974*mm" dz="22.2945*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z91" rMin="417.974*mm" rMax="419.974*mm" dz="23.3995*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z136" rMin="417.974*mm" rMax="419.974*mm" dz="21.19*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z181" rMin="417.974*mm" rMax="419.974*mm" dz="24.052*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z225" rMin="417.974*mm" rMax="419.974*mm" dz="20.0965*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z267" rMin="417.974*mm" rMax="419.974*mm" dz="21.3155*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z292" rMin="417.974*mm" rMax="419.974*mm" dz="3.703*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z344" rMin="417.974*mm" rMax="419.974*mm" dz="3.703*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z400" rMin="417.974*mm" rMax="419.974*mm" dz="3.7025*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z450" rMin="417.974*mm" rMax="419.974*mm" dz="4.45*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z514" rMin="417.974*mm" rMax="419.974*mm" dz="4.45*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z586" rMin="417.974*mm" rMax="419.974*mm" dz="4.45*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z665" rMin="417.974*mm" rMax="419.974*mm" dz="4.45*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z741" rMin="417.974*mm" rMax="419.974*mm" dz="5.551*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z836" rMin="417.974*mm" rMax="419.974*mm" dz="5.551*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z943" rMin="417.974*mm" rMax="419.974*mm" dz="5.551*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z1064" rMin="417.974*mm" rMax="419.974*mm" dz="5.5515*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z1197" rMin="417.974*mm" rMax="419.974*mm" dz="5.5515*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR417Z45" rMin="417.974*mm" rMax="419.974*mm" dz="22.405*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR417Z91" rMin="417.974*mm" rMax="419.974*mm" dz="23.404*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR417Z136" rMin="417.974*mm" rMax="419.974*mm" dz="21.406*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR417Z182" rMin="417.974*mm" rMax="419.974*mm" dz="23.956*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR417Z226" rMin="417.974*mm" rMax="419.974*mm" dz="20.4165*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR417Z267" rMin="417.974*mm" rMax="419.974*mm" dz="20.7605*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR417Z318" rMin="417.974*mm" rMax="419.974*mm" dz="22.244*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR417Z372" rMin="417.974*mm" rMax="419.974*mm" dz="24.409*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR417Z425" rMin="417.974*mm" rMax="419.974*mm" dz="20.516*mm" startPhi="0*deg" deltaPhi="360*deg"/>
@@ -18162,28 +18288,28 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Tubs name="serviceR417Z1004" rMin="417.974*mm" rMax="419.974*mm" dz="54.618*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR417Z1131" rMin="417.974*mm" rMax="419.974*mm" dz="61.0525*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR417Z1208" rMin="417.974*mm" rMax="419.974*mm" dz="5.164*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR417Z292" rMin="417.974*mm" rMax="419.974*mm" dz="3.703*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR417Z344" rMin="417.974*mm" rMax="419.974*mm" dz="3.703*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR417Z400" rMin="417.974*mm" rMax="419.974*mm" dz="3.7025*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR417Z450" rMin="417.974*mm" rMax="419.974*mm" dz="4.45*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR417Z514" rMin="417.974*mm" rMax="419.974*mm" dz="4.45*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR417Z586" rMin="417.974*mm" rMax="419.974*mm" dz="4.45*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR417Z665" rMin="417.974*mm" rMax="419.974*mm" dz="4.45*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR417Z741" rMin="417.974*mm" rMax="419.974*mm" dz="5.551*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR417Z836" rMin="417.974*mm" rMax="419.974*mm" dz="5.551*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR417Z943" rMin="417.974*mm" rMax="419.974*mm" dz="5.551*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR417Z1064" rMin="417.974*mm" rMax="419.974*mm" dz="5.5515*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR417Z1197" rMin="417.974*mm" rMax="419.974*mm" dz="5.5515*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR567Z1216" rMin="567.782*mm" rMax="577.682*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR557Z1214" rMin="557.782*mm" rMax="577.782*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z46" rMin="567.782*mm" rMax="569.782*mm" dz="22.6335*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z92" rMin="567.782*mm" rMax="569.782*mm" dz="23.412*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z137" rMin="567.782*mm" rMax="569.782*mm" dz="21.8555*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z183" rMin="567.782*mm" rMax="569.782*mm" dz="23.879*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z228" rMin="567.782*mm" rMax="569.782*mm" dz="21.0825*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z274" rMin="567.782*mm" rMax="569.782*mm" dz="24.339*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z318" rMin="567.782*mm" rMax="569.782*mm" dz="20.315*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z360" rMin="567.782*mm" rMax="569.782*mm" dz="20.799*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z384" rMin="567.782*mm" rMax="569.782*mm" dz="3.997*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z438" rMin="567.782*mm" rMax="569.782*mm" dz="3.997*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z494" rMin="567.782*mm" rMax="569.782*mm" dz="3.997*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z554" rMin="567.782*mm" rMax="569.782*mm" dz="3.997*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z619" rMin="567.782*mm" rMax="569.782*mm" dz="3.997*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z686" rMin="567.782*mm" rMax="569.782*mm" dz="3.997*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z745" rMin="567.782*mm" rMax="569.782*mm" dz="4.717*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z822" rMin="567.782*mm" rMax="569.782*mm" dz="4.717*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z905" rMin="567.782*mm" rMax="569.782*mm" dz="4.717*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z995" rMin="567.782*mm" rMax="569.782*mm" dz="4.717*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z1092" rMin="567.782*mm" rMax="569.782*mm" dz="4.717*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR567Z1197" rMin="567.782*mm" rMax="569.782*mm" dz="4.717*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z46" rMin="567.782*mm" rMax="569.782*mm" dz="22.6125*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z92" rMin="567.782*mm" rMax="569.782*mm" dz="23.4115*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z137" rMin="567.782*mm" rMax="569.782*mm" dz="21.8145*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z183" rMin="567.782*mm" rMax="569.782*mm" dz="23.898*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z228" rMin="567.782*mm" rMax="569.782*mm" dz="21.021*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z273" rMin="567.782*mm" rMax="569.782*mm" dz="24.3775*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z318" rMin="567.782*mm" rMax="569.782*mm" dz="20.2335*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z359" rMin="567.782*mm" rMax="569.782*mm" dz="20.947*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR567Z411" rMin="567.782*mm" rMax="569.782*mm" dz="22.4555*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR567Z466" rMin="567.782*mm" rMax="569.782*mm" dz="24.169*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR567Z524" rMin="567.782*mm" rMax="569.782*mm" dz="26.066*mm" startPhi="0*deg" deltaPhi="360*deg"/>
@@ -18196,108 +18322,120 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Tubs name="serviceR567Z1044" rMin="567.782*mm" rMax="569.782*mm" dz="43.625*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR567Z1144" rMin="567.782*mm" rMax="569.782*mm" dz="47.2765*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR567Z1207" rMin="567.782*mm" rMax="569.782*mm" dz="5.987*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1128Z1458" rMin="1128.56*mm" rMax="1130.56*mm" dz="119.05*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1126Z1339" rMin="1126.56*mm" rMax="1128.56*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR217Z1340" rMin="217.256*mm" rMax="279.748*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR279Z1340" rMin="279.848*mm" rMax="328.697*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR328Z1340" rMin="328.797*mm" rMax="364.71*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR364Z1340" rMin="364.81*mm" rMax="414.427*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR414Z1340" rMin="414.527*mm" rMax="447.531*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR447Z1340" rMin="447.631*mm" rMax="497.879*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR497Z1340" rMin="497.979*mm" rMax="528.096*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR528Z1340" rMin="528.196*mm" rMax="579.009*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR579Z1340" rMin="579.109*mm" rMax="606.393*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR606Z1340" rMin="606.493*mm" rMax="661.624*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR661Z1340" rMin="661.724*mm" rMax="743.901*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR744Z1340" rMin="744.001*mm" rMax="851.434*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR851Z1340" rMin="851.534*mm" rMax="924.724*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR924Z1340" rMin="924.824*mm" rMax="1033.68*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1033Z1340" rMin="1033.78*mm" rMax="1100.85*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1100Z1340" rMin="1100.95*mm" rMax="1126.46*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1128Z1581" rMin="1128.56*mm" rMax="1130.56*mm" dz="3.95*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1126Z1577" rMin="1126.56*mm" rMax="1128.56*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR217Z1578" rMin="217.256*mm" rMax="279.748*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR279Z1578" rMin="279.848*mm" rMax="328.697*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR328Z1578" rMin="328.797*mm" rMax="364.71*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR364Z1578" rMin="364.81*mm" rMax="414.427*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR414Z1578" rMin="414.527*mm" rMax="447.531*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR447Z1578" rMin="447.631*mm" rMax="497.879*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR497Z1578" rMin="497.979*mm" rMax="528.096*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR528Z1578" rMin="528.196*mm" rMax="579.009*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR579Z1578" rMin="579.109*mm" rMax="606.393*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR606Z1578" rMin="606.493*mm" rMax="661.624*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR661Z1578" rMin="661.724*mm" rMax="743.901*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR744Z1578" rMin="744.001*mm" rMax="851.434*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR851Z1578" rMin="851.534*mm" rMax="924.724*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR924Z1578" rMin="924.824*mm" rMax="1033.68*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1033Z1578" rMin="1033.78*mm" rMax="1100.85*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1100Z1578" rMin="1100.95*mm" rMax="1126.46*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1128Z2062" rMin="1128.56*mm" rMax="1130.56*mm" dz="181.345*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1126Z1881" rMin="1126.56*mm" rMax="1128.56*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR317Z1882" rMin="317.159*mm" rMax="378.558*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR378Z1882" rMin="378.658*mm" rMax="417.552*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z1882" rMin="417.652*mm" rMax="467.506*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR467Z1882" rMin="467.606*mm" rMax="504.356*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR504Z1882" rMin="504.456*mm" rMax="554.71*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR554Z1882" rMin="554.81*mm" rMax="589.42*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR589Z1882" rMin="589.52*mm" rMax="641.133*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR641Z1882" rMin="641.233*mm" rMax="727.904*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR728Z1882" rMin="728.004*mm" rMax="832.705*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR832Z1882" rMin="832.805*mm" rMax="915.585*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR915Z1882" rMin="915.685*mm" rMax="1022.49*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1022Z1882" rMin="1022.59*mm" rMax="1100.85*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1100Z1882" rMin="1100.95*mm" rMax="1126.46*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1128Z2460" rMin="1128.56*mm" rMax="1130.56*mm" dz="216.943*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1126Z2243" rMin="1126.56*mm" rMax="1128.56*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR317Z2244" rMin="317.159*mm" rMax="378.558*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR378Z2244" rMin="378.658*mm" rMax="417.552*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z2244" rMin="417.652*mm" rMax="467.506*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR467Z2244" rMin="467.606*mm" rMax="504.356*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR504Z2244" rMin="504.456*mm" rMax="554.71*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR554Z2244" rMin="554.81*mm" rMax="589.42*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR589Z2244" rMin="589.52*mm" rMax="641.133*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR641Z2244" rMin="641.233*mm" rMax="727.904*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR728Z2244" rMin="728.004*mm" rMax="832.705*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR832Z2244" rMin="832.805*mm" rMax="915.585*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR915Z2244" rMin="915.685*mm" rMax="1022.49*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1022Z2244" rMin="1022.59*mm" rMax="1100.85*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1100Z2244" rMin="1100.95*mm" rMax="1126.46*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1128Z2681" rMin="1128.56*mm" rMax="1130.56*mm" dz="3.95*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1126Z2677" rMin="1126.56*mm" rMax="1128.56*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR317Z2678" rMin="317.159*mm" rMax="378.558*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR378Z2678" rMin="378.658*mm" rMax="417.552*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR417Z2678" rMin="417.652*mm" rMax="467.506*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR467Z2678" rMin="467.606*mm" rMax="504.356*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR504Z2678" rMin="504.456*mm" rMax="554.71*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR554Z2678" rMin="554.81*mm" rMax="589.42*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR589Z2678" rMin="589.52*mm" rMax="641.133*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR641Z2678" rMin="641.233*mm" rMax="727.904*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR728Z2678" rMin="728.004*mm" rMax="832.705*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR832Z2678" rMin="832.805*mm" rMax="915.585*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR915Z2678" rMin="915.685*mm" rMax="1022.49*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1022Z2678" rMin="1022.59*mm" rMax="1100.85*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="serviceR1100Z2678" rMin="1100.95*mm" rMax="1126.46*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z384" rMin="567.782*mm" rMax="569.782*mm" dz="3.997*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z438" rMin="567.782*mm" rMax="569.782*mm" dz="3.997*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z494" rMin="567.782*mm" rMax="569.782*mm" dz="3.997*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z554" rMin="567.782*mm" rMax="569.782*mm" dz="3.997*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z619" rMin="567.782*mm" rMax="569.782*mm" dz="3.997*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z686" rMin="567.782*mm" rMax="569.782*mm" dz="3.997*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z745" rMin="567.782*mm" rMax="569.782*mm" dz="4.717*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z822" rMin="567.782*mm" rMax="569.782*mm" dz="4.717*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z905" rMin="567.782*mm" rMax="569.782*mm" dz="4.717*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z995" rMin="567.782*mm" rMax="569.782*mm" dz="4.717*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z1092" rMin="567.782*mm" rMax="569.782*mm" dz="4.717*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR567Z1197" rMin="567.782*mm" rMax="569.782*mm" dz="4.717*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1102Z1459" rMin="1102.02*mm" rMax="1104.02*mm" dz="119.05*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1100Z1340" rMin="1100.02*mm" rMax="1102.02*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR224Z1341" rMin="224.807*mm" rMax="287.19*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR287Z1341" rMin="287.29*mm" rMax="334.362*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR334Z1341" rMin="334.462*mm" rMax="367.355*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR367Z1341" rMin="367.455*mm" rMax="416.673*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR416Z1341" rMin="416.773*mm" rMax="446.134*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR446Z1341" rMin="446.234*mm" rMax="496.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR496Z1341" rMin="496.525*mm" rMax="524.326*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR524Z1341" rMin="524.426*mm" rMax="575.604*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR575Z1341" rMin="575.704*mm" rMax="601.957*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR602Z1341" rMin="602.057*mm" rMax="656.756*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR656Z1341" rMin="656.856*mm" rMax="740.952*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR741Z1341" rMin="741.052*mm" rMax="839.146*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR839Z1341" rMin="839.246*mm" rMax="905.854*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR905Z1341" rMin="905.954*mm" rMax="1014.33*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1014Z1341" rMin="1014.43*mm" rMax="1074.28*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1074Z1341" rMin="1074.38*mm" rMax="1099.92*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1102Z1582" rMin="1102.02*mm" rMax="1104.02*mm" dz="3.95*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1100Z1578" rMin="1100.02*mm" rMax="1102.02*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR224Z1579" rMin="224.807*mm" rMax="287.19*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR287Z1579" rMin="287.29*mm" rMax="334.362*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR334Z1579" rMin="334.462*mm" rMax="367.355*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR367Z1579" rMin="367.455*mm" rMax="416.673*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR416Z1579" rMin="416.773*mm" rMax="446.134*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR446Z1579" rMin="446.234*mm" rMax="496.425*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR496Z1579" rMin="496.525*mm" rMax="524.326*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR524Z1579" rMin="524.426*mm" rMax="575.604*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR575Z1579" rMin="575.704*mm" rMax="601.957*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR602Z1579" rMin="602.057*mm" rMax="656.756*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR656Z1579" rMin="656.856*mm" rMax="740.952*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR741Z1579" rMin="741.052*mm" rMax="839.146*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR839Z1579" rMin="839.246*mm" rMax="905.854*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR905Z1579" rMin="905.954*mm" rMax="1014.33*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1014Z1579" rMin="1014.43*mm" rMax="1074.28*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1074Z1579" rMin="1074.38*mm" rMax="1099.92*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1102Z2063" rMin="1102.02*mm" rMax="1104.02*mm" dz="181.345*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1100Z1881" rMin="1100.02*mm" rMax="1102.02*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR319Z1882" rMin="319.807*mm" rMax="381.185*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR381Z1882" rMin="381.285*mm" rMax="414.787*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR414Z1882" rMin="414.887*mm" rMax="463.119*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR463Z1882" rMin="463.219*mm" rMax="496.854*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR496Z1882" rMin="496.954*mm" rMax="545.608*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR545Z1882" rMin="545.708*mm" rMax="577.052*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR577Z1882" rMin="577.152*mm" rMax="627.637*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR627Z1882" rMin="627.737*mm" rMax="716.512*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR716Z1882" rMin="716.612*mm" rMax="819.176*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR819Z1882" rMin="819.276*mm" rMax="895.879*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR895Z1882" rMin="895.979*mm" rMax="1001.11*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1001Z1882" rMin="1001.21*mm" rMax="1074.28*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1074Z1882" rMin="1074.38*mm" rMax="1099.92*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1102Z2461" rMin="1102.02*mm" rMax="1104.02*mm" dz="216.942*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1100Z2244" rMin="1100.02*mm" rMax="1102.02*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR319Z2245" rMin="319.807*mm" rMax="381.185*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR381Z2245" rMin="381.285*mm" rMax="414.787*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR414Z2245" rMin="414.887*mm" rMax="463.119*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR463Z2245" rMin="463.219*mm" rMax="496.854*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR496Z2245" rMin="496.954*mm" rMax="545.608*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR545Z2245" rMin="545.708*mm" rMax="577.052*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR577Z2245" rMin="577.152*mm" rMax="627.637*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR627Z2245" rMin="627.737*mm" rMax="716.512*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR716Z2245" rMin="716.612*mm" rMax="819.176*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR819Z2245" rMin="819.276*mm" rMax="895.879*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR895Z2245" rMin="895.979*mm" rMax="1001.11*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1001Z2245" rMin="1001.21*mm" rMax="1074.28*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1074Z2245" rMin="1074.38*mm" rMax="1099.92*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1102Z2682" rMin="1102.02*mm" rMax="1104.02*mm" dz="3.95*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1100Z2678" rMin="1100.02*mm" rMax="1102.02*mm" dz="10*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR319Z2679" rMin="319.807*mm" rMax="381.185*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR381Z2679" rMin="381.285*mm" rMax="414.787*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR414Z2679" rMin="414.887*mm" rMax="463.119*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR463Z2679" rMin="463.219*mm" rMax="496.854*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR496Z2679" rMin="496.954*mm" rMax="545.608*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR545Z2679" rMin="545.708*mm" rMax="577.052*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR577Z2679" rMin="577.152*mm" rMax="627.637*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR627Z2679" rMin="627.737*mm" rMax="716.512*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR716Z2679" rMin="716.612*mm" rMax="819.176*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR819Z2679" rMin="819.276*mm" rMax="895.879*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR895Z2679" rMin="895.979*mm" rMax="1001.11*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1001Z2679" rMin="1001.21*mm" rMax="1074.28*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="serviceR1074Z2679" rMin="1074.38*mm" rMax="1099.92*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="supportR1155Z1564" rMin="1155*mm" rMax="1157*mm" dz="264*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="supportR1155Z2264" rMin="1155*mm" rMax="1157*mm" dz="436*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="supportR314Z2251" rMin="314*mm" rMax="316*mm" dz="423*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="supportR714Z291" rMin="714.91*mm" rMax="839.85*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR887Z291" rMin="887.369*mm" rMax="1087.85*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR887Z291" rMin="887.369*mm" rMax="1062.85*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="supportR714Z1176" rMin="714.91*mm" rMax="839.85*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR887Z1176" rMin="887.369*mm" rMax="1087.85*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR1134Z599" rMin="1134.88*mm" rMax="1136.88*mm" dz="599.165*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR664Z599" rMin="664.85*mm" rMax="666.85*mm" dz="599.165*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR887Z1176" rMin="887.369*mm" rMax="1062.85*mm" dz="1*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR1109Z599" rMin="1109.92*mm" rMax="1111.92*mm" dz="599.243*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR664Z599" rMin="664.85*mm" rMax="666.85*mm" dz="599.243*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="supportR571Z604" rMin="571.782*mm" rMax="573.782*mm" dz="604.406*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR210Z604" rMin="210.501*mm" rMax="212.501*mm" dz="604.406*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR214Z1430" rMin="214.257*mm" rMax="216.257*mm" dz="144.75*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR212Z604" rMin="212.052*mm" rMax="214.052*mm" dz="604.406*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<Tubs name="supportR221Z1430" rMin="221.808*mm" rMax="223.808*mm" dz="145.43*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <SubtractionSolid name="Rod1SubtractionIntermediate">
 <rSolid name="Rod1Full"/>
 <rSolid name="Rod1Air"/>
-<Translation x="3.04625*mm" y="0*mm" z="144.22*mm"/>
+<Translation x="3.03875*mm" y="0*mm" z="144.245*mm"/>
 </SubtractionSolid>
 <SubtractionSolid name="Rod1">
 <rSolid name="Rod1SubtractionIntermediate"/>
 <rSolid name="Rod1Air"/>
-<Translation x="3.04625*mm" y="0*mm" z="-144.22*mm"/>
+<Translation x="3.03875*mm" y="0*mm" z="-144.245*mm"/>
 </SubtractionSolid>
 <IntersectionSolid name="Ring5Layer1Minus">
 <rSolid name="Ring5Layer1MinusCone"/>
@@ -18398,12 +18536,12 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <SubtractionSolid name="Rod2SubtractionIntermediate">
 <rSolid name="Rod2Full"/>
 <rSolid name="Rod2Air"/>
-<Translation x="2.75*mm" y="0*mm" z="237.406*mm"/>
+<Translation x="2.53875*mm" y="0*mm" z="238.196*mm"/>
 </SubtractionSolid>
 <SubtractionSolid name="Rod2">
 <rSolid name="Rod2SubtractionIntermediate"/>
 <rSolid name="Rod2Air"/>
-<Translation x="2.75*mm" y="0*mm" z="-237.406*mm"/>
+<Translation x="2.53875*mm" y="0*mm" z="-238.196*mm"/>
 </SubtractionSolid>
 <IntersectionSolid name="Ring7Layer2Minus">
 <rSolid name="Ring7Layer2MinusCone"/>
@@ -18504,12 +18642,12 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <SubtractionSolid name="Rod3SubtractionIntermediate">
 <rSolid name="Rod3Full"/>
 <rSolid name="Rod3Air"/>
-<Translation x="2.75*mm" y="0*mm" z="330.356*mm"/>
+<Translation x="2.8072*mm" y="0*mm" z="330.141*mm"/>
 </SubtractionSolid>
 <SubtractionSolid name="Rod3">
 <rSolid name="Rod3SubtractionIntermediate"/>
 <rSolid name="Rod3Air"/>
-<Translation x="2.75*mm" y="0*mm" z="-330.356*mm"/>
+<Translation x="2.8072*mm" y="0*mm" z="-330.141*mm"/>
 </SubtractionSolid>
 <IntersectionSolid name="Ring9Layer3Minus">
 <rSolid name="Ring9Layer3MinusCone"/>
@@ -18613,7 +18751,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod1"/>
 <rChild name="tracker:BModule1Layer1"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="3.5625*mm" y="0*mm" z="2.84217e-14*mm"/>
+<Translation x="3.5475*mm" y="0*mm" z="2.84217e-14*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule1Layer1"/>
@@ -18666,13 +18804,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod1"/>
 <rChild name="tracker:BModule2Layer1"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-3.5625*mm" y="0*mm" z="42.9211*mm"/>
+<Translation x="-3.5475*mm" y="0*mm" z="42.9333*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod1"/>
 <rChild name="tracker:BModule2Layer1"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-3.5625*mm" y="0*mm" z="-42.9211*mm"/>
+<Translation x="-3.5475*mm" y="0*mm" z="-42.9333*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule2Layer1"/>
@@ -18725,13 +18863,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod1"/>
 <rChild name="tracker:BModule3Layer1"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="3.5625*mm" y="0*mm" z="89.7029*mm"/>
+<Translation x="3.5475*mm" y="0*mm" z="89.7161*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod1"/>
 <rChild name="tracker:BModule3Layer1"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="3.5625*mm" y="0*mm" z="-89.7029*mm"/>
+<Translation x="3.5475*mm" y="0*mm" z="-89.7161*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule3Layer1"/>
@@ -18784,13 +18922,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod1"/>
 <rChild name="tracker:BModule4Layer1"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-3.5625*mm" y="0*mm" z="128.763*mm"/>
+<Translation x="-3.5475*mm" y="0*mm" z="128.8*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod1"/>
 <rChild name="tracker:BModule4Layer1"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-3.5625*mm" y="0*mm" z="-128.763*mm"/>
+<Translation x="-3.5475*mm" y="0*mm" z="-128.8*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule4Layer1"/>
@@ -19531,7 +19669,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod2"/>
 <rChild name="tracker:BModule1Layer2"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="3.47*mm" y="0*mm" z="4.26326e-14*mm"/>
+<Translation x="3.0475*mm" y="0*mm" z="4.26326e-14*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule1Layer2"/>
@@ -19584,13 +19722,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod2"/>
 <rChild name="tracker:BModule2Layer2"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-3.47*mm" y="0*mm" z="44.6895*mm"/>
+<Translation x="-3.0475*mm" y="0*mm" z="44.9101*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod2"/>
 <rChild name="tracker:BModule2Layer2"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-3.47*mm" y="0*mm" z="-44.6895*mm"/>
+<Translation x="-3.0475*mm" y="0*mm" z="-44.9101*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule2Layer2"/>
@@ -19643,13 +19781,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod2"/>
 <rChild name="tracker:BModule3Layer2"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="3.47*mm" y="0*mm" z="91.5881*mm"/>
+<Translation x="3.0475*mm" y="0*mm" z="91.8182*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod2"/>
 <rChild name="tracker:BModule3Layer2"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="3.47*mm" y="0*mm" z="-91.5881*mm"/>
+<Translation x="3.0475*mm" y="0*mm" z="-91.8182*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule3Layer2"/>
@@ -19702,13 +19840,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod2"/>
 <rChild name="tracker:BModule4Layer2"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-3.47*mm" y="0*mm" z="134.068*mm"/>
+<Translation x="-3.0475*mm" y="0*mm" z="134.73*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod2"/>
 <rChild name="tracker:BModule4Layer2"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-3.47*mm" y="0*mm" z="-134.068*mm"/>
+<Translation x="-3.0475*mm" y="0*mm" z="-134.73*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule4Layer2"/>
@@ -19761,13 +19899,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod2"/>
 <rChild name="tracker:BModule5Layer2"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="3.47*mm" y="0*mm" z="182.273*mm"/>
+<Translation x="3.0475*mm" y="0*mm" z="182.742*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod2"/>
 <rChild name="tracker:BModule5Layer2"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="3.47*mm" y="0*mm" z="-182.273*mm"/>
+<Translation x="3.0475*mm" y="0*mm" z="-182.742*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule5Layer2"/>
@@ -19820,13 +19958,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod2"/>
 <rChild name="tracker:BModule6Layer2"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-3.47*mm" y="0*mm" z="222.566*mm"/>
+<Translation x="-3.0475*mm" y="0*mm" z="223.676*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod2"/>
 <rChild name="tracker:BModule6Layer2"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-3.47*mm" y="0*mm" z="-222.566*mm"/>
+<Translation x="-3.0475*mm" y="0*mm" z="-223.676*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule6Layer2"/>
@@ -20567,7 +20705,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod3"/>
 <rChild name="tracker:BModule1Layer3"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="3.47*mm" y="0*mm" z="6.39488e-14*mm"/>
+<Translation x="3.5844*mm" y="0*mm" z="6.39488e-14*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule1Layer3"/>
@@ -20620,13 +20758,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod3"/>
 <rChild name="tracker:BModule2Layer3"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-3.47*mm" y="0*mm" z="45.3676*mm"/>
+<Translation x="-3.5844*mm" y="0*mm" z="45.3257*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod3"/>
 <rChild name="tracker:BModule2Layer3"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-3.47*mm" y="0*mm" z="-45.3676*mm"/>
+<Translation x="-3.5844*mm" y="0*mm" z="-45.3257*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule2Layer3"/>
@@ -20679,13 +20817,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod3"/>
 <rChild name="tracker:BModule3Layer3"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="3.47*mm" y="0*mm" z="92.2917*mm"/>
+<Translation x="3.5844*mm" y="0*mm" z="92.2485*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod3"/>
 <rChild name="tracker:BModule3Layer3"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="3.47*mm" y="0*mm" z="-92.2917*mm"/>
+<Translation x="3.5844*mm" y="0*mm" z="-92.2485*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule3Layer3"/>
@@ -20738,13 +20876,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod3"/>
 <rChild name="tracker:BModule4Layer3"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-3.47*mm" y="0*mm" z="136.103*mm"/>
+<Translation x="-3.5844*mm" y="0*mm" z="135.977*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod3"/>
 <rChild name="tracker:BModule4Layer3"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-3.47*mm" y="0*mm" z="-136.103*mm"/>
+<Translation x="-3.5844*mm" y="0*mm" z="-135.977*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule4Layer3"/>
@@ -20797,13 +20935,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod3"/>
 <rChild name="tracker:BModule5Layer3"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="3.47*mm" y="0*mm" z="183.961*mm"/>
+<Translation x="3.5844*mm" y="0*mm" z="183.873*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod3"/>
 <rChild name="tracker:BModule5Layer3"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="3.47*mm" y="0*mm" z="-183.961*mm"/>
+<Translation x="3.5844*mm" y="0*mm" z="-183.873*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule5Layer3"/>
@@ -20856,13 +20994,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod3"/>
 <rChild name="tracker:BModule6Layer3"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-3.47*mm" y="0*mm" z="226.226*mm"/>
+<Translation x="-3.5844*mm" y="0*mm" z="226.016*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod3"/>
 <rChild name="tracker:BModule6Layer3"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-3.47*mm" y="0*mm" z="-226.226*mm"/>
+<Translation x="-3.5844*mm" y="0*mm" z="-226.016*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule6Layer3"/>
@@ -20915,13 +21053,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod3"/>
 <rChild name="tracker:BModule7Layer3"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="3.47*mm" y="0*mm" z="275.004*mm"/>
+<Translation x="3.5844*mm" y="0*mm" z="274.87*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod3"/>
 <rChild name="tracker:BModule7Layer3"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="3.47*mm" y="0*mm" z="-275.004*mm"/>
+<Translation x="3.5844*mm" y="0*mm" z="-274.87*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule7Layer3"/>
@@ -20974,13 +21112,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod3"/>
 <rChild name="tracker:BModule8Layer3"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-3.47*mm" y="0*mm" z="315.734*mm"/>
+<Translation x="-3.5844*mm" y="0*mm" z="315.437*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod3"/>
 <rChild name="tracker:BModule8Layer3"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-3.47*mm" y="0*mm" z="-315.734*mm"/>
+<Translation x="-3.5844*mm" y="0*mm" z="-315.437*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule8Layer3"/>
@@ -21721,13 +21859,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule1Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="52.7864*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="52.8004*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule1Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="-47.0833*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="-47.0695*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule1Layer4"/>
@@ -21775,13 +21913,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule2Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="151.67*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="151.684*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule2Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="-147.649*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="-147.637*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule2Layer4"/>
@@ -21829,13 +21967,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule3Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="252.487*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="252.508*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule3Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="-245.646*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="-245.634*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule3Layer4"/>
@@ -21883,7 +22021,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule4Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="349.505*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="349.526*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod4"/>
@@ -21937,7 +22075,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule5Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="450.798*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="450.837*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod4"/>
@@ -21991,13 +22129,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule6Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="545.963*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="546.002*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule6Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="-544.345*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="-544.368*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule6Layer4"/>
@@ -22045,13 +22183,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule7Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="647.729*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="647.797*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule7Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="-637.345*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="-637.368*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule7Layer4"/>
@@ -22099,13 +22237,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule8Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="740.729*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="740.797*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule8Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="-739.331*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="-739.388*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule8Layer4"/>
@@ -22153,13 +22291,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule9Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="842.963*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="843.071*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule9Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="-830.331*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="-830.388*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule9Layer4"/>
@@ -22207,13 +22345,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule10Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="933.963*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="934.071*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule10Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="-932.78*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="-932.882*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule10Layer4"/>
@@ -22261,13 +22399,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule11Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="1036.66*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="1036.82*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule11Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="-1023.44*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="-1023.54*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule11Layer4"/>
@@ -22315,13 +22453,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule12Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="1126.35*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="1126.51*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod4"/>
 <rChild name="tracker:BModule12Layer4"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="-1126.36*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="-1126.51*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule12Layer4"/>
@@ -22373,13 +22511,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule1Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="52.7864*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="52.8004*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule1Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="-47.0833*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="-47.0695*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule1Layer5"/>
@@ -22427,13 +22565,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule2Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="151.67*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="151.684*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule2Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="-147.649*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="-147.637*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule2Layer5"/>
@@ -22481,13 +22619,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule3Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="252.487*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="252.508*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule3Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="-245.646*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="-245.634*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule3Layer5"/>
@@ -22535,7 +22673,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule4Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="349.505*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="349.526*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod5"/>
@@ -22589,7 +22727,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule5Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="450.798*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="450.837*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod5"/>
@@ -22643,13 +22781,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule6Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="545.963*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="546.002*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule6Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="-544.345*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="-544.368*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule6Layer5"/>
@@ -22697,13 +22835,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule7Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="647.729*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="647.797*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule7Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="-637.345*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="-637.368*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule7Layer5"/>
@@ -22751,13 +22889,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule8Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="740.729*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="740.797*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule8Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="-739.331*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="-739.388*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule8Layer5"/>
@@ -22805,13 +22943,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule9Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="842.963*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="843.071*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule9Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="-830.331*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="-830.388*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule9Layer5"/>
@@ -22859,13 +22997,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule10Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="933.963*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="934.071*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule10Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="-932.78*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="-932.882*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule10Layer5"/>
@@ -22913,13 +23051,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule11Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="1036.66*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="1036.82*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule11Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="-1023.44*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="-1023.54*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule11Layer5"/>
@@ -22967,13 +23105,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule12Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="1126.35*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="1126.51*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod5"/>
 <rChild name="tracker:BModule12Layer5"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="-1126.36*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="-1126.51*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule12Layer5"/>
@@ -23025,13 +23163,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule1Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="52.7864*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="52.8004*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule1Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="-47.0833*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="-47.0695*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule1Layer6"/>
@@ -23079,13 +23217,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule2Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="151.67*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="151.684*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule2Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="-147.649*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="-147.637*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule2Layer6"/>
@@ -23133,13 +23271,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule3Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="252.487*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="252.508*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule3Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="-245.646*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="-245.634*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule3Layer6"/>
@@ -23187,7 +23325,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule4Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="349.505*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="349.526*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod6"/>
@@ -23241,7 +23379,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule5Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="450.798*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="450.837*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod6"/>
@@ -23295,13 +23433,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule6Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="545.963*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="546.002*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule6Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="-544.345*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="-544.368*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule6Layer6"/>
@@ -23349,13 +23487,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule7Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="647.729*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="647.797*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule7Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="-637.345*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="-637.368*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule7Layer6"/>
@@ -23403,13 +23541,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule8Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="740.729*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="740.797*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule8Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="-739.331*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="-739.388*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule8Layer6"/>
@@ -23457,13 +23595,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule9Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="842.963*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="843.071*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule9Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="-830.331*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="-830.388*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule9Layer6"/>
@@ -23511,13 +23649,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule10Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="933.963*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="934.071*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule10Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="-932.78*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="-932.882*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule10Layer6"/>
@@ -23565,13 +23703,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule11Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="1036.66*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="1036.82*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule11Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="-1023.44*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="-1023.54*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule11Layer6"/>
@@ -23619,13 +23757,13 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule12Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOFLIPPEDMODULE"/>
-<Translation x="-2.25*mm" y="0*mm" z="1126.35*mm"/>
+<Translation x="-2.25*mm" y="0*mm" z="1126.51*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="tracker:Rod6"/>
 <rChild name="tracker:BModule12Layer6"/>
 <rRotation name="tracker:OUTERTRACKERRODTOMODULE"/>
-<Translation x="2.25*mm" y="0*mm" z="-1126.36*mm"/>
+<Translation x="2.25*mm" y="0*mm" z="-1126.51*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:BModule12Layer6"/>
@@ -24356,77 +24494,77 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc1"/>
 <rChild name="tracker:Ring1Disc1"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc1"/>
 <rChild name="tracker:Ring2Disc1"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc1"/>
 <rChild name="tracker:Ring3Disc1"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc1"/>
 <rChild name="tracker:Ring4Disc1"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc1"/>
 <rChild name="tracker:Ring5Disc1"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc1"/>
 <rChild name="tracker:Ring6Disc1"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc1"/>
 <rChild name="tracker:Ring7Disc1"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc1"/>
 <rChild name="tracker:Ring8Disc1"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc1"/>
 <rChild name="tracker:Ring9Disc1"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc1"/>
 <rChild name="tracker:Ring10Disc1"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc1"/>
 <rChild name="tracker:Ring11Disc1"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc1"/>
 <rChild name="tracker:Ring12Disc1"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc1"/>
 <rChild name="tracker:Ring13Disc1"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc1"/>
 <rChild name="tracker:Ring14Disc1"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc1"/>
 <rChild name="tracker:Ring15Disc1"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
@@ -25116,77 +25254,77 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc2"/>
 <rChild name="tracker:Ring1Disc2"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc2"/>
 <rChild name="tracker:Ring2Disc2"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc2"/>
 <rChild name="tracker:Ring3Disc2"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc2"/>
 <rChild name="tracker:Ring4Disc2"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc2"/>
 <rChild name="tracker:Ring5Disc2"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc2"/>
 <rChild name="tracker:Ring6Disc2"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc2"/>
 <rChild name="tracker:Ring7Disc2"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc2"/>
 <rChild name="tracker:Ring8Disc2"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc2"/>
 <rChild name="tracker:Ring9Disc2"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc2"/>
 <rChild name="tracker:Ring10Disc2"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc2"/>
 <rChild name="tracker:Ring11Disc2"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc2"/>
 <rChild name="tracker:Ring12Disc2"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc2"/>
 <rChild name="tracker:Ring13Disc2"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc2"/>
 <rChild name="tracker:Ring14Disc2"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc2"/>
 <rChild name="tracker:Ring15Disc2"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
@@ -25735,62 +25873,62 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc3"/>
 <rChild name="tracker:Ring4Disc3"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc3"/>
 <rChild name="tracker:Ring5Disc3"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc3"/>
 <rChild name="tracker:Ring6Disc3"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc3"/>
 <rChild name="tracker:Ring7Disc3"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc3"/>
 <rChild name="tracker:Ring8Disc3"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc3"/>
 <rChild name="tracker:Ring9Disc3"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc3"/>
 <rChild name="tracker:Ring10Disc3"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc3"/>
 <rChild name="tracker:Ring11Disc3"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc3"/>
 <rChild name="tracker:Ring12Disc3"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc3"/>
 <rChild name="tracker:Ring13Disc3"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc3"/>
 <rChild name="tracker:Ring14Disc3"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc3"/>
 <rChild name="tracker:Ring15Disc3"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
@@ -26339,62 +26477,62 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc4"/>
 <rChild name="tracker:Ring4Disc4"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc4"/>
 <rChild name="tracker:Ring5Disc4"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc4"/>
 <rChild name="tracker:Ring6Disc4"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc4"/>
 <rChild name="tracker:Ring7Disc4"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc4"/>
 <rChild name="tracker:Ring8Disc4"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc4"/>
 <rChild name="tracker:Ring9Disc4"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc4"/>
 <rChild name="tracker:Ring10Disc4"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc4"/>
 <rChild name="tracker:Ring11Disc4"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc4"/>
 <rChild name="tracker:Ring12Disc4"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc4"/>
 <rChild name="tracker:Ring13Disc4"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc4"/>
 <rChild name="tracker:Ring14Disc4"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc4"/>
 <rChild name="tracker:Ring15Disc4"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
@@ -26943,62 +27081,62 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc5"/>
 <rChild name="tracker:Ring4Disc5"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc5"/>
 <rChild name="tracker:Ring5Disc5"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc5"/>
 <rChild name="tracker:Ring6Disc5"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc5"/>
 <rChild name="tracker:Ring7Disc5"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc5"/>
 <rChild name="tracker:Ring8Disc5"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc5"/>
 <rChild name="tracker:Ring9Disc5"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc5"/>
 <rChild name="tracker:Ring10Disc5"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc5"/>
 <rChild name="tracker:Ring11Disc5"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc5"/>
 <rChild name="tracker:Ring12Disc5"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc5"/>
 <rChild name="tracker:Ring13Disc5"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc5"/>
 <rChild name="tracker:Ring14Disc5"/>
-<Translation x="0*mm" y="0*mm" z="15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="tracker:Disc5"/>
 <rChild name="tracker:Ring15Disc5"/>
-<Translation x="0*mm" y="0*mm" z="-15.075*mm"/>
+<Translation x="0*mm" y="0*mm" z="-15.755*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
@@ -27007,109 +27145,109 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1139Z2686"/>
-<Translation x="0*mm" y="0*mm" z="2395.82*mm"/>
+<rChild name="tracker:serviceR1112Z2687"/>
+<Translation x="0*mm" y="0*mm" z="2396.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1151Z2730"/>
-<Translation x="0*mm" y="0*mm" z="2439.82*mm"/>
+<rChild name="tracker:serviceR1131Z2731"/>
+<Translation x="0*mm" y="0*mm" z="2440.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1139Z1586"/>
-<Translation x="0*mm" y="0*mm" z="1295.65*mm"/>
+<rChild name="tracker:serviceR1112Z1587"/>
+<Translation x="0*mm" y="0*mm" z="1296.33*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1151Z2135"/>
-<Translation x="0*mm" y="0*mm" z="1844.69*mm"/>
+<rChild name="tracker:serviceR1131Z2136"/>
+<Translation x="0*mm" y="0*mm" z="1845.37*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1140Z1220"/>
-<Translation x="0*mm" y="0*mm" z="1220.33*mm"/>
+<rChild name="tracker:serviceR1115Z1220"/>
+<Translation x="0*mm" y="0*mm" z="1220.48*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1140Z1220"/>
+<rChild name="tracker:serviceR1115Z1220"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1220.33*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1220.48*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1151Z1224"/>
-<Translation x="0*mm" y="0*mm" z="1224.52*mm"/>
+<rChild name="tracker:serviceR1131Z1224"/>
+<Translation x="0*mm" y="0*mm" z="1224.6*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1151Z1224"/>
+<rChild name="tracker:serviceR1131Z1224"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1224.52*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1224.6*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1043Z1230"/>
+<rChild name="tracker:serviceR1028Z1230"/>
 <Translation x="0*mm" y="0*mm" z="1230.81*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1043Z1230"/>
+<rChild name="tracker:serviceR1028Z1230"/>
 <rRotation name="tracker:Y180"/>
 <Translation x="0*mm" y="0*mm" z="-1230.81*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR945Z1230"/>
+<rChild name="tracker:serviceR933Z1230"/>
 <Translation x="0*mm" y="0*mm" z="1230.81*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR945Z1230"/>
+<rChild name="tracker:serviceR933Z1230"/>
 <rRotation name="tracker:Y180"/>
 <Translation x="0*mm" y="0*mm" z="-1230.81*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR856Z1230"/>
+<rChild name="tracker:serviceR848Z1230"/>
 <Translation x="0*mm" y="0*mm" z="1230.81*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR856Z1230"/>
+<rChild name="tracker:serviceR848Z1230"/>
 <rRotation name="tracker:Y180"/>
 <Translation x="0*mm" y="0*mm" z="-1230.81*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR776Z1230"/>
+<rChild name="tracker:serviceR770Z1230"/>
 <Translation x="0*mm" y="0*mm" z="1230.81*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR776Z1230"/>
+<rChild name="tracker:serviceR770Z1230"/>
 <rRotation name="tracker:Y180"/>
 <Translation x="0*mm" y="0*mm" z="-1230.81*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR703Z1230"/>
+<rChild name="tracker:serviceR700Z1230"/>
 <Translation x="0*mm" y="0*mm" z="1230.81*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR703Z1230"/>
+<rChild name="tracker:serviceR700Z1230"/>
 <rRotation name="tracker:Y180"/>
 <Translation x="0*mm" y="0*mm" z="-1230.81*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR637Z1230"/>
+<rChild name="tracker:serviceR636Z1230"/>
 <Translation x="0*mm" y="0*mm" z="1230.81*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR637Z1230"/>
+<rChild name="tracker:serviceR636Z1230"/>
 <rRotation name="tracker:Y180"/>
 <Translation x="0*mm" y="0*mm" z="-1230.81*mm"/>
 </PosPart>
@@ -27126,547 +27264,547 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1151Z1407BarrelPart"/>
+<rChild name="tracker:serviceR1131Z1408BarrelPart"/>
 <Translation x="0*mm" y="0*mm" z="1239.91*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1151Z1407BarrelPart"/>
+<rChild name="tracker:serviceR1131Z1408BarrelPart"/>
 <rRotation name="tracker:Y180"/>
 <Translation x="0*mm" y="0*mm" z="-1239.91*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1151Z1407EndcapsPart"/>
-<Translation x="0*mm" y="0*mm" z="1126.77*mm"/>
+<rChild name="tracker:serviceR1131Z1408EndcapsPart"/>
+<Translation x="0*mm" y="0*mm" z="1127.12*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z1206"/>
-<Translation x="0*mm" y="0*mm" z="1206.43*mm"/>
+<Translation x="0*mm" y="0*mm" z="1206.59*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z1206"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1206.43*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1206.59*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR700Z1204"/>
-<Translation x="0*mm" y="0*mm" z="1204.43*mm"/>
+<Translation x="0*mm" y="0*mm" z="1204.59*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR700Z1204"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1204.43*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1204.59*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z1"/>
-<Translation x="0*mm" y="0*mm" z="1.583*mm"/>
+<Translation x="0*mm" y="0*mm" z="1.59*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z1"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1.583*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1.59*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z152"/>
-<Translation x="0*mm" y="0*mm" z="152.428*mm"/>
+<Translation x="0*mm" y="0*mm" z="152.441*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z152"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-152.428*mm"/>
+<Translation x="0*mm" y="0*mm" z="-152.441*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z252"/>
-<Translation x="0*mm" y="0*mm" z="252.278*mm"/>
+<Translation x="0*mm" y="0*mm" z="252.296*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z252"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-252.278*mm"/>
+<Translation x="0*mm" y="0*mm" z="-252.296*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z351"/>
-<Translation x="0*mm" y="0*mm" z="351.196*mm"/>
+<Translation x="0*mm" y="0*mm" z="351.216*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z351"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-351.196*mm"/>
+<Translation x="0*mm" y="0*mm" z="-351.216*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z450"/>
-<Translation x="0*mm" y="0*mm" z="450.351*mm"/>
+<Translation x="0*mm" y="0*mm" z="450.381*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z450"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-450.351*mm"/>
+<Translation x="0*mm" y="0*mm" z="-450.381*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z548"/>
-<Translation x="0*mm" y="0*mm" z="548.581*mm"/>
+<Translation x="0*mm" y="0*mm" z="548.619*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z548"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-548.581*mm"/>
+<Translation x="0*mm" y="0*mm" z="-548.619*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z647"/>
-<Translation x="0*mm" y="0*mm" z="647.046*mm"/>
+<Translation x="0*mm" y="0*mm" z="647.098*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z647"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-647.046*mm"/>
+<Translation x="0*mm" y="0*mm" z="-647.098*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z744"/>
-<Translation x="0*mm" y="0*mm" z="744.429*mm"/>
+<Translation x="0*mm" y="0*mm" z="744.496*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z744"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-744.429*mm"/>
+<Translation x="0*mm" y="0*mm" z="-744.496*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z842"/>
-<Translation x="0*mm" y="0*mm" z="842.046*mm"/>
+<Translation x="0*mm" y="0*mm" z="842.133*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z842"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-842.046*mm"/>
+<Translation x="0*mm" y="0*mm" z="-842.133*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z938"/>
-<Translation x="0*mm" y="0*mm" z="938.663*mm"/>
+<Translation x="0*mm" y="0*mm" z="938.77*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z938"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-938.663*mm"/>
+<Translation x="0*mm" y="0*mm" z="-938.77*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z1035"/>
-<Translation x="0*mm" y="0*mm" z="1035.51*mm"/>
+<Translation x="0*mm" y="0*mm" z="1035.64*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z1035"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1035.51*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1035.64*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z1131"/>
-<Translation x="0*mm" y="0*mm" z="1131.71*mm"/>
+<Translation x="0*mm" y="0*mm" z="1131.86*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z1131"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1131.71*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1131.86*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR710Z1189"/>
-<Translation x="0*mm" y="0*mm" z="1189.97*mm"/>
+<rChild name="tracker:serviceR710Z1190"/>
+<Translation x="0*mm" y="0*mm" z="1190.12*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR710Z1189"/>
+<rChild name="tracker:serviceR710Z1190"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1189.97*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1190.12*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z53"/>
-<Translation x="0*mm" y="0*mm" z="53.051*mm"/>
+<Translation x="0*mm" y="0*mm" z="53.065*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR710Z53"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-53.051*mm"/>
+<Translation x="0*mm" y="0*mm" z="-53.065*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z1206"/>
-<Translation x="0*mm" y="0*mm" z="1206.43*mm"/>
+<Translation x="0*mm" y="0*mm" z="1206.59*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z1206"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1206.43*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1206.59*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR873Z1204"/>
-<Translation x="0*mm" y="0*mm" z="1204.43*mm"/>
+<Translation x="0*mm" y="0*mm" z="1204.59*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR873Z1204"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1204.43*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1204.59*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z1"/>
-<Translation x="0*mm" y="0*mm" z="1.583*mm"/>
+<Translation x="0*mm" y="0*mm" z="1.59*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z1"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1.583*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1.59*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z152"/>
-<Translation x="0*mm" y="0*mm" z="152.428*mm"/>
+<Translation x="0*mm" y="0*mm" z="152.441*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z152"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-152.428*mm"/>
+<Translation x="0*mm" y="0*mm" z="-152.441*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z252"/>
-<Translation x="0*mm" y="0*mm" z="252.278*mm"/>
+<Translation x="0*mm" y="0*mm" z="252.296*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z252"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-252.278*mm"/>
+<Translation x="0*mm" y="0*mm" z="-252.296*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z351"/>
-<Translation x="0*mm" y="0*mm" z="351.196*mm"/>
+<Translation x="0*mm" y="0*mm" z="351.216*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z351"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-351.196*mm"/>
+<Translation x="0*mm" y="0*mm" z="-351.216*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z450"/>
-<Translation x="0*mm" y="0*mm" z="450.351*mm"/>
+<Translation x="0*mm" y="0*mm" z="450.381*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z450"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-450.351*mm"/>
+<Translation x="0*mm" y="0*mm" z="-450.381*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z548"/>
-<Translation x="0*mm" y="0*mm" z="548.581*mm"/>
+<Translation x="0*mm" y="0*mm" z="548.619*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z548"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-548.581*mm"/>
+<Translation x="0*mm" y="0*mm" z="-548.619*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z647"/>
-<Translation x="0*mm" y="0*mm" z="647.046*mm"/>
+<Translation x="0*mm" y="0*mm" z="647.098*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z647"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-647.046*mm"/>
+<Translation x="0*mm" y="0*mm" z="-647.098*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z744"/>
-<Translation x="0*mm" y="0*mm" z="744.429*mm"/>
+<Translation x="0*mm" y="0*mm" z="744.496*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z744"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-744.429*mm"/>
+<Translation x="0*mm" y="0*mm" z="-744.496*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z842"/>
-<Translation x="0*mm" y="0*mm" z="842.046*mm"/>
+<Translation x="0*mm" y="0*mm" z="842.133*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z842"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-842.046*mm"/>
+<Translation x="0*mm" y="0*mm" z="-842.133*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z938"/>
-<Translation x="0*mm" y="0*mm" z="938.663*mm"/>
+<Translation x="0*mm" y="0*mm" z="938.77*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z938"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-938.663*mm"/>
+<Translation x="0*mm" y="0*mm" z="-938.77*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z1035"/>
-<Translation x="0*mm" y="0*mm" z="1035.51*mm"/>
+<Translation x="0*mm" y="0*mm" z="1035.64*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z1035"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1035.51*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1035.64*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z1131"/>
-<Translation x="0*mm" y="0*mm" z="1131.71*mm"/>
+<Translation x="0*mm" y="0*mm" z="1131.86*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z1131"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1131.71*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1131.86*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR883Z1189"/>
-<Translation x="0*mm" y="0*mm" z="1189.97*mm"/>
+<rChild name="tracker:serviceR883Z1190"/>
+<Translation x="0*mm" y="0*mm" z="1190.12*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR883Z1189"/>
+<rChild name="tracker:serviceR883Z1190"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1189.97*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1190.12*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z53"/>
-<Translation x="0*mm" y="0*mm" z="53.051*mm"/>
+<Translation x="0*mm" y="0*mm" z="53.065*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR883Z53"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-53.051*mm"/>
+<Translation x="0*mm" y="0*mm" z="-53.065*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z1206"/>
-<Translation x="0*mm" y="0*mm" z="1206.43*mm"/>
+<rChild name="tracker:serviceR1105Z1206"/>
+<Translation x="0*mm" y="0*mm" z="1206.59*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z1206"/>
+<rChild name="tracker:serviceR1105Z1206"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1206.43*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1206.59*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1120Z1204"/>
-<Translation x="0*mm" y="0*mm" z="1204.43*mm"/>
+<rChild name="tracker:serviceR1095Z1204"/>
+<Translation x="0*mm" y="0*mm" z="1204.59*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1120Z1204"/>
+<rChild name="tracker:serviceR1095Z1204"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1204.43*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1204.59*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z1"/>
-<Translation x="0*mm" y="0*mm" z="1.583*mm"/>
+<rChild name="tracker:serviceR1105Z1"/>
+<Translation x="0*mm" y="0*mm" z="1.59*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z1"/>
+<rChild name="tracker:serviceR1105Z1"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1.583*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1.59*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z152"/>
-<Translation x="0*mm" y="0*mm" z="152.428*mm"/>
+<rChild name="tracker:serviceR1105Z152"/>
+<Translation x="0*mm" y="0*mm" z="152.441*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z152"/>
+<rChild name="tracker:serviceR1105Z152"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-152.428*mm"/>
+<Translation x="0*mm" y="0*mm" z="-152.441*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z252"/>
-<Translation x="0*mm" y="0*mm" z="252.278*mm"/>
+<rChild name="tracker:serviceR1105Z252"/>
+<Translation x="0*mm" y="0*mm" z="252.296*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z252"/>
+<rChild name="tracker:serviceR1105Z252"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-252.278*mm"/>
+<Translation x="0*mm" y="0*mm" z="-252.296*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z351"/>
-<Translation x="0*mm" y="0*mm" z="351.196*mm"/>
+<rChild name="tracker:serviceR1105Z351"/>
+<Translation x="0*mm" y="0*mm" z="351.216*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z351"/>
+<rChild name="tracker:serviceR1105Z351"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-351.196*mm"/>
+<Translation x="0*mm" y="0*mm" z="-351.216*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z450"/>
-<Translation x="0*mm" y="0*mm" z="450.351*mm"/>
+<rChild name="tracker:serviceR1105Z450"/>
+<Translation x="0*mm" y="0*mm" z="450.381*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z450"/>
+<rChild name="tracker:serviceR1105Z450"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-450.351*mm"/>
+<Translation x="0*mm" y="0*mm" z="-450.381*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z548"/>
-<Translation x="0*mm" y="0*mm" z="548.581*mm"/>
+<rChild name="tracker:serviceR1105Z548"/>
+<Translation x="0*mm" y="0*mm" z="548.619*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z548"/>
+<rChild name="tracker:serviceR1105Z548"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-548.581*mm"/>
+<Translation x="0*mm" y="0*mm" z="-548.619*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z647"/>
-<Translation x="0*mm" y="0*mm" z="647.046*mm"/>
+<rChild name="tracker:serviceR1105Z647"/>
+<Translation x="0*mm" y="0*mm" z="647.098*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z647"/>
+<rChild name="tracker:serviceR1105Z647"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-647.046*mm"/>
+<Translation x="0*mm" y="0*mm" z="-647.098*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z744"/>
-<Translation x="0*mm" y="0*mm" z="744.429*mm"/>
+<rChild name="tracker:serviceR1105Z744"/>
+<Translation x="0*mm" y="0*mm" z="744.496*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z744"/>
+<rChild name="tracker:serviceR1105Z744"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-744.429*mm"/>
+<Translation x="0*mm" y="0*mm" z="-744.496*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z842"/>
-<Translation x="0*mm" y="0*mm" z="842.046*mm"/>
+<rChild name="tracker:serviceR1105Z842"/>
+<Translation x="0*mm" y="0*mm" z="842.133*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z842"/>
+<rChild name="tracker:serviceR1105Z842"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-842.046*mm"/>
+<Translation x="0*mm" y="0*mm" z="-842.133*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z938"/>
-<Translation x="0*mm" y="0*mm" z="938.663*mm"/>
+<rChild name="tracker:serviceR1105Z938"/>
+<Translation x="0*mm" y="0*mm" z="938.77*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z938"/>
+<rChild name="tracker:serviceR1105Z938"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-938.663*mm"/>
+<Translation x="0*mm" y="0*mm" z="-938.77*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z1035"/>
-<Translation x="0*mm" y="0*mm" z="1035.51*mm"/>
+<rChild name="tracker:serviceR1105Z1035"/>
+<Translation x="0*mm" y="0*mm" z="1035.64*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z1035"/>
+<rChild name="tracker:serviceR1105Z1035"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1035.51*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1035.64*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z1131"/>
-<Translation x="0*mm" y="0*mm" z="1131.71*mm"/>
+<rChild name="tracker:serviceR1105Z1131"/>
+<Translation x="0*mm" y="0*mm" z="1131.86*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z1131"/>
+<rChild name="tracker:serviceR1105Z1131"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1131.71*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1131.86*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z1189"/>
-<Translation x="0*mm" y="0*mm" z="1189.97*mm"/>
+<rChild name="tracker:serviceR1105Z1190"/>
+<Translation x="0*mm" y="0*mm" z="1190.12*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z1189"/>
+<rChild name="tracker:serviceR1105Z1190"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1189.97*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1190.12*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z53"/>
-<Translation x="0*mm" y="0*mm" z="53.051*mm"/>
+<rChild name="tracker:serviceR1105Z53"/>
+<Translation x="0*mm" y="0*mm" z="53.065*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR1130Z53"/>
+<rChild name="tracker:serviceR1105Z53"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-53.051*mm"/>
+<Translation x="0*mm" y="0*mm" z="-53.065*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
@@ -27693,178 +27831,46 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR300Z44"/>
-<Translation x="0*mm" y="0*mm" z="44.8825*mm"/>
+<Translation x="0*mm" y="0*mm" z="44.8885*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR300Z44"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-44.8825*mm"/>
+<Translation x="0*mm" y="0*mm" z="-44.8885*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR300Z89"/>
-<Translation x="0*mm" y="0*mm" z="89.7335*mm"/>
+<Translation x="0*mm" y="0*mm" z="89.7465*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR300Z89"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-89.7335*mm"/>
+<Translation x="0*mm" y="0*mm" z="-89.7465*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR300Z132"/>
-<Translation x="0*mm" y="0*mm" z="132.655*mm"/>
+<Translation x="0*mm" y="0*mm" z="132.679*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:serviceR300Z132"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-132.655*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z170"/>
-<Translation x="0*mm" y="0*mm" z="170.631*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z170"/>
-<rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-170.631*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z193"/>
-<Translation x="0*mm" y="0*mm" z="193.974*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z193"/>
-<rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-193.974*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z238"/>
-<Translation x="0*mm" y="0*mm" z="238.997*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z238"/>
-<rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-238.997*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z289"/>
-<Translation x="0*mm" y="0*mm" z="289.867*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z289"/>
-<rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-289.867*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z334"/>
-<Translation x="0*mm" y="0*mm" z="334.647*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z334"/>
-<rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-334.647*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z393"/>
-<Translation x="0*mm" y="0*mm" z="393.666*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z393"/>
-<rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-393.666*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z463"/>
-<Translation x="0*mm" y="0*mm" z="463.159*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z463"/>
-<rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-463.159*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z546"/>
-<Translation x="0*mm" y="0*mm" z="546.236*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z546"/>
-<rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-546.236*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z625"/>
-<Translation x="0*mm" y="0*mm" z="625.676*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z625"/>
-<rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-625.676*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z734"/>
-<Translation x="0*mm" y="0*mm" z="734.835*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z734"/>
-<rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-734.835*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z865"/>
-<Translation x="0*mm" y="0*mm" z="865.206*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z865"/>
-<rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-865.206*mm"/>
-</PosPart>
-<PosPart copyNumber="1">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z1018"/>
-<Translation x="0*mm" y="0*mm" z="1018.79*mm"/>
-</PosPart>
-<PosPart copyNumber="2">
-<rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z1018"/>
-<rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1018.79*mm"/>
+<Translation x="0*mm" y="0*mm" z="-132.679*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z1196"/>
-<Translation x="0*mm" y="0*mm" z="1196.92*mm"/>
+<rChild name="tracker:serviceR300Z170"/>
+<Translation x="0*mm" y="0*mm" z="170.648*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR300Z1196"/>
+<rChild name="tracker:serviceR300Z170"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1196.92*mm"/>
+<Translation x="0*mm" y="0*mm" z="-170.648*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
@@ -28000,223 +28006,223 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z1216"/>
-<Translation x="0*mm" y="0*mm" z="1216.91*mm"/>
+<rChild name="tracker:serviceR300Z193"/>
+<Translation x="0*mm" y="0*mm" z="193.974*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z1216"/>
+<rChild name="tracker:serviceR300Z193"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1216.91*mm"/>
+<Translation x="0*mm" y="0*mm" z="-193.974*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR407Z1214"/>
-<Translation x="0*mm" y="0*mm" z="1214.91*mm"/>
+<rChild name="tracker:serviceR300Z238"/>
+<Translation x="0*mm" y="0*mm" z="238.997*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR407Z1214"/>
+<rChild name="tracker:serviceR300Z238"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1214.91*mm"/>
+<Translation x="0*mm" y="0*mm" z="-238.997*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z45"/>
-<Translation x="0*mm" y="0*mm" z="45.7665*mm"/>
+<rChild name="tracker:serviceR300Z289"/>
+<Translation x="0*mm" y="0*mm" z="289.867*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z45"/>
+<rChild name="tracker:serviceR300Z289"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-45.7665*mm"/>
+<Translation x="0*mm" y="0*mm" z="-289.867*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z91"/>
-<Translation x="0*mm" y="0*mm" z="91.5605*mm"/>
+<rChild name="tracker:serviceR300Z334"/>
+<Translation x="0*mm" y="0*mm" z="334.647*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z91"/>
+<rChild name="tracker:serviceR300Z334"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-91.5605*mm"/>
+<Translation x="0*mm" y="0*mm" z="-334.647*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z136"/>
-<Translation x="0*mm" y="0*mm" z="136.25*mm"/>
+<rChild name="tracker:serviceR300Z393"/>
+<Translation x="0*mm" y="0*mm" z="393.666*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z136"/>
+<rChild name="tracker:serviceR300Z393"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-136.25*mm"/>
+<Translation x="0*mm" y="0*mm" z="-393.666*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z181"/>
-<Translation x="0*mm" y="0*mm" z="181.592*mm"/>
+<rChild name="tracker:serviceR300Z463"/>
+<Translation x="0*mm" y="0*mm" z="463.159*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z181"/>
+<rChild name="tracker:serviceR300Z463"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-181.592*mm"/>
+<Translation x="0*mm" y="0*mm" z="-463.159*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z225"/>
-<Translation x="0*mm" y="0*mm" z="225.84*mm"/>
+<rChild name="tracker:serviceR300Z546"/>
+<Translation x="0*mm" y="0*mm" z="546.236*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z225"/>
+<rChild name="tracker:serviceR300Z546"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-225.84*mm"/>
+<Translation x="0*mm" y="0*mm" z="-546.236*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z267"/>
-<Translation x="0*mm" y="0*mm" z="267.353*mm"/>
+<rChild name="tracker:serviceR300Z625"/>
+<Translation x="0*mm" y="0*mm" z="625.676*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z267"/>
+<rChild name="tracker:serviceR300Z625"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-267.353*mm"/>
+<Translation x="0*mm" y="0*mm" z="-625.676*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z292"/>
-<Translation x="0*mm" y="0*mm" z="292.471*mm"/>
+<rChild name="tracker:serviceR300Z734"/>
+<Translation x="0*mm" y="0*mm" z="734.835*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z292"/>
+<rChild name="tracker:serviceR300Z734"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-292.471*mm"/>
+<Translation x="0*mm" y="0*mm" z="-734.835*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z344"/>
-<Translation x="0*mm" y="0*mm" z="344.565*mm"/>
+<rChild name="tracker:serviceR300Z865"/>
+<Translation x="0*mm" y="0*mm" z="865.206*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z344"/>
+<rChild name="tracker:serviceR300Z865"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-344.565*mm"/>
+<Translation x="0*mm" y="0*mm" z="-865.206*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z400"/>
-<Translation x="0*mm" y="0*mm" z="400.988*mm"/>
+<rChild name="tracker:serviceR300Z1018"/>
+<Translation x="0*mm" y="0*mm" z="1018.79*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z400"/>
+<rChild name="tracker:serviceR300Z1018"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-400.988*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1018.79*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z450"/>
-<Translation x="0*mm" y="0*mm" z="450.373*mm"/>
+<rChild name="tracker:serviceR300Z1196"/>
+<Translation x="0*mm" y="0*mm" z="1196.92*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z450"/>
+<rChild name="tracker:serviceR300Z1196"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-450.373*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1196.92*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z514"/>
-<Translation x="0*mm" y="0*mm" z="514.804*mm"/>
+<rChild name="tracker:serviceR417Z1216"/>
+<Translation x="0*mm" y="0*mm" z="1216.91*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z514"/>
+<rChild name="tracker:serviceR417Z1216"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-514.804*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1216.91*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z586"/>
-<Translation x="0*mm" y="0*mm" z="586.321*mm"/>
+<rChild name="tracker:serviceR407Z1214"/>
+<Translation x="0*mm" y="0*mm" z="1214.91*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z586"/>
+<rChild name="tracker:serviceR407Z1214"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-586.321*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1214.91*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z665"/>
-<Translation x="0*mm" y="0*mm" z="665.168*mm"/>
+<rChild name="tracker:serviceR417Z45"/>
+<Translation x="0*mm" y="0*mm" z="45.877*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z665"/>
+<rChild name="tracker:serviceR417Z45"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-665.168*mm"/>
+<Translation x="0*mm" y="0*mm" z="-45.877*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z741"/>
-<Translation x="0*mm" y="0*mm" z="741.527*mm"/>
+<rChild name="tracker:serviceR417Z91"/>
+<Translation x="0*mm" y="0*mm" z="91.786*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z741"/>
+<rChild name="tracker:serviceR417Z91"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-741.527*mm"/>
+<Translation x="0*mm" y="0*mm" z="-91.786*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z836"/>
-<Translation x="0*mm" y="0*mm" z="836.933*mm"/>
+<rChild name="tracker:serviceR417Z136"/>
+<Translation x="0*mm" y="0*mm" z="136.696*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z836"/>
+<rChild name="tracker:serviceR417Z136"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-836.933*mm"/>
+<Translation x="0*mm" y="0*mm" z="-136.696*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z943"/>
-<Translation x="0*mm" y="0*mm" z="943.886*mm"/>
+<rChild name="tracker:serviceR417Z182"/>
+<Translation x="0*mm" y="0*mm" z="182.158*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z943"/>
+<rChild name="tracker:serviceR417Z182"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-943.886*mm"/>
+<Translation x="0*mm" y="0*mm" z="-182.158*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z1064"/>
-<Translation x="0*mm" y="0*mm" z="1064.42*mm"/>
+<rChild name="tracker:serviceR417Z226"/>
+<Translation x="0*mm" y="0*mm" z="226.63*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z1064"/>
+<rChild name="tracker:serviceR417Z226"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1064.42*mm"/>
+<Translation x="0*mm" y="0*mm" z="-226.63*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z1197"/>
-<Translation x="0*mm" y="0*mm" z="1197.83*mm"/>
+<rChild name="tracker:serviceR417Z267"/>
+<Translation x="0*mm" y="0*mm" z="267.907*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR417Z1197"/>
+<rChild name="tracker:serviceR417Z267"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1197.83*mm"/>
+<Translation x="0*mm" y="0*mm" z="-267.907*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
@@ -28352,245 +28358,245 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z1216"/>
-<Translation x="0*mm" y="0*mm" z="1216.91*mm"/>
+<rChild name="tracker:serviceR417Z292"/>
+<Translation x="0*mm" y="0*mm" z="292.471*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z1216"/>
+<rChild name="tracker:serviceR417Z292"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1216.91*mm"/>
+<Translation x="0*mm" y="0*mm" z="-292.471*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR557Z1214"/>
-<Translation x="0*mm" y="0*mm" z="1214.91*mm"/>
+<rChild name="tracker:serviceR417Z344"/>
+<Translation x="0*mm" y="0*mm" z="344.565*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR557Z1214"/>
+<rChild name="tracker:serviceR417Z344"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1214.91*mm"/>
+<Translation x="0*mm" y="0*mm" z="-344.565*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z46"/>
-<Translation x="0*mm" y="0*mm" z="46.1055*mm"/>
+<rChild name="tracker:serviceR417Z400"/>
+<Translation x="0*mm" y="0*mm" z="400.988*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z46"/>
+<rChild name="tracker:serviceR417Z400"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-46.1055*mm"/>
+<Translation x="0*mm" y="0*mm" z="-400.988*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z92"/>
-<Translation x="0*mm" y="0*mm" z="92.251*mm"/>
+<rChild name="tracker:serviceR417Z450"/>
+<Translation x="0*mm" y="0*mm" z="450.373*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z92"/>
+<rChild name="tracker:serviceR417Z450"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-92.251*mm"/>
+<Translation x="0*mm" y="0*mm" z="-450.373*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z137"/>
-<Translation x="0*mm" y="0*mm" z="137.619*mm"/>
+<rChild name="tracker:serviceR417Z514"/>
+<Translation x="0*mm" y="0*mm" z="514.804*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z137"/>
+<rChild name="tracker:serviceR417Z514"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-137.619*mm"/>
+<Translation x="0*mm" y="0*mm" z="-514.804*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z183"/>
-<Translation x="0*mm" y="0*mm" z="183.453*mm"/>
+<rChild name="tracker:serviceR417Z586"/>
+<Translation x="0*mm" y="0*mm" z="586.321*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z183"/>
+<rChild name="tracker:serviceR417Z586"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-183.453*mm"/>
+<Translation x="0*mm" y="0*mm" z="-586.321*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z228"/>
-<Translation x="0*mm" y="0*mm" z="228.514*mm"/>
+<rChild name="tracker:serviceR417Z665"/>
+<Translation x="0*mm" y="0*mm" z="665.168*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z228"/>
+<rChild name="tracker:serviceR417Z665"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-228.514*mm"/>
+<Translation x="0*mm" y="0*mm" z="-665.168*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z274"/>
-<Translation x="0*mm" y="0*mm" z="274.036*mm"/>
+<rChild name="tracker:serviceR417Z741"/>
+<Translation x="0*mm" y="0*mm" z="741.527*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z274"/>
+<rChild name="tracker:serviceR417Z741"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-274.036*mm"/>
+<Translation x="0*mm" y="0*mm" z="-741.527*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z318"/>
-<Translation x="0*mm" y="0*mm" z="318.79*mm"/>
+<rChild name="tracker:serviceR417Z836"/>
+<Translation x="0*mm" y="0*mm" z="836.933*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z318"/>
+<rChild name="tracker:serviceR417Z836"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-318.79*mm"/>
+<Translation x="0*mm" y="0*mm" z="-836.933*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z360"/>
-<Translation x="0*mm" y="0*mm" z="360.004*mm"/>
+<rChild name="tracker:serviceR417Z943"/>
+<Translation x="0*mm" y="0*mm" z="943.886*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z360"/>
+<rChild name="tracker:serviceR417Z943"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-360.004*mm"/>
+<Translation x="0*mm" y="0*mm" z="-943.886*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z384"/>
-<Translation x="0*mm" y="0*mm" z="384.9*mm"/>
+<rChild name="tracker:serviceR417Z1064"/>
+<Translation x="0*mm" y="0*mm" z="1064.42*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z384"/>
+<rChild name="tracker:serviceR417Z1064"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-384.9*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1064.42*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z438"/>
-<Translation x="0*mm" y="0*mm" z="438.005*mm"/>
+<rChild name="tracker:serviceR417Z1197"/>
+<Translation x="0*mm" y="0*mm" z="1197.83*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z438"/>
+<rChild name="tracker:serviceR417Z1197"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-438.005*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1197.83*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z494"/>
-<Translation x="0*mm" y="0*mm" z="494.537*mm"/>
+<rChild name="tracker:serviceR567Z1216"/>
+<Translation x="0*mm" y="0*mm" z="1216.91*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z494"/>
+<rChild name="tracker:serviceR567Z1216"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-494.537*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1216.91*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z554"/>
-<Translation x="0*mm" y="0*mm" z="554.863*mm"/>
+<rChild name="tracker:serviceR557Z1214"/>
+<Translation x="0*mm" y="0*mm" z="1214.91*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z554"/>
+<rChild name="tracker:serviceR557Z1214"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-554.863*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1214.91*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z619"/>
-<Translation x="0*mm" y="0*mm" z="619.089*mm"/>
+<rChild name="tracker:serviceR567Z46"/>
+<Translation x="0*mm" y="0*mm" z="46.0845*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z619"/>
+<rChild name="tracker:serviceR567Z46"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-619.089*mm"/>
+<Translation x="0*mm" y="0*mm" z="-46.0845*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z686"/>
-<Translation x="0*mm" y="0*mm" z="686.962*mm"/>
+<rChild name="tracker:serviceR567Z92"/>
+<Translation x="0*mm" y="0*mm" z="92.2085*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z686"/>
+<rChild name="tracker:serviceR567Z92"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-686.962*mm"/>
+<Translation x="0*mm" y="0*mm" z="-92.2085*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z745"/>
-<Translation x="0*mm" y="0*mm" z="745.49*mm"/>
+<rChild name="tracker:serviceR567Z137"/>
+<Translation x="0*mm" y="0*mm" z="137.535*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z745"/>
+<rChild name="tracker:serviceR567Z137"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-745.49*mm"/>
+<Translation x="0*mm" y="0*mm" z="-137.535*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z822"/>
-<Translation x="0*mm" y="0*mm" z="822.498*mm"/>
+<rChild name="tracker:serviceR567Z183"/>
+<Translation x="0*mm" y="0*mm" z="183.347*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z822"/>
+<rChild name="tracker:serviceR567Z183"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-822.498*mm"/>
+<Translation x="0*mm" y="0*mm" z="-183.347*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z905"/>
-<Translation x="0*mm" y="0*mm" z="905.844*mm"/>
+<rChild name="tracker:serviceR567Z228"/>
+<Translation x="0*mm" y="0*mm" z="228.366*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z905"/>
+<rChild name="tracker:serviceR567Z228"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-905.844*mm"/>
+<Translation x="0*mm" y="0*mm" z="-228.366*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z995"/>
-<Translation x="0*mm" y="0*mm" z="995.95*mm"/>
+<rChild name="tracker:serviceR567Z273"/>
+<Translation x="0*mm" y="0*mm" z="273.865*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z995"/>
+<rChild name="tracker:serviceR567Z273"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-995.95*mm"/>
+<Translation x="0*mm" y="0*mm" z="-273.865*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z1092"/>
-<Translation x="0*mm" y="0*mm" z="1092.83*mm"/>
+<rChild name="tracker:serviceR567Z318"/>
+<Translation x="0*mm" y="0*mm" z="318.575*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z1092"/>
+<rChild name="tracker:serviceR567Z318"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1092.83*mm"/>
+<Translation x="0*mm" y="0*mm" z="-318.575*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z1197"/>
-<Translation x="0*mm" y="0*mm" z="1197.02*mm"/>
+<rChild name="tracker:serviceR567Z359"/>
+<Translation x="0*mm" y="0*mm" z="359.856*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:serviceR567Z1197"/>
+<rChild name="tracker:serviceR567Z359"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-1197.02*mm"/>
+<Translation x="0*mm" y="0*mm" z="-359.856*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
@@ -28725,409 +28731,541 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Translation x="0*mm" y="0*mm" z="-1207.83*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z384"/>
+<Translation x="0*mm" y="0*mm" z="384.9*mm"/>
+</PosPart>
+<PosPart copyNumber="2">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z384"/>
+<rRotation name="tracker:Y180"/>
+<Translation x="0*mm" y="0*mm" z="-384.9*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z438"/>
+<Translation x="0*mm" y="0*mm" z="438.005*mm"/>
+</PosPart>
+<PosPart copyNumber="2">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z438"/>
+<rRotation name="tracker:Y180"/>
+<Translation x="0*mm" y="0*mm" z="-438.005*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z494"/>
+<Translation x="0*mm" y="0*mm" z="494.537*mm"/>
+</PosPart>
+<PosPart copyNumber="2">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z494"/>
+<rRotation name="tracker:Y180"/>
+<Translation x="0*mm" y="0*mm" z="-494.537*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z554"/>
+<Translation x="0*mm" y="0*mm" z="554.863*mm"/>
+</PosPart>
+<PosPart copyNumber="2">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z554"/>
+<rRotation name="tracker:Y180"/>
+<Translation x="0*mm" y="0*mm" z="-554.863*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z619"/>
+<Translation x="0*mm" y="0*mm" z="619.089*mm"/>
+</PosPart>
+<PosPart copyNumber="2">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z619"/>
+<rRotation name="tracker:Y180"/>
+<Translation x="0*mm" y="0*mm" z="-619.089*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z686"/>
+<Translation x="0*mm" y="0*mm" z="686.962*mm"/>
+</PosPart>
+<PosPart copyNumber="2">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z686"/>
+<rRotation name="tracker:Y180"/>
+<Translation x="0*mm" y="0*mm" z="-686.962*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z745"/>
+<Translation x="0*mm" y="0*mm" z="745.49*mm"/>
+</PosPart>
+<PosPart copyNumber="2">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z745"/>
+<rRotation name="tracker:Y180"/>
+<Translation x="0*mm" y="0*mm" z="-745.49*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z822"/>
+<Translation x="0*mm" y="0*mm" z="822.498*mm"/>
+</PosPart>
+<PosPart copyNumber="2">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z822"/>
+<rRotation name="tracker:Y180"/>
+<Translation x="0*mm" y="0*mm" z="-822.498*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z905"/>
+<Translation x="0*mm" y="0*mm" z="905.844*mm"/>
+</PosPart>
+<PosPart copyNumber="2">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z905"/>
+<rRotation name="tracker:Y180"/>
+<Translation x="0*mm" y="0*mm" z="-905.844*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z995"/>
+<Translation x="0*mm" y="0*mm" z="995.95*mm"/>
+</PosPart>
+<PosPart copyNumber="2">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z995"/>
+<rRotation name="tracker:Y180"/>
+<Translation x="0*mm" y="0*mm" z="-995.95*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z1092"/>
+<Translation x="0*mm" y="0*mm" z="1092.83*mm"/>
+</PosPart>
+<PosPart copyNumber="2">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z1092"/>
+<rRotation name="tracker:Y180"/>
+<Translation x="0*mm" y="0*mm" z="-1092.83*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z1197"/>
+<Translation x="0*mm" y="0*mm" z="1197.02*mm"/>
+</PosPart>
+<PosPart copyNumber="2">
+<rParent name="pixbar:Phase2OTBarrel"/>
+<rChild name="tracker:serviceR567Z1197"/>
+<rRotation name="tracker:Y180"/>
+<Translation x="0*mm" y="0*mm" z="-1197.02*mm"/>
+</PosPart>
+<PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1128Z1458"/>
-<Translation x="0*mm" y="0*mm" z="1167.5*mm"/>
+<rChild name="tracker:serviceR1102Z1459"/>
+<Translation x="0*mm" y="0*mm" z="1168.18*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1126Z1339"/>
-<Translation x="0*mm" y="0*mm" z="1048.45*mm"/>
+<rChild name="tracker:serviceR1100Z1340"/>
+<Translation x="0*mm" y="0*mm" z="1049.13*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR217Z1340"/>
-<Translation x="0*mm" y="0*mm" z="1049.45*mm"/>
+<rChild name="tracker:serviceR224Z1341"/>
+<Translation x="0*mm" y="0*mm" z="1050.13*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR279Z1340"/>
-<Translation x="0*mm" y="0*mm" z="1049.45*mm"/>
+<rChild name="tracker:serviceR287Z1341"/>
+<Translation x="0*mm" y="0*mm" z="1050.13*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR328Z1340"/>
-<Translation x="0*mm" y="0*mm" z="1049.45*mm"/>
+<rChild name="tracker:serviceR334Z1341"/>
+<Translation x="0*mm" y="0*mm" z="1050.13*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR364Z1340"/>
-<Translation x="0*mm" y="0*mm" z="1049.45*mm"/>
+<rChild name="tracker:serviceR367Z1341"/>
+<Translation x="0*mm" y="0*mm" z="1050.13*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR414Z1340"/>
-<Translation x="0*mm" y="0*mm" z="1049.45*mm"/>
+<rChild name="tracker:serviceR416Z1341"/>
+<Translation x="0*mm" y="0*mm" z="1050.13*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR447Z1340"/>
-<Translation x="0*mm" y="0*mm" z="1049.45*mm"/>
+<rChild name="tracker:serviceR446Z1341"/>
+<Translation x="0*mm" y="0*mm" z="1050.13*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR497Z1340"/>
-<Translation x="0*mm" y="0*mm" z="1049.45*mm"/>
+<rChild name="tracker:serviceR496Z1341"/>
+<Translation x="0*mm" y="0*mm" z="1050.13*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR528Z1340"/>
-<Translation x="0*mm" y="0*mm" z="1049.45*mm"/>
+<rChild name="tracker:serviceR524Z1341"/>
+<Translation x="0*mm" y="0*mm" z="1050.13*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR579Z1340"/>
-<Translation x="0*mm" y="0*mm" z="1049.45*mm"/>
+<rChild name="tracker:serviceR575Z1341"/>
+<Translation x="0*mm" y="0*mm" z="1050.13*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR606Z1340"/>
-<Translation x="0*mm" y="0*mm" z="1049.45*mm"/>
+<rChild name="tracker:serviceR602Z1341"/>
+<Translation x="0*mm" y="0*mm" z="1050.13*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR661Z1340"/>
-<Translation x="0*mm" y="0*mm" z="1049.45*mm"/>
+<rChild name="tracker:serviceR656Z1341"/>
+<Translation x="0*mm" y="0*mm" z="1050.13*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR744Z1340"/>
-<Translation x="0*mm" y="0*mm" z="1049.45*mm"/>
+<rChild name="tracker:serviceR741Z1341"/>
+<Translation x="0*mm" y="0*mm" z="1050.13*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR851Z1340"/>
-<Translation x="0*mm" y="0*mm" z="1049.45*mm"/>
+<rChild name="tracker:serviceR839Z1341"/>
+<Translation x="0*mm" y="0*mm" z="1050.13*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR924Z1340"/>
-<Translation x="0*mm" y="0*mm" z="1049.45*mm"/>
+<rChild name="tracker:serviceR905Z1341"/>
+<Translation x="0*mm" y="0*mm" z="1050.13*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1033Z1340"/>
-<Translation x="0*mm" y="0*mm" z="1049.45*mm"/>
+<rChild name="tracker:serviceR1014Z1341"/>
+<Translation x="0*mm" y="0*mm" z="1050.13*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1100Z1340"/>
-<Translation x="0*mm" y="0*mm" z="1049.45*mm"/>
+<rChild name="tracker:serviceR1074Z1341"/>
+<Translation x="0*mm" y="0*mm" z="1050.13*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1128Z1581"/>
-<Translation x="0*mm" y="0*mm" z="1290.6*mm"/>
+<rChild name="tracker:serviceR1102Z1582"/>
+<Translation x="0*mm" y="0*mm" z="1291.28*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1126Z1577"/>
-<Translation x="0*mm" y="0*mm" z="1286.65*mm"/>
+<rChild name="tracker:serviceR1100Z1578"/>
+<Translation x="0*mm" y="0*mm" z="1287.33*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR217Z1578"/>
-<Translation x="0*mm" y="0*mm" z="1287.65*mm"/>
+<rChild name="tracker:serviceR224Z1579"/>
+<Translation x="0*mm" y="0*mm" z="1288.33*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR279Z1578"/>
-<Translation x="0*mm" y="0*mm" z="1287.65*mm"/>
+<rChild name="tracker:serviceR287Z1579"/>
+<Translation x="0*mm" y="0*mm" z="1288.33*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR328Z1578"/>
-<Translation x="0*mm" y="0*mm" z="1287.65*mm"/>
+<rChild name="tracker:serviceR334Z1579"/>
+<Translation x="0*mm" y="0*mm" z="1288.33*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR364Z1578"/>
-<Translation x="0*mm" y="0*mm" z="1287.65*mm"/>
+<rChild name="tracker:serviceR367Z1579"/>
+<Translation x="0*mm" y="0*mm" z="1288.33*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR414Z1578"/>
-<Translation x="0*mm" y="0*mm" z="1287.65*mm"/>
+<rChild name="tracker:serviceR416Z1579"/>
+<Translation x="0*mm" y="0*mm" z="1288.33*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR447Z1578"/>
-<Translation x="0*mm" y="0*mm" z="1287.65*mm"/>
+<rChild name="tracker:serviceR446Z1579"/>
+<Translation x="0*mm" y="0*mm" z="1288.33*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR497Z1578"/>
-<Translation x="0*mm" y="0*mm" z="1287.65*mm"/>
+<rChild name="tracker:serviceR496Z1579"/>
+<Translation x="0*mm" y="0*mm" z="1288.33*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR528Z1578"/>
-<Translation x="0*mm" y="0*mm" z="1287.65*mm"/>
+<rChild name="tracker:serviceR524Z1579"/>
+<Translation x="0*mm" y="0*mm" z="1288.33*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR579Z1578"/>
-<Translation x="0*mm" y="0*mm" z="1287.65*mm"/>
+<rChild name="tracker:serviceR575Z1579"/>
+<Translation x="0*mm" y="0*mm" z="1288.33*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR606Z1578"/>
-<Translation x="0*mm" y="0*mm" z="1287.65*mm"/>
+<rChild name="tracker:serviceR602Z1579"/>
+<Translation x="0*mm" y="0*mm" z="1288.33*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR661Z1578"/>
-<Translation x="0*mm" y="0*mm" z="1287.65*mm"/>
+<rChild name="tracker:serviceR656Z1579"/>
+<Translation x="0*mm" y="0*mm" z="1288.33*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR744Z1578"/>
-<Translation x="0*mm" y="0*mm" z="1287.65*mm"/>
+<rChild name="tracker:serviceR741Z1579"/>
+<Translation x="0*mm" y="0*mm" z="1288.33*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR851Z1578"/>
-<Translation x="0*mm" y="0*mm" z="1287.65*mm"/>
+<rChild name="tracker:serviceR839Z1579"/>
+<Translation x="0*mm" y="0*mm" z="1288.33*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR924Z1578"/>
-<Translation x="0*mm" y="0*mm" z="1287.65*mm"/>
+<rChild name="tracker:serviceR905Z1579"/>
+<Translation x="0*mm" y="0*mm" z="1288.33*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1033Z1578"/>
-<Translation x="0*mm" y="0*mm" z="1287.65*mm"/>
+<rChild name="tracker:serviceR1014Z1579"/>
+<Translation x="0*mm" y="0*mm" z="1288.33*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1100Z1578"/>
-<Translation x="0*mm" y="0*mm" z="1287.65*mm"/>
+<rChild name="tracker:serviceR1074Z1579"/>
+<Translation x="0*mm" y="0*mm" z="1288.33*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1128Z2062"/>
-<Translation x="0*mm" y="0*mm" z="1771.39*mm"/>
+<rChild name="tracker:serviceR1102Z2063"/>
+<Translation x="0*mm" y="0*mm" z="1772.07*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1126Z1881"/>
-<Translation x="0*mm" y="0*mm" z="1590.05*mm"/>
+<rChild name="tracker:serviceR1100Z1881"/>
+<Translation x="0*mm" y="0*mm" z="1590.73*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR317Z1882"/>
-<Translation x="0*mm" y="0*mm" z="1591.05*mm"/>
+<rChild name="tracker:serviceR319Z1882"/>
+<Translation x="0*mm" y="0*mm" z="1591.73*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR378Z1882"/>
-<Translation x="0*mm" y="0*mm" z="1591.05*mm"/>
+<rChild name="tracker:serviceR381Z1882"/>
+<Translation x="0*mm" y="0*mm" z="1591.73*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR417Z1882"/>
-<Translation x="0*mm" y="0*mm" z="1591.05*mm"/>
+<rChild name="tracker:serviceR414Z1882"/>
+<Translation x="0*mm" y="0*mm" z="1591.73*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR467Z1882"/>
-<Translation x="0*mm" y="0*mm" z="1591.05*mm"/>
+<rChild name="tracker:serviceR463Z1882"/>
+<Translation x="0*mm" y="0*mm" z="1591.73*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR504Z1882"/>
-<Translation x="0*mm" y="0*mm" z="1591.05*mm"/>
+<rChild name="tracker:serviceR496Z1882"/>
+<Translation x="0*mm" y="0*mm" z="1591.73*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR554Z1882"/>
-<Translation x="0*mm" y="0*mm" z="1591.05*mm"/>
+<rChild name="tracker:serviceR545Z1882"/>
+<Translation x="0*mm" y="0*mm" z="1591.73*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR589Z1882"/>
-<Translation x="0*mm" y="0*mm" z="1591.05*mm"/>
+<rChild name="tracker:serviceR577Z1882"/>
+<Translation x="0*mm" y="0*mm" z="1591.73*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR641Z1882"/>
-<Translation x="0*mm" y="0*mm" z="1591.05*mm"/>
+<rChild name="tracker:serviceR627Z1882"/>
+<Translation x="0*mm" y="0*mm" z="1591.73*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR728Z1882"/>
-<Translation x="0*mm" y="0*mm" z="1591.05*mm"/>
+<rChild name="tracker:serviceR716Z1882"/>
+<Translation x="0*mm" y="0*mm" z="1591.73*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR832Z1882"/>
-<Translation x="0*mm" y="0*mm" z="1591.05*mm"/>
+<rChild name="tracker:serviceR819Z1882"/>
+<Translation x="0*mm" y="0*mm" z="1591.73*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR915Z1882"/>
-<Translation x="0*mm" y="0*mm" z="1591.05*mm"/>
+<rChild name="tracker:serviceR895Z1882"/>
+<Translation x="0*mm" y="0*mm" z="1591.73*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1022Z1882"/>
-<Translation x="0*mm" y="0*mm" z="1591.05*mm"/>
+<rChild name="tracker:serviceR1001Z1882"/>
+<Translation x="0*mm" y="0*mm" z="1591.73*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1100Z1882"/>
-<Translation x="0*mm" y="0*mm" z="1591.05*mm"/>
+<rChild name="tracker:serviceR1074Z1882"/>
+<Translation x="0*mm" y="0*mm" z="1591.73*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1128Z2460"/>
-<Translation x="0*mm" y="0*mm" z="2169.78*mm"/>
+<rChild name="tracker:serviceR1102Z2461"/>
+<Translation x="0*mm" y="0*mm" z="2170.46*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1126Z2243"/>
-<Translation x="0*mm" y="0*mm" z="1952.84*mm"/>
+<rChild name="tracker:serviceR1100Z2244"/>
+<Translation x="0*mm" y="0*mm" z="1953.52*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR317Z2244"/>
-<Translation x="0*mm" y="0*mm" z="1953.84*mm"/>
+<rChild name="tracker:serviceR319Z2245"/>
+<Translation x="0*mm" y="0*mm" z="1954.52*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR378Z2244"/>
-<Translation x="0*mm" y="0*mm" z="1953.84*mm"/>
+<rChild name="tracker:serviceR381Z2245"/>
+<Translation x="0*mm" y="0*mm" z="1954.52*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR417Z2244"/>
-<Translation x="0*mm" y="0*mm" z="1953.84*mm"/>
+<rChild name="tracker:serviceR414Z2245"/>
+<Translation x="0*mm" y="0*mm" z="1954.52*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR467Z2244"/>
-<Translation x="0*mm" y="0*mm" z="1953.84*mm"/>
+<rChild name="tracker:serviceR463Z2245"/>
+<Translation x="0*mm" y="0*mm" z="1954.52*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR504Z2244"/>
-<Translation x="0*mm" y="0*mm" z="1953.84*mm"/>
+<rChild name="tracker:serviceR496Z2245"/>
+<Translation x="0*mm" y="0*mm" z="1954.52*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR554Z2244"/>
-<Translation x="0*mm" y="0*mm" z="1953.84*mm"/>
+<rChild name="tracker:serviceR545Z2245"/>
+<Translation x="0*mm" y="0*mm" z="1954.52*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR589Z2244"/>
-<Translation x="0*mm" y="0*mm" z="1953.84*mm"/>
+<rChild name="tracker:serviceR577Z2245"/>
+<Translation x="0*mm" y="0*mm" z="1954.52*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR641Z2244"/>
-<Translation x="0*mm" y="0*mm" z="1953.84*mm"/>
+<rChild name="tracker:serviceR627Z2245"/>
+<Translation x="0*mm" y="0*mm" z="1954.52*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR728Z2244"/>
-<Translation x="0*mm" y="0*mm" z="1953.84*mm"/>
+<rChild name="tracker:serviceR716Z2245"/>
+<Translation x="0*mm" y="0*mm" z="1954.52*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR832Z2244"/>
-<Translation x="0*mm" y="0*mm" z="1953.84*mm"/>
+<rChild name="tracker:serviceR819Z2245"/>
+<Translation x="0*mm" y="0*mm" z="1954.52*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR915Z2244"/>
-<Translation x="0*mm" y="0*mm" z="1953.84*mm"/>
+<rChild name="tracker:serviceR895Z2245"/>
+<Translation x="0*mm" y="0*mm" z="1954.52*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1022Z2244"/>
-<Translation x="0*mm" y="0*mm" z="1953.84*mm"/>
+<rChild name="tracker:serviceR1001Z2245"/>
+<Translation x="0*mm" y="0*mm" z="1954.52*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1100Z2244"/>
-<Translation x="0*mm" y="0*mm" z="1953.84*mm"/>
+<rChild name="tracker:serviceR1074Z2245"/>
+<Translation x="0*mm" y="0*mm" z="1954.52*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1128Z2681"/>
-<Translation x="0*mm" y="0*mm" z="2390.77*mm"/>
+<rChild name="tracker:serviceR1102Z2682"/>
+<Translation x="0*mm" y="0*mm" z="2391.45*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1126Z2677"/>
-<Translation x="0*mm" y="0*mm" z="2386.82*mm"/>
+<rChild name="tracker:serviceR1100Z2678"/>
+<Translation x="0*mm" y="0*mm" z="2387.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR317Z2678"/>
-<Translation x="0*mm" y="0*mm" z="2387.82*mm"/>
+<rChild name="tracker:serviceR319Z2679"/>
+<Translation x="0*mm" y="0*mm" z="2388.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR378Z2678"/>
-<Translation x="0*mm" y="0*mm" z="2387.82*mm"/>
+<rChild name="tracker:serviceR381Z2679"/>
+<Translation x="0*mm" y="0*mm" z="2388.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR417Z2678"/>
-<Translation x="0*mm" y="0*mm" z="2387.82*mm"/>
+<rChild name="tracker:serviceR414Z2679"/>
+<Translation x="0*mm" y="0*mm" z="2388.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR467Z2678"/>
-<Translation x="0*mm" y="0*mm" z="2387.82*mm"/>
+<rChild name="tracker:serviceR463Z2679"/>
+<Translation x="0*mm" y="0*mm" z="2388.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR504Z2678"/>
-<Translation x="0*mm" y="0*mm" z="2387.82*mm"/>
+<rChild name="tracker:serviceR496Z2679"/>
+<Translation x="0*mm" y="0*mm" z="2388.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR554Z2678"/>
-<Translation x="0*mm" y="0*mm" z="2387.82*mm"/>
+<rChild name="tracker:serviceR545Z2679"/>
+<Translation x="0*mm" y="0*mm" z="2388.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR589Z2678"/>
-<Translation x="0*mm" y="0*mm" z="2387.82*mm"/>
+<rChild name="tracker:serviceR577Z2679"/>
+<Translation x="0*mm" y="0*mm" z="2388.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR641Z2678"/>
-<Translation x="0*mm" y="0*mm" z="2387.82*mm"/>
+<rChild name="tracker:serviceR627Z2679"/>
+<Translation x="0*mm" y="0*mm" z="2388.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR728Z2678"/>
-<Translation x="0*mm" y="0*mm" z="2387.82*mm"/>
+<rChild name="tracker:serviceR716Z2679"/>
+<Translation x="0*mm" y="0*mm" z="2388.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR832Z2678"/>
-<Translation x="0*mm" y="0*mm" z="2387.82*mm"/>
+<rChild name="tracker:serviceR819Z2679"/>
+<Translation x="0*mm" y="0*mm" z="2388.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR915Z2678"/>
-<Translation x="0*mm" y="0*mm" z="2387.82*mm"/>
+<rChild name="tracker:serviceR895Z2679"/>
+<Translation x="0*mm" y="0*mm" z="2388.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1022Z2678"/>
-<Translation x="0*mm" y="0*mm" z="2387.82*mm"/>
+<rChild name="tracker:serviceR1001Z2679"/>
+<Translation x="0*mm" y="0*mm" z="2388.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:serviceR1100Z2678"/>
-<Translation x="0*mm" y="0*mm" z="2387.82*mm"/>
+<rChild name="tracker:serviceR1074Z2679"/>
+<Translation x="0*mm" y="0*mm" z="2388.5*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
@@ -29190,25 +29328,25 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:supportR1134Z599"/>
-<Translation x="0*mm" y="0*mm" z="599.165*mm"/>
+<rChild name="tracker:supportR1109Z599"/>
+<Translation x="0*mm" y="0*mm" z="599.243*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:supportR1134Z599"/>
+<rChild name="tracker:supportR1109Z599"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-599.165*mm"/>
+<Translation x="0*mm" y="0*mm" z="-599.243*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:supportR664Z599"/>
-<Translation x="0*mm" y="0*mm" z="599.165*mm"/>
+<Translation x="0*mm" y="0*mm" z="599.243*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
 <rChild name="tracker:supportR664Z599"/>
 <rRotation name="tracker:Y180"/>
-<Translation x="0*mm" y="0*mm" z="-599.165*mm"/>
+<Translation x="0*mm" y="0*mm" z="-599.243*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
@@ -29223,25 +29361,25 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:supportR210Z604"/>
+<rChild name="tracker:supportR212Z604"/>
 <Translation x="0*mm" y="0*mm" z="604.406*mm"/>
 </PosPart>
 <PosPart copyNumber="2">
 <rParent name="pixbar:Phase2OTBarrel"/>
-<rChild name="tracker:supportR210Z604"/>
+<rChild name="tracker:supportR212Z604"/>
 <rRotation name="tracker:Y180"/>
 <Translation x="0*mm" y="0*mm" z="-604.406*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
 <rParent name="pixfwd:Phase2OTForward"/>
-<rChild name="tracker:supportR214Z1430"/>
+<rChild name="tracker:supportR221Z1430"/>
 <Translation x="0*mm" y="0*mm" z="1139.9*mm"/>
 </PosPart>
 <Algorithm name="track:DDTrackerPhiAltAlgo">
 <rParent name="tracker:Layer1"/>
 <String name="ChildName" value="tracker:Rod1"/>
 <Numeric name="Tilt" value="90*deg"/>
-<Numeric name="StartAngle" value="90*deg"/>
+<Numeric name="StartAngle" value="110*deg"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="RadiusIn" value="221.1*mm"/>
 <Numeric name="RadiusOut" value="244.9*mm"/>
@@ -29258,11 +29396,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="252"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.8981</Vector>
+<Numeric name="Radius" value="265"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.8981</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="47*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring5Layer1Minus"/>
@@ -29272,11 +29410,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="265"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.8981</Vector>
+<Numeric name="Radius" value="252"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.8981</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="47*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring6Layer1Minus"/>
@@ -29286,11 +29424,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="252"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.8981</Vector>
+<Numeric name="Radius" value="265"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.8981</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="47*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring6Layer1Minus"/>
@@ -29300,11 +29438,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="265"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.8981</Vector>
+<Numeric name="Radius" value="252"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.8981</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="47*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring7Layer1Minus"/>
@@ -29314,11 +29452,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="252"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.8981</Vector>
+<Numeric name="Radius" value="265"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.8981</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="47*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring7Layer1Minus"/>
@@ -29328,11 +29466,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="265"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.8981</Vector>
+<Numeric name="Radius" value="252"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.8981</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="47*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring8Layer1Minus"/>
@@ -29342,11 +29480,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="249"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,5.95877</Vector>
+<Numeric name="Radius" value="259"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-5.95877</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring8Layer1Minus"/>
@@ -29356,11 +29494,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="259"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-5.95877</Vector>
+<Numeric name="Radius" value="249"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,5.95877</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring9Layer1Minus"/>
@@ -29370,11 +29508,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="249"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,5.95877</Vector>
+<Numeric name="Radius" value="259"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-5.95877</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring9Layer1Minus"/>
@@ -29384,11 +29522,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="259"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-5.95877</Vector>
+<Numeric name="Radius" value="249"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,5.95877</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring10Layer1Minus"/>
@@ -29398,11 +29536,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="249"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,5.95877</Vector>
+<Numeric name="Radius" value="259"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-5.95877</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring10Layer1Minus"/>
@@ -29412,11 +29550,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="259"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-5.95877</Vector>
+<Numeric name="Radius" value="249"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,5.95877</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring11Layer1Minus"/>
@@ -29426,11 +29564,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="249"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,5.95877</Vector>
+<Numeric name="Radius" value="259"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-5.95877</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring11Layer1Minus"/>
@@ -29440,11 +29578,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="259"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-5.95877</Vector>
+<Numeric name="Radius" value="249"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,5.95877</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring12Layer1Minus"/>
@@ -29454,11 +29592,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="248"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
+<Numeric name="Radius" value="256"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring12Layer1Minus"/>
@@ -29468,11 +29606,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="254"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
+<Numeric name="Radius" value="250"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring13Layer1Minus"/>
@@ -29482,11 +29620,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="248"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
+<Numeric name="Radius" value="256"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring13Layer1Minus"/>
@@ -29496,11 +29634,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="254"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
+<Numeric name="Radius" value="250"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring14Layer1Minus"/>
@@ -29510,11 +29648,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="248"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
+<Numeric name="Radius" value="256"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring14Layer1Minus"/>
@@ -29524,11 +29662,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="254"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
+<Numeric name="Radius" value="250"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring15Layer1Minus"/>
@@ -29538,11 +29676,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="248"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
+<Numeric name="Radius" value="256"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring15Layer1Minus"/>
@@ -29552,11 +29690,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="254"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
+<Numeric name="Radius" value="250"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring16Layer1Minus"/>
@@ -29566,11 +29704,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="248"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
+<Numeric name="Radius" value="256"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring16Layer1Minus"/>
@@ -29580,11 +29718,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="254"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
+<Numeric name="Radius" value="250"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring5Layer1Plus"/>
@@ -29594,11 +29732,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="252"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.8981</Vector>
+<Numeric name="Radius" value="265"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.8981</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="47*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring5Layer1Plus"/>
@@ -29608,11 +29746,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="265"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.8981</Vector>
+<Numeric name="Radius" value="252"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.8981</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="47*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring6Layer1Plus"/>
@@ -29622,11 +29760,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="252"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.8981</Vector>
+<Numeric name="Radius" value="265"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.8981</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="47*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring6Layer1Plus"/>
@@ -29636,11 +29774,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="265"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.8981</Vector>
+<Numeric name="Radius" value="252"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.8981</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="47*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring7Layer1Plus"/>
@@ -29650,11 +29788,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="252"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.8981</Vector>
+<Numeric name="Radius" value="265"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.8981</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="47*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring7Layer1Plus"/>
@@ -29664,11 +29802,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="265"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.8981</Vector>
+<Numeric name="Radius" value="252"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.8981</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="47*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring8Layer1Plus"/>
@@ -29678,11 +29816,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="249"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-5.95877</Vector>
+<Numeric name="Radius" value="259"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,5.95877</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring8Layer1Plus"/>
@@ -29692,11 +29830,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="259"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,5.95877</Vector>
+<Numeric name="Radius" value="249"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-5.95877</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring9Layer1Plus"/>
@@ -29706,11 +29844,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="249"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-5.95877</Vector>
+<Numeric name="Radius" value="259"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,5.95877</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring9Layer1Plus"/>
@@ -29720,11 +29858,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="259"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,5.95877</Vector>
+<Numeric name="Radius" value="249"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-5.95877</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring10Layer1Plus"/>
@@ -29734,11 +29872,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="249"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-5.95877</Vector>
+<Numeric name="Radius" value="259"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,5.95877</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring10Layer1Plus"/>
@@ -29748,11 +29886,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="259"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,5.95877</Vector>
+<Numeric name="Radius" value="249"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-5.95877</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring11Layer1Plus"/>
@@ -29762,11 +29900,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="249"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-5.95877</Vector>
+<Numeric name="Radius" value="259"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,5.95877</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring11Layer1Plus"/>
@@ -29776,11 +29914,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="259"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,5.95877</Vector>
+<Numeric name="Radius" value="249"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-5.95877</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring12Layer1Plus"/>
@@ -29790,11 +29928,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="248"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
+<Numeric name="Radius" value="256"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring12Layer1Plus"/>
@@ -29804,11 +29942,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="254"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
+<Numeric name="Radius" value="250"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring13Layer1Plus"/>
@@ -29818,11 +29956,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="248"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
+<Numeric name="Radius" value="256"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring13Layer1Plus"/>
@@ -29832,11 +29970,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="254"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
+<Numeric name="Radius" value="250"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring14Layer1Plus"/>
@@ -29846,11 +29984,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="248"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
+<Numeric name="Radius" value="256"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring14Layer1Plus"/>
@@ -29860,11 +29998,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="254"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
+<Numeric name="Radius" value="250"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring15Layer1Plus"/>
@@ -29874,11 +30012,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="248"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
+<Numeric name="Radius" value="256"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring15Layer1Plus"/>
@@ -29888,11 +30026,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="254"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
+<Numeric name="Radius" value="250"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring16Layer1Plus"/>
@@ -29902,11 +30040,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="248"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
+<Numeric name="Radius" value="256"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring16Layer1Plus"/>
@@ -29916,17 +30054,17 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="110*deg"/>
-<Numeric name="Radius" value="254"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,6.15091</Vector>
+<Numeric name="Radius" value="250"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-6.15091</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="74*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerPhiAltAlgo">
 <rParent name="tracker:Layer2"/>
 <String name="ChildName" value="tracker:Rod2"/>
 <Numeric name="Tilt" value="90*deg"/>
-<Numeric name="StartAngle" value="90*deg"/>
+<Numeric name="StartAngle" value="103.846*deg"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="RadiusIn" value="349.8*mm"/>
 <Numeric name="RadiusOut" value="373.6*mm"/>
@@ -29943,11 +30081,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="374"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,3.75278</Vector>
+<Numeric name="Radius" value="387"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-3.75278</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="40*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring7Layer2Minus"/>
@@ -29957,11 +30095,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="387"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-3.75278</Vector>
+<Numeric name="Radius" value="374"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,3.75278</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="40*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring8Layer2Minus"/>
@@ -29971,11 +30109,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="374"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,3.75278</Vector>
+<Numeric name="Radius" value="387"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-3.75278</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="40*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring8Layer2Minus"/>
@@ -29985,11 +30123,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="387"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-3.75278</Vector>
+<Numeric name="Radius" value="374"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,3.75278</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="40*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring9Layer2Minus"/>
@@ -29999,11 +30137,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="374"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,3.75278</Vector>
+<Numeric name="Radius" value="387"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-3.75278</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="40*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring9Layer2Minus"/>
@@ -30013,11 +30151,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="387"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-3.75278</Vector>
+<Numeric name="Radius" value="374"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,3.75278</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="40*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring10Layer2Minus"/>
@@ -30027,11 +30165,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="372"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.5</Vector>
+<Numeric name="Radius" value="381"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.5</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="55*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring10Layer2Minus"/>
@@ -30041,11 +30179,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="381"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.5</Vector>
+<Numeric name="Radius" value="372"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.5</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="55*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring11Layer2Minus"/>
@@ -30055,11 +30193,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="372"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.5</Vector>
+<Numeric name="Radius" value="381"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.5</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="55*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring11Layer2Minus"/>
@@ -30069,11 +30207,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="381"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.5</Vector>
+<Numeric name="Radius" value="372"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.5</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="55*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring12Layer2Minus"/>
@@ -30083,11 +30221,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="372"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.5</Vector>
+<Numeric name="Radius" value="381"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.5</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="55*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring12Layer2Minus"/>
@@ -30097,11 +30235,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="381"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.5</Vector>
+<Numeric name="Radius" value="372"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.5</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="55*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring13Layer2Minus"/>
@@ -30111,11 +30249,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="372"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.5</Vector>
+<Numeric name="Radius" value="381"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.5</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="55*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring13Layer2Minus"/>
@@ -30125,11 +30263,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="381"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.5</Vector>
+<Numeric name="Radius" value="372"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.5</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="55*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring14Layer2Minus"/>
@@ -30139,11 +30277,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="371"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
+<Numeric name="Radius" value="378"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring14Layer2Minus"/>
@@ -30153,11 +30291,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="378"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
+<Numeric name="Radius" value="371"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring15Layer2Minus"/>
@@ -30167,11 +30305,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="371"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
+<Numeric name="Radius" value="378"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring15Layer2Minus"/>
@@ -30181,11 +30319,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="378"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
+<Numeric name="Radius" value="371"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring16Layer2Minus"/>
@@ -30195,11 +30333,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="371"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
+<Numeric name="Radius" value="378"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring16Layer2Minus"/>
@@ -30209,11 +30347,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="378"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
+<Numeric name="Radius" value="371"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring17Layer2Minus"/>
@@ -30223,11 +30361,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="371"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
+<Numeric name="Radius" value="378"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring17Layer2Minus"/>
@@ -30237,11 +30375,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="378"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
+<Numeric name="Radius" value="371"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring18Layer2Minus"/>
@@ -30251,11 +30389,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="371"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
+<Numeric name="Radius" value="378"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring18Layer2Minus"/>
@@ -30265,11 +30403,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="378"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
+<Numeric name="Radius" value="371"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring7Layer2Plus"/>
@@ -30279,11 +30417,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="374"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-3.75278</Vector>
+<Numeric name="Radius" value="387"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,3.75278</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="40*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring7Layer2Plus"/>
@@ -30293,11 +30431,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="387"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,3.75278</Vector>
+<Numeric name="Radius" value="374"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-3.75278</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="40*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring8Layer2Plus"/>
@@ -30307,11 +30445,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="374"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-3.75278</Vector>
+<Numeric name="Radius" value="387"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,3.75278</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="40*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring8Layer2Plus"/>
@@ -30321,11 +30459,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="387"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,3.75278</Vector>
+<Numeric name="Radius" value="374"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-3.75278</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="40*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring9Layer2Plus"/>
@@ -30335,11 +30473,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="374"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-3.75278</Vector>
+<Numeric name="Radius" value="387"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,3.75278</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="40*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring9Layer2Plus"/>
@@ -30349,11 +30487,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="387"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,3.75278</Vector>
+<Numeric name="Radius" value="374"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-3.75278</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="40*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring10Layer2Plus"/>
@@ -30363,11 +30501,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="372"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.5</Vector>
+<Numeric name="Radius" value="381"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.5</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="55*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring10Layer2Plus"/>
@@ -30377,11 +30515,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="381"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.5</Vector>
+<Numeric name="Radius" value="372"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.5</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="55*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring11Layer2Plus"/>
@@ -30391,11 +30529,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="372"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.5</Vector>
+<Numeric name="Radius" value="381"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.5</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="55*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring11Layer2Plus"/>
@@ -30405,11 +30543,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="381"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.5</Vector>
+<Numeric name="Radius" value="372"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.5</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="55*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring12Layer2Plus"/>
@@ -30419,11 +30557,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="372"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.5</Vector>
+<Numeric name="Radius" value="381"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.5</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="55*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring12Layer2Plus"/>
@@ -30433,11 +30571,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="381"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.5</Vector>
+<Numeric name="Radius" value="372"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.5</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="55*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring13Layer2Plus"/>
@@ -30447,11 +30585,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="372"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.5</Vector>
+<Numeric name="Radius" value="381"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.5</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="55*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring13Layer2Plus"/>
@@ -30461,11 +30599,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="381"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.5</Vector>
+<Numeric name="Radius" value="372"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.5</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="55*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring14Layer2Plus"/>
@@ -30475,11 +30613,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="371"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
+<Numeric name="Radius" value="378"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring14Layer2Plus"/>
@@ -30489,11 +30627,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="378"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
+<Numeric name="Radius" value="371"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring15Layer2Plus"/>
@@ -30503,11 +30641,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="371"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
+<Numeric name="Radius" value="378"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring15Layer2Plus"/>
@@ -30517,11 +30655,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="378"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
+<Numeric name="Radius" value="371"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring16Layer2Plus"/>
@@ -30531,11 +30669,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="371"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
+<Numeric name="Radius" value="378"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring16Layer2Plus"/>
@@ -30545,11 +30683,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="378"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
+<Numeric name="Radius" value="371"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring17Layer2Plus"/>
@@ -30559,11 +30697,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="371"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
+<Numeric name="Radius" value="378"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring17Layer2Plus"/>
@@ -30573,11 +30711,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="378"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
+<Numeric name="Radius" value="371"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring18Layer2Plus"/>
@@ -30587,11 +30725,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="371"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
+<Numeric name="Radius" value="378"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring18Layer2Plus"/>
@@ -30601,17 +30739,17 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="103.846*deg"/>
-<Numeric name="Radius" value="378"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,5.60117</Vector>
+<Numeric name="Radius" value="371"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-5.60117</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="68*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerPhiAltAlgo">
 <rParent name="tracker:Layer3"/>
 <String name="ChildName" value="tracker:Rod3"/>
 <Numeric name="Tilt" value="90*deg"/>
-<Numeric name="StartAngle" value="90*deg"/>
+<Numeric name="StartAngle" value="100*deg"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="RadiusIn" value="502.1*mm"/>
 <Numeric name="RadiusOut" value="525.9*mm"/>
@@ -30628,11 +30766,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="524.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
+<Numeric name="Radius" value="536.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring9Layer3Minus"/>
@@ -30642,11 +30780,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="536.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
+<Numeric name="Radius" value="524.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring10Layer3Minus"/>
@@ -30656,11 +30794,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="524.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
+<Numeric name="Radius" value="536.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring10Layer3Minus"/>
@@ -30670,11 +30808,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="536.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
+<Numeric name="Radius" value="524.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring11Layer3Minus"/>
@@ -30684,11 +30822,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="524.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
+<Numeric name="Radius" value="536.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring11Layer3Minus"/>
@@ -30698,11 +30836,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="536.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
+<Numeric name="Radius" value="524.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring12Layer3Minus"/>
@@ -30712,11 +30850,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="524.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
+<Numeric name="Radius" value="536.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring12Layer3Minus"/>
@@ -30726,11 +30864,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="536.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
+<Numeric name="Radius" value="524.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring13Layer3Minus"/>
@@ -30740,11 +30878,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="524.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
+<Numeric name="Radius" value="536.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring13Layer3Minus"/>
@@ -30754,11 +30892,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="536.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
+<Numeric name="Radius" value="524.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring14Layer3Minus"/>
@@ -30768,11 +30906,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="524.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
+<Numeric name="Radius" value="536.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring14Layer3Minus"/>
@@ -30782,11 +30920,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="536.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
+<Numeric name="Radius" value="524.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring15Layer3Minus"/>
@@ -30796,11 +30934,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="522.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
+<Numeric name="Radius" value="530.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring15Layer3Minus"/>
@@ -30810,11 +30948,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="530.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
+<Numeric name="Radius" value="522.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring16Layer3Minus"/>
@@ -30824,11 +30962,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="522.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
+<Numeric name="Radius" value="530.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring16Layer3Minus"/>
@@ -30838,11 +30976,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="530.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
+<Numeric name="Radius" value="522.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring17Layer3Minus"/>
@@ -30852,11 +30990,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="522.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
+<Numeric name="Radius" value="530.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring17Layer3Minus"/>
@@ -30866,11 +31004,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="530.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
+<Numeric name="Radius" value="522.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring18Layer3Minus"/>
@@ -30880,11 +31018,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="522.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
+<Numeric name="Radius" value="530.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring18Layer3Minus"/>
@@ -30894,11 +31032,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="530.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
+<Numeric name="Radius" value="522.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring19Layer3Minus"/>
@@ -30908,11 +31046,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="522.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
+<Numeric name="Radius" value="530.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring19Layer3Minus"/>
@@ -30922,11 +31060,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="530.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
+<Numeric name="Radius" value="522.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring20Layer3Minus"/>
@@ -30936,11 +31074,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="522.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
+<Numeric name="Radius" value="530.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring20Layer3Minus"/>
@@ -30950,11 +31088,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="530.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
+<Numeric name="Radius" value="522.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
 <Numeric name="IsZPlus" value="0"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring9Layer3Plus"/>
@@ -30964,11 +31102,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="524.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
+<Numeric name="Radius" value="536.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring9Layer3Plus"/>
@@ -30978,11 +31116,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="536.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
+<Numeric name="Radius" value="524.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring10Layer3Plus"/>
@@ -30992,11 +31130,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="524.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
+<Numeric name="Radius" value="536.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring10Layer3Plus"/>
@@ -31006,11 +31144,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="536.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
+<Numeric name="Radius" value="524.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring11Layer3Plus"/>
@@ -31020,11 +31158,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="524.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
+<Numeric name="Radius" value="536.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring11Layer3Plus"/>
@@ -31034,11 +31172,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="536.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
+<Numeric name="Radius" value="524.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring12Layer3Plus"/>
@@ -31048,11 +31186,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="524.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
+<Numeric name="Radius" value="536.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring12Layer3Plus"/>
@@ -31062,11 +31200,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="536.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
+<Numeric name="Radius" value="524.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring13Layer3Plus"/>
@@ -31076,11 +31214,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="524.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
+<Numeric name="Radius" value="536.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring13Layer3Plus"/>
@@ -31090,11 +31228,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="536.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
+<Numeric name="Radius" value="524.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring14Layer3Plus"/>
@@ -31104,11 +31242,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="524.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
+<Numeric name="Radius" value="536.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring14Layer3Plus"/>
@@ -31118,11 +31256,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="536.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.04705</Vector>
+<Numeric name="Radius" value="524.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.04705</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="44*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring15Layer3Plus"/>
@@ -31132,11 +31270,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="522.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
+<Numeric name="Radius" value="530.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring15Layer3Plus"/>
@@ -31146,11 +31284,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="530.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
+<Numeric name="Radius" value="522.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring16Layer3Plus"/>
@@ -31160,11 +31298,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="522.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
+<Numeric name="Radius" value="530.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring16Layer3Plus"/>
@@ -31174,11 +31312,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="530.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
+<Numeric name="Radius" value="522.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring17Layer3Plus"/>
@@ -31188,11 +31326,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="522.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
+<Numeric name="Radius" value="530.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring17Layer3Plus"/>
@@ -31202,11 +31340,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="530.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
+<Numeric name="Radius" value="522.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring18Layer3Plus"/>
@@ -31216,11 +31354,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="522.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
+<Numeric name="Radius" value="530.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring18Layer3Plus"/>
@@ -31230,11 +31368,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="530.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
+<Numeric name="Radius" value="522.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring19Layer3Plus"/>
@@ -31244,11 +31382,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="522.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
+<Numeric name="Radius" value="530.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring19Layer3Plus"/>
@@ -31258,11 +31396,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="530.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
+<Numeric name="Radius" value="522.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring20Layer3Plus"/>
@@ -31272,11 +31410,11 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="90*deg"/>
-<Numeric name="Radius" value="522.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
+<Numeric name="Radius" value="530.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="1"/>
+<Numeric name="IsFlipped" value="0"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring20Layer3Plus"/>
@@ -31286,20 +31424,20 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="100*deg"/>
-<Numeric name="Radius" value="530.5"/>
-<Vector name="Center" type="numeric" nEntries="3">0,0,4.76701</Vector>
+<Numeric name="Radius" value="522.5"/>
+<Vector name="Center" type="numeric" nEntries="3">0,0,-4.76701</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="60*deg"/>
-<Numeric name="IsFlipped" value="0"/>
+<Numeric name="IsFlipped" value="1"/>
 </Algorithm>
 <Algorithm name="track:DDTrackerPhiAltAlgo">
 <rParent name="tracker:Layer4"/>
 <String name="ChildName" value="tracker:Rod4"/>
 <Numeric name="Tilt" value="90*deg"/>
-<Numeric name="StartAngle" value="90*deg"/>
+<Numeric name="StartAngle" value="97.5*deg"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="RadiusIn" value="702.8*mm"/>
-<Numeric name="RadiusOut" value="671.2*mm"/>
+<Numeric name="RadiusIn" value="671.2*mm"/>
+<Numeric name="RadiusOut" value="702.8*mm"/>
 <Numeric name="ZPosition" value="0.0*mm"/>
 <Numeric name="Number" value="48"/>
 <Numeric name="StartCopyNo" value="1"/>
@@ -31309,10 +31447,10 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Layer5"/>
 <String name="ChildName" value="tracker:Rod5"/>
 <Numeric name="Tilt" value="90*deg"/>
-<Numeric name="StartAngle" value="90*deg"/>
+<Numeric name="StartAngle" value="96*deg"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="RadiusIn" value="875.8*mm"/>
-<Numeric name="RadiusOut" value="844.2*mm"/>
+<Numeric name="RadiusIn" value="844.2*mm"/>
+<Numeric name="RadiusOut" value="875.8*mm"/>
 <Numeric name="ZPosition" value="0.0*mm"/>
 <Numeric name="Number" value="60"/>
 <Numeric name="StartCopyNo" value="1"/>
@@ -31322,12 +31460,12 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <rParent name="tracker:Layer6"/>
 <String name="ChildName" value="tracker:Rod6"/>
 <Numeric name="Tilt" value="90*deg"/>
-<Numeric name="StartAngle" value="90*deg"/>
+<Numeric name="StartAngle" value="94.7368*deg"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="RadiusIn" value="1123.8*mm"/>
-<Numeric name="RadiusOut" value="1092.2*mm"/>
+<Numeric name="RadiusIn" value="1067.2*mm"/>
+<Numeric name="RadiusOut" value="1098.8*mm"/>
 <Numeric name="ZPosition" value="0.0*mm"/>
-<Numeric name="Number" value="78"/>
+<Numeric name="Number" value="76"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="1"/>
 </Algorithm>
@@ -31339,7 +31477,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="9*deg"/>
-<Numeric name="Radius" value="252.229"/>
+<Numeric name="Radius" value="259.78"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31353,7 +31491,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="27*deg"/>
-<Numeric name="Radius" value="252.229"/>
+<Numeric name="Radius" value="259.78"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31367,7 +31505,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="7.5*deg"/>
-<Numeric name="Radius" value="301.803"/>
+<Numeric name="Radius" value="307.528"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31381,7 +31519,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="22.5*deg"/>
-<Numeric name="Radius" value="301.803"/>
+<Numeric name="Radius" value="307.528"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31395,7 +31533,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="7.5*deg"/>
-<Numeric name="Radius" value="338.167"/>
+<Numeric name="Radius" value="340.835"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31409,7 +31547,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="22.5*deg"/>
-<Numeric name="Radius" value="338.167"/>
+<Numeric name="Radius" value="340.835"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31423,7 +31561,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="6.42857*deg"/>
-<Numeric name="Radius" value="388.267"/>
+<Numeric name="Radius" value="390.528"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31437,7 +31575,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="19.2857*deg"/>
-<Numeric name="Radius" value="388.267"/>
+<Numeric name="Radius" value="390.528"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31451,7 +31589,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="5.625*deg"/>
-<Numeric name="Radius" value="421.579"/>
+<Numeric name="Radius" value="420.173"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31465,7 +31603,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="16.875*deg"/>
-<Numeric name="Radius" value="421.579"/>
+<Numeric name="Radius" value="420.173"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31479,7 +31617,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="5.625*deg"/>
-<Numeric name="Radius" value="472.189"/>
+<Numeric name="Radius" value="470.728"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31493,7 +31631,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="16.875*deg"/>
-<Numeric name="Radius" value="472.189"/>
+<Numeric name="Radius" value="470.728"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31507,7 +31645,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="5*deg"/>
-<Numeric name="Radius" value="502.539"/>
+<Numeric name="Radius" value="498.753"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31521,7 +31659,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="15*deg"/>
-<Numeric name="Radius" value="502.539"/>
+<Numeric name="Radius" value="498.753"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31535,7 +31673,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="4.5*deg"/>
-<Numeric name="Radius" value="553.645"/>
+<Numeric name="Radius" value="550.228"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31549,7 +31687,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="13.5*deg"/>
-<Numeric name="Radius" value="553.645"/>
+<Numeric name="Radius" value="550.228"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31563,7 +31701,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="4.5*deg"/>
-<Numeric name="Radius" value="581.119"/>
+<Numeric name="Radius" value="576.669"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31577,7 +31715,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="13.5*deg"/>
-<Numeric name="Radius" value="581.119"/>
+<Numeric name="Radius" value="576.669"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31591,7 +31729,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="4.09091*deg"/>
-<Numeric name="Radius" value="636.509"/>
+<Numeric name="Radius" value="631.628"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31605,7 +31743,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="12.2727*deg"/>
-<Numeric name="Radius" value="636.509"/>
+<Numeric name="Radius" value="631.628"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31619,7 +31757,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="3.46154*deg"/>
-<Numeric name="Radius" value="692.345"/>
+<Numeric name="Radius" value="689.391"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31633,7 +31771,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="10.3846*deg"/>
-<Numeric name="Radius" value="692.345"/>
+<Numeric name="Radius" value="689.391"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31647,7 +31785,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="3*deg"/>
-<Numeric name="Radius" value="800.056"/>
+<Numeric name="Radius" value="787.75"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31661,7 +31799,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="9*deg"/>
-<Numeric name="Radius" value="800.056"/>
+<Numeric name="Radius" value="787.75"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31675,7 +31813,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="2.8125*deg"/>
-<Numeric name="Radius" value="873.444"/>
+<Numeric name="Radius" value="854.55"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31689,7 +31827,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="8.4375*deg"/>
-<Numeric name="Radius" value="873.444"/>
+<Numeric name="Radius" value="854.55"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31703,7 +31841,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="2.5*deg"/>
-<Numeric name="Radius" value="982.515"/>
+<Numeric name="Radius" value="963.15"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31717,7 +31855,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="7.5*deg"/>
-<Numeric name="Radius" value="982.515"/>
+<Numeric name="Radius" value="963.15"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31731,7 +31869,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="2.36842*deg"/>
-<Numeric name="Radius" value="1049.75"/>
+<Numeric name="Radius" value="1023.16"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31745,7 +31883,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="7.10526*deg"/>
-<Numeric name="Radius" value="1049.75"/>
+<Numeric name="Radius" value="1023.16"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31759,7 +31897,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="9*deg"/>
-<Numeric name="Radius" value="252.229"/>
+<Numeric name="Radius" value="259.78"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31773,7 +31911,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="27*deg"/>
-<Numeric name="Radius" value="252.229"/>
+<Numeric name="Radius" value="259.78"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31787,7 +31925,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="7.5*deg"/>
-<Numeric name="Radius" value="301.803"/>
+<Numeric name="Radius" value="307.528"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31801,7 +31939,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="22.5*deg"/>
-<Numeric name="Radius" value="301.803"/>
+<Numeric name="Radius" value="307.528"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31815,7 +31953,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="7.5*deg"/>
-<Numeric name="Radius" value="338.167"/>
+<Numeric name="Radius" value="340.835"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31829,7 +31967,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="22.5*deg"/>
-<Numeric name="Radius" value="338.167"/>
+<Numeric name="Radius" value="340.835"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31843,7 +31981,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="6.42857*deg"/>
-<Numeric name="Radius" value="388.267"/>
+<Numeric name="Radius" value="390.528"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31857,7 +31995,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="19.2857*deg"/>
-<Numeric name="Radius" value="388.267"/>
+<Numeric name="Radius" value="390.528"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31871,7 +32009,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="5.625*deg"/>
-<Numeric name="Radius" value="421.579"/>
+<Numeric name="Radius" value="420.173"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31885,7 +32023,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="16.875*deg"/>
-<Numeric name="Radius" value="421.579"/>
+<Numeric name="Radius" value="420.173"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31899,7 +32037,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="5.625*deg"/>
-<Numeric name="Radius" value="472.189"/>
+<Numeric name="Radius" value="470.728"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31913,7 +32051,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="16.875*deg"/>
-<Numeric name="Radius" value="472.189"/>
+<Numeric name="Radius" value="470.728"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31927,7 +32065,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="5*deg"/>
-<Numeric name="Radius" value="502.539"/>
+<Numeric name="Radius" value="498.753"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31941,7 +32079,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="15*deg"/>
-<Numeric name="Radius" value="502.539"/>
+<Numeric name="Radius" value="498.753"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31955,7 +32093,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="4.5*deg"/>
-<Numeric name="Radius" value="553.645"/>
+<Numeric name="Radius" value="550.228"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31969,7 +32107,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="13.5*deg"/>
-<Numeric name="Radius" value="553.645"/>
+<Numeric name="Radius" value="550.228"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31983,7 +32121,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="4.5*deg"/>
-<Numeric name="Radius" value="581.119"/>
+<Numeric name="Radius" value="576.669"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -31997,7 +32135,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="13.5*deg"/>
-<Numeric name="Radius" value="581.119"/>
+<Numeric name="Radius" value="576.669"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32011,7 +32149,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="4.09091*deg"/>
-<Numeric name="Radius" value="636.509"/>
+<Numeric name="Radius" value="631.628"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32025,7 +32163,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="12.2727*deg"/>
-<Numeric name="Radius" value="636.509"/>
+<Numeric name="Radius" value="631.628"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32039,7 +32177,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="3.46154*deg"/>
-<Numeric name="Radius" value="692.345"/>
+<Numeric name="Radius" value="689.391"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32053,7 +32191,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="10.3846*deg"/>
-<Numeric name="Radius" value="692.345"/>
+<Numeric name="Radius" value="689.391"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32067,7 +32205,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="3*deg"/>
-<Numeric name="Radius" value="800.056"/>
+<Numeric name="Radius" value="787.75"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32081,7 +32219,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="9*deg"/>
-<Numeric name="Radius" value="800.056"/>
+<Numeric name="Radius" value="787.75"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32095,7 +32233,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="2.8125*deg"/>
-<Numeric name="Radius" value="873.444"/>
+<Numeric name="Radius" value="854.55"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32109,7 +32247,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="8.4375*deg"/>
-<Numeric name="Radius" value="873.444"/>
+<Numeric name="Radius" value="854.55"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32123,7 +32261,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="2.5*deg"/>
-<Numeric name="Radius" value="982.515"/>
+<Numeric name="Radius" value="963.15"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32137,7 +32275,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="7.5*deg"/>
-<Numeric name="Radius" value="982.515"/>
+<Numeric name="Radius" value="963.15"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32151,7 +32289,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="2.36842*deg"/>
-<Numeric name="Radius" value="1049.75"/>
+<Numeric name="Radius" value="1023.16"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32165,7 +32303,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="7.10526*deg"/>
-<Numeric name="Radius" value="1049.75"/>
+<Numeric name="Radius" value="1023.16"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32179,7 +32317,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="6.42857*deg"/>
-<Numeric name="Radius" value="352.132"/>
+<Numeric name="Radius" value="354.78"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32193,7 +32331,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="19.2857*deg"/>
-<Numeric name="Radius" value="352.132"/>
+<Numeric name="Radius" value="354.78"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32207,7 +32345,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="6.42857*deg"/>
-<Numeric name="Radius" value="391.413"/>
+<Numeric name="Radius" value="388.629"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32221,7 +32359,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="19.2857*deg"/>
-<Numeric name="Radius" value="391.413"/>
+<Numeric name="Radius" value="388.629"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32235,7 +32373,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="5.625*deg"/>
-<Numeric name="Radius" value="441.664"/>
+<Numeric name="Radius" value="437.254"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32249,7 +32387,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="16.875*deg"/>
-<Numeric name="Radius" value="441.664"/>
+<Numeric name="Radius" value="437.254"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32258,12 +32396,12 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring7Disc3"/>
 <String name="ChildName" value="tracker:EModule7Disc3"/>
-<Numeric name="N" value="18"/>
+<Numeric name="N" value="16"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="5*deg"/>
-<Numeric name="Radius" value="478.696"/>
+<Numeric name="StartAngle" value="5.625*deg"/>
+<Numeric name="Radius" value="471.159"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32272,12 +32410,12 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring7Disc3"/>
 <String name="ChildName" value="tracker:EModule7Disc3"/>
-<Numeric name="N" value="18"/>
+<Numeric name="N" value="16"/>
 <Numeric name="StartCopyNo" value="2"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="15*deg"/>
-<Numeric name="Radius" value="478.696"/>
+<Numeric name="StartAngle" value="16.875*deg"/>
+<Numeric name="Radius" value="471.159"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32291,7 +32429,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="5*deg"/>
-<Numeric name="Radius" value="529.258"/>
+<Numeric name="Radius" value="520.121"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32305,7 +32443,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="15*deg"/>
-<Numeric name="Radius" value="529.258"/>
+<Numeric name="Radius" value="520.121"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32319,7 +32457,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="4.5*deg"/>
-<Numeric name="Radius" value="564.091"/>
+<Numeric name="Radius" value="551.681"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32333,7 +32471,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="13.5*deg"/>
-<Numeric name="Radius" value="564.091"/>
+<Numeric name="Radius" value="551.681"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32347,7 +32485,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="4.09091*deg"/>
-<Numeric name="Radius" value="615.962"/>
+<Numeric name="Radius" value="602.428"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32361,7 +32499,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="12.2727*deg"/>
-<Numeric name="Radius" value="615.962"/>
+<Numeric name="Radius" value="602.428"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32375,7 +32513,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="3.46154*deg"/>
-<Numeric name="Radius" value="676.317"/>
+<Numeric name="Radius" value="664.903"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,8.55</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32389,7 +32527,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="10.3846*deg"/>
-<Numeric name="Radius" value="676.317"/>
+<Numeric name="Radius" value="664.903"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-8.55</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32403,7 +32541,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="3.21429*deg"/>
-<Numeric name="Radius" value="781.3"/>
+<Numeric name="Radius" value="767.75"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32417,7 +32555,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="9.64286*deg"/>
-<Numeric name="Radius" value="781.3"/>
+<Numeric name="Radius" value="767.75"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32431,7 +32569,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="2.8125*deg"/>
-<Numeric name="Radius" value="864.293"/>
+<Numeric name="Radius" value="844.562"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32445,7 +32583,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="8.4375*deg"/>
-<Numeric name="Radius" value="864.293"/>
+<Numeric name="Radius" value="844.562"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32454,12 +32592,12 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring14Disc3"/>
 <String name="ChildName" value="tracker:EModule14Disc3"/>
-<Numeric name="N" value="36"/>
+<Numeric name="N" value="34"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="2.5*deg"/>
-<Numeric name="Radius" value="971.316"/>
+<Numeric name="StartAngle" value="2.64706*deg"/>
+<Numeric name="Radius" value="949.92"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32468,12 +32606,12 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring14Disc3"/>
 <String name="ChildName" value="tracker:EModule14Disc3"/>
-<Numeric name="N" value="36"/>
+<Numeric name="N" value="34"/>
 <Numeric name="StartCopyNo" value="2"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="7.5*deg"/>
-<Numeric name="Radius" value="971.316"/>
+<Numeric name="StartAngle" value="7.94118*deg"/>
+<Numeric name="Radius" value="949.92"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32487,7 +32625,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="2.36842*deg"/>
-<Numeric name="Radius" value="1049.75"/>
+<Numeric name="Radius" value="1023.16"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32501,7 +32639,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="7.10526*deg"/>
-<Numeric name="Radius" value="1049.75"/>
+<Numeric name="Radius" value="1023.16"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32515,7 +32653,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="6.42857*deg"/>
-<Numeric name="Radius" value="352.132"/>
+<Numeric name="Radius" value="354.78"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32529,7 +32667,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="19.2857*deg"/>
-<Numeric name="Radius" value="352.132"/>
+<Numeric name="Radius" value="354.78"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32543,7 +32681,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="6.42857*deg"/>
-<Numeric name="Radius" value="391.413"/>
+<Numeric name="Radius" value="388.629"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32557,7 +32695,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="19.2857*deg"/>
-<Numeric name="Radius" value="391.413"/>
+<Numeric name="Radius" value="388.629"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32571,7 +32709,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="5.625*deg"/>
-<Numeric name="Radius" value="441.664"/>
+<Numeric name="Radius" value="437.254"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32585,7 +32723,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="16.875*deg"/>
-<Numeric name="Radius" value="441.664"/>
+<Numeric name="Radius" value="437.254"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32594,12 +32732,12 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring7Disc4"/>
 <String name="ChildName" value="tracker:EModule7Disc4"/>
-<Numeric name="N" value="18"/>
+<Numeric name="N" value="16"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="5*deg"/>
-<Numeric name="Radius" value="478.696"/>
+<Numeric name="StartAngle" value="5.625*deg"/>
+<Numeric name="Radius" value="471.159"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32608,12 +32746,12 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring7Disc4"/>
 <String name="ChildName" value="tracker:EModule7Disc4"/>
-<Numeric name="N" value="18"/>
+<Numeric name="N" value="16"/>
 <Numeric name="StartCopyNo" value="2"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="15*deg"/>
-<Numeric name="Radius" value="478.696"/>
+<Numeric name="StartAngle" value="16.875*deg"/>
+<Numeric name="Radius" value="471.159"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32627,7 +32765,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="5*deg"/>
-<Numeric name="Radius" value="529.258"/>
+<Numeric name="Radius" value="520.121"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32641,7 +32779,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="15*deg"/>
-<Numeric name="Radius" value="529.258"/>
+<Numeric name="Radius" value="520.121"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32655,7 +32793,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="4.5*deg"/>
-<Numeric name="Radius" value="564.091"/>
+<Numeric name="Radius" value="551.681"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32669,7 +32807,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="13.5*deg"/>
-<Numeric name="Radius" value="564.091"/>
+<Numeric name="Radius" value="551.681"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32683,7 +32821,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="4.09091*deg"/>
-<Numeric name="Radius" value="615.962"/>
+<Numeric name="Radius" value="602.428"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32697,7 +32835,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="12.2727*deg"/>
-<Numeric name="Radius" value="615.962"/>
+<Numeric name="Radius" value="602.428"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32711,7 +32849,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="3.46154*deg"/>
-<Numeric name="Radius" value="676.317"/>
+<Numeric name="Radius" value="664.903"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,8.55</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32725,7 +32863,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="10.3846*deg"/>
-<Numeric name="Radius" value="676.317"/>
+<Numeric name="Radius" value="664.903"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-8.55</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32739,7 +32877,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="3.21429*deg"/>
-<Numeric name="Radius" value="781.3"/>
+<Numeric name="Radius" value="767.75"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32753,7 +32891,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="9.64286*deg"/>
-<Numeric name="Radius" value="781.3"/>
+<Numeric name="Radius" value="767.75"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32767,7 +32905,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="2.8125*deg"/>
-<Numeric name="Radius" value="864.293"/>
+<Numeric name="Radius" value="844.562"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32781,7 +32919,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="8.4375*deg"/>
-<Numeric name="Radius" value="864.293"/>
+<Numeric name="Radius" value="844.562"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32790,12 +32928,12 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring14Disc4"/>
 <String name="ChildName" value="tracker:EModule14Disc4"/>
-<Numeric name="N" value="36"/>
+<Numeric name="N" value="34"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="2.5*deg"/>
-<Numeric name="Radius" value="971.316"/>
+<Numeric name="StartAngle" value="2.64706*deg"/>
+<Numeric name="Radius" value="949.92"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32804,12 +32942,12 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring14Disc4"/>
 <String name="ChildName" value="tracker:EModule14Disc4"/>
-<Numeric name="N" value="36"/>
+<Numeric name="N" value="34"/>
 <Numeric name="StartCopyNo" value="2"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="7.5*deg"/>
-<Numeric name="Radius" value="971.316"/>
+<Numeric name="StartAngle" value="7.94118*deg"/>
+<Numeric name="Radius" value="949.92"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32823,7 +32961,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="2.36842*deg"/>
-<Numeric name="Radius" value="1049.75"/>
+<Numeric name="Radius" value="1023.16"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32837,7 +32975,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="7.10526*deg"/>
-<Numeric name="Radius" value="1049.75"/>
+<Numeric name="Radius" value="1023.16"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32851,7 +32989,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="6.42857*deg"/>
-<Numeric name="Radius" value="352.132"/>
+<Numeric name="Radius" value="354.78"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32865,7 +33003,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="19.2857*deg"/>
-<Numeric name="Radius" value="352.132"/>
+<Numeric name="Radius" value="354.78"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32879,7 +33017,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="6.42857*deg"/>
-<Numeric name="Radius" value="391.413"/>
+<Numeric name="Radius" value="388.629"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32893,7 +33031,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="19.2857*deg"/>
-<Numeric name="Radius" value="391.413"/>
+<Numeric name="Radius" value="388.629"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32907,7 +33045,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="5.625*deg"/>
-<Numeric name="Radius" value="441.664"/>
+<Numeric name="Radius" value="437.254"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32921,7 +33059,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="16.875*deg"/>
-<Numeric name="Radius" value="441.664"/>
+<Numeric name="Radius" value="437.254"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32930,12 +33068,12 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring7Disc5"/>
 <String name="ChildName" value="tracker:EModule7Disc5"/>
-<Numeric name="N" value="18"/>
+<Numeric name="N" value="16"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="5*deg"/>
-<Numeric name="Radius" value="478.696"/>
+<Numeric name="StartAngle" value="5.625*deg"/>
+<Numeric name="Radius" value="471.159"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32944,12 +33082,12 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring7Disc5"/>
 <String name="ChildName" value="tracker:EModule7Disc5"/>
-<Numeric name="N" value="18"/>
+<Numeric name="N" value="16"/>
 <Numeric name="StartCopyNo" value="2"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="15*deg"/>
-<Numeric name="Radius" value="478.696"/>
+<Numeric name="StartAngle" value="16.875*deg"/>
+<Numeric name="Radius" value="471.159"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32963,7 +33101,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="5*deg"/>
-<Numeric name="Radius" value="529.258"/>
+<Numeric name="Radius" value="520.121"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32977,7 +33115,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="15*deg"/>
-<Numeric name="Radius" value="529.258"/>
+<Numeric name="Radius" value="520.121"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -32991,7 +33129,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="4.5*deg"/>
-<Numeric name="Radius" value="564.091"/>
+<Numeric name="Radius" value="551.681"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -33005,7 +33143,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="13.5*deg"/>
-<Numeric name="Radius" value="564.091"/>
+<Numeric name="Radius" value="551.681"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -33019,7 +33157,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="4.09091*deg"/>
-<Numeric name="Radius" value="615.962"/>
+<Numeric name="Radius" value="602.428"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -33033,7 +33171,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="12.2727*deg"/>
-<Numeric name="Radius" value="615.962"/>
+<Numeric name="Radius" value="602.428"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.375</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -33047,7 +33185,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="3.46154*deg"/>
-<Numeric name="Radius" value="676.317"/>
+<Numeric name="Radius" value="664.903"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,8.55</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -33061,7 +33199,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="10.3846*deg"/>
-<Numeric name="Radius" value="676.317"/>
+<Numeric name="Radius" value="664.903"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-8.55</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -33075,7 +33213,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="3.21429*deg"/>
-<Numeric name="Radius" value="781.3"/>
+<Numeric name="Radius" value="767.75"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,8.55</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -33089,7 +33227,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="9.64286*deg"/>
-<Numeric name="Radius" value="781.3"/>
+<Numeric name="Radius" value="767.75"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-8.55</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -33103,7 +33241,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="2.8125*deg"/>
-<Numeric name="Radius" value="864.293"/>
+<Numeric name="Radius" value="844.562"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -33117,7 +33255,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="8.4375*deg"/>
-<Numeric name="Radius" value="864.293"/>
+<Numeric name="Radius" value="844.562"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -33126,12 +33264,12 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring14Disc5"/>
 <String name="ChildName" value="tracker:EModule14Disc5"/>
-<Numeric name="N" value="36"/>
+<Numeric name="N" value="34"/>
 <Numeric name="StartCopyNo" value="1"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="2.5*deg"/>
-<Numeric name="Radius" value="971.316"/>
+<Numeric name="StartAngle" value="2.64706*deg"/>
+<Numeric name="Radius" value="949.92"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -33140,12 +33278,12 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Algorithm name="track:DDTrackerRingAlgo">
 <rParent name="tracker:Ring14Disc5"/>
 <String name="ChildName" value="tracker:EModule14Disc5"/>
-<Numeric name="N" value="36"/>
+<Numeric name="N" value="34"/>
 <Numeric name="StartCopyNo" value="2"/>
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
-<Numeric name="StartAngle" value="7.5*deg"/>
-<Numeric name="Radius" value="971.316"/>
+<Numeric name="StartAngle" value="7.94118*deg"/>
+<Numeric name="Radius" value="949.92"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -33159,7 +33297,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="2.36842*deg"/>
-<Numeric name="Radius" value="1049.75"/>
+<Numeric name="Radius" value="1023.16"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
@@ -33173,7 +33311,7 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <Numeric name="IncrCopyNo" value="2"/>
 <Numeric name="RangeAngle" value="360*deg"/>
 <Numeric name="StartAngle" value="7.10526*deg"/>
-<Numeric name="Radius" value="1049.75"/>
+<Numeric name="Radius" value="1023.16"/>
 <Vector name="Center" type="numeric" nEntries="3">0,0,-7.45</Vector>
 <Numeric name="IsZPlus" value="1"/>
 <Numeric name="TiltAngle" value="90*deg"/>
diff --git a/Geometry/TrackerCommonData/plugins/dd4hep/DDTIDAxialCableAlgo.cc b/Geometry/TrackerCommonData/plugins/dd4hep/DDTIDAxialCableAlgo.cc
new file mode 100644
index 0000000000000..04d656aa6987d
--- /dev/null
+++ b/Geometry/TrackerCommonData/plugins/dd4hep/DDTIDAxialCableAlgo.cc
@@ -0,0 +1,228 @@
+///////////////////////////////////////////////////////////////////////////////
+// File: DDTIDAxialCableAlgo.cc
+// Description: Create and position TID axial cables at prescribed phi values
+///////////////////////////////////////////////////////////////////////////////
+
+#include <algorithm>
+#include <cmath>
+
+#include "DD4hep/DetFactoryHelper.h"
+#include "DataFormats/Math/interface/GeantUnits.h"
+#include "DetectorDescription/DDCMS/interface/DDPlugins.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+
+using namespace edm;
+using namespace dd4hep;
+using namespace cms;
+using namespace geant_units::operators;
+
+namespace {
+long algorithm(dd4hep::Detector &description, cms::DDParsingContext &ctxt,
+               xml_h e, SensitiveDetector & /* sens */) {
+  cms::DDNamespace ns(ctxt, e, true);
+  cms::DDAlgoArguments args(ctxt, e);
+
+  LogVerbatim("TIDGeom") << "DDTIDAxialCableAlgo info: Creating an instance...";
+
+  double zBend = args.value<double>("ZBend"); // Start z (at bending)........
+  double zEnd = args.value<double>("ZEnd");   // End   z             ........
+  double rMin = args.value<double>("RMin");   // Minimum radius      ........
+  double rMax = args.value<double>("RMax");   // Maximum radius      ........
+  double rTop = args.value<double>("RTop");   // Maximum radius (top)........
+  double width = args.value<double>("Width"); // Angular width
+  double thick = args.value<double>("Thick"); // Thickness
+  std::vector<double> angles =
+      args.value<std::vector<double>>("Angles"); // Phi Angles
+  std::vector<double> zposWheel =
+      args.value<std::vector<double>>("ZPosWheel"); // Z position of wheels
+  std::vector<double> zposRing = args.value<std::vector<double>>(
+      "ZPosRing"); // Z position of rings inside wheels
+
+  std::string childName = args.value<std::string>("ChildName"); // Child name
+  std::string matIn =
+      args.value<std::string>("MaterialIn"); // Material name (for inner parts)
+  std::string matOut =
+      args.value<std::string>("MaterialOut"); // Material name (for outer part)
+
+  LogVerbatim("TIDGeom")
+      << "DDTIDAxialCableAlgo debug: Parameters for creating "
+      << (zposWheel.size() + 2) << " axial cables and positioning"
+      << angles.size() << "copies in Service volume"
+      << "\nzBend " << zBend << "\nzEnd " << zEnd << "\nrMin " << rMin
+      << "\nrMax " << rMax << "\nCable width " << convertRadToDeg(width)
+      << "\nthickness " << thick << " with Angles";
+
+  for (int i = 0; i < (int)(angles.size()); i++)
+    LogVerbatim("TIDGeom") << "\n\tangles[" << i
+                           << "] = " << convertRadToDeg(angles[i]);
+
+  LogVerbatim("TIDGeom") << "\nWheels " << zposWheel.size() << " at Z";
+
+  for (int i = 0; i < (int)(zposWheel.size()); i++)
+    LogVerbatim("TIDGeom") << "\n\tzposWheel[" << i << "] = " << zposWheel[i];
+
+  LogVerbatim("TIDGeom") << "\neach with " << zposRing.size() << " Rings at Z";
+
+  for (int i = 0; i < (int)(zposRing.size()); i++)
+    LogVerbatim("TIDGeom") << "\tzposRing[" << i << "] = " << zposRing[i];
+
+  Volume mother = ns.volume(args.parentName());
+
+  LogVerbatim("TIDGeom") << "DDTIDAxialCableAlgo debug: Parent "
+                         << mother.name() << "\tChild " << childName
+                         << " NameSpace " << ns.name() << "\tMaterial " << matIn
+                         << " and " << matOut;
+
+  std::vector<Volume> logs;
+  const double thk = thick / zposRing.size();
+  double r = rMin;
+  double thktot = 0;
+  double z;
+
+  // Cables between the wheels
+  for (int k = 0; k < (int)(zposWheel.size()); k++) {
+    std::vector<double> pconZ, pconRmin, pconRmax;
+
+    for (int i = 0; i < (int)(zposRing.size()); i++) {
+      thktot += thk;
+      z = zposWheel[k] + zposRing[i] - 0.5 * thk;
+
+      if (i != 0) {
+        pconZ.emplace_back(z);
+        pconRmin.emplace_back(r);
+        pconRmax.emplace_back(rMax);
+      }
+
+      r = rMin;
+      pconZ.emplace_back(z);
+      pconRmin.emplace_back(r);
+      pconRmax.emplace_back(rMax);
+
+      z += thk;
+      pconZ.emplace_back(z);
+      pconRmin.emplace_back(r);
+      pconRmax.emplace_back(rMax);
+
+      r = rMax - thktot;
+      pconZ.emplace_back(z);
+      pconRmin.emplace_back(r);
+      pconRmax.emplace_back(rMax);
+    }
+
+    if (k >= ((int)(zposWheel.size()) - 1))
+      z = zBend;
+    else
+      z = zposWheel[k + 1] + zposRing[0] - 0.5 * thk;
+
+    pconZ.emplace_back(z);
+    pconRmin.emplace_back(r);
+    pconRmax.emplace_back(rMax);
+
+    std::string name = childName + std::to_string(k);
+
+    Solid solid = ns.addSolid(
+        name, Polycone(-0.5 * width, width, pconRmin, pconRmax, pconZ));
+
+    LogVerbatim("TIDGeom") << "DDTIDAxialCableAlgo test: " << solid.name()
+                           << " Polycone made of " << matIn << " from "
+                           << convertRadToDeg(-0.5 * width) << " to "
+                           << convertRadToDeg(0.5 * width) << " and with "
+                           << pconZ.size() << " sections ";
+
+    for (int i = 0; i < (int)(pconZ.size()); i++)
+      LogVerbatim("TIDGeom")
+          << "\t[" << i << "]\tZ = " << pconZ[i] << "\tRmin = " << pconRmin[i]
+          << "\tRmax = " << pconRmax[i];
+
+    logs.emplace_back(
+        Volume(solid.name(), solid, ns.material("materials:Air")));
+  }
+
+  // Cable in the vertical part
+  std::vector<double> pconZ, pconRmin, pconRmax;
+  r = thktot * rMax / rTop;
+  z = zBend - thktot;
+  LogVerbatim("TIDGeom") << "DDTIDAxialCableAlgo test: Thk " << thk << " Total "
+                         << thktot << " rMax " << rMax << " rTop " << rTop
+                         << " dR " << r << " z " << z;
+
+  pconZ.emplace_back(z);
+  pconRmin.emplace_back(rMax);
+  pconRmax.emplace_back(rMax);
+
+  z = zBend - r;
+  pconZ.emplace_back(z);
+  pconRmin.emplace_back(rMax);
+  pconRmax.emplace_back(rTop);
+
+  pconZ.emplace_back(zBend);
+  pconRmin.emplace_back(rMax);
+  pconRmax.emplace_back(rTop);
+
+  std::string name = childName + std::to_string(zposWheel.size());
+
+  Solid solid = ns.addSolid(
+      name, Polycone(-0.5 * width, width, pconRmin, pconRmax, pconZ));
+
+  LogVerbatim("TIDGeom") << "DDTIDAxialCableAlgo test: " << solid.name()
+                         << " Polycone made of " << matIn << " from "
+                         << convertRadToDeg(-0.5 * width) << " to "
+                         << convertRadToDeg(0.5 * width) << " and with "
+                         << pconZ.size() << " sections ";
+
+  for (int i = 0; i < (int)(pconZ.size()); i++)
+    LogVerbatim("TIDGeom") << "\t[" << i << "]\tZ = " << pconZ[i]
+                           << "\tRmin = " << pconRmin[i]
+                           << "\tRmax = " << pconRmax[i];
+
+  logs.emplace_back(Volume(solid.name(), solid, ns.material(matIn)));
+
+  // Cable in the outer part
+  name = childName + std::to_string(zposWheel.size() + 1);
+  r = rTop - r;
+  solid = ns.addSolid(name,
+                      Tube(r, rTop, 0.5 * (zEnd - zBend), -0.5 * width, width));
+
+  LogVerbatim("TIDGeom") << "DDTIDAxialCableAlgo test: " << solid.name()
+                         << " Tubs made of " << matOut << " from "
+                         << convertRadToDeg(-0.5 * width) << " to "
+                         << convertRadToDeg(0.5 * width) << " with Rin " << r
+                         << " Rout " << rTop << " ZHalf "
+                         << 0.5 * (zEnd - zBend);
+
+  logs.emplace_back(Volume(solid.name(), solid, ns.material(matOut)));
+
+  // Position the cables
+  constexpr double theta = 90_deg;
+
+  for (int i = 0; i < (int)(angles.size()); i++) {
+    double phix = angles[i];
+    double phiy = phix + 90_deg;
+
+    Rotation3D rotation = cms::makeRotation3D(theta, phix, theta, phiy, 0., 0.);
+    LogVerbatim("TIDGeom") << "DDTIDAxialCableAlgo test: Creating a new "
+                           << "rotation: " << convertRadToDeg(theta) << ", "
+                           << convertRadToDeg(phix) << ", "
+                           << convertRadToDeg(theta) << ", "
+                           << convertRadToDeg(phiy) << ", 0, 0";
+
+    for (int k = 0; k < (int)(logs.size()); k++) {
+      Position tran = Position(0., 0., 0.);
+
+      if (k == ((int)(logs.size()) - 1))
+        tran = Position(0., 0., 0.5 * (zEnd + zBend));
+
+      mother.placeVolume(logs[k], i + 1, Transform3D(rotation, tran));
+
+      LogVerbatim("TIDGeom")
+          << "DDTIDAxialCableAlgo test " << logs[k].name() << " number "
+          << i + 1 << " positioned in " << mother.name() << " at " << tran
+          << " with " << rotation;
+    }
+  }
+  return s_executed;
+}
+} // namespace
+
+// first argument is the type from the xml file
+DECLARE_DDCMS_DETELEMENT(DDCMS_track_DDTIDAxialCableAlgo, algorithm)
diff --git a/Geometry/TrackerCommonData/plugins/dd4hep/DDTrackerRingAlgo.cc b/Geometry/TrackerCommonData/plugins/dd4hep/DDTrackerRingAlgo.cc
index a834ace987a51..9d79e790c8b9e 100644
--- a/Geometry/TrackerCommonData/plugins/dd4hep/DDTrackerRingAlgo.cc
+++ b/Geometry/TrackerCommonData/plugins/dd4hep/DDTrackerRingAlgo.cc
@@ -10,15 +10,15 @@ using namespace geant_units::operators;
 
 namespace {
   long algorithm(Detector& /* description */,
-		 cms::DDParsingContext& ctxt, xml_h e,
-		 SensitiveDetector& /* sens */)
+                 cms::DDParsingContext& ctxt, xml_h e,
+                 SensitiveDetector& /* sens */)
   {
     DDNamespace ns(ctxt, e, true);
     DDAlgoArguments args(ctxt, e);
     Volume mother     = ns.volume(args.parentName());
     string childName  = args.value<string>("ChildName");
-    Volume child      = ns.volume(childName); 
-    
+    Volume child      = ns.volume(childName);
+
     string parentName = args.parentName();
     int n             = args.value<int>("N");
     int startCopyNo   = args.value<int>("StartCopyNo");
@@ -31,95 +31,87 @@ namespace {
     double tiltAngle  = args.value<double>("TiltAngle");
     bool isFlipped    = args.value<int>("IsFlipped") == 1;
     double delta = 0.;
-    
+
     if(abs(rangeAngle - 360.0_deg) < 0.001_deg) {
       delta = rangeAngle/double(n);
     } else {
       if(n > 1) {
-	delta = rangeAngle/double(n-1);
+        delta = rangeAngle/double(n-1);
       } else {
-	delta = 0.;
+        delta = 0.;
       }
     }
-    
+
     LogDebug("TrackerGeom") << "DDTrackerRingAlgo debug: Parameters for position"
-			    << "ing:: n " << n << " Start, Range, Delta "
-			    << convertRadToDeg(startAngle) << " "
-			    << convertRadToDeg(rangeAngle) << " " << convertRadToDeg(delta)
-			    << " Radius " << radius << " Centre " << center[0]
-			    << ", " << center[1] << ", "<< center[2];
-    
+                            << "ing:: n " << n << " Start, Range, Delta "
+                            << convertRadToDeg(startAngle) << " "
+                            << convertRadToDeg(rangeAngle) << " " << convertRadToDeg(delta)
+                            << " Radius " << radius << " Centre " << center[0]
+                            << ", " << center[1] << ", "<< center[2];
+
     LogDebug("TrackerGeom") << "DDTrackerRingAlgo debug: Parent " << parentName
-			    << "\tChild " << childName << " NameSpace "
-			    << ns.name();
-    
-    Rotation3D flipRot, tiltRot, phiRot, globalRot; // Identity
+                            << "\tChild " << childName << " NameSpace "
+                            << ns.name();
+
     Rotation3D flipMatrix, tiltMatrix, phiRotMatrix, globalRotMatrix; // Identity matrix
-    
+
     // flipMatrix calculus
     if(isFlipped) {
       LogDebug("TrackerGeom") << "DDTrackerRingAlgo test: Creating a new rotation: "
-			      << "\t90., 180., "
-			      << "90., 90., "
-			      << "180., 0.";
-      flipRot = makeRotation3D(90._deg, 180._deg, 90._deg, 90._deg, 180._deg, 0._deg);
-      flipMatrix = flipRot;
+                              << "\t90., 180., "
+                              << "90., 90., "
+                              << "180., 0.";
+      flipMatrix = makeRotation3D(90._deg, 180._deg, 90._deg, 90._deg, 180._deg, 0._deg);
     }
     // tiltMatrix calculus
     if(isZPlus) {
       LogDebug("TrackerGeom") << "DDTrackerRingAlgo test: Creating a new rotation: "
-			      << "\t90., 90., "
-			      << convertRadToDeg(tiltAngle) << ", 180., "
-			      << convertRadToDeg(90._deg - tiltAngle) << ", 0.";
-      tiltRot = makeRotation3D(90._deg, 90._deg, tiltAngle, 180._deg, 90._deg - tiltAngle, 0._deg);
-      tiltMatrix = tiltRot;
+                              << "\t90., 90., "
+                              << convertRadToDeg(tiltAngle) << ", 180., "
+                              << convertRadToDeg(90._deg - tiltAngle) << ", 0.";
+      tiltMatrix = makeRotation3D(90._deg, 90._deg, tiltAngle, 180._deg, 90._deg - tiltAngle, 0._deg);
       if(isFlipped) { tiltMatrix *= flipMatrix; }
     }
     else {
       LogDebug("TrackerGeom") << "DDTrackerRingAlgo test: Creating a new rotation: "
-			      << "\t90., 90., "
-			      << convertRadToDeg(tiltAngle) << ", 0., "
-			      << convertRadToDeg(90._deg + tiltAngle) << ", 0.";
-      tiltRot = makeRotation3D(90._deg, 90._deg, tiltAngle, 0._deg, 90._deg + tiltAngle, 0._deg);
-      tiltMatrix = tiltRot;
+                              << "\t90., 90., "
+                              << convertRadToDeg(tiltAngle) << ", 0., "
+                              << convertRadToDeg(90._deg + tiltAngle) << ", 0.";
+      tiltMatrix = makeRotation3D(90._deg, 90._deg, tiltAngle, 0._deg, 90._deg + tiltAngle, 0._deg);
       if(isFlipped) { tiltMatrix *= flipMatrix; }
     }
-    
+
     // Loops for all phi values
     double theta  = 90._deg;
     int    copy   = startCopyNo;
     double phi    = startAngle;
-    
+
     for(int i = 0; i < n; ++i) {
       // phiRotMatrix calculus
       double phix = phi;
       double phiy = phix + 90._deg;
-      double phideg = convertRadToDeg(phix);  
-      if(phideg != 0.) {
-	LogDebug("TrackerGeom") << "DDTrackerRingAlgo test: Creating a new rotation: "
-				<< "\t90., " << convertRadToDeg(phix)
-				<< ", 90.," << convertRadToDeg(phiy)
-				<<", 0., 0.";
-	phiRot = makeRotation3D(theta, phix, theta, phiy, 0., 0.);
-	phiRotMatrix = phiRot;
+      if(phix != 0.) {
+        LogDebug("TrackerGeom") << "DDTrackerRingAlgo test: Creating a new rotation: "
+                                << "\t90., " << convertRadToDeg(phix)
+                                << ", 90.," << convertRadToDeg(phiy)
+                                <<", 0., 0.";
+        phiRotMatrix = makeRotation3D(theta, phix, theta, phiy, 0., 0.);
       }
-      
-      // globalRot def
+
       globalRotMatrix = phiRotMatrix * tiltMatrix;
-      globalRot = Rotation3D(globalRotMatrix);
-      
-      // translation def
+
+     // translation def
       double xpos = radius*cos(phi) + center[0];
       double ypos = radius*sin(phi) + center[1];
       double zpos = center[2];
       Position tran(xpos, ypos, zpos);
-      
+
       // Positions child with respect to parent
-      mother.placeVolume(child, copy, Transform3D(globalRot, tran));
+      mother.placeVolume(child, copy, Transform3D(globalRotMatrix, tran));
       LogDebug("TrackerGeom") << "DDTrackerRingAlgo test " << child << " number "
-			      << copy << " positioned in " << mother << " at "
-			      << tran  << " with " << globalRot;
-      
+                              << copy << " positioned in " << mother << " at "
+                              << tran  << " with " << globalRotMatrix;
+
       copy += incrCopyNo;
       phi  += delta;
     }
@@ -128,4 +120,3 @@ namespace {
 }
 // first argument is the type from the xml file
 DECLARE_DDCMS_DETELEMENT(DDCMS_track_DDTrackerRingAlgo,::algorithm)
-  
diff --git a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc
index 3f9f5efc09bc0..71796d7686de9 100644
--- a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc
+++ b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.cc
@@ -2,22 +2,10 @@
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeomBuilderFromGeometricDet.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
-#include "Geometry/Records/interface/PTrackerParametersRcd.h"
 #include "DetectorDescription/Core/interface/DDCompactView.h"
-#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
-#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
 // Alignments
-#include "CondFormats/Alignment/interface/Alignments.h"
-#include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
-#include "CondFormats/Alignment/interface/AlignmentSurfaceDeformations.h"
 #include "CondFormats/Alignment/interface/DetectorGlobalPosition.h"
-#include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h"
-#include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h"
-#include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h"
-#include "CondFormats/AlignmentRecord/interface/TrackerSurfaceDeformationRcd.h"
 #include "Geometry/CommonTopologies/interface/GeometryAligner.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -32,17 +20,29 @@
 //__________________________________________________________________
 TrackerDigiGeometryESModule::TrackerDigiGeometryESModule(const edm::ParameterSet & p) 
   : alignmentsLabel_(p.getParameter<std::string>("alignmentsLabel")),
-    myLabel_(p.getParameter<std::string>("appendToDataLabel"))
+    myLabel_(p.getParameter<std::string>("appendToDataLabel")),
+    applyAlignment_(p.getParameter<bool>("applyAlignment"))
 {
-    applyAlignment_ = p.getParameter<bool>("applyAlignment");
-    fromDDD_ = p.getParameter<bool>("fromDDD");
+  {
+    auto cc = setWhatProduced(this);
+    const edm::ESInputTag kEmptyTag;
+    geometricDetToken_ = cc.consumesFrom<GeometricDet,IdealGeometryRecord>(kEmptyTag);
+    trackerTopoToken_ = cc.consumesFrom<TrackerTopology,TrackerTopologyRcd>(kEmptyTag);
+    trackerParamsToken_ = cc.consumesFrom<PTrackerParameters,PTrackerParametersRcd>(kEmptyTag);
 
-    setWhatProduced(this);
+    if(applyAlignment_) {
+      const edm::ESInputTag kAlignTag{"",alignmentsLabel_};
+      globalAlignmentToken_ = cc.consumesFrom<Alignments,GlobalPositionRcd>(kAlignTag);
+      trackerAlignmentToken_ = cc.consumesFrom<Alignments,TrackerAlignmentRcd>(kAlignTag);
+      alignmentErrorsToken_ = cc.consumesFrom<AlignmentErrorsExtended, TrackerAlignmentErrorExtendedRcd>(kAlignTag);
+      deformationsToken_ = cc.consumesFrom<AlignmentSurfaceDeformations, TrackerSurfaceDeformationRcd>(kAlignTag);
+    }
+  }
 
-    edm::LogInfo("Geometry") << "@SUB=TrackerDigiGeometryESModule"
-			     << "Label '" << myLabel_ << "' "
-			     << (applyAlignment_ ? "looking for" : "IGNORING")
-			     << " alignment labels '" << alignmentsLabel_ << "'.";
+  edm::LogInfo("Geometry") << "@SUB=TrackerDigiGeometryESModule"
+                           << "Label '" << myLabel_ << "' "
+                           << (applyAlignment_ ? "looking for" : "IGNORING")
+                           << " alignment labels '" << alignmentsLabel_ << "'.";
 }
 
 //__________________________________________________________________
@@ -73,51 +73,43 @@ TrackerDigiGeometryESModule::produce(const TrackerDigiGeometryRecord & iRecord)
   //
   // Called whenever the alignments, alignment errors or global positions change
   //
-  edm::ESHandle<GeometricDet> gD;
-  iRecord.getRecord<IdealGeometryRecord>().get( gD );
+  auto const& gD = iRecord.get( geometricDetToken_ );
 
-  edm::ESHandle<TrackerTopology> tTopoHand;
-  iRecord.getRecord<TrackerTopologyRcd>().get(tTopoHand);
-  const TrackerTopology *tTopo=tTopoHand.product();
+  auto const& tTopo = iRecord.get(trackerTopoToken_);
 
-  edm::ESHandle<PTrackerParameters> ptp;
-  iRecord.getRecord<PTrackerParametersRcd>().get( ptp );
+  auto const& ptp = iRecord.get( trackerParamsToken_ );
   
   TrackerGeomBuilderFromGeometricDet builder;
-  std::unique_ptr<TrackerGeometry> tracker(builder.build(&(*gD), *ptp, tTopo));
+  std::unique_ptr<TrackerGeometry> tracker(builder.build(&gD, ptp, &tTopo));
 
   if (applyAlignment_) {
     // Since fake is fully working when checking for 'empty', we should get rid of applyAlignment_!
-    edm::ESHandle<Alignments> globalPosition;
-    iRecord.getRecord<GlobalPositionRcd>().get(alignmentsLabel_, globalPosition);
-    edm::ESHandle<Alignments> alignments;
-    iRecord.getRecord<TrackerAlignmentRcd>().get(alignmentsLabel_, alignments);
-    edm::ESHandle<AlignmentErrorsExtended> alignmentErrors;
-    iRecord.getRecord<TrackerAlignmentErrorExtendedRcd>().get(alignmentsLabel_, alignmentErrors);
+    auto const& globalPosition = iRecord.get( globalAlignmentToken_ );
+    auto const& alignments = iRecord.get( trackerAlignmentToken_ );
+    auto const& alignmentErrors = iRecord.get( alignmentErrorsToken_ );
     // apply if not empty:
-    if (alignments->empty() && alignmentErrors->empty() && globalPosition->empty()) {
+    if (alignments.empty() && alignmentErrors.empty() && globalPosition.empty()) {
       edm::LogInfo("Config") << "@SUB=TrackerDigiGeometryRecord::produce"
 			     << "Alignment(Error)s and global position (label '"
 	 		     << alignmentsLabel_ << "') empty: Geometry producer (label "
 			     << "'" << myLabel_ << "') assumes fake and does not apply.";
     } else {
       GeometryAligner ali;
-      ali.applyAlignments<TrackerGeometry>(&(*tracker), &(*alignments), &(*alignmentErrors),
-                                           align::DetectorGlobalPosition(*globalPosition,
+      ali.applyAlignments<TrackerGeometry>(tracker.get(), &(alignments), &(alignmentErrors),
+                                           align::DetectorGlobalPosition(globalPosition,
                                                                          DetId(DetId::Tracker)));
     }
 
-    edm::ESHandle<AlignmentSurfaceDeformations> surfaceDeformations;
-    iRecord.getRecord<TrackerSurfaceDeformationRcd>().get(alignmentsLabel_, surfaceDeformations);
+    auto const& surfaceDeformations = iRecord.get( deformationsToken_ );
     // apply if not empty:
-    if (surfaceDeformations->empty()) {
+    if (surfaceDeformations.empty()) {
       edm::LogInfo("Config") << "@SUB=TrackerDigiGeometryRecord::produce"
 			     << "AlignmentSurfaceDeformations (label '"
 			     << alignmentsLabel_ << "') empty: Geometry producer (label "
 			     << "'" << myLabel_ << "') assumes fake and does not apply.";
     } else {
       GeometryAligner ali;
-      ali.attachSurfaceDeformations<TrackerGeometry>(&(*tracker), &(*surfaceDeformations));
+      ali.attachSurfaceDeformations<TrackerGeometry>(tracker.get(), &(surfaceDeformations));
     }
   }
   
diff --git a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.h b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.h
index e99c0da189bc0..e6906ce369de1 100644
--- a/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.h
+++ b/Geometry/TrackerGeometryBuilder/plugins/TrackerDigiGeometryESModule.h
@@ -4,7 +4,21 @@
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+#include "Geometry/Records/interface/IdealGeometryRecord.h"
+#include "Geometry/Records/interface/PTrackerParametersRcd.h"
+#include "CondFormats/AlignmentRecord/interface/GlobalPositionRcd.h"
+#include "CondFormats/AlignmentRecord/interface/TrackerAlignmentRcd.h"
+#include "CondFormats/AlignmentRecord/interface/TrackerAlignmentErrorExtendedRcd.h"
+#include "CondFormats/AlignmentRecord/interface/TrackerSurfaceDeformationRcd.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
+#include "CondFormats/GeometryObjects/interface/PTrackerParameters.h"
+
+#include "CondFormats/Alignment/interface/Alignments.h"
+#include "CondFormats/Alignment/interface/AlignmentErrorsExtended.h"
+#include "CondFormats/Alignment/interface/AlignmentSurfaceDeformations.h"
+
 #include <memory>
 
 #include <string>
@@ -25,13 +39,18 @@ class  TrackerDigiGeometryESModule: public edm::ESProducer{
   /// Called when geometry description changes
   const std::string alignmentsLabel_;
   const std::string myLabel_;
-  bool applyAlignment_; // Switch to apply alignment corrections
-  bool fromDDD_;
-};
 
+  edm::ESGetToken<GeometricDet,IdealGeometryRecord> geometricDetToken_;
+  edm::ESGetToken<TrackerTopology,TrackerTopologyRcd> trackerTopoToken_;
+  edm::ESGetToken<PTrackerParameters,PTrackerParametersRcd> trackerParamsToken_;
 
-#endif
-
+  edm::ESGetToken<Alignments,GlobalPositionRcd> globalAlignmentToken_;
+  edm::ESGetToken<Alignments,TrackerAlignmentRcd> trackerAlignmentToken_;
+  edm::ESGetToken<AlignmentErrorsExtended, TrackerAlignmentErrorExtendedRcd> alignmentErrorsToken_;
+  edm::ESGetToken<AlignmentSurfaceDeformations, TrackerSurfaceDeformationRcd> deformationsToken_;
 
+  const bool applyAlignment_; // Switch to apply alignment corrections
+};
 
 
+#endif
diff --git a/Geometry/TrackerNumberingBuilder/plugins/CmsTrackerPhase1DiskBuilder.cc b/Geometry/TrackerNumberingBuilder/plugins/CmsTrackerPhase1DiskBuilder.cc
index 5f31415b14711..99e6663a3c557 100644
--- a/Geometry/TrackerNumberingBuilder/plugins/CmsTrackerPhase1DiskBuilder.cc
+++ b/Geometry/TrackerNumberingBuilder/plugins/CmsTrackerPhase1DiskBuilder.cc
@@ -26,8 +26,6 @@ CmsTrackerPhase1DiskBuilder::PhiPosNegSplit_innerOuter( std::vector< GeometricDe
 
   // now put positive phi (in order) ahead of negative phi as in std geometry
   std::vector<const GeometricDet*> theCompsPosNeg;
-  theCompsPosNeg.empty();
-  theCompsPosNeg.clear();
   // also find the average radius (used to split inner and outer disk panels)
   double theRmin = (**begin).rho();
   double theRmax = theRmin;
@@ -47,8 +45,6 @@ CmsTrackerPhase1DiskBuilder::PhiPosNegSplit_innerOuter( std::vector< GeometricDe
   // force the split radius to be 100 mm to be able to deal with disks with only outer ring
   double radius_split = 100.;
   std::vector<const GeometricDet*> theCompsInnerOuter;
-  theCompsInnerOuter.empty();
-  theCompsInnerOuter.clear();
   unsigned int num_inner = 0;
   for(vector<const GeometricDet*>::const_iterator it=theCompsPosNeg.begin();
       it!=theCompsPosNeg.end();it++){
diff --git a/Geometry/TrackerNumberingBuilder/plugins/CmsTrackerPhase2TPDiskBuilder.cc b/Geometry/TrackerNumberingBuilder/plugins/CmsTrackerPhase2TPDiskBuilder.cc
index 89635baa65bda..9d5fedda2db4f 100644
--- a/Geometry/TrackerNumberingBuilder/plugins/CmsTrackerPhase2TPDiskBuilder.cc
+++ b/Geometry/TrackerNumberingBuilder/plugins/CmsTrackerPhase2TPDiskBuilder.cc
@@ -26,8 +26,6 @@ CmsTrackerPhase2TPDiskBuilder::PhiPosNegSplit_innerOuter( std::vector< Geometric
 
   // now put positive phi (in order) ahead of negative phi as in std geometry
   std::vector<const GeometricDet*> theCompsPosNeg;
-  theCompsPosNeg.empty();
-  theCompsPosNeg.clear();
   // also find the average radius (used to split inner and outer disk panels)
   double theRmin = (**begin).rho();
   double theRmax = theRmin;
@@ -47,8 +45,6 @@ CmsTrackerPhase2TPDiskBuilder::PhiPosNegSplit_innerOuter( std::vector< Geometric
   // force the split radius to be 100 mm to be able to deal with disks with only outer ring
   double radius_split = 100.;
   std::vector<const GeometricDet*> theCompsInnerOuter;
-  theCompsInnerOuter.empty();
-  theCompsInnerOuter.clear();
   unsigned int num_inner = 0;
   for(vector<const GeometricDet*>::const_iterator it=theCompsPosNeg.begin();
       it!=theCompsPosNeg.end();it++){
diff --git a/Geometry/TrackerNumberingBuilder/test/dumpSimGeometry_cfg.py b/Geometry/TrackerNumberingBuilder/test/dumpSimGeometry_cfg.py
index 71bfe64b328c1..bf3e25341d2e6 100644
--- a/Geometry/TrackerNumberingBuilder/test/dumpSimGeometry_cfg.py
+++ b/Geometry/TrackerNumberingBuilder/test/dumpSimGeometry_cfg.py
@@ -4,7 +4,7 @@
 import FWCore.ParameterSet.VarParsing as VarParsing
 from FWCore.Utilities.Enumerate import Enumerate
 
-varType = Enumerate ("Run1 Ideal2015 Ideal2015dev 2015 2015dev GEMDev RPC4RE11 2017 2019 2023 2023dev 2023sim 2023Muon MaPSA CRack DB")
+varType = Enumerate ("Run1 Ideal2015 Ideal2015dev 2015 2015dev GEMDev RPC4RE11 2017 2021 2023 2023dev 2023sim 2023Muon MaPSA CRack DB")
 
 def help():
    print("Usage: cmsRun dumpSimGeometry_cfg.py  tag=TAG ")
@@ -43,8 +43,8 @@ def simGeoLoad(score):
     elif score == "2017":
        process.load('Geometry.CMSCommonData.cmsExtendedGeometry2017XML_cfi')
        
-    elif score == "2019":
-       process.load('Configuration.Geometry.GeometryExtended2019Reco_cff')
+    elif score == "2021":
+       process.load('Configuration.Geometry.GeometryExtended2021Reco_cff')
   
     elif score == "2023dev":
        process.load('Geometry.CMSCommonData.cmsExtendedGeometry2023devXML_cfi')
diff --git a/Geometry/TrackerRecoData/data/PhaseII/TiltedTracker461/trackerRecoMaterial.xml b/Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml
similarity index 96%
rename from Geometry/TrackerRecoData/data/PhaseII/TiltedTracker461/trackerRecoMaterial.xml
rename to Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml
index a6b7b78c44322..314a6056410d8 100644
--- a/Geometry/TrackerRecoData/data/PhaseII/TiltedTracker461/trackerRecoMaterial.xml
+++ b/Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!--
 ============= XML GENERATION METADATA HEADER =============
-tkLayout revision: dev_gabie-2972-e516bb8 on git@github.com:ghugo83/tkLayout.git
+tkLayout revision: XMLs_2019_04_25_IT_MB_boom-3166-96d0380 on git@github.com:ghugo83/tkLayout.git
 generated by: Gabrielle Hugo (ghugo on hpsilicon2.dyndns.cern.ch)
-generation date: 2018-11-22.18:27:10
-note: see OT614_200_IT461_2018_11_22.cfg for full config files
+generation date: 2019-04-25.18:00:02
+note: see OT616_200_IT613_2019_04_25.cfg for full config files
 =========== END XML GENERATION METADATA HEADER ===========
 -->
 <DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
@@ -21,8 +21,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//pixbar:Phase2PixelBarrel/pixel:Layer1/pixel:RodFlipped1/pixel:BModule3Layer1/pixel:BModule3Layer1InnerPixelwafer/pixel:BModule3Layer1InnerPixelActive"/>
 <PartSelector path="//pixbar:Phase2PixelBarrel/pixel:Layer1/pixel:RodFlipped1/pixel:BModule4Layer1/pixel:BModule4Layer1InnerPixelwafer/pixel:BModule4Layer1InnerPixelActive"/>
 <PartSelector path="//pixbar:Phase2PixelBarrel/pixel:Layer1/pixel:RodFlipped1/pixel:BModule5Layer1/pixel:BModule5Layer1InnerPixelwafer/pixel:BModule5Layer1InnerPixelActive"/>
-<Parameter name="TrackerRadLength" value="0.017923"/>
-<Parameter name="TrackerXi" value="3.58461e-05"/>
+<Parameter name="TrackerRadLength" value="0.01868"/>
+<Parameter name="TrackerXi" value="3.736e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2PixelBarrelLayer2" eval="true">
@@ -36,8 +36,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//pixbar:Phase2PixelBarrel/pixel:Layer2/pixel:RodFlipped2/pixel:BModule3Layer2/pixel:BModule3Layer2InnerPixelwafer/pixel:BModule3Layer2InnerPixelActive"/>
 <PartSelector path="//pixbar:Phase2PixelBarrel/pixel:Layer2/pixel:RodFlipped2/pixel:BModule4Layer2/pixel:BModule4Layer2InnerPixelwafer/pixel:BModule4Layer2InnerPixelActive"/>
 <PartSelector path="//pixbar:Phase2PixelBarrel/pixel:Layer2/pixel:RodFlipped2/pixel:BModule5Layer2/pixel:BModule5Layer2InnerPixelwafer/pixel:BModule5Layer2InnerPixelActive"/>
-<Parameter name="TrackerRadLength" value="0.0170168"/>
-<Parameter name="TrackerXi" value="3.40336e-05"/>
+<Parameter name="TrackerRadLength" value="0.01868"/>
+<Parameter name="TrackerXi" value="3.736e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2PixelBarrelLayer3" eval="true">
@@ -51,8 +51,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//pixbar:Phase2PixelBarrel/pixel:Layer3/pixel:RodFlipped3/pixel:BModule3Layer3/pixel:BModule3Layer3InnerPixelwafer/pixel:BModule3Layer3InnerPixelActive"/>
 <PartSelector path="//pixbar:Phase2PixelBarrel/pixel:Layer3/pixel:RodFlipped3/pixel:BModule4Layer3/pixel:BModule4Layer3InnerPixelwafer/pixel:BModule4Layer3InnerPixelActive"/>
 <PartSelector path="//pixbar:Phase2PixelBarrel/pixel:Layer3/pixel:RodFlipped3/pixel:BModule5Layer3/pixel:BModule5Layer3InnerPixelwafer/pixel:BModule5Layer3InnerPixelActive"/>
-<Parameter name="TrackerRadLength" value="0.0158165"/>
-<Parameter name="TrackerXi" value="3.1633e-05"/>
+<Parameter name="TrackerRadLength" value="0.0147835"/>
+<Parameter name="TrackerXi" value="2.95669e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2PixelBarrelLayer4" eval="true">
@@ -66,8 +66,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//pixbar:Phase2PixelBarrel/pixel:Layer4/pixel:RodFlipped4/pixel:BModule3Layer4/pixel:BModule3Layer4InnerPixelwafer/pixel:BModule3Layer4InnerPixelActive"/>
 <PartSelector path="//pixbar:Phase2PixelBarrel/pixel:Layer4/pixel:RodFlipped4/pixel:BModule4Layer4/pixel:BModule4Layer4InnerPixelwafer/pixel:BModule4Layer4InnerPixelActive"/>
 <PartSelector path="//pixbar:Phase2PixelBarrel/pixel:Layer4/pixel:RodFlipped4/pixel:BModule5Layer4/pixel:BModule5Layer4InnerPixelwafer/pixel:BModule5Layer4InnerPixelActive"/>
-<Parameter name="TrackerRadLength" value="0.0158165"/>
-<Parameter name="TrackerXi" value="3.1633e-05"/>
+<Parameter name="TrackerRadLength" value="0.0147835"/>
+<Parameter name="TrackerXi" value="2.95669e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2PixelForwardDisk1" eval="true">
@@ -75,8 +75,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc1/pixel:Ring2Disc1/pixel:EModule2Disc1/pixel:EModule2Disc1InnerPixelwafer/pixel:EModule2Disc1InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc1/pixel:Ring3Disc1/pixel:EModule3Disc1/pixel:EModule3Disc1InnerPixelwafer/pixel:EModule3Disc1InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc1/pixel:Ring4Disc1/pixel:EModule4Disc1/pixel:EModule4Disc1InnerPixelwafer/pixel:EModule4Disc1InnerPixelActive"/>
-<Parameter name="TrackerRadLength" value="0.0153"/>
-<Parameter name="TrackerXi" value="3.06e-05"/>
+<Parameter name="TrackerRadLength" value="0.0133596"/>
+<Parameter name="TrackerXi" value="2.67192e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2PixelForwardDisk2" eval="true">
@@ -84,8 +84,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc2/pixel:Ring2Disc2/pixel:EModule2Disc2/pixel:EModule2Disc2InnerPixelwafer/pixel:EModule2Disc2InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc2/pixel:Ring3Disc2/pixel:EModule3Disc2/pixel:EModule3Disc2InnerPixelwafer/pixel:EModule3Disc2InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc2/pixel:Ring4Disc2/pixel:EModule4Disc2/pixel:EModule4Disc2InnerPixelwafer/pixel:EModule4Disc2InnerPixelActive"/>
-<Parameter name="TrackerRadLength" value="0.0153"/>
-<Parameter name="TrackerXi" value="3.06e-05"/>
+<Parameter name="TrackerRadLength" value="0.0133596"/>
+<Parameter name="TrackerXi" value="2.67192e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2PixelForwardDisk3" eval="true">
@@ -93,8 +93,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc3/pixel:Ring2Disc3/pixel:EModule2Disc3/pixel:EModule2Disc3InnerPixelwafer/pixel:EModule2Disc3InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc3/pixel:Ring3Disc3/pixel:EModule3Disc3/pixel:EModule3Disc3InnerPixelwafer/pixel:EModule3Disc3InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc3/pixel:Ring4Disc3/pixel:EModule4Disc3/pixel:EModule4Disc3InnerPixelwafer/pixel:EModule4Disc3InnerPixelActive"/>
-<Parameter name="TrackerRadLength" value="0.0153"/>
-<Parameter name="TrackerXi" value="3.06e-05"/>
+<Parameter name="TrackerRadLength" value="0.0133596"/>
+<Parameter name="TrackerXi" value="2.67192e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2PixelForwardDisk4" eval="true">
@@ -102,8 +102,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc4/pixel:Ring2Disc4/pixel:EModule2Disc4/pixel:EModule2Disc4InnerPixelwafer/pixel:EModule2Disc4InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc4/pixel:Ring3Disc4/pixel:EModule3Disc4/pixel:EModule3Disc4InnerPixelwafer/pixel:EModule3Disc4InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc4/pixel:Ring4Disc4/pixel:EModule4Disc4/pixel:EModule4Disc4InnerPixelwafer/pixel:EModule4Disc4InnerPixelActive"/>
-<Parameter name="TrackerRadLength" value="0.0153"/>
-<Parameter name="TrackerXi" value="3.06e-05"/>
+<Parameter name="TrackerRadLength" value="0.0133596"/>
+<Parameter name="TrackerXi" value="2.67192e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2PixelForwardDisk5" eval="true">
@@ -111,8 +111,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc5/pixel:Ring2Disc5/pixel:EModule2Disc5/pixel:EModule2Disc5InnerPixelwafer/pixel:EModule2Disc5InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc5/pixel:Ring3Disc5/pixel:EModule3Disc5/pixel:EModule3Disc5InnerPixelwafer/pixel:EModule3Disc5InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc5/pixel:Ring4Disc5/pixel:EModule4Disc5/pixel:EModule4Disc5InnerPixelwafer/pixel:EModule4Disc5InnerPixelActive"/>
-<Parameter name="TrackerRadLength" value="0.0153"/>
-<Parameter name="TrackerXi" value="3.06e-05"/>
+<Parameter name="TrackerRadLength" value="0.0133596"/>
+<Parameter name="TrackerXi" value="2.67192e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2PixelForwardDisk6" eval="true">
@@ -120,8 +120,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc6/pixel:Ring2Disc6/pixel:EModule2Disc6/pixel:EModule2Disc6InnerPixelwafer/pixel:EModule2Disc6InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc6/pixel:Ring3Disc6/pixel:EModule3Disc6/pixel:EModule3Disc6InnerPixelwafer/pixel:EModule3Disc6InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc6/pixel:Ring4Disc6/pixel:EModule4Disc6/pixel:EModule4Disc6InnerPixelwafer/pixel:EModule4Disc6InnerPixelActive"/>
-<Parameter name="TrackerRadLength" value="0.0153"/>
-<Parameter name="TrackerXi" value="3.06e-05"/>
+<Parameter name="TrackerRadLength" value="0.0133596"/>
+<Parameter name="TrackerXi" value="2.67192e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2PixelForwardDisk7" eval="true">
@@ -129,8 +129,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc7/pixel:Ring2Disc7/pixel:EModule2Disc7/pixel:EModule2Disc7InnerPixelwafer/pixel:EModule2Disc7InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc7/pixel:Ring3Disc7/pixel:EModule3Disc7/pixel:EModule3Disc7InnerPixelwafer/pixel:EModule3Disc7InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc7/pixel:Ring4Disc7/pixel:EModule4Disc7/pixel:EModule4Disc7InnerPixelwafer/pixel:EModule4Disc7InnerPixelActive"/>
-<Parameter name="TrackerRadLength" value="0.0153"/>
-<Parameter name="TrackerXi" value="3.06e-05"/>
+<Parameter name="TrackerRadLength" value="0.0133596"/>
+<Parameter name="TrackerXi" value="2.67192e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2PixelForwardDisk8" eval="true">
@@ -138,8 +138,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc8/pixel:Ring2Disc8/pixel:EModule2Disc8/pixel:EModule2Disc8InnerPixelwafer/pixel:EModule2Disc8InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc8/pixel:Ring3Disc8/pixel:EModule3Disc8/pixel:EModule3Disc8InnerPixelwafer/pixel:EModule3Disc8InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc8/pixel:Ring4Disc8/pixel:EModule4Disc8/pixel:EModule4Disc8InnerPixelwafer/pixel:EModule4Disc8InnerPixelActive"/>
-<Parameter name="TrackerRadLength" value="0.0153"/>
-<Parameter name="TrackerXi" value="3.06e-05"/>
+<Parameter name="TrackerRadLength" value="0.0133596"/>
+<Parameter name="TrackerXi" value="2.67192e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2PixelForwardDisk9" eval="true">
@@ -148,8 +148,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc9/pixel:Ring3Disc9/pixel:EModule3Disc9/pixel:EModule3Disc9InnerPixelwafer/pixel:EModule3Disc9InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc9/pixel:Ring4Disc9/pixel:EModule4Disc9/pixel:EModule4Disc9InnerPixelwafer/pixel:EModule4Disc9InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc9/pixel:Ring5Disc9/pixel:EModule5Disc9/pixel:EModule5Disc9InnerPixelwafer/pixel:EModule5Disc9InnerPixelActive"/>
-<Parameter name="TrackerRadLength" value="0.0152921"/>
-<Parameter name="TrackerXi" value="3.05843e-05"/>
+<Parameter name="TrackerRadLength" value="0.0199721"/>
+<Parameter name="TrackerXi" value="3.99442e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2PixelForwardDisk10" eval="true">
@@ -158,8 +158,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc10/pixel:Ring3Disc10/pixel:EModule3Disc10/pixel:EModule3Disc10InnerPixelwafer/pixel:EModule3Disc10InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc10/pixel:Ring4Disc10/pixel:EModule4Disc10/pixel:EModule4Disc10InnerPixelwafer/pixel:EModule4Disc10InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc10/pixel:Ring5Disc10/pixel:EModule5Disc10/pixel:EModule5Disc10InnerPixelwafer/pixel:EModule5Disc10InnerPixelActive"/>
-<Parameter name="TrackerRadLength" value="0.0152921"/>
-<Parameter name="TrackerXi" value="3.05843e-05"/>
+<Parameter name="TrackerRadLength" value="0.0199721"/>
+<Parameter name="TrackerXi" value="3.99442e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2PixelForwardDisk11" eval="true">
@@ -168,8 +168,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc11/pixel:Ring3Disc11/pixel:EModule3Disc11/pixel:EModule3Disc11InnerPixelwafer/pixel:EModule3Disc11InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc11/pixel:Ring4Disc11/pixel:EModule4Disc11/pixel:EModule4Disc11InnerPixelwafer/pixel:EModule4Disc11InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc11/pixel:Ring5Disc11/pixel:EModule5Disc11/pixel:EModule5Disc11InnerPixelwafer/pixel:EModule5Disc11InnerPixelActive"/>
-<Parameter name="TrackerRadLength" value="0.0152921"/>
-<Parameter name="TrackerXi" value="3.05843e-05"/>
+<Parameter name="TrackerRadLength" value="0.0199721"/>
+<Parameter name="TrackerXi" value="3.99442e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2PixelForwardDisk12" eval="true">
@@ -178,8 +178,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc12/pixel:Ring3Disc12/pixel:EModule3Disc12/pixel:EModule3Disc12InnerPixelwafer/pixel:EModule3Disc12InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc12/pixel:Ring4Disc12/pixel:EModule4Disc12/pixel:EModule4Disc12InnerPixelwafer/pixel:EModule4Disc12InnerPixelActive"/>
 <PartSelector path="//pixfwd:Phase2PixelEndcap/pixel:Disc12/pixel:Ring5Disc12/pixel:EModule5Disc12/pixel:EModule5Disc12InnerPixelwafer/pixel:EModule5Disc12InnerPixelActive"/>
-<Parameter name="TrackerRadLength" value="0.0152921"/>
-<Parameter name="TrackerXi" value="3.05843e-05"/>
+<Parameter name="TrackerRadLength" value="0.0199721"/>
+<Parameter name="TrackerXi" value="3.99442e-05"/>
 </SpecPar>
 
 
@@ -240,8 +240,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//Phase2OTBarrel/tracker:Layer1/tracker:Ring15Layer1Plus/tracker:BModule15Layer1/BModule15Layer1Upperwafer/BModule15Layer1UpperPSStripactive"/>
 <PartSelector path="//Phase2OTBarrel/tracker:Layer1/tracker:Ring16Layer1Plus/tracker:BModule16Layer1/BModule16Layer1Lowerwafer/BModule16Layer1LowerPSMacroPixelactive"/>
 <PartSelector path="//Phase2OTBarrel/tracker:Layer1/tracker:Ring16Layer1Plus/tracker:BModule16Layer1/BModule16Layer1Upperwafer/BModule16Layer1UpperPSStripactive"/>
-<Parameter name="TrackerRadLength" value="0.0411262"/>
-<Parameter name="TrackerXi" value="8.22524e-05"/>
+<Parameter name="TrackerRadLength" value="0.0412022"/>
+<Parameter name="TrackerXi" value="8.24044e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2OTBarrelLayer2" eval="true">
@@ -305,8 +305,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//Phase2OTBarrel/tracker:Layer2/tracker:Ring17Layer2Plus/tracker:BModule17Layer2/BModule17Layer2Upperwafer/BModule17Layer2UpperPSStripactive"/>
 <PartSelector path="//Phase2OTBarrel/tracker:Layer2/tracker:Ring18Layer2Plus/tracker:BModule18Layer2/BModule18Layer2Lowerwafer/BModule18Layer2LowerPSMacroPixelactive"/>
 <PartSelector path="//Phase2OTBarrel/tracker:Layer2/tracker:Ring18Layer2Plus/tracker:BModule18Layer2/BModule18Layer2Upperwafer/BModule18Layer2UpperPSStripactive"/>
-<Parameter name="TrackerRadLength" value="0.0391581"/>
-<Parameter name="TrackerXi" value="7.83162e-05"/>
+<Parameter name="TrackerRadLength" value="0.0392285"/>
+<Parameter name="TrackerXi" value="7.84571e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2OTBarrelLayer3" eval="true">
@@ -374,8 +374,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//Phase2OTBarrel/tracker:Layer3/tracker:Ring19Layer3Plus/tracker:BModule19Layer3/BModule19Layer3Upperwafer/BModule19Layer3UpperPSStripactive"/>
 <PartSelector path="//Phase2OTBarrel/tracker:Layer3/tracker:Ring20Layer3Plus/tracker:BModule20Layer3/BModule20Layer3Lowerwafer/BModule20Layer3LowerPSMacroPixelactive"/>
 <PartSelector path="//Phase2OTBarrel/tracker:Layer3/tracker:Ring20Layer3Plus/tracker:BModule20Layer3/BModule20Layer3Upperwafer/BModule20Layer3UpperPSStripactive"/>
-<Parameter name="TrackerRadLength" value="0.0383637"/>
-<Parameter name="TrackerXi" value="7.67275e-05"/>
+<Parameter name="TrackerRadLength" value="0.0384327"/>
+<Parameter name="TrackerXi" value="7.68654e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2OTBarrelLayer4" eval="true">
@@ -403,8 +403,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//Phase2OTBarrel/tracker:Layer4/tracker:Rod4/tracker:BModule11Layer4/BModule11Layer4Upperwafer/BModule11Layer4Upper2Sactive"/>
 <PartSelector path="//Phase2OTBarrel/tracker:Layer4/tracker:Rod4/tracker:BModule12Layer4/BModule12Layer4Lowerwafer/BModule12Layer4Lower2Sactive"/>
 <PartSelector path="//Phase2OTBarrel/tracker:Layer4/tracker:Rod4/tracker:BModule12Layer4/BModule12Layer4Upperwafer/BModule12Layer4Upper2Sactive"/>
-<Parameter name="TrackerRadLength" value="0.0162103"/>
-<Parameter name="TrackerXi" value="3.24207e-05"/>
+<Parameter name="TrackerRadLength" value="0.0162202"/>
+<Parameter name="TrackerXi" value="3.24403e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2OTBarrelLayer5" eval="true">
@@ -432,8 +432,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//Phase2OTBarrel/tracker:Layer5/tracker:Rod5/tracker:BModule11Layer5/BModule11Layer5Upperwafer/BModule11Layer5Upper2Sactive"/>
 <PartSelector path="//Phase2OTBarrel/tracker:Layer5/tracker:Rod5/tracker:BModule12Layer5/BModule12Layer5Lowerwafer/BModule12Layer5Lower2Sactive"/>
 <PartSelector path="//Phase2OTBarrel/tracker:Layer5/tracker:Rod5/tracker:BModule12Layer5/BModule12Layer5Upperwafer/BModule12Layer5Upper2Sactive"/>
-<Parameter name="TrackerRadLength" value="0.0162103"/>
-<Parameter name="TrackerXi" value="3.24207e-05"/>
+<Parameter name="TrackerRadLength" value="0.0162202"/>
+<Parameter name="TrackerXi" value="3.24403e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2OTBarrelLayer6" eval="true">
@@ -461,8 +461,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//Phase2OTBarrel/tracker:Layer6/tracker:Rod6/tracker:BModule11Layer6/BModule11Layer6Upperwafer/BModule11Layer6Upper2Sactive"/>
 <PartSelector path="//Phase2OTBarrel/tracker:Layer6/tracker:Rod6/tracker:BModule12Layer6/BModule12Layer6Lowerwafer/BModule12Layer6Lower2Sactive"/>
 <PartSelector path="//Phase2OTBarrel/tracker:Layer6/tracker:Rod6/tracker:BModule12Layer6/BModule12Layer6Upperwafer/BModule12Layer6Upper2Sactive"/>
-<Parameter name="TrackerRadLength" value="0.0162103"/>
-<Parameter name="TrackerXi" value="3.24207e-05"/>
+<Parameter name="TrackerRadLength" value="0.0162202"/>
+<Parameter name="TrackerXi" value="3.24403e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2OTForwardDisk1" eval="true">
@@ -496,8 +496,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//Phase2OTForward/tracker:Disc1/tracker:Ring14Disc1/tracker:EModule14Disc1/EModule14Disc1Upperwafer/EModule14Disc1Upper2Sactive"/>
 <PartSelector path="//Phase2OTForward/tracker:Disc1/tracker:Ring15Disc1/tracker:EModule15Disc1/EModule15Disc1Lowerwafer/EModule15Disc1Lower2Sactive"/>
 <PartSelector path="//Phase2OTForward/tracker:Disc1/tracker:Ring15Disc1/tracker:EModule15Disc1/EModule15Disc1Upperwafer/EModule15Disc1Upper2Sactive"/>
-<Parameter name="TrackerRadLength" value="0.0254861"/>
-<Parameter name="TrackerXi" value="5.09722e-05"/>
+<Parameter name="TrackerRadLength" value="0.0255039"/>
+<Parameter name="TrackerXi" value="5.10078e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2OTForwardDisk2" eval="true">
@@ -531,8 +531,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//Phase2OTForward/tracker:Disc2/tracker:Ring14Disc2/tracker:EModule14Disc2/EModule14Disc2Upperwafer/EModule14Disc2Upper2Sactive"/>
 <PartSelector path="//Phase2OTForward/tracker:Disc2/tracker:Ring15Disc2/tracker:EModule15Disc2/EModule15Disc2Lowerwafer/EModule15Disc2Lower2Sactive"/>
 <PartSelector path="//Phase2OTForward/tracker:Disc2/tracker:Ring15Disc2/tracker:EModule15Disc2/EModule15Disc2Upperwafer/EModule15Disc2Upper2Sactive"/>
-<Parameter name="TrackerRadLength" value="0.0254861"/>
-<Parameter name="TrackerXi" value="5.09722e-05"/>
+<Parameter name="TrackerRadLength" value="0.0255039"/>
+<Parameter name="TrackerXi" value="5.10078e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2OTForwardDisk3" eval="true">
@@ -560,8 +560,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//Phase2OTForward/tracker:Disc3/tracker:Ring14Disc3/tracker:EModule14Disc3/EModule14Disc3Upperwafer/EModule14Disc3Upper2Sactive"/>
 <PartSelector path="//Phase2OTForward/tracker:Disc3/tracker:Ring15Disc3/tracker:EModule15Disc3/EModule15Disc3Lowerwafer/EModule15Disc3Lower2Sactive"/>
 <PartSelector path="//Phase2OTForward/tracker:Disc3/tracker:Ring15Disc3/tracker:EModule15Disc3/EModule15Disc3Upperwafer/EModule15Disc3Upper2Sactive"/>
-<Parameter name="TrackerRadLength" value="0.0243958"/>
-<Parameter name="TrackerXi" value="4.87917e-05"/>
+<Parameter name="TrackerRadLength" value="0.0244127"/>
+<Parameter name="TrackerXi" value="4.88253e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2OTForwardDisk4" eval="true">
@@ -589,8 +589,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//Phase2OTForward/tracker:Disc4/tracker:Ring14Disc4/tracker:EModule14Disc4/EModule14Disc4Upperwafer/EModule14Disc4Upper2Sactive"/>
 <PartSelector path="//Phase2OTForward/tracker:Disc4/tracker:Ring15Disc4/tracker:EModule15Disc4/EModule15Disc4Lowerwafer/EModule15Disc4Lower2Sactive"/>
 <PartSelector path="//Phase2OTForward/tracker:Disc4/tracker:Ring15Disc4/tracker:EModule15Disc4/EModule15Disc4Upperwafer/EModule15Disc4Upper2Sactive"/>
-<Parameter name="TrackerRadLength" value="0.0243958"/>
-<Parameter name="TrackerXi" value="4.87917e-05"/>
+<Parameter name="TrackerRadLength" value="0.0244127"/>
+<Parameter name="TrackerXi" value="4.88253e-05"/>
 </SpecPar>
 
 <SpecPar name="TrackerRecMaterialPhase2OTForwardDisk5" eval="true">
@@ -618,8 +618,8 @@ note: see OT614_200_IT461_2018_11_22.cfg for full config files
 <PartSelector path="//Phase2OTForward/tracker:Disc5/tracker:Ring14Disc5/tracker:EModule14Disc5/EModule14Disc5Upperwafer/EModule14Disc5Upper2Sactive"/>
 <PartSelector path="//Phase2OTForward/tracker:Disc5/tracker:Ring15Disc5/tracker:EModule15Disc5/EModule15Disc5Lowerwafer/EModule15Disc5Lower2Sactive"/>
 <PartSelector path="//Phase2OTForward/tracker:Disc5/tracker:Ring15Disc5/tracker:EModule15Disc5/EModule15Disc5Upperwafer/EModule15Disc5Upper2Sactive"/>
-<Parameter name="TrackerRadLength" value="0.0244651"/>
-<Parameter name="TrackerXi" value="4.89301e-05"/>
+<Parameter name="TrackerRadLength" value="0.0244819"/>
+<Parameter name="TrackerXi" value="4.89637e-05"/>
 </SpecPar>
 
   </SpecParSection>
diff --git a/Geometry/VeryForwardGeometryBuilder/plugins/CTPPSGeometryESModule.cc b/Geometry/VeryForwardGeometryBuilder/plugins/CTPPSGeometryESModule.cc
index fd680c9ade922..91d64bd795b6e 100644
--- a/Geometry/VeryForwardGeometryBuilder/plugins/CTPPSGeometryESModule.cc
+++ b/Geometry/VeryForwardGeometryBuilder/plugins/CTPPSGeometryESModule.cc
@@ -55,20 +55,42 @@ class CTPPSGeometryESModule : public edm::ESProducer
     CTPPSGeometryESModule( const edm::ParameterSet& );
     ~CTPPSGeometryESModule() override {}
 
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
+  private:
     std::unique_ptr<DetGeomDesc> produceIdealGD( const IdealGeometryRecord& );
 
+    template<typename ALIGNMENT_REC> struct GDTokens {
+      explicit GDTokens( edm::ESConsumesCollector&& iCC):
+        idealGDToken_{iCC.consumesFrom<DetGeomDesc, IdealGeometryRecord>(edm::ESInputTag())},
+        alignmentToken_{iCC.consumesFrom<CTPPSRPAlignmentCorrectionsData, ALIGNMENT_REC>(edm::ESInputTag())}
+      {}
+      const edm::ESGetToken<DetGeomDesc, IdealGeometryRecord> idealGDToken_;
+      const edm::ESGetToken<CTPPSRPAlignmentCorrectionsData, ALIGNMENT_REC> alignmentToken_;
+    };
+
     std::unique_ptr<DetGeomDesc> produceRealGD( const VeryForwardRealGeometryRecord& );
     std::unique_ptr<CTPPSGeometry> produceRealTG( const VeryForwardRealGeometryRecord& );
 
     std::unique_ptr<DetGeomDesc> produceMisalignedGD( const VeryForwardMisalignedGeometryRecord& );
     std::unique_ptr<CTPPSGeometry> produceMisalignedTG( const VeryForwardMisalignedGeometryRecord& );
 
-  protected:
-    static void applyAlignments( const edm::ESHandle<DetGeomDesc>&, const edm::ESHandle<CTPPSRPAlignmentCorrectionsData>&, DetGeomDesc*& );
+    template<typename REC>
+    std::unique_ptr<DetGeomDesc> produceGD( IdealGeometryRecord const&, const std::optional<REC>&, GDTokens<REC> const&, const char* name);
+    
+
+    static void applyAlignments( const DetGeomDesc&, const CTPPSRPAlignmentCorrectionsData*, DetGeomDesc*& );
     static void buildDetGeomDesc( DDFilteredView* fv, DetGeomDesc* gd );
 
-    unsigned int verbosity_;
-    std::string compactViewTag_;
+    const unsigned int verbosity_;
+    const edm::ESGetToken<DDCompactView, IdealGeometryRecord> compactViewToken_;
+
+    const GDTokens<RPRealAlignmentRecord> gdRealTokens_;
+    const GDTokens<RPMisalignedAlignmentRecord> gdMisTokens_;
+
+    const edm::ESGetToken<DetGeomDesc, VeryForwardRealGeometryRecord> dgdRealToken_;
+    const edm::ESGetToken<DetGeomDesc, VeryForwardMisalignedGeometryRecord> dgdMisToken_;
+
 };
 
 
@@ -76,29 +98,37 @@ class CTPPSGeometryESModule : public edm::ESProducer
 //----------------------------------------------------------------------------------------------------
 
 CTPPSGeometryESModule::CTPPSGeometryESModule(const edm::ParameterSet& iConfig) :
-  verbosity_( iConfig.getUntrackedParameter<unsigned int>( "verbosity", 1 ) ),
-  compactViewTag_( iConfig.getParameter<std::string>( "compactViewTag" ) )
+  verbosity_( iConfig.getUntrackedParameter<unsigned int>( "verbosity") ),
+  compactViewToken_{ setWhatProduced( this, &CTPPSGeometryESModule::produceIdealGD )
+    .consumes<DDCompactView>(edm::ESInputTag(""/*optional module label */,
+                                             iConfig.getParameter<std::string>( "compactViewTag" ) )) },
+  gdRealTokens_{ setWhatProduced( this, &CTPPSGeometryESModule::produceRealGD ) },
+  gdMisTokens_{ setWhatProduced( this, &CTPPSGeometryESModule::produceMisalignedGD ) },
+  dgdRealToken_{ setWhatProduced( this, &CTPPSGeometryESModule::produceRealTG ).consumes<DetGeomDesc>(edm::ESInputTag()) },
+  dgdMisToken_{ setWhatProduced( this, &CTPPSGeometryESModule::produceMisalignedTG ).consumes<DetGeomDesc>(edm::ESInputTag()) }
 {
-  setWhatProduced( this, &CTPPSGeometryESModule::produceIdealGD );
-
-  setWhatProduced( this, &CTPPSGeometryESModule::produceRealGD );
-  setWhatProduced( this, &CTPPSGeometryESModule::produceRealTG );
+}
 
-  setWhatProduced( this, &CTPPSGeometryESModule::produceMisalignedGD );
-  setWhatProduced( this, &CTPPSGeometryESModule::produceMisalignedTG );
+void 
+CTPPSGeometryESModule::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.addUntracked<unsigned int>("verbosity", 1);
+  desc.add<std::string>("compactViewTag", std::string());
+  descriptions.add("DoodadESSource", desc);
 }
 
+
 //----------------------------------------------------------------------------------------------------
 
 void
-CTPPSGeometryESModule::applyAlignments( const edm::ESHandle<DetGeomDesc>& idealGD,
-                                        const edm::ESHandle<CTPPSRPAlignmentCorrectionsData>& alignments,
+CTPPSGeometryESModule::applyAlignments( const DetGeomDesc& idealGD,
+                                        const CTPPSRPAlignmentCorrectionsData* alignments,
                                         DetGeomDesc*& newGD )
 {
-  newGD = new DetGeomDesc( *(idealGD.product()) );
+  newGD = new DetGeomDesc( idealGD );
   std::deque<const DetGeomDesc*> buffer;
   std::deque<DetGeomDesc*> bufferNew;
-  buffer.emplace_back( idealGD.product() );
+  buffer.emplace_back( &idealGD );
   bufferNew.emplace_back( newGD );
 
   while ( !buffer.empty() ) {
@@ -117,7 +147,7 @@ CTPPSGeometryESModule::applyAlignments( const edm::ESHandle<DetGeomDesc>& idealG
       || std::regex_match( name, std::regex( DDD_TOTEM_TIMING_SENSOR_TMPL ) )) {
       unsigned int plId = pD->geographicalID();
 
-      if ( alignments.isValid() ) {
+      if ( alignments ) {
         const auto& ac = alignments->getFullSensorCorrection( plId );
         pD->applyAlignment( ac );
       }
@@ -130,7 +160,7 @@ CTPPSGeometryESModule::applyAlignments( const edm::ESHandle<DetGeomDesc>& idealG
       || name == DDD_TOTEM_TIMING_RP_NAME ) {
       unsigned int rpId = pD->geographicalID();
 
-      if ( alignments.isValid() ) {
+      if ( alignments ) {
         const auto& ac = alignments->getRPCorrection( rpId );
         pD->applyAlignment( ac );
       }
@@ -284,82 +314,69 @@ std::unique_ptr<DetGeomDesc>
 CTPPSGeometryESModule::produceIdealGD( const IdealGeometryRecord& iRecord )
 {
   // get the DDCompactView from EventSetup
-  edm::ESHandle<DDCompactView> cpv;
-  iRecord.get( compactViewTag_, cpv );
+  auto const& cpv = iRecord.get( compactViewToken_);
 
   // create DDFilteredView and apply the filter
   DDPassAllFilter filter;
-  DDFilteredView fv( *( cpv.product() ), filter );
+  DDFilteredView fv( cpv, filter );
 
   // conversion to DetGeomDesc structure
-  DetGeomDesc* root = new DetGeomDesc( &fv );
-  buildDetGeomDesc( &fv, root );
+  auto root = std::make_unique<DetGeomDesc>( &fv );
+  buildDetGeomDesc( &fv, root.get() );
 
   // construct the tree of DetGeomDesc
-  return std::unique_ptr<DetGeomDesc>( root );
+  return root;
 }
 
 //----------------------------------------------------------------------------------------------------
 
+template<typename REC>
 std::unique_ptr<DetGeomDesc>
-CTPPSGeometryESModule::produceRealGD( const VeryForwardRealGeometryRecord& iRecord )
-{
+CTPPSGeometryESModule::produceGD(IdealGeometryRecord const& iIdealRec, 
+                                 std::optional<REC> const& iAlignRec,
+                                 GDTokens<REC> const& iTokens,
+                                 const char* name) {
   // get the input GeometricalDet
-  edm::ESHandle<DetGeomDesc> idealGD;
-  iRecord.getRecord<IdealGeometryRecord>().get( idealGD );
+  auto const& idealGD = iIdealRec.get( iTokens.idealGDToken_ );
 
   // load alignments
   edm::ESHandle<CTPPSRPAlignmentCorrectionsData> alignments;
-  try { iRecord.getRecord<RPRealAlignmentRecord>().get( alignments ); }
-  catch ( cms::Exception& ) {}
+  if(iAlignRec) {
+    alignments = iAlignRec->getHandle(iTokens.alignmentToken_);
+  }
 
   if ( alignments.isValid() ) {
     if ( verbosity_ )
-      edm::LogVerbatim("CTPPSGeometryESModule::produceRealGD")
-        << ">> CTPPSGeometryESModule::produceRealGD > Real geometry: "
+      edm::LogVerbatim(name)
+        << ">> "<<name<<" > Real geometry: "
         << alignments->getRPMap().size() << " RP and "
         << alignments->getSensorMap().size() << " sensor alignments applied.";
   }
   else {
     if ( verbosity_ )
-      edm::LogVerbatim("CTPPSGeometryESModule::produceRealGD")
-        << ">> CTPPSGeometryESModule::produceRealGD > Real geometry: No alignments applied.";
+      edm::LogVerbatim(name)
+        << ">> "<<name<< " > Real geometry: No alignments applied.";
   }
 
   DetGeomDesc* newGD = nullptr;
-  applyAlignments( idealGD, alignments, newGD );
+  applyAlignments( idealGD, alignments.product(), newGD );
   return std::unique_ptr<DetGeomDesc>( newGD );
 }
 
+std::unique_ptr<DetGeomDesc>
+CTPPSGeometryESModule::produceRealGD( const VeryForwardRealGeometryRecord& iRecord )
+{
+  return produceGD(iRecord.getRecord<IdealGeometryRecord>(), iRecord.tryToGetRecord<RPRealAlignmentRecord>(), gdRealTokens_,
+                   "CTPPSGeometryESModule::produceRealGD");
+}
+
 //----------------------------------------------------------------------------------------------------
 
 std::unique_ptr<DetGeomDesc>
 CTPPSGeometryESModule::produceMisalignedGD( const VeryForwardMisalignedGeometryRecord& iRecord )
 {
-  // get the input GeometricalDet
-  edm::ESHandle<DetGeomDesc> idealGD;
-  iRecord.getRecord<IdealGeometryRecord>().get( idealGD );
-
-  // load alignments
-  edm::ESHandle<CTPPSRPAlignmentCorrectionsData> alignments;
-  try { iRecord.getRecord<RPMisalignedAlignmentRecord>().get( alignments ); }
-  catch ( cms::Exception& ) {}
-
-  if ( alignments.isValid() ) {
-    if ( verbosity_ )
-      edm::LogVerbatim("CTPPSGeometryESModule::produceMisalignedGD")
-        << ">> CTPPSGeometryESModule::produceMisalignedGD > Misaligned geometry: "
-        << alignments->getRPMap().size() << " RP and "
-        << alignments->getSensorMap().size() << " sensor alignments applied.";
-  } else {
-    if ( verbosity_ )
-      edm::LogVerbatim("CTPPSGeometryESModule::produceMisalignedGD")
-        << ">> CTPPSGeometryESModule::produceMisalignedGD > Misaligned geometry: No alignments applied.";
-  }
-
-  DetGeomDesc* newGD = nullptr;
-  applyAlignments( idealGD, alignments, newGD );
-  return std::unique_ptr<DetGeomDesc>( newGD );
+  return produceGD(iRecord.getRecord<IdealGeometryRecord>(), iRecord.tryToGetRecord<RPMisalignedAlignmentRecord>(), gdMisTokens_,
+                   "CTPPSGeometryESModule::produceMisalignedGD");
 }
 
 //----------------------------------------------------------------------------------------------------
@@ -367,10 +384,9 @@ CTPPSGeometryESModule::produceMisalignedGD( const VeryForwardMisalignedGeometryR
 std::unique_ptr<CTPPSGeometry>
 CTPPSGeometryESModule::produceRealTG( const VeryForwardRealGeometryRecord& iRecord )
 {
-  edm::ESHandle<DetGeomDesc> gD;
-  iRecord.get( gD );
+  auto const& gD = iRecord.get( dgdRealToken_ );
 
-  return std::make_unique<CTPPSGeometry>( gD.product() );
+  return std::make_unique<CTPPSGeometry>( &gD );
 }
 
 //----------------------------------------------------------------------------------------------------
@@ -378,10 +394,9 @@ CTPPSGeometryESModule::produceRealTG( const VeryForwardRealGeometryRecord& iReco
 std::unique_ptr<CTPPSGeometry>
 CTPPSGeometryESModule::produceMisalignedTG( const VeryForwardMisalignedGeometryRecord& iRecord )
 {
-  edm::ESHandle<DetGeomDesc> gD;
-  iRecord.get( gD );
+  auto const& gD = iRecord.get( dgdMisToken_ );
 
-  return std::make_unique<CTPPSGeometry>( gD.product() );
+  return std::make_unique<CTPPSGeometry>( &gD );
 }
 
 DEFINE_FWK_EVENTSETUP_MODULE( CTPPSGeometryESModule );
diff --git a/HLTrigger/Configuration/python/CustomConfigs.py b/HLTrigger/Configuration/python/CustomConfigs.py
index ad05255cc1650..16c91a4fdbcda 100644
--- a/HLTrigger/Configuration/python/CustomConfigs.py
+++ b/HLTrigger/Configuration/python/CustomConfigs.py
@@ -122,9 +122,9 @@ def HLTDropPrevious(process):
 
 def L1REPACK(process,sequence="Full"):
 
-    from Configuration.StandardSequences.Eras import eras
 
-    l1repack = cms.Process('L1REPACK',eras.Run2_2018)
+    from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+    l1repack = cms.Process('L1REPACK',Run2_2018)
     l1repack.load('Configuration.StandardSequences.SimL1EmulatorRepack_'+sequence+'_cff')
 
     for module in l1repack.es_sources_():
@@ -146,7 +146,7 @@ def L1REPACK(process,sequence="Full"):
         getattr(process,path).insert(0,process.SimL1Emulator)
 
     # special L1T cleanup
-    for obj in ('SimL1TCalorimeter','SimL1TMuonCommon','SimL1TMuon','SimL1TechnicalTriggers','SimL1EmulatorCore','ecalDigiSequence','hcalDigiSequence','calDigi','me0TriggerPseudoDigiSequence','hgcalTriggerGeometryESProducer'):
+    for obj in ('SimL1TCalorimeter','SimL1TMuonCommon','SimL1TMuon','SimL1TechnicalTriggers','SimL1EmulatorCore','ecalDigiSequence','hcalDigiSequence','calDigi','me0TriggerPseudoDigiTask','hgcalTriggerGeometryESProducer'):
         if hasattr(process,obj):
             delattr(process,obj)
 
diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py
index 30c767fe1a965..711d203887f08 100644
--- a/HLTrigger/Configuration/python/HLT_FULL_cff.py
+++ b/HLTrigger/Configuration/python/HLT_FULL_cff.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --cff --data /dev/CMSSW_10_6_0/HLT --type FULL
 
-# /dev/CMSSW_10_6_0/HLT/V2 (CMSSW_10_6_0_pre3_HLT1)
+# /dev/CMSSW_10_6_0/HLT/V3 (CMSSW_10_6_0_pre4)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_6_0/HLT/V2')
+  tableName = cms.string('/dev/CMSSW_10_6_0/HLT/V3')
 )
 
 fragment.transferSystem = cms.PSet( 
@@ -8366,6 +8366,7 @@
 )
 fragment.hltHfreco = cms.EDProducer( "HFPhase1Reconstructor",
     setNoiseFlags = cms.bool( True ),
+    algoConfigClass = cms.string( "HFPhase1PMTParams" ),
     PETstat = cms.PSet( 
       shortEnergyParams = cms.vdouble( 35.1773, 35.37, 35.7933, 36.4472, 37.3317, 38.4468, 39.7925, 41.3688, 43.1757, 45.2132, 47.4813, 49.98, 52.7093 ),
       shortETParams = cms.vdouble( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ),
@@ -8377,7 +8378,7 @@
       short_R = cms.vdouble( 0.8 ),
       HcalAcceptSeverityLevel = cms.int32( 9 )
     ),
-    algoConfigClass = cms.string( "HFPhase1PMTParams" ),
+    runHFStripFilter = cms.bool( False ),
     inputLabel = cms.InputTag( "hltHfprereco" ),
     S9S1stat = cms.PSet( 
       shortEnergyParams = cms.vdouble( 35.1773, 35.37, 35.7933, 36.4472, 37.3317, 38.4468, 39.7925, 41.3688, 43.1757, 45.2132, 47.4813, 49.98, 52.7093 ),
@@ -8410,6 +8411,17 @@
       longEnergyParams = cms.vdouble( 40.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0 ),
       short_optimumSlope = cms.vdouble( 0.3, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ),
       HcalAcceptSeverityLevel = cms.int32( 9 )
+    ),
+    HFStripFilter = cms.PSet( 
+      timeMax = cms.double( 6.0 ),
+      seedHitIetaMax = cms.int32( 35 ),
+      gap = cms.int32( 2 ),
+      verboseLevel = cms.untracked.int32( 10 ),
+      wedgeCut = cms.double( 0.05 ),
+      stripThreshold = cms.double( 40.0 ),
+      maxStripTime = cms.double( 10.0 ),
+      maxThreshold = cms.double( 100.0 ),
+      lstrips = cms.int32( 2 )
     )
 )
 fragment.hltHoreco = cms.EDProducer( "HcalHitReconstructor",
@@ -11298,6 +11310,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -11525,6 +11538,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIterL3MuonAndMuonFromL1Merged','hltIterL3GlbMuon','hltL2Muons:UpdatedAtVtx' ),
@@ -12646,6 +12664,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -12873,6 +12892,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltPFMuonMerging','hltMuonLinks','hltL2Muons' ),
@@ -17279,6 +17303,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -17505,6 +17530,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIter2IterL3FromL1MuonMergedOpenMu','hltL3MuonsIterL3LinksOpenMu' ),
@@ -20060,6 +20090,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -20286,6 +20317,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltDiMuonMerging','hltDiMuonLinks' ),
@@ -24304,6 +24340,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -24530,6 +24567,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltDiMuonMergingIter01TkMu','hltDiMuonLinksIter01TkMuMerge' ),
@@ -37722,6 +37764,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -37949,6 +37992,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltPFMuonMergingTauReg','hltMuonLinksReg','hltL2Muons' ),
@@ -47218,6 +47266,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -47443,6 +47492,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIter2HighPtTkMuMerged' ),
@@ -55012,13 +55066,13 @@
     minimumTransverseMomentum = cms.double( 1.0 ),
     primaryVertex = cms.InputTag( "hltVerticesPFFilter" ),
     maximumLongitudinalImpactParameter = cms.double( 17.0 ),
-    computeGhostTrack = cms.bool( True ),
+    jets = cms.InputTag( "hltPFJetForBtag" ),
     maxDeltaR = cms.double( 0.4 ),
     candidates = cms.InputTag( "hltParticleFlow" ),
     jetDirectionUsingGhostTrack = cms.bool( False ),
     minimumNumberOfPixelHits = cms.int32( 2 ),
     jetDirectionUsingTracks = cms.bool( False ),
-    jets = cms.InputTag( "hltPFJetForBtag" ),
+    computeGhostTrack = cms.bool( True ),
     useTrackQuality = cms.bool( False ),
     ghostTrackPriorDeltaR = cms.double( 0.03 ),
     maximumChiSquared = cms.double( 5.0 ),
@@ -74342,6 +74396,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -74568,6 +74623,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIter2IterL3FromL1MuonMergedNoVtx','hltL3MuonsIterL3LinksNoVtx' ),
@@ -74704,6 +74764,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -74930,6 +74991,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltDiMuonMergingNoVtx','hltDiMuonLinksNoVtx' ),
@@ -95970,13 +96036,13 @@
     minimumTransverseMomentum = cms.double( 1.0 ),
     primaryVertex = cms.InputTag( "hltVerticesPFFilter" ),
     maximumLongitudinalImpactParameter = cms.double( 17.0 ),
-    computeGhostTrack = cms.bool( True ),
+    jets = cms.InputTag( "hltPFJetForBtagAK8" ),
     maxDeltaR = cms.double( 0.4 ),
     candidates = cms.InputTag( "hltParticleFlow" ),
     jetDirectionUsingGhostTrack = cms.bool( False ),
     minimumNumberOfPixelHits = cms.int32( 2 ),
     jetDirectionUsingTracks = cms.bool( False ),
-    jets = cms.InputTag( "hltPFJetForBtagAK8" ),
+    computeGhostTrack = cms.bool( True ),
     useTrackQuality = cms.bool( False ),
     ghostTrackPriorDeltaR = cms.double( 0.03 ),
     maximumChiSquared = cms.double( 5.0 ),
@@ -96193,13 +96259,13 @@
     minimumTransverseMomentum = cms.double( 1.0 ),
     primaryVertex = cms.InputTag( "hltVerticesPFFilter" ),
     maximumLongitudinalImpactParameter = cms.double( 17.0 ),
-    computeGhostTrack = cms.bool( True ),
+    jets = cms.InputTag( "hltPFJetForDBtagAK8" ),
     maxDeltaR = cms.double( 0.4 ),
     candidates = cms.InputTag( "hltParticleFlow" ),
     jetDirectionUsingGhostTrack = cms.bool( False ),
     minimumNumberOfPixelHits = cms.int32( 2 ),
     jetDirectionUsingTracks = cms.bool( False ),
-    jets = cms.InputTag( "hltPFJetForDBtagAK8" ),
+    computeGhostTrack = cms.bool( True ),
     useTrackQuality = cms.bool( False ),
     ghostTrackPriorDeltaR = cms.double( 0.03 ),
     maximumChiSquared = cms.double( 5.0 ),
@@ -100950,6 +101016,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -101177,6 +101244,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIterL3MuonAndMuonFromL1MergedPPOnAA','hltIterL3GlbMuonPPOnAA','hltL2MuonsPPOnAA:UpdatedAtVtx' ),
@@ -102533,6 +102605,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -102760,6 +102833,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltPFMuonMergingPPOnAA','hltMuonLinksPPOnAA','hltL2MuonsPPOnAA' ),
diff --git a/HLTrigger/Configuration/python/HLT_Fake1_cff.py b/HLTrigger/Configuration/python/HLT_Fake1_cff.py
index 79e71fc756cbc..c32ae8bdefe44 100644
--- a/HLTrigger/Configuration/python/HLT_Fake1_cff.py
+++ b/HLTrigger/Configuration/python/HLT_Fake1_cff.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --cff --data /dev/CMSSW_10_6_0/Fake1 --type Fake1
 
-# /dev/CMSSW_10_6_0/Fake1/V2 (CMSSW_10_6_0_pre3_HLT1)
+# /dev/CMSSW_10_6_0/Fake1/V3 (CMSSW_10_6_0_pre4)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_6_0/Fake1/V2')
+  tableName = cms.string('/dev/CMSSW_10_6_0/Fake1/V3')
 )
 
 fragment.streams = cms.PSet(  A = cms.vstring( 'InitialPD' ) )
diff --git a/HLTrigger/Configuration/python/HLT_Fake2_cff.py b/HLTrigger/Configuration/python/HLT_Fake2_cff.py
index 54e2643ca92d5..07baf4b3de974 100644
--- a/HLTrigger/Configuration/python/HLT_Fake2_cff.py
+++ b/HLTrigger/Configuration/python/HLT_Fake2_cff.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --cff --data /dev/CMSSW_10_6_0/Fake2 --type Fake2
 
-# /dev/CMSSW_10_6_0/Fake2/V2 (CMSSW_10_6_0_pre3_HLT1)
+# /dev/CMSSW_10_6_0/Fake2/V3 (CMSSW_10_6_0_pre4)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_6_0/Fake2/V2')
+  tableName = cms.string('/dev/CMSSW_10_6_0/Fake2/V3')
 )
 
 fragment.streams = cms.PSet(  A = cms.vstring( 'InitialPD' ) )
diff --git a/HLTrigger/Configuration/python/HLT_Fake_cff.py b/HLTrigger/Configuration/python/HLT_Fake_cff.py
index c59e61f97450d..1007da4f02fea 100644
--- a/HLTrigger/Configuration/python/HLT_Fake_cff.py
+++ b/HLTrigger/Configuration/python/HLT_Fake_cff.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --cff --data /dev/CMSSW_10_6_0/Fake --type Fake
 
-# /dev/CMSSW_10_6_0/Fake/V2 (CMSSW_10_6_0_pre3_HLT1)
+# /dev/CMSSW_10_6_0/Fake/V3 (CMSSW_10_6_0_pre4)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_6_0/Fake/V2')
+  tableName = cms.string('/dev/CMSSW_10_6_0/Fake/V3')
 )
 
 fragment.streams = cms.PSet(  A = cms.vstring( 'InitialPD' ) )
diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py
index 5289ae773ec38..a038097f2f3be 100644
--- a/HLTrigger/Configuration/python/HLT_GRun_cff.py
+++ b/HLTrigger/Configuration/python/HLT_GRun_cff.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --cff --data /dev/CMSSW_10_6_0/GRun --type GRun
 
-# /dev/CMSSW_10_6_0/GRun/V1 (CMSSW_10_6_0_pre3_HLT1)
+# /dev/CMSSW_10_6_0/GRun/V2 (CMSSW_10_6_0_pre4)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_6_0/GRun/V1')
+  tableName = cms.string('/dev/CMSSW_10_6_0/GRun/V2')
 )
 
 fragment.transferSystem = cms.PSet( 
@@ -7046,6 +7046,7 @@
 )
 fragment.hltHfreco = cms.EDProducer( "HFPhase1Reconstructor",
     setNoiseFlags = cms.bool( True ),
+    algoConfigClass = cms.string( "HFPhase1PMTParams" ),
     PETstat = cms.PSet( 
       shortEnergyParams = cms.vdouble( 35.1773, 35.37, 35.7933, 36.4472, 37.3317, 38.4468, 39.7925, 41.3688, 43.1757, 45.2132, 47.4813, 49.98, 52.7093 ),
       shortETParams = cms.vdouble( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ),
@@ -7057,7 +7058,7 @@
       short_R = cms.vdouble( 0.8 ),
       HcalAcceptSeverityLevel = cms.int32( 9 )
     ),
-    algoConfigClass = cms.string( "HFPhase1PMTParams" ),
+    runHFStripFilter = cms.bool( False ),
     inputLabel = cms.InputTag( "hltHfprereco" ),
     S9S1stat = cms.PSet( 
       shortEnergyParams = cms.vdouble( 35.1773, 35.37, 35.7933, 36.4472, 37.3317, 38.4468, 39.7925, 41.3688, 43.1757, 45.2132, 47.4813, 49.98, 52.7093 ),
@@ -7090,6 +7091,17 @@
       longEnergyParams = cms.vdouble( 40.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0 ),
       short_optimumSlope = cms.vdouble( 0.3, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ),
       HcalAcceptSeverityLevel = cms.int32( 9 )
+    ),
+    HFStripFilter = cms.PSet( 
+      timeMax = cms.double( 6.0 ),
+      seedHitIetaMax = cms.int32( 35 ),
+      gap = cms.int32( 2 ),
+      verboseLevel = cms.untracked.int32( 10 ),
+      wedgeCut = cms.double( 0.05 ),
+      stripThreshold = cms.double( 40.0 ),
+      maxStripTime = cms.double( 10.0 ),
+      maxThreshold = cms.double( 100.0 ),
+      lstrips = cms.int32( 2 )
     )
 )
 fragment.hltHoreco = cms.EDProducer( "HcalHitReconstructor",
@@ -9978,6 +9990,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -10205,6 +10218,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIterL3MuonAndMuonFromL1Merged','hltIterL3GlbMuon','hltL2Muons:UpdatedAtVtx' ),
@@ -11326,6 +11344,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -11553,6 +11572,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltPFMuonMerging','hltMuonLinks','hltL2Muons' ),
@@ -15911,6 +15935,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -16137,6 +16162,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIter2IterL3FromL1MuonMergedOpenMu','hltL3MuonsIterL3LinksOpenMu' ),
@@ -18692,6 +18722,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -18918,6 +18949,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltDiMuonMerging','hltDiMuonLinks' ),
@@ -22936,6 +22972,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -23162,6 +23199,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltDiMuonMergingIter01TkMu','hltDiMuonLinksIter01TkMuMerge' ),
@@ -36330,6 +36372,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -36557,6 +36600,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltPFMuonMergingTauReg','hltMuonLinksReg','hltL2Muons' ),
@@ -45406,6 +45454,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -45631,6 +45680,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIter2HighPtTkMuMerged' ),
@@ -53211,13 +53265,13 @@
     minimumTransverseMomentum = cms.double( 1.0 ),
     primaryVertex = cms.InputTag( "hltVerticesPFFilter" ),
     maximumLongitudinalImpactParameter = cms.double( 17.0 ),
-    computeGhostTrack = cms.bool( True ),
+    jets = cms.InputTag( "hltPFJetForBtag" ),
     maxDeltaR = cms.double( 0.4 ),
     candidates = cms.InputTag( "hltParticleFlow" ),
     jetDirectionUsingGhostTrack = cms.bool( False ),
     minimumNumberOfPixelHits = cms.int32( 2 ),
     jetDirectionUsingTracks = cms.bool( False ),
-    jets = cms.InputTag( "hltPFJetForBtag" ),
+    computeGhostTrack = cms.bool( True ),
     useTrackQuality = cms.bool( False ),
     ghostTrackPriorDeltaR = cms.double( 0.03 ),
     maximumChiSquared = cms.double( 5.0 ),
@@ -72077,6 +72131,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -72303,6 +72358,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIter2IterL3FromL1MuonMergedNoVtx','hltL3MuonsIterL3LinksNoVtx' ),
@@ -72439,6 +72499,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -72665,6 +72726,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltDiMuonMergingNoVtx','hltDiMuonLinksNoVtx' ),
@@ -86481,13 +86547,13 @@
     minimumTransverseMomentum = cms.double( 1.0 ),
     primaryVertex = cms.InputTag( "hltVerticesPFFilter" ),
     maximumLongitudinalImpactParameter = cms.double( 17.0 ),
-    computeGhostTrack = cms.bool( True ),
+    jets = cms.InputTag( "hltPFJetForBtagAK8" ),
     maxDeltaR = cms.double( 0.4 ),
     candidates = cms.InputTag( "hltParticleFlow" ),
     jetDirectionUsingGhostTrack = cms.bool( False ),
     minimumNumberOfPixelHits = cms.int32( 2 ),
     jetDirectionUsingTracks = cms.bool( False ),
-    jets = cms.InputTag( "hltPFJetForBtagAK8" ),
+    computeGhostTrack = cms.bool( True ),
     useTrackQuality = cms.bool( False ),
     ghostTrackPriorDeltaR = cms.double( 0.03 ),
     maximumChiSquared = cms.double( 5.0 ),
@@ -86704,13 +86770,13 @@
     minimumTransverseMomentum = cms.double( 1.0 ),
     primaryVertex = cms.InputTag( "hltVerticesPFFilter" ),
     maximumLongitudinalImpactParameter = cms.double( 17.0 ),
-    computeGhostTrack = cms.bool( True ),
+    jets = cms.InputTag( "hltPFJetForDBtagAK8" ),
     maxDeltaR = cms.double( 0.4 ),
     candidates = cms.InputTag( "hltParticleFlow" ),
     jetDirectionUsingGhostTrack = cms.bool( False ),
     minimumNumberOfPixelHits = cms.int32( 2 ),
     jetDirectionUsingTracks = cms.bool( False ),
-    jets = cms.InputTag( "hltPFJetForDBtagAK8" ),
+    computeGhostTrack = cms.bool( True ),
     useTrackQuality = cms.bool( False ),
     ghostTrackPriorDeltaR = cms.double( 0.03 ),
     maximumChiSquared = cms.double( 5.0 ),
diff --git a/HLTrigger/Configuration/python/HLT_HIon_cff.py b/HLTrigger/Configuration/python/HLT_HIon_cff.py
index e217068eb994f..6bd0943876d4e 100644
--- a/HLTrigger/Configuration/python/HLT_HIon_cff.py
+++ b/HLTrigger/Configuration/python/HLT_HIon_cff.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --cff --data /dev/CMSSW_10_6_0/HIon --type HIon
 
-# /dev/CMSSW_10_6_0/HIon/V1 (CMSSW_10_6_0_pre3_HLT1)
+# /dev/CMSSW_10_6_0/HIon/V2 (CMSSW_10_6_0_pre4)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_6_0/HIon/V1')
+  tableName = cms.string('/dev/CMSSW_10_6_0/HIon/V2')
 )
 
 fragment.transferSystem = cms.PSet( 
@@ -7128,6 +7128,7 @@
 )
 fragment.hltHfreco = cms.EDProducer( "HFPhase1Reconstructor",
     setNoiseFlags = cms.bool( True ),
+    algoConfigClass = cms.string( "HFPhase1PMTParams" ),
     PETstat = cms.PSet( 
       shortEnergyParams = cms.vdouble( 35.1773, 35.37, 35.7933, 36.4472, 37.3317, 38.4468, 39.7925, 41.3688, 43.1757, 45.2132, 47.4813, 49.98, 52.7093 ),
       shortETParams = cms.vdouble( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ),
@@ -7139,7 +7140,7 @@
       short_R = cms.vdouble( 0.8 ),
       HcalAcceptSeverityLevel = cms.int32( 9 )
     ),
-    algoConfigClass = cms.string( "HFPhase1PMTParams" ),
+    runHFStripFilter = cms.bool( False ),
     inputLabel = cms.InputTag( "hltHfprereco" ),
     S9S1stat = cms.PSet( 
       shortEnergyParams = cms.vdouble( 35.1773, 35.37, 35.7933, 36.4472, 37.3317, 38.4468, 39.7925, 41.3688, 43.1757, 45.2132, 47.4813, 49.98, 52.7093 ),
@@ -7172,6 +7173,17 @@
       longEnergyParams = cms.vdouble( 40.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0 ),
       short_optimumSlope = cms.vdouble( 0.3, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ),
       HcalAcceptSeverityLevel = cms.int32( 9 )
+    ),
+    HFStripFilter = cms.PSet( 
+      timeMax = cms.double( 6.0 ),
+      seedHitIetaMax = cms.int32( 35 ),
+      gap = cms.int32( 2 ),
+      verboseLevel = cms.untracked.int32( 10 ),
+      wedgeCut = cms.double( 0.05 ),
+      stripThreshold = cms.double( 40.0 ),
+      maxStripTime = cms.double( 10.0 ),
+      maxThreshold = cms.double( 100.0 ),
+      lstrips = cms.int32( 2 )
     )
 )
 fragment.hltHoreco = cms.EDProducer( "HcalHitReconstructor",
@@ -9670,6 +9682,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -9897,6 +9910,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIterL3MuonAndMuonFromL1MergedPPOnAA','hltIterL3GlbMuonPPOnAA','hltL2MuonsPPOnAA:UpdatedAtVtx' ),
@@ -11264,6 +11282,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -11491,6 +11510,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltPFMuonMergingPPOnAA','hltMuonLinksPPOnAA','hltL2MuonsPPOnAA' ),
diff --git a/HLTrigger/Configuration/python/HLT_PIon_cff.py b/HLTrigger/Configuration/python/HLT_PIon_cff.py
index a2f18c65b9376..e7e9c1542cfbc 100644
--- a/HLTrigger/Configuration/python/HLT_PIon_cff.py
+++ b/HLTrigger/Configuration/python/HLT_PIon_cff.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --cff --data /dev/CMSSW_10_6_0/PIon --type PIon
 
-# /dev/CMSSW_10_6_0/PIon/V1 (CMSSW_10_6_0_pre3_HLT1)
+# /dev/CMSSW_10_6_0/PIon/V2 (CMSSW_10_6_0_pre4)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_6_0/PIon/V1')
+  tableName = cms.string('/dev/CMSSW_10_6_0/PIon/V2')
 )
 
 fragment.transferSystem = cms.PSet( 
diff --git a/HLTrigger/Configuration/python/HLT_PRef_cff.py b/HLTrigger/Configuration/python/HLT_PRef_cff.py
index 68a5cc6949cc1..ec5cb31045b3c 100644
--- a/HLTrigger/Configuration/python/HLT_PRef_cff.py
+++ b/HLTrigger/Configuration/python/HLT_PRef_cff.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --cff --data /dev/CMSSW_10_6_0/PRef --type PRef
 
-# /dev/CMSSW_10_6_0/PRef/V1 (CMSSW_10_6_0_pre3_HLT1)
+# /dev/CMSSW_10_6_0/PRef/V2 (CMSSW_10_6_0_pre4)
 
 import FWCore.ParameterSet.Config as cms
 
 fragment = cms.ProcessFragment( "HLT" )
 
 fragment.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_6_0/PRef/V1')
+  tableName = cms.string('/dev/CMSSW_10_6_0/PRef/V2')
 )
 
 fragment.transferSystem = cms.PSet( 
@@ -5711,6 +5711,7 @@
 )
 fragment.hltHfreco = cms.EDProducer( "HFPhase1Reconstructor",
     setNoiseFlags = cms.bool( True ),
+    algoConfigClass = cms.string( "HFPhase1PMTParams" ),
     PETstat = cms.PSet( 
       shortEnergyParams = cms.vdouble( 35.1773, 35.37, 35.7933, 36.4472, 37.3317, 38.4468, 39.7925, 41.3688, 43.1757, 45.2132, 47.4813, 49.98, 52.7093 ),
       shortETParams = cms.vdouble( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ),
@@ -5722,7 +5723,7 @@
       short_R = cms.vdouble( 0.8 ),
       HcalAcceptSeverityLevel = cms.int32( 9 )
     ),
-    algoConfigClass = cms.string( "HFPhase1PMTParams" ),
+    runHFStripFilter = cms.bool( False ),
     inputLabel = cms.InputTag( "hltHfprereco" ),
     S9S1stat = cms.PSet( 
       shortEnergyParams = cms.vdouble( 35.1773, 35.37, 35.7933, 36.4472, 37.3317, 38.4468, 39.7925, 41.3688, 43.1757, 45.2132, 47.4813, 49.98, 52.7093 ),
@@ -5755,6 +5756,17 @@
       longEnergyParams = cms.vdouble( 40.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0 ),
       short_optimumSlope = cms.vdouble( 0.3, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ),
       HcalAcceptSeverityLevel = cms.int32( 9 )
+    ),
+    HFStripFilter = cms.PSet( 
+      timeMax = cms.double( 6.0 ),
+      seedHitIetaMax = cms.int32( 35 ),
+      gap = cms.int32( 2 ),
+      verboseLevel = cms.untracked.int32( 10 ),
+      wedgeCut = cms.double( 0.05 ),
+      stripThreshold = cms.double( 40.0 ),
+      maxStripTime = cms.double( 10.0 ),
+      maxThreshold = cms.double( 100.0 ),
+      lstrips = cms.int32( 2 )
     )
 )
 fragment.hltHoreco = cms.EDProducer( "HcalHitReconstructor",
@@ -8414,6 +8426,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -8641,6 +8654,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIterL3MuonAndMuonFromL1Merged','hltIterL3GlbMuon','hltL2Muons:UpdatedAtVtx' ),
diff --git a/HLTrigger/Configuration/python/Tools/confdb.py b/HLTrigger/Configuration/python/Tools/confdb.py
index aa0a5131808da..899b846c89e13 100644
--- a/HLTrigger/Configuration/python/Tools/confdb.py
+++ b/HLTrigger/Configuration/python/Tools/confdb.py
@@ -503,7 +503,9 @@ def overrideOutput(self):
   def addEras(self):
     if self.config.eras is None:
       return
-    self.data = re.sub(r'process = cms.Process\( *"\w+"', 'from Configuration.StandardSequences.Eras import eras\n\g<0>, '+', '.join('eras.' + era for era in self.config.eras.split(',')), self.data)
+    from Configuration.StandardSequences.Eras import eras
+    erasSplit = self.config.eras.split(',')
+    self.data = re.sub(r'process = cms.Process\( *"\w+"', '\n'.join(eras.pythonCfgLines[era] for era in erasSplit)+'\n\g<0>, '+', '.join(era for era in erasSplit), self.data)
 
   # select specific Eras
   def loadSetupCff(self):
diff --git a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py
index 199310ba6f300..1d39ced8d473e 100644
--- a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py
+++ b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --full --data /dev/CMSSW_10_6_0/HLT --type FULL --unprescale --process HLTFULL --globaltag auto:run2_hlt_FULL --input file:RelVal_Raw_FULL_DATA.root
 
-# /dev/CMSSW_10_6_0/HLT/V2 (CMSSW_10_6_0_pre3_HLT1)
+# /dev/CMSSW_10_6_0/HLT/V3 (CMSSW_10_6_0_pre4)
 
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process( "HLTFULL" )
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_6_0/HLT/V2')
+  tableName = cms.string('/dev/CMSSW_10_6_0/HLT/V3')
 )
 
 process.transferSystem = cms.PSet( 
@@ -8666,6 +8666,7 @@
 )
 process.hltHfreco = cms.EDProducer( "HFPhase1Reconstructor",
     setNoiseFlags = cms.bool( True ),
+    algoConfigClass = cms.string( "HFPhase1PMTParams" ),
     PETstat = cms.PSet( 
       shortEnergyParams = cms.vdouble( 35.1773, 35.37, 35.7933, 36.4472, 37.3317, 38.4468, 39.7925, 41.3688, 43.1757, 45.2132, 47.4813, 49.98, 52.7093 ),
       shortETParams = cms.vdouble( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ),
@@ -8677,7 +8678,7 @@
       short_R = cms.vdouble( 0.8 ),
       HcalAcceptSeverityLevel = cms.int32( 9 )
     ),
-    algoConfigClass = cms.string( "HFPhase1PMTParams" ),
+    runHFStripFilter = cms.bool( False ),
     inputLabel = cms.InputTag( "hltHfprereco" ),
     S9S1stat = cms.PSet( 
       shortEnergyParams = cms.vdouble( 35.1773, 35.37, 35.7933, 36.4472, 37.3317, 38.4468, 39.7925, 41.3688, 43.1757, 45.2132, 47.4813, 49.98, 52.7093 ),
@@ -8710,6 +8711,17 @@
       longEnergyParams = cms.vdouble( 40.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0 ),
       short_optimumSlope = cms.vdouble( 0.3, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ),
       HcalAcceptSeverityLevel = cms.int32( 9 )
+    ),
+    HFStripFilter = cms.PSet( 
+      timeMax = cms.double( 6.0 ),
+      seedHitIetaMax = cms.int32( 35 ),
+      gap = cms.int32( 2 ),
+      verboseLevel = cms.untracked.int32( 10 ),
+      wedgeCut = cms.double( 0.05 ),
+      stripThreshold = cms.double( 40.0 ),
+      maxStripTime = cms.double( 10.0 ),
+      maxThreshold = cms.double( 100.0 ),
+      lstrips = cms.int32( 2 )
     )
 )
 process.hltHoreco = cms.EDProducer( "HcalHitReconstructor",
@@ -11598,6 +11610,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -11825,6 +11838,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIterL3MuonAndMuonFromL1Merged','hltIterL3GlbMuon','hltL2Muons:UpdatedAtVtx' ),
@@ -12946,6 +12964,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -13173,6 +13192,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltPFMuonMerging','hltMuonLinks','hltL2Muons' ),
@@ -17579,6 +17603,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -17805,6 +17830,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIter2IterL3FromL1MuonMergedOpenMu','hltL3MuonsIterL3LinksOpenMu' ),
@@ -20360,6 +20390,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -20586,6 +20617,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltDiMuonMerging','hltDiMuonLinks' ),
@@ -24604,6 +24640,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -24830,6 +24867,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltDiMuonMergingIter01TkMu','hltDiMuonLinksIter01TkMuMerge' ),
@@ -38022,6 +38064,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -38249,6 +38292,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltPFMuonMergingTauReg','hltMuonLinksReg','hltL2Muons' ),
@@ -47518,6 +47566,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -47743,6 +47792,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIter2HighPtTkMuMerged' ),
@@ -55312,13 +55366,13 @@
     minimumTransverseMomentum = cms.double( 1.0 ),
     primaryVertex = cms.InputTag( "hltVerticesPFFilter" ),
     maximumLongitudinalImpactParameter = cms.double( 17.0 ),
-    computeGhostTrack = cms.bool( True ),
+    jets = cms.InputTag( "hltPFJetForBtag" ),
     maxDeltaR = cms.double( 0.4 ),
     candidates = cms.InputTag( "hltParticleFlow" ),
     jetDirectionUsingGhostTrack = cms.bool( False ),
     minimumNumberOfPixelHits = cms.int32( 2 ),
     jetDirectionUsingTracks = cms.bool( False ),
-    jets = cms.InputTag( "hltPFJetForBtag" ),
+    computeGhostTrack = cms.bool( True ),
     useTrackQuality = cms.bool( False ),
     ghostTrackPriorDeltaR = cms.double( 0.03 ),
     maximumChiSquared = cms.double( 5.0 ),
@@ -74642,6 +74696,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -74868,6 +74923,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIter2IterL3FromL1MuonMergedNoVtx','hltL3MuonsIterL3LinksNoVtx' ),
@@ -75004,6 +75064,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -75230,6 +75291,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltDiMuonMergingNoVtx','hltDiMuonLinksNoVtx' ),
@@ -96270,13 +96336,13 @@
     minimumTransverseMomentum = cms.double( 1.0 ),
     primaryVertex = cms.InputTag( "hltVerticesPFFilter" ),
     maximumLongitudinalImpactParameter = cms.double( 17.0 ),
-    computeGhostTrack = cms.bool( True ),
+    jets = cms.InputTag( "hltPFJetForBtagAK8" ),
     maxDeltaR = cms.double( 0.4 ),
     candidates = cms.InputTag( "hltParticleFlow" ),
     jetDirectionUsingGhostTrack = cms.bool( False ),
     minimumNumberOfPixelHits = cms.int32( 2 ),
     jetDirectionUsingTracks = cms.bool( False ),
-    jets = cms.InputTag( "hltPFJetForBtagAK8" ),
+    computeGhostTrack = cms.bool( True ),
     useTrackQuality = cms.bool( False ),
     ghostTrackPriorDeltaR = cms.double( 0.03 ),
     maximumChiSquared = cms.double( 5.0 ),
@@ -96493,13 +96559,13 @@
     minimumTransverseMomentum = cms.double( 1.0 ),
     primaryVertex = cms.InputTag( "hltVerticesPFFilter" ),
     maximumLongitudinalImpactParameter = cms.double( 17.0 ),
-    computeGhostTrack = cms.bool( True ),
+    jets = cms.InputTag( "hltPFJetForDBtagAK8" ),
     maxDeltaR = cms.double( 0.4 ),
     candidates = cms.InputTag( "hltParticleFlow" ),
     jetDirectionUsingGhostTrack = cms.bool( False ),
     minimumNumberOfPixelHits = cms.int32( 2 ),
     jetDirectionUsingTracks = cms.bool( False ),
-    jets = cms.InputTag( "hltPFJetForDBtagAK8" ),
+    computeGhostTrack = cms.bool( True ),
     useTrackQuality = cms.bool( False ),
     ghostTrackPriorDeltaR = cms.double( 0.03 ),
     maximumChiSquared = cms.double( 5.0 ),
@@ -101250,6 +101316,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -101477,6 +101544,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIterL3MuonAndMuonFromL1MergedPPOnAA','hltIterL3GlbMuonPPOnAA','hltL2MuonsPPOnAA:UpdatedAtVtx' ),
@@ -102833,6 +102905,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -103060,6 +103133,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltPFMuonMergingPPOnAA','hltMuonLinksPPOnAA','hltL2MuonsPPOnAA' ),
diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake.py
index 99e9c98ad77c2..f1d810d669f49 100644
--- a/HLTrigger/Configuration/test/OnLine_HLT_Fake.py
+++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --full --data /dev/CMSSW_10_6_0/Fake --type Fake --unprescale --process HLTFake --globaltag auto:run1_hlt_Fake --input file:RelVal_Raw_Fake_DATA.root
 
-# /dev/CMSSW_10_6_0/Fake/V2 (CMSSW_10_6_0_pre3_HLT1)
+# /dev/CMSSW_10_6_0/Fake/V3 (CMSSW_10_6_0_pre4)
 
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process( "HLTFake" )
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_6_0/Fake/V2')
+  tableName = cms.string('/dev/CMSSW_10_6_0/Fake/V3')
 )
 
 process.streams = cms.PSet(  A = cms.vstring( 'InitialPD' ) )
diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py
index 8be9c723f7af6..276e69ec84af3 100644
--- a/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py
+++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --full --data /dev/CMSSW_10_6_0/Fake1 --type Fake1 --unprescale --process HLTFake1 --globaltag auto:run2_hlt_Fake1 --input file:RelVal_Raw_Fake1_DATA.root
 
-# /dev/CMSSW_10_6_0/Fake1/V2 (CMSSW_10_6_0_pre3_HLT1)
+# /dev/CMSSW_10_6_0/Fake1/V3 (CMSSW_10_6_0_pre4)
 
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process( "HLTFake1" )
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_6_0/Fake1/V2')
+  tableName = cms.string('/dev/CMSSW_10_6_0/Fake1/V3')
 )
 
 process.streams = cms.PSet(  A = cms.vstring( 'InitialPD' ) )
diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py
index 2530fa78c030a..f0643cc48b507 100644
--- a/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py
+++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --full --data /dev/CMSSW_10_6_0/Fake2 --type Fake2 --unprescale --process HLTFake2 --globaltag auto:run2_hlt_Fake2 --input file:RelVal_Raw_Fake2_DATA.root
 
-# /dev/CMSSW_10_6_0/Fake2/V2 (CMSSW_10_6_0_pre3_HLT1)
+# /dev/CMSSW_10_6_0/Fake2/V3 (CMSSW_10_6_0_pre4)
 
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process( "HLTFake2" )
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_6_0/Fake2/V2')
+  tableName = cms.string('/dev/CMSSW_10_6_0/Fake2/V3')
 )
 
 process.streams = cms.PSet(  A = cms.vstring( 'InitialPD' ) )
diff --git a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py
index 42514c93df016..66855e9e2a343 100644
--- a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py
+++ b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --full --data /dev/CMSSW_10_6_0/GRun --type GRun --unprescale --process HLTGRun --globaltag auto:run2_hlt_GRun --input file:RelVal_Raw_GRun_DATA.root
 
-# /dev/CMSSW_10_6_0/GRun/V1 (CMSSW_10_6_0_pre3_HLT1)
+# /dev/CMSSW_10_6_0/GRun/V2 (CMSSW_10_6_0_pre4)
 
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process( "HLTGRun" )
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_6_0/GRun/V1')
+  tableName = cms.string('/dev/CMSSW_10_6_0/GRun/V2')
 )
 
 process.transferSystem = cms.PSet( 
@@ -7346,6 +7346,7 @@
 )
 process.hltHfreco = cms.EDProducer( "HFPhase1Reconstructor",
     setNoiseFlags = cms.bool( True ),
+    algoConfigClass = cms.string( "HFPhase1PMTParams" ),
     PETstat = cms.PSet( 
       shortEnergyParams = cms.vdouble( 35.1773, 35.37, 35.7933, 36.4472, 37.3317, 38.4468, 39.7925, 41.3688, 43.1757, 45.2132, 47.4813, 49.98, 52.7093 ),
       shortETParams = cms.vdouble( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ),
@@ -7357,7 +7358,7 @@
       short_R = cms.vdouble( 0.8 ),
       HcalAcceptSeverityLevel = cms.int32( 9 )
     ),
-    algoConfigClass = cms.string( "HFPhase1PMTParams" ),
+    runHFStripFilter = cms.bool( False ),
     inputLabel = cms.InputTag( "hltHfprereco" ),
     S9S1stat = cms.PSet( 
       shortEnergyParams = cms.vdouble( 35.1773, 35.37, 35.7933, 36.4472, 37.3317, 38.4468, 39.7925, 41.3688, 43.1757, 45.2132, 47.4813, 49.98, 52.7093 ),
@@ -7390,6 +7391,17 @@
       longEnergyParams = cms.vdouble( 40.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0 ),
       short_optimumSlope = cms.vdouble( 0.3, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ),
       HcalAcceptSeverityLevel = cms.int32( 9 )
+    ),
+    HFStripFilter = cms.PSet( 
+      timeMax = cms.double( 6.0 ),
+      seedHitIetaMax = cms.int32( 35 ),
+      gap = cms.int32( 2 ),
+      verboseLevel = cms.untracked.int32( 10 ),
+      wedgeCut = cms.double( 0.05 ),
+      stripThreshold = cms.double( 40.0 ),
+      maxStripTime = cms.double( 10.0 ),
+      maxThreshold = cms.double( 100.0 ),
+      lstrips = cms.int32( 2 )
     )
 )
 process.hltHoreco = cms.EDProducer( "HcalHitReconstructor",
@@ -10278,6 +10290,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -10505,6 +10518,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIterL3MuonAndMuonFromL1Merged','hltIterL3GlbMuon','hltL2Muons:UpdatedAtVtx' ),
@@ -11626,6 +11644,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -11853,6 +11872,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltPFMuonMerging','hltMuonLinks','hltL2Muons' ),
@@ -16211,6 +16235,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -16437,6 +16462,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIter2IterL3FromL1MuonMergedOpenMu','hltL3MuonsIterL3LinksOpenMu' ),
@@ -18992,6 +19022,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -19218,6 +19249,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltDiMuonMerging','hltDiMuonLinks' ),
@@ -23236,6 +23272,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -23462,6 +23499,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltDiMuonMergingIter01TkMu','hltDiMuonLinksIter01TkMuMerge' ),
@@ -36630,6 +36672,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -36857,6 +36900,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltPFMuonMergingTauReg','hltMuonLinksReg','hltL2Muons' ),
@@ -45706,6 +45754,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -45931,6 +45980,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIter2HighPtTkMuMerged' ),
@@ -53511,13 +53565,13 @@
     minimumTransverseMomentum = cms.double( 1.0 ),
     primaryVertex = cms.InputTag( "hltVerticesPFFilter" ),
     maximumLongitudinalImpactParameter = cms.double( 17.0 ),
-    computeGhostTrack = cms.bool( True ),
+    jets = cms.InputTag( "hltPFJetForBtag" ),
     maxDeltaR = cms.double( 0.4 ),
     candidates = cms.InputTag( "hltParticleFlow" ),
     jetDirectionUsingGhostTrack = cms.bool( False ),
     minimumNumberOfPixelHits = cms.int32( 2 ),
     jetDirectionUsingTracks = cms.bool( False ),
-    jets = cms.InputTag( "hltPFJetForBtag" ),
+    computeGhostTrack = cms.bool( True ),
     useTrackQuality = cms.bool( False ),
     ghostTrackPriorDeltaR = cms.double( 0.03 ),
     maximumChiSquared = cms.double( 5.0 ),
@@ -72377,6 +72431,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -72603,6 +72658,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIter2IterL3FromL1MuonMergedNoVtx','hltL3MuonsIterL3LinksNoVtx' ),
@@ -72739,6 +72799,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -72965,6 +73026,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltDiMuonMergingNoVtx','hltDiMuonLinksNoVtx' ),
@@ -86781,13 +86847,13 @@
     minimumTransverseMomentum = cms.double( 1.0 ),
     primaryVertex = cms.InputTag( "hltVerticesPFFilter" ),
     maximumLongitudinalImpactParameter = cms.double( 17.0 ),
-    computeGhostTrack = cms.bool( True ),
+    jets = cms.InputTag( "hltPFJetForBtagAK8" ),
     maxDeltaR = cms.double( 0.4 ),
     candidates = cms.InputTag( "hltParticleFlow" ),
     jetDirectionUsingGhostTrack = cms.bool( False ),
     minimumNumberOfPixelHits = cms.int32( 2 ),
     jetDirectionUsingTracks = cms.bool( False ),
-    jets = cms.InputTag( "hltPFJetForBtagAK8" ),
+    computeGhostTrack = cms.bool( True ),
     useTrackQuality = cms.bool( False ),
     ghostTrackPriorDeltaR = cms.double( 0.03 ),
     maximumChiSquared = cms.double( 5.0 ),
@@ -87004,13 +87070,13 @@
     minimumTransverseMomentum = cms.double( 1.0 ),
     primaryVertex = cms.InputTag( "hltVerticesPFFilter" ),
     maximumLongitudinalImpactParameter = cms.double( 17.0 ),
-    computeGhostTrack = cms.bool( True ),
+    jets = cms.InputTag( "hltPFJetForDBtagAK8" ),
     maxDeltaR = cms.double( 0.4 ),
     candidates = cms.InputTag( "hltParticleFlow" ),
     jetDirectionUsingGhostTrack = cms.bool( False ),
     minimumNumberOfPixelHits = cms.int32( 2 ),
     jetDirectionUsingTracks = cms.bool( False ),
-    jets = cms.InputTag( "hltPFJetForDBtagAK8" ),
+    computeGhostTrack = cms.bool( True ),
     useTrackQuality = cms.bool( False ),
     ghostTrackPriorDeltaR = cms.double( 0.03 ),
     maximumChiSquared = cms.double( 5.0 ),
diff --git a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py
index 9daaf41ac14d3..ddb319de57ab4 100644
--- a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py
+++ b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --full --data /dev/CMSSW_10_6_0/HIon --type HIon --unprescale --process HLTHIon --globaltag auto:run2_hlt_HIon --input file:RelVal_Raw_HIon_DATA.root
 
-# /dev/CMSSW_10_6_0/HIon/V1 (CMSSW_10_6_0_pre3_HLT1)
+# /dev/CMSSW_10_6_0/HIon/V2 (CMSSW_10_6_0_pre4)
 
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process( "HLTHIon" )
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_6_0/HIon/V1')
+  tableName = cms.string('/dev/CMSSW_10_6_0/HIon/V2')
 )
 
 process.transferSystem = cms.PSet( 
@@ -7428,6 +7428,7 @@
 )
 process.hltHfreco = cms.EDProducer( "HFPhase1Reconstructor",
     setNoiseFlags = cms.bool( True ),
+    algoConfigClass = cms.string( "HFPhase1PMTParams" ),
     PETstat = cms.PSet( 
       shortEnergyParams = cms.vdouble( 35.1773, 35.37, 35.7933, 36.4472, 37.3317, 38.4468, 39.7925, 41.3688, 43.1757, 45.2132, 47.4813, 49.98, 52.7093 ),
       shortETParams = cms.vdouble( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ),
@@ -7439,7 +7440,7 @@
       short_R = cms.vdouble( 0.8 ),
       HcalAcceptSeverityLevel = cms.int32( 9 )
     ),
-    algoConfigClass = cms.string( "HFPhase1PMTParams" ),
+    runHFStripFilter = cms.bool( False ),
     inputLabel = cms.InputTag( "hltHfprereco" ),
     S9S1stat = cms.PSet( 
       shortEnergyParams = cms.vdouble( 35.1773, 35.37, 35.7933, 36.4472, 37.3317, 38.4468, 39.7925, 41.3688, 43.1757, 45.2132, 47.4813, 49.98, 52.7093 ),
@@ -7472,6 +7473,17 @@
       longEnergyParams = cms.vdouble( 40.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0 ),
       short_optimumSlope = cms.vdouble( 0.3, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ),
       HcalAcceptSeverityLevel = cms.int32( 9 )
+    ),
+    HFStripFilter = cms.PSet( 
+      timeMax = cms.double( 6.0 ),
+      seedHitIetaMax = cms.int32( 35 ),
+      gap = cms.int32( 2 ),
+      verboseLevel = cms.untracked.int32( 10 ),
+      wedgeCut = cms.double( 0.05 ),
+      stripThreshold = cms.double( 40.0 ),
+      maxStripTime = cms.double( 10.0 ),
+      maxThreshold = cms.double( 100.0 ),
+      lstrips = cms.int32( 2 )
     )
 )
 process.hltHoreco = cms.EDProducer( "HcalHitReconstructor",
@@ -9970,6 +9982,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -10197,6 +10210,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIterL3MuonAndMuonFromL1MergedPPOnAA','hltIterL3GlbMuonPPOnAA','hltL2MuonsPPOnAA:UpdatedAtVtx' ),
@@ -11564,6 +11582,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -11791,6 +11810,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltPFMuonMergingPPOnAA','hltMuonLinksPPOnAA','hltL2MuonsPPOnAA' ),
diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py
index 89c6045b77554..979f1c5920c75 100644
--- a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py
+++ b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --full --data /dev/CMSSW_10_6_0/PIon --type PIon --unprescale --process HLTPIon --globaltag auto:run2_hlt_PIon --input file:RelVal_Raw_PIon_DATA.root
 
-# /dev/CMSSW_10_6_0/PIon/V1 (CMSSW_10_6_0_pre3_HLT1)
+# /dev/CMSSW_10_6_0/PIon/V2 (CMSSW_10_6_0_pre4)
 
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process( "HLTPIon" )
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_6_0/PIon/V1')
+  tableName = cms.string('/dev/CMSSW_10_6_0/PIon/V2')
 )
 
 process.transferSystem = cms.PSet( 
diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py
index 6e68d9e704417..6db8d31a6638b 100644
--- a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py
+++ b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py
@@ -1,13 +1,13 @@
 # hltGetConfiguration --full --data /dev/CMSSW_10_6_0/PRef --type PRef --unprescale --process HLTPRef --globaltag auto:run2_hlt_PRef --input file:RelVal_Raw_PRef_DATA.root
 
-# /dev/CMSSW_10_6_0/PRef/V1 (CMSSW_10_6_0_pre3_HLT1)
+# /dev/CMSSW_10_6_0/PRef/V2 (CMSSW_10_6_0_pre4)
 
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process( "HLTPRef" )
 
 process.HLTConfigVersion = cms.PSet(
-  tableName = cms.string('/dev/CMSSW_10_6_0/PRef/V1')
+  tableName = cms.string('/dev/CMSSW_10_6_0/PRef/V2')
 )
 
 process.transferSystem = cms.PSet( 
@@ -6011,6 +6011,7 @@
 )
 process.hltHfreco = cms.EDProducer( "HFPhase1Reconstructor",
     setNoiseFlags = cms.bool( True ),
+    algoConfigClass = cms.string( "HFPhase1PMTParams" ),
     PETstat = cms.PSet( 
       shortEnergyParams = cms.vdouble( 35.1773, 35.37, 35.7933, 36.4472, 37.3317, 38.4468, 39.7925, 41.3688, 43.1757, 45.2132, 47.4813, 49.98, 52.7093 ),
       shortETParams = cms.vdouble( 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 ),
@@ -6022,7 +6023,7 @@
       short_R = cms.vdouble( 0.8 ),
       HcalAcceptSeverityLevel = cms.int32( 9 )
     ),
-    algoConfigClass = cms.string( "HFPhase1PMTParams" ),
+    runHFStripFilter = cms.bool( False ),
     inputLabel = cms.InputTag( "hltHfprereco" ),
     S9S1stat = cms.PSet( 
       shortEnergyParams = cms.vdouble( 35.1773, 35.37, 35.7933, 36.4472, 37.3317, 38.4468, 39.7925, 41.3688, 43.1757, 45.2132, 47.4813, 49.98, 52.7093 ),
@@ -6055,6 +6056,17 @@
       longEnergyParams = cms.vdouble( 40.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0 ),
       short_optimumSlope = cms.vdouble( 0.3, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ),
       HcalAcceptSeverityLevel = cms.int32( 9 )
+    ),
+    HFStripFilter = cms.PSet( 
+      timeMax = cms.double( 6.0 ),
+      seedHitIetaMax = cms.int32( 35 ),
+      gap = cms.int32( 2 ),
+      verboseLevel = cms.untracked.int32( 10 ),
+      wedgeCut = cms.double( 0.05 ),
+      stripThreshold = cms.double( 40.0 ),
+      maxStripTime = cms.double( 10.0 ),
+      maxThreshold = cms.double( 100.0 ),
+      lstrips = cms.int32( 2 )
     )
 )
 process.hltHoreco = cms.EDProducer( "HcalHitReconstructor",
@@ -8714,6 +8726,7 @@
       OverlapDPhi = cms.double( 0.0786 )
     ),
     globalTrackQualityInputTag = cms.InputTag( "glbTrackQual" ),
+    fillShowerDigis = cms.bool( False ),
     addExtraSoftMuons = cms.bool( False ),
     debugWithTruthMatching = cms.bool( False ),
     CaloExtractorPSet = cms.PSet( 
@@ -8941,6 +8954,11 @@
       PionTemplateFileName = cms.FileInPath( "RecoMuon/MuonIdentification/data/MuID_templates_pions_lowPt_3_1_norm.root" )
     ),
     fillTrackerKink = cms.bool( False ),
+    ShowerDigiFillerParameters = cms.PSet( 
+      cscDigiCollectionLabel = cms.InputTag( 'muonCSCDigis','MuonCSCStripDigi' ),
+      dtDigiCollectionLabel = cms.InputTag( "muonDTDigis" ),
+      digiMaxDistanceX = cms.double( 25.0 )
+    ),
     hcalDepositName = cms.string( "hcal" ),
     sigmaThresholdToFillCandidateP4WithGlobalFit = cms.double( 2.0 ),
     inputCollectionLabels = cms.VInputTag( 'hltIterL3MuonAndMuonFromL1Merged','hltIterL3GlbMuon','hltL2Muons:UpdatedAtVtx' ),
diff --git a/HLTrigger/HLTfilters/test/devHLT_Stage2.py b/HLTrigger/HLTfilters/test/devHLT_Stage2.py
index 39a816d1574e3..dc74096915a39 100644
--- a/HLTrigger/HLTfilters/test/devHLT_Stage2.py
+++ b/HLTrigger/HLTfilters/test/devHLT_Stage2.py
@@ -5,10 +5,11 @@
 # with command line options: debug --no_exec --conditions auto:run2_mc_25ns14e33_v4 -s DIGI:pdigi_valid,L1,DIGI2RAW,RAW2DIGI --datatier GEN-SIM-DIGI-RAW-HLTDEBUG -n 10 --era Run2_25ns --eventcontent FEVTDEBUGHLT --filein filelist:step1_dasquery.log --fileout file:step2.root
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-#process = cms.Process('L1SEQS',eras.Run2_25ns)
-process = cms.Process('HLT',eras.Run2_2016)
+#from Configuration.Eras.Era_Run2_25ns_cff import Run2_25ns
+#process = cms.Process('L1SEQS',Run2_25ns)
+from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
+process = cms.Process('HLT',Run2_2016)
 
 
 # import of standard configurations
diff --git a/HLTrigger/HLTfilters/test/runHLTMuonL1TFilter_Stage2.py b/HLTrigger/HLTfilters/test/runHLTMuonL1TFilter_Stage2.py
index 22f71e4396468..e63a72c492f14 100644
--- a/HLTrigger/HLTfilters/test/runHLTMuonL1TFilter_Stage2.py
+++ b/HLTrigger/HLTfilters/test/runHLTMuonL1TFilter_Stage2.py
@@ -5,10 +5,11 @@
 
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-#process = cms.Process('L1SEQS',eras.Run2_25ns)
-process = cms.Process('HLT',eras.Run2_2016)
+#from Configuration.Eras.Era_Run2_25ns_cff import Run2_25ns
+#process = cms.Process('L1SEQS',Run2_25ns)
+from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
+process = cms.Process('HLT',Run2_2016)
 
 
 # import of standard configurations
diff --git a/HLTrigger/special/plugins/HLTEcalResonanceFilter.cc b/HLTrigger/special/plugins/HLTEcalResonanceFilter.cc
index 93de3cc751113..64e1d1b484f7c 100644
--- a/HLTrigger/special/plugins/HLTEcalResonanceFilter.cc
+++ b/HLTrigger/special/plugins/HLTEcalResonanceFilter.cc
@@ -231,9 +231,9 @@ HLTEcalResonanceFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup
   edm::ESHandle<CaloGeometry> geoHandle;
   iSetup.get<CaloGeometryRecord>().get(geoHandle); 
   const CaloSubdetectorGeometry *geometry_es = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalPreshower);
-  CaloSubdetectorTopology *topology_es=nullptr;
+  std::unique_ptr<CaloSubdetectorTopology> topology_es;
   if (geometry_es) {
-    topology_es  = new EcalPreshowerTopology(geoHandle);
+    topology_es  = std::make_unique<EcalPreshowerTopology>();
   }else{
     storeRecHitES_ = false; ///if no preshower
   }
@@ -395,7 +395,7 @@ HLTEcalResonanceFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup
       ///save preshower rechits 
       if(storeRecHitES_){
 	std::set<DetId> used_strips_before = m_used_strips;  
-	makeClusterES(it_bc3->x(),it_bc3->y(),it_bc3->z(),geometry_es,topology_es);
+	makeClusterES(it_bc3->x(),it_bc3->y(),it_bc3->z(),geometry_es,topology_es.get());
 	auto ites = m_used_strips.begin();
 	for(; ites != m_used_strips.end(); ++ ites ){
 	  ESDetId d1 = ESDetId(*ites);
@@ -450,8 +450,6 @@ HLTEcalResonanceFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup
     
  
   
-  delete topology_es;
-  
   ////==============End of endcap ===============///
   
   if(debug_>=1) LogDebug("")<<" endcap_output_size run "<<iEvent.id().run()<<"_"<<iEvent.id().event()<<" nEESaved "<<selEERecHitCollection->size()<<" nESSaved: " << selESRecHitCollection->size() <<endl;
@@ -917,8 +915,8 @@ float HLTEcalResonanceFilter::GetDeltaR(float eta1, float eta2, float phi1, floa
 }
 
 
-void HLTEcalResonanceFilter::makeClusterES(float x, float y, float z,const CaloSubdetectorGeometry*& geometry_es,
-					CaloSubdetectorTopology*& topology_es
+void HLTEcalResonanceFilter::makeClusterES(float x, float y, float z, const CaloSubdetectorGeometry* geometry_es,
+                                           const CaloSubdetectorTopology* topology_es
 					){
   
   
diff --git a/HLTrigger/special/plugins/HLTEcalResonanceFilter.h b/HLTrigger/special/plugins/HLTEcalResonanceFilter.h
index 58cd274a6017b..56867b2925b5e 100644
--- a/HLTrigger/special/plugins/HLTEcalResonanceFilter.h
+++ b/HLTrigger/special/plugins/HLTEcalResonanceFilter.h
@@ -91,7 +91,7 @@ class HLTEcalResonanceFilter : public edm::EDFilter {
 		       ); 
       
       
-      void makeClusterES(float x, float y, float z,const CaloSubdetectorGeometry*&iSubGeom,CaloSubdetectorTopology*& topology_p);
+      void makeClusterES(float x, float y, float z,const CaloSubdetectorGeometry* iSubGeom,const CaloSubdetectorTopology* topology_p);
       
       void calcPaircluster(const reco::BasicCluster &bc1, const reco::BasicCluster &bc2, float &mpair, float &ptpair,float &etapair,float &phipair); 
       
diff --git a/HLTrigger/special/plugins/HLTMuonPointingFilter.cc b/HLTrigger/special/plugins/HLTMuonPointingFilter.cc
index 6c9642e62ac61..a890dcb0b2369 100644
--- a/HLTrigger/special/plugins/HLTMuonPointingFilter.cc
+++ b/HLTrigger/special/plugins/HLTMuonPointingFilter.cc
@@ -39,6 +39,9 @@ HLTMuonPointingFilter::HLTMuonPointingFilter(const edm::ParameterSet& pset) :
   thePropagatorName(pset.getParameter<std::string>("PropagatorName") ),
   theRadius(        pset.getParameter<double>("radius") ),              // cyl's radius (cm)
   theMaxZ(          pset.getParameter<double>("maxZ") ),                // cyl's half lenght (cm)
+  thePixHits(       pset.getParameter<unsigned int>("PixHits") ),       // pixel hits
+  theTkLayers(      pset.getParameter<unsigned int>("TkLayers") ),      // tracker layers with measurements
+  theMuonHits(      pset.getParameter<unsigned int>("MuonHits") ),      // muon hits
   thePropagator(nullptr),
   m_cacheRecordId(0)
 {
@@ -55,7 +58,11 @@ HLTMuonPointingFilter::HLTMuonPointingFilter(const edm::ParameterSet& pset) :
 
   LogDebug("HLTMuonPointing") << " SALabel : " << pset.getParameter<edm::InputTag>("SALabel")
     << " Radius : " << theRadius
-    << " Half lenght : " << theMaxZ;
+    << " Half lenght : " << theMaxZ
+    << " Min pixel hits : " << thePixHits
+    << " Min tk layers measurements : " << theTkLayers
+    << " Min muon hits : " << theMuonHits;
+
 }
 
 /// Destructor
@@ -94,6 +101,12 @@ bool HLTMuonPointingFilter::filter(edm::Event& event, const edm::EventSetup& eve
   for (staTrack = staTracks->begin(); staTrack != staTracks->end(); ++staTrack){
     reco::TransientTrack track(*staTrack,&*theMGField,theTrackingGeometry);
 
+    const reco::HitPattern& p = track.hitPattern();
+
+    const unsigned int pixelHits = p.numberOfValidPixelHits();
+    const unsigned int trkLayers = p.trackerLayersWithMeasurement();
+    const unsigned int nMuonHits = p.numberOfValidMuonHits();    
+
     TrajectoryStateOnSurface innerTSOS = track.innermostMeasurementState();
 
     LogDebug("HLTMuonPointing") << " InnerTSOS " << innerTSOS;
@@ -102,13 +115,25 @@ bool HLTMuonPointingFilter::filter(edm::Event& event, const edm::EventSetup& eve
       thePropagator->propagate(*innerTSOS.freeState(), *theCyl);
 
     if ( tsosAtCyl.isValid() ) {
-      LogDebug("HLTMuonPointing") << " extrap TSOS " << tsosAtCyl;
+      LogDebug("HLTMuonPointing") << " extrap TSOS " << tsosAtCyl
+        << " number of pixel hits " << pixelHits
+        << " number of tracker layers with interactions " << trkLayers
+	<< " number of muon hits " << nMuonHits;
       if (fabs(tsosAtCyl.globalPosition().z())<theMaxZ ) {
-        accept=true;
-        return accept;
+	if(pixelHits >= thePixHits){
+	  if(trkLayers >= theTkLayers){
+	    if(nMuonHits >= theMuonHits){
+	      accept=true;
+	      return accept;
+	    }
+	  }
+	}
       }
       else {
-        LogDebug("HLTMuonPointing") << " extrap TSOS z too big " << tsosAtCyl.globalPosition().z();
+        LogDebug("HLTMuonPointing") << " extrap TSOS z too big " << tsosAtCyl.globalPosition().z()
+ 	  << " number of pixel hits " << pixelHits
+ 	  << " number of tracker layers with interactions " << trkLayers
+	  << " number of muon hits " << nMuonHits;
 	TrajectoryStateOnSurface tsosAtPlane;
 	if (tsosAtCyl.globalPosition().z()>0)
 	  tsosAtPlane=thePropagator->propagate(*innerTSOS.freeState(), *thePosPlane);
@@ -117,8 +142,14 @@ bool HLTMuonPointingFilter::filter(edm::Event& event, const edm::EventSetup& eve
 
 	if (tsosAtPlane.isValid()){
 	  if (tsosAtPlane.globalPosition().perp()< theRadius){
-	    accept=true;
-	    return accept;
+	    if (pixelHits >= thePixHits){
+	      if(trkLayers >= theTkLayers){
+	  	if(nMuonHits >= theMuonHits){
+		  accept=true;
+		  return accept;
+		}
+	      }
+	    }
 	  }
 	}
 	else
@@ -140,6 +171,9 @@ void HLTMuonPointingFilter::fillDescriptions(edm::ConfigurationDescriptions & de
   desc.add<std::string>("PropagatorName", "SteppingHelixPropagatorAny");
   desc.add<double>("radius", 90.0);
   desc.add<double>("maxZ", 280.0);
+  desc.add<unsigned int>("PixHits",  0);
+  desc.add<unsigned int>("TkLayers",  0);
+  desc.add<unsigned int>("MuonHits", 0);
 
   descriptions.add("hltMuonPointingFilter", desc);
 }
diff --git a/HLTrigger/special/plugins/HLTMuonPointingFilter.h b/HLTrigger/special/plugins/HLTMuonPointingFilter.h
index a5b5eaa63f389..2edc5f76ccea8 100644
--- a/HLTrigger/special/plugins/HLTMuonPointingFilter.h
+++ b/HLTrigger/special/plugins/HLTMuonPointingFilter.h
@@ -49,6 +49,9 @@ class HLTMuonPointingFilter : public edm::EDFilter {
   const std::string thePropagatorName;      // name of propagator to be used
   const double theRadius;                   // radius of cylinder
   const double theMaxZ;                     // half length of cylinder
+  const unsigned int thePixHits;            // number of pixel hits
+  const unsigned int theTkLayers;           // number of tracker layers with measurements
+  const unsigned int theMuonHits;           // number of valid muon hits
 
   Cylinder::CylinderPointer theCyl;
   Plane::PlanePointer thePosPlane, theNegPlane;
diff --git a/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.cc b/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.cc
index 51c69f4af950a..7e147a9ae74b8 100644
--- a/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.cc
+++ b/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.cc
@@ -318,9 +318,9 @@ bool HLTRegionalEcalResonanceFilter::filter(edm::Event& iEvent, const edm::Event
   edm::ESHandle<CaloGeometry> geoHandle;
   iSetup.get<CaloGeometryRecord>().get(geoHandle); 
   const CaloSubdetectorGeometry *geometry_es = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalPreshower);
-  CaloSubdetectorTopology *topology_es=nullptr;
+  std::unique_ptr<CaloSubdetectorTopology> topology_es;
   if (geometry_es) {
-    topology_es  = new EcalPreshowerTopology(geoHandle);
+    topology_es  = std::make_unique<EcalPreshowerTopology>();
   }else{
     storeRecHitES_ = false; ///if no preshower
   }
@@ -485,7 +485,7 @@ bool HLTRegionalEcalResonanceFilter::filter(edm::Event& iEvent, const edm::Event
       ///save preshower rechits 
       if(storeRecHitES_){
 	std::set<DetId> used_strips_before = m_used_strips;  
-	makeClusterES(it_bc3->x(),it_bc3->y(),it_bc3->z(),geometry_es,topology_es);
+	makeClusterES(it_bc3->x(),it_bc3->y(),it_bc3->z(),geometry_es,topology_es.get());
 	auto ites = m_used_strips.begin();
 	for(; ites != m_used_strips.end(); ++ ites ){
 	  ESDetId d1 = ESDetId(*ites);
@@ -540,8 +540,6 @@ bool HLTRegionalEcalResonanceFilter::filter(edm::Event& iEvent, const edm::Event
     
  
   
-  delete topology_es;
-  
   ////==============End of endcap ===============///
   
   if(debug_>=1) 
@@ -1120,8 +1118,8 @@ bool HLTRegionalEcalResonanceFilter::checkStatusOfEcalRecHit(const EcalChannelSt
 }
 
 
-void HLTRegionalEcalResonanceFilter::makeClusterES(float x, float y, float z,const CaloSubdetectorGeometry*& geometry_es,
-					CaloSubdetectorTopology*& topology_es
+void HLTRegionalEcalResonanceFilter::makeClusterES(float x, float y, float z,const CaloSubdetectorGeometry* geometry_es,
+                                                   const CaloSubdetectorTopology* topology_es
 					){
   
   
diff --git a/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.h b/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.h
index 38f033a1d78f1..9eeac86a79271 100644
--- a/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.h
+++ b/HLTrigger/special/plugins/HLTRegionalEcalResonanceFilter.h
@@ -92,7 +92,7 @@ class HLTRegionalEcalResonanceFilter : public edm::stream::EDFilter<>
 		       ); 
       
       
-      void makeClusterES(float x, float y, float z,const CaloSubdetectorGeometry*&iSubGeom,CaloSubdetectorTopology*& topology_p);
+      void makeClusterES(float x, float y, float z,const CaloSubdetectorGeometry* iSubGeom,const CaloSubdetectorTopology* topology_p);
       
       void calcPaircluster(const reco::BasicCluster &bc1, const reco::BasicCluster &bc2, float &mpair, float &ptpair,float &etapair,float &phipair); 
       
diff --git a/HLTriggerOffline/B2G/interface/B2GDoubleLeptonHLTValidation.h b/HLTriggerOffline/B2G/interface/B2GDoubleLeptonHLTValidation.h
index 50f19bebc542b..45a5118ce8d01 100644
--- a/HLTriggerOffline/B2G/interface/B2GDoubleLeptonHLTValidation.h
+++ b/HLTriggerOffline/B2G/interface/B2GDoubleLeptonHLTValidation.h
@@ -2,10 +2,12 @@
 //
 // Package:    HLTriggerOffline/B2G
 // Class:      B2GDoubleLeptonHLTValidation
-// 
-/**\class B2GDoubleLeptonHLTValidation B2GDoubleLeptonHLTValidation.h HLTriggerOffline/B2G/interface/B2GDoubleLeptonHLTValidation.h
+//
+/**\class B2GDoubleLeptonHLTValidation B2GDoubleLeptonHLTValidation.h
+ HLTriggerOffline/B2G/interface/B2GDoubleLeptonHLTValidation.h
 
- Description: compute efficiencies of trigger paths on offline reco selection with respect to pt and eta
+ Description: compute efficiencies of trigger paths on offline reco selection
+ with respect to pt and eta
 
  Implementation:
      harvesting
@@ -22,90 +24,87 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
+#include "DataFormats/Common/interface/TriggerResults.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
-#include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/JetReco/interface/Jet.h"
+#include "DataFormats/MuonReco/interface/Muon.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
-#include "DataFormats/Common/interface/TriggerResults.h"
 
 //
 // class declaration
 //
 
 class B2GDoubleLeptonHLTValidation : public DQMEDAnalyzer {
-   public:
-      explicit B2GDoubleLeptonHLTValidation(const edm::ParameterSet&);
-      ~B2GDoubleLeptonHLTValidation() override;
-
-      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-
-
-   private:
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-      /// deduce monitorPath from label, the label is expected
-      /// to be of type 'selectionPath:monitorPath'
-      std::string monitorPath(const std::string& label) const { return label.substr(label.find(':')+1); };  
-      /// set configurable labels for trigger monitoring histograms
-      void triggerBinLabels(const std::vector<std::string>& labels);
-
-      // ----------member data ---------------------------
-      // DQM
-      std::string sDir_;
-      MonitorElement* hNumLeptonPt;
-      MonitorElement* hDenLeptonPt;
-      MonitorElement* hNumLeptonEta;
-      MonitorElement* hDenLeptonEta;
-      MonitorElement* hNumTriggerMon;
-      MonitorElement* hDenTriggerMon;
-      // Electrons
-      edm::Ptr<reco::GsfElectron> elec_;
-      std::string sElectrons_;
-      edm::EDGetTokenT< edm::View<reco::GsfElectron> > tokElectrons_;
-      double ptElectrons_;
-      double etaElectrons_;
-      double isoElectrons_;
-      unsigned int minElectrons_;
-      // Muons
-      edm::Ptr<reco::Muon> mu_;
-      std::string sMuons_;
-      edm::EDGetTokenT< edm::View<reco::Muon> > tokMuons_;
-      double ptMuons_;
-      double etaMuons_;
-      double isoMuons_;
-      unsigned int minMuons_;
-
-      //leptons
-      unsigned int minLeptons_;
-
-      // Trigger
-      std::string sTrigger_;
-      edm::EDGetTokenT<edm::TriggerResults> tokTrigger_;
-      std::vector<std::string> vsPaths_;
-      // Flags
-      bool isAll_ = false;
-      bool isSel_ = false;
+public:
+  explicit B2GDoubleLeptonHLTValidation(const edm::ParameterSet &);
+  ~B2GDoubleLeptonHLTValidation() override;
+
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
+
+private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  /// deduce monitorPath from label, the label is expected
+  /// to be of type 'selectionPath:monitorPath'
+  std::string monitorPath(const std::string &label) const { return label.substr(label.find(':') + 1); };
+  /// set configurable labels for trigger monitoring histograms
+  void triggerBinLabels(const std::vector<std::string> &labels);
+
+  // ----------member data ---------------------------
+  // DQM
+  std::string sDir_;
+  MonitorElement *hNumLeptonPt;
+  MonitorElement *hDenLeptonPt;
+  MonitorElement *hNumLeptonEta;
+  MonitorElement *hDenLeptonEta;
+  MonitorElement *hNumTriggerMon;
+  MonitorElement *hDenTriggerMon;
+  // Electrons
+  edm::Ptr<reco::GsfElectron> elec_;
+  std::string sElectrons_;
+  edm::EDGetTokenT<edm::View<reco::GsfElectron>> tokElectrons_;
+  double ptElectrons_;
+  double etaElectrons_;
+  double isoElectrons_;
+  unsigned int minElectrons_;
+  // Muons
+  edm::Ptr<reco::Muon> mu_;
+  std::string sMuons_;
+  edm::EDGetTokenT<edm::View<reco::Muon>> tokMuons_;
+  double ptMuons_;
+  double etaMuons_;
+  double isoMuons_;
+  unsigned int minMuons_;
 
+  // leptons
+  unsigned int minLeptons_;
+
+  // Trigger
+  std::string sTrigger_;
+  edm::EDGetTokenT<edm::TriggerResults> tokTrigger_;
+  std::vector<std::string> vsPaths_;
+  // Flags
+  bool isAll_ = false;
+  bool isSel_ = false;
 };
 
-inline void B2GDoubleLeptonHLTValidation::triggerBinLabels(const std::vector<std::string>& labels)
-{
-  for(unsigned int idx=0; idx<labels.size(); ++idx){
-    hNumTriggerMon->setBinLabel( idx+1, "["+monitorPath(labels[idx])+"]", 1);
-    hDenTriggerMon->setBinLabel( idx+1, "["+monitorPath(labels[idx])+"]", 1);
+inline void B2GDoubleLeptonHLTValidation::triggerBinLabels(const std::vector<std::string> &labels) {
+  for (unsigned int idx = 0; idx < labels.size(); ++idx) {
+    hNumTriggerMon->setBinLabel(idx + 1, "[" + monitorPath(labels[idx]) + "]", 1);
+    hDenTriggerMon->setBinLabel(idx + 1, "[" + monitorPath(labels[idx]) + "]", 1);
   }
 }
 
@@ -120,40 +119,36 @@ inline void B2GDoubleLeptonHLTValidation::triggerBinLabels(const std::vector<std
 //
 // constructors and destructor
 //
-B2GDoubleLeptonHLTValidation::B2GDoubleLeptonHLTValidation(const edm::ParameterSet& iConfig) :
-  sDir_(iConfig.getUntrackedParameter<std::string>("sDir","HLTValidation/B2G/Efficiencies/")),
-  sElectrons_(iConfig.getUntrackedParameter<std::string>("sElectrons","gsfElectrons")),
-  ptElectrons_(iConfig.getUntrackedParameter<double>("ptElectrons",0.)),
-  etaElectrons_(iConfig.getUntrackedParameter<double>("etaElectrons",0.)),
-  isoElectrons_(iConfig.getUntrackedParameter<double>("isoElectrons",0.)),
-  minElectrons_(iConfig.getUntrackedParameter<unsigned int>("minElectrons",0)),
-  sMuons_(iConfig.getUntrackedParameter<std::string>("sMuons","muons")),
-  ptMuons_(iConfig.getUntrackedParameter<double>("ptMuons",0.)),
-  etaMuons_(iConfig.getUntrackedParameter<double>("etaMuons",0.)),
-  isoMuons_(iConfig.getUntrackedParameter<double>("isoMuons",0.)),
-  minMuons_(iConfig.getUntrackedParameter<unsigned int>("minMuons",0)),
-  minLeptons_(iConfig.getUntrackedParameter<unsigned int>("minLeptons",0)),
-  sTrigger_(iConfig.getUntrackedParameter<std::string>("sTrigger","TriggerResults")),
-  vsPaths_(iConfig.getUntrackedParameter< std::vector<std::string> >("vsPaths"))
+B2GDoubleLeptonHLTValidation::B2GDoubleLeptonHLTValidation(const edm::ParameterSet &iConfig)
+    : sDir_(iConfig.getUntrackedParameter<std::string>("sDir", "HLTValidation/B2G/Efficiencies/")),
+      sElectrons_(iConfig.getUntrackedParameter<std::string>("sElectrons", "gsfElectrons")),
+      ptElectrons_(iConfig.getUntrackedParameter<double>("ptElectrons", 0.)),
+      etaElectrons_(iConfig.getUntrackedParameter<double>("etaElectrons", 0.)),
+      isoElectrons_(iConfig.getUntrackedParameter<double>("isoElectrons", 0.)),
+      minElectrons_(iConfig.getUntrackedParameter<unsigned int>("minElectrons", 0)),
+      sMuons_(iConfig.getUntrackedParameter<std::string>("sMuons", "muons")),
+      ptMuons_(iConfig.getUntrackedParameter<double>("ptMuons", 0.)),
+      etaMuons_(iConfig.getUntrackedParameter<double>("etaMuons", 0.)),
+      isoMuons_(iConfig.getUntrackedParameter<double>("isoMuons", 0.)),
+      minMuons_(iConfig.getUntrackedParameter<unsigned int>("minMuons", 0)),
+      minLeptons_(iConfig.getUntrackedParameter<unsigned int>("minLeptons", 0)),
+      sTrigger_(iConfig.getUntrackedParameter<std::string>("sTrigger", "TriggerResults")),
+      vsPaths_(iConfig.getUntrackedParameter<std::vector<std::string>>("vsPaths"))
 
 {
   // Electrons
-  tokElectrons_ = consumes< edm::View<reco::GsfElectron> >(edm::InputTag(sElectrons_));
+  tokElectrons_ = consumes<edm::View<reco::GsfElectron>>(edm::InputTag(sElectrons_));
   // Muons
-  tokMuons_ = consumes< edm::View<reco::Muon> >(edm::InputTag(sMuons_));
+  tokMuons_ = consumes<edm::View<reco::Muon>>(edm::InputTag(sMuons_));
   // Trigger
   tokTrigger_ = consumes<edm::TriggerResults>(edm::InputTag(sTrigger_, "", "HLT"));
 }
 
-
-B2GDoubleLeptonHLTValidation::~B2GDoubleLeptonHLTValidation()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+B2GDoubleLeptonHLTValidation::~B2GDoubleLeptonHLTValidation() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 #endif
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(B2GDoubleLeptonHLTValidation);
diff --git a/HLTriggerOffline/B2G/interface/B2GHadronicHLTValidation.h b/HLTriggerOffline/B2G/interface/B2GHadronicHLTValidation.h
index 7a099323a5320..f5d6449411ad3 100644
--- a/HLTriggerOffline/B2G/interface/B2GHadronicHLTValidation.h
+++ b/HLTriggerOffline/B2G/interface/B2GHadronicHLTValidation.h
@@ -2,10 +2,12 @@
 //
 // Package:    HLTriggerOffline/B2G
 // Class:      B2GHadronicHLTValidation
-// 
-/**\class B2GHadronicHLTValidation B2GHadronicHLTValidation.h HLTriggerOffline/B2G/interface/B2GHadronicHLTValidation.h
+//
+/**\class B2GHadronicHLTValidation B2GHadronicHLTValidation.h
+ HLTriggerOffline/B2G/interface/B2GHadronicHLTValidation.h
 
- Description: compute efficiencies of trigger paths on offline reco selection with respect to pt and eta
+ Description: compute efficiencies of trigger paths on offline reco selection
+ with respect to pt and eta
 
  Implementation:
      harvesting
@@ -22,80 +24,77 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
+#include "DataFormats/Common/interface/TriggerResults.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
-#include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/JetReco/interface/Jet.h"
+#include "DataFormats/MuonReco/interface/Muon.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
-#include "DataFormats/Common/interface/TriggerResults.h"
 
 //
 // class declaration
 //
 
 class B2GHadronicHLTValidation : public DQMEDAnalyzer {
-   public:
-      explicit B2GHadronicHLTValidation(const edm::ParameterSet&);
-      ~B2GHadronicHLTValidation() override;
-
-      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-
-
-   private:
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-      /// deduce monitorPath from label, the label is expected
-      /// to be of type 'selectionPath:monitorPath'
-      std::string monitorPath(const std::string& label) const { return label.substr(label.find(':')+1); };  
-      /// set configurable labels for trigger monitoring histograms
-      void triggerBinLabels(const std::vector<std::string>& labels);
-
-      // ----------member data ---------------------------
-      // DQM
-      std::string sDir_;
-      MonitorElement* hNumJetPt;
-      MonitorElement* hDenJetPt;
-      MonitorElement* hNumJetEta;
-      MonitorElement* hDenJetEta;
-      MonitorElement* hNumTriggerMon;
-      MonitorElement* hDenTriggerMon;
-      // Jets
-      edm::Ptr<reco::Jet> jet_;
-      std::string sJets_;
-      edm::EDGetTokenT< edm::View<reco::Jet> > tokJets_;
-      double ptJets_;
-      double ptJets0_;
-      double ptJets1_;
-      double etaJets_;
-      unsigned int minJets_;
-      double htMin_;
-      // Trigger
-      std::string sTrigger_;
-      edm::EDGetTokenT<edm::TriggerResults> tokTrigger_;
-      std::vector<std::string> vsPaths_;
-      // Flags
-      bool isAll_ = false;
-      bool isSel_ = false;
-
+public:
+  explicit B2GHadronicHLTValidation(const edm::ParameterSet &);
+  ~B2GHadronicHLTValidation() override;
+
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
+
+private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  /// deduce monitorPath from label, the label is expected
+  /// to be of type 'selectionPath:monitorPath'
+  std::string monitorPath(const std::string &label) const { return label.substr(label.find(':') + 1); };
+  /// set configurable labels for trigger monitoring histograms
+  void triggerBinLabels(const std::vector<std::string> &labels);
+
+  // ----------member data ---------------------------
+  // DQM
+  std::string sDir_;
+  MonitorElement *hNumJetPt;
+  MonitorElement *hDenJetPt;
+  MonitorElement *hNumJetEta;
+  MonitorElement *hDenJetEta;
+  MonitorElement *hNumTriggerMon;
+  MonitorElement *hDenTriggerMon;
+  // Jets
+  edm::Ptr<reco::Jet> jet_;
+  std::string sJets_;
+  edm::EDGetTokenT<edm::View<reco::Jet>> tokJets_;
+  double ptJets_;
+  double ptJets0_;
+  double ptJets1_;
+  double etaJets_;
+  unsigned int minJets_;
+  double htMin_;
+  // Trigger
+  std::string sTrigger_;
+  edm::EDGetTokenT<edm::TriggerResults> tokTrigger_;
+  std::vector<std::string> vsPaths_;
+  // Flags
+  bool isAll_ = false;
+  bool isSel_ = false;
 };
 
-inline void B2GHadronicHLTValidation::triggerBinLabels(const std::vector<std::string>& labels)
-{
-  for(unsigned int idx=0; idx<labels.size(); ++idx){
-    hNumTriggerMon->setBinLabel( idx+1, "["+monitorPath(labels[idx])+"]", 1);
-    hDenTriggerMon->setBinLabel( idx+1, "["+monitorPath(labels[idx])+"]", 1);
+inline void B2GHadronicHLTValidation::triggerBinLabels(const std::vector<std::string> &labels) {
+  for (unsigned int idx = 0; idx < labels.size(); ++idx) {
+    hNumTriggerMon->setBinLabel(idx + 1, "[" + monitorPath(labels[idx]) + "]", 1);
+    hDenTriggerMon->setBinLabel(idx + 1, "[" + monitorPath(labels[idx]) + "]", 1);
   }
 }
 
@@ -110,34 +109,30 @@ inline void B2GHadronicHLTValidation::triggerBinLabels(const std::vector<std::st
 //
 // constructors and destructor
 //
-B2GHadronicHLTValidation::B2GHadronicHLTValidation(const edm::ParameterSet& iConfig) :
-  sDir_(iConfig.getUntrackedParameter<std::string>("sDir","HLTValidation/B2G/Efficiencies/")),
-  sJets_(iConfig.getUntrackedParameter<std::string>("sJets","ak5PFJets")),
-  ptJets_(iConfig.getUntrackedParameter<double>("ptJets",0.)),
-  ptJets0_(iConfig.getUntrackedParameter<double>("ptJets0",0.)),
-  ptJets1_(iConfig.getUntrackedParameter<double>("ptJets1",0.)),
-  etaJets_(iConfig.getUntrackedParameter<double>("etaJets",0.)),
-  minJets_(iConfig.getUntrackedParameter<unsigned int>("minJets",0)),
-  htMin_(iConfig.getUntrackedParameter<double>("htMin",0.0)),
-  sTrigger_(iConfig.getUntrackedParameter<std::string>("sTrigger","TriggerResults")),
-  vsPaths_(iConfig.getUntrackedParameter< std::vector<std::string> >("vsPaths"))
+B2GHadronicHLTValidation::B2GHadronicHLTValidation(const edm::ParameterSet &iConfig)
+    : sDir_(iConfig.getUntrackedParameter<std::string>("sDir", "HLTValidation/B2G/Efficiencies/")),
+      sJets_(iConfig.getUntrackedParameter<std::string>("sJets", "ak5PFJets")),
+      ptJets_(iConfig.getUntrackedParameter<double>("ptJets", 0.)),
+      ptJets0_(iConfig.getUntrackedParameter<double>("ptJets0", 0.)),
+      ptJets1_(iConfig.getUntrackedParameter<double>("ptJets1", 0.)),
+      etaJets_(iConfig.getUntrackedParameter<double>("etaJets", 0.)),
+      minJets_(iConfig.getUntrackedParameter<unsigned int>("minJets", 0)),
+      htMin_(iConfig.getUntrackedParameter<double>("htMin", 0.0)),
+      sTrigger_(iConfig.getUntrackedParameter<std::string>("sTrigger", "TriggerResults")),
+      vsPaths_(iConfig.getUntrackedParameter<std::vector<std::string>>("vsPaths"))
 
 {
   // Jets
-  tokJets_ = consumes< edm::View<reco::Jet> >(edm::InputTag(sJets_));
+  tokJets_ = consumes<edm::View<reco::Jet>>(edm::InputTag(sJets_));
   // Trigger
   tokTrigger_ = consumes<edm::TriggerResults>(edm::InputTag(sTrigger_, "", "HLT"));
 }
 
-
-B2GHadronicHLTValidation::~B2GHadronicHLTValidation()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+B2GHadronicHLTValidation::~B2GHadronicHLTValidation() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 #endif
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(B2GHadronicHLTValidation);
diff --git a/HLTriggerOffline/B2G/interface/B2GSingleLeptonHLTValidation.h b/HLTriggerOffline/B2G/interface/B2GSingleLeptonHLTValidation.h
index d6fa3d62b40af..65c0e07e98075 100644
--- a/HLTriggerOffline/B2G/interface/B2GSingleLeptonHLTValidation.h
+++ b/HLTriggerOffline/B2G/interface/B2GSingleLeptonHLTValidation.h
@@ -2,10 +2,12 @@
 //
 // Package:    HLTriggerOffline/B2G
 // Class:      B2GSingleLeptonHLTValidation
-// 
-/**\class B2GSingleLeptonHLTValidation B2GSingleLeptonHLTValidation.h HLTriggerOffline/B2G/interface/B2GSingleLeptonHLTValidation.h
+//
+/**\class B2GSingleLeptonHLTValidation B2GSingleLeptonHLTValidation.h
+ HLTriggerOffline/B2G/interface/B2GSingleLeptonHLTValidation.h
 
- Description: compute efficiencies of trigger paths on offline reco selection with respect to pt and eta
+ Description: compute efficiencies of trigger paths on offline reco selection
+ with respect to pt and eta
 
  Implementation:
      harvesting
@@ -22,99 +24,96 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
+#include "DataFormats/Common/interface/TriggerResults.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
-#include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/JetReco/interface/Jet.h"
+#include "DataFormats/MuonReco/interface/Muon.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
-#include "DataFormats/Common/interface/TriggerResults.h"
 
 //
 // class declaration
 //
 
 class B2GSingleLeptonHLTValidation : public DQMEDAnalyzer {
-   public:
-      explicit B2GSingleLeptonHLTValidation(const edm::ParameterSet&);
-      ~B2GSingleLeptonHLTValidation() override;
-
-      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-
-
-   private:
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-      /// deduce monitorPath from label, the label is expected
-      /// to be of type 'selectionPath:monitorPath'
-      std::string monitorPath(const std::string& label) const { return label.substr(label.find(':')+1); };  
-      /// set configurable labels for trigger monitoring histograms
-      void triggerBinLabels(const std::vector<std::string>& labels);
-
-      // ----------member data ---------------------------
-      // DQM
-      std::string sDir_;
-      MonitorElement* hNumLeptonPt;
-      MonitorElement* hDenLeptonPt;
-      MonitorElement* hNumLeptonEta;
-      MonitorElement* hDenLeptonEta;
-      MonitorElement* hNumJetPt;
-      MonitorElement* hDenJetPt;
-      MonitorElement* hNumJetEta;
-      MonitorElement* hDenJetEta;
-      MonitorElement* hNumTriggerMon;
-      MonitorElement* hDenTriggerMon;
-      // Electrons
-      edm::Ptr<reco::GsfElectron> elec_;
-      std::string sElectrons_;
-      edm::EDGetTokenT< edm::View<reco::GsfElectron> > tokElectrons_;
-      double ptElectrons_;
-      double etaElectrons_;
-      double isoElectrons_;
-      unsigned int minElectrons_;
-      // Muons
-      edm::Ptr<reco::Muon> mu_;
-      std::string sMuons_;
-      edm::EDGetTokenT< edm::View<reco::Muon> > tokMuons_;
-      double ptMuons_;
-      double etaMuons_;
-      double isoMuons_;
-      unsigned int minMuons_;
-      // Jets
-      edm::Ptr<reco::Jet> jet_;
-      std::string sJets_;
-      edm::EDGetTokenT< edm::View<reco::Jet> > tokJets_;
-      double ptJets_;
-      double ptJets0_;
-      double ptJets1_;
-      double etaJets_;
-      unsigned int minJets_;
-      // Trigger
-      std::string sTrigger_;
-      edm::EDGetTokenT<edm::TriggerResults> tokTrigger_;
-      std::vector<std::string> vsPaths_;
-      // Flags
-      bool isAll_ = false;
-      bool isSel_ = false;
-
+public:
+  explicit B2GSingleLeptonHLTValidation(const edm::ParameterSet &);
+  ~B2GSingleLeptonHLTValidation() override;
+
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
+
+private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  /// deduce monitorPath from label, the label is expected
+  /// to be of type 'selectionPath:monitorPath'
+  std::string monitorPath(const std::string &label) const { return label.substr(label.find(':') + 1); };
+  /// set configurable labels for trigger monitoring histograms
+  void triggerBinLabels(const std::vector<std::string> &labels);
+
+  // ----------member data ---------------------------
+  // DQM
+  std::string sDir_;
+  MonitorElement *hNumLeptonPt;
+  MonitorElement *hDenLeptonPt;
+  MonitorElement *hNumLeptonEta;
+  MonitorElement *hDenLeptonEta;
+  MonitorElement *hNumJetPt;
+  MonitorElement *hDenJetPt;
+  MonitorElement *hNumJetEta;
+  MonitorElement *hDenJetEta;
+  MonitorElement *hNumTriggerMon;
+  MonitorElement *hDenTriggerMon;
+  // Electrons
+  edm::Ptr<reco::GsfElectron> elec_;
+  std::string sElectrons_;
+  edm::EDGetTokenT<edm::View<reco::GsfElectron>> tokElectrons_;
+  double ptElectrons_;
+  double etaElectrons_;
+  double isoElectrons_;
+  unsigned int minElectrons_;
+  // Muons
+  edm::Ptr<reco::Muon> mu_;
+  std::string sMuons_;
+  edm::EDGetTokenT<edm::View<reco::Muon>> tokMuons_;
+  double ptMuons_;
+  double etaMuons_;
+  double isoMuons_;
+  unsigned int minMuons_;
+  // Jets
+  edm::Ptr<reco::Jet> jet_;
+  std::string sJets_;
+  edm::EDGetTokenT<edm::View<reco::Jet>> tokJets_;
+  double ptJets_;
+  double ptJets0_;
+  double ptJets1_;
+  double etaJets_;
+  unsigned int minJets_;
+  // Trigger
+  std::string sTrigger_;
+  edm::EDGetTokenT<edm::TriggerResults> tokTrigger_;
+  std::vector<std::string> vsPaths_;
+  // Flags
+  bool isAll_ = false;
+  bool isSel_ = false;
 };
 
-inline void B2GSingleLeptonHLTValidation::triggerBinLabels(const std::vector<std::string>& labels)
-{
-  for(unsigned int idx=0; idx<labels.size(); ++idx){
-    hNumTriggerMon->setBinLabel( idx+1, "["+monitorPath(labels[idx])+"]", 1);
-    hDenTriggerMon->setBinLabel( idx+1, "["+monitorPath(labels[idx])+"]", 1);
+inline void B2GSingleLeptonHLTValidation::triggerBinLabels(const std::vector<std::string> &labels) {
+  for (unsigned int idx = 0; idx < labels.size(); ++idx) {
+    hNumTriggerMon->setBinLabel(idx + 1, "[" + monitorPath(labels[idx]) + "]", 1);
+    hDenTriggerMon->setBinLabel(idx + 1, "[" + monitorPath(labels[idx]) + "]", 1);
   }
 }
 
@@ -129,47 +128,43 @@ inline void B2GSingleLeptonHLTValidation::triggerBinLabels(const std::vector<std
 //
 // constructors and destructor
 //
-B2GSingleLeptonHLTValidation::B2GSingleLeptonHLTValidation(const edm::ParameterSet& iConfig) :
-  sDir_(iConfig.getUntrackedParameter<std::string>("sDir","HLTValidation/B2G/Efficiencies/")),
-  sElectrons_(iConfig.getUntrackedParameter<std::string>("sElectrons","gsfElectrons")),
-  ptElectrons_(iConfig.getUntrackedParameter<double>("ptElectrons",0.)),
-  etaElectrons_(iConfig.getUntrackedParameter<double>("etaElectrons",0.)),
-  isoElectrons_(iConfig.getUntrackedParameter<double>("isoElectrons",0.)),
-  minElectrons_(iConfig.getUntrackedParameter<unsigned int>("minElectrons",0)),
-  sMuons_(iConfig.getUntrackedParameter<std::string>("sMuons","muons")),
-  ptMuons_(iConfig.getUntrackedParameter<double>("ptMuons",0.)),
-  etaMuons_(iConfig.getUntrackedParameter<double>("etaMuons",0.)),
-  isoMuons_(iConfig.getUntrackedParameter<double>("isoMuons",0.)),
-  minMuons_(iConfig.getUntrackedParameter<unsigned int>("minMuons",0)),
-  sJets_(iConfig.getUntrackedParameter<std::string>("sJets","ak5PFJets")),
-  ptJets_(iConfig.getUntrackedParameter<double>("ptJets",0.)),
-  ptJets0_(iConfig.getUntrackedParameter<double>("ptJets0",0.)),
-  ptJets1_(iConfig.getUntrackedParameter<double>("ptJets1",0.)),
-  etaJets_(iConfig.getUntrackedParameter<double>("etaJets",0.)),
-  minJets_(iConfig.getUntrackedParameter<unsigned int>("minJets",0)),
-  sTrigger_(iConfig.getUntrackedParameter<std::string>("sTrigger","TriggerResults")),
-  vsPaths_(iConfig.getUntrackedParameter< std::vector<std::string> >("vsPaths"))
+B2GSingleLeptonHLTValidation::B2GSingleLeptonHLTValidation(const edm::ParameterSet &iConfig)
+    : sDir_(iConfig.getUntrackedParameter<std::string>("sDir", "HLTValidation/B2G/Efficiencies/")),
+      sElectrons_(iConfig.getUntrackedParameter<std::string>("sElectrons", "gsfElectrons")),
+      ptElectrons_(iConfig.getUntrackedParameter<double>("ptElectrons", 0.)),
+      etaElectrons_(iConfig.getUntrackedParameter<double>("etaElectrons", 0.)),
+      isoElectrons_(iConfig.getUntrackedParameter<double>("isoElectrons", 0.)),
+      minElectrons_(iConfig.getUntrackedParameter<unsigned int>("minElectrons", 0)),
+      sMuons_(iConfig.getUntrackedParameter<std::string>("sMuons", "muons")),
+      ptMuons_(iConfig.getUntrackedParameter<double>("ptMuons", 0.)),
+      etaMuons_(iConfig.getUntrackedParameter<double>("etaMuons", 0.)),
+      isoMuons_(iConfig.getUntrackedParameter<double>("isoMuons", 0.)),
+      minMuons_(iConfig.getUntrackedParameter<unsigned int>("minMuons", 0)),
+      sJets_(iConfig.getUntrackedParameter<std::string>("sJets", "ak5PFJets")),
+      ptJets_(iConfig.getUntrackedParameter<double>("ptJets", 0.)),
+      ptJets0_(iConfig.getUntrackedParameter<double>("ptJets0", 0.)),
+      ptJets1_(iConfig.getUntrackedParameter<double>("ptJets1", 0.)),
+      etaJets_(iConfig.getUntrackedParameter<double>("etaJets", 0.)),
+      minJets_(iConfig.getUntrackedParameter<unsigned int>("minJets", 0)),
+      sTrigger_(iConfig.getUntrackedParameter<std::string>("sTrigger", "TriggerResults")),
+      vsPaths_(iConfig.getUntrackedParameter<std::vector<std::string>>("vsPaths"))
 
 {
   // Electrons
-  tokElectrons_ = consumes< edm::View<reco::GsfElectron> >(edm::InputTag(sElectrons_));
+  tokElectrons_ = consumes<edm::View<reco::GsfElectron>>(edm::InputTag(sElectrons_));
   // Muons
-  tokMuons_ = consumes< edm::View<reco::Muon> >(edm::InputTag(sMuons_));
+  tokMuons_ = consumes<edm::View<reco::Muon>>(edm::InputTag(sMuons_));
   // Jets
-  tokJets_ = consumes< edm::View<reco::Jet> >(edm::InputTag(sJets_));
+  tokJets_ = consumes<edm::View<reco::Jet>>(edm::InputTag(sJets_));
   // Trigger
   tokTrigger_ = consumes<edm::TriggerResults>(edm::InputTag(sTrigger_, "", "HLT"));
 }
 
-
-B2GSingleLeptonHLTValidation::~B2GSingleLeptonHLTValidation()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+B2GSingleLeptonHLTValidation::~B2GSingleLeptonHLTValidation() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 #endif
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(B2GSingleLeptonHLTValidation);
diff --git a/HLTriggerOffline/B2G/src/B2GDoubleLeptonHLTValidation.cc b/HLTriggerOffline/B2G/src/B2GDoubleLeptonHLTValidation.cc
index e5566d695cccb..d03793e0be4b6 100644
--- a/HLTriggerOffline/B2G/src/B2GDoubleLeptonHLTValidation.cc
+++ b/HLTriggerOffline/B2G/src/B2GDoubleLeptonHLTValidation.cc
@@ -2,12 +2,14 @@
 //
 // Package:    HLTriggerOffline/B2G
 // Class:      B2GDoubleLeptonHLTValidation
-// 
-/**\class B2GDoubleLeptonHLTValidation B2GDoubleLeptonHLTValidation.cc HLTriggerOffline/B2G/src/B2GDoubleLeptonHLTValidation.cc
+//
+/**\class B2GDoubleLeptonHLTValidation B2GDoubleLeptonHLTValidation.cc
+HLTriggerOffline/B2G/src/B2GDoubleLeptonHLTValidation.cc
 
-Description: 
+Description:
 
-Description: compute efficiencies of trigger paths on offline reco selection with respect to subleading lepton pt and eta
+Description: compute efficiencies of trigger paths on offline reco selection
+with respect to subleading lepton pt and eta
 
 Implementation:
 harvesting
@@ -31,134 +33,140 @@ harvesting
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
+#include "DataFormats/MuonReco/interface/MuonPFIsolation.h"
+#include "FWCore/Common/interface/TriggerNames.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
-#include "FWCore/Common/interface/TriggerNames.h"
 #include "TString.h"
-#include "DataFormats/MuonReco/interface/MuonPFIsolation.h"
 //
 // member functions
 //
 
 // ------------ method called for each event  ------------
-  void
-B2GDoubleLeptonHLTValidation::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{ 
+void B2GDoubleLeptonHLTValidation::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace edm;
 
-  isAll_ = false; isSel_ = false;
+  isAll_ = false;
+  isSel_ = false;
 
-  // Electrons 
-  Handle< edm::View<reco::GsfElectron> > electrons;
-  if (!iEvent.getByToken(tokElectrons_,electrons))
+  // Electrons
+  Handle<edm::View<reco::GsfElectron>> electrons;
+  if (!iEvent.getByToken(tokElectrons_, electrons))
     edm::LogWarning("B2GDoubleLeptonHLTValidation") << "Electrons collection not found \n";
   unsigned int nGoodE = 0;
-  for(edm::View<reco::GsfElectron>::const_iterator e = electrons->begin(); e != electrons->end(); ++e){
-    if (e->pt() < ptElectrons_) continue;
-    if (fabs(e->eta()) > etaElectrons_) continue;
+  for (edm::View<reco::GsfElectron>::const_iterator e = electrons->begin(); e != electrons->end(); ++e) {
+    if (e->pt() < ptElectrons_)
+      continue;
+    if (fabs(e->eta()) > etaElectrons_)
+      continue;
     nGoodE++;
-    //leptons come sorted so use only 2nd
-    if (nGoodE == 2) elec_ = electrons->ptrAt( e - electrons->begin());
+    // leptons come sorted so use only 2nd
+    if (nGoodE == 2)
+      elec_ = electrons->ptrAt(e - electrons->begin());
   }
-  // Muons 
-  Handle< edm::View<reco::Muon> > muons;
-  if (!iEvent.getByToken(tokMuons_,muons))
+  // Muons
+  Handle<edm::View<reco::Muon>> muons;
+  if (!iEvent.getByToken(tokMuons_, muons))
     edm::LogWarning("B2GDoubleLeptonHLTValidation") << "Muons collection not found \n";
   unsigned int nGoodM = 0;
-  for(edm::View<reco::Muon>::const_iterator m = muons->begin(); m != muons->end(); ++m){
-    if (!m->isPFMuon() || !m->isGlobalMuon()) continue;
-    if (m->pt() < ptMuons_) continue;
-    if (fabs(m->eta()) > etaMuons_) continue;
+  for (edm::View<reco::Muon>::const_iterator m = muons->begin(); m != muons->end(); ++m) {
+    if (!m->isPFMuon() || !m->isGlobalMuon())
+      continue;
+    if (m->pt() < ptMuons_)
+      continue;
+    if (fabs(m->eta()) > etaMuons_)
+      continue;
     nGoodM++;
-    //leptons come sorted so use only 2nd
-    if (nGoodM == 2) mu_ = muons->ptrAt( m - muons->begin() );
+    // leptons come sorted so use only 2nd
+    if (nGoodM == 2)
+      mu_ = muons->ptrAt(m - muons->begin());
   }
 
-  if (nGoodE >= minElectrons_ && nGoodM >= minMuons_ && nGoodE + nGoodM >= minLeptons_) isAll_ = true;
+  if (nGoodE >= minElectrons_ && nGoodM >= minMuons_ && nGoodE + nGoodM >= minLeptons_)
+    isAll_ = true;
 
-
-  //Trigger
+  // Trigger
   Handle<edm::TriggerResults> triggerTable;
-  if (!iEvent.getByToken(tokTrigger_,triggerTable))
+  if (!iEvent.getByToken(tokTrigger_, triggerTable))
     edm::LogWarning("B2GDoubleLeptonHLTValidation") << "Trigger collection not found \n";
-  const edm::TriggerNames& triggerNames = iEvent.triggerNames(*triggerTable);
+  const edm::TriggerNames &triggerNames = iEvent.triggerNames(*triggerTable);
   bool isInteresting = false;
-  for (unsigned int i=0; i<triggerNames.triggerNames().size(); ++i) {
-    for (unsigned int j=0; j<vsPaths_.size(); j++) {
+  for (unsigned int i = 0; i < triggerNames.triggerNames().size(); ++i) {
+    for (unsigned int j = 0; j < vsPaths_.size(); j++) {
       if (triggerNames.triggerNames()[i].find(vsPaths_[j]) != std::string::npos) {
-        isInteresting = true; 
+        isInteresting = true;
         break;
       }
     }
-    if (isInteresting) break;
+    if (isInteresting)
+      break;
   }
 
-  if (isAll_ && isInteresting) isSel_ = true;
-  else isSel_ = false;
+  if (isAll_ && isInteresting)
+    isSel_ = true;
+  else
+    isSel_ = false;
 
-  //Histos
+  // Histos
   if (isAll_) {
-    //here and below, change to nGoodE/M instead of min since we are taking subleading
-    if (nGoodE > 1 && elec_.isNonnull() ) {
+    // here and below, change to nGoodE/M instead of min since we are taking
+    // subleading
+    if (nGoodE > 1 && elec_.isNonnull()) {
       hDenLeptonPt->Fill(elec_->pt());
       hDenLeptonEta->Fill(elec_->eta());
     }
-    if (nGoodM > 1 && mu_.isNonnull() ) {
+    if (nGoodM > 1 && mu_.isNonnull()) {
       hDenLeptonPt->Fill(mu_->pt());
       hDenLeptonEta->Fill(mu_->eta());
     }
-    for(unsigned int idx=0; idx<vsPaths_.size(); ++idx){
-      hDenTriggerMon->Fill(idx+0.5);
+    for (unsigned int idx = 0; idx < vsPaths_.size(); ++idx) {
+      hDenTriggerMon->Fill(idx + 0.5);
     }
-
   }
   if (isSel_) {
-    if (nGoodE > 1 && elec_.isNonnull() ) {
+    if (nGoodE > 1 && elec_.isNonnull()) {
       hNumLeptonPt->Fill(elec_->pt());
       hNumLeptonEta->Fill(elec_->eta());
     }
-    if (nGoodM > 1 && mu_.isNonnull() ) {
+    if (nGoodM > 1 && mu_.isNonnull()) {
       hNumLeptonPt->Fill(mu_->pt());
       hNumLeptonEta->Fill(mu_->eta());
     }
 
-    for (unsigned int i=0; i<triggerNames.triggerNames().size(); ++i) {
-      for (unsigned int j=0; j<vsPaths_.size(); j++) {
+    for (unsigned int i = 0; i < triggerNames.triggerNames().size(); ++i) {
+      for (unsigned int j = 0; j < vsPaths_.size(); j++) {
         if (triggerNames.triggerNames()[i].find(vsPaths_[j]) != std::string::npos) {
-          hNumTriggerMon->Fill(j+0.5 );
+          hNumTriggerMon->Fill(j + 0.5);
         }
       }
     }
   }
 }
 
-
 // ------------ booking histograms -----------
-  void
-B2GDoubleLeptonHLTValidation::bookHistograms(DQMStore::IBooker & dbe, edm::Run const &, edm::EventSetup const &)
-{
+void B2GDoubleLeptonHLTValidation::bookHistograms(DQMStore::IBooker &dbe, edm::Run const &, edm::EventSetup const &) {
   dbe.setCurrentFolder(sDir_);
-  hDenLeptonPt  = dbe.book1D("PtLeptonAll", "PtLeptonAll", 50, 0., 2500.);
-  hDenLeptonEta = dbe.book1D("EtaLeptonAll", "EtaLeptonAll", 30, -3. , 3.);
-  hNumLeptonPt  = dbe.book1D("PtLeptonSel", "PtLeptonSel", 50, 0., 2500.);
-  hNumLeptonEta = dbe.book1D("EtaLeptonSel", "EtaLeptonSel", 30, -3. , 3.);
+  hDenLeptonPt = dbe.book1D("PtLeptonAll", "PtLeptonAll", 50, 0., 2500.);
+  hDenLeptonEta = dbe.book1D("EtaLeptonAll", "EtaLeptonAll", 30, -3., 3.);
+  hNumLeptonPt = dbe.book1D("PtLeptonSel", "PtLeptonSel", 50, 0., 2500.);
+  hNumLeptonEta = dbe.book1D("EtaLeptonSel", "EtaLeptonSel", 30, -3., 3.);
   // determine number of bins for trigger monitoring
   unsigned int nPaths = vsPaths_.size();
   // monitored trigger occupancy for single lepton triggers
-  hNumTriggerMon    = dbe.book1D("TriggerMonSel" , "TriggerMonSel", nPaths, 0.,  nPaths);
-  hDenTriggerMon    = dbe.book1D("TriggerMonAll" , "TriggerMonAll", nPaths, 0.,  nPaths);
+  hNumTriggerMon = dbe.book1D("TriggerMonSel", "TriggerMonSel", nPaths, 0., nPaths);
+  hDenTriggerMon = dbe.book1D("TriggerMonAll", "TriggerMonAll", nPaths, 0., nPaths);
   // set bin labels for trigger monitoring
   triggerBinLabels(vsPaths_);
 }
 
-
-// ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
-void
-B2GDoubleLeptonHLTValidation::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-  //The following says we do not know what parameters are allowed so do no validation
-  // Please change this to state exactly what you do use, even if it is no parameters
+// ------------ method fills 'descriptions' with the allowed parameters for the
+// module  ------------
+void B2GDoubleLeptonHLTValidation::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
+  // The following says we do not know what parameters are allowed so do no
+  // validation
+  // Please change this to state exactly what you do use, even if it is no
+  // parameters
   edm::ParameterSetDescription desc;
   desc.setUnknown();
   descriptions.addDefault(desc);
 }
-
diff --git a/HLTriggerOffline/B2G/src/B2GHadronicHLTValidation.cc b/HLTriggerOffline/B2G/src/B2GHadronicHLTValidation.cc
index e9b875e2b3bc1..f0df7dd845337 100644
--- a/HLTriggerOffline/B2G/src/B2GHadronicHLTValidation.cc
+++ b/HLTriggerOffline/B2G/src/B2GHadronicHLTValidation.cc
@@ -2,12 +2,14 @@
 //
 // Package:    HLTriggerOffline/B2G
 // Class:      B2GHadronicHLTValidation
-// 
-/**\class B2GHadronicHLTValidation B2GHadronicHLTValidation.cc HLTriggerOffline/B2G/src/B2GHadronicHLTValidation.cc
+//
+/**\class B2GHadronicHLTValidation B2GHadronicHLTValidation.cc
+HLTriggerOffline/B2G/src/B2GHadronicHLTValidation.cc
 
-Description: 
+Description:
 
-Description: compute efficiencies of trigger paths on offline reco selection with respect to pt and eta
+Description: compute efficiencies of trigger paths on offline reco selection
+with respect to pt and eta
 
 Implementation:
 harvesting
@@ -31,128 +33,128 @@ harvesting
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
+#include "FWCore/Common/interface/TriggerNames.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
-#include "FWCore/Common/interface/TriggerNames.h"
 #include "TString.h"
 //
 // member functions
 //
 
 // ------------ method called for each event  ------------
-  void
-B2GHadronicHLTValidation::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{ 
+void B2GHadronicHLTValidation::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace edm;
 
-  isAll_ = false; isSel_ = false;
+  isAll_ = false;
+  isSel_ = false;
 
-  // Jets 
-  Handle< edm::View<reco::Jet> > jets;
-  if (!iEvent.getByToken(tokJets_,jets)) 
+  // Jets
+  Handle<edm::View<reco::Jet>> jets;
+  if (!iEvent.getByToken(tokJets_, jets))
     edm::LogWarning("B2GHadronicHLTValidation") << "Jets collection not found \n";
   unsigned int nGoodJ = 0;
   double ht = 0.0;
   // Check to see if we want asymmetric jet pt cuts
-  if ( ptJets0_ > 0.0 || ptJets1_ > 0.0 )  {
-    if ( ptJets0_ > 0.0 ) {
-      if ( !jets->empty() && jets->at(0).pt() > ptJets0_ ) {
-	nGoodJ++;
-	jet_ = jets->ptrAt(0) ;
+  if (ptJets0_ > 0.0 || ptJets1_ > 0.0) {
+    if (ptJets0_ > 0.0) {
+      if (!jets->empty() && jets->at(0).pt() > ptJets0_) {
+        nGoodJ++;
+        jet_ = jets->ptrAt(0);
       }
     }
-    if ( ptJets1_ > 0.0 ) {
-      if ( jets->size() > 1 && jets->at(1).pt() > ptJets1_ ) {
-	nGoodJ++;
-	jet_ = jets->ptrAt(1) ;
+    if (ptJets1_ > 0.0) {
+      if (jets->size() > 1 && jets->at(1).pt() > ptJets1_) {
+        nGoodJ++;
+        jet_ = jets->ptrAt(1);
       }
     }
-  } else if (minJets_ > 0 || htMin_ > 0 ) {
-    for(edm::View<reco::Jet>::const_iterator j = jets->begin(); j != jets->end(); ++j){
-      if (j->pt() < ptJets_) continue;
-      if (fabs(j->eta()) > etaJets_) continue;
+  } else if (minJets_ > 0 || htMin_ > 0) {
+    for (edm::View<reco::Jet>::const_iterator j = jets->begin(); j != jets->end(); ++j) {
+      if (j->pt() < ptJets_)
+        continue;
+      if (fabs(j->eta()) > etaJets_)
+        continue;
       nGoodJ++;
       ht += j->pt();
-      if (nGoodJ == minJets_) jet_ = jets->ptrAt( j -jets->begin() ); 
+      if (nGoodJ == minJets_)
+        jet_ = jets->ptrAt(j - jets->begin());
     }
-  } 
-
-  if ( nGoodJ >= minJets_ || ht > htMin_ ) isAll_ = true;
+  }
 
+  if (nGoodJ >= minJets_ || ht > htMin_)
+    isAll_ = true;
 
-  //Trigger
+  // Trigger
   Handle<edm::TriggerResults> triggerTable;
-  if (!iEvent.getByToken(tokTrigger_,triggerTable))
+  if (!iEvent.getByToken(tokTrigger_, triggerTable))
     edm::LogWarning("B2GHadronicHLTValidation") << "Trigger collection not found \n";
-  const edm::TriggerNames& triggerNames = iEvent.triggerNames(*triggerTable);
+  const edm::TriggerNames &triggerNames = iEvent.triggerNames(*triggerTable);
   bool isInteresting = false;
-  for (unsigned int i=0; i<triggerNames.triggerNames().size(); ++i) {
-
+  for (unsigned int i = 0; i < triggerNames.triggerNames().size(); ++i) {
     TString name = triggerNames.triggerNames()[i].c_str();
-    for (unsigned int j=0; j<vsPaths_.size(); j++) {
+    for (unsigned int j = 0; j < vsPaths_.size(); j++) {
       if (name.Contains(TString(vsPaths_[j]), TString::kIgnoreCase)) {
-        isInteresting = true; 
+        isInteresting = true;
         break;
       }
     }
-    if (isInteresting) break;
+    if (isInteresting)
+      break;
   }
 
-  if (isAll_ && isInteresting) isSel_ = true;
-  else isSel_ = false;
+  if (isAll_ && isInteresting)
+    isSel_ = true;
+  else
+    isSel_ = false;
 
-  //Histos
+  // Histos
   if (isAll_) {
-    if ( jet_.isNonnull() ) {
+    if (jet_.isNonnull()) {
       hDenJetPt->Fill(jet_->pt());
       hDenJetEta->Fill(jet_->eta());
     }
-    for(unsigned int idx=0; idx<vsPaths_.size(); ++idx){
-      hDenTriggerMon->Fill(idx+0.5);
+    for (unsigned int idx = 0; idx < vsPaths_.size(); ++idx) {
+      hDenTriggerMon->Fill(idx + 0.5);
     }
-
   }
   if (isSel_) {
     hNumJetPt->Fill(jet_->pt());
     hNumJetEta->Fill(jet_->eta());
-    for (unsigned int i=0; i<triggerNames.triggerNames().size(); ++i) {
+    for (unsigned int i = 0; i < triggerNames.triggerNames().size(); ++i) {
       TString name = triggerNames.triggerNames()[i].c_str();
-      for (unsigned int j=0; j<vsPaths_.size(); j++) {
+      for (unsigned int j = 0; j < vsPaths_.size(); j++) {
         if (name.Contains(TString(vsPaths_[j]), TString::kIgnoreCase)) {
-          hNumTriggerMon->Fill(j+0.5 );
+          hNumTriggerMon->Fill(j + 0.5);
         }
       }
     }
   }
 }
 
-
 // ------------ booking histograms -----------
-  void
-B2GHadronicHLTValidation::bookHistograms(DQMStore::IBooker & dbe, edm::Run const &, edm::EventSetup const &)
-{
+void B2GHadronicHLTValidation::bookHistograms(DQMStore::IBooker &dbe, edm::Run const &, edm::EventSetup const &) {
   dbe.setCurrentFolder(sDir_);
-  hDenJetPt     = dbe.book1D("PtLastJetAll", "PtLastJetAll", 60, 0., 3000.);
-  hDenJetEta    = dbe.book1D("EtaLastJetAll", "EtaLastJetAll", 30, -3., 3.);
-  hNumJetPt     = dbe.book1D("PtLastJetSel", "PtLastJetSel", 60, 0., 3000.);
-  hNumJetEta    = dbe.book1D("EtaLastJetSel", "EtaLastJetSel", 30, -3., 3.);
+  hDenJetPt = dbe.book1D("PtLastJetAll", "PtLastJetAll", 60, 0., 3000.);
+  hDenJetEta = dbe.book1D("EtaLastJetAll", "EtaLastJetAll", 30, -3., 3.);
+  hNumJetPt = dbe.book1D("PtLastJetSel", "PtLastJetSel", 60, 0., 3000.);
+  hNumJetEta = dbe.book1D("EtaLastJetSel", "EtaLastJetSel", 30, -3., 3.);
   // determine number of bins for trigger monitoring
   unsigned int nPaths = vsPaths_.size();
   // monitored trigger occupancy for single lepton triggers
-  hNumTriggerMon    = dbe.book1D("TriggerMonSel" , "TriggerMonSel", nPaths, 0.,  nPaths);
-  hDenTriggerMon    = dbe.book1D("TriggerMonAll" , "TriggerMonAll", nPaths, 0.,  nPaths);
+  hNumTriggerMon = dbe.book1D("TriggerMonSel", "TriggerMonSel", nPaths, 0., nPaths);
+  hDenTriggerMon = dbe.book1D("TriggerMonAll", "TriggerMonAll", nPaths, 0., nPaths);
   // set bin labels for trigger monitoring
   triggerBinLabels(vsPaths_);
 }
 
-
-// ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
-void
-B2GHadronicHLTValidation::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-  //The following says we do not know what parameters are allowed so do no validation
-  // Please change this to state exactly what you do use, even if it is no parameters
+// ------------ method fills 'descriptions' with the allowed parameters for the
+// module  ------------
+void B2GHadronicHLTValidation::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
+  // The following says we do not know what parameters are allowed so do no
+  // validation
+  // Please change this to state exactly what you do use, even if it is no
+  // parameters
   edm::ParameterSetDescription desc;
   desc.setUnknown();
   descriptions.addDefault(desc);
 }
-
diff --git a/HLTriggerOffline/B2G/src/B2GSingleLeptonHLTValidation.cc b/HLTriggerOffline/B2G/src/B2GSingleLeptonHLTValidation.cc
index 5f757cbbf6603..2aa04d5154983 100644
--- a/HLTriggerOffline/B2G/src/B2GSingleLeptonHLTValidation.cc
+++ b/HLTriggerOffline/B2G/src/B2GSingleLeptonHLTValidation.cc
@@ -2,12 +2,14 @@
 //
 // Package:    HLTriggerOffline/B2G
 // Class:      B2GSingleLeptonHLTValidation
-// 
-/**\class B2GSingleLeptonHLTValidation B2GSingleLeptonHLTValidation.cc HLTriggerOffline/B2G/src/B2GSingleLeptonHLTValidation.cc
+//
+/**\class B2GSingleLeptonHLTValidation B2GSingleLeptonHLTValidation.cc
+HLTriggerOffline/B2G/src/B2GSingleLeptonHLTValidation.cc
 
-Description: 
+Description:
 
-Description: compute efficiencies of trigger paths on offline reco selection with respect to pt and eta
+Description: compute efficiencies of trigger paths on offline reco selection
+with respect to pt and eta
 
 Implementation:
 harvesting
@@ -31,173 +33,180 @@ harvesting
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
+#include "DataFormats/MuonReco/interface/MuonPFIsolation.h"
+#include "FWCore/Common/interface/TriggerNames.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
-#include "FWCore/Common/interface/TriggerNames.h"
 #include "TString.h"
-#include "DataFormats/MuonReco/interface/MuonPFIsolation.h"
 //
 // member functions
 //
 
 // ------------ method called for each event  ------------
-  void
-B2GSingleLeptonHLTValidation::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{ 
+void B2GSingleLeptonHLTValidation::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace edm;
 
-  isAll_ = false; isSel_ = false;
+  isAll_ = false;
+  isSel_ = false;
 
-  // Electrons 
-  Handle< edm::View<reco::GsfElectron> > electrons;
-  if (!iEvent.getByToken(tokElectrons_,electrons))
+  // Electrons
+  Handle<edm::View<reco::GsfElectron>> electrons;
+  if (!iEvent.getByToken(tokElectrons_, electrons))
     edm::LogWarning("B2GSingleLeptonHLTValidation") << "Electrons collection not found \n";
   unsigned int nGoodE = 0;
-  for(edm::View<reco::GsfElectron>::const_iterator e = electrons->begin(); e != electrons->end(); ++e){
-    if (e->pt() < ptElectrons_) continue;
-    if (fabs(e->eta()) > etaElectrons_) continue;
+  for (edm::View<reco::GsfElectron>::const_iterator e = electrons->begin(); e != electrons->end(); ++e) {
+    if (e->pt() < ptElectrons_)
+      continue;
+    if (fabs(e->eta()) > etaElectrons_)
+      continue;
     nGoodE++;
-    if (nGoodE == 1) elec_ = electrons->ptrAt( e - electrons->begin());
+    if (nGoodE == 1)
+      elec_ = electrons->ptrAt(e - electrons->begin());
   }
-  // Muons 
-  Handle< edm::View<reco::Muon> > muons;
-  if (!iEvent.getByToken(tokMuons_,muons))
+  // Muons
+  Handle<edm::View<reco::Muon>> muons;
+  if (!iEvent.getByToken(tokMuons_, muons))
     edm::LogWarning("B2GSingleLeptonHLTValidation") << "Muons collection not found \n";
   unsigned int nGoodM = 0;
-  for(edm::View<reco::Muon>::const_iterator m = muons->begin(); m != muons->end(); ++m){
-    if (!m->isPFMuon() || !m->isGlobalMuon()) continue;
-    if (m->pt() < ptMuons_) continue;
-    if (fabs(m->eta()) > etaMuons_) continue;
+  for (edm::View<reco::Muon>::const_iterator m = muons->begin(); m != muons->end(); ++m) {
+    if (!m->isPFMuon() || !m->isGlobalMuon())
+      continue;
+    if (m->pt() < ptMuons_)
+      continue;
+    if (fabs(m->eta()) > etaMuons_)
+      continue;
     nGoodM++;
-    if (nGoodM == 1) mu_ = muons->ptrAt( m - muons->begin() );
+    if (nGoodM == 1)
+      mu_ = muons->ptrAt(m - muons->begin());
   }
-  // Jets 
-  Handle< edm::View<reco::Jet> > jets;
-  if (!iEvent.getByToken(tokJets_,jets)) 
+  // Jets
+  Handle<edm::View<reco::Jet>> jets;
+  if (!iEvent.getByToken(tokJets_, jets))
     edm::LogWarning("B2GSingleLeptonHLTValidation") << "Jets collection not found \n";
   unsigned int nGoodJ = 0;
 
   // Check to see if we want asymmetric jet pt cuts
-  if ( ptJets0_ > 0.0 || ptJets1_ > 0.0 )  {
-    if ( ptJets0_ > 0.0 ) {
-      if ( !jets->empty() && jets->at(0).pt() > ptJets0_ ) {
-	nGoodJ++;
-	jet_ = jets->ptrAt(0) ;
+  if (ptJets0_ > 0.0 || ptJets1_ > 0.0) {
+    if (ptJets0_ > 0.0) {
+      if (!jets->empty() && jets->at(0).pt() > ptJets0_) {
+        nGoodJ++;
+        jet_ = jets->ptrAt(0);
       }
     }
-    if ( ptJets1_ > 0.0 ) {
-      if ( jets->size() > 1 && jets->at(1).pt() > ptJets1_ ) {
-	nGoodJ++;
-	jet_ = jets->ptrAt(1) ;
+    if (ptJets1_ > 0.0) {
+      if (jets->size() > 1 && jets->at(1).pt() > ptJets1_) {
+        nGoodJ++;
+        jet_ = jets->ptrAt(1);
       }
     }
   } else {
-    for(edm::View<reco::Jet>::const_iterator j = jets->begin(); j != jets->end(); ++j){
-      if (j->pt() < ptJets_) continue;
-      if (fabs(j->eta()) > etaJets_) continue;
+    for (edm::View<reco::Jet>::const_iterator j = jets->begin(); j != jets->end(); ++j) {
+      if (j->pt() < ptJets_)
+        continue;
+      if (fabs(j->eta()) > etaJets_)
+        continue;
       nGoodJ++;
-      if (nGoodJ == minJets_) jet_ = jets->ptrAt( j -jets->begin() ); 
+      if (nGoodJ == minJets_)
+        jet_ = jets->ptrAt(j - jets->begin());
     }
   }
 
-  if (nGoodE >= minElectrons_ && nGoodM >= minMuons_ && nGoodJ >= minJets_) isAll_ = true;
-
+  if (nGoodE >= minElectrons_ && nGoodM >= minMuons_ && nGoodJ >= minJets_)
+    isAll_ = true;
 
-  //Trigger
+  // Trigger
   Handle<edm::TriggerResults> triggerTable;
-  if (!iEvent.getByToken(tokTrigger_,triggerTable))
+  if (!iEvent.getByToken(tokTrigger_, triggerTable))
     edm::LogWarning("B2GSingleLeptonHLTValidation") << "Trigger collection not found \n";
-  const edm::TriggerNames& triggerNames = iEvent.triggerNames(*triggerTable);
+  const edm::TriggerNames &triggerNames = iEvent.triggerNames(*triggerTable);
   bool isInteresting = false;
-  for (unsigned int i=0; i<triggerNames.triggerNames().size(); ++i) {
-
+  for (unsigned int i = 0; i < triggerNames.triggerNames().size(); ++i) {
     TString name = triggerNames.triggerNames()[i].c_str();
-    for (unsigned int j=0; j<vsPaths_.size(); j++) {
+    for (unsigned int j = 0; j < vsPaths_.size(); j++) {
       if (name.Contains(TString(vsPaths_[j]), TString::kIgnoreCase)) {
-        isInteresting = true; 
+        isInteresting = true;
         break;
       }
     }
-    if (isInteresting) break;
+    if (isInteresting)
+      break;
   }
 
-  if (isAll_ && isInteresting) isSel_ = true;
-  else isSel_ = false;
+  if (isAll_ && isInteresting)
+    isSel_ = true;
+  else
+    isSel_ = false;
 
-  //Histos
+  // Histos
   if (isAll_) {
-    if (minElectrons_ > 0 && elec_.isNonnull() ) {
+    if (minElectrons_ > 0 && elec_.isNonnull()) {
       hDenLeptonPt->Fill(elec_->pt());
       hDenLeptonEta->Fill(elec_->eta());
     }
-    if (minMuons_ > 0 && mu_.isNonnull() ) {
+    if (minMuons_ > 0 && mu_.isNonnull()) {
       hDenLeptonPt->Fill(mu_->pt());
       hDenLeptonEta->Fill(mu_->eta());
     }
-    if ( jet_.isNonnull() ) {
+    if (jet_.isNonnull()) {
       hDenJetPt->Fill(jet_->pt());
       hDenJetEta->Fill(jet_->eta());
     }
-    for(unsigned int idx=0; idx<vsPaths_.size(); ++idx){
-      hDenTriggerMon->Fill(idx+0.5);
+    for (unsigned int idx = 0; idx < vsPaths_.size(); ++idx) {
+      hDenTriggerMon->Fill(idx + 0.5);
     }
-
   }
   if (isSel_) {
-    if (minElectrons_ > 0 && elec_.isNonnull() ) {
+    if (minElectrons_ > 0 && elec_.isNonnull()) {
       hNumLeptonPt->Fill(elec_->pt());
       hNumLeptonEta->Fill(elec_->eta());
     }
-    if (minMuons_ > 0 && mu_.isNonnull() ) {
+    if (minMuons_ > 0 && mu_.isNonnull()) {
       hNumLeptonPt->Fill(mu_->pt());
       hNumLeptonEta->Fill(mu_->eta());
     }
-    if ( jet_.isNonnull() ) {
+    if (jet_.isNonnull()) {
       hNumJetPt->Fill(jet_->pt());
       hNumJetEta->Fill(jet_->eta());
     }
-    for (unsigned int i=0; i<triggerNames.triggerNames().size(); ++i) {
+    for (unsigned int i = 0; i < triggerNames.triggerNames().size(); ++i) {
       TString name = triggerNames.triggerNames()[i].c_str();
-      for (unsigned int j=0; j<vsPaths_.size(); j++) {
+      for (unsigned int j = 0; j < vsPaths_.size(); j++) {
         if (name.Contains(TString(vsPaths_[j]), TString::kIgnoreCase)) {
-          hNumTriggerMon->Fill(j+0.5 );
+          hNumTriggerMon->Fill(j + 0.5);
         }
       }
     }
   }
 }
 
-
 // ------------ booking histograms -----------
-  void
-B2GSingleLeptonHLTValidation::bookHistograms(DQMStore::IBooker & dbe, edm::Run const &, edm::EventSetup const &)
-{
+void B2GSingleLeptonHLTValidation::bookHistograms(DQMStore::IBooker &dbe, edm::Run const &, edm::EventSetup const &) {
   dbe.setCurrentFolder(sDir_);
-  hDenLeptonPt  = dbe.book1D("PtLeptonAll", "PtLeptonAll", 50, 0., 2500.);
-  hDenLeptonEta = dbe.book1D("EtaLeptonAll", "EtaLeptonAll", 30, -3. , 3.);
-  hDenJetPt     = dbe.book1D("PtLastJetAll", "PtLastJetAll", 60, 0., 3000.);
-  hDenJetEta    = dbe.book1D("EtaLastJetAll", "EtaLastJetAll", 30, -3., 3.);
-  hNumLeptonPt  = dbe.book1D("PtLeptonSel", "PtLeptonSel", 50, 0., 2500.);
-  hNumLeptonEta = dbe.book1D("EtaLeptonSel", "EtaLeptonSel", 30, -3. , 3.);
-  hNumJetPt     = dbe.book1D("PtLastJetSel", "PtLastJetSel", 60, 0., 3000.);
-  hNumJetEta    = dbe.book1D("EtaLastJetSel", "EtaLastJetSel", 30, -3., 3.);
+  hDenLeptonPt = dbe.book1D("PtLeptonAll", "PtLeptonAll", 50, 0., 2500.);
+  hDenLeptonEta = dbe.book1D("EtaLeptonAll", "EtaLeptonAll", 30, -3., 3.);
+  hDenJetPt = dbe.book1D("PtLastJetAll", "PtLastJetAll", 60, 0., 3000.);
+  hDenJetEta = dbe.book1D("EtaLastJetAll", "EtaLastJetAll", 30, -3., 3.);
+  hNumLeptonPt = dbe.book1D("PtLeptonSel", "PtLeptonSel", 50, 0., 2500.);
+  hNumLeptonEta = dbe.book1D("EtaLeptonSel", "EtaLeptonSel", 30, -3., 3.);
+  hNumJetPt = dbe.book1D("PtLastJetSel", "PtLastJetSel", 60, 0., 3000.);
+  hNumJetEta = dbe.book1D("EtaLastJetSel", "EtaLastJetSel", 30, -3., 3.);
   // determine number of bins for trigger monitoring
   unsigned int nPaths = vsPaths_.size();
   // monitored trigger occupancy for single lepton triggers
-  hNumTriggerMon    = dbe.book1D("TriggerMonSel" , "TriggerMonSel", nPaths, 0.,  nPaths);
-  hDenTriggerMon    = dbe.book1D("TriggerMonAll" , "TriggerMonAll", nPaths, 0.,  nPaths);
+  hNumTriggerMon = dbe.book1D("TriggerMonSel", "TriggerMonSel", nPaths, 0., nPaths);
+  hDenTriggerMon = dbe.book1D("TriggerMonAll", "TriggerMonAll", nPaths, 0., nPaths);
   // set bin labels for trigger monitoring
   triggerBinLabels(vsPaths_);
 }
 
-
-// ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
-void
-B2GSingleLeptonHLTValidation::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-  //The following says we do not know what parameters are allowed so do no validation
-  // Please change this to state exactly what you do use, even if it is no parameters
+// ------------ method fills 'descriptions' with the allowed parameters for the
+// module  ------------
+void B2GSingleLeptonHLTValidation::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
+  // The following says we do not know what parameters are allowed so do no
+  // validation
+  // Please change this to state exactly what you do use, even if it is no
+  // parameters
   edm::ParameterSetDescription desc;
   desc.setUnknown();
   descriptions.addDefault(desc);
 }
-
diff --git a/HLTriggerOffline/Btag/interface/HLTBTagHarvestingAnalyzer.h b/HLTriggerOffline/Btag/interface/HLTBTagHarvestingAnalyzer.h
index cd961f409ab80..595c8c696463c 100644
--- a/HLTriggerOffline/Btag/interface/HLTBTagHarvestingAnalyzer.h
+++ b/HLTriggerOffline/Btag/interface/HLTBTagHarvestingAnalyzer.h
@@ -2,59 +2,63 @@
 #define HLTBTagHarvestingAnalyzer_H
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-//DQM services
-#include "FWCore/ServiceRegistry/interface/Service.h"
+// DQM services
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "TCutG.h"
 #include "TEfficiency.h"
 
-
 /** \class HLTBTagHarvestingAnalyzer
  *
  *  Code used to produce DQM validation plots for b-tag at HLT.
- *  This class read the plots producted by HLTBTagPerformanceAnalyzer and make plots of: b-tag efficiency vs discr, b-tag efficiency vs jet pt, b-tag efficiency vs mistag rate 
+ *  This class read the plots producted by HLTBTagPerformanceAnalyzer and make
+ * plots of: b-tag efficiency vs discr, b-tag efficiency vs jet pt, b-tag
+ * efficiency vs mistag rate
  *
  */
 
+class HLTBTagHarvestingAnalyzer : public DQMEDHarvester {
+public:
+  explicit HLTBTagHarvestingAnalyzer(const edm::ParameterSet &);
+  ~HLTBTagHarvestingAnalyzer() override;
 
-class HLTBTagHarvestingAnalyzer : public DQMEDHarvester { 
-		public:
-			explicit HLTBTagHarvestingAnalyzer(const edm::ParameterSet&);
-			~HLTBTagHarvestingAnalyzer() override;
+  void dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) override;
+  TH1F calculateEfficiency1D(
+      DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, TH1 &num, TH1 &den, std::string name);
+  bool GetNumDenumerators(DQMStore::IBooker &ibooker,
+                          DQMStore::IGetter &igetter,
+                          std::string num,
+                          std::string den,
+                          TH1 *&ptrnum,
+                          TH1 *&ptrden,
+                          int type);
+  void mistagrate(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, TH1F *num, TH1F *den, std::string effName);
+  void modulesrate(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, TH1F *num, TH1F *den, std::string effName);
 
-			void dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) override;
-			TH1F  calculateEfficiency1D( DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter, TH1 & num, TH1 & den, std::string name );
-			bool GetNumDenumerators(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter, std::string num, std::string den,TH1 * & ptrnum,TH1* & ptrden,int type);
-			void mistagrate( DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter, TH1F* num, TH1F* den, std::string effName );
-			void modulesrate( DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter, TH1F* num, TH1F* den, std::string effName );
+private:
+  // ----------member data ---------------------------
+  std::string mainFolder_;
+  std::vector<std::string> hltPathNames_;
+  typedef unsigned int flavour_t;
+  typedef std::vector<flavour_t> flavours_t;
+  double m_minTag;
+  std::vector<std::string> m_mcLabels;
+  std::vector<flavours_t> m_mcFlavours;
+  bool m_mcMatching;
+  std::vector<std::string> m_histoName;
 
-		private:
-			// ----------member data ---------------------------
-			std::string			                mainFolder_;
-			std::vector<std::string>			hltPathNames_;
-			typedef unsigned int				flavour_t;
-			typedef std::vector<flavour_t>		flavours_t;
-			double 								m_minTag;
-			std::vector<std::string>			m_mcLabels;
-			std::vector<flavours_t>				m_mcFlavours;
-			bool								m_mcMatching;
-			std::vector< std::string>			m_histoName;
-
-			// Histogram handler
-			std::map<std::string, MonitorElement *> H1_;
-
-			enum HCALSpecials {HEP17, HEP18, HEM17};
-			std::map<HLTBTagHarvestingAnalyzer::HCALSpecials,std::string> HCALSpecialsNames;
-
-	};
+  // Histogram handler
+  std::map<std::string, MonitorElement *> H1_;
 
+  enum HCALSpecials { HEP17, HEP18, HEM17 };
+  std::map<HLTBTagHarvestingAnalyzer::HCALSpecials, std::string> HCALSpecialsNames;
+};
 
 #endif
-
diff --git a/HLTriggerOffline/Btag/interface/HLTBTagPerformanceAnalyzer.h b/HLTriggerOffline/Btag/interface/HLTBTagPerformanceAnalyzer.h
index c5fdf95fd6c07..39bcde5ce8f4c 100644
--- a/HLTriggerOffline/Btag/interface/HLTBTagPerformanceAnalyzer.h
+++ b/HLTriggerOffline/Btag/interface/HLTBTagPerformanceAnalyzer.h
@@ -2,31 +2,31 @@
 #define HLTBTagPerformanceAnalyzer_H
 
 // system include files
+#include <map>
 #include <memory>
 #include <string>
 #include <vector>
-#include <map>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include <DQMServices/Core/interface/DQMEDAnalyzer.h>
+#include "DataFormats/BTauReco/interface/JetTag.h"
+#include "DataFormats/BTauReco/interface/ShallowTagInfo.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/BTauReco/interface/JetTag.h"
-#include "DataFormats/BTauReco/interface/ShallowTagInfo.h"
+#include <DQMServices/Core/interface/DQMEDAnalyzer.h>
 
 // Trigger
 #include "DataFormats/Common/interface/TriggerResults.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
-//DQM services
-#include "FWCore/ServiceRegistry/interface/Service.h"
+// DQM services
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include <DQMServices/Core/interface/DQMEDAnalyzer.h>
 
-//for gen matching 
+// for gen matching
 #include "SimDataFormats/JetMatching/interface/JetFlavourMatching.h"
 #include <Math/GenVector/VectorUtil.h>
 
@@ -35,81 +35,79 @@
 /** \class HLTBTagPerformanceAnalyzer
  *
  *  Code used to produce DQM validation plots for b-tag at HLT.
- *  It plots the 1D distribution of the b-tag discriminant for all,b,c,lights,g jets
- *  And it plots the 2D distribution of the b-tag discriminant for all,b,c,lights,g jets vs pT 
+ *  It plots the 1D distribution of the b-tag discriminant for all,b,c,lights,g
+ * jets And it plots the 2D distribution of the b-tag discriminant for
+ * all,b,c,lights,g jets vs pT
  */
- 
-
-class HLTBTagPerformanceAnalyzer : public DQMEDAnalyzer { 
-		public:
-			explicit HLTBTagPerformanceAnalyzer(const edm::ParameterSet&);
-			~HLTBTagPerformanceAnalyzer() override;
-			void dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) override;
-
-		private:
-			void analyze(const edm::Event&, const edm::EventSetup&) override;
-			void bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & iRun,edm::EventSetup const &  iSetup ) override;
-
-		struct JetRefCompare {
-				inline bool operator () (const edm::RefToBase<reco::Jet> &j1,
-						const edm::RefToBase<reco::Jet> &j2) const
-				{ return j1.id() < j2.id() || (j1.id() == j2.id() && j1.key() < j2.key()); }
-			};
-
-		typedef std::map<edm::RefToBase<reco::Jet>, float, JetRefCompare> JetTagMap;
-
-		enum HCALSpecials {HEP17, HEP18, HEM17};
-
-		// variables from python configuration
-		edm::EDGetTokenT<edm::TriggerResults> hlTriggerResults_;
-		std::string mainFolder_;
-		std::vector<std::string> hltPathNames_;
-		HLTConfigProvider hltConfigProvider_;
-		bool triggerConfChanged_;
-		std::vector<edm::EDGetTokenT<reco::JetTagCollection> > JetTagCollection_;
-        //                edm::EDGetTokenT<std::vector<reco::ShallowTagInfo> > shallowTagInfosTokenCalo_;
-                edm::EDGetTokenT<std::vector<reco::ShallowTagInfo> > shallowTagInfosTokenPf_;
-        //                edm::Handle<std::vector<reco::ShallowTagInfo> > shallowTagInfosCalo;
-                edm::Handle<std::vector<reco::ShallowTagInfo> > shallowTagInfosPf;
-
-		/// other class variable
-		std::vector<bool> _isfoundHLTs;
-		std::vector<int> hltPathIndexs_;
-
-		// gen level tag-handlers
-		typedef unsigned int            flavour_t;
-		typedef std::vector<flavour_t>  flavours_t;
-
-		edm::EDGetTokenT<reco::JetFlavourMatchingCollection>						m_mcPartons;        // MC truth match - jet association to partons
-		std::vector<std::string>  											m_mcLabels;         // MC truth match - labels
-		std::vector<flavours_t>   											m_mcFlavours;       // MC truth match - flavours selection
-		double                    											m_mcRadius;         // MC truth match - deltaR association radius
-		bool                      											m_mcMatching;       // MC truth matching anabled/disabled
-
-		/// DQM folder handle
-		std::vector<std::string> folders;
-
-		// Histogram handler
-		std::vector< std::map<std::string, MonitorElement *> > H1_;
-		std::vector< std::map<std::string, std::map<HCALSpecials, MonitorElement *> > > H1mod_;
-		std::vector< std::map<std::string, MonitorElement *> > H2_;
-		std::vector< std::map<std::string, std::map<HCALSpecials, MonitorElement *> > > H2mod_;
-		std::vector< std::map<std::string, MonitorElement *> > H2Eta_;
-		std::vector< std::map<std::string, MonitorElement *> > H2EtaPhi_;
-		std::vector< std::map<std::string, MonitorElement *> > H2EtaPhi_threshold_;
-		std::vector< std::map<std::string, MonitorElement *> > H2Phi_;
-
-		// Other variables
-		edm::EDConsumerBase::Labels label;
-		std::string m_mcPartons_Label;
-		std::vector<std::string> JetTagCollection_Label;
-		std::string hlTriggerResults_Label;
-		std::string hltConfigProvider_Label;
-		std::map<HLTBTagPerformanceAnalyzer::HCALSpecials,std::string> HCALSpecialsNames;
 
+class HLTBTagPerformanceAnalyzer : public DQMEDAnalyzer {
+public:
+  explicit HLTBTagPerformanceAnalyzer(const edm::ParameterSet &);
+  ~HLTBTagPerformanceAnalyzer() override;
+  void dqmBeginRun(const edm::Run &iRun, const edm::EventSetup &iSetup) override;
+
+private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &iRun, edm::EventSetup const &iSetup) override;
+
+  struct JetRefCompare {
+    inline bool operator()(const edm::RefToBase<reco::Jet> &j1, const edm::RefToBase<reco::Jet> &j2) const {
+      return j1.id() < j2.id() || (j1.id() == j2.id() && j1.key() < j2.key());
+    }
+  };
+
+  typedef std::map<edm::RefToBase<reco::Jet>, float, JetRefCompare> JetTagMap;
+
+  enum HCALSpecials { HEP17, HEP18, HEM17 };
+
+  // variables from python configuration
+  edm::EDGetTokenT<edm::TriggerResults> hlTriggerResults_;
+  std::string mainFolder_;
+  std::vector<std::string> hltPathNames_;
+  HLTConfigProvider hltConfigProvider_;
+  bool triggerConfChanged_;
+  std::vector<edm::EDGetTokenT<reco::JetTagCollection>> JetTagCollection_;
+  //                edm::EDGetTokenT<std::vector<reco::ShallowTagInfo> >
+  //                shallowTagInfosTokenCalo_;
+  edm::EDGetTokenT<std::vector<reco::ShallowTagInfo>> shallowTagInfosTokenPf_;
+  //                edm::Handle<std::vector<reco::ShallowTagInfo> >
+  //                shallowTagInfosCalo;
+  edm::Handle<std::vector<reco::ShallowTagInfo>> shallowTagInfosPf;
+
+  /// other class variable
+  std::vector<bool> _isfoundHLTs;
+  std::vector<int> hltPathIndexs_;
+
+  // gen level tag-handlers
+  typedef unsigned int flavour_t;
+  typedef std::vector<flavour_t> flavours_t;
+
+  edm::EDGetTokenT<reco::JetFlavourMatchingCollection> m_mcPartons;  // MC truth match - jet association to partons
+  std::vector<std::string> m_mcLabels;                               // MC truth match - labels
+  std::vector<flavours_t> m_mcFlavours;                              // MC truth match - flavours selection
+  double m_mcRadius;                                                 // MC truth match - deltaR association radius
+  bool m_mcMatching;                                                 // MC truth matching anabled/disabled
+
+  /// DQM folder handle
+  std::vector<std::string> folders;
+
+  // Histogram handler
+  std::vector<std::map<std::string, MonitorElement *>> H1_;
+  std::vector<std::map<std::string, std::map<HCALSpecials, MonitorElement *>>> H1mod_;
+  std::vector<std::map<std::string, MonitorElement *>> H2_;
+  std::vector<std::map<std::string, std::map<HCALSpecials, MonitorElement *>>> H2mod_;
+  std::vector<std::map<std::string, MonitorElement *>> H2Eta_;
+  std::vector<std::map<std::string, MonitorElement *>> H2EtaPhi_;
+  std::vector<std::map<std::string, MonitorElement *>> H2EtaPhi_threshold_;
+  std::vector<std::map<std::string, MonitorElement *>> H2Phi_;
+
+  // Other variables
+  edm::EDConsumerBase::Labels label;
+  std::string m_mcPartons_Label;
+  std::vector<std::string> JetTagCollection_Label;
+  std::string hlTriggerResults_Label;
+  std::string hltConfigProvider_Label;
+  std::map<HLTBTagPerformanceAnalyzer::HCALSpecials, std::string> HCALSpecialsNames;
 };
 
-
 #endif
-
-
diff --git a/HLTriggerOffline/Btag/interface/HLTVertexPerformanceAnalyzer.h b/HLTriggerOffline/Btag/interface/HLTVertexPerformanceAnalyzer.h
index ab07a75959e48..355f20d4063d2 100644
--- a/HLTriggerOffline/Btag/interface/HLTVertexPerformanceAnalyzer.h
+++ b/HLTriggerOffline/Btag/interface/HLTVertexPerformanceAnalyzer.h
@@ -2,8 +2,8 @@
 #define HLTVertexPerformanceAnalyzer_H
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -11,14 +11,14 @@
 #include "DataFormats/Common/interface/TriggerResults.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
-//Vertex
+// Vertex
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
 #include <SimDataFormats/Vertex/interface/SimVertex.h>
 
-//DQM services
-#include "FWCore/ServiceRegistry/interface/Service.h"
+// DQM services
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include <DQMServices/Core/interface/DQMEDAnalyzer.h>
 
 #include "FWCore/Utilities/interface/transform.h"
@@ -26,39 +26,39 @@
 /** \class HLTVertexPerformanceAnalyzer
  *
  *  Code used to produce DQM validation plots for b-tag at HLT.
- *  It plots the distribution of recoVertex.z() - simVertex.z() of the primary vertex.
+ *  It plots the distribution of recoVertex.z() - simVertex.z() of the primary
+ * vertex.
  */
 
-
 class HLTVertexPerformanceAnalyzer : public DQMEDAnalyzer {
-	public:
-		explicit HLTVertexPerformanceAnalyzer(const edm::ParameterSet&);
-		~HLTVertexPerformanceAnalyzer() override;
-			void dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) override;
+public:
+  explicit HLTVertexPerformanceAnalyzer(const edm::ParameterSet &);
+  ~HLTVertexPerformanceAnalyzer() override;
+  void dqmBeginRun(const edm::Run &iRun, const edm::EventSetup &iSetup) override;
+
+private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
-	private:
-		void analyze(const edm::Event&, const edm::EventSetup&) override;
-		void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  // variables from python configuration
+  std::string mainFolder_;
+  edm::EDGetTokenT<edm::TriggerResults> hlTriggerResults_;
+  edm::EDGetTokenT<std::vector<SimVertex>> simVertexCollection_;
+  std::vector<std::string> hltPathNames_;
+  HLTConfigProvider hltConfigProvider_;
+  bool triggerConfChanged_;
 
-		// variables from python configuration
-		std::string mainFolder_;
-		edm::EDGetTokenT<edm::TriggerResults> hlTriggerResults_;
-		edm::EDGetTokenT<std::vector<SimVertex> > simVertexCollection_;
-		std::vector<std::string> hltPathNames_;
-		HLTConfigProvider hltConfigProvider_;
-		bool triggerConfChanged_;
+  std::vector<edm::EDGetTokenT<reco::VertexCollection>> VertexCollection_;
+  std::vector<int> hltPathIndexs_;
 
-		std::vector<edm::EDGetTokenT<reco::VertexCollection> > VertexCollection_;
-		std::vector<int> hltPathIndexs_;
-		
-		// other class variables
-		std::vector<bool> _isfoundHLTs;
-		std::vector<std::string> folders;
-		std::vector< std::map<std::string, MonitorElement *> > H1_;
+  // other class variables
+  std::vector<bool> _isfoundHLTs;
+  std::vector<std::string> folders;
+  std::vector<std::map<std::string, MonitorElement *>> H1_;
 
-		edm::EDConsumerBase::Labels label;
-		std::vector<std::string> VertexCollection_Label;
-		std::string hlTriggerResults_Label;
+  edm::EDConsumerBase::Labels label;
+  std::vector<std::string> VertexCollection_Label;
+  std::string hlTriggerResults_Label;
 };
 
 #endif
diff --git a/HLTriggerOffline/Btag/src/HLTBTagHarvestingAnalyzer.cc b/HLTriggerOffline/Btag/src/HLTBTagHarvestingAnalyzer.cc
index 8ecb4cfac4582..3b266447fb1d9 100644
--- a/HLTriggerOffline/Btag/src/HLTBTagHarvestingAnalyzer.cc
+++ b/HLTriggerOffline/Btag/src/HLTBTagHarvestingAnalyzer.cc
@@ -1,324 +1,388 @@
 #include "HLTriggerOffline/Btag/interface/HLTBTagHarvestingAnalyzer.h"
 
-HLTBTagHarvestingAnalyzer::HLTBTagHarvestingAnalyzer(const edm::ParameterSet& iConfig)
-{
-	//getParameter
-	mainFolder_                     = iConfig.getParameter<std::string>("mainFolder");
-	hltPathNames_			= iConfig.getParameter< std::vector<std::string> > ("HLTPathNames");
-	edm::ParameterSet mc	= iConfig.getParameter<edm::ParameterSet>("mcFlavours");
-	m_mcLabels				= mc.getParameterNamesForType<std::vector<unsigned int> >();
-	m_histoName				= iConfig.getParameter<std::vector<std::string> >("histoName");
-	m_minTag				= iConfig.getParameter<double>("minTag");
+HLTBTagHarvestingAnalyzer::HLTBTagHarvestingAnalyzer(const edm::ParameterSet &iConfig) {
+  // getParameter
+  mainFolder_ = iConfig.getParameter<std::string>("mainFolder");
+  hltPathNames_ = iConfig.getParameter<std::vector<std::string>>("HLTPathNames");
+  edm::ParameterSet mc = iConfig.getParameter<edm::ParameterSet>("mcFlavours");
+  m_mcLabels = mc.getParameterNamesForType<std::vector<unsigned int>>();
+  m_histoName = iConfig.getParameter<std::vector<std::string>>("histoName");
+  m_minTag = iConfig.getParameter<double>("minTag");
 
-	HCALSpecialsNames[HEP17] = "HEP17";
-	HCALSpecialsNames[HEP18] = "HEP18";
-	HCALSpecialsNames[HEM17] = "HEM17";
+  HCALSpecialsNames[HEP17] = "HEP17";
+  HCALSpecialsNames[HEP18] = "HEP18";
+  HCALSpecialsNames[HEM17] = "HEM17";
 }
 
-HLTBTagHarvestingAnalyzer::~HLTBTagHarvestingAnalyzer()
-{
-}
+HLTBTagHarvestingAnalyzer::~HLTBTagHarvestingAnalyzer() {}
+
+// ------------ method called once each job just after ending the event loop
+// ------------
+void HLTBTagHarvestingAnalyzer::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
+  using namespace edm;
+  Exception excp(errors::LogicError);
+  std::string dqmFolder_hist;
+
+  // for each hltPath and for each flavour, do the "b-tag efficiency vs jet pt"
+  // and "b-tag efficiency vs mistag rate" plots
+  for (unsigned int ind = 0; ind < hltPathNames_.size(); ind++) {
+    dqmFolder_hist = Form("%s/Discriminator/%s", mainFolder_.c_str(), hltPathNames_[ind].c_str());
+    std::string effDir = Form("%s/Discriminator/%s/efficiency", mainFolder_.c_str(), hltPathNames_[ind].c_str());
+    std::string relationsDir = Form("%s/Discriminator/%s/HEP17_HEM17", mainFolder_.c_str(), hltPathNames_[ind].c_str());
+    ibooker.setCurrentFolder(effDir);
+    TH1 *den = nullptr;
+    TH1 *num = nullptr;
+    std::map<std::string, TH1F> effics;
+    std::map<std::string, bool> efficsOK;
+    std::map<std::string, std::map<HCALSpecials, TH1F>> efficsmod;
+    std::map<std::string, std::map<HCALSpecials, bool>> efficsmodOK;
+    for (unsigned int i = 0; i < m_mcLabels.size(); ++i) {
+      bool isOK = false;
+      std::string label = m_histoName.at(ind) + "__";  //"JetTag__";
+      std::string flavour = m_mcLabels[i];
+      label += flavour;
+      isOK =
+          GetNumDenumerators(ibooker, igetter, dqmFolder_hist + "/" + label, dqmFolder_hist + "/" + label, num, den, 0);
+      if (isOK) {
+        // do the 'b-tag efficiency vs discr' plot
+        effics[flavour] = calculateEfficiency1D(ibooker, igetter, *num, *den, label + "_efficiency_vs_disc");
+        efficsOK[flavour] = isOK;
+      }
+      // for modules (HEP17 etc.)
+      for (auto j : HCALSpecialsNames) {
+        ibooker.setCurrentFolder(dqmFolder_hist + "/" + j.second + "/efficiency");
+        isOK = GetNumDenumerators(ibooker,
+                                  igetter,
+                                  dqmFolder_hist + "/" + j.second + "/" + label,
+                                  dqmFolder_hist + "/" + j.second + "/" + label,
+                                  num,
+                                  den,
+                                  0);
+        if (isOK) {
+          // do the 'b-tag efficiency vs discr' plot
+          efficsmod[flavour][j.first] =
+              calculateEfficiency1D(ibooker, igetter, *num, *den, label + "_efficiency_vs_disc");
+          efficsmodOK[flavour][j.first] = isOK;
+        }
+      }
+      ibooker.setCurrentFolder(effDir);
+      label = m_histoName.at(ind) + "___";
+      std::string labelEta = label;
+      std::string labelPhi = label;
+      label += flavour + "_disc_pT";
+      labelEta += flavour + "_disc_eta";
+      labelPhi += flavour + "_disc_phi";
+      isOK =
+          GetNumDenumerators(ibooker, igetter, dqmFolder_hist + "/" + label, dqmFolder_hist + "/" + label, num, den, 1);
+      if (isOK) {
+        // do the 'b-tag efficiency vs pT' plot
+        TH1F eff = calculateEfficiency1D(ibooker, igetter, *num, *den, label + "_efficiency_vs_pT");
+      }
+      isOK = GetNumDenumerators(
+          ibooker, igetter, dqmFolder_hist + "/" + labelEta, dqmFolder_hist + "/" + labelEta, num, den, 2);
+      if (isOK) {
+        // do the 'b-tag efficiency vs Eta' plot
+        TH1F eff = calculateEfficiency1D(ibooker, igetter, *num, *den, labelEta + "_efficiency_vs_eta");
+      }
+      isOK = GetNumDenumerators(
+          ibooker, igetter, dqmFolder_hist + "/" + labelPhi, dqmFolder_hist + "/" + labelPhi, num, den, 2);
+      if (isOK) {
+        // do the 'b-tag efficiency vs Phi' plot
+        TH1F eff = calculateEfficiency1D(ibooker, igetter, *num, *den, labelPhi + "_efficiency_vs_phi");
+      }
 
-// ------------ method called once each job just after ending the event loop  ------------
-	void 
-HLTBTagHarvestingAnalyzer::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter)
-{
-	using namespace edm;
-	Exception excp(errors::LogicError);
-	std::string dqmFolder_hist;
+      /// save efficiency_vs_disc_HEP17 / efficiency_vs_disc_HEM17 plots
+      ibooker.setCurrentFolder(relationsDir);
+      if (efficsmodOK[flavour][HEP17] && efficsmodOK[flavour][HEM17])
+        modulesrate(ibooker,
+                    igetter,
+                    &efficsmod[flavour][HEP17],
+                    &efficsmod[flavour][HEM17],
+                    m_histoName.at(ind) + "_" + flavour + "_HEP17_HEM17_effs_vs_disc_rate");
+      ibooker.setCurrentFolder(effDir);
 
-	//for each hltPath and for each flavour, do the "b-tag efficiency vs jet pt" and "b-tag efficiency vs mistag rate" plots
-	for (unsigned int ind=0; ind<hltPathNames_.size();ind++) 
-	{
-	  dqmFolder_hist = Form("%s/Discriminator/%s",mainFolder_.c_str(),hltPathNames_[ind].c_str());
-	  std::string effDir = Form("%s/Discriminator/%s/efficiency",mainFolder_.c_str(),hltPathNames_[ind].c_str());
-	  std::string relationsDir = Form("%s/Discriminator/%s/HEP17_HEM17",mainFolder_.c_str(),hltPathNames_[ind].c_str());
-		ibooker.setCurrentFolder(effDir);
-		TH1 *den =nullptr;
-		TH1 *num =nullptr; 
-		std::map<std::string,TH1F> effics;
-		std::map<std::string,bool> efficsOK;
-		std::map<std::string,std::map<HCALSpecials,TH1F> > efficsmod;
-		std::map<std::string,std::map<HCALSpecials,bool> > efficsmodOK;
-		for (unsigned int i = 0; i < m_mcLabels.size(); ++i)
-		{
-			bool isOK=false;
-			std::string label= m_histoName.at(ind) + "__"; //"JetTag__";
-			std::string flavour= m_mcLabels[i];
-			label+=flavour;
-			isOK=GetNumDenumerators(ibooker,igetter,dqmFolder_hist+"/"+label,dqmFolder_hist+"/"+label,num,den,0);
-			if (isOK){
-			
-				//do the 'b-tag efficiency vs discr' plot
-				effics[flavour]=calculateEfficiency1D(ibooker,igetter,*num,*den,label+"_efficiency_vs_disc");
-				efficsOK[flavour]=isOK;
-			}
-			//for modules (HEP17 etc.)
-			for (auto j: HCALSpecialsNames){
-				ibooker.setCurrentFolder(dqmFolder_hist+"/"+j.second+"/efficiency");
-				isOK=GetNumDenumerators(ibooker,igetter,dqmFolder_hist+"/"+j.second+"/"+label,dqmFolder_hist+"/"+j.second+"/"+label,num,den,0);
-				if (isOK){
-			
-					//do the 'b-tag efficiency vs discr' plot
-					efficsmod[flavour][j.first]=calculateEfficiency1D(ibooker,igetter,*num,*den,label+"_efficiency_vs_disc");
-					efficsmodOK[flavour][j.first]=isOK;
-				}
-			}
-			ibooker.setCurrentFolder(effDir);
-			label= m_histoName.at(ind)+"___";
-			std::string labelEta = label;
-			std::string labelPhi = label;
-			label+=flavour+"_disc_pT";
-			labelEta+=flavour+"_disc_eta";
-			labelPhi+=flavour+"_disc_phi";
-			isOK=GetNumDenumerators (ibooker,igetter,dqmFolder_hist+"/"+label,dqmFolder_hist+"/"+label,num,den,1);
-			if (isOK) {
-			
-				//do the 'b-tag efficiency vs pT' plot
-				TH1F eff=calculateEfficiency1D(ibooker,igetter,*num,*den,label+"_efficiency_vs_pT");
-			}
-			isOK=GetNumDenumerators (ibooker,igetter,dqmFolder_hist+"/"+labelEta,dqmFolder_hist+"/"+labelEta,num,den,2);
-			if (isOK) {
-			
-				//do the 'b-tag efficiency vs Eta' plot
-				TH1F eff=calculateEfficiency1D(ibooker,igetter,*num,*den,labelEta+"_efficiency_vs_eta");
-			}
-			isOK=GetNumDenumerators (ibooker,igetter,dqmFolder_hist+"/"+labelPhi,dqmFolder_hist+"/"+labelPhi,num,den,2);
-			if (isOK) {
-			
-				//do the 'b-tag efficiency vs Phi' plot
-				TH1F eff=calculateEfficiency1D(ibooker,igetter,*num,*den,labelPhi+"_efficiency_vs_phi");
-			}
+    }  /// for mc labels
 
-			///save efficiency_vs_disc_HEP17 / efficiency_vs_disc_HEM17 plots
-			ibooker.setCurrentFolder(relationsDir);
-			if (efficsmodOK[flavour][HEP17] && efficsmodOK[flavour][HEM17]) 
-				modulesrate(ibooker,igetter,&efficsmod[flavour][HEP17], &efficsmod[flavour][HEM17], m_histoName.at(ind)+"_"+flavour+"_HEP17_HEM17_effs_vs_disc_rate" );
-			ibooker.setCurrentFolder(effDir);
+    /// save mistagrate vs b-eff plots
+    if (efficsOK["b"] && efficsOK["c"])
+      mistagrate(ibooker, igetter, &effics["b"], &effics["c"], m_histoName.at(ind) + "_b_c_mistagrate");
+    if (efficsOK["b"] && efficsOK["light"])
+      mistagrate(ibooker, igetter, &effics["b"], &effics["light"], m_histoName.at(ind) + "_b_light_mistagrate");
+    if (efficsOK["b"] && efficsOK["g"])
+      mistagrate(ibooker, igetter, &effics["b"], &effics["g"], m_histoName.at(ind) + "_b_g_mistagrate");
 
-		} /// for mc labels
-		
-		///save mistagrate vs b-eff plots
-		if (efficsOK["b"] && efficsOK["c"])      mistagrate(ibooker,igetter,&effics["b"], &effics["c"], m_histoName.at(ind)+"_b_c_mistagrate" );
-		if (efficsOK["b"] && efficsOK["light"])  mistagrate(ibooker,igetter,&effics["b"], &effics["light"], m_histoName.at(ind)+"_b_light_mistagrate" );
-		if (efficsOK["b"] && efficsOK["g"])      mistagrate(ibooker,igetter,&effics["b"], &effics["g"], m_histoName.at(ind)+"_b_g_mistagrate" );
+    /// save mistagrate vs b-eff plots for modules (HEP17 etc.)
+    for (auto j : HCALSpecialsNames) {
+      ibooker.setCurrentFolder(dqmFolder_hist + "/" + j.second + "/efficiency");
+      if (efficsmodOK["b"][j.first] && efficsmodOK["c"][j.first])
+        mistagrate(ibooker,
+                   igetter,
+                   &efficsmod["b"][j.first],
+                   &efficsmod["c"][j.first],
+                   m_histoName.at(ind) + "_b_c_mistagrate");
+      if (efficsmodOK["b"][j.first] && efficsmodOK["light"][j.first])
+        mistagrate(ibooker,
+                   igetter,
+                   &efficsmod["b"][j.first],
+                   &efficsmod["light"][j.first],
+                   m_histoName.at(ind) + "_b_light_mistagrate");
+      if (efficsmodOK["b"][j.first] && efficsmodOK["g"][j.first])
+        mistagrate(ibooker,
+                   igetter,
+                   &efficsmod["b"][j.first],
+                   &efficsmod["g"][j.first],
+                   m_histoName.at(ind) + "_b_g_mistagrate");
+    }
 
-		///save mistagrate vs b-eff plots for modules (HEP17 etc.)
-		for (auto j: HCALSpecialsNames){
-			ibooker.setCurrentFolder(dqmFolder_hist+"/"+j.second+"/efficiency");
-			if (efficsmodOK["b"][j.first] && efficsmodOK["c"][j.first])      mistagrate(ibooker,igetter,&efficsmod["b"][j.first], &efficsmod["c"][j.first], m_histoName.at(ind)+"_b_c_mistagrate" );
-			if (efficsmodOK["b"][j.first] && efficsmodOK["light"][j.first])  mistagrate(ibooker,igetter,&efficsmod["b"][j.first], &efficsmod["light"][j.first], m_histoName.at(ind)+"_b_light_mistagrate" );
-			if (efficsmodOK["b"][j.first] && efficsmodOK["g"][j.first])      mistagrate(ibooker,igetter,&efficsmod["b"][j.first], &efficsmod["g"][j.first], m_histoName.at(ind)+"_b_g_mistagrate" );
-		}
-		
-		///save mistagrate_HEP17 / mistagrate_HEM17 plots
-		ibooker.setCurrentFolder(relationsDir);
-		bool isOK=false;
-		isOK=GetNumDenumerators(ibooker,igetter,dqmFolder_hist+"/HEP17/efficiency/"+m_histoName.at(ind)+"_b_c_mistagrate",dqmFolder_hist+"/HEM17/efficiency/"+m_histoName.at(ind)+"_b_c_mistagrate",num,den,3);
-		if (isOK) modulesrate(ibooker,igetter,(TH1F*)num, (TH1F*)den, m_histoName.at(ind)+"_HEP17_HEM17_b_c_mistagrate" );
-		isOK=GetNumDenumerators(ibooker,igetter,dqmFolder_hist+"/HEP17/efficiency/"+m_histoName.at(ind)+"_b_light_mistagrate",dqmFolder_hist+"/HEM17/efficiency/"+m_histoName.at(ind)+"_b_light_mistagrate",num,den,3);
-		if (isOK) modulesrate(ibooker,igetter,(TH1F*)num, (TH1F*)den, m_histoName.at(ind)+"_HEP17_HEM17_b_light_mistagrate" );
-		isOK=GetNumDenumerators(ibooker,igetter,dqmFolder_hist+"/HEP17/efficiency/"+m_histoName.at(ind)+"_b_g_mistagrate",dqmFolder_hist+"/HEM17/efficiency/"+m_histoName.at(ind)+"_b_g_mistagrate",num,den,3);
-		if (isOK) modulesrate(ibooker,igetter,(TH1F*)num, (TH1F*)den, m_histoName.at(ind)+"_HEP17_HEM17_b_g_mistagrate" );
-	} /// for triggers
+    /// save mistagrate_HEP17 / mistagrate_HEM17 plots
+    ibooker.setCurrentFolder(relationsDir);
+    bool isOK = false;
+    isOK = GetNumDenumerators(ibooker,
+                              igetter,
+                              dqmFolder_hist + "/HEP17/efficiency/" + m_histoName.at(ind) + "_b_c_mistagrate",
+                              dqmFolder_hist + "/HEM17/efficiency/" + m_histoName.at(ind) + "_b_c_mistagrate",
+                              num,
+                              den,
+                              3);
+    if (isOK)
+      modulesrate(ibooker, igetter, (TH1F *)num, (TH1F *)den, m_histoName.at(ind) + "_HEP17_HEM17_b_c_mistagrate");
+    isOK = GetNumDenumerators(ibooker,
+                              igetter,
+                              dqmFolder_hist + "/HEP17/efficiency/" + m_histoName.at(ind) + "_b_light_mistagrate",
+                              dqmFolder_hist + "/HEM17/efficiency/" + m_histoName.at(ind) + "_b_light_mistagrate",
+                              num,
+                              den,
+                              3);
+    if (isOK)
+      modulesrate(ibooker, igetter, (TH1F *)num, (TH1F *)den, m_histoName.at(ind) + "_HEP17_HEM17_b_light_mistagrate");
+    isOK = GetNumDenumerators(ibooker,
+                              igetter,
+                              dqmFolder_hist + "/HEP17/efficiency/" + m_histoName.at(ind) + "_b_g_mistagrate",
+                              dqmFolder_hist + "/HEM17/efficiency/" + m_histoName.at(ind) + "_b_g_mistagrate",
+                              num,
+                              den,
+                              3);
+    if (isOK)
+      modulesrate(ibooker, igetter, (TH1F *)num, (TH1F *)den, m_histoName.at(ind) + "_HEP17_HEM17_b_g_mistagrate");
+  }  /// for triggers
 }
 
-bool HLTBTagHarvestingAnalyzer::GetNumDenumerators(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter, std::string num,std::string den,TH1 * & ptrnum,TH1* & ptrden,int type)
-{
-        using namespace edm;
-/*
-   possible types: 
-   type =0 for eff_vs_discriminator
-   type =1 for eff_vs_pT
-   type =2 for eff_vs_eta or eff_vs_phi
-   type =3 for HEP17 / HEM17 mistagrate relation
- */
-	MonitorElement *denME = nullptr;
-	MonitorElement *numME = nullptr;
-	denME = igetter.get(den);
-	numME = igetter.get(num);
-	Exception excp(errors::LogicError);
-	
-	if ( denME == nullptr || numME == nullptr ) 
-	{
-		excp << "Plots not found:\n";
-		if(denME == nullptr) excp << den << "\n";
-		if(numME == nullptr) excp << num << "\n";
-		excp.raise();
-	}
-	
-	if (type==0) //efficiency_vs_discr: fill "ptrnum" with the cumulative function of the DQM plots contained in "num" and "ptrden" with a flat function
-	{
-		TH1* numH1 = numME->getTH1();
-		TH1* denH1 = denME->getTH1();
-		ptrden=(TH1*)denH1->Clone("denominator");
-		ptrnum=(TH1*)numH1->Clone("numerator");
+bool HLTBTagHarvestingAnalyzer::GetNumDenumerators(DQMStore::IBooker &ibooker,
+                                                   DQMStore::IGetter &igetter,
+                                                   std::string num,
+                                                   std::string den,
+                                                   TH1 *&ptrnum,
+                                                   TH1 *&ptrden,
+                                                   int type) {
+  using namespace edm;
+  /*
+     possible types:
+     type =0 for eff_vs_discriminator
+     type =1 for eff_vs_pT
+     type =2 for eff_vs_eta or eff_vs_phi
+     type =3 for HEP17 / HEM17 mistagrate relation
+   */
+  MonitorElement *denME = nullptr;
+  MonitorElement *numME = nullptr;
+  denME = igetter.get(den);
+  numME = igetter.get(num);
+  Exception excp(errors::LogicError);
+
+  if (denME == nullptr || numME == nullptr) {
+    excp << "Plots not found:\n";
+    if (denME == nullptr)
+      excp << den << "\n";
+    if (numME == nullptr)
+      excp << num << "\n";
+    excp.raise();
+  }
+
+  if (type == 0)  // efficiency_vs_discr: fill "ptrnum" with the cumulative function of
+                  // the DQM plots contained in "num" and "ptrden" with a flat function
+  {
+    TH1 *numH1 = numME->getTH1();
+    TH1 *denH1 = denME->getTH1();
+    ptrden = (TH1 *)denH1->Clone("denominator");
+    ptrnum = (TH1 *)numH1->Clone("numerator");
 
-		ptrnum->SetBinContent(1,numH1->Integral());
-		ptrden->SetBinContent(1,numH1->Integral());
-		for  (int j=2;j<=numH1->GetNbinsX();j++) {
-			ptrnum->SetBinContent(j,numH1->Integral()-numH1->Integral(1,j-1));
-			ptrden->SetBinContent(j,numH1->Integral());
-		}
-	}
-	
-	if (type==1) //efficiency_vs_pT: fill "ptrden" with projection of the plots contained in "den" and fill "ptrnum" with projection of the plots contained in "num", having btag>m_minTag
-	{
-		TH2F* numH2 = numME->getTH2F();
-		TH2F* denH2 = denME->getTH2F();
+    ptrnum->SetBinContent(1, numH1->Integral());
+    ptrden->SetBinContent(1, numH1->Integral());
+    for (int j = 2; j <= numH1->GetNbinsX(); j++) {
+      ptrnum->SetBinContent(j, numH1->Integral() - numH1->Integral(1, j - 1));
+      ptrden->SetBinContent(j, numH1->Integral());
+    }
+  }
 
-		///numerator preparing
-		TCutG * cutg_num= new TCutG("cutg_num",4);
-		cutg_num->SetPoint(0,m_minTag,0);
-		cutg_num->SetPoint(1,m_minTag,9999);
-		cutg_num->SetPoint(2,1.1,9999);
-		cutg_num->SetPoint(3,1.1,0);
-		ptrnum = numH2->ProjectionY("numerator",0,-1,"[cutg_num]");
+  if (type == 1)  // efficiency_vs_pT: fill "ptrden" with projection of the plots
+                  // contained in "den" and fill "ptrnum" with projection of the
+                  // plots contained in "num", having btag>m_minTag
+  {
+    TH2F *numH2 = numME->getTH2F();
+    TH2F *denH2 = denME->getTH2F();
 
-		///denominator preparing
-		TCutG * cutg_den= new TCutG("cutg_den",4);
-		cutg_den->SetPoint(0,-10.1,0);
-		cutg_den->SetPoint(1,-10.1,9999);
-		cutg_den->SetPoint(2,1.1,9999);
-		cutg_den->SetPoint(3,1.1,0);
-		ptrden = denH2->ProjectionY("denumerator",0,-1,"[cutg_den]");
-		delete cutg_num;
-		delete cutg_den;
-	}
+    /// numerator preparing
+    TCutG *cutg_num = new TCutG("cutg_num", 4);
+    cutg_num->SetPoint(0, m_minTag, 0);
+    cutg_num->SetPoint(1, m_minTag, 9999);
+    cutg_num->SetPoint(2, 1.1, 9999);
+    cutg_num->SetPoint(3, 1.1, 0);
+    ptrnum = numH2->ProjectionY("numerator", 0, -1, "[cutg_num]");
 
-	if (type==2) //efficiency_vs_eta: fill "ptrden" with projection of the plots contained in "den" and fill "ptrnum" with projection of the plots contained in "num", having btag>m_minTag
-	{
-		TH2F* numH2 = numME->getTH2F();
-		TH2F* denH2 = denME->getTH2F();
+    /// denominator preparing
+    TCutG *cutg_den = new TCutG("cutg_den", 4);
+    cutg_den->SetPoint(0, -10.1, 0);
+    cutg_den->SetPoint(1, -10.1, 9999);
+    cutg_den->SetPoint(2, 1.1, 9999);
+    cutg_den->SetPoint(3, 1.1, 0);
+    ptrden = denH2->ProjectionY("denumerator", 0, -1, "[cutg_den]");
+    delete cutg_num;
+    delete cutg_den;
+  }
 
-		///numerator preparing
-		TCutG * cutg_num= new TCutG("cutg_num",4);
-		cutg_num->SetPoint(0,m_minTag,-10);
-		cutg_num->SetPoint(1,m_minTag,10);
-		cutg_num->SetPoint(2,1.1,10);
-		cutg_num->SetPoint(3,1.1,-10);
-		ptrnum = numH2->ProjectionY("numerator",0,-1,"[cutg_num]");
+  if (type == 2)  // efficiency_vs_eta: fill "ptrden" with projection of the
+                  // plots contained in "den" and fill "ptrnum" with projection
+                  // of the plots contained in "num", having btag>m_minTag
+  {
+    TH2F *numH2 = numME->getTH2F();
+    TH2F *denH2 = denME->getTH2F();
 
-		///denominator preparing
-		TCutG * cutg_den= new TCutG("cutg_den",4);
-		cutg_den->SetPoint(0,-10.1,-10);
-		cutg_den->SetPoint(1,-10.1,10);
-		cutg_den->SetPoint(2,1.1,10);
-		cutg_den->SetPoint(3,1.1,-10);
-		ptrden = denH2->ProjectionY("denumerator",0,-1,"[cutg_den]");
-		delete cutg_num;
-		delete cutg_den;
-	}
+    /// numerator preparing
+    TCutG *cutg_num = new TCutG("cutg_num", 4);
+    cutg_num->SetPoint(0, m_minTag, -10);
+    cutg_num->SetPoint(1, m_minTag, 10);
+    cutg_num->SetPoint(2, 1.1, 10);
+    cutg_num->SetPoint(3, 1.1, -10);
+    ptrnum = numH2->ProjectionY("numerator", 0, -1, "[cutg_num]");
 
-	if (type==3) //mistagrate HEP17 / HEM17 relation: fill "ptrnum" with HEP17 mistagrate and "ptrden" with HEM17 mistagrate
-	{
-		ptrden=denME->getTH1();
-		ptrnum=numME->getTH1();
-	}
-	return true;
+    /// denominator preparing
+    TCutG *cutg_den = new TCutG("cutg_den", 4);
+    cutg_den->SetPoint(0, -10.1, -10);
+    cutg_den->SetPoint(1, -10.1, 10);
+    cutg_den->SetPoint(2, 1.1, 10);
+    cutg_den->SetPoint(3, 1.1, -10);
+    ptrden = denH2->ProjectionY("denumerator", 0, -1, "[cutg_den]");
+    delete cutg_num;
+    delete cutg_den;
+  }
+
+  if (type == 3)  // mistagrate HEP17 / HEM17 relation: fill "ptrnum" with HEP17
+                  // mistagrate and "ptrden" with HEM17 mistagrate
+  {
+    ptrden = denME->getTH1();
+    ptrnum = numME->getTH1();
+  }
+  return true;
 }
 
+void HLTBTagHarvestingAnalyzer::mistagrate(
+    DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, TH1F *num, TH1F *den, std::string effName) {
+  // do the efficiency_vs_mistag_rate plot
+  TH1F *eff;
+  eff = new TH1F(effName.c_str(), effName.c_str(), 100, 0, 1);
+  eff->SetTitle(effName.c_str());
+  eff->SetXTitle("b-effficiency");
+  eff->SetYTitle("mistag rate");
+  eff->SetOption("E");
+  eff->SetLineColor(2);
+  eff->SetLineWidth(2);
+  eff->SetMarkerStyle(20);
+  eff->SetMarkerSize(0.8);
+  eff->GetYaxis()->SetRangeUser(0.001, 1.001);
+  eff->GetXaxis()->SetRangeUser(-0.001, 1.001);
+  eff->SetStats(kFALSE);
 
-void HLTBTagHarvestingAnalyzer::mistagrate(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter, TH1F* num, TH1F* den, std::string effName ){
-	//do the efficiency_vs_mistag_rate plot
-	TH1F* eff;
-	eff = new TH1F(effName.c_str(),effName.c_str(),100,0,1);
-	eff->SetTitle(effName.c_str());
-	eff->SetXTitle("b-effficiency");
-	eff->SetYTitle("mistag rate");
-	eff->SetOption("E");
-	eff->SetLineColor(2);
-	eff->SetLineWidth(2);
-	eff->SetMarkerStyle(20);
-	eff->SetMarkerSize(0.8);
-	eff->GetYaxis()->SetRangeUser(0.001,1.001);
-	eff->GetXaxis()->SetRangeUser(-0.001,1.001);
-	eff->SetStats(kFALSE);
-	
-	//for each bin in the discr -> find efficiency and mistagrate -> put them in a plot
-	for(int i=1;i<=num->GetNbinsX();i++){
-		double beff=num->GetBinContent(i);
-		double miseff=den->GetBinContent(i);
-		double miseffErr= den->GetBinError(i);
-		int binX = eff->GetXaxis()->FindBin(beff);
-		if (eff->GetBinContent(binX)!=0) continue;
-		eff->SetBinContent(binX,miseff);
-		eff->SetBinError(binX,miseffErr);
-	}
-	MonitorElement *me;
-	me = ibooker.book1D(effName,eff);
-	me->setEfficiencyFlag();
+  // for each bin in the discr -> find efficiency and mistagrate -> put them in
+  // a plot
+  for (int i = 1; i <= num->GetNbinsX(); i++) {
+    double beff = num->GetBinContent(i);
+    double miseff = den->GetBinContent(i);
+    double miseffErr = den->GetBinError(i);
+    int binX = eff->GetXaxis()->FindBin(beff);
+    if (eff->GetBinContent(binX) != 0)
+      continue;
+    eff->SetBinContent(binX, miseff);
+    eff->SetBinError(binX, miseffErr);
+  }
+  MonitorElement *me;
+  me = ibooker.book1D(effName, eff);
+  me->setEfficiencyFlag();
 
-	delete eff;
-	return;
+  delete eff;
+  return;
 }
 
-void HLTBTagHarvestingAnalyzer::modulesrate(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter, TH1F* num, TH1F* den, std::string effName ){
-	//do the eff_vs_disc_HEP17 / eff_vs_disc_HEM17 plot
-	TH1F* eff=new TH1F(*num);
-	//eff = new TH1F(effName.c_str(),effName.c_str(),100,0,1);
-	eff->Divide(den);
-	eff->SetTitle(effName.c_str());
-	eff->SetXTitle(num->GetXaxis()->GetTitle());
-	eff->SetYTitle("");
-	eff->SetOption("E");
-	eff->SetLineColor(2);
-	eff->SetLineWidth(2);
-	eff->SetMarkerStyle(20);
-	eff->SetMarkerSize(0.8);
-	eff->GetYaxis()->SetRangeUser(0.001,2.001);
-	//eff->GetXaxis()->SetRangeUser(-0.001,1.001);
-	eff->SetStats(kFALSE);
-	
-	MonitorElement *me;
-	me = ibooker.book1D(effName,eff);
-	me->setEfficiencyFlag();
+void HLTBTagHarvestingAnalyzer::modulesrate(
+    DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, TH1F *num, TH1F *den, std::string effName) {
+  // do the eff_vs_disc_HEP17 / eff_vs_disc_HEM17 plot
+  TH1F *eff = new TH1F(*num);
+  // eff = new TH1F(effName.c_str(),effName.c_str(),100,0,1);
+  eff->Divide(den);
+  eff->SetTitle(effName.c_str());
+  eff->SetXTitle(num->GetXaxis()->GetTitle());
+  eff->SetYTitle("");
+  eff->SetOption("E");
+  eff->SetLineColor(2);
+  eff->SetLineWidth(2);
+  eff->SetMarkerStyle(20);
+  eff->SetMarkerSize(0.8);
+  eff->GetYaxis()->SetRangeUser(0.001, 2.001);
+  // eff->GetXaxis()->SetRangeUser(-0.001,1.001);
+  eff->SetStats(kFALSE);
+
+  MonitorElement *me;
+  me = ibooker.book1D(effName, eff);
+  me->setEfficiencyFlag();
 
-	delete eff;
-	return;
+  delete eff;
+  return;
 }
 
-TH1F  HLTBTagHarvestingAnalyzer::calculateEfficiency1D(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter, TH1 & num , TH1 & den, std::string effName ){
-	//calculate the efficiency as num/den ratio
-	TH1F eff;
-	if(num.GetXaxis()->GetXbins()->GetSize()==0){
-		 eff = TH1F(effName.c_str(),effName.c_str(),num.GetXaxis()->GetNbins(),num.GetXaxis()->GetXmin(),num.GetXaxis()->GetXmax());
-	}else{
-		eff = TH1F(effName.c_str(),effName.c_str(),num.GetXaxis()->GetNbins(),num.GetXaxis()->GetXbins()->GetArray());
-	} 
-	eff.SetTitle(effName.c_str());
-	eff.SetXTitle( num.GetXaxis()->GetTitle() );
-	eff.SetYTitle("Efficiency");
-	eff.SetOption("PE");
-	eff.SetLineColor(2);
-	eff.SetLineWidth(2);
-	eff.SetMarkerStyle(20);
-	eff.SetMarkerSize(0.8);
-	eff.GetYaxis()->SetRangeUser(-0.001,1.001);
-	for(int i=1;i<=num.GetNbinsX();i++){
-		double d, n,err;
-		d= den.GetBinContent(i);
-		n= num.GetBinContent(i);
-		double e;
-		if(d!=0){
-			e=n/d;
-			err = std::max(e - TEfficiency::ClopperPearson(d, n, 0.683, false), TEfficiency::ClopperPearson(d, n, 0.683, true) - e);
-			//err =  sqrt(e*(1-e)/d); //from binomial standard deviation
-		}
-		else{
-			e=0;
-			err=0;
-		}		
-		eff.SetBinContent( i, e );
-		eff.SetBinError( i, err );
-	}
-	
-	MonitorElement *me;
-	me = ibooker.book1D(effName,&eff);
-	me->setEfficiencyFlag();
-	
-	return eff;
+TH1F HLTBTagHarvestingAnalyzer::calculateEfficiency1D(
+    DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, TH1 &num, TH1 &den, std::string effName) {
+  // calculate the efficiency as num/den ratio
+  TH1F eff;
+  if (num.GetXaxis()->GetXbins()->GetSize() == 0) {
+    eff = TH1F(effName.c_str(),
+               effName.c_str(),
+               num.GetXaxis()->GetNbins(),
+               num.GetXaxis()->GetXmin(),
+               num.GetXaxis()->GetXmax());
+  } else {
+    eff = TH1F(effName.c_str(), effName.c_str(), num.GetXaxis()->GetNbins(), num.GetXaxis()->GetXbins()->GetArray());
+  }
+  eff.SetTitle(effName.c_str());
+  eff.SetXTitle(num.GetXaxis()->GetTitle());
+  eff.SetYTitle("Efficiency");
+  eff.SetOption("PE");
+  eff.SetLineColor(2);
+  eff.SetLineWidth(2);
+  eff.SetMarkerStyle(20);
+  eff.SetMarkerSize(0.8);
+  eff.GetYaxis()->SetRangeUser(-0.001, 1.001);
+  for (int i = 1; i <= num.GetNbinsX(); i++) {
+    double d, n, err;
+    d = den.GetBinContent(i);
+    n = num.GetBinContent(i);
+    double e;
+    if (d != 0) {
+      e = n / d;
+      err = std::max(e - TEfficiency::ClopperPearson(d, n, 0.683, false),
+                     TEfficiency::ClopperPearson(d, n, 0.683, true) - e);
+      // err =  sqrt(e*(1-e)/d); //from binomial standard deviation
+    } else {
+      e = 0;
+      err = 0;
+    }
+    eff.SetBinContent(i, e);
+    eff.SetBinError(i, err);
+  }
+
+  MonitorElement *me;
+  me = ibooker.book1D(effName, &eff);
+  me->setEfficiencyFlag();
+
+  return eff;
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(HLTBTagHarvestingAnalyzer);
diff --git a/HLTriggerOffline/Btag/src/HLTBTagPerformanceAnalyzer.cc b/HLTriggerOffline/Btag/src/HLTBTagPerformanceAnalyzer.cc
index 6af42e515849c..30a467aa0c67a 100644
--- a/HLTriggerOffline/Btag/src/HLTBTagPerformanceAnalyzer.cc
+++ b/HLTriggerOffline/Btag/src/HLTBTagPerformanceAnalyzer.cc
@@ -1,433 +1,432 @@
 #include "HLTriggerOffline/Btag/interface/HLTBTagPerformanceAnalyzer.h"
-#include <set>
 #include <algorithm>
+#include <set>
 
 using namespace edm;
 using namespace reco;
 
-// find the index of the object key of an association vector closest to a given jet, within a given distance
+// find the index of the object key of an association vector closest to a given
+// jet, within a given distance
 template <typename T, typename V>
-int closestJet(const RefToBase<reco::Jet>   jet, const edm::AssociationVector<T, V> & association, double distance) {
-	int closest = -1;
-	for (unsigned int i = 0; i < association.size(); ++i) {
-		double d = ROOT::Math::VectorUtil::DeltaR(jet->momentum(), association[i].first->momentum());
-		if (d < distance) {
-			distance = d;
-			closest  = i;
-		}
-	}
-	return closest;
+int closestJet(const RefToBase<reco::Jet> jet, const edm::AssociationVector<T, V> &association, double distance) {
+  int closest = -1;
+  for (unsigned int i = 0; i < association.size(); ++i) {
+    double d = ROOT::Math::VectorUtil::DeltaR(jet->momentum(), association[i].first->momentum());
+    if (d < distance) {
+      distance = d;
+      closest = i;
+    }
+  }
+  return closest;
 }
 
 std::set<std::string> keepSetJet{"jetNSecondaryVertices",
-				"jetNSelectedTracks",
-				"jetNTracks",
-				"Jet_JP",
-				"chargedHadronEnergyFraction",
-				"neutralHadronEnergyFraction",
-				"photonEnergyFraction",
-				"electronEnergyFraction",
-				"muonEnergyFraction",
-				"chargedHadronMultiplicity",
-				"neutralHadronMultiplicity",
-				"photonMultiplicity",
-				"electronMultiplicity",
-				"muonMultiplicity",
-				"hadronMultiplicity",
-				"hadronPhotonMultiplicity",
-				"totalMultiplicity"
-				};
+                                 "jetNSelectedTracks",
+                                 "jetNTracks",
+                                 "Jet_JP",
+                                 "chargedHadronEnergyFraction",
+                                 "neutralHadronEnergyFraction",
+                                 "photonEnergyFraction",
+                                 "electronEnergyFraction",
+                                 "muonEnergyFraction",
+                                 "chargedHadronMultiplicity",
+                                 "neutralHadronMultiplicity",
+                                 "photonMultiplicity",
+                                 "electronMultiplicity",
+                                 "muonMultiplicity",
+                                 "hadronMultiplicity",
+                                 "hadronPhotonMultiplicity",
+                                 "totalMultiplicity"};
 
-std::set<std::string> keepSetTrack{"trackChi2",
-				"trackNTotalHits",
-				"trackNPixelHits",
-				"trackSip3dVal",
-				"trackSip3dSig",
-				"trackSip2dVal",
-				"trackSip2dSig",
-				"trackPtRel",
-				"trackDeltaR",
-				"trackPtRatio",
-				"trackSip3dSig_0",
-				"trackSip3dSig_1",
-				"trackSip3dSig_2",
-				"trackSip3dSig_3",
-				"trackMomentum", 
-				"trackEta", 
-				"trackPhi",
-				"trackDecayLenVal",
-				"trackDecayLenSig",
-				"trackJetDistVal",
-				"trackJetDistSig",
-				"trackSumJetEtRatio",
-				"trackSumJetDeltaR",
-				"trackEtaRel"
+std::set<std::string> keepSetTrack{
+    "trackChi2",       "trackNTotalHits",    "trackNPixelHits",   "trackSip3dVal",    "trackSip3dSig",
+    "trackSip2dVal",   "trackSip2dSig",      "trackPtRel",        "trackDeltaR",      "trackPtRatio",
+    "trackSip3dSig_0", "trackSip3dSig_1",    "trackSip3dSig_2",   "trackSip3dSig_3",  "trackMomentum",
+    "trackEta",        "trackPhi",           "trackDecayLenVal",  "trackDecayLenSig", "trackJetDistVal",
+    "trackJetDistSig", "trackSumJetEtRatio", "trackSumJetDeltaR", "trackEtaRel"
 
-	};
+};
 std::set<std::string> keepSetVtx{"vertexMass",
-				"vertexNTracks"
-				"vertexFitProb",
-				"vertexCategory",
-				"vertexEnergyRatio",
-				"vertexJetDeltaR",
-				"vertexBoostOverSqrtJetPt",
-				"flightDistance1dVal",
-				"flightDistance1dSig", 
-				"flightDistance2dVal",
-				"flightDistance2dSig",
-				"flightDistance3dVal",
-				"flightDistance3dSig"
-	};
+                                 "vertexNTracks"
+                                 "vertexFitProb",
+                                 "vertexCategory",
+                                 "vertexEnergyRatio",
+                                 "vertexJetDeltaR",
+                                 "vertexBoostOverSqrtJetPt",
+                                 "flightDistance1dVal",
+                                 "flightDistance1dSig",
+                                 "flightDistance2dVal",
+                                 "flightDistance2dSig",
+                                 "flightDistance3dVal",
+                                 "flightDistance3dSig"};
 std::set<std::string> keepSet;
 
 // constructors and destructor
-HLTBTagPerformanceAnalyzer::HLTBTagPerformanceAnalyzer(const edm::ParameterSet& iConfig)
-{
-	mainFolder_                     = iConfig.getParameter<std::string>("mainFolder");
-	hlTriggerResults_   		= consumes<edm::TriggerResults>(iConfig.getParameter<InputTag> ("TriggerResults"));
-	JetTagCollection_ 			= edm::vector_transform(iConfig.getParameter<std::vector<edm::InputTag> >( "JetTag" ), [this](edm::InputTag const & tag){return mayConsume< reco::JetTagCollection>(tag);});
-    //        shallowTagInfosTokenCalo_ = consumes<std::vector<reco::ShallowTagInfo> > (edm::InputTag("hltDeepCombinedSecondaryVertexBJetTagsInfosCalo"));
-        shallowTagInfosTokenPf_ = consumes<std::vector<reco::ShallowTagInfo> > (edm::InputTag("hltDeepCombinedSecondaryVertexBJetTagsInfos"));
-	m_mcPartons 				= consumes<JetFlavourMatchingCollection>(iConfig.getParameter<InputTag> ("mcPartons") ); 
-	hltPathNames_        		= iConfig.getParameter< std::vector<std::string> > ("HLTPathNames");
-	edm::ParameterSet mc 		= iConfig.getParameter<edm::ParameterSet>("mcFlavours");
-	m_mcLabels 					= mc.getParameterNamesForType<std::vector<unsigned int> >();  
-	
-	EDConsumerBase::labelsForToken(m_mcPartons,label);
-	m_mcPartons_Label = label.module;
-	
-	for(unsigned int i=0; i<JetTagCollection_.size() ; i++){
-		EDConsumerBase::labelsForToken(JetTagCollection_[i],label);
-		JetTagCollection_Label.push_back(label.module);
-	}
+HLTBTagPerformanceAnalyzer::HLTBTagPerformanceAnalyzer(const edm::ParameterSet &iConfig) {
+  mainFolder_ = iConfig.getParameter<std::string>("mainFolder");
+  hlTriggerResults_ = consumes<edm::TriggerResults>(iConfig.getParameter<InputTag>("TriggerResults"));
+  JetTagCollection_ =
+      edm::vector_transform(iConfig.getParameter<std::vector<edm::InputTag>>("JetTag"),
+                            [this](edm::InputTag const &tag) { return mayConsume<reco::JetTagCollection>(tag); });
+  //        shallowTagInfosTokenCalo_ =
+  //        consumes<std::vector<reco::ShallowTagInfo> >
+  //        (edm::InputTag("hltDeepCombinedSecondaryVertexBJetTagsInfosCalo"));
+  shallowTagInfosTokenPf_ =
+      consumes<std::vector<reco::ShallowTagInfo>>(edm::InputTag("hltDeepCombinedSecondaryVertexBJetTagsInfos"));
+  m_mcPartons = consumes<JetFlavourMatchingCollection>(iConfig.getParameter<InputTag>("mcPartons"));
+  hltPathNames_ = iConfig.getParameter<std::vector<std::string>>("HLTPathNames");
+  edm::ParameterSet mc = iConfig.getParameter<edm::ParameterSet>("mcFlavours");
+  m_mcLabels = mc.getParameterNamesForType<std::vector<unsigned int>>();
 
-	EDConsumerBase::labelsForToken(hlTriggerResults_,label);
-	hlTriggerResults_Label = label.module;
-	
-	for (unsigned int i = 0; i < m_mcLabels.size(); ++i)
-		m_mcFlavours.push_back( mc.getParameter<std::vector<unsigned int> >(m_mcLabels[i]) );
-	m_mcMatching = m_mcPartons_Label != "none" ;
+  EDConsumerBase::labelsForToken(m_mcPartons, label);
+  m_mcPartons_Label = label.module;
 
-	m_mcRadius=0.3;
+  for (unsigned int i = 0; i < JetTagCollection_.size(); i++) {
+    EDConsumerBase::labelsForToken(JetTagCollection_[i], label);
+    JetTagCollection_Label.push_back(label.module);
+  }
 
-	HCALSpecialsNames[HEP17] = "HEP17";
-	HCALSpecialsNames[HEP18] = "HEP18";
-	HCALSpecialsNames[HEM17] = "HEM17";
-		
-}
+  EDConsumerBase::labelsForToken(hlTriggerResults_, label);
+  hlTriggerResults_Label = label.module;
 
+  for (unsigned int i = 0; i < m_mcLabels.size(); ++i)
+    m_mcFlavours.push_back(mc.getParameter<std::vector<unsigned int>>(m_mcLabels[i]));
+  m_mcMatching = m_mcPartons_Label != "none";
 
-HLTBTagPerformanceAnalyzer::~HLTBTagPerformanceAnalyzer()
-{
+  m_mcRadius = 0.3;
 
-	// do anything here that needs to be done at desctruction time
-	// (e.g. close files, deallocate resources etc.)
+  HCALSpecialsNames[HEP17] = "HEP17";
+  HCALSpecialsNames[HEP18] = "HEP18";
+  HCALSpecialsNames[HEM17] = "HEM17";
 }
 
-void HLTBTagPerformanceAnalyzer::dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) {
-	// Make a combined set of inputs avaiable 
-		std::set_union(std::begin(keepSetJet), std::end(keepSetJet),
-        	       std::begin(keepSetTrack), std::end(keepSetTrack),                  
-	               std::inserter(keepSet, std::begin(keepSet)));
-		std::set_union(std::begin(keepSet), std::end(keepSet),
-	               std::begin(keepSetVtx), std::end(keepSetVtx),                  
-	               std::inserter(keepSet, std::begin(keepSet)));
-	triggerConfChanged_ = true;
-	EDConsumerBase::labelsForToken(hlTriggerResults_,label);
-	
-	hltConfigProvider_.init(iRun, iSetup, label.process, triggerConfChanged_);
-	const std::vector< std::string > & allHltPathNames = hltConfigProvider_.triggerNames();
-
-	//fill hltPathIndexs_ with the trigger number of each hltPathNames_
-	for ( size_t trgs=0; trgs<hltPathNames_.size(); trgs++) {
-		unsigned int found = 1;
-		int it_mem = -1;
-		for (size_t it=0 ; it < allHltPathNames.size() ; ++it )
-		{
-			found = allHltPathNames.at(it).find(hltPathNames_[trgs]);
-			if ( found == 0 )
-			{
-				it_mem= (int) it;
-			}
-		}//for allallHltPathNames
-		hltPathIndexs_.push_back(it_mem);
-	}//for hltPathNames_
-	
-	//fill _isfoundHLTs for each hltPathNames_
-	for ( size_t trgs=0; trgs<hltPathNames_.size(); trgs++) {
-		if ( hltPathIndexs_[trgs] < 0 ) {
-			_isfoundHLTs.push_back(false);
-		} 
-		else {
-			_isfoundHLTs.push_back(true);
-		}
-	}
+HLTBTagPerformanceAnalyzer::~HLTBTagPerformanceAnalyzer() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
+void HLTBTagPerformanceAnalyzer::dqmBeginRun(const edm::Run &iRun, const edm::EventSetup &iSetup) {
+  // Make a combined set of inputs avaiable
+  std::set_union(std::begin(keepSetJet),
+                 std::end(keepSetJet),
+                 std::begin(keepSetTrack),
+                 std::end(keepSetTrack),
+                 std::inserter(keepSet, std::begin(keepSet)));
+  std::set_union(std::begin(keepSet),
+                 std::end(keepSet),
+                 std::begin(keepSetVtx),
+                 std::end(keepSetVtx),
+                 std::inserter(keepSet, std::begin(keepSet)));
+  triggerConfChanged_ = true;
+  EDConsumerBase::labelsForToken(hlTriggerResults_, label);
+
+  hltConfigProvider_.init(iRun, iSetup, label.process, triggerConfChanged_);
+  const std::vector<std::string> &allHltPathNames = hltConfigProvider_.triggerNames();
+
+  // fill hltPathIndexs_ with the trigger number of each hltPathNames_
+  for (size_t trgs = 0; trgs < hltPathNames_.size(); trgs++) {
+    unsigned int found = 1;
+    int it_mem = -1;
+    for (size_t it = 0; it < allHltPathNames.size(); ++it) {
+      found = allHltPathNames.at(it).find(hltPathNames_[trgs]);
+      if (found == 0) {
+        it_mem = (int)it;
+      }
+    }  // for allallHltPathNames
+    hltPathIndexs_.push_back(it_mem);
+  }  // for hltPathNames_
 
-void HLTBTagPerformanceAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+  // fill _isfoundHLTs for each hltPathNames_
+  for (size_t trgs = 0; trgs < hltPathNames_.size(); trgs++) {
+    if (hltPathIndexs_[trgs] < 0) {
+      _isfoundHLTs.push_back(false);
+    } else {
+      _isfoundHLTs.push_back(true);
+    }
+  }
+}
 
-  bool trigRes=false;
-  bool MCOK=false;
+void HLTBTagPerformanceAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  bool trigRes = false;
+  bool MCOK = false;
   using namespace edm;
 
-  //get triggerResults
+  // get triggerResults
   Handle<TriggerResults> TriggerResulsHandler;
   Handle<reco::JetFlavourMatchingCollection> h_mcPartons;
-  if ( hlTriggerResults_Label.empty() || hlTriggerResults_Label == "NULL" ) 
-	{
-      edm::LogInfo("NoTriggerResults") << "TriggerResults ==> Empty";
-      return;
-	}
+  if (hlTriggerResults_Label.empty() || hlTriggerResults_Label == "NULL") {
+    edm::LogInfo("NoTriggerResults") << "TriggerResults ==> Empty";
+    return;
+  }
   iEvent.getByToken(hlTriggerResults_, TriggerResulsHandler);
-  if (TriggerResulsHandler.isValid())   trigRes=true;
-  if ( !trigRes ) { edm::LogInfo("NoTriggerResults") << "TriggerResults ==> not readable"; return;}
-  const TriggerResults & triggerResults = *(TriggerResulsHandler.product());
-	
-  //get partons
-  if (m_mcMatching && !m_mcPartons_Label.empty() && m_mcPartons_Label != "NULL" ) {
+  if (TriggerResulsHandler.isValid())
+    trigRes = true;
+  if (!trigRes) {
+    edm::LogInfo("NoTriggerResults") << "TriggerResults ==> not readable";
+    return;
+  }
+  const TriggerResults &triggerResults = *(TriggerResulsHandler.product());
+
+  // get partons
+  if (m_mcMatching && !m_mcPartons_Label.empty() && m_mcPartons_Label != "NULL") {
     iEvent.getByToken(m_mcPartons, h_mcPartons);
-    if (h_mcPartons.isValid()) MCOK=true;
+    if (h_mcPartons.isValid())
+      MCOK = true;
   }
 
-  //fill the 1D and 2D DQM plot
+  // fill the 1D and 2D DQM plot
   Handle<reco::JetTagCollection> JetTagHandler;
-  for (unsigned int ind=0; ind<hltPathNames_.size();ind++) {
-    bool BtagOK=false;
+  for (unsigned int ind = 0; ind < hltPathNames_.size(); ind++) {
+    bool BtagOK = false;
     JetTagMap JetTag;
-    if ( !_isfoundHLTs[ind]) continue;	//if the hltPath is not in the event, skip the event
-    if ( !triggerResults.accept(hltPathIndexs_[ind]) ) continue;	//if the hltPath was not accepted skip the event
-		
-    //get JetTagCollection
-    if (!JetTagCollection_Label[ind].empty() && JetTagCollection_Label[ind] != "NULL" )
-      {
-        iEvent.getByToken(JetTagCollection_[ind], JetTagHandler);
-        iEvent.getByToken(shallowTagInfosTokenPf_, shallowTagInfosPf);
-        //                        iEvent.getByToken(shallowTagInfosTokenCalo_, shallowTagInfosCalo);
-        if (JetTagHandler.isValid() )   BtagOK=true;
-      }
+    if (!_isfoundHLTs[ind])
+      continue;  // if the hltPath is not in the event, skip the event
+    if (!triggerResults.accept(hltPathIndexs_[ind]))
+      continue;  // if the hltPath was not accepted skip the event
 
-    //fill JetTag map
-    if (BtagOK) for ( auto  iter = JetTagHandler->begin(); iter != JetTagHandler->end(); iter++ )
-                  {
-                    JetTag.insert(JetTagMap::value_type(iter->first, iter->second));
-                  }
+    // get JetTagCollection
+    if (!JetTagCollection_Label[ind].empty() && JetTagCollection_Label[ind] != "NULL") {
+      iEvent.getByToken(JetTagCollection_[ind], JetTagHandler);
+      iEvent.getByToken(shallowTagInfosTokenPf_, shallowTagInfosPf);
+      //                        iEvent.getByToken(shallowTagInfosTokenCalo_,
+      //                        shallowTagInfosCalo);
+      if (JetTagHandler.isValid())
+        BtagOK = true;
+    }
+
+    // fill JetTag map
+    if (BtagOK)
+      for (auto iter = JetTagHandler->begin(); iter != JetTagHandler->end(); iter++) {
+        JetTag.insert(JetTagMap::value_type(iter->first, iter->second));
+      }
     else {
-      edm::LogInfo("NoCollection") << "Collection " << JetTagCollection_Label[ind] <<  " ==> not found"; return;
+      edm::LogInfo("NoCollection") << "Collection " << JetTagCollection_Label[ind] << " ==> not found";
+      return;
     }
-    //fill Inputs for All
-    if ( shallowTagInfosPf.isValid() ) {
-      for(auto& info :  *(shallowTagInfosPf)) {
+    // fill Inputs for All
+    if (shallowTagInfosPf.isValid()) {
+      for (auto &info : *(shallowTagInfosPf)) {
         TaggingVariableList vars = info.taggingVariables();
-        for(auto entry = vars.begin(); entry != vars.end(); ++entry) 
-          {
-            if ( keepSet.find(TaggingVariableTokens[entry->first]) != keepSet.end()) {  // if Input name in defined list to keep
-              try {H1_.at(ind)[TaggingVariableTokens[entry->first]] -> Fill(std::fmax(0.0, entry->second));  }
-              catch (const std::exception& e) {
-                continue;
-              }
+        for (auto entry = vars.begin(); entry != vars.end(); ++entry) {
+          if (keepSet.find(TaggingVariableTokens[entry->first]) !=
+              keepSet.end()) {  // if Input name in defined list to keep
+            try {
+              H1_.at(ind)[TaggingVariableTokens[entry->first]]->Fill(std::fmax(0.0, entry->second));
+            } catch (const std::exception &e) {
+              continue;
             }
-            else continue; 
-          }
+          } else
+            continue;
+        }
       }
-    }
-    else {
+    } else {
       edm::LogInfo("NoCollection") << "No shallowTagInfosPf collection";
     }
-    //fill tagging 
-    for (auto & BtagJT: JetTag) {
+    // fill tagging
+    for (auto &BtagJT : JetTag) {
       std::map<HCALSpecials, bool> inmodule;
-      inmodule[HEP17]=(BtagJT.first->phi() >= -0.87) && (BtagJT.first->phi() < -0.52) && (BtagJT.first->eta() > 1.3);
-      inmodule[HEP18]=(BtagJT.first->phi() >= -0.52) && (BtagJT.first->phi() < -0.17) && (BtagJT.first->eta() > 1.3);
-      inmodule[HEM17]=(BtagJT.first->phi() >= -0.87) && (BtagJT.first->phi() < -0.52) && (BtagJT.first->eta() < -1.3);
-			
-      //fill 1D btag plot for 'all'
-      H1_.at(ind)[JetTagCollection_Label[ind]] -> Fill(std::fmax(0.0,BtagJT.second));
-      for (auto i: HCALSpecialsNames){
+      inmodule[HEP17] = (BtagJT.first->phi() >= -0.87) && (BtagJT.first->phi() < -0.52) && (BtagJT.first->eta() > 1.3);
+      inmodule[HEP18] = (BtagJT.first->phi() >= -0.52) && (BtagJT.first->phi() < -0.17) && (BtagJT.first->eta() > 1.3);
+      inmodule[HEM17] = (BtagJT.first->phi() >= -0.87) && (BtagJT.first->phi() < -0.52) && (BtagJT.first->eta() < -1.3);
+
+      // fill 1D btag plot for 'all'
+      H1_.at(ind)[JetTagCollection_Label[ind]]->Fill(std::fmax(0.0, BtagJT.second));
+      for (auto i : HCALSpecialsNames) {
         if (inmodule[i.first])
-          H1mod_.at(ind)[JetTagCollection_Label[ind]][i.first] -> Fill(std::fmax(0.0,BtagJT.second));
+          H1mod_.at(ind)[JetTagCollection_Label[ind]][i.first]->Fill(std::fmax(0.0, BtagJT.second));
       }
       if (MCOK) {
         int m = closestJet(BtagJT.first, *h_mcPartons, m_mcRadius);
         unsigned int flavour = (m != -1) ? abs((*h_mcPartons)[m].second.getFlavour()) : 0;
         for (unsigned int i = 0; i < m_mcLabels.size(); ++i) {
-          std::string flavour_str= m_mcLabels[i];
-          flavours_t flav_collection=  m_mcFlavours[i];
+          std::string flavour_str = m_mcLabels[i];
+          flavours_t flav_collection = m_mcFlavours[i];
           auto it = std::find(flav_collection.begin(), flav_collection.end(), flavour);
-          if (it== flav_collection.end())   continue;
-          std::string label=JetTagCollection_Label[ind] + "__";
-          label+=flavour_str;
-          H1_.at(ind)[label]->Fill(std::fmax(0.0,BtagJT.second));	//fill 1D btag plot for 'b,c,uds'
-          for (auto j: HCALSpecialsNames){
+          if (it == flav_collection.end())
+            continue;
+          std::string label = JetTagCollection_Label[ind] + "__";
+          label += flavour_str;
+          H1_.at(ind)[label]->Fill(std::fmax(0.0, BtagJT.second));  // fill 1D btag plot for 'b,c,uds'
+          for (auto j : HCALSpecialsNames) {
             if (inmodule[j.first])
-              H1mod_.at(ind)[label][j.first]->Fill(std::fmax(0.0,BtagJT.second));	//fill 1D btag plot for 'b,c,uds' in modules (HEP17 etc.)
+              H1mod_.at(ind)[label][j.first]->Fill(
+                  std::fmax(0.0, BtagJT.second));  // fill 1D btag plot for 'b,c,uds' in
+                                                   // modules (HEP17 etc.)
           }
-          label=JetTagCollection_Label[ind] + "___";
-          label+=flavour_str;
+          label = JetTagCollection_Label[ind] + "___";
+          label += flavour_str;
           std::string labelEta = label;
           std::string labelPhi = label;
           std::string labelEtaPhi = label;
           std::string labelEtaPhi_threshold = label;
-          label+="_disc_pT";
-          H2_.at(ind)[label]->Fill(std::fmax(0.0,BtagJT.second),BtagJT.first->pt());	//fill 2D btag, jetPt plot for 'b,c,uds'
-          for (auto j: HCALSpecialsNames){
+          label += "_disc_pT";
+          H2_.at(ind)[label]->Fill(std::fmax(0.0, BtagJT.second),
+                                   BtagJT.first->pt());  // fill 2D btag, jetPt plot for 'b,c,uds'
+          for (auto j : HCALSpecialsNames) {
             if (inmodule[j.first])
-              H2mod_.at(ind)[label][j.first]->Fill(std::fmax(0.0,BtagJT.second),BtagJT.first->pt());
+              H2mod_.at(ind)[label][j.first]->Fill(std::fmax(0.0, BtagJT.second), BtagJT.first->pt());
           }
-          labelEta+="_disc_eta";
-          H2Eta_.at(ind)[labelEta]->Fill(std::fmax(0.0,BtagJT.second),BtagJT.first->eta());	//fill 2D btag, jetEta plot for 'b,c,uds'
-          labelPhi+="_disc_phi";
-          H2Phi_.at(ind)[labelPhi]->Fill(std::fmax(0.0,BtagJT.second),BtagJT.first->phi());	//fill 2D btag, jetPhi plot for 'b,c,uds'
-          labelEtaPhi+="_eta_phi";
-          H2EtaPhi_.at(ind)[labelEtaPhi]->Fill(BtagJT.first->eta(),BtagJT.first->phi());  //fill 2D btag, jetPhi plot for 'b,c,uds'
-          labelEtaPhi_threshold+="_eta_phi_disc05";
+          labelEta += "_disc_eta";
+          H2Eta_.at(ind)[labelEta]->Fill(std::fmax(0.0, BtagJT.second),
+                                         BtagJT.first->eta());  // fill 2D btag, jetEta plot for 'b,c,uds'
+          labelPhi += "_disc_phi";
+          H2Phi_.at(ind)[labelPhi]->Fill(std::fmax(0.0, BtagJT.second),
+                                         BtagJT.first->phi());  // fill 2D btag, jetPhi plot for 'b,c,uds'
+          labelEtaPhi += "_eta_phi";
+          H2EtaPhi_.at(ind)[labelEtaPhi]->Fill(BtagJT.first->eta(),
+                                               BtagJT.first->phi());  // fill 2D btag, jetPhi plot for 'b,c,uds'
+          labelEtaPhi_threshold += "_eta_phi_disc05";
           if (BtagJT.second > 0.5) {
-            H2EtaPhi_threshold_.at(ind)[labelEtaPhi_threshold]->Fill(BtagJT.first->eta(),BtagJT.first->phi());  //fill 2D btag, jetPhi plot for 'b,c,uds' 
+            H2EtaPhi_threshold_.at(ind)[labelEtaPhi_threshold]->Fill(
+                BtagJT.first->eta(),
+                BtagJT.first->phi());  // fill 2D btag, jetPhi plot for 'b,c,uds'
           }
-        } /// for flavour
-      } /// if MCOK
-    } /// for BtagJT
-  }//for triggers
+        }  /// for flavour
+      }    /// if MCOK
+    }      /// for BtagJT
+  }        // for triggers
 }
 
+//// ------------ method called once each job just before starting event loop
+///------------
+void HLTBTagPerformanceAnalyzer::bookHistograms(DQMStore::IBooker &ibooker,
+                                                edm::Run const &iRun,
+                                                edm::EventSetup const &iSetup) {
+  // book the DQM plots for each path and for each flavour
+  using namespace std;
+  assert(hltPathNames_.size() == JetTagCollection_.size());
+  std::string dqmFolder;
+  for (unsigned int ind = 0; ind < hltPathNames_.size(); ind++) {
+    float btagL = 0.;
+    float btagU = 1.;
+    int btagBins = 100;
+    dqmFolder = Form("%s/Discriminator/%s", mainFolder_.c_str(), hltPathNames_[ind].c_str());
+    H1_.push_back(std::map<std::string, MonitorElement *>());
+    H2_.push_back(std::map<std::string, MonitorElement *>());
+    H1mod_.push_back(std::map<std::string, std::map<HCALSpecials, MonitorElement *>>());
+    H2mod_.push_back(std::map<std::string, std::map<HCALSpecials, MonitorElement *>>());
+    H2Eta_.push_back(std::map<std::string, MonitorElement *>());
+    H2Phi_.push_back(std::map<std::string, MonitorElement *>());
+    H2EtaPhi_.push_back(std::map<std::string, MonitorElement *>());
+    H2EtaPhi_threshold_.push_back(std::map<std::string, MonitorElement *>());
+    ibooker.setCurrentFolder(dqmFolder);
 
+    // book 1D btag plot for 'all'
+    if (!JetTagCollection_Label[ind].empty() && JetTagCollection_Label[ind] != "NULL") {
+      H1_.back()[JetTagCollection_Label[ind]] = ibooker.book1D(
+          JetTagCollection_Label[ind] + "_all", JetTagCollection_Label[ind] + "_all", btagBins, btagL, btagU);
+      H1_.back()[JetTagCollection_Label[ind]]->setAxisTitle(JetTagCollection_Label[ind] + "discriminant", 1);
+      // Input storing
+      ibooker.setCurrentFolder(dqmFolder + "/inputs");
+      ibooker.setCurrentFolder(dqmFolder + "/inputs/Jet");
+      for (int i = 0; i < 100; i++) {
+        if (keepSetJet.find(TaggingVariableTokens[i]) != keepSetJet.end()) {  // if input name in defined set
+          std::string inpt = TaggingVariableTokens[i];
+          H1_.back()[inpt] = ibooker.book1D(inpt, inpt, 105, -5, 100.);
+          H1_.back()[inpt]->setAxisTitle(inpt, 1);
+        } else
+          continue;
+      }
+      ibooker.setCurrentFolder(dqmFolder + "/inputs/Track");
+      for (int i = 0; i < 100; i++) {
+        if (keepSetTrack.find(TaggingVariableTokens[i]) != keepSetTrack.end()) {  // if input name in defined set
+          std::string inpt = TaggingVariableTokens[i];
+          H1_.back()[inpt] = ibooker.book1D(inpt, inpt, 105, -5, 100.);
+          H1_.back()[inpt]->setAxisTitle(inpt, 1);
+        } else
+          continue;
+      }
+      ibooker.setCurrentFolder(dqmFolder + "/inputs/Vertex");
+      for (int i = 0; i < 100; i++) {
+        if (keepSetVtx.find(TaggingVariableTokens[i]) != keepSetVtx.end()) {  // if input name in defined set
+          std::string inpt = TaggingVariableTokens[i];
+          H1_.back()[inpt] = ibooker.book1D(inpt, inpt, 105, -5, 100.);
+          H1_.back()[inpt]->setAxisTitle(inpt, 1);
+        } else
+          continue;
+      }
 
+      for (auto i : HCALSpecialsNames) {
+        ibooker.setCurrentFolder(dqmFolder + "/" + i.second);
+        H1mod_.back()[JetTagCollection_Label[ind]][i.first] = ibooker.book1D(
+            JetTagCollection_Label[ind] + "_all", JetTagCollection_Label[ind] + "_all", btagBins, btagL, btagU);
+        H1mod_.back()[JetTagCollection_Label[ind]][i.first]->setAxisTitle(JetTagCollection_Label[ind] + "discriminant",
+                                                                          1);
+      }
+      ibooker.setCurrentFolder(dqmFolder);
+    }
+    int nBinsPt = 60;
+    double pTmin = 30;
+    double pTMax = 330;
+    int nBinsPhi = 54;
+    double phimin = -M_PI;
+    double phiMax = M_PI;
+    int nBinsEta = 40;
+    double etamin = -2.4;
+    double etaMax = 2.4;
 
-//// ------------ method called once each job just before starting event loop  ------------
-void HLTBTagPerformanceAnalyzer::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & iRun,edm::EventSetup const &  iSetup )
-{
-	//book the DQM plots for each path and for each flavour
-	using namespace std;
-	assert(hltPathNames_.size()== JetTagCollection_.size());
-	std::string dqmFolder;
-	for (unsigned int ind=0; ind<hltPathNames_.size();ind++){
-		float btagL = 0.;
-		float btagU = 1.;
-		int   btagBins = 100;
-		dqmFolder = Form("%s/Discriminator/%s",mainFolder_.c_str(),hltPathNames_[ind].c_str());
-		H1_.push_back(std::map<std::string, MonitorElement *>());
-		H2_.push_back(std::map<std::string, MonitorElement *>());
-		H1mod_.push_back(std::map<std::string, std::map<HCALSpecials, MonitorElement *> > ());
-		H2mod_.push_back(std::map<std::string, std::map<HCALSpecials, MonitorElement *> > ());
-		H2Eta_.push_back(std::map<std::string, MonitorElement *>());
-		H2Phi_.push_back(std::map<std::string, MonitorElement *>());
-		H2EtaPhi_.push_back(std::map<std::string, MonitorElement *>());
-		H2EtaPhi_threshold_.push_back(std::map<std::string, MonitorElement *>());
-		ibooker.setCurrentFolder(dqmFolder);
-		
-		//book 1D btag plot for 'all'
-		if ( !JetTagCollection_Label[ind].empty() && JetTagCollection_Label[ind] != "NULL" ) { 
-			H1_.back()[JetTagCollection_Label[ind]]       = ibooker.book1D(JetTagCollection_Label[ind] + "_all",      JetTagCollection_Label[ind]+ "_all",  btagBins, btagL, btagU );
-			H1_.back()[JetTagCollection_Label[ind]]      -> setAxisTitle(JetTagCollection_Label[ind] +"discriminant",1);
-			//Input storing 
-			ibooker.setCurrentFolder(dqmFolder+"/inputs");
-			ibooker.setCurrentFolder(dqmFolder+"/inputs/Jet");
-			for (int i=0; i < 100; i++) {
-				if ( keepSetJet.find(TaggingVariableTokens[i]) != keepSetJet.end()) { // if input name in defined set
-					std::string inpt = TaggingVariableTokens[i];
-					H1_.back()[inpt]       = ibooker.book1D(inpt,inpt,  105 , -5  , 100.);
-					H1_.back()[inpt]      -> setAxisTitle(inpt,1);
-					}
-				else continue;
-			}
-			ibooker.setCurrentFolder(dqmFolder+"/inputs/Track");
-			for (int i=0; i < 100; i++) {
-				if ( keepSetTrack.find(TaggingVariableTokens[i]) != keepSetTrack.end()) { // if input name in defined set
-					std::string inpt = TaggingVariableTokens[i];
-					H1_.back()[inpt]       = ibooker.book1D(inpt,inpt,  105 , -5  , 100.);
-					H1_.back()[inpt]      -> setAxisTitle(inpt,1);
-					}
-				else continue;
-			}
-			ibooker.setCurrentFolder(dqmFolder+"/inputs/Vertex");
-			for (int i=0; i < 100; i++) {
-				if ( keepSetVtx.find(TaggingVariableTokens[i]) != keepSetVtx.end()) { // if input name in defined set
-					std::string inpt = TaggingVariableTokens[i];
-					H1_.back()[inpt]       = ibooker.book1D(inpt,inpt,  105 , -5  , 100.);
-					H1_.back()[inpt]      -> setAxisTitle(inpt,1);
-					}
-				else continue;
-			}
-
-			for (auto i: HCALSpecialsNames){
-				ibooker.setCurrentFolder(dqmFolder+"/"+i.second);
-				H1mod_.back()[JetTagCollection_Label[ind]][i.first]       = ibooker.book1D(JetTagCollection_Label[ind] + "_all",      JetTagCollection_Label[ind]+ "_all",  btagBins, btagL, btagU );
-				H1mod_.back()[JetTagCollection_Label[ind]][i.first]      -> setAxisTitle(JetTagCollection_Label[ind] +"discriminant",1);
-			}
-			ibooker.setCurrentFolder(dqmFolder);
-		} 
-		int nBinsPt=60;
-		double pTmin=30;
-		double pTMax=330;
-		int nBinsPhi=54;
-		double phimin=-M_PI;
-		double phiMax=M_PI;
-		int nBinsEta=40;
-		double etamin=-2.4;
-		double etaMax=2.4;
-
-		for (unsigned int i = 0; i < m_mcLabels.size(); ++i)
-		{
-			std::string flavour= m_mcLabels[i];
-			std::string label;
-			std::string labelEta;
-			std::string labelPhi;
-			std::string labelEtaPhi;
-			std::string labelEtaPhi_threshold;
-			if ( !JetTagCollection_Label[ind].empty() && JetTagCollection_Label[ind] != "NULL" ) {
-				label=JetTagCollection_Label[ind]+"__";
-				label+=flavour;
-
-				//book 1D btag plot for 'b,c,light,g'
-				H1_.back()[label] = 		 ibooker.book1D(label,   Form("%s %s",JetTagCollection_Label[ind].c_str(),flavour.c_str()), btagBins, btagL, btagU );
-				H1_.back()[label]->setAxisTitle("disc",1);
-				for (auto j: HCALSpecialsNames){
-					ibooker.setCurrentFolder(dqmFolder+"/"+j.second);
-					H1mod_.back()[label][j.first] = 		 ibooker.book1D(label,   Form("%s %s",JetTagCollection_Label[ind].c_str(),flavour.c_str()), btagBins, btagL, btagU );
-					H1mod_.back()[label][j.first]->setAxisTitle("disc",1);
-				}
-				ibooker.setCurrentFolder(dqmFolder);
-				label=JetTagCollection_Label[ind]+"___";
-				labelEta=label;
-				labelPhi=label;
-				labelEtaPhi=label;
-				labelEtaPhi_threshold=label;
-				label+=flavour+"_disc_pT";
-				labelEta+=flavour+"_disc_eta";
-				labelPhi+=flavour+"_disc_phi";
-				labelEtaPhi+=flavour+"_eta_phi";
-				labelEtaPhi_threshold+=flavour+"_eta_phi_disc05";
+    for (unsigned int i = 0; i < m_mcLabels.size(); ++i) {
+      std::string flavour = m_mcLabels[i];
+      std::string label;
+      std::string labelEta;
+      std::string labelPhi;
+      std::string labelEtaPhi;
+      std::string labelEtaPhi_threshold;
+      if (!JetTagCollection_Label[ind].empty() && JetTagCollection_Label[ind] != "NULL") {
+        label = JetTagCollection_Label[ind] + "__";
+        label += flavour;
 
-				//book 2D btag plot for 'b,c,light,g'
-				H2_.back()[label] =  ibooker.book2D( label, label, btagBins, btagL, btagU, nBinsPt, pTmin, pTMax );
-				H2_.back()[label]->setAxisTitle("pT",2);
-				H2_.back()[label]->setAxisTitle("disc",1);
-				for (auto j: HCALSpecialsNames){
-					ibooker.setCurrentFolder(dqmFolder+"/"+j.second);
-					H2mod_.back()[label][j.first] =  ibooker.book2D( label, label, btagBins, btagL, btagU, nBinsPt, pTmin, pTMax );
-					H2mod_.back()[label][j.first]->setAxisTitle("pT",2);
-					H2mod_.back()[label][j.first]->setAxisTitle("disc",1);
-				}
-				ibooker.setCurrentFolder(dqmFolder);
-				H2Eta_.back()[labelEta] =  ibooker.book2D( labelEta, labelEta, btagBins, btagL, btagU, nBinsEta, etamin, etaMax );
-				H2Eta_.back()[labelEta]->setAxisTitle("eta",2);
-				H2Eta_.back()[labelEta]->setAxisTitle("disc",1);
-				H2Phi_.back()[labelPhi] =  ibooker.book2D( labelPhi, labelPhi, btagBins, btagL, btagU, nBinsPhi, phimin, phiMax );
-				H2Phi_.back()[labelPhi]->setAxisTitle("phi",2);
-				H2Phi_.back()[labelPhi]->setAxisTitle("disc",1);
-				H2EtaPhi_.back()[labelEtaPhi] =  ibooker.book2D( labelEtaPhi, labelEtaPhi, nBinsEta, etamin, etaMax, nBinsPhi, phimin, phiMax );
-                                H2EtaPhi_.back()[labelEtaPhi]->setAxisTitle("phi",2);
-                                H2EtaPhi_.back()[labelEtaPhi]->setAxisTitle("eta",1);
-				H2EtaPhi_threshold_.back()[labelEtaPhi_threshold] =  ibooker.book2D( labelEtaPhi_threshold, labelEtaPhi_threshold, nBinsEta, etamin, etaMax, nBinsPhi, phimin, phiMax );
-                                H2EtaPhi_threshold_.back()[labelEtaPhi_threshold]->setAxisTitle("phi",2);
-                                H2EtaPhi_threshold_.back()[labelEtaPhi_threshold]->setAxisTitle("eta",1);
+        // book 1D btag plot for 'b,c,light,g'
+        H1_.back()[label] = ibooker.book1D(
+            label, Form("%s %s", JetTagCollection_Label[ind].c_str(), flavour.c_str()), btagBins, btagL, btagU);
+        H1_.back()[label]->setAxisTitle("disc", 1);
+        for (auto j : HCALSpecialsNames) {
+          ibooker.setCurrentFolder(dqmFolder + "/" + j.second);
+          H1mod_.back()[label][j.first] = ibooker.book1D(
+              label, Form("%s %s", JetTagCollection_Label[ind].c_str(), flavour.c_str()), btagBins, btagL, btagU);
+          H1mod_.back()[label][j.first]->setAxisTitle("disc", 1);
+        }
+        ibooker.setCurrentFolder(dqmFolder);
+        label = JetTagCollection_Label[ind] + "___";
+        labelEta = label;
+        labelPhi = label;
+        labelEtaPhi = label;
+        labelEtaPhi_threshold = label;
+        label += flavour + "_disc_pT";
+        labelEta += flavour + "_disc_eta";
+        labelPhi += flavour + "_disc_phi";
+        labelEtaPhi += flavour + "_eta_phi";
+        labelEtaPhi_threshold += flavour + "_eta_phi_disc05";
 
-			}
-		} /// for mc.size()
-	} /// for hltPathNames_.size()
+        // book 2D btag plot for 'b,c,light,g'
+        H2_.back()[label] = ibooker.book2D(label, label, btagBins, btagL, btagU, nBinsPt, pTmin, pTMax);
+        H2_.back()[label]->setAxisTitle("pT", 2);
+        H2_.back()[label]->setAxisTitle("disc", 1);
+        for (auto j : HCALSpecialsNames) {
+          ibooker.setCurrentFolder(dqmFolder + "/" + j.second);
+          H2mod_.back()[label][j.first] = ibooker.book2D(label, label, btagBins, btagL, btagU, nBinsPt, pTmin, pTMax);
+          H2mod_.back()[label][j.first]->setAxisTitle("pT", 2);
+          H2mod_.back()[label][j.first]->setAxisTitle("disc", 1);
+        }
+        ibooker.setCurrentFolder(dqmFolder);
+        H2Eta_.back()[labelEta] = ibooker.book2D(labelEta, labelEta, btagBins, btagL, btagU, nBinsEta, etamin, etaMax);
+        H2Eta_.back()[labelEta]->setAxisTitle("eta", 2);
+        H2Eta_.back()[labelEta]->setAxisTitle("disc", 1);
+        H2Phi_.back()[labelPhi] = ibooker.book2D(labelPhi, labelPhi, btagBins, btagL, btagU, nBinsPhi, phimin, phiMax);
+        H2Phi_.back()[labelPhi]->setAxisTitle("phi", 2);
+        H2Phi_.back()[labelPhi]->setAxisTitle("disc", 1);
+        H2EtaPhi_.back()[labelEtaPhi] =
+            ibooker.book2D(labelEtaPhi, labelEtaPhi, nBinsEta, etamin, etaMax, nBinsPhi, phimin, phiMax);
+        H2EtaPhi_.back()[labelEtaPhi]->setAxisTitle("phi", 2);
+        H2EtaPhi_.back()[labelEtaPhi]->setAxisTitle("eta", 1);
+        H2EtaPhi_threshold_.back()[labelEtaPhi_threshold] = ibooker.book2D(
+            labelEtaPhi_threshold, labelEtaPhi_threshold, nBinsEta, etamin, etaMax, nBinsPhi, phimin, phiMax);
+        H2EtaPhi_threshold_.back()[labelEtaPhi_threshold]->setAxisTitle("phi", 2);
+        H2EtaPhi_threshold_.back()[labelEtaPhi_threshold]->setAxisTitle("eta", 1);
+      }
+    }  /// for mc.size()
+  }    /// for hltPathNames_.size()
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(HLTBTagPerformanceAnalyzer);
-
diff --git a/HLTriggerOffline/Btag/src/HLTVertexPerformanceAnalyzer.cc b/HLTriggerOffline/Btag/src/HLTVertexPerformanceAnalyzer.cc
index 6767cde68246f..df0fc5d9967eb 100644
--- a/HLTriggerOffline/Btag/src/HLTVertexPerformanceAnalyzer.cc
+++ b/HLTriggerOffline/Btag/src/HLTVertexPerformanceAnalyzer.cc
@@ -3,142 +3,153 @@
 using namespace edm;
 using namespace reco;
 
-HLTVertexPerformanceAnalyzer::HLTVertexPerformanceAnalyzer(const edm::ParameterSet& iConfig)
-{
-	mainFolder_                     = iConfig.getParameter<std::string>("mainFolder");
-	hlTriggerResults_   		= consumes<TriggerResults>(iConfig.getParameter<InputTag> ("TriggerResults"));
-	VertexCollection_           = 	edm::vector_transform(iConfig.getParameter<std::vector<edm::InputTag> >( "Vertex" ), [this](edm::InputTag const & tag){return mayConsume< reco::VertexCollection>(tag);});
-	hltPathNames_        		= iConfig.getParameter< std::vector<std::string> > ("HLTPathNames");
-	simVertexCollection_ = consumes<std::vector<SimVertex> >(iConfig.getParameter<edm::InputTag> ("SimVertexCollection"));
-
-	EDConsumerBase::labelsForToken(hlTriggerResults_,label);
-	hlTriggerResults_Label = label.module;
-	
-	for(unsigned int i=0; i<VertexCollection_.size() ; i++){
-		EDConsumerBase::labelsForToken(VertexCollection_[i],label);
-		VertexCollection_Label.push_back(label.module);
-	}
+HLTVertexPerformanceAnalyzer::HLTVertexPerformanceAnalyzer(const edm::ParameterSet &iConfig) {
+  mainFolder_ = iConfig.getParameter<std::string>("mainFolder");
+  hlTriggerResults_ = consumes<TriggerResults>(iConfig.getParameter<InputTag>("TriggerResults"));
+  VertexCollection_ =
+      edm::vector_transform(iConfig.getParameter<std::vector<edm::InputTag>>("Vertex"),
+                            [this](edm::InputTag const &tag) { return mayConsume<reco::VertexCollection>(tag); });
+  hltPathNames_ = iConfig.getParameter<std::vector<std::string>>("HLTPathNames");
+  simVertexCollection_ = consumes<std::vector<SimVertex>>(iConfig.getParameter<edm::InputTag>("SimVertexCollection"));
+
+  EDConsumerBase::labelsForToken(hlTriggerResults_, label);
+  hlTriggerResults_Label = label.module;
+
+  for (unsigned int i = 0; i < VertexCollection_.size(); i++) {
+    EDConsumerBase::labelsForToken(VertexCollection_[i], label);
+    VertexCollection_Label.push_back(label.module);
+  }
 }
 
-
-HLTVertexPerformanceAnalyzer::~HLTVertexPerformanceAnalyzer()
-{
+HLTVertexPerformanceAnalyzer::~HLTVertexPerformanceAnalyzer() {}
+
+void HLTVertexPerformanceAnalyzer::dqmBeginRun(const edm::Run &iRun, const edm::EventSetup &iSetup) {
+  triggerConfChanged_ = true;
+  EDConsumerBase::labelsForToken(hlTriggerResults_, label);
+
+  hltConfigProvider_.init(iRun, iSetup, label.process, triggerConfChanged_);
+  const std::vector<std::string> &allHltPathNames = hltConfigProvider_.triggerNames();
+
+  // fill hltPathIndexs_ with the trigger number of each hltPathNames_
+  for (size_t trgs = 0; trgs < hltPathNames_.size(); trgs++) {
+    unsigned int found = 1;
+    int it_mem = -1;
+    for (size_t it = 0; it < allHltPathNames.size(); ++it) {
+      found = allHltPathNames.at(it).find(hltPathNames_[trgs]);
+      if (found == 0) {
+        it_mem = (int)it;
+      }
+    }  // for allallHltPathNames
+    hltPathIndexs_.push_back(it_mem);
+  }  // for hltPathNames_
+
+  // fill _isfoundHLTs for each hltPathNames_
+  for (size_t trgs = 0; trgs < hltPathNames_.size(); trgs++) {
+    if (hltPathIndexs_[trgs] < 0) {
+      _isfoundHLTs.push_back(false);
+    } else {
+      _isfoundHLTs.push_back(true);
+    }
+  }
 }
 
-
-void HLTVertexPerformanceAnalyzer::dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup) {
-	triggerConfChanged_ = true;
-	EDConsumerBase::labelsForToken(hlTriggerResults_,label);
-	
-	hltConfigProvider_.init(iRun, iSetup, label.process, triggerConfChanged_);
-	const std::vector< std::string > & allHltPathNames = hltConfigProvider_.triggerNames();
-
-	//fill hltPathIndexs_ with the trigger number of each hltPathNames_
-	for ( size_t trgs=0; trgs<hltPathNames_.size(); trgs++) {
-		unsigned int found = 1;
-		int it_mem = -1;
-		for (size_t it=0 ; it < allHltPathNames.size() ; ++it )
-		{
-			found = allHltPathNames.at(it).find(hltPathNames_[trgs]);
-			if ( found == 0 )
-			{
-				it_mem= (int) it;
-			}
-		}//for allallHltPathNames
-		hltPathIndexs_.push_back(it_mem);
-	}//for hltPathNames_
-	
-	//fill _isfoundHLTs for each hltPathNames_
-	for ( size_t trgs=0; trgs<hltPathNames_.size(); trgs++) {
-		if ( hltPathIndexs_[trgs] < 0 ) {
-			_isfoundHLTs.push_back(false);
-		} 
-		else {
-			_isfoundHLTs.push_back(true);
-		}
-	}
+void HLTVertexPerformanceAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  bool trigRes = false;
+  using namespace edm;
+
+  // get triggerResults
+  Handle<TriggerResults> TriggerResulsHandler;
+  if (hlTriggerResults_Label.empty() || hlTriggerResults_Label == "NULL") {
+    edm::LogInfo("NoTriggerResults") << "TriggerResults ==> Empty";
+    return;
+  }
+  iEvent.getByToken(hlTriggerResults_, TriggerResulsHandler);
+  if (TriggerResulsHandler.isValid())
+    trigRes = true;
+  if (!trigRes) {
+    edm::LogInfo("NoTriggerResults") << "TriggerResults ==> not readable";
+    return;
+  }
+  const TriggerResults &triggerResults = *(TriggerResulsHandler.product());
+
+  // get simVertex
+  float simPV = 0;
+
+  Handle<std::vector<SimVertex>> simVertexCollection;
+  iEvent.getByToken(simVertexCollection_, simVertexCollection);
+  if (!simVertexCollection.isValid()) {
+    edm::LogInfo("NoSimVertex") << "SimVertex collection is invalid";
+    return;
+  }
+  if (simVertexCollection->empty()) {
+    edm::LogInfo("NoSimVertex") << "SimVertex collection is empty";
+    return;
+  }
+  const SimVertex simPVh = *(simVertexCollection->begin());
+  simPV = simPVh.position().z();
+
+  // fill the DQM plot
+  Handle<VertexCollection> VertexHandler;
+  for (unsigned int ind = 0; ind < hltPathNames_.size(); ind++) {
+    for (unsigned int coll = 0; coll < VertexCollection_.size(); coll++) {
+      bool VertexOK = false;
+      if (!_isfoundHLTs[ind])
+        continue;  // if the hltPath is not in the event, skip the event
+      if (!triggerResults.accept(hltPathIndexs_[ind]))
+        continue;  // if the hltPath was not accepted skip the event
+
+      // get the recoVertex
+      if (!VertexCollection_Label.at(coll).empty() && VertexCollection_Label.at(coll) != "NULL") {
+        iEvent.getByToken(VertexCollection_.at(coll), VertexHandler);
+        if (VertexHandler.isValid() > 0)
+          VertexOK = true;
+      }
+
+      if (VertexOK) {
+        // calculate the variable (RecoVertex - SimVertex)
+        float value = VertexHandler->begin()->z() - simPV;
+
+        // if value is over/under flow, assign the extreme value
+        float maxValue = H1_.at(ind)["Vertex_" + VertexCollection_Label.at(coll)]->getTH1F()->GetXaxis()->GetXmax();
+        if (value > maxValue)
+          value = maxValue - 0.0001;
+        if (value < -maxValue)
+          value = -maxValue + 0.0001;
+        // fill the histo
+        H1_.at(ind)["Vertex_" + VertexCollection_Label.at(coll)]->Fill(value);
+      }
+    }  // for on VertexCollection_
+  }    // for on hltPathNames_
 }
 
-
-void HLTVertexPerformanceAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-	bool trigRes=false;
-	using namespace edm;
-
-	//get triggerResults
-	Handle<TriggerResults> TriggerResulsHandler;
-	if ( hlTriggerResults_Label == "" || hlTriggerResults_Label == "NULL" ) {
-		edm::LogInfo("NoTriggerResults") << "TriggerResults ==> Empty";
-		return;
-	}
-	iEvent.getByToken(hlTriggerResults_, TriggerResulsHandler);
-	if (TriggerResulsHandler.isValid())   trigRes=true;
-	if ( !trigRes ) { edm::LogInfo("NoTriggerResults") << "TriggerResults ==> not readable"; return;}
-	const TriggerResults & triggerResults = *(TriggerResulsHandler.product());
-
-	//get simVertex
-	float simPV=0;
-
-	Handle<std::vector<SimVertex> > simVertexCollection;
-	iEvent.getByToken(simVertexCollection_, simVertexCollection);
-	if (!simVertexCollection.isValid()) { edm::LogInfo("NoSimVertex") << "SimVertex collection is invalid"; return;}
-	if (simVertexCollection->empty()) { edm::LogInfo("NoSimVertex") << "SimVertex collection is empty"; return;}
-	const SimVertex simPVh = *(simVertexCollection->begin());
-	simPV=simPVh.position().z();
-	
-	//fill the DQM plot
-	Handle<VertexCollection> VertexHandler;
-	for (unsigned int ind=0; ind<hltPathNames_.size();ind++) {
-		for (unsigned int coll=0; coll<VertexCollection_.size();coll++) {
-			bool VertexOK=false;
-			if ( !_isfoundHLTs[ind]) continue;	//if the hltPath is not in the event, skip the event
-			if ( !triggerResults.accept(hltPathIndexs_[ind]) ) continue;	//if the hltPath was not accepted skip the event
-			
-			//get the recoVertex
-			if (VertexCollection_Label.at(coll) != "" && VertexCollection_Label.at(coll) != "NULL" )
-			{
-				iEvent.getByToken(VertexCollection_.at(coll), VertexHandler);
-				if (VertexHandler.isValid()>0)   VertexOK=true;
-			}
-			
-			if (VertexOK){
-				//calculate the variable (RecoVertex - SimVertex)
-				float value=VertexHandler->begin()->z()-simPV;
-				
-				//if value is over/under flow, assign the extreme value
-				float maxValue=H1_.at(ind)["Vertex_"+VertexCollection_Label.at(coll)]->getTH1F()->GetXaxis()->GetXmax();
-				if(value>maxValue)	value=maxValue-0.0001; 
-				if(value<-maxValue)	value=-maxValue+0.0001; 
-				//fill the histo
-				H1_.at(ind)["Vertex_"+VertexCollection_Label.at(coll)] -> Fill(value);
-			}
-		}// for on VertexCollection_
-	}//for on hltPathNames_
-}
-
-
-void HLTVertexPerformanceAnalyzer::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & iRun,edm::EventSetup const &  iSetup )
-{
-	//book the DQM plots
-	using namespace std;
-	std::string dqmFolder;
-	for (unsigned int ind=0; ind<hltPathNames_.size();ind++) {
-		dqmFolder = Form("%s/Vertex/%s",mainFolder_.c_str(),hltPathNames_[ind].c_str());
-		H1_.push_back(std::map<std::string, MonitorElement *>());
-		ibooker.setCurrentFolder(dqmFolder);
-		for (unsigned int coll=0; coll<VertexCollection_.size();coll++) {
-			float maxValue = 0.02;
-			if(VertexCollection_Label.at(coll)==("hltFastPrimaryVertex")) maxValue = 2.; //for the hltFastPrimaryVertex use a larger scale (res ~ 1 cm)
-			float vertexU = maxValue;
-			float vertexL = -maxValue;
-			int   vertexBins = 100;
-			if ( VertexCollection_Label.at(coll) != "" && VertexCollection_Label.at(coll) != "NULL" ) { 
-				H1_.back()["Vertex_"+VertexCollection_Label.at(coll)]       = ibooker.book1D("Vertex_"+VertexCollection_Label.at(coll),      VertexCollection_Label.at(coll).c_str(),  vertexBins, vertexL, vertexU );
-				H1_.back()["Vertex_"+VertexCollection_Label.at(coll)]      -> setAxisTitle("vertex error (cm)",1);
-			}
-		}
-	}
+void HLTVertexPerformanceAnalyzer::bookHistograms(DQMStore::IBooker &ibooker,
+                                                  edm::Run const &iRun,
+                                                  edm::EventSetup const &iSetup) {
+  // book the DQM plots
+  using namespace std;
+  std::string dqmFolder;
+  for (unsigned int ind = 0; ind < hltPathNames_.size(); ind++) {
+    dqmFolder = Form("%s/Vertex/%s", mainFolder_.c_str(), hltPathNames_[ind].c_str());
+    H1_.push_back(std::map<std::string, MonitorElement *>());
+    ibooker.setCurrentFolder(dqmFolder);
+    for (unsigned int coll = 0; coll < VertexCollection_.size(); coll++) {
+      float maxValue = 0.02;
+      if (VertexCollection_Label.at(coll) == ("hltFastPrimaryVertex"))
+        maxValue = 2.;  // for the hltFastPrimaryVertex use a larger scale (res ~ 1 cm)
+      float vertexU = maxValue;
+      float vertexL = -maxValue;
+      int vertexBins = 100;
+      if (!VertexCollection_Label.at(coll).empty() && VertexCollection_Label.at(coll) != "NULL") {
+        H1_.back()["Vertex_" + VertexCollection_Label.at(coll)] =
+            ibooker.book1D("Vertex_" + VertexCollection_Label.at(coll),
+                           VertexCollection_Label.at(coll).c_str(),
+                           vertexBins,
+                           vertexL,
+                           vertexU);
+        H1_.back()["Vertex_" + VertexCollection_Label.at(coll)]->setAxisTitle("vertex error (cm)", 1);
+      }
+    }
+  }
 }
 
 DEFINE_FWK_MODULE(HLTVertexPerformanceAnalyzer);
-
diff --git a/HLTriggerOffline/Common/interface/HltComparator.h b/HLTriggerOffline/Common/interface/HltComparator.h
index f6b439031564d..ac097eae3d4a7 100644
--- a/HLTriggerOffline/Common/interface/HltComparator.h
+++ b/HLTriggerOffline/Common/interface/HltComparator.h
@@ -2,9 +2,9 @@
 #define HLTCOMPARATOR_H
 // Original Author: James Jackson
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDFilter.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -12,40 +12,36 @@
 
 class TH1F;
 
-class HltComparator : public edm::EDFilter
-{
-    public:
-        explicit HltComparator(const edm::ParameterSet&);
-        ~HltComparator() override;
+class HltComparator : public edm::EDFilter {
+public:
+  explicit HltComparator(const edm::ParameterSet &);
+  ~HltComparator() override;
 
-    private:
-        edm::EDGetTokenT<edm::TriggerResults> hltOnlineResults_;
-        edm::EDGetTokenT<edm::TriggerResults> hltOfflineResults_;
+private:
+  edm::EDGetTokenT<edm::TriggerResults> hltOnlineResults_;
+  edm::EDGetTokenT<edm::TriggerResults> hltOfflineResults_;
 
-        std::vector<std::string> onlineActualNames_;
-        std::vector<std::string> offlineActualNames_;
-        std::vector<unsigned int> onlineToOfflineBitMappings_;
+  std::vector<std::string> onlineActualNames_;
+  std::vector<std::string> offlineActualNames_;
+  std::vector<unsigned int> onlineToOfflineBitMappings_;
 
-        std::vector<TH1F*> comparisonHists_;
-        std::map<unsigned int, std::map<std::string, unsigned int> > triggerComparisonErrors_;
+  std::vector<TH1F *> comparisonHists_;
+  std::map<unsigned int, std::map<std::string, unsigned int>> triggerComparisonErrors_;
 
-        bool init_;
-	bool verbose_;
-	bool verbose() const { return verbose_; }
+  bool init_;
+  bool verbose_;
+  bool verbose() const { return verbose_; }
 
-	std::vector<std::string> skipPathList_;
-	std::vector<std::string> usePathList_;
+  std::vector<std::string> skipPathList_;
+  std::vector<std::string> usePathList_;
 
-        unsigned int numTriggers_;
+  unsigned int numTriggers_;
 
-        void beginJob() override ;
-        bool filter(edm::Event&, const edm::EventSetup&) override;
-        void endJob() override ;
-        void initialise(const edm::TriggerResults&, 
-			const edm::TriggerResults&,
-                        edm::Event& e);
-        std::string formatResult(const unsigned int);
+  void beginJob() override;
+  bool filter(edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
+  void initialise(const edm::TriggerResults &, const edm::TriggerResults &, edm::Event &e);
+  std::string formatResult(const unsigned int);
 };
 
-#endif // HLTCOMPARATOR_HH
-
+#endif  // HLTCOMPARATOR_HH
diff --git a/HLTriggerOffline/Common/src/HltComparator.cc b/HLTriggerOffline/Common/src/HltComparator.cc
index d035037b9d3fb..41fdb178d4cf9 100644
--- a/HLTriggerOffline/Common/src/HltComparator.cc
+++ b/HLTriggerOffline/Common/src/HltComparator.cc
@@ -2,102 +2,93 @@
 // modified by Peter Wittich
 
 // user include files
-#include "HLTriggerOffline/Common/interface/HltComparator.h"
 #include "FWCore/Common/interface/TriggerNames.h"
+#include "HLTriggerOffline/Common/interface/HltComparator.h"
 //#include "FWCore/Utilities/interface/Exception.h"
 
 //#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include <TH1.h>
 #include <iostream>
-#include <vector>
 #include <string>
-
+#include <vector>
 
 typedef std::vector<std::string> StringCollection;
 
-
 // types of outcomes possible.
 // only some are errors
 enum {
-    kOnOffPass = 0, kOnOffFail, kOnPassOffFail, kOnFailOffPass, 
-    kOnOffError, kOnRunOffError, kOnErrorOffRun, kOnRunOffNot, kOnNotOffRun,
-    kOnOffNot
+  kOnOffPass = 0,
+  kOnOffFail,
+  kOnPassOffFail,
+  kOnFailOffPass,
+  kOnOffError,
+  kOnRunOffError,
+  kOnErrorOffRun,
+  kOnRunOffNot,
+  kOnNotOffRun,
+  kOnOffNot
 };
 
-
 // Analyser constructor
-HltComparator::HltComparator(const edm::ParameterSet & iConfig):
-  hltOnlineResults_(consumes<edm::TriggerResults>(iConfig.getParameter<edm::InputTag>("OnlineResults"))),
-  hltOfflineResults_(consumes<edm::TriggerResults>(iConfig.getParameter<edm::InputTag>("OfflineResults"))),
-  init_(false),
-  verbose_(iConfig.getUntrackedParameter<bool>("verbose")),
-  skipPathList_(iConfig.getUntrackedParameter<std::vector<std::string> >("skipPaths")),
-  usePathList_(iConfig.getUntrackedParameter<std::vector<std::string> >("usePaths"))
-{
-  //std::cout << " HERE I AM " << std::endl;
-  produces<StringCollection >("failedTriggerDescription");
-  //std::cout << " HERE I GO " << std::endl;
+HltComparator::HltComparator(const edm::ParameterSet &iConfig)
+    : hltOnlineResults_(consumes<edm::TriggerResults>(iConfig.getParameter<edm::InputTag>("OnlineResults"))),
+      hltOfflineResults_(consumes<edm::TriggerResults>(iConfig.getParameter<edm::InputTag>("OfflineResults"))),
+      init_(false),
+      verbose_(iConfig.getUntrackedParameter<bool>("verbose")),
+      skipPathList_(iConfig.getUntrackedParameter<std::vector<std::string>>("skipPaths")),
+      usePathList_(iConfig.getUntrackedParameter<std::vector<std::string>>("usePaths")) {
+  // std::cout << " HERE I AM " << std::endl;
+  produces<StringCollection>("failedTriggerDescription");
+  // std::cout << " HERE I GO " << std::endl;
 }
 
-
-HltComparator::~HltComparator()
-{
-}
+HltComparator::~HltComparator() {}
 
 // Initialises online --> offline trigger bit mappings and histograms
-void
-HltComparator::initialise(const edm::TriggerResults & onlineResults,
-			  const edm::TriggerResults & offlineResults,
-                          edm::Event& e)
-{
+void HltComparator::initialise(const edm::TriggerResults &onlineResults,
+                               const edm::TriggerResults &offlineResults,
+                               edm::Event &e) {
   init_ = true;
 
-  // Get trigger names 
-  const edm::TriggerNames & onlineTriggerNames = e.triggerNames(onlineResults);
-  const edm::TriggerNames & offlineTriggerNames = e.triggerNames(offlineResults);
+  // Get trigger names
+  const edm::TriggerNames &onlineTriggerNames = e.triggerNames(onlineResults);
+  const edm::TriggerNames &offlineTriggerNames = e.triggerNames(offlineResults);
   onlineActualNames_ = onlineTriggerNames.triggerNames();
   offlineActualNames_ = offlineTriggerNames.triggerNames();
   numTriggers_ = onlineActualNames_.size();
-  
+
   // do we need to throw? I guess the whole job is crap if this happens.
   // sort of assumes we're the only game in town.
   if (numTriggers_ != offlineActualNames_.size()) {
-    throw cms::Exception("IncorrectTriggers") << "Online had "
-					      << numTriggers_ << "triggers, "
-					      << "Offline had " 
-					      << offlineActualNames_.size()
-					      << "triggers";
+    throw cms::Exception("IncorrectTriggers") << "Online had " << numTriggers_ << "triggers, "
+                                              << "Offline had " << offlineActualNames_.size() << "triggers";
   }
 
   // Create bit mappings
-  std::map<std::string, unsigned int >offlineNameBitMap;
+  std::map<std::string, unsigned int> offlineNameBitMap;
   for (unsigned int i = 0; i < numTriggers_; ++i) {
     offlineNameBitMap[offlineActualNames_[i]] = i;
   }
   for (unsigned int i = 0; i < numTriggers_; ++i) {
     // Find offline position for fixed online bit
-    std::map<std::string, unsigned int >::iterator it =
-      offlineNameBitMap.find(onlineActualNames_[i]);
+    std::map<std::string, unsigned int>::iterator it = offlineNameBitMap.find(onlineActualNames_[i]);
     if (it != offlineNameBitMap.end()) {
       onlineToOfflineBitMappings_.push_back(it->second);
-    }
-    else {
-      throw cms:: Exception("IncorrectTriggers") << "Online trigger path " 
-						 << onlineActualNames_[i] 
-						 << " not found in Offline "
-	"processing";
+    } else {
+      throw cms::Exception("IncorrectTriggers") << "Online trigger path " << onlineActualNames_[i]
+                                                << " not found in Offline "
+                                                   "processing";
     }
   }
-  
+
   // Create histograms
   edm::Service<TFileService> fs;
-  for (std::vector<std::string>::iterator it = onlineActualNames_.begin();
-       it != onlineActualNames_.end(); ++it) {
-    // Bin descriptions: OnOfPass, OnOffFail, OnPassOffFail, OnFailOffPass, 
-    // OnOffError, OnRunOffError, OnErrorOffRun, OnRunOffNot OnNotOffRun 
+  for (std::vector<std::string>::iterator it = onlineActualNames_.begin(); it != onlineActualNames_.end(); ++it) {
+    // Bin descriptions: OnOfPass, OnOffFail, OnPassOffFail, OnFailOffPass,
+    // OnOffError, OnRunOffError, OnErrorOffRun, OnRunOffNot OnNotOffRun
     // OnNotOffNot
     TH1F *h = fs->make<TH1F>(it->c_str(), it->c_str(), 10, 0, 10);
     TAxis *a = h->GetXaxis();
@@ -116,48 +107,44 @@ HltComparator::initialise(const edm::TriggerResults & onlineResults,
 }
 
 // Format a comparison result
-std::string HltComparator::formatResult(const unsigned int i)
-{
+std::string HltComparator::formatResult(const unsigned int i) {
   switch (i) {
-  case 0:
-    return std::string("OnPass_OffPass");
-    break;
-  case 1:
-    return std::string("OnFail_OffFail");
-    break;
-  case 2:
-    return std::string("OnPass_OffFail");
-    break;
-  case 3:
-    return std::string("OnFail_OffPass");
-    break;
-  case 4:
-    return std::string("OnError_OffError");
-    break;
-  case 5:
-    return std::string("OnRun_OffError");
-    break;
-  case 6:
-    return std::string("OnError_OffRun");
-    break;
-  case 7:
-    return std::string("OnRun_OffNotRun");
-    break;
-  case 8:
-    return std::string("OnNotRun_OffRun");
-    break;
-  case 9:
-    return std::string("OnNotRun_OffNotRun");
-    break;
+    case 0:
+      return std::string("OnPass_OffPass");
+      break;
+    case 1:
+      return std::string("OnFail_OffFail");
+      break;
+    case 2:
+      return std::string("OnPass_OffFail");
+      break;
+    case 3:
+      return std::string("OnFail_OffPass");
+      break;
+    case 4:
+      return std::string("OnError_OffError");
+      break;
+    case 5:
+      return std::string("OnRun_OffError");
+      break;
+    case 6:
+      return std::string("OnError_OffRun");
+      break;
+    case 7:
+      return std::string("OnRun_OffNotRun");
+      break;
+    case 8:
+      return std::string("OnNotRun_OffRun");
+      break;
+    case 9:
+      return std::string("OnNotRun_OffNotRun");
+      break;
   }
   return std::string("CODE NOT KNOWN");
 }
 
-bool
-HltComparator::filter(edm::Event & event,
-		      const edm::EventSetup & iSetup)
-{
-  //std::cout << "top of the filter " << std::endl;
+bool HltComparator::filter(edm::Event &event, const edm::EventSetup &iSetup) {
+  // std::cout << "top of the filter " << std::endl;
   // Get trigger results
   edm::Handle<edm::TriggerResults> onlineResults;
   edm::Handle<edm::TriggerResults> offlineResults;
@@ -165,139 +152,115 @@ HltComparator::filter(edm::Event & event,
   event.getByToken(hltOfflineResults_, offlineResults);
 
   std::unique_ptr<StringCollection> resultDescription(new StringCollection);
-  
+
   // Initialise comparator if required
   if (!init_) {
     initialise(*onlineResults, *offlineResults, event);
   }
-  
+
   // Perform trigger checks
   bool hasDisagreement = false;
   for (unsigned int i = 0; i < numTriggers_; ++i) {
     unsigned int offlineTriggerBit = onlineToOfflineBitMappings_[i];
-    
+
     bool onRun = onlineResults->wasrun(i);
     bool offRun = offlineResults->wasrun(offlineTriggerBit);
     bool onAccept = onlineResults->accept(i);
     bool offAccept = offlineResults->accept(offlineTriggerBit);
     bool onError = onlineResults->error(i);
     bool offError = offlineResults->error(offlineTriggerBit);
-    
+
     int result = -1;
     if (onError || offError) {
       if (onError && offError) {
-	result = 4;
-      }
-      else if (onError) {
-	result = 6;
-      }
-      else {
-	result = 5;
+        result = 4;
+      } else if (onError) {
+        result = 6;
+      } else {
+        result = 5;
       }
-    }
-    else if ((!onRun) || (!offRun)) {
+    } else if ((!onRun) || (!offRun)) {
       if ((!onRun) && (!offRun)) {
-	result = 9;
-      }
-      else if (!onRun) {
-	result = 8;
+        result = 9;
+      } else if (!onRun) {
+        result = 8;
+      } else {
+        result = 7;
       }
-      else {
-	result = 7;
-      }
-    }
-    else {
+    } else {
       if (onAccept && offAccept) {
-	result = 0;
-      }
-      else if ((!onAccept) && (!offAccept)) {
-	result = 1;
-      }
-      else if (onAccept) {
-	result = 2;
-      }
-      else {
-	result = 3;
+        result = 0;
+      } else if ((!onAccept) && (!offAccept)) {
+        result = 1;
+      } else if (onAccept) {
+        result = 2;
+      } else {
+        result = 3;
       }
     }
-    
+
     // Fill the results histogram
     comparisonHists_[i]->Fill(result);
 
-  // if the online-offline comparison results in a failure, we
-  // want to send the result to a special stream. Hence we _pass_ the filter.
-  // If it all worked as expected the filter fails and the event doesn't go
-  // to the output stream.
-    if ( (result == kOnPassOffFail) || ( result == kOnFailOffPass ) ||
- 	 (result == kOnRunOffError) || ( result == kOnErrorOffRun ) ||
- 	 (result == kOnRunOffNot)   || ( result == kOnNotOffRun ) ) {
+    // if the online-offline comparison results in a failure, we
+    // want to send the result to a special stream. Hence we _pass_ the filter.
+    // If it all worked as expected the filter fails and the event doesn't go
+    // to the output stream.
+    if ((result == kOnPassOffFail) || (result == kOnFailOffPass) || (result == kOnRunOffError) ||
+        (result == kOnErrorOffRun) || (result == kOnRunOffNot) || (result == kOnNotOffRun)) {
       // is this one we should ignore? check the skip list
-      if ( verbose() ) {
-	std::cout << "Found disagreemenet " << result << ", name is " 
-		  << onlineActualNames_[i]
-		  << std::endl;
+      if (verbose()) {
+        std::cout << "Found disagreemenet " << result << ", name is " << onlineActualNames_[i] << std::endl;
       }
       std::ostringstream desc;
       desc << onlineActualNames_[i] << ":" << formatResult(result);
       resultDescription->push_back(desc.str());
-      if ( std::find(skipPathList_.begin(), skipPathList_.end(), 
-		     onlineActualNames_[i]) == skipPathList_.end() ) {
-
-	if (!usePathList_.empty()){
-	  //only use specified paths to debug
-	  if (std::find(usePathList_.begin(), usePathList_.end(),
-			onlineActualNames_[i]) != usePathList_.end() )
-	    hasDisagreement = true;
-	}
-	else
-	  hasDisagreement = true;
+      if (std::find(skipPathList_.begin(), skipPathList_.end(), onlineActualNames_[i]) == skipPathList_.end()) {
+        if (!usePathList_.empty()) {
+          // only use specified paths to debug
+          if (std::find(usePathList_.begin(), usePathList_.end(), onlineActualNames_[i]) != usePathList_.end())
+            hasDisagreement = true;
+        } else
+          hasDisagreement = true;
       }
     }
-      
+
     // Record the trigger error code
     // I think this should be result > 2? (pw)
     if (verbose() && (result > 1)) {
-      std::cout << "HLT-Compare: Event " << event.id().event() 
-		<< " Path " << onlineActualNames_[i] << " " 
-		<< formatResult(result) << std::endl;
-#ifdef NOTDEF      
+      std::cout << "HLT-Compare: Event " << event.id().event() << " Path " << onlineActualNames_[i] << " "
+                << formatResult(result) << std::endl;
+#ifdef NOTDEF
       triggerComparisonErrors_[event.id().event()][onlineActualNames_[i]] = result;
-#endif // NOTDEF
+#endif  // NOTDEF
     }
   }
 
-  //std::cout << " HERE I STAY " << std::endl;
-  event.put(std::move(resultDescription),"failedTriggerDescription");
-  //std::cout << " HERE I WENT " << std::endl;
+  // std::cout << " HERE I STAY " << std::endl;
+  event.put(std::move(resultDescription), "failedTriggerDescription");
+  // std::cout << " HERE I WENT " << std::endl;
 
-  if ( hasDisagreement ) 
+  if (hasDisagreement)
     return true;
   else
     return false;
 }
 
-
-void
-HltComparator::beginJob()
-{
-}
+void HltComparator::beginJob() {}
 
 // Print the trigger results
-void
-HltComparator::endJob()
-{
+void HltComparator::endJob() {
 #ifdef NOTDEF
   std::cout << "HLT-Compare ---------- Trigger Comparison Summary ----------" << std::endl;
   std::cout << "HLT-Compare  The following events had trigger mismatches:" << std::endl;
-  std::map<unsigned int, std::map<std::string, unsigned int> >::iterator it;
-  for(it = triggerComparisonErrors_.begin(); it != triggerComparisonErrors_.end(); ++it) {
+  std::map<unsigned int, std::map<std::string, unsigned int>>::iterator it;
+  for (it = triggerComparisonErrors_.begin(); it != triggerComparisonErrors_.end(); ++it) {
     std::cout << "HLT-Compare  Event: " << it->first << std::endl;
     std::map<std::string, unsigned int>::iterator jt;
-    for(jt = it->second.begin(); jt != it->second.end(); ++jt) {
+    for (jt = it->second.begin(); jt != it->second.end(); ++jt) {
       std::cout << "HLT-Compare    Path: " << jt->first << " : " << formatResult(jt->second) << std::endl;
     }
   }
   std::cout << "HLT-Compare ------------ End Trigger Comparison ------------" << std::endl;
-#endif //NOTDEF
+#endif  // NOTDEF
 }
-
diff --git a/HLTriggerOffline/Common/src/SealModule.cc b/HLTriggerOffline/Common/src/SealModule.cc
index 51603395722ab..268f040ef8232 100644
--- a/HLTriggerOffline/Common/src/SealModule.cc
+++ b/HLTriggerOffline/Common/src/SealModule.cc
@@ -3,6 +3,3 @@
 
 #include "HLTriggerOffline/Common/interface/HltComparator.h"
 DEFINE_FWK_MODULE(HltComparator);
-
-
-
diff --git a/HLTriggerOffline/Egamma/interface/EmDQM.h b/HLTriggerOffline/Egamma/interface/EmDQM.h
index c885c25d22ffb..058b43d02438d 100644
--- a/HLTriggerOffline/Egamma/interface/EmDQM.h
+++ b/HLTriggerOffline/Egamma/interface/EmDQM.h
@@ -1,99 +1,103 @@
 #ifndef HLTriggerOffline_Egamma_EmDQM_H
 #define HLTriggerOffline_Egamma_EmDQM_H
 
-
 // Base Class Headers
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Utilities/interface/InputTag.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/Utilities/interface/Exception.h"
-#include "DataFormats/Common/interface/RefToBase.h"
+#include "CommonTools/Utils/interface/PtComparator.h"
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DataFormats/Common/interface/AssociationMap.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/Common/interface/RefToBase.h"
 #include "DataFormats/Common/interface/TriggerResults.h"
+#include "DataFormats/EgammaCandidates/interface/Electron.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerTypeDefs.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
-#include "DataFormats/RecoCandidate/interface/RecoEcalCandidate.h"
-#include "DataFormats/EgammaCandidates/interface/Electron.h"
 #include "DataFormats/L1Trigger/interface/L1EmParticle.h"
 #include "DataFormats/L1Trigger/interface/L1EmParticleFwd.h"
-#include "DataFormats/Common/interface/AssociationMap.h"
-#include "DataFormats/HLTReco/interface/TriggerTypeDefs.h"
-#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
-#include "HepMC/GenParticle.h"
-#include "CommonTools/Utils/interface/PtComparator.h"
+#include "DataFormats/RecoCandidate/interface/RecoEcalCandidate.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Utilities/interface/Exception.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
+#include "HepMC/GenParticle.h"
+#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 
-#include <boost/regex.hpp>
 #include <boost/lexical_cast.hpp>
+#include <boost/regex.hpp>
 
 #include "TDirectory.h"
 #include "TFile.h"
 #include "TH1F.h"
-#include <memory>
+#include <Math/VectorUtil.h>
 #include <cmath>
 #include <iostream>
+#include <memory>
 #include <string>
 #include <vector>
-#include <Math/VectorUtil.h>
 
 class EmDQM;
 
 template <class T>
 class HistoFiller {
- public:
-  HistoFiller(EmDQM* d):dqm(d) {};
-  ~HistoFiller() {};
-
-  void fillHistos(edm::Handle<trigger::TriggerEventWithRefs>& ,const edm::Event& ,unsigned int, unsigned int, std::vector<reco::Particle>&, bool & );
-  //std::vector<edm::EDGetTokenT<edm::AssociationMap<edm::OneToValue< T , float>>>> isoNameTokens_;
+public:
+  HistoFiller(EmDQM *d) : dqm(d){};
+  ~HistoFiller(){};
+
+  void fillHistos(edm::Handle<trigger::TriggerEventWithRefs> &,
+                  const edm::Event &,
+                  unsigned int,
+                  unsigned int,
+                  std::vector<reco::Particle> &,
+                  bool &);
+  // std::vector<edm::EDGetTokenT<edm::AssociationMap<edm::OneToValue< T ,
+  // float>>>> isoNameTokens_;
 
- private:
-  EmDQM* dqm;
+private:
+  EmDQM *dqm;
 };
 
-class EmDQM : public DQMEDAnalyzer{
+class EmDQM : public DQMEDAnalyzer {
 public:
-
   friend class HistoFiller<reco::ElectronCollection>;
   friend class HistoFiller<reco::RecoEcalCandidateCollection>;
   friend class HistoFiller<l1extra::L1EmParticleCollection>;
 
   /// Constructor
-  explicit EmDQM(const edm::ParameterSet& pset);
+  explicit EmDQM(const edm::ParameterSet &pset);
 
   /// Destructor
   ~EmDQM() override;
 
   // Operations
 
-  void analyze(const edm::Event & event, const edm::EventSetup&) override;
+  void analyze(const edm::Event &event, const edm::EventSetup &) override;
 
-  void dqmBeginRun(edm::Run const&, edm::EventSetup const&) override;
+  void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void endRun(edm::Run const&, edm::EventSetup const&) override;
+  void endRun(edm::Run const &, edm::EventSetup const &) override;
 
 private:
   // interface to DQM framework
   std::string dirname_;
 
-  HistoFiller<reco::ElectronCollection>* histoFillerEle;
-  HistoFiller<reco::RecoEcalCandidateCollection>* histoFillerClu;
-  HistoFiller<l1extra::L1EmParticleCollection>* histoFillerL1NonIso;
-  HistoFiller<reco::RecoEcalCandidateCollection>* histoFillerPho;
-  HistoFiller<l1extra::L1EmParticleCollection>* histoFillerL1Iso;
+  HistoFiller<reco::ElectronCollection> *histoFillerEle;
+  HistoFiller<reco::RecoEcalCandidateCollection> *histoFillerClu;
+  HistoFiller<l1extra::L1EmParticleCollection> *histoFillerL1NonIso;
+  HistoFiller<reco::RecoEcalCandidateCollection> *histoFillerPho;
+  HistoFiller<l1extra::L1EmParticleCollection> *histoFillerL1Iso;
 
   // run in automatic configuration generation mode
   bool autoConfMode_;
   // parameter set from config file
-  const edm::ParameterSet& pset;
+  const edm::ParameterSet &pset;
   // global parameters
   edm::InputTag triggerObject_;
   unsigned int verbosity_;
@@ -126,25 +130,25 @@ class EmDQM : public DQMEDAnalyzer{
    *  particles. For the moment, there are some additional requirements in
    *  the MC version so we can't use the same code for both cases.
    */
-  bool checkRecoParticlesRequirement(const edm::Event & event);
+  bool checkRecoParticlesRequirement(const edm::Event &event);
 
   /// The instance of the HLTConfigProvider as a data member
   HLTConfigProvider hltConfig_;
 
   // routines to build validation configuration from HLTConfiguration
-  int countSubstring(const std::string&, const std::string&);
-  std::vector<std::vector<std::string> > findEgammaPaths();
-  std::vector<std::string> getFilterModules(const std::string&);
-  double getPrimaryEtCut(const std::string&);
-  edm::ParameterSet makePSetForL1SeedFilter(const std::string&);
-  edm::ParameterSet makePSetForL1SeedToSuperClusterMatchFilter(const std::string&);
-  edm::ParameterSet makePSetForEtFilter(const std::string&);
-  edm::ParameterSet makePSetForOneOEMinusOneOPFilter(const std::string&);
-  edm::ParameterSet makePSetForPixelMatchFilter(const std::string&);
-  edm::ParameterSet makePSetForEgammaGenericFilter(const std::string&);
-  edm::ParameterSet makePSetForEgammaGenericQuadraticFilter(const std::string&);
-  edm::ParameterSet makePSetForElectronGenericFilter(const std::string&);
-  edm::ParameterSet makePSetForEgammaDoubleEtDeltaPhiFilter(const std::string&);
+  int countSubstring(const std::string &, const std::string &);
+  std::vector<std::vector<std::string>> findEgammaPaths();
+  std::vector<std::string> getFilterModules(const std::string &);
+  double getPrimaryEtCut(const std::string &);
+  edm::ParameterSet makePSetForL1SeedFilter(const std::string &);
+  edm::ParameterSet makePSetForL1SeedToSuperClusterMatchFilter(const std::string &);
+  edm::ParameterSet makePSetForEtFilter(const std::string &);
+  edm::ParameterSet makePSetForOneOEMinusOneOPFilter(const std::string &);
+  edm::ParameterSet makePSetForPixelMatchFilter(const std::string &);
+  edm::ParameterSet makePSetForEgammaGenericFilter(const std::string &);
+  edm::ParameterSet makePSetForEgammaGenericQuadraticFilter(const std::string &);
+  edm::ParameterSet makePSetForElectronGenericFilter(const std::string &);
+  edm::ParameterSet makePSetForEgammaDoubleEtDeltaPhiFilter(const std::string &);
 
   // set validation configuration parameters for a trigger path
   void SetVarsFromPSet(std::vector<edm::ParameterSet>::iterator);
@@ -153,81 +157,81 @@ class EmDQM : public DQMEDAnalyzer{
   std::vector<edm::ParameterSet> paramSets;
   // input from generated parameter set
   unsigned int pathIndex;
-  std::vector<edm::InputTag> theHLTCollectionLabels;  
-  unsigned int numOfHLTCollectionLabels;  // Will be size of above vector
-  std::vector<std::string> theHLTCollectionHumanNames; // Human-readable names for the collections
+  std::vector<edm::InputTag> theHLTCollectionLabels;
+  unsigned int numOfHLTCollectionLabels;                // Will be size of above vector
+  std::vector<std::string> theHLTCollectionHumanNames;  // Human-readable names for the collections
   edm::InputTag theL1Seed;
   std::vector<int> theHLTOutputTypes;
   std::vector<bool> plotiso;
-  std::vector<std::vector<edm::InputTag> > isoNames; // there has to be a better solution
-  std::vector<std::pair<double,double> > plotBounds; 
+  std::vector<std::vector<edm::InputTag>> isoNames;  // there has to be a better solution
+  std::vector<std::pair<double, double>> plotBounds;
   std::vector<unsigned int> nCandCuts;
   // paramters for generator study
   unsigned int reqNum;
-  int   pdgGen;
+  int pdgGen;
   // plotting parameters
   double plotEtMin;
-  double plotPtMin ;
-  double plotPtMax ;
+  double plotPtMin;
+  double plotPtMax;
 
   /** collection which should be used for generator particles (MC)
    *  or reconstructed particles (data).
    *
-   *  This collection is used for matching the HLT objects against (e.g. match the HLT
-   *  object to generated particles or reconstructed electrons/photons).
+   *  This collection is used for matching the HLT objects against (e.g. match
+   * the HLT object to generated particles or reconstructed electrons/photons).
    */
   edm::InputTag gencutCollection_;
 
-  /** number of generator level particles (electrons/photons) required (for MC) */
+  /** number of generator level particles (electrons/photons) required (for MC)
+   */
   unsigned int gencut_;
 
   /** which hltCollectionLabels were SEEN at least once */
-  std::vector<std::set<std::string> > hltCollectionLabelsFoundPerPath;
+  std::vector<std::set<std::string>> hltCollectionLabelsFoundPerPath;
   std::set<std::string> hltCollectionLabelsFound;
 
   /** which hltCollectionLabels were MISSED at least once */
-  std::vector<std::set<std::string> > hltCollectionLabelsMissedPerPath;
+  std::vector<std::set<std::string>> hltCollectionLabelsMissedPerPath;
   std::set<std::string> hltCollectionLabelsMissed;
 
-
   ////////////////////////////////////////////////////////////
   //          Create Histogram containers
   ////////////////////////////////////////////////////////////
   // Et & eta distributions
-  std::vector<std::vector<MonitorElement*> > etahists;
-  std::vector<std::vector<MonitorElement*> > phihists;
-  std::vector<std::vector<MonitorElement*> > ethists;
-  std::vector<std::vector<MonitorElement*> > etahistmatchs;
-  std::vector<std::vector<MonitorElement*> > phihistmatchs;
-  std::vector<std::vector<MonitorElement*> > ethistmatchs;
-  std::vector<std::vector<MonitorElement*> > histEtOfHltObjMatchToGens;
-  std::vector<std::vector<MonitorElement*> > histEtaOfHltObjMatchToGens;
-  std::vector<std::vector<MonitorElement*> > histPhiOfHltObjMatchToGens;
-  std::vector<std::vector<MonitorElement*> > etaphihists;
-  std::vector<std::vector<MonitorElement*> > etaphihistmatchs;
-  std::vector<std::vector<MonitorElement*> > histEtaPhiOfHltObjMatchToGens;
+  std::vector<std::vector<MonitorElement *>> etahists;
+  std::vector<std::vector<MonitorElement *>> phihists;
+  std::vector<std::vector<MonitorElement *>> ethists;
+  std::vector<std::vector<MonitorElement *>> etahistmatchs;
+  std::vector<std::vector<MonitorElement *>> phihistmatchs;
+  std::vector<std::vector<MonitorElement *>> ethistmatchs;
+  std::vector<std::vector<MonitorElement *>> histEtOfHltObjMatchToGens;
+  std::vector<std::vector<MonitorElement *>> histEtaOfHltObjMatchToGens;
+  std::vector<std::vector<MonitorElement *>> histPhiOfHltObjMatchToGens;
+  std::vector<std::vector<MonitorElement *>> etaphihists;
+  std::vector<std::vector<MonitorElement *>> etaphihistmatchs;
+  std::vector<std::vector<MonitorElement *>> histEtaPhiOfHltObjMatchToGens;
   // Plots of efficiency per step
-  std::vector<MonitorElement*> totals;
-  std::vector<MonitorElement*> totalmatchs;
-  //generator histograms
-  std::vector<MonitorElement*> etgens;
-  std::vector<MonitorElement*> etagens;
-  std::vector<MonitorElement*> phigens;
-  std::vector<MonitorElement*> etaphigens;
+  std::vector<MonitorElement *> totals;
+  std::vector<MonitorElement *> totalmatchs;
+  // generator histograms
+  std::vector<MonitorElement *> etgens;
+  std::vector<MonitorElement *> etagens;
+  std::vector<MonitorElement *> phigens;
+  std::vector<MonitorElement *> etaphigens;
 
   GreaterByPt<reco::Particle> pTComparator_;
   GreaterByPt<reco::GenParticle> pTGenComparator_;
 
   // tokens for data access
-  edm::EDGetTokenT<edm::View<reco::Candidate> > genParticles_token;
+  edm::EDGetTokenT<edm::View<reco::Candidate>> genParticles_token;
   edm::EDGetTokenT<trigger::TriggerEventWithRefs> triggerObject_token;
   edm::EDGetTokenT<edm::TriggerResults> hltResults_token;
-  edm::EDGetTokenT<edm::View<reco::Candidate> > gencutColl_fidWenu_token;
-  edm::EDGetTokenT<edm::View<reco::Candidate> > gencutColl_fidZee_token;
-  edm::EDGetTokenT<edm::View<reco::Candidate> > gencutColl_fidTripleEle_token;
-  edm::EDGetTokenT<edm::View<reco::Candidate> > gencutColl_fidGammaJet_token;
-  edm::EDGetTokenT<edm::View<reco::Candidate> > gencutColl_fidDiGamma_token;
-  edm::EDGetTokenT<edm::View<reco::Candidate> > gencutColl_manualConf_token;
+  edm::EDGetTokenT<edm::View<reco::Candidate>> gencutColl_fidWenu_token;
+  edm::EDGetTokenT<edm::View<reco::Candidate>> gencutColl_fidZee_token;
+  edm::EDGetTokenT<edm::View<reco::Candidate>> gencutColl_fidTripleEle_token;
+  edm::EDGetTokenT<edm::View<reco::Candidate>> gencutColl_fidGammaJet_token;
+  edm::EDGetTokenT<edm::View<reco::Candidate>> gencutColl_fidDiGamma_token;
+  edm::EDGetTokenT<edm::View<reco::Candidate>> gencutColl_manualConf_token;
 
   // static variables
   //
diff --git a/HLTriggerOffline/Egamma/interface/EmDQMPostProcessor.h b/HLTriggerOffline/Egamma/interface/EmDQMPostProcessor.h
index 68d53b31c953c..29b92f168d405 100644
--- a/HLTriggerOffline/Egamma/interface/EmDQMPostProcessor.h
+++ b/HLTriggerOffline/Egamma/interface/EmDQMPostProcessor.h
@@ -1,30 +1,41 @@
 #ifndef HLTriggerOffline_Egamma_EmDQMPosProcessor_H
 #define HLTriggerOffline_Egamma_EmDQMPosProcessor_H
 
-
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 class EmDQMPostProcessor : public DQMEDHarvester {
- public:
-  EmDQMPostProcessor(const edm::ParameterSet& pset);
+public:
+  EmDQMPostProcessor(const edm::ParameterSet &pset);
   ~EmDQMPostProcessor() override{};
 
   void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
 
-  TProfile* dividehistos(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter, const std::string& num, const std::string& denom, const std::string& out,const std::string& label, const std::string& titel= "");
+  TProfile *dividehistos(DQMStore::IBooker &ibooker,
+                         DQMStore::IGetter &igetter,
+                         const std::string &num,
+                         const std::string &denom,
+                         const std::string &out,
+                         const std::string &label,
+                         const std::string &titel = "");
 
-  TH2F* dividehistos2D(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter, const std::string& num, const std::string& denom, const std::string& out,const std::string& label, const std::string& titel= "");
+  TH2F *dividehistos2D(DQMStore::IBooker &ibooker,
+                       DQMStore::IGetter &igetter,
+                       const std::string &num,
+                       const std::string &denom,
+                       const std::string &out,
+                       const std::string &label,
+                       const std::string &titel = "");
 
- private:
-  
-  /** a replacement for the function TGraphAsymmErrors::Efficiency(..) used with earlier 
-      versions of ROOT (this functionality has been moved to a separate class TEfficiency) */
+private:
+  /** a replacement for the function TGraphAsymmErrors::Efficiency(..) used with
+     earlier versions of ROOT (this functionality has been moved to a separate
+     class TEfficiency) */
   static void Efficiency(int passing, int total, double level, double &mode, double &lowerBound, double &upperBound);
 
-  /** read from the configuration: if set to true, efficiencies 
-      are calculated with respect to reconstructed objects (instead 
-      of generated objects). This is e.g. a useful option when 
+  /** read from the configuration: if set to true, efficiencies
+      are calculated with respect to reconstructed objects (instead
+      of generated objects). This is e.g. a useful option when
       running on data. */
   bool noPhiPlots;
   bool normalizeToReco;
@@ -33,10 +44,10 @@ class EmDQMPostProcessor : public DQMEDHarvester {
   /** convenience method to get a histogram but checks first
       whether the corresponding MonitorElement is non-null.
       @return null if the MonitorElement is null */
-  TH1F *getHistogram(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter, const std::string &histoPath);
-  TH2F *get2DHistogram(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter, const std::string &histoPath);
+  TH1F *getHistogram(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, const std::string &histoPath);
+  TH2F *get2DHistogram(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, const std::string &histoPath);
   std::string subDir_;
-  
+
   /** dataset with which these histograms were produced.
       This is set by a user parameter in the configuration
       file.
@@ -44,7 +55,7 @@ class EmDQMPostProcessor : public DQMEDHarvester {
       It is just used for writing it to the DQM output file.
       Useful to remember with which dataset a histogram file
       was produced. This code does not do much with this information
-      (apart from copying it to the output file) but 
+      (apart from copying it to the output file) but
       it can be used when generating reports.
   */
   std::string dataSet_;
diff --git a/HLTriggerOffline/Egamma/interface/EmDQMReco.h b/HLTriggerOffline/Egamma/interface/EmDQMReco.h
index b93947ccd487d..d7aee589010cf 100644
--- a/HLTriggerOffline/Egamma/interface/EmDQMReco.h
+++ b/HLTriggerOffline/Egamma/interface/EmDQMReco.h
@@ -1,67 +1,70 @@
 #ifndef HLTriggerOffline_Egamma_EmDQMReco_H
 #define HLTriggerOffline_Egamma_EmDQMReco_H
 
-
 // Base Class Headers
+#include "CommonTools/Utils/interface/PtComparator.h"
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+#include "DataFormats/Common/interface/AssociationMap.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/Common/interface/RefToBase.h"
+#include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "DataFormats/Common/interface/RefToBase.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
-#include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
-#include <vector>
-#include "TDirectory.h"
-#include "HepMC/GenParticle.h"
-#include "CommonTools/Utils/interface/PtComparator.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
-#include "DataFormats/Common/interface/AssociationMap.h"
+#include "HepMC/GenParticle.h"
+#include "TDirectory.h"
+#include <vector>
 
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/scoped_ptr.hpp>
 
 class EmDQMReco;
 
-template <class T> 
+template <class T>
 class HistoFillerReco {
- public:
-  HistoFillerReco(EmDQMReco* d):dqm(d) {};
-  ~HistoFillerReco() {};
-    
-  void fillHistos(edm::Handle<trigger::TriggerEventWithRefs>& triggerObj,const edm::Event& iEvent ,unsigned int n, std::vector<reco::Particle>& sortedReco, bool plotReco, bool plotMonpath);
-  std::vector<edm::EDGetTokenT<edm::AssociationMap<edm::OneToValue< T , float>>>> isoNameTokens_;
-
- private:
-  EmDQMReco* dqm;
-};
+public:
+  HistoFillerReco(EmDQMReco *d) : dqm(d){};
+  ~HistoFillerReco(){};
 
-class EmDQMReco : public DQMEDAnalyzer{
+  void fillHistos(edm::Handle<trigger::TriggerEventWithRefs> &triggerObj,
+                  const edm::Event &iEvent,
+                  unsigned int n,
+                  std::vector<reco::Particle> &sortedReco,
+                  bool plotReco,
+                  bool plotMonpath);
+  std::vector<edm::EDGetTokenT<edm::AssociationMap<edm::OneToValue<T, float>>>> isoNameTokens_;
 
+private:
+  EmDQMReco *dqm;
+};
+
+class EmDQMReco : public DQMEDAnalyzer {
   //----------------------------------------
 
   /** a class managing a set of MonitorElements for quantities of a fourvector
    *  we want to histogram.
    */
-  class FourVectorMonitorElements
-  {
-
+  class FourVectorMonitorElements {
   public:
-    /** @param histogramNameTemplate should be a format string (like used in printf(..)
-     *  or boost::format(..) for the histogram NAME where the first %s is replaced with et,eta or phi.
+    /** @param histogramNameTemplate should be a format string (like used in
+     * printf(..) or boost::format(..) for the histogram NAME where the first %s
+     * is replaced with et,eta or phi.
      *
-     *  @param histogramTitleTemplate should be a format string (see histogramNameTemplate)
-     *   for the histogram TITLE where the first %s is replaced with et,eta or phi.
+     *  @param histogramTitleTemplate should be a format string (see
+     * histogramNameTemplate) for the histogram TITLE where the first %s is
+     * replaced with et,eta or phi.
      */
     FourVectorMonitorElements(EmDQMReco *_parent,
-        DQMStore::IBooker &iBooker,
-        const std::string &histogramNameTemplate,
-        const std::string &histogramTitleTemplate);
+                              DQMStore::IBooker &iBooker,
+                              const std::string &histogramNameTemplate,
+                              const std::string &histogramTitleTemplate);
 
     void fill(const math::XYZTLorentzVector &momentum);
 
@@ -70,28 +73,26 @@ class EmDQMReco : public DQMEDAnalyzer{
     EmDQMReco *parent;
 
     /** DQM objects (histograms) for the variables to be plotted */
-    MonitorElement* etMonitorElement;
-    MonitorElement* etaMonitorElement;
-    MonitorElement* phiMonitorElement;
-
+    MonitorElement *etMonitorElement;
+    MonitorElement *etaMonitorElement;
+    MonitorElement *phiMonitorElement;
   };
   //----------------------------------------
 
 public:
-
   friend class HistoFillerReco<reco::ElectronCollection>;
   friend class HistoFillerReco<reco::RecoEcalCandidateCollection>;
   friend class HistoFillerReco<l1extra::L1EmParticleCollection>;
 
   /// Constructor
-  explicit EmDQMReco(const edm::ParameterSet& pset);
+  explicit EmDQMReco(const edm::ParameterSet &pset);
 
   /// Destructor
   ~EmDQMReco() override;
 
   // Operations
-  void analyze(const edm::Event & event, const edm::EventSetup&) override;
-  void dqmBeginRun(const edm::Run&, const edm::EventSetup& ) override;
+  void analyze(const edm::Event &event, const edm::EventSetup &) override;
+  void dqmBeginRun(const edm::Run &, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
 private:
@@ -103,12 +104,12 @@ class EmDQMReco : public DQMEDAnalyzer{
   unsigned int numOfHLTCollectionLabels;  // Will be size of above vector
 
   bool useHumanReadableHistTitles;
-  std::vector<std::string> theHLTCollectionHumanNames; // Human-readable names for the collections
-  //edm::InputTag theL1Seed;
+  std::vector<std::string> theHLTCollectionHumanNames;  // Human-readable names for the collections
+  // edm::InputTag theL1Seed;
   std::vector<int> theHLTOutputTypes;
   std::vector<bool> plotiso;
-  std::vector<std::vector<edm::InputTag> > isoNames; // there has to be a better solution
-  std::vector<std::pair<double,double> > plotBounds;
+  std::vector<std::vector<edm::InputTag>> isoNames;  // there has to be a better solution
+  std::vector<std::pair<double, double>> plotBounds;
   std::string theHltName;
   HLTConfigProvider hltConfig_;
   bool isHltConfigInitialized_;
@@ -118,20 +119,20 @@ class EmDQMReco : public DQMEDAnalyzer{
   ////////////////////////////////////////////////////////////
   // parameters for generator study
   unsigned int reqNum;
-  int   pdgGen;
+  int pdgGen;
   double recoEtaAcc;
   double recoEtAcc;
   // plotting paramters
   double plotEtaMax;
-  double plotPtMin ;
-  double plotPtMax ;
+  double plotPtMin;
+  double plotPtMax;
   double plotPhiMax;
 
   /** number of bins to use for ALL plots (?) */
-  unsigned int plotBins ;
+  unsigned int plotBins;
 
   // preselction cuts
-  //edm::InputTag recocutCollection_;
+  // edm::InputTag recocutCollection_;
   unsigned int recocut_;
 
   /** events which fire this trigger are filled into {et,eta,phi}recomonpath
@@ -157,55 +158,54 @@ class EmDQMReco : public DQMEDAnalyzer{
   /** \label Et, eta and phi distributions (RECO) for the different
    *  HLT modules to be looked at. */
   /** @{ */
-// std::vector<MonitorElement*> etahist;
-//  std::vector<MonitorElement*> ethist;
-//  std::vector<MonitorElement*> phiHist;
+  // std::vector<MonitorElement*> etahist;
+  //  std::vector<MonitorElement*> ethist;
+  //  std::vector<MonitorElement*> phiHist;
 
   boost::ptr_vector<FourVectorMonitorElements> standardHist;
 
-//  std::vector<MonitorElement*> etahistmatchreco;
-//  std::vector<MonitorElement*> ethistmatchreco;
-//  std::vector<MonitorElement*> phiHistMatchReco;
+  //  std::vector<MonitorElement*> etahistmatchreco;
+  //  std::vector<MonitorElement*> ethistmatchreco;
+  //  std::vector<MonitorElement*> phiHistMatchReco;
   boost::ptr_vector<FourVectorMonitorElements> histMatchReco;
 
-//  std::vector<MonitorElement*> etahistmatchrecomonpath;
-//  std::vector<MonitorElement*> ethistmatchrecomonpath;
-//  std::vector<MonitorElement*> phiHistMatchRecoMonPath;
+  //  std::vector<MonitorElement*> etahistmatchrecomonpath;
+  //  std::vector<MonitorElement*> ethistmatchrecomonpath;
+  //  std::vector<MonitorElement*> phiHistMatchRecoMonPath;
   boost::ptr_vector<FourVectorMonitorElements> histMatchRecoMonPath;
 
-
-//  std::vector<MonitorElement*> histEtOfHltObjMatchToReco;
-//  std::vector<MonitorElement*> histEtaOfHltObjMatchToReco;
-//  std::vector<MonitorElement*> histPhiOfHltObjMatchToReco;
+  //  std::vector<MonitorElement*> histEtOfHltObjMatchToReco;
+  //  std::vector<MonitorElement*> histEtaOfHltObjMatchToReco;
+  //  std::vector<MonitorElement*> histPhiOfHltObjMatchToReco;
   boost::ptr_vector<FourVectorMonitorElements> histHltObjMatchToReco;
 
   /** @} */
 
   /** \label Isolation distributions */
   /** @{ */
-  std::vector<MonitorElement*> etahistiso;
-  std::vector<MonitorElement*> ethistiso;
-  std::vector<MonitorElement*> phiHistIso;
+  std::vector<MonitorElement *> etahistiso;
+  std::vector<MonitorElement *> ethistiso;
+  std::vector<MonitorElement *> phiHistIso;
 
-  std::vector<MonitorElement*> etahistisomatchreco;
-  std::vector<MonitorElement*> ethistisomatchreco;
-  std::vector<MonitorElement*> phiHistIsoMatchReco;
+  std::vector<MonitorElement *> etahistisomatchreco;
+  std::vector<MonitorElement *> ethistisomatchreco;
+  std::vector<MonitorElement *> phiHistIsoMatchReco;
 
-  std::vector<MonitorElement*> histEtIsoOfHltObjMatchToReco;
-  std::vector<MonitorElement*> histEtaIsoOfHltObjMatchToReco;
-  std::vector<MonitorElement*> histPhiIsoOfHltObjMatchToReco;
+  std::vector<MonitorElement *> histEtIsoOfHltObjMatchToReco;
+  std::vector<MonitorElement *> histEtaIsoOfHltObjMatchToReco;
+  std::vector<MonitorElement *> histPhiIsoOfHltObjMatchToReco;
   /** @} */
 
   /** Plots of efficiency per step (note that these are NOT
    *  filled with four vector quantities but rather event counts) */
-  MonitorElement* totalreco;
-  MonitorElement* totalmatchreco;
+  MonitorElement *totalreco;
+  MonitorElement *totalmatchreco;
 
   /** \name reco histograms */
   /** @{ */
-//  MonitorElement* etreco;
-//  MonitorElement* etareco;
-//  MonitorElement* phiReco;
+  //  MonitorElement* etreco;
+  //  MonitorElement* etareco;
+  //  MonitorElement* phiReco;
   boost::scoped_ptr<FourVectorMonitorElements> histReco;
 
   //  MonitorElement* etrecomonpath;
@@ -225,17 +225,18 @@ class EmDQMReco : public DQMEDAnalyzer{
   // interface to DQM framework
   std::string dirname_;
 
-  HistoFillerReco<reco::ElectronCollection>* histoFillerEle;
-  HistoFillerReco<reco::RecoEcalCandidateCollection>* histoFillerClu;
-  HistoFillerReco<l1extra::L1EmParticleCollection>* histoFillerL1NonIso;
-  HistoFillerReco<reco::RecoEcalCandidateCollection>* histoFillerPho;
-  HistoFillerReco<l1extra::L1EmParticleCollection>* histoFillerL1Iso;
-  
-  //template <class T> void fillHistos(edm::Handle<trigger::TriggerEventWithRefs>&,const edm::Event& ,unsigned int, std::vector<reco::Particle>&, bool, bool);
+  HistoFillerReco<reco::ElectronCollection> *histoFillerEle;
+  HistoFillerReco<reco::RecoEcalCandidateCollection> *histoFillerClu;
+  HistoFillerReco<l1extra::L1EmParticleCollection> *histoFillerL1NonIso;
+  HistoFillerReco<reco::RecoEcalCandidateCollection> *histoFillerPho;
+  HistoFillerReco<l1extra::L1EmParticleCollection> *histoFillerL1Iso;
+
+  // template <class T> void
+  // fillHistos(edm::Handle<trigger::TriggerEventWithRefs>&,const edm::Event&
+  // ,unsigned int, std::vector<reco::Particle>&, bool, bool);
   GreaterByPt<reco::Particle> pTComparator_;
   GreaterByPt<reco::GsfElectron> pTRecoComparator_;
 
-
   //----------------------------------------
 };
 #endif
diff --git a/HLTriggerOffline/Egamma/src/EmDQM.cc b/HLTriggerOffline/Egamma/src/EmDQM.cc
index 37706ada93c15..95e6ff5459e5c 100644
--- a/HLTriggerOffline/Egamma/src/EmDQM.cc
+++ b/HLTriggerOffline/Egamma/src/EmDQM.cc
@@ -3,31 +3,29 @@
 ////////////////////////////////////////////////////////////////////////////////
 #include "HLTriggerOffline/Egamma/interface/EmDQM.h"
 
-using namespace ROOT::Math::VectorUtil ;
-
+using namespace ROOT::Math::VectorUtil;
 
 ////////////////////////////////////////////////////////////////////////////////
 //                             Constructor                                    //
 ////////////////////////////////////////////////////////////////////////////////
-EmDQM::EmDQM(const edm::ParameterSet& pset_) : pset(pset_) 
-{
+EmDQM::EmDQM(const edm::ParameterSet &pset_) : pset(pset_) {
   // are we running in automatic configuration mode with the HLTConfigProvider
   // or with a per path python config file
   autoConfMode_ = pset.getUntrackedParameter<bool>("autoConfMode", false);
 
   // set global parameters
   triggerObject_ = pset_.getParameter<edm::InputTag>("triggerobject");
-  verbosity_ = pset_.getUntrackedParameter<unsigned int>("verbosity",0);
+  verbosity_ = pset_.getUntrackedParameter<unsigned int>("verbosity", 0);
   genEtaAcc_ = pset.getParameter<double>("genEtaAcc");
   genEtAcc_ = pset.getParameter<double>("genEtAcc");
-  ptMax_ = pset.getUntrackedParameter<double>("PtMax",1000.);
-  ptMin_ = pset.getUntrackedParameter<double>("PtMin",0.);
+  ptMax_ = pset.getUntrackedParameter<double>("PtMax", 1000.);
+  ptMin_ = pset.getUntrackedParameter<double>("PtMin", 0.);
   etaMax_ = pset.getUntrackedParameter<double>("EtaMax", 2.7);
   phiMax_ = pset.getUntrackedParameter<double>("PhiMax", 3.15);
-  nbins_ = pset.getUntrackedParameter<unsigned int>("Nbins",40);
+  nbins_ = pset.getUntrackedParameter<unsigned int>("Nbins", 40);
   eta2DMax_ = pset.getUntrackedParameter<double>("Eta2DMax", 2.8);
   phi2DMax_ = pset.getUntrackedParameter<double>("Phi2DMax", 3.2);
-  nbins2D_ = pset.getUntrackedParameter<unsigned int>("Nbins2D",16);
+  nbins2D_ = pset.getUntrackedParameter<unsigned int>("Nbins2D", 16);
   minEtForEtaEffPlot_ = pset.getUntrackedParameter<unsigned int>("minEtForEtaEffPlot", 15);
   useHumanReadableHistTitles_ = pset.getUntrackedParameter<bool>("useHumanReadableHistTitles", false);
   mcMatchedOnly_ = pset.getUntrackedParameter<bool>("mcMatchedOnly", true);
@@ -41,696 +39,702 @@ EmDQM::EmDQM(const edm::ParameterSet& pset_) : pset(pset_)
     isData_ = pset.getParameter<bool>("isData");
   }
 
-  histoFillerEle      = new HistoFiller<reco::ElectronCollection>(this);
-  histoFillerPho      = new HistoFiller<reco::RecoEcalCandidateCollection>(this);
-  histoFillerClu      = new HistoFiller<reco::RecoEcalCandidateCollection>(this);
-  histoFillerL1Iso    = new HistoFiller<l1extra::L1EmParticleCollection>(this);
+  histoFillerEle = new HistoFiller<reco::ElectronCollection>(this);
+  histoFillerPho = new HistoFiller<reco::RecoEcalCandidateCollection>(this);
+  histoFillerClu = new HistoFiller<reco::RecoEcalCandidateCollection>(this);
+  histoFillerL1Iso = new HistoFiller<l1extra::L1EmParticleCollection>(this);
   histoFillerL1NonIso = new HistoFiller<l1extra::L1EmParticleCollection>(this);
 
   // consumes
-  genParticles_token = consumes<edm::View<reco::Candidate> >(edm::InputTag("genParticles"));
+  genParticles_token = consumes<edm::View<reco::Candidate>>(edm::InputTag("genParticles"));
   triggerObject_token = consumes<trigger::TriggerEventWithRefs>(triggerObject_);
   hltResults_token = consumes<edm::TriggerResults>(edm::InputTag("TriggerResults", "", triggerObject_.process()));
   if (autoConfMode_) {
-    gencutColl_fidWenu_token = mayConsume<edm::View<reco::Candidate> >(edm::InputTag("fiducialWenu"));
-    gencutColl_fidZee_token = mayConsume<edm::View<reco::Candidate> >(edm::InputTag("fiducialZee"));
-    gencutColl_fidTripleEle_token = mayConsume<edm::View<reco::Candidate> >(edm::InputTag("fiducialTripleEle"));
-    gencutColl_fidGammaJet_token = mayConsume<edm::View<reco::Candidate> >(edm::InputTag("fiducialGammaJet"));
-    gencutColl_fidDiGamma_token = mayConsume<edm::View<reco::Candidate> >(edm::InputTag("fiducialDiGamma"));
+    gencutColl_fidWenu_token = mayConsume<edm::View<reco::Candidate>>(edm::InputTag("fiducialWenu"));
+    gencutColl_fidZee_token = mayConsume<edm::View<reco::Candidate>>(edm::InputTag("fiducialZee"));
+    gencutColl_fidTripleEle_token = mayConsume<edm::View<reco::Candidate>>(edm::InputTag("fiducialTripleEle"));
+    gencutColl_fidGammaJet_token = mayConsume<edm::View<reco::Candidate>>(edm::InputTag("fiducialGammaJet"));
+    gencutColl_fidDiGamma_token = mayConsume<edm::View<reco::Candidate>>(edm::InputTag("fiducialDiGamma"));
   } else {
-    gencutColl_manualConf_token = consumes<edm::View<reco::Candidate> >(pset.getParameter<edm::InputTag>("cutcollection"));
+    gencutColl_manualConf_token =
+        consumes<edm::View<reco::Candidate>>(pset.getParameter<edm::InputTag>("cutcollection"));
   }
 }
 
+void EmDQM::dqmBeginRun(edm::Run const &iRun, edm::EventSetup const &iSetup) {
+  bool changed(true);
+  if (hltConfig_.init(iRun, iSetup, triggerObject_.process(), changed)) {
+    // if init returns TRUE, initialisation has succeeded!
 
-void 
-EmDQM::dqmBeginRun(edm::Run const &iRun, edm::EventSetup const &iSetup)
-{
-   bool changed(true);
-   if (hltConfig_.init(iRun, iSetup, triggerObject_.process(), changed)) {
-
-      // if init returns TRUE, initialisation has succeeded!
+    if (autoConfMode_) {
+      if (verbosity_ >= OUTPUT_ALL) {
+        // Output general information on the menu
+        edm::LogPrint("EmDQM") << "inited=" << hltConfig_.inited();
+        edm::LogPrint("EmDQM") << "changed=" << hltConfig_.changed();
+        edm::LogPrint("EmDQM") << "processName=" << hltConfig_.processName();
+        edm::LogPrint("EmDQM") << "tableName=" << hltConfig_.tableName();
+        edm::LogPrint("EmDQM") << "size=" << hltConfig_.size();
+        edm::LogInfo("EmDQM") << "The following filter types are not analyzed: \n"
+                              << "\tHLTGlobalSumsMET\n"
+                              << "\tHLTHtMhtFilter\n"
+                              << "\tHLTMhtFilter\n"
+                              << "\tHLTJetTag\n"
+                              << "\tHLT1CaloJet\n"
+                              << "\tHLT1CaloMET\n"
+                              << "\tHLT1CaloBJet\n"
+                              << "\tHLT1Tau\n"
+                              << "\tHLT1PFTau\n"
+                              << "\tPFTauSelector\n"
+                              << "\tHLT1PFJet\n"
+                              << "\tHLTPFJetCollectionsFilter\n"
+                              << "\tHLTPFJetCollectionsVBFFilter\n"
+                              << "\tHLTPFJetTag\n"
+                              << "\tEtMinCaloJetSelector\n"
+                              << "\tEtMinPFJetSelector\n"
+                              << "\tLargestEtCaloJetSelector\n"
+                              << "\tLargestEtPFJetSelector\n"
+                              << "\tHLTEgammaTriggerFilterObjectWrapper\n"
+                              << "\tHLTEgammaDoubleLegCombFilter\n"
+                              << "\tHLT2ElectronTau\n"
+                              << "\tHLT2ElectronMET\n"
+                              << "\tHLT2ElectronPFTau\n"
+                              << "\tHLTPMMassFilter\n"
+                              << "\tHLTHcalTowerFilter\n"
+                              << "\tHLT1Photon\n"
+                              << "\tHLTRFilter\n"
+                              << "\tHLTRHemisphere\n"
+                              << "\tHLTElectronPFMTFilter\n"
+                              << "\tPrimaryVertexObjectFilter\n"
+                              << "\tHLTEgammaAllCombMassFilter\n"
+                              << "\tHLTMuon*\n";
+      }
 
-      if (autoConfMode_) {
+      // All electron and photon paths
+      std::vector<std::vector<std::string>> egammaPaths = findEgammaPaths();
+      // std::cout << "Found " << egammaPaths[TYPE_SINGLE_ELE].size() << "
+      // single electron paths" << std::endl; std::cout << "Found " <<
+      // egammaPaths[TYPE_DOUBLE_ELE].size() << " double electron paths" <<
+      // std::endl; std::cout << "Found " << egammaPaths[TYPE_TRIPLE_ELE].size()
+      // << " triple electron paths" << std::endl; std::cout << "Found " <<
+      // egammaPaths[TYPE_SINGLE_PHOTON].size() << " single photon paths" <<
+      // std::endl; std::cout << "Found " <<
+      // egammaPaths[TYPE_DOUBLE_PHOTON].size() << " double photon paths" <<
+      // std::endl;
+
+      std::vector<std::string> filterModules;
+
+      for (unsigned int j = 0; j < egammaPaths.size(); j++) {
         if (verbosity_ >= OUTPUT_ALL) {
-           // Output general information on the menu
-           edm::LogPrint("EmDQM") << "inited=" << hltConfig_.inited();
-           edm::LogPrint("EmDQM") << "changed=" << hltConfig_.changed();
-           edm::LogPrint("EmDQM") << "processName=" << hltConfig_.processName();
-           edm::LogPrint("EmDQM") << "tableName=" << hltConfig_.tableName();
-           edm::LogPrint("EmDQM") << "size=" << hltConfig_.size();
-           edm::LogInfo("EmDQM") << "The following filter types are not analyzed: \n" 
-                                  << "\tHLTGlobalSumsMET\n"
-                                  << "\tHLTHtMhtFilter\n"
-                                  << "\tHLTMhtFilter\n"
-                                  << "\tHLTJetTag\n"
-                                  << "\tHLT1CaloJet\n"
-                                  << "\tHLT1CaloMET\n"
-                                  << "\tHLT1CaloBJet\n"
-                                  << "\tHLT1Tau\n"
-                                  << "\tHLT1PFTau\n"
-                                  << "\tPFTauSelector\n"
-                                  << "\tHLT1PFJet\n"
-                                  << "\tHLTPFJetCollectionsFilter\n"
-                                  << "\tHLTPFJetCollectionsVBFFilter\n"
-                                  << "\tHLTPFJetTag\n"
-                                  << "\tEtMinCaloJetSelector\n"
-                                  << "\tEtMinPFJetSelector\n"
-                                  << "\tLargestEtCaloJetSelector\n"
-                                  << "\tLargestEtPFJetSelector\n"
-                                  << "\tHLTEgammaTriggerFilterObjectWrapper\n"
-                                  << "\tHLTEgammaDoubleLegCombFilter\n"
-                                  << "\tHLT2ElectronTau\n"
-                                  << "\tHLT2ElectronMET\n"
-                                  << "\tHLT2ElectronPFTau\n"
-                                  << "\tHLTPMMassFilter\n"
-                                  << "\tHLTHcalTowerFilter\n"
-                                  << "\tHLT1Photon\n"
-                                  << "\tHLTRFilter\n"
-                                  << "\tHLTRHemisphere\n"
-                                  << "\tHLTElectronPFMTFilter\n"
-                                  << "\tPrimaryVertexObjectFilter\n"
-                                  << "\tHLTEgammaAllCombMassFilter\n"
-                                  << "\tHLTMuon*\n"
-                                  ;
+          switch (j) {
+            case TYPE_SINGLE_ELE:
+              edm::LogPrint("EmDQM") << "////////////////////////////////////////"
+                                        "/\nSingle electron paths: ";
+              break;
+            case TYPE_DOUBLE_ELE:
+              edm::LogPrint("EmDQM") << "////////////////////////////////////////"
+                                        "/\nDouble electron paths: ";
+              break;
+            case TYPE_TRIPLE_ELE:
+              edm::LogPrint("EmDQM") << "////////////////////////////////////////"
+                                        "/\nTriple electron paths: ";
+              break;
+            case TYPE_SINGLE_PHOTON:
+              edm::LogPrint("EmDQM") << "////////////////////////////////////////"
+                                        "/\nSingle photon paths: ";
+              break;
+            case TYPE_DOUBLE_PHOTON:
+              edm::LogPrint("EmDQM") << "////////////////////////////////////////"
+                                        "/\nDouble photon paths: ";
+              break;
+          }
         }
 
-
-        // All electron and photon paths
-        std::vector<std::vector<std::string> > egammaPaths = findEgammaPaths();
-        //std::cout << "Found " << egammaPaths[TYPE_SINGLE_ELE].size() << " single electron paths" << std::endl;
-        //std::cout << "Found " << egammaPaths[TYPE_DOUBLE_ELE].size() << " double electron paths" << std::endl;
-        //std::cout << "Found " << egammaPaths[TYPE_TRIPLE_ELE].size() << " triple electron paths" << std::endl;
-        //std::cout << "Found " << egammaPaths[TYPE_SINGLE_PHOTON].size() << " single photon paths" << std::endl;
-        //std::cout << "Found " << egammaPaths[TYPE_DOUBLE_PHOTON].size() << " double photon paths" << std::endl;
-
-        std::vector<std::string> filterModules;
-
-        for (unsigned int j=0; j < egammaPaths.size() ; j++) {
-           if (verbosity_ >= OUTPUT_ALL) {
-              switch(j) {
-                 case TYPE_SINGLE_ELE:
-                    edm::LogPrint("EmDQM") << "/////////////////////////////////////////\nSingle electron paths: ";
-                    break;
-                 case TYPE_DOUBLE_ELE:
-                    edm::LogPrint("EmDQM") << "/////////////////////////////////////////\nDouble electron paths: ";
-                    break;
-                 case TYPE_TRIPLE_ELE:
-                    edm::LogPrint("EmDQM") << "/////////////////////////////////////////\nTriple electron paths: ";
-                    break;
-                 case TYPE_SINGLE_PHOTON:
-                    edm::LogPrint("EmDQM") << "/////////////////////////////////////////\nSingle photon paths: ";
-                    break;
-                 case TYPE_DOUBLE_PHOTON:
-                    edm::LogPrint("EmDQM") << "/////////////////////////////////////////\nDouble photon paths: ";
-                    break;
+        for (unsigned int i = 0; i < egammaPaths.at(j).size(); i++) {
+          // get pathname of this trigger
+          const std::string pathName = egammaPaths.at(j).at(i);
+          if (verbosity_ >= OUTPUT_ALL)
+            edm::LogPrint("EmDQM") << "Path: " << pathName;
+
+          // get filters of the current path
+          filterModules = getFilterModules(pathName);
+
+          //--------------------
+          edm::ParameterSet paramSet;
+
+          paramSet.addUntrackedParameter("pathIndex", hltConfig_.triggerIndex(pathName));
+          paramSet.addParameter("@module_label", hltConfig_.removeVersion(pathName) + "_DQM");
+          // paramSet.addParameter("@module_label", pathName + "_DQM");
+
+          // plotting parameters (untracked because they don't affect the
+          // physics)
+          double genEtMin = getPrimaryEtCut(pathName);
+          if (genEtMin >= 0) {
+            paramSet.addUntrackedParameter("genEtMin", genEtMin);
+          } else {
+            if (verbosity_ >= OUTPUT_WARNINGS)
+              edm::LogWarning("EmDQM") << "Pathname: '" << pathName
+                                       << "':  Unable to determine a minimum Et. Will not include "
+                                          "this path in the validation.";
+            continue;
+          }
+
+          // set the x axis of the et plots to some reasonable value based
+          // on the primary et cut determined from the path name
+          double ptMax = ptMax_;
+          double ptMin = ptMin_;
+          if (ptMax < (1.2 * genEtMin)) {
+            paramSet.addUntrackedParameter<double>("PtMax", (10 * ceil(0.12 * genEtMin)));
+            paramSet.addUntrackedParameter<double>("PtMin", (10 * ceil(0.12 * genEtMin) - ptMax + ptMin));
+          } else {
+            paramSet.addUntrackedParameter<double>("PtMax", ptMax);
+            paramSet.addUntrackedParameter<double>("PtMin", ptMin);
+          }
+
+          // preselction cuts
+          switch (j) {
+            case TYPE_SINGLE_ELE:
+              paramSet.addParameter<unsigned>("reqNum", 1);
+              paramSet.addParameter<int>("pdgGen", 11);
+              paramSet.addParameter<edm::InputTag>("cutcollection", edm::InputTag("fiducialWenu"));
+              paramSet.addParameter<int>("cutnum", 1);
+              break;
+            case TYPE_DOUBLE_ELE:
+              paramSet.addParameter<unsigned>("reqNum", 2);
+              paramSet.addParameter<int>("pdgGen", 11);
+              paramSet.addParameter<edm::InputTag>("cutcollection", edm::InputTag("fiducialZee"));
+              paramSet.addParameter<int>("cutnum", 2);
+              break;
+            case TYPE_TRIPLE_ELE:
+              paramSet.addParameter<unsigned>("reqNum", 3);
+              paramSet.addParameter<int>("pdgGen", 11);
+              paramSet.addParameter<edm::InputTag>("cutcollection", edm::InputTag("fiducialTripleEle"));
+              paramSet.addParameter<int>("cutnum", 3);
+              break;
+            case TYPE_SINGLE_PHOTON:
+              paramSet.addParameter<unsigned>("reqNum", 1);
+              paramSet.addParameter<int>("pdgGen", 22);
+              paramSet.addParameter<edm::InputTag>("cutcollection", edm::InputTag("fiducialGammaJet"));
+              paramSet.addParameter<int>("cutnum", 1);
+              break;
+            case TYPE_DOUBLE_PHOTON:
+              paramSet.addParameter<unsigned>("reqNum", 2);
+              paramSet.addParameter<int>("pdgGen", 22);
+              paramSet.addParameter<edm::InputTag>("cutcollection", edm::InputTag("fiducialDiGamma"));
+              paramSet.addParameter<int>("cutnum", 2);
+          }
+          //--------------------
+
+          // TODO: extend this
+          if (isData_)
+            paramSet.addParameter<edm::InputTag>("cutcollection", edm::InputTag("gsfElectrons"));
+
+          std::vector<edm::ParameterSet> filterVPSet;
+          edm::ParameterSet filterPSet;
+          std::string moduleLabel;
+
+          // loop over filtermodules of current trigger path
+          for (std::vector<std::string>::iterator filter = filterModules.begin(); filter != filterModules.end();
+               ++filter) {
+            std::string moduleType = hltConfig_.modulePSet(*filter).getParameter<std::string>("@module_type");
+            moduleLabel = hltConfig_.modulePSet(*filter).getParameter<std::string>("@module_label");
+
+            // first check if it is a filter we are not interrested in
+            if (moduleType == "Pythia6GeneratorFilter" || moduleType == "HLTTriggerTypeFilter" ||
+                moduleType == "HLTLevel1Activity" || moduleType == "HLTPrescaler" || moduleType == "HLTBool")
+              continue;
+
+            // now check for the known filter types
+            if (moduleType == "HLTLevel1GTSeed") {
+              filterPSet = makePSetForL1SeedFilter(moduleLabel);
+            } else if (moduleType == "HLTEgammaL1MatchFilterRegional") {
+              filterPSet = makePSetForL1SeedToSuperClusterMatchFilter(moduleLabel);
+            } else if (moduleType == "HLTEgammaEtFilter") {
+              filterPSet = makePSetForEtFilter(moduleLabel);
+            } else if (moduleType == "HLTElectronOneOEMinusOneOPFilterRegional") {
+              filterPSet = makePSetForOneOEMinusOneOPFilter(moduleLabel);
+            } else if (moduleType == "HLTElectronPixelMatchFilter") {
+              filterPSet = makePSetForPixelMatchFilter(moduleLabel);
+            } else if (moduleType == "HLTEgammaGenericFilter") {
+              filterPSet = makePSetForEgammaGenericFilter(moduleLabel);
+            } else if (moduleType == "HLTEgammaGenericQuadraticFilter") {
+              filterPSet = makePSetForEgammaGenericQuadraticFilter(moduleLabel);
+            } else if (moduleType == "HLTElectronGenericFilter") {
+              filterPSet = makePSetForElectronGenericFilter(moduleLabel);
+            } else if (moduleType == "HLTEgammaDoubleEtDeltaPhiFilter") {
+              filterPSet = makePSetForEgammaDoubleEtDeltaPhiFilter(moduleLabel);
+            } else if (moduleType == "HLTGlobalSumsMET" || moduleType == "HLTHtMhtFilter" ||
+                       moduleType == "HLTMhtFilter" || moduleType == "HLTJetTag" || moduleType == "HLT1CaloJet" ||
+                       moduleType == "HLT1CaloMET" || moduleType == "HLT1CaloBJet" || moduleType == "HLT1Tau" ||
+                       moduleType == "HLT1PFTau" || moduleType == "PFTauSelector" || moduleType == "HLT1PFJet" ||
+                       moduleType == "HLTPFJetCollectionsFilter" || moduleType == "HLTPFJetCollectionsVBFFilter" ||
+                       moduleType == "HLTPFJetTag" || moduleType == "EtMinCaloJetSelector" ||
+                       moduleType == "EtMinPFJetSelector" || moduleType == "LargestEtCaloJetSelector" ||
+                       moduleType == "LargestEtPFJetSelector" ||
+                       moduleType == "HLTEgammaTriggerFilterObjectWrapper"  // 'fake' filter
+                       || moduleType == "HLTEgammaDoubleLegCombFilter"      // filter does not put
+                                                                            // anything in
+                                                                            // TriggerEventWithRefs
+                       || moduleType == "HLT2ElectronMET" || moduleType == "HLT2ElectronTau" ||
+                       moduleType == "HLT2ElectronPFTau" || moduleType == "HLTPMMassFilter" ||
+                       moduleType == "HLTHcalTowerFilter" || moduleType == "HLT1Photon" || moduleType == "HLTRFilter" ||
+                       moduleType == "HLTRHemisphere" || moduleType == "HLTElectronPFMTFilter" ||
+                       moduleType == "PrimaryVertexObjectFilter" || moduleType == "HLTEgammaAllCombMassFilter" ||
+                       moduleType.find("HLTMuon") != std::string::npos)
+              continue;
+            else {
+              if (verbosity_ >= OUTPUT_WARNINGS)
+                edm::LogWarning("EmDQM") << "No parameter set for filter '" << moduleLabel << "' with filter type '"
+                                         << moduleType << "' added. Module will not be analyzed.";
+              continue;
+            }
+
+            // something went wrong when the parameter set is empty.
+            if (!filterPSet.empty()) {
+              if (!hltConfig_.modulePSet(moduleLabel).exists("saveTags")) {
+                // make sure that 'theHLTOutputTypes' before an unseeded filter
+                // in a photon path is set to trigger::TriggerPhoton this is
+                // coupled to the parameter 'saveTag = true'
+                if (moduleLabel.find("Unseeded") != std::string::npos &&
+                    (j == TYPE_DOUBLE_PHOTON || j == TYPE_SINGLE_PHOTON)) {
+                  filterVPSet.back().addParameter<int>("theHLTOutputTypes", trigger::TriggerPhoton);
+                }
               }
-           }
-
-           for (unsigned int i=0; i < egammaPaths.at(j).size() ; i++) {
-              // get pathname of this trigger 
-              const std::string pathName = egammaPaths.at(j).at(i);
-              if (verbosity_ >= OUTPUT_ALL)
-                 edm::LogPrint("EmDQM") << "Path: " << pathName;
-
-              // get filters of the current path
-              filterModules = getFilterModules(pathName);
-
-              //--------------------	   
-              edm::ParameterSet paramSet;
-
-              paramSet.addUntrackedParameter("pathIndex", hltConfig_.triggerIndex(pathName));
-              paramSet.addParameter("@module_label", hltConfig_.removeVersion(pathName) + "_DQM");
-              //paramSet.addParameter("@module_label", pathName + "_DQM");
-
-              // plotting parameters (untracked because they don't affect the physics)
-              double genEtMin = getPrimaryEtCut(pathName);
-              if (genEtMin >= 0) {
-                 paramSet.addUntrackedParameter("genEtMin", genEtMin);
-              } else {
-                 if (verbosity_ >= OUTPUT_WARNINGS)
-                    edm::LogWarning("EmDQM") << "Pathname: '" << pathName << "':  Unable to determine a minimum Et. Will not include this path in the validation.";
-                 continue;
+              // if ncandcut is -1 (when parsing for the number of particles in
+              // the name of the L1seed filter fails), fall back to setting
+              // ncandcut to the number of particles needed for the given path.
+              if (filterPSet.getParameter<int>("ncandcut") < 0) {
+                edm::LogPrint("EmDQM") << "No number of candidates for filter " << moduleLabel << " found. Set to "
+                                       << paramSet.getParameter<int>("cutnum") << ", determined from path name.";
+                filterPSet.addParameter<int>("ncandcut", paramSet.getParameter<int>("cutnum"));
+              } else if (filterPSet.getParameter<int>("ncandcut") > paramSet.getParameter<int>("cutnum")) {
+                edm::LogInfo("EmDQM") << "Changed required number of candidates from "
+                                      << paramSet.getParameter<int>("cutnum") << " to "
+                                      << filterPSet.getParameter<int>("ncandcut") << " for filter " << moduleLabel;
+                paramSet.addParameter<int>("cutnum", filterPSet.getParameter<int>("ncandcut"));
+                paramSet.addParameter<unsigned>("reqNum", (unsigned)filterPSet.getParameter<int>("ncandcut"));
               }
 
-              // set the x axis of the et plots to some reasonable value based
-              // on the primary et cut determined from the path name
-              double ptMax = ptMax_;
-              double ptMin = ptMin_;
-              if (ptMax < (1.2*genEtMin)) {
-                 paramSet.addUntrackedParameter<double>("PtMax", (10*ceil(0.12 * genEtMin)));
-                 paramSet.addUntrackedParameter<double>("PtMin", (10*ceil(0.12 * genEtMin) - ptMax + ptMin));
-              }
-              else {
-                 paramSet.addUntrackedParameter<double>("PtMax", ptMax);
-                 paramSet.addUntrackedParameter<double>("PtMin", ptMin);
+              filterVPSet.push_back(filterPSet);
+            } else
+              break;
+
+          }  // end loop over filter modules of current trigger path
+
+          // do not include this path when an empty filterPSet is detected.
+          if (!filterPSet.empty()) {
+            std::string lastModuleName = filterPSet.getParameter<edm::InputTag>("HLTCollectionLabels").label();
+            if (!hltConfig_.modulePSet(lastModuleName).exists("saveTags")) {
+              // make sure that 'theHLTOutputTypes' of the last filter of a
+              // photon path is set to trigger::TriggerPhoton this is coupled to
+              // the parameter 'saveTag = true'
+              if ((j == TYPE_SINGLE_PHOTON || j == TYPE_DOUBLE_PHOTON) && pathName.rfind("Ele") == std::string::npos) {
+                filterVPSet.back().addParameter<int>("theHLTOutputTypes", trigger::TriggerPhoton);
               }
+            }
+            paramSet.addParameter<std::vector<edm::ParameterSet>>("filters", filterVPSet);
+          } else {
+            if (verbosity_ >= OUTPUT_ALL)
+              edm::LogPrint("EmDQM") << "Will not include this path in the validation due to "
+                                        "errors while generating the parameter set.";
+            continue;
+          }
+
+          // dump generated parameter set
+          // std::cout << paramSet.dump() << std::endl;
+
+          paramSets.push_back(paramSet);
+        }  // loop over all paths of this analysis type
+
+      }  // loop over analysis types (single ele etc.)
+    }
 
-              //preselction cuts 
-              switch (j) {
-                 case TYPE_SINGLE_ELE:
-                    paramSet.addParameter<unsigned>("reqNum", 1);
-                    paramSet.addParameter<int>("pdgGen", 11);
-                    paramSet.addParameter<edm::InputTag>("cutcollection", edm::InputTag("fiducialWenu"));
-                    paramSet.addParameter<int>("cutnum", 1);
-                    break;
-                 case TYPE_DOUBLE_ELE:
-                    paramSet.addParameter<unsigned>("reqNum", 2);
-                    paramSet.addParameter<int>("pdgGen", 11);
-                    paramSet.addParameter<edm::InputTag>("cutcollection", edm::InputTag("fiducialZee"));
-                    paramSet.addParameter<int>("cutnum", 2);
-                    break;
-                 case TYPE_TRIPLE_ELE:
-                    paramSet.addParameter<unsigned>("reqNum", 3);
-                    paramSet.addParameter<int>("pdgGen", 11);
-                    paramSet.addParameter<edm::InputTag>("cutcollection", edm::InputTag("fiducialTripleEle"));
-                    paramSet.addParameter<int>("cutnum", 3);
-                    break;
-                 case TYPE_SINGLE_PHOTON:
-                    paramSet.addParameter<unsigned>("reqNum", 1);
-                    paramSet.addParameter<int>("pdgGen", 22);
-                    paramSet.addParameter<edm::InputTag>("cutcollection", edm::InputTag("fiducialGammaJet"));
-                    paramSet.addParameter<int>("cutnum", 1);
-                    break;
-                 case TYPE_DOUBLE_PHOTON:
-                    paramSet.addParameter<unsigned>("reqNum", 2);
-                    paramSet.addParameter<int>("pdgGen", 22);
-                    paramSet.addParameter<edm::InputTag>("cutcollection", edm::InputTag("fiducialDiGamma"));
-                    paramSet.addParameter<int>("cutnum", 2);
-              }
-              //--------------------
-
-              // TODO: extend this
-              if (isData_) paramSet.addParameter<edm::InputTag>("cutcollection", edm::InputTag("gsfElectrons"));
-
-              std::vector<edm::ParameterSet> filterVPSet;
-              edm::ParameterSet filterPSet;
-              std::string moduleLabel;
-
-              // loop over filtermodules of current trigger path
-              for (std::vector<std::string>::iterator filter = filterModules.begin(); filter != filterModules.end(); ++filter) {
-                 std::string moduleType = hltConfig_.modulePSet(*filter).getParameter<std::string>("@module_type");
-                 moduleLabel = hltConfig_.modulePSet(*filter).getParameter<std::string>("@module_label");
-
-                 // first check if it is a filter we are not interrested in
-                 if (moduleType == "Pythia6GeneratorFilter" ||
-                     moduleType == "HLTTriggerTypeFilter" ||
-                     moduleType == "HLTLevel1Activity" ||
-                     moduleType == "HLTPrescaler" ||
-                     moduleType == "HLTBool")
-                    continue;
-
-                 // now check for the known filter types
-                 if (moduleType == "HLTLevel1GTSeed") {
-                    filterPSet = makePSetForL1SeedFilter(moduleLabel);
-                 }
-                 else if (moduleType == "HLTEgammaL1MatchFilterRegional") {
-                    filterPSet = makePSetForL1SeedToSuperClusterMatchFilter(moduleLabel);
-                 }
-                 else if (moduleType == "HLTEgammaEtFilter") {
-                    filterPSet = makePSetForEtFilter(moduleLabel);
-                 }
-                 else if (moduleType == "HLTElectronOneOEMinusOneOPFilterRegional") {
-                    filterPSet = makePSetForOneOEMinusOneOPFilter(moduleLabel);
-                 }
-                 else if (moduleType == "HLTElectronPixelMatchFilter") {
-                    filterPSet = makePSetForPixelMatchFilter(moduleLabel);
-                 }
-                 else if (moduleType == "HLTEgammaGenericFilter") {
-                    filterPSet = makePSetForEgammaGenericFilter(moduleLabel);
-                 }
-                 else if (moduleType == "HLTEgammaGenericQuadraticFilter") {
-                    filterPSet = makePSetForEgammaGenericQuadraticFilter(moduleLabel);
-                 }
-                 else if (moduleType == "HLTElectronGenericFilter") {
-                    filterPSet = makePSetForElectronGenericFilter(moduleLabel);
-                 }
-                 else if (moduleType == "HLTEgammaDoubleEtDeltaPhiFilter") {
-                    filterPSet = makePSetForEgammaDoubleEtDeltaPhiFilter(moduleLabel);
-                 }
-                 else if (moduleType == "HLTGlobalSumsMET"
-                          || moduleType == "HLTHtMhtFilter"
-                          || moduleType == "HLTMhtFilter"
-                          || moduleType == "HLTJetTag"
-                          || moduleType == "HLT1CaloJet"
-                          || moduleType == "HLT1CaloMET"
-                          || moduleType == "HLT1CaloBJet"
-                          || moduleType == "HLT1Tau"
-                          || moduleType == "HLT1PFTau"
-                          || moduleType == "PFTauSelector"
-                          || moduleType == "HLT1PFJet"
-                          || moduleType == "HLTPFJetCollectionsFilter"
-                          || moduleType == "HLTPFJetCollectionsVBFFilter"
-                          || moduleType == "HLTPFJetTag"
-                          || moduleType == "EtMinCaloJetSelector"
-                          || moduleType == "EtMinPFJetSelector"
-                          || moduleType == "LargestEtCaloJetSelector"
-                          || moduleType == "LargestEtPFJetSelector"
-                          || moduleType == "HLTEgammaTriggerFilterObjectWrapper"  // 'fake' filter
-                          || moduleType == "HLTEgammaDoubleLegCombFilter" // filter does not put anything in TriggerEventWithRefs
-                          || moduleType == "HLT2ElectronMET"
-                          || moduleType == "HLT2ElectronTau"
-                          || moduleType == "HLT2ElectronPFTau"
-                          || moduleType == "HLTPMMassFilter"
-                          || moduleType == "HLTHcalTowerFilter"
-                          || moduleType == "HLT1Photon"
-                          || moduleType == "HLTRFilter"
-                          || moduleType == "HLTRHemisphere"
-                          || moduleType == "HLTElectronPFMTFilter"
-                          || moduleType == "PrimaryVertexObjectFilter"
-                          || moduleType == "HLTEgammaAllCombMassFilter"
-                          || moduleType.find("HLTMuon") != std::string::npos
-                         )
-                    continue;
-                 else {
-                    if (verbosity_ >= OUTPUT_WARNINGS)
-                       edm::LogWarning("EmDQM")  << "No parameter set for filter '" << moduleLabel << "' with filter type '" << moduleType << "' added. Module will not be analyzed.";
-                    continue;
-                 }
-
-                 // something went wrong when the parameter set is empty. 
-                 if (!filterPSet.empty()) {
-                    if (!hltConfig_.modulePSet(moduleLabel).exists("saveTags")) {
-                       // make sure that 'theHLTOutputTypes' before an unseeded filter in a photon path is set to trigger::TriggerPhoton
-                       // this is coupled to the parameter 'saveTag = true'
-                       if (moduleLabel.find("Unseeded") != std::string::npos && (j == TYPE_DOUBLE_PHOTON || j == TYPE_SINGLE_PHOTON)) {
-                          filterVPSet.back().addParameter<int>("theHLTOutputTypes", trigger::TriggerPhoton);
-                       }
-                    }
-                    // if ncandcut is -1 (when parsing for the number of particles in the name of the L1seed filter fails),
-                    // fall back to setting ncandcut to the number of particles needed for the given path.
-                    if (filterPSet.getParameter<int>("ncandcut") < 0) {
-                      edm::LogPrint("EmDQM") << "No number of candidates for filter " << moduleLabel << " found. Set to " << paramSet.getParameter<int>("cutnum") << ", determined from path name.";
-                      filterPSet.addParameter<int>("ncandcut", paramSet.getParameter<int>("cutnum"));
-                    } else if (filterPSet.getParameter<int>("ncandcut") > paramSet.getParameter<int>("cutnum")) {
-                      edm::LogInfo("EmDQM") << "Changed required number of candidates from " << paramSet.getParameter<int>("cutnum") << " to " << filterPSet.getParameter<int>("ncandcut") << " for filter " << moduleLabel;
-                      paramSet.addParameter<int>("cutnum", filterPSet.getParameter<int>("ncandcut"));
-                      paramSet.addParameter<unsigned>("reqNum", (unsigned)filterPSet.getParameter<int>("ncandcut"));
-                    }
-
-                    filterVPSet.push_back(filterPSet);
-                 }
-                 else
-                    break;
-
-              } // end loop over filter modules of current trigger path
-
-              // do not include this path when an empty filterPSet is detected.
-              if (!filterPSet.empty()) {
-                 std::string lastModuleName = filterPSet.getParameter<edm::InputTag>("HLTCollectionLabels").label();
-                 if (!hltConfig_.modulePSet(lastModuleName).exists("saveTags")) {
-                    // make sure that 'theHLTOutputTypes' of the last filter of a photon path is set to trigger::TriggerPhoton
-                    // this is coupled to the parameter 'saveTag = true'
-                    if ((j == TYPE_SINGLE_PHOTON || j == TYPE_DOUBLE_PHOTON) && pathName.rfind("Ele") == std::string::npos) {
-                       filterVPSet.back().addParameter<int>("theHLTOutputTypes", trigger::TriggerPhoton);
-                    }
-                 }
-                 paramSet.addParameter<std::vector<edm::ParameterSet> >("filters", filterVPSet);
-              }
-              else {
-                 if (verbosity_ >= OUTPUT_ALL)
-                    edm::LogPrint("EmDQM") << "Will not include this path in the validation due to errors while generating the parameter set.";
-                 continue;
-              }
+    hltCollectionLabelsFoundPerPath.reserve(paramSets.size());
+    hltCollectionLabelsMissedPerPath.reserve(paramSets.size());
 
-              // dump generated parameter set
-              //std::cout << paramSet.dump() << std::endl;
+    ////////////////////////////////////////////////////////////
+    // loop over all the trigger path parameter sets
+    ////////////////////////////////////////////////////////////
+    for (std::vector<edm::ParameterSet>::iterator psetIt = paramSets.begin(); psetIt != paramSets.end(); ++psetIt) {
+      hltCollectionLabelsFoundPerPath.push_back(hltCollectionLabelsFound);
+      hltCollectionLabelsMissedPerPath.push_back(hltCollectionLabelsMissed);
+    }
 
-              paramSets.push_back(paramSet);
-           } // loop over all paths of this analysis type
+    if (changed) {
+      // The HLT config has actually changed wrt the previous Run, hence rebook
+      // your histograms or do anything else dependent on the revised HLT config
+    }
+  } else {
+    // if init returns FALSE, initialisation has NOT succeeded, which indicates
+    // a problem with the file and/or code and needs to be investigated!
+    if (verbosity_ >= OUTPUT_ERRORS)
+      edm::LogError("EmDQM") << " HLT config extraction failure with process name '" << triggerObject_.process()
+                             << "'.";
+    // In this case, all access methods will return empty values!
+  }
+}
 
-        } // loop over analysis types (single ele etc.)
-      }
+void EmDQM::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &iRun, edm::EventSetup const &iSetup) {
+  ////////////////////////////////////////////////////////////
+  // loop over all the trigger path parameter sets
+  ////////////////////////////////////////////////////////////
+  for (std::vector<edm::ParameterSet>::iterator psetIt = paramSets.begin(); psetIt != paramSets.end(); ++psetIt) {
+    SetVarsFromPSet(psetIt);
 
-      hltCollectionLabelsFoundPerPath.reserve(paramSets.size());
-      hltCollectionLabelsMissedPerPath.reserve(paramSets.size());
+    iBooker.setCurrentFolder(dirname_);
 
-      ////////////////////////////////////////////////////////////
-      // loop over all the trigger path parameter sets
-      ////////////////////////////////////////////////////////////
-      for (std::vector<edm::ParameterSet>::iterator psetIt = paramSets.begin(); psetIt != paramSets.end(); ++psetIt) {
-         hltCollectionLabelsFoundPerPath.push_back(hltCollectionLabelsFound);
-         hltCollectionLabelsMissedPerPath.push_back(hltCollectionLabelsMissed);
+    ////////////////////////////////////////////////////////////
+    //  Set up Histogram of Effiency vs Step.                 //
+    //   theHLTCollectionLabels is a vector of InputTags      //
+    //    from the configuration file.                        //
+    ////////////////////////////////////////////////////////////
+    // Et & eta distributions
+    std::vector<MonitorElement *> etahist;
+    std::vector<MonitorElement *> phihist;
+    std::vector<MonitorElement *> ethist;
+    std::vector<MonitorElement *> etahistmatch;
+    std::vector<MonitorElement *> phihistmatch;
+    std::vector<MonitorElement *> ethistmatch;
+    std::vector<MonitorElement *> histEtOfHltObjMatchToGen;
+    std::vector<MonitorElement *> histEtaOfHltObjMatchToGen;
+    std::vector<MonitorElement *> histPhiOfHltObjMatchToGen;
+    std::vector<MonitorElement *> etaphihist;
+    std::vector<MonitorElement *> etaphihistmatch;
+    std::vector<MonitorElement *> histEtaPhiOfHltObjMatchToGen;
+    // Plots of efficiency per step
+    MonitorElement *total;
+    MonitorElement *totalmatch;
+    // generator histograms
+    MonitorElement *etgen;
+    MonitorElement *etagen;
+    MonitorElement *phigen;
+    MonitorElement *etaphigen;
+
+    std::string histName = "total_eff";
+    std::string histTitle = "total events passing";
+    if (!mcMatchedOnly_) {
+      // This plot will have bins equal to 2+(number of
+      //        HLTCollectionLabels in the config file)
+      total = iBooker.book1D(
+          histName.c_str(), histTitle.c_str(), numOfHLTCollectionLabels + 2, 0, numOfHLTCollectionLabels + 2);
+      total->setBinLabel(numOfHLTCollectionLabels + 1, "Total");
+      total->setBinLabel(numOfHLTCollectionLabels + 2, "Gen");
+      for (unsigned int u = 0; u < numOfHLTCollectionLabels; u++) {
+        total->setBinLabel(u + 1, theHLTCollectionLabels[u].label());
       }
+    }
 
-      if (changed) {
-         // The HLT config has actually changed wrt the previous Run, hence rebook your
-         // histograms or do anything else dependent on the revised HLT config
-      }
-   } else {
-      // if init returns FALSE, initialisation has NOT succeeded, which indicates a problem
-      // with the file and/or code and needs to be investigated!
-      if (verbosity_ >= OUTPUT_ERRORS)
-         edm::LogError("EmDQM") << " HLT config extraction failure with process name '" << triggerObject_.process() << "'.";
-      // In this case, all access methods will return empty values!
-   }
-}
+    histName = "total_eff_MC_matched";
+    histTitle = "total events passing (mc matched)";
+    totalmatch = iBooker.book1D(
+        histName.c_str(), histTitle.c_str(), numOfHLTCollectionLabels + 2, 0, numOfHLTCollectionLabels + 2);
+    totalmatch->setBinLabel(numOfHLTCollectionLabels + 1, "Total");
+    totalmatch->setBinLabel(numOfHLTCollectionLabels + 2, "Gen");
+    for (unsigned int u = 0; u < numOfHLTCollectionLabels; u++) {
+      totalmatch->setBinLabel(u + 1, theHLTCollectionLabels[u].label());
+    }
 
-void 
-EmDQM::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &iRun, edm::EventSetup const &iSetup)
-{
-   ////////////////////////////////////////////////////////////
-   // loop over all the trigger path parameter sets
-   ////////////////////////////////////////////////////////////
-   for (std::vector<edm::ParameterSet>::iterator psetIt = paramSets.begin(); psetIt != paramSets.end(); ++psetIt) {
-      SetVarsFromPSet(psetIt);
-
-      iBooker.setCurrentFolder(dirname_);
-    
-      ////////////////////////////////////////////////////////////
-      //  Set up Histogram of Effiency vs Step.                 //
-      //   theHLTCollectionLabels is a vector of InputTags      //
-      //    from the configuration file.                        //
-      ////////////////////////////////////////////////////////////
-      // Et & eta distributions
-      std::vector<MonitorElement*> etahist;
-      std::vector<MonitorElement*> phihist;
-      std::vector<MonitorElement*> ethist;
-      std::vector<MonitorElement*> etahistmatch;
-      std::vector<MonitorElement*> phihistmatch;
-      std::vector<MonitorElement*> ethistmatch;
-      std::vector<MonitorElement*> histEtOfHltObjMatchToGen;
-      std::vector<MonitorElement*> histEtaOfHltObjMatchToGen;
-      std::vector<MonitorElement*> histPhiOfHltObjMatchToGen;
-      std::vector<MonitorElement*> etaphihist;
-      std::vector<MonitorElement*> etaphihistmatch;
-      std::vector<MonitorElement*> histEtaPhiOfHltObjMatchToGen; 
-      // Plots of efficiency per step
-      MonitorElement* total;
-      MonitorElement* totalmatch;
-      //generator histograms
-      MonitorElement* etgen;
-      MonitorElement* etagen;
-      MonitorElement* phigen;
-      MonitorElement* etaphigen;
- 
-      std::string histName="total_eff";
-      std::string histTitle = "total events passing";
-      if (!mcMatchedOnly_) {
-         // This plot will have bins equal to 2+(number of
-         //        HLTCollectionLabels in the config file)
-         total = iBooker.book1D(histName.c_str(),histTitle.c_str(),numOfHLTCollectionLabels+2,0,numOfHLTCollectionLabels+2);
-         total->setBinLabel(numOfHLTCollectionLabels+1,"Total");
-         total->setBinLabel(numOfHLTCollectionLabels+2,"Gen");
-         for (unsigned int u=0; u<numOfHLTCollectionLabels; u++) {
-            total->setBinLabel(u+1,theHLTCollectionLabels[u].label());
-         }
-      }
-    
-      histName="total_eff_MC_matched";
-      histTitle="total events passing (mc matched)";
-      totalmatch = iBooker.book1D(histName.c_str(),histTitle.c_str(),numOfHLTCollectionLabels+2,0,numOfHLTCollectionLabels+2);
-      totalmatch->setBinLabel(numOfHLTCollectionLabels+1,"Total");
-      totalmatch->setBinLabel(numOfHLTCollectionLabels+2,"Gen");
-      for (unsigned int u=0; u<numOfHLTCollectionLabels; u++) {
-         totalmatch->setBinLabel(u+1,theHLTCollectionLabels[u].label());
-      }
-    
-      MonitorElement* tmphisto;
-      //MonitorElement* tmpiso;
-    
-      ////////////////////////////////////////////////////////////
-      // Set up generator-level histograms                      //
-      ////////////////////////////////////////////////////////////
-      std::string pdgIdString;
-      switch(pdgGen) {
+    MonitorElement *tmphisto;
+    // MonitorElement* tmpiso;
+
+    ////////////////////////////////////////////////////////////
+    // Set up generator-level histograms                      //
+    ////////////////////////////////////////////////////////////
+    std::string pdgIdString;
+    switch (pdgGen) {
       case 11:
-        pdgIdString="Electron";break;
+        pdgIdString = "Electron";
+        break;
       case 22:
-        pdgIdString="Photon";break;
+        pdgIdString = "Photon";
+        break;
       default:
-        pdgIdString="Particle";
+        pdgIdString = "Particle";
+    }
+
+    histName = "gen_et";
+    histTitle = "E_{T} of " + pdgIdString + "s";
+    etgen = iBooker.book1D(histName.c_str(), histTitle.c_str(), nbins_, plotPtMin, plotPtMax);
+    histName = "gen_eta";
+    histTitle = "#eta of " + pdgIdString + "s ";
+    etagen = iBooker.book1D(histName.c_str(), histTitle.c_str(), nbins_, -etaMax_, etaMax_);
+    histName = "gen_phi";
+    histTitle = "#phi of " + pdgIdString + "s ";
+    if (!noPhiPlots_)
+      phigen = iBooker.book1D(histName.c_str(), histTitle.c_str(), nbins_, -phiMax_, phiMax_);
+    histName = "gen_etaphi";
+    histTitle = "#eta-#phi of " + pdgIdString + "s ";
+    etaphigen = iBooker.book2D(
+        histName.c_str(), histTitle.c_str(), nbins2D_ - 2, -eta2DMax_, eta2DMax_, nbins2D_, -phi2DMax_, phi2DMax_);
+    ////////////////////////////////////////////////////////////
+    //  Set up histograms of HLT objects                      //
+    ////////////////////////////////////////////////////////////
+    // Determine what strings to use for histogram titles
+    std::vector<std::string> HltHistTitle;
+    if (theHLTCollectionHumanNames.size() == numOfHLTCollectionLabels && useHumanReadableHistTitles_) {
+      HltHistTitle = theHLTCollectionHumanNames;
+    } else {
+      for (unsigned int i = 0; i < numOfHLTCollectionLabels; i++) {
+        HltHistTitle.push_back(theHLTCollectionLabels[i].label());
       }
-    
-      histName = "gen_et";
-      histTitle= "E_{T} of " + pdgIdString + "s" ;
-      etgen =  iBooker.book1D(histName.c_str(),histTitle.c_str(),nbins_,plotPtMin,plotPtMax);
-      histName = "gen_eta";
-      histTitle= "#eta of "+ pdgIdString +"s " ;
-      etagen = iBooker.book1D(histName.c_str(),histTitle.c_str(),nbins_,-etaMax_, etaMax_);
-      histName = "gen_phi";
-      histTitle= "#phi of "+ pdgIdString +"s " ;
-      if (!noPhiPlots_) phigen = iBooker.book1D(histName.c_str(),histTitle.c_str(),nbins_,-phiMax_, phiMax_);
-      histName = "gen_etaphi";
-      histTitle= "#eta-#phi of "+ pdgIdString +"s " ;
-      etaphigen = iBooker.book2D(histName.c_str(),histTitle.c_str(), nbins2D_-2,-eta2DMax_, eta2DMax_,nbins2D_,-phi2DMax_, phi2DMax_); 
-      ////////////////////////////////////////////////////////////
-      //  Set up histograms of HLT objects                      //
-      ////////////////////////////////////////////////////////////
-      // Determine what strings to use for histogram titles
-      std::vector<std::string> HltHistTitle;
-      if ( theHLTCollectionHumanNames.size() == numOfHLTCollectionLabels && useHumanReadableHistTitles_ ) {
-        HltHistTitle = theHLTCollectionHumanNames;
-      } else {
-        for (unsigned int i =0; i < numOfHLTCollectionLabels; i++) {
-          HltHistTitle.push_back(theHLTCollectionLabels[i].label());
+    }
+
+    for (unsigned int i = 0; i < numOfHLTCollectionLabels; i++) {
+      if (!mcMatchedOnly_) {
+        // Et distribution of HLT objects passing filter i
+        histName = theHLTCollectionLabels[i].label() + "et_all";
+        histTitle = HltHistTitle[i] + " Et (ALL)";
+        tmphisto = iBooker.book1D(histName.c_str(), histTitle.c_str(), nbins_, plotPtMin, plotPtMax);
+        ethist.push_back(tmphisto);
+
+        // Eta distribution of HLT objects passing filter i
+        histName = theHLTCollectionLabels[i].label() + "eta_all";
+        histTitle = HltHistTitle[i] + " #eta (ALL)";
+        tmphisto = iBooker.book1D(histName.c_str(), histTitle.c_str(), nbins_, -etaMax_, etaMax_);
+        etahist.push_back(tmphisto);
+
+        if (!noPhiPlots_) {
+          // Phi distribution of HLT objects passing filter i
+          histName = theHLTCollectionLabels[i].label() + "phi_all";
+          histTitle = HltHistTitle[i] + " #phi (ALL)";
+          tmphisto = iBooker.book1D(histName.c_str(), histTitle.c_str(), nbins_, -phiMax_, phiMax_);
+          phihist.push_back(tmphisto);
         }
-      }
-     
-      for(unsigned int i = 0; i< numOfHLTCollectionLabels ; i++){
-        if (!mcMatchedOnly_) {
-           // Et distribution of HLT objects passing filter i
-           histName = theHLTCollectionLabels[i].label()+"et_all";
-           histTitle = HltHistTitle[i]+" Et (ALL)";
-           tmphisto =  iBooker.book1D(histName.c_str(),histTitle.c_str(),nbins_,plotPtMin,plotPtMax);
-           ethist.push_back(tmphisto);
-           
-           // Eta distribution of HLT objects passing filter i
-           histName = theHLTCollectionLabels[i].label()+"eta_all";
-           histTitle = HltHistTitle[i]+" #eta (ALL)";
-           tmphisto =  iBooker.book1D(histName.c_str(),histTitle.c_str(),nbins_,-etaMax_, etaMax_);
-           etahist.push_back(tmphisto);          
-
-           if (!noPhiPlots_) {
-             // Phi distribution of HLT objects passing filter i
-             histName = theHLTCollectionLabels[i].label()+"phi_all";
-             histTitle = HltHistTitle[i]+" #phi (ALL)";
-             tmphisto =  iBooker.book1D(histName.c_str(),histTitle.c_str(),nbins_,-phiMax_, phiMax_);
-             phihist.push_back(tmphisto);
-           }
-    
-           histName = theHLTCollectionLabels[i].label()+"etaphi_all";
-           histTitle = HltHistTitle[i]+" #eta-#phi (ALL)";
-           tmphisto =  iBooker.book2D(histName.c_str(),histTitle.c_str(),nbins2D_-2,-eta2DMax_, eta2DMax_,nbins2D_,-phi2DMax_, phi2DMax_);
-           etaphihist.push_back(tmphisto);
-
-   
-           // Et distribution of HLT object that is closest delta-R match to sorted gen particle(s)
-           histName  = theHLTCollectionLabels[i].label()+"et";
-           histTitle = HltHistTitle[i]+" Et";
-           tmphisto  = iBooker.book1D(histName.c_str(),histTitle.c_str(),nbins_,plotPtMin,plotPtMax);
-           histEtOfHltObjMatchToGen.push_back(tmphisto);
-    
-           // eta distribution of HLT object that is closest delta-R match to sorted gen particle(s)
-           histName  = theHLTCollectionLabels[i].label()+"eta";
-           histTitle = HltHistTitle[i]+" eta";
-           tmphisto  = iBooker.book1D(histName.c_str(),histTitle.c_str(),nbins_,-etaMax_, etaMax_);
-           histEtaOfHltObjMatchToGen.push_back(tmphisto);
-    
-           if (!noPhiPlots_) {
-             // phi distribution of HLT object that is closest delta-R match to sorted gen particle(s)
-             histName  = theHLTCollectionLabels[i].label()+"phi";
-             histTitle = HltHistTitle[i]+" phi";
-             tmphisto  = iBooker.book1D(histName.c_str(),histTitle.c_str(),nbins_,-phiMax_, phiMax_);
-             histPhiOfHltObjMatchToGen.push_back(tmphisto);
-           }
-
-           histName  = theHLTCollectionLabels[i].label()+"etaphi";
-           histTitle = HltHistTitle[i]+" eta-phi";
-           tmphisto  = iBooker.book2D(histName.c_str(),histTitle.c_str(),nbins2D_-2,-eta2DMax_, eta2DMax_,nbins2D_,-phi2DMax_, phi2DMax_);
-           histEtaPhiOfHltObjMatchToGen.push_back(tmphisto);
-       }
-    
-        // Et distribution of gen object matching HLT object passing filter i
-        histName = theHLTCollectionLabels[i].label()+"et_MC_matched";
-        histTitle = HltHistTitle[i]+" Et (MC matched)";
-        tmphisto =  iBooker.book1D(histName.c_str(),histTitle.c_str(),nbins_,plotPtMin,plotPtMax);
-        ethistmatch.push_back(tmphisto);
-        
-        // Eta distribution of gen object matching HLT object passing filter i
-        histName = theHLTCollectionLabels[i].label()+"eta_MC_matched";
-        histTitle = HltHistTitle[i]+" #eta (MC matched)";
-        tmphisto =  iBooker.book1D(histName.c_str(),histTitle.c_str(),nbins_,-etaMax_, etaMax_);
-        etahistmatch.push_back(tmphisto);
-    
+
+        histName = theHLTCollectionLabels[i].label() + "etaphi_all";
+        histTitle = HltHistTitle[i] + " #eta-#phi (ALL)";
+        tmphisto = iBooker.book2D(
+            histName.c_str(), histTitle.c_str(), nbins2D_ - 2, -eta2DMax_, eta2DMax_, nbins2D_, -phi2DMax_, phi2DMax_);
+        etaphihist.push_back(tmphisto);
+
+        // Et distribution of HLT object that is closest delta-R match to sorted
+        // gen particle(s)
+        histName = theHLTCollectionLabels[i].label() + "et";
+        histTitle = HltHistTitle[i] + " Et";
+        tmphisto = iBooker.book1D(histName.c_str(), histTitle.c_str(), nbins_, plotPtMin, plotPtMax);
+        histEtOfHltObjMatchToGen.push_back(tmphisto);
+
+        // eta distribution of HLT object that is closest delta-R match to
+        // sorted gen particle(s)
+        histName = theHLTCollectionLabels[i].label() + "eta";
+        histTitle = HltHistTitle[i] + " eta";
+        tmphisto = iBooker.book1D(histName.c_str(), histTitle.c_str(), nbins_, -etaMax_, etaMax_);
+        histEtaOfHltObjMatchToGen.push_back(tmphisto);
+
         if (!noPhiPlots_) {
-          // Phi distribution of gen object matching HLT object passing filter i
-          histName = theHLTCollectionLabels[i].label()+"phi_MC_matched";
-          histTitle = HltHistTitle[i]+" #phi (MC matched)";
-          tmphisto =  iBooker.book1D(histName.c_str(),histTitle.c_str(),nbins_,-phiMax_, phiMax_);
-          phihistmatch.push_back(tmphisto);
+          // phi distribution of HLT object that is closest delta-R match to
+          // sorted gen particle(s)
+          histName = theHLTCollectionLabels[i].label() + "phi";
+          histTitle = HltHistTitle[i] + " phi";
+          tmphisto = iBooker.book1D(histName.c_str(), histTitle.c_str(), nbins_, -phiMax_, phiMax_);
+          histPhiOfHltObjMatchToGen.push_back(tmphisto);
         }
 
-        histName = theHLTCollectionLabels[i].label()+"etaphi_MC_matched";
-        histTitle = HltHistTitle[i]+" #eta-#phi (MC matched)";
-        tmphisto =  iBooker.book2D(histName.c_str(),histTitle.c_str(),nbins2D_-2,-eta2DMax_, eta2DMax_,nbins2D_,-phi2DMax_, phi2DMax_);
-        etaphihistmatch.push_back(tmphisto);
+        histName = theHLTCollectionLabels[i].label() + "etaphi";
+        histTitle = HltHistTitle[i] + " eta-phi";
+        tmphisto = iBooker.book2D(
+            histName.c_str(), histTitle.c_str(), nbins2D_ - 2, -eta2DMax_, eta2DMax_, nbins2D_, -phi2DMax_, phi2DMax_);
+        histEtaPhiOfHltObjMatchToGen.push_back(tmphisto);
+      }
+
+      // Et distribution of gen object matching HLT object passing filter i
+      histName = theHLTCollectionLabels[i].label() + "et_MC_matched";
+      histTitle = HltHistTitle[i] + " Et (MC matched)";
+      tmphisto = iBooker.book1D(histName.c_str(), histTitle.c_str(), nbins_, plotPtMin, plotPtMax);
+      ethistmatch.push_back(tmphisto);
+
+      // Eta distribution of gen object matching HLT object passing filter i
+      histName = theHLTCollectionLabels[i].label() + "eta_MC_matched";
+      histTitle = HltHistTitle[i] + " #eta (MC matched)";
+      tmphisto = iBooker.book1D(histName.c_str(), histTitle.c_str(), nbins_, -etaMax_, etaMax_);
+      etahistmatch.push_back(tmphisto);
+
+      if (!noPhiPlots_) {
+        // Phi distribution of gen object matching HLT object passing filter i
+        histName = theHLTCollectionLabels[i].label() + "phi_MC_matched";
+        histTitle = HltHistTitle[i] + " #phi (MC matched)";
+        tmphisto = iBooker.book1D(histName.c_str(), histTitle.c_str(), nbins_, -phiMax_, phiMax_);
+        phihistmatch.push_back(tmphisto);
       }
 
-      // Et & eta distributions
-      etahists.push_back(etahist);
-      phihists.push_back(phihist);
-      ethists.push_back(ethist);
-      etahistmatchs.push_back(etahistmatch);
-      phihistmatchs.push_back(phihistmatch);
-      ethistmatchs.push_back(ethistmatch);
-      histEtOfHltObjMatchToGens.push_back(histEtOfHltObjMatchToGen);
-      histEtaOfHltObjMatchToGens.push_back(histEtaOfHltObjMatchToGen);
-      histPhiOfHltObjMatchToGens.push_back(histPhiOfHltObjMatchToGen);
-      etaphihists.push_back(etaphihist);
-      etaphihistmatchs.push_back(etaphihistmatch);
-      histEtaPhiOfHltObjMatchToGens.push_back(histEtaPhiOfHltObjMatchToGen);
-      // commented out because uses data not included in HTLDEBUG and uses
-      // Isolation distributions
-      //etahistisos.push_back(etahistiso);
-      //phihistisos.push_back(phihistiso);
-      //ethistisos.push_back(ethistiso);
-      //etahistisomatchs.push_back(etahistisomatch);
-      //phihistisomatchs.push_back(phihistisomatch);
-      //ethistisomatchs.push_back(ethistisomatch);
-      //histEtIsoOfHltObjMatchToGens.push_back(histEtIsoOfHltObjMatchToGen); 
-      //histEtaIsoOfHltObjMatchToGens.push_back(histEtaIsoOfHltObjMatchToGen);
-      //histPhiIsoOfHltObjMatchToGens.push_back(histPhiIsoOfHltObjMatchToGen);
-
-      totals.push_back(total);
-      totalmatchs.push_back(totalmatch);
-      etgens.push_back(etgen);
-      etagens.push_back(etagen);
-      phigens.push_back(phigen);
-     etaphigens.push_back(etaphigen);
-   }
+      histName = theHLTCollectionLabels[i].label() + "etaphi_MC_matched";
+      histTitle = HltHistTitle[i] + " #eta-#phi (MC matched)";
+      tmphisto = iBooker.book2D(
+          histName.c_str(), histTitle.c_str(), nbins2D_ - 2, -eta2DMax_, eta2DMax_, nbins2D_, -phi2DMax_, phi2DMax_);
+      etaphihistmatch.push_back(tmphisto);
+    }
+
+    // Et & eta distributions
+    etahists.push_back(etahist);
+    phihists.push_back(phihist);
+    ethists.push_back(ethist);
+    etahistmatchs.push_back(etahistmatch);
+    phihistmatchs.push_back(phihistmatch);
+    ethistmatchs.push_back(ethistmatch);
+    histEtOfHltObjMatchToGens.push_back(histEtOfHltObjMatchToGen);
+    histEtaOfHltObjMatchToGens.push_back(histEtaOfHltObjMatchToGen);
+    histPhiOfHltObjMatchToGens.push_back(histPhiOfHltObjMatchToGen);
+    etaphihists.push_back(etaphihist);
+    etaphihistmatchs.push_back(etaphihistmatch);
+    histEtaPhiOfHltObjMatchToGens.push_back(histEtaPhiOfHltObjMatchToGen);
+    // commented out because uses data not included in HTLDEBUG and uses
+    // Isolation distributions
+    // etahistisos.push_back(etahistiso);
+    // phihistisos.push_back(phihistiso);
+    // ethistisos.push_back(ethistiso);
+    // etahistisomatchs.push_back(etahistisomatch);
+    // phihistisomatchs.push_back(phihistisomatch);
+    // ethistisomatchs.push_back(ethistisomatch);
+    // histEtIsoOfHltObjMatchToGens.push_back(histEtIsoOfHltObjMatchToGen);
+    // histEtaIsoOfHltObjMatchToGens.push_back(histEtaIsoOfHltObjMatchToGen);
+    // histPhiIsoOfHltObjMatchToGens.push_back(histPhiIsoOfHltObjMatchToGen);
+
+    totals.push_back(total);
+    totalmatchs.push_back(totalmatch);
+    etgens.push_back(etgen);
+    etagens.push_back(etagen);
+    phigens.push_back(phigen);
+    etaphigens.push_back(etaphigen);
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //                                Destructor                                  //
 ////////////////////////////////////////////////////////////////////////////////
-EmDQM::~EmDQM(){
-}
+EmDQM::~EmDQM() {}
 ////////////////////////////////////////////////////////////////////////////////
 
-bool EmDQM::checkGeneratedParticlesRequirement(const edm::Event & event)
-{
+bool EmDQM::checkGeneratedParticlesRequirement(const edm::Event &event) {
   ////////////////////////////////////////////////////////////
-   // Decide if this was an event of interest.               //
-   //  Did the highest energy particles happen               //
-   //  to have |eta| < 2.5 ?  Then continue.                 //
-   ////////////////////////////////////////////////////////////
-   edm::Handle< edm::View<reco::Candidate> > genParticles;
-   event.getByToken(genParticles_token, genParticles);
-   if(!genParticles.isValid()) {
-     if (verbosity_ >= OUTPUT_WARNINGS)
-        edm::LogWarning("EmDQM") << "genParticles invalid.";
-     return false;
-   }
-
-   std::vector<reco::LeafCandidate> allSortedGenParticles;
+  // Decide if this was an event of interest.               //
+  //  Did the highest energy particles happen               //
+  //  to have |eta| < 2.5 ?  Then continue.                 //
+  ////////////////////////////////////////////////////////////
+  edm::Handle<edm::View<reco::Candidate>> genParticles;
+  event.getByToken(genParticles_token, genParticles);
+  if (!genParticles.isValid()) {
+    if (verbosity_ >= OUTPUT_WARNINGS)
+      edm::LogWarning("EmDQM") << "genParticles invalid.";
+    return false;
+  }
 
-   for(edm::View<reco::Candidate>::const_iterator currentGenParticle = genParticles->begin(); currentGenParticle != genParticles->end(); currentGenParticle++){
+  std::vector<reco::LeafCandidate> allSortedGenParticles;
 
-     // TODO: do we need to check the states here again ?
-     // in principle, there should collections produced with the python configuration
-     // (other than 'genParticles') which fulfill these criteria
-     if (  !( abs((*currentGenParticle).pdgId())==pdgGen  && (*currentGenParticle).status()==1 && (*currentGenParticle).et() > 2.0)  )  continue;
+  for (edm::View<reco::Candidate>::const_iterator currentGenParticle = genParticles->begin();
+       currentGenParticle != genParticles->end();
+       currentGenParticle++) {
+    // TODO: do we need to check the states here again ?
+    // in principle, there should collections produced with the python
+    // configuration (other than 'genParticles') which fulfill these criteria
+    if (!(abs((*currentGenParticle).pdgId()) == pdgGen && (*currentGenParticle).status() == 1 &&
+          (*currentGenParticle).et() > 2.0))
+      continue;
 
-     reco::LeafCandidate tmpcand( *(currentGenParticle) );
+    reco::LeafCandidate tmpcand(*(currentGenParticle));
 
-     if (tmpcand.et() < plotEtMin) continue;
+    if (tmpcand.et() < plotEtMin)
+      continue;
 
-     allSortedGenParticles.push_back(tmpcand);
-   }
+    allSortedGenParticles.push_back(tmpcand);
+  }
 
-   std::sort(allSortedGenParticles.begin(), allSortedGenParticles.end(),pTGenComparator_);
+  std::sort(allSortedGenParticles.begin(), allSortedGenParticles.end(), pTGenComparator_);
 
-   // return false if not enough particles found
-   if (allSortedGenParticles.size() < gencut_)
-     return false;
+  // return false if not enough particles found
+  if (allSortedGenParticles.size() < gencut_)
+    return false;
 
-   // additional check (this might be legacy code and we need to check
-   // whether this should not be removed ?)
+  // additional check (this might be legacy code and we need to check
+  // whether this should not be removed ?)
 
-   // We now have a sorted collection of all generated particles
-   // with pdgId = pdgGen.
-   // Loop over them to see if the top gen particles have eta within acceptance
+  // We now have a sorted collection of all generated particles
+  // with pdgId = pdgGen.
+  // Loop over them to see if the top gen particles have eta within acceptance
   // bool keepEvent = true;
-   for (unsigned int i = 0 ; i < gencut_ ; i++ ) {
-     bool inECALgap = fabs(allSortedGenParticles[i].eta()) > 1.4442 && fabs(allSortedGenParticles[i].eta()) < 1.556;
-     if ( (fabs(allSortedGenParticles[i].eta()) > genEtaAcc_) || inECALgap ) {
-       //edm::LogWarning("EmDQM") << "Throwing event away. Gen particle with pdgId="<< allSortedGenParticles[i].pdgId() <<"; et="<< allSortedGenParticles[i].et() <<"; and eta="<< allSortedGenParticles[i].eta() <<" beyond acceptance.";
-       return false;
-     }
-   }
-
-   // all tests passed
-   return true;
+  for (unsigned int i = 0; i < gencut_; i++) {
+    bool inECALgap = fabs(allSortedGenParticles[i].eta()) > 1.4442 && fabs(allSortedGenParticles[i].eta()) < 1.556;
+    if ((fabs(allSortedGenParticles[i].eta()) > genEtaAcc_) || inECALgap) {
+      // edm::LogWarning("EmDQM") << "Throwing event away. Gen particle with
+      // pdgId="<< allSortedGenParticles[i].pdgId() <<"; et="<<
+      // allSortedGenParticles[i].et() <<"; and eta="<<
+      // allSortedGenParticles[i].eta() <<" beyond acceptance.";
+      return false;
+    }
+  }
+
+  // all tests passed
+  return true;
 }
 ////////////////////////////////////////////////////////////////////////////////
 
-bool EmDQM::checkRecoParticlesRequirement(const edm::Event & event)
-{
-  // note that this code is very similar to the one in checkGeneratedParticlesRequirement(..)
-  // and hopefully can be merged with it at some point in the future
+bool EmDQM::checkRecoParticlesRequirement(const edm::Event &event) {
+  // note that this code is very similar to the one in
+  // checkGeneratedParticlesRequirement(..) and hopefully can be merged with it
+  // at some point in the future
 
-  edm::Handle< edm::View<reco::Candidate> > referenceParticles;
+  edm::Handle<edm::View<reco::Candidate>> referenceParticles;
   // get the right data according to the trigger path currently looked at
   if (autoConfMode_) {
-    switch(reqNum) {
-       case 1:
-          if (pdgGen == 11) event.getByToken(gencutColl_fidWenu_token, referenceParticles);
-          else event.getByToken(gencutColl_fidGammaJet_token, referenceParticles);
-          break;
-       case 2:
-          if (pdgGen == 11) event.getByToken(gencutColl_fidZee_token, referenceParticles);
-          else event.getByToken(gencutColl_fidDiGamma_token, referenceParticles);
-          break;
-       case 3:
-          event.getByToken(gencutColl_fidTripleEle_token, referenceParticles);
-          break;
+    switch (reqNum) {
+      case 1:
+        if (pdgGen == 11)
+          event.getByToken(gencutColl_fidWenu_token, referenceParticles);
+        else
+          event.getByToken(gencutColl_fidGammaJet_token, referenceParticles);
+        break;
+      case 2:
+        if (pdgGen == 11)
+          event.getByToken(gencutColl_fidZee_token, referenceParticles);
+        else
+          event.getByToken(gencutColl_fidDiGamma_token, referenceParticles);
+        break;
+      case 3:
+        event.getByToken(gencutColl_fidTripleEle_token, referenceParticles);
+        break;
     }
   } else {
     event.getByToken(gencutColl_manualConf_token, referenceParticles);
   }
-  if(!referenceParticles.isValid()) {
-     if (verbosity_ >= OUTPUT_WARNINGS)
-        edm::LogWarning("EmDQM") << "referenceParticles invalid.";
-     return false;
+  if (!referenceParticles.isValid()) {
+    if (verbosity_ >= OUTPUT_WARNINGS)
+      edm::LogWarning("EmDQM") << "referenceParticles invalid.";
+    return false;
   }
 
   std::vector<const reco::Candidate *> allSortedReferenceParticles;
 
-  for(edm::View<reco::Candidate>::const_iterator currentReferenceParticle = referenceParticles->begin();
-      currentReferenceParticle != referenceParticles->end();
-      currentReferenceParticle++)
-  {
-     if ( currentReferenceParticle->et() <= 2.0)
-       continue;
-
-     // Note that for determining the overall efficiency,
-     // we should only allow
-     //
-     // HOWEVER: for turn-on curves, we need to let
-     //          more electrons pass
-     if (currentReferenceParticle->et() < plotEtMin)
-       continue;
-
-     // TODO: instead of filling a new vector we could simply count here...
-     allSortedReferenceParticles.push_back(&(*currentReferenceParticle));
+  for (edm::View<reco::Candidate>::const_iterator currentReferenceParticle = referenceParticles->begin();
+       currentReferenceParticle != referenceParticles->end();
+       currentReferenceParticle++) {
+    if (currentReferenceParticle->et() <= 2.0)
+      continue;
+
+    // Note that for determining the overall efficiency,
+    // we should only allow
+    //
+    // HOWEVER: for turn-on curves, we need to let
+    //          more electrons pass
+    if (currentReferenceParticle->et() < plotEtMin)
+      continue;
+
+    // TODO: instead of filling a new vector we could simply count here...
+    allSortedReferenceParticles.push_back(&(*currentReferenceParticle));
   }
 
-   // std::sort(allSortedReferenceParticles.begin(), allSortedReferenceParticles.end(),pTComparator_);
+  // std::sort(allSortedReferenceParticles.begin(),
+  // allSortedReferenceParticles.end(),pTComparator_);
 
-   // return false if not enough particles found
-   return allSortedReferenceParticles.size() >= gencut_;
+  // return false if not enough particles found
+  return allSortedReferenceParticles.size() >= gencut_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //                     method called to for each event                        //
 ////////////////////////////////////////////////////////////////////////////////
-void 
-EmDQM::analyze(const edm::Event & event , const edm::EventSetup& setup)
-{
+void EmDQM::analyze(const edm::Event &event, const edm::EventSetup &setup) {
   // loop over all the trigger path parameter sets
   unsigned int vPos = 0;
-  for (std::vector<edm::ParameterSet>::iterator psetIt = paramSets.begin(); psetIt != paramSets.end(); ++psetIt, ++vPos) {
+  for (std::vector<edm::ParameterSet>::iterator psetIt = paramSets.begin(); psetIt != paramSets.end();
+       ++psetIt, ++vPos) {
     SetVarsFromPSet(psetIt);
     // get the set forthe current path
     hltCollectionLabelsFound = hltCollectionLabelsFoundPerPath.at(vPos);
@@ -741,36 +745,44 @@ EmDQM::analyze(const edm::Event & event , const edm::EventSetup& setup)
     //             of interest                                //
     ////////////////////////////////////////////////////////////
     // get the right data according to the trigger path currently looked at
-    edm::Handle< edm::View<reco::Candidate> > cutCounter;
+    edm::Handle<edm::View<reco::Candidate>> cutCounter;
     if (autoConfMode_) {
-      switch(reqNum) {
-         case 1:
-            if (pdgGen == 11) event.getByToken(gencutColl_fidWenu_token, cutCounter);
-            else event.getByToken(gencutColl_fidGammaJet_token, cutCounter);
-            break;
-         case 2:
-            if (pdgGen == 11) event.getByToken(gencutColl_fidZee_token, cutCounter);
-            else event.getByToken(gencutColl_fidDiGamma_token, cutCounter);
-            break;
-         case 3:
-            event.getByToken(gencutColl_fidTripleEle_token, cutCounter);
-            break;
+      switch (reqNum) {
+        case 1:
+          if (pdgGen == 11)
+            event.getByToken(gencutColl_fidWenu_token, cutCounter);
+          else
+            event.getByToken(gencutColl_fidGammaJet_token, cutCounter);
+          break;
+        case 2:
+          if (pdgGen == 11)
+            event.getByToken(gencutColl_fidZee_token, cutCounter);
+          else
+            event.getByToken(gencutColl_fidDiGamma_token, cutCounter);
+          break;
+        case 3:
+          event.getByToken(gencutColl_fidTripleEle_token, cutCounter);
+          break;
       }
     } else {
       event.getByToken(gencutColl_manualConf_token, cutCounter);
     }
     if (cutCounter->size() < (unsigned int)gencut_) {
-      //edm::LogWarning("EmDQM") << "Less than "<< gencut_ <<" gen particles with pdgId=" << pdgGen;
+      // edm::LogWarning("EmDQM") << "Less than "<< gencut_ <<" gen particles
+      // with pdgId=" << pdgGen;
       continue;
     }
 
     // fill L1 and HLT info
     // get objects possed by each filter
     edm::Handle<trigger::TriggerEventWithRefs> triggerObj;
-    event.getByToken(triggerObject_token,triggerObj);
-    if(!triggerObj.isValid()) {
+    event.getByToken(triggerObject_token, triggerObj);
+    if (!triggerObj.isValid()) {
       if (verbosity_ >= OUTPUT_WARNINGS)
-         edm::LogWarning("EmDQM") << "parameter triggerobject (" << triggerObject_ << ") does not corresond to a valid TriggerEventWithRefs product. Please check especially the process name (e.g. when running over reprocessed datasets)";
+        edm::LogWarning("EmDQM") << "parameter triggerobject (" << triggerObject_
+                                 << ") does not corresond to a valid TriggerEventWithRefs product. "
+                                    "Please check especially the process name (e.g. when running "
+                                    "over reprocessed datasets)";
       continue;
     }
 
@@ -783,8 +795,7 @@ EmDQM::analyze(const edm::Event & event , const edm::EventSetup& setup)
       //       uninterpretable results...
       if (!checkRecoParticlesRequirement(event))
         continue;
-    }
-    else { // MC
+    } else {  // MC
       // if no, throw event away
       if (!checkGeneratedParticlesRequirement(event))
         continue;
@@ -796,83 +807,95 @@ EmDQM::analyze(const edm::Event & event , const edm::EventSetup& setup)
     //  Fill the bin labeled "Total"                          //
     //   This will be the number of events looked at.         //
     ////////////////////////////////////////////////////////////
-    if (!mcMatchedOnly_) totals.at(vPos)->Fill(numOfHLTCollectionLabels+0.5);
-    totalmatchs.at(vPos)->Fill(numOfHLTCollectionLabels+0.5);
+    if (!mcMatchedOnly_)
+      totals.at(vPos)->Fill(numOfHLTCollectionLabels + 0.5);
+    totalmatchs.at(vPos)->Fill(numOfHLTCollectionLabels + 0.5);
 
     ////////////////////////////////////////////////////////////
     //               Fill generator info                      //
     ////////////////////////////////////////////////////////////
-    // the gencut_ highest Et generator objects of the preselected type are our matches
+    // the gencut_ highest Et generator objects of the preselected type are our
+    // matches
 
     std::vector<reco::Particle> sortedGen;
-    for(edm::View<reco::Candidate>::const_iterator genpart = cutCounter->begin(); genpart != cutCounter->end();genpart++){
-      reco::Particle tmpcand(  genpart->charge(), genpart->p4(), genpart->vertex(),genpart->pdgId(),genpart->status() );
+    for (edm::View<reco::Candidate>::const_iterator genpart = cutCounter->begin(); genpart != cutCounter->end();
+         genpart++) {
+      reco::Particle tmpcand(genpart->charge(), genpart->p4(), genpart->vertex(), genpart->pdgId(), genpart->status());
       if (tmpcand.et() >= plotEtMin) {
         sortedGen.push_back(tmpcand);
       }
     }
-    std::sort(sortedGen.begin(),sortedGen.end(),pTComparator_ );
+    std::sort(sortedGen.begin(), sortedGen.end(), pTComparator_);
 
     // Now the collection of gen particles is sorted by pt.
-    // So, remove all particles from the collection so that we 
+    // So, remove all particles from the collection so that we
     // only have the top "1 thru gencut_" particles in it
-    if (sortedGen.size() < gencut_){
+    if (sortedGen.size() < gencut_) {
       continue;
     }
-    sortedGen.erase(sortedGen.begin()+gencut_,sortedGen.end());
+    sortedGen.erase(sortedGen.begin() + gencut_, sortedGen.end());
 
-    for (unsigned int i = 0 ; i < gencut_ ; i++ ) {
-      etgens.at(vPos)->Fill( sortedGen[i].et()  ); //validity has been implicitily checked by the cut on gencut_ above
+    for (unsigned int i = 0; i < gencut_; i++) {
+      etgens.at(vPos)->Fill(sortedGen[i].et());  // validity has been implicitily checked by the
+                                                 // cut on gencut_ above
       if (sortedGen[i].et() > minEtForEtaEffPlot_) {
-        etagens.at(vPos)->Fill( sortedGen[i].eta() );
-        if (!noPhiPlots_) phigens.at(vPos)->Fill( sortedGen[i].phi() );
-         etaphigens.at(vPos)->Fill( sortedGen[i].eta(),sortedGen[i].phi() );
+        etagens.at(vPos)->Fill(sortedGen[i].eta());
+        if (!noPhiPlots_)
+          phigens.at(vPos)->Fill(sortedGen[i].phi());
+        etaphigens.at(vPos)->Fill(sortedGen[i].eta(), sortedGen[i].phi());
       }
-    } // END of loop over Generated particles
-    if (gencut_ >= reqNum && !mcMatchedOnly_) totals.at(vPos)->Fill(numOfHLTCollectionLabels+1.5); // this isn't really needed anymore keep for backward comp.
-    if (gencut_ >= reqNum) totalmatchs.at(vPos)->Fill(numOfHLTCollectionLabels+1.5); // this isn't really needed anymore keep for backward comp.
-            
+    }  // END of loop over Generated particles
+    if (gencut_ >= reqNum && !mcMatchedOnly_)
+      totals.at(vPos)->Fill(numOfHLTCollectionLabels +
+                            1.5);  // this isn't really needed anymore keep for backward comp.
+    if (gencut_ >= reqNum)
+      totalmatchs.at(vPos)->Fill(numOfHLTCollectionLabels +
+                                 1.5);  // this isn't really needed anymore keep for backward comp.
+
     bool accepted = true;  // flags that the event has been accepted by all filters before
     edm::Handle<edm::TriggerResults> hltResults;
     event.getByToken(hltResults_token, hltResults);
     ////////////////////////////////////////////////////////////
     //            Loop over filter modules                    //
     ////////////////////////////////////////////////////////////
-    for(unsigned int n=0; n < numOfHLTCollectionLabels ; n++) {
-      // check that there are not less sortedGen particles than nCandCut requires for this filter
+    for (unsigned int n = 0; n < numOfHLTCollectionLabels; n++) {
+      // check that there are not less sortedGen particles than nCandCut
+      // requires for this filter
       if (sortedGen.size() < nCandCuts.at(n)) {
-         if (verbosity_ >= OUTPUT_ERRORS)
-            edm::LogError("EmDQM") << "There are less generated particles than the module '" << theHLTCollectionLabels[n].label() << "' requires.";
-         continue;
+        if (verbosity_ >= OUTPUT_ERRORS)
+          edm::LogError("EmDQM") << "There are less generated particles than the module '"
+                                 << theHLTCollectionLabels[n].label() << "' requires.";
+        continue;
       }
       std::vector<reco::Particle> sortedGenForFilter(sortedGen);
       sortedGenForFilter.erase(sortedGenForFilter.begin() + nCandCuts.at(n), sortedGenForFilter.end());
 
       // Fill only if this filter was run.
-      if (pathIndex != 0 && hltConfig_.moduleIndex(pathIndex, theHLTCollectionLabels[n].label()) > hltResults->index(pathIndex)) break;
+      if (pathIndex != 0 &&
+          hltConfig_.moduleIndex(pathIndex, theHLTCollectionLabels[n].label()) > hltResults->index(pathIndex))
+        break;
       // These numbers are from the Parameter Set, such as:
       //   theHLTOutputTypes = cms.uint32(100)
-      switch(theHLTOutputTypes[n]) 
-      {
-        case trigger::TriggerL1NoIsoEG: // Non-isolated Level 1
-          histoFillerL1NonIso->fillHistos(triggerObj,event,vPos,n,sortedGenForFilter,accepted);
+      switch (theHLTOutputTypes[n]) {
+        case trigger::TriggerL1NoIsoEG:  // Non-isolated Level 1
+          histoFillerL1NonIso->fillHistos(triggerObj, event, vPos, n, sortedGenForFilter, accepted);
           break;
-        case trigger::TriggerL1IsoEG: // Isolated Level 1
-          histoFillerL1Iso->fillHistos(triggerObj,event,vPos,n,sortedGenForFilter,accepted);
+        case trigger::TriggerL1IsoEG:  // Isolated Level 1
+          histoFillerL1Iso->fillHistos(triggerObj, event, vPos, n, sortedGenForFilter, accepted);
           break;
-        case trigger::TriggerPhoton: // Photon 
-          histoFillerPho->fillHistos(triggerObj,event,vPos,n,sortedGenForFilter,accepted);
+        case trigger::TriggerPhoton:  // Photon
+          histoFillerPho->fillHistos(triggerObj, event, vPos, n, sortedGenForFilter, accepted);
           break;
-        case trigger::TriggerElectron: // Electron 
-          histoFillerEle->fillHistos(triggerObj,event,vPos,n,sortedGenForFilter,accepted);
+        case trigger::TriggerElectron:  // Electron
+          histoFillerEle->fillHistos(triggerObj, event, vPos, n, sortedGenForFilter, accepted);
           break;
-        case trigger::TriggerCluster: // TriggerCluster
-          histoFillerClu->fillHistos(triggerObj,event,vPos,n,sortedGenForFilter,accepted);
+        case trigger::TriggerCluster:  // TriggerCluster
+          histoFillerClu->fillHistos(triggerObj, event, vPos, n, sortedGenForFilter, accepted);
           break;
-        default: 
-          throw(cms::Exception("Release Validation Error") << "HLT output type not implemented: theHLTOutputTypes[n]" );
+        default:
+          throw(cms::Exception("Release Validation Error") << "HLT output type not implemented: theHLTOutputTypes[n]");
       }
-    } // END of loop over filter modules
+    }  // END of loop over filter modules
 
     // earse the dummy and fill with real set
     hltCollectionLabelsFoundPerPath.at(vPos) = hltCollectionLabelsFound;
@@ -884,10 +907,15 @@ EmDQM::analyze(const edm::Event & event , const edm::EventSetup& setup)
 // fillHistos                                                                 //
 //   Called by analyze method.                                                //
 ////////////////////////////////////////////////////////////////////////////////
-template <class T> void HistoFiller<T>::fillHistos(edm::Handle<trigger::TriggerEventWithRefs>& triggerObj,const edm::Event& iEvent ,unsigned int vPos, unsigned int n,std::vector<reco::Particle>& sortedGen, bool &accepted)
-{
-  std::vector<edm::Ref<T> > recoecalcands;
-  if ( ( triggerObj->filterIndex(dqm->theHLTCollectionLabels[n])>=triggerObj->size() )){ // only process if available
+template <class T>
+void HistoFiller<T>::fillHistos(edm::Handle<trigger::TriggerEventWithRefs> &triggerObj,
+                                const edm::Event &iEvent,
+                                unsigned int vPos,
+                                unsigned int n,
+                                std::vector<reco::Particle> &sortedGen,
+                                bool &accepted) {
+  std::vector<edm::Ref<T>> recoecalcands;
+  if ((triggerObj->filterIndex(dqm->theHLTCollectionLabels[n]) >= triggerObj->size())) {  // only process if available
     dqm->hltCollectionLabelsMissed.insert(dqm->theHLTCollectionLabels[n].encode());
     accepted = false;
     return;
@@ -898,37 +926,40 @@ template <class T> void HistoFiller<T>::fillHistos(edm::Handle<trigger::TriggerE
   ////////////////////////////////////////////////////////////
   //      Retrieve saved filter objects                     //
   ////////////////////////////////////////////////////////////
-  triggerObj->getObjects(triggerObj->filterIndex(dqm->theHLTCollectionLabels[n]),dqm->theHLTOutputTypes[n],recoecalcands);
-  //Danger: special case, L1 non-isolated
+  triggerObj->getObjects(
+      triggerObj->filterIndex(dqm->theHLTCollectionLabels[n]), dqm->theHLTOutputTypes[n], recoecalcands);
+  // Danger: special case, L1 non-isolated
   // needs to be merged with L1 iso
-  if (dqm->theHLTOutputTypes[n] == trigger::TriggerL1NoIsoEG){
-    std::vector<edm::Ref<T> > isocands;
-    triggerObj->getObjects(triggerObj->filterIndex(dqm->theHLTCollectionLabels[n]),trigger::TriggerL1IsoEG,isocands);
-    if (!isocands.empty()) 
-      {
-        for (unsigned int i=0; i < isocands.size(); i++)
-          recoecalcands.push_back(isocands[i]);
-      }
-  } // END of if theHLTOutputTypes == 82
-  
+  if (dqm->theHLTOutputTypes[n] == trigger::TriggerL1NoIsoEG) {
+    std::vector<edm::Ref<T>> isocands;
+    triggerObj->getObjects(triggerObj->filterIndex(dqm->theHLTCollectionLabels[n]), trigger::TriggerL1IsoEG, isocands);
+    if (!isocands.empty()) {
+      for (unsigned int i = 0; i < isocands.size(); i++)
+        recoecalcands.push_back(isocands[i]);
+    }
+  }  // END of if theHLTOutputTypes == 82
 
-  if (recoecalcands.empty()){ // stop if no object passed the previous filter
+  if (recoecalcands.empty()) {  // stop if no object passed the previous filter
     accepted = false;
     return;
   }
 
-  //if (recoecalcands.size() >= reqNum ) 
-  if (recoecalcands.size() >= dqm->nCandCuts.at(n) && !dqm->mcMatchedOnly_) 
-    dqm->totals.at(vPos)->Fill(n+0.5);
+  // if (recoecalcands.size() >= reqNum )
+  if (recoecalcands.size() >= dqm->nCandCuts.at(n) && !dqm->mcMatchedOnly_)
+    dqm->totals.at(vPos)->Fill(n + 0.5);
 
   ///////////////////////////////////////////////////
   // check for validity                            //
   // prevents crash in CMSSW_3_1_0_pre6            //
   ///////////////////////////////////////////////////
-  for (unsigned int j=0; j<recoecalcands.size(); j++){
-    if(!( recoecalcands.at(j).isAvailable())){
+  for (unsigned int j = 0; j < recoecalcands.size(); j++) {
+    if (!(recoecalcands.at(j).isAvailable())) {
       if (dqm->verbosity_ >= dqm->OUTPUT_ERRORS)
-         edm::LogError("EmDQMInvalidRefs") << "Event content inconsistent: TriggerEventWithRefs contains invalid Refs. Invalid refs for: " << dqm->theHLTCollectionLabels[n].label() << ". The collection that this module uses may has been dropped in the event.";
+        edm::LogError("EmDQMInvalidRefs") << "Event content inconsistent: TriggerEventWithRefs contains "
+                                             "invalid Refs. Invalid refs for: "
+                                          << dqm->theHLTCollectionLabels[n].label()
+                                          << ". The collection that this module uses may has been dropped in "
+                                             "the event.";
       return;
     }
   }
@@ -938,14 +969,14 @@ template <class T> void HistoFiller<T>::fillHistos(edm::Handle<trigger::TriggerE
     // Loop over the Generated Particles, and find the        //
     // closest HLT object match.                              //
     ////////////////////////////////////////////////////////////
-    //for (unsigned int i=0; i < gencut_; i++) {
-    for (unsigned int i=0; i < dqm->nCandCuts.at(n); i++) {
+    // for (unsigned int i=0; i < gencut_; i++) {
+    for (unsigned int i = 0; i < dqm->nCandCuts.at(n); i++) {
       math::XYZVector currentGenParticleMomentum = sortedGen[i].momentum();
 
       float closestDeltaR = 0.5;
       int closestEcalCandIndex = -1;
-      for (unsigned int j=0; j<recoecalcands.size(); j++) {
-        float deltaR = DeltaR(recoecalcands[j]->momentum(),currentGenParticleMomentum);
+      for (unsigned int j = 0; j < recoecalcands.size(); j++) {
+        float deltaR = DeltaR(recoecalcands[j]->momentum(), currentGenParticleMomentum);
 
         if (deltaR < closestDeltaR) {
           closestDeltaR = deltaR;
@@ -955,12 +986,14 @@ template <class T> void HistoFiller<T>::fillHistos(edm::Handle<trigger::TriggerE
 
       // If an HLT object was found within some delta-R
       // of this gen particle, store it in a histogram
-      if ( closestEcalCandIndex >= 0 ) {
-        dqm->histEtOfHltObjMatchToGens.at(vPos).at(n)->Fill( recoecalcands[closestEcalCandIndex]->et()  );
-        dqm->histEtaOfHltObjMatchToGens.at(vPos).at(n)->Fill( recoecalcands[closestEcalCandIndex]->eta() );
-        if (!dqm->noPhiPlots_) dqm->histPhiOfHltObjMatchToGens.at(vPos).at(n)->Fill( recoecalcands[closestEcalCandIndex]->phi() );
-       dqm->histEtaPhiOfHltObjMatchToGens.at(vPos).at(n)->Fill( recoecalcands[closestEcalCandIndex]->eta(),recoecalcands[closestEcalCandIndex]->phi());  
-      } // END of if closestEcalCandIndex >= 0
+      if (closestEcalCandIndex >= 0) {
+        dqm->histEtOfHltObjMatchToGens.at(vPos).at(n)->Fill(recoecalcands[closestEcalCandIndex]->et());
+        dqm->histEtaOfHltObjMatchToGens.at(vPos).at(n)->Fill(recoecalcands[closestEcalCandIndex]->eta());
+        if (!dqm->noPhiPlots_)
+          dqm->histPhiOfHltObjMatchToGens.at(vPos).at(n)->Fill(recoecalcands[closestEcalCandIndex]->phi());
+        dqm->histEtaPhiOfHltObjMatchToGens.at(vPos).at(n)->Fill(recoecalcands[closestEcalCandIndex]->eta(),
+                                                                recoecalcands[closestEcalCandIndex]->phi());
+      }  // END of if closestEcalCandIndex >= 0
     }
 
     ////////////////////////////////////////////////////////////
@@ -969,28 +1002,31 @@ template <class T> void HistoFiller<T>::fillHistos(edm::Handle<trigger::TriggerE
     ////////////////////////////////////////////////////////////
     //  bool foundAllMatches = false;
     //  unsigned int numOfHLTobjectsMatched = 0;
-    for (unsigned int i=0; i<recoecalcands.size(); i++) {
+    for (unsigned int i = 0; i < recoecalcands.size(); i++) {
       //// See if this HLT object has a gen-level match
-      //float closestGenParticleDr = 99.0;
-      //for(unsigned int j =0; j < gencut_; j++) {
+      // float closestGenParticleDr = 99.0;
+      // for(unsigned int j =0; j < gencut_; j++) {
       //  math::XYZVector currentGenParticle = sortedGen[j].momentum();
 
-      //  double currentDeltaR = DeltaR(recoecalcands[i]->momentum(),currentGenParticle);
-      //  if ( currentDeltaR < closestGenParticleDr ) {
+      //  double currentDeltaR =
+      //  DeltaR(recoecalcands[i]->momentum(),currentGenParticle); if (
+      //  currentDeltaR < closestGenParticleDr ) {
       //    closestGenParticleDr = currentDeltaR;
       //  }
       //}
-      //// If this HLT object did not have a gen particle match, go to next HLT object
-      //if ( !(fabs(closestGenParticleDr < 0.3)) ) continue;
-   
-      //numOfHLTobjectsMatched++;
-      //if (numOfHLTobjectsMatched >= gencut_) foundAllMatches=true;
+      //// If this HLT object did not have a gen particle match, go to next HLT
+      /// object
+      // if ( !(fabs(closestGenParticleDr < 0.3)) ) continue;
+
+      // numOfHLTobjectsMatched++;
+      // if (numOfHLTobjectsMatched >= gencut_) foundAllMatches=true;
 
       // Fill HLT object histograms
-      dqm->ethists.at(vPos).at(n) ->Fill(recoecalcands[i]->et() );
-      dqm->etahists.at(vPos).at(n)->Fill(recoecalcands[i]->eta() );
-      if (!dqm->noPhiPlots_) dqm->phihists.at(vPos).at(n)->Fill(recoecalcands[i]->phi() );
-      dqm->etaphihists.at(vPos).at(n)->Fill(recoecalcands[i]->eta(),recoecalcands[i]->phi() );
+      dqm->ethists.at(vPos).at(n)->Fill(recoecalcands[i]->et());
+      dqm->etahists.at(vPos).at(n)->Fill(recoecalcands[i]->eta());
+      if (!dqm->noPhiPlots_)
+        dqm->phihists.at(vPos).at(n)->Fill(recoecalcands[i]->phi());
+      dqm->etaphihists.at(vPos).at(n)->Fill(recoecalcands[i]->eta(), recoecalcands[i]->phi());
     }
   }
 
@@ -998,249 +1034,249 @@ template <class T> void HistoFiller<T>::fillHistos(edm::Handle<trigger::TriggerE
   //        Fill mc matched objects into histograms         //
   ////////////////////////////////////////////////////////////
   unsigned int matchedMcParts = 0;
-  float mindist=0.3;
-  if(n==0) mindist=0.5; //low L1-resolution => allow wider matching 
-  for(unsigned int i =0; i < dqm->nCandCuts.at(n); ++i){
-    //match generator candidate
-    bool matchThis= false;
-    math::XYZVector candDir=sortedGen[i].momentum();
-    //unsigned int closest = 0;
+  float mindist = 0.3;
+  if (n == 0)
+    mindist = 0.5;  // low L1-resolution => allow wider matching
+  for (unsigned int i = 0; i < dqm->nCandCuts.at(n); ++i) {
+    // match generator candidate
+    bool matchThis = false;
+    math::XYZVector candDir = sortedGen[i].momentum();
+    // unsigned int closest = 0;
     double closestDr = 1000.;
-    for(unsigned int trigOb = 0 ; trigOb < recoecalcands.size(); ++trigOb){
-      double dr = DeltaR(recoecalcands[trigOb]->momentum(),candDir);
+    for (unsigned int trigOb = 0; trigOb < recoecalcands.size(); ++trigOb) {
+      double dr = DeltaR(recoecalcands[trigOb]->momentum(), candDir);
       if (dr < closestDr) {
         closestDr = dr;
-        //closest = trigOb;
+        // closest = trigOb;
       }
-      if (closestDr > mindist) { // it's not really a "match" if it's that far away
-        //closest = -1;
+      if (closestDr > mindist) {  // it's not really a "match" if it's that far away
+        // closest = -1;
       } else {
         matchedMcParts++;
         matchThis = true;
       }
     }
-    if ( !matchThis ) {
+    if (!matchThis) {
       accepted = false;
-      continue; // only plot matched candidates
+      continue;  // only plot matched candidates
     }
     // fill coordinates of mc particle matching trigger object
-    dqm->ethistmatchs.at(vPos).at(n) ->Fill( sortedGen[i].et()  );
+    dqm->ethistmatchs.at(vPos).at(n)->Fill(sortedGen[i].et());
     if (sortedGen[i].et() > dqm->minEtForEtaEffPlot_) {
-      dqm->etahistmatchs.at(vPos).at(n)->Fill( sortedGen[i].eta() );
-      if (!dqm->noPhiPlots_) dqm->phihistmatchs.at(vPos).at(n)->Fill( sortedGen[i].phi() );
-      dqm->etaphihistmatchs.at(vPos).at(n)->Fill( sortedGen[i].eta(),sortedGen[i].phi() ); 
+      dqm->etahistmatchs.at(vPos).at(n)->Fill(sortedGen[i].eta());
+      if (!dqm->noPhiPlots_)
+        dqm->phihistmatchs.at(vPos).at(n)->Fill(sortedGen[i].phi());
+      dqm->etaphihistmatchs.at(vPos).at(n)->Fill(sortedGen[i].eta(), sortedGen[i].phi());
     }
   }
   // fill total mc matched efficiency
 
   if (matchedMcParts >= dqm->nCandCuts.at(n) && accepted == true)
-    dqm->totalmatchs.at(vPos)->Fill(n+0.5);
+    dqm->totalmatchs.at(vPos)->Fill(n + 0.5);
 }
 
-void 
-EmDQM::endRun(edm::Run const &iRun, edm::EventSetup const &iSetup)
-{
-   // loop over all the trigger path parameter sets
-   unsigned int vPos = 0;
-   for (std::vector<edm::ParameterSet>::iterator psetIt = paramSets.begin(); psetIt != paramSets.end(); ++psetIt, ++vPos) {
-      SetVarsFromPSet(psetIt);
-
-      // print information about hltCollectionLabels which were not found
-      // (but only those which were never found)
-
-      // check which ones were never found
-      std::vector<std::string> labelsNeverFound;
-      
-      for(edm::InputTag const& tag : hltCollectionLabelsMissedPerPath.at(vPos))
-      {
-        if ((hltCollectionLabelsFoundPerPath.at(vPos)).count(tag.encode()) == 0)
-          // never found
-          labelsNeverFound.push_back(tag.encode());
-
-      } // loop over all tags which were missed at least once
-
-      if (labelsNeverFound.empty())
-        continue;
+void EmDQM::endRun(edm::Run const &iRun, edm::EventSetup const &iSetup) {
+  // loop over all the trigger path parameter sets
+  unsigned int vPos = 0;
+  for (std::vector<edm::ParameterSet>::iterator psetIt = paramSets.begin(); psetIt != paramSets.end();
+       ++psetIt, ++vPos) {
+    SetVarsFromPSet(psetIt);
 
-      std::sort(labelsNeverFound.begin(), labelsNeverFound.end());
+    // print information about hltCollectionLabels which were not found
+    // (but only those which were never found)
 
-      // there was at least one label which was never found
-      // (note that this could also be because the corresponding
-      // trigger path slowly fades out to zero efficiency)
-      if (verbosity_ >= OUTPUT_WARNINGS)
-         edm::LogWarning("EmDQM") << "There were some HLTCollectionLabels which were never found:";
+    // check which ones were never found
+    std::vector<std::string> labelsNeverFound;
 
-      for(auto const& tag : labelsNeverFound)
-      {
-        if (verbosity_ >= OUTPUT_ALL)
-           edm::LogPrint("EmDQM") << "  " << tag;
-      }
-   }
+    for (edm::InputTag const &tag : hltCollectionLabelsMissedPerPath.at(vPos)) {
+      if ((hltCollectionLabelsFoundPerPath.at(vPos)).count(tag.encode()) == 0)
+        // never found
+        labelsNeverFound.push_back(tag.encode());
+
+    }  // loop over all tags which were missed at least once
+
+    if (labelsNeverFound.empty())
+      continue;
+
+    std::sort(labelsNeverFound.begin(), labelsNeverFound.end());
+
+    // there was at least one label which was never found
+    // (note that this could also be because the corresponding
+    // trigger path slowly fades out to zero efficiency)
+    if (verbosity_ >= OUTPUT_WARNINGS)
+      edm::LogWarning("EmDQM") << "There were some HLTCollectionLabels which were never found:";
+
+    for (auto const &tag : labelsNeverFound) {
+      if (verbosity_ >= OUTPUT_ALL)
+        edm::LogPrint("EmDQM") << "  " << tag;
+    }
+  }
 }
 
 // returns count of non-overlapping occurrences of 'sub' in 'str'
-int 
-EmDQM::countSubstring(const std::string& str, const std::string& sub)
-{
-    if (sub.length() == 0) return 0;
-    int count = 0;
-    for (size_t offset = str.find(sub); offset != std::string::npos;
-	 offset = str.find(sub, offset + sub.length()))
-    {
-        ++count;
-    }
-    return count;
+int EmDQM::countSubstring(const std::string &str, const std::string &sub) {
+  if (sub.length() == 0)
+    return 0;
+  int count = 0;
+  for (size_t offset = str.find(sub); offset != std::string::npos; offset = str.find(sub, offset + sub.length())) {
+    ++count;
+  }
+  return count;
 }
 
 //----------------------------------------------------------------------
 // find egamma trigger paths from trigger name
-std::vector<std::vector<std::string> >
-EmDQM::findEgammaPaths()
-{
-   std::vector<std::vector<std::string> > Paths(5);
-   // Loop over all paths in the menu
-   for (unsigned int i=0; i<hltConfig_.size(); i++) {
-
-      std::string path = hltConfig_.triggerName(i);
-
-      // Find electron and photon paths and classify them
-      if (int(path.find("HLT_")) == 0) {    // Path should start with 'HLT_'
-
-         int scCount = countSubstring(path, "_SC");
-         int eleCount = countSubstring(path, "Ele");
-         int doubleEleCount = countSubstring(path, "DoubleEle");
-         int doubleSCCount = countSubstring(path, "DiSC");
-         int tripleEleCount = countSubstring(path, "TripleEle");
-         int photonCount = countSubstring(path, "hoton");
-         int doublePhotonCount = countSubstring(path, "DoublePhoton") + countSubstring(path, "Diphoton");
-
-         int totEleCount = 2*tripleEleCount + doubleEleCount + eleCount + scCount + 2*doubleSCCount;
-         int totPhotonCount = doublePhotonCount + photonCount;
-
-         if (totEleCount + totPhotonCount < 1) continue;
-         switch (totEleCount) {
-            case 1:
-               Paths[TYPE_SINGLE_ELE].push_back(path);
-               //std::cout << "Electron \t" << path << std::endl;
-               break;
-            case 2:
-               Paths[TYPE_DOUBLE_ELE].push_back(path);
-               //std::cout << "DoubleElectron \t" << path << std::endl;
-               break;
-            case 3:
-               Paths[TYPE_TRIPLE_ELE].push_back(path);
-               //std::cout << "TripleElectron \t" << path << std::endl;
-               break;
-         }
-
-         switch (totPhotonCount) {
-            case 1:
-               Paths[TYPE_SINGLE_PHOTON].push_back(path);
-               //std::cout << "Photon \t\t" << path << std::endl;
-               break;
-            case 2:
-               Paths[TYPE_DOUBLE_PHOTON].push_back(path);
-               //std::cout << "DoublePhoton \t" << path << std::endl;
-               break;
-         }
+std::vector<std::vector<std::string>> EmDQM::findEgammaPaths() {
+  std::vector<std::vector<std::string>> Paths(5);
+  // Loop over all paths in the menu
+  for (unsigned int i = 0; i < hltConfig_.size(); i++) {
+    std::string path = hltConfig_.triggerName(i);
+
+    // Find electron and photon paths and classify them
+    if (int(path.find("HLT_")) == 0) {  // Path should start with 'HLT_'
+
+      int scCount = countSubstring(path, "_SC");
+      int eleCount = countSubstring(path, "Ele");
+      int doubleEleCount = countSubstring(path, "DoubleEle");
+      int doubleSCCount = countSubstring(path, "DiSC");
+      int tripleEleCount = countSubstring(path, "TripleEle");
+      int photonCount = countSubstring(path, "hoton");
+      int doublePhotonCount = countSubstring(path, "DoublePhoton") + countSubstring(path, "Diphoton");
+
+      int totEleCount = 2 * tripleEleCount + doubleEleCount + eleCount + scCount + 2 * doubleSCCount;
+      int totPhotonCount = doublePhotonCount + photonCount;
+
+      if (totEleCount + totPhotonCount < 1)
+        continue;
+      switch (totEleCount) {
+        case 1:
+          Paths[TYPE_SINGLE_ELE].push_back(path);
+          // std::cout << "Electron \t" << path << std::endl;
+          break;
+        case 2:
+          Paths[TYPE_DOUBLE_ELE].push_back(path);
+          // std::cout << "DoubleElectron \t" << path << std::endl;
+          break;
+        case 3:
+          Paths[TYPE_TRIPLE_ELE].push_back(path);
+          // std::cout << "TripleElectron \t" << path << std::endl;
+          break;
       }
-      //std::cout << i << " triggerName: " << path << " containing " << hltConfig_.size(i) << " modules."<< std::endl;
-   }
-   return Paths;
+
+      switch (totPhotonCount) {
+        case 1:
+          Paths[TYPE_SINGLE_PHOTON].push_back(path);
+          // std::cout << "Photon \t\t" << path << std::endl;
+          break;
+        case 2:
+          Paths[TYPE_DOUBLE_PHOTON].push_back(path);
+          // std::cout << "DoublePhoton \t" << path << std::endl;
+          break;
+      }
+    }
+    // std::cout << i << " triggerName: " << path << " containing " <<
+    // hltConfig_.size(i) << " modules."<< std::endl;
+  }
+  return Paths;
 }
 
 //----------------------------------------------------------------------
 // get the names of filters of a given path
-std::vector<std::string>
-EmDQM::getFilterModules(const std::string& path)
-{
-   std::vector<std::string> filters;
-
-   //std::cout << "Pathname: " << path << std::endl;
-
-   // Loop over all modules in the path
-   for (unsigned int i=0; i<hltConfig_.size(path); i++) {
-
-      std::string module = hltConfig_.moduleLabel(path, i);
-      std::string moduleType = hltConfig_.moduleType(module);
-      std::string moduleEDMType = hltConfig_.moduleEDMType(module);
-
-      // Find filters
-      if (moduleEDMType == "EDFilter" || moduleType.find("Filter") != std::string::npos) {  // older samples may not have EDMType data included
-         filters.push_back(module);
-         //std::cout << i << "    moduleLabel: " << module << "    moduleType: " << moduleType << "    moduleEDMType: " << moduleEDMType << std::endl;
-      }
-   }
-   return filters;
+std::vector<std::string> EmDQM::getFilterModules(const std::string &path) {
+  std::vector<std::string> filters;
+
+  // std::cout << "Pathname: " << path << std::endl;
+
+  // Loop over all modules in the path
+  for (unsigned int i = 0; i < hltConfig_.size(path); i++) {
+    std::string module = hltConfig_.moduleLabel(path, i);
+    std::string moduleType = hltConfig_.moduleType(module);
+    std::string moduleEDMType = hltConfig_.moduleEDMType(module);
+
+    // Find filters
+    if (moduleEDMType == "EDFilter" ||
+        moduleType.find("Filter") != std::string::npos) {  // older samples may not have EDMType data
+                                                           // included
+      filters.push_back(module);
+      // std::cout << i << "    moduleLabel: " << module << "    moduleType: "
+      // << moduleType << "    moduleEDMType: " << moduleEDMType << std::endl;
+    }
+  }
+  return filters;
 }
 
 //----------------------------------------------------------------------
 // get the primary Et cut from the trigger name
-double
-EmDQM::getPrimaryEtCut(const std::string& path)
-{
-   double minEt = -1;
+double EmDQM::getPrimaryEtCut(const std::string &path) {
+  double minEt = -1;
 
-   boost::regex reg("^HLT_.*?(Ele|hoton|EG|SC)([[:digit:]]+).*");
+  boost::regex reg("^HLT_.*?(Ele|hoton|EG|SC)([[:digit:]]+).*");
 
-   boost::smatch what;
-   if (boost::regex_match(path, what, reg, boost::match_extra))
-   {
-     minEt = boost::lexical_cast<double>(what[2]); 
-   }
+  boost::smatch what;
+  if (boost::regex_match(path, what, reg, boost::match_extra)) {
+    minEt = boost::lexical_cast<double>(what[2]);
+  }
 
-   return minEt;
+  return minEt;
 }
 
 //----------------------------------------------------------------------
 
-edm::ParameterSet 
-EmDQM::makePSetForL1SeedFilter(const std::string& moduleName)
-{
+edm::ParameterSet EmDQM::makePSetForL1SeedFilter(const std::string &moduleName) {
   // generates a PSet to analyze the behaviour of an L1 seed.
   //
   // moduleName is the name of the HLT module which filters
   // on the L1 seed.
   edm::ParameterSet retPSet;
-  
-  retPSet.addParameter<std::vector<double> >("PlotBounds", std::vector<double>(2, 0.0));
-  //retPSet.addParameter<edm::InputTag>("HLTCollectionLabels", edm::InputTag(moduleName, "", processName_));
+
+  retPSet.addParameter<std::vector<double>>("PlotBounds", std::vector<double>(2, 0.0));
+  // retPSet.addParameter<edm::InputTag>("HLTCollectionLabels",
+  // edm::InputTag(moduleName, "", processName_));
   retPSet.addParameter<edm::InputTag>("HLTCollectionLabels", edm::InputTag(moduleName, "", triggerObject_.process()));
-  retPSet.addParameter<std::vector<edm::InputTag> >("IsoCollections", std::vector<edm::InputTag>(1, std::string("none")));
+  retPSet.addParameter<std::vector<edm::InputTag>>("IsoCollections",
+                                                   std::vector<edm::InputTag>(1, std::string("none")));
   retPSet.addParameter<int>("theHLTOutputTypes", trigger::TriggerL1NoIsoEG);
-  
-  // as HLTLevel1GTSeed has no parameter ncandcut we determine the value from the name of the filter
+
+  // as HLTLevel1GTSeed has no parameter ncandcut we determine the value from
+  // the name of the filter
 
   int orCount = countSubstring(moduleName, "OR") + countSubstring(moduleName, "Or");
   int egCount = countSubstring(moduleName, "EG");
   int dEgCount = countSubstring(moduleName, "DoubleEG");
   int tEgCount = countSubstring(moduleName, "TripleEG");
 
-  int candCount = 2*tEgCount + dEgCount + egCount;
-  // if L1 is and OR of triggers try the assumption that all of them are similar first and if not take the lowest number. If this is not successful, let the path name decide
+  int candCount = 2 * tEgCount + dEgCount + egCount;
+  // if L1 is and OR of triggers try the assumption that all of them are similar
+  // first and if not take the lowest number. If this is not successful, let the
+  // path name decide
   if (orCount > 0 && candCount > 0) {
-     if (egCount % (orCount+1) == 0 && dEgCount % (orCount+1) == 0 && tEgCount % (orCount+1) == 0) candCount /= (orCount+1);
-     else if (egCount-dEgCount-tEgCount > 0) candCount = 1; // at least one singleEG present
-     else if (dEgCount > 0) candCount = 2; // at least one doubleEG and no singleEG present
-     else if (tEgCount > 0) candCount = 3; // only tripleEG present
-     else candCount = -1;
+    if (egCount % (orCount + 1) == 0 && dEgCount % (orCount + 1) == 0 && tEgCount % (orCount + 1) == 0)
+      candCount /= (orCount + 1);
+    else if (egCount - dEgCount - tEgCount > 0)
+      candCount = 1;  // at least one singleEG present
+    else if (dEgCount > 0)
+      candCount = 2;  // at least one doubleEG and no singleEG present
+    else if (tEgCount > 0)
+      candCount = 3;  // only tripleEG present
+    else
+      candCount = -1;
   }
 
   switch (candCount) {
-     case 0:
-        retPSet.addParameter<int>("ncandcut", 0);
-        break;
-     case 1:
-        retPSet.addParameter<int>("ncandcut", 1);
-        break;
-     case 2:
-        retPSet.addParameter<int>("ncandcut", 2);
-        break;
-     case 3:
-        retPSet.addParameter<int>("ncandcut", 3);
-        break;
-     default:
-        retPSet.addParameter<int>("ncandcut", -1);
+    case 0:
+      retPSet.addParameter<int>("ncandcut", 0);
+      break;
+    case 1:
+      retPSet.addParameter<int>("ncandcut", 1);
+      break;
+    case 2:
+      retPSet.addParameter<int>("ncandcut", 2);
+      break;
+    case 3:
+      retPSet.addParameter<int>("ncandcut", 3);
+      break;
+    default:
+      retPSet.addParameter<int>("ncandcut", -1);
   }
 
   return retPSet;
@@ -1248,20 +1284,21 @@ EmDQM::makePSetForL1SeedFilter(const std::string& moduleName)
 
 //----------------------------------------------------------------------
 
-edm::ParameterSet 
-EmDQM::makePSetForL1SeedToSuperClusterMatchFilter(const std::string& moduleName)
-{
-  // generates a PSet to analyze the behaviour of L1 to supercluster match filter.
+edm::ParameterSet EmDQM::makePSetForL1SeedToSuperClusterMatchFilter(const std::string &moduleName) {
+  // generates a PSet to analyze the behaviour of L1 to supercluster match
+  // filter.
   //
   // moduleName is the name of the HLT module which requires the match
   // between supercluster and L1 seed.
   //
   edm::ParameterSet retPSet;
-  
-  retPSet.addParameter<std::vector<double> >("PlotBounds", std::vector<double>(2, 0.0));
-  //retPSet.addParameter<edm::InputTag>("HLTCollectionLabels", edm::InputTag(moduleName, "", processName_));
+
+  retPSet.addParameter<std::vector<double>>("PlotBounds", std::vector<double>(2, 0.0));
+  // retPSet.addParameter<edm::InputTag>("HLTCollectionLabels",
+  // edm::InputTag(moduleName, "", processName_));
   retPSet.addParameter<edm::InputTag>("HLTCollectionLabels", edm::InputTag(moduleName, "", triggerObject_.process()));
-  retPSet.addParameter<std::vector<edm::InputTag> >("IsoCollections", std::vector<edm::InputTag>(1, std::string("none")));
+  retPSet.addParameter<std::vector<edm::InputTag>>("IsoCollections",
+                                                   std::vector<edm::InputTag>(1, std::string("none")));
   retPSet.addParameter<int>("theHLTOutputTypes", trigger::TriggerCluster);
   retPSet.addParameter<int>("ncandcut", hltConfig_.modulePSet(moduleName).getParameter<int>("ncandcut"));
 
@@ -1270,15 +1307,15 @@ EmDQM::makePSetForL1SeedToSuperClusterMatchFilter(const std::string& moduleName)
 
 //----------------------------------------------------------------------
 
-edm::ParameterSet 
-EmDQM::makePSetForEtFilter(const std::string& moduleName)
-{
+edm::ParameterSet EmDQM::makePSetForEtFilter(const std::string &moduleName) {
   edm::ParameterSet retPSet;
-  
-  retPSet.addParameter<std::vector<double> >("PlotBounds", std::vector<double>(2, 0.0));
-  //retPSet.addParameter<edm::InputTag>("HLTCollectionLabels", edm::InputTag(moduleName, "", processName_));
+
+  retPSet.addParameter<std::vector<double>>("PlotBounds", std::vector<double>(2, 0.0));
+  // retPSet.addParameter<edm::InputTag>("HLTCollectionLabels",
+  // edm::InputTag(moduleName, "", processName_));
   retPSet.addParameter<edm::InputTag>("HLTCollectionLabels", edm::InputTag(moduleName, "", triggerObject_.process()));
-  retPSet.addParameter<std::vector<edm::InputTag> >("IsoCollections", std::vector<edm::InputTag>(1, std::string("none")));
+  retPSet.addParameter<std::vector<edm::InputTag>>("IsoCollections",
+                                                   std::vector<edm::InputTag>(1, std::string("none")));
   retPSet.addParameter<int>("theHLTOutputTypes", trigger::TriggerCluster);
   retPSet.addParameter<int>("ncandcut", hltConfig_.modulePSet(moduleName).getParameter<int>("ncandcut"));
 
@@ -1287,15 +1324,15 @@ EmDQM::makePSetForEtFilter(const std::string& moduleName)
 
 //----------------------------------------------------------------------
 
-edm::ParameterSet 
-EmDQM::makePSetForOneOEMinusOneOPFilter(const std::string& moduleName)
-{
+edm::ParameterSet EmDQM::makePSetForOneOEMinusOneOPFilter(const std::string &moduleName) {
   edm::ParameterSet retPSet;
-  
-  retPSet.addParameter<std::vector<double> >("PlotBounds", std::vector<double>(2, 0.0));
-  //retPSet.addParameter<edm::InputTag>("HLTCollectionLabels", edm::InputTag(moduleName, "", processName_));
+
+  retPSet.addParameter<std::vector<double>>("PlotBounds", std::vector<double>(2, 0.0));
+  // retPSet.addParameter<edm::InputTag>("HLTCollectionLabels",
+  // edm::InputTag(moduleName, "", processName_));
   retPSet.addParameter<edm::InputTag>("HLTCollectionLabels", edm::InputTag(moduleName, "", triggerObject_.process()));
-  retPSet.addParameter<std::vector<edm::InputTag> >("IsoCollections", std::vector<edm::InputTag>(1, std::string("none")));
+  retPSet.addParameter<std::vector<edm::InputTag>>("IsoCollections",
+                                                   std::vector<edm::InputTag>(1, std::string("none")));
   retPSet.addParameter<int>("theHLTOutputTypes", trigger::TriggerElectron);
   retPSet.addParameter<int>("ncandcut", hltConfig_.modulePSet(moduleName).getParameter<int>("ncandcut"));
 
@@ -1304,15 +1341,15 @@ EmDQM::makePSetForOneOEMinusOneOPFilter(const std::string& moduleName)
 
 //----------------------------------------------------------------------
 
-edm::ParameterSet 
-EmDQM::makePSetForPixelMatchFilter(const std::string& moduleName)
-{
+edm::ParameterSet EmDQM::makePSetForPixelMatchFilter(const std::string &moduleName) {
   edm::ParameterSet retPSet;
- 
-  retPSet.addParameter<std::vector<double> >("PlotBounds", std::vector<double>(2, 0.0));
-  //retPSet.addParameter<edm::InputTag>("HLTCollectionLabels", edm::InputTag(moduleName, "", processName_));
+
+  retPSet.addParameter<std::vector<double>>("PlotBounds", std::vector<double>(2, 0.0));
+  // retPSet.addParameter<edm::InputTag>("HLTCollectionLabels",
+  // edm::InputTag(moduleName, "", processName_));
   retPSet.addParameter<edm::InputTag>("HLTCollectionLabels", edm::InputTag(moduleName, "", triggerObject_.process()));
-  retPSet.addParameter<std::vector<edm::InputTag> >("IsoCollections", std::vector<edm::InputTag>(1, std::string("none")));
+  retPSet.addParameter<std::vector<edm::InputTag>>("IsoCollections",
+                                                   std::vector<edm::InputTag>(1, std::string("none")));
   retPSet.addParameter<int>("theHLTOutputTypes", trigger::TriggerCluster);
   retPSet.addParameter<int>("ncandcut", hltConfig_.modulePSet(moduleName).getParameter<int>("ncandcut"));
 
@@ -1321,15 +1358,15 @@ EmDQM::makePSetForPixelMatchFilter(const std::string& moduleName)
 
 //----------------------------------------------------------------------
 
-edm::ParameterSet 
-EmDQM::makePSetForEgammaDoubleEtDeltaPhiFilter(const std::string& moduleName)
-{
+edm::ParameterSet EmDQM::makePSetForEgammaDoubleEtDeltaPhiFilter(const std::string &moduleName) {
   edm::ParameterSet retPSet;
- 
-  retPSet.addParameter<std::vector<double> >("PlotBounds", std::vector<double>(2, 0.0));
-  //retPSet.addParameter<edm::InputTag>("HLTCollectionLabels", edm::InputTag(moduleName, "", processName_));
+
+  retPSet.addParameter<std::vector<double>>("PlotBounds", std::vector<double>(2, 0.0));
+  // retPSet.addParameter<edm::InputTag>("HLTCollectionLabels",
+  // edm::InputTag(moduleName, "", processName_));
   retPSet.addParameter<edm::InputTag>("HLTCollectionLabels", edm::InputTag(moduleName, "", triggerObject_.process()));
-  retPSet.addParameter<std::vector<edm::InputTag> >("IsoCollections", std::vector<edm::InputTag>(1, std::string("none")));
+  retPSet.addParameter<std::vector<edm::InputTag>>("IsoCollections",
+                                                   std::vector<edm::InputTag>(1, std::string("none")));
   retPSet.addParameter<int>("theHLTOutputTypes", trigger::TriggerCluster);
   retPSet.addParameter<int>("ncandcut", 2);
 
@@ -1338,191 +1375,221 @@ EmDQM::makePSetForEgammaDoubleEtDeltaPhiFilter(const std::string& moduleName)
 
 //----------------------------------------------------------------------
 
-edm::ParameterSet 
-EmDQM::makePSetForEgammaGenericFilter(const std::string& moduleName)
-{
+edm::ParameterSet EmDQM::makePSetForEgammaGenericFilter(const std::string &moduleName) {
   edm::ParameterSet retPSet;
 
   // example usages of HLTEgammaGenericFilter are:
-  //   R9 shape filter                        hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolR9ShapeFilter 
-  //   cluster shape filter                   hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolClusterShapeFilter 
-  //   Ecal isolation filter                  hltL1NonIsoHLTNonIsoSingleElectronEt17TIghterEleIdIsolEcalIsolFilter
-  //   H/E filter                             hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolHEFilter
-  //   HCAL isolation filter                  hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolHcalIsolFilter
+  //   R9 shape filter
+  //   hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolR9ShapeFilter
+  //   cluster shape filter
+  //   hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolClusterShapeFilter
+  //   Ecal isolation filter
+  //   hltL1NonIsoHLTNonIsoSingleElectronEt17TIghterEleIdIsolEcalIsolFilter H/E
+  //   filter hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolHEFilter
+  //   HCAL isolation filter
+  //   hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolHcalIsolFilter
 
   // infer the type of filter by the type of the producer which
   // generates the collection used to cut on this
   edm::InputTag varTag = hltConfig_.modulePSet(moduleName).getParameter<edm::InputTag>("varTag");
-  //edm::InputTag nonIsoTag = hltConfig_.modulePSet(moduleName).getParameter<edm::InputTag>("");
-  //std::cout << "varTag.label " << varTag.label() << " nonIsoTag.label " << nonIsoTag.label() << std::endl;
+  // edm::InputTag nonIsoTag =
+  // hltConfig_.modulePSet(moduleName).getParameter<edm::InputTag>("");
+  // std::cout
+  // << "varTag.label " << varTag.label() << " nonIsoTag.label " <<
+  // nonIsoTag.label() << std::endl;
 
   std::string inputType = hltConfig_.moduleType(varTag.label());
-  //std::cout << "inputType " << inputType << " moduleName " << moduleName << std::endl;
+  // std::cout << "inputType " << inputType << " moduleName " << moduleName <<
+  // std::endl;
 
   //--------------------
   // sanity check: non-isolated path should be produced by the
   // same type of module
 
   // first check that the non-iso tag is non-empty
-  //if (nonIsoTag.label().empty()) {
-  //  edm::LogError("EmDQM") << "nonIsoTag of HLTEgammaGenericFilter '" << moduleName <<  "' is empty.";
-  //  return retPSet;
+  // if (nonIsoTag.label().empty()) {
+  //  edm::LogError("EmDQM") << "nonIsoTag of HLTEgammaGenericFilter '" <<
+  //  moduleName <<  "' is empty."; return retPSet;
   //}
-  //if (inputType != hltConfig_.moduleType(nonIsoTag.label())) {
-  //  edm::LogError("EmDQM") << "C++ Type of varTag '" << inputType << "' and nonIsoTag '" << hltConfig_.moduleType(nonIsoTag.label()) << "' are not the same for HLTEgammaGenericFilter '" << moduleName <<  "'.";
-  //  return retPSet;
+  // if (inputType != hltConfig_.moduleType(nonIsoTag.label())) {
+  //  edm::LogError("EmDQM") << "C++ Type of varTag '" << inputType << "' and
+  //  nonIsoTag '" << hltConfig_.moduleType(nonIsoTag.label()) << "' are not the
+  //  same for HLTEgammaGenericFilter '" << moduleName <<  "'."; return retPSet;
   //}
   //--------------------
 
   // parameter saveTag determines the output type
   if (hltConfig_.saveTags(moduleName))
-     retPSet.addParameter<int>("theHLTOutputTypes", trigger::TriggerPhoton);  
+    retPSet.addParameter<int>("theHLTOutputTypes", trigger::TriggerPhoton);
   else
-     retPSet.addParameter<int>("theHLTOutputTypes", trigger::TriggerCluster);
+    retPSet.addParameter<int>("theHLTOutputTypes", trigger::TriggerCluster);
 
   std::vector<edm::InputTag> isoCollections;
   isoCollections.push_back(varTag);
-  //if (!nonIsoTag.label().empty())
+  // if (!nonIsoTag.label().empty())
   //   isoCollections.push_back(nonIsoTag);
 
   //--------------------
   // the following cases seem to have identical PSets ?
   //--------------------
 
-  if (inputType == "EgammaHLTR9Producer" ||                       // R9 shape
-      inputType == "EgammaHLTR9IDProducer" ||                     // R9 ID
-      inputType == "EgammaHLTClusterShapeProducer" ||             // cluster shape
-      inputType == "EgammaHLTEcalRecIsolationProducer" ||         // ecal isolation
-      inputType == "EgammaHLTHcalIsolationProducersRegional" ||   // HCAL isolation and HE
-      inputType == "EgammaHLTGsfTrackVarProducer" ||              // GSF track deta and dphi filter
-      inputType == "EgammaHLTBcHcalIsolationProducersRegional" || // HCAL isolation and HE
-      inputType == "EgammaHLTEcalPFClusterIsolationProducer" ||   // ECAL PF isolation filter
-      inputType == "EgammaHLTHcalPFClusterIsolationProducer" ||   // HCAL PF isolation filter
-      inputType == "EgammaHLTElectronTrackIsolationProducers"     // Track isolation filter
-     ) {
-    retPSet.addParameter<std::vector<double> >("PlotBounds", std::vector<double>(2, 0.0));
-    //retPSet.addParameter<edm::InputTag>("HLTCollectionLabels", edm::InputTag(moduleName, "", processName_));
+  if (inputType == "EgammaHLTR9Producer" ||                        // R9 shape
+      inputType == "EgammaHLTR9IDProducer" ||                      // R9 ID
+      inputType == "EgammaHLTClusterShapeProducer" ||              // cluster shape
+      inputType == "EgammaHLTEcalRecIsolationProducer" ||          // ecal isolation
+      inputType == "EgammaHLTHcalIsolationProducersRegional" ||    // HCAL isolation and HE
+      inputType == "EgammaHLTGsfTrackVarProducer" ||               // GSF track deta and dphi filter
+      inputType == "EgammaHLTBcHcalIsolationProducersRegional" ||  // HCAL isolation and
+                                                                   // HE
+      inputType == "EgammaHLTEcalPFClusterIsolationProducer" ||    // ECAL PF isolation
+                                                                   // filter
+      inputType == "EgammaHLTHcalPFClusterIsolationProducer" ||    // HCAL PF isolation
+                                                                   // filter
+      inputType == "EgammaHLTElectronTrackIsolationProducers"      // Track isolation filter
+  ) {
+    retPSet.addParameter<std::vector<double>>("PlotBounds", std::vector<double>(2, 0.0));
+    // retPSet.addParameter<edm::InputTag>("HLTCollectionLabels",
+    // edm::InputTag(moduleName, "", processName_));
     retPSet.addParameter<edm::InputTag>("HLTCollectionLabels", edm::InputTag(moduleName, "", triggerObject_.process()));
-    retPSet.addParameter<std::vector<edm::InputTag> >("IsoCollections", isoCollections);
+    retPSet.addParameter<std::vector<edm::InputTag>>("IsoCollections", isoCollections);
     retPSet.addParameter<int>("ncandcut", hltConfig_.modulePSet(moduleName).getParameter<int>("ncandcut"));
 
     return retPSet;
   }
 
   if (verbosity_ >= OUTPUT_ERRORS)
-     edm::LogError("EmDQM") << "Can't determine what the HLTEgammaGenericFilter '" << moduleName <<  "' should do: uses a collection produced by a module of C++ type '" << inputType << "'.";
+    edm::LogError("EmDQM") << "Can't determine what the HLTEgammaGenericFilter '" << moduleName
+                           << "' should do: uses a collection produced by a module of C++ type '" << inputType << "'.";
   return edm::ParameterSet();
 }
 
 //----------------------------------------------------------------------
 
-edm::ParameterSet 
-EmDQM::makePSetForEgammaGenericQuadraticFilter(const std::string& moduleName)
-{
+edm::ParameterSet EmDQM::makePSetForEgammaGenericQuadraticFilter(const std::string &moduleName) {
   edm::ParameterSet retPSet;
 
   // example usages of HLTEgammaGenericFilter are:
-  //   R9 shape filter                        hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolR9ShapeFilter 
-  //   cluster shape filter                   hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolClusterShapeFilter 
-  //   Ecal isolation filter                  hltL1NonIsoHLTNonIsoSingleElectronEt17TIghterEleIdIsolEcalIsolFilter
-  //   H/E filter                             hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolHEFilter
-  //   HCAL isolation filter                  hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolHcalIsolFilter
+  //   R9 shape filter
+  //   hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolR9ShapeFilter
+  //   cluster shape filter
+  //   hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolClusterShapeFilter
+  //   Ecal isolation filter
+  //   hltL1NonIsoHLTNonIsoSingleElectronEt17TIghterEleIdIsolEcalIsolFilter H/E
+  //   filter hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolHEFilter
+  //   HCAL isolation filter
+  //   hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolHcalIsolFilter
 
   // infer the type of filter by the type of the producer which
   // generates the collection used to cut on this
   edm::InputTag varTag = hltConfig_.modulePSet(moduleName).getParameter<edm::InputTag>("varTag");
-  //edm::InputTag nonIsoTag = hltConfig_.modulePSet(moduleName).getParameter<edm::InputTag>("nonIsoTag");
-  //std::cout << "varTag.label " << varTag.label() << " nonIsoTag.label " << nonIsoTag.label() << std::endl;
+  // edm::InputTag nonIsoTag =
+  // hltConfig_.modulePSet(moduleName).getParameter<edm::InputTag>("nonIsoTag");
+  // std::cout << "varTag.label " << varTag.label() << " nonIsoTag.label " <<
+  // nonIsoTag.label() << std::endl;
 
   std::string inputType = hltConfig_.moduleType(varTag.label());
-  //std::cout << "inputType " << inputType << " moduleName " << moduleName << std::endl;
+  // std::cout << "inputType " << inputType << " moduleName " << moduleName <<
+  // std::endl;
 
   //--------------------
   // sanity check: non-isolated path should be produced by the
   // same type of module
 
   // first check that the non-iso tag is non-empty
-  //if (nonIsoTag.label().empty()) {
-  //  edm::LogError("EmDQM") << "nonIsoTag of HLTEgammaGenericFilter '" << moduleName <<  "' is empty.";
-  //  return retPSet;
+  // if (nonIsoTag.label().empty()) {
+  //  edm::LogError("EmDQM") << "nonIsoTag of HLTEgammaGenericFilter '" <<
+  //  moduleName <<  "' is empty."; return retPSet;
   //}
-  //if (inputType != hltConfig_.moduleType(nonIsoTag.label())) {
-  //  edm::LogError("EmDQM") << "C++ Type of varTag '" << inputType << "' and nonIsoTag '" << hltConfig_.moduleType(nonIsoTag.label()) << "' are not the same for HLTEgammaGenericFilter '" << moduleName <<  "'.";
-  //  return retPSet;
+  // if (inputType != hltConfig_.moduleType(nonIsoTag.label())) {
+  //  edm::LogError("EmDQM") << "C++ Type of varTag '" << inputType << "' and
+  //  nonIsoTag '" << hltConfig_.moduleType(nonIsoTag.label()) << "' are not the
+  //  same for HLTEgammaGenericFilter '" << moduleName <<  "'."; return retPSet;
   //}
   //--------------------
 
   // parameter saveTag determines the output type
   if (hltConfig_.saveTags(moduleName))
-     retPSet.addParameter<int>("theHLTOutputTypes", trigger::TriggerPhoton);  
+    retPSet.addParameter<int>("theHLTOutputTypes", trigger::TriggerPhoton);
   else
-     retPSet.addParameter<int>("theHLTOutputTypes", trigger::TriggerCluster);
+    retPSet.addParameter<int>("theHLTOutputTypes", trigger::TriggerCluster);
 
   std::vector<edm::InputTag> isoCollections;
   isoCollections.push_back(varTag);
-  //if (!nonIsoTag.label().empty())
+  // if (!nonIsoTag.label().empty())
   //   isoCollections.push_back(nonIsoTag);
 
   //--------------------
   // the following cases seem to have identical PSets ?
   //--------------------
 
-  if (inputType == "EgammaHLTR9Producer" ||                            // R9 shape
-      inputType == "EgammaHLTR9IDProducer" ||                          // R9 ID
-      inputType == "EgammaHLTClusterShapeProducer" ||                  // cluster shape
-      inputType == "EgammaHLTEcalRecIsolationProducer" ||              // ecal isolation
-      inputType == "EgammaHLTHcalIsolationProducersRegional" ||        // HCAL isolation and HE
-      inputType == "EgammaHLTBcHcalIsolationProducersRegional" ||      // HCAL isolation and HE
-      inputType == "EgammaHLTEcalPFClusterIsolationProducer" ||        // ECAL PF isolation filter
-      inputType == "EgammaHLTHcalPFClusterIsolationProducer" ||        // HCAL PF isolation filter
-      inputType == "EgammaHLTPhotonTrackIsolationProducersRegional"    // Photon track isolation
-     ) {
-    retPSet.addParameter<std::vector<double> >("PlotBounds", std::vector<double>(2, 0.0));
-    //retPSet.addParameter<edm::InputTag>("HLTCollectionLabels", edm::InputTag(moduleName, "", processName_));
+  if (inputType == "EgammaHLTR9Producer" ||                          // R9 shape
+      inputType == "EgammaHLTR9IDProducer" ||                        // R9 ID
+      inputType == "EgammaHLTClusterShapeProducer" ||                // cluster shape
+      inputType == "EgammaHLTEcalRecIsolationProducer" ||            // ecal isolation
+      inputType == "EgammaHLTHcalIsolationProducersRegional" ||      // HCAL isolation and HE
+      inputType == "EgammaHLTBcHcalIsolationProducersRegional" ||    // HCAL isolation and
+                                                                     // HE
+      inputType == "EgammaHLTEcalPFClusterIsolationProducer" ||      // ECAL PF isolation
+                                                                     // filter
+      inputType == "EgammaHLTHcalPFClusterIsolationProducer" ||      // HCAL PF isolation
+                                                                     // filter
+      inputType == "EgammaHLTPhotonTrackIsolationProducersRegional"  // Photon track
+                                                                     // isolation
+  ) {
+    retPSet.addParameter<std::vector<double>>("PlotBounds", std::vector<double>(2, 0.0));
+    // retPSet.addParameter<edm::InputTag>("HLTCollectionLabels",
+    // edm::InputTag(moduleName, "", processName_));
     retPSet.addParameter<edm::InputTag>("HLTCollectionLabels", edm::InputTag(moduleName, "", triggerObject_.process()));
-    retPSet.addParameter<std::vector<edm::InputTag> >("IsoCollections", isoCollections);
+    retPSet.addParameter<std::vector<edm::InputTag>>("IsoCollections", isoCollections);
     retPSet.addParameter<int>("ncandcut", hltConfig_.modulePSet(moduleName).getParameter<int>("ncandcut"));
 
     return retPSet;
   }
- 
+
   if (verbosity_ >= OUTPUT_ERRORS)
-     edm::LogError("EmDQM") << "Can't determine what the HLTEgammaGenericQuadraticFilter '" << moduleName <<  "' should do: uses a collection produced by a module of C++ type '" << inputType << "'.";
+    edm::LogError("EmDQM") << "Can't determine what the HLTEgammaGenericQuadraticFilter '" << moduleName
+                           << "' should do: uses a collection produced by a module of C++ type '" << inputType << "'.";
   return edm::ParameterSet();
 }
 
 //----------------------------------------------------------------------
 
-edm::ParameterSet
-EmDQM::makePSetForElectronGenericFilter(const std::string& moduleName)
-{
+edm::ParameterSet EmDQM::makePSetForElectronGenericFilter(const std::string &moduleName) {
   edm::ParameterSet retPSet;
 
   // example usages of HLTElectronGenericFilter are:
   //
-  // deta filter      hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolDetaFilter
-  // dphi filter      hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolDphiFilter
-  // track isolation  hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolTrackIsolFilter
+  // deta filter
+  // hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolDetaFilter dphi
+  // filter hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolDphiFilter
+  // track isolation
+  // hltL1NonIsoHLTNonIsoSingleElectronEt17TighterEleIdIsolTrackIsolFilter
 
   // infer the type of filter by the type of the producer which
   // generates the collection used to cut on this
   edm::InputTag varTag = hltConfig_.modulePSet(moduleName).getParameter<edm::InputTag>("varTag");
-  //edm::InputTag nonIsoTag = hltConfig_.modulePSet(moduleName).getParameter<edm::InputTag>("nonIsoTag");
-  //std::cout << "varTag.label " << varTag.label() << " nonIsoTag.label " << nonIsoTag.label() << std::endl;
+  // edm::InputTag nonIsoTag =
+  // hltConfig_.modulePSet(moduleName).getParameter<edm::InputTag>("nonIsoTag");
+  // std::cout << "varTag.label " << varTag.label() << " nonIsoTag.label " <<
+  // nonIsoTag.label() << std::endl;
 
   std::string inputType = hltConfig_.moduleType(varTag.label());
-  //std::cout << "inputType iso " << inputType << " inputType noniso " << hltConfig_.moduleType(nonIsoTag.label()) << " moduleName " << moduleName << std::endl;
+  // std::cout << "inputType iso " << inputType << " inputType noniso " <<
+  // hltConfig_.moduleType(nonIsoTag.label()) << " moduleName " << moduleName <<
+  // std::endl;
 
   //--------------------
   // sanity check: non-isolated path should be produced by the
   // same type of module
-  //if (nonIsoTag.label().empty()) {
-  //  edm::LogError("EmDQM") << "nonIsoTag of HLTElectronGenericFilter '" << moduleName <<  "' is empty.";
-  //  return retPSet;
+  // if (nonIsoTag.label().empty()) {
+  //  edm::LogError("EmDQM") << "nonIsoTag of HLTElectronGenericFilter '" <<
+  //  moduleName <<  "' is empty."; return retPSet;
   //}
-  //if (inputType != hltConfig_.moduleType(nonIsoTag.label())) {
-  //  edm::LogError("EmDQM") << "C++ Type of varTag '" << inputType << "' and nonIsoTag '" << hltConfig_.moduleType(nonIsoTag.label()) << "' are not the same for HLTElectronGenericFilter '" << moduleName <<  "'.";
-  //  return retPSet;
+  // if (inputType != hltConfig_.moduleType(nonIsoTag.label())) {
+  //  edm::LogError("EmDQM") << "C++ Type of varTag '" << inputType << "' and
+  //  nonIsoTag '" << hltConfig_.moduleType(nonIsoTag.label()) << "' are not the
+  //  same for HLTElectronGenericFilter '" << moduleName <<  "'."; return
+  //  retPSet;
   //}
   //--------------------
 
@@ -1532,7 +1599,7 @@ EmDQM::makePSetForElectronGenericFilter(const std::string& moduleName)
 
   std::vector<edm::InputTag> isoCollections;
   isoCollections.push_back(varTag);
-  //if (!nonIsoTag.label().empty())
+  // if (!nonIsoTag.label().empty())
   //   isoCollections.push_back(nonIsoTag);
 
   //--------------------
@@ -1541,49 +1608,49 @@ EmDQM::makePSetForElectronGenericFilter(const std::string& moduleName)
 
   // note that whether deta or dphi is used is determined from
   // the product instance (not the module label)
-  if (inputType == "EgammaHLTElectronDetaDphiProducer" ||           // deta and dphi filter
-      inputType == "EgammaHLTElectronTrackIsolationProducers"       // track isolation
-     ) {
-    retPSet.addParameter<std::vector<double> >("PlotBounds", std::vector<double>(2, 0.0));
-    //retPSet.addParameter<edm::InputTag>("HLTCollectionLabels", edm::InputTag(moduleName, "", processName_));
+  if (inputType == "EgammaHLTElectronDetaDphiProducer" ||      // deta and dphi filter
+      inputType == "EgammaHLTElectronTrackIsolationProducers"  // track isolation
+  ) {
+    retPSet.addParameter<std::vector<double>>("PlotBounds", std::vector<double>(2, 0.0));
+    // retPSet.addParameter<edm::InputTag>("HLTCollectionLabels",
+    // edm::InputTag(moduleName, "", processName_));
     retPSet.addParameter<edm::InputTag>("HLTCollectionLabels", edm::InputTag(moduleName, "", triggerObject_.process()));
-    retPSet.addParameter<std::vector<edm::InputTag> >("IsoCollections", isoCollections);
+    retPSet.addParameter<std::vector<edm::InputTag>>("IsoCollections", isoCollections);
     retPSet.addParameter<int>("ncandcut", hltConfig_.modulePSet(moduleName).getParameter<int>("ncandcut"));
 
     return retPSet;
   }
 
   if (verbosity_ >= OUTPUT_ERRORS)
-     edm::LogError("EmDQM") << "Can't determine what the HLTElectronGenericFilter '" << moduleName <<  "' should do: uses a collection produced by a module of C++ type '" << inputType << "'.";
+    edm::LogError("EmDQM") << "Can't determine what the HLTElectronGenericFilter '" << moduleName
+                           << "' should do: uses a collection produced by a module of C++ type '" << inputType << "'.";
   return edm::ParameterSet();
 }
 
 //----------------------------------------------------------------------
 
-void EmDQM::SetVarsFromPSet(std::vector<edm::ParameterSet>::iterator psetIt) 
-{
-  dirname_="HLT/HLTEgammaValidation/"+psetIt->getParameter<std::string>("@module_label");
- 
+void EmDQM::SetVarsFromPSet(std::vector<edm::ParameterSet>::iterator psetIt) {
+  dirname_ = "HLT/HLTEgammaValidation/" + psetIt->getParameter<std::string>("@module_label");
+
   pathIndex = psetIt->getUntrackedParameter<unsigned int>("pathIndex", 0);
   // parameters for generator study
-  reqNum    = psetIt->getParameter<unsigned int>("reqNum");
-  pdgGen    = psetIt->getParameter<int>("pdgGen");
+  reqNum = psetIt->getParameter<unsigned int>("reqNum");
+  pdgGen = psetIt->getParameter<int>("pdgGen");
   // plotting parameters (untracked because they don't affect the physics)
-  plotEtMin  = psetIt->getUntrackedParameter<double>("genEtMin",0.);
-  plotPtMin  = psetIt->getUntrackedParameter<double>("PtMin",0.);
-  plotPtMax  = psetIt->getUntrackedParameter<double>("PtMax",1000.);
- 
-  //preselction cuts 
-  gencutCollection_= psetIt->getParameter<edm::InputTag>("cutcollection");
-  gencut_          = psetIt->getParameter<int>("cutnum");
- 
+  plotEtMin = psetIt->getUntrackedParameter<double>("genEtMin", 0.);
+  plotPtMin = psetIt->getUntrackedParameter<double>("PtMin", 0.);
+  plotPtMax = psetIt->getUntrackedParameter<double>("PtMax", 1000.);
+
+  // preselction cuts
+  gencutCollection_ = psetIt->getParameter<edm::InputTag>("cutcollection");
+  gencut_ = psetIt->getParameter<int>("cutnum");
+
   ////////////////////////////////////////////////////////////
   //         Read in the Vector of Parameter Sets.          //
   //           Information for each filter-step             //
   ////////////////////////////////////////////////////////////
-  std::vector<edm::ParameterSet> filters = 
-       psetIt->getParameter<std::vector<edm::ParameterSet> >("filters");
- 
+  std::vector<edm::ParameterSet> filters = psetIt->getParameter<std::vector<edm::ParameterSet>>("filters");
+
   // empty vectors of parameters from previous paths
   theHLTCollectionLabels.clear();
   theHLTOutputTypes.clear();
@@ -1594,54 +1661,58 @@ void EmDQM::SetVarsFromPSet(std::vector<edm::ParameterSet>::iterator psetIt)
   nCandCuts.clear();
 
   int i = 0;
-  for(std::vector<edm::ParameterSet>::iterator filterconf = filters.begin() ; filterconf != filters.end() ; filterconf++)
-  {
- 
+  for (std::vector<edm::ParameterSet>::iterator filterconf = filters.begin(); filterconf != filters.end();
+       filterconf++) {
     theHLTCollectionLabels.push_back(filterconf->getParameter<edm::InputTag>("HLTCollectionLabels"));
     theHLTOutputTypes.push_back(filterconf->getParameter<int>("theHLTOutputTypes"));
-    // Grab the human-readable name, if it is not specified, use the Collection Label
-    theHLTCollectionHumanNames.push_back(filterconf->getUntrackedParameter<std::string>("HLTCollectionHumanName",theHLTCollectionLabels[i].label()));
- 
-    std::vector<double> bounds = filterconf->getParameter<std::vector<double> >("PlotBounds");
+    // Grab the human-readable name, if it is not specified, use the Collection
+    // Label
+    theHLTCollectionHumanNames.push_back(
+        filterconf->getUntrackedParameter<std::string>("HLTCollectionHumanName", theHLTCollectionLabels[i].label()));
+
+    std::vector<double> bounds = filterconf->getParameter<std::vector<double>>("PlotBounds");
     // If the size of plot "bounds" vector != 2, abort
     assert(bounds.size() == 2);
-    plotBounds.push_back(std::pair<double,double>(bounds[0],bounds[1]));
-    isoNames.push_back(filterconf->getParameter<std::vector<edm::InputTag> >("IsoCollections"));
+    plotBounds.push_back(std::pair<double, double>(bounds[0], bounds[1]));
+    isoNames.push_back(filterconf->getParameter<std::vector<edm::InputTag>>("IsoCollections"));
 
-    //for (unsigned int i=0; i<isoNames.back().size(); i++) {
+    // for (unsigned int i=0; i<isoNames.back().size(); i++) {
     //  switch(theHLTOutputTypes.back())  {
     //  case trigger::TriggerL1NoIsoEG:
-    //    histoFillerL1NonIso->isoNameTokens_.push_back(consumes<edm::AssociationMap<edm::OneToValue<l1extra::L1EmParticleCollection , float>>>(isoNames.back()[i]));
-    //    break;
+    //    histoFillerL1NonIso->isoNameTokens_.push_back(consumes<edm::AssociationMap<edm::OneToValue<l1extra::L1EmParticleCollection
+    //    , float>>>(isoNames.back()[i])); break;
     //  case trigger::TriggerL1IsoEG: // Isolated Level 1
-    //    histoFillerL1Iso->isoNameTokens_.push_back(consumes<edm::AssociationMap<edm::OneToValue<l1extra::L1EmParticleCollection , float>>>(isoNames.back()[i]));
-    //    break;
-    //  case trigger::TriggerPhoton: // Photon 
-    //    histoFillerPho->isoNameTokens_.push_back(consumes<edm::AssociationMap<edm::OneToValue<reco::RecoEcalCandidateCollection , float>>>(isoNames.back()[i]));
-    //    break;
-    //  case trigger::TriggerElectron: // Electron 
-    //    histoFillerEle->isoNameTokens_.push_back(consumes<edm::AssociationMap<edm::OneToValue<reco::ElectronCollection , float>>>(isoNames.back()[i]));
-    //    break;
+    //    histoFillerL1Iso->isoNameTokens_.push_back(consumes<edm::AssociationMap<edm::OneToValue<l1extra::L1EmParticleCollection
+    //    , float>>>(isoNames.back()[i])); break;
+    //  case trigger::TriggerPhoton: // Photon
+    //    histoFillerPho->isoNameTokens_.push_back(consumes<edm::AssociationMap<edm::OneToValue<reco::RecoEcalCandidateCollection
+    //    , float>>>(isoNames.back()[i])); break;
+    //  case trigger::TriggerElectron: // Electron
+    //    histoFillerEle->isoNameTokens_.push_back(consumes<edm::AssociationMap<edm::OneToValue<reco::ElectronCollection
+    //    , float>>>(isoNames.back()[i])); break;
     //  case trigger::TriggerCluster: // TriggerCluster
-    //    histoFillerClu->isoNameTokens_.push_back(consumes<edm::AssociationMap<edm::OneToValue<reco::RecoEcalCandidateCollection , float>>>(isoNames.back()[i]));
-    //    break;
+    //    histoFillerClu->isoNameTokens_.push_back(consumes<edm::AssociationMap<edm::OneToValue<reco::RecoEcalCandidateCollection
+    //    , float>>>(isoNames.back()[i])); break;
     //  default:
-    //    throw(cms::Exception("Release Validation Error") << "HLT output type not implemented: theHLTOutputTypes[n]" );
+    //    throw(cms::Exception("Release Validation Error") << "HLT output type
+    //    not implemented: theHLTOutputTypes[n]" );
     //  }
     //}
 
     // If the size of the isoNames vector is not greater than zero, abort
     assert(!isoNames.back().empty());
-    if (isoNames.back().at(0).label()=="none") {
+    if (isoNames.back().at(0).label() == "none") {
       plotiso.push_back(false);
     } else {
-      if (!noIsolationPlots_) plotiso.push_back(true);
-      else plotiso.push_back(false);
+      if (!noIsolationPlots_)
+        plotiso.push_back(true);
+      else
+        plotiso.push_back(false);
     }
     nCandCuts.push_back(filterconf->getParameter<int>("ncandcut"));
     i++;
-  } // END of loop over parameter sets
- 
+  }  // END of loop over parameter sets
+
   // Record number of HLTCollectionLabels
   numOfHLTCollectionLabels = theHLTCollectionLabels.size();
 }
diff --git a/HLTriggerOffline/Egamma/src/EmDQMPostProcessor.cc b/HLTriggerOffline/Egamma/src/EmDQMPostProcessor.cc
index a2eb7fd23f923..ec61a48391746 100644
--- a/HLTriggerOffline/Egamma/src/EmDQMPostProcessor.cc
+++ b/HLTriggerOffline/Egamma/src/EmDQMPostProcessor.cc
@@ -1,38 +1,37 @@
 #include "HLTriggerOffline/Egamma/interface/EmDQMPostProcessor.h"
 
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include <iostream>
+#include <cmath>
 #include <cstring>
-#include <iomanip>
 #include <fstream>
-#include <cmath>
+#include <iomanip>
+#include <iostream>
 
 #include <TEfficiency.h>
 
 //----------------------------------------------------------------------
 
-EmDQMPostProcessor::EmDQMPostProcessor(const edm::ParameterSet& pset)
-{
-  subDir_  = pset.getUntrackedParameter<std::string>("subDir");
+EmDQMPostProcessor::EmDQMPostProcessor(const edm::ParameterSet &pset) {
+  subDir_ = pset.getUntrackedParameter<std::string>("subDir");
 
-  dataSet_ = pset.getUntrackedParameter<std::string>("dataSet","unknown");
+  dataSet_ = pset.getUntrackedParameter<std::string>("dataSet", "unknown");
 
   noPhiPlots = pset.getUntrackedParameter<bool>("noPhiPlots", true);
 
-  normalizeToReco = pset.getUntrackedParameter<bool>("normalizeToReco",false);
+  normalizeToReco = pset.getUntrackedParameter<bool>("normalizeToReco", false);
 
   ignoreEmpty = pset.getUntrackedParameter<bool>("ignoreEmpty", true);
 }
 
 //----------------------------------------------------------------------
 
-void EmDQMPostProcessor::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter)
-{
-  //go to the directory to be processed
-  if(igetter.dirExists(subDir_)) ibooker.cd(subDir_);
+void EmDQMPostProcessor::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
+  // go to the directory to be processed
+  if (igetter.dirExists(subDir_))
+    ibooker.cd(subDir_);
   else {
     edm::LogWarning("EmDQMPostProcessor") << "cannot find directory: " << subDir_ << " , skipping";
     return;
@@ -47,9 +46,8 @@ void EmDQMPostProcessor::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGette
     shortReferenceName = "gen";
   //--------------------
 
-
   //////////////////////////////////
-  //loop over all triggers/samples//
+  // loop over all triggers/samples//
   //////////////////////////////////
 
   // store dataset name (if defined) in output file
@@ -62,8 +60,8 @@ void EmDQMPostProcessor::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGette
   //
   // So we store the name of the dataset as the title of a histogram,
   // which is much easier to access...
-  // TH1D *dataSetNameHisto = 
-  ibooker.book1D("DataSetNameHistogram",dataSet_,1,0,1);
+  // TH1D *dataSetNameHisto =
+  ibooker.book1D("DataSetNameHistogram", dataSet_, 1, 0, 1);
 
   std::vector<std::string> subdirectories = igetter.getSubdirs();
   ////////////////////////////////////////////////////////
@@ -72,26 +70,28 @@ void EmDQMPostProcessor::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGette
   ////////////////////////////////////////////////////////
 
   std::vector<std::string> postfixes;
-  postfixes.push_back("");   //unmatched histograms
-  postfixes.push_back("_RECO_matched"); // for data
-  // we put this on the list even when we're running on 
+  postfixes.push_back("");               // unmatched histograms
+  postfixes.push_back("_RECO_matched");  // for data
+  // we put this on the list even when we're running on
   // data (where there is no generator information).
   // The first test in the loop will then fail and
   // the iteration is skipped.
-  postfixes.push_back("_MC_matched"); 
+  postfixes.push_back("_MC_matched");
 
   std::vector<TProfile *> allElePaths;
   int nEle = 0;
   int nPhoton = 0;
 
   // find the number of electron and photon paths
-  for(std::vector<std::string>::iterator dir = subdirectories.begin() ;dir!= subdirectories.end(); ++dir) {
-    if (dir->find("Ele") != std::string::npos || dir->find("_SC") != std::string::npos) ++nEle;
-    else if (dir->find("Photon") != std::string::npos) ++nPhoton;
+  for (std::vector<std::string>::iterator dir = subdirectories.begin(); dir != subdirectories.end(); ++dir) {
+    if (dir->find("Ele") != std::string::npos || dir->find("_SC") != std::string::npos)
+      ++nEle;
+    else if (dir->find("Photon") != std::string::npos)
+      ++nPhoton;
   }
 
   std::vector<TProfile *> allPhotonPaths;
-  for(std::vector<std::string>::iterator postfix=postfixes.begin(); postfix!=postfixes.end();postfix++){
+  for (std::vector<std::string>::iterator postfix = postfixes.begin(); postfix != postfixes.end(); postfix++) {
     bool pop = false;
     int elePos = 1;
     int photonPos = 1;
@@ -99,136 +99,171 @@ void EmDQMPostProcessor::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGette
     /////////////////////////////////////
     // computer per-event efficiencies //
     /////////////////////////////////////
-    
+
     std::string histoName = "efficiency_by_step" + *postfix;
     std::string baseName = "total_eff" + *postfix;
 
     std::string allEleHistoName = "EfficiencyByPath_Ele" + *postfix;
     std::string allEleHistoLabel = "Efficiency_for_each_validated_electron_path" + *postfix;
-    allElePaths.push_back(new TProfile(allEleHistoName.c_str(), allEleHistoLabel.c_str(), nEle, 0., (double)nEle, 0., 1.2));
+    allElePaths.push_back(
+        new TProfile(allEleHistoName.c_str(), allEleHistoLabel.c_str(), nEle, 0., (double)nEle, 0., 1.2));
     std::string allPhotonHistoName = "EfficiencyByPath_Photon" + *postfix;
     std::string allPhotonHistoLabel = "Efficiency_for_each_validated_photon_path" + *postfix;
-    allPhotonPaths.push_back(new TProfile(allPhotonHistoName.c_str(), allPhotonHistoLabel.c_str(), nPhoton, 0., (double)nPhoton, 0., 1.2));
+    allPhotonPaths.push_back(
+        new TProfile(allPhotonHistoName.c_str(), allPhotonHistoLabel.c_str(), nPhoton, 0., (double)nPhoton, 0., 1.2));
 
-    for(std::vector<std::string>::iterator dir = subdirectories.begin(); dir!= subdirectories.end(); dir++) {
+    for (std::vector<std::string>::iterator dir = subdirectories.begin(); dir != subdirectories.end(); dir++) {
       ibooker.cd(*dir);
 
       // get the current trigger name
       std::string trigName = dir->substr(dir->rfind("/") + 1);
-      trigName = trigName.replace(trigName.rfind("_DQM"),4,"");
+      trigName = trigName.replace(trigName.rfind("_DQM"), 4, "");
 
       // Get the gen-level (or reco, for data) plots
       std::string genName;
 
-      // only generate efficiency plots if there are generated/recoed events selected
-      // but label the bin in the overview plot, even if the bin is empty
+      // only generate efficiency plots if there are generated/recoed events
+      // selected but label the bin in the overview plot, even if the bin is
+      // empty
       if (ignoreEmpty) {
-        if (normalizeToReco) genName = ibooker.pwd() + "/reco_et";
-        else genName = ibooker.pwd() + "/gen_et";
-        TH1F* genHist = getHistogram(ibooker, igetter, genName);
+        if (normalizeToReco)
+          genName = ibooker.pwd() + "/reco_et";
+        else
+          genName = ibooker.pwd() + "/gen_et";
+        TH1F *genHist = getHistogram(ibooker, igetter, genName);
         if (genHist->GetEntries() == 0) {
-          edm::LogInfo("EmDQMPostProcessor") << "Zero events were selected for path '" << trigName << "'. No efficiency plots will be generated.";
+          edm::LogInfo("EmDQMPostProcessor")
+              << "Zero events were selected for path '" << trigName << "'. No efficiency plots will be generated.";
           if (trigName.find("Ele") != std::string::npos || trigName.find("_SC") != std::string::npos) {
-             allElePaths.back()->GetXaxis()->SetBinLabel(elePos, trigName.c_str());
-             ++elePos;
+            allElePaths.back()->GetXaxis()->SetBinLabel(elePos, trigName.c_str());
+            ++elePos;
           } else if (trigName.find("Photon") != std::string::npos) {
-             allPhotonPaths.back()->GetXaxis()->SetBinLabel(photonPos, trigName.c_str());
-             ++photonPos;
+            allPhotonPaths.back()->GetXaxis()->SetBinLabel(photonPos, trigName.c_str());
+            ++photonPos;
           }
           ibooker.goUp();
           continue;
         }
       }
 
-      TH1F* basehist = getHistogram(ibooker, igetter, ibooker.pwd() + "/" + baseName);
-      if (basehist == nullptr)
-	{
-	  //edm::LogWarning("EmDQMPostProcessor") << "histogram " << (ibooker.pwd() + "/" + baseName) << " does not exist, skipping postfix '" << *postfix << "'";
-          pop = true;
-          ibooker.goUp();
-	  continue;
-	}
+      TH1F *basehist = getHistogram(ibooker, igetter, ibooker.pwd() + "/" + baseName);
+      if (basehist == nullptr) {
+        // edm::LogWarning("EmDQMPostProcessor") << "histogram " <<
+        // (ibooker.pwd() + "/" + baseName) << " does not exist, skipping
+        // postfix
+        // '" << *postfix << "'";
+        pop = true;
+        ibooker.goUp();
+        continue;
+      }
       // at least one histogram with postfix was found
       pop = false;
 
       ibooker.goUp();
-      MonitorElement* meTotal = ibooker.bookProfile(trigName + "__" + histoName,trigName + "__" + histoName,basehist->GetXaxis()->GetNbins(),basehist->GetXaxis()->GetXmin(),basehist->GetXaxis()->GetXmax(),0.,1.2);
+      MonitorElement *meTotal = ibooker.bookProfile(trigName + "__" + histoName,
+                                                    trigName + "__" + histoName,
+                                                    basehist->GetXaxis()->GetNbins(),
+                                                    basehist->GetXaxis()->GetXmin(),
+                                                    basehist->GetXaxis()->GetXmax(),
+                                                    0.,
+                                                    1.2);
       meTotal->setEfficiencyFlag();
-      TProfile* total = meTotal->getTProfile();
+      TProfile *total = meTotal->getTProfile();
       ibooker.cd(*dir);
-      total->GetXaxis()->SetBinLabel(1,basehist->GetXaxis()->GetBinLabel(1));
-      
-//       std::vector<std::string> mes = igetter.getMEs();
-//       for(std::vector<std::string>::iterator me = mes.begin() ;me!= mes.end(); me++ )
-// 	std::cout <<*me <<std::endl;
-//       std::cout <<std::endl;
-      
-      double value=0;
-      double errorh=0,errorl=0,error=0;    
-      //compute stepwise total efficiencies 
-      for(int bin= total->GetNbinsX()-2 ; bin > 1  ; bin--){
-	value=0;
-	errorl=0;
-	errorh=0;
-	error=0;
-	if(basehist->GetBinContent(bin-1) != 0){
-	  Efficiency( (int)basehist->GetBinContent(bin), (int)basehist->GetBinContent(bin-1), 0.683, value, errorl, errorh );
-	  error = value-errorl>errorh-value ? value-errorl : errorh-value;
-	}
-	total->SetBinContent( bin, value );
-	total->SetBinEntries( bin, 1 );
-	total->SetBinError( bin, sqrt(value*value+error*error) );
-	total->GetXaxis()->SetBinLabel(bin,basehist->GetXaxis()->GetBinLabel(bin));
+      total->GetXaxis()->SetBinLabel(1, basehist->GetXaxis()->GetBinLabel(1));
+
+      //       std::vector<std::string> mes = igetter.getMEs();
+      //       for(std::vector<std::string>::iterator me = mes.begin() ;me!=
+      //       mes.end(); me++ )
+      // 	std::cout <<*me <<std::endl;
+      //       std::cout <<std::endl;
+
+      double value = 0;
+      double errorh = 0, errorl = 0, error = 0;
+      // compute stepwise total efficiencies
+      for (int bin = total->GetNbinsX() - 2; bin > 1; bin--) {
+        value = 0;
+        errorl = 0;
+        errorh = 0;
+        error = 0;
+        if (basehist->GetBinContent(bin - 1) != 0) {
+          Efficiency(
+              (int)basehist->GetBinContent(bin), (int)basehist->GetBinContent(bin - 1), 0.683, value, errorl, errorh);
+          error = value - errorl > errorh - value ? value - errorl : errorh - value;
+        }
+        total->SetBinContent(bin, value);
+        total->SetBinEntries(bin, 1);
+        total->SetBinError(bin, sqrt(value * value + error * error));
+        total->GetXaxis()->SetBinLabel(bin, basehist->GetXaxis()->GetBinLabel(bin));
       }
 
-      //set first bin to L1 efficiency
-      if(basehist->GetBinContent(basehist->GetNbinsX()) !=0 ){
-	Efficiency( (int)basehist->GetBinContent(1), (int)basehist->GetBinContent(basehist->GetNbinsX()), 0.683, value, errorl, errorh );
-	error= value-errorl>errorh-value ? value-errorl : errorh-value;
-      }else{
-	value=0;error=0;
+      // set first bin to L1 efficiency
+      if (basehist->GetBinContent(basehist->GetNbinsX()) != 0) {
+        Efficiency((int)basehist->GetBinContent(1),
+                   (int)basehist->GetBinContent(basehist->GetNbinsX()),
+                   0.683,
+                   value,
+                   errorl,
+                   errorh);
+        error = value - errorl > errorh - value ? value - errorl : errorh - value;
+      } else {
+        value = 0;
+        error = 0;
       }
-      total->SetBinContent(1,value);
-      total->SetBinEntries(1, 1 );
-      total->SetBinError(1, sqrt(value*value+error*error) );
-     
+      total->SetBinContent(1, value);
+      total->SetBinEntries(1, 1);
+      total->SetBinError(1, sqrt(value * value + error * error));
+
       // total efficiency relative to gen or reco
-      if(basehist->GetBinContent(basehist->GetNbinsX()) !=0 ){
-	Efficiency( (int)basehist->GetBinContent(basehist->GetNbinsX()-2), (int)basehist->GetBinContent(basehist->GetNbinsX()), 0.683, value, errorl, errorh );
-	error= value-errorl>errorh-value ? value-errorl : errorh-value;
-      }else{
-	value=0;error=0;
+      if (basehist->GetBinContent(basehist->GetNbinsX()) != 0) {
+        Efficiency((int)basehist->GetBinContent(basehist->GetNbinsX() - 2),
+                   (int)basehist->GetBinContent(basehist->GetNbinsX()),
+                   0.683,
+                   value,
+                   errorl,
+                   errorh);
+        error = value - errorl > errorh - value ? value - errorl : errorh - value;
+      } else {
+        value = 0;
+        error = 0;
       }
-      total->SetBinContent(total->GetNbinsX(),value);
-      total->SetBinEntries(total->GetNbinsX(),1);
-      total->SetBinError(total->GetNbinsX(),sqrt(value*value+error*error));
-      total->GetXaxis()->SetBinLabel(total->GetNbinsX(),("total efficiency rel. " + shortReferenceName).c_str());
-      
-      //total efficiency relative to L1
-      if(basehist->GetBinContent(1) !=0 ){
-	Efficiency( (int)basehist->GetBinContent(basehist->GetNbinsX()-2), (int)basehist->GetBinContent(1), 0.683, value, errorl, errorh );
-	error= value-errorl > errorh-value ? value-errorl : errorh-value;
-      }else{
-	value=0;error=0;
+      total->SetBinContent(total->GetNbinsX(), value);
+      total->SetBinEntries(total->GetNbinsX(), 1);
+      total->SetBinError(total->GetNbinsX(), sqrt(value * value + error * error));
+      total->GetXaxis()->SetBinLabel(total->GetNbinsX(), ("total efficiency rel. " + shortReferenceName).c_str());
+
+      // total efficiency relative to L1
+      if (basehist->GetBinContent(1) != 0) {
+        Efficiency((int)basehist->GetBinContent(basehist->GetNbinsX() - 2),
+                   (int)basehist->GetBinContent(1),
+                   0.683,
+                   value,
+                   errorl,
+                   errorh);
+        error = value - errorl > errorh - value ? value - errorl : errorh - value;
+      } else {
+        value = 0;
+        error = 0;
       }
-      total->SetBinContent(total->GetNbinsX()-1,value);
-      total->SetBinError(total->GetNbinsX()-1,sqrt(value*value+error*error));
-      total->SetBinEntries(total->GetNbinsX()-1,1);
-      total->GetXaxis()->SetBinLabel(total->GetNbinsX()-1,"total efficiency rel. L1");
+      total->SetBinContent(total->GetNbinsX() - 1, value);
+      total->SetBinError(total->GetNbinsX() - 1, sqrt(value * value + error * error));
+      total->SetBinEntries(total->GetNbinsX() - 1, 1);
+      total->GetXaxis()->SetBinLabel(total->GetNbinsX() - 1, "total efficiency rel. L1");
 
       //----------------------------------------
 
       ///////////////////////////////////////////
       // compute per-object efficiencies       //
       ///////////////////////////////////////////
-      //MonitorElement *eff, *num, *denom, *genPlot, *effVsGen, *effL1VsGen;
-      std::vector<std::string> varNames; 
+      // MonitorElement *eff, *num, *denom, *genPlot, *effVsGen, *effL1VsGen;
+      std::vector<std::string> varNames;
       varNames.push_back("et");
-      varNames.push_back("eta"); 
+      varNames.push_back("eta");
 
-      if(!noPhiPlots){ varNames.push_back("phi");
-                       }   
-      varNames.push_back("etaphi");       
+      if (!noPhiPlots) {
+        varNames.push_back("phi");
+      }
+      varNames.push_back("etaphi");
 
       std::string filterName;
       std::string filterName2;
@@ -236,57 +271,93 @@ void EmDQMPostProcessor::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGette
       std::string numName;
 
       // Get the L1 over gen filter first
-      filterName2= total->GetXaxis()->GetBinLabel(1);
-      //loop over variables (eta/phi/et)
-      for(std::vector<std::string>::iterator var = varNames.begin(); var != varNames.end() ; var++){
-	
-	numName   = ibooker.pwd() + "/" + filterName2 + *var + *postfix;
-
-	if (normalizeToReco)
-	  genName   = ibooker.pwd() + "/reco_" + *var ;
-	else
-	  genName   = ibooker.pwd() + "/gen_" + *var ;
-
-         if((*var).find("etaphi") != std::string::npos)
-           {
-             if(!dividehistos2D(ibooker,igetter,numName,genName,"efficiency_"+filterName2+"_vs_"+*var +*postfix,*var,"eff. of"+filterName2+" vs "+*var +*postfix))break;   
-            }else if(!dividehistos(ibooker,igetter,numName,genName,"efficiency_"+filterName2+"_vs_"+*var +*postfix,*var,"eff. of"+filterName2+" vs "+*var +*postfix))
-                   break;
-      } // loop over variables
-    
+      filterName2 = total->GetXaxis()->GetBinLabel(1);
+      // loop over variables (eta/phi/et)
+      for (std::vector<std::string>::iterator var = varNames.begin(); var != varNames.end(); var++) {
+        numName = ibooker.pwd() + "/" + filterName2 + *var + *postfix;
+
+        if (normalizeToReco)
+          genName = ibooker.pwd() + "/reco_" + *var;
+        else
+          genName = ibooker.pwd() + "/gen_" + *var;
+
+        if ((*var).find("etaphi") != std::string::npos) {
+          if (!dividehistos2D(ibooker,
+                              igetter,
+                              numName,
+                              genName,
+                              "efficiency_" + filterName2 + "_vs_" + *var + *postfix,
+                              *var,
+                              "eff. of" + filterName2 + " vs " + *var + *postfix))
+            break;
+        } else if (!dividehistos(ibooker,
+                                 igetter,
+                                 numName,
+                                 genName,
+                                 "efficiency_" + filterName2 + "_vs_" + *var + *postfix,
+                                 *var,
+                                 "eff. of" + filterName2 + " vs " + *var + *postfix))
+          break;
+      }  // loop over variables
+
       // get the filter names from the bin-labels of the master-histogram
-      for (int filter=1; filter < total->GetNbinsX()-2; filter++) {
-	filterName = total->GetXaxis()->GetBinLabel(filter);
-	filterName2= total->GetXaxis()->GetBinLabel(filter+1);
-	
-	//loop over variables (eta/et/phi)
-	for(std::vector<std::string>::iterator var = varNames.begin(); var != varNames.end() ; var++){
-	  numName   = ibooker.pwd() + "/" + filterName2 + *var + *postfix;
-	  denomName = ibooker.pwd() + "/" + filterName  + *var + *postfix;
-
-	  // Is this the last filter? Book efficiency vs gen (or reco, for data) level
-	  std::string temp = *postfix;
-          if (filter==total->GetNbinsX()-3 && temp.find("matched")!=std::string::npos) {
-	    if (normalizeToReco)
-	      genName = ibooker.pwd() + "/reco_" + *var;
-	    else
-	      genName = ibooker.pwd() + "/gen_" + *var;
-              
-           if((*var).find("etaphi") != std::string::npos)
-             {
-              if(!dividehistos2D(ibooker,igetter,numName,genName,"final_eff_vs_"+*var,*var,"Efficiency Compared to " + shortReferenceName + " vs "+*var))break;
-             }else if(!dividehistos(ibooker,igetter,numName,genName,"final_eff_vs_"+*var,*var,"Efficiency Compared to " + shortReferenceName + " vs "+*var))
-	      break;
-	  }
-
-          if((*var).find("etaphi") != std::string::npos)
-             {
-               if(!dividehistos2D(ibooker,igetter,numName,denomName,"efficiency_"+filterName2+"_vs_"+*var +*postfix,*var,"efficiency_"+filterName2+"_vs_"+*var + *postfix))break;          
-             }else if(!dividehistos(ibooker,igetter,numName,denomName,"efficiency_"+filterName2+"_vs_"+*var +*postfix,*var,"efficiency_"+filterName2+"_vs_"+*var + *postfix))
-	      break;
-
-	} // loop over variables
-      } // loop over monitoring modules within path
+      for (int filter = 1; filter < total->GetNbinsX() - 2; filter++) {
+        filterName = total->GetXaxis()->GetBinLabel(filter);
+        filterName2 = total->GetXaxis()->GetBinLabel(filter + 1);
+
+        // loop over variables (eta/et/phi)
+        for (std::vector<std::string>::iterator var = varNames.begin(); var != varNames.end(); var++) {
+          numName = ibooker.pwd() + "/" + filterName2 + *var + *postfix;
+          denomName = ibooker.pwd() + "/" + filterName + *var + *postfix;
+
+          // Is this the last filter? Book efficiency vs gen (or reco, for data)
+          // level
+          std::string temp = *postfix;
+          if (filter == total->GetNbinsX() - 3 && temp.find("matched") != std::string::npos) {
+            if (normalizeToReco)
+              genName = ibooker.pwd() + "/reco_" + *var;
+            else
+              genName = ibooker.pwd() + "/gen_" + *var;
+
+            if ((*var).find("etaphi") != std::string::npos) {
+              if (!dividehistos2D(ibooker,
+                                  igetter,
+                                  numName,
+                                  genName,
+                                  "final_eff_vs_" + *var,
+                                  *var,
+                                  "Efficiency Compared to " + shortReferenceName + " vs " + *var))
+                break;
+            } else if (!dividehistos(ibooker,
+                                     igetter,
+                                     numName,
+                                     genName,
+                                     "final_eff_vs_" + *var,
+                                     *var,
+                                     "Efficiency Compared to " + shortReferenceName + " vs " + *var))
+              break;
+          }
+
+          if ((*var).find("etaphi") != std::string::npos) {
+            if (!dividehistos2D(ibooker,
+                                igetter,
+                                numName,
+                                denomName,
+                                "efficiency_" + filterName2 + "_vs_" + *var + *postfix,
+                                *var,
+                                "efficiency_" + filterName2 + "_vs_" + *var + *postfix))
+              break;
+          } else if (!dividehistos(ibooker,
+                                   igetter,
+                                   numName,
+                                   denomName,
+                                   "efficiency_" + filterName2 + "_vs_" + *var + *postfix,
+                                   *var,
+                                   "efficiency_" + filterName2 + "_vs_" + *var + *postfix))
+            break;
+
+        }  // loop over variables
+      }    // loop over monitoring modules within path
 
       ibooker.goUp();
 
@@ -299,8 +370,7 @@ void EmDQMPostProcessor::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGette
         allElePaths.back()->SetBinError(elePos, sqrt(totCont * totCont + totErr * totErr));
         allElePaths.back()->GetXaxis()->SetBinLabel(elePos, trigName.c_str());
         ++elePos;
-      }
-      else if (trigName.find("Photon") != std::string::npos) {
+      } else if (trigName.find("Photon") != std::string::npos) {
         allPhotonPaths.back()->SetBinContent(photonPos, totCont);
         allPhotonPaths.back()->SetBinEntries(photonPos, 1);
         allPhotonPaths.back()->SetBinError(photonPos, sqrt(totCont * totCont + totErr * totErr));
@@ -308,30 +378,34 @@ void EmDQMPostProcessor::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGette
         ++photonPos;
       }
 
-    } // loop over dirs
+    }  // loop over dirs
     if (pop) {
       allElePaths.pop_back();
       allPhotonPaths.pop_back();
-    } 
-    else {
+    } else {
       allElePaths.back()->GetXaxis()->SetLabelSize(0.03);
       allPhotonPaths.back()->GetXaxis()->SetLabelSize(0.03);
       ibooker.bookProfile(allEleHistoName, allElePaths.back())->setEfficiencyFlag();
       ibooker.bookProfile(allPhotonHistoName, allPhotonPaths.back())->setEfficiencyFlag();
     }
-  } // loop over postfixes
-  
+  }  // loop over postfixes
 }
 
 //----------------------------------------------------------------------
 
-TProfile* EmDQMPostProcessor::dividehistos(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter, const std::string& numName, const std::string& denomName, const std::string& outName,const std::string& label,const std::string& titel){
-  //std::cout << numName <<std::endl;
+TProfile *EmDQMPostProcessor::dividehistos(DQMStore::IBooker &ibooker,
+                                           DQMStore::IGetter &igetter,
+                                           const std::string &numName,
+                                           const std::string &denomName,
+                                           const std::string &outName,
+                                           const std::string &label,
+                                           const std::string &titel) {
+  // std::cout << numName <<std::endl;
 
-  TH1F* num = getHistogram(ibooker,igetter,numName);
+  TH1F *num = getHistogram(ibooker, igetter, numName);
 
-  //std::cout << denomName << std::endl;
-  TH1F* denom = getHistogram(ibooker,igetter, denomName);
+  // std::cout << denomName << std::endl;
+  TH1F *denom = getHistogram(ibooker, igetter, denomName);
 
   if (num == nullptr)
     edm::LogWarning("EmDQMPostProcessor") << "numerator histogram " << numName << " does not exist";
@@ -341,11 +415,13 @@ TProfile* EmDQMPostProcessor::dividehistos(DQMStore::IBooker & ibooker, DQMStore
 
   // Check if histograms actually exist
 
-  if(num ==nullptr || denom == nullptr) return nullptr;
+  if (num == nullptr || denom == nullptr)
+    return nullptr;
 
-  MonitorElement* meOut = ibooker.bookProfile(outName,titel,num->GetXaxis()->GetNbins(),num->GetXaxis()->GetXmin(),num->GetXaxis()->GetXmax(),0.,1.2);
+  MonitorElement *meOut = ibooker.bookProfile(
+      outName, titel, num->GetXaxis()->GetNbins(), num->GetXaxis()->GetXmin(), num->GetXaxis()->GetXmax(), 0., 1.2);
   meOut->setEfficiencyFlag();
-  TProfile* out = meOut->getTProfile();
+  TProfile *out = meOut->getTProfile();
   out->GetXaxis()->SetTitle(label.c_str());
   out->SetYTitle("Efficiency");
   out->SetOption("PE");
@@ -354,24 +430,30 @@ TProfile* EmDQMPostProcessor::dividehistos(DQMStore::IBooker & ibooker, DQMStore
   out->SetMarkerStyle(20);
   out->SetMarkerSize(0.8);
   out->SetStats(kFALSE);
-  for(int i=1;i<=num->GetNbinsX();i++){
+  for (int i = 1; i <= num->GetNbinsX(); i++) {
     double e, low, high;
-    Efficiency( (int)num->GetBinContent(i), (int)denom->GetBinContent(i), 0.683, e, low, high );
-    double err = e-low>high-e ? e-low : high-e;
-    //here is the trick to store info in TProfile:
-    out->SetBinContent( i, e );
-    out->SetBinEntries( i, 1 );
-    out->SetBinError( i, sqrt(e*e+err*err) );
+    Efficiency((int)num->GetBinContent(i), (int)denom->GetBinContent(i), 0.683, e, low, high);
+    double err = e - low > high - e ? e - low : high - e;
+    // here is the trick to store info in TProfile:
+    out->SetBinContent(i, e);
+    out->SetBinEntries(i, 1);
+    out->SetBinError(i, sqrt(e * e + err * err));
   }
 
   return out;
 }
 //----------------------------------------------------------------------
-TH2F* EmDQMPostProcessor::dividehistos2D(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter, const std::string& numName, const std::string& denomName, const std::string& outName,const std::string& label,const std::string& titel){
-  //std::cout << numName <<std::endl;
-  TH2F* num = get2DHistogram(ibooker,igetter,numName);
-  //std::cout << denomName << std::endl;
-  TH2F* denom = get2DHistogram(ibooker,igetter, denomName);
+TH2F *EmDQMPostProcessor::dividehistos2D(DQMStore::IBooker &ibooker,
+                                         DQMStore::IGetter &igetter,
+                                         const std::string &numName,
+                                         const std::string &denomName,
+                                         const std::string &outName,
+                                         const std::string &label,
+                                         const std::string &titel) {
+  // std::cout << numName <<std::endl;
+  TH2F *num = get2DHistogram(ibooker, igetter, numName);
+  // std::cout << denomName << std::endl;
+  TH2F *denom = get2DHistogram(ibooker, igetter, denomName);
   if (num == nullptr)
     edm::LogWarning("EmDQMPostProcessor") << "2D numerator histogram " << numName << " does not exist";
 
@@ -379,10 +461,18 @@ TH2F* EmDQMPostProcessor::dividehistos2D(DQMStore::IBooker & ibooker, DQMStore::
     edm::LogWarning("EmDQMPostProcessor") << "2D denominator histogram " << denomName << " does not exist";
 
   // Check if histograms actually exist
-  if(num == nullptr || denom == nullptr) return nullptr;
+  if (num == nullptr || denom == nullptr)
+    return nullptr;
 
-  MonitorElement* meOut = ibooker.book2D(outName,titel,num->GetXaxis()->GetNbins(),num->GetXaxis()->GetXmin(),num->GetXaxis()->GetXmax(),num->GetYaxis()->GetNbins(),num->GetYaxis()->GetXmin(),num->GetYaxis()->GetXmax());
-  TH2F* out= meOut->getTH2F();
+  MonitorElement *meOut = ibooker.book2D(outName,
+                                         titel,
+                                         num->GetXaxis()->GetNbins(),
+                                         num->GetXaxis()->GetXmin(),
+                                         num->GetXaxis()->GetXmax(),
+                                         num->GetYaxis()->GetNbins(),
+                                         num->GetYaxis()->GetXmin(),
+                                         num->GetYaxis()->GetXmax());
+  TH2F *out = meOut->getTH2F();
   out->Add(num);
   out->Divide(denom);
   out->GetXaxis()->SetTitle(label.c_str());
@@ -394,7 +484,9 @@ TH2F* EmDQMPostProcessor::dividehistos2D(DQMStore::IBooker & ibooker, DQMStore::
   return out;
 }
 //--------------------
-TH1F *EmDQMPostProcessor::getHistogram(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter, const std::string &histoPath){
+TH1F *EmDQMPostProcessor::getHistogram(DQMStore::IBooker &ibooker,
+                                       DQMStore::IGetter &igetter,
+                                       const std::string &histoPath) {
   MonitorElement *monElement = igetter.get(histoPath);
   if (monElement != nullptr)
     return monElement->getTH1F();
@@ -402,7 +494,9 @@ TH1F *EmDQMPostProcessor::getHistogram(DQMStore::IBooker & ibooker, DQMStore::IG
     return nullptr;
 }
 //----------------------------------------------------------------------
-TH2F *EmDQMPostProcessor::get2DHistogram(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter, const std::string &histoPath){
+TH2F *EmDQMPostProcessor::get2DHistogram(DQMStore::IBooker &ibooker,
+                                         DQMStore::IGetter &igetter,
+                                         const std::string &histoPath) {
   MonitorElement *monElement = igetter.get(histoPath);
   if (monElement != nullptr)
     return monElement->getTH2F();
@@ -412,31 +506,31 @@ TH2F *EmDQMPostProcessor::get2DHistogram(DQMStore::IBooker & ibooker, DQMStore::
 
 //----------------------------------------------------------------------
 
-void 
-EmDQMPostProcessor::Efficiency(int passing, int total, double level, double &mode, double &lowerBound, double &upperBound)
-{ 
-  // protection (see also TGraphAsymmErrors::Efficiency(..), mimick the old behaviour )
-  if (total == 0)
-  {
+void EmDQMPostProcessor::Efficiency(
+    int passing, int total, double level, double &mode, double &lowerBound, double &upperBound) {
+  // protection (see also TGraphAsymmErrors::Efficiency(..), mimick the old
+  // behaviour )
+  if (total == 0) {
     mode = 0.5;
     lowerBound = 0;
     upperBound = 1;
     return;
   }
 
-  mode = passing / ((double) total);
+  mode = passing / ((double)total);
 
-  // note that the order of the two first arguments ('total' and 'passed') is the opposited
-  // with respect to the earlier TGraphAsymmErrors::Efficiency(..) method
+  // note that the order of the two first arguments ('total' and 'passed') is
+  // the opposited with respect to the earlier TGraphAsymmErrors::Efficiency(..)
+  // method
   //
   // see http://root.cern.ch/root/html/TEfficiency.html#compare for
-  // an illustration of the coverage of the different methods provided by TEfficiency
-  
+  // an illustration of the coverage of the different methods provided by
+  // TEfficiency
+
   lowerBound = TEfficiency::Wilson(total, passing, level, false);
   upperBound = TEfficiency::Wilson(total, passing, level, true);
 }
 
-
 //----------------------------------------------------------------------
 
 DEFINE_FWK_MODULE(EmDQMPostProcessor);
diff --git a/HLTriggerOffline/Egamma/src/EmDQMReco.cc b/HLTriggerOffline/Egamma/src/EmDQMReco.cc
index 2fa0d6f9a6ea3..874d7826fd9e5 100644
--- a/HLTriggerOffline/Egamma/src/EmDQMReco.cc
+++ b/HLTriggerOffline/Egamma/src/EmDQMReco.cc
@@ -6,52 +6,50 @@
 ////////////////////////////////////////////////////////////////////////////////
 //                    Collaborating Class Header                              //
 ////////////////////////////////////////////////////////////////////////////////
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
+#include "DataFormats/EgammaCandidates/interface/Electron.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
 #include "DataFormats/RecoCandidate/interface/RecoEcalCandidate.h"
-#include "DataFormats/EgammaCandidates/interface/Electron.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 //#include "DataFormats/EgammaCandidates/interface/PhotonFwd.h"
 //#include "DataFormats/EgammaCandidates/interface/Photon.h"
 #include "DataFormats/L1Trigger/interface/L1EmParticle.h"
 #include "DataFormats/L1Trigger/interface/L1EmParticleFwd.h"
 //#include "SimDataFormats/HepMCProduct/interface/HepMCProduct.h"
-#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DataFormats/Common/interface/AssociationMap.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/Common/interface/RefToBase.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 //#include "PhysicsTools/UtilAlgos/interface/TFileService.h"
-#include "FWCore/Utilities/interface/Exception.h"
-#include "DataFormats/HLTReco/interface/TriggerTypeDefs.h"
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "DataFormats/HLTReco/interface/TriggerTypeDefs.h"
+#include "FWCore/Utilities/interface/Exception.h"
 #include <boost/format.hpp>
 ////////////////////////////////////////////////////////////////////////////////
 //                           Root include files                               //
 ////////////////////////////////////////////////////////////////////////////////
-#include "TFile.h"
 #include "TDirectory.h"
+#include "TFile.h"
 #include "TH1F.h"
+#include <Math/VectorUtil.h>
 #include <iostream>
 #include <string>
-#include <Math/VectorUtil.h>
-using namespace ROOT::Math::VectorUtil ;
+using namespace ROOT::Math::VectorUtil;
 
 //----------------------------------------------------------------------
 // class EmDQMReco::FourVectorMonitorElements
 //----------------------------------------------------------------------
 EmDQMReco::FourVectorMonitorElements::FourVectorMonitorElements(EmDQMReco *_parent,
-    DQMStore::IBooker &iBooker,
-    const std::string &histogramNameTemplate,
-    const std::string &histogramTitleTemplate
-  ) :
-  parent(_parent)
-{
+                                                                DQMStore::IBooker &iBooker,
+                                                                const std::string &histogramNameTemplate,
+                                                                const std::string &histogramTitleTemplate)
+    : parent(_parent) {
   // introducing variables for better code readability later on
   std::string histName;
   std::string histTitle;
@@ -59,39 +57,28 @@ EmDQMReco::FourVectorMonitorElements::FourVectorMonitorElements(EmDQMReco *_pare
   // et
   histName = boost::str(boost::format(histogramNameTemplate) % "et");
   histTitle = boost::str(boost::format(histogramTitleTemplate) % "E_{T}");
-  etMonitorElement =  iBooker.book1D(histName.c_str(),
-                                   histTitle.c_str(),
-                                   parent->plotBins,
-                                   parent->plotPtMin,
-                                   parent->plotPtMax);
+  etMonitorElement =
+      iBooker.book1D(histName.c_str(), histTitle.c_str(), parent->plotBins, parent->plotPtMin, parent->plotPtMax);
 
   // eta
   histName = boost::str(boost::format(histogramNameTemplate) % "eta");
-  histTitle= boost::str(boost::format(histogramTitleTemplate) % "#eta");
-  etaMonitorElement = iBooker.book1D(histName.c_str(),
-                                  histTitle.c_str(),
-                                  parent->plotBins,
-                                  - parent->plotEtaMax,
-                                    parent->plotEtaMax);
+  histTitle = boost::str(boost::format(histogramTitleTemplate) % "#eta");
+  etaMonitorElement =
+      iBooker.book1D(histName.c_str(), histTitle.c_str(), parent->plotBins, -parent->plotEtaMax, parent->plotEtaMax);
 
   // phi
   histName = boost::str(boost::format(histogramNameTemplate) % "phi");
-  histTitle= boost::str(boost::format(histogramTitleTemplate) % "#phi");
-  phiMonitorElement = iBooker.book1D(histName.c_str(),
-                                  histTitle.c_str(),
-                                  parent->plotBins,
-                                  - parent->plotPhiMax,
-                                    parent->plotPhiMax);
+  histTitle = boost::str(boost::format(histogramTitleTemplate) % "#phi");
+  phiMonitorElement =
+      iBooker.book1D(histName.c_str(), histTitle.c_str(), parent->plotBins, -parent->plotPhiMax, parent->plotPhiMax);
 }
 
 //----------------------------------------------------------------------
 
-void
-EmDQMReco::FourVectorMonitorElements::fill(const math::XYZTLorentzVector &momentum)
-{
+void EmDQMReco::FourVectorMonitorElements::fill(const math::XYZTLorentzVector &momentum) {
   etMonitorElement->Fill(momentum.Et());
-  etaMonitorElement->Fill(momentum.eta() );
-  phiMonitorElement->Fill(momentum.phi() );
+  etaMonitorElement->Fill(momentum.eta());
+  phiMonitorElement->Fill(momentum.phi());
 }
 
 //----------------------------------------------------------------------
@@ -99,38 +86,39 @@ EmDQMReco::FourVectorMonitorElements::fill(const math::XYZTLorentzVector &moment
 ////////////////////////////////////////////////////////////////////////////////
 //                             Constructor                                    //
 ////////////////////////////////////////////////////////////////////////////////
-EmDQMReco::EmDQMReco(const edm::ParameterSet& pset)
-{
+EmDQMReco::EmDQMReco(const edm::ParameterSet &pset) {
   ////////////////////////////////////////////////////////////
   //          Read from configuration file                  //
   ////////////////////////////////////////////////////////////
-  dirname_="HLT/HLTEgammaValidation/"+pset.getParameter<std::string>("@module_label");
+  dirname_ = "HLT/HLTEgammaValidation/" + pset.getParameter<std::string>("@module_label");
 
   // parameters for generator study
-  reqNum    = pset.getParameter<unsigned int>("reqNum");
-  pdgGen    = pset.getParameter<int>("pdgGen");
+  reqNum = pset.getParameter<unsigned int>("reqNum");
+  pdgGen = pset.getParameter<int>("pdgGen");
   recoEtaAcc = pset.getParameter<double>("genEtaAcc");
-  recoEtAcc  = pset.getParameter<double>("genEtAcc");
+  recoEtAcc = pset.getParameter<double>("genEtAcc");
   // plotting parameters (untracked because they don't affect the physics)
-  plotPtMin  = pset.getUntrackedParameter<double>("PtMin",0.);
-  plotPtMax  = pset.getUntrackedParameter<double>("PtMax",1000.);
+  plotPtMin = pset.getUntrackedParameter<double>("PtMin", 0.);
+  plotPtMax = pset.getUntrackedParameter<double>("PtMax", 1000.);
   plotEtaMax = pset.getUntrackedParameter<double>("EtaMax", 2.7);
   plotPhiMax = pset.getUntrackedParameter<double>("PhiMax", 3.15);
-  plotBins   = pset.getUntrackedParameter<unsigned int>("Nbins",50);
+  plotBins = pset.getUntrackedParameter<unsigned int>("Nbins", 50);
   useHumanReadableHistTitles = pset.getUntrackedParameter<bool>("useHumanReadableHistTitles", false);
 
-  triggerNameRecoMonPath = pset.getUntrackedParameter<std::string>("triggerNameRecoMonPath","HLT_MinBias");
-  processNameRecoMonPath = pset.getUntrackedParameter<std::string>("processNameRecoMonPath","HLT");
+  triggerNameRecoMonPath = pset.getUntrackedParameter<std::string>("triggerNameRecoMonPath", "HLT_MinBias");
+  processNameRecoMonPath = pset.getUntrackedParameter<std::string>("processNameRecoMonPath", "HLT");
 
-  recoElectronsInput = consumes<reco::GsfElectronCollection>(pset.getUntrackedParameter<edm::InputTag>("recoElectrons",edm::InputTag("gsfElectrons")));
+  recoElectronsInput = consumes<reco::GsfElectronCollection>(
+      pset.getUntrackedParameter<edm::InputTag>("recoElectrons", edm::InputTag("gsfElectrons")));
   recoObjectsEBT = consumes<std::vector<reco::SuperCluster>>(edm::InputTag("correctedHybridSuperClusters"));
-  recoObjectsEET = consumes<std::vector<reco::SuperCluster>>(edm::InputTag("correctedMulti5x5SuperClustersWithPreshower"));
-  hltResultsT    = consumes<edm::TriggerResults>(edm::InputTag("TriggerResults","",processNameRecoMonPath));
-  triggerObjT    = consumes<trigger::TriggerEventWithRefs>(edm::InputTag("hltTriggerSummaryRAW"));
+  recoObjectsEET =
+      consumes<std::vector<reco::SuperCluster>>(edm::InputTag("correctedMulti5x5SuperClustersWithPreshower"));
+  hltResultsT = consumes<edm::TriggerResults>(edm::InputTag("TriggerResults", "", processNameRecoMonPath));
+  triggerObjT = consumes<trigger::TriggerEventWithRefs>(edm::InputTag("hltTriggerSummaryRAW"));
 
   // preselction cuts
   // recocutCollection_= pset.getParameter<edm::InputTag>("cutcollection");
-  recocut_          = pset.getParameter<int>("cutnum");
+  recocut_ = pset.getParameter<int>("cutnum");
 
   // prescale = 10;
   eventnum = 0;
@@ -142,78 +130,82 @@ EmDQMReco::EmDQMReco(const edm::ParameterSet& pset)
   //         Read in the Vector of Parameter Sets.          //
   //           Information for each filter-step             //
   ////////////////////////////////////////////////////////////
-  std::vector<edm::ParameterSet> filters =
-       pset.getParameter<std::vector<edm::ParameterSet> >("filters");
+  std::vector<edm::ParameterSet> filters = pset.getParameter<std::vector<edm::ParameterSet>>("filters");
 
   int i = 0;
-  for(std::vector<edm::ParameterSet>::iterator filterconf = filters.begin() ; filterconf != filters.end() ; filterconf++)
-  {
-
+  for (std::vector<edm::ParameterSet>::iterator filterconf = filters.begin(); filterconf != filters.end();
+       filterconf++) {
     theHLTCollectionLabels.push_back(filterconf->getParameter<edm::InputTag>("HLTCollectionLabels"));
     theHLTOutputTypes.push_back(filterconf->getParameter<int>("theHLTOutputTypes"));
-    // Grab the human-readable name, if it is not specified, use the Collection Label
-    theHLTCollectionHumanNames.push_back(filterconf->getUntrackedParameter<std::string>("HLTCollectionHumanName",theHLTCollectionLabels[i].label()));
+    // Grab the human-readable name, if it is not specified, use the Collection
+    // Label
+    theHLTCollectionHumanNames.push_back(
+        filterconf->getUntrackedParameter<std::string>("HLTCollectionHumanName", theHLTCollectionLabels[i].label()));
 
-    std::vector<double> bounds = filterconf->getParameter<std::vector<double> >("PlotBounds");
+    std::vector<double> bounds = filterconf->getParameter<std::vector<double>>("PlotBounds");
     // If the size of plot "bounds" vector != 2, abort
     assert(bounds.size() == 2);
-    plotBounds.push_back(std::pair<double,double>(bounds[0],bounds[1]));
-    isoNames.push_back(filterconf->getParameter<std::vector<edm::InputTag> >("IsoCollections"));
-    
-    for (unsigned int i=0; i<isoNames.back().size(); i++) {
-      switch(theHLTOutputTypes.back())  {
-      case trigger::TriggerL1NoIsoEG: 
-	histoFillerL1NonIso->isoNameTokens_.push_back(consumes<edm::AssociationMap<edm::OneToValue<l1extra::L1EmParticleCollection , float>>>(isoNames.back()[i]));
-	break;
-      case trigger::TriggerL1IsoEG: // Isolated Level 1
-	histoFillerL1Iso->isoNameTokens_.push_back(consumes<edm::AssociationMap<edm::OneToValue<l1extra::L1EmParticleCollection , float>>>(isoNames.back()[i]));
-	break;
-      case trigger::TriggerPhoton: // Photon 
-	histoFillerPho->isoNameTokens_.push_back(consumes<edm::AssociationMap<edm::OneToValue<reco::RecoEcalCandidateCollection , float>>>(isoNames.back()[i]));
-	break;
-      case trigger::TriggerElectron: // Electron 
-	histoFillerEle->isoNameTokens_.push_back(consumes<edm::AssociationMap<edm::OneToValue<reco::ElectronCollection , float>>>(isoNames.back()[i]));
-	break;
-      case trigger::TriggerCluster: // TriggerCluster
-	histoFillerClu->isoNameTokens_.push_back(consumes<edm::AssociationMap<edm::OneToValue<reco::RecoEcalCandidateCollection , float>>>(isoNames.back()[i]));
-	break;
-      default: 
-	throw(cms::Exception("Release Validation Error") << "HLT output type not implemented: theHLTOutputTypes[n]" );
+    plotBounds.push_back(std::pair<double, double>(bounds[0], bounds[1]));
+    isoNames.push_back(filterconf->getParameter<std::vector<edm::InputTag>>("IsoCollections"));
+
+    for (unsigned int i = 0; i < isoNames.back().size(); i++) {
+      switch (theHLTOutputTypes.back()) {
+        case trigger::TriggerL1NoIsoEG:
+          histoFillerL1NonIso->isoNameTokens_.push_back(
+              consumes<edm::AssociationMap<edm::OneToValue<l1extra::L1EmParticleCollection, float>>>(
+                  isoNames.back()[i]));
+          break;
+        case trigger::TriggerL1IsoEG:  // Isolated Level 1
+          histoFillerL1Iso->isoNameTokens_.push_back(
+              consumes<edm::AssociationMap<edm::OneToValue<l1extra::L1EmParticleCollection, float>>>(
+                  isoNames.back()[i]));
+          break;
+        case trigger::TriggerPhoton:  // Photon
+          histoFillerPho->isoNameTokens_.push_back(
+              consumes<edm::AssociationMap<edm::OneToValue<reco::RecoEcalCandidateCollection, float>>>(
+                  isoNames.back()[i]));
+          break;
+        case trigger::TriggerElectron:  // Electron
+          histoFillerEle->isoNameTokens_.push_back(
+              consumes<edm::AssociationMap<edm::OneToValue<reco::ElectronCollection, float>>>(isoNames.back()[i]));
+          break;
+        case trigger::TriggerCluster:  // TriggerCluster
+          histoFillerClu->isoNameTokens_.push_back(
+              consumes<edm::AssociationMap<edm::OneToValue<reco::RecoEcalCandidateCollection, float>>>(
+                  isoNames.back()[i]));
+          break;
+        default:
+          throw(cms::Exception("Release Validation Error") << "HLT output type not implemented: theHLTOutputTypes[n]");
       }
     }
-    
+
     // If the size of the isoNames vector is not greater than zero, abort
     assert(!isoNames.back().empty());
-    if (isoNames.back().at(0).label()=="none") {
+    if (isoNames.back().at(0).label() == "none") {
       plotiso.push_back(false);
     } else {
       plotiso.push_back(true);
     }
     i++;
-  } // END of loop over parameter sets
+  }  // END of loop over parameter sets
 
   // Record number of HLTCollectionLabels
   numOfHLTCollectionLabels = theHLTCollectionLabels.size();
-
 }
 
 ///
 ///
 ///
-void EmDQMReco::dqmBeginRun(const edm::Run& iRun, const edm::EventSetup& iSetup ) {
-
-  bool isHltConfigChanged = false; // change of cfg at run boundaries?
-  isHltConfigInitialized_ = hltConfig_.init( iRun, iSetup, "HLT", isHltConfigChanged );
-
+void EmDQMReco::dqmBeginRun(const edm::Run &iRun, const edm::EventSetup &iSetup) {
+  bool isHltConfigChanged = false;  // change of cfg at run boundaries?
+  isHltConfigInitialized_ = hltConfig_.init(iRun, iSetup, "HLT", isHltConfigChanged);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //       book DQM histograms                                                  //
 ////////////////////////////////////////////////////////////////////////////////
-void
-EmDQMReco::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &iRun, edm::EventSetup const &iSetup)
-{
-  //edm::Service<TFileService> fs;
+void EmDQMReco::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &iRun, edm::EventSetup const &iSetup) {
+  // edm::Service<TFileService> fs;
   iBooker.setCurrentFolder(dirname_);
 
   ////////////////////////////////////////////////////////////
@@ -222,68 +214,71 @@ EmDQMReco::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &iRun, edm:
   //    from the configuration file.                        //
   ////////////////////////////////////////////////////////////
 
-  std::string histName="total_eff";
+  std::string histName = "total_eff";
   std::string histTitle = "total events passing";
   // This plot will have bins equal to 2+(number of
   //        HLTCollectionLabels in the config file)
-  totalreco = iBooker.book1D(histName.c_str(),histTitle.c_str(),numOfHLTCollectionLabels+2,0,numOfHLTCollectionLabels+2);
-  totalreco->setBinLabel(numOfHLTCollectionLabels+1,"Total");
-  totalreco->setBinLabel(numOfHLTCollectionLabels+2,"Reco");
-  for (unsigned int u=0; u<numOfHLTCollectionLabels; u++){totalreco->setBinLabel(u+1,theHLTCollectionLabels[u].label());}
-
-  histName="total_eff_RECO_matched";
-  histTitle="total events passing (Reco matched)";
-  totalmatchreco = iBooker.book1D(histName.c_str(),histTitle.c_str(),numOfHLTCollectionLabels+2,0,numOfHLTCollectionLabels+2);
-  totalmatchreco->setBinLabel(numOfHLTCollectionLabels+1,"Total");
-  totalmatchreco->setBinLabel(numOfHLTCollectionLabels+2,"Reco");
-  for (unsigned int u=0; u<numOfHLTCollectionLabels; u++){totalmatchreco->setBinLabel(u+1,theHLTCollectionLabels[u].label());}
+  totalreco = iBooker.book1D(
+      histName.c_str(), histTitle.c_str(), numOfHLTCollectionLabels + 2, 0, numOfHLTCollectionLabels + 2);
+  totalreco->setBinLabel(numOfHLTCollectionLabels + 1, "Total");
+  totalreco->setBinLabel(numOfHLTCollectionLabels + 2, "Reco");
+  for (unsigned int u = 0; u < numOfHLTCollectionLabels; u++) {
+    totalreco->setBinLabel(u + 1, theHLTCollectionLabels[u].label());
+  }
+
+  histName = "total_eff_RECO_matched";
+  histTitle = "total events passing (Reco matched)";
+  totalmatchreco = iBooker.book1D(
+      histName.c_str(), histTitle.c_str(), numOfHLTCollectionLabels + 2, 0, numOfHLTCollectionLabels + 2);
+  totalmatchreco->setBinLabel(numOfHLTCollectionLabels + 1, "Total");
+  totalmatchreco->setBinLabel(numOfHLTCollectionLabels + 2, "Reco");
+  for (unsigned int u = 0; u < numOfHLTCollectionLabels; u++) {
+    totalmatchreco->setBinLabel(u + 1, theHLTCollectionLabels[u].label());
+  }
 
   // MonitorElement* tmphisto;
-  MonitorElement* tmpiso;
+  MonitorElement *tmpiso;
 
   ////////////////////////////////////////////////////////////
   // Set up generator-level histograms                      //
   ////////////////////////////////////////////////////////////
   std::string pdgIdString;
-  switch(pdgGen) {
-  case 11:
-    pdgIdString="Electron";break;
-  case 22:
-    pdgIdString="Photon";break;
-  default:
-    pdgIdString="Particle";
+  switch (pdgGen) {
+    case 11:
+      pdgIdString = "Electron";
+      break;
+    case 22:
+      pdgIdString = "Photon";
+      break;
+    default:
+      pdgIdString = "Particle";
   }
 
   //--------------------
 
   // reco
   // (note that reset(..) must be used to set the value of the scoped_ptr...)
-  histReco.reset(
-      new FourVectorMonitorElements(this, iBooker,
-          "reco_%s",             // pattern for histogram name
-          "%s of " + pdgIdString + "s"
-      ));
+  histReco.reset(new FourVectorMonitorElements(this,
+                                               iBooker,
+                                               "reco_%s",  // pattern for histogram name
+                                               "%s of " + pdgIdString + "s"));
 
   //--------------------
 
   // monpath
-  histRecoMonpath.reset(
-       new FourVectorMonitorElements(this, iBooker,
-           "reco_%s_monpath",   // pattern for histogram name
-           "%s of " + pdgIdString + "s monpath"
-       )
-  );
+  histRecoMonpath.reset(new FourVectorMonitorElements(this,
+                                                      iBooker,
+                                                      "reco_%s_monpath",  // pattern for histogram name
+                                                      "%s of " + pdgIdString + "s monpath"));
 
   //--------------------
 
-  // TODO: WHAT ARE THESE HISTOGRAMS FOR ? THEY SEEM NEVER REFERENCED ANYWHERE IN THIS FILE...
-  // final X monpath
-  histMonpath.reset(
-       new FourVectorMonitorElements(this, iBooker,
-           "final_%s_monpath",   // pattern for histogram name
-           "Final %s Monpath"
-       )
-  );
+  // TODO: WHAT ARE THESE HISTOGRAMS FOR ? THEY SEEM NEVER REFERENCED ANYWHERE
+  // IN THIS FILE... final X monpath
+  histMonpath.reset(new FourVectorMonitorElements(this,
+                                                  iBooker,
+                                                  "final_%s_monpath",  // pattern for histogram name
+                                                  "Final %s Monpath"));
 
   //--------------------
 
@@ -293,119 +288,142 @@ EmDQMReco::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &iRun, edm:
 
   // Determine what strings to use for histogram titles
   std::vector<std::string> HltHistTitle;
-  if ( theHLTCollectionHumanNames.size() == numOfHLTCollectionLabels && useHumanReadableHistTitles ) {
+  if (theHLTCollectionHumanNames.size() == numOfHLTCollectionLabels && useHumanReadableHistTitles) {
     HltHistTitle = theHLTCollectionHumanNames;
   } else {
-    for (unsigned int i =0; i < numOfHLTCollectionLabels; i++) {
+    for (unsigned int i = 0; i < numOfHLTCollectionLabels; i++) {
       HltHistTitle.push_back(theHLTCollectionLabels[i].label());
     }
   }
 
-  for(unsigned int i = 0; i< numOfHLTCollectionLabels ; i++){
+  for (unsigned int i = 0; i < numOfHLTCollectionLabels; i++) {
     //--------------------
     // distributions of HLT objects passing filter i
     //--------------------
 
-//    // Et
-//    histName = theHLTCollectionLabels[i].label()+"et_all";
-//    histTitle = HltHistTitle[i]+" Et (ALL)";
-//    tmphisto =  iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,plotPtMin,plotPtMax);
-//    ethist.push_back(tmphisto);
-//
-//    // Eta
-//    histName = theHLTCollectionLabels[i].label()+"eta_all";
-//    histTitle = HltHistTitle[i]+" #eta (ALL)";
-//    tmphisto =  iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,-plotEtaMax,plotEtaMax);
-//    etahist.push_back(tmphisto);
-//
-//    // phi
-//    histName = theHLTCollectionLabels[i].label()+"phi_all";
-//    histTitle = HltHistTitle[i]+" #phi (ALL)";
-//    tmphisto =  iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,-plotPhiMax,plotPhiMax);
-//    phiHist.push_back(tmphisto);
-
-    standardHist.push_back(new FourVectorMonitorElements(this, iBooker,
-							 theHLTCollectionLabels[i].label()+"%s_all", // histogram name
-							 HltHistTitle[i]+" %s (ALL)"                 // histogram title
-							 ));
+    //    // Et
+    //    histName = theHLTCollectionLabels[i].label()+"et_all";
+    //    histTitle = HltHistTitle[i]+" Et (ALL)";
+    //    tmphisto =
+    //    iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,plotPtMin,plotPtMax);
+    //    ethist.push_back(tmphisto);
+    //
+    //    // Eta
+    //    histName = theHLTCollectionLabels[i].label()+"eta_all";
+    //    histTitle = HltHistTitle[i]+" #eta (ALL)";
+    //    tmphisto =
+    //    iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,-plotEtaMax,plotEtaMax);
+    //    etahist.push_back(tmphisto);
+    //
+    //    // phi
+    //    histName = theHLTCollectionLabels[i].label()+"phi_all";
+    //    histTitle = HltHistTitle[i]+" #phi (ALL)";
+    //    tmphisto =
+    //    iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,-plotPhiMax,plotPhiMax);
+    //    phiHist.push_back(tmphisto);
+
+    standardHist.push_back(new FourVectorMonitorElements(
+        this,
+        iBooker,
+        theHLTCollectionLabels[i].label() + "%s_all",  // histogram name
+        HltHistTitle[i] + " %s (ALL)"                  // histogram title
+        ));
 
     //--------------------
     // distributions of reco object matching HLT object passing filter i
     //--------------------
 
     // Et
-//    histName = theHLTCollectionLabels[i].label()+"et_RECO_matched";
-//    histTitle = HltHistTitle[i]+" Et (RECO matched)";
-//    tmphisto =  iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,plotPtMin,plotPtMax);
-//    ethistmatchreco.push_back(tmphisto);
-
-//    // Eta
-//    histName = theHLTCollectionLabels[i].label()+"eta_RECO_matched";
-//    histTitle = HltHistTitle[i]+" #eta (RECO matched)";
-//    tmphisto =  iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,-plotEtaMax,plotEtaMax);
-//    etahistmatchreco.push_back(tmphisto);
-//
-//    // phi
-//    histName = theHLTCollectionLabels[i].label()+"phi_RECO_matched";
-//    histTitle = HltHistTitle[i]+" #phi (RECO matched)";
-//    tmphisto =  iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,-plotPhiMax,plotPhiMax);
-//    phiHistMatchReco.push_back(tmphisto);
-    histMatchReco.push_back(new FourVectorMonitorElements(this, iBooker,
-        theHLTCollectionLabels[i].label()+"%s_RECO_matched", // histogram name
-        HltHistTitle[i]+" %s (RECO matched)"                 // histogram title
+    //    histName = theHLTCollectionLabels[i].label()+"et_RECO_matched";
+    //    histTitle = HltHistTitle[i]+" Et (RECO matched)";
+    //    tmphisto =
+    //    iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,plotPtMin,plotPtMax);
+    //    ethistmatchreco.push_back(tmphisto);
+
+    //    // Eta
+    //    histName = theHLTCollectionLabels[i].label()+"eta_RECO_matched";
+    //    histTitle = HltHistTitle[i]+" #eta (RECO matched)";
+    //    tmphisto =
+    //    iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,-plotEtaMax,plotEtaMax);
+    //    etahistmatchreco.push_back(tmphisto);
+    //
+    //    // phi
+    //    histName = theHLTCollectionLabels[i].label()+"phi_RECO_matched";
+    //    histTitle = HltHistTitle[i]+" #phi (RECO matched)";
+    //    tmphisto =
+    //    iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,-plotPhiMax,plotPhiMax);
+    //    phiHistMatchReco.push_back(tmphisto);
+    histMatchReco.push_back(new FourVectorMonitorElements(
+        this,
+        iBooker,
+        theHLTCollectionLabels[i].label() + "%s_RECO_matched",  // histogram name
+        HltHistTitle[i] + " %s (RECO matched)"                  // histogram title
         ));
 
     //--------------------
     // distributions of reco object matching HLT object passing filter i
     //--------------------
 
-//    // Et
-//    histName = theHLTCollectionLabels[i].label()+"et_RECO_matched_monpath";
-//    histTitle = HltHistTitle[i]+" Et (RECO matched, monpath)";
-//    tmphisto =  iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,plotPtMin,plotPtMax);
-//    ethistmatchrecomonpath.push_back(tmphisto);
-//
-//    // Eta
-//    histName = theHLTCollectionLabels[i].label()+"eta_RECO_matched_monpath";
-//    histTitle = HltHistTitle[i]+" #eta (RECO matched, monpath)";
-//    tmphisto =  iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,-plotEtaMax,plotEtaMax);
-//    etahistmatchrecomonpath.push_back(tmphisto);
-//
-//    // phi
-//    histName = theHLTCollectionLabels[i].label()+"phi_RECO_matched_monpath";
-//    histTitle = HltHistTitle[i]+" #phi (RECO matched, monpath)";
-//    tmphisto =  iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,-plotPhiMax,plotPhiMax);
-//    phiHistMatchRecoMonPath.push_back(tmphisto);
-
-    histMatchRecoMonPath.push_back(new FourVectorMonitorElements(this, iBooker,
-        theHLTCollectionLabels[i].label()+"%s_RECO_matched_monpath", // histogram name
-        HltHistTitle[i]+" %s (RECO matched, monpath)"                // histogram title
+    //    // Et
+    //    histName =
+    //    theHLTCollectionLabels[i].label()+"et_RECO_matched_monpath"; histTitle
+    //    = HltHistTitle[i]+" Et (RECO matched, monpath)"; tmphisto =
+    //    iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,plotPtMin,plotPtMax);
+    //    ethistmatchrecomonpath.push_back(tmphisto);
+    //
+    //    // Eta
+    //    histName =
+    //    theHLTCollectionLabels[i].label()+"eta_RECO_matched_monpath";
+    //    histTitle = HltHistTitle[i]+" #eta (RECO matched, monpath)";
+    //    tmphisto =
+    //    iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,-plotEtaMax,plotEtaMax);
+    //    etahistmatchrecomonpath.push_back(tmphisto);
+    //
+    //    // phi
+    //    histName =
+    //    theHLTCollectionLabels[i].label()+"phi_RECO_matched_monpath";
+    //    histTitle = HltHistTitle[i]+" #phi (RECO matched, monpath)";
+    //    tmphisto =
+    //    iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,-plotPhiMax,plotPhiMax);
+    //    phiHistMatchRecoMonPath.push_back(tmphisto);
+
+    histMatchRecoMonPath.push_back(new FourVectorMonitorElements(
+        this,
+        iBooker,
+        theHLTCollectionLabels[i].label() + "%s_RECO_matched_monpath",  // histogram name
+        HltHistTitle[i] + " %s (RECO matched, monpath)"                 // histogram title
         ));
     //--------------------
-    // distributions of HLT object that is closest delta-R match to sorted reco particle(s)
+    // distributions of HLT object that is closest delta-R match to sorted reco
+    // particle(s)
     //--------------------
 
     // Et
-//    histName  = theHLTCollectionLabels[i].label()+"et_reco";
-//    histTitle = HltHistTitle[i]+" Et (reco)";
-//    tmphisto  = iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,plotPtMin,plotPtMax);
-//    histEtOfHltObjMatchToReco.push_back(tmphisto);
-//
-//    // eta
-//    histName  = theHLTCollectionLabels[i].label()+"eta_reco";
-//    histTitle = HltHistTitle[i]+" eta (reco)";
-//    tmphisto  = iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,-plotEtaMax,plotEtaMax);
-//    histEtaOfHltObjMatchToReco.push_back(tmphisto);
-//
-//    // phi
-//    histName  = theHLTCollectionLabels[i].label()+"phi_reco";
-//    histTitle = HltHistTitle[i]+" phi (reco)";
-//    tmphisto  = iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,-plotPhiMax,plotPhiMax);
-//    histPhiOfHltObjMatchToReco.push_back(tmphisto);
-
-    histHltObjMatchToReco.push_back(new FourVectorMonitorElements(this, iBooker,
-        theHLTCollectionLabels[i].label()+"%s_reco",   // histogram name
-        HltHistTitle[i]+" %s (reco)"                  // histogram title
+    //    histName  = theHLTCollectionLabels[i].label()+"et_reco";
+    //    histTitle = HltHistTitle[i]+" Et (reco)";
+    //    tmphisto  =
+    //    iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,plotPtMin,plotPtMax);
+    //    histEtOfHltObjMatchToReco.push_back(tmphisto);
+    //
+    //    // eta
+    //    histName  = theHLTCollectionLabels[i].label()+"eta_reco";
+    //    histTitle = HltHistTitle[i]+" eta (reco)";
+    //    tmphisto  =
+    //    iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,-plotEtaMax,plotEtaMax);
+    //    histEtaOfHltObjMatchToReco.push_back(tmphisto);
+    //
+    //    // phi
+    //    histName  = theHLTCollectionLabels[i].label()+"phi_reco";
+    //    histTitle = HltHistTitle[i]+" phi (reco)";
+    //    tmphisto  =
+    //    iBooker.book1D(histName.c_str(),histTitle.c_str(),plotBins,-plotPhiMax,plotPhiMax);
+    //    histPhiOfHltObjMatchToReco.push_back(tmphisto);
+
+    histHltObjMatchToReco.push_back(new FourVectorMonitorElements(
+        this,
+        iBooker,
+        theHLTCollectionLabels[i].label() + "%s_reco",  // histogram name
+        HltHistTitle[i] + " %s (reco)"                  // histogram title
         ));
 
     //--------------------
@@ -425,27 +443,47 @@ EmDQMReco::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &iRun, edm:
       histPhiIsoOfHltObjMatchToReco.push_back(tmpiso);
 
     } else {
-
       //--------------------
       // 2D plot: Isolation values vs X for all objects
       //--------------------
 
       // X = eta
-      histName  = theHLTCollectionLabels[i].label()+"eta_isolation_all";
-      histTitle = HltHistTitle[i]+" isolation vs #eta (all)";
-      tmpiso    = iBooker.book2D(histName.c_str(),histTitle.c_str(),plotBins,-plotEtaMax,plotEtaMax,plotBins,plotBounds[i].first,plotBounds[i].second);
+      histName = theHLTCollectionLabels[i].label() + "eta_isolation_all";
+      histTitle = HltHistTitle[i] + " isolation vs #eta (all)";
+      tmpiso = iBooker.book2D(histName.c_str(),
+                              histTitle.c_str(),
+                              plotBins,
+                              -plotEtaMax,
+                              plotEtaMax,
+                              plotBins,
+                              plotBounds[i].first,
+                              plotBounds[i].second);
       etahistiso.push_back(tmpiso);
 
       // X = et
-      histName  = theHLTCollectionLabels[i].label()+"et_isolation_all";
-      histTitle = HltHistTitle[i]+" isolation vs Et (all)";
-      tmpiso    = iBooker.book2D(histName.c_str(),histTitle.c_str(),plotBins,plotPtMin,plotPtMax,plotBins,plotBounds[i].first,plotBounds[i].second);
+      histName = theHLTCollectionLabels[i].label() + "et_isolation_all";
+      histTitle = HltHistTitle[i] + " isolation vs Et (all)";
+      tmpiso = iBooker.book2D(histName.c_str(),
+                              histTitle.c_str(),
+                              plotBins,
+                              plotPtMin,
+                              plotPtMax,
+                              plotBins,
+                              plotBounds[i].first,
+                              plotBounds[i].second);
       ethistiso.push_back(tmpiso);
 
       // X = phi
-      histName  = theHLTCollectionLabels[i].label()+"phi_isolation_all";
-      histTitle = HltHistTitle[i]+" isolation vs #phi (all)";
-      tmpiso    = iBooker.book2D(histName.c_str(),histTitle.c_str(),plotBins,-plotPhiMax,plotPhiMax,plotBins,plotBounds[i].first,plotBounds[i].second);
+      histName = theHLTCollectionLabels[i].label() + "phi_isolation_all";
+      histTitle = HltHistTitle[i] + " isolation vs #phi (all)";
+      tmpiso = iBooker.book2D(histName.c_str(),
+                              histTitle.c_str(),
+                              plotBins,
+                              -plotPhiMax,
+                              plotPhiMax,
+                              plotBins,
+                              plotBounds[i].first,
+                              plotBounds[i].second);
       phiHistIso.push_back(tmpiso);
 
       //--------------------
@@ -453,21 +491,42 @@ EmDQMReco::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &iRun, edm:
       //--------------------
 
       // X = eta
-      histName  = theHLTCollectionLabels[i].label()+"eta_isolation_RECO_matched";
-      histTitle = HltHistTitle[i]+" isolation vs #eta (reco matched)";
-      tmpiso    = iBooker.book2D(histName.c_str(),histTitle.c_str(),plotBins,-plotEtaMax,plotEtaMax,plotBins,plotBounds[i].first,plotBounds[i].second);
+      histName = theHLTCollectionLabels[i].label() + "eta_isolation_RECO_matched";
+      histTitle = HltHistTitle[i] + " isolation vs #eta (reco matched)";
+      tmpiso = iBooker.book2D(histName.c_str(),
+                              histTitle.c_str(),
+                              plotBins,
+                              -plotEtaMax,
+                              plotEtaMax,
+                              plotBins,
+                              plotBounds[i].first,
+                              plotBounds[i].second);
       etahistisomatchreco.push_back(tmpiso);
 
       // X = et
-      histName  = theHLTCollectionLabels[i].label()+"et_isolation_RECO_matched";
-      histTitle = HltHistTitle[i]+" isolation vs Et (reco matched)";
-      tmpiso    = iBooker.book2D(histName.c_str(),histTitle.c_str(),plotBins,plotPtMin,plotPtMax,plotBins,plotBounds[i].first,plotBounds[i].second);
+      histName = theHLTCollectionLabels[i].label() + "et_isolation_RECO_matched";
+      histTitle = HltHistTitle[i] + " isolation vs Et (reco matched)";
+      tmpiso = iBooker.book2D(histName.c_str(),
+                              histTitle.c_str(),
+                              plotBins,
+                              plotPtMin,
+                              plotPtMax,
+                              plotBins,
+                              plotBounds[i].first,
+                              plotBounds[i].second);
       ethistisomatchreco.push_back(tmpiso);
 
       // X = eta
-      histName  = theHLTCollectionLabels[i].label()+"phi_isolation_RECO_matched";
-      histTitle = HltHistTitle[i]+" isolation vs #phi (reco matched)";
-      tmpiso    = iBooker.book2D(histName.c_str(),histTitle.c_str(),plotBins,-plotPhiMax,plotPhiMax,plotBins,plotBounds[i].first,plotBounds[i].second);
+      histName = theHLTCollectionLabels[i].label() + "phi_isolation_RECO_matched";
+      histTitle = HltHistTitle[i] + " isolation vs #phi (reco matched)";
+      tmpiso = iBooker.book2D(histName.c_str(),
+                              histTitle.c_str(),
+                              plotBins,
+                              -plotPhiMax,
+                              plotPhiMax,
+                              plotBins,
+                              plotBounds[i].first,
+                              plotBounds[i].second);
       phiHistIsoMatchReco.push_back(tmpiso);
 
       //--------------------
@@ -476,69 +535,87 @@ EmDQMReco::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &iRun, edm:
       //--------------------
 
       // X = eta
-      histName  = theHLTCollectionLabels[i].label()+"eta_isolation_reco";
-      histTitle = HltHistTitle[i]+" isolation vs #eta (reco)";
-      tmpiso    = iBooker.book2D(histName.c_str(),histTitle.c_str(),plotBins,-plotEtaMax,plotEtaMax,plotBins,plotBounds[i].first,plotBounds[i].second);
+      histName = theHLTCollectionLabels[i].label() + "eta_isolation_reco";
+      histTitle = HltHistTitle[i] + " isolation vs #eta (reco)";
+      tmpiso = iBooker.book2D(histName.c_str(),
+                              histTitle.c_str(),
+                              plotBins,
+                              -plotEtaMax,
+                              plotEtaMax,
+                              plotBins,
+                              plotBounds[i].first,
+                              plotBounds[i].second);
       histEtaIsoOfHltObjMatchToReco.push_back(tmpiso);
 
       // X = et
-      histName  = theHLTCollectionLabels[i].label()+"et_isolation_reco";
-      histTitle = HltHistTitle[i]+" isolation vs Et (reco)";
-      tmpiso    = iBooker.book2D(histName.c_str(),histTitle.c_str(),plotBins,plotPtMin,plotPtMax,plotBins,plotBounds[i].first,plotBounds[i].second);
+      histName = theHLTCollectionLabels[i].label() + "et_isolation_reco";
+      histTitle = HltHistTitle[i] + " isolation vs Et (reco)";
+      tmpiso = iBooker.book2D(histName.c_str(),
+                              histTitle.c_str(),
+                              plotBins,
+                              plotPtMin,
+                              plotPtMax,
+                              plotBins,
+                              plotBounds[i].first,
+                              plotBounds[i].second);
       histEtIsoOfHltObjMatchToReco.push_back(tmpiso);
 
       // X = phi
-      histName  = theHLTCollectionLabels[i].label()+"phi_isolation_reco";
-      histTitle = HltHistTitle[i]+" isolation vs #phi (reco)";
-      tmpiso    = iBooker.book2D(histName.c_str(),histTitle.c_str(),plotBins,-plotPhiMax,plotPhiMax,plotBins,plotBounds[i].first,plotBounds[i].second);
+      histName = theHLTCollectionLabels[i].label() + "phi_isolation_reco";
+      histTitle = HltHistTitle[i] + " isolation vs #phi (reco)";
+      tmpiso = iBooker.book2D(histName.c_str(),
+                              histTitle.c_str(),
+                              plotBins,
+                              -plotPhiMax,
+                              plotPhiMax,
+                              plotBins,
+                              plotBounds[i].first,
+                              plotBounds[i].second);
       histPhiIsoOfHltObjMatchToReco.push_back(tmpiso);
       //--------------------
 
-    } // END of HLT histograms
+    }  // END of HLT histograms
   }
 }
 
-
 ////////////////////////////////////////////////////////////////////////////////
 //                                Destructor                                  //
 ////////////////////////////////////////////////////////////////////////////////
-EmDQMReco::~EmDQMReco(){
-}
-
+EmDQMReco::~EmDQMReco() {}
 
 ////////////////////////////////////////////////////////////////////////////////
 //                     method called to for each event                        //
 ////////////////////////////////////////////////////////////////////////////////
-void
-EmDQMReco::analyze(const edm::Event & event , const edm::EventSetup& setup)
-{
-
+void EmDQMReco::analyze(const edm::Event &event, const edm::EventSetup &setup) {
   // protect from hlt config failure
-  if( !isHltConfigInitialized_ ) return;
+  if (!isHltConfigInitialized_)
+    return;
 
   eventnum++;
   bool plotMonpath = false;
   bool plotReco = true;
 
-  edm::Handle<edm::View<reco::Candidate> > recoObjects;
-  edm::Handle<std::vector<reco::SuperCluster> > recoObjectsEB;
-  edm::Handle<std::vector<reco::SuperCluster> > recoObjectsEE;
+  edm::Handle<edm::View<reco::Candidate>> recoObjects;
+  edm::Handle<std::vector<reco::SuperCluster>> recoObjectsEB;
+  edm::Handle<std::vector<reco::SuperCluster>> recoObjectsEE;
 
   if (pdgGen == 11) {
-
     event.getByToken(recoElectronsInput, recoObjects);
 
     if (recoObjects->size() < (unsigned int)recocut_) {
-      // edm::LogWarning("EmDQMReco") << "Less than "<< recocut_ <<" Reco particles with pdgId=" << pdgGen << ".  Only " << cutRecoCounter->size() << " particles.";
+      // edm::LogWarning("EmDQMReco") << "Less than "<< recocut_ <<" Reco
+      // particles with pdgId=" << pdgGen << ".  Only " <<
+      // cutRecoCounter->size() << " particles.";
       return;
     }
   } else if (pdgGen == 22) {
-
     event.getByToken(recoObjectsEBT, recoObjectsEB);
     event.getByToken(recoObjectsEET, recoObjectsEE);
 
     if (recoObjectsEB->size() + recoObjectsEE->size() < (unsigned int)recocut_) {
-      // edm::LogWarning("EmDQMReco") << "Less than "<< recocut_ <<" Reco particles with pdgId=" << pdgGen << ".  Only " << cutRecoCounter.size() << " particles.";
+      // edm::LogWarning("EmDQMReco") << "Less than "<< recocut_ <<" Reco
+      // particles with pdgId=" << pdgGen << ".  Only " << cutRecoCounter.size()
+      // << " particles.";
       return;
     }
   }
@@ -564,9 +641,9 @@ EmDQMReco::analyze(const edm::Event & event , const edm::EventSetup& setup)
   unsigned int triggerIndex;
   triggerIndex = hltConfig_.triggerIndex(triggerNameRecoMonPath);
 
-  //triggerIndex must be less than the size of HLTR or you get a CMSException
+  // triggerIndex must be less than the size of HLTR or you get a CMSException
   bool isFired = false;
-  if (triggerIndex < HLTR->size()){
+  if (triggerIndex < HLTR->size()) {
     isFired = HLTR->accept(triggerIndex);
   }
 
@@ -575,7 +652,7 @@ EmDQMReco::analyze(const edm::Event & event , const edm::EventSetup& setup)
   edm::Handle<trigger::TriggerEventWithRefs> triggerObj;
   event.getByToken(triggerObjT, triggerObj);
 
-  if(!triggerObj.isValid()) {
+  if (!triggerObj.isValid()) {
     edm::LogWarning("EmDQMReco") << "RAW-type HLT results not found, skipping event";
     return;
   }
@@ -584,158 +661,164 @@ EmDQMReco::analyze(const edm::Event & event , const edm::EventSetup& setup)
   //  Fill the bin labeled "Total"                          //
   //   This will be the number of events looked at.         //
   ////////////////////////////////////////////////////////////
-  totalreco->Fill(numOfHLTCollectionLabels+0.5);
-  totalmatchreco->Fill(numOfHLTCollectionLabels+.5);
+  totalreco->Fill(numOfHLTCollectionLabels + 0.5);
+  totalmatchreco->Fill(numOfHLTCollectionLabels + .5);
 
   ////////////////////////////////////////////////////////////
   //  Fill the bin labeled "Total"                          //
   //   This will be the number of events looked at.         //
   ////////////////////////////////////////////////////////////
-  //total->Fill(numOfHLTCollectionLabels+0.5);
-  //totalmatch->Fill(numOfHLTCollectionLabels+0.5);
-
+  // total->Fill(numOfHLTCollectionLabels+0.5);
+  // totalmatch->Fill(numOfHLTCollectionLabels+0.5);
 
   ////////////////////////////////////////////////////////////
   //               Fill reconstruction info                      //
   ////////////////////////////////////////////////////////////
-  // the recocut_ highest Et generator objects of the preselected type are our matches
+  // the recocut_ highest Et generator objects of the preselected type are our
+  // matches
 
   std::vector<reco::Particle> sortedReco;
   if (plotReco == true) {
     if (pdgGen == 11) {
-      for(edm::View<reco::Candidate>::const_iterator recopart = recoObjects->begin(); recopart != recoObjects->end();recopart++){
-        reco::Particle tmpcand(  recopart->charge(), recopart->p4(), recopart->vertex(),recopart->pdgId(),recopart->status() );
+      for (edm::View<reco::Candidate>::const_iterator recopart = recoObjects->begin(); recopart != recoObjects->end();
+           recopart++) {
+        reco::Particle tmpcand(
+            recopart->charge(), recopart->p4(), recopart->vertex(), recopart->pdgId(), recopart->status());
         sortedReco.push_back(tmpcand);
       }
-    }
-    else if (pdgGen == 22) {
-      for(std::vector<reco::SuperCluster>::const_iterator recopart2 = recoObjectsEB->begin(); recopart2 != recoObjectsEB->end();recopart2++){
+    } else if (pdgGen == 22) {
+      for (std::vector<reco::SuperCluster>::const_iterator recopart2 = recoObjectsEB->begin();
+           recopart2 != recoObjectsEB->end();
+           recopart2++) {
         float en = recopart2->energy();
-        float er = sqrt(pow(recopart2->x(),2) + pow(recopart2->y(),2) + pow(recopart2->z(),2) );
-        float px = recopart2->energy()*recopart2->x()/er;
-        float py = recopart2->energy()*recopart2->y()/er;
-        float pz = recopart2->energy()*recopart2->z()/er;
-        reco::Candidate::LorentzVector thisLV(px,py,pz,en);
-        reco::Particle tmpcand(  0, thisLV, math::XYZPoint(0.,0.,0.), 22, 1 );
+        float er = sqrt(pow(recopart2->x(), 2) + pow(recopart2->y(), 2) + pow(recopart2->z(), 2));
+        float px = recopart2->energy() * recopart2->x() / er;
+        float py = recopart2->energy() * recopart2->y() / er;
+        float pz = recopart2->energy() * recopart2->z() / er;
+        reco::Candidate::LorentzVector thisLV(px, py, pz, en);
+        reco::Particle tmpcand(0, thisLV, math::XYZPoint(0., 0., 0.), 22, 1);
         sortedReco.push_back(tmpcand);
       }
-      for(std::vector<reco::SuperCluster>::const_iterator recopart2 = recoObjectsEE->begin(); recopart2 != recoObjectsEE->end();recopart2++){
+      for (std::vector<reco::SuperCluster>::const_iterator recopart2 = recoObjectsEE->begin();
+           recopart2 != recoObjectsEE->end();
+           recopart2++) {
         float en = recopart2->energy();
-        float er = sqrt(pow(recopart2->x(),2) + pow(recopart2->y(),2) + pow(recopart2->z(),2) );
-        float px = recopart2->energy()*recopart2->x()/er;
-        float py = recopart2->energy()*recopart2->y()/er;
-        float pz = recopart2->energy()*recopart2->z()/er;
-        reco::Candidate::LorentzVector thisLV(px,py,pz,en);
-        reco::Particle tmpcand(  0, thisLV, math::XYZPoint(0.,0.,0.), 22, 1 );
+        float er = sqrt(pow(recopart2->x(), 2) + pow(recopart2->y(), 2) + pow(recopart2->z(), 2));
+        float px = recopart2->energy() * recopart2->x() / er;
+        float py = recopart2->energy() * recopart2->y() / er;
+        float pz = recopart2->energy() * recopart2->z() / er;
+        reco::Candidate::LorentzVector thisLV(px, py, pz, en);
+        reco::Particle tmpcand(0, thisLV, math::XYZPoint(0., 0., 0.), 22, 1);
         sortedReco.push_back(tmpcand);
       }
     }
 
-    std::sort(sortedReco.begin(),sortedReco.end(),pTComparator_ );
+    std::sort(sortedReco.begin(), sortedReco.end(), pTComparator_);
 
     // Now the collection of gen particles is sorted by pt.
     // So, remove all particles from the collection so that we
     // only have the top "1 thru recocut_" particles in it
 
-    sortedReco.erase(sortedReco.begin()+recocut_,sortedReco.end());
+    sortedReco.erase(sortedReco.begin() + recocut_, sortedReco.end());
 
-    for (unsigned int i = 0 ; i < recocut_ ; i++ ) {
-        //validity has been implicitily checked by the cut on recocut_ above
-        histReco->fill(sortedReco[i].p4());
+    for (unsigned int i = 0; i < recocut_; i++) {
+      // validity has been implicitily checked by the cut on recocut_ above
+      histReco->fill(sortedReco[i].p4());
 
-//      etreco ->Fill( sortedReco[i].et()  );
-//      etareco->Fill( sortedReco[i].eta() );
-//      phiReco->Fill( sortedReco[i].phi() );
+      //      etreco ->Fill( sortedReco[i].et()  );
+      //      etareco->Fill( sortedReco[i].eta() );
+      //      phiReco->Fill( sortedReco[i].phi() );
 
       if (isFired) {
         histRecoMonpath->fill(sortedReco[i].p4());
         plotMonpath = true;
       }
 
-    } // END of loop over Reconstructed particles
-
-    if (recocut_ >= reqNum) totalreco->Fill(numOfHLTCollectionLabels+1.5); // this isn't really needed anymore keep for backward comp.
-    if (recocut_ >= reqNum) totalmatchreco->Fill(numOfHLTCollectionLabels+1.5); // this isn't really needed anymore keep for backward comp.
+    }  // END of loop over Reconstructed particles
 
+    if (recocut_ >= reqNum)
+      totalreco->Fill(numOfHLTCollectionLabels + 1.5);  // this isn't really needed anymore keep for backward comp.
+    if (recocut_ >= reqNum)
+      totalmatchreco->Fill(numOfHLTCollectionLabels + 1.5);  // this isn't really needed anymore keep for backward comp.
   }
 
-
-
-
-   ////////////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////////////
   //            Loop over filter modules                    //
   ////////////////////////////////////////////////////////////
-  for(unsigned int n=0; n < numOfHLTCollectionLabels ; n++) {
+  for (unsigned int n = 0; n < numOfHLTCollectionLabels; n++) {
     // These numbers are from the Parameter Set, such as:
     //   theHLTOutputTypes = cms.uint32(100)
-    switch(theHLTOutputTypes[n])
-    {
-      case trigger::TriggerL1NoIsoEG: // Non-isolated Level 1
-        histoFillerL1NonIso->fillHistos(triggerObj,event,n, sortedReco, plotReco, plotMonpath);
-	break;
-      case trigger::TriggerL1IsoEG: // Isolated Level 1
-        histoFillerL1Iso->fillHistos(triggerObj,event,n, sortedReco, plotReco, plotMonpath);
-	break;
-      case trigger::TriggerPhoton: // Photon
-        histoFillerPho->fillHistos(triggerObj,event,n, sortedReco, plotReco, plotMonpath);
-	break;
-      case trigger::TriggerElectron: // Electron
-        histoFillerEle->fillHistos(triggerObj,event,n, sortedReco, plotReco, plotMonpath);
-	break;
-      case trigger::TriggerCluster: // TriggerCluster
-        histoFillerClu->fillHistos(triggerObj,event,n, sortedReco, plotReco, plotMonpath);
-	break;
+    switch (theHLTOutputTypes[n]) {
+      case trigger::TriggerL1NoIsoEG:  // Non-isolated Level 1
+        histoFillerL1NonIso->fillHistos(triggerObj, event, n, sortedReco, plotReco, plotMonpath);
+        break;
+      case trigger::TriggerL1IsoEG:  // Isolated Level 1
+        histoFillerL1Iso->fillHistos(triggerObj, event, n, sortedReco, plotReco, plotMonpath);
+        break;
+      case trigger::TriggerPhoton:  // Photon
+        histoFillerPho->fillHistos(triggerObj, event, n, sortedReco, plotReco, plotMonpath);
+        break;
+      case trigger::TriggerElectron:  // Electron
+        histoFillerEle->fillHistos(triggerObj, event, n, sortedReco, plotReco, plotMonpath);
+        break;
+      case trigger::TriggerCluster:  // TriggerCluster
+        histoFillerClu->fillHistos(triggerObj, event, n, sortedReco, plotReco, plotMonpath);
+        break;
       default:
-        throw(cms::Exception("Release Validation Error") << "HLT output type not implemented: theHLTOutputTypes[n]" );
+        throw(cms::Exception("Release Validation Error") << "HLT output type not implemented: theHLTOutputTypes[n]");
     }
-    } // END of loop over filter modules
+  }  // END of loop over filter modules
 }
 
-
 ////////////////////////////////////////////////////////////////////////////////
 // fillHistos                                                                 //
 //   Called by analyze method.                                                //
 ////////////////////////////////////////////////////////////////////////////////
-template <class T> void HistoFillerReco<T>::fillHistos(edm::Handle<trigger::TriggerEventWithRefs>& triggerObj,const edm::Event& iEvent ,unsigned int n, std::vector<reco::Particle>& sortedReco, bool plotReco, bool plotMonpath)
-{
-  std::vector<edm::Ref<T> > recoecalcands;
-  if ( ( triggerObj->filterIndex(dqm->theHLTCollectionLabels[n])>=triggerObj->size() )){ // only process if available
+template <class T>
+void HistoFillerReco<T>::fillHistos(edm::Handle<trigger::TriggerEventWithRefs> &triggerObj,
+                                    const edm::Event &iEvent,
+                                    unsigned int n,
+                                    std::vector<reco::Particle> &sortedReco,
+                                    bool plotReco,
+                                    bool plotMonpath) {
+  std::vector<edm::Ref<T>> recoecalcands;
+  if ((triggerObj->filterIndex(dqm->theHLTCollectionLabels[n]) >= triggerObj->size())) {  // only process if available
     return;
   }
 
   ////////////////////////////////////////////////////////////
   //      Retrieve saved filter objects                     //
   ////////////////////////////////////////////////////////////
-  triggerObj->getObjects(triggerObj->filterIndex(dqm->theHLTCollectionLabels[n]),dqm->theHLTOutputTypes[n],recoecalcands);
-  //Danger: special case, L1 non-isolated
+  triggerObj->getObjects(
+      triggerObj->filterIndex(dqm->theHLTCollectionLabels[n]), dqm->theHLTOutputTypes[n], recoecalcands);
+  // Danger: special case, L1 non-isolated
   // needs to be merged with L1 iso
-  if (dqm->theHLTOutputTypes[n] == trigger::TriggerL1NoIsoEG){
-    std::vector<edm::Ref<T> > isocands;
-    triggerObj->getObjects(triggerObj->filterIndex(dqm->theHLTCollectionLabels[n]),trigger::TriggerL1IsoEG,isocands);
-    if (!isocands.empty())
-      {
-        for (unsigned int i=0; i < isocands.size(); i++)
-          recoecalcands.push_back(isocands[i]);
-      }
-  } // END of if theHLTOutputTypes == 82
-
+  if (dqm->theHLTOutputTypes[n] == trigger::TriggerL1NoIsoEG) {
+    std::vector<edm::Ref<T>> isocands;
+    triggerObj->getObjects(triggerObj->filterIndex(dqm->theHLTCollectionLabels[n]), trigger::TriggerL1IsoEG, isocands);
+    if (!isocands.empty()) {
+      for (unsigned int i = 0; i < isocands.size(); i++)
+        recoecalcands.push_back(isocands[i]);
+    }
+  }  // END of if theHLTOutputTypes == 82
 
-  if (recoecalcands.empty()){ // stop if no object passed the previous filter
+  if (recoecalcands.empty()) {  // stop if no object passed the previous filter
     return;
   }
 
-
-  if (recoecalcands.size() >= dqm->reqNum )
-    dqm->totalreco->Fill(n+0.5);
-
+  if (recoecalcands.size() >= dqm->reqNum)
+    dqm->totalreco->Fill(n + 0.5);
 
   ///////////////////////////////////////////////////
   // check for validity                            //
   // prevents crash in CMSSW_3_1_0_pre6            //
   ///////////////////////////////////////////////////
-  for (unsigned int j=0; j<recoecalcands.size(); j++){
-    if(!( recoecalcands.at(j).isAvailable())){
-      edm::LogError("EmDQMReco") << "Event content inconsistent: TriggerEventWithRefs contains invalid Refs" << std::endl << "invalid refs for: " << dqm->theHLTCollectionLabels[n].label();
+  for (unsigned int j = 0; j < recoecalcands.size(); j++) {
+    if (!(recoecalcands.at(j).isAvailable())) {
+      edm::LogError("EmDQMReco") << "Event content inconsistent: TriggerEventWithRefs contains "
+                                    "invalid Refs"
+                                 << std::endl
+                                 << "invalid refs for: " << dqm->theHLTCollectionLabels[n].label();
       return;
     }
   }
@@ -746,30 +829,31 @@ template <class T> void HistoFillerReco<T>::fillHistos(edm::Handle<trigger::Trig
   ////////////////////////////////////////////////////////////
   //  bool foundAllMatches = false;
   //  unsigned int numOfHLTobjectsMatched = 0;
-  for (unsigned int i=0; i<recoecalcands.size(); i++) {
-
+  for (unsigned int i = 0; i < recoecalcands.size(); i++) {
     dqm->standardHist[n].fill(recoecalcands[i]->p4());
 
     ////////////////////////////////////////////////////////////
     //  Plot isolation variables (show the not-yet-cut        //
     //  isolation, i.e. associated to next filter)            //
     ////////////////////////////////////////////////////////////
-    if ( n+1 < dqm->numOfHLTCollectionLabels ) { // can't plot beyond last
-      if (dqm->plotiso[n+1]) {
-        for (unsigned int j =  0 ; j < isoNameTokens_.size() ;j++  ){
-          edm::Handle<edm::AssociationMap<edm::OneToValue< T , float > > > depMap;
-          iEvent.getByToken(isoNameTokens_.at(j),depMap);
-          if (depMap.isValid()){ //Map may not exist if only one candidate passes a double filter
-            typename edm::AssociationMap<edm::OneToValue< T , float > >::const_iterator mapi = depMap->find(recoecalcands[i]);
-            if (mapi!=depMap->end()){  // found candidate in isolation map!
-              dqm->etahistiso[n+1]->Fill(recoecalcands[i]->eta(),mapi->val);
-              dqm->ethistiso[n+1]->Fill(recoecalcands[i]->et()  ,mapi->val);
-              dqm->phiHistIso[n+1]->Fill(recoecalcands[i]->phi(),mapi->val);
-      }
-    }
-  }
+    if (n + 1 < dqm->numOfHLTCollectionLabels) {  // can't plot beyond last
+      if (dqm->plotiso[n + 1]) {
+        for (unsigned int j = 0; j < isoNameTokens_.size(); j++) {
+          edm::Handle<edm::AssociationMap<edm::OneToValue<T, float>>> depMap;
+          iEvent.getByToken(isoNameTokens_.at(j), depMap);
+          if (depMap.isValid()) {  // Map may not exist if only one candidate
+                                   // passes a double filter
+            typename edm::AssociationMap<edm::OneToValue<T, float>>::const_iterator mapi =
+                depMap->find(recoecalcands[i]);
+            if (mapi != depMap->end()) {  // found candidate in isolation map!
+              dqm->etahistiso[n + 1]->Fill(recoecalcands[i]->eta(), mapi->val);
+              dqm->ethistiso[n + 1]->Fill(recoecalcands[i]->et(), mapi->val);
+              dqm->phiHistIso[n + 1]->Fill(recoecalcands[i]->phi(), mapi->val);
+            }
+          }
+        }
       }
-    } // END of if n+1 < then the number of hlt collections
+    }  // END of if n+1 < then the number of hlt collections
   }
 
   ////////////////////////////////////////////////////////////
@@ -777,116 +861,125 @@ template <class T> void HistoFillerReco<T>::fillHistos(edm::Handle<trigger::Trig
   // closest HLT object match.                              //
   ////////////////////////////////////////////////////////////
   if (plotReco == true) {
-    for (unsigned int i=0; i < dqm->recocut_; i++) {
+    for (unsigned int i = 0; i < dqm->recocut_; i++) {
       math::XYZVector currentRecoParticleMomentum = sortedReco[i].momentum();
 
       // float closestRecoDeltaR = 0.5;
       float closestRecoDeltaR = 1000.;
       int closestRecoEcalCandIndex = -1;
-      for (unsigned int j=0; j<recoecalcands.size(); j++) {
-        float deltaR = DeltaR(recoecalcands[j]->momentum(),currentRecoParticleMomentum);
+      for (unsigned int j = 0; j < recoecalcands.size(); j++) {
+        float deltaR = DeltaR(recoecalcands[j]->momentum(), currentRecoParticleMomentum);
 
         if (deltaR < closestRecoDeltaR) {
           closestRecoDeltaR = deltaR;
           closestRecoEcalCandIndex = j;
         }
-    }
+      }
 
       // If an HLT object was found within some delta-R
       // of this reco particle, store it in a histogram
-      if ( closestRecoEcalCandIndex >= 0 ) {
-//        histEtOfHltObjMatchToReco[n] ->Fill( recoecalcands[closestRecoEcalCandIndex]->et()  );
-//        histEtaOfHltObjMatchToReco[n]->Fill( recoecalcands[closestRecoEcalCandIndex]->eta() );
-//        histPhiOfHltObjMatchToReco[n]->Fill( recoecalcands[closestRecoEcalCandIndex]->phi() );
+      if (closestRecoEcalCandIndex >= 0) {
+        //        histEtOfHltObjMatchToReco[n] ->Fill(
+        //        recoecalcands[closestRecoEcalCandIndex]->et()  );
+        //        histEtaOfHltObjMatchToReco[n]->Fill(
+        //        recoecalcands[closestRecoEcalCandIndex]->eta() );
+        //        histPhiOfHltObjMatchToReco[n]->Fill(
+        //        recoecalcands[closestRecoEcalCandIndex]->phi() );
 
-          dqm->histHltObjMatchToReco[n].fill(recoecalcands[closestRecoEcalCandIndex]->p4());
+        dqm->histHltObjMatchToReco[n].fill(recoecalcands[closestRecoEcalCandIndex]->p4());
 
         // Also store isolation info
-        if (n+1 < dqm->numOfHLTCollectionLabels){ // can't plot beyond last
-          if (dqm->plotiso[n+1] ){  // only plot if requested in config
-            for (unsigned int j =  0 ; j < isoNameTokens_.size() ;j++  ){
-              edm::Handle<edm::AssociationMap<edm::OneToValue< T , float > > > depMap;
-              iEvent.getByToken(isoNameTokens_.at(j),depMap);
-              if (depMap.isValid()){ //Map may not exist if only one candidate passes a double filter
-                typename edm::AssociationMap<edm::OneToValue< T , float > >::const_iterator mapi = depMap->find(recoecalcands[closestRecoEcalCandIndex]);
-                if (mapi!=depMap->end()) {  // found candidate in isolation map!
-                  dqm->histEtaIsoOfHltObjMatchToReco[n+1]->Fill( recoecalcands[closestRecoEcalCandIndex]->eta(),mapi->val);
-                  dqm->histEtIsoOfHltObjMatchToReco[n+1] ->Fill( recoecalcands[closestRecoEcalCandIndex]->et(), mapi->val);
-                  dqm->histPhiIsoOfHltObjMatchToReco[n+1] ->Fill( recoecalcands[closestRecoEcalCandIndex]->phi(), mapi->val);
+        if (n + 1 < dqm->numOfHLTCollectionLabels) {  // can't plot beyond last
+          if (dqm->plotiso[n + 1]) {                  // only plot if requested in config
+            for (unsigned int j = 0; j < isoNameTokens_.size(); j++) {
+              edm::Handle<edm::AssociationMap<edm::OneToValue<T, float>>> depMap;
+              iEvent.getByToken(isoNameTokens_.at(j), depMap);
+              if (depMap.isValid()) {  // Map may not exist if only one candidate
+                                       // passes a double filter
+                typename edm::AssociationMap<edm::OneToValue<T, float>>::const_iterator mapi =
+                    depMap->find(recoecalcands[closestRecoEcalCandIndex]);
+                if (mapi != depMap->end()) {  // found candidate in isolation map!
+                  dqm->histEtaIsoOfHltObjMatchToReco[n + 1]->Fill(recoecalcands[closestRecoEcalCandIndex]->eta(),
+                                                                  mapi->val);
+                  dqm->histEtIsoOfHltObjMatchToReco[n + 1]->Fill(recoecalcands[closestRecoEcalCandIndex]->et(),
+                                                                 mapi->val);
+                  dqm->histPhiIsoOfHltObjMatchToReco[n + 1]->Fill(recoecalcands[closestRecoEcalCandIndex]->phi(),
+                                                                  mapi->val);
                 }
               }
             }
           }
         }
-      } // END of if closestEcalCandIndex >= 0
+      }  // END of if closestEcalCandIndex >= 0
     }
 
     ////////////////////////////////////////////////////////////
     //        Fill reco matched objects into histograms         //
     ////////////////////////////////////////////////////////////
     unsigned int mtachedRecoParts = 0;
-    float minrecodist=0.3;
-    if(n==0) minrecodist=0.5; //low L1-resolution => allow wider matching
-    for(unsigned int i =0; i < dqm->recocut_; i++){
-      //match generator candidate
-      bool matchThis= false;
-      math::XYZVector candDir=sortedReco[i].momentum();
+    float minrecodist = 0.3;
+    if (n == 0)
+      minrecodist = 0.5;  // low L1-resolution => allow wider matching
+    for (unsigned int i = 0; i < dqm->recocut_; i++) {
+      // match generator candidate
+      bool matchThis = false;
+      math::XYZVector candDir = sortedReco[i].momentum();
       unsigned int closest = 0;
       double closestDr = 1000.;
-      for(unsigned int trigOb = 0 ; trigOb < recoecalcands.size(); trigOb++){
-        double dr = DeltaR(recoecalcands[trigOb]->momentum(),candDir);
+      for (unsigned int trigOb = 0; trigOb < recoecalcands.size(); trigOb++) {
+        double dr = DeltaR(recoecalcands[trigOb]->momentum(), candDir);
         if (dr < closestDr) {
           closestDr = dr;
           closest = trigOb;
         }
-        if (closestDr > minrecodist) { // it's not really a "match" if it's that far away
+        if (closestDr > minrecodist) {  // it's not really a "match" if it's that far away
           closest = -1;
         } else {
           mtachedRecoParts++;
           matchThis = true;
         }
       }
-      if ( !matchThis ) continue; // only plot matched candidates
+      if (!matchThis)
+        continue;  // only plot matched candidates
       // fill coordinates of mc particle matching trigger object
-//      ethistmatchreco[n] ->Fill( sortedReco[i].et()  );
-//      etahistmatchreco[n]->Fill( sortedReco[i].eta() );
-//      phiHistMatchReco[n]->Fill( sortedReco[i].phi() );
+      //      ethistmatchreco[n] ->Fill( sortedReco[i].et()  );
+      //      etahistmatchreco[n]->Fill( sortedReco[i].eta() );
+      //      phiHistMatchReco[n]->Fill( sortedReco[i].phi() );
       dqm->histMatchReco[n].fill(sortedReco[i].p4());
 
       if (plotMonpath) {
-//        ethistmatchrecomonpath[n]->Fill( sortedReco[i].et() );
-//        etahistmatchrecomonpath[n]->Fill( sortedReco[i].eta() );
-//        phiHistMatchRecoMonPath[n]->Fill( sortedReco[i].phi() );
-          dqm->histMatchRecoMonPath[n].fill(sortedReco[i].p4());
-
+        //        ethistmatchrecomonpath[n]->Fill( sortedReco[i].et() );
+        //        etahistmatchrecomonpath[n]->Fill( sortedReco[i].eta() );
+        //        phiHistMatchRecoMonPath[n]->Fill( sortedReco[i].phi() );
+        dqm->histMatchRecoMonPath[n].fill(sortedReco[i].p4());
       }
       ////////////////////////////////////////////////////////////
       //  Plot isolation variables (show the not-yet-cut        //
       //  isolation, i.e. associated to next filter)            //
       ////////////////////////////////////////////////////////////
-      if (n+1 < dqm->numOfHLTCollectionLabels){ // can't plot beyond last
-        if (dqm->plotiso[n+1] ){  // only plot if requested in config
-          for (unsigned int j =  0 ; j < isoNameTokens_.size() ;j++  ){
-            edm::Handle<edm::AssociationMap<edm::OneToValue< T , float > > > depMapReco;
-            iEvent.getByToken(isoNameTokens_.at(j),depMapReco);
-            if (depMapReco.isValid()){ //Map may not exist if only one candidate passes a double filter
-              typename edm::AssociationMap<edm::OneToValue< T , float > >::const_iterator mapi = depMapReco->find(recoecalcands[closest]);
-              if (mapi!=depMapReco->end()){  // found candidate in isolation map!
-                dqm->etahistisomatchreco[n+1]->Fill(sortedReco[i].eta(),mapi->val);
-                dqm->ethistisomatchreco[n+1]->Fill(sortedReco[i].et(),mapi->val);
-                dqm->phiHistIsoMatchReco[n+1]->Fill(sortedReco[i].eta(),mapi->val);
+      if (n + 1 < dqm->numOfHLTCollectionLabels) {  // can't plot beyond last
+        if (dqm->plotiso[n + 1]) {                  // only plot if requested in config
+          for (unsigned int j = 0; j < isoNameTokens_.size(); j++) {
+            edm::Handle<edm::AssociationMap<edm::OneToValue<T, float>>> depMapReco;
+            iEvent.getByToken(isoNameTokens_.at(j), depMapReco);
+            if (depMapReco.isValid()) {  // Map may not exist if only one
+                                         // candidate passes a double filter
+              typename edm::AssociationMap<edm::OneToValue<T, float>>::const_iterator mapi =
+                  depMapReco->find(recoecalcands[closest]);
+              if (mapi != depMapReco->end()) {  // found candidate in isolation map!
+                dqm->etahistisomatchreco[n + 1]->Fill(sortedReco[i].eta(), mapi->val);
+                dqm->ethistisomatchreco[n + 1]->Fill(sortedReco[i].et(), mapi->val);
+                dqm->phiHistIsoMatchReco[n + 1]->Fill(sortedReco[i].eta(), mapi->val);
               }
             }
           }
         }
-      } // END of if n+1 < then the number of hlt collections
+      }  // END of if n+1 < then the number of hlt collections
     }
     // fill total reco matched efficiency
-    if (mtachedRecoParts >= dqm->reqNum )
-     dqm-> totalmatchreco->Fill(n+0.5);
+    if (mtachedRecoParts >= dqm->reqNum)
+      dqm->totalmatchreco->Fill(n + 0.5);
   }
-
 }
 
-
 DEFINE_FWK_MODULE(EmDQMReco);
diff --git a/HLTriggerOffline/Exotica/interface/HLTExoticaPlotter.h b/HLTriggerOffline/Exotica/interface/HLTExoticaPlotter.h
index d65aac9588a26..e6c8607451adc 100644
--- a/HLTriggerOffline/Exotica/interface/HLTExoticaPlotter.h
+++ b/HLTriggerOffline/Exotica/interface/HLTExoticaPlotter.h
@@ -13,75 +13,79 @@
  *           from the HLTriggerOffline/Muon package.
  */
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h"
-#include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h"
-#include "DataFormats/RecoCandidate/interface/RecoEcalCandidate.h"
-#include "DataFormats/RecoCandidate/interface/RecoEcalCandidateFwd.h"
 #include "CommonTools/Utils/interface/StringCutObjectSelector.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
 #include "DataFormats/Candidate/interface/LeafCandidate.h"
-#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
-#include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
 #include "DataFormats/EgammaCandidates/interface/Photon.h"
+#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
+#include "DataFormats/MuonReco/interface/Muon.h"
+#include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h"
+#include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h"
+#include "DataFormats/RecoCandidate/interface/RecoEcalCandidate.h"
+#include "DataFormats/RecoCandidate/interface/RecoEcalCandidateFwd.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-#include <vector>
 #include <cstring>
 #include <map>
 #include <set>
+#include <vector>
 
-//const unsigned int kNull = (unsigned int) - 1;
+// const unsigned int kNull = (unsigned int) - 1;
 
 struct EVTColContainer;
 
 class HLTExoticaPlotter {
 public:
-    HLTExoticaPlotter(const edm::ParameterSet & pset, const std::string & hltPath,
-                      const std::vector<unsigned int> & objectsType);
-    ~HLTExoticaPlotter();
-    void beginJob();
-    void beginRun(const edm::Run &, const edm::EventSetup &);
-    void plotterBookHistos(DQMStore::IBooker & iBooker, const edm::Run & iRun, const edm::EventSetup & iSetup);
-    void analyze(const bool & isPassTrigger, const std::string & source,
-                 const std::vector<reco::LeafCandidate> & matches,
-		 std::map<int,double> theSumEt,
-                 std::vector<float> & dxys);
+  HLTExoticaPlotter(const edm::ParameterSet &pset,
+                    const std::string &hltPath,
+                    const std::vector<unsigned int> &objectsType);
+  ~HLTExoticaPlotter();
+  void beginJob();
+  void beginRun(const edm::Run &, const edm::EventSetup &);
+  void plotterBookHistos(DQMStore::IBooker &iBooker, const edm::Run &iRun, const edm::EventSetup &iSetup);
+  void analyze(const bool &isPassTrigger,
+               const std::string &source,
+               const std::vector<reco::LeafCandidate> &matches,
+               std::map<int, double> theSumEt,
+               std::vector<float> &dxys);
 
-    inline const std::string gethltpath() const
-    {
-        return _hltPath;
-    }
+  inline const std::string gethltpath() const { return _hltPath; }
 
 private:
-    void bookHist(DQMStore::IBooker & iBooker, const std::string & source, const std::string & objType, const std::string & variable);
-    void fillHist(const bool & passTrigger, const std::string & source,
-                  const std::string & objType, const std::string & var,
-                  const float & value);
+  void bookHist(DQMStore::IBooker &iBooker,
+                const std::string &source,
+                const std::string &objType,
+                const std::string &variable);
+  void fillHist(const bool &passTrigger,
+                const std::string &source,
+                const std::string &objType,
+                const std::string &var,
+                const float &value);
 
-    std::string _hltPath;
-    std::string _hltProcessName;
+  std::string _hltPath;
+  std::string _hltProcessName;
 
-    std::set<unsigned int> _objectsType;
-    // Number of objects (elec,muons, ...) needed in the hlt path
-    unsigned int _nObjects;
+  std::set<unsigned int> _objectsType;
+  // Number of objects (elec,muons, ...) needed in the hlt path
+  unsigned int _nObjects;
 
-    std::vector<double> _parametersEta;
-    std::vector<double> _parametersPhi;
-    std::vector<double> _parametersTurnOn;
-    std::vector<double> _parametersTurnOnSumEt;
-    std::vector<double> _parametersDxy;
+  std::vector<double> _parametersEta;
+  std::vector<double> _parametersPhi;
+  std::vector<double> _parametersTurnOn;
+  std::vector<double> _parametersTurnOnSumEt;
+  std::vector<double> _parametersDxy;
 
-    // flag to switch off
-    bool _drop_pt2;
-    bool _drop_pt3;
+  // flag to switch off
+  bool _drop_pt2;
+  bool _drop_pt3;
 
-    std::map<std::string, MonitorElement *> _elements;
+  std::map<std::string, MonitorElement *> _elements;
 };
 #endif
diff --git a/HLTriggerOffline/Exotica/interface/HLTExoticaSubAnalysis.h b/HLTriggerOffline/Exotica/interface/HLTExoticaSubAnalysis.h
index 20bf954354058..05a56666784f3 100644
--- a/HLTriggerOffline/Exotica/interface/HLTExoticaSubAnalysis.h
+++ b/HLTriggerOffline/Exotica/interface/HLTExoticaSubAnalysis.h
@@ -13,49 +13,49 @@
  *           from the HLTriggerOffline/Muon package.
  */
 
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
+#include "CommonTools/Utils/interface/StringCutObjectSelector.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+#include "DataFormats/BeamSpot/interface/BeamSpot.h"
 #include "DataFormats/Candidate/interface/LeafCandidate.h"
-#include "DataFormats/MuonReco/interface/Muon.h"
-#include "DataFormats/MuonReco/interface/MuonFwd.h"
-#include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
 #include "DataFormats/EgammaCandidates/interface/Photon.h"
 #include "DataFormats/EgammaCandidates/interface/PhotonFwd.h"
-#include "DataFormats/METReco/interface/PFMET.h"
-#include "DataFormats/METReco/interface/PFMETCollection.h"
-#include "DataFormats/METReco/interface/GenMET.h"
-#include "DataFormats/METReco/interface/GenMETCollection.h"
+#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
+#include "DataFormats/JetReco/interface/CaloJet.h"
+#include "DataFormats/JetReco/interface/CaloJetCollection.h"
+#include "DataFormats/JetReco/interface/PFJet.h"
+#include "DataFormats/JetReco/interface/PFJetCollection.h"
+#include "DataFormats/L1Trigger/interface/L1EtMissParticle.h"
 #include "DataFormats/METReco/interface/CaloMET.h"
 #include "DataFormats/METReco/interface/CaloMETCollection.h"
-#include "DataFormats/L1Trigger/interface/L1EtMissParticle.h"
-#include "DataFormats/BeamSpot/interface/BeamSpot.h"
+#include "DataFormats/METReco/interface/GenMET.h"
+#include "DataFormats/METReco/interface/GenMETCollection.h"
+#include "DataFormats/METReco/interface/PFMET.h"
+#include "DataFormats/METReco/interface/PFMETCollection.h"
+#include "DataFormats/MuonReco/interface/Muon.h"
+#include "DataFormats/MuonReco/interface/MuonFwd.h"
 #include "DataFormats/TauReco/interface/PFTau.h"
 #include "DataFormats/TauReco/interface/PFTauFwd.h"
-#include "DataFormats/JetReco/interface/PFJet.h"
-#include "DataFormats/JetReco/interface/PFJetCollection.h"
-#include "DataFormats/JetReco/interface/CaloJet.h"
-#include "DataFormats/JetReco/interface/CaloJetCollection.h"
-#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
-#include "CommonTools/Utils/interface/StringCutObjectSelector.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
+#include "DataFormats/TrackReco/interface/Track.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
 #include "HLTriggerOffline/Exotica/interface/HLTExoticaPlotter.h"
 
-#include<vector>
-#include<set>
-#include<map>
-#include<cstring>
+#include <cstring>
+#include <map>
+#include <set>
+#include <vector>
 
 /// Class to manage all object collections from a centralized place.
 struct EVTColContainer;
@@ -65,134 +65,133 @@ struct EVTColContainer;
 /// of all HLT paths related to that analysis.
 class HLTExoticaSubAnalysis {
 public:
-    enum class Level{
-        GEN = 98,
-        RECO = 99
-    };
-
-    HLTExoticaSubAnalysis(const edm::ParameterSet & pset,
-                          const std::string & analysisname,
-			  edm::ConsumesCollector && consCollector);
-    ~HLTExoticaSubAnalysis();
-    void beginJob();
-    void beginRun(const edm::Run & iRun, const edm::EventSetup & iEventSetup);
-    void endRun();
-
-    /// Method to book all relevant histograms in the DQMStore.
-    /// Uses the IBooker interface for thread safety.
-    /// Intended to be called from master object.
-    void subAnalysisBookHistos(DQMStore::IBooker &iBooker, const edm::Run & iRun, const edm::EventSetup & iSetup);
-
-    /// Method to fill all relevant histograms.
-    /// Notice that we update the EVTColContaner to point to the collections we want.
-    void analyze(const edm::Event & iEvent, const edm::EventSetup & iEventSetup, EVTColContainer * cols);
+  enum class Level { GEN = 98, RECO = 99 };
+
+  HLTExoticaSubAnalysis(const edm::ParameterSet &pset,
+                        const std::string &analysisname,
+                        edm::ConsumesCollector &&consCollector);
+  ~HLTExoticaSubAnalysis();
+  void beginJob();
+  void beginRun(const edm::Run &iRun, const edm::EventSetup &iEventSetup);
+  void endRun();
+
+  /// Method to book all relevant histograms in the DQMStore.
+  /// Uses the IBooker interface for thread safety.
+  /// Intended to be called from master object.
+  void subAnalysisBookHistos(DQMStore::IBooker &iBooker, const edm::Run &iRun, const edm::EventSetup &iSetup);
+
+  /// Method to fill all relevant histograms.
+  /// Notice that we update the EVTColContaner to point to the collections we
+  /// want.
+  void analyze(const edm::Event &iEvent, const edm::EventSetup &iEventSetup, EVTColContainer *cols);
 
 private:
-    /// Return the objects (muons,electrons,photons,...) needed by a HLT path.
-    /// Will in general return: 0 for muon, 1 for electron, 2 for photon,
-    /// 3 for PFMET, 4 for PFTau, 5 for Jet.
-    /// Notice that this function is really based on a parsing of the name of
-    /// the path; any incongruences there may lead to problems.
-    const std::vector<unsigned int> getObjectsType(const std::string & hltpath) const;
-
-    /// Creates the maps that map  which collection should come from which label
-    void getNamesOfObjects(const edm::ParameterSet & anpset);
-    /// Registers consumption of objects
-    void registerConsumes(edm::ConsumesCollector & consCollector);
-    /// Gets the collections themselves
-    void getHandlesToObjects(const edm::Event & iEvent, EVTColContainer * col);
-    /// Initializes the selectors of the objects based on which object it is
-    void initSelector(const unsigned int & objtype);
-    /// This function applies the selectors initialized previously to the objects,
-    /// and matches the passing objects to HLT objects.
-    void insertCandidates(const unsigned int & objtype, const EVTColContainer * col,
-                          std::vector<reco::LeafCandidate> * matches, 
-                          std::map<int,double> & theSumEt,
-                          std::map<int, std::vector<const reco::Track*> > & trkObjs);
-
-    /// The internal functions to book and fill histograms
-    void bookHist(DQMStore::IBooker &iBooker, const std::string & source, const std::string & objType,
-                  const std::string & variable);
-    void fillHist(const std::string & source, const std::string & objType,
-                  const std::string & variable, const float & value);
-
-    /// Internal, working copy of the PSet passed from above.
-    edm::ParameterSet _pset;
-
-    /// The name of this sub-analysis
-    std::string _analysisname;
-
-    /// The minimum number of reco/gen candidates needed by the analysis
-    unsigned int _minCandidates;
-
-    /// The hlt paths to check for.
-    std::vector<std::string> _hltPathsToCheck;
-    /// The hlt paths found in the hltConfig
-    std::set<std::string> _hltPaths;
-    /// Relation between the short and long versions of the path
-    std::map<std::string, std::string> _shortpath2long;
-
-    /// The labels of the object collections to be used in this analysis.
-    std::string _hltProcessName;
-    edm::InputTag _genParticleLabel;
-    edm::InputTag _trigResultsLabel;
-    edm::InputTag _beamSpotLabel;
-    std::map<unsigned int, edm::InputTag> _recLabels;
-    /// And also the tokens to get the object collections
-    edm::EDGetTokenT<reco::GenParticleCollection> _genParticleToken;
-    edm::EDGetTokenT<edm::TriggerResults> _trigResultsToken;
-    edm::EDGetTokenT<reco::BeamSpot> _bsToken;
-    std::map<unsigned int, edm::EDGetToken> _tokens;
-
-    /// Some kinematical parameters
-    std::vector<double> _parametersEta;
-    std::vector<double> _parametersPhi;
-    std::vector<double> _parametersTurnOn;
-    std::vector<double> _parametersTurnOnSumEt;
-    std::vector<double> _parametersDxy;
-
-    // flag to switch off
-    bool _drop_pt2;
-    bool _drop_pt3;
-
-    /// gen/rec objects cuts
-    std::map<unsigned int, std::string> _genCut;
-    std::map<unsigned int, std::string> _recCut;
-    /// gen/rec pt-leading objects cuts
-    std::map<unsigned int, std::string> _genCut_leading;
-    std::map<unsigned int, std::string> _recCut_leading;
-
-    /// The concrete String selectors (use the string cuts introduced
-    /// via the config python)
-    std::map<unsigned int, StringCutObjectSelector<reco::GenParticle> *> _genSelectorMap;
-    StringCutObjectSelector<reco::Muon>        * _recMuonSelector;
-    StringCutObjectSelector<reco::Track>       * _recMuonTrkSelector;
-    StringCutObjectSelector<reco::Track>       * _recTrackSelector;
-    StringCutObjectSelector<reco::GsfElectron> * _recElecSelector;
-    StringCutObjectSelector<reco::MET>         * _recMETSelector;
-    StringCutObjectSelector<reco::PFMET>       * _recPFMETSelector;
-    StringCutObjectSelector<reco::PFMET>       * _recPFMHTSelector;
-    StringCutObjectSelector<reco::GenMET>      * _genMETSelector;
-    StringCutObjectSelector<reco::CaloMET>     * _recCaloMETSelector;
-    StringCutObjectSelector<reco::CaloMET>     * _recCaloMHTSelector;
-    StringCutObjectSelector<l1extra::L1EtMissParticle> * _l1METSelector;
-    StringCutObjectSelector<reco::PFTau>       * _recPFTauSelector;
-    StringCutObjectSelector<reco::Photon>      * _recPhotonSelector;
-    StringCutObjectSelector<reco::PFJet>       * _recPFJetSelector;
-    StringCutObjectSelector<reco::CaloJet>     * _recCaloJetSelector;
-
-    /// The plotters: managers of each hlt path where the plots are done
-    std::vector<HLTExoticaPlotter> _plotters;
-
-    /// counting HLT passed events  
-    std::map<std::string,int> _triggerCounter;
-
-    /// Interface to the HLT information
-    HLTConfigProvider _hltConfig;
-
-    /// Structure of the MonitorElements
-    std::map<std::string, MonitorElement *> _elements;
+  /// Return the objects (muons,electrons,photons,...) needed by a HLT path.
+  /// Will in general return: 0 for muon, 1 for electron, 2 for photon,
+  /// 3 for PFMET, 4 for PFTau, 5 for Jet.
+  /// Notice that this function is really based on a parsing of the name of
+  /// the path; any incongruences there may lead to problems.
+  const std::vector<unsigned int> getObjectsType(const std::string &hltpath) const;
+
+  /// Creates the maps that map  which collection should come from which label
+  void getNamesOfObjects(const edm::ParameterSet &anpset);
+  /// Registers consumption of objects
+  void registerConsumes(edm::ConsumesCollector &consCollector);
+  /// Gets the collections themselves
+  void getHandlesToObjects(const edm::Event &iEvent, EVTColContainer *col);
+  /// Initializes the selectors of the objects based on which object it is
+  void initSelector(const unsigned int &objtype);
+  /// This function applies the selectors initialized previously to the objects,
+  /// and matches the passing objects to HLT objects.
+  void insertCandidates(const unsigned int &objtype,
+                        const EVTColContainer *col,
+                        std::vector<reco::LeafCandidate> *matches,
+                        std::map<int, double> &theSumEt,
+                        std::map<int, std::vector<const reco::Track *>> &trkObjs);
+
+  /// The internal functions to book and fill histograms
+  void bookHist(DQMStore::IBooker &iBooker,
+                const std::string &source,
+                const std::string &objType,
+                const std::string &variable);
+  void fillHist(const std::string &source, const std::string &objType, const std::string &variable, const float &value);
+
+  /// Internal, working copy of the PSet passed from above.
+  edm::ParameterSet _pset;
+
+  /// The name of this sub-analysis
+  std::string _analysisname;
+
+  /// The minimum number of reco/gen candidates needed by the analysis
+  unsigned int _minCandidates;
+
+  /// The hlt paths to check for.
+  std::vector<std::string> _hltPathsToCheck;
+  /// The hlt paths found in the hltConfig
+  std::set<std::string> _hltPaths;
+  /// Relation between the short and long versions of the path
+  std::map<std::string, std::string> _shortpath2long;
+
+  /// The labels of the object collections to be used in this analysis.
+  std::string _hltProcessName;
+  edm::InputTag _genParticleLabel;
+  edm::InputTag _trigResultsLabel;
+  edm::InputTag _beamSpotLabel;
+  std::map<unsigned int, edm::InputTag> _recLabels;
+  /// And also the tokens to get the object collections
+  edm::EDGetTokenT<reco::GenParticleCollection> _genParticleToken;
+  edm::EDGetTokenT<edm::TriggerResults> _trigResultsToken;
+  edm::EDGetTokenT<reco::BeamSpot> _bsToken;
+  std::map<unsigned int, edm::EDGetToken> _tokens;
+
+  /// Some kinematical parameters
+  std::vector<double> _parametersEta;
+  std::vector<double> _parametersPhi;
+  std::vector<double> _parametersTurnOn;
+  std::vector<double> _parametersTurnOnSumEt;
+  std::vector<double> _parametersDxy;
+
+  // flag to switch off
+  bool _drop_pt2;
+  bool _drop_pt3;
+
+  /// gen/rec objects cuts
+  std::map<unsigned int, std::string> _genCut;
+  std::map<unsigned int, std::string> _recCut;
+  /// gen/rec pt-leading objects cuts
+  std::map<unsigned int, std::string> _genCut_leading;
+  std::map<unsigned int, std::string> _recCut_leading;
+
+  /// The concrete String selectors (use the string cuts introduced
+  /// via the config python)
+  std::map<unsigned int, StringCutObjectSelector<reco::GenParticle> *> _genSelectorMap;
+  StringCutObjectSelector<reco::Muon> *_recMuonSelector;
+  StringCutObjectSelector<reco::Track> *_recMuonTrkSelector;
+  StringCutObjectSelector<reco::Track> *_recTrackSelector;
+  StringCutObjectSelector<reco::GsfElectron> *_recElecSelector;
+  StringCutObjectSelector<reco::MET> *_recMETSelector;
+  StringCutObjectSelector<reco::PFMET> *_recPFMETSelector;
+  StringCutObjectSelector<reco::PFMET> *_recPFMHTSelector;
+  StringCutObjectSelector<reco::GenMET> *_genMETSelector;
+  StringCutObjectSelector<reco::CaloMET> *_recCaloMETSelector;
+  StringCutObjectSelector<reco::CaloMET> *_recCaloMHTSelector;
+  StringCutObjectSelector<l1extra::L1EtMissParticle> *_l1METSelector;
+  StringCutObjectSelector<reco::PFTau> *_recPFTauSelector;
+  StringCutObjectSelector<reco::Photon> *_recPhotonSelector;
+  StringCutObjectSelector<reco::PFJet> *_recPFJetSelector;
+  StringCutObjectSelector<reco::CaloJet> *_recCaloJetSelector;
+
+  /// The plotters: managers of each hlt path where the plots are done
+  std::vector<HLTExoticaPlotter> _plotters;
+
+  /// counting HLT passed events
+  std::map<std::string, int> _triggerCounter;
+
+  /// Interface to the HLT information
+  HLTConfigProvider _hltConfig;
+
+  /// Structure of the MonitorElements
+  std::map<std::string, MonitorElement *> _elements;
 };
 
-
 #endif
diff --git a/HLTriggerOffline/Exotica/interface/HLTExoticaValidator.h b/HLTriggerOffline/Exotica/interface/HLTExoticaValidator.h
index 8d0ff9d555a5e..ac78105f2f4cc 100644
--- a/HLTriggerOffline/Exotica/interface/HLTExoticaValidator.h
+++ b/HLTriggerOffline/Exotica/interface/HLTExoticaValidator.h
@@ -14,18 +14,17 @@
  */
 
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 
 #include "HLTriggerOffline/Exotica/interface/HLTExoticaSubAnalysis.h"
 
-#include <vector>
 #include <cstring>
-
+#include <vector>
 
 struct EVTColContainer;
 
@@ -37,34 +36,33 @@ struct EVTColContainer;
 /// HLT path
 class HLTExoticaValidator : public DQMEDAnalyzer {
 public:
-    /// Constructor and destructor
-    HLTExoticaValidator(const edm::ParameterSet &);
-    ~HLTExoticaValidator() override;
+  /// Constructor and destructor
+  HLTExoticaValidator(const edm::ParameterSet &);
+  ~HLTExoticaValidator() override;
 
 protected:
-    /// Method called by the framework to book histograms.
-    void bookHistograms(DQMStore::IBooker &iBooker, const edm::Run &iRun, const edm::EventSetup &iSetup) override;
+  /// Method called by the framework to book histograms.
+  void bookHistograms(DQMStore::IBooker &iBooker, const edm::Run &iRun, const edm::EventSetup &iSetup) override;
 
 private:
-    void beginJob() override;
-    /// Method called by the framework just before dqmBeginRun()
-    void dqmBeginRun(const edm::Run &iRun, const edm::EventSetup & iSetup) override;
-    /// Method called for each event.
-    void analyze(const edm::Event & iEvent, const edm::EventSetup & iSetup) override;
-    void endRun(const edm::Run & iRun, const edm::EventSetup & iSetup) override;
-    void endJob() override;
-
-    /// Copy (to be modified) of the input ParameterSet from configuration file.
-    edm::ParameterSet _pset;
-    /// The names of the subanalyses
-    std::vector<std::string> _analysisnames;
+  void beginJob() override;
+  /// Method called by the framework just before dqmBeginRun()
+  void dqmBeginRun(const edm::Run &iRun, const edm::EventSetup &iSetup) override;
+  /// Method called for each event.
+  void analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) override;
+  void endRun(const edm::Run &iRun, const edm::EventSetup &iSetup) override;
+  void endJob() override;
 
-    /// The instances of the class which do the real work
-    std::vector<HLTExoticaSubAnalysis> _analyzers;
+  /// Copy (to be modified) of the input ParameterSet from configuration file.
+  edm::ParameterSet _pset;
+  /// The names of the subanalyses
+  std::vector<std::string> _analysisnames;
 
-    /// Centralized point of access to all collections used
-    EVTColContainer * _collections;
+  /// The instances of the class which do the real work
+  std::vector<HLTExoticaSubAnalysis> _analyzers;
 
+  /// Centralized point of access to all collections used
+  EVTColContainer *_collections;
 };
 
 #endif
diff --git a/HLTriggerOffline/Exotica/src/EVTColContainer.cc b/HLTriggerOffline/Exotica/src/EVTColContainer.cc
index 59726008e0172..ef66af86957ea 100644
--- a/HLTriggerOffline/Exotica/src/EVTColContainer.cc
+++ b/HLTriggerOffline/Exotica/src/EVTColContainer.cc
@@ -11,81 +11,81 @@
  */
 
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/MuonReco/interface/Muon.h"
-#include "DataFormats/MuonReco/interface/MuonFwd.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
 #include "DataFormats/EgammaCandidates/interface/Photon.h"
 #include "DataFormats/EgammaCandidates/interface/PhotonFwd.h"
+#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
+#include "DataFormats/JetReco/interface/CaloJet.h"
+#include "DataFormats/JetReco/interface/CaloJetCollection.h"
+#include "DataFormats/JetReco/interface/PFJet.h"
+#include "DataFormats/JetReco/interface/PFJetCollection.h"
+#include "DataFormats/L1Trigger/interface/L1EtMissParticle.h"
+#include "DataFormats/L1Trigger/interface/L1EtMissParticleFwd.h"
+#include "DataFormats/METReco/interface/CaloMET.h"
+#include "DataFormats/METReco/interface/CaloMETFwd.h"
+#include "DataFormats/METReco/interface/GenMET.h"
+#include "DataFormats/METReco/interface/GenMETFwd.h"
 #include "DataFormats/METReco/interface/MET.h"
 #include "DataFormats/METReco/interface/METFwd.h"
 #include "DataFormats/METReco/interface/PFMET.h"
 #include "DataFormats/METReco/interface/PFMETFwd.h"
-#include "DataFormats/METReco/interface/GenMET.h"
-#include "DataFormats/METReco/interface/GenMETFwd.h"
-#include "DataFormats/METReco/interface/CaloMET.h"
-#include "DataFormats/METReco/interface/CaloMETFwd.h"
-#include "DataFormats/L1Trigger/interface/L1EtMissParticle.h"
-#include "DataFormats/L1Trigger/interface/L1EtMissParticleFwd.h"
-#include "DataFormats/JetReco/interface/PFJet.h"
-#include "DataFormats/JetReco/interface/PFJetCollection.h"
-#include "DataFormats/JetReco/interface/CaloJet.h"
-#include "DataFormats/JetReco/interface/CaloJetCollection.h"
+#include "DataFormats/MuonReco/interface/Muon.h"
+#include "DataFormats/MuonReco/interface/MuonFwd.h"
 #include "DataFormats/TauReco/interface/PFTau.h"
 #include "DataFormats/TauReco/interface/PFTauFwd.h"
-#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 
-#include<vector>
-#include<map>
+#include <map>
+#include <vector>
 
 /// Container with all the objects needed
 /// Notice that I have "more or less" followed
 /// the pdgIds of the particles involved.
 
 struct EVTColContainer {
-    enum {
-        PHOTON  = 22,
-        ELEC    = 11,
-        MUON    = 13,
-        MUTRK   = 130,
-        PFTAU   = 15,
-        TRACK   = 0,  
-        PFMET   = 39,
-	PFMHT   = 40,
-        MET     = 390000,
-        GENMET  = 390001,
-        CALOMET = 390002,
-        HLTMET  = 390003,
-        L1MET   = 390004,
-        PFJET   = 211,
-        CALOJET = 111, 
-	CALOMHT = 400002,
-        _nMAX
-    };
+  enum {
+    PHOTON = 22,
+    ELEC = 11,
+    MUON = 13,
+    MUTRK = 130,
+    PFTAU = 15,
+    TRACK = 0,
+    PFMET = 39,
+    PFMHT = 40,
+    MET = 390000,
+    GENMET = 390001,
+    CALOMET = 390002,
+    HLTMET = 390003,
+    L1MET = 390004,
+    PFJET = 211,
+    CALOJET = 111,
+    CALOMHT = 400002,
+    _nMAX
+  };
 
-    int nOfCollections;
-    int nInitialized;
+  int nOfCollections;
+  int nInitialized;
 
-    const reco::GenParticleCollection            * genParticles;
-    const std::vector<reco::Muon>                * muons;
-    const std::vector<reco::Track>               * tracks;
-    const std::vector<reco::GsfElectron>         * electrons;
-    const std::vector<reco::Photon>              * photons;
-    const std::vector<reco::MET>                 * METs;
-    const std::vector<reco::PFMET>               * pfMETs;
-    const std::vector<reco::PFMET>               * pfMHTs;
-    const std::vector<reco::GenMET>              * genMETs;
-    const std::vector<reco::CaloMET>             * caloMETs;
-    const std::vector<reco::CaloMET>             * caloMHTs;
-    const std::vector<l1extra::L1EtMissParticle> * l1METs;
-    const std::vector<reco::PFTau>               * pfTaus;
-    const std::vector<reco::PFJet>               * pfJets;
-    const std::vector<reco::CaloJet>             * caloJets;
-    const edm::TriggerResults                    * triggerResults ;
-    const reco::BeamSpot                         * bs;
+  const reco::GenParticleCollection *genParticles;
+  const std::vector<reco::Muon> *muons;
+  const std::vector<reco::Track> *tracks;
+  const std::vector<reco::GsfElectron> *electrons;
+  const std::vector<reco::Photon> *photons;
+  const std::vector<reco::MET> *METs;
+  const std::vector<reco::PFMET> *pfMETs;
+  const std::vector<reco::PFMET> *pfMHTs;
+  const std::vector<reco::GenMET> *genMETs;
+  const std::vector<reco::CaloMET> *caloMETs;
+  const std::vector<reco::CaloMET> *caloMHTs;
+  const std::vector<l1extra::L1EtMissParticle> *l1METs;
+  const std::vector<reco::PFTau> *pfTaus;
+  const std::vector<reco::PFJet> *pfJets;
+  const std::vector<reco::CaloJet> *caloJets;
+  const edm::TriggerResults *triggerResults;
+  const reco::BeamSpot *bs;
 
-    EVTColContainer():
-        nOfCollections(6),
+  EVTColContainer()
+      : nOfCollections(6),
         nInitialized(0),
         genParticles(nullptr),
         muons(nullptr),
@@ -103,195 +103,171 @@ struct EVTColContainer {
         pfJets(nullptr),
         caloJets(nullptr),
         triggerResults(nullptr),
-        bs(nullptr)
-    {
-    }
-    ///
-    bool isAllInit()
-    {
-        return (nInitialized == nOfCollections);
-    }
+        bs(nullptr) {}
+  ///
+  bool isAllInit() { return (nInitialized == nOfCollections); }
 
-    bool isCommonInit()
-    {
-        return false;
-    }
+  bool isCommonInit() { return false; }
 
-    /// Reset: clear all collections
-    void reset()
-    {
-        nInitialized = 0;
-        genParticles = nullptr;
-        muons = nullptr;
-        tracks = nullptr;
-        electrons = nullptr;
-        photons = nullptr;
-        METs = nullptr;
-        pfMETs = nullptr;
-        pfMHTs = nullptr;
-        genMETs = nullptr;
-        caloMETs = nullptr;
-        caloMHTs = nullptr;
-        l1METs = nullptr;
-        pfTaus = nullptr;
-        pfJets = nullptr;
-        caloJets = nullptr;
-        triggerResults = nullptr;
-        bs = nullptr;
-    }
+  /// Reset: clear all collections
+  void reset() {
+    nInitialized = 0;
+    genParticles = nullptr;
+    muons = nullptr;
+    tracks = nullptr;
+    electrons = nullptr;
+    photons = nullptr;
+    METs = nullptr;
+    pfMETs = nullptr;
+    pfMHTs = nullptr;
+    genMETs = nullptr;
+    caloMETs = nullptr;
+    caloMHTs = nullptr;
+    l1METs = nullptr;
+    pfTaus = nullptr;
+    pfJets = nullptr;
+    caloJets = nullptr;
+    triggerResults = nullptr;
+    bs = nullptr;
+  }
 
-    /// Setter: multiple overloaded function
-    void set(const reco::MuonCollection * v)
-    {
-	muons = v;
-        ++nInitialized;
-    }
-    void set(const reco::TrackCollection * v)
-    {
-	tracks = v;
-        ++nInitialized;
-    }
-    void set(const reco::GsfElectronCollection * v)
-    {
-        electrons = v;
-        ++nInitialized;
-    }
-    void set(const reco::PhotonCollection * v)
-    {
-        photons = v;
-        ++nInitialized;
-    }
-    void set(const reco::METCollection * v)
-    {
-        METs = v;
-        ++nInitialized;
-    }
-    void set(const reco::PFMETCollection * v)
-    {
-        pfMETs = v;
-        ++nInitialized;
-    }
-    void setPFMHT(const reco::PFMETCollection * v)
-    {
-        pfMHTs = v;
-        ++nInitialized;
-    }
-    void set(const reco::GenMETCollection * v)
-    {
-        genMETs = v;
-        ++nInitialized;
-    }
-    void set(const reco::CaloMETCollection * v)
-    {
-        caloMETs = v;
-        ++nInitialized;
-    }
-    void setCaloMHT(const reco::CaloMETCollection * v)
-    {
-        caloMHTs = v;
-        ++nInitialized;
-    }
-    void set(const l1extra::L1EtMissParticleCollection * v)
-    {
-        l1METs = v;
-        ++nInitialized;
-    }
-    void set(const reco::PFTauCollection * v)
-    {
-        pfTaus = v;
-        ++nInitialized;
-    }
-    void set(const reco::PFJetCollection * v)
-    {
-        pfJets = v;
-        ++nInitialized;
-    }
-    void set(const reco::CaloJetCollection * v)
-    {
-        caloJets = v;
-        ++nInitialized;
-    }
+  /// Setter: multiple overloaded function
+  void set(const reco::MuonCollection *v) {
+    muons = v;
+    ++nInitialized;
+  }
+  void set(const reco::TrackCollection *v) {
+    tracks = v;
+    ++nInitialized;
+  }
+  void set(const reco::GsfElectronCollection *v) {
+    electrons = v;
+    ++nInitialized;
+  }
+  void set(const reco::PhotonCollection *v) {
+    photons = v;
+    ++nInitialized;
+  }
+  void set(const reco::METCollection *v) {
+    METs = v;
+    ++nInitialized;
+  }
+  void set(const reco::PFMETCollection *v) {
+    pfMETs = v;
+    ++nInitialized;
+  }
+  void setPFMHT(const reco::PFMETCollection *v) {
+    pfMHTs = v;
+    ++nInitialized;
+  }
+  void set(const reco::GenMETCollection *v) {
+    genMETs = v;
+    ++nInitialized;
+  }
+  void set(const reco::CaloMETCollection *v) {
+    caloMETs = v;
+    ++nInitialized;
+  }
+  void setCaloMHT(const reco::CaloMETCollection *v) {
+    caloMHTs = v;
+    ++nInitialized;
+  }
+  void set(const l1extra::L1EtMissParticleCollection *v) {
+    l1METs = v;
+    ++nInitialized;
+  }
+  void set(const reco::PFTauCollection *v) {
+    pfTaus = v;
+    ++nInitialized;
+  }
+  void set(const reco::PFJetCollection *v) {
+    pfJets = v;
+    ++nInitialized;
+  }
+  void set(const reco::CaloJetCollection *v) {
+    caloJets = v;
+    ++nInitialized;
+  }
 
-    /// Get size of collections
-    const unsigned int getSize(const unsigned int & objtype) const
-    {
-        unsigned int size = 0;
-        if (objtype == EVTColContainer::MUON && muons != nullptr) {
-            size = muons->size();
-        } else if (objtype == EVTColContainer::MUTRK && tracks != nullptr) {
-            size = tracks->size();
-        } else if (objtype == EVTColContainer::TRACK && tracks != nullptr) {
-            size = tracks->size();
-        } else if (objtype == EVTColContainer::ELEC && electrons != nullptr) {
-            size = electrons->size();
-        } else if (objtype == EVTColContainer::PHOTON && photons != nullptr) {
-            size = photons->size();
-        } else if (objtype == EVTColContainer::MET && METs != nullptr) {
-            size = METs->size();
-        } else if (objtype == EVTColContainer::PFMET && pfMETs != nullptr) {
-            size = pfMETs->size();
-        } else if (objtype == EVTColContainer::PFMHT && pfMHTs != nullptr) {
-            size = pfMHTs->size();
-        } else if (objtype == EVTColContainer::GENMET && genMETs != nullptr) {
-            size = genMETs->size();
-        } else if (objtype == EVTColContainer::CALOMET && caloMETs != nullptr) {
-            size = caloMETs->size();
-        } else if (objtype == EVTColContainer::CALOMHT && caloMHTs != nullptr) {
-            size = caloMHTs->size();
-        } else if (objtype == EVTColContainer::L1MET && l1METs != nullptr) {
-            size = l1METs->size();
-        } else if (objtype == EVTColContainer::PFTAU && pfTaus != nullptr) {
-            size = pfTaus->size();
-        } else if (objtype == EVTColContainer::PFJET && pfJets != nullptr) {
-            size = pfJets->size();
-        } else if (objtype == EVTColContainer::CALOJET && caloJets != nullptr) {
-            size = caloJets->size();
-        }
-
-        return size;
+  /// Get size of collections
+  const unsigned int getSize(const unsigned int &objtype) const {
+    unsigned int size = 0;
+    if (objtype == EVTColContainer::MUON && muons != nullptr) {
+      size = muons->size();
+    } else if (objtype == EVTColContainer::MUTRK && tracks != nullptr) {
+      size = tracks->size();
+    } else if (objtype == EVTColContainer::TRACK && tracks != nullptr) {
+      size = tracks->size();
+    } else if (objtype == EVTColContainer::ELEC && electrons != nullptr) {
+      size = electrons->size();
+    } else if (objtype == EVTColContainer::PHOTON && photons != nullptr) {
+      size = photons->size();
+    } else if (objtype == EVTColContainer::MET && METs != nullptr) {
+      size = METs->size();
+    } else if (objtype == EVTColContainer::PFMET && pfMETs != nullptr) {
+      size = pfMETs->size();
+    } else if (objtype == EVTColContainer::PFMHT && pfMHTs != nullptr) {
+      size = pfMHTs->size();
+    } else if (objtype == EVTColContainer::GENMET && genMETs != nullptr) {
+      size = genMETs->size();
+    } else if (objtype == EVTColContainer::CALOMET && caloMETs != nullptr) {
+      size = caloMETs->size();
+    } else if (objtype == EVTColContainer::CALOMHT && caloMHTs != nullptr) {
+      size = caloMHTs->size();
+    } else if (objtype == EVTColContainer::L1MET && l1METs != nullptr) {
+      size = l1METs->size();
+    } else if (objtype == EVTColContainer::PFTAU && pfTaus != nullptr) {
+      size = pfTaus->size();
+    } else if (objtype == EVTColContainer::PFJET && pfJets != nullptr) {
+      size = pfJets->size();
+    } else if (objtype == EVTColContainer::CALOJET && caloJets != nullptr) {
+      size = caloJets->size();
     }
 
-    /// Tranform types into strings
-    const static std::string getTypeString(const unsigned int & objtype)
-    {
-        std::string objTypestr;
+    return size;
+  }
 
-        if (objtype == EVTColContainer::MUON) {
-            objTypestr = "Mu";
-        } else if (objtype == EVTColContainer::MUTRK) {
-            objTypestr = "refittedStandAloneMuons";
-        } else if (objtype == EVTColContainer::TRACK) {
-            objTypestr = "Track";
-        } else if (objtype == EVTColContainer::ELEC) {
-            objTypestr = "Ele";
-        } else if (objtype == EVTColContainer::PHOTON) {
-            objTypestr = "Photon";
-        } else if (objtype == EVTColContainer::MET) {
-            objTypestr = "MET";
-        } else if (objtype == EVTColContainer::PFMET) {
-            objTypestr = "PFMET";
-        } else if (objtype == EVTColContainer::PFMHT) {
-            objTypestr = "PFMHT";
-        } else if (objtype == EVTColContainer::GENMET) {
-            objTypestr = "GenMET";
-        } else if (objtype == EVTColContainer::CALOMET) {
-            objTypestr = "CaloMET";
-        } else if (objtype == EVTColContainer::CALOMHT) {
-            objTypestr = "CaloMHT";
-        } else if (objtype == EVTColContainer::L1MET) {
-            objTypestr = "l1MET";
-        } else if (objtype == EVTColContainer::PFTAU) {
-            objTypestr = "PFTau";
-        } else if (objtype == EVTColContainer::PFJET) {
-            objTypestr = "PFJet";
-        } else if (objtype == EVTColContainer::CALOJET) {
-            objTypestr = "CaloJet";
-        } else {
-            edm::LogError("ExoticaValidations") << "EVTColContainer::getTypeString, "
-                                                << "NOT Implemented error (object type id='" << objtype << "')" << std::endl;;
-        }
+  /// Tranform types into strings
+  const static std::string getTypeString(const unsigned int &objtype) {
+    std::string objTypestr;
 
-        return objTypestr;
+    if (objtype == EVTColContainer::MUON) {
+      objTypestr = "Mu";
+    } else if (objtype == EVTColContainer::MUTRK) {
+      objTypestr = "refittedStandAloneMuons";
+    } else if (objtype == EVTColContainer::TRACK) {
+      objTypestr = "Track";
+    } else if (objtype == EVTColContainer::ELEC) {
+      objTypestr = "Ele";
+    } else if (objtype == EVTColContainer::PHOTON) {
+      objTypestr = "Photon";
+    } else if (objtype == EVTColContainer::MET) {
+      objTypestr = "MET";
+    } else if (objtype == EVTColContainer::PFMET) {
+      objTypestr = "PFMET";
+    } else if (objtype == EVTColContainer::PFMHT) {
+      objTypestr = "PFMHT";
+    } else if (objtype == EVTColContainer::GENMET) {
+      objTypestr = "GenMET";
+    } else if (objtype == EVTColContainer::CALOMET) {
+      objTypestr = "CaloMET";
+    } else if (objtype == EVTColContainer::CALOMHT) {
+      objTypestr = "CaloMHT";
+    } else if (objtype == EVTColContainer::L1MET) {
+      objTypestr = "l1MET";
+    } else if (objtype == EVTColContainer::PFTAU) {
+      objTypestr = "PFTau";
+    } else if (objtype == EVTColContainer::PFJET) {
+      objTypestr = "PFJet";
+    } else if (objtype == EVTColContainer::CALOJET) {
+      objTypestr = "CaloJet";
+    } else {
+      edm::LogError("ExoticaValidations") << "EVTColContainer::getTypeString, "
+                                          << "NOT Implemented error (object type id='" << objtype << "')" << std::endl;
+      ;
     }
+
+    return objTypestr;
+  }
 };
 #endif
diff --git a/HLTriggerOffline/Exotica/src/HLTExoticaPlotter.cc b/HLTriggerOffline/Exotica/src/HLTExoticaPlotter.cc
index 1b96a5e4186eb..48e935df4fb09 100644
--- a/HLTriggerOffline/Exotica/src/HLTExoticaPlotter.cc
+++ b/HLTriggerOffline/Exotica/src/HLTExoticaPlotter.cc
@@ -1,10 +1,9 @@
 /** \file HLTExoticaPlotter.cc
  */
 
-
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "HLTriggerOffline/Exotica/interface/HLTExoticaPlotter.h"
 #include "HLTriggerOffline/Exotica/interface/HLTExoticaSubAnalysis.h"
@@ -14,266 +13,246 @@
 
 #include "HLTriggerOffline/Exotica/src/EVTColContainer.cc"
 
-#include<set>
-#include<cctype>
-
-HLTExoticaPlotter::HLTExoticaPlotter(const edm::ParameterSet & pset,
-                                     const std::string & hltPath,
-                                     const std::vector<unsigned int> & objectsType) :
-    _hltPath(hltPath),
-    _hltProcessName(pset.getParameter<std::string>("hltProcessName")),
-    _objectsType(std::set<unsigned int>(objectsType.begin(), objectsType.end())),
-    _nObjects(objectsType.size()),
-    _parametersEta(pset.getParameter<std::vector<double> >("parametersEta")),
-    _parametersPhi(pset.getParameter<std::vector<double> >("parametersPhi")),
-    _parametersTurnOn(pset.getParameter<std::vector<double> >("parametersTurnOn")),
-    _parametersTurnOnSumEt(pset.getParameter<std::vector<double> >("parametersTurnOnSumEt")),
-    _parametersDxy(pset.getParameter<std::vector<double> >("parametersDxy")),
-    _drop_pt2(false),
-    _drop_pt3(false)
-{
-    if (pset.exists("dropPt2")) {
-      _drop_pt2 = pset.getParameter<bool>("dropPt2");
-    }
-    if (pset.exists("dropPt3")) {
-      _drop_pt3 = pset.getParameter<bool>("dropPt3");
-    }
-    LogDebug("ExoticaValidation") << "In HLTExoticaPlotter::constructor()";
+#include <cctype>
+#include <set>
+
+HLTExoticaPlotter::HLTExoticaPlotter(const edm::ParameterSet &pset,
+                                     const std::string &hltPath,
+                                     const std::vector<unsigned int> &objectsType)
+    : _hltPath(hltPath),
+      _hltProcessName(pset.getParameter<std::string>("hltProcessName")),
+      _objectsType(std::set<unsigned int>(objectsType.begin(), objectsType.end())),
+      _nObjects(objectsType.size()),
+      _parametersEta(pset.getParameter<std::vector<double>>("parametersEta")),
+      _parametersPhi(pset.getParameter<std::vector<double>>("parametersPhi")),
+      _parametersTurnOn(pset.getParameter<std::vector<double>>("parametersTurnOn")),
+      _parametersTurnOnSumEt(pset.getParameter<std::vector<double>>("parametersTurnOnSumEt")),
+      _parametersDxy(pset.getParameter<std::vector<double>>("parametersDxy")),
+      _drop_pt2(false),
+      _drop_pt3(false) {
+  if (pset.exists("dropPt2")) {
+    _drop_pt2 = pset.getParameter<bool>("dropPt2");
+  }
+  if (pset.exists("dropPt3")) {
+    _drop_pt3 = pset.getParameter<bool>("dropPt3");
+  }
+  LogDebug("ExoticaValidation") << "In HLTExoticaPlotter::constructor()";
 }
 
-HLTExoticaPlotter::~HLTExoticaPlotter()
-{
-}
-
-
-void HLTExoticaPlotter::beginJob()
-{
-}
-
-
-
-void HLTExoticaPlotter::plotterBookHistos(DQMStore::IBooker & iBooker,
-					  const edm::Run & iRun,
-					  const edm::EventSetup & iSetup)
-{
-    LogDebug("ExoticaValidation") << "In HLTExoticaPlotter::plotterBookHistos()";
-    for (std::set<unsigned int>::iterator it = _objectsType.begin();
-         it != _objectsType.end(); ++it) {
-        std::vector<std::string> sources(2);
-        sources[0] = "gen";
-        sources[1] = "rec";
-
-        const std::string objTypeStr = EVTColContainer::getTypeString(*it);
-
-        for (size_t i = 0; i < sources.size(); i++) {
-            std::string source = sources[i];
-
-            if ( source == "gen" ) {
-              if ( TString(objTypeStr).Contains("MET") ||
-                   TString(objTypeStr).Contains("MHT") ||
-                   TString(objTypeStr).Contains("Jet")    ) {
-                continue;
-              } else {
-                bookHist(iBooker, source, objTypeStr, "MaxPt1");
-                if (!_drop_pt2) bookHist(iBooker, source, objTypeStr, "MaxPt2");
-                if (!_drop_pt3) bookHist(iBooker, source, objTypeStr, "MaxPt3");
-                bookHist(iBooker, source, objTypeStr, "Eta");
-                bookHist(iBooker, source, objTypeStr, "Phi");
- 
-                // If the target is electron or muon,
-                // we will add Dxy plots.
-                if ( *it == EVTColContainer::ELEC ||
-                     *it == EVTColContainer::MUON || 
-                     *it == EVTColContainer::MUTRK    ) { 
-                  bookHist(iBooker, source, objTypeStr, "Dxy");
-                }
-              }
-            } else { // reco
-              if ( TString(objTypeStr).Contains("MET") ||
-                   TString(objTypeStr).Contains("MHT")    ) {
-                bookHist(iBooker, source, objTypeStr, "MaxPt1");
-                bookHist(iBooker, source, objTypeStr, "SumEt");
-              } else {
-                bookHist(iBooker, source, objTypeStr, "MaxPt1");
-                if (!_drop_pt2) bookHist(iBooker, source, objTypeStr, "MaxPt2");
-                if (!_drop_pt3) bookHist(iBooker, source, objTypeStr, "MaxPt3");
-                bookHist(iBooker, source, objTypeStr, "Eta");
-                bookHist(iBooker, source, objTypeStr, "Phi");
-
-                // If the target is electron or muon,
-                // we will add Dxy plots.
-                if ( *it == EVTColContainer::ELEC ||
-                     *it == EVTColContainer::MUON || 
-                     *it == EVTColContainer::MUTRK    ) { 
-                  bookHist(iBooker, source, objTypeStr, "Dxy");
-                }
-              }
-            }	    
-
+HLTExoticaPlotter::~HLTExoticaPlotter() {}
+
+void HLTExoticaPlotter::beginJob() {}
+
+void HLTExoticaPlotter::plotterBookHistos(DQMStore::IBooker &iBooker,
+                                          const edm::Run &iRun,
+                                          const edm::EventSetup &iSetup) {
+  LogDebug("ExoticaValidation") << "In HLTExoticaPlotter::plotterBookHistos()";
+  for (std::set<unsigned int>::iterator it = _objectsType.begin(); it != _objectsType.end(); ++it) {
+    std::vector<std::string> sources(2);
+    sources[0] = "gen";
+    sources[1] = "rec";
+
+    const std::string objTypeStr = EVTColContainer::getTypeString(*it);
+
+    for (size_t i = 0; i < sources.size(); i++) {
+      std::string source = sources[i];
+
+      if (source == "gen") {
+        if (TString(objTypeStr).Contains("MET") || TString(objTypeStr).Contains("MHT") ||
+            TString(objTypeStr).Contains("Jet")) {
+          continue;
+        } else {
+          bookHist(iBooker, source, objTypeStr, "MaxPt1");
+          if (!_drop_pt2)
+            bookHist(iBooker, source, objTypeStr, "MaxPt2");
+          if (!_drop_pt3)
+            bookHist(iBooker, source, objTypeStr, "MaxPt3");
+          bookHist(iBooker, source, objTypeStr, "Eta");
+          bookHist(iBooker, source, objTypeStr, "Phi");
+
+          // If the target is electron or muon,
+          // we will add Dxy plots.
+          if (*it == EVTColContainer::ELEC || *it == EVTColContainer::MUON || *it == EVTColContainer::MUTRK) {
+            bookHist(iBooker, source, objTypeStr, "Dxy");
+          }
+        }
+      } else {  // reco
+        if (TString(objTypeStr).Contains("MET") || TString(objTypeStr).Contains("MHT")) {
+          bookHist(iBooker, source, objTypeStr, "MaxPt1");
+          bookHist(iBooker, source, objTypeStr, "SumEt");
+        } else {
+          bookHist(iBooker, source, objTypeStr, "MaxPt1");
+          if (!_drop_pt2)
+            bookHist(iBooker, source, objTypeStr, "MaxPt2");
+          if (!_drop_pt3)
+            bookHist(iBooker, source, objTypeStr, "MaxPt3");
+          bookHist(iBooker, source, objTypeStr, "Eta");
+          bookHist(iBooker, source, objTypeStr, "Phi");
+
+          // If the target is electron or muon,
+          // we will add Dxy plots.
+          if (*it == EVTColContainer::ELEC || *it == EVTColContainer::MUON || *it == EVTColContainer::MUTRK) {
+            bookHist(iBooker, source, objTypeStr, "Dxy");
+          }
         }
+      }
     }
+  }
 }
 
-void HLTExoticaPlotter::analyze(const bool & isPassTrigger,
-                                const std::string & source,
-                                const std::vector<reco::LeafCandidate> & matches,
-				std::map<int,double> theSumEt,
-                                std::vector<float> & dxys)
-{
-    LogDebug("ExoticaValidation") << "In HLTExoticaPlotter::analyze()";
-    if (!isPassTrigger) {
-        return;
+void HLTExoticaPlotter::analyze(const bool &isPassTrigger,
+                                const std::string &source,
+                                const std::vector<reco::LeafCandidate> &matches,
+                                std::map<int, double> theSumEt,
+                                std::vector<float> &dxys) {
+  LogDebug("ExoticaValidation") << "In HLTExoticaPlotter::analyze()";
+  if (!isPassTrigger) {
+    return;
+  }
+
+  std::map<unsigned int, int> countobjects;
+  // Initializing the count of the used object
+  for (std::set<unsigned int>::iterator co = _objectsType.begin(); co != _objectsType.end(); ++co) {
+    countobjects[*co] = 0;
+  }
+
+  int counttotal = 0;
+
+  // 3 : pt1, pt2, pt3
+  int totalobjectssize = 1;
+  if (!_drop_pt2)
+    totalobjectssize++;
+  if (!_drop_pt3)
+    totalobjectssize++;
+  totalobjectssize *= countobjects.size();
+  // Fill the histos if pass the trigger (just the two with higher pt)
+  for (size_t j = 0; j < matches.size(); ++j) {
+    // Is this object owned by this trigger? If not we are not interested...
+    if (_objectsType.find(matches[j].pdgId()) == _objectsType.end()) {
+      continue;
     }
 
-    std::map<unsigned int, int> countobjects;
-    // Initializing the count of the used object
-    for (std::set<unsigned int>::iterator co = _objectsType.begin();
-         co != _objectsType.end(); ++co) {
-        countobjects[*co] = 0;
-    }
-
-    int counttotal = 0;
-
-    // 3 : pt1, pt2, pt3
-    int totalobjectssize = 1;
-    if (!_drop_pt2) totalobjectssize++;
-    if (!_drop_pt3) totalobjectssize++;
-    totalobjectssize *= countobjects.size();
-    // Fill the histos if pass the trigger (just the two with higher pt)
-    for (size_t j = 0; j < matches.size(); ++j) {
-        // Is this object owned by this trigger? If not we are not interested...
-        if (_objectsType.find(matches[j].pdgId()) == _objectsType.end()) {
-            continue;
-        }
-
-        const unsigned int objType = matches[j].pdgId();
-        const std::string objTypeStr = EVTColContainer::getTypeString(objType);
+    const unsigned int objType = matches[j].pdgId();
+    const std::string objTypeStr = EVTColContainer::getTypeString(objType);
 
-        float pt  =   matches[j].pt();
-        float eta =   matches[j].eta();
-        float phi =   matches[j].phi();
+    float pt = matches[j].pt();
+    float eta = matches[j].eta();
+    float phi = matches[j].phi();
 
-	if ( !( TString(objTypeStr).Contains("MET") || TString(objTypeStr).Contains("MHT") ) ) {
-          this->fillHist(isPassTrigger, source, objTypeStr, "Eta", eta);
-          this->fillHist(isPassTrigger, source, objTypeStr, "Phi", phi);
-	}
-	else if( source!="gen" ) {
-	  if(theSumEt[objType]>=0 && countobjects[objType] == 0) {
-	    this->fillHist(isPassTrigger, source, objTypeStr, "SumEt", theSumEt[objType]);
-	  }
-	}
-
-        if ( !dxys.empty() && (objType == EVTColContainer::ELEC || objType == EVTColContainer::MUON || objType == EVTColContainer::MUTRK) ) 
-           this->fillHist(isPassTrigger, source, objTypeStr, "Dxy", dxys[j] );
+    if (!(TString(objTypeStr).Contains("MET") || TString(objTypeStr).Contains("MHT"))) {
+      this->fillHist(isPassTrigger, source, objTypeStr, "Eta", eta);
+      this->fillHist(isPassTrigger, source, objTypeStr, "Phi", phi);
+    } else if (source != "gen") {
+      if (theSumEt[objType] >= 0 && countobjects[objType] == 0) {
+        this->fillHist(isPassTrigger, source, objTypeStr, "SumEt", theSumEt[objType]);
+      }
+    }
 
-        if (countobjects[objType] == 0) {
-	  if ( !( TString(objTypeStr).Contains("MET") || TString(objTypeStr).Contains("MHT") ) || source!="gen" ) {
-            this->fillHist(isPassTrigger, source, objTypeStr, "MaxPt1", pt);
-	  }
-	  // Filled the high pt ...
-	  ++(countobjects[objType]);
-	  ++counttotal;
-        } 
-	else if (countobjects[objType] == 1 && !_drop_pt2) {
-	  if( !( TString(objTypeStr).Contains("MET") || TString(objTypeStr).Contains("MHT") ) ) {
-            this->fillHist(isPassTrigger, source, objTypeStr, "MaxPt2", pt);
-	  }
-	  // Filled the second high pt ...
-	  ++(countobjects[objType]);
-	  ++counttotal;
-        } 
-	else if (countobjects[objType] == 2 && !_drop_pt3) {
-	  if( !( TString(objTypeStr).Contains("MET") || TString(objTypeStr).Contains("MHT") ) ) {
-            this->fillHist(isPassTrigger, source, objTypeStr, "MaxPt3", pt);
-	  }
-	  // Filled the third highest pt ...
-	  ++(countobjects[objType]);
-	  ++counttotal;
-        } 
-	else {
-	  if (counttotal == totalobjectssize) {
-	    break;
-	  }
-        }
+    if (!dxys.empty() &&
+        (objType == EVTColContainer::ELEC || objType == EVTColContainer::MUON || objType == EVTColContainer::MUTRK))
+      this->fillHist(isPassTrigger, source, objTypeStr, "Dxy", dxys[j]);
+
+    if (countobjects[objType] == 0) {
+      if (!(TString(objTypeStr).Contains("MET") || TString(objTypeStr).Contains("MHT")) || source != "gen") {
+        this->fillHist(isPassTrigger, source, objTypeStr, "MaxPt1", pt);
+      }
+      // Filled the high pt ...
+      ++(countobjects[objType]);
+      ++counttotal;
+    } else if (countobjects[objType] == 1 && !_drop_pt2) {
+      if (!(TString(objTypeStr).Contains("MET") || TString(objTypeStr).Contains("MHT"))) {
+        this->fillHist(isPassTrigger, source, objTypeStr, "MaxPt2", pt);
+      }
+      // Filled the second high pt ...
+      ++(countobjects[objType]);
+      ++counttotal;
+    } else if (countobjects[objType] == 2 && !_drop_pt3) {
+      if (!(TString(objTypeStr).Contains("MET") || TString(objTypeStr).Contains("MHT"))) {
+        this->fillHist(isPassTrigger, source, objTypeStr, "MaxPt3", pt);
+      }
+      // Filled the third highest pt ...
+      ++(countobjects[objType]);
+      ++counttotal;
+    } else {
+      if (counttotal == totalobjectssize) {
+        break;
+      }
+    }
 
-    } // end loop over matches
+  }  // end loop over matches
 }
 
-
-void HLTExoticaPlotter::bookHist(DQMStore::IBooker & iBooker,
-				 const std::string & source,
-                                 const std::string & objType,
-                                 const std::string & variable)
-{
-    LogDebug("ExoticaValidation") << "In HLTExoticaPlotter::bookHist()";
-    std::string sourceUpper = source;
-    sourceUpper[0] = std::toupper(sourceUpper[0]);
-    std::string name = source + objType + variable + "_" + _hltPath;
-    TH1F * h = nullptr;
-
-    if (variable.find("SumEt") != std::string::npos) {
-        std::string title = "Sum ET of " + sourceUpper + " " + objType;
-        const size_t nBins = _parametersTurnOnSumEt.size() - 1;
-        float * edges = new float[nBins + 1];
-        for (size_t i = 0; i < nBins + 1; i++) {
-            edges[i] = _parametersTurnOnSumEt[i];
-        }
-        h = new TH1F(name.c_str(), title.c_str(), nBins, edges);
-        delete[] edges;
-    }
-    else if (variable.find("Dxy") != std::string::npos) {
-      std::string title = "Dxy " + sourceUpper + " " + objType;
-      int    nBins = _parametersDxy[0];
-      double min   = _parametersDxy[1];
-      double max   = _parametersDxy[2];
-      h = new TH1F(name.c_str(), title.c_str(), nBins, min, max);
+void HLTExoticaPlotter::bookHist(DQMStore::IBooker &iBooker,
+                                 const std::string &source,
+                                 const std::string &objType,
+                                 const std::string &variable) {
+  LogDebug("ExoticaValidation") << "In HLTExoticaPlotter::bookHist()";
+  std::string sourceUpper = source;
+  sourceUpper[0] = std::toupper(sourceUpper[0]);
+  std::string name = source + objType + variable + "_" + _hltPath;
+  TH1F *h = nullptr;
+
+  if (variable.find("SumEt") != std::string::npos) {
+    std::string title = "Sum ET of " + sourceUpper + " " + objType;
+    const size_t nBins = _parametersTurnOnSumEt.size() - 1;
+    float *edges = new float[nBins + 1];
+    for (size_t i = 0; i < nBins + 1; i++) {
+      edges[i] = _parametersTurnOnSumEt[i];
     }
-    else if (variable.find("MaxPt") != std::string::npos) {
-        std::string desc = (variable == "MaxPt1") ? "Leading" : 
-                           (variable == "MaxPt2") ? "Next-to-Leading" : "Next-to-next-to-Leading";
-        std::string title = "pT of " + desc + " " + sourceUpper + " " + objType + " "
-                            "where event pass the " + _hltPath;
-        const size_t nBins = _parametersTurnOn.size() - 1;
-        float * edges = new float[nBins + 1];
-        for (size_t i = 0; i < nBins + 1; i++) {
-            edges[i] = _parametersTurnOn[i];
-        }
-        h = new TH1F(name.c_str(), title.c_str(), nBins, edges);
-        delete [] edges;
-    } 
-
-    else {
-        std::string symbol = (variable == "Eta") ? "#eta" : "#phi";
-        std::string title  = symbol + " of " + sourceUpper + " " + objType + " " +
-                             "where event pass the " + _hltPath;
-        std::vector<double> params = (variable == "Eta") ? _parametersEta : _parametersPhi;
-
-        int    nBins = (int)params[0];
-        double min   = params[1];
-        double max   = params[2];
-        h = new TH1F(name.c_str(), title.c_str(), nBins, min, max);
+    h = new TH1F(name.c_str(), title.c_str(), nBins, edges);
+    delete[] edges;
+  } else if (variable.find("Dxy") != std::string::npos) {
+    std::string title = "Dxy " + sourceUpper + " " + objType;
+    int nBins = _parametersDxy[0];
+    double min = _parametersDxy[1];
+    double max = _parametersDxy[2];
+    h = new TH1F(name.c_str(), title.c_str(), nBins, min, max);
+  } else if (variable.find("MaxPt") != std::string::npos) {
+    std::string desc =
+        (variable == "MaxPt1") ? "Leading" : (variable == "MaxPt2") ? "Next-to-Leading" : "Next-to-next-to-Leading";
+    std::string title = "pT of " + desc + " " + sourceUpper + " " + objType +
+                        " "
+                        "where event pass the " +
+                        _hltPath;
+    const size_t nBins = _parametersTurnOn.size() - 1;
+    float *edges = new float[nBins + 1];
+    for (size_t i = 0; i < nBins + 1; i++) {
+      edges[i] = _parametersTurnOn[i];
     }
-
-    h->Sumw2();
-    _elements[name] = iBooker.book1D(name, h);
-    //    LogDebug("ExoticaValidation") << "                        booked histo with name " << name << "\n"
-    //				  << "                        at location " << (unsigned long int)_elements[name];
-    delete h;
+    h = new TH1F(name.c_str(), title.c_str(), nBins, edges);
+    delete[] edges;
+  }
+
+  else {
+    std::string symbol = (variable == "Eta") ? "#eta" : "#phi";
+    std::string title = symbol + " of " + sourceUpper + " " + objType + " " + "where event pass the " + _hltPath;
+    std::vector<double> params = (variable == "Eta") ? _parametersEta : _parametersPhi;
+
+    int nBins = (int)params[0];
+    double min = params[1];
+    double max = params[2];
+    h = new TH1F(name.c_str(), title.c_str(), nBins, min, max);
+  }
+
+  h->Sumw2();
+  _elements[name] = iBooker.book1D(name, h);
+  //    LogDebug("ExoticaValidation") << "                        booked histo
+  //    with name " << name << "\n"
+  //				  << "                        at location " <<
+  //(unsigned long int)_elements[name];
+  delete h;
 }
 
-void HLTExoticaPlotter::fillHist(const bool & passTrigger,
-                                 const std::string & source,
-                                 const std::string & objType,
-                                 const std::string & variable,
-                                 const float & value)
-{
-    std::string sourceUpper = source;
-    sourceUpper[0] = toupper(sourceUpper[0]);
-    std::string name = source + objType + variable + "_" + _hltPath;
-
-    LogDebug("ExoticaValidation") << "In HLTExoticaPlotter::fillHist()" << name << " " << value;
-    _elements[name]->Fill(value);
-    LogDebug("ExoticaValidation") << "In HLTExoticaPlotter::fillHist()" << name << " worked";
+void HLTExoticaPlotter::fillHist(const bool &passTrigger,
+                                 const std::string &source,
+                                 const std::string &objType,
+                                 const std::string &variable,
+                                 const float &value) {
+  std::string sourceUpper = source;
+  sourceUpper[0] = toupper(sourceUpper[0]);
+  std::string name = source + objType + variable + "_" + _hltPath;
+
+  LogDebug("ExoticaValidation") << "In HLTExoticaPlotter::fillHist()" << name << " " << value;
+  _elements[name]->Fill(value);
+  LogDebug("ExoticaValidation") << "In HLTExoticaPlotter::fillHist()" << name << " worked";
 }
-
-
diff --git a/HLTriggerOffline/Exotica/src/HLTExoticaSubAnalysis.cc b/HLTriggerOffline/Exotica/src/HLTExoticaSubAnalysis.cc
index a876d5ca3d58c..09cd6a6b939fa 100644
--- a/HLTriggerOffline/Exotica/src/HLTExoticaSubAnalysis.cc
+++ b/HLTriggerOffline/Exotica/src/HLTExoticaSubAnalysis.cc
@@ -2,15 +2,15 @@
 /** \file HLTExoticaSubAnalysis.cc
  */
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/TypeID.h"
-#include "DataFormats/Common/interface/Handle.h"
 
-#include "HLTriggerOffline/Exotica/interface/HLTExoticaSubAnalysis.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
 #include "CommonTools/Utils/interface/PtComparator.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
+#include "HLTriggerOffline/Exotica/interface/HLTExoticaSubAnalysis.h"
 #include "HLTriggerOffline/Exotica/src/EVTColContainer.cc"
 
 #include "TPRegexp.h"
@@ -19,1340 +19,1325 @@
 #include "DataFormats/Common/interface/TriggerResults.h"
 #include "FWCore/Common/interface/TriggerNames.h"
 
-#include <set>
 #include <algorithm>
+#include <set>
 
-static constexpr int verbose=0;
+static constexpr int verbose = 0;
 
 /// Constructor
-HLTExoticaSubAnalysis::HLTExoticaSubAnalysis(const edm::ParameterSet & pset,
-                                             const std::string & analysisname,
-					     edm::ConsumesCollector && consCollector) :
-    _pset(pset),
-    _analysisname(analysisname),
-    _minCandidates(0),
-    _hltProcessName(pset.getParameter<std::string>("hltProcessName")),
-    _genParticleLabel(pset.getParameter<std::string>("genParticleLabel")),
-    _trigResultsLabel("TriggerResults", "", _hltProcessName),
-    _beamSpotLabel(pset.getParameter<std::string>("beamSpotLabel")),
-    _parametersEta(pset.getParameter<std::vector<double> >("parametersEta")),
-    _parametersPhi(pset.getParameter<std::vector<double> >("parametersPhi")),
-    _parametersTurnOn(pset.getParameter<std::vector<double> >("parametersTurnOn")),
-    _parametersTurnOnSumEt(pset.getParameter<std::vector<double> >("parametersTurnOnSumEt")),
-    _parametersDxy(pset.getParameter<std::vector<double> >("parametersDxy")),
-    _drop_pt2(false),
-    _drop_pt3(false),
-    _recMuonSelector(nullptr),
-    _recMuonTrkSelector(nullptr),
-    _recTrackSelector(nullptr),
-    _recElecSelector(nullptr),
-    _recMETSelector(nullptr),
-    _recPFMETSelector(nullptr),
-    _recPFMHTSelector(nullptr),
-    _genMETSelector(nullptr),
-    _recCaloMETSelector(nullptr),
-    _recCaloMHTSelector(nullptr),
-    _l1METSelector(nullptr),
-    _recPFTauSelector(nullptr),
-    _recPhotonSelector(nullptr),
-    _recPFJetSelector(nullptr),
-    _recCaloJetSelector(nullptr)
-{
-
-    LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::constructor()";
-
-    // Specific parameters for this analysis
-    edm::ParameterSet anpset = pset.getParameter<edm::ParameterSet>(analysisname);
-
-    // If this analysis has a particular set of binnings, use it.
-    // (Taken from the analysis-specific parameter set, of course)
-    // The "true" in the beginning of _pset.insert() means
-    // "overwrite the parameter if need be".
-    if (anpset.exists("parametersTurnOn")) {
-        _parametersTurnOn = anpset.getParameter<std::vector<double> >("parametersTurnOn");
-        _pset.insert(true, "parametersTurnOn", anpset.retrieve("parametersTurnOn"));
-    }
-    if (anpset.exists("parametersEta")) {
-        _parametersEta = anpset.getParameter<std::vector<double> >("parametersEta");
-        _pset.insert(true, "parametersEta", anpset.retrieve("parametersEta"));
-    }
-    if (anpset.exists("parametersPhi")) {
-        _parametersPhi = anpset.getParameter<std::vector<double> >("parametersPhi");
-        _pset.insert(true, "parametersPhi", anpset.retrieve("parametersPhi"));
-    }
-    if (anpset.exists("parametersDxy")) {
-        _parametersDxy = anpset.getParameter<std::vector<double> >("parametersDxy");
-        _pset.insert(true, "parametersDxy", anpset.retrieve("parametersDxy"));
-    }
-    if (anpset.exists("parametersTurnOnSumEt")) {
-        _parametersTurnOnSumEt = anpset.getParameter<std::vector<double> >("parametersTurnOnSumEt");
-        _pset.insert(true, "parametersTurnOnSumEt", anpset.retrieve("parametersTurnOnSumEt"));
-    }
-    if (anpset.exists("dropPt2")) {
-        _drop_pt2 = anpset.getParameter<bool>("dropPt2");
-        _pset.insert(true, "dropPt2", anpset.retrieve("dropPt2"));
+HLTExoticaSubAnalysis::HLTExoticaSubAnalysis(const edm::ParameterSet &pset,
+                                             const std::string &analysisname,
+                                             edm::ConsumesCollector &&consCollector)
+    : _pset(pset),
+      _analysisname(analysisname),
+      _minCandidates(0),
+      _hltProcessName(pset.getParameter<std::string>("hltProcessName")),
+      _genParticleLabel(pset.getParameter<std::string>("genParticleLabel")),
+      _trigResultsLabel("TriggerResults", "", _hltProcessName),
+      _beamSpotLabel(pset.getParameter<std::string>("beamSpotLabel")),
+      _parametersEta(pset.getParameter<std::vector<double>>("parametersEta")),
+      _parametersPhi(pset.getParameter<std::vector<double>>("parametersPhi")),
+      _parametersTurnOn(pset.getParameter<std::vector<double>>("parametersTurnOn")),
+      _parametersTurnOnSumEt(pset.getParameter<std::vector<double>>("parametersTurnOnSumEt")),
+      _parametersDxy(pset.getParameter<std::vector<double>>("parametersDxy")),
+      _drop_pt2(false),
+      _drop_pt3(false),
+      _recMuonSelector(nullptr),
+      _recMuonTrkSelector(nullptr),
+      _recTrackSelector(nullptr),
+      _recElecSelector(nullptr),
+      _recMETSelector(nullptr),
+      _recPFMETSelector(nullptr),
+      _recPFMHTSelector(nullptr),
+      _genMETSelector(nullptr),
+      _recCaloMETSelector(nullptr),
+      _recCaloMHTSelector(nullptr),
+      _l1METSelector(nullptr),
+      _recPFTauSelector(nullptr),
+      _recPhotonSelector(nullptr),
+      _recPFJetSelector(nullptr),
+      _recCaloJetSelector(nullptr) {
+  LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::constructor()";
+
+  // Specific parameters for this analysis
+  edm::ParameterSet anpset = pset.getParameter<edm::ParameterSet>(analysisname);
+
+  // If this analysis has a particular set of binnings, use it.
+  // (Taken from the analysis-specific parameter set, of course)
+  // The "true" in the beginning of _pset.insert() means
+  // "overwrite the parameter if need be".
+  if (anpset.exists("parametersTurnOn")) {
+    _parametersTurnOn = anpset.getParameter<std::vector<double>>("parametersTurnOn");
+    _pset.insert(true, "parametersTurnOn", anpset.retrieve("parametersTurnOn"));
+  }
+  if (anpset.exists("parametersEta")) {
+    _parametersEta = anpset.getParameter<std::vector<double>>("parametersEta");
+    _pset.insert(true, "parametersEta", anpset.retrieve("parametersEta"));
+  }
+  if (anpset.exists("parametersPhi")) {
+    _parametersPhi = anpset.getParameter<std::vector<double>>("parametersPhi");
+    _pset.insert(true, "parametersPhi", anpset.retrieve("parametersPhi"));
+  }
+  if (anpset.exists("parametersDxy")) {
+    _parametersDxy = anpset.getParameter<std::vector<double>>("parametersDxy");
+    _pset.insert(true, "parametersDxy", anpset.retrieve("parametersDxy"));
+  }
+  if (anpset.exists("parametersTurnOnSumEt")) {
+    _parametersTurnOnSumEt = anpset.getParameter<std::vector<double>>("parametersTurnOnSumEt");
+    _pset.insert(true, "parametersTurnOnSumEt", anpset.retrieve("parametersTurnOnSumEt"));
+  }
+  if (anpset.exists("dropPt2")) {
+    _drop_pt2 = anpset.getParameter<bool>("dropPt2");
+    _pset.insert(true, "dropPt2", anpset.retrieve("dropPt2"));
+  }
+  if (anpset.exists("dropPt3")) {
+    _drop_pt3 = anpset.getParameter<bool>("dropPt3");
+    _pset.insert(true, "dropPt3", anpset.retrieve("dropPt3"));
+  }
+
+  // Get names of objects that we may want to get from the event.
+  // Notice that genParticles are dealt with separately.
+  this->getNamesOfObjects(anpset);
+
+  // Since now we have the names, we should register the consumption
+  // of objects.
+  this->registerConsumes(consCollector);
+
+  // Generic objects: Initialization of basic phase space cuts.
+  for (std::map<unsigned int, edm::InputTag>::const_iterator it = _recLabels.begin(); it != _recLabels.end(); ++it) {
+    const std::string objStr = EVTColContainer::getTypeString(it->first);
+    _genCut[it->first] = pset.getParameter<std::string>(objStr + "_genCut");
+    _recCut[it->first] = pset.getParameter<std::string>(objStr + "_recCut");
+    auto const genCutParam = objStr + "_genCut_leading";
+    if (pset.exists(genCutParam)) {
+      _genCut_leading[it->first] = pset.getParameter<std::string>(genCutParam);
+    } else {
+      _genCut_leading[it->first] = "pt>0";  // no cut
     }
-    if (anpset.exists("dropPt3")) {
-        _drop_pt3 = anpset.getParameter<bool>("dropPt3");
-        _pset.insert(true, "dropPt3", anpset.retrieve("dropPt3"));
-    }
-
-    // Get names of objects that we may want to get from the event.
-    // Notice that genParticles are dealt with separately.
-    this->getNamesOfObjects(anpset);
-    
-    // Since now we have the names, we should register the consumption
-    // of objects.
-    this->registerConsumes(consCollector);
-
-    // Generic objects: Initialization of basic phase space cuts.
-    for (std::map<unsigned int, edm::InputTag>::const_iterator it = _recLabels.begin();
-         it != _recLabels.end(); ++it) {
-	const std::string objStr = EVTColContainer::getTypeString(it->first);
-        _genCut[it->first] = pset.getParameter<std::string>(objStr + "_genCut");
-        _recCut[it->first] = pset.getParameter<std::string>(objStr + "_recCut");
-        auto const genCutParam = objStr + "_genCut_leading";
-        if (pset.exists(genCutParam)) {
-          _genCut_leading[it->first] = pset.getParameter<std::string>(genCutParam);
-        } else {
-          _genCut_leading[it->first] = "pt>0"; // no cut
-        }
-        auto const recCutParam = objStr + "_recCut_leading";
-        if (pset.exists(recCutParam)) {
-          _recCut_leading[it->first] = pset.getParameter<std::string>(recCutParam);
-        } else {
-          _recCut_leading[it->first] = "pt>0"; // no cut
-        }
+    auto const recCutParam = objStr + "_recCut_leading";
+    if (pset.exists(recCutParam)) {
+      _recCut_leading[it->first] = pset.getParameter<std::string>(recCutParam);
+    } else {
+      _recCut_leading[it->first] = "pt>0";  // no cut
     }
+  }
 
-    //--- Updating parameters if has to be modified for this particular specific analysis
-    for (std::map<unsigned int, edm::InputTag>::const_iterator it = _recLabels.begin();
-         it != _recLabels.end(); ++it) {
-	const std::string objStr = EVTColContainer::getTypeString(it->first);
-
-        auto const genCutParam = objStr + "_genCut";
-        if(anpset.existsAs<std::string>(genCutParam,false) ) {
-            _genCut[it->first] = anpset.getUntrackedParameter<std::string>(genCutParam);
-        }
-
-        auto const recCutParam = objStr + "_recCut";
-        if(anpset.existsAs<std::string>(recCutParam,false) ) {
-           _recCut[it->first] = anpset.getUntrackedParameter<std::string>(recCutParam);
-        } 
+  //--- Updating parameters if has to be modified for this particular specific
+  // analysis
+  for (std::map<unsigned int, edm::InputTag>::const_iterator it = _recLabels.begin(); it != _recLabels.end(); ++it) {
+    const std::string objStr = EVTColContainer::getTypeString(it->first);
 
+    auto const genCutParam = objStr + "_genCut";
+    if (anpset.existsAs<std::string>(genCutParam, false)) {
+      _genCut[it->first] = anpset.getUntrackedParameter<std::string>(genCutParam);
     }
 
-    /// Get the vector of paths to check, for this particular analysis.
-    _hltPathsToCheck = anpset.getParameter<std::vector<std::string> >("hltPathsToCheck");
-    /// Get the minimum candidates, for this particular analysis.
-    _minCandidates = anpset.getParameter<unsigned int>("minCandidates");
-
-} /// End Constructor
-
-HLTExoticaSubAnalysis::~HLTExoticaSubAnalysis()
-{
-    for (std::map<unsigned int, StringCutObjectSelector<reco::GenParticle>* >::iterator it = _genSelectorMap.begin();
-         it != _genSelectorMap.end(); ++it) {
-        delete it->second;
-        it->second = nullptr;
+    auto const recCutParam = objStr + "_recCut";
+    if (anpset.existsAs<std::string>(recCutParam, false)) {
+      _recCut[it->first] = anpset.getUntrackedParameter<std::string>(recCutParam);
     }
-    delete _recMuonSelector;
-    _recMuonSelector = nullptr;
-    delete _recMuonTrkSelector;
-    _recMuonTrkSelector = nullptr;
-    delete _recTrackSelector;
-    _recTrackSelector = nullptr;
-    delete _recElecSelector;
-    _recElecSelector = nullptr;
-    delete _recPhotonSelector;
-    _recPhotonSelector = nullptr;
-    delete _recMETSelector;
-    _recMETSelector = nullptr;
-    delete _recPFMETSelector;
-    _recPFMETSelector = nullptr;
-    delete _recPFMHTSelector;
-    _recPFMHTSelector = nullptr;
-    delete _genMETSelector;
-    _genMETSelector = nullptr;
-    delete _recCaloMETSelector;
-    _recCaloMETSelector = nullptr;
-    delete _recCaloMHTSelector;
-    _recCaloMHTSelector = nullptr;
-    delete _l1METSelector;
-    _l1METSelector = nullptr;
-    delete _recPFTauSelector;
-    _recPFTauSelector = nullptr;
-    delete _recPFJetSelector;
-    _recPFJetSelector = nullptr;
-    delete _recCaloJetSelector;
-    _recCaloJetSelector = nullptr;
-}
-
-
-void HLTExoticaSubAnalysis::beginJob()
-{
+  }
+
+  /// Get the vector of paths to check, for this particular analysis.
+  _hltPathsToCheck = anpset.getParameter<std::vector<std::string>>("hltPathsToCheck");
+  /// Get the minimum candidates, for this particular analysis.
+  _minCandidates = anpset.getParameter<unsigned int>("minCandidates");
+
+}  /// End Constructor
+
+HLTExoticaSubAnalysis::~HLTExoticaSubAnalysis() {
+  for (std::map<unsigned int, StringCutObjectSelector<reco::GenParticle> *>::iterator it = _genSelectorMap.begin();
+       it != _genSelectorMap.end();
+       ++it) {
+    delete it->second;
+    it->second = nullptr;
+  }
+  delete _recMuonSelector;
+  _recMuonSelector = nullptr;
+  delete _recMuonTrkSelector;
+  _recMuonTrkSelector = nullptr;
+  delete _recTrackSelector;
+  _recTrackSelector = nullptr;
+  delete _recElecSelector;
+  _recElecSelector = nullptr;
+  delete _recPhotonSelector;
+  _recPhotonSelector = nullptr;
+  delete _recMETSelector;
+  _recMETSelector = nullptr;
+  delete _recPFMETSelector;
+  _recPFMETSelector = nullptr;
+  delete _recPFMHTSelector;
+  _recPFMHTSelector = nullptr;
+  delete _genMETSelector;
+  _genMETSelector = nullptr;
+  delete _recCaloMETSelector;
+  _recCaloMETSelector = nullptr;
+  delete _recCaloMHTSelector;
+  _recCaloMHTSelector = nullptr;
+  delete _l1METSelector;
+  _l1METSelector = nullptr;
+  delete _recPFTauSelector;
+  _recPFTauSelector = nullptr;
+  delete _recPFJetSelector;
+  _recPFJetSelector = nullptr;
+  delete _recCaloJetSelector;
+  _recCaloJetSelector = nullptr;
 }
 
+void HLTExoticaSubAnalysis::beginJob() {}
 
 // 2014-02-03 -- Thiago
-// Due to the fact that the DQM has to be thread safe now, we have to do things differently:
-// 1) Implement the bookHistograms() method in the container class
+// Due to the fact that the DQM has to be thread safe now, we have to do things
+// differently: 1) Implement the bookHistograms() method in the container class
 // 2) Make the iBooker from above be known to this class
-// 3) Separate all booking histograms routines in this and any auxiliary classe to be called
-// from bookHistograms() in the container class
+// 3) Separate all booking histograms routines in this and any auxiliary classe
+// to be called from bookHistograms() in the container class
 void HLTExoticaSubAnalysis::subAnalysisBookHistos(DQMStore::IBooker &iBooker,
-                                                  const edm::Run & iRun,
-                                                  const edm::EventSetup & iSetup)
-{
-    
-    LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::subAnalysisBookHistos()";
-
-    // Create the folder structure inside HLT/Exotica
-    std::string baseDir = "HLT/Exotica/" + _analysisname + "/";
-    iBooker.setCurrentFolder(baseDir);
-
-    // Book the gen/reco analysis-dependent histograms (denominators)
-    for (std::map<unsigned int, edm::InputTag>::const_iterator it = _recLabels.begin();
-         it != _recLabels.end(); ++it) {
-	const std::string objStr = EVTColContainer::getTypeString(it->first);
-        std::vector<std::string> sources(2);
-        sources[0] = "gen";
-        sources[1] = "rec";
-	
-        for (size_t i = 0; i < sources.size(); i++) {
-	  std::string source = sources[i];
-
-          if ( source == "gen" ) {
-            if ( TString(objStr).Contains("MET") ||
-                 TString(objStr).Contains("MHT") ||
-                 TString(objStr).Contains("Jet")    ) {
-              continue;
-            } else {
-              bookHist(iBooker, source, objStr, "MaxPt1");
-              if (!_drop_pt2) bookHist(iBooker, source, objStr, "MaxPt2");
-              if (!_drop_pt3) bookHist(iBooker, source, objStr, "MaxPt3");
-              bookHist(iBooker, source, objStr, "Eta");
-              bookHist(iBooker, source, objStr, "Phi");
-
-              // If the target is electron or muon,
-              // we will add Dxy plots.
-              if ( it->first == EVTColContainer::ELEC ||
-                   it->first == EVTColContainer::MUON ||  
-                   it->first == EVTColContainer::MUTRK   ) { 
-                 bookHist(iBooker, source, objStr, "Dxy");
-              }
-            }
-          } else { // reco
-            if ( TString(objStr).Contains("MET") ||
-                 TString(objStr).Contains("MHT")    ) {
-              bookHist(iBooker, source, objStr, "MaxPt1");
-              bookHist(iBooker, source, objStr, "SumEt");
-            } else {
-              bookHist(iBooker, source, objStr, "MaxPt1");
-              if (!_drop_pt2) bookHist(iBooker, source, objStr, "MaxPt2");
-              if (!_drop_pt3) bookHist(iBooker, source, objStr, "MaxPt3");
-              bookHist(iBooker, source, objStr, "Eta");
-              bookHist(iBooker, source, objStr, "Phi");
-
-              // If the target is electron or muon,
-              // we will add Dxy plots.
-              if ( it->first == EVTColContainer::ELEC ||
-                   it->first == EVTColContainer::MUON ||  
-                   it->first == EVTColContainer::MUTRK    ) { 
-                 bookHist(iBooker, source, objStr, "Dxy");
-              }
-            }
+                                                  const edm::Run &iRun,
+                                                  const edm::EventSetup &iSetup) {
+  LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::subAnalysisBookHistos()";
+
+  // Create the folder structure inside HLT/Exotica
+  std::string baseDir = "HLT/Exotica/" + _analysisname + "/";
+  iBooker.setCurrentFolder(baseDir);
+
+  // Book the gen/reco analysis-dependent histograms (denominators)
+  for (std::map<unsigned int, edm::InputTag>::const_iterator it = _recLabels.begin(); it != _recLabels.end(); ++it) {
+    const std::string objStr = EVTColContainer::getTypeString(it->first);
+    std::vector<std::string> sources(2);
+    sources[0] = "gen";
+    sources[1] = "rec";
+
+    for (size_t i = 0; i < sources.size(); i++) {
+      std::string source = sources[i];
+
+      if (source == "gen") {
+        if (TString(objStr).Contains("MET") || TString(objStr).Contains("MHT") || TString(objStr).Contains("Jet")) {
+          continue;
+        } else {
+          bookHist(iBooker, source, objStr, "MaxPt1");
+          if (!_drop_pt2)
+            bookHist(iBooker, source, objStr, "MaxPt2");
+          if (!_drop_pt3)
+            bookHist(iBooker, source, objStr, "MaxPt3");
+          bookHist(iBooker, source, objStr, "Eta");
+          bookHist(iBooker, source, objStr, "Phi");
+
+          // If the target is electron or muon,
+          // we will add Dxy plots.
+          if (it->first == EVTColContainer::ELEC || it->first == EVTColContainer::MUON ||
+              it->first == EVTColContainer::MUTRK) {
+            bookHist(iBooker, source, objStr, "Dxy");
           }
-
         }
-    } // closes loop in _recLabels
-
-    // Call the plotterBookHistos() (which books all the path dependent histograms)
-    LogDebug("ExoticaValidation") << "                        number of plotters = " << _plotters.size();
-    for (std::vector<HLTExoticaPlotter>::iterator it = _plotters.begin();
-         it != _plotters.end(); ++it) {
-	it->plotterBookHistos(iBooker, iRun, iSetup);
+      } else {  // reco
+        if (TString(objStr).Contains("MET") || TString(objStr).Contains("MHT")) {
+          bookHist(iBooker, source, objStr, "MaxPt1");
+          bookHist(iBooker, source, objStr, "SumEt");
+        } else {
+          bookHist(iBooker, source, objStr, "MaxPt1");
+          if (!_drop_pt2)
+            bookHist(iBooker, source, objStr, "MaxPt2");
+          if (!_drop_pt3)
+            bookHist(iBooker, source, objStr, "MaxPt3");
+          bookHist(iBooker, source, objStr, "Eta");
+          bookHist(iBooker, source, objStr, "Phi");
+
+          // If the target is electron or muon,
+          // we will add Dxy plots.
+          if (it->first == EVTColContainer::ELEC || it->first == EVTColContainer::MUON ||
+              it->first == EVTColContainer::MUTRK) {
+            bookHist(iBooker, source, objStr, "Dxy");
+          }
+        }
+      }
     }
+  }  // closes loop in _recLabels
+
+  // Call the plotterBookHistos() (which books all the path dependent
+  // histograms)
+  LogDebug("ExoticaValidation") << "                        number of plotters = " << _plotters.size();
+  for (std::vector<HLTExoticaPlotter>::iterator it = _plotters.begin(); it != _plotters.end(); ++it) {
+    it->plotterBookHistos(iBooker, iRun, iSetup);
+  }
 }
 
-void HLTExoticaSubAnalysis::beginRun(const edm::Run & iRun, const edm::EventSetup & iSetup)
-{
-
-    LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::beginRun()";
-    
-    /// Construct the plotters right here.
-    /// For that we need to create the _hltPaths vector.
-
-    // Initialize the HLT config.
-    bool changedConfig(true);
-    if (!_hltConfig.init(iRun, iSetup, _hltProcessName, changedConfig)) {
-        edm::LogError("ExoticaValidation") << "HLTExoticaSubAnalysis::constructor(): "
-                                           << "Initialization of HLTConfigProvider failed!";
+void HLTExoticaSubAnalysis::beginRun(const edm::Run &iRun, const edm::EventSetup &iSetup) {
+  LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::beginRun()";
+
+  /// Construct the plotters right here.
+  /// For that we need to create the _hltPaths vector.
+
+  // Initialize the HLT config.
+  bool changedConfig(true);
+  if (!_hltConfig.init(iRun, iSetup, _hltProcessName, changedConfig)) {
+    edm::LogError("ExoticaValidation") << "HLTExoticaSubAnalysis::constructor(): "
+                                       << "Initialization of HLTConfigProvider failed!";
+  }
+
+  // Parse the input paths to get them if they are in the table and associate
+  // them to the last filter of the path (in order to extract the objects).
+  _hltPaths.clear();
+  for (size_t i = 0; i < _hltPathsToCheck.size(); ++i) {
+    bool found = false;
+    TPRegexp pattern(_hltPathsToCheck[i]);
+
+    // Loop over triggerNames from _hltConfig
+    for (size_t j = 0; j < _hltConfig.triggerNames().size(); ++j) {
+      std::string thetriggername = _hltConfig.triggerNames()[j];
+      if (TString(thetriggername).Contains(pattern)) {
+        _hltPaths.insert(thetriggername);
+        found = true;
+      }
+      if (verbose > 2 && i == 0)
+        LogDebug("ExoticaValidation") << "--- TRIGGER PATH : " << thetriggername;
     }
 
-    // Parse the input paths to get them if they are in the table and associate
-    // them to the last filter of the path (in order to extract the objects).
-    _hltPaths.clear();
-    for (size_t i = 0; i < _hltPathsToCheck.size(); ++i) {
-        bool found = false;
-        TPRegexp pattern(_hltPathsToCheck[i]);
-	
-	// Loop over triggerNames from _hltConfig
-	for (size_t j = 0 ; j < _hltConfig.triggerNames().size(); ++j) {
-            std::string thetriggername = _hltConfig.triggerNames()[j];
-            if (TString(thetriggername).Contains(pattern)) {
-                _hltPaths.insert(thetriggername);
-                found = true;
-            }
-	    if(verbose>2 && i==0) 
-	      LogDebug("ExoticaValidation") << "--- TRIGGER PATH : " << thetriggername;
-        }
-	
-	// Oh dear, the path we wanted seems to not be available
-        if (! found && verbose>2) {
-            edm::LogWarning("ExoticaValidation") << "HLTExoticaSubAnalysis::constructor(): In "
-                                                 << _analysisname << " subfolder NOT found the path: '"
-                                                 << _hltPathsToCheck[i] << "*'" ;
-        }
-    } // Close loop over paths to check.
-    
-    // At this point, _hltpaths contains the names of the paths to check
-    // that were found. Let's log it at trace level.
-    LogTrace("ExoticaValidation") << "SubAnalysis: " << _analysisname 
-				  << "\nHLT Trigger Paths found >>>";
-    for (std::set<std::string>::const_iterator iter = _hltPaths.begin();
-	 iter != _hltPaths.end(); ++iter) {
-        LogTrace("ExoticaValidation") << (*iter) << "\n";
+    // Oh dear, the path we wanted seems to not be available
+    if (!found && verbose > 2) {
+      edm::LogWarning("ExoticaValidation") << "HLTExoticaSubAnalysis::constructor(): In " << _analysisname
+                                           << " subfolder NOT found the path: '" << _hltPathsToCheck[i] << "*'";
+    }
+  }  // Close loop over paths to check.
+
+  // At this point, _hltpaths contains the names of the paths to check
+  // that were found. Let's log it at trace level.
+  LogTrace("ExoticaValidation") << "SubAnalysis: " << _analysisname << "\nHLT Trigger Paths found >>>";
+  for (std::set<std::string>::const_iterator iter = _hltPaths.begin(); iter != _hltPaths.end(); ++iter) {
+    LogTrace("ExoticaValidation") << (*iter) << "\n";
+  }
+
+  // Initialize the plotters (analysers for each trigger path)
+  _plotters.clear();
+  for (std::set<std::string>::iterator iPath = _hltPaths.begin(); iPath != _hltPaths.end(); ++iPath) {
+    // Avoiding the dependence of the version number for the trigger paths
+    std::string path = *iPath;
+    std::string shortpath = path;
+    if (path.rfind("_v") < path.length()) {
+      shortpath = path.substr(0, path.rfind("_v"));
+    }
+    _shortpath2long[shortpath] = path;
+
+    // Objects needed by the HLT path
+    // Thiago: instead of trying to decode the objects from the path,
+    // put the burden on the user to tell us which objects are needed.
+    // const std::vector<unsigned int> objsNeedHLT =
+    // this->getObjectsType(shortpath);
+    std::vector<unsigned int> objsNeedHLT;
+    for (std::map<unsigned int, edm::InputTag>::iterator it = _recLabels.begin(); it != _recLabels.end(); ++it) {
+      objsNeedHLT.push_back(it->first);
     }
 
-    // Initialize the plotters (analysers for each trigger path)
-    _plotters.clear();
-    for (std::set<std::string>::iterator iPath = _hltPaths.begin();
-         iPath != _hltPaths.end(); ++iPath) {
-        // Avoiding the dependence of the version number for the trigger paths
-        std::string path = * iPath;
-        std::string shortpath = path;
-        if (path.rfind("_v") < path.length()) {
-            shortpath = path.substr(0, path.rfind("_v"));
-        }
-        _shortpath2long[shortpath] = path;
-
-        // Objects needed by the HLT path
-	// Thiago: instead of trying to decode the objects from the path,
-	// put the burden on the user to tell us which objects are needed.
-        //const std::vector<unsigned int> objsNeedHLT = this->getObjectsType(shortpath);
-	std::vector<unsigned int> objsNeedHLT;
-        for (std::map<unsigned int, edm::InputTag>::iterator it = _recLabels.begin() ;
-             it != _recLabels.end(); ++it) {
-            objsNeedHLT.push_back(it->first);
-        }
-
-        /*std::vector<unsigned int> userInstantiate;
-        // Sanity check: the object needed by a trigger path should be
-        // introduced by the user via config python (_recLabels datamember)
-        for (std::map<unsigned int, edm::InputTag>::iterator it = _recLabels.begin() ;
-             it != _recLabels.end(); ++it) {
-            userInstantiate.push_back(it->first);
-        }
-        for (std::vector<unsigned int>::const_iterator it = objsNeedHLT.begin(); it != objsNeedHLT.end();
-             ++it) {
-            if (std::find(userInstantiate.begin(), userInstantiate.end(), *it) ==
-                userInstantiate.end()) {
-                edm::LogError("ExoticaValidation") << "In HLTExoticaSubAnalysis::beginRun, "
-                                                   << "Incoherence found in the python configuration file!!\nThe SubAnalysis '"
-                                                   << _analysisname << "' has been asked to evaluate the trigger path '"
-                                                   << shortpath << "' (found it in 'hltPathsToCheck') BUT this path"
-                                                   << " needs a '" << EVTColContainer::getTypeString(*it)
-                                                   << "' which has not been instantiated ('recVariableLabels'"
-                                                   << ")" ;
-                exit(-1); // This should probably throw an exception...
-            }
+    /*std::vector<unsigned int> userInstantiate;
+    // Sanity check: the object needed by a trigger path should be
+    // introduced by the user via config python (_recLabels datamember)
+    for (std::map<unsigned int, edm::InputTag>::iterator it = _recLabels.begin()
+    ; it != _recLabels.end(); ++it) { userInstantiate.push_back(it->first);
+    }
+    for (std::vector<unsigned int>::const_iterator it = objsNeedHLT.begin(); it
+    != objsNeedHLT.end();
+         ++it) {
+        if (std::find(userInstantiate.begin(), userInstantiate.end(), *it) ==
+            userInstantiate.end()) {
+            edm::LogError("ExoticaValidation") << "In
+    HLTExoticaSubAnalysis::beginRun, "
+                                               << "Incoherence found in the
+    python configuration file!!\nThe SubAnalysis '"
+                                               << _analysisname << "' has been
+    asked to evaluate the trigger path '"
+                                               << shortpath << "' (found it in
+    'hltPathsToCheck') BUT this path"
+                                               << " needs a '" <<
+    EVTColContainer::getTypeString(*it)
+                                               << "' which has not been
+    instantiated ('recVariableLabels'"
+                                               << ")" ;
+            exit(-1); // This should probably throw an exception...
         }
-	*/
-        LogTrace("ExoticaValidation") << " --- " << shortpath;
-
-        // The hlt path, the objects (electrons, muons, photons, ...)
-        // needed to evaluate the path are the argumens of the plotter
-        HLTExoticaPlotter analyzer(_pset, shortpath, objsNeedHLT);
-        _plotters.push_back(analyzer);
-        // counting HLT passed events for debug
-        _triggerCounter.insert(std::map<std::string,int>::value_type(shortpath,0));
-    }// Okay, at this point we have prepared all the plotters.
-
+    }
+    */
+    LogTrace("ExoticaValidation") << " --- " << shortpath;
+
+    // The hlt path, the objects (electrons, muons, photons, ...)
+    // needed to evaluate the path are the argumens of the plotter
+    HLTExoticaPlotter analyzer(_pset, shortpath, objsNeedHLT);
+    _plotters.push_back(analyzer);
+    // counting HLT passed events for debug
+    _triggerCounter.insert(std::map<std::string, int>::value_type(shortpath, 0));
+  }  // Okay, at this point we have prepared all the plotters.
 }
 
+void HLTExoticaSubAnalysis::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup, EVTColContainer *cols) {
+  LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::analyze()";
+
+  // Loop over _recLabels to make sure everything is alright.
+  /*
+  std::cout << "Now printing the _recLabels" << std::endl;
+  for (std::map<unsigned int, edm::InputTag>::iterator it = _recLabels.begin();
+       it != _recLabels.end(); ++it) {
+      std::cout <<  "Number: " << it->first << "\t" << "Label: " <<
+  it->second.label() << std::endl;
+  }
+  */
+
+  // Initialize the collection (the ones which have not been initialiazed yet)
+  // std::cout << "Setting handles to objects..." << std::endl;
+  this->getHandlesToObjects(iEvent, cols);
+
+  // Utility map, mapping kinds of objects (GEN, RECO) to strings ("gen","rec")
+  // std::map<Level, std::string> u2str;
+  // u2str[Level::GEN] = "gen";
+  // u2str[Level::RECO] = "rec";
+
+  // Extract the match structure containing the gen/reco candidates (electron,
+  // muons,...). This part is common to all the SubAnalyses
+  std::vector<reco::LeafCandidate> matchesGen;
+  matchesGen.clear();
+  std::vector<reco::LeafCandidate> matchesReco;
+  matchesReco.clear();
+  std::map<int, double> theSumEt;  // map< pdgId ; SumEt > in order to keep track of the MET type
+  std::map<int, std::vector<const reco::Track *>> trkObjs;
+
+  // --- deal with GEN objects first.
+  // Make each good GEN object into the base cand for a MatchStruct
+  // Our definition of "good" is "passes the selector" defined in the config.py
+  // Save all the MatchStructs in the "matchesGen" vector.
+
+  for (std::map<unsigned int, edm::InputTag>::iterator it = _recLabels.begin(); it != _recLabels.end(); ++it) {
+    // Here we are filling the vector of
+    // StringCutObjectSelector<reco::GenParticle> with objects constructed from
+    // the strings saved in _genCut. Initialize selectors when first event
+
+    // std::cout << "Loop over the kinds of objects: objects of kind " <<
+    // it->first << std::endl;
+
+    if (!_genSelectorMap[it->first]) {
+      _genSelectorMap[it->first] = new StringCutObjectSelector<reco::GenParticle>(_genCut[it->first]);
+    }
 
-void HLTExoticaSubAnalysis::analyze(const edm::Event & iEvent, const edm::EventSetup & iSetup, EVTColContainer * cols)
-{
-    LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::analyze()";
+    const std::string objTypeStr = EVTColContainer::getTypeString(it->first);
+    // genAnyMET doesn't make sense. No need their matchesGens
+    if (TString(objTypeStr).Contains("MET") || TString(objTypeStr).Contains("MHT") ||
+        TString(objTypeStr).Contains("Jet"))
+      continue;
+
+    // Now loop over the genParticles, and apply the operator() over each of
+    // them. Fancy syntax: for objects X and Y, X.operator()(Y) is the same as
+    // X(Y).
+    for (size_t i = 0; i < cols->genParticles->size(); ++i) {
+      // std::cout << "Now matchesGen.size() is " << matchesGen.size() <<
+      // std::endl;
+      if (_genSelectorMap[it->first]->operator()(cols->genParticles->at(i))) {
+        const reco::Candidate *cand = &(cols->genParticles->at(i));
+        // std::cout << "Found good cand: cand->pt() = " << cand->pt() <<
+        // std::endl; matchesGen.push_back(MatchStruct(cand, it->first));
+        /// We are going to make a fake reco::LeafCandidate, with our
+        /// particleType as the pdgId. This is an alternative to the older
+        /// implementation with MatchStruct.
+        reco::LeafCandidate v(0, cand->p4(), cand->vertex(), it->first, 0, true);
+
+        matchesGen.push_back(v);
+      }
+    }
+  }
+
+  // Sort the matches by pT for later filling of turn-on curve
+  // std::cout << "Before sorting: matchesGen.size() = " << matchesGen.size() <<
+  // std::endl;
+
+  // GreaterByPt<reco::LeafCandidate> comparator;
+  // std::sort(matchesGen.begin(),
+  // 	      matchesGen.end(),
+  // 	      comparator);
+
+  // --- same for RECO objects
+  // Extraction of the objects candidates
+  if (verbose > 0)
+    LogDebug("ExoticaValidation") << "-- enter loop over recLabels";
+  for (std::map<unsigned int, edm::InputTag>::iterator it = _recLabels.begin(); it != _recLabels.end(); ++it) {
+    // std::cout << "Filling RECO \"matchesReco\" vector for particle kind
+    // it->first = "
+    //	  << it->first << ", which means " << it->second.label() << std::endl;
+    // Reco selectors (the function takes into account if it was instantiated
+    // before or not) ### Thiago ---> Then why don't we put it in the
+    // beginRun???
+    this->initSelector(it->first);
+    // -- Storing the matchesReco
+    this->insertCandidates(it->first, cols, &matchesReco, theSumEt, trkObjs);
+    if (verbose > 0)
+      LogDebug("ExoticaValidation") << "--- " << EVTColContainer::getTypeString(it->first)
+                                    << " sumEt=" << theSumEt[it->first];
+  }
+
+  // std::sort(matchesReco.begin(),
+  // 	      matchesReco.end(),
+  // 	      comparator);
+
+  // -- Trigger Results
+  const edm::TriggerNames &trigNames = iEvent.triggerNames(*(cols->triggerResults));
+
+  // counting HLT passed events for debugging
+  for (std::vector<HLTExoticaPlotter>::iterator an = _plotters.begin(); an != _plotters.end(); ++an) {
+    const std::string hltPath = _shortpath2long[an->gethltpath()];
+    const bool ispassTrigger = cols->triggerResults->accept(trigNames.triggerIndex(hltPath));
+    if (ispassTrigger)
+      _triggerCounter.find(an->gethltpath())->second++;
+  }
+
+  /// Filling the histograms if pass the minimum amount of candidates needed by
+  /// the analysis:
+
+  // for (std::map<unsigned int, std::vector<MatchStruct> >::iterator it =
+  // sourceMatchMap.begin(); it != sourceMatchMap.end(); ++it) {
+  // it->first: gen/reco   it->second: HLT matches (std::vector<MatchStruct>)
+
+  // if (it->second.size() < _minCandidates) {  // FIXME: A bug is potentially
+  // here: what about the mixed channels? continue;
+  //}
+
+  ////////////////
+  /// GEN CASE ///
+  ////////////////
+  if (matchesGen.size() >= _minCandidates) {  // FIXME: A bug is potentially here: what about the
+                                              // mixed channels?
+    // Okay, there are enough candidates. Move on!
+
+    // Filling the gen/reco objects (eff-denominators):
+    // Just the first two different ones, if there are more
+    // The countobjects maps uints (object types, really) --> integers.
+    // Example:
+    // | uint | int |
+    // |  0   |  1  | --> 1 muon used
+    // |  1   |  2  | --> 2 electrons used
+
+    // Initializing the count of the used objects.
+    std::map<unsigned int, int> countobjects;
+    for (std::map<unsigned int, edm::InputTag>::iterator co = _recLabels.begin(); co != _recLabels.end(); ++co) {
+      // countobjects->insert(std::pair<unsigned int, int>(co->first, 0));
+      countobjects.insert(std::pair<unsigned int, int>(co->first, 0));
+    }
 
-    // Loop over _recLabels to make sure everything is alright.
-    /*
-    std::cout << "Now printing the _recLabels" << std::endl;
-    for (std::map<unsigned int, edm::InputTag>::iterator it = _recLabels.begin();
-         it != _recLabels.end(); ++it) {
-	std::cout <<  "Number: " << it->first << "\t" << "Label: " << it->second.label() << std::endl;  
+    int counttotal = 0;
+
+    // 3 : pt1, pt2, pt3
+    int totalobjectssize = 1;
+    if (!_drop_pt2)
+      totalobjectssize++;
+    if (!_drop_pt3)
+      totalobjectssize++;
+    totalobjectssize *= countobjects.size();
+
+    bool isPassedLeadingCut = true;
+    // We will proceed only when cuts for the pt-leading are satisified.
+    for (size_t j = 0; j != matchesGen.size(); ++j) {
+      const unsigned int objType = matchesGen[j].pdgId();
+      // Cut for the pt-leading object
+      StringCutObjectSelector<reco::LeafCandidate> select(_genCut_leading[objType]);
+      if (!select(matchesGen[j])) {  // No interest case
+        isPassedLeadingCut = false;  // Will skip the following matchesGen loop
+        matchesGen.clear();
+        break;
+      }
     }
-    */
-    
-    // Initialize the collection (the ones which have not been initialiazed yet)
-    //std::cout << "Setting handles to objects..." << std::endl;
-    this->getHandlesToObjects(iEvent, cols);
-
-    // Utility map, mapping kinds of objects (GEN, RECO) to strings ("gen","rec")
-    //std::map<Level, std::string> u2str;
-    //u2str[Level::GEN] = "gen";
-    //u2str[Level::RECO] = "rec";
-
-    // Extract the match structure containing the gen/reco candidates (electron, muons,...). This part is common to all the SubAnalyses
-    std::vector<reco::LeafCandidate> matchesGen; matchesGen.clear();
-    std::vector<reco::LeafCandidate> matchesReco; matchesReco.clear();
-    std::map<int , double> theSumEt; // map< pdgId ; SumEt > in order to keep track of the MET type
-    std::map<int, std::vector<const reco::Track*> > trkObjs;
-
-    // --- deal with GEN objects first.
-    // Make each good GEN object into the base cand for a MatchStruct
-    // Our definition of "good" is "passes the selector" defined in the config.py
-    // Save all the MatchStructs in the "matchesGen" vector.
-
-    for (std::map<unsigned int, edm::InputTag>::iterator it = _recLabels.begin();
-         it != _recLabels.end(); ++it) {
-        // Here we are filling the vector of StringCutObjectSelector<reco::GenParticle>
-        // with objects constructed from the strings saved in _genCut.
-        // Initialize selectors when first event
-
-	//std::cout << "Loop over the kinds of objects: objects of kind " << it->first << std::endl;
-	
-
-	if (!_genSelectorMap[it->first]) {
-            _genSelectorMap[it->first] = new StringCutObjectSelector<reco::GenParticle>(_genCut[it->first]);
-        }
 
-        const std::string objTypeStr = EVTColContainer::getTypeString(it->first);
-        // genAnyMET doesn't make sense. No need their matchesGens
-        if ( TString(objTypeStr).Contains("MET") || 
-             TString(objTypeStr).Contains("MHT") ||
-             TString(objTypeStr).Contains("Jet")   ) continue;
-
-        // Now loop over the genParticles, and apply the operator() over each of them.
-        // Fancy syntax: for objects X and Y, X.operator()(Y) is the same as X(Y).
-        for (size_t i = 0; i < cols->genParticles->size(); ++i) {
-	    //std::cout << "Now matchesGen.size() is " << matchesGen.size() << std::endl;
-            if (_genSelectorMap[it->first]->operator()(cols->genParticles->at(i))) {
-                const reco::Candidate* cand = &(cols->genParticles->at(i));
-		//std::cout << "Found good cand: cand->pt() = " << cand->pt() << std::endl;
-		//matchesGen.push_back(MatchStruct(cand, it->first));
-		/// We are going to make a fake reco::LeafCandidate, with our particleType as the pdgId.
-		/// This is an alternative to the older implementation with MatchStruct.
-		reco::LeafCandidate v(0,cand->p4(),cand->vertex(),it->first,0,true);
-
-                matchesGen.push_back(v);
-            }
+    std::vector<float> dxys;
+    dxys.clear();
+
+    for (size_t j = 0; (j != matchesGen.size()) && isPassedLeadingCut; ++j) {
+      const unsigned int objType = matchesGen[j].pdgId();
+      // std::cout << "(4) Gonna call with " << objType << std::endl;
+      const std::string objTypeStr = EVTColContainer::getTypeString(objType);
+
+      float pt = matchesGen[j].pt();
+
+      if (countobjects[objType] == 0) {
+        this->fillHist("gen", objTypeStr, "MaxPt1", pt);
+        ++(countobjects[objType]);
+        ++counttotal;
+      } else if (countobjects[objType] == 1 && !_drop_pt2) {
+        this->fillHist("gen", objTypeStr, "MaxPt2", pt);
+        ++(countobjects[objType]);
+        ++counttotal;
+      } else if (countobjects[objType] == 2 && !_drop_pt3) {
+        this->fillHist("gen", objTypeStr, "MaxPt3", pt);
+        ++(countobjects[objType]);
+        ++counttotal;
+      } else {
+        // Already the minimum three objects has been filled, get out...
+        if (counttotal == totalobjectssize) {
+          size_t max_size = matchesGen.size();
+          for (size_t jj = j; jj < max_size; jj++) {
+            matchesGen.erase(matchesGen.end());
+          }
+          break;
         }
-    }
+      }
 
-    // Sort the matches by pT for later filling of turn-on curve
-    //std::cout << "Before sorting: matchesGen.size() = " << matchesGen.size() << std::endl;
-
-    // GreaterByPt<reco::LeafCandidate> comparator;
-    // std::sort(matchesGen.begin(), 
-    // 	      matchesGen.end(), 
-    // 	      comparator);
-
-    // --- same for RECO objects
-    // Extraction of the objects candidates
-    if(verbose>0) LogDebug("ExoticaValidation") << "-- enter loop over recLabels" ;
-    for (std::map<unsigned int, edm::InputTag>::iterator it = _recLabels.begin();
-         it != _recLabels.end(); ++it) {
-      //std::cout << "Filling RECO \"matchesReco\" vector for particle kind it->first = "
-      //	  << it->first << ", which means " << it->second.label() << std::endl;
-      // Reco selectors (the function takes into account if it was instantiated
-      // before or not) ### Thiago ---> Then why don't we put it in the beginRun???
-      this->initSelector(it->first);
-      // -- Storing the matchesReco
-      this->insertCandidates(it->first, cols, &matchesReco, theSumEt, trkObjs);
-      if(verbose>0) LogDebug("ExoticaValidation") << "--- " << EVTColContainer::getTypeString(it->first) 
-			      << " sumEt=" << theSumEt[it->first] ;
-    }
+      float eta = matchesGen[j].eta();
+      float phi = matchesGen[j].phi();
 
-    // std::sort(matchesReco.begin(), 
-    // 	      matchesReco.end(), 
-    // 	      comparator);
+      this->fillHist("gen", objTypeStr, "Eta", eta);
+      this->fillHist("gen", objTypeStr, "Phi", phi);
 
-    // -- Trigger Results
-    const edm::TriggerNames& trigNames = iEvent.triggerNames(*(cols->triggerResults));
+      // If the target is electron or muon,
 
-    // counting HLT passed events for debugging
+      if (objType == EVTColContainer::MUON || objType == EVTColContainer::MUTRK || objType == EVTColContainer::ELEC) {
+        const math::XYZPoint &vtx = matchesGen[j].vertex();
+        float momphi = matchesGen[j].momentum().phi();
+        float dxyGen = (-(vtx.x() - cols->bs->x0()) * sin(momphi) + (vtx.y() - cols->bs->y0()) * cos(momphi));
+        dxys.push_back(dxyGen);
+        this->fillHist("gen", objTypeStr, "Dxy", dxyGen);
+      }
+
+    }  // Closes loop in gen
+
+    // Calling to the plotters analysis (where the evaluation of the different
+    // trigger paths are done)
+    // const std::string source = "gen";
     for (std::vector<HLTExoticaPlotter>::iterator an = _plotters.begin(); an != _plotters.end(); ++an) {
       const std::string hltPath = _shortpath2long[an->gethltpath()];
-      const bool ispassTrigger =  cols->triggerResults->accept(trigNames.triggerIndex(hltPath));
-      if (ispassTrigger) _triggerCounter.find(an->gethltpath())->second++;
+      const bool ispassTrigger = cols->triggerResults->accept(trigNames.triggerIndex(hltPath));
+      LogDebug("ExoticaValidation") << "                        preparing to call the plotters analysis";
+      an->analyze(ispassTrigger, "gen", matchesGen, theSumEt, dxys);
+      LogDebug("ExoticaValidation") << "                        called the plotter";
+    }
+  }  /// Close GEN case
+
+  /////////////////
+  /// RECO CASE ///
+  /////////////////
+
+  {
+    if (matchesReco.size() < _minCandidates)
+      return;  // FIXME: A bug is potentially here: what about the mixed
+               // channels?
+
+    // Okay, there are enough candidates. Move on!
+
+    // Filling the gen/reco objects (eff-denominators):
+    // Just the first two different ones, if there are more
+    // The countobjects maps uints (object types, really) --> integers.
+    // Example:
+    // | uint | int |
+    // |  0   |  1  | --> 1 muon used
+    // |  1   |  2  | --> 2 electrons used
+    // Initializing the count of the used objects.
+    // std::map<unsigned int, int> * countobjects = new std::map<unsigned int,
+    // int>;
+    std::map<unsigned int, int> countobjects;
+    for (std::map<unsigned int, edm::InputTag>::iterator co = _recLabels.begin(); co != _recLabels.end(); ++co) {
+      countobjects.insert(std::pair<unsigned int, int>(co->first, 0));
     }
 
-    /// Filling the histograms if pass the minimum amount of candidates needed by the analysis:
-
-    //for (std::map<unsigned int, std::vector<MatchStruct> >::iterator it = sourceMatchMap.begin(); it != sourceMatchMap.end(); ++it) {
-    // it->first: gen/reco   it->second: HLT matches (std::vector<MatchStruct>)
-
-    //if (it->second.size() < _minCandidates) {  // FIXME: A bug is potentially here: what about the mixed channels?
-    //continue;
-    //}
-
-    //////////////// 
-    /// GEN CASE ///
-    //////////////// 
-    if( matchesGen.size() >= _minCandidates) {  // FIXME: A bug is potentially here: what about the mixed channels?
-      // Okay, there are enough candidates. Move on!
-
-      // Filling the gen/reco objects (eff-denominators):
-      // Just the first two different ones, if there are more
-      // The countobjects maps uints (object types, really) --> integers.
-      // Example:
-      // | uint | int |
-      // |  0   |  1  | --> 1 muon used
-      // |  1   |  2  | --> 2 electrons used  
-
-      // Initializing the count of the used objects.
-      std::map<unsigned int, int> countobjects;
-      for (std::map<unsigned int, edm::InputTag>::iterator co = _recLabels.begin();
-	   co != _recLabels.end(); ++co) {
-	//countobjects->insert(std::pair<unsigned int, int>(co->first, 0));
-	countobjects.insert(std::pair<unsigned int, int>(co->first, 0));
+    int counttotal = 0;
+
+    // 3 : pt1, pt2, pt3
+    int totalobjectssize = 1;
+    if (!_drop_pt2)
+      totalobjectssize++;
+    if (!_drop_pt3)
+      totalobjectssize++;
+    totalobjectssize *= countobjects.size();
+
+    /// Debugging.
+    // std::cout << "Our RECO vector has matchesReco.size() = " <<
+    // matchesReco.size() << std::endl;
+
+    std::vector<float> dxys;
+    dxys.clear();
+
+    bool isPassedLeadingCut = true;
+    // We will proceed only when cuts for the pt-leading are satisified.
+    for (size_t j = 0; j != matchesReco.size(); ++j) {
+      const unsigned int objType = matchesReco[j].pdgId();
+      // Cut for the pt-leading object
+      StringCutObjectSelector<reco::LeafCandidate> select(_recCut_leading[objType]);
+      if (!select(matchesReco[j])) {  // No interest case
+        isPassedLeadingCut = false;   // Will skip the following matchesReco loop
+        matchesReco.clear();
+        break;
       }
-    
-      int counttotal = 0;
-
-      // 3 : pt1, pt2, pt3
-      int totalobjectssize = 1;
-      if (!_drop_pt2) totalobjectssize++;
-      if (!_drop_pt3) totalobjectssize++;
-      totalobjectssize *= countobjects.size();
-
-
-      bool isPassedLeadingCut = true;
-      // We will proceed only when cuts for the pt-leading are satisified.
-      for (size_t j = 0; j != matchesGen.size(); ++j) {
-	const unsigned int objType = matchesGen[j].pdgId();
-        // Cut for the pt-leading object 
-        StringCutObjectSelector<reco::LeafCandidate> select( _genCut_leading[objType] );
-        if ( !select( matchesGen[j] ) ) { // No interest case
-          isPassedLeadingCut = false;     // Will skip the following matchesGen loop
-          matchesGen.clear();
+    }
+
+    for (size_t j = 0; (j != matchesReco.size()) && isPassedLeadingCut; ++j) {
+      const unsigned int objType = matchesReco[j].pdgId();
+      // std::cout << "(4) Gonna call with " << objType << std::endl;
+      const std::string objTypeStr = EVTColContainer::getTypeString(objType);
+
+      float pt = matchesReco[j].pt();
+
+      if (countobjects[objType] == 0) {
+        this->fillHist("rec", objTypeStr, "MaxPt1", pt);
+        ++(countobjects[objType]);
+        ++counttotal;
+      } else if (countobjects[objType] == 1 && !_drop_pt2) {
+        if (!(TString(objTypeStr).Contains("MET") || TString(objTypeStr).Contains("MHT"))) {
+          this->fillHist("rec", objTypeStr, "MaxPt2", pt);
+        }
+        ++(countobjects[objType]);
+        ++counttotal;
+      } else if (countobjects[objType] == 2 && !_drop_pt3) {
+        if (!(TString(objTypeStr).Contains("MET") || TString(objTypeStr).Contains("MHT"))) {
+          this->fillHist("rec", objTypeStr, "MaxPt3", pt);
+        }
+        ++(countobjects[objType]);
+        ++counttotal;
+      } else {
+        // Already the minimum three objects has been filled, get out...
+        if (counttotal == totalobjectssize) {
+          size_t max_size = matchesReco.size();
+          for (size_t jj = j; jj < max_size; jj++) {
+            matchesReco.erase(matchesReco.end());
+          }
           break;
         }
       }
- 
-      std::vector<float> dxys; dxys.clear();
-
-      for (size_t j = 0; ( j != matchesGen.size() ) && isPassedLeadingCut; ++j) {
-	const unsigned int objType = matchesGen[j].pdgId();
-	//std::cout << "(4) Gonna call with " << objType << std::endl;
-	const std::string objTypeStr = EVTColContainer::getTypeString(objType);
-	  
-	float pt  = matchesGen[j].pt();
-
-	if (countobjects[objType] == 0) {
-	  this->fillHist("gen", objTypeStr, "MaxPt1", pt);
-	  ++(countobjects[objType]);
-	  ++counttotal;
-	} 
-	else if (countobjects[objType] == 1 && !_drop_pt2) {
-	  this->fillHist("gen", objTypeStr, "MaxPt2", pt);
-	  ++(countobjects[objType]);
-	  ++counttotal;
-	} 
-	else if (countobjects[objType] == 2 && !_drop_pt3) {
-	  this->fillHist("gen", objTypeStr, "MaxPt3", pt);
-	  ++(countobjects[objType]);
-	  ++counttotal;
-	} 
-	else {
-	  // Already the minimum three objects has been filled, get out...
-	  if (counttotal == totalobjectssize) {
-	    size_t max_size = matchesGen.size();
-	    for ( size_t jj = j; jj < max_size; jj++ ) {
-	      matchesGen.erase(matchesGen.end());
-	    }
-	    break;
-	  }
-	}
-	    
-	float eta = matchesGen[j].eta();
-	float phi = matchesGen[j].phi();
-
-	this->fillHist("gen", objTypeStr, "Eta", eta);
-	this->fillHist("gen", objTypeStr, "Phi", phi);
-
-        // If the target is electron or muon,
-
-        if ( objType == EVTColContainer::MUON ||
-             objType == EVTColContainer::MUTRK ||
-             objType == EVTColContainer::ELEC   ) {
-          const math::XYZPoint & vtx = matchesGen[j].vertex();
-          float momphi = matchesGen[j].momentum().phi();
-          float dxyGen = (-(vtx.x()-cols->bs->x0())*sin(momphi)+(vtx.y()-cols->bs->y0())*cos(momphi));
-          dxys.push_back(dxyGen);
-          this->fillHist("gen", objTypeStr, "Dxy", dxyGen);
-        }
 
-      } // Closes loop in gen
-	
-      // Calling to the plotters analysis (where the evaluation of the different trigger paths are done)
-      //const std::string source = "gen";
-      for (std::vector<HLTExoticaPlotter>::iterator an = _plotters.begin(); an != _plotters.end(); ++an) {
-	const std::string hltPath = _shortpath2long[an->gethltpath()];
-	const bool ispassTrigger =  cols->triggerResults->accept(trigNames.triggerIndex(hltPath));
-	LogDebug("ExoticaValidation") << "                        preparing to call the plotters analysis";
-        an->analyze(ispassTrigger, "gen", matchesGen, theSumEt, dxys);
-	LogDebug("ExoticaValidation") << "                        called the plotter";
+      float eta = matchesReco[j].eta();
+      float phi = matchesReco[j].phi();
+
+      if (!(TString(objTypeStr).Contains("MET") || TString(objTypeStr).Contains("MHT"))) {
+        this->fillHist("rec", objTypeStr, "Eta", eta);
+        this->fillHist("rec", objTypeStr, "Phi", phi);
+      } else {
+        this->fillHist("rec", objTypeStr, "SumEt", theSumEt[objType]);
       }
-    } /// Close GEN case
-
-    ///////////////// 
-    /// RECO CASE ///
-    ///////////////// 
-
-    {
-	if(matchesReco.size() < _minCandidates) return; // FIXME: A bug is potentially here: what about the mixed channels?
-
-	// Okay, there are enough candidates. Move on!
-    
-	// Filling the gen/reco objects (eff-denominators):
-	// Just the first two different ones, if there are more
-	// The countobjects maps uints (object types, really) --> integers.
-	// Example:
-	// | uint | int |
-	// |  0   |  1  | --> 1 muon used
-	// |  1   |  2  | --> 2 electrons used  
-	// Initializing the count of the used objects.
-	//std::map<unsigned int, int> * countobjects = new std::map<unsigned int, int>;
-	std::map<unsigned int, int> countobjects;
-	for (std::map<unsigned int, edm::InputTag>::iterator co = _recLabels.begin();
-	     co != _recLabels.end(); ++co) {
-	  countobjects.insert(std::pair<unsigned int, int>(co->first, 0));
-	}
-    
-	int counttotal = 0;
-
-        // 3 : pt1, pt2, pt3
-        int totalobjectssize = 1;
-        if (!_drop_pt2) totalobjectssize++;
-        if (!_drop_pt3) totalobjectssize++;
-        totalobjectssize *= countobjects.size();
-    
-	/// Debugging.
-	//std::cout << "Our RECO vector has matchesReco.size() = " << matchesReco.size() << std::endl;
-
-        std::vector<float> dxys; dxys.clear();
-
-        bool isPassedLeadingCut = true;
-        // We will proceed only when cuts for the pt-leading are satisified.
-        for (size_t j = 0; j != matchesReco.size(); ++j) {
-          const unsigned int objType = matchesReco[j].pdgId();
-          // Cut for the pt-leading object 
-          StringCutObjectSelector<reco::LeafCandidate> select( _recCut_leading[objType] );
-          if ( !select( matchesReco[j] ) ) { // No interest case 
-            isPassedLeadingCut = false;      // Will skip the following matchesReco loop
-            matchesReco.clear();
-            break;
-          }
-        }
 
-	for (size_t j = 0; ( j != matchesReco.size() ) && isPassedLeadingCut; ++j) {
-	    const unsigned int objType = matchesReco[j].pdgId();
-	    //std::cout << "(4) Gonna call with " << objType << std::endl;
-	    const std::string objTypeStr = EVTColContainer::getTypeString(objType);
-	    
-	    float pt  = matchesReco[j].pt();
-
-	    if (countobjects[objType] == 0) {
-		this->fillHist("rec", objTypeStr, "MaxPt1", pt);
-		++(countobjects[objType]);
-		++counttotal;
-	    } 
-	    else if (countobjects[objType] == 1 && !_drop_pt2) {
-	      if( ! ( TString(objTypeStr).Contains("MET") || TString(objTypeStr).Contains("MHT") ) ) {
-		this->fillHist("rec", objTypeStr, "MaxPt2", pt);
-	      } 
-	      ++(countobjects[objType]);
-	      ++counttotal;
-	    } 
-	    else if (countobjects[objType] == 2 && !_drop_pt3) {
-	      if( ! ( TString(objTypeStr).Contains("MET") || TString(objTypeStr).Contains("MHT") ) ) {
-		this->fillHist("rec", objTypeStr, "MaxPt3", pt);
-	      } 
-	      ++(countobjects[objType]);
-	      ++counttotal;
-	    } 
-	    else {
-	      // Already the minimum three objects has been filled, get out...
-	      if (counttotal == totalobjectssize) {
-		size_t max_size = matchesReco.size();
-		for ( size_t jj = j; jj < max_size; jj++ ) {
-		  matchesReco.erase(matchesReco.end());
-		}
-		break;
-	      }
-	    }
-
-	    float eta = matchesReco[j].eta();
-	    float phi = matchesReco[j].phi();
-	
-            if ( !( TString(objTypeStr).Contains("MET") || TString(objTypeStr).Contains("MHT") ) ) { 
-	      this->fillHist("rec", objTypeStr, "Eta", eta);
-	      this->fillHist("rec", objTypeStr, "Phi", phi);
-            }
-	    else {
-	      this->fillHist("rec", objTypeStr, "SumEt", theSumEt[objType]);
-	    }
-          
-            if (trkObjs[objType].size()>=j+1) {
-              float dxyRec = trkObjs[objType].at(j)->dxy(cols->bs->position());
-              this->fillHist("rec", objTypeStr, "Dxy", dxyRec);
-              dxys.push_back(dxyRec);
-            }
-
-	} // Closes loop in reco
-
-	//LogDebug("ExoticaValidation") << "                        deleting countobjects";
-	//delete countobjects;
-	
-	// Calling to the plotters analysis (where the evaluation of the different trigger paths are done)
-	//const std::string source = "reco";
-	for (std::vector<HLTExoticaPlotter>::iterator an = _plotters.begin(); an != _plotters.end(); ++an) {
-	    const std::string hltPath = _shortpath2long[an->gethltpath()];
-	    const bool ispassTrigger =  cols->triggerResults->accept(trigNames.triggerIndex(hltPath));
-	    LogDebug("ExoticaValidation") << "                        preparing to call the plotters analysis";
-            an->analyze(ispassTrigger, "rec", matchesReco, theSumEt, dxys);
-	    LogDebug("ExoticaValidation") << "                        called the plotter";
-	}
-    } /// Close RECO case
-
-} /// closes analyze method
+      if (trkObjs[objType].size() >= j + 1) {
+        float dxyRec = trkObjs[objType].at(j)->dxy(cols->bs->position());
+        this->fillHist("rec", objTypeStr, "Dxy", dxyRec);
+        dxys.push_back(dxyRec);
+      }
 
+    }  // Closes loop in reco
 
-// Return the objects (muons,electrons,photons,...) needed by a hlt path.
-const std::vector<unsigned int> HLTExoticaSubAnalysis::getObjectsType(const std::string & hltPath) const
-{
-    LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::getObjectsType()";
-
-    static const unsigned int objSize = 15;
-    static const unsigned int objtriggernames[] = {
-        EVTColContainer::MUON,
-        EVTColContainer::MUTRK,
-        EVTColContainer::TRACK,
-        EVTColContainer::ELEC,
-        EVTColContainer::PHOTON,
-        EVTColContainer::MET,
-        EVTColContainer::PFMET,
-        EVTColContainer::PFMHT,
-        EVTColContainer::GENMET,
-        EVTColContainer::CALOMET,
-        EVTColContainer::CALOMHT,
-        EVTColContainer::L1MET,
-        EVTColContainer::PFTAU,
-        EVTColContainer::PFJET,
-        EVTColContainer::CALOJET
-    };
-
-    std::set<unsigned int> objsType;
-    // The object to deal has to be entered via the config .py
-    for (unsigned int i = 0; i < objSize; ++i) {
-	//std::cout << "(5) Gonna call with " << objtriggernames[i] << std::endl;
-        std::string objTypeStr = EVTColContainer::getTypeString(objtriggernames[i]);
-        // Check if it is needed this object for this trigger
-        if (! TString(hltPath).Contains(objTypeStr)) {
-            continue;
-        }
+    // LogDebug("ExoticaValidation") << "                        deleting
+    // countobjects"; delete countobjects;
 
-        objsType.insert(objtriggernames[i]);
+    // Calling to the plotters analysis (where the evaluation of the different
+    // trigger paths are done)
+    // const std::string source = "reco";
+    for (std::vector<HLTExoticaPlotter>::iterator an = _plotters.begin(); an != _plotters.end(); ++an) {
+      const std::string hltPath = _shortpath2long[an->gethltpath()];
+      const bool ispassTrigger = cols->triggerResults->accept(trigNames.triggerIndex(hltPath));
+      LogDebug("ExoticaValidation") << "                        preparing to call the plotters analysis";
+      an->analyze(ispassTrigger, "rec", matchesReco, theSumEt, dxys);
+      LogDebug("ExoticaValidation") << "                        called the plotter";
     }
+  }  /// Close RECO case
 
-    return std::vector<unsigned int>(objsType.begin(), objsType.end());
-}
+}  /// closes analyze method
 
-// Booking the maps: recLabels and genParticle selectors
-void HLTExoticaSubAnalysis::getNamesOfObjects(const edm::ParameterSet & anpset)
-{
-    LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::getNamesOfObjects()";
-
-    if (anpset.exists("recMuonLabel")) {
-        _recLabels[EVTColContainer::MUON] = anpset.getParameter<edm::InputTag>("recMuonLabel");
-        _genSelectorMap[EVTColContainer::MUON] = nullptr ;
-    }
-    if (anpset.exists("recMuonTrkLabel")) {
-        _recLabels[EVTColContainer::MUTRK] = anpset.getParameter<edm::InputTag>("recMuonTrkLabel");
-        _genSelectorMap[EVTColContainer::MUTRK] = nullptr ;
-    }
-    if (anpset.exists("recTrackLabel")) {
-        _recLabels[EVTColContainer::TRACK] = anpset.getParameter<edm::InputTag>("recTrackLabel");
-        _genSelectorMap[EVTColContainer::TRACK] = nullptr ;
-    }
-    if (anpset.exists("recElecLabel")) {
-        _recLabels[EVTColContainer::ELEC] = anpset.getParameter<edm::InputTag>("recElecLabel");
-        _genSelectorMap[EVTColContainer::ELEC] = nullptr ;
-    }
-    if (anpset.exists("recPhotonLabel")) {
-        _recLabels[EVTColContainer::PHOTON] = anpset.getParameter<edm::InputTag>("recPhotonLabel");
-        _genSelectorMap[EVTColContainer::PHOTON] = nullptr ;
-    }
-    if (anpset.exists("recMETLabel")) {
-        _recLabels[EVTColContainer::MET] = anpset.getParameter<edm::InputTag>("recMETLabel");
-        _genSelectorMap[EVTColContainer::MET] = nullptr ;
-    }
-    if (anpset.exists("recPFMETLabel")) {
-        _recLabels[EVTColContainer::PFMET] = anpset.getParameter<edm::InputTag>("recPFMETLabel");
-        _genSelectorMap[EVTColContainer::PFMET] = nullptr ;
-    }
-    if (anpset.exists("recPFMHTLabel")) {
-        _recLabels[EVTColContainer::PFMHT] = anpset.getParameter<edm::InputTag>("recPFMHTLabel");
-        _genSelectorMap[EVTColContainer::PFMHT] = nullptr ;
-    }
-    if (anpset.exists("genMETLabel")) {
-        _recLabels[EVTColContainer::GENMET] = anpset.getParameter<edm::InputTag>("genMETLabel");
-        _genSelectorMap[EVTColContainer::GENMET] = nullptr ;
-    }
-    if (anpset.exists("recCaloMETLabel")) {
-        _recLabels[EVTColContainer::CALOMET] = anpset.getParameter<edm::InputTag>("recCaloMETLabel");
-        _genSelectorMap[EVTColContainer::CALOMET] = nullptr ;
-    }
-    if (anpset.exists("recCaloMHTLabel")) {
-        _recLabels[EVTColContainer::CALOMHT] = anpset.getParameter<edm::InputTag>("recCaloMHTLabel");
-        _genSelectorMap[EVTColContainer::CALOMHT] = nullptr ;
-    }
-    if (anpset.exists("hltMETLabel")) {
-        _recLabels[EVTColContainer::CALOMET] = anpset.getParameter<edm::InputTag>("hltMETLabel");
-        _genSelectorMap[EVTColContainer::CALOMET] = nullptr ;
-    }
-    if (anpset.exists("l1METLabel")) {
-        _recLabels[EVTColContainer::L1MET] = anpset.getParameter<edm::InputTag>("l1METLabel");
-        _genSelectorMap[EVTColContainer::L1MET] = nullptr ;
-    }
-    if (anpset.exists("recPFTauLabel")) {
-        _recLabels[EVTColContainer::PFTAU] = anpset.getParameter<edm::InputTag>("recPFTauLabel");
-        _genSelectorMap[EVTColContainer::PFTAU] = nullptr ;
-    }
-    if (anpset.exists("recPFJetLabel")) {
-        _recLabels[EVTColContainer::PFJET] = anpset.getParameter<edm::InputTag>("recPFJetLabel");
-        _genSelectorMap[EVTColContainer::PFJET] = nullptr ;
-    }
-    if (anpset.exists("recCaloJetLabel")) {
-        _recLabels[EVTColContainer::CALOJET] = anpset.getParameter<edm::InputTag>("recCaloJetLabel");
-        _genSelectorMap[EVTColContainer::CALOJET] = nullptr ;
+// Return the objects (muons,electrons,photons,...) needed by a hlt path.
+const std::vector<unsigned int> HLTExoticaSubAnalysis::getObjectsType(const std::string &hltPath) const {
+  LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::getObjectsType()";
+
+  static const unsigned int objSize = 15;
+  static const unsigned int objtriggernames[] = {EVTColContainer::MUON,
+                                                 EVTColContainer::MUTRK,
+                                                 EVTColContainer::TRACK,
+                                                 EVTColContainer::ELEC,
+                                                 EVTColContainer::PHOTON,
+                                                 EVTColContainer::MET,
+                                                 EVTColContainer::PFMET,
+                                                 EVTColContainer::PFMHT,
+                                                 EVTColContainer::GENMET,
+                                                 EVTColContainer::CALOMET,
+                                                 EVTColContainer::CALOMHT,
+                                                 EVTColContainer::L1MET,
+                                                 EVTColContainer::PFTAU,
+                                                 EVTColContainer::PFJET,
+                                                 EVTColContainer::CALOJET};
+
+  std::set<unsigned int> objsType;
+  // The object to deal has to be entered via the config .py
+  for (unsigned int i = 0; i < objSize; ++i) {
+    // std::cout << "(5) Gonna call with " << objtriggernames[i] << std::endl;
+    std::string objTypeStr = EVTColContainer::getTypeString(objtriggernames[i]);
+    // Check if it is needed this object for this trigger
+    if (!TString(hltPath).Contains(objTypeStr)) {
+      continue;
     }
 
-    if (_recLabels.empty()) {
-        edm::LogError("ExoticaValidation") << "HLTExoticaSubAnalysis::getNamesOfObjects, "
-                                           << "Not included any object (recMuonLabel, recElecLabel, ...)  "
-                                           << "in the analysis " << _analysisname;
-        return;
-    }
+    objsType.insert(objtriggernames[i]);
+  }
+
+  return std::vector<unsigned int>(objsType.begin(), objsType.end());
+}
+
+// Booking the maps: recLabels and genParticle selectors
+void HLTExoticaSubAnalysis::getNamesOfObjects(const edm::ParameterSet &anpset) {
+  LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::getNamesOfObjects()";
+
+  if (anpset.exists("recMuonLabel")) {
+    _recLabels[EVTColContainer::MUON] = anpset.getParameter<edm::InputTag>("recMuonLabel");
+    _genSelectorMap[EVTColContainer::MUON] = nullptr;
+  }
+  if (anpset.exists("recMuonTrkLabel")) {
+    _recLabels[EVTColContainer::MUTRK] = anpset.getParameter<edm::InputTag>("recMuonTrkLabel");
+    _genSelectorMap[EVTColContainer::MUTRK] = nullptr;
+  }
+  if (anpset.exists("recTrackLabel")) {
+    _recLabels[EVTColContainer::TRACK] = anpset.getParameter<edm::InputTag>("recTrackLabel");
+    _genSelectorMap[EVTColContainer::TRACK] = nullptr;
+  }
+  if (anpset.exists("recElecLabel")) {
+    _recLabels[EVTColContainer::ELEC] = anpset.getParameter<edm::InputTag>("recElecLabel");
+    _genSelectorMap[EVTColContainer::ELEC] = nullptr;
+  }
+  if (anpset.exists("recPhotonLabel")) {
+    _recLabels[EVTColContainer::PHOTON] = anpset.getParameter<edm::InputTag>("recPhotonLabel");
+    _genSelectorMap[EVTColContainer::PHOTON] = nullptr;
+  }
+  if (anpset.exists("recMETLabel")) {
+    _recLabels[EVTColContainer::MET] = anpset.getParameter<edm::InputTag>("recMETLabel");
+    _genSelectorMap[EVTColContainer::MET] = nullptr;
+  }
+  if (anpset.exists("recPFMETLabel")) {
+    _recLabels[EVTColContainer::PFMET] = anpset.getParameter<edm::InputTag>("recPFMETLabel");
+    _genSelectorMap[EVTColContainer::PFMET] = nullptr;
+  }
+  if (anpset.exists("recPFMHTLabel")) {
+    _recLabels[EVTColContainer::PFMHT] = anpset.getParameter<edm::InputTag>("recPFMHTLabel");
+    _genSelectorMap[EVTColContainer::PFMHT] = nullptr;
+  }
+  if (anpset.exists("genMETLabel")) {
+    _recLabels[EVTColContainer::GENMET] = anpset.getParameter<edm::InputTag>("genMETLabel");
+    _genSelectorMap[EVTColContainer::GENMET] = nullptr;
+  }
+  if (anpset.exists("recCaloMETLabel")) {
+    _recLabels[EVTColContainer::CALOMET] = anpset.getParameter<edm::InputTag>("recCaloMETLabel");
+    _genSelectorMap[EVTColContainer::CALOMET] = nullptr;
+  }
+  if (anpset.exists("recCaloMHTLabel")) {
+    _recLabels[EVTColContainer::CALOMHT] = anpset.getParameter<edm::InputTag>("recCaloMHTLabel");
+    _genSelectorMap[EVTColContainer::CALOMHT] = nullptr;
+  }
+  if (anpset.exists("hltMETLabel")) {
+    _recLabels[EVTColContainer::CALOMET] = anpset.getParameter<edm::InputTag>("hltMETLabel");
+    _genSelectorMap[EVTColContainer::CALOMET] = nullptr;
+  }
+  if (anpset.exists("l1METLabel")) {
+    _recLabels[EVTColContainer::L1MET] = anpset.getParameter<edm::InputTag>("l1METLabel");
+    _genSelectorMap[EVTColContainer::L1MET] = nullptr;
+  }
+  if (anpset.exists("recPFTauLabel")) {
+    _recLabels[EVTColContainer::PFTAU] = anpset.getParameter<edm::InputTag>("recPFTauLabel");
+    _genSelectorMap[EVTColContainer::PFTAU] = nullptr;
+  }
+  if (anpset.exists("recPFJetLabel")) {
+    _recLabels[EVTColContainer::PFJET] = anpset.getParameter<edm::InputTag>("recPFJetLabel");
+    _genSelectorMap[EVTColContainer::PFJET] = nullptr;
+  }
+  if (anpset.exists("recCaloJetLabel")) {
+    _recLabels[EVTColContainer::CALOJET] = anpset.getParameter<edm::InputTag>("recCaloJetLabel");
+    _genSelectorMap[EVTColContainer::CALOJET] = nullptr;
+  }
+
+  if (_recLabels.empty()) {
+    edm::LogError("ExoticaValidation") << "HLTExoticaSubAnalysis::getNamesOfObjects, "
+                                       << "Not included any object (recMuonLabel, recElecLabel, ...)  "
+                                       << "in the analysis " << _analysisname;
+    return;
+  }
 }
 
 // Register consumption of objects.
 // I have chosen to centralize all consumes() calls here.
-void HLTExoticaSubAnalysis::registerConsumes(edm::ConsumesCollector & iC)
-{
-    // Register that we are getting genParticles
-    _genParticleToken = iC.consumes<reco::GenParticleCollection>(_genParticleLabel);    
-   
-    // Register that we are getting the trigger results
-    _trigResultsToken = iC.consumes<edm::TriggerResults>(_trigResultsLabel);
-
-    // Register beamspot 
-    _bsToken = iC.consumes<reco::BeamSpot>(_beamSpotLabel);
-
-    // Loop over _recLabels, see what we need, and register.
-    // Then save the registered token in _tokens.
-    // Remember: _recLabels is a map<uint, edm::InputTag>
-    // Remember: _tokens    is a map<uint, edm::EDGetToken>
-    LogDebug("ExoticaValidation") << "We have got " << _recLabels.size() << "recLabels";
-    for (std::map<unsigned int, edm::InputTag>::iterator it = _recLabels.begin();
-         it != _recLabels.end(); ++it) {
-        if (it->first == EVTColContainer::MUON) {
-	    edm::EDGetTokenT<reco::MuonCollection> particularToken = iC.consumes<reco::MuonCollection>(it->second);
-	    edm::EDGetToken token(particularToken);
-	    _tokens[it->first] = token;
-	} 
-	else if (it->first == EVTColContainer::MUTRK) {
-	    edm::EDGetTokenT<reco::TrackCollection> particularToken = iC.consumes<reco::TrackCollection>(it->second);
-	    edm::EDGetToken token(particularToken);
-	    _tokens[it->first] = token;
-        }
-	else if (it->first == EVTColContainer::TRACK) {
-	    edm::EDGetTokenT<reco::TrackCollection> particularToken = iC.consumes<reco::TrackCollection>(it->second);
-	    edm::EDGetToken token(particularToken);
-	    _tokens[it->first] = token;
-        }
-	else if (it->first == EVTColContainer::ELEC) {
-            edm::EDGetTokenT<reco::GsfElectronCollection> particularToken = iC.consumes<reco::GsfElectronCollection>(it->second);
-	    edm::EDGetToken token(particularToken);
-	    _tokens[it->first] = token;
-	} 
-	else if (it->first == EVTColContainer::PHOTON) {
-            edm::EDGetTokenT<reco::PhotonCollection> particularToken = iC.consumes<reco::PhotonCollection>(it->second);
-	    edm::EDGetToken token(particularToken);
-	    _tokens[it->first] = token;
-	} 
-	else if (it->first == EVTColContainer::MET) {
-            edm::EDGetTokenT<reco::METCollection> particularToken = iC.consumes<reco::METCollection>(it->second);
-	    edm::EDGetToken token(particularToken);
-	    _tokens[it->first] = token;
-	} 
-	else if (it->first == EVTColContainer::PFMET) {
-            edm::EDGetTokenT<reco::PFMETCollection> particularToken = iC.consumes<reco::PFMETCollection>(it->second);
-	    edm::EDGetToken token(particularToken);
-	    _tokens[it->first] = token;
-	} 
-	else if (it->first == EVTColContainer::PFMHT) {
-            edm::EDGetTokenT<reco::PFMETCollection> particularToken = iC.consumes<reco::PFMETCollection>(it->second);
-	    edm::EDGetToken token(particularToken);
-	    _tokens[it->first] = token;
-	} 
-	else if (it->first == EVTColContainer::GENMET) {
-            edm::EDGetTokenT<reco::GenMETCollection> particularToken = iC.consumes<reco::GenMETCollection>(it->second);
-	    edm::EDGetToken token(particularToken);
-	    _tokens[it->first] = token;
-	} 
-	else if (it->first == EVTColContainer::CALOMET) {
-            edm::EDGetTokenT<reco::CaloMETCollection> particularToken = iC.consumes<reco::CaloMETCollection>(it->second);
-	    edm::EDGetToken token(particularToken);
-	    _tokens[it->first] = token;
-	} 
-	else if (it->first == EVTColContainer::CALOMHT) {
-            edm::EDGetTokenT<reco::CaloMETCollection> particularToken = iC.consumes<reco::CaloMETCollection>(it->second);
-	    edm::EDGetToken token(particularToken);
-	    _tokens[it->first] = token;
-	} 
-	else if (it->first == EVTColContainer::L1MET) {
-            edm::EDGetTokenT<l1extra::L1EtMissParticleCollection> particularToken = iC.consumes<l1extra::L1EtMissParticleCollection>(it->second);
-	    edm::EDGetToken token(particularToken);
-	    _tokens[it->first] = token;
-	} 
-	else if (it->first == EVTColContainer::PFTAU) {
-            edm::EDGetTokenT<reco::PFTauCollection> particularToken = iC.consumes<reco::PFTauCollection>(it->second);
-	    edm::EDGetToken token(particularToken);
-	    _tokens[it->first] = token;
-	} 
-	else if (it->first == EVTColContainer::PFJET) {
-            edm::EDGetTokenT<reco::PFJetCollection> particularToken = iC.consumes<reco::PFJetCollection>(it->second);
-	    edm::EDGetToken token(particularToken);
-	    _tokens[it->first] = token;
-	} 
-	else if (it->first == EVTColContainer::CALOJET) {
-            edm::EDGetTokenT<reco::CaloJetCollection> particularToken = iC.consumes<reco::CaloJetCollection>(it->second);
-	    edm::EDGetToken token(particularToken);
-	    _tokens[it->first] = token;
-	} 
-	else {
-            edm::LogError("ExoticaValidation") << "HLTExoticaSubAnalysis::registerConsumes"
-                                               << " NOT IMPLEMENTED (yet) ERROR: '" << it->second.label() << "'";
-        }
+void HLTExoticaSubAnalysis::registerConsumes(edm::ConsumesCollector &iC) {
+  // Register that we are getting genParticles
+  _genParticleToken = iC.consumes<reco::GenParticleCollection>(_genParticleLabel);
+
+  // Register that we are getting the trigger results
+  _trigResultsToken = iC.consumes<edm::TriggerResults>(_trigResultsLabel);
+
+  // Register beamspot
+  _bsToken = iC.consumes<reco::BeamSpot>(_beamSpotLabel);
+
+  // Loop over _recLabels, see what we need, and register.
+  // Then save the registered token in _tokens.
+  // Remember: _recLabels is a map<uint, edm::InputTag>
+  // Remember: _tokens    is a map<uint, edm::EDGetToken>
+  LogDebug("ExoticaValidation") << "We have got " << _recLabels.size() << "recLabels";
+  for (std::map<unsigned int, edm::InputTag>::iterator it = _recLabels.begin(); it != _recLabels.end(); ++it) {
+    if (it->first == EVTColContainer::MUON) {
+      edm::EDGetTokenT<reco::MuonCollection> particularToken = iC.consumes<reco::MuonCollection>(it->second);
+      edm::EDGetToken token(particularToken);
+      _tokens[it->first] = token;
+    } else if (it->first == EVTColContainer::MUTRK) {
+      edm::EDGetTokenT<reco::TrackCollection> particularToken = iC.consumes<reco::TrackCollection>(it->second);
+      edm::EDGetToken token(particularToken);
+      _tokens[it->first] = token;
+    } else if (it->first == EVTColContainer::TRACK) {
+      edm::EDGetTokenT<reco::TrackCollection> particularToken = iC.consumes<reco::TrackCollection>(it->second);
+      edm::EDGetToken token(particularToken);
+      _tokens[it->first] = token;
+    } else if (it->first == EVTColContainer::ELEC) {
+      edm::EDGetTokenT<reco::GsfElectronCollection> particularToken =
+          iC.consumes<reco::GsfElectronCollection>(it->second);
+      edm::EDGetToken token(particularToken);
+      _tokens[it->first] = token;
+    } else if (it->first == EVTColContainer::PHOTON) {
+      edm::EDGetTokenT<reco::PhotonCollection> particularToken = iC.consumes<reco::PhotonCollection>(it->second);
+      edm::EDGetToken token(particularToken);
+      _tokens[it->first] = token;
+    } else if (it->first == EVTColContainer::MET) {
+      edm::EDGetTokenT<reco::METCollection> particularToken = iC.consumes<reco::METCollection>(it->second);
+      edm::EDGetToken token(particularToken);
+      _tokens[it->first] = token;
+    } else if (it->first == EVTColContainer::PFMET) {
+      edm::EDGetTokenT<reco::PFMETCollection> particularToken = iC.consumes<reco::PFMETCollection>(it->second);
+      edm::EDGetToken token(particularToken);
+      _tokens[it->first] = token;
+    } else if (it->first == EVTColContainer::PFMHT) {
+      edm::EDGetTokenT<reco::PFMETCollection> particularToken = iC.consumes<reco::PFMETCollection>(it->second);
+      edm::EDGetToken token(particularToken);
+      _tokens[it->first] = token;
+    } else if (it->first == EVTColContainer::GENMET) {
+      edm::EDGetTokenT<reco::GenMETCollection> particularToken = iC.consumes<reco::GenMETCollection>(it->second);
+      edm::EDGetToken token(particularToken);
+      _tokens[it->first] = token;
+    } else if (it->first == EVTColContainer::CALOMET) {
+      edm::EDGetTokenT<reco::CaloMETCollection> particularToken = iC.consumes<reco::CaloMETCollection>(it->second);
+      edm::EDGetToken token(particularToken);
+      _tokens[it->first] = token;
+    } else if (it->first == EVTColContainer::CALOMHT) {
+      edm::EDGetTokenT<reco::CaloMETCollection> particularToken = iC.consumes<reco::CaloMETCollection>(it->second);
+      edm::EDGetToken token(particularToken);
+      _tokens[it->first] = token;
+    } else if (it->first == EVTColContainer::L1MET) {
+      edm::EDGetTokenT<l1extra::L1EtMissParticleCollection> particularToken =
+          iC.consumes<l1extra::L1EtMissParticleCollection>(it->second);
+      edm::EDGetToken token(particularToken);
+      _tokens[it->first] = token;
+    } else if (it->first == EVTColContainer::PFTAU) {
+      edm::EDGetTokenT<reco::PFTauCollection> particularToken = iC.consumes<reco::PFTauCollection>(it->second);
+      edm::EDGetToken token(particularToken);
+      _tokens[it->first] = token;
+    } else if (it->first == EVTColContainer::PFJET) {
+      edm::EDGetTokenT<reco::PFJetCollection> particularToken = iC.consumes<reco::PFJetCollection>(it->second);
+      edm::EDGetToken token(particularToken);
+      _tokens[it->first] = token;
+    } else if (it->first == EVTColContainer::CALOJET) {
+      edm::EDGetTokenT<reco::CaloJetCollection> particularToken = iC.consumes<reco::CaloJetCollection>(it->second);
+      edm::EDGetToken token(particularToken);
+      _tokens[it->first] = token;
+    } else {
+      edm::LogError("ExoticaValidation") << "HLTExoticaSubAnalysis::registerConsumes"
+                                         << " NOT IMPLEMENTED (yet) ERROR: '" << it->second.label() << "'";
     }
-    
+  }
 }
 
 // Setting the collections of objects in EVTColContainer
-void HLTExoticaSubAnalysis::getHandlesToObjects(const edm::Event & iEvent, EVTColContainer * col)
-{
-    LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::getHandlesToObjects()";
-
-    if (! col->isCommonInit()) {
-        // Extract the trigger results (path info, pass,...)
-        edm::Handle<edm::TriggerResults> trigResults;
-        iEvent.getByToken(_trigResultsToken, trigResults);
-        if (trigResults.isValid()) {
-            col->triggerResults = trigResults.product();
-	    LogDebug("ExoticaValidation") << "Added handle to triggerResults";
-        }
-
-        // Extract the genParticles
-        edm::Handle<reco::GenParticleCollection> genPart;
-        iEvent.getByToken(_genParticleToken, genPart);
-        if (genPart.isValid()) {
-            col->genParticles = genPart.product();
-	    LogDebug("ExoticaValidation") << "Added handle to genParticles";
-        }
+void HLTExoticaSubAnalysis::getHandlesToObjects(const edm::Event &iEvent, EVTColContainer *col) {
+  LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::getHandlesToObjects()";
+
+  if (!col->isCommonInit()) {
+    // Extract the trigger results (path info, pass,...)
+    edm::Handle<edm::TriggerResults> trigResults;
+    iEvent.getByToken(_trigResultsToken, trigResults);
+    if (trigResults.isValid()) {
+      col->triggerResults = trigResults.product();
+      LogDebug("ExoticaValidation") << "Added handle to triggerResults";
+    }
 
-        // BeamSpot for dxy 
-        edm::Handle<reco::BeamSpot> bsHandle;
-        iEvent.getByToken(_bsToken, bsHandle);
-        if (bsHandle.isValid()) {
-            col->bs = bsHandle.product();
-        }
+    // Extract the genParticles
+    edm::Handle<reco::GenParticleCollection> genPart;
+    iEvent.getByToken(_genParticleToken, genPart);
+    if (genPart.isValid()) {
+      col->genParticles = genPart.product();
+      LogDebug("ExoticaValidation") << "Added handle to genParticles";
     }
 
-    // Loop over the tokens and extract all other objects
-    LogDebug("ExoticaValidation") << "We have got " << _tokens.size() << "tokens";
-    for (std::map<unsigned int, edm::EDGetToken>::iterator it = _tokens.begin();
-         it != _tokens.end(); ++it) {
-        if (it->first == EVTColContainer::MUON) {
-            edm::Handle<reco::MuonCollection> theHandle;
-            iEvent.getByToken(it->second, theHandle);
-            if (theHandle.isValid()) col->set(theHandle.product());
-        } 
-	else if (it->first == EVTColContainer::MUTRK) {
-            edm::Handle<reco::TrackCollection> theHandle;
-            iEvent.getByToken(it->second, theHandle);
-            if (theHandle.isValid()) col->set(theHandle.product());
-        }
-	else if (it->first == EVTColContainer::TRACK) {
-            edm::Handle<reco::TrackCollection> theHandle;
-            iEvent.getByToken(it->second, theHandle);
-            if (theHandle.isValid()) col->set(theHandle.product());
-        }
-	else if (it->first == EVTColContainer::ELEC) {
-            edm::Handle<reco::GsfElectronCollection> theHandle;
-            iEvent.getByToken(it->second, theHandle);
-            if (theHandle.isValid()) col->set(theHandle.product());
-        } 
-	else if (it->first == EVTColContainer::PHOTON) {
-            edm::Handle<reco::PhotonCollection> theHandle;
-            iEvent.getByToken(it->second, theHandle);
-            if (theHandle.isValid()) col->set(theHandle.product());
-        } 
-	else if (it->first == EVTColContainer::MET) {
-            edm::Handle<reco::METCollection> theHandle;
-            iEvent.getByToken(it->second, theHandle);
-            if (theHandle.isValid()) col->set(theHandle.product());
-        } 
-	else if (it->first == EVTColContainer::PFMET) {
-	  edm::Handle<reco::PFMETCollection> theHandle;
-	  iEvent.getByToken(it->second, theHandle);
-	  if (theHandle.isValid()) col->set(theHandle.product());
-        } 
-	else if (it->first == EVTColContainer::PFMHT) {
-	  edm::Handle<reco::PFMETCollection> theHandle;
-	  iEvent.getByToken(it->second, theHandle);
-	  if (theHandle.isValid()) col->setPFMHT(theHandle.product());
-        } 
-	else if (it->first == EVTColContainer::GENMET) {
-            edm::Handle<reco::GenMETCollection> theHandle;
-            iEvent.getByToken(it->second, theHandle);
-            if (theHandle.isValid()) col->set(theHandle.product());
-        } 
-        else if (it->first == EVTColContainer::CALOMET) {
-            edm::Handle<reco::CaloMETCollection> theHandle;
-            iEvent.getByToken(it->second, theHandle);
-            if (theHandle.isValid()) col->set(theHandle.product());
-        }
-	else if (it->first == EVTColContainer::CALOMHT) {
-	  edm::Handle<reco::CaloMETCollection> theHandle;
-	  iEvent.getByToken(it->second, theHandle);
-	  if (theHandle.isValid()) col->setCaloMHT(theHandle.product());
-        } 
-        else if (it->first == EVTColContainer::L1MET) {
-            edm::Handle<l1extra::L1EtMissParticleCollection> theHandle;
-            iEvent.getByToken(it->second, theHandle);
-            if (theHandle.isValid()) col->set(theHandle.product());
-        }
-	else if (it->first == EVTColContainer::PFTAU) {
-            edm::Handle<reco::PFTauCollection> theHandle;
-            iEvent.getByToken(it->second, theHandle);
-            if (theHandle.isValid()) col->set(theHandle.product());
-        } 
-	else if (it->first == EVTColContainer::PFJET) {
-            edm::Handle<reco::PFJetCollection> theHandle;
-            iEvent.getByToken(it->second, theHandle);
-            if (theHandle.isValid()) col->set(theHandle.product());
-        }
-	else if (it->first == EVTColContainer::CALOJET) {
-            edm::Handle<reco::CaloJetCollection> theHandle;
-            iEvent.getByToken(it->second, theHandle);
-            if (theHandle.isValid()) col->set(theHandle.product());
-        }
-	else {
-            edm::LogError("ExoticaValidation") << "HLTExoticaSubAnalysis::getHandlesToObjects "
-                                               << " NOT IMPLEMENTED (yet) ERROR: '" << it->first << "'";
-        }
+    // BeamSpot for dxy
+    edm::Handle<reco::BeamSpot> bsHandle;
+    iEvent.getByToken(_bsToken, bsHandle);
+    if (bsHandle.isValid()) {
+      col->bs = bsHandle.product();
+    }
+  }
+
+  // Loop over the tokens and extract all other objects
+  LogDebug("ExoticaValidation") << "We have got " << _tokens.size() << "tokens";
+  for (std::map<unsigned int, edm::EDGetToken>::iterator it = _tokens.begin(); it != _tokens.end(); ++it) {
+    if (it->first == EVTColContainer::MUON) {
+      edm::Handle<reco::MuonCollection> theHandle;
+      iEvent.getByToken(it->second, theHandle);
+      if (theHandle.isValid())
+        col->set(theHandle.product());
+    } else if (it->first == EVTColContainer::MUTRK) {
+      edm::Handle<reco::TrackCollection> theHandle;
+      iEvent.getByToken(it->second, theHandle);
+      if (theHandle.isValid())
+        col->set(theHandle.product());
+    } else if (it->first == EVTColContainer::TRACK) {
+      edm::Handle<reco::TrackCollection> theHandle;
+      iEvent.getByToken(it->second, theHandle);
+      if (theHandle.isValid())
+        col->set(theHandle.product());
+    } else if (it->first == EVTColContainer::ELEC) {
+      edm::Handle<reco::GsfElectronCollection> theHandle;
+      iEvent.getByToken(it->second, theHandle);
+      if (theHandle.isValid())
+        col->set(theHandle.product());
+    } else if (it->first == EVTColContainer::PHOTON) {
+      edm::Handle<reco::PhotonCollection> theHandle;
+      iEvent.getByToken(it->second, theHandle);
+      if (theHandle.isValid())
+        col->set(theHandle.product());
+    } else if (it->first == EVTColContainer::MET) {
+      edm::Handle<reco::METCollection> theHandle;
+      iEvent.getByToken(it->second, theHandle);
+      if (theHandle.isValid())
+        col->set(theHandle.product());
+    } else if (it->first == EVTColContainer::PFMET) {
+      edm::Handle<reco::PFMETCollection> theHandle;
+      iEvent.getByToken(it->second, theHandle);
+      if (theHandle.isValid())
+        col->set(theHandle.product());
+    } else if (it->first == EVTColContainer::PFMHT) {
+      edm::Handle<reco::PFMETCollection> theHandle;
+      iEvent.getByToken(it->second, theHandle);
+      if (theHandle.isValid())
+        col->setPFMHT(theHandle.product());
+    } else if (it->first == EVTColContainer::GENMET) {
+      edm::Handle<reco::GenMETCollection> theHandle;
+      iEvent.getByToken(it->second, theHandle);
+      if (theHandle.isValid())
+        col->set(theHandle.product());
+    } else if (it->first == EVTColContainer::CALOMET) {
+      edm::Handle<reco::CaloMETCollection> theHandle;
+      iEvent.getByToken(it->second, theHandle);
+      if (theHandle.isValid())
+        col->set(theHandle.product());
+    } else if (it->first == EVTColContainer::CALOMHT) {
+      edm::Handle<reco::CaloMETCollection> theHandle;
+      iEvent.getByToken(it->second, theHandle);
+      if (theHandle.isValid())
+        col->setCaloMHT(theHandle.product());
+    } else if (it->first == EVTColContainer::L1MET) {
+      edm::Handle<l1extra::L1EtMissParticleCollection> theHandle;
+      iEvent.getByToken(it->second, theHandle);
+      if (theHandle.isValid())
+        col->set(theHandle.product());
+    } else if (it->first == EVTColContainer::PFTAU) {
+      edm::Handle<reco::PFTauCollection> theHandle;
+      iEvent.getByToken(it->second, theHandle);
+      if (theHandle.isValid())
+        col->set(theHandle.product());
+    } else if (it->first == EVTColContainer::PFJET) {
+      edm::Handle<reco::PFJetCollection> theHandle;
+      iEvent.getByToken(it->second, theHandle);
+      if (theHandle.isValid())
+        col->set(theHandle.product());
+    } else if (it->first == EVTColContainer::CALOJET) {
+      edm::Handle<reco::CaloJetCollection> theHandle;
+      iEvent.getByToken(it->second, theHandle);
+      if (theHandle.isValid())
+        col->set(theHandle.product());
+    } else {
+      edm::LogError("ExoticaValidation") << "HLTExoticaSubAnalysis::getHandlesToObjects "
+                                         << " NOT IMPLEMENTED (yet) ERROR: '" << it->first << "'";
     }
+  }
 }
 
 // Booking the histograms, and putting them in DQM
-void HLTExoticaSubAnalysis::bookHist(DQMStore::IBooker & iBooker,
-				     const std::string & source,
-                                     const std::string & objType, 
-				     const std::string & variable)
-{
-    LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::bookHist()";
-    std::string sourceUpper = source;
-    sourceUpper[0] = std::toupper(sourceUpper[0]);
-    std::string name = source + objType + variable ;
-    TH1F * h = nullptr;
-    
-    if (variable.find("SumEt") != std::string::npos) {
-      std::string title = "Sum ET of " + sourceUpper + " " + objType;
-      const size_t nBins = _parametersTurnOnSumEt.size() - 1;
-      float * edges = new float[nBins + 1];
-      for (size_t i = 0; i < nBins + 1; i++) {
-	edges[i] = _parametersTurnOnSumEt[i];
-      }
-      h = new TH1F(name.c_str(), title.c_str(), nBins, edges);
-      delete[] edges;
+void HLTExoticaSubAnalysis::bookHist(DQMStore::IBooker &iBooker,
+                                     const std::string &source,
+                                     const std::string &objType,
+                                     const std::string &variable) {
+  LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::bookHist()";
+  std::string sourceUpper = source;
+  sourceUpper[0] = std::toupper(sourceUpper[0]);
+  std::string name = source + objType + variable;
+  TH1F *h = nullptr;
+
+  if (variable.find("SumEt") != std::string::npos) {
+    std::string title = "Sum ET of " + sourceUpper + " " + objType;
+    const size_t nBins = _parametersTurnOnSumEt.size() - 1;
+    float *edges = new float[nBins + 1];
+    for (size_t i = 0; i < nBins + 1; i++) {
+      edges[i] = _parametersTurnOnSumEt[i];
     }
-
-    else if (variable.find("Dxy") != std::string::npos) {
-      std::string title = "Dxy " + sourceUpper + " " + objType;
-      int    nBins = _parametersDxy[0];
-      double min   = _parametersDxy[1];
-      double max   = _parametersDxy[2];
-      h = new TH1F(name.c_str(), title.c_str(), nBins, min, max);
+    h = new TH1F(name.c_str(), title.c_str(), nBins, edges);
+    delete[] edges;
+  }
+
+  else if (variable.find("Dxy") != std::string::npos) {
+    std::string title = "Dxy " + sourceUpper + " " + objType;
+    int nBins = _parametersDxy[0];
+    double min = _parametersDxy[1];
+    double max = _parametersDxy[2];
+    h = new TH1F(name.c_str(), title.c_str(), nBins, min, max);
+  }
+
+  else if (variable.find("MaxPt") != std::string::npos) {
+    std::string desc = (variable == "MaxPt1") ? "Leading" : "Next-to-Leading";
+    std::string title = "pT of " + desc + " " + sourceUpper + " " + objType;
+    const size_t nBins = _parametersTurnOn.size() - 1;
+    float *edges = new float[nBins + 1];
+    for (size_t i = 0; i < nBins + 1; i++) {
+      edges[i] = _parametersTurnOn[i];
     }
-
-    else if (variable.find("MaxPt") != std::string::npos) {
-      std::string desc = (variable == "MaxPt1") ? "Leading" : "Next-to-Leading";
-      std::string title = "pT of " + desc + " " + sourceUpper + " " + objType;
-      const size_t nBins = _parametersTurnOn.size() - 1;
-      float * edges = new float[nBins + 1];
-      for (size_t i = 0; i < nBins + 1; i++) {
-	edges[i] = _parametersTurnOn[i];
-      }
-      h = new TH1F(name.c_str(), title.c_str(), nBins, edges);
-      delete[] edges;
-    } 
-
-    else {
-      std::string symbol = (variable == "Eta") ? "#eta" : "#phi";
-      std::string title  = symbol + " of " + sourceUpper + " " + objType;
-      std::vector<double> params = (variable == "Eta") ? _parametersEta : _parametersPhi;
-      int    nBins = (int)params[0];
-      double min   = params[1];
-      double max   = params[2];
-      h = new TH1F(name.c_str(), title.c_str(), nBins, min, max);
-    }
-
-    h->Sumw2();
-    // This is the trick, that takes a normal TH1F and puts it in in the DQM
-    // machinery. Seems to be easy!
-    // Updated to use the new iBooker machinery.
-    _elements[name] = iBooker.book1D(name, h);
-    delete h;
+    h = new TH1F(name.c_str(), title.c_str(), nBins, edges);
+    delete[] edges;
+  }
+
+  else {
+    std::string symbol = (variable == "Eta") ? "#eta" : "#phi";
+    std::string title = symbol + " of " + sourceUpper + " " + objType;
+    std::vector<double> params = (variable == "Eta") ? _parametersEta : _parametersPhi;
+    int nBins = (int)params[0];
+    double min = params[1];
+    double max = params[2];
+    h = new TH1F(name.c_str(), title.c_str(), nBins, min, max);
+  }
+
+  h->Sumw2();
+  // This is the trick, that takes a normal TH1F and puts it in in the DQM
+  // machinery. Seems to be easy!
+  // Updated to use the new iBooker machinery.
+  _elements[name] = iBooker.book1D(name, h);
+  delete h;
 }
 
 // Fill the histograms
-void HLTExoticaSubAnalysis::fillHist(const std::string & source, 
-				     const std::string & objType, 
-				     const std::string & variable, 
-				     const float & value)
-{
-    std::string sourceUpper = source;
-    sourceUpper[0] = toupper(sourceUpper[0]);
-    std::string name = source + objType + variable ;
-
-    LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::fillHist() " << name << " " << value;
-    _elements[name]->Fill(value);
-    LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::fillHist() " << name << " worked";
+void HLTExoticaSubAnalysis::fillHist(const std::string &source,
+                                     const std::string &objType,
+                                     const std::string &variable,
+                                     const float &value) {
+  std::string sourceUpper = source;
+  sourceUpper[0] = toupper(sourceUpper[0]);
+  std::string name = source + objType + variable;
+
+  LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::fillHist() " << name << " " << value;
+  _elements[name]->Fill(value);
+  LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::fillHist() " << name << " worked";
 }
 
 // Initialize the selectors
-void HLTExoticaSubAnalysis::initSelector(const unsigned int & objtype)
-{
-
-    LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::initSelector()";
-
-    if (objtype == EVTColContainer::MUON && _recMuonSelector == nullptr) {
-        _recMuonSelector = new StringCutObjectSelector<reco::Muon>(_recCut[objtype]);
-    } else if (objtype == EVTColContainer::MUTRK && _recMuonTrkSelector == nullptr) {
-        _recMuonTrkSelector = new StringCutObjectSelector<reco::Track>(_recCut[objtype]);
-    } else if (objtype == EVTColContainer::TRACK && _recTrackSelector == nullptr) {
-        _recTrackSelector = new StringCutObjectSelector<reco::Track>(_recCut[objtype]);
-    } else if (objtype == EVTColContainer::ELEC && _recElecSelector == nullptr) {
-        _recElecSelector = new StringCutObjectSelector<reco::GsfElectron>(_recCut[objtype]);
-    } else if (objtype == EVTColContainer::PHOTON && _recPhotonSelector == nullptr) {
-        _recPhotonSelector = new StringCutObjectSelector<reco::Photon>(_recCut[objtype]);
-    } else if (objtype == EVTColContainer::MET && _recMETSelector == nullptr) {
-        _recMETSelector = new StringCutObjectSelector<reco::MET>(_recCut[objtype]);
-    } else if (objtype == EVTColContainer::PFMET && _recPFMETSelector == nullptr) {
-        _recPFMETSelector = new StringCutObjectSelector<reco::PFMET>(_recCut[objtype]);
-    } else if (objtype == EVTColContainer::PFMHT && _recPFMHTSelector == nullptr) {
-        _recPFMHTSelector = new StringCutObjectSelector<reco::PFMET>(_recCut[objtype]);
-    } else if (objtype == EVTColContainer::GENMET && _genMETSelector == nullptr) {
-        _genMETSelector = new StringCutObjectSelector<reco::GenMET>(_recCut[objtype]);
-    } else if (objtype == EVTColContainer::CALOMET && _recCaloMETSelector == nullptr) {
-        _recCaloMETSelector = new StringCutObjectSelector<reco::CaloMET>(_recCut[objtype]);
-    } else if (objtype == EVTColContainer::CALOMHT && _recCaloMHTSelector == nullptr) {
-        _recCaloMHTSelector = new StringCutObjectSelector<reco::CaloMET>(_recCut[objtype]);
-    } else if (objtype == EVTColContainer::L1MET && _l1METSelector == nullptr) {
-        _l1METSelector = new StringCutObjectSelector<l1extra::L1EtMissParticle>(_recCut[objtype]);
-    } else if (objtype == EVTColContainer::PFTAU && _recPFTauSelector == nullptr) {
-        _recPFTauSelector = new StringCutObjectSelector<reco::PFTau>(_recCut[objtype]);
-    } else if (objtype == EVTColContainer::PFJET && _recPFJetSelector == nullptr) {
-        _recPFJetSelector = new StringCutObjectSelector<reco::PFJet>(_recCut[objtype]);
-    } else if (objtype == EVTColContainer::CALOJET && _recCaloJetSelector == nullptr) {
-        _recCaloJetSelector = new StringCutObjectSelector<reco::CaloJet>(_recCut[objtype]);
-    }
-    /* else
-    {
-    FIXME: ERROR NOT IMPLEMENTED
-    }*/
+void HLTExoticaSubAnalysis::initSelector(const unsigned int &objtype) {
+  LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::initSelector()";
+
+  if (objtype == EVTColContainer::MUON && _recMuonSelector == nullptr) {
+    _recMuonSelector = new StringCutObjectSelector<reco::Muon>(_recCut[objtype]);
+  } else if (objtype == EVTColContainer::MUTRK && _recMuonTrkSelector == nullptr) {
+    _recMuonTrkSelector = new StringCutObjectSelector<reco::Track>(_recCut[objtype]);
+  } else if (objtype == EVTColContainer::TRACK && _recTrackSelector == nullptr) {
+    _recTrackSelector = new StringCutObjectSelector<reco::Track>(_recCut[objtype]);
+  } else if (objtype == EVTColContainer::ELEC && _recElecSelector == nullptr) {
+    _recElecSelector = new StringCutObjectSelector<reco::GsfElectron>(_recCut[objtype]);
+  } else if (objtype == EVTColContainer::PHOTON && _recPhotonSelector == nullptr) {
+    _recPhotonSelector = new StringCutObjectSelector<reco::Photon>(_recCut[objtype]);
+  } else if (objtype == EVTColContainer::MET && _recMETSelector == nullptr) {
+    _recMETSelector = new StringCutObjectSelector<reco::MET>(_recCut[objtype]);
+  } else if (objtype == EVTColContainer::PFMET && _recPFMETSelector == nullptr) {
+    _recPFMETSelector = new StringCutObjectSelector<reco::PFMET>(_recCut[objtype]);
+  } else if (objtype == EVTColContainer::PFMHT && _recPFMHTSelector == nullptr) {
+    _recPFMHTSelector = new StringCutObjectSelector<reco::PFMET>(_recCut[objtype]);
+  } else if (objtype == EVTColContainer::GENMET && _genMETSelector == nullptr) {
+    _genMETSelector = new StringCutObjectSelector<reco::GenMET>(_recCut[objtype]);
+  } else if (objtype == EVTColContainer::CALOMET && _recCaloMETSelector == nullptr) {
+    _recCaloMETSelector = new StringCutObjectSelector<reco::CaloMET>(_recCut[objtype]);
+  } else if (objtype == EVTColContainer::CALOMHT && _recCaloMHTSelector == nullptr) {
+    _recCaloMHTSelector = new StringCutObjectSelector<reco::CaloMET>(_recCut[objtype]);
+  } else if (objtype == EVTColContainer::L1MET && _l1METSelector == nullptr) {
+    _l1METSelector = new StringCutObjectSelector<l1extra::L1EtMissParticle>(_recCut[objtype]);
+  } else if (objtype == EVTColContainer::PFTAU && _recPFTauSelector == nullptr) {
+    _recPFTauSelector = new StringCutObjectSelector<reco::PFTau>(_recCut[objtype]);
+  } else if (objtype == EVTColContainer::PFJET && _recPFJetSelector == nullptr) {
+    _recPFJetSelector = new StringCutObjectSelector<reco::PFJet>(_recCut[objtype]);
+  } else if (objtype == EVTColContainer::CALOJET && _recCaloJetSelector == nullptr) {
+    _recCaloJetSelector = new StringCutObjectSelector<reco::CaloJet>(_recCut[objtype]);
+  }
+  /* else
+  {
+  FIXME: ERROR NOT IMPLEMENTED
+  }*/
 }
 
 // Insert the HLT candidates
-void HLTExoticaSubAnalysis::insertCandidates(const unsigned int & objType, const EVTColContainer * cols, std::vector<reco::LeafCandidate> * matches, 
-                                             std::map<int,double> & theSumEt, std::map<int,std::vector<const reco::Track*> > & trkObjs )
-{
-    
-    LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::insertCandidates()"; 
-
-    theSumEt[objType] = -1;
-    
-    if (objType == EVTColContainer::MUON) {
-        for (size_t i = 0; i < cols->muons->size(); i++) {
-	    LogDebug("ExoticaValidation") << "Inserting muon " << i ;
-	    if (_recMuonSelector->operator()(cols->muons->at(i))) {
-		reco::LeafCandidate m(0, cols->muons->at(i).p4(), cols->muons->at(i).vertex(), objType, 0, true);
-		matches->push_back(m);
-        
-                // for making dxy plots
-                trkObjs[objType].push_back(cols->muons->at(i).bestTrack());
-	    }
-        }
-    } else if (objType == EVTColContainer::MUTRK) {
-        for (size_t i = 0; i < cols->tracks->size(); i++) {
-	    LogDebug("ExoticaValidation") << "Inserting muonTrack " << i ;
-	    if (_recMuonTrkSelector->operator()(cols->tracks->at(i))) {
-		ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<double>> mom4;
-                ROOT::Math::XYZVector mom3 = cols->tracks->at(i).momentum();
-                mom4.SetXYZT(mom3.x(),mom3.y(),mom3.z(),mom3.r());
-		reco::LeafCandidate m(0, mom4, cols->tracks->at(i).vertex(), objType, 0, true);
-		matches->push_back(m);
-
-                // for making dxy plots
-                trkObjs[objType].push_back(&cols->tracks->at(i));
-            }
-        }
-    } else if (objType == EVTColContainer::TRACK) {
-        for (size_t i = 0; i < cols->tracks->size(); i++) {
-            LogDebug("ExoticaValidation") << "Inserting Track " << i ;
-            if (_recTrackSelector->operator()(cols->tracks->at(i))) {
-                ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<double>> mom4;
-                ROOT::Math::XYZVector mom3 = cols->tracks->at(i).momentum();
-                mom4.SetXYZT(mom3.x(),mom3.y(),mom3.z(),mom3.r());
-                reco::LeafCandidate m(0, mom4, cols->tracks->at(i).vertex(), objType, 0, true);
-                matches->push_back(m);
-            }
-        }
-    } else if (objType == EVTColContainer::ELEC) {
-        for (size_t i = 0; i < cols->electrons->size(); i++) {
-	    LogDebug("ExoticaValidation") << "Inserting electron " << i ;
-            if (_recElecSelector->operator()(cols->electrons->at(i))) {
-		reco::LeafCandidate m(0, cols->electrons->at(i).p4(), cols->electrons->at(i).vertex(), objType, 0, true);
-		matches->push_back(m);
-
-                // for making dxy plots
-                trkObjs[objType].push_back(cols->electrons->at(i).bestTrack());
-	    }
-        }
-    } else if (objType == EVTColContainer::PHOTON) {
-        for (size_t i = 0; i < cols->photons->size(); i++) {
-	    LogDebug("ExoticaValidation") << "Inserting photon " << i ;
-            if (_recPhotonSelector->operator()(cols->photons->at(i))) {
-		reco::LeafCandidate m(0, cols->photons->at(i).p4(), cols->photons->at(i).vertex(), objType, 0, true);
-		matches->push_back(m);
-            }
-        }
-    } else if (objType == EVTColContainer::PFMET) {
-	/// This is a special case. Passing a PFMET* to the constructor of
-	/// MatchStruct will trigger the usage of the special constructor which
-	/// also sets the sumEt member.
-        for (size_t i = 0; i < cols->pfMETs->size(); i++) {
-	    LogDebug("ExoticaValidation") << "Inserting PFMET " << i ;
-	    if (_recPFMETSelector->operator()(cols->pfMETs->at(i))) {
-		reco::LeafCandidate m(0, cols->pfMETs->at(i).p4(), cols->pfMETs->at(i).vertex(), objType, 0, true);
-		matches->push_back(m);
-		if(i==0) theSumEt[objType] = cols->pfMETs->at(i).sumEt();
-	    }
-        }
-    } else if (objType == EVTColContainer::PFMHT) {
-        for (size_t i = 0; i < cols->pfMHTs->size(); i++) {
-	    LogDebug("ExoticaValidation") << "Inserting PFMHT " << i ;
-	    if (_recPFMHTSelector->operator()(cols->pfMHTs->at(i))) {
-		reco::LeafCandidate m(0, cols->pfMHTs->at(i).p4(), cols->pfMHTs->at(i).vertex(), objType, 0, true);
-		matches->push_back(m);
-		if(i==0) theSumEt[objType] = cols->pfMHTs->at(i).sumEt();
-	    }
-        }
-    } else if (objType == EVTColContainer::GENMET) {
-        for (size_t i = 0; i < cols->genMETs->size(); i++) {
-	    LogDebug("ExoticaValidation") << "Inserting GENMET " << i ;
-	    if (_genMETSelector->operator()(cols->genMETs->at(i))) {
-		reco::LeafCandidate m(0, cols->genMETs->at(i).p4(), cols->genMETs->at(i).vertex(), objType, 0, true);
-		matches->push_back(m);
-		if(i==0) theSumEt[objType] = cols->genMETs->at(i).sumEt();
-	    }
-        }
-    } else if (objType == EVTColContainer::CALOMET) {
-        for (size_t i = 0; i < cols->caloMETs->size(); i++) {
-            LogDebug("ExoticaValidation") << "Inserting CALOMET " << i ;
-            if (_recCaloMETSelector->operator()(cols->caloMETs->at(i))) {
-                reco::LeafCandidate m(0, cols->caloMETs->at(i).p4(), cols->caloMETs->at(i).vertex(), objType, 0, true);
-                matches->push_back(m);
-		if(i==0) theSumEt[objType] = cols->caloMETs->at(i).sumEt();
-            }
-        }
-    } else if (objType == EVTColContainer::CALOMHT) {
-        for (size_t i = 0; i < cols->caloMHTs->size(); i++) {
-	    LogDebug("ExoticaValidation") << "Inserting CaloMHT " << i ;
-	    if (_recCaloMHTSelector->operator()(cols->caloMHTs->at(i))) {
-		reco::LeafCandidate m(0, cols->caloMHTs->at(i).p4(), cols->caloMHTs->at(i).vertex(), objType, 0, true);
-		matches->push_back(m);
-		if(i==0) theSumEt[objType] = cols->caloMHTs->at(i).sumEt();
-	    }
-        }
-    } else if (objType == EVTColContainer::L1MET) {
-        for (size_t i = 0; i < cols->l1METs->size(); i++) {
-            LogDebug("ExoticaValidation") << "Inserting L1MET " << i ;
-            if (_l1METSelector->operator()(cols->l1METs->at(i))) {
-                reco::LeafCandidate m(0, cols->l1METs->at(i).p4(), cols->l1METs->at(i).vertex(), objType, 0, true);
-                matches->push_back(m);
-		if(i==0) theSumEt[objType] = cols->l1METs->at(i).etTotal();
-            }
-        }
-    } else if (objType == EVTColContainer::PFTAU) {
-        for (size_t i = 0; i < cols->pfTaus->size(); i++) {
-	    LogDebug("ExoticaValidation") << "Inserting PFtau " << i ;
-	    if (_recPFTauSelector->operator()(cols->pfTaus->at(i))) {
-		reco::LeafCandidate m(0, cols->pfTaus->at(i).p4(), cols->pfTaus->at(i).vertex(), objType, 0, true);
-		matches->push_back(m);
-	    }
-        }
-    } else if (objType == EVTColContainer::PFJET) {
-        for (size_t i = 0; i < cols->pfJets->size(); i++) {
-	    LogDebug("ExoticaValidation") << "Inserting jet " << i ;
-            if (_recPFJetSelector->operator()(cols->pfJets->at(i))) {
-		reco::LeafCandidate m(0, cols->pfJets->at(i).p4(), cols->pfJets->at(i).vertex(), objType, 0, true);
-		matches->push_back(m);
-            }
-        }
-    } else if (objType == EVTColContainer::CALOJET) {
-        for (size_t i = 0; i < cols->caloJets->size(); i++) {
-	    LogDebug("ExoticaValidation") << "Inserting jet " << i ;
-            if (_recCaloJetSelector->operator()(cols->caloJets->at(i))) {
-		reco::LeafCandidate m(0, cols->caloJets->at(i).p4(), cols->caloJets->at(i).vertex(), objType, 0, true);
-		matches->push_back(m);
-            }
-        }
+void HLTExoticaSubAnalysis::insertCandidates(const unsigned int &objType,
+                                             const EVTColContainer *cols,
+                                             std::vector<reco::LeafCandidate> *matches,
+                                             std::map<int, double> &theSumEt,
+                                             std::map<int, std::vector<const reco::Track *>> &trkObjs) {
+  LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::insertCandidates()";
+
+  theSumEt[objType] = -1;
+
+  if (objType == EVTColContainer::MUON) {
+    for (size_t i = 0; i < cols->muons->size(); i++) {
+      LogDebug("ExoticaValidation") << "Inserting muon " << i;
+      if (_recMuonSelector->operator()(cols->muons->at(i))) {
+        reco::LeafCandidate m(0, cols->muons->at(i).p4(), cols->muons->at(i).vertex(), objType, 0, true);
+        matches->push_back(m);
+
+        // for making dxy plots
+        trkObjs[objType].push_back(cols->muons->at(i).bestTrack());
+      }
+    }
+  } else if (objType == EVTColContainer::MUTRK) {
+    for (size_t i = 0; i < cols->tracks->size(); i++) {
+      LogDebug("ExoticaValidation") << "Inserting muonTrack " << i;
+      if (_recMuonTrkSelector->operator()(cols->tracks->at(i))) {
+        ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<double>> mom4;
+        ROOT::Math::XYZVector mom3 = cols->tracks->at(i).momentum();
+        mom4.SetXYZT(mom3.x(), mom3.y(), mom3.z(), mom3.r());
+        reco::LeafCandidate m(0, mom4, cols->tracks->at(i).vertex(), objType, 0, true);
+        matches->push_back(m);
+
+        // for making dxy plots
+        trkObjs[objType].push_back(&cols->tracks->at(i));
+      }
+    }
+  } else if (objType == EVTColContainer::TRACK) {
+    for (size_t i = 0; i < cols->tracks->size(); i++) {
+      LogDebug("ExoticaValidation") << "Inserting Track " << i;
+      if (_recTrackSelector->operator()(cols->tracks->at(i))) {
+        ROOT::Math::LorentzVector<ROOT::Math::PxPyPzE4D<double>> mom4;
+        ROOT::Math::XYZVector mom3 = cols->tracks->at(i).momentum();
+        mom4.SetXYZT(mom3.x(), mom3.y(), mom3.z(), mom3.r());
+        reco::LeafCandidate m(0, mom4, cols->tracks->at(i).vertex(), objType, 0, true);
+        matches->push_back(m);
+      }
+    }
+  } else if (objType == EVTColContainer::ELEC) {
+    for (size_t i = 0; i < cols->electrons->size(); i++) {
+      LogDebug("ExoticaValidation") << "Inserting electron " << i;
+      if (_recElecSelector->operator()(cols->electrons->at(i))) {
+        reco::LeafCandidate m(0, cols->electrons->at(i).p4(), cols->electrons->at(i).vertex(), objType, 0, true);
+        matches->push_back(m);
+
+        // for making dxy plots
+        trkObjs[objType].push_back(cols->electrons->at(i).bestTrack());
+      }
     }
+  } else if (objType == EVTColContainer::PHOTON) {
+    for (size_t i = 0; i < cols->photons->size(); i++) {
+      LogDebug("ExoticaValidation") << "Inserting photon " << i;
+      if (_recPhotonSelector->operator()(cols->photons->at(i))) {
+        reco::LeafCandidate m(0, cols->photons->at(i).p4(), cols->photons->at(i).vertex(), objType, 0, true);
+        matches->push_back(m);
+      }
+    }
+  } else if (objType == EVTColContainer::PFMET) {
+    /// This is a special case. Passing a PFMET* to the constructor of
+    /// MatchStruct will trigger the usage of the special constructor which
+    /// also sets the sumEt member.
+    for (size_t i = 0; i < cols->pfMETs->size(); i++) {
+      LogDebug("ExoticaValidation") << "Inserting PFMET " << i;
+      if (_recPFMETSelector->operator()(cols->pfMETs->at(i))) {
+        reco::LeafCandidate m(0, cols->pfMETs->at(i).p4(), cols->pfMETs->at(i).vertex(), objType, 0, true);
+        matches->push_back(m);
+        if (i == 0)
+          theSumEt[objType] = cols->pfMETs->at(i).sumEt();
+      }
+    }
+  } else if (objType == EVTColContainer::PFMHT) {
+    for (size_t i = 0; i < cols->pfMHTs->size(); i++) {
+      LogDebug("ExoticaValidation") << "Inserting PFMHT " << i;
+      if (_recPFMHTSelector->operator()(cols->pfMHTs->at(i))) {
+        reco::LeafCandidate m(0, cols->pfMHTs->at(i).p4(), cols->pfMHTs->at(i).vertex(), objType, 0, true);
+        matches->push_back(m);
+        if (i == 0)
+          theSumEt[objType] = cols->pfMHTs->at(i).sumEt();
+      }
+    }
+  } else if (objType == EVTColContainer::GENMET) {
+    for (size_t i = 0; i < cols->genMETs->size(); i++) {
+      LogDebug("ExoticaValidation") << "Inserting GENMET " << i;
+      if (_genMETSelector->operator()(cols->genMETs->at(i))) {
+        reco::LeafCandidate m(0, cols->genMETs->at(i).p4(), cols->genMETs->at(i).vertex(), objType, 0, true);
+        matches->push_back(m);
+        if (i == 0)
+          theSumEt[objType] = cols->genMETs->at(i).sumEt();
+      }
+    }
+  } else if (objType == EVTColContainer::CALOMET) {
+    for (size_t i = 0; i < cols->caloMETs->size(); i++) {
+      LogDebug("ExoticaValidation") << "Inserting CALOMET " << i;
+      if (_recCaloMETSelector->operator()(cols->caloMETs->at(i))) {
+        reco::LeafCandidate m(0, cols->caloMETs->at(i).p4(), cols->caloMETs->at(i).vertex(), objType, 0, true);
+        matches->push_back(m);
+        if (i == 0)
+          theSumEt[objType] = cols->caloMETs->at(i).sumEt();
+      }
+    }
+  } else if (objType == EVTColContainer::CALOMHT) {
+    for (size_t i = 0; i < cols->caloMHTs->size(); i++) {
+      LogDebug("ExoticaValidation") << "Inserting CaloMHT " << i;
+      if (_recCaloMHTSelector->operator()(cols->caloMHTs->at(i))) {
+        reco::LeafCandidate m(0, cols->caloMHTs->at(i).p4(), cols->caloMHTs->at(i).vertex(), objType, 0, true);
+        matches->push_back(m);
+        if (i == 0)
+          theSumEt[objType] = cols->caloMHTs->at(i).sumEt();
+      }
+    }
+  } else if (objType == EVTColContainer::L1MET) {
+    for (size_t i = 0; i < cols->l1METs->size(); i++) {
+      LogDebug("ExoticaValidation") << "Inserting L1MET " << i;
+      if (_l1METSelector->operator()(cols->l1METs->at(i))) {
+        reco::LeafCandidate m(0, cols->l1METs->at(i).p4(), cols->l1METs->at(i).vertex(), objType, 0, true);
+        matches->push_back(m);
+        if (i == 0)
+          theSumEt[objType] = cols->l1METs->at(i).etTotal();
+      }
+    }
+  } else if (objType == EVTColContainer::PFTAU) {
+    for (size_t i = 0; i < cols->pfTaus->size(); i++) {
+      LogDebug("ExoticaValidation") << "Inserting PFtau " << i;
+      if (_recPFTauSelector->operator()(cols->pfTaus->at(i))) {
+        reco::LeafCandidate m(0, cols->pfTaus->at(i).p4(), cols->pfTaus->at(i).vertex(), objType, 0, true);
+        matches->push_back(m);
+      }
+    }
+  } else if (objType == EVTColContainer::PFJET) {
+    for (size_t i = 0; i < cols->pfJets->size(); i++) {
+      LogDebug("ExoticaValidation") << "Inserting jet " << i;
+      if (_recPFJetSelector->operator()(cols->pfJets->at(i))) {
+        reco::LeafCandidate m(0, cols->pfJets->at(i).p4(), cols->pfJets->at(i).vertex(), objType, 0, true);
+        matches->push_back(m);
+      }
+    }
+  } else if (objType == EVTColContainer::CALOJET) {
+    for (size_t i = 0; i < cols->caloJets->size(); i++) {
+      LogDebug("ExoticaValidation") << "Inserting jet " << i;
+      if (_recCaloJetSelector->operator()(cols->caloJets->at(i))) {
+        reco::LeafCandidate m(0, cols->caloJets->at(i).p4(), cols->caloJets->at(i).vertex(), objType, 0, true);
+        matches->push_back(m);
+      }
+    }
+  }
 
-    /* else
-    {
-    FIXME: ERROR NOT IMPLEMENTED
-    }*/
+  /* else
+  {
+  FIXME: ERROR NOT IMPLEMENTED
+  }*/
 }
 
 void HLTExoticaSubAnalysis::endRun() {
-    // Dump trigger results
-    std::stringstream log;
-    log << std::endl;
-    log << "===========================================================================" << std::endl;
-    log << "          Trigger Results ( " << _analysisname << " )                      " << std::endl;
-    log << "===========================================================================" << std::endl;
-    log << std::setw(18) << "# of passed events : HLT path names"                        << std::endl;
-    log << "-------------------:-------------------------------------------------------" << std::endl;
-    for (std::map<std::string,int>::iterator it = _triggerCounter.begin();
-         it != _triggerCounter.end(); ++it) {
-      log << std::setw(18) << it->second <<  " : " << it->first << std::endl;
-    }
-    log << "===========================================================================" << std::endl;
-    LogDebug("ExoticaValidation") << log.str().data();
+  // Dump trigger results
+  std::stringstream log;
+  log << std::endl;
+  log << "====================================================================="
+         "======"
+      << std::endl;
+  log << "          Trigger Results ( " << _analysisname << " )                      " << std::endl;
+  log << "====================================================================="
+         "======"
+      << std::endl;
+  log << std::setw(18) << "# of passed events : HLT path names" << std::endl;
+  log << "-------------------:-------------------------------------------------"
+         "------"
+      << std::endl;
+  for (std::map<std::string, int>::iterator it = _triggerCounter.begin(); it != _triggerCounter.end(); ++it) {
+    log << std::setw(18) << it->second << " : " << it->first << std::endl;
+  }
+  log << "====================================================================="
+         "======"
+      << std::endl;
+  LogDebug("ExoticaValidation") << log.str().data();
 }
diff --git a/HLTriggerOffline/Exotica/src/HLTExoticaValidator.cc b/HLTriggerOffline/Exotica/src/HLTExoticaValidator.cc
index 6aaf3cc528c45..aba841e13658a 100644
--- a/HLTriggerOffline/Exotica/src/HLTExoticaValidator.cc
+++ b/HLTriggerOffline/Exotica/src/HLTExoticaValidator.cc
@@ -19,106 +19,83 @@
 //////// Class Methods ///////////////////////////////////////////////////////
 
 // Constructor
-HLTExoticaValidator::HLTExoticaValidator(const edm::ParameterSet& pset) :
-    _pset(pset),
-    _analysisnames(pset.getParameter<std::vector<std::string> >("analyses")),
-    _collections(nullptr)
-{
-
-    LogDebug("ExoticaValidation") << "In HLTExoticaValidator::constructor()";
-
-    // Prepare the event collections to be used.
-    _collections = new EVTColContainer;
-
-    // Create a new subanalysis for each of the analysis names.
-    // Notice that the constructor takes the full parameter set,
-    // the analysis name and the consumesCollector() separately.
-    for (size_t i = 0; i < _analysisnames.size() ; ++i) {
-        HLTExoticaSubAnalysis analyzer(_pset, _analysisnames.at(i), consumesCollector());
-        _analyzers.push_back(analyzer);
-    }
-
+HLTExoticaValidator::HLTExoticaValidator(const edm::ParameterSet &pset)
+    : _pset(pset), _analysisnames(pset.getParameter<std::vector<std::string>>("analyses")), _collections(nullptr) {
+  LogDebug("ExoticaValidation") << "In HLTExoticaValidator::constructor()";
+
+  // Prepare the event collections to be used.
+  _collections = new EVTColContainer;
+
+  // Create a new subanalysis for each of the analysis names.
+  // Notice that the constructor takes the full parameter set,
+  // the analysis name and the consumesCollector() separately.
+  for (size_t i = 0; i < _analysisnames.size(); ++i) {
+    HLTExoticaSubAnalysis analyzer(_pset, _analysisnames.at(i), consumesCollector());
+    _analyzers.push_back(analyzer);
+  }
 }
 
-HLTExoticaValidator::~HLTExoticaValidator()
-{
-    if (_collections != nullptr) {
-        delete _collections;
-        _collections = nullptr;
-    }
+HLTExoticaValidator::~HLTExoticaValidator() {
+  if (_collections != nullptr) {
+    delete _collections;
+    _collections = nullptr;
+  }
 }
 
-
-// 2014-02-03 -- Thiago                                                      
-// Due to the fact that the DQM has to be thread safe now, we have to do things differently:                                                         
-// 1) Implement the bookHistograms method in this class
-// 2) Split beginRun() into bookHistograms() and dqmBeginRun()                                                                                
-// 3) Call subAnalysisBookHistos() for each subAnalysis from inside bookHistograms()
+// 2014-02-03 -- Thiago
+// Due to the fact that the DQM has to be thread safe now, we have to do things
+// differently: 1) Implement the bookHistograms method in this class 2) Split
+// beginRun() into bookHistograms() and dqmBeginRun() 3) Call
+// subAnalysisBookHistos() for each subAnalysis from inside bookHistograms()
 // *** IMPORTANT *** notice that now dqmBeginRun() runs before bookHistograms()!
-void HLTExoticaValidator::dqmBeginRun(const edm::Run & iRun, const edm::EventSetup & iSetup)
-{
-    LogDebug("ExoticaValidation") << "In HLTExoticaValidator::dqmBeginRun()";
-
-    // Call the Plotter beginRun (which stores the triggers paths..:)
-    for (std::vector<HLTExoticaSubAnalysis>::iterator iter = _analyzers.begin();
-         iter != _analyzers.end(); ++iter) {
-        iter->beginRun(iRun, iSetup);
-    }
-}
-
-void HLTExoticaValidator::bookHistograms(DQMStore::IBooker &iBooker, const edm::Run & iRun, const edm::EventSetup & iSetup)
-{
+void HLTExoticaValidator::dqmBeginRun(const edm::Run &iRun, const edm::EventSetup &iSetup) {
+  LogDebug("ExoticaValidation") << "In HLTExoticaValidator::dqmBeginRun()";
 
-    LogDebug("ExoticaValidation") << "In HLTExoticaValidator::bookHistograms()";
-
-    // Loop over all sub-analyses and book histograms for all of them.
-    // For this to work, I think we have to pass the iBooker to each of them.
-    // I don't think we have any guarantee that this loop is executed sequentially,
-    // but the booking with iBooker itself has such a guarantee.
-    for (std::vector<HLTExoticaSubAnalysis>::iterator iter = _analyzers.begin();
-         iter != _analyzers.end(); ++iter) {
-        iter->subAnalysisBookHistos(iBooker, iRun, iSetup);
-    }
+  // Call the Plotter beginRun (which stores the triggers paths..:)
+  for (std::vector<HLTExoticaSubAnalysis>::iterator iter = _analyzers.begin(); iter != _analyzers.end(); ++iter) {
+    iter->beginRun(iRun, iSetup);
+  }
 }
 
-
-void HLTExoticaValidator::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-    LogDebug("ExoticaValidation") << "In HLTExoticaValidator::analyze()";
-
-    //static int eventNumber = 0;
-    //eventNumber++;
-    //LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::analyze,  "
-    //                              << "Event: " << eventNumber;
-
-    // Initialize the event collections
-    this->_collections->reset();
-
-    for (std::vector<HLTExoticaSubAnalysis>::iterator iter = _analyzers.begin();
-         iter != _analyzers.end(); ++iter) {
-        iter->analyze(iEvent, iSetup, this->_collections);
-    }
+void HLTExoticaValidator::bookHistograms(DQMStore::IBooker &iBooker,
+                                         const edm::Run &iRun,
+                                         const edm::EventSetup &iSetup) {
+  LogDebug("ExoticaValidation") << "In HLTExoticaValidator::bookHistograms()";
+
+  // Loop over all sub-analyses and book histograms for all of them.
+  // For this to work, I think we have to pass the iBooker to each of them.
+  // I don't think we have any guarantee that this loop is executed
+  // sequentially, but the booking with iBooker itself has such a guarantee.
+  for (std::vector<HLTExoticaSubAnalysis>::iterator iter = _analyzers.begin(); iter != _analyzers.end(); ++iter) {
+    iter->subAnalysisBookHistos(iBooker, iRun, iSetup);
+  }
 }
 
+void HLTExoticaValidator::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  LogDebug("ExoticaValidation") << "In HLTExoticaValidator::analyze()";
 
+  // static int eventNumber = 0;
+  // eventNumber++;
+  // LogDebug("ExoticaValidation") << "In HLTExoticaSubAnalysis::analyze,  "
+  //                              << "Event: " << eventNumber;
 
-void HLTExoticaValidator::beginJob()
-{
-    LogDebug("ExoticaValidation") << "In HLTExoticaValidator::beginJob()";
-}
+  // Initialize the event collections
+  this->_collections->reset();
 
-void HLTExoticaValidator::endRun(const edm::Run & iRun, const edm::EventSetup& iSetup)
-{
-    for (std::vector<HLTExoticaSubAnalysis>::iterator iter = _analyzers.begin();
-         iter != _analyzers.end(); ++iter) {
-        iter->endRun();
-    }
+  for (std::vector<HLTExoticaSubAnalysis>::iterator iter = _analyzers.begin(); iter != _analyzers.end(); ++iter) {
+    iter->analyze(iEvent, iSetup, this->_collections);
+  }
 }
 
+void HLTExoticaValidator::beginJob() { LogDebug("ExoticaValidation") << "In HLTExoticaValidator::beginJob()"; }
 
-void HLTExoticaValidator::endJob()
-{
+void HLTExoticaValidator::endRun(const edm::Run &iRun, const edm::EventSetup &iSetup) {
+  for (std::vector<HLTExoticaSubAnalysis>::iterator iter = _analyzers.begin(); iter != _analyzers.end(); ++iter) {
+    iter->endRun();
+  }
 }
 
-//define this as a plug-in
-//DEFINE_FWK_MODULE(HLTExoticaValidator);
+void HLTExoticaValidator::endJob() {}
+
+// define this as a plug-in
+// DEFINE_FWK_MODULE(HLTExoticaValidator);
diff --git a/HLTriggerOffline/Exotica/src/SealModules.cc b/HLTriggerOffline/Exotica/src/SealModules.cc
index ba7e9c4d0c7e4..af4a5de3df8aa 100644
--- a/HLTriggerOffline/Exotica/src/SealModules.cc
+++ b/HLTriggerOffline/Exotica/src/SealModules.cc
@@ -1,6 +1,6 @@
 
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 
 #include "HLTriggerOffline/Exotica/interface/HLTExoticaValidator.h"
 
diff --git a/HLTriggerOffline/HeavyFlavor/src/HeavyFlavorValidation.cc b/HLTriggerOffline/HeavyFlavor/src/HeavyFlavorValidation.cc
index 29bbf3d5314bf..98668569d31a3 100755
--- a/HLTriggerOffline/HeavyFlavor/src/HeavyFlavorValidation.cc
+++ b/HLTriggerOffline/HeavyFlavor/src/HeavyFlavorValidation.cc
@@ -112,7 +112,6 @@ class HeavyFlavorValidation : public DQMEDAnalyzer {
     vector<double> dimuonPtBins;
     vector<double> dimuonEtaBins;
     vector<double> dimuonDRBins;
-    DQMStore* dqmStore;
     map<TString, MonitorElement *> ME;
     vector<pair<string,int> > filterNamesLevels;
     const double muonMass;
diff --git a/HLTriggerOffline/JetMET/interface/HLTJetMETValidation.h b/HLTriggerOffline/JetMET/interface/HLTJetMETValidation.h
index 413c2a9e565ad..7a4b3f14f0b1f 100644
--- a/HLTriggerOffline/JetMET/interface/HLTJetMETValidation.h
+++ b/HLTriggerOffline/JetMET/interface/HLTJetMETValidation.h
@@ -5,31 +5,29 @@
 #ifndef HLTJetMETValidation_h
 #define HLTJetMETValidation_h
 
-
-#include "FWCore/Framework/interface/Event.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-
 
 #include "DataFormats/Common/interface/TriggerResults.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
 #include "DataFormats/HLTReco/interface/TriggerRefsCollections.h"
 
-#include "DataFormats/L1Trigger/interface/L1JetParticle.h"
-#include "DataFormats/L1Trigger/interface/L1JetParticleFwd.h"
 #include "DataFormats/L1Trigger/interface/L1EmParticle.h"
 #include "DataFormats/L1Trigger/interface/L1EmParticleFwd.h"
+#include "DataFormats/L1Trigger/interface/L1JetParticle.h"
+#include "DataFormats/L1Trigger/interface/L1JetParticleFwd.h"
 #include "DataFormats/L1Trigger/interface/L1MuonParticle.h"
 #include "DataFormats/L1Trigger/interface/L1MuonParticleFwd.h"
 
-#include "DataFormats/JetReco/interface/CaloJetCollection.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
+#include "DataFormats/JetReco/interface/CaloJetCollection.h"
 #include "DataFormats/JetReco/interface/GenJet.h"
-#include "DataFormats/JetReco/interface/PFJetCollection.h"
 #include "DataFormats/JetReco/interface/PFJet.h"
+#include "DataFormats/JetReco/interface/PFJetCollection.h"
 
 #include "DataFormats/METReco/interface/CaloMET.h"
 #include "DataFormats/METReco/interface/CaloMETCollection.h"
@@ -39,34 +37,32 @@
 
 #include "DataFormats/EgammaCandidates/interface/Electron.h"
 #include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h"
-//Include DQM core
+// Include DQM core
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
-#include <vector>
-#include <string>
 #include "TPRegexp.h"
+#include <string>
+#include <vector>
 
 namespace edm {
   class TriggerNames;
 }
 
 class HLTJetMETValidation : public DQMEDAnalyzer {
-  
- public:
-  explicit HLTJetMETValidation(const edm::ParameterSet&);
+public:
+  explicit HLTJetMETValidation(const edm::ParameterSet &);
   ~HLTJetMETValidation() override;
-  
- private:
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void bookHistograms(DQMStore::IBooker &, edm::Run const & iRun, edm::EventSetup const & iSetup) override;
-  void dqmBeginRun(edm::Run const& iRun,edm::EventSetup const& iSetup) override;
 
-  void getHLTResults(const edm::TriggerResults&,
-                     const edm::TriggerNames & triggerNames);
+private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &iRun, edm::EventSetup const &iSetup) override;
+  void dqmBeginRun(edm::Run const &iRun, edm::EventSetup const &iSetup) override;
+
+  void getHLTResults(const edm::TriggerResults &, const edm::TriggerNames &triggerNames);
 
   /// InputTag of TriggerEventWithRefs to analyze
   edm::EDGetTokenT<trigger::TriggerEventWithRefs> triggerEventObject_;
@@ -76,47 +72,47 @@ class HLTJetMETValidation : public DQMEDAnalyzer {
   edm::EDGetTokenT<reco::GenMETCollection> GenMETColl;
   edm::EDGetTokenT<edm::TriggerResults> HLTriggerResults;
 
-  //Just a tag for better file organization
+  // Just a tag for better file organization
   std::string triggerTag_, patternJetTrg_, patternMetTrg_, patternMuTrg_;
 
-  std::vector<MonitorElement*> _meHLTJetPt;
-  std::vector<MonitorElement*> _meHLTJetPtTrgMC;
-  std::vector<MonitorElement*> _meHLTJetPtTrg;
-  std::vector<MonitorElement*> _meHLTJetPtTrgLow;
-  std::vector<MonitorElement*> _meHLTJetEta;
-  std::vector<MonitorElement*> _meHLTJetEtaTrgMC;
-  std::vector<MonitorElement*> _meHLTJetEtaTrg;
-  std::vector<MonitorElement*> _meHLTJetEtaTrgLow;
-  std::vector<MonitorElement*> _meHLTJetPhi;
-  std::vector<MonitorElement*> _meHLTJetPhiTrgMC;
-  std::vector<MonitorElement*> _meHLTJetPhiTrg;
-  std::vector<MonitorElement*> _meHLTJetPhiTrgLow;
-
-  std::vector<MonitorElement*> _meGenJetPt;
-  std::vector<MonitorElement*> _meGenJetPtTrgMC;
-  std::vector<MonitorElement*> _meGenJetPtTrg;
-  std::vector<MonitorElement*> _meGenJetPtTrgLow;
-  std::vector<MonitorElement*> _meGenJetEta;
-  std::vector<MonitorElement*> _meGenJetEtaTrgMC;
-  std::vector<MonitorElement*> _meGenJetEtaTrg;
-  std::vector<MonitorElement*> _meGenJetEtaTrgLow;
-  std::vector<MonitorElement*> _meGenJetPhi;
-  std::vector<MonitorElement*> _meGenJetPhiTrgMC;
-  std::vector<MonitorElement*> _meGenJetPhiTrg;
-  std::vector<MonitorElement*> _meGenJetPhiTrgLow;
-
-  std::vector<MonitorElement*> _meHLTMET;
-  std::vector<MonitorElement*> _meHLTMETTrgMC;
-  std::vector<MonitorElement*> _meHLTMETTrg;
-  std::vector<MonitorElement*> _meHLTMETTrgLow;  
-  std::vector<MonitorElement*> _meGenMET;
-  std::vector<MonitorElement*> _meGenMETTrgMC;
-  std::vector<MonitorElement*> _meGenMETTrg;
-  std::vector<MonitorElement*> _meGenMETTrgLow;  
+  std::vector<MonitorElement *> _meHLTJetPt;
+  std::vector<MonitorElement *> _meHLTJetPtTrgMC;
+  std::vector<MonitorElement *> _meHLTJetPtTrg;
+  std::vector<MonitorElement *> _meHLTJetPtTrgLow;
+  std::vector<MonitorElement *> _meHLTJetEta;
+  std::vector<MonitorElement *> _meHLTJetEtaTrgMC;
+  std::vector<MonitorElement *> _meHLTJetEtaTrg;
+  std::vector<MonitorElement *> _meHLTJetEtaTrgLow;
+  std::vector<MonitorElement *> _meHLTJetPhi;
+  std::vector<MonitorElement *> _meHLTJetPhiTrgMC;
+  std::vector<MonitorElement *> _meHLTJetPhiTrg;
+  std::vector<MonitorElement *> _meHLTJetPhiTrgLow;
+
+  std::vector<MonitorElement *> _meGenJetPt;
+  std::vector<MonitorElement *> _meGenJetPtTrgMC;
+  std::vector<MonitorElement *> _meGenJetPtTrg;
+  std::vector<MonitorElement *> _meGenJetPtTrgLow;
+  std::vector<MonitorElement *> _meGenJetEta;
+  std::vector<MonitorElement *> _meGenJetEtaTrgMC;
+  std::vector<MonitorElement *> _meGenJetEtaTrg;
+  std::vector<MonitorElement *> _meGenJetEtaTrgLow;
+  std::vector<MonitorElement *> _meGenJetPhi;
+  std::vector<MonitorElement *> _meGenJetPhiTrgMC;
+  std::vector<MonitorElement *> _meGenJetPhiTrg;
+  std::vector<MonitorElement *> _meGenJetPhiTrgLow;
+
+  std::vector<MonitorElement *> _meHLTMET;
+  std::vector<MonitorElement *> _meHLTMETTrgMC;
+  std::vector<MonitorElement *> _meHLTMETTrg;
+  std::vector<MonitorElement *> _meHLTMETTrgLow;
+  std::vector<MonitorElement *> _meGenMET;
+  std::vector<MonitorElement *> _meGenMETTrgMC;
+  std::vector<MonitorElement *> _meGenMETTrg;
+  std::vector<MonitorElement *> _meGenMETTrgLow;
 
   MonitorElement *_triggerResults;
 
-  //Define Numbers 
+  // Define Numbers
   int evtCnt;
 
   HLTConfigProvider hltConfig_;
@@ -127,8 +123,8 @@ class HLTJetMETValidation : public DQMEDAnalyzer {
 
   // store hlt information in a map
   std::vector<bool> hlttrigs;
-  std::map <std::string,bool> hltTriggerMap;
-  std::map<std::string,bool>::iterator trig_iter;
+  std::map<std::string, bool> hltTriggerMap;
+  std::map<std::string, bool>::iterator trig_iter;
 
   bool HLTinit_;
 
diff --git a/HLTriggerOffline/JetMET/interface/JetMETDQMPostProcessor.h b/HLTriggerOffline/JetMET/interface/JetMETDQMPostProcessor.h
index d3d6c0471c08b..32e9d4b692362 100644
--- a/HLTriggerOffline/JetMET/interface/JetMETDQMPostProcessor.h
+++ b/HLTriggerOffline/JetMET/interface/JetMETDQMPostProcessor.h
@@ -3,28 +3,34 @@
 #ifndef HLTriggerOffline_JetMET_JetMETDQMPosProcessor_H
 #define HLTriggerOffline_JetMET_JetMETDQMPosProcessor_H
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
-#include "TPRegexp.h"
 #include "TEfficiency.h"
+#include "TPRegexp.h"
+
+class JetMETDQMPostProcessor : public DQMEDHarvester {
+public:
+  JetMETDQMPostProcessor(const edm::ParameterSet &pset);
+  ~JetMETDQMPostProcessor() override{};
 
-class JetMETDQMPostProcessor : public DQMEDHarvester{
- public:
-  JetMETDQMPostProcessor(const edm::ParameterSet& pset);
-  ~JetMETDQMPostProcessor() override {};
+  void dqmEndJob(DQMStore::IBooker &,
+                 DQMStore::IGetter &) override;  // performed in the endJob
 
-  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; //performed in the endJob
-  
-  TProfile* dividehistos(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter, const std::string& numName, const std::string& denomName, const std::string& outName, const std::string& label, const std::string& titel);
+  TProfile *dividehistos(DQMStore::IBooker &ibooker,
+                         DQMStore::IGetter &igetter,
+                         const std::string &numName,
+                         const std::string &denomName,
+                         const std::string &outName,
+                         const std::string &label,
+                         const std::string &titel);
 
- private:
+private:
   std::string subDir_, patternJetTrg_, patternMetTrg_;
 
   void Efficiency(int passing, int total, double level, double &mode, double &lowerBound, double &upperBound);
 
-  TH1F *getHistogram(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter, const std::string &histoPath);
-
+  TH1F *getHistogram(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter, const std::string &histoPath);
 };
 
 #endif
diff --git a/HLTriggerOffline/JetMET/src/HLTJetMETValidation.cc b/HLTriggerOffline/JetMET/src/HLTJetMETValidation.cc
index 8d12c63a4e7e4..1c7202a8b80d2 100644
--- a/HLTriggerOffline/JetMET/src/HLTJetMETValidation.cc
+++ b/HLTriggerOffline/JetMET/src/HLTJetMETValidation.cc
@@ -1,8 +1,8 @@
 // Migrated to use DQMEDAnalyzer by: Jyothsna Rani Komaragiri, Oct 2014
 
+#include "FWCore/Common/interface/TriggerNames.h"
 #include "HLTriggerOffline/JetMET/interface/HLTJetMETValidation.h"
 #include "Math/GenVector/VectorUtil.h"
-#include "FWCore/Common/interface/TriggerNames.h"
 
 using namespace std;
 using namespace edm;
@@ -10,55 +10,51 @@ using namespace reco;
 using namespace l1extra;
 using namespace trigger;
 
-
-HLTJetMETValidation::HLTJetMETValidation(const edm::ParameterSet& ps) : 
-  triggerEventObject_(consumes<TriggerEventWithRefs>(ps.getUntrackedParameter<edm::InputTag>("triggerEventObject"))),
-  PFJetAlgorithm( consumes<PFJetCollection>(ps.getUntrackedParameter<edm::InputTag>( "PFJetAlgorithm" ) )),
-  GenJetAlgorithm( consumes<GenJetCollection>(ps.getUntrackedParameter<edm::InputTag>( "GenJetAlgorithm" ) )),
-  CaloMETColl( consumes<CaloMETCollection>(ps.getUntrackedParameter<edm::InputTag>( "CaloMETCollection" ) )),
-  GenMETColl( consumes<GenMETCollection>(ps.getUntrackedParameter<edm::InputTag>( "GenMETCollection" ) )),
-  HLTriggerResults(consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>( "HLTriggerResults" ) )),
-  triggerTag_(ps.getUntrackedParameter<std::string>("DQMFolder","SingleJet")),
-  patternJetTrg_(ps.getUntrackedParameter<std::string>("PatternJetTrg","")),
-  patternMetTrg_(ps.getUntrackedParameter<std::string>("PatternMetTrg","")),
-  patternMuTrg_(ps.getUntrackedParameter<std::string>("PatternMuTrg","")),
-  HLTinit_(false)
-{
-  evtCnt=0;
+HLTJetMETValidation::HLTJetMETValidation(const edm::ParameterSet &ps)
+    : triggerEventObject_(
+          consumes<TriggerEventWithRefs>(ps.getUntrackedParameter<edm::InputTag>("triggerEventObject"))),
+      PFJetAlgorithm(consumes<PFJetCollection>(ps.getUntrackedParameter<edm::InputTag>("PFJetAlgorithm"))),
+      GenJetAlgorithm(consumes<GenJetCollection>(ps.getUntrackedParameter<edm::InputTag>("GenJetAlgorithm"))),
+      CaloMETColl(consumes<CaloMETCollection>(ps.getUntrackedParameter<edm::InputTag>("CaloMETCollection"))),
+      GenMETColl(consumes<GenMETCollection>(ps.getUntrackedParameter<edm::InputTag>("GenMETCollection"))),
+      HLTriggerResults(consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>("HLTriggerResults"))),
+      triggerTag_(ps.getUntrackedParameter<std::string>("DQMFolder", "SingleJet")),
+      patternJetTrg_(ps.getUntrackedParameter<std::string>("PatternJetTrg", "")),
+      patternMetTrg_(ps.getUntrackedParameter<std::string>("PatternMetTrg", "")),
+      patternMuTrg_(ps.getUntrackedParameter<std::string>("PatternMuTrg", "")),
+      HLTinit_(false) {
+  evtCnt = 0;
 }
 
-HLTJetMETValidation::~HLTJetMETValidation()
-{
-}
+HLTJetMETValidation::~HLTJetMETValidation() {}
 
 //
 // member functions
 //
 
 // ------------ method called when starting to processes a run ------------
-void
-HLTJetMETValidation::dqmBeginRun(edm::Run const& iRun, edm::EventSetup const& iSetup) {
-
+void HLTJetMETValidation::dqmBeginRun(edm::Run const &iRun, edm::EventSetup const &iSetup) {
   bool foundMuTrg = false;
   std::string trgMuNm;
   bool changedConfig = true;
-  
+
   //--define search patterns
   TPRegexp patternJet(patternJetTrg_);
   TPRegexp patternMet(patternMetTrg_);
   TPRegexp patternMu(patternMuTrg_);
 
   if (!hltConfig_.init(iRun, iSetup, "HLT", changedConfig)) {
-    edm::LogError("HLTJetMETValidation") << "Initialization of HLTConfigProvider failed!!"; 
+    edm::LogError("HLTJetMETValidation") << "Initialization of HLTConfigProvider failed!!";
     return;
   }
-  
+
   std::vector<std::string> validTriggerNames = hltConfig_.triggerNames();
   for (size_t j = 0; j < validTriggerNames.size(); j++) {
     //---find the muon path
     if (TString(validTriggerNames[j]).Contains(patternMu)) {
-      //std::cout <<validTriggerNames[j].c_str()<<std::endl;
-      if (!foundMuTrg) trgMuNm = validTriggerNames[j];
+      // std::cout <<validTriggerNames[j].c_str()<<std::endl;
+      if (!foundMuTrg)
+        trgMuNm = validTriggerNames[j];
       foundMuTrg = true;
     }
     //---find the jet paths
@@ -70,276 +66,330 @@ HLTJetMETValidation::dqmBeginRun(edm::Run const& iRun, edm::EventSetup const& iS
       hltTrgMet.push_back(validTriggerNames[j]);
     }
   }
-  
+
   //----set the denominator paths
-  for (size_t it=0;it<hltTrgJet.size();it++) {
-    if (it==0 && foundMuTrg) hltTrgJetLow.push_back(trgMuNm);//--lowest threshold uses muon path
-    if (it==0 && !foundMuTrg) hltTrgJetLow.push_back(hltTrgJet[it]);//---if no muon then itself
-    if (it!=0) hltTrgJetLow.push_back(hltTrgJet[it-1]);
-    //std::cout<<hltTrgJet[it].c_str()<<" "<<hltTrgJetLow[it].c_str()<<std::endl;
+  for (size_t it = 0; it < hltTrgJet.size(); it++) {
+    if (it == 0 && foundMuTrg)
+      hltTrgJetLow.push_back(trgMuNm);  //--lowest threshold uses muon path
+    if (it == 0 && !foundMuTrg)
+      hltTrgJetLow.push_back(hltTrgJet[it]);  //---if no muon then itself
+    if (it != 0)
+      hltTrgJetLow.push_back(hltTrgJet[it - 1]);
+    // std::cout<<hltTrgJet[it].c_str()<<"
+    // "<<hltTrgJetLow[it].c_str()<<std::endl;
   }
   int itm(0), itpm(0), itmh(0), itpmh(0);
-  for (size_t it=0;it<hltTrgMet.size();it++) {
+  for (size_t it = 0; it < hltTrgMet.size(); it++) {
     if (TString(hltTrgMet[it]).Contains("PF")) {
       if (TString(hltTrgMet[it]).Contains("MHT")) {
-	if( 0 == itpmh ) {
-	  if( foundMuTrg ) hltTrgMetLow.push_back(trgMuNm);
-	  else hltTrgMetLow.push_back(hltTrgMet[it]);
-	}
-	else hltTrgMetLow.push_back(hltTrgMet[it-1]);
-	itpmh++;
+        if (0 == itpmh) {
+          if (foundMuTrg)
+            hltTrgMetLow.push_back(trgMuNm);
+          else
+            hltTrgMetLow.push_back(hltTrgMet[it]);
+        } else
+          hltTrgMetLow.push_back(hltTrgMet[it - 1]);
+        itpmh++;
       }
       if (TString(hltTrgMet[it]).Contains("MET")) {
-	if( 0 == itpm ) {
-	  if( foundMuTrg ) hltTrgMetLow.push_back(trgMuNm);
-	  else hltTrgMetLow.push_back(hltTrgMet[it]);
-	}
-	else hltTrgMetLow.push_back(hltTrgMet[it-1]);
-	itpm++;
+        if (0 == itpm) {
+          if (foundMuTrg)
+            hltTrgMetLow.push_back(trgMuNm);
+          else
+            hltTrgMetLow.push_back(hltTrgMet[it]);
+        } else
+          hltTrgMetLow.push_back(hltTrgMet[it - 1]);
+        itpm++;
       }
-    }
-    else {
+    } else {
       if (TString(hltTrgMet[it]).Contains("MHT")) {
-	if( 0 == itmh ) {
-	  if( foundMuTrg ) hltTrgMetLow.push_back(trgMuNm);
-	  else hltTrgMetLow.push_back(hltTrgMet[it]);
-	}
-	else hltTrgMetLow.push_back(hltTrgMet[it-1]);
-	itmh++;
+        if (0 == itmh) {
+          if (foundMuTrg)
+            hltTrgMetLow.push_back(trgMuNm);
+          else
+            hltTrgMetLow.push_back(hltTrgMet[it]);
+        } else
+          hltTrgMetLow.push_back(hltTrgMet[it - 1]);
+        itmh++;
       }
       if (TString(hltTrgMet[it]).Contains("MET")) {
-	if( 0 == itm ) {
-	  if( foundMuTrg ) hltTrgMetLow.push_back(trgMuNm);
-	  else hltTrgMetLow.push_back(hltTrgMet[it]);
-	}
-	else hltTrgMetLow.push_back(hltTrgMet[it-1]);
-	itm++;
+        if (0 == itm) {
+          if (foundMuTrg)
+            hltTrgMetLow.push_back(trgMuNm);
+          else
+            hltTrgMetLow.push_back(hltTrgMet[it]);
+        } else
+          hltTrgMetLow.push_back(hltTrgMet[it - 1]);
+        itm++;
       }
     }
-    //std::cout<<hltTrgMet[it].c_str()<<" "<<hltTrgMetLow[it].c_str()<<std::endl;
+    // std::cout<<hltTrgMet[it].c_str()<<"
+    // "<<hltTrgMetLow[it].c_str()<<std::endl;
   }
-
 }
 
-// ------------ method called to book histograms before starting event loop ------------
-void 
-HLTJetMETValidation::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const & iRun, edm::EventSetup const & iSetup)
-{
-
+// ------------ method called to book histograms before starting event loop
+// ------------
+void HLTJetMETValidation::bookHistograms(DQMStore::IBooker &iBooker,
+                                         edm::Run const &iRun,
+                                         edm::EventSetup const &iSetup) {
   //----define DQM folders and elements
-  for (size_t it=0;it<hltTrgJet.size();it++) {
-    //std::cout<<hltTrgJet[it].c_str()<<" "<<hltTrgJetLow[it].c_str()<<std::endl;
-    std::string trgPathName = HLTConfigProvider::removeVersion(triggerTag_+hltTrgJet[it]);
-    //std::cout << "str = " << triggerTag_+hltTrgJet[it].c_str() << std::endl;
-    //std::cout << "trgPathName = " << trgPathName << std::endl;
+  for (size_t it = 0; it < hltTrgJet.size(); it++) {
+    // std::cout<<hltTrgJet[it].c_str()<<"
+    // "<<hltTrgJetLow[it].c_str()<<std::endl;
+    std::string trgPathName = HLTConfigProvider::removeVersion(triggerTag_ + hltTrgJet[it]);
+    // std::cout << "str = " << triggerTag_+hltTrgJet[it].c_str() << std::endl;
+    // std::cout << "trgPathName = " << trgPathName << std::endl;
     iBooker.setCurrentFolder(trgPathName);
-    _meHLTJetPt.push_back(iBooker.book1D("_meHLTJetPt","Single HLT Jet Pt",100,0,500));
-    _meHLTJetPtTrgMC.push_back(iBooker.book1D("_meHLTJetPtTrgMC","Single HLT Jet Pt - HLT Triggered",100,0,500));
-    _meHLTJetPtTrg.push_back(iBooker.book1D("_meHLTJetPtTrg","Single HLT Jet Pt - HLT Triggered",100,0,500));
-    _meHLTJetPtTrgLow.push_back(iBooker.book1D("_meHLTJetPtTrgLow","Single HLT Jet Pt - HLT Triggered Low",100,0,500));
-    
-    _meHLTJetEta.push_back(iBooker.book1D("_meHLTJetEta","Single HLT Jet Eta",100,-10,10));
-    _meHLTJetEtaTrgMC.push_back(iBooker.book1D("_meHLTJetEtaTrgMC","Single HLT Jet Eta - HLT Triggered",100,-10,10));
-    _meHLTJetEtaTrg.push_back(iBooker.book1D("_meHLTJetEtaTrg","Single HLT Jet Eta - HLT Triggered",100,-10,10));
-    _meHLTJetEtaTrgLow.push_back(iBooker.book1D("_meHLTJetEtaTrgLow","Single HLT Jet Eta - HLT Triggered Low",100,-10,10));
-    
-    _meHLTJetPhi.push_back(iBooker.book1D("_meHLTJetPhi","Single HLT Jet Phi",100,-4.,4.));
-    _meHLTJetPhiTrgMC.push_back(iBooker.book1D("_meHLTJetPhiTrgMC","Single HLT Jet Phi - HLT Triggered",100,-4.,4.));
-    _meHLTJetPhiTrg.push_back(iBooker.book1D("_meHLTJetPhiTrg","Single HLT Jet Phi - HLT Triggered",100,-4.,4.));
-    _meHLTJetPhiTrgLow.push_back(iBooker.book1D("_meHLTJetPhiTrgLow","Single HLT Jet Phi - HLT Triggered Low",100,-4.,4.));
-    
-    _meGenJetPt.push_back(iBooker.book1D("_meGenJetPt","Single Generated Jet Pt",100,0,500));
-    _meGenJetPtTrgMC.push_back(iBooker.book1D("_meGenJetPtTrgMC","Single Generated Jet Pt - HLT Triggered",100,0,500));
-    _meGenJetPtTrg.push_back(iBooker.book1D("_meGenJetPtTrg","Single Generated Jet Pt - HLT Triggered",100,0,500));
-    _meGenJetPtTrgLow.push_back(iBooker.book1D("_meGenJetPtTrgLow","Single Generated Jet Pt - HLT Triggered Low",100,0,500));
-    
-    _meGenJetEta.push_back(iBooker.book1D("_meGenJetEta","Single Generated Jet Eta",100,-10,10));
-    _meGenJetEtaTrgMC.push_back(iBooker.book1D("_meGenJetEtaTrgMC","Single Generated Jet Eta - HLT Triggered",100,-10,10));
-    _meGenJetEtaTrg.push_back(iBooker.book1D("_meGenJetEtaTrg","Single Generated Jet Eta - HLT Triggered",100,-10,10));
-    _meGenJetEtaTrgLow.push_back(iBooker.book1D("_meGenJetEtaTrgLow","Single Generated Jet Eta - HLT Triggered Low",100,-10,10));
-    
-    _meGenJetPhi.push_back(iBooker.book1D("_meGenJetPhi","Single Generated Jet Phi",100,-4.,4.));
-    _meGenJetPhiTrgMC.push_back(iBooker.book1D("_meGenJetPhiTrgMC","Single Generated Jet Phi - HLT Triggered",100,-4.,4.));
-    _meGenJetPhiTrg.push_back(iBooker.book1D("_meGenJetPhiTrg","Single Generated Jet Phi - HLT Triggered",100,-4.,4.));
-    _meGenJetPhiTrgLow.push_back(iBooker.book1D("_meGenJetPhiTrgLow","Single Generated Jet Phi - HLT Triggered Low",100,-4.,4.));
-    
+    _meHLTJetPt.push_back(iBooker.book1D("_meHLTJetPt", "Single HLT Jet Pt", 100, 0, 500));
+    _meHLTJetPtTrgMC.push_back(iBooker.book1D("_meHLTJetPtTrgMC", "Single HLT Jet Pt - HLT Triggered", 100, 0, 500));
+    _meHLTJetPtTrg.push_back(iBooker.book1D("_meHLTJetPtTrg", "Single HLT Jet Pt - HLT Triggered", 100, 0, 500));
+    _meHLTJetPtTrgLow.push_back(
+        iBooker.book1D("_meHLTJetPtTrgLow", "Single HLT Jet Pt - HLT Triggered Low", 100, 0, 500));
+
+    _meHLTJetEta.push_back(iBooker.book1D("_meHLTJetEta", "Single HLT Jet Eta", 100, -10, 10));
+    _meHLTJetEtaTrgMC.push_back(
+        iBooker.book1D("_meHLTJetEtaTrgMC", "Single HLT Jet Eta - HLT Triggered", 100, -10, 10));
+    _meHLTJetEtaTrg.push_back(iBooker.book1D("_meHLTJetEtaTrg", "Single HLT Jet Eta - HLT Triggered", 100, -10, 10));
+    _meHLTJetEtaTrgLow.push_back(
+        iBooker.book1D("_meHLTJetEtaTrgLow", "Single HLT Jet Eta - HLT Triggered Low", 100, -10, 10));
+
+    _meHLTJetPhi.push_back(iBooker.book1D("_meHLTJetPhi", "Single HLT Jet Phi", 100, -4., 4.));
+    _meHLTJetPhiTrgMC.push_back(
+        iBooker.book1D("_meHLTJetPhiTrgMC", "Single HLT Jet Phi - HLT Triggered", 100, -4., 4.));
+    _meHLTJetPhiTrg.push_back(iBooker.book1D("_meHLTJetPhiTrg", "Single HLT Jet Phi - HLT Triggered", 100, -4., 4.));
+    _meHLTJetPhiTrgLow.push_back(
+        iBooker.book1D("_meHLTJetPhiTrgLow", "Single HLT Jet Phi - HLT Triggered Low", 100, -4., 4.));
+
+    _meGenJetPt.push_back(iBooker.book1D("_meGenJetPt", "Single Generated Jet Pt", 100, 0, 500));
+    _meGenJetPtTrgMC.push_back(
+        iBooker.book1D("_meGenJetPtTrgMC", "Single Generated Jet Pt - HLT Triggered", 100, 0, 500));
+    _meGenJetPtTrg.push_back(iBooker.book1D("_meGenJetPtTrg", "Single Generated Jet Pt - HLT Triggered", 100, 0, 500));
+    _meGenJetPtTrgLow.push_back(
+        iBooker.book1D("_meGenJetPtTrgLow", "Single Generated Jet Pt - HLT Triggered Low", 100, 0, 500));
+
+    _meGenJetEta.push_back(iBooker.book1D("_meGenJetEta", "Single Generated Jet Eta", 100, -10, 10));
+    _meGenJetEtaTrgMC.push_back(
+        iBooker.book1D("_meGenJetEtaTrgMC", "Single Generated Jet Eta - HLT Triggered", 100, -10, 10));
+    _meGenJetEtaTrg.push_back(
+        iBooker.book1D("_meGenJetEtaTrg", "Single Generated Jet Eta - HLT Triggered", 100, -10, 10));
+    _meGenJetEtaTrgLow.push_back(
+        iBooker.book1D("_meGenJetEtaTrgLow", "Single Generated Jet Eta - HLT Triggered Low", 100, -10, 10));
+
+    _meGenJetPhi.push_back(iBooker.book1D("_meGenJetPhi", "Single Generated Jet Phi", 100, -4., 4.));
+    _meGenJetPhiTrgMC.push_back(
+        iBooker.book1D("_meGenJetPhiTrgMC", "Single Generated Jet Phi - HLT Triggered", 100, -4., 4.));
+    _meGenJetPhiTrg.push_back(
+        iBooker.book1D("_meGenJetPhiTrg", "Single Generated Jet Phi - HLT Triggered", 100, -4., 4.));
+    _meGenJetPhiTrgLow.push_back(
+        iBooker.book1D("_meGenJetPhiTrgLow", "Single Generated Jet Phi - HLT Triggered Low", 100, -4., 4.));
   }
-  for (size_t it=0;it<hltTrgMet.size();it++) {
-    //std::cout<<hltTrgMet[it].c_str()<<" "<<hltTrgMetLow[it].c_str()<<std::endl;
-    std::string trgPathName = HLTConfigProvider::removeVersion(triggerTag_+hltTrgMet[it]);
+  for (size_t it = 0; it < hltTrgMet.size(); it++) {
+    // std::cout<<hltTrgMet[it].c_str()<<"
+    // "<<hltTrgMetLow[it].c_str()<<std::endl;
+    std::string trgPathName = HLTConfigProvider::removeVersion(triggerTag_ + hltTrgMet[it]);
     iBooker.setCurrentFolder(trgPathName);
-    _meHLTMET.push_back(iBooker.book1D("_meHLTMET","HLT Missing ET",100,0,500));
-    _meHLTMETTrgMC.push_back(iBooker.book1D("_meHLTMETTrgMC","HLT Missing ET - HLT Triggered",100,0,500));
-    _meHLTMETTrg.push_back(iBooker.book1D("_meHLTMETTrg","HLT Missing ET - HLT Triggered",100,0,500));
-    _meHLTMETTrgLow.push_back(iBooker.book1D("_meHLTMETTrgLow","HLT Missing ET - HLT Triggered Low",100,0,500));
-    
-    _meGenMET.push_back(iBooker.book1D("_meGenMET","Generated Missing ET",100,0,500));
-    _meGenMETTrgMC.push_back(iBooker.book1D("_meGenMETTrgMC","Generated Missing ET - HLT Triggered",100,0,500));
-    _meGenMETTrg.push_back(iBooker.book1D("_meGenMETTrg","Generated Missing ET - HLT Triggered",100,0,500));
-    _meGenMETTrgLow.push_back(iBooker.book1D("_meGenMETTrgLow","Generated Missing ET - HLT Triggered Low",100,0,500));
-  }
+    _meHLTMET.push_back(iBooker.book1D("_meHLTMET", "HLT Missing ET", 100, 0, 500));
+    _meHLTMETTrgMC.push_back(iBooker.book1D("_meHLTMETTrgMC", "HLT Missing ET - HLT Triggered", 100, 0, 500));
+    _meHLTMETTrg.push_back(iBooker.book1D("_meHLTMETTrg", "HLT Missing ET - HLT Triggered", 100, 0, 500));
+    _meHLTMETTrgLow.push_back(iBooker.book1D("_meHLTMETTrgLow", "HLT Missing ET - HLT Triggered Low", 100, 0, 500));
 
+    _meGenMET.push_back(iBooker.book1D("_meGenMET", "Generated Missing ET", 100, 0, 500));
+    _meGenMETTrgMC.push_back(iBooker.book1D("_meGenMETTrgMC", "Generated Missing ET - HLT Triggered", 100, 0, 500));
+    _meGenMETTrg.push_back(iBooker.book1D("_meGenMETTrg", "Generated Missing ET - HLT Triggered", 100, 0, 500));
+    _meGenMETTrgLow.push_back(
+        iBooker.book1D("_meGenMETTrgLow", "Generated Missing ET - HLT Triggered Low", 100, 0, 500));
+  }
 }
 
 // ------------ method called for each event ------------
-void
-HLTJetMETValidation::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void HLTJetMETValidation::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace std;
   using namespace edm;
   using namespace reco;
   using namespace l1extra;
   using namespace trigger;
-  
+
   evtCnt++;
 
-  //get The triggerEvent
+  // get The triggerEvent
   Handle<TriggerEventWithRefs> trigEv;
-  iEvent.getByToken(triggerEventObject_,trigEv);
+  iEvent.getByToken(triggerEventObject_, trigEv);
 
-  //get TriggerResults object
-  bool gotHLT=true;
+  // get TriggerResults object
+  bool gotHLT = true;
   std::vector<bool> myTrigJ;
-  for (size_t it=0;it<hltTrgJet.size();it++) myTrigJ.push_back(false);
+  for (size_t it = 0; it < hltTrgJet.size(); it++)
+    myTrigJ.push_back(false);
   std::vector<bool> myTrigJLow;
-  for (size_t it=0;it<hltTrgJetLow.size();it++) myTrigJLow.push_back(false);
+  for (size_t it = 0; it < hltTrgJetLow.size(); it++)
+    myTrigJLow.push_back(false);
   std::vector<bool> myTrigM;
-  for (size_t it=0;it<hltTrgMet.size();it++) myTrigM.push_back(false);
+  for (size_t it = 0; it < hltTrgMet.size(); it++)
+    myTrigM.push_back(false);
   std::vector<bool> myTrigMLow;
-  for (size_t it=0;it<hltTrgMetLow.size();it++) myTrigMLow.push_back(false);
-
+  for (size_t it = 0; it < hltTrgMetLow.size(); it++)
+    myTrigMLow.push_back(false);
 
   Handle<TriggerResults> hltresults;
-  iEvent.getByToken(HLTriggerResults,hltresults);
-  if (! hltresults.isValid() ) { 
-    //if (evtCnt==1) edm::LogWarning("HLTJetMETValidation") << "  -- No HLTRESULTS";    
-    gotHLT=false;
+  iEvent.getByToken(HLTriggerResults, hltresults);
+  if (!hltresults.isValid()) {
+    // if (evtCnt==1) edm::LogWarning("HLTJetMETValidation") << "  -- No
+    // HLTRESULTS";
+    gotHLT = false;
   }
 
   if (gotHLT) {
-    const edm::TriggerNames & triggerNames = iEvent.triggerNames(*hltresults);
+    const edm::TriggerNames &triggerNames = iEvent.triggerNames(*hltresults);
     getHLTResults(*hltresults, triggerNames);
 
     //---pick-up the jet trigger decisions
-    for (size_t it=0;it<hltTrgJet.size();it++) {
-      trig_iter=hltTriggerMap.find(hltTrgJet[it]);
-      if (trig_iter==hltTriggerMap.end()){
-	//std::cout << "Could not find trigger path with name: " << _probefilter.label() << std::endl;
-	//if (evtCnt==1) edm::LogWarning("HLTJetMETValidation") << "Could not find trigger path with name: " << _probefilter.label(); 
-      }else{
-	myTrigJ[it]=trig_iter->second;
+    for (size_t it = 0; it < hltTrgJet.size(); it++) {
+      trig_iter = hltTriggerMap.find(hltTrgJet[it]);
+      if (trig_iter == hltTriggerMap.end()) {
+        // std::cout << "Could not find trigger path with name: " <<
+        // _probefilter.label() << std::endl; if (evtCnt==1)
+        // edm::LogWarning("HLTJetMETValidation") << "Could not find trigger
+        // path with name: " << _probefilter.label();
+      } else {
+        myTrigJ[it] = trig_iter->second;
       }
-      //std::cout<<hltTrgJet[it].c_str()<<" "<<myTrigJ[it]<<std::endl;
+      // std::cout<<hltTrgJet[it].c_str()<<" "<<myTrigJ[it]<<std::endl;
     }
-    for (size_t it=0;it<hltTrgJetLow.size();it++) {
-      trig_iter=hltTriggerMap.find(hltTrgJetLow[it]);
-      if (trig_iter==hltTriggerMap.end()){
-	//std::cout << "Could not find trigger path with name: " << _probefilter.label() << std::endl;
-	//if (evtCnt==1) edm::LogWarning("HLTJetMETValidation") << "Could not find trigger path with name: " << _probefilter.label(); 
-      }else{
-	myTrigJLow[it]=trig_iter->second;
+    for (size_t it = 0; it < hltTrgJetLow.size(); it++) {
+      trig_iter = hltTriggerMap.find(hltTrgJetLow[it]);
+      if (trig_iter == hltTriggerMap.end()) {
+        // std::cout << "Could not find trigger path with name: " <<
+        // _probefilter.label() << std::endl; if (evtCnt==1)
+        // edm::LogWarning("HLTJetMETValidation") << "Could not find trigger
+        // path with name: " << _probefilter.label();
+      } else {
+        myTrigJLow[it] = trig_iter->second;
       }
-      //std::cout<<hltTrgJetLow[it].c_str()<<" "<<myTrigJLow[it]<<std::endl;
+      // std::cout<<hltTrgJetLow[it].c_str()<<" "<<myTrigJLow[it]<<std::endl;
     }
     //---pick-up the met trigger decisions
-    for (size_t it=0;it<hltTrgMet.size();it++) {
-      trig_iter=hltTriggerMap.find(hltTrgMet[it]);
-      if (trig_iter==hltTriggerMap.end()){
-	//std::cout << "Could not find trigger path with name: " << _probefilter.label() << std::endl;
-	//if (evtCnt==1) edm::LogWarning("HLTJetMETValidation") << "Could not find trigger path with name: " << _probefilter.label(); 
-      }else{
-	myTrigM[it]=trig_iter->second;
+    for (size_t it = 0; it < hltTrgMet.size(); it++) {
+      trig_iter = hltTriggerMap.find(hltTrgMet[it]);
+      if (trig_iter == hltTriggerMap.end()) {
+        // std::cout << "Could not find trigger path with name: " <<
+        // _probefilter.label() << std::endl; if (evtCnt==1)
+        // edm::LogWarning("HLTJetMETValidation") << "Could not find trigger
+        // path with name: " << _probefilter.label();
+      } else {
+        myTrigM[it] = trig_iter->second;
       }
-      //std::cout<<hltTrgMet[it].c_str()<<" "<<myTrigM[it]<<std::endl;
+      // std::cout<<hltTrgMet[it].c_str()<<" "<<myTrigM[it]<<std::endl;
     }
-    for (size_t it=0;it<hltTrgMetLow.size();it++) {
-      trig_iter=hltTriggerMap.find(hltTrgMetLow[it]);
-      if (trig_iter==hltTriggerMap.end()){
-	//std::cout << "Could not find trigger path with name: " << _probefilter.label() << std::endl;
-	//if (evtCnt==1) edm::LogWarning("HLTJetMETValidation") << "Could not find trigger path with name: " << _probefilter.label(); 
-      }else{
-	myTrigMLow[it]=trig_iter->second;
+    for (size_t it = 0; it < hltTrgMetLow.size(); it++) {
+      trig_iter = hltTriggerMap.find(hltTrgMetLow[it]);
+      if (trig_iter == hltTriggerMap.end()) {
+        // std::cout << "Could not find trigger path with name: " <<
+        // _probefilter.label() << std::endl; if (evtCnt==1)
+        // edm::LogWarning("HLTJetMETValidation") << "Could not find trigger
+        // path with name: " << _probefilter.label();
+      } else {
+        myTrigMLow[it] = trig_iter->second;
       }
-      //std::cout<<hltTrgMetLow[it].c_str()<<" "<<myTrigMLow[it]<<std::endl;
+      // std::cout<<hltTrgMetLow[it].c_str()<<" "<<myTrigMLow[it]<<std::endl;
     }
   }
 
   // --- Fill histos for PFJet paths ---
   // HLT jets namely hltAK4PFJets
   Handle<PFJetCollection> pfJets;
-  iEvent.getByToken( PFJetAlgorithm, pfJets );
-  double pfJetPt=-1.;
-  double pfJetEta=-999.;
-  double pfJetPhi=-999.;
+  iEvent.getByToken(PFJetAlgorithm, pfJets);
+  double pfJetPt = -1.;
+  double pfJetEta = -999.;
+  double pfJetPhi = -999.;
 
-  if (pfJets.isValid()) { 
-    //Loop over the PFJets and fill some histograms
+  if (pfJets.isValid()) {
+    // Loop over the PFJets and fill some histograms
     int jetInd = 0;
-    for( PFJetCollection::const_iterator pf = pfJets->begin(); pf != pfJets->end(); ++ pf ) {
-      //std::cout << "PF JET #" << jetInd << std::endl << pf->print() << std::endl;
-      if (jetInd == 0){
-	pfJetPt=pf->pt();
-	pfJetEta=pf->eta();
-	pfJetPhi=pf->phi();
-	for (size_t it=0;it<hltTrgJet.size();it++) {
-	  _meHLTJetPt[it]->Fill( pfJetPt );
-	  _meHLTJetEta[it]->Fill( pfJetEta );
-	  _meHLTJetPhi[it]->Fill( pfJetPhi );
-	  if (myTrigJ[it]) _meHLTJetPtTrgMC[it]->Fill( pfJetPt );
-	  if (myTrigJ[it]) _meHLTJetEtaTrgMC[it]->Fill( pfJetEta );
-	  if (myTrigJ[it]) _meHLTJetPhiTrgMC[it]->Fill( pfJetPhi );
-	  if (myTrigJ[it] && myTrigJLow[it]) _meHLTJetPtTrg[it]->Fill( pfJetPt );
-	  if (myTrigJ[it] && myTrigJLow[it]) _meHLTJetEtaTrg[it]->Fill( pfJetEta );
-	  if (myTrigJ[it] && myTrigJLow[it]) _meHLTJetPhiTrg[it]->Fill( pfJetPhi );
-	  if (myTrigJLow[it]) _meHLTJetPtTrgLow[it]->Fill( pfJetPt );
-	  if (myTrigJLow[it]) _meHLTJetEtaTrgLow[it]->Fill( pfJetEta );
-	  if (myTrigJLow[it]) _meHLTJetPhiTrgLow[it]->Fill( pfJetPhi );
-	}
-	jetInd++;
+    for (PFJetCollection::const_iterator pf = pfJets->begin(); pf != pfJets->end(); ++pf) {
+      // std::cout << "PF JET #" << jetInd << std::endl << pf->print() <<
+      // std::endl;
+      if (jetInd == 0) {
+        pfJetPt = pf->pt();
+        pfJetEta = pf->eta();
+        pfJetPhi = pf->phi();
+        for (size_t it = 0; it < hltTrgJet.size(); it++) {
+          _meHLTJetPt[it]->Fill(pfJetPt);
+          _meHLTJetEta[it]->Fill(pfJetEta);
+          _meHLTJetPhi[it]->Fill(pfJetPhi);
+          if (myTrigJ[it])
+            _meHLTJetPtTrgMC[it]->Fill(pfJetPt);
+          if (myTrigJ[it])
+            _meHLTJetEtaTrgMC[it]->Fill(pfJetEta);
+          if (myTrigJ[it])
+            _meHLTJetPhiTrgMC[it]->Fill(pfJetPhi);
+          if (myTrigJ[it] && myTrigJLow[it])
+            _meHLTJetPtTrg[it]->Fill(pfJetPt);
+          if (myTrigJ[it] && myTrigJLow[it])
+            _meHLTJetEtaTrg[it]->Fill(pfJetEta);
+          if (myTrigJ[it] && myTrigJLow[it])
+            _meHLTJetPhiTrg[it]->Fill(pfJetPhi);
+          if (myTrigJLow[it])
+            _meHLTJetPtTrgLow[it]->Fill(pfJetPt);
+          if (myTrigJLow[it])
+            _meHLTJetEtaTrgLow[it]->Fill(pfJetEta);
+          if (myTrigJLow[it])
+            _meHLTJetPhiTrgLow[it]->Fill(pfJetPhi);
+        }
+        jetInd++;
       }
-    }//loop over pfjets
-  } 
-  else{
-    //std::cout << "  -- No PFJets" << std::endl;
-    //if (evtCnt==1) edm::LogWarning("HLTJetMETValidation") << "  -- No PFJets"; 
+    }  // loop over pfjets
+  } else {
+    // std::cout << "  -- No PFJets" << std::endl;
+    // if (evtCnt==1) edm::LogWarning("HLTJetMETValidation") << "  -- No
+    // PFJets";
   }
 
-  //GenJets
+  // GenJets
   Handle<GenJetCollection> genJets;
-  iEvent.getByToken( GenJetAlgorithm, genJets );
-  double genJetPt=-1.;
-  double genJetEta=-999.;
-  double genJetPhi=-999.;
+  iEvent.getByToken(GenJetAlgorithm, genJets);
+  double genJetPt = -1.;
+  double genJetEta = -999.;
+  double genJetPhi = -999.;
 
-  if (genJets.isValid()) { 
-    //Loop over the GenJets and fill some histograms
+  if (genJets.isValid()) {
+    // Loop over the GenJets and fill some histograms
     int jetInd = 0;
-    for( GenJetCollection::const_iterator gen = genJets->begin(); gen != genJets->end(); ++ gen ) {
-      if (jetInd == 0){
-	genJetPt=gen->pt();
-	genJetEta=gen->eta();
-	genJetPhi=gen->phi();
-	for (size_t it=0;it<hltTrgJet.size();it++) {
-	  _meGenJetPt[it]->Fill( genJetPt );
-	  _meGenJetEta[it]->Fill( genJetEta );
-	  _meGenJetPhi[it]->Fill( genJetPhi );
-	  if (myTrigJ[it]) _meGenJetPtTrgMC[it]->Fill( genJetPt );
-	  if (myTrigJ[it]) _meGenJetEtaTrgMC[it]->Fill( genJetEta );
-	  if (myTrigJ[it]) _meGenJetPhiTrgMC[it]->Fill( genJetPhi );
-	  if (myTrigJ[it] && myTrigJLow[it]) _meGenJetPtTrg[it]->Fill( genJetPt );
-	  if (myTrigJ[it] && myTrigJLow[it]) _meGenJetEtaTrg[it]->Fill( genJetEta );
-	  if (myTrigJ[it] && myTrigJLow[it]) _meGenJetPhiTrg[it]->Fill( genJetPhi );
-	  if (myTrigJLow[it]) _meGenJetPtTrgLow[it]->Fill( genJetPt );
-	  if (myTrigJLow[it]) _meGenJetEtaTrgLow[it]->Fill( genJetEta );
-	  if (myTrigJLow[it]) _meGenJetPhiTrgLow[it]->Fill( genJetPhi );
-	}
-	jetInd++;
+    for (GenJetCollection::const_iterator gen = genJets->begin(); gen != genJets->end(); ++gen) {
+      if (jetInd == 0) {
+        genJetPt = gen->pt();
+        genJetEta = gen->eta();
+        genJetPhi = gen->phi();
+        for (size_t it = 0; it < hltTrgJet.size(); it++) {
+          _meGenJetPt[it]->Fill(genJetPt);
+          _meGenJetEta[it]->Fill(genJetEta);
+          _meGenJetPhi[it]->Fill(genJetPhi);
+          if (myTrigJ[it])
+            _meGenJetPtTrgMC[it]->Fill(genJetPt);
+          if (myTrigJ[it])
+            _meGenJetEtaTrgMC[it]->Fill(genJetEta);
+          if (myTrigJ[it])
+            _meGenJetPhiTrgMC[it]->Fill(genJetPhi);
+          if (myTrigJ[it] && myTrigJLow[it])
+            _meGenJetPtTrg[it]->Fill(genJetPt);
+          if (myTrigJ[it] && myTrigJLow[it])
+            _meGenJetEtaTrg[it]->Fill(genJetEta);
+          if (myTrigJ[it] && myTrigJLow[it])
+            _meGenJetPhiTrg[it]->Fill(genJetPhi);
+          if (myTrigJLow[it])
+            _meGenJetPtTrgLow[it]->Fill(genJetPt);
+          if (myTrigJLow[it])
+            _meGenJetEtaTrgLow[it]->Fill(genJetEta);
+          if (myTrigJLow[it])
+            _meGenJetPhiTrgLow[it]->Fill(genJetPhi);
+        }
+        jetInd++;
       }
     }
-  } 
-  else{
-    //std::cout << "  -- No GenJets" << std::endl;
-    //if (evtCnt==1) edm::LogWarning("HLTJetMETValidation") << "  -- No GenJets"; 
+  } else {
+    // std::cout << "  -- No GenJets" << std::endl;
+    // if (evtCnt==1) edm::LogWarning("HLTJetMETValidation") << "  -- No
+    // GenJets";
   }
 
   // --- Fill histos for PFMET paths ---
@@ -347,72 +397,75 @@ HLTJetMETValidation::analyze(const edm::Event& iEvent, const edm::EventSetup& iS
   edm::Handle<CaloMETCollection> recmet;
   iEvent.getByToken(CaloMETColl, recmet);
 
-  double calMet=-1;
-  if (recmet.isValid()) { 
+  double calMet = -1;
+  if (recmet.isValid()) {
     typedef CaloMETCollection::const_iterator cmiter;
-    //std::cout << "Size of MET collection" <<  recmet.size() << std::endl;
-    for ( cmiter i=recmet->begin(); i!=recmet->end(); i++) {
+    // std::cout << "Size of MET collection" <<  recmet.size() << std::endl;
+    for (cmiter i = recmet->begin(); i != recmet->end(); i++) {
       calMet = i->pt();
-      for (size_t it=0;it<hltTrgMet.size();it++) {
-	_meHLTMET[it] -> Fill(calMet);
-	if (myTrigM.size() > it && myTrigM[it]) _meHLTMETTrgMC[it] -> Fill(calMet);
-	if (myTrigM.size() > it && myTrigMLow.size() > it && myTrigM[it] && myTrigMLow[it]) _meHLTMETTrg[it] -> Fill(calMet);
-	if (myTrigMLow.size() > it && myTrigMLow[it]) _meHLTMETTrgLow[it] -> Fill(calMet);
+      for (size_t it = 0; it < hltTrgMet.size(); it++) {
+        _meHLTMET[it]->Fill(calMet);
+        if (myTrigM.size() > it && myTrigM[it])
+          _meHLTMETTrgMC[it]->Fill(calMet);
+        if (myTrigM.size() > it && myTrigMLow.size() > it && myTrigM[it] && myTrigMLow[it])
+          _meHLTMETTrg[it]->Fill(calMet);
+        if (myTrigMLow.size() > it && myTrigMLow[it])
+          _meHLTMETTrgLow[it]->Fill(calMet);
       }
     }
+  } else {
+    // std::cout << "  -- No MET Collection with name: " << CaloMETColl <<
+    // std::endl; if (evtCnt==1) edm::LogWarning("HLTJetMETValidation") << "  --
+    // No MET Collection with name: "<< CaloMETColl;
   }
-  else{
-    //std::cout << "  -- No MET Collection with name: " << CaloMETColl << std::endl;
-    //if (evtCnt==1) edm::LogWarning("HLTJetMETValidation") << "  -- No MET Collection with name: "<< CaloMETColl; 
-  }
-  
+
   edm::Handle<GenMETCollection> genmet;
   iEvent.getByToken(GenMETColl, genmet);
 
-  double genMet=-1;
-  if (genmet.isValid()) { 
+  double genMet = -1;
+  if (genmet.isValid()) {
     typedef GenMETCollection::const_iterator cmiter;
-    for ( cmiter i=genmet->begin(); i!=genmet->end(); i++) {
+    for (cmiter i = genmet->begin(); i != genmet->end(); i++) {
       genMet = i->pt();
-      for (size_t it=0;it<hltTrgMet.size();it++) {
-	_meGenMET[it] -> Fill(genMet);
-	if (myTrigM.size() > it && myTrigM[it]) _meGenMETTrgMC[it] -> Fill(genMet);
-	if (myTrigM.size() > it && myTrigMLow.size() > it && myTrigM[it] && myTrigMLow[it]) _meGenMETTrg[it] -> Fill(genMet);
-	if (myTrigMLow.size() > it && myTrigMLow[it]) _meGenMETTrgLow[it] -> Fill(genMet);
+      for (size_t it = 0; it < hltTrgMet.size(); it++) {
+        _meGenMET[it]->Fill(genMet);
+        if (myTrigM.size() > it && myTrigM[it])
+          _meGenMETTrgMC[it]->Fill(genMet);
+        if (myTrigM.size() > it && myTrigMLow.size() > it && myTrigM[it] && myTrigMLow[it])
+          _meGenMETTrg[it]->Fill(genMet);
+        if (myTrigMLow.size() > it && myTrigMLow[it])
+          _meGenMETTrgLow[it]->Fill(genMet);
       }
     }
+  } else {
+    // std::cout << "  -- No GenMET Collection with name: " << GenMETColl <<
+    // std::endl; if (evtCnt==1) edm::LogWarning("HLTJetMETValidation") << "  --
+    // No GenMET Collection with name: "<< GenMETColl;
   }
-  else{
-    //std::cout << "  -- No GenMET Collection with name: " << GenMETColl << std::endl;
-    //if (evtCnt==1) edm::LogWarning("HLTJetMETValidation") << "  -- No GenMET Collection with name: "<< GenMETColl; 
-  }
-  
 }
 
-void HLTJetMETValidation::getHLTResults(const edm::TriggerResults& hltresults,
-                                        const edm::TriggerNames & triggerNames) {
+void HLTJetMETValidation::getHLTResults(const edm::TriggerResults &hltresults, const edm::TriggerNames &triggerNames) {
+  int ntrigs = hltresults.size();
+  if (!HLTinit_) {
+    HLTinit_ = true;
 
-  int ntrigs=hltresults.size();
-  if (! HLTinit_){
-    HLTinit_=true;
-    
-    for (int itrig = 0; itrig != ntrigs; ++itrig){
-      // std::cout << "trigger " << itrig << ": " << trigName << std::endl; 
+    for (int itrig = 0; itrig != ntrigs; ++itrig) {
+      // std::cout << "trigger " << itrig << ": " << trigName << std::endl;
     }
   }
-  
-  for (int itrig = 0; itrig != ntrigs; ++itrig){
+
+  for (int itrig = 0; itrig != ntrigs; ++itrig) {
     std::string trigName = triggerNames.triggerName(itrig);
-     bool accept=hltresults.accept(itrig);
+    bool accept = hltresults.accept(itrig);
 
-     //if (accept) _triggerResults->Fill(float(itrig));
+    // if (accept) _triggerResults->Fill(float(itrig));
 
-     // fill the trigger map
-     typedef std::map<std::string,bool>::value_type valType;
-     trig_iter=hltTriggerMap.find(trigName);
-     if (trig_iter==hltTriggerMap.end())
-       hltTriggerMap.insert(valType(trigName,accept));
-     else
-       trig_iter->second=accept;
+    // fill the trigger map
+    typedef std::map<std::string, bool>::value_type valType;
+    trig_iter = hltTriggerMap.find(trigName);
+    if (trig_iter == hltTriggerMap.end())
+      hltTriggerMap.insert(valType(trigName, accept));
+    else
+      trig_iter->second = accept;
   }
 }
diff --git a/HLTriggerOffline/JetMET/src/JetMETDQMPostProcessor.cc b/HLTriggerOffline/JetMET/src/JetMETDQMPostProcessor.cc
index 7c907b5bba794..1f5dfd17e286b 100644
--- a/HLTriggerOffline/JetMET/src/JetMETDQMPostProcessor.cc
+++ b/HLTriggerOffline/JetMET/src/JetMETDQMPostProcessor.cc
@@ -4,27 +4,23 @@
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
-
-#include <iostream>
+#include <cmath>
 #include <cstring>
+#include <fstream>
 #include <iomanip>
-#include<fstream>
-#include <cmath>
-
+#include <iostream>
 
-JetMETDQMPostProcessor::JetMETDQMPostProcessor(const edm::ParameterSet& pset)
-{
+JetMETDQMPostProcessor::JetMETDQMPostProcessor(const edm::ParameterSet &pset) {
   subDir_ = pset.getUntrackedParameter<std::string>("subDir");
-  patternJetTrg_ = pset.getUntrackedParameter<std::string>("PatternJetTrg","");
-  patternMetTrg_ = pset.getUntrackedParameter<std::string>("PatternMetTrg","");
+  patternJetTrg_ = pset.getUntrackedParameter<std::string>("PatternJetTrg", "");
+  patternMetTrg_ = pset.getUntrackedParameter<std::string>("PatternMetTrg", "");
 }
 
-void JetMETDQMPostProcessor::dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::IGetter& igetter)
-{
- //////////////////////////////////
+void JetMETDQMPostProcessor::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
+  //////////////////////////////////
   // setup DQM stor               //
   //////////////////////////////////
 
@@ -34,89 +30,192 @@ void JetMETDQMPostProcessor::dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::IGe
   TPRegexp patternJet(patternJetTrg_);
   TPRegexp patternMet(patternMetTrg_);
 
-  //go to the directory to be processed
-  if(igetter.dirExists(subDir_)) ibooker.cd(subDir_);
+  // go to the directory to be processed
+  if (igetter.dirExists(subDir_))
+    ibooker.cd(subDir_);
   else {
     edm::LogWarning("JetMETDQMPostProcessor") << "cannot find directory: " << subDir_ << " , skipping";
     return;
   }
-  
-  std::vector<std::string> subdirectories = igetter.getSubdirs();
-  for(std::vector<std::string>::iterator dir = subdirectories.begin() ;dir!= subdirectories.end(); dir++ ){
 
+  std::vector<std::string> subdirectories = igetter.getSubdirs();
+  for (std::vector<std::string>::iterator dir = subdirectories.begin(); dir != subdirectories.end(); dir++) {
     ibooker.cd(*dir);
 
     isJetDir = false;
     isMetDir = false;
 
-    if (TString(*dir).Contains(patternJet)) isJetDir = true;
-    if (TString(*dir).Contains(patternMet)) isMetDir = true;
-    
+    if (TString(*dir).Contains(patternJet))
+      isJetDir = true;
+    if (TString(*dir).Contains(patternMet))
+      isMetDir = true;
+
     if (isMetDir) {
+      // std::cout << "JetMETDQMPostProcessor - Met paths: " << ibooker.pwd() <<
+      // " " << *dir << std::endl;
 
-      //std::cout << "JetMETDQMPostProcessor - Met paths: " << ibooker.pwd() << " " << *dir << std::endl;
-      
-      //GenMET
-      dividehistos(ibooker, igetter, "_meGenMETTrgMC", "_meGenMET",        "_meTurnOngMET",    "Gen Missing ET",    "Gen Missing ET Turn-On RelVal");
-      dividehistos(ibooker, igetter, "_meGenMETTrg",   "_meGenMETTrgLow",  "_meTurnOngMETLow", "Gen Missing ETLow", "Gen Missing ET Turn-On Data");
+      // GenMET
+      dividehistos(ibooker,
+                   igetter,
+                   "_meGenMETTrgMC",
+                   "_meGenMET",
+                   "_meTurnOngMET",
+                   "Gen Missing ET",
+                   "Gen Missing ET Turn-On RelVal");
+      dividehistos(ibooker,
+                   igetter,
+                   "_meGenMETTrg",
+                   "_meGenMETTrgLow",
+                   "_meTurnOngMETLow",
+                   "Gen Missing ETLow",
+                   "Gen Missing ET Turn-On Data");
 
-      //HLTMET
-      dividehistos(ibooker, igetter, "_meHLTMETTrgMC", "_meHLTMET",       "_meTurnOnhMET",    "HLT Missing ET",    "HLT Missing ET Turn-On RelVal");
-      dividehistos(ibooker, igetter, "_meHLTMETTrg",   "_meHLTMETTrgLow", "_meTurnOnhMETLow", "HLT Missing ETLow", "HLT Missing ET Turn-On Data");
-      
+      // HLTMET
+      dividehistos(ibooker,
+                   igetter,
+                   "_meHLTMETTrgMC",
+                   "_meHLTMET",
+                   "_meTurnOnhMET",
+                   "HLT Missing ET",
+                   "HLT Missing ET Turn-On RelVal");
+      dividehistos(ibooker,
+                   igetter,
+                   "_meHLTMETTrg",
+                   "_meHLTMETTrgLow",
+                   "_meTurnOnhMETLow",
+                   "HLT Missing ETLow",
+                   "HLT Missing ET Turn-On Data");
     }
-    
+
     if (isJetDir) {
+      // std::cout << "JetMETDQMPostProcessor - Jet paths: " << ibooker.pwd() <<
+      // " " << *dir << std::endl;
 
-      //std::cout << "JetMETDQMPostProcessor - Jet paths: " << ibooker.pwd() << " " << *dir << std::endl;
-      
-      //GenJets
-      dividehistos(ibooker, igetter, "_meGenJetPtTrgMC", "_meGenJetPt", "_meTurnOngJetPt", "Gen Jet Pt", "Gen Jet Pt Turn-On RelVal");
-      dividehistos(ibooker, igetter, "_meGenJetPtTrg", "_meGenJetPtTrgLow", "_meTurnOngJetPt", "Gen Jet PtLow", "Gen Jet Pt Turn-On Data");
-      dividehistos(ibooker, igetter, "_meGenJetEtaTrgMC", "_meGenJetEta", "_meTurnOngJetEta", "Gen Jet Eta", "Gen Jet Eta Turn-On RelVal");
-      dividehistos(ibooker, igetter, "_meGenJetEtaTrg", "_meGenJetEtaTrgLow", "_meTurnOngJetEta", "Gen Jet EtaLow", "Gen Jet Eta Turn-On Data");
-      dividehistos(ibooker, igetter, "_meGenJetPhiTrgMC", "_meGenJetPhi", "_meTurnOngJetPhi", "Gen Jet Phi", "Gen Jet Phi Turn-On RelVal");
-      dividehistos(ibooker, igetter, "_meGenJetPhiTrg", "_meGenJetPhiTrgLow", "_meTurnOngJetPhi", "Gen Jet PhiLow", "Gen Jet Phi Turn-On Data");
-
-      //HLTJets
-      dividehistos(ibooker, igetter, "_meHLTJetPtTrgMC", "_meHLTJetPt", "_meTurnOnhJetPt", "HLT Jet Pt", "HLT Jet Pt Turn-On RelVal");
-      dividehistos(ibooker, igetter, "_meHLTJetPtTrg", "_meHLTJetPtTrgLow", "_meTurnOnhJetPt", "HLT Jet PtLow", "HLT Jet Pt Turn-On Data");
-      dividehistos(ibooker, igetter, "_meHLTJetEtaTrgMC", "_meHLTJetEta", "_meTurnOnhJetEta", "HLT Jet Eta", "HLT Jet Eta Turn-On RelVal");
-      dividehistos(ibooker, igetter, "_meHLTJetEtaTrg", "_meHLTJetEtaTrgLow", "_meTurnOnhJetEta", "HLT Jet EtaLow", "HLT Jet Eta Turn-On Data");
-      dividehistos(ibooker, igetter, "_meHLTJetPhiTrgMC", "_meHLTJetPhi", "_meTurnOnhJetPhi", "HLT Jet Phi", "HLT Jet Phi Turn-On RelVal");
-      dividehistos(ibooker, igetter, "_meHLTJetPhiTrg", "_meHLTJetPhiTrgLow", "_meTurnOnhJetPhi", "HLT Jet PhiLow", "HLT Jet Phi Turn-On Data");
+      // GenJets
+      dividehistos(ibooker,
+                   igetter,
+                   "_meGenJetPtTrgMC",
+                   "_meGenJetPt",
+                   "_meTurnOngJetPt",
+                   "Gen Jet Pt",
+                   "Gen Jet Pt Turn-On RelVal");
+      dividehistos(ibooker,
+                   igetter,
+                   "_meGenJetPtTrg",
+                   "_meGenJetPtTrgLow",
+                   "_meTurnOngJetPt",
+                   "Gen Jet PtLow",
+                   "Gen Jet Pt Turn-On Data");
+      dividehistos(ibooker,
+                   igetter,
+                   "_meGenJetEtaTrgMC",
+                   "_meGenJetEta",
+                   "_meTurnOngJetEta",
+                   "Gen Jet Eta",
+                   "Gen Jet Eta Turn-On RelVal");
+      dividehistos(ibooker,
+                   igetter,
+                   "_meGenJetEtaTrg",
+                   "_meGenJetEtaTrgLow",
+                   "_meTurnOngJetEta",
+                   "Gen Jet EtaLow",
+                   "Gen Jet Eta Turn-On Data");
+      dividehistos(ibooker,
+                   igetter,
+                   "_meGenJetPhiTrgMC",
+                   "_meGenJetPhi",
+                   "_meTurnOngJetPhi",
+                   "Gen Jet Phi",
+                   "Gen Jet Phi Turn-On RelVal");
+      dividehistos(ibooker,
+                   igetter,
+                   "_meGenJetPhiTrg",
+                   "_meGenJetPhiTrgLow",
+                   "_meTurnOngJetPhi",
+                   "Gen Jet PhiLow",
+                   "Gen Jet Phi Turn-On Data");
 
+      // HLTJets
+      dividehistos(ibooker,
+                   igetter,
+                   "_meHLTJetPtTrgMC",
+                   "_meHLTJetPt",
+                   "_meTurnOnhJetPt",
+                   "HLT Jet Pt",
+                   "HLT Jet Pt Turn-On RelVal");
+      dividehistos(ibooker,
+                   igetter,
+                   "_meHLTJetPtTrg",
+                   "_meHLTJetPtTrgLow",
+                   "_meTurnOnhJetPt",
+                   "HLT Jet PtLow",
+                   "HLT Jet Pt Turn-On Data");
+      dividehistos(ibooker,
+                   igetter,
+                   "_meHLTJetEtaTrgMC",
+                   "_meHLTJetEta",
+                   "_meTurnOnhJetEta",
+                   "HLT Jet Eta",
+                   "HLT Jet Eta Turn-On RelVal");
+      dividehistos(ibooker,
+                   igetter,
+                   "_meHLTJetEtaTrg",
+                   "_meHLTJetEtaTrgLow",
+                   "_meTurnOnhJetEta",
+                   "HLT Jet EtaLow",
+                   "HLT Jet Eta Turn-On Data");
+      dividehistos(ibooker,
+                   igetter,
+                   "_meHLTJetPhiTrgMC",
+                   "_meHLTJetPhi",
+                   "_meTurnOnhJetPhi",
+                   "HLT Jet Phi",
+                   "HLT Jet Phi Turn-On RelVal");
+      dividehistos(ibooker,
+                   igetter,
+                   "_meHLTJetPhiTrg",
+                   "_meHLTJetPhiTrgLow",
+                   "_meTurnOnhJetPhi",
+                   "HLT Jet PhiLow",
+                   "HLT Jet Phi Turn-On Data");
     }
-    
-    ibooker.goUp();         
+
+    ibooker.goUp();
   }
 }
 
 //----------------------------------------------------------------------
-TProfile* 
-JetMETDQMPostProcessor::dividehistos(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter, const std::string& numName, const std::string& denomName, 
-				     const std::string& outName, const std::string& label, const std::string& titel)
-{
-  //ibooker.pwd();
-  //std::cout << "In dividehistos: " << ibooker.pwd() << std::endl;
-  
-  //std::cout << numName <<std::endl;
-  TH1F* num = getHistogram(ibooker, igetter, ibooker.pwd()+"/"+numName);
-
-  //std::cout << denomName << std::endl;
-  TH1F* denom = getHistogram(ibooker, igetter, ibooker.pwd()+"/"+denomName);
+TProfile *JetMETDQMPostProcessor::dividehistos(DQMStore::IBooker &ibooker,
+                                               DQMStore::IGetter &igetter,
+                                               const std::string &numName,
+                                               const std::string &denomName,
+                                               const std::string &outName,
+                                               const std::string &label,
+                                               const std::string &titel) {
+  // ibooker.pwd();
+  // std::cout << "In dividehistos: " << ibooker.pwd() << std::endl;
+
+  // std::cout << numName <<std::endl;
+  TH1F *num = getHistogram(ibooker, igetter, ibooker.pwd() + "/" + numName);
+
+  // std::cout << denomName << std::endl;
+  TH1F *denom = getHistogram(ibooker, igetter, ibooker.pwd() + "/" + denomName);
 
   if (num == nullptr)
-    edm::LogWarning("JetMETDQMPostProcessor") << "numerator histogram " << ibooker.pwd()+"/"+numName << " does not exist";
+    edm::LogWarning("JetMETDQMPostProcessor")
+        << "numerator histogram " << ibooker.pwd() + "/" + numName << " does not exist";
   if (denom == nullptr)
-    edm::LogWarning("JetMETDQMPostProcessor") << "denominator histogram " << ibooker.pwd()+"/"+denomName << " does not exist";
+    edm::LogWarning("JetMETDQMPostProcessor")
+        << "denominator histogram " << ibooker.pwd() + "/" + denomName << " does not exist";
 
   // Check if histograms actually exist
-  if(!num || !denom) return nullptr;
+  if (!num || !denom)
+    return nullptr;
 
-  MonitorElement* meOut = ibooker.bookProfile(outName, titel, num->GetXaxis()->GetNbins(), num->GetXaxis()->GetXmin(), num->GetXaxis()->GetXmax(),0.,1.2);
+  MonitorElement *meOut = ibooker.bookProfile(
+      outName, titel, num->GetXaxis()->GetNbins(), num->GetXaxis()->GetXmin(), num->GetXaxis()->GetXmax(), 0., 1.2);
   meOut->setEfficiencyFlag();
-  TProfile* out = meOut->getTProfile();
+  TProfile *out = meOut->getTProfile();
   out->GetXaxis()->SetTitle(label.c_str());
   out->SetYTitle("Efficiency");
   out->SetOption("PE");
@@ -126,22 +225,22 @@ JetMETDQMPostProcessor::dividehistos(DQMStore::IBooker & ibooker, DQMStore::IGet
   out->SetMarkerSize(0.8);
   out->SetStats(kFALSE);
 
-  for(int i=1;i<=num->GetNbinsX();i++){
+  for (int i = 1; i <= num->GetNbinsX(); i++) {
     double e, low, high;
-    Efficiency( (int)num->GetBinContent(i), (int)denom->GetBinContent(i), 0.683, e, low, high );
-    double err = e-low>high-e ? e-low : high-e;
-    //here is the trick to store info in TProfile:
-    out->SetBinContent( i, e );
-    out->SetBinEntries( i, 1 );
-    out->SetBinError( i, sqrt(e*e+err*err) );
+    Efficiency((int)num->GetBinContent(i), (int)denom->GetBinContent(i), 0.683, e, low, high);
+    double err = e - low > high - e ? e - low : high - e;
+    // here is the trick to store info in TProfile:
+    out->SetBinContent(i, e);
+    out->SetBinEntries(i, 1);
+    out->SetBinError(i, sqrt(e * e + err * err));
   }
   return out;
 }
 
 //----------------------------------------------------------------------
-TH1F *
-JetMETDQMPostProcessor::getHistogram(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter, const std::string &histoPath)
-{
+TH1F *JetMETDQMPostProcessor::getHistogram(DQMStore::IBooker &ibooker,
+                                           DQMStore::IGetter &igetter,
+                                           const std::string &histoPath) {
   ibooker.pwd();
   MonitorElement *monElement = igetter.get(histoPath);
   if (monElement != nullptr)
@@ -151,18 +250,16 @@ JetMETDQMPostProcessor::getHistogram(DQMStore::IBooker & ibooker, DQMStore::IGet
 }
 
 //----------------------------------------------------------------------
-void
-JetMETDQMPostProcessor::Efficiency(int passing, int total, double level, double &mode, double &lowerBound, double &upperBound)
-{
+void JetMETDQMPostProcessor::Efficiency(
+    int passing, int total, double level, double &mode, double &lowerBound, double &upperBound) {
   // protection
-  if (total == 0)
-    {
-      mode = 0.5;
-      lowerBound = 0;
-      upperBound = 1;
-      return;
-    }
-  mode = passing / ((double) total);
+  if (total == 0) {
+    mode = 0.5;
+    lowerBound = 0;
+    upperBound = 1;
+    return;
+  }
+  mode = passing / ((double)total);
 
   // see http://root.cern.ch/root/html/TEfficiency.html#compare
   lowerBound = TEfficiency::Wilson(total, passing, level, false);
diff --git a/HLTriggerOffline/JetMET/src/SealModule.cc b/HLTriggerOffline/JetMET/src/SealModule.cc
index c0c6dafe234a5..99d0e49e51d93 100644
--- a/HLTriggerOffline/JetMET/src/SealModule.cc
+++ b/HLTriggerOffline/JetMET/src/SealModule.cc
@@ -2,5 +2,4 @@
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "HLTriggerOffline/JetMET/interface/HLTJetMETValidation.h"
 
-
 DEFINE_FWK_MODULE(HLTJetMETValidation);
diff --git a/HLTriggerOffline/Muon/interface/HLTMuonPlotter.h b/HLTriggerOffline/Muon/interface/HLTMuonPlotter.h
old mode 100755
new mode 100644
index 9d656e633dbe7..be20438e32210
--- a/HLTriggerOffline/Muon/interface/HLTMuonPlotter.h
+++ b/HLTriggerOffline/Muon/interface/HLTMuonPlotter.h
@@ -11,60 +11,54 @@
 
 #include "HLTriggerOffline/Muon/interface/L1MuonMatcherAlgo.h"
 
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 
-#include "DataFormats/Common/interface/RefToBase.h"
-#include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/Candidate/interface/Particle.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
+#include "DataFormats/Candidate/interface/Particle.h"
+#include "DataFormats/Common/interface/RefToBase.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/L1Trigger/interface/Muon.h"
+#include "DataFormats/TrackReco/interface/Track.h"
 
-#include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h"
-#include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h"
-#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
+#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
+#include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h"
+#include "DataFormats/RecoCandidate/interface/RecoChargedCandidateFwd.h"
 
 #include "CommonTools/Utils/interface/StringCutObjectSelector.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-
-#include <vector>
-#include <set>
-#include <map>
-#include <iostream>
+#include "boost/tuple/tuple.hpp"
 #include <algorithm>
 #include <cctype>
-#include "boost/tuple/tuple.hpp"
+#include <iostream>
+#include <map>
+#include <set>
+#include <vector>
 
 #include "TPRegexp.h"
 
-
-
-const unsigned int kNull = (unsigned int) -1;
-
-
+const unsigned int kNull = (unsigned int)-1;
 
 class HLTMuonPlotter {
-
- public:
-  HLTMuonPlotter(const edm::ParameterSet &, std::string,
-                 const std::vector<std::string>&, 
-		 const std::vector<std::string>&,
-		 const boost::tuple<edm::EDGetTokenT<trigger::TriggerEventWithRefs>,
-		                    edm::EDGetTokenT<reco::GenParticleCollection>,
-		                    edm::EDGetTokenT<reco::MuonCollection> >&
-		 );
+public:
+  HLTMuonPlotter(const edm::ParameterSet &,
+                 std::string,
+                 const std::vector<std::string> &,
+                 const std::vector<std::string> &,
+                 const boost::tuple<edm::EDGetTokenT<trigger::TriggerEventWithRefs>,
+                                    edm::EDGetTokenT<reco::GenParticleCollection>,
+                                    edm::EDGetTokenT<reco::MuonCollection>> &);
 
   ~HLTMuonPlotter() {
     delete genMuonSelector_;
@@ -75,52 +69,43 @@ class HLTMuonPlotter {
   void beginRun(DQMStore::IBooker &, const edm::Run &, const edm::EventSetup &);
   void analyze(const edm::Event &, const edm::EventSetup &);
 
-  static boost::tuple<
-    edm::EDGetTokenT<trigger::TriggerEventWithRefs>,
-    edm::EDGetTokenT<reco::GenParticleCollection>,
-    edm::EDGetTokenT<reco::MuonCollection> > getTokens(const edm::ParameterSet&, edm::ConsumesCollector&&);
-  
- private:
-  
+  static boost::tuple<edm::EDGetTokenT<trigger::TriggerEventWithRefs>,
+                      edm::EDGetTokenT<reco::GenParticleCollection>,
+                      edm::EDGetTokenT<reco::MuonCollection>>
+  getTokens(const edm::ParameterSet &, edm::ConsumesCollector &&);
+
+private:
   struct MatchStruct {
-    const reco::Candidate            * candBase;
-    const l1t::Muon                  * candL1;
+    const reco::Candidate *candBase;
+    const l1t::Muon *candL1;
     std::vector<const reco::RecoChargedCandidate *> candHlt;
     MatchStruct() {
-      candBase   = nullptr;
-      candL1     = nullptr;
+      candBase = nullptr;
+      candL1 = nullptr;
     }
-    MatchStruct(const reco::Candidate * cand) {
+    MatchStruct(const reco::Candidate *cand) {
       candBase = cand;
-      candL1     = nullptr;
-    }
-    bool operator<(MatchStruct match) {
-      return candBase->pt() < match.candBase->pt();
-    }
-    bool operator>(MatchStruct match) {
-      return candBase->pt() > match.candBase->pt();
+      candL1 = nullptr;
     }
+    bool operator<(MatchStruct match) { return candBase->pt() < match.candBase->pt(); }
+    bool operator>(MatchStruct match) { return candBase->pt() > match.candBase->pt(); }
   };
   struct matchesByDescendingPt {
-    bool operator() (MatchStruct a, MatchStruct b) {
-      return a.candBase->pt() > b.candBase->pt();
-    }
+    bool operator()(MatchStruct a, MatchStruct b) { return a.candBase->pt() > b.candBase->pt(); }
   };
 
-  void analyzePath(const edm::Event &, 
-                   const std::string &, const std::string &,
-                   const std::vector<MatchStruct>&, 
+  void analyzePath(const edm::Event &,
+                   const std::string &,
+                   const std::string &,
+                   const std::vector<MatchStruct> &,
                    edm::Handle<trigger::TriggerEventWithRefs>);
-  void findMatches(
-      std::vector<MatchStruct> &, 
-      const l1t::MuonVectorRef& candsL1,
-      const std::vector< std::vector< const reco::RecoChargedCandidate *> >&
-      );
-  void bookHist(DQMStore::IBooker &, std::string,
-		std::string, std::string, std::string);
+  void findMatches(std::vector<MatchStruct> &,
+                   const l1t::MuonVectorRef &candsL1,
+                   const std::vector<std::vector<const reco::RecoChargedCandidate *>> &);
+  void bookHist(DQMStore::IBooker &, std::string, std::string, std::string, std::string);
 
-  std::string  hltPath_;
-  std::string  hltProcessName_;
+  std::string hltPath_;
+  std::string hltProcessName_;
 
   std::vector<std::string> moduleLabels_;
   std::vector<std::string> stepLabels_;
@@ -140,13 +125,12 @@ class HLTMuonPlotter {
   std::string genMuonCut_;
   std::string recMuonCut_;
 
-  StringCutObjectSelector<reco::GenParticle> * genMuonSelector_;
-  StringCutObjectSelector<reco::Muon       > * recMuonSelector_;
+  StringCutObjectSelector<reco::GenParticle> *genMuonSelector_;
+  StringCutObjectSelector<reco::Muon> *recMuonSelector_;
 
   L1MuonMatcherAlgo l1Matcher_;
 
   std::map<std::string, MonitorElement *> elements_;
-
 };
 
 #endif
diff --git a/HLTriggerOffline/Muon/interface/L1MuonMatcherAlgo.h b/HLTriggerOffline/Muon/interface/L1MuonMatcherAlgo.h
index 3a4ca66dbdd26..b932a108e608a 100644
--- a/HLTriggerOffline/Muon/interface/L1MuonMatcherAlgo.h
+++ b/HLTriggerOffline/Muon/interface/L1MuonMatcherAlgo.h
@@ -4,153 +4,206 @@
 //
 
 /**
-  \class    L1MuonMatcherAlgo L1MuonMatcherAlgo.h "HLTriggerOffline/Muon/interface/L1MuonMatcherAlgo.h"
-  \brief    Matcher of reconstructed objects to L1 Muons 
-            
+  \class    L1MuonMatcherAlgo L1MuonMatcherAlgo.h
+  "HLTriggerOffline/Muon/interface/L1MuonMatcherAlgo.h" \brief    Matcher of
+  reconstructed objects to L1 Muons
+
   \author   Giovanni Petrucciani
 */
 
-
-#include <cmath>
-#include "DataFormats/Math/interface/deltaR.h"
-#include "DataFormats/Math/interface/deltaPhi.h"
+#include "CommonTools/Utils/interface/AnySelector.h"
+#include "CommonTools/Utils/interface/StringCutObjectSelector.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
-#include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/L1Trigger/interface/L1MuonParticle.h"
+#include "DataFormats/Math/interface/deltaPhi.h"
+#include "DataFormats/Math/interface/deltaR.h"
+#include "DataFormats/TrackReco/interface/Track.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "CommonTools/Utils/interface/StringCutObjectSelector.h"
-#include "CommonTools/Utils/interface/AnySelector.h"
 #include "HLTriggerOffline/Muon/interface/PropagateToMuon.h"
+#include <cmath>
 
 class L1MuonMatcherAlgo {
-    public:
-        explicit L1MuonMatcherAlgo(const edm::ParameterSet & iConfig) ;
-        ~L1MuonMatcherAlgo() ;
-
-        /// Call this method at the beginning of each run, to initialize geometry, magnetic field and propagators
-        void init(const edm::EventSetup &iSetup) ;
-
-        /// Extrapolate reco::Track to the muon station 2, return an invalid TSOS if it fails
-        TrajectoryStateOnSurface extrapolate(const reco::Track &tk)     const { return prop_.extrapolate(tk); }
-
-        /// Extrapolate reco::Candidate to the muon station 2, return an invalid TSOS if it fails
-        TrajectoryStateOnSurface extrapolate(const reco::Candidate &tk) const { return prop_.extrapolate(tk); }
-
-        /// Extrapolate a FreeTrajectoryState to the muon station 2, return an invalid TSOS if it fails
-        TrajectoryStateOnSurface extrapolate(const FreeTrajectoryState &state) const { return prop_.extrapolate(state); }
-
-        /// Return the propagator to second muon station (in case it's needed)
-        PropagateToMuon & propagatorToMuon() { return prop_; }
-        /// Return the propagator to second muon station (in case it's needed)
-        const PropagateToMuon & propagatorToMuon() const { return prop_; }
-
-        /// Try to match one track to one L1. Return true if succeeded (and update deltaR, deltaPhi and propagated TSOS accordingly)
-        /// The preselection cut on L1, if specified in the config, is applied before the match
-        bool match(const reco::Track &tk, const l1extra::L1MuonParticle &l1, float &deltaR, float &deltaPhi, TrajectoryStateOnSurface &propagated) const {
-            propagated = extrapolate(tk);
-            return propagated.isValid() ? match(propagated, l1, deltaR, deltaPhi) : false;
-        }
-
-        /// Try to match one track to one L1. Return true if succeeded (and update deltaR, deltaPhi and propagated TSOS accordingly)
-        /// The preselection cut on L1, if specified in the config, is applied before the match
-        bool match(const reco::Candidate &c, const l1extra::L1MuonParticle &l1, float &deltaR, float &deltaPhi, TrajectoryStateOnSurface &propagated) const {
-            propagated = extrapolate(c);
-            return propagated.isValid() ? match(propagated, l1, deltaR, deltaPhi) : false;
-        }
-
-        /// Try to match one track to one L1. Return true if succeeded (and update deltaR, deltaPhi accordingly)
-        /// The preselection cut on L1, if specified in the config, is applied before the match
-        bool match(TrajectoryStateOnSurface & propagated, const l1extra::L1MuonParticle &l1, float &deltaR, float &deltaPhi) const ;
-
-        /// Find the best match to L1, and return its index in the vector (and update deltaR, deltaPhi and propagated TSOS accordingly)
-        /// Returns -1 if the match fails
-        /// The preselection cut on L1, if specified in the config, is applied before the match
-        int match(const reco::Track &tk, const std::vector<l1extra::L1MuonParticle> &l1, float &deltaR, float &deltaPhi, TrajectoryStateOnSurface &propagated) const {
-            propagated = extrapolate(tk);
-            return propagated.isValid() ? match(propagated, l1, deltaR, deltaPhi) : -1;
-        }
-
-        /// Find the best match to L1, and return its index in the vector (and update deltaR, deltaPhi and propagated TSOS accordingly)
-        /// Returns -1 if the match fails
-        /// The preselection cut on L1, if specified in the config, is applied before the match
-        int match(const reco::Candidate &c, const std::vector<l1extra::L1MuonParticle> &l1, float &deltaR, float &deltaPhi, TrajectoryStateOnSurface &propagated) const {
-            propagated = extrapolate(c);
-            return propagated.isValid() ? match(propagated, l1, deltaR, deltaPhi) : -1;
-        }
-
-        /// Find the best match to L1, and return its index in the vector (and update deltaR, deltaPhi accordingly)
-        /// Returns -1 if the match fails
-        /// The preselection cut on L1, if specified in the config, is applied before the match
-        int match(TrajectoryStateOnSurface &propagated, const std::vector<l1extra::L1MuonParticle> &l1, float &deltaR, float &deltaPhi) const ;
-
-
-        /// Find the best match to L1, and return its index in the vector (and update deltaR, deltaPhi and propagated TSOS accordingly)
-        /// Returns -1 if the match fails
-        /// Only the objects passing the selector will be allowed for the match.
-        /// If you don't need a selector, just use an AnySelector (CommonTools/Utils) which accepts everything
-        template<typename Collection, typename Selector>
-        int matchGeneric(const reco::Track &tk, const Collection &l1, const Selector &sel, float &deltaR, float &deltaPhi, TrajectoryStateOnSurface &propagated) const {
-            propagated = extrapolate(tk);
-            return propagated.isValid() ? matchGeneric(propagated, l1, sel, deltaR, deltaPhi) : -1;
-        }
-
-        /// Find the best match to L1, and return its index in the vector (and update deltaR, deltaPhi and propagated TSOS accordingly)
-        /// Returns -1 if the match fails
-        /// Only the objects passing the selector will be allowed for the match.
-        /// If you don't need a selector, just use an AnySelector (CommonTools/Utils) which accepts everything
-        template<typename Collection, typename Selector>
-        int matchGeneric(const reco::Candidate &c, const Collection &l1, const Selector &sel, float &deltaR, float &deltaPhi, TrajectoryStateOnSurface &propagated) const {
-            propagated = extrapolate(c);
-            return propagated.isValid() ? matchGeneric(propagated, l1, sel, deltaR, deltaPhi) : -1;
-        }
-
-        /// Find the best match to L1, and return its index in the vector (and update deltaR, deltaPhi accordingly)
-        /// Returns -1 if the match fails
-        /// Only the objects passing the selector will be allowed for the match.
-        /// The selector defaults to an AnySelector (CommonTools/Utils) which just accepts everything
-        template<typename Collection, typename Selector>
-        int matchGeneric(TrajectoryStateOnSurface &propagated, const Collection &l1, const Selector &sel, float &deltaR, float &deltaPhi) const ;
-
-
-    private:
-        PropagateToMuon prop_;
-
-        typedef StringCutObjectSelector<l1extra::L1MuonParticle> L1Selector;
-        /// Preselection cut to apply to L1 candidates before matching
-        L1Selector preselectionCut_;
-
-        /// Matching cuts
-        double deltaR2_, deltaPhi_;
-
-        /// Sort by deltaPhi instead of deltaR
-        bool sortByDeltaPhi_;
+public:
+  explicit L1MuonMatcherAlgo(const edm::ParameterSet &iConfig);
+  ~L1MuonMatcherAlgo();
+
+  /// Call this method at the beginning of each run, to initialize geometry,
+  /// magnetic field and propagators
+  void init(const edm::EventSetup &iSetup);
+
+  /// Extrapolate reco::Track to the muon station 2, return an invalid TSOS if
+  /// it fails
+  TrajectoryStateOnSurface extrapolate(const reco::Track &tk) const { return prop_.extrapolate(tk); }
+
+  /// Extrapolate reco::Candidate to the muon station 2, return an invalid TSOS
+  /// if it fails
+  TrajectoryStateOnSurface extrapolate(const reco::Candidate &tk) const { return prop_.extrapolate(tk); }
+
+  /// Extrapolate a FreeTrajectoryState to the muon station 2, return an invalid
+  /// TSOS if it fails
+  TrajectoryStateOnSurface extrapolate(const FreeTrajectoryState &state) const { return prop_.extrapolate(state); }
+
+  /// Return the propagator to second muon station (in case it's needed)
+  PropagateToMuon &propagatorToMuon() { return prop_; }
+  /// Return the propagator to second muon station (in case it's needed)
+  const PropagateToMuon &propagatorToMuon() const { return prop_; }
+
+  /// Try to match one track to one L1. Return true if succeeded (and update
+  /// deltaR, deltaPhi and propagated TSOS accordingly) The preselection cut on
+  /// L1, if specified in the config, is applied before the match
+  bool match(const reco::Track &tk,
+             const l1extra::L1MuonParticle &l1,
+             float &deltaR,
+             float &deltaPhi,
+             TrajectoryStateOnSurface &propagated) const {
+    propagated = extrapolate(tk);
+    return propagated.isValid() ? match(propagated, l1, deltaR, deltaPhi) : false;
+  }
+
+  /// Try to match one track to one L1. Return true if succeeded (and update
+  /// deltaR, deltaPhi and propagated TSOS accordingly) The preselection cut on
+  /// L1, if specified in the config, is applied before the match
+  bool match(const reco::Candidate &c,
+             const l1extra::L1MuonParticle &l1,
+             float &deltaR,
+             float &deltaPhi,
+             TrajectoryStateOnSurface &propagated) const {
+    propagated = extrapolate(c);
+    return propagated.isValid() ? match(propagated, l1, deltaR, deltaPhi) : false;
+  }
+
+  /// Try to match one track to one L1. Return true if succeeded (and update
+  /// deltaR, deltaPhi accordingly) The preselection cut on L1, if specified in
+  /// the config, is applied before the match
+  bool match(TrajectoryStateOnSurface &propagated,
+             const l1extra::L1MuonParticle &l1,
+             float &deltaR,
+             float &deltaPhi) const;
+
+  /// Find the best match to L1, and return its index in the vector (and update
+  /// deltaR, deltaPhi and propagated TSOS accordingly) Returns -1 if the match
+  /// fails The preselection cut on L1, if specified in the config, is applied
+  /// before the match
+  int match(const reco::Track &tk,
+            const std::vector<l1extra::L1MuonParticle> &l1,
+            float &deltaR,
+            float &deltaPhi,
+            TrajectoryStateOnSurface &propagated) const {
+    propagated = extrapolate(tk);
+    return propagated.isValid() ? match(propagated, l1, deltaR, deltaPhi) : -1;
+  }
+
+  /// Find the best match to L1, and return its index in the vector (and update
+  /// deltaR, deltaPhi and propagated TSOS accordingly) Returns -1 if the match
+  /// fails The preselection cut on L1, if specified in the config, is applied
+  /// before the match
+  int match(const reco::Candidate &c,
+            const std::vector<l1extra::L1MuonParticle> &l1,
+            float &deltaR,
+            float &deltaPhi,
+            TrajectoryStateOnSurface &propagated) const {
+    propagated = extrapolate(c);
+    return propagated.isValid() ? match(propagated, l1, deltaR, deltaPhi) : -1;
+  }
+
+  /// Find the best match to L1, and return its index in the vector (and update
+  /// deltaR, deltaPhi accordingly) Returns -1 if the match fails The
+  /// preselection cut on L1, if specified in the config, is applied before the
+  /// match
+  int match(TrajectoryStateOnSurface &propagated,
+            const std::vector<l1extra::L1MuonParticle> &l1,
+            float &deltaR,
+            float &deltaPhi) const;
+
+  /// Find the best match to L1, and return its index in the vector (and update
+  /// deltaR, deltaPhi and propagated TSOS accordingly) Returns -1 if the match
+  /// fails Only the objects passing the selector will be allowed for the match.
+  /// If you don't need a selector, just use an AnySelector (CommonTools/Utils)
+  /// which accepts everything
+  template <typename Collection, typename Selector>
+  int matchGeneric(const reco::Track &tk,
+                   const Collection &l1,
+                   const Selector &sel,
+                   float &deltaR,
+                   float &deltaPhi,
+                   TrajectoryStateOnSurface &propagated) const {
+    propagated = extrapolate(tk);
+    return propagated.isValid() ? matchGeneric(propagated, l1, sel, deltaR, deltaPhi) : -1;
+  }
+
+  /// Find the best match to L1, and return its index in the vector (and update
+  /// deltaR, deltaPhi and propagated TSOS accordingly) Returns -1 if the match
+  /// fails Only the objects passing the selector will be allowed for the match.
+  /// If you don't need a selector, just use an AnySelector (CommonTools/Utils)
+  /// which accepts everything
+  template <typename Collection, typename Selector>
+  int matchGeneric(const reco::Candidate &c,
+                   const Collection &l1,
+                   const Selector &sel,
+                   float &deltaR,
+                   float &deltaPhi,
+                   TrajectoryStateOnSurface &propagated) const {
+    propagated = extrapolate(c);
+    return propagated.isValid() ? matchGeneric(propagated, l1, sel, deltaR, deltaPhi) : -1;
+  }
+
+  /// Find the best match to L1, and return its index in the vector (and update
+  /// deltaR, deltaPhi accordingly) Returns -1 if the match fails Only the
+  /// objects passing the selector will be allowed for the match. The selector
+  /// defaults to an AnySelector (CommonTools/Utils) which just accepts
+  /// everything
+  template <typename Collection, typename Selector>
+  int matchGeneric(TrajectoryStateOnSurface &propagated,
+                   const Collection &l1,
+                   const Selector &sel,
+                   float &deltaR,
+                   float &deltaPhi) const;
+
+private:
+  PropagateToMuon prop_;
+
+  typedef StringCutObjectSelector<l1extra::L1MuonParticle> L1Selector;
+  /// Preselection cut to apply to L1 candidates before matching
+  L1Selector preselectionCut_;
+
+  /// Matching cuts
+  double deltaR2_, deltaPhi_;
+
+  /// Sort by deltaPhi instead of deltaR
+  bool sortByDeltaPhi_;
 };
 
-template<typename Collection, typename Selector>
-int 
-L1MuonMatcherAlgo::matchGeneric(TrajectoryStateOnSurface &propagated, const Collection &l1s, const Selector &sel, float &deltaR, float &deltaPhi) const {
-    typedef typename Collection::value_type obj;
-    int match = -1;
-    double minDeltaPhi = deltaPhi_;
-    double minDeltaR2  = deltaR2_;
-    GlobalPoint pos = propagated.globalPosition();
-    for (int i = 0, n = l1s.size(); i < n; ++i) {
-        const obj &l1 = l1s[i];
-        if (sel(l1)) {
-            double thisDeltaPhi = ::deltaPhi(double(pos.phi()),  l1.phi());
-            double thisDeltaR2  = ::deltaR2(double(pos.eta()), double(pos.phi()), l1.eta(), l1.phi());
-            if ((fabs(thisDeltaPhi) < deltaPhi_) && (thisDeltaR2 < deltaR2_)) { // check both
-                if (sortByDeltaPhi_ ? (fabs(thisDeltaPhi) < fabs(minDeltaPhi)) : (thisDeltaR2 < minDeltaR2)) { // sort on one
-                    match = i;
-                    deltaR   = std::sqrt(thisDeltaR2);
-                    deltaPhi = thisDeltaPhi;
-                    if (sortByDeltaPhi_) minDeltaPhi = thisDeltaPhi; else minDeltaR2 = thisDeltaR2;
-                }
-            }
+template <typename Collection, typename Selector>
+int L1MuonMatcherAlgo::matchGeneric(TrajectoryStateOnSurface &propagated,
+                                    const Collection &l1s,
+                                    const Selector &sel,
+                                    float &deltaR,
+                                    float &deltaPhi) const {
+  typedef typename Collection::value_type obj;
+  int match = -1;
+  double minDeltaPhi = deltaPhi_;
+  double minDeltaR2 = deltaR2_;
+  GlobalPoint pos = propagated.globalPosition();
+  for (int i = 0, n = l1s.size(); i < n; ++i) {
+    const obj &l1 = l1s[i];
+    if (sel(l1)) {
+      double thisDeltaPhi = ::deltaPhi(double(pos.phi()), l1.phi());
+      double thisDeltaR2 = ::deltaR2(double(pos.eta()), double(pos.phi()), l1.eta(), l1.phi());
+      if ((fabs(thisDeltaPhi) < deltaPhi_) && (thisDeltaR2 < deltaR2_)) {                               // check both
+        if (sortByDeltaPhi_ ? (fabs(thisDeltaPhi) < fabs(minDeltaPhi)) : (thisDeltaR2 < minDeltaR2)) {  // sort on one
+          match = i;
+          deltaR = std::sqrt(thisDeltaR2);
+          deltaPhi = thisDeltaPhi;
+          if (sortByDeltaPhi_)
+            minDeltaPhi = thisDeltaPhi;
+          else
+            minDeltaR2 = thisDeltaR2;
         }
+      }
     }
-    return match;
+  }
+  return match;
 }
 
 #endif
diff --git a/HLTriggerOffline/Muon/interface/PropagateToMuon.h b/HLTriggerOffline/Muon/interface/PropagateToMuon.h
index 6377f3964dcc3..da75a67a90834 100644
--- a/HLTriggerOffline/Muon/interface/PropagateToMuon.h
+++ b/HLTriggerOffline/Muon/interface/PropagateToMuon.h
@@ -4,14 +4,14 @@
 //
 
 /**
-  \class    PropagateToMuon PropagateToMuon.h "HLTriggerOffline/Muon/interface/PropagateToMuon.h"
-  \brief    Propagate an object (usually a track) to the second muon station.
-            Support for other muon stations will be added on request.
-            
+  \class    PropagateToMuon PropagateToMuon.h
+  "HLTriggerOffline/Muon/interface/PropagateToMuon.h" \brief    Propagate an
+  object (usually a track) to the second muon station. Support for other muon
+  stations will be added on request.
+
   \author   Giovanni Petrucciani
 */
 
-
 #include "DataFormats/Candidate/interface/Candidate.h"
 #include "DataFormats/GeometrySurface/interface/BoundCylinder.h"
 #include "DataFormats/GeometrySurface/interface/BoundDisk.h"
@@ -21,57 +21,64 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "RecoMuon/DetLayers/interface/MuonDetLayerGeometry.h"
-class DetLayer; // #include "TrackingTools/DetLayers/interface/DetLayer.h" // forward declaration can suffice
+class DetLayer;  // #include "TrackingTools/DetLayers/interface/DetLayer.h" //
+                 // forward declaration can suffice
 #include "TrackingTools/GeomPropagators/interface/Propagator.h"
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 
 class PropagateToMuon {
-    public:
-        explicit PropagateToMuon(const edm::ParameterSet & iConfig) ;
-        ~PropagateToMuon() ;
-
-        /// Call this method at the beginning of each run, to initialize geometry, magnetic field and propagators
-        void init(const edm::EventSetup &iSetup) ;
-
-        /// Extrapolate reco::Track to the muon station 2, return an invalid TSOS if it fails
-        TrajectoryStateOnSurface extrapolate(const reco::Track &tk)     const { return extrapolate(startingState(tk)); }
-
-        /// Extrapolate reco::Candidate to the muon station 2, return an invalid TSOS if it fails
-        TrajectoryStateOnSurface extrapolate(const reco::Candidate &tk) const { return extrapolate(startingState(tk)); }
-
-        /// Extrapolate a FreeTrajectoryState to the muon station 2, return an invalid TSOS if it fails
-        TrajectoryStateOnSurface extrapolate(const FreeTrajectoryState &state) const ;
-
-    private:
-        enum WhichTrack { None, TrackerTk, MuonTk, GlobalTk };
-        enum WhichState { AtVertex, Innermost, Outermost };
-
-        /// Labels for input collections
-        bool useSimpleGeometry_;
-        WhichTrack whichTrack_;
-        WhichState whichState_;
-
-        /// for cosmics, some things change: the along-opposite is not in-out, nor the innermost/outermost states are in-out really
-        bool cosmicPropagation_;
-
-        // needed services for track propagation
-        edm::ESHandle<MagneticField> magfield_;
-        edm::ESHandle<Propagator> propagator_, propagatorAny_, propagatorOpposite_;
-        edm::ESHandle<MuonDetLayerGeometry> muonGeometry_;
-        // simplified geometry for track propagation
-        const  BoundCylinder *barrelCylinder_;
-        const  BoundDisk *endcapDiskPos_, *endcapDiskNeg_;
-        double barrelHalfLength_;
-        std::pair<float,float> endcapRadii_;
-
-        /// Starting state for the propagation
-        FreeTrajectoryState startingState(const reco::Candidate &reco) const ;
-
-        /// Starting state for the propagation
-        FreeTrajectoryState startingState(const reco::Track &tk) const ;
-
-        /// Get the best TSOS on one of the chambres of this DetLayer, or an invalid TSOS if none match
-        TrajectoryStateOnSurface getBestDet(const TrajectoryStateOnSurface &tsos, const DetLayer *station) const;
+public:
+  explicit PropagateToMuon(const edm::ParameterSet &iConfig);
+  ~PropagateToMuon();
+
+  /// Call this method at the beginning of each run, to initialize geometry,
+  /// magnetic field and propagators
+  void init(const edm::EventSetup &iSetup);
+
+  /// Extrapolate reco::Track to the muon station 2, return an invalid TSOS if
+  /// it fails
+  TrajectoryStateOnSurface extrapolate(const reco::Track &tk) const { return extrapolate(startingState(tk)); }
+
+  /// Extrapolate reco::Candidate to the muon station 2, return an invalid TSOS
+  /// if it fails
+  TrajectoryStateOnSurface extrapolate(const reco::Candidate &tk) const { return extrapolate(startingState(tk)); }
+
+  /// Extrapolate a FreeTrajectoryState to the muon station 2, return an invalid
+  /// TSOS if it fails
+  TrajectoryStateOnSurface extrapolate(const FreeTrajectoryState &state) const;
+
+private:
+  enum WhichTrack { None, TrackerTk, MuonTk, GlobalTk };
+  enum WhichState { AtVertex, Innermost, Outermost };
+
+  /// Labels for input collections
+  bool useSimpleGeometry_;
+  WhichTrack whichTrack_;
+  WhichState whichState_;
+
+  /// for cosmics, some things change: the along-opposite is not in-out, nor the
+  /// innermost/outermost states are in-out really
+  bool cosmicPropagation_;
+
+  // needed services for track propagation
+  edm::ESHandle<MagneticField> magfield_;
+  edm::ESHandle<Propagator> propagator_, propagatorAny_, propagatorOpposite_;
+  edm::ESHandle<MuonDetLayerGeometry> muonGeometry_;
+  // simplified geometry for track propagation
+  const BoundCylinder *barrelCylinder_;
+  const BoundDisk *endcapDiskPos_, *endcapDiskNeg_;
+  double barrelHalfLength_;
+  std::pair<float, float> endcapRadii_;
+
+  /// Starting state for the propagation
+  FreeTrajectoryState startingState(const reco::Candidate &reco) const;
+
+  /// Starting state for the propagation
+  FreeTrajectoryState startingState(const reco::Track &tk) const;
+
+  /// Get the best TSOS on one of the chambres of this DetLayer, or an invalid
+  /// TSOS if none match
+  TrajectoryStateOnSurface getBestDet(const TrajectoryStateOnSurface &tsos, const DetLayer *station) const;
 };
 
 #endif
diff --git a/HLTriggerOffline/Muon/src/HLTMuonPlotter.cc b/HLTriggerOffline/Muon/src/HLTMuonPlotter.cc
index 834cf8656a7a7..9512d4244cb7a 100644
--- a/HLTriggerOffline/Muon/src/HLTMuonPlotter.cc
+++ b/HLTriggerOffline/Muon/src/HLTMuonPlotter.cc
@@ -2,58 +2,48 @@
 /** \file HLTMuonPlotter.cc
  */
 
-
-
-#include "HLTriggerOffline/Muon/interface/HLTMuonPlotter.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/Candidate/interface/CandMatchMap.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/Math/interface/deltaPhi.h"
 #include "DataFormats/Math/interface/deltaR.h"
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "HLTriggerOffline/Muon/interface/HLTMuonPlotter.h"
 
 #include "DataFormats/MuonSeed/interface/L2MuonTrajectorySeed.h"
 #include "DataFormats/MuonSeed/interface/L2MuonTrajectorySeedCollection.h"
 #include "DataFormats/MuonSeed/interface/L3MuonTrajectorySeed.h"
 #include "DataFormats/MuonSeed/interface/L3MuonTrajectorySeedCollection.h"
 
-
-
 using namespace std;
 using namespace edm;
 using namespace reco;
 using namespace trigger;
 
-
-
 typedef vector<ParameterSet> Parameters;
 
-
-
-HLTMuonPlotter::HLTMuonPlotter(const ParameterSet & pset,
+HLTMuonPlotter::HLTMuonPlotter(const ParameterSet &pset,
                                string hltPath,
-                               const std::vector<string>& moduleLabels,
-                               const std::vector<string>& stepLabels,
-			       const boost::tuple<edm::EDGetTokenT<trigger::TriggerEventWithRefs>,
-		                                  edm::EDGetTokenT<reco::GenParticleCollection>,
-		                                  edm::EDGetTokenT<reco::MuonCollection> >& tokens
-			       ) :
-			       
-  l1Matcher_(pset)
-{
-
+                               const std::vector<string> &moduleLabels,
+                               const std::vector<string> &stepLabels,
+                               const boost::tuple<edm::EDGetTokenT<trigger::TriggerEventWithRefs>,
+                                                  edm::EDGetTokenT<reco::GenParticleCollection>,
+                                                  edm::EDGetTokenT<reco::MuonCollection>> &tokens)
+    :
+
+      l1Matcher_(pset) {
   hltPath_ = hltPath;
   moduleLabels_ = moduleLabels;
   stepLabels_ = stepLabels;
-  hltProcessName_  = pset.getParameter<string>("hltProcessName");
+  hltProcessName_ = pset.getParameter<string>("hltProcessName");
 
-  cutsDr_      = pset.getParameter< vector<double> >("cutsDr"     );
+  cutsDr_ = pset.getParameter<vector<double>>("cutsDr");
 
-  parametersEta_    = pset.getParameter< vector<double> >("parametersEta");
-  parametersPhi_    = pset.getParameter< vector<double> >("parametersPhi");
-  parametersTurnOn_ = pset.getParameter< vector<double> >("parametersTurnOn");
+  parametersEta_ = pset.getParameter<vector<double>>("parametersEta");
+  parametersPhi_ = pset.getParameter<vector<double>>("parametersPhi");
+  parametersTurnOn_ = pset.getParameter<vector<double>>("parametersTurnOn");
 
   genMuonCut_ = pset.getParameter<string>("genMuonCut");
   recMuonCut_ = pset.getParameter<string>("recMuonCut");
@@ -61,51 +51,39 @@ HLTMuonPlotter::HLTMuonPlotter(const ParameterSet & pset,
   genMuonSelector_ = nullptr;
   recMuonSelector_ = nullptr;
 
-  //set tokens
+  // set tokens
   hltTriggerSummaryRAW_ = tokens.get<0>();
   genParticleLabel_ = tokens.get<1>();
   recMuonLabel_ = tokens.get<2>();
-
 }
 
+void HLTMuonPlotter::beginJob() {}
 
-
-void 
-HLTMuonPlotter::beginJob() 
-{
-
-}
-
-
-
-void 
-HLTMuonPlotter::beginRun(DQMStore::IBooker & iBooker,
-			 const Run & iRun, const EventSetup & iSetup) 
-{
-
+void HLTMuonPlotter::beginRun(DQMStore::IBooker &iBooker, const Run &iRun, const EventSetup &iSetup) {
   static int runNumber = 0;
   runNumber++;
 
   l1Matcher_.init(iSetup);
 
   cutMaxEta_ = 2.4;
-  if (hltPath_.find("eta2p1") != string::npos) 
+  if (hltPath_.find("eta2p1") != string::npos)
     cutMaxEta_ = 2.1;
 
   // Choose a pT cut for gen/rec muons based on the pT cut in the hltPath_
   unsigned int threshold = 0;
   TPRegexp ptRegexp("Mu([0-9]+)");
-  TObjArray * regexArray = ptRegexp.MatchS(hltPath_);
+  TObjArray *regexArray = ptRegexp.MatchS(hltPath_);
   if (regexArray->GetEntriesFast() == 2) {
     threshold = atoi(((TObjString *)regexArray->At(1))->GetString());
   }
   delete regexArray;
-  // We select a whole number min pT cut slightly above the hltPath_'s final 
+  // We select a whole number min pT cut slightly above the hltPath_'s final
   // pt threshold, then subtract a bit to let through particle gun muons with
   // exact integer pT:
   cutMinPt_ = ceil(threshold * 1.1) - 0.01;
-  if (cutMinPt_ < 0.) cutMinPt_ = 0.;
-  
+  if (cutMinPt_ < 0.)
+    cutMinPt_ = 0.;
+
   string baseDir = "HLT/Muon/Distributions/";
   iBooker.setCurrentFolder(baseDir + hltPath_);
 
@@ -113,9 +91,9 @@ HLTMuonPlotter::beginRun(DQMStore::IBooker & iBooker,
   sources[0] = "gen";
   sources[1] = "rec";
 
-  elements_["CutMinPt" ] = iBooker.bookFloat("CutMinPt" );
+  elements_["CutMinPt"] = iBooker.bookFloat("CutMinPt");
   elements_["CutMaxEta"] = iBooker.bookFloat("CutMaxEta");
-  elements_["CutMinPt" ]->Fill(cutMinPt_);
+  elements_["CutMinPt"]->Fill(cutMinPt_);
   elements_["CutMaxEta"]->Fill(cutMaxEta_);
 
   for (size_t i = 0; i < sources.size(); i++) {
@@ -127,71 +105,68 @@ HLTMuonPlotter::beginRun(DQMStore::IBooker & iBooker,
       bookHist(iBooker, hltPath_, stepLabels_[j], source, "MaxPt2");
     }
   }
-
 }
 
-
-
-void 
-HLTMuonPlotter::analyze(const Event & iEvent, const EventSetup & iSetup)
-{
-
+void HLTMuonPlotter::analyze(const Event &iEvent, const EventSetup &iSetup) {
   static int eventNumber = 0;
   eventNumber++;
-  LogTrace("HLTMuonVal") << "In HLTMuonPlotter::analyze,  " 
+  LogTrace("HLTMuonVal") << "In HLTMuonPlotter::analyze,  "
                          << "Event: " << eventNumber;
 
   // cout << hltPath_ << endl;
   // for (size_t i = 0; i < moduleLabels_.size(); i++)
   //   cout << "    " << moduleLabels_[i] << endl;
 
-  Handle<          TriggerEventWithRefs> rawTriggerEvent;
-  Handle<                MuonCollection> recMuons;
-  Handle<         GenParticleCollection> genParticles;
+  Handle<TriggerEventWithRefs> rawTriggerEvent;
+  Handle<MuonCollection> recMuons;
+  Handle<GenParticleCollection> genParticles;
 
   iEvent.getByToken(hltTriggerSummaryRAW_, rawTriggerEvent);
-  if (rawTriggerEvent.failedToGet())
-    {LogError("HLTMuonVal") << "No trigger summary found"; return;}
+  if (rawTriggerEvent.failedToGet()) {
+    LogError("HLTMuonVal") << "No trigger summary found";
+    return;
+  }
   iEvent.getByToken(recMuonLabel_, recMuons);
-  iEvent.getByToken(genParticleLabel_, genParticles );
+  iEvent.getByToken(genParticleLabel_, genParticles);
 
   vector<string> sources;
-  if (genParticles.isValid()) sources.push_back("gen");
-  if (    recMuons.isValid()) sources.push_back("rec");
+  if (genParticles.isValid())
+    sources.push_back("gen");
+  if (recMuons.isValid())
+    sources.push_back("rec");
 
   for (size_t sourceNo = 0; sourceNo < sources.size(); sourceNo++) {
-
     string source = sources[sourceNo];
-    
+
     // If this is the first event, initialize selectors
-    if (!genMuonSelector_) genMuonSelector_ =
-      new StringCutObjectSelector<reco::GenParticle>(genMuonCut_);
-    if (!recMuonSelector_) recMuonSelector_ =
-      new StringCutObjectSelector<reco::Muon       >(recMuonCut_);
+    if (!genMuonSelector_)
+      genMuonSelector_ = new StringCutObjectSelector<reco::GenParticle>(genMuonCut_);
+    if (!recMuonSelector_)
+      recMuonSelector_ = new StringCutObjectSelector<reco::Muon>(recMuonCut_);
 
     // Make each good gen/rec muon into the base cand for a MatchStruct
     vector<MatchStruct> matches;
     if (source == "gen" && genParticles.isValid())
       for (size_t i = 0; i < genParticles->size(); i++)
         if ((*genMuonSelector_)(genParticles->at(i)))
-          matches.push_back(MatchStruct(& genParticles->at(i)));
+          matches.push_back(MatchStruct(&genParticles->at(i)));
     if (source == "rec" && recMuons.isValid())
       for (size_t i = 0; i < recMuons->size(); i++)
         if ((*recMuonSelector_)(recMuons->at(i)))
-          matches.push_back(MatchStruct(& recMuons->at(i)));
-    
+          matches.push_back(MatchStruct(&recMuons->at(i)));
+
     // Sort the MatchStructs by pT for later filling of turn-on curve
     sort(matches.begin(), matches.end(), matchesByDescendingPt());
 
     const bool isDoubleMuonPath = (hltPath_.find("Double") != string::npos);
-    const size_t nFilters   = moduleLabels_.size();
-    const size_t nSteps     = stepLabels_.size();
-    const size_t nStepsHlt  = nSteps - 2;
+    const size_t nFilters = moduleLabels_.size();
+    const size_t nSteps = stepLabels_.size();
+    const size_t nStepsHlt = nSteps - 2;
     const int nObjectsToPassPath = (isDoubleMuonPath) ? 2 : 1;
     l1t::MuonVectorRef candsL1;
-    vector< vector< RecoChargedCandidateRef      > > refsHlt(nStepsHlt);
-    vector< vector< const RecoChargedCandidate * > > candsHlt(nStepsHlt);
-    
+    vector<vector<RecoChargedCandidateRef>> refsHlt(nStepsHlt);
+    vector<vector<const RecoChargedCandidate *>> candsHlt(nStepsHlt);
+
     for (size_t i = 0; i < nFilters; i++) {
       const int hltStep = i - 1;
       InputTag tag = InputTag(moduleLabels_[i], "", hltProcessName_);
@@ -200,72 +175,73 @@ HLTMuonPlotter::analyze(const Event & iEvent, const EventSetup & iSetup)
         if (i == 0)
           rawTriggerEvent->getObjects(iFilter, TriggerL1Mu, candsL1);
         else
-          rawTriggerEvent->getObjects(iFilter, TriggerMuon, 
-                                      refsHlt[hltStep]);
-      }
-      else LogTrace("HLTMuonVal") << "No collection with label " << tag;
+          rawTriggerEvent->getObjects(iFilter, TriggerMuon, refsHlt[hltStep]);
+      } else
+        LogTrace("HLTMuonVal") << "No collection with label " << tag;
     }
     for (size_t i = 0; i < nStepsHlt; i++)
       for (size_t j = 0; j < refsHlt[i].size(); j++)
         if (refsHlt[i][j].isAvailable()) {
-          candsHlt[i].push_back(& * refsHlt[i][j]);
+          candsHlt[i].push_back(&*refsHlt[i][j]);
         } else {
-          LogWarning("HLTMuonPlotter")
-            << "Ref refsHlt[i][j]: product not available "
-            << i << " " << j;
+          LogWarning("HLTMuonPlotter") << "Ref refsHlt[i][j]: product not available " << i << " " << j;
         }
-    
+
     // Add trigger objects to the MatchStructs
     findMatches(matches, candsL1, candsHlt);
-    
+
     vector<size_t> matchesInEtaRange;
     vector<bool> hasMatch(matches.size(), true);
-    
+
     for (size_t step = 0; step < nSteps; step++) {
-      
       size_t hltStep = (step >= 2) ? step - 2 : 0;
-      if (nSteps == 6) hltStep=hltStep-1; // case of the tracker muon (it has no L2)
+      if (nSteps == 6)
+        hltStep = hltStep - 1;  // case of the tracker muon (it has no L2)
       size_t level = 0;
-      if ((stepLabels_[step].find("L3TkIso") != string::npos)||(stepLabels_[step].find("TkTkIso") != string::npos)) level = 6;
-      else if ((stepLabels_[step].find("L3HcalIso") != string::npos)||(stepLabels_[step].find("TkEcalIso") != string::npos)) level = 5;
-      else if ((stepLabels_[step].find("L3EcalIso") != string::npos)||(stepLabels_[step].find("TkEcalIso") != string::npos)) level = 4;
-      else if ((stepLabels_[step].find("L3") != string::npos)||(stepLabels_[step].find("Tk") != string::npos)) level = 3;
-      else if (stepLabels_[step].find("L2") != string::npos) level = 2;
-      else if (stepLabels_[step].find("L1") != string::npos) level = 1;
-      
+      if ((stepLabels_[step].find("L3TkIso") != string::npos) || (stepLabels_[step].find("TkTkIso") != string::npos))
+        level = 6;
+      else if ((stepLabels_[step].find("L3HcalIso") != string::npos) ||
+               (stepLabels_[step].find("TkEcalIso") != string::npos))
+        level = 5;
+      else if ((stepLabels_[step].find("L3EcalIso") != string::npos) ||
+               (stepLabels_[step].find("TkEcalIso") != string::npos))
+        level = 4;
+      else if ((stepLabels_[step].find("L3") != string::npos) || (stepLabels_[step].find("Tk") != string::npos))
+        level = 3;
+      else if (stepLabels_[step].find("L2") != string::npos)
+        level = 2;
+      else if (stepLabels_[step].find("L1") != string::npos)
+        level = 1;
+
       for (size_t j = 0; j < matches.size(); j++) {
         if (level == 0) {
           if (fabs(matches[j].candBase->eta()) < cutMaxEta_)
             matchesInEtaRange.push_back(j);
-        }
-        else if (level == 1) {
+        } else if (level == 1) {
           if (matches[j].candL1 == nullptr)
             hasMatch[j] = false;
-        }
-        else if (level >= 2) {
+        } else if (level >= 2) {
           if (matches[j].candHlt[hltStep] == nullptr)
             hasMatch[j] = false;
           else if (!hasMatch[j]) {
-            LogTrace("HLTMuonVal") << "Match found for HLT step " << hltStep
-                                   << " of " << nStepsHlt 
+            LogTrace("HLTMuonVal") << "Match found for HLT step " << hltStep << " of " << nStepsHlt
                                    << " without previous match!";
             break;
           }
         }
       }
-      
-      if (std::count(hasMatch.begin(), hasMatch.end(), true) <
-          nObjectsToPassPath) 
+
+      if (std::count(hasMatch.begin(), hasMatch.end(), true) < nObjectsToPassPath)
         break;
-      
-      string pre  = source + "Pass";
+
+      string pre = source + "Pass";
       string post = "_" + stepLabels_[step];
-      
+
       for (size_t j = 0; j < matches.size(); j++) {
-        float pt  = matches[j].candBase->pt();
+        float pt = matches[j].candBase->pt();
         float eta = matches[j].candBase->eta();
         float phi = matches[j].candBase->phi();
-        if (hasMatch[j]) { 
+        if (hasMatch[j]) {
           if (!matchesInEtaRange.empty() && j == matchesInEtaRange[0])
             elements_[pre + "MaxPt1" + post]->Fill(pt);
           if (matchesInEtaRange.size() >= 2 && j == matchesInEtaRange[1])
@@ -277,99 +253,80 @@ HLTMuonPlotter::analyze(const Event & iEvent, const EventSetup & iSetup)
           }
         }
       }
-      
     }
-    
-    
-    
-  } // End loop over sources
-  
-}
-
 
+  }  // End loop over sources
+}
 
-boost::tuple<
-  edm::EDGetTokenT<trigger::TriggerEventWithRefs>,
-  edm::EDGetTokenT<reco::GenParticleCollection>,
-  edm::EDGetTokenT<reco::MuonCollection> > HLTMuonPlotter::getTokens(const edm::ParameterSet& pset, edm::ConsumesCollector&& iC)
-{
-
-  edm::EDGetTokenT<trigger::TriggerEventWithRefs> _hltTriggerSummaryRAW = iC.consumes<TriggerEventWithRefs>(edm::InputTag("hltTriggerSummaryRAW"));
-  edm::EDGetTokenT<reco::GenParticleCollection> _genParticleLabel = iC.consumes<GenParticleCollection>(pset.getParameter<string>("genParticleLabel"));
-  edm::EDGetTokenT<reco::MuonCollection> _recMuonLabel = iC.consumes<MuonCollection>(pset.getParameter<string>("recMuonLabel"));
-
-  boost::tuple<
-    edm::EDGetTokenT<trigger::TriggerEventWithRefs>,
-    edm::EDGetTokenT<reco::GenParticleCollection>,
-    edm::EDGetTokenT<reco::MuonCollection> > myTuple(_hltTriggerSummaryRAW,_genParticleLabel,_recMuonLabel);
+boost::tuple<edm::EDGetTokenT<trigger::TriggerEventWithRefs>,
+             edm::EDGetTokenT<reco::GenParticleCollection>,
+             edm::EDGetTokenT<reco::MuonCollection>>
+HLTMuonPlotter::getTokens(const edm::ParameterSet &pset, edm::ConsumesCollector &&iC) {
+  edm::EDGetTokenT<trigger::TriggerEventWithRefs> _hltTriggerSummaryRAW =
+      iC.consumes<TriggerEventWithRefs>(edm::InputTag("hltTriggerSummaryRAW"));
+  edm::EDGetTokenT<reco::GenParticleCollection> _genParticleLabel =
+      iC.consumes<GenParticleCollection>(pset.getParameter<string>("genParticleLabel"));
+  edm::EDGetTokenT<reco::MuonCollection> _recMuonLabel =
+      iC.consumes<MuonCollection>(pset.getParameter<string>("recMuonLabel"));
+
+  boost::tuple<edm::EDGetTokenT<trigger::TriggerEventWithRefs>,
+               edm::EDGetTokenT<reco::GenParticleCollection>,
+               edm::EDGetTokenT<reco::MuonCollection>>
+      myTuple(_hltTriggerSummaryRAW, _genParticleLabel, _recMuonLabel);
 
   return (myTuple);
 }
 
-
-
-void
-HLTMuonPlotter::findMatches(
-    vector<MatchStruct> & matches,
-    const l1t::MuonVectorRef& candsL1,
-    const std::vector< vector< const RecoChargedCandidate *> >& candsHlt)
-{
-
+void HLTMuonPlotter::findMatches(vector<MatchStruct> &matches,
+                                 const l1t::MuonVectorRef &candsL1,
+                                 const std::vector<vector<const RecoChargedCandidate *>> &candsHlt) {
   set<size_t>::iterator it;
 
   set<size_t> indicesL1;
-  for (size_t i = 0; i < candsL1.size(); i++) 
+  for (size_t i = 0; i < candsL1.size(); i++)
     indicesL1.insert(i);
-  
-  vector< set<size_t> > indicesHlt(candsHlt.size());
+
+  vector<set<size_t>> indicesHlt(candsHlt.size());
   for (size_t i = 0; i < candsHlt.size(); i++)
     for (size_t j = 0; j < candsHlt[i].size(); j++)
       indicesHlt[i].insert(j);
 
   for (size_t i = 0; i < matches.size(); i++) {
-
-    const Candidate * cand = matches[i].candBase;
+    const Candidate *cand = matches[i].candBase;
 
     double bestDeltaR = cutsDr_[0];
     size_t bestMatch = kNull;
     for (it = indicesL1.begin(); it != indicesL1.end(); it++) {
-     if (candsL1[*it].isAvailable()) { 
-      double dR = deltaR(cand->eta(), cand->phi(),
-                         candsL1[*it]->eta(), candsL1[*it]->phi());
-      if (dR < bestDeltaR) {
-        bestMatch = *it;
-        bestDeltaR = dR;
+      if (candsL1[*it].isAvailable()) {
+        double dR = deltaR(cand->eta(), cand->phi(), candsL1[*it]->eta(), candsL1[*it]->phi());
+        if (dR < bestDeltaR) {
+          bestMatch = *it;
+          bestDeltaR = dR;
+        }
+        // TrajectoryStateOnSurface propagated;
+        // float dR = 999., dPhi = 999.;
+        // bool isValid = l1Matcher_.match(* cand, * candsL1[*it],
+        //                                 dR, dPhi, propagated);
+        // if (isValid && dR < bestDeltaR) {
+        //   bestMatch = *it;
+        //   bestDeltaR = dR;
+        // }
+      } else {
+        LogWarning("HLTMuonPlotter") << "Ref candsL1[*it]: product not available " << *it;
       }
-      // TrajectoryStateOnSurface propagated;		
-      // float dR = 999., dPhi = 999.;		
-      // bool isValid = l1Matcher_.match(* cand, * candsL1[*it], 		
-      //                                 dR, dPhi, propagated);		
-      // if (isValid && dR < bestDeltaR) {		
-      //   bestMatch = *it;		
-      //   bestDeltaR = dR;		
-      // }		
-     } else {
-       LogWarning("HLTMuonPlotter")
-	 << "Ref candsL1[*it]: product not available "
-	 << *it;
-     }
     }
-    
-    
+
     if (bestMatch != kNull)
-      matches[i].candL1 = & * candsL1[bestMatch];
+      matches[i].candL1 = &*candsL1[bestMatch];
     indicesL1.erase(bestMatch);
 
     matches[i].candHlt.assign(candsHlt.size(), nullptr);
     for (size_t j = 0; j < candsHlt.size(); j++) {
-      size_t level = (candsHlt.size() == 4) ? (j < 2) ? 2 : 3 :
-                     (candsHlt.size() == 2) ? (j < 1) ? 2 : 3 :
-                     2;
+      size_t level = (candsHlt.size() == 4) ? (j < 2) ? 2 : 3 : (candsHlt.size() == 2) ? (j < 1) ? 2 : 3 : 2;
       bestDeltaR = cutsDr_[level - 2];
       bestMatch = kNull;
       for (it = indicesHlt[j].begin(); it != indicesHlt[j].end(); it++) {
-        double dR = deltaR(cand->eta(), cand->phi(),
-                           candsHlt[j][*it]->eta(), candsHlt[j][*it]->phi());
+        double dR = deltaR(cand->eta(), cand->phi(), candsHlt[j][*it]->eta(), candsHlt[j][*it]->phi());
         if (dR < bestDeltaR) {
           bestMatch = *it;
           bestDeltaR = dR;
@@ -380,56 +337,43 @@ HLTMuonPlotter::findMatches(
       indicesHlt[j].erase(bestMatch);
     }
 
-//     cout << "    Muon: " << cand->eta() << ", ";
-//     if (matches[i].candL1) cout << matches[i].candL1->eta() << ", ";
-//     else cout << "none, ";
-//     for (size_t j = 0; j < candsHlt.size(); j++) 
-//       if (matches[i].candHlt[j]) cout << matches[i].candHlt[j]->eta() << ", ";
-//       else cout << "none, ";
-//     cout << endl;
-
+    //     cout << "    Muon: " << cand->eta() << ", ";
+    //     if (matches[i].candL1) cout << matches[i].candL1->eta() << ", ";
+    //     else cout << "none, ";
+    //     for (size_t j = 0; j < candsHlt.size(); j++)
+    //       if (matches[i].candHlt[j]) cout << matches[i].candHlt[j]->eta() <<
+    //       ", "; else cout << "none, ";
+    //     cout << endl;
   }
-
 }
 
-
-
-
-void 
-HLTMuonPlotter::bookHist(DQMStore::IBooker & iBooker,
-			 string path, string label, 
-                         string source, string type)
-{
-
-  string sourceUpper = source; 
+void HLTMuonPlotter::bookHist(DQMStore::IBooker &iBooker, string path, string label, string source, string type) {
+  string sourceUpper = source;
   sourceUpper[0] = toupper(sourceUpper[0]);
   string name = source + "Pass" + type + "_" + label;
-  TH1F * h;
+  TH1F *h;
 
   if (type.find("MaxPt") != string::npos) {
     string desc = (type == "MaxPt1") ? "Leading" : "Next-to-Leading";
-    string title = "pT of " + desc + " " + sourceUpper + " Muon "+
-                   "matched to " + label;
+    string title = "pT of " + desc + " " + sourceUpper + " Muon " + "matched to " + label;
     const size_t nBins = parametersTurnOn_.size() - 1;
-    float * edges = new float[nBins + 1];
-    for (size_t i = 0; i < nBins + 1; i++) edges[i] = parametersTurnOn_[i];
+    float *edges = new float[nBins + 1];
+    for (size_t i = 0; i < nBins + 1; i++)
+      edges[i] = parametersTurnOn_[i];
     h = new TH1F(name.c_str(), title.c_str(), nBins, edges);
   }
 
   else {
     string symbol = (type == "Eta") ? "#eta" : "#phi";
-    string title  = symbol + " of " + sourceUpper + " Muons " +
-                    "matched to " + label;
-    vector<double> params = (type == "Eta") ? parametersEta_ : parametersPhi_; 
-    int    nBins = (int)params[0];
-    double min   = params[1];
-    double max   = params[2];
+    string title = symbol + " of " + sourceUpper + " Muons " + "matched to " + label;
+    vector<double> params = (type == "Eta") ? parametersEta_ : parametersPhi_;
+    int nBins = (int)params[0];
+    double min = params[1];
+    double max = params[2];
     h = new TH1F(name.c_str(), title.c_str(), nBins, min, max);
   }
 
   h->Sumw2();
   elements_[name] = iBooker.book1D(name, h);
   delete h;
-
 }
-
diff --git a/HLTriggerOffline/Muon/src/HLTMuonValidator.cc b/HLTriggerOffline/Muon/src/HLTMuonValidator.cc
index adf4695a7e96b..2fb94f72cb457 100644
--- a/HLTriggerOffline/Muon/src/HLTMuonValidator.cc
+++ b/HLTriggerOffline/Muon/src/HLTMuonValidator.cc
@@ -2,7 +2,7 @@
 //
 // Package:     HLTMuonValidator
 // Class:       HLTMuonValidator
-// 
+//
 
 //
 // Jason Slaunwhite and Jeff Klukas
@@ -10,43 +10,34 @@
 //
 
 // system include files
-#include <memory>
 #include <iostream>
+#include <memory>
 
 // user include files
 #include "HLTriggerOffline/Muon/interface/HLTMuonPlotter.h"
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-
-#include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
+#include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
-
-#include "TFile.h"
 #include "TDirectory.h"
+#include "TFile.h"
 #include "TPRegexp.h"
 #include "boost/tuple/tuple.hpp"
 
-
-
 //////////////////////////////////////////////////////////////////////////////
 //////// Define the interface ////////////////////////////////////////////////
 
-
-
 class HLTMuonValidator : public DQMEDAnalyzer {
-
 public:
-
-  explicit HLTMuonValidator(const edm::ParameterSet&);
+  explicit HLTMuonValidator(const edm::ParameterSet &);
 
 private:
-
   // Analyzer Methods
   void dqmBeginRun(const edm::Run &, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
@@ -55,7 +46,7 @@ class HLTMuonValidator : public DQMEDAnalyzer {
 
   // Extra Methods
   std::vector<std::string> moduleLabels(std::string);
-  std::vector<std::string> stepLabels(const std::vector<std::string>&);
+  std::vector<std::string> stepLabels(const std::vector<std::string> &);
 
   // Input from Configuration File
   edm::ParameterSet pset_;
@@ -65,15 +56,12 @@ class HLTMuonValidator : public DQMEDAnalyzer {
   // Member Variables
   std::vector<HLTMuonPlotter> analyzers_;
   HLTConfigProvider hltConfig_;
-  boost::tuple<
-    edm::EDGetTokenT<trigger::TriggerEventWithRefs>,
-    edm::EDGetTokenT<reco::GenParticleCollection>,
-    edm::EDGetTokenT<reco::MuonCollection> > myTokens_;
-
+  boost::tuple<edm::EDGetTokenT<trigger::TriggerEventWithRefs>,
+               edm::EDGetTokenT<reco::GenParticleCollection>,
+               edm::EDGetTokenT<reco::MuonCollection>>
+      myTokens_;
 };
 
-
-
 //////////////////////////////////////////////////////////////////////////////
 //////// Namespaces, Typedefs, and Constants /////////////////////////////////
 
@@ -84,95 +72,72 @@ using namespace trigger;
 
 typedef vector<string> vstring;
 
-
-
 //////////////////////////////////////////////////////////////////////////////
 //////// Class Methods ///////////////////////////////////////////////////////
 
-HLTMuonValidator::HLTMuonValidator(const ParameterSet& pset) :
-  pset_(pset),
-  hltProcessName_(pset.getParameter<string>("hltProcessName")),
-  hltPathsToCheck_(pset.getParameter<vstring>("hltPathsToCheck"))
-{
-
+HLTMuonValidator::HLTMuonValidator(const ParameterSet &pset)
+    : pset_(pset),
+      hltProcessName_(pset.getParameter<string>("hltProcessName")),
+      hltPathsToCheck_(pset.getParameter<vstring>("hltPathsToCheck")) {
   myTokens_ = HLTMuonPlotter::getTokens(pset_, consumesCollector());
-
 }
 
-
-
-vector<string> 
-HLTMuonValidator::moduleLabels(string path) {
-
+vector<string> HLTMuonValidator::moduleLabels(string path) {
   vector<string> modules = hltConfig_.moduleLabels(path);
   vector<string>::iterator iter = modules.begin();
 
   while (iter != modules.end())
-    if (iter->find("Filtered") == string::npos) 
+    if (iter->find("Filtered") == string::npos)
       iter = modules.erase(iter);
     else
       ++iter;
 
   return modules;
-
 }
 
+vector<string> HLTMuonValidator::stepLabels(const vector<string> &modules) {
+  vector<string> steps(1, "All");
+  for (size_t i = 0; i < modules.size(); i++) {
+    if ((modules[i].find("IsoFiltered") != string::npos)) {
+      if (modules[i].find("L3") != string::npos)
+        steps.push_back("L3TkIso");
+      else
+        steps.push_back("L2Iso");
+    } else if ((modules[i].find("pfecalIsoRhoFiltered") != string::npos)) {
+      if (modules[i].find("L3") != string::npos)
+        steps.push_back("L3EcalIso");
+      else if (modules[i].find("TkFiltered") != string::npos)
+        steps.push_back("TkEcalIso");
+    } else if ((modules[i].find("pfhcalIsoRhoFiltered") != string::npos)) {
+      if (modules[i].find("L3") != string::npos)
+        steps.push_back("L3HcalIso");
+      else if (modules[i].find("TkFiltered") != string::npos)
+        steps.push_back("TkHcalIso");
+    } else if (modules[i].find("TkFiltered") != string::npos) {
+      steps.push_back("Tk");
+    } else if (modules[i].find("L3") != string::npos)
+      steps.push_back("L3");
+    else if (modules[i].find("L2") != string::npos)
+      steps.push_back("L2");
+    else if (modules[i].find("L1") != string::npos)
+      steps.push_back("L1");
+    else
+      return vector<string>();
+  }
 
-
-vector<string>
-HLTMuonValidator::stepLabels(const vector<string>& modules) {
-    vector<string> steps(1, "All");
-    for (size_t i = 0; i < modules.size(); i++) {
-        if ((modules[i].find("IsoFiltered") != string::npos)){
-            if (modules[i].find("L3") != string::npos)
-                steps.push_back("L3TkIso");
-            else
-                steps.push_back("L2Iso");
-        }
-        else if ((modules[i].find("pfecalIsoRhoFiltered") != string::npos)) {
-            if (modules[i].find("L3") != string::npos)
-                steps.push_back("L3EcalIso");
-            else if (modules[i].find("TkFiltered") != string::npos)
-                steps.push_back("TkEcalIso");
-        }
-        else if ((modules[i].find("pfhcalIsoRhoFiltered") != string::npos)) {
-            if (modules[i].find("L3") != string::npos)
-                steps.push_back("L3HcalIso");
-            else if (modules[i].find("TkFiltered") != string::npos)
-                steps.push_back("TkHcalIso");
-        }
-        else if (modules[i].find("TkFiltered") != string::npos){
-            steps.push_back("Tk");
-        }
-        else if (modules[i].find("L3") != string::npos)
-            steps.push_back("L3");
-        else if (modules[i].find("L2") != string::npos)
-            steps.push_back("L2");
-        else if (modules[i].find("L1") != string::npos)
-            steps.push_back("L1");
-        else
-            return vector<string>();
-    }
-
-    if (steps.size() < 2 || ((steps[1] != "L1")&&(steps[1] != "Tk")))
-        return vector<string>();
-    return steps;
-    
+  if (steps.size() < 2 || ((steps[1] != "L1") && (steps[1] != "Tk")))
+    return vector<string>();
+  return steps;
 }
 
-
-
-void 
-HLTMuonValidator::dqmBeginRun(const edm::Run & iRun, 
-			      const edm::EventSetup & iSetup) 
-{  
+void HLTMuonValidator::dqmBeginRun(const edm::Run &iRun, const edm::EventSetup &iSetup) {
   // Initialize hltConfig
   bool changedConfig;
   if (!hltConfig_.init(iRun, iSetup, hltProcessName_, changedConfig)) {
-    LogError("HLTMuonVal") << "Initialization of HLTConfigProvider failed!!"; 
+    LogError("HLTMuonVal") << "Initialization of HLTConfigProvider failed!!";
     return;
   }
-  
+
   // Get the set of trigger paths we want to make plots for
   set<string> hltPaths;
   for (size_t i = 0; i < hltPathsToCheck_.size(); i++) {
@@ -181,17 +146,16 @@ HLTMuonValidator::dqmBeginRun(const edm::Run & iRun,
       if (TString(hltConfig_.triggerNames()[j]).Contains(pattern))
         hltPaths.insert(hltConfig_.triggerNames()[j]);
   }
-  
+
   // Initialize the analyzers
   analyzers_.clear();
   set<string>::iterator iPath;
   for (iPath = hltPaths.begin(); iPath != hltPaths.end(); iPath++) {
-    
-    string path = * iPath;
+    string path = *iPath;
     string shortpath = path;
     if (path.rfind("_v") < path.length())
       shortpath = path.substr(0, path.rfind("_v"));
-    
+
     vector<string> labels = moduleLabels(path);
     vector<string> steps = stepLabels(labels);
 
@@ -200,56 +164,29 @@ HLTMuonValidator::dqmBeginRun(const edm::Run & iRun,
       analyzers_.push_back(analyzer);
     }
   }
-
 }
 
-
-
-void HLTMuonValidator::bookHistograms(DQMStore::IBooker & iBooker, 
-				      edm::Run const & iRun, 
-				      edm::EventSetup const & iSetup)
-{
-
+void HLTMuonValidator::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &iRun, edm::EventSetup const &iSetup) {
   // Call the beginRun (which books all the histograms)
   vector<HLTMuonPlotter>::iterator iter;
   for (iter = analyzers_.begin(); iter != analyzers_.end(); ++iter) {
     iter->beginRun(iBooker, iRun, iSetup);
   }
-  
 }
 
-
-
-void
-HLTMuonValidator::analyze(const Event& iEvent, 
-			  const EventSetup& iSetup)
-{
-  
+void HLTMuonValidator::analyze(const Event &iEvent, const EventSetup &iSetup) {
   vector<HLTMuonPlotter>::iterator iter;
   for (iter = analyzers_.begin(); iter != analyzers_.end(); ++iter) {
     iter->analyze(iEvent, iSetup);
   }
-  
 }
 
-
-
-
-void 
-HLTMuonValidator::endRun(const edm::Run & iRun, 
-			 const edm::EventSetup& iSetup)
-{
-
+void HLTMuonValidator::endRun(const edm::Run &iRun, const edm::EventSetup &iSetup) {
   // vector<HLTMuonPlotter>::iterator iter;
   // for (iter = analyzers_.begin(); iter != analyzers_.end(); ++iter) {
   //   iter->endRun(iRun, iSetup);
   // }
-
 }
 
-
-
-
-
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(HLTMuonValidator);
diff --git a/HLTriggerOffline/Muon/src/L1MuonMatcherAlgo.cc b/HLTriggerOffline/Muon/src/L1MuonMatcherAlgo.cc
index 23c4bd20eea93..77f8f9c9140f7 100644
--- a/HLTriggerOffline/Muon/src/L1MuonMatcherAlgo.cc
+++ b/HLTriggerOffline/Muon/src/L1MuonMatcherAlgo.cc
@@ -2,62 +2,61 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-L1MuonMatcherAlgo::L1MuonMatcherAlgo(const edm::ParameterSet & iConfig) :
-    prop_(iConfig),
-    preselectionCut_(iConfig.existsAs<std::string>("preselection") ? iConfig.getParameter<std::string>("preselection") : ""),
-    deltaR2_(std::pow(iConfig.getParameter<double>("maxDeltaR"),2)),
-    deltaPhi_(iConfig.existsAs<double>("maxDeltaPhi") ? iConfig.getParameter<double>("maxDeltaPhi") : 10),
-    sortByDeltaPhi_(iConfig.existsAs<bool>("sortByDeltaPhi") ? iConfig.getParameter<bool>("sortByDeltaPhi") : false)
-{
+L1MuonMatcherAlgo::L1MuonMatcherAlgo(const edm::ParameterSet &iConfig)
+    : prop_(iConfig),
+      preselectionCut_(iConfig.existsAs<std::string>("preselection") ? iConfig.getParameter<std::string>("preselection")
+                                                                     : ""),
+      deltaR2_(std::pow(iConfig.getParameter<double>("maxDeltaR"), 2)),
+      deltaPhi_(iConfig.existsAs<double>("maxDeltaPhi") ? iConfig.getParameter<double>("maxDeltaPhi") : 10),
+      sortByDeltaPhi_(iConfig.existsAs<bool>("sortByDeltaPhi") ? iConfig.getParameter<bool>("sortByDeltaPhi") : false) {
 }
 
 L1MuonMatcherAlgo::~L1MuonMatcherAlgo() {}
 
-void
-L1MuonMatcherAlgo::init(const edm::EventSetup & iSetup) {
-    prop_.init(iSetup);
-}
-
-bool
-L1MuonMatcherAlgo::match(TrajectoryStateOnSurface & propagated, const l1extra::L1MuonParticle &l1, float &deltaR, float &deltaPhi) const {
-    if (preselectionCut_(l1)) {
-        GlobalPoint pos = propagated.globalPosition();
-        double thisDeltaPhi = ::deltaPhi(double(pos.phi()),  l1.phi());
-        double thisDeltaR2  = ::deltaR2(double(pos.eta()), double(pos.phi()), l1.eta(), l1.phi());
-        if ((fabs(thisDeltaPhi) < deltaPhi_) && (thisDeltaR2 < deltaR2_)) {
-            deltaR   = std::sqrt(thisDeltaR2);
-            deltaPhi = thisDeltaPhi;
-            return true;
-        }
-    }
-    return false;
-}
+void L1MuonMatcherAlgo::init(const edm::EventSetup &iSetup) { prop_.init(iSetup); }
 
-int
-L1MuonMatcherAlgo::match(TrajectoryStateOnSurface & propagated, const std::vector<l1extra::L1MuonParticle> &l1s, float &deltaR, float &deltaPhi) const {
-    return matchGeneric(propagated, l1s, preselectionCut_, deltaR, deltaPhi);
-/*
-    int match = -1;
-    double minDeltaPhi = deltaPhi_;
-    double minDeltaR2  = deltaR2_;
+bool L1MuonMatcherAlgo::match(TrajectoryStateOnSurface &propagated,
+                              const l1extra::L1MuonParticle &l1,
+                              float &deltaR,
+                              float &deltaPhi) const {
+  if (preselectionCut_(l1)) {
     GlobalPoint pos = propagated.globalPosition();
-    for (int i = 0, n = l1s.size(); i < n; ++i) {
-        const l1extra::L1MuonParticle &l1 = l1s[i];
-        if (preselectionCut_(l1)) {
-            double thisDeltaPhi = ::deltaPhi(double(pos.phi()),  l1.phi());
-            double thisDeltaR2  = ::deltaR2(double(pos.eta()), double(pos.phi()), l1.eta(), l1.phi());
-            if ((fabs(thisDeltaPhi) < deltaPhi_) && (thisDeltaR2 < deltaR2_)) { // check both
-                if (sortByDeltaPhi_ ? (fabs(thisDeltaPhi) < fabs(minDeltaPhi)) : (thisDeltaR2 < minDeltaR2)) { // sort on one
-                    match = i;
-                    deltaR   = std::sqrt(thisDeltaR2);
-                    deltaPhi = thisDeltaPhi;
-                    if (sortByDeltaPhi_) minDeltaPhi = thisDeltaPhi; else minDeltaR2 = thisDeltaR2;
-                }
-            }
-        }
+    double thisDeltaPhi = ::deltaPhi(double(pos.phi()), l1.phi());
+    double thisDeltaR2 = ::deltaR2(double(pos.eta()), double(pos.phi()), l1.eta(), l1.phi());
+    if ((fabs(thisDeltaPhi) < deltaPhi_) && (thisDeltaR2 < deltaR2_)) {
+      deltaR = std::sqrt(thisDeltaR2);
+      deltaPhi = thisDeltaPhi;
+      return true;
     }
-    return match;
-*/
+  }
+  return false;
 }
 
-
+int L1MuonMatcherAlgo::match(TrajectoryStateOnSurface &propagated,
+                             const std::vector<l1extra::L1MuonParticle> &l1s,
+                             float &deltaR,
+                             float &deltaPhi) const {
+  return matchGeneric(propagated, l1s, preselectionCut_, deltaR, deltaPhi);
+  /*
+      int match = -1;
+      double minDeltaPhi = deltaPhi_;
+      double minDeltaR2  = deltaR2_;
+      GlobalPoint pos = propagated.globalPosition();
+      for (int i = 0, n = l1s.size(); i < n; ++i) {
+          const l1extra::L1MuonParticle &l1 = l1s[i];
+          if (preselectionCut_(l1)) {
+              double thisDeltaPhi = ::deltaPhi(double(pos.phi()),  l1.phi());
+              double thisDeltaR2  = ::deltaR2(double(pos.eta()),
+     double(pos.phi()), l1.eta(), l1.phi()); if ((fabs(thisDeltaPhi) <
+     deltaPhi_) && (thisDeltaR2 < deltaR2_)) { // check both if (sortByDeltaPhi_
+     ? (fabs(thisDeltaPhi) < fabs(minDeltaPhi)) : (thisDeltaR2 < minDeltaR2)) {
+     // sort on one match = i; deltaR   = std::sqrt(thisDeltaR2); deltaPhi =
+     thisDeltaPhi; if (sortByDeltaPhi_) minDeltaPhi = thisDeltaPhi; else
+     minDeltaR2 = thisDeltaR2;
+                  }
+              }
+          }
+      }
+      return match;
+  */
+}
diff --git a/HLTriggerOffline/Muon/src/PropagateToMuon.cc b/HLTriggerOffline/Muon/src/PropagateToMuon.cc
index 24ca8c9327cd8..0ce8167efd350 100644
--- a/HLTriggerOffline/Muon/src/PropagateToMuon.cc
+++ b/HLTriggerOffline/Muon/src/PropagateToMuon.cc
@@ -1,166 +1,195 @@
 #include "HLTriggerOffline/Muon/interface/PropagateToMuon.h"
 
-#include <iostream>
 #include <cmath>
+#include <iostream>
 
 #include "DataFormats/RecoCandidate/interface/RecoCandidate.h"
 
+#include "DataFormats/GeometrySurface/interface/TrapezoidalPlaneBounds.h"
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 #include "RecoMuon/Records/interface/MuonRecoGeometryRecord.h"
+#include "TrackingTools/DetLayers/interface/DetLayer.h"
+#include "TrackingTools/KalmanUpdators/interface/Chi2MeasurementEstimator.h"
 #include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
-#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
-#include "DataFormats/GeometrySurface/interface/TrapezoidalPlaneBounds.h"
-#include "TrackingTools/DetLayers/interface/DetLayer.h" 
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
-#include "TrackingTools/KalmanUpdators/interface/Chi2MeasurementEstimator.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-PropagateToMuon::PropagateToMuon(const edm::ParameterSet & iConfig) :
-    useSimpleGeometry_(iConfig.getParameter<bool>("useSimpleGeometry")),
-    whichTrack_(None), whichState_(AtVertex),
-    cosmicPropagation_(iConfig.existsAs<bool>("cosmicPropagationHypothesis") ? iConfig.getParameter<bool>("cosmicPropagationHypothesis") : false)
-{
-    std::string whichTrack = iConfig.getParameter<std::string>("useTrack");
-    if      (whichTrack == "none")    { whichTrack_ = None; }
-    else if (whichTrack == "tracker") { whichTrack_ = TrackerTk; }
-    else if (whichTrack == "muon")    { whichTrack_ = MuonTk; }
-    else if (whichTrack == "global")  { whichTrack_ = GlobalTk; }
-    else throw cms::Exception("Configuration") << "Parameter 'useTrack' must be 'none', 'tracker', 'muon', 'global'\n";
-    if (whichTrack_ != None) {
-        std::string whichState = iConfig.getParameter<std::string>("useState");
-        if      (whichState == "atVertex")  { whichState_ = AtVertex; }
-        else if (whichState == "innermost") { whichState_ = Innermost; }
-        else if (whichState == "outermost") { whichState_ = Outermost; }
-        else throw cms::Exception("Configuration") << "Parameter 'useState' must be 'atVertex', 'innermost', 'outermost'\n";
-    }
-    if (cosmicPropagation_ && (whichTrack_ == None || whichState_ == AtVertex)) {
-        throw cms::Exception("Configuration") << "When using 'cosmicPropagationHypothesis' useTrack must not be 'none', and the state must not be 'atVertex'\n";
-    }
+PropagateToMuon::PropagateToMuon(const edm::ParameterSet &iConfig)
+    : useSimpleGeometry_(iConfig.getParameter<bool>("useSimpleGeometry")),
+      whichTrack_(None),
+      whichState_(AtVertex),
+      cosmicPropagation_(iConfig.existsAs<bool>("cosmicPropagationHypothesis")
+                             ? iConfig.getParameter<bool>("cosmicPropagationHypothesis")
+                             : false) {
+  std::string whichTrack = iConfig.getParameter<std::string>("useTrack");
+  if (whichTrack == "none") {
+    whichTrack_ = None;
+  } else if (whichTrack == "tracker") {
+    whichTrack_ = TrackerTk;
+  } else if (whichTrack == "muon") {
+    whichTrack_ = MuonTk;
+  } else if (whichTrack == "global") {
+    whichTrack_ = GlobalTk;
+  } else
+    throw cms::Exception("Configuration") << "Parameter 'useTrack' must be 'none', 'tracker', 'muon', 'global'\n";
+  if (whichTrack_ != None) {
+    std::string whichState = iConfig.getParameter<std::string>("useState");
+    if (whichState == "atVertex") {
+      whichState_ = AtVertex;
+    } else if (whichState == "innermost") {
+      whichState_ = Innermost;
+    } else if (whichState == "outermost") {
+      whichState_ = Outermost;
+    } else
+      throw cms::Exception("Configuration") << "Parameter 'useState' must be 'atVertex', 'innermost', "
+                                               "'outermost'\n";
+  }
+  if (cosmicPropagation_ && (whichTrack_ == None || whichState_ == AtVertex)) {
+    throw cms::Exception("Configuration") << "When using 'cosmicPropagationHypothesis' useTrack must not be "
+                                             "'none', and the state must not be 'atVertex'\n";
+  }
 }
 
 PropagateToMuon::~PropagateToMuon() {}
 
-void
-PropagateToMuon::init(const edm::EventSetup & iSetup) {
-    iSetup.get<IdealMagneticFieldRecord>().get(magfield_);
-    iSetup.get<TrackingComponentsRecord>().get("SteppingHelixPropagatorAlong",    propagator_);
-    iSetup.get<TrackingComponentsRecord>().get("SteppingHelixPropagatorOpposite", propagatorOpposite_);
-    iSetup.get<TrackingComponentsRecord>().get("SteppingHelixPropagatorAny",      propagatorAny_);
-    iSetup.get<MuonRecoGeometryRecord>().get(muonGeometry_);
-
-    const DetLayer * dt2 = muonGeometry_->allDTLayers()[1];
-    const DetLayer * csc2Pos = muonGeometry_->forwardCSCLayers()[2];
-    const DetLayer * csc2Neg = muonGeometry_->backwardCSCLayers()[2];
-    barrelCylinder_ = dynamic_cast<const BoundCylinder *>(&dt2->surface());
-    endcapDiskPos_  = dynamic_cast<const BoundDisk *>(& csc2Pos->surface());
-    endcapDiskNeg_  = dynamic_cast<const BoundDisk *>(& csc2Neg->surface());
-    if (barrelCylinder_==nullptr || endcapDiskPos_==nullptr || endcapDiskNeg_==nullptr) throw cms::Exception("Geometry") << "Bad muon geometry!?";
-    barrelHalfLength_ = barrelCylinder_->bounds().length()/2;;
-    endcapRadii_ = std::make_pair(endcapDiskPos_->innerRadius(), endcapDiskPos_->outerRadius());
-    //std::cout << "L1MuonMatcher: barrel radius = " << barrelCylinder_->radius() << ", half length = " << barrelHalfLength_ <<
-    //             "; endcap Z = " << endcapDiskPos_->position().z() << ", radii = " << endcapRadii_.first << "," << endcapRadii_.second << std::std::endl;
+void PropagateToMuon::init(const edm::EventSetup &iSetup) {
+  iSetup.get<IdealMagneticFieldRecord>().get(magfield_);
+  iSetup.get<TrackingComponentsRecord>().get("SteppingHelixPropagatorAlong", propagator_);
+  iSetup.get<TrackingComponentsRecord>().get("SteppingHelixPropagatorOpposite", propagatorOpposite_);
+  iSetup.get<TrackingComponentsRecord>().get("SteppingHelixPropagatorAny", propagatorAny_);
+  iSetup.get<MuonRecoGeometryRecord>().get(muonGeometry_);
+
+  const DetLayer *dt2 = muonGeometry_->allDTLayers()[1];
+  const DetLayer *csc2Pos = muonGeometry_->forwardCSCLayers()[2];
+  const DetLayer *csc2Neg = muonGeometry_->backwardCSCLayers()[2];
+  barrelCylinder_ = dynamic_cast<const BoundCylinder *>(&dt2->surface());
+  endcapDiskPos_ = dynamic_cast<const BoundDisk *>(&csc2Pos->surface());
+  endcapDiskNeg_ = dynamic_cast<const BoundDisk *>(&csc2Neg->surface());
+  if (barrelCylinder_ == nullptr || endcapDiskPos_ == nullptr || endcapDiskNeg_ == nullptr)
+    throw cms::Exception("Geometry") << "Bad muon geometry!?";
+  barrelHalfLength_ = barrelCylinder_->bounds().length() / 2;
+  ;
+  endcapRadii_ = std::make_pair(endcapDiskPos_->innerRadius(), endcapDiskPos_->outerRadius());
+  // std::cout << "L1MuonMatcher: barrel radius = " << barrelCylinder_->radius()
+  // << ", half length = " << barrelHalfLength_ <<
+  //             "; endcap Z = " << endcapDiskPos_->position().z() << ", radii =
+  //             " << endcapRadii_.first << "," << endcapRadii_.second <<
+  //             std::std::endl;
 }
 
-FreeTrajectoryState 
-PropagateToMuon::startingState(const reco::Candidate &reco) const {
-    FreeTrajectoryState ret;
-    if (whichTrack_ != None) {
-        const reco::RecoCandidate *rc = dynamic_cast<const reco::RecoCandidate *>(&reco);
-        if (rc == nullptr) throw cms::Exception("Invalid Data") << "Input object is not a RecoCandidate.\n";
-        reco::TrackRef tk;
-        switch (whichTrack_) {
-            case TrackerTk: tk = rc->track();          break; 
-            case MuonTk   : tk = rc->standAloneMuon(); break;
-            case GlobalTk : tk = rc->combinedMuon();   break;
-            default: break; // just to make gcc happy
-        }
-        if (tk.isNull()) {
-            ret = FreeTrajectoryState();
-        } else {
-            ret = startingState(*tk);
-        }
+FreeTrajectoryState PropagateToMuon::startingState(const reco::Candidate &reco) const {
+  FreeTrajectoryState ret;
+  if (whichTrack_ != None) {
+    const reco::RecoCandidate *rc = dynamic_cast<const reco::RecoCandidate *>(&reco);
+    if (rc == nullptr)
+      throw cms::Exception("Invalid Data") << "Input object is not a RecoCandidate.\n";
+    reco::TrackRef tk;
+    switch (whichTrack_) {
+      case TrackerTk:
+        tk = rc->track();
+        break;
+      case MuonTk:
+        tk = rc->standAloneMuon();
+        break;
+      case GlobalTk:
+        tk = rc->combinedMuon();
+        break;
+      default:
+        break;  // just to make gcc happy
+    }
+    if (tk.isNull()) {
+      ret = FreeTrajectoryState();
     } else {
-        ret = FreeTrajectoryState(  GlobalPoint( reco.vx(), reco.vy(), reco.vz()),
-                                    GlobalVector(reco.px(), reco.py(), reco.pz()),
-                                    reco.charge(),
-                                    magfield_.product());
+      ret = startingState(*tk);
     }
-    return ret;
+  } else {
+    ret = FreeTrajectoryState(GlobalPoint(reco.vx(), reco.vy(), reco.vz()),
+                              GlobalVector(reco.px(), reco.py(), reco.pz()),
+                              reco.charge(),
+                              magfield_.product());
+  }
+  return ret;
 }
 
-FreeTrajectoryState 
-PropagateToMuon::startingState(const reco::Track &tk) const {
-    WhichState state = whichState_;
-    if (cosmicPropagation_) { 
-        if (whichState_ == Innermost) {
-            state = tk.innerPosition().Mag2() <= tk.outerPosition().Mag2()  ? Innermost : Outermost;
-        } else if (whichState_ == Outermost) {
-            state = tk.innerPosition().Mag2() <= tk.outerPosition().Mag2()  ? Outermost : Innermost;
-        }
+FreeTrajectoryState PropagateToMuon::startingState(const reco::Track &tk) const {
+  WhichState state = whichState_;
+  if (cosmicPropagation_) {
+    if (whichState_ == Innermost) {
+      state = tk.innerPosition().Mag2() <= tk.outerPosition().Mag2() ? Innermost : Outermost;
+    } else if (whichState_ == Outermost) {
+      state = tk.innerPosition().Mag2() <= tk.outerPosition().Mag2() ? Outermost : Innermost;
     }
-    switch (state) {
-        case Innermost: return trajectoryStateTransform::innerFreeState(  tk, magfield_.product()); 
-        case Outermost: return trajectoryStateTransform::outerFreeState(  tk, magfield_.product()); 
-
-        case AtVertex:  
-        default:
-            return trajectoryStateTransform::initialFreeState(tk, magfield_.product()); 
-    }
-    
+  }
+  switch (state) {
+    case Innermost:
+      return trajectoryStateTransform::innerFreeState(tk, magfield_.product());
+    case Outermost:
+      return trajectoryStateTransform::outerFreeState(tk, magfield_.product());
+
+    case AtVertex:
+    default:
+      return trajectoryStateTransform::initialFreeState(tk, magfield_.product());
+  }
 }
 
-
-TrajectoryStateOnSurface
-PropagateToMuon::extrapolate(const FreeTrajectoryState &start) const {
-    TrajectoryStateOnSurface final;
-    if (start.momentum().mag() == 0) return final;
-    double eta = start.momentum().eta();
-
-    const Propagator * propagatorBarrel  = &*propagator_;
-    const Propagator * propagatorEndcaps = &*propagator_;
-
-    if (whichState_ != AtVertex) { 
-        if (start.position().perp()    > barrelCylinder_->radius())      propagatorBarrel  = &*propagatorOpposite_;
-        if (fabs(start.position().z()) > endcapDiskPos_->position().z()) propagatorEndcaps = &*propagatorOpposite_;
+TrajectoryStateOnSurface PropagateToMuon::extrapolate(const FreeTrajectoryState &start) const {
+  TrajectoryStateOnSurface final;
+  if (start.momentum().mag() == 0)
+    return final;
+  double eta = start.momentum().eta();
+
+  const Propagator *propagatorBarrel = &*propagator_;
+  const Propagator *propagatorEndcaps = &*propagator_;
+
+  if (whichState_ != AtVertex) {
+    if (start.position().perp() > barrelCylinder_->radius())
+      propagatorBarrel = &*propagatorOpposite_;
+    if (fabs(start.position().z()) > endcapDiskPos_->position().z())
+      propagatorEndcaps = &*propagatorOpposite_;
+  }
+  if (cosmicPropagation_) {
+    if (start.momentum().dot(GlobalVector(start.position().x(), start.position().y(), start.position().z())) < 0) {
+      // must flip the propagations
+      propagatorBarrel = (propagatorBarrel == &*propagator_ ? &*propagatorOpposite_ : &*propagator_);
+      propagatorEndcaps = (propagatorEndcaps == &*propagator_ ? &*propagatorOpposite_ : &*propagator_);
     }
-    if (cosmicPropagation_) {
-        if (start.momentum().dot(GlobalVector(start.position().x(), start.position().y(), start.position().z())) < 0) {
-            // must flip the propagations
-            propagatorBarrel  = (propagatorBarrel  == &*propagator_ ? &*propagatorOpposite_ : &*propagator_);
-            propagatorEndcaps = (propagatorEndcaps == &*propagator_ ? &*propagatorOpposite_ : &*propagator_);
-        }
+  }
+
+  TrajectoryStateOnSurface tsos = propagatorBarrel->propagate(start, *barrelCylinder_);
+  if (tsos.isValid()) {
+    if (useSimpleGeometry_) {
+      if (fabs(tsos.globalPosition().z()) <= barrelHalfLength_)
+        final = tsos;
+    } else {
+      final = getBestDet(tsos, muonGeometry_->allDTLayers()[1]);
     }
+  }
 
-    TrajectoryStateOnSurface tsos = propagatorBarrel->propagate(start, *barrelCylinder_);
+  if (!final.isValid()) {
+    tsos = propagatorEndcaps->propagate(start, (eta > 0 ? *endcapDiskPos_ : *endcapDiskNeg_));
     if (tsos.isValid()) {
-        if (useSimpleGeometry_) {
-            if (fabs(tsos.globalPosition().z()) <= barrelHalfLength_) final = tsos;
-        } else {
-            final = getBestDet(tsos, muonGeometry_->allDTLayers()[1]);
-        }
-    } 
-
-    if (!final.isValid()) { 
-        tsos = propagatorEndcaps->propagate(start, (eta > 0 ? *endcapDiskPos_ : *endcapDiskNeg_));
-        if (tsos.isValid()) {
-            if (useSimpleGeometry_) {
-                float rho = tsos.globalPosition().perp();
-                if ((rho >= endcapRadii_.first) && (rho <= endcapRadii_.second)) final = tsos;
-            } else {
-                final = getBestDet(tsos, (eta > 0 ? muonGeometry_->forwardCSCLayers()[2] : muonGeometry_->backwardCSCLayers()[2]));
-            }
-        }
+      if (useSimpleGeometry_) {
+        float rho = tsos.globalPosition().perp();
+        if ((rho >= endcapRadii_.first) && (rho <= endcapRadii_.second))
+          final = tsos;
+      } else {
+        final =
+            getBestDet(tsos, (eta > 0 ? muonGeometry_->forwardCSCLayers()[2] : muonGeometry_->backwardCSCLayers()[2]));
+      }
     }
-    return final;
+  }
+  return final;
 }
 
-TrajectoryStateOnSurface 
-PropagateToMuon::getBestDet(const TrajectoryStateOnSurface &tsos, const DetLayer *layer) const {
-    TrajectoryStateOnSurface ret; // start as null
-    Chi2MeasurementEstimator estimator(1e10, 3.); // require compatibility at 3 sigma
-    std::vector<GeometricSearchDet::DetWithState> dets = layer->compatibleDets(tsos, *propagatorAny_, estimator);
-    if (!dets.empty()) {
-        ret = dets.front().second;
-    }
-    return ret;
+TrajectoryStateOnSurface PropagateToMuon::getBestDet(const TrajectoryStateOnSurface &tsos,
+                                                     const DetLayer *layer) const {
+  TrajectoryStateOnSurface ret;  // start as null
+  Chi2MeasurementEstimator estimator(1e10,
+                                     3.);  // require compatibility at 3 sigma
+  std::vector<GeometricSearchDet::DetWithState> dets = layer->compatibleDets(tsos, *propagatorAny_, estimator);
+  if (!dets.empty()) {
+    ret = dets.front().second;
+  }
+  return ret;
 }
diff --git a/HLTriggerOffline/SUSYBSM/interface/HltSusyExoPostProcessor.h b/HLTriggerOffline/SUSYBSM/interface/HltSusyExoPostProcessor.h
index 39829fbbbbf99..ff5f0bca53c64 100644
--- a/HLTriggerOffline/SUSYBSM/interface/HltSusyExoPostProcessor.h
+++ b/HLTriggerOffline/SUSYBSM/interface/HltSusyExoPostProcessor.h
@@ -1,20 +1,22 @@
 #ifndef HLTriggerOffline_SUSYBSM_HltSusyExoPostProcessor_H
 #define HLTriggerOffline_SUSYBSM_HltSusyExoPostProcessor_H
 
+#include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/DQMEDHarvester.h"
 
 class HltSusyExoPostProcessor : public DQMEDHarvester {
- public:
-  HltSusyExoPostProcessor(const edm::ParameterSet& pset);
-  ~HltSusyExoPostProcessor() override {};
- protected:
-  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override; 
- private:
-  MonitorElement* bookEffMEProfileFromTH1(TH1F*,std::string, DQMStore::IBooker&);
+public:
+  HltSusyExoPostProcessor(const edm::ParameterSet &pset);
+  ~HltSusyExoPostProcessor() override{};
+
+protected:
+  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
+
+private:
+  MonitorElement *bookEffMEProfileFromTH1(TH1F *, std::string, DQMStore::IBooker &);
   std::string subDir_;
   bool mcFlag;
   std::vector<edm::ParameterSet> reco_parametersets;
diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DiJet_MET.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DiJet_MET.h
index 5ba3d94b56910..5784ca594abc0 100644
--- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DiJet_MET.h
+++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DiJet_MET.h
@@ -1,58 +1,52 @@
 #ifndef SUSY_HLT_DiJet_MET_H
 #define SUSY_HLT_DiJet_MET_H
 
-//event
+// event
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-//Muon
+// Muon
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 
-
 // MET
-#include "DataFormats/METReco/interface/PFMET.h"
-#include "DataFormats/METReco/interface/PFMETCollection.h"
 #include "DataFormats/METReco/interface/CaloMET.h"
 #include "DataFormats/METReco/interface/CaloMETCollection.h"
+#include "DataFormats/METReco/interface/PFMET.h"
+#include "DataFormats/METReco/interface/PFMETCollection.h"
 
 // Jets
-#include "DataFormats/JetReco/interface/PFJet.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
+#include "DataFormats/JetReco/interface/PFJet.h"
 
 // Trigger
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
-#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
-
-
-
-class SUSY_HLT_DiJet_MET: public DQMEDAnalyzer{
-
-  public:
-  SUSY_HLT_DiJet_MET(const edm::ParameterSet& ps);
+class SUSY_HLT_DiJet_MET : public DQMEDAnalyzer {
+public:
+  SUSY_HLT_DiJet_MET(const edm::ParameterSet &ps);
   ~SUSY_HLT_DiJet_MET() override;
 
-  protected:
+protected:
   void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;
-  void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
+  void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
 
-  private:
-  //histos booking function
+private:
+  // histos booking function
   void bookHistos(DQMStore::IBooker &);
-  
-  //variables from config file
+
+  // variables from config file
   edm::EDGetTokenT<reco::PFMETCollection> thePfMETCollection_;
   edm::EDGetTokenT<reco::CaloMETCollection> theCaloMETCollection_;
   edm::EDGetTokenT<reco::PFJetCollection> thePfJetCollection_;
@@ -60,7 +54,6 @@ class SUSY_HLT_DiJet_MET: public DQMEDAnalyzer{
   edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
   edm::EDGetTokenT<trigger::TriggerEvent> theTrigSummary_;
 
-
   HLTConfigProvider fHltConfig;
 
   std::string HLTProcess_;
@@ -73,24 +66,23 @@ class SUSY_HLT_DiJet_MET: public DQMEDAnalyzer{
   double ptThrJet_;
   double etaThrJet_;
   double metCut_;
-  
-  // Histograms
-  MonitorElement* h_pfMetPhi;
-  MonitorElement* h_pfJetPt;
-  MonitorElement* h_pfJetEta;
-  MonitorElement* h_pfJetPhi;
-  MonitorElement* h_pfJet1Jet2DPhi;
-  MonitorElement* h_caloMetvsPFMet;
-  MonitorElement* h_triggerMet;
-  MonitorElement* h_triggerMetPhi;
-  MonitorElement* h_triggerJetPt;
-  MonitorElement* h_triggerJetEta;
-  MonitorElement* h_triggerJetPhi;
-  MonitorElement* h_pfMetTurnOn_num;
-  MonitorElement* h_pfMetTurnOn_den;
-  MonitorElement* h_pfJet2PtTurnOn_num;
-  MonitorElement* h_pfJet2PtTurnOn_den;
 
+  // Histograms
+  MonitorElement *h_pfMetPhi;
+  MonitorElement *h_pfJetPt;
+  MonitorElement *h_pfJetEta;
+  MonitorElement *h_pfJetPhi;
+  MonitorElement *h_pfJet1Jet2DPhi;
+  MonitorElement *h_caloMetvsPFMet;
+  MonitorElement *h_triggerMet;
+  MonitorElement *h_triggerMetPhi;
+  MonitorElement *h_triggerJetPt;
+  MonitorElement *h_triggerJetEta;
+  MonitorElement *h_triggerJetPhi;
+  MonitorElement *h_pfMetTurnOn_num;
+  MonitorElement *h_pfMetTurnOn_den;
+  MonitorElement *h_pfJet2PtTurnOn_num;
+  MonitorElement *h_pfJet2PtTurnOn_den;
 };
 
 #endif
diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleEle_Hadronic.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleEle_Hadronic.h
index 1840abb55bd37..2b4ddf334ed03 100644
--- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleEle_Hadronic.h
+++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleEle_Hadronic.h
@@ -1,16 +1,16 @@
 #ifndef SUSY_HLT_DoubleEle_Hadronic_H
 #define SUSY_HLT_DoubleEle_Hadronic_H
 
-//event
+// event
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-//Electron
+// Electron
 #include "DataFormats/EgammaCandidates/interface/Electron.h"
 #include "DataFormats/EgammaCandidates/interface/ElectronFwd.h"
 
@@ -18,64 +18,57 @@
 #include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
 
 // Jets
-#include "DataFormats/JetReco/interface/PFJet.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
+#include "DataFormats/JetReco/interface/PFJet.h"
 
 // Trigger
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
-#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
-
-
-
-class SUSY_HLT_DoubleEle_Hadronic: public DQMEDAnalyzer{
-    
+class SUSY_HLT_DoubleEle_Hadronic : public DQMEDAnalyzer {
 public:
-    SUSY_HLT_DoubleEle_Hadronic(const edm::ParameterSet& ps);
-    ~SUSY_HLT_DoubleEle_Hadronic() override;
-    
+  SUSY_HLT_DoubleEle_Hadronic(const edm::ParameterSet &ps);
+  ~SUSY_HLT_DoubleEle_Hadronic() override;
+
 protected:
-    void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
-    void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-    void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;
-    void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
-    
+  void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
+
 private:
-    //histos booking function
-    void bookHistos(DQMStore::IBooker &);
-    
-    //variables from config file
-    edm::EDGetTokenT<reco::GsfElectronCollection> theElectronCollection_;
-    edm::EDGetTokenT<reco::PFJetCollection> thePfJetCollection_;
-    edm::EDGetTokenT<reco::CaloJetCollection> theCaloJetCollection_;
-    edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
-    edm::EDGetTokenT<trigger::TriggerEvent> theTrigSummary_;
-    
-    
-    HLTConfigProvider fHltConfig;
-    
-    std::string HLTProcess_;
-    std::string triggerPath_;
-    std::string triggerPathAuxiliaryForElectron_;
-    std::string triggerPathAuxiliaryForHadronic_;
-    edm::InputTag triggerFilter_;
-    double ptThrJet_;
-    double etaThrJet_;
-    
-    // Histograms
-    MonitorElement* h_triggerElePt;
-    MonitorElement* h_triggerEleEta;
-    MonitorElement* h_triggerElePhi;
-    MonitorElement* h_triggerDoubleEleMass;
-    MonitorElement* h_pfHTTurnOn_num;
-    MonitorElement* h_pfHTTurnOn_den;
-    MonitorElement* h_EleTurnOn_num;
-    MonitorElement* h_EleTurnOn_den;
-    
+  // histos booking function
+  void bookHistos(DQMStore::IBooker &);
+
+  // variables from config file
+  edm::EDGetTokenT<reco::GsfElectronCollection> theElectronCollection_;
+  edm::EDGetTokenT<reco::PFJetCollection> thePfJetCollection_;
+  edm::EDGetTokenT<reco::CaloJetCollection> theCaloJetCollection_;
+  edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
+  edm::EDGetTokenT<trigger::TriggerEvent> theTrigSummary_;
+
+  HLTConfigProvider fHltConfig;
+
+  std::string HLTProcess_;
+  std::string triggerPath_;
+  std::string triggerPathAuxiliaryForElectron_;
+  std::string triggerPathAuxiliaryForHadronic_;
+  edm::InputTag triggerFilter_;
+  double ptThrJet_;
+  double etaThrJet_;
+
+  // Histograms
+  MonitorElement *h_triggerElePt;
+  MonitorElement *h_triggerEleEta;
+  MonitorElement *h_triggerElePhi;
+  MonitorElement *h_triggerDoubleEleMass;
+  MonitorElement *h_pfHTTurnOn_num;
+  MonitorElement *h_pfHTTurnOn_den;
+  MonitorElement *h_EleTurnOn_num;
+  MonitorElement *h_EleTurnOn_den;
 };
 
 #endif
diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleMuon_Hadronic.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleMuon_Hadronic.h
index f4744645d2bfd..2e856aba1aa8f 100644
--- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleMuon_Hadronic.h
+++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleMuon_Hadronic.h
@@ -1,78 +1,71 @@
 #ifndef SUSY_HLT_DoubleMuon_Hadronic_H
 #define SUSY_HLT_DoubleMuon_Hadronic_H
 
-//event
+// event
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-//Muon
+// Muon
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 
 // Jets
-#include "DataFormats/JetReco/interface/PFJet.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
+#include "DataFormats/JetReco/interface/PFJet.h"
 
 // Trigger
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
-#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
-
-
-
-class SUSY_HLT_DoubleMuon_Hadronic: public DQMEDAnalyzer{
-    
+class SUSY_HLT_DoubleMuon_Hadronic : public DQMEDAnalyzer {
 public:
-    SUSY_HLT_DoubleMuon_Hadronic(const edm::ParameterSet& ps);
-    ~SUSY_HLT_DoubleMuon_Hadronic() override;
-    
+  SUSY_HLT_DoubleMuon_Hadronic(const edm::ParameterSet &ps);
+  ~SUSY_HLT_DoubleMuon_Hadronic() override;
+
 protected:
-    void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
-    void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-    void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;
-    void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
-    
+  void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
+
 private:
-    //histos booking function
-    void bookHistos(DQMStore::IBooker &);
-    
-    //variables from config file
-    edm::EDGetTokenT<reco::MuonCollection> theMuonCollection_;
-    edm::EDGetTokenT<reco::PFJetCollection> thePfJetCollection_;
-    edm::EDGetTokenT<reco::CaloJetCollection> theCaloJetCollection_;
-    edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
-    edm::EDGetTokenT<trigger::TriggerEvent> theTrigSummary_;
-    
-    
-    HLTConfigProvider fHltConfig;
-    
-    std::string HLTProcess_;
-    std::string triggerPath_;
-    std::string triggerPathAuxiliaryForMuon_;
-    std::string triggerPathAuxiliaryForHadronic_;
-    edm::InputTag triggerFilter_;
-    double ptThrJet_;
-    double etaThrJet_;
-    
-    // Histograms
-    MonitorElement* h_triggerMuPt;
-    MonitorElement* h_triggerMuEta;
-    MonitorElement* h_triggerMuPhi;
-    MonitorElement* h_triggerDoubleMuMass;
-    MonitorElement* h_pfHTTurnOn_num;
-    MonitorElement* h_pfHTTurnOn_den;
-    MonitorElement* h_MuTurnOn_num;
-    MonitorElement* h_MuTurnOn_den;
-    
+  // histos booking function
+  void bookHistos(DQMStore::IBooker &);
+
+  // variables from config file
+  edm::EDGetTokenT<reco::MuonCollection> theMuonCollection_;
+  edm::EDGetTokenT<reco::PFJetCollection> thePfJetCollection_;
+  edm::EDGetTokenT<reco::CaloJetCollection> theCaloJetCollection_;
+  edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
+  edm::EDGetTokenT<trigger::TriggerEvent> theTrigSummary_;
+
+  HLTConfigProvider fHltConfig;
+
+  std::string HLTProcess_;
+  std::string triggerPath_;
+  std::string triggerPathAuxiliaryForMuon_;
+  std::string triggerPathAuxiliaryForHadronic_;
+  edm::InputTag triggerFilter_;
+  double ptThrJet_;
+  double etaThrJet_;
+
+  // Histograms
+  MonitorElement *h_triggerMuPt;
+  MonitorElement *h_triggerMuEta;
+  MonitorElement *h_triggerMuPhi;
+  MonitorElement *h_triggerDoubleMuMass;
+  MonitorElement *h_pfHTTurnOn_num;
+  MonitorElement *h_pfHTTurnOn_den;
+  MonitorElement *h_MuTurnOn_num;
+  MonitorElement *h_MuTurnOn_den;
 };
 
 #endif
diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_ElecFakes.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_ElecFakes.h
index 7936ed9aabd7d..7644feef9d59e 100644
--- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_ElecFakes.h
+++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_ElecFakes.h
@@ -1,77 +1,70 @@
 #ifndef SUSY_HLT_ElecFakes_H
 #define SUSY_HLT_ElecFakes_H
 
-//event
+// event
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-//Muon
+// Muon
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 
-
 // MET
-#include "DataFormats/METReco/interface/PFMET.h"
-#include "DataFormats/METReco/interface/PFMETCollection.h"
 #include "DataFormats/METReco/interface/CaloMET.h"
 #include "DataFormats/METReco/interface/CaloMETCollection.h"
+#include "DataFormats/METReco/interface/PFMET.h"
+#include "DataFormats/METReco/interface/PFMETCollection.h"
 
 // Jets
-#include "DataFormats/JetReco/interface/PFJet.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
+#include "DataFormats/JetReco/interface/PFJet.h"
 
 // Trigger
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
-#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
-
-
-
-class SUSY_HLT_ElecFakes: public DQMEDAnalyzer{
-
-  public:
-  SUSY_HLT_ElecFakes(const edm::ParameterSet& ps);
+class SUSY_HLT_ElecFakes : public DQMEDAnalyzer {
+public:
+  SUSY_HLT_ElecFakes(const edm::ParameterSet &ps);
   ~SUSY_HLT_ElecFakes() override;
 
-  protected:
+protected:
   void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;
-  void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
+  void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
 
-  private:
-  //histos booking function
+private:
+  // histos booking function
   void bookHistos(DQMStore::IBooker &);
-  
-  //variables from config file
+
+  // variables from config file
   edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
   edm::EDGetTokenT<trigger::TriggerEvent> theTrigSummary_;
 
-
   HLTConfigProvider fHltConfig;
 
   std::string HLTProcess_;
   std::string triggerPath_;
   edm::InputTag triggerFilter_;
   edm::InputTag triggerJetFilter_;
-  
+
   // Histograms
-  MonitorElement* h_triggerElPt;
-  MonitorElement* h_triggerElEta;
-  MonitorElement* h_triggerElPhi;
-  MonitorElement* h_triggerJetPt;
-  MonitorElement* h_triggerJetEta;
-  MonitorElement* h_triggerJetPhi;
-  MonitorElement* h_triggerElJetdPhi;
+  MonitorElement *h_triggerElPt;
+  MonitorElement *h_triggerElEta;
+  MonitorElement *h_triggerElPhi;
+  MonitorElement *h_triggerJetPt;
+  MonitorElement *h_triggerJetEta;
+  MonitorElement *h_triggerJetPhi;
+  MonitorElement *h_triggerElJetdPhi;
 };
 
 #endif
diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Electron_BJet.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Electron_BJet.h
index 9242b18f10839..1e1b6dbb06a61 100644
--- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Electron_BJet.h
+++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Electron_BJet.h
@@ -1,16 +1,16 @@
 #ifndef SUSY_HLT_Electron_BJet_H
 #define SUSY_HLT_Electron_BJet_H
 
-//event
+// event
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-//Electron
+// Electron
 #include "DataFormats/EgammaCandidates/interface/Electron.h"
 #include "DataFormats/EgammaCandidates/interface/ElectronFwd.h"
 
@@ -18,62 +18,55 @@
 #include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
 
 // Jets
-#include "DataFormats/JetReco/interface/PFJet.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
+#include "DataFormats/JetReco/interface/PFJet.h"
 
 // Trigger
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
-#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
-
-
-
-class SUSY_HLT_Electron_BJet: public DQMEDAnalyzer{
-    
+class SUSY_HLT_Electron_BJet : public DQMEDAnalyzer {
 public:
-    SUSY_HLT_Electron_BJet(const edm::ParameterSet& ps);
-    ~SUSY_HLT_Electron_BJet() override;
-    
+  SUSY_HLT_Electron_BJet(const edm::ParameterSet &ps);
+  ~SUSY_HLT_Electron_BJet() override;
+
 protected:
-    void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
-    void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-    void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;
-    void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
-    
+  void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
+
 private:
-    //histos booking function
-    void bookHistos(DQMStore::IBooker &);
-    
-    //variables from config file
-    edm::EDGetTokenT<reco::GsfElectronCollection> theElectronCollection_;
-    edm::EDGetTokenT<reco::PFJetCollection> thePfJetCollection_;
-    edm::EDGetTokenT<reco::CaloJetCollection> theCaloJetCollection_;
-    edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
-    edm::EDGetTokenT<trigger::TriggerEvent> theTrigSummary_;
-    
-    
-    HLTConfigProvider fHltConfig;
-    
-    std::string HLTProcess_;
-    std::string triggerPath_;
-    edm::InputTag triggerFilterEle_;
-	edm::InputTag triggerFilterJet_;
-    double ptThrJet_;
-    double etaThrJet_;
-    
-    // Histograms
-    MonitorElement* h_triggerElePt;
-    MonitorElement* h_triggerEleEta;
-    MonitorElement* h_triggerElePhi;
-	
-	MonitorElement* h_triggerJetPt;
-    MonitorElement* h_triggerJetEta;
-    MonitorElement* h_triggerJetPhi;
-    
+  // histos booking function
+  void bookHistos(DQMStore::IBooker &);
+
+  // variables from config file
+  edm::EDGetTokenT<reco::GsfElectronCollection> theElectronCollection_;
+  edm::EDGetTokenT<reco::PFJetCollection> thePfJetCollection_;
+  edm::EDGetTokenT<reco::CaloJetCollection> theCaloJetCollection_;
+  edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
+  edm::EDGetTokenT<trigger::TriggerEvent> theTrigSummary_;
+
+  HLTConfigProvider fHltConfig;
+
+  std::string HLTProcess_;
+  std::string triggerPath_;
+  edm::InputTag triggerFilterEle_;
+  edm::InputTag triggerFilterJet_;
+  double ptThrJet_;
+  double etaThrJet_;
+
+  // Histograms
+  MonitorElement *h_triggerElePt;
+  MonitorElement *h_triggerEleEta;
+  MonitorElement *h_triggerElePhi;
+
+  MonitorElement *h_triggerJetPt;
+  MonitorElement *h_triggerJetEta;
+  MonitorElement *h_triggerJetPhi;
 };
 
 #endif
diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_InclusiveHT.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_InclusiveHT.h
index 81440322cf3ac..eb32e348c4c8f 100644
--- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_InclusiveHT.h
+++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_InclusiveHT.h
@@ -1,11 +1,11 @@
 #ifndef SUSY_HLT_InclusiveHT_H
 #define SUSY_HLT_InclusiveHT_H
 
-//event
+// event
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
@@ -15,33 +15,31 @@
 #include "DataFormats/METReco/interface/PFMETCollection.h"
 
 // Jets
-#include "DataFormats/JetReco/interface/PFJet.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
+#include "DataFormats/JetReco/interface/PFJet.h"
 
 // Trigger
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
 
-
-class SUSY_HLT_InclusiveHT: public DQMEDAnalyzer{
-
-  public:
-  SUSY_HLT_InclusiveHT(const edm::ParameterSet& ps);
+class SUSY_HLT_InclusiveHT : public DQMEDAnalyzer {
+public:
+  SUSY_HLT_InclusiveHT(const edm::ParameterSet &ps);
   ~SUSY_HLT_InclusiveHT() override;
 
-  protected:
+protected:
   void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;
-  void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
+  void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
 
-  private:
-  //histos booking function
+private:
+  // histos booking function
   void bookHistos(DQMStore::IBooker &);
-  
-  //variables from config file
+
+  // variables from config file
   edm::EDGetTokenT<reco::PFMETCollection> thePfMETCollection_;
   edm::EDGetTokenT<reco::PFJetCollection> thePfJetCollection_;
   edm::EDGetTokenT<reco::CaloJetCollection> theCaloJetCollection_;
@@ -53,29 +51,28 @@ class SUSY_HLT_InclusiveHT: public DQMEDAnalyzer{
   edm::InputTag triggerFilter_;
   double ptThrJet_;
   double etaThrJet_;
-  
-  // Histograms
-  MonitorElement* h_pfMet;
-  MonitorElement* h_pfMetPhi;
-  MonitorElement* h_pfHT;
-  MonitorElement* h_caloHT;
-  MonitorElement* h_pfJetPt;
-  MonitorElement* h_pfJetEta;
-  MonitorElement* h_pfJetPhi;
-  MonitorElement* h_caloJetPt;
-  MonitorElement* h_caloJetEta;
-  MonitorElement* h_caloJetPhi;
-  MonitorElement* h_triggerJetPt;
-  MonitorElement* h_triggerJetEta;
-  MonitorElement* h_triggerJetPhi;
-  MonitorElement* h_triggerMetPt;
-  MonitorElement* h_triggerMetPhi;
-  MonitorElement* h_triggerHT;
-  MonitorElement* h_pfMetTurnOn_num;
-  MonitorElement* h_pfMetTurnOn_den;
-  MonitorElement* h_pfHTTurnOn_num;
-  MonitorElement* h_pfHTTurnOn_den;
 
+  // Histograms
+  MonitorElement *h_pfMet;
+  MonitorElement *h_pfMetPhi;
+  MonitorElement *h_pfHT;
+  MonitorElement *h_caloHT;
+  MonitorElement *h_pfJetPt;
+  MonitorElement *h_pfJetEta;
+  MonitorElement *h_pfJetPhi;
+  MonitorElement *h_caloJetPt;
+  MonitorElement *h_caloJetEta;
+  MonitorElement *h_caloJetPhi;
+  MonitorElement *h_triggerJetPt;
+  MonitorElement *h_triggerJetEta;
+  MonitorElement *h_triggerJetPhi;
+  MonitorElement *h_triggerMetPt;
+  MonitorElement *h_triggerMetPhi;
+  MonitorElement *h_triggerHT;
+  MonitorElement *h_pfMetTurnOn_num;
+  MonitorElement *h_pfMetTurnOn_den;
+  MonitorElement *h_pfHTTurnOn_num;
+  MonitorElement *h_pfHTTurnOn_den;
 };
 
 #endif
diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuEle_Hadronic.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuEle_Hadronic.h
index 0578f9564b781..556ef8b28c3ea 100644
--- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuEle_Hadronic.h
+++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuEle_Hadronic.h
@@ -1,91 +1,84 @@
 #ifndef SUSY_HLT_MuEle_Hadronic_H
 #define SUSY_HLT_MuEle_Hadronic_H
 
-//event
+// event
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-//Electron
+// Electron
 #include "DataFormats/EgammaCandidates/interface/Electron.h"
 #include "DataFormats/EgammaCandidates/interface/ElectronFwd.h"
 
 #include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
 
-//Muon
+// Muon
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 
 // Jets
-#include "DataFormats/JetReco/interface/PFJet.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
+#include "DataFormats/JetReco/interface/PFJet.h"
 
 // Trigger
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
-#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
-
-
-
-class SUSY_HLT_MuEle_Hadronic: public DQMEDAnalyzer{
-    
+class SUSY_HLT_MuEle_Hadronic : public DQMEDAnalyzer {
 public:
-    SUSY_HLT_MuEle_Hadronic(const edm::ParameterSet& ps);
-    ~SUSY_HLT_MuEle_Hadronic() override;
-    
+  SUSY_HLT_MuEle_Hadronic(const edm::ParameterSet &ps);
+  ~SUSY_HLT_MuEle_Hadronic() override;
+
 protected:
-    void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
-    void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-    void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;
-    void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
-    
+  void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
+
 private:
-    //histos booking function
-    void bookHistos(DQMStore::IBooker &);
-    
-    //variables from config file
-    edm::EDGetTokenT<reco::MuonCollection> theMuonCollection_;
-    edm::EDGetTokenT<reco::GsfElectronCollection> theElectronCollection_;
-    edm::EDGetTokenT<reco::PFJetCollection> thePfJetCollection_;
-    edm::EDGetTokenT<reco::CaloJetCollection> theCaloJetCollection_;
-    edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
-    edm::EDGetTokenT<trigger::TriggerEvent> theTrigSummary_;
-    
-    
-    HLTConfigProvider fHltConfig;
-    
-    std::string HLTProcess_;
-    std::string triggerPath_;
-    std::string triggerPathAuxiliaryForMuEle_;
-    std::string triggerPathAuxiliaryForHadronic_;
-    edm::InputTag triggerFilter_;
-    double ptThrJet_;
-    double etaThrJet_;
-    
-    // Histograms
-    MonitorElement* h_triggerMuPt;
-    MonitorElement* h_triggerMuEta;
-    MonitorElement* h_triggerMuPhi;
-    MonitorElement* h_triggerElePt;
-    MonitorElement* h_triggerEleEta;
-    MonitorElement* h_triggerElePhi;
-    MonitorElement* h_triggerMuEleMass;
-    MonitorElement* h_pfHTTurnOn_num;
-    MonitorElement* h_pfHTTurnOn_den;
-    MonitorElement* h_MuTurnOn_num;
-    MonitorElement* h_MuTurnOn_den;
-    MonitorElement* h_EleTurnOn_num;
-    MonitorElement* h_EleTurnOn_den;
-    
+  // histos booking function
+  void bookHistos(DQMStore::IBooker &);
+
+  // variables from config file
+  edm::EDGetTokenT<reco::MuonCollection> theMuonCollection_;
+  edm::EDGetTokenT<reco::GsfElectronCollection> theElectronCollection_;
+  edm::EDGetTokenT<reco::PFJetCollection> thePfJetCollection_;
+  edm::EDGetTokenT<reco::CaloJetCollection> theCaloJetCollection_;
+  edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
+  edm::EDGetTokenT<trigger::TriggerEvent> theTrigSummary_;
+
+  HLTConfigProvider fHltConfig;
+
+  std::string HLTProcess_;
+  std::string triggerPath_;
+  std::string triggerPathAuxiliaryForMuEle_;
+  std::string triggerPathAuxiliaryForHadronic_;
+  edm::InputTag triggerFilter_;
+  double ptThrJet_;
+  double etaThrJet_;
+
+  // Histograms
+  MonitorElement *h_triggerMuPt;
+  MonitorElement *h_triggerMuEta;
+  MonitorElement *h_triggerMuPhi;
+  MonitorElement *h_triggerElePt;
+  MonitorElement *h_triggerEleEta;
+  MonitorElement *h_triggerElePhi;
+  MonitorElement *h_triggerMuEleMass;
+  MonitorElement *h_pfHTTurnOn_num;
+  MonitorElement *h_pfHTTurnOn_den;
+  MonitorElement *h_MuTurnOn_num;
+  MonitorElement *h_MuTurnOn_den;
+  MonitorElement *h_EleTurnOn_num;
+  MonitorElement *h_EleTurnOn_den;
 };
 
 #endif
diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuonFakes.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuonFakes.h
index d8d19e8293ee9..207182ecdbfe9 100644
--- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuonFakes.h
+++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuonFakes.h
@@ -1,73 +1,65 @@
 #ifndef SUSY_HLT_MuonFakes_H
 #define SUSY_HLT_MuonFakes_H
 
-//event
+// event
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-//Muon
+// Muon
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 
-
 // MET
-#include "DataFormats/METReco/interface/PFMET.h"
-#include "DataFormats/METReco/interface/PFMETCollection.h"
 #include "DataFormats/METReco/interface/CaloMET.h"
 #include "DataFormats/METReco/interface/CaloMETCollection.h"
+#include "DataFormats/METReco/interface/PFMET.h"
+#include "DataFormats/METReco/interface/PFMETCollection.h"
 
 // Jets
-#include "DataFormats/JetReco/interface/PFJet.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
+#include "DataFormats/JetReco/interface/PFJet.h"
 
 // Trigger
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
-#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
-
-
-
-class SUSY_HLT_MuonFakes: public DQMEDAnalyzer{
-
-  public:
-  SUSY_HLT_MuonFakes(const edm::ParameterSet& ps);
+class SUSY_HLT_MuonFakes : public DQMEDAnalyzer {
+public:
+  SUSY_HLT_MuonFakes(const edm::ParameterSet &ps);
   ~SUSY_HLT_MuonFakes() override;
 
-  protected:
+protected:
   void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;
-  void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
+  void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
 
-  private:
-  //histos booking function
+private:
+  // histos booking function
   void bookHistos(DQMStore::IBooker &);
-  
-  //variables from config file
+
+  // variables from config file
   edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
   edm::EDGetTokenT<trigger::TriggerEvent> theTrigSummary_;
 
-
   HLTConfigProvider fHltConfig;
 
   std::string HLTProcess_;
   std::string triggerPath_;
   edm::InputTag triggerFilter_;
-  
-  // Histograms
-  MonitorElement* h_triggerMuPt;
-  MonitorElement* h_triggerMuEta;
-  MonitorElement* h_triggerMuPhi;
 
+  // Histograms
+  MonitorElement *h_triggerMuPt;
+  MonitorElement *h_triggerMuEta;
+  MonitorElement *h_triggerMuPhi;
 };
 
 #endif
diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_BJet.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_BJet.h
index 7e29031c20e55..eb3bab764c684 100644
--- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_BJet.h
+++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_BJet.h
@@ -1,75 +1,68 @@
 #ifndef SUSY_HLT_Muon_BJet_H
 #define SUSY_HLT_Muon_BJet_H
 
-//event
+// event
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-//Muon
+// Muon
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 
 // Jets
-#include "DataFormats/JetReco/interface/PFJet.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
+#include "DataFormats/JetReco/interface/PFJet.h"
 
 // Trigger
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
-#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
-
-
-
-class SUSY_HLT_Muon_BJet: public DQMEDAnalyzer{
-    
+class SUSY_HLT_Muon_BJet : public DQMEDAnalyzer {
 public:
-    SUSY_HLT_Muon_BJet(const edm::ParameterSet& ps);
-    ~SUSY_HLT_Muon_BJet() override;
-    
+  SUSY_HLT_Muon_BJet(const edm::ParameterSet &ps);
+  ~SUSY_HLT_Muon_BJet() override;
+
 protected:
-    void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
-    void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-    void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;
-    void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
-    
+  void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
+
 private:
-    //histos booking function
-    void bookHistos(DQMStore::IBooker &);
-    
-    //variables from config file
-    edm::EDGetTokenT<reco::MuonCollection> theMuonCollection_;
-    edm::EDGetTokenT<reco::PFJetCollection> thePfJetCollection_;
-    edm::EDGetTokenT<reco::CaloJetCollection> theCaloJetCollection_;
-    edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
-    edm::EDGetTokenT<trigger::TriggerEvent> theTrigSummary_;
-    
-    
-    HLTConfigProvider fHltConfig;
-    
-    std::string HLTProcess_;
-    std::string triggerPath_;
-    edm::InputTag triggerFilterMuon_;
-	edm::InputTag triggerFilterJet_;
-    double ptThrJet_;
-    double etaThrJet_;
-    
-    // Histograms
-    MonitorElement* h_triggerMuPt;
-    MonitorElement* h_triggerMuEta;
-    MonitorElement* h_triggerMuPhi;
-	MonitorElement* h_triggerJetPt;
-    MonitorElement* h_triggerJetEta;
-    MonitorElement* h_triggerJetPhi;
-    
+  // histos booking function
+  void bookHistos(DQMStore::IBooker &);
+
+  // variables from config file
+  edm::EDGetTokenT<reco::MuonCollection> theMuonCollection_;
+  edm::EDGetTokenT<reco::PFJetCollection> thePfJetCollection_;
+  edm::EDGetTokenT<reco::CaloJetCollection> theCaloJetCollection_;
+  edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
+  edm::EDGetTokenT<trigger::TriggerEvent> theTrigSummary_;
+
+  HLTConfigProvider fHltConfig;
+
+  std::string HLTProcess_;
+  std::string triggerPath_;
+  edm::InputTag triggerFilterMuon_;
+  edm::InputTag triggerFilterJet_;
+  double ptThrJet_;
+  double etaThrJet_;
+
+  // Histograms
+  MonitorElement *h_triggerMuPt;
+  MonitorElement *h_triggerMuEta;
+  MonitorElement *h_triggerMuPhi;
+  MonitorElement *h_triggerJetPt;
+  MonitorElement *h_triggerJetEta;
+  MonitorElement *h_triggerJetPhi;
 };
 
 #endif
diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_Hadronic.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_Hadronic.h
index 104f7a9cb3432..32c5359491dc3 100644
--- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_Hadronic.h
+++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_Hadronic.h
@@ -1,58 +1,52 @@
 #ifndef SUSY_HLT_Muon_Hadronic_H
 #define SUSY_HLT_Muon_Hadronic_H
 
-//event
+// event
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-//Muon
+// Muon
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 
-
 // MET
-#include "DataFormats/METReco/interface/PFMET.h"
-#include "DataFormats/METReco/interface/PFMETCollection.h"
 #include "DataFormats/METReco/interface/CaloMET.h"
 #include "DataFormats/METReco/interface/CaloMETCollection.h"
+#include "DataFormats/METReco/interface/PFMET.h"
+#include "DataFormats/METReco/interface/PFMETCollection.h"
 
 // Jets
-#include "DataFormats/JetReco/interface/PFJet.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
+#include "DataFormats/JetReco/interface/PFJet.h"
 
 // Trigger
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
-#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
-
-
-
-class SUSY_HLT_Muon_Hadronic: public DQMEDAnalyzer{
-
-  public:
-  SUSY_HLT_Muon_Hadronic(const edm::ParameterSet& ps);
+class SUSY_HLT_Muon_Hadronic : public DQMEDAnalyzer {
+public:
+  SUSY_HLT_Muon_Hadronic(const edm::ParameterSet &ps);
   ~SUSY_HLT_Muon_Hadronic() override;
 
-  protected:
+protected:
   void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;
-  void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
+  void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
 
-  private:
-  //histos booking function
+private:
+  // histos booking function
   void bookHistos(DQMStore::IBooker &);
-  
-  //variables from config file
+
+  // variables from config file
   edm::EDGetTokenT<reco::MuonCollection> theMuonCollection_;
   edm::EDGetTokenT<reco::PFMETCollection> thePfMETCollection_;
   edm::EDGetTokenT<reco::PFJetCollection> thePfJetCollection_;
@@ -60,7 +54,6 @@ class SUSY_HLT_Muon_Hadronic: public DQMEDAnalyzer{
   edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
   edm::EDGetTokenT<trigger::TriggerEvent> theTrigSummary_;
 
-
   HLTConfigProvider fHltConfig;
 
   std::string HLTProcess_;
@@ -74,23 +67,21 @@ class SUSY_HLT_Muon_Hadronic: public DQMEDAnalyzer{
   double METOffline_;
   double ptThrJet_;
   double etaThrJet_;
- 
-  // Histograms
-  MonitorElement* h_triggerMuPt;
-  MonitorElement* h_triggerMuEta;
-  MonitorElement* h_triggerMuPhi;
-  MonitorElement* h_pfMetTurnOn_num;
-  MonitorElement* h_pfMetTurnOn_den;
-  MonitorElement* h_pfHTTurnOn_num;
-  MonitorElement* h_pfHTTurnOn_den;
-  MonitorElement* h_MuTurnOn_num;
-  MonitorElement* h_MuTurnOn_den;
 
+  // Histograms
+  MonitorElement *h_triggerMuPt;
+  MonitorElement *h_triggerMuEta;
+  MonitorElement *h_triggerMuPhi;
+  MonitorElement *h_pfMetTurnOn_num;
+  MonitorElement *h_pfMetTurnOn_den;
+  MonitorElement *h_pfHTTurnOn_num;
+  MonitorElement *h_pfHTTurnOn_den;
+  MonitorElement *h_MuTurnOn_num;
+  MonitorElement *h_MuTurnOn_den;
 };
 
-
 struct Lepton {
   float pt, phi, eta;
-};  
+};
 
 #endif
diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonHT.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonHT.h
index 4c8189b873974..c024ddd1fc7fa 100644
--- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonHT.h
+++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonHT.h
@@ -1,11 +1,11 @@
 #ifndef SUSY_HLT_PhotonHT_H
 #define SUSY_HLT_PhotonHT_H
 
-//event
+// event
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
@@ -19,31 +19,30 @@
 
 // Trigger
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
 
-namespace reco{
-    typedef std::vector<reco::Photon> PhotonCollection;
+namespace reco {
+  typedef std::vector<reco::Photon> PhotonCollection;
 }
 
-class SUSY_HLT_PhotonHT: public DQMEDAnalyzer{
-
-  public:
-  SUSY_HLT_PhotonHT(const edm::ParameterSet& ps);
+class SUSY_HLT_PhotonHT : public DQMEDAnalyzer {
+public:
+  SUSY_HLT_PhotonHT(const edm::ParameterSet &ps);
   ~SUSY_HLT_PhotonHT() override;
 
-  protected:
+protected:
   void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;
-  void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
+  void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
 
-  private:
-  //histos booking function
+private:
+  // histos booking function
   void bookHistos(DQMStore::IBooker &);
 
-  //variables from config file
+  // variables from config file
   edm::EDGetTokenT<reco::PFMETCollection> thePfMETCollection_;
   edm::EDGetTokenT<reco::PhotonCollection> thePhotonCollection_;
   edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
@@ -57,13 +56,12 @@ class SUSY_HLT_PhotonHT: public DQMEDAnalyzer{
   double htThrOffline_;
 
   // Histograms
-  MonitorElement* h_photonPt;
-  MonitorElement* h_ht;
-  MonitorElement* h_htTurnOn_num;
-  MonitorElement* h_htTurnOn_den;
-  MonitorElement* h_photonTurnOn_num;
-  MonitorElement* h_photonTurnOn_den;
-
+  MonitorElement *h_photonPt;
+  MonitorElement *h_ht;
+  MonitorElement *h_htTurnOn_num;
+  MonitorElement *h_htTurnOn_den;
+  MonitorElement *h_photonTurnOn_num;
+  MonitorElement *h_photonTurnOn_den;
 };
 
 #endif
diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonMET.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonMET.h
index 925b342a79919..ac5f70c7c15b7 100644
--- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonMET.h
+++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonMET.h
@@ -1,11 +1,11 @@
 #ifndef SUSY_HLT_PhotonMET_H
 #define SUSY_HLT_PhotonMET_H
 
-//event
+// event
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
@@ -19,31 +19,30 @@
 
 // Trigger
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
 
-namespace reco{
+namespace reco {
   typedef std::vector<reco::Photon> PhotonCollection;
 }
 
-class SUSY_HLT_PhotonMET: public DQMEDAnalyzer
-{
+class SUSY_HLT_PhotonMET : public DQMEDAnalyzer {
 public:
-  SUSY_HLT_PhotonMET(const edm::ParameterSet& ps);
+  SUSY_HLT_PhotonMET(const edm::ParameterSet &ps);
   ~SUSY_HLT_PhotonMET() override;
 
 protected:
   void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;
-  void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
+  void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
 
 private:
-  //histos booking function
+  // histos booking function
   void bookHistos(DQMStore::IBooker &);
 
-  //variables from config file
+  // variables from config file
   edm::EDGetTokenT<reco::PFMETCollection> thePfMETCollection_;
   edm::EDGetTokenT<reco::PhotonCollection> thePhotonCollection_;
   edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
@@ -56,13 +55,12 @@ class SUSY_HLT_PhotonMET: public DQMEDAnalyzer
   double metThrOffline_;
 
   // Histograms
-  MonitorElement* h_recoPhotonPt;
-  MonitorElement* h_recoMet;
-  MonitorElement* h_metTurnOn_num;
-  MonitorElement* h_metTurnOn_den;
-  MonitorElement* h_photonTurnOn_num;
-  MonitorElement* h_photonTurnOn_den;
-
+  MonitorElement *h_recoPhotonPt;
+  MonitorElement *h_recoMet;
+  MonitorElement *h_metTurnOn_num;
+  MonitorElement *h_metTurnOn_den;
+  MonitorElement *h_photonTurnOn_num;
+  MonitorElement *h_photonTurnOn_den;
 };
 
 #endif
diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Razor.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Razor.h
index e38fe948a26a3..3660e450b4a67 100644
--- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Razor.h
+++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Razor.h
@@ -1,84 +1,86 @@
 #ifndef SUSY_HLT_Razor_H
 #define SUSY_HLT_Razor_H
 
-//event
+// event
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
 // MET
+#include "DataFormats/METReco/interface/CaloMET.h"
+#include "DataFormats/METReco/interface/CaloMETCollection.h"
 #include "DataFormats/METReco/interface/MET.h"
 #include "DataFormats/METReco/interface/METCollection.h"
 #include "DataFormats/METReco/interface/PFMET.h"
 #include "DataFormats/METReco/interface/PFMETCollection.h"
-#include "DataFormats/METReco/interface/CaloMET.h"
-#include "DataFormats/METReco/interface/CaloMETCollection.h"
 
 // Jets
+#include "DataFormats/JetReco/interface/CaloJet.h"
 #include "DataFormats/JetReco/interface/Jet.h"
 #include "DataFormats/JetReco/interface/PFJet.h"
-#include "DataFormats/JetReco/interface/CaloJet.h"
 
 // Trigger
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
 
-//Hemispheres
-#include "HLTrigger/JetMET/interface/HLTRHemisphere.h"
+// Hemispheres
 #include "DataFormats/Math/interface/LorentzVector.h"
+#include "HLTrigger/JetMET/interface/HLTRHemisphere.h"
 #include "TLorentzVector.h"
 
-class SUSY_HLT_Razor: public DQMEDAnalyzer{
-
-  public:
-  SUSY_HLT_Razor(const edm::ParameterSet& ps);
-  static double CalcMR(TLorentzVector ja,TLorentzVector jb);
-  static double CalcR(double MR, TLorentzVector ja,TLorentzVector jb, edm::Handle<edm::View<reco::MET> > met, const std::vector<math::XYZTLorentzVector>& muons);
+class SUSY_HLT_Razor : public DQMEDAnalyzer {
+public:
+  SUSY_HLT_Razor(const edm::ParameterSet &ps);
+  static double CalcMR(TLorentzVector ja, TLorentzVector jb);
+  static double CalcR(double MR,
+                      TLorentzVector ja,
+                      TLorentzVector jb,
+                      edm::Handle<edm::View<reco::MET>> met,
+                      const std::vector<math::XYZTLorentzVector> &muons);
   ~SUSY_HLT_Razor() override;
-  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 
-  protected:
+protected:
   void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;
-  void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
+  void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
 
-  private:
-  //histos booking function
+private:
+  // histos booking function
   void bookHistos(DQMStore::IBooker &);
-  
-  //variables from config file
-  edm::EDGetTokenT<edm::View<reco::MET> > theMETCollection_;
+
+  // variables from config file
+  edm::EDGetTokenT<edm::View<reco::MET>> theMETCollection_;
   edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
   edm::EDGetTokenT<trigger::TriggerEvent> theTrigSummary_;
-  edm::EDGetTokenT<edm::View<reco::Jet> > theJetCollection_;
-  edm::EDGetTokenT<std::vector<math::XYZTLorentzVector> > theHemispheres_;
+  edm::EDGetTokenT<edm::View<reco::Jet>> theJetCollection_;
+  edm::EDGetTokenT<std::vector<math::XYZTLorentzVector>> theHemispheres_;
 
   std::string triggerPath_;
   edm::InputTag triggerFilter_;
   edm::InputTag caloFilter_;
-  
-  // Histograms
-  MonitorElement* h_mr;
-  MonitorElement* h_rsq;
-  MonitorElement* h_mrRsq;
-  MonitorElement* h_mr_tight;
-  MonitorElement* h_rsq_tight;
-  MonitorElement* h_rsq_loose;  
-  MonitorElement* h_ht;
-  MonitorElement* h_met;
-  MonitorElement* h_htMet;
-  MonitorElement* h_online_mr_vs_mr;
-  MonitorElement* h_online_rsq_vs_rsq;
-  MonitorElement* h_calo_mr_vs_mr;
-  MonitorElement* h_calo_rsq_vs_rsq;
 
+  // Histograms
+  MonitorElement *h_mr;
+  MonitorElement *h_rsq;
+  MonitorElement *h_mrRsq;
+  MonitorElement *h_mr_tight;
+  MonitorElement *h_rsq_tight;
+  MonitorElement *h_rsq_loose;
+  MonitorElement *h_ht;
+  MonitorElement *h_met;
+  MonitorElement *h_htMet;
+  MonitorElement *h_online_mr_vs_mr;
+  MonitorElement *h_online_rsq_vs_rsq;
+  MonitorElement *h_calo_mr_vs_mr;
+  MonitorElement *h_calo_rsq_vs_rsq;
 };
 
 #endif
diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_SingleLepton.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_SingleLepton.h
index 2586557647f6b..39f823a6b1319 100644
--- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_SingleLepton.h
+++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_SingleLepton.h
@@ -1,56 +1,54 @@
 #ifndef SUSY_HLT_SingleLepton_H
 #define SUSY_HLT_SingleLepton_H
 
-//event
+// event
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-//Electron
+// Electron
 #include "DataFormats/EgammaCandidates/interface/Electron.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
 
-//Muon
-#include "DataFormats/MuonReco/interface/MuonFwd.h"
+// Muon
 #include "DataFormats/MuonReco/interface/Muon.h"
+#include "DataFormats/MuonReco/interface/MuonFwd.h"
 
-//MET
-#include "DataFormats/METReco/interface/PFMET.h"
-#include "DataFormats/METReco/interface/PFMETCollection.h"
+// MET
 #include "DataFormats/METReco/interface/MET.h"
 #include "DataFormats/METReco/interface/METCollection.h"
+#include "DataFormats/METReco/interface/PFMET.h"
+#include "DataFormats/METReco/interface/PFMETCollection.h"
 
-//Jets
-#include "DataFormats/JetReco/interface/PFJet.h"
+// Jets
 #include "DataFormats/BTauReco/interface/JetTag.h"
+#include "DataFormats/JetReco/interface/PFJet.h"
 
-//Trigger
+// Trigger
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
-#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
-//Vertices
-#include "DataFormats/VertexReco/interface/VertexFwd.h"
+// Vertices
 #include "DataFormats/VertexReco/interface/Vertex.h"
+#include "DataFormats/VertexReco/interface/VertexFwd.h"
 
-//Conversions
-#include "DataFormats/EgammaCandidates/interface/ConversionFwd.h"
+// Conversions
 #include "DataFormats/EgammaCandidates/interface/Conversion.h"
+#include "DataFormats/EgammaCandidates/interface/ConversionFwd.h"
 
-//Beam spot
+// Beam spot
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
 
-class SUSY_HLT_SingleLepton: public DQMEDAnalyzer{
-
+class SUSY_HLT_SingleLepton : public DQMEDAnalyzer {
 public:
-  SUSY_HLT_SingleLepton(const edm::ParameterSet& ps);
+  SUSY_HLT_SingleLepton(const edm::ParameterSet &ps);
   ~SUSY_HLT_SingleLepton() override;
 
 protected:
@@ -60,7 +58,7 @@ class SUSY_HLT_SingleLepton: public DQMEDAnalyzer{
   void endRun(const edm::Run &run, const edm::EventSetup &eSetup) override;
 
 private:
-  //variables from config file
+  // variables from config file
   edm::InputTag theElectronTag_;
   edm::EDGetTokenT<reco::GsfElectronCollection> theElectronCollection_;
   edm::InputTag theMuonTag_;
@@ -117,22 +115,22 @@ class SUSY_HLT_SingleLepton: public DQMEDAnalyzer{
   double csv_threshold_;
 
   // Histograms
-  MonitorElement* h_triggerLepPt_;
-  MonitorElement* h_triggerLepEta_;
-  MonitorElement* h_triggerLepPhi_;
-  MonitorElement* h_HT_;
-  MonitorElement* h_MET_;
-  MonitorElement* h_maxCSV_;
-  MonitorElement* h_leptonTurnOn_num_;
-  MonitorElement* h_leptonTurnOn_den_;
-  MonitorElement* h_pfHTTurnOn_num_;
-  MonitorElement* h_pfHTTurnOn_den_;
-  MonitorElement* h_pfMetTurnOn_num_;
-  MonitorElement* h_pfMetTurnOn_den_;
-  MonitorElement* h_CSVTurnOn_num_;
-  MonitorElement* h_CSVTurnOn_den_;
-  MonitorElement* h_btagTurnOn_num_;
-  MonitorElement* h_btagTurnOn_den_;
+  MonitorElement *h_triggerLepPt_;
+  MonitorElement *h_triggerLepEta_;
+  MonitorElement *h_triggerLepPhi_;
+  MonitorElement *h_HT_;
+  MonitorElement *h_MET_;
+  MonitorElement *h_maxCSV_;
+  MonitorElement *h_leptonTurnOn_num_;
+  MonitorElement *h_leptonTurnOn_den_;
+  MonitorElement *h_pfHTTurnOn_num_;
+  MonitorElement *h_pfHTTurnOn_den_;
+  MonitorElement *h_pfMetTurnOn_num_;
+  MonitorElement *h_pfMetTurnOn_den_;
+  MonitorElement *h_CSVTurnOn_num_;
+  MonitorElement *h_CSVTurnOn_den_;
+  MonitorElement *h_btagTurnOn_num_;
+  MonitorElement *h_btagTurnOn_den_;
 };
 
 #endif
diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_VBF_Mu.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_VBF_Mu.h
old mode 100755
new mode 100644
index 578360457e723..d33aae9a05de8
--- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_VBF_Mu.h
+++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_VBF_Mu.h
@@ -1,107 +1,100 @@
 #ifndef SUSY_HLT_VBF_Mu_H
 #define SUSY_HLT_VBF_Mu_H
 
-//event
+// event
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
 // MET
-#include "DataFormats/METReco/interface/PFMET.h"
-#include "DataFormats/METReco/interface/PFMETCollection.h"
 #include "DataFormats/METReco/interface/CaloMET.h"
 #include "DataFormats/METReco/interface/CaloMETCollection.h"
+#include "DataFormats/METReco/interface/PFMET.h"
+#include "DataFormats/METReco/interface/PFMETCollection.h"
 
-
-//Muon
+// Muon
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 
 // Jets
-#include "DataFormats/JetReco/interface/PFJet.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
+#include "DataFormats/JetReco/interface/PFJet.h"
 
 // Trigger
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
-#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
-
-
-
-class SUSY_HLT_VBF_Mu: public DQMEDAnalyzer{
-    
+class SUSY_HLT_VBF_Mu : public DQMEDAnalyzer {
 public:
-    SUSY_HLT_VBF_Mu(const edm::ParameterSet& ps);
-    ~SUSY_HLT_VBF_Mu() override;
-    
+  SUSY_HLT_VBF_Mu(const edm::ParameterSet &ps);
+  ~SUSY_HLT_VBF_Mu() override;
+
 protected:
-    void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
-    void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-    void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;
-    void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
-    
+  void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
+
 private:
-    //histos booking function
-    void bookHistos(DQMStore::IBooker &);
-    
-    //variables from config file
-    edm::EDGetTokenT<reco::MuonCollection> theMuonCollection_;
-    edm::EDGetTokenT<reco::PFJetCollection> thePfJetCollection_;
-    edm::EDGetTokenT<reco::CaloJetCollection> theCaloJetCollection_;
-    edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
-    edm::EDGetTokenT<trigger::TriggerEvent> theTrigSummary_;
-    edm::EDGetTokenT<reco::PFMETCollection> thePfMETCollection_;    
-    edm::EDGetTokenT<reco::CaloMETCollection> theCaloMETCollection_;    
-    HLTConfigProvider fHltConfig;
-    
-    std::string HLTProcess_;
-    std::string triggerPath_;
-    edm::InputTag triggerMetFilter_;
-    edm::InputTag triggerDiJetFilter_;
-    edm::InputTag triggerHTFilter_;
-    edm::InputTag triggerMuFilter_;
-    edm::InputTag triggerCaloMETFilter_;
-    double ptThrJet_;
-    double etaThrJet_;
-    double ptThrJetTrig_;
-    double etaThrJetTrig_;
-    double metCut_;
-    double deltaetaVBFJets;
-    double dijet ;
-    double dijetOff ;
-    double pfmetOnlinethreshold;
-    double muonOnlinethreshold;
-    double htOnlinethreshold;
-    double mjjOnlinethreshold;
-    // Histograms
-    MonitorElement* h_triggerMuPt;
-    MonitorElement* h_triggerMuEta;
-    MonitorElement* h_triggerMuPhi;
-    MonitorElement* h_triggerCaloMet;
-    MonitorElement* h_triggerMet;
-    MonitorElement* h_triggerMetPhi;
-    MonitorElement* h_Met;
-    MonitorElement* h_ht; 
-    MonitorElement* h_DiJetMass;
-    MonitorElement* h_den_muonpt;
-    MonitorElement* h_num_muonpt;
-    MonitorElement* h_den_muoneta;
-    MonitorElement* h_num_muoneta;
-    MonitorElement* h_den_mjj;
-    MonitorElement* h_num_mjj;
-    MonitorElement* h_den_ht;
-    MonitorElement* h_num_ht;
-    MonitorElement* h_den_met;
-    MonitorElement* h_num_met;
+  // histos booking function
+  void bookHistos(DQMStore::IBooker &);
+
+  // variables from config file
+  edm::EDGetTokenT<reco::MuonCollection> theMuonCollection_;
+  edm::EDGetTokenT<reco::PFJetCollection> thePfJetCollection_;
+  edm::EDGetTokenT<reco::CaloJetCollection> theCaloJetCollection_;
+  edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
+  edm::EDGetTokenT<trigger::TriggerEvent> theTrigSummary_;
+  edm::EDGetTokenT<reco::PFMETCollection> thePfMETCollection_;
+  edm::EDGetTokenT<reco::CaloMETCollection> theCaloMETCollection_;
+  HLTConfigProvider fHltConfig;
 
+  std::string HLTProcess_;
+  std::string triggerPath_;
+  edm::InputTag triggerMetFilter_;
+  edm::InputTag triggerDiJetFilter_;
+  edm::InputTag triggerHTFilter_;
+  edm::InputTag triggerMuFilter_;
+  edm::InputTag triggerCaloMETFilter_;
+  double ptThrJet_;
+  double etaThrJet_;
+  double ptThrJetTrig_;
+  double etaThrJetTrig_;
+  double metCut_;
+  double deltaetaVBFJets;
+  double dijet;
+  double dijetOff;
+  double pfmetOnlinethreshold;
+  double muonOnlinethreshold;
+  double htOnlinethreshold;
+  double mjjOnlinethreshold;
+  // Histograms
+  MonitorElement *h_triggerMuPt;
+  MonitorElement *h_triggerMuEta;
+  MonitorElement *h_triggerMuPhi;
+  MonitorElement *h_triggerCaloMet;
+  MonitorElement *h_triggerMet;
+  MonitorElement *h_triggerMetPhi;
+  MonitorElement *h_Met;
+  MonitorElement *h_ht;
+  MonitorElement *h_DiJetMass;
+  MonitorElement *h_den_muonpt;
+  MonitorElement *h_num_muonpt;
+  MonitorElement *h_den_muoneta;
+  MonitorElement *h_num_muoneta;
+  MonitorElement *h_den_mjj;
+  MonitorElement *h_num_mjj;
+  MonitorElement *h_den_ht;
+  MonitorElement *h_num_ht;
+  MonitorElement *h_den_met;
+  MonitorElement *h_num_met;
 };
 
 #endif
diff --git a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_alphaT.h b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_alphaT.h
index 8cdcdd2560e61..e3b326c05fcce 100644
--- a/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_alphaT.h
+++ b/HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_alphaT.h
@@ -1,63 +1,59 @@
 #ifndef SUSY_HLT_alphaT_H
 #define SUSY_HLT_alphaT_H
 
-//event
+// event
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-//DQM
+// DQM
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-//Muon
+// Muon
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 
-
 // MET
-#include "DataFormats/METReco/interface/PFMET.h"
-#include "DataFormats/METReco/interface/PFMETCollection.h"
 #include "DataFormats/METReco/interface/CaloMET.h"
 #include "DataFormats/METReco/interface/CaloMETCollection.h"
+#include "DataFormats/METReco/interface/PFMET.h"
+#include "DataFormats/METReco/interface/PFMETCollection.h"
 
 // Jets
-#include "DataFormats/JetReco/interface/PFJet.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
+#include "DataFormats/JetReco/interface/PFJet.h"
 
 // Trigger
 #include "DataFormats/Common/interface/TriggerResults.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerEvent.h"
 #include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
-#include "DataFormats/HLTReco/interface/TriggerEventWithRefs.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
 
 #include "HLTrigger/JetMET/interface/AlphaT.h"
 
-class SUSY_HLT_alphaT: public DQMEDAnalyzer{
-
-  public:
-  SUSY_HLT_alphaT(const edm::ParameterSet& ps);
+class SUSY_HLT_alphaT : public DQMEDAnalyzer {
+public:
+  SUSY_HLT_alphaT(const edm::ParameterSet &ps);
   ~SUSY_HLT_alphaT() override;
 
-  protected:
+protected:
   void dqmBeginRun(edm::Run const &, edm::EventSetup const &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(edm::Event const& e, edm::EventSetup const& eSetup) override;
-  void endRun(edm::Run const& run, edm::EventSetup const& eSetup) override;
+  void analyze(edm::Event const &e, edm::EventSetup const &eSetup) override;
+  void endRun(edm::Run const &run, edm::EventSetup const &eSetup) override;
 
-  private:
-  //histos booking function
+private:
+  // histos booking function
   void bookHistos(DQMStore::IBooker &);
-  
-  //variables from config file
+
+  // variables from config file
   edm::EDGetTokenT<reco::PFJetCollection> thePfJetCollection_;
-  //edm::EDGetTokenT<reco::CaloJetCollection> theCaloJetCollection_;
+  // edm::EDGetTokenT<reco::CaloJetCollection> theCaloJetCollection_;
   edm::EDGetTokenT<edm::TriggerResults> triggerResults_;
   edm::EDGetTokenT<trigger::TriggerEvent> theTrigSummary_;
 
-
   HLTConfigProvider fHltConfig;
 
   std::string HLTProcess_;
@@ -72,7 +68,7 @@ class SUSY_HLT_alphaT: public DQMEDAnalyzer{
   double pfHtThrTurnon_;
   /* double caloAlphaTThrTurnon_; */
   /* double caloHtThrTurnon_; */
-  
+
   // Histograms
   /* MonitorElement* h_triggerCaloHt; */
   /* MonitorElement* h_triggerCaloAlphaT; */
@@ -82,13 +78,13 @@ class SUSY_HLT_alphaT: public DQMEDAnalyzer{
   /* MonitorElement* h_caloHtTurnOn_num; */
   /* MonitorElement* h_caloHtTurnOn_den; */
 
-  MonitorElement* h_triggerPfHt;
-  MonitorElement* h_triggerPfAlphaT;
-  MonitorElement* h_triggerPfAlphaT_triggerPfHt;
-  MonitorElement* h_pfAlphaTTurnOn_num;
-  MonitorElement* h_pfAlphaTTurnOn_den;
-  MonitorElement* h_pfHtTurnOn_num;
-  MonitorElement* h_pfHtTurnOn_den;
+  MonitorElement *h_triggerPfHt;
+  MonitorElement *h_triggerPfAlphaT;
+  MonitorElement *h_triggerPfAlphaT_triggerPfHt;
+  MonitorElement *h_pfAlphaTTurnOn_num;
+  MonitorElement *h_pfAlphaTTurnOn_den;
+  MonitorElement *h_pfHtTurnOn_num;
+  MonitorElement *h_pfHtTurnOn_den;
 };
 
 #endif
diff --git a/HLTriggerOffline/SUSYBSM/src/HltSusyExoPostProcessor.cc b/HLTriggerOffline/SUSYBSM/src/HltSusyExoPostProcessor.cc
index b865c37ccb79a..448dcf6055a76 100644
--- a/HLTriggerOffline/SUSYBSM/src/HltSusyExoPostProcessor.cc
+++ b/HLTriggerOffline/SUSYBSM/src/HltSusyExoPostProcessor.cc
@@ -2,40 +2,40 @@
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include <iostream>
-#include <cstring>
-#include <iomanip>
-#include <fstream>
-#include <cmath>
 #include "TH1.h"
 #include "TProfile.h"
+#include <cmath>
+#include <cstring>
+#include <fstream>
+#include <iomanip>
+#include <iostream>
 
 using namespace std;
 using namespace edm;
 
-HltSusyExoPostProcessor::HltSusyExoPostProcessor(const edm::ParameterSet& pset):
-  subDir_(pset.getUntrackedParameter<std::string>("subDir", std::string("HLT/SusyExo"))),
-  mcFlag(pset.getUntrackedParameter<bool>("mc_flag",true)),
-  reco_parametersets(pset.getParameter<VParameterSet>("reco_parametersets")),
-  mc_parametersets(pset.getParameter<VParameterSet>("mc_parametersets"))
-{
-  for(unsigned int i=0; i<reco_parametersets.size(); ++i) {
+HltSusyExoPostProcessor::HltSusyExoPostProcessor(const edm::ParameterSet &pset)
+    : subDir_(pset.getUntrackedParameter<std::string>("subDir", std::string("HLT/SusyExo"))),
+      mcFlag(pset.getUntrackedParameter<bool>("mc_flag", true)),
+      reco_parametersets(pset.getParameter<VParameterSet>("reco_parametersets")),
+      mc_parametersets(pset.getParameter<VParameterSet>("mc_parametersets")) {
+  for (unsigned int i = 0; i < reco_parametersets.size(); ++i) {
     reco_dirs.push_back(reco_parametersets[i].getParameter<string>("name"));
   }
-  for(unsigned int i=0; i<mc_parametersets.size(); ++i) {
+  for (unsigned int i = 0; i < mc_parametersets.size(); ++i) {
     mc_dirs.push_back(mc_parametersets[i].getParameter<string>("name"));
   }
 }
 
-void HltSusyExoPostProcessor::dqmEndJob(DQMStore::IBooker& iBooker_, DQMStore::IGetter& iGetter_) {
+void HltSusyExoPostProcessor::dqmEndJob(DQMStore::IBooker &iBooker_, DQMStore::IGetter &iGetter_) {
   LogDebug("HltSusyExoPostProcessor") << "Start dqmEndJob";
 
-  //go to the directory to be processed
-  if(iGetter_.dirExists(subDir_)) iGetter_.cd(subDir_);
+  // go to the directory to be processed
+  if (iGetter_.dirExists(subDir_))
+    iGetter_.cd(subDir_);
   else {
     edm::LogWarning("HltSusyExoPostProcessor") << "cannot find directory: " << subDir_ << " , skipping";
     return;
@@ -50,466 +50,595 @@ void HltSusyExoPostProcessor::dqmEndJob(DQMStore::IBooker& iBooker_, DQMStore::I
   std::string byEventDir = "/By_Event";
   std::string byMuonDir = "/By_Muon";
 
-  //get the number of bins of the MonitorElements (valid for all the MonitorElements, independently of selection on the final state)
-  //we take the number of bins from the MonitorElements of the source, and we subtract one because the last bin was reserved for the Total number of events
-  int nL1bins  = (iGetter_.get(iBooker_.pwd() + triggerBitsDir + "/L1Bits")->getNbinsX());
+  // get the number of bins of the MonitorElements (valid for all the
+  // MonitorElements, independently of selection on the final state) we take the
+  // number of bins from the MonitorElements of the source, and we subtract one
+  // because the last bin was reserved for the Total number of events
+  int nL1bins = (iGetter_.get(iBooker_.pwd() + triggerBitsDir + "/L1Bits")->getNbinsX());
   int nHltbins = (iGetter_.get(iBooker_.pwd() + triggerBitsDir + "/HltBits")->getNbinsX());
 
-  std::vector<int> L1placement; for(int i=0; i<nL1bins-1*mcFlag; ++i) L1placement.push_back(6);
-  std::vector<int> Hltplacement; for(int i=0; i<nHltbins-1*mcFlag; ++i) Hltplacement.push_back(7);
-  int L1bins[7]; for(unsigned int i=0; i<sizeof(L1bins)/sizeof(L1bins[0]); ++i) L1bins[i]=0;
-  int Hltbins[8]; for(unsigned int i=0; i<sizeof(Hltbins)/sizeof(Hltbins[0]); ++i) Hltbins[i]=0;
-  string L1search[8] = {"Mu","EG","Jet","ET","TauJet","X",""};
+  std::vector<int> L1placement;
+  for (int i = 0; i < nL1bins - 1 * mcFlag; ++i)
+    L1placement.push_back(6);
+  std::vector<int> Hltplacement;
+  for (int i = 0; i < nHltbins - 1 * mcFlag; ++i)
+    Hltplacement.push_back(7);
+  int L1bins[7];
+  for (unsigned int i = 0; i < sizeof(L1bins) / sizeof(L1bins[0]); ++i)
+    L1bins[i] = 0;
+  int Hltbins[8];
+  for (unsigned int i = 0; i < sizeof(Hltbins) / sizeof(Hltbins[0]); ++i)
+    Hltbins[i] = 0;
+  string L1search[8] = {"Mu", "EG", "Jet", "ET", "TauJet", "X", ""};
   string L1search3 = "HTT", L1search6 = "Bias";
-  string Hltsearch[8] = {"Mu","Ele","Jet","Photon","MET","Tau","X",""};
-  string Hltsearch4 = "HT", Hltsearch5 = "BTag", Hltsearch6_1 = "EG", Hltsearch6_2 = "ET", Hltsearch7_1 = "Bias", Hltsearch7_2 = "AlCa";
+  string Hltsearch[8] = {"Mu", "Ele", "Jet", "Photon", "MET", "Tau", "X", ""};
+  string Hltsearch4 = "HT", Hltsearch5 = "BTag", Hltsearch6_1 = "EG", Hltsearch6_2 = "ET", Hltsearch7_1 = "Bias",
+         Hltsearch7_2 = "AlCa";
 
   LogDebug("HltSusyExoPostProcessor") << "number of L1 bins = " << nL1bins << " number of HLT bins = " << nHltbins;
   double value = 0;
   double error = 0;
 
-  //Calculate the efficiencies for histos without any selection
+  // Calculate the efficiencies for histos without any selection
   iGetter_.setCurrentFolder(subDir_ + triggerBitsDir);
-  TH1F* hL1Paths = iGetter_.get(subDir_ + triggerBitsDir + "/L1Paths")->getTH1F();
-  MonitorElement* hL1EffBeforeCuts = bookEffMEProfileFromTH1(hL1Paths, "Eff", iBooker_);
-  TH1F* hHltPaths = iGetter_.get(subDir_ + triggerBitsDir + "/HltPaths")->getTH1F();
-  MonitorElement* hHltEffBeforeCuts = bookEffMEProfileFromTH1(hHltPaths, "Eff", iBooker_);
+  TH1F *hL1Paths = iGetter_.get(subDir_ + triggerBitsDir + "/L1Paths")->getTH1F();
+  MonitorElement *hL1EffBeforeCuts = bookEffMEProfileFromTH1(hL1Paths, "Eff", iBooker_);
+  TH1F *hHltPaths = iGetter_.get(subDir_ + triggerBitsDir + "/HltPaths")->getTH1F();
+  MonitorElement *hHltEffBeforeCuts = bookEffMEProfileFromTH1(hHltPaths, "Eff", iBooker_);
 
   LogDebug("HltSusyExoPostProcessor") << "MonitorElements booked";
 
-  //get the total number of events
+  // get the total number of events
   float nTotalBeforeCuts = -1;
   int reference_bin = -1;
-  if(mcFlag) {
+  if (mcFlag) {
     nTotalBeforeCuts = iGetter_.get(subDir_ + triggerBitsDir + "/L1Bits")->getBinContent(nL1bins);
     reference_bin = nL1bins;
-  }
-  else {
-    for(int i=0; i<nHltbins; ++i) {
-      string triggername = ((TProfile*)hHltEffBeforeCuts->getTProfile())->GetXaxis()->GetBinLabel(i+1);
+  } else {
+    for (int i = 0; i < nHltbins; ++i) {
+      string triggername = ((TProfile *)hHltEffBeforeCuts->getTProfile())->GetXaxis()->GetBinLabel(i + 1);
       string eff_search = "HLT_ZeroBias";
-      if(triggername.find(eff_search)!=string::npos && triggername.size()==eff_search.size()) {
-        nTotalBeforeCuts = ((TProfile*)hHltEffBeforeCuts->getTProfile())->GetBinContent(i+1);
-        reference_bin = i+1;
+      if (triggername.find(eff_search) != string::npos && triggername.size() == eff_search.size()) {
+        nTotalBeforeCuts = ((TProfile *)hHltEffBeforeCuts->getTProfile())->GetBinContent(i + 1);
+        reference_bin = i + 1;
         break;
       }
     }
-    if(nTotalBeforeCuts == -1) {
+    if (nTotalBeforeCuts == -1) {
       nTotalBeforeCuts = iGetter_.get(subDir_ + triggerBitsDir + "/L1Bits")->getBinContent(nL1bins);
       reference_bin = nHltbins;
     }
   }
   LogDebug("HltSusyExoPostProcessor") << "Total number of events = " << nTotalBeforeCuts;
 
-  //fill the eff histo
-  for(int i=0; i<nL1bins-1*mcFlag; i++) {
-    value = (double) iGetter_.get(subDir_ + triggerBitsDir + "/L1Paths")->getBinContent(i+1) / (double) nTotalBeforeCuts;
-    error = sqrt(value*(1-value)/(double)nTotalBeforeCuts);
-    hL1EffBeforeCuts->setBinContent(i+1,value);
-    hL1EffBeforeCuts->setBinEntries(i+1,1);
-    hL1EffBeforeCuts->setBinError(i+1,error);
-    //if(i!=nL1bins)
+  // fill the eff histo
+  for (int i = 0; i < nL1bins - 1 * mcFlag; i++) {
+    value =
+        (double)iGetter_.get(subDir_ + triggerBitsDir + "/L1Paths")->getBinContent(i + 1) / (double)nTotalBeforeCuts;
+    error = sqrt(value * (1 - value) / (double)nTotalBeforeCuts);
+    hL1EffBeforeCuts->setBinContent(i + 1, value);
+    hL1EffBeforeCuts->setBinEntries(i + 1, 1);
+    hL1EffBeforeCuts->setBinError(i + 1, error);
+    // if(i!=nL1bins)
     // {
-    string triggername = ((TProfile*)hL1EffBeforeCuts->getTProfile())->GetXaxis()->GetBinLabel(i+1);
-    if( triggername.find(L1search6)==string::npos ) {
-      for(unsigned int j=0; j<sizeof(L1search)/sizeof(L1search[0])-2; ++j) {
-        if( triggername.find(L1search[j])!=string::npos || (j==3 && triggername.find(L1search3)!=string::npos) ) {
-          if(L1placement[i]==6)
-            L1placement[i]=j;
-          else if(L1placement[i]==2 && j==4)
-            L1placement[i]=4;
+    string triggername = ((TProfile *)hL1EffBeforeCuts->getTProfile())->GetXaxis()->GetBinLabel(i + 1);
+    if (triggername.find(L1search6) == string::npos) {
+      for (unsigned int j = 0; j < sizeof(L1search) / sizeof(L1search[0]) - 2; ++j) {
+        if (triggername.find(L1search[j]) != string::npos || (j == 3 && triggername.find(L1search3) != string::npos)) {
+          if (L1placement[i] == 6)
+            L1placement[i] = j;
+          else if (L1placement[i] == 2 && j == 4)
+            L1placement[i] = 4;
           else
-            L1placement[i]=5;
-        }
-        else if(triggername.empty() || triggername.find("Total")!=string::npos)
-          L1placement[i]=-1;
+            L1placement[i] = 5;
+        } else if (triggername.empty() || triggername.find("Total") != string::npos)
+          L1placement[i] = -1;
       }
     }
   }
 
-  for(unsigned int i=0; i<L1placement.size(); ++i)
-    if(L1placement[i]!=-1)
+  for (unsigned int i = 0; i < L1placement.size(); ++i)
+    if (L1placement[i] != -1)
       ++L1bins[L1placement[i]];
 
-  for(int i=0; i<nHltbins-1*mcFlag; i++) {
-    value = (double)iGetter_.get(subDir_ + triggerBitsDir + "/HltPaths")->getBinContent(i+1) / (double)nTotalBeforeCuts; error = sqrt(value*(1-value)/(double)nTotalBeforeCuts);
-    hHltEffBeforeCuts->setBinContent(i+1,value);
-    hHltEffBeforeCuts->setBinEntries(i+1,1);
-    hHltEffBeforeCuts->setBinError(i+1,error);
+  for (int i = 0; i < nHltbins - 1 * mcFlag; i++) {
+    value =
+        (double)iGetter_.get(subDir_ + triggerBitsDir + "/HltPaths")->getBinContent(i + 1) / (double)nTotalBeforeCuts;
+    error = sqrt(value * (1 - value) / (double)nTotalBeforeCuts);
+    hHltEffBeforeCuts->setBinContent(i + 1, value);
+    hHltEffBeforeCuts->setBinEntries(i + 1, 1);
+    hHltEffBeforeCuts->setBinError(i + 1, error);
     // if(i!=nHltbins)
     //  {
-    string triggername = ((TProfile*)hHltEffBeforeCuts->getTProfile())->GetXaxis()->GetBinLabel(i+1);
-    if( triggername.find(Hltsearch7_1)==string::npos && triggername.find(Hltsearch7_2)==string::npos ) {
-      for(unsigned int j=0; j<sizeof(Hltsearch)/sizeof(Hltsearch[0])-2; ++j) {
-        if( triggername.find(Hltsearch[j])!=string::npos || (j==4 && triggername.find(Hltsearch4)!=string::npos) || (j==5 && triggername.find(Hltsearch5)!=string::npos) ) {
-          if(Hltplacement[i]==7)
-            Hltplacement[i]=j;
-          else if( triggername.find(Hltsearch5)!=string::npos )
-            Hltplacement[i]=5;
+    string triggername = ((TProfile *)hHltEffBeforeCuts->getTProfile())->GetXaxis()->GetBinLabel(i + 1);
+    if (triggername.find(Hltsearch7_1) == string::npos && triggername.find(Hltsearch7_2) == string::npos) {
+      for (unsigned int j = 0; j < sizeof(Hltsearch) / sizeof(Hltsearch[0]) - 2; ++j) {
+        if (triggername.find(Hltsearch[j]) != string::npos ||
+            (j == 4 && triggername.find(Hltsearch4) != string::npos) ||
+            (j == 5 && triggername.find(Hltsearch5) != string::npos)) {
+          if (Hltplacement[i] == 7)
+            Hltplacement[i] = j;
+          else if (triggername.find(Hltsearch5) != string::npos)
+            Hltplacement[i] = 5;
           else
-            Hltplacement[i]=6;
-        }
-        else if(triggername.empty() || triggername.find("Total")!=string::npos)
-          Hltplacement[i]=-1;
+            Hltplacement[i] = 6;
+        } else if (triggername.empty() || triggername.find("Total") != string::npos)
+          Hltplacement[i] = -1;
       }
-      if(Hltplacement[i]>=0 && Hltplacement[i]<=5 && (triggername.find(Hltsearch6_1)!=string::npos || (triggername.find(Hltsearch6_2)!=string::npos && Hltplacement[i]!=4) ))
-        Hltplacement[i]=6;
+      if (Hltplacement[i] >= 0 && Hltplacement[i] <= 5 &&
+          (triggername.find(Hltsearch6_1) != string::npos ||
+           (triggername.find(Hltsearch6_2) != string::npos && Hltplacement[i] != 4)))
+        Hltplacement[i] = 6;
     }
   }
 
-  for(unsigned int i=0; i<Hltplacement.size(); ++i)
-    if(Hltplacement[i]!=-1)
+  for (unsigned int i = 0; i < Hltplacement.size(); ++i)
+    if (Hltplacement[i] != -1)
       ++Hltbins[Hltplacement[i]];
 
   LogDebug("HltSusyExoPostProcessor") << "MonitorElements filled";
 
-  //Create the sorted histograms
+  // Create the sorted histograms
   iBooker_.setCurrentFolder(subDir_ + triggerBitsDir);
-  MonitorElement* hL1EffSorted[7] = {
-      iBooker_.bookProfile("L1_Mu", new TProfile("L1_Mu","Efficiencies of L1 Muon Triggers",L1bins[0],0,L1bins[0])),
-      iBooker_.bookProfile("L1_EG", new TProfile("L1_EG","Efficiencies of L1 EG Triggers",L1bins[1],0,L1bins[1])),
-      iBooker_.bookProfile("L1_Jet", new TProfile("L1_Jet","Efficiencies of L1 Jet Triggers",L1bins[2],0,L1bins[2])),
-      iBooker_.bookProfile("L1_ETM_ETT_HTT", new TProfile("L1_ETM_ETT_HTT","Efficiencies of L1 ETM, ETT, and HTT Triggers",L1bins[3],0,L1bins[3])),
-      iBooker_.bookProfile("L1_TauJet", new TProfile("L1_TauJet","Efficiencies of L1 TauJet Triggers",L1bins[4],0,L1bins[4])),
-      iBooker_.bookProfile("L1_XTrigger", new TProfile("L1_XTrigger","Efficiencies of L1 Cross Triggers",L1bins[5],0,L1bins[5])),
-      iBooker_.bookProfile("L1_Overflow", new TProfile("L1_Overflow","Efficiencies of L1 Unsorted Triggers",L1bins[6],0,L1bins[6]))
-  };
-
-  MonitorElement* hHltEffSorted[8] = {
-      iBooker_.bookProfile("Hlt_Mu", new TProfile("Hlt_Mu","Efficiencies of HL Muon Triggers",Hltbins[0],0,Hltbins[0])),
-      iBooker_.bookProfile("Hlt_Ele", new TProfile("Hlt_Ele","Efficiencies of HL Electron Triggers",Hltbins[1],0,Hltbins[1])),
-      iBooker_.bookProfile("Hlt_Jet", new TProfile("Hlt_Jet","Efficiencies of HL Jet Triggers",Hltbins[2],0,Hltbins[2],"s")),
-      iBooker_.bookProfile("Hlt_Photon", new TProfile("Hlt_Photon","Efficiencies of HL Photon Triggers",Hltbins[3],0,Hltbins[3])),
-      iBooker_.bookProfile("Hlt_MET_HT", new TProfile("Hlt_MET_HT","Efficiencies of HL MET and HT Triggers",Hltbins[4],0,Hltbins[4])),
-      iBooker_.bookProfile("Hlt_Tau_BTag", new TProfile("Hlt_Tau_Btag","Efficiencies of HL Tau and BTag Triggers",Hltbins[5],0,Hltbins[5])),
-      iBooker_.bookProfile("Hlt_XTrigger", new TProfile("Hlt_XTrigger","Efficiencies of HL Cross Triggers",Hltbins[6],0,Hltbins[6])),
-      iBooker_.bookProfile("Hlt_Overflow", new TProfile("Hlt_Overflow","Efficiencies of HL Unsorted Triggers",Hltbins[7],0,Hltbins[7]))
-  };
-
-  int L1bincounter[8]; for(unsigned int i=0; i<sizeof(L1bincounter)/sizeof(L1bincounter[0]); ++i) L1bincounter[i]=0;
-  int Hltbincounter[8]; for(unsigned int i=0; i<sizeof(Hltbincounter)/sizeof(Hltbincounter[0]); ++i) Hltbincounter[i]=0;
-  TProfile* hL1_ = (TProfile*)hL1EffBeforeCuts->getTProfile();
-  TProfile* hHlt_ = (TProfile*)hHltEffBeforeCuts->getTProfile();
-  //  for(int i = 0; i<hHlt_->GetXaxis()->GetNbins(); i++) cout << "hHLT_->GetBinError(" << i << ") = " << hHlt_->GetBinError(i+1) << endl;
-  for(unsigned int i=0; i<L1placement.size(); ++i) {
-    if(L1placement[i]!=-1) {
-      hL1EffSorted[L1placement[i]]->setBinLabel(L1bincounter[L1placement[i]]+1, hL1_->GetXaxis()->GetBinLabel(i+1));
-      hL1EffSorted[L1placement[i]]->setBinContent(L1bincounter[L1placement[i]]+1, hL1_->GetBinContent(i+1));
-      hL1EffSorted[L1placement[i]]->setBinEntries(L1bincounter[L1placement[i]]+1, 1);
-      hL1EffSorted[L1placement[i]]->setBinError(L1bincounter[L1placement[i]]+1, hL1_->GetBinError(i+1));
+  MonitorElement *hL1EffSorted[7] = {
+      iBooker_.bookProfile("L1_Mu", new TProfile("L1_Mu", "Efficiencies of L1 Muon Triggers", L1bins[0], 0, L1bins[0])),
+      iBooker_.bookProfile("L1_EG", new TProfile("L1_EG", "Efficiencies of L1 EG Triggers", L1bins[1], 0, L1bins[1])),
+      iBooker_.bookProfile("L1_Jet",
+                           new TProfile("L1_Jet", "Efficiencies of L1 Jet Triggers", L1bins[2], 0, L1bins[2])),
+      iBooker_.bookProfile(
+          "L1_ETM_ETT_HTT",
+          new TProfile("L1_ETM_ETT_HTT", "Efficiencies of L1 ETM, ETT, and HTT Triggers", L1bins[3], 0, L1bins[3])),
+      iBooker_.bookProfile("L1_TauJet",
+                           new TProfile("L1_TauJet", "Efficiencies of L1 TauJet Triggers", L1bins[4], 0, L1bins[4])),
+      iBooker_.bookProfile("L1_XTrigger",
+                           new TProfile("L1_XTrigger", "Efficiencies of L1 Cross Triggers", L1bins[5], 0, L1bins[5])),
+      iBooker_.bookProfile(
+          "L1_Overflow", new TProfile("L1_Overflow", "Efficiencies of L1 Unsorted Triggers", L1bins[6], 0, L1bins[6]))};
+
+  MonitorElement *hHltEffSorted[8] = {
+      iBooker_.bookProfile("Hlt_Mu",
+                           new TProfile("Hlt_Mu", "Efficiencies of HL Muon Triggers", Hltbins[0], 0, Hltbins[0])),
+      iBooker_.bookProfile("Hlt_Ele",
+                           new TProfile("Hlt_Ele", "Efficiencies of HL Electron Triggers", Hltbins[1], 0, Hltbins[1])),
+      iBooker_.bookProfile("Hlt_Jet",
+                           new TProfile("Hlt_Jet", "Efficiencies of HL Jet Triggers", Hltbins[2], 0, Hltbins[2], "s")),
+      iBooker_.bookProfile("Hlt_Photon",
+                           new TProfile("Hlt_Photon", "Efficiencies of HL Photon Triggers", Hltbins[3], 0, Hltbins[3])),
+      iBooker_.bookProfile(
+          "Hlt_MET_HT",
+          new TProfile("Hlt_MET_HT", "Efficiencies of HL MET and HT Triggers", Hltbins[4], 0, Hltbins[4])),
+      iBooker_.bookProfile(
+          "Hlt_Tau_BTag",
+          new TProfile("Hlt_Tau_Btag", "Efficiencies of HL Tau and BTag Triggers", Hltbins[5], 0, Hltbins[5])),
+      iBooker_.bookProfile(
+          "Hlt_XTrigger", new TProfile("Hlt_XTrigger", "Efficiencies of HL Cross Triggers", Hltbins[6], 0, Hltbins[6])),
+      iBooker_.bookProfile(
+          "Hlt_Overflow",
+          new TProfile("Hlt_Overflow", "Efficiencies of HL Unsorted Triggers", Hltbins[7], 0, Hltbins[7]))};
+
+  int L1bincounter[8];
+  for (unsigned int i = 0; i < sizeof(L1bincounter) / sizeof(L1bincounter[0]); ++i)
+    L1bincounter[i] = 0;
+  int Hltbincounter[8];
+  for (unsigned int i = 0; i < sizeof(Hltbincounter) / sizeof(Hltbincounter[0]); ++i)
+    Hltbincounter[i] = 0;
+  TProfile *hL1_ = (TProfile *)hL1EffBeforeCuts->getTProfile();
+  TProfile *hHlt_ = (TProfile *)hHltEffBeforeCuts->getTProfile();
+  //  for(int i = 0; i<hHlt_->GetXaxis()->GetNbins(); i++) cout <<
+  //  "hHLT_->GetBinError(" << i << ") = " << hHlt_->GetBinError(i+1) << endl;
+  for (unsigned int i = 0; i < L1placement.size(); ++i) {
+    if (L1placement[i] != -1) {
+      hL1EffSorted[L1placement[i]]->setBinLabel(L1bincounter[L1placement[i]] + 1, hL1_->GetXaxis()->GetBinLabel(i + 1));
+      hL1EffSorted[L1placement[i]]->setBinContent(L1bincounter[L1placement[i]] + 1, hL1_->GetBinContent(i + 1));
+      hL1EffSorted[L1placement[i]]->setBinEntries(L1bincounter[L1placement[i]] + 1, 1);
+      hL1EffSorted[L1placement[i]]->setBinError(L1bincounter[L1placement[i]] + 1, hL1_->GetBinError(i + 1));
       ++L1bincounter[L1placement[i]];
     }
   }
-  for(unsigned int i=0; i<Hltplacement.size(); ++i) {
-    if(Hltplacement[i]!=-1) {
-      hHltEffSorted[Hltplacement[i]]->setBinLabel(Hltbincounter[Hltplacement[i]]+1, hHlt_->GetXaxis()->GetBinLabel(i+1));
-      hHltEffSorted[Hltplacement[i]]->setBinContent(Hltbincounter[Hltplacement[i]]+1, hHlt_->GetBinContent(i+1));
-      hHltEffSorted[Hltplacement[i]]->setBinEntries(Hltbincounter[Hltplacement[i]]+1, 1);
-      hHltEffSorted[Hltplacement[i]]->setBinError(Hltbincounter[Hltplacement[i]]+1, hHlt_->GetBinError(i+1));
+  for (unsigned int i = 0; i < Hltplacement.size(); ++i) {
+    if (Hltplacement[i] != -1) {
+      hHltEffSorted[Hltplacement[i]]->setBinLabel(Hltbincounter[Hltplacement[i]] + 1,
+                                                  hHlt_->GetXaxis()->GetBinLabel(i + 1));
+      hHltEffSorted[Hltplacement[i]]->setBinContent(Hltbincounter[Hltplacement[i]] + 1, hHlt_->GetBinContent(i + 1));
+      hHltEffSorted[Hltplacement[i]]->setBinEntries(Hltbincounter[Hltplacement[i]] + 1, 1);
+      hHltEffSorted[Hltplacement[i]]->setBinError(Hltbincounter[Hltplacement[i]] + 1, hHlt_->GetBinError(i + 1));
       ++Hltbincounter[Hltplacement[i]];
     }
   }
 
-  for(unsigned int i=0; i<mc_dirs.size(); ++i) {
-    //Calculate the efficiencies for histos after MC selection
+  for (unsigned int i = 0; i < mc_dirs.size(); ++i) {
+    // Calculate the efficiencies for histos after MC selection
     iGetter_.setCurrentFolder(subDir_ + mcSelBitsDir + "/" + mc_dirs[i]);
-    //book the MonitorElements for the efficiencies
+    // book the MonitorElements for the efficiencies
     char set_name_L1[256], set_name_Hlt[256];
     sprintf(set_name_L1, "L1Eff_%s", mc_dirs[i].c_str());
     sprintf(set_name_Hlt, "HltEff_%s", mc_dirs[i].c_str());
-    MonitorElement* hL1EffAfterMcCuts  = bookEffMEProfileFromTH1(iGetter_.get(subDir_ + mcSelBitsDir + "/" + mc_dirs[i] + "/L1Paths_" + mc_dirs[i])->getTH1F(), (std::string) set_name_L1, iBooker_);
+    MonitorElement *hL1EffAfterMcCuts = bookEffMEProfileFromTH1(
+        iGetter_.get(subDir_ + mcSelBitsDir + "/" + mc_dirs[i] + "/L1Paths_" + mc_dirs[i])->getTH1F(),
+        (std::string)set_name_L1,
+        iBooker_);
     hL1EffAfterMcCuts->setTitle("L1 Efficiencies for " + mc_dirs[i] + " selection");
-    MonitorElement* hHltEffAfterMcCuts = bookEffMEProfileFromTH1(iGetter_.get(subDir_ + mcSelBitsDir + "/" + mc_dirs[i] + "/HltPaths_" + mc_dirs[i])->getTH1F(), (std::string) set_name_Hlt, iBooker_);
+    MonitorElement *hHltEffAfterMcCuts = bookEffMEProfileFromTH1(
+        iGetter_.get(subDir_ + mcSelBitsDir + "/" + mc_dirs[i] + "/HltPaths_" + mc_dirs[i])->getTH1F(),
+        (std::string)set_name_Hlt,
+        iBooker_);
     hHltEffAfterMcCuts->setTitle("HLT Efficiencies for " + mc_dirs[i] + " selection");
 
     LogDebug("HltSusyExoPostProcessor") << "MonitorElements for " << mc_dirs[i] << " selection booked";
 
-    //get the total number of events
+    // get the total number of events
     float nTotalAfterMcCuts;
-    if(mcFlag)
-      nTotalAfterMcCuts = iGetter_.get(subDir_ + mcSelBitsDir + "/" + mc_dirs[i] + "/L1Bits_" + mc_dirs[i])->getBinContent(nL1bins);
+    if (mcFlag)
+      nTotalAfterMcCuts =
+          iGetter_.get(subDir_ + mcSelBitsDir + "/" + mc_dirs[i] + "/L1Bits_" + mc_dirs[i])->getBinContent(nL1bins);
     else
-      nTotalAfterMcCuts = iGetter_.get(subDir_ + mcSelBitsDir + "/" + mc_dirs[i] + "/HltBits_" + mc_dirs[i])->getBinContent(reference_bin);
+      nTotalAfterMcCuts = iGetter_.get(subDir_ + mcSelBitsDir + "/" + mc_dirs[i] + "/HltBits_" + mc_dirs[i])
+                              ->getBinContent(reference_bin);
 
     LogDebug("HltSusyExoPostProcessor") << "Total number of events = " << nTotalAfterMcCuts;
 
-    MonitorElement* hL1EffSorted_mc[7];
-    MonitorElement* hHltEffSorted_mc[8];
+    MonitorElement *hL1EffSorted_mc[7];
+    MonitorElement *hHltEffSorted_mc[8];
     char buffer1[256], buffer2[256];
-    string L1_nametags[7] = {"Mu","EG","Jet","ETM_ETT_HTT","TauJet","XTrigger","Overflow"};
-    string L1_titletags[7] = {"Muon","EG","Jet","ETM, ETT, and HTT","TauJet","Cross","Unsorted"};
-    string Hlt_nametags[8] = {"Mu","Ele","Jet","Photon","MET_HT","Tau_BTag","XTrigger","Overflow"};
-    string Hlt_titletags[8] = {"Muon","Electron","Jet","Photon","MET and HT","Tau and BTag","Cross","Unsorted"};
-    for(unsigned int j=0; j<sizeof(hL1EffSorted_mc)/sizeof(hL1EffSorted_mc[0]); ++j) {
-      sprintf(buffer1,"L1_%s_%s",mc_dirs[i].c_str(),L1_nametags[j].c_str());
-      sprintf(buffer2,"Efficiencies of L1 %s Triggers for %s Selection",L1_titletags[j].c_str(),mc_dirs[i].c_str());
-      hL1EffSorted_mc[j] = iBooker_.bookProfile(buffer1, new TProfile(buffer1,buffer2,L1bins[j],0,L1bins[j]));
+    string L1_nametags[7] = {"Mu", "EG", "Jet", "ETM_ETT_HTT", "TauJet", "XTrigger", "Overflow"};
+    string L1_titletags[7] = {"Muon", "EG", "Jet", "ETM, ETT, and HTT", "TauJet", "Cross", "Unsorted"};
+    string Hlt_nametags[8] = {"Mu", "Ele", "Jet", "Photon", "MET_HT", "Tau_BTag", "XTrigger", "Overflow"};
+    string Hlt_titletags[8] = {"Muon", "Electron", "Jet", "Photon", "MET and HT", "Tau and BTag", "Cross", "Unsorted"};
+    for (unsigned int j = 0; j < sizeof(hL1EffSorted_mc) / sizeof(hL1EffSorted_mc[0]); ++j) {
+      sprintf(buffer1, "L1_%s_%s", mc_dirs[i].c_str(), L1_nametags[j].c_str());
+      sprintf(buffer2, "Efficiencies of L1 %s Triggers for %s Selection", L1_titletags[j].c_str(), mc_dirs[i].c_str());
+      hL1EffSorted_mc[j] = iBooker_.bookProfile(buffer1, new TProfile(buffer1, buffer2, L1bins[j], 0, L1bins[j]));
     }
-    for(unsigned int j=0; j<sizeof(hHltEffSorted_mc)/sizeof(hHltEffSorted_mc[0]); ++j) {
-      sprintf(buffer1,"Hlt_%s_%s",mc_dirs[i].c_str(),Hlt_nametags[j].c_str());
-      sprintf(buffer2,"Efficiencies of HL %s Triggers for %s Selection",Hlt_titletags[j].c_str(),mc_dirs[i].c_str());
-      hHltEffSorted_mc[j] = iBooker_.bookProfile(buffer1, new TProfile(buffer1,buffer2,Hltbins[j],0,Hltbins[j]));
+    for (unsigned int j = 0; j < sizeof(hHltEffSorted_mc) / sizeof(hHltEffSorted_mc[0]); ++j) {
+      sprintf(buffer1, "Hlt_%s_%s", mc_dirs[i].c_str(), Hlt_nametags[j].c_str());
+      sprintf(buffer2, "Efficiencies of HL %s Triggers for %s Selection", Hlt_titletags[j].c_str(), mc_dirs[i].c_str());
+      hHltEffSorted_mc[j] = iBooker_.bookProfile(buffer1, new TProfile(buffer1, buffer2, Hltbins[j], 0, Hltbins[j]));
     }
 
-    //fill the eff histo
-    int L1bincounter_mc[8]; for(unsigned int j=0; j<sizeof(L1bincounter_mc)/sizeof(L1bincounter_mc[0]); ++j) L1bincounter_mc[j]=0;
-    int Hltbincounter_mc[8]; for(unsigned int j=0; j<sizeof(Hltbincounter_mc)/sizeof(Hltbincounter_mc[0]); ++j) Hltbincounter_mc[j]=0;
-    TProfile* hL1_mc = (TProfile*)hL1EffAfterMcCuts->getTProfile();
-    TProfile* hHlt_mc = (TProfile*)hHltEffAfterMcCuts->getTProfile();
-    for(unsigned int j=0; j<L1placement.size(); j++) {
-      value = nTotalAfterMcCuts ? (float)iGetter_.get(subDir_ + mcSelBitsDir + "/" + mc_dirs[i] + "/L1Paths_" + mc_dirs[i])->getBinContent(j+1) / nTotalAfterMcCuts : 0;
-      error = nTotalAfterMcCuts ? sqrt(value*(1-value)/nTotalAfterMcCuts) : 0;
-      hL1EffAfterMcCuts->setBinContent(j+1,value);
-      hL1EffAfterMcCuts->setBinEntries(j+1,1);
-      hL1EffAfterMcCuts->setBinError(j+1,error);
-      if(L1placement[j]!=-1) {
-        hL1EffSorted_mc[L1placement[j]]->setBinLabel(L1bincounter_mc[L1placement[j]]+1, hL1_mc->GetXaxis()->GetBinLabel(j+1));
-        hL1EffSorted_mc[L1placement[j]]->setBinContent(L1bincounter_mc[L1placement[j]]+1, hL1_mc->GetBinContent(j+1));
-        hL1EffSorted_mc[L1placement[j]]->setBinEntries(L1bincounter_mc[L1placement[j]]+1, 1);
-        hL1EffSorted_mc[L1placement[j]]->setBinError(L1bincounter_mc[L1placement[j]]+1, hL1_mc->GetBinError(j+1));
+    // fill the eff histo
+    int L1bincounter_mc[8];
+    for (unsigned int j = 0; j < sizeof(L1bincounter_mc) / sizeof(L1bincounter_mc[0]); ++j)
+      L1bincounter_mc[j] = 0;
+    int Hltbincounter_mc[8];
+    for (unsigned int j = 0; j < sizeof(Hltbincounter_mc) / sizeof(Hltbincounter_mc[0]); ++j)
+      Hltbincounter_mc[j] = 0;
+    TProfile *hL1_mc = (TProfile *)hL1EffAfterMcCuts->getTProfile();
+    TProfile *hHlt_mc = (TProfile *)hHltEffAfterMcCuts->getTProfile();
+    for (unsigned int j = 0; j < L1placement.size(); j++) {
+      value = nTotalAfterMcCuts
+                  ? (float)iGetter_.get(subDir_ + mcSelBitsDir + "/" + mc_dirs[i] + "/L1Paths_" + mc_dirs[i])
+                            ->getBinContent(j + 1) /
+                        nTotalAfterMcCuts
+                  : 0;
+      error = nTotalAfterMcCuts ? sqrt(value * (1 - value) / nTotalAfterMcCuts) : 0;
+      hL1EffAfterMcCuts->setBinContent(j + 1, value);
+      hL1EffAfterMcCuts->setBinEntries(j + 1, 1);
+      hL1EffAfterMcCuts->setBinError(j + 1, error);
+      if (L1placement[j] != -1) {
+        hL1EffSorted_mc[L1placement[j]]->setBinLabel(L1bincounter_mc[L1placement[j]] + 1,
+                                                     hL1_mc->GetXaxis()->GetBinLabel(j + 1));
+        hL1EffSorted_mc[L1placement[j]]->setBinContent(L1bincounter_mc[L1placement[j]] + 1,
+                                                       hL1_mc->GetBinContent(j + 1));
+        hL1EffSorted_mc[L1placement[j]]->setBinEntries(L1bincounter_mc[L1placement[j]] + 1, 1);
+        hL1EffSorted_mc[L1placement[j]]->setBinError(L1bincounter_mc[L1placement[j]] + 1, hL1_mc->GetBinError(j + 1));
         ++L1bincounter_mc[L1placement[j]];
       }
     }
-    if(nL1bins!=int(L1placement.size())) {
-      value = nTotalAfterMcCuts ? (float)iGetter_.get(subDir_ + mcSelBitsDir + "/" + mc_dirs[i] + "/L1Paths_" + mc_dirs[i])->getBinContent(nL1bins) / nTotalAfterMcCuts : 0;
-      error = nTotalAfterMcCuts ? sqrt(value*(1-value)/nTotalAfterMcCuts) : 0;
-      hL1EffAfterMcCuts->setBinContent(nL1bins,value);
-      hL1EffAfterMcCuts->setBinEntries(nL1bins,1);
-      hL1EffAfterMcCuts->setBinError(nL1bins,error);
+    if (nL1bins != int(L1placement.size())) {
+      value = nTotalAfterMcCuts
+                  ? (float)iGetter_.get(subDir_ + mcSelBitsDir + "/" + mc_dirs[i] + "/L1Paths_" + mc_dirs[i])
+                            ->getBinContent(nL1bins) /
+                        nTotalAfterMcCuts
+                  : 0;
+      error = nTotalAfterMcCuts ? sqrt(value * (1 - value) / nTotalAfterMcCuts) : 0;
+      hL1EffAfterMcCuts->setBinContent(nL1bins, value);
+      hL1EffAfterMcCuts->setBinEntries(nL1bins, 1);
+      hL1EffAfterMcCuts->setBinError(nL1bins, error);
     }
-    for(unsigned int j=0; j<Hltplacement.size(); j++) {
-      value = nTotalAfterMcCuts ? (float)iGetter_.get(subDir_ + mcSelBitsDir + "/" + mc_dirs[i] + "/HltPaths_" + mc_dirs[i])->getBinContent(j+1) / nTotalAfterMcCuts : 0;
-      error = nTotalAfterMcCuts ? sqrt(value*(1-value)/nTotalAfterMcCuts) : 0;
-      hHltEffAfterMcCuts->setBinContent(j+1,value);
-      hHltEffAfterMcCuts->setBinEntries(j+1,1);
-      hHltEffAfterMcCuts->setBinError(j+1,error);
-      if(Hltplacement[j]!=-1) {
-        hHltEffSorted_mc[Hltplacement[j]]->setBinLabel(Hltbincounter_mc[Hltplacement[j]]+1, hHlt_mc->GetXaxis()->GetBinLabel(j+1));
-        hHltEffSorted_mc[Hltplacement[j]]->setBinContent(Hltbincounter_mc[Hltplacement[j]]+1, hHlt_mc->GetBinContent(j+1));
-        hHltEffSorted_mc[Hltplacement[j]]->setBinEntries(Hltbincounter_mc[Hltplacement[j]]+1, 1);
-        hHltEffSorted_mc[Hltplacement[j]]->setBinError(Hltbincounter_mc[Hltplacement[j]]+1, hHlt_mc->GetBinError(j+1));
+    for (unsigned int j = 0; j < Hltplacement.size(); j++) {
+      value = nTotalAfterMcCuts
+                  ? (float)iGetter_.get(subDir_ + mcSelBitsDir + "/" + mc_dirs[i] + "/HltPaths_" + mc_dirs[i])
+                            ->getBinContent(j + 1) /
+                        nTotalAfterMcCuts
+                  : 0;
+      error = nTotalAfterMcCuts ? sqrt(value * (1 - value) / nTotalAfterMcCuts) : 0;
+      hHltEffAfterMcCuts->setBinContent(j + 1, value);
+      hHltEffAfterMcCuts->setBinEntries(j + 1, 1);
+      hHltEffAfterMcCuts->setBinError(j + 1, error);
+      if (Hltplacement[j] != -1) {
+        hHltEffSorted_mc[Hltplacement[j]]->setBinLabel(Hltbincounter_mc[Hltplacement[j]] + 1,
+                                                       hHlt_mc->GetXaxis()->GetBinLabel(j + 1));
+        hHltEffSorted_mc[Hltplacement[j]]->setBinContent(Hltbincounter_mc[Hltplacement[j]] + 1,
+                                                         hHlt_mc->GetBinContent(j + 1));
+        hHltEffSorted_mc[Hltplacement[j]]->setBinEntries(Hltbincounter_mc[Hltplacement[j]] + 1, 1);
+        hHltEffSorted_mc[Hltplacement[j]]->setBinError(Hltbincounter_mc[Hltplacement[j]] + 1,
+                                                       hHlt_mc->GetBinError(j + 1));
         ++Hltbincounter_mc[Hltplacement[j]];
       }
     }
-    if(nHltbins!=int(Hltplacement.size())) {
-      value = nTotalAfterMcCuts ? (float)iGetter_.get(subDir_ + mcSelBitsDir + "/" + mc_dirs[i] + "/HltPaths_" + mc_dirs[i])->getBinContent(nHltbins) / nTotalAfterMcCuts : 0;
-      error = nTotalAfterMcCuts ? sqrt(value*(1-value)/nTotalAfterMcCuts) : 0;
-      hHltEffAfterMcCuts->setBinContent(nHltbins,value);
-      hHltEffAfterMcCuts->setBinEntries(nHltbins,1);
-      hHltEffAfterMcCuts->setBinError(nHltbins,error);
+    if (nHltbins != int(Hltplacement.size())) {
+      value = nTotalAfterMcCuts
+                  ? (float)iGetter_.get(subDir_ + mcSelBitsDir + "/" + mc_dirs[i] + "/HltPaths_" + mc_dirs[i])
+                            ->getBinContent(nHltbins) /
+                        nTotalAfterMcCuts
+                  : 0;
+      error = nTotalAfterMcCuts ? sqrt(value * (1 - value) / nTotalAfterMcCuts) : 0;
+      hHltEffAfterMcCuts->setBinContent(nHltbins, value);
+      hHltEffAfterMcCuts->setBinEntries(nHltbins, 1);
+      hHltEffAfterMcCuts->setBinError(nHltbins, error);
     }
-    LogDebug("HltSusyExoPostProcessor") << "MonitorElements filled for " << mc_dirs[i] <<" selection";
+    LogDebug("HltSusyExoPostProcessor") << "MonitorElements filled for " << mc_dirs[i] << " selection";
   }
 
-  for(unsigned int i=0; i<reco_dirs.size(); ++i) {
-    //Calculate the efficiencies for histos after RECO selection
+  for (unsigned int i = 0; i < reco_dirs.size(); ++i) {
+    // Calculate the efficiencies for histos after RECO selection
     iGetter_.setCurrentFolder(subDir_ + recoSelBitsDir + "/" + reco_dirs[i]);
-    //book the MonitorElements for the efficiencies
+    // book the MonitorElements for the efficiencies
     char set_name_L1[256], set_name_Hlt[256];
     sprintf(set_name_L1, "L1Eff_%s", reco_dirs[i].c_str());
     sprintf(set_name_Hlt, "HltEff_%s", reco_dirs[i].c_str());
-    MonitorElement* hL1EffAfterRecoCuts  = bookEffMEProfileFromTH1(iGetter_.get(subDir_ + recoSelBitsDir + "/" + reco_dirs[i] + "/L1Paths_" + reco_dirs[i])->getTH1F(), (std::string) set_name_L1, iBooker_);
+    MonitorElement *hL1EffAfterRecoCuts = bookEffMEProfileFromTH1(
+        iGetter_.get(subDir_ + recoSelBitsDir + "/" + reco_dirs[i] + "/L1Paths_" + reco_dirs[i])->getTH1F(),
+        (std::string)set_name_L1,
+        iBooker_);
     hL1EffAfterRecoCuts->setTitle("L1 Efficiencies for " + reco_dirs[i] + " selection");
-    MonitorElement* hHltEffAfterRecoCuts = bookEffMEProfileFromTH1(iGetter_.get(subDir_ + recoSelBitsDir + "/" + reco_dirs[i] + "/HltPaths_" + reco_dirs[i])->getTH1F(), (std::string) set_name_Hlt, iBooker_);
+    MonitorElement *hHltEffAfterRecoCuts = bookEffMEProfileFromTH1(
+        iGetter_.get(subDir_ + recoSelBitsDir + "/" + reco_dirs[i] + "/HltPaths_" + reco_dirs[i])->getTH1F(),
+        (std::string)set_name_Hlt,
+        iBooker_);
     hHltEffAfterRecoCuts->setTitle("HLT Efficiencies for " + reco_dirs[i] + " selection");
 
     LogDebug("HltSusyExoPostProcessor") << "MonitorElements for " << reco_dirs[i] << " selection booked";
 
-    //get the total number of events
+    // get the total number of events
     float nTotalAfterRecoCuts;
-    if(mcFlag)
-      nTotalAfterRecoCuts = iGetter_.get(subDir_ + recoSelBitsDir + "/" + reco_dirs[i] + "/L1Bits_" + reco_dirs[i])->getBinContent(nL1bins);
+    if (mcFlag)
+      nTotalAfterRecoCuts = iGetter_.get(subDir_ + recoSelBitsDir + "/" + reco_dirs[i] + "/L1Bits_" + reco_dirs[i])
+                                ->getBinContent(nL1bins);
     else
-      nTotalAfterRecoCuts = iGetter_.get(subDir_ + recoSelBitsDir + "/" + reco_dirs[i] + "/HltBits_" + reco_dirs[i])->getBinContent(reference_bin);
+      nTotalAfterRecoCuts = iGetter_.get(subDir_ + recoSelBitsDir + "/" + reco_dirs[i] + "/HltBits_" + reco_dirs[i])
+                                ->getBinContent(reference_bin);
 
     LogDebug("HltSusyExoPostProcessor") << "Total number of events = " << nTotalAfterRecoCuts;
 
-    MonitorElement* hL1EffSorted_reco[7];
-    MonitorElement* hHltEffSorted_reco[8];
+    MonitorElement *hL1EffSorted_reco[7];
+    MonitorElement *hHltEffSorted_reco[8];
     char buffer1[256], buffer2[256];
-    string L1_nametags[7] = {"Mu","EG","Jet","ETM_ETT_HTT","TauJet","XTrigger","Overflow"};
-    string L1_titletags[7] = {"Muon","EG","Jet","ETM, ETT, and HTT","TauJet","Cross","Unsorted"};
-    string Hlt_nametags[8] = {"Mu","Ele","Jet","Photon","MET_HT","Tau_BTag","XTrigger","Overflow"};
-    string Hlt_titletags[8] = {"Muon","Electron","Jet","Photon","MET and HT","Tau and BTag","Cross","Unsorted"};
-    for(unsigned int j=0; j<sizeof(hL1EffSorted_reco)/sizeof(hL1EffSorted_reco[0]); ++j)
-    {
-      sprintf(buffer1,"L1_%s_%s",reco_dirs[i].c_str(),L1_nametags[j].c_str());
-      sprintf(buffer2,"Efficiencies of L1 %s Triggers for %s Selection",L1_titletags[j].c_str(),reco_dirs[i].c_str());
-      hL1EffSorted_reco[j] = iBooker_.bookProfile(buffer1, new TProfile(buffer1,buffer2,L1bins[j],0,L1bins[j]));
+    string L1_nametags[7] = {"Mu", "EG", "Jet", "ETM_ETT_HTT", "TauJet", "XTrigger", "Overflow"};
+    string L1_titletags[7] = {"Muon", "EG", "Jet", "ETM, ETT, and HTT", "TauJet", "Cross", "Unsorted"};
+    string Hlt_nametags[8] = {"Mu", "Ele", "Jet", "Photon", "MET_HT", "Tau_BTag", "XTrigger", "Overflow"};
+    string Hlt_titletags[8] = {"Muon", "Electron", "Jet", "Photon", "MET and HT", "Tau and BTag", "Cross", "Unsorted"};
+    for (unsigned int j = 0; j < sizeof(hL1EffSorted_reco) / sizeof(hL1EffSorted_reco[0]); ++j) {
+      sprintf(buffer1, "L1_%s_%s", reco_dirs[i].c_str(), L1_nametags[j].c_str());
+      sprintf(
+          buffer2, "Efficiencies of L1 %s Triggers for %s Selection", L1_titletags[j].c_str(), reco_dirs[i].c_str());
+      hL1EffSorted_reco[j] = iBooker_.bookProfile(buffer1, new TProfile(buffer1, buffer2, L1bins[j], 0, L1bins[j]));
     }
-    for(unsigned int j=0; j<sizeof(hHltEffSorted_reco)/sizeof(hHltEffSorted_reco[0]); ++j)
-    {
-      sprintf(buffer1,"Hlt_%s_%s",reco_dirs[i].c_str(),Hlt_nametags[j].c_str());
-      sprintf(buffer2,"Efficiencies of HL %s Triggers for %s Selection",Hlt_titletags[j].c_str(),reco_dirs[i].c_str());
-      hHltEffSorted_reco[j] = iBooker_.bookProfile(buffer1, new TProfile(buffer1,buffer2,Hltbins[j],0,Hltbins[j]));
+    for (unsigned int j = 0; j < sizeof(hHltEffSorted_reco) / sizeof(hHltEffSorted_reco[0]); ++j) {
+      sprintf(buffer1, "Hlt_%s_%s", reco_dirs[i].c_str(), Hlt_nametags[j].c_str());
+      sprintf(
+          buffer2, "Efficiencies of HL %s Triggers for %s Selection", Hlt_titletags[j].c_str(), reco_dirs[i].c_str());
+      hHltEffSorted_reco[j] = iBooker_.bookProfile(buffer1, new TProfile(buffer1, buffer2, Hltbins[j], 0, Hltbins[j]));
     }
 
-    //fill the eff histo
-    int L1bincounter_reco[8]; for(unsigned int j=0; j<sizeof(L1bincounter_reco)/sizeof(L1bincounter_reco[0]); ++j) L1bincounter_reco[j]=0;
-    int Hltbincounter_reco[8]; for(unsigned int j=0; j<sizeof(Hltbincounter_reco)/sizeof(Hltbincounter_reco[0]); ++j) Hltbincounter_reco[j]=0;
-    TProfile* hL1_reco = (TProfile*)hL1EffAfterRecoCuts->getTProfile();
-    TProfile* hHlt_reco = (TProfile*)hHltEffAfterRecoCuts->getTProfile();
-    for(unsigned int j=0; j<L1placement.size(); j++) {
-      value = nTotalAfterRecoCuts ? (float)iGetter_.get(subDir_ + recoSelBitsDir + "/" + reco_dirs[i] + "/L1Paths_" + reco_dirs[i])->getBinContent(j+1) / nTotalAfterRecoCuts : 0;
-      error = nTotalAfterRecoCuts ? sqrt(value*(1-value)/nTotalAfterRecoCuts) : 0;
-      hL1EffAfterRecoCuts->setBinContent(j+1,value);
-      hL1EffAfterRecoCuts->setBinEntries(j+1,1);
-      hL1EffAfterRecoCuts->setBinError(j+1,error);
-      if(L1placement[j]!=-1) {
-        hL1EffSorted_reco[L1placement[j]]->setBinLabel(L1bincounter_reco[L1placement[j]]+1, hL1_reco->GetXaxis()->GetBinLabel(j+1));
-        hL1EffSorted_reco[L1placement[j]]->setBinContent(L1bincounter_reco[L1placement[j]]+1, hL1_reco->GetBinContent(j+1));
-        hL1EffSorted_reco[L1placement[j]]->setBinEntries(L1bincounter_reco[L1placement[j]]+1, 1);
-        hL1EffSorted_reco[L1placement[j]]->setBinError(L1bincounter_reco[L1placement[j]]+1, hL1_reco->GetBinError(j+1));
+    // fill the eff histo
+    int L1bincounter_reco[8];
+    for (unsigned int j = 0; j < sizeof(L1bincounter_reco) / sizeof(L1bincounter_reco[0]); ++j)
+      L1bincounter_reco[j] = 0;
+    int Hltbincounter_reco[8];
+    for (unsigned int j = 0; j < sizeof(Hltbincounter_reco) / sizeof(Hltbincounter_reco[0]); ++j)
+      Hltbincounter_reco[j] = 0;
+    TProfile *hL1_reco = (TProfile *)hL1EffAfterRecoCuts->getTProfile();
+    TProfile *hHlt_reco = (TProfile *)hHltEffAfterRecoCuts->getTProfile();
+    for (unsigned int j = 0; j < L1placement.size(); j++) {
+      value = nTotalAfterRecoCuts
+                  ? (float)iGetter_.get(subDir_ + recoSelBitsDir + "/" + reco_dirs[i] + "/L1Paths_" + reco_dirs[i])
+                            ->getBinContent(j + 1) /
+                        nTotalAfterRecoCuts
+                  : 0;
+      error = nTotalAfterRecoCuts ? sqrt(value * (1 - value) / nTotalAfterRecoCuts) : 0;
+      hL1EffAfterRecoCuts->setBinContent(j + 1, value);
+      hL1EffAfterRecoCuts->setBinEntries(j + 1, 1);
+      hL1EffAfterRecoCuts->setBinError(j + 1, error);
+      if (L1placement[j] != -1) {
+        hL1EffSorted_reco[L1placement[j]]->setBinLabel(L1bincounter_reco[L1placement[j]] + 1,
+                                                       hL1_reco->GetXaxis()->GetBinLabel(j + 1));
+        hL1EffSorted_reco[L1placement[j]]->setBinContent(L1bincounter_reco[L1placement[j]] + 1,
+                                                         hL1_reco->GetBinContent(j + 1));
+        hL1EffSorted_reco[L1placement[j]]->setBinEntries(L1bincounter_reco[L1placement[j]] + 1, 1);
+        hL1EffSorted_reco[L1placement[j]]->setBinError(L1bincounter_reco[L1placement[j]] + 1,
+                                                       hL1_reco->GetBinError(j + 1));
         ++L1bincounter_reco[L1placement[j]];
       }
     }
-    if(nL1bins!=int(L1placement.size())) {
-      value = nTotalAfterRecoCuts ? (float)iGetter_.get(subDir_ + recoSelBitsDir + "/" + reco_dirs[i] + "/L1Paths_" + reco_dirs[i])->getBinContent(nL1bins) / nTotalAfterRecoCuts : 0;
-      error = nTotalAfterRecoCuts ? sqrt(value*(1-value)/nTotalAfterRecoCuts) : 0;
-      hL1EffAfterRecoCuts->setBinContent(nL1bins,value);
-      hL1EffAfterRecoCuts->setBinEntries(nL1bins,1);
-      hL1EffAfterRecoCuts->setBinError(nL1bins,error);
+    if (nL1bins != int(L1placement.size())) {
+      value = nTotalAfterRecoCuts
+                  ? (float)iGetter_.get(subDir_ + recoSelBitsDir + "/" + reco_dirs[i] + "/L1Paths_" + reco_dirs[i])
+                            ->getBinContent(nL1bins) /
+                        nTotalAfterRecoCuts
+                  : 0;
+      error = nTotalAfterRecoCuts ? sqrt(value * (1 - value) / nTotalAfterRecoCuts) : 0;
+      hL1EffAfterRecoCuts->setBinContent(nL1bins, value);
+      hL1EffAfterRecoCuts->setBinEntries(nL1bins, 1);
+      hL1EffAfterRecoCuts->setBinError(nL1bins, error);
     }
-    for(unsigned int j=0; j<Hltplacement.size(); j++) {
-      value = nTotalAfterRecoCuts ? (float)iGetter_.get(subDir_ + recoSelBitsDir + "/" + reco_dirs[i] + "/HltPaths_" + reco_dirs[i])->getBinContent(j+1) / nTotalAfterRecoCuts : 0;
-      error = nTotalAfterRecoCuts ? sqrt(value*(1-value)/nTotalAfterRecoCuts) : 0;
-      hHltEffAfterRecoCuts->setBinContent(j+1,value);
-      hHltEffAfterRecoCuts->setBinEntries(j+1,1);
-      hHltEffAfterRecoCuts->setBinError(j+1,error);
-      if(Hltplacement[j]!=-1) {
-        hHltEffSorted_reco[Hltplacement[j]]->setBinLabel(Hltbincounter_reco[Hltplacement[j]]+1, hHlt_reco->GetXaxis()->GetBinLabel(j+1));
-        hHltEffSorted_reco[Hltplacement[j]]->setBinContent(Hltbincounter_reco[Hltplacement[j]]+1, hHlt_reco->GetBinContent(j+1));
-        hHltEffSorted_reco[Hltplacement[j]]->setBinEntries(Hltbincounter_reco[Hltplacement[j]]+1, 1);
-        hHltEffSorted_reco[Hltplacement[j]]->setBinError(Hltbincounter_reco[Hltplacement[j]]+1, hHlt_reco->GetBinError(j+1));
+    for (unsigned int j = 0; j < Hltplacement.size(); j++) {
+      value = nTotalAfterRecoCuts
+                  ? (float)iGetter_.get(subDir_ + recoSelBitsDir + "/" + reco_dirs[i] + "/HltPaths_" + reco_dirs[i])
+                            ->getBinContent(j + 1) /
+                        nTotalAfterRecoCuts
+                  : 0;
+      error = nTotalAfterRecoCuts ? sqrt(value * (1 - value) / nTotalAfterRecoCuts) : 0;
+      hHltEffAfterRecoCuts->setBinContent(j + 1, value);
+      hHltEffAfterRecoCuts->setBinEntries(j + 1, 1);
+      hHltEffAfterRecoCuts->setBinError(j + 1, error);
+      if (Hltplacement[j] != -1) {
+        hHltEffSorted_reco[Hltplacement[j]]->setBinLabel(Hltbincounter_reco[Hltplacement[j]] + 1,
+                                                         hHlt_reco->GetXaxis()->GetBinLabel(j + 1));
+        hHltEffSorted_reco[Hltplacement[j]]->setBinContent(Hltbincounter_reco[Hltplacement[j]] + 1,
+                                                           hHlt_reco->GetBinContent(j + 1));
+        hHltEffSorted_reco[Hltplacement[j]]->setBinEntries(Hltbincounter_reco[Hltplacement[j]] + 1, 1);
+        hHltEffSorted_reco[Hltplacement[j]]->setBinError(Hltbincounter_reco[Hltplacement[j]] + 1,
+                                                         hHlt_reco->GetBinError(j + 1));
         ++Hltbincounter_reco[Hltplacement[j]];
       }
     }
-    if(nHltbins!=int(Hltplacement.size())) {
-      value = nTotalAfterRecoCuts ? (float)iGetter_.get(subDir_ + recoSelBitsDir + "/" + reco_dirs[i] + "/HltPaths_" + reco_dirs[i])->getBinContent(nHltbins) / nTotalAfterRecoCuts : 0;
-      error = nTotalAfterRecoCuts ? sqrt(value*(1-value)/nTotalAfterRecoCuts) : 0;
-      hHltEffAfterRecoCuts->setBinContent(nHltbins,value);
-      hHltEffAfterRecoCuts->setBinEntries(nHltbins,1);
-      hHltEffAfterRecoCuts->setBinError(nHltbins,error);
+    if (nHltbins != int(Hltplacement.size())) {
+      value = nTotalAfterRecoCuts
+                  ? (float)iGetter_.get(subDir_ + recoSelBitsDir + "/" + reco_dirs[i] + "/HltPaths_" + reco_dirs[i])
+                            ->getBinContent(nHltbins) /
+                        nTotalAfterRecoCuts
+                  : 0;
+      error = nTotalAfterRecoCuts ? sqrt(value * (1 - value) / nTotalAfterRecoCuts) : 0;
+      hHltEffAfterRecoCuts->setBinContent(nHltbins, value);
+      hHltEffAfterRecoCuts->setBinEntries(nHltbins, 1);
+      hHltEffAfterRecoCuts->setBinError(nHltbins, error);
     }
     LogDebug("HltSusyExoPostProcessor") << "MonitorElements filled";
   }
 
-  int pt_bins=100, eta_bins=100;
-  double pt_floor=0., pt_ceiling = 200., eta_floor=-3.5, eta_ceiling=3.5;
+  int pt_bins = 100, eta_bins = 100;
+  double pt_floor = 0., pt_ceiling = 200., eta_floor = -3.5, eta_ceiling = 3.5;
   iBooker_.setCurrentFolder(subDir_ + byEventDir);
-  MonitorElement* hPt_1_ByEvent = iBooker_.book1D("Pt_1_ByEvent","Turn on as a Function of P_{t}, |Eta|<1.2, By Event",pt_bins, pt_floor, pt_ceiling);
-  MonitorElement* hEta_1_ByEvent= iBooker_.book1D("Eta_1_ByEvent","Efficiency as a Function of Eta, P_{t}>0, By Event", eta_bins, eta_floor,eta_ceiling);
-  MonitorElement* hPt_2_ByEvent = iBooker_.book1D("Pt_2_ByEvent","Turn on as a Function of P_{t}, 1.2<|Eta|<2.1, By Event",pt_bins, pt_floor, pt_ceiling);
-  MonitorElement* hEta_2_ByEvent= iBooker_.book1D("Eta_2_ByEvent","Efficiency as a Function of Eta, P_{t}>10, By Event", eta_bins, eta_floor,eta_ceiling);
-  MonitorElement* hPt_3_ByEvent = iBooker_.book1D("Pt_3_ByEvent","Turn on as a Function of P_{t}, |Eta|>2.1, By Event",pt_bins, pt_floor, pt_ceiling);
-  MonitorElement* hEta_3_ByEvent= iBooker_.book1D("Eta_3_ByEvent","Efficiency as a Function of Eta, P_{t}>20, By Event", eta_bins, eta_floor,eta_ceiling);
+  MonitorElement *hPt_1_ByEvent = iBooker_.book1D(
+      "Pt_1_ByEvent", "Turn on as a Function of P_{t}, |Eta|<1.2, By Event", pt_bins, pt_floor, pt_ceiling);
+  MonitorElement *hEta_1_ByEvent = iBooker_.book1D(
+      "Eta_1_ByEvent", "Efficiency as a Function of Eta, P_{t}>0, By Event", eta_bins, eta_floor, eta_ceiling);
+  MonitorElement *hPt_2_ByEvent = iBooker_.book1D(
+      "Pt_2_ByEvent", "Turn on as a Function of P_{t}, 1.2<|Eta|<2.1, By Event", pt_bins, pt_floor, pt_ceiling);
+  MonitorElement *hEta_2_ByEvent = iBooker_.book1D(
+      "Eta_2_ByEvent", "Efficiency as a Function of Eta, P_{t}>10, By Event", eta_bins, eta_floor, eta_ceiling);
+  MonitorElement *hPt_3_ByEvent = iBooker_.book1D(
+      "Pt_3_ByEvent", "Turn on as a Function of P_{t}, |Eta|>2.1, By Event", pt_bins, pt_floor, pt_ceiling);
+  MonitorElement *hEta_3_ByEvent = iBooker_.book1D(
+      "Eta_3_ByEvent", "Efficiency as a Function of Eta, P_{t}>20, By Event", eta_bins, eta_floor, eta_ceiling);
   iBooker_.setCurrentFolder(subDir_ + byMuonDir);
-  MonitorElement* hPt_1_ByMuon = iBooker_.book1D("Pt_1_ByMuon","Turn on as a Function of P_{t}, |Eta|<1.2, By Muon",pt_bins, pt_floor, pt_ceiling);
-  MonitorElement* hEta_1_ByMuon= iBooker_.book1D("Eta_1_ByMuon","Efficiency as a Function of Eta, P_{t}>0, By Muon", eta_bins, eta_floor,eta_ceiling);
-  MonitorElement* hPt_2_ByMuon = iBooker_.book1D("Pt_2_ByMuon","Turn on as a Function of P_{t}, 1.2<|Eta|<2.1, By Muon",pt_bins, pt_floor, pt_ceiling);
-  MonitorElement* hEta_2_ByMuon= iBooker_.book1D("Eta_2_ByMuon","Efficiency as a Function of Eta, P_{t}>10, By Muon", eta_bins, eta_floor,eta_ceiling);
-  MonitorElement* hPt_3_ByMuon = iBooker_.book1D("Pt_3_ByMuon","Turn on as a Function of P_{t}, |Eta|>2.1, By Muon",pt_bins, pt_floor, pt_ceiling);
-  MonitorElement* hEta_3_ByMuon= iBooker_.book1D("Eta_3_ByMuon","Efficiency as a Function of Eta, P_{t}>20, By Muon", eta_bins, eta_floor,eta_ceiling);
-
-  for(int i=1; i<=hPt_1_ByEvent->getNbinsX(); ++i) {
+  MonitorElement *hPt_1_ByMuon = iBooker_.book1D(
+      "Pt_1_ByMuon", "Turn on as a Function of P_{t}, |Eta|<1.2, By Muon", pt_bins, pt_floor, pt_ceiling);
+  MonitorElement *hEta_1_ByMuon = iBooker_.book1D(
+      "Eta_1_ByMuon", "Efficiency as a Function of Eta, P_{t}>0, By Muon", eta_bins, eta_floor, eta_ceiling);
+  MonitorElement *hPt_2_ByMuon = iBooker_.book1D(
+      "Pt_2_ByMuon", "Turn on as a Function of P_{t}, 1.2<|Eta|<2.1, By Muon", pt_bins, pt_floor, pt_ceiling);
+  MonitorElement *hEta_2_ByMuon = iBooker_.book1D(
+      "Eta_2_ByMuon", "Efficiency as a Function of Eta, P_{t}>10, By Muon", eta_bins, eta_floor, eta_ceiling);
+  MonitorElement *hPt_3_ByMuon = iBooker_.book1D(
+      "Pt_3_ByMuon", "Turn on as a Function of P_{t}, |Eta|>2.1, By Muon", pt_bins, pt_floor, pt_ceiling);
+  MonitorElement *hEta_3_ByMuon = iBooker_.book1D(
+      "Eta_3_ByMuon", "Efficiency as a Function of Eta, P_{t}>20, By Muon", eta_bins, eta_floor, eta_ceiling);
+
+  for (int i = 1; i <= hPt_1_ByEvent->getNbinsX(); ++i) {
     double n1 = (double)iGetter_.get(subDir_ + byEventDir + "/LeadAssocRecoMuonPt_1_ByEvent")->getBinContent(i);
     double n2 = (double)iGetter_.get(subDir_ + byEventDir + "/LeadRecoMuonPt_1_ByEvent")->getBinContent(i);
-    double value = (n2!=0 ? n1/n2 : 0);
-    double error = (n2!=0 ? sqrt(value*(1-value)/n2) : 0);
-    hPt_1_ByEvent->setBinContent(i,value);
-    hPt_1_ByEvent->setBinError(i,error);
+    double value = (n2 != 0 ? n1 / n2 : 0);
+    double error = (n2 != 0 ? sqrt(value * (1 - value) / n2) : 0);
+    hPt_1_ByEvent->setBinContent(i, value);
+    hPt_1_ByEvent->setBinError(i, error);
 
     n1 = (double)iGetter_.get(subDir_ + byEventDir + "/LeadAssocRecoMuonPt_2_ByEvent")->getBinContent(i);
     n2 = (double)iGetter_.get(subDir_ + byEventDir + "/LeadRecoMuonPt_2_ByEvent")->getBinContent(i);
-    value = (n2!=0 ? n1/n2 : 0);
-    error = (n2!=0 ? sqrt(value*(1-value)/n2) : 0);
-    hPt_2_ByEvent->setBinContent(i,value);
-    hPt_2_ByEvent->setBinError(i,error);
+    value = (n2 != 0 ? n1 / n2 : 0);
+    error = (n2 != 0 ? sqrt(value * (1 - value) / n2) : 0);
+    hPt_2_ByEvent->setBinContent(i, value);
+    hPt_2_ByEvent->setBinError(i, error);
 
     n1 = (double)iGetter_.get(subDir_ + byEventDir + "/LeadAssocRecoMuonPt_3_ByEvent")->getBinContent(i);
     n2 = (double)iGetter_.get(subDir_ + byEventDir + "/LeadRecoMuonPt_3_ByEvent")->getBinContent(i);
-    value = (n2!=0 ? n1/n2 : 0);
-    error = (n2!=0 ? sqrt(value*(1-value)/n2) : 0);
-    hPt_3_ByEvent->setBinContent(i,value);
-    hPt_3_ByEvent->setBinError(i,error);
+    value = (n2 != 0 ? n1 / n2 : 0);
+    error = (n2 != 0 ? sqrt(value * (1 - value) / n2) : 0);
+    hPt_3_ByEvent->setBinContent(i, value);
+    hPt_3_ByEvent->setBinError(i, error);
 
     n1 = (double)iGetter_.get(subDir_ + byMuonDir + "/AssocRecoMuonPt_1_ByMuon")->getBinContent(i);
     n2 = (double)iGetter_.get(subDir_ + byMuonDir + "/RecoMuonPt_1_ByMuon")->getBinContent(i);
-    value = (n2!=0 ? n1/n2 : 0);
-    error = (n2!=0 ? sqrt(value*(1-value)/n2) : 0);
-    hPt_1_ByMuon->setBinContent(i,value);
-    hPt_1_ByMuon->setBinError(i,error);
+    value = (n2 != 0 ? n1 / n2 : 0);
+    error = (n2 != 0 ? sqrt(value * (1 - value) / n2) : 0);
+    hPt_1_ByMuon->setBinContent(i, value);
+    hPt_1_ByMuon->setBinError(i, error);
 
     n1 = (double)iGetter_.get(subDir_ + byMuonDir + "/AssocRecoMuonPt_2_ByMuon")->getBinContent(i);
     n2 = (double)iGetter_.get(subDir_ + byMuonDir + "/RecoMuonPt_2_ByMuon")->getBinContent(i);
-    value = (n2!=0 ? n1/n2 : 0);
-    error = (n2!=0 ? sqrt(value*(1-value)/n2) : 0);
-    hPt_2_ByMuon->setBinContent(i,value);
-    hPt_2_ByMuon->setBinError(i,error);
+    value = (n2 != 0 ? n1 / n2 : 0);
+    error = (n2 != 0 ? sqrt(value * (1 - value) / n2) : 0);
+    hPt_2_ByMuon->setBinContent(i, value);
+    hPt_2_ByMuon->setBinError(i, error);
 
     n1 = (double)iGetter_.get(subDir_ + byMuonDir + "/AssocRecoMuonPt_3_ByMuon")->getBinContent(i);
     n2 = (double)iGetter_.get(subDir_ + byMuonDir + "/RecoMuonPt_3_ByMuon")->getBinContent(i);
-    value = (n2!=0 ? n1/n2 : 0);
-    error = (n2!=0 ? sqrt(value*(1-value)/n2) : 0);
-    hPt_3_ByMuon->setBinContent(i,value);
-    hPt_3_ByMuon->setBinError(i,error);
+    value = (n2 != 0 ? n1 / n2 : 0);
+    error = (n2 != 0 ? sqrt(value * (1 - value) / n2) : 0);
+    hPt_3_ByMuon->setBinContent(i, value);
+    hPt_3_ByMuon->setBinError(i, error);
   }
 
-  for(int i=1; i<=hEta_1_ByEvent->getNbinsX(); ++i) {
+  for (int i = 1; i <= hEta_1_ByEvent->getNbinsX(); ++i) {
     double n1 = (double)iGetter_.get(subDir_ + byEventDir + "/LeadAssocRecoMuonEta_1_ByEvent")->getBinContent(i);
     double n2 = (double)iGetter_.get(subDir_ + byEventDir + "/LeadRecoMuonEta_1_ByEvent")->getBinContent(i);
-    double value = (n2!=0 ? n1/n2 : 0);
-    double error = (n2!=0 ? sqrt(value*(1-value)/n2) : 0);
-    hEta_1_ByEvent->setBinContent(i,value);
-    hEta_1_ByEvent->setBinError(i,error);
+    double value = (n2 != 0 ? n1 / n2 : 0);
+    double error = (n2 != 0 ? sqrt(value * (1 - value) / n2) : 0);
+    hEta_1_ByEvent->setBinContent(i, value);
+    hEta_1_ByEvent->setBinError(i, error);
 
     n1 = (double)iGetter_.get(subDir_ + byEventDir + "/LeadAssocRecoMuonEta_2_ByEvent")->getBinContent(i);
     n2 = (double)iGetter_.get(subDir_ + byEventDir + "/LeadRecoMuonEta_2_ByEvent")->getBinContent(i);
-    value = (n2!=0 ? n1/n2 : 0);
-    error = (n2!=0 ? sqrt(value*(1-value)/n2) : 0);
-    hEta_2_ByEvent->setBinContent(i,value);
-    hEta_2_ByEvent->setBinError(i,error);
+    value = (n2 != 0 ? n1 / n2 : 0);
+    error = (n2 != 0 ? sqrt(value * (1 - value) / n2) : 0);
+    hEta_2_ByEvent->setBinContent(i, value);
+    hEta_2_ByEvent->setBinError(i, error);
 
     n1 = (double)iGetter_.get(subDir_ + byEventDir + "/LeadAssocRecoMuonEta_3_ByEvent")->getBinContent(i);
     n2 = (double)iGetter_.get(subDir_ + byEventDir + "/LeadRecoMuonEta_3_ByEvent")->getBinContent(i);
-    value = (n2!=0 ? n1/n2 : 0);
-    error = (n2!=0 ? sqrt(value*(1-value)/n2) : 0);
-    hEta_3_ByEvent->setBinContent(i,value);
-    hEta_3_ByEvent->setBinError(i,error);
+    value = (n2 != 0 ? n1 / n2 : 0);
+    error = (n2 != 0 ? sqrt(value * (1 - value) / n2) : 0);
+    hEta_3_ByEvent->setBinContent(i, value);
+    hEta_3_ByEvent->setBinError(i, error);
 
     n1 = (double)iGetter_.get(subDir_ + byMuonDir + "/AssocRecoMuonEta_1_ByMuon")->getBinContent(i);
     n2 = (double)iGetter_.get(subDir_ + byMuonDir + "/RecoMuonEta_1_ByMuon")->getBinContent(i);
-    value = (n2!=0 ? n1/n2 : 0);
-    error = (n2!=0 ? sqrt(value*(1-value)/n2) : 0);
-    hEta_1_ByMuon->setBinContent(i,value);
-    hEta_1_ByMuon->setBinError(i,error);
+    value = (n2 != 0 ? n1 / n2 : 0);
+    error = (n2 != 0 ? sqrt(value * (1 - value) / n2) : 0);
+    hEta_1_ByMuon->setBinContent(i, value);
+    hEta_1_ByMuon->setBinError(i, error);
 
     n1 = (double)iGetter_.get(subDir_ + byMuonDir + "/AssocRecoMuonEta_2_ByMuon")->getBinContent(i);
     n2 = (double)iGetter_.get(subDir_ + byMuonDir + "/RecoMuonEta_2_ByMuon")->getBinContent(i);
-    value = (n2!=0 ? n1/n2 : 0);
-    error = (n2!=0 ? sqrt(value*(1-value)/n2) : 0);
-    hEta_2_ByMuon->setBinContent(i,value);
-    hEta_2_ByMuon->setBinError(i,error);
+    value = (n2 != 0 ? n1 / n2 : 0);
+    error = (n2 != 0 ? sqrt(value * (1 - value) / n2) : 0);
+    hEta_2_ByMuon->setBinContent(i, value);
+    hEta_2_ByMuon->setBinError(i, error);
 
     n1 = (double)iGetter_.get(subDir_ + byMuonDir + "/AssocRecoMuonEta_3_ByMuon")->getBinContent(i);
     n2 = (double)iGetter_.get(subDir_ + byMuonDir + "/RecoMuonEta_3_ByMuon")->getBinContent(i);
-    value = (n2!=0 ? n1/n2 : 0);
-    error = (n2!=0 ? sqrt(value*(1-value)/n2) : 0);
-    hEta_3_ByMuon->setBinContent(i,value);
-    hEta_3_ByMuon->setBinError(i,error);
+    value = (n2 != 0 ? n1 / n2 : 0);
+    error = (n2 != 0 ? sqrt(value * (1 - value) / n2) : 0);
+    hEta_3_ByMuon->setBinContent(i, value);
+    hEta_3_ByMuon->setBinError(i, error);
   }
 }
 
-MonitorElement* HltSusyExoPostProcessor::bookEffMEProfileFromTH1(TH1F* histo, std::string name, DQMStore::IBooker& iBooker_) {
-  MonitorElement* myEffME;
-  if(name == "Eff") {
-    myEffME = iBooker_.bookProfile((std::string) ("Eff_"+((std::string) histo->GetName())), ((std::string) histo->GetTitle()), histo->GetXaxis()->GetNbins(), histo->GetXaxis()->GetXmin(), histo->GetXaxis()->GetXmax(), 100, 0, 1, "");
-  }
-  else {
-    myEffME = iBooker_.bookProfile(name, new TProfile(name.c_str(), histo->GetTitle(), histo->GetXaxis()->GetNbins(), histo->GetXaxis()->GetXmin(), histo->GetXaxis()->GetXmax()));
+MonitorElement *HltSusyExoPostProcessor::bookEffMEProfileFromTH1(TH1F *histo,
+                                                                 std::string name,
+                                                                 DQMStore::IBooker &iBooker_) {
+  MonitorElement *myEffME;
+  if (name == "Eff") {
+    myEffME = iBooker_.bookProfile((std::string)("Eff_" + ((std::string)histo->GetName())),
+                                   ((std::string)histo->GetTitle()),
+                                   histo->GetXaxis()->GetNbins(),
+                                   histo->GetXaxis()->GetXmin(),
+                                   histo->GetXaxis()->GetXmax(),
+                                   100,
+                                   0,
+                                   1,
+                                   "");
+  } else {
+    myEffME = iBooker_.bookProfile(name,
+                                   new TProfile(name.c_str(),
+                                                histo->GetTitle(),
+                                                histo->GetXaxis()->GetNbins(),
+                                                histo->GetXaxis()->GetXmin(),
+                                                histo->GetXaxis()->GetXmax()));
   }
-  for(int i=0; i<histo->GetXaxis()->GetNbins(); i++) {
-    myEffME->setBinLabel(i+1, histo->GetXaxis()->GetBinLabel(i+1),1);
+  for (int i = 0; i < histo->GetXaxis()->GetNbins(); i++) {
+    myEffME->setBinLabel(i + 1, histo->GetXaxis()->GetBinLabel(i + 1), 1);
   }
   return myEffME;
 }
diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DiJet_MET.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DiJet_MET.cc
index 73a0f7bc26818..46a3abd1d1025 100644
--- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DiJet_MET.cc
+++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DiJet_MET.cc
@@ -1,14 +1,12 @@
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "DataFormats/Math/interface/deltaPhi.h"
+#include "FWCore/Common/interface/TriggerNames.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Common/interface/TriggerNames.h"
-#include "DataFormats/Math/interface/deltaPhi.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DiJet_MET.h"
 
-
-SUSY_HLT_DiJet_MET::SUSY_HLT_DiJet_MET(const edm::ParameterSet& ps)
-{
+SUSY_HLT_DiJet_MET::SUSY_HLT_DiJet_MET(const edm::ParameterSet &ps) {
   edm::LogInfo("SUSY_HLT_DiJet_MET") << "Constructor SUSY_HLT_DiJet_MET::SUSY_HLT_DiJet_MET " << std::endl;
   // Get parameters from configuration file
   theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
@@ -29,16 +27,13 @@ SUSY_HLT_DiJet_MET::SUSY_HLT_DiJet_MET(const edm::ParameterSet& ps)
   metCut_ = ps.getUntrackedParameter<double>("OfflineMetCut");
 }
 
-SUSY_HLT_DiJet_MET::~SUSY_HLT_DiJet_MET()
-{
-   edm::LogInfo("SUSY_HLT_DiJet_MET") << "Destructor SUSY_HLT_DiJet_MET::~SUSY_HLT_DiJet_MET " << std::endl;
+SUSY_HLT_DiJet_MET::~SUSY_HLT_DiJet_MET() {
+  edm::LogInfo("SUSY_HLT_DiJet_MET") << "Destructor SUSY_HLT_DiJet_MET::~SUSY_HLT_DiJet_MET " << std::endl;
 }
 
-void SUSY_HLT_DiJet_MET::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e)
-{
- 
+void SUSY_HLT_DiJet_MET::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e) {
   bool changed;
-  
+
   if (!fHltConfig.init(run, e, HLTProcess_, changed)) {
     edm::LogError("SUSY_HLT_DiJet_MET") << "Initialization of HLTConfigProvider failed!!";
     return;
@@ -46,215 +41,217 @@ void SUSY_HLT_DiJet_MET::dqmBeginRun(edm::Run const &run, edm::EventSetup const
 
   bool pathFound = false;
   const std::vector<std::string> allTrigNames = fHltConfig.triggerNames();
-  for(size_t j = 0; j <allTrigNames.size(); ++j) {
-    if(allTrigNames[j].find(triggerPath_) != std::string::npos) {
+  for (size_t j = 0; j < allTrigNames.size(); ++j) {
+    if (allTrigNames[j].find(triggerPath_) != std::string::npos) {
       pathFound = true;
     }
   }
 
-  if(!pathFound) {
-    LogDebug("SUSY_HLT_DiJet_MET") << "Path not found" << "\n";
+  if (!pathFound) {
+    LogDebug("SUSY_HLT_DiJet_MET") << "Path not found"
+                                   << "\n";
     return;
   }
 
   edm::LogInfo("SUSY_HLT_DiJet_MET") << "SUSY_HLT_DiJet_MET::beginRun" << std::endl;
 }
 
- void SUSY_HLT_DiJet_MET::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run const &, edm::EventSetup const &)
-{
+void SUSY_HLT_DiJet_MET::bookHistograms(DQMStore::IBooker &ibooker_, edm::Run const &, edm::EventSetup const &) {
   edm::LogInfo("SUSY_HLT_DiJet_MET") << "SUSY_HLT_DiJet_MET::bookHistograms" << std::endl;
-  //book at beginRun
+  // book at beginRun
   bookHistos(ibooker_);
 }
 
-
-
-
-void SUSY_HLT_DiJet_MET::analyze(edm::Event const& e, edm::EventSetup const& eSetup){
+void SUSY_HLT_DiJet_MET::analyze(edm::Event const &e, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_DiJet_MET") << "SUSY_HLT_DiJet_MET::analyze" << std::endl;
 
-
   //-------------------------------
   //--- MET
   //-------------------------------
   edm::Handle<reco::PFMETCollection> pfMETCollection;
   e.getByToken(thePfMETCollection_, pfMETCollection);
-  if ( !pfMETCollection.isValid() ){
-    edm::LogError ("SUSY_HLT_DiJet_MET") << "invalid collection: PFMET" << "\n";
-   return;
+  if (!pfMETCollection.isValid()) {
+    edm::LogError("SUSY_HLT_DiJet_MET") << "invalid collection: PFMET"
+                                        << "\n";
+    return;
   }
   edm::Handle<reco::CaloMETCollection> caloMETCollection;
   e.getByToken(theCaloMETCollection_, caloMETCollection);
-  if ( !caloMETCollection.isValid() ){
-    edm::LogError ("SUSY_HLT_DiJet_MET") << "invalid collection: CaloMET" << "\n";
+  if (!caloMETCollection.isValid()) {
+    edm::LogError("SUSY_HLT_DiJet_MET") << "invalid collection: CaloMET"
+                                        << "\n";
     return;
   }
   //-------------------------------
   //--- Jets
   //-------------------------------
   edm::Handle<reco::PFJetCollection> pfJetCollection;
-  e.getByToken (thePfJetCollection_,pfJetCollection);
-  if ( !pfJetCollection.isValid() ){
-    edm::LogError ("SUSY_HLT_DiJet_MET") << "invalid collection: PFJets" << "\n";
+  e.getByToken(thePfJetCollection_, pfJetCollection);
+  if (!pfJetCollection.isValid()) {
+    edm::LogError("SUSY_HLT_DiJet_MET") << "invalid collection: PFJets"
+                                        << "\n";
     return;
   }
   edm::Handle<reco::CaloJetCollection> caloJetCollection;
-  e.getByToken (theCaloJetCollection_,caloJetCollection);
-  if ( !caloJetCollection.isValid() ){
-  edm::LogError ("SUSY_HLT_DiJet_MET") << "invalid collection: CaloJets" << "\n";
-  return;
+  e.getByToken(theCaloJetCollection_, caloJetCollection);
+  if (!caloJetCollection.isValid()) {
+    edm::LogError("SUSY_HLT_DiJet_MET") << "invalid collection: CaloJets"
+                                        << "\n";
+    return;
   }
-  
+
   //-------------------------------
   //--- Trigger
   //-------------------------------
   edm::Handle<edm::TriggerResults> hltresults;
-  e.getByToken(triggerResults_,hltresults);
-  if(!hltresults.isValid()){
-    edm::LogError ("SUSY_HLT_DiJet_MET") << "invalid collection: TriggerResults" << "\n";
+  e.getByToken(triggerResults_, hltresults);
+  if (!hltresults.isValid()) {
+    edm::LogError("SUSY_HLT_DiJet_MET") << "invalid collection: TriggerResults"
+                                        << "\n";
     return;
   }
   edm::Handle<trigger::TriggerEvent> triggerSummary;
   e.getByToken(theTrigSummary_, triggerSummary);
-  if(!triggerSummary.isValid()) {
-    edm::LogError ("SUSY_HLT_DiJet_MET") << "invalid collection: TriggerSummary" << "\n";
+  if (!triggerSummary.isValid()) {
+    edm::LogError("SUSY_HLT_DiJet_MET") << "invalid collection: TriggerSummary"
+                                        << "\n";
     return;
   }
 
+  // get online objects
 
-  //get online objects
-
-  size_t filterIndex = triggerSummary->filterIndex( triggerFilter_ );
-  size_t jetFilterIndex = triggerSummary->filterIndex( triggerJetFilter_ );
+  size_t filterIndex = triggerSummary->filterIndex(triggerFilter_);
+  size_t jetFilterIndex = triggerSummary->filterIndex(triggerJetFilter_);
   trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
 
-  if( !(filterIndex >= triggerSummary->sizeFilters()) ){
-    const trigger::Keys& keys = triggerSummary->filterKeys( filterIndex );
-    for( size_t j = 0; j < keys.size(); ++j ){
+  if (!(filterIndex >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndex);
+    for (size_t j = 0; j < keys.size(); ++j) {
       trigger::TriggerObject foundObject = triggerObjects[keys[j]];
       h_triggerMet->Fill(foundObject.pt());
       h_triggerMetPhi->Fill(foundObject.phi());
     }
   }
 
-  std::vector<float> ptJet,  etaJet, phiJet;
-  if( !(jetFilterIndex >= triggerSummary->sizeFilters()) ){
-    const trigger::Keys& keys_jetfilter = triggerSummary->filterKeys( jetFilterIndex );
-    for( size_t j = 0; j < keys_jetfilter.size(); ++j ){
+  std::vector<float> ptJet, etaJet, phiJet;
+  if (!(jetFilterIndex >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys_jetfilter = triggerSummary->filterKeys(jetFilterIndex);
+    for (size_t j = 0; j < keys_jetfilter.size(); ++j) {
       trigger::TriggerObject foundObject = triggerObjects[keys_jetfilter[j]];
       h_triggerJetPt->Fill(foundObject.pt());
       h_triggerJetEta->Fill(foundObject.eta());
       h_triggerJetPhi->Fill(foundObject.phi());
-      if(foundObject.pt() > ptThrJetTrig_ && fabs(foundObject.eta()) < etaThrJetTrig_) {
-	ptJet.push_back(foundObject.pt());
-	etaJet.push_back(foundObject.eta());
-	phiJet.push_back(foundObject.phi());
+      if (foundObject.pt() > ptThrJetTrig_ && fabs(foundObject.eta()) < etaThrJetTrig_) {
+        ptJet.push_back(foundObject.pt());
+        etaJet.push_back(foundObject.eta());
+        phiJet.push_back(foundObject.phi());
       }
     }
   }
 
-
   bool hasFired = false;
   bool hasFiredAuxiliaryForHadronicLeg = false;
-  const edm::TriggerNames& trigNames = e.triggerNames(*hltresults);
+  const edm::TriggerNames &trigNames = e.triggerNames(*hltresults);
   unsigned int numTriggers = trigNames.size();
-  for( unsigned int hltIndex=0; hltIndex<numTriggers; ++hltIndex ){
-    if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFired = true;
-    if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForHadronic_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFiredAuxiliaryForHadronicLeg = true;
+  for (unsigned int hltIndex = 0; hltIndex < numTriggers; ++hltIndex) {
+    if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) &&
+        hltresults->accept(hltIndex))
+      hasFired = true;
+    if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForHadronic_) != std::string::npos &&
+        hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex))
+      hasFiredAuxiliaryForHadronicLeg = true;
   }
 
-
-
-  if(hasFiredAuxiliaryForHadronicLeg) {
-  
+  if (hasFiredAuxiliaryForHadronicLeg) {
     int offlineJetCounter = 0;
     int offlineCentralJets = 0;
     int nMatch = 0, jet1Index = -1, jet2Index = -1;
 
-    for (reco::PFJetCollection::const_iterator i_pfjet = pfJetCollection->begin(); i_pfjet != pfJetCollection->end(); ++i_pfjet){
-
+    for (reco::PFJetCollection::const_iterator i_pfjet = pfJetCollection->begin(); i_pfjet != pfJetCollection->end();
+         ++i_pfjet) {
       if (i_pfjet->pt() > ptThrJet_ && fabs(i_pfjet->eta()) < etaThrJet_) {
-	offlineCentralJets++;
-	if(offlineCentralJets == 2 && pfMETCollection->begin()->et()>metCut_) h_pfJet2PtTurnOn_den->Fill(i_pfjet->pt());
-
-	for(unsigned int itrigjet = 0; itrigjet < ptJet.size(); ++itrigjet) {
-	  if(itrigjet < 2 && (sqrt((i_pfjet->phi()-phiJet.at(itrigjet))*(i_pfjet->phi()-phiJet.at(itrigjet)) + (i_pfjet->eta()-etaJet.at(itrigjet))*(i_pfjet->eta()-etaJet.at(itrigjet))) < 0.4)) {
-	    nMatch++;
-	    if(nMatch == 1) jet1Index = offlineJetCounter;
-	    if(nMatch == 2) jet2Index = offlineJetCounter;
-
-	    if(hasFired) {
-	      h_pfJetPt->Fill(i_pfjet->pt());
-	      h_pfJetEta->Fill(i_pfjet->eta());
-	      h_pfJetPhi->Fill(i_pfjet->phi());
-	      if(offlineCentralJets == 2 && pfMETCollection->begin()->et()>metCut_) h_pfJet2PtTurnOn_num->Fill(i_pfjet->pt());
-	    }
-
-	    break;
-	  }
-	}
+        offlineCentralJets++;
+        if (offlineCentralJets == 2 && pfMETCollection->begin()->et() > metCut_)
+          h_pfJet2PtTurnOn_den->Fill(i_pfjet->pt());
+
+        for (unsigned int itrigjet = 0; itrigjet < ptJet.size(); ++itrigjet) {
+          if (itrigjet < 2 &&
+              (sqrt((i_pfjet->phi() - phiJet.at(itrigjet)) * (i_pfjet->phi() - phiJet.at(itrigjet)) +
+                    (i_pfjet->eta() - etaJet.at(itrigjet)) * (i_pfjet->eta() - etaJet.at(itrigjet))) < 0.4)) {
+            nMatch++;
+            if (nMatch == 1)
+              jet1Index = offlineJetCounter;
+            if (nMatch == 2)
+              jet2Index = offlineJetCounter;
+
+            if (hasFired) {
+              h_pfJetPt->Fill(i_pfjet->pt());
+              h_pfJetEta->Fill(i_pfjet->eta());
+              h_pfJetPhi->Fill(i_pfjet->phi());
+              if (offlineCentralJets == 2 && pfMETCollection->begin()->et() > metCut_)
+                h_pfJet2PtTurnOn_num->Fill(i_pfjet->pt());
+            }
+
+            break;
+          }
+        }
       }
 
       offlineJetCounter++;
     }
 
-    if(hasFired) {
+    if (hasFired) {
       h_pfMetTurnOn_num->Fill(pfMETCollection->begin()->et());
       h_pfMetPhi->Fill(pfMETCollection->begin()->phi());
       h_caloMetvsPFMet->Fill(pfMETCollection->begin()->et(), caloMETCollection->begin()->et());
 
-      if(jet1Index > -1 && jet2Index > -1) {
-	h_pfJet1Jet2DPhi->Fill(fabs(reco::deltaPhi(pfJetCollection->at(jet1Index).phi(), pfJetCollection->at(jet2Index).phi())));
+      if (jet1Index > -1 && jet2Index > -1) {
+        h_pfJet1Jet2DPhi->Fill(
+            fabs(reco::deltaPhi(pfJetCollection->at(jet1Index).phi(), pfJetCollection->at(jet2Index).phi())));
       }
+    }
 
-    } 
-
-    h_pfMetTurnOn_den-> Fill(pfMETCollection->begin()->et());
-
+    h_pfMetTurnOn_den->Fill(pfMETCollection->begin()->et());
   }
 
   ptJet.clear();
   etaJet.clear();
   phiJet.clear();
-
 }
 
-
-
-
-void SUSY_HLT_DiJet_MET::endRun(edm::Run const& run, edm::EventSetup const& eSetup)
-{
+void SUSY_HLT_DiJet_MET::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_DiJet_MET") << "SUSY_HLT_DiJet_MET::endRun" << std::endl;
 }
 
-void SUSY_HLT_DiJet_MET::bookHistos(DQMStore::IBooker & ibooker_)
-{
+void SUSY_HLT_DiJet_MET::bookHistos(DQMStore::IBooker &ibooker_) {
   ibooker_.cd();
   ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
 
-  //offline quantities
+  // offline quantities
   h_pfMetPhi = ibooker_.book1D("pfMetPhi", "PF MET Phi", 20, -3.5, 3.5);
   h_pfJetPt = ibooker_.book1D("pfJetPt", "PF Jet p_{T} (trigger-matched jets, |#eta| < 2.4); GeV", 20, 0.0, 500.0);
   h_pfJetEta = ibooker_.book1D("pfJetEta", "PF Jet #eta (trigger-matched jets, |#eta| < 2.4)", 20, -3.0, 3.0);
   h_pfJetPhi = ibooker_.book1D("pfJetPhi", "PF Jet #phi (trigger-matched jets, |#eta| < 2.4)", 20, -3.5, 3.5);
-  h_pfJet1Jet2DPhi = ibooker_.book1D("pfJet1Jet2DPhi", "|#Delta#phi| between two leading trigger-matched jets", 20, 0.0, 3.5);
+  h_pfJet1Jet2DPhi =
+      ibooker_.book1D("pfJet1Jet2DPhi", "|#Delta#phi| between two leading trigger-matched jets", 20, 0.0, 3.5);
   h_caloMetvsPFMet = ibooker_.book2D("caloMetvsPFMet", "Calo MET vs PF MET; GeV; GeV", 25, 0.0, 500.0, 25, 0.0, 500.0);
 
-  //online quantities 
+  // online quantities
   h_triggerMet = ibooker_.book1D("triggerMet", "Trigger MET; GeV", 20, 0.0, 500.0);
   h_triggerMetPhi = ibooker_.book1D("triggerMetPhi", "Trigger MET Phi", 20, -3.5, 3.5);
   h_triggerJetPt = ibooker_.book1D("triggerJetPt", "Trigger Jet p_{T}; GeV", 20, 0.0, 500.0);
   h_triggerJetEta = ibooker_.book1D("triggerJetEta", "Trigger Jet Eta", 20, -3.0, 3.0);
   h_triggerJetPhi = ibooker_.book1D("triggerJetPhi", "Trigger Jet Phi", 20, -3.5, 3.5);
 
-  //num and den hists to be divided in harvesting step to make turn on curves
-  h_pfMetTurnOn_num = ibooker_.book1D("pfMetTurnOn_num", "PF MET", 20, 0.0, 500.0 );
-  h_pfMetTurnOn_den = ibooker_.book1D("pfMetTurnOn_den", "PF MET Turn On Denominator", 20, 0.0, 500.0 );
-  h_pfJet2PtTurnOn_num = ibooker_.book1D("pfJet2PtTurnOn_num", "PF Jet2 Pt (NCentralPFJets >= 2, PFMET > 250)", 20, 0.0, 500.0 );
-  h_pfJet2PtTurnOn_den = ibooker_.book1D("pfJet2PtTurnOn_den", "PF Jet2 Pt Turn On Denominator", 20, 0.0, 500.0 );
+  // num and den hists to be divided in harvesting step to make turn on curves
+  h_pfMetTurnOn_num = ibooker_.book1D("pfMetTurnOn_num", "PF MET", 20, 0.0, 500.0);
+  h_pfMetTurnOn_den = ibooker_.book1D("pfMetTurnOn_den", "PF MET Turn On Denominator", 20, 0.0, 500.0);
+  h_pfJet2PtTurnOn_num =
+      ibooker_.book1D("pfJet2PtTurnOn_num", "PF Jet2 Pt (NCentralPFJets >= 2, PFMET > 250)", 20, 0.0, 500.0);
+  h_pfJet2PtTurnOn_den = ibooker_.book1D("pfJet2PtTurnOn_den", "PF Jet2 Pt Turn On Denominator", 20, 0.0, 500.0);
 
   ibooker_.cd();
 }
 
- //define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SUSY_HLT_DiJet_MET);
diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleEle_Hadronic.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleEle_Hadronic.cc
index c09e8a20125e1..386137b71302e 100644
--- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleEle_Hadronic.cc
+++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleEle_Hadronic.cc
@@ -1,247 +1,259 @@
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Common/interface/TriggerNames.h"
 #include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
+#include "FWCore/Common/interface/TriggerNames.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleEle_Hadronic.h"
 
-SUSY_HLT_DoubleEle_Hadronic::SUSY_HLT_DoubleEle_Hadronic(const edm::ParameterSet& ps)
-{
-    edm::LogInfo("SUSY_HLT_DoubleEle_Hadronic") << "Constructor SUSY_HLT_DoubleEle_Hadronic::SUSY_HLT_DoubleEle_Hadronic " << std::endl;
-    // Get parameters from configuration file
-    theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
-    theElectronCollection_ = consumes<reco::GsfElectronCollection>(ps.getParameter<edm::InputTag>("ElectronCollection"));
-    thePfJetCollection_ = consumes<reco::PFJetCollection>(ps.getParameter<edm::InputTag>("pfJetCollection"));
-    theCaloJetCollection_ = consumes<reco::CaloJetCollection>(ps.getParameter<edm::InputTag>("caloJetCollection"));
-    triggerResults_ = consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>("TriggerResults"));
-    HLTProcess_ = ps.getParameter<std::string>("HLTProcess");
-    triggerPath_ = ps.getParameter<std::string>("TriggerPath");
-    triggerPathAuxiliaryForElectron_ = ps.getParameter<std::string>("TriggerPathAuxiliaryForElectron");
-    triggerPathAuxiliaryForHadronic_ = ps.getParameter<std::string>("TriggerPathAuxiliaryForHadronic");
-    triggerFilter_ = ps.getParameter<edm::InputTag>("TriggerFilter");
-    ptThrJet_ = ps.getUntrackedParameter<double>("PtThrJet");
-    etaThrJet_ = ps.getUntrackedParameter<double>("EtaThrJet");
+SUSY_HLT_DoubleEle_Hadronic::SUSY_HLT_DoubleEle_Hadronic(const edm::ParameterSet &ps) {
+  edm::LogInfo("SUSY_HLT_DoubleEle_Hadronic")
+      << "Constructor SUSY_HLT_DoubleEle_Hadronic::SUSY_HLT_DoubleEle_Hadronic " << std::endl;
+  // Get parameters from configuration file
+  theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
+  theElectronCollection_ = consumes<reco::GsfElectronCollection>(ps.getParameter<edm::InputTag>("ElectronCollection"));
+  thePfJetCollection_ = consumes<reco::PFJetCollection>(ps.getParameter<edm::InputTag>("pfJetCollection"));
+  theCaloJetCollection_ = consumes<reco::CaloJetCollection>(ps.getParameter<edm::InputTag>("caloJetCollection"));
+  triggerResults_ = consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>("TriggerResults"));
+  HLTProcess_ = ps.getParameter<std::string>("HLTProcess");
+  triggerPath_ = ps.getParameter<std::string>("TriggerPath");
+  triggerPathAuxiliaryForElectron_ = ps.getParameter<std::string>("TriggerPathAuxiliaryForElectron");
+  triggerPathAuxiliaryForHadronic_ = ps.getParameter<std::string>("TriggerPathAuxiliaryForHadronic");
+  triggerFilter_ = ps.getParameter<edm::InputTag>("TriggerFilter");
+  ptThrJet_ = ps.getUntrackedParameter<double>("PtThrJet");
+  etaThrJet_ = ps.getUntrackedParameter<double>("EtaThrJet");
 }
 
-SUSY_HLT_DoubleEle_Hadronic::~SUSY_HLT_DoubleEle_Hadronic()
-{
-    edm::LogInfo("SUSY_HLT_DoubleEle_Hadronic") << "Destructor SUSY_HLT_DoubleEle_Hadronic::~SUSY_HLT_DoubleEle_Hadronic " << std::endl;
+SUSY_HLT_DoubleEle_Hadronic::~SUSY_HLT_DoubleEle_Hadronic() {
+  edm::LogInfo("SUSY_HLT_DoubleEle_Hadronic")
+      << "Destructor SUSY_HLT_DoubleEle_Hadronic::~SUSY_HLT_DoubleEle_Hadronic " << std::endl;
 }
 
-void SUSY_HLT_DoubleEle_Hadronic::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e)
-{
-    
-    bool changed;
-    
-    if (!fHltConfig.init(run, e, HLTProcess_, changed)) {
-        edm::LogError("SUSY_HLT_DoubleEle_Hadronic") << "Initialization of HLTConfigProvider failed!!";
-        return;
-    }
-    
-    bool pathFound = false;
-    const std::vector<std::string> allTrigNames = fHltConfig.triggerNames();
-    for(size_t j = 0; j <allTrigNames.size(); ++j) {
-        if(allTrigNames[j].find(triggerPath_) != std::string::npos) {
-            pathFound = true;
-        }
-    }
-    
-    if(!pathFound) {
-        LogDebug("SUSY_HLT_DoubleEle_Hadronic") << "Path not found" << "\n";
-        return;
+void SUSY_HLT_DoubleEle_Hadronic::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e) {
+  bool changed;
+
+  if (!fHltConfig.init(run, e, HLTProcess_, changed)) {
+    edm::LogError("SUSY_HLT_DoubleEle_Hadronic") << "Initialization of HLTConfigProvider failed!!";
+    return;
+  }
+
+  bool pathFound = false;
+  const std::vector<std::string> allTrigNames = fHltConfig.triggerNames();
+  for (size_t j = 0; j < allTrigNames.size(); ++j) {
+    if (allTrigNames[j].find(triggerPath_) != std::string::npos) {
+      pathFound = true;
     }
-    //std::vector<std::string> filtertags = fHltConfig.moduleLabels( triggerPath_ );
-    //triggerFilter_ = edm::InputTag(filtertags[filtertags.size()-1],"",fHltConfig.processName());
-    //triggerFilter_ = edm::InputTag("hltPFMET120Mu5L3PreFiltered", "", fHltConfig.processName());
-    
-    edm::LogInfo("SUSY_HLT_DoubleEle_Hadronic") << "SUSY_HLT_DoubleEle_Hadronic::beginRun" << std::endl;
+  }
+
+  if (!pathFound) {
+    LogDebug("SUSY_HLT_DoubleEle_Hadronic") << "Path not found"
+                                            << "\n";
+    return;
+  }
+  // std::vector<std::string> filtertags = fHltConfig.moduleLabels( triggerPath_
+  // ); triggerFilter_ =
+  // edm::InputTag(filtertags[filtertags.size()-1],"",fHltConfig.processName());
+  // triggerFilter_ = edm::InputTag("hltPFMET120Mu5L3PreFiltered", "",
+  // fHltConfig.processName());
+
+  edm::LogInfo("SUSY_HLT_DoubleEle_Hadronic") << "SUSY_HLT_DoubleEle_Hadronic::beginRun" << std::endl;
 }
 
-void SUSY_HLT_DoubleEle_Hadronic::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run const &, edm::EventSetup const &)
-{
-    edm::LogInfo("SUSY_HLT_DoubleEle_Hadronic") << "SUSY_HLT_DoubleEle_Hadronic::bookHistograms" << std::endl;
-    //book at beginRun
-    bookHistos(ibooker_);
+void SUSY_HLT_DoubleEle_Hadronic::bookHistograms(DQMStore::IBooker &ibooker_,
+                                                 edm::Run const &,
+                                                 edm::EventSetup const &) {
+  edm::LogInfo("SUSY_HLT_DoubleEle_Hadronic") << "SUSY_HLT_DoubleEle_Hadronic::bookHistograms" << std::endl;
+  // book at beginRun
+  bookHistos(ibooker_);
 }
 
+void SUSY_HLT_DoubleEle_Hadronic::analyze(edm::Event const &e, edm::EventSetup const &eSetup) {
+  edm::LogInfo("SUSY_HLT_DoubleEle_Hadronic") << "SUSY_HLT_DoubleEle_Hadronic::analyze" << std::endl;
 
+  //-------------------------------
+  //--- Jets
+  //-------------------------------
+  edm::Handle<reco::PFJetCollection> pfJetCollection;
+  e.getByToken(thePfJetCollection_, pfJetCollection);
+  if (!pfJetCollection.isValid()) {
+    edm::LogError("SUSY_HLT_DoubleEle_Hadronic") << "invalid collection: PFJets"
+                                                 << "\n";
+    return;
+  }
+  edm::Handle<reco::CaloJetCollection> caloJetCollection;
+  e.getByToken(theCaloJetCollection_, caloJetCollection);
+  if (!caloJetCollection.isValid()) {
+    edm::LogError("SUSY_HLT_DoubleEle_Hadronic") << "invalid collection: CaloJets"
+                                                 << "\n";
+    return;
+  }
 
+  //-------------------------------
+  //--- Electron
+  //-------------------------------
+  edm::Handle<reco::GsfElectronCollection> ElectronCollection;
+  e.getByToken(theElectronCollection_, ElectronCollection);
+  if (!ElectronCollection.isValid()) {
+    edm::LogError("SUSY_HLT_DoubleEle_Hadronic") << "invalid collection: Electrons "
+                                                 << "\n";
+    return;
+  }
 
-void SUSY_HLT_DoubleEle_Hadronic::analyze(edm::Event const& e, edm::EventSetup const& eSetup){
-    edm::LogInfo("SUSY_HLT_DoubleEle_Hadronic") << "SUSY_HLT_DoubleEle_Hadronic::analyze" << std::endl;
-    
-    //-------------------------------
-    //--- Jets
-    //-------------------------------
-    edm::Handle<reco::PFJetCollection> pfJetCollection;
-    e.getByToken (thePfJetCollection_,pfJetCollection);
-    if ( !pfJetCollection.isValid() ){
-        edm::LogError ("SUSY_HLT_DoubleEle_Hadronic") << "invalid collection: PFJets" << "\n";
-        return;
-    }
-    edm::Handle<reco::CaloJetCollection> caloJetCollection;
-    e.getByToken (theCaloJetCollection_,caloJetCollection);
-    if ( !caloJetCollection.isValid() ){
-        edm::LogError ("SUSY_HLT_DoubleEle_Hadronic") << "invalid collection: CaloJets" << "\n";
-        return;
+  //-------------------------------
+  //--- Trigger
+  //-------------------------------
+  edm::Handle<edm::TriggerResults> hltresults;
+  e.getByToken(triggerResults_, hltresults);
+  if (!hltresults.isValid()) {
+    edm::LogError("SUSY_HLT_DoubleEle_Hadronic") << "invalid collection: TriggerResults"
+                                                 << "\n";
+    return;
+  }
+  edm::Handle<trigger::TriggerEvent> triggerSummary;
+  e.getByToken(theTrigSummary_, triggerSummary);
+  if (!triggerSummary.isValid()) {
+    edm::LogError("SUSY_HLT_DoubleEle_Hadronic") << "invalid collection: TriggerSummary"
+                                                 << "\n";
+    return;
+  }
+
+  // get online objects
+  std::vector<float> ptElectron, etaElectron, phiElectron;
+  size_t filterIndex = triggerSummary->filterIndex(triggerFilter_);
+  trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
+  if (!(filterIndex >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndex);
+    for (size_t j = 0; j < keys.size(); ++j) {
+      trigger::TriggerObject foundObject = triggerObjects[keys[j]];
+      if (fabs(foundObject.id()) == 11) {  // It's an electron
+
+        bool same = false;
+        for (unsigned int x = 0; x < ptElectron.size(); x++) {
+          if (fabs(ptElectron[x] - foundObject.pt()) < 0.01 || fabs(etaElectron[x] - foundObject.eta()) < 0.001 ||
+              fabs(phiElectron[x] - foundObject.phi()) < 0.001)
+            same = true;
+        }
+
+        if (!same) {
+          h_triggerElePt->Fill(foundObject.pt());
+          h_triggerEleEta->Fill(foundObject.eta());
+          h_triggerElePhi->Fill(foundObject.phi());
+          ptElectron.push_back(foundObject.pt());
+          etaElectron.push_back(foundObject.eta());
+          phiElectron.push_back(foundObject.phi());
+        }
+      }
     }
-    
-    //-------------------------------
-    //--- Electron
-    //-------------------------------
-    edm::Handle<reco::GsfElectronCollection> ElectronCollection;
-    e.getByToken (theElectronCollection_, ElectronCollection);
-    if ( !ElectronCollection.isValid() ){
-        edm::LogError ("SUSY_HLT_DoubleEle_Hadronic") << "invalid collection: Electrons " << "\n";
-        return;
+    if (ptElectron.size() >= 2) {
+      math::PtEtaPhiMLorentzVectorD *ele1 =
+          new math::PtEtaPhiMLorentzVectorD(ptElectron[0], etaElectron[0], phiElectron[0], 0.0005);
+      math::PtEtaPhiMLorentzVectorD *ele2 =
+          new math::PtEtaPhiMLorentzVectorD(ptElectron[1], etaElectron[1], phiElectron[1], 0.0005);
+      (*ele1) += (*ele2);
+      h_triggerDoubleEleMass->Fill(ele1->M());
+      delete ele1;
+      delete ele2;
+    } else {
+      h_triggerDoubleEleMass->Fill(-1.);
     }
-    
-    
-    //-------------------------------
-    //--- Trigger
-    //-------------------------------
-    edm::Handle<edm::TriggerResults> hltresults;
-    e.getByToken(triggerResults_,hltresults);
-    if(!hltresults.isValid()){
-        edm::LogError ("SUSY_HLT_DoubleEle_Hadronic") << "invalid collection: TriggerResults" << "\n";
-        return;
+  }
+
+  bool hasFired = false;
+  bool hasFiredAuxiliaryForElectronLeg = false;
+  bool hasFiredAuxiliaryForHadronicLeg = false;
+  const edm::TriggerNames &trigNames = e.triggerNames(*hltresults);
+  unsigned int numTriggers = trigNames.size();
+  for (unsigned int hltIndex = 0; hltIndex < numTriggers; ++hltIndex) {
+    if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) &&
+        hltresults->accept(hltIndex))
+      hasFired = true;
+    if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForElectron_) != std::string::npos &&
+        hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex))
+      hasFiredAuxiliaryForElectronLeg = true;
+    if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForHadronic_) != std::string::npos &&
+        hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex))
+      hasFiredAuxiliaryForHadronicLeg = true;
+  }
+
+  if (hasFiredAuxiliaryForElectronLeg || hasFiredAuxiliaryForHadronicLeg) {
+    // Matching the Electron
+    int indexOfMatchedElectron[2] = {-1};
+    int matchedCounter = 0;
+    int offlineCounter = 0;
+    for (reco::GsfElectronCollection::const_iterator Electron = ElectronCollection->begin();
+         (Electron != ElectronCollection->end() && matchedCounter < 2);
+         ++Electron) {
+      for (size_t off_i = 0; off_i < ptElectron.size(); ++off_i) {
+        if (sqrt((Electron->phi() - phiElectron[off_i]) * (Electron->phi() - phiElectron[off_i]) +
+                 (Electron->eta() - etaElectron[off_i]) * (Electron->eta() - etaElectron[off_i])) < 0.5) {
+          indexOfMatchedElectron[matchedCounter] = offlineCounter;
+          matchedCounter++;
+          break;
+        }
+      }
+      offlineCounter++;
     }
-    edm::Handle<trigger::TriggerEvent> triggerSummary;
-    e.getByToken(theTrigSummary_, triggerSummary);
-    if(!triggerSummary.isValid()) {
-        edm::LogError ("SUSY_HLT_DoubleEle_Hadronic") << "invalid collection: TriggerSummary" << "\n";
-        return;
+
+    float caloHT = 0.0;
+    float pfHT = 0.0;
+    for (reco::PFJetCollection::const_iterator i_pfjet = pfJetCollection->begin(); i_pfjet != pfJetCollection->end();
+         ++i_pfjet) {
+      if (i_pfjet->pt() < ptThrJet_)
+        continue;
+      if (fabs(i_pfjet->eta()) > etaThrJet_)
+        continue;
+      pfHT += i_pfjet->pt();
     }
-    
-    
-    //get online objects
-    std::vector<float> ptElectron, etaElectron, phiElectron;
-    size_t filterIndex = triggerSummary->filterIndex( triggerFilter_ );
-    trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
-    if( !(filterIndex >= triggerSummary->sizeFilters()) ){
-        const trigger::Keys& keys = triggerSummary->filterKeys( filterIndex );
-        for( size_t j = 0; j < keys.size(); ++j ){
-            trigger::TriggerObject foundObject = triggerObjects[keys[j]];
-            if(fabs(foundObject.id()) == 11){ //It's an electron
-			
-				bool same= false;
-				for(unsigned int x=0;x<ptElectron.size();x++){
-					if(fabs(ptElectron[x] - foundObject.pt()) < 0.01 || fabs(etaElectron[x] - foundObject.eta()) < 0.001 || fabs(phiElectron[x] - foundObject.phi()) < 0.001)
-						same = true;
-				}
-				
-				if(!same){
-                	h_triggerElePt->Fill(foundObject.pt());
-                	h_triggerEleEta->Fill(foundObject.eta());
-                	h_triggerElePhi->Fill(foundObject.phi());
-                	ptElectron.push_back(foundObject.pt());
-                	etaElectron.push_back(foundObject.eta());
-                	phiElectron.push_back(foundObject.phi());
-				}
-            }
-        }
-        if (ptElectron.size()>=2) {
-            math::PtEtaPhiMLorentzVectorD* ele1 = new math::PtEtaPhiMLorentzVectorD(ptElectron[0],etaElectron[0],phiElectron[0],0.0005);
-            math::PtEtaPhiMLorentzVectorD* ele2 = new math::PtEtaPhiMLorentzVectorD(ptElectron[1],etaElectron[1],phiElectron[1],0.0005);
-            (*ele1)+=(*ele2);
-            h_triggerDoubleEleMass->Fill(ele1->M());
-            delete ele1;
-            delete ele2;
-        } else {
-            h_triggerDoubleEleMass->Fill(-1.);
-        }
+    for (reco::CaloJetCollection::const_iterator i_calojet = caloJetCollection->begin();
+         i_calojet != caloJetCollection->end();
+         ++i_calojet) {
+      if (i_calojet->pt() < ptThrJet_)
+        continue;
+      if (fabs(i_calojet->eta()) > etaThrJet_)
+        continue;
+      caloHT += i_calojet->pt();
     }
-    
-    
-    bool hasFired = false;
-    bool hasFiredAuxiliaryForElectronLeg = false;
-    bool hasFiredAuxiliaryForHadronicLeg = false;
-    const edm::TriggerNames& trigNames = e.triggerNames(*hltresults);
-    unsigned int numTriggers = trigNames.size();
-    for( unsigned int hltIndex=0; hltIndex<numTriggers; ++hltIndex ){
-        if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFired = true;
-        if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForElectron_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFiredAuxiliaryForElectronLeg = true;
-        if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForHadronic_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFiredAuxiliaryForHadronicLeg = true;
+
+    if (hasFiredAuxiliaryForElectronLeg && ElectronCollection->size() > 1) {
+      if (hasFired && indexOfMatchedElectron[1] >= 0) {  // fill trailing leg
+        h_EleTurnOn_num->Fill(ElectronCollection->at(indexOfMatchedElectron[1]).pt());
+      }
+      h_EleTurnOn_den->Fill(ElectronCollection->at(1).pt());
     }
-    
-    
-    
-    if(hasFiredAuxiliaryForElectronLeg || hasFiredAuxiliaryForHadronicLeg) {
-        
-        //Matching the Electron
-        int indexOfMatchedElectron[2] = {-1};
-        int matchedCounter = 0;
-        int offlineCounter = 0;
-        for(reco::GsfElectronCollection::const_iterator Electron = ElectronCollection->begin(); (Electron != ElectronCollection->end() && matchedCounter < 2) ; ++Electron) {
-            for(size_t off_i = 0; off_i < ptElectron.size(); ++off_i) {
-                if(sqrt((Electron->phi()-phiElectron[off_i])*(Electron->phi()-phiElectron[off_i]) + (Electron->eta()-etaElectron[off_i])*(Electron->eta()-etaElectron[off_i])) < 0.5) {
-                    indexOfMatchedElectron[matchedCounter] = offlineCounter;
-                    matchedCounter++;
-                    break;
-                }
-            }
-            offlineCounter++;
-        }
-        
-        float caloHT = 0.0;
-        float pfHT = 0.0;
-        for (reco::PFJetCollection::const_iterator i_pfjet = pfJetCollection->begin(); i_pfjet != pfJetCollection->end(); ++i_pfjet){
-            if (i_pfjet->pt() < ptThrJet_) continue;
-            if (fabs(i_pfjet->eta()) > etaThrJet_) continue;
-            pfHT += i_pfjet->pt();
-        }
-        for (reco::CaloJetCollection::const_iterator i_calojet = caloJetCollection->begin(); i_calojet != caloJetCollection->end(); ++i_calojet){
-            if (i_calojet->pt() < ptThrJet_) continue;
-            if (fabs(i_calojet->eta()) > etaThrJet_) continue;
-            caloHT += i_calojet->pt();
-        }
-        
-        if(hasFiredAuxiliaryForElectronLeg && ElectronCollection->size()>1) {
-            if(hasFired && indexOfMatchedElectron[1] >= 0) { //fill trailing leg
-                h_EleTurnOn_num-> Fill(ElectronCollection->at(indexOfMatchedElectron[1]).pt());
-            }
-            h_EleTurnOn_den-> Fill(ElectronCollection->at(1).pt());
-        }
-        if(hasFiredAuxiliaryForHadronicLeg) {
-            if(hasFired) {
-                h_pfHTTurnOn_num-> Fill(pfHT);
-            }
-            h_pfHTTurnOn_den-> Fill(pfHT);
-        }
+    if (hasFiredAuxiliaryForHadronicLeg) {
+      if (hasFired) {
+        h_pfHTTurnOn_num->Fill(pfHT);
+      }
+      h_pfHTTurnOn_den->Fill(pfHT);
     }
+  }
 }
 
+void SUSY_HLT_DoubleEle_Hadronic::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
+  edm::LogInfo("SUSY_HLT_DoubleEle_Hadronic") << "SUSY_HLT_DoubleEle_Hadronic::endRun" << std::endl;
+}
 
+void SUSY_HLT_DoubleEle_Hadronic::bookHistos(DQMStore::IBooker &ibooker_) {
+  ibooker_.cd();
+  ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
 
+  // offline quantities
 
-void SUSY_HLT_DoubleEle_Hadronic::endRun(edm::Run const& run, edm::EventSetup const& eSetup)
-{
-    edm::LogInfo("SUSY_HLT_DoubleEle_Hadronic") << "SUSY_HLT_DoubleEle_Hadronic::endRun" << std::endl;
-}
+  // online quantities
+  h_triggerElePt = ibooker_.book1D("triggerElePt", "Trigger Electron Pt; GeV", 50, 0.0, 500.0);
+  h_triggerEleEta = ibooker_.book1D("triggerEleEta", "Trigger Electron Eta", 20, -3.0, 3.0);
+  h_triggerElePhi = ibooker_.book1D("triggerElePhi", "Trigger Electron Phi", 20, -3.5, 3.5);
+
+  h_triggerDoubleEleMass = ibooker_.book1D("triggerDoubleEleMass", "Trigger DoubleElectron Mass", 202, -2, 200);
+
+  // num and den hists to be divided in harvesting step to make turn on curves
+  h_pfHTTurnOn_num = ibooker_.book1D("pfHTTurnOn_num", "PF HT Turn On Numerator", 30, 0.0, 1500.0);
+  h_pfHTTurnOn_den = ibooker_.book1D("pfHTTurnOn_den", "PF HT Turn On Denominator", 30, 0.0, 1500.0);
+  h_EleTurnOn_num = ibooker_.book1D("EleTurnOn_num", "Electron Turn On Numerator", 30, 0.0, 150);
+  h_EleTurnOn_den = ibooker_.book1D("EleTurnOn_den", "Electron Turn On Denominator", 30, 0.0, 150.0);
 
-void SUSY_HLT_DoubleEle_Hadronic::bookHistos(DQMStore::IBooker & ibooker_)
-{
-    ibooker_.cd();
-    ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
-    
-    //offline quantities
-    
-    //online quantities
-    h_triggerElePt = ibooker_.book1D("triggerElePt", "Trigger Electron Pt; GeV", 50, 0.0, 500.0);
-    h_triggerEleEta = ibooker_.book1D("triggerEleEta", "Trigger Electron Eta", 20, -3.0, 3.0);
-    h_triggerElePhi = ibooker_.book1D("triggerElePhi", "Trigger Electron Phi", 20, -3.5, 3.5);
-
-    h_triggerDoubleEleMass = ibooker_.book1D("triggerDoubleEleMass", "Trigger DoubleElectron Mass", 202, -2, 200);
-
-    //num and den hists to be divided in harvesting step to make turn on curves
-    h_pfHTTurnOn_num = ibooker_.book1D("pfHTTurnOn_num", "PF HT Turn On Numerator", 30, 0.0, 1500.0 );
-    h_pfHTTurnOn_den = ibooker_.book1D("pfHTTurnOn_den", "PF HT Turn On Denominator", 30, 0.0, 1500.0 );
-    h_EleTurnOn_num = ibooker_.book1D("EleTurnOn_num", "Electron Turn On Numerator", 30, 0.0, 150 );
-    h_EleTurnOn_den = ibooker_.book1D("EleTurnOn_den", "Electron Turn On Denominator", 30, 0.0, 150.0 );
-    
-    ibooker_.cd();
+  ibooker_.cd();
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SUSY_HLT_DoubleEle_Hadronic);
diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleMuon_Hadronic.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleMuon_Hadronic.cc
index d449a45d6c4d7..23ca1b89b66b4 100644
--- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleMuon_Hadronic.cc
+++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_DoubleMuon_Hadronic.cc
@@ -1,237 +1,249 @@
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Common/interface/TriggerNames.h"
 #include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
+#include "FWCore/Common/interface/TriggerNames.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_DoubleMuon_Hadronic.h"
 
-SUSY_HLT_DoubleMuon_Hadronic::SUSY_HLT_DoubleMuon_Hadronic(const edm::ParameterSet& ps)
-{
-    edm::LogInfo("SUSY_HLT_DoubleMuon_Hadronic") << "Constructor SUSY_HLT_DoubleMuon_Hadronic::SUSY_HLT_DoubleMuon_Hadronic " << std::endl;
-    // Get parameters from configuration file
-    theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
-    theMuonCollection_ = consumes<reco::MuonCollection>(ps.getParameter<edm::InputTag>("MuonCollection"));
-    thePfJetCollection_ = consumes<reco::PFJetCollection>(ps.getParameter<edm::InputTag>("pfJetCollection"));
-    theCaloJetCollection_ = consumes<reco::CaloJetCollection>(ps.getParameter<edm::InputTag>("caloJetCollection"));
-    triggerResults_ = consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>("TriggerResults"));
-    HLTProcess_ = ps.getParameter<std::string>("HLTProcess");
-    triggerPath_ = ps.getParameter<std::string>("TriggerPath");
-    triggerPathAuxiliaryForMuon_ = ps.getParameter<std::string>("TriggerPathAuxiliaryForMuon");
-    triggerPathAuxiliaryForHadronic_ = ps.getParameter<std::string>("TriggerPathAuxiliaryForHadronic");
-    triggerFilter_ = ps.getParameter<edm::InputTag>("TriggerFilter");
-    ptThrJet_ = ps.getUntrackedParameter<double>("PtThrJet");
-    etaThrJet_ = ps.getUntrackedParameter<double>("EtaThrJet");
+SUSY_HLT_DoubleMuon_Hadronic::SUSY_HLT_DoubleMuon_Hadronic(const edm::ParameterSet &ps) {
+  edm::LogInfo("SUSY_HLT_DoubleMuon_Hadronic") << "Constructor "
+                                                  "SUSY_HLT_DoubleMuon_Hadronic::SUSY_HLT_DoubleMuon_Hadronic "
+                                               << std::endl;
+  // Get parameters from configuration file
+  theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
+  theMuonCollection_ = consumes<reco::MuonCollection>(ps.getParameter<edm::InputTag>("MuonCollection"));
+  thePfJetCollection_ = consumes<reco::PFJetCollection>(ps.getParameter<edm::InputTag>("pfJetCollection"));
+  theCaloJetCollection_ = consumes<reco::CaloJetCollection>(ps.getParameter<edm::InputTag>("caloJetCollection"));
+  triggerResults_ = consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>("TriggerResults"));
+  HLTProcess_ = ps.getParameter<std::string>("HLTProcess");
+  triggerPath_ = ps.getParameter<std::string>("TriggerPath");
+  triggerPathAuxiliaryForMuon_ = ps.getParameter<std::string>("TriggerPathAuxiliaryForMuon");
+  triggerPathAuxiliaryForHadronic_ = ps.getParameter<std::string>("TriggerPathAuxiliaryForHadronic");
+  triggerFilter_ = ps.getParameter<edm::InputTag>("TriggerFilter");
+  ptThrJet_ = ps.getUntrackedParameter<double>("PtThrJet");
+  etaThrJet_ = ps.getUntrackedParameter<double>("EtaThrJet");
 }
 
-SUSY_HLT_DoubleMuon_Hadronic::~SUSY_HLT_DoubleMuon_Hadronic()
-{
-    edm::LogInfo("SUSY_HLT_DoubleMuon_Hadronic") << "Destructor SUSY_HLT_DoubleMuon_Hadronic::~SUSY_HLT_DoubleMuon_Hadronic " << std::endl;
+SUSY_HLT_DoubleMuon_Hadronic::~SUSY_HLT_DoubleMuon_Hadronic() {
+  edm::LogInfo("SUSY_HLT_DoubleMuon_Hadronic") << "Destructor "
+                                                  "SUSY_HLT_DoubleMuon_Hadronic::~SUSY_HLT_DoubleMuon_Hadronic "
+                                               << std::endl;
 }
 
-void SUSY_HLT_DoubleMuon_Hadronic::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e)
-{
-    
-    bool changed;
-    
-    if (!fHltConfig.init(run, e, HLTProcess_, changed)) {
-        edm::LogError("SUSY_HLT_DoubleMuon_Hadronic") << "Initialization of HLTConfigProvider failed!!";
-        return;
-    }
-    
-    bool pathFound = false;
-    const std::vector<std::string> allTrigNames = fHltConfig.triggerNames();
-    for(size_t j = 0; j <allTrigNames.size(); ++j) {
-        if(allTrigNames[j].find(triggerPath_) != std::string::npos) {
-            pathFound = true;
-        }
-    }
-    
-    if(!pathFound) {
-        LogDebug("SUSY_HLT_DoubleMuon_Hadronic") << "Path not found" << "\n";
-        return;
+void SUSY_HLT_DoubleMuon_Hadronic::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e) {
+  bool changed;
+
+  if (!fHltConfig.init(run, e, HLTProcess_, changed)) {
+    edm::LogError("SUSY_HLT_DoubleMuon_Hadronic") << "Initialization of HLTConfigProvider failed!!";
+    return;
+  }
+
+  bool pathFound = false;
+  const std::vector<std::string> allTrigNames = fHltConfig.triggerNames();
+  for (size_t j = 0; j < allTrigNames.size(); ++j) {
+    if (allTrigNames[j].find(triggerPath_) != std::string::npos) {
+      pathFound = true;
     }
-    //std::vector<std::string> filtertags = fHltConfig.moduleLabels( triggerPath_ );
-    //triggerFilter_ = edm::InputTag(filtertags[filtertags.size()-1],"",fHltConfig.processName());
-    //triggerFilter_ = edm::InputTag("hltPFMET120Mu5L3PreFiltered", "", fHltConfig.processName());
-    
-    edm::LogInfo("SUSY_HLT_DoubleMuon_Hadronic") << "SUSY_HLT_DoubleMuon_Hadronic::beginRun" << std::endl;
+  }
+
+  if (!pathFound) {
+    LogDebug("SUSY_HLT_DoubleMuon_Hadronic") << "Path not found"
+                                             << "\n";
+    return;
+  }
+  // std::vector<std::string> filtertags = fHltConfig.moduleLabels( triggerPath_
+  // ); triggerFilter_ =
+  // edm::InputTag(filtertags[filtertags.size()-1],"",fHltConfig.processName());
+  // triggerFilter_ = edm::InputTag("hltPFMET120Mu5L3PreFiltered", "",
+  // fHltConfig.processName());
+
+  edm::LogInfo("SUSY_HLT_DoubleMuon_Hadronic") << "SUSY_HLT_DoubleMuon_Hadronic::beginRun" << std::endl;
 }
 
-void SUSY_HLT_DoubleMuon_Hadronic::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run const &, edm::EventSetup const &)
-{
-    edm::LogInfo("SUSY_HLT_DoubleMuon_Hadronic") << "SUSY_HLT_DoubleMuon_Hadronic::bookHistograms" << std::endl;
-    //book at beginRun
-    bookHistos(ibooker_);
+void SUSY_HLT_DoubleMuon_Hadronic::bookHistograms(DQMStore::IBooker &ibooker_,
+                                                  edm::Run const &,
+                                                  edm::EventSetup const &) {
+  edm::LogInfo("SUSY_HLT_DoubleMuon_Hadronic") << "SUSY_HLT_DoubleMuon_Hadronic::bookHistograms" << std::endl;
+  // book at beginRun
+  bookHistos(ibooker_);
 }
 
-
-
-
-void SUSY_HLT_DoubleMuon_Hadronic::analyze(edm::Event const& e, edm::EventSetup const& eSetup){
-    edm::LogInfo("SUSY_HLT_DoubleMuon_Hadronic") << "SUSY_HLT_DoubleMuon_Hadronic::analyze" << std::endl;
-    
-    //-------------------------------
-    //--- Jets
-    //-------------------------------
-    edm::Handle<reco::PFJetCollection> pfJetCollection;
-    e.getByToken (thePfJetCollection_,pfJetCollection);
-    if ( !pfJetCollection.isValid() ){
-        edm::LogError ("SUSY_HLT_DoubleMuon_Hadronic") << "invalid collection: PFJets" << "\n";
-        return;
+void SUSY_HLT_DoubleMuon_Hadronic::analyze(edm::Event const &e, edm::EventSetup const &eSetup) {
+  edm::LogInfo("SUSY_HLT_DoubleMuon_Hadronic") << "SUSY_HLT_DoubleMuon_Hadronic::analyze" << std::endl;
+
+  //-------------------------------
+  //--- Jets
+  //-------------------------------
+  edm::Handle<reco::PFJetCollection> pfJetCollection;
+  e.getByToken(thePfJetCollection_, pfJetCollection);
+  if (!pfJetCollection.isValid()) {
+    edm::LogError("SUSY_HLT_DoubleMuon_Hadronic") << "invalid collection: PFJets"
+                                                  << "\n";
+    return;
+  }
+  edm::Handle<reco::CaloJetCollection> caloJetCollection;
+  e.getByToken(theCaloJetCollection_, caloJetCollection);
+  if (!caloJetCollection.isValid()) {
+    edm::LogError("SUSY_HLT_DoubleMuon_Hadronic") << "invalid collection: CaloJets"
+                                                  << "\n";
+    return;
+  }
+
+  //-------------------------------
+  //--- Muon
+  //-------------------------------
+  edm::Handle<reco::MuonCollection> MuonCollection;
+  e.getByToken(theMuonCollection_, MuonCollection);
+  if (!MuonCollection.isValid()) {
+    edm::LogError("SUSY_HLT_DoubleMuon_Hadronic") << "invalid collection: Muons "
+                                                  << "\n";
+    return;
+  }
+
+  //-------------------------------
+  //--- Trigger
+  //-------------------------------
+  edm::Handle<edm::TriggerResults> hltresults;
+  e.getByToken(triggerResults_, hltresults);
+  if (!hltresults.isValid()) {
+    edm::LogError("SUSY_HLT_DoubleMuon_Hadronic") << "invalid collection: TriggerResults"
+                                                  << "\n";
+    return;
+  }
+  edm::Handle<trigger::TriggerEvent> triggerSummary;
+  e.getByToken(theTrigSummary_, triggerSummary);
+  if (!triggerSummary.isValid()) {
+    edm::LogError("SUSY_HLT_DoubleMuon_Hadronic") << "invalid collection: TriggerSummary"
+                                                  << "\n";
+    return;
+  }
+
+  // get online objects
+  std::vector<float> ptMuon, etaMuon, phiMuon;
+  size_t filterIndex = triggerSummary->filterIndex(triggerFilter_);
+  trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
+  if (!(filterIndex >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndex);
+    for (size_t j = 0; j < keys.size(); ++j) {
+      trigger::TriggerObject foundObject = triggerObjects[keys[j]];
+      if (fabs(foundObject.id()) == 13) {  // It's a muon
+        h_triggerMuPt->Fill(foundObject.pt());
+        h_triggerMuEta->Fill(foundObject.eta());
+        h_triggerMuPhi->Fill(foundObject.phi());
+        ptMuon.push_back(foundObject.pt());
+        etaMuon.push_back(foundObject.eta());
+        phiMuon.push_back(foundObject.phi());
+      }
     }
-    edm::Handle<reco::CaloJetCollection> caloJetCollection;
-    e.getByToken (theCaloJetCollection_,caloJetCollection);
-    if ( !caloJetCollection.isValid() ){
-        edm::LogError ("SUSY_HLT_DoubleMuon_Hadronic") << "invalid collection: CaloJets" << "\n";
-        return;
+    if (ptMuon.size() >= 2) {
+      math::PtEtaPhiMLorentzVectorD *mu1 = new math::PtEtaPhiMLorentzVectorD(ptMuon[0], etaMuon[0], phiMuon[0], 0.106);
+      math::PtEtaPhiMLorentzVectorD *mu2 = new math::PtEtaPhiMLorentzVectorD(ptMuon[1], etaMuon[1], phiMuon[1], 0.106);
+      (*mu1) += (*mu2);
+      h_triggerDoubleMuMass->Fill(mu1->M());
+      delete mu1;
+      delete mu2;
+    } else {
+      h_triggerDoubleMuMass->Fill(-1.);
     }
-    
-    //-------------------------------
-    //--- Muon
-    //-------------------------------
-    edm::Handle<reco::MuonCollection> MuonCollection;
-    e.getByToken (theMuonCollection_, MuonCollection);
-    if ( !MuonCollection.isValid() ){
-        edm::LogError ("SUSY_HLT_DoubleMuon_Hadronic") << "invalid collection: Muons " << "\n";
-        return;
+  }
+
+  bool hasFired = false;
+  bool hasFiredAuxiliaryForMuonLeg = false;
+  bool hasFiredAuxiliaryForHadronicLeg = false;
+  const edm::TriggerNames &trigNames = e.triggerNames(*hltresults);
+  unsigned int numTriggers = trigNames.size();
+  for (unsigned int hltIndex = 0; hltIndex < numTriggers; ++hltIndex) {
+    if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) &&
+        hltresults->accept(hltIndex))
+      hasFired = true;
+    if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForMuon_) != std::string::npos &&
+        hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex))
+      hasFiredAuxiliaryForMuonLeg = true;
+    if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForHadronic_) != std::string::npos &&
+        hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex))
+      hasFiredAuxiliaryForHadronicLeg = true;
+  }
+
+  if (hasFiredAuxiliaryForMuonLeg || hasFiredAuxiliaryForHadronicLeg) {
+    // Matching the muon
+    int indexOfMatchedMuon[2] = {-1};
+    int matchedCounter = 0;
+    int offlineCounter = 0;
+    for (reco::MuonCollection::const_iterator muon = MuonCollection->begin();
+         (muon != MuonCollection->end() && matchedCounter < 2);
+         ++muon) {
+      for (size_t off_i = 0; off_i < ptMuon.size(); ++off_i) {
+        if (sqrt((muon->phi() - phiMuon[off_i]) * (muon->phi() - phiMuon[off_i]) +
+                 (muon->eta() - etaMuon[off_i]) * (muon->eta() - etaMuon[off_i])) < 0.5) {
+          indexOfMatchedMuon[matchedCounter] = offlineCounter;
+          matchedCounter++;
+          break;
+        }
+      }
+      offlineCounter++;
     }
-    
-    
-    //-------------------------------
-    //--- Trigger
-    //-------------------------------
-    edm::Handle<edm::TriggerResults> hltresults;
-    e.getByToken(triggerResults_,hltresults);
-    if(!hltresults.isValid()){
-        edm::LogError ("SUSY_HLT_DoubleMuon_Hadronic") << "invalid collection: TriggerResults" << "\n";
-        return;
+
+    float caloHT = 0.0;
+    float pfHT = 0.0;
+    for (reco::PFJetCollection::const_iterator i_pfjet = pfJetCollection->begin(); i_pfjet != pfJetCollection->end();
+         ++i_pfjet) {
+      if (i_pfjet->pt() < ptThrJet_)
+        continue;
+      if (fabs(i_pfjet->eta()) > etaThrJet_)
+        continue;
+      pfHT += i_pfjet->pt();
     }
-    edm::Handle<trigger::TriggerEvent> triggerSummary;
-    e.getByToken(theTrigSummary_, triggerSummary);
-    if(!triggerSummary.isValid()) {
-        edm::LogError ("SUSY_HLT_DoubleMuon_Hadronic") << "invalid collection: TriggerSummary" << "\n";
-        return;
+    for (reco::CaloJetCollection::const_iterator i_calojet = caloJetCollection->begin();
+         i_calojet != caloJetCollection->end();
+         ++i_calojet) {
+      if (i_calojet->pt() < ptThrJet_)
+        continue;
+      if (fabs(i_calojet->eta()) > etaThrJet_)
+        continue;
+      caloHT += i_calojet->pt();
     }
-    
-    //get online objects
-    std::vector<float> ptMuon, etaMuon, phiMuon;
-    size_t filterIndex = triggerSummary->filterIndex( triggerFilter_ );
-    trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
-    if( !(filterIndex >= triggerSummary->sizeFilters()) ){
-        const trigger::Keys& keys = triggerSummary->filterKeys( filterIndex );
-        for( size_t j = 0; j < keys.size(); ++j ){
-            trigger::TriggerObject foundObject = triggerObjects[keys[j]];
-            if(fabs(foundObject.id()) == 13){ //It's a muon
-                h_triggerMuPt->Fill(foundObject.pt());
-                h_triggerMuEta->Fill(foundObject.eta());
-                h_triggerMuPhi->Fill(foundObject.phi());
-                ptMuon.push_back(foundObject.pt());
-                etaMuon.push_back(foundObject.eta());
-                phiMuon.push_back(foundObject.phi());
-            }
-        }
-        if (ptMuon.size()>=2) {
-            math::PtEtaPhiMLorentzVectorD* mu1 = new math::PtEtaPhiMLorentzVectorD(ptMuon[0],etaMuon[0],phiMuon[0],0.106);
-            math::PtEtaPhiMLorentzVectorD* mu2 = new math::PtEtaPhiMLorentzVectorD(ptMuon[1],etaMuon[1],phiMuon[1],0.106);
-            (*mu1)+=(*mu2);
-            h_triggerDoubleMuMass->Fill(mu1->M());
-            delete mu1;
-            delete mu2;
-        } else {
-            h_triggerDoubleMuMass->Fill(-1.);
-        }
+
+    if (hasFiredAuxiliaryForMuonLeg && MuonCollection->size() > 1) {
+      if (hasFired && indexOfMatchedMuon[1] >= 0) {  // fill trailing leg
+        h_MuTurnOn_num->Fill(MuonCollection->at(indexOfMatchedMuon[1]).pt());
+      }
+      h_MuTurnOn_den->Fill(MuonCollection->at(1).pt());
     }
-    
-    
-    bool hasFired = false;
-    bool hasFiredAuxiliaryForMuonLeg = false;
-    bool hasFiredAuxiliaryForHadronicLeg = false;
-    const edm::TriggerNames& trigNames = e.triggerNames(*hltresults);
-    unsigned int numTriggers = trigNames.size();
-    for( unsigned int hltIndex=0; hltIndex<numTriggers; ++hltIndex ){
-        if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFired = true;
-        if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForMuon_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFiredAuxiliaryForMuonLeg = true;
-        if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForHadronic_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFiredAuxiliaryForHadronicLeg = true;
-    }
-    
-    
-    
-    if(hasFiredAuxiliaryForMuonLeg || hasFiredAuxiliaryForHadronicLeg) {
-        
-        //Matching the muon
-        int indexOfMatchedMuon[2] = {-1};
-        int matchedCounter = 0;
-        int offlineCounter = 0;
-        for(reco::MuonCollection::const_iterator muon = MuonCollection->begin(); (muon != MuonCollection->end() && matchedCounter < 2) ; ++muon) {
-            for(size_t off_i = 0; off_i < ptMuon.size(); ++off_i) {
-                if(sqrt((muon->phi()-phiMuon[off_i])*(muon->phi()-phiMuon[off_i]) + (muon->eta()-etaMuon[off_i])*(muon->eta()-etaMuon[off_i])) < 0.5) {
-                    indexOfMatchedMuon[matchedCounter] = offlineCounter;
-                    matchedCounter++;
-                    break;
-                }
-            }
-            offlineCounter++;
-        }
-        
-        float caloHT = 0.0;
-        float pfHT = 0.0;
-        for (reco::PFJetCollection::const_iterator i_pfjet = pfJetCollection->begin(); i_pfjet != pfJetCollection->end(); ++i_pfjet){
-            if (i_pfjet->pt() < ptThrJet_) continue;
-            if (fabs(i_pfjet->eta()) > etaThrJet_) continue;
-            pfHT += i_pfjet->pt();
-        }
-        for (reco::CaloJetCollection::const_iterator i_calojet = caloJetCollection->begin(); i_calojet != caloJetCollection->end(); ++i_calojet){
-            if (i_calojet->pt() < ptThrJet_) continue;
-            if (fabs(i_calojet->eta()) > etaThrJet_) continue;
-            caloHT += i_calojet->pt();
-        }
-        
-        if(hasFiredAuxiliaryForMuonLeg && MuonCollection->size()>1) {
-            if(hasFired && indexOfMatchedMuon[1] >= 0) { //fill trailing leg
-                h_MuTurnOn_num-> Fill(MuonCollection->at(indexOfMatchedMuon[1]).pt());
-            }
-            h_MuTurnOn_den-> Fill(MuonCollection->at(1).pt());
-        }
-        if(hasFiredAuxiliaryForHadronicLeg) {
-            if(hasFired) {
-                h_pfHTTurnOn_num-> Fill(pfHT);
-            }
-            h_pfHTTurnOn_den-> Fill(pfHT);
-        }
+    if (hasFiredAuxiliaryForHadronicLeg) {
+      if (hasFired) {
+        h_pfHTTurnOn_num->Fill(pfHT);
+      }
+      h_pfHTTurnOn_den->Fill(pfHT);
     }
+  }
 }
 
+void SUSY_HLT_DoubleMuon_Hadronic::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
+  edm::LogInfo("SUSY_HLT_DoubleMuon_Hadronic") << "SUSY_HLT_DoubleMuon_Hadronic::endRun" << std::endl;
+}
 
+void SUSY_HLT_DoubleMuon_Hadronic::bookHistos(DQMStore::IBooker &ibooker_) {
+  ibooker_.cd();
+  ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
 
+  // offline quantities
 
-void SUSY_HLT_DoubleMuon_Hadronic::endRun(edm::Run const& run, edm::EventSetup const& eSetup)
-{
-    edm::LogInfo("SUSY_HLT_DoubleMuon_Hadronic") << "SUSY_HLT_DoubleMuon_Hadronic::endRun" << std::endl;
-}
+  // online quantities
+  h_triggerMuPt = ibooker_.book1D("triggerMuPt", "Trigger Muon Pt; GeV", 50, 0.0, 500.0);
+  h_triggerMuEta = ibooker_.book1D("triggerMuEta", "Trigger Muon Eta", 20, -3.0, 3.0);
+  h_triggerMuPhi = ibooker_.book1D("triggerMuPhi", "Trigger Muon Phi", 20, -3.5, 3.5);
+
+  h_triggerDoubleMuMass = ibooker_.book1D("triggerDoubleMuMass", "Trigger DoubleMuon Mass", 202, -2, 200);
+
+  // num and den hists to be divided in harvesting step to make turn on curves
+  h_pfHTTurnOn_num = ibooker_.book1D("pfHTTurnOn_num", "PF HT Turn On Numerator", 30, 0.0, 1500.0);
+  h_pfHTTurnOn_den = ibooker_.book1D("pfHTTurnOn_den", "PF HT Turn On Denominator", 30, 0.0, 1500.0);
+  h_MuTurnOn_num = ibooker_.book1D("MuTurnOn_num", "Muon Turn On Numerator", 30, 0.0, 150);
+  h_MuTurnOn_den = ibooker_.book1D("MuTurnOn_den", "Muon Turn On Denominator", 30, 0.0, 150.0);
 
-void SUSY_HLT_DoubleMuon_Hadronic::bookHistos(DQMStore::IBooker & ibooker_)
-{
-    ibooker_.cd();
-    ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
-    
-    //offline quantities
-    
-    //online quantities
-    h_triggerMuPt = ibooker_.book1D("triggerMuPt", "Trigger Muon Pt; GeV", 50, 0.0, 500.0);
-    h_triggerMuEta = ibooker_.book1D("triggerMuEta", "Trigger Muon Eta", 20, -3.0, 3.0);
-    h_triggerMuPhi = ibooker_.book1D("triggerMuPhi", "Trigger Muon Phi", 20, -3.5, 3.5);
-
-    h_triggerDoubleMuMass = ibooker_.book1D("triggerDoubleMuMass", "Trigger DoubleMuon Mass", 202, -2, 200);
-
-    //num and den hists to be divided in harvesting step to make turn on curves
-    h_pfHTTurnOn_num = ibooker_.book1D("pfHTTurnOn_num", "PF HT Turn On Numerator", 30, 0.0, 1500.0 );
-    h_pfHTTurnOn_den = ibooker_.book1D("pfHTTurnOn_den", "PF HT Turn On Denominator", 30, 0.0, 1500.0 );
-    h_MuTurnOn_num = ibooker_.book1D("MuTurnOn_num", "Muon Turn On Numerator", 30, 0.0, 150 );
-    h_MuTurnOn_den = ibooker_.book1D("MuTurnOn_den", "Muon Turn On Denominator", 30, 0.0, 150.0 );
-    
-    ibooker_.cd();
+  ibooker_.cd();
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SUSY_HLT_DoubleMuon_Hadronic);
diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_ElecFakes.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_ElecFakes.cc
index fb35918b8b95b..054d006966431 100644
--- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_ElecFakes.cc
+++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_ElecFakes.cc
@@ -1,13 +1,12 @@
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "FWCore/Common/interface/TriggerNames.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Common/interface/TriggerNames.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_ElecFakes.h"
 #include <iostream>
 
-SUSY_HLT_ElecFakes::SUSY_HLT_ElecFakes(const edm::ParameterSet& ps)
-{
+SUSY_HLT_ElecFakes::SUSY_HLT_ElecFakes(const edm::ParameterSet &ps) {
   edm::LogInfo("SUSY_HLT_ElecFakes") << "Constructor SUSY_HLT_ElecFakes::SUSY_HLT_ElecFakes " << std::endl;
   // Get parameters from configuration file
   theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
@@ -18,16 +17,13 @@ SUSY_HLT_ElecFakes::SUSY_HLT_ElecFakes(const edm::ParameterSet& ps)
   triggerJetFilter_ = ps.getParameter<edm::InputTag>("TriggerJetFilter");
 }
 
-SUSY_HLT_ElecFakes::~SUSY_HLT_ElecFakes()
-{
-   edm::LogInfo("SUSY_HLT_ElecFakes") << "Destructor SUSY_HLT_ElecFakes::~SUSY_HLT_ElecFakes " << std::endl;
+SUSY_HLT_ElecFakes::~SUSY_HLT_ElecFakes() {
+  edm::LogInfo("SUSY_HLT_ElecFakes") << "Destructor SUSY_HLT_ElecFakes::~SUSY_HLT_ElecFakes " << std::endl;
 }
 
-void SUSY_HLT_ElecFakes::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e)
-{
- 
+void SUSY_HLT_ElecFakes::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e) {
   bool changed;
-  
+
   if (!fHltConfig.init(run, e, HLTProcess_, changed)) {
     edm::LogError("SUSY_HLT_ElecFakes") << "Initialization of HLTConfigProvider failed!!";
     return;
@@ -35,108 +31,99 @@ void SUSY_HLT_ElecFakes::dqmBeginRun(edm::Run const &run, edm::EventSetup const
 
   bool pathFound = false;
   const std::vector<std::string> allTrigNames = fHltConfig.triggerNames();
-  for(size_t j = 0; j <allTrigNames.size(); ++j) {
-    if(allTrigNames[j].find(triggerPath_) != std::string::npos) {
+  for (size_t j = 0; j < allTrigNames.size(); ++j) {
+    if (allTrigNames[j].find(triggerPath_) != std::string::npos) {
       pathFound = true;
     }
   }
 
-  if(!pathFound) {
-    edm::LogInfo ("SUSY_HLT_ElecFakes") << "Path not found" << "\n";
+  if (!pathFound) {
+    edm::LogInfo("SUSY_HLT_ElecFakes") << "Path not found"
+                                       << "\n";
     return;
   }
 
   edm::LogInfo("SUSY_HLT_ElecFakes") << "SUSY_HLT_ElecFakes::beginRun" << std::endl;
 }
 
- void SUSY_HLT_ElecFakes::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run const &, edm::EventSetup const &)
-{
+void SUSY_HLT_ElecFakes::bookHistograms(DQMStore::IBooker &ibooker_, edm::Run const &, edm::EventSetup const &) {
   edm::LogInfo("SUSY_HLT_ElecFakes") << "SUSY_HLT_ElecFakes::bookHistograms" << std::endl;
-  //book at beginRun
+  // book at beginRun
   bookHistos(ibooker_);
 }
 
-
-
-
-void SUSY_HLT_ElecFakes::analyze(edm::Event const& e, edm::EventSetup const& eSetup){
+void SUSY_HLT_ElecFakes::analyze(edm::Event const &e, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_ElecFakes") << "SUSY_HLT_ElecFakes::analyze" << std::endl;
 
-
   //-------------------------------
   //--- Trigger
   //-------------------------------
   edm::Handle<edm::TriggerResults> hltresults;
-  e.getByToken(triggerResults_,hltresults);
-  if(!hltresults.isValid()){
-    edm::LogError ("SUSY_HLT_ElecFakes") << "invalid collection: TriggerResults" << "\n";
+  e.getByToken(triggerResults_, hltresults);
+  if (!hltresults.isValid()) {
+    edm::LogError("SUSY_HLT_ElecFakes") << "invalid collection: TriggerResults"
+                                        << "\n";
     return;
   }
   edm::Handle<trigger::TriggerEvent> triggerSummary;
   e.getByToken(theTrigSummary_, triggerSummary);
-  if(!triggerSummary.isValid()) {
-    edm::LogError ("SUSY_HLT_ElecFakes") << "invalid collection: TriggerSummary" << "\n";
+  if (!triggerSummary.isValid()) {
+    edm::LogError("SUSY_HLT_ElecFakes") << "invalid collection: TriggerSummary"
+                                        << "\n";
     return;
   }
 
-
-  //get online objects
-  size_t filterIndex = triggerSummary->filterIndex( triggerFilter_ );
+  // get online objects
+  size_t filterIndex = triggerSummary->filterIndex(triggerFilter_);
   trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
-  if( !(filterIndex >= triggerSummary->sizeFilters()) ){
-    const trigger::Keys& keys = triggerSummary->filterKeys( filterIndex );
-    for( size_t j = 0; j < keys.size(); ++j ){
+  if (!(filterIndex >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndex);
+    for (size_t j = 0; j < keys.size(); ++j) {
       trigger::TriggerObject foundObject = triggerObjects[keys[j]];
       //      if(foundObject.id() == 11){ //Electrons check number
-	h_triggerElPt->Fill(foundObject.pt());
-	h_triggerElEta->Fill(foundObject.eta());
-	h_triggerElPhi->Fill(foundObject.phi());
-	//      }
+      h_triggerElPt->Fill(foundObject.pt());
+      h_triggerElEta->Fill(foundObject.eta());
+      h_triggerElPhi->Fill(foundObject.phi());
+      //      }
     }
   }
-  
-  filterIndex = triggerSummary->filterIndex( triggerJetFilter_ );
+
+  filterIndex = triggerSummary->filterIndex(triggerJetFilter_);
   //  triggerObjects = triggerSummary->getObjects();
-  if( !(filterIndex >= triggerSummary->sizeFilters()) ){
-    const trigger::Keys& keys = triggerSummary->filterKeys( filterIndex );
-    for( size_t j = 0; j < keys.size(); ++j ){
+  if (!(filterIndex >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndex);
+    for (size_t j = 0; j < keys.size(); ++j) {
       trigger::TriggerObject foundObject = triggerObjects[keys[j]];
       h_triggerJetPt->Fill(foundObject.pt());
       h_triggerJetEta->Fill(foundObject.eta());
       h_triggerJetPhi->Fill(foundObject.phi());
     }
   }
-  
 }
 
-
-
-
-void SUSY_HLT_ElecFakes::endRun(edm::Run const& run, edm::EventSetup const& eSetup)
-{
+void SUSY_HLT_ElecFakes::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_ElecFakes") << "SUSY_HLT_ElecFakes::endRun" << std::endl;
 }
 
-void SUSY_HLT_ElecFakes::bookHistos(DQMStore::IBooker & ibooker_)
-{
+void SUSY_HLT_ElecFakes::bookHistos(DQMStore::IBooker &ibooker_) {
   ibooker_.cd();
   ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
-  
-  //online quantities 
-  h_triggerElPt  = ibooker_.book1D("triggerElPt",  "Trigger El Pt; GeV", 50, 0.0, 100.0);
+
+  // online quantities
+  h_triggerElPt = ibooker_.book1D("triggerElPt", "Trigger El Pt; GeV", 50, 0.0, 100.0);
   h_triggerElEta = ibooker_.book1D("triggerElEta", "Trigger El Eta", 20, -2.5, 2.5);
   h_triggerElPhi = ibooker_.book1D("triggerElPhi", "Trigger El Phi", 20, -3.5, 3.5);
-  
-  h_triggerJetPt  = ibooker_.book1D("triggerJetPt",  "Trigger Jet Pt; GeV", 20, 0.0, 200.0);
+
+  h_triggerJetPt = ibooker_.book1D("triggerJetPt", "Trigger Jet Pt; GeV", 20, 0.0, 200.0);
   h_triggerJetEta = ibooker_.book1D("triggerJetEta", "Trigger Jet Eta", 20, -3.0, 3.0);
   h_triggerJetPhi = ibooker_.book1D("triggerJetPhi", "Trigger Jet Phi", 20, -3.5, 3.5);
 
-//  h_triggerElJetdPhi = ibooker_.book1D("triggerElJetdPhi", "Trigger El,Jet dPhi", 20, -3.5, 3.5);
-
+  //  h_triggerElJetdPhi = ibooker_.book1D("triggerElJetdPhi", "Trigger El,Jet
+  //  dPhi", 20, -3.5, 3.5);
 
-  //num and den hists to be divided in harvesting step to make turn on curves
+  // num and den hists to be divided in harvesting step to make turn on curves
   ibooker_.cd();
 }
 
- //define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SUSY_HLT_ElecFakes);
diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Electron_BJet.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Electron_BJet.cc
index 9f865bc1c6af8..4f5e9cc753ab5 100644
--- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Electron_BJet.cc
+++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Electron_BJet.cc
@@ -1,156 +1,142 @@
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Common/interface/TriggerNames.h"
 #include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
+#include "FWCore/Common/interface/TriggerNames.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Electron_BJet.h"
 
-SUSY_HLT_Electron_BJet::SUSY_HLT_Electron_BJet(const edm::ParameterSet& ps)
-{
-    edm::LogInfo("SUSY_HLT_Electron_BJet") << "Constructor SUSY_HLT_Electron_BJet::SUSY_HLT_Electron_BJet " << std::endl;
-    // Get parameters from configuration file
-    theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
-    theElectronCollection_ = consumes<reco::GsfElectronCollection>(ps.getParameter<edm::InputTag>("ElectronCollection"));
-    thePfJetCollection_ = consumes<reco::PFJetCollection>(ps.getParameter<edm::InputTag>("pfJetCollection"));
-    theCaloJetCollection_ = consumes<reco::CaloJetCollection>(ps.getParameter<edm::InputTag>("caloJetCollection"));
-    triggerResults_ = consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>("TriggerResults"));
-    HLTProcess_ = ps.getParameter<std::string>("HLTProcess");
-    triggerPath_ = ps.getParameter<std::string>("TriggerPath");
-    triggerFilterEle_ = ps.getParameter<edm::InputTag>("TriggerFilterEle");
-	triggerFilterJet_ = ps.getParameter<edm::InputTag>("TriggerFilterJet");
-    ptThrJet_ = ps.getUntrackedParameter<double>("PtThrJet");
-    etaThrJet_ = ps.getUntrackedParameter<double>("EtaThrJet");
+SUSY_HLT_Electron_BJet::SUSY_HLT_Electron_BJet(const edm::ParameterSet &ps) {
+  edm::LogInfo("SUSY_HLT_Electron_BJet") << "Constructor SUSY_HLT_Electron_BJet::SUSY_HLT_Electron_BJet " << std::endl;
+  // Get parameters from configuration file
+  theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
+  theElectronCollection_ = consumes<reco::GsfElectronCollection>(ps.getParameter<edm::InputTag>("ElectronCollection"));
+  thePfJetCollection_ = consumes<reco::PFJetCollection>(ps.getParameter<edm::InputTag>("pfJetCollection"));
+  theCaloJetCollection_ = consumes<reco::CaloJetCollection>(ps.getParameter<edm::InputTag>("caloJetCollection"));
+  triggerResults_ = consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>("TriggerResults"));
+  HLTProcess_ = ps.getParameter<std::string>("HLTProcess");
+  triggerPath_ = ps.getParameter<std::string>("TriggerPath");
+  triggerFilterEle_ = ps.getParameter<edm::InputTag>("TriggerFilterEle");
+  triggerFilterJet_ = ps.getParameter<edm::InputTag>("TriggerFilterJet");
+  ptThrJet_ = ps.getUntrackedParameter<double>("PtThrJet");
+  etaThrJet_ = ps.getUntrackedParameter<double>("EtaThrJet");
 }
 
-SUSY_HLT_Electron_BJet::~SUSY_HLT_Electron_BJet()
-{
-    edm::LogInfo("SUSY_HLT_Electron_BJet") << "Destructor SUSY_HLT_Electron_BJet::~SUSY_HLT_Electron_BJet " << std::endl;
+SUSY_HLT_Electron_BJet::~SUSY_HLT_Electron_BJet() {
+  edm::LogInfo("SUSY_HLT_Electron_BJet") << "Destructor SUSY_HLT_Electron_BJet::~SUSY_HLT_Electron_BJet " << std::endl;
 }
 
-void SUSY_HLT_Electron_BJet::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e)
-{
-    
-    bool changed;
-    
-    if (!fHltConfig.init(run, e, HLTProcess_, changed)) {
-        edm::LogError("SUSY_HLT_Electron_BJet") << "Initialization of HLTConfigProvider failed!!";
-        return;
-    }
-    
-    bool pathFound = false;
-    const std::vector<std::string> allTrigNames = fHltConfig.triggerNames();
-    for(size_t j = 0; j <allTrigNames.size(); ++j) {
-        if(allTrigNames[j].find(triggerPath_) != std::string::npos) {
-            pathFound = true;
-        }
-    }
-    
-    if(!pathFound) {
-        LogDebug("SUSY_HLT_Electron_BJet") << "Path not found" << "\n";
-        return;
+void SUSY_HLT_Electron_BJet::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e) {
+  bool changed;
+
+  if (!fHltConfig.init(run, e, HLTProcess_, changed)) {
+    edm::LogError("SUSY_HLT_Electron_BJet") << "Initialization of HLTConfigProvider failed!!";
+    return;
+  }
+
+  bool pathFound = false;
+  const std::vector<std::string> allTrigNames = fHltConfig.triggerNames();
+  for (size_t j = 0; j < allTrigNames.size(); ++j) {
+    if (allTrigNames[j].find(triggerPath_) != std::string::npos) {
+      pathFound = true;
     }
-    
-    edm::LogInfo("SUSY_HLT_Electron_BJet") << "SUSY_HLT_Electron_BJet::beginRun" << std::endl;
+  }
+
+  if (!pathFound) {
+    LogDebug("SUSY_HLT_Electron_BJet") << "Path not found"
+                                       << "\n";
+    return;
+  }
+
+  edm::LogInfo("SUSY_HLT_Electron_BJet") << "SUSY_HLT_Electron_BJet::beginRun" << std::endl;
 }
 
-void SUSY_HLT_Electron_BJet::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run const &, edm::EventSetup const &)
-{
-    edm::LogInfo("SUSY_HLT_Electron_BJet") << "SUSY_HLT_Electron_BJet::bookHistograms" << std::endl;
-    //book at beginRun
-    bookHistos(ibooker_);
+void SUSY_HLT_Electron_BJet::bookHistograms(DQMStore::IBooker &ibooker_, edm::Run const &, edm::EventSetup const &) {
+  edm::LogInfo("SUSY_HLT_Electron_BJet") << "SUSY_HLT_Electron_BJet::bookHistograms" << std::endl;
+  // book at beginRun
+  bookHistos(ibooker_);
 }
 
+void SUSY_HLT_Electron_BJet::analyze(edm::Event const &e, edm::EventSetup const &eSetup) {
+  edm::LogInfo("SUSY_HLT_Electron_BJet") << "SUSY_HLT_Electron_BJet::analyze" << std::endl;
 
+  //-------------------------------
+  //--- Trigger
+  //-------------------------------
+  edm::Handle<edm::TriggerResults> hltresults;
+  e.getByToken(triggerResults_, hltresults);
+  if (!hltresults.isValid()) {
+    edm::LogError("SUSY_HLT_Electron_BJet") << "invalid collection: TriggerResults"
+                                            << "\n";
+    return;
+  }
+  edm::Handle<trigger::TriggerEvent> triggerSummary;
+  e.getByToken(theTrigSummary_, triggerSummary);
+  if (!triggerSummary.isValid()) {
+    edm::LogError("SUSY_HLT_Electron_BJet") << "invalid collection: TriggerSummary"
+                                            << "\n";
+    return;
+  }
 
+  // get online objects
+  std::vector<float> ptElectron;  //, etaElectron, phiElectron;
+  size_t filterIndex = triggerSummary->filterIndex(triggerFilterEle_);
+  trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
+  if (!(filterIndex >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndex);
+    for (size_t j = 0; j < keys.size(); ++j) {
+      trigger::TriggerObject foundObject = triggerObjects[keys[j]];
+      if (fabs(foundObject.id()) == 11) {  // It's an electron
 
-void SUSY_HLT_Electron_BJet::analyze(edm::Event const& e, edm::EventSetup const& eSetup){
-    edm::LogInfo("SUSY_HLT_Electron_BJet") << "SUSY_HLT_Electron_BJet::analyze" << std::endl;
-    
-    //-------------------------------
-    //--- Trigger
-    //-------------------------------
-    edm::Handle<edm::TriggerResults> hltresults;
-    e.getByToken(triggerResults_,hltresults);
-    if(!hltresults.isValid()){
-        edm::LogError ("SUSY_HLT_Electron_BJet") << "invalid collection: TriggerResults" << "\n";
-        return;
-    }
-    edm::Handle<trigger::TriggerEvent> triggerSummary;
-    e.getByToken(theTrigSummary_, triggerSummary);
-    if(!triggerSummary.isValid()) {
-        edm::LogError ("SUSY_HLT_Electron_BJet") << "invalid collection: TriggerSummary" << "\n";
-        return;
-    }
-    
-    
-    //get online objects
-    std::vector<float> ptElectron;//, etaElectron, phiElectron;
-    size_t filterIndex = triggerSummary->filterIndex( triggerFilterEle_ );
-    trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
-    if( !(filterIndex >= triggerSummary->sizeFilters()) ){
-        const trigger::Keys& keys = triggerSummary->filterKeys( filterIndex );
-        for( size_t j = 0; j < keys.size(); ++j ){
-            trigger::TriggerObject foundObject = triggerObjects[keys[j]];
-            if(fabs(foundObject.id()) == 11){ //It's an electron
-			
-				bool same= false;
-				for(unsigned int x=0;x<ptElectron.size();x++){
-					if(fabs(ptElectron[x] - foundObject.pt()) < 0.01)
-						same = true;
-				}
-				
-				if(!same){
-                	h_triggerElePt->Fill(foundObject.pt());
-                	h_triggerEleEta->Fill(foundObject.eta());
-                	h_triggerElePhi->Fill(foundObject.phi());
-                	ptElectron.push_back(foundObject.pt());
-				}
-            }
+        bool same = false;
+        for (unsigned int x = 0; x < ptElectron.size(); x++) {
+          if (fabs(ptElectron[x] - foundObject.pt()) < 0.01)
+            same = true;
         }
-    }
-    
-    size_t filterIndex2 = triggerSummary->filterIndex( triggerFilterJet_ );
-    if( !(filterIndex2 >= triggerSummary->sizeFilters()) ){
-        const trigger::Keys& keys = triggerSummary->filterKeys( filterIndex2 );
-        for( size_t j = 0; j < keys.size(); ++j ){
-            trigger::TriggerObject foundObject = triggerObjects[keys[j]];
-                h_triggerJetPt->Fill(foundObject.pt());
-                h_triggerJetEta->Fill(foundObject.eta());
-                h_triggerJetPhi->Fill(foundObject.phi());
+
+        if (!same) {
+          h_triggerElePt->Fill(foundObject.pt());
+          h_triggerEleEta->Fill(foundObject.eta());
+          h_triggerElePhi->Fill(foundObject.phi());
+          ptElectron.push_back(foundObject.pt());
         }
+      }
+    }
+  }
+
+  size_t filterIndex2 = triggerSummary->filterIndex(triggerFilterJet_);
+  if (!(filterIndex2 >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndex2);
+    for (size_t j = 0; j < keys.size(); ++j) {
+      trigger::TriggerObject foundObject = triggerObjects[keys[j]];
+      h_triggerJetPt->Fill(foundObject.pt());
+      h_triggerJetEta->Fill(foundObject.eta());
+      h_triggerJetPhi->Fill(foundObject.phi());
     }
-	
-    
+  }
 }
 
+void SUSY_HLT_Electron_BJet::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
+  edm::LogInfo("SUSY_HLT_Electron_BJet") << "SUSY_HLT_Electron_BJet::endRun" << std::endl;
+}
 
+void SUSY_HLT_Electron_BJet::bookHistos(DQMStore::IBooker &ibooker_) {
+  ibooker_.cd();
+  ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
 
+  // offline quantities
 
-void SUSY_HLT_Electron_BJet::endRun(edm::Run const& run, edm::EventSetup const& eSetup)
-{
-    edm::LogInfo("SUSY_HLT_Electron_BJet") << "SUSY_HLT_Electron_BJet::endRun" << std::endl;
-}
+  // online quantities
+  h_triggerElePt = ibooker_.book1D("triggerElePt", "Trigger Electron Pt; GeV", 50, 0.0, 500.0);
+  h_triggerEleEta = ibooker_.book1D("triggerEleEta", "Trigger Electron Eta", 20, -3.0, 3.0);
+  h_triggerElePhi = ibooker_.book1D("triggerElePhi", "Trigger Electron Phi", 20, -3.5, 3.5);
+
+  h_triggerJetPt = ibooker_.book1D("triggerJetPt", "Trigger Jet Pt; GeV", 50, 0.0, 500.0);
+  h_triggerJetEta = ibooker_.book1D("triggerJetEta", "Trigger Jet Eta", 20, -3.0, 3.0);
+  h_triggerJetPhi = ibooker_.book1D("triggerJetPhi", "Trigger Jet Phi", 20, -3.5, 3.5);
 
-void SUSY_HLT_Electron_BJet::bookHistos(DQMStore::IBooker & ibooker_)
-{
-    ibooker_.cd();
-    ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
-    
-    //offline quantities
-    
-    //online quantities
-    h_triggerElePt = ibooker_.book1D("triggerElePt", "Trigger Electron Pt; GeV", 50, 0.0, 500.0);
-    h_triggerEleEta = ibooker_.book1D("triggerEleEta", "Trigger Electron Eta", 20, -3.0, 3.0);
-    h_triggerElePhi = ibooker_.book1D("triggerElePhi", "Trigger Electron Phi", 20, -3.5, 3.5);
-	
-	h_triggerJetPt = ibooker_.book1D("triggerJetPt", "Trigger Jet Pt; GeV", 50, 0.0, 500.0);
-    h_triggerJetEta = ibooker_.book1D("triggerJetEta", "Trigger Jet Eta", 20, -3.0, 3.0);
-    h_triggerJetPhi = ibooker_.book1D("triggerJetPhi", "Trigger Jet Phi", 20, -3.5, 3.5);
-
-    
-    ibooker_.cd();
+  ibooker_.cd();
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SUSY_HLT_Electron_BJet);
diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_InclusiveHT.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_InclusiveHT.cc
index 7072ec1af8816..6f91465dc1a48 100644
--- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_InclusiveHT.cc
+++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_InclusiveHT.cc
@@ -1,13 +1,11 @@
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "FWCore/Common/interface/TriggerNames.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Common/interface/TriggerNames.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_InclusiveHT.h"
 
-
-SUSY_HLT_InclusiveHT::SUSY_HLT_InclusiveHT(const edm::ParameterSet& ps)
-{
+SUSY_HLT_InclusiveHT::SUSY_HLT_InclusiveHT(const edm::ParameterSet &ps) {
   edm::LogInfo("SUSY_HLT_InclusiveHT") << "Constructor SUSY_HLT_InclusiveHT::SUSY_HLT_InclusiveHT " << std::endl;
   // Get parameters from configuration file
   theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
@@ -22,181 +20,192 @@ SUSY_HLT_InclusiveHT::SUSY_HLT_InclusiveHT(const edm::ParameterSet& ps)
   etaThrJet_ = ps.getUntrackedParameter<double>("EtaThrJet");
 }
 
-SUSY_HLT_InclusiveHT::~SUSY_HLT_InclusiveHT()
-{
-   edm::LogInfo("SUSY_HLT_InclusiveHT") << "Destructor SUSY_HLT_InclusiveHT::~SUSY_HLT_InclusiveHT " << std::endl;
+SUSY_HLT_InclusiveHT::~SUSY_HLT_InclusiveHT() {
+  edm::LogInfo("SUSY_HLT_InclusiveHT") << "Destructor SUSY_HLT_InclusiveHT::~SUSY_HLT_InclusiveHT " << std::endl;
 }
 
-void SUSY_HLT_InclusiveHT::dqmBeginRun(edm::Run const &, edm::EventSetup const &)
-{
+void SUSY_HLT_InclusiveHT::dqmBeginRun(edm::Run const &, edm::EventSetup const &) {
   edm::LogInfo("SUSY_HLT_InclusiveHT") << "SUSY_HLT_InclusiveHT::beginRun" << std::endl;
 }
 
- void SUSY_HLT_InclusiveHT::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run const &, edm::EventSetup const &)
-{
+void SUSY_HLT_InclusiveHT::bookHistograms(DQMStore::IBooker &ibooker_, edm::Run const &, edm::EventSetup const &) {
   edm::LogInfo("SUSY_HLT_InclusiveHT") << "SUSY_HLT_InclusiveHT::bookHistograms" << std::endl;
-  //book at beginRun
+  // book at beginRun
   bookHistos(ibooker_);
 }
 
-
-void SUSY_HLT_InclusiveHT::analyze(edm::Event const& e, edm::EventSetup const& eSetup){
+void SUSY_HLT_InclusiveHT::analyze(edm::Event const &e, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_InclusiveHT") << "SUSY_HLT_InclusiveHT::analyze" << std::endl;
 
-
   //-------------------------------
   //--- MET
   //-------------------------------
   edm::Handle<reco::PFMETCollection> pfMETCollection;
   e.getByToken(thePfMETCollection_, pfMETCollection);
-  if ( !pfMETCollection.isValid() ){
-    edm::LogError ("SUSY_HLT_InclusiveHT") << "invalid collection: PFMET" << "\n";
-   return;
+  if (!pfMETCollection.isValid()) {
+    edm::LogError("SUSY_HLT_InclusiveHT") << "invalid collection: PFMET"
+                                          << "\n";
+    return;
   }
   //-------------------------------
   //--- Jets
   //-------------------------------
   edm::Handle<reco::PFJetCollection> pfJetCollection;
-  e.getByToken (thePfJetCollection_,pfJetCollection);
-  if ( !pfJetCollection.isValid() ){
-    edm::LogError ("SUSY_HLT_InclusiveHT") << "invalid collection: PFJets" << "\n";
+  e.getByToken(thePfJetCollection_, pfJetCollection);
+  if (!pfJetCollection.isValid()) {
+    edm::LogError("SUSY_HLT_InclusiveHT") << "invalid collection: PFJets"
+                                          << "\n";
     return;
   }
   edm::Handle<reco::CaloJetCollection> caloJetCollection;
-  e.getByToken (theCaloJetCollection_,caloJetCollection);
-  if ( !caloJetCollection.isValid() ){
-  edm::LogError ("SUSY_HLT_InclusiveHT") << "invalid collection: CaloJets" << "\n";
-  return;
+  e.getByToken(theCaloJetCollection_, caloJetCollection);
+  if (!caloJetCollection.isValid()) {
+    edm::LogError("SUSY_HLT_InclusiveHT") << "invalid collection: CaloJets"
+                                          << "\n";
+    return;
   }
 
-  //check what is in the menu
+  // check what is in the menu
   edm::Handle<edm::TriggerResults> hltresults;
-  e.getByToken(triggerResults_,hltresults);
-  if(!hltresults.isValid()){
-    edm::LogError ("SUSY_HLT_InclusiveHT") << "invalid collection: TriggerResults" << "\n";
+  e.getByToken(triggerResults_, hltresults);
+  if (!hltresults.isValid()) {
+    edm::LogError("SUSY_HLT_InclusiveHT") << "invalid collection: TriggerResults"
+                                          << "\n";
     return;
   }
-  
+
   //-------------------------------
   //--- Trigger
   //-------------------------------
   edm::Handle<trigger::TriggerEvent> triggerSummary;
   e.getByToken(theTrigSummary_, triggerSummary);
-  if(!triggerSummary.isValid()) {
-    edm::LogError ("SUSY_HLT_InclusiveHT") << "invalid collection: TriggerSummary" << "\n";
+  if (!triggerSummary.isValid()) {
+    edm::LogError("SUSY_HLT_InclusiveHT") << "invalid collection: TriggerSummary"
+                                          << "\n";
     return;
   }
 
-  //get online objects
-  size_t filterIndex = triggerSummary->filterIndex( triggerFilter_ );
+  // get online objects
+  size_t filterIndex = triggerSummary->filterIndex(triggerFilter_);
   trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
-  if( !(filterIndex >= triggerSummary->sizeFilters()) ){
-      const trigger::Keys& keys = triggerSummary->filterKeys( filterIndex );
-      for( size_t j = 0; j < keys.size(); ++j ){
-        trigger::TriggerObject foundObject = triggerObjects[keys[j]];
-        //if(foundObject.id() == 85 && foundObject.pt() > 40.0 && fabs(foundObject.eta()) < 3.0){
-        //  h_triggerJetPt->Fill(foundObject.pt());
-        //  h_triggerJetEta->Fill(foundObject.eta());
-        //  h_triggerJetPhi->Fill(foundObject.phi());
-        //}
-        if(foundObject.id() == 87){
-          h_triggerMetPt->Fill(foundObject.pt());
-          h_triggerMetPhi->Fill(foundObject.phi());
-        }
-        if(foundObject.id() == 89){
-          h_triggerHT->Fill(foundObject.pt());
-        }
+  if (!(filterIndex >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndex);
+    for (size_t j = 0; j < keys.size(); ++j) {
+      trigger::TriggerObject foundObject = triggerObjects[keys[j]];
+      // if(foundObject.id() == 85 && foundObject.pt() > 40.0 &&
+      // fabs(foundObject.eta()) < 3.0){
+      //  h_triggerJetPt->Fill(foundObject.pt());
+      //  h_triggerJetEta->Fill(foundObject.eta());
+      //  h_triggerJetPhi->Fill(foundObject.phi());
+      //}
+      if (foundObject.id() == 87) {
+        h_triggerMetPt->Fill(foundObject.pt());
+        h_triggerMetPhi->Fill(foundObject.phi());
+      }
+      if (foundObject.id() == 89) {
+        h_triggerHT->Fill(foundObject.pt());
       }
     }
+  }
 
-  bool hasFired = false, hasFiredAuxiliaryForHadronicLeg=false;
-  const edm::TriggerNames& trigNames = e.triggerNames(*hltresults);
+  bool hasFired = false, hasFiredAuxiliaryForHadronicLeg = false;
+  const edm::TriggerNames &trigNames = e.triggerNames(*hltresults);
   unsigned int numTriggers = trigNames.size();
-  for( unsigned int hltIndex=0; hltIndex<numTriggers; ++hltIndex ){
-    if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFired = true;
-    if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForHadronic_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFiredAuxiliaryForHadronicLeg = true;
+  for (unsigned int hltIndex = 0; hltIndex < numTriggers; ++hltIndex) {
+    if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) &&
+        hltresults->accept(hltIndex))
+      hasFired = true;
+    if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForHadronic_) != std::string::npos &&
+        hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex))
+      hasFiredAuxiliaryForHadronicLeg = true;
   }
 
-  if(hasFiredAuxiliaryForHadronicLeg || !e.isRealData()) {
+  if (hasFiredAuxiliaryForHadronicLeg || !e.isRealData()) {
     float caloHT = 0.0;
     float pfHT = 0.0;
-    for (reco::PFJetCollection::const_iterator i_pfjet = pfJetCollection->begin(); i_pfjet != pfJetCollection->end(); ++i_pfjet){
-      if (i_pfjet->pt() < ptThrJet_) continue;
-      if (fabs(i_pfjet->eta()) > etaThrJet_) continue;
+    for (reco::PFJetCollection::const_iterator i_pfjet = pfJetCollection->begin(); i_pfjet != pfJetCollection->end();
+         ++i_pfjet) {
+      if (i_pfjet->pt() < ptThrJet_)
+        continue;
+      if (fabs(i_pfjet->eta()) > etaThrJet_)
+        continue;
       pfHT += i_pfjet->pt();
     }
 
-    if(hasFired){
-      for (reco::CaloJetCollection::const_iterator i_calojet = caloJetCollection->begin(); i_calojet != caloJetCollection->end(); ++i_calojet){
-        if (i_calojet->pt() < ptThrJet_) continue;
-        if (fabs(i_calojet->eta()) > etaThrJet_) continue;
-        h_caloJetPt ->Fill(i_calojet->pt());
-        h_caloJetEta ->Fill(i_calojet->eta());
-        h_caloJetPhi ->Fill(i_calojet->phi());
+    if (hasFired) {
+      for (reco::CaloJetCollection::const_iterator i_calojet = caloJetCollection->begin();
+           i_calojet != caloJetCollection->end();
+           ++i_calojet) {
+        if (i_calojet->pt() < ptThrJet_)
+          continue;
+        if (fabs(i_calojet->eta()) > etaThrJet_)
+          continue;
+        h_caloJetPt->Fill(i_calojet->pt());
+        h_caloJetEta->Fill(i_calojet->eta());
+        h_caloJetPhi->Fill(i_calojet->phi());
         caloHT += i_calojet->pt();
       }
-      for (reco::PFJetCollection::const_iterator i_pfjet = pfJetCollection->begin(); i_pfjet != pfJetCollection->end(); ++i_pfjet){
-        if (i_pfjet->pt() < ptThrJet_) continue;
-        if (fabs(i_pfjet->eta()) > etaThrJet_) continue;
-        h_pfJetPt ->Fill(i_pfjet->pt());
-        h_pfJetEta ->Fill(i_pfjet->eta());
-        h_pfJetPhi ->Fill(i_pfjet->phi());
+      for (reco::PFJetCollection::const_iterator i_pfjet = pfJetCollection->begin(); i_pfjet != pfJetCollection->end();
+           ++i_pfjet) {
+        if (i_pfjet->pt() < ptThrJet_)
+          continue;
+        if (fabs(i_pfjet->eta()) > etaThrJet_)
+          continue;
+        h_pfJetPt->Fill(i_pfjet->pt());
+        h_pfJetEta->Fill(i_pfjet->eta());
+        h_pfJetPhi->Fill(i_pfjet->phi());
       }
-      h_pfMet -> Fill(pfMETCollection->begin()->et());
-      h_pfMetPhi -> Fill(pfMETCollection->begin()->phi());
-      h_pfHT -> Fill(pfHT);
-      h_caloHT -> Fill(caloHT);
+      h_pfMet->Fill(pfMETCollection->begin()->et());
+      h_pfMetPhi->Fill(pfMETCollection->begin()->phi());
+      h_pfHT->Fill(pfHT);
+      h_caloHT->Fill(caloHT);
 
-      h_pfMetTurnOn_num -> Fill(pfMETCollection->begin()->et());
-      h_pfHTTurnOn_num -> Fill(pfHT);
+      h_pfMetTurnOn_num->Fill(pfMETCollection->begin()->et());
+      h_pfHTTurnOn_num->Fill(pfHT);
     }
-    //fill denominator histograms for all events, used for turn on curves
-    h_pfMetTurnOn_den -> Fill(pfMETCollection->begin()->et());
-    h_pfHTTurnOn_den -> Fill(pfHT);
+    // fill denominator histograms for all events, used for turn on curves
+    h_pfMetTurnOn_den->Fill(pfMETCollection->begin()->et());
+    h_pfHTTurnOn_den->Fill(pfHT);
   }
 }
 
-
-
-
-void SUSY_HLT_InclusiveHT::endRun(edm::Run const& run, edm::EventSetup const& eSetup)
-{
+void SUSY_HLT_InclusiveHT::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_InclusiveHT") << "SUSY_HLT_InclusiveHT::endRun" << std::endl;
 }
 
-void SUSY_HLT_InclusiveHT::bookHistos(DQMStore::IBooker & ibooker_)
-{
+void SUSY_HLT_InclusiveHT::bookHistos(DQMStore::IBooker &ibooker_) {
   ibooker_.cd();
   ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
 
-  //offline quantities
-  h_pfMet = ibooker_.book1D("pfMet", "PF Missing E_{T}; GeV", 20, 0.0, 500.0 );
-  h_pfMetPhi = ibooker_.book1D("pfMetPhi", "PF MET Phi", 20, -3.5, 3.5 );
+  // offline quantities
+  h_pfMet = ibooker_.book1D("pfMet", "PF Missing E_{T}; GeV", 20, 0.0, 500.0);
+  h_pfMetPhi = ibooker_.book1D("pfMetPhi", "PF MET Phi", 20, -3.5, 3.5);
   h_pfHT = ibooker_.book1D("pfHT", "PF H_{T}; GeV", 30, 0.0, 1500.0);
   h_caloHT = ibooker_.book1D("caloHT", "Calo H_{T}; GeV", 30, 0.0, 1500.0);
-  h_pfJetPt = ibooker_.book1D("pfJetPt", "PFJet P_{T}; GeV", 20, 0.0, 500.0 );
-  h_pfJetEta = ibooker_.book1D("pfJetEta", "PFJet Eta", 20, -3.0, 3.0 );
-  h_pfJetPhi = ibooker_.book1D("pfJetPhi", "PFJet Phi", 20, -3.5, 3.5 );
-  h_caloJetPt = ibooker_.book1D("caloJetPt", "CaloJet P_{T}; GeV", 20, 0.0, 500.0 );
-  h_caloJetEta = ibooker_.book1D("caloJetEta", "CaloJet Eta", 20, -3.0, 3.0 );
-  h_caloJetPhi = ibooker_.book1D("caloJetPhi", "CaloJet Phi", 20, -3.5, 3.5 );
-
-  //online quantities 
-  //h_triggerJetPt = ibooker_.book1D("triggerJetPt", "Trigger Jet Pt; GeV", 20, 0.0, 500.0);
-  //h_triggerJetEta = ibooker_.book1D("triggerJetEta", "Trigger Jet Eta", 20, -3.0, 3.0);
-  //h_triggerJetPhi = ibooker_.book1D("triggerJetPhi", "Trigger Jet Phi", 20, -3.5, 3.5);
+  h_pfJetPt = ibooker_.book1D("pfJetPt", "PFJet P_{T}; GeV", 20, 0.0, 500.0);
+  h_pfJetEta = ibooker_.book1D("pfJetEta", "PFJet Eta", 20, -3.0, 3.0);
+  h_pfJetPhi = ibooker_.book1D("pfJetPhi", "PFJet Phi", 20, -3.5, 3.5);
+  h_caloJetPt = ibooker_.book1D("caloJetPt", "CaloJet P_{T}; GeV", 20, 0.0, 500.0);
+  h_caloJetEta = ibooker_.book1D("caloJetEta", "CaloJet Eta", 20, -3.0, 3.0);
+  h_caloJetPhi = ibooker_.book1D("caloJetPhi", "CaloJet Phi", 20, -3.5, 3.5);
+
+  // online quantities
+  // h_triggerJetPt = ibooker_.book1D("triggerJetPt", "Trigger Jet Pt; GeV", 20,
+  // 0.0, 500.0); h_triggerJetEta = ibooker_.book1D("triggerJetEta", "Trigger
+  // Jet Eta", 20, -3.0, 3.0); h_triggerJetPhi =
+  // ibooker_.book1D("triggerJetPhi", "Trigger Jet Phi", 20, -3.5, 3.5);
   h_triggerMetPt = ibooker_.book1D("triggerMetPt", "Trigger Met Pt; GeV", 20, 0.0, 500.0);
   h_triggerMetPhi = ibooker_.book1D("triggerMetPhi", "Trigger Met Phi", 20, -3.5, 3.5);
   h_triggerHT = ibooker_.book1D("triggerHT", "Trigger HT; GeV", 30, 0.0, 1500.0);
 
-  //num and den hists to be divided in harvesting step to make turn on curves
-  h_pfMetTurnOn_num = ibooker_.book1D("pfMetTurnOn_num", "PF MET Turn On Numerator", 20, 0.0, 500.0 );
-  h_pfMetTurnOn_den = ibooker_.book1D("pfMetTurnOn_den", "PF MET Turn OnDenominator", 20, 0.0, 500.0 );
-  h_pfHTTurnOn_num = ibooker_.book1D("pfHTTurnOn_num", "PF HT Turn On Numerator", 30, 0.0, 1500.0 );
-  h_pfHTTurnOn_den = ibooker_.book1D("pfHTTurnOn_den", "PF HT Turn On Denominator", 30, 0.0, 1500.0 );
+  // num and den hists to be divided in harvesting step to make turn on curves
+  h_pfMetTurnOn_num = ibooker_.book1D("pfMetTurnOn_num", "PF MET Turn On Numerator", 20, 0.0, 500.0);
+  h_pfMetTurnOn_den = ibooker_.book1D("pfMetTurnOn_den", "PF MET Turn OnDenominator", 20, 0.0, 500.0);
+  h_pfHTTurnOn_num = ibooker_.book1D("pfHTTurnOn_num", "PF HT Turn On Numerator", 30, 0.0, 1500.0);
+  h_pfHTTurnOn_den = ibooker_.book1D("pfHTTurnOn_den", "PF HT Turn On Denominator", 30, 0.0, 1500.0);
 
   ibooker_.cd();
 }
 
- //define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SUSY_HLT_InclusiveHT);
diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuEle_Hadronic.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuEle_Hadronic.cc
index acd40c08f563a..a050736a9d956 100644
--- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuEle_Hadronic.cc
+++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuEle_Hadronic.cc
@@ -1,298 +1,310 @@
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Common/interface/TriggerNames.h"
 #include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/HLTReco/interface/TriggerTypeDefs.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
+#include "FWCore/Common/interface/TriggerNames.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuEle_Hadronic.h"
 
-SUSY_HLT_MuEle_Hadronic::SUSY_HLT_MuEle_Hadronic(const edm::ParameterSet& ps)
-{
-    edm::LogInfo("SUSY_HLT_MuEle_Hadronic") << "Constructor SUSY_HLT_MuEle_Hadronic::SUSY_HLT_MuEle_Hadronic " << std::endl;
-    // Get parameters from configuration file
-    theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
-    theMuonCollection_ = consumes<reco::MuonCollection>(ps.getParameter<edm::InputTag>("MuonCollection"));
-    theElectronCollection_ = consumes<reco::GsfElectronCollection>(ps.getParameter<edm::InputTag>("ElectronCollection"));
-    thePfJetCollection_ = consumes<reco::PFJetCollection>(ps.getParameter<edm::InputTag>("pfJetCollection"));
-    theCaloJetCollection_ = consumes<reco::CaloJetCollection>(ps.getParameter<edm::InputTag>("caloJetCollection"));
-    triggerResults_ = consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>("TriggerResults"));
-    HLTProcess_ = ps.getParameter<std::string>("HLTProcess");
-    triggerPath_ = ps.getParameter<std::string>("TriggerPath");
-    triggerPathAuxiliaryForMuEle_ = ps.getParameter<std::string>("TriggerPathAuxiliaryForMuEle");
-    triggerPathAuxiliaryForHadronic_ = ps.getParameter<std::string>("TriggerPathAuxiliaryForHadronic");
-    triggerFilter_ = ps.getParameter<edm::InputTag>("TriggerFilter");
-    ptThrJet_ = ps.getUntrackedParameter<double>("PtThrJet");
-    etaThrJet_ = ps.getUntrackedParameter<double>("EtaThrJet");
+SUSY_HLT_MuEle_Hadronic::SUSY_HLT_MuEle_Hadronic(const edm::ParameterSet &ps) {
+  edm::LogInfo("SUSY_HLT_MuEle_Hadronic")
+      << "Constructor SUSY_HLT_MuEle_Hadronic::SUSY_HLT_MuEle_Hadronic " << std::endl;
+  // Get parameters from configuration file
+  theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
+  theMuonCollection_ = consumes<reco::MuonCollection>(ps.getParameter<edm::InputTag>("MuonCollection"));
+  theElectronCollection_ = consumes<reco::GsfElectronCollection>(ps.getParameter<edm::InputTag>("ElectronCollection"));
+  thePfJetCollection_ = consumes<reco::PFJetCollection>(ps.getParameter<edm::InputTag>("pfJetCollection"));
+  theCaloJetCollection_ = consumes<reco::CaloJetCollection>(ps.getParameter<edm::InputTag>("caloJetCollection"));
+  triggerResults_ = consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>("TriggerResults"));
+  HLTProcess_ = ps.getParameter<std::string>("HLTProcess");
+  triggerPath_ = ps.getParameter<std::string>("TriggerPath");
+  triggerPathAuxiliaryForMuEle_ = ps.getParameter<std::string>("TriggerPathAuxiliaryForMuEle");
+  triggerPathAuxiliaryForHadronic_ = ps.getParameter<std::string>("TriggerPathAuxiliaryForHadronic");
+  triggerFilter_ = ps.getParameter<edm::InputTag>("TriggerFilter");
+  ptThrJet_ = ps.getUntrackedParameter<double>("PtThrJet");
+  etaThrJet_ = ps.getUntrackedParameter<double>("EtaThrJet");
 }
 
-SUSY_HLT_MuEle_Hadronic::~SUSY_HLT_MuEle_Hadronic()
-{
-    edm::LogInfo("SUSY_HLT_MuEle_Hadronic") << "Destructor SUSY_HLT_MuEle_Hadronic::~SUSY_HLT_MuEle_Hadronic " << std::endl;
+SUSY_HLT_MuEle_Hadronic::~SUSY_HLT_MuEle_Hadronic() {
+  edm::LogInfo("SUSY_HLT_MuEle_Hadronic")
+      << "Destructor SUSY_HLT_MuEle_Hadronic::~SUSY_HLT_MuEle_Hadronic " << std::endl;
 }
 
-void SUSY_HLT_MuEle_Hadronic::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e)
-{
-    
-    bool changed;
-    
-    if (!fHltConfig.init(run, e, HLTProcess_, changed)) {
-        edm::LogError("SUSY_HLT_MuEle_Hadronic") << "Initialization of HLTConfigProvider failed!!";
-        return;
-    }
-    
-    bool pathFound = false;
-    const std::vector<std::string> allTrigNames = fHltConfig.triggerNames();
-    for(size_t j = 0; j <allTrigNames.size(); ++j) {
-        if(allTrigNames[j].find(triggerPath_) != std::string::npos) {
-            pathFound = true;
-        }
-    }
-    
-    if(!pathFound) {
-        LogDebug("SUSY_HLT_MuEle_Hadronic") << "Path not found" << "\n";
-        return;
+void SUSY_HLT_MuEle_Hadronic::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e) {
+  bool changed;
+
+  if (!fHltConfig.init(run, e, HLTProcess_, changed)) {
+    edm::LogError("SUSY_HLT_MuEle_Hadronic") << "Initialization of HLTConfigProvider failed!!";
+    return;
+  }
+
+  bool pathFound = false;
+  const std::vector<std::string> allTrigNames = fHltConfig.triggerNames();
+  for (size_t j = 0; j < allTrigNames.size(); ++j) {
+    if (allTrigNames[j].find(triggerPath_) != std::string::npos) {
+      pathFound = true;
     }
-    //std::vector<std::string> filtertags = fHltConfig.moduleLabels( triggerPath_ );
-    //triggerFilter_ = edm::InputTag(filtertags[filtertags.size()-1],"",fHltConfig.processName());
-    //triggerFilter_ = edm::InputTag("hltPFMET120Mu5L3PreFiltered", "", fHltConfig.processName());
-    
-    edm::LogInfo("SUSY_HLT_MuEle_Hadronic") << "SUSY_HLT_MuEle_Hadronic::beginRun" << std::endl;
+  }
+
+  if (!pathFound) {
+    LogDebug("SUSY_HLT_MuEle_Hadronic") << "Path not found"
+                                        << "\n";
+    return;
+  }
+  // std::vector<std::string> filtertags = fHltConfig.moduleLabels( triggerPath_
+  // ); triggerFilter_ =
+  // edm::InputTag(filtertags[filtertags.size()-1],"",fHltConfig.processName());
+  // triggerFilter_ = edm::InputTag("hltPFMET120Mu5L3PreFiltered", "",
+  // fHltConfig.processName());
+
+  edm::LogInfo("SUSY_HLT_MuEle_Hadronic") << "SUSY_HLT_MuEle_Hadronic::beginRun" << std::endl;
 }
 
-void SUSY_HLT_MuEle_Hadronic::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run const &, edm::EventSetup const &)
-{
-    edm::LogInfo("SUSY_HLT_MuEle_Hadronic") << "SUSY_HLT_MuEle_Hadronic::bookHistograms" << std::endl;
-    //book at beginRun
-    bookHistos(ibooker_);
+void SUSY_HLT_MuEle_Hadronic::bookHistograms(DQMStore::IBooker &ibooker_, edm::Run const &, edm::EventSetup const &) {
+  edm::LogInfo("SUSY_HLT_MuEle_Hadronic") << "SUSY_HLT_MuEle_Hadronic::bookHistograms" << std::endl;
+  // book at beginRun
+  bookHistos(ibooker_);
 }
 
+void SUSY_HLT_MuEle_Hadronic::analyze(edm::Event const &e, edm::EventSetup const &eSetup) {
+  edm::LogInfo("SUSY_HLT_MuEle_Hadronic") << "SUSY_HLT_MuEle_Hadronic::analyze" << std::endl;
 
+  //-------------------------------
+  //--- Jets
+  //-------------------------------
+  edm::Handle<reco::PFJetCollection> pfJetCollection;
+  e.getByToken(thePfJetCollection_, pfJetCollection);
+  if (!pfJetCollection.isValid()) {
+    edm::LogError("SUSY_HLT_MuEle_Hadronic") << "invalid collection: PFJets"
+                                             << "\n";
+    return;
+  }
+  edm::Handle<reco::CaloJetCollection> caloJetCollection;
+  e.getByToken(theCaloJetCollection_, caloJetCollection);
+  if (!caloJetCollection.isValid()) {
+    edm::LogError("SUSY_HLT_MuEle_Hadronic") << "invalid collection: CaloJets"
+                                             << "\n";
+    return;
+  }
 
+  //-------------------------------
+  //--- Muon
+  //-------------------------------
+  edm::Handle<reco::MuonCollection> MuonCollection;
+  e.getByToken(theMuonCollection_, MuonCollection);
+  if (!MuonCollection.isValid()) {
+    edm::LogError("SUSY_HLT_MuEle_Hadronic") << "invalid collection: Muons "
+                                             << "\n";
+    return;
+  }
 
-void SUSY_HLT_MuEle_Hadronic::analyze(edm::Event const& e, edm::EventSetup const& eSetup){
-    edm::LogInfo("SUSY_HLT_MuEle_Hadronic") << "SUSY_HLT_MuEle_Hadronic::analyze" << std::endl;
-    
-    //-------------------------------
-    //--- Jets
-    //-------------------------------
-    edm::Handle<reco::PFJetCollection> pfJetCollection;
-    e.getByToken (thePfJetCollection_,pfJetCollection);
-    if ( !pfJetCollection.isValid() ){
-        edm::LogError ("SUSY_HLT_MuEle_Hadronic") << "invalid collection: PFJets" << "\n";
-        return;
-    }
-    edm::Handle<reco::CaloJetCollection> caloJetCollection;
-    e.getByToken (theCaloJetCollection_,caloJetCollection);
-    if ( !caloJetCollection.isValid() ){
-        edm::LogError ("SUSY_HLT_MuEle_Hadronic") << "invalid collection: CaloJets" << "\n";
-        return;
-    }
-    
-    //-------------------------------
-    //--- Muon
-    //-------------------------------
-    edm::Handle<reco::MuonCollection> MuonCollection;
-    e.getByToken (theMuonCollection_, MuonCollection);
-    if ( !MuonCollection.isValid() ){
-        edm::LogError ("SUSY_HLT_MuEle_Hadronic") << "invalid collection: Muons " << "\n";
-        return;
-    }
-    
-    //-------------------------------
-    //--- Electron
-    //-------------------------------
-    edm::Handle<reco::GsfElectronCollection> ElectronCollection;
-    e.getByToken (theElectronCollection_, ElectronCollection);
-    if ( !ElectronCollection.isValid() ){
-        edm::LogError ("SUSY_HLT_MuEle_Hadronic") << "invalid collection: Electrons " << "\n";
-        return;
-    }
-    
-    //-------------------------------
-    //--- Trigger
-    //-------------------------------
-    edm::Handle<edm::TriggerResults> hltresults;
-    e.getByToken(triggerResults_,hltresults);
-    if(!hltresults.isValid()){
-        edm::LogError ("SUSY_HLT_MuEle_Hadronic") << "invalid collection: TriggerResults" << "\n";
-        return;
-    }
-    edm::Handle<trigger::TriggerEvent> triggerSummary;
-    e.getByToken(theTrigSummary_, triggerSummary);
-    if(!triggerSummary.isValid()) {
-        edm::LogError ("SUSY_HLT_MuEle_Hadronic") << "invalid collection: TriggerSummary" << "\n";
-        return;
-    }
-   
-    
-    //get online objects
-    std::vector<float> ptMuon, etaMuon, phiMuon, ptElectron, etaElectron, phiElectron;
-    size_t filterIndexEle = triggerSummary->filterIndex( triggerFilter_ );
-    trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
-    if( !(filterIndexEle >= triggerSummary->sizeFilters()) ){
-        const trigger::Keys& keys = triggerSummary->filterKeys( filterIndexEle );
-        for( size_t j = 0; j < keys.size(); ++j ){
-            trigger::TriggerObject foundObject = triggerObjects[keys[j]];
-            if(foundObject.id()==trigger::TriggerElectron){ //It's an electron
-                	
-		bool same= false;
-		for(unsigned int x=0;x<ptElectron.size();x++){
-			if(fabs(ptElectron[x] - foundObject.pt()) < 0.01 || fabs(etaElectron[x] - foundObject.eta()) < 0.001 || fabs(phiElectron[x] - foundObject.phi()) < 0.001)
-				same = true;
-		}
-		
-		if(!same){	
-			h_triggerElePt->Fill(foundObject.pt());
-                	h_triggerEleEta->Fill(foundObject.eta());
-                	h_triggerElePhi->Fill(foundObject.phi());
-                	ptElectron.push_back(foundObject.pt());
-                	etaElectron.push_back(foundObject.eta());
-                	phiElectron.push_back(foundObject.phi());
-			}
-            }
-	    if(foundObject.id()==trigger::TriggerMuon){ //It's a muon
-                	
-		bool same= false;
-		for(unsigned int x=0;x<ptMuon.size();x++){
-			if(fabs(ptMuon[x] - foundObject.pt()) < 0.01)
-				same = true;
-		}
-		
-		if(!same){
-			h_triggerMuPt->Fill(foundObject.pt());
-                	h_triggerMuEta->Fill(foundObject.eta());
-                	h_triggerMuPhi->Fill(foundObject.phi());
-                	ptMuon.push_back(foundObject.pt());
-                	etaMuon.push_back(foundObject.eta());
-                	phiMuon.push_back(foundObject.phi());
-			}
-            }
+  //-------------------------------
+  //--- Electron
+  //-------------------------------
+  edm::Handle<reco::GsfElectronCollection> ElectronCollection;
+  e.getByToken(theElectronCollection_, ElectronCollection);
+  if (!ElectronCollection.isValid()) {
+    edm::LogError("SUSY_HLT_MuEle_Hadronic") << "invalid collection: Electrons "
+                                             << "\n";
+    return;
+  }
 
+  //-------------------------------
+  //--- Trigger
+  //-------------------------------
+  edm::Handle<edm::TriggerResults> hltresults;
+  e.getByToken(triggerResults_, hltresults);
+  if (!hltresults.isValid()) {
+    edm::LogError("SUSY_HLT_MuEle_Hadronic") << "invalid collection: TriggerResults"
+                                             << "\n";
+    return;
+  }
+  edm::Handle<trigger::TriggerEvent> triggerSummary;
+  e.getByToken(theTrigSummary_, triggerSummary);
+  if (!triggerSummary.isValid()) {
+    edm::LogError("SUSY_HLT_MuEle_Hadronic") << "invalid collection: TriggerSummary"
+                                             << "\n";
+    return;
+  }
+
+  // get online objects
+  std::vector<float> ptMuon, etaMuon, phiMuon, ptElectron, etaElectron, phiElectron;
+  size_t filterIndexEle = triggerSummary->filterIndex(triggerFilter_);
+  trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
+  if (!(filterIndexEle >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndexEle);
+    for (size_t j = 0; j < keys.size(); ++j) {
+      trigger::TriggerObject foundObject = triggerObjects[keys[j]];
+      if (foundObject.id() == trigger::TriggerElectron) {  // It's an electron
+
+        bool same = false;
+        for (unsigned int x = 0; x < ptElectron.size(); x++) {
+          if (fabs(ptElectron[x] - foundObject.pt()) < 0.01 || fabs(etaElectron[x] - foundObject.eta()) < 0.001 ||
+              fabs(phiElectron[x] - foundObject.phi()) < 0.001)
+            same = true;
         }
-        
-    }
-	
-	if (!ptMuon.empty() && !ptElectron.empty()) {
-        math::PtEtaPhiMLorentzVectorD* mu1 = new math::PtEtaPhiMLorentzVectorD(ptMuon[0],etaMuon[0],phiMuon[0],0.106);
-        math::PtEtaPhiMLorentzVectorD* ele2 = new math::PtEtaPhiMLorentzVectorD(ptElectron[0],etaElectron[0],phiElectron[0],0.0005);
-        (*mu1)+=(*ele2);
-        h_triggerMuEleMass->Fill(mu1->M());
-        delete mu1;
-        delete ele2;
-    } else {
-        h_triggerMuEleMass->Fill(-1.);
-    }
-    
-    
-    bool hasFired = false;
-    bool hasFiredAuxiliaryForMuEleLeg = false;
-    bool hasFiredAuxiliaryForHadronicLeg = false;
-    const edm::TriggerNames& trigNames = e.triggerNames(*hltresults);
-    unsigned int numTriggers = trigNames.size();
-    for( unsigned int hltIndex=0; hltIndex<numTriggers; ++hltIndex ){
-        if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFired = true;
-        if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForMuEle_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFiredAuxiliaryForMuEleLeg = true;
-        if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForHadronic_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFiredAuxiliaryForHadronicLeg = true;
-    }
-    
-    
-    
-    if(hasFiredAuxiliaryForMuEleLeg || hasFiredAuxiliaryForHadronicLeg) {
-        
-        //Matching the muon
-        int indexOfMatchedMuEle[2] = {-1};
-        int matchedCounter = 0;
-        int offlineCounter = 0;
-        for(reco::MuonCollection::const_iterator muon = MuonCollection->begin(); (muon != MuonCollection->end() && matchedCounter < 1) ; ++muon) {
-            for(size_t off_i = 0; off_i < ptMuon.size(); ++off_i) {
-                if(sqrt((muon->phi()-phiMuon[off_i])*(muon->phi()-phiMuon[off_i]) + (muon->eta()-etaMuon[off_i])*(muon->eta()-etaMuon[off_i])) < 0.5) {
-                    indexOfMatchedMuEle[matchedCounter] = offlineCounter;
-                    matchedCounter++;
-                    break;
-                }
-            }
-            offlineCounter++;
-        }
-		
-        for(reco::GsfElectronCollection::const_iterator electron = ElectronCollection->begin(); (electron != ElectronCollection->end() && matchedCounter < 2) ; ++electron) {
-            for(size_t off_i = 0; off_i < ptElectron.size(); ++off_i) {
-                if(sqrt((electron->phi()-phiElectron[off_i])*(electron->phi()-phiElectron[off_i]) + (electron->eta()-etaElectron[off_i])*(electron->eta()-etaElectron[off_i])) < 0.5) {
-                    indexOfMatchedMuEle[matchedCounter] = offlineCounter;
-                    matchedCounter++;
-                    break;
-                }
-            }
-            offlineCounter++;
+
+        if (!same) {
+          h_triggerElePt->Fill(foundObject.pt());
+          h_triggerEleEta->Fill(foundObject.eta());
+          h_triggerElePhi->Fill(foundObject.phi());
+          ptElectron.push_back(foundObject.pt());
+          etaElectron.push_back(foundObject.eta());
+          phiElectron.push_back(foundObject.phi());
         }
-        
-        float caloHT = 0.0;
-        float pfHT = 0.0;
-        for (reco::PFJetCollection::const_iterator i_pfjet = pfJetCollection->begin(); i_pfjet != pfJetCollection->end(); ++i_pfjet){
-            if (i_pfjet->pt() < ptThrJet_) continue;
-            if (fabs(i_pfjet->eta()) > etaThrJet_) continue;
-            pfHT += i_pfjet->pt();
+      }
+      if (foundObject.id() == trigger::TriggerMuon) {  // It's a muon
+
+        bool same = false;
+        for (unsigned int x = 0; x < ptMuon.size(); x++) {
+          if (fabs(ptMuon[x] - foundObject.pt()) < 0.01)
+            same = true;
         }
-        for (reco::CaloJetCollection::const_iterator i_calojet = caloJetCollection->begin(); i_calojet != caloJetCollection->end(); ++i_calojet){
-            if (i_calojet->pt() < ptThrJet_) continue;
-            if (fabs(i_calojet->eta()) > etaThrJet_) continue;
-            caloHT += i_calojet->pt();
+
+        if (!same) {
+          h_triggerMuPt->Fill(foundObject.pt());
+          h_triggerMuEta->Fill(foundObject.eta());
+          h_triggerMuPhi->Fill(foundObject.phi());
+          ptMuon.push_back(foundObject.pt());
+          etaMuon.push_back(foundObject.eta());
+          phiMuon.push_back(foundObject.phi());
         }
-        
-        if(hasFiredAuxiliaryForMuEleLeg && !MuonCollection->empty() && !ElectronCollection->empty()) {
-		     if(hasFired && indexOfMatchedMuEle[1] >= 0 && indexOfMatchedMuEle[0] >= 0) { //check that ele is there too
-			    h_EleTurnOn_num-> Fill(ElectronCollection->at(indexOfMatchedMuEle[1]).pt());
-                h_MuTurnOn_num-> Fill(MuonCollection->at(indexOfMatchedMuEle[0]).pt());
-            }
-            h_MuTurnOn_den-> Fill(MuonCollection->at(0).pt());
-            h_EleTurnOn_den-> Fill(ElectronCollection->at(0).pt());
+      }
+    }
+  }
+
+  if (!ptMuon.empty() && !ptElectron.empty()) {
+    math::PtEtaPhiMLorentzVectorD *mu1 = new math::PtEtaPhiMLorentzVectorD(ptMuon[0], etaMuon[0], phiMuon[0], 0.106);
+    math::PtEtaPhiMLorentzVectorD *ele2 =
+        new math::PtEtaPhiMLorentzVectorD(ptElectron[0], etaElectron[0], phiElectron[0], 0.0005);
+    (*mu1) += (*ele2);
+    h_triggerMuEleMass->Fill(mu1->M());
+    delete mu1;
+    delete ele2;
+  } else {
+    h_triggerMuEleMass->Fill(-1.);
+  }
+
+  bool hasFired = false;
+  bool hasFiredAuxiliaryForMuEleLeg = false;
+  bool hasFiredAuxiliaryForHadronicLeg = false;
+  const edm::TriggerNames &trigNames = e.triggerNames(*hltresults);
+  unsigned int numTriggers = trigNames.size();
+  for (unsigned int hltIndex = 0; hltIndex < numTriggers; ++hltIndex) {
+    if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) &&
+        hltresults->accept(hltIndex))
+      hasFired = true;
+    if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForMuEle_) != std::string::npos &&
+        hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex))
+      hasFiredAuxiliaryForMuEleLeg = true;
+    if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForHadronic_) != std::string::npos &&
+        hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex))
+      hasFiredAuxiliaryForHadronicLeg = true;
+  }
+
+  if (hasFiredAuxiliaryForMuEleLeg || hasFiredAuxiliaryForHadronicLeg) {
+    // Matching the muon
+    int indexOfMatchedMuEle[2] = {-1};
+    int matchedCounter = 0;
+    int offlineCounter = 0;
+    for (reco::MuonCollection::const_iterator muon = MuonCollection->begin();
+         (muon != MuonCollection->end() && matchedCounter < 1);
+         ++muon) {
+      for (size_t off_i = 0; off_i < ptMuon.size(); ++off_i) {
+        if (sqrt((muon->phi() - phiMuon[off_i]) * (muon->phi() - phiMuon[off_i]) +
+                 (muon->eta() - etaMuon[off_i]) * (muon->eta() - etaMuon[off_i])) < 0.5) {
+          indexOfMatchedMuEle[matchedCounter] = offlineCounter;
+          matchedCounter++;
+          break;
         }
-		
-        if(hasFiredAuxiliaryForHadronicLeg) {
-            if(hasFired) {
-                h_pfHTTurnOn_num-> Fill(pfHT);
-            }
-            h_pfHTTurnOn_den-> Fill(pfHT);
+      }
+      offlineCounter++;
+    }
+
+    for (reco::GsfElectronCollection::const_iterator electron = ElectronCollection->begin();
+         (electron != ElectronCollection->end() && matchedCounter < 2);
+         ++electron) {
+      for (size_t off_i = 0; off_i < ptElectron.size(); ++off_i) {
+        if (sqrt((electron->phi() - phiElectron[off_i]) * (electron->phi() - phiElectron[off_i]) +
+                 (electron->eta() - etaElectron[off_i]) * (electron->eta() - etaElectron[off_i])) < 0.5) {
+          indexOfMatchedMuEle[matchedCounter] = offlineCounter;
+          matchedCounter++;
+          break;
         }
+      }
+      offlineCounter++;
     }
-}
 
+    float caloHT = 0.0;
+    float pfHT = 0.0;
+    for (reco::PFJetCollection::const_iterator i_pfjet = pfJetCollection->begin(); i_pfjet != pfJetCollection->end();
+         ++i_pfjet) {
+      if (i_pfjet->pt() < ptThrJet_)
+        continue;
+      if (fabs(i_pfjet->eta()) > etaThrJet_)
+        continue;
+      pfHT += i_pfjet->pt();
+    }
+    for (reco::CaloJetCollection::const_iterator i_calojet = caloJetCollection->begin();
+         i_calojet != caloJetCollection->end();
+         ++i_calojet) {
+      if (i_calojet->pt() < ptThrJet_)
+        continue;
+      if (fabs(i_calojet->eta()) > etaThrJet_)
+        continue;
+      caloHT += i_calojet->pt();
+    }
 
+    if (hasFiredAuxiliaryForMuEleLeg && !MuonCollection->empty() && !ElectronCollection->empty()) {
+      if (hasFired && indexOfMatchedMuEle[1] >= 0 && indexOfMatchedMuEle[0] >= 0) {  // check that ele is there too
+        h_EleTurnOn_num->Fill(ElectronCollection->at(indexOfMatchedMuEle[1]).pt());
+        h_MuTurnOn_num->Fill(MuonCollection->at(indexOfMatchedMuEle[0]).pt());
+      }
+      h_MuTurnOn_den->Fill(MuonCollection->at(0).pt());
+      h_EleTurnOn_den->Fill(ElectronCollection->at(0).pt());
+    }
 
+    if (hasFiredAuxiliaryForHadronicLeg) {
+      if (hasFired) {
+        h_pfHTTurnOn_num->Fill(pfHT);
+      }
+      h_pfHTTurnOn_den->Fill(pfHT);
+    }
+  }
+}
 
-void SUSY_HLT_MuEle_Hadronic::endRun(edm::Run const& run, edm::EventSetup const& eSetup)
-{
-    edm::LogInfo("SUSY_HLT_MuEle_Hadronic") << "SUSY_HLT_MuEle_Hadronic::endRun" << std::endl;
+void SUSY_HLT_MuEle_Hadronic::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
+  edm::LogInfo("SUSY_HLT_MuEle_Hadronic") << "SUSY_HLT_MuEle_Hadronic::endRun" << std::endl;
 }
 
-void SUSY_HLT_MuEle_Hadronic::bookHistos(DQMStore::IBooker & ibooker_)
-{
-    ibooker_.cd();
-    ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
-    
-    //offline quantities
-    
-    //online quantities
-    h_triggerMuPt = ibooker_.book1D("triggerMuPt", "Trigger Muon Pt; GeV", 50, 0.0, 500.0);
-    h_triggerMuEta = ibooker_.book1D("triggerMuEta", "Trigger Muon Eta", 20, -3.0, 3.0);
-    h_triggerMuPhi = ibooker_.book1D("triggerMuPhi", "Trigger Muon Phi", 20, -3.5, 3.5);
-
-    h_triggerElePt = ibooker_.book1D("triggerElePt", "Trigger Electron Pt; GeV", 50, 0.0, 500.0);
-    h_triggerEleEta = ibooker_.book1D("triggerEleEta", "Trigger Electron Eta", 20, -3.0, 3.0);
-    h_triggerElePhi = ibooker_.book1D("triggerElePhi", "Trigger Electron Phi", 20, -3.5, 3.5);
-
-    h_triggerMuEleMass = ibooker_.book1D("triggerMuEleMass", "Trigger MuEle Mass", 202, -2, 200);
-
-    //num and den hists to be divided in harvesting step to make turn on curves
-    h_pfHTTurnOn_num = ibooker_.book1D("pfHTTurnOn_num", "PF HT Turn On Numerator", 30, 0.0, 1500.0 );
-    h_pfHTTurnOn_den = ibooker_.book1D("pfHTTurnOn_den", "PF HT Turn On Denominator", 30, 0.0, 1500.0 );
-    h_MuTurnOn_num = ibooker_.book1D("MuTurnOn_num", "Muon Turn On Numerator", 30, 0.0, 150 );
-    h_MuTurnOn_den = ibooker_.book1D("MuTurnOn_den", "Muon Turn On Denominator", 30, 0.0, 150.0 );
-    h_EleTurnOn_num = ibooker_.book1D("EleTurnOn_num", "Electron Turn On Numerator", 30, 0.0, 150 );
-    h_EleTurnOn_den = ibooker_.book1D("EleTurnOn_den", "Electron Turn On Denominator", 30, 0.0, 150.0 );
-    
-    ibooker_.cd();
+void SUSY_HLT_MuEle_Hadronic::bookHistos(DQMStore::IBooker &ibooker_) {
+  ibooker_.cd();
+  ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
+
+  // offline quantities
+
+  // online quantities
+  h_triggerMuPt = ibooker_.book1D("triggerMuPt", "Trigger Muon Pt; GeV", 50, 0.0, 500.0);
+  h_triggerMuEta = ibooker_.book1D("triggerMuEta", "Trigger Muon Eta", 20, -3.0, 3.0);
+  h_triggerMuPhi = ibooker_.book1D("triggerMuPhi", "Trigger Muon Phi", 20, -3.5, 3.5);
+
+  h_triggerElePt = ibooker_.book1D("triggerElePt", "Trigger Electron Pt; GeV", 50, 0.0, 500.0);
+  h_triggerEleEta = ibooker_.book1D("triggerEleEta", "Trigger Electron Eta", 20, -3.0, 3.0);
+  h_triggerElePhi = ibooker_.book1D("triggerElePhi", "Trigger Electron Phi", 20, -3.5, 3.5);
+
+  h_triggerMuEleMass = ibooker_.book1D("triggerMuEleMass", "Trigger MuEle Mass", 202, -2, 200);
+
+  // num and den hists to be divided in harvesting step to make turn on curves
+  h_pfHTTurnOn_num = ibooker_.book1D("pfHTTurnOn_num", "PF HT Turn On Numerator", 30, 0.0, 1500.0);
+  h_pfHTTurnOn_den = ibooker_.book1D("pfHTTurnOn_den", "PF HT Turn On Denominator", 30, 0.0, 1500.0);
+  h_MuTurnOn_num = ibooker_.book1D("MuTurnOn_num", "Muon Turn On Numerator", 30, 0.0, 150);
+  h_MuTurnOn_den = ibooker_.book1D("MuTurnOn_den", "Muon Turn On Denominator", 30, 0.0, 150.0);
+  h_EleTurnOn_num = ibooker_.book1D("EleTurnOn_num", "Electron Turn On Numerator", 30, 0.0, 150);
+  h_EleTurnOn_den = ibooker_.book1D("EleTurnOn_den", "Electron Turn On Denominator", 30, 0.0, 150.0);
+
+  ibooker_.cd();
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SUSY_HLT_MuEle_Hadronic);
diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuonFakes.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuonFakes.cc
index 15f1728ad075c..05ed1acfaab39 100644
--- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuonFakes.cc
+++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_MuonFakes.cc
@@ -1,13 +1,11 @@
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "FWCore/Common/interface/TriggerNames.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Common/interface/TriggerNames.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_MuonFakes.h"
 
-
-SUSY_HLT_MuonFakes::SUSY_HLT_MuonFakes(const edm::ParameterSet& ps)
-{
+SUSY_HLT_MuonFakes::SUSY_HLT_MuonFakes(const edm::ParameterSet &ps) {
   edm::LogInfo("SUSY_HLT_MuonFakes") << "Constructor SUSY_HLT_MuonFakes::SUSY_HLT_MuonFakes " << std::endl;
   // Get parameters from configuration file
   theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
@@ -17,16 +15,13 @@ SUSY_HLT_MuonFakes::SUSY_HLT_MuonFakes(const edm::ParameterSet& ps)
   triggerFilter_ = ps.getParameter<edm::InputTag>("TriggerFilter");
 }
 
-SUSY_HLT_MuonFakes::~SUSY_HLT_MuonFakes()
-{
-   edm::LogInfo("SUSY_HLT_MuonFakes") << "Destructor SUSY_HLT_MuonFakes::~SUSY_HLT_MuonFakes " << std::endl;
+SUSY_HLT_MuonFakes::~SUSY_HLT_MuonFakes() {
+  edm::LogInfo("SUSY_HLT_MuonFakes") << "Destructor SUSY_HLT_MuonFakes::~SUSY_HLT_MuonFakes " << std::endl;
 }
 
-void SUSY_HLT_MuonFakes::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e)
-{
- 
+void SUSY_HLT_MuonFakes::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e) {
   bool changed;
-  
+
   if (!fHltConfig.init(run, e, HLTProcess_, changed)) {
     edm::LogError("SUSY_HLT_MuonFakes") << "Initialization of HLTConfigProvider failed!!";
     return;
@@ -34,59 +29,56 @@ void SUSY_HLT_MuonFakes::dqmBeginRun(edm::Run const &run, edm::EventSetup const
 
   bool pathFound = false;
   const std::vector<std::string> allTrigNames = fHltConfig.triggerNames();
-  for(size_t j = 0; j <allTrigNames.size(); ++j) {
-    if(allTrigNames[j].find(triggerPath_) != std::string::npos) {
+  for (size_t j = 0; j < allTrigNames.size(); ++j) {
+    if (allTrigNames[j].find(triggerPath_) != std::string::npos) {
       pathFound = true;
     }
   }
 
-  if(!pathFound) {
-    edm::LogInfo ("SUSY_HLT_MuonFakes") << "Path not found" << "\n";
+  if (!pathFound) {
+    edm::LogInfo("SUSY_HLT_MuonFakes") << "Path not found"
+                                       << "\n";
     return;
   }
   edm::LogInfo("SUSY_HLT_MuonFakes") << "SUSY_HLT_MuonFakes::beginRun" << std::endl;
 }
 
- void SUSY_HLT_MuonFakes::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run const &, edm::EventSetup const &)
-{
+void SUSY_HLT_MuonFakes::bookHistograms(DQMStore::IBooker &ibooker_, edm::Run const &, edm::EventSetup const &) {
   edm::LogInfo("SUSY_HLT_MuonFakes") << "SUSY_HLT_MuonFakes::bookHistograms" << std::endl;
-  //book at beginRun
+  // book at beginRun
   bookHistos(ibooker_);
 }
 
-
-
-
-void SUSY_HLT_MuonFakes::analyze(edm::Event const& e, edm::EventSetup const& eSetup){
+void SUSY_HLT_MuonFakes::analyze(edm::Event const &e, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_MuonFakes") << "SUSY_HLT_MuonFakes::analyze" << std::endl;
 
-
   //-------------------------------
   //--- Trigger
   //-------------------------------
   edm::Handle<edm::TriggerResults> hltresults;
-  e.getByToken(triggerResults_,hltresults);
-  if(!hltresults.isValid()){
-    edm::LogError ("SUSY_HLT_MuonFakes") << "invalid collection: TriggerResults" << "\n";
+  e.getByToken(triggerResults_, hltresults);
+  if (!hltresults.isValid()) {
+    edm::LogError("SUSY_HLT_MuonFakes") << "invalid collection: TriggerResults"
+                                        << "\n";
     return;
   }
   edm::Handle<trigger::TriggerEvent> triggerSummary;
   e.getByToken(theTrigSummary_, triggerSummary);
-  if(!triggerSummary.isValid()) {
-    edm::LogError ("SUSY_HLT_MuonFakes") << "invalid collection: TriggerSummary" << "\n";
+  if (!triggerSummary.isValid()) {
+    edm::LogError("SUSY_HLT_MuonFakes") << "invalid collection: TriggerSummary"
+                                        << "\n";
     return;
   }
 
-
-  //get online objects
+  // get online objects
   std::vector<float> ptMuon, etaMuon, phiMuon;
-  size_t filterIndex = triggerSummary->filterIndex( triggerFilter_ );
+  size_t filterIndex = triggerSummary->filterIndex(triggerFilter_);
   trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
-  if( !(filterIndex >= triggerSummary->sizeFilters()) ){
-    const trigger::Keys& keys = triggerSummary->filterKeys( filterIndex );
-    for( size_t j = 0; j < keys.size(); ++j ){
+  if (!(filterIndex >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndex);
+    for (size_t j = 0; j < keys.size(); ++j) {
       trigger::TriggerObject foundObject = triggerObjects[keys[j]];
-      if(foundObject.id() == 13){ //Muons check number
+      if (foundObject.id() == 13) {  // Muons check number
         h_triggerMuPt->Fill(foundObject.pt());
         h_triggerMuEta->Fill(foundObject.eta());
         h_triggerMuPhi->Fill(foundObject.phi());
@@ -97,38 +89,32 @@ void SUSY_HLT_MuonFakes::analyze(edm::Event const& e, edm::EventSetup const& eSe
     }
   }
 
-
-//  bool hasFired = false;
-//  const edm::TriggerNames& trigNames = e.triggerNames(*hltresults);
-//  unsigned int numTriggers = trigNames.size();
-//  for( unsigned int hltIndex=0; hltIndex<numTriggers; ++hltIndex ){
-//    if (trigNames.triggerName(hltIndex)==triggerPath_ && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFired = true;
-//  }
-  
+  //  bool hasFired = false;
+  //  const edm::TriggerNames& trigNames = e.triggerNames(*hltresults);
+  //  unsigned int numTriggers = trigNames.size();
+  //  for( unsigned int hltIndex=0; hltIndex<numTriggers; ++hltIndex ){
+  //    if (trigNames.triggerName(hltIndex)==triggerPath_ &&
+  //    hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFired =
+  //    true;
+  //  }
 }
 
-
-
-
-void SUSY_HLT_MuonFakes::endRun(edm::Run const& run, edm::EventSetup const& eSetup)
-{
+void SUSY_HLT_MuonFakes::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_MuonFakes") << "SUSY_HLT_MuonFakes::endRun" << std::endl;
 }
 
-void SUSY_HLT_MuonFakes::bookHistos(DQMStore::IBooker & ibooker_)
-{
+void SUSY_HLT_MuonFakes::bookHistos(DQMStore::IBooker &ibooker_) {
   ibooker_.cd();
   ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
 
-  //online quantities 
-  h_triggerMuPt  = ibooker_.book1D("triggerMuPt",  "Trigger Mu Pt; GeV", 40, 0.0, 80.0);
+  // online quantities
+  h_triggerMuPt = ibooker_.book1D("triggerMuPt", "Trigger Mu Pt; GeV", 40, 0.0, 80.0);
   h_triggerMuEta = ibooker_.book1D("triggerMuEta", "Trigger Mu Eta", 20, -2.5, 2.5);
   h_triggerMuPhi = ibooker_.book1D("triggerMuPhi", "Trigger Mu Phi", 20, -3.5, 3.5);
 
-
-  //num and den hists to be divided in harvesting step to make turn on curves
+  // num and den hists to be divided in harvesting step to make turn on curves
   ibooker_.cd();
 }
 
- //define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SUSY_HLT_MuonFakes);
diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_BJet.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_BJet.cc
index 0d8ce6c1e3ed4..7703ecd402991 100644
--- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_BJet.cc
+++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_BJet.cc
@@ -1,147 +1,137 @@
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Common/interface/TriggerNames.h"
 #include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
+#include "FWCore/Common/interface/TriggerNames.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_BJet.h"
 
-SUSY_HLT_Muon_BJet::SUSY_HLT_Muon_BJet(const edm::ParameterSet& ps)
-{
-    edm::LogInfo("SUSY_HLT_Muon_BJet") << "Constructor SUSY_HLT_Muon_BJet::SUSY_HLT_Muon_BJet " << std::endl;
-    // Get parameters from configuration file
-    theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
-    theMuonCollection_ = consumes<reco::MuonCollection>(ps.getParameter<edm::InputTag>("MuonCollection"));
-    thePfJetCollection_ = consumes<reco::PFJetCollection>(ps.getParameter<edm::InputTag>("pfJetCollection"));
-    theCaloJetCollection_ = consumes<reco::CaloJetCollection>(ps.getParameter<edm::InputTag>("caloJetCollection"));
-    triggerResults_ = consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>("TriggerResults"));
-    HLTProcess_ = ps.getParameter<std::string>("HLTProcess");
-    triggerPath_ = ps.getParameter<std::string>("TriggerPath");
-	triggerFilterMuon_ = ps.getParameter<edm::InputTag>("TriggerFilterMuon");
-    triggerFilterJet_ = ps.getParameter<edm::InputTag>("TriggerFilterJet");
-    ptThrJet_ = ps.getUntrackedParameter<double>("PtThrJet");
-    etaThrJet_ = ps.getUntrackedParameter<double>("EtaThrJet");
+SUSY_HLT_Muon_BJet::SUSY_HLT_Muon_BJet(const edm::ParameterSet &ps) {
+  edm::LogInfo("SUSY_HLT_Muon_BJet") << "Constructor SUSY_HLT_Muon_BJet::SUSY_HLT_Muon_BJet " << std::endl;
+  // Get parameters from configuration file
+  theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
+  theMuonCollection_ = consumes<reco::MuonCollection>(ps.getParameter<edm::InputTag>("MuonCollection"));
+  thePfJetCollection_ = consumes<reco::PFJetCollection>(ps.getParameter<edm::InputTag>("pfJetCollection"));
+  theCaloJetCollection_ = consumes<reco::CaloJetCollection>(ps.getParameter<edm::InputTag>("caloJetCollection"));
+  triggerResults_ = consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>("TriggerResults"));
+  HLTProcess_ = ps.getParameter<std::string>("HLTProcess");
+  triggerPath_ = ps.getParameter<std::string>("TriggerPath");
+  triggerFilterMuon_ = ps.getParameter<edm::InputTag>("TriggerFilterMuon");
+  triggerFilterJet_ = ps.getParameter<edm::InputTag>("TriggerFilterJet");
+  ptThrJet_ = ps.getUntrackedParameter<double>("PtThrJet");
+  etaThrJet_ = ps.getUntrackedParameter<double>("EtaThrJet");
 }
 
-SUSY_HLT_Muon_BJet::~SUSY_HLT_Muon_BJet()
-{
-    edm::LogInfo("SUSY_HLT_Muon_BJet") << "Destructor SUSY_HLT_Muon_BJet::~SUSY_HLT_Muon_BJet " << std::endl;
+SUSY_HLT_Muon_BJet::~SUSY_HLT_Muon_BJet() {
+  edm::LogInfo("SUSY_HLT_Muon_BJet") << "Destructor SUSY_HLT_Muon_BJet::~SUSY_HLT_Muon_BJet " << std::endl;
 }
 
-void SUSY_HLT_Muon_BJet::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e)//
+void SUSY_HLT_Muon_BJet::dqmBeginRun(edm::Run const &run,
+                                     edm::EventSetup const &e)  //
 {
-    
-    bool changed;
-    
-    if (!fHltConfig.init(run, e, HLTProcess_, changed)) {
-        edm::LogError("SUSY_HLT_Muon_BJet") << "Initialization of HLTConfigProvider failed!!";
-        return;
-    }
-    
-    bool pathFound = false;
-    const std::vector<std::string> allTrigNames = fHltConfig.triggerNames();
-    for(size_t j = 0; j <allTrigNames.size(); ++j) {
-        if(allTrigNames[j].find(triggerPath_) != std::string::npos) {
-            pathFound = true;
-        }
-    }
-    
-    if(!pathFound) {
-        LogDebug("SUSY_HLT_Muon_BJet") << "Path not found" << "\n";
-        return;
+  bool changed;
+
+  if (!fHltConfig.init(run, e, HLTProcess_, changed)) {
+    edm::LogError("SUSY_HLT_Muon_BJet") << "Initialization of HLTConfigProvider failed!!";
+    return;
+  }
+
+  bool pathFound = false;
+  const std::vector<std::string> allTrigNames = fHltConfig.triggerNames();
+  for (size_t j = 0; j < allTrigNames.size(); ++j) {
+    if (allTrigNames[j].find(triggerPath_) != std::string::npos) {
+      pathFound = true;
     }
-    
-    edm::LogInfo("SUSY_HLT_Muon_BJet") << "SUSY_HLT_Muon_BJet::beginRun" << std::endl;
-}
+  }
 
-void SUSY_HLT_Muon_BJet::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run const &, edm::EventSetup const &)
-{
-    edm::LogInfo("SUSY_HLT_Muon_BJet") << "SUSY_HLT_Muon_BJet::bookHistograms" << std::endl;
-    //book at beginRun
-    bookHistos(ibooker_);
+  if (!pathFound) {
+    LogDebug("SUSY_HLT_Muon_BJet") << "Path not found"
+                                   << "\n";
+    return;
+  }
+
+  edm::LogInfo("SUSY_HLT_Muon_BJet") << "SUSY_HLT_Muon_BJet::beginRun" << std::endl;
 }
 
+void SUSY_HLT_Muon_BJet::bookHistograms(DQMStore::IBooker &ibooker_, edm::Run const &, edm::EventSetup const &) {
+  edm::LogInfo("SUSY_HLT_Muon_BJet") << "SUSY_HLT_Muon_BJet::bookHistograms" << std::endl;
+  // book at beginRun
+  bookHistos(ibooker_);
+}
 
+void SUSY_HLT_Muon_BJet::analyze(edm::Event const &e, edm::EventSetup const &eSetup) {
+  edm::LogInfo("SUSY_HLT_Muon_BJet") << "SUSY_HLT_Muon_BJet::analyze" << std::endl;
 
+  //-------------------------------
+  //--- Trigger
+  //-------------------------------
+  edm::Handle<edm::TriggerResults> hltresults;
+  e.getByToken(triggerResults_, hltresults);
+  if (!hltresults.isValid()) {
+    edm::LogError("SUSY_HLT_Muon_BJet") << "invalid collection: TriggerResults"
+                                        << "\n";
+    return;
+  }
+  edm::Handle<trigger::TriggerEvent> triggerSummary;
+  e.getByToken(theTrigSummary_, triggerSummary);
+  if (!triggerSummary.isValid()) {
+    edm::LogError("SUSY_HLT_Muon_BJet") << "invalid collection: TriggerSummary"
+                                        << "\n";
+    return;
+  }
 
-void SUSY_HLT_Muon_BJet::analyze(edm::Event const& e, edm::EventSetup const& eSetup){
-    edm::LogInfo("SUSY_HLT_Muon_BJet") << "SUSY_HLT_Muon_BJet::analyze" << std::endl;
-    
-    
-    //-------------------------------
-    //--- Trigger
-    //-------------------------------
-    edm::Handle<edm::TriggerResults> hltresults;
-    e.getByToken(triggerResults_,hltresults);
-    if(!hltresults.isValid()){
-        edm::LogError ("SUSY_HLT_Muon_BJet") << "invalid collection: TriggerResults" << "\n";
-        return;
-    }
-    edm::Handle<trigger::TriggerEvent> triggerSummary;
-    e.getByToken(theTrigSummary_, triggerSummary);
-    if(!triggerSummary.isValid()) {
-        edm::LogError ("SUSY_HLT_Muon_BJet") << "invalid collection: TriggerSummary" << "\n";
-        return;
-    }
-    
-    //get online objects
-    //std::vector<float> ptMuon, etaMuon, phiMuon;
-    size_t filterIndex = triggerSummary->filterIndex( triggerFilterMuon_ );
-    trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
-    if( !(filterIndex >= triggerSummary->sizeFilters()) ){
-        const trigger::Keys& keys = triggerSummary->filterKeys( filterIndex );
-        for( size_t j = 0; j < keys.size(); ++j ){
-            trigger::TriggerObject foundObject = triggerObjects[keys[j]];
-            if(fabs(foundObject.id()) == 13){ //It's a muon
-                h_triggerMuPt->Fill(foundObject.pt());
-                h_triggerMuEta->Fill(foundObject.eta());
-                h_triggerMuPhi->Fill(foundObject.phi());
-              //  ptMuon.push_back(foundObject.pt());
-               // etaMuon.push_back(foundObject.eta());
-               // phiMuon.push_back(foundObject.phi());
-            }
-        }
+  // get online objects
+  // std::vector<float> ptMuon, etaMuon, phiMuon;
+  size_t filterIndex = triggerSummary->filterIndex(triggerFilterMuon_);
+  trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
+  if (!(filterIndex >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndex);
+    for (size_t j = 0; j < keys.size(); ++j) {
+      trigger::TriggerObject foundObject = triggerObjects[keys[j]];
+      if (fabs(foundObject.id()) == 13) {  // It's a muon
+        h_triggerMuPt->Fill(foundObject.pt());
+        h_triggerMuEta->Fill(foundObject.eta());
+        h_triggerMuPhi->Fill(foundObject.phi());
+        //  ptMuon.push_back(foundObject.pt());
+        // etaMuon.push_back(foundObject.eta());
+        // phiMuon.push_back(foundObject.phi());
+      }
     }
-	
-	size_t filterIndex2 = triggerSummary->filterIndex( triggerFilterJet_ );
-    if( !(filterIndex2 >= triggerSummary->sizeFilters()) ){
-        const trigger::Keys& keys = triggerSummary->filterKeys( filterIndex2 );
-        for( size_t j = 0; j < keys.size(); ++j ){
-            trigger::TriggerObject foundObject = triggerObjects[keys[j]];
-                h_triggerJetPt->Fill(foundObject.pt());
-                h_triggerJetEta->Fill(foundObject.eta());
-                h_triggerJetPhi->Fill(foundObject.phi());
-        }
+  }
+
+  size_t filterIndex2 = triggerSummary->filterIndex(triggerFilterJet_);
+  if (!(filterIndex2 >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndex2);
+    for (size_t j = 0; j < keys.size(); ++j) {
+      trigger::TriggerObject foundObject = triggerObjects[keys[j]];
+      h_triggerJetPt->Fill(foundObject.pt());
+      h_triggerJetEta->Fill(foundObject.eta());
+      h_triggerJetPhi->Fill(foundObject.phi());
     }
- 
+  }
 }
 
+void SUSY_HLT_Muon_BJet::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
+  edm::LogInfo("SUSY_HLT_Muon_BJet") << "SUSY_HLT_Muon_BJet::endRun" << std::endl;
+}
 
+void SUSY_HLT_Muon_BJet::bookHistos(DQMStore::IBooker &ibooker_) {
+  ibooker_.cd();
+  ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
 
+  // offline quantities
 
-void SUSY_HLT_Muon_BJet::endRun(edm::Run const& run, edm::EventSetup const& eSetup)
-{
-    edm::LogInfo("SUSY_HLT_Muon_BJet") << "SUSY_HLT_Muon_BJet::endRun" << std::endl;
-}
+  // online quantities
+  h_triggerMuPt = ibooker_.book1D("triggerMuPt", "Trigger Muon Pt; GeV", 50, 0.0, 500.0);
+  h_triggerMuEta = ibooker_.book1D("triggerMuEta", "Trigger Muon Eta", 20, -3.0, 3.0);
+  h_triggerMuPhi = ibooker_.book1D("triggerMuPhi", "Trigger Muon Phi", 20, -3.5, 3.5);
 
-void SUSY_HLT_Muon_BJet::bookHistos(DQMStore::IBooker & ibooker_)
-{
-    ibooker_.cd();
-    ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
-    
-    //offline quantities
-    
-    //online quantities
-    h_triggerMuPt = ibooker_.book1D("triggerMuPt", "Trigger Muon Pt; GeV", 50, 0.0, 500.0);
-    h_triggerMuEta = ibooker_.book1D("triggerMuEta", "Trigger Muon Eta", 20, -3.0, 3.0);
-    h_triggerMuPhi = ibooker_.book1D("triggerMuPhi", "Trigger Muon Phi", 20, -3.5, 3.5);
-	
-	h_triggerJetPt = ibooker_.book1D("triggerJetPt", "Trigger Jet Pt; GeV", 50, 0.0, 500.0);
-    h_triggerJetEta = ibooker_.book1D("triggerJetEta", "Trigger Jet Eta", 20, -3.0, 3.0);
-    h_triggerJetPhi = ibooker_.book1D("triggerJetPhi", "Trigger Jet Phi", 20, -3.5, 3.5);
-    
-    ibooker_.cd();
+  h_triggerJetPt = ibooker_.book1D("triggerJetPt", "Trigger Jet Pt; GeV", 50, 0.0, 500.0);
+  h_triggerJetEta = ibooker_.book1D("triggerJetEta", "Trigger Jet Eta", 20, -3.0, 3.0);
+  h_triggerJetPhi = ibooker_.book1D("triggerJetPhi", "Trigger Jet Phi", 20, -3.5, 3.5);
+
+  ibooker_.cd();
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SUSY_HLT_Muon_BJet);
diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_Hadronic.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_Hadronic.cc
index 19f822158b3d0..d5ad8c069905a 100644
--- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_Hadronic.cc
+++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Muon_Hadronic.cc
@@ -1,20 +1,17 @@
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "FWCore/Common/interface/TriggerNames.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Common/interface/TriggerNames.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Muon_Hadronic.h"
 
 bool comparePt(Lepton a, Lepton b) { return (a.pt > b.pt); }
 
-
-SUSY_HLT_Muon_Hadronic::SUSY_HLT_Muon_Hadronic(const edm::ParameterSet& ps)
-{
-
+SUSY_HLT_Muon_Hadronic::SUSY_HLT_Muon_Hadronic(const edm::ParameterSet &ps) {
   edm::LogInfo("SUSY_HLT_Muon_Hadronic") << "Constructor SUSY_HLT_Muon_Hadronic::SUSY_HLT_Muon_Hadronic " << std::endl;
   // Get parameters from configuration file
   theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
-  theMuonCollection_ = consumes<reco::MuonCollection>(ps.getParameter<edm::InputTag>("MuonCollection")); 
+  theMuonCollection_ = consumes<reco::MuonCollection>(ps.getParameter<edm::InputTag>("MuonCollection"));
   thePfMETCollection_ = consumes<reco::PFMETCollection>(ps.getParameter<edm::InputTag>("pfMETCollection"));
   thePfJetCollection_ = consumes<reco::PFJetCollection>(ps.getParameter<edm::InputTag>("pfJetCollection"));
   theCaloJetCollection_ = consumes<reco::CaloJetCollection>(ps.getParameter<edm::InputTag>("caloJetCollection"));
@@ -28,20 +25,17 @@ SUSY_HLT_Muon_Hadronic::SUSY_HLT_Muon_Hadronic(const edm::ParameterSet& ps)
   etaMuonOffline_ = ps.getUntrackedParameter<double>("etaMuonOffline");
   HTOffline_ = ps.getUntrackedParameter<double>("HTOffline");
   METOffline_ = ps.getUntrackedParameter<double>("METOffline");
-  ptThrJet_ = ps.getUntrackedParameter<double>("PtThrJet"); 
+  ptThrJet_ = ps.getUntrackedParameter<double>("PtThrJet");
   etaThrJet_ = ps.getUntrackedParameter<double>("EtaThrJet");
 }
 
-SUSY_HLT_Muon_Hadronic::~SUSY_HLT_Muon_Hadronic()
-{
-   edm::LogInfo("SUSY_HLT_Muon_Hadronic") << "Destructor SUSY_HLT_Muon_Hadronic::~SUSY_HLT_Muon_Hadronic " << std::endl;
+SUSY_HLT_Muon_Hadronic::~SUSY_HLT_Muon_Hadronic() {
+  edm::LogInfo("SUSY_HLT_Muon_Hadronic") << "Destructor SUSY_HLT_Muon_Hadronic::~SUSY_HLT_Muon_Hadronic " << std::endl;
 }
 
-void SUSY_HLT_Muon_Hadronic::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e)
-{
- 
+void SUSY_HLT_Muon_Hadronic::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e) {
   bool changed;
-  
+
   if (!fHltConfig.init(run, e, HLTProcess_, changed)) {
     edm::LogError("SUSY_HLT_Muon_Hadronic") << "Initialization of HLTConfigProvider failed!!";
     return;
@@ -49,128 +43,139 @@ void SUSY_HLT_Muon_Hadronic::dqmBeginRun(edm::Run const &run, edm::EventSetup co
 
   bool pathFound = false;
   const std::vector<std::string> allTrigNames = fHltConfig.triggerNames();
-  for(size_t j = 0; j <allTrigNames.size(); ++j) {
-    if(allTrigNames[j].find(triggerPath_) != std::string::npos) {
+  for (size_t j = 0; j < allTrigNames.size(); ++j) {
+    if (allTrigNames[j].find(triggerPath_) != std::string::npos) {
       pathFound = true;
     }
   }
 
-  if(!pathFound) {
-    LogDebug ("SUSY_HLT_Muon_Hadronic") << "Path not found" << "\n";
+  if (!pathFound) {
+    LogDebug("SUSY_HLT_Muon_Hadronic") << "Path not found"
+                                       << "\n";
     return;
   }
-  //std::vector<std::string> filtertags = fHltConfig.moduleLabels( triggerPath_ );
-  //triggerFilter_ = edm::InputTag(filtertags[filtertags.size()-1],"",fHltConfig.processName());  
-  //triggerFilter_ = edm::InputTag("hltPFMET120Mu5L3PreFiltered", "", fHltConfig.processName());
+  // std::vector<std::string> filtertags = fHltConfig.moduleLabels( triggerPath_
+  // ); triggerFilter_ =
+  // edm::InputTag(filtertags[filtertags.size()-1],"",fHltConfig.processName());
+  // triggerFilter_ = edm::InputTag("hltPFMET120Mu5L3PreFiltered", "",
+  // fHltConfig.processName());
 
   edm::LogInfo("SUSY_HLT_Muon_Hadronic") << "SUSY_HLT_Muon_Hadronic::beginRun" << std::endl;
 }
 
- void SUSY_HLT_Muon_Hadronic::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run const &, edm::EventSetup const &)
-{
+void SUSY_HLT_Muon_Hadronic::bookHistograms(DQMStore::IBooker &ibooker_, edm::Run const &, edm::EventSetup const &) {
   edm::LogInfo("SUSY_HLT_Muon_Hadronic") << "SUSY_HLT_Muon_Hadronic::bookHistograms" << std::endl;
-  //book at beginRun
+  // book at beginRun
   bookHistos(ibooker_);
 }
 
-
-
-
-void SUSY_HLT_Muon_Hadronic::analyze(edm::Event const& e, edm::EventSetup const& eSetup){
+void SUSY_HLT_Muon_Hadronic::analyze(edm::Event const &e, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_Muon_Hadronic") << "SUSY_HLT_Muon_Hadronic::analyze" << std::endl;
 
-
   //-------------------------------
   //--- MET
   //-------------------------------
   edm::Handle<reco::PFMETCollection> pfMETCollection;
   e.getByToken(thePfMETCollection_, pfMETCollection);
-  if ( !pfMETCollection.isValid() ){
-    edm::LogError ("SUSY_HLT_Muon_Hadronic") << "invalid collection: PFMET" << "\n";
-   return;
+  if (!pfMETCollection.isValid()) {
+    edm::LogError("SUSY_HLT_Muon_Hadronic") << "invalid collection: PFMET"
+                                            << "\n";
+    return;
   }
   //-------------------------------
   //--- Jets
   //-------------------------------
   edm::Handle<reco::PFJetCollection> pfJetCollection;
-  e.getByToken (thePfJetCollection_,pfJetCollection);
-  if ( !pfJetCollection.isValid() ){
-    edm::LogError ("SUSY_HLT_Muon_Hadronic") << "invalid collection: PFJets" << "\n";
+  e.getByToken(thePfJetCollection_, pfJetCollection);
+  if (!pfJetCollection.isValid()) {
+    edm::LogError("SUSY_HLT_Muon_Hadronic") << "invalid collection: PFJets"
+                                            << "\n";
     return;
   }
   edm::Handle<reco::CaloJetCollection> caloJetCollection;
-  e.getByToken (theCaloJetCollection_,caloJetCollection);
-  if ( !caloJetCollection.isValid() ){
-  edm::LogError ("SUSY_HLT_Muon_Hadronic") << "invalid collection: CaloJets" << "\n";
-  return;
+  e.getByToken(theCaloJetCollection_, caloJetCollection);
+  if (!caloJetCollection.isValid()) {
+    edm::LogError("SUSY_HLT_Muon_Hadronic") << "invalid collection: CaloJets"
+                                            << "\n";
+    return;
   }
-  
+
   //-------------------------------
   //--- Muon
   //-------------------------------
   edm::Handle<reco::MuonCollection> MuonCollection;
-  e.getByToken (theMuonCollection_, MuonCollection);
-  if ( !MuonCollection.isValid() ){
-    edm::LogError ("SUSY_HLT_Mu_Hadronic") << "invalid collection: Muons " << "\n";
+  e.getByToken(theMuonCollection_, MuonCollection);
+  if (!MuonCollection.isValid()) {
+    edm::LogError("SUSY_HLT_Mu_Hadronic") << "invalid collection: Muons "
+                                          << "\n";
     return;
   }
-  
 
   //-------------------------------
   //--- Trigger
   //-------------------------------
   edm::Handle<edm::TriggerResults> hltresults;
-  e.getByToken(triggerResults_,hltresults);
-  if(!hltresults.isValid()){
-    edm::LogError ("SUSY_HLT_Muon_Hadronic") << "invalid collection: TriggerResults" << "\n";
+  e.getByToken(triggerResults_, hltresults);
+  if (!hltresults.isValid()) {
+    edm::LogError("SUSY_HLT_Muon_Hadronic") << "invalid collection: TriggerResults"
+                                            << "\n";
     return;
   }
   edm::Handle<trigger::TriggerEvent> triggerSummary;
   e.getByToken(theTrigSummary_, triggerSummary);
-  if(!triggerSummary.isValid()) {
-    edm::LogError ("SUSY_HLT_Muon_Hadronic") << "invalid collection: TriggerSummary" << "\n";
+  if (!triggerSummary.isValid()) {
+    edm::LogError("SUSY_HLT_Muon_Hadronic") << "invalid collection: TriggerSummary"
+                                            << "\n";
     return;
   }
 
-
-  //get online objects
+  // get online objects
   std::vector<Lepton> onlineMuons;
-  size_t filterIndex = triggerSummary->filterIndex( triggerFilter_ );
+  size_t filterIndex = triggerSummary->filterIndex(triggerFilter_);
   trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
-  if( !(filterIndex >= triggerSummary->sizeFilters()) ){
-    const trigger::Keys& keys = triggerSummary->filterKeys( filterIndex );
-    for( size_t j = 0; j < keys.size(); ++j ){
+  if (!(filterIndex >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndex);
+    for (size_t j = 0; j < keys.size(); ++j) {
       trigger::TriggerObject foundObject = triggerObjects[keys[j]];
-      if(fabs(foundObject.id()) == 13){ //It's a muon
+      if (fabs(foundObject.id()) == 13) {  // It's a muon
         h_triggerMuPt->Fill(foundObject.pt());
         h_triggerMuEta->Fill(foundObject.eta());
         h_triggerMuPhi->Fill(foundObject.phi());
-        Lepton theMuon; theMuon.pt = foundObject.pt(); theMuon.phi = foundObject.phi(); theMuon.eta = foundObject.eta();
+        Lepton theMuon;
+        theMuon.pt = foundObject.pt();
+        theMuon.phi = foundObject.phi();
+        theMuon.eta = foundObject.eta();
         onlineMuons.push_back(theMuon);
       }
     }
   }
 
-
   bool hasFired = false;
   bool hasFiredAuxiliaryForMuonLeg = false;
   bool hasFiredAuxiliaryForHadronicLeg = false;
-  const edm::TriggerNames& trigNames = e.triggerNames(*hltresults);
+  const edm::TriggerNames &trigNames = e.triggerNames(*hltresults);
   unsigned int numTriggers = trigNames.size();
-  for( unsigned int hltIndex=0; hltIndex<numTriggers; ++hltIndex ){
-    if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFired = true;
-    if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForMuon_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFiredAuxiliaryForMuonLeg = true;
-    if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForHadronic_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFiredAuxiliaryForHadronicLeg = true;
+  for (unsigned int hltIndex = 0; hltIndex < numTriggers; ++hltIndex) {
+    if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) &&
+        hltresults->accept(hltIndex))
+      hasFired = true;
+    if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForMuon_) != std::string::npos &&
+        hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex))
+      hasFiredAuxiliaryForMuonLeg = true;
+    if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForHadronic_) != std::string::npos &&
+        hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex))
+      hasFiredAuxiliaryForHadronicLeg = true;
   }
 
-  
-
-  if(hasFiredAuxiliaryForMuonLeg || hasFiredAuxiliaryForHadronicLeg || !e.isRealData()) {
-  
+  if (hasFiredAuxiliaryForMuonLeg || hasFiredAuxiliaryForHadronicLeg || !e.isRealData()) {
     std::vector<Lepton> offlineMuons;
-    for(reco::MuonCollection::const_iterator muon = MuonCollection->begin(); muon != MuonCollection->end() ; ++muon) {
-      if(fabs(muon->eta())>etaMuonOffline_) continue;
-      Lepton theMuon; theMuon.pt = muon->pt(); theMuon.phi = muon->phi(); theMuon.eta = muon->eta();
+    for (reco::MuonCollection::const_iterator muon = MuonCollection->begin(); muon != MuonCollection->end(); ++muon) {
+      if (fabs(muon->eta()) > etaMuonOffline_)
+        continue;
+      Lepton theMuon;
+      theMuon.pt = muon->pt();
+      theMuon.phi = muon->phi();
+      theMuon.eta = muon->eta();
       offlineMuons.push_back(theMuon);
     }
 
@@ -178,23 +183,29 @@ void SUSY_HLT_Muon_Hadronic::analyze(edm::Event const& e, edm::EventSetup const&
     std::sort(offlineMuons.begin(), offlineMuons.end(), comparePt);
     /*
     std::cout << "OFFLINE MUON" << std::endl;
-    for(std::vector<Lepton>::iterator offline_muon = offlineMuons.begin(); offline_muon != offlineMuons.end(); offline_muon++) {
-      std::cout << offline_muon->pt << std::endl;
+    for(std::vector<Lepton>::iterator offline_muon = offlineMuons.begin();
+    offline_muon != offlineMuons.end(); offline_muon++) { std::cout <<
+    offline_muon->pt << std::endl;
     }
     std::cout << "ONLINE MUON" << std::endl;
-    for(std::vector<Lepton>::iterator online_muon = onlineMuons.begin();  online_muon != onlineMuons.end(); online_muon++) {
-      std::cout << online_muon->pt << std::endl;
+    for(std::vector<Lepton>::iterator online_muon = onlineMuons.begin();
+    online_muon != onlineMuons.end(); online_muon++) { std::cout <<
+    online_muon->pt << std::endl;
     }
-    */ 
-    //Matching the muon
+    */
+    // Matching the muon
     int indexOfMatchedMuon = -1;
     int offlineCounter = 0;
-    for(std::vector<Lepton>::iterator offline_muon = offlineMuons.begin(); (offline_muon != offlineMuons.end() && indexOfMatchedMuon == -1); offline_muon++) {
-      for(std::vector<Lepton>::iterator online_muon = onlineMuons.begin();  online_muon != onlineMuons.end(); online_muon++) {
-        if(sqrt( (offline_muon->phi-online_muon->phi)*(offline_muon->phi-online_muon->phi) +
-                 (offline_muon->eta-online_muon->eta)*(offline_muon->eta-online_muon->eta)) < 0.5) {
+    for (std::vector<Lepton>::iterator offline_muon = offlineMuons.begin();
+         (offline_muon != offlineMuons.end() && indexOfMatchedMuon == -1);
+         offline_muon++) {
+      for (std::vector<Lepton>::iterator online_muon = onlineMuons.begin(); online_muon != onlineMuons.end();
+           online_muon++) {
+        if (sqrt((offline_muon->phi - online_muon->phi) * (offline_muon->phi - online_muon->phi) +
+                 (offline_muon->eta - online_muon->eta) * (offline_muon->eta - online_muon->eta)) < 0.5) {
           indexOfMatchedMuon = offlineCounter;
-          //std::cout << "Offline " << offline_muon->pt << " " << "Online " << online_muon->pt << std::endl;
+          // std::cout << "Offline " << offline_muon->pt << " " << "Online " <<
+          // online_muon->pt << std::endl;
           break;
         }
       }
@@ -202,71 +213,76 @@ void SUSY_HLT_Muon_Hadronic::analyze(edm::Event const& e, edm::EventSetup const&
     }
     float caloHT = 0.0;
     float pfHT = 0.0;
-    for (reco::PFJetCollection::const_iterator i_pfjet = pfJetCollection->begin(); i_pfjet != pfJetCollection->end(); ++i_pfjet){
-      if (i_pfjet->pt() < ptThrJet_) continue;
-      if (fabs(i_pfjet->eta()) > etaThrJet_) continue;
+    for (reco::PFJetCollection::const_iterator i_pfjet = pfJetCollection->begin(); i_pfjet != pfJetCollection->end();
+         ++i_pfjet) {
+      if (i_pfjet->pt() < ptThrJet_)
+        continue;
+      if (fabs(i_pfjet->eta()) > etaThrJet_)
+        continue;
       pfHT += i_pfjet->pt();
     }
-    for (reco::CaloJetCollection::const_iterator i_calojet = caloJetCollection->begin(); i_calojet != caloJetCollection->end(); ++i_calojet){
-      if (i_calojet->pt() < ptThrJet_) continue;
-      if (fabs(i_calojet->eta()) > etaThrJet_) continue;
+    for (reco::CaloJetCollection::const_iterator i_calojet = caloJetCollection->begin();
+         i_calojet != caloJetCollection->end();
+         ++i_calojet) {
+      if (i_calojet->pt() < ptThrJet_)
+        continue;
+      if (fabs(i_calojet->eta()) > etaThrJet_)
+        continue;
       caloHT += i_calojet->pt();
     }
-    //Need to apply the MET offline cut to be in the MET plateau
-    if((hasFiredAuxiliaryForMuonLeg || !e.isRealData()) && !offlineMuons.empty() && pfMETCollection->begin()->et() > METOffline_ && pfHT > HTOffline_) {
-      if(hasFired && indexOfMatchedMuon >= 0) {
-        h_MuTurnOn_num-> Fill(offlineMuons.at(indexOfMatchedMuon).pt);
-        h_MuTurnOn_den-> Fill(offlineMuons.at(indexOfMatchedMuon).pt);
+    // Need to apply the MET offline cut to be in the MET plateau
+    if ((hasFiredAuxiliaryForMuonLeg || !e.isRealData()) && !offlineMuons.empty() &&
+        pfMETCollection->begin()->et() > METOffline_ && pfHT > HTOffline_) {
+      if (hasFired && indexOfMatchedMuon >= 0) {
+        h_MuTurnOn_num->Fill(offlineMuons.at(indexOfMatchedMuon).pt);
+        h_MuTurnOn_den->Fill(offlineMuons.at(indexOfMatchedMuon).pt);
       } else {
-        h_MuTurnOn_den-> Fill(offlineMuons.at(0).pt);
-      } 
+        h_MuTurnOn_den->Fill(offlineMuons.at(0).pt);
+      }
     }
-    //Need to apply the pt offline cut to be in the muon pt plateau
-    if((hasFiredAuxiliaryForHadronicLeg || !e.isRealData()) && indexOfMatchedMuon >= 0 && offlineMuons.at(indexOfMatchedMuon).pt > ptMuonOffline_ && pfHT > HTOffline_) {
-      if(hasFired) {
-        h_pfMetTurnOn_num-> Fill(pfMETCollection->begin()->et());
-      } 
-      h_pfMetTurnOn_den-> Fill(pfMETCollection->begin()->et());
+    // Need to apply the pt offline cut to be in the muon pt plateau
+    if ((hasFiredAuxiliaryForHadronicLeg || !e.isRealData()) && indexOfMatchedMuon >= 0 &&
+        offlineMuons.at(indexOfMatchedMuon).pt > ptMuonOffline_ && pfHT > HTOffline_) {
+      if (hasFired) {
+        h_pfMetTurnOn_num->Fill(pfMETCollection->begin()->et());
+      }
+      h_pfMetTurnOn_den->Fill(pfMETCollection->begin()->et());
     }
-    if((hasFiredAuxiliaryForHadronicLeg || !e.isRealData()) && indexOfMatchedMuon >= 0 && offlineMuons.at(indexOfMatchedMuon).pt > ptMuonOffline_ && pfMETCollection->begin()->et() > METOffline_) {
-      if(hasFired) {
-        h_pfHTTurnOn_num-> Fill(pfHT);
-      } 
-      h_pfHTTurnOn_den-> Fill(pfHT);
+    if ((hasFiredAuxiliaryForHadronicLeg || !e.isRealData()) && indexOfMatchedMuon >= 0 &&
+        offlineMuons.at(indexOfMatchedMuon).pt > ptMuonOffline_ && pfMETCollection->begin()->et() > METOffline_) {
+      if (hasFired) {
+        h_pfHTTurnOn_num->Fill(pfHT);
+      }
+      h_pfHTTurnOn_den->Fill(pfHT);
     }
   }
 }
 
-
-
-
-void SUSY_HLT_Muon_Hadronic::endRun(edm::Run const& run, edm::EventSetup const& eSetup)
-{
+void SUSY_HLT_Muon_Hadronic::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_Muon_Hadronic") << "SUSY_HLT_Muon_Hadronic::endRun" << std::endl;
 }
 
-void SUSY_HLT_Muon_Hadronic::bookHistos(DQMStore::IBooker & ibooker_)
-{
+void SUSY_HLT_Muon_Hadronic::bookHistos(DQMStore::IBooker &ibooker_) {
   ibooker_.cd();
   ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
 
-  //offline quantities
+  // offline quantities
 
-  //online quantities 
+  // online quantities
   h_triggerMuPt = ibooker_.book1D("triggerMuPt", "Trigger Muon Pt; GeV", 20, 0.0, 500.0);
   h_triggerMuEta = ibooker_.book1D("triggerMuEta", "Trigger Muon Eta", 20, -3.0, 3.0);
   h_triggerMuPhi = ibooker_.book1D("triggerMuPhi", "Trigger Muon Phi", 20, -3.5, 3.5);
 
-  //num and den hists to be divided in harvesting step to make turn on curves
-  h_pfMetTurnOn_num = ibooker_.book1D("pfMetTurnOn_num", "PF MET Turn On Numerator", 20, 0.0, 500.0 );
-  h_pfMetTurnOn_den = ibooker_.book1D("pfMetTurnOn_den", "PF MET Turn OnDenominator", 20, 0.0, 500.0 );
-  h_pfHTTurnOn_num = ibooker_.book1D("pfHTTurnOn_num", "PF HT Turn On Numerator", 30, 0.0, 1500.0 );
-  h_pfHTTurnOn_den = ibooker_.book1D("pfHTTurnOn_den", "PF HT Turn On Denominator", 30, 0.0, 1500.0 );
-  h_MuTurnOn_num = ibooker_.book1D("MuTurnOn_num", "Muon Turn On Numerator", 30, 0.0, 150 );
-  h_MuTurnOn_den = ibooker_.book1D("MuTurnOn_den", "Muon Turn On Denominator", 30, 0.0, 150.0 );
+  // num and den hists to be divided in harvesting step to make turn on curves
+  h_pfMetTurnOn_num = ibooker_.book1D("pfMetTurnOn_num", "PF MET Turn On Numerator", 20, 0.0, 500.0);
+  h_pfMetTurnOn_den = ibooker_.book1D("pfMetTurnOn_den", "PF MET Turn OnDenominator", 20, 0.0, 500.0);
+  h_pfHTTurnOn_num = ibooker_.book1D("pfHTTurnOn_num", "PF HT Turn On Numerator", 30, 0.0, 1500.0);
+  h_pfHTTurnOn_den = ibooker_.book1D("pfHTTurnOn_den", "PF HT Turn On Denominator", 30, 0.0, 1500.0);
+  h_MuTurnOn_num = ibooker_.book1D("MuTurnOn_num", "Muon Turn On Numerator", 30, 0.0, 150);
+  h_MuTurnOn_den = ibooker_.book1D("MuTurnOn_den", "Muon Turn On Denominator", 30, 0.0, 150.0);
 
   ibooker_.cd();
 }
 
- //define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SUSY_HLT_Muon_Hadronic);
diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonHT.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonHT.cc
index 5c87940a9138f..aed743ed49406 100644
--- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonHT.cc
+++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonHT.cc
@@ -1,13 +1,11 @@
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "FWCore/Common/interface/TriggerNames.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Common/interface/TriggerNames.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonHT.h"
 
-
-SUSY_HLT_PhotonHT::SUSY_HLT_PhotonHT(const edm::ParameterSet& ps)
-{
+SUSY_HLT_PhotonHT::SUSY_HLT_PhotonHT(const edm::ParameterSet &ps) {
   edm::LogInfo("SUSY_HLT_PhotonHT") << "Constructor SUSY_HLT_PhotonHT::SUSY_HLT_PhotonHT " << std::endl;
   // Get parameters from configuration file
   theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
@@ -22,52 +20,50 @@ SUSY_HLT_PhotonHT::SUSY_HLT_PhotonHT(const edm::ParameterSet& ps)
   htThrOffline_ = ps.getUntrackedParameter<double>("htThrOffline");
 }
 
-SUSY_HLT_PhotonHT::~SUSY_HLT_PhotonHT()
-{
-   edm::LogInfo("SUSY_HLT_PhotonHT") << "Destructor SUSY_HLT_PhotonHT::~SUSY_HLT_PhotonHT " << std::endl;
+SUSY_HLT_PhotonHT::~SUSY_HLT_PhotonHT() {
+  edm::LogInfo("SUSY_HLT_PhotonHT") << "Destructor SUSY_HLT_PhotonHT::~SUSY_HLT_PhotonHT " << std::endl;
 }
 
-void SUSY_HLT_PhotonHT::dqmBeginRun(edm::Run const &, edm::EventSetup const &)
-{
+void SUSY_HLT_PhotonHT::dqmBeginRun(edm::Run const &, edm::EventSetup const &) {
   edm::LogInfo("SUSY_HLT_PhotonHT") << "SUSY_HLT_PhotonHT::beginRun" << std::endl;
 }
 
- void SUSY_HLT_PhotonHT::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run const &, edm::EventSetup const &)
-{
+void SUSY_HLT_PhotonHT::bookHistograms(DQMStore::IBooker &ibooker_, edm::Run const &, edm::EventSetup const &) {
   edm::LogInfo("SUSY_HLT_PhotonHT") << "SUSY_HLT_PhotonHT::bookHistograms" << std::endl;
-  //book at beginRun
+  // book at beginRun
   bookHistos(ibooker_);
 }
 
-
-void SUSY_HLT_PhotonHT::analyze(edm::Event const& e, edm::EventSetup const& eSetup){
+void SUSY_HLT_PhotonHT::analyze(edm::Event const &e, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_PhotonHT") << "SUSY_HLT_PhotonHT::analyze" << std::endl;
 
-
   //-------------------------------
   //--- MET / HT
   //-------------------------------
   edm::Handle<reco::PFMETCollection> pfMETCollection;
   e.getByToken(thePfMETCollection_, pfMETCollection);
-  if ( !pfMETCollection.isValid() ){
-    edm::LogError ("SUSY_HLT_PhotonHT") << "invalid met collection" << "\n";
+  if (!pfMETCollection.isValid()) {
+    edm::LogError("SUSY_HLT_PhotonHT") << "invalid met collection"
+                                       << "\n";
     return;
   }
   //-------------------------------
   //--- Photon
   //-------------------------------
   edm::Handle<reco::PhotonCollection> photonCollection;
-  e.getByToken (thePhotonCollection_, photonCollection);
-  if ( !photonCollection.isValid() ){
-    edm::LogError ("SUSY_HLT_PhotonHT") << "invalid egamma collection" << "\n";
+  e.getByToken(thePhotonCollection_, photonCollection);
+  if (!photonCollection.isValid()) {
+    edm::LogError("SUSY_HLT_PhotonHT") << "invalid egamma collection"
+                                       << "\n";
     return;
   }
 
-  //check what is in the menu
+  // check what is in the menu
   edm::Handle<edm::TriggerResults> hltresults;
-  e.getByToken(triggerResults_,hltresults);
-  if(!hltresults.isValid()){
-    edm::LogError ("SUSY_HLT_PhotonHT") << "invalid collection: TriggerResults" << "\n";
+  e.getByToken(triggerResults_, hltresults);
+  if (!hltresults.isValid()) {
+    edm::LogError("SUSY_HLT_PhotonHT") << "invalid collection: TriggerResults"
+                                       << "\n";
     return;
   }
 
@@ -76,8 +72,9 @@ void SUSY_HLT_PhotonHT::analyze(edm::Event const& e, edm::EventSetup const& eSet
   //-------------------------------
   edm::Handle<trigger::TriggerEvent> triggerSummary;
   e.getByToken(theTrigSummary_, triggerSummary);
-  if(!triggerSummary.isValid()) {
-    edm::LogError ("SUSY_HLT_PhotonHT") << "invalid collection: TriggerSummary" << "\n";
+  if (!triggerSummary.isValid()) {
+    edm::LogError("SUSY_HLT_PhotonHT") << "invalid collection: TriggerSummary"
+                                       << "\n";
     return;
   }
 
@@ -85,70 +82,73 @@ void SUSY_HLT_PhotonHT::analyze(edm::Event const& e, edm::EventSetup const& eSet
   trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
 
   // get the photon object
-  size_t filterIndexPhoton = triggerSummary->filterIndex( triggerFilterPhoton_ );
-  if( filterIndexPhoton < triggerSummary->sizeFilters() ) {
-      const trigger::Keys& keys = triggerSummary->filterKeys( filterIndexPhoton );
-      if( !keys.empty() ) {
-          // take the leading photon
-          float pt = triggerObjects[ keys[0] ].pt();
-          h_photonPt->Fill( pt );
-      }
+  size_t filterIndexPhoton = triggerSummary->filterIndex(triggerFilterPhoton_);
+  if (filterIndexPhoton < triggerSummary->sizeFilters()) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndexPhoton);
+    if (!keys.empty()) {
+      // take the leading photon
+      float pt = triggerObjects[keys[0]].pt();
+      h_photonPt->Fill(pt);
+    }
   }
 
   // get ht
-  size_t filterIndexHt = triggerSummary->filterIndex( triggerFilterHt_ );
-  if( filterIndexHt < triggerSummary->sizeFilters() ) {
-      const trigger::Keys& keys = triggerSummary->filterKeys( filterIndexHt );
-      if( !keys.empty() ) {
-          float ht = triggerObjects[ keys[0] ].pt();
-          h_ht->Fill( ht );
-      }
+  size_t filterIndexHt = triggerSummary->filterIndex(triggerFilterHt_);
+  if (filterIndexHt < triggerSummary->sizeFilters()) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndexHt);
+    if (!keys.empty()) {
+      float ht = triggerObjects[keys[0]].pt();
+      h_ht->Fill(ht);
+    }
   }
 
-  bool hasFired = false, hasFiredAuxiliaryForHadronicLeg=false;
-  const edm::TriggerNames& trigNames = e.triggerNames(*hltresults);
+  bool hasFired = false, hasFiredAuxiliaryForHadronicLeg = false;
+  const edm::TriggerNames &trigNames = e.triggerNames(*hltresults);
   unsigned int numTriggers = trigNames.size();
-  for( unsigned int hltIndex=0; hltIndex<numTriggers; ++hltIndex ){
-    if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFired = true;
-    if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForHadronic_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFiredAuxiliaryForHadronicLeg = true;
+  for (unsigned int hltIndex = 0; hltIndex < numTriggers; ++hltIndex) {
+    if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) &&
+        hltresults->accept(hltIndex))
+      hasFired = true;
+    if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForHadronic_) != std::string::npos &&
+        hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex))
+      hasFiredAuxiliaryForHadronicLeg = true;
   }
 
-  if(hasFiredAuxiliaryForHadronicLeg || !e.isRealData()) {
-   float recoPhotonPt = !photonCollection->empty() ? photonCollection->begin()->et() : 0;
-   float recoHt = !pfMETCollection->empty() ? pfMETCollection->begin()->et() : 0;
+  if (hasFiredAuxiliaryForHadronicLeg || !e.isRealData()) {
+    float recoPhotonPt = !photonCollection->empty() ? photonCollection->begin()->et() : 0;
+    float recoHt = !pfMETCollection->empty() ? pfMETCollection->begin()->et() : 0;
 
-    if(hasFired){
-      if( !photonCollection->empty() && recoHt >= htThrOffline_ ) h_photonTurnOn_num -> Fill( recoPhotonPt );
-      if( !pfMETCollection->empty() && recoPhotonPt >= ptThrOffline_ ) h_htTurnOn_num -> Fill( recoHt );
+    if (hasFired) {
+      if (!photonCollection->empty() && recoHt >= htThrOffline_)
+        h_photonTurnOn_num->Fill(recoPhotonPt);
+      if (!pfMETCollection->empty() && recoPhotonPt >= ptThrOffline_)
+        h_htTurnOn_num->Fill(recoHt);
     }
-    if( !photonCollection->empty() && recoHt >= htThrOffline_ ) h_photonTurnOn_den -> Fill( recoPhotonPt );
-    if( !pfMETCollection->empty() && recoPhotonPt >= ptThrOffline_ ) h_htTurnOn_den -> Fill( recoPhotonPt );
+    if (!photonCollection->empty() && recoHt >= htThrOffline_)
+      h_photonTurnOn_den->Fill(recoPhotonPt);
+    if (!pfMETCollection->empty() && recoPhotonPt >= ptThrOffline_)
+      h_htTurnOn_den->Fill(recoPhotonPt);
   }
-
 }
 
-
-
-void SUSY_HLT_PhotonHT::endRun(edm::Run const& run, edm::EventSetup const& eSetup)
-{
+void SUSY_HLT_PhotonHT::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_PhotonHT") << "SUSY_HLT_PhotonHT::endRun" << std::endl;
 }
 
-void SUSY_HLT_PhotonHT::bookHistos(DQMStore::IBooker & ibooker_)
-{
+void SUSY_HLT_PhotonHT::bookHistos(DQMStore::IBooker &ibooker_) {
   ibooker_.cd();
   ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
 
-  //offline quantities
-  h_photonPt = ibooker_.book1D("photonPt", "Photon transverse momentum; p_{T} (GeV)", 20, 0, 500 );
-  h_ht = ibooker_.book1D("ht", "Hadronic activity;H_{T} (GeV)", 20, 0, 2000 );
-  h_htTurnOn_num = ibooker_.book1D("pfHtTurnOn_num", "PF HT Turn On Numerator",   20, 300, 800 );
-  h_htTurnOn_den = ibooker_.book1D("pfHtTurnOn_den", "PF HT Turn On Denominator", 20, 300, 800 );
-  h_photonTurnOn_num = ibooker_.book1D("photonTurnOn_num", "Photon Turn On Numerator",   20, 70, 130 );
-  h_photonTurnOn_den = ibooker_.book1D("photonTurnOn_den", "Photon Turn On Denominator", 20, 70, 130 );
+  // offline quantities
+  h_photonPt = ibooker_.book1D("photonPt", "Photon transverse momentum; p_{T} (GeV)", 20, 0, 500);
+  h_ht = ibooker_.book1D("ht", "Hadronic activity;H_{T} (GeV)", 20, 0, 2000);
+  h_htTurnOn_num = ibooker_.book1D("pfHtTurnOn_num", "PF HT Turn On Numerator", 20, 300, 800);
+  h_htTurnOn_den = ibooker_.book1D("pfHtTurnOn_den", "PF HT Turn On Denominator", 20, 300, 800);
+  h_photonTurnOn_num = ibooker_.book1D("photonTurnOn_num", "Photon Turn On Numerator", 20, 70, 130);
+  h_photonTurnOn_den = ibooker_.book1D("photonTurnOn_den", "Photon Turn On Denominator", 20, 70, 130);
 
   ibooker_.cd();
 }
 
- //define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SUSY_HLT_PhotonHT);
diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonMET.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonMET.cc
index af55630c089f6..83b79251654e1 100644
--- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonMET.cc
+++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_PhotonMET.cc
@@ -1,13 +1,11 @@
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "FWCore/Common/interface/TriggerNames.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Common/interface/TriggerNames.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_PhotonMET.h"
 
-
-SUSY_HLT_PhotonMET::SUSY_HLT_PhotonMET(const edm::ParameterSet& ps)
-{
+SUSY_HLT_PhotonMET::SUSY_HLT_PhotonMET(const edm::ParameterSet &ps) {
   edm::LogInfo("SUSY_HLT_PhotonMET") << "Constructor SUSY_HLT_PhotonMET::SUSY_HLT_PhotonMET " << std::endl;
   // Get parameters from configuration file
   thePfMETCollection_ = consumes<reco::PFMETCollection>(ps.getParameter<edm::InputTag>("pfMETCollection"));
@@ -19,26 +17,21 @@ SUSY_HLT_PhotonMET::SUSY_HLT_PhotonMET(const edm::ParameterSet& ps)
   metThrOffline_ = ps.getUntrackedParameter<double>("metThrOffline");
 }
 
-SUSY_HLT_PhotonMET::~SUSY_HLT_PhotonMET()
-{
+SUSY_HLT_PhotonMET::~SUSY_HLT_PhotonMET() {
   edm::LogInfo("SUSY_HLT_PhotonMET") << "Destructor SUSY_HLT_PhotonMET::~SUSY_HLT_PhotonMET " << std::endl;
 }
 
-void SUSY_HLT_PhotonMET::dqmBeginRun(edm::Run const &, edm::EventSetup const &)
-{
+void SUSY_HLT_PhotonMET::dqmBeginRun(edm::Run const &, edm::EventSetup const &) {
   edm::LogInfo("SUSY_HLT_PhotonMET") << "SUSY_HLT_PhotonMET::beginRun" << std::endl;
 }
 
-void SUSY_HLT_PhotonMET::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run const &, edm::EventSetup const &)
-{
+void SUSY_HLT_PhotonMET::bookHistograms(DQMStore::IBooker &ibooker_, edm::Run const &, edm::EventSetup const &) {
   edm::LogInfo("SUSY_HLT_PhotonMET") << "SUSY_HLT_PhotonMET::bookHistograms" << std::endl;
-  //book at beginRun
+  // book at beginRun
   bookHistos(ibooker_);
 }
 
-
-void SUSY_HLT_PhotonMET::analyze(edm::Event const& e, edm::EventSetup const& eSetup)
-{
+void SUSY_HLT_PhotonMET::analyze(edm::Event const &e, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_PhotonMET") << "SUSY_HLT_PhotonMET::analyze" << std::endl;
 
   //-------------------------------
@@ -46,30 +39,34 @@ void SUSY_HLT_PhotonMET::analyze(edm::Event const& e, edm::EventSetup const& eSe
   //-------------------------------
   edm::Handle<reco::PFMETCollection> pfMETCollection;
   e.getByToken(thePfMETCollection_, pfMETCollection);
-  if ( !pfMETCollection.isValid() ){
-    edm::LogError ("SUSY_HLT_PhotonMET") << "invalid met collection" << "\n";
+  if (!pfMETCollection.isValid()) {
+    edm::LogError("SUSY_HLT_PhotonMET") << "invalid met collection"
+                                        << "\n";
     return;
   }
   //-------------------------------
   //--- Photon
   //-------------------------------
   edm::Handle<reco::PhotonCollection> photonCollection;
-  e.getByToken (thePhotonCollection_, photonCollection);
-  if ( !photonCollection.isValid() ){
-    edm::LogError ("SUSY_HLT_PhotonMET") << "invalid egamma collection" << "\n";
+  e.getByToken(thePhotonCollection_, photonCollection);
+  if (!photonCollection.isValid()) {
+    edm::LogError("SUSY_HLT_PhotonMET") << "invalid egamma collection"
+                                        << "\n";
     return;
   }
 
-  //check what is in the menu
+  // check what is in the menu
   edm::Handle<edm::TriggerResults> hltresults;
-  e.getByToken(triggerResults_,hltresults);
-  if(!hltresults.isValid()){
-    edm::LogError ("SUSY_HLT_PhotonMET") << "invalid collection: TriggerResults" << "\n";
+  e.getByToken(triggerResults_, hltresults);
+  if (!hltresults.isValid()) {
+    edm::LogError("SUSY_HLT_PhotonMET") << "invalid collection: TriggerResults"
+                                        << "\n";
     return;
   }
 
   // use only events with leading photon in barrel
-  if (photonCollection->empty() || abs(photonCollection->begin()->superCluster()->eta()) > 1.4442) return;
+  if (photonCollection->empty() || abs(photonCollection->begin()->superCluster()->eta()) > 1.4442)
+    return;
 
   // get reco photon and met
   float const recoPhotonPt = !photonCollection->empty() ? photonCollection->begin()->et() : 0;
@@ -78,48 +75,52 @@ void SUSY_HLT_PhotonMET::analyze(edm::Event const& e, edm::EventSetup const& eSe
   h_recoMet->Fill(recoMET);
 
   // the actual trigger efficiencies
-  bool hasFired = false, hasFiredBaseTrigger=false;
+  bool hasFired = false, hasFiredBaseTrigger = false;
   edm::TriggerNames const &trigNames = e.triggerNames(*hltresults);
   unsigned int const numTriggers = trigNames.size();
-  for( unsigned int hltIndex=0; hltIndex<numTriggers; ++hltIndex ){
-    if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFired = true;
-    if (trigNames.triggerName(hltIndex).find(triggerPathBase_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFiredBaseTrigger = true;
+  for (unsigned int hltIndex = 0; hltIndex < numTriggers; ++hltIndex) {
+    if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) &&
+        hltresults->accept(hltIndex))
+      hasFired = true;
+    if (trigNames.triggerName(hltIndex).find(triggerPathBase_) != std::string::npos && hltresults->wasrun(hltIndex) &&
+        hltresults->accept(hltIndex))
+      hasFiredBaseTrigger = true;
   }
 
-  if(hasFiredBaseTrigger || !e.isRealData()) {
+  if (hasFiredBaseTrigger || !e.isRealData()) {
     // passed base trigger
-    if (recoPhotonPt>ptThrOffline_) h_metTurnOn_den->Fill(recoMET);
-    if (recoMET>metThrOffline_) h_photonTurnOn_den->Fill(recoPhotonPt);
-    if (hasFired){
+    if (recoPhotonPt > ptThrOffline_)
+      h_metTurnOn_den->Fill(recoMET);
+    if (recoMET > metThrOffline_)
+      h_photonTurnOn_den->Fill(recoPhotonPt);
+    if (hasFired) {
       // passed base and signal trigger
-      if (recoPhotonPt>ptThrOffline_) h_metTurnOn_num->Fill(recoMET);
-      if (recoMET>metThrOffline_) h_photonTurnOn_num->Fill(recoPhotonPt);
+      if (recoPhotonPt > ptThrOffline_)
+        h_metTurnOn_num->Fill(recoMET);
+      if (recoMET > metThrOffline_)
+        h_photonTurnOn_num->Fill(recoPhotonPt);
     }
   }
 }
 
-
-
-void SUSY_HLT_PhotonMET::endRun(edm::Run const& run, edm::EventSetup const& eSetup)
-{
+void SUSY_HLT_PhotonMET::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_PhotonMET") << "SUSY_HLT_PhotonMET::endRun" << std::endl;
 }
 
-void SUSY_HLT_PhotonMET::bookHistos(DQMStore::IBooker & ibooker_)
-{
+void SUSY_HLT_PhotonMET::bookHistos(DQMStore::IBooker &ibooker_) {
   ibooker_.cd();
   ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
 
-  //offline quantities
+  // offline quantities
   h_recoPhotonPt = ibooker_.book1D("recoPhotonPt", "reco Photon transverse momentum; p_{T} (GeV)", 20, 0, 1000);
   h_recoMet = ibooker_.book1D("recoMet", "reco Missing transverse energy;E_{T}^{miss} (GeV)", 20, 0, 1000);
-  h_metTurnOn_num = ibooker_.book1D("pfMetTurnOn_num", "PF MET Turn On Numerator",   20, 0, 500);
+  h_metTurnOn_num = ibooker_.book1D("pfMetTurnOn_num", "PF MET Turn On Numerator", 20, 0, 500);
   h_metTurnOn_den = ibooker_.book1D("pfMetTurnOn_den", "PF MET Turn On Denominator", 20, 0, 500);
-  h_photonTurnOn_num = ibooker_.book1D("photonTurnOn_num", "Photon Turn On Numerator",   20, 0, 1000);
+  h_photonTurnOn_num = ibooker_.book1D("photonTurnOn_num", "Photon Turn On Numerator", 20, 0, 1000);
   h_photonTurnOn_den = ibooker_.book1D("photonTurnOn_den", "Photon Turn On Denominator", 20, 0, 1000);
 
   ibooker_.cd();
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SUSY_HLT_PhotonMET);
diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Razor.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Razor.cc
index ee3b6c072f305..055cbcc1e889d 100644
--- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Razor.cc
+++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_Razor.cc
@@ -1,58 +1,54 @@
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "FWCore/Common/interface/TriggerNames.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Common/interface/TriggerNames.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_Razor.h"
 
-
-SUSY_HLT_Razor::SUSY_HLT_Razor(const edm::ParameterSet& ps)
-{
+SUSY_HLT_Razor::SUSY_HLT_Razor(const edm::ParameterSet &ps) {
   edm::LogInfo("SUSY_HLT_Razor") << "Constructor SUSY_HLT_Razor::SUSY_HLT_Razor " << std::endl;
   // Get parameters from configuration file
   theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
-  theMETCollection_ = consumes<edm::View<reco::MET> >(ps.getParameter<edm::InputTag>("METCollection"));
-  theHemispheres_ = consumes<std::vector<math::XYZTLorentzVector> >(ps.getParameter<edm::InputTag>("hemispheres"));
+  theMETCollection_ = consumes<edm::View<reco::MET>>(ps.getParameter<edm::InputTag>("METCollection"));
+  theHemispheres_ = consumes<std::vector<math::XYZTLorentzVector>>(ps.getParameter<edm::InputTag>("hemispheres"));
   triggerResults_ = consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>("TriggerResults"));
   triggerPath_ = ps.getParameter<std::string>("TriggerPath");
   triggerFilter_ = ps.getParameter<edm::InputTag>("TriggerFilter");
   caloFilter_ = ps.getParameter<edm::InputTag>("CaloFilter");
-  theJetCollection_ = consumes<edm::View<reco::Jet> >(ps.getParameter<edm::InputTag>("jetCollection"));
+  theJetCollection_ = consumes<edm::View<reco::Jet>>(ps.getParameter<edm::InputTag>("jetCollection"));
 }
 
-SUSY_HLT_Razor::~SUSY_HLT_Razor()
-{
-   edm::LogInfo("SUSY_HLT_Razor") << "Destructor SUSY_HLT_Razor::~SUSY_HLT_Razor " << std::endl;
+SUSY_HLT_Razor::~SUSY_HLT_Razor() {
+  edm::LogInfo("SUSY_HLT_Razor") << "Destructor SUSY_HLT_Razor::~SUSY_HLT_Razor " << std::endl;
 }
 
-void SUSY_HLT_Razor::dqmBeginRun(edm::Run const &, edm::EventSetup const &)
-{
+void SUSY_HLT_Razor::dqmBeginRun(edm::Run const &, edm::EventSetup const &) {
   edm::LogInfo("SUSY_HLT_Razor") << "SUSY_HLT_Razor::beginRun" << std::endl;
 }
 
- void SUSY_HLT_Razor::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run const &, edm::EventSetup const &)
-{
+void SUSY_HLT_Razor::bookHistograms(DQMStore::IBooker &ibooker_, edm::Run const &, edm::EventSetup const &) {
   edm::LogInfo("SUSY_HLT_Razor") << "SUSY_HLT_Razor::bookHistograms" << std::endl;
-  //book at beginRun
+  // book at beginRun
   bookHistos(ibooker_);
 }
 
-
-void SUSY_HLT_Razor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+void SUSY_HLT_Razor::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
   edm::ParameterSetDescription desc;
-  desc.add<edm::InputTag>("jetCollection",edm::InputTag("ak4PFJetsCHS"));
-  desc.add<edm::InputTag>("CaloFilter",edm::InputTag("hltRsqMR200Rsq0p01MR100Calo","","HLT"))->setComment("Calo HLT filter module used to save razor variable objects");
-  desc.add<edm::InputTag>("METCollection",edm::InputTag("pfMet"));
-  desc.add<edm::InputTag>("hemispheres",edm::InputTag("hemispheres"))->setComment("hemisphere jets used to compute razor variables");
-  desc.add<std::string>("TriggerPath","HLT_RsqMR300_Rsq0p09_MR200_v")->setComment("trigger path name");
-  desc.add<edm::InputTag>("TriggerFilter",edm::InputTag("hltRsqMR300Rsq0p09MR200","","HLT"))->setComment("PF HLT filter module used to save razor variable objects");
-  desc.add<edm::InputTag>("TriggerResults",edm::InputTag("TriggerResults","","HLT"));
-  desc.add<edm::InputTag>("trigSummary",edm::InputTag("hltTriggerSummaryAOD"));
-  descriptions.add("SUSY_HLT_Razor_Main",desc);
+  desc.add<edm::InputTag>("jetCollection", edm::InputTag("ak4PFJetsCHS"));
+  desc.add<edm::InputTag>("CaloFilter", edm::InputTag("hltRsqMR200Rsq0p01MR100Calo", "", "HLT"))
+      ->setComment("Calo HLT filter module used to save razor variable objects");
+  desc.add<edm::InputTag>("METCollection", edm::InputTag("pfMet"));
+  desc.add<edm::InputTag>("hemispheres", edm::InputTag("hemispheres"))
+      ->setComment("hemisphere jets used to compute razor variables");
+  desc.add<std::string>("TriggerPath", "HLT_RsqMR300_Rsq0p09_MR200_v")->setComment("trigger path name");
+  desc.add<edm::InputTag>("TriggerFilter", edm::InputTag("hltRsqMR300Rsq0p09MR200", "", "HLT"))
+      ->setComment("PF HLT filter module used to save razor variable objects");
+  desc.add<edm::InputTag>("TriggerResults", edm::InputTag("TriggerResults", "", "HLT"));
+  desc.add<edm::InputTag>("trigSummary", edm::InputTag("hltTriggerSummaryAOD"));
+  descriptions.add("SUSY_HLT_Razor_Main", desc);
 }
 
-void SUSY_HLT_Razor::analyze(edm::Event const& e, edm::EventSetup const& eSetup){
-    
+void SUSY_HLT_Razor::analyze(edm::Event const &e, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_Razor") << "SUSY_HLT_Razor::analyze" << std::endl;
 
   using namespace std;
@@ -60,165 +56,173 @@ void SUSY_HLT_Razor::analyze(edm::Event const& e, edm::EventSetup const& eSetup)
   using namespace reco;
 
   // get hold of collection of objects
-  Handle< vector<math::XYZTLorentzVector> > hemispheres;
-  e.getByToken (theHemispheres_,hemispheres);
+  Handle<vector<math::XYZTLorentzVector>> hemispheres;
+  e.getByToken(theHemispheres_, hemispheres);
   // get hold of the MET Collection
-  edm::Handle<edm::View<reco::MET> > inputMet;
-  e.getByToken(theMETCollection_,inputMet);
-  if ( !inputMet.isValid() ){
-    edm::LogError ("SUSY_HLT_Razor") << "invalid collection: MET" << "\n";
-   return;
+  edm::Handle<edm::View<reco::MET>> inputMet;
+  e.getByToken(theMETCollection_, inputMet);
+  if (!inputMet.isValid()) {
+    edm::LogError("SUSY_HLT_Razor") << "invalid collection: MET"
+                                    << "\n";
+    return;
   }
   //  edm::Handle<reco::PFJetCollection> jetCollection;
-  edm::Handle<edm::View<reco::Jet> > jetCollection;
-  e.getByToken (theJetCollection_,jetCollection);
-  if ( !jetCollection.isValid() ){
-    edm::LogError ("SUSY_HLT_Razor") << "invalid collection: jets" << "\n";
+  edm::Handle<edm::View<reco::Jet>> jetCollection;
+  e.getByToken(theJetCollection_, jetCollection);
+  if (!jetCollection.isValid()) {
+    edm::LogError("SUSY_HLT_Razor") << "invalid collection: jets"
+                                    << "\n";
     return;
   }
 
-  //check what is in the menu
+  // check what is in the menu
   edm::Handle<edm::TriggerResults> hltresults;
-  e.getByToken(triggerResults_,hltresults);
-  if(!hltresults.isValid()){
-    edm::LogError ("SUSY_HLT_Razor") << "invalid collection: TriggerResults" << "\n";
+  e.getByToken(triggerResults_, hltresults);
+  if (!hltresults.isValid()) {
+    edm::LogError("SUSY_HLT_Razor") << "invalid collection: TriggerResults"
+                                    << "\n";
     return;
   }
-  
+
   //-------------------------------
   //--- Trigger
   //-------------------------------
   edm::Handle<trigger::TriggerEvent> triggerSummary;
   e.getByToken(theTrigSummary_, triggerSummary);
-  if(!triggerSummary.isValid()) {
-    edm::LogError ("SUSY_HLT_Razor") << "invalid collection: TriggerSummary" << "\n";
+  if (!triggerSummary.isValid()) {
+    edm::LogError("SUSY_HLT_Razor") << "invalid collection: TriggerSummary"
+                                    << "\n";
     return;
   }
-  //get online objects
-  //HLTriggerOffline/Egamma/python/TriggerTypeDefs.py contains the trigger object IDs
+  // get online objects
+  // HLTriggerOffline/Egamma/python/TriggerTypeDefs.py contains the trigger
+  // object IDs
   double onlineMR = 0, onlineRsq = 0;
-  double caloMR = 0, caloRsq = 0; //online razor variables computed using calo quantities
-  size_t filterIndex = triggerSummary->filterIndex( triggerFilter_ );
-  size_t caloFilterIndex = triggerSummary->filterIndex( caloFilter_ );
-  //search for online MR and Rsq objects
+  double caloMR = 0,
+         caloRsq = 0;  // online razor variables computed using calo quantities
+  size_t filterIndex = triggerSummary->filterIndex(triggerFilter_);
+  size_t caloFilterIndex = triggerSummary->filterIndex(caloFilter_);
+  // search for online MR and Rsq objects
   trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
-  if( !(filterIndex >= triggerSummary->sizeFilters()) ){
-      const trigger::Keys& keys = triggerSummary->filterKeys( filterIndex );
-      for( size_t j = 0; j < keys.size(); ++j ){
-          trigger::TriggerObject foundObject = triggerObjects[keys[j]];
-          if(foundObject.id() == 0){ //the MET object containing MR and Rsq will show up with ID = 0
-              onlineMR = foundObject.px(); //razor variables stored in dummy reco::MET objects
-              onlineRsq = foundObject.py();
-          }
+  if (!(filterIndex >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndex);
+    for (size_t j = 0; j < keys.size(); ++j) {
+      trigger::TriggerObject foundObject = triggerObjects[keys[j]];
+      if (foundObject.id() == 0) {    // the MET object containing MR and Rsq will show up with ID = 0
+        onlineMR = foundObject.px();  // razor variables stored in dummy reco::MET objects
+        onlineRsq = foundObject.py();
       }
+    }
   }
 
-  //search for calo MR and Rsq objects
-  if( !(caloFilterIndex >= triggerSummary->sizeFilters()) ){
-      const trigger::Keys& keys = triggerSummary->filterKeys( caloFilterIndex );
-      for( size_t j = 0; j < keys.size(); ++j ){
-          trigger::TriggerObject foundObject = triggerObjects[keys[j]];
-          if(foundObject.id() == 0){ 
-              caloMR = foundObject.px(); //razor variables stored in dummy reco::MET objects
-              caloRsq = foundObject.py();
-          }
+  // search for calo MR and Rsq objects
+  if (!(caloFilterIndex >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(caloFilterIndex);
+    for (size_t j = 0; j < keys.size(); ++j) {
+      trigger::TriggerObject foundObject = triggerObjects[keys[j]];
+      if (foundObject.id() == 0) {
+        caloMR = foundObject.px();  // razor variables stored in dummy reco::MET objects
+        caloRsq = foundObject.py();
       }
+    }
   }
 
   bool hasFired = false;
-  const edm::TriggerNames& trigNames = e.triggerNames(*hltresults);
+  const edm::TriggerNames &trigNames = e.triggerNames(*hltresults);
   unsigned int numTriggers = trigNames.size();
-  for( unsigned int hltIndex=0; hltIndex<numTriggers; ++hltIndex ){
-      if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) 
-	{
-	  hasFired = true;
-	}      
+  for (unsigned int hltIndex = 0; hltIndex < numTriggers; ++hltIndex) {
+    if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) &&
+        hltresults->accept(hltIndex)) {
+      hasFired = true;
+    }
   }
 
   float HT = 0.0;
-  
-  for (unsigned int i=0; i<jetCollection->size(); i++) {    
-    if(std::abs(jetCollection->at(i).eta()) < 3.0 && jetCollection->at(i).pt() >= 40.0){
+
+  for (unsigned int i = 0; i < jetCollection->size(); i++) {
+    if (std::abs(jetCollection->at(i).eta()) < 3.0 && jetCollection->at(i).pt() >= 40.0) {
       HT += jetCollection->at(i).pt();
     }
   }
-  //for (reco::PFJetCollection::const_iterator i_jet = jetCollection->begin(); i_jet != jetCollection->end(); ++i_jet){
+  // for (reco::PFJetCollection::const_iterator i_jet = jetCollection->begin();
+  // i_jet != jetCollection->end(); ++i_jet){
   //    if (i_pfjet->pt() < 40) continue;
   //    if (fabs(i_pfjet->eta()) > 3.0) continue;
   //    pfHT += i_pfjet->pt();
   //}
   float MET = (inputMet->front()).pt();
 
-  //this part is adapted from HLTRFilter.cc 
+  // this part is adapted from HLTRFilter.cc
 
   // check that the input collections are available
-  if (not hemispheres.isValid()){
-      //This is happening many times (which is normal) and it's noisy for the output, we removed the error message
-      //edm::LogError("SUSY_HLT_Razor") << "Hemisphere object is invalid!" << "\n";
-      return;
+  if (not hemispheres.isValid()) {
+    // This is happening many times (which is normal) and it's noisy for the
+    // output, we removed the error message edm::LogError("SUSY_HLT_Razor") <<
+    // "Hemisphere object is invalid!" << "\n";
+    return;
   }
 
-  if(hasFired){
-
-      if(hemispheres->empty()){  // the Hemisphere Maker will produce an empty collection of hemispheres if the number of jets in the
-          edm::LogError("SUSY_HLT_Razor") << "Cannot calculate M_R and R^2 because there are too many jets! (trigger passed automatically without forming the hemispheres)" << endl;
-          return;
-      }
-
-      //***********************************
-      //Calculate R 
-
-      if(!hemispheres->empty() && hemispheres->size() != 2 && hemispheres->size() != 5 && hemispheres->size() != 10){
-          edm::LogError("SUSY_HLT_Razor") << "Invalid hemisphere collection!  hemispheres->size() = " << hemispheres->size() << endl;
-          return;
-      }
+  if (hasFired) {
+    if (hemispheres->empty()) {  // the Hemisphere Maker will produce an empty
+                                 // collection of hemispheres if the number of
+                                 // jets in the
+      edm::LogError("SUSY_HLT_Razor") << "Cannot calculate M_R and R^2 because there are too many jets! "
+                                         "(trigger passed automatically without forming the hemispheres)"
+                                      << endl;
+      return;
+    }
 
-      TLorentzVector ja(hemispheres->at(0).x(),hemispheres->at(0).y(),hemispheres->at(0).z(),hemispheres->at(0).t());
-      TLorentzVector jb(hemispheres->at(1).x(),hemispheres->at(1).y(),hemispheres->at(1).z(),hemispheres->at(1).t());
+    //***********************************
+    // Calculate R
 
-      //dummy vector (this trigger does not care about muons)
-      std::vector<math::XYZTLorentzVector> muonVec;
+    if (!hemispheres->empty() && hemispheres->size() != 2 && hemispheres->size() != 5 && hemispheres->size() != 10) {
+      edm::LogError("SUSY_HLT_Razor") << "Invalid hemisphere collection!  hemispheres->size() = " << hemispheres->size()
+                                      << endl;
+      return;
+    }
 
-      double MR = CalcMR(ja,jb);
-      double R  = CalcR(MR,ja,jb,inputMet,muonVec);
-      double Rsq = R*R;    
+    TLorentzVector ja(hemispheres->at(0).x(), hemispheres->at(0).y(), hemispheres->at(0).z(), hemispheres->at(0).t());
+    TLorentzVector jb(hemispheres->at(1).x(), hemispheres->at(1).y(), hemispheres->at(1).z(), hemispheres->at(1).t());
 
-      if(Rsq > 0.15) h_mr->Fill(MR);
-      if(MR > 300) h_rsq->Fill(Rsq);
-      h_mrRsq->Fill(MR, Rsq);
+    // dummy vector (this trigger does not care about muons)
+    std::vector<math::XYZTLorentzVector> muonVec;
 
-      h_rsq_loose->Fill(Rsq);
+    double MR = CalcMR(ja, jb);
+    double R = CalcR(MR, ja, jb, inputMet, muonVec);
+    double Rsq = R * R;
 
-      if(Rsq > 0.25){
-          h_mr_tight->Fill(MR);
-      }
-      if(MR > 400){
-          h_rsq_tight->Fill(Rsq);
-      }
+    if (Rsq > 0.15)
+      h_mr->Fill(MR);
+    if (MR > 300)
+      h_rsq->Fill(Rsq);
+    h_mrRsq->Fill(MR, Rsq);
 
-      h_ht->Fill(HT);
-      h_met->Fill(MET);
-      h_htMet->Fill(HT, MET);
+    h_rsq_loose->Fill(Rsq);
 
-      h_online_mr_vs_mr->Fill(MR, onlineMR);
-      h_online_rsq_vs_rsq->Fill(Rsq, onlineRsq);
+    if (Rsq > 0.25) {
+      h_mr_tight->Fill(MR);
+    }
+    if (MR > 400) {
+      h_rsq_tight->Fill(Rsq);
+    }
 
-      h_calo_mr_vs_mr->Fill(MR, caloMR);
-      h_calo_rsq_vs_rsq->Fill(Rsq, caloRsq);
+    h_ht->Fill(HT);
+    h_met->Fill(MET);
+    h_htMet->Fill(HT, MET);
 
-  } 
+    h_online_mr_vs_mr->Fill(MR, onlineMR);
+    h_online_rsq_vs_rsq->Fill(Rsq, onlineRsq);
 
+    h_calo_mr_vs_mr->Fill(MR, caloMR);
+    h_calo_rsq_vs_rsq->Fill(Rsq, caloRsq);
+  }
 }
 
-
-
-void SUSY_HLT_Razor::endRun(edm::Run const& run, edm::EventSetup const& eSetup)
-{
+void SUSY_HLT_Razor::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_Razor") << "SUSY_HLT_Razor::endRun" << std::endl;
 }
 
-void SUSY_HLT_Razor::bookHistos(DQMStore::IBooker & ibooker_)
-{
+void SUSY_HLT_Razor::bookHistos(DQMStore::IBooker &ibooker_) {
   ibooker_.cd();
   ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
 
@@ -235,68 +239,101 @@ void SUSY_HLT_Razor::bookHistos(DQMStore::IBooker & ibooker_)
   h_met = ibooker_.book1D("met", "MET; GeV; ", 100, 0.0, 1000);
   h_htMet = ibooker_.book2D("htMet", "MET vs HT; GeV; ", 100, 0.0, 4000.0, 100, 0.0, 1000);
 
-  h_online_mr_vs_mr = ibooker_.book2D("online_mr_vs_mr", "Online M_{R} vs  Offline M_{R} (events passing trigger); Offline M_{R} (GeV); Online M_{R} (GeV); ", 100, 0.0, 4000.0, 100, 0.0, 4000.0);
-  h_calo_mr_vs_mr = ibooker_.book2D("calo_mr_vs_mr", "Calo M_{R} vs  Offline M_{R} (events passing trigger); Offline M_{R} (GeV); Calo M_{R} (GeV); ", 100, 0.0, 4000.0, 100, 0.0, 4000.0);
-  h_online_rsq_vs_rsq = ibooker_.book2D("online_rsq_vs_rsq", "Online R^{2} vs Offline R^{2} (events passing trigger); Offline R^{2}; Online R^{2}; ", 100, 0.0, 1.5, 100, 0.0, 1.5);
-  h_calo_rsq_vs_rsq = ibooker_.book2D("calo_rsq_vs_rsq", "Calo R^{2} vs Offline R^{2} (events passing trigger); Offline R^{2}; Calo R^{2}; ", 100, 0.0, 1.5, 100, 0.0, 1.5);
+  h_online_mr_vs_mr = ibooker_.book2D("online_mr_vs_mr",
+                                      "Online M_{R} vs  Offline M_{R} (events passing "
+                                      "trigger); Offline M_{R} (GeV); Online M_{R} (GeV); ",
+                                      100,
+                                      0.0,
+                                      4000.0,
+                                      100,
+                                      0.0,
+                                      4000.0);
+  h_calo_mr_vs_mr = ibooker_.book2D("calo_mr_vs_mr",
+                                    "Calo M_{R} vs  Offline M_{R} (events passing trigger); "
+                                    "Offline M_{R} (GeV); Calo M_{R} (GeV); ",
+                                    100,
+                                    0.0,
+                                    4000.0,
+                                    100,
+                                    0.0,
+                                    4000.0);
+  h_online_rsq_vs_rsq = ibooker_.book2D("online_rsq_vs_rsq",
+                                        "Online R^{2} vs Offline R^{2} (events passing trigger); "
+                                        "Offline R^{2}; Online R^{2}; ",
+                                        100,
+                                        0.0,
+                                        1.5,
+                                        100,
+                                        0.0,
+                                        1.5);
+  h_calo_rsq_vs_rsq = ibooker_.book2D("calo_rsq_vs_rsq",
+                                      "Calo R^{2} vs Offline R^{2} (events passing trigger); "
+                                      "Offline R^{2}; Calo R^{2}; ",
+                                      100,
+                                      0.0,
+                                      1.5,
+                                      100,
+                                      0.0,
+                                      1.5);
 
   ibooker_.cd();
 }
 
-//CalcMR and CalcR borrowed from HLTRFilter.cc
-double 
-SUSY_HLT_Razor::CalcMR(TLorentzVector ja, TLorentzVector jb){
-  if(ja.Pt()<=0.1) return -1;
+// CalcMR and CalcR borrowed from HLTRFilter.cc
+double SUSY_HLT_Razor::CalcMR(TLorentzVector ja, TLorentzVector jb) {
+  if (ja.Pt() <= 0.1)
+    return -1;
+
+  ja.SetPtEtaPhiM(ja.Pt(), ja.Eta(), ja.Phi(), 0.0);
+  jb.SetPtEtaPhiM(jb.Pt(), jb.Eta(), jb.Phi(), 0.0);
 
-  ja.SetPtEtaPhiM(ja.Pt(),ja.Eta(),ja.Phi(),0.0);
-  jb.SetPtEtaPhiM(jb.Pt(),jb.Eta(),jb.Phi(),0.0);
-  
-  if(ja.Pt() > jb.Pt()){
+  if (ja.Pt() > jb.Pt()) {
     TLorentzVector temp = ja;
     ja = jb;
     jb = temp;
   }
-  
+
   double A = ja.P();
   double B = jb.P();
   double az = ja.Pz();
   double bz = jb.Pz();
   TVector3 jaT, jbT;
-  jaT.SetXYZ(ja.Px(),ja.Py(),0.0);
-  jbT.SetXYZ(jb.Px(),jb.Py(),0.0);
-  double ATBT = (jaT+jbT).Mag2();
-  
-  double MR = sqrt((A+B)*(A+B)-(az+bz)*(az+bz)-
-		   (jbT.Dot(jbT)-jaT.Dot(jaT))*(jbT.Dot(jbT)-jaT.Dot(jaT))/(jaT+jbT).Mag2());
-  
-  double mybeta = (jbT.Dot(jbT)-jaT.Dot(jaT))/
-    sqrt(ATBT*((A+B)*(A+B)-(az+bz)*(az+bz)));
-  
-  double mygamma = 1./sqrt(1.-mybeta*mybeta);
-  
-  //use gamma times MRstar
-  return MR*mygamma;  
+  jaT.SetXYZ(ja.Px(), ja.Py(), 0.0);
+  jbT.SetXYZ(jb.Px(), jb.Py(), 0.0);
+  double ATBT = (jaT + jbT).Mag2();
+
+  double MR = sqrt((A + B) * (A + B) - (az + bz) * (az + bz) -
+                   (jbT.Dot(jbT) - jaT.Dot(jaT)) * (jbT.Dot(jbT) - jaT.Dot(jaT)) / (jaT + jbT).Mag2());
+
+  double mybeta = (jbT.Dot(jbT) - jaT.Dot(jaT)) / sqrt(ATBT * ((A + B) * (A + B) - (az + bz) * (az + bz)));
+
+  double mygamma = 1. / sqrt(1. - mybeta * mybeta);
+
+  // use gamma times MRstar
+  return MR * mygamma;
 }
 
-double 
-  SUSY_HLT_Razor::CalcR(double MR, TLorentzVector ja, TLorentzVector jb, edm::Handle<edm::View<reco::MET> > inputMet, const std::vector<math::XYZTLorentzVector>& muons){
-  //now we can calculate MTR
+double SUSY_HLT_Razor::CalcR(double MR,
+                             TLorentzVector ja,
+                             TLorentzVector jb,
+                             edm::Handle<edm::View<reco::MET>> inputMet,
+                             const std::vector<math::XYZTLorentzVector> &muons) {
+  // now we can calculate MTR
   TVector3 met;
-  met.SetPtEtaPhi((inputMet->front()).pt(),0.0,(inputMet->front()).phi());
-  
+  met.SetPtEtaPhi((inputMet->front()).pt(), 0.0, (inputMet->front()).phi());
+
   std::vector<math::XYZTLorentzVector>::const_iterator muonIt;
-  for(muonIt = muons.begin(); muonIt!=muons.end(); muonIt++){
+  for (muonIt = muons.begin(); muonIt != muons.end(); muonIt++) {
     TVector3 tmp;
-    tmp.SetPtEtaPhi(muonIt->pt(),0,muonIt->phi());
-    met-=tmp;
+    tmp.SetPtEtaPhi(muonIt->pt(), 0, muonIt->phi());
+    met -= tmp;
   }
 
-  double MTR = sqrt(0.5*(met.Mag()*(ja.Pt()+jb.Pt()) - met.Dot(ja.Vect()+jb.Vect())));
-  
-  //filter events
-  return float(MTR)/float(MR); //R
-  
+  double MTR = sqrt(0.5 * (met.Mag() * (ja.Pt() + jb.Pt()) - met.Dot(ja.Vect() + jb.Vect())));
+
+  // filter events
+  return float(MTR) / float(MR);  // R
 }
 
- //define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SUSY_HLT_Razor);
diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc
index d4aa783e083ff..006c804491359 100644
--- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc
+++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_SingleLepton.cc
@@ -1,11 +1,11 @@
 #include "HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_SingleLepton.h"
 
-#include <limits>
 #include <algorithm>
+#include <limits>
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "FWCore/Common/interface/TriggerNames.h"
 
@@ -13,18 +13,16 @@
 
 #include "DataFormats/Math/interface/deltaR.h"
 
-#include "DataFormats/EgammaCandidates/interface/ConversionFwd.h"
 #include "DataFormats/EgammaCandidates/interface/Conversion.h"
+#include "DataFormats/EgammaCandidates/interface/ConversionFwd.h"
 #include "RecoEgamma/EgammaTools/interface/ConversionTools.h"
 
-namespace{
-  bool Contains(const std::string &text,
-		const std::string &pattern){
-    return text.find(pattern)!=std::string::npos;
-  }
+namespace {
+  bool Contains(const std::string &text, const std::string &pattern) { return text.find(pattern) != std::string::npos; }
 
-  void SetBinLabels(MonitorElement * const me){
-    if(!me) return;
+  void SetBinLabels(MonitorElement *const me) {
+    if (!me)
+      return;
     me->setBinLabel(1, "No CSV Reqs.");
     me->setBinLabel(2, "N_{CSVL} >= 1");
     me->setBinLabel(3, "N_{CSVL} >= 2");
@@ -40,198 +38,224 @@ namespace{
     me->setBinLabel(13, "N_{CSVT} >= 4");
   }
 
-  bool IsGood(const reco::GsfElectron &el, const reco::Vertex::Point &pv_position,
+  bool IsGood(const reco::GsfElectron &el,
+              const reco::Vertex::Point &pv_position,
               const reco::BeamSpot::Point &bs_position,
-              const edm::Handle<reco::ConversionCollection> &convs){
+              const edm::Handle<reco::ConversionCollection> &convs) {
     const float dEtaIn = el.deltaEtaSuperClusterTrackAtVtx();
     const float dPhiIn = el.deltaPhiSuperClusterTrackAtVtx();
     const float sigmaietaieta = el.full5x5_sigmaIetaIeta();
     const float hOverE = el.hcalOverEcal();
-    float d0 = 0.0, dz=0.0;
-    try{
-      d0=-(el.gsfTrack()->dxy(pv_position));
+    float d0 = 0.0, dz = 0.0;
+    try {
+      d0 = -(el.gsfTrack()->dxy(pv_position));
       dz = el.gsfTrack()->dz(pv_position);
-    }catch(...){
+    } catch (...) {
       edm::LogError("SUSY_HLT_SingleLepton") << "Could not read electron.gsfTrack().\n";
       return false;
     }
     float ooemoop = 1e30;
-    if(el.ecalEnergy()>0.0 && std::isfinite(el.ecalEnergy())){
-      ooemoop = fabs(1.0/el.ecalEnergy() - el.eSuperClusterOverP()/el.ecalEnergy());
+    if (el.ecalEnergy() > 0.0 && std::isfinite(el.ecalEnergy())) {
+      ooemoop = fabs(1.0 / el.ecalEnergy() - el.eSuperClusterOverP() / el.ecalEnergy());
     }
     const auto &iso = el.pfIsolationVariables();
-    const float absiso = iso.sumChargedHadronPt
-      + std::max(0.0, iso.sumNeutralHadronEt + iso.sumPhotonEt -0.5 * iso.sumPUPt);
-    const float relisowithdb = absiso/el.pt();
+    const float absiso =
+        iso.sumChargedHadronPt + std::max(0.0, iso.sumNeutralHadronEt + iso.sumPhotonEt - 0.5 * iso.sumPUPt);
+    const float relisowithdb = absiso / el.pt();
 
     bool pass_conversion = false;
-    if(convs.isValid()){
-      try{
+    if (convs.isValid()) {
+      try {
         pass_conversion = !ConversionTools::hasMatchedConversion(el, *convs, bs_position);
-      }catch(...){
+      } catch (...) {
         edm::LogError("SUSY_HLT_SingleLepton") << "Electron conversion matching failed.\n";
         return false;
       }
     }
 
     float etasc = 0.0;
-    try{
+    try {
       etasc = el.superCluster()->eta();
-    }catch(...){
+    } catch (...) {
       edm::LogError("SUSY_HLT_SingleLepton") << "Could not read electron.superCluster().\n";
       return false;
     }
-    if(fabs(etasc)>2.5){
+    if (fabs(etasc) > 2.5) {
       return false;
-    }else if(fabs(etasc)>1.479){
-      if(fabs(dEtaIn)>0.0106) return false;
-      if(fabs(dPhiIn)>0.0359) return false;
-      if(sigmaietaieta>0.0305) return false;
-      if(hOverE>0.0835) return false;
-      if(fabs(d0)>0.0163) return false;
-      if(fabs(dz)>0.5999) return false;
-      if(fabs(ooemoop)>0.1126) return false;
-      if(relisowithdb>0.2075) return false;
-      if(!pass_conversion) return false;
-    }else{
-      if(fabs(dEtaIn)>0.0091) return false;
-      if(fabs(dPhiIn)>0.031) return false;
-      if(sigmaietaieta>0.0106) return false;
-      if(hOverE>0.0532) return false;
-      if(fabs(d0)>0.0126) return false;
-      if(fabs(dz)>0.0116) return false;
-      if(fabs(ooemoop)>0.0609) return false;
-      if(relisowithdb>0.1649) return false;
-      if(!pass_conversion) return false;
+    } else if (fabs(etasc) > 1.479) {
+      if (fabs(dEtaIn) > 0.0106)
+        return false;
+      if (fabs(dPhiIn) > 0.0359)
+        return false;
+      if (sigmaietaieta > 0.0305)
+        return false;
+      if (hOverE > 0.0835)
+        return false;
+      if (fabs(d0) > 0.0163)
+        return false;
+      if (fabs(dz) > 0.5999)
+        return false;
+      if (fabs(ooemoop) > 0.1126)
+        return false;
+      if (relisowithdb > 0.2075)
+        return false;
+      if (!pass_conversion)
+        return false;
+    } else {
+      if (fabs(dEtaIn) > 0.0091)
+        return false;
+      if (fabs(dPhiIn) > 0.031)
+        return false;
+      if (sigmaietaieta > 0.0106)
+        return false;
+      if (hOverE > 0.0532)
+        return false;
+      if (fabs(d0) > 0.0126)
+        return false;
+      if (fabs(dz) > 0.0116)
+        return false;
+      if (fabs(ooemoop) > 0.0609)
+        return false;
+      if (relisowithdb > 0.1649)
+        return false;
+      if (!pass_conversion)
+        return false;
     }
     return true;
   }
 
-  bool IsGood(const reco::Muon &mu, const reco::Vertex::Point &pv_position){
-    if(!mu.isGlobalMuon()) return false;
-    if(!mu.isPFMuon()) return false;
-    try{
-      if(mu.globalTrack()->normalizedChi2()>=10.) return false;
-      if(mu.globalTrack()->hitPattern().numberOfValidMuonHits()<=0) return false;
-    }catch(...){
+  bool IsGood(const reco::Muon &mu, const reco::Vertex::Point &pv_position) {
+    if (!mu.isGlobalMuon())
+      return false;
+    if (!mu.isPFMuon())
+      return false;
+    try {
+      if (mu.globalTrack()->normalizedChi2() >= 10.)
+        return false;
+      if (mu.globalTrack()->hitPattern().numberOfValidMuonHits() <= 0)
+        return false;
+    } catch (...) {
       edm::LogWarning("SUSY_HLT_SingleLepton") << "Could not read muon.globalTrack().\n";
       return false;
     }
-    if(mu.numberOfMatchedStations()<=1) return false;
-    try{
-      if(fabs(mu.muonBestTrack()->dxy(pv_position))>=0.2) return false;
-      if(fabs(mu.muonBestTrack()->dz(pv_position))>=0.5) return false;
-    }catch(...){
+    if (mu.numberOfMatchedStations() <= 1)
+      return false;
+    try {
+      if (fabs(mu.muonBestTrack()->dxy(pv_position)) >= 0.2)
+        return false;
+      if (fabs(mu.muonBestTrack()->dz(pv_position)) >= 0.5)
+        return false;
+    } catch (...) {
       edm::LogWarning("SUSY_HLT_SingleLepton") << "Could not read muon.muonBestTrack().\n";
       return false;
     }
-    try{
-      if(mu.innerTrack()->hitPattern().numberOfValidPixelHits()<=0) return false;
-      if(mu.innerTrack()->hitPattern().trackerLayersWithMeasurement()<=5) return false;
-    }catch(...){
+    try {
+      if (mu.innerTrack()->hitPattern().numberOfValidPixelHits() <= 0)
+        return false;
+      if (mu.innerTrack()->hitPattern().trackerLayersWithMeasurement() <= 5)
+        return false;
+    } catch (...) {
       edm::LogWarning("SUSY_HLT_SingleLepton") << "Could not read muon.innerTrack().\n";
       return false;
     }
     return true;
   }
+}  // namespace
+
+SUSY_HLT_SingleLepton::SUSY_HLT_SingleLepton(const edm::ParameterSet &ps)
+    : theElectronTag_(ps.getParameter<edm::InputTag>("electronCollection")),
+      theElectronCollection_(consumes<reco::GsfElectronCollection>(theElectronTag_)),
+      theMuonTag_(ps.getParameter<edm::InputTag>("muonCollection")),
+      theMuonCollection_(consumes<reco::MuonCollection>(theMuonTag_)),
+      thePfMETTag_(ps.getParameter<edm::InputTag>("pfMetCollection")),
+      thePfMETCollection_(consumes<reco::PFMETCollection>(thePfMETTag_)),
+      thePfJetTag_(ps.getParameter<edm::InputTag>("pfJetCollection")),
+      thePfJetCollection_(consumes<reco::PFJetCollection>(thePfJetTag_)),
+      theJetTagTag_(ps.getParameter<edm::InputTag>("jetTagCollection")),
+      theJetTagCollection_(consumes<reco::JetTagCollection>(theJetTagTag_)),
+
+      theVertexCollectionTag_(ps.getParameter<edm::InputTag>("vertexCollection")),
+      theVertexCollection_(consumes<reco::VertexCollection>(theVertexCollectionTag_)),
+      theConversionCollectionTag_(ps.getParameter<edm::InputTag>("conversionCollection")),
+      theConversionCollection_(consumes<reco::ConversionCollection>(theConversionCollectionTag_)),
+      theBeamSpotTag_(ps.getParameter<edm::InputTag>("beamSpot")),
+      theBeamSpot_(consumes<reco::BeamSpot>(theBeamSpotTag_)),
+
+      theLeptonFilterTag_(ps.getParameter<edm::InputTag>("leptonFilter")),
+      theHLTHTTag_(ps.getParameter<edm::InputTag>("hltHt")),
+      theHLTHT_(consumes<reco::METCollection>(theHLTHTTag_)),
+      theHLTMETTag_(ps.getParameter<edm::InputTag>("hltMet")),
+      theHLTMET_(consumes<reco::METCollection>(theHLTMETTag_)),
+      theHLTJetCollectionTag_(ps.getParameter<edm::InputTag>("hltJets")),
+      theHLTJetCollection_(consumes<reco::CaloJetCollection>(theHLTJetCollectionTag_)),
+      theHLTJetTagCollectionTag_(ps.getParameter<edm::InputTag>("hltJetTags")),
+      theHLTJetTagCollection_(consumes<reco::JetTagCollection>(theHLTJetTagCollectionTag_)),
+
+      theTriggerResultsTag_(ps.getParameter<edm::InputTag>("triggerResults")),
+      theTriggerResults_(consumes<edm::TriggerResults>(theTriggerResultsTag_)),
+      theTrigSummaryTag_(ps.getParameter<edm::InputTag>("trigSummary")),
+      theTrigSummary_(consumes<trigger::TriggerEvent>(theTrigSummaryTag_)),
+
+      fHltConfig_(),
+
+      HLTProcess_(ps.getParameter<std::string>("hltProcess")),
+
+      triggerPath_(ps.getParameter<std::string>("triggerPath")),
+      triggerPathAuxiliary_(ps.getParameter<std::string>("triggerPathAuxiliary")),
+      triggerPathLeptonAuxiliary_(ps.getParameter<std::string>("triggerPathLeptonAuxiliary")),
+
+      csvlCut_(ps.getUntrackedParameter<double>("csvlCut")),
+      csvmCut_(ps.getUntrackedParameter<double>("csvmCut")),
+      csvtCut_(ps.getUntrackedParameter<double>("csvtCut")),
+
+      jetPtCut_(ps.getUntrackedParameter<double>("jetPtCut")),
+      jetEtaCut_(ps.getUntrackedParameter<double>("jetEtaCut")),
+      metCut_(ps.getUntrackedParameter<double>("metCut")),
+      htCut_(ps.getUntrackedParameter<double>("htCut")),
+
+      lep_pt_threshold_(ps.getUntrackedParameter<double>("leptonPtThreshold")),
+      ht_threshold_(ps.getUntrackedParameter<double>("htThreshold")),
+      met_threshold_(ps.getUntrackedParameter<double>("metThreshold")),
+      csv_threshold_(ps.getUntrackedParameter<double>("csvThreshold")),
+
+      h_triggerLepPt_(nullptr),
+      h_triggerLepEta_(nullptr),
+      h_triggerLepPhi_(nullptr),
+      h_HT_(nullptr),
+      h_MET_(nullptr),
+      h_maxCSV_(nullptr),
+      h_leptonTurnOn_num_(nullptr),
+      h_leptonTurnOn_den_(nullptr),
+      h_pfHTTurnOn_num_(nullptr),
+      h_pfHTTurnOn_den_(nullptr),
+      h_pfMetTurnOn_num_(nullptr),
+      h_pfMetTurnOn_den_(nullptr),
+      h_CSVTurnOn_num_(nullptr),
+      h_CSVTurnOn_den_(nullptr),
+      h_btagTurnOn_num_(nullptr),
+      h_btagTurnOn_den_(nullptr) {
+  edm::LogInfo("SUSY_HLT_SingleLepton") << "Constructor SUSY_HLT_SingleLepton::SUSY_HLT_SingleLepton\n";
 }
 
-SUSY_HLT_SingleLepton::SUSY_HLT_SingleLepton(const edm::ParameterSet &ps):
-  theElectronTag_(ps.getParameter<edm::InputTag>("electronCollection")),
-  theElectronCollection_(consumes<reco::GsfElectronCollection>(theElectronTag_)),
-  theMuonTag_(ps.getParameter<edm::InputTag>("muonCollection")),
-  theMuonCollection_(consumes<reco::MuonCollection>(theMuonTag_)),
-  thePfMETTag_(ps.getParameter<edm::InputTag>("pfMetCollection")),
-  thePfMETCollection_(consumes<reco::PFMETCollection>(thePfMETTag_)),
-  thePfJetTag_(ps.getParameter<edm::InputTag>("pfJetCollection")),
-  thePfJetCollection_(consumes<reco::PFJetCollection>(thePfJetTag_)),
-  theJetTagTag_(ps.getParameter<edm::InputTag>("jetTagCollection")),
-  theJetTagCollection_(consumes<reco::JetTagCollection>(theJetTagTag_)),
-
-  theVertexCollectionTag_(ps.getParameter<edm::InputTag>("vertexCollection")),
-  theVertexCollection_(consumes<reco::VertexCollection>(theVertexCollectionTag_)),
-  theConversionCollectionTag_(ps.getParameter<edm::InputTag>("conversionCollection")),
-  theConversionCollection_(consumes<reco::ConversionCollection>(theConversionCollectionTag_)),
-  theBeamSpotTag_(ps.getParameter<edm::InputTag>("beamSpot")),
-  theBeamSpot_(consumes<reco::BeamSpot>(theBeamSpotTag_)),
-
-  theLeptonFilterTag_(ps.getParameter<edm::InputTag>("leptonFilter")),
-  theHLTHTTag_(ps.getParameter<edm::InputTag>("hltHt")),
-  theHLTHT_(consumes<reco::METCollection>(theHLTHTTag_)),
-  theHLTMETTag_(ps.getParameter<edm::InputTag>("hltMet")),
-  theHLTMET_(consumes<reco::METCollection>(theHLTMETTag_)),
-  theHLTJetCollectionTag_(ps.getParameter<edm::InputTag>("hltJets")),
-  theHLTJetCollection_(consumes<reco::CaloJetCollection>(theHLTJetCollectionTag_)),
-  theHLTJetTagCollectionTag_(ps.getParameter<edm::InputTag>("hltJetTags")),
-  theHLTJetTagCollection_(consumes<reco::JetTagCollection>(theHLTJetTagCollectionTag_)),
-
-  theTriggerResultsTag_(ps.getParameter<edm::InputTag>("triggerResults")),
-  theTriggerResults_(consumes<edm::TriggerResults>(theTriggerResultsTag_)),
-  theTrigSummaryTag_(ps.getParameter<edm::InputTag>("trigSummary")),
-  theTrigSummary_(consumes<trigger::TriggerEvent>(theTrigSummaryTag_)),
-
-  fHltConfig_(),
-
-  HLTProcess_(ps.getParameter<std::string>("hltProcess")),
-
-  triggerPath_(ps.getParameter<std::string>("triggerPath")),
-  triggerPathAuxiliary_(ps.getParameter<std::string>("triggerPathAuxiliary")),
-  triggerPathLeptonAuxiliary_(ps.getParameter<std::string>("triggerPathLeptonAuxiliary")),
-
-  csvlCut_(ps.getUntrackedParameter<double>("csvlCut")),
-  csvmCut_(ps.getUntrackedParameter<double>("csvmCut")),
-  csvtCut_(ps.getUntrackedParameter<double>("csvtCut")),
-
-  jetPtCut_(ps.getUntrackedParameter<double>("jetPtCut")),
-  jetEtaCut_(ps.getUntrackedParameter<double>("jetEtaCut")),
-  metCut_(ps.getUntrackedParameter<double>("metCut")),
-  htCut_(ps.getUntrackedParameter<double>("htCut")),
-
-  lep_pt_threshold_(ps.getUntrackedParameter<double>("leptonPtThreshold")),
-  ht_threshold_(ps.getUntrackedParameter<double>("htThreshold")),
-  met_threshold_(ps.getUntrackedParameter<double>("metThreshold")),
-  csv_threshold_(ps.getUntrackedParameter<double>("csvThreshold")),
-
-  h_triggerLepPt_(nullptr),
-  h_triggerLepEta_(nullptr),
-  h_triggerLepPhi_(nullptr),
-  h_HT_(nullptr),
-  h_MET_(nullptr),
-  h_maxCSV_(nullptr),
-  h_leptonTurnOn_num_(nullptr),
-  h_leptonTurnOn_den_(nullptr),
-  h_pfHTTurnOn_num_(nullptr),
-  h_pfHTTurnOn_den_(nullptr),
-  h_pfMetTurnOn_num_(nullptr),
-  h_pfMetTurnOn_den_(nullptr),
-  h_CSVTurnOn_num_(nullptr),
-  h_CSVTurnOn_den_(nullptr),
-  h_btagTurnOn_num_(nullptr),
-  h_btagTurnOn_den_(nullptr){
-  edm::LogInfo("SUSY_HLT_SingleLepton")
-    << "Constructor SUSY_HLT_SingleLepton::SUSY_HLT_SingleLepton\n";
-  }
-
-SUSY_HLT_SingleLepton::~SUSY_HLT_SingleLepton(){
-  edm::LogInfo("SUSY_HLT_SingleLepton")
-    << "Destructor SUSY_HLT_SingleLepton::~SUSY_HLT_SingleLepton\n";
+SUSY_HLT_SingleLepton::~SUSY_HLT_SingleLepton() {
+  edm::LogInfo("SUSY_HLT_SingleLepton") << "Destructor SUSY_HLT_SingleLepton::~SUSY_HLT_SingleLepton\n";
 }
 
-void SUSY_HLT_SingleLepton::dqmBeginRun(const edm::Run &run, const edm::EventSetup &e){
+void SUSY_HLT_SingleLepton::dqmBeginRun(const edm::Run &run, const edm::EventSetup &e) {
   bool changed;
 
-  if(!fHltConfig_.init(run, e, HLTProcess_, changed)){
-    edm::LogError("SUSY_HLT_SingleLepton")
-      << "Initialization of HLTConfigProvider failed!!\n";
+  if (!fHltConfig_.init(run, e, HLTProcess_, changed)) {
+    edm::LogError("SUSY_HLT_SingleLepton") << "Initialization of HLTConfigProvider failed!!\n";
     return;
   }
 
   bool pathFound = false;
-  for(const auto &trig_name: fHltConfig_.triggerNames()){
-    if(Contains(trig_name, triggerPath_)) pathFound = true;
+  for (const auto &trig_name : fHltConfig_.triggerNames()) {
+    if (Contains(trig_name, triggerPath_))
+      pathFound = true;
   }
 
-  if(!pathFound){
+  if (!pathFound) {
     LogDebug("SUSY_HLT_SingleLepton") << "Path not found: " << triggerPath_ << '\n';
     return;
   }
@@ -239,95 +263,64 @@ void SUSY_HLT_SingleLepton::dqmBeginRun(const edm::Run &run, const edm::EventSet
   edm::LogInfo("SUSY_HLT_SingleLepton") << "SUSY_HLT_SingleLepton::beginRun\n";
 }
 
-void SUSY_HLT_SingleLepton::bookHistograms(DQMStore::IBooker &ibooker,
-                                           const edm::Run &, const edm::EventSetup &){
+void SUSY_HLT_SingleLepton::bookHistograms(DQMStore::IBooker &ibooker, const edm::Run &, const edm::EventSetup &) {
   edm::LogInfo("SUSY_HLT_SingleLepton") << "SUSY_HLT_SingleLepton::bookHistograms\n";
-  //book at beginRun
+  // book at beginRun
   ibooker.cd();
   ibooker.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
 
   bool is_mu = false;
   bool is_ele = false;
-  if(theElectronTag_.label().empty() && !theMuonTag_.label().empty()){
-    is_mu=true;
-  }else if(!theElectronTag_.label().empty() && theMuonTag_.label().empty()){
-    is_ele=true;
-  }
-  std::string lepton="lepton", Lepton="Lepton";
-  if(is_mu && !is_ele){
-    lepton="muon";
-    Lepton="Muon";
-  }else if(is_ele && !is_mu){
-    lepton="electron";
-    Lepton="Electron";
-  }
-
-  //online quantities
-  h_triggerLepPt_ = ibooker.book1D("triggerLepPt",
-                                   (";"+Lepton+" p_{T} [GeV];").c_str(),
-                                   20, 0.0, 500.0);
-  h_triggerLepEta_ = ibooker.book1D("triggerLepEta",
-                                    (";"+Lepton+" #eta;").c_str(),
-                                    20, -3.0, 3.0);
-  h_triggerLepPhi_ = ibooker.book1D("triggerLepPhi",
-                                    (";"+Lepton+" #phi;").c_str(),
-                                    20, -3.5, 3.5);
-
-  if(!theHLTHTTag_.label().empty()){
-    h_HT_ = ibooker.book1D("HT",
-                           ";HLT HT [GeV];",
-                           40, 0.0, 1000.0);
-  }
-
-  if(!theHLTMETTag_.label().empty()){
-    h_MET_ = ibooker.book1D("MET",
-                            ";HLT MET [GeV];",
-                            40, 0.0, 1000.0);
-  }
-
-  if(!theHLTJetCollectionTag_.label().empty() && !theHLTJetTagCollectionTag_.label().empty()){
-    h_maxCSV_ = ibooker.book1D("maxCSV",
-                               ";Max HLT CSV;",
-                               20, 0.0, 1.0);
-  }
-
-  //num and den hists to be divided in harvesting step to make turn on curves
-  h_leptonTurnOn_num_ = ibooker.book1D("leptonTurnOn_num",
-                                       ("Numerator;Offline "+lepton+" p_{T} [GeV];").c_str(),
-                                       30, 0.0, 150);
-  h_leptonTurnOn_den_ = ibooker.book1D("leptonTurnOn_den",
-                                       ("Denominator;Offline "+lepton+" p_{T} [GeV];").c_str(),
-                                       30, 0.0, 150.0);
-  h_pfHTTurnOn_num_ = ibooker.book1D("pfHTTurnOn_num",
-                                     "Numerator;Offline H_{T} [GeV];",
-                                     30, 0.0, 1500.0 );
-  h_pfHTTurnOn_den_ = ibooker.book1D("pfHTTurnOn_den",
-                                     "Denominator;Offline H_{T} [GeV];",
-                                     30, 0.0, 1500.0 );
-
-  if(!theHLTMETTag_.label().empty()){
-    h_pfMetTurnOn_num_ = ibooker.book1D("pfMetTurnOn_num",
-                                        "Numerator;Offline MET [GeV];",
-                                        20, 0.0, 500.0 );
-    h_pfMetTurnOn_den_ = ibooker.book1D("pfMetTurnOn_den",
-                                        "Denominator;Offline MET [GeV];",
-                                        20, 0.0, 500.0 );
-  }
-
-  if(!theHLTJetCollectionTag_.label().empty() && !theHLTJetTagCollectionTag_.label().empty()){
-    h_CSVTurnOn_num_ = ibooker.book1D("CSVTurnOn_num",
-                                      "Numerator;Offline Max CSV Discriminant;",
-                                      20, 0.0, 1.0);
-    h_CSVTurnOn_den_ = ibooker.book1D("CSVTurnOn_den",
-                                      "Denominator;Offline Max CSV Discriminant;",
-                                      20, 0.0, 1.0);
-
-    h_btagTurnOn_num_ = ibooker.book1D("btagTurnOn_num",
-                                       "Numerator;Offline CSV Requirement;",
-                                       13, -0.5, 12.5);
-    h_btagTurnOn_den_ = ibooker.book1D("btagTurnOn_den",
-                                       "Denominator;Offline CSV Requirements;",
-                                       13, -0.5, 12.5);
+  if (theElectronTag_.label().empty() && !theMuonTag_.label().empty()) {
+    is_mu = true;
+  } else if (!theElectronTag_.label().empty() && theMuonTag_.label().empty()) {
+    is_ele = true;
+  }
+  std::string lepton = "lepton", Lepton = "Lepton";
+  if (is_mu && !is_ele) {
+    lepton = "muon";
+    Lepton = "Muon";
+  } else if (is_ele && !is_mu) {
+    lepton = "electron";
+    Lepton = "Electron";
+  }
+
+  // online quantities
+  h_triggerLepPt_ = ibooker.book1D("triggerLepPt", (";" + Lepton + " p_{T} [GeV];").c_str(), 20, 0.0, 500.0);
+  h_triggerLepEta_ = ibooker.book1D("triggerLepEta", (";" + Lepton + " #eta;").c_str(), 20, -3.0, 3.0);
+  h_triggerLepPhi_ = ibooker.book1D("triggerLepPhi", (";" + Lepton + " #phi;").c_str(), 20, -3.5, 3.5);
+
+  if (!theHLTHTTag_.label().empty()) {
+    h_HT_ = ibooker.book1D("HT", ";HLT HT [GeV];", 40, 0.0, 1000.0);
+  }
+
+  if (!theHLTMETTag_.label().empty()) {
+    h_MET_ = ibooker.book1D("MET", ";HLT MET [GeV];", 40, 0.0, 1000.0);
+  }
+
+  if (!theHLTJetCollectionTag_.label().empty() && !theHLTJetTagCollectionTag_.label().empty()) {
+    h_maxCSV_ = ibooker.book1D("maxCSV", ";Max HLT CSV;", 20, 0.0, 1.0);
+  }
+
+  // num and den hists to be divided in harvesting step to make turn on curves
+  h_leptonTurnOn_num_ =
+      ibooker.book1D("leptonTurnOn_num", ("Numerator;Offline " + lepton + " p_{T} [GeV];").c_str(), 30, 0.0, 150);
+  h_leptonTurnOn_den_ =
+      ibooker.book1D("leptonTurnOn_den", ("Denominator;Offline " + lepton + " p_{T} [GeV];").c_str(), 30, 0.0, 150.0);
+  h_pfHTTurnOn_num_ = ibooker.book1D("pfHTTurnOn_num", "Numerator;Offline H_{T} [GeV];", 30, 0.0, 1500.0);
+  h_pfHTTurnOn_den_ = ibooker.book1D("pfHTTurnOn_den", "Denominator;Offline H_{T} [GeV];", 30, 0.0, 1500.0);
+
+  if (!theHLTMETTag_.label().empty()) {
+    h_pfMetTurnOn_num_ = ibooker.book1D("pfMetTurnOn_num", "Numerator;Offline MET [GeV];", 20, 0.0, 500.0);
+    h_pfMetTurnOn_den_ = ibooker.book1D("pfMetTurnOn_den", "Denominator;Offline MET [GeV];", 20, 0.0, 500.0);
+  }
+
+  if (!theHLTJetCollectionTag_.label().empty() && !theHLTJetTagCollectionTag_.label().empty()) {
+    h_CSVTurnOn_num_ = ibooker.book1D("CSVTurnOn_num", "Numerator;Offline Max CSV Discriminant;", 20, 0.0, 1.0);
+    h_CSVTurnOn_den_ = ibooker.book1D("CSVTurnOn_den", "Denominator;Offline Max CSV Discriminant;", 20, 0.0, 1.0);
+
+    h_btagTurnOn_num_ = ibooker.book1D("btagTurnOn_num", "Numerator;Offline CSV Requirement;", 13, -0.5, 12.5);
+    h_btagTurnOn_den_ = ibooker.book1D("btagTurnOn_den", "Denominator;Offline CSV Requirements;", 13, -0.5, 12.5);
 
     SetBinLabels(h_btagTurnOn_num_);
     SetBinLabels(h_btagTurnOn_den_);
@@ -335,240 +328,239 @@ void SUSY_HLT_SingleLepton::bookHistograms(DQMStore::IBooker &ibooker,
   ibooker.cd();
 }
 
-
-void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup &eSetup){
+void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup &eSetup) {
   edm::LogInfo("SUSY_HLT_SingleLepton") << "SUSY_HLT_SingleLepton::analyze\n";
 
-
-  //HLT HT
+  // HLT HT
   edm::Handle<reco::METCollection> HLTHT;
-  if(!theHLTHTTag_.label().empty()){
+  if (!theHLTHTTag_.label().empty()) {
     e.getByToken(theHLTHT_, HLTHT);
-    if( !HLTHT.isValid() ){
-      edm::LogInfo("SUSY_HLT_SingleLepton")
-        << "Invalid METCollection: " << theHLTHTTag_.label() << '\n';
+    if (!HLTHT.isValid()) {
+      edm::LogInfo("SUSY_HLT_SingleLepton") << "Invalid METCollection: " << theHLTHTTag_.label() << '\n';
     }
   }
 
-  //HLT MET
+  // HLT MET
   edm::Handle<reco::METCollection> HLTMET;
-  if(!theHLTMETTag_.label().empty()){
+  if (!theHLTMETTag_.label().empty()) {
     e.getByToken(theHLTMET_, HLTMET);
-    if( !HLTMET.isValid() ){
-      edm::LogInfo("SUSY_HLT_SingleLepton")
-        << "Invalid METCollection: " << theHLTMETTag_.label() << '\n';
+    if (!HLTMET.isValid()) {
+      edm::LogInfo("SUSY_HLT_SingleLepton") << "Invalid METCollection: " << theHLTMETTag_.label() << '\n';
     }
   }
 
-  //HLT Jets
+  // HLT Jets
   edm::Handle<reco::CaloJetCollection> HLTJetCollection;
-  if(!theHLTJetCollectionTag_.label().empty()){
+  if (!theHLTJetCollectionTag_.label().empty()) {
     e.getByToken(theHLTJetCollection_, HLTJetCollection);
-    if( !HLTJetCollection.isValid() ){
-      edm::LogInfo("SUSY_HLT_SingleLepton")
-        << "Invalid CaloJetCollection: " << theHLTJetCollectionTag_.label() << '\n';
+    if (!HLTJetCollection.isValid()) {
+      edm::LogInfo("SUSY_HLT_SingleLepton") << "Invalid CaloJetCollection: " << theHLTJetCollectionTag_.label() << '\n';
     }
   }
 
-  //HLT Jet Tags
+  // HLT Jet Tags
   edm::Handle<reco::JetTagCollection> HLTJetTagCollection;
-  if(!theHLTJetTagCollectionTag_.label().empty()){
+  if (!theHLTJetTagCollectionTag_.label().empty()) {
     e.getByToken(theHLTJetTagCollection_, HLTJetTagCollection);
-    if( !HLTJetTagCollection.isValid() ){
+    if (!HLTJetTagCollection.isValid()) {
       edm::LogInfo("SUSY_HLT_SingleLepton")
-        << "Invalid JetTagCollection: " << theHLTJetTagCollectionTag_.label() << '\n';
+          << "Invalid JetTagCollection: " << theHLTJetTagCollectionTag_.label() << '\n';
     }
   }
 
-  //Vertex
+  // Vertex
   edm::Handle<reco::VertexCollection> VertexCollection;
-  if(!theVertexCollectionTag_.label().empty()){
+  if (!theVertexCollectionTag_.label().empty()) {
     e.getByToken(theVertexCollection_, VertexCollection);
-    if( !VertexCollection.isValid() ){
+    if (!VertexCollection.isValid()) {
       edm::LogWarning("SUSY_HLT_SingleLepton")
-        << "Invalid VertexCollection: " << theVertexCollectionTag_.label() << '\n';
+          << "Invalid VertexCollection: " << theVertexCollectionTag_.label() << '\n';
     }
   }
 
-  //Conversions
+  // Conversions
   edm::Handle<reco::ConversionCollection> ConversionCollection;
-  if(!theConversionCollectionTag_.label().empty()){
+  if (!theConversionCollectionTag_.label().empty()) {
     e.getByToken(theConversionCollection_, ConversionCollection);
-    if( !ConversionCollection.isValid() ){
+    if (!ConversionCollection.isValid()) {
       edm::LogWarning("SUSY_HLT_SingleLepton")
-        << "Invalid ConversionCollection: " << theConversionCollectionTag_.label() << '\n';
+          << "Invalid ConversionCollection: " << theConversionCollectionTag_.label() << '\n';
     }
   }
 
-  //Beam Spot
+  // Beam Spot
   edm::Handle<reco::BeamSpot> BeamSpot;
-  if(!theBeamSpotTag_.label().empty()){
+  if (!theBeamSpotTag_.label().empty()) {
     e.getByToken(theBeamSpot_, BeamSpot);
-    if( !BeamSpot.isValid() ){
-      edm::LogWarning("SUSY_HLT_SingleLepton")
-        << "Invalid BeamSpot: " << theBeamSpotTag_.label() << '\n';
+    if (!BeamSpot.isValid()) {
+      edm::LogWarning("SUSY_HLT_SingleLepton") << "Invalid BeamSpot: " << theBeamSpotTag_.label() << '\n';
     }
   }
 
-  //MET
+  // MET
   edm::Handle<reco::PFMETCollection> pfMETCollection;
-  if(!thePfMETTag_.label().empty()){
+  if (!thePfMETTag_.label().empty()) {
     e.getByToken(thePfMETCollection_, pfMETCollection);
-    if( !pfMETCollection.isValid() ){
-      edm::LogWarning("SUSY_HLT_SingleLepton")
-        << "Invalid PFMETCollection: " << thePfMETTag_.label() << '\n';
+    if (!pfMETCollection.isValid()) {
+      edm::LogWarning("SUSY_HLT_SingleLepton") << "Invalid PFMETCollection: " << thePfMETTag_.label() << '\n';
     }
   }
 
-  //Jets
+  // Jets
   edm::Handle<reco::PFJetCollection> pfJetCollection;
-  if(!thePfJetTag_.label().empty()){
-    e.getByToken (thePfJetCollection_,pfJetCollection);
-    if( !pfJetCollection.isValid() ){
-      edm::LogWarning("SUSY_HLT_SingleLepton")
-        << "Invalid PFJetCollection: " << thePfJetTag_.label() << '\n';
+  if (!thePfJetTag_.label().empty()) {
+    e.getByToken(thePfJetCollection_, pfJetCollection);
+    if (!pfJetCollection.isValid()) {
+      edm::LogWarning("SUSY_HLT_SingleLepton") << "Invalid PFJetCollection: " << thePfJetTag_.label() << '\n';
     }
   }
 
-  //b-tags
+  // b-tags
   edm::Handle<reco::JetTagCollection> jetTagCollection;
-  if(!theJetTagTag_.label().empty()){
+  if (!theJetTagTag_.label().empty()) {
     e.getByToken(theJetTagCollection_, jetTagCollection);
-    if( !jetTagCollection.isValid() ){
-      edm::LogWarning("SUSY_HLT_SingleLepton")
-        << "Invalid JetTagCollection: " << theJetTagTag_.label() << '\n';
+    if (!jetTagCollection.isValid()) {
+      edm::LogWarning("SUSY_HLT_SingleLepton") << "Invalid JetTagCollection: " << theJetTagTag_.label() << '\n';
     }
   }
 
-  //Electron
+  // Electron
   edm::Handle<reco::GsfElectronCollection> ElectronCollection;
-  if(!theElectronTag_.label().empty()){
-    e.getByToken (theElectronCollection_, ElectronCollection);
-    if( !ElectronCollection.isValid() ){
-      edm::LogWarning("SUSY_HLT_SingleLepton")
-        << "Invalid GsfElectronCollection: " << theElectronTag_.label() << '\n';
+  if (!theElectronTag_.label().empty()) {
+    e.getByToken(theElectronCollection_, ElectronCollection);
+    if (!ElectronCollection.isValid()) {
+      edm::LogWarning("SUSY_HLT_SingleLepton") << "Invalid GsfElectronCollection: " << theElectronTag_.label() << '\n';
     }
   }
 
-  //Muon
+  // Muon
   edm::Handle<reco::MuonCollection> MuonCollection;
-  if(!theMuonTag_.label().empty()){
-    e.getByToken (theMuonCollection_, MuonCollection);
-    if( !MuonCollection.isValid() ){
-      edm::LogWarning("SUSY_HLT_SingleLepton")
-        << "Invalid MuonCollection: " << theMuonTag_.label() << '\n';
+  if (!theMuonTag_.label().empty()) {
+    e.getByToken(theMuonCollection_, MuonCollection);
+    if (!MuonCollection.isValid()) {
+      edm::LogWarning("SUSY_HLT_SingleLepton") << "Invalid MuonCollection: " << theMuonTag_.label() << '\n';
     }
   }
 
-  //Trigger
+  // Trigger
   edm::Handle<edm::TriggerResults> hltresults;
-  if(!theTriggerResultsTag_.label().empty()){
+  if (!theTriggerResultsTag_.label().empty()) {
     e.getByToken(theTriggerResults_, hltresults);
-    if( !hltresults.isValid() ){
-      edm::LogWarning("SUSY_HLT_SingleLepton")
-        << "Invalid TriggerResults: " << theTriggerResultsTag_.label() << '\n';
+    if (!hltresults.isValid()) {
+      edm::LogWarning("SUSY_HLT_SingleLepton") << "Invalid TriggerResults: " << theTriggerResultsTag_.label() << '\n';
     }
   }
   edm::Handle<trigger::TriggerEvent> triggerSummary;
-  if(!theTrigSummaryTag_.label().empty()){
+  if (!theTrigSummaryTag_.label().empty()) {
     e.getByToken(theTrigSummary_, triggerSummary);
-    if( !triggerSummary.isValid() ){
-      edm::LogWarning("SUSY_HLT_SingleLepton")
-        << "Invalid TriggerEvent: " << theTrigSummaryTag_.label() << '\n';
+    if (!triggerSummary.isValid()) {
+      edm::LogWarning("SUSY_HLT_SingleLepton") << "Invalid TriggerEvent: " << theTrigSummaryTag_.label() << '\n';
     }
   }
 
-  //Get online leptons
+  // Get online leptons
   std::vector<float> ptLepton, etaLepton, phiLepton;
-  if(triggerSummary.isValid()){
-    //Leptons
+  if (triggerSummary.isValid()) {
+    // Leptons
     size_t filterIndex = triggerSummary->filterIndex(theLeptonFilterTag_);
     trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
-    if( !(filterIndex >= triggerSummary->sizeFilters()) ){
+    if (!(filterIndex >= triggerSummary->sizeFilters())) {
       size_t ilep = 0, num_keys = triggerSummary->filterKeys(filterIndex).size();
       ptLepton.resize(num_keys);
       etaLepton.resize(num_keys);
       phiLepton.resize(num_keys);
-      for(const auto &key: triggerSummary->filterKeys(filterIndex)){
+      for (const auto &key : triggerSummary->filterKeys(filterIndex)) {
         const trigger::TriggerObject &foundObject = triggerObjects[key];
 
-        if(h_triggerLepPt_) h_triggerLepPt_->Fill(foundObject.pt());
-        if(h_triggerLepEta_) h_triggerLepEta_->Fill(foundObject.eta());
-        if(h_triggerLepPhi_) h_triggerLepPhi_->Fill(foundObject.phi());
-
-        ptLepton.at(ilep)=foundObject.pt();
-        etaLepton.at(ilep)=foundObject.eta();
-        phiLepton.at(ilep)=foundObject.phi();
-	++ilep;
+        if (h_triggerLepPt_)
+          h_triggerLepPt_->Fill(foundObject.pt());
+        if (h_triggerLepEta_)
+          h_triggerLepEta_->Fill(foundObject.eta());
+        if (h_triggerLepPhi_)
+          h_triggerLepPhi_->Fill(foundObject.phi());
+
+        ptLepton.at(ilep) = foundObject.pt();
+        etaLepton.at(ilep) = foundObject.eta();
+        phiLepton.at(ilep) = foundObject.phi();
+        ++ilep;
       }
     }
   }
 
-  //Get online ht and met
-  const float hlt_ht = ((HLTHT.isValid() && !HLTHT->empty())?HLTHT->front().sumEt():-1.0);
-  if(h_HT_) h_HT_->Fill(hlt_ht);
-  const float hlt_met = ((HLTMET.isValid() && !HLTMET->empty())?HLTMET->front().pt():-1.0);
-  if(h_MET_) h_MET_->Fill(hlt_met);
+  // Get online ht and met
+  const float hlt_ht = ((HLTHT.isValid() && !HLTHT->empty()) ? HLTHT->front().sumEt() : -1.0);
+  if (h_HT_)
+    h_HT_->Fill(hlt_ht);
+  const float hlt_met = ((HLTMET.isValid() && !HLTMET->empty()) ? HLTMET->front().pt() : -1.0);
+  if (h_MET_)
+    h_MET_->Fill(hlt_met);
 
-  //Get online csv and fill plot
+  // Get online csv and fill plot
   float hlt_csv = -1.0;
-  if(HLTJetCollection.isValid() && HLTJetTagCollection.isValid()){
-    for(const auto &jet: *HLTJetTagCollection){
-      if(jet.second>hlt_csv) hlt_csv = jet.second;
+  if (HLTJetCollection.isValid() && HLTJetTagCollection.isValid()) {
+    for (const auto &jet : *HLTJetTagCollection) {
+      if (jet.second > hlt_csv)
+        hlt_csv = jet.second;
     }
   }
-  if(h_maxCSV_) h_maxCSV_->Fill(hlt_csv);
+  if (h_maxCSV_)
+    h_maxCSV_->Fill(hlt_csv);
 
-  //Test whether main and auxilliary triggers fired
+  // Test whether main and auxilliary triggers fired
   bool hasFired = false;
   bool hasFiredAuxiliary = false;
   bool hasFiredLeptonAuxiliary = false;
-  if(hltresults.isValid()){
+  if (hltresults.isValid()) {
     const edm::TriggerNames &trigNames = e.triggerNames(*hltresults);
-    for( unsigned int hltIndex = 0; hltIndex < trigNames.size(); ++hltIndex ){
-      if(hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)){
-        const std::string& name = trigNames.triggerName(hltIndex);
-        if(Contains(name, triggerPath_)) hasFired=true;
-        if(Contains(name, triggerPathAuxiliary_)) hasFiredAuxiliary=true;
-	if(Contains(name, triggerPathLeptonAuxiliary_)) hasFiredLeptonAuxiliary=true;
+    for (unsigned int hltIndex = 0; hltIndex < trigNames.size(); ++hltIndex) {
+      if (hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) {
+        const std::string &name = trigNames.triggerName(hltIndex);
+        if (Contains(name, triggerPath_))
+          hasFired = true;
+        if (Contains(name, triggerPathAuxiliary_))
+          hasFiredAuxiliary = true;
+        if (Contains(name, triggerPathLeptonAuxiliary_))
+          hasFiredLeptonAuxiliary = true;
       }
     }
   }
 
-  //Get offline HT
+  // Get offline HT
   double pfHT = -1.0;
-  if(pfJetCollection.isValid()){
-    pfHT=0.0;
-    for(const auto &pfjet: *pfJetCollection){
-      if(pfjet.pt() < jetPtCut_) continue;
-      if(fabs(pfjet.eta()) > jetEtaCut_) continue;
+  if (pfJetCollection.isValid()) {
+    pfHT = 0.0;
+    for (const auto &pfjet : *pfJetCollection) {
+      if (pfjet.pt() < jetPtCut_)
+        continue;
+      if (fabs(pfjet.eta()) > jetEtaCut_)
+        continue;
       pfHT += pfjet.pt();
     }
   }
 
-  //Get offline MET
+  // Get offline MET
   double pfMET = -1.0;
-  if(pfMETCollection.isValid() && !pfMETCollection->empty()){
+  if (pfMETCollection.isValid() && !pfMETCollection->empty()) {
     pfMET = pfMETCollection->front().et();
   }
 
-  //Get offline b-tagging info
+  // Get offline b-tagging info
   float maxCSV = -1.0;
   unsigned num_csvl = 0;
   unsigned num_csvm = 0;
   unsigned num_csvt = 0;
-  if(jetTagCollection.isValid()){
-    for(const auto &jet: *jetTagCollection){
+  if (jetTagCollection.isValid()) {
+    for (const auto &jet : *jetTagCollection) {
       const float CSV = jet.second;
-      if(jet.first->pt()>jetPtCut_){
-        if(CSV>maxCSV){
-          maxCSV=CSV;
+      if (jet.first->pt() > jetPtCut_) {
+        if (CSV > maxCSV) {
+          maxCSV = CSV;
         }
-        if(CSV>csvlCut_){
+        if (CSV > csvlCut_) {
           ++num_csvl;
-          if(CSV>csvmCut_){
+          if (CSV > csvmCut_) {
             ++num_csvm;
-            if(CSV>csvtCut_){
+            if (CSV > csvtCut_) {
               ++num_csvt;
             }
           }
@@ -576,124 +568,159 @@ void SUSY_HLT_SingleLepton::analyze(const edm::Event &e, const edm::EventSetup &
       }
     }
   }
-  if(h_maxCSV_) h_maxCSV_->Fill(maxCSV);
+  if (h_maxCSV_)
+    h_maxCSV_->Fill(maxCSV);
 
-  //Fill lepton pt efficiency plot
+  // Fill lepton pt efficiency plot
   double lep_max_pt = -1.0;
-  if(VertexCollection.isValid() && !VertexCollection->empty()){//for quality checks
-    //Try to find a reco electron
-    if(ElectronCollection.isValid()
-       && ConversionCollection.isValid()
-       && BeamSpot.isValid()){
-      for(const auto &electron: *ElectronCollection){
-        if(IsGood(electron, VertexCollection->front().position(),
-                  BeamSpot->position(), ConversionCollection)){
-          if(electron.pt()>lep_max_pt) lep_max_pt=electron.pt();
+  if (VertexCollection.isValid() && !VertexCollection->empty()) {  // for quality checks
+    // Try to find a reco electron
+    if (ElectronCollection.isValid() && ConversionCollection.isValid() && BeamSpot.isValid()) {
+      for (const auto &electron : *ElectronCollection) {
+        if (IsGood(electron, VertexCollection->front().position(), BeamSpot->position(), ConversionCollection)) {
+          if (electron.pt() > lep_max_pt)
+            lep_max_pt = electron.pt();
         }
       }
     }
 
-    //Try to find a reco muon
-    if(MuonCollection.isValid()){
-      for(const auto &muon: *MuonCollection){
-        if(IsGood(muon, VertexCollection->front().position())){
-          if(muon.pt()>lep_max_pt){
-            lep_max_pt=muon.pt();
+    // Try to find a reco muon
+    if (MuonCollection.isValid()) {
+      for (const auto &muon : *MuonCollection) {
+        if (IsGood(muon, VertexCollection->front().position())) {
+          if (muon.pt() > lep_max_pt) {
+            lep_max_pt = muon.pt();
           }
         }
       }
     }
   }
 
-  const bool lep_plateau = lep_max_pt>lep_pt_threshold_ || lep_pt_threshold_<0.0;
-  const bool ht_plateau = pfHT>ht_threshold_ || ht_threshold_<0.0;
-  const bool met_plateau = pfMET>met_threshold_ || met_threshold_<0.0;
-  const bool csv_plateau = maxCSV>csv_threshold_ || csv_threshold_<0.0;
-
-  //Fill lepton turn-on histograms
-  if(hasFiredLeptonAuxiliary || triggerPathLeptonAuxiliary_.empty() || !e.isRealData()){
-    //Fill histograms using highest pt reco lepton
-    if(ht_plateau && met_plateau && csv_plateau
-       && (pfMET>metCut_ || metCut_<0.0)
-       && (pfHT>htCut_ || htCut_<0.0)){
-      if(h_leptonTurnOn_den_) h_leptonTurnOn_den_->Fill(lep_max_pt);
-      if(h_leptonTurnOn_num_ && hasFired) h_leptonTurnOn_num_->Fill(lep_max_pt);
-    }
-  }
-
-  //Fill remaining turn-on histograms
-  if(hasFiredAuxiliary || triggerPathAuxiliary_.empty() || !e.isRealData()){
-    //Fill HT efficiency plot
-    if(lep_plateau && met_plateau && csv_plateau){
-      if(h_pfHTTurnOn_den_) h_pfHTTurnOn_den_->Fill(pfHT);
-      if(h_pfHTTurnOn_num_ && hasFired) h_pfHTTurnOn_num_->Fill(pfHT);
-    }
-
-    //Fill MET efficiency plot
-    if(lep_plateau && ht_plateau && csv_plateau){
-      if(h_pfMetTurnOn_den_) h_pfMetTurnOn_den_->Fill(pfMET);
-      if(h_pfMetTurnOn_num_ && hasFired) h_pfMetTurnOn_num_->Fill(pfMET);
-    }
-
-    //Fill CSV efficiency plot
-    if(lep_plateau && ht_plateau && met_plateau){
-      if(h_CSVTurnOn_den_) h_CSVTurnOn_den_->Fill(maxCSV);
-      if(h_CSVTurnOn_num_ && hasFired) h_CSVTurnOn_num_->Fill(maxCSV);
-
-      if(h_btagTurnOn_den_){
-        switch(num_csvl){
-        default: h_btagTurnOn_den_->Fill(4);
-        case 3 : h_btagTurnOn_den_->Fill(3);
-        case 2 : h_btagTurnOn_den_->Fill(2);
-        case 1 : h_btagTurnOn_den_->Fill(1);
-        case 0 : h_btagTurnOn_den_->Fill(0);
+  const bool lep_plateau = lep_max_pt > lep_pt_threshold_ || lep_pt_threshold_ < 0.0;
+  const bool ht_plateau = pfHT > ht_threshold_ || ht_threshold_ < 0.0;
+  const bool met_plateau = pfMET > met_threshold_ || met_threshold_ < 0.0;
+  const bool csv_plateau = maxCSV > csv_threshold_ || csv_threshold_ < 0.0;
+
+  // Fill lepton turn-on histograms
+  if (hasFiredLeptonAuxiliary || triggerPathLeptonAuxiliary_.empty() || !e.isRealData()) {
+    // Fill histograms using highest pt reco lepton
+    if (ht_plateau && met_plateau && csv_plateau && (pfMET > metCut_ || metCut_ < 0.0) &&
+        (pfHT > htCut_ || htCut_ < 0.0)) {
+      if (h_leptonTurnOn_den_)
+        h_leptonTurnOn_den_->Fill(lep_max_pt);
+      if (h_leptonTurnOn_num_ && hasFired)
+        h_leptonTurnOn_num_->Fill(lep_max_pt);
+    }
+  }
+
+  // Fill remaining turn-on histograms
+  if (hasFiredAuxiliary || triggerPathAuxiliary_.empty() || !e.isRealData()) {
+    // Fill HT efficiency plot
+    if (lep_plateau && met_plateau && csv_plateau) {
+      if (h_pfHTTurnOn_den_)
+        h_pfHTTurnOn_den_->Fill(pfHT);
+      if (h_pfHTTurnOn_num_ && hasFired)
+        h_pfHTTurnOn_num_->Fill(pfHT);
+    }
+
+    // Fill MET efficiency plot
+    if (lep_plateau && ht_plateau && csv_plateau) {
+      if (h_pfMetTurnOn_den_)
+        h_pfMetTurnOn_den_->Fill(pfMET);
+      if (h_pfMetTurnOn_num_ && hasFired)
+        h_pfMetTurnOn_num_->Fill(pfMET);
+    }
+
+    // Fill CSV efficiency plot
+    if (lep_plateau && ht_plateau && met_plateau) {
+      if (h_CSVTurnOn_den_)
+        h_CSVTurnOn_den_->Fill(maxCSV);
+      if (h_CSVTurnOn_num_ && hasFired)
+        h_CSVTurnOn_num_->Fill(maxCSV);
+
+      if (h_btagTurnOn_den_) {
+        switch (num_csvl) {
+          default:
+            h_btagTurnOn_den_->Fill(4);
+          case 3:
+            h_btagTurnOn_den_->Fill(3);
+          case 2:
+            h_btagTurnOn_den_->Fill(2);
+          case 1:
+            h_btagTurnOn_den_->Fill(1);
+          case 0:
+            h_btagTurnOn_den_->Fill(0);
         }
-        switch(num_csvm){
-        default: h_btagTurnOn_den_->Fill(8);
-        case 3 : h_btagTurnOn_den_->Fill(7);
-        case 2 : h_btagTurnOn_den_->Fill(6);
-        case 1 : h_btagTurnOn_den_->Fill(5);
-        case 0 : break;//Don't double count in the no tag bin
+        switch (num_csvm) {
+          default:
+            h_btagTurnOn_den_->Fill(8);
+          case 3:
+            h_btagTurnOn_den_->Fill(7);
+          case 2:
+            h_btagTurnOn_den_->Fill(6);
+          case 1:
+            h_btagTurnOn_den_->Fill(5);
+          case 0:
+            break;  // Don't double count in the no tag bin
         }
-        switch(num_csvt){
-        default: h_btagTurnOn_den_->Fill(12);
-        case 3 : h_btagTurnOn_den_->Fill(11);
-        case 2 : h_btagTurnOn_den_->Fill(10);
-        case 1 : h_btagTurnOn_den_->Fill(9);
-        case 0 : break;//Don't double count in the no tag bin
+        switch (num_csvt) {
+          default:
+            h_btagTurnOn_den_->Fill(12);
+          case 3:
+            h_btagTurnOn_den_->Fill(11);
+          case 2:
+            h_btagTurnOn_den_->Fill(10);
+          case 1:
+            h_btagTurnOn_den_->Fill(9);
+          case 0:
+            break;  // Don't double count in the no tag bin
         }
       }
-      if(h_btagTurnOn_num_ && hasFired){
-        switch(num_csvl){
-        default: h_btagTurnOn_num_->Fill(4);
-        case 3 : h_btagTurnOn_num_->Fill(3);
-        case 2 : h_btagTurnOn_num_->Fill(2);
-        case 1 : h_btagTurnOn_num_->Fill(1);
-        case 0 : h_btagTurnOn_num_->Fill(0);
+      if (h_btagTurnOn_num_ && hasFired) {
+        switch (num_csvl) {
+          default:
+            h_btagTurnOn_num_->Fill(4);
+          case 3:
+            h_btagTurnOn_num_->Fill(3);
+          case 2:
+            h_btagTurnOn_num_->Fill(2);
+          case 1:
+            h_btagTurnOn_num_->Fill(1);
+          case 0:
+            h_btagTurnOn_num_->Fill(0);
         }
-        switch(num_csvm){
-        default: h_btagTurnOn_num_->Fill(8);
-        case 3 : h_btagTurnOn_num_->Fill(7);
-        case 2 : h_btagTurnOn_num_->Fill(6);
-        case 1 : h_btagTurnOn_num_->Fill(5);
-        case 0 : break;//Don't double count in the no tag bin
+        switch (num_csvm) {
+          default:
+            h_btagTurnOn_num_->Fill(8);
+          case 3:
+            h_btagTurnOn_num_->Fill(7);
+          case 2:
+            h_btagTurnOn_num_->Fill(6);
+          case 1:
+            h_btagTurnOn_num_->Fill(5);
+          case 0:
+            break;  // Don't double count in the no tag bin
         }
-        switch(num_csvt){
-        default: h_btagTurnOn_num_->Fill(12);
-        case 3 : h_btagTurnOn_num_->Fill(11);
-        case 2 : h_btagTurnOn_num_->Fill(10);
-        case 1 : h_btagTurnOn_num_->Fill(9);
-        case 0 : break;//Don't double count in the no tag bin
+        switch (num_csvt) {
+          default:
+            h_btagTurnOn_num_->Fill(12);
+          case 3:
+            h_btagTurnOn_num_->Fill(11);
+          case 2:
+            h_btagTurnOn_num_->Fill(10);
+          case 1:
+            h_btagTurnOn_num_->Fill(9);
+          case 0:
+            break;  // Don't double count in the no tag bin
         }
       }
     }
   }
 }
 
-
-void SUSY_HLT_SingleLepton::endRun(const edm::Run &run, const edm::EventSetup &eSetup){
+void SUSY_HLT_SingleLepton::endRun(const edm::Run &run, const edm::EventSetup &eSetup) {
   edm::LogInfo("SUSY_HLT_SingleLepton") << "SUSY_HLT_SingleLepton::endRun\n";
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SUSY_HLT_SingleLepton);
diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_VBF_Mu.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_VBF_Mu.cc
index a99851ccd5aa1..7d34b1dd7001d 100644
--- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_VBF_Mu.cc
+++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_VBF_Mu.cc
@@ -1,23 +1,22 @@
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Common/interface/TriggerNames.h"
 #include "DataFormats/HLTReco/interface/TriggerObject.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
-#include "HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_VBF_Mu.h"
 #include "DataFormats/Math/interface/deltaR.h"
+#include "FWCore/Common/interface/TriggerNames.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_VBF_Mu.h"
+#include "TLorentzVector.h"
 #include <cassert>
+#include <cstdio>
 #include <cstdlib>
-#include "TLorentzVector.h"
-#include <string>
-#include <iostream>
 #include <fstream>
-#include <sys/types.h>
+#include <iostream>
 #include <regex.h>
-#include <cstdio>
+#include <string>
+#include <sys/types.h>
 
-SUSY_HLT_VBF_Mu::SUSY_HLT_VBF_Mu(const edm::ParameterSet& ps)
-{
+SUSY_HLT_VBF_Mu::SUSY_HLT_VBF_Mu(const edm::ParameterSet &ps) {
   edm::LogInfo("SUSY_HLT_VBF_Mu") << "Constructor SUSY_HLT_VBF_Mu::SUSY_HLT_VBF_Mu " << std::endl;
   // Get parameters from configuration file
   theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
@@ -30,7 +29,7 @@ SUSY_HLT_VBF_Mu::SUSY_HLT_VBF_Mu(const edm::ParameterSet& ps)
   HLTProcess_ = ps.getParameter<std::string>("HLTProcess");
   triggerPath_ = ps.getParameter<std::string>("TriggerPath");
   triggerMuFilter_ = ps.getParameter<edm::InputTag>("TriggerFilterMuon");
-  triggerHTFilter_  = ps.getParameter<edm::InputTag>("TriggerFilterHT");
+  triggerHTFilter_ = ps.getParameter<edm::InputTag>("TriggerFilterHT");
   triggerMetFilter_ = ps.getParameter<edm::InputTag>("TriggerFilterMET");
   triggerDiJetFilter_ = ps.getParameter<edm::InputTag>("TriggerFilterMJJ");
   triggerCaloMETFilter_ = ps.getParameter<edm::InputTag>("TriggerFilterCaloMET");
@@ -39,387 +38,366 @@ SUSY_HLT_VBF_Mu::SUSY_HLT_VBF_Mu(const edm::ParameterSet& ps)
   ptThrJet_ = ps.getUntrackedParameter<double>("PtThrJet");
   etaThrJet_ = ps.getUntrackedParameter<double>("EtaThrJet");
   deltaetaVBFJets = ps.getUntrackedParameter<double>("DeltaEtaVBFJets");
-  pfmetOnlinethreshold  = ps.getUntrackedParameter<double>("PFMetCutOnline");
-  muonOnlinethreshold  = ps.getUntrackedParameter<double>("MuonCutOnline");
+  pfmetOnlinethreshold = ps.getUntrackedParameter<double>("PFMetCutOnline");
+  muonOnlinethreshold = ps.getUntrackedParameter<double>("MuonCutOnline");
   htOnlinethreshold = ps.getUntrackedParameter<double>("HTCutOnline");
   mjjOnlinethreshold = ps.getUntrackedParameter<double>("MJJCutOnline");
-  
 }
 
-SUSY_HLT_VBF_Mu::~SUSY_HLT_VBF_Mu()
-{
+SUSY_HLT_VBF_Mu::~SUSY_HLT_VBF_Mu() {
   edm::LogInfo("SUSY_HLT_VBF_Mu") << "Destructor SUSY_HLT_VBF_Mu::~SUSY_HLT_VBF_Mu " << std::endl;
 }
 
-void SUSY_HLT_VBF_Mu::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e)
-{
-  
+void SUSY_HLT_VBF_Mu::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e) {
   bool changed;
-  
+
   if (!fHltConfig.init(run, e, HLTProcess_, changed)) {
     edm::LogError("SUSY_HLT_VBF_Mu") << "Initialization of HLTConfigProvider failed!!";
     return;
   }
-  
+
   bool pathFound = false;
   const std::vector<std::string> allTrigNames = fHltConfig.triggerNames();
-  for(size_t j = 0; j <allTrigNames.size(); ++j) {
-    if(allTrigNames[j].find(triggerPath_) != std::string::npos) {
+  for (size_t j = 0; j < allTrigNames.size(); ++j) {
+    if (allTrigNames[j].find(triggerPath_) != std::string::npos) {
       pathFound = true;
     }
   }
-  
-  if(!pathFound) {
-    LogDebug("SUSY_HLT_VBF_Mu") << "Path not found" << "\n";
+
+  if (!pathFound) {
+    LogDebug("SUSY_HLT_VBF_Mu") << "Path not found"
+                                << "\n";
     return;
   }
 
   edm::LogInfo("SUSY_HLT_VBF_Mu") << "SUSY_HLT_VBF_Mu::beginRun" << std::endl;
 }
 
-void SUSY_HLT_VBF_Mu::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run const &, edm::EventSetup const &)
-{
+void SUSY_HLT_VBF_Mu::bookHistograms(DQMStore::IBooker &ibooker_, edm::Run const &, edm::EventSetup const &) {
   edm::LogInfo("SUSY_HLT_VBF_Mu") << "SUSY_HLT_VBF_Mu::bookHistograms" << std::endl;
-  //book at beginRun
+  // book at beginRun
   bookHistos(ibooker_);
 }
 
-
-
-
-void SUSY_HLT_VBF_Mu::analyze(edm::Event const& e, edm::EventSetup const& eSetup){
-
-
+void SUSY_HLT_VBF_Mu::analyze(edm::Event const &e, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_VBF_Mu") << "SUSY_HLT_VBF_Mu::analyze" << std::endl;
-  
+
   //-------------------------------
   //--- Jets
   //-------------------------------
-  
+
   edm::Handle<reco::PFJetCollection> pfJetCollection;
-  e.getByToken (thePfJetCollection_,pfJetCollection);
-  if ( !pfJetCollection.isValid() ){
-    edm::LogError ("SUSY_HLT_VBF_Mu") << "invalid collection: PFJets" << "\n";
+  e.getByToken(thePfJetCollection_, pfJetCollection);
+  if (!pfJetCollection.isValid()) {
+    edm::LogError("SUSY_HLT_VBF_Mu") << "invalid collection: PFJets"
+                                     << "\n";
     return;
   }
 
   edm::Handle<reco::CaloJetCollection> caloJetCollection;
-  e.getByToken (theCaloJetCollection_,caloJetCollection);
-  if ( !caloJetCollection.isValid() ){
-    edm::LogError ("SUSY_HLT_VBF_Mu") << "invalid collection: CaloJets" << "\n";
+  e.getByToken(theCaloJetCollection_, caloJetCollection);
+  if (!caloJetCollection.isValid()) {
+    edm::LogError("SUSY_HLT_VBF_Mu") << "invalid collection: CaloJets"
+                                     << "\n";
     return;
   }
-    
+
   //-------------------------------
   //--- Muon
   //-------------------------------
   edm::Handle<reco::MuonCollection> MuonCollection;
-  e.getByToken (theMuonCollection_, MuonCollection);
-  if ( !MuonCollection.isValid() ){
-    edm::LogError ("SUSY_HLT_VBF_Mu") << "invalid collection: Muons " << "\n";
+  e.getByToken(theMuonCollection_, MuonCollection);
+  if (!MuonCollection.isValid()) {
+    edm::LogError("SUSY_HLT_VBF_Mu") << "invalid collection: Muons "
+                                     << "\n";
     return;
   }
-  
-   
+
   //-------------------------------
   //--- MET
   //-------------------------------
-  
+
   edm::Handle<reco::CaloMETCollection> caloMETCollection;
-  e.getByToken(theCaloMETCollection_, caloMETCollection);                                                      
-  if ( !caloMETCollection.isValid() ){
-    edm::LogError ("SUSY_HLT_VBF_Mu") << "invalid collection: CaloMET" << "\n";
+  e.getByToken(theCaloMETCollection_, caloMETCollection);
+  if (!caloMETCollection.isValid()) {
+    edm::LogError("SUSY_HLT_VBF_Mu") << "invalid collection: CaloMET"
+                                     << "\n";
     return;
   }
 
-
   edm::Handle<reco::PFMETCollection> pfMETCollection;
   e.getByToken(thePfMETCollection_, pfMETCollection);
-  if ( !pfMETCollection.isValid() ){
-    edm::LogError ("SUSY_HLT_VBF_Mu") << "invalid collection: PFMET" << "\n";
+  if (!pfMETCollection.isValid()) {
+    edm::LogError("SUSY_HLT_VBF_Mu") << "invalid collection: PFMET"
+                                     << "\n";
     return;
   }
   //
-  
+
   //-------------------------------
   //--- Trigger
   //-------------------------------
   edm::Handle<edm::TriggerResults> hltresults;
-  e.getByToken(triggerResults_,hltresults);
-  if(!hltresults.isValid()){
-    edm::LogError ("SUSY_HLT_VBF_Mu") << "invalid collection: TriggerResults" << "\n";
+  e.getByToken(triggerResults_, hltresults);
+  if (!hltresults.isValid()) {
+    edm::LogError("SUSY_HLT_VBF_Mu") << "invalid collection: TriggerResults"
+                                     << "\n";
     return;
   }
   edm::Handle<trigger::TriggerEvent> triggerSummary;
   e.getByToken(theTrigSummary_, triggerSummary);
-  if(!triggerSummary.isValid()) {
-    edm::LogError ("SUSY_HLT_VBF_Mu") << "invalid collection: TriggerSummary" << "\n";
+  if (!triggerSummary.isValid()) {
+    edm::LogError("SUSY_HLT_VBF_Mu") << "invalid collection: TriggerSummary"
+                                     << "\n";
     return;
   }
-  
-  
-  
-  //get online objects
-  
+
+  // get online objects
+
   std::vector<float> ptMuon, etaMuon, phiMuon;
-  size_t filterIndexMu = triggerSummary->filterIndex( triggerMuFilter_ );
+  size_t filterIndexMu = triggerSummary->filterIndex(triggerMuFilter_);
   trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
-  if( !(filterIndexMu >= triggerSummary->sizeFilters()) ){
-    const trigger::Keys& keys = triggerSummary->filterKeys( filterIndexMu );
-    for( size_t j = 0; j < keys.size(); ++j ){
+  if (!(filterIndexMu >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndexMu);
+    for (size_t j = 0; j < keys.size(); ++j) {
       trigger::TriggerObject foundObject = triggerObjects[keys[j]];
-      if(fabs(foundObject.id()) == 13){ //It's a muon
-	
-	bool same= false;
-	for(unsigned int x=0;x<ptMuon.size();x++){
-	  if(fabs(ptMuon[x] - foundObject.pt()) < 0.01)
-	    same = true;
-	}
-	
-	if(!same){
-	  h_triggerMuPt->Fill(foundObject.pt());
-	  h_triggerMuEta->Fill(foundObject.eta());
-	  h_triggerMuPhi->Fill(foundObject.phi());
-	  ptMuon.push_back(foundObject.pt());
-	  etaMuon.push_back(foundObject.eta());
-	  phiMuon.push_back(foundObject.phi());
-	}
+      if (fabs(foundObject.id()) == 13) {  // It's a muon
+
+        bool same = false;
+        for (unsigned int x = 0; x < ptMuon.size(); x++) {
+          if (fabs(ptMuon[x] - foundObject.pt()) < 0.01)
+            same = true;
+        }
+
+        if (!same) {
+          h_triggerMuPt->Fill(foundObject.pt());
+          h_triggerMuEta->Fill(foundObject.eta());
+          h_triggerMuPhi->Fill(foundObject.phi());
+          ptMuon.push_back(foundObject.pt());
+          etaMuon.push_back(foundObject.eta());
+          phiMuon.push_back(foundObject.phi());
+        }
       }
     }
   }
-  
-
-    
-  //get online objects                                                                                                                                       
-  
-  size_t filterIndexMet = triggerSummary->filterIndex( triggerMetFilter_ );
-  size_t dijetFilterIndex = triggerSummary->filterIndex( triggerDiJetFilter_ );
-  
-  if( !(filterIndexMet >= triggerSummary->sizeFilters()) ){
-    const trigger::Keys& keys = triggerSummary->filterKeys( filterIndexMet );
-    for( size_t j = 0; j < keys.size(); ++j ){
+
+  // get online objects
+
+  size_t filterIndexMet = triggerSummary->filterIndex(triggerMetFilter_);
+  size_t dijetFilterIndex = triggerSummary->filterIndex(triggerDiJetFilter_);
+
+  if (!(filterIndexMet >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndexMet);
+    for (size_t j = 0; j < keys.size(); ++j) {
       trigger::TriggerObject foundObject = triggerObjects[keys[j]];
       h_triggerMet->Fill(foundObject.pt());
       h_triggerMetPhi->Fill(foundObject.phi());
     }
   }
-  
-  dijet = -1; 
-  
-  std::vector<float> ptJet,  etaJet, phiJet;
-  if( !(dijetFilterIndex >= triggerSummary->sizeFilters()) ){
-    const trigger::Keys& KEYS(triggerSummary->filterKeys(dijetFilterIndex));                                                     
-    const  size_t nK(KEYS.size());
-    const trigger::TriggerObjectCollection& TOC(triggerSummary->getObjects());
-    
-    for (size_t i=0; i < nK ; i++ ) {
-      const trigger::TriggerObject& TO1(TOC[KEYS[i]]);
-      if( TO1.pt() > ptThrJetTrig_ && fabs(TO1.eta()) < etaThrJetTrig_ ){
-	
-	// for dijet part
-	for (size_t j=i; j < nK; j++) {
-	  if( i < j ){
-	    const trigger::TriggerObject& TO2(TOC[KEYS[j]]);
-	    if( TO2.pt() > ptThrJetTrig_ && fabs(TO2.eta()) < etaThrJetTrig_  ){
-	      double tmpdeta = fabs( TO1.eta() - TO2.eta() );
-	      double tmpopposite = TO1.eta() * TO2.eta() ;
-	      if( tmpdeta > deltaetaVBFJets && tmpopposite < 0){
-		TLorentzVector j1 ( TO1.px(),  TO1.py(),  TO1.pz(),  TO1.energy());
-		TLorentzVector j2 ( TO2.px(),  TO2.py(),  TO2.pz(),  TO2.energy());
-		double tmpmass = ( j1 + j2 ).M();
-		if( dijet < tmpmass ) {
-           dijet = tmpmass ;
-         }
-	      }
-	    }
-	  }
-	}
+
+  dijet = -1;
+
+  std::vector<float> ptJet, etaJet, phiJet;
+  if (!(dijetFilterIndex >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &KEYS(triggerSummary->filterKeys(dijetFilterIndex));
+    const size_t nK(KEYS.size());
+    const trigger::TriggerObjectCollection &TOC(triggerSummary->getObjects());
+
+    for (size_t i = 0; i < nK; i++) {
+      const trigger::TriggerObject &TO1(TOC[KEYS[i]]);
+      if (TO1.pt() > ptThrJetTrig_ && fabs(TO1.eta()) < etaThrJetTrig_) {
+        // for dijet part
+        for (size_t j = i; j < nK; j++) {
+          if (i < j) {
+            const trigger::TriggerObject &TO2(TOC[KEYS[j]]);
+            if (TO2.pt() > ptThrJetTrig_ && fabs(TO2.eta()) < etaThrJetTrig_) {
+              double tmpdeta = fabs(TO1.eta() - TO2.eta());
+              double tmpopposite = TO1.eta() * TO2.eta();
+              if (tmpdeta > deltaetaVBFJets && tmpopposite < 0) {
+                TLorentzVector j1(TO1.px(), TO1.py(), TO1.pz(), TO1.energy());
+                TLorentzVector j2(TO2.px(), TO2.py(), TO2.pz(), TO2.energy());
+                double tmpmass = (j1 + j2).M();
+                if (dijet < tmpmass) {
+                  dijet = tmpmass;
+                }
+              }
+            }
+          }
+        }
       }
     }
-   h_DiJetMass->Fill(dijet);
+    h_DiJetMass->Fill(dijet);
   }
- 
- 
-  size_t filterIndexCaloMET = triggerSummary->filterIndex( triggerCaloMETFilter_ );
-  if( filterIndexCaloMET  < triggerSummary->sizeFilters() ) {
-    const trigger::Keys& keys = triggerSummary->filterKeys( filterIndexCaloMET );
-     if(!keys.empty() ) {
-      float met_h = triggerObjects[ keys[0] ].pt();
+
+  size_t filterIndexCaloMET = triggerSummary->filterIndex(triggerCaloMETFilter_);
+  if (filterIndexCaloMET < triggerSummary->sizeFilters()) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndexCaloMET);
+    if (!keys.empty()) {
+      float met_h = triggerObjects[keys[0]].pt();
       h_triggerCaloMet->Fill(met_h);
-     } 
     }
+  }
+
+  size_t filterIndexHt = triggerSummary->filterIndex(triggerHTFilter_);
+  if (filterIndexHt < triggerSummary->sizeFilters()) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndexHt);
+    if (!keys.empty()) {
+      float ht = triggerObjects[keys[0]].pt();
+      h_ht->Fill(ht);
+    }
+  }
 
+  bool hasFired = false;
 
+  const edm::TriggerNames &trigNames = e.triggerNames(*hltresults);
+  unsigned int numTriggers = trigNames.size();
 
-  
-  size_t filterIndexHt = triggerSummary->filterIndex( triggerHTFilter_ );
-  if( filterIndexHt < triggerSummary->sizeFilters() ) {
-    const trigger::Keys& keys = triggerSummary->filterKeys( filterIndexHt );
-    if( !keys.empty() ) {
-      float ht = triggerObjects[ keys[0] ].pt();
-      h_ht->Fill( ht );
-    }
+  for (unsigned int hltIndex = 0; hltIndex < numTriggers; ++hltIndex) {
+    if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) &&
+        hltresults->accept(hltIndex))
+      hasFired = true;
   }
-  
-  
-  
-    bool hasFired = false;
-    
-    const edm::TriggerNames& trigNames = e.triggerNames(*hltresults);
-    unsigned int numTriggers = trigNames.size();
-    
-    for( unsigned int hltIndex=0; hltIndex<numTriggers; ++hltIndex ){
-      if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFired = true;
-    }
-    
-    
-    
-    
-    //Matching the muon
-    int indexOfMatchedMuon = -1;
-    int offlineCounter = 0;
-    for(reco::MuonCollection::const_iterator muon = MuonCollection->begin(); muon != MuonCollection->end()  ; ++muon) {
-      for(size_t off_i = 0; off_i < ptMuon.size(); ++off_i) {
-    if(reco::deltaR(muon->eta(),muon->phi(),etaMuon[off_i],phiMuon[off_i]) < 0.5) {
-	  indexOfMatchedMuon = offlineCounter;
-	  break;
-	}
+
+  // Matching the muon
+  int indexOfMatchedMuon = -1;
+  int offlineCounter = 0;
+  for (reco::MuonCollection::const_iterator muon = MuonCollection->begin(); muon != MuonCollection->end(); ++muon) {
+    for (size_t off_i = 0; off_i < ptMuon.size(); ++off_i) {
+      if (reco::deltaR(muon->eta(), muon->phi(), etaMuon[off_i], phiMuon[off_i]) < 0.5) {
+        indexOfMatchedMuon = offlineCounter;
+        break;
       }
-      offlineCounter++;
-    }
-    
-    
-    
-    float pfHT = 0.0;
-    
-    for (reco::PFJetCollection::const_iterator i_pfjet = pfJetCollection->begin(); i_pfjet != pfJetCollection->end(); ++i_pfjet){
-      if (i_pfjet->pt() < ptThrJet_) continue;
-      if (fabs(i_pfjet->eta()) > etaThrJet_) continue;
-      pfHT += i_pfjet->pt();
     }
+    offlineCounter++;
+  }
 
-    // 
-    
-    dijetOff =-1;
-    
-    size_t jetCol = pfJetCollection->size();
-    
-    for (size_t i=0; i < jetCol ; i++ ) {
-      
-      if( pfJetCollection->at(i).pt() > ptThrJetTrig_ && fabs(pfJetCollection->at(i).eta()) < etaThrJetTrig_ ){
-	
-	for (size_t j=i; j <jetCol ; j++) {
-	  
-	  if( i < j ){
-	    
-	    if( pfJetCollection->at(j).pt() > ptThrJetTrig_ && fabs(pfJetCollection->at(j).eta()) < etaThrJetTrig_  ){
-	      
-	      double tmpdetaOff = fabs( pfJetCollection->at(i).eta() - pfJetCollection->at(j).eta() );
-	      double tmpoppositeOff = pfJetCollection->at(i).eta() * pfJetCollection->at(j).eta() ;
-	      if( tmpdetaOff > deltaetaVBFJets && tmpoppositeOff < 0){
-		TLorentzVector j1Off ( pfJetCollection->at(i).px(),  pfJetCollection->at(i).py(),  pfJetCollection->at(i).pz(),  pfJetCollection->at(i).energy());
-		TLorentzVector j2Off ( pfJetCollection->at(j).px(),  pfJetCollection->at(j).py(),  pfJetCollection->at(j).pz(),  pfJetCollection->at(j).energy());
-		double tmpmassOff = ( j1Off + j2Off ).M();
-		if( dijetOff < tmpmassOff ) dijetOff = tmpmassOff ;
-	
-	      }
-	    }
-	  }
-	}
+  float pfHT = 0.0;
+
+  for (reco::PFJetCollection::const_iterator i_pfjet = pfJetCollection->begin(); i_pfjet != pfJetCollection->end();
+       ++i_pfjet) {
+    if (i_pfjet->pt() < ptThrJet_)
+      continue;
+    if (fabs(i_pfjet->eta()) > etaThrJet_)
+      continue;
+    pfHT += i_pfjet->pt();
+  }
+
+  //
+
+  dijetOff = -1;
+
+  size_t jetCol = pfJetCollection->size();
+
+  for (size_t i = 0; i < jetCol; i++) {
+    if (pfJetCollection->at(i).pt() > ptThrJetTrig_ && fabs(pfJetCollection->at(i).eta()) < etaThrJetTrig_) {
+      for (size_t j = i; j < jetCol; j++) {
+        if (i < j) {
+          if (pfJetCollection->at(j).pt() > ptThrJetTrig_ && fabs(pfJetCollection->at(j).eta()) < etaThrJetTrig_) {
+            double tmpdetaOff = fabs(pfJetCollection->at(i).eta() - pfJetCollection->at(j).eta());
+            double tmpoppositeOff = pfJetCollection->at(i).eta() * pfJetCollection->at(j).eta();
+            if (tmpdetaOff > deltaetaVBFJets && tmpoppositeOff < 0) {
+              TLorentzVector j1Off(pfJetCollection->at(i).px(),
+                                   pfJetCollection->at(i).py(),
+                                   pfJetCollection->at(i).pz(),
+                                   pfJetCollection->at(i).energy());
+              TLorentzVector j2Off(pfJetCollection->at(j).px(),
+                                   pfJetCollection->at(j).py(),
+                                   pfJetCollection->at(j).pz(),
+                                   pfJetCollection->at(j).energy());
+              double tmpmassOff = (j1Off + j2Off).M();
+              if (dijetOff < tmpmassOff)
+                dijetOff = tmpmassOff;
+            }
+          }
+        }
       }
     }
-    
+  }
 
-//  For trigger turn on curves
+  //  For trigger turn on curves
 
   // for muon
-    if(indexOfMatchedMuon > -1 && (dijetOff > mjjOnlinethreshold) && (pfMETCollection->begin()->et() > pfmetOnlinethreshold) && (pfHT > htOnlinethreshold)) {
-      h_den_muonpt->Fill(MuonCollection->at(indexOfMatchedMuon).pt());
-      h_den_muoneta->Fill(MuonCollection->at(indexOfMatchedMuon).eta());
-      if(hasFired) {
-	h_num_muonpt->Fill(MuonCollection->at(indexOfMatchedMuon).pt());
-	h_num_muoneta->Fill(MuonCollection->at(indexOfMatchedMuon).eta());
-      }
+  if (indexOfMatchedMuon > -1 && (dijetOff > mjjOnlinethreshold) &&
+      (pfMETCollection->begin()->et() > pfmetOnlinethreshold) && (pfHT > htOnlinethreshold)) {
+    h_den_muonpt->Fill(MuonCollection->at(indexOfMatchedMuon).pt());
+    h_den_muoneta->Fill(MuonCollection->at(indexOfMatchedMuon).eta());
+    if (hasFired) {
+      h_num_muonpt->Fill(MuonCollection->at(indexOfMatchedMuon).pt());
+      h_num_muoneta->Fill(MuonCollection->at(indexOfMatchedMuon).eta());
     }
-    
-    
-    // For MJJ
-    if(indexOfMatchedMuon > -1 && (MuonCollection->at(indexOfMatchedMuon).pt() > muonOnlinethreshold) && (pfMETCollection->begin()->et() > pfmetOnlinethreshold) && (pfHT > htOnlinethreshold)) {
-      h_den_mjj->Fill(dijetOff);
-      if(hasFired) {
-	h_num_mjj->Fill(dijetOff);
-      }
+  }
+
+  // For MJJ
+  if (indexOfMatchedMuon > -1 && (MuonCollection->at(indexOfMatchedMuon).pt() > muonOnlinethreshold) &&
+      (pfMETCollection->begin()->et() > pfmetOnlinethreshold) && (pfHT > htOnlinethreshold)) {
+    h_den_mjj->Fill(dijetOff);
+    if (hasFired) {
+      h_num_mjj->Fill(dijetOff);
     }
-    
-    // For HT
-    //
-    if(indexOfMatchedMuon > -1 && (MuonCollection->at(indexOfMatchedMuon).pt() > muonOnlinethreshold) && (pfMETCollection->begin()->et() > pfmetOnlinethreshold) && (dijetOff > mjjOnlinethreshold)) {
-      
-      h_den_ht->Fill(pfHT);
-      if(hasFired) {
-	h_num_ht->Fill(pfHT);
-      }
-    } 
-    
-    if(indexOfMatchedMuon > -1 && (dijetOff > mjjOnlinethreshold) && (pfHT > htOnlinethreshold) && (MuonCollection->at(indexOfMatchedMuon).pt() > muonOnlinethreshold)) {
-      
-      h_den_met->Fill(pfMETCollection->begin()->et());
-      if(hasFired) {
-	h_num_met->Fill(pfMETCollection->begin()->et());
-      }
+  }
+
+  // For HT
+  //
+  if (indexOfMatchedMuon > -1 && (MuonCollection->at(indexOfMatchedMuon).pt() > muonOnlinethreshold) &&
+      (pfMETCollection->begin()->et() > pfmetOnlinethreshold) && (dijetOff > mjjOnlinethreshold)) {
+    h_den_ht->Fill(pfHT);
+    if (hasFired) {
+      h_num_ht->Fill(pfHT);
+    }
+  }
+
+  if (indexOfMatchedMuon > -1 && (dijetOff > mjjOnlinethreshold) && (pfHT > htOnlinethreshold) &&
+      (MuonCollection->at(indexOfMatchedMuon).pt() > muonOnlinethreshold)) {
+    h_den_met->Fill(pfMETCollection->begin()->et());
+    if (hasFired) {
+      h_num_met->Fill(pfMETCollection->begin()->et());
     }
-    
+  }
 }
 
+void SUSY_HLT_VBF_Mu::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
+  edm::LogInfo("SUSY_HLT_VBF_Mu") << "SUSY_HLT_VBF_Mu::endRun" << std::endl;
+}
 
+void SUSY_HLT_VBF_Mu::bookHistos(DQMStore::IBooker &ibooker_) {
+  ibooker_.cd();
+  ibooker_.setCurrentFolder("HLT/SUSYBSM/SUSY_HLT_VBF_Mu");
 
-void SUSY_HLT_VBF_Mu::endRun(edm::Run const& run, edm::EventSetup const& eSetup)
-{
-    edm::LogInfo("SUSY_HLT_VBF_Mu") << "SUSY_HLT_VBF_Mu::endRun" << std::endl;
-}
+  // offline quantities
+
+  // online quantities
+  h_triggerMuPt = ibooker_.book1D("triggerMuPt", "Trigger Muon Pt; GeV", 50, 0.0, 500.0);
+  h_triggerMuEta = ibooker_.book1D("triggerMuEta", "Trigger Muon Eta", 20, -3.0, 3.0);
+  h_triggerMuPhi = ibooker_.book1D("triggerMuPhi", "Trigger Muon Phi", 20, -3.5, 3.5);
+
+  h_triggerCaloMet = ibooker_.book1D("h_triggerCaloMet", "Trigger Calo MET; GeV", 20, 0.0, 500.0);
+
+  h_ht = ibooker_.book1D("h_ht", "h_ht", 30, 0.0, 1500.0);
+
+  h_triggerMet = ibooker_.book1D("triggerMet", "Trigger MET; GeV", 20, 0.0, 500.0);
+  h_triggerMetPhi = ibooker_.book1D("triggerMetPhi", "Trigger MET Phi", 20, -3.5, 3.5);
+
+  h_DiJetMass = ibooker_.book1D("h_DiJetMass", "h_DiJetMass", 500, 0.0, 5000.0);
+
+  // num and den hists to be divided in harvesting step to make turn on curves
+
+  h_den_muonpt = ibooker_.book1D("h_den_muonpt", "h_den_muonpt", 50, 0.0, 500.0);
+  h_num_muonpt = ibooker_.book1D("h_num_muonpt", "h_num_muonpt", 50, 0.0, 500.0);
+
+  h_den_muoneta = ibooker_.book1D("h_den_muoneta", "h_den_muoneta", 20, -3.0, 3.0);
+  h_num_muoneta = ibooker_.book1D("h_num_muoneta", "h_num_muoneta", 20, -3.0, 3.0);
+
+  h_den_mjj = ibooker_.book1D("h_den_mjj", "h_den_mjj", 500, 0.0, 5000.0);
+  h_num_mjj = ibooker_.book1D("h_num_mjj", "h_num_mjj", 500, 0.0, 5000.0);
+
+  h_den_met = ibooker_.book1D("h_den_met", "h_den_met", 20, 0.0, 500.0);
+  h_num_met = ibooker_.book1D("h_num_met", "h_num_met", 20, 0.0, 500.0);
+
+  h_den_ht = ibooker_.book1D("h_den_ht", "h_den_ht", 30, 0.0, 1500.0);
+  h_num_ht = ibooker_.book1D("h_num_ht", "h_num_ht", 30, 0.0, 1500.0);
 
-void SUSY_HLT_VBF_Mu::bookHistos(DQMStore::IBooker & ibooker_)
-{
-    ibooker_.cd();
-    ibooker_.setCurrentFolder("HLT/SUSYBSM/SUSY_HLT_VBF_Mu");
-    
-    //offline quantities
-    
-    //online quantities
-    h_triggerMuPt = ibooker_.book1D("triggerMuPt", "Trigger Muon Pt; GeV", 50, 0.0, 500.0);
-    h_triggerMuEta = ibooker_.book1D("triggerMuEta", "Trigger Muon Eta", 20, -3.0, 3.0);
-    h_triggerMuPhi = ibooker_.book1D("triggerMuPhi", "Trigger Muon Phi", 20, -3.5, 3.5);
-
-    h_triggerCaloMet = ibooker_.book1D("h_triggerCaloMet", "Trigger Calo MET; GeV", 20, 0.0, 500.0);
-
-    h_ht = ibooker_.book1D("h_ht", "h_ht",30, 0.0, 1500.0 ); 
-
-    h_triggerMet = ibooker_.book1D("triggerMet", "Trigger MET; GeV", 20, 0.0, 500.0);
-    h_triggerMetPhi = ibooker_.book1D("triggerMetPhi", "Trigger MET Phi", 20, -3.5, 3.5);
-
-    h_DiJetMass  = ibooker_.book1D("h_DiJetMass" , "h_DiJetMass", 500,0.0,5000.0);    
-        
-//num and den hists to be divided in harvesting step to make turn on curves
-
-    h_den_muonpt = ibooker_.book1D("h_den_muonpt","h_den_muonpt", 50, 0.0, 500.0);
-    h_num_muonpt = ibooker_.book1D("h_num_muonpt","h_num_muonpt", 50, 0.0, 500.0);
-
-    
-    h_den_muoneta = ibooker_.book1D("h_den_muoneta","h_den_muoneta", 20, -3.0, 3.0);
-    h_num_muoneta = ibooker_.book1D("h_num_muoneta","h_num_muoneta", 20, -3.0, 3.0);
-    
-    h_den_mjj = ibooker_.book1D("h_den_mjj","h_den_mjj",500,0.0,5000.0);
-    h_num_mjj = ibooker_.book1D("h_num_mjj","h_num_mjj",500,0.0,5000.0);
-    
-    h_den_met = ibooker_.book1D("h_den_met","h_den_met",20,0.0,500.0);
-    h_num_met = ibooker_.book1D("h_num_met","h_num_met",20,0.0,500.0);
-    
-    h_den_ht = ibooker_.book1D("h_den_ht","h_den_ht",30,0.0,1500.0);
-    h_num_ht = ibooker_.book1D("h_num_ht","h_num_ht",30,0.0,1500.0);
-
-
-    ibooker_.cd();
+  ibooker_.cd();
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SUSY_HLT_VBF_Mu);
diff --git a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_alphaT.cc b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_alphaT.cc
index 2c085252c315e..6505c971881ca 100644
--- a/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_alphaT.cc
+++ b/HLTriggerOffline/SUSYBSM/src/SUSY_HLT_alphaT.cc
@@ -1,20 +1,20 @@
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "FWCore/Common/interface/TriggerNames.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Common/interface/TriggerNames.h"
-#include "DataFormats/HLTReco/interface/TriggerObject.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "HLTriggerOffline/SUSYBSM/interface/SUSY_HLT_alphaT.h"
 //#include "HLTriggerOffline/SUSYBSM/interface/AlphaT.h"
 
-typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiM4D<double> > LorentzV;
+typedef ROOT::Math::LorentzVector<ROOT::Math::PtEtaPhiM4D<double>> LorentzV;
 
-SUSY_HLT_alphaT::SUSY_HLT_alphaT(const edm::ParameterSet& ps)
-{
+SUSY_HLT_alphaT::SUSY_HLT_alphaT(const edm::ParameterSet &ps) {
   edm::LogInfo("SUSY_HLT_alphaT") << "Constructor SUSY_HLT_alphaT::SUSY_HLT_alphaT " << std::endl;
   // Get parameters from configuration file
   theTrigSummary_ = consumes<trigger::TriggerEvent>(ps.getParameter<edm::InputTag>("trigSummary"));
   thePfJetCollection_ = consumes<reco::PFJetCollection>(ps.getParameter<edm::InputTag>("pfJetCollection"));
-  //theCaloJetCollection_ = consumes<reco::CaloJetCollection>(ps.getParameter<edm::InputTag>("caloJetCollection"));
+  // theCaloJetCollection_ =
+  // consumes<reco::CaloJetCollection>(ps.getParameter<edm::InputTag>("caloJetCollection"));
   triggerResults_ = consumes<edm::TriggerResults>(ps.getParameter<edm::InputTag>("TriggerResults"));
   HLTProcess_ = ps.getParameter<std::string>("HLTProcess");
   triggerPath_ = ps.getParameter<std::string>("TriggerPath");
@@ -23,22 +23,20 @@ SUSY_HLT_alphaT::SUSY_HLT_alphaT(const edm::ParameterSet& ps)
   triggerPreFilter_ = ps.getParameter<edm::InputTag>("TriggerPreFilter");
   ptThrJet_ = ps.getUntrackedParameter<double>("PtThrJet");
   etaThrJet_ = ps.getUntrackedParameter<double>("EtaThrJet");
-  //caloAlphaTThrTurnon_ = ps.getUntrackedParameter<double>("caloAlphaTThrTurnon");
-  //caloHtThrTurnon_ = ps.getUntrackedParameter<double>("caloHtThrTurnon");
+  // caloAlphaTThrTurnon_ =
+  // ps.getUntrackedParameter<double>("caloAlphaTThrTurnon"); caloHtThrTurnon_ =
+  // ps.getUntrackedParameter<double>("caloHtThrTurnon");
   pfAlphaTThrTurnon_ = ps.getUntrackedParameter<double>("pfAlphaTThrTurnon");
   pfHtThrTurnon_ = ps.getUntrackedParameter<double>("pfHtThrTurnon");
 }
 
-SUSY_HLT_alphaT::~SUSY_HLT_alphaT()
-{
-   edm::LogInfo("SUSY_HLT_alphaT") << "Destructor SUSY_HLT_alphaT::~SUSY_HLT_alphaT " << std::endl;
+SUSY_HLT_alphaT::~SUSY_HLT_alphaT() {
+  edm::LogInfo("SUSY_HLT_alphaT") << "Destructor SUSY_HLT_alphaT::~SUSY_HLT_alphaT " << std::endl;
 }
 
-void SUSY_HLT_alphaT::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e)
-{
- 
+void SUSY_HLT_alphaT::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e) {
   bool changed;
-  
+
   if (!fHltConfig.init(run, e, HLTProcess_, changed)) {
     edm::LogError("SUSY_HLT_alphaT") << "Initialization of HLTConfigProvider failed!!";
     return;
@@ -46,49 +44,50 @@ void SUSY_HLT_alphaT::dqmBeginRun(edm::Run const &run, edm::EventSetup const &e)
 
   bool pathFound = false;
   const std::vector<std::string> allTrigNames = fHltConfig.triggerNames();
-  for(size_t j = 0; j <allTrigNames.size(); ++j) {
-    if(allTrigNames[j].find(triggerPath_) != std::string::npos) {
+  for (size_t j = 0; j < allTrigNames.size(); ++j) {
+    if (allTrigNames[j].find(triggerPath_) != std::string::npos) {
       pathFound = true;
     }
   }
 
-  if(!pathFound) {
-    LogDebug ("SUSY_HLT_alphaT") << "Path not found" << "\n";
+  if (!pathFound) {
+    LogDebug("SUSY_HLT_alphaT") << "Path not found"
+                                << "\n";
     return;
   }
-  //std::vector<std::string> filtertags = fHltConfig.moduleLabels( triggerPath_ );
-  //triggerFilter_ = edm::InputTag(filtertags[filtertags.size()-1],"",fHltConfig.processName());  
-  //triggerFilter_ = edm::InputTag("hltPFMET120Mu5L3PreFiltered", "", fHltConfig.processName());
+  // std::vector<std::string> filtertags = fHltConfig.moduleLabels( triggerPath_
+  // ); triggerFilter_ =
+  // edm::InputTag(filtertags[filtertags.size()-1],"",fHltConfig.processName());
+  // triggerFilter_ = edm::InputTag("hltPFMET120Mu5L3PreFiltered", "",
+  // fHltConfig.processName());
 
   edm::LogInfo("SUSY_HLT_alphaT") << "SUSY_HLT_alphaT::beginRun" << std::endl;
 }
 
- void SUSY_HLT_alphaT::bookHistograms(DQMStore::IBooker & ibooker_, edm::Run const &, edm::EventSetup const &)
-{
+void SUSY_HLT_alphaT::bookHistograms(DQMStore::IBooker &ibooker_, edm::Run const &, edm::EventSetup const &) {
   edm::LogInfo("SUSY_HLT_alphaT") << "SUSY_HLT_alphaT::bookHistograms" << std::endl;
-  //book at beginRun
+  // book at beginRun
   bookHistos(ibooker_);
 }
 
-
-
-
-void SUSY_HLT_alphaT::analyze(edm::Event const& e, edm::EventSetup const& eSetup){
+void SUSY_HLT_alphaT::analyze(edm::Event const &e, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_alphaT") << "SUSY_HLT_alphaT::analyze" << std::endl;
 
   //-------------------------------
   //--- Trigger
   //-------------------------------
   edm::Handle<edm::TriggerResults> hltresults;
-  e.getByToken(triggerResults_,hltresults);
-  if(!hltresults.isValid()){
-    edm::LogWarning ("SUSY_HLT_alphaT") << "invalid collection: TriggerResults" << "\n";
+  e.getByToken(triggerResults_, hltresults);
+  if (!hltresults.isValid()) {
+    edm::LogWarning("SUSY_HLT_alphaT") << "invalid collection: TriggerResults"
+                                       << "\n";
     return;
   }
   edm::Handle<trigger::TriggerEvent> triggerSummary;
   e.getByToken(theTrigSummary_, triggerSummary);
-  if(!triggerSummary.isValid()) {
-    edm::LogWarning ("SUSY_HLT_alphaT") << "invalid collection: TriggerSummary" << "\n";
+  if (!triggerSummary.isValid()) {
+    edm::LogWarning("SUSY_HLT_alphaT") << "invalid collection: TriggerSummary"
+                                       << "\n";
     return;
   }
 
@@ -96,68 +95,72 @@ void SUSY_HLT_alphaT::analyze(edm::Event const& e, edm::EventSetup const& eSetup
   //--- Jets
   //-------------------------------
   edm::Handle<reco::PFJetCollection> pfJetCollection;
-  e.getByToken (thePfJetCollection_,pfJetCollection);
-  if ( !pfJetCollection.isValid() ){
-   edm::LogWarning ("SUSY_HLT_alphaT") << "invalid collection: PFJets" << "\n";
-   return;
+  e.getByToken(thePfJetCollection_, pfJetCollection);
+  if (!pfJetCollection.isValid()) {
+    edm::LogWarning("SUSY_HLT_alphaT") << "invalid collection: PFJets"
+                                       << "\n";
+    return;
   }
   // edm::Handle<reco::CaloJetCollection> caloJetCollection;
   // e.getByToken (theCaloJetCollection_,caloJetCollection);
   // if ( !caloJetCollection.isValid() ){
-  //     edm::LogWarning ("SUSY_HLT_alphaT") << "invalid collection: CaloJets" << "\n";
-  //     return;
+  //     edm::LogWarning ("SUSY_HLT_alphaT") << "invalid collection: CaloJets"
+  //     << "\n"; return;
   // }
 
-  //get online objects
-  //For now just get the jets and recalculate ht and alphaT
-  size_t filterIndex = triggerSummary->filterIndex( triggerFilter_ );
-  //size_t preFilterIndex = triggerSummary->filterIndex( triggerPreFilter_ );
+  // get online objects
+  // For now just get the jets and recalculate ht and alphaT
+  size_t filterIndex = triggerSummary->filterIndex(triggerFilter_);
+  // size_t preFilterIndex = triggerSummary->filterIndex( triggerPreFilter_ );
   trigger::TriggerObjectCollection triggerObjects = triggerSummary->getObjects();
 
-  //Get the PF objects from the filter
-  double hltPfHt=0.;
+  // Get the PF objects from the filter
+  double hltPfHt = 0.;
   std::vector<LorentzV> hltPfJets;
-  if( !(filterIndex >= triggerSummary->sizeFilters()) ){
-      const trigger::Keys& keys = triggerSummary->filterKeys( filterIndex );
-
-      for( size_t j = 0; j < keys.size(); ++j ){
-          trigger::TriggerObject foundObject = triggerObjects[keys[j]];
-
-          //  if(foundObject.id() == 85){ //It's a jet 
-          if(foundObject.pt()>ptThrJet_ && fabs(foundObject.eta()) < etaThrJet_){
-              hltPfHt += foundObject.pt();
-              LorentzV JetLVec(foundObject.pt(),foundObject.eta(),foundObject.phi(),foundObject.mass());
-              hltPfJets.push_back(JetLVec);
-          }
-          //   }
+  if (!(filterIndex >= triggerSummary->sizeFilters())) {
+    const trigger::Keys &keys = triggerSummary->filterKeys(filterIndex);
+
+    for (size_t j = 0; j < keys.size(); ++j) {
+      trigger::TriggerObject foundObject = triggerObjects[keys[j]];
+
+      //  if(foundObject.id() == 85){ //It's a jet
+      if (foundObject.pt() > ptThrJet_ && fabs(foundObject.eta()) < etaThrJet_) {
+        hltPfHt += foundObject.pt();
+        LorentzV JetLVec(foundObject.pt(), foundObject.eta(), foundObject.phi(), foundObject.mass());
+        hltPfJets.push_back(JetLVec);
       }
+      //   }
+    }
   }
-  
+
   // //Get the Calo objects from the prefilter
   // double hltCaloHt=0.;
   // std::vector<LorentzV> hltCaloJets;
   // if( !(preFilterIndex >= triggerSummary->sizeFilters()) ){
-  //     const trigger::Keys& keys = triggerSummary->filterKeys( preFilterIndex );
+  //     const trigger::Keys& keys = triggerSummary->filterKeys( preFilterIndex
+  //     );
 
   //     for( size_t j = 0; j < keys.size(); ++j ){
   //         trigger::TriggerObject foundObject = triggerObjects[keys[j]];
 
-  //         //  if(foundObject.id() == 85){ //It's a jet 
-  //         if(foundObject.pt()>ptThrJet_ && fabs(foundObject.eta()) < etaThrJet_){
+  //         //  if(foundObject.id() == 85){ //It's a jet
+  //         if(foundObject.pt()>ptThrJet_ && fabs(foundObject.eta()) <
+  //         etaThrJet_){
   //             hltCaloHt += foundObject.pt();
-  //             LorentzV JetLVec(foundObject.pt(),foundObject.eta(),foundObject.phi(),foundObject.mass());
+  //             LorentzV
+  //             JetLVec(foundObject.pt(),foundObject.eta(),foundObject.phi(),foundObject.mass());
   //             hltCaloJets.push_back(JetLVec);
   //         }
   //         //   }
   //     }
   // }
 
-  //Fill the alphaT and HT histograms
-  if(!hltPfJets.empty()){
-      double hltPfAlphaT = AlphaT(hltPfJets,true).value();
-      h_triggerPfAlphaT->Fill(hltPfAlphaT);
-      h_triggerPfHt->Fill(hltPfHt);
-      h_triggerPfAlphaT_triggerPfHt->Fill(hltPfHt, hltPfAlphaT);
+  // Fill the alphaT and HT histograms
+  if (!hltPfJets.empty()) {
+    double hltPfAlphaT = AlphaT(hltPfJets, true).value();
+    h_triggerPfAlphaT->Fill(hltPfAlphaT);
+    h_triggerPfHt->Fill(hltPfHt);
+    h_triggerPfAlphaT_triggerPfHt->Fill(hltPfHt, hltPfAlphaT);
   }
 
   // if(hltCaloJets.size()>0){
@@ -169,94 +172,113 @@ void SUSY_HLT_alphaT::analyze(edm::Event const& e, edm::EventSetup const& eSetup
 
   bool hasFired = false;
   bool hasFiredAuxiliaryForHadronicLeg = false;
-  const edm::TriggerNames& trigNames = e.triggerNames(*hltresults);
+  const edm::TriggerNames &trigNames = e.triggerNames(*hltresults);
   unsigned int numTriggers = trigNames.size();
-  for( unsigned int hltIndex=0; hltIndex<numTriggers; ++hltIndex ){
-      if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFired = true;
-      if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForHadronic_) != std::string::npos && hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex)) hasFiredAuxiliaryForHadronicLeg = true;
-
+  for (unsigned int hltIndex = 0; hltIndex < numTriggers; ++hltIndex) {
+    if (trigNames.triggerName(hltIndex).find(triggerPath_) != std::string::npos && hltresults->wasrun(hltIndex) &&
+        hltresults->accept(hltIndex))
+      hasFired = true;
+    if (trigNames.triggerName(hltIndex).find(triggerPathAuxiliaryForHadronic_) != std::string::npos &&
+        hltresults->wasrun(hltIndex) && hltresults->accept(hltIndex))
+      hasFiredAuxiliaryForHadronicLeg = true;
   }
 
-  if(hasFiredAuxiliaryForHadronicLeg) {
+  if (hasFiredAuxiliaryForHadronicLeg) {
+    float pfHT = 0.0;
+    std::vector<LorentzV> pfJets;
+    for (reco::PFJetCollection::const_iterator i_pfjet = pfJetCollection->begin(); i_pfjet != pfJetCollection->end();
+         ++i_pfjet) {
+      if (i_pfjet->pt() < ptThrJet_)
+        continue;
+      if (fabs(i_pfjet->eta()) > etaThrJet_)
+        continue;
+      pfHT += i_pfjet->pt();
+      LorentzV JetLVec(i_pfjet->pt(), i_pfjet->eta(), i_pfjet->phi(), i_pfjet->mass());
+      pfJets.push_back(JetLVec);
+    }
 
-      float pfHT = 0.0;
-      std::vector<LorentzV> pfJets;
-      for (reco::PFJetCollection::const_iterator i_pfjet = pfJetCollection->begin(); i_pfjet != pfJetCollection->end(); ++i_pfjet){
-       if (i_pfjet->pt() < ptThrJet_) continue;
-       if (fabs(i_pfjet->eta()) > etaThrJet_) continue;
-       pfHT += i_pfjet->pt();
-       LorentzV JetLVec(i_pfjet->pt(),i_pfjet->eta(),i_pfjet->phi(),i_pfjet->mass());
-       pfJets.push_back(JetLVec);
-      }
+    // //Make the gen Calo HT and AlphaT
+    // float caloHT = 0.0;
+    // std::vector<LorentzV> caloJets;
+    // for (reco::CaloJetCollection::const_iterator i_calojet =
+    // caloJetCollection->begin(); i_calojet != caloJetCollection->end();
+    // ++i_calojet){
+    //   if (i_calojet->pt() < ptThrJet_) continue;
+    //   if (fabs(i_calojet->eta()) > etaThrJet_) continue;
+    //   caloHT += i_calojet->pt();
+    //   LorentzV
+    //   JetLVec(i_calojet->pt(),i_calojet->eta(),i_calojet->phi(),i_calojet->mass());
+    //   caloJets.push_back(JetLVec);
+    // }
+
+    // AlphaT aT = AlphaT(jets);
+    // double caloAlphaT = AlphaT(caloJets).value();
+    double pfAlphaT = AlphaT(pfJets).value();
+
+    // Fill the turnons
+    if (hasFired) {
+      // if(caloHT>caloHtThrTurnon_) h_caloAlphaTTurnOn_num-> Fill(caloAlphaT);
+      // if(caloAlphaT>caloAlphaTThrTurnon_) h_caloHtTurnOn_num-> Fill(caloHT);
+
+      if (pfHT > pfHtThrTurnon_)
+        h_pfAlphaTTurnOn_num->Fill(pfAlphaT);
+      if (pfAlphaT > pfAlphaTThrTurnon_)
+        h_pfHtTurnOn_num->Fill(pfHT);
+    }
+    // if(caloHT>caloHtThrTurnon_) h_caloAlphaTTurnOn_den-> Fill(caloAlphaT);
+    // if(caloAlphaT>caloAlphaTThrTurnon_) h_caloHtTurnOn_den-> Fill(caloHT);
 
-      // //Make the gen Calo HT and AlphaT
-      // float caloHT = 0.0;
-      // std::vector<LorentzV> caloJets;
-      // for (reco::CaloJetCollection::const_iterator i_calojet = caloJetCollection->begin(); i_calojet != caloJetCollection->end(); ++i_calojet){
-      //   if (i_calojet->pt() < ptThrJet_) continue;
-      //   if (fabs(i_calojet->eta()) > etaThrJet_) continue;
-      //   caloHT += i_calojet->pt();
-      //   LorentzV JetLVec(i_calojet->pt(),i_calojet->eta(),i_calojet->phi(),i_calojet->mass());
-      //   caloJets.push_back(JetLVec);
-      // }
-
-      //AlphaT aT = AlphaT(jets);
-      //double caloAlphaT = AlphaT(caloJets).value();
-      double pfAlphaT = AlphaT(pfJets).value();
-
-      //Fill the turnons
-      if(hasFired) {
-        // if(caloHT>caloHtThrTurnon_) h_caloAlphaTTurnOn_num-> Fill(caloAlphaT);
-        // if(caloAlphaT>caloAlphaTThrTurnon_) h_caloHtTurnOn_num-> Fill(caloHT);
-
-        if(pfHT>pfHtThrTurnon_) h_pfAlphaTTurnOn_num-> Fill(pfAlphaT);
-        if(pfAlphaT>pfAlphaTThrTurnon_) h_pfHtTurnOn_num-> Fill(pfHT);
-      } 
-      // if(caloHT>caloHtThrTurnon_) h_caloAlphaTTurnOn_den-> Fill(caloAlphaT);
-      // if(caloAlphaT>caloAlphaTThrTurnon_) h_caloHtTurnOn_den-> Fill(caloHT);
-
-      if(pfHT>pfHtThrTurnon_) h_pfAlphaTTurnOn_den-> Fill(pfAlphaT);
-      if(pfAlphaT>pfAlphaTThrTurnon_) h_pfHtTurnOn_den-> Fill(pfHT);
+    if (pfHT > pfHtThrTurnon_)
+      h_pfAlphaTTurnOn_den->Fill(pfAlphaT);
+    if (pfAlphaT > pfAlphaTThrTurnon_)
+      h_pfHtTurnOn_den->Fill(pfHT);
   }
 }
 
-
-
-
-void SUSY_HLT_alphaT::endRun(edm::Run const& run, edm::EventSetup const& eSetup)
-{
+void SUSY_HLT_alphaT::endRun(edm::Run const &run, edm::EventSetup const &eSetup) {
   edm::LogInfo("SUSY_HLT_alphaT") << "SUSY_HLT_alphaT::endRun" << std::endl;
 }
 
-void SUSY_HLT_alphaT::bookHistos(DQMStore::IBooker & ibooker_)
-{
+void SUSY_HLT_alphaT::bookHistos(DQMStore::IBooker &ibooker_) {
   ibooker_.cd();
   ibooker_.setCurrentFolder("HLT/SUSYBSM/" + triggerPath_);
 
-  //offline quantities
+  // offline quantities
 
-  //online quantities 
-  // h_triggerCaloHt = ibooker_.book1D("triggerCaloHt", "Trigger Calo Ht; HT (GeV)", 60, 0.0, 1500.0);
-  // h_triggerCaloAlphaT = ibooker_.book1D("triggerCaloAlphaT", "Trigger Calo AlphaT; AlphaT", 80, 0., 1.0);
-  // h_triggerCaloAlphaT_triggerCaloHt = ibooker_.book2D("triggerCaloAlphaT_triggerCaloHt","Trigger Calo HT vs Trigger Calo AlphaT; HT (GeV); AlphaT", 60,0.0,1500.,80,0.,1.0);
+  // online quantities
+  // h_triggerCaloHt = ibooker_.book1D("triggerCaloHt", "Trigger Calo Ht; HT
+  // (GeV)", 60, 0.0, 1500.0); h_triggerCaloAlphaT =
+  // ibooker_.book1D("triggerCaloAlphaT", "Trigger Calo AlphaT; AlphaT", 80,
+  // 0., 1.0); h_triggerCaloAlphaT_triggerCaloHt =
+  // ibooker_.book2D("triggerCaloAlphaT_triggerCaloHt","Trigger Calo HT vs
+  // Trigger Calo AlphaT; HT (GeV); AlphaT", 60,0.0,1500.,80,0.,1.0);
   h_triggerPfHt = ibooker_.book1D("triggerPfHt", "Trigger PF Ht; HT (GeV)", 60, 0.0, 1500.0);
   h_triggerPfAlphaT = ibooker_.book1D("triggerPfAlphaT", "Trigger PF AlphaT; AlphaT", 80, 0., 1.0);
-  h_triggerPfAlphaT_triggerPfHt = ibooker_.book2D("triggerPfAlphaT_triggerPfHt","Trigger PF HT vs Trigger PF AlphaT; HT (GeV); AlphaT", 60,0.0,1500.,80,0.,1.0);
-
-
-  //num and den hists to be divided in harvesting step to make turn on curves
-  // h_caloAlphaTTurnOn_num = ibooker_.book1D("caloAlphaTTurnOn_num", "Calo AlphaT Turn On Numerator; AlphaT", 40, 0.0, 1.0 );
-  // h_caloAlphaTTurnOn_den = ibooker_.book1D("caloAlphaTTurnOn_den", "Calo AlphaT Turn OnDenominator; AlphaT", 40, 0.0, 1.0 );
-  // h_caloHtTurnOn_num = ibooker_.book1D("caloHtTurnOn_num", "Calo HT Turn On Numerator; HT (GeV)", 30, 0.0, 1500.0 );
-  // h_caloHtTurnOn_den = ibooker_.book1D("caloHtTurnOn_den", "Calo HT Turn On Denominator; HT (GeV)", 30, 0.0, 1500.0 );
-
-  h_pfAlphaTTurnOn_num = ibooker_.book1D("pfAlphaTTurnOn_num", "PF AlphaT Turn On Numerator; AlphaT", 40, 0.0, 1.0 );
-  h_pfAlphaTTurnOn_den = ibooker_.book1D("pfAlphaTTurnOn_den", "PF AlphaT Turn OnDenominator; AlphaT", 40, 0.0, 1.0 );
-  h_pfHtTurnOn_num = ibooker_.book1D("pfHtTurnOn_num", "PF HT Turn On Numerator; HT (GeV)", 30, 0.0, 1500.0 );
-  h_pfHtTurnOn_den = ibooker_.book1D("pfHtTurnOn_den", "PF HT Turn On Denominator; HT (GeV)", 30, 0.0, 1500.0 );
+  h_triggerPfAlphaT_triggerPfHt = ibooker_.book2D("triggerPfAlphaT_triggerPfHt",
+                                                  "Trigger PF HT vs Trigger PF AlphaT; HT (GeV); AlphaT",
+                                                  60,
+                                                  0.0,
+                                                  1500.,
+                                                  80,
+                                                  0.,
+                                                  1.0);
+
+  // num and den hists to be divided in harvesting step to make turn on curves
+  // h_caloAlphaTTurnOn_num = ibooker_.book1D("caloAlphaTTurnOn_num", "Calo
+  // AlphaT Turn On Numerator; AlphaT", 40, 0.0, 1.0 ); h_caloAlphaTTurnOn_den =
+  // ibooker_.book1D("caloAlphaTTurnOn_den", "Calo AlphaT Turn OnDenominator;
+  // AlphaT", 40, 0.0, 1.0 ); h_caloHtTurnOn_num =
+  // ibooker_.book1D("caloHtTurnOn_num", "Calo HT Turn On Numerator; HT (GeV)",
+  // 30, 0.0, 1500.0 ); h_caloHtTurnOn_den = ibooker_.book1D("caloHtTurnOn_den",
+  // "Calo HT Turn On Denominator; HT (GeV)", 30, 0.0, 1500.0 );
+
+  h_pfAlphaTTurnOn_num = ibooker_.book1D("pfAlphaTTurnOn_num", "PF AlphaT Turn On Numerator; AlphaT", 40, 0.0, 1.0);
+  h_pfAlphaTTurnOn_den = ibooker_.book1D("pfAlphaTTurnOn_den", "PF AlphaT Turn OnDenominator; AlphaT", 40, 0.0, 1.0);
+  h_pfHtTurnOn_num = ibooker_.book1D("pfHtTurnOn_num", "PF HT Turn On Numerator; HT (GeV)", 30, 0.0, 1500.0);
+  h_pfHtTurnOn_den = ibooker_.book1D("pfHtTurnOn_den", "PF HT Turn On Denominator; HT (GeV)", 30, 0.0, 1500.0);
 
   ibooker_.cd();
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SUSY_HLT_alphaT);
diff --git a/HLTriggerOffline/Tau/interface/HLTTauMCProducer.h b/HLTriggerOffline/Tau/interface/HLTTauMCProducer.h
index b6796d188bd74..f0c0d8cbdaf9c 100644
--- a/HLTriggerOffline/Tau/interface/HLTTauMCProducer.h
+++ b/HLTriggerOffline/Tau/interface/HLTTauMCProducer.h
@@ -7,46 +7,50 @@ in Offline Trigger DQM etc
 #ifndef HLTTauMCProducer_h
 #define HLTTauMCProducer_h
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Utilities/interface/InputTag.h"
+#include "DataFormats/Candidate/interface/Candidate.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
-#include "DataFormats/Candidate/interface/Candidate.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
-#include "HepMC/GenEvent.h"
 #include "DataFormats/METReco/interface/GenMET.h"
 #include "DataFormats/METReco/interface/GenMETCollection.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
+#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/InputTag.h"
+#include "HepMC/GenEvent.h"
+#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 
-#include <vector>
-#include <string>
 #include "TLorentzVector.h"
+#include <string>
+#include <vector>
 
 typedef math::XYZTLorentzVectorD LorentzVector;
 typedef std::vector<LorentzVector> LorentzVectorCollection;
 
 class HLTTauMCProducer : public edm::EDProducer {
-  
 public:
-  explicit HLTTauMCProducer(const edm::ParameterSet&);
+  explicit HLTTauMCProducer(const edm::ParameterSet &);
   ~HLTTauMCProducer() override;
 
-  void produce(edm::Event&, const edm::EventSetup&) override;
-  
- private:
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
-  void getGenDecayProducts(const reco::GenParticleRef&, reco::GenParticleRefVector&,
-			   int status=1, int pdgId=0);
+private:
+  void getGenDecayProducts(const reco::GenParticleRef &, reco::GenParticleRefVector &, int status = 1, int pdgId = 0);
 
-  enum tauDecayModes {kElectron, kMuon, 
-		      kOneProng0pi0, kOneProng1pi0, kOneProng2pi0,
-		      kThreeProng0pi0, kThreeProng1pi0,
-		      kOther, kUndefined};
+  enum tauDecayModes {
+    kElectron,
+    kMuon,
+    kOneProng0pi0,
+    kOneProng1pi0,
+    kOneProng2pi0,
+    kThreeProng0pi0,
+    kThreeProng1pi0,
+    kOther,
+    kUndefined
+  };
 
   edm::EDGetTokenT<reco::GenParticleCollection> MC_;
   edm::EDGetTokenT<reco::GenMETCollection> MCMET_;
@@ -54,8 +58,7 @@ class HLTTauMCProducer : public edm::EDProducer {
   double ptMinMCElectron_;
   double ptMinMCMuon_;
   std::vector<int> m_PDG_;
-  double etaMin,etaMax,phiMin,phiMax;
-
+  double etaMin, etaMax, phiMin, phiMax;
 };
 
 #endif
diff --git a/HLTriggerOffline/Tau/interface/HLTTauRefCombiner.h b/HLTriggerOffline/Tau/interface/HLTTauRefCombiner.h
index 71a3a7be4d4f1..5387667b8d843 100644
--- a/HLTriggerOffline/Tau/interface/HLTTauRefCombiner.h
+++ b/HLTriggerOffline/Tau/interface/HLTTauRefCombiner.h
@@ -1,5 +1,5 @@
 /*HLTTauRefCombiner
-Producer that Combines LV collection to common denominator objects 
+Producer that Combines LV collection to common denominator objects
 for matching in the Tau HLT
 
 */
@@ -7,36 +7,34 @@ for matching in the Tau HLT
 #ifndef HLTTauRefCombiner_h
 #define HLTTauRefCombiner_h
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 #include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
-#include <vector>
 #include <string>
+#include <vector>
 
 class HLTTauRefCombiner : public edm::EDProducer {
-
 public:
-  explicit HLTTauRefCombiner(const edm::ParameterSet&);
+  explicit HLTTauRefCombiner(const edm::ParameterSet &);
   ~HLTTauRefCombiner() override;
 
-  void produce(edm::Event&, const edm::EventSetup&) override;
-  
- private:
+  void produce(edm::Event &, const edm::EventSetup &) override;
+
+private:
   typedef math::XYZTLorentzVectorD LorentzVector;
   typedef std::vector<LorentzVector> LorentzVectorCollection;
 
-  std::vector<edm::EDGetTokenT<LorentzVectorCollection> > inputColl_; //Input LV Collections
-  double matchDeltaR_; //Delta R for matching
-  std::string outName_; //outputObjectName
-
- bool match(const LorentzVector&,const LorentzVectorCollection&);//See if this Jet Is Matched
-
+  std::vector<edm::EDGetTokenT<LorentzVectorCollection>> inputColl_;  // Input LV Collections
+  double matchDeltaR_;                                                // Delta R for matching
+  std::string outName_;                                               // outputObjectName
 
+  bool match(const LorentzVector &,
+             const LorentzVectorCollection &);  // See if this Jet Is Matched
 };
 
 #endif
diff --git a/HLTriggerOffline/Tau/interface/HLTTauRelvalQTester.h b/HLTriggerOffline/Tau/interface/HLTTauRelvalQTester.h
index 1689253c7a25f..af277e1a708c6 100644
--- a/HLTriggerOffline/Tau/interface/HLTTauRelvalQTester.h
+++ b/HLTriggerOffline/Tau/interface/HLTTauRelvalQTester.h
@@ -1,21 +1,18 @@
 #include "DQMServices/Components/interface/QualityTester.h"
 
-
-class HLTTauRelvalQTester : public QualityTester
-{
- public:
-  HLTTauRelvalQTester(const edm::ParameterSet& ps);
+class HLTTauRelvalQTester : public QualityTester {
+public:
+  HLTTauRelvalQTester(const edm::ParameterSet &ps);
   ~HLTTauRelvalQTester() override;
 
- protected:
-
-  void analyze(const edm::Event& e, const edm::EventSetup& c) override ;
-  void endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& c) override;
-  void endRun(const edm::Run& r, const edm::EventSetup& c) override;
+protected:
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
+  void endLuminosityBlock(edm::LuminosityBlock const &lumiSeg, edm::EventSetup const &c) override;
+  void endRun(const edm::Run &r, const edm::EventSetup &c) override;
   void endJob() override;
 
- private:
-  edm::EDGetTokenT<std::vector<int> > refMothers_;
+private:
+  edm::EDGetTokenT<std::vector<int>> refMothers_;
   std::vector<int> mothers_;
   bool runQTests;
 };
diff --git a/HLTriggerOffline/Tau/src/HLTTauMCProducer.cc b/HLTriggerOffline/Tau/src/HLTTauMCProducer.cc
index 586e7767a5595..c896aa4e57751 100644
--- a/HLTriggerOffline/Tau/src/HLTTauMCProducer.cc
+++ b/HLTriggerOffline/Tau/src/HLTTauMCProducer.cc
@@ -4,21 +4,19 @@ using namespace edm;
 using namespace std;
 using namespace reco;
 
-HLTTauMCProducer::HLTTauMCProducer(const edm::ParameterSet& mc)
-{
- 
-  //One Parameter Set per Collection
+HLTTauMCProducer::HLTTauMCProducer(const edm::ParameterSet &mc) {
+  // One Parameter Set per Collection
 
-  MC_      = consumes<GenParticleCollection>(mc.getUntrackedParameter<edm::InputTag>("GenParticles"));
-  MCMET_   = consumes<GenMETCollection>(mc.getUntrackedParameter<edm::InputTag>("GenMET"));
-  ptMinMCTau_ = mc.getUntrackedParameter<double>("ptMinTau",5.);
-  ptMinMCMuon_ = mc.getUntrackedParameter<double>("ptMinMuon",2.);
-  ptMinMCElectron_ = mc.getUntrackedParameter<double>("ptMinElectron",5.);
-  m_PDG_   = mc.getUntrackedParameter<std::vector<int> >("BosonID");
-  etaMin = mc.getUntrackedParameter<double>("EtaMin",-2.5);
-  etaMax = mc.getUntrackedParameter<double>("EtaMax",2.5);
-  phiMin = mc.getUntrackedParameter<double>("PhiMin",-3.15);
-  phiMax = mc.getUntrackedParameter<double>("PhiMax",3.15);
+  MC_ = consumes<GenParticleCollection>(mc.getUntrackedParameter<edm::InputTag>("GenParticles"));
+  MCMET_ = consumes<GenMETCollection>(mc.getUntrackedParameter<edm::InputTag>("GenMET"));
+  ptMinMCTau_ = mc.getUntrackedParameter<double>("ptMinTau", 5.);
+  ptMinMCMuon_ = mc.getUntrackedParameter<double>("ptMinMuon", 2.);
+  ptMinMCElectron_ = mc.getUntrackedParameter<double>("ptMinElectron", 5.);
+  m_PDG_ = mc.getUntrackedParameter<std::vector<int>>("BosonID");
+  etaMin = mc.getUntrackedParameter<double>("EtaMin", -2.5);
+  etaMax = mc.getUntrackedParameter<double>("EtaMax", 2.5);
+  phiMin = mc.getUntrackedParameter<double>("PhiMin", -3.15);
+  phiMax = mc.getUntrackedParameter<double>("PhiMax", 3.15);
 
   produces<LorentzVectorCollection>("LeptonicTauLeptons");
   produces<LorentzVectorCollection>("LeptonicTauElectrons");
@@ -29,16 +27,14 @@ HLTTauMCProducer::HLTTauMCProducer(const edm::ParameterSet& mc)
   produces<LorentzVectorCollection>("TauOther");
   produces<LorentzVectorCollection>("Neutrina");
   produces<LorentzVectorCollection>("MET");
-  produces<std::vector<int> >("Mothers");
-
+  produces<std::vector<int>>("Mothers");
 }
 
-HLTTauMCProducer::~HLTTauMCProducer(){}
+HLTTauMCProducer::~HLTTauMCProducer() {}
+
+void HLTTauMCProducer::produce(edm::Event &iEvent, const edm::EventSetup &iES) {
+  // All the code from HLTTauMCInfo is here :-)
 
-void HLTTauMCProducer::produce(edm::Event& iEvent, const edm::EventSetup& iES)
-{
-  //All the code from HLTTauMCInfo is here :-) 
-  
   unique_ptr<LorentzVectorCollection> product_Electrons(new LorentzVectorCollection);
   unique_ptr<LorentzVectorCollection> product_Muons(new LorentzVectorCollection);
   unique_ptr<LorentzVectorCollection> product_Leptons(new LorentzVectorCollection);
@@ -48,212 +44,207 @@ void HLTTauMCProducer::produce(edm::Event& iEvent, const edm::EventSetup& iES)
   unique_ptr<LorentzVectorCollection> product_Other(new LorentzVectorCollection);
   unique_ptr<LorentzVectorCollection> product_Neutrina(new LorentzVectorCollection);
   unique_ptr<LorentzVectorCollection> product_MET(new LorentzVectorCollection);
-  unique_ptr<std::vector<int> > product_Mothers(new std::vector<int>);
-  
+  unique_ptr<std::vector<int>> product_Mothers(new std::vector<int>);
+
   edm::Handle<GenParticleCollection> genParticles;
   iEvent.getByToken(MC_, genParticles);
 
-  if(!genParticles.isValid()) return;
+  if (!genParticles.isValid())
+    return;
 
-  // Look for MET 
+  // Look for MET
   edm::Handle<reco::GenMETCollection> genMet;
   iEvent.getByToken(MCMET_, genMet);
-  LorentzVector MET(0.,0.,0.,0.);
-  if(genMet.isValid()){
-    MET = LorentzVector(
-        genMet->front().px(),
-        genMet->front().py(),
-        0,
-        genMet->front().pt()
-    );
-  }     
+  LorentzVector MET(0., 0., 0., 0.);
+  if (genMet.isValid()) {
+    MET = LorentzVector(genMet->front().px(), genMet->front().py(), 0, genMet->front().pt());
+  }
   product_MET->push_back(MET);
 
   // Look for primary bosons
   // It is not guaranteed that primary bosons are stored in event history.
-  // Is it really needed when check if taus from the boson is removed? 
+  // Is it really needed when check if taus from the boson is removed?
   // Kept for backward compatibility
-  for(GenParticleCollection::const_iterator p = genParticles->begin(); p != genParticles->end(); ++p) {
-    //Check the PDG ID
+  for (GenParticleCollection::const_iterator p = genParticles->begin(); p != genParticles->end(); ++p) {
+    // Check the PDG ID
     bool pdg_ok = false;
-    for(size_t pi =0;pi<m_PDG_.size();++pi)
-      {
-	if(abs((*p).pdgId())== m_PDG_[pi] && ( (*p).isHardProcess() || (*p).status() == 3 ) ){
-   	  pdg_ok = true;
-	  //cout<<" Bsoson particles: "<< (*p).pdgId()<< " " <<(*p).status() << " "<< pdg_ok<<endl;
-	  break;
-   	}
+    for (size_t pi = 0; pi < m_PDG_.size(); ++pi) {
+      if (abs((*p).pdgId()) == m_PDG_[pi] && ((*p).isHardProcess() || (*p).status() == 3)) {
+        pdg_ok = true;
+        // cout<<" Bsoson particles: "<< (*p).pdgId()<< " " <<(*p).status() << "
+        // "<< pdg_ok<<endl;
+        break;
       }
-    
+    }
+
     // Check if the boson is one of interest and if there is a valid vertex
-    if( pdg_ok )
-      {
-	product_Mothers->push_back((*p).pdgId());
+    if (pdg_ok) {
+      product_Mothers->push_back((*p).pdgId());
 
-	TLorentzVector Boson((*p).px(),(*p).py(),(*p).pz(),(*p).energy());	
-      }
-  }// End of search for the bosons
+      TLorentzVector Boson((*p).px(), (*p).py(), (*p).pz(), (*p).energy());
+    }
+  }  // End of search for the bosons
 
   // Look for taus
   GenParticleRefVector allTaus;
   unsigned index = 0;
-  for(GenParticleCollection::const_iterator p = genParticles->begin(); p != genParticles->end(); ++p, ++index) {    
-    const GenParticle& genP = *p;
-    //accept only isPromptDecayed() particles
-    if( !genP.isPromptDecayed() ) continue;
-    //check if it is tau, i.e. if |pdgId|=15
-    if( std::abs( genP.pdgId() ) == 15 ) {
+  for (GenParticleCollection::const_iterator p = genParticles->begin(); p != genParticles->end(); ++p, ++index) {
+    const GenParticle &genP = *p;
+    // accept only isPromptDecayed() particles
+    if (!genP.isPromptDecayed())
+      continue;
+    // check if it is tau, i.e. if |pdgId|=15
+    if (std::abs(genP.pdgId()) == 15) {
       GenParticleRef genRef(genParticles, index);
-      //check if it is the last tau in decay/radiation chain
+      // check if it is the last tau in decay/radiation chain
       GenParticleRefVector daugTaus;
-      getGenDecayProducts(genRef, daugTaus, 0, 15);      
-      if( daugTaus.empty() )
-	allTaus.push_back(genRef);
+      getGenDecayProducts(genRef, daugTaus, 0, 15);
+      if (daugTaus.empty())
+        allTaus.push_back(genRef);
     }
   }
 
   // Find stable tau decay products and build visible taus
-  for(GenParticleRefVector::const_iterator t = allTaus.begin(); t != allTaus.end(); ++t) {
-    //look for all stable (status=1) decay products
+  for (GenParticleRefVector::const_iterator t = allTaus.begin(); t != allTaus.end(); ++t) {
+    // look for all stable (status=1) decay products
     GenParticleRefVector decayProducts;
-    getGenDecayProducts(*t,decayProducts,1);
+    getGenDecayProducts(*t, decayProducts, 1);
+
+    // build visible taus and recognize decay mode
+    if (!decayProducts.empty()) {
+      LorentzVector Visible_Taus(0., 0., 0., 0.);
+      LorentzVector TauDecayProduct(0., 0., 0., 0.);
+      LorentzVector Neutrino(0., 0., 0., 0.);
 
-    //build visible taus and recognize decay mode
-    if( !decayProducts.empty() ) {
-      
-      LorentzVector Visible_Taus(0.,0.,0.,0.);
-      LorentzVector TauDecayProduct(0.,0.,0.,0.);
-      LorentzVector Neutrino(0.,0.,0.,0.);
-      
-      int numElectrons      = 0;
-      int numMuons          = 0;
-      int numChargedPions   = 0;
-      int numNeutralPions   = 0;
-      int numPhotons        = 0;
-      int numNeutrinos      = 0;
+      int numElectrons = 0;
+      int numMuons = 0;
+      int numChargedPions = 0;
+      int numNeutralPions = 0;
+      int numPhotons = 0;
+      int numNeutrinos = 0;
       int numOtherParticles = 0;
-      
-      for(GenParticleRefVector::const_iterator pit = decayProducts.begin(); pit != decayProducts.end(); ++pit) {
-	int pdg_id = abs((*pit)->pdgId());
-	if (pdg_id == 11) numElectrons++;
-	else if (pdg_id == 13) numMuons++;
-	else if (pdg_id == 211 || pdg_id == 321 ) numChargedPions++; //Count both pi+ and K+
-	else if (pdg_id == 111 || pdg_id == 130 || pdg_id == 310) numNeutralPions++; //Count both pi0 and K0_L/S
-	else if (pdg_id == 12 || 
-		 pdg_id == 14 || 
-		 pdg_id == 16) {
-	  numNeutrinos++;
-	  if (pdg_id == 16) {
-	    Neutrino.SetPxPyPzE((*pit)->px(),(*pit)->py(),(*pit)->pz(),(*pit)->energy());
-	  }
-	}
-	else if (pdg_id == 22) numPhotons++;
-	else {
-	  numOtherParticles++;
-	}
-	
-	if (pdg_id != 12 &&
-	    pdg_id != 14 && 
-	    pdg_id != 16){
-	  TauDecayProduct.SetPxPyPzE((*pit)->px(),(*pit)->py(),(*pit)->pz(),(*pit)->energy());
-	  Visible_Taus+=TauDecayProduct;
-	}
-	//		  cout<< "This has to be the same: " << (*pit)->pdgId() << " "<< (*pit)->status()<< " mother: "<< (*pit)->mother()->pdgId() << endl;
+
+      for (GenParticleRefVector::const_iterator pit = decayProducts.begin(); pit != decayProducts.end(); ++pit) {
+        int pdg_id = abs((*pit)->pdgId());
+        if (pdg_id == 11)
+          numElectrons++;
+        else if (pdg_id == 13)
+          numMuons++;
+        else if (pdg_id == 211 || pdg_id == 321)
+          numChargedPions++;  // Count both pi+ and K+
+        else if (pdg_id == 111 || pdg_id == 130 || pdg_id == 310)
+          numNeutralPions++;  // Count both pi0 and K0_L/S
+        else if (pdg_id == 12 || pdg_id == 14 || pdg_id == 16) {
+          numNeutrinos++;
+          if (pdg_id == 16) {
+            Neutrino.SetPxPyPzE((*pit)->px(), (*pit)->py(), (*pit)->pz(), (*pit)->energy());
+          }
+        } else if (pdg_id == 22)
+          numPhotons++;
+        else {
+          numOtherParticles++;
+        }
+
+        if (pdg_id != 12 && pdg_id != 14 && pdg_id != 16) {
+          TauDecayProduct.SetPxPyPzE((*pit)->px(), (*pit)->py(), (*pit)->pz(), (*pit)->energy());
+          Visible_Taus += TauDecayProduct;
+        }
+        //		  cout<< "This has to be the same: " << (*pit)->pdgId()
+        //<< " "<< (*pit)->status()<< " mother: "<< (*pit)->mother()->pdgId() <<
+        // endl;
       }
-      
+
       int tauDecayMode = kOther;
-      
-      if ( numOtherParticles == 0 ){
-	if ( numElectrons == 1 ){
-	  //--- tau decays into electrons
-	  tauDecayMode = kElectron;
-	} else if ( numMuons == 1 ){
-	  //--- tau decays into muons
-	  tauDecayMode = kMuon;
-	} else {
-	  //--- hadronic tau decays
-	  switch ( numChargedPions ){
-	  case 1 :
-	    if( numNeutralPions !=0 ){
-	      tauDecayMode = kOther;
-	      break;
-	    }
-	    switch ( numPhotons ){
-	    case 0:
-	      tauDecayMode = kOneProng0pi0;
-              break;
-	    case 2:
-	      tauDecayMode = kOneProng1pi0;
+
+      if (numOtherParticles == 0) {
+        if (numElectrons == 1) {
+          //--- tau decays into electrons
+          tauDecayMode = kElectron;
+        } else if (numMuons == 1) {
+          //--- tau decays into muons
+          tauDecayMode = kMuon;
+        } else {
+          //--- hadronic tau decays
+          switch (numChargedPions) {
+            case 1:
+              if (numNeutralPions != 0) {
+                tauDecayMode = kOther;
+                break;
+              }
+              switch (numPhotons) {
+                case 0:
+                  tauDecayMode = kOneProng0pi0;
+                  break;
+                case 2:
+                  tauDecayMode = kOneProng1pi0;
+                  break;
+                case 4:
+                  tauDecayMode = kOneProng2pi0;
+                  break;
+                default:
+                  tauDecayMode = kOther;
+                  break;
+              }
               break;
-	    case 4:
-	      tauDecayMode = kOneProng2pi0;
+            case 3:
+              if (numNeutralPions != 0) {
+                tauDecayMode = kOther;
+                break;
+              }
+              switch (numPhotons) {
+                case 0:
+                  tauDecayMode = kThreeProng0pi0;
+                  break;
+                case 2:
+                  tauDecayMode = kThreeProng1pi0;
+                  break;
+                default:
+                  tauDecayMode = kOther;
+                  break;
+              }
               break;
-	    default:
-	      tauDecayMode = kOther;
-	      break;
-	    }
-	    break;
-	  case 3 : 
-	    if( numNeutralPions !=0 ){
-	      tauDecayMode = kOther;
-	      break;
-	    }
-	    switch ( numPhotons ){
-	    case 0 : 
-	      tauDecayMode = kThreeProng0pi0;
-	      break;
-	    case 2 : 
-	      tauDecayMode = kThreeProng1pi0;
-	      break;
-	    default:
-	      tauDecayMode = kOther;
-	      break;
-	    }
-	    break;
-	  }
-	}
+          }
+        }
       }
-      
+
       //		  cout<< "So we have a: " << tauDecayMode <<endl;
-      if(tauDecayMode == kElectron)
-	{
-	  if((Visible_Taus.eta()>etaMin&&Visible_Taus.eta()<etaMax&&Visible_Taus.phi()>phiMin&&Visible_Taus.phi()<phiMax)&&(Visible_Taus.pt()>ptMinMCElectron_)){
-	    product_Electrons->push_back(Visible_Taus);
-	    product_Leptons->push_back(Visible_Taus);
-	  }
-	}
-      else if (tauDecayMode == kMuon)
-	{
-	  if((Visible_Taus.eta()>etaMin&&Visible_Taus.eta()<etaMax&&Visible_Taus.phi()>phiMin&&Visible_Taus.phi()<phiMax)&&(Visible_Taus.pt()>ptMinMCMuon_)){
-	    product_Muons->push_back(Visible_Taus);
-	    product_Leptons->push_back(Visible_Taus);
-	  }
-	}
-      else if(tauDecayMode == kOneProng0pi0 || 
-	      tauDecayMode == kOneProng1pi0 || 
-	      tauDecayMode == kOneProng2pi0 ) 
-	{
-	  if ((Visible_Taus.eta()>etaMin&&Visible_Taus.eta()<etaMax&&Visible_Taus.phi()>phiMin&&Visible_Taus.phi()<phiMax) && (Visible_Taus.pt() > ptMinMCTau_)){
-	    product_OneProng->push_back(Visible_Taus);
-	    product_OneAndThreeProng->push_back(Visible_Taus);
-	    product_Neutrina->push_back(Neutrino);
-	  }
-	}
-      else if (tauDecayMode == kThreeProng0pi0 || 
-	       tauDecayMode == kThreeProng1pi0 )
-	{
-	  if((Visible_Taus.eta()>etaMin&&Visible_Taus.eta()<etaMax&&Visible_Taus.phi()>phiMin&&Visible_Taus.phi()<phiMax)&&(Visible_Taus.pt()>ptMinMCTau_))  {
-	    product_ThreeProng->push_back(Visible_Taus);
-	    product_OneAndThreeProng->push_back(Visible_Taus);
-	    product_Neutrina->push_back(Neutrino);
-	  }
-	}
-      else if (tauDecayMode == kOther)
-	{
-	  if((Visible_Taus.eta()>etaMin&&Visible_Taus.eta()<etaMax&&Visible_Taus.phi()>phiMin&&Visible_Taus.phi()<phiMax)&&(Visible_Taus.pt()>ptMinMCTau_))  {
-	    product_Other->push_back(Visible_Taus);
-	  }
-	}
+      if (tauDecayMode == kElectron) {
+        if ((Visible_Taus.eta() > etaMin && Visible_Taus.eta() < etaMax && Visible_Taus.phi() > phiMin &&
+             Visible_Taus.phi() < phiMax) &&
+            (Visible_Taus.pt() > ptMinMCElectron_)) {
+          product_Electrons->push_back(Visible_Taus);
+          product_Leptons->push_back(Visible_Taus);
+        }
+      } else if (tauDecayMode == kMuon) {
+        if ((Visible_Taus.eta() > etaMin && Visible_Taus.eta() < etaMax && Visible_Taus.phi() > phiMin &&
+             Visible_Taus.phi() < phiMax) &&
+            (Visible_Taus.pt() > ptMinMCMuon_)) {
+          product_Muons->push_back(Visible_Taus);
+          product_Leptons->push_back(Visible_Taus);
+        }
+      } else if (tauDecayMode == kOneProng0pi0 || tauDecayMode == kOneProng1pi0 || tauDecayMode == kOneProng2pi0) {
+        if ((Visible_Taus.eta() > etaMin && Visible_Taus.eta() < etaMax && Visible_Taus.phi() > phiMin &&
+             Visible_Taus.phi() < phiMax) &&
+            (Visible_Taus.pt() > ptMinMCTau_)) {
+          product_OneProng->push_back(Visible_Taus);
+          product_OneAndThreeProng->push_back(Visible_Taus);
+          product_Neutrina->push_back(Neutrino);
+        }
+      } else if (tauDecayMode == kThreeProng0pi0 || tauDecayMode == kThreeProng1pi0) {
+        if ((Visible_Taus.eta() > etaMin && Visible_Taus.eta() < etaMax && Visible_Taus.phi() > phiMin &&
+             Visible_Taus.phi() < phiMax) &&
+            (Visible_Taus.pt() > ptMinMCTau_)) {
+          product_ThreeProng->push_back(Visible_Taus);
+          product_OneAndThreeProng->push_back(Visible_Taus);
+          product_Neutrina->push_back(Neutrino);
+        }
+      } else if (tauDecayMode == kOther) {
+        if ((Visible_Taus.eta() > etaMin && Visible_Taus.eta() < etaMax && Visible_Taus.phi() > phiMin &&
+             Visible_Taus.phi() < phiMax) &&
+            (Visible_Taus.pt() > ptMinMCTau_)) {
+          product_Other->push_back(Visible_Taus);
+        }
+      }
     }
   }
 
@@ -265,27 +256,22 @@ void HLTTauMCProducer::produce(edm::Event& iEvent, const edm::EventSetup& iES)
   iEvent.put(std::move(product_OneAndThreeProng), "HadronicTauOneAndThreeProng");
   iEvent.put(std::move(product_Other), "TauOther");
   iEvent.put(std::move(product_Neutrina), "Neutrina");
-  iEvent.put(std::move(product_MET), "MET"); 
-  iEvent.put(std::move(product_Mothers), "Mothers"); 
-  
+  iEvent.put(std::move(product_MET), "MET");
+  iEvent.put(std::move(product_Mothers), "Mothers");
 }
 
 // Helper Function
 
-void HLTTauMCProducer::getGenDecayProducts(const GenParticleRef& mother, GenParticleRefVector& products,
-					   int status, int pdgId ) {
+void HLTTauMCProducer::getGenDecayProducts(const GenParticleRef &mother,
+                                           GenParticleRefVector &products,
+                                           int status,
+                                           int pdgId) {
+  const GenParticleRefVector &daughterRefs = mother->daughterRefVector();
 
-  const GenParticleRefVector& daughterRefs = mother->daughterRefVector();
-  
-  for(GenParticleRefVector::const_iterator d = daughterRefs.begin(); d != daughterRefs.end(); ++d) {
-    
-    if( (status==0 || (*d)->status() == status) && 
-	(pdgId==0 || std::abs((*d)->pdgId()) == pdgId) ) {
-      
+  for (GenParticleRefVector::const_iterator d = daughterRefs.begin(); d != daughterRefs.end(); ++d) {
+    if ((status == 0 || (*d)->status() == status) && (pdgId == 0 || std::abs((*d)->pdgId()) == pdgId)) {
       products.push_back(*d);
-    }
-    else 
+    } else
       getGenDecayProducts(*d, products, status, pdgId);
   }
-  
-} 
+}
diff --git a/HLTriggerOffline/Tau/src/HLTTauRefCombiner.cc b/HLTriggerOffline/Tau/src/HLTTauRefCombiner.cc
index 970580a294860..93a95718fd7d2 100644
--- a/HLTriggerOffline/Tau/src/HLTTauRefCombiner.cc
+++ b/HLTriggerOffline/Tau/src/HLTTauRefCombiner.cc
@@ -1,106 +1,75 @@
 #include "HLTriggerOffline/Tau/interface/HLTTauRefCombiner.h"
 #include "Math/GenVector/VectorUtil.h"
 
-
-
 using namespace edm;
 using namespace std;
 
-HLTTauRefCombiner::HLTTauRefCombiner(const edm::ParameterSet& iConfig)
-{
-  std::vector<edm::InputTag> inputCollVector_ = iConfig.getParameter< std::vector<InputTag> >("InputCollections");
-  for(unsigned int ii=0; ii<inputCollVector_.size(); ++ii)
-    {
-      inputColl_.push_back( consumes<LorentzVectorCollection>(inputCollVector_[ii]) );
-    }
+HLTTauRefCombiner::HLTTauRefCombiner(const edm::ParameterSet &iConfig) {
+  std::vector<edm::InputTag> inputCollVector_ = iConfig.getParameter<std::vector<InputTag>>("InputCollections");
+  for (unsigned int ii = 0; ii < inputCollVector_.size(); ++ii) {
+    inputColl_.push_back(consumes<LorentzVectorCollection>(inputCollVector_[ii]));
+  }
   matchDeltaR_ = iConfig.getParameter<double>("MatchDeltaR");
-  outName_     = iConfig.getParameter<string>("OutputCollection");
+  outName_ = iConfig.getParameter<string>("OutputCollection");
 
-  produces<LorentzVectorCollection> ( outName_);
+  produces<LorentzVectorCollection>(outName_);
 }
 
-HLTTauRefCombiner::~HLTTauRefCombiner(){ }
-
-void HLTTauRefCombiner::produce(edm::Event& iEvent, const edm::EventSetup& iES)
-{
-    unique_ptr<LorentzVectorCollection> out_product(new LorentzVectorCollection);
-
-    //Create The Handles..
-    std::vector< Handle<LorentzVectorCollection> > handles;
-
-    bool allCollectionsExist = true;
-    //Map the Handles to the collections if all collections exist
-    for(size_t i = 0;i<inputColl_.size();++i)
-      {
-	edm::Handle<LorentzVectorCollection> tmp;
-	if(iEvent.getByToken(inputColl_[i],tmp))
-	  {
-	    handles.push_back(tmp);
-	  }
-	else
-	  {
-	    allCollectionsExist = false;
-	  }
-
-      }
-
-    //The reference output object collection will be the first one..
-    if(allCollectionsExist)
-      {
-	//loop on the first collection
-	for(size_t i = 0; i < (handles[0])->size();++i)
-	  {
-	    bool MatchedObj = true;
+HLTTauRefCombiner::~HLTTauRefCombiner() {}
 
-	    //get reference Vector
-	    const LorentzVector lvRef = (*(handles[0]))[i];
-	    
-	    //Loop on all other collections and match
-	    	for(size_t j = 1; j < handles.size();++j)
-		  {
-		    if(!match(lvRef,*(handles[j])))
-		      MatchedObj = false;
+void HLTTauRefCombiner::produce(edm::Event &iEvent, const edm::EventSetup &iES) {
+  unique_ptr<LorentzVectorCollection> out_product(new LorentzVectorCollection);
 
-		  }
-		
-		//If the Object is Matched Everywhere store
-		if(MatchedObj)
-		  {
-		    out_product->push_back(lvRef);
-		  }
+  // Create The Handles..
+  std::vector<Handle<LorentzVectorCollection>> handles;
 
+  bool allCollectionsExist = true;
+  // Map the Handles to the collections if all collections exist
+  for (size_t i = 0; i < inputColl_.size(); ++i) {
+    edm::Handle<LorentzVectorCollection> tmp;
+    if (iEvent.getByToken(inputColl_[i], tmp)) {
+      handles.push_back(tmp);
+    } else {
+      allCollectionsExist = false;
+    }
+  }
 
-	  }
+  // The reference output object collection will be the first one..
+  if (allCollectionsExist) {
+    // loop on the first collection
+    for (size_t i = 0; i < (handles[0])->size(); ++i) {
+      bool MatchedObj = true;
 
-	//Put product to file
-	iEvent.put(std::move(out_product),outName_);
+      // get reference Vector
+      const LorentzVector lvRef = (*(handles[0]))[i];
 
+      // Loop on all other collections and match
+      for (size_t j = 1; j < handles.size(); ++j) {
+        if (!match(lvRef, *(handles[j])))
+          MatchedObj = false;
       }
-    
-    
 
+      // If the Object is Matched Everywhere store
+      if (MatchedObj) {
+        out_product->push_back(lvRef);
+      }
+    }
 
+    // Put product to file
+    iEvent.put(std::move(out_product), outName_);
+  }
 }
 
+bool HLTTauRefCombiner::match(const LorentzVector &lv, const LorentzVectorCollection &lvcol) {
+  bool matched = false;
 
+  if (!lvcol.empty())
+    for (LorentzVectorCollection::const_iterator it = lvcol.begin(); it != lvcol.end(); ++it) {
+      double delta = ROOT::Math::VectorUtil::DeltaR(lv, *it);
+      if (delta < matchDeltaR_) {
+        matched = true;
+      }
+    }
 
-bool 
-HLTTauRefCombiner::match(const LorentzVector& lv,const LorentzVectorCollection& lvcol)
-{
- bool matched=false;
-
- if(!lvcol.empty())
-  for(LorentzVectorCollection::const_iterator it = lvcol.begin();it!=lvcol.end();++it)
-   {
-     	  double delta = ROOT::Math::VectorUtil::DeltaR(lv,*it);
-	  if(delta<matchDeltaR_)
-	    {
-	      matched=true;
-	     
-	    }
-   }
-
-
-
- return matched;
+  return matched;
 }
diff --git a/HLTriggerOffline/Tau/src/HLTTauRelvalQTester.cc b/HLTriggerOffline/Tau/src/HLTTauRelvalQTester.cc
index f8af1e2db95b0..0602665393d1e 100644
--- a/HLTriggerOffline/Tau/src/HLTTauRelvalQTester.cc
+++ b/HLTriggerOffline/Tau/src/HLTTauRelvalQTester.cc
@@ -1,65 +1,34 @@
 #include "HLTriggerOffline/Tau/interface/HLTTauRelvalQTester.h"
 //#include "DataFormats/Math/interface/LorentzVector.h"
 
-
-
-
-HLTTauRelvalQTester::HLTTauRelvalQTester(const edm::ParameterSet& ps):
-QualityTester(ps)
-{
-  refMothers_ = consumes<std::vector<int> >(ps.getParameter<edm::InputTag >("refMothers"));
-  mothers_ = ps.getParameter<std::vector<int> >("mothers");
+HLTTauRelvalQTester::HLTTauRelvalQTester(const edm::ParameterSet &ps) : QualityTester(ps) {
+  refMothers_ = consumes<std::vector<int>>(ps.getParameter<edm::InputTag>("refMothers"));
+  mothers_ = ps.getParameter<std::vector<int>>("mothers");
   runQTests = false;
 }
 
-HLTTauRelvalQTester::~HLTTauRelvalQTester()
-{
-
-}
-
-
-
-void 
-HLTTauRelvalQTester::analyze(const edm::Event& e, const edm::EventSetup& c)
-{
-  edm::Handle<std::vector<int> > refMothers;
-  if(e.getByToken(refMothers_,refMothers))
-    for(unsigned int i=0;i<refMothers->size();++i)
-      {
-	int mother = (*refMothers)[i];
-	for(unsigned int j=0;j<mothers_.size();++j)
-	  {
-	    if(mothers_[j]==mother)
-	      runQTests = true;
-	  }
+HLTTauRelvalQTester::~HLTTauRelvalQTester() {}
 
-	if(runQTests)
-	  {
-	    QualityTester::analyze(e,c);
-	  }
+void HLTTauRelvalQTester::analyze(const edm::Event &e, const edm::EventSetup &c) {
+  edm::Handle<std::vector<int>> refMothers;
+  if (e.getByToken(refMothers_, refMothers))
+    for (unsigned int i = 0; i < refMothers->size(); ++i) {
+      int mother = (*refMothers)[i];
+      for (unsigned int j = 0; j < mothers_.size(); ++j) {
+        if (mothers_[j] == mother)
+          runQTests = true;
       }
-} 
-
-void 
-HLTTauRelvalQTester::endLuminosityBlock(edm::LuminosityBlock const& lumiSeg, edm::EventSetup const& c)
-{
-	    QualityTester::endLuminosityBlock(lumiSeg,c);
 
+      if (runQTests) {
+        QualityTester::analyze(e, c);
+      }
+    }
 }
 
-
-void 
-HLTTauRelvalQTester::endRun(const edm::Run& r, const edm::EventSetup& c)
-{
-	    QualityTester::endRun(r,c);
-
+void HLTTauRelvalQTester::endLuminosityBlock(edm::LuminosityBlock const &lumiSeg, edm::EventSetup const &c) {
+  QualityTester::endLuminosityBlock(lumiSeg, c);
 }
 
+void HLTTauRelvalQTester::endRun(const edm::Run &r, const edm::EventSetup &c) { QualityTester::endRun(r, c); }
 
-void 
-HLTTauRelvalQTester::endJob()
-{
-	    QualityTester::endJob();
-
-}
-
+void HLTTauRelvalQTester::endJob() { QualityTester::endJob(); }
diff --git a/HLTriggerOffline/Tau/src/SealModule.cc b/HLTriggerOffline/Tau/src/SealModule.cc
index f676aa1e9c033..41b9cdbe3e119 100644
--- a/HLTriggerOffline/Tau/src/SealModule.cc
+++ b/HLTriggerOffline/Tau/src/SealModule.cc
@@ -1,12 +1,9 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
-#include "HLTriggerOffline/Tau/interface/HLTTauRefCombiner.h"
 #include "HLTriggerOffline/Tau/interface/HLTTauMCProducer.h"
+#include "HLTriggerOffline/Tau/interface/HLTTauRefCombiner.h"
 #include "HLTriggerOffline/Tau/interface/HLTTauRelvalQTester.h"
 
-
-
 DEFINE_FWK_MODULE(HLTTauRefCombiner);
 DEFINE_FWK_MODULE(HLTTauMCProducer);
 DEFINE_FWK_MODULE(HLTTauRelvalQTester);
-
diff --git a/HLTriggerOffline/Top/interface/TopDiLeptonHLTValidation.h b/HLTriggerOffline/Top/interface/TopDiLeptonHLTValidation.h
index c8891efc94220..b28d512bfd7c3 100644
--- a/HLTriggerOffline/Top/interface/TopDiLeptonHLTValidation.h
+++ b/HLTriggerOffline/Top/interface/TopDiLeptonHLTValidation.h
@@ -2,12 +2,14 @@
 //
 // Package:    HLTriggerOffline/Top
 // Class:      TopDiLeptonHLTValidation
-// 
-/**\class TopDiLeptonHLTValidation TopDiLeptonHLTValidation.h HLTriggerOffline/Top/TopDiLeptonHLTValidation.h
+//
+/**\class TopDiLeptonHLTValidation TopDiLeptonHLTValidation.h
+ HLTriggerOffline/Top/TopDiLeptonHLTValidation.h
 
- Description: 
+ Description:
 
- Description: compute efficiencies of trigger paths on offline reco selection with respect to pt and eta
+ Description: compute efficiencies of trigger paths on offline reco selection
+ with respect to pt and eta
 
  Implementation:
    harvesting
@@ -25,98 +27,96 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
+#include "DataFormats/Common/interface/TriggerResults.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
-#include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/JetReco/interface/Jet.h"
+#include "DataFormats/MuonReco/interface/Muon.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
-#include "DataFormats/Common/interface/TriggerResults.h"
 
 //
 // class declaration
 //
 
 class TopDiLeptonHLTValidation : public DQMEDAnalyzer {
-   public:
-      explicit TopDiLeptonHLTValidation(const edm::ParameterSet&);
-      ~TopDiLeptonHLTValidation() override;
-
-      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-
-
-   private:
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-      /// deduce monitorPath from label, the label is expected
-      /// to be of type 'selectionPath:monitorPath'
-      std::string monitorPath(const std::string& label) const { return label.substr(label.find(':')+1); };  
-      /// set configurable labels for trigger monitoring histograms
-      void triggerBinLabels(const std::vector<std::string>& labels);
-
-      // ----------member data ---------------------------
-      // DQM
-      std::string sDir_;
-      MonitorElement* hNumLeptonPt;
-      MonitorElement* hDenLeptonPt;
-      MonitorElement* hNumLeptonEta;
-      MonitorElement* hDenLeptonEta;
-      MonitorElement* hNumJetPt;
-      MonitorElement* hDenJetPt;
-      MonitorElement* hNumJetEta;
-      MonitorElement* hDenJetEta;
-      MonitorElement* hNumTriggerMon;
-      MonitorElement* hDenTriggerMon;
-      // Electrons
-      const reco::GsfElectron *elec1_;
-      const reco::GsfElectron *elec2_;
-      std::string sElectrons_;
-      edm::EDGetTokenT< edm::View<reco::GsfElectron> > tokElectrons_;
-      double ptElectrons_;
-      double etaElectrons_;
-      double isoElectrons_;
-      unsigned int minElectrons_;
-      // Muons
-      const reco::Muon *mu1_;
-      const reco::Muon *mu2_;
-      std::string sMuons_;
-      edm::EDGetTokenT< edm::View<reco::Muon> > tokMuons_;
-      double ptMuons_;
-      double etaMuons_;
-      double isoMuons_;
-      unsigned int minMuons_;
-      // Jets
-      const reco::Jet *jet_;
-      std::string sJets_;
-      edm::EDGetTokenT< edm::View<reco::Jet> > tokJets_;
-      double ptJets_;
-      double etaJets_;
-      unsigned int minJets_;
-      // Trigger
-      edm::InputTag iTrigger_;
-      edm::EDGetTokenT<edm::TriggerResults> tokTrigger_;
-      std::vector<std::string> vsPaths_;
-      // Flags
-      bool isAll_ = false;
-      bool isSel_ = false;
+public:
+  explicit TopDiLeptonHLTValidation(const edm::ParameterSet &);
+  ~TopDiLeptonHLTValidation() override;
+
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
+
+private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  /// deduce monitorPath from label, the label is expected
+  /// to be of type 'selectionPath:monitorPath'
+  std::string monitorPath(const std::string &label) const { return label.substr(label.find(':') + 1); };
+  /// set configurable labels for trigger monitoring histograms
+  void triggerBinLabels(const std::vector<std::string> &labels);
+
+  // ----------member data ---------------------------
+  // DQM
+  std::string sDir_;
+  MonitorElement *hNumLeptonPt;
+  MonitorElement *hDenLeptonPt;
+  MonitorElement *hNumLeptonEta;
+  MonitorElement *hDenLeptonEta;
+  MonitorElement *hNumJetPt;
+  MonitorElement *hDenJetPt;
+  MonitorElement *hNumJetEta;
+  MonitorElement *hDenJetEta;
+  MonitorElement *hNumTriggerMon;
+  MonitorElement *hDenTriggerMon;
+  // Electrons
+  const reco::GsfElectron *elec1_;
+  const reco::GsfElectron *elec2_;
+  std::string sElectrons_;
+  edm::EDGetTokenT<edm::View<reco::GsfElectron>> tokElectrons_;
+  double ptElectrons_;
+  double etaElectrons_;
+  double isoElectrons_;
+  unsigned int minElectrons_;
+  // Muons
+  const reco::Muon *mu1_;
+  const reco::Muon *mu2_;
+  std::string sMuons_;
+  edm::EDGetTokenT<edm::View<reco::Muon>> tokMuons_;
+  double ptMuons_;
+  double etaMuons_;
+  double isoMuons_;
+  unsigned int minMuons_;
+  // Jets
+  const reco::Jet *jet_;
+  std::string sJets_;
+  edm::EDGetTokenT<edm::View<reco::Jet>> tokJets_;
+  double ptJets_;
+  double etaJets_;
+  unsigned int minJets_;
+  // Trigger
+  edm::InputTag iTrigger_;
+  edm::EDGetTokenT<edm::TriggerResults> tokTrigger_;
+  std::vector<std::string> vsPaths_;
+  // Flags
+  bool isAll_ = false;
+  bool isSel_ = false;
 };
 
-inline void TopDiLeptonHLTValidation::triggerBinLabels(const std::vector<std::string>& labels)
-{
-  for(unsigned int idx=0; idx<labels.size(); ++idx){
-    hNumTriggerMon->setBinLabel( idx+1, "["+monitorPath(labels[idx])+"]", 1);
-    hDenTriggerMon->setBinLabel( idx+1, "["+monitorPath(labels[idx])+"]", 1);
+inline void TopDiLeptonHLTValidation::triggerBinLabels(const std::vector<std::string> &labels) {
+  for (unsigned int idx = 0; idx < labels.size(); ++idx) {
+    hNumTriggerMon->setBinLabel(idx + 1, "[" + monitorPath(labels[idx]) + "]", 1);
+    hDenTriggerMon->setBinLabel(idx + 1, "[" + monitorPath(labels[idx]) + "]", 1);
   }
 }
 
@@ -131,45 +131,41 @@ inline void TopDiLeptonHLTValidation::triggerBinLabels(const std::vector<std::st
 //
 // constructors and destructor
 //
-TopDiLeptonHLTValidation::TopDiLeptonHLTValidation(const edm::ParameterSet& iConfig) :
-  sDir_(iConfig.getUntrackedParameter<std::string>("sDir","Validation/Top/Efficiencies/")),
-  sElectrons_(iConfig.getUntrackedParameter<std::string>("sElectrons","gsfElectrons")),
-  ptElectrons_(iConfig.getUntrackedParameter<double>("ptElectrons",0.)),
-  etaElectrons_(iConfig.getUntrackedParameter<double>("etaElectrons",0.)),
-  isoElectrons_(iConfig.getUntrackedParameter<double>("isoElectrons",0.)),
-  minElectrons_(iConfig.getUntrackedParameter<unsigned int>("minElectrons",0)),
-  sMuons_(iConfig.getUntrackedParameter<std::string>("sMuons","muons")),
-  ptMuons_(iConfig.getUntrackedParameter<double>("ptMuons",0.)),
-  etaMuons_(iConfig.getUntrackedParameter<double>("etaMuons",0.)),
-  isoMuons_(iConfig.getUntrackedParameter<double>("isoMuons",0.)),
-  minMuons_(iConfig.getUntrackedParameter<unsigned int>("minMuons",0)),
-  sJets_(iConfig.getUntrackedParameter<std::string>("sJets","ak5PFJets")),
-  ptJets_(iConfig.getUntrackedParameter<double>("ptJets",0.)),
-  etaJets_(iConfig.getUntrackedParameter<double>("etaJets",0.)),
-  minJets_(iConfig.getUntrackedParameter<unsigned int>("minJets",0)),
-  iTrigger_(iConfig.getUntrackedParameter<edm::InputTag>("iTrigger")),
-  vsPaths_(iConfig.getUntrackedParameter< std::vector<std::string> >("vsPaths"))
+TopDiLeptonHLTValidation::TopDiLeptonHLTValidation(const edm::ParameterSet &iConfig)
+    : sDir_(iConfig.getUntrackedParameter<std::string>("sDir", "Validation/Top/Efficiencies/")),
+      sElectrons_(iConfig.getUntrackedParameter<std::string>("sElectrons", "gsfElectrons")),
+      ptElectrons_(iConfig.getUntrackedParameter<double>("ptElectrons", 0.)),
+      etaElectrons_(iConfig.getUntrackedParameter<double>("etaElectrons", 0.)),
+      isoElectrons_(iConfig.getUntrackedParameter<double>("isoElectrons", 0.)),
+      minElectrons_(iConfig.getUntrackedParameter<unsigned int>("minElectrons", 0)),
+      sMuons_(iConfig.getUntrackedParameter<std::string>("sMuons", "muons")),
+      ptMuons_(iConfig.getUntrackedParameter<double>("ptMuons", 0.)),
+      etaMuons_(iConfig.getUntrackedParameter<double>("etaMuons", 0.)),
+      isoMuons_(iConfig.getUntrackedParameter<double>("isoMuons", 0.)),
+      minMuons_(iConfig.getUntrackedParameter<unsigned int>("minMuons", 0)),
+      sJets_(iConfig.getUntrackedParameter<std::string>("sJets", "ak5PFJets")),
+      ptJets_(iConfig.getUntrackedParameter<double>("ptJets", 0.)),
+      etaJets_(iConfig.getUntrackedParameter<double>("etaJets", 0.)),
+      minJets_(iConfig.getUntrackedParameter<unsigned int>("minJets", 0)),
+      iTrigger_(iConfig.getUntrackedParameter<edm::InputTag>("iTrigger")),
+      vsPaths_(iConfig.getUntrackedParameter<std::vector<std::string>>("vsPaths"))
 
 {
   // Electrons
-  tokElectrons_ = consumes< edm::View<reco::GsfElectron> >(edm::InputTag(sElectrons_));
+  tokElectrons_ = consumes<edm::View<reco::GsfElectron>>(edm::InputTag(sElectrons_));
   // Muons
-  tokMuons_ = consumes< edm::View<reco::Muon> >(edm::InputTag(sMuons_));
+  tokMuons_ = consumes<edm::View<reco::Muon>>(edm::InputTag(sMuons_));
   // Jets
-  tokJets_ = consumes< edm::View<reco::Jet> >(edm::InputTag(sJets_));
+  tokJets_ = consumes<edm::View<reco::Jet>>(edm::InputTag(sJets_));
   // Trigger
-  tokTrigger_ = consumes<edm::TriggerResults>(iTrigger_); 
+  tokTrigger_ = consumes<edm::TriggerResults>(iTrigger_);
 }
 
-
-TopDiLeptonHLTValidation::~TopDiLeptonHLTValidation()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+TopDiLeptonHLTValidation::~TopDiLeptonHLTValidation() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 #endif
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(TopDiLeptonHLTValidation);
diff --git a/HLTriggerOffline/Top/interface/TopSingleLeptonHLTValidation.h b/HLTriggerOffline/Top/interface/TopSingleLeptonHLTValidation.h
index cc7c50c78a072..75aa924f7cdf9 100644
--- a/HLTriggerOffline/Top/interface/TopSingleLeptonHLTValidation.h
+++ b/HLTriggerOffline/Top/interface/TopSingleLeptonHLTValidation.h
@@ -2,10 +2,12 @@
 //
 // Package:    HLTriggerOffline/Top
 // Class:      TopSingleLeptonHLTValidation
-// 
-/**\class TopSingleLeptonHLTValidation TopSingleLeptonHLTValidation.h HLTriggerOffline/Top/interface/TopSingleLeptonHLTValidation.h
+//
+/**\class TopSingleLeptonHLTValidation TopSingleLeptonHLTValidation.h
+ HLTriggerOffline/Top/interface/TopSingleLeptonHLTValidation.h
 
- Description: compute efficiencies of trigger paths on offline reco selection with respect to pt and eta
+ Description: compute efficiencies of trigger paths on offline reco selection
+ with respect to pt and eta
 
  Implementation:
      harvesting
@@ -22,97 +24,94 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
+#include "DataFormats/Common/interface/TriggerResults.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
-#include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/JetReco/interface/Jet.h"
+#include "DataFormats/MuonReco/interface/Muon.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
-#include "DataFormats/Common/interface/TriggerResults.h"
 
 //
 // class declaration
 //
 
 class TopSingleLeptonHLTValidation : public DQMEDAnalyzer {
-   public:
-      explicit TopSingleLeptonHLTValidation(const edm::ParameterSet&);
-      ~TopSingleLeptonHLTValidation() override;
-
-      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-
-
-   private:
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-      /// deduce monitorPath from label, the label is expected
-      /// to be of type 'selectionPath:monitorPath'
-      std::string monitorPath(const std::string& label) const { return label.substr(label.find(':')+1); };  
-      /// set configurable labels for trigger monitoring histograms
-      void triggerBinLabels(const std::vector<std::string>& labels);
-
-      // ----------member data ---------------------------
-      // DQM
-      std::string sDir_;
-      MonitorElement* hNumLeptonPt;
-      MonitorElement* hDenLeptonPt;
-      MonitorElement* hNumLeptonEta;
-      MonitorElement* hDenLeptonEta;
-      MonitorElement* hNumJetPt;
-      MonitorElement* hDenJetPt;
-      MonitorElement* hNumJetEta;
-      MonitorElement* hDenJetEta;
-      MonitorElement* hNumTriggerMon;
-      MonitorElement* hDenTriggerMon;
-      // Electrons
-      const reco::GsfElectron *elec_;
-      std::string sElectrons_;
-      edm::EDGetTokenT< edm::View<reco::GsfElectron> > tokElectrons_;
-      double ptElectrons_;
-      double etaElectrons_;
-      double isoElectrons_;
-      unsigned int minElectrons_;
-      // Muons
-      const reco::Muon *mu_;
-      std::string sMuons_;
-      edm::EDGetTokenT< edm::View<reco::Muon> > tokMuons_;
-      double ptMuons_;
-      double etaMuons_;
-      double isoMuons_;
-      unsigned int minMuons_;
-      // Jets
-      const reco::Jet *jet_;
-      std::string sJets_;
-      edm::EDGetTokenT< edm::View<reco::Jet> > tokJets_;
-      double ptJets_;
-      double etaJets_;
-      unsigned int minJets_;
-      // Trigger
-      edm::InputTag iTrigger_;
-      edm::EDGetTokenT<edm::TriggerResults> tokTrigger_;
-      std::vector<std::string> vsPaths_;
-      // Flags
-      bool isAll_ = false;
-      bool isSel_ = false;
-
+public:
+  explicit TopSingleLeptonHLTValidation(const edm::ParameterSet &);
+  ~TopSingleLeptonHLTValidation() override;
+
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
+
+private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  /// deduce monitorPath from label, the label is expected
+  /// to be of type 'selectionPath:monitorPath'
+  std::string monitorPath(const std::string &label) const { return label.substr(label.find(':') + 1); };
+  /// set configurable labels for trigger monitoring histograms
+  void triggerBinLabels(const std::vector<std::string> &labels);
+
+  // ----------member data ---------------------------
+  // DQM
+  std::string sDir_;
+  MonitorElement *hNumLeptonPt;
+  MonitorElement *hDenLeptonPt;
+  MonitorElement *hNumLeptonEta;
+  MonitorElement *hDenLeptonEta;
+  MonitorElement *hNumJetPt;
+  MonitorElement *hDenJetPt;
+  MonitorElement *hNumJetEta;
+  MonitorElement *hDenJetEta;
+  MonitorElement *hNumTriggerMon;
+  MonitorElement *hDenTriggerMon;
+  // Electrons
+  const reco::GsfElectron *elec_;
+  std::string sElectrons_;
+  edm::EDGetTokenT<edm::View<reco::GsfElectron>> tokElectrons_;
+  double ptElectrons_;
+  double etaElectrons_;
+  double isoElectrons_;
+  unsigned int minElectrons_;
+  // Muons
+  const reco::Muon *mu_;
+  std::string sMuons_;
+  edm::EDGetTokenT<edm::View<reco::Muon>> tokMuons_;
+  double ptMuons_;
+  double etaMuons_;
+  double isoMuons_;
+  unsigned int minMuons_;
+  // Jets
+  const reco::Jet *jet_;
+  std::string sJets_;
+  edm::EDGetTokenT<edm::View<reco::Jet>> tokJets_;
+  double ptJets_;
+  double etaJets_;
+  unsigned int minJets_;
+  // Trigger
+  edm::InputTag iTrigger_;
+  edm::EDGetTokenT<edm::TriggerResults> tokTrigger_;
+  std::vector<std::string> vsPaths_;
+  // Flags
+  bool isAll_ = false;
+  bool isSel_ = false;
 };
 
-inline void TopSingleLeptonHLTValidation::triggerBinLabels(const std::vector<std::string>& labels)
-{
-  for(unsigned int idx=0; idx<labels.size(); ++idx){
-    hNumTriggerMon->setBinLabel( idx+1, "["+monitorPath(labels[idx])+"]", 1);
-    hDenTriggerMon->setBinLabel( idx+1, "["+monitorPath(labels[idx])+"]", 1);
+inline void TopSingleLeptonHLTValidation::triggerBinLabels(const std::vector<std::string> &labels) {
+  for (unsigned int idx = 0; idx < labels.size(); ++idx) {
+    hNumTriggerMon->setBinLabel(idx + 1, "[" + monitorPath(labels[idx]) + "]", 1);
+    hDenTriggerMon->setBinLabel(idx + 1, "[" + monitorPath(labels[idx]) + "]", 1);
   }
 }
 
@@ -127,45 +126,41 @@ inline void TopSingleLeptonHLTValidation::triggerBinLabels(const std::vector<std
 //
 // constructors and destructor
 //
-TopSingleLeptonHLTValidation::TopSingleLeptonHLTValidation(const edm::ParameterSet& iConfig) :
-  sDir_(iConfig.getUntrackedParameter<std::string>("sDir","HLTValidation/Top/Efficiencies/")),
-  sElectrons_(iConfig.getUntrackedParameter<std::string>("sElectrons","gsfElectrons")),
-  ptElectrons_(iConfig.getUntrackedParameter<double>("ptElectrons",0.)),
-  etaElectrons_(iConfig.getUntrackedParameter<double>("etaElectrons",0.)),
-  isoElectrons_(iConfig.getUntrackedParameter<double>("isoElectrons",0.)),
-  minElectrons_(iConfig.getUntrackedParameter<unsigned int>("minElectrons",0)),
-  sMuons_(iConfig.getUntrackedParameter<std::string>("sMuons","muons")),
-  ptMuons_(iConfig.getUntrackedParameter<double>("ptMuons",0.)),
-  etaMuons_(iConfig.getUntrackedParameter<double>("etaMuons",0.)),
-  isoMuons_(iConfig.getUntrackedParameter<double>("isoMuons",0.)),
-  minMuons_(iConfig.getUntrackedParameter<unsigned int>("minMuons",0)),
-  sJets_(iConfig.getUntrackedParameter<std::string>("sJets","ak5PFJets")),
-  ptJets_(iConfig.getUntrackedParameter<double>("ptJets",0.)),
-  etaJets_(iConfig.getUntrackedParameter<double>("etaJets",0.)),
-  minJets_(iConfig.getUntrackedParameter<unsigned int>("minJets",0)),
-  iTrigger_(iConfig.getUntrackedParameter<edm::InputTag>("iTrigger")),
-  vsPaths_(iConfig.getUntrackedParameter< std::vector<std::string> >("vsPaths"))
+TopSingleLeptonHLTValidation::TopSingleLeptonHLTValidation(const edm::ParameterSet &iConfig)
+    : sDir_(iConfig.getUntrackedParameter<std::string>("sDir", "HLTValidation/Top/Efficiencies/")),
+      sElectrons_(iConfig.getUntrackedParameter<std::string>("sElectrons", "gsfElectrons")),
+      ptElectrons_(iConfig.getUntrackedParameter<double>("ptElectrons", 0.)),
+      etaElectrons_(iConfig.getUntrackedParameter<double>("etaElectrons", 0.)),
+      isoElectrons_(iConfig.getUntrackedParameter<double>("isoElectrons", 0.)),
+      minElectrons_(iConfig.getUntrackedParameter<unsigned int>("minElectrons", 0)),
+      sMuons_(iConfig.getUntrackedParameter<std::string>("sMuons", "muons")),
+      ptMuons_(iConfig.getUntrackedParameter<double>("ptMuons", 0.)),
+      etaMuons_(iConfig.getUntrackedParameter<double>("etaMuons", 0.)),
+      isoMuons_(iConfig.getUntrackedParameter<double>("isoMuons", 0.)),
+      minMuons_(iConfig.getUntrackedParameter<unsigned int>("minMuons", 0)),
+      sJets_(iConfig.getUntrackedParameter<std::string>("sJets", "ak5PFJets")),
+      ptJets_(iConfig.getUntrackedParameter<double>("ptJets", 0.)),
+      etaJets_(iConfig.getUntrackedParameter<double>("etaJets", 0.)),
+      minJets_(iConfig.getUntrackedParameter<unsigned int>("minJets", 0)),
+      iTrigger_(iConfig.getUntrackedParameter<edm::InputTag>("iTrigger")),
+      vsPaths_(iConfig.getUntrackedParameter<std::vector<std::string>>("vsPaths"))
 
 {
   // Electrons
-  tokElectrons_ = consumes< edm::View<reco::GsfElectron> >(edm::InputTag(sElectrons_));
+  tokElectrons_ = consumes<edm::View<reco::GsfElectron>>(edm::InputTag(sElectrons_));
   // Muons
-  tokMuons_ = consumes< edm::View<reco::Muon> >(edm::InputTag(sMuons_));
+  tokMuons_ = consumes<edm::View<reco::Muon>>(edm::InputTag(sMuons_));
   // Jets
-  tokJets_ = consumes< edm::View<reco::Jet> >(edm::InputTag(sJets_));
+  tokJets_ = consumes<edm::View<reco::Jet>>(edm::InputTag(sJets_));
   // Trigger
-  tokTrigger_ = consumes<edm::TriggerResults>(iTrigger_); 
+  tokTrigger_ = consumes<edm::TriggerResults>(iTrigger_);
 }
 
-
-TopSingleLeptonHLTValidation::~TopSingleLeptonHLTValidation()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+TopSingleLeptonHLTValidation::~TopSingleLeptonHLTValidation() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 #endif
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(TopSingleLeptonHLTValidation);
diff --git a/HLTriggerOffline/Top/src/TopDiLeptonHLTValidation.cc b/HLTriggerOffline/Top/src/TopDiLeptonHLTValidation.cc
index ba516bd57613a..b18ba22ebe89a 100644
--- a/HLTriggerOffline/Top/src/TopDiLeptonHLTValidation.cc
+++ b/HLTriggerOffline/Top/src/TopDiLeptonHLTValidation.cc
@@ -2,12 +2,14 @@
 //
 // Package:    HLTriggerOffline/Top
 // Class:      TopDiLeptonHLTValidation
-// 
-/**\class TopDiLeptonHLTValidation TopDiLeptonHLTValidation.cc HLTriggerOffline/Top/src/TopDiLeptonHLTValidation.cc
+//
+/**\class TopDiLeptonHLTValidation TopDiLeptonHLTValidation.cc
+HLTriggerOffline/Top/src/TopDiLeptonHLTValidation.cc
 
-Description: 
+Description:
 
-Description: compute efficiencies of trigger paths on offline reco selection with respect to pt and eta
+Description: compute efficiencies of trigger paths on offline reco selection
+with respect to pt and eta
 
 Implementation:
 harvesting
@@ -32,161 +34,179 @@ harvesting
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
+#include "DataFormats/MuonReco/interface/MuonPFIsolation.h"
+#include "FWCore/Common/interface/TriggerNames.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
-#include "FWCore/Common/interface/TriggerNames.h"
 #include "TString.h"
-#include "DataFormats/MuonReco/interface/MuonPFIsolation.h"
 //
 // member functions
 //
 
 // ------------ method called for each event  ------------
-  void
-TopDiLeptonHLTValidation::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void TopDiLeptonHLTValidation::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace edm;
 
-  isAll_ = false; isSel_ = false;
+  isAll_ = false;
+  isSel_ = false;
 
-  // Electrons 
-  Handle< edm::View<reco::GsfElectron> > electrons;
-  if (!iEvent.getByToken(tokElectrons_,electrons))
+  // Electrons
+  Handle<edm::View<reco::GsfElectron>> electrons;
+  if (!iEvent.getByToken(tokElectrons_, electrons))
     edm::LogWarning("TopDiLeptonHLTValidation") << "Electrons collection not found \n";
   unsigned int nGoodE = 0;
-  for(edm::View<reco::GsfElectron>::const_iterator e = electrons->begin(); e != electrons->end(); ++e){
-    if (e->pt() < ptElectrons_) continue;
-    if (fabs(e->eta()) > etaElectrons_) continue;
-    if ((e->dr03TkSumPt()+e->dr03EcalRecHitSumEt()+e->dr03HcalTowerSumEt())/e->pt() > isoElectrons_ ) continue;
+  for (edm::View<reco::GsfElectron>::const_iterator e = electrons->begin(); e != electrons->end(); ++e) {
+    if (e->pt() < ptElectrons_)
+      continue;
+    if (fabs(e->eta()) > etaElectrons_)
+      continue;
+    if ((e->dr03TkSumPt() + e->dr03EcalRecHitSumEt() + e->dr03HcalTowerSumEt()) / e->pt() > isoElectrons_)
+      continue;
     nGoodE++;
-    if (nGoodE == 1) elec1_ = &(*e);
-    if (nGoodE == 2) elec2_ = &(*e);
+    if (nGoodE == 1)
+      elec1_ = &(*e);
+    if (nGoodE == 2)
+      elec2_ = &(*e);
   }
-  // Muons 
-  Handle< edm::View<reco::Muon> > muons;
-  if (!iEvent.getByToken(tokMuons_,muons))
+  // Muons
+  Handle<edm::View<reco::Muon>> muons;
+  if (!iEvent.getByToken(tokMuons_, muons))
     edm::LogWarning("TopDiLeptonHLTValidation") << "Muons collection not found \n";
   unsigned int nGoodM = 0;
-  for(edm::View<reco::Muon>::const_iterator m = muons->begin(); m != muons->end(); ++m){
-    if (!m->isPFMuon() || (!m->isGlobalMuon() && !m->isTrackerMuon())) continue;
-    if (m->pt() < ptMuons_) continue;
-    if (fabs(m->eta()) > etaMuons_) continue;
-    if (((m->pfIsolationR04()).sumChargedHadronPt+(m->pfIsolationR04()).sumPhotonEt+(m->pfIsolationR04()).sumNeutralHadronEt)/m->pt() > isoMuons_ ) continue;
+  for (edm::View<reco::Muon>::const_iterator m = muons->begin(); m != muons->end(); ++m) {
+    if (!m->isPFMuon() || (!m->isGlobalMuon() && !m->isTrackerMuon()))
+      continue;
+    if (m->pt() < ptMuons_)
+      continue;
+    if (fabs(m->eta()) > etaMuons_)
+      continue;
+    if (((m->pfIsolationR04()).sumChargedHadronPt + (m->pfIsolationR04()).sumPhotonEt +
+         (m->pfIsolationR04()).sumNeutralHadronEt) /
+            m->pt() >
+        isoMuons_)
+      continue;
     nGoodM++;
-    if (nGoodM == 1) mu1_ = &(*m);
-    if (nGoodM == 2) mu2_ = &(*m);
+    if (nGoodM == 1)
+      mu1_ = &(*m);
+    if (nGoodM == 2)
+      mu2_ = &(*m);
   }
-  // Jets 
-  Handle< edm::View<reco::Jet> > jets;
-  if (!iEvent.getByToken(tokJets_,jets)) 
+  // Jets
+  Handle<edm::View<reco::Jet>> jets;
+  if (!iEvent.getByToken(tokJets_, jets))
     edm::LogWarning("TopDiLeptonHLTValidation") << "Jets collection not found \n";
   unsigned int nGoodJ = 0;
-  for(edm::View<reco::Jet>::const_iterator j = jets->begin(); j != jets->end(); ++j){
-    if (j->pt() < ptJets_) continue;
-    if (fabs(j->eta()) > etaJets_) continue;
+  for (edm::View<reco::Jet>::const_iterator j = jets->begin(); j != jets->end(); ++j) {
+    if (j->pt() < ptJets_)
+      continue;
+    if (fabs(j->eta()) > etaJets_)
+      continue;
     nGoodJ++;
-    if (nGoodJ == minJets_) jet_ = &(*j);
+    if (nGoodJ == minJets_)
+      jet_ = &(*j);
   }
 
-  if (nGoodE >= minElectrons_ && nGoodM >= minMuons_ && nGoodJ >= minJets_) isAll_ = true;
+  if (nGoodE >= minElectrons_ && nGoodM >= minMuons_ && nGoodJ >= minJets_)
+    isAll_ = true;
 
-  //Trigger
+  // Trigger
   Handle<edm::TriggerResults> triggerTable;
-  if (!iEvent.getByToken(tokTrigger_,triggerTable))
-      edm::LogWarning("TopDiLeptonHLTValidation") << "Trigger collection not found \n";
-  const edm::TriggerNames& triggerNames = iEvent.triggerNames(*triggerTable);
+  if (!iEvent.getByToken(tokTrigger_, triggerTable))
+    edm::LogWarning("TopDiLeptonHLTValidation") << "Trigger collection not found \n";
+  const edm::TriggerNames &triggerNames = iEvent.triggerNames(*triggerTable);
   unsigned int isInteresting = 0;
-  for (unsigned int i=0; i<triggerNames.triggerNames().size(); ++i) {
-
-      TString name = triggerNames.triggerNames()[i].c_str();
-      for (unsigned int j=0; j<vsPaths_.size(); j++) {
-          if (name.Contains(TString(vsPaths_[j]), TString::kIgnoreCase)) {
-            if (triggerTable->accept(i)){
-              isInteresting++;  
-              if (isAll_) hNumTriggerMon->Fill(j+0.5 ); 
-            }  
-          }
+  for (unsigned int i = 0; i < triggerNames.triggerNames().size(); ++i) {
+    TString name = triggerNames.triggerNames()[i].c_str();
+    for (unsigned int j = 0; j < vsPaths_.size(); j++) {
+      if (name.Contains(TString(vsPaths_[j]), TString::kIgnoreCase)) {
+        if (triggerTable->accept(i)) {
+          isInteresting++;
+          if (isAll_)
+            hNumTriggerMon->Fill(j + 0.5);
+        }
       }
+    }
   }
 
-  if (isAll_ && isInteresting > 0) isSel_ = true;
-  else isSel_ = false;
+  if (isAll_ && isInteresting > 0)
+    isSel_ = true;
+  else
+    isSel_ = false;
 
-  //Histos
+  // Histos
   if (isAll_) {
-      if (minElectrons_ > 0) {
-          hDenLeptonPt->Fill(elec1_->pt());
-          hDenLeptonEta->Fill(elec1_->eta());
-      }
-      if (minElectrons_ > 1) {
-          hDenLeptonPt->Fill(elec2_->pt());
-          hDenLeptonEta->Fill(elec2_->eta());
-      }
-      if (minMuons_ > 0) {
-          hDenLeptonPt->Fill(mu1_->pt());
-          hDenLeptonEta->Fill(mu1_->eta());
-      }
-      if (minMuons_ > 1) {
-          hDenLeptonPt->Fill(mu2_->pt());
-          hDenLeptonEta->Fill(mu2_->eta());
-      }
-      hDenJetPt->Fill(jet_->pt());
-      hDenJetEta->Fill(jet_->eta());
-      for(unsigned int idx=0; idx<vsPaths_.size(); ++idx){
-          hDenTriggerMon->Fill(idx+0.5);
-      }
+    if (minElectrons_ > 0) {
+      hDenLeptonPt->Fill(elec1_->pt());
+      hDenLeptonEta->Fill(elec1_->eta());
+    }
+    if (minElectrons_ > 1) {
+      hDenLeptonPt->Fill(elec2_->pt());
+      hDenLeptonEta->Fill(elec2_->eta());
+    }
+    if (minMuons_ > 0) {
+      hDenLeptonPt->Fill(mu1_->pt());
+      hDenLeptonEta->Fill(mu1_->eta());
+    }
+    if (minMuons_ > 1) {
+      hDenLeptonPt->Fill(mu2_->pt());
+      hDenLeptonEta->Fill(mu2_->eta());
+    }
+    hDenJetPt->Fill(jet_->pt());
+    hDenJetEta->Fill(jet_->eta());
+    for (unsigned int idx = 0; idx < vsPaths_.size(); ++idx) {
+      hDenTriggerMon->Fill(idx + 0.5);
+    }
   }
   if (isSel_) {
-      if (minElectrons_ > 0) {
-          hNumLeptonPt->Fill(elec1_->pt());
-          hNumLeptonEta->Fill(elec1_->eta());
-      }
-      if (minElectrons_ > 1) {
-          hNumLeptonPt->Fill(elec2_->pt());
-          hNumLeptonEta->Fill(elec2_->eta());
-      }
-      if (minMuons_ > 0) {
-          hNumLeptonPt->Fill(mu1_->pt());
-          hNumLeptonEta->Fill(mu1_->eta());
-      }
-      if (minMuons_ > 1) {
-          hNumLeptonPt->Fill(mu2_->pt());
-          hNumLeptonEta->Fill(mu2_->eta());
-      }
-      hNumJetPt->Fill(jet_->pt());
-      hNumJetEta->Fill(jet_->eta());
+    if (minElectrons_ > 0) {
+      hNumLeptonPt->Fill(elec1_->pt());
+      hNumLeptonEta->Fill(elec1_->eta());
+    }
+    if (minElectrons_ > 1) {
+      hNumLeptonPt->Fill(elec2_->pt());
+      hNumLeptonEta->Fill(elec2_->eta());
+    }
+    if (minMuons_ > 0) {
+      hNumLeptonPt->Fill(mu1_->pt());
+      hNumLeptonEta->Fill(mu1_->eta());
+    }
+    if (minMuons_ > 1) {
+      hNumLeptonPt->Fill(mu2_->pt());
+      hNumLeptonEta->Fill(mu2_->eta());
+    }
+    hNumJetPt->Fill(jet_->pt());
+    hNumJetEta->Fill(jet_->eta());
   }
 }
 
 // ------------ booking histograms -----------
-  void
-TopDiLeptonHLTValidation::bookHistograms(DQMStore::IBooker & dbe, edm::Run const &, edm::EventSetup const &)
-{
+void TopDiLeptonHLTValidation::bookHistograms(DQMStore::IBooker &dbe, edm::Run const &, edm::EventSetup const &) {
   dbe.setCurrentFolder(sDir_);
-  hDenLeptonPt  = dbe.book1D("PtLeptonAll", "PtLeptonAll", 50, 0., 250.);
-  hDenLeptonEta = dbe.book1D("EtaLeptonAll", "EtaLeptonAll", 30, -3. , 3.);
-  hDenJetPt     = dbe.book1D("PtLastJetAll", "PtLastJetAll", 60, 0., 300.);
-  hDenJetEta    = dbe.book1D("EtaLastJetAll", "EtaLastJetAll", 30, -3., 3.);
-  hNumLeptonPt  = dbe.book1D("PtLeptonSel", "PtLeptonSel", 50, 0., 250.);
-  hNumLeptonEta = dbe.book1D("EtaLeptonSel", "EtaLeptonSel", 30, -3. , 3.);
-  hNumJetPt     = dbe.book1D("PtLastJetSel", "PtLastJetSel", 60, 0., 300.);
-  hNumJetEta    = dbe.book1D("EtaLastJetSel", "EtaLastJetSel", 30, -3., 3.);
+  hDenLeptonPt = dbe.book1D("PtLeptonAll", "PtLeptonAll", 50, 0., 250.);
+  hDenLeptonEta = dbe.book1D("EtaLeptonAll", "EtaLeptonAll", 30, -3., 3.);
+  hDenJetPt = dbe.book1D("PtLastJetAll", "PtLastJetAll", 60, 0., 300.);
+  hDenJetEta = dbe.book1D("EtaLastJetAll", "EtaLastJetAll", 30, -3., 3.);
+  hNumLeptonPt = dbe.book1D("PtLeptonSel", "PtLeptonSel", 50, 0., 250.);
+  hNumLeptonEta = dbe.book1D("EtaLeptonSel", "EtaLeptonSel", 30, -3., 3.);
+  hNumJetPt = dbe.book1D("PtLastJetSel", "PtLastJetSel", 60, 0., 300.);
+  hNumJetEta = dbe.book1D("EtaLastJetSel", "EtaLastJetSel", 30, -3., 3.);
   // determine number of bins for trigger monitoring
   unsigned int nPaths = vsPaths_.size();
   // monitored trigger occupancy for single lepton triggers
-  hNumTriggerMon    = dbe.book1D("TriggerMonSel" , "TriggerMonSel", nPaths, 0.,  nPaths);
-  hDenTriggerMon    = dbe.book1D("TriggerMonAll" , "TriggerMonAll", nPaths, 0.,  nPaths);
+  hNumTriggerMon = dbe.book1D("TriggerMonSel", "TriggerMonSel", nPaths, 0., nPaths);
+  hDenTriggerMon = dbe.book1D("TriggerMonAll", "TriggerMonAll", nPaths, 0., nPaths);
   // set bin labels for trigger monitoring
   triggerBinLabels(vsPaths_);
 }
 
-// ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
-void
-TopDiLeptonHLTValidation::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-  //The following says we do not know what parameters are allowed so do no validation
-  // Please change this to state exactly what you do use, even if it is no parameters
+// ------------ method fills 'descriptions' with the allowed parameters for the
+// module  ------------
+void TopDiLeptonHLTValidation::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
+  // The following says we do not know what parameters are allowed so do no
+  // validation
+  // Please change this to state exactly what you do use, even if it is no
+  // parameters
   edm::ParameterSetDescription desc;
   desc.setUnknown();
   descriptions.addDefault(desc);
 }
-
diff --git a/HLTriggerOffline/Top/src/TopSingleLeptonHLTValidation.cc b/HLTriggerOffline/Top/src/TopSingleLeptonHLTValidation.cc
index 1401106e709d2..55dffa828cc24 100644
--- a/HLTriggerOffline/Top/src/TopSingleLeptonHLTValidation.cc
+++ b/HLTriggerOffline/Top/src/TopSingleLeptonHLTValidation.cc
@@ -2,12 +2,14 @@
 //
 // Package:    HLTriggerOffline/Top
 // Class:      TopSingleLeptonHLTValidation
-// 
-/**\class TopSingleLeptonHLTValidation TopSingleLeptonHLTValidation.cc HLTriggerOffline/Top/src/TopSingleLeptonHLTValidation.cc
+//
+/**\class TopSingleLeptonHLTValidation TopSingleLeptonHLTValidation.cc
+HLTriggerOffline/Top/src/TopSingleLeptonHLTValidation.cc
 
-Description: 
+Description:
 
-Description: compute efficiencies of trigger paths on offline reco selection with respect to pt and eta
+Description: compute efficiencies of trigger paths on offline reco selection
+with respect to pt and eta
 
 Implementation:
 harvesting
@@ -31,99 +33,120 @@ harvesting
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
+#include "DataFormats/MuonReco/interface/MuonPFIsolation.h"
+#include "FWCore/Common/interface/TriggerNames.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "HLTrigger/HLTcore/interface/HLTConfigProvider.h"
-#include "FWCore/Common/interface/TriggerNames.h"
 #include "TString.h"
-#include "DataFormats/MuonReco/interface/MuonPFIsolation.h"
 //
 // member functions
 //
 
 // ------------ method called for each event  ------------
-  void
-TopSingleLeptonHLTValidation::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{ 
+void TopSingleLeptonHLTValidation::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace edm;
 
-  isAll_ = false; isSel_ = false;
+  isAll_ = false;
+  isSel_ = false;
 
-  // Electrons 
-  Handle< edm::View<reco::GsfElectron> > electrons;
-  if (!iEvent.getByToken(tokElectrons_,electrons))
+  // Electrons
+  Handle<edm::View<reco::GsfElectron>> electrons;
+  if (!iEvent.getByToken(tokElectrons_, electrons))
     edm::LogWarning("TopSingleLeptonHLTValidation") << "Electrons collection not found \n";
   unsigned int nGoodE = 0;
-  for(edm::View<reco::GsfElectron>::const_iterator e = electrons->begin(); e != electrons->end(); ++e){
-    if (e->pt() < ptElectrons_) continue;
-    if (fabs(e->eta()) > etaElectrons_) continue;
-    if ((e->dr03TkSumPt()+e->dr03EcalRecHitSumEt()+e->dr03HcalTowerSumEt())/e->pt() > isoElectrons_ ) continue;
+  for (edm::View<reco::GsfElectron>::const_iterator e = electrons->begin(); e != electrons->end(); ++e) {
+    if (e->pt() < ptElectrons_)
+      continue;
+    if (fabs(e->eta()) > etaElectrons_)
+      continue;
+    if ((e->dr03TkSumPt() + e->dr03EcalRecHitSumEt() + e->dr03HcalTowerSumEt()) / e->pt() > isoElectrons_)
+      continue;
     nGoodE++;
-    if (nGoodE == 1) elec_ = &(*e);
+    if (nGoodE == 1)
+      elec_ = &(*e);
   }
-  // Muons 
-  Handle< edm::View<reco::Muon> > muons;
-  if (!iEvent.getByToken(tokMuons_,muons))
+  // Muons
+  Handle<edm::View<reco::Muon>> muons;
+  if (!iEvent.getByToken(tokMuons_, muons))
     edm::LogWarning("TopSingleLeptonHLTValidation") << "Muons collection not found \n";
   unsigned int nGoodM = 0;
-  for(edm::View<reco::Muon>::const_iterator m = muons->begin(); m != muons->end(); ++m){
-    if (!m->isPFMuon() || !m->isGlobalMuon()) continue;
-    if (m->pt() < ptMuons_) continue;
-    if (fabs(m->eta()) > etaMuons_) continue;
-    if (((m->pfIsolationR04()).sumChargedHadronPt+(m->pfIsolationR04()).sumPhotonEt+(m->pfIsolationR04()).sumNeutralHadronEt)/m->pt() > isoMuons_ ) continue;
+  for (edm::View<reco::Muon>::const_iterator m = muons->begin(); m != muons->end(); ++m) {
+    if (!m->isPFMuon() || !m->isGlobalMuon())
+      continue;
+    if (m->pt() < ptMuons_)
+      continue;
+    if (fabs(m->eta()) > etaMuons_)
+      continue;
+    if (((m->pfIsolationR04()).sumChargedHadronPt + (m->pfIsolationR04()).sumPhotonEt +
+         (m->pfIsolationR04()).sumNeutralHadronEt) /
+            m->pt() >
+        isoMuons_)
+      continue;
     nGoodM++;
-    if (nGoodM == 1) mu_ = &(*m);
+    if (nGoodM == 1)
+      mu_ = &(*m);
   }
-  // Jets 
-  Handle< edm::View<reco::Jet> > jets;
-  if (!iEvent.getByToken(tokJets_,jets)) 
+  // Jets
+  Handle<edm::View<reco::Jet>> jets;
+  if (!iEvent.getByToken(tokJets_, jets))
     edm::LogWarning("TopSingleLeptonHLTValidation") << "Jets collection not found \n";
   unsigned int nGoodJ = 0;
   if (minJets_ == 4) {
-    for(edm::View<reco::Jet>::const_iterator j = jets->begin(); j != jets->end(); ++j){
-      if (nGoodJ < 1 && j->pt() < 55) continue;
-      if (nGoodJ < 2 && j->pt() < 45) continue;
-      if (nGoodJ < 3 && j->pt() < 35) continue;
-      if (nGoodJ >= 3 && j->pt() < 20) continue;
-      if (fabs(j->eta()) > etaJets_) continue;
+    for (edm::View<reco::Jet>::const_iterator j = jets->begin(); j != jets->end(); ++j) {
+      if (nGoodJ < 1 && j->pt() < 55)
+        continue;
+      if (nGoodJ < 2 && j->pt() < 45)
+        continue;
+      if (nGoodJ < 3 && j->pt() < 35)
+        continue;
+      if (nGoodJ >= 3 && j->pt() < 20)
+        continue;
+      if (fabs(j->eta()) > etaJets_)
+        continue;
       nGoodJ++;
-      if (nGoodJ == minJets_) jet_ = &(*j);
+      if (nGoodJ == minJets_)
+        jet_ = &(*j);
     }
-  }
-  else {
-    for(edm::View<reco::Jet>::const_iterator j = jets->begin(); j != jets->end(); ++j){
-      if (j->pt() < ptJets_) continue;
-      if (fabs(j->eta()) > etaJets_) continue;
+  } else {
+    for (edm::View<reco::Jet>::const_iterator j = jets->begin(); j != jets->end(); ++j) {
+      if (j->pt() < ptJets_)
+        continue;
+      if (fabs(j->eta()) > etaJets_)
+        continue;
       nGoodJ++;
-      if (nGoodJ == minJets_) jet_ = &(*j);
+      if (nGoodJ == minJets_)
+        jet_ = &(*j);
     }
   }
 
-  if (nGoodE >= minElectrons_ && nGoodM >= minMuons_ && nGoodJ >= minJets_) isAll_ = true;
+  if (nGoodE >= minElectrons_ && nGoodM >= minMuons_ && nGoodJ >= minJets_)
+    isAll_ = true;
 
-
-  //Trigger
+  // Trigger
   Handle<edm::TriggerResults> triggerTable;
-  if (!iEvent.getByToken(tokTrigger_,triggerTable))
+  if (!iEvent.getByToken(tokTrigger_, triggerTable))
     edm::LogWarning("TopSingleLeptonHLTValidation") << "Trigger collection not found \n";
-  const edm::TriggerNames& triggerNames = iEvent.triggerNames(*triggerTable);
+  const edm::TriggerNames &triggerNames = iEvent.triggerNames(*triggerTable);
   unsigned int isInteresting = 0;
-  for (unsigned int i=0; i<triggerNames.triggerNames().size(); ++i) {
-
+  for (unsigned int i = 0; i < triggerNames.triggerNames().size(); ++i) {
     TString name = triggerNames.triggerNames()[i].c_str();
-    for (unsigned int j=0; j<vsPaths_.size(); j++) {
+    for (unsigned int j = 0; j < vsPaths_.size(); j++) {
       if (name.Contains(TString(vsPaths_[j]), TString::kIgnoreCase)) {
-        if (triggerTable->accept(i)){
-          isInteresting++;   
-          if (isAll_) hNumTriggerMon->Fill(j+0.5 ); 
+        if (triggerTable->accept(i)) {
+          isInteresting++;
+          if (isAll_)
+            hNumTriggerMon->Fill(j + 0.5);
         }
       }
     }
   }
 
-  if (isAll_ && isInteresting > 0) isSel_ = true;
-  else isSel_ = false;
+  if (isAll_ && isInteresting > 0)
+    isSel_ = true;
+  else
+    isSel_ = false;
 
-  //Histos
+  // Histos
   if (isAll_) {
     if (minElectrons_ > 0) {
       hDenLeptonPt->Fill(elec_->pt());
@@ -135,10 +158,9 @@ TopSingleLeptonHLTValidation::analyze(const edm::Event& iEvent, const edm::Event
     }
     hDenJetPt->Fill(jet_->pt());
     hDenJetEta->Fill(jet_->eta());
-    for(unsigned int idx=0; idx<vsPaths_.size(); ++idx){
-      hDenTriggerMon->Fill(idx+0.5);
+    for (unsigned int idx = 0; idx < vsPaths_.size(); ++idx) {
+      hDenTriggerMon->Fill(idx + 0.5);
     }
-
   }
   if (isSel_) {
     if (minElectrons_ > 0) {
@@ -154,37 +176,34 @@ TopSingleLeptonHLTValidation::analyze(const edm::Event& iEvent, const edm::Event
   }
 }
 
-
 // ------------ booking histograms -----------
-  void
-TopSingleLeptonHLTValidation::bookHistograms(DQMStore::IBooker & dbe, edm::Run const &, edm::EventSetup const &)
-{
+void TopSingleLeptonHLTValidation::bookHistograms(DQMStore::IBooker &dbe, edm::Run const &, edm::EventSetup const &) {
   dbe.setCurrentFolder(sDir_);
-  hDenLeptonPt  = dbe.book1D("PtLeptonAll", "PtLeptonAll", 50, 0., 250.);
-  hDenLeptonEta = dbe.book1D("EtaLeptonAll", "EtaLeptonAll", 30, -3. , 3.);
-  hDenJetPt     = dbe.book1D("PtLastJetAll", "PtLastJetAll", 60, 0., 300.);
-  hDenJetEta    = dbe.book1D("EtaLastJetAll", "EtaLastJetAll", 30, -3., 3.);
-  hNumLeptonPt  = dbe.book1D("PtLeptonSel", "PtLeptonSel", 50, 0., 250.);
-  hNumLeptonEta = dbe.book1D("EtaLeptonSel", "EtaLeptonSel", 30, -3. , 3.);
-  hNumJetPt     = dbe.book1D("PtLastJetSel", "PtLastJetSel", 60, 0., 300.);
-  hNumJetEta    = dbe.book1D("EtaLastJetSel", "EtaLastJetSel", 30, -3., 3.);
+  hDenLeptonPt = dbe.book1D("PtLeptonAll", "PtLeptonAll", 50, 0., 250.);
+  hDenLeptonEta = dbe.book1D("EtaLeptonAll", "EtaLeptonAll", 30, -3., 3.);
+  hDenJetPt = dbe.book1D("PtLastJetAll", "PtLastJetAll", 60, 0., 300.);
+  hDenJetEta = dbe.book1D("EtaLastJetAll", "EtaLastJetAll", 30, -3., 3.);
+  hNumLeptonPt = dbe.book1D("PtLeptonSel", "PtLeptonSel", 50, 0., 250.);
+  hNumLeptonEta = dbe.book1D("EtaLeptonSel", "EtaLeptonSel", 30, -3., 3.);
+  hNumJetPt = dbe.book1D("PtLastJetSel", "PtLastJetSel", 60, 0., 300.);
+  hNumJetEta = dbe.book1D("EtaLastJetSel", "EtaLastJetSel", 30, -3., 3.);
   // determine number of bins for trigger monitoring
   unsigned int nPaths = vsPaths_.size();
   // monitored trigger occupancy for single lepton triggers
-  hNumTriggerMon    = dbe.book1D("TriggerMonSel" , "TriggerMonSel", nPaths, 0.,  nPaths);
-  hDenTriggerMon    = dbe.book1D("TriggerMonAll" , "TriggerMonAll", nPaths, 0.,  nPaths);
+  hNumTriggerMon = dbe.book1D("TriggerMonSel", "TriggerMonSel", nPaths, 0., nPaths);
+  hDenTriggerMon = dbe.book1D("TriggerMonAll", "TriggerMonAll", nPaths, 0., nPaths);
   // set bin labels for trigger monitoring
   triggerBinLabels(vsPaths_);
 }
 
-
-// ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
-void
-TopSingleLeptonHLTValidation::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-  //The following says we do not know what parameters are allowed so do no validation
-  // Please change this to state exactly what you do use, even if it is no parameters
+// ------------ method fills 'descriptions' with the allowed parameters for the
+// module  ------------
+void TopSingleLeptonHLTValidation::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
+  // The following says we do not know what parameters are allowed so do no
+  // validation
+  // Please change this to state exactly what you do use, even if it is no
+  // parameters
   edm::ParameterSetDescription desc;
   desc.setUnknown();
   descriptions.addDefault(desc);
 }
-
diff --git a/HeavyFlavorAnalysis/RecoDecay/interface/BPHFitSelect.h b/HeavyFlavorAnalysis/RecoDecay/interface/BPHFitSelect.h
index 75381c64e2df1..60a3e095e68e8 100644
--- a/HeavyFlavorAnalysis/RecoDecay/interface/BPHFitSelect.h
+++ b/HeavyFlavorAnalysis/RecoDecay/interface/BPHFitSelect.h
@@ -40,6 +40,7 @@ class BPHFitSelect {
    */
   virtual ~BPHFitSelect();
 
+  using AcceptArg = BPHKinematicFit;
   /** Operations
    */
   /// accept function
diff --git a/HeavyFlavorAnalysis/RecoDecay/interface/BPHMomentumSelect.h b/HeavyFlavorAnalysis/RecoDecay/interface/BPHMomentumSelect.h
index c205f4351d6c1..fa23dc79bbb58 100644
--- a/HeavyFlavorAnalysis/RecoDecay/interface/BPHMomentumSelect.h
+++ b/HeavyFlavorAnalysis/RecoDecay/interface/BPHMomentumSelect.h
@@ -40,6 +40,7 @@ class BPHMomentumSelect {
    */
   virtual ~BPHMomentumSelect();
 
+  using AcceptArg = BPHDecayMomentum;
   /** Operations
    */
   /// accept function
diff --git a/HeavyFlavorAnalysis/RecoDecay/interface/BPHMultiSelect.h b/HeavyFlavorAnalysis/RecoDecay/interface/BPHMultiSelect.h
index c92f7427056a2..2485a42d23eec 100644
--- a/HeavyFlavorAnalysis/RecoDecay/interface/BPHMultiSelect.h
+++ b/HeavyFlavorAnalysis/RecoDecay/interface/BPHMultiSelect.h
@@ -43,14 +43,16 @@ class BPHSelectOperation {
   enum mode { or_mode, and_mode };
 };
 
+
+//BPHMultiSelectBase has the implementation needed for accept
+// but does not itself override accept
 template<class T>
-class BPHMultiSelect: public T {
+class BPHMultiSelectBase : public T {
 
  public:
-
   /** Constructor
    */
-  BPHMultiSelect( BPHSelectOperation::mode op ) {
+  BPHMultiSelectBase( BPHSelectOperation::mode op ) {
     switch ( op ) {
     case BPHSelectOperation:: or_mode:
       breakValue =  true;
@@ -65,7 +67,7 @@ class BPHMultiSelect: public T {
 
   /** Destructor
    */
-  ~BPHMultiSelect() override {}
+  ~BPHMultiSelectBase() override {}
 
   /** Operations
    */
@@ -78,29 +80,7 @@ class BPHMultiSelect: public T {
     return;
   }
 
-  /// accept function
-  bool accept( const reco::Candidate & cand, //NOLINT
-	       const BPHRecoBuilder*  build ) const  { return false; } //NOLINT
-  bool accept( const reco::Candidate & cand ) const  { return false; } //NOLINT
-  bool accept( const BPHDecayMomentum& cand ) const { return false; } //NOLINT
-  bool accept( const BPHDecayVertex  & cand ) const { return false; } //NOLINT
-  bool accept( const BPHKinematicFit & cand ) const { return false; } //NOLINT
-
- private:
-
-  // private copy and assigment constructors
-  BPHMultiSelect           ( const BPHMultiSelect<T>& x ) = delete;
-  BPHMultiSelect& operator=( const BPHMultiSelect<T>& x ) = delete;
-
-  struct SelectElement {
-    T* selector;
-    bool mode;
-  };
-
-  bool breakValue;
-  bool finalValue;
-  std::vector<SelectElement> selectList;
-
+ protected:
   template<class Obj> bool select( const Obj& cand ) const {
     int i;
     int n = selectList.size();
@@ -123,15 +103,75 @@ class BPHMultiSelect: public T {
     return finalValue;
   }
 
+ private:
+
+  // private copy and assigment constructors
+  BPHMultiSelectBase<T>           ( const BPHMultiSelectBase<T>& x ) = delete;
+  BPHMultiSelectBase<T>& operator=( const BPHMultiSelectBase<T>& x ) = delete;
+
+  struct SelectElement {
+    T* selector;
+    bool mode;
+  };
+
+  bool breakValue;
+  bool finalValue;
+  std::vector<SelectElement> selectList;
+
+};
+
+template<class T>
+class BPHMultiSelect: public BPHMultiSelectBase<T> {
+
+ public:
+  using Base = BPHMultiSelectBase<T>;
+
+  /** Constructor
+   */
+  BPHMultiSelect( BPHSelectOperation::mode op ):
+  Base(op) {}
+
+  /** Destructor
+   */
+  ~BPHMultiSelect() override {}
+
+  /// accept function
+  bool accept( const typename T::AcceptArg & cand ) const override;
+
+ private:
+
+  // private copy and assigment constructors
+  BPHMultiSelect           ( const BPHMultiSelect<T>& x ) = delete;
+  BPHMultiSelect& operator=( const BPHMultiSelect<T>& x ) = delete;
 };
 
 template<>
-bool BPHMultiSelect<BPHRecoSelect    >::accept(
-                                        const reco::Candidate & cand,
-                                        const BPHRecoBuilder* build ) const;
-template<>
-bool BPHMultiSelect<BPHRecoSelect    >::accept(
-                                        const reco::Candidate & cand ) const;
+class BPHMultiSelect<BPHRecoSelect>: public BPHMultiSelectBase<BPHRecoSelect> {
+
+ public:
+  using Base = BPHMultiSelectBase<BPHRecoSelect>;
+
+  /** Constructor
+   */
+  BPHMultiSelect( BPHSelectOperation::mode op ):
+  Base(op) {}
+
+  /** Destructor
+   */
+  ~BPHMultiSelect() override {}
+
+  /// accept function
+  bool accept( const typename BPHRecoSelect::AcceptArg & cand ) const override;
+  bool accept( const reco::Candidate & cand, //NOLINT
+	       const BPHRecoBuilder*  build ) const override; //NOLINT
+
+ private:
+
+  // private copy and assigment constructors
+  BPHMultiSelect           ( const BPHMultiSelect<BPHRecoSelect>& x ) = delete;
+  BPHMultiSelect& operator=( const BPHMultiSelect<BPHRecoSelect>& x ) = delete;
+};
+
 template<>
 bool BPHMultiSelect<BPHMomentumSelect>::accept(
                                         const BPHDecayMomentum& cand ) const;
diff --git a/HeavyFlavorAnalysis/RecoDecay/interface/BPHRecoSelect.h b/HeavyFlavorAnalysis/RecoDecay/interface/BPHRecoSelect.h
index 5cc4b5eaade7a..1cbfcd335301f 100644
--- a/HeavyFlavorAnalysis/RecoDecay/interface/BPHRecoSelect.h
+++ b/HeavyFlavorAnalysis/RecoDecay/interface/BPHRecoSelect.h
@@ -44,6 +44,7 @@ class BPHRecoSelect {
    */
   virtual ~BPHRecoSelect();
 
+  using AcceptArg = reco::Candidate;
   /** Operations
    */
   /// accept function
diff --git a/HeavyFlavorAnalysis/RecoDecay/interface/BPHVertexSelect.h b/HeavyFlavorAnalysis/RecoDecay/interface/BPHVertexSelect.h
index 3fe9032326d86..89a182071303a 100644
--- a/HeavyFlavorAnalysis/RecoDecay/interface/BPHVertexSelect.h
+++ b/HeavyFlavorAnalysis/RecoDecay/interface/BPHVertexSelect.h
@@ -40,6 +40,7 @@ class BPHVertexSelect {
    */
   virtual ~BPHVertexSelect();
 
+  using AcceptArg = BPHDecayVertex;
   /** Operations
    */
   /// accept function
diff --git a/HeavyFlavorAnalysis/RecoDecay/src/BPHMultiSelect.cc b/HeavyFlavorAnalysis/RecoDecay/src/BPHMultiSelect.cc
index 28e0e739049f4..b1f1b3e7adb2a 100644
--- a/HeavyFlavorAnalysis/RecoDecay/src/BPHMultiSelect.cc
+++ b/HeavyFlavorAnalysis/RecoDecay/src/BPHMultiSelect.cc
@@ -41,21 +41,17 @@
 //--------------
 // Operations --
 //--------------
-template<>
 bool BPHMultiSelect<BPHRecoSelect    >::accept(
                                         const reco::Candidate & cand,
                                         const BPHRecoBuilder* build ) const {
   return select( cand, build );
 }
 
-
-template<>
 bool BPHMultiSelect<BPHRecoSelect    >::accept(
                                         const reco::Candidate & cand ) const {
   return select( cand );
 }
 
-
 template<>
 bool BPHMultiSelect<BPHMomentumSelect>::accept(
                                         const BPHDecayMomentum& cand ) const {
diff --git a/IOMC/ParticleGuns/interface/CloseByParticleGunProducer.h b/IOMC/ParticleGuns/interface/CloseByParticleGunProducer.h
index a9ec81edaba7e..e35ec788c5e5b 100644
--- a/IOMC/ParticleGuns/interface/CloseByParticleGunProducer.h
+++ b/IOMC/ParticleGuns/interface/CloseByParticleGunProducer.h
@@ -21,9 +21,10 @@ namespace edm
 
     // data members
     double fEnMin,fEnMax,fRMin,fRMax,fZMin,fZMax,fDelta,fPhiMin,fPhiMax;
-
+    int fNParticles;
     bool fPointing = false;
     bool fOverlapping = false;
+    bool fRandomShoot = false;
     std::vector<int> fPartIDs;
   };
 }
diff --git a/IOMC/ParticleGuns/src/CloseByParticleGunProducer.cc b/IOMC/ParticleGuns/src/CloseByParticleGunProducer.cc
index 442364a42cf73..ea213a1dc8058 100644
--- a/IOMC/ParticleGuns/src/CloseByParticleGunProducer.cc
+++ b/IOMC/ParticleGuns/src/CloseByParticleGunProducer.cc
@@ -38,12 +38,15 @@ CloseByParticleGunProducer::CloseByParticleGunProducer(const ParameterSet& pset)
   fDelta = pgun_params.getParameter<double>("Delta");
   fPhiMin = pgun_params.getParameter<double>("MinPhi");
   fPhiMax = pgun_params.getParameter<double>("MaxPhi");
-  fPartIDs = pgun_params.getParameter< vector<int> >("PartID");
   fPointing = pgun_params.getParameter<bool>("Pointing");
   fOverlapping = pgun_params.getParameter<bool>("Overlapping");
+  fRandomShoot = pgun_params.getParameter<bool>("RandomShoot");
+  fNParticles = pgun_params.getParameter<int>("NParticles");
+  fPartIDs = pgun_params.getParameter< vector<int> >("PartID");
 
   produces<HepMCProduct>("unsmeared");
   produces<GenEventInfoProduct>();
+
 }
 
 CloseByParticleGunProducer::~CloseByParticleGunProducer()
@@ -65,22 +68,32 @@ void CloseByParticleGunProducer::produce(Event &e, const EventSetup& es)
    // loop over particles
    //
    int barcode = 1 ;
+   int numParticles = fRandomShoot ? CLHEP::RandFlat::shoot(engine, 1, fNParticles) : fNParticles;
+   std::vector<int> particles;
+
+   for(int i=0; i<numParticles; i++){
+     int partIdx = CLHEP::RandFlat::shoot(engine, 0, fPartIDs.size());
+     particles.push_back(fPartIDs[partIdx]);
+     }
+
    double phi = CLHEP::RandFlat::shoot(engine, fPhiMin, fPhiMax);
    double fR = CLHEP::RandFlat::shoot(engine,fRMin,fRMax);
    double fZ = CLHEP::RandFlat::shoot(engine,fZMin,fZMax);
+   double tmpPhi = phi;
+   double tmpR = fR;
 
-   for (unsigned int ip=0; ip<fPartIDs.size(); ++ip)
+   for (unsigned int ip=0; ip<particles.size(); ++ip)
    {
      if(fOverlapping)
        {
-        phi = CLHEP::RandFlat::shoot(engine, fPhiMin, fPhiMax);
-        fR = CLHEP::RandFlat::shoot(engine,fRMin,fRMax);
+        fR = CLHEP::RandFlat::shoot(engine,tmpR-fDelta,tmpR+fDelta);
+        phi = CLHEP::RandFlat::shoot(engine, tmpPhi-fDelta/fR, tmpPhi+fDelta/fR);
        }
      else
        phi += fDelta/fR;
        
      double fEn = CLHEP::RandFlat::shoot(engine,fEnMin,fEnMax);
-     int PartID = fPartIDs[ip] ;
+     int PartID = particles[ip] ;
      const HepPDT::ParticleData *PData = fPDGTable->particle(HepPDT::ParticleID(abs(PartID))) ;
      double mass   = PData->mass().value() ;
      double mom    = sqrt(fEn*fEn-mass*mass);
@@ -138,5 +151,6 @@ void CloseByParticleGunProducer::produce(Event &e, const EventSetup& es)
      {
        LogDebug("CloseByParticleGunProducer") << " CloseByParticleGunProducer : Event Generation Done " << endl;
      }
-}
 
+   particles.clear();
+}
diff --git a/IOPool/Common/bin/CollUtil.cc b/IOPool/Common/bin/CollUtil.cc
index e796914811a7b..a593c534b2395 100644
--- a/IOPool/Common/bin/CollUtil.cc
+++ b/IOPool/Common/bin/CollUtil.cc
@@ -21,7 +21,7 @@
 namespace edm {
 
   // Get a file handler
-  TFile* openFileHdl(std::string const& fname) {
+  TFile *openFileHdl(std::string const &fname) {
     TFile *hdl = TFile::Open(fname.c_str(), "read");
 
     if (nullptr == hdl) {
@@ -37,7 +37,7 @@ namespace edm {
     TList *keylist = hdl->GetListOfKeys();
     TIterator *iter = keylist->MakeIterator();
     TKey *key = nullptr;
-    while ((key = (TKey*)iter->Next())) {
+    while ((key = (TKey *)iter->Next())) {
       TObject *obj = hdl->Get(key->GetName());
       if (obj->IsA() == TTree::Class()) {
         obj->Print();
@@ -47,20 +47,19 @@ namespace edm {
   }
 
   // number of entries in a tree
-  Long64_t numEntries(TFile *hdl, std::string const& trname) {
-    TTree *tree = (TTree*)hdl->Get(trname.c_str());
+  Long64_t numEntries(TFile *hdl, std::string const &trname) {
+    TTree *tree = (TTree *)hdl->Get(trname.c_str());
     if (tree) {
       return tree->GetEntries();
     } else {
-      std::cout << "ERR cannot find a TTree named \"" << trname << "\""
-                << std::endl;
+      std::cout << "ERR cannot find a TTree named \"" << trname << "\"" << std::endl;
       return -1;
     }
   }
 
   namespace {
-    void addBranchSizes(TBranch *branch, Long64_t& size) {
-      size += branch->GetTotalSize(); // Includes size of branch metadata
+    void addBranchSizes(TBranch *branch, Long64_t &size) {
+      size += branch->GetTotalSize();  // Includes size of branch metadata
       // Now recurse through any subbranches.
       Long64_t nB = branch->GetListOfBranches()->GetEntries();
       for (Long64_t i = 0; i < nB; ++i) {
@@ -68,7 +67,7 @@ namespace edm {
         addBranchSizes(btemp, size);
       }
     }
-  }
+  }  // namespace
 
   void printBranchNames(TTree *tree) {
     if (tree != nullptr) {
@@ -77,7 +76,8 @@ namespace edm {
         Long64_t size = 0LL;
         TBranch *btemp = (TBranch *)tree->GetListOfBranches()->At(i);
         addBranchSizes(btemp, size);
-        std::cout << "Branch " << i << " of " << tree->GetName() << " tree: " << btemp->GetName() << " Total size = " << size << std::endl;
+        std::cout << "Branch " << i << " of " << tree->GetName() << " tree: " << btemp->GetName()
+                  << " Total size = " << size << std::endl;
       }
     } else {
       std::cout << "Missing Events tree?\n";
@@ -112,7 +112,9 @@ namespace edm {
     std::cout << "UUID: " << fid.fid() << std::endl;
   }
 
-  static void preIndexIntoFilePrintEventLists(TFile*, FileFormatVersion const& fileFormatVersion, TTree *metaDataTree) {
+  static void preIndexIntoFilePrintEventLists(TFile *,
+                                              FileFormatVersion const &fileFormatVersion,
+                                              TTree *metaDataTree) {
     FileIndex fileIndex;
     FileIndex *findexPtr = &fileIndex;
     if (metaDataTree->FindBranch(poolNames::fileIndexBranchName().c_str()) != nullptr) {
@@ -122,15 +124,17 @@ namespace edm {
     } else {
       std::cout << "FileIndex not found.  If this input file was created with release 1_8_0 or later\n"
                    "this indicates a problem with the file.  This condition should be expected with\n"
-        "files created with earlier releases and printout of the event list will fail.\n";
+                   "files created with earlier releases and printout of the event list will fail.\n";
       return;
     }
 
     std::cout << "\n" << fileIndex;
 
     std::cout << "\nFileFormatVersion = " << fileFormatVersion << ".  ";
-    if (fileFormatVersion.fastCopyPossible()) std::cout << "This version supports fast copy\n";
-    else std::cout << "This version does not support fast copy\n";
+    if (fileFormatVersion.fastCopyPossible())
+      std::cout << "This version supports fast copy\n";
+    else
+      std::cout << "This version does not support fast copy\n";
 
     if (fileIndex.allEventsInEntryOrder()) {
       std::cout << "Events are sorted such that fast copy is possible in the \"noEventSort = False\" mode\n";
@@ -147,7 +151,9 @@ namespace edm {
     std::cout << "(Note that other factors can prevent fast copy from occurring)\n\n";
   }
 
-  static void postIndexIntoFilePrintEventLists(TFile* tfl, FileFormatVersion const& fileFormatVersion, TTree *metaDataTree) {
+  static void postIndexIntoFilePrintEventLists(TFile *tfl,
+                                               FileFormatVersion const &fileFormatVersion,
+                                               TTree *metaDataTree) {
     IndexIntoFile indexIntoFile;
     IndexIntoFile *findexPtr = &indexIntoFile;
     if (metaDataTree->FindBranch(poolNames::indexIntoFileBranchName().c_str()) != nullptr) {
@@ -161,54 +167,56 @@ namespace edm {
       return;
     }
     //need to read event # from the EventAuxiliary branch
-    TTree* eventsTree = dynamic_cast<TTree*>(tfl->Get(poolNames::eventTreeName().c_str()));
-    TBranch* eventAuxBranch = nullptr;
+    TTree *eventsTree = dynamic_cast<TTree *>(tfl->Get(poolNames::eventTreeName().c_str()));
+    TBranch *eventAuxBranch = nullptr;
     assert(nullptr != eventsTree);
-    char const* const kEventAuxiliaryBranchName = "EventAuxiliary";
-    if(eventsTree->FindBranch(kEventAuxiliaryBranchName) != nullptr){
+    char const *const kEventAuxiliaryBranchName = "EventAuxiliary";
+    if (eventsTree->FindBranch(kEventAuxiliaryBranchName) != nullptr) {
       eventAuxBranch = eventsTree->GetBranch(kEventAuxiliaryBranchName);
     } else {
-      std::cout << "Failed to find " << kEventAuxiliaryBranchName << " branch in Events TTree.  Something is wrong with this file." << std::endl;
+      std::cout << "Failed to find " << kEventAuxiliaryBranchName
+                << " branch in Events TTree.  Something is wrong with this file." << std::endl;
       return;
     }
     EventAuxiliary eventAuxiliary;
-    EventAuxiliary* eAPtr = &eventAuxiliary;
+    EventAuxiliary *eAPtr = &eventAuxiliary;
     eventAuxBranch->SetAddress(&eAPtr);
     std::cout << "\nPrinting IndexIntoFile contents.  This includes a list of all Runs, LuminosityBlocks\n"
-       << "and Events stored in the root file.\n\n";
-    std::cout << std::setw(15) << "Run"
-       << std::setw(15) << "Lumi"
-       << std::setw(15) << "Event"
-       << std::setw(15) << "TTree Entry"
-       << "\n";
-
-    for(IndexIntoFile::IndexIntoFileItr it = indexIntoFile.begin(IndexIntoFile::firstAppearanceOrder),
-                                        itEnd = indexIntoFile.end(IndexIntoFile::firstAppearanceOrder);
-                                        it != itEnd; ++it) {
+              << "and Events stored in the root file.\n\n";
+    std::cout << std::setw(15) << "Run" << std::setw(15) << "Lumi" << std::setw(15) << "Event" << std::setw(15)
+              << "TTree Entry"
+              << "\n";
+
+    for (IndexIntoFile::IndexIntoFileItr it = indexIntoFile.begin(IndexIntoFile::firstAppearanceOrder),
+                                         itEnd = indexIntoFile.end(IndexIntoFile::firstAppearanceOrder);
+         it != itEnd;
+         ++it) {
       IndexIntoFile::EntryType t = it.getEntryType();
       std::cout << std::setw(15) << it.run() << std::setw(15) << it.lumi();
       EventNumber_t eventNum = 0;
       std::string type;
-      switch(t) {
+      switch (t) {
         case IndexIntoFile::kRun:
           type = "(Run)";
-        break;
+          break;
         case IndexIntoFile::kLumi:
           type = "(Lumi)";
-        break;
+          break;
         case IndexIntoFile::kEvent:
           eventAuxBranch->GetEntry(it.entry());
           eventNum = eventAuxiliary.id().event();
-        break;
+          break;
         default:
-        break;
+          break;
       }
       std::cout << std::setw(15) << eventNum << std::setw(15) << it.entry() << " " << type << std::endl;
     }
 
     std::cout << "\nFileFormatVersion = " << fileFormatVersion << ".  ";
-    if (fileFormatVersion.fastCopyPossible()) std::cout << "This version supports fast copy\n";
-    else std::cout << "This version does not support fast copy\n";
+    if (fileFormatVersion.fastCopyPossible())
+      std::cout << "This version supports fast copy\n";
+    else
+      std::cout << "This version does not support fast copy\n";
 
     if (indexIntoFile.iterationWillBeInEntryOrder(IndexIntoFile::firstAppearanceOrder)) {
       std::cout << "Events are sorted such that fast copy is possible in the \"noEventSort = false\" mode\n";
@@ -237,14 +245,16 @@ namespace edm {
       fft->SetAddress(&fftPtr);
       fft->GetEntry(0);
     }
-    if(fileFormatVersion.hasIndexIntoFile()) {
+    if (fileFormatVersion.hasIndexIntoFile()) {
       postIndexIntoFilePrintEventLists(tfl, fileFormatVersion, metaDataTree);
     } else {
       preIndexIntoFilePrintEventLists(tfl, fileFormatVersion, metaDataTree);
     }
   }
 
-  static void preIndexIntoFilePrintEventsInLumis(TFile*, FileFormatVersion const& fileFormatVersion, TTree *metaDataTree) {
+  static void preIndexIntoFilePrintEventsInLumis(TFile *,
+                                                 FileFormatVersion const &fileFormatVersion,
+                                                 TTree *metaDataTree) {
     FileIndex fileIndex;
     FileIndex *findexPtr = &fileIndex;
     if (metaDataTree->FindBranch(poolNames::fileIndexBranchName().c_str()) != nullptr) {
@@ -253,47 +263,44 @@ namespace edm {
       fndx->GetEntry(0);
     } else {
       std::cout << "FileIndex not found.  If this input file was created with release 1_8_0 or later\n"
-      "this indicates a problem with the file.  This condition should be expected with\n"
-      "files created with earlier releases and printout of the event list will fail.\n";
+                   "this indicates a problem with the file.  This condition should be expected with\n"
+                   "files created with earlier releases and printout of the event list will fail.\n";
       return;
     }
 
-    std::cout <<"\n"<< std::setw(15) << "Run"
-    << std::setw(15) << "Lumi"
-    << std::setw(15) << "# Events"
-    << "\n";
+    std::cout << "\n"
+              << std::setw(15) << "Run" << std::setw(15) << "Lumi" << std::setw(15) << "# Events"
+              << "\n";
     unsigned long nEvents = 0;
     unsigned long runID = 0;
     unsigned long lumiID = 0;
-    for(std::vector<FileIndex::Element>::const_iterator it = fileIndex.begin(), itEnd = fileIndex.end(); it != itEnd; ++it) {
-      if(it->getEntryType() == FileIndex::kEvent) {
+    for (std::vector<FileIndex::Element>::const_iterator it = fileIndex.begin(), itEnd = fileIndex.end(); it != itEnd;
+         ++it) {
+      if (it->getEntryType() == FileIndex::kEvent) {
         ++nEvents;
-      }
-      else if(it->getEntryType() == FileIndex::kLumi) {
-        if(runID !=it->run_ || lumiID !=it->lumi_) {
+      } else if (it->getEntryType() == FileIndex::kLumi) {
+        if (runID != it->run_ || lumiID != it->lumi_) {
           //print the previous one
-          if(lumiID !=0) {
-            std::cout << std::setw(15) << runID
-            << std::setw(15) << lumiID
-            << std::setw(15) << nEvents<<"\n";
+          if (lumiID != 0) {
+            std::cout << std::setw(15) << runID << std::setw(15) << lumiID << std::setw(15) << nEvents << "\n";
           }
-          nEvents=0;
+          nEvents = 0;
           runID = it->run_;
           lumiID = it->lumi_;
         }
       }
     }
     //print the last one
-    if(lumiID !=0) {
-      std::cout << std::setw(15) << runID
-      << std::setw(15) << lumiID
-      << std::setw(15) << nEvents<<"\n";
+    if (lumiID != 0) {
+      std::cout << std::setw(15) << runID << std::setw(15) << lumiID << std::setw(15) << nEvents << "\n";
     }
 
     std::cout << "\n";
   }
 
-  static void postIndexIntoFilePrintEventsInLumis(TFile* tfl, FileFormatVersion const& fileFormatVersion, TTree *metaDataTree) {
+  static void postIndexIntoFilePrintEventsInLumis(TFile *tfl,
+                                                  FileFormatVersion const &fileFormatVersion,
+                                                  TTree *metaDataTree) {
     IndexIntoFile indexIntoFile;
     IndexIntoFile *findexPtr = &indexIntoFile;
     if (metaDataTree->FindBranch(poolNames::indexIntoFileBranchName().c_str()) != nullptr) {
@@ -302,35 +309,33 @@ namespace edm {
       fndx->GetEntry(0);
     } else {
       std::cout << "IndexIntoFile not found.  If this input file was created with release 1_8_0 or later\n"
-      "this indicates a problem with the file.  This condition should be expected with\n"
-      "files created with earlier releases and printout of the event list will fail.\n";
+                   "this indicates a problem with the file.  This condition should be expected with\n"
+                   "files created with earlier releases and printout of the event list will fail.\n";
       return;
     }
-    std::cout <<"\n"<< std::setw(15) << "Run"
-    << std::setw(15) << "Lumi"
-    << std::setw(15) << "# Events"
-    << "\n";
+    std::cout << "\n"
+              << std::setw(15) << "Run" << std::setw(15) << "Lumi" << std::setw(15) << "# Events"
+              << "\n";
 
     unsigned long nEvents = 0;
     unsigned long runID = 0;
     unsigned long lumiID = 0;
 
-    for(IndexIntoFile::IndexIntoFileItr it = indexIntoFile.begin(IndexIntoFile::firstAppearanceOrder),
-        itEnd = indexIntoFile.end(IndexIntoFile::firstAppearanceOrder);
-        it != itEnd; ++it) {
+    for (IndexIntoFile::IndexIntoFileItr it = indexIntoFile.begin(IndexIntoFile::firstAppearanceOrder),
+                                         itEnd = indexIntoFile.end(IndexIntoFile::firstAppearanceOrder);
+         it != itEnd;
+         ++it) {
       IndexIntoFile::EntryType t = it.getEntryType();
-      switch(t) {
+      switch (t) {
         case IndexIntoFile::kRun:
           break;
         case IndexIntoFile::kLumi:
-          if(runID != it.run() || lumiID != it.lumi()) {
+          if (runID != it.run() || lumiID != it.lumi()) {
             //print the previous one
-            if(lumiID !=0) {
-              std::cout << std::setw(15) << runID
-              << std::setw(15) << lumiID
-              << std::setw(15) << nEvents<<"\n";
+            if (lumiID != 0) {
+              std::cout << std::setw(15) << runID << std::setw(15) << lumiID << std::setw(15) << nEvents << "\n";
             }
-            nEvents=0;
+            nEvents = 0;
             runID = it.run();
             lumiID = it.lumi();
           }
@@ -343,10 +348,8 @@ namespace edm {
       }
     }
     //print the last one
-    if(lumiID !=0) {
-      std::cout << std::setw(15) << runID
-      << std::setw(15) << lumiID
-      << std::setw(15) << nEvents<<"\n";
+    if (lumiID != 0) {
+      std::cout << std::setw(15) << runID << std::setw(15) << lumiID << std::setw(15) << nEvents << "\n";
     }
     std::cout << "\n";
   }
@@ -362,10 +365,10 @@ namespace edm {
       fft->SetAddress(&fftPtr);
       fft->GetEntry(0);
     }
-    if(fileFormatVersion.hasIndexIntoFile()) {
+    if (fileFormatVersion.hasIndexIntoFile()) {
       postIndexIntoFilePrintEventsInLumis(tfl, fileFormatVersion, metaDataTree);
     } else {
       preIndexIntoFilePrintEventsInLumis(tfl, fileFormatVersion, metaDataTree);
     }
   }
-}
+}  // namespace edm
diff --git a/IOPool/Common/bin/CollUtil.h b/IOPool/Common/bin/CollUtil.h
index 4a8ba02df77fd..0119d3fbb3c3e 100644
--- a/IOPool/Common/bin/CollUtil.h
+++ b/IOPool/Common/bin/CollUtil.h
@@ -9,16 +9,16 @@ class TFile;
 class TTree;
 
 namespace edm {
-  
-  TFile* openFileHdl(const std::string& fname) ;
+
+  TFile *openFileHdl(const std::string &fname);
   void printTrees(TFile *hdl);
-  Long64_t numEntries(TFile *hdl, const std::string& trname);
+  Long64_t numEntries(TFile *hdl, const std::string &trname);
   void printBranchNames(TTree *tree);
   void longBranchPrint(TTree *tr);
   std::string getUuid(TTree *uuidTree);
   void printUuids(TTree *uuidTree);
   void printEventLists(TFile *tfl);
-  void printEventsInLumis(TFile* tfl);
-}
+  void printEventsInLumis(TFile *tfl);
+}  // namespace edm
 
 #endif
diff --git a/IOPool/Common/bin/EdmCopyUtil.cpp b/IOPool/Common/bin/EdmCopyUtil.cpp
index 9cc2390a4c1a5..16c874eff6d30 100644
--- a/IOPool/Common/bin/EdmCopyUtil.cpp
+++ b/IOPool/Common/bin/EdmCopyUtil.cpp
@@ -20,9 +20,9 @@
 #include "FWCore/Catalog/interface/InputFileCatalog.h"
 #include "FWCore/Catalog/interface/SiteLocalConfig.h"
 
-static int copy_files(const boost::program_options::variables_map &vm) {
-
-  std::unique_ptr<edm::SiteLocalConfig> slcptr = std::make_unique<edm::service::SiteLocalConfigService>(edm::ParameterSet());
+static int copy_files(const boost::program_options::variables_map& vm) {
+  std::unique_ptr<edm::SiteLocalConfig> slcptr =
+      std::make_unique<edm::service::SiteLocalConfigService>(edm::ParameterSet());
   auto slc = std::make_shared<edm::serviceregistry::ServiceWrapper<edm::SiteLocalConfig> >(std::move(slcptr));
   edm::ServiceToken slcToken = edm::ServiceRegistry::createContaining(slc);
   edm::ServiceRegistry::Operate operate(slcToken);
@@ -47,7 +47,7 @@ static int copy_files(const boost::program_options::variables_map &vm) {
   edm::InputFileCatalog catalog(in, catalogIn, true);
   std::vector<std::string> const& filesIn = catalog.fileNames();
 
-  for(unsigned int j = 0; j < in.size(); ++j) {
+  for (unsigned int j = 0; j < in.size(); ++j) {
     boost::filesystem::path pathOut = destdir;
     pathOut /= boost::filesystem::path(in[j]).filename();
 
@@ -56,13 +56,14 @@ static int copy_files(const boost::program_options::variables_map &vm) {
     ofs.open(pathOut);
 
     std::unique_ptr<Storage> s = StorageFactory::get()->open(filesIn[j]);
-    assert(s); // StorageFactory should throw if file open fails.
+    assert(s);  // StorageFactory should throw if file open fails.
 
-    static unsigned int const COPYBUFSIZE = 10*1024*1024; // 10MB buffer
-    std::vector<char> buffer; buffer.reserve(COPYBUFSIZE);
+    static unsigned int const COPYBUFSIZE = 10 * 1024 * 1024;  // 10MB buffer
+    std::vector<char> buffer;
+    buffer.reserve(COPYBUFSIZE);
 
     IOSize n;
-    while ((n = s->read(&buffer[0], COPYBUFSIZE))) { // Note Storage throws on error
+    while ((n = s->read(&buffer[0], COPYBUFSIZE))) {  // Note Storage throws on error
       ofs.write(&buffer[0], n);
     }
     ofs.close();
@@ -72,20 +73,14 @@ static int copy_files(const boost::program_options::variables_map &vm) {
   return 0;
 }
 
-
 int main(int argc, char* argv[]) {
-
   gErrorIgnoreLevel = kError;
 
   boost::program_options::options_description desc("Allowed options");
-  desc.add_options()
-    ("help,h", "print help message")
-    ("catalog,c", boost::program_options::value<std::string>(), "catalog")
-    ;
+  desc.add_options()("help,h", "print help message")(
+      "catalog,c", boost::program_options::value<std::string>(), "catalog");
   boost::program_options::options_description hidden("Hidden options");
-  hidden.add_options()
-    ("file", boost::program_options::value< std::vector<std::string> >(), "files to transfer")
-    ;
+  hidden.add_options()("file", boost::program_options::value<std::vector<std::string> >(), "files to transfer");
 
   boost::program_options::positional_options_description p;
   p.add("file", -1);
@@ -96,13 +91,12 @@ int main(int argc, char* argv[]) {
   boost::program_options::variables_map vm;
 
   try {
-      boost::program_options::store(boost::program_options::command_line_parser(argc, argv).
-                                    options(cmdline_options).positional(p).run(), vm);
+    boost::program_options::store(
+        boost::program_options::command_line_parser(argc, argv).options(cmdline_options).positional(p).run(), vm);
   } catch (boost::program_options::error const& x) {
-      std::cerr << "Option parsing failure:\n"
-                << x.what() << "\n\n";
-      std::cerr << desc << "\n";
-      return 1;
+    std::cerr << "Option parsing failure:\n" << x.what() << "\n\n";
+    std::cerr << desc << "\n";
+    return 1;
   }
 
   boost::program_options::notify(vm);
@@ -117,23 +111,18 @@ int main(int argc, char* argv[]) {
     rc = copy_files(vm);
   } catch (cms::Exception const& e) {
     std::cout << "cms::Exception caught in "
-              <<"EdmFileUtil"
-              << '\n'
+              << "EdmFileUtil" << '\n'
               << e.explainSelf();
     rc = 1;
-  }
-  catch (std::exception const& e) {
+  } catch (std::exception const& e) {
     std::cout << "Standard library exception caught in "
-              << "EdmFileUtil"
-              << '\n'
+              << "EdmFileUtil" << '\n'
               << e.what();
     rc = 1;
-  }
-  catch (...) {
+  } catch (...) {
     std::cout << "Unknown exception caught in "
               << "EdmFileUtil";
     rc = 2;
   }
   return rc;
 }
-
diff --git a/IOPool/Common/bin/EdmFileUtil.cpp b/IOPool/Common/bin/EdmFileUtil.cpp
index 2117d0324bc1f..3523eb2c0a4b4 100644
--- a/IOPool/Common/bin/EdmFileUtil.cpp
+++ b/IOPool/Common/bin/EdmFileUtil.cpp
@@ -26,29 +26,27 @@
 #include "TError.h"
 
 int main(int argc, char* argv[]) {
-
   gErrorIgnoreLevel = kError;
 
   // Add options here
 
   boost::program_options::options_description desc("Allowed options");
-  desc.add_options()
-    ("help,h", "print help message")
-    ("file,f", boost::program_options::value<std::vector<std::string> >(), "data file (-f or -F required)")
-    ("Files,F", boost::program_options::value<std::string>(), "text file containing names of data files, one per line")
-    ("catalog,c", boost::program_options::value<std::string>(), "catalog")
-    ("decodeLFN,d", "Convert LFN to PFN")
-    ("uuid,u", "Print uuid")
-    ("adler32,a", "Print adler32 checksum.")
-    ("allowRecovery", "Allow root to auto-recover corrupted files")
-    ("JSON,j", "JSON output format.  Any arguments listed below are ignored")
-    ("ls,l", "list file content")
-    ("print,P", "Print all")
-    ("verbose,v", "Verbose printout")
-    ("printBranchDetails,b", "Call Print()sc for all branches")
-    ("tree,t", boost::program_options::value<std::string>(), "Select tree used with -P and -b options")
-    ("events,e", "Print list of all Events, Runs, and LuminosityBlocks in the file sorted by run number, luminosity block number, and event number.  Also prints the entry numbers and whether it is possible to use fast copy with the file.")
-    ("eventsInLumis","Print how many Events are in each LuminosityBlock.");
+  desc.add_options()("help,h", "print help message")(
+      "file,f", boost::program_options::value<std::vector<std::string> >(), "data file (-f or -F required)")(
+      "Files,F",
+      boost::program_options::value<std::string>(),
+      "text file containing names of data files, one per line")(
+      "catalog,c", boost::program_options::value<std::string>(), "catalog")("decodeLFN,d", "Convert LFN to PFN")(
+      "uuid,u", "Print uuid")("adler32,a", "Print adler32 checksum.")("allowRecovery",
+                                                                      "Allow root to auto-recover corrupted files")(
+      "JSON,j", "JSON output format.  Any arguments listed below are ignored")("ls,l", "list file content")(
+      "print,P", "Print all")("verbose,v", "Verbose printout")("printBranchDetails,b",
+                                                               "Call Print()sc for all branches")(
+      "tree,t", boost::program_options::value<std::string>(), "Select tree used with -P and -b options")(
+      "events,e",
+      "Print list of all Events, Runs, and LuminosityBlocks in the file sorted by run number, luminosity block number, "
+      "and event number.  Also prints the entry numbers and whether it is possible to use fast copy with the file.")(
+      "eventsInLumis", "Print how many Events are in each LuminosityBlock.");
 
   // What trees do we require for this to be a valid collection?
   std::vector<std::string> expectedTrees;
@@ -60,15 +58,13 @@ int main(int argc, char* argv[]) {
 
   boost::program_options::variables_map vm;
 
-
   try {
-      boost::program_options::store(boost::program_options::command_line_parser(argc, argv).
-                                    options(desc).positional(p).run(), vm);
+    boost::program_options::store(
+        boost::program_options::command_line_parser(argc, argv).options(desc).positional(p).run(), vm);
   } catch (boost::program_options::error const& x) {
-      std::cerr << "Option parsing failure:\n"
-                << x.what() << "\n\n";
-      std::cerr << desc << "\n";
-      return 1;
+    std::cerr << "Option parsing failure:\n" << x.what() << "\n\n";
+    std::cerr << desc << "\n";
+    return 1;
   }
 
   boost::program_options::notify(vm);
@@ -80,12 +76,14 @@ int main(int argc, char* argv[]) {
 
   int rc = 0;
   try {
-    std::unique_ptr<edm::SiteLocalConfig> slcptr = std::make_unique<edm::service::SiteLocalConfigService>(edm::ParameterSet());
+    std::unique_ptr<edm::SiteLocalConfig> slcptr =
+        std::make_unique<edm::service::SiteLocalConfigService>(edm::ParameterSet());
     auto slc = std::make_shared<edm::serviceregistry::ServiceWrapper<edm::SiteLocalConfig> >(std::move(slcptr));
     edm::ServiceToken slcToken = edm::ServiceRegistry::createContaining(slc);
     edm::ServiceRegistry::Operate operate(slcToken);
 
-    std::vector<std::string> in = (vm.count("file") ? vm["file"].as<std::vector<std::string> >() : std::vector<std::string>());
+    std::vector<std::string> in =
+        (vm.count("file") ? vm["file"].as<std::vector<std::string> >() : std::vector<std::string>());
     if (vm.count("Files")) {
       std::ifstream ifile(vm["Files"].as<std::string>().c_str());
       std::istream_iterator<std::string> beginItr(ifile);
@@ -115,13 +113,14 @@ int main(int argc, char* argv[]) {
     bool tree = more && (vm.count("tree") > 0 ? true : false);
     bool print = more && (vm.count("print") > 0 ? true : false);
     bool printBranchDetails = more && (vm.count("printBranchDetails") > 0 ? true : false);
-    bool onlyDecodeLFN = decodeLFN && !(uuid || adler32 || allowRecovery || json || events || tree || ls || print || printBranchDetails);
+    bool onlyDecodeLFN =
+        decodeLFN && !(uuid || adler32 || allowRecovery || json || events || tree || ls || print || printBranchDetails);
     std::string selectedTree = tree ? vm["tree"].as<std::string>() : edm::poolNames::eventTreeName();
 
-    if (events||eventsInLumis) {
+    if (events || eventsInLumis) {
       try {
         edmplugin::PluginManager::configure(edmplugin::standard::config());
-      } catch(std::exception& e) {
+      } catch (std::exception& e) {
         std::cout << "exception caught in EdmFileUtil while configuring the PluginManager\n" << e.what();
         return 1;
       }
@@ -136,8 +135,7 @@ int main(int argc, char* argv[]) {
 
     // now run..
     // Allow user to input multiple files
-    for(unsigned int j = 0; j < in.size(); ++j) {
-
+    for (unsigned int j = 0; j < in.size(); ++j) {
       // We _only_ want the LFN->PFN conversion. No need to open the file,
       // just check the catalog and move on
       if (onlyDecodeLFN) {
@@ -146,14 +144,17 @@ int main(int argc, char* argv[]) {
       }
 
       // open a data file
-      if (!json) std::cout << in[j] << "\n";
+      if (!json)
+        std::cout << in[j] << "\n";
       std::string const& lfn = in[j];
       std::unique_ptr<TFile> tfile{edm::openFileHdl(filesIn[j])};
-      if (tfile == nullptr) return 1;
+      if (tfile == nullptr)
+        return 1;
 
       std::string const& pfn = filesIn[j];
 
-      if (verbose) std::cout << "ECU:: Opened " << pfn << std::endl;
+      if (verbose)
+        std::cout << "ECU:: Opened " << pfn << std::endl;
 
       std::string datafile = decodeLFN ? pfn : lfn;
 
@@ -173,39 +174,41 @@ int main(int argc, char* argv[]) {
           return 1;
         }
       } else {
-        if (verbose) std::cout << "ECU:: Collection not autorecovered. Continuing\n";
+        if (verbose)
+          std::cout << "ECU:: Collection not autorecovered. Continuing\n";
       }
 
       // Ok. Do we have the expected trees?
       for (unsigned int i = 0; i < expectedTrees.size(); ++i) {
-        TTree *t = (TTree*) tfile->Get(expectedTrees[i].c_str());
+        TTree* t = (TTree*)tfile->Get(expectedTrees[i].c_str());
         if (t == nullptr) {
           std::cout << "Tree " << expectedTrees[i] << " appears to be missing. Not a valid collection\n";
           std::cout << "Exiting\n";
           return 1;
         } else {
-          if (verbose) std::cout << "ECU:: Found Tree " << expectedTrees[i] << std::endl;
+          if (verbose)
+            std::cout << "ECU:: Found Tree " << expectedTrees[i] << std::endl;
         }
       }
 
-      if (verbose) std::cout << "ECU:: Found all expected trees\n";
+      if (verbose)
+        std::cout << "ECU:: Found all expected trees\n";
 
       std::ostringstream auout;
       if (adler32) {
-        unsigned int const EDMFILEUTILADLERBUFSIZE = 10*1024*1024; // 10MB buffer
+        unsigned int const EDMFILEUTILADLERBUFSIZE = 10 * 1024 * 1024;  // 10MB buffer
         static char buffer[EDMFILEUTILADLERBUFSIZE];
         size_t bufToRead = EDMFILEUTILADLERBUFSIZE;
         uint32_t a = 1, b = 0;
         size_t fileSize = tfile->GetSize();
         tfile->Seek(0, TFile::kBeg);
 
-        for (size_t offset = 0; offset < fileSize;
-              offset += EDMFILEUTILADLERBUFSIZE) {
-            // true on last loop
-            if (fileSize - offset < EDMFILEUTILADLERBUFSIZE)
-              bufToRead = fileSize - offset;
-            tfile->ReadBuffer((char*)buffer, bufToRead);
-            cms::Adler32(buffer, bufToRead, a, b);
+        for (size_t offset = 0; offset < fileSize; offset += EDMFILEUTILADLERBUFSIZE) {
+          // true on last loop
+          if (fileSize - offset < EDMFILEUTILADLERBUFSIZE)
+            bufToRead = fileSize - offset;
+          tfile->ReadBuffer((char*)buffer, bufToRead);
+          cms::Adler32(buffer, bufToRead, a, b);
         }
         uint32_t adler32sum = (b << 16) | a;
         if (json) {
@@ -216,7 +219,7 @@ int main(int argc, char* argv[]) {
       }
 
       if (uuid) {
-        TTree *paramsTree = (TTree*)tfile->Get(edm::poolNames::metaDataTreeName().c_str());
+        TTree* paramsTree = (TTree*)tfile->Get(edm::poolNames::metaDataTreeName().c_str());
         if (json) {
           auout << ",\"uuid\":\"" << edm::getUuid(paramsTree) << '"';
         } else {
@@ -229,22 +232,13 @@ int main(int argc, char* argv[]) {
       int nlumis = edm::numEntries(tfile.get(), edm::poolNames::luminosityBlockTreeName());
       int nevents = edm::numEntries(tfile.get(), edm::poolNames::eventTreeName());
       if (json) {
-        if (j > 0) std::cout << ',' << std::endl;
-        std::cout << "{\"file\":\"" << datafile << '"'
-                  << ",\"runs\":" << nruns
-                  << ",\"lumis\":" << nlumis
-                  << ",\"events\":" << nevents
-                  << ",\"bytes\":" << tfile->GetSize()
-                  << auout.str()
-                  << '}' << std::endl;
+        if (j > 0)
+          std::cout << ',' << std::endl;
+        std::cout << "{\"file\":\"" << datafile << '"' << ",\"runs\":" << nruns << ",\"lumis\":" << nlumis
+                  << ",\"events\":" << nevents << ",\"bytes\":" << tfile->GetSize() << auout.str() << '}' << std::endl;
       } else {
-        std::cout << datafile << " ("
-                  << nruns << " runs, "
-                  << nlumis << " lumis, "
-                  << nevents << " events, "
-                  << tfile->GetSize() << " bytes"
-                  << auout.str()
-                  << ")" << std::endl;
+        std::cout << datafile << " (" << nruns << " runs, " << nlumis << " lumis, " << nevents << " events, "
+                  << tfile->GetSize() << " bytes" << auout.str() << ")" << std::endl;
       }
 
       if (json) {
@@ -254,12 +248,13 @@ int main(int argc, char* argv[]) {
 
       // Look at the collection contents
       if (ls) {
-        if (tfile != nullptr) tfile->ls();
+        if (tfile != nullptr)
+          tfile->ls();
       }
 
       // Print out each tree
       if (print) {
-        TTree *printTree = (TTree*)tfile->Get(selectedTree.c_str());
+        TTree* printTree = (TTree*)tfile->Get(selectedTree.c_str());
         if (printTree == nullptr) {
           std::cout << "Tree " << selectedTree << " appears to be missing. Could not find it in the file.\n";
           std::cout << "Exiting\n";
@@ -269,7 +264,7 @@ int main(int argc, char* argv[]) {
       }
 
       if (printBranchDetails) {
-        TTree *printTree = (TTree*)tfile->Get(selectedTree.c_str());
+        TTree* printTree = (TTree*)tfile->Get(selectedTree.c_str());
         if (printTree == nullptr) {
           std::cout << "Tree " << selectedTree << " appears to be missing. Could not find it in the file.\n";
           std::cout << "Exiting\n";
@@ -283,31 +278,26 @@ int main(int argc, char* argv[]) {
         edm::printEventLists(tfile.get());
       }
 
-      if(eventsInLumis) {
+      if (eventsInLumis) {
         edm::printEventsInLumis(tfile.get());
       }
-      
+
       tfile->Close();
     }
     if (json) {
       std::cout << ']' << std::endl;
     }
-  }
-  catch (cms::Exception const& e) {
+  } catch (cms::Exception const& e) {
     std::cout << "cms::Exception caught in "
-              <<"EdmFileUtil"
-              << '\n'
+              << "EdmFileUtil" << '\n'
               << e.explainSelf();
     rc = 1;
-  }
-  catch (std::exception const& e) {
+  } catch (std::exception const& e) {
     std::cout << "Standard library exception caught in "
-              << "EdmFileUtil"
-              << '\n'
+              << "EdmFileUtil" << '\n'
               << e.what();
     rc = 1;
-  }
-  catch (...) {
+  } catch (...) {
     std::cout << "Unknown exception caught in "
               << "EdmFileUtil";
     rc = 2;
diff --git a/IOPool/Common/bin/EdmProvDump.cc b/IOPool/Common/bin/EdmProvDump.cc
index 0d456b5edf90e..935577d4e218c 100644
--- a/IOPool/Common/bin/EdmProvDump.cc
+++ b/IOPool/Common/bin/EdmProvDump.cc
@@ -34,10 +34,13 @@
 #include <sstream>
 #include <vector>
 
-typedef std::map<std::string, std::vector<edm::BranchDescription> > IdToBranches;
+typedef std::map<std::string, std::vector<edm::BranchDescription>> IdToBranches;
 typedef std::map<std::pair<std::string, std::string>, IdToBranches> ModuleToIdBranches;
 
-static std::ostream& prettyPrint(std::ostream& oStream, edm::ParameterSet const& iPSet, std::string const& iIndent, std::string const& iIndentDelta);
+static std::ostream& prettyPrint(std::ostream& oStream,
+                                 edm::ParameterSet const& iPSet,
+                                 std::string const& iIndent,
+                                 std::string const& iIndentDelta);
 
 static std::string const triggerResults = std::string("TriggerResults");
 static std::string const triggerPaths = std::string("@trigger_paths");
@@ -45,60 +48,37 @@ static std::string const source = std::string("source");
 static std::string const input = std::string("@main_input");
 
 namespace {
-typedef std::map<edm::ParameterSetID, edm::ParameterSetBlob> ParameterSetMap;
+  typedef std::map<edm::ParameterSetID, edm::ParameterSetBlob> ParameterSetMap;
 
   class HistoryNode {
   public:
-    HistoryNode() :
-      config_(),
-      simpleId_(0) {
-    }
+    HistoryNode() : config_(), simpleId_(0) {}
 
-    HistoryNode(edm::ProcessConfiguration const& iConfig, unsigned int iSimpleId) :
-      config_(iConfig),
-      simpleId_(iSimpleId) {
-    }
+    HistoryNode(edm::ProcessConfiguration const& iConfig, unsigned int iSimpleId)
+        : config_(iConfig), simpleId_(iSimpleId) {}
 
-    void addChild(HistoryNode const& child) {
-      children_.push_back(child);
-    }
+    void addChild(HistoryNode const& child) { children_.push_back(child); }
 
-    edm::ParameterSetID const&
-    parameterSetID() const {
-      return config_.parameterSetID();
-    }
+    edm::ParameterSetID const& parameterSetID() const { return config_.parameterSetID(); }
 
-    std::string const&
-    processName() const {
-      return config_.processName();
-    }
+    std::string const& processName() const { return config_.processName(); }
 
-    std::size_t
-    size() const {
-      return children_.size();
-    }
+    std::size_t size() const { return children_.size(); }
 
-    HistoryNode *
-    lastChildAddress() {
-      return &children_.back();
-    }
+    HistoryNode* lastChildAddress() { return &children_.back(); }
 
     typedef std::vector<HistoryNode>::const_iterator const_iterator;
     typedef std::vector<HistoryNode>::iterator iterator;
 
-    iterator begin() { return children_.begin();}
-    iterator end() { return children_.end();}
+    iterator begin() { return children_.begin(); }
+    iterator end() { return children_.end(); }
 
-    const_iterator begin() const { return children_.begin();}
-    const_iterator end() const { return children_.end();}
+    const_iterator begin() const { return children_.begin(); }
+    const_iterator end() const { return children_.end(); }
 
     void print(std::ostream& os) const {
-      os << config_.processName()
-         << " '" << config_.passID() << "' '"
-         << config_.releaseVersion() << "' ["
-         << simpleId_ << "]  ("
-         << config_.parameterSetID() << ")"
-         << std::endl;
+      os << config_.processName() << " '" << config_.passID() << "' '" << config_.releaseVersion() << "' [" << simpleId_
+         << "]  (" << config_.parameterSetID() << ")" << std::endl;
     }
 
     void printHistory(std::string const& iIndent = std::string("  ")) const;
@@ -113,16 +93,14 @@ typedef std::map<edm::ParameterSetID, edm::ParameterSetBlob> ParameterSetMap;
                                    std::vector<std::string> const& iFindMatch,
                                    std::ostream& oErrorLog) const;
 
-    edm::ProcessConfigurationID
-    configurationID() const {
-      return config_.id();
-    }
+    edm::ProcessConfigurationID configurationID() const { return config_.id(); }
 
     static bool sort_;
+
   private:
     edm::ProcessConfiguration config_;
-    std::vector<HistoryNode>  children_;
-    unsigned int              simpleId_;
+    std::vector<HistoryNode> children_;
+    unsigned int simpleId_;
   };
 
   std::ostream& operator<<(std::ostream& os, HistoryNode const& node) {
@@ -130,19 +108,14 @@ typedef std::map<edm::ParameterSetID, edm::ParameterSetBlob> ParameterSetMap;
     return os;
   }
   bool HistoryNode::sort_ = false;
-}
+}  // namespace
 
-std::ostream&
-operator<<(std::ostream& os, edm::ProcessHistory& iHist) {
+std::ostream& operator<<(std::ostream& os, edm::ProcessHistory& iHist) {
   std::string const indentDelta("  ");
   std::string indent = indentDelta;
-  for(auto const& process : iHist) {
-    os << indent
-       << process.processName() << " '"
-       << process.passID()      << "' '"
-       << process.releaseVersion() << "' ("
-       << process.parameterSetID() << ")"
-       << std::endl;
+  for (auto const& process : iHist) {
+    os << indent << process.processName() << " '" << process.passID() << "' '" << process.releaseVersion() << "' ("
+       << process.parameterSetID() << ")" << std::endl;
     indent += indentDelta;
   }
   return os;
@@ -151,7 +124,7 @@ operator<<(std::ostream& os, edm::ProcessHistory& iHist) {
 void HistoryNode::printHistory(std::string const& iIndent) const {
   std::string const indentDelta("  ");
   const std::string& indent = iIndent;
-  for(auto const& item : *this) {
+  for (auto const& item : *this) {
     std::cout << indent << item;
     item.printHistory(indent + indentDelta);
   }
@@ -164,7 +137,7 @@ std::string eventSetupComponent(char const* iType,
   std::ostringstream result;
   edm::ParameterSet const& pset = iProcessConfig.getParameterSet(iCompName);
   std::string name(pset.getParameter<std::string>("@module_label"));
-  if(name.empty()) {
+  if (name.empty()) {
     name = pset.getParameter<std::string>("@module_type");
   }
 
@@ -177,23 +150,20 @@ std::string eventSetupComponent(char const* iType,
 void HistoryNode::printEventSetupHistory(ParameterSetMap const& iPSM,
                                          std::vector<std::string> const& iFindMatch,
                                          std::ostream& oErrorLog) const {
-  for(auto const& itH : *this) {
+  for (auto const& itH : *this) {
     //Get ParameterSet for process
     ParameterSetMap::const_iterator itFind = iPSM.find(itH.parameterSetID());
-    if(itFind == iPSM.end()){
+    if (itFind == iPSM.end()) {
       oErrorLog << "No ParameterSetID for " << itH.parameterSetID() << std::endl;
     } else {
       edm::ParameterSet processConfig(itFind->second.pset());
       std::vector<std::string> sourceStrings, moduleStrings;
       //get the sources
-      std::vector<std::string> sources = processConfig.getParameter<std::vector<std::string> >("@all_essources");
-      for(auto& itM : sources) {
-        std::string retValue = eventSetupComponent("ESSource",
-                                                   itM,
-                                                   processConfig,
-                                                   itH.processName());
+      std::vector<std::string> sources = processConfig.getParameter<std::vector<std::string>>("@all_essources");
+      for (auto& itM : sources) {
+        std::string retValue = eventSetupComponent("ESSource", itM, processConfig, itH.processName());
         bool foundMatch = true;
-        if(!iFindMatch.empty()) {
+        if (!iFindMatch.empty()) {
           for (auto const& stringToFind : iFindMatch) {
             if (retValue.find(stringToFind) == std::string::npos) {
               foundMatch = false;
@@ -206,14 +176,11 @@ void HistoryNode::printEventSetupHistory(ParameterSetMap const& iPSM,
         }
       }
       //get the modules
-      std::vector<std::string> modules = processConfig.getParameter<std::vector<std::string> >("@all_esmodules");
-      for(auto& itM : modules) {
-        std::string retValue = eventSetupComponent("ESModule",
-                                                   itM,
-                                                   processConfig,
-                                                   itH.processName());
+      std::vector<std::string> modules = processConfig.getParameter<std::vector<std::string>>("@all_esmodules");
+      for (auto& itM : modules) {
+        std::string retValue = eventSetupComponent("ESModule", itM, processConfig, itH.processName());
         bool foundMatch = true;
-        if(!iFindMatch.empty()) {
+        if (!iFindMatch.empty()) {
           for (auto const& stringToFind : iFindMatch) {
             if (retValue.find(stringToFind) == std::string::npos) {
               foundMatch = false;
@@ -225,15 +192,12 @@ void HistoryNode::printEventSetupHistory(ParameterSetMap const& iPSM,
           moduleStrings.push_back(std::move(retValue));
         }
       }
-      if(sort_) {
+      if (sort_) {
         std::sort(sourceStrings.begin(), sourceStrings.end());
         std::sort(moduleStrings.begin(), moduleStrings.end());
       }
-      std::copy(sourceStrings.begin(), sourceStrings.end(),
-                std::ostream_iterator<std::string>(std::cout, "\n"));
-      std::copy(moduleStrings.begin(), moduleStrings.end(),
-                std::ostream_iterator<std::string>(std::cout, "\n"));
-
+      std::copy(sourceStrings.begin(), sourceStrings.end(), std::ostream_iterator<std::string>(std::cout, "\n"));
+      std::copy(moduleStrings.begin(), moduleStrings.end(), std::ostream_iterator<std::string>(std::cout, "\n"));
     }
     itH.printEventSetupHistory(iPSM, iFindMatch, oErrorLog);
   }
@@ -246,7 +210,8 @@ std::string nonProducerComponent(std::string const& iCompName,
   edm::ParameterSet const& pset = iProcessConfig.getParameterSet(iCompName);
   std::string label(pset.getParameter<std::string>("@module_label"));
 
-  result << "Module: " << label << " " << iProcessName << "\n" << " parameters: ";
+  result << "Module: " << label << " " << iProcessName << "\n"
+         << " parameters: ";
   prettyPrint(result, pset, " ", " ");
   return result.str();
 }
@@ -255,25 +220,22 @@ void HistoryNode::printOtherModulesHistory(ParameterSetMap const& iPSM,
                                            ModuleToIdBranches const& iModules,
                                            std::vector<std::string> const& iFindMatch,
                                            std::ostream& oErrorLog) const {
-  for(auto const& itH : *this) {
+  for (auto const& itH : *this) {
     //Get ParameterSet for process
     ParameterSetMap::const_iterator itFind = iPSM.find(itH.parameterSetID());
-    if(itFind == iPSM.end()){
+    if (itFind == iPSM.end()) {
       oErrorLog << "No ParameterSetID for " << itH.parameterSetID() << std::endl;
     } else {
       edm::ParameterSet processConfig(itFind->second.pset());
       std::vector<std::string> moduleStrings;
       //get all modules
-      std::vector<std::string> modules = processConfig.getParameter<std::vector<std::string> >("@all_modules");
-      for(auto& itM : modules) {
+      std::vector<std::string> modules = processConfig.getParameter<std::vector<std::string>>("@all_modules");
+      for (auto& itM : modules) {
         //if we didn't already handle this from the branches
-        if(iModules.end() == iModules.find(std::make_pair(itH.processName(), itM))) {
-          std::string retValue(nonProducerComponent(
-                                                    itM,
-                                                    processConfig,
-                                                    itH.processName()));
+        if (iModules.end() == iModules.find(std::make_pair(itH.processName(), itM))) {
+          std::string retValue(nonProducerComponent(itM, processConfig, itH.processName()));
           bool foundMatch = true;
-          if(!iFindMatch.empty()) {
+          if (!iFindMatch.empty()) {
             for (auto const& stringToFind : iFindMatch) {
               if (retValue.find(stringToFind) == std::string::npos) {
                 foundMatch = false;
@@ -286,18 +248,17 @@ void HistoryNode::printOtherModulesHistory(ParameterSetMap const& iPSM,
           }
         }
       }
-      if(sort_) {
+      if (sort_) {
         std::sort(moduleStrings.begin(), moduleStrings.end());
       }
-      std::copy(moduleStrings.begin(), moduleStrings.end(),
-                std::ostream_iterator<std::string>(std::cout, "\n"));
+      std::copy(moduleStrings.begin(), moduleStrings.end(), std::ostream_iterator<std::string>(std::cout, "\n"));
     }
     itH.printOtherModulesHistory(iPSM, iModules, iFindMatch, oErrorLog);
   }
 }
 
-static void appendToSet(std::set<std::string>&iSet, std::vector<std::string> const& iFrom){
-  for(auto const& n : iFrom) {
+static void appendToSet(std::set<std::string>& iSet, std::vector<std::string> const& iFrom) {
+  for (auto const& n : iFrom) {
     iSet.insert(n);
   }
 }
@@ -307,48 +268,48 @@ static std::string topLevelPSet(std::string const& iName,
                                 std::string const& iProcessName) {
   std::ostringstream result;
   edm::ParameterSet const& pset = iProcessConfig.getParameterSet(iName);
-  
-  result << "PSet: " << iName << " " << iProcessName << "\n" << " parameters: ";
+
+  result << "PSet: " << iName << " " << iProcessName << "\n"
+         << " parameters: ";
   prettyPrint(result, pset, " ", " ");
   return result.str();
 }
 
-
 void HistoryNode::printTopLevelPSetsHistory(ParameterSetMap const& iPSM,
                                             std::vector<std::string> const& iFindMatch,
                                             std::ostream& oErrorLog) const {
-  for(auto const& itH : *this) {
+  for (auto const& itH : *this) {
     //Get ParameterSet for process
     ParameterSetMap::const_iterator itFind = iPSM.find(itH.parameterSetID());
-    if(itFind == iPSM.end()){
+    if (itFind == iPSM.end()) {
       oErrorLog << "No ParameterSetID for " << itH.parameterSetID() << std::endl;
     } else {
       edm::ParameterSet processConfig(itFind->second.pset());
       //Need to get the names of PSets which are used by the framework (e.g. names of modules)
       std::set<std::string> namesToExclude;
-      appendToSet(namesToExclude,processConfig.getParameter<std::vector<std::string> >("@all_modules"));
-      appendToSet(namesToExclude,processConfig.getParameter<std::vector<std::string> >("@all_sources"));
-      appendToSet(namesToExclude,processConfig.getParameter<std::vector<std::string> >("@all_loopers"));
+      appendToSet(namesToExclude, processConfig.getParameter<std::vector<std::string>>("@all_modules"));
+      appendToSet(namesToExclude, processConfig.getParameter<std::vector<std::string>>("@all_sources"));
+      appendToSet(namesToExclude, processConfig.getParameter<std::vector<std::string>>("@all_loopers"));
       //appendToSet(namesToExclude,processConfig.getParameter<std::vector<std::string> >("@all_subprocesses"));//untracked
-      appendToSet(namesToExclude,processConfig.getParameter<std::vector<std::string> >("@all_esmodules"));
-      appendToSet(namesToExclude,processConfig.getParameter<std::vector<std::string> >("@all_essources"));
-      appendToSet(namesToExclude,processConfig.getParameter<std::vector<std::string> >("@all_esprefers"));
+      appendToSet(namesToExclude, processConfig.getParameter<std::vector<std::string>>("@all_esmodules"));
+      appendToSet(namesToExclude, processConfig.getParameter<std::vector<std::string>>("@all_essources"));
+      appendToSet(namesToExclude, processConfig.getParameter<std::vector<std::string>>("@all_esprefers"));
       if (processConfig.existsAs<std::vector<std::string>>("all_aliases")) {
-        appendToSet(namesToExclude,processConfig.getParameter<std::vector<std::string> >("@all_aliases"));
+        appendToSet(namesToExclude, processConfig.getParameter<std::vector<std::string>>("@all_aliases"));
       }
 
       std::vector<std::string> allNames{};
       processConfig.getParameterSetNames(allNames);
 
       std::vector<std::string> results;
-      for(auto const& name: allNames){
-        if (name.empty() || '@' == name[0] || namesToExclude.find(name)!=namesToExclude.end()) {
+      for (auto const& name : allNames) {
+        if (name.empty() || '@' == name[0] || namesToExclude.find(name) != namesToExclude.end()) {
           continue;
         }
-        std::string retValue = topLevelPSet(name,processConfig,itH.processName());
+        std::string retValue = topLevelPSet(name, processConfig, itH.processName());
 
         bool foundMatch = true;
-        if(!iFindMatch.empty()) {
+        if (!iFindMatch.empty()) {
           for (auto const& stringToFind : iFindMatch) {
             if (retValue.find(stringToFind) == std::string::npos) {
               foundMatch = false;
@@ -360,38 +321,36 @@ void HistoryNode::printTopLevelPSetsHistory(ParameterSetMap const& iPSM,
           results.push_back(std::move(retValue));
         }
       }
-      if(sort_) {
+      if (sort_) {
         std::sort(results.begin(), results.end());
       }
-      std::copy(results.begin(), results.end(),
-                std::ostream_iterator<std::string>(std::cout, "\n"));
+      std::copy(results.begin(), results.end(), std::ostream_iterator<std::string>(std::cout, "\n"));
     }
     itH.printTopLevelPSetsHistory(iPSM, iFindMatch, oErrorLog);
   }
 }
 
-
 namespace {
-  std::unique_ptr<TFile>
-  makeTFileWithLookup(std::string const& filename) {
+  std::unique_ptr<TFile> makeTFileWithLookup(std::string const& filename) {
     // See if it is a logical file name.
-    std::unique_ptr<edm::SiteLocalConfig> slcptr = std::make_unique<edm::service::SiteLocalConfigService>(edm::ParameterSet());
-    auto slc = std::make_shared<edm::serviceregistry::ServiceWrapper<edm::SiteLocalConfig> >(std::move(slcptr));
+    std::unique_ptr<edm::SiteLocalConfig> slcptr =
+        std::make_unique<edm::service::SiteLocalConfigService>(edm::ParameterSet());
+    auto slc = std::make_shared<edm::serviceregistry::ServiceWrapper<edm::SiteLocalConfig>>(std::move(slcptr));
     edm::ServiceToken slcToken = edm::ServiceRegistry::createContaining(slc);
     edm::ServiceRegistry::Operate operate(slcToken);
     std::string override;
     std::vector<std::string> fileNames;
     fileNames.push_back(filename);
     edm::InputFileCatalog catalog(fileNames, override, true);
-    if(catalog.fileNames()[0] == filename) {
+    if (catalog.fileNames()[0] == filename) {
       throw cms::Exception("FileNotFound", "RootFile::RootFile()")
-        << "File " << filename << " was not found or could not be opened.\n";
+          << "File " << filename << " was not found or could not be opened.\n";
     }
     // filename is a valid LFN.
     std::unique_ptr<TFile> result(TFile::Open(catalog.fileNames()[0].c_str()));
-    if(!result.get()) {
+    if (!result.get()) {
       throw cms::Exception("FileNotFound", "RootFile::RootFile()")
-        << "File " << fileNames[0] << " was not found or could not be opened.\n";
+          << "File " << fileNames[0] << " was not found or could not be opened.\n";
     }
     return result;
   }
@@ -400,75 +359,80 @@ namespace {
   // The returned unique_ptr will not be null. The argument must not be null.
   // We first try the file name as a PFN, so that the catalog and related
   // services are not loaded unless needed.
-  std::unique_ptr<TFile>
-  makeTFile(std::string const& filename) {
+  std::unique_ptr<TFile> makeTFile(std::string const& filename) {
     gErrorIgnoreLevel = kFatal;
     std::unique_ptr<TFile> result(TFile::Open(filename.c_str()));
     gErrorIgnoreLevel = kError;
-    if(!result.get()) {
+    if (!result.get()) {
       // Try again with catalog.
       return makeTFileWithLookup(filename);
     }
     return result;
   }
-}
+}  // namespace
 
-
-static std::ostream& prettyPrint(std::ostream& os, edm::ParameterSetEntry const& psetEntry, std::string const& iIndent, std::string const& iIndentDelta) {
-  char const* trackiness = (psetEntry.isTracked()?"tracked":"untracked");
+static std::ostream& prettyPrint(std::ostream& os,
+                                 edm::ParameterSetEntry const& psetEntry,
+                                 std::string const& iIndent,
+                                 std::string const& iIndentDelta) {
+  char const* trackiness = (psetEntry.isTracked() ? "tracked" : "untracked");
   os << "PSet " << trackiness << " = (";
   prettyPrint(os, psetEntry.pset(), iIndent + iIndentDelta, iIndentDelta);
   os << ")";
   return os;
 }
 
-static std::ostream& prettyPrint(std::ostream& os, edm::VParameterSetEntry const& vpsetEntry, std::string const& iIndent, std::string const& iIndentDelta) {
+static std::ostream& prettyPrint(std::ostream& os,
+                                 edm::VParameterSetEntry const& vpsetEntry,
+                                 std::string const& iIndent,
+                                 std::string const& iIndentDelta) {
   std::vector<edm::ParameterSet> const& vps = vpsetEntry.vpset();
   os << "VPSet " << (vpsetEntry.isTracked() ? "tracked" : "untracked") << " = ({" << std::endl;
-  std::string newIndent = iIndent+iIndentDelta;
+  std::string newIndent = iIndent + iIndentDelta;
   std::string start;
   std::string const between(",\n");
-  for(auto const& item : vps) {
+  for (auto const& item : vps) {
     os << start << newIndent;
     prettyPrint(os, item, newIndent, iIndentDelta);
     start = between;
   }
-  if(!vps.empty()) {
+  if (!vps.empty()) {
     os << std::endl;
   }
-  os << iIndent<< "})";
+  os << iIndent << "})";
   return os;
 }
 
-
-static std::ostream& prettyPrint(std::ostream& oStream, edm::ParameterSet const& iPSet, std::string const& iIndent, std::string const& iIndentDelta) {
-  std::string newIndent = iIndent+iIndentDelta;
+static std::ostream& prettyPrint(std::ostream& oStream,
+                                 edm::ParameterSet const& iPSet,
+                                 std::string const& iIndent,
+                                 std::string const& iIndentDelta) {
+  std::string newIndent = iIndent + iIndentDelta;
 
   oStream << "{" << std::endl;
-  for(auto const& item : iPSet.tbl()) {
+  for (auto const& item : iPSet.tbl()) {
     // indent a bit
-    oStream << newIndent<< item.first << ": " << item.second << std::endl;
+    oStream << newIndent << item.first << ": " << item.second << std::endl;
   }
-  for(auto const& item : iPSet.psetTable()) {
+  for (auto const& item : iPSet.psetTable()) {
     // indent a bit
     edm::ParameterSetEntry const& pe = item.second;
     oStream << newIndent << item.first << ": ";
     prettyPrint(oStream, pe, iIndent, iIndentDelta);
-    oStream<<  std::endl;
+    oStream << std::endl;
   }
-  for(auto const& item : iPSet.vpsetTable()) {
+  for (auto const& item : iPSet.vpsetTable()) {
     // indent a bit
     edm::VParameterSetEntry const& pe = item.second;
     oStream << newIndent << item.first << ": ";
     prettyPrint(oStream, pe, newIndent, iIndentDelta);
-    oStream<<  std::endl;
+    oStream << std::endl;
   }
-  oStream << iIndent<< "}";
+  oStream << iIndent << "}";
 
   return oStream;
 }
 
-
 class ProvenanceDumper {
 public:
   // It is illegal to call this constructor with a null pointer; a
@@ -484,8 +448,8 @@ class ProvenanceDumper {
                    bool dontPrintProducts,
                    std::string const& dumpPSetID);
 
-  ProvenanceDumper(ProvenanceDumper const&) = delete; // Disallow copying and moving
-  ProvenanceDumper& operator=(ProvenanceDumper const&) = delete; // Disallow copying and moving
+  ProvenanceDumper(ProvenanceDumper const&) = delete;             // Disallow copying and moving
+  ProvenanceDumper& operator=(ProvenanceDumper const&) = delete;  // Disallow copying and moving
 
   // Write the provenenace information to the given stream.
   void dump();
@@ -493,40 +457,40 @@ class ProvenanceDumper {
   int exitCode() const;
 
 private:
-
   void addAncestors(edm::BranchID const& branchID,
                     std::set<edm::BranchID>& ancestorBranchIDs,
                     std::ostringstream& sout,
-                    std::map<edm::BranchID, std::set<edm::ParentageID> >& perProductParentage) const;
+                    std::map<edm::BranchID, std::set<edm::ParentageID>>& perProductParentage) const;
 
-  void addDescendants(edm::BranchID const& branchID, std::set<edm::BranchID>& descendantBranchIDs,
+  void addDescendants(edm::BranchID const& branchID,
+                      std::set<edm::BranchID>& descendantBranchIDs,
                       std::ostringstream& sout,
-                      std::map<edm::BranchID, std::set<edm::BranchID> >& parentToChildren) const;
-
-  std::string              filename_;
-  edm::propagate_const<std::unique_ptr<TFile>>   inputFile_;
-  int                      exitCode_;
-  std::stringstream        errorLog_;
-  int                      errorCount_;
-  edm::ProductRegistry     reg_;
+                      std::map<edm::BranchID, std::set<edm::BranchID>>& parentToChildren) const;
+
+  std::string filename_;
+  edm::propagate_const<std::unique_ptr<TFile>> inputFile_;
+  int exitCode_;
+  std::stringstream errorLog_;
+  int errorCount_;
+  edm::ProductRegistry reg_;
   edm::ProcessConfigurationVector phc_;
   edm::ProcessHistoryVector phv_;
-  ParameterSetMap          psm_;
-  HistoryNode              historyGraph_;
-  bool                     showDependencies_;
-  bool                     extendedAncestors_;
-  bool                     extendedDescendants_;
-  bool                     excludeESModules_;
-  bool                     showOtherModules_;
-  bool                     productRegistryPresent_;
-  bool                     showTopLevelPSets_;
+  ParameterSetMap psm_;
+  HistoryNode historyGraph_;
+  bool showDependencies_;
+  bool extendedAncestors_;
+  bool extendedDescendants_;
+  bool excludeESModules_;
+  bool showOtherModules_;
+  bool productRegistryPresent_;
+  bool showTopLevelPSets_;
   std::vector<std::string> findMatch_;
-  bool                     dontPrintProducts_;
-  std::string              dumpPSetID_;
+  bool dontPrintProducts_;
+  std::string dumpPSetID_;
 
   void work_();
   void dumpProcessHistory_();
-  void dumpEventFilteringParameterSets_(TFile * file);
+  void dumpEventFilteringParameterSets_(TFile* file);
   void dumpEventFilteringParameterSets(edm::EventSelectionIDVector const& ids);
   void dumpParameterSetForID_(edm::ParameterSetID const& id);
 };
@@ -540,80 +504,69 @@ ProvenanceDumper::ProvenanceDumper(std::string const& filename,
                                    bool showTopLevelPSets,
                                    std::vector<std::string> const& findMatch,
                                    bool dontPrintProducts,
-                                   std::string const& dumpPSetID) :
-  filename_(filename),
-  inputFile_(makeTFile(filename)),
-  exitCode_(0),
-  errorLog_(),
-  errorCount_(0),
-  showDependencies_(showDependencies),
-  extendedAncestors_(extendedAncestors),
-  extendedDescendants_(extendedDescendants),
-  excludeESModules_(excludeESModules),
-  showOtherModules_(showOtherModules),
-  productRegistryPresent_(true),
-  showTopLevelPSets_(showTopLevelPSets),
-  findMatch_(findMatch),
-  dontPrintProducts_(dontPrintProducts),
-  dumpPSetID_(dumpPSetID) {
-}
-
-void
-ProvenanceDumper::dump() {
-  work_();
-}
-
-void
-ProvenanceDumper::printErrors(std::ostream& os) {
-  if(errorCount_ > 0) os << errorLog_.str() << std::endl;
+                                   std::string const& dumpPSetID)
+    : filename_(filename),
+      inputFile_(makeTFile(filename)),
+      exitCode_(0),
+      errorLog_(),
+      errorCount_(0),
+      showDependencies_(showDependencies),
+      extendedAncestors_(extendedAncestors),
+      extendedDescendants_(extendedDescendants),
+      excludeESModules_(excludeESModules),
+      showOtherModules_(showOtherModules),
+      productRegistryPresent_(true),
+      showTopLevelPSets_(showTopLevelPSets),
+      findMatch_(findMatch),
+      dontPrintProducts_(dontPrintProducts),
+      dumpPSetID_(dumpPSetID) {}
+
+void ProvenanceDumper::dump() { work_(); }
+
+void ProvenanceDumper::printErrors(std::ostream& os) {
+  if (errorCount_ > 0)
+    os << errorLog_.str() << std::endl;
 }
 
-int
-ProvenanceDumper::exitCode() const {
-  return exitCode_;
-}
+int ProvenanceDumper::exitCode() const { return exitCode_; }
 
-void
-ProvenanceDumper::dumpEventFilteringParameterSets(edm::EventSelectionIDVector const& ids) {
+void ProvenanceDumper::dumpEventFilteringParameterSets(edm::EventSelectionIDVector const& ids) {
   edm::EventSelectionIDVector::size_type num_ids = ids.size();
-  if(num_ids == 0) {
+  if (num_ids == 0) {
     std::cout << "No event filtering information is available.\n";
     std::cout << "------------------------------\n";
   } else {
-    std::cout << "Event filtering information for "
-              << num_ids
-              << " processing steps is available.\n"
+    std::cout << "Event filtering information for " << num_ids << " processing steps is available.\n"
               << "The ParameterSets will be printed out, "
               << "with the oldest printed first.\n";
-    for(edm::EventSelectionIDVector::size_type i = 0; i != num_ids; ++i) {
+    for (edm::EventSelectionIDVector::size_type i = 0; i != num_ids; ++i) {
       dumpParameterSetForID_(ids[i]);
     }
   }
 }
 
-void
-ProvenanceDumper::dumpEventFilteringParameterSets_(TFile* file) {
-
+void ProvenanceDumper::dumpEventFilteringParameterSets_(TFile* file) {
   TTree* history = dynamic_cast<TTree*>(file->Get(edm::poolNames::eventHistoryTreeName().c_str()));
-  if(history != nullptr) {
+  if (history != nullptr) {
     edm::History h;
     edm::History* ph = &h;
 
     history->SetBranchAddress(edm::poolNames::eventHistoryBranchName().c_str(), &ph);
-    if(history->GetEntry(0) <= 0) {
+    if (history->GetEntry(0) <= 0) {
       std::cout << "No event filtering information is available; the event history tree has no entries\n";
     } else {
       dumpEventFilteringParameterSets(h.eventSelectionIDs());
     }
   } else {
     TTree* events = dynamic_cast<TTree*>(file->Get(edm::poolNames::eventTreeName().c_str()));
-    assert (events != nullptr);
+    assert(events != nullptr);
     TBranch* eventSelectionsBranch = events->GetBranch(edm::poolNames::eventSelectionsBranchName().c_str());
-    if (eventSelectionsBranch == nullptr) return;
+    if (eventSelectionsBranch == nullptr)
+      return;
     edm::EventSelectionIDVector ids;
     edm::EventSelectionIDVector* pids = &ids;
     eventSelectionsBranch->SetAddress(&pids);
-    if(eventSelectionsBranch->GetEntry(0) <= 0) {
+    if (eventSelectionsBranch->GetEntry(0) <= 0) {
       std::cout << "No event filtering information is available; the event selections branch has no entries\n";
     } else {
       dumpEventFilteringParameterSets(ids);
@@ -621,22 +574,21 @@ ProvenanceDumper::dumpEventFilteringParameterSets_(TFile* file) {
   }
 }
 
-void
-ProvenanceDumper::dumpParameterSetForID_(edm::ParameterSetID const& id) {
+void ProvenanceDumper::dumpParameterSetForID_(edm::ParameterSetID const& id) {
   std::cout << "ParameterSetID: " << id << '\n';
-  if(id.isValid()) {
+  if (id.isValid()) {
     ParameterSetMap::const_iterator i = psm_.find(id);
-    if(i == psm_.end()) {
+    if (i == psm_.end()) {
       std::cout << "We are unable to find the corresponding ParameterSet\n";
       edm::ParameterSet empty;
       empty.registerIt();
-      if(id == empty.id()) {
+      if (id == empty.id()) {
         std::cout << "But it would have been empty anyway\n";
       }
     } else {
       edm::ParameterSet ps(i->second.pset());
       prettyPrint(std::cout, ps, " ", " ");
-      std::cout<< '\n';
+      std::cout << '\n';
     }
   } else {
     std::cout << "This ID is not valid\n";
@@ -644,17 +596,16 @@ ProvenanceDumper::dumpParameterSetForID_(edm::ParameterSetID const& id) {
   std::cout << "     -------------------------\n";
 }
 
-void
-ProvenanceDumper::dumpProcessHistory_() {
+void ProvenanceDumper::dumpProcessHistory_() {
   std::cout << "Processing History:" << std::endl;
   std::map<edm::ProcessConfigurationID, unsigned int> simpleIDs;
-  for(auto const& ph : phv_) {
+  for (auto const& ph : phv_) {
     //loop over the history entries looking for matches
     HistoryNode* parent = &historyGraph_;
-    for(auto const& pc : ph) {
-      if(parent->size() == 0) {
+    for (auto const& pc : ph) {
+      if (parent->size() == 0) {
         unsigned int id = simpleIDs[pc.id()];
-        if(0 == id) {
+        if (0 == id) {
           id = 1;
           simpleIDs[pc.id()] = id;
         }
@@ -663,14 +614,14 @@ ProvenanceDumper::dumpProcessHistory_() {
       } else {
         //see if this is unique
         bool isUnique = true;
-        for(auto& child : *parent) {
-          if(child.configurationID() == pc.id()) {
+        for (auto& child : *parent) {
+          if (child.configurationID() == pc.id()) {
             isUnique = false;
             parent = &child;
             break;
           }
         }
-        if(isUnique) {
+        if (isUnique) {
           simpleIDs[pc.id()] = parent->size() + 1;
           parent->addChild(HistoryNode(pc, simpleIDs[pc.id()]));
           parent = parent->lastChildAddress();
@@ -681,48 +632,46 @@ ProvenanceDumper::dumpProcessHistory_() {
   historyGraph_.printHistory();
 }
 
-void
-ProvenanceDumper::work_() {
-
+void ProvenanceDumper::work_() {
   TTree* meta = dynamic_cast<TTree*>(inputFile_->Get(edm::poolNames::metaDataTreeName().c_str()));
   assert(nullptr != meta);
 
   edm::ProductRegistry* pReg = &reg_;
-  if(meta->FindBranch(edm::poolNames::productDescriptionBranchName().c_str()) != nullptr) {
+  if (meta->FindBranch(edm::poolNames::productDescriptionBranchName().c_str()) != nullptr) {
     meta->SetBranchAddress(edm::poolNames::productDescriptionBranchName().c_str(), &pReg);
   } else {
     productRegistryPresent_ = false;
   }
 
   ParameterSetMap* pPsm = &psm_;
-  if(meta->FindBranch(edm::poolNames::parameterSetMapBranchName().c_str()) != nullptr) {
+  if (meta->FindBranch(edm::poolNames::parameterSetMapBranchName().c_str()) != nullptr) {
     meta->SetBranchAddress(edm::poolNames::parameterSetMapBranchName().c_str(), &pPsm);
   } else {
-    TTree* psetTree = dynamic_cast<TTree *>(inputFile_->Get(edm::poolNames::parameterSetsTreeName().c_str()));
+    TTree* psetTree = dynamic_cast<TTree*>(inputFile_->Get(edm::poolNames::parameterSetsTreeName().c_str()));
     assert(nullptr != psetTree);
     typedef std::pair<edm::ParameterSetID, edm::ParameterSetBlob> IdToBlobs;
     IdToBlobs idToBlob;
     IdToBlobs* pIdToBlob = &idToBlob;
     psetTree->SetBranchAddress(edm::poolNames::idToParameterSetBlobsBranchName().c_str(), &pIdToBlob);
-    for(long long i = 0; i != psetTree->GetEntries(); ++i) {
+    for (long long i = 0; i != psetTree->GetEntries(); ++i) {
       psetTree->GetEntry(i);
       psm_.insert(idToBlob);
     }
   }
 
   edm::ProcessHistoryVector* pPhv = &phv_;
-  if(meta->FindBranch(edm::poolNames::processHistoryBranchName().c_str()) != nullptr) {
+  if (meta->FindBranch(edm::poolNames::processHistoryBranchName().c_str()) != nullptr) {
     meta->SetBranchAddress(edm::poolNames::processHistoryBranchName().c_str(), &pPhv);
   }
 
   edm::ProcessHistoryMap phm;
   edm::ProcessHistoryMap* pPhm = &phm;
-  if(meta->FindBranch(edm::poolNames::processHistoryMapBranchName().c_str()) != nullptr) {
+  if (meta->FindBranch(edm::poolNames::processHistoryMapBranchName().c_str()) != nullptr) {
     meta->SetBranchAddress(edm::poolNames::processHistoryMapBranchName().c_str(), &pPhm);
   }
 
-  if(meta->FindBranch(edm::poolNames::moduleDescriptionMapBranchName().c_str()) != nullptr) {
-    if(meta->GetBranch(edm::poolNames::moduleDescriptionMapBranchName().c_str())->GetSplitLevel() != 0) {
+  if (meta->FindBranch(edm::poolNames::moduleDescriptionMapBranchName().c_str()) != nullptr) {
+    if (meta->GetBranch(edm::poolNames::moduleDescriptionMapBranchName().c_str())->GetSplitLevel() != 0) {
       meta->SetBranchStatus((edm::poolNames::moduleDescriptionMapBranchName() + ".*").c_str(), false);
     } else {
       meta->SetBranchStatus(edm::poolNames::moduleDescriptionMapBranchName().c_str(), false);
@@ -733,28 +682,27 @@ ProvenanceDumper::work_() {
   assert(nullptr != pReg);
 
   edm::pset::Registry& psetRegistry = *edm::pset::Registry::instance();
-  for(auto const& item : psm_) {
+  for (auto const& item : psm_) {
     edm::ParameterSet pset(item.second.pset());
     pset.setID(item.first);
     psetRegistry.insertMapped(pset);
   }
 
-
-  if(!phv_.empty()) {
-    for(auto const& history : phv_) {
-      for(auto const& process : history) {
+  if (!phv_.empty()) {
+    for (auto const& history : phv_) {
+      for (auto const& process : history) {
         phc_.push_back(process);
       }
     }
     edm::sort_all(phc_);
     phc_.erase(std::unique(phc_.begin(), phc_.end()), phc_.end());
-    
+
   }
   // backward compatibility
-  else if(!phm.empty()) {
-    for(auto const& history : phm) {
+  else if (!phm.empty()) {
+    for (auto const& history : phm) {
       phv_.push_back(history.second);
-      for(auto const& process : history.second) {
+      for (auto const& process : history.second) {
         phc_.push_back(process);
       }
     }
@@ -762,23 +710,24 @@ ProvenanceDumper::work_() {
     phc_.erase(std::unique(phc_.begin(), phc_.end()), phc_.end());
   }
 
-  if(!dumpPSetID_.empty()) {
+  if (!dumpPSetID_.empty()) {
     edm::ParameterSetID psetID;
     try {
       psetID = edm::ParameterSetID(dumpPSetID_);
     } catch (cms::Exception const& x) {
-      throw cms::Exception("Command Line Argument") << "Illegal ParameterSetID string. It should contain 32 hexadecimal characters";
+      throw cms::Exception("Command Line Argument")
+          << "Illegal ParameterSetID string. It should contain 32 hexadecimal characters";
     }
     dumpParameterSetForID_(psetID);
     return;
   }
 
   //Prepare the parentage information if requested
-  std::map<edm::BranchID, std::set<edm::ParentageID> > perProductParentage;
+  std::map<edm::BranchID, std::set<edm::ParentageID>> perProductParentage;
 
-  if(showDependencies_ || extendedAncestors_ || extendedDescendants_){
+  if (showDependencies_ || extendedAncestors_ || extendedDescendants_) {
     TTree* parentageTree = dynamic_cast<TTree*>(inputFile_->Get(edm::poolNames::parentageTreeName().c_str()));
-    if(nullptr == parentageTree) {
+    if (nullptr == parentageTree) {
       std::cerr << "ERROR, no Parentage tree available so cannot show dependencies, ancestors, or descendants.\n";
       std::cerr << "Possibly this is not a standard EDM format file. For example, dependency, ancestor, and\n";
       std::cerr << "descendant options to edmProvDump will not work with nanoAOD format files.\n\n";
@@ -786,14 +735,13 @@ ProvenanceDumper::work_() {
       extendedAncestors_ = false;
       extendedDescendants_ = false;
     } else {
-
       edm::ParentageRegistry& registry = *edm::ParentageRegistry::instance();
 
       std::vector<edm::ParentageID> orderedParentageIDs;
       orderedParentageIDs.reserve(parentageTree->GetEntries());
-      for(Long64_t i = 0, numEntries = parentageTree->GetEntries(); i < numEntries; ++i) {
+      for (Long64_t i = 0, numEntries = parentageTree->GetEntries(); i < numEntries; ++i) {
         edm::Parentage parentageBuffer;
-        edm::Parentage *pParentageBuffer = &parentageBuffer;
+        edm::Parentage* pParentageBuffer = &parentageBuffer;
         parentageTree->SetBranchAddress(edm::poolNames::parentageBranchName().c_str(), &pParentageBuffer);
         parentageTree->GetEntry(i);
         registry.insertMapped(parentageBuffer);
@@ -801,45 +749,49 @@ ProvenanceDumper::work_() {
       }
       parentageTree->SetBranchAddress(edm::poolNames::parentageBranchName().c_str(), nullptr);
 
-      TTree* eventMetaTree = dynamic_cast<TTree*>(inputFile_->Get(edm::BranchTypeToMetaDataTreeName(edm::InEvent).c_str()));
-      if(nullptr == eventMetaTree) {
+      TTree* eventMetaTree =
+          dynamic_cast<TTree*>(inputFile_->Get(edm::BranchTypeToMetaDataTreeName(edm::InEvent).c_str()));
+      if (nullptr == eventMetaTree) {
         eventMetaTree = dynamic_cast<TTree*>(inputFile_->Get(edm::BranchTypeToProductTreeName(edm::InEvent).c_str()));
       }
-      if(nullptr == eventMetaTree) {
-        std::cerr << "ERROR, no '" << edm::BranchTypeToProductTreeName(edm::InEvent)<< "' Tree in file so can not show dependencies\n";
+      if (nullptr == eventMetaTree) {
+        std::cerr << "ERROR, no '" << edm::BranchTypeToProductTreeName(edm::InEvent)
+                  << "' Tree in file so can not show dependencies\n";
         showDependencies_ = false;
         extendedAncestors_ = false;
         extendedDescendants_ = false;
       } else {
-        TBranch* storedProvBranch = eventMetaTree->GetBranch(edm::BranchTypeToProductProvenanceBranchName(edm::InEvent).c_str());
+        TBranch* storedProvBranch =
+            eventMetaTree->GetBranch(edm::BranchTypeToProductProvenanceBranchName(edm::InEvent).c_str());
 
-        if(nullptr!=storedProvBranch) {
+        if (nullptr != storedProvBranch) {
           std::vector<edm::StoredProductProvenance> info;
           std::vector<edm::StoredProductProvenance>* pInfo = &info;
           storedProvBranch->SetAddress(&pInfo);
-          for(Long64_t i = 0, numEntries = eventMetaTree->GetEntries(); i < numEntries; ++i) {
+          for (Long64_t i = 0, numEntries = eventMetaTree->GetEntries(); i < numEntries; ++i) {
             storedProvBranch->GetEntry(i);
-            for(auto const& item : info) {
+            for (auto const& item : info) {
               edm::BranchID bid(item.branchID_);
               perProductParentage[bid].insert(orderedParentageIDs.at(item.parentageIDIndex_));
             }
           }
         } else {
           //backwards compatible check
-          TBranch* productProvBranch = eventMetaTree->GetBranch(edm::BranchTypeToBranchEntryInfoBranchName(edm::InEvent).c_str());
+          TBranch* productProvBranch =
+              eventMetaTree->GetBranch(edm::BranchTypeToBranchEntryInfoBranchName(edm::InEvent).c_str());
           if (nullptr != productProvBranch) {
             std::vector<edm::ProductProvenance> info;
             std::vector<edm::ProductProvenance>* pInfo = &info;
             productProvBranch->SetAddress(&pInfo);
-            for(Long64_t i = 0, numEntries = eventMetaTree->GetEntries(); i < numEntries; ++i) {
+            for (Long64_t i = 0, numEntries = eventMetaTree->GetEntries(); i < numEntries; ++i) {
               productProvBranch->GetEntry(i);
-              for(auto const& item : info) {
+              for (auto const& item : info) {
                 perProductParentage[item.branchID()].insert(item.parentageID());
               }
             }
           } else {
-            std::cerr <<" ERROR, could not find provenance information so can not show dependencies\n";
-            showDependencies_=false;
+            std::cerr << " ERROR, could not find provenance information so can not show dependencies\n";
+            showDependencies_ = false;
             extendedAncestors_ = false;
             extendedDescendants_ = false;
           }
@@ -848,7 +800,7 @@ ProvenanceDumper::work_() {
     }
   }
 
-  std::map<edm::BranchID, std::set<edm::BranchID> > parentToChildren;
+  std::map<edm::BranchID, std::set<edm::BranchID>> parentToChildren;
   edm::ParentageRegistry& registry = *edm::ParentageRegistry::instance();
 
   if (extendedDescendants_) {
@@ -856,10 +808,10 @@ ProvenanceDumper::work_() {
       edm::BranchID childBranchID = itParentageSet.first;
       for (auto const& itParentageID : itParentageSet.second) {
         edm::Parentage const* parentage = registry.getMapped(itParentageID);
-        if(nullptr != parentage) {
-            for(auto const& branch : parentage->parents()) {
-              parentToChildren[branch].insert(childBranchID);
-            }
+        if (nullptr != parentage) {
+          for (auto const& branch : parentage->parents()) {
+            parentToChildren[branch].insert(childBranchID);
+          }
         } else {
           std::cerr << "  ERROR:parentage info not in registry ParentageID=" << itParentageID << std::endl;
         }
@@ -871,7 +823,6 @@ ProvenanceDumper::work_() {
 
   dumpProcessHistory_();
 
-
   if (productRegistryPresent_) {
     std::cout << "---------Producers with data in file---------" << std::endl;
   }
@@ -883,21 +834,22 @@ ProvenanceDumper::work_() {
 
   std::map<edm::BranchID, std::string> branchIDToBranchName;
 
-  for(auto const& processConfig : phc_) {
-    edm::ParameterSet const* processParameterSet = edm::pset::Registry::instance()->getMapped(processConfig.parameterSetID());
-    if(nullptr == processParameterSet || processParameterSet->empty()) {
+  for (auto const& processConfig : phc_) {
+    edm::ParameterSet const* processParameterSet =
+        edm::pset::Registry::instance()->getMapped(processConfig.parameterSetID());
+    if (nullptr == processParameterSet || processParameterSet->empty()) {
       continue;
     }
-    for(auto& item : reg_.productListUpdator()) {
+    for (auto& item : reg_.productListUpdator()) {
       auto& product = item.second;
-      if(product.processName() != processConfig.processName()) {
-         continue;
+      if (product.processName() != processConfig.processName()) {
+        continue;
       }
       //force it to rebuild the branch name
       product.init();
       setIsMergeable(product);
 
-      if(showDependencies_ || extendedAncestors_ || extendedDescendants_) {
+      if (showDependencies_ || extendedAncestors_ || extendedDescendants_) {
         branchIDToBranchName[product.branchID()] = product.branchName();
       }
       /*
@@ -905,7 +857,7 @@ ProvenanceDumper::work_() {
         << " id " << product.productID() << std::endl;
       */
       std::string moduleLabel = product.moduleLabel();
-      if(moduleLabel == source) {
+      if (moduleLabel == source) {
         moduleLabel = input;
       } else if (moduleLabel == triggerResults) {
         moduleLabel = triggerPaths;
@@ -913,9 +865,9 @@ ProvenanceDumper::work_() {
 
       std::stringstream s;
 
-      if(processParameterSet->existsAs<edm::ParameterSet>(moduleLabel)) {
+      if (processParameterSet->existsAs<edm::ParameterSet>(moduleLabel)) {
         edm::ParameterSet const& moduleParameterSet = processParameterSet->getParameterSet(moduleLabel);
-        if(!moduleParameterSet.isRegistered()) {
+        if (!moduleParameterSet.isRegistered()) {
           edm::ParameterSet moduleParameterSetCopy = processParameterSet->getParameterSet(moduleLabel);
           moduleParameterSetCopy.registerIt();
           s << moduleParameterSetCopy.id();
@@ -927,19 +879,19 @@ ProvenanceDumper::work_() {
     }
   }
 
-  for(auto const& item : moduleToIdBranches) {
+  for (auto const& item : moduleToIdBranches) {
     std::ostringstream sout;
     sout << "Module: " << item.first.second << " " << item.first.first << std::endl;
     std::set<edm::BranchID> allBranchIDsForLabelAndProcess;
     IdToBranches const& idToBranches = item.second;
-    for(auto const& idBranch : idToBranches) {
+    for (auto const& idBranch : idToBranches) {
       sout << " PSet id:" << idBranch.first << std::endl;
-      if(!dontPrintProducts_) {
+      if (!dontPrintProducts_) {
         sout << " products: {" << std::endl;
       }
       std::set<edm::BranchID> branchIDs;
-      for(auto const& branch : idBranch.second) {
-        if(!dontPrintProducts_) {
+      for (auto const& branch : idBranch.second) {
+        if (!dontPrintProducts_) {
           sout << "  " << branch.branchName() << std::endl;
         }
         branchIDs.insert(branch.branchID());
@@ -948,7 +900,7 @@ ProvenanceDumper::work_() {
       sout << " }" << std::endl;
       edm::ParameterSetID psid(idBranch.first);
       ParameterSetMap::const_iterator itpsm = psm_.find(psid);
-      if(psm_.end() == itpsm) {
+      if (psm_.end() == itpsm) {
         ++errorCount_;
         errorLog_ << "No ParameterSetID for " << psid << std::endl;
         exitCode_ = 1;
@@ -957,32 +909,30 @@ ProvenanceDumper::work_() {
         prettyPrint(sout, edm::ParameterSet((*itpsm).second.pset()), " ", " ");
         sout << std::endl;
       }
-      if(showDependencies_) {
-
+      if (showDependencies_) {
         sout << " dependencies: {" << std::endl;
         std::set<edm::ParentageID> parentageIDs;
-        for(auto const& branch : branchIDs) {
-
+        for (auto const& branch : branchIDs) {
           //Save these BranchIDs
           std::set<edm::ParentageID> const& temp = perProductParentage[branch];
           parentageIDs.insert(temp.begin(), temp.end());
         }
-        for(auto const& parentID : parentageIDs) {
+        for (auto const& parentID : parentageIDs) {
           edm::Parentage const* parentage = registry.getMapped(parentID);
-          if(nullptr != parentage) {
-            for(auto const& branch : parentage->parents()) {
+          if (nullptr != parentage) {
+            for (auto const& branch : parentage->parents()) {
               sout << "  " << branchIDToBranchName[branch] << std::endl;
             }
           } else {
             sout << "  ERROR:parentage info not in registry ParentageID=" << parentID << std::endl;
           }
         }
-        if(parentageIDs.empty()) {
+        if (parentageIDs.empty()) {
           sout << "  no dependencies recorded (event may not contain data from this module)" << std::endl;
         }
         sout << " }" << std::endl;
       }
-    } // end loop over PSetIDs
+    }  // end loop over PSetIDs
     if (extendedAncestors_) {
       sout << " extendedAncestors: {" << std::endl;
       std::set<edm::BranchID> ancestorBranchIDs;
@@ -1007,7 +957,7 @@ ProvenanceDumper::work_() {
       sout << " }" << std::endl;
     }
     bool foundMatch = true;
-    if(!findMatch_.empty()) {
+    if (!findMatch_.empty()) {
       for (auto const& stringToFind : findMatch_) {
         if (sout.str().find(stringToFind) == std::string::npos) {
           foundMatch = false;
@@ -1016,11 +966,11 @@ ProvenanceDumper::work_() {
       }
     }
     if (foundMatch) {
-      std::cout <<sout.str()<<std::endl;
+      std::cout << sout.str() << std::endl;
     }
-  } // end loop over module label/process
+  }  // end loop over module label/process
 
-  if(productRegistryPresent_ && showOtherModules_) {
+  if (productRegistryPresent_ && showOtherModules_) {
     std::cout << "---------Other Modules---------" << std::endl;
     historyGraph_.printOtherModulesHistory(psm_, moduleToIdBranches, findMatch_, errorLog_);
   } else if (!productRegistryPresent_) {
@@ -1028,33 +978,32 @@ ProvenanceDumper::work_() {
     historyGraph_.printOtherModulesHistory(psm_, moduleToIdBranches, findMatch_, errorLog_);
   }
 
-  if(!excludeESModules_) {
+  if (!excludeESModules_) {
     std::cout << "---------EventSetup---------" << std::endl;
     historyGraph_.printEventSetupHistory(psm_, findMatch_, errorLog_);
   }
-  
-  if(showTopLevelPSets_) {
+
+  if (showTopLevelPSets_) {
     std::cout << "---------Top Level PSets---------" << std::endl;
     historyGraph_.printTopLevelPSetsHistory(psm_, findMatch_, errorLog_);
   }
-  if(errorCount_ != 0) {
+  if (errorCount_ != 0) {
     exitCode_ = 1;
   }
 }
 
-void
-ProvenanceDumper::addAncestors(edm::BranchID const& branchID, std::set<edm::BranchID>& ancestorBranchIDs, std::ostringstream& sout,
-                               std::map<edm::BranchID, std::set<edm::ParentageID> >& perProductParentage) const {
-
+void ProvenanceDumper::addAncestors(edm::BranchID const& branchID,
+                                    std::set<edm::BranchID>& ancestorBranchIDs,
+                                    std::ostringstream& sout,
+                                    std::map<edm::BranchID, std::set<edm::ParentageID>>& perProductParentage) const {
   edm::ParentageRegistry& registry = *edm::ParentageRegistry::instance();
 
   std::set<edm::ParentageID> const& parentIDs = perProductParentage[branchID];
   for (auto const& parentageID : parentIDs) {
     edm::Parentage const* parentage = registry.getMapped(parentageID);
-    if(nullptr != parentage) {
-      for(auto const& branch : parentage->parents()) {
-
-        if(ancestorBranchIDs.insert(branch).second) {
+    if (nullptr != parentage) {
+      for (auto const& branch : parentage->parents()) {
+        if (ancestorBranchIDs.insert(branch).second) {
           addAncestors(branch, ancestorBranchIDs, sout, perProductParentage);
         }
       }
@@ -1064,10 +1013,10 @@ ProvenanceDumper::addAncestors(edm::BranchID const& branchID, std::set<edm::Bran
   }
 }
 
-void
-ProvenanceDumper::addDescendants(edm::BranchID const& branchID, std::set<edm::BranchID>& descendantBranchIDs, std::ostringstream& sout,
-                                 std::map<edm::BranchID, std::set<edm::BranchID> >& parentToChildren) const {
-
+void ProvenanceDumper::addDescendants(edm::BranchID const& branchID,
+                                      std::set<edm::BranchID>& descendantBranchIDs,
+                                      std::ostringstream& sout,
+                                      std::map<edm::BranchID, std::set<edm::BranchID>>& parentToChildren) const {
   for (auto const& childBranchID : parentToChildren[branchID]) {
     if (descendantBranchIDs.insert(childBranchID).second) {
       addDescendants(childBranchID, descendantBranchIDs, sout, parentToChildren);
@@ -1092,7 +1041,7 @@ static char const* const kFindMatchCommandOpt = "findMatch,f";
 static char const* const kDontPrintProductsOpt = "dontPrintProducts";
 static char const* const kDontPrintProductsCommandOpt = "dontPrintProducts,p";
 static char const* const kShowTopLevelPSetsOpt = "showTopLevelPSets";
-static char const* const kShowTopLevelPSetsCommandOpt ="showTopLevelPSets,t";
+static char const* const kShowTopLevelPSetsCommandOpt = "showTopLevelPSets,t";
 static char const* const kHelpOpt = "help";
 static char const* const kHelpCommandOpt = "help,h";
 static char const* const kFileNameOpt = "input-file";
@@ -1106,28 +1055,21 @@ int main(int argc, char* argv[]) {
   descString += " [options] <filename>";
   descString += "\nAllowed options";
   options_description desc(descString);
-  desc.add_options()
-  (kHelpCommandOpt, "show help message")
-  (kSortCommandOpt
-   , "alphabetially sort EventSetup components")
-  (kDependenciesCommandOpt
-   , "print what data each EDProducer is directly dependent upon")
-  (kExtendedAncestorsCommandOpt
-   , "print what data each EDProducer is dependent upon including indirect dependences")
-  (kExtendedDescendantsCommandOpt
-   , "print what data depends on the data each EDProducer produces including indirect dependences")
-  (kExcludeESModulesCommandOpt
-   , "do not print ES module information")
-  (kShowAllModulesCommandOpt
-   , "show all modules (not just those that created data in the file)")
-  (kShowTopLevelPSetsCommandOpt,"show all top level PSets")
-  (kFindMatchCommandOpt, boost::program_options::value<std::vector<std::string> >(),
-    "show only modules whose information contains the matching string (or all the matching strings, this option can be repeated with different strings)")
-  (kDontPrintProductsCommandOpt
-   , "do not print products produced by module")
-  (kDumpPSetIDCommandOpt, value<std::string>()
-   , "print the parameter set associated with the parameter set ID string (and print nothing else)")
-  ;
+  desc.add_options()(kHelpCommandOpt, "show help message")(kSortCommandOpt, "alphabetially sort EventSetup components")(
+      kDependenciesCommandOpt, "print what data each EDProducer is directly dependent upon")(
+      kExtendedAncestorsCommandOpt, "print what data each EDProducer is dependent upon including indirect dependences")(
+      kExtendedDescendantsCommandOpt,
+      "print what data depends on the data each EDProducer produces including indirect dependences")(
+      kExcludeESModulesCommandOpt, "do not print ES module information")(
+      kShowAllModulesCommandOpt, "show all modules (not just those that created data in the file)")(
+      kShowTopLevelPSetsCommandOpt, "show all top level PSets")(
+      kFindMatchCommandOpt,
+      boost::program_options::value<std::vector<std::string>>(),
+      "show only modules whose information contains the matching string (or all the matching strings, this option can "
+      "be repeated with different strings)")(kDontPrintProductsCommandOpt, "do not print products produced by module")(
+      kDumpPSetIDCommandOpt,
+      value<std::string>(),
+      "print the parameter set associated with the parameter set ID string (and print nothing else)");
   //we don't want users to see these in the help messages since this
   // name only exists since the parser needs it
   options_description hidden;
@@ -1144,55 +1086,55 @@ int main(int argc, char* argv[]) {
   try {
     store(command_line_parser(argc, argv).options(cmdline_options).positional(p).run(), vm);
     notify(vm);
-  } catch(error const& iException) {
+  } catch (error const& iException) {
     std::cerr << iException.what();
     return 1;
   }
 
-  if(vm.count(kHelpOpt)) {
+  if (vm.count(kHelpOpt)) {
     std::cout << desc << std::endl;
     return 0;
   }
 
-  if(vm.count(kSortOpt)) {
+  if (vm.count(kSortOpt)) {
     HistoryNode::sort_ = true;
   }
 
   bool showDependencies = false;
-  if(vm.count(kDependenciesOpt)) {
+  if (vm.count(kDependenciesOpt)) {
     showDependencies = true;
   }
 
   bool extendedAncestors = false;
-  if(vm.count(kExtendedAncestorsOpt)) {
+  if (vm.count(kExtendedAncestorsOpt)) {
     extendedAncestors = true;
   }
 
   bool extendedDescendants = false;
-  if(vm.count(kExtendedDescendantsOpt)) {
+  if (vm.count(kExtendedDescendantsOpt)) {
     extendedDescendants = true;
   }
 
   bool excludeESModules = false;
-  if(vm.count(kExcludeESModulesOpt)) {
+  if (vm.count(kExcludeESModulesOpt)) {
     excludeESModules = true;
   }
 
   bool showAllModules = false;
-  if(vm.count(kShowAllModulesOpt)) {
+  if (vm.count(kShowAllModulesOpt)) {
     showAllModules = true;
   }
-  
+
   bool showTopLevelPSets = false;
-  if(vm.count(kShowTopLevelPSetsOpt)) {
-    showTopLevelPSets=true;
+  if (vm.count(kShowTopLevelPSetsOpt)) {
+    showTopLevelPSets = true;
   }
 
   std::string fileName;
-  if(vm.count(kFileNameOpt)) {
+  if (vm.count(kFileNameOpt)) {
     try {
       fileName = vm[kFileNameOpt].as<std::string>();
-    } catch(boost::bad_any_cast const& e) {
+    } catch (boost::bad_any_cast const& e) {
       std::cout << e.what() << std::endl;
       return 2;
     }
@@ -1203,51 +1145,56 @@ int main(int argc, char* argv[]) {
   }
 
   std::string dumpPSetID;
-  if(vm.count(kDumpPSetIDOpt)) {
+  if (vm.count(kDumpPSetIDOpt)) {
     try {
       dumpPSetID = vm[kDumpPSetIDOpt].as<std::string>();
-    } catch(boost::bad_any_cast const& e) {
+    } catch (boost::bad_any_cast const& e) {
       std::cout << e.what() << std::endl;
       return 2;
     }
   }
 
   std::vector<std::string> findMatch;
-  if(vm.count(kFindMatchOpt)) {
+  if (vm.count(kFindMatchOpt)) {
     try {
-      findMatch = vm[kFindMatchOpt].as<std::vector<std::string> >();
-    } catch(boost::bad_any_cast const& e) {
+      findMatch = vm[kFindMatchOpt].as<std::vector<std::string>>();
+    } catch (boost::bad_any_cast const& e) {
       std::cout << e.what() << std::endl;
       return 2;
     }
   }
 
   bool dontPrintProducts = false;
-  if(vm.count(kDontPrintProductsOpt)) {
-    dontPrintProducts=true;
+  if (vm.count(kDontPrintProductsOpt)) {
+    dontPrintProducts = true;
   }
 
   //silence ROOT warnings about missing dictionaries
   gErrorIgnoreLevel = kError;
 
-  ProvenanceDumper dumper(fileName, showDependencies, extendedAncestors, extendedDescendants,
-                          excludeESModules, showAllModules, showTopLevelPSets, findMatch, dontPrintProducts, dumpPSetID);
+  ProvenanceDumper dumper(fileName,
+                          showDependencies,
+                          extendedAncestors,
+                          extendedDescendants,
+                          excludeESModules,
+                          showAllModules,
+                          showTopLevelPSets,
+                          findMatch,
+                          dontPrintProducts,
+                          dumpPSetID);
   int exitCode(0);
   try {
     dumper.dump();
     exitCode = dumper.exitCode();
-  }
-  catch (cms::Exception const& x) {
+  } catch (cms::Exception const& x) {
     std::cerr << "cms::Exception caught\n";
     std::cerr << x.what() << '\n';
     exitCode = 2;
-  }
-  catch (std::exception& x) {
+  } catch (std::exception& x) {
     std::cerr << "std::exception caught\n";
     std::cerr << x.what() << '\n';
     exitCode = 3;
-  }
-  catch (...) {
+  } catch (...) {
     std::cerr << "Unknown exception caught\n";
     exitCode = 4;
   }
diff --git a/IOPool/Common/interface/RootServiceChecker.h b/IOPool/Common/interface/RootServiceChecker.h
index 00161c9c8760b..d693ecfcb59fa 100644
--- a/IOPool/Common/interface/RootServiceChecker.h
+++ b/IOPool/Common/interface/RootServiceChecker.h
@@ -5,8 +5,8 @@ namespace edm {
   class RootServiceChecker {
   public:
     RootServiceChecker();
-    ~RootServiceChecker(){}
+    ~RootServiceChecker() {}
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/IOPool/Common/interface/getWrapperBasePtr.h b/IOPool/Common/interface/getWrapperBasePtr.h
index 413b2fcccdecd..6feecca4c05a8 100644
--- a/IOPool/Common/interface/getWrapperBasePtr.h
+++ b/IOPool/Common/interface/getWrapperBasePtr.h
@@ -5,10 +5,9 @@
 #include "FWCore/Utilities/interface/getAnyPtr.h"
 
 namespace edm {
-  inline
-  std::unique_ptr<WrapperBase> getWrapperBasePtr(void* p, int offset) {
+  inline std::unique_ptr<WrapperBase> getWrapperBasePtr(void* p, int offset) {
     return getAnyPtr<WrapperBase>(p, offset);
   }
-}
+}  // namespace edm
 
 #endif
diff --git a/IOPool/Common/src/RootServiceChecker.cc b/IOPool/Common/src/RootServiceChecker.cc
index 1c0583db02fb8..5228a81cbd05e 100644
--- a/IOPool/Common/src/RootServiceChecker.cc
+++ b/IOPool/Common/src/RootServiceChecker.cc
@@ -7,10 +7,9 @@ namespace edm {
   RootServiceChecker::RootServiceChecker() {
     Service<RootHandlers> rootSvc;
     if (!rootSvc.isAvailable()) {
-      throw edm::Exception(errors::Configuration) <<
-	    "The 'InitRootHandlers' service was not specified.\n" <<
-	    "This service must be used if PoolSource or PoolOutputModule is used.\n";
+      throw edm::Exception(errors::Configuration)
+          << "The 'InitRootHandlers' service was not specified.\n"
+          << "This service must be used if PoolSource or PoolOutputModule is used.\n";
     }
   }
-}
-
+}  // namespace edm
diff --git a/IOPool/Input/src/DuplicateChecker.cc b/IOPool/Input/src/DuplicateChecker.cc
index 268e3b2757b29..a8359454fa9a2 100644
--- a/IOPool/Input/src/DuplicateChecker.cc
+++ b/IOPool/Input/src/DuplicateChecker.cc
@@ -10,11 +10,8 @@
 
 namespace edm {
 
-  DuplicateChecker::DuplicateChecker(ParameterSet const& pset) :
-    dataType_(unknown),
-    itIsKnownTheFileHasNoDuplicates_(false),
-    disabled_(false)
-  {
+  DuplicateChecker::DuplicateChecker(ParameterSet const& pset)
+      : dataType_(unknown), itIsKnownTheFileHasNoDuplicates_(false), disabled_(false) {
     // The default value provided as the second argument to the getUntrackedParameter function call
     // is not used when the ParameterSet has been validated and the parameters are not optional
     // in the description.  This is currently true when PoolSource is the primary input source.
@@ -23,17 +20,21 @@ namespace edm {
     // have defined descriptions, the defaults in the getUntrackedParameterSet function calls can
     // and should be deleted from the code.
     std::string duplicateCheckMode =
-      pset.getUntrackedParameter<std::string>("duplicateCheckMode", std::string("checkAllFilesOpened"));
-
-    if (duplicateCheckMode == std::string("noDuplicateCheck")) duplicateCheckMode_ = noDuplicateCheck;
-    else if (duplicateCheckMode == std::string("checkEachFile")) duplicateCheckMode_ = checkEachFile;
-    else if (duplicateCheckMode == std::string("checkEachRealDataFile")) duplicateCheckMode_ = checkEachRealDataFile;
-    else if (duplicateCheckMode == std::string("checkAllFilesOpened")) duplicateCheckMode_ = checkAllFilesOpened;
+        pset.getUntrackedParameter<std::string>("duplicateCheckMode", std::string("checkAllFilesOpened"));
+
+    if (duplicateCheckMode == std::string("noDuplicateCheck"))
+      duplicateCheckMode_ = noDuplicateCheck;
+    else if (duplicateCheckMode == std::string("checkEachFile"))
+      duplicateCheckMode_ = checkEachFile;
+    else if (duplicateCheckMode == std::string("checkEachRealDataFile"))
+      duplicateCheckMode_ = checkEachRealDataFile;
+    else if (duplicateCheckMode == std::string("checkAllFilesOpened"))
+      duplicateCheckMode_ = checkAllFilesOpened;
     else {
       throw cms::Exception("Configuration")
-        << "Illegal configuration parameter value passed to PoolSource for\n"
-        << "the \"duplicateCheckMode\" parameter, legal values are:\n"
-        << "\"noDuplicateCheck\", \"checkEachFile\", \"checkEachRealDataFile\", \"checkAllFilesOpened\"\n";
+          << "Illegal configuration parameter value passed to PoolSource for\n"
+          << "the \"duplicateCheckMode\" parameter, legal values are:\n"
+          << "\"noDuplicateCheck\", \"checkEachFile\", \"checkEachRealDataFile\", \"checkAllFilesOpened\"\n";
     }
   }
 
@@ -44,85 +45,74 @@ namespace edm {
     itIsKnownTheFileHasNoDuplicates_ = false;
   }
 
-  void DuplicateChecker::inputFileOpened(
-      bool realData,
-      IndexIntoFile const& indexIntoFile,
-      std::vector<std::shared_ptr<IndexIntoFile> > const& indexesIntoFiles,
-      std::vector<std::shared_ptr<IndexIntoFile> >::size_type currentIndexIntoFile) {
-
+  void DuplicateChecker::inputFileOpened(bool realData,
+                                         IndexIntoFile const& indexIntoFile,
+                                         std::vector<std::shared_ptr<IndexIntoFile> > const& indexesIntoFiles,
+                                         std::vector<std::shared_ptr<IndexIntoFile> >::size_type currentIndexIntoFile) {
     dataType_ = realData ? isRealData : isSimulation;
-    if (checkDisabled()) return;
+    if (checkDisabled())
+      return;
 
     relevantPreviousEvents_.clear();
     itIsKnownTheFileHasNoDuplicates_ = false;
 
     if (duplicateCheckMode_ == checkAllFilesOpened) {
-
       // Compares the current IndexIntoFile to all the previous ones and saves any duplicates.
       // One unintended thing, it also saves the duplicate runs and lumis.
-      for(std::vector<std::shared_ptr<IndexIntoFile> >::size_type i = 0; i < currentIndexIntoFile; ++i) {
+      for (std::vector<std::shared_ptr<IndexIntoFile> >::size_type i = 0; i < currentIndexIntoFile; ++i) {
         if (indexesIntoFiles[i].get() != nullptr) {
-
           indexIntoFile.set_intersection(*indexesIntoFiles[i], relevantPreviousEvents_);
         }
       }
     }
     if (relevantPreviousEvents_.empty()) {
-      if(!indexIntoFile.containsDuplicateEvents()) {
+      if (!indexIntoFile.containsDuplicateEvents()) {
         itIsKnownTheFileHasNoDuplicates_ = true;
       }
     }
   }
 
-  void DuplicateChecker::inputFileClosed()
-  {
+  void DuplicateChecker::inputFileClosed() {
     dataType_ = unknown;
     relevantPreviousEvents_.clear();
     itIsKnownTheFileHasNoDuplicates_ = false;
   }
 
-  bool DuplicateChecker::isDuplicateAndCheckActive(int index,
-                                                   RunNumber_t run,
-                                                   LuminosityBlockNumber_t lumi,
-                                                   EventNumber_t event,
-                                                   std::string const& fileName) {
-    if (itIsKnownTheFileHasNoDuplicates_) return false;
-    if (checkDisabled()) return false;
+  bool DuplicateChecker::isDuplicateAndCheckActive(
+      int index, RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event, std::string const& fileName) {
+    if (itIsKnownTheFileHasNoDuplicates_)
+      return false;
+    if (checkDisabled())
+      return false;
 
     IndexIntoFile::IndexRunLumiEventKey newEvent(index, run, lumi, event);
     bool duplicate = !relevantPreviousEvents_.insert(newEvent).second;
 
     if (duplicate) {
       if (duplicateCheckMode_ == checkAllFilesOpened) {
-        LogWarning("DuplicateEvent")
-          << "Duplicate Events found in entire set of input files.\n"
-          << "Both events were from run " << run 
-          << " and luminosity block " << lumi
-          << " with event number " << event << ".\n"
-          << "The duplicate was from file " << fileName << ".\n"
-          << "The duplicate will be skipped.\n";
-      }
-      else {
-        LogWarning("DuplicateEvent")
-          << "Duplicate Events found in file " << fileName << ".\n"
-          << "Both events were from run " << run
-          << " and luminosity block " << lumi
-          << " with event number " << event << ".\n"
-          << "The duplicate will be skipped.\n";
+        LogWarning("DuplicateEvent") << "Duplicate Events found in entire set of input files.\n"
+                                     << "Both events were from run " << run << " and luminosity block " << lumi
+                                     << " with event number " << event << ".\n"
+                                     << "The duplicate was from file " << fileName << ".\n"
+                                     << "The duplicate will be skipped.\n";
+      } else {
+        LogWarning("DuplicateEvent") << "Duplicate Events found in file " << fileName << ".\n"
+                                     << "Both events were from run " << run << " and luminosity block " << lumi
+                                     << " with event number " << event << ".\n"
+                                     << "The duplicate will be skipped.\n";
       }
       return true;
     }
     return false;
   }
 
-  void
-  DuplicateChecker::fillDescription(ParameterSetDescription & desc) {
+  void DuplicateChecker::fillDescription(ParameterSetDescription& desc) {
     std::string defaultString("checkAllFilesOpened");
-    desc.addUntracked<std::string>("duplicateCheckMode", defaultString)->setComment(
-        "'checkAllFilesOpened':   check across all input files\n"
-        "'checkEachFile':         check each input file independently\n"
-        "'checkEachRealDataFile': check each real data input file independently\n"
-        "'noDuplicateCheck':      no duplicate checking\n"
-    );
+    desc.addUntracked<std::string>("duplicateCheckMode", defaultString)
+        ->setComment(
+            "'checkAllFilesOpened':   check across all input files\n"
+            "'checkEachFile':         check each input file independently\n"
+            "'checkEachRealDataFile': check each real data input file independently\n"
+            "'noDuplicateCheck':      no duplicate checking\n");
   }
-}
+}  // namespace edm
diff --git a/IOPool/Input/src/DuplicateChecker.h b/IOPool/Input/src/DuplicateChecker.h
index 0d73db8985280..de3122244b1c9 100644
--- a/IOPool/Input/src/DuplicateChecker.h
+++ b/IOPool/Input/src/DuplicateChecker.h
@@ -1,7 +1,6 @@
 #ifndef DataFormats_Provenance_DuplicateChecker_h
 #define DataFormats_Provenance_DuplicateChecker_h
 
-
 /*----------------------------------------------------------------------
 
 IOPool/Input/src/DuplicateChecker.h
@@ -23,7 +22,6 @@ files or does not check for duplicates at all.
 #include <string>
 #include <vector>
 
-
 namespace edm {
 
   class ParameterSet;
@@ -31,16 +29,14 @@ namespace edm {
 
   class DuplicateChecker {
   public:
-
     DuplicateChecker(ParameterSet const& pset);
 
     void disable();
 
-    void inputFileOpened(
-      bool realData,
-      IndexIntoFile const& indexIntoFile,
-      std::vector<std::shared_ptr<IndexIntoFile> > const& indexesIntoFiles,
-      std::vector<std::shared_ptr<IndexIntoFile> >::size_type currentIndexIntoFile);
+    void inputFileOpened(bool realData,
+                         IndexIntoFile const& indexIntoFile,
+                         std::vector<std::shared_ptr<IndexIntoFile> > const& indexesIntoFiles,
+                         std::vector<std::shared_ptr<IndexIntoFile> >::size_type currentIndexIntoFile);
 
     void inputFileClosed();
 
@@ -48,24 +44,19 @@ namespace edm {
 
     bool checkDisabled() const {
       return duplicateCheckMode_ == noDuplicateCheck ||
-	(duplicateCheckMode_ == checkEachRealDataFile && dataType_ == isSimulation) ||
-        disabled_;
+             (duplicateCheckMode_ == checkEachRealDataFile && dataType_ == isSimulation) || disabled_;
     }
 
     // Note that all references to the ProcessHistoryID in this class are to
     // the "reduced" process history, including the index argument to this function.
-    bool isDuplicateAndCheckActive(int index,
-                                   RunNumber_t run,
-                                   LuminosityBlockNumber_t lumi,
-                                   EventNumber_t event,
-                                   std::string const& fileName);
+    bool isDuplicateAndCheckActive(
+        int index, RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event, std::string const& fileName);
 
-    bool checkingAllFiles() const {return checkAllFilesOpened == duplicateCheckMode_;} 
+    bool checkingAllFiles() const { return checkAllFilesOpened == duplicateCheckMode_; }
 
-    static void fillDescription(ParameterSetDescription & desc);
+    static void fillDescription(ParameterSetDescription& desc);
 
   private:
-
     enum DuplicateCheckMode { noDuplicateCheck, checkEachFile, checkEachRealDataFile, checkAllFilesOpened };
 
     DuplicateCheckMode duplicateCheckMode_;
@@ -85,5 +76,5 @@ namespace edm {
 
     bool disabled_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/IOPool/Input/src/EmbeddedRootSource.cc b/IOPool/Input/src/EmbeddedRootSource.cc
index 8ae14b707c22a..bc9bf251666f1 100644
--- a/IOPool/Input/src/EmbeddedRootSource.cc
+++ b/IOPool/Input/src/EmbeddedRootSource.cc
@@ -13,62 +13,59 @@ namespace edm {
   class EventID;
   class EventPrincipal;
 
-  EmbeddedRootSource::EmbeddedRootSource(ParameterSet const& pset, VectorInputSourceDescription const& desc) :
-    VectorInputSource(pset, desc),
-    rootServiceChecker_(),
-    nStreams_(desc.allocations_->numberOfStreams()),
-    // The default value provided as the second argument to the getUntrackedParameter function call
-    // is not used when the ParameterSet has been validated and the parameters are not optional
-    // in the description.  This is currently true when PoolSource is the primary input source.
-    // The modules that use PoolSource as a SecSource have not defined their fillDescriptions function
-    // yet, so the ParameterSet does not get validated yet.  As soon as all the modules with a SecSource
-    // have defined descriptions, the defaults in the getUntrackedParameterSet function calls can
-    // and should be deleted from the code.
-    //
-    skipBadFiles_(pset.getUntrackedParameter<bool>("skipBadFiles", false)),
-    bypassVersionCheck_(pset.getUntrackedParameter<bool>("bypassVersionCheck", false)),
-    treeMaxVirtualSize_(pset.getUntrackedParameter<int>("treeMaxVirtualSize", -1)),
-    productSelectorRules_(pset, "inputCommands", "InputSource"),
-    runHelper_(new DefaultRunHelper()),
-    catalog_(pset.getUntrackedParameter<std::vector<std::string> >("fileNames"),
-      pset.getUntrackedParameter<std::string>("overrideCatalog", std::string())),
-    // Note: fileSequence_ needs to be initialized last, because it uses data members 
-    // initialized previously in its own initialization.
-    fileSequence_(new RootEmbeddedFileSequence(pset, *this, catalog_)) {
-  }
+  EmbeddedRootSource::EmbeddedRootSource(ParameterSet const& pset, VectorInputSourceDescription const& desc)
+      : VectorInputSource(pset, desc),
+        rootServiceChecker_(),
+        nStreams_(desc.allocations_->numberOfStreams()),
+        // The default value provided as the second argument to the getUntrackedParameter function call
+        // is not used when the ParameterSet has been validated and the parameters are not optional
+        // in the description.  This is currently true when PoolSource is the primary input source.
+        // The modules that use PoolSource as a SecSource have not defined their fillDescriptions function
+        // yet, so the ParameterSet does not get validated yet.  As soon as all the modules with a SecSource
+        // have defined descriptions, the defaults in the getUntrackedParameterSet function calls can
+        // and should be deleted from the code.
+        //
+        skipBadFiles_(pset.getUntrackedParameter<bool>("skipBadFiles", false)),
+        bypassVersionCheck_(pset.getUntrackedParameter<bool>("bypassVersionCheck", false)),
+        treeMaxVirtualSize_(pset.getUntrackedParameter<int>("treeMaxVirtualSize", -1)),
+        productSelectorRules_(pset, "inputCommands", "InputSource"),
+        runHelper_(new DefaultRunHelper()),
+        catalog_(pset.getUntrackedParameter<std::vector<std::string> >("fileNames"),
+                 pset.getUntrackedParameter<std::string>("overrideCatalog", std::string())),
+        // Note: fileSequence_ needs to be initialized last, because it uses data members
+        // initialized previously in its own initialization.
+        fileSequence_(new RootEmbeddedFileSequence(pset, *this, catalog_)) {}
 
   EmbeddedRootSource::~EmbeddedRootSource() {}
 
-  void
-  EmbeddedRootSource::beginJob() {
-  }
+  void EmbeddedRootSource::beginJob() {}
 
-  void
-  EmbeddedRootSource::endJob() {
+  void EmbeddedRootSource::endJob() {
     fileSequence_->endJob();
     InputFile::reportReadBranches();
   }
 
-  void EmbeddedRootSource::closeFile_() {
-    fileSequence_->closeFile_();
-  }
+  void EmbeddedRootSource::closeFile_() { fileSequence_->closeFile_(); }
 
-  bool
-  EmbeddedRootSource::readOneEvent(EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine* engine, EventID const* id, bool recycleFiles) {
+  bool EmbeddedRootSource::readOneEvent(EventPrincipal& cache,
+                                        size_t& fileNameHash,
+                                        CLHEP::HepRandomEngine* engine,
+                                        EventID const* id,
+                                        bool recycleFiles) {
     return fileSequence_->readOneEvent(cache, fileNameHash, engine, id, recycleFiles);
   }
 
-  void
-  EmbeddedRootSource::readOneSpecified(EventPrincipal& cache, size_t& fileNameHash, SecondaryEventIDAndFileInfo const& id) {
+  void EmbeddedRootSource::readOneSpecified(EventPrincipal& cache,
+                                            size_t& fileNameHash,
+                                            SecondaryEventIDAndFileInfo const& id) {
     fileSequence_->readOneSpecified(cache, fileNameHash, id);
   }
 
-  void
-  EmbeddedRootSource::dropUnwantedBranches_(std::vector<std::string> const& wantedBranches) {
+  void EmbeddedRootSource::dropUnwantedBranches_(std::vector<std::string> const& wantedBranches) {
     std::vector<std::string> rules;
     rules.reserve(wantedBranches.size() + 1);
     rules.emplace_back("drop *");
-    for(std::string const& branch : wantedBranches) {
+    for (std::string const& branch : wantedBranches) {
       rules.push_back("keep " + branch + "_*");
     }
     ParameterSet pset;
@@ -76,22 +73,21 @@ namespace edm {
     productSelectorRules_ = ProductSelectorRules(pset, "inputCommands", "InputSource");
   }
 
-  void
-  EmbeddedRootSource::fillDescriptions(ConfigurationDescriptions& descriptions) {
-
+  void EmbeddedRootSource::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
 
     std::vector<std::string> defaultStrings;
     desc.setComment("Reads EDM/Root files for mixing.");
-    desc.addUntracked<std::vector<std::string> >("fileNames")
-        ->setComment("Names of files to be processed.");
+    desc.addUntracked<std::vector<std::string> >("fileNames")->setComment("Names of files to be processed.");
     desc.addUntracked<std::string>("overrideCatalog", std::string());
     desc.addUntracked<bool>("skipBadFiles", false)
-        ->setComment("True:  Ignore any missing or unopenable input file.\n"
-                     "False: Throw exception if missing or unopenable input file.");
+        ->setComment(
+            "True:  Ignore any missing or unopenable input file.\n"
+            "False: Throw exception if missing or unopenable input file.");
     desc.addUntracked<bool>("bypassVersionCheck", false)
-        ->setComment("True:  Bypass release version check.\n"
-                     "False: Throw exception if reading file in a release prior to the release in which the file was written.");
+        ->setComment(
+            "True:  Bypass release version check.\n"
+            "False: Throw exception if reading file in a release prior to the release in which the file was written.");
     desc.addUntracked<int>("treeMaxVirtualSize", -1)
         ->setComment("Size of ROOT TTree TBasket cache.  Affects performance.");
 
@@ -100,4 +96,4 @@ namespace edm {
 
     descriptions.add("source", desc);
   }
-}
+}  // namespace edm
diff --git a/IOPool/Input/src/EmbeddedRootSource.h b/IOPool/Input/src/EmbeddedRootSource.h
index 49db99a07a5d3..6456cf9fd701e 100644
--- a/IOPool/Input/src/EmbeddedRootSource.h
+++ b/IOPool/Input/src/EmbeddedRootSource.h
@@ -39,20 +39,24 @@ namespace edm {
     using VectorInputSource::productRegistryUpdate;
 
     // const accessors
-    bool skipBadFiles() const {return skipBadFiles_;}
-    bool bypassVersionCheck() const {return bypassVersionCheck_;}
-    unsigned int nStreams() const {return nStreams_;}
-    int treeMaxVirtualSize() const {return treeMaxVirtualSize_;}
-    ProductSelectorRules const& productSelectorRules() const {return productSelectorRules_;}
-    RunHelperBase* runHelper() {return runHelper_.get();}
+    bool skipBadFiles() const { return skipBadFiles_; }
+    bool bypassVersionCheck() const { return bypassVersionCheck_; }
+    unsigned int nStreams() const { return nStreams_; }
+    int treeMaxVirtualSize() const { return treeMaxVirtualSize_; }
+    ProductSelectorRules const& productSelectorRules() const { return productSelectorRules_; }
+    RunHelperBase* runHelper() { return runHelper_.get(); }
 
-    static void fillDescriptions(ConfigurationDescriptions & descriptions);
+    static void fillDescriptions(ConfigurationDescriptions& descriptions);
 
   private:
     virtual void closeFile_();
     void beginJob() override;
     void endJob() override;
-    bool readOneEvent(EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine*, EventID const* id, bool recycleFiles) override;
+    bool readOneEvent(EventPrincipal& cache,
+                      size_t& fileNameHash,
+                      CLHEP::HepRandomEngine*,
+                      EventID const* id,
+                      bool recycleFiles) override;
     void readOneSpecified(EventPrincipal& cache, size_t& fileNameHash, SecondaryEventIDAndFileInfo const& id) override;
     void dropUnwantedBranches_(std::vector<std::string> const& wantedBranches) override;
 
@@ -68,6 +72,6 @@ namespace edm {
     InputFileCatalog catalog_;
     edm::propagate_const<std::unique_ptr<RootEmbeddedFileSequence>> fileSequence_;
 
-  }; // class EmbeddedRootSource
-}
+  };  // class EmbeddedRootSource
+}  // namespace edm
 #endif
diff --git a/IOPool/Input/src/InputFile.cc b/IOPool/Input/src/InputFile.cc
index d109c5bc874d2..016bb44c6a9b6 100644
--- a/IOPool/Input/src/InputFile.cc
+++ b/IOPool/Input/src/InputFile.cc
@@ -15,9 +15,8 @@ Holder for an input TFile.
 #include <iomanip>
 
 namespace edm {
-  InputFile::InputFile(char const* fileName, char const* msg, InputType inputType) :
-    file_(), fileName_(fileName), reportToken_(0), inputType_(inputType) {
-
+  InputFile::InputFile(char const* fileName, char const* msg, InputType inputType)
+      : file_(), fileName_(fileName), reportToken_(0), inputType_(inputType) {
     logFileAction(msg, fileName);
     {
       // ROOT's context management implicitly assumes that a file is opened and
@@ -27,106 +26,90 @@ namespace edm {
       // it was registered in.  Fixes issue #15524.
       TDirectory::TContext contextEraser;
 
-      file_ = std::unique_ptr<TFile>(TFile::Open(fileName)); // propagate_const<T> has no reset() function
+      file_ = std::unique_ptr<TFile>(TFile::Open(fileName));  // propagate_const<T> has no reset() function
     }
     std::exception_ptr e = edm::threadLocalException::getException();
-    if(e != std::exception_ptr()) {
+    if (e != std::exception_ptr()) {
       edm::threadLocalException::setException(std::exception_ptr());
       std::rethrow_exception(e);
     }
-    if(!file_) {
+    if (!file_) {
       return;
     }
-    if(file_->IsZombie()) {
-      file_ = nullptr; // propagate_const<T> has no reset() function
+    if (file_->IsZombie()) {
+      file_ = nullptr;  // propagate_const<T> has no reset() function
       return;
     }
-    
+
     logFileAction("  Successfully opened file ", fileName);
   }
 
-  InputFile::~InputFile() {
-    Close();
-  }
+  InputFile::~InputFile() { Close(); }
 
-  void
-  InputFile::inputFileOpened(std::string const& logicalFileName,
-                             std::string const& inputType,
-                             std::string const& moduleName,
-                             std::string const& label,
-                             std::string const& fid,
-                             std::vector<std::string> const& branchNames) {
+  void InputFile::inputFileOpened(std::string const& logicalFileName,
+                                  std::string const& inputType,
+                                  std::string const& moduleName,
+                                  std::string const& label,
+                                  std::string const& fid,
+                                  std::vector<std::string> const& branchNames) {
     Service<JobReport> reportSvc;
-    reportToken_ = reportSvc->inputFileOpened(fileName_,
-                                              logicalFileName,
-                                              std::string(),
-                                              inputType,
-                                              moduleName,
-                                              label,
-                                              fid,
-                                              branchNames);
+    reportToken_ = reportSvc->inputFileOpened(
+        fileName_, logicalFileName, std::string(), inputType, moduleName, label, fid, branchNames);
   }
 
-  void
-  InputFile::eventReadFromFile() const {
+  void InputFile::eventReadFromFile() const {
     Service<JobReport> reportSvc;
     reportSvc->eventReadFromFile(inputType_, reportToken_);
   }
 
-  void
-  InputFile::reportInputRunNumber(unsigned int run) const {
+  void InputFile::reportInputRunNumber(unsigned int run) const {
     Service<JobReport> reportSvc;
     reportSvc->reportInputRunNumber(run);
   }
 
-  void
-  InputFile::reportInputLumiSection(unsigned int run, unsigned int lumi) const {
+  void InputFile::reportInputLumiSection(unsigned int run, unsigned int lumi) const {
     Service<JobReport> reportSvc;
     reportSvc->reportInputLumiSection(run, lumi);
   }
 
-  void
-  InputFile::reportSkippedFile(std::string const& fileName, std::string const& logicalFileName) {
+  void InputFile::reportSkippedFile(std::string const& fileName, std::string const& logicalFileName) {
     Service<JobReport> reportSvc;
     reportSvc->reportSkippedFile(fileName, logicalFileName);
   }
 
-  void
-  InputFile::reportFallbackAttempt(std::string const& pfn, std::string const& logicalFileName, std::string const& errorMessage) {
+  void InputFile::reportFallbackAttempt(std::string const& pfn,
+                                        std::string const& logicalFileName,
+                                        std::string const& errorMessage) {
     Service<JobReport> reportSvc;
     reportSvc->reportFallbackAttempt(pfn, logicalFileName, errorMessage);
   }
 
-  void
-  InputFile::Close() {
-    if(file_->IsOpen()) {
+  void InputFile::Close() {
+    if (file_->IsOpen()) {
       file_->Close();
       try {
         logFileAction("  Closed file ", fileName_.c_str());
         Service<JobReport> reportSvc;
         reportSvc->inputFileClosed(inputType_, reportToken_);
-      } catch(std::exception const&) {
+      } catch (std::exception const&) {
         // If Close() called in a destructor after an exception throw, the services may no longer be active.
         // Therefore, we catch any reasonable new exception.
       }
     }
   }
 
-  void
-  InputFile::logFileAction(char const* msg, char const* fileName) const {
+  void InputFile::logFileAction(char const* msg, char const* fileName) const {
     LogAbsolute("fileAction") << std::setprecision(0) << TimeOfDay() << msg << fileName;
     FlushMessageLog();
   }
 
-  void
-  InputFile::reportReadBranches() {
+  void InputFile::reportReadBranches() {
     Service<JobReport> reportSvc;
     reportSvc->reportReadBranches();
   }
 
-  void
-  InputFile::reportReadBranch(InputType inputType, std::string const& branchName) {
+  void InputFile::reportReadBranch(InputType inputType, std::string const& branchName) {
     Service<JobReport> reportSvc;
     reportSvc->reportReadBranch(inputType, branchName);
   }
-}
+}  // namespace edm
diff --git a/IOPool/Input/src/InputFile.h b/IOPool/Input/src/InputFile.h
index 0d92c4614c7fc..3a1edbc56b072 100644
--- a/IOPool/Input/src/InputFile.h
+++ b/IOPool/Input/src/InputFile.h
@@ -19,12 +19,12 @@ class TObject;
 
 namespace edm {
   class InputFile {
-  public:  
+  public:
     explicit InputFile(char const* fileName, char const* msg, InputType inputType);
     ~InputFile();
 
-    InputFile(InputFile const&) = delete; // Disallow copying and moving
-    InputFile& operator=(InputFile const&) = delete; // Disallow copying and moving
+    InputFile(InputFile const&) = delete;             // Disallow copying and moving
+    InputFile& operator=(InputFile const&) = delete;  // Disallow copying and moving
 
     void Close();
     void inputFileOpened(std::string const& logicalFileName,
@@ -32,26 +32,29 @@ namespace edm {
                          std::string const& moduleName,
                          std::string const& label,
                          std::string const& fid,
-                         std::vector<std::string> const& branchNames);    
+                         std::vector<std::string> const& branchNames);
     void eventReadFromFile() const;
     void reportInputRunNumber(unsigned int run) const;
     void reportInputLumiSection(unsigned int run, unsigned int lumi) const;
     static void reportSkippedFile(std::string const& fileName, std::string const& logicalFileName);
-    static void reportFallbackAttempt(std::string const& pfn, std::string const& logicalFileName, std::string const& errorMessage);
+    static void reportFallbackAttempt(std::string const& pfn,
+                                      std::string const& logicalFileName,
+                                      std::string const& errorMessage);
     // reportReadBranches is a per job report, rather than per file report.
     // Nevertheless, it is defined here for convenience.
     static void reportReadBranches();
     static void reportReadBranch(InputType inputType, std::string const& branchname);
 
-    TObject* Get(char const* name) {return file_->Get(name);}
-    TFileCacheRead* GetCacheRead() const {return file_->GetCacheRead();}
-    void SetCacheRead(TFileCacheRead* tfcr) {file_->SetCacheRead(tfcr, nullptr, TFile::kDoNotDisconnect);}
+    TObject* Get(char const* name) { return file_->Get(name); }
+    TFileCacheRead* GetCacheRead() const { return file_->GetCacheRead(); }
+    void SetCacheRead(TFileCacheRead* tfcr) { file_->SetCacheRead(tfcr, nullptr, TFile::kDoNotDisconnect); }
     void logFileAction(char const* msg, char const* fileName) const;
+
   private:
     edm::propagate_const<std::unique_ptr<TFile>> file_;
     std::string fileName_;
     JobReport::Token reportToken_;
     InputType inputType_;
-  }; 
-}
+  };
+}  // namespace edm
 #endif
diff --git a/IOPool/Input/src/Module.cc b/IOPool/Input/src/Module.cc
index a3418f6f43572..c4a7c3c004626 100644
--- a/IOPool/Input/src/Module.cc
+++ b/IOPool/Input/src/Module.cc
@@ -3,7 +3,7 @@
 #include "PoolSource.h"
 #include "EmbeddedRootSource.h"
 
-using edm::PoolSource;
 using edm::EmbeddedRootSource;
+using edm::PoolSource;
 DEFINE_FWK_INPUT_SOURCE(PoolSource);
 DEFINE_FWK_VECTOR_INPUT_SOURCE(EmbeddedRootSource);
diff --git a/IOPool/Input/src/OneLumiPoolSource.cc b/IOPool/Input/src/OneLumiPoolSource.cc
index 1222c4940781a..77512503cfbde 100644
--- a/IOPool/Input/src/OneLumiPoolSource.cc
+++ b/IOPool/Input/src/OneLumiPoolSource.cc
@@ -9,30 +9,27 @@
 #include "FWCore/Framework/interface/HistoryAppender.h"
 
 namespace edm {
-  
+
   class OneLumiPoolSource : public PoolSource {
   public:
     explicit OneLumiPoolSource(ParameterSet const& pset, InputSourceDescription const& desc);
-    
+
   private:
     ItemType getNextItemType() override;
     std::shared_ptr<LuminosityBlockAuxiliary> readLuminosityBlockAuxiliary_() override;
 
     void readEvent_(EventPrincipal& eventPrincipal) override {
       PoolSource::readEvent_(eventPrincipal);
-      eventPrincipal.setRunAndLumiNumber(eventPrincipal.run(),1);
+      eventPrincipal.setRunAndLumiNumber(eventPrincipal.run(), 1);
     }
 
     bool seenFirstLumi_ = false;
   };
 
-  OneLumiPoolSource::OneLumiPoolSource(ParameterSet const& pset, InputSourceDescription const& desc) :
-    PoolSource(pset, desc)
-  {
-  }
+  OneLumiPoolSource::OneLumiPoolSource(ParameterSet const& pset, InputSourceDescription const& desc)
+      : PoolSource(pset, desc) {}
 
-  std::shared_ptr<LuminosityBlockAuxiliary>
-  OneLumiPoolSource::readLuminosityBlockAuxiliary_() {
+  std::shared_ptr<LuminosityBlockAuxiliary> OneLumiPoolSource::readLuminosityBlockAuxiliary_() {
     auto ret = PoolSource::readLuminosityBlockAuxiliary_();
     auto hist = ret->processHistoryID();
     *ret = LuminosityBlockAuxiliary(ret->run(), 1, ret->beginTime(), ret->endTime());
@@ -40,29 +37,27 @@ namespace edm {
     return ret;
   }
 
-  InputSource::ItemType
-  OneLumiPoolSource::getNextItemType() {
+  InputSource::ItemType OneLumiPoolSource::getNextItemType() {
     auto type = PoolSource::getNextItemType();
-    if(type==IsLumi) {
-      if(seenFirstLumi_) {
+    if (type == IsLumi) {
+      if (seenFirstLumi_) {
         do {
           edm::HistoryAppender historyAppender;
           auto prodReg = std::make_shared<edm::ProductRegistry>();
           prodReg->setFrozen();
           edm::ProcessConfiguration procConfig;
 
-          LuminosityBlockPrincipal temp(prodReg, procConfig, &historyAppender,0);
+          LuminosityBlockPrincipal temp(prodReg, procConfig, &historyAppender, 0);
           readLuminosityBlock_(temp);
-          type =PoolSource::getNextItemType();
-        } while(type == IsLumi);
+          type = PoolSource::getNextItemType();
+        } while (type == IsLumi);
       } else {
         seenFirstLumi_ = true;
       }
     }
     return type;
   }
-}
+}  // namespace edm
 using namespace edm;
 
 DEFINE_FWK_INPUT_SOURCE(OneLumiPoolSource);
-
diff --git a/IOPool/Input/src/PoolSource.cc b/IOPool/Input/src/PoolSource.cc
index 1f7863408c970..db20150593168 100644
--- a/IOPool/Input/src/PoolSource.cc
+++ b/IOPool/Input/src/PoolSource.cc
@@ -37,58 +37,58 @@ namespace edm {
     void checkHistoryConsistency(Principal const& primary, Principal const& secondary) {
       ProcessHistory const& ph1 = primary.processHistory();
       ProcessHistory const& ph2 = secondary.processHistory();
-      if(ph1 != ph2 && !isAncestor(ph2, ph1)) {
-        throw Exception(errors::MismatchedInputFiles, "PoolSource::checkConsistency") <<
-          "The secondary file is not an ancestor of the primary file\n";
+      if (ph1 != ph2 && !isAncestor(ph2, ph1)) {
+        throw Exception(errors::MismatchedInputFiles, "PoolSource::checkConsistency")
+            << "The secondary file is not an ancestor of the primary file\n";
       }
     }
     void checkConsistency(EventPrincipal const& primary, EventPrincipal const& secondary) {
-      if(!isSameEvent(primary, secondary)) {
-        throw Exception(errors::MismatchedInputFiles, "PoolSource::checkConsistency") <<
-          primary.id() << " has inconsistent EventAuxiliary data in the primary and secondary file\n";
+      if (!isSameEvent(primary, secondary)) {
+        throw Exception(errors::MismatchedInputFiles, "PoolSource::checkConsistency")
+            << primary.id() << " has inconsistent EventAuxiliary data in the primary and secondary file\n";
       }
     }
     void checkConsistency(LuminosityBlockAuxiliary const& primary, LuminosityBlockAuxiliary const& secondary) {
-      if(primary.id() != secondary.id()) {
-        throw Exception(errors::MismatchedInputFiles, "PoolSource::checkConsistency") <<
-          primary.id() << " has inconsistent LuminosityBlockAuxiliary data in the primary and secondary file\n";
+      if (primary.id() != secondary.id()) {
+        throw Exception(errors::MismatchedInputFiles, "PoolSource::checkConsistency")
+            << primary.id() << " has inconsistent LuminosityBlockAuxiliary data in the primary and secondary file\n";
       }
     }
     void checkConsistency(RunAuxiliary const& primary, RunAuxiliary const& secondary) {
-      if(primary.id() != secondary.id()) {
-        throw Exception(errors::MismatchedInputFiles, "PoolSource::checkConsistency") <<
-          primary.id() << " has inconsistent RunAuxiliary data in the primary and secondary file\n";
+      if (primary.id() != secondary.id()) {
+        throw Exception(errors::MismatchedInputFiles, "PoolSource::checkConsistency")
+            << primary.id() << " has inconsistent RunAuxiliary data in the primary and secondary file\n";
       }
     }
-  }
+  }  // namespace
 
-  PoolSource::PoolSource(ParameterSet const& pset, InputSourceDescription const& desc) :
-    InputSource(pset, desc),
-    rootServiceChecker_(),
-    catalog_(pset.getUntrackedParameter<std::vector<std::string> >("fileNames"),
-      pset.getUntrackedParameter<std::string>("overrideCatalog", std::string())),
-    secondaryCatalog_(pset.getUntrackedParameter<std::vector<std::string> >("secondaryFileNames", std::vector<std::string>()),
-      pset.getUntrackedParameter<std::string>("overrideCatalog", std::string())),
-    secondaryRunPrincipal_(),
-    secondaryLumiPrincipal_(),
-    secondaryEventPrincipals_(),
-    branchIDsToReplace_(),
-    nStreams_(desc.allocations_->numberOfStreams()),
-    skipBadFiles_(pset.getUntrackedParameter<bool>("skipBadFiles")),
-    bypassVersionCheck_(pset.getUntrackedParameter<bool>("bypassVersionCheck")),
-    treeMaxVirtualSize_(pset.getUntrackedParameter<int>("treeMaxVirtualSize")),
-    productSelectorRules_(pset, "inputCommands", "InputSource"),
-    dropDescendants_(pset.getUntrackedParameter<bool>("dropDescendantsOfDroppedBranches")),
-    labelRawDataLikeMC_(pset.getUntrackedParameter<bool>("labelRawDataLikeMC")),
-    delayReadingEventProducts_(pset.getUntrackedParameter<bool>("delayReadingEventProducts")),
-    runHelper_(makeRunHelper(pset)),
-    resourceSharedWithDelayedReaderPtr_(),
-    // Note: primaryFileSequence_ and secondaryFileSequence_ need to be initialized last, because they use data members
-    // initialized previously in their own initialization.
-    primaryFileSequence_(new RootPrimaryFileSequence(pset, *this, catalog_)),
-    secondaryFileSequence_(secondaryCatalog_.empty() ? nullptr :
-                           new RootSecondaryFileSequence(pset, *this, secondaryCatalog_))
-  {
+  PoolSource::PoolSource(ParameterSet const& pset, InputSourceDescription const& desc)
+      : InputSource(pset, desc),
+        rootServiceChecker_(),
+        catalog_(pset.getUntrackedParameter<std::vector<std::string> >("fileNames"),
+                 pset.getUntrackedParameter<std::string>("overrideCatalog", std::string())),
+        secondaryCatalog_(
+            pset.getUntrackedParameter<std::vector<std::string> >("secondaryFileNames", std::vector<std::string>()),
+            pset.getUntrackedParameter<std::string>("overrideCatalog", std::string())),
+        secondaryRunPrincipal_(),
+        secondaryLumiPrincipal_(),
+        secondaryEventPrincipals_(),
+        branchIDsToReplace_(),
+        nStreams_(desc.allocations_->numberOfStreams()),
+        skipBadFiles_(pset.getUntrackedParameter<bool>("skipBadFiles")),
+        bypassVersionCheck_(pset.getUntrackedParameter<bool>("bypassVersionCheck")),
+        treeMaxVirtualSize_(pset.getUntrackedParameter<int>("treeMaxVirtualSize")),
+        productSelectorRules_(pset, "inputCommands", "InputSource"),
+        dropDescendants_(pset.getUntrackedParameter<bool>("dropDescendantsOfDroppedBranches")),
+        labelRawDataLikeMC_(pset.getUntrackedParameter<bool>("labelRawDataLikeMC")),
+        delayReadingEventProducts_(pset.getUntrackedParameter<bool>("delayReadingEventProducts")),
+        runHelper_(makeRunHelper(pset)),
+        resourceSharedWithDelayedReaderPtr_(),
+        // Note: primaryFileSequence_ and secondaryFileSequence_ need to be initialized last, because they use data members
+        // initialized previously in their own initialization.
+        primaryFileSequence_(new RootPrimaryFileSequence(pset, *this, catalog_)),
+        secondaryFileSequence_(
+            secondaryCatalog_.empty() ? nullptr : new RootSecondaryFileSequence(pset, *this, secondaryCatalog_)) {
     auto resources = SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader();
     resourceSharedWithDelayedReaderPtr_ = std::make_unique<SharedResourcesAcquirer>(std::move(resources.first));
     mutexSharedWithDelayedReader_ = resources.second;
@@ -96,9 +96,9 @@ namespace edm {
     if (secondaryCatalog_.empty() && pset.getUntrackedParameter<bool>("needSecondaryFileNames", false)) {
       throw Exception(errors::Configuration, "PoolSource") << "'secondaryFileNames' must be specified\n";
     }
-    if(secondaryFileSequence_) {
+    if (secondaryFileSequence_) {
       secondaryEventPrincipals_.reserve(nStreams_);
-      for(unsigned int index = 0; index < nStreams_; ++index) {
+      for (unsigned int index = 0; index < nStreams_; ++index) {
         secondaryEventPrincipals_.emplace_back(new EventPrincipal(secondaryFileSequence_->fileProductRegistry(),
                                                                   secondaryFileSequence_->fileBranchIDListHelper(),
                                                                   std::make_shared<ThinnedAssociationsHelper const>(),
@@ -112,32 +112,31 @@ namespace edm {
       std::set<BranchID> associationsFromSecondary;
       //this is the registry used by the 'outside' world and only has the primary file information in it at present
       ProductRegistry::ProductList& fullList = productRegistryUpdate().productListUpdator();
-      for(auto const& item : secondary) {
-        if(item.second.present()) {
+      for (auto const& item : secondary) {
+        if (item.second.present()) {
           idsToReplace[item.second.branchType()].insert(item.second.branchID());
-          if(item.second.branchType() == InEvent &&
-             item.second.unwrappedType() == typeid(ThinnedAssociation)) {
+          if (item.second.branchType() == InEvent && item.second.unwrappedType() == typeid(ThinnedAssociation)) {
             associationsFromSecondary.insert(item.second.branchID());
           }
           //now make sure this is marked as not dropped else the product will not be 'get'table from the Event
           auto itFound = fullList.find(item.first);
-          if(itFound != fullList.end()) {
+          if (itFound != fullList.end()) {
             itFound->second.setDropped(false);
           }
         }
       }
-      for(auto const& item : primary) {
-        if(item.second.present()) {
+      for (auto const& item : primary) {
+        if (item.second.present()) {
           idsToReplace[item.second.branchType()].erase(item.second.branchID());
           associationsFromSecondary.erase(item.second.branchID());
         }
       }
-      if(idsToReplace[InEvent].empty() && idsToReplace[InLumi].empty() && idsToReplace[InRun].empty()) {
-        secondaryFileSequence_ = nullptr; // propagate_const<T> has no reset() function
+      if (idsToReplace[InEvent].empty() && idsToReplace[InLumi].empty() && idsToReplace[InRun].empty()) {
+        secondaryFileSequence_ = nullptr;  // propagate_const<T> has no reset() function
       } else {
-        for(int i = InEvent; i < NumBranchTypes; ++i) {
+        for (int i = InEvent; i < NumBranchTypes; ++i) {
           branchIDsToReplace_[i].reserve(idsToReplace[i].size());
-          for(auto const& id : idsToReplace[i]) {
+          for (auto const& id : idsToReplace[i]) {
             branchIDsToReplace_[i].push_back(id);
           }
         }
@@ -148,94 +147,79 @@ namespace edm {
 
   PoolSource::~PoolSource() {}
 
-  void
-  PoolSource::endJob() {
-    if(secondaryFileSequence_) secondaryFileSequence_->endJob();
+  void PoolSource::endJob() {
+    if (secondaryFileSequence_)
+      secondaryFileSequence_->endJob();
     primaryFileSequence_->endJob();
     InputFile::reportReadBranches();
   }
 
-  std::unique_ptr<FileBlock>
-  PoolSource::readFile_() {
+  std::unique_ptr<FileBlock> PoolSource::readFile_() {
     std::unique_ptr<FileBlock> fb = primaryFileSequence_->readFile_();
-    if(secondaryFileSequence_) {
+    if (secondaryFileSequence_) {
       fb->setNotFastClonable(FileBlock::HasSecondaryFileSequence);
     }
     return fb;
   }
 
-  void PoolSource::closeFile_() {
-    primaryFileSequence_->closeFile_();
-  }
+  void PoolSource::closeFile_() { primaryFileSequence_->closeFile_(); }
 
-  std::shared_ptr<RunAuxiliary>
-  PoolSource::readRunAuxiliary_() {
-    return primaryFileSequence_->readRunAuxiliary_();
-  }
+  std::shared_ptr<RunAuxiliary> PoolSource::readRunAuxiliary_() { return primaryFileSequence_->readRunAuxiliary_(); }
 
-  std::shared_ptr<LuminosityBlockAuxiliary>
-  PoolSource::readLuminosityBlockAuxiliary_() {
+  std::shared_ptr<LuminosityBlockAuxiliary> PoolSource::readLuminosityBlockAuxiliary_() {
     return primaryFileSequence_->readLuminosityBlockAuxiliary_();
   }
 
-  void
-  PoolSource::readRun_(RunPrincipal& runPrincipal) {
+  void PoolSource::readRun_(RunPrincipal& runPrincipal) {
     primaryFileSequence_->readRun_(runPrincipal);
-    if(secondaryFileSequence_ && !branchIDsToReplace_[InRun].empty()) {
+    if (secondaryFileSequence_ && !branchIDsToReplace_[InRun].empty()) {
       bool found = secondaryFileSequence_->skipToItem(runPrincipal.run(), 0U, 0U);
-      if(found) {
+      if (found) {
         std::shared_ptr<RunAuxiliary> secondaryAuxiliary = secondaryFileSequence_->readRunAuxiliary_();
         checkConsistency(runPrincipal.aux(), *secondaryAuxiliary);
         secondaryRunPrincipal_ = std::make_shared<RunPrincipal>(secondaryAuxiliary,
-                                                      secondaryFileSequence_->fileProductRegistry(),
-                                                      processConfiguration(),
-                                                      nullptr,
-                                                      runPrincipal.index());
+                                                                secondaryFileSequence_->fileProductRegistry(),
+                                                                processConfiguration(),
+                                                                nullptr,
+                                                                runPrincipal.index());
         secondaryFileSequence_->readRun_(*secondaryRunPrincipal_);
         checkHistoryConsistency(runPrincipal, *secondaryRunPrincipal_);
         runPrincipal.recombine(*secondaryRunPrincipal_, branchIDsToReplace_[InRun]);
       } else {
         throw Exception(errors::MismatchedInputFiles, "PoolSource::readRun_")
-          << " Run " << runPrincipal.run()
-          << " is not found in the secondary input files\n";
+            << " Run " << runPrincipal.run() << " is not found in the secondary input files\n";
       }
     }
   }
 
-  void
-  PoolSource::readLuminosityBlock_(LuminosityBlockPrincipal& lumiPrincipal) {
+  void PoolSource::readLuminosityBlock_(LuminosityBlockPrincipal& lumiPrincipal) {
     primaryFileSequence_->readLuminosityBlock_(lumiPrincipal);
-    if(secondaryFileSequence_ && !branchIDsToReplace_[InLumi].empty()) {
+    if (secondaryFileSequence_ && !branchIDsToReplace_[InLumi].empty()) {
       bool found = secondaryFileSequence_->skipToItem(lumiPrincipal.run(), lumiPrincipal.luminosityBlock(), 0U);
-      if(found) {
-        std::shared_ptr<LuminosityBlockAuxiliary> secondaryAuxiliary = secondaryFileSequence_->readLuminosityBlockAuxiliary_();
+      if (found) {
+        std::shared_ptr<LuminosityBlockAuxiliary> secondaryAuxiliary =
+            secondaryFileSequence_->readLuminosityBlockAuxiliary_();
         checkConsistency(lumiPrincipal.aux(), *secondaryAuxiliary);
         secondaryLumiPrincipal_ = std::make_shared<LuminosityBlockPrincipal>(
-                                                                   secondaryFileSequence_->fileProductRegistry(),
-                                                                   processConfiguration(),
-                                                                   nullptr,
-                                                                   lumiPrincipal.index());
+            secondaryFileSequence_->fileProductRegistry(), processConfiguration(), nullptr, lumiPrincipal.index());
         secondaryLumiPrincipal_->setAux(*secondaryAuxiliary);
         secondaryFileSequence_->readLuminosityBlock_(*secondaryLumiPrincipal_);
         checkHistoryConsistency(lumiPrincipal, *secondaryLumiPrincipal_);
         lumiPrincipal.recombine(*secondaryLumiPrincipal_, branchIDsToReplace_[InLumi]);
       } else {
         throw Exception(errors::MismatchedInputFiles, "PoolSource::readLuminosityBlock_")
-          << " Run " << lumiPrincipal.run()
-          << " LuminosityBlock " << lumiPrincipal.luminosityBlock()
-          << " is not found in the secondary input files\n";
+            << " Run " << lumiPrincipal.run() << " LuminosityBlock " << lumiPrincipal.luminosityBlock()
+            << " is not found in the secondary input files\n";
       }
     }
   }
 
-  void
-  PoolSource::readEvent_(EventPrincipal& eventPrincipal) {
+  void PoolSource::readEvent_(EventPrincipal& eventPrincipal) {
     primaryFileSequence_->readEvent(eventPrincipal);
-    if(secondaryFileSequence_ && !branchIDsToReplace_[InEvent].empty()) {
-      bool found = secondaryFileSequence_->skipToItem(eventPrincipal.run(),
-                                                      eventPrincipal.luminosityBlock(),
-                                                      eventPrincipal.id().event());
-      if(found) {
+    if (secondaryFileSequence_ && !branchIDsToReplace_[InEvent].empty()) {
+      bool found = secondaryFileSequence_->skipToItem(
+          eventPrincipal.run(), eventPrincipal.luminosityBlock(), eventPrincipal.id().event());
+      if (found) {
         EventPrincipal& secondaryEventPrincipal = *secondaryEventPrincipals_[eventPrincipal.streamID().value()];
         secondaryFileSequence_->readEvent(secondaryEventPrincipal);
         checkConsistency(eventPrincipal, secondaryEventPrincipal);
@@ -244,33 +228,32 @@ namespace edm {
         eventPrincipal.mergeProvenanceRetrievers(secondaryEventPrincipal);
         secondaryEventPrincipal.clearPrincipal();
       } else {
-        throw Exception(errors::MismatchedInputFiles, "PoolSource::readEvent_") <<
-          eventPrincipal.id() << " is not found in the secondary input files\n";
+        throw Exception(errors::MismatchedInputFiles, "PoolSource::readEvent_")
+            << eventPrincipal.id() << " is not found in the secondary input files\n";
       }
     }
-    if(not delayReadingEventProducts_) {
+    if (not delayReadingEventProducts_) {
       eventPrincipal.readAllFromSourceAndMergeImmediately();
     }
   }
 
-  bool
-  PoolSource::readIt(EventID const& id, EventPrincipal& eventPrincipal, StreamContext& streamContext) {
+  bool PoolSource::readIt(EventID const& id, EventPrincipal& eventPrincipal, StreamContext& streamContext) {
     bool found = primaryFileSequence_->skipToItem(id.run(), id.luminosityBlock(), id.event());
-    if(!found) return false;
+    if (!found)
+      return false;
     EventSourceSentry sentry(*this, streamContext);
     readEvent_(eventPrincipal);
     return true;
   }
 
-  InputSource::ItemType
-  PoolSource::getNextItemType() {
+  InputSource::ItemType PoolSource::getNextItemType() {
     RunNumber_t run = IndexIntoFile::invalidRun;
     LuminosityBlockNumber_t lumi = IndexIntoFile::invalidLumi;
     EventNumber_t event = IndexIntoFile::invalidEvent;
     InputSource::ItemType itemType = primaryFileSequence_->getNextItemType(run, lumi, event);
-    if(secondaryFileSequence_ && (IsSynchronize != state())) {
-      if(itemType == IsRun || itemType == IsLumi || itemType == IsEvent) {
-        if(!secondaryFileSequence_->containedInCurrentFile(run, lumi, event)) {
+    if (secondaryFileSequence_ && (IsSynchronize != state())) {
+      if (itemType == IsRun || itemType == IsLumi || itemType == IsEvent) {
+        if (!secondaryFileSequence_->containedInCurrentFile(run, lumi, event)) {
           return IsSynchronize;
         }
       }
@@ -278,55 +261,47 @@ namespace edm {
     return runHelper_->nextItemType(state(), itemType);
   }
 
-  std::pair<SharedResourcesAcquirer*,std::recursive_mutex*>
-  PoolSource::resourceSharedWithDelayedReader_() {
+  std::pair<SharedResourcesAcquirer*, std::recursive_mutex*> PoolSource::resourceSharedWithDelayedReader_() {
     return std::make_pair(resourceSharedWithDelayedReaderPtr_.get(), mutexSharedWithDelayedReader_.get());
   }
 
   // Rewind to before the first event that was read.
-  void
-  PoolSource::rewind_() {
-    primaryFileSequence_->rewind_();
-  }
+  void PoolSource::rewind_() { primaryFileSequence_->rewind_(); }
 
   // Advance "offset" events.  Offset can be positive or negative (or zero).
-  void
-  PoolSource::skip(int offset) {
-    primaryFileSequence_->skipEvents(offset);
-  }
+  void PoolSource::skip(int offset) { primaryFileSequence_->skipEvents(offset); }
 
-  bool
-  PoolSource::goToEvent_(EventID const& eventID) {
-    return primaryFileSequence_->goToEvent(eventID);
-  }
-
-  void
-  PoolSource::fillDescriptions(ConfigurationDescriptions & descriptions) {
+  bool PoolSource::goToEvent_(EventID const& eventID) { return primaryFileSequence_->goToEvent(eventID); }
 
+  void PoolSource::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
 
     std::vector<std::string> defaultStrings;
     desc.setComment("Reads EDM/Root files.");
-    desc.addUntracked<std::vector<std::string> >("fileNames")
-        ->setComment("Names of files to be processed.");
+    desc.addUntracked<std::vector<std::string> >("fileNames")->setComment("Names of files to be processed.");
     desc.addUntracked<std::vector<std::string> >("secondaryFileNames", defaultStrings)
         ->setComment("Names of secondary files to be processed.");
     desc.addUntracked<bool>("needSecondaryFileNames", false)
         ->setComment("If True, 'secondaryFileNames' must be specified and be non-empty.");
     desc.addUntracked<std::string>("overrideCatalog", std::string());
     desc.addUntracked<bool>("skipBadFiles", false)
-        ->setComment("True:  Ignore any missing or unopenable input file.\n"
-                     "False: Throw exception if missing or unopenable input file.");
+        ->setComment(
+            "True:  Ignore any missing or unopenable input file.\n"
+            "False: Throw exception if missing or unopenable input file.");
     desc.addUntracked<bool>("bypassVersionCheck", false)
-        ->setComment("True:  Bypass release version check.\n"
-                     "False: Throw exception if reading file in a release prior to the release in which the file was written.");
+        ->setComment(
+            "True:  Bypass release version check.\n"
+            "False: Throw exception if reading file in a release prior to the release in which the file was written.");
     desc.addUntracked<int>("treeMaxVirtualSize", -1)
         ->setComment("Size of ROOT TTree TBasket cache. Affects performance.");
     desc.addUntracked<bool>("dropDescendantsOfDroppedBranches", true)
         ->setComment("If True, also drop on input any descendent of any branch dropped on input.");
     desc.addUntracked<bool>("labelRawDataLikeMC", true)
         ->setComment("If True: replace module label for raw data to match MC. Also use 'LHC' as process.");
-    desc.addUntracked<bool>("delayReadingEventProducts",true)->setComment("If True: do not read a data product from the file until it is requested. If False: all event data products are read upfront.");
+    desc.addUntracked<bool>("delayReadingEventProducts", true)
+        ->setComment(
+            "If True: do not read a data product from the file until it is requested. If False: all event data "
+            "products are read upfront.");
     ProductSelectorRules::fillDescription(desc, "inputCommands");
     InputSource::fillDescription(desc);
     RootPrimaryFileSequence::fillDescription(desc);
@@ -335,18 +310,9 @@ namespace edm {
     descriptions.add("source", desc);
   }
 
-  bool
-  PoolSource::randomAccess_() const {
-    return true;
-  }
+  bool PoolSource::randomAccess_() const { return true; }
 
-  ProcessingController::ForwardState
-  PoolSource::forwardState_() const {
-    return primaryFileSequence_->forwardState();
-  }
+  ProcessingController::ForwardState PoolSource::forwardState_() const { return primaryFileSequence_->forwardState(); }
 
-  ProcessingController::ReverseState
-  PoolSource::reverseState_() const {
-    return primaryFileSequence_->reverseState();
-  }
-}
+  ProcessingController::ReverseState PoolSource::reverseState_() const { return primaryFileSequence_->reverseState(); }
+}  // namespace edm
diff --git a/IOPool/Input/src/PoolSource.h b/IOPool/Input/src/PoolSource.h
index 5f8f1cbf53874..c471abe77c395 100644
--- a/IOPool/Input/src/PoolSource.h
+++ b/IOPool/Input/src/PoolSource.h
@@ -37,16 +37,17 @@ namespace edm {
     using InputSource::productRegistryUpdate;
 
     // const accessors
-    bool skipBadFiles() const {return skipBadFiles_;}
-    bool dropDescendants() const {return dropDescendants_;}
-    bool bypassVersionCheck() const {return bypassVersionCheck_;}
-    bool labelRawDataLikeMC() const {return labelRawDataLikeMC_;}
-    unsigned int nStreams() const {return nStreams_;}
-    int treeMaxVirtualSize() const {return treeMaxVirtualSize_;}
-    ProductSelectorRules const& productSelectorRules() const {return productSelectorRules_;}
-    RunHelperBase* runHelper() {return runHelper_.get();}
+    bool skipBadFiles() const { return skipBadFiles_; }
+    bool dropDescendants() const { return dropDescendants_; }
+    bool bypassVersionCheck() const { return bypassVersionCheck_; }
+    bool labelRawDataLikeMC() const { return labelRawDataLikeMC_; }
+    unsigned int nStreams() const { return nStreams_; }
+    int treeMaxVirtualSize() const { return treeMaxVirtualSize_; }
+    ProductSelectorRules const& productSelectorRules() const { return productSelectorRules_; }
+    RunHelperBase* runHelper() { return runHelper_.get(); }
 
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
+
   protected:
     ItemType getNextItemType() override;
     void readLuminosityBlock_(LuminosityBlockPrincipal& lumiPrincipal) override;
@@ -67,15 +68,15 @@ namespace edm {
     ProcessingController::ForwardState forwardState_() const override;
     ProcessingController::ReverseState reverseState_() const override;
 
-    std::pair<SharedResourcesAcquirer*,std::recursive_mutex*> resourceSharedWithDelayedReader_() override;
-    
+    std::pair<SharedResourcesAcquirer*, std::recursive_mutex*> resourceSharedWithDelayedReader_() override;
+
     RootServiceChecker rootServiceChecker_;
     InputFileCatalog catalog_;
     InputFileCatalog secondaryCatalog_;
     edm::propagate_const<std::shared_ptr<RunPrincipal>> secondaryRunPrincipal_;
     edm::propagate_const<std::shared_ptr<LuminosityBlockPrincipal>> secondaryLumiPrincipal_;
     std::vector<edm::propagate_const<std::unique_ptr<EventPrincipal>>> secondaryEventPrincipals_;
-    std::array<std::vector<BranchID>, NumBranchTypes>  branchIDsToReplace_;
+    std::array<std::vector<BranchID>, NumBranchTypes> branchIDsToReplace_;
 
     unsigned int nStreams_;
     bool skipBadFiles_;
@@ -85,12 +86,13 @@ namespace edm {
     bool dropDescendants_;
     bool labelRawDataLikeMC_;
     bool delayReadingEventProducts_;
-    
+
     edm::propagate_const<std::unique_ptr<RunHelperBase>> runHelper_;
-    std::unique_ptr<SharedResourcesAcquirer> resourceSharedWithDelayedReaderPtr_; // We do not use propagate_const because the acquirer is itself mutable.
+    std::unique_ptr<SharedResourcesAcquirer>
+        resourceSharedWithDelayedReaderPtr_;  // We do not use propagate_const because the acquirer is itself mutable.
     std::shared_ptr<std::recursive_mutex> mutexSharedWithDelayedReader_;
     edm::propagate_const<std::unique_ptr<RootPrimaryFileSequence>> primaryFileSequence_;
     edm::propagate_const<std::unique_ptr<RootSecondaryFileSequence>> secondaryFileSequence_;
-  }; // class PoolSource
-}
+  };  // class PoolSource
+}  // namespace edm
 #endif
diff --git a/IOPool/Input/src/ProvenanceAdaptor.cc b/IOPool/Input/src/ProvenanceAdaptor.cc
index 5e48c5898bdd9..737b9d5aa732f 100644
--- a/IOPool/Input/src/ProvenanceAdaptor.cc
+++ b/IOPool/Input/src/ProvenanceAdaptor.cc
@@ -3,8 +3,8 @@
 ProvenanceAdaptor.cc
 
 ----------------------------------------------------------------------*/
-  //------------------------------------------------------------
-  // Class ProvenanceAdaptor: adapts old provenance (fileFormatVersion_.value() < 11) to new provenance.
+//------------------------------------------------------------
+// Class ProvenanceAdaptor: adapts old provenance (fileFormatVersion_.value() < 11) to new provenance.
 
 #include "IOPool/Input/src/ProvenanceAdaptor.h"
 
@@ -19,11 +19,9 @@ ProvenanceAdaptor.cc
 #include "DataFormats/Provenance/interface/ProductRegistry.h"
 #include "FWCore/Utilities/interface/Algorithms.h"
 namespace edm {
-  
-  void
-  ProvenanceAdaptor::fixProcessHistory(ProcessHistoryMap& pHistMap,
-				       ProcessHistoryVector& pHistVector) {
-    assert (pHistMap.empty() != pHistVector.empty());
+
+  void ProvenanceAdaptor::fixProcessHistory(ProcessHistoryMap& pHistMap, ProcessHistoryVector& pHistVector) {
+    assert(pHistMap.empty() != pHistVector.empty());
     for (ProcessHistoryVector::const_iterator i = pHistVector.begin(), e = pHistVector.end(); i != e; ++i) {
       pHistMap.insert(std::make_pair(i->id(), *i));
     }
@@ -32,8 +30,8 @@ namespace edm {
       ProcessHistory newHist;
       ProcessHistoryID const& oldphID = i->first;
       for (ProcessHistory::const_iterator it = i->second.begin(), et = i->second.end(); it != et; ++it) {
-	ParameterSetID const& newPsetID = convertID(it->parameterSetID());
-	newHist.emplace_back(it->processName(), newPsetID, it->releaseVersion(), it->passID());
+        ParameterSetID const& newPsetID = convertID(it->parameterSetID());
+        newHist.emplace_back(it->processName(), newPsetID, it->releaseVersion(), it->passID());
       }
       assert(newHist.size() == i->second.size());
       ProcessHistoryID newphID = newHist.id();
@@ -56,64 +54,65 @@ namespace edm {
       Histories const histories_;
     };
     bool Sorter::operator()(Product const& a, Product const& b) const {
-      assert (a != b);
-      if (a.first == b.first) return false;
+      assert(a != b);
+      if (a.first == b.first)
+        return false;
       bool mayBeTrue = false;
       for (Histories::const_iterator it = histories_.begin(), itEnd = histories_.end(); it != itEnd; ++it) {
-	OneHistory::const_iterator itA = find_in_all(*it, a.first);
-	if (itA == it->end()) continue;
-	OneHistory::const_iterator itB = find_in_all(*it, b.first);
-	if (itB == it->end()) continue;
-	assert (itA != itB);
-	if (itB < itA) {
-	  // process b precedes process a;
-	  return false;
-	}
-	// process a precedes process b;
-	mayBeTrue = true;
+        OneHistory::const_iterator itA = find_in_all(*it, a.first);
+        if (itA == it->end())
+          continue;
+        OneHistory::const_iterator itB = find_in_all(*it, b.first);
+        if (itB == it->end())
+          continue;
+        assert(itA != itB);
+        if (itB < itA) {
+          // process b precedes process a;
+          return false;
+        }
+        // process a precedes process b;
+        mayBeTrue = true;
       }
       return mayBeTrue;
     }
 
-    void
-    fillProcessConfiguration(ProcessHistoryVector const& pHistVec, ProcessConfigurationVector& procConfigVector) {
+    void fillProcessConfiguration(ProcessHistoryVector const& pHistVec, ProcessConfigurationVector& procConfigVector) {
       procConfigVector.clear();
       std::set<ProcessConfiguration> pcset;
       for (auto const& history : pHistVec) {
-	for (auto const& process : history) {
-	  if (pcset.insert(process).second) {
-	    procConfigVector.push_back(process);
-	  }
-	}
+        for (auto const& process : history) {
+          if (pcset.insert(process).second) {
+            procConfigVector.push_back(process);
+          }
+        }
       }
     }
 
-    void
-    fillListsAndIndexes(ProductRegistry& productRegistry,
-			ProcessHistoryMap const& pHistMap,
-			std::shared_ptr<BranchIDLists const>& branchIDLists,
-			std::vector<BranchListIndex>& branchListIndexes) {
+    void fillListsAndIndexes(ProductRegistry& productRegistry,
+                             ProcessHistoryMap const& pHistMap,
+                             std::shared_ptr<BranchIDLists const>& branchIDLists,
+                             std::vector<BranchListIndex>& branchListIndexes) {
       OrderedProducts orderedProducts;
       std::set<std::string> processNamesThatProduced;
       ProductRegistry::ProductList& prodList = productRegistry.productListUpdator();
       for (auto& item : prodList) {
         BranchDescription& prod = item.second;
         if (prod.branchType() == InEvent) {
-	  prod.init();
-	  processNamesThatProduced.insert(prod.processName());
-	  orderedProducts.emplace_back(prod.processName(), prod.branchID());
+          prod.init();
+          processNamesThatProduced.insert(prod.processName());
+          orderedProducts.emplace_back(prod.processName(), prod.branchID());
         }
       }
-      assert (!orderedProducts.empty());
+      assert(!orderedProducts.empty());
       Histories processHistories;
       size_t max = 0;
-      for(ProcessHistoryMap::const_iterator it = pHistMap.begin(), itEnd = pHistMap.end(); it != itEnd; ++it) {
+      for (ProcessHistoryMap::const_iterator it = pHistMap.begin(), itEnd = pHistMap.end(); it != itEnd; ++it) {
         ProcessHistory const& pHist = it->second;
         OneHistory processHistory;
-        for(ProcessHistory::const_iterator i = pHist.begin(), iEnd = pHist.end(); i != iEnd; ++i) {
-	  if (processNamesThatProduced.find(i->processName()) != processNamesThatProduced.end()) {
-	    processHistory.push_back(i->processName());
-	  }
+        for (ProcessHistory::const_iterator i = pHist.begin(), iEnd = pHist.end(); i != iEnd; ++i) {
+          if (processNamesThatProduced.find(i->processName()) != processNamesThatProduced.end()) {
+            processHistory.push_back(i->processName());
+          }
         }
         max = (processHistory.size() > max ? processHistory.size() : max);
         assert(max <= processNamesThatProduced.size());
@@ -127,15 +126,16 @@ namespace edm {
       auto p = std::make_unique<BranchIDList>();
       std::string processName;
       BranchListIndex blix = 0;
-      for (OrderedProducts::const_iterator it = orderedProducts.begin(), itEnd = orderedProducts.end(); it != itEnd; ++it) {
+      for (OrderedProducts::const_iterator it = orderedProducts.begin(), itEnd = orderedProducts.end(); it != itEnd;
+           ++it) {
         if (it->first != processName) {
-	  if (!processName.empty()) {
-	    branchListIndexes.push_back(blix);
-	    ++blix;
-	    pv->push_back(std::move(*p));
-	    p.reset(new BranchIDList);
+          if (!processName.empty()) {
+            branchListIndexes.push_back(blix);
+            ++blix;
+            pv->push_back(std::move(*p));
+            p.reset(new BranchIDList);
           }
-	  processName = it->first;
+          processName = it->first;
         }
         p->push_back(it->second.id());
       }
@@ -143,19 +143,18 @@ namespace edm {
       pv->push_back(std::move(*p));
       branchIDLists.reset(pv.release());
     }
-  }
+  }  // namespace
 
-  ProvenanceAdaptor::ProvenanceAdaptor(
-	     ProductRegistry& productRegistry,
-	     ProcessHistoryMap& pHistMap,
-	     ProcessHistoryVector& pHistVector,
-	     ProcessConfigurationVector& procConfigVector,
-	     ParameterSetIdConverter const& parameterSetIdConverter,
-	     bool fullConversion) :
-	        parameterSetIdConverter_(parameterSetIdConverter),
-	        processHistoryIdConverter_(),
-		branchIDLists_(),
-		branchListIndexes_() {
+  ProvenanceAdaptor::ProvenanceAdaptor(ProductRegistry& productRegistry,
+                                       ProcessHistoryMap& pHistMap,
+                                       ProcessHistoryVector& pHistVector,
+                                       ProcessConfigurationVector& procConfigVector,
+                                       ParameterSetIdConverter const& parameterSetIdConverter,
+                                       bool fullConversion)
+      : parameterSetIdConverter_(parameterSetIdConverter),
+        processHistoryIdConverter_(),
+        branchIDLists_(),
+        branchListIndexes_() {
     fixProcessHistory(pHistMap, pHistVector);
     fillProcessConfiguration(pHistVector, procConfigVector);
     if (fullConversion) {
@@ -165,31 +164,23 @@ namespace edm {
 
   ProvenanceAdaptor::~ProvenanceAdaptor() {}
 
-  ParameterSetID const&
-  ProvenanceAdaptor::convertID(ParameterSetID const& oldID) const {
+  ParameterSetID const& ProvenanceAdaptor::convertID(ParameterSetID const& oldID) const {
     ParameterSetIdConverter::const_iterator it = parameterSetIdConverter_.find(oldID);
     if (it == parameterSetIdConverter_.end()) {
       return oldID;
     }
-    return it->second; 
+    return it->second;
   }
 
-  ProcessHistoryID const&
-  ProvenanceAdaptor::convertID(ProcessHistoryID const& oldID) const {
+  ProcessHistoryID const& ProvenanceAdaptor::convertID(ProcessHistoryID const& oldID) const {
     ProcessHistoryIdConverter::const_iterator it = processHistoryIdConverter_.find(oldID);
     if (it == processHistoryIdConverter_.end()) {
       return oldID;
     }
-    return it->second; 
+    return it->second;
   }
 
-  std::shared_ptr<BranchIDLists const>
-  ProvenanceAdaptor::branchIDLists() const {
-    return branchIDLists_;
-  }
+  std::shared_ptr<BranchIDLists const> ProvenanceAdaptor::branchIDLists() const { return branchIDLists_; }
 
-  void
-  ProvenanceAdaptor::branchListIndexes(BranchListIndexes & indexes)  const {
-    indexes = branchListIndexes_;
-  }
-}
+  void ProvenanceAdaptor::branchListIndexes(BranchListIndexes& indexes) const { indexes = branchListIndexes_; }
+}  // namespace edm
diff --git a/IOPool/Input/src/ProvenanceAdaptor.h b/IOPool/Input/src/ProvenanceAdaptor.h
index e9657e1458a8c..b68bfe6d0907b 100644
--- a/IOPool/Input/src/ProvenanceAdaptor.h
+++ b/IOPool/Input/src/ProvenanceAdaptor.h
@@ -21,42 +21,38 @@ ProvenanceAdaptor.h
 namespace edm {
 
   //------------------------------------------------------------
-  // Class ProvenanceAdaptor: 
+  // Class ProvenanceAdaptor:
 
   class ProvenanceAdaptor {
   public:
     typedef ParameterSetConverter::ParameterSetIdConverter ParameterSetIdConverter;
     typedef std::map<ProcessHistoryID, ProcessHistoryID> ProcessHistoryIdConverter;
-    ProvenanceAdaptor(
-	     ProductRegistry& productRegistry,
-	     ProcessHistoryMap& pHistMap,
-	     ProcessHistoryVector& pHistVector,
-	     ProcessConfigurationVector& procConfigVector,
-	     ParameterSetIdConverter const& parameterSetIdConverter,
-	     bool fullConversion);
+    ProvenanceAdaptor(ProductRegistry& productRegistry,
+                      ProcessHistoryMap& pHistMap,
+                      ProcessHistoryVector& pHistVector,
+                      ProcessConfigurationVector& procConfigVector,
+                      ParameterSetIdConverter const& parameterSetIdConverter,
+                      bool fullConversion);
     ~ProvenanceAdaptor();
-  
-    ProvenanceAdaptor(ProvenanceAdaptor const&) = delete; // Disallow copying and moving
-    ProvenanceAdaptor& operator=(ProvenanceAdaptor const&) = delete; // Disallow copying and moving
+
+    ProvenanceAdaptor(ProvenanceAdaptor const&) = delete;             // Disallow copying and moving
+    ProvenanceAdaptor& operator=(ProvenanceAdaptor const&) = delete;  // Disallow copying and moving
 
     std::shared_ptr<BranchIDLists const> branchIDLists() const;
 
-    void branchListIndexes(BranchListIndexes & indexes) const;
+    void branchListIndexes(BranchListIndexes& indexes) const;
 
-    ParameterSetID const&
-    convertID(ParameterSetID const& oldID) const;
+    ParameterSetID const& convertID(ParameterSetID const& oldID) const;
 
-    ProcessHistoryID const&
-    convertID(ProcessHistoryID const& oldID) const;
+    ProcessHistoryID const& convertID(ProcessHistoryID const& oldID) const;
 
   private:
-    void fixProcessHistory(ProcessHistoryMap& pHistMap,
-			   ProcessHistoryVector& pHistVector);
+    void fixProcessHistory(ProcessHistoryMap& pHistMap, ProcessHistoryVector& pHistVector);
 
     ParameterSetIdConverter parameterSetIdConverter_;
     ProcessHistoryIdConverter processHistoryIdConverter_;
     std::shared_ptr<BranchIDLists const> branchIDLists_;
     std::vector<BranchListIndex> branchListIndexes_;
-  }; // class ProvenanceAdaptor
-}
+  };  // class ProvenanceAdaptor
+}  // namespace edm
 #endif
diff --git a/IOPool/Input/src/RootDelayedReader.cc b/IOPool/Input/src/RootDelayedReader.cc
index 63766ce25d85f..2a199947e88a2 100644
--- a/IOPool/Input/src/RootDelayedReader.cc
+++ b/IOPool/Input/src/RootDelayedReader.cc
@@ -20,33 +20,28 @@
 
 namespace edm {
 
-  RootDelayedReader::RootDelayedReader(
-      RootTree const& tree,
-      std::shared_ptr<InputFile> filePtr,
-      InputType inputType) :
-   tree_(tree),
-   filePtr_(filePtr),
-   nextReader_(),
-   resourceAcquirer_(inputType == InputType::Primary ? new SharedResourcesAcquirer() : static_cast<SharedResourcesAcquirer*>(nullptr)),
-   inputType_(inputType),
-   wrapperBaseTClass_(TClass::GetClass("edm::WrapperBase")) {
-     if(inputType == InputType::Primary) {
-       auto resources = SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader();
-       resourceAcquirer_=std::make_unique<SharedResourcesAcquirer>(std::move(resources.first));
-       mutex_ = resources.second;
-     }
+  RootDelayedReader::RootDelayedReader(RootTree const& tree, std::shared_ptr<InputFile> filePtr, InputType inputType)
+      : tree_(tree),
+        filePtr_(filePtr),
+        nextReader_(),
+        resourceAcquirer_(inputType == InputType::Primary ? new SharedResourcesAcquirer()
+                                                          : static_cast<SharedResourcesAcquirer*>(nullptr)),
+        inputType_(inputType),
+        wrapperBaseTClass_(TClass::GetClass("edm::WrapperBase")) {
+    if (inputType == InputType::Primary) {
+      auto resources = SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader();
+      resourceAcquirer_ = std::make_unique<SharedResourcesAcquirer>(std::move(resources.first));
+      mutex_ = resources.second;
+    }
   }
 
-  RootDelayedReader::~RootDelayedReader() {
-  }
+  RootDelayedReader::~RootDelayedReader() {}
 
-  std::pair<SharedResourcesAcquirer*, std::recursive_mutex*>
-  RootDelayedReader::sharedResources_() const {
+  std::pair<SharedResourcesAcquirer*, std::recursive_mutex*> RootDelayedReader::sharedResources_() const {
     return std::make_pair(resourceAcquirer_.get(), mutex_.get());
   }
 
-  std::unique_ptr<WrapperBase>
-  RootDelayedReader::getProduct_(BranchID const& k, EDProductGetter const* ep) {
+  std::unique_ptr<WrapperBase> RootDelayedReader::getProduct_(BranchID const& k, EDProductGetter const* ep) {
     if (lastException_) {
       std::rethrow_exception(lastException_);
     }
@@ -66,13 +61,15 @@ namespace edm {
         return std::unique_ptr<WrapperBase>();
       }
     }
-   
+
     setRefCoreStreamer(ep);
     //make code exception safe
-    std::shared_ptr<void> refCoreStreamerGuard(nullptr,[](void*){    setRefCoreStreamer(false);
-      ;});
+    std::shared_ptr<void> refCoreStreamerGuard(nullptr, [](void*) {
+      setRefCoreStreamer(false);
+      ;
+    });
     TClass* cp = branchInfo->classCache_;
-    if(nullptr == cp) {
+    if (nullptr == cp) {
       branchInfo->classCache_ = TClass::GetClass(branchInfo->branchDescription_.wrappedName().c_str());
       cp = branchInfo->classCache_;
       branchInfo->offsetToWrapperBase_ = cp->GetBaseClassOffset(wrapperBaseTClass_);
@@ -80,22 +77,22 @@ namespace edm {
     void* p = cp->New();
     std::unique_ptr<WrapperBase> edp = getWrapperBasePtr(p, branchInfo->offsetToWrapperBase_);
     br->SetAddress(&p);
-    try{
+    try {
       //Run and Lumi only have 1 entry number, which is index 0
-      tree_.getEntry(br, tree_.entryNumberForIndex(tree_.branchType()==InEvent?ep->transitionIndex(): 0));
-    } catch(edm::Exception& exception) {
+      tree_.getEntry(br, tree_.entryNumberForIndex(tree_.branchType() == InEvent ? ep->transitionIndex() : 0));
+    } catch (edm::Exception& exception) {
       exception.addContext("Rethrowing an exception that happened on a different thread.");
       lastException_ = std::current_exception();
-    } catch(...) {
+    } catch (...) {
       lastException_ = std::current_exception();
     }
-    if(lastException_) {
+    if (lastException_) {
       std::rethrow_exception(lastException_);
     }
-    if(tree_.branchType() == InEvent) {
+    if (tree_.branchType() == InEvent) {
       // CMS-THREADING For the primary input source calls to this function need to be serialized
       InputFile::reportReadBranch(inputType_, std::string(br->GetName()));
     }
     return edp;
   }
-}
+}  // namespace edm
diff --git a/IOPool/Input/src/RootDelayedReader.h b/IOPool/Input/src/RootDelayedReader.h
index 89e96f85bf45a..64355dde35315 100644
--- a/IOPool/Input/src/RootDelayedReader.h
+++ b/IOPool/Input/src/RootDelayedReader.h
@@ -34,55 +34,58 @@ namespace edm {
     typedef roottree::BranchInfo BranchInfo;
     typedef roottree::BranchMap BranchMap;
     typedef roottree::EntryNumber EntryNumber;
-    RootDelayedReader(
-      RootTree const& tree,
-      std::shared_ptr<InputFile> filePtr,
-      InputType inputType);
+    RootDelayedReader(RootTree const& tree, std::shared_ptr<InputFile> filePtr, InputType inputType);
 
     ~RootDelayedReader() override;
 
-    RootDelayedReader(RootDelayedReader const&) = delete; // Disallow copying and moving
-    RootDelayedReader& operator=(RootDelayedReader const&) = delete; // Disallow copying and moving
+    RootDelayedReader(RootDelayedReader const&) = delete;             // Disallow copying and moving
+    RootDelayedReader& operator=(RootDelayedReader const&) = delete;  // Disallow copying and moving
 
-    signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* preEventReadFromSourceSignal() const final {
+    signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* preEventReadFromSourceSignal()
+        const final {
       return preEventReadFromSourceSignal_;
     }
-    signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* postEventReadFromSourceSignal() const final {
+    signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* postEventReadFromSourceSignal()
+        const final {
       return postEventReadFromSourceSignal_;
     }
 
-    void setSignals(signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* preEventReadSource,
-                    signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* postEventReadSource) {
-      preEventReadFromSourceSignal_ =preEventReadSource;
+    void setSignals(
+        signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* preEventReadSource,
+        signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* postEventReadSource) {
+      preEventReadFromSourceSignal_ = preEventReadSource;
       postEventReadFromSourceSignal_ = postEventReadSource;
     }
 
   private:
     std::unique_ptr<WrapperBase> getProduct_(BranchID const& k, EDProductGetter const* ep) override;
-    void mergeReaders_(DelayedReader* other) override {nextReader_ = other;}
-    void reset_() override {nextReader_ = nullptr;}
+    void mergeReaders_(DelayedReader* other) override { nextReader_ = other; }
+    void reset_() override { nextReader_ = nullptr; }
     std::pair<SharedResourcesAcquirer*, std::recursive_mutex*> sharedResources_() const override;
 
-    BranchMap const& branches() const {return tree_.branches();}
-    BranchInfo const* getBranchInfo(BranchID const& k) const {return branches().find(k);}
+    BranchMap const& branches() const { return tree_.branches(); }
+    BranchInfo const* getBranchInfo(BranchID const& k) const { return branches().find(k); }
     // NOTE: filePtr_ appears to be unused, but is needed to prevent
     // the file containing the branch from being reclaimed.
     RootTree const& tree_;
     edm::propagate_const<std::shared_ptr<InputFile>> filePtr_;
     edm::propagate_const<DelayedReader*> nextReader_;
-    std::unique_ptr<SharedResourcesAcquirer> resourceAcquirer_; // We do not use propagate_const because the acquirer is itself mutable.
+    std::unique_ptr<SharedResourcesAcquirer>
+        resourceAcquirer_;  // We do not use propagate_const because the acquirer is itself mutable.
     std::shared_ptr<std::recursive_mutex> mutex_;
     InputType inputType_;
     edm::propagate_const<TClass*> wrapperBaseTClass_;
-    
-    signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* preEventReadFromSourceSignal_ = nullptr;
-    signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* postEventReadFromSourceSignal_ = nullptr;
+
+    signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* preEventReadFromSourceSignal_ =
+        nullptr;
+    signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* postEventReadFromSourceSignal_ =
+        nullptr;
 
     //If a fatal exception happens we need to make a copy so we can
     // rethrow that exception on other threads. This avoids TTree
     // non-exception safety problems on later calls to TTree.
     mutable std::exception_ptr lastException_;
-  }; // class RootDelayedReader
+  };  // class RootDelayedReader
   //------------------------------------------------------------
-}
+}  // namespace edm
 #endif
diff --git a/IOPool/Input/src/RootEmbeddedFileSequence.cc b/IOPool/Input/src/RootEmbeddedFileSequence.cc
index c350ca66e2e4f..37552a7673f08 100644
--- a/IOPool/Input/src/RootEmbeddedFileSequence.cc
+++ b/IOPool/Input/src/RootEmbeddedFileSequence.cc
@@ -23,50 +23,49 @@
 namespace edm {
   class EventPrincipal;
 
-  RootEmbeddedFileSequence::RootEmbeddedFileSequence(
-                ParameterSet const& pset,
-                EmbeddedRootSource& input,
-                InputFileCatalog const& catalog) :
-    RootInputFileSequence(pset, catalog),
-    input_(input),
-    orderedProcessHistoryIDs_(),
-    sequential_(pset.getUntrackedParameter<bool>("sequential", false)),
-    sameLumiBlock_(pset.getUntrackedParameter<bool>("sameLumiBlock", false)),
-    fptr_(nullptr),
-    eventsRemainingInFile_(0),
-    // The default value provided as the second argument to the getUntrackedParameter function call
-    // is not used when the ParameterSet has been validated and the parameters are not optional
-    // in the description.  This is currently true when PoolSource is the primary input source.
-    // The modules that use PoolSource as a SecSource have not defined their fillDescriptions function
-    // yet, so the ParameterSet does not get validated yet.  As soon as all the modules with a SecSource
-    // have defined descriptions, the defaults in the getUntrackedParameterSet function calls can
-    // and should be deleted from the code.
-    initialNumberOfEventsToSkip_(pset.getUntrackedParameter<unsigned int>("skipEvents", 0U)),
-    treeCacheSize_(pset.getUntrackedParameter<unsigned int>("cacheSize", roottree::defaultCacheSize)),
-    enablePrefetching_(false) {
-
-    if(noFiles()) {
-      throw Exception(errors::NoSecondaryFiles) << "RootEmbeddedFileSequence no input files specified for secondary input source.\n";
+  RootEmbeddedFileSequence::RootEmbeddedFileSequence(ParameterSet const& pset,
+                                                     EmbeddedRootSource& input,
+                                                     InputFileCatalog const& catalog)
+      : RootInputFileSequence(pset, catalog),
+        input_(input),
+        orderedProcessHistoryIDs_(),
+        sequential_(pset.getUntrackedParameter<bool>("sequential", false)),
+        sameLumiBlock_(pset.getUntrackedParameter<bool>("sameLumiBlock", false)),
+        fptr_(nullptr),
+        eventsRemainingInFile_(0),
+        // The default value provided as the second argument to the getUntrackedParameter function call
+        // is not used when the ParameterSet has been validated and the parameters are not optional
+        // in the description.  This is currently true when PoolSource is the primary input source.
+        // The modules that use PoolSource as a SecSource have not defined their fillDescriptions function
+        // yet, so the ParameterSet does not get validated yet.  As soon as all the modules with a SecSource
+        // have defined descriptions, the defaults in the getUntrackedParameterSet function calls can
+        // and should be deleted from the code.
+        initialNumberOfEventsToSkip_(pset.getUntrackedParameter<unsigned int>("skipEvents", 0U)),
+        treeCacheSize_(pset.getUntrackedParameter<unsigned int>("cacheSize", roottree::defaultCacheSize)),
+        enablePrefetching_(false) {
+    if (noFiles()) {
+      throw Exception(errors::NoSecondaryFiles)
+          << "RootEmbeddedFileSequence no input files specified for secondary input source.\n";
     }
     //
     // The SiteLocalConfig controls the TTreeCache size and the prefetching settings.
     Service<SiteLocalConfig> pSLC;
-    if(pSLC.isAvailable()) {
-      if(treeCacheSize_ != 0U && pSLC->sourceTTreeCacheSize()) {
+    if (pSLC.isAvailable()) {
+      if (treeCacheSize_ != 0U && pSLC->sourceTTreeCacheSize()) {
         treeCacheSize_ = *(pSLC->sourceTTreeCacheSize());
       }
       enablePrefetching_ = pSLC->enablePrefetching();
     }
 
     // Set the pointer to the function that reads an event.
-    if(sameLumiBlock_) {
-      if(sequential_) {
+    if (sameLumiBlock_) {
+      if (sequential_) {
         fptr_ = &RootEmbeddedFileSequence::readOneSequentialWithID;
       } else {
         fptr_ = &RootEmbeddedFileSequence::readOneRandomWithID;
       }
     } else {
-      if(sequential_) {
+      if (sequential_) {
         fptr_ = &RootEmbeddedFileSequence::readOneSequential;
       } else {
         fptr_ = &RootEmbeddedFileSequence::readOneRandom;
@@ -74,15 +73,15 @@ namespace edm {
     }
 
     // For the secondary input source we do not stage in.
-    if(sequential_) {
+    if (sequential_) {
       // We open the first file
-      if(!atFirstFile()) {
+      if (!atFirstFile()) {
         setAtFirstFile();
         initFile(false);
       }
       assert(rootFile());
       rootFile()->setAtEventEntry(IndexIntoFile::invalidEntry);
-      if(!sameLumiBlock_) {
+      if (!sameLumiBlock_) {
         skipEntries(initialNumberOfEventsToSkip_);
       }
     } else {
@@ -90,33 +89,29 @@ namespace edm {
       // We cannot use the random number service yet.
       std::ifstream f("/dev/urandom");
       unsigned int seed;
-      f.read(reinterpret_cast<char*>(&seed), sizeof(seed)); 
+      f.read(reinterpret_cast<char*>(&seed), sizeof(seed));
       std::default_random_engine dre(seed);
       size_t count = numberOfFiles();
       std::uniform_int_distribution<int> distribution(0, count - 1);
-      while(!rootFile() && count != 0) {
+      while (!rootFile() && count != 0) {
         --count;
         int offset = distribution(dre);
         setAtFileSequenceNumber(offset);
         initFile(input_.skipBadFiles());
       }
     }
-    if(rootFile()) {
+    if (rootFile()) {
       input_.productRegistryUpdate().updateFromInput(rootFile()->productRegistry()->productList());
     }
   }
 
-  RootEmbeddedFileSequence::~RootEmbeddedFileSequence() {
-  }
+  RootEmbeddedFileSequence::~RootEmbeddedFileSequence() {}
 
-  void
-  RootEmbeddedFileSequence::endJob() {
-    closeFile_();
-  }
+  void RootEmbeddedFileSequence::endJob() { closeFile_(); }
 
   void RootEmbeddedFileSequence::closeFile_() {
     // delete the RootFile object.
-    if(rootFile()) {
+    if (rootFile()) {
       rootFile().reset();
     }
   }
@@ -125,35 +120,33 @@ namespace edm {
     initTheFile(skipBadFiles, false, nullptr, "mixingFiles", InputType::SecondarySource);
   }
 
-  RootEmbeddedFileSequence::RootFileSharedPtr
-  RootEmbeddedFileSequence::makeRootFile(std::shared_ptr<InputFile> filePtr) {
+  RootEmbeddedFileSequence::RootFileSharedPtr RootEmbeddedFileSequence::makeRootFile(
+      std::shared_ptr<InputFile> filePtr) {
     size_t currentIndexIntoFile = sequenceNumberOfFile();
-    return std::make_shared<RootFile>(
-          fileName(),
-          ProcessConfiguration(),
-          logicalFileName(),
-          filePtr,
-	  input_.nStreams(),
-          treeCacheSize_,
-          input_.treeMaxVirtualSize(),
-          input_.runHelper(),
-          input_.productSelectorRules(),
-          InputType::SecondarySource,
-          input_.processHistoryRegistryForUpdate(),
-          indexesIntoFiles(),
-          currentIndexIntoFile,
-          orderedProcessHistoryIDs_,
-          input_.bypassVersionCheck(),
-          enablePrefetching_);
+    return std::make_shared<RootFile>(fileName(),
+                                      ProcessConfiguration(),
+                                      logicalFileName(),
+                                      filePtr,
+                                      input_.nStreams(),
+                                      treeCacheSize_,
+                                      input_.treeMaxVirtualSize(),
+                                      input_.runHelper(),
+                                      input_.productSelectorRules(),
+                                      InputType::SecondarySource,
+                                      input_.processHistoryRegistryForUpdate(),
+                                      indexesIntoFiles(),
+                                      currentIndexIntoFile,
+                                      orderedProcessHistoryIDs_,
+                                      input_.bypassVersionCheck(),
+                                      enablePrefetching_);
   }
 
-  void
-  RootEmbeddedFileSequence::skipEntries(unsigned int offset) {
+  void RootEmbeddedFileSequence::skipEntries(unsigned int offset) {
     // offset is decremented by the number of events actually skipped.
     bool completed = rootFile()->skipEntries(offset);
-    while(!completed) {
+    while (!completed) {
       setAtNextFile();
-      if(noMoreFiles()) {
+      if (noMoreFiles()) {
         setAtFirstFile();
       }
       initFile(false);
@@ -163,14 +156,14 @@ namespace edm {
     }
   }
 
-  bool
-  RootEmbeddedFileSequence::readOneSequential(EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine*, EventID const*, bool recycleFiles) {
+  bool RootEmbeddedFileSequence::readOneSequential(
+      EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine*, EventID const*, bool recycleFiles) {
     assert(rootFile());
     rootFile()->nextEventEntry();
     bool found = rootFile()->readCurrentEvent(cache);
-    if(!found) {
+    if (!found) {
       setAtNextFile();
-      if(noMoreFiles()) {
+      if (noMoreFiles()) {
         if (recycleFiles) {
           setAtFirstFile();
         } else {
@@ -186,39 +179,38 @@ namespace edm {
     return true;
   }
 
-  bool
-  RootEmbeddedFileSequence::readOneSequentialWithID(EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine*, EventID const* idp, bool recycleFiles) {
+  bool RootEmbeddedFileSequence::readOneSequentialWithID(
+      EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine*, EventID const* idp, bool recycleFiles) {
     assert(idp);
     EventID const& id = *idp;
     int offset = initialNumberOfEventsToSkip_;
     initialNumberOfEventsToSkip_ = 0;
-    if(offset > 0) {
+    if (offset > 0) {
       assert(rootFile());
-      while(offset > 0) {
+      while (offset > 0) {
         bool found = readOneSequentialWithID(cache, fileNameHash, nullptr, idp, recycleFiles);
-        if(!found) {
+        if (!found) {
           return false;
         }
         --offset;
       }
     }
     assert(rootFile());
-    if(noMoreFiles() ||
-        rootFile()->indexIntoFileIter().run() != id.run() ||
+    if (noMoreFiles() || rootFile()->indexIntoFileIter().run() != id.run() ||
         rootFile()->indexIntoFileIter().lumi() != id.luminosityBlock()) {
       bool found = skipToItem(id.run(), id.luminosityBlock(), 0, 0, false);
-      if(!found) {
+      if (!found) {
         return false;
       }
     }
     assert(rootFile());
     bool found = rootFile()->setEntryAtNextEventInLumi(id.run(), id.luminosityBlock());
-    if(found) {
+    if (found) {
       found = rootFile()->readCurrentEvent(cache);
     }
-    if(!found) {
+    if (!found) {
       found = skipToItemInNewFile(id.run(), id.luminosityBlock(), 0);
-      if(!found) {
+      if (!found) {
         return false;
       }
       return readOneSequentialWithID(cache, fileNameHash, nullptr, idp, recycleFiles);
@@ -227,48 +219,48 @@ namespace edm {
     return true;
   }
 
-  void
-  RootEmbeddedFileSequence::readOneSpecified(EventPrincipal& cache, size_t& fileNameHash, SecondaryEventIDAndFileInfo const& idx) {
+  void RootEmbeddedFileSequence::readOneSpecified(EventPrincipal& cache,
+                                                  size_t& fileNameHash,
+                                                  SecondaryEventIDAndFileInfo const& idx) {
     EventID const& id = idx.eventID();
     bool found = skipToItem(id.run(), id.luminosityBlock(), id.event(), idx.fileNameHash());
-    if(!found) {
-       throw Exception(errors::NotFound) <<
-         "RootEmbeddedFileSequence::readOneSpecified(): Secondary Input files" <<
-         " do not contain specified event:\n" << id << "\n";
+    if (!found) {
+      throw Exception(errors::NotFound) << "RootEmbeddedFileSequence::readOneSpecified(): Secondary Input files"
+                                        << " do not contain specified event:\n"
+                                        << id << "\n";
     }
     assert(rootFile());
     found = rootFile()->readCurrentEvent(cache);
     assert(found);
     fileNameHash = idx.fileNameHash();
-    if(fileNameHash == 0U)  {
+    if (fileNameHash == 0U) {
       fileNameHash = lfnHash();
     }
   }
 
-  bool
-  RootEmbeddedFileSequence::readOneRandom(EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine* engine, EventID const*, bool) {
+  bool RootEmbeddedFileSequence::readOneRandom(
+      EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine* engine, EventID const*, bool) {
     assert(rootFile());
     assert(engine);
     unsigned int currentSeqNumber = sequenceNumberOfFile();
-    while(eventsRemainingInFile_ == 0) {
-
+    while (eventsRemainingInFile_ == 0) {
       unsigned int newSeqNumber = CLHEP::RandFlat::shootInt(engine, fileCatalogItems().size());
       setAtFileSequenceNumber(newSeqNumber);
-      if(newSeqNumber != currentSeqNumber) {
+      if (newSeqNumber != currentSeqNumber) {
         initFile(false);
         currentSeqNumber = newSeqNumber;
       }
       eventsRemainingInFile_ = rootFile()->eventTree().entries();
-      if(eventsRemainingInFile_ == 0) {
-        throw Exception(errors::NotFound) <<
-           "RootEmbeddedFileSequence::readOneRandom(): Secondary Input file " << fileName() << " contains no events.\n";
+      if (eventsRemainingInFile_ == 0) {
+        throw Exception(errors::NotFound) << "RootEmbeddedFileSequence::readOneRandom(): Secondary Input file "
+                                          << fileName() << " contains no events.\n";
       }
       rootFile()->setAtEventEntry(CLHEP::RandFlat::shootInt(engine, eventsRemainingInFile_) - 1);
     }
     rootFile()->nextEventEntry();
 
     bool found = rootFile()->readCurrentEvent(cache);
-    if(!found) {
+    if (!found) {
       rootFile()->setAtEventEntry(0);
       bool found = rootFile()->readCurrentEvent(cache);
       assert(found);
@@ -278,37 +270,40 @@ namespace edm {
     return true;
   }
 
-  bool
-  RootEmbeddedFileSequence::readOneRandomWithID(EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine* engine, EventID const* idp, bool recycleFiles) {
+  bool RootEmbeddedFileSequence::readOneRandomWithID(EventPrincipal& cache,
+                                                     size_t& fileNameHash,
+                                                     CLHEP::HepRandomEngine* engine,
+                                                     EventID const* idp,
+                                                     bool recycleFiles) {
     assert(engine);
     assert(idp);
     EventID const& id = *idp;
-    if(noMoreFiles() || !rootFile() ||
-        rootFile()->indexIntoFileIter().run() != id.run() ||
+    if (noMoreFiles() || !rootFile() || rootFile()->indexIntoFileIter().run() != id.run() ||
         rootFile()->indexIntoFileIter().lumi() != id.luminosityBlock()) {
       bool found = skipToItem(id.run(), id.luminosityBlock(), 0);
-      if(!found) {
+      if (!found) {
         return false;
       }
       int eventsInLumi = 0;
       assert(rootFile());
-      while(rootFile()->setEntryAtNextEventInLumi(id.run(), id.luminosityBlock())) ++eventsInLumi;
+      while (rootFile()->setEntryAtNextEventInLumi(id.run(), id.luminosityBlock()))
+        ++eventsInLumi;
       found = skipToItem(id.run(), id.luminosityBlock(), 0);
       assert(found);
       int eventInLumi = CLHEP::RandFlat::shootInt(engine, eventsInLumi);
-      for(int i = 0; i < eventInLumi; ++i) {
+      for (int i = 0; i < eventInLumi; ++i) {
         bool found = rootFile()->setEntryAtNextEventInLumi(id.run(), id.luminosityBlock());
         assert(found);
       }
     }
     assert(rootFile());
     bool found = rootFile()->setEntryAtNextEventInLumi(id.run(), id.luminosityBlock());
-    if(found) {
+    if (found) {
       found = rootFile()->readCurrentEvent(cache);
     }
-    if(!found) {
+    if (!found) {
       bool found = rootFile()->setEntryAtItem(id.run(), id.luminosityBlock(), 0);
-      if(!found) {
+      if (!found) {
         return false;
       }
       return readOneRandomWithID(cache, fileNameHash, engine, idp, recycleFiles);
@@ -317,24 +312,29 @@ namespace edm {
     return true;
   }
 
-  bool
-  RootEmbeddedFileSequence::readOneEvent(EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine* engine, EventID const* id, bool recycleFiles) {
+  bool RootEmbeddedFileSequence::readOneEvent(EventPrincipal& cache,
+                                              size_t& fileNameHash,
+                                              CLHEP::HepRandomEngine* engine,
+                                              EventID const* id,
+                                              bool recycleFiles) {
     assert(!sameLumiBlock_ || id != nullptr);
     assert(sequential_ || engine != nullptr);
     return (this->*fptr_)(cache, fileNameHash, engine, id, recycleFiles);
   }
 
-  void
-  RootEmbeddedFileSequence::fillDescription(ParameterSetDescription & desc) {
+  void RootEmbeddedFileSequence::fillDescription(ParameterSetDescription& desc) {
     desc.addUntracked<bool>("sequential", false)
-        ->setComment("True: loopEvents() reads events sequentially from beginning of first file.\n"
-                     "False: loopEvents() first reads events beginning at random event. New files also chosen randomly");
+        ->setComment(
+            "True: loopEvents() reads events sequentially from beginning of first file.\n"
+            "False: loopEvents() first reads events beginning at random event. New files also chosen randomly");
     desc.addUntracked<bool>("sameLumiBlock", false)
-        ->setComment("True: loopEvents() reads events only in same lumi as the specified event.\n"
-                     "False: loopEvents() reads events regardless of lumi.");
+        ->setComment(
+            "True: loopEvents() reads events only in same lumi as the specified event.\n"
+            "False: loopEvents() reads events regardless of lumi.");
     desc.addUntracked<unsigned int>("skipEvents", 0U)
-        ->setComment("Skip the first 'skipEvents' events. Used only if 'sequential' is True and 'sameLumiBlock' is False");
+        ->setComment(
+            "Skip the first 'skipEvents' events. Used only if 'sequential' is True and 'sameLumiBlock' is False");
     desc.addUntracked<unsigned int>("cacheSize", roottree::defaultCacheSize)
         ->setComment("Size of ROOT TTree prefetch cache.  Affects performance.");
   }
-}
+}  // namespace edm
diff --git a/IOPool/Input/src/RootEmbeddedFileSequence.h b/IOPool/Input/src/RootEmbeddedFileSequence.h
index b01b268d9ff24..b01dc310fa567 100644
--- a/IOPool/Input/src/RootEmbeddedFileSequence.h
+++ b/IOPool/Input/src/RootEmbeddedFileSequence.h
@@ -32,27 +32,32 @@ namespace edm {
   class RootEmbeddedFileSequence : public RootInputFileSequence {
   public:
     explicit RootEmbeddedFileSequence(ParameterSet const& pset,
-                                   EmbeddedRootSource& input,
-                                   InputFileCatalog const& catalog);
+                                      EmbeddedRootSource& input,
+                                      InputFileCatalog const& catalog);
     ~RootEmbeddedFileSequence() override;
 
-    RootEmbeddedFileSequence(RootEmbeddedFileSequence const&) = delete; // Disallow copying and moving
-    RootEmbeddedFileSequence& operator=(RootEmbeddedFileSequence const&) = delete; // Disallow copying and moving
+    RootEmbeddedFileSequence(RootEmbeddedFileSequence const&) = delete;             // Disallow copying and moving
+    RootEmbeddedFileSequence& operator=(RootEmbeddedFileSequence const&) = delete;  // Disallow copying and moving
 
     void closeFile_() override;
     void endJob();
     void skipEntries(unsigned int offset);
-    bool readOneEvent(EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine*, EventID const* id, bool recycleFiles);
+    bool readOneEvent(
+        EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine*, EventID const* id, bool recycleFiles);
     bool readOneRandom(EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine*, EventID const*, bool);
-    bool readOneRandomWithID(EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine*, EventID const* id, bool);
-    bool readOneSequential(EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine*, EventID const*, bool recycleFiles);
-    bool readOneSequentialWithID(EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine*, EventID const* id, bool);
+    bool readOneRandomWithID(
+        EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine*, EventID const* id, bool);
+    bool readOneSequential(
+        EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine*, EventID const*, bool recycleFiles);
+    bool readOneSequentialWithID(
+        EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine*, EventID const* id, bool);
     void readOneSpecified(EventPrincipal& cache, size_t& fileNameHash, SecondaryEventIDAndFileInfo const& id);
 
-    static void fillDescription(ParameterSetDescription & desc);
+    static void fillDescription(ParameterSetDescription& desc);
+
   private:
     void initFile_(bool skipBadFiles) override;
-    RootFileSharedPtr makeRootFile(std::shared_ptr<InputFile> filePtr) override; 
+    RootFileSharedPtr makeRootFile(std::shared_ptr<InputFile> filePtr) override;
 
     EmbeddedRootSource& input_;
 
@@ -60,11 +65,11 @@ namespace edm {
 
     bool sequential_;
     bool sameLumiBlock_;
-    bool (RootEmbeddedFileSequence::* fptr_)(EventPrincipal&, size_t&, CLHEP::HepRandomEngine*, EventID const*, bool);
+    bool (RootEmbeddedFileSequence::*fptr_)(EventPrincipal&, size_t&, CLHEP::HepRandomEngine*, EventID const*, bool);
     int eventsRemainingInFile_;
     int initialNumberOfEventsToSkip_;
     unsigned int treeCacheSize_;
     bool enablePrefetching_;
-  }; // class RootEmbeddedFileSequence
-}
+  };  // class RootEmbeddedFileSequence
+}  // namespace edm
 #endif
diff --git a/IOPool/Input/src/RootFile.cc b/IOPool/Input/src/RootFile.cc
index 2e6a6fe08c765..4a781ea2f1375 100644
--- a/IOPool/Input/src/RootFile.cc
+++ b/IOPool/Input/src/RootFile.cc
@@ -69,66 +69,73 @@ namespace edm {
   // Algorithm classes for making ProvenanceReader:
   class MakeDummyProvenanceReader : public MakeProvenanceReader {
   public:
-    std::unique_ptr<ProvenanceReaderBase> makeReader(RootTree& eventTree, DaqProvenanceHelper const* daqProvenanceHelper) const override;
+    std::unique_ptr<ProvenanceReaderBase> makeReader(RootTree& eventTree,
+                                                     DaqProvenanceHelper const* daqProvenanceHelper) const override;
   };
   class MakeOldProvenanceReader : public MakeProvenanceReader {
   public:
-    MakeOldProvenanceReader(std::unique_ptr<EntryDescriptionMap>&& entryDescriptionMap) : MakeProvenanceReader(), entryDescriptionMap_(std::move(entryDescriptionMap)) {}
-    std::unique_ptr<ProvenanceReaderBase> makeReader(RootTree& eventTree, DaqProvenanceHelper const* daqProvenanceHelper) const override;
+    MakeOldProvenanceReader(std::unique_ptr<EntryDescriptionMap>&& entryDescriptionMap)
+        : MakeProvenanceReader(), entryDescriptionMap_(std::move(entryDescriptionMap)) {}
+    std::unique_ptr<ProvenanceReaderBase> makeReader(RootTree& eventTree,
+                                                     DaqProvenanceHelper const* daqProvenanceHelper) const override;
+
   private:
     edm::propagate_const<std::unique_ptr<EntryDescriptionMap>> entryDescriptionMap_;
   };
   class MakeFullProvenanceReader : public MakeProvenanceReader {
   public:
-    std::unique_ptr<ProvenanceReaderBase> makeReader(RootTree& eventTree, DaqProvenanceHelper const* daqProvenanceHelper) const override;
+    std::unique_ptr<ProvenanceReaderBase> makeReader(RootTree& eventTree,
+                                                     DaqProvenanceHelper const* daqProvenanceHelper) const override;
   };
   class MakeReducedProvenanceReader : public MakeProvenanceReader {
   public:
-    MakeReducedProvenanceReader(std::vector<ParentageID> const& parentageIDLookup) : parentageIDLookup_(parentageIDLookup) {}
-    std::unique_ptr<ProvenanceReaderBase> makeReader(RootTree& eventTree, DaqProvenanceHelper const* daqProvenanceHelper) const override;
+    MakeReducedProvenanceReader(std::vector<ParentageID> const& parentageIDLookup)
+        : parentageIDLookup_(parentageIDLookup) {}
+    std::unique_ptr<ProvenanceReaderBase> makeReader(RootTree& eventTree,
+                                                     DaqProvenanceHelper const* daqProvenanceHelper) const override;
+
   private:
     std::vector<ParentageID> const& parentageIDLookup_;
   };
 
   namespace {
-    void
-    checkReleaseVersion(std::vector<ProcessHistory> processHistoryVector, std::string const& fileName) {
+    void checkReleaseVersion(std::vector<ProcessHistory> processHistoryVector, std::string const& fileName) {
       std::string releaseVersion = getReleaseVersion();
       releaseversion::DecomposedReleaseVersion currentRelease(releaseVersion);
-      for(auto const& ph : processHistoryVector) {
-        for(auto const& pc : ph) {
-          if(releaseversion::isEarlierRelease(currentRelease, pc.releaseVersion())) {
+      for (auto const& ph : processHistoryVector) {
+        for (auto const& pc : ph) {
+          if (releaseversion::isEarlierRelease(currentRelease, pc.releaseVersion())) {
             throw Exception(errors::FormatIncompatibility)
-              << "The release you are using, " << getReleaseVersion() << " , predates\n"
-              << "a release (" << pc.releaseVersion() << ") used in writing the input file, " << fileName <<".\n"
-              << "Forward compatibility cannot be supported.\n";
+                << "The release you are using, " << getReleaseVersion() << " , predates\n"
+                << "a release (" << pc.releaseVersion() << ") used in writing the input file, " << fileName << ".\n"
+                << "Forward compatibility cannot be supported.\n";
           }
         }
       }
     }
-  }
+  }  // namespace
 
   // This is a helper class for IndexIntoFile.
   class RootFileEventFinder : public IndexIntoFile::EventFinder {
   public:
     explicit RootFileEventFinder(RootTree& eventTree) : eventTree_(eventTree) {}
     ~RootFileEventFinder() override {}
-    
+
     EventNumber_t getEventNumberOfEntry(roottree::EntryNumber entry) const override {
       roottree::EntryNumber saveEntry = eventTree_.entryNumber();
       eventTree_.setEntryNumber(entry);
       EventAuxiliary eventAux;
-      EventAuxiliary *pEvAux = &eventAux;
+      EventAuxiliary* pEvAux = &eventAux;
       eventTree_.fillAux<EventAuxiliary>(pEvAux);
       eventTree_.setEntryNumber(saveEntry);
       return eventAux.event();
     }
 
   private:
-     RootTree& eventTree_;
+    RootTree& eventTree_;
   };
 
-//---------------------------------------------------------------------
+  //---------------------------------------------------------------------
   RootFile::RootFile(std::string const& fileName,
                      ProcessConfiguration const& processConfiguration,
                      std::string const& logicalFileName,
@@ -151,103 +158,125 @@ namespace edm {
                      std::shared_ptr<DuplicateChecker> duplicateChecker,
                      bool dropDescendants,
                      ProcessHistoryRegistry& processHistoryRegistry,
-                     std::vector<std::shared_ptr<IndexIntoFile> > const& indexesIntoFiles,
-                     std::vector<std::shared_ptr<IndexIntoFile> >::size_type currentIndexIntoFile,
+                     std::vector<std::shared_ptr<IndexIntoFile>> const& indexesIntoFiles,
+                     std::vector<std::shared_ptr<IndexIntoFile>>::size_type currentIndexIntoFile,
                      std::vector<ProcessHistoryID>& orderedProcessHistoryIDs,
                      bool bypassVersionCheck,
                      bool labelRawDataLikeMC,
                      bool usingGoToEvent,
-                     bool enablePrefetching) :
-      file_(fileName),
-      logicalFile_(logicalFileName),
-      processConfiguration_(processConfiguration),
-      processHistoryRegistry_(&processHistoryRegistry),
-      filePtr_(filePtr),
-      eventSkipperByID_(eventSkipperByID),
-      fileFormatVersion_(),
-      fid_(),
-      indexIntoFileSharedPtr_(new IndexIntoFile),
-      indexIntoFile_(*indexIntoFileSharedPtr_),
-      orderedProcessHistoryIDs_(orderedProcessHistoryIDs),
-      indexIntoFileBegin_(indexIntoFile_.begin(noEventSort ? IndexIntoFile::firstAppearanceOrder : IndexIntoFile::numericalOrder)),
-      indexIntoFileEnd_(indexIntoFileBegin_),
-      indexIntoFileIter_(indexIntoFileBegin_),
-      storedMergeableRunProductMetadata_((inputType == InputType::Primary) ? new StoredMergeableRunProductMetadata : nullptr),
-      eventProcessHistoryIDs_(),
-      eventProcessHistoryIter_(eventProcessHistoryIDs_.begin()),
-      savedRunAuxiliary_(),
-      skipAnyEvents_(skipAnyEvents),
-      noEventSort_(noEventSort),
-      whyNotFastClonable_(0),
-      hasNewlyDroppedBranch_(),
-      branchListIndexesUnchanged_(false),
-      eventAux_(),
-      eventTree_(filePtr, InEvent, nStreams, treeMaxVirtualSize, treeCacheSize, roottree::defaultLearningEntries, enablePrefetching, inputType),
-      lumiTree_(filePtr, InLumi, 1, treeMaxVirtualSize, roottree::defaultNonEventCacheSize, roottree::defaultNonEventLearningEntries, enablePrefetching, inputType),
-      runTree_(filePtr, InRun, 1, treeMaxVirtualSize, roottree::defaultNonEventCacheSize, roottree::defaultNonEventLearningEntries, enablePrefetching, inputType),
-      treePointers_(),
-      lastEventEntryNumberRead_(IndexIntoFile::invalidEntry),
-      productRegistry_(),
-      branchIDLists_(),
-      branchIDListHelper_(branchIDListHelper),
-      fileThinnedAssociationsHelper_(),
-      thinnedAssociationsHelper_(thinnedAssociationsHelper),
-      processingMode_(processingMode),
-      runHelper_(runHelper),
-      newBranchToOldBranch_(),
-      eventHistoryTree_(nullptr),
-      eventSelectionIDs_(),
-      branchListIndexes_(),
-      history_(),
-      branchChildren_(new BranchChildren),
-      duplicateChecker_(duplicateChecker),
-      provenanceAdaptor_(),
-      provenanceReaderMaker_(),
-      eventProductProvenanceRetrievers_(),
-      parentageIDLookup_(),
-      daqProvenanceHelper_(),
-      edProductClass_(TypeWithDict::byName("edm::WrapperBase").getClass()),
-      inputType_(inputType) {
-
+                     bool enablePrefetching)
+      : file_(fileName),
+        logicalFile_(logicalFileName),
+        processConfiguration_(processConfiguration),
+        processHistoryRegistry_(&processHistoryRegistry),
+        filePtr_(filePtr),
+        eventSkipperByID_(eventSkipperByID),
+        fileFormatVersion_(),
+        fid_(),
+        indexIntoFileSharedPtr_(new IndexIntoFile),
+        indexIntoFile_(*indexIntoFileSharedPtr_),
+        orderedProcessHistoryIDs_(orderedProcessHistoryIDs),
+        indexIntoFileBegin_(
+            indexIntoFile_.begin(noEventSort ? IndexIntoFile::firstAppearanceOrder : IndexIntoFile::numericalOrder)),
+        indexIntoFileEnd_(indexIntoFileBegin_),
+        indexIntoFileIter_(indexIntoFileBegin_),
+        storedMergeableRunProductMetadata_((inputType == InputType::Primary) ? new StoredMergeableRunProductMetadata
+                                                                             : nullptr),
+        eventProcessHistoryIDs_(),
+        eventProcessHistoryIter_(eventProcessHistoryIDs_.begin()),
+        savedRunAuxiliary_(),
+        skipAnyEvents_(skipAnyEvents),
+        noEventSort_(noEventSort),
+        whyNotFastClonable_(0),
+        hasNewlyDroppedBranch_(),
+        branchListIndexesUnchanged_(false),
+        eventAux_(),
+        eventTree_(filePtr,
+                   InEvent,
+                   nStreams,
+                   treeMaxVirtualSize,
+                   treeCacheSize,
+                   roottree::defaultLearningEntries,
+                   enablePrefetching,
+                   inputType),
+        lumiTree_(filePtr,
+                  InLumi,
+                  1,
+                  treeMaxVirtualSize,
+                  roottree::defaultNonEventCacheSize,
+                  roottree::defaultNonEventLearningEntries,
+                  enablePrefetching,
+                  inputType),
+        runTree_(filePtr,
+                 InRun,
+                 1,
+                 treeMaxVirtualSize,
+                 roottree::defaultNonEventCacheSize,
+                 roottree::defaultNonEventLearningEntries,
+                 enablePrefetching,
+                 inputType),
+        treePointers_(),
+        lastEventEntryNumberRead_(IndexIntoFile::invalidEntry),
+        productRegistry_(),
+        branchIDLists_(),
+        branchIDListHelper_(branchIDListHelper),
+        fileThinnedAssociationsHelper_(),
+        thinnedAssociationsHelper_(thinnedAssociationsHelper),
+        processingMode_(processingMode),
+        runHelper_(runHelper),
+        newBranchToOldBranch_(),
+        eventHistoryTree_(nullptr),
+        eventSelectionIDs_(),
+        branchListIndexes_(),
+        history_(),
+        branchChildren_(new BranchChildren),
+        duplicateChecker_(duplicateChecker),
+        provenanceAdaptor_(),
+        provenanceReaderMaker_(),
+        eventProductProvenanceRetrievers_(),
+        parentageIDLookup_(),
+        daqProvenanceHelper_(),
+        edProductClass_(TypeWithDict::byName("edm::WrapperBase").getClass()),
+        inputType_(inputType) {
     hasNewlyDroppedBranch_.fill(false);
 
     treePointers_[InEvent] = &eventTree_;
-    treePointers_[InLumi]  = &lumiTree_;
-    treePointers_[InRun]   = &runTree_;
+    treePointers_[InLumi] = &lumiTree_;
+    treePointers_[InRun] = &runTree_;
 
     // Read the metadata tree.
     // We use a smart pointer so the tree will be deleted after use, and not kept for the life of the file.
-    std::unique_ptr<TTree> metaDataTree(dynamic_cast<TTree *>(filePtr_->Get(poolNames::metaDataTreeName().c_str())));
-    if(nullptr == metaDataTree.get()) {
-      throw Exception(errors::FileReadError) << "Could not find tree " << poolNames::metaDataTreeName()
-                                             << " in the input file.\n";
+    std::unique_ptr<TTree> metaDataTree(dynamic_cast<TTree*>(filePtr_->Get(poolNames::metaDataTreeName().c_str())));
+    if (nullptr == metaDataTree.get()) {
+      throw Exception(errors::FileReadError)
+          << "Could not find tree " << poolNames::metaDataTreeName() << " in the input file.\n";
     }
 
     // To keep things simple, we just read in every possible branch that exists.
     // We don't pay attention to which branches exist in which file format versions
 
-    FileFormatVersion *fftPtr = &fileFormatVersion_;
-    if(metaDataTree->FindBranch(poolNames::fileFormatVersionBranchName().c_str()) != nullptr) {
-      TBranch *fft = metaDataTree->GetBranch(poolNames::fileFormatVersionBranchName().c_str());
+    FileFormatVersion* fftPtr = &fileFormatVersion_;
+    if (metaDataTree->FindBranch(poolNames::fileFormatVersionBranchName().c_str()) != nullptr) {
+      TBranch* fft = metaDataTree->GetBranch(poolNames::fileFormatVersionBranchName().c_str());
       fft->SetAddress(&fftPtr);
       roottree::getEntry(fft, 0);
       metaDataTree->SetBranchAddress(poolNames::fileFormatVersionBranchName().c_str(), &fftPtr);
     }
 
-    FileID *fidPtr = &fid_;
-    if(metaDataTree->FindBranch(poolNames::fileIdentifierBranchName().c_str()) != nullptr) {
+    FileID* fidPtr = &fid_;
+    if (metaDataTree->FindBranch(poolNames::fileIdentifierBranchName().c_str()) != nullptr) {
       metaDataTree->SetBranchAddress(poolNames::fileIdentifierBranchName().c_str(), &fidPtr);
     }
 
-    IndexIntoFile *iifPtr = &indexIntoFile_;
-    if(metaDataTree->FindBranch(poolNames::indexIntoFileBranchName().c_str()) != nullptr) {
+    IndexIntoFile* iifPtr = &indexIntoFile_;
+    if (metaDataTree->FindBranch(poolNames::indexIntoFileBranchName().c_str()) != nullptr) {
       metaDataTree->SetBranchAddress(poolNames::indexIntoFileBranchName().c_str(), &iifPtr);
     }
 
-    StoredMergeableRunProductMetadata *smrc = nullptr;
-    if(inputType == InputType::Primary) {
+    StoredMergeableRunProductMetadata* smrc = nullptr;
+    if (inputType == InputType::Primary) {
       smrc = &*storedMergeableRunProductMetadata_;
-      if(metaDataTree->FindBranch(poolNames::mergeableRunProductMetadataBranchName().c_str()) != nullptr) {
+      if (metaDataTree->FindBranch(poolNames::mergeableRunProductMetadataBranchName().c_str()) != nullptr) {
         metaDataTree->SetBranchAddress(poolNames::mergeableRunProductMetadataBranchName().c_str(), &smrc);
       }
     }
@@ -255,23 +284,23 @@ namespace edm {
     // Need to read to a temporary registry so we can do a translation of the BranchKeys.
     // This preserves backward compatibility against friendly class name algorithm changes.
     ProductRegistry inputProdDescReg;
-    ProductRegistry *ppReg = &inputProdDescReg;
+    ProductRegistry* ppReg = &inputProdDescReg;
     metaDataTree->SetBranchAddress(poolNames::productDescriptionBranchName().c_str(), (&ppReg));
 
     typedef std::map<ParameterSetID, ParameterSetBlob> PsetMap;
     PsetMap psetMap;
-    PsetMap *psetMapPtr = &psetMap;
-    if(metaDataTree->FindBranch(poolNames::parameterSetMapBranchName().c_str()) != nullptr) {
+    PsetMap* psetMapPtr = &psetMap;
+    if (metaDataTree->FindBranch(poolNames::parameterSetMapBranchName().c_str()) != nullptr) {
       //backward compatibility
       assert(!fileFormatVersion().parameterSetsTree());
       metaDataTree->SetBranchAddress(poolNames::parameterSetMapBranchName().c_str(), &psetMapPtr);
     } else {
       assert(fileFormatVersion().parameterSetsTree());
       // We use a smart pointer so the tree will be deleted after use, and not kept for the life of the file.
-      std::unique_ptr<TTree> psetTree(dynamic_cast<TTree *>(filePtr_->Get(poolNames::parameterSetsTreeName().c_str())));
-      if(nullptr == psetTree.get()) {
-        throw Exception(errors::FileReadError) << "Could not find tree " << poolNames::parameterSetsTreeName()
-        << " in the input file.\n";
+      std::unique_ptr<TTree> psetTree(dynamic_cast<TTree*>(filePtr_->Get(poolNames::parameterSetsTreeName().c_str())));
+      if (nullptr == psetTree.get()) {
+        throw Exception(errors::FileReadError)
+            << "Could not find tree " << poolNames::parameterSetsTreeName() << " in the input file.\n";
       }
 
       typedef std::pair<ParameterSetID, ParameterSetBlob> IdToBlobs;
@@ -279,10 +308,11 @@ namespace edm {
       IdToBlobs* pIdToBlob = &idToBlob;
       psetTree->SetBranchAddress(poolNames::idToParameterSetBlobsBranchName().c_str(), &pIdToBlob);
 
-      std::unique_ptr<TTreeCache> psetTreeCache = roottree::trainCache(psetTree.get(), *filePtr_, roottree::defaultNonEventCacheSize, "*");
+      std::unique_ptr<TTreeCache> psetTreeCache =
+          roottree::trainCache(psetTree.get(), *filePtr_, roottree::defaultNonEventCacheSize, "*");
       psetTreeCache->SetEnablePrefetching(false);
       filePtr_->SetCacheRead(psetTreeCache.get());
-      for(Long64_t i = 0; i != psetTree->GetEntries(); ++i) {
+      for (Long64_t i = 0; i != psetTree->GetEntries(); ++i) {
         psetTree->GetEntry(i);
         psetMap.insert(idToBlob);
       }
@@ -291,51 +321,53 @@ namespace edm {
 
     // backward compatibility
     ProcessHistoryRegistry::collection_type pHistMap;
-    ProcessHistoryRegistry::collection_type *pHistMapPtr = &pHistMap;
-    if(metaDataTree->FindBranch(poolNames::processHistoryMapBranchName().c_str()) != nullptr) {
+    ProcessHistoryRegistry::collection_type* pHistMapPtr = &pHistMap;
+    if (metaDataTree->FindBranch(poolNames::processHistoryMapBranchName().c_str()) != nullptr) {
       metaDataTree->SetBranchAddress(poolNames::processHistoryMapBranchName().c_str(), &pHistMapPtr);
     }
 
     ProcessHistoryRegistry::vector_type pHistVector;
-    ProcessHistoryRegistry::vector_type *pHistVectorPtr = &pHistVector;
-    if(metaDataTree->FindBranch(poolNames::processHistoryBranchName().c_str()) != nullptr) {
+    ProcessHistoryRegistry::vector_type* pHistVectorPtr = &pHistVector;
+    if (metaDataTree->FindBranch(poolNames::processHistoryBranchName().c_str()) != nullptr) {
       metaDataTree->SetBranchAddress(poolNames::processHistoryBranchName().c_str(), &pHistVectorPtr);
     }
 
     // backward compatibility
     ProcessConfigurationVector processConfigurations;
     ProcessConfigurationVector* procConfigVectorPtr = &processConfigurations;
-    if(metaDataTree->FindBranch(poolNames::processConfigurationBranchName().c_str()) != nullptr) {
+    if (metaDataTree->FindBranch(poolNames::processConfigurationBranchName().c_str()) != nullptr) {
       metaDataTree->SetBranchAddress(poolNames::processConfigurationBranchName().c_str(), &procConfigVectorPtr);
     }
 
     auto branchIDListsAPtr = std::make_unique<BranchIDLists>();
     BranchIDLists* branchIDListsPtr = branchIDListsAPtr.get();
-    if(metaDataTree->FindBranch(poolNames::branchIDListBranchName().c_str()) != nullptr) {
+    if (metaDataTree->FindBranch(poolNames::branchIDListBranchName().c_str()) != nullptr) {
       metaDataTree->SetBranchAddress(poolNames::branchIDListBranchName().c_str(), &branchIDListsPtr);
     }
 
-    if(inputType != InputType::SecondarySource) {
-      fileThinnedAssociationsHelper_ = std::make_unique<ThinnedAssociationsHelper>(); // propagate_const<T> has no reset() function
+    if (inputType != InputType::SecondarySource) {
+      fileThinnedAssociationsHelper_ =
+          std::make_unique<ThinnedAssociationsHelper>();  // propagate_const<T> has no reset() function
       ThinnedAssociationsHelper* thinnedAssociationsHelperPtr = fileThinnedAssociationsHelper_.get();
-      if(metaDataTree->FindBranch(poolNames::thinnedAssociationsHelperBranchName().c_str()) != nullptr) {
-        metaDataTree->SetBranchAddress(poolNames::thinnedAssociationsHelperBranchName().c_str(), &thinnedAssociationsHelperPtr);
+      if (metaDataTree->FindBranch(poolNames::thinnedAssociationsHelperBranchName().c_str()) != nullptr) {
+        metaDataTree->SetBranchAddress(poolNames::thinnedAssociationsHelperBranchName().c_str(),
+                                       &thinnedAssociationsHelperPtr);
       }
     }
 
     BranchChildren* branchChildrenBuffer = branchChildren_.get();
-    if(metaDataTree->FindBranch(poolNames::productDependenciesBranchName().c_str()) != nullptr) {
+    if (metaDataTree->FindBranch(poolNames::productDependenciesBranchName().c_str()) != nullptr) {
       metaDataTree->SetBranchAddress(poolNames::productDependenciesBranchName().c_str(), &branchChildrenBuffer);
     }
 
     // backward compatibility
-    std::vector<EventProcessHistoryID> *eventHistoryIDsPtr = &eventProcessHistoryIDs_;
-    if(metaDataTree->FindBranch(poolNames::eventHistoryBranchName().c_str()) != nullptr) {
+    std::vector<EventProcessHistoryID>* eventHistoryIDsPtr = &eventProcessHistoryIDs_;
+    if (metaDataTree->FindBranch(poolNames::eventHistoryBranchName().c_str()) != nullptr) {
       metaDataTree->SetBranchAddress(poolNames::eventHistoryBranchName().c_str(), &eventHistoryIDsPtr);
     }
 
-    if(metaDataTree->FindBranch(poolNames::moduleDescriptionMapBranchName().c_str()) != nullptr) {
-      if(metaDataTree->GetBranch(poolNames::moduleDescriptionMapBranchName().c_str())->GetSplitLevel() != 0) {
+    if (metaDataTree->FindBranch(poolNames::moduleDescriptionMapBranchName().c_str()) != nullptr) {
+      if (metaDataTree->GetBranch(poolNames::moduleDescriptionMapBranchName().c_str())->GetSplitLevel() != 0) {
         metaDataTree->SetBranchStatus((poolNames::moduleDescriptionMapBranchName() + ".*").c_str(), false);
       } else {
         metaDataTree->SetBranchStatus(poolNames::moduleDescriptionMapBranchName().c_str(), false);
@@ -351,60 +383,59 @@ namespace edm {
     readEventHistoryTree();
 
     ParameterSetConverter::ParameterSetIdConverter psetIdConverter;
-    if(!fileFormatVersion().triggerPathsTracked()) {
+    if (!fileFormatVersion().triggerPathsTracked()) {
       ParameterSetConverter converter(psetMap, psetIdConverter, fileFormatVersion().parameterSetsByReference());
     } else {
       // Merge into the parameter set registry.
       pset::Registry& psetRegistry = *pset::Registry::instance();
-      for(auto const& psetEntry : psetMap) {
+      for (auto const& psetEntry : psetMap) {
         ParameterSet pset(psetEntry.second.pset());
         pset.setID(psetEntry.first);
         // For thread safety, don't update global registries when a secondary source opens a file.
-        if(inputType != InputType::SecondarySource) {
+        if (inputType != InputType::SecondarySource) {
           psetRegistry.insertMapped(pset);
         }
       }
     }
-    if(!fileFormatVersion().splitProductIDs()) {
+    if (!fileFormatVersion().splitProductIDs()) {
       // Old provenance format input file.  Create a provenance adaptor.
       // propagate_const<T> has no reset() function
       provenanceAdaptor_ = std::make_unique<ProvenanceAdaptor>(
-            inputProdDescReg, pHistMap, pHistVector, processConfigurations, psetIdConverter, true);
+          inputProdDescReg, pHistMap, pHistVector, processConfigurations, psetIdConverter, true);
       // Fill in the branchIDLists branch from the provenance adaptor
       branchIDLists_ = provenanceAdaptor_->branchIDLists();
     } else {
-      if(!fileFormatVersion().triggerPathsTracked()) {
+      if (!fileFormatVersion().triggerPathsTracked()) {
         // New provenance format, but change in ParameterSet Format. Create a provenance adaptor.
         // propagate_const<T> has no reset() function
         provenanceAdaptor_ = std::make_unique<ProvenanceAdaptor>(
             inputProdDescReg, pHistMap, pHistVector, processConfigurations, psetIdConverter, false);
       }
       // New provenance format input file. The branchIDLists branch was read directly from the input file.
-      if(metaDataTree->FindBranch(poolNames::branchIDListBranchName().c_str()) == nullptr) {
-        throw Exception(errors::EventCorruption)
-          << "Failed to find branchIDLists branch in metaData tree.\n";
+      if (metaDataTree->FindBranch(poolNames::branchIDListBranchName().c_str()) == nullptr) {
+        throw Exception(errors::EventCorruption) << "Failed to find branchIDLists branch in metaData tree.\n";
       }
       branchIDLists_.reset(branchIDListsAPtr.release());
     }
 
-    if(fileFormatVersion().hasThinnedAssociations()) {
-      if(metaDataTree->FindBranch(poolNames::thinnedAssociationsHelperBranchName().c_str()) == nullptr) {
+    if (fileFormatVersion().hasThinnedAssociations()) {
+      if (metaDataTree->FindBranch(poolNames::thinnedAssociationsHelperBranchName().c_str()) == nullptr) {
         throw Exception(errors::EventCorruption)
-          << "Failed to find thinnedAssociationsHelper branch in metaData tree.\n";
+            << "Failed to find thinnedAssociationsHelper branch in metaData tree.\n";
       }
     }
 
-    if(!bypassVersionCheck) {
+    if (!bypassVersionCheck) {
       checkReleaseVersion(pHistVector, file());
     }
 
-    if(labelRawDataLikeMC) {
+    if (labelRawDataLikeMC) {
       std::string const rawData("FEDRawDataCollection");
       std::string const source("source");
       ProductRegistry::ProductList& pList = inputProdDescReg.productListUpdator();
       BranchKey finder(rawData, source, "", "");
       ProductRegistry::ProductList::iterator it = pList.lower_bound(finder);
-      if(it != pList.end() && it->first.friendlyClassName() == rawData && it->first.moduleLabel() == source) {
+      if (it != pList.end() && it->first.friendlyClassName() == rawData && it->first.moduleLabel() == source) {
         // We found raw data with a module label of source.
         // We need to change the module label and process name.
         // Create helper.
@@ -431,7 +462,7 @@ namespace edm {
       }
     }
 
-    for(auto const& history : pHistVector) {
+    for (auto const& history : pHistVector) {
       processHistoryRegistry.registerProcessHistory(history);
     }
 
@@ -439,7 +470,7 @@ namespace edm {
 
     // Update the branch id info. This has to be done before validateFile since
     // depending on the file format, the branchIDListHelper_ may have its fixBranchListIndexes call made
-    if(inputType == InputType::Primary) {
+    if (inputType == InputType::Primary) {
       branchListIndexesUnchanged_ = branchIDListHelper_->updateFromInput(*branchIDLists_);
     }
 
@@ -451,19 +482,21 @@ namespace edm {
     provenanceReaderMaker_ = std::unique_ptr<MakeProvenanceReader>(makeProvenanceReaderMaker(inputType).release());
 
     // Merge into the hashed registries.
-    if(eventSkipperByID_ && eventSkipperByID_->somethingToSkip()) {
+    if (eventSkipperByID_ && eventSkipperByID_->somethingToSkip()) {
       whyNotFastClonable_ += FileBlock::EventsOrLumisSelectedByID;
     }
 
     initializeDuplicateChecker(indexesIntoFiles, currentIndexIntoFile);
-    indexIntoFileIter_ = indexIntoFileBegin_ = indexIntoFile_.begin(noEventSort ? IndexIntoFile::firstAppearanceOrder : IndexIntoFile::numericalOrder);
-    indexIntoFileEnd_ = indexIntoFile_.end(noEventSort ? IndexIntoFile::firstAppearanceOrder : IndexIntoFile::numericalOrder);
+    indexIntoFileIter_ = indexIntoFileBegin_ =
+        indexIntoFile_.begin(noEventSort ? IndexIntoFile::firstAppearanceOrder : IndexIntoFile::numericalOrder);
+    indexIntoFileEnd_ =
+        indexIntoFile_.end(noEventSort ? IndexIntoFile::firstAppearanceOrder : IndexIntoFile::numericalOrder);
     runHelper_->setForcedRunOffset(indexIntoFileBegin_ == indexIntoFileEnd_ ? 1 : indexIntoFileBegin_.run());
     eventProcessHistoryIter_ = eventProcessHistoryIDs_.begin();
 
     // Set product presence information in the product registry.
     ProductRegistry::ProductList& pList = inputProdDescReg.productListUpdator();
-    for(auto& product : pList) {
+    for (auto& product : pList) {
       BranchDescription& prod = product.second;
       prod.init();
       treePointers_[prod.branchType()]->setPresence(prod, newBranchToOldBranch(prod.branchName()));
@@ -474,16 +507,16 @@ namespace edm {
     // Do the translation from the old registry to the new one
     {
       ProductRegistry::ProductList const& prodList = inputProdDescReg.productList();
-      for(auto const& product : prodList) {
+      for (auto const& product : prodList) {
         BranchDescription const& prod = product.second;
         std::string newFriendlyName = friendlyname::friendlyName(prod.className());
-        if(newFriendlyName == prod.friendlyClassName()) {
+        if (newFriendlyName == prod.friendlyClassName()) {
           newReg->copyProduct(prod);
         } else {
-          if(fileFormatVersion().splitProductIDs()) {
+          if (fileFormatVersion().splitProductIDs()) {
             throw Exception(errors::UnimplementedFeature)
-              << "Cannot change friendly class name algorithm without more development work\n"
-              << "to update BranchIDLists and ThinnedAssociationsHelper.  Contact the framework group.\n";
+                << "Cannot change friendly class name algorithm without more development work\n"
+                << "to update BranchIDLists and ThinnedAssociationsHelper.  Contact the framework group.\n";
           }
           BranchDescription newBD(prod);
           newBD.updateFriendlyClassName();
@@ -492,7 +525,7 @@ namespace edm {
         }
       }
       dropOnInput(*newReg, productSelectorRules, dropDescendants, inputType);
-      if(inputType == InputType::SecondaryFile) {
+      if (inputType == InputType::SecondaryFile) {
         thinnedAssociationsHelper->updateFromSecondaryInput(*fileThinnedAssociationsHelper_,
                                                             *associationsFromSecondary);
       } else if (inputType == InputType::Primary) {
@@ -500,7 +533,7 @@ namespace edm {
       }
 
       if (inputType == InputType::Primary) {
-        for(auto & product : newReg->productListUpdator()) {
+        for (auto& product : newReg->productListUpdator()) {
           setIsMergeable(product.second);
         }
       }
@@ -514,22 +547,21 @@ namespace edm {
     ProductRegistry::ProductList const& prodList = productRegistry()->productList();
 
     {
-      std::array<size_t,NumBranchTypes> nBranches;
+      std::array<size_t, NumBranchTypes> nBranches;
       nBranches.fill(0);
-      for(auto const& product : prodList) {
+      for (auto const& product : prodList) {
         ++nBranches[product.second.branchType()];
       }
 
       int i = 0;
-      for(auto t: treePointers_) {
+      for (auto t : treePointers_) {
         t->numberOfBranchesToAdd(nBranches[i]);
         ++i;
       }
     }
-    for(auto const& product : prodList) {
+    for (auto const& product : prodList) {
       BranchDescription const& prod = product.second;
-      treePointers_[prod.branchType()]->addBranch(prod,
-                                                  newBranchToOldBranch(prod.branchName()));
+      treePointers_[prod.branchType()]->addBranch(prod, newBranchToOldBranch(prod.branchName()));
     }
 
     // Determine if this file is fast clonable.
@@ -546,17 +578,16 @@ namespace edm {
     lumiTree_.trainCache("*");
   }
 
-  RootFile::~RootFile() {
-  }
+  RootFile::~RootFile() {}
 
-  void
-  RootFile::readEntryDescriptionTree(EntryDescriptionMap& entryDescriptionMap, InputType inputType) {
+  void RootFile::readEntryDescriptionTree(EntryDescriptionMap& entryDescriptionMap, InputType inputType) {
     // Called only for old format files.
     // We use a smart pointer so the tree will be deleted after use, and not kept for the life of the file.
-    std::unique_ptr<TTree> entryDescriptionTree(dynamic_cast<TTree*>(filePtr_->Get(poolNames::entryDescriptionTreeName().c_str())));
-    if(nullptr == entryDescriptionTree.get()) {
-      throw Exception(errors::FileReadError) << "Could not find tree " << poolNames::entryDescriptionTreeName()
-                                             << " in the input file.\n";
+    std::unique_ptr<TTree> entryDescriptionTree(
+        dynamic_cast<TTree*>(filePtr_->Get(poolNames::entryDescriptionTreeName().c_str())));
+    if (nullptr == entryDescriptionTree.get()) {
+      throw Exception(errors::FileReadError)
+          << "Could not find tree " << poolNames::entryDescriptionTreeName() << " in the input file.\n";
     }
 
     EntryDescriptionID idBuffer;
@@ -564,30 +595,30 @@ namespace edm {
     entryDescriptionTree->SetBranchAddress(poolNames::entryDescriptionIDBranchName().c_str(), &pidBuffer);
 
     EventEntryDescription entryDescriptionBuffer;
-    EventEntryDescription *pEntryDescriptionBuffer = &entryDescriptionBuffer;
+    EventEntryDescription* pEntryDescriptionBuffer = &entryDescriptionBuffer;
     entryDescriptionTree->SetBranchAddress(poolNames::entryDescriptionBranchName().c_str(), &pEntryDescriptionBuffer);
 
     // Fill in the parentage registry.
     ParentageRegistry& registry = *ParentageRegistry::instance();
 
-    for(Long64_t i = 0, numEntries = entryDescriptionTree->GetEntries(); i < numEntries; ++i) {
+    for (Long64_t i = 0, numEntries = entryDescriptionTree->GetEntries(); i < numEntries; ++i) {
       roottree::getEntry(entryDescriptionTree.get(), i);
-      if(idBuffer != entryDescriptionBuffer.id()) {
+      if (idBuffer != entryDescriptionBuffer.id()) {
         throw Exception(errors::EventCorruption) << "Corruption of EntryDescription tree detected.\n";
       }
-      entryDescriptionMap.insert(std::make_pair(entryDescriptionBuffer.id(),entryDescriptionBuffer));
+      entryDescriptionMap.insert(std::make_pair(entryDescriptionBuffer.id(), entryDescriptionBuffer));
       Parentage parents;
       parents.setParents(entryDescriptionBuffer.parents());
-      if(daqProvenanceHelper_) {
+      if (daqProvenanceHelper_) {
         ParentageID const oldID = parents.id();
         daqProvenanceHelper_->fixMetaData(parents.parentsForUpdate());
         ParentageID newID = parents.id();
-        if(newID != oldID) {
-          daqProvenanceHelper_->setOldParentageIDToNew(oldID,newID);
+        if (newID != oldID) {
+          daqProvenanceHelper_->setOldParentageIDToNew(oldID, newID);
         }
       }
       // For thread safety, don't update global registries when a secondary source opens a file.
-      if(inputType != InputType::SecondarySource) {
+      if (inputType != InputType::SecondarySource) {
         registry.insertMapped(parents);
       }
     }
@@ -595,35 +626,34 @@ namespace edm {
     entryDescriptionTree->SetBranchAddress(poolNames::entryDescriptionBranchName().c_str(), nullptr);
   }
 
-  void
-  RootFile::readParentageTree(InputType inputType) {
+  void RootFile::readParentageTree(InputType inputType) {
     // New format file
     // We use a smart pointer so the tree will be deleted after use, and not kept for the life of the file.
     std::unique_ptr<TTree> parentageTree(dynamic_cast<TTree*>(filePtr_->Get(poolNames::parentageTreeName().c_str())));
-    if(nullptr == parentageTree.get()) {
-      throw Exception(errors::FileReadError) << "Could not find tree " << poolNames::parentageTreeName()
-                                             << " in the input file.\n";
+    if (nullptr == parentageTree.get()) {
+      throw Exception(errors::FileReadError)
+          << "Could not find tree " << poolNames::parentageTreeName() << " in the input file.\n";
     }
 
     Parentage parents;
-    Parentage *pParentageBuffer = &parents;
+    Parentage* pParentageBuffer = &parents;
     parentageTree->SetBranchAddress(poolNames::parentageBranchName().c_str(), &pParentageBuffer);
 
     ParentageRegistry& registry = *ParentageRegistry::instance();
 
     parentageIDLookup_.reserve(parentageTree->GetEntries());
-    for(Long64_t i = 0, numEntries = parentageTree->GetEntries(); i < numEntries; ++i) {
+    for (Long64_t i = 0, numEntries = parentageTree->GetEntries(); i < numEntries; ++i) {
       roottree::getEntry(parentageTree.get(), i);
-      if(daqProvenanceHelper_) {
+      if (daqProvenanceHelper_) {
         ParentageID const oldID = parents.id();
         daqProvenanceHelper_->fixMetaData(parents.parentsForUpdate());
         ParentageID newID = parents.id();
-        if(newID != oldID) {
-          daqProvenanceHelper_->setOldParentageIDToNew(oldID,newID);
+        if (newID != oldID) {
+          daqProvenanceHelper_->setOldParentageIDToNew(oldID, newID);
         }
       }
       // For thread safety, don't update global registries when a secondary source opens a file.
-      if(inputType != InputType::SecondarySource) {
+      if (inputType != InputType::SecondarySource) {
         registry.insertMapped(parents);
       }
       parentageIDLookup_.push_back(parents.id());
@@ -631,54 +661,51 @@ namespace edm {
     parentageTree->SetBranchAddress(poolNames::parentageBranchName().c_str(), nullptr);
   }
 
-  void
-  RootFile::setIfFastClonable(int remainingEvents, int remainingLumis) {
-    if(fileFormatVersion().noMetaDataTrees() and !fileFormatVersion().storedProductProvenanceUsed()) {
+  void RootFile::setIfFastClonable(int remainingEvents, int remainingLumis) {
+    if (fileFormatVersion().noMetaDataTrees() and !fileFormatVersion().storedProductProvenanceUsed()) {
       //we must avoid copying the old branch which stored the per product per event provenance
       whyNotFastClonable_ += FileBlock::FileTooOld;
       return;
     }
-    if(!fileFormatVersion().splitProductIDs()) {
+    if (!fileFormatVersion().splitProductIDs()) {
       whyNotFastClonable_ += FileBlock::FileTooOld;
       return;
     }
-    if(processingMode_ != InputSource::RunsLumisAndEvents) {
+    if (processingMode_ != InputSource::RunsLumisAndEvents) {
       whyNotFastClonable_ += FileBlock::NotProcessingEvents;
       return;
     }
     // Find entry for first event in file
     IndexIntoFile::IndexIntoFileItr it = indexIntoFileBegin_;
-    while(it != indexIntoFileEnd_ && it.getEntryType() != IndexIntoFile::kEvent) {
+    while (it != indexIntoFileEnd_ && it.getEntryType() != IndexIntoFile::kEvent) {
       ++it;
     }
-    if(it == indexIntoFileEnd_) {
+    if (it == indexIntoFileEnd_) {
       whyNotFastClonable_ += FileBlock::NoEventsInFile;
       return;
     }
 
     // From here on, record all reasons we can't fast clone.
-    IndexIntoFile::SortOrder sortOrder = (noEventSort_ ? IndexIntoFile::firstAppearanceOrder : IndexIntoFile::numericalOrder);
-    if(!indexIntoFile_.iterationWillBeInEntryOrder(sortOrder)) {
+    IndexIntoFile::SortOrder sortOrder =
+        (noEventSort_ ? IndexIntoFile::firstAppearanceOrder : IndexIntoFile::numericalOrder);
+    if (!indexIntoFile_.iterationWillBeInEntryOrder(sortOrder)) {
       whyNotFastClonable_ += (noEventSort_ ? FileBlock::RunOrLumiNotContiguous : FileBlock::EventsToBeSorted);
     }
-    if(skipAnyEvents_) {
+    if (skipAnyEvents_) {
       whyNotFastClonable_ += FileBlock::InitialEventsSkipped;
     }
-    if(remainingEvents >= 0 && eventTree_.entries() > remainingEvents) {
+    if (remainingEvents >= 0 && eventTree_.entries() > remainingEvents) {
       whyNotFastClonable_ += FileBlock::MaxEventsTooSmall;
     }
-    if(remainingLumis >= 0 && lumiTree_.entries() > remainingLumis) {
+    if (remainingLumis >= 0 && lumiTree_.entries() > remainingLumis) {
       whyNotFastClonable_ += FileBlock::MaxLumisTooSmall;
     }
-    if(duplicateChecker_ &&
-      !duplicateChecker_->checkDisabled() &&
-      !duplicateChecker_->noDuplicatesInFile()) {
+    if (duplicateChecker_ && !duplicateChecker_->checkDisabled() && !duplicateChecker_->noDuplicatesInFile()) {
       whyNotFastClonable_ += FileBlock::DuplicateEventsRemoved;
     }
   }
 
-  std::unique_ptr<FileBlock>
-  RootFile::createFileBlock() const {
+  std::unique_ptr<FileBlock> RootFile::createFileBlock() const {
     return std::make_unique<FileBlock>(fileFormatVersion(),
                                        eventTree_.tree(),
                                        eventTree_.metaTree(),
@@ -694,126 +721,115 @@ namespace edm {
                                        branchChildren());
   }
 
-  std::string const&
-  RootFile::newBranchToOldBranch(std::string const& newBranch) const {
+  std::string const& RootFile::newBranchToOldBranch(std::string const& newBranch) const {
     std::map<std::string, std::string>::const_iterator it = newBranchToOldBranch_.find(newBranch);
-    if(it != newBranchToOldBranch_.end()) {
+    if (it != newBranchToOldBranch_.end()) {
       return it->second;
     }
     return newBranch;
   }
 
-  IndexIntoFile::IndexIntoFileItr
-  RootFile::indexIntoFileIter() const {
-    return indexIntoFileIter_;
-  }
+  IndexIntoFile::IndexIntoFileItr RootFile::indexIntoFileIter() const { return indexIntoFileIter_; }
 
-  void
-  RootFile::setPosition(IndexIntoFile::IndexIntoFileItr const& position) {
+  void RootFile::setPosition(IndexIntoFile::IndexIntoFileItr const& position) {
     indexIntoFileIter_.copyPosition(position);
   }
 
-  void
-  RootFile::initAssociationsFromSecondary(std::vector<BranchID> const& associationsFromSecondary) {
-    thinnedAssociationsHelper_->initAssociationsFromSecondary(associationsFromSecondary, *fileThinnedAssociationsHelper_);
+  void RootFile::initAssociationsFromSecondary(std::vector<BranchID> const& associationsFromSecondary) {
+    thinnedAssociationsHelper_->initAssociationsFromSecondary(associationsFromSecondary,
+                                                              *fileThinnedAssociationsHelper_);
   }
 
-  bool
-  RootFile::skipThisEntry() {
-    if(indexIntoFileIter_ == indexIntoFileEnd_) {
-        return false;
+  bool RootFile::skipThisEntry() {
+    if (indexIntoFileIter_ == indexIntoFileEnd_) {
+      return false;
     }
-    if(eventSkipperByID_ && eventSkipperByID_->somethingToSkip()) {
-
+    if (eventSkipperByID_ && eventSkipperByID_->somethingToSkip()) {
       // See first if the entire lumi or run is skipped, so we won't have to read the event Auxiliary in that case.
-      if(eventSkipperByID_->skipIt(indexIntoFileIter_.run(), indexIntoFileIter_.lumi(), 0U)) {
+      if (eventSkipperByID_->skipIt(indexIntoFileIter_.run(), indexIntoFileIter_.lumi(), 0U)) {
         return true;
       }
 
       // The Lumi is not skipped.  If this is an event, see if the event is skipped.
-      if(indexIntoFileIter_.getEntryType() == IndexIntoFile::kEvent) {
+      if (indexIntoFileIter_.getEntryType() == IndexIntoFile::kEvent) {
         fillEventAuxiliary(indexIntoFileIter_.entry());
-        if(eventSkipperByID_->skipIt(indexIntoFileIter_.run(),
-                                      indexIntoFileIter_.lumi(),
-                                      eventAux_.id().event())) {
+        if (eventSkipperByID_->skipIt(indexIntoFileIter_.run(), indexIntoFileIter_.lumi(), eventAux_.id().event())) {
           return true;
         }
       }
 
       // Skip runs with no lumis if either lumisToSkip or lumisToProcess have been set to select lumis
-      if(indexIntoFileIter_.getEntryType() == IndexIntoFile::kRun &&
-          eventSkipperByID_->skippingLumis()) {
+      if (indexIntoFileIter_.getEntryType() == IndexIntoFile::kRun && eventSkipperByID_->skippingLumis()) {
         IndexIntoFile::IndexIntoFileItr iterLumi = indexIntoFileIter_;
 
         // There are no lumis in this run, not even ones we will skip
-        if(iterLumi.peekAheadAtLumi() == IndexIntoFile::invalidLumi) {
+        if (iterLumi.peekAheadAtLumi() == IndexIntoFile::invalidLumi) {
           return true;
         }
         // If we get here there are lumis in the run, check to see if we are skipping all of them
         do {
-          if(!eventSkipperByID_->skipIt(iterLumi.run(), iterLumi.peekAheadAtLumi(), 0U)) {
+          if (!eventSkipperByID_->skipIt(iterLumi.run(), iterLumi.peekAheadAtLumi(), 0U)) {
             return false;
           }
-        }
-        while(iterLumi.skipLumiInRun());
+        } while (iterLumi.skipLumiInRun());
         return true;
       }
     }
     return false;
   }
 
-  bool
-  RootFile::isDuplicateEvent() {
+  bool RootFile::isDuplicateEvent() {
     assert(indexIntoFileIter_.getEntryType() == IndexIntoFile::kEvent);
-    if(duplicateChecker_.get() == nullptr) {
+    if (duplicateChecker_.get() == nullptr) {
       return false;
     }
     fillEventAuxiliary(indexIntoFileIter_.entry());
     return duplicateChecker_->isDuplicateAndCheckActive(indexIntoFileIter_.processHistoryIDIndex(),
-        indexIntoFileIter_.run(), indexIntoFileIter_.lumi(), eventAux_.id().event(), file_);
+                                                        indexIntoFileIter_.run(),
+                                                        indexIntoFileIter_.lumi(),
+                                                        eventAux_.id().event(),
+                                                        file_);
   }
 
-  bool
-  RootFile::containsItem(RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event) const {
+  bool RootFile::containsItem(RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event) const {
     return indexIntoFile_.containsItem(run, lumi, event);
   }
 
-  IndexIntoFile::EntryType
-  RootFile::getNextItemType(RunNumber_t& run, LuminosityBlockNumber_t& lumi, EventNumber_t& event) {
+  IndexIntoFile::EntryType RootFile::getNextItemType(RunNumber_t& run,
+                                                     LuminosityBlockNumber_t& lumi,
+                                                     EventNumber_t& event) {
     // First, account for consecutive skipped entries.
-    while(skipThisEntry()) {
-      if(indexIntoFileIter_.getEntryType() == IndexIntoFile::kRun) {
+    while (skipThisEntry()) {
+      if (indexIntoFileIter_.getEntryType() == IndexIntoFile::kRun) {
         indexIntoFileIter_.advanceToNextRun();
-      }
-      else if(indexIntoFileIter_.getEntryType() == IndexIntoFile::kLumi) {
+      } else if (indexIntoFileIter_.getEntryType() == IndexIntoFile::kLumi) {
         indexIntoFileIter_.advanceToNextLumiOrRun();
-      }
-      else {
+      } else {
         ++indexIntoFileIter_;
       }
     }
     // OK, we have an entry that is not skipped.
     IndexIntoFile::EntryType entryType = indexIntoFileIter_.getEntryType();
-    if(entryType == IndexIntoFile::kEnd) {
+    if (entryType == IndexIntoFile::kEnd) {
       return IndexIntoFile::kEnd;
     }
-    if(entryType == IndexIntoFile::kRun) {
+    if (entryType == IndexIntoFile::kRun) {
       run = indexIntoFileIter_.run();
       runHelper_->checkForNewRun(run);
       return IndexIntoFile::kRun;
-    } else if(processingMode_ == InputSource::Runs) {
+    } else if (processingMode_ == InputSource::Runs) {
       indexIntoFileIter_.advanceToNextRun();
       return getNextItemType(run, lumi, event);
     }
-    if(entryType == IndexIntoFile::kLumi) {
+    if (entryType == IndexIntoFile::kLumi) {
       run = indexIntoFileIter_.run();
       lumi = indexIntoFileIter_.lumi();
       return IndexIntoFile::kLumi;
-    } else if(processingMode_ == InputSource::RunsAndLumis) {
+    } else if (processingMode_ == InputSource::RunsAndLumis) {
       indexIntoFileIter_.advanceToNextLumiOrRun();
       return getNextItemType(run, lumi, event);
     }
-    if(isDuplicateEvent()) {
+    if (isDuplicateEvent()) {
       ++indexIntoFileIter_;
       return getNextItemType(run, lumi, event);
     }
@@ -824,42 +840,31 @@ namespace edm {
     return IndexIntoFile::kEvent;
   }
 
-  bool
-  RootFile::wasLastEventJustRead() const {
+  bool RootFile::wasLastEventJustRead() const {
     IndexIntoFile::IndexIntoFileItr itr(indexIntoFileIter_);
     itr.advanceToEvent();
     return itr.getEntryType() == IndexIntoFile::kEnd;
   }
 
-  bool
-  RootFile::wasFirstEventJustRead() const {
+  bool RootFile::wasFirstEventJustRead() const {
     IndexIntoFile::IndexIntoFileItr itr(indexIntoFileIter_);
     int phIndex;
     RunNumber_t run;
     LuminosityBlockNumber_t lumi;
     IndexIntoFile::EntryNumber_t eventEntry;
-    itr.skipEventBackward(phIndex,
-                          run,
-                          lumi,
-                          eventEntry);
-    itr.skipEventBackward(phIndex,
-                          run,
-                          lumi,
-                          eventEntry);
+    itr.skipEventBackward(phIndex, run, lumi, eventEntry);
+    itr.skipEventBackward(phIndex, run, lumi, eventEntry);
     return eventEntry == IndexIntoFile::invalidEntry;
   }
 
   namespace {
     struct RunItem {
-      RunItem(ProcessHistoryID const& phid, RunNumber_t const& run) :
-        phid_(phid), run_(run) {}
+      RunItem(ProcessHistoryID const& phid, RunNumber_t const& run) : phid_(phid), run_(run) {}
       ProcessHistoryID phid_;
       RunNumber_t run_;
     };
     struct RunItemSortByRun {
-      bool operator()(RunItem const& a, RunItem const& b) const {
-        return a.run_ < b.run_;
-      }
+      bool operator()(RunItem const& a, RunItem const& b) const { return a.run_ < b.run_; }
     };
     struct RunItemSortByRunPhid {
       bool operator()(RunItem const& a, RunItem const& b) const {
@@ -867,10 +872,15 @@ namespace edm {
       }
     };
     struct LumiItem {
-      LumiItem(ProcessHistoryID const& phid, RunNumber_t const& run,
-                 LuminosityBlockNumber_t const& lumi, IndexIntoFile::EntryNumber_t const& entry) :
-        phid_(phid), run_(run), lumi_(lumi), firstEventEntry_(entry),
-        lastEventEntry_(entry == IndexIntoFile::invalidEntry ? IndexIntoFile::invalidEntry : entry + 1) {}
+      LumiItem(ProcessHistoryID const& phid,
+               RunNumber_t const& run,
+               LuminosityBlockNumber_t const& lumi,
+               IndexIntoFile::EntryNumber_t const& entry)
+          : phid_(phid),
+            run_(run),
+            lumi_(lumi),
+            firstEventEntry_(entry),
+            lastEventEntry_(entry == IndexIntoFile::invalidEntry ? IndexIntoFile::invalidEntry : entry + 1) {}
       ProcessHistoryID phid_;
       RunNumber_t run_;
       LuminosityBlockNumber_t lumi_;
@@ -884,17 +894,20 @@ namespace edm {
     };
     struct LumiItemSortByRunLumiPhid {
       bool operator()(LumiItem const& a, LumiItem const& b) const {
-        if(a.run_ < b.run_) return true;
-        if(b.run_ < a.run_) return false;
-        if(a.lumi_ < b.lumi_) return true;
-        if(b.lumi_ < a.lumi_) return false;
+        if (a.run_ < b.run_)
+          return true;
+        if (b.run_ < a.run_)
+          return false;
+        if (a.lumi_ < b.lumi_)
+          return true;
+        if (b.lumi_ < a.lumi_)
+          return false;
         return a.phid_ < b.phid_;
       }
     };
-  }
+  }  // namespace
 
-  void
-  RootFile::fillIndexIntoFile() {
+  void RootFile::fillIndexIntoFile() {
     // This function is for backward compatibility.
     // If reading a current format file, indexIntoFile_ is read from the input
     // file and should always be there. Note that the algorithm below will work
@@ -905,19 +918,19 @@ namespace edm {
     assert(!fileFormatVersion().hasIndexIntoFile());
 
     typedef std::list<LumiItem> LumiList;
-    LumiList lumis; // (declare 1)
+    LumiList lumis;  // (declare 1)
 
     typedef std::set<LuminosityBlockID> RunLumiSet;
-    RunLumiSet runLumiSet; // (declare 2)
+    RunLumiSet runLumiSet;  // (declare 2)
 
     typedef std::list<RunItem> RunList;
-    RunList runs; // (declare 5)
+    RunList runs;  // (declare 5)
 
     typedef std::set<RunNumber_t> RunSet;
-    RunSet runSet; // (declare 4)
+    RunSet runSet;  // (declare 4)
 
     typedef std::set<RunItem, RunItemSortByRunPhid> RunItemSet;
-    RunItemSet runItemSet; // (declare 3)
+    RunItemSet runItemSet;  // (declare 3)
 
     typedef std::map<RunNumber_t, ProcessHistoryID> PHIDMap;
     PHIDMap phidMap;
@@ -927,11 +940,11 @@ namespace edm {
     ProcessHistoryID prevPhid;
     bool iFirst = true;
 
-    indexIntoFile_.unsortedEventNumbers().clear(); // should already be empty, just being careful
+    indexIntoFile_.unsortedEventNumbers().clear();  // should already be empty, just being careful
     indexIntoFile_.unsortedEventNumbers().reserve(eventTree_.entries());
 
     // First, loop through the event tree.
-    while(eventTree_.next()) {
+    while (eventTree_.next()) {
       bool newRun = false;
       bool newLumi = false;
       fillThisEventAuxiliary();
@@ -944,30 +957,30 @@ namespace edm {
 
       ProcessHistoryID reducedPHID = processHistoryRegistry_->reducedProcessHistoryID(eventAux().processHistoryID());
 
-      if(iFirst || prevPhid != reducedPHID || prevRun != eventAux().run()) {
+      if (iFirst || prevPhid != reducedPHID || prevRun != eventAux().run()) {
         iFirst = false;
         newRun = newLumi = true;
-      } else if(prevLumi != eventAux().luminosityBlock()) {
+      } else if (prevLumi != eventAux().luminosityBlock()) {
         newLumi = true;
       }
       prevPhid = reducedPHID;
       prevRun = eventAux().run();
       prevLumi = eventAux().luminosityBlock();
-      if(newLumi) {
-        lumis.emplace_back(reducedPHID,
-          eventAux().run(), eventAux().luminosityBlock(), eventTree_.entryNumber()); // (insert 1)
-        runLumiSet.insert(LuminosityBlockID(eventAux().run(), eventAux().luminosityBlock())); // (insert 2)
+      if (newLumi) {
+        lumis.emplace_back(
+            reducedPHID, eventAux().run(), eventAux().luminosityBlock(), eventTree_.entryNumber());  // (insert 1)
+        runLumiSet.insert(LuminosityBlockID(eventAux().run(), eventAux().luminosityBlock()));        // (insert 2)
       } else {
         LumiItem& currentLumi = lumis.back();
         assert(currentLumi.lastEventEntry_ == eventTree_.entryNumber());
         ++currentLumi.lastEventEntry_;
       }
-      if(newRun) {
+      if (newRun) {
         // Insert run in list if it is not already there.
         RunItem item(reducedPHID, eventAux().run());
-        if(runItemSet.insert(item).second) { // (check 3, insert 3)
-          runs.push_back(std::move(item)); // (insert 5)
-          runSet.insert(eventAux().run()); // (insert 4)
+        if (runItemSet.insert(item).second) {  // (check 3, insert 3)
+          runs.push_back(std::move(item));     // (insert 5)
+          runSet.insert(eventAux().run());     // (insert 4)
           phidMap.insert(std::make_pair(eventAux().run(), reducedPHID));
         }
       }
@@ -980,23 +993,23 @@ namespace edm {
     // Loop over run entries and fill information.
 
     typedef std::map<RunNumber_t, IndexIntoFile::EntryNumber_t> RunMap;
-    RunMap runMap; // (declare 11)
+    RunMap runMap;  // (declare 11)
 
     typedef std::vector<RunItem> RunVector;
-    RunVector emptyRuns; // (declare 12)
+    RunVector emptyRuns;  // (declare 12)
 
-    if(runTree_.isValid()) {
-      while(runTree_.next()) {
+    if (runTree_.isValid()) {
+      while (runTree_.next()) {
         // Note: adjacent duplicates will be skipped without an explicit check.
 
         std::shared_ptr<RunAuxiliary> runAux = fillRunAuxiliary();
         ProcessHistoryID reducedPHID = processHistoryRegistry_->reducedProcessHistoryID(runAux->processHistoryID());
 
-        if(runSet.insert(runAux->run()).second) { // (check 4, insert 4)
+        if (runSet.insert(runAux->run()).second) {  // (check 4, insert 4)
           // This run was not associated with any events.
-          emptyRuns.emplace_back(reducedPHID, runAux->run()); // (insert 12)
+          emptyRuns.emplace_back(reducedPHID, runAux->run());  // (insert 12)
         }
-        runMap.insert(std::make_pair(runAux->run(), runTree_.entryNumber())); // (insert 11)
+        runMap.insert(std::make_pair(runAux->run(), runTree_.entryNumber()));  // (insert 11)
         phidMap.insert(std::make_pair(runAux->run(), reducedPHID));
       }
       // now clean up.
@@ -1008,9 +1021,9 @@ namespace edm {
     stable_sort_all(emptyRuns, runItemSortByRun);
 
     RunList::iterator itRuns = runs.begin(), endRuns = runs.end();
-    for(auto const& emptyRun : emptyRuns) {
-      for(; itRuns != endRuns; ++itRuns) {
-        if(runItemSortByRun(emptyRun, *itRuns)) {
+    for (auto const& emptyRun : emptyRuns) {
+      for (; itRuns != endRuns; ++itRuns) {
+        if (runItemSortByRun(emptyRun, *itRuns)) {
           break;
         }
       }
@@ -1020,24 +1033,25 @@ namespace edm {
     // Loop over luminosity block entries and fill information.
 
     typedef std::vector<LumiItem> LumiVector;
-    LumiVector emptyLumis; // (declare 7)
+    LumiVector emptyLumis;  // (declare 7)
 
     typedef std::map<LuminosityBlockID, IndexIntoFile::EntryNumber_t> RunLumiMap;
-    RunLumiMap runLumiMap; // (declare 6)
+    RunLumiMap runLumiMap;  // (declare 6)
 
-    if(lumiTree_.isValid()) {
-      while(lumiTree_.next()) {
+    if (lumiTree_.isValid()) {
+      while (lumiTree_.next()) {
         // Note: adjacent duplicates will be skipped without an explicit check.
         std::shared_ptr<LuminosityBlockAuxiliary> lumiAux = fillLumiAuxiliary();
         LuminosityBlockID lumiID = LuminosityBlockID(lumiAux->run(), lumiAux->luminosityBlock());
-        if(runLumiSet.insert(lumiID).second) { // (check 2, insert 2)
+        if (runLumiSet.insert(lumiID).second) {  // (check 2, insert 2)
           // This lumi was not associated with any events.
           // Use the process history ID from the corresponding run.  In cases of practical
           // importance, this should be the correct process history ID,  but it is possible
           // to construct files where this is not the correct process history ID ...
           PHIDMap::const_iterator iPhidMap = phidMap.find(lumiAux->run());
           assert(iPhidMap != phidMap.end());
-          emptyLumis.emplace_back(iPhidMap->second, lumiAux->run(), lumiAux->luminosityBlock(), IndexIntoFile::invalidEntry); // (insert 7)
+          emptyLumis.emplace_back(
+              iPhidMap->second, lumiAux->run(), lumiAux->luminosityBlock(), IndexIntoFile::invalidEntry);  // (insert 7)
         }
         runLumiMap.insert(std::make_pair(lumiID, lumiTree_.entryNumber()));
       }
@@ -1050,9 +1064,9 @@ namespace edm {
     stable_sort_all(emptyLumis, lumiItemSortByRunLumi);
 
     LumiList::iterator itLumis = lumis.begin(), endLumis = lumis.end();
-    for(auto const& emptyLumi : emptyLumis) {
-      for(; itLumis != endLumis; ++itLumis) {
-        if(lumiItemSortByRunLumi(emptyLumi, *itLumis)) {
+    for (auto const& emptyLumi : emptyLumis) {
+      for (; itLumis != endLumis; ++itLumis) {
+        if (lumiItemSortByRunLumi(emptyLumi, *itLumis)) {
           break;
         }
       }
@@ -1062,158 +1076,146 @@ namespace edm {
     // Create a map of RunItems that gives the order of first appearance in the list.
     // Also fill in the vector of process history IDs
     typedef std::map<RunItem, int, RunItemSortByRunPhid> RunCountMap;
-    RunCountMap runCountMap; // Declare (17)
+    RunCountMap runCountMap;  // Declare (17)
     std::vector<ProcessHistoryID>& phids = indexIntoFile_.setProcessHistoryIDs();
     assert(phids.empty());
     std::vector<IndexIntoFile::RunOrLumiEntry>& entries = indexIntoFile_.setRunOrLumiEntries();
     assert(entries.empty());
     int rcount = 0;
-    for(auto& run : runs) {
+    for (auto& run : runs) {
       RunCountMap::const_iterator countMapItem = runCountMap.find(run);
-      if(countMapItem == runCountMap.end()) {
-        countMapItem = runCountMap.insert(std::make_pair(run, rcount)).first; // Insert (17)
+      if (countMapItem == runCountMap.end()) {
+        countMapItem = runCountMap.insert(std::make_pair(run, rcount)).first;  // Insert (17)
         assert(countMapItem != runCountMap.end());
         ++rcount;
       }
       std::vector<ProcessHistoryID>::const_iterator phidItem = find_in_all(phids, run.phid_);
-      if(phidItem == phids.end()) {
+      if (phidItem == phids.end()) {
         phids.push_back(run.phid_);
         phidItem = phids.end() - 1;
       }
-      entries.emplace_back(
-        countMapItem->second, // use (17)
-        IndexIntoFile::invalidEntry,
-        runMap[run.run_], // use (11)
-        phidItem - phids.begin(),
-        run.run_,
-        0U,
-        IndexIntoFile::invalidEntry,
-        IndexIntoFile::invalidEntry);
+      entries.emplace_back(countMapItem->second,  // use (17)
+                           IndexIntoFile::invalidEntry,
+                           runMap[run.run_],  // use (11)
+                           phidItem - phids.begin(),
+                           run.run_,
+                           0U,
+                           IndexIntoFile::invalidEntry,
+                           IndexIntoFile::invalidEntry);
     }
 
     // Create a map of LumiItems that gives the order of first appearance in the list.
     typedef std::map<LumiItem, int, LumiItemSortByRunLumiPhid> LumiCountMap;
-    LumiCountMap lumiCountMap; // Declare (19)
+    LumiCountMap lumiCountMap;  // Declare (19)
     int lcount = 0;
-    for(auto& lumi : lumis) {
+    for (auto& lumi : lumis) {
       RunCountMap::const_iterator runCountMapItem = runCountMap.find(RunItem(lumi.phid_, lumi.run_));
       assert(runCountMapItem != runCountMap.end());
       LumiCountMap::const_iterator countMapItem = lumiCountMap.find(lumi);
-      if(countMapItem == lumiCountMap.end()) {
-        countMapItem = lumiCountMap.insert(std::make_pair(lumi, lcount)).first; // Insert (17)
+      if (countMapItem == lumiCountMap.end()) {
+        countMapItem = lumiCountMap.insert(std::make_pair(lumi, lcount)).first;  // Insert (17)
         assert(countMapItem != lumiCountMap.end());
         ++lcount;
       }
       std::vector<ProcessHistoryID>::const_iterator phidItem = find_in_all(phids, lumi.phid_);
       assert(phidItem != phids.end());
-      entries.emplace_back(
-        runCountMapItem->second,
-        countMapItem->second,
-        runLumiMap[LuminosityBlockID(lumi.run_, lumi.lumi_)],
-        phidItem - phids.begin(),
-        lumi.run_,
-        lumi.lumi_,
-        lumi.firstEventEntry_,
-        lumi.lastEventEntry_);
+      entries.emplace_back(runCountMapItem->second,
+                           countMapItem->second,
+                           runLumiMap[LuminosityBlockID(lumi.run_, lumi.lumi_)],
+                           phidItem - phids.begin(),
+                           lumi.run_,
+                           lumi.lumi_,
+                           lumi.firstEventEntry_,
+                           lumi.lastEventEntry_);
     }
     stable_sort_all(entries);
   }
 
-  void
-  RootFile::validateFile(InputType inputType, bool usingGoToEvent) {
-    if(!fid_.isValid()) {
+  void RootFile::validateFile(InputType inputType, bool usingGoToEvent) {
+    if (!fid_.isValid()) {
       fid_ = FileID(createGlobalIdentifier());
     }
-    if(!eventTree_.isValid()) {
-      throw Exception(errors::EventCorruption) <<
-         "'Events' tree is corrupted or not present\n" << "in the input file.\n";
+    if (!eventTree_.isValid()) {
+      throw Exception(errors::EventCorruption) << "'Events' tree is corrupted or not present\n"
+                                               << "in the input file.\n";
     }
 
-    if(fileFormatVersion().hasIndexIntoFile()) {
-      if(runTree().entries() > 0) {
+    if (fileFormatVersion().hasIndexIntoFile()) {
+      if (runTree().entries() > 0) {
         assert(!indexIntoFile_.empty());
       }
-      if(!fileFormatVersion().useReducedProcessHistoryID()) {
-        if(daqProvenanceHelper_) {
+      if (!fileFormatVersion().useReducedProcessHistoryID()) {
+        if (daqProvenanceHelper_) {
           std::vector<ProcessHistoryID>& phidVec = indexIntoFile_.setProcessHistoryIDs();
-          for(auto& phid : phidVec) {
+          for (auto& phid : phidVec) {
             phid = daqProvenanceHelper_->mapProcessHistoryID(phid);
           }
         }
         indexIntoFile_.reduceProcessHistoryIDs(*processHistoryRegistry_);
       }
-    }
-    else {
+    } else {
       assert(indexIntoFile_.empty());
       fillIndexIntoFile();
     }
 
     indexIntoFile_.fixIndexes(orderedProcessHistoryIDs_);
     indexIntoFile_.setNumberOfEvents(eventTree_.entries());
-    indexIntoFile_.setEventFinder(std::shared_ptr<IndexIntoFile::EventFinder>(std::make_shared<RootFileEventFinder>(eventTree_)));
+    indexIntoFile_.setEventFinder(
+        std::shared_ptr<IndexIntoFile::EventFinder>(std::make_shared<RootFileEventFinder>(eventTree_)));
     // We fill the event numbers explicitly if we need to find events in closed files,
     // such as for secondary files (or secondary sources) or if duplicate checking across files.
     bool needEventNumbers = false;
-    bool needIndexesForDuplicateChecker = duplicateChecker_ && duplicateChecker_->checkingAllFiles() && !duplicateChecker_->checkDisabled();
-    if(inputType != InputType::Primary || needIndexesForDuplicateChecker || usingGoToEvent) {
+    bool needIndexesForDuplicateChecker =
+        duplicateChecker_ && duplicateChecker_->checkingAllFiles() && !duplicateChecker_->checkDisabled();
+    if (inputType != InputType::Primary || needIndexesForDuplicateChecker || usingGoToEvent) {
       needEventNumbers = true;
     }
     bool needEventEntries = false;
-    if(inputType != InputType::Primary || !noEventSort_) {
+    if (inputType != InputType::Primary || !noEventSort_) {
       // We need event entries for sorting or for secondary files or sources.
       needEventEntries = true;
     }
     indexIntoFile_.fillEventNumbersOrEntries(needEventNumbers, needEventEntries);
   }
 
-  void
-  RootFile::reportOpened(std::string const& inputType) {
+  void RootFile::reportOpened(std::string const& inputType) {
     // Report file opened.
     std::string const label = "source";
     std::string moduleName = "PoolSource";
-    filePtr_->inputFileOpened(
-              logicalFile_,
-              inputType,
-              moduleName,
-              label,
-              fid_.fid(),
-              eventTree_.branchNames());
+    filePtr_->inputFileOpened(logicalFile_, inputType, moduleName, label, fid_.fid(), eventTree_.branchNames());
   }
 
-  void
-  RootFile::close() {
+  void RootFile::close() {
     // Just to play it safe, zero all pointers to objects in the InputFile to be closed.
     eventHistoryTree_ = nullptr;
-    for(auto& treePointer : treePointers_) {
+    for (auto& treePointer : treePointers_) {
       treePointer->close();
       treePointer = nullptr;
     }
     filePtr_->Close();
-    filePtr_ = nullptr; // propagate_const<T> has no reset() function
+    filePtr_ = nullptr;  // propagate_const<T> has no reset() function
   }
 
-  void
-  RootFile::fillThisEventAuxiliary() {
-    if(lastEventEntryNumberRead_ == eventTree_.entryNumber()) {
+  void RootFile::fillThisEventAuxiliary() {
+    if (lastEventEntryNumberRead_ == eventTree_.entryNumber()) {
       // Already read.
       return;
     }
-    if(fileFormatVersion().newAuxiliary()) {
-      EventAuxiliary *pEvAux = &eventAux_;
+    if (fileFormatVersion().newAuxiliary()) {
+      EventAuxiliary* pEvAux = &eventAux_;
       eventTree_.fillAux<EventAuxiliary>(pEvAux);
     } else {
       // for backward compatibility.
       EventAux eventAux;
-      EventAux *pEvAux = &eventAux;
+      EventAux* pEvAux = &eventAux;
       eventTree_.fillAux<EventAux>(pEvAux);
       conversion(eventAux, eventAux_);
     }
     lastEventEntryNumberRead_ = eventTree_.entryNumber();
   }
 
-  bool
-  RootFile::fillEventAuxiliary(IndexIntoFile::EntryNumber_t entry) {
-    if(!eventTree_.current(entry)) {
+  bool RootFile::fillEventAuxiliary(IndexIntoFile::EntryNumber_t entry) {
+    if (!eventTree_.current(entry)) {
       return false;
     }
     eventTree_.setEntryNumber(entry);
@@ -1221,36 +1223,34 @@ namespace edm {
     return true;
   }
 
-  void
-  RootFile::fillEventHistory() {
+  void RootFile::fillEventHistory() {
     // We could consider doing delayed reading, but because we have to
     // store this History object in a different tree than the event
     // data tree, this is too hard to do in this first version.
 
-    if(fileFormatVersion().eventHistoryBranch()) {
+    if (fileFormatVersion().eventHistoryBranch()) {
       // Lumi block number was not in EventID for the relevant releases.
       EventID id(eventAux().id().run(), 0, eventAux().id().event());
-      if(eventProcessHistoryIter_->eventID() != id) {
+      if (eventProcessHistoryIter_->eventID() != id) {
         EventProcessHistoryID target(id, ProcessHistoryID());
         eventProcessHistoryIter_ = lower_bound_all(eventProcessHistoryIDs_, target);
         assert(eventProcessHistoryIter_->eventID() == id);
       }
       eventAux_.setProcessHistoryID(eventProcessHistoryIter_->processHistoryID());
       ++eventProcessHistoryIter_;
-    } else if(fileFormatVersion().eventHistoryTree()) {
+    } else if (fileFormatVersion().eventHistoryTree()) {
       // for backward compatibility.
       History* pHistory = history_.get();
       TBranch* eventHistoryBranch = eventHistoryTree_->GetBranch(poolNames::eventHistoryBranchName().c_str());
-      if(!eventHistoryBranch) {
-        throw Exception(errors::EventCorruption)
-          << "Failed to find history branch in event history tree.\n";
+      if (!eventHistoryBranch) {
+        throw Exception(errors::EventCorruption) << "Failed to find history branch in event history tree.\n";
       }
       eventHistoryBranch->SetAddress(&pHistory);
       roottree::getEntry(eventHistoryTree_, eventTree_.entryNumber());
       eventAux_.setProcessHistoryID(history_->processHistoryID());
       eventSelectionIDs_.swap(history_->eventSelectionIDs());
       branchListIndexes_.swap(history_->branchListIndexes());
-    } else if(fileFormatVersion().noMetaDataTrees()) {
+    } else if (fileFormatVersion().noMetaDataTrees()) {
       // Current format
       EventSelectionIDVector* pESV = &eventSelectionIDs_;
       TBranch* eventSelectionIDBranch = eventTree_.tree()->GetBranch(poolNames::eventSelectionsBranchName().c_str());
@@ -1261,153 +1261,138 @@ namespace edm {
       assert(branchListIndexesBranch != nullptr);
       eventTree_.fillBranchEntry(branchListIndexesBranch, pBLI);
     }
-    if(provenanceAdaptor_) {
+    if (provenanceAdaptor_) {
       eventAux_.setProcessHistoryID(provenanceAdaptor_->convertID(eventAux().processHistoryID()));
-      for(auto& esID : eventSelectionIDs_) {
+      for (auto& esID : eventSelectionIDs_) {
         esID = provenanceAdaptor_->convertID(esID);
       }
     }
-    if(daqProvenanceHelper_) {
+    if (daqProvenanceHelper_) {
       eventAux_.setProcessHistoryID(daqProvenanceHelper_->mapProcessHistoryID(eventAux_.processHistoryID()));
     }
-    if(!fileFormatVersion().splitProductIDs()) {
+    if (!fileFormatVersion().splitProductIDs()) {
       // old format.  branchListIndexes_ must be filled in from the ProvenanceAdaptor.
       provenanceAdaptor_->branchListIndexes(branchListIndexes_);
     }
-    if(branchIDListHelper_) {
+    if (branchIDListHelper_) {
       branchIDListHelper_->fixBranchListIndexes(branchListIndexes_);
     }
   }
 
-  std::shared_ptr<LuminosityBlockAuxiliary>
-  RootFile::fillLumiAuxiliary() {
+  std::shared_ptr<LuminosityBlockAuxiliary> RootFile::fillLumiAuxiliary() {
     auto lumiAuxiliary = std::make_shared<LuminosityBlockAuxiliary>();
-    if(fileFormatVersion().newAuxiliary()) {
-      LuminosityBlockAuxiliary *pLumiAux = lumiAuxiliary.get();
+    if (fileFormatVersion().newAuxiliary()) {
+      LuminosityBlockAuxiliary* pLumiAux = lumiAuxiliary.get();
       lumiTree_.fillAux<LuminosityBlockAuxiliary>(pLumiAux);
     } else {
       LuminosityBlockAux lumiAux;
-      LuminosityBlockAux *pLumiAux = &lumiAux;
+      LuminosityBlockAux* pLumiAux = &lumiAux;
       lumiTree_.fillAux<LuminosityBlockAux>(pLumiAux);
       conversion(lumiAux, *lumiAuxiliary);
     }
-    if(provenanceAdaptor_) {
+    if (provenanceAdaptor_) {
       lumiAuxiliary->setProcessHistoryID(provenanceAdaptor_->convertID(lumiAuxiliary->processHistoryID()));
     }
-    if(daqProvenanceHelper_) {
+    if (daqProvenanceHelper_) {
       lumiAuxiliary->setProcessHistoryID(daqProvenanceHelper_->mapProcessHistoryID(lumiAuxiliary->processHistoryID()));
     }
-    if(lumiAuxiliary->luminosityBlock() == 0 && !fileFormatVersion().runsAndLumis()) {
+    if (lumiAuxiliary->luminosityBlock() == 0 && !fileFormatVersion().runsAndLumis()) {
       lumiAuxiliary->id() = LuminosityBlockID(RunNumber_t(1), LuminosityBlockNumber_t(1));
     }
     return lumiAuxiliary;
   }
 
-  std::shared_ptr<RunAuxiliary>
-  RootFile::fillRunAuxiliary() {
+  std::shared_ptr<RunAuxiliary> RootFile::fillRunAuxiliary() {
     auto runAuxiliary = std::make_shared<RunAuxiliary>();
-    if(fileFormatVersion().newAuxiliary()) {
-      RunAuxiliary *pRunAux = runAuxiliary.get();
+    if (fileFormatVersion().newAuxiliary()) {
+      RunAuxiliary* pRunAux = runAuxiliary.get();
       runTree_.fillAux<RunAuxiliary>(pRunAux);
     } else {
       RunAux runAux;
-      RunAux *pRunAux = &runAux;
+      RunAux* pRunAux = &runAux;
       runTree_.fillAux<RunAux>(pRunAux);
       conversion(runAux, *runAuxiliary);
     }
-    if(provenanceAdaptor_) {
+    if (provenanceAdaptor_) {
       runAuxiliary->setProcessHistoryID(provenanceAdaptor_->convertID(runAuxiliary->processHistoryID()));
     }
-    if(daqProvenanceHelper_) {
+    if (daqProvenanceHelper_) {
       runAuxiliary->setProcessHistoryID(daqProvenanceHelper_->mapProcessHistoryID(runAuxiliary->processHistoryID()));
     }
     return runAuxiliary;
   }
 
-  bool
-  RootFile::skipEvents(int& offset) {
-    while(offset > 0 && indexIntoFileIter_ != indexIntoFileEnd_) {
-
+  bool RootFile::skipEvents(int& offset) {
+    while (offset > 0 && indexIntoFileIter_ != indexIntoFileEnd_) {
       int phIndexOfSkippedEvent = IndexIntoFile::invalidIndex;
       RunNumber_t runOfSkippedEvent = IndexIntoFile::invalidRun;
       LuminosityBlockNumber_t lumiOfSkippedEvent = IndexIntoFile::invalidLumi;
       IndexIntoFile::EntryNumber_t skippedEventEntry = IndexIntoFile::invalidEntry;
 
-      indexIntoFileIter_.skipEventForward(phIndexOfSkippedEvent,
-                                          runOfSkippedEvent,
-                                          lumiOfSkippedEvent,
-                                          skippedEventEntry);
+      indexIntoFileIter_.skipEventForward(
+          phIndexOfSkippedEvent, runOfSkippedEvent, lumiOfSkippedEvent, skippedEventEntry);
 
       // At the end of the file and there were no more events to skip
-      if(skippedEventEntry == IndexIntoFile::invalidEntry) break;
+      if (skippedEventEntry == IndexIntoFile::invalidEntry)
+        break;
 
-      if(eventSkipperByID_ && eventSkipperByID_->somethingToSkip()) {
+      if (eventSkipperByID_ && eventSkipperByID_->somethingToSkip()) {
         fillEventAuxiliary(skippedEventEntry);
-        if(eventSkipperByID_->skipIt(runOfSkippedEvent, lumiOfSkippedEvent, eventAux_.id().event())) {
-            continue;
+        if (eventSkipperByID_->skipIt(runOfSkippedEvent, lumiOfSkippedEvent, eventAux_.id().event())) {
+          continue;
         }
       }
-      if(duplicateChecker_ &&
-         !duplicateChecker_->checkDisabled() &&
-         !duplicateChecker_->noDuplicatesInFile()) {
-
+      if (duplicateChecker_ && !duplicateChecker_->checkDisabled() && !duplicateChecker_->noDuplicatesInFile()) {
         fillEventAuxiliary(skippedEventEntry);
-        if(duplicateChecker_->isDuplicateAndCheckActive(phIndexOfSkippedEvent,
-                                                         runOfSkippedEvent,
-                                                         lumiOfSkippedEvent,
-                                                         eventAux_.id().event(),
-                                                         file_)) {
+        if (duplicateChecker_->isDuplicateAndCheckActive(
+                phIndexOfSkippedEvent, runOfSkippedEvent, lumiOfSkippedEvent, eventAux_.id().event(), file_)) {
           continue;
         }
       }
       --offset;
     }
 
-    while(offset < 0) {
-
-      if(duplicateChecker_) {
+    while (offset < 0) {
+      if (duplicateChecker_) {
         duplicateChecker_->disable();
       }
 
       int phIndexOfEvent = IndexIntoFile::invalidIndex;
-      RunNumber_t runOfEvent =  IndexIntoFile::invalidRun;
+      RunNumber_t runOfEvent = IndexIntoFile::invalidRun;
       LuminosityBlockNumber_t lumiOfEvent = IndexIntoFile::invalidLumi;
       IndexIntoFile::EntryNumber_t eventEntry = IndexIntoFile::invalidEntry;
 
-      indexIntoFileIter_.skipEventBackward(phIndexOfEvent,
-                                           runOfEvent,
-                                           lumiOfEvent,
-                                           eventEntry);
+      indexIntoFileIter_.skipEventBackward(phIndexOfEvent, runOfEvent, lumiOfEvent, eventEntry);
 
-      if(eventEntry == IndexIntoFile::invalidEntry) break;
+      if (eventEntry == IndexIntoFile::invalidEntry)
+        break;
 
-      if(eventSkipperByID_ && eventSkipperByID_->somethingToSkip()) {
+      if (eventSkipperByID_ && eventSkipperByID_->somethingToSkip()) {
         fillEventAuxiliary(eventEntry);
-        if(eventSkipperByID_->skipIt(runOfEvent, lumiOfEvent, eventAux_.id().event())) {
+        if (eventSkipperByID_->skipIt(runOfEvent, lumiOfEvent, eventAux_.id().event())) {
           continue;
         }
       }
       ++offset;
     }
-    return(indexIntoFileIter_ == indexIntoFileEnd_);
+    return (indexIntoFileIter_ == indexIntoFileEnd_);
   }
 
-  bool
-  RootFile::goToEvent(EventID const& eventID) {
-
+  bool RootFile::goToEvent(EventID const& eventID) {
     indexIntoFile_.fillEventNumbers();
 
-    if(duplicateChecker_) {
+    if (duplicateChecker_) {
       duplicateChecker_->disable();
     }
 
     IndexIntoFile::SortOrder sortOrder = IndexIntoFile::numericalOrder;
-    if(noEventSort_) sortOrder = IndexIntoFile::firstAppearanceOrder;
+    if (noEventSort_)
+      sortOrder = IndexIntoFile::firstAppearanceOrder;
 
     IndexIntoFile::IndexIntoFileItr iter =
-      indexIntoFile_.findPosition(sortOrder, eventID.run(), eventID.luminosityBlock(), eventID.event());
+        indexIntoFile_.findPosition(sortOrder, eventID.run(), eventID.luminosityBlock(), eventID.event());
 
-    if(iter == indexIntoFile_.end(sortOrder)) {
+    if (iter == indexIntoFile_.end(sortOrder)) {
       return false;
     }
     indexIntoFileIter_ = iter;
@@ -1426,8 +1411,7 @@ namespace edm {
   // the branch containing this EDProduct. That will be done by the Delayed Reader,
   //  when it is asked to do so.
   //
-  void
-  RootFile::readEvent(EventPrincipal& principal) {
+  void RootFile::readEvent(EventPrincipal& principal) {
     assert(indexIntoFileIter_ != indexIntoFileEnd_);
     assert(indexIntoFileIter_.getEntryType() == IndexIntoFile::kEvent);
     // read the event auxiliary if not alrady read.
@@ -1441,7 +1425,9 @@ namespace edm {
 
     // If this next assert shows up in performance profiling or significantly affects memory, then these three lines should be deleted.
     // The IndexIntoFile should guarantee that it never fails.
-    ProcessHistoryID idToCheck = (daqProvenanceHelper_ && fileFormatVersion().useReducedProcessHistoryID() ? *daqProvenanceHelper_->oldProcessHistoryID() : eventAux().processHistoryID());
+    ProcessHistoryID idToCheck = (daqProvenanceHelper_ && fileFormatVersion().useReducedProcessHistoryID()
+                                      ? *daqProvenanceHelper_->oldProcessHistoryID()
+                                      : eventAux().processHistoryID());
     ProcessHistoryID const& reducedPHID = processHistoryRegistry_->reducedProcessHistoryID(idToCheck);
     assert(reducedPHID == indexIntoFile_.processHistoryID(indexIntoFileIter_.processHistoryIDIndex()));
 
@@ -1449,16 +1435,15 @@ namespace edm {
   }
 
   // Reads event at the current entry in the event tree
-  bool
-  RootFile::readCurrentEvent(EventPrincipal& principal) {
-    if(!eventTree_.current()) {
+  bool RootFile::readCurrentEvent(EventPrincipal& principal) {
+    if (!eventTree_.current()) {
       return false;
     }
     fillThisEventAuxiliary();
-    if(!fileFormatVersion().lumiInEventID()) {
-        //ugly, but will disappear when the backward compatibility is done with schema evolution.
-        const_cast<EventID&>(eventAux_.id()).setLuminosityBlockNumber(eventAux_.oldLuminosityBlock());
-        eventAux_.resetObsoleteInfo();
+    if (!fileFormatVersion().lumiInEventID()) {
+      //ugly, but will disappear when the backward compatibility is done with schema evolution.
+      const_cast<EventID&>(eventAux_.id()).setLuminosityBlockNumber(eventAux_.oldLuminosityBlock());
+      eventAux_.resetObsoleteInfo();
     }
     fillEventHistory();
     runHelper_->overrideRunNumber(eventAux_.id(), eventAux().isRealData());
@@ -1477,14 +1462,10 @@ namespace edm {
     return true;
   }
 
-  void
-  RootFile::setAtEventEntry(IndexIntoFile::EntryNumber_t entry) {
-    eventTree_.setEntryNumber(entry);
-  }
+  void RootFile::setAtEventEntry(IndexIntoFile::EntryNumber_t entry) { eventTree_.setEntryNumber(entry); }
 
-  std::shared_ptr<RunAuxiliary>
-  RootFile::readRunAuxiliary_() {
-    if(runHelper_->fakeNewRun()) {
+  std::shared_ptr<RunAuxiliary> RootFile::readRunAuxiliary_() {
+    if (runHelper_->fakeNewRun()) {
       runHelper_->overrideRunNumber(savedRunAuxiliary_->id());
       return savedRunAuxiliary();
     }
@@ -1492,8 +1473,7 @@ namespace edm {
     assert(indexIntoFileIter_.getEntryType() == IndexIntoFile::kRun);
 
     // Begin code for backward compatibility before the existence of run trees.
-    if(!runTree_.isValid()) {
-
+    if (!runTree_.isValid()) {
       // prior to the support of run trees.
       // RunAuxiliary did not contain a valid timestamp.  Take it from the next event.
       IndexIntoFile::EntryNumber_t eventEntry = indexIntoFileIter_.firstEventEntryThisRun();
@@ -1513,24 +1493,23 @@ namespace edm {
     runHelper_->overrideRunNumber(runAuxiliary->id());
     filePtr_->reportInputRunNumber(runAuxiliary->run());
     // If RunAuxiliary did not contain a valid begin timestamp, invalidate any end timestamp.
-    if(runAuxiliary->beginTime() == Timestamp::invalidTimestamp()) {
+    if (runAuxiliary->beginTime() == Timestamp::invalidTimestamp()) {
       runAuxiliary->setEndTime(Timestamp::invalidTimestamp());
     }
 
     // If RunAuxiliary did not contain a valid timestamp, or if this an old format file from
     // when the Run's ProcessHistory included only processes where products were added to the Run itself,
     // we attempt to read the first event in the run to get appropriate info.
-    if(runAuxiliary->beginTime() == Timestamp::invalidTimestamp() ||
-       !fileFormatVersion().processHistorySameWithinRun()) {
-
+    if (runAuxiliary->beginTime() == Timestamp::invalidTimestamp() ||
+        !fileFormatVersion().processHistorySameWithinRun()) {
       IndexIntoFile::EntryNumber_t eventEntry = indexIntoFileIter_.firstEventEntryThisRun();
       // If we have a valid event, use its information.
-      if(eventEntry != IndexIntoFile::invalidEntry) {
+      if (eventEntry != IndexIntoFile::invalidEntry) {
         assert(eventTree_.current(eventEntry));
         fillEventAuxiliary(eventEntry);
 
         // RunAuxiliary did not contain a valid timestamp.  Take it from the next event in this run if there is one.
-        if(runAuxiliary->beginTime() == Timestamp::invalidTimestamp()) {
+        if (runAuxiliary->beginTime() == Timestamp::invalidTimestamp()) {
           runAuxiliary->setBeginTime(eventAux().time());
         }
 
@@ -1538,7 +1517,7 @@ namespace edm {
         // Run, and then the Run and Event auxiliaries could be different.  Use the event ProcessHistoryID if there is one. It should
         // almost always be correct by the current definition (processes included if any products are added. This makes the run, lumi,
         // and event ProcessHistory's always be the same if no file merging occurs).
-        if(!fileFormatVersion().processHistorySameWithinRun()) {
+        if (!fileFormatVersion().processHistorySameWithinRun()) {
           fillEventHistory();
           runAuxiliary->setProcessHistoryID(eventAux().processHistoryID());
         }
@@ -1548,25 +1527,23 @@ namespace edm {
     return runAuxiliary;
   }
 
-  void
-  RootFile::readRun_(RunPrincipal& runPrincipal) {
-
+  void RootFile::readRun_(RunPrincipal& runPrincipal) {
     MergeableRunProductMetadata* mergeableRunProductMetadata = nullptr;
     if (inputType_ == InputType::Primary) {
       mergeableRunProductMetadata = runPrincipal.mergeableRunProductMetadata();
       RootTree::EntryNumber const& entryNumber = runTree_.entryNumber();
       assert(entryNumber >= 0);
-      mergeableRunProductMetadata->readRun(entryNumber, *storedMergeableRunProductMetadata_,
-                                           IndexIntoFileItrHolder(indexIntoFileIter_));
+      mergeableRunProductMetadata->readRun(
+          entryNumber, *storedMergeableRunProductMetadata_, IndexIntoFileItrHolder(indexIntoFileIter_));
     }
 
-    if(!runHelper_->fakeNewRun()) {
+    if (!runHelper_->fakeNewRun()) {
       assert(indexIntoFileIter_ != indexIntoFileEnd_);
       assert(indexIntoFileIter_.getEntryType() == IndexIntoFile::kRun);
       ++indexIntoFileIter_;
     }
     // Begin code for backward compatibility before the existence of run trees.
-    if(!runTree_.isValid()) {
+    if (!runTree_.isValid()) {
       return;
     }
     // End code for backward compatibility before the existence of run trees.
@@ -1577,13 +1554,11 @@ namespace edm {
     runPrincipal.readAllFromSourceAndMergeImmediately(mergeableRunProductMetadata);
   }
 
-
-  std::shared_ptr<LuminosityBlockAuxiliary>
-  RootFile::readLuminosityBlockAuxiliary_() {
+  std::shared_ptr<LuminosityBlockAuxiliary> RootFile::readLuminosityBlockAuxiliary_() {
     assert(indexIntoFileIter_ != indexIntoFileEnd_);
     assert(indexIntoFileIter_.getEntryType() == IndexIntoFile::kLumi);
     // Begin code for backward compatibility before the existence of lumi trees.
-    if(!lumiTree_.isValid()) {
+    if (!lumiTree_.isValid()) {
       IndexIntoFile::EntryNumber_t eventEntry = indexIntoFileIter_.firstEventEntryThisLumi();
       assert(eventEntry != IndexIntoFile::invalidEntry);
       assert(eventTree_.current(eventEntry));
@@ -1591,7 +1566,8 @@ namespace edm {
 
       LuminosityBlockID lumi = LuminosityBlockID(indexIntoFileIter_.run(), indexIntoFileIter_.lumi());
       runHelper_->overrideRunNumber(lumi);
-      return std::make_shared<LuminosityBlockAuxiliary>(lumi.run(), lumi.luminosityBlock(), eventAux().time(), Timestamp::invalidTimestamp());
+      return std::make_shared<LuminosityBlockAuxiliary>(
+          lumi.run(), lumi.luminosityBlock(), eventAux().time(), Timestamp::invalidTimestamp());
     }
     // End code for backward compatibility before the existence of lumi trees.
     lumiTree_.setEntryNumber(indexIntoFileIter_.entry());
@@ -1600,9 +1576,9 @@ namespace edm {
     assert(lumiAuxiliary->luminosityBlock() == indexIntoFileIter_.lumi());
     runHelper_->overrideRunNumber(lumiAuxiliary->id());
     filePtr_->reportInputLumiSection(lumiAuxiliary->run(), lumiAuxiliary->luminosityBlock());
-    if(lumiAuxiliary->beginTime() == Timestamp::invalidTimestamp()) {
+    if (lumiAuxiliary->beginTime() == Timestamp::invalidTimestamp()) {
       IndexIntoFile::EntryNumber_t eventEntry = indexIntoFileIter_.firstEventEntryThisLumi();
-      if(eventEntry != IndexIntoFile::invalidEntry) {
+      if (eventEntry != IndexIntoFile::invalidEntry) {
         assert(eventTree_.current(eventEntry));
         fillEventAuxiliary(eventEntry);
 
@@ -1610,18 +1586,17 @@ namespace edm {
       }
       lumiAuxiliary->setEndTime(Timestamp::invalidTimestamp());
     }
-    if(!fileFormatVersion().processHistorySameWithinRun() && savedRunAuxiliary_) {
+    if (!fileFormatVersion().processHistorySameWithinRun() && savedRunAuxiliary_) {
       lumiAuxiliary->setProcessHistoryID(savedRunAuxiliary_->processHistoryID());
     }
     return lumiAuxiliary;
   }
 
-  void
-  RootFile::readLuminosityBlock_(LuminosityBlockPrincipal& lumiPrincipal) {
+  void RootFile::readLuminosityBlock_(LuminosityBlockPrincipal& lumiPrincipal) {
     assert(indexIntoFileIter_ != indexIntoFileEnd_);
     assert(indexIntoFileIter_.getEntryType() == IndexIntoFile::kLumi);
     // Begin code for backward compatibility before the existence of lumi trees.
-    if(!lumiTree_.isValid()) {
+    if (!lumiTree_.isValid()) {
       ++indexIntoFileIter_;
       return;
     }
@@ -1635,86 +1610,85 @@ namespace edm {
     ++indexIntoFileIter_;
   }
 
-  bool
-  RootFile::setEntryAtEvent(RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event) {
+  bool RootFile::setEntryAtEvent(RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event) {
     indexIntoFileIter_ = indexIntoFile_.findEventPosition(run, lumi, event);
-    if(indexIntoFileIter_ == indexIntoFileEnd_) return false;
+    if (indexIntoFileIter_ == indexIntoFileEnd_)
+      return false;
     eventTree_.setEntryNumber(indexIntoFileIter_.entry());
     return true;
   }
 
-  bool
-  RootFile::setEntryAtLumi(RunNumber_t run, LuminosityBlockNumber_t lumi) {
+  bool RootFile::setEntryAtLumi(RunNumber_t run, LuminosityBlockNumber_t lumi) {
     indexIntoFileIter_ = indexIntoFile_.findLumiPosition(run, lumi);
-    if(indexIntoFileIter_ == indexIntoFileEnd_) return false;
+    if (indexIntoFileIter_ == indexIntoFileEnd_)
+      return false;
     lumiTree_.setEntryNumber(indexIntoFileIter_.entry());
     return true;
   }
 
-  bool
-  RootFile::setEntryAtRun(RunNumber_t run) {
+  bool RootFile::setEntryAtRun(RunNumber_t run) {
     indexIntoFileIter_ = indexIntoFile_.findRunPosition(run);
-    if(indexIntoFileIter_ == indexIntoFileEnd_) return false;
+    if (indexIntoFileIter_ == indexIntoFileEnd_)
+      return false;
     runTree_.setEntryNumber(indexIntoFileIter_.entry());
     return true;
   }
 
-  bool
-  RootFile::setEntryAtNextEventInLumi(RunNumber_t run, LuminosityBlockNumber_t lumi) {
-    if(indexIntoFileIter_.getEntryType() == IndexIntoFile::kEvent) {
+  bool RootFile::setEntryAtNextEventInLumi(RunNumber_t run, LuminosityBlockNumber_t lumi) {
+    if (indexIntoFileIter_.getEntryType() == IndexIntoFile::kEvent) {
       ++indexIntoFileIter_;
     }
     indexIntoFileIter_.advanceToEvent();
-    if(indexIntoFileIter_.getEntryType() != IndexIntoFile::kEvent) return false;
-    if(run != indexIntoFileIter_.run()) return false;
-    if(lumi != indexIntoFileIter_.lumi()) return false;
+    if (indexIntoFileIter_.getEntryType() != IndexIntoFile::kEvent)
+      return false;
+    if (run != indexIntoFileIter_.run())
+      return false;
+    if (lumi != indexIntoFileIter_.lumi())
+      return false;
     fillEventAuxiliary(indexIntoFileIter_.entry());
     return true;
   }
 
-  void
-  RootFile::readEventHistoryTree() {
+  void RootFile::readEventHistoryTree() {
     // Read in the event history tree, if we have one...
-    if(fileFormatVersion().eventHistoryTree()) {
-      history_ = std::make_unique<History>(); // propagate_const<T> has no reset() function
+    if (fileFormatVersion().eventHistoryTree()) {
+      history_ = std::make_unique<History>();  // propagate_const<T> has no reset() function
       eventHistoryTree_ = dynamic_cast<TTree*>(filePtr_->Get(poolNames::eventHistoryTreeName().c_str()));
-      if(!eventHistoryTree_) {
-        throw Exception(errors::EventCorruption)
-          << "Failed to find the event history tree.\n";
+      if (!eventHistoryTree_) {
+        throw Exception(errors::EventCorruption) << "Failed to find the event history tree.\n";
       }
     }
   }
 
-  void
-  RootFile::initializeDuplicateChecker(
-    std::vector<std::shared_ptr<IndexIntoFile> > const& indexesIntoFiles,
-    std::vector<std::shared_ptr<IndexIntoFile> >::size_type currentIndexIntoFile) {
-    if(duplicateChecker_ && !duplicateChecker_->checkDisabled()) {
-      if(eventTree_.next()) {
+  void RootFile::initializeDuplicateChecker(
+      std::vector<std::shared_ptr<IndexIntoFile>> const& indexesIntoFiles,
+      std::vector<std::shared_ptr<IndexIntoFile>>::size_type currentIndexIntoFile) {
+    if (duplicateChecker_ && !duplicateChecker_->checkDisabled()) {
+      if (eventTree_.next()) {
         fillThisEventAuxiliary();
-        duplicateChecker_->inputFileOpened(eventAux().isRealData(),
-                                           indexIntoFile_,
-                                           indexesIntoFiles,
-                                           currentIndexIntoFile);
+        duplicateChecker_->inputFileOpened(
+            eventAux().isRealData(), indexIntoFile_, indexesIntoFiles, currentIndexIntoFile);
       }
       eventTree_.setEntryNumber(IndexIntoFile::invalidEntry);
     }
   }
 
-  void
-  RootFile::markBranchToBeDropped(bool dropDescendants, BranchDescription const& branch, std::set<BranchID>& branchesToDrop,
-                                  std::map<BranchID, BranchID> const& droppedToKeptAlias) const {
-    if(dropDescendants) {
+  void RootFile::markBranchToBeDropped(bool dropDescendants,
+                                       BranchDescription const& branch,
+                                       std::set<BranchID>& branchesToDrop,
+                                       std::map<BranchID, BranchID> const& droppedToKeptAlias) const {
+    if (dropDescendants) {
       branchChildren_->appendToDescendants(branch, branchesToDrop, droppedToKeptAlias);
     } else {
       branchesToDrop.insert(branch.branchID());
     }
   }
 
-  void
-  RootFile::dropOnInput (ProductRegistry& reg, ProductSelectorRules const& rules, bool dropDescendants, InputType inputType) {
-
-  // This is the selector for drop on input.
+  void RootFile::dropOnInput(ProductRegistry& reg,
+                             ProductSelectorRules const& rules,
+                             bool dropDescendants,
+                             InputType inputType) {
+    // This is the selector for drop on input.
     ProductSelector productSelector;
     productSelector.initialize(rules, reg.allBranchDescriptions());
 
@@ -1724,28 +1698,27 @@ namespace edm {
     // Do drop on input. On the first pass, just fill in a set of branches to be dropped.
     std::set<BranchID> branchesToDrop;
     std::map<BranchID, BranchID> droppedToKeptAlias;
-    for(auto const& product : prodList) {
+    for (auto const& product : prodList) {
       BranchDescription const& prod = product.second;
       if (prod.branchID() != prod.originalBranchID() && prod.present()) {
         droppedToKeptAlias[prod.originalBranchID()] = prod.branchID();
       }
     }
-    for(auto const& product : prodList) {
+    for (auto const& product : prodList) {
       BranchDescription const& prod = product.second;
       // Special handling for ThinnedAssociations
-      if(prod.unwrappedType() == typeid(ThinnedAssociation) && prod.present()) {
-        if(inputType != InputType::SecondarySource) {
+      if (prod.unwrappedType() == typeid(ThinnedAssociation) && prod.present()) {
+        if (inputType != InputType::SecondarySource) {
           associationDescriptions.push_back(&prod);
         } else {
           markBranchToBeDropped(dropDescendants, prod, branchesToDrop, droppedToKeptAlias);
         }
-      } else if(!productSelector.selected(prod)) {
+      } else if (!productSelector.selected(prod)) {
         markBranchToBeDropped(dropDescendants, prod, branchesToDrop, droppedToKeptAlias);
       }
     }
 
-    if(inputType != InputType::SecondarySource) {
-
+    if (inputType != InputType::SecondarySource) {
       // Decide whether to keep the thinned associations and corresponding
       // entries in the helper. For secondary source they are all dropped,
       // but in other cases we look for thinned collections the associations
@@ -1754,10 +1727,9 @@ namespace edm {
       // Need a list of kept products in order to determine which thinned associations
       // are kept.
       std::set<BranchID> keptProductsInEvent;
-      for(auto const& product : prodList) {
+      for (auto const& product : prodList) {
         BranchDescription const& prod = product.second;
-        if( branchesToDrop.find(prod.branchID()) == branchesToDrop.end() &&
-            prod.present() &&
+        if (branchesToDrop.find(prod.branchID()) == branchesToDrop.end() && prod.present() &&
             prod.branchType() == InEvent) {
           keptProductsInEvent.insert(prod.branchID());
         }
@@ -1765,21 +1737,20 @@ namespace edm {
 
       // Decide which ThinnedAssociations to keep and store the decision in keepAssociation
       std::map<BranchID, bool> keepAssociation;
-      fileThinnedAssociationsHelper_->selectAssociationProducts(associationDescriptions,
-                                                              keptProductsInEvent,
-                                                              keepAssociation);
+      fileThinnedAssociationsHelper_->selectAssociationProducts(
+          associationDescriptions, keptProductsInEvent, keepAssociation);
 
-      for(auto association : associationDescriptions) {
-        if(!keepAssociation[association->branchID()]) {
+      for (auto association : associationDescriptions) {
+        if (!keepAssociation[association->branchID()]) {
           markBranchToBeDropped(dropDescendants, *association, branchesToDrop, droppedToKeptAlias);
         }
       }
 
       // Also delete the dropped associations from the ThinnedAssociationsHelper
       auto temp = std::make_unique<ThinnedAssociationsHelper>();
-      for(auto const& associationBranches : fileThinnedAssociationsHelper_->data()) {
+      for (auto const& associationBranches : fileThinnedAssociationsHelper_->data()) {
         auto iter = keepAssociation.find(associationBranches.association());
-        if(iter != keepAssociation.end() && iter->second) {
+        if (iter != keepAssociation.end() && iter->second) {
           temp->addAssociation(associationBranches);
         }
       }
@@ -1789,16 +1760,15 @@ namespace edm {
 
     // On this pass, actually drop the branches.
     std::set<BranchID>::const_iterator branchesToDropEnd = branchesToDrop.end();
-    for(ProductRegistry::ProductList::iterator it = prodList.begin(), itEnd = prodList.end(); it != itEnd;) {
+    for (ProductRegistry::ProductList::iterator it = prodList.begin(), itEnd = prodList.end(); it != itEnd;) {
       BranchDescription const& prod = it->second;
       bool drop = branchesToDrop.find(prod.branchID()) != branchesToDropEnd;
-      if(drop) {
-        if(!prod.dropped()) {
-          if(productSelector.selected(prod) && prod.unwrappedType() != typeid(ThinnedAssociation)) {
-            LogWarning("RootFile")
-              << "Branch '" << prod.branchName() << "' is being dropped from the input\n"
-              << "of file '" << file_ << "' because it is dependent on a branch\n"
-              << "that was explicitly dropped.\n";
+      if (drop) {
+        if (!prod.dropped()) {
+          if (productSelector.selected(prod) && prod.unwrappedType() != typeid(ThinnedAssociation)) {
+            LogWarning("RootFile") << "Branch '" << prod.branchName() << "' is being dropped from the input\n"
+                                   << "of file '" << file_ << "' because it is dependent on a branch\n"
+                                   << "that was explicitly dropped.\n";
           }
           treePointers_[prod.branchType()]->dropBranch(newBranchToOldBranch(prod.branchName()));
           hasNewlyDroppedBranch_[prod.branchType()] = true;
@@ -1812,16 +1782,16 @@ namespace edm {
     }
 
     // Drop on input mergeable run and lumi products, this needs to be invoked for secondary file input
-    if(inputType == InputType::SecondaryFile) {
+    if (inputType == InputType::SecondaryFile) {
       TString tString;
-      for(ProductRegistry::ProductList::iterator it = prodList.begin(), itEnd = prodList.end(); it != itEnd;) {
+      for (ProductRegistry::ProductList::iterator it = prodList.begin(), itEnd = prodList.end(); it != itEnd;) {
         BranchDescription const& prod = it->second;
-        if(prod.branchType() != InEvent) {
+        if (prod.branchType() != InEvent) {
           TClass* cp = prod.wrappedType().getClass();
           void* p = cp->New();
           int offset = cp->GetBaseClassOffset(edProductClass_);
           std::unique_ptr<WrapperBase> edp = getWrapperBasePtr(p, offset);
-          if(edp->isMergeable()) {
+          if (edp->isMergeable()) {
             treePointers_[prod.branchType()]->dropBranch(newBranchToOldBranch(prod.branchName()));
             ProductRegistry::ProductList::iterator icopy = it;
             ++it;
@@ -1829,28 +1799,26 @@ namespace edm {
           } else {
             ++it;
           }
-        }
-        else ++it;
+        } else
+          ++it;
       }
     }
   }
-  
-  void 
-  RootFile::setSignals(signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* preEventReadSource,
-                      signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* postEventReadSource) {
-    eventTree_.setSignals(preEventReadSource,postEventReadSource);
-  }
 
+  void RootFile::setSignals(
+      signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* preEventReadSource,
+      signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* postEventReadSource) {
+    eventTree_.setSignals(preEventReadSource, postEventReadSource);
+  }
 
-  std::unique_ptr<MakeProvenanceReader>
-  RootFile::makeProvenanceReaderMaker(InputType inputType) {
-    if(fileFormatVersion_.storedProductProvenanceUsed()) {
+  std::unique_ptr<MakeProvenanceReader> RootFile::makeProvenanceReaderMaker(InputType inputType) {
+    if (fileFormatVersion_.storedProductProvenanceUsed()) {
       readParentageTree(inputType);
       return std::make_unique<MakeReducedProvenanceReader>(parentageIDLookup_);
-    } else if(fileFormatVersion_.splitProductIDs()) {
+    } else if (fileFormatVersion_.splitProductIDs()) {
       readParentageTree(inputType);
       return std::make_unique<MakeFullProvenanceReader>();
-    } else if(fileFormatVersion_.perEventProductIDs()) {
+    } else if (fileFormatVersion_.perEventProductIDs()) {
       auto entryDescriptionMap = std::make_unique<EntryDescriptionMap>();
       readEntryDescriptionTree(*entryDescriptionMap, inputType);
       return std::make_unique<MakeOldProvenanceReader>(std::move(entryDescriptionMap));
@@ -1859,14 +1827,14 @@ namespace edm {
     }
   }
 
-  std::shared_ptr<ProductProvenanceRetriever>
-  RootFile::makeProductProvenanceRetriever(unsigned int iStreamID) {
-    if(eventProductProvenanceRetrievers_.size()<=iStreamID) {
-      eventProductProvenanceRetrievers_.resize(iStreamID+1);
+  std::shared_ptr<ProductProvenanceRetriever> RootFile::makeProductProvenanceRetriever(unsigned int iStreamID) {
+    if (eventProductProvenanceRetrievers_.size() <= iStreamID) {
+      eventProductProvenanceRetrievers_.resize(iStreamID + 1);
     }
-    if(!eventProductProvenanceRetrievers_[iStreamID]) {
+    if (!eventProductProvenanceRetrievers_[iStreamID]) {
       // propagate_const<T> has no reset() function
-      eventProductProvenanceRetrievers_[iStreamID] = std::make_shared<ProductProvenanceRetriever>(provenanceReaderMaker_->makeReader(eventTree_, daqProvenanceHelper_.get()));
+      eventProductProvenanceRetrievers_[iStreamID] = std::make_shared<ProductProvenanceRetriever>(
+          provenanceReaderMaker_->makeReader(eventTree_, daqProvenanceHelper_.get()));
     }
     eventProductProvenanceRetrievers_[iStreamID]->reset();
     return eventProductProvenanceRetriever(iStreamID);
@@ -1874,15 +1842,17 @@ namespace edm {
 
   class ReducedProvenanceReader : public ProvenanceReaderBase {
   public:
-    ReducedProvenanceReader(RootTree* iRootTree, std::vector<ParentageID> const& iParentageIDLookup, DaqProvenanceHelper const* daqProvenanceHelper);
+    ReducedProvenanceReader(RootTree* iRootTree,
+                            std::vector<ParentageID> const& iParentageIDLookup,
+                            DaqProvenanceHelper const* daqProvenanceHelper);
 
     std::set<ProductProvenance> readProvenance(unsigned int) const override;
-private:
+
+  private:
     void readProvenanceAsync(WaitingTask* task,
-                                     ModuleCallingContext const* moduleCallingContext,
-                                     unsigned int transitionIndex,
-                                     std::atomic<const std::set<ProductProvenance>*>& writeTo
-                                     ) const override;
+                             ModuleCallingContext const* moduleCallingContext,
+                             unsigned int transitionIndex,
+                             std::atomic<const std::set<ProductProvenance>*>& writeTo) const override;
 
     edm::propagate_const<RootTree*> rootTree_;
     edm::propagate_const<TBranch*> provBranch_;
@@ -1894,24 +1864,23 @@ namespace edm {
     SharedResourcesAcquirer acquirer_;
   };
 
-  ReducedProvenanceReader::ReducedProvenanceReader(
-                                              RootTree* iRootTree,
-                                              std::vector<ParentageID> const& iParentageIDLookup,
-                                              DaqProvenanceHelper const* daqProvenanceHelper) :
-      ProvenanceReaderBase(),
-      rootTree_(iRootTree),
-      pProvVector_(&provVector_),
-      parentageIDLookup_(iParentageIDLookup),
-      daqProvenanceHelper_(daqProvenanceHelper),
-      mutex_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().second),
-      acquirer_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().first)
-  {
-    provBranch_ = rootTree_->tree()->GetBranch(BranchTypeToProductProvenanceBranchName(rootTree_->branchType()).c_str());
+  ReducedProvenanceReader::ReducedProvenanceReader(RootTree* iRootTree,
+                                                   std::vector<ParentageID> const& iParentageIDLookup,
+                                                   DaqProvenanceHelper const* daqProvenanceHelper)
+      : ProvenanceReaderBase(),
+        rootTree_(iRootTree),
+        pProvVector_(&provVector_),
+        parentageIDLookup_(iParentageIDLookup),
+        daqProvenanceHelper_(daqProvenanceHelper),
+        mutex_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().second),
+        acquirer_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().first) {
+    provBranch_ =
+        rootTree_->tree()->GetBranch(BranchTypeToProductProvenanceBranchName(rootTree_->branchType()).c_str());
   }
 
   namespace {
     using SignalType = signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)>;
-    template<typename R>
+    template <typename R>
     void readProvenanceAsyncImpl(R const* iThis,
                                  SerialTaskQueueChain& chain,
                                  WaitingTask* task,
@@ -1920,32 +1889,44 @@ namespace edm {
                                  ModuleCallingContext const* iContext,
                                  SignalType const* pre,
                                  SignalType const* post) {
-      if(nullptr == writeTo.load()) {
+      if (nullptr == writeTo.load()) {
         //need to be sure the task isn't run until after the read
         WaitingTaskHolder taskHolder{task};
         auto pWriteTo = &writeTo;
-        
-        auto serviceToken = ServiceRegistry::instance().presentToken();
 
-        chain.push([holder = std::move(taskHolder), pWriteTo,iThis,transitionIndex, iContext, pre,post, serviceToken]() mutable {
+        auto serviceToken = ServiceRegistry::instance().presentToken();
 
-          if(nullptr == pWriteTo->load()) {
+        chain.push([holder = std::move(taskHolder),
+                    pWriteTo,
+                    iThis,
+                    transitionIndex,
+                    iContext,
+                    pre,
+                    post,
+                    serviceToken]() mutable {
+          if (nullptr == pWriteTo->load()) {
             ServiceRegistry::Operate operate(serviceToken);
             std::unique_ptr<const std::set<ProductProvenance>> prov;
             try {
-              if(pre) {pre->emit(*(iContext->getStreamContext()),*iContext);}
+              if (pre) {
+                pre->emit(*(iContext->getStreamContext()), *iContext);
+              }
               prov = std::make_unique<const std::set<ProductProvenance>>(iThis->readProvenance(transitionIndex));
-              if(post) {post->emit(*(iContext->getStreamContext()),*iContext);}
+              if (post) {
+                post->emit(*(iContext->getStreamContext()), *iContext);
+              }
 
-            }catch(...) {
-              if(post) {post->emit(*(iContext->getStreamContext()),*iContext);}
+            } catch (...) {
+              if (post) {
+                post->emit(*(iContext->getStreamContext()), *iContext);
+              }
 
               holder.doneWaiting(std::current_exception());
               return;
             }
             const std::set<ProductProvenance>* expected = nullptr;
-            
-            if(pWriteTo->compare_exchange_strong(expected,prov.get())) {
+
+            if (pWriteTo->compare_exchange_strong(expected, prov.get())) {
               prov.release();
             }
           }
@@ -1953,14 +1934,12 @@ namespace edm {
         });
       }
     }
-  }
-  
-  void
-  ReducedProvenanceReader::readProvenanceAsync(WaitingTask* task,
-                                   ModuleCallingContext const* moduleCallingContext,
-                                   unsigned int transitionIndex,
-                                   std::atomic<const std::set<ProductProvenance>*>& writeTo
-                                               ) const {
+  }  // namespace
+
+  void ReducedProvenanceReader::readProvenanceAsync(WaitingTask* task,
+                                                    ModuleCallingContext const* moduleCallingContext,
+                                                    unsigned int transitionIndex,
+                                                    std::atomic<const std::set<ProductProvenance>*>& writeTo) const {
     readProvenanceAsyncImpl(this,
                             acquirer_.serialQueueChain(),
                             task,
@@ -1971,28 +1950,29 @@ namespace edm {
                             rootTree_->rootDelayedReader()->postEventReadFromSourceSignal());
   }
 
-  std::set<ProductProvenance>
-  ReducedProvenanceReader::readProvenance(unsigned int transitionIndex) const {
+  std::set<ProductProvenance> ReducedProvenanceReader::readProvenance(unsigned int transitionIndex) const {
     {
       std::lock_guard<std::recursive_mutex> guard(*mutex_);
       ReducedProvenanceReader* me = const_cast<ReducedProvenanceReader*>(this);
-      me->rootTree_->fillBranchEntry(me->provBranch_, me->rootTree_->entryNumberForIndex(transitionIndex), me->pProvVector_);
+      me->rootTree_->fillBranchEntry(
+          me->provBranch_, me->rootTree_->entryNumberForIndex(transitionIndex), me->pProvVector_);
     }
     std::set<ProductProvenance> retValue;
-    if(daqProvenanceHelper_) {
-      for(auto const& prov : provVector_) {
+    if (daqProvenanceHelper_) {
+      for (auto const& prov : provVector_) {
         BranchID bid(prov.branchID_);
         retValue.emplace(daqProvenanceHelper_->mapBranchID(BranchID(prov.branchID_)),
                          daqProvenanceHelper_->mapParentageID(parentageIDLookup_[prov.parentageIDIndex_]));
       }
     } else {
-      for(auto const& prov : provVector_) {
-        if(prov.parentageIDIndex_ >= parentageIDLookup_.size()) {
+      for (auto const& prov : provVector_) {
+        if (prov.parentageIDIndex_ >= parentageIDLookup_.size()) {
           throw edm::Exception(errors::LogicError)
-            << "ReducedProvenanceReader::ReadProvenance\n"
-            << "The parentage ID index value " << prov.parentageIDIndex_ << " is out of bounds.  The maximum value is " << parentageIDLookup_.size()-1 << ".\n"
-            << "This should never happen.\n"
-            << "Please report this to the framework hypernews forum 'hn-cms-edmFramework@cern.ch'.\n";
+              << "ReducedProvenanceReader::ReadProvenance\n"
+              << "The parentage ID index value " << prov.parentageIDIndex_
+              << " is out of bounds.  The maximum value is " << parentageIDLookup_.size() - 1 << ".\n"
+              << "This should never happen.\n"
+              << "Please report this to the framework hypernews forum 'hn-cms-edmFramework@cern.ch'.\n";
         }
         retValue.emplace(BranchID(prov.branchID_), parentageIDLookup_[prov.parentageIDIndex_]);
       }
@@ -2005,12 +1985,12 @@ namespace edm {
     explicit FullProvenanceReader(RootTree* rootTree, DaqProvenanceHelper const* daqProvenanceHelper);
     ~FullProvenanceReader() override {}
     std::set<ProductProvenance> readProvenance(unsigned int transitionIndex) const override;
+
   private:
     void readProvenanceAsync(WaitingTask* task,
-                                     ModuleCallingContext const* moduleCallingContext,
-                                     unsigned int transitionIndex,
-                                     std::atomic<const std::set<ProductProvenance>*>& writeTo
-                                     ) const override;
+                             ModuleCallingContext const* moduleCallingContext,
+                             unsigned int transitionIndex,
+                             std::atomic<const std::set<ProductProvenance>*>& writeTo) const override;
 
     RootTree* rootTree_;
     ProductProvenanceVector infoVector_;
@@ -2020,23 +2000,19 @@ namespace edm {
     SharedResourcesAcquirer acquirer_;
   };
 
-  FullProvenanceReader::FullProvenanceReader(RootTree* rootTree, DaqProvenanceHelper const* daqProvenanceHelper) :
-         ProvenanceReaderBase(),
-         rootTree_(rootTree),
-         infoVector_(),
-         pInfoVector_(&infoVector_),
-         daqProvenanceHelper_(daqProvenanceHelper),
-         mutex_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().second),
-         acquirer_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().first)
-{
-  }
-
-  void
-  FullProvenanceReader::readProvenanceAsync(WaitingTask* task,
-                                            ModuleCallingContext const* moduleCallingContext,
-                                            unsigned int transitionIndex,
-                                            std::atomic<const std::set<ProductProvenance>*>& writeTo
-                                               ) const {
+  FullProvenanceReader::FullProvenanceReader(RootTree* rootTree, DaqProvenanceHelper const* daqProvenanceHelper)
+      : ProvenanceReaderBase(),
+        rootTree_(rootTree),
+        infoVector_(),
+        pInfoVector_(&infoVector_),
+        daqProvenanceHelper_(daqProvenanceHelper),
+        mutex_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().second),
+        acquirer_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().first) {}
+
+  void FullProvenanceReader::readProvenanceAsync(WaitingTask* task,
+                                                 ModuleCallingContext const* moduleCallingContext,
+                                                 unsigned int transitionIndex,
+                                                 std::atomic<const std::set<ProductProvenance>*>& writeTo) const {
     readProvenanceAsyncImpl(this,
                             acquirer_.serialQueueChain(),
                             task,
@@ -2047,20 +2023,20 @@ namespace edm {
                             rootTree_->rootDelayedReader()->postEventReadFromSourceSignal());
   }
 
-  std::set<ProductProvenance>
-  FullProvenanceReader::readProvenance(unsigned int transitionIndex) const {
+  std::set<ProductProvenance> FullProvenanceReader::readProvenance(unsigned int transitionIndex) const {
     {
       std::lock_guard<std::recursive_mutex> guard(*mutex_);
-      rootTree_->fillBranchEntryMeta(rootTree_->branchEntryInfoBranch(), rootTree_->entryNumberForIndex(transitionIndex), pInfoVector_);
+      rootTree_->fillBranchEntryMeta(
+          rootTree_->branchEntryInfoBranch(), rootTree_->entryNumberForIndex(transitionIndex), pInfoVector_);
     }
     std::set<ProductProvenance> retValue;
-    if(daqProvenanceHelper_) {
-      for(auto const& info : infoVector_) {
+    if (daqProvenanceHelper_) {
+      for (auto const& info : infoVector_) {
         retValue.emplace(daqProvenanceHelper_->mapBranchID(info.branchID()),
                          daqProvenanceHelper_->mapParentageID(info.parentageID()));
       }
     } else {
-      for(auto const& info : infoVector_) {
+      for (auto const& info : infoVector_) {
         retValue.emplace(info);
       }
     }
@@ -2069,43 +2045,43 @@ namespace edm {
 
   class OldProvenanceReader : public ProvenanceReaderBase {
   public:
-    explicit OldProvenanceReader(RootTree* rootTree, EntryDescriptionMap const& theMap, DaqProvenanceHelper const* daqProvenanceHelper);
+    explicit OldProvenanceReader(RootTree* rootTree,
+                                 EntryDescriptionMap const& theMap,
+                                 DaqProvenanceHelper const* daqProvenanceHelper);
     ~OldProvenanceReader() override {}
     std::set<ProductProvenance> readProvenance(unsigned int transitionIndex) const override;
+
   private:
     void readProvenanceAsync(WaitingTask* task,
-                                     ModuleCallingContext const* moduleCallingContext,
-                                     unsigned int transitionIndex,
-                                     std::atomic<const std::set<ProductProvenance>*>& writeTo
-                                     ) const override;
+                             ModuleCallingContext const* moduleCallingContext,
+                             unsigned int transitionIndex,
+                             std::atomic<const std::set<ProductProvenance>*>& writeTo) const override;
 
     edm::propagate_const<RootTree*> rootTree_;
     std::vector<EventEntryInfo> infoVector_;
-    mutable std::vector<EventEntryInfo> *pInfoVector_;
+    mutable std::vector<EventEntryInfo>* pInfoVector_;
     EntryDescriptionMap const& entryDescriptionMap_;
     DaqProvenanceHelper const* daqProvenanceHelper_;
     std::shared_ptr<std::recursive_mutex> mutex_;
     SharedResourcesAcquirer acquirer_;
   };
 
-  OldProvenanceReader::OldProvenanceReader(RootTree* rootTree, EntryDescriptionMap const& theMap, DaqProvenanceHelper const* daqProvenanceHelper) :
-         ProvenanceReaderBase(),
-         rootTree_(rootTree),
-         infoVector_(),
-         pInfoVector_(&infoVector_),
-         entryDescriptionMap_(theMap),
-         daqProvenanceHelper_(daqProvenanceHelper),
-         mutex_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().second),
-         acquirer_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().first)
-{
-  }
-
-  void
-  OldProvenanceReader::readProvenanceAsync(WaitingTask* task,
-                                            ModuleCallingContext const* moduleCallingContext,
-                                            unsigned int transitionIndex,
-                                            std::atomic<const std::set<ProductProvenance>*>& writeTo
-                                            ) const {
+  OldProvenanceReader::OldProvenanceReader(RootTree* rootTree,
+                                           EntryDescriptionMap const& theMap,
+                                           DaqProvenanceHelper const* daqProvenanceHelper)
+      : ProvenanceReaderBase(),
+        rootTree_(rootTree),
+        infoVector_(),
+        pInfoVector_(&infoVector_),
+        entryDescriptionMap_(theMap),
+        daqProvenanceHelper_(daqProvenanceHelper),
+        mutex_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().second),
+        acquirer_(SharedResourcesRegistry::instance()->createAcquirerForSourceDelayedReader().first) {}
+
+  void OldProvenanceReader::readProvenanceAsync(WaitingTask* task,
+                                                ModuleCallingContext const* moduleCallingContext,
+                                                unsigned int transitionIndex,
+                                                std::atomic<const std::set<ProductProvenance>*>& writeTo) const {
     readProvenanceAsyncImpl(this,
                             acquirer_.serialQueueChain(),
                             task,
@@ -2116,21 +2092,20 @@ namespace edm {
                             rootTree_->rootDelayedReader()->postEventReadFromSourceSignal());
   }
 
-  std::set<ProductProvenance>
-  OldProvenanceReader::readProvenance(unsigned int transitionIndex) const {
+  std::set<ProductProvenance> OldProvenanceReader::readProvenance(unsigned int transitionIndex) const {
     {
       std::lock_guard<std::recursive_mutex> guard(*mutex_);
       rootTree_->branchEntryInfoBranch()->SetAddress(&pInfoVector_);
       roottree::getEntry(rootTree_->branchEntryInfoBranch(), rootTree_->entryNumberForIndex(transitionIndex));
     }
     std::set<ProductProvenance> retValue;
-    for(auto const& info : infoVector_) {
+    for (auto const& info : infoVector_) {
       EntryDescriptionMap::const_iterator iter = entryDescriptionMap_.find(info.entryDescriptionID());
       assert(iter != entryDescriptionMap_.end());
       Parentage parentage(iter->second.parents());
-      if(daqProvenanceHelper_) {
+      if (daqProvenanceHelper_) {
         retValue.emplace(daqProvenanceHelper_->mapBranchID(info.branchID()),
-                                daqProvenanceHelper_->mapParentageID(parentage.id()));
+                         daqProvenanceHelper_->mapParentageID(parentage.id()));
       } else {
         retValue.emplace(info.branchID(), parentage.id());
       }
@@ -2142,56 +2117,51 @@ namespace edm {
   public:
     DummyProvenanceReader();
     ~DummyProvenanceReader() override {}
+
   private:
     std::set<ProductProvenance> readProvenance(unsigned int) const override;
     void readProvenanceAsync(WaitingTask* task,
-                                     ModuleCallingContext const* moduleCallingContext,
-                                     unsigned int transitionIndex,
-                                     std::atomic<const std::set<ProductProvenance>*>& writeTo
-                                     ) const override;
+                             ModuleCallingContext const* moduleCallingContext,
+                             unsigned int transitionIndex,
+                             std::atomic<const std::set<ProductProvenance>*>& writeTo) const override;
   };
 
-  DummyProvenanceReader::DummyProvenanceReader() :
-      ProvenanceReaderBase() {
-  }
+  DummyProvenanceReader::DummyProvenanceReader() : ProvenanceReaderBase() {}
 
-  std::set<ProductProvenance>
-  DummyProvenanceReader::readProvenance(unsigned int) const {
+  std::set<ProductProvenance> DummyProvenanceReader::readProvenance(unsigned int) const {
     // Not providing parentage!!!
     return std::set<ProductProvenance>{};
   }
-  void
-  DummyProvenanceReader::readProvenanceAsync(WaitingTask* task,
-                                             ModuleCallingContext const* moduleCallingContext,
-                                             unsigned int transitionIndex,
-                                             std::atomic<const std::set<ProductProvenance>*>& writeTo
-                                             ) const {
-    if(nullptr == writeTo.load()) {
+  void DummyProvenanceReader::readProvenanceAsync(WaitingTask* task,
+                                                  ModuleCallingContext const* moduleCallingContext,
+                                                  unsigned int transitionIndex,
+                                                  std::atomic<const std::set<ProductProvenance>*>& writeTo) const {
+    if (nullptr == writeTo.load()) {
       auto emptyProv = std::make_unique<const std::set<ProductProvenance>>();
       const std::set<ProductProvenance>* expected = nullptr;
-      if(writeTo.compare_exchange_strong(expected,emptyProv.get())) {
+      if (writeTo.compare_exchange_strong(expected, emptyProv.get())) {
         emptyProv.release();
       }
     }
   }
-  
-  std::unique_ptr<ProvenanceReaderBase>
-  MakeDummyProvenanceReader::makeReader(RootTree&, DaqProvenanceHelper const*) const {
-     return std::make_unique<DummyProvenanceReader>();
+
+  std::unique_ptr<ProvenanceReaderBase> MakeDummyProvenanceReader::makeReader(RootTree&,
+                                                                              DaqProvenanceHelper const*) const {
+    return std::make_unique<DummyProvenanceReader>();
   }
 
-  std::unique_ptr<ProvenanceReaderBase>
-  MakeOldProvenanceReader::makeReader(RootTree& rootTree, DaqProvenanceHelper const* daqProvenanceHelper) const {
+  std::unique_ptr<ProvenanceReaderBase> MakeOldProvenanceReader::makeReader(
+      RootTree& rootTree, DaqProvenanceHelper const* daqProvenanceHelper) const {
     return std::make_unique<OldProvenanceReader>(&rootTree, *entryDescriptionMap_, daqProvenanceHelper);
   }
 
-  std::unique_ptr<ProvenanceReaderBase>
-  MakeFullProvenanceReader::makeReader(RootTree& rootTree, DaqProvenanceHelper const* daqProvenanceHelper) const {
+  std::unique_ptr<ProvenanceReaderBase> MakeFullProvenanceReader::makeReader(
+      RootTree& rootTree, DaqProvenanceHelper const* daqProvenanceHelper) const {
     return std::make_unique<FullProvenanceReader>(&rootTree, daqProvenanceHelper);
   }
 
-  std::unique_ptr<ProvenanceReaderBase>
-  MakeReducedProvenanceReader::makeReader(RootTree& rootTree, DaqProvenanceHelper const* daqProvenanceHelper) const {
+  std::unique_ptr<ProvenanceReaderBase> MakeReducedProvenanceReader::makeReader(
+      RootTree& rootTree, DaqProvenanceHelper const* daqProvenanceHelper) const {
     return std::make_unique<ReducedProvenanceReader>(&rootTree, parentageIDLookup_, daqProvenanceHelper);
   }
-}
+}  // namespace edm
diff --git a/IOPool/Input/src/RootFile.h b/IOPool/Input/src/RootFile.h
index f67606b7bdd5c..0003beb464c99 100644
--- a/IOPool/Input/src/RootFile.h
+++ b/IOPool/Input/src/RootFile.h
@@ -11,10 +11,10 @@ RootFile.h // used by ROOT input sources
 #include "DataFormats/Provenance/interface/BranchChildren.h"
 #include "DataFormats/Provenance/interface/BranchIDList.h"
 #include "DataFormats/Provenance/interface/BranchListIndex.h"
-#include "DataFormats/Provenance/interface/EntryDescriptionID.h" // backward compatibility
+#include "DataFormats/Provenance/interface/EntryDescriptionID.h"  // backward compatibility
 #include "DataFormats/Provenance/interface/EventAuxiliary.h"
-#include "DataFormats/Provenance/interface/EventEntryDescription.h" // backward compatibility
-#include "DataFormats/Provenance/interface/EventProcessHistoryID.h" // backward compatibility
+#include "DataFormats/Provenance/interface/EventEntryDescription.h"  // backward compatibility
+#include "DataFormats/Provenance/interface/EventProcessHistoryID.h"  // backward compatibility
 #include "DataFormats/Provenance/interface/EventSelectionID.h"
 #include "DataFormats/Provenance/interface/FileFormatVersion.h"
 #include "DataFormats/Provenance/interface/FileID.h"
@@ -55,7 +55,8 @@ namespace edm {
 
   class MakeProvenanceReader {
   public:
-    virtual std::unique_ptr<ProvenanceReaderBase> makeReader(RootTree& eventTree, DaqProvenanceHelper const* daqProvenanceHelper) const = 0;
+    virtual std::unique_ptr<ProvenanceReaderBase> makeReader(RootTree& eventTree,
+                                                             DaqProvenanceHelper const* daqProvenanceHelper) const = 0;
     virtual ~MakeProvenanceReader() = default;
   };
 
@@ -84,8 +85,8 @@ namespace edm {
              std::shared_ptr<DuplicateChecker> duplicateChecker,
              bool dropDescendantsOfDroppedProducts,
              ProcessHistoryRegistry& processHistoryRegistry,
-             std::vector<std::shared_ptr<IndexIntoFile> > const& indexesIntoFiles,
-             std::vector<std::shared_ptr<IndexIntoFile> >::size_type currentIndexIntoFile,
+             std::vector<std::shared_ptr<IndexIntoFile>> const& indexesIntoFiles,
+             std::vector<std::shared_ptr<IndexIntoFile>>::size_type currentIndexIntoFile,
              std::vector<ProcessHistoryID>& orderedProcessHistoryIDs,
              bool bypassVersionCheck,
              bool labelRawDataLikeMC,
@@ -107,21 +108,41 @@ namespace edm {
              std::vector<BranchID> const* associationsFromSecondary,
              bool dropDescendantsOfDroppedProducts,
              ProcessHistoryRegistry& processHistoryRegistry,
-             std::vector<std::shared_ptr<IndexIntoFile> > const& indexesIntoFiles,
-             std::vector<std::shared_ptr<IndexIntoFile> >::size_type currentIndexIntoFile,
+             std::vector<std::shared_ptr<IndexIntoFile>> const& indexesIntoFiles,
+             std::vector<std::shared_ptr<IndexIntoFile>>::size_type currentIndexIntoFile,
              std::vector<ProcessHistoryID>& orderedProcessHistoryIDs,
              bool bypassVersionCheck,
              bool labelRawDataLikeMC,
-             bool enablePrefetching) : RootFile(
-               fileName, processConfiguration, logicalFileName, filePtr,
-               nullptr, false, -1, -1, nStreams, 0U, treeMaxVirtualSize,
-               processingMode, runHelper,
-               false, productSelectorRules, inputType, branchIDListHelper,
-               thinnedAssociationsHelper, associationsFromSecondary,
-               nullptr, dropDescendantsOfDroppedProducts, processHistoryRegistry,
-               indexesIntoFiles, currentIndexIntoFile, orderedProcessHistoryIDs,
-               bypassVersionCheck, labelRawDataLikeMC,
-               false, enablePrefetching) {}
+             bool enablePrefetching)
+        : RootFile(fileName,
+                   processConfiguration,
+                   logicalFileName,
+                   filePtr,
+                   nullptr,
+                   false,
+                   -1,
+                   -1,
+                   nStreams,
+                   0U,
+                   treeMaxVirtualSize,
+                   processingMode,
+                   runHelper,
+                   false,
+                   productSelectorRules,
+                   inputType,
+                   branchIDListHelper,
+                   thinnedAssociationsHelper,
+                   associationsFromSecondary,
+                   nullptr,
+                   dropDescendantsOfDroppedProducts,
+                   processHistoryRegistry,
+                   indexesIntoFiles,
+                   currentIndexIntoFile,
+                   orderedProcessHistoryIDs,
+                   bypassVersionCheck,
+                   labelRawDataLikeMC,
+                   false,
+                   enablePrefetching) {}
 
     RootFile(std::string const& fileName,
              ProcessConfiguration const& processConfiguration,
@@ -134,24 +155,45 @@ namespace edm {
              ProductSelectorRules const& productSelectorRules,
              InputType inputType,
              ProcessHistoryRegistry& processHistoryRegistry,
-             std::vector<std::shared_ptr<IndexIntoFile> > const& indexesIntoFiles,
-             std::vector<std::shared_ptr<IndexIntoFile> >::size_type currentIndexIntoFile,
+             std::vector<std::shared_ptr<IndexIntoFile>> const& indexesIntoFiles,
+             std::vector<std::shared_ptr<IndexIntoFile>>::size_type currentIndexIntoFile,
              std::vector<ProcessHistoryID>& orderedProcessHistoryIDs,
              bool bypassVersionCheck,
-             bool enablePrefetching) : RootFile(
-               fileName, processConfiguration, logicalFileName, filePtr,
-               nullptr, false, -1, -1, nStreams, treeCacheSize, treeMaxVirtualSize,
-               InputSource::RunsLumisAndEvents, runHelper,
-               false, productSelectorRules, inputType, nullptr, nullptr,
-               nullptr, nullptr, false, processHistoryRegistry,
-               indexesIntoFiles, currentIndexIntoFile, orderedProcessHistoryIDs,
-               bypassVersionCheck, false,
-               false, enablePrefetching) {}
+             bool enablePrefetching)
+        : RootFile(fileName,
+                   processConfiguration,
+                   logicalFileName,
+                   filePtr,
+                   nullptr,
+                   false,
+                   -1,
+                   -1,
+                   nStreams,
+                   treeCacheSize,
+                   treeMaxVirtualSize,
+                   InputSource::RunsLumisAndEvents,
+                   runHelper,
+                   false,
+                   productSelectorRules,
+                   inputType,
+                   nullptr,
+                   nullptr,
+                   nullptr,
+                   nullptr,
+                   false,
+                   processHistoryRegistry,
+                   indexesIntoFiles,
+                   currentIndexIntoFile,
+                   orderedProcessHistoryIDs,
+                   bypassVersionCheck,
+                   false,
+                   false,
+                   enablePrefetching) {}
 
     ~RootFile();
 
-    RootFile(RootFile const&) = delete; // Disallow copying and moving
-    RootFile& operator=(RootFile const&) = delete; // Disallow copying and moving
+    RootFile(RootFile const&) = delete;             // Disallow copying and moving
+    RootFile& operator=(RootFile const&) = delete;  // Disallow copying and moving
 
     void reportOpened(std::string const& inputType);
     void close();
@@ -164,21 +206,21 @@ namespace edm {
     void readRun_(RunPrincipal& runPrincipal);
     void readFakeRun_(RunPrincipal& runPrincipal);
     void readLuminosityBlock_(LuminosityBlockPrincipal& lumiPrincipal);
-    std::string const& file() const {return file_;}
-    std::shared_ptr<ProductRegistry const> productRegistry() const {return productRegistry_;}
-    EventAuxiliary const& eventAux() const {return eventAux_;}
+    std::string const& file() const { return file_; }
+    std::shared_ptr<ProductRegistry const> productRegistry() const { return productRegistry_; }
+    EventAuxiliary const& eventAux() const { return eventAux_; }
     // IndexIntoFile::EntryNumber_t const& entryNumber() const {return indexIntoFileIter().entry();}
     // LuminosityBlockNumber_t const& luminosityBlockNumber() const {return indexIntoFileIter().lumi();}
     // RunNumber_t const& runNumber() const {return indexIntoFileIter().run();}
-    EventID const& eventID() const {return eventAux().id();}
-    RootTree const& eventTree() const {return eventTree_;}
-    RootTree const& lumiTree() const {return lumiTree_;}
-    RootTree const& runTree() const {return runTree_;}
-    FileFormatVersion fileFormatVersion() const {return fileFormatVersion_;}
-    int whyNotFastClonable() const {return whyNotFastClonable_;}
-    std::array<bool, NumBranchTypes> const& hasNewlyDroppedBranch() const {return hasNewlyDroppedBranch_;}
-    bool branchListIndexesUnchanged() const {return branchListIndexesUnchanged_;}
-    bool modifiedIDs() const {return daqProvenanceHelper_.get() != nullptr;}
+    EventID const& eventID() const { return eventAux().id(); }
+    RootTree const& eventTree() const { return eventTree_; }
+    RootTree const& lumiTree() const { return lumiTree_; }
+    RootTree const& runTree() const { return runTree_; }
+    FileFormatVersion fileFormatVersion() const { return fileFormatVersion_; }
+    int whyNotFastClonable() const { return whyNotFastClonable_; }
+    std::array<bool, NumBranchTypes> const& hasNewlyDroppedBranch() const { return hasNewlyDroppedBranch_; }
+    bool branchListIndexesUnchanged() const { return branchListIndexesUnchanged_; }
+    bool modifiedIDs() const { return daqProvenanceHelper_.get() != nullptr; }
     std::unique_ptr<FileBlock> createFileBlock() const;
     bool setEntryAtItem(RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event) {
       return (event != 0) ? setEntryAtEvent(run, lumi, event) : (lumi ? setEntryAtLumi(run, lumi) : setEntryAtRun(run));
@@ -196,29 +238,33 @@ namespace edm {
       lumiTree_.rewind();
       runTree_.rewind();
     }
-    void setToLastEntry() {
-      indexIntoFileIter_ = indexIntoFileEnd_;
-    }
+    void setToLastEntry() { indexIntoFileIter_ = indexIntoFileEnd_; }
 
-    bool skipEntries(unsigned int& offset) {return eventTree_.skipEntries(offset);}
+    bool skipEntries(unsigned int& offset) { return eventTree_.skipEntries(offset); }
     bool skipEvents(int& offset);
     bool goToEvent(EventID const& eventID);
-    bool nextEventEntry() {return eventTree_.nextWithCache();}
+    bool nextEventEntry() { return eventTree_.nextWithCache(); }
     IndexIntoFile::EntryType getNextItemType(RunNumber_t& run, LuminosityBlockNumber_t& lumi, EventNumber_t& event);
-    std::shared_ptr<BranchIDListHelper const> branchIDListHelper() const {return get_underlying_safe(branchIDListHelper_);}
-    std::shared_ptr<BranchIDListHelper>& branchIDListHelper() {return get_underlying_safe(branchIDListHelper_);}
-    std::shared_ptr<IndexIntoFile const> indexIntoFileSharedPtr() const {return get_underlying_safe(indexIntoFileSharedPtr_);}
-    std::shared_ptr<IndexIntoFile>& indexIntoFileSharedPtr() {return get_underlying_safe(indexIntoFileSharedPtr_);}
+    std::shared_ptr<BranchIDListHelper const> branchIDListHelper() const {
+      return get_underlying_safe(branchIDListHelper_);
+    }
+    std::shared_ptr<BranchIDListHelper>& branchIDListHelper() { return get_underlying_safe(branchIDListHelper_); }
+    std::shared_ptr<IndexIntoFile const> indexIntoFileSharedPtr() const {
+      return get_underlying_safe(indexIntoFileSharedPtr_);
+    }
+    std::shared_ptr<IndexIntoFile>& indexIntoFileSharedPtr() { return get_underlying_safe(indexIntoFileSharedPtr_); }
     bool wasLastEventJustRead() const;
     bool wasFirstEventJustRead() const;
     IndexIntoFile::IndexIntoFileItr indexIntoFileIter() const;
     void setPosition(IndexIntoFile::IndexIntoFileItr const& position);
     void initAssociationsFromSecondary(std::vector<BranchID> const&);
 
-    void setSignals(signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* preEventReadSource,
-                    signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* postEventReadSource);
+    void setSignals(
+        signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* preEventReadSource,
+        signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* postEventReadSource);
+
   private:
-    RootTreePtrArray& treePointers() {return treePointers_;}
+    RootTreePtrArray& treePointers() { return treePointers_; }
     bool skipThisEntry();
     void setIfFastClonable(int remainingEvents, int remainingLumis);
     void validateFile(InputType inputType, bool usingGoToEvent);
@@ -229,27 +275,35 @@ namespace edm {
     std::shared_ptr<LuminosityBlockAuxiliary> fillLumiAuxiliary();
     std::shared_ptr<RunAuxiliary> fillRunAuxiliary();
     std::string const& newBranchToOldBranch(std::string const& newBranch) const;
-    void markBranchToBeDropped(bool dropDescendants, BranchDescription const& branch, std::set<BranchID>& branchesToDrop, std::map<BranchID, BranchID> const& droppedToKeptAlias) const;
+    void markBranchToBeDropped(bool dropDescendants,
+                               BranchDescription const& branch,
+                               std::set<BranchID>& branchesToDrop,
+                               std::map<BranchID, BranchID> const& droppedToKeptAlias) const;
     void dropOnInput(ProductRegistry& reg, ProductSelectorRules const& rules, bool dropDescendants, InputType inputType);
     void readParentageTree(InputType inputType);
-    void readEntryDescriptionTree(EntryDescriptionMap& entryDescriptionMap, InputType inputType); // backward compatibility
+    void readEntryDescriptionTree(EntryDescriptionMap& entryDescriptionMap,
+                                  InputType inputType);  // backward compatibility
     void readEventHistoryTree();
     bool isDuplicateEvent();
 
-    void initializeDuplicateChecker(std::vector<std::shared_ptr<IndexIntoFile> > const& indexesIntoFiles,
-                                    std::vector<std::shared_ptr<IndexIntoFile> >::size_type currentIndexIntoFile);
+    void initializeDuplicateChecker(std::vector<std::shared_ptr<IndexIntoFile>> const& indexesIntoFiles,
+                                    std::vector<std::shared_ptr<IndexIntoFile>>::size_type currentIndexIntoFile);
 
     std::unique_ptr<MakeProvenanceReader> makeProvenanceReaderMaker(InputType inputType);
     std::shared_ptr<ProductProvenanceRetriever> makeProductProvenanceRetriever(unsigned int iStreamIndex);
 
-    std::shared_ptr<RunAuxiliary const> savedRunAuxiliary() const {return get_underlying_safe(savedRunAuxiliary_);}
-    std::shared_ptr<RunAuxiliary>& savedRunAuxiliary() {return get_underlying_safe(savedRunAuxiliary_);}
+    std::shared_ptr<RunAuxiliary const> savedRunAuxiliary() const { return get_underlying_safe(savedRunAuxiliary_); }
+    std::shared_ptr<RunAuxiliary>& savedRunAuxiliary() { return get_underlying_safe(savedRunAuxiliary_); }
 
-    std::shared_ptr<BranchChildren const> branchChildren() const {return get_underlying_safe(branchChildren_);}
-    std::shared_ptr<BranchChildren>& branchChildren() {return get_underlying_safe(branchChildren_);}
+    std::shared_ptr<BranchChildren const> branchChildren() const { return get_underlying_safe(branchChildren_); }
+    std::shared_ptr<BranchChildren>& branchChildren() { return get_underlying_safe(branchChildren_); }
 
-    std::shared_ptr<ProductProvenanceRetriever const> eventProductProvenanceRetriever(size_t index) const {return get_underlying_safe(eventProductProvenanceRetrievers_[index]);}
-    std::shared_ptr<ProductProvenanceRetriever>& eventProductProvenanceRetriever(size_t index) {return get_underlying_safe(eventProductProvenanceRetrievers_[index]);}
+    std::shared_ptr<ProductProvenanceRetriever const> eventProductProvenanceRetriever(size_t index) const {
+      return get_underlying_safe(eventProductProvenanceRetrievers_[index]);
+    }
+    std::shared_ptr<ProductProvenanceRetriever>& eventProductProvenanceRetriever(size_t index) {
+      return get_underlying_safe(eventProductProvenanceRetrievers_[index]);
+    }
 
     std::string const file_;
     std::string const logicalFile_;
@@ -266,8 +320,8 @@ namespace edm {
     IndexIntoFile::IndexIntoFileItr indexIntoFileEnd_;
     IndexIntoFile::IndexIntoFileItr indexIntoFileIter_;
     edm::propagate_const<std::unique_ptr<StoredMergeableRunProductMetadata>> storedMergeableRunProductMetadata_;
-    std::vector<EventProcessHistoryID> eventProcessHistoryIDs_;  // backward compatibility
-    std::vector<EventProcessHistoryID>::const_iterator eventProcessHistoryIter_; // backward compatibility
+    std::vector<EventProcessHistoryID> eventProcessHistoryIDs_;                   // backward compatibility
+    std::vector<EventProcessHistoryID>::const_iterator eventProcessHistoryIter_;  // backward compatibility
     edm::propagate_const<std::shared_ptr<RunAuxiliary>> savedRunAuxiliary_;
     bool skipAnyEvents_;
     bool noEventSort_;
@@ -288,20 +342,20 @@ namespace edm {
     InputSource::ProcessingMode processingMode_;
     edm::propagate_const<RunHelperBase*> runHelper_;
     std::map<std::string, std::string> newBranchToOldBranch_;
-    edm::propagate_const<TTree*> eventHistoryTree_; // backward compatibility
+    edm::propagate_const<TTree*> eventHistoryTree_;  // backward compatibility
     EventSelectionIDVector eventSelectionIDs_;
     BranchListIndexes branchListIndexes_;
-    edm::propagate_const<std::unique_ptr<History>> history_; // backward compatibility
+    edm::propagate_const<std::unique_ptr<History>> history_;  // backward compatibility
     edm::propagate_const<std::shared_ptr<BranchChildren>> branchChildren_;
     edm::propagate_const<std::shared_ptr<DuplicateChecker>> duplicateChecker_;
-    edm::propagate_const<std::unique_ptr<ProvenanceAdaptor>> provenanceAdaptor_; // backward comatibility
+    edm::propagate_const<std::unique_ptr<ProvenanceAdaptor>> provenanceAdaptor_;  // backward comatibility
     edm::propagate_const<std::unique_ptr<MakeProvenanceReader>> provenanceReaderMaker_;
     std::vector<edm::propagate_const<std::shared_ptr<ProductProvenanceRetriever>>> eventProductProvenanceRetrievers_;
     std::vector<ParentageID> parentageIDLookup_;
     edm::propagate_const<std::unique_ptr<DaqProvenanceHelper>> daqProvenanceHelper_;
     edm::propagate_const<TClass*> edProductClass_;
     InputType inputType_;
-  }; // class RootFile
+  };  // class RootFile
 
-}
+}  // namespace edm
 #endif
diff --git a/IOPool/Input/src/RootInputFileSequence.cc b/IOPool/Input/src/RootInputFileSequence.cc
index 469a6d717d6cb..4cd78e40909cd 100644
--- a/IOPool/Input/src/RootInputFileSequence.cc
+++ b/IOPool/Input/src/RootInputFileSequence.cc
@@ -19,62 +19,51 @@ namespace edm {
   class LuminosityBlockPrincipal;
   class RunPrincipal;
 
-  RootInputFileSequence::RootInputFileSequence(
-                ParameterSet const& pset,
-                InputFileCatalog const& catalog) :
-    catalog_(catalog),
-    lfn_("unknown"),
-    lfnHash_(0U),
-    usedFallback_(false),
-    findFileForSpecifiedID_(nullptr),
-    fileIterBegin_(fileCatalogItems().begin()),
-    fileIterEnd_(fileCatalogItems().end()),
-    fileIter_(fileIterEnd_),
-    fileIterLastOpened_(fileIterEnd_),
-    rootFile_(),
-    indexesIntoFiles_(fileCatalogItems().size()) {
-  }
+  RootInputFileSequence::RootInputFileSequence(ParameterSet const& pset, InputFileCatalog const& catalog)
+      : catalog_(catalog),
+        lfn_("unknown"),
+        lfnHash_(0U),
+        usedFallback_(false),
+        findFileForSpecifiedID_(nullptr),
+        fileIterBegin_(fileCatalogItems().begin()),
+        fileIterEnd_(fileCatalogItems().end()),
+        fileIter_(fileIterEnd_),
+        fileIterLastOpened_(fileIterEnd_),
+        rootFile_(),
+        indexesIntoFiles_(fileCatalogItems().size()) {}
 
-  std::vector<FileCatalogItem> const&
-  RootInputFileSequence::fileCatalogItems() const {
+  std::vector<FileCatalogItem> const& RootInputFileSequence::fileCatalogItems() const {
     return catalog_.fileCatalogItems();
   }
 
-  std::shared_ptr<ProductRegistry const>
-  RootInputFileSequence::fileProductRegistry() const {
+  std::shared_ptr<ProductRegistry const> RootInputFileSequence::fileProductRegistry() const {
     assert(rootFile());
     return rootFile()->productRegistry();
   }
 
-  std::shared_ptr<BranchIDListHelper const>
-  RootInputFileSequence::fileBranchIDListHelper() const {
+  std::shared_ptr<BranchIDListHelper const> RootInputFileSequence::fileBranchIDListHelper() const {
     assert(rootFile());
     return rootFile()->branchIDListHelper();
   }
 
-  RootInputFileSequence::~RootInputFileSequence() {
-  }
+  RootInputFileSequence::~RootInputFileSequence() {}
 
-  std::shared_ptr<RunAuxiliary>
-  RootInputFileSequence::readRunAuxiliary_() {
+  std::shared_ptr<RunAuxiliary> RootInputFileSequence::readRunAuxiliary_() {
     assert(rootFile());
     return rootFile()->readRunAuxiliary_();
   }
 
-  std::shared_ptr<LuminosityBlockAuxiliary>
-  RootInputFileSequence::readLuminosityBlockAuxiliary_() {
+  std::shared_ptr<LuminosityBlockAuxiliary> RootInputFileSequence::readLuminosityBlockAuxiliary_() {
     assert(rootFile());
     return rootFile()->readLuminosityBlockAuxiliary_();
   }
 
-  void
-  RootInputFileSequence::readRun_(RunPrincipal& runPrincipal) {
+  void RootInputFileSequence::readRun_(RunPrincipal& runPrincipal) {
     assert(rootFile());
     rootFile()->readRun_(runPrincipal);
   }
 
-  void
-  RootInputFileSequence::readLuminosityBlock_(LuminosityBlockPrincipal& lumiPrincipal) {
+  void RootInputFileSequence::readLuminosityBlock_(LuminosityBlockPrincipal& lumiPrincipal) {
     assert(rootFile());
     rootFile()->readLuminosityBlock_(lumiPrincipal);
   }
@@ -92,42 +81,46 @@ namespace edm {
   //  when it is asked to do so.
   //
 
-  void
-  RootInputFileSequence::readEvent(EventPrincipal& eventPrincipal) {
+  void RootInputFileSequence::readEvent(EventPrincipal& eventPrincipal) {
     assert(rootFile());
     rootFile()->readEvent(eventPrincipal);
   }
 
-  bool
-  RootInputFileSequence::containedInCurrentFile(RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event) const {
-    if(!rootFile()) return false;
+  bool RootInputFileSequence::containedInCurrentFile(RunNumber_t run,
+                                                     LuminosityBlockNumber_t lumi,
+                                                     EventNumber_t event) const {
+    if (!rootFile())
+      return false;
     return rootFile()->containsItem(run, lumi, event);
   }
 
-  bool
-  RootInputFileSequence::skipToItemInNewFile(RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event, size_t fileNameHash) {
+  bool RootInputFileSequence::skipToItemInNewFile(RunNumber_t run,
+                                                  LuminosityBlockNumber_t lumi,
+                                                  EventNumber_t event,
+                                                  size_t fileNameHash) {
     // Look for item in files not yet opened. We have a hash of the logical file name
     assert(fileNameHash != 0U);
-    // If the lookup table is not yet filled in, fill it. 
-    if(!findFileForSpecifiedID_) {
+    // If the lookup table is not yet filled in, fill it.
+    if (!findFileForSpecifiedID_) {
       // We use a multimap because there may be hash collisions (Two different LFNs could have the same hash).
       // We map the hash of the LFN to the index into the list of files.
-      findFileForSpecifiedID_ =  std::make_unique<std::unordered_multimap<size_t, size_t>>(); // propagate_const<T> has no reset() function
+      findFileForSpecifiedID_ =
+          std::make_unique<std::unordered_multimap<size_t, size_t>>();  // propagate_const<T> has no reset() function
       auto hasher = std::hash<std::string>();
-      for(auto fileIter = fileIterBegin_; fileIter != fileIterEnd_; ++fileIter) {
+      for (auto fileIter = fileIterBegin_; fileIter != fileIterEnd_; ++fileIter) {
         findFileForSpecifiedID_->insert(std::make_pair(hasher(fileIter->logicalFileName()), fileIter - fileIterBegin_));
       }
     }
     // Look up the logical file name in the table
     auto range = findFileForSpecifiedID_->equal_range(fileNameHash);
-    for(auto iter = range.first; iter != range.second; ++iter) {
+    for (auto iter = range.first; iter != range.second; ++iter) {
       // Don't look in files previously opened, because those have already been searched.
-      if(!indexesIntoFiles_[iter->second]) {
+      if (!indexesIntoFiles_[iter->second]) {
         setAtFileSequenceNumber(iter->second);
         initFile_(false);
         assert(rootFile());
         bool found = rootFile()->setEntryAtItem(run, lumi, event);
-        if(found) {
+        if (found) {
           return true;
         }
       }
@@ -136,17 +129,16 @@ namespace edm {
     return false;
   }
 
-  bool
-  RootInputFileSequence::skipToItemInNewFile(RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event) {
+  bool RootInputFileSequence::skipToItemInNewFile(RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event) {
     // Look for item in files not yet opened.  We do not have a valid hash of the logical file name.
-    for(auto it = indexesIntoFiles_.begin(), itEnd = indexesIntoFiles_.end(); it != itEnd; ++it) {
-      if(!*it) {
+    for (auto it = indexesIntoFiles_.begin(), itEnd = indexesIntoFiles_.end(); it != itEnd; ++it) {
+      if (!*it) {
         // File not yet opened.
         setAtFileSequenceNumber(it - indexesIntoFiles_.begin());
         initFile_(false);
         assert(rootFile());
         bool found = rootFile()->setEntryAtItem(run, lumi, event);
-        if(found) {
+        if (found) {
           return true;
         }
       }
@@ -155,22 +147,22 @@ namespace edm {
     return false;
   }
 
-  bool
-  RootInputFileSequence::skipToItem(RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event, size_t fileNameHash, bool currentFileFirst) {
+  bool RootInputFileSequence::skipToItem(
+      RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event, size_t fileNameHash, bool currentFileFirst) {
     // Attempt to find item in currently open input file.
     bool found = currentFileFirst && rootFile() && rootFile()->setEntryAtItem(run, lumi, event);
-    if(!found) {
+    if (!found) {
       // If only one input file, give up now, to save time.
-      if(currentFileFirst && rootFile() && indexesIntoFiles_.size() == 1) {
+      if (currentFileFirst && rootFile() && indexesIntoFiles_.size() == 1) {
         return false;
       }
       // Look for item (run/lumi/event) in files previously opened without reopening unnecessary files.
-      for(auto it = indexesIntoFiles_.begin(), itEnd = indexesIntoFiles_.end(); it != itEnd; ++it) {
-        if(*it && (*it)->containsItem(run, lumi, event)) {
+      for (auto it = indexesIntoFiles_.begin(), itEnd = indexesIntoFiles_.end(); it != itEnd; ++it) {
+        if (*it && (*it)->containsItem(run, lumi, event)) {
           // We found it. Close the currently open file, and open the correct one.
           std::vector<FileCatalogItem>::const_iterator currentIter = fileIter_;
           setAtFileSequenceNumber(it - indexesIntoFiles_.begin());
-          if(fileIter_ != currentIter) {
+          if (fileIter_ != currentIter) {
             initFile(false);
           }
           // Now get the item from the correct file.
@@ -180,46 +172,45 @@ namespace edm {
           return true;
         }
       }
-      return (fileNameHash != 0U && skipToItemInNewFile(run, lumi, event, fileNameHash)) || skipToItemInNewFile(run, lumi, event);
+      return (fileNameHash != 0U && skipToItemInNewFile(run, lumi, event, fileNameHash)) ||
+             skipToItemInNewFile(run, lumi, event);
     }
     return true;
   }
 
-  void
-  RootInputFileSequence::initTheFile(bool skipBadFiles,
-                                    bool deleteIndexIntoFile,
-                                    InputSource* input, 
-                                    char const* inputTypeName,
-                                    InputType inputType) {
+  void RootInputFileSequence::initTheFile(
+      bool skipBadFiles, bool deleteIndexIntoFile, InputSource* input, char const* inputTypeName, InputType inputType) {
     // We are really going to close the open file.
 
-    if(fileIterLastOpened_ != fileIterEnd_) {
+    if (fileIterLastOpened_ != fileIterEnd_) {
       size_t currentIndexIntoFile = fileIterLastOpened_ - fileIterBegin_;
-      if(deleteIndexIntoFile) {
+      if (deleteIndexIntoFile) {
         indexesIntoFiles_[currentIndexIntoFile].reset();
       } else {
-        if(indexesIntoFiles_[currentIndexIntoFile]) indexesIntoFiles_[currentIndexIntoFile]->inputFileClosed();
+        if (indexesIntoFiles_[currentIndexIntoFile])
+          indexesIntoFiles_[currentIndexIntoFile]->inputFileClosed();
       }
       fileIterLastOpened_ = fileIterEnd_;
     }
     closeFile_();
 
-    if(noMoreFiles()) {
+    if (noMoreFiles()) {
       // No files specified
       return;
     }
 
     // Check if the logical file name was found.
-    if(fileName().empty()) {
+    if (fileName().empty()) {
       // LFN not found in catalog.
       InputFile::reportSkippedFile(fileName(), logicalFileName());
-      if(!skipBadFiles) {
+      if (!skipBadFiles) {
         throw cms::Exception("LogicalFileNameNotFound", "RootFileSequenceBase::initTheFile()\n")
-          << "Logical file name '" << logicalFileName() << "' was not found in the file catalog.\n"
-          << "If you wanted a local file, you forgot the 'file:' prefix\n"
-          << "before the file name in your configuration file.\n";
+            << "Logical file name '" << logicalFileName() << "' was not found in the file catalog.\n"
+            << "If you wanted a local file, you forgot the 'file:' prefix\n"
+            << "before the file name in your configuration file.\n";
       }
-      LogWarning("") << "Input logical file: " << logicalFileName() << " was not found in the catalog, and will be skipped.\n";
+      LogWarning("") << "Input logical file: " << logicalFileName()
+                     << " was not found in the catalog, and will be skipped.\n";
       return;
     }
 
@@ -234,16 +225,17 @@ namespace edm {
     std::shared_ptr<InputFile> filePtr;
     std::list<std::string> originalInfo;
     try {
-      std::unique_ptr<InputSource::FileOpenSentry> sentry(input ? std::make_unique<InputSource::FileOpenSentry>(*input, lfn_, usedFallback_) : nullptr);
-      std::unique_ptr<char[]> name(gSystem->ExpandPathName(fileName().c_str()));;
+      std::unique_ptr<InputSource::FileOpenSentry> sentry(
+          input ? std::make_unique<InputSource::FileOpenSentry>(*input, lfn_, usedFallback_) : nullptr);
+      std::unique_ptr<char[]> name(gSystem->ExpandPathName(fileName().c_str()));
+      ;
       filePtr = std::make_shared<InputFile>(name.get(), "  Initiating request to open file ", inputType);
-    }
-    catch (cms::Exception const& e) {
-      if(!skipBadFiles) {
-        if(hasFallbackUrl) {
+    } catch (cms::Exception const& e) {
+      if (!skipBadFiles) {
+        if (hasFallbackUrl) {
           std::ostringstream out;
           out << e.explainSelf();
-          
+
           std::unique_ptr<char[]> name(gSystem->ExpandPathName(fallbackFileName().c_str()));
           std::string pfn(name.get());
           InputFile::reportFallbackAttempt(pfn, logicalFileName(), out.str());
@@ -259,15 +251,15 @@ namespace edm {
         }
       }
     }
-    if(!filePtr && (hasFallbackUrl)) {
+    if (!filePtr && (hasFallbackUrl)) {
       try {
         usedFallback_ = true;
-        std::unique_ptr<InputSource::FileOpenSentry> sentry(input ? std::make_unique<InputSource::FileOpenSentry>(*input, lfn_, usedFallback_) : nullptr);
+        std::unique_ptr<InputSource::FileOpenSentry> sentry(
+            input ? std::make_unique<InputSource::FileOpenSentry>(*input, lfn_, usedFallback_) : nullptr);
         std::unique_ptr<char[]> fallbackFullName(gSystem->ExpandPathName(fallbackFileName().c_str()));
         filePtr.reset(new InputFile(fallbackFullName.get(), "  Fallback request to file ", inputType));
-      }
-      catch (cms::Exception const& e) {
-        if(!skipBadFiles) {
+      } catch (cms::Exception const& e) {
+        if (!skipBadFiles) {
           InputFile::reportSkippedFile(fileName(), logicalFileName());
           Exception ex(errors::FallbackFileOpenError, "", e);
           ex.addContext("Calling RootFileSequenceBase::initTheFile()");
@@ -277,7 +269,7 @@ namespace edm {
           if (!originalInfo.empty()) {
             out << std::endl << "Original exception info is above; fallback exception info is below.";
             ex.addAdditionalInfo(out.str());
-            for (auto const & s : originalInfo) {
+            for (auto const& s : originalInfo) {
               ex.addAdditionalInfo(s);
             }
           } else {
@@ -287,10 +279,10 @@ namespace edm {
         }
       }
     }
-    if(filePtr) {
+    if (filePtr) {
       size_t currentIndexIntoFile = fileIter_ - fileIterBegin_;
       rootFile_ = makeRootFile(filePtr);
-      if(input) {
+      if (input) {
         rootFile_->setSignals(&(input->preEventReadFromSourceSignal_), &(input->postEventReadFromSourceSignal_));
       }
       assert(rootFile_);
@@ -299,17 +291,16 @@ namespace edm {
       rootFile_->reportOpened(inputTypeName);
     } else {
       InputFile::reportSkippedFile(fileName(), logicalFileName());
-      if(!skipBadFiles) {
-        throw Exception(errors::FileOpenError) <<
-           "RootFileSequenceBase::initTheFile(): Input file " << fileName() << " was not found or could not be opened.\n";
+      if (!skipBadFiles) {
+        throw Exception(errors::FileOpenError) << "RootFileSequenceBase::initTheFile(): Input file " << fileName()
+                                               << " was not found or could not be opened.\n";
       }
       LogWarning("") << "Input file: " << fileName() << " was not found or could not be opened, and will be skipped.\n";
     }
   }
 
-  void
-  RootInputFileSequence::setIndexIntoFile(size_t index) {
-   indexesIntoFiles_[index] = rootFile()->indexIntoFileSharedPtr();
+  void RootInputFileSequence::setIndexIntoFile(size_t index) {
+    indexesIntoFiles_[index] = rootFile()->indexIntoFileSharedPtr();
   }
 
-}
+}  // namespace edm
diff --git a/IOPool/Input/src/RootInputFileSequence.h b/IOPool/Input/src/RootInputFileSequence.h
index 5d82de0310260..bf91576e3a4fb 100644
--- a/IOPool/Input/src/RootInputFileSequence.h
+++ b/IOPool/Input/src/RootInputFileSequence.h
@@ -28,12 +28,11 @@ namespace edm {
 
   class RootInputFileSequence {
   public:
-    explicit RootInputFileSequence(ParameterSet const& pset,
-                                   InputFileCatalog const& catalog);
+    explicit RootInputFileSequence(ParameterSet const& pset, InputFileCatalog const& catalog);
     virtual ~RootInputFileSequence();
 
-    RootInputFileSequence(RootInputFileSequence const&) = delete; // Disallow copying and moving
-    RootInputFileSequence& operator=(RootInputFileSequence const&) = delete; // Disallow copying and moving
+    RootInputFileSequence(RootInputFileSequence const&) = delete;             // Disallow copying and moving
+    RootInputFileSequence& operator=(RootInputFileSequence const&) = delete;  // Disallow copying and moving
 
     bool containedInCurrentFile(RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event) const;
     void readEvent(EventPrincipal& cache);
@@ -41,42 +40,52 @@ namespace edm {
     void readLuminosityBlock_(LuminosityBlockPrincipal& lumiPrincipal);
     std::shared_ptr<RunAuxiliary> readRunAuxiliary_();
     void readRun_(RunPrincipal& runPrincipal);
-    bool skipToItem(RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event, size_t fileNameHash = 0U, bool currentFileFirst = true);
+    bool skipToItem(RunNumber_t run,
+                    LuminosityBlockNumber_t lumi,
+                    EventNumber_t event,
+                    size_t fileNameHash = 0U,
+                    bool currentFileFirst = true);
     std::shared_ptr<ProductRegistry const> fileProductRegistry() const;
     std::shared_ptr<BranchIDListHelper const> fileBranchIDListHelper() const;
+
   protected:
     typedef std::shared_ptr<RootFile> RootFileSharedPtr;
-    void initFile(bool skipBadFiles) {initFile_(skipBadFiles);}
-    void initTheFile(bool skipBadFiles, bool deleteIndexIntoFile, InputSource* input, char const* inputTypeName, InputType inputType);
+    void initFile(bool skipBadFiles) { initFile_(skipBadFiles); }
+    void initTheFile(bool skipBadFiles,
+                     bool deleteIndexIntoFile,
+                     InputSource* input,
+                     char const* inputTypeName,
+                     InputType inputType);
     bool skipToItemInNewFile(RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event);
     bool skipToItemInNewFile(RunNumber_t run, LuminosityBlockNumber_t lumi, EventNumber_t event, size_t fileNameHash);
 
-    bool atFirstFile() const {return fileIter_ == fileIterBegin_;}
-    bool atLastFile() const {return fileIter_ + 1 == fileIterEnd_;}
-    bool noMoreFiles() const {return fileIter_ == fileIterEnd_;}
-    bool noFiles() const {return fileIterBegin_ == fileIterEnd_;}
-    size_t sequenceNumberOfFile() const {return fileIter_ - fileIterBegin_;}
-    size_t numberOfFiles() const {return fileIterEnd_ - fileIterBegin_;}
-
-    void setAtFirstFile() {fileIter_ = fileIterBegin_;}
-    void setAtFileSequenceNumber(size_t offset) {fileIter_ = fileIterBegin_ + offset;}
-    void setNoMoreFiles() {fileIter_ = fileIterEnd_;}
-    void setAtNextFile() {++fileIter_;}
-    void setAtPreviousFile() {--fileIter_;}
-
-    std::string const& fileName() const {return fileIter_->fileName();}
-    std::string const& logicalFileName() const {return fileIter_->logicalFileName();}
-    std::string const& fallbackFileName() const {return fileIter_->fallbackFileName();}
-    std::string const& lfn() const {return lfn_;}
+    bool atFirstFile() const { return fileIter_ == fileIterBegin_; }
+    bool atLastFile() const { return fileIter_ + 1 == fileIterEnd_; }
+    bool noMoreFiles() const { return fileIter_ == fileIterEnd_; }
+    bool noFiles() const { return fileIterBegin_ == fileIterEnd_; }
+    size_t sequenceNumberOfFile() const { return fileIter_ - fileIterBegin_; }
+    size_t numberOfFiles() const { return fileIterEnd_ - fileIterBegin_; }
+
+    void setAtFirstFile() { fileIter_ = fileIterBegin_; }
+    void setAtFileSequenceNumber(size_t offset) { fileIter_ = fileIterBegin_ + offset; }
+    void setNoMoreFiles() { fileIter_ = fileIterEnd_; }
+    void setAtNextFile() { ++fileIter_; }
+    void setAtPreviousFile() { --fileIter_; }
+
+    std::string const& fileName() const { return fileIter_->fileName(); }
+    std::string const& logicalFileName() const { return fileIter_->logicalFileName(); }
+    std::string const& fallbackFileName() const { return fileIter_->fallbackFileName(); }
+    std::string const& lfn() const { return lfn_; }
     std::vector<FileCatalogItem> const& fileCatalogItems() const;
 
-    std::vector<std::shared_ptr<IndexIntoFile> > const& indexesIntoFiles() const {return indexesIntoFiles_;}
+    std::vector<std::shared_ptr<IndexIntoFile>> const& indexesIntoFiles() const { return indexesIntoFiles_; }
     void setIndexIntoFile(size_t index);
-    size_t lfnHash() const {return lfnHash_;}
-    bool usedFallback() const {return usedFallback_;}
+    size_t lfnHash() const { return lfnHash_; }
+    bool usedFallback() const { return usedFallback_; }
+
+    std::shared_ptr<RootFile const> rootFile() const { return get_underlying_safe(rootFile_); }
+    std::shared_ptr<RootFile>& rootFile() { return get_underlying_safe(rootFile_); }
 
-    std::shared_ptr<RootFile const> rootFile() const {return get_underlying_safe(rootFile_);}
-    std::shared_ptr<RootFile>& rootFile() {return get_underlying_safe(rootFile_);}
   private:
     InputFileCatalog const& catalog_;
     std::string lfn_;
@@ -88,13 +97,13 @@ namespace edm {
     std::vector<FileCatalogItem>::const_iterator fileIter_;
     std::vector<FileCatalogItem>::const_iterator fileIterLastOpened_;
     edm::propagate_const<RootFileSharedPtr> rootFile_;
-    std::vector<std::shared_ptr<IndexIntoFile> > indexesIntoFiles_;
+    std::vector<std::shared_ptr<IndexIntoFile>> indexesIntoFiles_;
 
   private:
-    virtual RootFileSharedPtr makeRootFile(std::shared_ptr<InputFile> filePtr) = 0; 
+    virtual RootFileSharedPtr makeRootFile(std::shared_ptr<InputFile> filePtr) = 0;
     virtual void initFile_(bool skipBadFiles) = 0;
     virtual void closeFile_() = 0;
 
-  }; // class RootInputFileSequence
-}
+  };  // class RootInputFileSequence
+}  // namespace edm
 #endif
diff --git a/IOPool/Input/src/RootPrimaryFileSequence.cc b/IOPool/Input/src/RootPrimaryFileSequence.cc
index 867c11b13436f..ff8b17bba1c16 100644
--- a/IOPool/Input/src/RootPrimaryFileSequence.cc
+++ b/IOPool/Input/src/RootPrimaryFileSequence.cc
@@ -18,34 +18,34 @@
 #include "Utilities/StorageFactory/interface/StorageFactory.h"
 
 namespace edm {
-  RootPrimaryFileSequence::RootPrimaryFileSequence(
-                ParameterSet const& pset,
-                PoolSource& input,
-                InputFileCatalog const& catalog) :
-    RootInputFileSequence(pset, catalog),
-    input_(input),
-    firstFile_(true),
-    branchesMustMatch_(BranchDescription::Permissive),
-    orderedProcessHistoryIDs_(),
-    eventSkipperByID_(EventSkipperByID::create(pset).release()),
-    initialNumberOfEventsToSkip_(pset.getUntrackedParameter<unsigned int>("skipEvents")),
-    noEventSort_(pset.getUntrackedParameter<bool>("noEventSort")),
-    treeCacheSize_(noEventSort_ ? pset.getUntrackedParameter<unsigned int>("cacheSize") : 0U),
-    duplicateChecker_(new DuplicateChecker(pset)),
-    usingGoToEvent_(false),
-    enablePrefetching_(false) {
-
+  RootPrimaryFileSequence::RootPrimaryFileSequence(ParameterSet const& pset,
+                                                   PoolSource& input,
+                                                   InputFileCatalog const& catalog)
+      : RootInputFileSequence(pset, catalog),
+        input_(input),
+        firstFile_(true),
+        branchesMustMatch_(BranchDescription::Permissive),
+        orderedProcessHistoryIDs_(),
+        eventSkipperByID_(EventSkipperByID::create(pset).release()),
+        initialNumberOfEventsToSkip_(pset.getUntrackedParameter<unsigned int>("skipEvents")),
+        noEventSort_(pset.getUntrackedParameter<bool>("noEventSort")),
+        treeCacheSize_(noEventSort_ ? pset.getUntrackedParameter<unsigned int>("cacheSize") : 0U),
+        duplicateChecker_(new DuplicateChecker(pset)),
+        usingGoToEvent_(false),
+        enablePrefetching_(false) {
     // The SiteLocalConfig controls the TTreeCache size and the prefetching settings.
     Service<SiteLocalConfig> pSLC;
-    if(pSLC.isAvailable()) {
-      if(treeCacheSize_ != 0U && pSLC->sourceTTreeCacheSize()) {
+    if (pSLC.isAvailable()) {
+      if (treeCacheSize_ != 0U && pSLC->sourceTTreeCacheSize()) {
         treeCacheSize_ = *(pSLC->sourceTTreeCacheSize());
       }
       enablePrefetching_ = pSLC->enablePrefetching();
     }
 
-    std::string branchesMustMatch = pset.getUntrackedParameter<std::string>("branchesMustMatch", std::string("permissive"));
-    if(branchesMustMatch == std::string("strict")) branchesMustMatch_ = BranchDescription::Strict;
+    std::string branchesMustMatch =
+        pset.getUntrackedParameter<std::string>("branchesMustMatch", std::string("permissive"));
+    if (branchesMustMatch == std::string("strict"))
+      branchesMustMatch_ = BranchDescription::Strict;
 
     // Prestage the files
     for (setAtFirstFile(); !noMoreFiles(); setAtNextFile()) {
@@ -54,199 +54,192 @@ namespace edm {
     // Open the first file.
     for (setAtFirstFile(); !noMoreFiles(); setAtNextFile()) {
       initFile(input_.skipBadFiles());
-      if(rootFile()) break;
+      if (rootFile())
+        break;
     }
-    if(rootFile()) {
+    if (rootFile()) {
       input_.productRegistryUpdate().updateFromInput(rootFile()->productRegistry()->productList());
-      if(initialNumberOfEventsToSkip_ != 0) {
+      if (initialNumberOfEventsToSkip_ != 0) {
         skipEvents(initialNumberOfEventsToSkip_);
       }
     }
   }
 
-  RootPrimaryFileSequence::~RootPrimaryFileSequence() {
-  }
+  RootPrimaryFileSequence::~RootPrimaryFileSequence() {}
 
-  void
-  RootPrimaryFileSequence::endJob() {
-    closeFile_();
-  }
+  void RootPrimaryFileSequence::endJob() { closeFile_(); }
 
-  std::unique_ptr<FileBlock>
-  RootPrimaryFileSequence::readFile_() {
-    if(firstFile_) {
+  std::unique_ptr<FileBlock> RootPrimaryFileSequence::readFile_() {
+    if (firstFile_) {
       // The first input file has already been opened.
       firstFile_ = false;
-      if(!rootFile()) {
+      if (!rootFile()) {
         initFile(input_.skipBadFiles());
       }
     } else {
-      if(!nextFile()) {
+      if (!nextFile()) {
         assert(0);
       }
     }
-    if(!rootFile()) {
+    if (!rootFile()) {
       return std::make_unique<FileBlock>();
     }
     return rootFile()->createFileBlock();
   }
 
-  void
-  RootPrimaryFileSequence::closeFile_() {
+  void RootPrimaryFileSequence::closeFile_() {
     // close the currently open file, if any, and delete the RootFile object.
-    if(rootFile()) {
+    if (rootFile()) {
       auto sentry = std::make_unique<InputSource::FileCloseSentry>(input_, lfn(), usedFallback());
       rootFile()->close();
-      if(duplicateChecker_) duplicateChecker_->inputFileClosed();
+      if (duplicateChecker_)
+        duplicateChecker_->inputFileClosed();
       rootFile().reset();
     }
   }
 
-  void
-  RootPrimaryFileSequence::initFile_(bool skipBadFiles) {
+  void RootPrimaryFileSequence::initFile_(bool skipBadFiles) {
     // If we are not duplicate checking across files and we are not using random access to find events,
     // then we can delete the IndexIntoFile for the file we are closing.
     // If we can't delete all of it, then we can delete the parts we do not need.
-    bool deleteIndexIntoFile = !usingGoToEvent_ && !(duplicateChecker_ && duplicateChecker_->checkingAllFiles() && !duplicateChecker_->checkDisabled());
+    bool deleteIndexIntoFile = !usingGoToEvent_ && !(duplicateChecker_ && duplicateChecker_->checkingAllFiles() &&
+                                                     !duplicateChecker_->checkDisabled());
     initTheFile(skipBadFiles, deleteIndexIntoFile, &input_, "primaryFiles", InputType::Primary);
   }
 
-  RootPrimaryFileSequence::RootFileSharedPtr
-  RootPrimaryFileSequence::makeRootFile(std::shared_ptr<InputFile> filePtr) {
-      size_t currentIndexIntoFile = sequenceNumberOfFile();
-      return std::make_shared<RootFile>(
-          fileName(),
-          input_.processConfiguration(),
-          logicalFileName(),
-          filePtr,
-          eventSkipperByID(),
-          initialNumberOfEventsToSkip_ != 0,
-          remainingEvents(),
-          remainingLuminosityBlocks(),
-	  input_.nStreams(),
-          treeCacheSize_,
-          input_.treeMaxVirtualSize(),
-          input_.processingMode(),
-          input_.runHelper(),
-          noEventSort_,
-          input_.productSelectorRules(),
-          InputType::Primary,
-          input_.branchIDListHelper(),
-          input_.thinnedAssociationsHelper(),
-          nullptr, // associationsFromSecondary
-          duplicateChecker(),
-          input_.dropDescendants(),
-          input_.processHistoryRegistryForUpdate(),
-          indexesIntoFiles(),
-          currentIndexIntoFile,
-          orderedProcessHistoryIDs_,
-          input_.bypassVersionCheck(),
-          input_.labelRawDataLikeMC(),
-          usingGoToEvent_,
-          enablePrefetching_);
+  RootPrimaryFileSequence::RootFileSharedPtr RootPrimaryFileSequence::makeRootFile(std::shared_ptr<InputFile> filePtr) {
+    size_t currentIndexIntoFile = sequenceNumberOfFile();
+    return std::make_shared<RootFile>(fileName(),
+                                      input_.processConfiguration(),
+                                      logicalFileName(),
+                                      filePtr,
+                                      eventSkipperByID(),
+                                      initialNumberOfEventsToSkip_ != 0,
+                                      remainingEvents(),
+                                      remainingLuminosityBlocks(),
+                                      input_.nStreams(),
+                                      treeCacheSize_,
+                                      input_.treeMaxVirtualSize(),
+                                      input_.processingMode(),
+                                      input_.runHelper(),
+                                      noEventSort_,
+                                      input_.productSelectorRules(),
+                                      InputType::Primary,
+                                      input_.branchIDListHelper(),
+                                      input_.thinnedAssociationsHelper(),
+                                      nullptr,  // associationsFromSecondary
+                                      duplicateChecker(),
+                                      input_.dropDescendants(),
+                                      input_.processHistoryRegistryForUpdate(),
+                                      indexesIntoFiles(),
+                                      currentIndexIntoFile,
+                                      orderedProcessHistoryIDs_,
+                                      input_.bypassVersionCheck(),
+                                      input_.labelRawDataLikeMC(),
+                                      usingGoToEvent_,
+                                      enablePrefetching_);
   }
 
   bool RootPrimaryFileSequence::nextFile() {
-    if(!noMoreFiles()) setAtNextFile();
-    if(noMoreFiles()) {
+    if (!noMoreFiles())
+      setAtNextFile();
+    if (noMoreFiles()) {
       return false;
     }
 
     initFile(input_.skipBadFiles());
 
-    if(rootFile()) {
+    if (rootFile()) {
       // make sure the new product registry is compatible with the main one
-      std::string mergeInfo = input_.productRegistryUpdate().merge(*rootFile()->productRegistry(),
-                                                                   fileName(),
-                                                                   branchesMustMatch_);
-      if(!mergeInfo.empty()) {
-        throw Exception(errors::MismatchedInputFiles,"RootPrimaryFileSequence::nextFile()") << mergeInfo;
+      std::string mergeInfo =
+          input_.productRegistryUpdate().merge(*rootFile()->productRegistry(), fileName(), branchesMustMatch_);
+      if (!mergeInfo.empty()) {
+        throw Exception(errors::MismatchedInputFiles, "RootPrimaryFileSequence::nextFile()") << mergeInfo;
       }
     }
     return true;
   }
 
   bool RootPrimaryFileSequence::previousFile() {
-    if(atFirstFile()) {
+    if (atFirstFile()) {
       return false;
     }
     setAtPreviousFile();
 
     initFile(false);
 
-    if(rootFile()) {
+    if (rootFile()) {
       // make sure the new product registry is compatible to the main one
-      std::string mergeInfo = input_.productRegistryUpdate().merge(*rootFile()->productRegistry(),
-                                                                   fileName(),
-                                                                   branchesMustMatch_);
-      if(!mergeInfo.empty()) {
-        throw Exception(errors::MismatchedInputFiles,"RootPrimaryFileSequence::previousEvent()") << mergeInfo;
+      std::string mergeInfo =
+          input_.productRegistryUpdate().merge(*rootFile()->productRegistry(), fileName(), branchesMustMatch_);
+      if (!mergeInfo.empty()) {
+        throw Exception(errors::MismatchedInputFiles, "RootPrimaryFileSequence::previousEvent()") << mergeInfo;
       }
     }
-    if(rootFile()) rootFile()->setToLastEntry();
+    if (rootFile())
+      rootFile()->setToLastEntry();
     return true;
   }
 
-  InputSource::ItemType
-  RootPrimaryFileSequence::getNextItemType(RunNumber_t& run, LuminosityBlockNumber_t& lumi, EventNumber_t& event) {
-    if(noMoreFiles()) {
+  InputSource::ItemType RootPrimaryFileSequence::getNextItemType(RunNumber_t& run,
+                                                                 LuminosityBlockNumber_t& lumi,
+                                                                 EventNumber_t& event) {
+    if (noMoreFiles()) {
       return InputSource::IsStop;
     }
-    if(firstFile_) {
+    if (firstFile_) {
       return InputSource::IsFile;
     }
-    if(rootFile()) {
+    if (rootFile()) {
       IndexIntoFile::EntryType entryType = rootFile()->getNextItemType(run, lumi, event);
-      if(entryType == IndexIntoFile::kEvent) {
+      if (entryType == IndexIntoFile::kEvent) {
         return InputSource::IsEvent;
-      } else if(entryType == IndexIntoFile::kLumi) {
+      } else if (entryType == IndexIntoFile::kLumi) {
         return InputSource::IsLumi;
-      } else if(entryType == IndexIntoFile::kRun) {
+      } else if (entryType == IndexIntoFile::kRun) {
         return InputSource::IsRun;
       }
       assert(entryType == IndexIntoFile::kEnd);
     }
-    if(atLastFile()) {
+    if (atLastFile()) {
       return InputSource::IsStop;
     }
     return InputSource::IsFile;
   }
 
   // Rewind to before the first event that was read.
-  void
-  RootPrimaryFileSequence::rewind_() {
-    if(!atFirstFile()) {
+  void RootPrimaryFileSequence::rewind_() {
+    if (!atFirstFile()) {
       closeFile_();
       setAtFirstFile();
     }
-    if(!rootFile()) {
+    if (!rootFile()) {
       initFile(false);
     }
     rewindFile();
     firstFile_ = true;
-    if(rootFile()) {
-      if(initialNumberOfEventsToSkip_ != 0) {
+    if (rootFile()) {
+      if (initialNumberOfEventsToSkip_ != 0) {
         skipEvents(initialNumberOfEventsToSkip_);
       }
     }
   }
 
   // Rewind to the beginning of the current file
-  void
-  RootPrimaryFileSequence::rewindFile() {
-    if(rootFile()) rootFile()->rewind();
+  void RootPrimaryFileSequence::rewindFile() {
+    if (rootFile())
+      rootFile()->rewind();
   }
 
   // Advance "offset" events.  Offset can be positive or negative (or zero).
-  bool
-  RootPrimaryFileSequence::skipEvents(int offset) {
+  bool RootPrimaryFileSequence::skipEvents(int offset) {
     assert(rootFile());
-    while(offset != 0) {
+    while (offset != 0) {
       bool atEnd = rootFile()->skipEvents(offset);
-      if((offset > 0 || atEnd) && !nextFile()) {
+      if ((offset > 0 || atEnd) && !nextFile()) {
         return false;
       }
-      if(offset < 0 && !previousFile()) {
+      if (offset < 0 && !previousFile()) {
         setNoMoreFiles();
         return false;
       }
@@ -254,15 +247,14 @@ namespace edm {
     return true;
   }
 
-  bool
-  RootPrimaryFileSequence::goToEvent(EventID const& eventID) {
+  bool RootPrimaryFileSequence::goToEvent(EventID const& eventID) {
     usingGoToEvent_ = true;
-    if(rootFile()) {
-      if(rootFile()->goToEvent(eventID)) {
+    if (rootFile()) {
+      if (rootFile()->goToEvent(eventID)) {
         return true;
       }
       // If only one input file, give up now, to save time.
-      if(rootFile() && indexesIntoFiles().size() == 1) {
+      if (rootFile() && indexesIntoFiles().size() == 1) {
         return false;
       }
       // Save the current file and position so that we can restore them
@@ -272,8 +264,8 @@ namespace edm {
       IndexIntoFile::IndexIntoFileItr originalPosition = rootFile()->indexIntoFileIter();
 
       // Look for item (run/lumi/event) in files previously opened without reopening unnecessary files.
-      for(auto it = indexesIntoFiles().begin(), itEnd = indexesIntoFiles().end(); it != itEnd; ++it) {
-        if(*it && (*it)->containsItem(eventID.run(), eventID.luminosityBlock(), eventID.event())) {
+      for (auto it = indexesIntoFiles().begin(), itEnd = indexesIntoFiles().end(); it != itEnd; ++it) {
+        if (*it && (*it)->containsItem(eventID.run(), eventID.luminosityBlock(), eventID.event())) {
           // We found it. Close the currently open file, and open the correct one.
           setAtFileSequenceNumber(it - indexesIntoFiles().begin());
           initFile(false);
@@ -285,20 +277,20 @@ namespace edm {
         }
       }
       // Look for item in files not yet opened.
-      for(auto it = indexesIntoFiles().begin(), itEnd = indexesIntoFiles().end(); it != itEnd; ++it) {
-        if(!*it) {
+      for (auto it = indexesIntoFiles().begin(), itEnd = indexesIntoFiles().end(); it != itEnd; ++it) {
+        if (!*it) {
           setAtFileSequenceNumber(it - indexesIntoFiles().begin());
           initFile(false);
           closedOriginalFile = true;
-          if((*it)->containsItem(eventID.run(), eventID.luminosityBlock(), eventID.event())) {
+          if ((*it)->containsItem(eventID.run(), eventID.luminosityBlock(), eventID.event())) {
             assert(rootFile());
-            if(rootFile()->goToEvent(eventID)) {
+            if (rootFile()->goToEvent(eventID)) {
               return true;
             }
           }
         }
       }
-      if(closedOriginalFile) {
+      if (closedOriginalFile) {
         setAtFileSequenceNumber(originalFileSequenceNumber);
         initFile(false);
         assert(rootFile());
@@ -308,44 +300,39 @@ namespace edm {
     return false;
   }
 
-  int
-  RootPrimaryFileSequence::remainingEvents() const {
-    return input_.remainingEvents();
-  }
+  int RootPrimaryFileSequence::remainingEvents() const { return input_.remainingEvents(); }
 
-  int
-  RootPrimaryFileSequence::remainingLuminosityBlocks() const {
-    return input_.remainingLuminosityBlocks();
-  }
+  int RootPrimaryFileSequence::remainingLuminosityBlocks() const { return input_.remainingLuminosityBlocks(); }
 
-  void
-  RootPrimaryFileSequence::fillDescription(ParameterSetDescription & desc) {
+  void RootPrimaryFileSequence::fillDescription(ParameterSetDescription& desc) {
     desc.addUntracked<unsigned int>("skipEvents", 0U)
         ->setComment("Skip the first 'skipEvents' events that otherwise would have been processed.");
     desc.addUntracked<bool>("noEventSort", true)
-        ->setComment("True:  Process runs, lumis and events in the order they appear in the file (but see notes 1 and 2).\n"
-                     "False: Process runs, lumis and events in each file in numerical order (run#, lumi#, event#) (but see note 3).\n"
-                     "Note 1: Events within the same lumi will always be processed contiguously.\n"
-                     "Note 2: Lumis within the same run will always be processed contiguously.\n"
-                     "Note 3: Any sorting occurs independently in each input file (no sorting across input files).");
+        ->setComment(
+            "True:  Process runs, lumis and events in the order they appear in the file (but see notes 1 and 2).\n"
+            "False: Process runs, lumis and events in each file in numerical order (run#, lumi#, event#) (but see note "
+            "3).\n"
+            "Note 1: Events within the same lumi will always be processed contiguously.\n"
+            "Note 2: Lumis within the same run will always be processed contiguously.\n"
+            "Note 3: Any sorting occurs independently in each input file (no sorting across input files).");
     desc.addUntracked<unsigned int>("cacheSize", roottree::defaultCacheSize)
         ->setComment("Size of ROOT TTree prefetch cache.  Affects performance.");
     std::string defaultString("permissive");
     desc.addUntracked<std::string>("branchesMustMatch", defaultString)
-        ->setComment("'strict':     Branches in each input file must match those in the first file.\n"
-                     "'permissive': Branches in each input file may be any subset of those in the first file.");
+        ->setComment(
+            "'strict':     Branches in each input file must match those in the first file.\n"
+            "'permissive': Branches in each input file may be any subset of those in the first file.");
 
     EventSkipperByID::fillDescription(desc);
     DuplicateChecker::fillDescription(desc);
   }
 
-  ProcessingController::ForwardState
-  RootPrimaryFileSequence::forwardState() const {
-    if(rootFile()) {
-      if(!rootFile()->wasLastEventJustRead()) {
+  ProcessingController::ForwardState RootPrimaryFileSequence::forwardState() const {
+    if (rootFile()) {
+      if (!rootFile()->wasLastEventJustRead()) {
         return ProcessingController::kEventsAheadInFile;
       }
-      if(noMoreFiles() || atLastFile()) { 
+      if (noMoreFiles() || atLastFile()) {
         return ProcessingController::kAtLastEvent;
       } else {
         return ProcessingController::kNextFileExists;
@@ -354,13 +341,12 @@ namespace edm {
     return ProcessingController::kUnknownForward;
   }
 
-  ProcessingController::ReverseState
-  RootPrimaryFileSequence::reverseState() const {
-    if(rootFile()) {
-      if(!rootFile()->wasFirstEventJustRead()) {
+  ProcessingController::ReverseState RootPrimaryFileSequence::reverseState() const {
+    if (rootFile()) {
+      if (!rootFile()->wasFirstEventJustRead()) {
         return ProcessingController::kEventsBackwardsInFile;
       }
-      if(!atFirstFile()) {
+      if (!atFirstFile()) {
         return ProcessingController::kPreviousFileExists;
       }
       return ProcessingController::kAtFirstEvent;
@@ -368,4 +354,4 @@ namespace edm {
     return ProcessingController::kUnknownReverse;
   }
 
-}
+}  // namespace edm
diff --git a/IOPool/Input/src/RootPrimaryFileSequence.h b/IOPool/Input/src/RootPrimaryFileSequence.h
index 35308d0679a91..e365c109125c9 100644
--- a/IOPool/Input/src/RootPrimaryFileSequence.h
+++ b/IOPool/Input/src/RootPrimaryFileSequence.h
@@ -31,15 +31,13 @@ namespace edm {
   class PoolSource;
   class RootFile;
 
-  class RootPrimaryFileSequence : public RootInputFileSequence{
+  class RootPrimaryFileSequence : public RootInputFileSequence {
   public:
-    explicit RootPrimaryFileSequence(ParameterSet const& pset,
-                                   PoolSource& input,
-                                   InputFileCatalog const& catalog);
+    explicit RootPrimaryFileSequence(ParameterSet const& pset, PoolSource& input, InputFileCatalog const& catalog);
     ~RootPrimaryFileSequence() override;
 
-    RootPrimaryFileSequence(RootPrimaryFileSequence const&) = delete; // Disallow copying and moving
-    RootPrimaryFileSequence& operator=(RootPrimaryFileSequence const&) = delete; // Disallow copying and moving
+    RootPrimaryFileSequence(RootPrimaryFileSequence const&) = delete;             // Disallow copying and moving
+    RootPrimaryFileSequence& operator=(RootPrimaryFileSequence const&) = delete;  // Disallow copying and moving
 
     std::unique_ptr<FileBlock> readFile_();
     void closeFile_() override;
@@ -48,12 +46,13 @@ namespace edm {
     bool skipEvents(int offset);
     bool goToEvent(EventID const& eventID);
     void rewind_();
-    static void fillDescription(ParameterSetDescription & desc);
+    static void fillDescription(ParameterSetDescription& desc);
     ProcessingController::ForwardState forwardState() const;
     ProcessingController::ReverseState reverseState() const;
+
   private:
     void initFile_(bool skipBadFiles) override;
-    RootFileSharedPtr makeRootFile(std::shared_ptr<InputFile> filePtr) override; 
+    RootFileSharedPtr makeRootFile(std::shared_ptr<InputFile> filePtr) override;
     bool nextFile();
     bool previousFile();
     void rewindFile();
@@ -66,10 +65,10 @@ namespace edm {
     BranchDescription::MatchMode branchesMustMatch_;
     std::vector<ProcessHistoryID> orderedProcessHistoryIDs_;
 
-    std::shared_ptr<EventSkipperByID const> eventSkipperByID() const {return get_underlying_safe(eventSkipperByID_);}
-    std::shared_ptr<EventSkipperByID>& eventSkipperByID() {return get_underlying_safe(eventSkipperByID_);}
-    std::shared_ptr<DuplicateChecker const> duplicateChecker() const {return get_underlying_safe(duplicateChecker_);}
-    std::shared_ptr<DuplicateChecker>& duplicateChecker() {return get_underlying_safe(duplicateChecker_);}
+    std::shared_ptr<EventSkipperByID const> eventSkipperByID() const { return get_underlying_safe(eventSkipperByID_); }
+    std::shared_ptr<EventSkipperByID>& eventSkipperByID() { return get_underlying_safe(eventSkipperByID_); }
+    std::shared_ptr<DuplicateChecker const> duplicateChecker() const { return get_underlying_safe(duplicateChecker_); }
+    std::shared_ptr<DuplicateChecker>& duplicateChecker() { return get_underlying_safe(duplicateChecker_); }
 
     edm::propagate_const<std::shared_ptr<EventSkipperByID>> eventSkipperByID_;
     int initialNumberOfEventsToSkip_;
@@ -78,6 +77,6 @@ namespace edm {
     edm::propagate_const<std::shared_ptr<DuplicateChecker>> duplicateChecker_;
     bool usingGoToEvent_;
     bool enablePrefetching_;
-  }; // class RootPrimaryFileSequence
-}
+  };  // class RootPrimaryFileSequence
+}  // namespace edm
 #endif
diff --git a/IOPool/Input/src/RootSecondaryFileSequence.cc b/IOPool/Input/src/RootSecondaryFileSequence.cc
index aca06e96856a3..cf5cbe46a7899 100644
--- a/IOPool/Input/src/RootSecondaryFileSequence.cc
+++ b/IOPool/Input/src/RootSecondaryFileSequence.cc
@@ -18,18 +18,13 @@
 #include "Utilities/StorageFactory/interface/StorageFactory.h"
 
 namespace edm {
-  RootSecondaryFileSequence::RootSecondaryFileSequence(
-                ParameterSet const& pset,
-                PoolSource& input,
-                InputFileCatalog const& catalog) :
-    RootInputFileSequence(pset, catalog),
-    input_(input),
-    orderedProcessHistoryIDs_(),
-    enablePrefetching_(false) {
-
+  RootSecondaryFileSequence::RootSecondaryFileSequence(ParameterSet const& pset,
+                                                       PoolSource& input,
+                                                       InputFileCatalog const& catalog)
+      : RootInputFileSequence(pset, catalog), input_(input), orderedProcessHistoryIDs_(), enablePrefetching_(false) {
     // The SiteLocalConfig controls the TTreeCache size and the prefetching settings.
     Service<SiteLocalConfig> pSLC;
-    if(pSLC.isAvailable()) {
+    if (pSLC.isAvailable()) {
       enablePrefetching_ = pSLC->enablePrefetching();
     }
 
@@ -41,27 +36,23 @@ namespace edm {
     StorageFactory::get()->stagein(fileName());
 
     // Open the first file.
-    for(setAtFirstFile(); !noMoreFiles(); setAtNextFile()) {
+    for (setAtFirstFile(); !noMoreFiles(); setAtNextFile()) {
       initFile(input_.skipBadFiles());
-      if(rootFile()) break;
+      if (rootFile())
+        break;
     }
-    if(rootFile()) {
+    if (rootFile()) {
       input_.productRegistryUpdate().updateFromInput(rootFile()->productRegistry()->productList());
     }
   }
 
-  RootSecondaryFileSequence::~RootSecondaryFileSequence() {
-  }
+  RootSecondaryFileSequence::~RootSecondaryFileSequence() {}
 
-  void
-  RootSecondaryFileSequence::endJob() {
-    closeFile_();
-  }
+  void RootSecondaryFileSequence::endJob() { closeFile_(); }
 
-  void
-  RootSecondaryFileSequence::closeFile_() {
+  void RootSecondaryFileSequence::closeFile_() {
     // close the currently open file, if any, and delete the RootFile object.
-    if(rootFile()) {
+    if (rootFile()) {
       rootFile()->close();
       rootFile().reset();
     }
@@ -71,38 +62,36 @@ namespace edm {
     initTheFile(skipBadFiles, false, nullptr, "secondaryFiles", InputType::SecondaryFile);
   }
 
-  RootSecondaryFileSequence::RootFileSharedPtr
-  RootSecondaryFileSequence::makeRootFile(std::shared_ptr<InputFile> filePtr) {
+  RootSecondaryFileSequence::RootFileSharedPtr RootSecondaryFileSequence::makeRootFile(
+      std::shared_ptr<InputFile> filePtr) {
     size_t currentIndexIntoFile = sequenceNumberOfFile();
-    return std::make_shared<RootFile>(
-          fileName(),
-          input_.processConfiguration(),
-          logicalFileName(),
-          filePtr,
-	  input_.nStreams(),
-          input_.treeMaxVirtualSize(),
-          input_.processingMode(),
-          input_.runHelper(),
-          input_.productSelectorRules(),
-          InputType::SecondaryFile,
-          input_.branchIDListHelper(),
-          input_.thinnedAssociationsHelper(),
-          &associationsFromSecondary_,
-          input_.dropDescendants(),
-          input_.processHistoryRegistryForUpdate(),
-          indexesIntoFiles(),
-          currentIndexIntoFile,
-          orderedProcessHistoryIDs_,
-          input_.bypassVersionCheck(),
-          input_.labelRawDataLikeMC(),
-          enablePrefetching_);
+    return std::make_shared<RootFile>(fileName(),
+                                      input_.processConfiguration(),
+                                      logicalFileName(),
+                                      filePtr,
+                                      input_.nStreams(),
+                                      input_.treeMaxVirtualSize(),
+                                      input_.processingMode(),
+                                      input_.runHelper(),
+                                      input_.productSelectorRules(),
+                                      InputType::SecondaryFile,
+                                      input_.branchIDListHelper(),
+                                      input_.thinnedAssociationsHelper(),
+                                      &associationsFromSecondary_,
+                                      input_.dropDescendants(),
+                                      input_.processHistoryRegistryForUpdate(),
+                                      indexesIntoFiles(),
+                                      currentIndexIntoFile,
+                                      orderedProcessHistoryIDs_,
+                                      input_.bypassVersionCheck(),
+                                      input_.labelRawDataLikeMC(),
+                                      enablePrefetching_);
   }
 
-  void
-  RootSecondaryFileSequence::initAssociationsFromSecondary(std::set<BranchID> const& associationsFromSecondary) {
-    for(auto const& branchID : associationsFromSecondary) {
+  void RootSecondaryFileSequence::initAssociationsFromSecondary(std::set<BranchID> const& associationsFromSecondary) {
+    for (auto const& branchID : associationsFromSecondary) {
       associationsFromSecondary_.push_back(branchID);
     }
     rootFile()->initAssociationsFromSecondary(associationsFromSecondary_);
   }
-}
+}  // namespace edm
diff --git a/IOPool/Input/src/RootSecondaryFileSequence.h b/IOPool/Input/src/RootSecondaryFileSequence.h
index d74f2ad85e272..1f12aec0fdc81 100644
--- a/IOPool/Input/src/RootSecondaryFileSequence.h
+++ b/IOPool/Input/src/RootSecondaryFileSequence.h
@@ -27,25 +27,24 @@ namespace edm {
 
   class RootSecondaryFileSequence : public RootInputFileSequence {
   public:
-    explicit RootSecondaryFileSequence(ParameterSet const& pset,
-                                   PoolSource& input,
-                                   InputFileCatalog const& catalog);
+    explicit RootSecondaryFileSequence(ParameterSet const& pset, PoolSource& input, InputFileCatalog const& catalog);
     ~RootSecondaryFileSequence() override;
 
-    RootSecondaryFileSequence(RootSecondaryFileSequence const&) = delete; // Disallow copying and moving
-    RootSecondaryFileSequence& operator=(RootSecondaryFileSequence const&) = delete; // Disallow copying and moving
+    RootSecondaryFileSequence(RootSecondaryFileSequence const&) = delete;             // Disallow copying and moving
+    RootSecondaryFileSequence& operator=(RootSecondaryFileSequence const&) = delete;  // Disallow copying and moving
 
     void closeFile_() override;
     void endJob();
     void initAssociationsFromSecondary(std::set<BranchID> const&);
+
   private:
     void initFile_(bool skipBadFiles) override;
-    RootFileSharedPtr makeRootFile(std::shared_ptr<InputFile> filePtr) override; 
+    RootFileSharedPtr makeRootFile(std::shared_ptr<InputFile> filePtr) override;
 
     PoolSource& input_;
     std::vector<BranchID> associationsFromSecondary_;
     std::vector<ProcessHistoryID> orderedProcessHistoryIDs_;
     bool enablePrefetching_;
-  }; // class RootSecondaryFileSequence
-}
+  };  // class RootSecondaryFileSequence
+}  // namespace edm
 #endif
diff --git a/IOPool/Input/src/RootTree.cc b/IOPool/Input/src/RootTree.cc
index f6cd5ac16f9c0..a02cd5f8ffe13 100644
--- a/IOPool/Input/src/RootTree.cc
+++ b/IOPool/Input/src/RootTree.cc
@@ -24,7 +24,7 @@ namespace edm {
       TBranch* branch = tree->GetBranch(BranchTypeToBranchEntryInfoBranchName(branchType).c_str());
       return branch;
     }
-  }
+  }  // namespace
   RootTree::RootTree(std::shared_ptr<InputFile> filePtr,
                      BranchType const& branchType,
                      unsigned int nIndexes,
@@ -32,177 +32,173 @@ namespace edm {
                      unsigned int cacheSize,
                      unsigned int learningEntries,
                      bool enablePrefetching,
-                     InputType inputType) :
-    filePtr_(filePtr),
-    tree_(dynamic_cast<TTree*>(filePtr_.get() != nullptr ? filePtr_->Get(BranchTypeToProductTreeName(branchType).c_str()) : nullptr)),
-    metaTree_(dynamic_cast<TTree*>(filePtr_.get() != nullptr ? filePtr_->Get(BranchTypeToMetaDataTreeName(branchType).c_str()) : nullptr)),
-    branchType_(branchType),
-    auxBranch_(tree_ ? getAuxiliaryBranch(tree_, branchType_) : nullptr),
-    treeCache_(),
-    rawTreeCache_(),
-    triggerTreeCache_(),
-    rawTriggerTreeCache_(),
-    trainedSet_(),
-    triggerSet_(),
-    entries_(tree_ ? tree_->GetEntries() : 0),
-    entryNumber_(-1),
-    entryNumberForIndex_(new std::vector<EntryNumber>(nIndexes, IndexIntoFile::invalidEntry)),
-    branchNames_(),
-    branches_{},
-    trainNow_(false),
-    switchOverEntry_(-1),
-    rawTriggerSwitchOverEntry_(-1),
-    performedSwitchOver_{false},
-    learningEntries_(learningEntries),
-    cacheSize_(cacheSize),
-    treeAutoFlush_(0),
-    enablePrefetching_(enablePrefetching),
-    enableTriggerCache_(branchType_ == InEvent),
-    rootDelayedReader_(new RootDelayedReader(*this, filePtr, inputType)),
-    branchEntryInfoBranch_(metaTree_ ? getProductProvenanceBranch(metaTree_, branchType_) : (tree_ ? getProductProvenanceBranch(tree_, branchType_) : nullptr)),
-    infoTree_(dynamic_cast<TTree*>(filePtr_.get() != nullptr ? filePtr->Get(BranchTypeToInfoTreeName(branchType).c_str()) : nullptr)) // backward compatibility
-    {
-      if(not tree_) {
-        throw cms::Exception("WrongFileFormat")<< "The ROOT file does not contain a TTree named "<<BranchTypeToProductTreeName(branchType)<<"\n This is either not an edm ROOT file or is one that has been corrupted.";
-      }
-      // On merged files in older releases of ROOT, the autoFlush setting is always negative; we must guess.
-      // TODO: On newer merged files, we should be able to get this from the cluster iterator.
-      long treeAutoFlush = (tree_ ? tree_->GetAutoFlush() : 0);
-      if (treeAutoFlush < 0) {
-        // The "+1" is here to avoid divide-by-zero in degenerate cases.
-        Long64_t averageEventSizeBytes = tree_->GetZipBytes() / (tree_->GetEntries()+1) + 1;
-        treeAutoFlush_ = cacheSize_/averageEventSizeBytes+1;
-      } else {
-        treeAutoFlush_ = treeAutoFlush;
-      }
-      if (treeAutoFlush_ < learningEntries_) {
-        learningEntries_ = treeAutoFlush_;
-      }
-      setTreeMaxVirtualSize(maxVirtualSize);
-      setCacheSize(cacheSize);
-      if (tree_) {
-         Int_t branchCount = tree_->GetListOfBranches()->GetEntriesFast();
-         trainedSet_.reserve(branchCount);
-         triggerSet_.reserve(branchCount);
-      }
+                     InputType inputType)
+      : filePtr_(filePtr),
+        tree_(dynamic_cast<TTree*>(
+            filePtr_.get() != nullptr ? filePtr_->Get(BranchTypeToProductTreeName(branchType).c_str()) : nullptr)),
+        metaTree_(dynamic_cast<TTree*>(
+            filePtr_.get() != nullptr ? filePtr_->Get(BranchTypeToMetaDataTreeName(branchType).c_str()) : nullptr)),
+        branchType_(branchType),
+        auxBranch_(tree_ ? getAuxiliaryBranch(tree_, branchType_) : nullptr),
+        treeCache_(),
+        rawTreeCache_(),
+        triggerTreeCache_(),
+        rawTriggerTreeCache_(),
+        trainedSet_(),
+        triggerSet_(),
+        entries_(tree_ ? tree_->GetEntries() : 0),
+        entryNumber_(-1),
+        entryNumberForIndex_(new std::vector<EntryNumber>(nIndexes, IndexIntoFile::invalidEntry)),
+        branchNames_(),
+        branches_{},
+        trainNow_(false),
+        switchOverEntry_(-1),
+        rawTriggerSwitchOverEntry_(-1),
+        performedSwitchOver_{false},
+        learningEntries_(learningEntries),
+        cacheSize_(cacheSize),
+        treeAutoFlush_(0),
+        enablePrefetching_(enablePrefetching),
+        enableTriggerCache_(branchType_ == InEvent),
+        rootDelayedReader_(new RootDelayedReader(*this, filePtr, inputType)),
+        branchEntryInfoBranch_(metaTree_ ? getProductProvenanceBranch(metaTree_, branchType_)
+                                         : (tree_ ? getProductProvenanceBranch(tree_, branchType_) : nullptr)),
+        infoTree_(dynamic_cast<TTree*>(filePtr_.get() != nullptr
+                                           ? filePtr->Get(BranchTypeToInfoTreeName(branchType).c_str())
+                                           : nullptr))  // backward compatibility
+  {
+    if (not tree_) {
+      throw cms::Exception("WrongFileFormat")
+          << "The ROOT file does not contain a TTree named " << BranchTypeToProductTreeName(branchType)
+          << "\n This is either not an edm ROOT file or is one that has been corrupted.";
+    }
+    // On merged files in older releases of ROOT, the autoFlush setting is always negative; we must guess.
+    // TODO: On newer merged files, we should be able to get this from the cluster iterator.
+    long treeAutoFlush = (tree_ ? tree_->GetAutoFlush() : 0);
+    if (treeAutoFlush < 0) {
+      // The "+1" is here to avoid divide-by-zero in degenerate cases.
+      Long64_t averageEventSizeBytes = tree_->GetZipBytes() / (tree_->GetEntries() + 1) + 1;
+      treeAutoFlush_ = cacheSize_ / averageEventSizeBytes + 1;
+    } else {
+      treeAutoFlush_ = treeAutoFlush;
+    }
+    if (treeAutoFlush_ < learningEntries_) {
+      learningEntries_ = treeAutoFlush_;
+    }
+    setTreeMaxVirtualSize(maxVirtualSize);
+    setCacheSize(cacheSize);
+    if (tree_) {
+      Int_t branchCount = tree_->GetListOfBranches()->GetEntriesFast();
+      trainedSet_.reserve(branchCount);
+      triggerSet_.reserve(branchCount);
+    }
   }
 
-  RootTree::~RootTree() {
-  }
+  RootTree::~RootTree() {}
 
-  RootTree::EntryNumber const&
-  RootTree::entryNumberForIndex(unsigned int index) const {
+  RootTree::EntryNumber const& RootTree::entryNumberForIndex(unsigned int index) const {
     assert(index < entryNumberForIndex_->size());
     return (*entryNumberForIndex_)[index];
   }
 
-  void
-  RootTree::insertEntryForIndex(unsigned int index) {
+  void RootTree::insertEntryForIndex(unsigned int index) {
     assert(index < entryNumberForIndex_->size());
     (*entryNumberForIndex_)[index] = entryNumber();
   }
 
-  bool
-  RootTree::isValid() const {
+  bool RootTree::isValid() const {
     if (metaTree_ == nullptr || metaTree_->GetNbranches() == 0) {
       return tree_ != nullptr && auxBranch_ != nullptr;
     }
-    if (tree_ != nullptr && auxBranch_ != nullptr && metaTree_ != nullptr) { // backward compatibility
-      if (branchEntryInfoBranch_ != nullptr || infoTree_ != nullptr) return true; // backward compatibility
-      return (entries_ == metaTree_->GetEntries() && tree_->GetNbranches() <= metaTree_->GetNbranches() + 1);  // backward compatibility
-    } // backward compatibility
+    if (tree_ != nullptr && auxBranch_ != nullptr && metaTree_ != nullptr) {  // backward compatibility
+      if (branchEntryInfoBranch_ != nullptr || infoTree_ != nullptr)
+        return true;  // backward compatibility
+      return (entries_ == metaTree_->GetEntries() &&
+              tree_->GetNbranches() <= metaTree_->GetNbranches() + 1);  // backward compatibility
+    }                                                                   // backward compatibility
     return false;
   }
 
-  DelayedReader*
-  RootTree::resetAndGetRootDelayedReader() const {
+  DelayedReader* RootTree::resetAndGetRootDelayedReader() const {
     rootDelayedReader_->reset();
     return rootDelayedReader_.get();
   }
 
-  DelayedReader*
-  RootTree::rootDelayedReader() const {
-    return rootDelayedReader_.get();
-  }  
+  DelayedReader* RootTree::rootDelayedReader() const { return rootDelayedReader_.get(); }
 
-  void
-  RootTree::setPresence(BranchDescription& prod, std::string const& oldBranchName) {
-      assert(isValid());
-      if(tree_->GetBranch(oldBranchName.c_str()) == nullptr){
-        prod.setDropped(true);
-      }
+  void RootTree::setPresence(BranchDescription& prod, std::string const& oldBranchName) {
+    assert(isValid());
+    if (tree_->GetBranch(oldBranchName.c_str()) == nullptr) {
+      prod.setDropped(true);
+    }
   }
 
-  void
-  RootTree::addBranch(BranchDescription const& prod,
-                      std::string const& oldBranchName) {
-      assert(isValid());
-      //use the translated branch name
-      TBranch* branch = tree_->GetBranch(oldBranchName.c_str());
-      roottree::BranchInfo info = roottree::BranchInfo(prod);
-      info.productBranch_ = nullptr;
-      if (prod.present()) {
-        info.productBranch_ = branch;
-        //we want the new branch name for the JobReport
-        branchNames_.push_back(prod.branchName());
-      }
-      TTree* provTree = (metaTree_ != nullptr ? metaTree_ : tree_);
-      info.provenanceBranch_ = provTree->GetBranch(oldBranchName.c_str());
-      branches_.insert(prod.branchID(), info);
+  void RootTree::addBranch(BranchDescription const& prod, std::string const& oldBranchName) {
+    assert(isValid());
+    //use the translated branch name
+    TBranch* branch = tree_->GetBranch(oldBranchName.c_str());
+    roottree::BranchInfo info = roottree::BranchInfo(prod);
+    info.productBranch_ = nullptr;
+    if (prod.present()) {
+      info.productBranch_ = branch;
+      //we want the new branch name for the JobReport
+      branchNames_.push_back(prod.branchName());
+    }
+    TTree* provTree = (metaTree_ != nullptr ? metaTree_ : tree_);
+    info.provenanceBranch_ = provTree->GetBranch(oldBranchName.c_str());
+    branches_.insert(prod.branchID(), info);
   }
 
-  void
-  RootTree::dropBranch(std::string const& oldBranchName) {
-      //use the translated branch name
-      TBranch* branch = tree_->GetBranch(oldBranchName.c_str());
-      if (branch != nullptr) {
-        TObjArray* leaves = tree_->GetListOfLeaves();
-        int entries = leaves->GetEntries();
-        for (int i = 0; i < entries; ++i) {
-          TLeaf* leaf = (TLeaf*)(*leaves)[i];
-          if (leaf == nullptr) continue;
-          TBranch* br = leaf->GetBranch();
-          if (br == nullptr) continue;
-          if (br->GetMother() == branch) {
-            leaves->Remove(leaf);
-          }
+  void RootTree::dropBranch(std::string const& oldBranchName) {
+    //use the translated branch name
+    TBranch* branch = tree_->GetBranch(oldBranchName.c_str());
+    if (branch != nullptr) {
+      TObjArray* leaves = tree_->GetListOfLeaves();
+      int entries = leaves->GetEntries();
+      for (int i = 0; i < entries; ++i) {
+        TLeaf* leaf = (TLeaf*)(*leaves)[i];
+        if (leaf == nullptr)
+          continue;
+        TBranch* br = leaf->GetBranch();
+        if (br == nullptr)
+          continue;
+        if (br->GetMother() == branch) {
+          leaves->Remove(leaf);
         }
-        leaves->Compress();
-        tree_->GetListOfBranches()->Remove(branch);
-        tree_->GetListOfBranches()->Compress();
-        delete branch;
       }
+      leaves->Compress();
+      tree_->GetListOfBranches()->Remove(branch);
+      tree_->GetListOfBranches()->Compress();
+      delete branch;
+    }
   }
 
-  roottree::BranchMap const&
-  RootTree::branches() const {return branches_;}
+  roottree::BranchMap const& RootTree::branches() const { return branches_; }
 
-  void
-  RootTree::setCacheSize(unsigned int cacheSize) {
+  void RootTree::setCacheSize(unsigned int cacheSize) {
     cacheSize_ = cacheSize;
     tree_->SetCacheSize(static_cast<Long64_t>(cacheSize));
     treeCache_.reset(dynamic_cast<TTreeCache*>(filePtr_->GetCacheRead()));
-    if(treeCache_) treeCache_->SetEnablePrefetching(enablePrefetching_);
+    if (treeCache_)
+      treeCache_->SetEnablePrefetching(enablePrefetching_);
     filePtr_->SetCacheRead(nullptr);
     rawTreeCache_.reset();
   }
 
-  void
-  RootTree::setTreeMaxVirtualSize(int treeMaxVirtualSize) {
-    if (treeMaxVirtualSize >= 0) tree_->SetMaxVirtualSize(static_cast<Long64_t>(treeMaxVirtualSize));
+  void RootTree::setTreeMaxVirtualSize(int treeMaxVirtualSize) {
+    if (treeMaxVirtualSize >= 0)
+      tree_->SetMaxVirtualSize(static_cast<Long64_t>(treeMaxVirtualSize));
   }
 
-  bool
-  RootTree::nextWithCache() {
-    bool returnValue =  ++entryNumber_ < entries_;
-    if(returnValue) {
+  bool RootTree::nextWithCache() {
+    bool returnValue = ++entryNumber_ < entries_;
+    if (returnValue) {
       setEntryNumber(entryNumber_);
     }
     return returnValue;
   }
 
-  void
-  RootTree::setEntryNumber(EntryNumber theEntryNumber) {
+  void RootTree::setEntryNumber(EntryNumber theEntryNumber) {
     filePtr_->SetCacheRead(treeCache_.get());
 
     // Detect a backward skip.  If the skip is sufficiently large, we roll the dice and reset the treeCache.
@@ -210,20 +206,20 @@ namespace edm {
     // However, because reading one event in the cluster is supposed to be equivalent to reading all events in the cluster,
     // we're not incurring additional over-reading - we're just doing it more efficiently.
     // NOTE: Constructor guarantees treeAutoFlush_ is positive, even if TTree->GetAutoFlush() is negative.
-    if(theEntryNumber < entryNumber_ and theEntryNumber >=0) {
+    if (theEntryNumber < entryNumber_ and theEntryNumber >= 0) {
       //We started reading the file near the end, now we need to correct for the learning length
-      if(switchOverEntry_ >tree_->GetEntries()) {
-        switchOverEntry_ = switchOverEntry_-tree_->GetEntries();
-        if(rawTreeCache_) {
+      if (switchOverEntry_ > tree_->GetEntries()) {
+        switchOverEntry_ = switchOverEntry_ - tree_->GetEntries();
+        if (rawTreeCache_) {
           rawTreeCache_->SetEntryRange(theEntryNumber, switchOverEntry_);
           rawTreeCache_->FillBuffer();
         }
       }
-      if(performedSwitchOver_ and triggerTreeCache_) {
+      if (performedSwitchOver_ and triggerTreeCache_) {
         //We are using the triggerTreeCache_ not the rawTriggerTreeCache_.
         //The triggerTreeCache was originally told to start from an entry further in the file.
         triggerTreeCache_->SetEntryRange(theEntryNumber, tree_->GetEntries());
-      } else if(rawTriggerTreeCache_) {
+      } else if (rawTriggerTreeCache_) {
         //move the switch point to the end of the cluster holding theEntryNumber
         rawTriggerSwitchOverEntry_ = -1;
         TTree::TClusterIterator clusterIter = tree_->GetClusterIterator(theEntryNumber);
@@ -233,8 +229,8 @@ namespace edm {
         rawTriggerTreeCache_->SetEntryRange(theEntryNumber, rawTriggerSwitchOverEntry_);
       }
     }
-    if ((theEntryNumber < static_cast<EntryNumber>(entryNumber_-treeAutoFlush_)) &&
-        (treeCache_) && (!treeCache_->IsLearning()) && (entries_ > 0) && (switchOverEntry_ >= 0)) {
+    if ((theEntryNumber < static_cast<EntryNumber>(entryNumber_ - treeAutoFlush_)) && (treeCache_) &&
+        (!treeCache_->IsLearning()) && (entries_ > 0) && (switchOverEntry_ >= 0)) {
       treeCache_->SetEntryRange(theEntryNumber, entries_);
       treeCache_->FillBuffer();
     }
@@ -242,7 +238,7 @@ namespace edm {
     entryNumber_ = theEntryNumber;
     tree_->LoadTree(entryNumber_);
     filePtr_->SetCacheRead(nullptr);
-    if(treeCache_ && trainNow_ && entryNumber_ >= 0) {
+    if (treeCache_ && trainNow_ && entryNumber_ >= 0) {
       startTraining();
       trainNow_ = false;
       trainedSet_.clear();
@@ -256,8 +252,7 @@ namespace edm {
 
   // The actual implementation is done below; it's split in this strange
   // manner in order to keep a by-definition-rare code path out of the instruction cache.
-  inline TTreeCache*
-  RootTree::checkTriggerCache(TBranch* branch, EntryNumber entryNumber) const {
+  inline TTreeCache* RootTree::checkTriggerCache(TBranch* branch, EntryNumber entryNumber) const {
     if (!treeCache_->IsAsyncReading() && enableTriggerCache_ && (trainedSet_.find(branch) == trainedSet_.end())) {
       return checkTriggerCacheImpl(branch, entryNumber);
     } else {
@@ -267,14 +262,15 @@ namespace edm {
 
   // See comments in the header.  If this function is called, we already know
   // the trigger cache is active and it was a cache miss for the regular cache.
-  TTreeCache*
-  RootTree::checkTriggerCacheImpl(TBranch* branch, EntryNumber entryNumber) const {
+  TTreeCache* RootTree::checkTriggerCacheImpl(TBranch* branch, EntryNumber entryNumber) const {
     // This branch is not going to be in the cache.
     // Assume this is a "trigger pattern".
     // Always make sure the branch is added to the trigger set.
     if (triggerSet_.find(branch) == triggerSet_.end()) {
       triggerSet_.insert(branch);
-      if (triggerTreeCache_.get()) { triggerTreeCache_->AddBranch(branch, kTRUE); }
+      if (triggerTreeCache_.get()) {
+        triggerTreeCache_->AddBranch(branch, kTRUE);
+      }
     }
 
     if (rawTriggerSwitchOverEntry_ < 0) {
@@ -293,17 +289,18 @@ namespace edm {
 
       // ROOT will automatically expand the cache to fit one cluster; hence, we use
       // 5 MB as the cache size below
-      tree_->SetCacheSize(static_cast<Long64_t>(5*1024*1024));
+      tree_->SetCacheSize(static_cast<Long64_t>(5 * 1024 * 1024));
       rawTriggerTreeCache_.reset(dynamic_cast<TTreeCache*>(filePtr_->GetCacheRead()));
-      if(rawTriggerTreeCache_) rawTriggerTreeCache_->SetEnablePrefetching(false);
-      TObjArray *branches = tree_->GetListOfBranches();
+      if (rawTriggerTreeCache_)
+        rawTriggerTreeCache_->SetEnablePrefetching(false);
+      TObjArray* branches = tree_->GetListOfBranches();
       int branchCount = branches->GetEntriesFast();
 
       // Train the rawTriggerCache to have everything not in the regular cache.
       rawTriggerTreeCache_->SetLearnEntries(0);
       rawTriggerTreeCache_->SetEntryRange(entryNumber, rawTriggerSwitchOverEntry_);
-      for (int i=0;i<branchCount;i++) {
-        TBranch *tmp_branch = (TBranch*)branches->UncheckedAt(i);
+      for (int i = 0; i < branchCount; i++) {
+        TBranch* tmp_branch = (TBranch*)branches->UncheckedAt(i);
         if (trainedSet_.find(tmp_branch) != trainedSet_.end()) {
           continue;
         }
@@ -322,18 +319,17 @@ namespace edm {
       // triggerCache instead.
       if (!performedSwitchOver_) {
         rawTriggerTreeCache_.reset();
-        performedSwitchOver_ = true; 
-        
+        performedSwitchOver_ = true;
+
         // Train the triggerCache
-        tree_->SetCacheSize(static_cast<Long64_t>(5*1024*1024));
+        tree_->SetCacheSize(static_cast<Long64_t>(5 * 1024 * 1024));
         triggerTreeCache_.reset(dynamic_cast<TTreeCache*>(filePtr_->GetCacheRead()));
         triggerTreeCache_->SetEnablePrefetching(false);
         triggerTreeCache_->SetLearnEntries(0);
         triggerTreeCache_->SetEntryRange(entryNumber, tree_->GetEntries());
-        for(std::unordered_set<TBranch*>::const_iterator it = triggerSet_.begin(), itEnd = triggerSet_.end();
-              it != itEnd;
-              it++)
-        { 
+        for (std::unordered_set<TBranch*>::const_iterator it = triggerSet_.begin(), itEnd = triggerSet_.end();
+             it != itEnd;
+             it++) {
           triggerTreeCache_->AddBranch(*it, kTRUE);
         }
         triggerTreeCache_->StopLearningPhase();
@@ -343,13 +339,12 @@ namespace edm {
     }
 
     // By construction, this case should be impossible.
-    assert (false);
+    assert(false);
     return nullptr;
   }
 
-  inline TTreeCache*
-  RootTree::selectCache(TBranch* branch, EntryNumber entryNumber) const {
-    TTreeCache *triggerCache = nullptr;
+  inline TTreeCache* RootTree::selectCache(TBranch* branch, EntryNumber entryNumber) const {
+    TTreeCache* triggerCache = nullptr;
     if (!treeCache_) {
       return nullptr;
     } else if (treeCache_->IsLearning() && rawTreeCache_) {
@@ -366,28 +361,26 @@ namespace edm {
     }
   }
 
-  void
-  RootTree::getEntry(TBranch* branch, EntryNumber entryNumber) const {
+  void RootTree::getEntry(TBranch* branch, EntryNumber entryNumber) const {
     try {
-      TTreeCache * cache = selectCache(branch, entryNumber);
+      TTreeCache* cache = selectCache(branch, entryNumber);
       filePtr_->SetCacheRead(cache);
       branch->GetEntry(entryNumber);
       filePtr_->SetCacheRead(nullptr);
-    } catch(cms::Exception const& e) {
+    } catch (cms::Exception const& e) {
       // We make sure the treeCache_ is detached from the file,
       // so that ROOT does not also delete it.
       filePtr_->SetCacheRead(nullptr);
       Exception t(errors::FileReadError, "", e);
-      t.addContext(std::string("Reading branch ")+branch->GetName());
+      t.addContext(std::string("Reading branch ") + branch->GetName());
       throw t;
     }
   }
 
-  bool
-  RootTree::skipEntries(unsigned int& offset) {
+  bool RootTree::skipEntries(unsigned int& offset) {
     entryNumber_ += offset;
     bool retval = (entryNumber_ < entries_);
-    if(retval) {
+    if (retval) {
       offset = 0;
     } else {
       // Not enough entries in the file to skip.
@@ -399,8 +392,7 @@ namespace edm {
     return retval;
   }
 
-  void
-  RootTree::startTraining() {
+  void RootTree::startTraining() {
     if (cacheSize_ == 0) {
       return;
     }
@@ -409,16 +401,16 @@ namespace edm {
     assert(!rawTreeCache_);
     treeCache_->SetLearnEntries(learningEntries_);
     tree_->SetCacheSize(static_cast<Long64_t>(cacheSize_));
-    rawTreeCache_.reset(dynamic_cast<TTreeCache *>(filePtr_->GetCacheRead()));
+    rawTreeCache_.reset(dynamic_cast<TTreeCache*>(filePtr_->GetCacheRead()));
     rawTreeCache_->SetEnablePrefetching(false);
     filePtr_->SetCacheRead(nullptr);
     rawTreeCache_->SetLearnEntries(0);
     switchOverEntry_ = entryNumber_ + learningEntries_;
     auto rawStart = entryNumber_;
     auto rawEnd = switchOverEntry_;
-    auto treeStart =switchOverEntry_;
-    if(switchOverEntry_ >= tree_->GetEntries()) {
-      treeStart = switchOverEntry_-tree_->GetEntries();
+    auto treeStart = switchOverEntry_;
+    if (switchOverEntry_ >= tree_->GetEntries()) {
+      treeStart = switchOverEntry_ - tree_->GetEntries();
       rawEnd = tree_->GetEntries();
     }
     rawTreeCache_->StartLearningPhase();
@@ -437,19 +429,17 @@ namespace edm {
     assert(treeCache_->GetTree() == tree_);
   }
 
-  void
-  RootTree::stopTraining() {
+  void RootTree::stopTraining() {
     filePtr_->SetCacheRead(treeCache_.get());
     treeCache_->StopLearningPhase();
     filePtr_->SetCacheRead(nullptr);
     rawTreeCache_.reset();
   }
 
-  void
-  RootTree::close () {
+  void RootTree::close() {
     // The TFile is about to be closed, and destructed.
     // Just to play it safe, zero all pointers to quantities that are owned by the TFile.
-    auxBranch_  = branchEntryInfoBranch_ = nullptr;
+    auxBranch_ = branchEntryInfoBranch_ = nullptr;
     tree_ = metaTree_ = infoTree_ = nullptr;
     // We own the treeCache_.
     // We make sure the treeCache_ is detached from the file,
@@ -467,8 +457,7 @@ namespace edm {
     filePtr_.reset();
   }
 
-  void
-  RootTree::trainCache(char const* branchNames) {
+  void RootTree::trainCache(char const* branchNames) {
     if (cacheSize_ == 0) {
       return;
     }
@@ -486,52 +475,47 @@ namespace edm {
     filePtr_->SetCacheRead(nullptr);
 
     // Must also manually add things to the trained set.
-    TObjArray *branches = tree_->GetListOfBranches();
+    TObjArray* branches = tree_->GetListOfBranches();
     int branchCount = branches->GetEntriesFast();
-    for (int i=0;i<branchCount;i++) {
-       TBranch *branch = (TBranch*)branches->UncheckedAt(i);
-       if ((branchNames[0] == '*') || (strcmp(branchNames, branch->GetName()) == 0)) {
-          trainedSet_.insert(branch);
-       } 
-    } 
- 
-  }
-  
-  void
-  RootTree::setSignals(signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* preEventReadSource,
-                       signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* postEventReadSource) {
-    rootDelayedReader_->setSignals(preEventReadSource,
-                                   postEventReadSource);
+    for (int i = 0; i < branchCount; i++) {
+      TBranch* branch = (TBranch*)branches->UncheckedAt(i);
+      if ((branchNames[0] == '*') || (strcmp(branchNames, branch->GetName()) == 0)) {
+        trainedSet_.insert(branch);
+      }
+    }
   }
 
+  void RootTree::setSignals(
+      signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* preEventReadSource,
+      signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* postEventReadSource) {
+    rootDelayedReader_->setSignals(preEventReadSource, postEventReadSource);
+  }
 
   namespace roottree {
-    Int_t
-    getEntry(TBranch* branch, EntryNumber entryNumber) {
+    Int_t getEntry(TBranch* branch, EntryNumber entryNumber) {
       Int_t n = 0;
       try {
         n = branch->GetEntry(entryNumber);
-      }
-      catch(cms::Exception const& e) {
+      } catch (cms::Exception const& e) {
         throw Exception(errors::FileReadError, "", e);
       }
       return n;
     }
 
-    Int_t
-    getEntry(TTree* tree, EntryNumber entryNumber) {
+    Int_t getEntry(TTree* tree, EntryNumber entryNumber) {
       Int_t n = 0;
       try {
         n = tree->GetEntry(entryNumber);
-      }
-      catch(cms::Exception const& e) {
-        throw Exception (errors::FileReadError, "", e);
+      } catch (cms::Exception const& e) {
+        throw Exception(errors::FileReadError, "", e);
       }
       return n;
     }
 
-    std::unique_ptr<TTreeCache>
-    trainCache(TTree* tree, InputFile& file, unsigned int cacheSize, char const* branchNames) {
+    std::unique_ptr<TTreeCache> trainCache(TTree* tree,
+                                           InputFile& file,
+                                           unsigned int cacheSize,
+                                           char const* branchNames) {
       tree->LoadTree(0);
       tree->SetCacheSize(cacheSize);
       std::unique_ptr<TTreeCache> treeCache(dynamic_cast<TTreeCache*>(file.GetCacheRead()));
@@ -547,5 +531,5 @@ namespace edm {
       file.SetCacheRead(nullptr);
       return treeCache;
     }
-  }
-}
+  }  // namespace roottree
+}  // namespace edm
diff --git a/IOPool/Input/src/RootTree.h b/IOPool/Input/src/RootTree.h
index e3b25bbd837de..b40b0a9bf2c14 100644
--- a/IOPool/Input/src/RootTree.h
+++ b/IOPool/Input/src/RootTree.h
@@ -36,12 +36,12 @@ namespace edm {
 
   class StreamContext;
   class ModuleCallingContext;
-  
+
   namespace signalslot {
-    template <typename T> class Signal;
+    template <typename T>
+    class Signal;
   }
 
-
   namespace roottree {
     unsigned int const defaultCacheSize = 20U * 1024 * 1024;
     unsigned int const defaultNonEventCacheSize = 1U * 1024 * 1024;
@@ -49,50 +49,54 @@ namespace edm {
     unsigned int const defaultNonEventLearningEntries = 1U;
     typedef IndexIntoFile::EntryNumber_t EntryNumber;
     struct BranchInfo {
-      BranchInfo(BranchDescription const& prod) :
-        branchDescription_(prod),
-        productBranch_(nullptr),
-        provenanceBranch_(nullptr),
-        classCache_(nullptr),
-        offsetToWrapperBase_(0) {}
+      BranchInfo(BranchDescription const& prod)
+          : branchDescription_(prod),
+            productBranch_(nullptr),
+            provenanceBranch_(nullptr),
+            classCache_(nullptr),
+            offsetToWrapperBase_(0) {}
       BranchDescription const branchDescription_;
       TBranch* productBranch_;
-      TBranch* provenanceBranch_; // For backward compatibility
+      TBranch* provenanceBranch_;  // For backward compatibility
       mutable TClass* classCache_;
       mutable Int_t offsetToWrapperBase_;
     };
-    
+
     class BranchMap {
       enum {
         kKeys,
         kInfos,
       };
+
     public:
-      void reserve(size_t iSize) {
-        map_.reserve(iSize);
-      }
-      void insert(edm::BranchID const& iKey, BranchInfo const& iInfo) {
-        map_.emplace(iKey.id(),iInfo);
-      }
+      void reserve(size_t iSize) { map_.reserve(iSize); }
+      void insert(edm::BranchID const& iKey, BranchInfo const& iInfo) { map_.emplace(iKey.id(), iInfo); }
       BranchInfo const* find(BranchID const& iKey) const {
         auto itFound = map_.find(iKey.id());
-        if(itFound == map_.end()) {return nullptr;}
+        if (itFound == map_.end()) {
+          return nullptr;
+        }
         return &itFound->second;
       }
       BranchInfo* find(BranchID const& iKey) {
         auto itFound = map_.find(iKey.id());
-        if(itFound == map_.end()) {return nullptr;}
+        if (itFound == map_.end()) {
+          return nullptr;
+        }
         return &itFound->second;
       }
 
     private:
-      std::unordered_map<unsigned int,BranchInfo> map_;
+      std::unordered_map<unsigned int, BranchInfo> map_;
     };
 
     Int_t getEntry(TBranch* branch, EntryNumber entryNumber);
     Int_t getEntry(TTree* tree, EntryNumber entryNumber);
-    std::unique_ptr<TTreeCache> trainCache(TTree* tree, InputFile& file, unsigned int cacheSize, char const* branchNames);
-  }
+    std::unique_ptr<TTreeCache> trainCache(TTree* tree,
+                                           InputFile& file,
+                                           unsigned int cacheSize,
+                                           char const* branchNames);
+  }  // namespace roottree
 
   class RootTree {
   public:
@@ -108,32 +112,30 @@ namespace edm {
              InputType inputType);
     ~RootTree();
 
-    RootTree(RootTree const&) = delete; // Disallow copying and moving
-    RootTree& operator=(RootTree const&) = delete; // Disallow copying and moving
+    RootTree(RootTree const&) = delete;             // Disallow copying and moving
+    RootTree& operator=(RootTree const&) = delete;  // Disallow copying and moving
 
     bool isValid() const;
-    void numberOfBranchesToAdd(size_t iSize) { branches_.reserve(iSize);}
-    void addBranch(BranchDescription const& prod,
-                   std::string const& oldBranchName);
+    void numberOfBranchesToAdd(size_t iSize) { branches_.reserve(iSize); }
+    void addBranch(BranchDescription const& prod, std::string const& oldBranchName);
     void dropBranch(std::string const& oldBranchName);
-    void getEntry(TBranch *branch, EntryNumber entry) const;
-    void setPresence(BranchDescription& prod,
-                   std::string const& oldBranchName);
+    void getEntry(TBranch* branch, EntryNumber entry) const;
+    void setPresence(BranchDescription& prod, std::string const& oldBranchName);
 
-    bool next() {return ++entryNumber_ < entries_;}
+    bool next() { return ++entryNumber_ < entries_; }
     bool nextWithCache();
-    bool previous() {return --entryNumber_ >= 0;}
-    bool current() const {return entryNumber_ < entries_ && entryNumber_ >= 0;}
-    bool current(EntryNumber entry) const {return entry < entries_ && entry >= 0;}
-    void rewind() {entryNumber_ = 0;}
+    bool previous() { return --entryNumber_ >= 0; }
+    bool current() const { return entryNumber_ < entries_ && entryNumber_ >= 0; }
+    bool current(EntryNumber entry) const { return entry < entries_ && entry >= 0; }
+    void rewind() { entryNumber_ = 0; }
     void close();
     bool skipEntries(unsigned int& offset);
-    EntryNumber const& entryNumber() const {return entryNumber_;}
+    EntryNumber const& entryNumber() const { return entryNumber_; }
     EntryNumber const& entryNumberForIndex(unsigned int index) const;
-    EntryNumber const& entries() const {return entries_;}
+    EntryNumber const& entries() const { return entries_; }
     void setEntryNumber(EntryNumber theEntryNumber);
     void insertEntryForIndex(unsigned int index);
-    std::vector<std::string> const& branchNames() const {return branchNames_;}
+    std::vector<std::string> const& branchNames() const { return branchNames_; }
     DelayedReader* rootDelayedReader() const;
     DelayedReader* resetAndGetRootDelayedReader() const;
     template <typename T>
@@ -168,31 +170,32 @@ namespace edm {
         fillBranchEntry<T>(branch, entryNumber, pbuf);
       }
     }
-    
+
     template <typename T>
     void fillBranchEntry(TBranch* branch, EntryNumber entryNumber, T*& pbuf) {
       branch->SetAddress(&pbuf);
       getEntry(branch, entryNumber);
     }
-    
-    TTree const* tree() const {return tree_;}
-    TTree* tree() {return tree_;}
-    TTree const* metaTree() const {return metaTree_;}
+
+    TTree const* tree() const { return tree_; }
+    TTree* tree() { return tree_; }
+    TTree const* metaTree() const { return metaTree_; }
     BranchMap const& branches() const;
 
     //For backwards compatibility
-    TBranch* branchEntryInfoBranch() const {return branchEntryInfoBranch_;}
+    TBranch* branchEntryInfoBranch() const { return branchEntryInfoBranch_; }
 
     inline TTreeCache* checkTriggerCache(TBranch* branch, EntryNumber entryNumber) const;
     TTreeCache* checkTriggerCacheImpl(TBranch* branch, EntryNumber entryNumber) const;
     inline TTreeCache* selectCache(TBranch* branch, EntryNumber entryNumber) const;
     void trainCache(char const* branchNames);
-    void resetTraining() {trainNow_ = true;}
+    void resetTraining() { trainNow_ = true; }
+
+    BranchType branchType() const { return branchType_; }
 
-    BranchType branchType() const {return branchType_;}
-    
-    void setSignals(signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* preEventReadSource,
-                    signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* postEventReadSource);
+    void setSignals(
+        signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* preEventReadSource,
+        signalslot::Signal<void(StreamContext const&, ModuleCallingContext const&)> const* postEventReadSource);
 
   private:
     void setCacheSize(unsigned int cacheSize);
@@ -201,16 +204,16 @@ namespace edm {
     void stopTraining();
 
     std::shared_ptr<InputFile> filePtr_;
-// We use bare pointers for pointers to some ROOT entities.
-// Root owns them and uses bare pointers internally.
-// Therefore,using smart pointers here will do no good.
+    // We use bare pointers for pointers to some ROOT entities.
+    // Root owns them and uses bare pointers internally.
+    // Therefore,using smart pointers here will do no good.
     TTree* tree_;
     TTree* metaTree_;
     BranchType branchType_;
     TBranch* auxBranch_;
-// We use a smart pointer to own the TTreeCache.
-// Unfortunately, ROOT owns it when attached to a TFile, but not after it is detached.
-// So, we make sure to it is detached before closing the TFile so there is no double delete.
+    // We use a smart pointer to own the TTreeCache.
+    // Unfortunately, ROOT owns it when attached to a TFile, but not after it is detached.
+    // So, we make sure to it is detached before closing the TFile so there is no double delete.
     std::shared_ptr<TTreeCache> treeCache_;
     std::shared_ptr<TTreeCache> rawTreeCache_;
     mutable std::shared_ptr<TTreeCache> triggerTreeCache_;
@@ -229,16 +232,16 @@ namespace edm {
     unsigned int learningEntries_;
     unsigned int cacheSize_;
     unsigned long treeAutoFlush_;
-// Enable asynchronous I/O in ROOT (done in a separate thread).  Only takes
-// effect on the primary treeCache_; all other caches have this explicitly disabled.
+    // Enable asynchronous I/O in ROOT (done in a separate thread).  Only takes
+    // effect on the primary treeCache_; all other caches have this explicitly disabled.
     bool enablePrefetching_;
     bool enableTriggerCache_;
     std::unique_ptr<RootDelayedReader> rootDelayedReader_;
 
-    TBranch* branchEntryInfoBranch_; //backwards compatibility
+    TBranch* branchEntryInfoBranch_;  //backwards compatibility
     // below for backward compatibility
-    TTree* infoTree_; // backward compatibility
-    TBranch* statusBranch_; // backward compatibility
+    TTree* infoTree_;        // backward compatibility
+    TBranch* statusBranch_;  // backward compatibility
   };
-}
+}  // namespace edm
 #endif
diff --git a/IOPool/Input/src/RunHelper.cc b/IOPool/Input/src/RunHelper.cc
index 483f5e06e591d..04fd30f2b8df9 100644
--- a/IOPool/Input/src/RunHelper.cc
+++ b/IOPool/Input/src/RunHelper.cc
@@ -9,17 +9,16 @@
 
 namespace edm {
 
-  std::unique_ptr<RunHelperBase>
-  makeRunHelper(ParameterSet const& pset) {
-    if(pset.exists("setRunNumber")) {
+  std::unique_ptr<RunHelperBase> makeRunHelper(ParameterSet const& pset) {
+    if (pset.exists("setRunNumber")) {
       RunNumber_t run = pset.getUntrackedParameter<unsigned int>("setRunNumber");
-      if(run != 0U) {
+      if (run != 0U) {
         return std::make_unique<SetRunHelper>(pset);
       }
-    } 
-    if(pset.exists("setRunNumberForEachLumi")) {
+    }
+    if (pset.exists("setRunNumberForEachLumi")) {
       std::vector<RunNumber_t> runs = pset.getUntrackedParameter<std::vector<unsigned int> >("setRunNumberForEachLumi");
-      if(!runs.empty()) {
+      if (!runs.empty()) {
         return std::make_unique<SetRunForEachLumiHelper>(pset);
       }
     }
@@ -28,102 +27,96 @@ namespace edm {
 
   RunHelperBase::~RunHelperBase() {}
 
-  void
-  RunHelperBase::checkLumiConsistency(LuminosityBlockNumber_t lumi, LuminosityBlockNumber_t originalLumi) const {
+  void RunHelperBase::checkLumiConsistency(LuminosityBlockNumber_t lumi, LuminosityBlockNumber_t originalLumi) const {
     assert(lumi == originalLumi);
   }
 
-  void
-  RunHelperBase::checkRunConsistency(RunNumber_t run, RunNumber_t originalRun) const {
+  void RunHelperBase::checkRunConsistency(RunNumber_t run, RunNumber_t originalRun) const {
     assert(run == originalRun);
   }
 
   DefaultRunHelper::~DefaultRunHelper() {}
 
-  SetRunHelper::SetRunHelper(ParameterSet const& pset) :
-        RunHelperBase(),
+  SetRunHelper::SetRunHelper(ParameterSet const& pset)
+      : RunHelperBase(),
         setRun_(pset.getUntrackedParameter<unsigned int>("setRunNumber")),
         forcedRunOffset_(0),
-        firstTime_(true) {
-  }
+        firstTime_(true) {}
 
   SetRunHelper::~SetRunHelper() {}
- 
-  void
-  SetRunHelper::setForcedRunOffset(RunNumber_t firstRun) {
-    if(firstTime_ && setRun_ != 0) {
-      forcedRunOffset_  = setRun_ - firstRun;
-      if(forcedRunOffset_ < 0) {
+
+  void SetRunHelper::setForcedRunOffset(RunNumber_t firstRun) {
+    if (firstTime_ && setRun_ != 0) {
+      forcedRunOffset_ = setRun_ - firstRun;
+      if (forcedRunOffset_ < 0) {
         throw Exception(errors::Configuration)
-          << "The value of the 'setRunNumber' parameter must not be\n"
-          << "less than the first run number in the first input file.\n"
-          << "'setRunNumber' was " << setRun_ <<", while the first run was "
-          << firstRun << ".\n";
+            << "The value of the 'setRunNumber' parameter must not be\n"
+            << "less than the first run number in the first input file.\n"
+            << "'setRunNumber' was " << setRun_ << ", while the first run was " << firstRun << ".\n";
       }
     }
     firstTime_ = false;
   }
 
-  void
-  SetRunHelper::overrideRunNumber(RunID& id) {
+  void SetRunHelper::overrideRunNumber(RunID& id) {
     id = RunID(id.run() + forcedRunOffset_);
-    if(id < RunID::firstValidRun()) id = RunID::firstValidRun();
+    if (id < RunID::firstValidRun())
+      id = RunID::firstValidRun();
   }
 
-  void
-  SetRunHelper::overrideRunNumber(LuminosityBlockID& id) {
+  void SetRunHelper::overrideRunNumber(LuminosityBlockID& id) {
     id = LuminosityBlockID(id.run() + forcedRunOffset_, id.luminosityBlock());
-    if(RunID(id.run()) < RunID::firstValidRun()) id = LuminosityBlockID(RunID::firstValidRun().run(), id.luminosityBlock());
+    if (RunID(id.run()) < RunID::firstValidRun())
+      id = LuminosityBlockID(RunID::firstValidRun().run(), id.luminosityBlock());
   }
 
-  void
-  SetRunHelper::overrideRunNumber(EventID& id, bool isRealData) {
-    if(isRealData) {
+  void SetRunHelper::overrideRunNumber(EventID& id, bool isRealData) {
+    if (isRealData) {
       throw Exception(errors::Configuration, "SetRunHelper::overrideRunNumber()")
-        << "The 'setRunNumber' parameter of PoolSource cannot be used with real data.\n";
+          << "The 'setRunNumber' parameter of PoolSource cannot be used with real data.\n";
     }
     id = EventID(id.run() + forcedRunOffset_, id.luminosityBlock(), id.event());
-    if(RunID(id.run()) < RunID::firstValidRun()) {
-      id = EventID(RunID::firstValidRun().run(), LuminosityBlockID::firstValidLuminosityBlock().luminosityBlock(), id.event());
+    if (RunID(id.run()) < RunID::firstValidRun()) {
+      id = EventID(
+          RunID::firstValidRun().run(), LuminosityBlockID::firstValidLuminosityBlock().luminosityBlock(), id.event());
     }
   }
 
-  void
-  SetRunHelper::checkRunConsistency(RunNumber_t run, RunNumber_t originalRun) const {
+  void SetRunHelper::checkRunConsistency(RunNumber_t run, RunNumber_t originalRun) const {
     assert(run == originalRun + forcedRunOffset_);
   }
 
-  SetRunForEachLumiHelper::SetRunForEachLumiHelper(ParameterSet const& pset) :
-        RunHelperBase(),
+  SetRunForEachLumiHelper::SetRunForEachLumiHelper(ParameterSet const& pset)
+      : RunHelperBase(),
         setRunNumberForEachLumi_(pset.getUntrackedParameter<std::vector<unsigned int> >("setRunNumberForEachLumi")),
         indexOfNextRunNumber_(0),
         realRunNumber_(0),
         fakeNewRun_(false),
-        firstTime_(true) {
-  }
+        firstTime_(true) {}
 
   SetRunForEachLumiHelper::~SetRunForEachLumiHelper() {}
- 
-  InputSource::ItemType
-  SetRunForEachLumiHelper::nextItemType(InputSource::ItemType const& previousItemType, InputSource::ItemType const& newItemType) {
-    if(newItemType == InputSource::IsRun || (newItemType == InputSource::IsLumi && previousItemType != InputSource::IsRun)) {
-      if(firstTime_) {
+
+  InputSource::ItemType SetRunForEachLumiHelper::nextItemType(InputSource::ItemType const& previousItemType,
+                                                              InputSource::ItemType const& newItemType) {
+    if (newItemType == InputSource::IsRun ||
+        (newItemType == InputSource::IsLumi && previousItemType != InputSource::IsRun)) {
+      if (firstTime_) {
         firstTime_ = false;
       } else {
         ++indexOfNextRunNumber_;
       }
-      if(indexOfNextRunNumber_ == setRunNumberForEachLumi_.size()) {
+      if (indexOfNextRunNumber_ == setRunNumberForEachLumi_.size()) {
         throw Exception(errors::MismatchedInputFiles, "PoolSource::getNextItemType")
-          << " Parameter 'setRunNumberForEachLumi' has " << setRunNumberForEachLumi_.size() << " entries\n"
-          << "but this job is processing more luminosity blocks than this.\n";
+            << " Parameter 'setRunNumberForEachLumi' has " << setRunNumberForEachLumi_.size() << " entries\n"
+            << "but this job is processing more luminosity blocks than this.\n";
       }
       RunNumber_t run = setRunNumberForEachLumi_[indexOfNextRunNumber_];
-      if(run == 0) {
-        throw Exception(errors::Configuration, "PoolSource") <<
-          "'setRunNumberForEachLumi' contains an illegal run number of '0'.\n";
+      if (run == 0) {
+        throw Exception(errors::Configuration, "PoolSource")
+            << "'setRunNumberForEachLumi' contains an illegal run number of '0'.\n";
       }
       bool sameRunNumber = (indexOfNextRunNumber_ != 0U && run == setRunNumberForEachLumi_[indexOfNextRunNumber_ - 1]);
-      if(!sameRunNumber) {
+      if (!sameRunNumber) {
         fakeNewRun_ = (newItemType != InputSource::IsRun);
         return InputSource::IsRun;
       }
@@ -131,51 +124,45 @@ namespace edm {
     return newItemType;
   }
 
-  RunNumber_t
-  SetRunForEachLumiHelper::runNumberToUseForThisLumi() const {
+  RunNumber_t SetRunForEachLumiHelper::runNumberToUseForThisLumi() const {
     return setRunNumberForEachLumi_.at(indexOfNextRunNumber_);
   }
 
-  void
-  SetRunForEachLumiHelper::checkForNewRun(RunNumber_t run) {
-    if(realRunNumber_ != 0 && run != realRunNumber_) {
+  void SetRunForEachLumiHelper::checkForNewRun(RunNumber_t run) {
+    if (realRunNumber_ != 0 && run != realRunNumber_) {
       throw Exception(errors::MismatchedInputFiles, "PoolSource::checkForNewRun")
-        << " Parameter 'setRunNumberForEachLumi' can only process a single run.\n"
-        << "but this job is processing more than one run.\n";
+          << " Parameter 'setRunNumberForEachLumi' can only process a single run.\n"
+          << "but this job is processing more than one run.\n";
     }
     realRunNumber_ = run;
   }
 
-  void
-  SetRunForEachLumiHelper::overrideRunNumber(RunID& id) {
-    id = RunID(runNumberToUseForThisLumi());
-  }
+  void SetRunForEachLumiHelper::overrideRunNumber(RunID& id) { id = RunID(runNumberToUseForThisLumi()); }
 
-  void
-  SetRunForEachLumiHelper::overrideRunNumber(LuminosityBlockID& id) {
+  void SetRunForEachLumiHelper::overrideRunNumber(LuminosityBlockID& id) {
     id = LuminosityBlockID(runNumberToUseForThisLumi(), id.luminosityBlock());
   }
 
-  void
-  SetRunForEachLumiHelper::overrideRunNumber(EventID& id, bool isRealData) {
-    if(isRealData) {
+  void SetRunForEachLumiHelper::overrideRunNumber(EventID& id, bool isRealData) {
+    if (isRealData) {
       throw Exception(errors::Configuration, "SetRunForEachLumiHelper::overrideRunNumber()")
-        << "The 'setRunNumberForEachLumi' parameter of PoolSource cannot be used with real data.\n";
+          << "The 'setRunNumberForEachLumi' parameter of PoolSource cannot be used with real data.\n";
     }
     id = EventID(runNumberToUseForThisLumi(), id.luminosityBlock(), id.event());
   }
 
-  void
-  SetRunForEachLumiHelper::checkRunConsistency(RunNumber_t run, RunNumber_t originalRun) const {
+  void SetRunForEachLumiHelper::checkRunConsistency(RunNumber_t run, RunNumber_t originalRun) const {
     assert(run == runNumberToUseForThisLumi());
   }
 
-  void
-  RunHelperBase::fillDescription(ParameterSetDescription& desc) {
+  void RunHelperBase::fillDescription(ParameterSetDescription& desc) {
     desc.addOptionalNode(ParameterDescription<unsigned int>("setRunNumber", 0U, false) xor
-         ParameterDescription<std::vector<unsigned int> >("setRunNumberForEachLumi", std::vector<unsigned int>(), false), true)
-         ->setComment("If 'setRun' is non-zero, change number of first run to this number. Apply same offset to all runs." \
-         "If 'setRunNumberForEachLumi' is non-empty, use these as run numbers for each lumi respectively." \
-         "''setRun' and 'setRunNumberForEachLumi' are mutually exclusive and allowed only for simulation.");
-  }
-}
+                             ParameterDescription<std::vector<unsigned int> >(
+                                 "setRunNumberForEachLumi", std::vector<unsigned int>(), false),
+                         true)
+        ->setComment(
+            "If 'setRun' is non-zero, change number of first run to this number. Apply same offset to all runs."
+            "If 'setRunNumberForEachLumi' is non-empty, use these as run numbers for each lumi respectively."
+            "''setRun' and 'setRunNumberForEachLumi' are mutually exclusive and allowed only for simulation.");
+  }
+}  // namespace edm
diff --git a/IOPool/Input/src/RunHelper.h b/IOPool/Input/src/RunHelper.h
index d1caa0e5de8c8..1de314154d704 100644
--- a/IOPool/Input/src/RunHelper.h
+++ b/IOPool/Input/src/RunHelper.h
@@ -13,20 +13,21 @@ namespace edm {
   class ParameterSetDescription;
 
   class RunHelperBase {
-  public: 
+  public:
     explicit RunHelperBase() = default;
     virtual ~RunHelperBase();
 
-    virtual InputSource::ItemType nextItemType(
-      InputSource::ItemType const& previousItemType,
-      InputSource::ItemType const& newItemType) {return newItemType;}
-    virtual RunNumber_t runNumberToUseForThisLumi() const {return 0;}
-    virtual bool fakeNewRun() const {return false;} 
+    virtual InputSource::ItemType nextItemType(InputSource::ItemType const& previousItemType,
+                                               InputSource::ItemType const& newItemType) {
+      return newItemType;
+    }
+    virtual RunNumber_t runNumberToUseForThisLumi() const { return 0; }
+    virtual bool fakeNewRun() const { return false; }
     virtual void setForcedRunOffset(RunNumber_t firstRun) {}
     virtual void checkForNewRun(RunNumber_t run) {}
 
     virtual void checkRunConsistency(RunNumber_t run, RunNumber_t origninalRun) const;
-    virtual void checkLumiConsistency(LuminosityBlockNumber_t lumi, LuminosityBlockNumber_t origninalLumi) const; 
+    virtual void checkLumiConsistency(LuminosityBlockNumber_t lumi, LuminosityBlockNumber_t origninalLumi) const;
     virtual void overrideRunNumber(EventID& event, bool isRealData) {}
     virtual void overrideRunNumber(RunID& run) {}
     virtual void overrideRunNumber(LuminosityBlockID& lumi) {}
@@ -41,7 +42,7 @@ namespace edm {
   };
 
   class SetRunHelper : public RunHelperBase {
-  public: 
+  public:
     explicit SetRunHelper(ParameterSet const& pset);
     ~SetRunHelper() override;
 
@@ -59,18 +60,17 @@ namespace edm {
   };
 
   class SetRunForEachLumiHelper : public RunHelperBase {
-  public: 
+  public:
     explicit SetRunForEachLumiHelper(ParameterSet const& pset);
     ~SetRunForEachLumiHelper() override;
 
-    InputSource::ItemType nextItemType(
-      InputSource::ItemType const& previousItemType,
-      InputSource::ItemType const& newIemType) override;
+    InputSource::ItemType nextItemType(InputSource::ItemType const& previousItemType,
+                                       InputSource::ItemType const& newIemType) override;
     RunNumber_t runNumberToUseForThisLumi() const override;
-    bool fakeNewRun() const override {return fakeNewRun_;}
+    bool fakeNewRun() const override { return fakeNewRun_; }
     void checkForNewRun(RunNumber_t run) override;
 
-    void checkRunConsistency(RunNumber_t run, RunNumber_t origninalRun) const override; 
+    void checkRunConsistency(RunNumber_t run, RunNumber_t origninalRun) const override;
     void overrideRunNumber(EventID& event, bool isRealData) override;
     void overrideRunNumber(RunID& run) override;
     void overrideRunNumber(LuminosityBlockID& lumi) override;
@@ -83,8 +83,7 @@ namespace edm {
     bool firstTime_;
   };
 
-  std::unique_ptr<RunHelperBase>
-  makeRunHelper(ParameterSet const& pset);
-}
+  std::unique_ptr<RunHelperBase> makeRunHelper(ParameterSet const& pset);
+}  // namespace edm
 
 #endif
diff --git a/IOPool/Input/test/IOExerciser.cc b/IOPool/Input/test/IOExerciser.cc
index 82f89ef20d8fb..b2fbb98a25d3e 100644
--- a/IOPool/Input/test/IOExerciser.cc
+++ b/IOPool/Input/test/IOExerciser.cc
@@ -4,7 +4,7 @@
 //           Class:  IOExerciser
 // Original Author:  Brian Bockelman
 //         Created:  Mon Jun  4 17:35:30 CDT 2012
-// 
+//
 /*
  Description: Read out a fixed subset of an input file
 
@@ -17,7 +17,6 @@ to use this plugin.
 
 */
 
-
 // system include files
 #include <map>
 #include <memory>
@@ -43,284 +42,257 @@ to use this plugin.
 #include "ProductInfo.h"
 
 class IOExerciser : public edm::OutputModule {
-   public:
-      explicit IOExerciser(const edm::ParameterSet&);
-      ~IOExerciser() override;
-
-      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-
-      enum SelectionStrategy { SmallestFirst = 0,
-                               LargestFirst,
-                               RoundRobin };
-
-   private:
-
-      typedef std::map<edm::BranchID, edm::EDGetToken> TokenMap;
-      // ----------required OutputModule functions-----------------------------
-      void write(edm::EventForOutput const &e) override;
-      void writeRun(edm::RunForOutput const&) override{}
-      void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override{}
-
-      void respondToOpenInputFile(edm::FileBlock const& fb) override;
-
-      // ----------internal implementation functions---------------------------
-      void computeProducts(edm::EventForOutput const& e, TokenMap const& tokens);
-      void fillSmallestFirst(ProductInfos const& all_products, Long64_t threshold);
-      void fillLargestFirst(ProductInfos const& all_products, Long64_t threshold);
-      void fillRoundRobin(ProductInfos const& all_products, Long64_t threshold);
-
-      // ----------member data ------------------------------------------------
-      TokenMap m_tokens;
-      bool m_fetchedProducts;
-      edm::propagate_const<TTree*> m_eventsTree;
-      ProductInfos m_products;
-      ProductInfos m_all_products;
-      unsigned int m_percentBranches;
-      SelectionStrategy m_selectionStrategy;
-      Long64_t m_currentUsage;
-      const unsigned int m_triggerFactor;
-      unsigned int m_triggerCount;
-
+public:
+  explicit IOExerciser(const edm::ParameterSet&);
+  ~IOExerciser() override;
+
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
+  enum SelectionStrategy { SmallestFirst = 0, LargestFirst, RoundRobin };
+
+private:
+  typedef std::map<edm::BranchID, edm::EDGetToken> TokenMap;
+  // ----------required OutputModule functions-----------------------------
+  void write(edm::EventForOutput const& e) override;
+  void writeRun(edm::RunForOutput const&) override {}
+  void writeLuminosityBlock(edm::LuminosityBlockForOutput const&) override {}
+
+  void respondToOpenInputFile(edm::FileBlock const& fb) override;
+
+  // ----------internal implementation functions---------------------------
+  void computeProducts(edm::EventForOutput const& e, TokenMap const& tokens);
+  void fillSmallestFirst(ProductInfos const& all_products, Long64_t threshold);
+  void fillLargestFirst(ProductInfos const& all_products, Long64_t threshold);
+  void fillRoundRobin(ProductInfos const& all_products, Long64_t threshold);
+
+  // ----------member data ------------------------------------------------
+  TokenMap m_tokens;
+  bool m_fetchedProducts;
+  edm::propagate_const<TTree*> m_eventsTree;
+  ProductInfos m_products;
+  ProductInfos m_all_products;
+  unsigned int m_percentBranches;
+  SelectionStrategy m_selectionStrategy;
+  Long64_t m_currentUsage;
+  const unsigned int m_triggerFactor;
+  unsigned int m_triggerCount;
 };
 
 //
 // constructors and destructor
 //
-IOExerciser::IOExerciser(const edm::ParameterSet& pset) :
-   OutputModule(pset),
-   m_tokens(),
-   m_fetchedProducts(false),
-   m_eventsTree(nullptr),
-   m_percentBranches(pset.getUntrackedParameter<unsigned int>("percentBranches")),
-   m_currentUsage(0),
-   m_triggerFactor(pset.getUntrackedParameter<unsigned int>("triggerFactor")),
-   m_triggerCount(0)
-{
-   //now do what ever initialization is needed
-   std::string const& selectionStrategy = pset.getUntrackedParameter<std::string>("selectionStrategy");
-   if (selectionStrategy == "smallestFirst") {
-      m_selectionStrategy = SmallestFirst;
-   } else if (selectionStrategy == "largestFirst") {
-      m_selectionStrategy = LargestFirst;
-   } else if (selectionStrategy == "roundRobin") {
-      m_selectionStrategy = RoundRobin;
-   } else {
-      edm::Exception ex(edm::errors::Configuration);
-      ex << "Invalid IOExerciser selection strategy: " << selectionStrategy;
-      throw ex;
-   }
-   if ((m_percentBranches < 1) || (m_percentBranches > 100)) {
-      edm::Exception ex(edm::errors::Configuration);
-      ex << "Invalid value for percentBranches (" << m_percentBranches << "); must be between 1 and 100, inclusive";
-      throw ex;
-   }
-   for(auto const& product : keptProducts()[edm::InEvent]) {
-     m_tokens.insert(std::make_pair(product.first->branchID(), product.second));
-   }
-}
-
-
-IOExerciser::~IOExerciser()
-{
+IOExerciser::IOExerciser(const edm::ParameterSet& pset)
+    : OutputModule(pset),
+      m_tokens(),
+      m_fetchedProducts(false),
+      m_eventsTree(nullptr),
+      m_percentBranches(pset.getUntrackedParameter<unsigned int>("percentBranches")),
+      m_currentUsage(0),
+      m_triggerFactor(pset.getUntrackedParameter<unsigned int>("triggerFactor")),
+      m_triggerCount(0) {
+  //now do what ever initialization is needed
+  std::string const& selectionStrategy = pset.getUntrackedParameter<std::string>("selectionStrategy");
+  if (selectionStrategy == "smallestFirst") {
+    m_selectionStrategy = SmallestFirst;
+  } else if (selectionStrategy == "largestFirst") {
+    m_selectionStrategy = LargestFirst;
+  } else if (selectionStrategy == "roundRobin") {
+    m_selectionStrategy = RoundRobin;
+  } else {
+    edm::Exception ex(edm::errors::Configuration);
+    ex << "Invalid IOExerciser selection strategy: " << selectionStrategy;
+    throw ex;
+  }
+  if ((m_percentBranches < 1) || (m_percentBranches > 100)) {
+    edm::Exception ex(edm::errors::Configuration);
+    ex << "Invalid value for percentBranches (" << m_percentBranches << "); must be between 1 and 100, inclusive";
+    throw ex;
+  }
+  for (auto const& product : keptProducts()[edm::InEvent]) {
+    m_tokens.insert(std::make_pair(product.first->branchID(), product.second));
+  }
 }
 
+IOExerciser::~IOExerciser() {}
 
 //
 // member functions
 //
 
 // ------------ method called for each event  ------------
-void
-IOExerciser::write(edm::EventForOutput const& e)
-{
-   using namespace edm;
-   if (!m_fetchedProducts)
-   {
-      computeProducts(e, m_tokens);
-   }
-
-   m_triggerCount += 1;
-
-   int ctr = 0;
-
-   ProductInfos &products_to_use = (m_triggerCount == m_triggerFactor) ? m_all_products : m_products;
-   if (m_triggerCount == m_triggerFactor) {
-      m_triggerCount = 0;
-   }
-
-   for (auto const& product : products_to_use)
-   {
-      edm::BasicHandle result = e.getByToken(product.token(), product.type());
-      ctr++;
-   }
-   edm::LogInfo("IOExerciser") << "IOExerciser read out " << ctr << " products.";
-   
+void IOExerciser::write(edm::EventForOutput const& e) {
+  using namespace edm;
+  if (!m_fetchedProducts) {
+    computeProducts(e, m_tokens);
+  }
+
+  m_triggerCount += 1;
+
+  int ctr = 0;
+
+  ProductInfos& products_to_use = (m_triggerCount == m_triggerFactor) ? m_all_products : m_products;
+  if (m_triggerCount == m_triggerFactor) {
+    m_triggerCount = 0;
+  }
+
+  for (auto const& product : products_to_use) {
+    edm::BasicHandle result = e.getByToken(product.token(), product.type());
+    ctr++;
+  }
+  edm::LogInfo("IOExerciser") << "IOExerciser read out " << ctr << " products.";
 }
 
 // ------------ method called when starting to processes a run  ------------
-void 
-IOExerciser::respondToOpenInputFile(edm::FileBlock const& fb)
-{
-   TTree *eventsTree = fb.tree();
-   if (!eventsTree)
-   {
-      edm::Exception ex(edm::errors::ProductNotFound);
-      ex << "IOExerciser was run with a TFile missing an events TTree.";
-      throw ex;
-   }
-   m_eventsTree = eventsTree;
-
-   m_fetchedProducts = false;
+void IOExerciser::respondToOpenInputFile(edm::FileBlock const& fb) {
+  TTree* eventsTree = fb.tree();
+  if (!eventsTree) {
+    edm::Exception ex(edm::errors::ProductNotFound);
+    ex << "IOExerciser was run with a TFile missing an events TTree.";
+    throw ex;
+  }
+  m_eventsTree = eventsTree;
+
+  m_fetchedProducts = false;
 }
 
-void
-IOExerciser::computeProducts(edm::EventForOutput const& e, TokenMap const& tokens)
-{
-   using namespace edm;
-   typedef std::vector<StableProvenance const*> Provenances;
-
-   m_fetchedProducts = true;
-   Provenances provenances;
-   e.getAllStableProvenance(provenances);
-
-   if (!m_eventsTree)
-   {
-      edm::Exception ex(edm::errors::ProductNotFound);
-      ex << "IOExerciser invoked computeProducts without an events TTree.";
-      throw ex;
-   }
-
-   m_all_products.clear();
-   m_all_products.reserve(provenances.size());
-   Long64_t totalSize = 0;
-   for (auto const& provenance : provenances) {
-
-      const std::string & branchName = provenance->branchName();
-
-      TBranch * branch = (TBranch*)m_eventsTree->GetBranch(branchName.c_str());
-      if (!branch)
-      {
-         LogWarning("IOExerciser") << "Ignoring missing branch " << branchName;
-         continue;
-      }
-      edm::BranchID bid = provenance->branchID();
-      auto const iter = m_tokens.find(bid);
-      if (iter == m_tokens.end()) {
-        // product not kept
-        continue;
-      }
-      ProductInfo pi(*provenance, *branch, iter->second);
-      totalSize += pi.size();
-      m_all_products.push_back(pi);
-   }
-
-   Long64_t threshold = m_percentBranches*totalSize/100;
-   LogDebug("IOExerciser") << "Threshold is " << threshold << " of " << totalSize << " bytes.";
-
-   std::sort(m_all_products.begin(), m_all_products.end(), ProductInfo::sort);
-
-   m_products.clear();
-   m_currentUsage = 0;
-
-   switch (m_selectionStrategy)
-   {
-      case SmallestFirst:
-         fillSmallestFirst(m_all_products, threshold);
-         break;
-      case LargestFirst:
-         fillLargestFirst(m_all_products, threshold);
-         break;
-      case RoundRobin:
-         fillRoundRobin(m_all_products, threshold);
-          break;
-   }
-
-   LogInfo("IOExerciser") << "Reading " << m_products.size() << " of " << m_all_products.size() << " products.  Aggregate branch size is " << m_currentUsage << " of " << totalSize << " bytes.";
-
+void IOExerciser::computeProducts(edm::EventForOutput const& e, TokenMap const& tokens) {
+  using namespace edm;
+  typedef std::vector<StableProvenance const*> Provenances;
+
+  m_fetchedProducts = true;
+  Provenances provenances;
+  e.getAllStableProvenance(provenances);
+
+  if (!m_eventsTree) {
+    edm::Exception ex(edm::errors::ProductNotFound);
+    ex << "IOExerciser invoked computeProducts without an events TTree.";
+    throw ex;
+  }
+
+  m_all_products.clear();
+  m_all_products.reserve(provenances.size());
+  Long64_t totalSize = 0;
+  for (auto const& provenance : provenances) {
+    const std::string& branchName = provenance->branchName();
+
+    TBranch* branch = (TBranch*)m_eventsTree->GetBranch(branchName.c_str());
+    if (!branch) {
+      LogWarning("IOExerciser") << "Ignoring missing branch " << branchName;
+      continue;
+    }
+    edm::BranchID bid = provenance->branchID();
+    auto const iter = m_tokens.find(bid);
+    if (iter == m_tokens.end()) {
+      // product not kept
+      continue;
+    }
+    ProductInfo pi(*provenance, *branch, iter->second);
+    totalSize += pi.size();
+    m_all_products.push_back(pi);
+  }
+
+  Long64_t threshold = m_percentBranches * totalSize / 100;
+  LogDebug("IOExerciser") << "Threshold is " << threshold << " of " << totalSize << " bytes.";
+
+  std::sort(m_all_products.begin(), m_all_products.end(), ProductInfo::sort);
+
+  m_products.clear();
+  m_currentUsage = 0;
+
+  switch (m_selectionStrategy) {
+    case SmallestFirst:
+      fillSmallestFirst(m_all_products, threshold);
+      break;
+    case LargestFirst:
+      fillLargestFirst(m_all_products, threshold);
+      break;
+    case RoundRobin:
+      fillRoundRobin(m_all_products, threshold);
+      break;
+  }
+
+  LogInfo("IOExerciser") << "Reading " << m_products.size() << " of " << m_all_products.size()
+                         << " products.  Aggregate branch size is " << m_currentUsage << " of " << totalSize
+                         << " bytes.";
 }
 
-void
-IOExerciser::fillSmallestFirst(ProductInfos const& all_products, Long64_t threshold)
-{
-   for (ProductInfos::const_iterator it = all_products.begin(), itEnd = all_products.end();
+void IOExerciser::fillSmallestFirst(ProductInfos const& all_products, Long64_t threshold) {
+  for (ProductInfos::const_iterator it = all_products.begin(), itEnd = all_products.end();
        (it != itEnd) && (m_currentUsage < threshold);
        ++it) {
-
-       m_products.push_back(*it);
-       m_currentUsage += it->size();
-       LogDebug("IOExerciser") << "Adding label " << it->tag().label() << ", size " << it->size() << "; current usage is " << m_currentUsage << " of " << threshold << " bytes.";
-   }
+    m_products.push_back(*it);
+    m_currentUsage += it->size();
+    LogDebug("IOExerciser") << "Adding label " << it->tag().label() << ", size " << it->size() << "; current usage is "
+                            << m_currentUsage << " of " << threshold << " bytes.";
+  }
 }
 
-void
-IOExerciser::fillLargestFirst(ProductInfos const& all_products, Long64_t threshold)
-{
-   m_currentUsage = 0;
-   for (ProductInfos::const_iterator it = --all_products.end(), itBegin = all_products.begin();
+void IOExerciser::fillLargestFirst(ProductInfos const& all_products, Long64_t threshold) {
+  m_currentUsage = 0;
+  for (ProductInfos::const_iterator it = --all_products.end(), itBegin = all_products.begin();
        m_currentUsage < threshold;
        --it) {
-   
-       m_products.push_back(*it);
-       m_currentUsage += it->size();
-       LogDebug("IOExerciser") << "Adding label " << it->tag().label() << ", size " << it->size() << "; current usage is " << m_currentUsage << " of " << threshold << " bytes.";
-       if (it == itBegin) {
-          break;
-       }
-   }
+    m_products.push_back(*it);
+    m_currentUsage += it->size();
+    LogDebug("IOExerciser") << "Adding label " << it->tag().label() << ", size " << it->size() << "; current usage is "
+                            << m_currentUsage << " of " << threshold << " bytes.";
+    if (it == itBegin) {
+      break;
+    }
+  }
 }
 
-void
-IOExerciser::fillRoundRobin(ProductInfos const& all_products, Long64_t threshold)
-{
-   size_t currentSmallest = 0, currentLargest = all_products.size()-1;
-   bool useSmallest = true;
-   while (m_currentUsage < threshold)
-   {
-      if (useSmallest) {
-         ProductInfo const& pi = all_products[currentSmallest];
-         m_currentUsage += pi.size();
-         m_products.push_back(pi);
-         currentSmallest++;
-         useSmallest = false;
-         LogDebug("IOExerciser") << "Adding label " << pi.tag().label() << ", size " << pi.size() << "; current usage is " << m_currentUsage << " of " << threshold << " bytes.";
-      } else
-      {
-         ProductInfo const& pi = all_products[currentLargest];
-         m_currentUsage += pi.size();
-         m_products.push_back(pi);
-         currentLargest--;
-         useSmallest = true;
-         LogDebug("IOExerciser") << "Adding label " << pi.tag().label() << ", size " << pi.size() << "; current usage is " << m_currentUsage << " of " << threshold << " bytes.";
-      }
-   }
+void IOExerciser::fillRoundRobin(ProductInfos const& all_products, Long64_t threshold) {
+  size_t currentSmallest = 0, currentLargest = all_products.size() - 1;
+  bool useSmallest = true;
+  while (m_currentUsage < threshold) {
+    if (useSmallest) {
+      ProductInfo const& pi = all_products[currentSmallest];
+      m_currentUsage += pi.size();
+      m_products.push_back(pi);
+      currentSmallest++;
+      useSmallest = false;
+      LogDebug("IOExerciser") << "Adding label " << pi.tag().label() << ", size " << pi.size() << "; current usage is "
+                              << m_currentUsage << " of " << threshold << " bytes.";
+    } else {
+      ProductInfo const& pi = all_products[currentLargest];
+      m_currentUsage += pi.size();
+      m_products.push_back(pi);
+      currentLargest--;
+      useSmallest = true;
+      LogDebug("IOExerciser") << "Adding label " << pi.tag().label() << ", size " << pi.size() << "; current usage is "
+                              << m_currentUsage << " of " << threshold << " bytes.";
+    }
+  }
 }
 
 // ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
-void
-IOExerciser::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-   //The following says we do not know what parameters are allowed so do no validation
-   // Please change this to state exactly what you do use, even if it is no parameters
-   edm::ParameterSetDescription desc;
-   desc.setComment("Reads a configurable subset of EDM files.");
-   desc.addUntracked<unsigned int>("percentBranches", 100)
-     ->setComment("Control the percent of branches IOExerciser will read out.\n"
-                  "Branches are weighted by size.  Valid values are between 1 and 100.\n"
-                  "Additional branches will be read out until at least this percent has\n"
-                  "been read; thus, IOExerciser will likely read out more than this amount.");
-   desc.addUntracked<std::string>("selectionStrategy", "smallestFirst")
-     ->setComment("Control the branch selection strategy:\n"
-                  "'smallestFirst' (default): Read branches in increasing order of size until limit is hit.\n"
-                  "'largestFirst': Read branches in decreasing order of size until limit is hit.\n"
-                  "'roundRobin': Read a small branch, then large branch.  Repeat until size limit is hit.");
-   desc.addUntracked<unsigned int>("triggerFactor", 0)
-      ->setComment("Controls the trigger rate.  Once every 'triggerFactor' events, IOExerciser\n"
-                   "will read out all event data, not just the selected branches.  Setting to 10\n"
-                   "will cause it to read out one event in 10.  Setting it to zero would mean to\n"
-                   "disable trigger behavior completely.  Defaults to 0.");
-   OutputModule::fillDescription(desc);
-   descriptions.add("IOExerciser", desc);
+void IOExerciser::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  //The following says we do not know what parameters are allowed so do no validation
+  // Please change this to state exactly what you do use, even if it is no parameters
+  edm::ParameterSetDescription desc;
+  desc.setComment("Reads a configurable subset of EDM files.");
+  desc.addUntracked<unsigned int>("percentBranches", 100)
+      ->setComment(
+          "Control the percent of branches IOExerciser will read out.\n"
+          "Branches are weighted by size.  Valid values are between 1 and 100.\n"
+          "Additional branches will be read out until at least this percent has\n"
+          "been read; thus, IOExerciser will likely read out more than this amount.");
+  desc.addUntracked<std::string>("selectionStrategy", "smallestFirst")
+      ->setComment(
+          "Control the branch selection strategy:\n"
+          "'smallestFirst' (default): Read branches in increasing order of size until limit is hit.\n"
+          "'largestFirst': Read branches in decreasing order of size until limit is hit.\n"
+          "'roundRobin': Read a small branch, then large branch.  Repeat until size limit is hit.");
+  desc.addUntracked<unsigned int>("triggerFactor", 0)
+      ->setComment(
+          "Controls the trigger rate.  Once every 'triggerFactor' events, IOExerciser\n"
+          "will read out all event data, not just the selected branches.  Setting to 10\n"
+          "will cause it to read out one event in 10.  Setting it to zero would mean to\n"
+          "disable trigger behavior completely.  Defaults to 0.");
+  OutputModule::fillDescription(desc);
+  descriptions.add("IOExerciser", desc);
 }
 
 //define this as a plug-in
 DEFINE_FWK_MODULE(IOExerciser);
-
diff --git a/IOPool/Input/test/ProductInfo.h b/IOPool/Input/test/ProductInfo.h
index e9d23d1505047..88e341fcf4ba2 100644
--- a/IOPool/Input/test/ProductInfo.h
+++ b/IOPool/Input/test/ProductInfo.h
@@ -10,52 +10,44 @@
 #include <vector>
 
 class ProductInfo {
-   public:
-      ProductInfo(const edm::Provenance &prov, TBranch & branch, edm::EDGetToken const& token);
-
-      Long64_t size() const {return m_size;}
-      const edm::InputTag & tag() const { return m_tag;}
-      const edm::TypeID& type() const { return m_type;}
-      const edm::EDGetToken& token() const { return m_token;}
-      static bool sort(const ProductInfo &x, const ProductInfo &y);
-
-   private:
-      static void addBranchSizes(TBranch & branch, Long64_t &size);
-
-      edm::InputTag m_tag;
-      edm::TypeID m_type;
-      edm::EDGetToken m_token;
-      Long64_t m_size;
+public:
+  ProductInfo(const edm::Provenance &prov, TBranch &branch, edm::EDGetToken const &token);
+
+  Long64_t size() const { return m_size; }
+  const edm::InputTag &tag() const { return m_tag; }
+  const edm::TypeID &type() const { return m_type; }
+  const edm::EDGetToken &token() const { return m_token; }
+  static bool sort(const ProductInfo &x, const ProductInfo &y);
+
+private:
+  static void addBranchSizes(TBranch &branch, Long64_t &size);
+
+  edm::InputTag m_tag;
+  edm::TypeID m_type;
+  edm::EDGetToken m_token;
+  Long64_t m_size;
 };
 
-ProductInfo::ProductInfo(const edm::Provenance &prov, TBranch & branch, edm::EDGetToken const& token) :
-    m_tag(prov.moduleLabel(), prov.productInstanceName(), prov.processName()),
-    m_type(prov.branchDescription().unwrappedTypeID()),
-    m_token(token),
-    m_size(0)
-{
-   addBranchSizes(branch, m_size);
+ProductInfo::ProductInfo(const edm::Provenance &prov, TBranch &branch, edm::EDGetToken const &token)
+    : m_tag(prov.moduleLabel(), prov.productInstanceName(), prov.processName()),
+      m_type(prov.branchDescription().unwrappedTypeID()),
+      m_token(token),
+      m_size(0) {
+  addBranchSizes(branch, m_size);
 }
 
-void ProductInfo::addBranchSizes(TBranch & branch, Long64_t &size)
-{
-   size += branch.GetTotalSize(); // Includes size of branch metadata
-   // Now recurse through any subbranches.
-   Long64_t nB = branch.GetListOfBranches()->GetEntries();
-   for (Long64_t i = 0; i < nB; ++i)
-   {
-      TBranch *btemp = (TBranch *)branch.GetListOfBranches()->At(i);
-      if (btemp != nullptr)
-      {
-         addBranchSizes(*btemp, size);
-      }
-   }
+void ProductInfo::addBranchSizes(TBranch &branch, Long64_t &size) {
+  size += branch.GetTotalSize();  // Includes size of branch metadata
+  // Now recurse through any subbranches.
+  Long64_t nB = branch.GetListOfBranches()->GetEntries();
+  for (Long64_t i = 0; i < nB; ++i) {
+    TBranch *btemp = (TBranch *)branch.GetListOfBranches()->At(i);
+    if (btemp != nullptr) {
+      addBranchSizes(*btemp, size);
+    }
+  }
 }
 
-bool ProductInfo::sort(ProductInfo const &x, ProductInfo const &y)
-{
-   return x.size() < y.size();
-}
+bool ProductInfo::sort(ProductInfo const &x, ProductInfo const &y) { return x.size() < y.size(); }
 
 typedef std::vector<ProductInfo> ProductInfos;
-
diff --git a/IOPool/Output/interface/PoolOutputModule.h b/IOPool/Output/interface/PoolOutputModule.h
index 396940e7b27cf..33e0ef01221fc 100644
--- a/IOPool/Output/interface/PoolOutputModule.h
+++ b/IOPool/Output/interface/PoolOutputModule.h
@@ -41,24 +41,24 @@ namespace edm {
     enum DropMetaData { DropNone, DropDroppedPrior, DropPrior, DropAll };
     explicit PoolOutputModule(ParameterSet const& ps);
     ~PoolOutputModule() override;
-    PoolOutputModule(PoolOutputModule const&) = delete; // Disallow copying and moving
-    PoolOutputModule& operator=(PoolOutputModule const&) = delete; // Disallow copying and moving
-    std::string const& fileName() const {return fileName_;}
-    std::string const& logicalFileName() const {return logicalFileName_;}
-    int const& compressionLevel() const {return compressionLevel_;}
-    std::string const& compressionAlgorithm() const {return compressionAlgorithm_;}
-    int const& basketSize() const {return basketSize_;}
-    int eventAutoFlushSize() const {return eventAutoFlushSize_;}
-    int const& splitLevel() const {return splitLevel_;}
-    std::string const& basketOrder() const {return basketOrder_;}
-    int const& treeMaxVirtualSize() const {return treeMaxVirtualSize_;}
-    bool const& overrideInputFileSplitLevels() const {return overrideInputFileSplitLevels_;}
-    DropMetaData const& dropMetaData() const {return dropMetaData_;}
-    std::string const& catalog() const {return catalog_;}
-    std::string const& moduleLabel() const {return moduleLabel_;}
-    unsigned int const& maxFileSize() const {return maxFileSize_;}
-    int const& inputFileCount() const {return inputFileCount_;}
-    int const& whyNotFastClonable() const {return whyNotFastClonable_;}
+    PoolOutputModule(PoolOutputModule const&) = delete;             // Disallow copying and moving
+    PoolOutputModule& operator=(PoolOutputModule const&) = delete;  // Disallow copying and moving
+    std::string const& fileName() const { return fileName_; }
+    std::string const& logicalFileName() const { return logicalFileName_; }
+    int const& compressionLevel() const { return compressionLevel_; }
+    std::string const& compressionAlgorithm() const { return compressionAlgorithm_; }
+    int const& basketSize() const { return basketSize_; }
+    int eventAutoFlushSize() const { return eventAutoFlushSize_; }
+    int const& splitLevel() const { return splitLevel_; }
+    std::string const& basketOrder() const { return basketOrder_; }
+    int const& treeMaxVirtualSize() const { return treeMaxVirtualSize_; }
+    bool const& overrideInputFileSplitLevels() const { return overrideInputFileSplitLevels_; }
+    DropMetaData const& dropMetaData() const { return dropMetaData_; }
+    std::string const& catalog() const { return catalog_; }
+    std::string const& moduleLabel() const { return moduleLabel_; }
+    unsigned int const& maxFileSize() const { return maxFileSize_; }
+    int const& inputFileCount() const { return inputFileCount_; }
+    int const& whyNotFastClonable() const { return whyNotFastClonable_; }
 
     std::string const& currentFileName() const;
 
@@ -73,15 +73,16 @@ namespace edm {
       int basketSize_;
     };
     typedef std::array<AuxItem, NumBranchTypes> AuxItemArray;
-    AuxItemArray const& auxItems() const {return auxItems_;}
+    AuxItemArray const& auxItems() const { return auxItems_; }
 
     struct OutputItem {
       class Sorter {
       public:
         explicit Sorter(TTree* tree);
-        bool operator() (OutputItem const& lh, OutputItem const& rh) const;
+        bool operator()(OutputItem const& lh, OutputItem const& rh) const;
+
       private:
-        std::shared_ptr<std::map<std::string, int> > treeMap_;
+        std::shared_ptr<std::map<std::string, int>> treeMap_;
       };
 
       OutputItem();
@@ -93,9 +94,7 @@ namespace edm {
       BranchID branchID() const { return branchDescription_->branchID(); }
       std::string const& branchName() const { return branchDescription_->branchName(); }
 
-      bool operator <(OutputItem const& rh) const {
-        return *branchDescription_ < *rh.branchDescription_;
-      }
+      bool operator<(OutputItem const& rh) const { return *branchDescription_ < *rh.branchDescription_; }
 
       BranchDescription const* branchDescription_;
       EDGetToken token_;
@@ -109,20 +108,20 @@ namespace edm {
     typedef std::array<OutputItemList, NumBranchTypes> OutputItemListArray;
 
     struct SpecialSplitLevelForBranch {
-      SpecialSplitLevelForBranch(std::string const& iBranchName, int iSplitLevel):
-      branch_(convert(iBranchName)),
-      splitLevel_(iSplitLevel < 1? 1: iSplitLevel) //minimum is 1
+      SpecialSplitLevelForBranch(std::string const& iBranchName, int iSplitLevel)
+          : branch_(convert(iBranchName)),
+            splitLevel_(iSplitLevel < 1 ? 1 : iSplitLevel)  //minimum is 1
       {}
       bool match(std::string const& iBranchName) const;
-      std::regex convert(std::string const& iGlobBranchExpression )const;
-      
+      std::regex convert(std::string const& iGlobBranchExpression) const;
+
       std::regex branch_;
       int splitLevel_;
     };
-    
-    OutputItemListArray const& selectedOutputItemList() const {return selectedOutputItemList_;}
 
-    BranchChildren const& branchChildren() const {return branchChildren_;}
+    OutputItemListArray const& selectedOutputItemList() const { return selectedOutputItemList_; }
+
+    BranchChildren const& branchChildren() const { return branchChildren_; }
 
   protected:
     ///allow inheriting classes to override but still be able to call this method in the overridden version
@@ -131,8 +130,11 @@ namespace edm {
 
     virtual std::pair<std::string, std::string> physicalAndLogicalNameForNewFile();
     virtual void doExtrasAfterCloseFile();
+
   private:
-    void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const override;
+    void preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                      ModuleCallingContext const& iModuleCallingContext,
+                                      Principal const& iPrincipal) const override;
 
     void openFile(FileBlock const& fb) override;
     void respondToOpenInputFile(FileBlock const& fb) override;
@@ -146,9 +148,8 @@ namespace edm {
 
     void setProcessesWithSelectedMergeableRunProducts(std::set<std::string> const&) override;
 
-    typedef std::map<BranchID, std::set<ParentageID> > BranchParents;
-    void updateBranchParentsForOneBranch(ProductProvenanceRetriever const* provRetriever,
-                                         BranchID const& branchID);
+    typedef std::map<BranchID, std::set<ParentageID>> BranchParents;
+    void updateBranchParentsForOneBranch(ProductProvenanceRetriever const* provRetriever, BranchID const& branchID);
     void updateBranchParents(EventForOutput const& e);
     void fillDependencyGraph();
 
@@ -200,7 +201,6 @@ namespace edm {
     std::string statusFileName_;
     std::vector<std::string> processesWithSelectedMergeableRunProducts_;
   };
-}
+}  // namespace edm
 
 #endif
-
diff --git a/IOPool/Output/interface/TimeoutPoolOutputModule.h b/IOPool/Output/interface/TimeoutPoolOutputModule.h
index 0e8294df9f3d9..c21d6258825f2 100644
--- a/IOPool/Output/interface/TimeoutPoolOutputModule.h
+++ b/IOPool/Output/interface/TimeoutPoolOutputModule.h
@@ -24,8 +24,8 @@ namespace edm {
   public:
     explicit TimeoutPoolOutputModule(ParameterSet const& ps);
     ~TimeoutPoolOutputModule() override{};
-    TimeoutPoolOutputModule(TimeoutPoolOutputModule const&) = delete; // Disallow copying and moving
-    TimeoutPoolOutputModule& operator=(TimeoutPoolOutputModule const&) = delete; // Disallow copying and moving
+    TimeoutPoolOutputModule(TimeoutPoolOutputModule const&) = delete;             // Disallow copying and moving
+    TimeoutPoolOutputModule& operator=(TimeoutPoolOutputModule const&) = delete;  // Disallow copying and moving
 
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
 
@@ -36,8 +36,8 @@ namespace edm {
   private:
     mutable time_t m_lastEvent;
     mutable unsigned int eventsWrittenInCurrentFile;
-    mutable int    m_timeout;
+    mutable int m_timeout;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/IOPool/Output/src/PoolOutputModule.cc b/IOPool/Output/src/PoolOutputModule.cc
index f99695002a4c2..10b43fc6c2924 100644
--- a/IOPool/Output/src/PoolOutputModule.cc
+++ b/IOPool/Output/src/PoolOutputModule.cc
@@ -32,69 +32,73 @@
 #include <sstream>
 #include "boost/algorithm/string.hpp"
 
-
 namespace edm {
-  PoolOutputModule::PoolOutputModule(ParameterSet const& pset) :
-  edm::one::OutputModuleBase::OutputModuleBase(pset),
-  one::OutputModule<WatchInputFiles>(pset),
-    rootServiceChecker_(),
-    auxItems_(),
-    selectedOutputItemList_(),
-    fileName_(pset.getUntrackedParameter<std::string>("fileName")),
-    logicalFileName_(pset.getUntrackedParameter<std::string>("logicalFileName")),
-    catalog_(pset.getUntrackedParameter<std::string>("catalog")),
-    maxFileSize_(pset.getUntrackedParameter<int>("maxSize")),
-    compressionLevel_(pset.getUntrackedParameter<int>("compressionLevel")),
-    compressionAlgorithm_(pset.getUntrackedParameter<std::string>("compressionAlgorithm")),
-    basketSize_(pset.getUntrackedParameter<int>("basketSize")),
-    eventAutoFlushSize_(pset.getUntrackedParameter<int>("eventAutoFlushCompressedSize")),
-    splitLevel_(std::min<int>(pset.getUntrackedParameter<int>("splitLevel") + 1, 99)),
-    basketOrder_(pset.getUntrackedParameter<std::string>("sortBaskets")),
-    treeMaxVirtualSize_(pset.getUntrackedParameter<int>("treeMaxVirtualSize")),
-    whyNotFastClonable_(pset.getUntrackedParameter<bool>("fastCloning") ? FileBlock::CanFastClone : FileBlock::DisabledInConfigFile),
-    dropMetaData_(DropNone),
-    moduleLabel_(pset.getParameter<std::string>("@module_label")),
-    initializedFromInput_(false),
-    outputFileCount_(0),
-    inputFileCount_(0),
-    childIndex_(0U),
-    numberOfDigitsInIndex_(0U),
-    branchParents_(),
-    branchChildren_(),
-    overrideInputFileSplitLevels_(pset.getUntrackedParameter<bool>("overrideInputFileSplitLevels")),
-    rootOutputFile_(),
-    statusFileName_() {
-
-      if (pset.getUntrackedParameter<bool>("writeStatusFile")) {
-        std::ostringstream statusfilename;
-        statusfilename << moduleLabel_ << '_' << getpid();
-        statusFileName_ = statusfilename.str();
-      }
+  PoolOutputModule::PoolOutputModule(ParameterSet const& pset)
+      : edm::one::OutputModuleBase::OutputModuleBase(pset),
+        one::OutputModule<WatchInputFiles>(pset),
+        rootServiceChecker_(),
+        auxItems_(),
+        selectedOutputItemList_(),
+        fileName_(pset.getUntrackedParameter<std::string>("fileName")),
+        logicalFileName_(pset.getUntrackedParameter<std::string>("logicalFileName")),
+        catalog_(pset.getUntrackedParameter<std::string>("catalog")),
+        maxFileSize_(pset.getUntrackedParameter<int>("maxSize")),
+        compressionLevel_(pset.getUntrackedParameter<int>("compressionLevel")),
+        compressionAlgorithm_(pset.getUntrackedParameter<std::string>("compressionAlgorithm")),
+        basketSize_(pset.getUntrackedParameter<int>("basketSize")),
+        eventAutoFlushSize_(pset.getUntrackedParameter<int>("eventAutoFlushCompressedSize")),
+        splitLevel_(std::min<int>(pset.getUntrackedParameter<int>("splitLevel") + 1, 99)),
+        basketOrder_(pset.getUntrackedParameter<std::string>("sortBaskets")),
+        treeMaxVirtualSize_(pset.getUntrackedParameter<int>("treeMaxVirtualSize")),
+        whyNotFastClonable_(pset.getUntrackedParameter<bool>("fastCloning") ? FileBlock::CanFastClone
+                                                                            : FileBlock::DisabledInConfigFile),
+        dropMetaData_(DropNone),
+        moduleLabel_(pset.getParameter<std::string>("@module_label")),
+        initializedFromInput_(false),
+        outputFileCount_(0),
+        inputFileCount_(0),
+        childIndex_(0U),
+        numberOfDigitsInIndex_(0U),
+        branchParents_(),
+        branchChildren_(),
+        overrideInputFileSplitLevels_(pset.getUntrackedParameter<bool>("overrideInputFileSplitLevels")),
+        rootOutputFile_(),
+        statusFileName_() {
+    if (pset.getUntrackedParameter<bool>("writeStatusFile")) {
+      std::ostringstream statusfilename;
+      statusfilename << moduleLabel_ << '_' << getpid();
+      statusFileName_ = statusfilename.str();
+    }
 
-      std::string dropMetaData(pset.getUntrackedParameter<std::string>("dropMetaData"));
-      if(dropMetaData.empty()) dropMetaData_ = DropNone;
-      else if(dropMetaData == std::string("NONE")) dropMetaData_ = DropNone;
-      else if(dropMetaData == std::string("DROPPED")) dropMetaData_ = DropDroppedPrior;
-      else if(dropMetaData == std::string("PRIOR")) dropMetaData_ = DropPrior;
-      else if(dropMetaData == std::string("ALL")) dropMetaData_ = DropAll;
-      else {
-        throw edm::Exception(errors::Configuration, "Illegal dropMetaData parameter value: ")
-            << dropMetaData << ".\n"
-            << "Legal values are 'NONE', 'DROPPED', 'PRIOR', and 'ALL'.\n";
-      }
+    std::string dropMetaData(pset.getUntrackedParameter<std::string>("dropMetaData"));
+    if (dropMetaData.empty())
+      dropMetaData_ = DropNone;
+    else if (dropMetaData == std::string("NONE"))
+      dropMetaData_ = DropNone;
+    else if (dropMetaData == std::string("DROPPED"))
+      dropMetaData_ = DropDroppedPrior;
+    else if (dropMetaData == std::string("PRIOR"))
+      dropMetaData_ = DropPrior;
+    else if (dropMetaData == std::string("ALL"))
+      dropMetaData_ = DropAll;
+    else {
+      throw edm::Exception(errors::Configuration, "Illegal dropMetaData parameter value: ")
+          << dropMetaData << ".\n"
+          << "Legal values are 'NONE', 'DROPPED', 'PRIOR', and 'ALL'.\n";
+    }
 
     if (!wantAllEvents()) {
-      whyNotFastClonable_+= FileBlock::EventSelectionUsed;
+      whyNotFastClonable_ += FileBlock::EventSelectionUsed;
     }
 
-    auto const& specialSplit {pset.getUntrackedParameterSetVector("overrideBranchesSplitLevel")};
-      
+    auto const& specialSplit{pset.getUntrackedParameterSetVector("overrideBranchesSplitLevel")};
+
     specialSplitLevelForBranches_.reserve(specialSplit.size());
-    for(auto const& s: specialSplit) {
+    for (auto const& s : specialSplit) {
       specialSplitLevelForBranches_.emplace_back(s.getUntrackedParameter<std::string>("branch"),
                                                  s.getUntrackedParameter<int>("splitLevel"));
     }
-      
+
     // We don't use this next parameter, but we read it anyway because it is part
     // of the configuration of this module.  An external parser creates the
     // configuration by reading this source code.
@@ -103,7 +107,7 @@ namespace edm {
 
   void PoolOutputModule::beginJob() {
     Service<ConstProductRegistry> reg;
-    for(auto const& prod : reg->productList()) {
+    for (auto const& prod : reg->productList()) {
       BranchDescription const& desc = prod.second;
       if (desc.produced() && desc.branchType() == InEvent && !desc.isAlias()) {
         producedBranches_.emplace_back(desc.branchID());
@@ -111,76 +115,70 @@ namespace edm {
     }
   }
 
-  std::string const& PoolOutputModule::currentFileName() const {
-    return rootOutputFile_->fileName();
-  }
+  std::string const& PoolOutputModule::currentFileName() const { return rootOutputFile_->fileName(); }
 
-  PoolOutputModule::AuxItem::AuxItem() :
-        basketSize_(BranchDescription::invalidBasketSize) {}
+  PoolOutputModule::AuxItem::AuxItem() : basketSize_(BranchDescription::invalidBasketSize) {}
 
-  PoolOutputModule::OutputItem::OutputItem() :
-        branchDescription_(nullptr),
+  PoolOutputModule::OutputItem::OutputItem()
+      : branchDescription_(nullptr),
         token_(),
         product_(nullptr),
         splitLevel_(BranchDescription::invalidSplitLevel),
         basketSize_(BranchDescription::invalidBasketSize) {}
 
-  PoolOutputModule::OutputItem::OutputItem(BranchDescription const* bd, EDGetToken const& token, int splitLevel, int basketSize) :
-        branchDescription_(bd),
-        token_(token),
-        product_(nullptr),
-        splitLevel_(splitLevel),
-        basketSize_(basketSize) {}
-
+  PoolOutputModule::OutputItem::OutputItem(BranchDescription const* bd,
+                                           EDGetToken const& token,
+                                           int splitLevel,
+                                           int basketSize)
+      : branchDescription_(bd), token_(token), product_(nullptr), splitLevel_(splitLevel), basketSize_(basketSize) {}
 
   PoolOutputModule::OutputItem::Sorter::Sorter(TTree* tree) : treeMap_(new std::map<std::string, int>) {
     // Fill a map mapping branch names to an index specifying the order in the tree.
-    if(tree != nullptr) {
+    if (tree != nullptr) {
       TObjArray* branches = tree->GetListOfBranches();
-      for(int i = 0; i < branches->GetEntries(); ++i) {
+      for (int i = 0; i < branches->GetEntries(); ++i) {
         TBranchElement* br = (TBranchElement*)branches->At(i);
         treeMap_->insert(std::make_pair(std::string(br->GetName()), i));
       }
     }
   }
 
-  bool
-  PoolOutputModule::OutputItem::Sorter::operator()(OutputItem const& lh, OutputItem const& rh) const {
+  bool PoolOutputModule::OutputItem::Sorter::operator()(OutputItem const& lh, OutputItem const& rh) const {
     // Provides a comparison for sorting branches according to the index values in treeMap_.
     // Branches not found are always put at the end (i.e. not found > found).
-    if(treeMap_->empty()) return lh < rh;
+    if (treeMap_->empty())
+      return lh < rh;
     std::string const& lstring = lh.branchDescription_->branchName();
     std::string const& rstring = rh.branchDescription_->branchName();
     std::map<std::string, int>::const_iterator lit = treeMap_->find(lstring);
     std::map<std::string, int>::const_iterator rit = treeMap_->find(rstring);
     bool lfound = (lit != treeMap_->end());
     bool rfound = (rit != treeMap_->end());
-    if(lfound && rfound) {
+    if (lfound && rfound) {
       return lit->second < rit->second;
-    } else if(lfound) {
+    } else if (lfound) {
       return true;
-    } else if(rfound) {
+    } else if (rfound) {
       return false;
     }
     return lh < rh;
   }
 
-  inline bool PoolOutputModule::SpecialSplitLevelForBranch::match( std::string const& iBranchName) const {
-    return std::regex_match(iBranchName,branch_);
+  inline bool PoolOutputModule::SpecialSplitLevelForBranch::match(std::string const& iBranchName) const {
+    return std::regex_match(iBranchName, branch_);
   }
 
-  std::regex PoolOutputModule::SpecialSplitLevelForBranch::convert( std::string const& iGlobBranchExpression) const {
+  std::regex PoolOutputModule::SpecialSplitLevelForBranch::convert(std::string const& iGlobBranchExpression) const {
     std::string tmp(iGlobBranchExpression);
     boost::replace_all(tmp, "*", ".*");
     boost::replace_all(tmp, "?", ".");
     return std::regex(tmp);
   }
-  
-  void PoolOutputModule::fillSelectedItemList(BranchType branchType, TTree* theInputTree) {
 
+  void PoolOutputModule::fillSelectedItemList(BranchType branchType, TTree* theInputTree) {
     SelectedProducts const& keptVector = keptProducts()[branchType];
-    OutputItemList&   outputItemList = selectedOutputItemList_[branchType];
-    AuxItem&   auxItem = auxItems_[branchType];
+    OutputItemList& outputItemList = selectedOutputItemList_[branchType];
+    AuxItem& auxItem = auxItems_[branchType];
 
     // Fill AuxItem
     if (theInputTree != nullptr && !overrideInputFileSplitLevels_) {
@@ -195,21 +193,23 @@ namespace edm {
     }
 
     // Fill outputItemList with an entry for each branch.
-    for(auto const& kept : keptVector) {
+    for (auto const& kept : keptVector) {
       int splitLevel = BranchDescription::invalidSplitLevel;
       int basketSize = BranchDescription::invalidBasketSize;
 
       BranchDescription const& prod = *kept.first;
-      TBranch* theBranch = ((!prod.produced() && theInputTree != nullptr && !overrideInputFileSplitLevels_) ? theInputTree->GetBranch(prod.branchName().c_str()) : nullptr);
+      TBranch* theBranch = ((!prod.produced() && theInputTree != nullptr && !overrideInputFileSplitLevels_)
+                                ? theInputTree->GetBranch(prod.branchName().c_str())
+                                : nullptr);
 
-      if(theBranch != nullptr) {
+      if (theBranch != nullptr) {
         splitLevel = theBranch->GetSplitLevel();
         basketSize = theBranch->GetBasketSize();
       } else {
         splitLevel = (prod.splitLevel() == BranchDescription::invalidSplitLevel ? splitLevel_ : prod.splitLevel());
-        for(auto const& b: specialSplitLevelForBranches_) {
-          if(b.match(prod.branchName())) {
-            splitLevel =b.splitLevel_;
+        for (auto const& b : specialSplitLevelForBranches_) {
+          if (b.match(prod.branchName())) {
+            splitLevel = b.splitLevel_;
           }
         }
         basketSize = (prod.basketSize() == BranchDescription::invalidBasketSize ? basketSize_ : prod.basketSize());
@@ -223,7 +223,7 @@ namespace edm {
   }
 
   void PoolOutputModule::beginInputFile(FileBlock const& fb) {
-    if(isFileOpen()) {
+    if (isFileOpen()) {
       //Faster to read ChildrenBranches directly from input
       // file than to build it every event
       auto const& branchToChildMap = fb.branchChildren().childLookup();
@@ -237,19 +237,18 @@ namespace edm {
   }
 
   void PoolOutputModule::openFile(FileBlock const& fb) {
-    if(!isFileOpen()) {
+    if (!isFileOpen()) {
       reallyOpenFile();
       beginInputFile(fb);
     }
   }
 
   void PoolOutputModule::respondToOpenInputFile(FileBlock const& fb) {
-    if(!initializedFromInput_) {
-      for(int i = InEvent; i < NumBranchTypes; ++i) {
+    if (!initializedFromInput_) {
+      for (int i = InEvent; i < NumBranchTypes; ++i) {
         BranchType branchType = static_cast<BranchType>(i);
-        TTree* theInputTree = (branchType == InEvent ? fb.tree() :
-                              (branchType == InLumi ? fb.lumiTree() :
-                               fb.runTree()));
+        TTree* theInputTree =
+            (branchType == InEvent ? fb.tree() : (branchType == InLumi ? fb.lumiTree() : fb.runTree()));
         fillSelectedItemList(branchType, theInputTree);
       }
       initializedFromInput_ = true;
@@ -259,33 +258,31 @@ namespace edm {
   }
 
   void PoolOutputModule::respondToCloseInputFile(FileBlock const& fb) {
-    if(rootOutputFile_) rootOutputFile_->respondToCloseInputFile(fb);
+    if (rootOutputFile_)
+      rootOutputFile_->respondToCloseInputFile(fb);
   }
 
   void PoolOutputModule::setProcessesWithSelectedMergeableRunProducts(std::set<std::string> const& processes) {
     processesWithSelectedMergeableRunProducts_.assign(processes.begin(), processes.end());
   }
 
-  PoolOutputModule::~PoolOutputModule() {
-  }
+  PoolOutputModule::~PoolOutputModule() {}
 
   void PoolOutputModule::write(EventForOutput const& e) {
     updateBranchParents(e);
     rootOutputFile_->writeOne(e);
-      if (!statusFileName_.empty()) {
-        std::ofstream statusFile(statusFileName_.c_str());
-        statusFile << e.id() << " time: " << std::setprecision(3) << TimeOfDay() << '\n';
-        statusFile.close();
-      }
+    if (!statusFileName_.empty()) {
+      std::ofstream statusFile(statusFileName_.c_str());
+      statusFile << e.id() << " time: " << std::setprecision(3) << TimeOfDay() << '\n';
+      statusFile.close();
+    }
   }
 
   void PoolOutputModule::writeLuminosityBlock(LuminosityBlockForOutput const& lb) {
     rootOutputFile_->writeLuminosityBlock(lb);
   }
 
-  void PoolOutputModule::writeRun(RunForOutput const& r) {
-    rootOutputFile_->writeRun(r);
-  }
+  void PoolOutputModule::writeRun(RunForOutput const& r) { rootOutputFile_->writeRun(r); }
 
   void PoolOutputModule::reallyCloseFile() {
     fillDependencyGraph();
@@ -301,21 +298,22 @@ namespace edm {
     writeParentageRegistry();
     writeBranchIDListRegistry();
     writeThinnedAssociationsHelper();
-    writeProductDependencies(); //branchChildren used here
+    writeProductDependencies();  //branchChildren used here
     branchChildren_.clear();
     finishEndFile();
 
     doExtrasAfterCloseFile();
   }
 
-  
   // At some later date, we may move functionality from finishEndFile() to here.
-  void PoolOutputModule::startEndFile() { }
+  void PoolOutputModule::startEndFile() {}
 
   void PoolOutputModule::writeFileFormatVersion() { rootOutputFile_->writeFileFormatVersion(); }
   void PoolOutputModule::writeFileIdentifier() { rootOutputFile_->writeFileIdentifier(); }
   void PoolOutputModule::writeIndexIntoFile() { rootOutputFile_->writeIndexIntoFile(); }
-  void PoolOutputModule::writeStoredMergeableRunProductMetadata() { rootOutputFile_->writeStoredMergeableRunProductMetadata(); }
+  void PoolOutputModule::writeStoredMergeableRunProductMetadata() {
+    rootOutputFile_->writeStoredMergeableRunProductMetadata();
+  }
   void PoolOutputModule::writeProcessHistoryRegistry() { rootOutputFile_->writeProcessHistoryRegistry(); }
   void PoolOutputModule::writeParameterSetRegistry() { rootOutputFile_->writeParameterSetRegistry(); }
   void PoolOutputModule::writeProductDescriptionRegistry() { rootOutputFile_->writeProductDescriptionRegistry(); }
@@ -323,70 +321,69 @@ namespace edm {
   void PoolOutputModule::writeBranchIDListRegistry() { rootOutputFile_->writeBranchIDListRegistry(); }
   void PoolOutputModule::writeThinnedAssociationsHelper() { rootOutputFile_->writeThinnedAssociationsHelper(); }
   void PoolOutputModule::writeProductDependencies() { rootOutputFile_->writeProductDependencies(); }
-  void PoolOutputModule::finishEndFile() { rootOutputFile_->finishEndFile(); rootOutputFile_ = nullptr; } // propagate_const<T> has no reset() function
+  void PoolOutputModule::finishEndFile() {
+    rootOutputFile_->finishEndFile();
+    rootOutputFile_ = nullptr;
+  }  // propagate_const<T> has no reset() function
   void PoolOutputModule::doExtrasAfterCloseFile() {}
   bool PoolOutputModule::isFileOpen() const { return rootOutputFile_.get() != nullptr; }
   bool PoolOutputModule::shouldWeCloseFile() const { return rootOutputFile_->shouldWeCloseFile(); }
 
-  std::pair<std::string, std::string>
-  PoolOutputModule::physicalAndLogicalNameForNewFile() {
-      if(inputFileCount_ == 0) {
-        throw edm::Exception(errors::LogicError)
-          << "Attempt to open output file before input file. "
-          << "Please report this to the core framework developers.\n";
-      }
-      std::string suffix(".root");
-      std::string::size_type offset = fileName().rfind(suffix);
-      bool ext = (offset == fileName().size() - suffix.size());
-      if(!ext) suffix.clear();
-      std::string fileBase(ext ? fileName().substr(0, offset) : fileName());
-      std::ostringstream ofilename;
-      std::ostringstream lfilename;
-      ofilename << fileBase;
-      lfilename << logicalFileName();
-      if(numberOfDigitsInIndex_) {
-        ofilename << '_' << std::setw(numberOfDigitsInIndex_) << std::setfill('0') << childIndex_;
-        if(!logicalFileName().empty()) {
-          lfilename << '_' << std::setw(numberOfDigitsInIndex_) << std::setfill('0') << childIndex_;
-        }
+  std::pair<std::string, std::string> PoolOutputModule::physicalAndLogicalNameForNewFile() {
+    if (inputFileCount_ == 0) {
+      throw edm::Exception(errors::LogicError) << "Attempt to open output file before input file. "
+                                               << "Please report this to the core framework developers.\n";
+    }
+    std::string suffix(".root");
+    std::string::size_type offset = fileName().rfind(suffix);
+    bool ext = (offset == fileName().size() - suffix.size());
+    if (!ext)
+      suffix.clear();
+    std::string fileBase(ext ? fileName().substr(0, offset) : fileName());
+    std::ostringstream ofilename;
+    std::ostringstream lfilename;
+    ofilename << fileBase;
+    lfilename << logicalFileName();
+    if (numberOfDigitsInIndex_) {
+      ofilename << '_' << std::setw(numberOfDigitsInIndex_) << std::setfill('0') << childIndex_;
+      if (!logicalFileName().empty()) {
+        lfilename << '_' << std::setw(numberOfDigitsInIndex_) << std::setfill('0') << childIndex_;
       }
-      if(outputFileCount_) {
-        ofilename << std::setw(3) << std::setfill('0') << outputFileCount_;
-        if(!logicalFileName().empty()) {
-          lfilename << std::setw(3) << std::setfill('0') << outputFileCount_;
-        }
+    }
+    if (outputFileCount_) {
+      ofilename << std::setw(3) << std::setfill('0') << outputFileCount_;
+      if (!logicalFileName().empty()) {
+        lfilename << std::setw(3) << std::setfill('0') << outputFileCount_;
       }
-      ofilename << suffix;
-      ++outputFileCount_;
+    }
+    ofilename << suffix;
+    ++outputFileCount_;
 
-      return std::make_pair(ofilename.str(), lfilename.str());
+    return std::make_pair(ofilename.str(), lfilename.str());
   }
 
   void PoolOutputModule::reallyOpenFile() {
     auto names = physicalAndLogicalNameForNewFile();
-    rootOutputFile_ = std::make_unique<RootOutputFile>(this, names.first, names.second,
-                                                       processesWithSelectedMergeableRunProducts_); // propagate_const<T> has no reset() function
+    rootOutputFile_ = std::make_unique<RootOutputFile>(
+        this,
+        names.first,
+        names.second,
+        processesWithSelectedMergeableRunProducts_);  // propagate_const<T> has no reset() function
   }
 
-  void
-  PoolOutputModule::updateBranchParentsForOneBranch(
-    ProductProvenanceRetriever const* provRetriever,
-    BranchID const& branchID) {
-
+  void PoolOutputModule::updateBranchParentsForOneBranch(ProductProvenanceRetriever const* provRetriever,
+                                                         BranchID const& branchID) {
     ProductProvenance const* provenance = provRetriever->branchIDToProvenanceForProducedOnly(branchID);
     if (provenance != nullptr) {
       BranchParents::iterator it = branchParents_.find(branchID);
       if (it == branchParents_.end()) {
-        it = branchParents_.insert(std::make_pair(branchID,
-                                                  std::set<ParentageID>())).first;
+        it = branchParents_.insert(std::make_pair(branchID, std::set<ParentageID>())).first;
       }
       it->second.insert(provenance->parentageID());
     }
   }
 
-  void
-  PoolOutputModule::updateBranchParents(EventForOutput const& e) {
-
+  void PoolOutputModule::updateBranchParents(EventForOutput const& e) {
     ProductProvenanceRetriever const* provRetriever = e.productProvenanceRetrieverPtr();
     for (auto const& bid : producedBranches_) {
       updateBranchParentsForOneBranch(provRetriever, bid);
@@ -399,98 +396,103 @@ namespace edm {
     }
   }
 
-  void
-  PoolOutputModule::preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const {
-    if(DropAll != dropMetaData_ ) {
+  void PoolOutputModule::preActionBeforeRunEventAsync(WaitingTask* iTask,
+                                                      ModuleCallingContext const& iModuleCallingContext,
+                                                      Principal const& iPrincipal) const {
+    if (DropAll != dropMetaData_) {
       auto const* ep = dynamic_cast<EventPrincipal const*>(&iPrincipal);
-      if(ep)
-      {
+      if (ep) {
         auto pr = ep->productProvenanceRetrieverPtr();
-        if(pr) {
-          pr->readProvenanceAsync(iTask,&iModuleCallingContext);
+        if (pr) {
+          pr->readProvenanceAsync(iTask, &iModuleCallingContext);
         }
       }
     }
   }
 
-  void
-  PoolOutputModule::fillDependencyGraph() {
-    for(auto const& branchParent : branchParents_) {
+  void PoolOutputModule::fillDependencyGraph() {
+    for (auto const& branchParent : branchParents_) {
       BranchID const& child = branchParent.first;
       std::set<ParentageID> const& eIds = branchParent.second;
-      for(auto const& eId : eIds) {
+      for (auto const& eId : eIds) {
         Parentage entryDesc;
         ParentageRegistry::instance()->getMapped(eId, entryDesc);
         std::vector<BranchID> const& parents = entryDesc.parents();
-        for(auto const& parent : parents) {
+        for (auto const& parent : parents) {
           branchChildren_.insertChild(parent, child);
         }
       }
     }
   }
 
-  void
-  PoolOutputModule::fillDescription(ParameterSetDescription& desc) {
+  void PoolOutputModule::fillDescription(ParameterSetDescription& desc) {
     std::string defaultString;
 
     desc.setComment("Writes runs, lumis, and events into EDM/ROOT files.");
-    desc.addUntracked<std::string>("fileName")
-        ->setComment("Name of output file.");
+    desc.addUntracked<std::string>("fileName")->setComment("Name of output file.");
     desc.addUntracked<std::string>("logicalFileName", defaultString)
         ->setComment("Passed to job report. Otherwise unused by module.");
     desc.addUntracked<std::string>("catalog", defaultString)
         ->setComment("Passed to job report. Otherwise unused by module.");
     desc.addUntracked<int>("maxSize", 0x7f000000)
-        ->setComment("Maximum output file size, in kB.\n"
-                     "If over maximum, new output file will be started at next input file transition.");
-    desc.addUntracked<int>("compressionLevel", 9)
-        ->setComment("ROOT compression level of output file.");
+        ->setComment(
+            "Maximum output file size, in kB.\n"
+            "If over maximum, new output file will be started at next input file transition.");
+    desc.addUntracked<int>("compressionLevel", 9)->setComment("ROOT compression level of output file.");
     desc.addUntracked<std::string>("compressionAlgorithm", "ZLIB")
         ->setComment("Algorithm used to compress data in the ROOT output file, allowed values are ZLIB and LZMA");
-    desc.addUntracked<int>("basketSize", 16384)
-        ->setComment("Default ROOT basket size in output file.");
-    desc.addUntracked<int>("eventAutoFlushCompressedSize",20*1024*1024)
-        ->setComment("Set ROOT auto flush stored data size (in bytes) for event TTree. The value sets how large the compressed buffer is allowed to get. The uncompressed buffer can be quite a bit larger than this depending on the average compression ratio. The value of -1 just uses ROOT's default value. The value of 0 turns off this feature.");
-    desc.addUntracked<int>("splitLevel", 99)
-        ->setComment("Default ROOT branch split level in output file.");
+    desc.addUntracked<int>("basketSize", 16384)->setComment("Default ROOT basket size in output file.");
+    desc.addUntracked<int>("eventAutoFlushCompressedSize", 20 * 1024 * 1024)
+        ->setComment(
+            "Set ROOT auto flush stored data size (in bytes) for event TTree. The value sets how large the compressed "
+            "buffer is allowed to get. The uncompressed buffer can be quite a bit larger than this depending on the "
+            "average compression ratio. The value of -1 just uses ROOT's default value. The value of 0 turns off this "
+            "feature.");
+    desc.addUntracked<int>("splitLevel", 99)->setComment("Default ROOT branch split level in output file.");
     desc.addUntracked<std::string>("sortBaskets", std::string("sortbasketsbyoffset"))
-        ->setComment("Legal values: 'sortbasketsbyoffset', 'sortbasketsbybranch', 'sortbasketsbyentry'.\n"
-                     "Used by ROOT when fast copying. Affects performance.");
+        ->setComment(
+            "Legal values: 'sortbasketsbyoffset', 'sortbasketsbybranch', 'sortbasketsbyentry'.\n"
+            "Used by ROOT when fast copying. Affects performance.");
     desc.addUntracked<int>("treeMaxVirtualSize", -1)
         ->setComment("Size of ROOT TTree TBasket cache.  Affects performance.");
     desc.addUntracked<bool>("fastCloning", true)
-        ->setComment("True:  Allow fast copying, if possible.\n"
-                     "False: Disable fast copying.");
+        ->setComment(
+            "True:  Allow fast copying, if possible.\n"
+            "False: Disable fast copying.");
     desc.addUntracked<bool>("overrideInputFileSplitLevels", false)
-        ->setComment("False: Use branch split levels and basket sizes from input file, if possible.\n"
-                     "True:  Always use specified or default split levels and basket sizes.");
+        ->setComment(
+            "False: Use branch split levels and basket sizes from input file, if possible.\n"
+            "True:  Always use specified or default split levels and basket sizes.");
     desc.addUntracked<bool>("writeStatusFile", false)
         ->setComment("Write a status file. Intended for use by workflow management.");
     desc.addUntracked<std::string>("dropMetaData", defaultString)
-        ->setComment("Determines handling of per product per event metadata.  Options are:\n"
-                     "'NONE':    Keep all of it.\n"
-                     "'DROPPED': Keep it for products produced in current process and all kept products. Drop it for dropped products produced in prior processes.\n"
-                     "'PRIOR':   Keep it for products produced in current process. Drop it for products produced in prior processes.\n"
-                     "'ALL':     Drop all of it.");
+        ->setComment(
+            "Determines handling of per product per event metadata.  Options are:\n"
+            "'NONE':    Keep all of it.\n"
+            "'DROPPED': Keep it for products produced in current process and all kept products. Drop it for dropped "
+            "products produced in prior processes.\n"
+            "'PRIOR':   Keep it for products produced in current process. Drop it for products produced in prior "
+            "processes.\n"
+            "'ALL':     Drop all of it.");
     {
       ParameterSetDescription dataSet;
       dataSet.setAllowAnything();
       desc.addUntracked<ParameterSetDescription>("dataset", dataSet)
-      ->setComment("PSet is only used by Data Operations and not by this module.");
+          ->setComment("PSet is only used by Data Operations and not by this module.");
     }
     {
       ParameterSetDescription specialSplit;
-      specialSplit.addUntracked<std::string>("branch")->setComment("Name of branch needing a special split level. The name can contain wildcards '*' and '?'");
+      specialSplit.addUntracked<std::string>("branch")->setComment(
+          "Name of branch needing a special split level. The name can contain wildcards '*' and '?'");
       specialSplit.addUntracked<int>("splitLevel")->setComment("The special split level for the branch");
-      desc.addVPSetUntracked("overrideBranchesSplitLevel",specialSplit, std::vector<ParameterSet>());
+      desc.addVPSetUntracked("overrideBranchesSplitLevel", specialSplit, std::vector<ParameterSet>());
     }
     OutputModule::fillDescription(desc);
   }
 
-  void
-  PoolOutputModule::fillDescriptions(ConfigurationDescriptions & descriptions) {
+  void PoolOutputModule::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     PoolOutputModule::fillDescription(desc);
     descriptions.add("edmOutput", desc);
   }
-}
+}  // namespace edm
diff --git a/IOPool/Output/src/RootOutputFile.cc b/IOPool/Output/src/RootOutputFile.cc
index 43680d821cd7c..2ff5170cdfae1 100644
--- a/IOPool/Output/src/RootOutputFile.cc
+++ b/IOPool/Output/src/RootOutputFile.cc
@@ -3,7 +3,6 @@
 
 #include "FWCore/Utilities/interface/GlobalIdentifier.h"
 
-
 #include "DataFormats/Provenance/interface/EventAuxiliary.h"
 #include "FWCore/Version/interface/GetFileFormatVersion.h"
 #include "DataFormats/Provenance/interface/FileFormatVersion.h"
@@ -52,103 +51,108 @@
 namespace edm {
 
   namespace {
-    bool
-    sorterForJobReportHash(BranchDescription const* lh, BranchDescription const* rh) {
-      return
-        lh->fullClassName() < rh->fullClassName() ? true :
-        lh->fullClassName() > rh->fullClassName() ? false :
-        lh->moduleLabel() < rh->moduleLabel() ? true :
-        lh->moduleLabel() > rh->moduleLabel() ? false :
-        lh->productInstanceName() < rh->productInstanceName() ? true :
-        lh->productInstanceName() > rh->productInstanceName() ? false :
-        lh->processName() < rh->processName() ? true :
-        false;
+    bool sorterForJobReportHash(BranchDescription const* lh, BranchDescription const* rh) {
+      return lh->fullClassName() < rh->fullClassName()
+                 ? true
+                 : lh->fullClassName() > rh->fullClassName()
+                       ? false
+                       : lh->moduleLabel() < rh->moduleLabel()
+                             ? true
+                             : lh->moduleLabel() > rh->moduleLabel()
+                                   ? false
+                                   : lh->productInstanceName() < rh->productInstanceName()
+                                         ? true
+                                         : lh->productInstanceName() > rh->productInstanceName()
+                                               ? false
+                                               : lh->processName() < rh->processName() ? true : false;
     }
 
-    TFile*
-    openTFile(char const* name, int compressionLevel) {
+    TFile* openTFile(char const* name, int compressionLevel) {
       TFile* file = TFile::Open(name, "recreate", "", compressionLevel);
       std::exception_ptr e = edm::threadLocalException::getException();
-      if(e != std::exception_ptr()) {
+      if (e != std::exception_ptr()) {
         edm::threadLocalException::setException(std::exception_ptr());
         std::rethrow_exception(e);
       }
       return file;
     }
-  }
+  }  // namespace
 
-  RootOutputFile::RootOutputFile(PoolOutputModule* om, std::string const& fileName,
+  RootOutputFile::RootOutputFile(PoolOutputModule* om,
+                                 std::string const& fileName,
                                  std::string const& logicalFileName,
-                                 std::vector<std::string> const& processesWithSelectedMergeableRunProducts) :
-      file_(fileName),
-      logicalFile_(logicalFileName),
-      reportToken_(0),
-      om_(om),
-      whyNotFastClonable_(om_->whyNotFastClonable()),
-      canFastCloneAux_(false),
-      filePtr_(openTFile(file_.c_str(), om_->compressionLevel())),
-      fid_(),
-      eventEntryNumber_(0LL),
-      lumiEntryNumber_(0LL),
-      runEntryNumber_(0LL),
-      indexIntoFile_(),
-      storedMergeableRunProductMetadata_(processesWithSelectedMergeableRunProducts),
-      nEventsInLumi_(0),
-      metaDataTree_(nullptr),
-      parameterSetsTree_(nullptr),
-      parentageTree_(nullptr),
-      lumiAux_(),
-      runAux_(),
-      pEventAux_(nullptr),
-      pLumiAux_(&lumiAux_),
-      pRunAux_(&runAux_),
-      eventEntryInfoVector_(),
-      pEventEntryInfoVector_(&eventEntryInfoVector_),
-      pBranchListIndexes_(nullptr),
-      pEventSelectionIDs_(nullptr),
-      eventTree_(filePtr(), InEvent, om_->splitLevel(), om_->treeMaxVirtualSize()),
-      lumiTree_(filePtr(), InLumi, om_->splitLevel(), om_->treeMaxVirtualSize()),
-      runTree_(filePtr(), InRun, om_->splitLevel(), om_->treeMaxVirtualSize()),
-      treePointers_(),
-      dataTypeReported_(false),
-      processHistoryRegistry_(),
-      parentageIDs_(),
-      branchesWithStoredHistory_(),
-      wrapperBaseTClass_(TClass::GetClass("edm::WrapperBase")) {
+                                 std::vector<std::string> const& processesWithSelectedMergeableRunProducts)
+      : file_(fileName),
+        logicalFile_(logicalFileName),
+        reportToken_(0),
+        om_(om),
+        whyNotFastClonable_(om_->whyNotFastClonable()),
+        canFastCloneAux_(false),
+        filePtr_(openTFile(file_.c_str(), om_->compressionLevel())),
+        fid_(),
+        eventEntryNumber_(0LL),
+        lumiEntryNumber_(0LL),
+        runEntryNumber_(0LL),
+        indexIntoFile_(),
+        storedMergeableRunProductMetadata_(processesWithSelectedMergeableRunProducts),
+        nEventsInLumi_(0),
+        metaDataTree_(nullptr),
+        parameterSetsTree_(nullptr),
+        parentageTree_(nullptr),
+        lumiAux_(),
+        runAux_(),
+        pEventAux_(nullptr),
+        pLumiAux_(&lumiAux_),
+        pRunAux_(&runAux_),
+        eventEntryInfoVector_(),
+        pEventEntryInfoVector_(&eventEntryInfoVector_),
+        pBranchListIndexes_(nullptr),
+        pEventSelectionIDs_(nullptr),
+        eventTree_(filePtr(), InEvent, om_->splitLevel(), om_->treeMaxVirtualSize()),
+        lumiTree_(filePtr(), InLumi, om_->splitLevel(), om_->treeMaxVirtualSize()),
+        runTree_(filePtr(), InRun, om_->splitLevel(), om_->treeMaxVirtualSize()),
+        treePointers_(),
+        dataTypeReported_(false),
+        processHistoryRegistry_(),
+        parentageIDs_(),
+        branchesWithStoredHistory_(),
+        wrapperBaseTClass_(TClass::GetClass("edm::WrapperBase")) {
     if (om_->compressionAlgorithm() == std::string("ZLIB")) {
       filePtr_->SetCompressionAlgorithm(ROOT::kZLIB);
     } else if (om_->compressionAlgorithm() == std::string("LZMA")) {
       filePtr_->SetCompressionAlgorithm(ROOT::kLZMA);
     } else {
-      throw Exception(errors::Configuration) << "PoolOutputModule configured with unknown compression algorithm '" << om_->compressionAlgorithm() << "'\n"
-					     << "Allowed compression algorithms are ZLIB and LZMA\n";
+      throw Exception(errors::Configuration)
+          << "PoolOutputModule configured with unknown compression algorithm '" << om_->compressionAlgorithm() << "'\n"
+          << "Allowed compression algorithms are ZLIB and LZMA\n";
     }
     if (-1 != om->eventAutoFlushSize()) {
-      eventTree_.setAutoFlush(-1*om->eventAutoFlushSize());
+      eventTree_.setAutoFlush(-1 * om->eventAutoFlushSize());
     }
-    eventTree_.addAuxiliary<EventAuxiliary>(BranchTypeToAuxiliaryBranchName(InEvent),
-                                            pEventAux_, om_->auxItems()[InEvent].basketSize_);
+    eventTree_.addAuxiliary<EventAuxiliary>(
+        BranchTypeToAuxiliaryBranchName(InEvent), pEventAux_, om_->auxItems()[InEvent].basketSize_);
     eventTree_.addAuxiliary<StoredProductProvenanceVector>(BranchTypeToProductProvenanceBranchName(InEvent),
-                                                     pEventEntryInfoVector(), om_->auxItems()[InEvent].basketSize_);
-    eventTree_.addAuxiliary<EventSelectionIDVector>(poolNames::eventSelectionsBranchName(),
-                                                    pEventSelectionIDs_, om_->auxItems()[InEvent].basketSize_,false);
-    eventTree_.addAuxiliary<BranchListIndexes>(poolNames::branchListIndexesBranchName(),
-                                               pBranchListIndexes_, om_->auxItems()[InEvent].basketSize_);
+                                                           pEventEntryInfoVector(),
+                                                           om_->auxItems()[InEvent].basketSize_);
+    eventTree_.addAuxiliary<EventSelectionIDVector>(
+        poolNames::eventSelectionsBranchName(), pEventSelectionIDs_, om_->auxItems()[InEvent].basketSize_, false);
+    eventTree_.addAuxiliary<BranchListIndexes>(
+        poolNames::branchListIndexesBranchName(), pBranchListIndexes_, om_->auxItems()[InEvent].basketSize_);
 
-    lumiTree_.addAuxiliary<LuminosityBlockAuxiliary>(BranchTypeToAuxiliaryBranchName(InLumi),
-                                                     pLumiAux_, om_->auxItems()[InLumi].basketSize_);
+    lumiTree_.addAuxiliary<LuminosityBlockAuxiliary>(
+        BranchTypeToAuxiliaryBranchName(InLumi), pLumiAux_, om_->auxItems()[InLumi].basketSize_);
 
-    runTree_.addAuxiliary<RunAuxiliary>(BranchTypeToAuxiliaryBranchName(InRun),
-                                        pRunAux_, om_->auxItems()[InRun].basketSize_);
+    runTree_.addAuxiliary<RunAuxiliary>(
+        BranchTypeToAuxiliaryBranchName(InRun), pRunAux_, om_->auxItems()[InRun].basketSize_);
 
     treePointers_[InEvent] = &eventTree_;
-    treePointers_[InLumi]  = &lumiTree_;
-    treePointers_[InRun]   = &runTree_;
+    treePointers_[InLumi] = &lumiTree_;
+    treePointers_[InRun] = &runTree_;
 
-    for(int i = InEvent; i < NumBranchTypes; ++i) {
+    for (int i = InEvent; i < NumBranchTypes; ++i) {
       BranchType branchType = static_cast<BranchType>(i);
-      RootOutputTree *theTree = treePointers_[branchType];
-      for(auto const& item : om_->selectedOutputItemList()[branchType]) {
+      RootOutputTree* theTree = treePointers_[branchType];
+      for (auto const& item : om_->selectedOutputItemList()[branchType]) {
         item.product_ = nullptr;
         BranchDescription const& desc = *item.branchDescription_;
         theTree->addBranch(desc.branchName(),
@@ -162,9 +166,9 @@ namespace edm {
       }
     }
     // Don't split metadata tree or event description tree
-    metaDataTree_         = RootOutputTree::makeTTree(filePtr_.get(), poolNames::metaDataTreeName(), 0);
+    metaDataTree_ = RootOutputTree::makeTTree(filePtr_.get(), poolNames::metaDataTreeName(), 0);
     parentageTree_ = RootOutputTree::makeTTree(filePtr_.get(), poolNames::parentageTreeName(), 0);
-    parameterSetsTree_    = RootOutputTree::makeTTree(filePtr_.get(), poolNames::parameterSetsTreeName(), 0);
+    parameterSetsTree_ = RootOutputTree::makeTTree(filePtr_.get(), poolNames::parameterSetsTreeName(), 0);
 
     fid_ = FileID(createGlobalIdentifier());
 
@@ -177,7 +181,7 @@ namespace edm {
     std::vector<BranchDescription const*> branches;
     branchNames.reserve(om_->selectedOutputItemList()[InEvent].size());
     branches.reserve(om->selectedOutputItemList()[InEvent].size());
-    for(auto const& item : om_->selectedOutputItemList()[InEvent]) {
+    for (auto const& item : om_->selectedOutputItemList()[InEvent]) {
       branchNames.push_back(item.branchDescription_->branchName());
       branches.push_back(item.branchDescription_);
     }
@@ -186,12 +190,10 @@ namespace edm {
     // Now, make a concatenated string.
     std::ostringstream oss;
     char const underscore = '_';
-    for(auto const& branch : branches) {
+    for (auto const& branch : branches) {
       BranchDescription const& bd = *branch;
-      oss << bd.fullClassName() << underscore
-          << bd.moduleLabel() << underscore
-          << bd.productInstanceName() << underscore
-          << bd.processName() << underscore;
+      oss << bd.fullClassName() << underscore << bd.moduleLabel() << underscore << bd.productInstanceName()
+          << underscore << bd.processName() << underscore;
     }
     std::string stringrep = oss.str();
     cms::Digest md5alg(stringrep);
@@ -200,24 +202,22 @@ namespace edm {
     // and get back the token for it.
     std::string moduleName = "PoolOutputModule";
     Service<JobReport> reportSvc;
-    reportToken_ = reportSvc->outputFileOpened(
-                      file_, logicalFile_,  // PFN and LFN
-                      om_->catalog(),  // catalog
-                      moduleName,   // module class name
-                      om_->moduleLabel(),  // module label
-                      fid_.fid(), // file id (guid)
-                      std::string(), // data type (not yet known, so string is empty).
-                      md5alg.digest().toString(), // branch hash
-                      branchNames); // branch names being written
+    reportToken_ = reportSvc->outputFileOpened(file_,
+                                               logicalFile_,        // PFN and LFN
+                                               om_->catalog(),      // catalog
+                                               moduleName,          // module class name
+                                               om_->moduleLabel(),  // module label
+                                               fid_.fid(),          // file id (guid)
+                                               std::string(),       // data type (not yet known, so string is empty).
+                                               md5alg.digest().toString(),  // branch hash
+                                               branchNames);                // branch names being written
   }
 
   namespace {
-    void
-    maybeIssueWarning(int whyNotFastClonable, std::string const& ifileName, std::string const& ofileName) {
-
+    void maybeIssueWarning(int whyNotFastClonable, std::string const& ifileName, std::string const& ofileName) {
       // No message if fast cloning was deliberately disabled, or if there are no events to copy anyway.
-      if ((whyNotFastClonable &
-        (FileBlock::DisabledInConfigFile | FileBlock::NoRootInputSource | FileBlock::NotProcessingEvents | FileBlock::NoEventsInFile)) != 0) {
+      if ((whyNotFastClonable & (FileBlock::DisabledInConfigFile | FileBlock::NoRootInputSource |
+                                 FileBlock::NotProcessingEvents | FileBlock::NoEventsInFile)) != 0) {
         return;
       }
 
@@ -227,68 +227,68 @@ namespace edm {
       bool isWarning = true;
       std::ostringstream message;
       message << "Fast copying of file " << ifileName << " to file " << ofileName << " is disabled because:\n";
-      if((whyNotFastClonable & FileBlock::HasSecondaryFileSequence) != 0) {
+      if ((whyNotFastClonable & FileBlock::HasSecondaryFileSequence) != 0) {
         message << "a SecondaryFileSequence was specified.\n";
         whyNotFastClonable &= ~(FileBlock::HasSecondaryFileSequence);
         isWarning = false;
       }
-      if((whyNotFastClonable & FileBlock::FileTooOld) != 0) {
+      if ((whyNotFastClonable & FileBlock::FileTooOld) != 0) {
         message << "the input file is in an old format.\n";
         whyNotFastClonable &= ~(FileBlock::FileTooOld);
         isWarning = false;
       }
-      if((whyNotFastClonable & FileBlock::EventsToBeSorted) != 0) {
+      if ((whyNotFastClonable & FileBlock::EventsToBeSorted) != 0) {
         message << "events need to be sorted.\n";
         whyNotFastClonable &= ~(FileBlock::EventsToBeSorted);
       }
-      if((whyNotFastClonable & FileBlock::RunOrLumiNotContiguous) != 0) {
+      if ((whyNotFastClonable & FileBlock::RunOrLumiNotContiguous) != 0) {
         message << "a run or a lumi is not contiguous in the input file.\n";
         whyNotFastClonable &= ~(FileBlock::RunOrLumiNotContiguous);
       }
-      if((whyNotFastClonable & FileBlock::EventsOrLumisSelectedByID) != 0) {
+      if ((whyNotFastClonable & FileBlock::EventsOrLumisSelectedByID) != 0) {
         message << "events or lumis were selected or skipped by ID.\n";
         whyNotFastClonable &= ~(FileBlock::EventsOrLumisSelectedByID);
         isWarning = false;
       }
-      if((whyNotFastClonable & FileBlock::InitialEventsSkipped) != 0) {
+      if ((whyNotFastClonable & FileBlock::InitialEventsSkipped) != 0) {
         message << "initial events, lumis or runs were skipped.\n";
         whyNotFastClonable &= ~(FileBlock::InitialEventsSkipped);
         isWarning = false;
       }
-      if((whyNotFastClonable & FileBlock::DuplicateEventsRemoved) != 0) {
+      if ((whyNotFastClonable & FileBlock::DuplicateEventsRemoved) != 0) {
         message << "some events were skipped because of duplicate checking.\n";
         whyNotFastClonable &= ~(FileBlock::DuplicateEventsRemoved);
       }
-      if((whyNotFastClonable & FileBlock::MaxEventsTooSmall) != 0) {
+      if ((whyNotFastClonable & FileBlock::MaxEventsTooSmall) != 0) {
         message << "some events were not copied because of maxEvents limit.\n";
         whyNotFastClonable &= ~(FileBlock::MaxEventsTooSmall);
         isWarning = false;
       }
-      if((whyNotFastClonable & FileBlock::MaxLumisTooSmall) != 0) {
+      if ((whyNotFastClonable & FileBlock::MaxLumisTooSmall) != 0) {
         message << "some events were not copied because of maxLumis limit.\n";
         whyNotFastClonable &= ~(FileBlock::MaxLumisTooSmall);
         isWarning = false;
       }
-      if((whyNotFastClonable & FileBlock::ParallelProcesses) != 0) {
+      if ((whyNotFastClonable & FileBlock::ParallelProcesses) != 0) {
         message << "parallel processing was specified.\n";
         whyNotFastClonable &= ~(FileBlock::ParallelProcesses);
         isWarning = false;
       }
-      if((whyNotFastClonable & FileBlock::EventSelectionUsed) != 0) {
+      if ((whyNotFastClonable & FileBlock::EventSelectionUsed) != 0) {
         message << "an EventSelector was specified.\n";
         whyNotFastClonable &= ~(FileBlock::EventSelectionUsed);
         isWarning = false;
       }
-      if((whyNotFastClonable & FileBlock::OutputMaxEventsTooSmall) != 0) {
+      if ((whyNotFastClonable & FileBlock::OutputMaxEventsTooSmall) != 0) {
         message << "some events were not copied because of maxEvents output limit.\n";
         whyNotFastClonable &= ~(FileBlock::OutputMaxEventsTooSmall);
         isWarning = false;
       }
-      if((whyNotFastClonable & FileBlock::SplitLevelMismatch) != 0) {
+      if ((whyNotFastClonable & FileBlock::SplitLevelMismatch) != 0) {
         message << "the split level or basket size of a branch or branches was modified.\n";
         whyNotFastClonable &= ~(FileBlock::SplitLevelMismatch);
       }
-      if((whyNotFastClonable & FileBlock::BranchMismatch) != 0) {
+      if ((whyNotFastClonable & FileBlock::BranchMismatch) != 0) {
         message << "The format of a data product has changed.\n";
         whyNotFastClonable &= ~(FileBlock::BranchMismatch);
       }
@@ -299,25 +299,23 @@ namespace edm {
         LogInfo("FastCloningDisabled") << message.str();
       }
     }
-  }
+  }  // namespace
 
   void RootOutputFile::beginInputFile(FileBlock const& fb, int remainingEvents) {
-
     // Reset per input file information
     whyNotFastClonable_ = om_->whyNotFastClonable();
     canFastCloneAux_ = false;
 
-    if(fb.tree() != nullptr) {
-
+    if (fb.tree() != nullptr) {
       whyNotFastClonable_ |= fb.whyNotFastClonable();
 
-      if(remainingEvents >= 0 && remainingEvents < fb.tree()->GetEntries()) {
+      if (remainingEvents >= 0 && remainingEvents < fb.tree()->GetEntries()) {
         whyNotFastClonable_ |= FileBlock::OutputMaxEventsTooSmall;
       }
 
       bool match = eventTree_.checkSplitLevelsAndBasketSizes(fb.tree());
-      if(!match) {
-        if(om_->overrideInputFileSplitLevels()) {
+      if (!match) {
+        if (om_->overrideInputFileSplitLevels()) {
           // We may be fast copying.  We must disable fast copying if the split levels
           // or basket sizes do not match.
           whyNotFastClonable_ |= FileBlock::SplitLevelMismatch;
@@ -327,17 +325,17 @@ namespace edm {
           // have different split levels or basket sizes in a subsequent input file.
           // If the mismatch is in the first file, there is a bug somewhere, so we assert.
           assert(om_->inputFileCount() > 1);
-          throw Exception(errors::MismatchedInputFiles, "RootOutputFile::beginInputFile()") <<
-            "Merge failure because input file " << file_ << " has different ROOT split levels or basket sizes\n" <<
-            "than previous files.  To allow merging in splite of this, use the configuration parameter\n" <<
-            "overrideInputFileSplitLevels=cms.untracked.bool(True)\n" <<
-            "in every PoolOutputModule.\n";
+          throw Exception(errors::MismatchedInputFiles, "RootOutputFile::beginInputFile()")
+              << "Merge failure because input file " << file_ << " has different ROOT split levels or basket sizes\n"
+              << "than previous files.  To allow merging in splite of this, use the configuration parameter\n"
+              << "overrideInputFileSplitLevels=cms.untracked.bool(True)\n"
+              << "in every PoolOutputModule.\n";
         }
       }
 
       // Since this check can be time consuming, we do it only if we would otherwise fast clone.
-      if(whyNotFastClonable_ == FileBlock::CanFastClone) {
-        if(!eventTree_.checkIfFastClonable(fb.tree())) {
+      if (whyNotFastClonable_ == FileBlock::CanFastClone) {
+        if (!eventTree_.checkIfFastClonable(fb.tree())) {
           whyNotFastClonable_ |= FileBlock::BranchMismatch;
         }
       }
@@ -355,7 +353,7 @@ namespace edm {
       // This has never been enforced, and, withthe EDAlias feature, it may no longer
       // work by accident.
       // So, for now, we do not enable fast cloning of the non-product branches.
-/*
+      /*
       Service<ConstProductRegistry> reg;
       canFastCloneAux_ = (whyNotFastClonable_ == FileBlock::CanFastClone) &&
                           fb.fileFormatVersion().noMetaDataTrees() &&
@@ -374,10 +372,11 @@ namespace edm {
       whyNotFastClonable_ |= FileBlock::NoRootInputSource;
     }
 
-    eventTree_.maybeFastCloneTree(whyNotFastClonable_ == FileBlock::CanFastClone, canFastCloneAux_, fb.tree(), om_->basketOrder());
+    eventTree_.maybeFastCloneTree(
+        whyNotFastClonable_ == FileBlock::CanFastClone, canFastCloneAux_, fb.tree(), om_->basketOrder());
 
     // Possibly issue warning or informational message if we haven't fast cloned.
-    if(fb.tree() != nullptr && whyNotFastClonable_ != FileBlock::CanFastClone) {
+    if (fb.tree() != nullptr && whyNotFastClonable_ != FileBlock::CanFastClone) {
       maybeIssueWarning(whyNotFastClonable_, fb.fileName(), file_);
     }
   }
@@ -390,8 +389,8 @@ namespace edm {
 
   bool RootOutputFile::shouldWeCloseFile() const {
     unsigned int const oneK = 1024;
-    Long64_t size = filePtr_->GetSize()/oneK;
-    return(size >= om_->maxFileSize());
+    Long64_t size = filePtr_->GetSize() / oneK;
+    return (size >= om_->maxFileSize());
   }
 
   void RootOutputFile::writeOne(EventForOutput const& e) {
@@ -419,10 +418,11 @@ namespace edm {
     fillBranches(InEvent, e, pEventEntryInfoVector_, provRetriever);
 
     // Add the dataType to the job report if it hasn't already been done
-    if(!dataTypeReported_) {
+    if (!dataTypeReported_) {
       Service<JobReport> reportSvc;
       std::string dataType("MC");
-      if(pEventAux_->isRealData())  dataType = "Data";
+      if (pEventAux_->isRealData())
+        dataType = "Data";
       reportSvc->reportDataType(reportToken_, dataType);
       dataTypeReported_ = true;
     }
@@ -432,7 +432,8 @@ namespace edm {
     // Store the reduced ID in the IndexIntoFile
     ProcessHistoryID reducedPHID = processHistoryRegistry_.reducedProcessHistoryID(e.processHistoryID());
     // Add event to index
-    indexIntoFile_.addEntry(reducedPHID, pEventAux_->run(), pEventAux_->luminosityBlock(), pEventAux_->event(), eventEntryNumber_);
+    indexIntoFile_.addEntry(
+        reducedPHID, pEventAux_->run(), pEventAux_->luminosityBlock(), pEventAux_->event(), eventEntryNumber_);
     ++eventEntryNumber_;
 
     // Report event written
@@ -455,10 +456,10 @@ namespace edm {
     indexIntoFile_.addEntry(reducedPHID, lumiAux_.run(), lumiAux_.luminosityBlock(), 0U, lumiEntryNumber_);
     ++lumiEntryNumber_;
     fillBranches(InLumi, lb);
-    lumiTree_.optimizeBaskets(10ULL*1024*1024);
+    lumiTree_.optimizeBaskets(10ULL * 1024 * 1024);
 
     Service<JobReport> reportSvc;
-    reportSvc->reportLumiSection(reportToken_, lb.id().run(), lb.id().luminosityBlock(),nEventsInLumi_);
+    reportSvc->reportLumiSection(reportToken_, lb.id().run(), lb.id().luminosityBlock(), nEventsInLumi_);
     nEventsInLumi_ = 0;
   }
 
@@ -477,7 +478,7 @@ namespace edm {
     r.mergeableRunProductMetadata()->addEntryToStoredMetadata(storedMergeableRunProductMetadata_);
     ++runEntryNumber_;
     fillBranches(InRun, r);
-    runTree_.optimizeBaskets(10ULL*1024*1024);
+    runTree_.optimizeBaskets(10ULL * 1024 * 1024);
 
     Service<JobReport> reportSvc;
     reportSvc->reportRunNumber(reportToken_, r.run());
@@ -486,19 +487,17 @@ namespace edm {
   void RootOutputFile::writeParentageRegistry() {
     Parentage const* desc(nullptr);
 
-    if(!parentageTree_->Branch(poolNames::parentageBranchName().c_str(),
-                                        &desc, om_->basketSize(), 0))
-      throw Exception(errors::FatalRootError)
-        << "Failed to create a branch for Parentages in the output file";
+    if (!parentageTree_->Branch(poolNames::parentageBranchName().c_str(), &desc, om_->basketSize(), 0))
+      throw Exception(errors::FatalRootError) << "Failed to create a branch for Parentages in the output file";
 
     ParentageRegistry& ptReg = *ParentageRegistry::instance();
 
     std::vector<ParentageID> orderedIDs(parentageIDs_.size());
-    for(auto const& parentageID : parentageIDs_) {
+    for (auto const& parentageID : parentageIDs_) {
       orderedIDs[parentageID.second] = parentageID.first;
     }
     //now put them into the TTree in the correct order
-    for(auto const& orderedID : orderedIDs) {
+    for (auto const& orderedID : orderedIDs) {
       desc = ptReg.getMapped(orderedID);
       //NOTE: some old format files have missing Parentage info
       // so a null value of desc can't be fatal.
@@ -510,7 +509,8 @@ namespace edm {
   void RootOutputFile::writeFileFormatVersion() {
     FileFormatVersion fileFormatVersion(getFileFormatVersion());
     FileFormatVersion* pFileFmtVsn = &fileFormatVersion;
-    TBranch* b = metaDataTree_->Branch(poolNames::fileFormatVersionBranchName().c_str(), &pFileFmtVsn, om_->basketSize(), 0);
+    TBranch* b =
+        metaDataTree_->Branch(poolNames::fileFormatVersionBranchName().c_str(), &pFileFmtVsn, om_->basketSize(), 0);
     assert(b);
     b->Fill();
   }
@@ -542,7 +542,8 @@ namespace edm {
   void RootOutputFile::writeStoredMergeableRunProductMetadata() {
     storedMergeableRunProductMetadata_.optimizeBeforeWrite();
     StoredMergeableRunProductMetadata* ptr = &storedMergeableRunProductMetadata_;
-    TBranch* b = metaDataTree_->Branch(poolNames::mergeableRunProductMetadataBranchName().c_str(), &ptr, om_->basketSize(), 0);
+    TBranch* b =
+        metaDataTree_->Branch(poolNames::mergeableRunProductMetadataBranchName().c_str(), &ptr, om_->basketSize(), 0);
     assert(b);
     b->Fill();
   }
@@ -560,7 +561,8 @@ namespace edm {
 
   void RootOutputFile::writeThinnedAssociationsHelper() {
     ThinnedAssociationsHelper const* p = om_->thinnedAssociationsHelper();
-    TBranch* b = metaDataTree_->Branch(poolNames::thinnedAssociationsHelperBranchName().c_str(), &p, om_->basketSize(), 0);
+    TBranch* b =
+        metaDataTree_->Branch(poolNames::thinnedAssociationsHelperBranchName().c_str(), &p, om_->basketSize(), 0);
     assert(b);
     b->Fill();
   }
@@ -574,17 +576,17 @@ namespace edm {
     typedef ProductRegistry::ProductList ProductList;
     Service<ConstProductRegistry> reg;
     ProductRegistry pReg(reg->productList());
-    ProductList& pList  = const_cast<ProductList &>(pReg.productList());
-    for(auto const& prod : pList) {
-      if(prod.second.branchID() != prod.second.originalBranchID()) {
-        if(branchesWithStoredHistory_.find(prod.second.branchID()) != branchesWithStoredHistory_.end()) {
+    ProductList& pList = const_cast<ProductList&>(pReg.productList());
+    for (auto const& prod : pList) {
+      if (prod.second.branchID() != prod.second.originalBranchID()) {
+        if (branchesWithStoredHistory_.find(prod.second.branchID()) != branchesWithStoredHistory_.end()) {
           branchesWithStoredHistory_.insert(prod.second.originalBranchID());
         }
       }
     }
     std::set<BranchID>::iterator end = branchesWithStoredHistory_.end();
-    for(ProductList::iterator it = pList.begin(); it != pList.end();) {
-      if(branchesWithStoredHistory_.find(it->second.branchID()) == end) {
+    for (ProductList::iterator it = pList.begin(); it != pList.end();) {
+      if (branchesWithStoredHistory_.find(it->second.branchID()) == end) {
         // avoid invalidating iterator on deletion
         ProductList::iterator itCopy = it;
         ++it;
@@ -603,7 +605,8 @@ namespace edm {
   void RootOutputFile::writeProductDependencies() {
     BranchChildren& pDeps = const_cast<BranchChildren&>(om_->branchChildren());
     BranchChildren* ppDeps = &pDeps;
-    TBranch* b = metaDataTree_->Branch(poolNames::productDependenciesBranchName().c_str(), &ppDeps, om_->basketSize(), 0);
+    TBranch* b =
+        metaDataTree_->Branch(poolNames::productDependenciesBranchName().c_str(), &ppDeps, om_->basketSize(), 0);
     assert(b);
     b->Fill();
   }
@@ -618,7 +621,7 @@ namespace edm {
     // Create branch aliases for all the branches in the
     // events/lumis/runs trees. The loop is over all types of data
     // products.
-    for(int i = InEvent; i < NumBranchTypes; ++i) {
+    for (int i = InEvent; i < NumBranchTypes; ++i) {
       BranchType branchType = static_cast<BranchType>(i);
       setBranchAliases(treePointers_[branchType]->tree(), om_->keptProducts()[branchType]);
       treePointers_[branchType]->writeTree();
@@ -627,31 +630,28 @@ namespace edm {
     // close the file -- mfp
     // Just to play it safe, zero all pointers to objects in the TFile to be closed.
     metaDataTree_ = parentageTree_ = nullptr;
-    for(auto& treePointer : treePointers_) {
+    for (auto& treePointer : treePointers_) {
       treePointer->close();
       treePointer = nullptr;
     }
     filePtr_->Close();
-    filePtr_ = nullptr; // propagate_const<T> has no reset() function
+    filePtr_ = nullptr;  // propagate_const<T> has no reset() function
 
     // report that file has been closed
     Service<JobReport> reportSvc;
     reportSvc->outputFileClosed(reportToken_);
-
   }
 
-  void
-  RootOutputFile::setBranchAliases(TTree* tree, SelectedProducts const& branches) const {
-    if(tree && tree->GetNbranches() != 0) {
-      for(auto const& selection : branches) {
+  void RootOutputFile::setBranchAliases(TTree* tree, SelectedProducts const& branches) const {
+    if (tree && tree->GetNbranches() != 0) {
+      for (auto const& selection : branches) {
         BranchDescription const& pd = *selection.first;
         std::string const& full = pd.branchName() + "obj";
-        if(pd.branchAliases().empty()) {
-          std::string const& alias =
-              (pd.productInstanceName().empty() ? pd.moduleLabel() : pd.productInstanceName());
+        if (pd.branchAliases().empty()) {
+          std::string const& alias = (pd.productInstanceName().empty() ? pd.moduleLabel() : pd.productInstanceName());
           tree->SetAlias(alias.c_str(), full.c_str());
         } else {
-          for(auto const& alias : pd.branchAliases()) {
+          for (auto const& alias : pd.branchAliases()) {
             tree->SetAlias(alias.c_str(), full.c_str());
           }
         }
@@ -659,22 +659,23 @@ namespace edm {
     }
   }
 
-  void
-  RootOutputFile::insertAncestors(ProductProvenance const& iGetParents,
-                                  ProductProvenanceRetriever const* iMapper,
-                                  bool produced,
-                                  std::set<BranchID> const &iProducedIDs,
-                                  std::set<StoredProductProvenance>& oToFill) {
+  void RootOutputFile::insertAncestors(ProductProvenance const& iGetParents,
+                                       ProductProvenanceRetriever const* iMapper,
+                                       bool produced,
+                                       std::set<BranchID> const& iProducedIDs,
+                                       std::set<StoredProductProvenance>& oToFill) {
     assert(om_->dropMetaData() != PoolOutputModule::DropAll);
     assert(produced || om_->dropMetaData() != PoolOutputModule::DropPrior);
-    if(om_->dropMetaData() == PoolOutputModule::DropDroppedPrior && !produced) return;
+    if (om_->dropMetaData() == PoolOutputModule::DropDroppedPrior && !produced)
+      return;
     std::vector<BranchID> const& parentIDs = iGetParents.parentage().parents();
-    for(auto const& parentID : parentIDs) {
+    for (auto const& parentID : parentIDs) {
       branchesWithStoredHistory_.insert(parentID);
       ProductProvenance const* info = iMapper->branchIDToProvenance(parentID);
-      if(info) {
-        if(om_->dropMetaData() == PoolOutputModule::DropNone || (iProducedIDs.end() != iProducedIDs.find(info->branchID()) ) ) {
-          if(insertProductProvenance(*info,oToFill) ) {
+      if (info) {
+        if (om_->dropMetaData() == PoolOutputModule::DropNone ||
+            (iProducedIDs.end() != iProducedIDs.find(info->branchID()))) {
+          if (insertProductProvenance(*info, oToFill)) {
             //haven't seen this one yet
             insertAncestors(*info, iMapper, produced, iProducedIDs, oToFill);
           }
@@ -683,17 +684,16 @@ namespace edm {
     }
   }
 
-  void RootOutputFile::fillBranches(
-                BranchType const& branchType,
-                OccurrenceForOutput const& occurrence,
-                StoredProductProvenanceVector* productProvenanceVecPtr,
-                ProductProvenanceRetriever const* provRetriever) {
-
+  void RootOutputFile::fillBranches(BranchType const& branchType,
+                                    OccurrenceForOutput const& occurrence,
+                                    StoredProductProvenanceVector* productProvenanceVecPtr,
+                                    ProductProvenanceRetriever const* provRetriever) {
     std::vector<std::unique_ptr<WrapperBase> > dummies;
 
     OutputItemList const& items = om_->selectedOutputItemList()[branchType];
 
-    bool const doProvenance = (productProvenanceVecPtr != nullptr) && (om_->dropMetaData() != PoolOutputModule::DropAll);
+    bool const doProvenance =
+        (productProvenanceVecPtr != nullptr) && (om_->dropMetaData() != PoolOutputModule::DropAll);
     bool const keepProvenanceForPrior = doProvenance && om_->dropMetaData() != PoolOutputModule::DropPrior;
 
     bool const fastCloning = (branchType == InEvent) && (whyNotFastClonable_ == FileBlock::CanFastClone);
@@ -704,34 +704,34 @@ namespace edm {
     // we may be storing meta data for only those products
     // We do this only for event products.
     std::set<BranchID> producedBranches;
-    if(doProvenance && branchType == InEvent && om_->dropMetaData() != PoolOutputModule::DropNone) {
+    if (doProvenance && branchType == InEvent && om_->dropMetaData() != PoolOutputModule::DropNone) {
       Service<ConstProductRegistry> preg;
-      for(auto bd : preg->allBranchDescriptions()) {
-        if(bd->produced() && bd->branchType() == InEvent) {
+      for (auto bd : preg->allBranchDescriptions()) {
+        if (bd->produced() && bd->branchType() == InEvent) {
           producedBranches.insert(bd->branchID());
         }
       }
     }
 
     // Loop over EDProduct branches, possibly fill the provenance, and write the branch.
-    for(auto const& item : items) {
-
+    for (auto const& item : items) {
       BranchID const& id = item.branchDescription_->branchID();
       branchesWithStoredHistory_.insert(id);
 
       bool produced = item.branchDescription_->produced();
-      bool getProd = (produced || !fastCloning || treePointers_[branchType]->uncloned(item.branchDescription_->branchName()));
+      bool getProd =
+          (produced || !fastCloning || treePointers_[branchType]->uncloned(item.branchDescription_->branchName()));
       bool keepProvenance = doProvenance && (produced || keepProvenanceForPrior);
 
       WrapperBase const* product = nullptr;
       ProductProvenance const* productProvenance = nullptr;
-      if(getProd) {
+      if (getProd) {
         BasicHandle result = occurrence.getByToken(item.token_, item.branchDescription_->unwrappedTypeID());
         product = result.wrapper();
-        if(result.isValid() && keepProvenance) {
+        if (result.isValid() && keepProvenance) {
           productProvenance = result.provenance()->productProvenance();
         }
-        if(product == nullptr) {
+        if (product == nullptr) {
           // No product with this ID is in the event.
           // Add a null product.
           TClass* cp = item.branchDescription_->wrappedType().getClass();
@@ -747,33 +747,36 @@ namespace edm {
       if (keepProvenance && productProvenance == nullptr) {
         productProvenance = provRetriever->branchIDToProvenance(item.branchDescription_->originalBranchID());
       }
-      if(productProvenance) {
-        insertProductProvenance(*productProvenance,provenanceToKeep);
+      if (productProvenance) {
+        insertProductProvenance(*productProvenance, provenanceToKeep);
         insertAncestors(*productProvenance, provRetriever, produced, producedBranches, provenanceToKeep);
       }
     }
 
-    if(doProvenance) productProvenanceVecPtr->assign(provenanceToKeep.begin(), provenanceToKeep.end());
+    if (doProvenance)
+      productProvenanceVecPtr->assign(provenanceToKeep.begin(), provenanceToKeep.end());
     treePointers_[branchType]->fillTree();
-    if(doProvenance) productProvenanceVecPtr->clear();
+    if (doProvenance)
+      productProvenanceVecPtr->clear();
   }
 
-  bool
-  RootOutputFile::insertProductProvenance(const edm::ProductProvenance& iProv,
-                                          std::set<edm::StoredProductProvenance>& oToInsert) {
+  bool RootOutputFile::insertProductProvenance(const edm::ProductProvenance& iProv,
+                                               std::set<edm::StoredProductProvenance>& oToInsert) {
     StoredProductProvenance toStore;
     toStore.branchID_ = iProv.branchID().id();
     std::set<edm::StoredProductProvenance>::iterator itFound = oToInsert.find(toStore);
-    if(itFound == oToInsert.end()) {
+    if (itFound == oToInsert.end()) {
       //get the index to the ParentageID or insert a new value if not already present
-      std::pair<std::map<edm::ParentageID,unsigned int>::iterator,bool> i = parentageIDs_.insert(std::make_pair(iProv.parentageID(),static_cast<unsigned int>(parentageIDs_.size())));
+      std::pair<std::map<edm::ParentageID, unsigned int>::iterator, bool> i =
+          parentageIDs_.insert(std::make_pair(iProv.parentageID(), static_cast<unsigned int>(parentageIDs_.size())));
       toStore.parentageIDIndex_ = i.first->second;
-      if(toStore.parentageIDIndex_ >= parentageIDs_.size()) {
+      if (toStore.parentageIDIndex_ >= parentageIDs_.size()) {
         throw edm::Exception(errors::LogicError)
-          << "RootOutputFile::insertProductProvenance\n"
-          << "The parentage ID index value " << toStore.parentageIDIndex_ << " is out of bounds.  The maximum value is currently " << parentageIDs_.size()-1 << ".\n"
-          << "This should never happen.\n"
-          << "Please report this to the framework hypernews forum 'hn-cms-edmFramework@cern.ch'.\n";
+            << "RootOutputFile::insertProductProvenance\n"
+            << "The parentage ID index value " << toStore.parentageIDIndex_
+            << " is out of bounds.  The maximum value is currently " << parentageIDs_.size() - 1 << ".\n"
+            << "This should never happen.\n"
+            << "Please report this to the framework hypernews forum 'hn-cms-edmFramework@cern.ch'.\n";
       }
 
       oToInsert.insert(toStore);
@@ -781,4 +784,4 @@ namespace edm {
     }
     return false;
   }
-}
+}  // namespace edm
diff --git a/IOPool/Output/src/RootOutputFile.h b/IOPool/Output/src/RootOutputFile.h
index 00326421c6339..0e912bd5e45fa 100644
--- a/IOPool/Output/src/RootOutputFile.h
+++ b/IOPool/Output/src/RootOutputFile.h
@@ -47,7 +47,8 @@ namespace edm {
     typedef PoolOutputModule::OutputItem OutputItem;
     typedef PoolOutputModule::OutputItemList OutputItemList;
     typedef std::array<edm::propagate_const<RootOutputTree*>, NumBranchTypes> RootOutputTreePtrArray;
-    explicit RootOutputFile(PoolOutputModule* om, std::string const& fileName,
+    explicit RootOutputFile(PoolOutputModule* om,
+                            std::string const& fileName,
                             std::string const& logicalFileName,
                             std::vector<std::string> const& processesWithSelectedMergeableRunProducts);
     ~RootOutputFile() {}
@@ -72,10 +73,9 @@ namespace edm {
     void respondToCloseInputFile(FileBlock const& fb);
     bool shouldWeCloseFile() const;
 
-    std::string const& fileName() const {return file_;}
+    std::string const& fileName() const { return file_; }
 
   private:
-
     //-------------------------------
     // Local types
     //
@@ -90,19 +90,20 @@ namespace edm {
                       StoredProductProvenanceVector* productProvenanceVecPtr = nullptr,
                       ProductProvenanceRetriever const* provRetriever = nullptr);
 
-     void insertAncestors(ProductProvenance const& iGetParents,
-                          ProductProvenanceRetriever const* iMapper,
-                          bool produced,
-                          std::set<BranchID> const& producedBranches,
-                          std::set<StoredProductProvenance>& oToFill);
+    void insertAncestors(ProductProvenance const& iGetParents,
+                         ProductProvenanceRetriever const* iMapper,
+                         bool produced,
+                         std::set<BranchID> const& producedBranches,
+                         std::set<StoredProductProvenance>& oToFill);
 
-    bool insertProductProvenance(const ProductProvenance&,
-                                 std::set<StoredProductProvenance>& oToInsert);
+    bool insertProductProvenance(const ProductProvenance&, std::set<StoredProductProvenance>& oToInsert);
 
-    std::shared_ptr<TFile const> filePtr() const {return get_underlying_safe(filePtr_);}
-    std::shared_ptr<TFile>& filePtr() {return get_underlying_safe(filePtr_);}
-    StoredProductProvenanceVector const* pEventEntryInfoVector() const {return get_underlying_safe(pEventEntryInfoVector_);}
-    StoredProductProvenanceVector*& pEventEntryInfoVector() {return get_underlying_safe(pEventEntryInfoVector_);}
+    std::shared_ptr<TFile const> filePtr() const { return get_underlying_safe(filePtr_); }
+    std::shared_ptr<TFile>& filePtr() { return get_underlying_safe(filePtr_); }
+    StoredProductProvenanceVector const* pEventEntryInfoVector() const {
+      return get_underlying_safe(pEventEntryInfoVector_);
+    }
+    StoredProductProvenanceVector*& pEventEntryInfoVector() { return get_underlying_safe(pEventEntryInfoVector_); }
 
     //-------------------------------
     // Member data
@@ -124,26 +125,26 @@ namespace edm {
     edm::propagate_const<TTree*> metaDataTree_;
     edm::propagate_const<TTree*> parameterSetsTree_;
     edm::propagate_const<TTree*> parentageTree_;
-    LuminosityBlockAuxiliary  lumiAux_;
-    RunAuxiliary              runAux_;
-    EventAuxiliary const*           pEventAux_;
+    LuminosityBlockAuxiliary lumiAux_;
+    RunAuxiliary runAux_;
+    EventAuxiliary const* pEventAux_;
     LuminosityBlockAuxiliary const* pLumiAux_;
-    RunAuxiliary const*             pRunAux_;
+    RunAuxiliary const* pRunAux_;
     StoredProductProvenanceVector eventEntryInfoVector_;
     edm::propagate_const<StoredProductProvenanceVector*> pEventEntryInfoVector_;
-    BranchListIndexes const*        pBranchListIndexes_;
-    EventSelectionIDVector const*   pEventSelectionIDs_;
+    BranchListIndexes const* pBranchListIndexes_;
+    EventSelectionIDVector const* pEventSelectionIDs_;
     RootOutputTree eventTree_;
     RootOutputTree lumiTree_;
     RootOutputTree runTree_;
     RootOutputTreePtrArray treePointers_;
     bool dataTypeReported_;
     ProcessHistoryRegistry processHistoryRegistry_;
-    std::map<ParentageID,unsigned int> parentageIDs_;
+    std::map<ParentageID, unsigned int> parentageIDs_;
     std::set<BranchID> branchesWithStoredHistory_;
     edm::propagate_const<TClass*> wrapperBaseTClass_;
   };
 
-}
+}  // namespace edm
 
 #endif
diff --git a/IOPool/Output/src/RootOutputTree.cc b/IOPool/Output/src/RootOutputTree.cc
index df52904371e6d..f53550cc34511 100644
--- a/IOPool/Output/src/RootOutputTree.cc
+++ b/IOPool/Output/src/RootOutputTree.cc
@@ -26,7 +26,7 @@
 
 namespace edm {
 
-    /**
+  /**
      * Currently, ROOT doesn't use any latency-hiding optimizations for
      * fast-cloning.  This causes a significant slowdown when doing fast-cloning
      * over a high-latency network (30ms latency makes this multiple factors slower).
@@ -38,74 +38,79 @@ namespace edm {
      * for cloning.  When the object is destroyed, the new file and tree are cleaned up.
      *
      */
-    class DuplicateTreeSentry
-    {
-    public:
-        DuplicateTreeSentry(TTree * tree)
-          : tree_(tree)
-        {
-            dup();
+  class DuplicateTreeSentry {
+  public:
+    DuplicateTreeSentry(TTree* tree) : tree_(tree) { dup(); }
+
+    TTree* tree() const { return mytree_ ? mytree_.get() : tree_; }
+
+  private:
+    DuplicateTreeSentry(DuplicateTreeSentry const&) = delete;  // Disallow copying and moving
+    DuplicateTreeSentry& operator=(DuplicateTreeSentry const&) = delete;
+    struct CloseBeforeDelete {
+      void operator()(TFile* iFile) const {
+        if (iFile) {
+          iFile->Close();
         }
+        delete iFile;
+      }
+    };
 
-        TTree *tree() const {return mytree_ ? mytree_.get() : tree_;}
-
-    private:
-        DuplicateTreeSentry(DuplicateTreeSentry const&) = delete; // Disallow copying and moving
-        DuplicateTreeSentry& operator=(DuplicateTreeSentry const&) = delete;
-        struct CloseBeforeDelete { void operator()(TFile* iFile) const { if( iFile) { iFile->Close(); } delete iFile; } };
-
-        void dup()
-        {
-            edm::Service<edm::SiteLocalConfig> pSLC;
-            if (!pSLC.isAvailable()) {return;}
-            if (pSLC->sourceCacheHint() && *(pSLC->sourceCacheHint()) == "lazy-download") {return;}
-            if (!pSLC->sourceCloneCacheHint() || *(pSLC->sourceCloneCacheHint()) != "lazy-download") {return;}
-            edm::LogWarning("DuplicateTreeSentry") << "Re-opening file for fast-cloning";
-
-            TFile *file = tree_->GetCurrentFile();
-            const TUrl *url = file->GetEndpointUrl();
-            if (!url)
-            {
-                return;
-            }
-            file_.reset(TFile::Open(url->GetUrl(), "READWRAP")); // May throw an exception.
-            if (!file_)
-            {
-                return;
-            }
-            mytree_.reset(dynamic_cast<TTree*>(file_->Get(tree_->GetName())));
-            if (!mytree_) {return;}
-        }
+    void dup() {
+      edm::Service<edm::SiteLocalConfig> pSLC;
+      if (!pSLC.isAvailable()) {
+        return;
+      }
+      if (pSLC->sourceCacheHint() && *(pSLC->sourceCacheHint()) == "lazy-download") {
+        return;
+      }
+      if (!pSLC->sourceCloneCacheHint() || *(pSLC->sourceCloneCacheHint()) != "lazy-download") {
+        return;
+      }
+      edm::LogWarning("DuplicateTreeSentry") << "Re-opening file for fast-cloning";
+
+      TFile* file = tree_->GetCurrentFile();
+      const TUrl* url = file->GetEndpointUrl();
+      if (!url) {
+        return;
+      }
+      file_.reset(TFile::Open(url->GetUrl(), "READWRAP"));  // May throw an exception.
+      if (!file_) {
+        return;
+      }
+      mytree_.reset(dynamic_cast<TTree*>(file_->Get(tree_->GetName())));
+      if (!mytree_) {
+        return;
+      }
+    }
 
-        /**
+    /**
          * Note this relies on the implicit delete ordering - mytree_ (if non-null)
          * must be deleted before file_.  Do not reorder the class members!
          */
-        std::unique_ptr<TFile, CloseBeforeDelete> file_;
-        TTree *tree_ = nullptr;
-        std::unique_ptr<TTree> mytree_ = nullptr;
-    };
-
-    RootOutputTree::RootOutputTree(
-                   std::shared_ptr<TFile> filePtr,
-                   BranchType const& branchType,
-                   int splitLevel,
-                   int treeMaxVirtualSize) :
-      filePtr_(filePtr),
-      tree_(makeTTree(filePtr.get(), BranchTypeToProductTreeName(branchType), splitLevel)),
-      producedBranches_(),
-      readBranches_(),
-      auxBranches_(),
-      unclonedReadBranches_(),
-      clonedReadBranchNames_(),
-      currentlyFastCloning_(),
-      fastCloneAuxBranches_(false) {
-
-    if(treeMaxVirtualSize >= 0) tree_->SetMaxVirtualSize(treeMaxVirtualSize);
+    std::unique_ptr<TFile, CloseBeforeDelete> file_;
+    TTree* tree_ = nullptr;
+    std::unique_ptr<TTree> mytree_ = nullptr;
+  };
+
+  RootOutputTree::RootOutputTree(std::shared_ptr<TFile> filePtr,
+                                 BranchType const& branchType,
+                                 int splitLevel,
+                                 int treeMaxVirtualSize)
+      : filePtr_(filePtr),
+        tree_(makeTTree(filePtr.get(), BranchTypeToProductTreeName(branchType), splitLevel)),
+        producedBranches_(),
+        readBranches_(),
+        auxBranches_(),
+        unclonedReadBranches_(),
+        clonedReadBranchNames_(),
+        currentlyFastCloning_(),
+        fastCloneAuxBranches_(false) {
+    if (treeMaxVirtualSize >= 0)
+      tree_->SetMaxVirtualSize(treeMaxVirtualSize);
   }
 
-  TTree*
-  RootOutputTree::assignTTree(TFile* filePtr, TTree* tree) {
+  TTree* RootOutputTree::assignTTree(TFile* filePtr, TTree* tree) {
     tree->SetDirectory(filePtr);
     // Turn off autosaving because it is such a memory hog and we are not using
     // this check-pointing feature anyway.
@@ -113,30 +118,27 @@ namespace edm {
     return tree;
   }
 
-  TTree*
-  RootOutputTree::makeTTree(TFile* filePtr, std::string const& name, int splitLevel) {
+  TTree* RootOutputTree::makeTTree(TFile* filePtr, std::string const& name, int splitLevel) {
     TTree* tree = new TTree(name.c_str(), "", splitLevel);
-    if(!tree) throw edm::Exception(errors::FatalRootError)
-      << "Failed to create the tree: " << name << "\n";
-    if(tree->IsZombie())
-      throw edm::Exception(errors::FatalRootError)
-        << "Tree: " << name << " is a zombie." << "\n";
+    if (!tree)
+      throw edm::Exception(errors::FatalRootError) << "Failed to create the tree: " << name << "\n";
+    if (tree->IsZombie())
+      throw edm::Exception(errors::FatalRootError) << "Tree: " << name << " is a zombie."
+                                                   << "\n";
 
     return assignTTree(filePtr, tree);
   }
 
-  bool
-  RootOutputTree::checkSplitLevelsAndBasketSizes(TTree* inputTree) const {
-
+  bool RootOutputTree::checkSplitLevelsAndBasketSizes(TTree* inputTree) const {
     assert(inputTree != nullptr);
 
     // Do the split level and basket size match in the input and output?
-    for(auto const& outputBranch : readBranches_) {
-      if(outputBranch != nullptr) {
+    for (auto const& outputBranch : readBranches_) {
+      if (outputBranch != nullptr) {
         TBranch* inputBranch = inputTree->GetBranch(outputBranch->GetName());
 
-        if(inputBranch != nullptr) {
-          if(inputBranch->GetSplitLevel() != outputBranch->GetSplitLevel() ||
+        if (inputBranch != nullptr) {
+          if (inputBranch->GetSplitLevel() != outputBranch->GetSplitLevel() ||
               inputBranch->GetBasketSize() != outputBranch->GetBasketSize()) {
             return false;
           }
@@ -148,47 +150,47 @@ namespace edm {
 
   namespace {
     bool checkMatchingBranches(TBranchElement* inputBranch, TBranchElement* outputBranch) {
-      if(inputBranch->GetStreamerType() != outputBranch->GetStreamerType()) {
+      if (inputBranch->GetStreamerType() != outputBranch->GetStreamerType()) {
         return false;
       }
       TObjArray* inputArray = inputBranch->GetListOfBranches();
       TObjArray* outputArray = outputBranch->GetListOfBranches();
 
-      if(outputArray->GetSize() < inputArray->GetSize()) {
+      if (outputArray->GetSize() < inputArray->GetSize()) {
         return false;
       }
       TIter iter(outputArray);
       TObject* obj = nullptr;
-      while((obj = iter.Next()) != nullptr) {
+      while ((obj = iter.Next()) != nullptr) {
         TBranchElement* outBranch = dynamic_cast<TBranchElement*>(obj);
-        if(outBranch) {
+        if (outBranch) {
           TBranchElement* inBranch = dynamic_cast<TBranchElement*>(inputArray->FindObject(outBranch->GetName()));
-          if(!inBranch) {
+          if (!inBranch) {
             return false;
           }
-          if(!checkMatchingBranches(inBranch, outBranch)) {
+          if (!checkMatchingBranches(inBranch, outBranch)) {
             return false;
           }
         }
       }
       return true;
     }
-  }
+  }  // namespace
 
   bool RootOutputTree::checkIfFastClonable(TTree* inputTree) const {
-
-    if(inputTree == nullptr) return false;
+    if (inputTree == nullptr)
+      return false;
 
     // Do the sub-branches match in the input and output. Extra sub-branches in the input are OK for fast cloning, but not in the output.
-    for(auto const& outputBr : readBranches_) {
+    for (auto const& outputBr : readBranches_) {
       TBranchElement* outputBranch = dynamic_cast<TBranchElement*>(outputBr);
-      if(outputBranch != nullptr) {
+      if (outputBranch != nullptr) {
         TBranchElement* inputBranch = dynamic_cast<TBranchElement*>(inputTree->GetBranch(outputBranch->GetName()));
-        if(inputBranch != nullptr) {
+        if (inputBranch != nullptr) {
           // We have a matching top level branch. Do the recursive check on subbranches.
-          if(!checkMatchingBranches(inputBranch, outputBranch)) {
-            LogInfo("FastCloning")
-              << "Fast Cloning disabled because a data member has been added to split branch: " << inputBranch->GetName() << "\n.";
+          if (!checkMatchingBranches(inputBranch, outputBranch)) {
+            LogInfo("FastCloning") << "Fast Cloning disabled because a data member has been added to split branch: "
+                                   << inputBranch->GetName() << "\n.";
             return false;
           }
         }
@@ -198,26 +200,25 @@ namespace edm {
   }
 
   bool RootOutputTree::checkEntriesInReadBranches(Long64_t expectedNumberOfEntries) const {
-    for(auto const& readBranch : readBranches_) {
-      if(readBranch->GetEntries() != expectedNumberOfEntries) {
+    for (auto const& readBranch : readBranches_) {
+      if (readBranch->GetEntries() != expectedNumberOfEntries) {
         return false;
       }
     }
     return true;
   }
 
-  void
-  RootOutputTree::fastCloneTTree(TTree* in, std::string const& option) {
-    if(in->GetEntries() != 0) {
+  void RootOutputTree::fastCloneTTree(TTree* in, std::string const& option) {
+    if (in->GetEntries() != 0) {
       TObjArray* branches = tree_->GetListOfBranches();
       // If any products were produced (not just event products), the EventAuxiliary will be modified.
       // In that case, don't fast copy auxiliary branches. Remove them, and add back after fast copying.
-      std::map<Int_t, TBranch *> auxIndexes;
+      std::map<Int_t, TBranch*> auxIndexes;
       bool mustRemoveSomeAuxs = false;
-      if(!fastCloneAuxBranches_) {
-        for(auto const& auxBranch : auxBranches_) {
+      if (!fastCloneAuxBranches_) {
+        for (auto const& auxBranch : auxBranches_) {
           int auxIndex = branches->IndexOf(auxBranch);
-          assert (auxIndex >= 0);
+          assert(auxIndex >= 0);
           auxIndexes.insert(std::make_pair(auxIndex, auxBranch));
           branches->RemoveAt(auxIndex);
         }
@@ -225,43 +226,43 @@ namespace edm {
       }
 
       //Deal with any aux branches which can never be cloned
-      for(auto const& auxBranch : unclonedAuxBranches_) {
+      for (auto const& auxBranch : unclonedAuxBranches_) {
         int auxIndex = branches->IndexOf(auxBranch);
-        assert (auxIndex >= 0);
+        assert(auxIndex >= 0);
         auxIndexes.insert(std::make_pair(auxIndex, auxBranch));
         branches->RemoveAt(auxIndex);
         mustRemoveSomeAuxs = true;
       }
 
-      if(mustRemoveSomeAuxs) {
+      if (mustRemoveSomeAuxs) {
         branches->Compress();
       }
 
       DuplicateTreeSentry dupTree(in);
-      TTreeCloner cloner(dupTree.tree(), tree_, option.c_str(), TTreeCloner::kNoWarnings|TTreeCloner::kIgnoreMissingTopLevel);
+      TTreeCloner cloner(
+          dupTree.tree(), tree_, option.c_str(), TTreeCloner::kNoWarnings | TTreeCloner::kIgnoreMissingTopLevel);
 
-      if(!cloner.IsValid()) {
+      if (!cloner.IsValid()) {
         // Let's check why
         static const char* okerror = "One of the export branch";
-        if(strncmp(cloner.GetWarning(), okerror, strlen(okerror)) == 0) {
+        if (strncmp(cloner.GetWarning(), okerror, strlen(okerror)) == 0) {
           // That's fine we will handle it;
         } else {
-          throw edm::Exception(errors::FatalRootError)
-            << "invalid TTreeCloner (" << cloner.GetWarning() << ")\n";
+          throw edm::Exception(errors::FatalRootError) << "invalid TTreeCloner (" << cloner.GetWarning() << ")\n";
         }
       }
       tree_->SetEntries(tree_->GetEntries() + in->GetEntries());
       Service<RootHandlers> rootHandler;
       rootHandler->ignoreWarningsWhileDoing([&cloner] { cloner.Exec(); });
 
-      if(mustRemoveSomeAuxs) {
-        for(auto const& auxIndex : auxIndexes) {
+      if (mustRemoveSomeAuxs) {
+        for (auto const& auxIndex : auxIndexes) {
           // Add the auxiliary branches back after fast copying the rest of the tree.
           Int_t last = branches->GetLast();
-          if(last >= 0) {
-            branches->AddAtAndExpand(branches->At(last), last+1);
-            for(Int_t ind = last-1; ind >= auxIndex.first; --ind) {
-              branches->AddAt(branches->At(ind), ind+1);
+          if (last >= 0) {
+            branches->AddAtAndExpand(branches->At(last), last + 1);
+            for (Int_t ind = last - 1; ind >= auxIndex.first; --ind) {
+              branches->AddAt(branches->At(ind), ind + 1);
             };
             branches->AddAt(auxIndex.second, auxIndex.first);
           } else {
@@ -272,9 +273,8 @@ namespace edm {
     }
   }
 
-  void
-  RootOutputTree::writeTTree(TTree* tree) {
-    if(tree->GetNbranches() != 0) {
+  void RootOutputTree::writeTTree(TTree* tree) {
+    if (tree->GetNbranches() != 0) {
       // This is required when Fill is called on individual branches
       // in the TTree instead of calling Fill once for the entire TTree.
       tree->SetEntries(-1);
@@ -283,26 +283,24 @@ namespace edm {
     tree->AutoSave("FlushBaskets");
   }
 
-  void
-  RootOutputTree::fillTTree(std::vector<TBranch*> const& branches) {
+  void RootOutputTree::fillTTree(std::vector<TBranch*> const& branches) {
     for_all(branches, std::bind(&TBranch::Fill, std::placeholders::_1));
   }
 
-  void
-  RootOutputTree::writeTree() {
-    writeTTree(tree());
-  }
+  void RootOutputTree::writeTree() { writeTTree(tree()); }
 
-  void
-  RootOutputTree::maybeFastCloneTree(bool canFastClone, bool canFastCloneAux, TTree* tree, std::string const& option) {
+  void RootOutputTree::maybeFastCloneTree(bool canFastClone,
+                                          bool canFastCloneAux,
+                                          TTree* tree,
+                                          std::string const& option) {
     unclonedReadBranches_.clear();
     clonedReadBranchNames_.clear();
     currentlyFastCloning_ = canFastClone && !readBranches_.empty();
-    if(currentlyFastCloning_) {
+    if (currentlyFastCloning_) {
       fastCloneAuxBranches_ = canFastCloneAux;
       fastCloneTTree(tree, option);
-      for(auto const& branch : readBranches_) {
-        if(branch->GetEntries() == tree_->GetEntries()) {
+      for (auto const& branch : readBranches_) {
+        if (branch->GetEntries() == tree_->GetEntries()) {
           clonedReadBranchNames_.insert(std::string(branch->GetName()));
         } else {
           unclonedReadBranches_.push_back(branch);
@@ -313,36 +311,31 @@ namespace edm {
     }
   }
 
-  void
-  RootOutputTree::fillTree() {
-    if(currentlyFastCloning_) {
-      if(!fastCloneAuxBranches_)fillTTree(auxBranches_);
+  void RootOutputTree::fillTree() {
+    if (currentlyFastCloning_) {
+      if (!fastCloneAuxBranches_)
+        fillTTree(auxBranches_);
       fillTTree(unclonedAuxBranches_);
       fillTTree(producedBranches_);
       fillTTree(unclonedReadBranches_);
     } else {
       // Isolate the fill operation so that IMT doesn't grab other large tasks
       // that could lead to PoolOutputModule stalling
-      tbb::this_task_arena::isolate( [&]{ tree_->Fill(); } );
+      tbb::this_task_arena::isolate([&] { tree_->Fill(); });
     }
   }
 
-  void
-  RootOutputTree::addBranch(std::string const& branchName,
-                            std::string const& className,
-                            void const*& pProd,
-                            int splitLevel,
-                            int basketSize,
-                            bool produced) {
-      assert(splitLevel != BranchDescription::invalidSplitLevel);
-      assert(basketSize != BranchDescription::invalidBasketSize);
-      TBranch* branch = tree_->Branch(branchName.c_str(),
-                 className.c_str(),
-                 &pProd,
-                 basketSize,
-                 splitLevel);
-      assert(branch != nullptr);
-/*
+  void RootOutputTree::addBranch(std::string const& branchName,
+                                 std::string const& className,
+                                 void const*& pProd,
+                                 int splitLevel,
+                                 int basketSize,
+                                 bool produced) {
+    assert(splitLevel != BranchDescription::invalidSplitLevel);
+    assert(basketSize != BranchDescription::invalidBasketSize);
+    TBranch* branch = tree_->Branch(branchName.c_str(), className.c_str(), &pProd, basketSize, splitLevel);
+    assert(branch != nullptr);
+    /*
       if(pProd != nullptr) {
         // Delete the product that ROOT has allocated.
         WrapperBase const* edp = static_cast<WrapperBase const *>(pProd);
@@ -350,15 +343,14 @@ namespace edm {
         pProd = nullptr;
       }
 */
-      if(produced) {
-        producedBranches_.push_back(branch);
-      } else {
-        readBranches_.push_back(branch);
-      }
+    if (produced) {
+      producedBranches_.push_back(branch);
+    } else {
+      readBranches_.push_back(branch);
+    }
   }
 
-  void
-  RootOutputTree::close() {
+  void RootOutputTree::close() {
     // The TFile was just closed.
     // Just to play it safe, zero all pointers to quantities in the file.
     auxBranches_.clear();
@@ -366,7 +358,7 @@ namespace edm {
     producedBranches_.clear();
     readBranches_.clear();
     unclonedReadBranches_.clear();
-    tree_ = nullptr; // propagate_const<T> has no reset() function
-    filePtr_ = nullptr; // propagate_const<T> has no reset() function
+    tree_ = nullptr;     // propagate_const<T> has no reset() function
+    filePtr_ = nullptr;  // propagate_const<T> has no reset() function
   }
-}
+}  // namespace edm
diff --git a/IOPool/Output/src/RootOutputTree.h b/IOPool/Output/src/RootOutputTree.h
index 85dda1952e2f2..7fac5555dc513 100644
--- a/IOPool/Output/src/RootOutputTree.h
+++ b/IOPool/Output/src/RootOutputTree.h
@@ -23,33 +23,28 @@ class TBranch;
 namespace edm {
   class RootOutputTree {
   public:
-    RootOutputTree(std::shared_ptr<TFile> filePtr,
-                   BranchType const& branchType,
-                   int splitLevel,
-                   int treeMaxVirtualSize);
+    RootOutputTree(std::shared_ptr<TFile> filePtr, BranchType const& branchType, int splitLevel, int treeMaxVirtualSize);
 
     ~RootOutputTree() {}
 
-    RootOutputTree(RootOutputTree const&) = delete; // Disallow copying and moving
-    RootOutputTree& operator=(RootOutputTree const&) = delete; // Disallow copying and moving
+    RootOutputTree(RootOutputTree const&) = delete;             // Disallow copying and moving
+    RootOutputTree& operator=(RootOutputTree const&) = delete;  // Disallow copying and moving
 
     template <typename T>
-    void
-    addAuxiliary(std::string const& branchName, T const*& pAux, int bufSize, bool allowCloning=true) {
-      if(allowCloning) {
+    void addAuxiliary(std::string const& branchName, T const*& pAux, int bufSize, bool allowCloning = true) {
+      if (allowCloning) {
         auxBranches_.push_back(tree_->Branch(branchName.c_str(), &pAux, bufSize, 0));
       } else {
-        unclonedAuxBranches_.push_back(tree_->Branch(branchName.c_str(), &pAux, bufSize, 0));    
+        unclonedAuxBranches_.push_back(tree_->Branch(branchName.c_str(), &pAux, bufSize, 0));
       }
     }
 
     template <typename T>
-    void
-    addAuxiliary(std::string const& branchName, T*& pAux, int bufSize,bool allowCloning=true) {
-      if(allowCloning) {
+    void addAuxiliary(std::string const& branchName, T*& pAux, int bufSize, bool allowCloning = true) {
+      if (allowCloning) {
         auxBranches_.push_back(tree_->Branch(branchName.c_str(), &pAux, bufSize, 0));
       } else {
-        unclonedAuxBranches_.push_back(tree_->Branch(branchName.c_str(), &pAux, bufSize, 0));    
+        unclonedAuxBranches_.push_back(tree_->Branch(branchName.c_str(), &pAux, bufSize, 0));
       }
     }
 
@@ -82,41 +77,34 @@ namespace edm {
 
     void writeTree();
 
-    TTree const* tree() const {
-      return tree_.get();
-    }
+    TTree const* tree() const { return tree_.get(); }
 
-    TTree* tree() {
-      return tree_.get();
-    }
+    TTree* tree() { return tree_.get(); }
 
     void setEntries() {
-      if(tree_->GetNbranches() != 0) tree_->SetEntries(-1);
+      if (tree_->GetNbranches() != 0)
+        tree_->SetEntries(-1);
     }
 
-    bool
-    uncloned(std::string const& branchName) const {
+    bool uncloned(std::string const& branchName) const {
       return clonedReadBranchNames_.find(branchName) == clonedReadBranchNames_.end();
     }
 
     void close();
 
-    void optimizeBaskets(ULong64_t size) {
-      tree_->OptimizeBaskets(size);
-    }
+    void optimizeBaskets(ULong64_t size) { tree_->OptimizeBaskets(size); }
+
+    void setAutoFlush(Long64_t size) { tree_->SetAutoFlush(size); }
 
-    void setAutoFlush(Long64_t size) {
-      tree_->SetAutoFlush(size);
-    }
   private:
     static void fillTTree(std::vector<TBranch*> const& branches);
-// We use bare pointers for pointers to some ROOT entities.
-// Root owns them and uses bare pointers internally.
-// Therefore, using smart pointers here will do no good.
+    // We use bare pointers for pointers to some ROOT entities.
+    // Root owns them and uses bare pointers internally.
+    // Therefore, using smart pointers here will do no good.
     edm::propagate_const<std::shared_ptr<TFile>> filePtr_;
     edm::propagate_const<TTree*> tree_;
 
-    std::vector<TBranch*> producedBranches_; // does not include cloned branches
+    std::vector<TBranch*> producedBranches_;  // does not include cloned branches
     std::vector<TBranch*> readBranches_;
     std::vector<TBranch*> auxBranches_;
     std::vector<TBranch*> unclonedAuxBranches_;
@@ -126,5 +114,5 @@ namespace edm {
     bool currentlyFastCloning_;
     bool fastCloneAuxBranches_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/IOPool/Output/src/TimeoutPoolOutputModule.cc b/IOPool/Output/src/TimeoutPoolOutputModule.cc
index 8022783625746..d729cf49d1929 100644
--- a/IOPool/Output/src/TimeoutPoolOutputModule.cc
+++ b/IOPool/Output/src/TimeoutPoolOutputModule.cc
@@ -9,17 +9,16 @@ namespace edm {
     eventsWrittenInCurrentFile++;
     PoolOutputModule::write(e);
   }
-  
-  TimeoutPoolOutputModule::TimeoutPoolOutputModule(ParameterSet const& ps):
-      edm::one::OutputModuleBase::OutputModuleBase(ps),
-      PoolOutputModule(ps), 
-      m_lastEvent(time(nullptr)),
-      eventsWrittenInCurrentFile(0),
-      m_timeout(-1) // we want the first event right away
-  {  }
 
-  void
-  TimeoutPoolOutputModule::fillDescriptions(ConfigurationDescriptions & descriptions) {
+  TimeoutPoolOutputModule::TimeoutPoolOutputModule(ParameterSet const& ps)
+      : edm::one::OutputModuleBase::OutputModuleBase(ps),
+        PoolOutputModule(ps),
+        m_lastEvent(time(nullptr)),
+        eventsWrittenInCurrentFile(0),
+        m_timeout(-1)  // we want the first event right away
+  {}
+
+  void TimeoutPoolOutputModule::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     PoolOutputModule::fillDescription(desc);
     descriptions.add("TimeoutPoolOutputModule", desc);
@@ -27,24 +26,30 @@ namespace edm {
 
   bool TimeoutPoolOutputModule::shouldWeCloseFile() const {
     time_t now(time(nullptr));
-    if ( PoolOutputModule::shouldWeCloseFile() ) {
-      edm::LogVerbatim("TimeoutPoolOutputModule")  <<" Closing file "<< currentFileName()<< " with "<< eventsWrittenInCurrentFile  <<" events.";
+    if (PoolOutputModule::shouldWeCloseFile()) {
+      edm::LogVerbatim("TimeoutPoolOutputModule")
+          << " Closing file " << currentFileName() << " with " << eventsWrittenInCurrentFile << " events.";
       eventsWrittenInCurrentFile = 0;
       m_lastEvent = now;
       return true;
     }
     //    std::cout <<" Events "<< eventsWrittenInCurrentFile<<" time "<< now - m_lastEvent<<std::endl;
-    if (eventsWrittenInCurrentFile==0) return false;
-    if ( now - m_lastEvent < m_timeout ) return false;
+    if (eventsWrittenInCurrentFile == 0)
+      return false;
+    if (now - m_lastEvent < m_timeout)
+      return false;
     // next files are needed in 15, 30 and 60 sec
     m_lastEvent = now;
-    if (m_timeout == 30) m_timeout = 60;
-    if (m_timeout == 15) m_timeout = 30;
-    if (m_timeout == -1) m_timeout = 15;
-    
-    edm::LogVerbatim("TimeoutPoolOutputModule")  <<" Closing file "<< currentFileName()<< " with "<< eventsWrittenInCurrentFile  <<" events.";
+    if (m_timeout == 30)
+      m_timeout = 60;
+    if (m_timeout == 15)
+      m_timeout = 30;
+    if (m_timeout == -1)
+      m_timeout = 15;
+
+    edm::LogVerbatim("TimeoutPoolOutputModule")
+        << " Closing file " << currentFileName() << " with " << eventsWrittenInCurrentFile << " events.";
     eventsWrittenInCurrentFile = 0;
     return true;
   }
-}
-
+}  // namespace edm
diff --git a/IOPool/Provenance/interface/CommonProvenanceFiller.h b/IOPool/Provenance/interface/CommonProvenanceFiller.h
index 012b14cac5520..d035940b0e9f4 100644
--- a/IOPool/Provenance/interface/CommonProvenanceFiller.h
+++ b/IOPool/Provenance/interface/CommonProvenanceFiller.h
@@ -9,4 +9,4 @@ namespace edm {
   void fillProcessHistoryBranch(TTree* metaDataTree,
                                 int basketSize,
                                 ProcessHistoryRegistry const& processHistoryRegistry);
-}
+}  // namespace edm
diff --git a/IOPool/Provenance/src/CommonProvenanceFiller.cc b/IOPool/Provenance/src/CommonProvenanceFiller.cc
index 1a02ec1fed324..25756ad66e56c 100644
--- a/IOPool/Provenance/src/CommonProvenanceFiller.cc
+++ b/IOPool/Provenance/src/CommonProvenanceFiller.cc
@@ -16,10 +16,10 @@
 namespace edm {
 
   void fillParameterSetBranch(TTree* parameterSetsTree, int basketSize) {
-
     std::pair<ParameterSetID, ParameterSetBlob> idToBlob;
     std::pair<ParameterSetID, ParameterSetBlob>* pIdToBlob = &idToBlob;
-    TBranch* b = parameterSetsTree->Branch(poolNames::idToParameterSetBlobsBranchName().c_str(), &pIdToBlob, basketSize, 0);
+    TBranch* b =
+        parameterSetsTree->Branch(poolNames::idToParameterSetBlobsBranchName().c_str(), &pIdToBlob, basketSize, 0);
 
     for (auto const& pset : *pset::Registry::instance()) {
       idToBlob.first = pset.first;
@@ -29,9 +29,11 @@ namespace edm {
     }
   }
 
-  void fillProcessHistoryBranch(TTree* metaDataTree, int basketSize, ProcessHistoryRegistry const& processHistoryRegistry) {
+  void fillProcessHistoryBranch(TTree* metaDataTree,
+                                int basketSize,
+                                ProcessHistoryRegistry const& processHistoryRegistry) {
     ProcessHistoryVector procHistoryVector;
-    for(auto const& ph : processHistoryRegistry) {
+    for (auto const& ph : processHistoryRegistry) {
       procHistoryVector.push_back(ph.second);
     }
     ProcessHistoryVector* p = &procHistoryVector;
@@ -40,4 +42,4 @@ namespace edm {
     b->Fill();
   }
 
-}
+}  // namespace edm
diff --git a/IOPool/SecondaryInput/test/SecondaryProducer.cc b/IOPool/SecondaryInput/test/SecondaryProducer.cc
index f6b9f0c0ff401..47b49d57a8123 100644
--- a/IOPool/SecondaryInput/test/SecondaryProducer.cc
+++ b/IOPool/SecondaryInput/test/SecondaryProducer.cc
@@ -47,8 +47,8 @@ namespace edm {
 
   // Constructor
   // make secondary input source
-  SecondaryProducer::SecondaryProducer(ParameterSet const& pset) :
-        productRegistry_(new SignallingProductRegistry),
+  SecondaryProducer::SecondaryProducer(ParameterSet const& pset)
+      : productRegistry_(new SignallingProductRegistry),
         secInput_(makeSecInput(pset)),
         processConfiguration_(new ProcessConfiguration(std::string("PROD"), getReleaseVersion(), getPassID())),
         eventPrincipal_(),
@@ -56,10 +56,11 @@ namespace edm {
         specified_(pset.getUntrackedParameter<bool>("specified", false)),
         firstEvent_(true),
         firstLoop_(true),
-        expectedEventNumber_(sequential_ ? pset.getParameterSet("input").getUntrackedParameter<unsigned int>("skipEvents", 0) + 1 : 1) {
+        expectedEventNumber_(
+            sequential_ ? pset.getParameterSet("input").getUntrackedParameter<unsigned int>("skipEvents", 0) + 1 : 1) {
     processConfiguration_->setParameterSetID(ParameterSet::emptyParameterSetID());
     processConfiguration_->setProcessConfigurationID();
- 
+
     productRegistry_->setFrozen();
 
     produces<edmtest::ThingCollection>();
@@ -69,13 +70,11 @@ namespace edm {
 
   void SecondaryProducer::beginJob() {
     // propagate_const<T> has no reset() function
-    eventPrincipal_ = std::make_unique<EventPrincipal>(
-                                             secInput_->productRegistry(),
-                                             std::make_shared<BranchIDListHelper>(),
-                                             std::make_shared<ThinnedAssociationsHelper>(),
-                                             *processConfiguration_,
-                                             nullptr);
-
+    eventPrincipal_ = std::make_unique<EventPrincipal>(secInput_->productRegistry(),
+                                                       std::make_shared<BranchIDListHelper>(),
+                                                       std::make_shared<ThinnedAssociationsHelper>(),
+                                                       *processConfiguration_,
+                                                       nullptr);
   }
 
   // Virtual destructor needed.
@@ -86,25 +85,34 @@ namespace edm {
     using std::placeholders::_1;
     size_t fileNameHash = 0U;
 
-    if(specified_) {
+    if (specified_) {
       // Just for simplicity, we use the event ID from the primary to read the secondary.
       std::vector<SecondaryEventIDAndFileInfo> events(1, SecondaryEventIDAndFileInfo(e.id(), fileNameHash));
-      secInput_->loopSpecified(*eventPrincipal_, fileNameHash, events.begin(), events.end(), std::bind(&SecondaryProducer::processOneEvent, this, _1, std::ref(e)));
+      secInput_->loopSpecified(*eventPrincipal_,
+                               fileNameHash,
+                               events.begin(),
+                               events.end(),
+                               std::bind(&SecondaryProducer::processOneEvent, this, _1, std::ref(e)));
     } else {
       CLHEP::HepRandomEngine* engine = nullptr;
       if (!sequential_) {
         edm::Service<edm::RandomNumberGenerator> rng;
         if (!rng.isAvailable()) {
           throw cms::Exception("Configuration")
-            << "SecondaryProducer requires the RandomNumberGeneratorService,\n"
-               "which is not present in the configuration file.  You must add the service\n"
-               "in the configuration file or remove the modules that require it.";
+              << "SecondaryProducer requires the RandomNumberGeneratorService,\n"
+                 "which is not present in the configuration file.  You must add the service\n"
+                 "in the configuration file or remove the modules that require it.";
         }
         engine = &rng->getEngine(e.streamID());
       }
       // Just for simplicity, we use the event ID from the primary to read the secondary.
       EventID id = e.id();
-      secInput_->loopOverEvents(*eventPrincipal_, fileNameHash, 1, std::bind(&SecondaryProducer::processOneEvent, this, _1, std::ref(e)), engine, &id);
+      secInput_->loopOverEvents(*eventPrincipal_,
+                                fileNameHash,
+                                1,
+                                std::bind(&SecondaryProducer::processOneEvent, this, _1, std::ref(e)),
+                                engine,
+                                &id);
     }
   }
 
@@ -114,13 +122,8 @@ namespace edm {
 
     EventNumber_t en = eventPrincipal.id().event();
     // Check that secondary source products are retrieved from the same event as the EventAuxiliary
-    BasicHandle bhandle = eventPrincipal.getByLabel(PRODUCT_TYPE, TypeID(typeid(edmtest::UInt64Product)),
-                                                    "EventNumber",
-                                                    "",
-                                                    "",
-                                                    nullptr,
-                                                    nullptr,
-                                                    nullptr);
+    BasicHandle bhandle = eventPrincipal.getByLabel(
+        PRODUCT_TYPE, TypeID(typeid(edmtest::UInt64Product)), "EventNumber", "", "", nullptr, nullptr, nullptr);
     assert(bhandle.isValid());
     Handle<edmtest::UInt64Product> handle = convert_handle<edmtest::UInt64Product>(std::move(bhandle));
     assert(static_cast<EventNumber_t>(handle->value) == en);
@@ -129,13 +132,9 @@ namespace edm {
     e.getByLabel<edmtest::UInt64Product>("EventNumber", handle);
     assert(static_cast<EventNumber_t>(handle->value) == e.id().event());
 
-    WrapperBase const* ep = eventPrincipal.getByLabel(PRODUCT_TYPE, TypeID(typeid(TC)),
-                                               "Thing",
-                                               "",
-                                               "",
-                                               nullptr,
-                                               nullptr,
-                                               nullptr).wrapper();
+    WrapperBase const* ep =
+        eventPrincipal.getByLabel(PRODUCT_TYPE, TypeID(typeid(TC)), "Thing", "", "", nullptr, nullptr, nullptr)
+            .wrapper();
     assert(ep != nullptr);
     WTC const* wtp = static_cast<WTC const*>(ep);
     assert(wtp);
@@ -145,17 +144,17 @@ namespace edm {
     // Put output into event
     e.put(std::move(thing));
 
-    if(!sequential_ && !specified_ && firstLoop_ && en == 1) {
+    if (!sequential_ && !specified_ && firstLoop_ && en == 1) {
       expectedEventNumber_ = 1;
       firstLoop_ = false;
     }
-    if(firstEvent_) {
+    if (firstEvent_) {
       firstEvent_ = false;
-      if(!sequential_ && !specified_) {
+      if (!sequential_ && !specified_) {
         expectedEventNumber_ = en;
       }
     }
-    assert (expectedEventNumber_ == en);
+    assert(expectedEventNumber_ == en);
     ++expectedEventNumber_;
 
     return true;
@@ -165,15 +164,13 @@ namespace edm {
     ParameterSet const& sec_input = ps.getParameterSet("input");
     PreallocationConfiguration dummy;
     VectorInputSourceDescription desc(productRegistry(), dummy);
-    std::shared_ptr<VectorInputSource> input_(static_cast<VectorInputSource *>
-      (VectorInputSourceFactory::get()->makeVectorInputSource(sec_input, desc).release()));
+    std::shared_ptr<VectorInputSource> input_(static_cast<VectorInputSource*>(
+        VectorInputSourceFactory::get()->makeVectorInputSource(sec_input, desc).release()));
     return input_;
   }
 
-  void SecondaryProducer::endJob() {
-    secInput_->doEndJob();
-  }
+  void SecondaryProducer::endJob() { secInput_->doEndJob(); }
 
-} //edm
+}  // namespace edm
 using edm::SecondaryProducer;
 DEFINE_FWK_MODULE(SecondaryProducer);
diff --git a/IOPool/SecondaryInput/test/SecondaryProducer.h b/IOPool/SecondaryInput/test/SecondaryProducer.h
index e369e2ea7a459..5ce7981db5d9f 100644
--- a/IOPool/SecondaryInput/test/SecondaryProducer.h
+++ b/IOPool/SecondaryInput/test/SecondaryProducer.h
@@ -19,9 +19,8 @@ namespace edm {
   class ProcessConfiguration;
   class VectorInputSource;
 
-  class SecondaryProducer: public EDProducer {
+  class SecondaryProducer : public EDProducer {
   public:
-
     /** standard constructor*/
     explicit SecondaryProducer(ParameterSet const& pset);
 
@@ -34,13 +33,13 @@ namespace edm {
     bool processOneEvent(EventPrincipal const& eventPrincipal, Event& e);
 
   private:
-    virtual void put(Event &) {}
+    virtual void put(Event&) {}
     virtual void beginJob();
     virtual void endJob();
     std::shared_ptr<VectorInputSource> makeSecInput(ParameterSet const& ps);
 
-    std::shared_ptr<ProductRegistry const> productRegistry() const {return get_underlying_safe(productRegistry_);}
-    std::shared_ptr<ProductRegistry>& productRegistry() {return get_underlying_safe(productRegistry_);}
+    std::shared_ptr<ProductRegistry const> productRegistry() const { return get_underlying_safe(productRegistry_); }
+    std::shared_ptr<ProductRegistry>& productRegistry() { return get_underlying_safe(productRegistry_); }
 
     edm::propagate_const<std::shared_ptr<ProductRegistry>> productRegistry_;
     edm::propagate_const<std::shared_ptr<VectorInputSource> const> secInput_;
@@ -53,6 +52,6 @@ namespace edm {
     bool firstLoop_;
     EventNumber_t expectedEventNumber_;
   };
-}//edm
+}  // namespace edm
 
 #endif
diff --git a/IOPool/Streamer/bin/CalcAdler32.cpp b/IOPool/Streamer/bin/CalcAdler32.cpp
index c5eb87ba59678..f22fee3bbc424 100644
--- a/IOPool/Streamer/bin/CalcAdler32.cpp
+++ b/IOPool/Streamer/bin/CalcAdler32.cpp
@@ -8,40 +8,39 @@
 #include <cstdint>
 
 int main(int argc, char* argv[]) {
-
-   if(argc < 2) {
-      std::cerr << "No command line argument given, expected path/filename.\n";
-      return 1;
-   }
-
-   std::string filename(argv[1]);
-   std::ifstream file(filename.c_str(), std::ios::in | std::ios::binary | std::ios::ate);
-   if(!file.is_open()) {
-     std::cerr << "File " << filename << " could not be opened.\n";
-     return 1;
-   }
-
-   std::ifstream::pos_type size = file.tellg();
-   file.seekg(0, std::ios::beg);
-
-   boost::shared_array<char> ptr(new char[1024*1024]);
-   uint32_t a = 1, b = 0;
-
-   std::ifstream::pos_type rsize = 0;
-   while(rsize < size) {
-     file.read(ptr.get(), 1024*1024);
-     rsize += 1024*1024;
-     //std::cout << file.tellg() << " " << rsize << " " << size << " - " << file.gcount() << std::endl;
-     if(file.gcount()) {
-       cms::Adler32(ptr.get(), file.gcount(), a, b);
-     } else {
-       break;
-     }
-   }
-
-   uint32 adler = (b << 16) | a;
-   std::cout << std::hex << adler << std::dec << " " << filename << std::endl;
-
-   file.close();
-   return 0;
+  if (argc < 2) {
+    std::cerr << "No command line argument given, expected path/filename.\n";
+    return 1;
+  }
+
+  std::string filename(argv[1]);
+  std::ifstream file(filename.c_str(), std::ios::in | std::ios::binary | std::ios::ate);
+  if (!file.is_open()) {
+    std::cerr << "File " << filename << " could not be opened.\n";
+    return 1;
+  }
+
+  std::ifstream::pos_type size = file.tellg();
+  file.seekg(0, std::ios::beg);
+
+  boost::shared_array<char> ptr(new char[1024 * 1024]);
+  uint32_t a = 1, b = 0;
+
+  std::ifstream::pos_type rsize = 0;
+  while (rsize < size) {
+    file.read(ptr.get(), 1024 * 1024);
+    rsize += 1024 * 1024;
+    //std::cout << file.tellg() << " " << rsize << " " << size << " - " << file.gcount() << std::endl;
+    if (file.gcount()) {
+      cms::Adler32(ptr.get(), file.gcount(), a, b);
+    } else {
+      break;
+    }
+  }
+
+  uint32 adler = (b << 16) | a;
+  std::cout << std::hex << adler << std::dec << " " << filename << std::endl;
+
+  file.close();
+  return 0;
 }
diff --git a/IOPool/Streamer/bin/DiagStreamerFile.cpp b/IOPool/Streamer/bin/DiagStreamerFile.cpp
index 52ef8ff90556f..ab10c4166841b 100644
--- a/IOPool/Streamer/bin/DiagStreamerFile.cpp
+++ b/IOPool/Streamer/bin/DiagStreamerFile.cpp
@@ -38,18 +38,17 @@
 
 bool compares_bad(EventMsgView const* eview1, EventMsgView const* eview2);
 bool uncompressBuffer(unsigned char* inputBuffer,
-                              unsigned int inputSize,
-                              std::vector<unsigned char> &outputBuffer,
-                              unsigned int expectedFullSize);
+                      unsigned int inputSize,
+                      std::vector<unsigned char>& outputBuffer,
+                      unsigned int expectedFullSize);
 bool test_chksum(EventMsgView const* eview);
-bool test_uncompress(EventMsgView const* eview, std::vector<unsigned char> &dest);
+bool test_uncompress(EventMsgView const* eview, std::vector<unsigned char>& dest);
 void readfile(std::string filename, std::string outfile);
 void help();
 
 //==========================================================================
-int main(int argc, char* argv[]){
-
-  if(argc < 2) {
+int main(int argc, char* argv[]) {
+  if (argc < 2) {
     std::cout << "No command line argument supplied\n";
     help();
     return 1;
@@ -57,7 +56,7 @@ int main(int argc, char* argv[]){
 
   std::string streamfile(argv[1]);
   std::string outfile("/dev/null");
-  if(argc == 3) {
+  if (argc == 3) {
     outfile = argv[2];
   }
 
@@ -69,12 +68,11 @@ int main(int argc, char* argv[]){
 
 //==========================================================================
 void help() {
-      std::cout << "Usage: DiagStreamerFile streamer_file_name"
-                << " [output_file_name]" << std::endl;
+  std::cout << "Usage: DiagStreamerFile streamer_file_name"
+            << " [output_file_name]" << std::endl;
 }
 //==========================================================================
 void readfile(std::string filename, std::string outfile) {
-
   uint32 num_events(0);
   uint32 num_badevents(0);
   uint32 num_baduncompress(0);
@@ -84,22 +82,21 @@ void readfile(std::string filename, std::string outfile) {
   std::vector<unsigned char> compress_buffer(7000000);
   std::map<uint64, uint32> seenEventMap;
   bool output(false);
-  if(outfile != "/dev/null") {
+  if (outfile != "/dev/null") {
     output = true;
   }
   StreamerOutputFile stream_output(outfile);
-  try{
+  try {
     // ----------- init
     edm::StreamerInputFile stream_reader(filename);
     //if(output) StreamerOutputFile stream_output(outfile);
 
-    std::cout << "Trying to Read The Init message from Streamer File: " << std::endl
-         << filename << std::endl;
+    std::cout << "Trying to Read The Init message from Streamer File: " << std::endl << filename << std::endl;
     InitMsgView const* init = stream_reader.startMessage();
     std::cout << "\n\n-------------INIT Message---------------------" << std::endl;
     std::cout << "Dump the Init Message from Streamer:-" << std::endl;
     dumpInitView(init);
-    if(output) {
+    if (output) {
       stream_output.write(*init);
     }
 
@@ -112,138 +109,134 @@ void readfile(std::string filename, std::string outfile) {
     EventMsgView const* eview(nullptr);
     seenEventMap.clear();
 
-    while(stream_reader.next()) {
+    while (stream_reader.next()) {
       eview = stream_reader.currentRecord();
       ++num_events;
       bool good_event(true);
-      if(seenEventMap.find(eview->event()) == seenEventMap.end()) {
-         seenEventMap.insert(std::make_pair(eview->event(), 1));
+      if (seenEventMap.find(eview->event()) == seenEventMap.end()) {
+        seenEventMap.insert(std::make_pair(eview->event(), 1));
       } else {
-         ++seenEventMap[eview->event()];
-         ++num_duplevents;
-         std::cout << "??????? duplicate event Id for count " << num_events
-                    << " event number " << eview->event()
-                    << " seen " << seenEventMap[eview->event()] << " times" << std::endl;
+        ++seenEventMap[eview->event()];
+        ++num_duplevents;
+        std::cout << "??????? duplicate event Id for count " << num_events << " event number " << eview->event()
+                  << " seen " << seenEventMap[eview->event()] << " times" << std::endl;
       }
-      if(first_event) {
+      if (first_event) {
         std::cout << "----------dumping first EVENT-----------" << std::endl;
         dumpEventView(eview);
         first_event = false;
         unsigned char* src = (unsigned char*)eview->startAddress();
         unsigned int srcSize = eview->size();
         savebuf.resize(srcSize);
-        std::copy(src, src+srcSize, &(savebuf)[0]);
+        std::copy(src, src + srcSize, &(savebuf)[0]);
         firstEvtView.reset(new EventMsgView(&(savebuf)[0]));
         //firstEvtView, reset(new EventMsgView((void*)eview->startAddress()));
-        if(!test_chksum(eview)) {
-          std::cout << "checksum error for count " << num_events
-                    << " event number " << eview->event()
+        if (!test_chksum(eview)) {
+          std::cout << "checksum error for count " << num_events << " event number " << eview->event()
                     << " from host name " << eview->hostName() << std::endl;
           ++num_badchksum;
           std::cout << "----------dumping bad checksum EVENT-----------" << std::endl;
           dumpEventView(eview);
           good_event = false;
         }
-        if(!test_uncompress(eview, compress_buffer)) {
-          std::cout << "uncompress error for count " << num_events
-                    << " event number " << firstEvtView->event() << std::endl;
+        if (!test_uncompress(eview, compress_buffer)) {
+          std::cout << "uncompress error for count " << num_events << " event number " << firstEvtView->event()
+                    << std::endl;
           ++num_baduncompress;
           std::cout << "----------dumping bad uncompress EVENT-----------" << std::endl;
           dumpEventView(firstEvtView.get());
           good_event = false;
         }
       } else {
-        if(compares_bad(firstEvtView.get(), eview)) {
+        if (compares_bad(firstEvtView.get(), eview)) {
           std::cout << "Bad event at count " << num_events << " dumping event " << std::endl
                     << "----------dumping bad EVENT-----------" << std::endl;
           dumpEventView(eview);
           ++num_badevents;
           good_event = false;
         }
-        if(!test_chksum(eview)) {
-          std::cout << "checksum error for count " << num_events
-                    << " event number " << eview->event()
+        if (!test_chksum(eview)) {
+          std::cout << "checksum error for count " << num_events << " event number " << eview->event()
                     << " from host name " << eview->hostName() << std::endl;
           ++num_badchksum;
           std::cout << "----------dumping bad checksum EVENT-----------" << std::endl;
           dumpEventView(eview);
           good_event = false;
         }
-        if(!test_uncompress(eview, compress_buffer)) {
-          std::cout << "uncompress error for count " << num_events
-                    << " event number " << eview->event() << std::endl;
+        if (!test_uncompress(eview, compress_buffer)) {
+          std::cout << "uncompress error for count " << num_events << " event number " << eview->event() << std::endl;
           ++num_baduncompress;
           std::cout << "----------dumping bad uncompress EVENT-----------" << std::endl;
           dumpEventView(eview);
           good_event = false;
         }
       }
-      if(good_event) {
-        if(output) {
+      if (good_event) {
+        if (output) {
           ++num_goodevents;
           stream_output.write(*eview);
         }
         //dumpEventView(eview);
       }
-      if((num_events % 50) == 0) {
-        std::cout << "Read " << num_events << " events, and "
-                  << num_badevents << " events with bad headers, and "
-                  << num_badchksum << " events with bad check sum, and "
-                  << num_baduncompress << " events with bad uncompress" << std::endl;
-        if(output) std::cout << "Wrote " << num_goodevents << " good events " << std::endl;
+      if ((num_events % 50) == 0) {
+        std::cout << "Read " << num_events << " events, and " << num_badevents << " events with bad headers, and "
+                  << num_badchksum << " events with bad check sum, and " << num_baduncompress
+                  << " events with bad uncompress" << std::endl;
+        if (output)
+          std::cout << "Wrote " << num_goodevents << " good events " << std::endl;
       }
     }
 
-    std::cout << std::endl << "------------END--------------" << std::endl
+    std::cout << std::endl
+              << "------------END--------------" << std::endl
               << "read " << num_events << " events" << std::endl
               << "and " << num_badevents << " events with bad headers" << std::endl
-              << "and " << num_badchksum << " events with bad check sum"  << std::endl
+              << "and " << num_badchksum << " events with bad check sum" << std::endl
               << "and " << num_baduncompress << " events with bad uncompress" << std::endl
               << "and " << num_duplevents << " duplicated event Id" << std::endl;
 
-    if(output) {
+    if (output) {
       std::cout << "Wrote " << num_goodevents << " good events " << std::endl;
     }
 
-  }catch(cms::Exception& e){
-     std::cerr << "Exception caught:  "
-               << e.what() << std::endl
-               << "After reading " << num_events << " events, and "
-               << num_badevents << " events with bad headers" << std::endl
-               << "and " << num_badchksum << " events with bad check sum"  << std::endl
-               << "and " << num_baduncompress << " events with bad uncompress"  << std::endl
-               << "and " << num_duplevents << " duplicated event Id" << std::endl;
+  } catch (cms::Exception& e) {
+    std::cerr << "Exception caught:  " << e.what() << std::endl
+              << "After reading " << num_events << " events, and " << num_badevents << " events with bad headers"
+              << std::endl
+              << "and " << num_badchksum << " events with bad check sum" << std::endl
+              << "and " << num_baduncompress << " events with bad uncompress" << std::endl
+              << "and " << num_duplevents << " duplicated event Id" << std::endl;
   }
 }
 
 //==========================================================================
 bool compares_bad(EventMsgView const* eview1, EventMsgView const* eview2) {
   bool is_bad(false);
-  if(eview1->code() != eview2->code()) {
+  if (eview1->code() != eview2->code()) {
     std::cout << "non-matching EVENT message code " << std::endl;
     is_bad = true;
   }
-  if(eview1->protocolVersion() != eview2->protocolVersion()) {
+  if (eview1->protocolVersion() != eview2->protocolVersion()) {
     std::cout << "non-matching EVENT message protocol version" << std::endl;
     is_bad = true;
   }
-  if(eview1->run() != eview2->run()) {
+  if (eview1->run() != eview2->run()) {
     std::cout << "non-matching run number " << std::endl;
     is_bad = true;
   }
-  if(eview1->lumi() != eview2->lumi()) {
+  if (eview1->lumi() != eview2->lumi()) {
     std::cout << "non-matching lumi number" << std::endl;
     is_bad = true;
   }
-  if(eview1->outModId() != eview2->outModId()) {
+  if (eview1->outModId() != eview2->outModId()) {
     std::cout << "non-matching output module id" << std::endl;
     is_bad = true;
   }
-  if(eview1->hltCount() != eview2->hltCount()) {
+  if (eview1->hltCount() != eview2->hltCount()) {
     std::cout << "non-matching HLT count" << std::endl;
     is_bad = true;
   }
-  if(eview1->l1Count() != eview2->l1Count()) {
+  if (eview1->l1Count() != eview2->l1Count()) {
     std::cout << "non-matching L1 count" << std::endl;
     is_bad = true;
   }
@@ -256,24 +249,22 @@ bool test_chksum(EventMsgView const* eview) {
   //std::cout << "Adler32 checksum of event = " << adler32_chksum << std::endl;
   //std::cout << "Adler32 checksum from header = " << eview->adler32_chksum() << std::endl;
   //std::cout << "event from host name = " << eview->hostName() << std::endl;
-  if((uint32)adler32_chksum != eview->adler32_chksum()) {
+  if ((uint32)adler32_chksum != eview->adler32_chksum()) {
     std::cout << "Bad chekcsum: Adler32 checksum of event data  = " << adler32_chksum
-              << " from header = " << eview->adler32_chksum()
-              << " host name = " << eview->hostName() << std::endl;
+              << " from header = " << eview->adler32_chksum() << " host name = " << eview->hostName() << std::endl;
     return false;
   }
   return true;
 }
 
 //==========================================================================
-bool test_uncompress(EventMsgView const* eview, std::vector<unsigned char> &dest) {
+bool test_uncompress(EventMsgView const* eview, std::vector<unsigned char>& dest) {
   unsigned long origsize = eview->origDataSize();
   bool success = false;
-  if(origsize != 0 && origsize != 78)
-  {
+  if (origsize != 0 && origsize != 78) {
     // compressed
-    success = uncompressBuffer(const_cast<unsigned char*>((unsigned char const*)eview->eventData()),
-                                   eview->eventLength(), dest, origsize);
+    success = uncompressBuffer(
+        const_cast<unsigned char*>((unsigned char const*)eview->eventData()), eview->eventLength(), dest, origsize);
   } else {
     // uncompressed anyway
     success = true;
@@ -282,28 +273,24 @@ bool test_uncompress(EventMsgView const* eview, std::vector<unsigned char> &dest
 }
 
 //==========================================================================
-bool uncompressBuffer(unsigned char *inputBuffer,
-                              unsigned int inputSize,
-                              std::vector<unsigned char> &outputBuffer,
-                              unsigned int expectedFullSize)
-  {
-    unsigned long origSize = expectedFullSize;
-    unsigned long uncompressedSize = expectedFullSize*1.1;
-    outputBuffer.resize(uncompressedSize);
-    int ret = uncompress(&outputBuffer[0], &uncompressedSize,
-                         inputBuffer, inputSize);
-    if(ret == Z_OK) {
-        // check the length against original uncompressed length
-        if(origSize != uncompressedSize) {
-            std::cout << "Problem with uncompress, original size = "
-                 << origSize << " uncompress size = " << uncompressedSize << std::endl;
-            return false;
-        }
-    } else {
-        std::cout << "Problem with uncompress, return value = "
-             << ret << std::endl;
-        return false;
+bool uncompressBuffer(unsigned char* inputBuffer,
+                      unsigned int inputSize,
+                      std::vector<unsigned char>& outputBuffer,
+                      unsigned int expectedFullSize) {
+  unsigned long origSize = expectedFullSize;
+  unsigned long uncompressedSize = expectedFullSize * 1.1;
+  outputBuffer.resize(uncompressedSize);
+  int ret = uncompress(&outputBuffer[0], &uncompressedSize, inputBuffer, inputSize);
+  if (ret == Z_OK) {
+    // check the length against original uncompressed length
+    if (origSize != uncompressedSize) {
+      std::cout << "Problem with uncompress, original size = " << origSize << " uncompress size = " << uncompressedSize
+                << std::endl;
+      return false;
     }
-    return true;
+  } else {
+    std::cout << "Problem with uncompress, return value = " << ret << std::endl;
+    return false;
+  }
+  return true;
 }
-
diff --git a/IOPool/Streamer/interface/ClassFiller.h b/IOPool/Streamer/interface/ClassFiller.h
index d5af72db5fea5..7abe6a2298d8f 100644
--- a/IOPool/Streamer/interface/ClassFiller.h
+++ b/IOPool/Streamer/interface/ClassFiller.h
@@ -11,17 +11,18 @@
 #include <set>
 #include <vector>
 
-namespace edm
-{
-  class RootDebug
-  {
+namespace edm {
+  class RootDebug {
   public:
-    RootDebug(int flevel, int rlevel):
-      flevel_(flevel),rlevel_(rlevel),old_(gDebug)
-    { if(flevel_ < debugit()) gDebug=rlevel_; }
-    ~RootDebug()
-    { if(flevel_ < debugit()) gDebug=old_; } 
-    
+    RootDebug(int flevel, int rlevel) : flevel_(flevel), rlevel_(rlevel), old_(gDebug) {
+      if (flevel_ < debugit())
+        gDebug = rlevel_;
+    }
+    ~RootDebug() {
+      if (flevel_ < debugit())
+        gDebug = old_;
+    }
+
   private:
     int flevel_;
     int rlevel_;
@@ -32,6 +33,6 @@ namespace edm
   TClass* getTClass(const std::type_info& ti);
   bool loadCap(const std::string& name, std::vector<std::string>& missingDictionaries);
   void doBuildRealData(const std::string& name);
-}
+}  // namespace edm
 
 #endif
diff --git a/IOPool/Streamer/interface/DumpTools.h b/IOPool/Streamer/interface/DumpTools.h
index b656c5c0e068d..aa8cd5e4fbdae 100644
--- a/IOPool/Streamer/interface/DumpTools.h
+++ b/IOPool/Streamer/interface/DumpTools.h
@@ -23,4 +23,3 @@ void dumpEvent(uint8* buf);
 void dumpFRDEventView(const FRDEventMsgView* fview);
 
 #endif
-
diff --git a/IOPool/Streamer/interface/EventMessage.h b/IOPool/Streamer/interface/EventMessage.h
index 5bff51be30c21..be9b108fe20f6 100644
--- a/IOPool/Streamer/interface/EventMessage.h
+++ b/IOPool/Streamer/interface/EventMessage.h
@@ -58,8 +58,7 @@ Protocol Version 11: identical to version 10, except event changed from 4 bytes
 
 // ----------------------- event message ------------------------
 
-struct EventHeader
-{
+struct EventHeader {
   Header header_;
   uint8 protocolVersion_;
   char_uint32 run_;
@@ -70,10 +69,8 @@ struct EventHeader
   char_uint32 droppedEventsCount_;
 };
 
-class EventMsgView
-{
+class EventMsgView {
 public:
-
   EventMsgView(void* buf);
 
   uint32 code() const { return head_.code(); }
@@ -82,7 +79,7 @@ class EventMsgView
   const uint8* eventData() const { return event_start_; }
   uint8* startAddress() const { return buf_; }
   uint32 eventLength() const { return event_len_; }
-  uint32 headerSize() const {return event_start_-buf_;}
+  uint32 headerSize() const { return event_start_ - buf_; }
   uint32 protocolVersion() const;
   uint32 run() const;
   uint64 event() const;
@@ -94,11 +91,11 @@ class EventMsgView
   void l1TriggerBits(std::vector<bool>& put_here) const;
   void hltTriggerBits(uint8* put_here) const;
 
-  uint32 hltCount() const {return hlt_bits_count_;}
-  uint32 l1Count() const {return l1_bits_count_;}
-  uint32 adler32_chksum() const {return adler32_chksum_;}
+  uint32 hltCount() const { return hlt_bits_count_; }
+  uint32 l1Count() const { return l1_bits_count_; }
+  uint32 adler32_chksum() const { return adler32_chksum_; }
   std::string hostName() const;
-  uint32 hostName_len() const {return host_name_len_;}
+  uint32 hostName_len() const { return host_name_len_; }
 
 private:
   uint8* buf_;
diff --git a/IOPool/Streamer/interface/EventMsgBuilder.h b/IOPool/Streamer/interface/EventMsgBuilder.h
index e89be5def825c..b226eacf52522 100644
--- a/IOPool/Streamer/interface/EventMsgBuilder.h
+++ b/IOPool/Streamer/interface/EventMsgBuilder.h
@@ -5,23 +5,28 @@
 
 // ------------------ event message builder ----------------
 
-class EventMsgBuilder
-{
+class EventMsgBuilder {
 public:
-  EventMsgBuilder(void* buf, uint32 size,
-                  uint32 run, uint64 event, uint32 lumi, uint32 outModId,
+  EventMsgBuilder(void* buf,
+                  uint32 size,
+                  uint32 run,
+                  uint64 event,
+                  uint32 lumi,
+                  uint32 outModId,
                   uint32 droppedEventsCount,
                   std::vector<bool>& l1_bits,
-                  uint8* hlt_bits, uint32 hlt_bit_count, 
-                  uint32 adler32_chksum, const char* host_name);
+                  uint8* hlt_bits,
+                  uint32 hlt_bit_count,
+                  uint32 adler32_chksum,
+                  const char* host_name);
 
   void setOrigDataSize(uint32);
   uint8* startAddress() const { return buf_; }
   void setEventLength(uint32 len);
   uint8* eventAddr() const { return event_addr_; }
-  uint32 headerSize() const {return event_addr_-buf_;} 
+  uint32 headerSize() const { return event_addr_ - buf_; }
   uint32 size() const;
-  uint32 bufferSize() const {return size_;}
+  uint32 bufferSize() const { return size_; }
 
 private:
   uint8* buf_;
@@ -30,4 +35,3 @@ class EventMsgBuilder
 };
 
 #endif
-
diff --git a/IOPool/Streamer/interface/FRDEventMessage.h b/IOPool/Streamer/interface/FRDEventMessage.h
index 92899d2ae6441..611e41389fa89 100644
--- a/IOPool/Streamer/interface/FRDEventMessage.h
+++ b/IOPool/Streamer/interface/FRDEventMessage.h
@@ -57,8 +57,7 @@
 
 #include "IOPool/Streamer/interface/MsgTools.h"
 
-struct FRDEventHeader_V5
-{
+struct FRDEventHeader_V5 {
   uint32 version_;
   uint32 run_;
   uint32 lumi_;
@@ -69,8 +68,7 @@ struct FRDEventHeader_V5
   uint32 crc32c_;
 };
 
-struct FRDEventHeader_V4
-{
+struct FRDEventHeader_V4 {
   uint32 version_;
   uint32 run_;
   uint32 lumi_;
@@ -81,8 +79,7 @@ struct FRDEventHeader_V4
   uint32 adler32_;
 };
 
-struct FRDEventHeader_V3
-{
+struct FRDEventHeader_V3 {
   uint32 version_;
   uint32 run_;
   uint32 lumi_;
@@ -92,33 +89,23 @@ struct FRDEventHeader_V3
   uint32 adler32_;
 };
 
-struct FRDEventHeader_V2
-{
+struct FRDEventHeader_V2 {
   uint32 version_;
   uint32 run_;
   uint32 lumi_;
   uint32 event_;
 };
 
-struct FRDEventHeader_V1
-{
+struct FRDEventHeader_V1 {
   uint32 run_;
   uint32 event_;
 };
 
 const uint32 FRDHeaderVersionSize[6] = {
-  0,
-  2*sizeof(uint32),
-  (4 + 1024) * sizeof(uint32),
-  7*sizeof(uint32),
-  8*sizeof(uint32),
-  6*sizeof(uint32)
-};
-
-class FRDEventMsgView
-{
- public:
+    0, 2 * sizeof(uint32), (4 + 1024) * sizeof(uint32), 7 * sizeof(uint32), 8 * sizeof(uint32), 6 * sizeof(uint32)};
 
+class FRDEventMsgView {
+public:
   FRDEventMsgView(void* buf);
 
   uint8* startAddress() const { return buf_; }
@@ -134,8 +121,7 @@ class FRDEventMsgView
   uint32 adler32() const { return adler32_; }
   uint32 crc32c() const { return crc32c_; }
 
- private:
-
+private:
   uint8* buf_;
   void* payload_;
   uint32 size_;
diff --git a/IOPool/Streamer/interface/InitMessage.h b/IOPool/Streamer/interface/InitMessage.h
index 10046ed4477d7..2858d367927c8 100644
--- a/IOPool/Streamer/interface/InitMessage.h
+++ b/IOPool/Streamer/interface/InitMessage.h
@@ -36,24 +36,19 @@ Protocol Version 11: identical to version 10, but incremented to keep in sync wi
 #include "IOPool/Streamer/interface/MsgTools.h"
 #include "IOPool/Streamer/interface/MsgHeader.h"
 
-struct Version
-{
-  Version(const uint8* pset):protocol_(11)
-  { std::copy(pset,pset+sizeof(pset_id_),&pset_id_[0]); }
+struct Version {
+  Version(const uint8* pset) : protocol_(11) { std::copy(pset, pset + sizeof(pset_id_), &pset_id_[0]); }
 
-  uint8 protocol_; // version of the protocol
-  unsigned char pset_id_[16]; // parameter set ID
+  uint8 protocol_;             // version of the protocol
+  unsigned char pset_id_[16];  // parameter set ID
 };
 
-struct InitHeader
-{
-  InitHeader(const Header& h, uint32 run, const Version& v,
-           uint32 init_header_size=0, uint32 event_header_size=0):
-    header_(h),version_(v)
-  {
-   convert(run,run_); 
-   convert(init_header_size, init_header_size_);
-   convert(event_header_size, event_header_size_);
+struct InitHeader {
+  InitHeader(const Header& h, uint32 run, const Version& v, uint32 init_header_size = 0, uint32 event_header_size = 0)
+      : header_(h), version_(v) {
+    convert(run, run_);
+    convert(init_header_size, init_header_size_);
+    convert(event_header_size, event_header_size_);
   }
 
   Header header_;
@@ -63,10 +58,8 @@ struct InitHeader
   char_uint32 event_header_size_;
 };
 
-class InitMsgView
-{
+class InitMsgView {
 public:
-
   InitMsgView(void* buf);
 
   uint32 code() const { return head_.code(); }
@@ -91,42 +84,42 @@ class InitMsgView
   // needed for streamer file
   uint32 descLength() const { return desc_len_; }
   const uint8* descData() const { return desc_start_; }
-  uint32 headerSize() const {return desc_start_-buf_;}
+  uint32 headerSize() const { return desc_start_ - buf_; }
   uint32 eventHeaderSize() const;
-  uint32 adler32_chksum() const {return adler32_chksum_;}
+  uint32 adler32_chksum() const { return adler32_chksum_; }
   std::string hostName() const;
-  uint32 hostName_len() const {return host_name_len_;}
+  uint32 hostName_len() const { return host_name_len_; }
 
 private:
   uint8* buf_;
   HeaderView head_;
 
-  uint8* release_start_; // points to the string
+  uint8* release_start_;  // points to the string
   uint32 release_len_;
 
-  uint8* processName_start_; // points to the string
+  uint8* processName_start_;  // points to the string
   uint32 processName_len_;
 
-  uint8* outputModuleLabel_start_; // points to the string
+  uint8* outputModuleLabel_start_;  // points to the string
   uint32 outputModuleLabel_len_;
   uint32 outputModuleId_;
 
-  uint8* hlt_trig_start_; // points to the string
-  uint32 hlt_trig_count_; // number of strings
-  uint32 hlt_trig_len_; // length of strings character array only
-  uint8* hlt_select_start_; // points to the string
-  uint32 hlt_select_count_; // number of strings
-  uint32 hlt_select_len_; // length of strings character array only
-  uint8* l1_trig_start_; // points to the string
-  uint32 l1_trig_count_; // number of strings
-  uint32 l1_trig_len_; // length of strings character array only
+  uint8* hlt_trig_start_;    // points to the string
+  uint32 hlt_trig_count_;    // number of strings
+  uint32 hlt_trig_len_;      // length of strings character array only
+  uint8* hlt_select_start_;  // points to the string
+  uint32 hlt_select_count_;  // number of strings
+  uint32 hlt_select_len_;    // length of strings character array only
+  uint8* l1_trig_start_;     // points to the string
+  uint32 l1_trig_count_;     // number of strings
+  uint32 l1_trig_len_;       // length of strings character array only
   uint32 adler32_chksum_;
   uint8* host_name_start_;
   uint32 host_name_len_;
 
   // does not need to be present in the message sent over the network,
   // but is needed for the index file
-  uint8* desc_start_; // point to the bytes
+  uint8* desc_start_;  // point to the bytes
   uint32 desc_len_;
 };
 
diff --git a/IOPool/Streamer/interface/InitMsgBuilder.h b/IOPool/Streamer/interface/InitMsgBuilder.h
index e67f8fcec40e8..90b15ab6c1435 100644
--- a/IOPool/Streamer/interface/InitMsgBuilder.h
+++ b/IOPool/Streamer/interface/InitMsgBuilder.h
@@ -6,11 +6,12 @@
 
 // ----------------- init -------------------
 
-class InitMsgBuilder
-{
+class InitMsgBuilder {
 public:
-  InitMsgBuilder(void* msg_mem, uint32 size,
-                 uint32 run, const Version& v,
+  InitMsgBuilder(void* msg_mem,
+                 uint32 size,
+                 uint32 run,
+                 const Version& v,
                  const char* release_tag,
                  const char* process_name,
                  const char* output_module_label,
@@ -22,11 +23,11 @@ class InitMsgBuilder
 
   uint8* startAddress() const { return buf_; }
   void setDataLength(uint32 registry_length);
-  uint8* dataAddress() const  { return data_addr_; }
-  uint32 headerSize() const {return data_addr_-buf_;}
-  uint32 size() const ;
-  uint32 run() const;  /** Required by EOF Record Builder */  
-  uint32 bufferSize() const {return size_;}
+  uint8* dataAddress() const { return data_addr_; }
+  uint32 headerSize() const { return data_addr_ - buf_; }
+  uint32 size() const;
+  uint32 run() const; /** Required by EOF Record Builder */
+  uint32 bufferSize() const { return size_; }
 
 private:
   uint8* buf_;
@@ -35,4 +36,3 @@ class InitMsgBuilder
 };
 
 #endif
-
diff --git a/IOPool/Streamer/interface/MsgHeader.h b/IOPool/Streamer/interface/MsgHeader.h
index 329b90dd4030f..060fc75ad3cf6 100644
--- a/IOPool/Streamer/interface/MsgHeader.h
+++ b/IOPool/Streamer/interface/MsgHeader.h
@@ -3,29 +3,38 @@
 
 #include "IOPool/Streamer/interface/MsgTools.h"
 // as it is in memory of file
-struct Header
-{
-  Header(uint32 code,uint32 size):code_(code)
-  { convert(size,size_); }
+struct Header {
+  Header(uint32 code, uint32 size) : code_(code) { convert(size, size_); }
 
-  uint8 code_; // type of the message
-  char_uint32 size_; // of entire message including all headers
+  uint8 code_;        // type of the message
+  char_uint32 size_;  // of entire message including all headers
 
   // 20-Jul-2006, KAB: added enumeration for message types
-  enum Codes { INVALID = 0, INIT = 1, EVENT = 2, DONE = 3, // EOFRECORD = 4 is no longer used
-               HEADER_REQUEST = 5, EVENT_REQUEST = 6,
-               CONS_REG_REQUEST = 7, CONS_REG_RESPONSE = 8,
-               DQM_INIT = 9, DQM_EVENT = 10, DQMEVENT_REQUEST = 11,
-               INIT_SET = 12, NEW_INIT_AVAILABLE = 13, ERROR_EVENT = 14,
-               FILE_CLOSE_REQUEST = 15, SPARE1 = 16, SPARE2 = 17 };
+  enum Codes {
+    INVALID = 0,
+    INIT = 1,
+    EVENT = 2,
+    DONE = 3,  // EOFRECORD = 4 is no longer used
+    HEADER_REQUEST = 5,
+    EVENT_REQUEST = 6,
+    CONS_REG_REQUEST = 7,
+    CONS_REG_RESPONSE = 8,
+    DQM_INIT = 9,
+    DQM_EVENT = 10,
+    DQMEVENT_REQUEST = 11,
+    INIT_SET = 12,
+    NEW_INIT_AVAILABLE = 13,
+    ERROR_EVENT = 14,
+    FILE_CLOSE_REQUEST = 15,
+    SPARE1 = 16,
+    SPARE2 = 17
+  };
 };
 
 // as we need to see it
-class HeaderView
-{
+class HeaderView {
 public:
-  HeaderView(void* buf)
-  {
+  HeaderView(void* buf) {
     Header* h = (Header*)buf;
     code_ = h->code_;
     size_ = convert32(h->size_);
@@ -33,6 +42,7 @@ class HeaderView
 
   uint32 code() const { return code_; }
   uint32 size() const { return size_; }
+
 private:
   uint32 code_;
   uint32 size_;
diff --git a/IOPool/Streamer/interface/MsgTools.h b/IOPool/Streamer/interface/MsgTools.h
index 0a55295b34f1a..7411b945c76de 100644
--- a/IOPool/Streamer/interface/MsgTools.h
+++ b/IOPool/Streamer/interface/MsgTools.h
@@ -9,93 +9,86 @@
 
 // could just use the c99 names here from stdint.h
 typedef unsigned char uint8;
-typedef unsigned short uint16; 
-typedef unsigned int  uint32;
+typedef unsigned short uint16;
+typedef unsigned int uint32;
 typedef unsigned long long uint64;
 typedef unsigned char char_uint64[sizeof(uint64)];
 typedef unsigned char char_uint32[sizeof(uint32)];
 typedef unsigned char char_uint16[sizeof(uint16)];
 typedef std::vector<std::string> Strings;
 
-
-inline uint64 convert64(char_uint64 v)
-{
+inline uint64 convert64(char_uint64 v) {
   // first four bytes are code,  LSB first
-  unsigned long long a=v[0], b=v[1], c=v[2], d=v[3];
-  unsigned long long e=v[4], f=v[5], g=v[6], h=v[7];
-  a|=(b<<8)|(c<<16)|(d<<24)|(e<<32)|(f<<40)|(g<<48)|(h<<56);
+  unsigned long long a = v[0], b = v[1], c = v[2], d = v[3];
+  unsigned long long e = v[4], f = v[5], g = v[6], h = v[7];
+  a |= (b << 8) | (c << 16) | (d << 24) | (e << 32) | (f << 40) | (g << 48) | (h << 56);
   return a;
 }
 
-inline uint32 convert32(char_uint32 v)
-{ 
+inline uint32 convert32(char_uint32 v) {
   // first four bytes are code,  LSB first
-  unsigned int a=v[0], b=v[1], c=v[2], d=v[3];
-  a|=(b<<8)|(c<<16)|(d<<24);
+  unsigned int a = v[0], b = v[1], c = v[2], d = v[3];
+  a |= (b << 8) | (c << 16) | (d << 24);
   return a;
 }
 
-inline uint16 convert16(char_uint16 v)
-{ 
+inline uint16 convert16(char_uint16 v) {
   // first four bytes are code,  LSB first
-  unsigned int a=v[0], b=v[1];
-  a|=(b<<8);
+  unsigned int a = v[0], b = v[1];
+  a |= (b << 8);
   return a;
 }
 
-inline void convert(uint32 i, char_uint32 v)
-{
-  v[0]=i&0xff;
-  v[1]=(i>>8)&0xff;
-  v[2]=(i>>16)&0xff;
-  v[3]=(i>>24)&0xff;
+inline void convert(uint32 i, char_uint32 v) {
+  v[0] = i & 0xff;
+  v[1] = (i >> 8) & 0xff;
+  v[2] = (i >> 16) & 0xff;
+  v[3] = (i >> 24) & 0xff;
 }
 
-inline void convert(uint16 i, char_uint16 v)
-{
-  v[0]=i&0xff;
-  v[1]=(i>>8)&0xff;
+inline void convert(uint16 i, char_uint16 v) {
+  v[0] = i & 0xff;
+  v[1] = (i >> 8) & 0xff;
 }
 
-inline void convert(uint64 li, char_uint64 v)
-{
-  v[0]=li&0xff;
-  v[1]=(li>>8)&0xff;
-  v[2]=(li>>16)&0xff;
-  v[3]=(li>>24)&0xff;
-  v[4]=(li>>32)&0xff;
-  v[5]=(li>>40)&0xff;
-  v[6]=(li>>48)&0xff;
-  v[7]=(li>>56)&0xff;
+inline void convert(uint64 li, char_uint64 v) {
+  v[0] = li & 0xff;
+  v[1] = (li >> 8) & 0xff;
+  v[2] = (li >> 16) & 0xff;
+  v[3] = (li >> 24) & 0xff;
+  v[4] = (li >> 32) & 0xff;
+  v[5] = (li >> 40) & 0xff;
+  v[6] = (li >> 48) & 0xff;
+  v[7] = (li >> 56) & 0xff;
 }
 
-namespace MsgTools
-{
+namespace MsgTools {
 
-inline uint8* fillNames(const Strings& names, uint8* pos)
-{
-  uint32 sz = names.size();
-  convert(sz,pos); // save number of strings
-  uint8* len_pos = pos + sizeof(char_uint32); // area for length
-  pos = len_pos + sizeof(char_uint32); // area for full string of names
-  bool first = true;
+  inline uint8* fillNames(const Strings& names, uint8* pos) {
+    uint32 sz = names.size();
+    convert(sz, pos);                            // save number of strings
+    uint8* len_pos = pos + sizeof(char_uint32);  // area for length
+    pos = len_pos + sizeof(char_uint32);         // area for full string of names
+    bool first = true;
 
-  for(Strings::const_iterator beg = names.begin(); beg != names.end(); ++beg) {
-      if(first) first = false; else *pos++ = ' ';
-      pos = edm::copy_all(*beg,pos);
+    for (Strings::const_iterator beg = names.begin(); beg != names.end(); ++beg) {
+      if (first)
+        first = false;
+      else
+        *pos++ = ' ';
+      pos = edm::copy_all(*beg, pos);
+    }
+    convert((uint32)(pos - len_pos - sizeof(char_uint32)), len_pos);
+    return pos;
   }
-  convert((uint32)(pos-len_pos-sizeof(char_uint32)),len_pos);
-  return pos;
-}
 
-inline void getNames(uint8* from, uint32 from_len, Strings& to)
-{
-  // not the most efficient way to do this
-  std::istringstream ist(std::string(reinterpret_cast<char *>(from),from_len));
-  typedef std::istream_iterator<std::string> Iter;
-  std::copy(Iter(ist),Iter(),std::back_inserter(to));
-}
+  inline void getNames(uint8* from, uint32 from_len, Strings& to) {
+    // not the most efficient way to do this
+    std::istringstream ist(std::string(reinterpret_cast<char*>(from), from_len));
+    typedef std::istream_iterator<std::string> Iter;
+    std::copy(Iter(ist), Iter(), std::back_inserter(to));
+  }
 
-}
+}  // namespace MsgTools
 
 #endif
diff --git a/IOPool/Streamer/interface/StreamSerializer.h b/IOPool/Streamer/interface/StreamSerializer.h
index e486c64f5d1f5..b3a17ed0c7f43 100644
--- a/IOPool/Streamer/interface/StreamSerializer.h
+++ b/IOPool/Streamer/interface/StreamSerializer.h
@@ -18,25 +18,23 @@
 #include "DataFormats/Provenance/interface/SelectedProducts.h"
 #include "FWCore/Utilities/interface/get_underlying_safe.h"
 
-const int init_size = 1024*1024;
+const int init_size = 1024 * 1024;
 
 // Data structure to be shared by all output modules for event serialization
-struct SerializeDataBuffer
-{
+struct SerializeDataBuffer {
   typedef std::vector<char> SBuffer;
 
-  SerializeDataBuffer():
-    comp_buf_(init_size),
-    curr_event_size_(),
-    curr_space_used_(),
-    rootbuf_(TBuffer::kWrite,init_size),
-    ptr_((unsigned char*)rootbuf_.Buffer()),
-    header_buf_(),
-    bufs_(),
-    adler32_chksum_(0)
-  { }
-
-  // This object caches the results of the last INIT or event 
+  SerializeDataBuffer()
+      : comp_buf_(init_size),
+        curr_event_size_(),
+        curr_space_used_(),
+        rootbuf_(TBuffer::kWrite, init_size),
+        ptr_((unsigned char*)rootbuf_.Buffer()),
+        header_buf_(),
+        bufs_(),
+        adler32_chksum_(0) {}
+
+  // This object caches the results of the last INIT or event
   // serialization operation.  You get access to the data using the
   // following member functions.
 
@@ -46,56 +44,53 @@ struct SerializeDataBuffer
   unsigned int currentEventSize() const { return curr_event_size_; }
   uint32_t adler32_chksum() const { return adler32_chksum_; }
 
-  std::vector<unsigned char> comp_buf_; // space for compressed data
+  std::vector<unsigned char> comp_buf_;  // space for compressed data
   unsigned int curr_event_size_;
-  unsigned int curr_space_used_; // less than curr_event_size_ if compressed
+  unsigned int curr_space_used_;  // less than curr_event_size_ if compressed
   TBufferFile rootbuf_;
-  edm::propagate_const<unsigned char*> ptr_; // set to the place where the last event stored
-  SBuffer header_buf_; // place for INIT message creation
-  SBuffer bufs_;       // place for EVENT message creation
-  uint32_t  adler32_chksum_; // adler32 check sum for the (compressed) data
+  edm::propagate_const<unsigned char*> ptr_;  // set to the place where the last event stored
+  SBuffer header_buf_;                        // place for INIT message creation
+  SBuffer bufs_;                              // place for EVENT message creation
+  uint32_t adler32_chksum_;                   // adler32 check sum for the (compressed) data
 };
 
 class EventMsgBuilder;
 class InitMsgBuilder;
-namespace edm
-{
-  
+namespace edm {
+
   class EventForOutput;
   class ModuleCallingContext;
   class ThinnedAssociationsHelper;
 
-  class StreamSerializer
-  {
-
+  class StreamSerializer {
   public:
-
     StreamSerializer(SelectedProducts const* selections);
 
-    int serializeRegistry(SerializeDataBuffer &data_buffer,
-                          const BranchIDLists &branchIDLists,
+    int serializeRegistry(SerializeDataBuffer& data_buffer,
+                          const BranchIDLists& branchIDLists,
                           ThinnedAssociationsHelper const& thinnedAssociationsHelper);
 
-    int serializeEvent(EventForOutput const& event, ParameterSetID const& selectorConfig,
-                       bool use_compression, int compression_level,
-                       SerializeDataBuffer &data_buffer) const;
+    int serializeEvent(EventForOutput const& event,
+                       ParameterSetID const& selectorConfig,
+                       bool use_compression,
+                       int compression_level,
+                       SerializeDataBuffer& data_buffer) const;
 
     /**
      * Compresses the data in the specified input buffer into the
      * specified output buffer.  Returns the size of the compressed data
      * or zero if compression failed.
      */
-    static unsigned int compressBuffer(unsigned char *inputBuffer,
+    static unsigned int compressBuffer(unsigned char* inputBuffer,
                                        unsigned int inputSize,
-                                       std::vector<unsigned char> &outputBuffer,
+                                       std::vector<unsigned char>& outputBuffer,
                                        int compressionLevel);
 
   private:
-
     SelectedProducts const* selections_;
     edm::propagate_const<TClass*> tc_;
   };
 
-}
+}  // namespace edm
 
 #endif
diff --git a/IOPool/Streamer/interface/StreamerFileIO.h b/IOPool/Streamer/interface/StreamerFileIO.h
index 161f6e6f56b85..a71a92c5d3d49 100644
--- a/IOPool/Streamer/interface/StreamerFileIO.h
+++ b/IOPool/Streamer/interface/StreamerFileIO.h
@@ -13,38 +13,38 @@ Class representing Output (Streamer) file.
 #include <string>
 
 //-------------------------------------------------------
-  
-class OutputFile 
-  /**
+
+class OutputFile
+/**
   Class representing Output (Streamer) file.
   */
-  {
-  public:
-     explicit OutputFile(const std::string& name);
-     /**
+{
+public:
+  explicit OutputFile(const std::string& name);
+  /**
       CTOR, takes file path name as argument
      */
-     ~OutputFile();
+  ~OutputFile();
 
-     bool write(const char *ptr, size_t n);
+  bool write(const char* ptr, size_t n);
 
-     std::string fileName()      const { return filename_; }
-     uint64 current_offset()     const { return current_offset_; }
-     uint32 adler32()            const { return (adlerb_ << 16) | adlera_; }
+  std::string fileName() const { return filename_; }
+  uint64 current_offset() const { return current_offset_; }
+  uint32 adler32() const { return (adlerb_ << 16) | adlera_; }
 
-     void set_do_adler(bool v)             { do_adler_ = v; }
-     void set_current_offset(uint64 v)     { current_offset_ = v; }
-     void close();
+  void set_do_adler(bool v) { do_adler_ = v; }
+  void set_current_offset(uint64 v) { current_offset_ = v; }
+  void close();
 
-  private:
-     uint64 current_offset_;  /** Location of current ioptr */
+private:
+  uint64 current_offset_; /** Location of current ioptr */
 
-     bool   do_adler_;
-     uint32 adlera_;
-     uint32 adlerb_;
+  bool do_adler_;
+  uint32 adlera_;
+  uint32 adlerb_;
 
-     edm::propagate_const<std::shared_ptr<std::ofstream>> ost_;
-     std::string filename_; 
-  };
+  edm::propagate_const<std::shared_ptr<std::ofstream>> ost_;
+  std::string filename_;
+};
 
 #endif
diff --git a/IOPool/Streamer/interface/StreamerInputFile.h b/IOPool/Streamer/interface/StreamerInputFile.h
index f02f1e7b23eb4..ad1f3cc347e5c 100644
--- a/IOPool/Streamer/interface/StreamerInputFile.h
+++ b/IOPool/Streamer/interface/StreamerInputFile.h
@@ -10,21 +10,20 @@
 
 #include <memory>
 
-#include<string>
-#include<vector>
+#include <string>
+#include <vector>
 
 namespace edm {
   class EventSkipperByID;
   class StreamerInputFile {
   public:
-
     /**Reads a Streamer file */
     explicit StreamerInputFile(std::string const& name,
-      std::shared_ptr<EventSkipperByID> eventSkipperByID = std::shared_ptr<EventSkipperByID>());
+                               std::shared_ptr<EventSkipperByID> eventSkipperByID = std::shared_ptr<EventSkipperByID>());
 
     /** Multiple Streamer files */
     explicit StreamerInputFile(std::vector<std::string> const& names,
-      std::shared_ptr<EventSkipperByID> eventSkipperByID = std::shared_ptr<EventSkipperByID>());
+                               std::shared_ptr<EventSkipperByID> eventSkipperByID = std::shared_ptr<EventSkipperByID>());
 
     ~StreamerInputFile();
 
@@ -36,13 +35,16 @@ namespace edm {
     EventMsgView const* currentRecord() const { return currentEvMsg_.get(); }
     /** Points to current Record */
 
-    bool newHeader() { bool tmp = newHeader_; newHeader_ = false; return tmp;}  /** Test bit if a new header is encountered */
+    bool newHeader() {
+      bool tmp = newHeader_;
+      newHeader_ = false;
+      return tmp;
+    } /** Test bit if a new header is encountered */
 
     /// Needs to be public because of forking.
     void closeStreamerFile();
 
   private:
-
     void openStreamerFile(std::string const& name);
     IOSize readBytes(char* buf, IOSize nBytes);
     IOOffset skipBytes(IOSize nBytes);
@@ -63,9 +65,9 @@ namespace edm {
     std::vector<char> headerBuf_; /** Buffer to store file Header */
     std::vector<char> eventBuf_;  /** Buffer to store Event Data */
 
-    unsigned int currentFile_; /** keeps track of which file is in use at the moment*/
+    unsigned int currentFile_;               /** keeps track of which file is in use at the moment*/
     std::vector<std::string> streamerNames_; /** names of Streamer files */
-    bool multiStreams_;  /** True if Multiple Streams are Read */
+    bool multiStreams_;                      /** True if Multiple Streams are Read */
     std::string currentFileName_;
     bool currentFileOpen_;
 
@@ -80,6 +82,6 @@ namespace edm {
 
     bool endOfFile_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/IOPool/Streamer/interface/StreamerInputModule.h b/IOPool/Streamer/interface/StreamerInputModule.h
index b575135f7f3f1..25bb39e8863a9 100644
--- a/IOPool/Streamer/interface/StreamerInputModule.h
+++ b/IOPool/Streamer/interface/StreamerInputModule.h
@@ -12,67 +12,64 @@
 #include <vector>
 #include <utility>
 #include <iostream>
-#include <algorithm> 
+#include <algorithm>
 #include <iterator>
 
-namespace edm
-{
+namespace edm {
   template <typename Producer>
   class StreamerInputModule : public StreamerInputSource {
-  /**
+    /**
      Requires the Producer class to provide following functions
            const InitMsgView* getHeader();
            const EventMsgView* getNextEvent();
   */
-  public:  
-    explicit StreamerInputModule(ParameterSet const& pset,
-                 InputSourceDescription const& desc);
+  public:
+    explicit StreamerInputModule(ParameterSet const& pset, InputSourceDescription const& desc);
     ~StreamerInputModule() override;
+
   private:
     void genuineCloseFile() override {
-      if(pr_.get() != nullptr) pr_->closeFile();
+      if (pr_.get() != nullptr)
+        pr_->closeFile();
     }
 
     bool checkNextEvent() override;
 
     //ProductRegistry const* prod_reg_;
     edm::propagate_const<std::unique_ptr<Producer>> pr_;
-  }; //end-of-class-def
+  };  //end-of-class-def
 
   template <typename Producer>
   StreamerInputModule<Producer>::~StreamerInputModule() {}
 
   template <typename Producer>
-  StreamerInputModule<Producer>::StreamerInputModule(
-                    ParameterSet const& pset,
-                    InputSourceDescription const& desc):
-	StreamerInputSource(pset, desc),
-	//prod_reg_(&productRegistry()), 
-	pr_(new Producer(pset)) {
+  StreamerInputModule<Producer>::StreamerInputModule(ParameterSet const& pset, InputSourceDescription const& desc)
+      : StreamerInputSource(pset, desc),
+        //prod_reg_(&productRegistry()),
+        pr_(new Producer(pset)) {
     //Get header/init from Producer
     InitMsgView const* header = pr_->getHeader();
-    deserializeAndMergeWithRegistry(*header); 
+    deserializeAndMergeWithRegistry(*header);
   }
 
   template <typename Producer>
   bool StreamerInputModule<Producer>::checkNextEvent() {
-
     EventMsgView const* eview = pr_->getNextEvent();
 
-    if (pr_->newHeader()) {   
-        FDEBUG(6) << "A new file has been opened and we must compare Headers here !!" << std::endl;
-        // A new file has been opened and we must compare Headers here !!
-        //Get header/init from Producer
-        InitMsgView const* header = pr_->getHeader();
-        deserializeAndMergeWithRegistry(*header, true);
-    } 
+    if (pr_->newHeader()) {
+      FDEBUG(6) << "A new file has been opened and we must compare Headers here !!" << std::endl;
+      // A new file has been opened and we must compare Headers here !!
+      //Get header/init from Producer
+      InitMsgView const* header = pr_->getHeader();
+      deserializeAndMergeWithRegistry(*header, true);
+    }
     if (eview == nullptr) {
-        return  false;
+      return false;
     }
     deserializeEvent(*eview);
     return true;
   }
 
-} // end of namespace-edm
-  
+}  // namespace edm
+
 #endif
diff --git a/IOPool/Streamer/interface/StreamerInputSource.h b/IOPool/Streamer/interface/StreamerInputSource.h
index 896a1a041b00e..1d053fd716998 100644
--- a/IOPool/Streamer/interface/StreamerInputSource.h
+++ b/IOPool/Streamer/interface/StreamerInputSource.h
@@ -8,7 +8,6 @@
  * framework objects (e.g. ProductRegistry and EventPrincipal)
  */
 
-
 #include "TBufferFile.h"
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
@@ -30,9 +29,8 @@ namespace edm {
   class ThinnedAssociationsHelper;
 
   class StreamerInputSource : public RawInputSource {
-  public:  
-    explicit StreamerInputSource(ParameterSet const& pset,
-                 InputSourceDescription const& desc);
+  public:
+    explicit StreamerInputSource(ParameterSet const& pset, InputSourceDescription const& desc);
     ~StreamerInputSource() override;
     static void fillDescription(ParameterSetDescription& description);
 
@@ -42,12 +40,11 @@ namespace edm {
 
     void deserializeEvent(EventMsgView const& eventView);
 
-    static
-    void mergeIntoRegistry(SendJobHeader const& header,
-                           ProductRegistry&,
-                           BranchIDListHelper&,
-                           ThinnedAssociationsHelper&,
-                           bool subsequent);
+    static void mergeIntoRegistry(SendJobHeader const& header,
+                                  ProductRegistry&,
+                                  BranchIDListHelper&,
+                                  ThinnedAssociationsHelper&,
+                                  bool subsequent);
 
     /**
      * Uncompresses the data in the specified input buffer into the
@@ -61,13 +58,13 @@ namespace edm {
                                          unsigned int inputSize,
                                          std::vector<unsigned char>& outputBuffer,
                                          unsigned int expectedFullSize);
+
   protected:
     static void declareStreamers(SendDescs const& descs);
     static void buildClassCache(SendDescs const& descs);
     void resetAfterEndRun();
 
   private:
-
     class EventPrincipalHolder : public EDProductGetter {
     public:
       EventPrincipalHolder();
@@ -76,9 +73,8 @@ namespace edm {
       WrapperBase const* getIt(ProductID const& id) const override;
       WrapperBase const* getThinnedProduct(ProductID const&, unsigned int&) const override;
       void getThinnedProducts(ProductID const& pid,
-                                      std::vector<WrapperBase const*>& wrappers,
-                                      std::vector<unsigned int>& keys) const override;
-
+                              std::vector<WrapperBase const*>& wrappers,
+                              std::vector<unsigned int>& keys) const override;
 
       unsigned int transitionIndex_() const override;
 
@@ -105,7 +101,7 @@ namespace edm {
 
     std::string processName_;
     unsigned int protocolVersion_;
-  }; //end-of-class-def
-} // end of namespace-edm
-  
+  };  //end-of-class-def
+}  // namespace edm
+
 #endif
diff --git a/IOPool/Streamer/interface/StreamerOutputFile.h b/IOPool/Streamer/interface/StreamerOutputFile.h
index 144c3ec3bf79f..4e32969016f1d 100644
--- a/IOPool/Streamer/interface/StreamerOutputFile.h
+++ b/IOPool/Streamer/interface/StreamerOutputFile.h
@@ -21,49 +21,47 @@
 #include <iostream>
 
 class StreamerOutputFile
-  /**
+/**
   Class for doing Streamer Write operations
   */
-  {
-  public:
-     explicit StreamerOutputFile(const std::string& name);
-     /**
+{
+public:
+  explicit StreamerOutputFile(const std::string& name);
+  /**
       CTOR, takes file path name as argument
      */
-     ~StreamerOutputFile();
+  ~StreamerOutputFile();
 
-     void write(const InitMsgBuilder&);
-     /**
+  void write(const InitMsgBuilder&);
+  /**
       Performs write on InitMsgBuilder type,
       Header + Blob, both are written out.
      */
-     void write(const InitMsgView&);
+  void write(const InitMsgView&);
 
-     void writeInitFragment(uint32 fragIndex, uint32 fragCount,
-                            const char *dataPtr, uint32 dataSize);
+  void writeInitFragment(uint32 fragIndex, uint32 fragCount, const char* dataPtr, uint32 dataSize);
 
-     uint64 write(const EventMsgBuilder&);
-     /**
+  uint64 write(const EventMsgBuilder&);
+  /**
       Performs write on EventMsgBuilder type,
       Header + Blob, both are written out.
       RETURNS the Offset in Stream while at
               which EventForOutputwas written.
      */
-     uint64 write(const EventMsgView&);
+  uint64 write(const EventMsgView&);
 
-     uint64 writeEventFragment(uint32 fragIndex, uint32 fragCount,
-                               const char *dataPtr, uint32 dataSize);
+  uint64 writeEventFragment(uint32 fragIndex, uint32 fragCount, const char* dataPtr, uint32 dataSize);
 
-     uint32 adler32() const { return streamerfile_->adler32(); }
+  uint32 adler32() const { return streamerfile_->adler32(); }
 
-     void close() { streamerfile_->close(); }
+  void close() { streamerfile_->close(); }
 
-  private:
-     void writeEventHeader(const EventMsgView& ineview);
-     void writeStart(const InitMsgView& inview);
+private:
+  void writeEventHeader(const EventMsgView& ineview);
+  void writeStart(const InitMsgView& inview);
 
-  private:
-     edm::propagate_const<std::shared_ptr<OutputFile>> streamerfile_;
+private:
+  edm::propagate_const<std::shared_ptr<OutputFile>> streamerfile_;
 };
 
 #endif
diff --git a/IOPool/Streamer/interface/StreamerOutputModule.h b/IOPool/Streamer/interface/StreamerOutputModule.h
index 410e1f87e3b37..2359418e7e1b2 100644
--- a/IOPool/Streamer/interface/StreamerOutputModule.h
+++ b/IOPool/Streamer/interface/StreamerOutputModule.h
@@ -6,19 +6,18 @@
 #include "IOPool/Streamer/interface/StreamerOutputModuleBase.h"
 
 namespace edm {
-  template<typename Consumer>
+  template <typename Consumer>
   class StreamerOutputModule : public StreamerOutputModuleBase {
-
-  /** Consumers are suppose to provide
+    /** Consumers are suppose to provide
          void doOutputHeader(InitMsgBuilder const& init_message)
          void doOutputEvent(EventMsgBuilder const& msg)
          void start()
          void stop()
 	 static void fillDescription(ParameterSetDescription&)
   **/
-        
+
   public:
-    explicit StreamerOutputModule(ParameterSet const& ps);  
+    explicit StreamerOutputModule(ParameterSet const& ps);
     ~StreamerOutputModule() override;
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
 
@@ -32,60 +31,49 @@ namespace edm {
 
   private:
     edm::propagate_const<std::unique_ptr<Consumer>> c_;
-  }; //end-of-class-def
+  };  //end-of-class-def
 
-  template<typename Consumer>
-  StreamerOutputModule<Consumer>::StreamerOutputModule(ParameterSet const& ps) :
-    edm::one::OutputModuleBase::OutputModuleBase(ps),
-    StreamerOutputModuleBase(ps),
-    c_(new Consumer(ps))
-    {
-  }
+  template <typename Consumer>
+  StreamerOutputModule<Consumer>::StreamerOutputModule(ParameterSet const& ps)
+      : edm::one::OutputModuleBase::OutputModuleBase(ps), StreamerOutputModuleBase(ps), c_(new Consumer(ps)) {}
 
-  template<typename Consumer>
+  template <typename Consumer>
   StreamerOutputModule<Consumer>::~StreamerOutputModule() {}
 
-  template<typename Consumer>
-  void
-  StreamerOutputModule<Consumer>::start() {
+  template <typename Consumer>
+  void StreamerOutputModule<Consumer>::start() {
     c_->start();
   }
-  
-  template<typename Consumer>
-  void
-  StreamerOutputModule<Consumer>::stop() {
+
+  template <typename Consumer>
+  void StreamerOutputModule<Consumer>::stop() {
     c_->stop();
   }
 
-  template<typename Consumer>
-  void
-  StreamerOutputModule<Consumer>::doOutputHeader(InitMsgBuilder const& init_message) {
+  template <typename Consumer>
+  void StreamerOutputModule<Consumer>::doOutputHeader(InitMsgBuilder const& init_message) {
     c_->doOutputHeader(init_message);
   }
-   
-//______________________________________________________________________________
-  template<typename Consumer>
-  void
-  StreamerOutputModule<Consumer>::doOutputEvent(EventMsgBuilder const& msg) {
-    c_->doOutputEvent(msg); // You can't use msg in StreamerOutputModule after this point
+
+  //______________________________________________________________________________
+  template <typename Consumer>
+  void StreamerOutputModule<Consumer>::doOutputEvent(EventMsgBuilder const& msg) {
+    c_->doOutputEvent(msg);  // You can't use msg in StreamerOutputModule after this point
   }
 
-  template<typename Consumer>
-  void
-  StreamerOutputModule<Consumer>::beginLuminosityBlock(edm::LuminosityBlockForOutput const&) {}
+  template <typename Consumer>
+  void StreamerOutputModule<Consumer>::beginLuminosityBlock(edm::LuminosityBlockForOutput const&) {}
 
-  template<typename Consumer>
-  void
-  StreamerOutputModule<Consumer>::endLuminosityBlock(edm::LuminosityBlockForOutput const&) {}
+  template <typename Consumer>
+  void StreamerOutputModule<Consumer>::endLuminosityBlock(edm::LuminosityBlockForOutput const&) {}
 
-  template<typename Consumer>
-  void
-  StreamerOutputModule<Consumer>::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  template <typename Consumer>
+  void StreamerOutputModule<Consumer>::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     StreamerOutputModuleBase::fillDescription(desc);
     Consumer::fillDescription(desc);
     descriptions.add("streamerOutput", desc);
   }
-} // end of namespace-edm
+}  // namespace edm
 
 #endif
diff --git a/IOPool/Streamer/interface/StreamerOutputModuleBase.h b/IOPool/Streamer/interface/StreamerOutputModuleBase.h
index 26fda3ac4a267..b2fb7e49c270f 100644
--- a/IOPool/Streamer/interface/StreamerOutputModuleBase.h
+++ b/IOPool/Streamer/interface/StreamerOutputModuleBase.h
@@ -21,7 +21,7 @@ namespace edm {
   public:
     explicit StreamerOutputModuleBase(ParameterSet const& ps);
     ~StreamerOutputModuleBase() override;
-    static void fillDescription(ParameterSetDescription & desc);
+    static void fillDescription(ParameterSetDescription& desc);
 
   private:
     void beginRun(RunForOutput const&) override;
@@ -42,8 +42,8 @@ namespace edm {
   private:
     edm::EDGetTokenT<edm::TriggerResults> trToken_;
 
-  }; //end-of-class-def
+  };  //end-of-class-def
 
-} // end of namespace-edm
+}  // namespace edm
 
 #endif
diff --git a/IOPool/Streamer/interface/StreamerOutputModuleCommon.h b/IOPool/Streamer/interface/StreamerOutputModuleCommon.h
index a972a3f39f266..6de097437eca7 100644
--- a/IOPool/Streamer/interface/StreamerOutputModuleCommon.h
+++ b/IOPool/Streamer/interface/StreamerOutputModuleCommon.h
@@ -21,7 +21,7 @@ namespace edm {
   public:
     explicit StreamerOutputModuleCommon(ParameterSet const& ps, SelectedProducts const* selections);
     ~StreamerOutputModuleCommon();
-    static void fillDescription(ParameterSetDescription & desc);
+    static void fillDescription(ParameterSetDescription& desc);
 
     std::unique_ptr<InitMsgBuilder> serializeRegistry(BranchIDLists const& branchLists,
                                                       ThinnedAssociationsHelper const& helper,
@@ -39,7 +39,9 @@ namespace edm {
     }
 
   private:
-    void setHltMask(EventForOutput const& e, Handle<TriggerResults> const& triggerResults, std::vector<unsigned char>& hltbits) const;
+    void setHltMask(EventForOutput const& e,
+                    Handle<TriggerResults> const& triggerResults,
+                    std::vector<unsigned char>& hltbits) const;
 
     StreamSerializer serializer_;
 
@@ -48,7 +50,7 @@ namespace edm {
     int compressionLevel_;
 
     // test luminosity sections
-    int lumiSectionInterval_;  
+    int lumiSectionInterval_;
     double timeInSecSinceUTC;
 
     SerializeDataBuffer serializeDataBuffer_;
@@ -60,8 +62,8 @@ namespace edm {
     Strings hltTriggerSelections_;
     uint32 outputModuleId_;
 
-  }; //end-of-class-def
+  };  //end-of-class-def
 
-} // end of namespace-edm
+}  // namespace edm
 
 #endif
diff --git a/IOPool/Streamer/src/ClassFiller.cc b/IOPool/Streamer/src/ClassFiller.cc
index 822bafb43d233..d2b764c17a1c0 100644
--- a/IOPool/Streamer/src/ClassFiller.cc
+++ b/IOPool/Streamer/src/ClassFiller.cc
@@ -25,8 +25,7 @@ namespace edm {
     if (ttest != nullptr) {
       ttest->BuildRealData();
     } else {
-      throw edm::Exception(errors::Configuration)
-			<< "Could not find TClass for " << name << "\n";
+      throw edm::Exception(errors::Configuration) << "Could not find TClass for " << name << "\n";
     }
   }
   // ---------------------
@@ -45,26 +44,24 @@ namespace edm {
         throwMissingDictionariesException(missingDictionaries, context);
       }
     }
-    done=true;
+    done = true;
   }
 
   namespace {
     TClass* getRootClass(std::string const& name) {
-      TClass* tc = TClass::GetClass(name.c_str());    
-      
-      if(tc == nullptr) {
-	throw edm::Exception(errors::Configuration,"getRootClass")
-	  << "could not find TClass for " << name
-	  << "\n";
+      TClass* tc = TClass::GetClass(name.c_str());
+
+      if (tc == nullptr) {
+        throw edm::Exception(errors::Configuration, "getRootClass") << "could not find TClass for " << name << "\n";
       }
-      
+
       return tc;
     }
-  }
+  }  // namespace
 
   // ---------------------
   TClass* getTClass(std::type_info const& ti) {
     TypeID const type(ti);
     return getRootClass(type.className());
   }
-}
+}  // namespace edm
diff --git a/IOPool/Streamer/src/DumpTools.cc b/IOPool/Streamer/src/DumpTools.cc
index 88f0fea36fb3e..977c7c393b975 100644
--- a/IOPool/Streamer/src/DumpTools.cc
+++ b/IOPool/Streamer/src/DumpTools.cc
@@ -16,40 +16,37 @@
 
 using namespace edm;
 
-void dumpInitHeader(const InitMsgView* view)
-{
-  std::cout
-    << "code = " << view->code() << ", "
-    << "size = " << view->size() << "\n"
-    << "run = " << view->run() << ", "
-    << "proto = " << view->protocolVersion() << "\n"
-    << "release = " << view->releaseTag() << "\n"
-    << "processName = " << view->processName() << "\n";
+void dumpInitHeader(const InitMsgView* view) {
+  std::cout << "code = " << view->code() << ", "
+            << "size = " << view->size() << "\n"
+            << "run = " << view->run() << ", "
+            << "proto = " << view->protocolVersion() << "\n"
+            << "release = " << view->releaseTag() << "\n"
+            << "processName = " << view->processName() << "\n";
   if (view->protocolVersion() >= 5) {
     std::cout << "outModuleLabel = " << view->outputModuleLabel() << "\n";
   }
   if (view->protocolVersion() >= 6) {
-    std::cout << "outputModuleId=0x" << std::hex << view->outputModuleId()
-              << std::dec << std::endl;
+    std::cout << "outputModuleId=0x" << std::hex << view->outputModuleId() << std::dec << std::endl;
   }
   if (view->protocolVersion() >= 8) {
-    std::cout << "Checksum for Registry data = " << view->adler32_chksum()
-              << " Hostname = " << view->hostName() << std::endl;
+    std::cout << "Checksum for Registry data = " << view->adler32_chksum() << " Hostname = " << view->hostName()
+              << std::endl;
   }
 
   //PSet 16 byte non-printable representation, stored in message.
   uint8 vpset[16];
-  view->pset(vpset); 
+  view->pset(vpset);
 
   //Lets convert it to printable hex form
-  std::string pset_str(vpset, vpset+sizeof(vpset));
+  std::string pset_str(vpset, vpset + sizeof(vpset));
   pset_str += '\0';
   cms::Digest dig(pset_str);
   cms::MD5Result r1 = dig.digest();
   std::string hexy = r1.toString();
   std::cout << "PSetID= " << hexy << std::endl;
 
-  Strings vhltnames,vhltselections,vl1names;
+  Strings vhltnames, vhltselections, vl1names;
   view->hltTriggerNames(vhltnames);
   if (view->protocolVersion() >= 5) {
     view->hltTriggerSelections(vhltselections);
@@ -57,54 +54,45 @@ void dumpInitHeader(const InitMsgView* view)
   view->l1TriggerNames(vl1names);
 
   std::cout << "HLT names :- \n ";
-  edm::copy_all(vhltnames,std::ostream_iterator<std::string>(std::cout,"\n"));
+  edm::copy_all(vhltnames, std::ostream_iterator<std::string>(std::cout, "\n"));
 
   if (view->protocolVersion() >= 5) {
     std::cout << "HLT selections :- \n ";
-    edm::copy_all(vhltselections,std::ostream_iterator<std::string>(std::cout,"\n"));
+    edm::copy_all(vhltselections, std::ostream_iterator<std::string>(std::cout, "\n"));
   }
 
   std::cout << "L1 names :- \n ";
-  edm::copy_all(vl1names,std::ostream_iterator<std::string>(std::cout,"\n"));
+  edm::copy_all(vl1names, std::ostream_iterator<std::string>(std::cout, "\n"));
   std::cout << "\n";
   std::cout.flush();
-
 }
 
-void dumpInitView(const InitMsgView* view)
-{
-
-
+void dumpInitView(const InitMsgView* view) {
   dumpInitHeader(view);
   std::cout << "desc len = " << view->descLength() << "\n";
   //const uint8* pos = view->descData();
   //std::copy(pos,pos+view->descLength(),std::ostream_iterator<uint8>(std::cout,""));
   //std::cout << "\n";
   std::cout.flush();
-
 }
 
-void dumpStartMsg(const InitMsgView* view)
-{
+void dumpStartMsg(const InitMsgView* view) {
   dumpInitHeader(view);
   std::cout.flush();
 }
 
-void dumpInitVerbose(const InitMsgView* view)
-{
+void dumpInitVerbose(const InitMsgView* view) {
   std::cout << ">>>>> INIT Message Dump (begin) >>>>>" << std::endl;
   dumpInitHeader(view);
 
   TClass* desc = getTClass(typeid(SendJobHeader));
-  TBufferFile xbuf(TBuffer::kRead, view->descLength(),
-               (char*)view->descData(), kFALSE);
+  TBufferFile xbuf(TBuffer::kRead, view->descLength(), (char*)view->descData(), kFALSE);
   std::unique_ptr<SendJobHeader> sd((SendJobHeader*)xbuf.ReadObjectAny(desc));
 
   if (sd.get() == nullptr) {
     std::cout << "Unable to determine the product registry - "
               << "Registry deserialization error." << std::endl;
-  }
-  else {
+  } else {
     std::cout << "Branch Descriptions:" << std::endl;
     SendDescs const& descs = sd->descs();
     SendDescs::const_iterator iDesc(descs.begin()), eDesc(descs.end());
@@ -121,11 +109,10 @@ void dumpInitVerbose(const InitMsgView* view)
   std::cout.flush();
 }
 
-void dumpInit(uint8* buf)
-{
+void dumpInit(uint8* buf) {
   InitMsgView view(buf);
   dumpInitHeader(&view);
-  
+
   std::cout << "desc len = " << view.descLength() << "\n";
   //const uint8* pos = view.descData();
   //std::copy(pos,pos+view.descLength(),std::ostream_iterator<uint8>(std::cout,""));
@@ -133,49 +120,48 @@ void dumpInit(uint8* buf)
   std::cout.flush();
 }
 
-void printBits(unsigned char c){
-
-        for (int i = 7; i >= 0; --i) {
-            int bit = ((c >> i) & 1);
-            std::cout << " "<<bit;
-        }
+void printBits(unsigned char c) {
+  for (int i = 7; i >= 0; --i) {
+    int bit = ((c >> i) & 1);
+    std::cout << " " << bit;
+  }
 }
 
-void dumpEventHeader(const EventMsgView* eview)
-{
+void dumpEventHeader(const EventMsgView* eview) {
   std::cout << "code=" << eview->code() << "\n"
-       << "size=" << eview->size() << "\n"
-       << "protocolVersion=" << eview->protocolVersion() << "\n"
-       << "run=" << eview->run() << "\n"
-       << "event=" << eview->event() << "\n"
-       << "lumi=" << eview->lumi() << "\n"
-       << "origDataSize=" << eview->origDataSize() << "\n"
-       << "outModId=0x" << std::hex << eview->outModId() << std::dec << "\n"
-       << "adler32 chksum= " << eview->adler32_chksum() << "\n"
-       << "host name= " << eview->hostName() << "\n"
-       << "event length=" << eview->eventLength() << "\n"
-       << "droppedEventsCount=" << eview->droppedEventsCount() << "\n";
+            << "size=" << eview->size() << "\n"
+            << "protocolVersion=" << eview->protocolVersion() << "\n"
+            << "run=" << eview->run() << "\n"
+            << "event=" << eview->event() << "\n"
+            << "lumi=" << eview->lumi() << "\n"
+            << "origDataSize=" << eview->origDataSize() << "\n"
+            << "outModId=0x" << std::hex << eview->outModId() << std::dec << "\n"
+            << "adler32 chksum= " << eview->adler32_chksum() << "\n"
+            << "host name= " << eview->hostName() << "\n"
+            << "event length=" << eview->eventLength() << "\n"
+            << "droppedEventsCount=" << eview->droppedEventsCount() << "\n";
 
   std::vector<bool> l1_out;
   eview->l1TriggerBits(l1_out);
 
   std::cout << "\nl1 size= " << l1_out.size() << "\n l1 bits=\n";
-  edm::copy_all(l1_out,std::ostream_iterator<bool>(std::cout," "));
+  edm::copy_all(l1_out, std::ostream_iterator<bool>(std::cout, " "));
 
   std::vector<unsigned char> hlt_out;
-  if (eview->hltCount() > 0) {hlt_out.resize(1 + (eview->hltCount()-1)/4);}
+  if (eview->hltCount() > 0) {
+    hlt_out.resize(1 + (eview->hltCount() - 1) / 4);
+  }
   eview->hltTriggerBits(&hlt_out[0]);
 
   std::cout << "\nhlt Count:" << eview->hltCount();
   std::cout << "\nhlt bits=\n(";
-  for(int i=(hlt_out.size()-1); i != -1 ; --i)
+  for (int i = (hlt_out.size() - 1); i != -1; --i)
     printBits(hlt_out[i]);
   std::cout << ")\n";
   std::cout.flush();
 }
 
-void dumpEventView(const EventMsgView* eview)
-  {
+void dumpEventView(const EventMsgView* eview) {
   dumpEventHeader(eview);
   //const uint8* edata = eview->eventData();
   //std::cout << "\nevent data=\n(";
@@ -183,17 +169,14 @@ void dumpEventView(const EventMsgView* eview)
   //     std::ostream_iterator<char>(std::cout,""));
   //std::cout << ")\n";
   std::cout.flush();
-
 }
 
-void dumpEventIndex(const EventMsgView* eview)
-{
+void dumpEventIndex(const EventMsgView* eview) {
   dumpEventHeader(eview);
   std::cout.flush();
 }
 
-void dumpEvent(uint8* buf)
-{
+void dumpEvent(uint8* buf) {
   EventMsgView eview(buf);
 
   dumpEventHeader(&eview);
@@ -204,11 +187,9 @@ void dumpEvent(uint8* buf)
   //     std::ostream_iterator<char>(std::cout,""));
   //std::cout << ")\n";
   std::cout.flush();
-
 }
 
-void dumpFRDEventView(const FRDEventMsgView* fview)
-{
+void dumpFRDEventView(const FRDEventMsgView* fview) {
   std::cout << "\n>>>>> FRDEvent Message Dump (begin) >>>>>" << std::endl;
   std::cout.flush();
 
diff --git a/IOPool/Streamer/src/EventMessage.cc b/IOPool/Streamer/src/EventMessage.cc
index 80851197de71a..87e3530b5577c 100644
--- a/IOPool/Streamer/src/EventMessage.cc
+++ b/IOPool/Streamer/src/EventMessage.cc
@@ -1,11 +1,7 @@
 #include "IOPool/Streamer/interface/EventMessage.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-
-EventMsgView::EventMsgView(void* buf):
-  buf_((uint8*)buf),head_(buf),
-  v2Detected_(false)
-{ 
+EventMsgView::EventMsgView(void* buf) : buf_((uint8*)buf), head_(buf), v2Detected_(false) {
   // 29-Jan-2008, KAB - adding an explicit version number.
   // We'll start with 5 to match the new version of the INIT message.
   // We support earlier versions of the full protocol, of course, but since
@@ -17,124 +13,118 @@ EventMsgView::EventMsgView(void* buf):
   // So we no longer support previous formats.
   if (protocolVersion() != 11) {
     throw cms::Exception("EventMsgView", "Invalid Message Version:")
-      << "Only message version 10 is currently supported \n"
-      << "(invalid value = " << protocolVersion() << ").\n"
-      << "We support only reading and converting streamer files\n"
-      << "using the same version of CMSSW used to created the\n"
-      << "streamer file. This is because the streamer format is\n"
-      << "only a temporary format, as such we do not support\n"
-      << "backwards compatibility. If you really need a streamer\n"
-      << "file for some reason, the work around is that you convert\n"
-      << "the streamer file to a Root file using the CMSSW version\n"
-      << "that created the streamer file, then convert the Root file\n"
-      << "to a streamer file using a newer release that will produce\n"
-      << "the version of streamer file that you desire.\n";
+        << "Only message version 10 is currently supported \n"
+        << "(invalid value = " << protocolVersion() << ").\n"
+        << "We support only reading and converting streamer files\n"
+        << "using the same version of CMSSW used to created the\n"
+        << "streamer file. This is because the streamer format is\n"
+        << "only a temporary format, as such we do not support\n"
+        << "backwards compatibility. If you really need a streamer\n"
+        << "file for some reason, the work around is that you convert\n"
+        << "the streamer file to a Root file using the CMSSW version\n"
+        << "that created the streamer file, then convert the Root file\n"
+        << "to a streamer file using a newer release that will produce\n"
+        << "the version of streamer file that you desire.\n";
   }
 
-  uint8* l1_bit_size_ptr = buf_ + sizeof(EventHeader); //Just after Header 
-  l1_bits_count_ = convert32(l1_bit_size_ptr); 
+  uint8* l1_bit_size_ptr = buf_ + sizeof(EventHeader);  //Just after Header
+  l1_bits_count_ = convert32(l1_bit_size_ptr);
   uint32 l1_sz = l1_bits_count_;
-// No point! Not supporting older versions and causes problems in unit
-// tests that uses l1_bits_count_ == 11, and could cause problems later if using 11
-  //Lets detect if thats V2 message 
+  // No point! Not supporting older versions and causes problems in unit
+  // tests that uses l1_bits_count_ == 11, and could cause problems later if using 11
+  //Lets detect if thats V2 message
   //if (l1_bits_count_ == 11) {
-  //        l1_sz = 1; 
+  //        l1_sz = 1;
   //        v2Detected_=true;
   //}
 
-  l1_bits_start_ = buf_ + sizeof(EventHeader) + sizeof(uint32); 
+  l1_bits_start_ = buf_ + sizeof(EventHeader) + sizeof(uint32);
 
-  if (v2Detected_ == false) { 
-     if (l1_sz != 0) l1_sz = 1 + ((l1_sz-1)/8);
+  if (v2Detected_ == false) {
+    if (l1_sz != 0)
+      l1_sz = 1 + ((l1_sz - 1) / 8);
   }
-  uint8* hlt_bit_size_ptr = l1_bits_start_ + l1_sz; 
-  hlt_bits_count_ = convert32(hlt_bit_size_ptr); 
-  hlt_bits_start_ = hlt_bit_size_ptr + sizeof(uint32); 
+  uint8* hlt_bit_size_ptr = l1_bits_start_ + l1_sz;
+  hlt_bits_count_ = convert32(hlt_bit_size_ptr);
+  hlt_bits_start_ = hlt_bit_size_ptr + sizeof(uint32);
   uint32 hlt_sz = hlt_bits_count_;
-  if (hlt_sz != 0) hlt_sz = 1+ ((hlt_sz-1)/4);
+  if (hlt_sz != 0)
+    hlt_sz = 1 + ((hlt_sz - 1) / 4);
 
-  if(v2Detected_) hlt_sz=2;
-  uint8* adler32_start = hlt_bits_start_ + hlt_sz; 
+  if (v2Detected_)
+    hlt_sz = 2;
+  uint8* adler32_start = hlt_bits_start_ + hlt_sz;
   adler32_chksum_ = convert32(adler32_start);
   host_name_start_ = adler32_start + sizeof(uint32);
   host_name_len_ = *host_name_start_;
   host_name_start_ += sizeof(uint8);
   event_start_ = host_name_start_ + host_name_len_;
-  event_len_ = convert32(event_start_); 
-  event_start_ += sizeof(char_uint32); 
+  event_len_ = convert32(event_start_);
+  event_start_ += sizeof(char_uint32);
 }
 
-uint32 EventMsgView::protocolVersion() const
-{
+uint32 EventMsgView::protocolVersion() const {
   EventHeader* h = (EventHeader*)buf_;
   return h->protocolVersion_;
 }
 
-uint32 EventMsgView::run() const
-{
+uint32 EventMsgView::run() const {
   EventHeader* h = (EventHeader*)buf_;
   return convert32(h->run_);
 }
 
-uint64 EventMsgView::event() const
-{
+uint64 EventMsgView::event() const {
   EventHeader* h = (EventHeader*)buf_;
   return convert64(h->event_);
 }
 
-uint32 EventMsgView::lumi() const
-{
+uint32 EventMsgView::lumi() const {
   EventHeader* h = (EventHeader*)buf_;
   return convert32(h->lumi_);
 }
 
-uint32 EventMsgView::origDataSize() const
-{
+uint32 EventMsgView::origDataSize() const {
   EventHeader* h = (EventHeader*)buf_;
   return convert32(h->origDataSize_);
 }
 
-uint32 EventMsgView::outModId() const
-{
+uint32 EventMsgView::outModId() const {
   EventHeader* h = (EventHeader*)buf_;
   return convert32(h->outModId_);
 }
 
-uint32 EventMsgView::droppedEventsCount() const
-{
+uint32 EventMsgView::droppedEventsCount() const {
   EventHeader* h = (EventHeader*)buf_;
   return convert32(h->droppedEventsCount_);
   return 0;
 }
 
-void EventMsgView::l1TriggerBits(std::vector<bool>& put_here) const
-{
+void EventMsgView::l1TriggerBits(std::vector<bool>& put_here) const {
   put_here.clear();
   put_here.resize(l1_bits_count_);
 
-  for(std::vector<bool>::size_type i = 0; i < l1_bits_count_; ++i)
-    put_here[i] = (bool)(l1_bits_start_[i/8] & (1<<((i&0x07))));
+  for (std::vector<bool>::size_type i = 0; i < l1_bits_count_; ++i)
+    put_here[i] = (bool)(l1_bits_start_[i / 8] & (1 << ((i & 0x07))));
 }
 
-void EventMsgView::hltTriggerBits(uint8* put_here) const
-{
+void EventMsgView::hltTriggerBits(uint8* put_here) const {
   uint32 hlt_sz = hlt_bits_count_;
-  if (hlt_sz != 0) hlt_sz = 1 + ((hlt_sz-1)/4);
+  if (hlt_sz != 0)
+    hlt_sz = 1 + ((hlt_sz - 1) / 4);
 
-  if(v2Detected_) hlt_sz=2;
+  if (v2Detected_)
+    hlt_sz = 2;
 
-  std::copy(hlt_bits_start_,hlt_bits_start_ + hlt_sz,
-            put_here);
+  std::copy(hlt_bits_start_, hlt_bits_start_ + hlt_sz, put_here);
 }
 
-std::string EventMsgView::hostName() const
-{
-   //return std::string(reinterpret_cast<char *>(host_name_start_),host_name_len_);
-   std::string host_name(reinterpret_cast<char *>(host_name_start_),host_name_len_);
-   size_t found = host_name.find('\0');
-   if(found != std::string::npos) {
-     return std::string(host_name, 0, found);
-   } else {
-     return host_name;
-   }
+std::string EventMsgView::hostName() const {
+  //return std::string(reinterpret_cast<char *>(host_name_start_),host_name_len_);
+  std::string host_name(reinterpret_cast<char*>(host_name_start_), host_name_len_);
+  size_t found = host_name.find('\0');
+  if (found != std::string::npos) {
+    return std::string(host_name, 0, found);
+  } else {
+    return host_name;
+  }
 }
diff --git a/IOPool/Streamer/src/EventMsgBuilder.cc b/IOPool/Streamer/src/EventMsgBuilder.cc
index d45d8003a0498..6f2a3fd9ac23d 100644
--- a/IOPool/Streamer/src/EventMsgBuilder.cc
+++ b/IOPool/Streamer/src/EventMsgBuilder.cc
@@ -6,49 +6,56 @@
 
 #define MAX_HOSTNAME_LEN 25
 
-EventMsgBuilder::EventMsgBuilder(void* buf, uint32 size,
-                                 uint32 run, uint64 event, uint32 lumi,
-                                 uint32 outModId, uint32 droppedEventsCount,
+EventMsgBuilder::EventMsgBuilder(void* buf,
+                                 uint32 size,
+                                 uint32 run,
+                                 uint64 event,
+                                 uint32 lumi,
+                                 uint32 outModId,
+                                 uint32 droppedEventsCount,
                                  std::vector<bool>& l1_bits,
-                                 uint8* hlt_bits, uint32 hlt_bit_count, 
-                                 uint32 adler_chksum, const char* host_name):
-  buf_((uint8*)buf),size_(size)
-{
+                                 uint8* hlt_bits,
+                                 uint32 hlt_bit_count,
+                                 uint32 adler_chksum,
+                                 const char* host_name)
+    : buf_((uint8*)buf), size_(size) {
   EventHeader* h = (EventHeader*)buf_;
   h->protocolVersion_ = 11;
-  convert(run,h->run_);
-  convert(event,h->event_);
-  convert(lumi,h->lumi_);
-  convert(outModId,h->outModId_);
-  convert(droppedEventsCount,h->droppedEventsCount_);
+  convert(run, h->run_);
+  convert(event, h->event_);
+  convert(lumi, h->lumi_);
+  convert(outModId, h->outModId_);
+  convert(droppedEventsCount, h->droppedEventsCount_);
   uint8* pos = buf_ + sizeof(EventHeader);
 
   // l1 count
   uint32 l1_count = l1_bits.size();
   convert(l1_count, pos);
-  pos = pos + sizeof(uint32); 
+  pos = pos + sizeof(uint32);
 
-  // set the l1 
+  // set the l1
   uint32 l1_sz = l1_bits.size();
-  if (l1_sz != 0) l1_sz = 1 + ((l1_sz-1)/8);
- 
+  if (l1_sz != 0)
+    l1_sz = 1 + ((l1_sz - 1) / 8);
+
   uint8* pos_end = pos + l1_sz;
-  memset(pos,0x00, pos_end-pos); // clear the bits
-  for(std::vector<bool>::size_type i = 0; i < l1_bits.size(); ++i) {
-      uint8 v = l1_bits[i] ? 1 : 0;
-      pos[i/8] |= (v << (i&0x07));
+  memset(pos, 0x00, pos_end - pos);  // clear the bits
+  for (std::vector<bool>::size_type i = 0; i < l1_bits.size(); ++i) {
+    uint8 v = l1_bits[i] ? 1 : 0;
+    pos[i / 8] |= (v << (i & 0x07));
   }
   pos = pos_end;
 
   // hlt count
-  convert(hlt_bit_count, pos); 
+  convert(hlt_bit_count, pos);
   pos = pos + sizeof(uint32);
 
   uint32 hlt_sz = hlt_bit_count;
-  if (hlt_sz != 0) hlt_sz = 1+ ((hlt_sz-1)/4);
+  if (hlt_sz != 0)
+    hlt_sz = 1 + ((hlt_sz - 1) / 4);
 
   // copy the hlt bits over
-  pos = std::copy(hlt_bits, hlt_bits+hlt_sz, pos);
+  pos = std::copy(hlt_bits, hlt_bits + hlt_sz, pos);
 
   // adler32 check sum of data blob
   convert(adler_chksum, pos);
@@ -66,13 +73,13 @@ EventMsgBuilder::EventMsgBuilder(void* buf, uint32 size,
 
   //Put host_name
   uint32 real_len = strlen(host_name);
-  if(real_len < host_name_len) {
+  if (real_len < host_name_len) {
     char hostname_2use[MAX_HOSTNAME_LEN];
-    memset(hostname_2use,'\0',host_name_len);
-    memcpy(hostname_2use,host_name,real_len);
-    memcpy(pos,hostname_2use,host_name_len);
+    memset(hostname_2use, '\0', host_name_len);
+    memcpy(hostname_2use, host_name, real_len);
+    memcpy(pos, hostname_2use, host_name_len);
   } else {
-    memcpy(pos,host_name,host_name_len);
+    memcpy(pos, host_name, host_name_len);
   }
   pos += host_name_len;
 
@@ -80,21 +87,18 @@ EventMsgBuilder::EventMsgBuilder(void* buf, uint32 size,
   setEventLength(0);
 }
 
-void EventMsgBuilder::setOrigDataSize(uint32 value)
-{
+void EventMsgBuilder::setOrigDataSize(uint32 value) {
   EventHeader* h = (EventHeader*)buf_;
-  convert(value,h->origDataSize_);
+  convert(value, h->origDataSize_);
 }
 
-void EventMsgBuilder::setEventLength(uint32 len)
-{
-  convert(len,event_addr_-sizeof(char_uint32));
+void EventMsgBuilder::setEventLength(uint32 len) {
+  convert(len, event_addr_ - sizeof(char_uint32));
   EventHeader* h = (EventHeader*)buf_;
-  new (&h->header_) Header(Header::EVENT,event_addr_-buf_+len);
+  new (&h->header_) Header(Header::EVENT, event_addr_ - buf_ + len);
 }
 
-uint32 EventMsgBuilder::size() const
-{
+uint32 EventMsgBuilder::size() const {
   HeaderView v(buf_);
   return v.size();
 }
diff --git a/IOPool/Streamer/src/FRDEventMessage.cc b/IOPool/Streamer/src/FRDEventMessage.cc
index 2e5b34b38d03b..2ffdcb5bf0134 100644
--- a/IOPool/Streamer/src/FRDEventMessage.cc
+++ b/IOPool/Streamer/src/FRDEventMessage.cc
@@ -15,33 +15,32 @@
  * Constructor for the FRD event message viewer.
  */
 FRDEventMsgView::FRDEventMsgView(void* buf)
-  : buf_((uint8*)buf),
-    payload_(nullptr),
-    size_(0),
-    version_(0),
-    run_(0),
-    lumi_(0),
-    event_(0),
-    eventSize_(0),
-    paddingSize_(0),
-    adler32_(0),
-    crc32c_(0)
-{
+    : buf_((uint8*)buf),
+      payload_(nullptr),
+      size_(0),
+      version_(0),
+      run_(0),
+      lumi_(0),
+      event_(0),
+      eventSize_(0),
+      paddingSize_(0),
+      adler32_(0),
+      crc32c_(0) {
   uint32* bufPtr = static_cast<uint32*>(buf);
   version_ = *bufPtr;
   // if the version number is rather large, then we assume that the true
   // version number is one.  (In version one of the format, there was
   // no version number in the data, and the run number appeared first.)
   if (version_ >= 32) {
-      version_ = 1;
+    version_ = 1;
   }
 
   size_ = 0;
 
   // version number
   if (version_ >= 2) {
-      size_ += sizeof(uint32);
-      ++bufPtr;
+    size_ += sizeof(uint32);
+    ++bufPtr;
   }
 
   // run number
@@ -51,18 +50,18 @@ FRDEventMsgView::FRDEventMsgView(void* buf)
 
   // lumi number
   if (version_ >= 2) {
-      lumi_ = *bufPtr;
-      size_ += sizeof(uint32);
-      ++bufPtr;
+    lumi_ = *bufPtr;
+    size_ += sizeof(uint32);
+    ++bufPtr;
   }
 
   // event number
   if (version_ == 4) {
-    uint64 eventLow =  *bufPtr;
+    uint64 eventLow = *bufPtr;
     size_ += sizeof(uint32);
     ++bufPtr;
 
-    uint64 eventHigh =  *bufPtr;
+    uint64 eventHigh = *bufPtr;
     size_ += sizeof(uint32);
     ++bufPtr;
 
@@ -75,34 +74,32 @@ FRDEventMsgView::FRDEventMsgView(void* buf)
   }
 
   if (version_ >= 3) {
-      // event size
-      eventSize_ = *bufPtr;
-      size_ += sizeof(uint32) + eventSize_;
-      ++bufPtr;
+    // event size
+    eventSize_ = *bufPtr;
+    size_ += sizeof(uint32) + eventSize_;
+    ++bufPtr;
 
-      if (version_ >= 5) {
-        crc32c_ = *bufPtr;
-        size_ += sizeof(uint32);
-        ++bufPtr;
-      }
-      else {
-        // padding size up to V4
-        paddingSize_ = *bufPtr;
-        size_ += sizeof(uint32) + paddingSize_;
-        ++bufPtr;
+    if (version_ >= 5) {
+      crc32c_ = *bufPtr;
+      size_ += sizeof(uint32);
+      ++bufPtr;
+    } else {
+      // padding size up to V4
+      paddingSize_ = *bufPtr;
+      size_ += sizeof(uint32) + paddingSize_;
+      ++bufPtr;
 
-        adler32_ = *bufPtr;
-        size_ += sizeof(uint32);
-        ++bufPtr;
-      }
-  }
-  else {
-      for (int idx = 0; idx < 1024; idx++) {
-          size_ += sizeof(uint32);  // FED N size
-          size_ += *bufPtr;         // FED N data
-          eventSize_ += *bufPtr;
-          ++bufPtr;
-      }
+      adler32_ = *bufPtr;
+      size_ += sizeof(uint32);
+      ++bufPtr;
+    }
+  } else {
+    for (int idx = 0; idx < 1024; idx++) {
+      size_ += sizeof(uint32);  // FED N size
+      size_ += *bufPtr;         // FED N data
+      eventSize_ += *bufPtr;
+      ++bufPtr;
+    }
   }
 
   payload_ = (void*)bufPtr;
diff --git a/IOPool/Streamer/src/InitMessage.cc b/IOPool/Streamer/src/InitMessage.cc
index 709d9a9f46afa..338019471d291 100644
--- a/IOPool/Streamer/src/InitMessage.cc
+++ b/IOPool/Streamer/src/InitMessage.cc
@@ -4,37 +4,37 @@
 #include <iterator>
 #include <cstring>
 
-InitMsgView::InitMsgView(void* buf) :
-  buf_((uint8*)buf),
-  head_(buf),
-  release_start_(nullptr),
-  release_len_(0),
-  processName_start_(nullptr),
-  processName_len_(0),
-  outputModuleLabel_start_(nullptr),
-  outputModuleLabel_len_(0),
-  outputModuleId_(0),
-  hlt_trig_start_(nullptr),
-  hlt_trig_count_(0),
-  hlt_trig_len_(0),
-  hlt_select_start_(nullptr),
-  hlt_select_count_(0),
-  hlt_select_len_(0),
-  l1_trig_start_(nullptr),
-  l1_trig_count_(0),
-  l1_trig_len_(0),
-  adler32_chksum_(0),
-  host_name_start_(nullptr),
-  host_name_len_(0),
-  desc_start_(nullptr),
-  desc_len_(0) {
+InitMsgView::InitMsgView(void* buf)
+    : buf_((uint8*)buf),
+      head_(buf),
+      release_start_(nullptr),
+      release_len_(0),
+      processName_start_(nullptr),
+      processName_len_(0),
+      outputModuleLabel_start_(nullptr),
+      outputModuleLabel_len_(0),
+      outputModuleId_(0),
+      hlt_trig_start_(nullptr),
+      hlt_trig_count_(0),
+      hlt_trig_len_(0),
+      hlt_select_start_(nullptr),
+      hlt_select_count_(0),
+      hlt_select_len_(0),
+      l1_trig_start_(nullptr),
+      l1_trig_count_(0),
+      l1_trig_len_(0),
+      adler32_chksum_(0),
+      host_name_start_(nullptr),
+      host_name_len_(0),
+      desc_start_(nullptr),
+      desc_len_(0) {
   if (protocolVersion() == 2) {
-      std::cout << "Protocol Version 2 encountered" << std::endl;
-      release_start_ = buf_ + sizeof(InitHeader) - (sizeof(uint32)*2);
-      // Minus the size for Init and Event Header size fileds
-      // in the InitHeader
-  } else { //For version 3
-      release_start_ = buf_ + sizeof(InitHeader);
+    std::cout << "Protocol Version 2 encountered" << std::endl;
+    release_start_ = buf_ + sizeof(InitHeader) - (sizeof(uint32) * 2);
+    // Minus the size for Init and Event Header size fileds
+    // in the InitHeader
+  } else {  //For version 3
+    release_start_ = buf_ + sizeof(InitHeader);
   }
   release_len_ = *release_start_;
   release_start_ += sizeof(uint8);
@@ -42,23 +42,23 @@ InitMsgView::InitMsgView(void* buf) :
 
   //Lets get Process Name from right after Release Name
   if (protocolVersion() > 3) {
-        //std::cout << "Protocol Version > 3 encountered" << std::endl;
-        processName_len_ = *pos;
-        processName_start_ = (uint8*)(pos + sizeof(uint8));
-        pos = processName_start_ + processName_len_;
-
-        // Output Module Label
-        if (protocolVersion() > 4) {
-            outputModuleLabel_len_ = *pos;
-            outputModuleLabel_start_ = (uint8*)(pos + sizeof(uint8));
-            pos = outputModuleLabel_start_ + outputModuleLabel_len_;
-
-            // Output Module Id
-            if (protocolVersion() > 5) {
-              outputModuleId_ = convert32(pos);
-              pos += sizeof(char_uint32);
-            }
-        }
+    //std::cout << "Protocol Version > 3 encountered" << std::endl;
+    processName_len_ = *pos;
+    processName_start_ = (uint8*)(pos + sizeof(uint8));
+    pos = processName_start_ + processName_len_;
+
+    // Output Module Label
+    if (protocolVersion() > 4) {
+      outputModuleLabel_len_ = *pos;
+      outputModuleLabel_start_ = (uint8*)(pos + sizeof(uint8));
+      pos = outputModuleLabel_start_ + outputModuleLabel_len_;
+
+      // Output Module Id
+      if (protocolVersion() > 5) {
+        outputModuleId_ = convert32(pos);
+        pos += sizeof(char_uint32);
+      }
+    }
   }
 
   hlt_trig_start_ = pos;
@@ -69,12 +69,12 @@ InitMsgView::InitMsgView(void* buf) :
   pos = hlt_trig_start_ + hlt_trig_len_;
 
   if (protocolVersion() > 4) {
-      hlt_select_start_ = pos;
-      hlt_select_count_ = convert32(hlt_select_start_);
-      hlt_select_start_ += sizeof(char_uint32);
-      hlt_select_len_ = convert32(hlt_select_start_);
-      hlt_select_start_ += sizeof(char_uint32);
-      pos = hlt_select_start_ + hlt_select_len_;
+    hlt_select_start_ = pos;
+    hlt_select_count_ = convert32(hlt_select_start_);
+    hlt_select_start_ += sizeof(char_uint32);
+    hlt_select_len_ = convert32(hlt_select_start_);
+    hlt_select_start_ += sizeof(char_uint32);
+    pos = hlt_select_start_ + hlt_select_len_;
   }
 
   l1_trig_start_ = pos;
@@ -101,83 +101,77 @@ InitMsgView::InitMsgView(void* buf) :
   desc_start_ += sizeof(char_uint32);
 }
 
-uint32 InitMsgView::run() const
-{
+uint32 InitMsgView::run() const {
   InitHeader* h = reinterpret_cast<InitHeader*>(buf_);
   return convert32(h->run_);
 }
 
-uint32 InitMsgView::protocolVersion() const
-{
+uint32 InitMsgView::protocolVersion() const {
   InitHeader* h = reinterpret_cast<InitHeader*>(buf_);
   return h->version_.protocol_;
 }
 
-void InitMsgView::pset(uint8* put_here) const
-{
+void InitMsgView::pset(uint8* put_here) const {
   InitHeader* h = reinterpret_cast<InitHeader*>(buf_);
-  memcpy(put_here,h->version_.pset_id_,sizeof(h->version_.pset_id_));
+  memcpy(put_here, h->version_.pset_id_, sizeof(h->version_.pset_id_));
 }
 
-std::string InitMsgView::releaseTag() const
-{
-  return std::string(reinterpret_cast<char *>(release_start_),release_len_);
+std::string InitMsgView::releaseTag() const {
+  return std::string(reinterpret_cast<char*>(release_start_), release_len_);
 }
 
-std::string InitMsgView::processName() const
-{
-   if (protocolVersion() < 4)
-      throw cms::Exception("Invalid Message Version", "InitMsgView")
-        << "Process Name is only supported in Protocol Version 4 and above" << ".\n";
+std::string InitMsgView::processName() const {
+  if (protocolVersion() < 4)
+    throw cms::Exception("Invalid Message Version", "InitMsgView")
+        << "Process Name is only supported in Protocol Version 4 and above"
+        << ".\n";
 
-   return std::string(reinterpret_cast<char *>(processName_start_),processName_len_);
+  return std::string(reinterpret_cast<char*>(processName_start_), processName_len_);
 }
 
-std::string InitMsgView::outputModuleLabel() const
-{
-   if (protocolVersion() < 5)
-      throw cms::Exception("Invalid Message Version", "InitMsgView")
-        << "Output Module Label is only supported in Protocol Version 5 and above" << ".\n";
+std::string InitMsgView::outputModuleLabel() const {
+  if (protocolVersion() < 5)
+    throw cms::Exception("Invalid Message Version", "InitMsgView")
+        << "Output Module Label is only supported in Protocol Version 5 and above"
+        << ".\n";
 
-   return std::string(reinterpret_cast<char *>(outputModuleLabel_start_),outputModuleLabel_len_);
+  return std::string(reinterpret_cast<char*>(outputModuleLabel_start_), outputModuleLabel_len_);
 }
 
-
-void InitMsgView::hltTriggerNames(Strings& save_here) const
-{
-  MsgTools::getNames(hlt_trig_start_,hlt_trig_len_,save_here);
+void InitMsgView::hltTriggerNames(Strings& save_here) const {
+  MsgTools::getNames(hlt_trig_start_, hlt_trig_len_, save_here);
 }
 
-void InitMsgView::hltTriggerSelections(Strings& save_here) const
-{
+void InitMsgView::hltTriggerSelections(Strings& save_here) const {
   if (protocolVersion() < 5)
     throw cms::Exception("Invalid Message Version", "InitMsgView")
-      << "HLT trigger selections are only supported in Protocol Version 5 and above" << ".\n";
+        << "HLT trigger selections are only supported in Protocol Version 5 and above"
+        << ".\n";
 
-  MsgTools::getNames(hlt_select_start_,hlt_select_len_,save_here);
+  MsgTools::getNames(hlt_select_start_, hlt_select_len_, save_here);
 }
 
-void InitMsgView::l1TriggerNames(Strings& save_here) const
-{
-  MsgTools::getNames(l1_trig_start_,l1_trig_len_,save_here);
+void InitMsgView::l1TriggerNames(Strings& save_here) const {
+  MsgTools::getNames(l1_trig_start_, l1_trig_len_, save_here);
 }
 
-uint32 InitMsgView::eventHeaderSize() const
-{
+uint32 InitMsgView::eventHeaderSize() const {
   if (protocolVersion() == 2) {
-       /** This is estimated size of event header for Protocol Version 2. */
+    /** This is estimated size of event header for Protocol Version 2. */
 
-       uint32 hlt_sz = get_hlt_bit_cnt();
-       if (hlt_sz != 0 ) hlt_sz = 1+ ((hlt_sz-1)/4);
+    uint32 hlt_sz = get_hlt_bit_cnt();
+    if (hlt_sz != 0)
+      hlt_sz = 1 + ((hlt_sz - 1) / 4);
 
-       uint32 l1_sz = get_l1_bit_cnt();
-       if (l1_sz != 0) l1_sz = 1 + ((l1_sz-1)/8);
+    uint32 l1_sz = get_l1_bit_cnt();
+    if (l1_sz != 0)
+      l1_sz = 1 + ((l1_sz - 1) / 8);
 
-       return 1 + (4*8) + hlt_sz+l1_sz;
-   }
+    return 1 + (4 * 8) + hlt_sz + l1_sz;
+  }
 
-   InitHeader* h = reinterpret_cast<InitHeader*>(buf_);
-   return convert32(h->event_header_size_);
+  InitHeader* h = reinterpret_cast<InitHeader*>(buf_);
+  return convert32(h->event_header_size_);
 }
 
 /***
@@ -187,18 +181,16 @@ uint32 InitMsgView::initHeaderSize() const
   return convert32(h->init_header_size_);
 } **/
 
-std::string InitMsgView::hostName() const
-{
+std::string InitMsgView::hostName() const {
   if (host_name_start_) {
-    std::string host_name(reinterpret_cast<char *>(host_name_start_),host_name_len_);
+    std::string host_name(reinterpret_cast<char*>(host_name_start_), host_name_len_);
     size_t found = host_name.find('\0');
-    if(found != std::string::npos) {
+    if (found != std::string::npos) {
       return std::string(host_name, 0, found);
     } else {
       return host_name;
     }
-  }
-  else {
+  } else {
     return "n/a";
   }
 }
diff --git a/IOPool/Streamer/src/InitMsgBuilder.cc b/IOPool/Streamer/src/InitMsgBuilder.cc
index befd5792851c3..6aefa5bb34b72 100644
--- a/IOPool/Streamer/src/InitMsgBuilder.cc
+++ b/IOPool/Streamer/src/InitMsgBuilder.cc
@@ -6,29 +6,30 @@
 #include <cstdint>
 #include <unistd.h>
 
-InitMsgBuilder::InitMsgBuilder(void* buf, uint32 size,
-                               uint32 run, const Version& v,
+InitMsgBuilder::InitMsgBuilder(void* buf,
+                               uint32 size,
+                               uint32 run,
+                               const Version& v,
                                const char* release_tag,
-                               const char* process_name,		       
+                               const char* process_name,
                                const char* output_module_label,
                                uint32 output_module_id,
                                const Strings& hlt_names,
                                const Strings& hlt_selections,
                                const Strings& l1_names,
-                               uint32 adler_chksum):
-  buf_((uint8*)buf),size_(size)
-{
+                               uint32 adler_chksum)
+    : buf_((uint8*)buf), size_(size) {
   InitHeader* h = (InitHeader*)buf_;
   // fixed length parts
   new (&h->version_) Version(v);
-  convert(run,h->run_);
+  convert(run, h->run_);
   // variable length parts
   uint32 tag_len = strlen(release_tag);
   assert(tag_len < 0x00ff);
-  uint8* pos = buf_+sizeof(InitHeader);
+  uint8* pos = buf_ + sizeof(InitHeader);
 
-  *pos++ = tag_len; // length of release tag
-  memcpy(pos,release_tag,tag_len); // copy release tag in
+  *pos++ = tag_len;                   // length of release tag
+  memcpy(pos, release_tag, tag_len);  // copy release tag in
   pos += tag_len;
 
   //Lets put Process Name (Length and then Name) right after release_tag
@@ -37,23 +38,23 @@ InitMsgBuilder::InitMsgBuilder(void* buf, uint32 size,
   //Put process_name_len
   *pos++ = process_name_len;
   //Put process_name
-  memcpy(pos,process_name,process_name_len);
+  memcpy(pos, process_name, process_name_len);
   pos += process_name_len;
 
   // output module label next
   uint32 outmod_label_len = strlen(output_module_label);
   assert(outmod_label_len < 0x00ff);
   *pos++ = outmod_label_len;
-  memcpy(pos,output_module_label,outmod_label_len);
+  memcpy(pos, output_module_label, outmod_label_len);
   pos += outmod_label_len;
 
   // output module ID next
   convert(output_module_id, pos);
   pos += sizeof(char_uint32);
 
-  pos = MsgTools::fillNames(hlt_names,pos);
-  pos = MsgTools::fillNames(hlt_selections,pos);
-  pos = MsgTools::fillNames(l1_names,pos);
+  pos = MsgTools::fillNames(hlt_names, pos);
+  pos = MsgTools::fillNames(hlt_selections, pos);
+  pos = MsgTools::fillNames(l1_names, pos);
 
   // adler32 check sum of data blob
   convert(adler_chksum, pos);
@@ -76,35 +77,38 @@ InitMsgBuilder::InitMsgBuilder(void* buf, uint32 size,
   uint32_t adler32 = 0;
   char host_name[255];
   int got_host = gethostname(host_name, 255);
-  if(got_host != 0) strcpy(host_name, "noHostNameFoundOrTooLong");
-  EventMsgBuilder dummyMsg(&msgBuff[0], TEMP_BUFFER_SIZE, 0, 0, 0, 0, 0,
-                           dummyL1Bits, (uint8*) &dummyHLTBits[0],
-                           hlt_names.size(), adler32, host_name);
+  if (got_host != 0)
+    strcpy(host_name, "noHostNameFoundOrTooLong");
+  EventMsgBuilder dummyMsg(&msgBuff[0],
+                           TEMP_BUFFER_SIZE,
+                           0,
+                           0,
+                           0,
+                           0,
+                           0,
+                           dummyL1Bits,
+                           (uint8*)&dummyHLTBits[0],
+                           hlt_names.size(),
+                           adler32,
+                           host_name);
 
   //Size of Event Header
   uint32 eventHeaderSize = dummyMsg.headerSize();
   convert(eventHeaderSize, h->event_header_size_);
 }
 
-void InitMsgBuilder::setDataLength(uint32 len)
-{
-  convert(len,data_addr_-sizeof(char_uint32));
+void InitMsgBuilder::setDataLength(uint32 len) {
+  convert(len, data_addr_ - sizeof(char_uint32));
   InitHeader* h = (InitHeader*)buf_;
   new (&h->header_) Header(Header::INIT, data_addr_ - buf_ + len);
 }
 
-
-uint32 InitMsgBuilder::size() const
-{
-
+uint32 InitMsgBuilder::size() const {
   HeaderView v(buf_);
   return v.size();
 }
 
-
-uint32 InitMsgBuilder::run() const
-{
+uint32 InitMsgBuilder::run() const {
   InitHeader* h = (InitHeader*)buf_;
   return convert32(h->run_);
 }
-
diff --git a/IOPool/Streamer/src/StreamSerializer.cc b/IOPool/Streamer/src/StreamSerializer.cc
index 655cd28f1deca..529bc328254b7 100644
--- a/IOPool/Streamer/src/StreamSerializer.cc
+++ b/IOPool/Streamer/src/StreamSerializer.cc
@@ -32,29 +32,25 @@ namespace edm {
   /**
    * Creates a translator instance for the specified product registry.
    */
-  StreamSerializer::StreamSerializer(SelectedProducts const* selections):
-    selections_(selections),
-    tc_(getTClass(typeid(SendEvent))) {
-  }
+  StreamSerializer::StreamSerializer(SelectedProducts const* selections)
+      : selections_(selections), tc_(getTClass(typeid(SendEvent))) {}
 
   /**
    * Serializes the product registry (that was specified to the constructor)
    * into the specified InitMessage.
    */
 
-  int StreamSerializer::serializeRegistry(SerializeDataBuffer &data_buffer,
-                                          const BranchIDLists &branchIDLists,
+  int StreamSerializer::serializeRegistry(SerializeDataBuffer& data_buffer,
+                                          const BranchIDLists& branchIDLists,
                                           ThinnedAssociationsHelper const& thinnedAssociationsHelper) {
     FDEBUG(6) << "StreamSerializer::serializeRegistry" << std::endl;
     SendJobHeader sd;
 
     FDEBUG(9) << "Product List: " << std::endl;
 
-
-    for(auto const& selection : *selections_)  {
-        sd.push_back(*selection.first);
-        FDEBUG(9) << "StreamOutput got product = " << selection.first->className()
-                  << std::endl;
+    for (auto const& selection : *selections_) {
+      sd.push_back(*selection.first);
+      FDEBUG(9) << "StreamOutput got product = " << selection.first->className() << std::endl;
     }
     Service<ConstProductRegistry> reg;
     sd.setBranchIDLists(branchIDLists);
@@ -66,43 +62,43 @@ namespace edm {
 
     data_buffer.rootbuf_.Reset();
 
-    RootDebug tracer(10,10);
+    RootDebug tracer(10, 10);
 
     TClass* tc = getTClass(typeid(SendJobHeader));
     int bres = data_buffer.rootbuf_.WriteObjectAny((char*)&sd, tc);
 
-    switch(bres) {
-      case 0: // failure
+    switch (bres) {
+      case 0:  // failure
       {
-          throw cms::Exception("StreamTranslation","Registry serialization failed")
+        throw cms::Exception("StreamTranslation", "Registry serialization failed")
             << "StreamSerializer failed to serialize registry\n";
-          break;
+        break;
       }
-      case 1: // succcess
+      case 1:  // succcess
         break;
-      case 2: // truncated result
+      case 2:  // truncated result
       {
-          throw cms::Exception("StreamTranslation","Registry serialization truncated")
+        throw cms::Exception("StreamTranslation", "Registry serialization truncated")
             << "StreamSerializer module attempted to serialize\n"
             << "a registry that is to big for the allocated buffers\n";
-          break;
+        break;
       }
-      default: // unknown
+      default:  // unknown
       {
-          throw cms::Exception("StreamTranslation","Registry serialization failed")
+        throw cms::Exception("StreamTranslation", "Registry serialization failed")
             << "StreamSerializer module got an unknown error code\n"
             << " while attempting to serialize registry\n";
-          break;
+        break;
       }
     }
 
-   data_buffer.curr_event_size_ = data_buffer.rootbuf_.Length();
-   data_buffer.curr_space_used_ = data_buffer.curr_event_size_;
-   data_buffer.ptr_ = (unsigned char*)data_buffer.rootbuf_.Buffer();
-   // calculate the adler32 checksum and fill it into the struct
-   data_buffer.adler32_chksum_ = cms::Adler32((char*)data_buffer.bufferPointer(), data_buffer.curr_space_used_);
-   //std::cout << "Adler32 checksum of init message = " << data_buffer.adler32_chksum_ << std::endl;
-   return data_buffer.curr_space_used_;
+    data_buffer.curr_event_size_ = data_buffer.rootbuf_.Length();
+    data_buffer.curr_space_used_ = data_buffer.curr_event_size_;
+    data_buffer.ptr_ = (unsigned char*)data_buffer.rootbuf_.Buffer();
+    // calculate the adler32 checksum and fill it into the struct
+    data_buffer.adler32_chksum_ = cms::Adler32((char*)data_buffer.bufferPointer(), data_buffer.curr_space_used_);
+    //std::cout << "Adler32 checksum of init message = " << data_buffer.adler32_chksum_ << std::endl;
+    return data_buffer.curr_space_used_;
   }
 
   /**
@@ -127,9 +123,9 @@ namespace edm {
    */
   int StreamSerializer::serializeEvent(EventForOutput const& event,
                                        ParameterSetID const& selectorConfig,
-                                       bool use_compression, int compression_level,
+                                       bool use_compression,
+                                       int compression_level,
                                        SerializeDataBuffer& data_buffer) const {
-
     EventSelectionIDVector selectionIDs = event.eventSelectionIDs();
     selectionIDs.push_back(selectorConfig);
     SendEvent se(event.eventAuxiliary(), event.processHistory(), selectionIDs, event.branchListIndexes());
@@ -148,84 +144,77 @@ namespace edm {
     // the PoolOutputModule. That information is currently
     // lost when the streamer output module is used.
 
-    for(auto const& selection : *selections_) {
+    for (auto const& selection : *selections_) {
       BranchDescription const& desc = *selection.first;
       BasicHandle result = event.getByToken(selection.second, desc.unwrappedTypeID());
-      if(!result.isValid()) {
+      if (!result.isValid()) {
         // No product with this ID was put in the event.
         // Create and write the provenance.
         se.products().push_back(StreamedProduct(desc));
       } else {
         if (result.provenance()->productProvenance()) {
-          Parentage const* parentage = ParentageRegistry::instance()->getMapped(result.provenance()->productProvenance()->parentageID());
+          Parentage const* parentage =
+              ParentageRegistry::instance()->getMapped(result.provenance()->productProvenance()->parentageID());
           assert(parentage);
-          se.products().push_back(StreamedProduct(result.wrapper(),
-                                                  desc,
-                                                  result.wrapper() != nullptr,
-                                                  &parentage->parents()));
+          se.products().push_back(
+              StreamedProduct(result.wrapper(), desc, result.wrapper() != nullptr, &parentage->parents()));
         } else {
-          se.products().push_back(StreamedProduct(result.wrapper(),
-                                                  desc,
-                                                  result.wrapper() != nullptr,
-                                                  nullptr));
-	}
+          se.products().push_back(StreamedProduct(result.wrapper(), desc, result.wrapper() != nullptr, nullptr));
+        }
       }
     }
 
     data_buffer.rootbuf_.Reset();
-    RootDebug tracer(10,10);
+    RootDebug tracer(10, 10);
 
     //TClass* tc = getTClass(typeid(SendEvent));
-    int bres = data_buffer.rootbuf_.WriteObjectAny(&se,tc_);
-    switch(bres) {
-      case 0: // failure
-        {
-          throw cms::Exception("StreamTranslation","Event serialization failed")
-            << "StreamSerializer failed to serialize event: "
-            << event.id();
-          break;
-        }
-      case 1: // succcess
+    int bres = data_buffer.rootbuf_.WriteObjectAny(&se, tc_);
+    switch (bres) {
+      case 0:  // failure
+      {
+        throw cms::Exception("StreamTranslation", "Event serialization failed")
+            << "StreamSerializer failed to serialize event: " << event.id();
         break;
-      case 2: // truncated result
-        {
-          throw cms::Exception("StreamTranslation","Event serialization truncated")
+      }
+      case 1:  // succcess
+        break;
+      case 2:  // truncated result
+      {
+        throw cms::Exception("StreamTranslation", "Event serialization truncated")
             << "StreamSerializer module attempted to serialize an event\n"
-            << "that is to big for the allocated buffers: "
-            << event.id();
-          break;
-        }
-    default: // unknown
-        {
-          throw cms::Exception("StreamTranslation","Event serialization failed")
+            << "that is to big for the allocated buffers: " << event.id();
+        break;
+      }
+      default:  // unknown
+      {
+        throw cms::Exception("StreamTranslation", "Event serialization failed")
             << "StreamSerializer module got an unknown error code\n"
-            << " while attempting to serialize event: "
-            << event.id();
-          break;
-        }
+            << " while attempting to serialize event: " << event.id();
+        break;
       }
+    }
 
-   data_buffer.curr_event_size_ = data_buffer.rootbuf_.Length();
-   data_buffer.curr_space_used_ = data_buffer.curr_event_size_;
-   data_buffer.ptr_ = (unsigned char*)data_buffer.rootbuf_.Buffer();
+    data_buffer.curr_event_size_ = data_buffer.rootbuf_.Length();
+    data_buffer.curr_space_used_ = data_buffer.curr_event_size_;
+    data_buffer.ptr_ = (unsigned char*)data_buffer.rootbuf_.Buffer();
 #if 0
    if(data_buffer.ptr_ != data_.ptr_) {
         std::cerr << "ROOT reset the buffer!!!!\n";
         data_.ptr_ = data_buffer.ptr_; // ROOT may have reset our data pointer!!!!
         }
 #endif
-   // std::copy(rootbuf_.Buffer(),rootbuf_.Buffer()+rootbuf_.Length(),
-   // eventMessage.eventAddr());
-   // eventMessage.setEventLength(rootbuf.Length());
+    // std::copy(rootbuf_.Buffer(),rootbuf_.Buffer()+rootbuf_.Length(),
+    // eventMessage.eventAddr());
+    // eventMessage.setEventLength(rootbuf.Length());
 
     // compress before return if we need to
     // should test if compressed already - should never be?
     //   as double compression can have problems
-    if(use_compression) {
+    if (use_compression) {
       unsigned int dest_size =
-        compressBuffer(data_buffer.ptr_, data_buffer.curr_event_size_, data_buffer.comp_buf_, compression_level);
-      if(dest_size != 0) {
-        data_buffer.ptr_ = &data_buffer.comp_buf_[0]; // reset to point at compressed area
+          compressBuffer(data_buffer.ptr_, data_buffer.curr_event_size_, data_buffer.comp_buf_, compression_level);
+      if (dest_size != 0) {
+        data_buffer.ptr_ = &data_buffer.comp_buf_[0];  // reset to point at compressed area
         data_buffer.curr_space_used_ = dest_size;
       }
     }
@@ -241,40 +230,34 @@ namespace edm {
    * specified output buffer.  Returns the size of the compressed data
    * or zero if compression failed.
    */
-  unsigned int
-  StreamSerializer::compressBuffer(unsigned char *inputBuffer,
-                                   unsigned int inputSize,
-                                   std::vector<unsigned char> &outputBuffer,
-                                   int compressionLevel) {
+  unsigned int StreamSerializer::compressBuffer(unsigned char* inputBuffer,
+                                                unsigned int inputSize,
+                                                std::vector<unsigned char>& outputBuffer,
+                                                int compressionLevel) {
     unsigned int resultSize = 0;
 
     // what are these magic numbers? (jbk)
-    unsigned long dest_size = (unsigned long)(double(inputSize)*
-                                              1.002 + 1.0) + 12;
-    if(outputBuffer.size() < dest_size) outputBuffer.resize(dest_size);
+    unsigned long dest_size = (unsigned long)(double(inputSize) * 1.002 + 1.0) + 12;
+    if (outputBuffer.size() < dest_size)
+      outputBuffer.resize(dest_size);
 
     // compression 1-9, 6 is zlib default, 0 none
-    int ret = compress2(&outputBuffer[0], &dest_size, inputBuffer,
-                        inputSize, compressionLevel);
+    int ret = compress2(&outputBuffer[0], &dest_size, inputBuffer, inputSize, compressionLevel);
 
     // check status
-    if(ret == Z_OK) {
-        // return the correct length
-        resultSize = dest_size;
-
-        FDEBUG(1) << " original size = " << inputSize
-                  << " final size = " << dest_size
-                  << " ratio = " << double(dest_size)/double(inputSize)
-                  << std::endl;
-    } else {
-        // compression failed, return a size of zero
-        FDEBUG(9) << "Compression Return value: " << ret
-                  << " Okay = " << Z_OK << std::endl;
-        // do we throw an exception here?
-        std::cerr << "Compression Return value: " << ret << " Okay = " << Z_OK << std::endl;
+    if (ret == Z_OK) {
+      // return the correct length
+      resultSize = dest_size;
 
+      FDEBUG(1) << " original size = " << inputSize << " final size = " << dest_size
+                << " ratio = " << double(dest_size) / double(inputSize) << std::endl;
+    } else {
+      // compression failed, return a size of zero
+      FDEBUG(9) << "Compression Return value: " << ret << " Okay = " << Z_OK << std::endl;
+      // do we throw an exception here?
+      std::cerr << "Compression Return value: " << ret << " Okay = " << Z_OK << std::endl;
     }
 
     return resultSize;
   }
-}
+}  // namespace edm
diff --git a/IOPool/Streamer/src/StreamerFileIO.cc b/IOPool/Streamer/src/StreamerFileIO.cc
index 0a9d0af78c8b2..630205e4b6f40 100644
--- a/IOPool/Streamer/src/StreamerFileIO.cc
+++ b/IOPool/Streamer/src/StreamerFileIO.cc
@@ -4,39 +4,30 @@
 #include "FWCore/Utilities/interface/Adler32Calculator.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-  OutputFile::OutputFile(const std::string& name):
-    current_offset_(1), 
-    do_adler_(false),
-    adlera_(1),
-    adlerb_(0),
-    ost_(new std::ofstream(name.c_str(), std::ios_base::binary | std::ios_base::out)),
-    filename_(name)
-  {
-    if(!ost_->is_open()) {
-      throw cms::Exception("OutputFile","OutputFile")
-        << "Error Opening Output File: "<<name<<"\n";
-    }
-    ost_->rdbuf()->pubsetbuf(nullptr,0);
+OutputFile::OutputFile(const std::string& name)
+    : current_offset_(1),
+      do_adler_(false),
+      adlera_(1),
+      adlerb_(0),
+      ost_(new std::ofstream(name.c_str(), std::ios_base::binary | std::ios_base::out)),
+      filename_(name) {
+  if (!ost_->is_open()) {
+    throw cms::Exception("OutputFile", "OutputFile") << "Error Opening Output File: " << name << "\n";
   }
+  ost_->rdbuf()->pubsetbuf(nullptr, 0);
+}
 
-  OutputFile::~OutputFile() 
-  {
-    ost_->close();
-  }
+OutputFile::~OutputFile() { ost_->close(); }
 
-  bool OutputFile::write(const char *ptr, size_t n) 
-  {
-    ost_->write(ptr,n);
-    if(!ost_->fail()) {
-      current_offset_ += (uint64)(n);
-      if (do_adler_)
-        cms::Adler32(ptr,n,adlera_,adlerb_);
-      return false;
-    }
-    return true;
+bool OutputFile::write(const char* ptr, size_t n) {
+  ost_->write(ptr, n);
+  if (!ost_->fail()) {
+    current_offset_ += (uint64)(n);
+    if (do_adler_)
+      cms::Adler32(ptr, n, adlera_, adlerb_);
+    return false;
   }
+  return true;
+}
 
-  void OutputFile::close()
-  {
-    ost_->close();
-  }
+void OutputFile::close() { ost_->close(); }
diff --git a/IOPool/Streamer/src/StreamerFileReader.cc b/IOPool/Streamer/src/StreamerFileReader.cc
index 27d17ad487daf..e5780bf92a541 100644
--- a/IOPool/Streamer/src/StreamerFileReader.cc
+++ b/IOPool/Streamer/src/StreamerFileReader.cc
@@ -11,39 +11,36 @@
 
 namespace edm {
 
-  StreamerFileReader::StreamerFileReader(ParameterSet const& pset, InputSourceDescription const& desc) :
-      StreamerInputSource(pset, desc),
-      streamerNames_(pset.getUntrackedParameter<std::vector<std::string> >("fileNames")),
-      streamReader_(),
-      eventSkipperByID_(EventSkipperByID::create(pset).release()),
-      initialNumberOfEventsToSkip_(pset.getUntrackedParameter<unsigned int>("skipEvents")) {
-    InputFileCatalog catalog(pset.getUntrackedParameter<std::vector<std::string> >("fileNames"), pset.getUntrackedParameter<std::string>("overrideCatalog"));
+  StreamerFileReader::StreamerFileReader(ParameterSet const& pset, InputSourceDescription const& desc)
+      : StreamerInputSource(pset, desc),
+        streamerNames_(pset.getUntrackedParameter<std::vector<std::string> >("fileNames")),
+        streamReader_(),
+        eventSkipperByID_(EventSkipperByID::create(pset).release()),
+        initialNumberOfEventsToSkip_(pset.getUntrackedParameter<unsigned int>("skipEvents")) {
+    InputFileCatalog catalog(pset.getUntrackedParameter<std::vector<std::string> >("fileNames"),
+                             pset.getUntrackedParameter<std::string>("overrideCatalog"));
     streamerNames_ = catalog.fileNames();
     reset_();
-
   }
 
-  StreamerFileReader::~StreamerFileReader() {
-  }
+  StreamerFileReader::~StreamerFileReader() {}
 
-  void
-  StreamerFileReader::reset_() {
+  void StreamerFileReader::reset_() {
     if (streamerNames_.size() > 1) {
       streamReader_ = std::make_unique<StreamerInputFile>(streamerNames_, eventSkipperByID());
     } else if (streamerNames_.size() == 1) {
       streamReader_ = std::make_unique<StreamerInputFile>(streamerNames_.at(0), eventSkipperByID());
     } else {
       throw Exception(errors::FileReadError, "StreamerFileReader::StreamerFileReader")
-         << "No fileNames were specified\n";
+          << "No fileNames were specified\n";
     }
     InitMsgView const* header = getHeader();
     deserializeAndMergeWithRegistry(*header, false);
-    if(initialNumberOfEventsToSkip_) {
+    if (initialNumberOfEventsToSkip_) {
       skip(initialNumberOfEventsToSkip_);
     }
   }
 
-
   bool StreamerFileReader::checkNextEvent() {
     EventMsgView const* eview = getNextEvent();
 
@@ -55,63 +52,53 @@ namespace edm {
       deserializeAndMergeWithRegistry(*header, true);
     }
     if (eview == nullptr) {
-      return  false;
+      return false;
     }
     deserializeEvent(*eview);
     return true;
   }
 
-  void
-  StreamerFileReader::skip(int toSkip) {
-    for(int i = 0; i != toSkip; ++i) {
+  void StreamerFileReader::skip(int toSkip) {
+    for (int i = 0; i != toSkip; ++i) {
       EventMsgView const* evMsg = getNextEvent();
-      if(evMsg == nullptr)  {
+      if (evMsg == nullptr) {
         return;
       }
       // If the event would have been skipped anyway, don't count it as a skipped event.
-      if(eventSkipperByID_ && eventSkipperByID_->skipIt(evMsg->run(), evMsg->lumi(), evMsg->event())) {
+      if (eventSkipperByID_ && eventSkipperByID_->skipIt(evMsg->run(), evMsg->lumi(), evMsg->event())) {
         --i;
       }
     }
   }
 
-  void
-  StreamerFileReader::genuineCloseFile() {
-    if(streamReader_.get() != nullptr) streamReader_->closeStreamerFile();
+  void StreamerFileReader::genuineCloseFile() {
+    if (streamReader_.get() != nullptr)
+      streamReader_->closeStreamerFile();
   }
 
-  bool
-  StreamerFileReader::newHeader() {
-    return streamReader_->newHeader();
-  }
-
-  InitMsgView const*
-  StreamerFileReader::getHeader() {
+  bool StreamerFileReader::newHeader() { return streamReader_->newHeader(); }
 
+  InitMsgView const* StreamerFileReader::getHeader() {
     InitMsgView const* header = streamReader_->startMessage();
 
-    if(header->code() != Header::INIT) { //INIT Msg
+    if (header->code() != Header::INIT) {  //INIT Msg
       throw Exception(errors::FileReadError, "StreamerFileReader::readHeader")
-        << "received wrong message type: expected INIT, got "
-        << header->code() << "\n";
+          << "received wrong message type: expected INIT, got " << header->code() << "\n";
     }
     return header;
   }
 
-  EventMsgView const*
-  StreamerFileReader::getNextEvent() {
+  EventMsgView const* StreamerFileReader::getNextEvent() {
     if (!streamReader_->next()) {
       return nullptr;
     }
     return streamReader_->currentRecord();
   }
 
-  void
-  StreamerFileReader::fillDescriptions(ConfigurationDescriptions& descriptions) {
+  void StreamerFileReader::fillDescriptions(ConfigurationDescriptions& descriptions) {
     ParameterSetDescription desc;
     desc.setComment("Reads events from streamer files.");
-    desc.addUntracked<std::vector<std::string> >("fileNames")
-        ->setComment("Names of files to be processed.");
+    desc.addUntracked<std::vector<std::string> >("fileNames")->setComment("Names of files to be processed.");
     desc.addUntracked<unsigned int>("skipEvents", 0U)
         ->setComment("Skip the first 'skipEvents' events that otherwise would have been processed.");
     desc.addUntracked<std::string>("overrideCatalog", std::string());
@@ -121,5 +108,4 @@ namespace edm {
     EventSkipperByID::fillDescription(desc);
     descriptions.add("source", desc);
   }
-} //end-of-namespace
-
+}  // namespace edm
diff --git a/IOPool/Streamer/src/StreamerFileReader.h b/IOPool/Streamer/src/StreamerFileReader.h
index d8359f619f9fc..faf8f8521e246 100644
--- a/IOPool/Streamer/src/StreamerFileReader.h
+++ b/IOPool/Streamer/src/StreamerFileReader.h
@@ -34,14 +34,14 @@ namespace edm {
     void genuineCloseFile() override;
     void reset_() override;
 
-    std::shared_ptr<EventSkipperByID const> eventSkipperByID() const {return get_underlying_safe(eventSkipperByID_);}
-    std::shared_ptr<EventSkipperByID>& eventSkipperByID() {return get_underlying_safe(eventSkipperByID_);}
+    std::shared_ptr<EventSkipperByID const> eventSkipperByID() const { return get_underlying_safe(eventSkipperByID_); }
+    std::shared_ptr<EventSkipperByID>& eventSkipperByID() { return get_underlying_safe(eventSkipperByID_); }
 
-    std::vector<std::string> streamerNames_; // names of Streamer files
+    std::vector<std::string> streamerNames_;  // names of Streamer files
     edm::propagate_const<std::unique_ptr<StreamerInputFile>> streamReader_;
     edm::propagate_const<std::shared_ptr<EventSkipperByID>> eventSkipperByID_;
     int initialNumberOfEventsToSkip_;
   };
-} //end-of-namespace-def
+}  // namespace edm
 
 #endif
diff --git a/IOPool/Streamer/src/StreamerFileWriter.cc b/IOPool/Streamer/src/StreamerFileWriter.cc
index 1e409457deced..9b330dad6256d 100644
--- a/IOPool/Streamer/src/StreamerFileWriter.cc
+++ b/IOPool/Streamer/src/StreamerFileWriter.cc
@@ -2,19 +2,13 @@
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 namespace edm {
-  StreamerFileWriter::StreamerFileWriter(edm::ParameterSet const& ps) :
-    stream_writer_(new StreamerOutputFile(
-                      ps.getUntrackedParameter<std::string>("fileName")))
-  {
-  }
+  StreamerFileWriter::StreamerFileWriter(edm::ParameterSet const& ps)
+      : stream_writer_(new StreamerOutputFile(ps.getUntrackedParameter<std::string>("fileName"))) {}
 
-  StreamerFileWriter::StreamerFileWriter(std::string const& fileName) :
-    stream_writer_(new StreamerOutputFile(fileName))
-  {
-  }
+  StreamerFileWriter::StreamerFileWriter(std::string const& fileName)
+      : stream_writer_(new StreamerOutputFile(fileName)) {}
 
-  StreamerFileWriter::~StreamerFileWriter() {
-  }
+  StreamerFileWriter::~StreamerFileWriter() {}
 
   void StreamerFileWriter::doOutputHeader(InitMsgBuilder const& init_message) {
     //Let us turn it into a View
@@ -41,4 +35,4 @@ namespace edm {
     desc.setComment("Writes events into a streamer output file.");
     desc.addUntracked<std::string>("fileName", "teststreamfile.dat")->setComment("Name of output file.");
   }
-} //namespace edm
+}  //namespace edm
diff --git a/IOPool/Streamer/src/StreamerFileWriter.h b/IOPool/Streamer/src/StreamerFileWriter.h
index c5bf2b6313e81..a0f75964cc598 100644
--- a/IOPool/Streamer/src/StreamerFileWriter.h
+++ b/IOPool/Streamer/src/StreamerFileWriter.h
@@ -1,5 +1,5 @@
 #ifndef IOPool_Streamer_StreamerFileWriter_h
-#define IOPool_Streamer_StreamerFileWriter_h 
+#define IOPool_Streamer_StreamerFileWriter_h
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -16,34 +16,29 @@
 #include <memory>
 #include <string>
 
-namespace edm
-{
+namespace edm {
   class ParameterSetDescription;
-  class StreamerFileWriter 
-  {
+  class StreamerFileWriter {
   public:
-
     explicit StreamerFileWriter(edm::ParameterSet const& ps);
     explicit StreamerFileWriter(std::string const& fileName);
     ~StreamerFileWriter();
 
     static void fillDescription(ParameterSetDescription& desc);
 
-    void doOutputHeader(InitMsgBuilder const& init_message);    
-    void doOutputHeader(InitMsgView const& init_message);    
+    void doOutputHeader(InitMsgBuilder const& init_message);
+    void doOutputHeader(InitMsgView const& init_message);
 
     void doOutputEvent(EventMsgBuilder const& msg);
     void doOutputEvent(EventMsgView const& msg);
 
-    void start(){}
+    void start() {}
     void stop(){};
 
-    uint32 get_adler32() const { return stream_writer_->adler32();}
+    uint32 get_adler32() const { return stream_writer_->adler32(); }
 
   private:
-
     edm::propagate_const<std::unique_ptr<StreamerOutputFile>> stream_writer_;
-
   };
-}
+}  // namespace edm
 #endif
diff --git a/IOPool/Streamer/src/StreamerInputFile.cc b/IOPool/Streamer/src/StreamerInputFile.cc
index 214990398045c..69965a9c42bb0 100644
--- a/IOPool/Streamer/src/StreamerInputFile.cc
+++ b/IOPool/Streamer/src/StreamerInputFile.cc
@@ -15,47 +15,44 @@
 
 namespace edm {
 
-  StreamerInputFile::~StreamerInputFile() {
-    closeStreamerFile();
-  }
-
-  StreamerInputFile::StreamerInputFile(std::string const& name,
-                                       std::shared_ptr<EventSkipperByID> eventSkipperByID) :
-    startMsg_(),
-    currentEvMsg_(),
-    headerBuf_(1000*1000),
-    eventBuf_(1000*1000*7),
-    currentFile_(0),
-    streamerNames_(),
-    multiStreams_(false),
-    currentFileName_(),
-    currentFileOpen_(false),
-    eventSkipperByID_(eventSkipperByID),
-    currRun_(0),
-    currProto_(0),
-    newHeader_(false),
-    storage_(),
-    endOfFile_(false) {
+  StreamerInputFile::~StreamerInputFile() { closeStreamerFile(); }
+
+  StreamerInputFile::StreamerInputFile(std::string const& name, std::shared_ptr<EventSkipperByID> eventSkipperByID)
+      : startMsg_(),
+        currentEvMsg_(),
+        headerBuf_(1000 * 1000),
+        eventBuf_(1000 * 1000 * 7),
+        currentFile_(0),
+        streamerNames_(),
+        multiStreams_(false),
+        currentFileName_(),
+        currentFileOpen_(false),
+        eventSkipperByID_(eventSkipperByID),
+        currRun_(0),
+        currProto_(0),
+        newHeader_(false),
+        storage_(),
+        endOfFile_(false) {
     openStreamerFile(name);
     readStartMessage();
   }
 
   StreamerInputFile::StreamerInputFile(std::vector<std::string> const& names,
-                                       std::shared_ptr<EventSkipperByID> eventSkipperByID) :
-    startMsg_(),
-    currentEvMsg_(),
-    headerBuf_(1000*1000),
-    eventBuf_(1000*1000*7),
-    currentFile_(0),
-    streamerNames_(names),
-    multiStreams_(true),
-    currentFileName_(),
-    currentFileOpen_(false),
-    eventSkipperByID_(eventSkipperByID),
-    currRun_(0),
-    currProto_(0),
-    newHeader_(false),
-    endOfFile_(false) {
+                                       std::shared_ptr<EventSkipperByID> eventSkipperByID)
+      : startMsg_(),
+        currentEvMsg_(),
+        headerBuf_(1000 * 1000),
+        eventBuf_(1000 * 1000 * 7),
+        currentFile_(0),
+        streamerNames_(names),
+        multiStreams_(true),
+        currentFileName_(),
+        currentFileOpen_(false),
+        eventSkipperByID_(eventSkipperByID),
+        currRun_(0),
+        currProto_(0),
+        newHeader_(false),
+        endOfFile_(false) {
     openStreamerFile(names.at(0));
     ++currentFile_;
     readStartMessage();
@@ -63,51 +60,44 @@ namespace edm {
     currProto_ = startMsg_->protocolVersion();
   }
 
-  void
-  StreamerInputFile::openStreamerFile(std::string const& name) {
-
+  void StreamerInputFile::openStreamerFile(std::string const& name) {
     closeStreamerFile();
 
     currentFileName_ = name;
     logFileAction("  Initiating request to open file ");
 
     IOOffset size = -1;
-    if(StorageFactory::get()->check(name, &size)) {
+    if (StorageFactory::get()->check(name, &size)) {
       try {
-        storage_ =StorageFactory::get()->open(name,
-                                                   IOFlags::OpenRead);
-      }
-      catch(cms::Exception& e) {
+        storage_ = StorageFactory::get()->open(name, IOFlags::OpenRead);
+      } catch (cms::Exception& e) {
         Exception ex(errors::FileOpenError, "", e);
         ex.addContext("Calling StreamerInputFile::openStreamerFile()");
         ex.clearMessage();
-        ex <<  "Error Opening Streamer Input File: " << name << "\n";
+        ex << "Error Opening Streamer Input File: " << name << "\n";
         throw ex;
       }
     } else {
       throw Exception(errors::FileOpenError, "StreamerInputFile::openStreamerFile")
-        << "Error Opening Streamer Input File, file does not exist: "
-        << name << "\n";
+          << "Error Opening Streamer Input File, file does not exist: " << name << "\n";
     }
     currentFileOpen_ = true;
     logFileAction("  Successfully opened file ");
   }
 
-  void
-  StreamerInputFile::closeStreamerFile() {
-    if(currentFileOpen_ && storage_) {
+  void StreamerInputFile::closeStreamerFile() {
+    if (currentFileOpen_ && storage_) {
       storage_->close();
       logFileAction("  Closed file ");
     }
     currentFileOpen_ = false;
   }
 
-  IOSize StreamerInputFile::readBytes(char *buf, IOSize nBytes) {
+  IOSize StreamerInputFile::readBytes(char* buf, IOSize nBytes) {
     IOSize n = 0;
     try {
       n = storage_->read(buf, nBytes);
-    }
-    catch(cms::Exception& ce) {
+    } catch (cms::Exception& ce) {
       Exception ex(errors::FileReadError, "", ce);
       ex.addContext("Calling StreamerInputFile::readBytes()");
       throw ex;
@@ -121,8 +111,7 @@ namespace edm {
       // We wish to return the number of bytes skipped, not the final offset.
       n = storage_->position(0, Storage::CURRENT);
       n = storage_->position(nBytes, Storage::CURRENT) - n;
-    }
-    catch(cms::Exception& ce) {
+    } catch (cms::Exception& ce) {
       Exception ex(errors::FileReadError, "", ce);
       ex.addContext("Calling StreamerInputFile::skipBytes()");
       throw ex;
@@ -133,152 +122,149 @@ namespace edm {
   void StreamerInputFile::readStartMessage() {
     IOSize nWant = sizeof(HeaderView);
     IOSize nGot = readBytes(&headerBuf_[0], nWant);
-    if(nGot != nWant) {
+    if (nGot != nWant) {
       throw Exception(errors::FileReadError, "StreamerInputFile::readStartMessage")
-        << "Failed reading streamer file, first read in readStartMessage\n";
+          << "Failed reading streamer file, first read in readStartMessage\n";
     }
 
     HeaderView head(&headerBuf_[0]);
     uint32 code = head.code();
-    if(code != Header::INIT) /** Not an init message should return ******/
+    if (code != Header::INIT) /** Not an init message should return ******/
     {
       throw Exception(errors::FileReadError, "StreamerInputFile::readStartMessage")
-        << "Expecting an init Message at start of file\n";
+          << "Expecting an init Message at start of file\n";
       return;
     }
 
     uint32 headerSize = head.size();
-    if(headerBuf_.size() < headerSize) headerBuf_.resize(headerSize);
+    if (headerBuf_.size() < headerSize)
+      headerBuf_.resize(headerSize);
 
-    if(headerSize > sizeof(HeaderView)) {
+    if (headerSize > sizeof(HeaderView)) {
       nWant = headerSize - sizeof(HeaderView);
       nGot = readBytes(&headerBuf_[sizeof(HeaderView)], nWant);
-      if(nGot != nWant) {
+      if (nGot != nWant) {
         throw Exception(errors::FileReadError, "StreamerInputFile::readStartMessage")
-          << "Failed reading streamer file, second read in readStartMessage\n";
+            << "Failed reading streamer file, second read in readStartMessage\n";
       }
     } else {
       throw Exception(errors::FileReadError, "StreamerInputFile::readStartMessage")
-        << "Failed reading streamer file, init header size from data too small\n";
+          << "Failed reading streamer file, init header size from data too small\n";
     }
 
-    startMsg_ = std::make_shared<InitMsgView>(&headerBuf_[0]); // propagate_const<T> has no reset() function
+    startMsg_ = std::make_shared<InitMsgView>(&headerBuf_[0]);  // propagate_const<T> has no reset() function
   }
 
   bool StreamerInputFile::next() {
-    if(this->readEventMessage()) {
-         return true;
+    if (this->readEventMessage()) {
+      return true;
     }
-    if(multiStreams_) {
-       //Try opening next file
-       if(openNextFile()) {
-          endOfFile_ = false;
-          if(this->readEventMessage()) {
-             return true;
-          }
-       }
+    if (multiStreams_) {
+      //Try opening next file
+      if (openNextFile()) {
+        endOfFile_ = false;
+        if (this->readEventMessage()) {
+          return true;
+        }
+      }
     }
     return false;
   }
 
   bool StreamerInputFile::openNextFile() {
+    if (currentFile_ <= streamerNames_.size() - 1) {
+      FDEBUG(10) << "Opening file " << streamerNames_.at(currentFile_).c_str() << std::endl;
 
-     if(currentFile_ <= streamerNames_.size() - 1) {
-       FDEBUG(10) << "Opening file "
-                  << streamerNames_.at(currentFile_).c_str() << std::endl;
-
-       openStreamerFile(streamerNames_.at(currentFile_));
+      openStreamerFile(streamerNames_.at(currentFile_));
 
-       // If start message was already there, then compare the
-       // previous and new headers
-       if(startMsg_) {
-          FDEBUG(10) << "Comparing Header" << std::endl;
-          if(!compareHeader()) {
-              return false;
-          }
-       }
-       ++currentFile_;
-       return true;
-     }
-     return false;
+      // If start message was already there, then compare the
+      // previous and new headers
+      if (startMsg_) {
+        FDEBUG(10) << "Comparing Header" << std::endl;
+        if (!compareHeader()) {
+          return false;
+        }
+      }
+      ++currentFile_;
+      return true;
+    }
+    return false;
   }
 
   bool StreamerInputFile::compareHeader() {
-
     //Get the new header
     readStartMessage();
 
     //Values from new Header should match up
-    if(currRun_ != startMsg_->run() ||
-        currProto_ != startMsg_->protocolVersion()) {
-      throw Exception(errors::MismatchedInputFiles,"StreamerInputFile::compareHeader")
-        << "File " << streamerNames_.at(currentFile_)
-        << "\nhas different run number or protocol version than previous\n";
+    if (currRun_ != startMsg_->run() || currProto_ != startMsg_->protocolVersion()) {
+      throw Exception(errors::MismatchedInputFiles, "StreamerInputFile::compareHeader")
+          << "File " << streamerNames_.at(currentFile_)
+          << "\nhas different run number or protocol version than previous\n";
       return false;
     }
     newHeader_ = true;
     return true;
   }
 
-
   int StreamerInputFile::readEventMessage() {
-    if(endOfFile_) return 0;
+    if (endOfFile_)
+      return 0;
 
     bool eventRead = false;
-    while(!eventRead) {
-
+    while (!eventRead) {
       IOSize nWant = sizeof(EventHeader);
       IOSize nGot = readBytes(&eventBuf_[0], nWant);
-      if(nGot == 0) {
+      if (nGot == 0) {
         // no more data available
         endOfFile_ = true;
         return 0;
       }
-      if(nGot != nWant) {
+      if (nGot != nWant) {
         throw edm::Exception(errors::FileReadError, "StreamerInputFile::readEventMessage")
-          << "Failed reading streamer file, first read in readEventMessage\n"
-          << "Requested " << nWant << " bytes, read function returned " << nGot << " bytes\n";
+            << "Failed reading streamer file, first read in readEventMessage\n"
+            << "Requested " << nWant << " bytes, read function returned " << nGot << " bytes\n";
       }
       HeaderView head(&eventBuf_[0]);
       uint32 code = head.code();
 
       // If it is not an event then something is wrong.
-      if(code != Header::EVENT) {
+      if (code != Header::EVENT) {
         throw Exception(errors::FileReadError, "StreamerInputFile::readEventMessage")
-          << "Failed reading streamer file, unknown code in event header\n"
-          << "code = " << code << "\n";
+            << "Failed reading streamer file, unknown code in event header\n"
+            << "code = " << code << "\n";
       }
       uint32 eventSize = head.size();
-      if(eventSize <= sizeof(EventHeader)) {
+      if (eventSize <= sizeof(EventHeader)) {
         throw edm::Exception(errors::FileReadError, "StreamerInputFile::readEventMessage")
-          << "Failed reading streamer file, event header size from data too small\n";
+            << "Failed reading streamer file, event header size from data too small\n";
       }
       eventRead = true;
-      if(eventSkipperByID_) {
-        EventHeader *evh = (EventHeader *)(&eventBuf_[0]);
-        if(eventSkipperByID_->skipIt(convert32(evh->run_), convert32(evh->lumi_), convert64(evh->event_))) {
+      if (eventSkipperByID_) {
+        EventHeader* evh = (EventHeader*)(&eventBuf_[0]);
+        if (eventSkipperByID_->skipIt(convert32(evh->run_), convert32(evh->lumi_), convert64(evh->event_))) {
           eventRead = false;
         }
       }
       nWant = eventSize - sizeof(EventHeader);
-      if(eventRead) {
-        if(eventBuf_.size() < eventSize) eventBuf_.resize(eventSize);
+      if (eventRead) {
+        if (eventBuf_.size() < eventSize)
+          eventBuf_.resize(eventSize);
         nGot = readBytes(&eventBuf_[sizeof(EventHeader)], nWant);
-        if(nGot != nWant) {
+        if (nGot != nWant) {
           throw Exception(errors::FileReadError, "StreamerInputFile::readEventMessage")
-            << "Failed reading streamer file, second read in readEventMessage\n"
-            << "Requested " << nWant << " bytes, read function returned " << nGot << " bytes\n";
+              << "Failed reading streamer file, second read in readEventMessage\n"
+              << "Requested " << nWant << " bytes, read function returned " << nGot << " bytes\n";
         }
       } else {
         nGot = skipBytes(nWant);
-        if(nGot != nWant) {
+        if (nGot != nWant) {
           throw Exception(errors::FileReadError, "StreamerInputFile::readEventMessage")
-            << "Failed reading streamer file, skip event in readEventMessage\n"
-            << "Requested " << nWant << " bytes skipped, seek function returned " << nGot << " bytes\n";
+              << "Failed reading streamer file, skip event in readEventMessage\n"
+              << "Requested " << nWant << " bytes skipped, seek function returned " << nGot << " bytes\n";
         }
       }
     }
-    currentEvMsg_ = std::make_shared<EventMsgView>((void*)&eventBuf_[0]); // propagate_const<T> has no reset() function
+    currentEvMsg_ = std::make_shared<EventMsgView>((void*)&eventBuf_[0]);  // propagate_const<T> has no reset() function
     return 1;
   }
 
@@ -286,4 +272,4 @@ namespace edm {
     LogAbsolute("fileAction") << std::setprecision(0) << TimeOfDay() << msg << currentFileName_;
     FlushMessageLog();
   }
-}
+}  // namespace edm
diff --git a/IOPool/Streamer/src/StreamerInputSource.cc b/IOPool/Streamer/src/StreamerInputSource.cc
index fff67a43e5e0a..b57d7787ab5d6 100644
--- a/IOPool/Streamer/src/StreamerInputSource.cc
+++ b/IOPool/Streamer/src/StreamerInputSource.cc
@@ -37,38 +37,30 @@
 
 namespace edm {
   namespace {
-    int const init_size = 1024*1024;
+    int const init_size = 1024 * 1024;
   }
 
-  StreamerInputSource::StreamerInputSource(
-                    ParameterSet const& pset,
-                    InputSourceDescription const& desc):
-    RawInputSource(pset, desc),
-    tc_(getTClass(typeid(SendEvent))),
-    dest_(init_size),
-    xbuf_(TBuffer::kRead, init_size),
-    sendEvent_(),
-    eventPrincipalHolder_(),
-    adjustEventToNewProductRegistry_(false),
-    processName_(),
-    protocolVersion_(0U) {
-  }
+  StreamerInputSource::StreamerInputSource(ParameterSet const& pset, InputSourceDescription const& desc)
+      : RawInputSource(pset, desc),
+        tc_(getTClass(typeid(SendEvent))),
+        dest_(init_size),
+        xbuf_(TBuffer::kRead, init_size),
+        sendEvent_(),
+        eventPrincipalHolder_(),
+        adjustEventToNewProductRegistry_(false),
+        processName_(),
+        protocolVersion_(0U) {}
 
   StreamerInputSource::~StreamerInputSource() {}
 
   // ---------------------------------------
-  std::unique_ptr<FileBlock>
-  StreamerInputSource::readFile_() {
-    return std::make_unique<FileBlock>();
-  }
-
-  void
-  StreamerInputSource::mergeIntoRegistry(SendJobHeader const& header,
-                                         ProductRegistry& reg,
-                                         BranchIDListHelper& branchIDListHelper,
-                                         ThinnedAssociationsHelper& thinnedHelper,
-                                         bool subsequent) {
+  std::unique_ptr<FileBlock> StreamerInputSource::readFile_() { return std::make_unique<FileBlock>(); }
 
+  void StreamerInputSource::mergeIntoRegistry(SendJobHeader const& header,
+                                              ProductRegistry& reg,
+                                              BranchIDListHelper& branchIDListHelper,
+                                              ThinnedAssociationsHelper& thinnedHelper,
+                                              bool subsequent) {
     SendDescs const& descs = header.descs();
 
     FDEBUG(6) << "mergeIntoRegistry: Product List: " << std::endl;
@@ -78,7 +70,7 @@ namespace edm {
       pReg.updateFromInput(descs);
       std::string mergeInfo = reg.merge(pReg, std::string(), BranchDescription::Permissive);
       if (!mergeInfo.empty()) {
-        throw cms::Exception("MismatchedInput","RootInputFileSequence::previousEvent()") << mergeInfo;
+        throw cms::Exception("MismatchedInput", "RootInputFileSequence::previousEvent()") << mergeInfo;
       }
       branchIDListHelper.updateFromInput(header.branchIDLists());
       thinnedHelper.updateFromPrimaryInput(header.thinnedAssociationsHelper());
@@ -86,7 +78,7 @@ namespace edm {
       declareStreamers(descs);
       buildClassCache(descs);
       loadExtraClasses();
-      if(!reg.frozen()) {
+      if (!reg.frozen()) {
         reg.updateFromInput(descs);
       }
       branchIDListHelper.updateFromInput(header.branchIDLists());
@@ -94,8 +86,7 @@ namespace edm {
     }
   }
 
-  void
-  StreamerInputSource::declareStreamers(SendDescs const& descs) {
+  void StreamerInputSource::declareStreamers(SendDescs const& descs) {
     std::vector<std::string> missingDictionaries;
     std::vector<std::string> branchNamesForMissing;
     std::vector<std::string> producedTypes;
@@ -114,14 +105,12 @@ namespace edm {
     }
   }
 
-
-  void
-  StreamerInputSource::buildClassCache(SendDescs const& descs) {
-    for(auto const& item : descs) {
-        //pi->init();
-        std::string const real_name = wrappedClassName(item.className());
-        FDEBUG(6) << "BuildReadData: " << real_name << std::endl;
-        doBuildRealData(real_name);
+  void StreamerInputSource::buildClassCache(SendDescs const& descs) {
+    for (auto const& item : descs) {
+      //pi->init();
+      std::string const real_name = wrappedClassName(item.className());
+      FDEBUG(6) << "BuildReadData: " << real_name << std::endl;
+      doBuildRealData(real_name);
     }
   }
 
@@ -129,44 +118,41 @@ namespace edm {
    * Deserializes the specified init message into a SendJobHeader object
    * (which is related to the product registry).
    */
-  std::unique_ptr<SendJobHeader>
-  StreamerInputSource::deserializeRegistry(InitMsgView const& initView) {
-    if(initView.code() != Header::INIT)
-      throw cms::Exception("StreamTranslation","Registry deserialization error")
-        << "received wrong message type: expected INIT, got "
-        << initView.code() << "\n";
+  std::unique_ptr<SendJobHeader> StreamerInputSource::deserializeRegistry(InitMsgView const& initView) {
+    if (initView.code() != Header::INIT)
+      throw cms::Exception("StreamTranslation", "Registry deserialization error")
+          << "received wrong message type: expected INIT, got " << initView.code() << "\n";
 
     //Get the process name and store if for Protocol version 4 and above.
     if (initView.protocolVersion() > 3) {
+      processName_ = initView.processName();
+      protocolVersion_ = initView.protocolVersion();
 
-         processName_ = initView.processName();
-         protocolVersion_ = initView.protocolVersion();
-
-         FDEBUG(10) << "StreamerInputSource::deserializeRegistry processName = "<< processName_<< std::endl;
-         FDEBUG(10) << "StreamerInputSource::deserializeRegistry protocolVersion_= "<< protocolVersion_<< std::endl;
+      FDEBUG(10) << "StreamerInputSource::deserializeRegistry processName = " << processName_ << std::endl;
+      FDEBUG(10) << "StreamerInputSource::deserializeRegistry protocolVersion_= " << protocolVersion_ << std::endl;
     }
 
-   // calculate the adler32 checksum
-   uint32_t adler32_chksum = cms::Adler32((char const*)initView.descData(),initView.descLength());
-   //std::cout << "Adler32 checksum of init message = " << adler32_chksum << std::endl;
-   //std::cout << "Adler32 checksum of init messsage from header = " << initView.adler32_chksum() << " "
-   //          << "host name = " << initView.hostName() << " len = " << initView.hostName_len() << std::endl;
-    if((uint32)adler32_chksum != initView.adler32_chksum()) {
+    // calculate the adler32 checksum
+    uint32_t adler32_chksum = cms::Adler32((char const*)initView.descData(), initView.descLength());
+    //std::cout << "Adler32 checksum of init message = " << adler32_chksum << std::endl;
+    //std::cout << "Adler32 checksum of init messsage from header = " << initView.adler32_chksum() << " "
+    //          << "host name = " << initView.hostName() << " len = " << initView.hostName_len() << std::endl;
+    if ((uint32)adler32_chksum != initView.adler32_chksum()) {
       // skip event (based on option?) or throw exception?
       throw cms::Exception("StreamDeserialization", "Checksum error")
-        << " chksum from registry data = " << adler32_chksum << " from header = "
-        << initView.adler32_chksum() << " host name = " << initView.hostName() << std::endl;
+          << " chksum from registry data = " << adler32_chksum << " from header = " << initView.adler32_chksum()
+          << " host name = " << initView.hostName() << std::endl;
     }
 
     TClass* desc = getTClass(typeid(SendJobHeader));
 
-    TBufferFile xbuf(TBuffer::kRead, initView.descLength(),
-                 const_cast<char*>((char const*)initView.descData()),kFALSE);
-    RootDebug tracer(10,10);
+    TBufferFile xbuf(
+        TBuffer::kRead, initView.descLength(), const_cast<char*>((char const*)initView.descData()), kFALSE);
+    RootDebug tracer(10, 10);
     std::unique_ptr<SendJobHeader> sd((SendJobHeader*)xbuf.ReadObjectAny(desc));
 
-    if(sd.get() == nullptr) {
-        throw cms::Exception("StreamTranslation","Registry deserialization error")
+    if (sd.get() == nullptr) {
+      throw cms::Exception("StreamTranslation", "Registry deserialization error")
           << "Could not read the initial product registry list\n";
     }
 
@@ -178,113 +164,109 @@ namespace edm {
    * Deserializes the specified init message into a SendJobHeader object
    * and merges registries.
    */
-  void
-  StreamerInputSource::deserializeAndMergeWithRegistry(InitMsgView const& initView, bool subsequent) {
-     std::unique_ptr<SendJobHeader> sd = deserializeRegistry(initView);
-     mergeIntoRegistry(*sd, productRegistryUpdate(), *branchIDListHelper(), *thinnedAssociationsHelper(), subsequent);
-     if (subsequent) {
-       adjustEventToNewProductRegistry_ = true;
-     }
-     SendJobHeader::ParameterSetMap const& psetMap = sd->processParameterSet();
-     pset::Registry& psetRegistry = *pset::Registry::instance();
-     for (auto const& item : psetMap) {
-       ParameterSet pset(item.second.pset());
-       pset.setID(item.first);
-       psetRegistry.insertMapped(pset);
-     }
+  void StreamerInputSource::deserializeAndMergeWithRegistry(InitMsgView const& initView, bool subsequent) {
+    std::unique_ptr<SendJobHeader> sd = deserializeRegistry(initView);
+    mergeIntoRegistry(*sd, productRegistryUpdate(), *branchIDListHelper(), *thinnedAssociationsHelper(), subsequent);
+    if (subsequent) {
+      adjustEventToNewProductRegistry_ = true;
+    }
+    SendJobHeader::ParameterSetMap const& psetMap = sd->processParameterSet();
+    pset::Registry& psetRegistry = *pset::Registry::instance();
+    for (auto const& item : psetMap) {
+      ParameterSet pset(item.second.pset());
+      pset.setID(item.first);
+      psetRegistry.insertMapped(pset);
+    }
   }
 
   /**
    * Deserializes the specified event message.
    */
-  void
-  StreamerInputSource::deserializeEvent(EventMsgView const& eventView) {
-    if(eventView.code() != Header::EVENT)
-      throw cms::Exception("StreamTranslation","Event deserialization error")
-        << "received wrong message type: expected EVENT, got "
-        << eventView.code() << "\n";
-    FDEBUG(9) << "Decode event: "
-         << eventView.event() << " "
-         << eventView.run() << " "
-         << eventView.size() << " "
-         << eventView.adler32_chksum() << " "
-         << eventView.eventLength() << " "
-         << eventView.eventData()
-         << std::endl;
+  void StreamerInputSource::deserializeEvent(EventMsgView const& eventView) {
+    if (eventView.code() != Header::EVENT)
+      throw cms::Exception("StreamTranslation", "Event deserialization error")
+          << "received wrong message type: expected EVENT, got " << eventView.code() << "\n";
+    FDEBUG(9) << "Decode event: " << eventView.event() << " " << eventView.run() << " " << eventView.size() << " "
+              << eventView.adler32_chksum() << " " << eventView.eventLength() << " " << eventView.eventData()
+              << std::endl;
     // uncompress if we need to
     // 78 was a dummy value (for no uncompressed) - should be 0 for uncompressed
     // need to get rid of this when 090 MTCC streamers are gotten rid of
     unsigned long origsize = eventView.origDataSize();
-    unsigned long dest_size; //(should be >= eventView.origDataSize())
+    unsigned long dest_size;  //(should be >= eventView.origDataSize())
 
     uint32_t adler32_chksum = cms::Adler32((char const*)eventView.eventData(), eventView.eventLength());
     //std::cout << "Adler32 checksum of event = " << adler32_chksum << std::endl;
     //std::cout << "Adler32 checksum from header = " << eventView.adler32_chksum() << " "
     //          << "host name = " << eventView.hostName() << " len = " << eventView.hostName_len() << std::endl;
-    if((uint32)adler32_chksum != eventView.adler32_chksum()) {
+    if ((uint32)adler32_chksum != eventView.adler32_chksum()) {
       // skip event (based on option?) or throw exception?
       throw cms::Exception("StreamDeserialization", "Checksum error")
-        << " chksum from event = " << adler32_chksum << " from header = "
-        << eventView.adler32_chksum() << " host name = " << eventView.hostName() << std::endl;
+          << " chksum from event = " << adler32_chksum << " from header = " << eventView.adler32_chksum()
+          << " host name = " << eventView.hostName() << std::endl;
     }
-    if(origsize != 78 && origsize != 0) {
+    if (origsize != 78 && origsize != 0) {
       // compressed
       dest_size = uncompressBuffer(const_cast<unsigned char*>((unsigned char const*)eventView.eventData()),
-                                   eventView.eventLength(), dest_, origsize);
-    } else { // not compressed
+                                   eventView.eventLength(),
+                                   dest_,
+                                   origsize);
+    } else {  // not compressed
       // we need to copy anyway the buffer as we are using dest in xbuf
       dest_size = eventView.eventLength();
       dest_.resize(dest_size);
-      unsigned char* pos = (unsigned char*) &dest_[0];
-      unsigned char const* from = (unsigned char const*) eventView.eventData();
-      std::copy(from,from+dest_size,pos);
+      unsigned char* pos = (unsigned char*)&dest_[0];
+      unsigned char const* from = (unsigned char const*)eventView.eventData();
+      std::copy(from, from + dest_size, pos);
     }
     //TBuffer xbuf(TBuffer::kRead, dest_size,
     //             (char const*) &dest[0],kFALSE);
     //TBuffer xbuf(TBuffer::kRead, eventView.eventLength(),
     //             (char const*) eventView.eventData(),kFALSE);
     xbuf_.Reset();
-    xbuf_.SetBuffer(&dest_[0],dest_size,kFALSE);
-    RootDebug tracer(10,10);
+    xbuf_.SetBuffer(&dest_[0], dest_size, kFALSE);
+    RootDebug tracer(10, 10);
 
     //We do not yet know which EventPrincipal we will use, therefore
     // we are using a new EventPrincipalHolder as a proxy. We need to
     // make a new one instead of reusing the same one becuase when running
     // multi-threaded there will be multiple EventPrincipals being used
     // simultaneously.
-    eventPrincipalHolder_ = std::make_unique<EventPrincipalHolder>(); // propagate_const<T> has no reset() function
+    eventPrincipalHolder_ = std::make_unique<EventPrincipalHolder>();  // propagate_const<T> has no reset() function
     setRefCoreStreamer(eventPrincipalHolder_.get());
     {
-      std::shared_ptr<void> refCoreStreamerGuard(nullptr,[](void*){ setRefCoreStreamer();
-        ;});
+      std::shared_ptr<void> refCoreStreamerGuard(nullptr, [](void*) {
+        setRefCoreStreamer();
+        ;
+      });
       sendEvent_ = std::unique_ptr<SendEvent>((SendEvent*)xbuf_.ReadObjectAny(tc_));
     }
 
-    if(sendEvent_.get() == nullptr) {
-        throw cms::Exception("StreamTranslation","Event deserialization error")
+    if (sendEvent_.get() == nullptr) {
+      throw cms::Exception("StreamTranslation", "Event deserialization error")
           << "got a null event from input stream\n";
     }
     processHistoryRegistryForUpdate().registerProcessHistory(sendEvent_->processHistory());
 
     FDEBUG(5) << "Got event: " << sendEvent_->aux().id() << " " << sendEvent_->products().size() << std::endl;
-    if(runAuxiliary().get() == nullptr || runAuxiliary()->run() != sendEvent_->aux().run()) {
-      RunAuxiliary* runAuxiliary = new RunAuxiliary(sendEvent_->aux().run(), sendEvent_->aux().time(), Timestamp::invalidTimestamp());
+    if (runAuxiliary().get() == nullptr || runAuxiliary()->run() != sendEvent_->aux().run()) {
+      RunAuxiliary* runAuxiliary =
+          new RunAuxiliary(sendEvent_->aux().run(), sendEvent_->aux().time(), Timestamp::invalidTimestamp());
       runAuxiliary->setProcessHistoryID(sendEvent_->processHistory().id());
       setRunAuxiliary(runAuxiliary);
       resetLuminosityBlockAuxiliary();
     }
-    if(!luminosityBlockAuxiliary() || luminosityBlockAuxiliary()->luminosityBlock() != eventView.lumi()) {
-      LuminosityBlockAuxiliary* luminosityBlockAuxiliary =
-        new LuminosityBlockAuxiliary(runAuxiliary()->run(), eventView.lumi(), sendEvent_->aux().time(), Timestamp::invalidTimestamp());
+    if (!luminosityBlockAuxiliary() || luminosityBlockAuxiliary()->luminosityBlock() != eventView.lumi()) {
+      LuminosityBlockAuxiliary* luminosityBlockAuxiliary = new LuminosityBlockAuxiliary(
+          runAuxiliary()->run(), eventView.lumi(), sendEvent_->aux().time(), Timestamp::invalidTimestamp());
       luminosityBlockAuxiliary->setProcessHistoryID(sendEvent_->processHistory().id());
       setLuminosityBlockAuxiliary(luminosityBlockAuxiliary);
     }
     setEventCached();
   }
 
-  void
-  StreamerInputSource::read(EventPrincipal& eventPrincipal) {
-    if(adjustEventToNewProductRegistry_) {
+  void StreamerInputSource::read(EventPrincipal& eventPrincipal) {
+    if (adjustEventToNewProductRegistry_) {
       eventPrincipal.adjustIndexesAfterProductRegistryAddition();
       bool eventOK = eventPrincipal.adjustToNewProductRegistry(*productRegistry());
       assert(eventOK);
@@ -298,50 +280,50 @@ namespace edm {
     //We now know which eventPrincipal to use and we can reuse the slot in
     // streamToEventPrincipalHolders to own the memory
     eventPrincipalHolder_->setEventPrincipal(&eventPrincipal);
-    if(streamToEventPrincipalHolders_.size() < eventPrincipal.streamID().value() +1) {
-      streamToEventPrincipalHolders_.resize(eventPrincipal.streamID().value() +1);
+    if (streamToEventPrincipalHolders_.size() < eventPrincipal.streamID().value() + 1) {
+      streamToEventPrincipalHolders_.resize(eventPrincipal.streamID().value() + 1);
     }
     streamToEventPrincipalHolders_[eventPrincipal.streamID().value()] = std::move(eventPrincipalHolder_);
 
     // no process name list handling
 
     SendProds& sps = sendEvent_->products();
-    for(auto& spitem : sps) {
-        FDEBUG(10) << "check prodpair" << std::endl;
-        if(spitem.desc() == nullptr)
-          throw cms::Exception("StreamTranslation","Empty Provenance");
-        FDEBUG(5) << "Prov:"
-             << " " << spitem.desc()->className()
-             << " " << spitem.desc()->productInstanceName()
-             << " " << spitem.desc()->branchID()
-             << std::endl;
-
-        BranchDescription const branchDesc(*spitem.desc());
-        // This ProductProvenance constructor inserts into the entry description registry
-        if (spitem.parents()) {
-          ProductProvenance productProvenance(spitem.branchID(), *spitem.parents());
-          if(spitem.prod() != nullptr) {
-            FDEBUG(10) << "addproduct next " << spitem.branchID() << std::endl;
-            eventPrincipal.putOnRead(branchDesc, std::unique_ptr<WrapperBase>(const_cast<WrapperBase*>(spitem.prod())), &productProvenance);
-            FDEBUG(10) << "addproduct done" << std::endl;
-          } else {
-            FDEBUG(10) << "addproduct empty next " << spitem.branchID() << std::endl;
-            eventPrincipal.putOnRead(branchDesc, std::unique_ptr<WrapperBase>(), &productProvenance);
-            FDEBUG(10) << "addproduct empty done" << std::endl;
-          }
-	} else {
-          ProductProvenance const* productProvenance = nullptr;
-          if(spitem.prod() != nullptr) {
-            FDEBUG(10) << "addproduct next " << spitem.branchID() << std::endl;
-            eventPrincipal.putOnRead(branchDesc, std::unique_ptr<WrapperBase>(const_cast<WrapperBase*>(spitem.prod())), productProvenance);
-            FDEBUG(10) << "addproduct done" << std::endl;
-          } else {
-            FDEBUG(10) << "addproduct empty next " << spitem.branchID() << std::endl;
-            eventPrincipal.putOnRead(branchDesc, std::unique_ptr<WrapperBase>(), productProvenance);
-            FDEBUG(10) << "addproduct empty done" << std::endl;
-          }
+    for (auto& spitem : sps) {
+      FDEBUG(10) << "check prodpair" << std::endl;
+      if (spitem.desc() == nullptr)
+        throw cms::Exception("StreamTranslation", "Empty Provenance");
+      FDEBUG(5) << "Prov:"
+                << " " << spitem.desc()->className() << " " << spitem.desc()->productInstanceName() << " "
+                << spitem.desc()->branchID() << std::endl;
+
+      BranchDescription const branchDesc(*spitem.desc());
+      // This ProductProvenance constructor inserts into the entry description registry
+      if (spitem.parents()) {
+        ProductProvenance productProvenance(spitem.branchID(), *spitem.parents());
+        if (spitem.prod() != nullptr) {
+          FDEBUG(10) << "addproduct next " << spitem.branchID() << std::endl;
+          eventPrincipal.putOnRead(
+              branchDesc, std::unique_ptr<WrapperBase>(const_cast<WrapperBase*>(spitem.prod())), &productProvenance);
+          FDEBUG(10) << "addproduct done" << std::endl;
+        } else {
+          FDEBUG(10) << "addproduct empty next " << spitem.branchID() << std::endl;
+          eventPrincipal.putOnRead(branchDesc, std::unique_ptr<WrapperBase>(), &productProvenance);
+          FDEBUG(10) << "addproduct empty done" << std::endl;
+        }
+      } else {
+        ProductProvenance const* productProvenance = nullptr;
+        if (spitem.prod() != nullptr) {
+          FDEBUG(10) << "addproduct next " << spitem.branchID() << std::endl;
+          eventPrincipal.putOnRead(
+              branchDesc, std::unique_ptr<WrapperBase>(const_cast<WrapperBase*>(spitem.prod())), productProvenance);
+          FDEBUG(10) << "addproduct done" << std::endl;
+        } else {
+          FDEBUG(10) << "addproduct empty next " << spitem.branchID() << std::endl;
+          eventPrincipal.putOnRead(branchDesc, std::unique_ptr<WrapperBase>(), productProvenance);
+          FDEBUG(10) << "addproduct empty done" << std::endl;
         }
-        spitem.clear();
+      }
+      spitem.clear();
     }
 
     FDEBUG(10) << "Size = " << eventPrincipal.size() << std::endl;
@@ -355,91 +337,74 @@ namespace edm {
    * Returns the actual size of the uncompressed data.
    * Errors are reported by throwing exceptions.
    */
-  unsigned int
-  StreamerInputSource::uncompressBuffer(unsigned char* inputBuffer,
-                                        unsigned int inputSize,
-                                        std::vector<unsigned char>& outputBuffer,
-                                        unsigned int expectedFullSize) {
+  unsigned int StreamerInputSource::uncompressBuffer(unsigned char* inputBuffer,
+                                                     unsigned int inputSize,
+                                                     std::vector<unsigned char>& outputBuffer,
+                                                     unsigned int expectedFullSize) {
     unsigned long origSize = expectedFullSize;
-    unsigned long uncompressedSize = expectedFullSize*1.1;
-    FDEBUG(1) << "Uncompress: original size = " << origSize
-              << ", compressed size = " << inputSize
-              << std::endl;
+    unsigned long uncompressedSize = expectedFullSize * 1.1;
+    FDEBUG(1) << "Uncompress: original size = " << origSize << ", compressed size = " << inputSize << std::endl;
     outputBuffer.resize(uncompressedSize);
-    int ret = uncompress(&outputBuffer[0], &uncompressedSize,
-                         inputBuffer, inputSize); // do not need compression level
+    int ret = uncompress(&outputBuffer[0], &uncompressedSize, inputBuffer, inputSize);  // do not need compression level
     //std::cout << "unCompress Return value: " << ret << " Okay = " << Z_OK << std::endl;
-    if(ret == Z_OK) {
-        // check the length against original uncompressed length
-        FDEBUG(10) << " original size = " << origSize << " final size = "
-                   << uncompressedSize << std::endl;
-        if(origSize != uncompressedSize) {
-            // we throw an error and return without event! null pointer
-            throw cms::Exception("StreamDeserialization","Uncompression error")
-              << "mismatch event lengths should be" << origSize << " got "
-              << uncompressedSize << "\n";
-        }
-    } else {
+    if (ret == Z_OK) {
+      // check the length against original uncompressed length
+      FDEBUG(10) << " original size = " << origSize << " final size = " << uncompressedSize << std::endl;
+      if (origSize != uncompressedSize) {
         // we throw an error and return without event! null pointer
-        throw cms::Exception("StreamDeserialization","Uncompression error")
-            << "Error code = " << ret << "\n ";
+        throw cms::Exception("StreamDeserialization", "Uncompression error")
+            << "mismatch event lengths should be" << origSize << " got " << uncompressedSize << "\n";
+      }
+    } else {
+      // we throw an error and return without event! null pointer
+      throw cms::Exception("StreamDeserialization", "Uncompression error") << "Error code = " << ret << "\n ";
     }
-    return (unsigned int) uncompressedSize;
+    return (unsigned int)uncompressedSize;
   }
 
   void StreamerInputSource::resetAfterEndRun() {
-     // called from an online streamer source to reset after a stop command
-     // so an enable command will work
-     resetLuminosityBlockAuxiliary();
-     resetRunAuxiliary();
-     assert(!eventCached());
-     reset();
+    // called from an online streamer source to reset after a stop command
+    // so an enable command will work
+    resetLuminosityBlockAuxiliary();
+    resetRunAuxiliary();
+    assert(!eventCached());
+    reset();
   }
 
   void StreamerInputSource::setRun(RunNumber_t) {
-     // Need to define a dummy setRun here or else the InputSource::setRun is called
-     // if we have a source inheriting from this and wants to define a setRun method
-     throw Exception(errors::LogicError)
-     << "StreamerInputSource::setRun()\n"
-     << "Run number cannot be modified for this type of Input Source\n"
-     << "Contact a Storage Manager Developer\n";
+    // Need to define a dummy setRun here or else the InputSource::setRun is called
+    // if we have a source inheriting from this and wants to define a setRun method
+    throw Exception(errors::LogicError) << "StreamerInputSource::setRun()\n"
+                                        << "Run number cannot be modified for this type of Input Source\n"
+                                        << "Contact a Storage Manager Developer\n";
   }
 
   StreamerInputSource::EventPrincipalHolder::EventPrincipalHolder() : eventPrincipal_(nullptr) {}
 
   StreamerInputSource::EventPrincipalHolder::~EventPrincipalHolder() {}
 
-  WrapperBase const*
-  StreamerInputSource::EventPrincipalHolder::getIt(ProductID const& id) const {
+  WrapperBase const* StreamerInputSource::EventPrincipalHolder::getIt(ProductID const& id) const {
     return eventPrincipal_ ? eventPrincipal_->getIt(id) : nullptr;
   }
 
-  WrapperBase const*
-  StreamerInputSource::EventPrincipalHolder::getThinnedProduct(edm::ProductID const& id, unsigned int& index) const {
+  WrapperBase const* StreamerInputSource::EventPrincipalHolder::getThinnedProduct(edm::ProductID const& id,
+                                                                                  unsigned int& index) const {
     return eventPrincipal_ ? eventPrincipal_->getThinnedProduct(id, index) : nullptr;
   }
 
-  void
-  StreamerInputSource::EventPrincipalHolder::getThinnedProducts(ProductID const& pid,
-                                                                std::vector<WrapperBase const*>& wrappers,
-                                                                std::vector<unsigned int>& keys) const {
-    if (eventPrincipal_) eventPrincipal_->getThinnedProducts(pid, wrappers, keys);
+  void StreamerInputSource::EventPrincipalHolder::getThinnedProducts(ProductID const& pid,
+                                                                     std::vector<WrapperBase const*>& wrappers,
+                                                                     std::vector<unsigned int>& keys) const {
+    if (eventPrincipal_)
+      eventPrincipal_->getThinnedProducts(pid, wrappers, keys);
   }
 
-
-  unsigned int
-  StreamerInputSource::EventPrincipalHolder::transitionIndex_() const {
+  unsigned int StreamerInputSource::EventPrincipalHolder::transitionIndex_() const {
     assert(eventPrincipal_ != nullptr);
     return eventPrincipal_->transitionIndex();
   }
 
-  void
-  StreamerInputSource::EventPrincipalHolder::setEventPrincipal(EventPrincipal* ep) {
-    eventPrincipal_ = ep;
-  }
+  void StreamerInputSource::EventPrincipalHolder::setEventPrincipal(EventPrincipal* ep) { eventPrincipal_ = ep; }
 
-  void
-  StreamerInputSource::fillDescription(ParameterSetDescription& desc) {
-    RawInputSource::fillDescription(desc);
-  }
-}
+  void StreamerInputSource::fillDescription(ParameterSetDescription& desc) { RawInputSource::fillDescription(desc); }
+}  // namespace edm
diff --git a/IOPool/Streamer/src/StreamerOutputFile.cc b/IOPool/Streamer/src/StreamerOutputFile.cc
index 70b83f51942d7..a2eb3ff54546d 100644
--- a/IOPool/Streamer/src/StreamerOutputFile.cc
+++ b/IOPool/Streamer/src/StreamerOutputFile.cc
@@ -1,110 +1,82 @@
 #include "IOPool/Streamer/interface/StreamerOutputFile.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-  StreamerOutputFile::~StreamerOutputFile() {
-  }
+StreamerOutputFile::~StreamerOutputFile() {}
 
-  StreamerOutputFile::StreamerOutputFile(const std::string& name):
-  streamerfile_(new OutputFile(name))
-  {
-    streamerfile_->set_do_adler(true);
-  }
+StreamerOutputFile::StreamerOutputFile(const std::string& name) : streamerfile_(new OutputFile(name)) {
+  streamerfile_->set_do_adler(true);
+}
 
-  uint64 StreamerOutputFile::write(const EventMsgBuilder& ineview)
-  {
-    EventMsgView tmpView(ineview.startAddress());
-    return write(tmpView);
-  }
+uint64 StreamerOutputFile::write(const EventMsgBuilder& ineview) {
+  EventMsgView tmpView(ineview.startAddress());
+  return write(tmpView);
+}
 
-  uint64 StreamerOutputFile::write(const EventMsgView& ineview)
-  {
-    /** Offset where current event starts */
-    uint64 offset_to_return = streamerfile_->current_offset();
+uint64 StreamerOutputFile::write(const EventMsgView& ineview) {
+  /** Offset where current event starts */
+  uint64 offset_to_return = streamerfile_->current_offset();
 
-    writeEventHeader(ineview);
-    bool ret = streamerfile_->write((const char*) ineview.eventData(),
-                                    ineview.size() - ineview.headerSize());
-    if (ret) {
-      throw cms::Exception("OutputFile", "write(EventMsgView)")
-        << "Error writing streamer event data to "
-        << streamerfile_->fileName() << ".  Possibly the output disk "
+  writeEventHeader(ineview);
+  bool ret = streamerfile_->write((const char*)ineview.eventData(), ineview.size() - ineview.headerSize());
+  if (ret) {
+    throw cms::Exception("OutputFile", "write(EventMsgView)")
+        << "Error writing streamer event data to " << streamerfile_->fileName() << ".  Possibly the output disk "
         << "is full?" << std::endl;
-    }
-    return offset_to_return;
   }
+  return offset_to_return;
+}
 
-  uint64 StreamerOutputFile::
-  writeEventFragment(uint32 fragIndex, uint32 fragCount,
-                     const char *dataPtr, uint32 dataSize)
-  {
-    /** Offset where current event starts */
-    uint64 offset_to_return = streamerfile_->current_offset();
+uint64 StreamerOutputFile::writeEventFragment(uint32 fragIndex, uint32 fragCount, const char* dataPtr, uint32 dataSize) {
+  /** Offset where current event starts */
+  uint64 offset_to_return = streamerfile_->current_offset();
 
-    bool ret = streamerfile_->write(dataPtr, dataSize);
-    if (ret) {
-      throw cms::Exception("OutputFile", "writeEventFragment()")
-        << "Error writing streamer event data to "
-        << streamerfile_->fileName() << ".  Possibly the output disk "
+  bool ret = streamerfile_->write(dataPtr, dataSize);
+  if (ret) {
+    throw cms::Exception("OutputFile", "writeEventFragment()")
+        << "Error writing streamer event data to " << streamerfile_->fileName() << ".  Possibly the output disk "
         << "is full?" << std::endl;
-    }
-    return offset_to_return;
   }
+  return offset_to_return;
+}
 
-  void StreamerOutputFile::writeEventHeader(const EventMsgView& ineview)
-  {
-    bool ret = streamerfile_->write((const char*)
-                                    ineview.startAddress(),
-                                    ineview.headerSize()) ;
-    if (ret) {
-      throw cms::Exception("OutputFile", "writeEventHeader")
-        << "Error writing streamer event data to "
-        << streamerfile_->fileName() << ".  Possibly the output disk "
+void StreamerOutputFile::writeEventHeader(const EventMsgView& ineview) {
+  bool ret = streamerfile_->write((const char*)ineview.startAddress(), ineview.headerSize());
+  if (ret) {
+    throw cms::Exception("OutputFile", "writeEventHeader")
+        << "Error writing streamer event data to " << streamerfile_->fileName() << ".  Possibly the output disk "
         << "is full?" << std::endl;
-    }
   }
+}
 
-  void StreamerOutputFile::write(const InitMsgBuilder& inview)
-  {
-    InitMsgView tmpView(inview.startAddress());
-    return write(tmpView);
-  }
+void StreamerOutputFile::write(const InitMsgBuilder& inview) {
+  InitMsgView tmpView(inview.startAddress());
+  return write(tmpView);
+}
 
-  void StreamerOutputFile::write(const InitMsgView& inview)
-  {
-    writeStart(inview);
-    bool ret = streamerfile_->write((const char*) inview.descData(),
-                                    inview.size() - inview.headerSize());
-    if (ret) {
-      throw cms::Exception("OutputFile", "write(InitMsgView)")
-        << "Error writing streamer header data to "
-        << streamerfile_->fileName() << ".  Possibly the output disk "
+void StreamerOutputFile::write(const InitMsgView& inview) {
+  writeStart(inview);
+  bool ret = streamerfile_->write((const char*)inview.descData(), inview.size() - inview.headerSize());
+  if (ret) {
+    throw cms::Exception("OutputFile", "write(InitMsgView)")
+        << "Error writing streamer header data to " << streamerfile_->fileName() << ".  Possibly the output disk "
         << "is full?" << std::endl;
-    }
   }
+}
 
-  void StreamerOutputFile::
-  writeInitFragment(uint32 fragIndex, uint32 fragCount,
-                    const char *dataPtr, uint32 dataSize)
-  {
-    bool ret = streamerfile_->write((const char*) dataPtr, dataSize);
-    if (ret) {
-      throw cms::Exception("OutputFile", "writeInitFragment()")
-        << "Error writing streamer header data to "
-        << streamerfile_->fileName() << ".  Possibly the output disk "
+void StreamerOutputFile::writeInitFragment(uint32 fragIndex, uint32 fragCount, const char* dataPtr, uint32 dataSize) {
+  bool ret = streamerfile_->write((const char*)dataPtr, dataSize);
+  if (ret) {
+    throw cms::Exception("OutputFile", "writeInitFragment()")
+        << "Error writing streamer header data to " << streamerfile_->fileName() << ".  Possibly the output disk "
         << "is full?" << std::endl;
-    }
   }
+}
 
-  void StreamerOutputFile::writeStart(const InitMsgView& inview)
-  {
-    bool ret = streamerfile_->write((const char*)
-                                    inview.startAddress(),
-                                    inview.headerSize()) ;
-    if (ret) {
-      throw cms::Exception("OutputFile", "writeStart")
-        << "Error writing streamer header data to "
-        << streamerfile_->fileName() << ".  Possibly the output disk "
+void StreamerOutputFile::writeStart(const InitMsgView& inview) {
+  bool ret = streamerfile_->write((const char*)inview.startAddress(), inview.headerSize());
+  if (ret) {
+    throw cms::Exception("OutputFile", "writeStart")
+        << "Error writing streamer header data to " << streamerfile_->fileName() << ".  Possibly the output disk "
         << "is full?" << std::endl;
-    }
   }
-
+}
diff --git a/IOPool/Streamer/src/StreamerOutputModuleBase.cc b/IOPool/Streamer/src/StreamerOutputModuleBase.cc
index 8ea401026871d..76d07e49fe1ca 100644
--- a/IOPool/Streamer/src/StreamerOutputModuleBase.cc
+++ b/IOPool/Streamer/src/StreamerOutputModuleBase.cc
@@ -13,63 +13,52 @@
 #include "zlib.h"
 
 namespace edm {
-  StreamerOutputModuleBase::StreamerOutputModuleBase(ParameterSet const& ps) :
-    one::OutputModuleBase::OutputModuleBase(ps),
-    one::OutputModule<one::WatchRuns, one::WatchLuminosityBlocks>(ps),
-    StreamerOutputModuleCommon(ps,&keptProducts()[InEvent]),
-    trToken_(consumes<edm::TriggerResults>(edm::InputTag("TriggerResults")))
-  {}
+  StreamerOutputModuleBase::StreamerOutputModuleBase(ParameterSet const& ps)
+      : one::OutputModuleBase::OutputModuleBase(ps),
+        one::OutputModule<one::WatchRuns, one::WatchLuminosityBlocks>(ps),
+        StreamerOutputModuleCommon(ps, &keptProducts()[InEvent]),
+        trToken_(consumes<edm::TriggerResults>(edm::InputTag("TriggerResults"))) {}
 
   StreamerOutputModuleBase::~StreamerOutputModuleBase() {}
 
-  void
-  StreamerOutputModuleBase::beginRun(RunForOutput const&) {
+  void StreamerOutputModuleBase::beginRun(RunForOutput const&) {
     start();
 
-    std::unique_ptr<InitMsgBuilder> init_message = 
-      serializeRegistry(*branchIDLists(), *thinnedAssociationsHelper(), 
-                        OutputModule::processName(), description().moduleLabel(), moduleDescription().mainParameterSetID());
+    std::unique_ptr<InitMsgBuilder> init_message = serializeRegistry(*branchIDLists(),
+                                                                     *thinnedAssociationsHelper(),
+                                                                     OutputModule::processName(),
+                                                                     description().moduleLabel(),
+                                                                     moduleDescription().mainParameterSetID());
 
     doOutputHeader(*init_message);
     clearSerializeDataBuffer();
   }
 
-  void
-  StreamerOutputModuleBase::endRun(RunForOutput const&) {
-    stop();
-  }
+  void StreamerOutputModuleBase::endRun(RunForOutput const&) { stop(); }
 
-  void
-  StreamerOutputModuleBase::beginJob() {}
+  void StreamerOutputModuleBase::beginJob() {}
 
-  void
-  StreamerOutputModuleBase::endJob() {
-    stop();
-  }
+  void StreamerOutputModuleBase::endJob() { stop(); }
 
-  void
-  StreamerOutputModuleBase::writeRun(RunForOutput const&) {}
+  void StreamerOutputModuleBase::writeRun(RunForOutput const&) {}
 
-  void
-  StreamerOutputModuleBase::writeLuminosityBlock(LuminosityBlockForOutput const&) {}
+  void StreamerOutputModuleBase::writeLuminosityBlock(LuminosityBlockForOutput const&) {}
 
-  void
-  StreamerOutputModuleBase::write(EventForOutput const& e) {
+  void StreamerOutputModuleBase::write(EventForOutput const& e) {
     Handle<TriggerResults> const& triggerResults = getTriggerResults(trToken_, e);
     std::unique_ptr<EventMsgBuilder> msg = serializeEvent(e, triggerResults, selectorConfig());
-    doOutputEvent(*msg); // You can't use msg in StreamerOutputModuleBase after this point
+    doOutputEvent(*msg);  // You can't use msg in StreamerOutputModuleBase after this point
   }
 
-  Trig
-  StreamerOutputModuleBase::getTriggerResults(EDGetTokenT<TriggerResults> const& token, EventForOutput const& e) const {
+  Trig StreamerOutputModuleBase::getTriggerResults(EDGetTokenT<TriggerResults> const& token,
+                                                   EventForOutput const& e) const {
     Trig result;
     e.getByToken<TriggerResults>(token, result);
     return result;
   }
 
-  void
-  StreamerOutputModuleBase::fillDescription(ParameterSetDescription& desc) {
+  void StreamerOutputModuleBase::fillDescription(ParameterSetDescription& desc) {
     StreamerOutputModuleCommon::fillDescription(desc);
     OutputModule::fillDescription(desc);
   }
-} // end of namespace-edm
+}  // namespace edm
diff --git a/IOPool/Streamer/src/StreamerOutputModuleCommon.cc b/IOPool/Streamer/src/StreamerOutputModuleCommon.cc
index b285640ddaf3b..05c83c28b898b 100644
--- a/IOPool/Streamer/src/StreamerOutputModuleCommon.cc
+++ b/IOPool/Streamer/src/StreamerOutputModuleCommon.cc
@@ -23,42 +23,42 @@
 #include <zlib.h>
 
 namespace edm {
-  StreamerOutputModuleCommon::StreamerOutputModuleCommon(ParameterSet const& ps, SelectedProducts const* selections) :
-
-    serializer_(selections),
-    maxEventSize_(ps.getUntrackedParameter<int>("max_event_size")),
-    useCompression_(ps.getUntrackedParameter<bool>("use_compression")),
-    compressionLevel_(ps.getUntrackedParameter<int>("compression_level")),
-    lumiSectionInterval_(ps.getUntrackedParameter<int>("lumiSection_interval")),
-    serializeDataBuffer_(),
-    hltsize_(0),
-    origSize_(0),
-    host_name_(),
-    hltTriggerSelections_(),
-    outputModuleId_(0) {
+  StreamerOutputModuleCommon::StreamerOutputModuleCommon(ParameterSet const& ps, SelectedProducts const* selections)
+      :
+
+        serializer_(selections),
+        maxEventSize_(ps.getUntrackedParameter<int>("max_event_size")),
+        useCompression_(ps.getUntrackedParameter<bool>("use_compression")),
+        compressionLevel_(ps.getUntrackedParameter<int>("compression_level")),
+        lumiSectionInterval_(ps.getUntrackedParameter<int>("lumiSection_interval")),
+        serializeDataBuffer_(),
+        hltsize_(0),
+        origSize_(0),
+        host_name_(),
+        hltTriggerSelections_(),
+        outputModuleId_(0) {
     // no compression as default value - we need this!
 
     // test luminosity sections
     struct timeval now;
     struct timezone dummyTZ;
     gettimeofday(&now, &dummyTZ);
-    timeInSecSinceUTC = static_cast<double>(now.tv_sec) + (static_cast<double>(now.tv_usec)/1000000.0);
+    timeInSecSinceUTC = static_cast<double>(now.tv_sec) + (static_cast<double>(now.tv_usec) / 1000000.0);
 
-    if(useCompression_ == true) {
-      if(compressionLevel_ <= 0) {
-        FDEBUG(9) << "Compression Level = " << compressionLevel_
-                  << " no compression" << std::endl;
+    if (useCompression_ == true) {
+      if (compressionLevel_ <= 0) {
+        FDEBUG(9) << "Compression Level = " << compressionLevel_ << " no compression" << std::endl;
         compressionLevel_ = 0;
         useCompression_ = false;
-      } else if(compressionLevel_ > 9) {
-        FDEBUG(9) << "Compression Level = " << compressionLevel_
-                  << " using max compression level 9" << std::endl;
+      } else if (compressionLevel_ > 9) {
+        FDEBUG(9) << "Compression Level = " << compressionLevel_ << " using max compression level 9" << std::endl;
         compressionLevel_ = 9;
       }
     }
     serializeDataBuffer_.bufs_.resize(maxEventSize_);
     int got_host = gethostname(host_name_, 255);
-    if(got_host != 0) strncpy(host_name_, "noHostNameFoundOrTooLong", sizeof(host_name_));
+    if (got_host != 0)
+      strncpy(host_name_, "noHostNameFoundOrTooLong", sizeof(host_name_));
     //loadExtraClasses();
 
     // 25-Jan-2008, KAB - pull out the trigger selection request
@@ -68,22 +68,19 @@ namespace edm {
 
   StreamerOutputModuleCommon::~StreamerOutputModuleCommon() {}
 
-
-  std::unique_ptr<InitMsgBuilder>
-  StreamerOutputModuleCommon::serializeRegistry( const BranchIDLists &branchLists,
-                                                 ThinnedAssociationsHelper const& helper,
-                                                 std::string const& processName,
-                                                 std::string const& moduleLabel,
-                                                 ParameterSetID const& toplevel)
-  {
-
+  std::unique_ptr<InitMsgBuilder> StreamerOutputModuleCommon::serializeRegistry(const BranchIDLists& branchLists,
+                                                                                ThinnedAssociationsHelper const& helper,
+                                                                                std::string const& processName,
+                                                                                std::string const& moduleLabel,
+                                                                                ParameterSetID const& toplevel) {
     serializer_.serializeRegistry(serializeDataBuffer_, branchLists, helper);
 
     // resize bufs_ to reflect space used in serializer_ + header
     // I just added an overhead for header of 50000 for now
     unsigned int src_size = serializeDataBuffer_.currentSpaceUsed();
     unsigned int new_size = src_size + 50000;
-    if(serializeDataBuffer_.header_buf_.size() < new_size) serializeDataBuffer_.header_buf_.resize(new_size);
+    if (serializeDataBuffer_.header_buf_.size() < new_size)
+      serializeDataBuffer_.header_buf_.resize(new_size);
 
     //Build the INIT Message
     //Following values are strictly DUMMY and will be replaced
@@ -112,13 +109,18 @@ namespace edm {
     crc = crc32(crc, buf, moduleLabel.length());
     outputModuleId_ = static_cast<uint32>(crc);
 
-    auto init_message = std::make_unique<InitMsgBuilder>(
-                           &serializeDataBuffer_.header_buf_[0], serializeDataBuffer_.header_buf_.size(),
-                           run, Version((uint8 const*)toplevel.compactForm().c_str()),
-                           getReleaseVersion().c_str() , processName.c_str(),
-                           moduleLabel.c_str(), outputModuleId_,
-                           hltTriggerNames, hltTriggerSelections_, l1_names,
-                           (uint32)serializeDataBuffer_.adler32_chksum());
+    auto init_message = std::make_unique<InitMsgBuilder>(&serializeDataBuffer_.header_buf_[0],
+                                                         serializeDataBuffer_.header_buf_.size(),
+                                                         run,
+                                                         Version((uint8 const*)toplevel.compactForm().c_str()),
+                                                         getReleaseVersion().c_str(),
+                                                         processName.c_str(),
+                                                         moduleLabel.c_str(),
+                                                         outputModuleId_,
+                                                         hltTriggerNames,
+                                                         hltTriggerSelections_,
+                                                         l1_names,
+                                                         (uint32)serializeDataBuffer_.adler32_chksum());
 
     // copy data into the destination message
     unsigned char* src = serializeDataBuffer_.bufferPointer();
@@ -127,36 +129,36 @@ namespace edm {
     return init_message;
   }
 
-  void
-  StreamerOutputModuleCommon::setHltMask(EventForOutput const& e, Handle<TriggerResults> const& triggerResults, std::vector<unsigned char>& hltbits) const {
-
+  void StreamerOutputModuleCommon::setHltMask(EventForOutput const& e,
+                                              Handle<TriggerResults> const& triggerResults,
+                                              std::vector<unsigned char>& hltbits) const {
     hltbits.clear();
 
     std::vector<unsigned char> vHltState;
 
     if (triggerResults.isValid()) {
-      for(std::vector<unsigned char>::size_type i=0; i != hltsize_ ; ++i) {
+      for (std::vector<unsigned char>::size_type i = 0; i != hltsize_; ++i) {
         vHltState.push_back(((triggerResults->at(i)).state()));
       }
     } else {
-     // We fill all Trigger bits to valid state.
-     for(std::vector<unsigned char>::size_type i=0; i != hltsize_ ; ++i) {
-           vHltState.push_back(hlt::Pass);
+      // We fill all Trigger bits to valid state.
+      for (std::vector<unsigned char>::size_type i = 0; i != hltsize_; ++i) {
+        vHltState.push_back(hlt::Pass);
       }
     }
 
     //Pack into member hltbits
     if (!vHltState.empty()) {
       unsigned int packInOneByte = 4;
-      unsigned int sizeOfPackage = 1+((vHltState.size()-1)/packInOneByte); //Two bits per HLT
+      unsigned int sizeOfPackage = 1 + ((vHltState.size() - 1) / packInOneByte);  //Two bits per HLT
 
       hltbits.resize(sizeOfPackage);
       std::fill(hltbits.begin(), hltbits.end(), 0);
 
-      for (std::vector<unsigned char>::size_type i=0; i != vHltState.size() ; ++i) {
-        unsigned int whichByte = i/packInOneByte;
+      for (std::vector<unsigned char>::size_type i = 0; i != vHltState.size(); ++i) {
+        unsigned int whichByte = i / packInOneByte;
         unsigned int indxWithinByte = i % packInOneByte;
-        hltbits[whichByte] = hltbits[whichByte] | (vHltState[i] << (indxWithinByte*2));
+        hltbits[whichByte] = hltbits[whichByte] | (vHltState[i] << (indxWithinByte * 2));
       }
     }
 
@@ -168,13 +170,13 @@ namespace edm {
     //std::cout << "\n";
   }
 
-  std::unique_ptr<EventMsgBuilder>
-  StreamerOutputModuleCommon::serializeEvent(EventForOutput const& e, Handle<TriggerResults> const& triggerResults, ParameterSetID const& selectorCfg) {
+  std::unique_ptr<EventMsgBuilder> StreamerOutputModuleCommon::serializeEvent(
+      EventForOutput const& e, Handle<TriggerResults> const& triggerResults, ParameterSetID const& selectorCfg) {
     //Lets Build the Event Message first
 
     //Following is strictly DUMMY Data for L! Trig and will be replaced with actual
     // once figured out, there is no logic involved here.
-    std::vector<bool> l1bit = {true,true,false};
+    std::vector<bool> l1bit = {true, true, false};
     //End of dummy data
 
     std::vector<unsigned char> hltbits;
@@ -184,13 +186,14 @@ namespace edm {
     if (lumiSectionInterval_ == 0) {
       lumi = e.luminosityBlock();
     } else {
-
       struct timeval now;
       struct timezone dummyTZ;
       gettimeofday(&now, &dummyTZ);
-      double timeInSec = static_cast<double>(now.tv_sec) + (static_cast<double>(now.tv_usec)/1000000.0) - timeInSecSinceUTC;
+      double timeInSec =
+          static_cast<double>(now.tv_sec) + (static_cast<double>(now.tv_usec) / 1000000.0) - timeInSecSinceUTC;
       // what about overflows?
-      if(lumiSectionInterval_ > 0) lumi = static_cast<uint32>(timeInSec/lumiSectionInterval_) + 1;
+      if (lumiSectionInterval_ > 0)
+        lumi = static_cast<uint32>(timeInSec / lumiSectionInterval_) + 1;
     }
 
     serializer_.serializeEvent(e, selectorCfg, useCompression_, compressionLevel_, serializeDataBuffer_);
@@ -199,14 +202,22 @@ namespace edm {
     // I just added an overhead for header of 50000 for now
     unsigned int src_size = serializeDataBuffer_.currentSpaceUsed();
     unsigned int new_size = src_size + 50000;
-    if(serializeDataBuffer_.bufs_.size() < new_size) serializeDataBuffer_.bufs_.resize(new_size);
-
-    auto msg = std::make_unique<EventMsgBuilder>(
-                              &serializeDataBuffer_.bufs_[0], serializeDataBuffer_.bufs_.size(), e.id().run(),
-                              e.id().event(), lumi, outputModuleId_, 0,
-                              l1bit, (uint8*)&hltbits[0], hltsize_,
-                              (uint32)serializeDataBuffer_.adler32_chksum(), host_name_);
-    msg->setOrigDataSize(origSize_); // we need this set to zero
+    if (serializeDataBuffer_.bufs_.size() < new_size)
+      serializeDataBuffer_.bufs_.resize(new_size);
+
+    auto msg = std::make_unique<EventMsgBuilder>(&serializeDataBuffer_.bufs_[0],
+                                                 serializeDataBuffer_.bufs_.size(),
+                                                 e.id().run(),
+                                                 e.id().event(),
+                                                 lumi,
+                                                 outputModuleId_,
+                                                 0,
+                                                 l1bit,
+                                                 (uint8*)&hltbits[0],
+                                                 hltsize_,
+                                                 (uint32)serializeDataBuffer_.adler32_chksum(),
+                                                 host_name_);
+    msg->setOrigDataSize(origSize_);  // we need this set to zero
 
     // copy data into the destination message
     // an alternative is to have serializer only to the serialization
@@ -218,23 +229,23 @@ namespace edm {
     // compressed size.
 
     unsigned char* src = serializeDataBuffer_.bufferPointer();
-    std::copy(src,src + src_size, msg->eventAddr());
+    std::copy(src, src + src_size, msg->eventAddr());
     msg->setEventLength(src_size);
-    if(useCompression_) msg->setOrigDataSize(serializeDataBuffer_.currentEventSize());
+    if (useCompression_)
+      msg->setOrigDataSize(serializeDataBuffer_.currentEventSize());
 
     return msg;
   }
 
-  void
-  StreamerOutputModuleCommon::fillDescription(ParameterSetDescription& desc) {
+  void StreamerOutputModuleCommon::fillDescription(ParameterSetDescription& desc) {
     desc.addUntracked<int>("max_event_size", 7000000)
         ->setComment("Starting size in bytes of the serialized event buffer.");
     desc.addUntracked<bool>("use_compression", true)
         ->setComment("If True, compression will be used to write streamer file.");
-    desc.addUntracked<int>("compression_level", 1)
-        ->setComment("ROOT compression level to use.");
+    desc.addUntracked<int>("compression_level", 1)->setComment("ROOT compression level to use.");
     desc.addUntracked<int>("lumiSection_interval", 0)
-        ->setComment("If 0, use lumi section number from event.\n"
-                     "If not 0, the interval in seconds between fake lumi sections.");
+        ->setComment(
+            "If 0, use lumi section number from event.\n"
+            "If not 0, the interval in seconds between fake lumi sections.");
   }
-} // end of namespace-edm
+}  // namespace edm
diff --git a/IOPool/Streamer/test/EventMessageTest.cpp b/IOPool/Streamer/test/EventMessageTest.cpp
index 6ad7ad46c8337..2004eecfb1f4f 100644
--- a/IOPool/Streamer/test/EventMessageTest.cpp
+++ b/IOPool/Streamer/test/EventMessageTest.cpp
@@ -10,7 +10,6 @@ Disclaimer: Most of the code here is randomly written during
 
 */
 
-
 #include <iostream>
 #include "IOPool/Streamer/interface/MsgTools.h"
 #include "IOPool/Streamer/interface/EventMsgBuilder.h"
@@ -35,39 +34,53 @@ int main() try {
   Strings hlt_names;
   Strings l1_names;
 
-  hlt_names.push_back("a");  hlt_names.push_back("b");
-  hlt_names.push_back("c");  hlt_names.push_back("d");
-  hlt_names.push_back("e");  hlt_names.push_back("f");
-  hlt_names.push_back("g");  hlt_names.push_back("h");
+  hlt_names.push_back("a");
+  hlt_names.push_back("b");
+  hlt_names.push_back("c");
+  hlt_names.push_back("d");
+  hlt_names.push_back("e");
+  hlt_names.push_back("f");
+  hlt_names.push_back("g");
+  hlt_names.push_back("h");
   hlt_names.push_back("i");
-    
-  l1_names.push_back("t10");  l1_names.push_back("t11");
-  l1_names.push_back("t12");  l1_names.push_back("t13");
-  l1_names.push_back("t14");  l1_names.push_back("t15");
-  l1_names.push_back("t16");  l1_names.push_back("t17");
-  l1_names.push_back("t18");  l1_names.push_back("t19");
+
+  l1_names.push_back("t10");
+  l1_names.push_back("t11");
+  l1_names.push_back("t12");
+  l1_names.push_back("t13");
+  l1_names.push_back("t14");
+  l1_names.push_back("t15");
+  l1_names.push_back("t16");
+  l1_names.push_back("t17");
+  l1_names.push_back("t18");
+  l1_names.push_back("t19");
   l1_names.push_back("t20");
 
-  char reltag[]="CMSSW_0_8_0_pre7";
+  char reltag[] = "CMSSW_0_8_0_pre7";
   std::string processName = "HLT";
   std::string outputModuleLabel = "HLTOutput";
 
   uLong crc = crc32(0L, Z_NULL, 0);
-  Bytef* crcbuf = (Bytef*) outputModuleLabel.data();
+  Bytef* crcbuf = (Bytef*)outputModuleLabel.data();
   crc = crc32(crc, crcbuf, outputModuleLabel.length());
 
   uint32 adler32_chksum = (uint32)cms::Adler32((char*)&test_value[0], sizeof(test_value));
 
-  InitMsgBuilder init(&buf[0],buf.size(),12,
-                      Version((const uint8*)psetid),(const char*)reltag,
-		      processName.c_str(),outputModuleLabel.c_str(), crc,
-                      hlt_names,hlt_names,l1_names,
+  InitMsgBuilder init(&buf[0],
+                      buf.size(),
+                      12,
+                      Version((const uint8*)psetid),
+                      (const char*)reltag,
+                      processName.c_str(),
+                      outputModuleLabel.c_str(),
+                      crc,
+                      hlt_names,
+                      hlt_names,
+                      l1_names,
                       adler32_chksum);
 
-
   init.setDataLength(sizeof(test_value));
-  std::copy(&test_value[0],&test_value[0]+sizeof(test_value),
-            init.dataAddress());
+  std::copy(&test_value[0], &test_value[0] + sizeof(test_value), init.dataAddress());
 
   InitMsgView view(&buf[0]);
   uint8 psetid2[16];
@@ -79,48 +92,61 @@ int main() try {
 
   uint32 adler32_2 = view.adler32_chksum();
 
-
-  InitMsgBuilder init2(&buf2[0],buf2.size(),
+  InitMsgBuilder init2(&buf2[0],
+                       buf2.size(),
                        view.run(),
                        Version((const uint8*)psetid2),
                        view.releaseTag().c_str(),
-                       processName.c_str(),outputModuleLabel.c_str(), crc,
-                       hlt2,hlt2,l12,
+                       processName.c_str(),
+                       outputModuleLabel.c_str(),
+                       crc,
+                       hlt2,
+                       hlt2,
+                       l12,
                        adler32_2);
 
   init2.setDataLength(view.descLength());
-  std::copy(view.descData(),view.descData()+view.size(),
-            init2.dataAddress());
+  std::copy(view.descData(), view.descData() + view.size(), init2.dataAddress());
 
-  if(equal(&buf[0],&buf[0]+view.size(),buf2.begin())==false)
-    {
-      std::cerr << "Init buffers not the same!\n";
-      dumpInit(&buf[0]);
-      dumpInit(&buf2[0]);
-      abort();
-    }
+  if (equal(&buf[0], &buf[0] + view.size(), buf2.begin()) == false) {
+    std::cerr << "Init buffers not the same!\n";
+    dumpInit(&buf[0]);
+    dumpInit(&buf2[0]);
+    abort();
+  }
 
   // ------- event
 
   std::vector<bool> l1bit(16);
   uint8 hltbits[] = "4567";
-  const int hltsize = (sizeof(hltbits)-1)*4;
-
-  l1bit[0]=true;  l1bit[4]=true;  l1bit[8]=false;  l1bit[12]=true;
-  l1bit[1]=true;  l1bit[5]=false;  l1bit[9]=false;  l1bit[13]=false;
-  l1bit[2]=false;  l1bit[6]=true;  l1bit[10]=true;  l1bit[14]=false;
-  l1bit[3]=false;  l1bit[7]=false;  l1bit[11]=true;  l1bit[15]=true;
+  const int hltsize = (sizeof(hltbits) - 1) * 4;
+
+  l1bit[0] = true;
+  l1bit[4] = true;
+  l1bit[8] = false;
+  l1bit[12] = true;
+  l1bit[1] = true;
+  l1bit[5] = false;
+  l1bit[9] = false;
+  l1bit[13] = false;
+  l1bit[2] = false;
+  l1bit[6] = true;
+  l1bit[10] = true;
+  l1bit[14] = false;
+  l1bit[3] = false;
+  l1bit[7] = false;
+  l1bit[11] = true;
+  l1bit[15] = true;
 
   adler32_chksum = (uint32)cms::Adler32((char*)&test_value[0], sizeof(test_value));
   std::string host_name = "mytestnode.cms";
 
-  EventMsgBuilder emb(&buf[0],buf.size(),45,2020,2,0xdeadbeef,3,
-                      l1bit,hltbits,hltsize, adler32_chksum, host_name.c_str());
+  EventMsgBuilder emb(
+      &buf[0], buf.size(), 45, 2020, 2, 0xdeadbeef, 3, l1bit, hltbits, hltsize, adler32_chksum, host_name.c_str());
 
   emb.setOrigDataSize(78);
   emb.setEventLength(sizeof(test_value));
-  std::copy(&test_value[0],&test_value[0]+sizeof(test_value),
-            emb.eventAddr());
+  std::copy(&test_value[0], &test_value[0] + sizeof(test_value), emb.eventAddr());
 
   // ------ check for sameness
 
@@ -133,7 +159,8 @@ int main() try {
   adler32_2 = eview.adler32_chksum();
   std::string host_name2 = eview.hostName();
 
-  EventMsgBuilder emb2(&buf2[0],buf.size(),
+  EventMsgBuilder emb2(&buf2[0],
+                       buf.size(),
                        eview.run(),
                        eview.event(),
                        eview.lumi(),
@@ -147,21 +174,19 @@ int main() try {
 
   emb2.setOrigDataSize(eview.origDataSize());
   emb2.setEventLength(eview.eventLength());
-  std::copy(eview.eventData(),eview.eventData()+eview.eventLength(),
-            emb2.eventAddr());
-
-  if(equal(&buf[0],&buf[0]+emb.size(),buf2.begin())==false)
-    {
-      std::cerr << "event messages not the same\n";
-      std::cerr << "size 1st=" << emb.size() << "\n"
-           << "size 2nd=" << emb2.size() << "\n";
-
-      dumpEvent(&buf[0]);
-      dumpEvent(&buf2[0]);
-      abort();
-    }
+  std::copy(eview.eventData(), eview.eventData() + eview.eventLength(), emb2.eventAddr());
+
+  if (equal(&buf[0], &buf[0] + emb.size(), buf2.begin()) == false) {
+    std::cerr << "event messages not the same\n";
+    std::cerr << "size 1st=" << emb.size() << "\n"
+              << "size 2nd=" << emb2.size() << "\n";
+
+    dumpEvent(&buf[0]);
+    dumpEvent(&buf2[0]);
+    abort();
+  }
   return 0;
-} catch(cms::Exception const& e) {
+} catch (cms::Exception const& e) {
   std::cerr << e.explainSelf() << std::endl;
   return 1;
 }
diff --git a/IOPool/Streamer/test/ReadStreamerFile.cpp b/IOPool/Streamer/test/ReadStreamerFile.cpp
index 985f4a133a694..d661602b94b98 100644
--- a/IOPool/Streamer/test/ReadStreamerFile.cpp
+++ b/IOPool/Streamer/test/ReadStreamerFile.cpp
@@ -37,8 +37,7 @@ void readSingleStream() {
     std::string initfilename = "teststreamfile.dat";
     edm::StreamerInputFile stream_reader(initfilename);
 
-    std::cout << "Trying to Read The Init message from Streamer File: "
-         << initfilename << std::endl;
+    std::cout << "Trying to Read The Init message from Streamer File: " << initfilename << std::endl;
     InitMsgView const* init = stream_reader.startMessage();
     std::cout << "\n\n-------------INIT---------------------" << std::endl;
     std::cout << "Dump the Init Message from Streamer:-" << std::endl;
@@ -46,22 +45,20 @@ void readSingleStream() {
 
     // ------- event
 
-    while(stream_reader.next()) {
-       std::cout << "----------EVENT-----------" << std::endl;
-       EventMsgView const* eview = stream_reader.currentRecord();
-       dumpEventView(eview);
+    while (stream_reader.next()) {
+      std::cout << "----------EVENT-----------" << std::endl;
+      EventMsgView const* eview = stream_reader.currentRecord();
+      dumpEventView(eview);
     }
 
-  } catch(cms::Exception& e){
-     std::cerr << "Exception caught:  "
-               << e.what()
-               << std::endl;
+  } catch (cms::Exception& e) {
+    std::cerr << "Exception caught:  " << e.what() << std::endl;
   }
 }
 
 int readMultipleStreams() {
   try {
-    int evCount=0;
+    int evCount = 0;
     std::vector<std::string> streamFiles;
     streamFiles.push_back("teststreamfile0.dat");
     streamFiles.push_back("teststreamfile1.dat");
@@ -76,47 +73,45 @@ int readMultipleStreams() {
     std::cout << "Dump the Init Message from Streamer:-" << std::endl;
     dumpInitView(init);
 
-    while(stream_reader.next()) {
-       if(stream_reader.newHeader()) {
-          std::cout << "File Boundary has just been crossed, a new file is read" << std::endl;
-          std::cout << "A new INIT Message is available" << std::endl;
-          std::cout << "Event from next file is also avialble" << std::endl;
-       }
-       std::cout << "----------EVENT-----------" << std::endl;
-       EventMsgView const* eview = stream_reader.currentRecord();
-       dumpEventView(eview);
-       ++evCount;
+    while (stream_reader.next()) {
+      if (stream_reader.newHeader()) {
+        std::cout << "File Boundary has just been crossed, a new file is read" << std::endl;
+        std::cout << "A new INIT Message is available" << std::endl;
+        std::cout << "Event from next file is also avialble" << std::endl;
+      }
+      std::cout << "----------EVENT-----------" << std::endl;
+      EventMsgView const* eview = stream_reader.currentRecord();
+      dumpEventView(eview);
+      ++evCount;
     }
 
-    std::cout << " TOTAL Events Read: " <<evCount<< std::endl;
-  } catch(cms::Exception& e){
-     std::cerr << "Exception caught:  "
-               << e.what()
-               << std::endl;
-     return 1;
+    std::cout << " TOTAL Events Read: " << evCount << std::endl;
+  } catch (cms::Exception& e) {
+    std::cerr << "Exception caught:  " << e.what() << std::endl;
+    return 1;
   }
   return 0;
 }
 
 void help() {
-   std::cout << "Valid options are: " << std::endl;
-   std::cout << "single, multi, all" << std::endl;
+  std::cout << "Valid options are: " << std::endl;
+  std::cout << "single, multi, all" << std::endl;
 }
 
-int main(int argc, char* argv[]){
-
-   if(argc < 2) {
-      std::cout << "No command line argument supplied\n";
-      help();
-      return 1;
-   }
+int main(int argc, char* argv[]) {
+  if (argc < 2) {
+    std::cout << "No command line argument supplied\n";
+    help();
+    return 1;
+  }
 
-   std::string doThis(argv[1]);
+  std::string doThis(argv[1]);
 
-   if(doThis == "all" || doThis == "single") readSingleStream();
-   if(doThis == "all" || doThis == "multi") readMultipleStreams();
-   std::cout << "\n\nReadStreamerFile TEST DONE\n" << std::endl;
+  if (doThis == "all" || doThis == "single")
+    readSingleStream();
+  if (doThis == "all" || doThis == "multi")
+    readMultipleStreams();
+  std::cout << "\n\nReadStreamerFile TEST DONE\n" << std::endl;
 
-   return 0;
+  return 0;
 }
-
diff --git a/IOPool/Streamer/test/StreamThingAnalyzer.cc b/IOPool/Streamer/test/StreamThingAnalyzer.cc
index 4ab4642587a57..d019109c3483a 100644
--- a/IOPool/Streamer/test/StreamThingAnalyzer.cc
+++ b/IOPool/Streamer/test/StreamThingAnalyzer.cc
@@ -2,7 +2,7 @@
 #include <iostream>
 
 #include "IOPool/Streamer/test/StreamThingAnalyzer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h" 
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ModuleLabelMatch.h"
@@ -17,42 +17,34 @@
 
 using namespace edmtestprod;
 
-namespace edmtest_thing
-{
-  StreamThingAnalyzer::StreamThingAnalyzer(edm::ParameterSet const& ps):
-    name_(ps.getParameter<std::string>("product_to_get")),
-    total_(),
-    out_("gennums.txt"),
-    cnt_(),
-    getterUsingLabel_(edm::ModuleLabelMatch(name_), this)
-  {
+namespace edmtest_thing {
+  StreamThingAnalyzer::StreamThingAnalyzer(edm::ParameterSet const& ps)
+      : name_(ps.getParameter<std::string>("product_to_get")),
+        total_(),
+        out_("gennums.txt"),
+        cnt_(),
+        getterUsingLabel_(edm::ModuleLabelMatch(name_), this) {
     callWhenNewProductsRegistered(getterUsingLabel_);
-    if(!out_)
-    {
-	std::cerr << "cannot open file gennums.txt" << std::endl;
-        abort();
+    if (!out_) {
+      std::cerr << "cannot open file gennums.txt" << std::endl;
+      abort();
     }
-	out_ << "event instance value" << std::endl;
+    out_ << "event instance value" << std::endl;
 
-	//LogDebug("StreamThing") << "ctor completing"; // << std::endl;
-	//edm::LogInfo("stuff") << "again, ctor completing";
-  }
-    
-  StreamThingAnalyzer::~StreamThingAnalyzer()
-  {
-    std::cout << "\nSTREAMTHING_CHECKSUM " << total_ << "\n" << std::endl;
+    //LogDebug("StreamThing") << "ctor completing"; // << std::endl;
+    //edm::LogInfo("stuff") << "again, ctor completing";
   }
 
-  void StreamThingAnalyzer::analyze(edm::Event const& e,
-				    edm::EventSetup const&)
-  {
+  StreamThingAnalyzer::~StreamThingAnalyzer() { std::cout << "\nSTREAMTHING_CHECKSUM " << total_ << "\n" << std::endl; }
+
+  void StreamThingAnalyzer::analyze(edm::Event const& e, edm::EventSetup const&) {
     typedef std::vector<edm::Handle<WriteThis> > ProdList;
     ProdList prod;
     getterUsingLabel_.fillHandles(e, prod);
-    ProdList::iterator i(prod.begin()),end(prod.end());
-    for(; i != end; ++i)
-      total_ = accumulate((*i)->data_.begin(),(*i)->data_.end(),total_);
-    //std::cout << tot << std::endl;
+    ProdList::iterator i(prod.begin()), end(prod.end());
+    for (; i != end; ++i)
+      total_ = accumulate((*i)->data_.begin(), (*i)->data_.end(), total_);
+      //std::cout << tot << std::endl;
 
 #if 0
     for(i = prod.begin();i != end; ++i) {
@@ -66,7 +58,7 @@ namespace edmtest_thing
 
     ++cnt_;
   }
-}
+}  // namespace edmtest_thing
 
 using edmtest_thing::StreamThingAnalyzer;
 DEFINE_FWK_MODULE(StreamThingAnalyzer);
diff --git a/IOPool/Streamer/test/StreamThingAnalyzer.h b/IOPool/Streamer/test/StreamThingAnalyzer.h
index dd11321dcd624..b43fe056e9060 100644
--- a/IOPool/Streamer/test/StreamThingAnalyzer.h
+++ b/IOPool/Streamer/test/StreamThingAnalyzer.h
@@ -18,11 +18,10 @@ typedef edmtestprod::IntArray WriteThis;
 
 namespace edmtest_thing {
 
-  class StreamThingAnalyzer : public edm::EDAnalyzer
-  {
+  class StreamThingAnalyzer : public edm::EDAnalyzer {
   public:
     explicit StreamThingAnalyzer(edm::ParameterSet const&);
-    
+
     virtual ~StreamThingAnalyzer();
 
     virtual void analyze(edm::Event const& e, edm::EventSetup const& c);
@@ -34,6 +33,6 @@ namespace edmtest_thing {
     int cnt_;
     edm::GetterOfProducts<WriteThis> getterUsingLabel_;
   };
-}
+}  // namespace edmtest_thing
 
 #endif
diff --git a/IOPool/Streamer/test/StreamThingProducer.cc b/IOPool/Streamer/test/StreamThingProducer.cc
index 9bc90bd8165ac..87aa56750e4c2 100644
--- a/IOPool/Streamer/test/StreamThingProducer.cc
+++ b/IOPool/Streamer/test/StreamThingProducer.cc
@@ -12,29 +12,26 @@ typedef edmtestprod::IntArray WriteThis;
 #endif
 
 #include "IOPool/Streamer/test/StreamThingProducer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h" 
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include <sstream>
 
 using namespace edmtestprod;
 
-
-namespace edmtest_thing
-{
+namespace edmtest_thing {
   typedef StreamTestTmpl<OSimple> TestDbl;
 
-  StreamThingProducer::StreamThingProducer(edm::ParameterSet const& ps):
-    size_(ps.getParameter<int>("array_size")),
-    inst_count_(ps.getParameter<int>("instance_count")),
-    start_count_(ps.getUntrackedParameter<int>("start_count",0)),
-    apply_bit_mask_(ps.getUntrackedParameter<bool>("apply_bit_mask",false)),
-    bit_mask_(ps.getUntrackedParameter<uint32_t>("bit_mask",0))
-  {
-    for(int i=0;i<inst_count_;++i) {
-	std::ostringstream ost;
-	ost << (i+start_count_);
-	names_.push_back(ost.str());
-	produces<WriteThis>(ost.str());
+  StreamThingProducer::StreamThingProducer(edm::ParameterSet const& ps)
+      : size_(ps.getParameter<int>("array_size")),
+        inst_count_(ps.getParameter<int>("instance_count")),
+        start_count_(ps.getUntrackedParameter<int>("start_count", 0)),
+        apply_bit_mask_(ps.getUntrackedParameter<bool>("apply_bit_mask", false)),
+        bit_mask_(ps.getUntrackedParameter<uint32_t>("bit_mask", 0)) {
+    for (int i = 0; i < inst_count_; ++i) {
+      std::ostringstream ost;
+      ost << (i + start_count_);
+      names_.push_back(ost.str());
+      produces<WriteThis>(ost.str());
     }
 
     // produces<TestDbl>();
@@ -42,34 +39,31 @@ namespace edmtest_thing
     // produces<Pig>();
   }
 
-  StreamThingProducer::~StreamThingProducer()
-  {
-  }  
+  StreamThingProducer::~StreamThingProducer() {}
 
   // Functions that gets called by framework every event
-  void StreamThingProducer::produce(edm::Event& e, edm::EventSetup const&)
-  {
-    for(int i = 0; i < inst_count_; ++i) {
+  void StreamThingProducer::produce(edm::Event& e, edm::EventSetup const&) {
+    for (int i = 0; i < inst_count_; ++i) {
       auto result = std::make_unique<WriteThis>(size_);
 
-        // The purpose of this masking is to allow
-        // some limited control of how much smaller these
-        // vectors will get when compressed.  The more bits
-        // are set to zero the more effect compression will have.
-        if (apply_bit_mask_) {
-          for (int j = 0; j < size_; ++j) {
-            result->data_.at(j) &= bit_mask_;
-          }
+      // The purpose of this masking is to allow
+      // some limited control of how much smaller these
+      // vectors will get when compressed.  The more bits
+      // are set to zero the more effect compression will have.
+      if (apply_bit_mask_) {
+        for (int j = 0; j < size_; ++j) {
+          result->data_.at(j) &= bit_mask_;
         }
+      }
 
-      e.put(std::move(result),names_[i]);
+      e.put(std::move(result), names_[i]);
     }
 
     //e.put(std::make_unique<TestDbl>());
     //e.put(std::make_unique<StreamTestSimple>());
     //e.put(std::make_unique<Pig>());
   }
-}
+}  // namespace edmtest_thing
 
 using edmtest_thing::StreamThingProducer;
 DEFINE_FWK_MODULE(StreamThingProducer);
diff --git a/IOPool/Streamer/test/StreamThingProducer.h b/IOPool/Streamer/test/StreamThingProducer.h
index 6b036e6111811..a35f9ae2ea5d0 100644
--- a/IOPool/Streamer/test/StreamThingProducer.h
+++ b/IOPool/Streamer/test/StreamThingProducer.h
@@ -14,10 +14,8 @@
 #include <string>
 #include <vector>
 
-namespace edmtest_thing
-{
-  class StreamThingProducer : public edm::EDProducer
-  {
+namespace edmtest_thing {
+  class StreamThingProducer : public edm::EDProducer {
   public:
     explicit StreamThingProducer(edm::ParameterSet const& ps);
 
@@ -34,5 +32,5 @@ namespace edmtest_thing
     bool apply_bit_mask_;
     unsigned int bit_mask_;
   };
-}
+}  // namespace edmtest_thing
 #endif
diff --git a/IOPool/Streamer/test/WriteStreamerFile.cpp b/IOPool/Streamer/test/WriteStreamerFile.cpp
index f55bcf0772510..e6c2d57207ada 100644
--- a/IOPool/Streamer/test/WriteStreamerFile.cpp
+++ b/IOPool/Streamer/test/WriteStreamerFile.cpp
@@ -41,61 +41,81 @@ int main() try {
   Strings hlt_names;
   Strings l1_names;
 
-  hlt_names.push_back("a");  hlt_names.push_back("b");
-  hlt_names.push_back("c");  hlt_names.push_back("d");
-  hlt_names.push_back("e");  hlt_names.push_back("f");
-  hlt_names.push_back("g");  hlt_names.push_back("h");
+  hlt_names.push_back("a");
+  hlt_names.push_back("b");
+  hlt_names.push_back("c");
+  hlt_names.push_back("d");
+  hlt_names.push_back("e");
+  hlt_names.push_back("f");
+  hlt_names.push_back("g");
+  hlt_names.push_back("h");
   hlt_names.push_back("i");
 
-  l1_names.push_back("t10");  l1_names.push_back("t11");
-  l1_names.push_back("t12");  l1_names.push_back("t13");
-  l1_names.push_back("t14");  l1_names.push_back("t15");
-  l1_names.push_back("t16");  l1_names.push_back("t17");
-  l1_names.push_back("t18");  l1_names.push_back("t19");
+  l1_names.push_back("t10");
+  l1_names.push_back("t11");
+  l1_names.push_back("t12");
+  l1_names.push_back("t13");
+  l1_names.push_back("t14");
+  l1_names.push_back("t15");
+  l1_names.push_back("t16");
+  l1_names.push_back("t17");
+  l1_names.push_back("t18");
+  l1_names.push_back("t19");
   l1_names.push_back("t20");
 
-  char reltag[]="CMSSW_0_8_0_pre7";
+  char reltag[] = "CMSSW_0_8_0_pre7";
   std::string processName = "HLT";
   std::string outputModuleLabel = "HLTOutput";
 
   uLong crc = crc32(0L, Z_NULL, 0);
-  Bytef* crcbuf = (Bytef*) outputModuleLabel.data();
+  Bytef* crcbuf = (Bytef*)outputModuleLabel.data();
   crc = crc32(crc, crcbuf, outputModuleLabel.length());
 
   uint32 adler32_chksum = (uint32)cms::Adler32((char*)&test_value[0], sizeof(test_value));
 
-  InitMsgBuilder init(&buf[0],buf.size(),12,
+  InitMsgBuilder init(&buf[0],
+                      buf.size(),
+                      12,
                       Version((const uint8*)psetid),
-                      (const char*)reltag, processName.c_str(),
-                      outputModuleLabel.c_str(), crc,
-                      hlt_names,hlt_names,l1_names,
+                      (const char*)reltag,
+                      processName.c_str(),
+                      outputModuleLabel.c_str(),
+                      crc,
+                      hlt_names,
+                      hlt_names,
+                      l1_names,
                       adler32_chksum);
 
   init.setDataLength(sizeof(test_value));
-  std::copy(&test_value[0],&test_value[0]+sizeof(test_value),
-            init.dataAddress());
+  std::copy(&test_value[0], &test_value[0] + sizeof(test_value), init.dataAddress());
 
   //Do a dumpInit here if you need to see the event.
 
   //Start the Streamer file
-  std::cout <<"Trying to Write a Streamer file"<< std::endl;
+  std::cout << "Trying to Write a Streamer file" << std::endl;
   std::string initfilename = "teststreamfile.dat";
   StreamerOutputFile stream_writer(initfilename);
 
-  std::cout << "Trying to Write Out The Init message into Streamer File: "
-      << initfilename << std::endl;
+  std::cout << "Trying to Write Out The Init message into Streamer File: " << initfilename << std::endl;
   stream_writer.write(init);
 
   // ------- event
 
   std::vector<bool> l1bit(11);
   uint8 hltbits[] = "4567";
-  const int hltsize = 9;  /** I am interested in 9 bits only */
-
-  l1bit[0]=true;  l1bit[4]=true;  l1bit[8]=false;  //l1bit[12]=true;
-  l1bit[1]=true;  l1bit[5]=false;  l1bit[9]=false;  //l1bit[13]=false;
-  l1bit[2]=false;  l1bit[6]=true;  l1bit[10]=true;  //l1bit[14]=false;
-  l1bit[3]=false;  l1bit[7]=false;  //l1bit[11]=true;  //l1bit[15]=true;
+  const int hltsize = 9; /** I am interested in 9 bits only */
+
+  l1bit[0] = true;
+  l1bit[4] = true;
+  l1bit[8] = false;  //l1bit[12]=true;
+  l1bit[1] = true;
+  l1bit[5] = false;
+  l1bit[9] = false;  //l1bit[13]=false;
+  l1bit[2] = false;
+  l1bit[6] = true;
+  l1bit[10] = true;  //l1bit[14]=false;
+  l1bit[3] = false;
+  l1bit[7] = false;  //l1bit[11]=true;  //l1bit[15]=true;
   //l1bit[16]=false;  l1bit[17]=false;  l1bit[18]=true;  l1bit[19]=true;
 
   //Lets Build 10 Events and then Write them into Streamer file.
@@ -103,23 +123,20 @@ int main() try {
   adler32_chksum = (uint32)cms::Adler32((char*)&test_value_event[0], sizeof(test_value_event));
   std::string host_name = "mytestnode.cms";
 
-  for (uint32 eventId = 2000; eventId != 2000+NO_OF_EVENTS; ++eventId) {
-    EventMsgBuilder emb(&buf2[0],buf2.size(),45,eventId,2,0xdeadbeef,3,
-                      l1bit,hltbits,hltsize,adler32_chksum, host_name.c_str());
+  for (uint32 eventId = 2000; eventId != 2000 + NO_OF_EVENTS; ++eventId) {
+    EventMsgBuilder emb(
+        &buf2[0], buf2.size(), 45, eventId, 2, 0xdeadbeef, 3, l1bit, hltbits, hltsize, adler32_chksum, host_name.c_str());
     emb.setOrigDataSize(78);
     emb.setEventLength(sizeof(test_value_event));
-    std::copy(&test_value_event[0],&test_value_event[0]+sizeof(test_value_event),
-             emb.eventAddr());
+    std::copy(&test_value_event[0], &test_value_event[0] + sizeof(test_value_event), emb.eventAddr());
 
     //Lets write this to our streamer file .
-    std::cout<<"Writing Event# : "<<eventId<<" To Streamer file"<< std::endl;
+    std::cout << "Writing Event# : " << eventId << " To Streamer file" << std::endl;
     stream_writer.write(emb);
   }
 
   return 0;
-} catch(cms::Exception const& e) {
+} catch (cms::Exception const& e) {
   std::cerr << e.explainSelf() << std::endl;
   return 1;
 }
-
-
diff --git a/IOPool/TFileAdaptor/interface/TStorageFactoryFile.h b/IOPool/TFileAdaptor/interface/TStorageFactoryFile.h
index 27bb6b09a28ac..69ba2ad46efdd 100644
--- a/IOPool/TFileAdaptor/interface/TStorageFactoryFile.h
+++ b/IOPool/TFileAdaptor/interface/TStorageFactoryFile.h
@@ -1,63 +1,63 @@
 #ifndef TFILE_ADAPTOR_TSTORAGE_FACTORY_FILE_H
-# define TFILE_ADAPTOR_TSTORAGE_FACTORY_FILE_H
+#define TFILE_ADAPTOR_TSTORAGE_FACTORY_FILE_H
 
-# include <vector>
-# include <memory>
+#include <vector>
+#include <memory>
 
-# include "TFile.h"
+#include "TFile.h"
 
-# include "Utilities/StorageFactory/interface/IOPosBuffer.h"
+#include "Utilities/StorageFactory/interface/IOPosBuffer.h"
 #include "FWCore/Utilities/interface/get_underlying_safe.h"
 
-
 class Storage;
 
 /** TFile wrapper around #StorageFactory and #Storage.  */
-class TStorageFactoryFile : public TFile
-{
+class TStorageFactoryFile : public TFile {
 public:
-  ClassDef(TStorageFactoryFile, 0); // ROOT File operating on CMS Storage.
+  ClassDefOverride(TStorageFactoryFile, 0);  // ROOT File operating on CMS Storage.
 
   // Due to limitations in the ROOT plugin manager, TStorageFactoryFile must
   // provide a constructor matching all the different variants that other
   // ROOT plugins might use
 
   // This one is to match TXNetFile
-  TStorageFactoryFile(const char *name, Option_t *option,
-                      const char *ftitle, Int_t compress, Int_t netopt,
+  TStorageFactoryFile(const char *name,
+                      Option_t *option,
+                      const char *ftitle,
+                      Int_t compress,
+                      Int_t netopt,
                       Bool_t parallelopen = kFALSE);
 
   // This matches everything else.
-  TStorageFactoryFile(const char *name, Option_t *option = "",
-                      const char *ftitle = "", Int_t compress = 1);
+  TStorageFactoryFile(const char *name, Option_t *option = "", const char *ftitle = "", Int_t compress = 1);
 
-  ~TStorageFactoryFile(void);
+  ~TStorageFactoryFile(void) override;
 
-  virtual Bool_t	ReadBuffer(char *buf, Int_t len);
-  virtual Bool_t	ReadBuffer(char *buf, Long64_t pos, Int_t len);
-  virtual Bool_t	ReadBufferAsync(Long64_t off, Int_t len);
-  virtual Bool_t	ReadBuffers(char *buf,  Long64_t *pos, Int_t *len, Int_t nbuf);
-  virtual Bool_t	WriteBuffer(const char *buf, Int_t len);
+  Bool_t ReadBuffer(char *buf, Int_t len) override;
+  Bool_t ReadBuffer(char *buf, Long64_t pos, Int_t len) override;
+  Bool_t ReadBufferAsync(Long64_t off, Int_t len) override;
+  Bool_t ReadBuffers(char *buf, Long64_t *pos, Int_t *len, Int_t nbuf) override;
+  Bool_t WriteBuffer(const char *buf, Int_t len) override;
 
-  void			ResetErrno(void) const;
+  void ResetErrno(void) const override;
 
 protected:
-  virtual Int_t		SysOpen(const char *pathname, Int_t flags, UInt_t mode);
-  virtual Int_t		SysClose(Int_t fd);
-  virtual Long64_t	SysSeek(Int_t fd, Long64_t offset, Int_t whence);
-  virtual Int_t		SysStat(Int_t fd, Long_t *id, Long64_t *size, Long_t *flags, Long_t *modtime);
-  virtual Int_t		SysSync(Int_t fd);
+  Int_t SysOpen(const char *pathname, Int_t flags, UInt_t mode) override;
+  Int_t SysClose(Int_t fd) override;
+  Long64_t SysSeek(Int_t fd, Long64_t offset, Int_t whence) override;
+  Int_t SysStat(Int_t fd, Long_t *id, Long64_t *size, Long_t *flags, Long_t *modtime) override;
+  Int_t SysSync(Int_t fd) override;
 
 private:
-  void                  Initialize(const char *name, Option_t *option = "");
+  void Initialize(const char *name, Option_t *option = "");
 
-  Bool_t                ReadBuffersSync(char *buf, Long64_t *pos, Int_t *len, Int_t nbuf);
+  Bool_t ReadBuffersSync(char *buf, Long64_t *pos, Int_t *len, Int_t nbuf);
 
-  void                  releaseStorage() {get_underlying_safe(storage_).release();}
+  void releaseStorage() { get_underlying_safe(storage_).release(); }
 
   TStorageFactoryFile(void);
 
-  edm::propagate_const<std::unique_ptr<Storage>> storage_; //< Real underlying storage
+  edm::propagate_const<std::unique_ptr<Storage>> storage_;  //< Real underlying storage
 };
 
-#endif // TFILE_ADAPTOR_TSTORAGE_FACTORY_FILE_H
+#endif  // TFILE_ADAPTOR_TSTORAGE_FACTORY_FILE_H
diff --git a/IOPool/TFileAdaptor/interface/TStorageFactorySystem.h b/IOPool/TFileAdaptor/interface/TStorageFactorySystem.h
index c5d12dc6c1d76..abdfdf88240fb 100644
--- a/IOPool/TFileAdaptor/interface/TStorageFactorySystem.h
+++ b/IOPool/TFileAdaptor/interface/TStorageFactorySystem.h
@@ -1,36 +1,34 @@
 #ifndef TFILE_ADAPTOR_TSTORAGE_FACTORY_SYSTEM_H
-# define TFILE_ADAPTOR_TSTORAGE_FACTORY_SYSTEM_H
+#define TFILE_ADAPTOR_TSTORAGE_FACTORY_SYSTEM_H
 
-# include "TSystem.h"
+#include "TSystem.h"
 
 class Storage;
 
 /** TSystem wrapper around #StorageFactory and CMS #Storage.
   This class is a blatant copy of TDCacheSystem.  */
-class TStorageFactorySystem : public TSystem
-{
+class TStorageFactorySystem : public TSystem {
 private:
-  void			*fDirp;	// Directory handle
-  void *		GetDirPt(void) const { return fDirp; }
+  void *fDirp;  // Directory handle
+  void *GetDirPt(void) const { return fDirp; }
 
 public:
-  ClassDefOverride(TStorageFactorySystem, 0); // ROOT System operating on CMS Storage.
+  ClassDefOverride(TStorageFactorySystem, 0);  // ROOT System operating on CMS Storage.
 
-  TStorageFactorySystem(const char *, Bool_t); // For compatibility with TXNetFile, we don't actually use the arguments
+  TStorageFactorySystem(const char *, Bool_t);  // For compatibility with TXNetFile, we don't actually use the arguments
   TStorageFactorySystem(void);
   ~TStorageFactorySystem(void) override;
 
-  Int_t		MakeDirectory(const char *name) override;
-  void *	OpenDirectory(const char *name) override;
-  void		FreeDirectory(void *dirp) override;
-  const char *	GetDirEntry(void *dirp) override;
+  Int_t MakeDirectory(const char *name) override;
+  void *OpenDirectory(const char *name) override;
+  void FreeDirectory(void *dirp) override;
+  const char *GetDirEntry(void *dirp) override;
 
-  Int_t		GetPathInfo(const char *path, FileStat_t &info) override;
+  Int_t GetPathInfo(const char *path, FileStat_t &info) override;
 
-  Bool_t	AccessPathName(const char *path, EAccessMode mode) override;
-
-  int           Unlink(const char *name) override;
+  Bool_t AccessPathName(const char *path, EAccessMode mode) override;
 
+  int Unlink(const char *name) override;
 };
 
-#endif // TFILE_ADAPTOR_TSTORAGE_FACTORY_SYSTEM_H
+#endif  // TFILE_ADAPTOR_TSTORAGE_FACTORY_SYSTEM_H
diff --git a/IOPool/TFileAdaptor/src/ReadRepacker.cc b/IOPool/TFileAdaptor/src/ReadRepacker.cc
index 1724c8c0b489f..31cc2a83cdeec 100644
--- a/IOPool/TFileAdaptor/src/ReadRepacker.cc
+++ b/IOPool/TFileAdaptor/src/ReadRepacker.cc
@@ -18,29 +18,28 @@
 
    Returns the number of entries of the original array packed into iov.
  */
-int
-ReadRepacker::pack(long long int *pos, int *len, int nbuf, char *buf, IOSize buffer_size)
-{
+int ReadRepacker::pack(long long int *pos, int *len, int nbuf, char *buf, IOSize buffer_size) {
   reset(nbuf);
-  m_len = len; // Record the len array so we can later unpack.
+  m_len = len;  // Record the len array so we can later unpack.
 
   // Determine the buffer to use for the initial packing.
-  char * tmp_buf;
+  char *tmp_buf;
   IOSize tmp_size;
   if (buffer_size < TEMPORARY_BUFFER_SIZE) {
-        m_spare_buffer.resize(TEMPORARY_BUFFER_SIZE);
-        tmp_buf = &m_spare_buffer[0];
-        tmp_size = TEMPORARY_BUFFER_SIZE;
+    m_spare_buffer.resize(TEMPORARY_BUFFER_SIZE);
+    tmp_buf = &m_spare_buffer[0];
+    tmp_size = TEMPORARY_BUFFER_SIZE;
   } else {
-        tmp_buf = buf;
-        tmp_size = buffer_size;
-  } 
-  
+    tmp_buf = buf;
+    tmp_size = buffer_size;
+  }
+
   int pack_count = packInternal(pos, len, nbuf, tmp_buf, tmp_size);
 
-  if ((nbuf - pack_count > 0) &&  // If there is remaining work..
-      (tmp_buf != &m_spare_buffer[0]) &&    // and the spare buffer isn't already used
-      ((IOSize)len[pack_count] < TEMPORARY_BUFFER_SIZE)) { // And the spare buffer is big enough to hold at least one read.
+  if ((nbuf - pack_count > 0) &&          // If there is remaining work..
+      (tmp_buf != &m_spare_buffer[0]) &&  // and the spare buffer isn't already used
+      ((IOSize)len[pack_count] <
+       TEMPORARY_BUFFER_SIZE)) {  // And the spare buffer is big enough to hold at least one read.
 
     // Verify the spare is allocated.
     // If tmp_buf != &m_spare_buffer[0] before, it certainly won't after.
@@ -49,17 +48,14 @@ ReadRepacker::pack(long long int *pos, int *len, int nbuf, char *buf, IOSize buf
     // If there are remaining chunks and we aren't already using the spare
     // buffer, try using that too.
     // This clutters up the code badly, but could save a network round-trip.
-    pack_count += packInternal(&pos[pack_count], &len[pack_count], nbuf-pack_count,
-                               &m_spare_buffer[0], TEMPORARY_BUFFER_SIZE);
-
+    pack_count +=
+        packInternal(&pos[pack_count], &len[pack_count], nbuf - pack_count, &m_spare_buffer[0], TEMPORARY_BUFFER_SIZE);
   }
 
   return pack_count;
 }
 
-int
-ReadRepacker::packInternal(long long int *pos, int *len, int nbuf, char *buf, IOSize buffer_size)
-{
+int ReadRepacker::packInternal(long long int *pos, int *len, int nbuf, char *buf, IOSize buffer_size) {
   if (nbuf == 0) {
     return 0;
   }
@@ -75,16 +71,17 @@ ReadRepacker::packInternal(long long int *pos, int *len, int nbuf, char *buf, IO
 
   IOSize buffer_used = len[0];
   int idx;
-  for (idx=1; idx < nbuf; idx++) {
+  for (idx = 1; idx < nbuf; idx++) {
     if (buffer_used + len[idx] > buffer_size) {
       // No way we can include this chunk in the read buffer
       break;
     }
 
-    IOOffset extra_bytes_signed = (idx == 0) ? 0 : ((pos[idx] - iopb.offset()) - iopb.size()); assert(extra_bytes_signed >= 0);
-    IOSize   extra_bytes = static_cast<IOSize>(extra_bytes_signed);
+    IOOffset extra_bytes_signed = (idx == 0) ? 0 : ((pos[idx] - iopb.offset()) - iopb.size());
+    assert(extra_bytes_signed >= 0);
+    IOSize extra_bytes = static_cast<IOSize>(extra_bytes_signed);
 
-    if (((static_cast<IOSize>(len[idx]) < BIG_READ_SIZE) || (iopb.size() < BIG_READ_SIZE)) && 
+    if (((static_cast<IOSize>(len[idx]) < BIG_READ_SIZE) || (iopb.size() < BIG_READ_SIZE)) &&
         (extra_bytes < READ_COALESCE_SIZE) && (buffer_used + len[idx] + extra_bytes <= buffer_size)) {
       // The space between the two reads is small enough we can coalesce.
 
@@ -92,8 +89,8 @@ ReadRepacker::packInternal(long long int *pos, int *len, int nbuf, char *buf, IO
       // This is so we can "perfectly pack" buffers consisting of only big
       // reads - in such a case, read coalescing doesn't help much.
       m_idx_to_iopb.push_back(iopb_offset);
-      m_idx_to_iopb_offset.push_back(pos[idx]-iopb.offset());
-      iopb.set_size(pos[idx]+len[idx] - iopb.offset());
+      m_idx_to_iopb_offset.push_back(pos[idx] - iopb.offset());
+      iopb.set_size(pos[idx] + len[idx] - iopb.offset());
       buffer_used += (len[idx] + extra_bytes);
       m_extra_bytes += extra_bytes;
       continue;
@@ -108,7 +105,7 @@ ReadRepacker::packInternal(long long int *pos, int *len, int nbuf, char *buf, IO
     iopb.set_size(len[idx]);
 
     // Record location of this chunk.
-    iopb_offset ++;
+    iopb_offset++;
 
     m_idx_to_iopb.push_back(iopb_offset);
     m_idx_to_iopb_offset.push_back(0);
@@ -125,35 +122,29 @@ ReadRepacker::packInternal(long long int *pos, int *len, int nbuf, char *buf, IO
  * Unpack the optimized set of reads from the storage system and copy the
  * results in the order ROOT requested.
  */
-void
-ReadRepacker::unpack(char *buf)
-{
-
-  char * root_result_ptr = buf;
+void ReadRepacker::unpack(char *buf) {
+  char *root_result_ptr = buf;
   int nbuf = m_idx_to_iopb.size();
-  for (int idx=0; idx < nbuf; idx++) {
+  for (int idx = 0; idx < nbuf; idx++) {
     int iov_idx = m_idx_to_iopb[idx];
     IOPosBuffer &iopb = m_iov[iov_idx];
     int iopb_offset = m_idx_to_iopb_offset[idx];
-    char * io_result_ptr = static_cast<char *>(iopb.data()) + iopb_offset;
+    char *io_result_ptr = static_cast<char *>(iopb.data()) + iopb_offset;
     // Note that we use the input buffer as a temporary where possible.
     // Hence, the source and destination can overlap; use memmove instead of memcpy.
     memmove(root_result_ptr, io_result_ptr, m_len[idx]);
 
     root_result_ptr += m_len[idx];
   }
-
 }
 
-void
-ReadRepacker::reset(unsigned int nbuf)
-{
+void ReadRepacker::reset(unsigned int nbuf) {
   m_extra_bytes = 0;
   m_buffer_used = 0;
 
   // Number of buffers to storage typically decreases, but nbuf/2 is just an
   // somewhat-informed guess.
-  m_iov.reserve(nbuf/2);
+  m_iov.reserve(nbuf / 2);
   m_iov.clear();
   m_idx_to_iopb.reserve(nbuf);
   m_idx_to_iopb.clear();
diff --git a/IOPool/TFileAdaptor/src/ReadRepacker.h b/IOPool/TFileAdaptor/src/ReadRepacker.h
index fc718ea0a1ad2..332da71b06ffc 100644
--- a/IOPool/TFileAdaptor/src/ReadRepacker.h
+++ b/IOPool/TFileAdaptor/src/ReadRepacker.h
@@ -27,55 +27,58 @@
 
 #include <vector>
 
-# include "Utilities/StorageFactory/interface/IOPosBuffer.h"
+#include "Utilities/StorageFactory/interface/IOPosBuffer.h"
 #include "FWCore/Utilities/interface/propagate_const.h"
 
 class ReadRepacker {
-
 public:
+  // Returns the number of input buffers it was able to pack into the IO operation.
+  int pack(long long int *pos,   // An array of file offsets to read.
+           int *len,             // An array of lengths to read.
+           int nbuf,             // Size of the pos and len array.
+           char *buf,            // Temporary buffer to hold I/O result.
+           IOSize buffer_size);  // Size of the temporary buffer.
 
-// Returns the number of input buffers it was able to pack into the IO operation.
-int
-pack(long long int    *pos,   // An array of file offsets to read.
-     int              *len,   // An array of lengths to read.
-     int               nbuf,  // Size of the pos and len array.
-     char             *buf,   // Temporary buffer to hold I/O result.
-     IOSize            buffer_size); // Size of the temporary buffer.
-
-void
-unpack(char *buf);  // Buffer to unpack the I/O results into.  Not the temporayr buffer and result buffer may overlap.
+  void unpack(
+      char *buf);  // Buffer to unpack the I/O results into.  Not the temporayr buffer and result buffer may overlap.
 
-std::vector<IOPosBuffer> & iov() { return m_iov; } // Returns the IO vector, optimized for storage.
+  std::vector<IOPosBuffer> &iov() { return m_iov; }  // Returns the IO vector, optimized for storage.
 
-IOSize bufferUsed() const {return m_buffer_used;} // Returns the total amount of space in the temp buffer used.
-IOSize extraBytes() const {return m_extra_bytes;} // Returns the number of extra bytes to be issued to the I/O system
-                                                   // Note that (buffer_used - extra_bytes) should equal the number of "real" bytes serviced.
-IOSize realBytesProcessed() const {return m_buffer_used-m_extra_bytes;} // Return the number of bytes of the input request that would be processed by the IO vector
+  IOSize bufferUsed() const { return m_buffer_used; }  // Returns the total amount of space in the temp buffer used.
+  IOSize extraBytes() const {
+    return m_extra_bytes;
+  }  // Returns the number of extra bytes to be issued to the I/O system
+     // Note that (buffer_used - extra_bytes) should equal the number of "real" bytes serviced.
+  IOSize realBytesProcessed() const {
+    return m_buffer_used - m_extra_bytes;
+  }  // Return the number of bytes of the input request that would be processed by the IO vector
 
-// Two reads distanced by less than READ_COALESCE_SIZE will turn into one
-// large read.
-static const IOSize TEMPORARY_BUFFER_SIZE = 256 * 1024;
+  // Two reads distanced by less than READ_COALESCE_SIZE will turn into one
+  // large read.
+  static const IOSize TEMPORARY_BUFFER_SIZE = 256 * 1024;
 
-// A read larger than BIG_READ_SIZE will not be coalesced.
-static const IOSize READ_COALESCE_SIZE = 32 * 1024;
+  // A read larger than BIG_READ_SIZE will not be coalesced.
+  static const IOSize READ_COALESCE_SIZE = 32 * 1024;
 
-// The size of the temporary holding buffer for read-coalescing.
-static const IOSize BIG_READ_SIZE = 256 * 1024;
+  // The size of the temporary holding buffer for read-coalescing.
+  static const IOSize BIG_READ_SIZE = 256 * 1024;
 
 private:
-
-int packInternal(long long int *pos, int *len, int nbuf, char *buf, IOSize buffer_size); // Heart of the implementation of Pack; because we pack up to 2 buffers,
-                                                                                    // its easier to break the method into two.
-
-void reset(unsigned int nbuf); // Reset all the internal counters and arrays.  Resize arrays to be about nbuf long.
-
-std::vector<int>         m_idx_to_iopb;        // Mapping from idx in the input array to the iopb in the IO vector
-std::vector<int>         m_idx_to_iopb_offset; // Mapping from idx in the input array to the data offset in the results of the iopb.
-std::vector<IOPosBuffer> m_iov;                // Vector of IO for the storage system to perform.
-edm::propagate_const<int*> m_len;              // Pointed to the array of read sizes.
-IOSize                   m_buffer_used;        // Bytes in the temporary buffer used.
-IOSize                   m_extra_bytes;        // Number of bytes read from storage that will be discarded.
-std::vector<char>        m_spare_buffer;       // The spare buffer; allocated if we cannot fit the I/O results into the ROOT buffer.
-
+  int packInternal(long long int *pos,
+                   int *len,
+                   int nbuf,
+                   char *buf,
+                   IOSize buffer_size);  // Heart of the implementation of Pack; because we pack up to 2 buffers,
+                                         // its easier to break the method into two.
+
+  void reset(unsigned int nbuf);  // Reset all the internal counters and arrays.  Resize arrays to be about nbuf long.
+
+  std::vector<int> m_idx_to_iopb;  // Mapping from idx in the input array to the iopb in the IO vector
+  std::vector<int>
+      m_idx_to_iopb_offset;        // Mapping from idx in the input array to the data offset in the results of the iopb.
+  std::vector<IOPosBuffer> m_iov;  // Vector of IO for the storage system to perform.
+  edm::propagate_const<int *> m_len;  // Pointed to the array of read sizes.
+  IOSize m_buffer_used;               // Bytes in the temporary buffer used.
+  IOSize m_extra_bytes;               // Number of bytes read from storage that will be discarded.
+  std::vector<char> m_spare_buffer;  // The spare buffer; allocated if we cannot fit the I/O results into the ROOT buffer.
 };
-
diff --git a/IOPool/TFileAdaptor/src/TFileAdaptor.cc b/IOPool/TFileAdaptor/src/TFileAdaptor.cc
index 784d682f4e6db..22d04f8925f50 100644
--- a/IOPool/TFileAdaptor/src/TFileAdaptor.cc
+++ b/IOPool/TFileAdaptor/src/TFileAdaptor.cc
@@ -35,49 +35,38 @@
                        a slightly different syntax.  Set this parameter to 1 if this
                        applies to you.  Otherwise, leave it at the default (0)
  */
-  void
-  TFileAdaptor::addType(TPluginManager* mgr, char const* type, int altType /*=0*/) {
-
-    // HACK:
-    // The ROOT plug-in manager does not understand loading plugins with different
-    // signatures.  So, because TXNetSystem is registered with a different constructor
-    // than all the other plugins, we must match its interface in order to override
-    // it.
-    if (altType == 0) {
-      mgr->AddHandler("TFile",
-                      type,
-                      "TStorageFactoryFile",
-                      "IOPoolTFileAdaptor",
-                      "TStorageFactoryFile(char const*,Option_t*,char const*,Int_t)");
-
-      mgr->AddHandler("TSystem",
-                      type,
-                      "TStorageFactorySystem",
-                      "IOPoolTFileAdaptor",
-                      "TStorageFactorySystem()");
-    } else if (altType == 1) {
-      mgr->AddHandler("TFile",
-                      type,
-                      "TStorageFactoryFile",
-                      "IOPoolTFileAdaptor",
-                      "TStorageFactoryFile(char const*,Option_t*,char const*,Int_t, Int_t, Bool_t)");
-
-      mgr->AddHandler("TSystem",
-                      type,
-                      "TStorageFactorySystem",
-                      "IOPoolTFileAdaptor",
-                      "TStorageFactorySystem(const char *,Bool_t)");
-    }
-
+void TFileAdaptor::addType(TPluginManager* mgr, char const* type, int altType /*=0*/) {
+  // HACK:
+  // The ROOT plug-in manager does not understand loading plugins with different
+  // signatures.  So, because TXNetSystem is registered with a different constructor
+  // than all the other plugins, we must match its interface in order to override
+  // it.
+  if (altType == 0) {
+    mgr->AddHandler("TFile",
+                    type,
+                    "TStorageFactoryFile",
+                    "IOPoolTFileAdaptor",
+                    "TStorageFactoryFile(char const*,Option_t*,char const*,Int_t)");
+
+    mgr->AddHandler("TSystem", type, "TStorageFactorySystem", "IOPoolTFileAdaptor", "TStorageFactorySystem()");
+  } else if (altType == 1) {
+    mgr->AddHandler("TFile",
+                    type,
+                    "TStorageFactoryFile",
+                    "IOPoolTFileAdaptor",
+                    "TStorageFactoryFile(char const*,Option_t*,char const*,Int_t, Int_t, Bool_t)");
+
+    mgr->AddHandler(
+        "TSystem", type, "TStorageFactorySystem", "IOPoolTFileAdaptor", "TStorageFactorySystem(const char *,Bool_t)");
   }
+}
 
-  bool
-  TFileAdaptor::native(char const* proto) const {
-    return std::find(native_.begin(), native_.end(), "all") != native_.end()
-      || std::find(native_.begin(), native_.end(), proto) != native_.end();
-  }
+bool TFileAdaptor::native(char const* proto) const {
+  return std::find(native_.begin(), native_.end(), "all") != native_.end() ||
+         std::find(native_.begin(), native_.end(), proto) != native_.end();
+}
 
-  TFileAdaptor::TFileAdaptor(edm::ParameterSet const& pset, edm::ActivityRegistry& ar)
+TFileAdaptor::TFileAdaptor(edm::ParameterSet const& pset, edm::ActivityRegistry& ar)
     : enabled_(true),
       doStats_(true),
       enablePrefetching_(false),
@@ -88,186 +77,193 @@
       timeout_(0U),
       debugLevel_(0U),
       native_() {
-    if (!(enabled_ = pset.getUntrackedParameter<bool> ("enable", enabled_)))
-      return;
-
-    StorageFactory* f = StorageFactory::getToModify();
-    doStats_ = pset.getUntrackedParameter<bool> ("stats", doStats_);
-
-    // values set in the site local config or in SiteLocalConfigService override
-    // any values set here for this service.
-    // These parameters here are needed only for backward compatibility
-    // for WMDM tools until we switch to only using the site local config for this info.
-    cacheHint_ = pset.getUntrackedParameter<std::string> ("cacheHint", cacheHint_);
-    readHint_ = pset.getUntrackedParameter<std::string> ("readHint", readHint_);
-    tempDir_ = pset.getUntrackedParameter<std::string> ("tempDir", f->tempPath());
-    minFree_ = pset.getUntrackedParameter<double> ("tempMinFree", f->tempMinFree());
-    native_ = pset.getUntrackedParameter<std::vector<std::string> >("native", native_);
-
-    ar.watchPostEndJob(this, &TFileAdaptor::termination);
-
-    // Retrieve values from SiteLocalConfigService.
-    // Any such values will override values set above.
-    edm::Service<edm::SiteLocalConfig> pSLC;
-    if (pSLC.isAvailable()) {
-      if (std::string const* p = pSLC->sourceCacheTempDir()) {
-        tempDir_ = *p;
-      }
-      if (double const* p = pSLC->sourceCacheMinFree()) {
-        minFree_ = *p;
-      }
-      if (std::string const* p = pSLC->sourceCacheHint()) {
-        cacheHint_ = *p;
-      }
-      if (std::string const* p = pSLC->sourceReadHint()) {
-        readHint_ = *p;
-      }
-      if (unsigned int const* p = pSLC->sourceTimeout()) {
-        timeout_ = *p;
-      }
-      if (std::vector<std::string> const* p = pSLC->sourceNativeProtocols()) {
-        native_ = *p;
-      }
-      debugLevel_ = pSLC->debugLevel();
-      enablePrefetching_ = pSLC->enablePrefetching();
+  if (!(enabled_ = pset.getUntrackedParameter<bool>("enable", enabled_)))
+    return;
+
+  StorageFactory* f = StorageFactory::getToModify();
+  doStats_ = pset.getUntrackedParameter<bool>("stats", doStats_);
+
+  // values set in the site local config or in SiteLocalConfigService override
+  // any values set here for this service.
+  // These parameters here are needed only for backward compatibility
+  // for WMDM tools until we switch to only using the site local config for this info.
+  cacheHint_ = pset.getUntrackedParameter<std::string>("cacheHint", cacheHint_);
+  readHint_ = pset.getUntrackedParameter<std::string>("readHint", readHint_);
+  tempDir_ = pset.getUntrackedParameter<std::string>("tempDir", f->tempPath());
+  minFree_ = pset.getUntrackedParameter<double>("tempMinFree", f->tempMinFree());
+  native_ = pset.getUntrackedParameter<std::vector<std::string> >("native", native_);
+
+  ar.watchPostEndJob(this, &TFileAdaptor::termination);
+
+  // Retrieve values from SiteLocalConfigService.
+  // Any such values will override values set above.
+  edm::Service<edm::SiteLocalConfig> pSLC;
+  if (pSLC.isAvailable()) {
+    if (std::string const* p = pSLC->sourceCacheTempDir()) {
+      tempDir_ = *p;
     }
-
-    // Prefetching does not work with storage-only; forcibly disable it.
-    if ((enablePrefetching_) && ((cacheHint_ == "storage-only") || (cacheHint_ == "auto-detect")))
-      cacheHint_ = "application-only";
-
-    // tell factory how clients should access files
-    if (cacheHint_ == "application-only")
-      f->setCacheHint(StorageFactory::CACHE_HINT_APPLICATION);
-    else if (cacheHint_ == "storage-only")
-      f->setCacheHint(StorageFactory::CACHE_HINT_STORAGE);
-    else if (cacheHint_ == "lazy-download")
-      f->setCacheHint(StorageFactory::CACHE_HINT_LAZY_DOWNLOAD);
-    else if (cacheHint_ == "auto-detect")
-      f->setCacheHint(StorageFactory::CACHE_HINT_AUTO_DETECT);
-    else
-      throw cms::Exception("TFileAdaptor")
-        << "Unrecognised 'cacheHint' value '" << cacheHint_
-        << "', recognised values are 'application-only',"
-        << " 'storage-only', 'lazy-download', 'auto-detect'";
-
-    if (readHint_ == "direct-unbuffered")
-      f->setReadHint(StorageFactory::READ_HINT_UNBUFFERED);
-    else if (readHint_ == "read-ahead-buffered")
-      f->setReadHint(StorageFactory::READ_HINT_READAHEAD);
-    else if (readHint_ == "auto-detect")
-      f->setReadHint(StorageFactory::READ_HINT_AUTO);
-    else
-      throw cms::Exception("TFileAdaptor")
-        << "Unrecognised 'readHint' value '" << readHint_
-        << "', recognised values are 'direct-unbuffered',"
-        << " 'read-ahead-buffered', 'auto-detect'";
-
-    f->setTimeout(timeout_);
-    f->setDebugLevel(debugLevel_);
-
-    // enable file access stats accounting if requested
-    f->enableAccounting(doStats_);
-
-    // tell where to save files.
-    f->setTempDir(tempDir_, minFree_);
-
-    // set our own root plugins
-    TPluginManager* mgr = gROOT->GetPluginManager();
-
-    // Make sure ROOT parses system directories first.
-    mgr->LoadHandlersFromPluginDirs("TFile");
-    mgr->LoadHandlersFromPluginDirs("TSystem");
-
-    if (!native("file"))      addType(mgr, "^file:");
-    if (!native("http"))      addType(mgr, "^http:");
-    if (!native("http"))      addType(mgr, "^http[s]?:");
-    if (!native("ftp"))       addType(mgr, "^ftp:");
-    /* always */              addType(mgr, "^web:");
-    /* always */              addType(mgr, "^gsiftp:");
-    /* always */              addType(mgr, "^sfn:");
-    if (!native("rfio"))      addType(mgr, "^rfio:");
-    if (!native("dcache"))    addType(mgr, "^dcache:");
-    if (!native("dcap"))      addType(mgr, "^dcap:");
-    if (!native("gsidcap"))   addType(mgr, "^gsidcap:");
-    if (!native("storm"))     addType(mgr, "^storm:");
-    if (!native("storm-lcg")) addType(mgr, "^storm-lcg:");
-    if (!native("lstore"))    addType(mgr, "^lstore:");
-    if (!native("root"))      addType(mgr, "^root:", 1); // See comments in addType
-    if (!native("root"))      addType(mgr, "^[x]?root:", 1); // See comments in addType
+    if (double const* p = pSLC->sourceCacheMinFree()) {
+      minFree_ = *p;
+    }
+    if (std::string const* p = pSLC->sourceCacheHint()) {
+      cacheHint_ = *p;
+    }
+    if (std::string const* p = pSLC->sourceReadHint()) {
+      readHint_ = *p;
+    }
+    if (unsigned int const* p = pSLC->sourceTimeout()) {
+      timeout_ = *p;
+    }
+    if (std::vector<std::string> const* p = pSLC->sourceNativeProtocols()) {
+      native_ = *p;
+    }
+    debugLevel_ = pSLC->debugLevel();
+    enablePrefetching_ = pSLC->enablePrefetching();
   }
 
-  void
-  TFileAdaptor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-    edm::ParameterSetDescription desc;
-    desc.addOptionalUntracked<bool>("enable");
-    desc.addOptionalUntracked<bool>("stats");
-    desc.addOptionalUntracked<std::string>("cacheHint");
-    desc.addOptionalUntracked<std::string>("readHint");
-    desc.addOptionalUntracked<std::string>("tempDir");
-    desc.addOptionalUntracked<double>("tempMinFree");
-    desc.addOptionalUntracked<std::vector<std::string> >("native");
-    descriptions.add("AdaptorConfig", desc);
-  }
+  // Prefetching does not work with storage-only; forcibly disable it.
+  if ((enablePrefetching_) && ((cacheHint_ == "storage-only") || (cacheHint_ == "auto-detect")))
+    cacheHint_ = "application-only";
+
+  // tell factory how clients should access files
+  if (cacheHint_ == "application-only")
+    f->setCacheHint(StorageFactory::CACHE_HINT_APPLICATION);
+  else if (cacheHint_ == "storage-only")
+    f->setCacheHint(StorageFactory::CACHE_HINT_STORAGE);
+  else if (cacheHint_ == "lazy-download")
+    f->setCacheHint(StorageFactory::CACHE_HINT_LAZY_DOWNLOAD);
+  else if (cacheHint_ == "auto-detect")
+    f->setCacheHint(StorageFactory::CACHE_HINT_AUTO_DETECT);
+  else
+    throw cms::Exception("TFileAdaptor") << "Unrecognised 'cacheHint' value '" << cacheHint_
+                                         << "', recognised values are 'application-only',"
+                                         << " 'storage-only', 'lazy-download', 'auto-detect'";
+
+  if (readHint_ == "direct-unbuffered")
+    f->setReadHint(StorageFactory::READ_HINT_UNBUFFERED);
+  else if (readHint_ == "read-ahead-buffered")
+    f->setReadHint(StorageFactory::READ_HINT_READAHEAD);
+  else if (readHint_ == "auto-detect")
+    f->setReadHint(StorageFactory::READ_HINT_AUTO);
+  else
+    throw cms::Exception("TFileAdaptor") << "Unrecognised 'readHint' value '" << readHint_
+                                         << "', recognised values are 'direct-unbuffered',"
+                                         << " 'read-ahead-buffered', 'auto-detect'";
+
+  f->setTimeout(timeout_);
+  f->setDebugLevel(debugLevel_);
+
+  // enable file access stats accounting if requested
+  f->enableAccounting(doStats_);
+
+  // tell where to save files.
+  f->setTempDir(tempDir_, minFree_);
+
+  // set our own root plugins
+  TPluginManager* mgr = gROOT->GetPluginManager();
+
+  // Make sure ROOT parses system directories first.
+  mgr->LoadHandlersFromPluginDirs("TFile");
+  mgr->LoadHandlersFromPluginDirs("TSystem");
+
+  if (!native("file"))
+    addType(mgr, "^file:");
+  if (!native("http"))
+    addType(mgr, "^http:");
+  if (!native("http"))
+    addType(mgr, "^http[s]?:");
+  if (!native("ftp"))
+    addType(mgr, "^ftp:");
+  /* always */ addType(mgr, "^web:");
+  /* always */ addType(mgr, "^gsiftp:");
+  /* always */ addType(mgr, "^sfn:");
+  if (!native("rfio"))
+    addType(mgr, "^rfio:");
+  if (!native("dcache"))
+    addType(mgr, "^dcache:");
+  if (!native("dcap"))
+    addType(mgr, "^dcap:");
+  if (!native("gsidcap"))
+    addType(mgr, "^gsidcap:");
+  if (!native("storm"))
+    addType(mgr, "^storm:");
+  if (!native("storm-lcg"))
+    addType(mgr, "^storm-lcg:");
+  if (!native("lstore"))
+    addType(mgr, "^lstore:");
+  if (!native("root"))
+    addType(mgr, "^root:", 1);  // See comments in addType
+  if (!native("root"))
+    addType(mgr, "^[x]?root:", 1);  // See comments in addType
+}
 
-  // Write current Storage statistics on a ostream
-  void
-  TFileAdaptor::termination(void) const {
-    std::map<std::string, std::string> data;
-    statsXML(data);
-    if (!data.empty()) {
-      edm::Service<edm::JobReport> reportSvc;
-      reportSvc->reportPerformanceSummary("StorageStatistics", data);
-    }
+void TFileAdaptor::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+  edm::ParameterSetDescription desc;
+  desc.addOptionalUntracked<bool>("enable");
+  desc.addOptionalUntracked<bool>("stats");
+  desc.addOptionalUntracked<std::string>("cacheHint");
+  desc.addOptionalUntracked<std::string>("readHint");
+  desc.addOptionalUntracked<std::string>("tempDir");
+  desc.addOptionalUntracked<double>("tempMinFree");
+  desc.addOptionalUntracked<std::vector<std::string> >("native");
+  descriptions.add("AdaptorConfig", desc);
+}
+
+// Write current Storage statistics on a ostream
+void TFileAdaptor::termination(void) const {
+  std::map<std::string, std::string> data;
+  statsXML(data);
+  if (!data.empty()) {
+    edm::Service<edm::JobReport> reportSvc;
+    reportSvc->reportPerformanceSummary("StorageStatistics", data);
   }
+}
 
-  void
-  TFileAdaptor::stats(std::ostream& o) const {
-    if (!doStats_) {
-      return;
-    }
-    float const oneMeg = 1048576.0;
-    o << "Storage parameters: adaptor: true"
-      << " Stats:" << (doStats_ ? "true" : "false") << '\n'
-      << " Prefetching:" << (enablePrefetching_ ? "true" : "false") << '\n'
-      << " Cache hint:" << cacheHint_ << '\n'
-      << " Read hint:" << readHint_ << '\n'
-      << "Storage statistics: "
-      << StorageAccount::summaryText()
-      << "; tfile/read=?/?/" << (TFile::GetFileBytesRead() / oneMeg) << "MB/?ms/?ms/?ms"
-      << "; tfile/write=?/?/" << (TFile::GetFileBytesWritten() / oneMeg) << "MB/?ms/?ms/?ms";
+void TFileAdaptor::stats(std::ostream& o) const {
+  if (!doStats_) {
+    return;
   }
+  float const oneMeg = 1048576.0;
+  o << "Storage parameters: adaptor: true"
+    << " Stats:" << (doStats_ ? "true" : "false") << '\n'
+    << " Prefetching:" << (enablePrefetching_ ? "true" : "false") << '\n'
+    << " Cache hint:" << cacheHint_ << '\n'
+    << " Read hint:" << readHint_ << '\n'
+    << "Storage statistics: " << StorageAccount::summaryText() << "; tfile/read=?/?/"
+    << (TFile::GetFileBytesRead() / oneMeg) << "MB/?ms/?ms/?ms"
+    << "; tfile/write=?/?/" << (TFile::GetFileBytesWritten() / oneMeg) << "MB/?ms/?ms/?ms";
+}
 
-  void
-  TFileAdaptor::statsXML(std::map<std::string, std::string>& data) const {
-    if (!doStats_) {
-      return;
-    }
-    float const oneMeg = 1048576.0;
-    data.insert(std::make_pair("Parameter-untracked-bool-enabled", "true"));
-    data.insert(std::make_pair("Parameter-untracked-bool-stats", (doStats_ ? "true" : "false")));
-    data.insert(std::make_pair("Parameter-untracked-bool-prefetching", (enablePrefetching_ ? "true" : "false")));
-    data.insert(std::make_pair("Parameter-untracked-string-cacheHint", cacheHint_));
-    data.insert(std::make_pair("Parameter-untracked-string-readHint", readHint_));
-    StorageAccount::fillSummary(data);
-    std::ostringstream r;
-    std::ostringstream w;
-    r << (TFile::GetFileBytesRead() / oneMeg);
-    w << (TFile::GetFileBytesWritten() / oneMeg);
-    data.insert(std::make_pair("ROOT-tfile-read-totalMegabytes", r.str()));
-    data.insert(std::make_pair("ROOT-tfile-write-totalMegabytes", w.str()));
+void TFileAdaptor::statsXML(std::map<std::string, std::string>& data) const {
+  if (!doStats_) {
+    return;
   }
+  float const oneMeg = 1048576.0;
+  data.insert(std::make_pair("Parameter-untracked-bool-enabled", "true"));
+  data.insert(std::make_pair("Parameter-untracked-bool-stats", (doStats_ ? "true" : "false")));
+  data.insert(std::make_pair("Parameter-untracked-bool-prefetching", (enablePrefetching_ ? "true" : "false")));
+  data.insert(std::make_pair("Parameter-untracked-string-cacheHint", cacheHint_));
+  data.insert(std::make_pair("Parameter-untracked-string-readHint", readHint_));
+  StorageAccount::fillSummary(data);
+  std::ostringstream r;
+  std::ostringstream w;
+  r << (TFile::GetFileBytesRead() / oneMeg);
+  w << (TFile::GetFileBytesWritten() / oneMeg);
+  data.insert(std::make_pair("ROOT-tfile-read-totalMegabytes", r.str()));
+  data.insert(std::make_pair("ROOT-tfile-write-totalMegabytes", w.str()));
+}
 
 #include <iostream>
 
 TFileAdaptorUI::TFileAdaptorUI() {
   edm::ActivityRegistry ar;
   const edm::ParameterSet param;
-  me = std::make_shared<TFileAdaptor>(param, ar); // propagate_const<T> has no reset() function
+  me = std::make_shared<TFileAdaptor>(param, ar);  // propagate_const<T> has no reset() function
 }
 
 TFileAdaptorUI::~TFileAdaptorUI() {}
 
 void TFileAdaptorUI::stats() const {
-  me->stats(std::cout); std::cout << std::endl;
+  me->stats(std::cout);
+  std::cout << std::endl;
 }
diff --git a/IOPool/TFileAdaptor/src/TFileAdaptor.h b/IOPool/TFileAdaptor/src/TFileAdaptor.h
index ae6a24b86798c..99f53d4844ab8 100644
--- a/IOPool/TFileAdaptor/src/TFileAdaptor.h
+++ b/IOPool/TFileAdaptor/src/TFileAdaptor.h
@@ -14,7 +14,7 @@ namespace edm {
   class ActivityRegistry;
   class ConfigurationDescriptions;
   class ParameterSet;
-}
+}  // namespace edm
 
 // Driver for configuring ROOT plug-in manager to use TStorageFactoryFile.
 class TFileAdaptor {
@@ -24,16 +24,17 @@ class TFileAdaptor {
   static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
 
   friend class TFileAdaptorUI;
+
 private:
   // Write current Storage statistics on a ostream
   void termination(void) const;
-  
+
   //Called by TFileAdaptorUI
-  void stats(std::ostream &o) const;
-  
-  void statsXML(std::map<std::string, std::string> &data) const;
-  
-  static void addType(TPluginManager* mgr, char const* type, int altType=0);
+  void stats(std::ostream& o) const;
+
+  void statsXML(std::map<std::string, std::string>& data) const;
+
+  static void addType(TPluginManager* mgr, char const* type, int altType = 0);
   bool native(char const* proto) const;
 
   bool enabled_;
@@ -46,17 +47,13 @@ class TFileAdaptor {
   unsigned int timeout_;
   unsigned int debugLevel_;
   std::vector<std::string> native_;
-
 };
 
 namespace edm {
   namespace service {
-    inline
-    bool isProcessWideService(TFileAdaptor const*) {
-      return true;
-    }
-  }
-}
+    inline bool isProcessWideService(TFileAdaptor const*) { return true; }
+  }  // namespace service
+}  // namespace edm
 
 /*
  * wrapper to bind TFileAdaptor to root, python etc
@@ -67,7 +64,6 @@ namespace edm {
 
 class TFileAdaptorUI {
 public:
-
   TFileAdaptorUI();
   ~TFileAdaptorUI();
 
diff --git a/IOPool/TFileAdaptor/src/TStorageFactoryFile.cc b/IOPool/TFileAdaptor/src/TStorageFactoryFile.cc
index bc476f010bffa..a687de44ff576 100644
--- a/IOPool/TFileAdaptor/src/TStorageFactoryFile.cc
+++ b/IOPool/TFileAdaptor/src/TStorageFactoryFile.cc
@@ -85,18 +85,15 @@ static StorageAccount::Counter *s_statsWrite = nullptr;
 static StorageAccount::Counter *s_statsCWrite = nullptr;
 static StorageAccount::Counter *s_statsXWrite = nullptr;
 
-
-static inline StorageAccount::Counter &
-storageCounter(StorageAccount::Counter *&c, StorageAccount::Operation operation)
-{
+static inline StorageAccount::Counter &storageCounter(StorageAccount::Counter *&c,
+                                                      StorageAccount::Operation operation) {
   static const auto token = StorageAccount::tokenForStorageClassName("tstoragefile");
-  if (! c) c = &StorageAccount::counter(token, operation);
+  if (!c)
+    c = &StorageAccount::counter(token, operation);
   return *c;
 }
 
-TStorageFactoryFile::TStorageFactoryFile(void)
-  : storage_()
-{
+TStorageFactoryFile::TStorageFactoryFile(void) : storage_() {
   StorageAccount::Stamp stats(storageCounter(s_statsCtor, StorageAccount::Operation::construct));
   stats.tick(0);
 }
@@ -111,13 +108,12 @@ TStorageFactoryFile::TStorageFactoryFile(const char *path,
                                          Int_t compress,
                                          Int_t netopt,
                                          Bool_t parallelopen /* = kFALSE */)
-  : TFile(path, "NET", ftitle, compress), // Pass "NET" to prevent local access in base class
-    storage_()
-{
+    : TFile(path, "NET", ftitle, compress),  // Pass "NET" to prevent local access in base class
+      storage_() {
   try {
     Initialize(path, option);
   } catch (...) {
-    edm::threadLocalException::setException(std::current_exception()); // capture
+    edm::threadLocalException::setException(std::current_exception());  // capture
   }
 }
 
@@ -125,20 +121,16 @@ TStorageFactoryFile::TStorageFactoryFile(const char *path,
                                          Option_t *option /* = "" */,
                                          const char *ftitle /* = "" */,
                                          Int_t compress /* = 1 */)
-  : TFile(path, "NET", ftitle, compress), // Pass "NET" to prevent local access in base class
-    storage_()
-{
+    : TFile(path, "NET", ftitle, compress),  // Pass "NET" to prevent local access in base class
+      storage_() {
   try {
     Initialize(path, option);
   } catch (...) {
-    edm::threadLocalException::setException(std::current_exception()); // capture
+    edm::threadLocalException::setException(std::current_exception());  // capture
   }
 }
 
-void
-TStorageFactoryFile::Initialize(const char *path,
-                                Option_t *option /* = "" */)
-{
+void TStorageFactoryFile::Initialize(const char *path, Option_t *option /* = "" */) {
   StorageAccount::Stamp stats(storageCounter(s_statsCtor, StorageAccount::Operation::construct));
 
   // Enable AsyncReading.
@@ -155,50 +147,48 @@ TStorageFactoryFile::Initialize(const char *path,
   if (fOption == "NEW")
     fOption = "CREATE";
 
-  Bool_t create   = (fOption == "CREATE");
+  Bool_t create = (fOption == "CREATE");
   Bool_t recreate = (fOption == "RECREATE");
-  Bool_t update   = (fOption == "UPDATE");
-  Bool_t read     = (fOption == "READ") || (fOption == "READWRAP");
+  Bool_t update = (fOption == "UPDATE");
+  Bool_t read = (fOption == "READ") || (fOption == "READWRAP");
   Bool_t readwrap = (fOption == "READWRAP");
 
-  if (!create && !recreate && !update && !read)
-  {
+  if (!create && !recreate && !update && !read) {
     read = true;
     fOption = "READ";
   }
 
-  if (recreate)
-  {
+  if (recreate) {
     if (!gSystem->AccessPathName(path, kFileExists))
       gSystem->Unlink(path);
 
     recreate = false;
-    create   = true;
-    fOption  = "CREATE";
+    create = true;
+    fOption = "CREATE";
   }
   assert(!recreate);
 
-  if (update && gSystem->AccessPathName(path, kFileExists))
-  {
+  if (update && gSystem->AccessPathName(path, kFileExists)) {
     update = kFALSE;
     create = kTRUE;
   }
 
   assert(read || update || create);
 
-  int           openFlags = IOFlags::OpenRead;
-  if (!read)    openFlags |= IOFlags::OpenWrite;
-  if (create)   openFlags |= IOFlags::OpenCreate;
+  int openFlags = IOFlags::OpenRead;
+  if (!read)
+    openFlags |= IOFlags::OpenWrite;
+  if (create)
+    openFlags |= IOFlags::OpenCreate;
   //if (recreate) openFlags |= IOFlags::OpenCreate | IOFlags::OpenTruncate;
-  if (readwrap) openFlags |= IOFlags::OpenWrap;
+  if (readwrap)
+    openFlags |= IOFlags::OpenWrap;
 
   // Open storage
-  if (! (storage_ = StorageFactory::get()->open(path, openFlags)))
-  {
-     MakeZombie();
-     gDirectory = gROOT;
-     throw cms::Exception("TStorageFactoryFile::TStorageFactoryFile()")
-       << "Cannot open file '" << path << "'";
+  if (!(storage_ = StorageFactory::get()->open(path, openFlags))) {
+    MakeZombie();
+    gDirectory = gROOT;
+    throw cms::Exception("TStorageFactoryFile::TStorageFactoryFile()") << "Cannot open file '" << path << "'";
   }
 
   // Record the statistics.
@@ -207,14 +197,14 @@ TStorageFactoryFile::Initialize(const char *path,
     if (statsService.isAvailable()) {
       statsService->setSize(storage_->size());
     }
-  } catch (edm::Exception const& e) {
+  } catch (edm::Exception const &e) {
     if (e.categoryCode() != edm::errors::NotFound) {
       throw;
     }
   }
 
   fRealName = path;
-  fD = 0; // sorry, meaningless
+  fD = 0;  // sorry, meaningless
   fWritable = read ? kFALSE : kTRUE;
 
   Init(create);
@@ -222,36 +212,27 @@ TStorageFactoryFile::Initialize(const char *path,
   stats.tick(0);
 }
 
-TStorageFactoryFile::~TStorageFactoryFile(void)
-{
-  Close();
-}
+TStorageFactoryFile::~TStorageFactoryFile(void) { Close(); }
 
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 
-Bool_t
-TStorageFactoryFile::ReadBuffer(char *buf, Long64_t pos, Int_t len)
-{
+Bool_t TStorageFactoryFile::ReadBuffer(char *buf, Long64_t pos, Int_t len) {
   // This function needs to be optimized to minimize seeks.
   // See TFile::ReadBuffer(char *buf, Long64_t pos, Int_t len) in ROOT 5.27.06.
   Seek(pos);
   return ReadBuffer(buf, len);
 }
 
-Bool_t
-TStorageFactoryFile::ReadBuffer(char *buf, Int_t len)
-{
+Bool_t TStorageFactoryFile::ReadBuffer(char *buf, Int_t len) {
   // Check that it's valid to access this file.
-  if (IsZombie())
-  {
+  if (IsZombie()) {
     Error("ReadBuffer", "Cannot read from a zombie file");
     return kTRUE;
   }
 
-  if (! IsOpen())
-  {
+  if (!IsOpen()) {
     Error("ReadBuffer", "Cannot read from a file that is not open");
     return kTRUE;
   }
@@ -269,19 +250,22 @@ TStorageFactoryFile::ReadBuffer(char *buf, Int_t len)
   // If we have a cache, read from there first.  This returns 0
   // if the block hasn't been prefetched, 1 if it was in cache,
   // and 2 if there was an error.
-  if (TFileCacheRead *c = GetCacheRead())
-  {
+  if (TFileCacheRead *c = GetCacheRead()) {
     Long64_t here = GetRelOffset();
-    Bool_t   async = c->IsAsyncReading();
+    Bool_t async = c->IsAsyncReading();
 
     StorageAccount::Stamp cstats(async
-                                 ? storageCounter(s_statsCPrefetch, StorageAccount::Operation::readPrefetchToCache)
-                                 : storageCounter(s_statsCRead, StorageAccount::Operation::readViaCache));
+                                     ? storageCounter(s_statsCPrefetch, StorageAccount::Operation::readPrefetchToCache)
+                                     : storageCounter(s_statsCRead, StorageAccount::Operation::readViaCache));
 
     Int_t st = ReadBufferViaCache(async ? nullptr : buf, len);
 
     if (st == 2) {
-      Error("ReadBuffer","ReadBufferViaCache failed. Asked to read nBytes: %d from offset: %lld with file size: %lld",len, here, GetSize());
+      Error("ReadBuffer",
+            "ReadBufferViaCache failed. Asked to read nBytes: %d from offset: %lld with file size: %lld",
+            len,
+            here,
+            GetSize());
       return kTRUE;
     }
 
@@ -305,24 +289,25 @@ TStorageFactoryFile::ReadBuffer(char *buf, Int_t len)
   IOSize n = storage_->xread(buf, len);
   xstats.tick(n);
   stats.tick(n);
-  if(n < static_cast<IOSize>(len)) {
-    Error("ReadBuffer", "read from Storage::xread returned %ld. Asked to read n bytes: %d from offset: %lld with file size: %lld",n, len, GetRelOffset(), GetSize());
+  if (n < static_cast<IOSize>(len)) {
+    Error("ReadBuffer",
+          "read from Storage::xread returned %ld. Asked to read n bytes: %d from offset: %lld with file size: %lld",
+          n,
+          len,
+          GetRelOffset(),
+          GetSize());
   }
   return n ? kFALSE : kTRUE;
 }
 
-Bool_t
-TStorageFactoryFile::ReadBufferAsync(Long64_t off, Int_t len)
-{
+Bool_t TStorageFactoryFile::ReadBufferAsync(Long64_t off, Int_t len) {
   // Check that it's valid to access this file.
-  if (IsZombie())
-  {
+  if (IsZombie()) {
     Error("ReadBufferAsync", "Cannot read from a zombie file");
     return kTRUE;
   }
 
-  if (! IsOpen())
-  {
+  if (!IsOpen()) {
     Error("ReadBufferAsync", "Cannot read from a file that is not open");
     return kTRUE;
   }
@@ -349,9 +334,8 @@ TStorageFactoryFile::ReadBufferAsync(Long64_t off, Int_t len)
     ;
   }
 
-  IOPosBuffer iov(off, (void *) nullptr, len ? len : PREFETCH_PROBE_LENGTH);
-  if (storage_->prefetch(&iov, 1))
-  {
+  IOPosBuffer iov(off, (void *)nullptr, len ? len : PREFETCH_PROBE_LENGTH);
+  if (storage_->prefetch(&iov, 1)) {
     stats.tick(len);
     return kFALSE;
   }
@@ -365,9 +349,7 @@ TStorageFactoryFile::ReadBufferAsync(Long64_t off, Int_t len)
   return kTRUE;
 }
 
-Bool_t
-TStorageFactoryFile::ReadBuffersSync(char *buf, Long64_t *pos, Int_t *len, Int_t nbuf)
-{
+Bool_t TStorageFactoryFile::ReadBuffersSync(char *buf, Long64_t *pos, Int_t *len, Int_t nbuf) {
   /** Most storage systems are not prepared for the onslaught of small reads
    *  that ROOT will perform, even if they implement a vectored read interface.
    *
@@ -388,23 +370,24 @@ TStorageFactoryFile::ReadBuffersSync(char *buf, Long64_t *pos, Int_t *len, Int_t
    *  I/O transactions.  A clear win for all cases except high-latency WAN.
    */
 
-  Int_t remaining = nbuf; // Number of read requests left to process.
-  Int_t pack_count; // Number of read requests processed by this iteration.
+  Int_t remaining = nbuf;  // Number of read requests left to process.
+  Int_t pack_count;        // Number of read requests processed by this iteration.
 
-  IOSize remaining_buffer_size=0;
+  IOSize remaining_buffer_size = 0;
   // Calculate the remaining buffer size for the ROOT-owned buffer by adding
   // the size of the various requests.
-  for (Int_t i=0; i<nbuf; i++) remaining_buffer_size+=len[i];
+  for (Int_t i = 0; i < nbuf; i++)
+    remaining_buffer_size += len[i];
 
-  char     *current_buffer = buf;
-  Long64_t *current_pos    = pos;
-  Int_t    *current_len    = len;
+  char *current_buffer = buf;
+  Long64_t *current_pos = pos;
+  Int_t *current_len = len;
 
   ReadRepacker repacker;
 
   while (remaining > 0) {
-
-    pack_count = repacker.pack(static_cast<long long int *>(current_pos), current_len, remaining, current_buffer, remaining_buffer_size);
+    pack_count = repacker.pack(
+        static_cast<long long int *>(current_pos), current_len, remaining, current_buffer, remaining_buffer_size);
 
     int real_bytes_processed = repacker.realBytesProcessed();
     IOSize io_buffer_used = repacker.bufferUsed();
@@ -414,7 +397,8 @@ TStorageFactoryFile::ReadBuffersSync(char *buf, Long64_t *pos, Int_t *len, Int_t
     std::vector<IOPosBuffer> &iov = repacker.iov();
     IOSize result = storage_->readv(&iov[0], iov.size());
     if (result != io_buffer_used) {
-      Error("ReadBuffersSync","Storage::readv returned different size result=%ld expected=%ld",result,io_buffer_used);
+      Error(
+          "ReadBuffersSync", "Storage::readv returned different size result=%ld expected=%ld", result, io_buffer_used);
       return kTRUE;
     }
     xstats.tick(io_buffer_used);
@@ -426,45 +410,38 @@ TStorageFactoryFile::ReadBuffersSync(char *buf, Long64_t *pos, Int_t *len, Int_t
 
     current_pos += pack_count;
     current_len += pack_count;
-    remaining   -= pack_count;
-
+    remaining -= pack_count;
   }
   assert(remaining_buffer_size == 0);
   return kFALSE;
 }
 
-Bool_t
-TStorageFactoryFile::ReadBuffers(char *buf, Long64_t *pos, Int_t *len, Int_t nbuf)
-{
+Bool_t TStorageFactoryFile::ReadBuffers(char *buf, Long64_t *pos, Int_t *len, Int_t nbuf) {
   // Check that it's valid to access this file.
-  if (IsZombie())
-  {
+  if (IsZombie()) {
     Error("ReadBuffers", "Cannot read from a zombie file");
     return kTRUE;
   }
 
-  if (! IsOpen())
-  {
+  if (!IsOpen()) {
     Error("ReadBuffers", "Cannot read from a file that is not open");
     return kTRUE;
   }
 
   // For synchronous reads, we have special logic to optimize the I/O requests
   // from ROOT before handing it to the storage.
-  if (buf)
-  {
+  if (buf) {
     return ReadBuffersSync(buf, pos, len, nbuf);
   }
   // For an async read, we assume the storage system is smart enough to do the
   // optimization itself.
 
   // Read from underlying storage.
-  void* const nobuf = nullptr;
+  void *const nobuf = nullptr;
   Int_t total = 0;
   std::vector<IOPosBuffer> iov;
   iov.reserve(nbuf);
-  for (Int_t i = 0; i < nbuf; ++i)
-  {
+  for (Int_t i = 0; i < nbuf; ++i) {
     iov.push_back(IOPosBuffer(pos[i], nobuf, len[i]));
     total += len[i];
   }
@@ -478,8 +455,8 @@ TStorageFactoryFile::ReadBuffers(char *buf, Long64_t *pos, Int_t *len, Int_t nbu
   astats.tick(total);
 
   // If it didn't suceeed, pass down to the base class.
-  if(not success) {
-    if(TFile::ReadBuffers(buf, pos, len, nbuf)) {
+  if (not success) {
+    if (TFile::ReadBuffers(buf, pos, len, nbuf)) {
       Error("ReadBuffers", "call to TFile::ReadBuffers failed after prefetch already failed.");
       return kTRUE;
     }
@@ -487,24 +464,19 @@ TStorageFactoryFile::ReadBuffers(char *buf, Long64_t *pos, Int_t *len, Int_t nbu
   return kFALSE;
 }
 
-Bool_t
-TStorageFactoryFile::WriteBuffer(const char *buf, Int_t len)
-{
+Bool_t TStorageFactoryFile::WriteBuffer(const char *buf, Int_t len) {
   // Check that it's valid to access this file.
-  if (IsZombie())
-  {
+  if (IsZombie()) {
     Error("WriteBuffer", "Cannot write to a zombie file");
     return kTRUE;
   }
 
-  if (! IsOpen())
-  {
+  if (!IsOpen()) {
     Error("WriteBuffer", "Cannot write to a file that is not open");
     return kTRUE;
   }
 
-  if (! fWritable)
-  {
+  if (!fWritable) {
     Error("WriteBuffer", "File is not writable");
     return kTRUE;
   }
@@ -514,29 +486,28 @@ TStorageFactoryFile::WriteBuffer(const char *buf, Int_t len)
 
   // Try first writing via a cache, and if that's not possible, directly.
   Int_t st;
-  switch ((st = WriteBufferViaCache(buf, len)))
-  {
-  case 0:
-    // Actual write.
-    {
-      StorageAccount::Stamp xstats(storageCounter(s_statsXWrite, StorageAccount::Operation::writeActual));
-      IOSize n = storage_->xwrite(buf, len);
-      xstats.tick(n);
-      stats.tick(n);
-
-      // FIXME: What if it's a short write?
-      return n > 0 ? kFALSE : kTRUE;
-    }
+  switch ((st = WriteBufferViaCache(buf, len))) {
+    case 0:
+      // Actual write.
+      {
+        StorageAccount::Stamp xstats(storageCounter(s_statsXWrite, StorageAccount::Operation::writeActual));
+        IOSize n = storage_->xwrite(buf, len);
+        xstats.tick(n);
+        stats.tick(n);
+
+        // FIXME: What if it's a short write?
+        return n > 0 ? kFALSE : kTRUE;
+      }
 
-  case 1:
-    cstats.tick(len);
-    stats.tick(len);
-    return kFALSE;
+    case 1:
+      cstats.tick(len);
+      stats.tick(len);
+      return kFALSE;
 
-  case 2:
-  default:
-    Error("WriteBuffer", "Error writing to cache");
-    return kTRUE;
+    case 2:
+    default:
+      Error("WriteBuffer", "Error writing to cache");
+      return kTRUE;
   }
 }
 
@@ -550,44 +521,43 @@ TStorageFactoryFile::WriteBuffer(const char *buf, Int_t len)
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
-Int_t
-TStorageFactoryFile::SysOpen(const char *pathname, Int_t flags, UInt_t /* mode */)
-{
+Int_t TStorageFactoryFile::SysOpen(const char *pathname, Int_t flags, UInt_t /* mode */) {
   StorageAccount::Stamp stats(storageCounter(s_statsOpen, StorageAccount::Operation::open));
 
-  if (storage_)
-  {
+  if (storage_) {
     storage_->close();
   }
 
-  int                      openFlags = IOFlags::OpenRead;
-  if (flags & O_WRONLY)    openFlags = IOFlags::OpenWrite;
-  else if (flags & O_RDWR) openFlags |= IOFlags::OpenWrite;
-  if (flags & O_CREAT)     openFlags |= IOFlags::OpenCreate;
-  if (flags & O_APPEND)    openFlags |= IOFlags::OpenAppend;
-  if (flags & O_EXCL)      openFlags |= IOFlags::OpenExclusive;
-  if (flags & O_TRUNC)     openFlags |= IOFlags::OpenTruncate;
-  if (flags & O_NONBLOCK)  openFlags |= IOFlags::OpenNonBlock;
-
-  if (! (storage_ = StorageFactory::get()->open(pathname, openFlags)))
-  {
-     MakeZombie();
-     gDirectory = gROOT;
-     throw cms::Exception("TStorageFactoryFile::SysOpen()")
-       << "Cannot open file '" << pathname << "'";
+  int openFlags = IOFlags::OpenRead;
+  if (flags & O_WRONLY)
+    openFlags = IOFlags::OpenWrite;
+  else if (flags & O_RDWR)
+    openFlags |= IOFlags::OpenWrite;
+  if (flags & O_CREAT)
+    openFlags |= IOFlags::OpenCreate;
+  if (flags & O_APPEND)
+    openFlags |= IOFlags::OpenAppend;
+  if (flags & O_EXCL)
+    openFlags |= IOFlags::OpenExclusive;
+  if (flags & O_TRUNC)
+    openFlags |= IOFlags::OpenTruncate;
+  if (flags & O_NONBLOCK)
+    openFlags |= IOFlags::OpenNonBlock;
+
+  if (!(storage_ = StorageFactory::get()->open(pathname, openFlags))) {
+    MakeZombie();
+    gDirectory = gROOT;
+    throw cms::Exception("TStorageFactoryFile::SysOpen()") << "Cannot open file '" << pathname << "'";
   }
 
   stats.tick();
   return 0;
 }
 
-Int_t
-TStorageFactoryFile::SysClose(Int_t /* fd */)
-{
+Int_t TStorageFactoryFile::SysClose(Int_t /* fd */) {
   StorageAccount::Stamp stats(storageCounter(s_statsClose, StorageAccount::Operation::close));
 
-  if (storage_)
-  {
+  if (storage_) {
     storage_->close();
     releaseStorage();
   }
@@ -596,32 +566,23 @@ TStorageFactoryFile::SysClose(Int_t /* fd */)
   return 0;
 }
 
-Long64_t
-TStorageFactoryFile::SysSeek(Int_t /* fd */, Long64_t offset, Int_t whence)
-{
+Long64_t TStorageFactoryFile::SysSeek(Int_t /* fd */, Long64_t offset, Int_t whence) {
   StorageAccount::Stamp stats(storageCounter(s_statsSeek, StorageAccount::Operation::seek));
-  Storage::Relative rel = (whence == SEEK_SET ? Storage::SET
-                               : whence == SEEK_CUR ? Storage::CURRENT
-                               : Storage::END);
+  Storage::Relative rel = (whence == SEEK_SET ? Storage::SET : whence == SEEK_CUR ? Storage::CURRENT : Storage::END);
 
   offset = storage_->position(offset, rel);
   stats.tick();
   return offset;
 }
 
-Int_t
-TStorageFactoryFile::SysSync(Int_t /* fd */)
-{
+Int_t TStorageFactoryFile::SysSync(Int_t /* fd */) {
   StorageAccount::Stamp stats(storageCounter(s_statsFlush, StorageAccount::Operation::flush));
   storage_->flush();
   stats.tick();
   return 0;
 }
 
-Int_t
-TStorageFactoryFile::SysStat(Int_t /* fd */, Long_t *id, Long64_t *size,
-                             Long_t *flags, Long_t *modtime)
-{
+Int_t TStorageFactoryFile::SysStat(Int_t /* fd */, Long_t *id, Long64_t *size, Long_t *flags, Long_t *modtime) {
   StorageAccount::Stamp stats(storageCounter(s_statsStat, StorageAccount::Operation::stat));
   // FIXME: Most of this is unsupported or makes no sense with Storage
   *id = ::Hash(fRealName);
@@ -632,8 +593,4 @@ TStorageFactoryFile::SysStat(Int_t /* fd */, Long_t *id, Long64_t *size,
   return 0;
 }
 
-void
-TStorageFactoryFile::ResetErrno(void) const
-{
-  TSystem::ResetErrno();
-}
+void TStorageFactoryFile::ResetErrno(void) const { TSystem::ResetErrno(); }
diff --git a/IOPool/TFileAdaptor/src/TStorageFactorySystem.cc b/IOPool/TFileAdaptor/src/TStorageFactorySystem.cc
index 1a41fcb13f38f..adf3c55ee51bd 100644
--- a/IOPool/TFileAdaptor/src/TStorageFactorySystem.cc
+++ b/IOPool/TFileAdaptor/src/TStorageFactorySystem.cc
@@ -3,67 +3,49 @@
 
 ClassImp(TStorageFactorySystem);
 
-
 TStorageFactorySystem::TStorageFactorySystem(const char *, Bool_t)
-  : TSystem("-StorageFactory", "Storage Factory System"),
-    fDirp(nullptr)
-{ SetName("StorageFactory"); }
+    : TSystem("-StorageFactory", "Storage Factory System"), fDirp(nullptr) {
+  SetName("StorageFactory");
+}
 
 TStorageFactorySystem::TStorageFactorySystem(void)
-  : TSystem("-StorageFactory", "Storage Factory System"),
-    fDirp(nullptr)
-{ SetName("StorageFactory"); }
+    : TSystem("-StorageFactory", "Storage Factory System"), fDirp(nullptr) {
+  SetName("StorageFactory");
+}
 
-TStorageFactorySystem::~TStorageFactorySystem(void)
-{}
+TStorageFactorySystem::~TStorageFactorySystem(void) {}
 
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////
-Int_t
-TStorageFactorySystem::MakeDirectory(const char */*name*/)
-{
+Int_t TStorageFactorySystem::MakeDirectory(const char * /*name*/) {
   Error("MakeDirectory", "Unsupported");
   return -1;
 }
 
-void *
-TStorageFactorySystem::OpenDirectory(const char */*name*/)
-{
+void *TStorageFactorySystem::OpenDirectory(const char * /*name*/) {
   Error("OpenDirectory", "Unsupported");
   return nullptr;
 }
 
-void
-TStorageFactorySystem::FreeDirectory(void */*dirp*/)
-{
-  Error("FreeDirectory", "Unsupported");
-}
+void TStorageFactorySystem::FreeDirectory(void * /*dirp*/) { Error("FreeDirectory", "Unsupported"); }
 
-const char *
-TStorageFactorySystem::GetDirEntry(void */*dirp*/)
-{
+const char *TStorageFactorySystem::GetDirEntry(void * /*dirp*/) {
   Error("GetDirEntry", "Unsupported");
   return nullptr;
 }
 
-Bool_t
-TStorageFactorySystem::AccessPathName(const char *name, EAccessMode /* mode */)
-{
+Bool_t TStorageFactorySystem::AccessPathName(const char *name, EAccessMode /* mode */) {
   // NB: This return reverse of check(): kTRUE if access *fails*
   return name ? !StorageFactory::get()->check(name) : kTRUE;
 }
 
-Int_t
-TStorageFactorySystem::Unlink(const char */*name*/)
-{
+Int_t TStorageFactorySystem::Unlink(const char * /*name*/) {
   Error("Unlink", "Unsupported");
   return 1;
 }
 
-Int_t
-TStorageFactorySystem::GetPathInfo(const char *name, FileStat_t &info)
-{
+Int_t TStorageFactorySystem::GetPathInfo(const char *name, FileStat_t &info) {
   info.fDev = 0;
   info.fIno = 0;
   info.fMode = 0644;
@@ -73,8 +55,7 @@ TStorageFactorySystem::GetPathInfo(const char *name, FileStat_t &info)
   info.fMtime = 0;
 
   IOOffset storageSize;
-  if (StorageFactory::get()->check(name, &storageSize))
-  {
+  if (StorageFactory::get()->check(name, &storageSize)) {
     info.fSize = storageSize;
     return 0;
   }
diff --git a/IOPool/TFileAdaptor/test/tfileTest.cpp b/IOPool/TFileAdaptor/test/tfileTest.cpp
index 51bc35d9a1c96..b34afc6cbc025 100644
--- a/IOPool/TFileAdaptor/test/tfileTest.cpp
+++ b/IOPool/TFileAdaptor/test/tfileTest.cpp
@@ -18,18 +18,17 @@ int main(int argc, char* argv[]) {
      TestMain tfileTest rfio:suncmsc.cern.ch:/data/valid/test/vincenzo/testPool/evData/EVD0_EventData.56709894d26a11d78dd20040f45cca94.1.h300eemm.TestSignalHits
      TestMain tfileTest zip-member:rfio:suncmsc.cern.ch:/data/valid/test/vincenzo/testZip/test1.zip#file.5 */
 
-  char const* protocols[] = {"^file:", "^http:", "^ftp:", "^web:", "^gsiftp:", "^sfn:", "^rfio:", "^dcache:", "^dcap:", "^gsidcap:"};
+  char const* protocols[] = {
+      "^file:", "^http:", "^ftp:", "^web:", "^gsiftp:", "^sfn:", "^rfio:", "^dcache:", "^dcap:", "^gsidcap:"};
 
-  char const* tStorageFactoryFileFunc = "TStorageFactoryFile(char const*, Option_t*, char const*, Int_t)"; 
+  char const* tStorageFactoryFileFunc = "TStorageFactoryFile(char const*, Option_t*, char const*, Int_t)";
 
   try {
     edmplugin::PluginManager::configure(edmplugin::standard::config());
-  }
-  catch(cms::Exception const& e) {
+  } catch (cms::Exception const& e) {
     std::cout << e.explainSelf() << std::endl;
     return 1;
-  }
-  catch(boost::system::system_error const& e) {
+  } catch (boost::system::system_error const& e) {
     std::cout << e.what() << std::endl;
     return 1;
   }
@@ -38,17 +37,20 @@ int main(int argc, char* argv[]) {
   // set our own root plugin
   typedef char const* Cp;
   Cp* begin = protocols;
-  Cp* end = &protocols[sizeof(protocols)/sizeof(protocols[0])];
+  Cp* end = &protocols[sizeof(protocols) / sizeof(protocols[0])];
   for (Cp* i = begin; i != end; ++i) {
-    gROOT->GetPluginManager()->AddHandler("TFile", *i, "TStorageFactoryFile", "pluginIOPoolTFileAdaptor", tStorageFactoryFileFunc);   
-    gROOT->GetPluginManager()->AddHandler("TSystem", *i, "TStorageFactorySystem", "pluginIOPoolTFileAdaptor", "TStorageFactorySystem()");
+    gROOT->GetPluginManager()->AddHandler(
+        "TFile", *i, "TStorageFactoryFile", "pluginIOPoolTFileAdaptor", tStorageFactoryFileFunc);
+    gROOT->GetPluginManager()->AddHandler(
+        "TSystem", *i, "TStorageFactorySystem", "pluginIOPoolTFileAdaptor", "TStorageFactorySystem()");
   }
 
-  gROOT->GetPluginManager()->Print(); // use option="a" to see ctors 
- 
+  gROOT->GetPluginManager()->Print();  // use option="a" to see ctors
+
   std::string fname("file:bha.root");
 
-  if (argc > 1) fname = argv[1];
+  if (argc > 1)
+    fname = argv[1];
 
   {
     std::unique_ptr<TFile> g(TFile::Open(fname.c_str(), "recreate", "", 1));
@@ -66,11 +68,9 @@ int main(int argc, char* argv[]) {
       std::cout << "file size " << f->GetSize() << std::endl;
       f->ls();
     }
-  }
-  catch (cms::Exception& e) {
+  } catch (cms::Exception& e) {
     std::cout << "*ERROR*: " << e.what() << std::endl;
-  }
-  catch (...) {
+  } catch (...) {
     std::cout << "*ERROR*\n";
   }
 
diff --git a/IORawData/CaloPatterns/interface/HcalFiberPattern.h b/IORawData/CaloPatterns/interface/HcalFiberPattern.h
index 425c4ae8c0891..453c519732554 100644
--- a/IORawData/CaloPatterns/interface/HcalFiberPattern.h
+++ b/IORawData/CaloPatterns/interface/HcalFiberPattern.h
@@ -19,6 +19,7 @@ class HcalFiberPattern {
   int crate() const { return crate_; }
   int slot() const { return slot_; }
   int fiber() const { return fiber_; }
+
 private:
   HcalQIESample unpack(int bc, int fc);
   int crate_, slot_, tb_, fiber_, spigot_, dcc_;
diff --git a/IORawData/CaloPatterns/interface/HcalPatternXMLParser.h b/IORawData/CaloPatterns/interface/HcalPatternXMLParser.h
index 10b0ffe591b8e..1fd39af099764 100644
--- a/IORawData/CaloPatterns/interface/HcalPatternXMLParser.h
+++ b/IORawData/CaloPatterns/interface/HcalPatternXMLParser.h
@@ -13,11 +13,16 @@ class HcalPatternXMLParser {
 public:
   HcalPatternXMLParser();
   ~HcalPatternXMLParser();
-  void parse(const std::string& xmlDocument, std::map<std::string,std::string>& parameters, std::vector<std::string>& items, std::string& encoding);
-  void parse(const std::string& xmlDocument, std::map<std::string,std::string>& parameters, std::vector<uint32_t>& items);
+  void parse(const std::string& xmlDocument,
+             std::map<std::string, std::string>& parameters,
+             std::vector<std::string>& items,
+             std::string& encoding);
+  void parse(const std::string& xmlDocument,
+             std::map<std::string, std::string>& parameters,
+             std::vector<uint32_t>& items);
+
 private:
   HcalPatternXMLParserImpl* m_parser;
 };
 
-
-#endif // HcalPatternXMLParser_hh_included
+#endif  // HcalPatternXMLParser_hh_included
diff --git a/IORawData/CaloPatterns/src/HcalFiberPattern.cc b/IORawData/CaloPatterns/src/HcalFiberPattern.cc
index d06314159870d..ac0eaf91f89dc 100644
--- a/IORawData/CaloPatterns/src/HcalFiberPattern.cc
+++ b/IORawData/CaloPatterns/src/HcalFiberPattern.cc
@@ -1,64 +1,72 @@
 #include "IORawData/CaloPatterns/interface/HcalFiberPattern.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-static inline int setIf(const std::string& name,const std::map<std::string, std::string>& params) {
-  std::map<std::string, std::string>::const_iterator j=params.find(name);
-  if (j==params.end()) throw cms::Exception("InvalidFormat") << "Missing parameter '" << name << "'";
-  else return strtol(j->second.c_str(),nullptr,0);
-} 
+static inline int setIf(const std::string& name, const std::map<std::string, std::string>& params) {
+  std::map<std::string, std::string>::const_iterator j = params.find(name);
+  if (j == params.end())
+    throw cms::Exception("InvalidFormat") << "Missing parameter '" << name << "'";
+  else
+    return strtol(j->second.c_str(), nullptr, 0);
+}
 
-HcalFiberPattern::HcalFiberPattern(const std::map<std::string, std::string>& params, const std::vector<uint32_t>& data) : pattern_(data) {
-  crate_=setIf("CRATE",params);
-  slot_=setIf("SLOT",params);
-  fiber_=setIf("FIBER",params);
-  dcc_=setIf("DCC",params);
-  spigot_=setIf("SPIGOT",params);
-  tb_=setIf("TOPBOTTOM",params);
+HcalFiberPattern::HcalFiberPattern(const std::map<std::string, std::string>& params, const std::vector<uint32_t>& data)
+    : pattern_(data) {
+  crate_ = setIf("CRATE", params);
+  slot_ = setIf("SLOT", params);
+  fiber_ = setIf("FIBER", params);
+  dcc_ = setIf("DCC", params);
+  spigot_ = setIf("SPIGOT", params);
+  tb_ = setIf("TOPBOTTOM", params);
 }
 
 HcalQIESample HcalFiberPattern::unpack(int bc, int fc) {
-  uint32_t w1=pattern_[bc*2]; // lsw
-  uint32_t w2=pattern_[bc*2+1]; // msw
+  uint32_t w1 = pattern_[bc * 2];      // lsw
+  uint32_t w2 = pattern_[bc * 2 + 1];  // msw
+
+  int adc = 0, capid = 0;
+  bool dv = (w1 & 0x10000) != 0;
+  bool er = (w1 & 0x20000) != 0;
 
-  int adc=0, capid=0;
-  bool dv=(w1&0x10000)!=0;
-  bool er=(w1&0x20000)!=0;
-  
   switch (fc) {
-  case (0):
-    adc=(w2&0xFE00)>>9;
-    capid=(w1&0x0180)>>7;
-    break;
-  case (1):
-    adc=(w2&0xFE)>>1;
-    capid=(w1&0x0060)>>5;
-    break;
-  case (2):
-    adc=(w1&0xFE00)>>9;
-    capid=(w1&0x0018)>>3;
-    break;
-  default:
-    break;
+    case (0):
+      adc = (w2 & 0xFE00) >> 9;
+      capid = (w1 & 0x0180) >> 7;
+      break;
+    case (1):
+      adc = (w2 & 0xFE) >> 1;
+      capid = (w1 & 0x0060) >> 5;
+      break;
+    case (2):
+      adc = (w1 & 0xFE00) >> 9;
+      capid = (w1 & 0x0018) >> 3;
+      break;
+    default:
+      break;
   }
-  return HcalQIESample(adc,capid,fiber_,fc,dv,er);
+  return HcalQIESample(adc, capid, fiber_, fc, dv, er);
 }
 
 std::vector<HcalQIESample> HcalFiberPattern::getSamples(int bunch, int npresamples, int nsamples, int fiberChan) {
-  if (bunch<npresamples) throw cms::Exception("InvalidArgument") << "Asked for " << npresamples << " presamples with event at bunch " << bunch;
-  if (nsamples-npresamples+bunch>=(int)(pattern_.size()/2)) throw cms::Exception("InvalidArgument") << "Asked for " << nsamples << " with event at " << bunch << " and " << npresamples << " presamples, but only " << pattern_.size()/2 << " bunches are available";
+  if (bunch < npresamples)
+    throw cms::Exception("InvalidArgument")
+        << "Asked for " << npresamples << " presamples with event at bunch " << bunch;
+  if (nsamples - npresamples + bunch >= (int)(pattern_.size() / 2))
+    throw cms::Exception("InvalidArgument")
+        << "Asked for " << nsamples << " with event at " << bunch << " and " << npresamples << " presamples, but only "
+        << pattern_.size() / 2 << " bunches are available";
 
   std::vector<HcalQIESample> retval;
   retval.reserve(nsamples);
 
-  for (int i=0; i<nsamples; i++) {
-    int bc=bunch+i-npresamples;
-    retval.push_back(unpack(bc,fiberChan));
+  for (int i = 0; i < nsamples; i++) {
+    int bc = bunch + i - npresamples;
+    retval.push_back(unpack(bc, fiberChan));
   }
   return retval;
 }
 
 HcalElectronicsId HcalFiberPattern::getId(int fiberChan) {
-  HcalElectronicsId retval(fiberChan,fiber_,spigot_,dcc_);
-  retval.setHTR(crate_,slot_,tb_);
+  HcalElectronicsId retval(fiberChan, fiber_, spigot_, dcc_);
+  retval.setHTR(crate_, slot_, tb_);
   return retval;
 }
diff --git a/IORawData/CaloPatterns/src/HcalPatternSource.cc b/IORawData/CaloPatterns/src/HcalPatternSource.cc
index 71e107297e4cd..4796ed61d0bc0 100644
--- a/IORawData/CaloPatterns/src/HcalPatternSource.cc
+++ b/IORawData/CaloPatterns/src/HcalPatternSource.cc
@@ -11,11 +11,10 @@
 #include <wordexp.h>
 #include <cstdio>
 
-HcalPatternSource::HcalPatternSource(const edm::ParameterSet & pset) : 
-  bunches_(pset.getUntrackedParameter<std::vector<int> >("Bunches",std::vector<int>())),
-  presamples_(pset.getUntrackedParameter<int>("Presamples",4)),
-  samples_(pset.getUntrackedParameter<int>("Samples",10))
-{
+HcalPatternSource::HcalPatternSource(const edm::ParameterSet& pset)
+    : bunches_(pset.getUntrackedParameter<std::vector<int> >("Bunches", std::vector<int>())),
+      presamples_(pset.getUntrackedParameter<int>("Presamples", 4)),
+      samples_(pset.getUntrackedParameter<int>("Samples", 10)) {
   loadPatterns(pset.getUntrackedParameter<std::string>("Patterns"));
   produces<HBHEDigiCollection>();
   produces<HODigiCollection>();
@@ -23,61 +22,66 @@ HcalPatternSource::HcalPatternSource(const edm::ParameterSet & pset) :
 }
 
 void HcalPatternSource::produce(edm::Event& e, const edm::EventSetup& es) {
-  if (e.id().event()>bunches_.size()) return;
+  if (e.id().event() > bunches_.size())
+    return;
 
   edm::ESHandle<HcalElectronicsMap> item;
   es.get<HcalElectronicsMapRcd>().get(item);
-  const HcalElectronicsMap *elecmap=item.product();
+  const HcalElectronicsMap* elecmap = item.product();
 
   auto hbhe = std::make_unique<HBHEDigiCollection>();
   auto hf = std::make_unique<HFDigiCollection>();
   auto ho = std::make_unique<HODigiCollection>();
 
-  int bc=bunches_[e.id().event()-1];
-  for (std::vector<HcalFiberPattern>::iterator i=patterns_.begin(); i!=patterns_.end(); i++) {
+  int bc = bunches_[e.id().event() - 1];
+  for (std::vector<HcalFiberPattern>::iterator i = patterns_.begin(); i != patterns_.end(); i++) {
     std::vector<HcalQIESample> samples;
-    for (int fc=0; fc<3; fc++) {
-      samples=i->getSamples(bc,presamples_, samples_, fc);
-      HcalElectronicsId eid=i->getId(fc);
+    for (int fc = 0; fc < 3; fc++) {
+      samples = i->getSamples(bc, presamples_, samples_, fc);
+      HcalElectronicsId eid = i->getId(fc);
 
       HcalDetId did(elecmap->lookup(eid));
 
       if (did.null()) {
-	edm::LogWarning("HCAL") << "No electronics map match for id " << eid;
-	continue;
+        edm::LogWarning("HCAL") << "No electronics map match for id " << eid;
+        continue;
       }
 
       switch (did.subdet()) {
-      case (HcalBarrel):
-      case (HcalEndcap):
-	hbhe->push_back(HBHEDataFrame(did));
-	hbhe->back().setSize(samples_);
-	hbhe->back().setPresamples(presamples_);
-	for (int i=0; i<samples_; i++) hbhe->back().setSample(i,samples[i]);
-	hbhe->back().setReadoutIds(eid);
-	break;
-      case (HcalForward):
-	hf->push_back(HFDataFrame(did));
-	hf->back().setSize(samples_);
-	hf->back().setPresamples(presamples_);
-	for (int i=0; i<samples_; i++) hf->back().setSample(i,samples[i]);
-	hf->back().setReadoutIds(eid);
-	break;
-      case (HcalOuter) :
-	ho->push_back(HODataFrame(did));
-	ho->back().setSize(samples_);
-	ho->back().setPresamples(presamples_);
-	for (int i=0; i<samples_; i++) ho->back().setSample(i,samples[i]);
-	ho->back().setReadoutIds(eid);
-	break;
-      default: continue;
+        case (HcalBarrel):
+        case (HcalEndcap):
+          hbhe->push_back(HBHEDataFrame(did));
+          hbhe->back().setSize(samples_);
+          hbhe->back().setPresamples(presamples_);
+          for (int i = 0; i < samples_; i++)
+            hbhe->back().setSample(i, samples[i]);
+          hbhe->back().setReadoutIds(eid);
+          break;
+        case (HcalForward):
+          hf->push_back(HFDataFrame(did));
+          hf->back().setSize(samples_);
+          hf->back().setPresamples(presamples_);
+          for (int i = 0; i < samples_; i++)
+            hf->back().setSample(i, samples[i]);
+          hf->back().setReadoutIds(eid);
+          break;
+        case (HcalOuter):
+          ho->push_back(HODataFrame(did));
+          ho->back().setSize(samples_);
+          ho->back().setPresamples(presamples_);
+          for (int i = 0; i < samples_; i++)
+            ho->back().setSample(i, samples[i]);
+          ho->back().setReadoutIds(eid);
+          break;
+        default:
+          continue;
       }
-    }        
+    }
   }
   hbhe->sort();
   ho->sort();
   hf->sort();
-  
+
   e.put(std::move(hbhe));
   e.put(std::move(ho));
   e.put(std::move(hf));
@@ -86,12 +90,12 @@ void HcalPatternSource::produce(edm::Event& e, const edm::EventSetup& es) {
 void HcalPatternSource::loadPatterns(const std::string& patspec) {
   wordexp_t p;
   char** files;
-  wordexp(patspec.c_str(),&p, WRDE_NOCMD); // do not run shell commands!
-  files=p.we_wordv;
-  for (unsigned int i=0; i<p.we_wordc; i++) {
-    LogDebug ("HCAL") << "Reading pattern file '" << files[i] << "'";
+  wordexp(patspec.c_str(), &p, WRDE_NOCMD);  // do not run shell commands!
+  files = p.we_wordv;
+  for (unsigned int i = 0; i < p.we_wordc; i++) {
+    LogDebug("HCAL") << "Reading pattern file '" << files[i] << "'";
     loadPatternFile(files[i]);
-    LogDebug ("HCAL") << "Fibers so far " << patterns_.size();
+    LogDebug("HCAL") << "Fibers so far " << patterns_.size();
   }
   wordfree(&p);
 }
@@ -99,35 +103,34 @@ void HcalPatternSource::loadPatterns(const std::string& patspec) {
 void HcalPatternSource::loadPatternFile(const std::string& filename) {
   HcalPatternXMLParser parser;
   std::string buffer, element;
-  std::map<std::string,std::string> params;
+  std::map<std::string, std::string> params;
   std::vector<uint32_t> data;
-  FILE* f=fopen(filename.c_str(), "r");
-  if (f==nullptr) return;
+  FILE* f = fopen(filename.c_str(), "r");
+  if (f == nullptr)
+    return;
   else {
     char block[4096];
     while (!feof(f)) {
-      int read=fread(block,1,4096,f);
-      buffer.append(block,block+read);
-    }  
+      int read = fread(block, 1, 4096, f);
+      buffer.append(block, block + read);
+    }
     fclose(f);
   }
-  if (buffer.find("<?xml")!=0) {
+  if (buffer.find("<?xml") != 0) {
     throw cms::Exception("InvalidFormat") << "Not a valid XML file: " << filename;
   }
-  std::string::size_type i=0,j;
-  while (buffer.find("<CFGBrick>",i)!=std::string::npos) {
-    i=buffer.find("<CFGBrick>",i);
-    j=buffer.find("</CFGBrick>",i);
-    element="<?xml version='1.0'?>\n";
-    element.append(buffer,i,j-i);
+  std::string::size_type i = 0, j;
+  while (buffer.find("<CFGBrick>", i) != std::string::npos) {
+    i = buffer.find("<CFGBrick>", i);
+    j = buffer.find("</CFGBrick>", i);
+    element = "<?xml version='1.0'?>\n";
+    element.append(buffer, i, j - i);
     element.append("</CFGBrick>");
     //    LogDebug("HCAL") << element;
     params.clear();
     data.clear();
-    parser.parse(element,params,data);
-    patterns_.push_back(HcalFiberPattern(params,data));
-    i=j+5;
+    parser.parse(element, params, data);
+    patterns_.push_back(HcalFiberPattern(params, data));
+    i = j + 5;
   }
-  
-  
 }
diff --git a/IORawData/CaloPatterns/src/HcalPatternSource.h b/IORawData/CaloPatterns/src/HcalPatternSource.h
index ff68bedd853bb..b4cc8f19768a0 100644
--- a/IORawData/CaloPatterns/src/HcalPatternSource.h
+++ b/IORawData/CaloPatterns/src/HcalPatternSource.h
@@ -11,9 +11,10 @@
   */
 class HcalPatternSource : public edm::EDProducer {
 public:
-  HcalPatternSource(const edm::ParameterSet & pset);
+  HcalPatternSource(const edm::ParameterSet& pset);
   void produce(edm::Event& e, const edm::EventSetup& c) override;
-private:  
+
+private:
   void loadPatterns(const std::string& patspec);
   void loadPatternFile(const std::string& filename);
   std::vector<int> bunches_;
diff --git a/IORawData/CaloPatterns/src/HcalPatternXMLParser.cc b/IORawData/CaloPatterns/src/HcalPatternXMLParser.cc
index e4c8c0559e85b..da7f3aa77d1d3 100644
--- a/IORawData/CaloPatterns/src/HcalPatternXMLParser.cc
+++ b/IORawData/CaloPatterns/src/HcalPatternXMLParser.cc
@@ -13,14 +13,13 @@ class HcalPatternXMLParserImpl {
   std::unique_ptr<SAX2XMLReader> parser;
 };
 
-HcalPatternXMLParser::HcalPatternXMLParser() {
-  m_parser=nullptr;
-}
+HcalPatternXMLParser::HcalPatternXMLParser() { m_parser = nullptr; }
 HcalPatternXMLParser::~HcalPatternXMLParser() {
-  if (m_parser!=nullptr) delete m_parser;
+  if (m_parser != nullptr)
+    delete m_parser;
 }
 
-  /*
+/*
     Example
     <pre>
     <CFGBrick>
@@ -42,139 +41,168 @@ HcalPatternXMLParser::~HcalPatternXMLParser() {
     </pre>
   */
 
-  class ConfigurationDBHandler : public DefaultHandler {
-    enum { md_Idle, md_Parameter, md_Data } m_mode;
-  public:
-    ConfigurationDBHandler(std::map<std::string,std::string>& parameters, std::vector<std::string>& items, std::string& encoding) : m_dataEncoding(encoding), m_items(items), m_parameters(parameters) {
-      m_mode=md_Idle;
-      xc_Parameter=XMLString::transcode("Parameter");
-      xc_Data=XMLString::transcode("Data");
-      xc_name=XMLString::transcode("name");
-      xc_type=XMLString::transcode("type");
-      xc_elements=XMLString::transcode("elements");      
-      xc_encoding=XMLString::transcode("encoding");
-      m_items.clear();
-      m_parameters.clear();
-    }
-    ~ConfigurationDBHandler() override {
-      XMLString::release(&xc_Parameter);
-      XMLString::release(&xc_Data);
-      XMLString::release(&xc_name);
-      XMLString::release(&xc_type);
-      XMLString::release(&xc_elements);
-      XMLString::release(&xc_encoding);
-    }
-    void startElement (const XMLCh *const uri, const XMLCh *const localname, const XMLCh *const qname, const Attributes &attrs) override;
-    void endElement (const XMLCh *const uri, const XMLCh *const localname, const XMLCh *const qname) override;
-    void characters (const XMLCh *const chars, const XMLSize_t length) override;
-    void ignorableWhitespace (const XMLCh *const chars, const XMLSize_t length) override;
-  private:
-    inline bool cvt2String(const XMLCh* val, std::string& ou) {
-      if (val==nullptr) return false;
-      char* tool=XMLString::transcode(val);
-      ou=tool;
-      XMLString::release(&tool);
-      return true;
-    }
-    XMLCh *xc_Parameter, *xc_Data, *xc_name, *xc_type, *xc_elements, *xc_encoding;
-    std::string m_pname, m_ptype, m_text;
-    int n_elements;
-    std::string& m_dataEncoding;
-    std::vector<std::string>& m_items;
-    std::map<std::string,std::string>& m_parameters;
-    char m_workc[512];
-    XMLCh m_workx[256];
-  };
+class ConfigurationDBHandler : public DefaultHandler {
+  enum { md_Idle, md_Parameter, md_Data } m_mode;
 
-  void ConfigurationDBHandler::startElement (const XMLCh *const uri, const XMLCh *const localname, const XMLCh *const qname, const Attributes &attrs) {
-    if (m_mode!=md_Idle) return; 
-    if (!XMLString::compareIString(localname,xc_Parameter)) {
-      // parameter name
-      if (!cvt2String(attrs.getValue(xc_name),m_pname)) return;
-      // parameter type
-      if (!cvt2String(attrs.getValue(xc_type),m_ptype)) return;
-      // switch mode
-      m_mode=md_Parameter;
-      m_text="";
-    } else if (!XMLString::compareIString(localname,xc_Data)) {
-      // elements
-      std::string strElements;
-      if (!cvt2String(attrs.getValue(xc_elements),strElements)) return;
-      n_elements=atoi(strElements.c_str());
-      // encoding
-      m_dataEncoding="";
-      cvt2String(attrs.getValue(xc_encoding),m_dataEncoding);
-      // switch mode
-      m_mode=md_Data;
-      m_text="";
-    }
-   
+public:
+  ConfigurationDBHandler(std::map<std::string, std::string>& parameters,
+                         std::vector<std::string>& items,
+                         std::string& encoding)
+      : m_dataEncoding(encoding), m_items(items), m_parameters(parameters) {
+    m_mode = md_Idle;
+    xc_Parameter = XMLString::transcode("Parameter");
+    xc_Data = XMLString::transcode("Data");
+    xc_name = XMLString::transcode("name");
+    xc_type = XMLString::transcode("type");
+    xc_elements = XMLString::transcode("elements");
+    xc_encoding = XMLString::transcode("encoding");
+    m_items.clear();
+    m_parameters.clear();
   }
-  void ConfigurationDBHandler::endElement (const XMLCh *const uri, const XMLCh *const localname, const XMLCh *const qname) {
-    if (m_mode==md_Idle) return;
-
-    if (m_mode==md_Parameter) {
-      m_parameters[m_pname]=m_text; // ignore the type for now...
-    } else if (m_mode==md_Data) {
-      // parse the text
-      std::string entry;
-      for (std::string::iterator q=m_text.begin(); q!=m_text.end(); q++) {
-	if (isspace(*q)) {
-	  if (entry.empty()) continue;
-	  m_items.push_back(entry);
-	  entry="";
-	} else entry+=*q;
-      }
-    }
+  ~ConfigurationDBHandler() override {
+    XMLString::release(&xc_Parameter);
+    XMLString::release(&xc_Data);
+    XMLString::release(&xc_name);
+    XMLString::release(&xc_type);
+    XMLString::release(&xc_elements);
+    XMLString::release(&xc_encoding);
+  }
+  void startElement(const XMLCh* const uri,
+                    const XMLCh* const localname,
+                    const XMLCh* const qname,
+                    const Attributes& attrs) override;
+  void endElement(const XMLCh* const uri, const XMLCh* const localname, const XMLCh* const qname) override;
+  void characters(const XMLCh* const chars, const XMLSize_t length) override;
+  void ignorableWhitespace(const XMLCh* const chars, const XMLSize_t length) override;
 
-    m_mode=md_Idle;
+private:
+  inline bool cvt2String(const XMLCh* val, std::string& ou) {
+    if (val == nullptr)
+      return false;
+    char* tool = XMLString::transcode(val);
+    ou = tool;
+    XMLString::release(&tool);
+    return true;
   }
-  void ConfigurationDBHandler::ignorableWhitespace(const   XMLCh* chars, const XMLSize_t length) {
-    if (m_mode==md_Idle) return;
-    m_text+=' ';
+  XMLCh *xc_Parameter, *xc_Data, *xc_name, *xc_type, *xc_elements, *xc_encoding;
+  std::string m_pname, m_ptype, m_text;
+  int n_elements;
+  std::string& m_dataEncoding;
+  std::vector<std::string>& m_items;
+  std::map<std::string, std::string>& m_parameters;
+  char m_workc[512];
+  XMLCh m_workx[256];
+};
+
+void ConfigurationDBHandler::startElement(const XMLCh* const uri,
+                                          const XMLCh* const localname,
+                                          const XMLCh* const qname,
+                                          const Attributes& attrs) {
+  if (m_mode != md_Idle)
+    return;
+  if (!XMLString::compareIString(localname, xc_Parameter)) {
+    // parameter name
+    if (!cvt2String(attrs.getValue(xc_name), m_pname))
+      return;
+    // parameter type
+    if (!cvt2String(attrs.getValue(xc_type), m_ptype))
+      return;
+    // switch mode
+    m_mode = md_Parameter;
+    m_text = "";
+  } else if (!XMLString::compareIString(localname, xc_Data)) {
+    // elements
+    std::string strElements;
+    if (!cvt2String(attrs.getValue(xc_elements), strElements))
+      return;
+    n_elements = atoi(strElements.c_str());
+    // encoding
+    m_dataEncoding = "";
+    cvt2String(attrs.getValue(xc_encoding), m_dataEncoding);
+    // switch mode
+    m_mode = md_Data;
+    m_text = "";
   }
-  void ConfigurationDBHandler::characters(const XMLCh* chars, const XMLSize_t length) {
-    if (m_mode==md_Idle) return;
-    unsigned int offset=0;
-    while (offset<length) {
-      unsigned int i=0;
-      for (i=0; i<length-offset && i<255; i++) m_workx[i]=chars[i+offset];
-      m_workx[i]=0; // terminate string
-      XMLString::transcode(m_workx,m_workc,511);
-      m_text+=m_workc;
-      offset+=i;
+}
+void ConfigurationDBHandler::endElement(const XMLCh* const uri,
+                                        const XMLCh* const localname,
+                                        const XMLCh* const qname) {
+  if (m_mode == md_Idle)
+    return;
+
+  if (m_mode == md_Parameter) {
+    m_parameters[m_pname] = m_text;  // ignore the type for now...
+  } else if (m_mode == md_Data) {
+    // parse the text
+    std::string entry;
+    for (std::string::iterator q = m_text.begin(); q != m_text.end(); q++) {
+      if (isspace(*q)) {
+        if (entry.empty())
+          continue;
+        m_items.push_back(entry);
+        entry = "";
+      } else
+        entry += *q;
     }
   }
 
-void HcalPatternXMLParser::parse(const std::string& xmlDocument, std::map<std::string,std::string>& parameters, std::vector<std::string>& items, std::string& encoding) {
-    // uses XERCES SAX2 parser
-    ConfigurationDBHandler handler(parameters,items,encoding);
-    
-    try {
-      if (m_parser==nullptr) {
-	m_parser=new HcalPatternXMLParserImpl();
-	m_parser->parser=std::unique_ptr<xercesc::SAX2XMLReader>(xercesc::XMLReaderFactory::createXMLReader());
-      }
-	 
-      MemBufInputSource src((const unsigned char*)xmlDocument.c_str(), xmlDocument.length(),"hcal::PatternReader");
-      m_parser->parser->setContentHandler(&handler);
-      m_parser->parser->parse(src);
-    } catch (std::exception& ex) {
-      throw cms::Exception("ParseError") << ex.what();
+  m_mode = md_Idle;
+}
+void ConfigurationDBHandler::ignorableWhitespace(const XMLCh* chars, const XMLSize_t length) {
+  if (m_mode == md_Idle)
+    return;
+  m_text += ' ';
+}
+void ConfigurationDBHandler::characters(const XMLCh* chars, const XMLSize_t length) {
+  if (m_mode == md_Idle)
+    return;
+  unsigned int offset = 0;
+  while (offset < length) {
+    unsigned int i = 0;
+    for (i = 0; i < length - offset && i < 255; i++)
+      m_workx[i] = chars[i + offset];
+    m_workx[i] = 0;  // terminate string
+    XMLString::transcode(m_workx, m_workc, 511);
+    m_text += m_workc;
+    offset += i;
+  }
+}
+
+void HcalPatternXMLParser::parse(const std::string& xmlDocument,
+                                 std::map<std::string, std::string>& parameters,
+                                 std::vector<std::string>& items,
+                                 std::string& encoding) {
+  // uses XERCES SAX2 parser
+  ConfigurationDBHandler handler(parameters, items, encoding);
+
+  try {
+    if (m_parser == nullptr) {
+      m_parser = new HcalPatternXMLParserImpl();
+      m_parser->parser = std::unique_ptr<xercesc::SAX2XMLReader>(xercesc::XMLReaderFactory::createXMLReader());
     }
+
+    MemBufInputSource src((const unsigned char*)xmlDocument.c_str(), xmlDocument.length(), "hcal::PatternReader");
+    m_parser->parser->setContentHandler(&handler);
+    m_parser->parser->parse(src);
+  } catch (std::exception& ex) {
+    throw cms::Exception("ParseError") << ex.what();
   }
+}
 
-void HcalPatternXMLParser::parse(const std::string& xmlDocument, std::map<std::string,std::string>& parameters, std::vector<uint32_t>& data) {
+void HcalPatternXMLParser::parse(const std::string& xmlDocument,
+                                 std::map<std::string, std::string>& parameters,
+                                 std::vector<uint32_t>& data) {
   std::vector<std::string> items;
   std::string encoding;
 
-  this->parse(xmlDocument,parameters,items,encoding);
-  int formatting=0;
-  if (encoding=="dec") formatting=10;
-  if (encoding=="hex") formatting=16;
+  this->parse(xmlDocument, parameters, items, encoding);
+  int formatting = 0;
+  if (encoding == "dec")
+    formatting = 10;
+  if (encoding == "hex")
+    formatting = 16;
 
   data.clear();
-  for (std::vector<std::string>::const_iterator i=items.begin(); i!=items.end(); i++)
-    data.push_back(strtol(i->c_str(),nullptr,formatting));
-
+  for (std::vector<std::string>::const_iterator i = items.begin(); i != items.end(); i++)
+    data.push_back(strtol(i->c_str(), nullptr, formatting));
 }
diff --git a/IORawData/CaloPatterns/src/HtrXmlPattern.cc b/IORawData/CaloPatterns/src/HtrXmlPattern.cc
index 125092f3e4991..b5b686a5f5187 100644
--- a/IORawData/CaloPatterns/src/HtrXmlPattern.cc
+++ b/IORawData/CaloPatterns/src/HtrXmlPattern.cc
@@ -10,163 +10,165 @@
 #include "HtrXmlPatternTool.h"
 #include "HtrXmlPatternToolParameters.h"
 
-HtrXmlPattern::HtrXmlPattern(const edm::ParameterSet& iConfig)
-{
-  m_filled=false;
-  m_fill_by_hand        = iConfig.getUntrackedParameter<bool>("fill_by_hand");
-  m_hand_pattern_number = iConfig.getUntrackedParameter<int> ("hand_pattern_number");
-  m_sets_to_show        = iConfig.getUntrackedParameter<int> ("sets_to_show");
-  m_write_root_file     = iConfig.getUntrackedParameter<bool>("write_root_file");
+HtrXmlPattern::HtrXmlPattern(const edm::ParameterSet& iConfig) {
+  m_filled = false;
+  m_fill_by_hand = iConfig.getUntrackedParameter<bool>("fill_by_hand");
+  m_hand_pattern_number = iConfig.getUntrackedParameter<int>("hand_pattern_number");
+  m_sets_to_show = iConfig.getUntrackedParameter<int>("sets_to_show");
+  m_write_root_file = iConfig.getUntrackedParameter<bool>("write_root_file");
 
   m_toolparameters = new HtrXmlPatternToolParameters;
-  m_toolparameters->m_show_errors            = iConfig.getUntrackedParameter<bool>       ("show_errors");
-  m_toolparameters->m_presamples_per_event   = iConfig.getUntrackedParameter<int>        ("presamples_per_event");
-  m_toolparameters->m_samples_per_event      = iConfig.getUntrackedParameter<int>        ("samples_per_event");
+  m_toolparameters->m_show_errors = iConfig.getUntrackedParameter<bool>("show_errors");
+  m_toolparameters->m_presamples_per_event = iConfig.getUntrackedParameter<int>("presamples_per_event");
+  m_toolparameters->m_samples_per_event = iConfig.getUntrackedParameter<int>("samples_per_event");
 
-  m_toolparameters->m_XML_file_mode          = iConfig.getUntrackedParameter<int>        ("XML_file_mode");
-  m_toolparameters->m_file_tag               = iConfig.getUntrackedParameter<std::string>("file_tag");
-  m_toolparameters->m_user_output_directory  = iConfig.getUntrackedParameter<std::string>("user_output_directory");
+  m_toolparameters->m_XML_file_mode = iConfig.getUntrackedParameter<int>("XML_file_mode");
+  m_toolparameters->m_file_tag = iConfig.getUntrackedParameter<std::string>("file_tag");
+  m_toolparameters->m_user_output_directory = iConfig.getUntrackedParameter<std::string>("user_output_directory");
 
-  std::string out_dir=m_toolparameters->m_user_output_directory;
-  while (out_dir.find_last_of('/')==out_dir.length()-1) out_dir.erase(out_dir.find_last_of('/'));
-  m_toolparameters->m_output_directory=out_dir+"/"+(m_toolparameters->m_file_tag)+"/";
+  std::string out_dir = m_toolparameters->m_user_output_directory;
+  while (out_dir.find_last_of('/') == out_dir.length() - 1)
+    out_dir.erase(out_dir.find_last_of('/'));
+  m_toolparameters->m_output_directory = out_dir + "/" + (m_toolparameters->m_file_tag) + "/";
 
   m_tool = new HtrXmlPatternTool(m_toolparameters);
 }
 
-
-HtrXmlPattern::~HtrXmlPattern()
-{
+HtrXmlPattern::~HtrXmlPattern() {
   delete m_tool;
   delete m_toolparameters;
 }
 
 // ------------ method called to for each event  ------------
-void HtrXmlPattern::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace std;
-
-   if (m_filled) return;
-
-   edm::ESHandle<HcalDbService> pSetup;
-   iSetup.get<HcalDbRecord>().get( pSetup );
-   const HcalElectronicsMap* readoutMap=pSetup->getHcalMapping();
-
-   if (m_fill_by_hand) {
-     do_hand_fill(readoutMap);
-     m_filled=true;
-     return;
-   }
-  
-   std::vector<edm::Handle<HBHEDigiCollection> > hbhe;
-   std::vector<edm::Handle<HODigiCollection> > ho;
-   std::vector<edm::Handle<HFDigiCollection> > hf;
-   std::vector<edm::Handle<ZDCDigiCollection> > zdc;
-   std::vector<edm::Handle<HcalCalibDigiCollection> > hc;
-   std::vector<edm::Handle<HcalTrigPrimDigiCollection> > htp;
-   std::vector<edm::Handle<HcalHistogramDigiCollection> > hh;  
-
-   iEvent.getManyByType(hbhe);
-   if (hbhe.empty()) {
-     cout << "No HB/HE Digis." << endl;
-   } else {
-     std::vector<edm::Handle<HBHEDigiCollection> >::iterator i;
-     for (i=hbhe.begin(); i!=hbhe.end(); i++) {
-       const HBHEDigiCollection& c=*(*i);
-   
-       int count=0;
-       for (HBHEDigiCollection::const_iterator j=c.begin(); j!=c.end(); j++) {
-   	 const HcalElectronicsId HEID = readoutMap->lookup(j->id());
-   	 m_tool->Fill(HEID,j);
-
-   	 if ( count++<m_sets_to_show || m_sets_to_show<0 ) {
-   	   cout << *j << std::endl;
-   	   cout << HEID << endl;
-   	   cout << "count: " << count << endl;
-   	 }
-       }
-       if (m_sets_to_show!=0) cout << "HB/HE count: " << count << endl;
-     }
+void HtrXmlPattern::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
+  using namespace std;
+
+  if (m_filled)
+    return;
+
+  edm::ESHandle<HcalDbService> pSetup;
+  iSetup.get<HcalDbRecord>().get(pSetup);
+  const HcalElectronicsMap* readoutMap = pSetup->getHcalMapping();
+
+  if (m_fill_by_hand) {
+    do_hand_fill(readoutMap);
+    m_filled = true;
+    return;
   }
-  
-   iEvent.getManyByType(hf);
-   if (hf.empty()) {
-     cout << "No HF Digis." << endl;
+
+  std::vector<edm::Handle<HBHEDigiCollection> > hbhe;
+  std::vector<edm::Handle<HODigiCollection> > ho;
+  std::vector<edm::Handle<HFDigiCollection> > hf;
+  std::vector<edm::Handle<ZDCDigiCollection> > zdc;
+  std::vector<edm::Handle<HcalCalibDigiCollection> > hc;
+  std::vector<edm::Handle<HcalTrigPrimDigiCollection> > htp;
+  std::vector<edm::Handle<HcalHistogramDigiCollection> > hh;
+
+  iEvent.getManyByType(hbhe);
+  if (hbhe.empty()) {
+    cout << "No HB/HE Digis." << endl;
   } else {
-     std::vector<edm::Handle<HFDigiCollection> >::iterator i;
-     for (i=hf.begin(); i!=hf.end(); i++) {
-       const HFDigiCollection& c=*(*i);
-   
-       int count=0;
-       for (HFDigiCollection::const_iterator j=c.begin(); j!=c.end(); j++) {
-   	 const HcalElectronicsId HEID = readoutMap->lookup(j->id());
-   	 m_tool->Fill(HEID,j);
-   	 
-   	 if ( count++<m_sets_to_show || m_sets_to_show<0 ) {
-   	   cout << *j << std::endl;
-   	   cout << HEID << endl;
-   	   cout << "count: " << count << endl;
-   	 }
-       }
-       if (m_sets_to_show!=0) cout << "HF    count: " << count << endl;
-     }
+    std::vector<edm::Handle<HBHEDigiCollection> >::iterator i;
+    for (i = hbhe.begin(); i != hbhe.end(); i++) {
+      const HBHEDigiCollection& c = *(*i);
+
+      int count = 0;
+      for (HBHEDigiCollection::const_iterator j = c.begin(); j != c.end(); j++) {
+        const HcalElectronicsId HEID = readoutMap->lookup(j->id());
+        m_tool->Fill(HEID, j);
+
+        if (count++ < m_sets_to_show || m_sets_to_show < 0) {
+          cout << *j << std::endl;
+          cout << HEID << endl;
+          cout << "count: " << count << endl;
+        }
+      }
+      if (m_sets_to_show != 0)
+        cout << "HB/HE count: " << count << endl;
+    }
   }
-   
-   iEvent.getManyByType(ho);
-   if (ho.empty()) {
-     cout << "No HO Digis." << endl;
+
+  iEvent.getManyByType(hf);
+  if (hf.empty()) {
+    cout << "No HF Digis." << endl;
   } else {
-     std::vector<edm::Handle<HODigiCollection> >::iterator i;
-     for (i=ho.begin(); i!=ho.end(); i++) {
-       const HODigiCollection& c=*(*i);
-       
-       int count=0;
-       for (HODigiCollection::const_iterator j=c.begin(); j!=c.end(); j++) {
-   	 const HcalElectronicsId HEID = readoutMap->lookup(j->id());
-   	 m_tool->Fill(HEID,j);
-   	 
-   	 if ( count++<m_sets_to_show || m_sets_to_show<0 ) {
-   	   cout << *j << std::endl;
-   	   cout << HEID << endl;
-   	   cout << "count: " << count << endl;
-   	 }
-       }
-       if (m_sets_to_show!=0) cout << "HO    count: " << count << endl;
-     }
+    std::vector<edm::Handle<HFDigiCollection> >::iterator i;
+    for (i = hf.begin(); i != hf.end(); i++) {
+      const HFDigiCollection& c = *(*i);
+
+      int count = 0;
+      for (HFDigiCollection::const_iterator j = c.begin(); j != c.end(); j++) {
+        const HcalElectronicsId HEID = readoutMap->lookup(j->id());
+        m_tool->Fill(HEID, j);
+
+        if (count++ < m_sets_to_show || m_sets_to_show < 0) {
+          cout << *j << std::endl;
+          cout << HEID << endl;
+          cout << "count: " << count << endl;
+        }
+      }
+      if (m_sets_to_show != 0)
+        cout << "HF    count: " << count << endl;
+    }
   }
 
-   cout << endl;    
+  iEvent.getManyByType(ho);
+  if (ho.empty()) {
+    cout << "No HO Digis." << endl;
+  } else {
+    std::vector<edm::Handle<HODigiCollection> >::iterator i;
+    for (i = ho.begin(); i != ho.end(); i++) {
+      const HODigiCollection& c = *(*i);
+
+      int count = 0;
+      for (HODigiCollection::const_iterator j = c.begin(); j != c.end(); j++) {
+        const HcalElectronicsId HEID = readoutMap->lookup(j->id());
+        m_tool->Fill(HEID, j);
+
+        if (count++ < m_sets_to_show || m_sets_to_show < 0) {
+          cout << *j << std::endl;
+          cout << HEID << endl;
+          cout << "count: " << count << endl;
+        }
+      }
+      if (m_sets_to_show != 0)
+        cout << "HO    count: " << count << endl;
+    }
+  }
 
+  cout << endl;
 }
 
-
-void HtrXmlPattern::do_hand_fill(const HcalElectronicsMap *emap)
-{
-  HtrXmlPatternSet *hxps=m_tool->GetPatternSet();
-
-  for (int iCrate=0;iCrate<ChannelPattern::NUM_CRATES;iCrate++) {
-    CrateData *cd=hxps->getCrate(iCrate);
-    if (!cd) continue;
-    for (int iSlot=0;iSlot<ChannelPattern::NUM_SLOTS;iSlot++) {
-      for (int iTb=0;iTb<2;iTb++) {
-	HalfHtrData* hhd=cd->getHalfHtrData(iSlot,iTb);
-	if (!hhd) continue;
-	for (int iChannel=1;iChannel<25;iChannel++) {
-	  ChannelPattern *cp=hhd->getPattern(iChannel);
-	  if (!cp) continue;
-	  cp->Fill_by_hand(emap,m_hand_pattern_number);
-	}
-      }      
+void HtrXmlPattern::do_hand_fill(const HcalElectronicsMap* emap) {
+  HtrXmlPatternSet* hxps = m_tool->GetPatternSet();
+
+  for (int iCrate = 0; iCrate < ChannelPattern::NUM_CRATES; iCrate++) {
+    CrateData* cd = hxps->getCrate(iCrate);
+    if (!cd)
+      continue;
+    for (int iSlot = 0; iSlot < ChannelPattern::NUM_SLOTS; iSlot++) {
+      for (int iTb = 0; iTb < 2; iTb++) {
+        HalfHtrData* hhd = cd->getHalfHtrData(iSlot, iTb);
+        if (!hhd)
+          continue;
+        for (int iChannel = 1; iChannel < 25; iChannel++) {
+          ChannelPattern* cp = hhd->getPattern(iChannel);
+          if (!cp)
+            continue;
+          cp->Fill_by_hand(emap, m_hand_pattern_number);
+        }
+      }
     }
   }
-
 }
 
 // ------------ method called once each job just after ending the event loop  ------------
-void 
-HtrXmlPattern::endJob() {
-  bool modeg0=m_toolparameters->m_XML_file_mode>0;
-  if (modeg0 || m_write_root_file) m_tool->prepareDirs();
-  if (modeg0)                      m_tool->writeXML();
-  if (m_write_root_file)           m_tool->createHists();
+void HtrXmlPattern::endJob() {
+  bool modeg0 = m_toolparameters->m_XML_file_mode > 0;
+  if (modeg0 || m_write_root_file)
+    m_tool->prepareDirs();
+  if (modeg0)
+    m_tool->writeXML();
+  if (m_write_root_file)
+    m_tool->createHists();
 }
diff --git a/IORawData/CaloPatterns/src/HtrXmlPattern.h b/IORawData/CaloPatterns/src/HtrXmlPattern.h
index 55430814f9612..eb98f96983bf6 100644
--- a/IORawData/CaloPatterns/src/HtrXmlPattern.h
+++ b/IORawData/CaloPatterns/src/HtrXmlPattern.h
@@ -20,17 +20,17 @@
 
 class HtrXmlPattern : public edm::EDAnalyzer {
 public:
-  explicit HtrXmlPattern(const edm::ParameterSet&);
+  explicit HtrXmlPattern(const edm::ParameterSet &);
   ~HtrXmlPattern() override;
 
 private:
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void endJob() override ;
-  virtual void do_hand_fill(const HcalElectronicsMap*);
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
+  virtual void do_hand_fill(const HcalElectronicsMap *);
   HtrXmlPatternTool *m_tool;
   HtrXmlPatternToolParameters *m_toolparameters;
-  int  m_sets_to_show;
-  int  m_hand_pattern_number;
+  int m_sets_to_show;
+  int m_hand_pattern_number;
   bool m_fill_by_hand;
   bool m_filled;
   bool m_write_root_file;
diff --git a/IORawData/CaloPatterns/src/HtrXmlPatternSet.cc b/IORawData/CaloPatterns/src/HtrXmlPatternSet.cc
index ed6ce67b984ed..0afbaeb989ead 100644
--- a/IORawData/CaloPatterns/src/HtrXmlPatternSet.cc
+++ b/IORawData/CaloPatterns/src/HtrXmlPatternSet.cc
@@ -3,64 +3,94 @@
 #include <iostream>
 
 ChannelPattern::ChannelPattern() {
-  for (int i=0; i<SAMPLES; i++) {
-    fCReal[i]=0;
-    fCCoded[i]=0;
-    fCQuantized[i]=0;
+  for (int i = 0; i < SAMPLES; i++) {
+    fCReal[i] = 0;
+    fCCoded[i] = 0;
+    fCQuantized[i] = 0;
   }
-  m_sample_pos=0;
+  m_sample_pos = 0;
 }
 
-void ChannelPattern::Fill_by_hand(const HcalElectronicsMap *emap,int pattern_number) {
-
-  for (int iSample=0;iSample<SAMPLES;iSample++) {
-    fCCoded    [iSample]=0;
-    fCQuantized[iSample]=0;
+void ChannelPattern::Fill_by_hand(const HcalElectronicsMap* emap, int pattern_number) {
+  for (int iSample = 0; iSample < SAMPLES; iSample++) {
+    fCCoded[iSample] = 0;
+    fCQuantized[iSample] = 0;
   }
 
   int dcc9[NUM_CRATES];
   int dcc19[NUM_CRATES];
-  for (int jCrate=0;jCrate<NUM_CRATES;jCrate++) {
-    dcc9[jCrate]=-1;
-    dcc19[jCrate]=-1;
+  for (int jCrate = 0; jCrate < NUM_CRATES; jCrate++) {
+    dcc9[jCrate] = -1;
+    dcc19[jCrate] = -1;
   }
 
   int iCrate;
-  iCrate=4 ; dcc9[iCrate]=700; dcc19[iCrate]=701;
-  iCrate=0 ; dcc9[iCrate]=702; dcc19[iCrate]=703;
-  iCrate=1 ; dcc9[iCrate]=704; dcc19[iCrate]=705;
-  iCrate=5 ; dcc9[iCrate]=706; dcc19[iCrate]=707;
-  iCrate=11; dcc9[iCrate]=708; dcc19[iCrate]=709;
-  iCrate=15; dcc9[iCrate]=710; dcc19[iCrate]=711;
-  iCrate=17; dcc9[iCrate]=712; dcc19[iCrate]=713;
-  iCrate=14; dcc9[iCrate]=714; dcc19[iCrate]=715;
-  iCrate=10; dcc9[iCrate]=716; dcc19[iCrate]=717;
-  iCrate=2 ; dcc9[iCrate]=718; dcc19[iCrate]=719;
-  iCrate=9 ; dcc9[iCrate]=720; dcc19[iCrate]=721;
-  iCrate=12; dcc9[iCrate]=722; dcc19[iCrate]=723;
-  iCrate=3 ; dcc9[iCrate]=724; dcc19[iCrate]=725;
-  iCrate=7 ; dcc9[iCrate]=726; dcc19[iCrate]=727;
-  iCrate=6 ; dcc9[iCrate]=728; dcc19[iCrate]=729;
-  iCrate=13; dcc9[iCrate]=730; dcc19[iCrate]=731;
-
-  int *dcc=nullptr;
-  int spigot=-100;
-  if (m_slot>=2 && m_slot<=8) {
-    spigot=2*m_slot-m_tb-3;
-    dcc=dcc9;
-  }
-  else if (m_slot>=13 && m_slot<=18) {
-    spigot=2*m_slot-m_tb-25;
-    dcc=dcc19;
-  }
-  else return;
+  iCrate = 4;
+  dcc9[iCrate] = 700;
+  dcc19[iCrate] = 701;
+  iCrate = 0;
+  dcc9[iCrate] = 702;
+  dcc19[iCrate] = 703;
+  iCrate = 1;
+  dcc9[iCrate] = 704;
+  dcc19[iCrate] = 705;
+  iCrate = 5;
+  dcc9[iCrate] = 706;
+  dcc19[iCrate] = 707;
+  iCrate = 11;
+  dcc9[iCrate] = 708;
+  dcc19[iCrate] = 709;
+  iCrate = 15;
+  dcc9[iCrate] = 710;
+  dcc19[iCrate] = 711;
+  iCrate = 17;
+  dcc9[iCrate] = 712;
+  dcc19[iCrate] = 713;
+  iCrate = 14;
+  dcc9[iCrate] = 714;
+  dcc19[iCrate] = 715;
+  iCrate = 10;
+  dcc9[iCrate] = 716;
+  dcc19[iCrate] = 717;
+  iCrate = 2;
+  dcc9[iCrate] = 718;
+  dcc19[iCrate] = 719;
+  iCrate = 9;
+  dcc9[iCrate] = 720;
+  dcc19[iCrate] = 721;
+  iCrate = 12;
+  dcc9[iCrate] = 722;
+  dcc19[iCrate] = 723;
+  iCrate = 3;
+  dcc9[iCrate] = 724;
+  dcc19[iCrate] = 725;
+  iCrate = 7;
+  dcc9[iCrate] = 726;
+  dcc19[iCrate] = 727;
+  iCrate = 6;
+  dcc9[iCrate] = 728;
+  dcc19[iCrate] = 729;
+  iCrate = 13;
+  dcc9[iCrate] = 730;
+  dcc19[iCrate] = 731;
 
-  int fiber_channel=(m_chan-1)%3;
-  int fiber=(m_chan-fiber_channel-1)/3 +1;
-  int dcc_num=dcc[m_crate]-700;
+  int* dcc = nullptr;
+  int spigot = -100;
+  if (m_slot >= 2 && m_slot <= 8) {
+    spigot = 2 * m_slot - m_tb - 3;
+    dcc = dcc9;
+  } else if (m_slot >= 13 && m_slot <= 18) {
+    spigot = 2 * m_slot - m_tb - 25;
+    dcc = dcc19;
+  } else
+    return;
 
-  HcalElectronicsId heid(fiber_channel,fiber,spigot,dcc_num);
-  heid.setHTR(m_crate,m_slot,m_tb);
+  int fiber_channel = (m_chan - 1) % 3;
+  int fiber = (m_chan - fiber_channel - 1) / 3 + 1;
+  int dcc_num = dcc[m_crate] - 700;
+
+  HcalElectronicsId heid(fiber_channel, fiber, spigot, dcc_num);
+  heid.setHTR(m_crate, m_slot, m_tb);
 
   //if (heid.readoutVMECrateId()!=m_crate) std::cout << "crate: " << heid.readoutVMECrateId() << "; " << m_crate << std::endl;
   //if (heid.htrSlot()!=m_slot) std::cout << "slot:  " << heid.htrSlot() << "; " << m_slot << std::endl;
@@ -72,173 +102,199 @@ void ChannelPattern::Fill_by_hand(const HcalElectronicsMap *emap,int pattern_num
   //}
 
   try {
-    const HcalDetId hdid=emap->lookup(heid);
+    const HcalDetId hdid = emap->lookup(heid);
 
-    int etaabs=hdid.ietaAbs();
-    int phi=hdid.iphi();
-    int side=hdid.zside();
-    int depth=hdid.depth();
-    int subdet=hdid.subdet();
+    int etaabs = hdid.ietaAbs();
+    int phi = hdid.iphi();
+    int side = hdid.zside();
+    int depth = hdid.depth();
+    int subdet = hdid.subdet();
 
     ///////////////////////////////
-    if (pattern_number==1) {
-      if (m_crate==2 || m_crate==9 || m_crate==12) return;
+    if (pattern_number == 1) {
+      if (m_crate == 2 || m_crate == 9 || m_crate == 12)
+        return;
       //fill only one channel per half-crate
-      if (m_slot!=2 && m_slot!=13) return;
-      if (m_tb!=0) return;
-      if (m_chan!=5) return;
-  
+      if (m_slot != 2 && m_slot != 13)
+        return;
+      if (m_tb != 0)
+        return;
+      if (m_chan != 5)
+        return;
+
       //put some data here
-      fCCoded[31]=17;
+      fCCoded[31] = 17;
     }
     ///////////////////////////////
-    if (pattern_number==2) {
-      if (depth>1) return;
-      if (subdet==4 && etaabs<30) return;
-      
-      if ((etaabs+2)%4!=0) return;
-      int i=(etaabs+2)/4;
-      if (i<1 || i>7) return;
-      
-      if ((phi+3)%4!=0) return;
-      int j=(phi+3)/4;
-      if (j<1 || j>18) return;
-      
+    if (pattern_number == 2) {
+      if (depth > 1)
+        return;
+      if (subdet == 4 && etaabs < 30)
+        return;
+
+      if ((etaabs + 2) % 4 != 0)
+        return;
+      int i = (etaabs + 2) / 4;
+      if (i < 1 || i > 7)
+        return;
+
+      if ((phi + 3) % 4 != 0)
+        return;
+      int j = (phi + 3) / 4;
+      if (j < 1 || j > 18)
+        return;
+
       //add one to BX?
-      if (side<0) fCCoded[phi+10]=i;
-      if (side>0) fCCoded[phi+10]=i+16;
+      if (side < 0)
+        fCCoded[phi + 10] = i;
+      if (side > 0)
+        fCCoded[phi + 10] = i + 16;
     }
     ///////////////////////////////
-    if (pattern_number==3) {
-      if (depth>1 || etaabs!=18 || side!=1 || phi!=32) return;
+    if (pattern_number == 3) {
+      if (depth > 1 || etaabs != 18 || side != 1 || phi != 32)
+        return;
       std::cout << "hello" << std::endl;
       //add one to BX?
-      if (side>0) fCCoded[15]=20;
+      if (side > 0)
+        fCCoded[15] = 20;
     }
-    
+
+  } catch (...) {
+    return;
   }
-  catch (...) {return;}
 }
 
-void ChannelPattern::Fill(HtrXmlPatternToolParameters* params,HBHEDigiCollection::const_iterator data) {
+void ChannelPattern::Fill(HtrXmlPatternToolParameters* params, HBHEDigiCollection::const_iterator data) {
   //first fill with pedestal value (currently hard-coded to 0)
-  for (int samples=0; samples<params->m_samples_per_event; samples++) {
+  for (int samples = 0; samples < params->m_samples_per_event; samples++) {
     int index = m_sample_pos + samples;
-    if (index>=SAMPLES) continue;
+    if (index >= SAMPLES)
+      continue;
 
-    fCCoded    [index] = 0;
+    fCCoded[index] = 0;
     fCQuantized[index] = 0;
   }
 
   //now fill with actual samples
-  for (int samples=0; samples<data->size(); samples++) {
+  for (int samples = 0; samples < data->size(); samples++) {
     int index = m_sample_pos + params->m_presamples_per_event - data->presamples() + samples;
-    if (index<m_sample_pos || 
-	index>=(m_sample_pos+params->m_samples_per_event) ||
-	index>=SAMPLES) continue;
+    if (index < m_sample_pos || index >= (m_sample_pos + params->m_samples_per_event) || index >= SAMPLES)
+      continue;
 
-    fCCoded    [index] = data->sample(samples).adc();
+    fCCoded[index] = data->sample(samples).adc();
     fCQuantized[index] = data->sample(samples).nominal_fC();
   }
-  
-  m_sample_pos+=params->m_samples_per_event;
+
+  m_sample_pos += params->m_samples_per_event;
 }
 
-void ChannelPattern::Fill(HtrXmlPatternToolParameters* params,HFDigiCollection::const_iterator data) {
+void ChannelPattern::Fill(HtrXmlPatternToolParameters* params, HFDigiCollection::const_iterator data) {
   //first fill with pedestal value (currently hard-coded to 0)
-  for (int samples=0; samples<params->m_samples_per_event; samples++) {
+  for (int samples = 0; samples < params->m_samples_per_event; samples++) {
     int index = m_sample_pos + samples;
-    if (index>=SAMPLES) continue;
+    if (index >= SAMPLES)
+      continue;
 
-    fCCoded    [index] = 0;
+    fCCoded[index] = 0;
     fCQuantized[index] = 0;
   }
 
   //now fill with actual samples
-  for (int samples=0; samples<data->size(); samples++) {
+  for (int samples = 0; samples < data->size(); samples++) {
     int index = m_sample_pos + params->m_presamples_per_event - data->presamples() + samples;
-    if (index<m_sample_pos || 
-	index>=(m_sample_pos+params->m_samples_per_event) ||
-	index>=SAMPLES) continue;
+    if (index < m_sample_pos || index >= (m_sample_pos + params->m_samples_per_event) || index >= SAMPLES)
+      continue;
 
-    fCCoded    [index] = data->sample(samples).adc();
+    fCCoded[index] = data->sample(samples).adc();
     fCQuantized[index] = data->sample(samples).nominal_fC();
   }
-  
-  m_sample_pos+=params->m_samples_per_event;
+
+  m_sample_pos += params->m_samples_per_event;
 }
 
-void ChannelPattern::Fill(HtrXmlPatternToolParameters* params,HODigiCollection::const_iterator data) {
+void ChannelPattern::Fill(HtrXmlPatternToolParameters* params, HODigiCollection::const_iterator data) {
   //first fill with pedestal value (currently hard-coded to 0)
-  for (int samples=0; samples<params->m_samples_per_event; samples++) {
+  for (int samples = 0; samples < params->m_samples_per_event; samples++) {
     int index = m_sample_pos + samples;
-    if (index>=SAMPLES) continue;
+    if (index >= SAMPLES)
+      continue;
 
-    fCCoded    [index] = 0;
+    fCCoded[index] = 0;
     fCQuantized[index] = 0;
   }
 
   //now fill with actual samples
-  for (int samples=0; samples<data->size(); samples++) {
+  for (int samples = 0; samples < data->size(); samples++) {
     int index = m_sample_pos + params->m_presamples_per_event - data->presamples() + samples;
-    if (index<m_sample_pos || 
-	index>=(m_sample_pos+params->m_samples_per_event) ||
-	index>=SAMPLES) continue;
+    if (index < m_sample_pos || index >= (m_sample_pos + params->m_samples_per_event) || index >= SAMPLES)
+      continue;
 
-    fCCoded    [index] = data->sample(samples).adc();
+    fCCoded[index] = data->sample(samples).adc();
     fCQuantized[index] = data->sample(samples).nominal_fC();
   }
-  
-  m_sample_pos+=params->m_samples_per_event;
+
+  m_sample_pos += params->m_samples_per_event;
 }
 
 HalfHtrData::HalfHtrData(int crate, int slot, int tb) {
-  for (int i=0; i<24; i++)
-    m_patterns[i].setLoc(crate,slot,tb,i+1);
-  m_crate=crate;
-  m_slot=slot;
-  m_tb=tb;
+  for (int i = 0; i < 24; i++)
+    m_patterns[i].setLoc(crate, slot, tb, i + 1);
+  m_crate = crate;
+  m_slot = slot;
+  m_tb = tb;
   //these are set later with map data
-  m_dcc=0;
-  m_spigot=0;
+  m_dcc = 0;
+  m_spigot = 0;
 }
 
 CrateData::CrateData(int crate, int slotsActive[ChannelPattern::NUM_SLOTS]) {
-  for (int slot=0; slot<ChannelPattern::NUM_SLOTS; slot++) {
-    for (int tb=0;tb<2;tb++) {
-      if (slotsActive[slot]) m_slotsDoubled[slot][tb] = new HalfHtrData(crate,slot,tb);
-      else                   m_slotsDoubled[slot][tb] = nullptr;
+  for (int slot = 0; slot < ChannelPattern::NUM_SLOTS; slot++) {
+    for (int tb = 0; tb < 2; tb++) {
+      if (slotsActive[slot])
+        m_slotsDoubled[slot][tb] = new HalfHtrData(crate, slot, tb);
+      else
+        m_slotsDoubled[slot][tb] = nullptr;
     }
   }
 }
 
 CrateData::~CrateData() {
-  for (int slot=0; slot<ChannelPattern::NUM_SLOTS; slot++) {
-    for (int tb=0;tb<2;tb++) {
-      if (m_slotsDoubled[slot][tb]) delete m_slotsDoubled[slot][tb];
+  for (int slot = 0; slot < ChannelPattern::NUM_SLOTS; slot++) {
+    for (int tb = 0; tb < 2; tb++) {
+      if (m_slotsDoubled[slot][tb])
+        delete m_slotsDoubled[slot][tb];
     }
   }
 }
 
 HalfHtrData* CrateData::getHalfHtrData(int slot, int tb) {
-  if ( slot>=0 && slot<ChannelPattern::NUM_SLOTS && (tb==0 || tb==1) ) return m_slotsDoubled[slot][tb];
-  else return nullptr;
+  if (slot >= 0 && slot < ChannelPattern::NUM_SLOTS && (tb == 0 || tb == 1))
+    return m_slotsDoubled[slot][tb];
+  else
+    return nullptr;
 }
 
-HtrXmlPatternSet::HtrXmlPatternSet(int cratesActive[ChannelPattern::NUM_CRATES], int slotsActive[ChannelPattern::NUM_SLOTS]) {
-  for (int crate=0; crate<ChannelPattern::NUM_CRATES; crate++) {
-    if (cratesActive[crate]) m_crates[crate] = new CrateData(crate,slotsActive);
-    else                     m_crates[crate] = nullptr;
+HtrXmlPatternSet::HtrXmlPatternSet(int cratesActive[ChannelPattern::NUM_CRATES],
+                                   int slotsActive[ChannelPattern::NUM_SLOTS]) {
+  for (int crate = 0; crate < ChannelPattern::NUM_CRATES; crate++) {
+    if (cratesActive[crate])
+      m_crates[crate] = new CrateData(crate, slotsActive);
+    else
+      m_crates[crate] = nullptr;
   }
 }
 
 HtrXmlPatternSet::~HtrXmlPatternSet() {
-  for (int crate=0; crate<ChannelPattern::NUM_CRATES; crate++) {
-    if (m_crates[crate]) delete m_crates[crate];
+  for (int crate = 0; crate < ChannelPattern::NUM_CRATES; crate++) {
+    if (m_crates[crate])
+      delete m_crates[crate];
   }
 }
 
 CrateData* HtrXmlPatternSet::getCrate(int crate) {
-  if (crate>=0 && crate<ChannelPattern::NUM_CRATES) return m_crates[crate];
-  else return nullptr;
+  if (crate >= 0 && crate < ChannelPattern::NUM_CRATES)
+    return m_crates[crate];
+  else
+    return nullptr;
 }
diff --git a/IORawData/CaloPatterns/src/HtrXmlPatternSet.h b/IORawData/CaloPatterns/src/HtrXmlPatternSet.h
index e299f21f2ef41..911ca750e3f86 100644
--- a/IORawData/CaloPatterns/src/HtrXmlPatternSet.h
+++ b/IORawData/CaloPatterns/src/HtrXmlPatternSet.h
@@ -7,13 +7,18 @@
 
 class ChannelPattern {
 public:
-  static const int SAMPLES    = 512;
-  static const int NUM_CRATES =  18;
+  static const int SAMPLES = 512;
+  static const int NUM_CRATES = 18;
   //this is one larger than it 'needs' to be so that the array index can match the physical slot number
-  static const int NUM_SLOTS  =  22;
+  static const int NUM_SLOTS = 22;
 
   ChannelPattern();
-  void setLoc(int crate, int slot, int tb, int chan) { m_crate=crate; m_slot=slot; m_tb=tb; m_chan=chan; }
+  void setLoc(int crate, int slot, int tb, int chan) {
+    m_crate = crate;
+    m_slot = slot;
+    m_tb = tb;
+    m_chan = chan;
+  }
   int getCrate() const { return m_crate; }
   int getSlot() const { return m_slot; }
   int getTB() const { return m_tb; }
@@ -23,10 +28,11 @@ class ChannelPattern {
   void encode();
   int getCoded(int bc) const { return fCCoded[bc]; }
   double getQuantized(int bc) const { return fCQuantized[bc]; }
-  void Fill(HtrXmlPatternToolParameters *params,HBHEDigiCollection::const_iterator data);
-  void Fill(HtrXmlPatternToolParameters *params,HFDigiCollection::const_iterator data);
-  void Fill(HtrXmlPatternToolParameters *params,HODigiCollection::const_iterator data);
-  void Fill_by_hand(const HcalElectronicsMap*,int);
+  void Fill(HtrXmlPatternToolParameters* params, HBHEDigiCollection::const_iterator data);
+  void Fill(HtrXmlPatternToolParameters* params, HFDigiCollection::const_iterator data);
+  void Fill(HtrXmlPatternToolParameters* params, HODigiCollection::const_iterator data);
+  void Fill_by_hand(const HcalElectronicsMap*, int);
+
 private:
   double fCReal[SAMPLES];
   double fCQuantized[SAMPLES];
@@ -38,7 +44,7 @@ class ChannelPattern {
 class HalfHtrData {
 public:
   HalfHtrData(int crate, int slot, int tb);
-  ChannelPattern* getPattern(int chan) { return (chan>=1 && chan<=24)?(&m_patterns[chan-1]):(nullptr); }
+  ChannelPattern* getPattern(int chan) { return (chan >= 1 && chan <= 24) ? (&m_patterns[chan - 1]) : (nullptr); }
   int getCrate() const { return m_crate; }
   int getSlot() const { return m_slot; }
   int getTB() const { return m_tb; }
@@ -46,6 +52,7 @@ class HalfHtrData {
   int getDCC() const { return m_dcc; }
   void setSpigot(int spigot) { m_spigot = spigot; }
   void setDCC(int dcc) { m_dcc = dcc; }
+
 private:
   ChannelPattern m_patterns[24];
   int m_crate, m_slot, m_tb;
@@ -57,6 +64,7 @@ class CrateData {
   CrateData(int crate, int slotsActive[ChannelPattern::NUM_SLOTS]);
   ~CrateData();
   HalfHtrData* getHalfHtrData(int slot, int one_two_tb);
+
 private:
   HalfHtrData* m_slotsDoubled[ChannelPattern::NUM_SLOTS][2];
 };
@@ -66,6 +74,7 @@ class HtrXmlPatternSet {
   HtrXmlPatternSet(int cratesActive[ChannelPattern::NUM_CRATES], int slotsActive[ChannelPattern::NUM_SLOTS]);
   ~HtrXmlPatternSet();
   CrateData* getCrate(int crate);
+
 private:
   CrateData* m_crates[ChannelPattern::NUM_CRATES];
 };
diff --git a/IORawData/CaloPatterns/src/HtrXmlPatternTool.cc b/IORawData/CaloPatterns/src/HtrXmlPatternTool.cc
index 8bae0ad2bf0e9..3e20fd1aab59c 100644
--- a/IORawData/CaloPatterns/src/HtrXmlPatternTool.cc
+++ b/IORawData/CaloPatterns/src/HtrXmlPatternTool.cc
@@ -12,117 +12,110 @@ HtrXmlPatternTool::HtrXmlPatternTool(HtrXmlPatternToolParameters* params) {
   m_params = params;
 
   //slotsOn array index corresponds to physical number (e.g., slotsOn[1] for slot 1)
-  int slotsOn [ChannelPattern::NUM_SLOTS];
+  int slotsOn[ChannelPattern::NUM_SLOTS];
   int cratesOn[ChannelPattern::NUM_CRATES];
 
   //turn off all slots
-  for (int i=0; i<ChannelPattern::NUM_SLOTS; i++) slotsOn[i]=0;
+  for (int i = 0; i < ChannelPattern::NUM_SLOTS; i++)
+    slotsOn[i] = 0;
   //turn on slots 2,3,4,5,6,7,8
-  for (int i=2; i<9; i++)   slotsOn[i]=1;
+  for (int i = 2; i < 9; i++)
+    slotsOn[i] = 1;
   //turn on slots 13,14,15,16,17,18
-  for (int i=13; i<19; i++) slotsOn[i]=1;
+  for (int i = 13; i < 19; i++)
+    slotsOn[i] = 1;
 
   //turn on all crates
-  for (int i=0; i<ChannelPattern::NUM_CRATES; i++) cratesOn[i]=1;
+  for (int i = 0; i < ChannelPattern::NUM_CRATES; i++)
+    cratesOn[i] = 1;
   //turn off two unused crates
-  cratesOn[ 8] = 0;
+  cratesOn[8] = 0;
   cratesOn[16] = 0;
 
-  m_patternSet=new HtrXmlPatternSet(cratesOn,slotsOn);
+  m_patternSet = new HtrXmlPatternSet(cratesOn, slotsOn);
   m_xmlWriter.setTagName(m_params->m_file_tag);
-
 }
 
-HtrXmlPatternTool::~HtrXmlPatternTool() {
-  delete m_patternSet;
-}
+HtrXmlPatternTool::~HtrXmlPatternTool() { delete m_patternSet; }
 
-void HtrXmlPatternTool::Fill(const HcalElectronicsId HEID,HBHEDigiCollection::const_iterator data) {
-  CrateData* cd=m_patternSet->getCrate(HEID.readoutVMECrateId());
-  HalfHtrData* hd=nullptr;
-  ChannelPattern* cp=nullptr;
+void HtrXmlPatternTool::Fill(const HcalElectronicsId HEID, HBHEDigiCollection::const_iterator data) {
+  CrateData* cd = m_patternSet->getCrate(HEID.readoutVMECrateId());
+  HalfHtrData* hd = nullptr;
+  ChannelPattern* cp = nullptr;
 
   if (cd) {
-    hd=cd->getHalfHtrData(HEID.htrSlot(),HEID.htrTopBottom());
+    hd = cd->getHalfHtrData(HEID.htrSlot(), HEID.htrTopBottom());
     if (hd) {
       hd->setSpigot(HEID.spigot());
       hd->setDCC(HEID.dccid());
 
-      cp=hd->getPattern(HEID.htrChanId());
-      if (cp) cp->Fill(m_params,data);
-      else if(m_params->m_show_errors) std::cerr << "Bad (crate,slot,channel): (" 
-						 << HEID.readoutVMECrateId() << "," 
-						 << HEID.htrSlot()           << "," 
-						 << HEID.htrChanId()         << ")" << std::endl;
-    }
-    else if(m_params->m_show_errors) std::cerr << "Bad (crate,slot): (" 
-					       << HEID.readoutVMECrateId() << "," 
-					       << HEID.htrSlot()           << ")" << std::endl;
-  }
-  else if(m_params->m_show_errors) std::cerr << "Bad (crate): (" << HEID.readoutVMECrateId() << ")" << std::endl;
+      cp = hd->getPattern(HEID.htrChanId());
+      if (cp)
+        cp->Fill(m_params, data);
+      else if (m_params->m_show_errors)
+        std::cerr << "Bad (crate,slot,channel): (" << HEID.readoutVMECrateId() << "," << HEID.htrSlot() << ","
+                  << HEID.htrChanId() << ")" << std::endl;
+    } else if (m_params->m_show_errors)
+      std::cerr << "Bad (crate,slot): (" << HEID.readoutVMECrateId() << "," << HEID.htrSlot() << ")" << std::endl;
+  } else if (m_params->m_show_errors)
+    std::cerr << "Bad (crate): (" << HEID.readoutVMECrateId() << ")" << std::endl;
 }
 
-void HtrXmlPatternTool::Fill(const HcalElectronicsId HEID,HFDigiCollection::const_iterator data) {
-  CrateData* cd=m_patternSet->getCrate(HEID.readoutVMECrateId());
-  HalfHtrData* hd=nullptr;
-  ChannelPattern* cp=nullptr;
+void HtrXmlPatternTool::Fill(const HcalElectronicsId HEID, HFDigiCollection::const_iterator data) {
+  CrateData* cd = m_patternSet->getCrate(HEID.readoutVMECrateId());
+  HalfHtrData* hd = nullptr;
+  ChannelPattern* cp = nullptr;
 
   if (cd) {
-    hd=cd->getHalfHtrData(HEID.htrSlot(),HEID.htrTopBottom());
+    hd = cd->getHalfHtrData(HEID.htrSlot(), HEID.htrTopBottom());
     if (hd) {
       hd->setSpigot(HEID.spigot());
       hd->setDCC(HEID.dccid());
 
-      cp=hd->getPattern(HEID.htrChanId());
-      if (cp) cp->Fill(m_params,data);
-      else if(m_params->m_show_errors) std::cerr << "Bad (crate,slot,channel): (" 
-						 << HEID.readoutVMECrateId() << "," 
-						 << HEID.htrSlot()           << "," 
-						 << HEID.htrChanId()         << ")" << std::endl;
-    }
-    else if(m_params->m_show_errors) std::cerr << "Bad (crate,slot): (" 
-					       << HEID.readoutVMECrateId() << "," 
-					       << HEID.htrSlot()           << ")" << std::endl;
-  }
-  else if(m_params->m_show_errors) std::cerr << "Bad (crate): (" << HEID.readoutVMECrateId() << ")" << std::endl;
+      cp = hd->getPattern(HEID.htrChanId());
+      if (cp)
+        cp->Fill(m_params, data);
+      else if (m_params->m_show_errors)
+        std::cerr << "Bad (crate,slot,channel): (" << HEID.readoutVMECrateId() << "," << HEID.htrSlot() << ","
+                  << HEID.htrChanId() << ")" << std::endl;
+    } else if (m_params->m_show_errors)
+      std::cerr << "Bad (crate,slot): (" << HEID.readoutVMECrateId() << "," << HEID.htrSlot() << ")" << std::endl;
+  } else if (m_params->m_show_errors)
+    std::cerr << "Bad (crate): (" << HEID.readoutVMECrateId() << ")" << std::endl;
 }
 
-void HtrXmlPatternTool::Fill(const HcalElectronicsId HEID,HODigiCollection::const_iterator data) {
-  CrateData* cd=m_patternSet->getCrate(HEID.readoutVMECrateId());
-  HalfHtrData* hd=nullptr;
-  ChannelPattern* cp=nullptr;
+void HtrXmlPatternTool::Fill(const HcalElectronicsId HEID, HODigiCollection::const_iterator data) {
+  CrateData* cd = m_patternSet->getCrate(HEID.readoutVMECrateId());
+  HalfHtrData* hd = nullptr;
+  ChannelPattern* cp = nullptr;
 
   if (cd) {
-    hd=cd->getHalfHtrData(HEID.htrSlot(),HEID.htrTopBottom());
+    hd = cd->getHalfHtrData(HEID.htrSlot(), HEID.htrTopBottom());
     if (hd) {
       hd->setSpigot(HEID.spigot());
       hd->setDCC(HEID.dccid());
 
-      cp=hd->getPattern(HEID.htrChanId());
-      if (cp) cp->Fill(m_params,data);
-      else if(m_params->m_show_errors) std::cerr << "Bad (crate,slot,channel): (" 
-						 << HEID.readoutVMECrateId() << "," 
-						 << HEID.htrSlot()           << "," 
-						 << HEID.htrChanId()         << ")" << std::endl;
-    }
-    else if(m_params->m_show_errors) std::cerr << "Bad (crate,slot): (" 
-					       << HEID.readoutVMECrateId() << "," 
-					       << HEID.htrSlot()           << ")" << std::endl;
-  }
-  else if(m_params->m_show_errors) std::cerr << "Bad (crate): (" << HEID.readoutVMECrateId() << ")" << std::endl;
+      cp = hd->getPattern(HEID.htrChanId());
+      if (cp)
+        cp->Fill(m_params, data);
+      else if (m_params->m_show_errors)
+        std::cerr << "Bad (crate,slot,channel): (" << HEID.readoutVMECrateId() << "," << HEID.htrSlot() << ","
+                  << HEID.htrChanId() << ")" << std::endl;
+    } else if (m_params->m_show_errors)
+      std::cerr << "Bad (crate,slot): (" << HEID.readoutVMECrateId() << "," << HEID.htrSlot() << ")" << std::endl;
+  } else if (m_params->m_show_errors)
+    std::cerr << "Bad (crate): (" << HEID.readoutVMECrateId() << ")" << std::endl;
 }
 
-void HtrXmlPatternTool::prepareDirs() {
-  boost::filesystem::create_directory(m_params->m_output_directory);
-}
+void HtrXmlPatternTool::prepareDirs() { boost::filesystem::create_directory(m_params->m_output_directory); }
 
 void HtrXmlPatternTool::writeXML() {
   std::cout << "Writing XML..." << std::endl;
-  std::ofstream* of=nullptr;
+  std::ofstream* of = nullptr;
 
-  if (m_params->m_XML_file_mode==1) {
-    std::string name=m_params->m_output_directory+(m_params->m_file_tag)+"_all.xml";
-    of=new std::ofstream(name.c_str(),std::ios_base::out|std::ios_base::trunc);
+  if (m_params->m_XML_file_mode == 1) {
+    std::string name = m_params->m_output_directory + (m_params->m_file_tag) + "_all.xml";
+    of = new std::ofstream(name.c_str(), std::ios_base::out | std::ios_base::trunc);
     if (!of->good()) {
       std::cerr << "XML output file " << name << " is bad." << std::endl;
       return;
@@ -131,76 +124,77 @@ void HtrXmlPatternTool::writeXML() {
     (*of) << "<CFGBrickSet name='" << m_params->m_file_tag << "'>" << std::endl;
   }
 
-  for (int crate=0; crate<ChannelPattern::NUM_CRATES; crate++) {
-    CrateData* cd=m_patternSet->getCrate(crate);
-    if (cd==nullptr) continue;
+  for (int crate = 0; crate < ChannelPattern::NUM_CRATES; crate++) {
+    CrateData* cd = m_patternSet->getCrate(crate);
+    if (cd == nullptr)
+      continue;
 
-    if (m_params->m_XML_file_mode==2) {
-      std::string name=m_params->m_output_directory+(m_params->m_file_tag);
+    if (m_params->m_XML_file_mode == 2) {
+      std::string name = m_params->m_output_directory + (m_params->m_file_tag);
       char cr_name[256];
-      snprintf(cr_name,256,"_crate_%d.xml",crate);
+      snprintf(cr_name, 256, "_crate_%d.xml", crate);
       name += cr_name;
-      of=new std::ofstream(name.c_str(),std::ios_base::out|std::ios_base::trunc);
+      of = new std::ofstream(name.c_str(), std::ios_base::out | std::ios_base::trunc);
       if (!of->good()) {
-	std::cerr << "XML output file " << name << " is bad." << std::endl;
-    delete of;
-	return;
+        std::cerr << "XML output file " << name << " is bad." << std::endl;
+        delete of;
+        return;
       }
       (*of) << "<?xml version='1.0' encoding='UTF-8'?>" << std::endl;
       (*of) << "<CFGBrickSet name='" << m_params->m_file_tag << "'>" << std::endl;
     }
 
-    for (int slot=0; slot<ChannelPattern::NUM_SLOTS; slot++) {
-      for (int tb=0; tb<=1; tb++) {
-	HalfHtrData* hd=cd->getHalfHtrData(slot,tb);
-	if (hd==nullptr) continue;
-	for (int fiber=1; fiber<=8; fiber++) {
-
-	  if (m_params->m_XML_file_mode==3) {
-	    std::string name=m_params->m_output_directory+(m_params->m_file_tag);
-	    char cr_name[256];
-	    snprintf(cr_name,256,"_crate_%d_slot_%d_tb_%d_fiber_%d.xml",crate,slot,tb,fiber);
-	    name += cr_name;
-	    of=new std::ofstream(name.c_str(),std::ios_base::out|std::ios_base::trunc);
-	    if (!of->good()) {
-	      std::cerr << "XML output file " << name << " is bad." << std::endl;
-          delete of;
-	      return;
-	    }
-	    (*of) << "<?xml version='1.0' encoding='UTF-8'?>" << std::endl;
-	  }
-	  m_xmlWriter.writePattern(hd,fiber,*of,1);
-	  if (m_params->m_XML_file_mode==3) {
-	    of->close();
-	    delete of;
-	    of=nullptr;
-	  }
-
-	} //end fiber loop
-      } // end tb loop
-    } //end slot loop
-    
-    if (m_params->m_XML_file_mode==2) {
+    for (int slot = 0; slot < ChannelPattern::NUM_SLOTS; slot++) {
+      for (int tb = 0; tb <= 1; tb++) {
+        HalfHtrData* hd = cd->getHalfHtrData(slot, tb);
+        if (hd == nullptr)
+          continue;
+        for (int fiber = 1; fiber <= 8; fiber++) {
+          if (m_params->m_XML_file_mode == 3) {
+            std::string name = m_params->m_output_directory + (m_params->m_file_tag);
+            char cr_name[256];
+            snprintf(cr_name, 256, "_crate_%d_slot_%d_tb_%d_fiber_%d.xml", crate, slot, tb, fiber);
+            name += cr_name;
+            of = new std::ofstream(name.c_str(), std::ios_base::out | std::ios_base::trunc);
+            if (!of->good()) {
+              std::cerr << "XML output file " << name << " is bad." << std::endl;
+              delete of;
+              return;
+            }
+            (*of) << "<?xml version='1.0' encoding='UTF-8'?>" << std::endl;
+          }
+          m_xmlWriter.writePattern(hd, fiber, *of, 1);
+          if (m_params->m_XML_file_mode == 3) {
+            of->close();
+            delete of;
+            of = nullptr;
+          }
+
+        }  //end fiber loop
+      }    // end tb loop
+    }      //end slot loop
+
+    if (m_params->m_XML_file_mode == 2) {
       (*of) << "</CFGBrickSet>" << std::endl;
       of->close();
       delete of;
-      of=nullptr;
+      of = nullptr;
     }
-    
-  } //end crate loop
-  
-  if (m_params->m_XML_file_mode==1) {
+
+  }  //end crate loop
+
+  if (m_params->m_XML_file_mode == 1) {
     (*of) << "</CFGBrickSet>" << std::endl;
     of->close();
     delete of;
-    of=nullptr;
+    of = nullptr;
   }
 }
 
 void HtrXmlPatternTool::createHists() {
   std::cout << "Writing root file..." << std::endl;
-  std::string name=m_params->m_output_directory+"/"+(m_params->m_file_tag)+".root";
-  TFile of(name.c_str(),"RECREATE");
+  std::string name = m_params->m_output_directory + "/" + (m_params->m_file_tag) + ".root";
+  TFile of(name.c_str(), "RECREATE");
   if (of.IsZombie()) {
     std::cerr << "root output file " << name << " is bad." << std::endl;
     return;
@@ -208,40 +202,40 @@ void HtrXmlPatternTool::createHists() {
 
   of.mkdir("adc");
 
-  for (int crate=0; crate<ChannelPattern::NUM_CRATES; crate++) {
-    CrateData* cd=m_patternSet->getCrate(crate);
-    if (cd==nullptr) continue;
-    for (int slot=0; slot<ChannelPattern::NUM_SLOTS; slot++) {
-      for (int tb=0; tb<=1; tb++) {
-	HalfHtrData* hd=cd->getHalfHtrData(slot,tb);
-	if (hd==nullptr) continue;
-	for (int chan=1; chan<=24; chan++) {
-	  ChannelPattern* cp=hd->getPattern(chan);
-	  char hname[128];
-	  sprintf(hname,"Exact fC Cr%d,%d%s-%d",crate,slot,
-		  ((tb==1)?("t"):("b")),chan);
-	  TH1* hp=new TH1F(hname,hname,ChannelPattern::SAMPLES,-0.5,ChannelPattern::SAMPLES-0.5);
-	  hp->SetDirectory(nullptr);
-	  sprintf(hname,"Quantized fC Cr%d,%d%s-%d",crate,slot,
-		  ((tb==1)?("t"):("b")),chan);
-	  TH1* hq=new TH1F(hname,hname,ChannelPattern::SAMPLES,-0.5,ChannelPattern::SAMPLES-0.5);
-	  hp->SetDirectory(nullptr);
-	  sprintf(hname,"Encoded fC Cr%d,%d%s-%d",crate,slot,
-		  ((tb==1)?("t"):("b")),chan);
-	  TH1* ha=new TH1F(hname,hname,ChannelPattern::SAMPLES,-0.5,ChannelPattern::SAMPLES-0.5);
-	  ha->SetDirectory(nullptr);
-	  for (int i=0; i<ChannelPattern::SAMPLES; i++) {
-	    hp->Fill(i*1.0,(*cp)[i]);
-	    hq->Fill(i*1.0,cp->getQuantized(i));
-	    ha->Fill(i*1.0,cp->getCoded(i));
-	  }
-	  //of.cd("perfect");   hp->Write();
-	  //of.cd("quantized"); hq->Write();
-	  of.cd("adc");       ha->Write();
-	  delete hp;
-	  delete hq;
-	  delete ha;
-	}
+  for (int crate = 0; crate < ChannelPattern::NUM_CRATES; crate++) {
+    CrateData* cd = m_patternSet->getCrate(crate);
+    if (cd == nullptr)
+      continue;
+    for (int slot = 0; slot < ChannelPattern::NUM_SLOTS; slot++) {
+      for (int tb = 0; tb <= 1; tb++) {
+        HalfHtrData* hd = cd->getHalfHtrData(slot, tb);
+        if (hd == nullptr)
+          continue;
+        for (int chan = 1; chan <= 24; chan++) {
+          ChannelPattern* cp = hd->getPattern(chan);
+          char hname[128];
+          sprintf(hname, "Exact fC Cr%d,%d%s-%d", crate, slot, ((tb == 1) ? ("t") : ("b")), chan);
+          TH1* hp = new TH1F(hname, hname, ChannelPattern::SAMPLES, -0.5, ChannelPattern::SAMPLES - 0.5);
+          hp->SetDirectory(nullptr);
+          sprintf(hname, "Quantized fC Cr%d,%d%s-%d", crate, slot, ((tb == 1) ? ("t") : ("b")), chan);
+          TH1* hq = new TH1F(hname, hname, ChannelPattern::SAMPLES, -0.5, ChannelPattern::SAMPLES - 0.5);
+          hp->SetDirectory(nullptr);
+          sprintf(hname, "Encoded fC Cr%d,%d%s-%d", crate, slot, ((tb == 1) ? ("t") : ("b")), chan);
+          TH1* ha = new TH1F(hname, hname, ChannelPattern::SAMPLES, -0.5, ChannelPattern::SAMPLES - 0.5);
+          ha->SetDirectory(nullptr);
+          for (int i = 0; i < ChannelPattern::SAMPLES; i++) {
+            hp->Fill(i * 1.0, (*cp)[i]);
+            hq->Fill(i * 1.0, cp->getQuantized(i));
+            ha->Fill(i * 1.0, cp->getCoded(i));
+          }
+          //of.cd("perfect");   hp->Write();
+          //of.cd("quantized"); hq->Write();
+          of.cd("adc");
+          ha->Write();
+          delete hp;
+          delete hq;
+          delete ha;
+        }
       }
     }
   }
diff --git a/IORawData/CaloPatterns/src/HtrXmlPatternTool.h b/IORawData/CaloPatterns/src/HtrXmlPatternTool.h
index db22c491a49be..62e6803c03529 100644
--- a/IORawData/CaloPatterns/src/HtrXmlPatternTool.h
+++ b/IORawData/CaloPatterns/src/HtrXmlPatternTool.h
@@ -10,13 +10,14 @@ class HtrXmlPatternTool {
 public:
   HtrXmlPatternTool(HtrXmlPatternToolParameters* m_params);
   ~HtrXmlPatternTool();
-  void Fill(const HcalElectronicsId HEID,HBHEDigiCollection::const_iterator data);
-  void Fill(const HcalElectronicsId HEID,HFDigiCollection::const_iterator data);
-  void Fill(const HcalElectronicsId HEID,HODigiCollection::const_iterator data);
+  void Fill(const HcalElectronicsId HEID, HBHEDigiCollection::const_iterator data);
+  void Fill(const HcalElectronicsId HEID, HFDigiCollection::const_iterator data);
+  void Fill(const HcalElectronicsId HEID, HODigiCollection::const_iterator data);
   void prepareDirs();
   void createHists();
   void writeXML();
-  HtrXmlPatternSet* GetPatternSet() {return m_patternSet;}
+  HtrXmlPatternSet* GetPatternSet() { return m_patternSet; }
+
 private:
   HtrXmlPatternSet* m_patternSet;
   HtrXmlPatternToolParameters* m_params;
diff --git a/IORawData/CaloPatterns/src/HtrXmlPatternToolParameters.cc b/IORawData/CaloPatterns/src/HtrXmlPatternToolParameters.cc
index c8f3893edd520..7f609f56b1c16 100644
--- a/IORawData/CaloPatterns/src/HtrXmlPatternToolParameters.cc
+++ b/IORawData/CaloPatterns/src/HtrXmlPatternToolParameters.cc
@@ -1,19 +1,17 @@
 #include "HtrXmlPatternToolParameters.h"
 #include <iostream>
 
-HtrXmlPatternToolParameters::HtrXmlPatternToolParameters() {
-}
+HtrXmlPatternToolParameters::HtrXmlPatternToolParameters() {}
 
-HtrXmlPatternToolParameters::~HtrXmlPatternToolParameters() {
-}
+HtrXmlPatternToolParameters::~HtrXmlPatternToolParameters() {}
 
 void HtrXmlPatternToolParameters::Print() {
   using namespace std;
-  cout << "show_errors           = " << m_show_errors           << endl;
-  cout << "presamples_per_event  = " << m_presamples_per_event  << endl;
-  cout << "samples_per_event     = " << m_samples_per_event     << endl;
-  cout << "XML_file_mode         = " << m_XML_file_mode         << endl;
-  cout << "file_tag              = " << m_file_tag              << endl;
+  cout << "show_errors           = " << m_show_errors << endl;
+  cout << "presamples_per_event  = " << m_presamples_per_event << endl;
+  cout << "samples_per_event     = " << m_samples_per_event << endl;
+  cout << "XML_file_mode         = " << m_XML_file_mode << endl;
+  cout << "file_tag              = " << m_file_tag << endl;
   cout << "user_output_directory = " << m_user_output_directory << endl;
-  cout << "output_directory      = " << m_output_directory      << endl;
+  cout << "output_directory      = " << m_output_directory << endl;
 }
diff --git a/IORawData/CaloPatterns/src/HtrXmlPatternToolParameters.h b/IORawData/CaloPatterns/src/HtrXmlPatternToolParameters.h
index b780e7510ef11..b94d73c8d7ad6 100644
--- a/IORawData/CaloPatterns/src/HtrXmlPatternToolParameters.h
+++ b/IORawData/CaloPatterns/src/HtrXmlPatternToolParameters.h
@@ -9,14 +9,15 @@ class HtrXmlPatternToolParameters {
   ~HtrXmlPatternToolParameters();
   void Print();
 
-  bool         m_show_errors;
-  int          m_presamples_per_event;
-  int          m_samples_per_event;
+  bool m_show_errors;
+  int m_presamples_per_event;
+  int m_samples_per_event;
+
+  int m_XML_file_mode;
+  std::string m_file_tag;
+  std::string m_user_output_directory;
+  std::string m_output_directory;
 
-  int          m_XML_file_mode;
-  std::string  m_file_tag;
-  std::string  m_user_output_directory;
-  std::string  m_output_directory;
 protected:
 private:
 };
diff --git a/IORawData/CaloPatterns/src/HtrXmlPatternWriter.cc b/IORawData/CaloPatterns/src/HtrXmlPatternWriter.cc
index dea69400a3560..a5d9d8ab0a4b0 100644
--- a/IORawData/CaloPatterns/src/HtrXmlPatternWriter.cc
+++ b/IORawData/CaloPatterns/src/HtrXmlPatternWriter.cc
@@ -2,71 +2,74 @@
 
 static const char* tabbing(int level) {
   static char tab[50];
-  for (int i=0; i<level*2; i++)
-    tab[i]=' ';
-  tab[level*2]=0;
+  for (int i = 0; i < level * 2; i++)
+    tab[i] = ' ';
+  tab[level * 2] = 0;
   return tab;
 }
 
 HtrXmlPatternWriter::HtrXmlPatternWriter() {
   // set the timestamp!
-  time_t now1=time(nullptr);
-  struct tm* now=localtime(&now1);
+  time_t now1 = time(nullptr);
+  struct tm* now = localtime(&now1);
 
   char buffer[1024];
-  strftime(buffer,1024,"%Y-%m-%d %H:%M:%S",now);
+  strftime(buffer, 1024, "%Y-%m-%d %H:%M:%S", now);
 
-  m_stamp=buffer;
+  m_stamp = buffer;
 }
 
 void HtrXmlPatternWriter::writePattern(HalfHtrData* spigotData, int fiber, std::ostream& os, int level) {
-
   os << tabbing(level) << "<CFGBrick>" << std::endl;
-  os << tabbing(level+1) << "<Parameter name='DCC' type='int'>" << std::dec << spigotData->getDCC() << "</Parameter>" << std::endl;
-  os << tabbing(level+1) << "<Parameter name='SPIGOT' type='int'>" << std::dec << spigotData->getSpigot() << "</Parameter>" << std::endl;
-  os << tabbing(level+1) << "<Parameter name='CRATE' type='int'>" << std::dec << spigotData->getCrate() << "</Parameter>" << std::endl;
-  os << tabbing(level+1) << "<Parameter name='SLOT' type='int'>" << spigotData->getSlot() << "</Parameter>" << std::endl;
-  os << tabbing(level+1) << "<Parameter name='TOPBOTTOM' type='int'>" << spigotData->getTB() << "</Parameter>" << std::endl;
-  os << tabbing(level+1) << "<Parameter name='FIBER' type='int'>" << fiber << "</Parameter>" << std::endl;
-  
-  int genIndex=fiber+(spigotData->getTB()*10)+(spigotData->getSlot()*100)+(spigotData->getCrate()*10000);
-  os << tabbing(level+1) << "<Parameter name='GENERALIZEDINDEX' type='int'>" << std::dec << genIndex << "</Parameter>" << std::endl;
-  os << tabbing(level+1) << "<Parameter name='CREATIONTAG' type='string'>" << m_tagName << "</Parameter>" << std::endl;
-  os << tabbing(level+1) << "<Parameter name='CREATIONSTAMP' type='string'>" << m_stamp << "</Parameter>" << std::endl;
-  os << tabbing(level+1) << "<Parameter name='PATTERN_SPEC_NAME' type='string'>" << m_tagName << "</Parameter>" << std::endl;
-  
+  os << tabbing(level + 1) << "<Parameter name='DCC' type='int'>" << std::dec << spigotData->getDCC() << "</Parameter>"
+     << std::endl;
+  os << tabbing(level + 1) << "<Parameter name='SPIGOT' type='int'>" << std::dec << spigotData->getSpigot()
+     << "</Parameter>" << std::endl;
+  os << tabbing(level + 1) << "<Parameter name='CRATE' type='int'>" << std::dec << spigotData->getCrate()
+     << "</Parameter>" << std::endl;
+  os << tabbing(level + 1) << "<Parameter name='SLOT' type='int'>" << spigotData->getSlot() << "</Parameter>"
+     << std::endl;
+  os << tabbing(level + 1) << "<Parameter name='TOPBOTTOM' type='int'>" << spigotData->getTB() << "</Parameter>"
+     << std::endl;
+  os << tabbing(level + 1) << "<Parameter name='FIBER' type='int'>" << fiber << "</Parameter>" << std::endl;
+
+  int genIndex = fiber + (spigotData->getTB() * 10) + (spigotData->getSlot() * 100) + (spigotData->getCrate() * 10000);
+  os << tabbing(level + 1) << "<Parameter name='GENERALIZEDINDEX' type='int'>" << std::dec << genIndex << "</Parameter>"
+     << std::endl;
+  os << tabbing(level + 1) << "<Parameter name='CREATIONTAG' type='string'>" << m_tagName << "</Parameter>"
+     << std::endl;
+  os << tabbing(level + 1) << "<Parameter name='CREATIONSTAMP' type='string'>" << m_stamp << "</Parameter>"
+     << std::endl;
+  os << tabbing(level + 1) << "<Parameter name='PATTERN_SPEC_NAME' type='string'>" << m_tagName << "</Parameter>"
+     << std::endl;
 
   // CREATIONTAG, CREATIONSTAMP, PATTERN_SPEC_NAME
-  
-  os << tabbing(level+1) << "<Data elements='1024' encoding='hex'>" << std::endl;
-  
-  ChannelPattern* p1=spigotData->getPattern((fiber-1)*3+1);
-  ChannelPattern* p2=spigotData->getPattern((fiber-1)*3+2);
-  ChannelPattern* p3=spigotData->getPattern((fiber-1)*3+3);
 
+  os << tabbing(level + 1) << "<Data elements='1024' encoding='hex'>" << std::endl;
+
+  ChannelPattern* p1 = spigotData->getPattern((fiber - 1) * 3 + 1);
+  ChannelPattern* p2 = spigotData->getPattern((fiber - 1) * 3 + 2);
+  ChannelPattern* p3 = spigotData->getPattern((fiber - 1) * 3 + 3);
 
-  unsigned int w1,w2;
-  for (int i=0; i<512; i++) {
-    packWordsStd(p1->getCoded(i),p2->getCoded(i),p3->getCoded(i),i%4,w1,w2);
+  unsigned int w1, w2;
+  for (int i = 0; i < 512; i++) {
+    packWordsStd(p1->getCoded(i), p2->getCoded(i), p3->getCoded(i), i % 4, w1, w2);
     os << std::hex << w1 << ' ' << std::hex << w2 << ' ';
   }
 
-  os << std::endl << tabbing(level+1) << "</Data>" << std::endl;
-  
+  os << std::endl << tabbing(level + 1) << "</Data>" << std::endl;
+
   os << tabbing(level) << "</CFGBrick>" << std::endl;
 }
 
 void HtrXmlPatternWriter::packWordsStd(int adc0, int adc1, int adc2, int capid, unsigned int& w1, unsigned int& w2) {
-  w1=0x3;
-  w1|=(capid&0x3)<<3;
-  w1|=(capid&0x3)<<5;
-  w1|=(capid&0x3)<<7;
-  w1|=adc2<<9;
-  w1|=0x10000; // data valid
-  w2=adc1<<1;
-  w2|=adc0<<9;
-  w2|=0x10000; // data valid
+  w1 = 0x3;
+  w1 |= (capid & 0x3) << 3;
+  w1 |= (capid & 0x3) << 5;
+  w1 |= (capid & 0x3) << 7;
+  w1 |= adc2 << 9;
+  w1 |= 0x10000;  // data valid
+  w2 = adc1 << 1;
+  w2 |= adc0 << 9;
+  w2 |= 0x10000;  // data valid
 }
-  
-
-
diff --git a/IORawData/CaloPatterns/src/HtrXmlPatternWriter.h b/IORawData/CaloPatterns/src/HtrXmlPatternWriter.h
index 272c179c39193..e44a10fa169c7 100644
--- a/IORawData/CaloPatterns/src/HtrXmlPatternWriter.h
+++ b/IORawData/CaloPatterns/src/HtrXmlPatternWriter.h
@@ -7,8 +7,9 @@
 class HtrXmlPatternWriter {
 public:
   HtrXmlPatternWriter();
-  void setTagName(std::string tn) { m_tagName=tn; }
-  void writePattern(HalfHtrData* spigotData, int fiber, std::ostream& os, int level=0); 
+  void setTagName(std::string tn) { m_tagName = tn; }
+  void writePattern(HalfHtrData* spigotData, int fiber, std::ostream& os, int level = 0);
+
 private:
   void packWordsStd(int adc0, int adc1, int adc2, int capid, unsigned int& w1, unsigned int& w2);
   std::string m_tagName, m_stamp;
diff --git a/IORawData/SiPixelInputSources/interface/PixelSLinkDataInputSource.h b/IORawData/SiPixelInputSources/interface/PixelSLinkDataInputSource.h
index af6744164fd1e..8fec42f554342 100644
--- a/IORawData/SiPixelInputSources/interface/PixelSLinkDataInputSource.h
+++ b/IORawData/SiPixelInputSources/interface/PixelSLinkDataInputSource.h
@@ -4,8 +4,9 @@
 //
 // Package:    SiPixelInputSources
 // Class:      PixelSLinkDataInputSource
-// 
-/**\class PixelSLinkDataInputSource PixelSLinkDataInputSource.h IORawData/SiPixelInputSources/interface/PixelSLinkDataInputSource.h
+//
+/**\class PixelSLinkDataInputSource PixelSLinkDataInputSource.h
+ IORawData/SiPixelInputSources/interface/PixelSLinkDataInputSource.h
 
  Description: <one line class summary>
 
@@ -18,36 +19,32 @@
 //
 //
 
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 #include <vector>
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Sources/interface/ProducerSourceFromFiles.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/InputSourceMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "Utilities/StorageFactory/interface/StorageFactory.h"
-#include "Utilities/StorageFactory/interface/StorageAccount.h"
-#include "Utilities/StorageFactory/interface/Storage.h"
 #include "FWCore/PluginManager/interface/PluginManager.h"
 #include "FWCore/PluginManager/interface/standard.h"
+#include "FWCore/Sources/interface/ProducerSourceFromFiles.h"
+#include "Utilities/StorageFactory/interface/Storage.h"
+#include "Utilities/StorageFactory/interface/StorageAccount.h"
+#include "Utilities/StorageFactory/interface/StorageFactory.h"
 
 class FEDRawDataCollection;
 
 class PixelSLinkDataInputSource : public edm::ProducerSourceFromFiles {
-
 public:
-
-  explicit PixelSLinkDataInputSource(const edm::ParameterSet& pset, 
-				     const edm::InputSourceDescription& desc);
+  explicit PixelSLinkDataInputSource(const edm::ParameterSet &pset, const edm::InputSourceDescription &desc);
 
   ~PixelSLinkDataInputSource() override;
 
 private:
-
-  bool setRunAndEventInfo(edm::EventID& id, edm::TimeValue_t& time, edm::EventAuxiliary::ExperimentType&) override;
-  void produce(edm::Event& event) override;
+  bool setRunAndEventInfo(edm::EventID &id, edm::TimeValue_t &time, edm::EventAuxiliary::ExperimentType &) override;
+  void produce(edm::Event &event) override;
   uint32_t synchronizeEvents();
 
   int m_fedid;
@@ -59,7 +56,7 @@ class PixelSLinkDataInputSource : public edm::ProducerSourceFromFiles {
   uint32_t m_currenttriggernumber;
   uint32_t m_globaleventnumber;
   int32_t m_eventnumber_shift;
-  int getEventNumberFromFillWords(const std::vector<uint64_t>& data, uint32_t &totword);
+  int getEventNumberFromFillWords(const std::vector<uint64_t> &data, uint32_t &totword);
   std::unique_ptr<FEDRawDataCollection> buffers;
 };
 #endif
diff --git a/IORawData/SiPixelInputSources/src/PixelSLinkDataInputSource.cc b/IORawData/SiPixelInputSources/src/PixelSLinkDataInputSource.cc
index 609468a2636e1..fd8aaa53ad579 100644
--- a/IORawData/SiPixelInputSources/src/PixelSLinkDataInputSource.cc
+++ b/IORawData/SiPixelInputSources/src/PixelSLinkDataInputSource.cc
@@ -2,8 +2,9 @@
 //
 // Package:    SiPixelInputSources
 // Class:      PixelSLinkDataInputSource
-// 
-/**\class PixelSLinkDataInputSource PixelSLinkDataInputSource.cc IORawData/SiPixelInputSources/src/PixelSLinkDataInputSource.cc
+//
+/**\class PixelSLinkDataInputSource PixelSLinkDataInputSource.cc
+IORawData/SiPixelInputSources/src/PixelSLinkDataInputSource.cc
 
 Description: <one line class summary>
 
@@ -16,251 +17,329 @@ Description: <one line class summary>
 //
 //
 
-#include <memory>
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DataFormats/FEDRawData/interface/FEDRawData.h"
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
-#include "IORawData/SiPixelInputSources/interface/PixelSLinkDataInputSource.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "Utilities/StorageFactory/interface/StorageFactory.h"
-#include "Utilities/StorageFactory/interface/StorageAccount.h"
+#include "IORawData/SiPixelInputSources/interface/PixelSLinkDataInputSource.h"
 #include "Utilities/StorageFactory/interface/IOTypes.h"
+#include "Utilities/StorageFactory/interface/StorageAccount.h"
+#include "Utilities/StorageFactory/interface/StorageFactory.h"
 #include <iostream>
+#include <memory>
 
 using namespace edm;
 
 // function to get the trigger number from fill words
-int PixelSLinkDataInputSource::getEventNumberFromFillWords(const std::vector<uint64_t>& buffer, uint32_t & totword ){
-  // buffer validity, should already be pretty clean as this is exactly what goes into the FEDRawDataobject.
-  
-  // code copied directly from A. Ryd's fill word checker in PixelFEDInterface::PwordSlink64
-
-  int fif2cnt=0;
-  int dumcnt=0;
-  int gapcnt=0;
+int PixelSLinkDataInputSource::getEventNumberFromFillWords(const std::vector<uint64_t> &buffer, uint32_t &totword) {
+  // buffer validity, should already be pretty clean as this is exactly what
+  // goes into the FEDRawDataobject.
+
+  // code copied directly from A. Ryd's fill word checker in
+  // PixelFEDInterface::PwordSlink64
+
+  int fif2cnt = 0;
+  int dumcnt = 0;
+  int gapcnt = 0;
   uint32_t gap[9];
   uint32_t dum[9];
-  uint32_t word[2]={0,0};
-  uint32_t chan=0;
-  uint32_t roc=0;
+  uint32_t word[2] = {0, 0};
+  uint32_t chan = 0;
+  uint32_t roc = 0;
 
   const uint32_t rocmsk = 0x3e00000;
   const uint32_t chnlmsk = 0xfc000000;
-  
-  for(int jk=1;jk<9;jk++)gap[jk]=0;
-  for(int jk=1;jk<9;jk++)dum[jk]=0;
-  
-  int fifcnt=1;
-  for(size_t kk=0; kk<buffer.size(); ++kk)
+
+  for (int jk = 1; jk < 9; jk++)
+    gap[jk] = 0;
+  for (int jk = 1; jk < 9; jk++)
+    dum[jk] = 0;
+
+  int fifcnt = 1;
+  for (size_t kk = 0; kk < buffer.size(); ++kk) {
+    word[0] = (uint32_t)buffer[kk];
+    word[1] = (uint32_t)(buffer[kk] >> 32);
+
+    for (size_t iw = 0; iw < 2; iw++) {
+      chan = ((word[iw] & chnlmsk) >> 26);
+      roc = ((word[iw] & rocmsk) >> 21);
+
+      // count non-error words
+      if (roc < 25) {
+        if ((chan > 4) && (chan < 10) && (fifcnt != 2)) {
+          fif2cnt = 0;
+          fifcnt = 2;
+        }
+        if ((chan > 9) && (chan < 14) && (fifcnt != 3)) {
+          fif2cnt = 0;
+          fifcnt = 3;
+        }
+        if ((chan > 13) && (chan < 19) && (fifcnt != 4)) {
+          fif2cnt = 0;
+          fifcnt = 4;
+        }
+        if ((chan > 18) && (chan < 23) && (fifcnt != 5)) {
+          fif2cnt = 0;
+          fifcnt = 5;
+        }
+        if ((chan > 22) && (chan < 28) && (fifcnt != 6)) {
+          fif2cnt = 0;
+          fifcnt = 6;
+        }
+        if ((chan > 27) && (chan < 32) && (fifcnt != 7)) {
+          fif2cnt = 0;
+          fifcnt = 7;
+        }
+        if ((chan > 31) && (fifcnt != 8)) {
+          fif2cnt = 0;
+          fifcnt = 8;
+        }
+        fif2cnt++;
+      }
+      if (roc == 26) {
+        gap[fifcnt] = (0x1000 + (word[iw] & 0xff));
+        gapcnt++;
+      }
+
+      if ((roc == 27) && ((fif2cnt + dumcnt) < 6)) {
+        dumcnt++;
+        dum[fifcnt] = (0x1000 + (word[iw] & 0xff));
+      } else if ((roc == 27) && ((fif2cnt + dumcnt) > 6)) {
+        dumcnt = 1;
+        fif2cnt = 0;
+        fifcnt++;
+      }
+    }
+
+    // word check complete
+    if (((fif2cnt + dumcnt) == 6) && (dumcnt > 0))  // done with this fifo
+    {
+      dumcnt = 0;
+      fif2cnt = 0;
+      fifcnt++;
+    }
+    if ((gapcnt > 0) && ((dumcnt + fif2cnt) > 5))  // done with this fifo
     {
+      gapcnt = 0;
+      fifcnt++;
+      fif2cnt = 0;
+      dumcnt = 0;
+    } else if ((gapcnt > 0) && ((dumcnt + fif2cnt) < 6))
+      gapcnt = 0;
+
+  }  // end of fifo-3 word loop-see what we got!
+
+  int status = 0;
+
+  if (gap[1] > 0) {
+    totword = (gap[1] & 0xff);
+    status = 1;
+  } else if (gap[2] > 0) {
+    totword = (gap[2] & 0xff);
+    status = 1;
+  } else if (dum[1] > 0) {
+    totword = (dum[1] & 0xff);
+    status = 1;
+  } else if (dum[2] > 0) {
+    totword = (dum[2] & 0xff);
+    status = 1;
+  }
 
-      word[0] = (uint32_t) buffer[kk];
-      word[1] = (uint32_t) (buffer[kk]>>32);
-
-      for(size_t iw=0; iw<2; iw++)
-	{
-	  chan= ((word[iw]&chnlmsk)>>26);
-	  roc= ((word[iw]&rocmsk)>>21);
-
-	  //count non-error words
-	  if(roc<25){
-	    if((chan>4)&&(chan<10)&&(fifcnt!=2)) {fif2cnt=0;fifcnt=2;}
-	    if((chan>9)&&(chan<14)&&(fifcnt!=3)) {fif2cnt=0;fifcnt=3;}
-	    if((chan>13)&&(chan<19)&&(fifcnt!=4)){fif2cnt=0;fifcnt=4;}
-	    if((chan>18)&&(chan<23)&&(fifcnt!=5)){fif2cnt=0;fifcnt=5;}
-	    if((chan>22)&&(chan<28)&&(fifcnt!=6)){fif2cnt=0;fifcnt=6;}
-	    if((chan>27)&&(chan<32)&&(fifcnt!=7)){fif2cnt=0;fifcnt=7;}
-	    if((chan>31)&&(fifcnt!=8)){fif2cnt=0;fifcnt=8;} 
-	    fif2cnt++;
-	  }
-	  if(roc==26){gap[fifcnt]=(0x1000+(word[iw]&0xff));gapcnt++;}
-	  
-	  if((roc==27)&&((fif2cnt+dumcnt)<6)){dumcnt++;dum[fifcnt]=(0x1000+(word[iw]&0xff));}
-	  else if((roc==27)&&((fif2cnt+dumcnt)>6)){dumcnt=1;fif2cnt=0;fifcnt++;}
-	}
-
-      //word check complete
-      if(((fif2cnt+dumcnt)==6)&&(dumcnt>0)) //done with this fifo
-	{dumcnt=0;fif2cnt=0;fifcnt++;}
-      if((gapcnt>0)&&((dumcnt+fif2cnt)>5))//done with this fifo
-	{gapcnt=0;fifcnt++;fif2cnt=0;dumcnt=0;}
-      else if((gapcnt>0)&&((dumcnt+fif2cnt)<6)) gapcnt=0;
-
-    }//end of fifo-3 word loop-see what we got!
-
-  int status=0;
-
-  if(gap[1]>0) {totword=(gap[1]&0xff);status=1;}
-  else if(gap[2]>0){totword=(gap[2]&0xff);status=1;}
-  else if(dum[1]>0){totword=(dum[1]&0xff);status=1;}
-  else if(dum[2]>0){totword=(dum[2]&0xff);status=1;}
-
-  if(gap[3]>0) {totword=totword|((gap[3]&0xff)<<8);status=status|0x2;}
-  else if(gap[4]>0){totword=totword|((gap[4]&0xff)<<8);status=status|0x2;}
-  else if(dum[3]>0){totword=totword|((dum[3]&0xff)<<8);status=status|0x2;}
-  else if(dum[4]>0){totword=totword|((dum[4]&0xff)<<8);status=status|0x2;}
-
-  if(gap[5]>0) {totword=totword|((gap[5]&0xff)<<16);status=status|0x4;}
-  else if(gap[6]>0){totword=totword|((gap[6]&0xff)<<16);status=status|0x4;}
-  else if(dum[5]>0){totword=totword|((dum[5]&0xff)<<16);status=status|0x4;}
-  else if(dum[6]>0){totword=totword|((dum[6]&0xff)<<16);status=status|0x4;}
-
-  if(gap[7]>0){totword=totword|((gap[7]&0xff)<<24);status=status|0x8;}
-  else if(gap[8]>0){totword=totword|((gap[8]&0xff)<<24);status=status|0x8;}
-  else if(dum[7]>0){totword=totword|((dum[7]&0xff)<<24);status=status|0x8;}
-  else if(dum[8]>0){totword=totword|((dum[8]&0xff)<<24);status=status|0x8;}
-  return(status);
+  if (gap[3] > 0) {
+    totword = totword | ((gap[3] & 0xff) << 8);
+    status = status | 0x2;
+  } else if (gap[4] > 0) {
+    totword = totword | ((gap[4] & 0xff) << 8);
+    status = status | 0x2;
+  } else if (dum[3] > 0) {
+    totword = totword | ((dum[3] & 0xff) << 8);
+    status = status | 0x2;
+  } else if (dum[4] > 0) {
+    totword = totword | ((dum[4] & 0xff) << 8);
+    status = status | 0x2;
+  }
 
+  if (gap[5] > 0) {
+    totword = totword | ((gap[5] & 0xff) << 16);
+    status = status | 0x4;
+  } else if (gap[6] > 0) {
+    totword = totword | ((gap[6] & 0xff) << 16);
+    status = status | 0x4;
+  } else if (dum[5] > 0) {
+    totword = totword | ((dum[5] & 0xff) << 16);
+    status = status | 0x4;
+  } else if (dum[6] > 0) {
+    totword = totword | ((dum[6] & 0xff) << 16);
+    status = status | 0x4;
+  }
+
+  if (gap[7] > 0) {
+    totword = totword | ((gap[7] & 0xff) << 24);
+    status = status | 0x8;
+  } else if (gap[8] > 0) {
+    totword = totword | ((gap[8] & 0xff) << 24);
+    status = status | 0x8;
+  } else if (dum[7] > 0) {
+    totword = totword | ((dum[7] & 0xff) << 24);
+    status = status | 0x8;
+  } else if (dum[8] > 0) {
+    totword = totword | ((dum[8] & 0xff) << 24);
+    status = status | 0x8;
+  }
+  return (status);
 }
 
 // constructor
-PixelSLinkDataInputSource::PixelSLinkDataInputSource(const edm::ParameterSet& pset, 
-						     const edm::InputSourceDescription& desc) :
-  ProducerSourceFromFiles(pset,desc,true),
-  m_fedid(pset.getUntrackedParameter<int>("fedid")),
-  m_fileindex(0),
-  m_runnumber(pset.getUntrackedParameter<int>("runNumber",-1)),
-  m_currenteventnumber(0),
-  m_currenttriggernumber(0),
-  m_eventnumber_shift(0)
-{
+PixelSLinkDataInputSource::PixelSLinkDataInputSource(const edm::ParameterSet &pset,
+                                                     const edm::InputSourceDescription &desc)
+    : ProducerSourceFromFiles(pset, desc, true),
+      m_fedid(pset.getUntrackedParameter<int>("fedid")),
+      m_fileindex(0),
+      m_runnumber(pset.getUntrackedParameter<int>("runNumber", -1)),
+      m_currenteventnumber(0),
+      m_currenttriggernumber(0),
+      m_eventnumber_shift(0) {
   produces<FEDRawDataCollection>();
 
-  if (m_fileindex>=fileNames().size()) {
+  if (m_fileindex >= fileNames().size()) {
     edm::LogInfo("") << "no more file to read " << std::endl;
-    return;// ???
+    return;  // ???
   }
   std::string currentfilename = fileNames()[m_fileindex];
-  edm::LogInfo("") << "now examining file "<< currentfilename ;
+  edm::LogInfo("") << "now examining file " << currentfilename;
   m_fileindex++;
   // reading both castor and other ('normal'/dcap) files.
   IOOffset size = -1;
   StorageFactory::getToModify()->enableAccounting(true);
-    
-  edm::LogInfo("PixelSLinkDataInputSource") << " unsigned long int size = " << sizeof(unsigned long int) <<"\n unsigned long size = " << sizeof(unsigned long)<<"\n unsigned long long size = " << sizeof(unsigned long long) <<  "\n uint32_t size = " << sizeof(uint32_t) << "\n uint64_t size = " << sizeof(uint64_t) << std::endl;
 
-  bool exists = StorageFactory::get() -> check(currentfilename, &size);
-  
+  edm::LogInfo("PixelSLinkDataInputSource")
+      << " unsigned long int size = " << sizeof(unsigned long int)
+      << "\n unsigned long size = " << sizeof(unsigned long)
+      << "\n unsigned long long size = " << sizeof(unsigned long long) << "\n uint32_t size = " << sizeof(uint32_t)
+      << "\n uint64_t size = " << sizeof(uint64_t) << std::endl;
+
+  bool exists = StorageFactory::get()->check(currentfilename, &size);
+
   edm::LogInfo("PixelSLinkDataInputSource") << "file size " << size << std::endl;
-  
-  if(!exists){
+
+  if (!exists) {
     edm::LogInfo("") << "file " << currentfilename << " cannot be found.";
     return;
   }
   // now open the file stream:
-  storage =StorageFactory::get()->open(currentfilename);
+  storage = StorageFactory::get()->open(currentfilename);
   // (throw if storage is 0)
 
   // check run number by opening up data file...
-  
-  Storage & temp_file = *storage;
+
+  Storage &temp_file = *storage;
   //  IOSize n =
-  temp_file.read((char*)&m_data,8);
-  if((m_data >> 60) != 0x5){ 
+  temp_file.read((char *)&m_data, 8);
+  if ((m_data >> 60) != 0x5) {
     uint32_t runnum = m_data;
-    if(m_runnumber!=-1)
-      edm::LogInfo("") << "WARNING: observed run number encoded in S-Link dump. Overwriting run number as defined in .cfg file!!! Run number now set to " << runnum << " (was " << m_runnumber << ")";
-    m_runnumber=runnum;
-  } 
-  temp_file.read((char*)&m_data,8);
-  m_currenteventnumber = (m_data >> 32)&0x00ffffff ;
+    if (m_runnumber != -1)
+      edm::LogInfo("") << "WARNING: observed run number encoded in S-Link dump. Overwriting "
+                          "run number as defined in .cfg file!!! Run number now set to "
+                       << runnum << " (was " << m_runnumber << ")";
+    m_runnumber = runnum;
+  }
+  temp_file.read((char *)&m_data, 8);
+  m_currenteventnumber = (m_data >> 32) & 0x00ffffff;
 }
-    
-// destructor
-PixelSLinkDataInputSource::~PixelSLinkDataInputSource() {
 
+// destructor
+PixelSLinkDataInputSource::~PixelSLinkDataInputSource() {}
 
-}
-
-bool PixelSLinkDataInputSource::setRunAndEventInfo(edm::EventID& id, edm::TimeValue_t& time, edm::EventAuxiliary::ExperimentType&) {
-  Storage & m_file = *storage;
+bool PixelSLinkDataInputSource::setRunAndEventInfo(edm::EventID &id,
+                                                   edm::TimeValue_t &time,
+                                                   edm::EventAuxiliary::ExperimentType &) {
+  Storage &m_file = *storage;
 
   // create product (raw data)
-  buffers.reset( new FEDRawDataCollection );
-    
+  buffers.reset(new FEDRawDataCollection);
+
   //  uint32_t currenteventnumber = (m_data >> 32)&0x00ffffff;
-  uint32_t eventnumber =(m_data >> 32)&0x00ffffff ;
-  
-  do{
+  uint32_t eventnumber = (m_data >> 32) & 0x00ffffff;
+
+  do {
     std::vector<uint64_t> buffer;
-  
- 
-  
-    uint16_t count=0;
-    eventnumber = (m_data >> 32)&0x00ffffff ;
-    if(m_currenteventnumber==0)
-      m_currenteventnumber=eventnumber;
-    edm::LogInfo("PixelSLinkDataInputSource::produce()") << "**** event number = " << eventnumber << " global event number " << m_currenteventnumber << " data " << std::hex << m_data << std::dec << std::endl;
-    while ((m_data >> 60) != 0x5){
+
+    uint16_t count = 0;
+    eventnumber = (m_data >> 32) & 0x00ffffff;
+    if (m_currenteventnumber == 0)
+      m_currenteventnumber = eventnumber;
+    edm::LogInfo("PixelSLinkDataInputSource::produce()")
+        << "**** event number = " << eventnumber << " global event number " << m_currenteventnumber << " data "
+        << std::hex << m_data << std::dec << std::endl;
+    while ((m_data >> 60) != 0x5) {
       //  std::cout << std::hex << m_data << std::dec << std::endl;
-      if (count==0){
-	edm::LogWarning("") << "DATA CORRUPTION!" ;
-	edm::LogWarning("") << "Expected to find header, but read: 0x"
-			    << std::hex<<m_data<<std::dec ;
+      if (count == 0) {
+        edm::LogWarning("") << "DATA CORRUPTION!";
+        edm::LogWarning("") << "Expected to find header, but read: 0x" << std::hex << m_data << std::dec;
       }
-   
+
       count++;
-      int n=m_file.read((char*)&m_data,8);
+      int n = m_file.read((char *)&m_data, 8);
       edm::LogWarning("") << "next data " << std::hex << m_data << std::dec << std::endl;
-    
-      if (n!=8) {
-	edm::LogInfo("") << "End of input file" ;
-	return false;
+
+      if (n != 8) {
+        edm::LogInfo("") << "End of input file";
+        return false;
       }
     }
- 
 
-    if (count>0) {
-      edm::LogWarning("")<<"Had to read "<<count<<" words before finding header!"<<std::endl;
+    if (count > 0) {
+      edm::LogWarning("") << "Had to read " << count << " words before finding header!" << std::endl;
     }
 
-    if (m_fedid>-1) {
-      m_data=(m_data&0xfffffffffff000ffLL)|((m_fedid&0xfff)<<8);
+    if (m_fedid > -1) {
+      m_data = (m_data & 0xfffffffffff000ffLL) | ((m_fedid & 0xfff) << 8);
     }
 
-    uint16_t fed_id=(m_data>>8)&0xfff;
+    uint16_t fed_id = (m_data >> 8) & 0xfff;
     //   std::cout << "fed id = " << fed_id << std::endl;
     buffer.push_back(m_data);
-  
-    do{
-      m_file.read((char*)&m_data,8);
+
+    do {
+      m_file.read((char *)&m_data, 8);
       buffer.push_back(m_data);
-    }
-    while((m_data >> 60) != 0xa);
+    } while ((m_data >> 60) != 0xa);
     //  std::cout << "read " <<  buffer.size() << " long words" << std::endl;
 
-    auto rawData = std::make_unique<FEDRawData>(8*buffer.size());
+    auto rawData = std::make_unique<FEDRawData>(8 * buffer.size());
     //  FEDRawData * rawData = new FEDRawData(8*buffer.size());
-    unsigned char* dataptr=rawData->data();
+    unsigned char *dataptr = rawData->data();
 
-    for (uint16_t i=0;i<buffer.size();i++){
-      ((uint64_t *)dataptr)[i]=buffer[i];
+    for (uint16_t i = 0; i < buffer.size(); i++) {
+      ((uint64_t *)dataptr)[i] = buffer[i];
     }
-    uint32_t thetriggernumber=0;
-    int nfillwords = 0;//getEventNumberFromFillWords(buffer,thetriggernumber);
+    uint32_t thetriggernumber = 0;
+    int nfillwords = 0;  // getEventNumberFromFillWords(buffer,thetriggernumber);
 
-    if(nfillwords>0){
-      LogInfo("") << "n fill words = " << nfillwords <<  ", trigger numbers: " << thetriggernumber << "," << m_currenttriggernumber << std::endl;
+    if (nfillwords > 0) {
+      LogInfo("") << "n fill words = " << nfillwords << ", trigger numbers: " << thetriggernumber << ","
+                  << m_currenttriggernumber << std::endl;
       m_eventnumber_shift = thetriggernumber - m_currenttriggernumber;
     }
     m_currenttriggernumber = thetriggernumber;
-    FEDRawData& fedRawData = buffers->FEDData( fed_id );
-    fedRawData=*rawData;
-    
+    FEDRawData &fedRawData = buffers->FEDData(fed_id);
+    fedRawData = *rawData;
+
     // read the first data member of the next blob to check on event number
-    int n =m_file.read((char*)&m_data,8);
-    if (n==0) {
-      edm::LogInfo("") << "End of input file" ;
+    int n = m_file.read((char *)&m_data, 8);
+    if (n == 0) {
+      edm::LogInfo("") << "End of input file";
     }
-    m_currenteventnumber = (m_data >> 32)&0x00ffffff ;
-    if(m_currenteventnumber<eventnumber)
-      LogError("PixelSLinkDataInputSource") << " error, the previous event number (" << eventnumber << ") is LARGER than the next event number (" << m_currenteventnumber << ")" << std::endl;
+    m_currenteventnumber = (m_data >> 32) & 0x00ffffff;
+    if (m_currenteventnumber < eventnumber)
+      LogError("PixelSLinkDataInputSource")
+          << " error, the previous event number (" << eventnumber << ") is LARGER than the next event number ("
+          << m_currenteventnumber << ")" << std::endl;
+
+  } while (eventnumber == m_currenteventnumber);
 
-  }
-  while( eventnumber == m_currenteventnumber);
-  
   uint32_t realeventno = synchronizeEvents();
-  if(m_runnumber!=0)
+  if (m_runnumber != 0)
     id = edm::EventID(m_runnumber, id.luminosityBlock(), realeventno);
   else
     id = edm::EventID(id.run(), id.luminosityBlock(), realeventno);
@@ -268,14 +347,15 @@ bool PixelSLinkDataInputSource::setRunAndEventInfo(edm::EventID& id, edm::TimeVa
 }
 
 // produce() method. This is the worker method that is called every event.
-void PixelSLinkDataInputSource::produce(edm::Event& event) {
+void PixelSLinkDataInputSource::produce(edm::Event &event) {
   event.put(std::move(buffers));
-  buffers.reset();  
+  buffers.reset();
 }
 
-// this function sets the m_globaleventnumber quantity. It uses the m_currenteventnumber and m_currenttriggernumber values as input
-uint32_t PixelSLinkDataInputSource::synchronizeEvents(){
-  int32_t result= m_currenteventnumber -1;
-      
-  return(uint32_t) result;
+// this function sets the m_globaleventnumber quantity. It uses the
+// m_currenteventnumber and m_currenttriggernumber values as input
+uint32_t PixelSLinkDataInputSource::synchronizeEvents() {
+  int32_t result = m_currenteventnumber - 1;
+
+  return (uint32_t)result;
 }
diff --git a/IORawData/SiPixelInputSources/src/SealModule.cc b/IORawData/SiPixelInputSources/src/SealModule.cc
old mode 100755
new mode 100644
index d04e4668fdec3..f829f91764636
--- a/IORawData/SiPixelInputSources/src/SealModule.cc
+++ b/IORawData/SiPixelInputSources/src/SealModule.cc
@@ -3,5 +3,3 @@
 #include "IORawData/SiPixelInputSources/interface/PixelSLinkDataInputSource.h"
 
 DEFINE_FWK_INPUT_SOURCE(PixelSLinkDataInputSource);
-
-
diff --git a/JetMETCorrections/MinBias/BuildFile.xml b/JetMETCorrections/MinBias/BuildFile.xml
index 49be336a11e44..d65a4deaff4d2 100644
--- a/JetMETCorrections/MinBias/BuildFile.xml
+++ b/JetMETCorrections/MinBias/BuildFile.xml
@@ -1,5 +1,6 @@
 <use   name="DataFormats/HcalRecHit"/>
 <use   name="Geometry/HcalTowerAlgo"/>
 <use   name="CommonTools/UtilAlgos"/>
+<use   name="Geometry/Records"/>
 <use   name="root"/>
 <flags   EDM_PLUGIN="1"/>
diff --git a/JetMETCorrections/Type1MET/python/pfMETmultShiftCorrections_cfi.py b/JetMETCorrections/Type1MET/python/pfMETmultShiftCorrections_cfi.py
index 25b7569b46308..04d6b79962a3e 100644
--- a/JetMETCorrections/Type1MET/python/pfMETmultShiftCorrections_cfi.py
+++ b/JetMETCorrections/Type1MET/python/pfMETmultShiftCorrections_cfi.py
@@ -35,9 +35,4 @@
 
 pfMEtSysShiftCorrSequence = cms.Sequence( pfMEtMultShiftCorr )
 
-#from Configuration.StandardSequences.Eras import eras
-#eras.run2_common.toModify(pfMEtMultShiftCorr, parameters=multPhiCorrParams_Txy_25ns )
-#eras.run2_50ns_specific.toModify(pfMEtMultShiftCorr, parameters=multPhiCorrParams_Txy_50ns )
-#eras.run2_25ns_specific.toModify(pfMEtMultShiftCorr, parameters=multPhiCorrParams_Txy_25ns )
-
 
diff --git a/L1Trigger/CSCTrackFinder/src/CSCTFPtMethods.cc b/L1Trigger/CSCTrackFinder/src/CSCTFPtMethods.cc
index 0b7a74cfac9ee..3af7022997f73 100644
--- a/L1Trigger/CSCTrackFinder/src/CSCTFPtMethods.cc
+++ b/L1Trigger/CSCTrackFinder/src/CSCTFPtMethods.cc
@@ -37,13 +37,13 @@ const float CSCTFPtMethods::AkLowEta_Fit1[kME2andMB2][CSCTFPtMethods::kMaxParame
 
 const float CSCTFPtMethods::AkHighEta_Fit1[kME2andMB2][CSCTFPtMethods::kMaxParameters] = 
   {
-    //    {0.6644, -0.2312, 0.0, 0.0},			//12
-    {0.6275, -0.2133, 0.0, 0.0},			//12
+    //    {0.6644, -0.2312, 0.0, 0.0},          //12
+    {0.6275, -0.2133, 0.0, 0.0},		//12
     {-1.124, 2.492, -1.347, 0.2204},		//13
     {0.5214, -0.7536, 0.3913, -.06739},		//23
     {1.394, -1.886, 0.8809, -0.1369},		//24
     {-0.5519E-02, 0.8496E-02, 0.0, 0.0},	//34
-    {0.6644, -0.2312, 0.0, 0.0},			//12
+    {0.6644, -0.2312, 0.0, 0.0},		//12
     {0.80, -0.54, 0.0, 0.0},	    		//25
     {0.80, -0.54, 0.0, 0.0},	    		//26
   };
@@ -52,14 +52,14 @@ const float CSCTFPtMethods::AkHighEta_Fit1[kME2andMB2][CSCTFPtMethods::kMaxParam
 // The realtionship is dphi = A/Pt + B/Pt^2
 const float CSCTFPtMethods::AkLowEta_Fit2[kME2andMB2][CSCTFPtMethods::kMaxParameters] = 
   {
-    //    {-3.198, 6.703, -4.539, 1.028},			//12
-    {-0.6131, 0.6870, 0.0285, -0.1147},			//12
-    //	{-6.705, 14.52, -10.32, 2.449},			//13
+    //    {-3.198, 6.703, -4.539, 1.028},       //12
+    {-0.6131, 0.6870, 0.0285, -0.1147},		//12
+    //	{-6.705, 14.52, -10.32, 2.449},         //13
     {8.03602, -17.5355, 12.7725, -3.0616 },	//13
-    {5.765, -12.85, 9.543, -2.345},			//23
-    {-4.068, 8.254, -5.491, 1.214},			//24
+    {5.765, -12.85, 9.543, -2.345},		//23
+    {-4.068, 8.254, -5.491, 1.214},		//24
     {-.02974, .04816, -.02105, .003640},	//34
-    {-3.358, 7.038, -4.766, 1.079},			//12
+    {-3.358, 7.038, -4.766, 1.079},		//12
     {0.80, -0.54, 0.0, 0.0},	    		//25
     {0.80, -0.54, 0.0, 0.0},	    		//26
   };
diff --git a/L1Trigger/CSCTriggerPrimitives/test/CSCTPEmulator_cfg.py b/L1Trigger/CSCTriggerPrimitives/test/CSCTPEmulator_cfg.py
index 787ed94618073..a64b7a6451b02 100644
--- a/L1Trigger/CSCTriggerPrimitives/test/CSCTPEmulator_cfg.py
+++ b/L1Trigger/CSCTriggerPrimitives/test/CSCTPEmulator_cfg.py
@@ -3,9 +3,9 @@
 # Slava Valuev; October, 2006.
 
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("CSCTPEmulator", eras.Run2_2018)
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+process = cms.Process("CSCTPEmulator", Run2_2018)
 
 process.maxEvents = cms.untracked.PSet(
   input = cms.untracked.int32(10000)
diff --git a/L1Trigger/CSCTriggerPrimitives/test/CSCTriggerPrimitivesProducerTest_cfg.py b/L1Trigger/CSCTriggerPrimitives/test/CSCTriggerPrimitivesProducerTest_cfg.py
index 65c33896ae52c..9068086904eb2 100644
--- a/L1Trigger/CSCTriggerPrimitives/test/CSCTriggerPrimitivesProducerTest_cfg.py
+++ b/L1Trigger/CSCTriggerPrimitives/test/CSCTriggerPrimitivesProducerTest_cfg.py
@@ -2,9 +2,9 @@
 # Slava Valuev May-2006.
 
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("MuonCSCTriggerPrimitives", eras.Run2_2018)
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+process = cms.Process("MuonCSCTriggerPrimitives", Run2_2018)
 
 process.source = cms.Source("PoolSource",
     fileNames = cms.untracked.vstring("digis.root")
diff --git a/L1Trigger/CSCTriggerPrimitives/test/CSCTriggerPrimitivesReader_cfg.py b/L1Trigger/CSCTriggerPrimitives/test/CSCTriggerPrimitivesReader_cfg.py
index 55c6efb07df7a..cfed91492e6c2 100644
--- a/L1Trigger/CSCTriggerPrimitives/test/CSCTriggerPrimitivesReader_cfg.py
+++ b/L1Trigger/CSCTriggerPrimitives/test/CSCTriggerPrimitivesReader_cfg.py
@@ -1,12 +1,12 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
 # Hack to add "test" directory to the python path.
 import sys, os
 sys.path.insert(0, os.path.join(os.environ['CMSSW_BASE'],
                                 'src/L1Trigger/CSCTriggerPrimitives/test'))
 
-process = cms.Process("L1CSCTriggerPrimitivesReader", eras.Run2_2018)
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+process = cms.Process("L1CSCTriggerPrimitivesReader", Run2_2018)
 
 process.source = cms.Source("PoolSource",
     fileNames = cms.untracked.vstring("file:lcts.root")
diff --git a/L1Trigger/CSCTriggerPrimitives/test/runL1CSCTPEmulatorConfigAnalyzer_cfg.py b/L1Trigger/CSCTriggerPrimitives/test/runL1CSCTPEmulatorConfigAnalyzer_cfg.py
index e3f8466c23cda..776f9211b1377 100644
--- a/L1Trigger/CSCTriggerPrimitives/test/runL1CSCTPEmulatorConfigAnalyzer_cfg.py
+++ b/L1Trigger/CSCTriggerPrimitives/test/runL1CSCTPEmulatorConfigAnalyzer_cfg.py
@@ -18,9 +18,9 @@
     sys.exit(1)
 
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("TEST",eras.Run2_2018)
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+process = cms.Process("TEST",Run2_2018)
 
 process.load('Configuration.StandardSequences.GeometryDB_cff')
 process.load('L1Trigger.CSCTriggerPrimitives.cscTriggerPrimitiveDigis_cfi')
diff --git a/L1Trigger/Configuration/python/L1TDigiToRaw_cff.py b/L1Trigger/Configuration/python/L1TDigiToRaw_cff.py
index ca0b53a425e61..8ffeb9c0a546a 100644
--- a/L1Trigger/Configuration/python/L1TDigiToRaw_cff.py
+++ b/L1Trigger/Configuration/python/L1TDigiToRaw_cff.py
@@ -37,7 +37,7 @@
 l1GtPack.DaqGtInputTag = 'simGtDigis'
 l1GtPack.MuGmtInputTag = 'simGmtDigis'
 l1GtEvmPack.EvmGtInputTag = 'simGtDigis'
-L1TDigiToRaw = cms.Sequence(csctfpacker+dttfpacker+gctDigiToRaw+l1GtPack+l1GtEvmPack)
+L1TDigiToRawTask = cms.Task(csctfpacker, dttfpacker, gctDigiToRaw, l1GtPack, l1GtEvmPack)
 
 #
 # Stage-1 Trigger
@@ -47,7 +47,7 @@
 # (but still needed for RCT digis!)
 (stage1L1Trigger & ~stage2L1Trigger).toModify(gctDigiToRaw, gctInputLabel = 'simCaloStage1LegacyFormatDigis')
 from EventFilter.L1TRawToDigi.caloStage1Raw_cfi import *
-(stage1L1Trigger & ~stage2L1Trigger).toReplaceWith(L1TDigiToRaw, cms.Sequence(csctfpacker+dttfpacker+l1GtPack+caloStage1Raw))
+(stage1L1Trigger & ~stage2L1Trigger).toReplaceWith(L1TDigiToRawTask, cms.Task(csctfpacker, dttfpacker, l1GtPack, caloStage1Raw))
 
 #
 # Stage-2 Trigger
@@ -59,4 +59,6 @@
 from EventFilter.L1TRawToDigi.gmtStage2Raw_cfi import *
 from EventFilter.L1TRawToDigi.gtStage2Raw_cfi import *
 # Missing: muon EMTF
-(stage2L1Trigger).toReplaceWith(L1TDigiToRaw, cms.Sequence(caloLayer1Raw + caloStage2Raw + bmtfStage2Raw + omtfStage2Raw + gmtStage2Raw + gtStage2Raw))
+(stage2L1Trigger).toReplaceWith(L1TDigiToRawTask, cms.Task(caloLayer1Raw, caloStage2Raw, bmtfStage2Raw, omtfStage2Raw, gmtStage2Raw, gtStage2Raw))
+
+L1TDigiToRaw = cms.Sequence(L1TDigiToRawTask)
diff --git a/L1Trigger/Configuration/python/SimL1Emulator_cff.py b/L1Trigger/Configuration/python/SimL1Emulator_cff.py
index 6c569717f224c..1bd9a6634046d 100644
--- a/L1Trigger/Configuration/python/SimL1Emulator_cff.py
+++ b/L1Trigger/Configuration/python/SimL1Emulator_cff.py
@@ -37,14 +37,16 @@
 from L1Trigger.L1TGlobal.simDigis_cff import *
 
 # define a core which can be extented in customizations:
-SimL1EmulatorCore = cms.Sequence(
-    SimL1TCalorimeter +
-    SimL1TMuon +
-    SimL1TechnicalTriggers +
-    SimL1TGlobal
-    )
+SimL1EmulatorCoreTask = cms.Task(
+    SimL1TCalorimeterTask,
+    SimL1TMuonTask,
+    SimL1TechnicalTriggersTask,
+    SimL1TGlobalTask
+)
+SimL1EmulatorCore = cms.Sequence(SimL1EmulatorCoreTask)
 
-SimL1Emulator = cms.Sequence( SimL1EmulatorCore )
+SimL1EmulatorTask = cms.Task(SimL1EmulatorCoreTask)
+SimL1Emulator = cms.Sequence( SimL1EmulatorTask )
 
 # 
 # Emulators are configured from DB (GlobalTags)
@@ -58,9 +60,9 @@
 
 # Customisation for the phase2_hgcal era. Includes the HGCAL L1 trigger
 from  L1Trigger.L1THGCal.hgcalTriggerPrimitives_cff import *
-_phase2_siml1emulator = SimL1Emulator.copy()
-_phase2_siml1emulator += hgcalTriggerPrimitives
+_phase2_siml1emulator = SimL1EmulatorTask.copy()
+_phase2_siml1emulator.add(hgcalTriggerPrimitivesTask)
 
 from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
 from Configuration.Eras.Modifier_phase2_hgcalV9_cff import phase2_hgcalV9
-phase2_hgcal.toReplaceWith( SimL1Emulator , _phase2_siml1emulator )
+phase2_hgcal.toReplaceWith( SimL1EmulatorTask , _phase2_siml1emulator )
diff --git a/L1Trigger/Configuration/python/SimL1TechnicalTriggers_cff.py b/L1Trigger/Configuration/python/SimL1TechnicalTriggers_cff.py
index 7de50754eac94..aa1013eac6c8d 100644
--- a/L1Trigger/Configuration/python/SimL1TechnicalTriggers_cff.py
+++ b/L1Trigger/Configuration/python/SimL1TechnicalTriggers_cff.py
@@ -4,7 +4,8 @@
 import L1Trigger.L1TGlobal.simGtExtFakeProd_cfi
 simGtExtFakeStage2Digis = L1Trigger.L1TGlobal.simGtExtFakeProd_cfi.simGtExtFakeProd.clone()
 
-SimL1TechnicalTriggers = cms.Sequence(simGtExtFakeStage2Digis)
+SimL1TechnicalTriggersTask = cms.Task(simGtExtFakeStage2Digis)
+SimL1TechnicalTriggers = cms.Sequence(SimL1TechnicalTriggersTask)
 
 
 # BSC Technical Trigger
@@ -26,8 +27,8 @@
 simCastorTechTrigDigis = SimCalorimetry.CastorTechTrigProducer.castorTTRecord_cfi.simCastorTTRecord.clone()
 
 from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
-(~stage2L1Trigger).toReplaceWith(SimL1TechnicalTriggers, cms.Sequence(
-        simBscDigis + 
-        simRpcTechTrigDigis + 
-        simHcalTechTrigDigis +
+(~stage2L1Trigger).toReplaceWith(SimL1TechnicalTriggersTask, cms.Task(
+        simBscDigis,
+        simRpcTechTrigDigis,
+        simHcalTechTrigDigis,
         simCastorTechTrigDigis ))
diff --git a/L1Trigger/DTBti/interface/DTBtiChip.h b/L1Trigger/DTBti/interface/DTBtiChip.h
index 5065a0dc4ff85..df8926e894704 100644
--- a/L1Trigger/DTBti/interface/DTBtiChip.h
+++ b/L1Trigger/DTBti/interface/DTBtiChip.h
@@ -38,6 +38,8 @@ class DTDigi;
 // C++ Headers --
 //---------------
 #include <vector>
+#include <memory>
+#include <array>
 
 //              ---------------------
 //              -- Class Interface --
@@ -54,13 +56,15 @@ class DTBtiChip {
   DTBtiChip(DTBtiCard* card, DTTrigGeom* geom, int supl, int n, DTConfigBti* _config );
 
   //! Copy constructor
-  DTBtiChip(const DTBtiChip& bti);
+  DTBtiChip(DTBtiChip&& bti) = delete;
+  DTBtiChip(DTBtiChip const& bti) = delete;
 
   //! Destructor 
   ~DTBtiChip();
 
   //! Assignment operator
-  DTBtiChip& operator=(const DTBtiChip& bti);
+  DTBtiChip& operator=(DTBtiChip&& bti) = delete;
+  DTBtiChip& operator=(DTBtiChip const& bti) = delete;
 
   //! Add a digi to the DTBtiChip
   void add_digi(int cell, const DTDigi* digi);
@@ -69,7 +73,7 @@ class DTBtiChip {
   void add_digi_clock(int cell, int clock_digi);
 
    //! get digi vector - SV 28/XI/02
-  std::vector<const DTDigi*> get_CellDigis(int cell) { return _digis[cell];}
+  std::vector<const DTDigi*> const& get_CellDigis(int cell) const { return _digis[cell];}
 
   //! Run DTBtiChip algorithm
   void run();
@@ -79,7 +83,7 @@ class DTBtiChip {
 
   //! Add a DTBtiChip trigger
   //! (normally used by DTBtiChip itself - may be used for debugging by other classes)
-  void addTrig(int step, DTBtiTrig* btitrig);
+  void addTrig(int step, std::unique_ptr<DTBtiTrig> btitrig);
 
   // Public const methods
 
@@ -102,10 +106,10 @@ class DTBtiChip {
   int nTrig(int step) const;
 
   //  // Return the trigger vector
-  std::vector<DTBtiTrig*> trigList(int step) const;
+  std::vector<std::unique_ptr<DTBtiTrig>> const& trigList(int step) const;
 
   //! Return the requested trigger
-  DTBtiTrig* trigger(int step, unsigned n) const;
+  DTBtiTrig const* trigger(int step, unsigned n) const;
 
   //! Return the data part of the requested trigger
   DTBtiTrigData triggerData(int step, unsigned n) const;
@@ -172,20 +176,20 @@ class DTBtiChip {
   DTBtiId _id;
 
   // input data from DTDigis
-  std::vector<const DTDigi*> _digis[9];
+  std::array<std::vector<const DTDigi*>,9> _digis;
   // input data from clock digis
-  std::vector<int > _digis_clock[9];
+  std::array<std::vector<int >,9> _digis_clock;
 
   // output data (ordered by step number)
-  std::vector<DTBtiTrig*> _trigs[ DTConfig::NSTEPL - DTConfig::NSTEPF+1 ];
+  std::array<std::vector<std::unique_ptr<DTBtiTrig>>,DTConfig::NSTEPL - DTConfig::NSTEPF+1>  _trigs;
 
   // internal use variables
   int _curStep;                      // current step
-  std::vector<DTBtiHit*> _hits[9];    // current hits in cells
-  int _thisStepUsedTimes[9];         // current used times in cells (JTRIG)
-  DTBtiHit* _thisStepUsedHit[9]; // link to currently used hits
+  std::array<std::vector<DTBtiHit*>,9> _hits;    // current hits in cells
+  std::array<int,9> _thisStepUsedTimes;         // current used times in cells (JTRIG)
+  std::array<DTBtiHit*,9> _thisStepUsedHit; // link to currently used hits
   int _nStepUsedHits;                // number of currently used hits
-  float _sums[25], _difs[25];        // time sums and differences 
+  std::array<float,25> _sums, _difs;        // time sums and differences 
   float _Keq[32][6];                 // The K equations
   float _Xeq[32][2];                 // The X equations
   int _MinKAcc;                      // min K value accepted by DTBtiChip 
@@ -203,7 +207,7 @@ class DTBtiChip {
   float _KTR[32][2];                 //
   float _JTR[32][3];                 //
   int init_done;                     // initialization flag
-  int _busyStart_clock[9];            // SV - busy wire flag
+  std::array<int,9> _busyStart_clock;            // SV - busy wire flag
 
   //snap register variables
   int ST43, RE43, ST23, RE23, ST, ST2, ST3, ST4, ST5, ST7;
diff --git a/L1Trigger/DTBti/src/DTBtiCard.cc b/L1Trigger/DTBti/src/DTBtiCard.cc
index dd9187eb2d280..418ccf9326009 100755
--- a/L1Trigger/DTBti/src/DTBtiCard.cc
+++ b/L1Trigger/DTBti/src/DTBtiCard.cc
@@ -501,11 +501,12 @@ DTBtiCard::storeTrigger(DTBtiTrigData td) {
   // get the appropriate BTI
   DTBtiChip* bti = activeGetBTI(btiid.superlayer(), btiid.bti());
   // create a new trigger in the BTI
-  DTBtiTrig* trig = new DTBtiTrig(bti,td);
+  auto trig = std::make_unique<DTBtiTrig>(bti,td);
+  auto pTrig = trig.get();
   // add the trigger to the BTI
-  bti->addTrig(td.step(),trig);
+  bti->addTrig(td.step(),std::move(trig));
   // return the trigger
-  return trig;
+  return pTrig;
 }
 
 /*
diff --git a/L1Trigger/DTBti/src/DTBtiChip.cc b/L1Trigger/DTBti/src/DTBtiChip.cc
index f690925a8e8a0..6b342dc0d109b 100755
--- a/L1Trigger/DTBti/src/DTBtiChip.cc
+++ b/L1Trigger/DTBti/src/DTBtiChip.cc
@@ -59,20 +59,21 @@ DTBtiChip::DTBtiChip(DTBtiCard* card, DTTrigGeom* geom, int supl, int n, DTConfi
   }
 
   // reserve the appropriate amount of space for vectors
-  int i=0;
-  for(i=0;i<DTConfig::NSTEPL - DTConfig::NSTEPF;i++) {
-    _trigs[i].reserve(2);
+  for(auto& t: _trigs) {
+    t.reserve(2);
   }
 
-  for(i=0;i<9;i++) {
-    _digis[i].reserve(10);
-    _hits[i].reserve(10);
+  for(auto& d: _digis) {
+    d.reserve(10);
+  }
+  for(auto& h: _hits) {
+    h.reserve(10);
   }
 
   //SV wire dead time init
   int DEAD = config()->DEADpar();
-  for(int cell=1; cell<=9; cell++){
-    _busyStart_clock[cell-1] = - DEAD -1;
+  for(auto& c: _busyStart_clock) {
+    c = - DEAD -1;
   }
 
   // Identifier
@@ -85,7 +86,7 @@ DTBtiChip::DTBtiChip(DTBtiCard* card, DTTrigGeom* geom, int supl, int n, DTConfi
     _MaxKAcc = 63;
 	
 /*	   DTBtiId _id1 = DTBtiId(sid,supl,1);
-	   
+
 	   cout <<"superlayer" << _id.superlayer()<< "BTI1   " <<  _id1.bti()  << " BTICur " << _id.bti()<< endl;
 	   cout <<endl;
 	   GlobalPoint gp1 = _geom->CMSPosition(_id1);
@@ -208,59 +209,6 @@ DTBtiChip::DTBtiChip(DTBtiCard* card, DTTrigGeom* geom, int supl, int n, DTConfi
 
 }
 
-
-DTBtiChip::DTBtiChip(const DTBtiChip& bti) :
-  _geom(bti._geom), _id(bti._id),
-  _curStep(bti._curStep), _nStepUsedHits(bti._nStepUsedHits){
-
-  setSnap();
-  reSumSet();
-
-  int i=0;
-  for(i=0;i<DTConfig::NSTEPL - DTConfig::NSTEPF;i++) {
-    _trigs[i].reserve(2);
-    vector<DTBtiTrig*>::const_iterator p;
-    for(p=bti._trigs[i].begin();p<bti._trigs[i].end();p++){
-      _trigs[i].push_back(*p);
-    }
-  }
-  for(i=0;i<9;i++) {
-    _digis[i].reserve(10);
-    vector<const DTDigi*>::const_iterator p;
-    for(p=bti._digis[i].begin();p<bti._digis[i].end();p++){
-      _digis[i].push_back(*p);
-    }
-    _hits[i].reserve(10);
-    vector<DTBtiHit*>::const_iterator p1;
-    for(p1=bti._hits[i].begin();p1<bti._hits[i].end();p1++){
-      _hits[i].push_back(*p1);
-    }
-    _thisStepUsedTimes[i] = bti._thisStepUsedTimes[i];
-    _thisStepUsedHit[i] = _thisStepUsedHit[i];
-  }
-  for(i=0;i<25;i++){
-    _sums[i] = bti._sums[i];
-    _difs[i] = bti._difs[i];
-  }
-  for(i=0;i<26;i++){
-    int j = 0;
-    for(j=0;j<6;j++){
-      _Keq[i][j] = bti._Keq[i][j];
-    }
-    for(j=0;j<3;j++){
-      _JTR[i][j] = bti._JTR[i][j];
-    }
-    for(j=0;j<2;j++){
-      _Xeq[i][j] = bti._Xeq[i][j];
-      _KTR[i][j] = bti._KTR[i][j];
-    }
-  }
-  _MinKAcc = bti._MinKAcc;
-  _MaxKAcc = bti._MaxKAcc;
-
-
-
-}
 //--------------
 // Destructor --
 //--------------
@@ -268,61 +216,6 @@ DTBtiChip::~DTBtiChip(){
   clear();
 }
 
-//--------------
-// Operations --
-//--------------
-DTBtiChip& 
-DTBtiChip::operator=(const DTBtiChip& bti) {
-  if(this != &bti){
-    _geom = bti._geom;
-    _id = bti._id;
-    _curStep = bti._curStep;
-    _nStepUsedHits = bti._nStepUsedHits;
-    int i=0;
-    for(i=0;i<DTConfig::NSTEPL - DTConfig::NSTEPF;i++) {
-      _trigs[i].reserve(2);
-      vector<DTBtiTrig*>::const_iterator p;
-      for(p=bti._trigs[i].begin();p<bti._trigs[i].end();p++){
-	_trigs[i].push_back(*p);
-      }
-    }
-    for(i=0;i<9;i++) {
-      _digis[i].reserve(10);
-      vector<const DTDigi*>::const_iterator p;
-      for(p=bti._digis[i].begin();p<bti._digis[i].end();p++){
-	_digis[i].push_back(*p);
-      }
-      _hits[i].reserve(10);
-      vector<DTBtiHit*>::const_iterator p1;
-      for(p1=bti._hits[i].begin();p1<bti._hits[i].end();p1++){
-	_hits[i].push_back(*p1);
-      }
-      _thisStepUsedTimes[i] = bti._thisStepUsedTimes[i];
-      _thisStepUsedHit[i] = _thisStepUsedHit[i];
-    }
-    for(i=0;i<25;i++){
-      _sums[i] = bti._sums[i];
-      _difs[i] = bti._difs[i];
-    }
-    for(i=0;i<26;i++){
-      int j = 0;
-      for(j=0;j<6;j++){
-	_Keq[i][j] = bti._Keq[i][j];
-      }
-      for(j=0;j<3;j++){
-	_JTR[i][j] = bti._JTR[i][j];
-      }
-      for(j=0;j<2;j++){
-	_Xeq[i][j] = bti._Xeq[i][j];
-	_KTR[i][j] = bti._KTR[i][j];
-      }
-    }
-    _MinKAcc = bti._MinKAcc;
-    _MaxKAcc = bti._MaxKAcc;
-  }
-  return *this;
-}
-
 void 
 DTBtiChip::add_digi(int cell, const DTDigi* digi) {
 
@@ -390,21 +283,20 @@ int
 DTBtiChip::nCellHit() const {
   int n=0;
   int i=0;
-  for(i=0;i<9;i++) {
-    if( !_digis[i].empty() ) n++;
+  for(auto const& d: _digis) {
+    if( !d.empty() ) n++;
   }
   if(config()->debug()>2) {
     cout << n << " cells with hits found:" << endl;
   }
   if(config()->debug()>2) {
     for(i=0;i<9;i++) {
-      vector<const DTDigi*>::const_iterator p;
-      for(p=_digis[i].begin();p<_digis[i].end();p++) {
+      for(auto const&d: _digis[i]) {
         cout << "DTBtiChip # " << 
         _id.bti() << 
         " cell " << i+1;
-        cout << " --> drift time (tdc units): " << (*p)->countsTDC() << endl;
-        (*p)->print();
+        cout << " --> drift time (tdc units): " << d->countsTDC() << endl;
+        d->print();
       }
     }
   }
@@ -438,11 +330,11 @@ DTBtiChip::nCellHit() const {
 }
 
 void 
-DTBtiChip::addTrig(int step, DTBtiTrig* btitrig) { 
+DTBtiChip::addTrig(int step, std::unique_ptr<DTBtiTrig> btitrig) { 
   if(step>=DTConfig::NSTEPF&&step<=DTConfig::NSTEPL){
     if(config()->debug()>3) 
       cout << "DTBtiChip: adding trigger..." <<endl;
-    _trigs[step-DTConfig::NSTEPF].push_back(btitrig);
+    _trigs[step-DTConfig::NSTEPF].emplace_back(std::move(btitrig));
   } else {
     if(config()->debug()>3){    
       cout << "DTBtiChip::addTrig: step " << step ;
@@ -461,7 +353,7 @@ DTBtiChip::nTrig(int step) const {
   return _trigs[step-DTConfig::NSTEPF].size(); 
 }
 
-vector<DTBtiTrig*>
+vector<std::unique_ptr<DTBtiTrig>> const&
 DTBtiChip::trigList(int step) const {
   if(step<DTConfig::NSTEPF||step>DTConfig::NSTEPL){
     cout << "DTBtiChip::trigList: step out of range: " << step ;
@@ -471,7 +363,7 @@ DTBtiChip::trigList(int step) const {
   return _trigs[step-DTConfig::NSTEPF]; 
 }
 
-DTBtiTrig*
+DTBtiTrig const*
 DTBtiChip::trigger(int step, unsigned n) const {
   if(step<DTConfig::NSTEPF||step>DTConfig::NSTEPL){
     cout << "DTBtiChip::trigger: step out of range: " << step ;
@@ -483,8 +375,8 @@ DTBtiChip::trigger(int step, unsigned n) const {
     cout << " empty pointer returned!" << endl;
     return nullptr;
   }
-  vector<DTBtiTrig*>::const_iterator p = _trigs[step-DTConfig::NSTEPF].begin();
-  return (*(p+n-1));
+  auto p = _trigs[step-DTConfig::NSTEPF].begin();
+  return (*(p+n-1)).get();
 }
 
 DTBtiTrigData
@@ -499,7 +391,7 @@ DTBtiChip::triggerData(int step, unsigned n) const {
     cout << " dummy trigger returned!" << endl;
     return DTBtiTrigData();
   }
-  vector<DTBtiTrig*>::const_iterator p = _trigs[step-DTConfig::NSTEPF].begin();
+  auto p = _trigs[step-DTConfig::NSTEPF].begin();
   return (*(p+n-1))->data();
 }
 
@@ -513,8 +405,7 @@ DTBtiChip::eraseTrigger(int step, unsigned n) {
     cout << "DTBtiChip::trigger: requested trigger does not exist: " << n;
     cout << " trigger not deleted!" << endl;
   }
-  vector<DTBtiTrig*>::iterator p = _trigs[step-DTConfig::NSTEPF].begin()+n-1;
-  if(&(*p))delete (*p);
+  auto p = _trigs[step-DTConfig::NSTEPF].begin()+n-1;
   _trigs[step-DTConfig::NSTEPF].erase(p);
 }
 
@@ -523,25 +414,19 @@ DTBtiChip::clear() {
 
   if(config()->debug()>3)
     cout << "DTBtiChip::clear()" << endl;
-
-  for(int c=0;c<9;c++) {
-
-    _digis[c].clear();
-    _digis_clock[c].clear();
-
-    vector<DTBtiHit*>::iterator p;
-    for(p=_hits[c].begin();p<_hits[c].end();p++){
-      delete (*p);
-    }
-    _hits[c].clear();
+  
+  for(auto& d: _digis) {
+    d.clear();
+  }
+  for(auto& c: _digis_clock) {
+    c.clear();
+  }
+  for(auto& h: _hits) {
+    h.clear();
   }
 
-  vector<DTBtiTrig*>::iterator p1;
-  for(int is=0;is<DTConfig::NSTEPL-DTConfig::NSTEPF+1;is++){
-    for(p1=_trigs[is].begin();p1<_trigs[is].end();p1++){
-      delete (*p1);
-    }
-    _trigs[is].clear();
+  for(auto& t: _trigs) {
+    t.clear();
   }
 }
 
@@ -691,26 +576,25 @@ DTBtiChip::tick() {
   for(int cell=0;cell<9;cell++) {
 
     // decrease drift time by 12.5 ns for each hit
-    vector<DTBtiHit*>::const_iterator p;
-    for(p=_hits[cell].begin();p<_hits[cell].end();p++){
-      (*p)->stepDownTime();
+    for(auto& h: _hits[cell]) {
+      h->stepDownTime();
     }
 
     // loop on hits
     _thisStepUsedHit[cell]=nullptr;
-    for(p=_hits[cell].begin();p<_hits[cell].end();p++){
-      if       ( (*p)->isDrifting() ) { // hit is drifting
+    for(auto& h: _hits[cell]) {
+      if       ( h->isDrifting() ) { // hit is drifting
         break;                          //   --> don't consider others
-      } else if( (*p)->isInsideReg() ) {  // hit is already in registers
-	_thisStepUsedHit[cell]=(*p);
+      } else if( h->isInsideReg() ) {  // hit is already in registers
+	_thisStepUsedHit[cell]=h;
 	_nStepUsedHits++;
 	// debugging
 	if(config()->debug()>2){
-          if((*p)->curTime() != 4000)
-            cout << "DTBtiChip::tick: hit in register: time=" << (*p)->curTime();
+          if(h->curTime() != 4000)
+            cout << "DTBtiChip::tick: hit in register: time=" << h->curTime();
           else
             cout << "DTBtiChip::tick: hit in register! " << endl;
-          cout <<                           " jtrig=" << (*p)->jtrig() << endl;
+          cout <<                           " jtrig=" << h->jtrig() << endl;
 
 	}
 	// end debugging
@@ -758,7 +642,7 @@ DTBtiChip::doLTS() {
         // do LTS on nbxLTS[superlayer] following steps
         for(int js=is+1;(js<=is+nbxlts&&js<=DTConfig::NSTEPL);js++){
           if(nTrig(js)>0) { // non empty step
-            DTBtiTrig* tr = trigger(js,1);
+            DTBtiTrig const* tr = trigger(js,1);
             if( tr->code()<8 && (lts==1 || lts==3)) {
               if(config()->debug()>3)
                 cout<<"LTS: erasing trigger!"<<endl; 
@@ -768,7 +652,7 @@ DTBtiChip::doLTS() {
         }
         // do LTS on previous step
         if(is>DTConfig::NSTEPF && nTrig(is-1)>0) { // non empty step
-          DTBtiTrig* tr = trigger(is-1,1);
+          DTBtiTrig const* tr = trigger(is-1,1);
           if( tr->code()<8 && (lts==2 || lts==3) ) {
             if(config()->debug()>3)
                 cout<<"LTS: erasing trigger!"<<endl;                                
@@ -814,25 +698,25 @@ DTBtiChip::store(const int eq, const int code, const int K, const int X,
     // create a new trigger
     float Keq[6] = {KeqAB,KeqBC,KeqCD,KeqAC,KeqBD,KeqAD};
     //DTBtiTrig* trg = new DTBtiTrig(this,code,K,X,currentStep(),eq);
-    DTBtiTrig* trg = new DTBtiTrig(this,code,K,X,trig_step,eq,strobe,Keq);
+    auto trg = std::make_unique<DTBtiTrig>(this,code,K,X,trig_step,eq,strobe,Keq);
 
     // store also the digis
-    for(int c=0; c<9; c++) {
-      if(_thisStepUsedHit[c]) {
-        const DTDigi* digi = _thisStepUsedHit[c]->hitDigi();
+    for(auto& h: _thisStepUsedHit) {
+      if(h) {
+        const DTDigi* digi = h->hitDigi();
         if(digi)
           trg->addDigi(digi);
       }
     }
 
-    //addTrig(currentStep(),trg);
-    addTrig(trig_step,trg);
-
     // Debugging...
     if(config()->debug()>1)
       trg->print();
     // end debugging
     
+    //addTrig(currentStep(),trg);
+    addTrig(trig_step,std::move(trg));
+
     return 1;
   }
   else{
diff --git a/L1Trigger/DTTraco/interface/DTTracoCand.h b/L1Trigger/DTTraco/interface/DTTracoCand.h
index 2c5dba0d3adf9..a80eff2f3bbba 100644
--- a/L1Trigger/DTTraco/interface/DTTracoCand.h
+++ b/L1Trigger/DTTraco/interface/DTTracoCand.h
@@ -2,13 +2,13 @@
 //
 /**  \class DTTracoCand
  *
- *   Implementation of DTTracoChip candidate 
- * 
+ *   Implementation of DTTracoChip candidate
+ *
  *
  *
  *   \author C. Grandi, S. Vanini
  *
- *   Modifications: 
+ *   Modifications:
  *   S.V. store BtiTrig pointer instead of TrigData
  */
 //
@@ -37,86 +37,84 @@ class DTTracoChip;
 
 class DTTracoCand {
 
-  public:
-
-    /// Constructor
-    DTTracoCand() {}
-
-    /// Constructor
-    DTTracoCand(DTTracoChip* tc, const DTBtiTrigData* btitr, int pos, int step);
-
-    /// Constructor
-    DTTracoCand(const DTTracoCand& tccand);
+public:
+  /// Constructor
+  DTTracoCand() {}
 
-    /// Assignment operator
-    DTTracoCand& operator=(const DTTracoCand& tccand);
+  /// Constructor
+  DTTracoCand(DTTracoChip *tc, const DTBtiTrigData *btitr, int pos, int step);
 
-    /// Destructor 
-    ~DTTracoCand();
+  /// Constructor
+  DTTracoCand(const DTTracoCand &tccand);
 
-    /// set candidate used (unusable)
-    inline void setUsed() { _usable=0; }
+  /// Assignment operator
+  DTTracoCand &operator=(const DTTracoCand &tccand);
 
-    /// set candidate unused (usable)
-    inline void setUnused() {_usable=1; }
+  /// Destructor
+  ~DTTracoCand();
 
-    /// set quality bits for first/second track
-    void setBits(int itk);
+  /// set candidate used (unusable)
+  inline void setUsed() { _usable = 0; }
 
-    /// Return parent TRACO
-    inline DTTracoChip* Traco() const { return _traco; }
+  /// set candidate unused (usable)
+  inline void setUnused() { _usable = 1; }
 
-    /// Return associated BTI trigger
-    inline const DTBtiTrigData* BtiTrig() const { return _btitr; }
+  /// set quality bits for first/second track
+  void setBits(int itk);
 
-    /// Return Bunch crossing
-    inline int step() const { return _step; }
+  /// Return parent TRACO
+  inline DTTracoChip *Traco() const { return _traco; }
 
-    /// Return position inside TRACO
-    inline int position() const { return _position; }
+  /// Return associated BTI trigger
+  inline const DTBtiTrigData *BtiTrig() const { return _btitr; }
 
-    /// Return K-KRAD
-    inline int K() const { return _tcK; }
+  /// Return Bunch crossing
+  inline int step() const { return _step; }
 
-    /// Return local X coordinate
-    inline int X() const { return _tcX; }
+  /// Return position inside TRACO
+  inline int position() const { return _position; }
 
-    /// Check if candidate is usable
-    inline int usable() const { return _usable; }
+  /// Return K-KRAD
+  inline int K() const { return _tcK; }
 
-    /// returns true if it has smaller K w.r.t. DTTracoChip center K (sort ascend)
-    bool operator < ( const DTTracoCand& c) const { return _tcK<c._tcK; }
-    // bool operator < ( const DTTracoCand& c) const { return _dataword<c._dataword; }
+  /// Return local X coordinate
+  inline int X() const { return _tcX; }
 
-    /*
-    /// returns true if it has smaller K w.r.t. DTTracoChip center K (sort ascend)
-    inline bool closer ( const DTTracoCand& cand1, const DTTracoCand& cand2) const {
-       return cand1<cand2; 
-    }
+  /// Check if candidate is usable
+  inline int usable() const { return _usable; }
 
-    /// return true if it has larger K w.r.t. DTTracoChip center K (sort descend)
-    inline bool wider ( const DTTracoCand& cand1, const DTTracoCand& cand2) const { 
-      return cand2<cand1; 
-    }
-    */
+  /// returns true if it has smaller K w.r.t. DTTracoChip center K (sort ascend)
+  bool operator<(const DTTracoCand &c) const { return _tcK < c._tcK; }
+  // bool operator < ( const DTTracoCand& c) const { return
+  // _dataword<c._dataword; }
 
-    /// Print candidate
-    void print() const ;
+  /*
+  /// returns true if it has smaller K w.r.t. DTTracoChip center K (sort ascend)
+  inline bool closer ( const DTTracoCand& cand1, const DTTracoCand& cand2) const
+  { return cand1<cand2;
+  }
 
-  private:
+  /// return true if it has larger K w.r.t. DTTracoChip center K (sort descend)
+  inline bool wider ( const DTTracoCand& cand1, const DTTracoCand& cand2) const
+  { return cand2<cand1;
+  }
+  */
 
-    DTTracoChip* _traco;         // Parent DTTracoChip
+  /// Print candidate
+  void print() const;
 
-    const DTBtiTrigData* _btitr; // Associated BTI trigger
+private:
+  DTTracoChip *_traco; // Parent DTTracoChip
 
-    // Other variables
-    BitArray<7> _dataword; // the word on which sorting is done
-    int _step;
-    int _position;
-    int _usable;
-    int _tcX;
-    int _tcK;
+  const DTBtiTrigData *_btitr; // Associated BTI trigger
 
+  // Other variables
+  BitArray<7> _dataword; // the word on which sorting is done
+  int _step;
+  int _position;
+  int _usable;
+  int _tcX;
+  int _tcK;
 };
 
 #endif
diff --git a/L1Trigger/DTTraco/interface/DTTracoCard.h b/L1Trigger/DTTraco/interface/DTTracoCard.h
index b7e4cb45a1943..4439c3c9bd8ff 100644
--- a/L1Trigger/DTTraco/interface/DTTracoCard.h
+++ b/L1Trigger/DTTraco/interface/DTTracoCard.h
@@ -5,11 +5,11 @@
  *
  *
  *
- *   \author C. Grandi, S. Vanini 
+ *   \author C. Grandi, S. Vanini
  *
  *    Modifications:
- *   III/07 : SV configuration with DTConfigManager 
-*/
+ *   III/07 : SV configuration with DTConfigManager
+ */
 //
 //--------------------------------------------------
 #ifndef DT_TRACO_CARD_H
@@ -27,128 +27,129 @@ class DTTrigGeom;
 //----------------------
 // Base Class Headers --
 //----------------------
-#include "L1Trigger/DTUtilities/interface/DTGeomSupplier.h"
 #include "DataFormats/MuonDetId/interface/DTTracoId.h"
-#include "L1TriggerConfig/DTTPGConfig/interface/DTConfig.h"
 #include "L1Trigger/DTTraco/interface/DTTracoTrigData.h"
 #include "L1Trigger/DTUtilities/interface/DTCache.h"
-#include "L1TriggerConfig/DTTPGConfig/interface/DTConfigTraco.h"
+#include "L1Trigger/DTUtilities/interface/DTGeomSupplier.h"
+#include "L1TriggerConfig/DTTPGConfig/interface/DTConfig.h"
 #include "L1TriggerConfig/DTTPGConfig/interface/DTConfigLUTs.h"
 #include "L1TriggerConfig/DTTPGConfig/interface/DTConfigManager.h"
+#include "L1TriggerConfig/DTTPGConfig/interface/DTConfigTraco.h"
 //#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 //---------------
 // C++ Headers --
 //---------------
-#include <vector>
 #include <map>
+#include <vector>
 
 //              ---------------------
 //              -- Class Interface --
 //              ---------------------
 
-typedef std::map< int,DTTracoChip*,std::less<int> >  TRACOContainer;
+typedef std::map<int, DTTracoChip *, std::less<int>> TRACOContainer;
 typedef TRACOContainer::const_iterator TRACO_const_iter;
 typedef TRACOContainer::iterator TRACO_iter;
 
-typedef std::map<DTTracoId,DTConfigTraco> ConfTracoMap;
+typedef std::map<DTTracoId, DTConfigTraco> ConfTracoMap;
 
-typedef DTCache<DTTracoTrigData,std::vector<DTTracoTrigData> > TRACOCache;
-  
-class DTTracoCard : public TRACOCache, public DTGeomSupplier {
+typedef DTCache<DTTracoTrigData, std::vector<DTTracoTrigData>> TRACOCache;
 
-  public:
+class DTTracoCard : public TRACOCache, public DTGeomSupplier {
 
-    /// Constructor
-    //DTTracoCard(DTTrigGeom*, DTBtiCard*, DTTSTheta*,edm::ParameterSet&);
-    DTTracoCard(DTTrigGeom*, DTBtiCard*, DTTSTheta*);
+public:
+  /// Constructor
+  // DTTracoCard(DTTrigGeom*, DTBtiCard*, DTTSTheta*,edm::ParameterSet&);
+  DTTracoCard(DTTrigGeom *, DTBtiCard *, DTTSTheta *);
 
-    /// Destructor 
-    ~DTTracoCard() override;
+  /// Destructor
+  ~DTTracoCard() override;
 
-    /// Clear all traco stuff (cache & map)
-    void clearCache();
+  /// Clear all traco stuff (cache & map)
+  void clearCache();
 
-    /// Set configuration
-    void setConfig(const DTConfigManager *conf);
+  /// Set configuration
+  void setConfig(const DTConfigManager *conf);
 
-    /// Return TU debug flag
-    inline bool debug() {return _debug;}
+  /// Return TU debug flag
+  inline bool debug() { return _debug; }
 
-    /// Return TSTheta
-    inline DTTSTheta* TSTh() const { return _tstheta; }
+  /// Return TSTheta
+  inline DTTSTheta *TSTh() const { return _tstheta; }
 
-    /// Returns the required DTTracoChip. Return 0 if it doesn't exist
-    DTTracoChip* getTRACO(int n) const;
+  /// Returns the required DTTracoChip. Return 0 if it doesn't exist
+  DTTracoChip *getTRACO(int n) const;
 
-    /// Returns the required DTTracoChip. Return 0 if it doesn't exist
-    DTTracoChip* getTRACO(const DTTracoId& tracoid) const {
-      return getTRACO(tracoid.traco());
-    }
+  /// Returns the required DTTracoChip. Return 0 if it doesn't exist
+  DTTracoChip *getTRACO(const DTTracoId &tracoid) const {
+    return getTRACO(tracoid.traco());
+  }
 
-    /// Returns the active TRACO list
-    std::vector<DTTracoChip*> tracoList();
+  /// Returns the active TRACO list
+  std::vector<DTTracoChip *> tracoList();
 
-    /**
-     * Returns a DTTracoTrig corresponding to a DTTracoTrigData.
-     * Creates the corresponding TRACO chip if needed and stores the trigger
-     */
-    DTTracoTrig* storeTrigger(DTTracoTrigData);
+  /**
+   * Returns a DTTracoTrig corresponding to a DTTracoTrigData.
+   * Creates the corresponding TRACO chip if needed and stores the trigger
+   */
+  DTTracoTrig *storeTrigger(DTTracoTrigData);
 
-    /// NEWGEO Local position in chamber of a trigger-data object
-    LocalPoint localPosition(const DTTrigData*) const override;
+  /// NEWGEO Local position in chamber of a trigger-data object
+  LocalPoint localPosition(const DTTrigData *) const override;
 
-    /// NEWGEO Local direction in chamber of a trigger-data object
-    LocalVector localDirection(const DTTrigData*) const override;
-    
-    /// Load BTIs triggers and run TRACOs algorithm
-    void reconstruct() override { clearCache(); loadTRACO(); runTRACO(); }
+  /// NEWGEO Local direction in chamber of a trigger-data object
+  LocalVector localDirection(const DTTrigData *) const override;
 
-    /// Return LUTS config for this chamber (=minicrate)
-    const DTConfigLUTs* config_luts() const { return _conf_luts; } 
+  /// Load BTIs triggers and run TRACOs algorithm
+  void reconstruct() override {
+    clearCache();
+    loadTRACO();
+    runTRACO();
+  }
 
-   /// Return acceptance flag
-   inline bool useAcceptParamFlag() { return _flag_acc; } 
+  /// Return LUTS config for this chamber (=minicrate)
+  const DTConfigLUTs *config_luts() const { return _conf_luts; }
 
-   /// Return lut computation option (DB/geometry)
-   inline bool lutFromDBFlag() { return _lut_from_db; }
+  /// Return acceptance flag
+  inline bool useAcceptParamFlag() { return _flag_acc; }
 
-  private:
+  /// Return lut computation option (DB/geometry)
+  inline bool lutFromDBFlag() { return _lut_from_db; }
 
-    /// store BTI triggers in TRACO's
-    void loadTRACO();
+private:
+  /// store BTI triggers in TRACO's
+  void loadTRACO();
 
-    /// run TRACO algorithm
-    void runTRACO();
+  /// run TRACO algorithm
+  void runTRACO();
 
-    /// Returns the required DTTracoChip. Create it if it doesn't exist
-    DTTracoChip* activeGetTRACO(int);
+  /// Returns the required DTTracoChip. Create it if it doesn't exist
+  DTTracoChip *activeGetTRACO(int);
 
-    /// Returns the required DTTracoChip. Create it if it doesn't exist
-    DTTracoChip* activeGetTRACO(const DTTracoId& tracoid) {
-      return activeGetTRACO(tracoid.traco());
-    }
+  /// Returns the required DTTracoChip. Create it if it doesn't exist
+  DTTracoChip *activeGetTRACO(const DTTracoId &tracoid) {
+    return activeGetTRACO(tracoid.traco());
+  }
 
-    /// clear the TRACO map
-    void localClear();
+  /// clear the TRACO map
+  void localClear();
 
-    /// Return single TRACO config
-    DTConfigTraco* config_traco(const DTTracoId& tracoid) const; 
+  /// Return single TRACO config
+  DTConfigTraco *config_traco(const DTTracoId &tracoid) const;
 
-  private:
+private:
+  DTBtiCard *_bticard;
+  DTTSTheta *_tstheta;
 
-    DTBtiCard* _bticard;
-    DTTSTheta* _tstheta;
+  TRACOContainer _tracomap;
+  ConfTracoMap _conf_traco_map; // bti configuration map for this chamber
 
-    TRACOContainer _tracomap;
-    ConfTracoMap _conf_traco_map;	//bti configuration map for this chamber
+  const DTConfigLUTs *_conf_luts;
 
-    const DTConfigLUTs* _conf_luts;
-    
-    bool _debug;
+  bool _debug;
 
-    bool _flag_acc;
-    bool _lut_from_db;
+  bool _flag_acc;
+  bool _lut_from_db;
 };
 
 #endif
diff --git a/L1Trigger/DTTraco/interface/DTTracoChip.h b/L1Trigger/DTTraco/interface/DTTracoChip.h
index 82897569d7617..dd3cbf4548bfc 100644
--- a/L1Trigger/DTTraco/interface/DTTracoChip.h
+++ b/L1Trigger/DTTraco/interface/DTTracoChip.h
@@ -4,9 +4,9 @@
  *
  *   Implementation of TRACO trigger algorithm.
  *   Internally uses DTTracoCand to store BTI triggers
- * 
- * 
- * 
+ *
+ *
+ *
  *   \author S. Vanini
  */
 //
@@ -17,9 +17,9 @@
 //-------------------
 // Constants file  --
 //-------------------
-#include "L1TriggerConfig/DTTPGConfig/interface/DTConfig.h"
-#include "L1Trigger/DTBti/interface/DTBtiTrigData.h" 
+#include "L1Trigger/DTBti/interface/DTBtiTrigData.h"
 #include "L1Trigger/DTTraco/interface/Lut.h"
+#include "L1TriggerConfig/DTTPGConfig/interface/DTConfig.h"
 
 //------------------------------------
 // Collaborating Class Declarations --
@@ -52,177 +52,180 @@ class DTTracoTrigData;
 
 class DTTracoChip {
 
-  public:
+public:
+  /// Constructor
+  // DTTracoChip(DTTracoCard* card, int n);
 
-    /// Constructor
-    //DTTracoChip(DTTracoCard* card, int n);
+  /// Constructor for passing configuration
+  DTTracoChip(DTTracoCard *card, int n, DTConfigTraco *config);
 
-    /// Constructor for passing configuration
-    DTTracoChip(DTTracoCard* card, int n, DTConfigTraco* config);
+  /// Copy constructor
+  DTTracoChip(const DTTracoChip &traco);
 
-    /// Copy constructor
-    DTTracoChip(const DTTracoChip& traco);
-  
-    /// Destructor 
-    ~DTTracoChip();
+  /// Destructor
+  ~DTTracoChip();
 
-    /// Assignment operator
-    DTTracoChip& operator=(const DTTracoChip& traco);
+  /// Assignment operator
+  DTTracoChip &operator=(const DTTracoChip &traco);
 
-    /// Add a BTI trigger to the TRACO
-    void add_btiT(int step, int pos, const DTBtiTrigData* btitrig);
+  /// Add a BTI trigger to the TRACO
+  void add_btiT(int step, int pos, const DTBtiTrigData *btitrig);
 
-    /// Add a TRACO trigger
-    void addTrig(int step, DTTracoTrig*);
+  /// Add a TRACO trigger
+  void addTrig(int step, DTTracoTrig *);
 
-    /// Set the preview values for a TRACO trigger
-    void setPV(int step, int ntrk, int code, int K);
+  /// Set the preview values for a TRACO trigger
+  void setPV(int step, int ntrk, int code, int K);
 
-    /// Calculate trigger angles
-    void calculateAngles(DTTracoTrig*);
+  /// Calculate trigger angles
+  void calculateAngles(DTTracoTrig *);
 
-    /// Run TRACO algorithm
-    void run();
+  /// Run TRACO algorithm
+  void run();
 
-    /// Clear
-    void clear();
+  /// Clear
+  void clear();
 
-    /// Return TRACO number
-    inline int number() const { return _id.traco(); }
+  /// Return TRACO number
+  inline int number() const { return _id.traco(); }
 
-    /// raise overlap flag
-    void raiseOverlap(int step);
+  /// raise overlap flag
+  void raiseOverlap(int step);
 
-    /// Return trigger geometry
-    inline DTTrigGeom* geom() const { return _geom; }
+  /// Return trigger geometry
+  inline DTTrigGeom *geom() const { return _geom; }
 
-    /// Return TRACO id
-    inline DTTracoId id() const { return _id; }
+  /// Return TRACO id
+  inline DTTracoId id() const { return _id; }
 
-    /// Return wheel number
-    inline int wheel() const { return _geom->wheel(); }
+  /// Return wheel number
+  inline int wheel() const { return _geom->wheel(); }
 
-    /// Return station number
-    inline int station() const { return _geom->station(); }
+  /// Return station number
+  inline int station() const { return _geom->station(); }
 
-    /// Return sector number
-    inline int sector() const { return _geom->sector(); }
+  /// Return sector number
+  inline int sector() const { return _geom->sector(); }
 
-    /// Configuration set
-    //inline DTConfig* config() const { return _geom->config(); }
+  /// Configuration set
+  // inline DTConfig* config() const { return _geom->config(); }
 
-    /// New Configuration set
-    inline DTConfigTraco* config() const { return _config; }
+  /// New Configuration set
+  inline DTConfigTraco *config() const { return _config; }
 
-    /// Radial angle of correlator center in mrad referred to plane sl
-    float psiRad(int sl=0) const;
+  /// Radial angle of correlator center in mrad referred to plane sl
+  float psiRad(int sl = 0) const;
 
-    /// K par of the radial angle of corr center referred to plane sl
-    int KRad() const;
-    //int KRad(int sl=0) const;
+  /// K par of the radial angle of corr center referred to plane sl
+  int KRad() const;
+  // int KRad(int sl=0) const;
 
-    /// BTIC parameter 
-    int BTIC() const { return _btic; }
-  
-    /// IBTIOFF parameter
-    int IBTIOFF() const { return _ibtioff; }
+  /// BTIC parameter
+  int BTIC() const { return _btic; }
 
-    /// DD parameter
-    int DD() const { return _dd; }
+  /// IBTIOFF parameter
+  int IBTIOFF() const { return _ibtioff; }
 
-    /// Return the number of trigger candidates
-    int nTrig(int step) const;
+  /// DD parameter
+  int DD() const { return _dd; }
 
-    /// Return the requested trigger
-    DTTracoTrig* trigger(int step, unsigned n) const;
+  /// Return the number of trigger candidates
+  int nTrig(int step) const;
 
-    /// Return the data part of the requested trigger
-    DTTracoTrigData triggerData(int step, unsigned n) const;
+  /// Return the requested trigger
+  DTTracoTrig *trigger(int step, unsigned n) const;
 
-    /// a flag for a usable second track
-    int useSecondTrack(int step) const;
+  /// Return the data part of the requested trigger
+  DTTracoTrigData triggerData(int step, unsigned n) const;
 
-    /// flags for HTRIG in edge BTI
-    int edgeBTI(int step, int io, int lr) const;
+  /// a flag for a usable second track
+  int useSecondTrack(int step) const;
 
-    /// Position in chamber frame
-    LocalPoint localPosition() const { return _geom->localPosition(_id); }
+  /// flags for HTRIG in edge BTI
+  int edgeBTI(int step, int io, int lr) const;
 
-    /// Position in CMS frame
-    GlobalPoint CMSPosition() const { return _geom->CMSPosition(_id); }
+  /// Position in chamber frame
+  LocalPoint localPosition() const { return _geom->localPosition(_id); }
 
-    /// Set flags for multiple trigger detection between cons. TRACO's
-    void setFlag(int step,int ext=0);
+  /// Position in CMS frame
+  GlobalPoint CMSPosition() const { return _geom->CMSPosition(_id); }
 
-    /// return overlap flag
-    inline int ovlFlag(int step) {
-      return _flag[step-DTConfigTraco::NSTEPF].element(1);}
+  /// Set flags for multiple trigger detection between cons. TRACO's
+  void setFlag(int step, int ext = 0);
 
-  private:
+  /// return overlap flag
+  inline int ovlFlag(int step) {
+    return _flag[step - DTConfigTraco::NSTEPF].element(1);
+  }
 
-    /// Get the best inner/outer candidate
-    DTTracoCand* bestCand(int itk, std::vector<DTTracoCand> & tclist);
+private:
+  /// Get the best inner/outer candidate
+  DTTracoCand *bestCand(int itk, std::vector<DTTracoCand> &tclist);
 
-    /// Set the preview for a trigger
-    DTTracoTrig* setPV(int itk, DTTracoCand* inner, DTTracoCand* outer);
+  /// Set the preview for a trigger
+  DTTracoTrig *setPV(int itk, DTTracoCand *inner, DTTracoCand *outer);
 
-    /// Do suppression of LTRIG on BTI close to selected HTRIG
-    void DoAdjBtiLts(DTTracoCand* candidate, std::vector<DTTracoCand> & tclist);
+  /// Do suppression of LTRIG on BTI close to selected HTRIG
+  void DoAdjBtiLts(DTTracoCand *candidate, std::vector<DTTracoCand> &tclist);
 
-    /// Do suppression of LTRIG on adjacent TRACO
-    int AdjBtiLTSuppressed(DTTracoCand* candidate);
+  /// Do suppression of LTRIG on adjacent TRACO
+  int AdjBtiLTSuppressed(DTTracoCand *candidate);
 
-    /// Check correlation and store correlated trigger
-    int storeCorr(DTTracoTrig* tctrig, DTTracoCand* inner, DTTracoCand* outer, int tkn);
+  /// Check correlation and store correlated trigger
+  int storeCorr(DTTracoTrig *tctrig, DTTracoCand *inner, DTTracoCand *outer,
+                int tkn);
 
-    /// Store uncorrelated trigger
-    int storeUncorr(DTTracoTrig* tctrig, DTTracoCand* inner, DTTracoCand* outer, int tkn);
+  /// Store uncorrelated trigger
+  int storeUncorr(DTTracoTrig *tctrig, DTTracoCand *inner, DTTracoCand *outer,
+                  int tkn);
 
-    /// Check if a trigger is inside the angular acceptance window
-    int insideAngWindow(DTTracoTrig* ) const;
+  /// Check if a trigger is inside the angular acceptance window
+  int insideAngWindow(DTTracoTrig *) const;
 
-    /// Compute traco chip acceptances
-    void setTracoAcceptances();
+  /// Compute traco chip acceptances
+  void setTracoAcceptances();
 
-  private:
-    // identification
-    DTTrigGeom* _geom;
-    DTTracoId _id;
-    // parent card
-    DTTracoCard* _card;
-    //config
-    DTConfigTraco* _config;
+private:
+  // identification
+  DTTrigGeom *_geom;
+  DTTracoId _id;
+  // parent card
+  DTTracoCard *_card;
+  // config
+  DTConfigTraco *_config;
 
-    int _krad;
-    int _btic;
-    int _ibtioff;
-    int _dd;
+  int _krad;
+  int _btic;
+  int _ibtioff;
+  int _dd;
 
-    // input data
-    std::vector<DTTracoCand> _innerCand[DTConfigTraco::NSTEPL-DTConfigTraco::NSTEPF+1];
-    std::vector<DTTracoCand> _outerCand[DTConfigTraco::NSTEPL-DTConfigTraco::NSTEPF+1];
+  // input data
+  std::vector<DTTracoCand>
+      _innerCand[DTConfigTraco::NSTEPL - DTConfigTraco::NSTEPF + 1];
+  std::vector<DTTracoCand>
+      _outerCand[DTConfigTraco::NSTEPL - DTConfigTraco::NSTEPF + 1];
 
-    // output data
-    std::vector<DTTracoTrig*> _tracotrig[DTConfigTraco::NSTEPL-DTConfigTraco::NSTEPF+1];
+  // output data
+  std::vector<DTTracoTrig *>
+      _tracotrig[DTConfigTraco::NSTEPL - DTConfigTraco::NSTEPF + 1];
 
-    // internal use variables: SV 11V04 lts suppression if to bx+1, bx=array index
-    BitArray<DTConfigTraco::NSTEPL+2> _bxlts;
-    // *** FOR TESTBEAM DATA  *** SV from input data instead from card! 
-    // 1: overlap with II track from bx-1)
-    // 2: II track rej.
-    // 3...8: IL,IR,OL,OR,th,th
-    // 9: H present in traco at bx
-    BitArray<32> _flag[DTConfigTraco::NSTEPL-DTConfigTraco::NSTEPF+1]; 
+  // internal use variables: SV 11V04 lts suppression if to bx+1, bx=array index
+  BitArray<DTConfigTraco::NSTEPL + 2> _bxlts;
+  // *** FOR TESTBEAM DATA  *** SV from input data instead from card!
+  // 1: overlap with II track from bx-1)
+  // 2: II track rej.
+  // 3...8: IL,IR,OL,OR,th,th
+  // 9: H present in traco at bx
+  BitArray<32> _flag[DTConfigTraco::NSTEPL - DTConfigTraco::NSTEPF + 1];
 
-    // psi acceptance of correlator MT ports
-    int _PSIMIN[4*DTConfig::NBTITC];
-    int _PSIMAX[4*DTConfig::NBTITC];
+  // psi acceptance of correlator MT ports
+  int _PSIMIN[4 * DTConfig::NBTITC];
+  int _PSIMAX[4 * DTConfig::NBTITC];
 
-    // LUT file class
-    DTTracoLUTs* _luts;
-    
-    Lut* _lutsCCB;
+  // LUT file class
+  DTTracoLUTs *_luts;
 
+  Lut *_lutsCCB;
 };
 
 #endif
diff --git a/L1Trigger/DTTraco/interface/DTTracoLUTs.h b/L1Trigger/DTTraco/interface/DTTracoLUTs.h
index 86bbf3b11bed1..611db0d991253 100644
--- a/L1Trigger/DTTraco/interface/DTTracoLUTs.h
+++ b/L1Trigger/DTTraco/interface/DTTracoLUTs.h
@@ -17,59 +17,56 @@
 // C++ Headers --
 //---------------
 
+#include <string>
 #include <vector>
-#include <string> 
 
 //------------------------------------
 // Collaborating Class Declarations --
 //------------------------------------
 
-
 //              ---------------------
 //              -- Class Interface --
 //              ---------------------
 
 typedef std::vector<unsigned short int> LUT;
 
-class DTTracoLUTs{
+class DTTracoLUTs {
 
-  public:
-//    typedef static std::vector<unsigned short int> LUT;
- 
-    /// constructor
-    DTTracoLUTs(std::string filename);
+public:
+  //    typedef static std::vector<unsigned short int> LUT;
 
-    /// destructor
-    virtual ~DTTracoLUTs();
+  /// constructor
+  DTTracoLUTs(std::string filename);
 
-    /// reset look-up tables
-    void reset();
-    
-    /// load look-up tables
-    int load();
+  /// destructor
+  virtual ~DTTracoLUTs();
 
-    /// print look-up tables
-    void print() const;
+  /// reset look-up tables
+  void reset();
 
-    /// get radial angle from traco position and flag: 0=outer, 1=inner, 2=correl.
-    unsigned short int getPhiRad(int pos, int qualflag) const;
+  /// load look-up tables
+  int load();
 
-    /// get psi angle from traco k parameter
-    unsigned short int getPsi(int ang) const;
+  /// print look-up tables
+  void print() const;
 
-    /// return bending angle from pos and ang
-    unsigned short int getBendAng(int pos, int ang, int qualflag) const;
+  /// get radial angle from traco position and flag: 0=outer, 1=inner, 2=correl.
+  unsigned short int getPhiRad(int pos, int qualflag) const;
 
-    /// return number of entries in the LUT
-    inline int size_psiLUT() const { return psi_lut.size(); }
-    inline int size_phiLUT(int i) const { return phi_lut[i].size(); }
+  /// get psi angle from traco k parameter
+  unsigned short int getPsi(int ang) const;
 
-  private:
+  /// return bending angle from pos and ang
+  unsigned short int getBendAng(int pos, int ang, int qualflag) const;
 
-    LUT phi_lut[3];  // phi rad: elem.0: inner; elem.1: outer; elem.2: corr.
-    LUT psi_lut;     // psi 
-    std::string _testfile;
+  /// return number of entries in the LUT
+  inline int size_psiLUT() const { return psi_lut.size(); }
+  inline int size_phiLUT(int i) const { return phi_lut[i].size(); }
 
+private:
+  LUT phi_lut[3]; // phi rad: elem.0: inner; elem.1: outer; elem.2: corr.
+  LUT psi_lut;    // psi
+  std::string _testfile;
 };
 
 #endif
diff --git a/L1Trigger/DTTraco/interface/DTTracoTrig.h b/L1Trigger/DTTraco/interface/DTTracoTrig.h
index c62b586d9d00a..a2ab711bfe30e 100644
--- a/L1Trigger/DTTraco/interface/DTTracoTrig.h
+++ b/L1Trigger/DTTraco/interface/DTTracoTrig.h
@@ -24,9 +24,9 @@ class DTTracoChip;
 //----------------------
 // Base Class Headers --
 //----------------------
-#include "L1Trigger/DTUtilities/interface/DTTrigData.h"
 #include "L1Trigger/DTBti/interface/DTBtiTrig.h"
 #include "L1Trigger/DTTraco/interface/DTTracoTrigData.h"
+#include "L1Trigger/DTUtilities/interface/DTTrigData.h"
 
 //---------------
 // C++ Headers --
@@ -39,231 +39,157 @@ class DTTracoChip;
 
 class DTTracoTrig : public DTTrigData {
 
-  public:
-
-    /// Constructors
-    DTTracoTrig();
-
-    /// Constructors
-    DTTracoTrig(DTTracoChip*, int);
-
-    /// Constructors
-    DTTracoTrig(DTTracoChip*, DTTracoTrigData) ;
-  
-    /// Destructor 
-    ~DTTracoTrig() override;
-
-    /// Set the parent TRACO
-    inline void setParent(DTTracoChip* parent) { 
-      _tparent = parent; 
-    }  
-
-    /// Add a BTI trigger to the list
-    inline void addDTBtiTrig(const DTBtiTrigData* btitrig) {
-      _btitrig.push_back(btitrig); 
-    }
-
-    /// Set trigger preview parameters
-    inline void setPV(int first, int code, int K, int io) { 
-      _data.setPV(first,code,K,io); 
-    }
-  
-    /// Set trigger preview correlation bit
-    inline void setPVCorr(int ic) { 
-      _data.setPVCorr(ic); 
-    }
-  
-    /// Set trigger code, inner segment
-    inline void setCodeIn(int code) {
-      _data.setCodeIn(code);
-    }
-
-    /// Set trigger code, outer segment
-    inline void setCodeOut(int code) {
-      _data.setCodeOut(code);
-    }
-  
-    /// Set position of segments, inner
-    inline void setPosIn(int pos) {
-      _data.setPosIn(pos);
-    }
-  
-    /// Set position of segments, outer
-    inline void setPosOut(int pos) {
-      _data.setPosOut(pos);
-    }
- 
-    /// Set bti trigger equation of segments, inner
-    inline void setEqIn(int eq) {
-      _data.setEqIn(eq);
-    }
-  
-    /// Set bti trigger equation of segments, outer
-    inline void setEqOut(int eq) {
-      _data.setEqOut(eq);
-    }
- 
-    /// Set trigger K parameter
-    inline void setK(int k) {
-      _data.setK(k);
-    }
-  
-    /// Set trigger X parameter
-    inline void setX(int x) {
-      _data.setX(x);
-    }
-  
-    /// Set trigger angles
-    inline void setAngles(int psi, int psir, int dpsir) {
-      _data.setAngles(psi,psir,dpsir);
-    }
-  
-    /// Reset all variables but preview
-    inline void resetVar() {
-      _data.resetVar();
-    }
-  
-    /// Reset preview variables
-    inline void resetPV() {
-      _data.resetPV();
-    }
-  
-    /// Clear
-    inline void clear() {
-      _data.clear();
-      _btitrig.clear();
-    }
-  
-    /// Return chamber identifier
-    inline DTChamberId ChamberId() const override {
-      return _data.ChamberId(); 
-    }
-
-    /// Print
-    inline void print() const override { 
-      _data.print();
-    }
-
-    /// Return parent TRACO pointer
-    inline DTTracoChip* tParent() const { 
-      return _tparent; 
-    }
-  
-    /// Return the data part
-    inline DTTracoTrigData data() const {
-      return _data;
-    }
-
-    /// Return parent TRACO number
-    inline int tracoNumber() const { 
-      return _data.tracoNumber(); 
-    }
-
-    /// Return step
-    inline int step() const { 
-      return _data.step(); 
-    }
-  
-    /// Return trigger code
-    inline int code() const { 
-      return _data.code(); 
-    }
-  
-    /// Return correlator output code (position of segments)
-    inline int posMask() const { 
-      return _data.posMask(); 
-    }
-  
-    /// Return the position of inner segment
-    inline int posIn() const { 
-      return _data.posIn(); 
-    }
-  
-    /// Return the position of outer segment
-    inline int posOut() const { 
-      return _data.posOut(); 
-    }
-
-    /// Return bti trigger equation of segments, inner
-    inline int eqIn() {
-      return _data.eqIn();
-    }
-  
-    /// Return bti trigger equation of segments, outer
-    inline int eqOut() {
-      return _data.eqOut();
-    }
- 
-    /// Return non 0 if the track is a first track
-    inline int isFirst() const {
-      return _data.isFirst();
-    }
-
-    /// Return the preview code
-    inline int pvCode() const { 
-      return _data.pvCode(); 
-    }
-  
-    /// Return the preview K
-    inline int pvK() const { 
-      return _data.pvK(); 
-    }
-  
-    /// Return the preview correaltion bit
-    inline int pvCorr() const { 
-      return _data.pvCorr(); 
-    }
-  
-    /// Return trigger K parameter
-    inline int K() const { 
-      return _data.K(); 
-    }
-  
-    /// Return trigger X parameter
-    inline int X() const { 
-      return _data.X(); 
-    }
-  
-    /// Return trigger K parameter converted to angle
-    inline int psi() const { 
-      return _data.psi(); 
-    }
-  
-    /// Return trigger X parameter converted to angle
-    inline int psiR() const { 
-      return _data.psiR(); 
-    }
-  
-    /// Return DeltaPsiR
-    inline int DeltaPsiR() const {
-      return _data.DeltaPsiR(); 
-    }
-  
-    /// Return the trigger code in new format
-    inline int qdec() const { 
-      return _data.qdec(); 
-    }
-
-    /// Return the BTI Triggers list
-      std::vector<const DTBtiTrigData*> btiTrigList() const { 
-      return _btitrig; 
-    }
-
-    /// comparison operator
-    bool operator == (const DTTracoTrig &) const;
-
-
-  private:
-
-    // parent TRACO
-    DTTracoChip* _tparent;
-
-    // Trigger data component
-    DTTracoTrigData _data;
-
-    // vector of BTI triggers which produce the DTTracoChip trigger (1 or 2)
-	std::vector<const DTBtiTrigData*> _btitrig;
+public:
+  /// Constructors
+  DTTracoTrig();
+
+  /// Constructors
+  DTTracoTrig(DTTracoChip *, int);
+
+  /// Constructors
+  DTTracoTrig(DTTracoChip *, DTTracoTrigData);
+
+  /// Destructor
+  ~DTTracoTrig() override;
+
+  /// Set the parent TRACO
+  inline void setParent(DTTracoChip *parent) { _tparent = parent; }
+
+  /// Add a BTI trigger to the list
+  inline void addDTBtiTrig(const DTBtiTrigData *btitrig) {
+    _btitrig.push_back(btitrig);
+  }
+
+  /// Set trigger preview parameters
+  inline void setPV(int first, int code, int K, int io) {
+    _data.setPV(first, code, K, io);
+  }
+
+  /// Set trigger preview correlation bit
+  inline void setPVCorr(int ic) { _data.setPVCorr(ic); }
+
+  /// Set trigger code, inner segment
+  inline void setCodeIn(int code) { _data.setCodeIn(code); }
+
+  /// Set trigger code, outer segment
+  inline void setCodeOut(int code) { _data.setCodeOut(code); }
+
+  /// Set position of segments, inner
+  inline void setPosIn(int pos) { _data.setPosIn(pos); }
+
+  /// Set position of segments, outer
+  inline void setPosOut(int pos) { _data.setPosOut(pos); }
+
+  /// Set bti trigger equation of segments, inner
+  inline void setEqIn(int eq) { _data.setEqIn(eq); }
+
+  /// Set bti trigger equation of segments, outer
+  inline void setEqOut(int eq) { _data.setEqOut(eq); }
+
+  /// Set trigger K parameter
+  inline void setK(int k) { _data.setK(k); }
+
+  /// Set trigger X parameter
+  inline void setX(int x) { _data.setX(x); }
+
+  /// Set trigger angles
+  inline void setAngles(int psi, int psir, int dpsir) {
+    _data.setAngles(psi, psir, dpsir);
+  }
+
+  /// Reset all variables but preview
+  inline void resetVar() { _data.resetVar(); }
+
+  /// Reset preview variables
+  inline void resetPV() { _data.resetPV(); }
+
+  /// Clear
+  inline void clear() {
+    _data.clear();
+    _btitrig.clear();
+  }
+
+  /// Return chamber identifier
+  inline DTChamberId ChamberId() const override { return _data.ChamberId(); }
+
+  /// Print
+  inline void print() const override { _data.print(); }
+
+  /// Return parent TRACO pointer
+  inline DTTracoChip *tParent() const { return _tparent; }
+
+  /// Return the data part
+  inline DTTracoTrigData data() const { return _data; }
+
+  /// Return parent TRACO number
+  inline int tracoNumber() const { return _data.tracoNumber(); }
+
+  /// Return step
+  inline int step() const { return _data.step(); }
+
+  /// Return trigger code
+  inline int code() const { return _data.code(); }
+
+  /// Return correlator output code (position of segments)
+  inline int posMask() const { return _data.posMask(); }
+
+  /// Return the position of inner segment
+  inline int posIn() const { return _data.posIn(); }
+
+  /// Return the position of outer segment
+  inline int posOut() const { return _data.posOut(); }
+
+  /// Return bti trigger equation of segments, inner
+  inline int eqIn() { return _data.eqIn(); }
+
+  /// Return bti trigger equation of segments, outer
+  inline int eqOut() { return _data.eqOut(); }
+
+  /// Return non 0 if the track is a first track
+  inline int isFirst() const { return _data.isFirst(); }
+
+  /// Return the preview code
+  inline int pvCode() const { return _data.pvCode(); }
+
+  /// Return the preview K
+  inline int pvK() const { return _data.pvK(); }
+
+  /// Return the preview correaltion bit
+  inline int pvCorr() const { return _data.pvCorr(); }
+
+  /// Return trigger K parameter
+  inline int K() const { return _data.K(); }
+
+  /// Return trigger X parameter
+  inline int X() const { return _data.X(); }
+
+  /// Return trigger K parameter converted to angle
+  inline int psi() const { return _data.psi(); }
+
+  /// Return trigger X parameter converted to angle
+  inline int psiR() const { return _data.psiR(); }
+
+  /// Return DeltaPsiR
+  inline int DeltaPsiR() const { return _data.DeltaPsiR(); }
+
+  /// Return the trigger code in new format
+  inline int qdec() const { return _data.qdec(); }
+
+  /// Return the BTI Triggers list
+  std::vector<const DTBtiTrigData *> btiTrigList() const { return _btitrig; }
+
+  /// comparison operator
+  bool operator==(const DTTracoTrig &) const;
+
+private:
+  // parent TRACO
+  DTTracoChip *_tparent;
+
+  // Trigger data component
+  DTTracoTrigData _data;
 
+  // vector of BTI triggers which produce the DTTracoChip trigger (1 or 2)
+  std::vector<const DTBtiTrigData *> _btitrig;
 };
 
 #endif
diff --git a/L1Trigger/DTTraco/interface/DTTracoTrigData.h b/L1Trigger/DTTraco/interface/DTTracoTrigData.h
index cd4824154c0a3..f0edcc12cbe85 100644
--- a/L1Trigger/DTTraco/interface/DTTracoTrigData.h
+++ b/L1Trigger/DTTraco/interface/DTTracoTrigData.h
@@ -16,8 +16,8 @@
 //------------------------------------
 // Collaborating Class Declarations --
 //------------------------------------
-#include "L1TriggerConfig/DTTPGConfig/interface/DTConfig.h"
 #include "DataFormats/MuonDetId/interface/DTTracoId.h"
+#include "L1TriggerConfig/DTTPGConfig/interface/DTConfig.h"
 
 //----------------------
 // Base Class Headers --
@@ -36,8 +36,7 @@ typedef unsigned char myint8;
 
 class DTTracoTrigData : public DTTrigData {
 
- public:
-
+public:
   // public methods
 
   //!  Constructor
@@ -45,118 +44,94 @@ class DTTracoTrigData : public DTTrigData {
 
   //!  Constructor
   DTTracoTrigData(DTTracoId, int);
-  
-  //!  Destructor 
+
+  //!  Destructor
   ~DTTracoTrigData() override {}
 
   // Non-const methods
-  
+
   //! Set the parent TRACO Identifier
-  inline void setParent(DTTracoId tracoid) { 
-    _tracoid = tracoid; 
-  }
+  inline void setParent(DTTracoId tracoid) { _tracoid = tracoid; }
 
   //! Set trigger step
-  inline void setStep(int step) {
-    _step = step;
-  }
+  inline void setStep(int step) { _step = step; }
 
   //! Set trigger preview parameters
   inline void setPV(int first, int code, int K, int ioflag) {
-    _pvfirst = first; 
+    _pvfirst = first;
     _pvcode = code;
-    _pvKval = K; 
+    _pvKval = K;
     _pvIOflag = ioflag;
-/*
-    cout<<"setPV called, stored:"<<
-    "  first=" << first <<
-    "  code=" << code <<
-    "  K=" << K <<
-    " ioflag=" << ioflag << endl;
-*/
-   }
+    /*
+        cout<<"setPV called, stored:"<<
+        "  first=" << first <<
+        "  code=" << code <<
+        "  K=" << K <<
+        " ioflag=" << ioflag << endl;
+    */
+  }
 
   //! Set trigger preview correlation bit
-  inline void setPVCorr(int ic) {
-    _pvCorr = ic; 
-  }
+  inline void setPVCorr(int ic) { _pvCorr = ic; }
 
   //! Set trigger code inner layer
-  inline void setCodeIn(int code) {
-    _codeIn = code;
-  }
+  inline void setCodeIn(int code) { _codeIn = code; }
   //! Set trigger code outer layer
-  inline void setCodeOut(int code) {
-    _codeOut = code;
-  }
+  inline void setCodeOut(int code) { _codeOut = code; }
 
   //! Set position of segment, inner layer
-  inline void setPosIn(int pos) {
-    _posIn = pos;
-  }
+  inline void setPosIn(int pos) { _posIn = pos; }
 
   //! Set position of segment, outer layer
-  inline void setPosOut(int pos) {
-    _posOut = pos;
-  }
+  inline void setPosOut(int pos) { _posOut = pos; }
 
   //! Set bti trigger equation of segment, inner layer
-  inline void setEqIn(int eq) {
-    _eqIn = eq;
-  }
+  inline void setEqIn(int eq) { _eqIn = eq; }
 
   //! Set bti trigger equation of segment, outer layer
-  inline void setEqOut(int eq) {
-    _eqOut = eq;
-  }
-
+  inline void setEqOut(int eq) { _eqOut = eq; }
 
   //! Set trigger K parameter
-  inline void setK(int k) {
-    _Kval = k;
-  }
+  inline void setK(int k) { _Kval = k; }
 
   //! Set trigger X parameter
-  inline void setX(int x) {
-    _Xval = x;
-  }
+  inline void setX(int x) { _Xval = x; }
 
   //! Set trigger angles
-  inline void setAngles(int psi, int psir, int dpsir) { 
-    if(psi & 0x200)
+  inline void setAngles(int psi, int psir, int dpsir) {
+    if (psi & 0x200)
       psi |= 0xFFFFFC00;
-    if(psir & 0x800)
+    if (psir & 0x800)
       psir |= 0xFFFFF000;
-    if(dpsir & 0x200)
+    if (dpsir & 0x200)
       dpsir |= 0xFFFFFC00;
 
     _psi = psi;
     _psiR = psir;
-    _dPsiR = dpsir; 
+    _dPsiR = dpsir;
   }
 
   //! Reset all variables but preview
   void resetVar() {
-    _codeIn = 0; 
-    _codeOut = 0; 
+    _codeIn = 0;
+    _codeOut = 0;
     _posIn = 0;
     _posOut = 0;
     _eqIn = 0;
     _eqOut = 0;
-    _Kval = 255; 
+    _Kval = 255;
     _Xval = 0;
     /*
     _psi = -DTConfig::RESOLPSI;
     _psiR = -DTConfig::RESOLPSIR/2;
     _dPsiR = -DTConfig::RESOLPSI;
     */
-    //SV notazione complemento a due:
+    // SV notazione complemento a due:
     _psi = 0x1FF;
     _psiR = 0xFFF;
     _dPsiR = 0x1FF;
-
   }
-  
+
   //! Reset preview variables
   void resetPV() {
     _pvfirst = 0;
@@ -165,123 +140,80 @@ class DTTracoTrigData : public DTTrigData {
     _pvCorr = 0;
     _pvIOflag = 0;
   }
-  
+
   //! Clear
   void clear() {
     resetVar();
     resetPV();
   }
-  
+
   //! Return chamber identifier
-  DTChamberId ChamberId() const override {
-    return _tracoid.ChamberId(); 
-  }
+  DTChamberId ChamberId() const override { return _tracoid.ChamberId(); }
 
   //! print
   void print() const override;
 
   //! Return parent TRACO identifier
-  inline DTTracoId parentId() const {
-    return _tracoid; 
-  }
+  inline DTTracoId parentId() const { return _tracoid; }
 
   //! Return parent TRACO number
-  inline int tracoNumber() const { 
-    return _tracoid.traco(); 
-  }
+  inline int tracoNumber() const { return _tracoid.traco(); }
 
   //! Return step
-  inline int step() const { 
-    return _step; 
-  }
+  inline int step() const { return _step; }
 
   //! Return trigger code
-  inline int code() const { 
-    return _codeIn*10 + _codeOut; 
-  }
-  
+  inline int code() const { return _codeIn * 10 + _codeOut; }
+
   //! Return correlator output code (position of segments)
-  inline int posMask() const { 
-    return _posOut*1000 + _posIn; 
-  }
-  
+  inline int posMask() const { return _posOut * 1000 + _posIn; }
+
   //! Return the position of inner segment
-  inline int posIn() const { 
-    return _posIn; 
-  }
+  inline int posIn() const { return _posIn; }
 
   //! Return the position of outer segment
-  inline int posOut() const { 
-    return _posOut; 
-  }
+  inline int posOut() const { return _posOut; }
 
   //! Return bti trigger equation of inner segment
-  inline int eqIn() const { 
-    return _eqIn; 
-  }
+  inline int eqIn() const { return _eqIn; }
 
   //! Return bti trigger equation of outer segment
-  inline int eqOut() const { 
-    return _eqOut; 
-  }
-
+  inline int eqOut() const { return _eqOut; }
 
   //! Return non 0 if the track is a first track
-  inline int isFirst() const {
-    return _pvfirst;
-  }
+  inline int isFirst() const { return _pvfirst; }
 
   //! Return the preview code
-  inline int pvCode() const { 
-    return _pvcode; 
-  }
+  inline int pvCode() const { return _pvcode; }
 
   //! Return the preview K
-  inline int pvK() const { 
-    return _pvKval; 
-  }
+  inline int pvK() const { return _pvKval; }
 
   //! Return the preview correaltion bit
-  inline int pvCorr() const { 
-    return _pvCorr; 
-  }
+  inline int pvCorr() const { return _pvCorr; }
 
   //! Return the preview i/o bit
-  inline int pvIO() const { 
-    return _pvIOflag; 
-  }
-
+  inline int pvIO() const { return _pvIOflag; }
 
   //! Return trigger K parameter
-  inline int K() const { 
-    return _Kval; 
-  }
+  inline int K() const { return _Kval; }
 
   //! Return trigger X parameter
-  inline int X() const { 
-    return _Xval; 
-  }
+  inline int X() const { return _Xval; }
 
   //! Return trigger K parameter converted to angle
-  int psi() const {
-    return _psi; 
-  }
+  int psi() const { return _psi; }
 
   //! Return trigger X parameter converted to angle
-  int psiR() const {
-    return _psiR; 
-  }
+  int psiR() const { return _psiR; }
 
   //! Return DeltaPsiR
-  int DeltaPsiR() const {
-    return _dPsiR; 
-  }
+  int DeltaPsiR() const { return _dPsiR; }
 
   //! Return the trigger code in new format
   int qdec() const;
 
-  private:
-
+private:
   // parent TRACO
   DTTracoId _tracoid; // this is 4 bytes
 
@@ -314,7 +246,6 @@ class DTTracoTrigData : public DTTrigData {
   // preview io bit
   myint8 _pvIOflag;
 
-
   // K variable value
   int _Kval;
   // X variable value
@@ -326,7 +257,6 @@ class DTTracoTrigData : public DTTrigData {
   long int _psiR;
   // bending angle (delta(psi_r), phiB)
   long int _dPsiR;
-
 };
 
 #endif
diff --git a/L1Trigger/DTTraco/interface/Lut.h b/L1Trigger/DTTraco/interface/Lut.h
index 7f5a3c8bfcf70..1daece9d55651 100644
--- a/L1Trigger/DTTraco/interface/Lut.h
+++ b/L1Trigger/DTTraco/interface/Lut.h
@@ -3,8 +3,8 @@
 /**  \class Lut
  *
  *   Class for computing single Traco LUT from given parameters
- * 
- * 
+ *
+ *
  *   \author S. Vanini
  */
 //
@@ -12,51 +12,49 @@
 #ifndef LUT_H
 #define LUT_H
 
-
 #include "L1TriggerConfig/DTTPGConfig/interface/DTConfigLUTs.h"
 
 //---------------
 // C++ Headers --
 //---------------
-#include <iostream>
+#include <cmath>
 #include <fstream>
+#include <iostream>
 #include <string>
-#include <cmath>
 
-#define ANGRESOL	512.0	
-#define POSRESOL	4096.0
-#define SL_D		23.5	//(cm)SL Distance 
-#define CELL_PITCH	4.2	//(cm)Wire Distance 
-#define SL_DIFF		11.75   // (cm )Distance of SL from station center
+#define ANGRESOL 512.0
+#define POSRESOL 4096.0
+#define SL_D 23.5      //(cm)SL Distance
+#define CELL_PITCH 4.2 //(cm)Wire Distance
+#define SL_DIFF 11.75  // (cm )Distance of SL from station center
 
 class Lut {
 
- public:
-  Lut() {}; 
-  Lut(const DTConfigLUTs* conf, int ntc, float SL_shift);
+public:
+  Lut(){};
+  Lut(const DTConfigLUTs *conf, int ntc, float SL_shift);
   ~Lut();
 
   // set lut parameters methods
-  void setForTestBeam( int station, int board, int traco );
+  void setForTestBeam(int station, int board, int traco);
 
   // get luts
-  int get_x( int addr ) const;
-  int get_k( int addr ) const;
+  int get_x(int addr) const;
+  int get_k(int addr) const;
 
   // DSP <-> IEEE32 conversions
   void IEEE32toDSP(float f, short *DSPmantissa, short *DSPexp);
   void DSPtoIEEE32(short DSPmantissa, short DSPexp, float *f);
 
 public:
-  float m_d;		//distance vertex - normal
-  float m_Xcn;		//Distance correlator - normal
-  int m_ST;		//TRACO BTIC parameter
-  int m_wheel;		//Wheel sign (+1 or -1)
+  float m_d;   // distance vertex - normal
+  float m_Xcn; // Distance correlator - normal
+  int m_ST;    // TRACO BTIC parameter
+  int m_wheel; // Wheel sign (+1 or -1)
 
 private:
-  float m_pitch_d_ST;	//=pitch/ST private:
-
-  const DTConfigLUTs* _conf_luts;
+  float m_pitch_d_ST; //=pitch/ST private:
 
+  const DTConfigLUTs *_conf_luts;
 };
 #endif
diff --git a/L1Trigger/DTTraco/src/DTTracoCand.cc b/L1Trigger/DTTraco/src/DTTracoCand.cc
index 340590d9dde4f..0fd62e6a8d46b 100644
--- a/L1Trigger/DTTraco/src/DTTracoCand.cc
+++ b/L1Trigger/DTTraco/src/DTTracoCand.cc
@@ -2,17 +2,17 @@
 //
 //   Class: DTTracoCand
 //
-//   Description: Implementation of L1MuDTTracoChip 
+//   Description: Implementation of L1MuDTTracoChip
 //                candidate
 //
 //
 //   Author List:
 //   C. Grandi
-//   Modifications: 
+//   Modifications:
 //   SV BTIC parameter from config
 //   SV bti Trig pointer stored insted of trigdata
 //   22/VI/04 SV: last trigger code update
-//   04/XI/04 SV: bug fixed for wrong MB1 superlayer offset! 
+//   04/XI/04 SV: bug fixed for wrong MB1 superlayer offset!
 //   III/05   SV: NEWGEO update
 //----------------------------------------------------------
 
@@ -24,9 +24,9 @@
 //-------------------------------
 // Collaborating Class Headers --
 //-------------------------------
-#include "L1TriggerConfig/DTTPGConfig/interface/DTConfigTraco.h"
-#include "L1Trigger/DTTraco/interface/DTTracoChip.h"
 #include "L1Trigger/DTBti/interface/DTBtiTrigData.h"
+#include "L1Trigger/DTTraco/interface/DTTracoChip.h"
+#include "L1TriggerConfig/DTTPGConfig/interface/DTConfigTraco.h"
 
 //---------------
 // C++ Headers --
@@ -36,77 +36,76 @@
 //----------------
 // Constructors --
 //----------------
-DTTracoCand::DTTracoCand(DTTracoChip* tc, 
-				 const DTBtiTrigData* btitr,
-				 int pos, int step) : 
-  _traco(tc), _btitr(btitr), _step(step), _position(pos), _usable(1) {
-  
-  if(pos<1 || pos>4*DTConfigTraco::NBTITC) {
+DTTracoCand::DTTracoCand(DTTracoChip *tc, const DTBtiTrigData *btitr, int pos,
+                         int step)
+    : _traco(tc), _btitr(btitr), _step(step), _position(pos), _usable(1) {
+
+  if (pos < 1 || pos > 4 * DTConfigTraco::NBTITC) {
     std::cout << "DTTracoCand::DTTracoCand: wrong position: " << pos;
     std::cout << ", dummy coordinates set!" << std::endl;
     _tcX = 9999;
     _tcK = 9999;
     return;
   }
-  // abs value of K in local TRACO frame (angle conversion): 
+  // abs value of K in local TRACO frame (angle conversion):
   // for sorting the angle closest to normal of chamber
   // Ktr = Kbti - BTIC - KRAD
-  _tcK = abs( btitr->K() - tc->KRad() - tc->BTIC() );
-  
- 
-  // X in local TRACO frame (position conversion): Xtr = Xbti + BTIC*(i+4 or o-4)
+  _tcK = abs(btitr->K() - tc->KRad() - tc->BTIC());
+
+  // X in local TRACO frame (position conversion): Xtr = Xbti + BTIC*(i+4 or
+  // o-4)
   int lstep = tc->BTIC();
-  _tcX = btitr->X() + lstep * (
-	 (pos<=DTConfigTraco::NBTITC)*(pos-1 + DTConfigTraco::NBTITC) +  // inner
-	 (pos> DTConfigTraco::NBTITC)*(pos-1 - DTConfigTraco::NBTITC) ); // outer
+  _tcX = btitr->X() + lstep * ((pos <= DTConfigTraco::NBTITC) *
+                                   (pos - 1 + DTConfigTraco::NBTITC) + // inner
+                               (pos > DTConfigTraco::NBTITC) *
+                                   (pos - 1 - DTConfigTraco::NBTITC)); // outer
 
-  //NEWGEO add phi sl offset to inner positions
-  if(btitr->btiSL()==1)
+  // NEWGEO add phi sl offset to inner positions
+  if (btitr->btiSL() == 1)
     _tcX += tc->IBTIOFF();
-  
-/* DEBUG  
-  btitr->print();
-  std::cout << "K in local " << tc->number() << " TRACO " << K() << std::endl;
-  std::cout << "X in local " << tc->number() << " TRACO " << X() << " offset " << tc->IBTIOFF() << std::endl;
-  print();
-*/
-
-/*
-  //OBSOLETE
-  //ATTENTION!! This isn't the "real" MB-superlayer shift
-  //because wires have been renamed/shifted in : DTTrigGeom::cellMapping(int sl, int lay, int tube)
-  //this is a "patch" : to BE FIXED with NEW GEOMETRY! 
-
-  //MB1: half cell shift
-  if(btitr->btiSL()==1 && tc->station()==1)
-    _tcX += (int)(0.5*lstep);
-  //MB2 
-  //  if(btitr->btiSL()==1   && tc->station()==2)
-  //    _tcX += (int)(-lstep);
-
-  //std::cout << "X in local TRACO frame = " << _tcX << std::endl;
-  //print();
-*/  
+
+  /* DEBUG
+    btitr->print();
+    std::cout << "K in local " << tc->number() << " TRACO " << K() << std::endl;
+    std::cout << "X in local " << tc->number() << " TRACO " << X() << " offset "
+    << tc->IBTIOFF() << std::endl; print();
+  */
+
+  /*
+    //OBSOLETE
+    //ATTENTION!! This isn't the "real" MB-superlayer shift
+    //because wires have been renamed/shifted in : DTTrigGeom::cellMapping(int
+    sl, int lay, int tube)
+    //this is a "patch" : to BE FIXED with NEW GEOMETRY!
+
+    //MB1: half cell shift
+    if(btitr->btiSL()==1 && tc->station()==1)
+      _tcX += (int)(0.5*lstep);
+    //MB2
+    //  if(btitr->btiSL()==1   && tc->station()==2)
+    //    _tcX += (int)(-lstep);
+
+    //std::cout << "X in local TRACO frame = " << _tcX << std::endl;
+    //print();
+  */
 }
 
-DTTracoCand::DTTracoCand(const DTTracoCand& tccand) : 
-  _traco(tccand._traco), _btitr(tccand._btitr), 
-  _step(tccand._step), _position(tccand._position), _usable(tccand._usable), 
-  _tcX(tccand._tcX), _tcK(tccand._tcK) {}
+DTTracoCand::DTTracoCand(const DTTracoCand &tccand)
+    : _traco(tccand._traco), _btitr(tccand._btitr), _step(tccand._step),
+      _position(tccand._position), _usable(tccand._usable), _tcX(tccand._tcX),
+      _tcK(tccand._tcK) {}
 
 //--------------
 // Destructor --
 //--------------
-DTTracoCand::~DTTracoCand(){
-}
+DTTracoCand::~DTTracoCand() {}
 
 //--------------
 // Operations --
 //--------------
 
-DTTracoCand& 
-DTTracoCand::operator=(const DTTracoCand& tccand){
-  if(this != &tccand){
+DTTracoCand &DTTracoCand::operator=(const DTTracoCand &tccand) {
+  if (this != &tccand) {
     _traco = tccand._traco;
     _btitr = tccand._btitr;
     _position = tccand._position;
@@ -118,12 +117,11 @@ DTTracoCand::operator=(const DTTracoCand& tccand){
   return *this;
 }
 
-void
-DTTracoCand::print() const {
-//  int sl = _btitr->btiSL();
+void DTTracoCand::print() const {
+  //  int sl = _btitr->btiSL();
   std::cout << " step " << _step;
   std::cout << " Position " << _position;
-  std::cout << " Code = " <<  _btitr->code();
+  std::cout << " Code = " << _btitr->code();
   std::cout << " SL = " << _btitr->btiSL();
   std::cout << " N = " << _btitr->btiNumber();
   std::cout << " X = " << _btitr->X();
@@ -131,4 +129,3 @@ DTTracoCand::print() const {
   std::cout << " Kr = " << _traco->KRad();
   std::cout << " |K-Kr| = " << _tcK << std::endl;
 }
-
diff --git a/L1Trigger/DTTraco/src/DTTracoCard.cc b/L1Trigger/DTTraco/src/DTTracoCard.cc
index 5ac7e65ca9e74..464fbe896647c 100644
--- a/L1Trigger/DTTraco/src/DTTracoCard.cc
+++ b/L1Trigger/DTTraco/src/DTTracoCard.cc
@@ -7,13 +7,13 @@
 //
 //   Author List:
 //   C. Grandi
-//   Modifications: 
+//   Modifications:
 //   X/03 Sara Vanini
 //   22/VI/04 SV: last trigger code update
 //   13/XII/04 SV: Zotto's traco acceptance routine implemented
 //   V/05 SV: NEWGEO
-//   9/V/05 SV: mt ports ing K units, bug fixed  
-//   30/III/07 SV : config with DTConfigManager every single chip 
+//   9/V/05 SV: mt ports ing K units, bug fixed
+//   30/III/07 SV : config with DTConfigManager every single chip
 //   2/XI/09 SV : bti acceptance windows included
 //--------------------------------------------------
 
@@ -27,58 +27,48 @@
 //-------------------------------
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "DataFormats/GeometryVector/interface/LocalVector.h"
-#include "L1Trigger/DTTraco/interface/DTTracoChip.h"
-#include "L1Trigger/DTTraco/interface/DTTracoTrig.h"
 #include "L1Trigger/DTBti/interface/DTBtiCard.h"
 #include "L1Trigger/DTBti/interface/DTBtiTrigData.h"
+#include "L1Trigger/DTTraco/interface/DTTracoChip.h"
+#include "L1Trigger/DTTraco/interface/DTTracoTrig.h"
 #include "L1Trigger/DTTriggerServerTheta/interface/DTTSTheta.h"
 
 //---------------
 // C++ Headers --
 //---------------
-#include <iostream>
 #include <cmath>
-#include <utility>  
 #include <iomanip>
-#include <cmath>
+#include <iostream>
+#include <utility>
 
 //----------------
 // Constructors --
 //----------------
 
-DTTracoCard::DTTracoCard(DTTrigGeom* geo, DTBtiCard* bticard,
-  DTTSTheta* tstheta) : DTGeomSupplier(geo) , 
-  _bticard(bticard), _tstheta(tstheta) { 
-
-}
+DTTracoCard::DTTracoCard(DTTrigGeom *geo, DTBtiCard *bticard,
+                         DTTSTheta *tstheta)
+    : DTGeomSupplier(geo), _bticard(bticard), _tstheta(tstheta) {}
 
 //--------------
 // Destructor --
 //--------------
 
-DTTracoCard::~DTTracoCard(){
-
-localClear();
-
-}
+DTTracoCard::~DTTracoCard() { localClear(); }
 
 //--------------
 // Operations --
 //--------------
 
-void
-DTTracoCard::clearCache(){
+void DTTracoCard::clearCache() {
 
   TRACOCache::clearCache();
   localClear();
-
 }
 
-void
-DTTracoCard::setConfig(const DTConfigManager *conf){
-  // get traco configuration map  
+void DTTracoCard::setConfig(const DTConfigManager *conf) {
+  // get traco configuration map
   DTChamberId sid = ChamberId();
-  _conf_traco_map = conf->getDTConfigTracoMap(sid);	
+  _conf_traco_map = conf->getDTConfigTracoMap(sid);
   _debug = conf->getDTTPGDebug();
 
   // get bti acceptance flag
@@ -89,76 +79,74 @@ DTTracoCard::setConfig(const DTConfigManager *conf){
 
   // get lut configuration for this chamber
   // 100511 SV only if luts are read from OMDS
-  if(_lut_from_db)
+  if (_lut_from_db)
     _conf_luts = conf->getDTConfigLUTs(sid);
-
 }
 
-void
-DTTracoCard::localClear(){
+void DTTracoCard::localClear() {
   // Clear the map
-  for(TRACO_iter p=_tracomap.begin();p!=_tracomap.end();p++){
+  for (TRACO_iter p = _tracomap.begin(); p != _tracomap.end(); p++) {
     delete (*p).second;
   }
   _tracomap.clear();
 }
 
-void 
-DTTracoCard::loadTRACO() {
- 
+void DTTracoCard::loadTRACO() {
+
   localClear();
 
-  if(debug()){
-    std::cout << "DTTracoCard::loadTRACO called for wheel=" << wheel() ;
-    std::cout <<                                ", station=" << station();
-    std::cout <<                                ", sector="  << sector() << std::endl;
+  if (debug()) {
+    std::cout << "DTTracoCard::loadTRACO called for wheel=" << wheel();
+    std::cout << ", station=" << station();
+    std::cout << ", sector=" << sector() << std::endl;
   }
 
-  int maxtc = int(ceil( float(geom()->nCell(1)) / float(DTConfig::NBTITC) ));
+  int maxtc = int(ceil(float(geom()->nCell(1)) / float(DTConfig::NBTITC)));
 
   // loop on all BTI triggers
   std::vector<DTBtiTrigData>::const_iterator p;
-  std::vector<DTBtiTrigData>::const_iterator pend=_bticard->end();
-  for(p=_bticard->begin();p!=pend;p++){
-    if(debug()){
+  std::vector<DTBtiTrigData>::const_iterator pend = _bticard->end();
+  for (p = _bticard->begin(); p != pend; p++) {
+    if (debug()) {
       std::cout << "Found bti trigger: ";
       (*p).print();
     }
 
     // BTI data
-    int nbti 	= (*p).btiNumber();
-    int nsl  	= (*p).btiSL(); 
-    int step 	= (*p).step();
-    int K 	= (*p).K();
+    int nbti = (*p).btiNumber();
+    int nsl = (*p).btiSL();
+    int step = (*p).step();
+    int K = (*p).K();
     DTBtiId id_bti = (*p).parentId();
 
-    DTConfigBti* conf_bti = _bticard->config_bti( id_bti ); 
-    int LL 	= conf_bti->LL();
-    int LH 	= conf_bti->LH();
-    int CL 	= conf_bti->CL();
-    int CH 	= conf_bti->CH();
-    int RL 	= conf_bti->RL();
-    int RH 	= conf_bti->RH();
-/*
-    if(debug())
-      std::cout << "Bti trigger acceptances: \n" 
-		<< " LL " << LL << ", LH " << LH << "\n"
-		<< " CL " << CL << ", CH " << CH << "\n"
-		<< " RL " << RL << ", RH " << RH << std::endl;
-*/
+    DTConfigBti *conf_bti = _bticard->config_bti(id_bti);
+    int LL = conf_bti->LL();
+    int LH = conf_bti->LH();
+    int CL = conf_bti->CL();
+    int CH = conf_bti->CH();
+    int RL = conf_bti->RL();
+    int RH = conf_bti->RH();
+    /*
+        if(debug())
+          std::cout << "Bti trigger acceptances: \n"
+                    << " LL " << LL << ", LH " << LH << "\n"
+                    << " CL " << CL << ", CH " << CH << "\n"
+                    << " RL " << RL << ", RH " << RH << std::endl;
+    */
     // assign BTI to TRACO (central TRACO for sl=3); ntc=1,2...maxtc
-    int ntc = static_cast<int>((nbti-1)/DTConfig::NBTITC)+1;
-    if( ntc<1 || ntc>maxtc ) 
+    int ntc = static_cast<int>((nbti - 1) / DTConfig::NBTITC) + 1;
+    if (ntc < 1 || ntc > maxtc)
       continue;
-    
-    if(debug())
-      std::cout << "Bti trigger assigned to traco " << ntc << " (maxtc " << maxtc << ")" << std::endl;
+
+    if (debug())
+      std::cout << "Bti trigger assigned to traco " << ntc << " (maxtc "
+                << maxtc << ")" << std::endl;
 
     // TRACO information
-    DTTracoId tracoid = DTTracoId(wheel(),station(),sector(),ntc);
-     
-    // position inside TRACO: 
-    int pos = nbti-(ntc-1)*DTConfig::NBTITC;
+    DTTracoId tracoid = DTTracoId(wheel(), station(), sector(), ntc);
+
+    // position inside TRACO:
+    int pos = nbti - (ntc - 1) * DTConfig::NBTITC;
 
     // store trigger in TRACO. Create TRACO if it doesn't exist
     // SV tb2003 : check if traco is connected!
@@ -167,194 +155,203 @@ DTTracoCard::loadTRACO() {
     // if flag is useAcceptParam() = true
 
     // Load master TRACO plane
-    if( nsl==1 ) {
-      if( !_flag_acc || (K>=CL && K<=CH) )
-        activeGetTRACO(ntc)->add_btiT( step, pos, &(*p) );
-      else
-        if(debug())
-          std::cout 	<< "ATTENTION: in TRACO n. " << ntc 
-			<< " bti pos " << pos << " trigger K= " << K 
-			<< " outside acceptance " << CL << "<K<" << CH << std::endl;
-    } 
+    if (nsl == 1) {
+      if (!_flag_acc || (K >= CL && K <= CH))
+        activeGetTRACO(ntc)->add_btiT(step, pos, &(*p));
+      else if (debug())
+        std::cout << "ATTENTION: in TRACO n. " << ntc << " bti pos " << pos
+                  << " trigger K= " << K << " outside acceptance " << CL
+                  << "<K<" << CH << std::endl;
+    }
 
     // Load slave TRACO plane
-    if( nsl==3 ) {
+    if (nsl == 3) {
       // 3 TRACO's
-      //for(int tci=-1;tci<=1;tci++) {
+      // for(int tci=-1;tci<=1;tci++) {
       //  if( (ntc+tci)>0 && (ntc+tci)<=maxtc )
       //    activeGetTRACO(ntc+tci)->add_btiT( step, pos+8-4*tci, &(*p) );
       //  else{
       //    if(debug())
-      //      std::cout << "ATTENTION: traco " << ntc+tci << " is disconnected!" << std::endl;
+      //      std::cout << "ATTENTION: traco " << ntc+tci << " is disconnected!"
+      //      << std::endl;
       //  }
 
       // Left Traco
-      if( (ntc-1)>0 && (ntc-1)<=maxtc ) {
-	if( !_flag_acc || (K>=LL && K<=LH) ) {
-	  activeGetTRACO(ntc-1)->add_btiT( step, pos+8-4*(-1), &(*p) );
-	} else {
-	  if(debug()) {
-	    std::cout 	<< "ATTENTION: in TRACO n. " << ntc-1
-			<< " bti pos " << pos+8-4*(-1) << " trigger K= " << K 
-			<< " outside acceptance " << LL << "<K<" << LH << std::endl;
-	  }
-	}
+      if ((ntc - 1) > 0 && (ntc - 1) <= maxtc) {
+        if (!_flag_acc || (K >= LL && K <= LH)) {
+          activeGetTRACO(ntc - 1)->add_btiT(step, pos + 8 - 4 * (-1), &(*p));
+        } else {
+          if (debug()) {
+            std::cout << "ATTENTION: in TRACO n. " << ntc - 1 << " bti pos "
+                      << pos + 8 - 4 * (-1) << " trigger K= " << K
+                      << " outside acceptance " << LL << "<K<" << LH
+                      << std::endl;
+          }
+        }
       }
 
       // Central Traco
-      if( (ntc)>0 && (ntc)<=maxtc ) {
-	if( !_flag_acc || (K>=CL && K<=CH) ) {
-	  activeGetTRACO(ntc)->add_btiT( step, pos+8-4*(0), &(*p) );
-	} else {
-	  if(debug())
-	    std::cout 	<< "ATTENTION: in TRACO n. " << ntc 
-			<< " bti pos " << pos+8-4*(0) << " trigger K= " << K 
-			<< " outside acceptance " << CL << "<K<" << CH << std::endl;
-	}
+      if ((ntc) > 0 && (ntc) <= maxtc) {
+        if (!_flag_acc || (K >= CL && K <= CH)) {
+          activeGetTRACO(ntc)->add_btiT(step, pos + 8 - 4 * (0), &(*p));
+        } else {
+          if (debug())
+            std::cout << "ATTENTION: in TRACO n. " << ntc << " bti pos "
+                      << pos + 8 - 4 * (0) << " trigger K= " << K
+                      << " outside acceptance " << CL << "<K<" << CH
+                      << std::endl;
+        }
       }
-      
+
       // Right Traco
-      if( (ntc+1)>0 && (ntc+1)<=maxtc ) {
-	if( !_flag_acc || (K>=RL && K<=RH) ) {
-	  activeGetTRACO(ntc+1)->add_btiT( step, pos+8-4*(+1), &(*p) );
-	} else {
-	  if(debug())
-	    std::cout 	<< "ATTENTION: in TRACO n. " << ntc+1 
-			<< " bti pos " << pos+8-4*(+1) << " trigger K= " << K 
-			<< " outside acceptance " << RL << "<K<" << RH << std::endl;
-	}
+      if ((ntc + 1) > 0 && (ntc + 1) <= maxtc) {
+        if (!_flag_acc || (K >= RL && K <= RH)) {
+          activeGetTRACO(ntc + 1)->add_btiT(step, pos + 8 - 4 * (+1), &(*p));
+        } else {
+          if (debug())
+            std::cout << "ATTENTION: in TRACO n. " << ntc + 1 << " bti pos "
+                      << pos + 8 - 4 * (+1) << " trigger K= " << K
+                      << " outside acceptance " << RL << "<K<" << RH
+                      << std::endl;
+        }
       }
     }
 
-    // Filter Theta BTIs -> this is done in DTBtiChip 
+    // Filter Theta BTIs -> this is done in DTBtiChip
 
-  }//end loop on bti trigs
+  } // end loop on bti trigs
 }
 
-void 
-DTTracoCard::runTRACO() {
+void DTTracoCard::runTRACO() {
 
-  if(debug()){
-    std::cout << "DTTracoCard:runTRACO called for wheel=" << wheel() ;
-    std::cout <<                               ", station=" << station();
-    std::cout <<                               ", sector="  << sector();
+  if (debug()) {
+    std::cout << "DTTracoCard:runTRACO called for wheel=" << wheel();
+    std::cout << ", station=" << station();
+    std::cout << ", sector=" << sector();
     std::cout << ", " << _tracomap.size() << " TRACOs with signal" << std::endl;
   }
 
   // run TRACO algorithm on all non-empty TRACO
-  if(!_tracomap.empty()){
+  if (!_tracomap.empty()) {
 
-    if(debug()){
-      std::cout << "====================================================" << std::endl;
-      std::cout << "              TRACO triggers                        " << std::endl; 
+    if (debug()) {
+      std::cout << "===================================================="
+                << std::endl;
+      std::cout << "              TRACO triggers                        "
+                << std::endl;
     }
 
-
     TRACO_iter ptraco;
-    for(ptraco=_tracomap.begin(); ptraco!=_tracomap.end(); ptraco++) {
-      DTTracoChip* traco = (*ptraco).second;
+    for (ptraco = _tracomap.begin(); ptraco != _tracomap.end(); ptraco++) {
+      DTTracoChip *traco = (*ptraco).second;
       traco->run();
-      for(int step=DTConfig::NSTEPF; step<=DTConfig::NSTEPL; step++){
-        if( traco->nTrig(step)>0 ){ 
-          _cache.push_back( traco->triggerData(step,1) );
+      for (int step = DTConfig::NSTEPF; step <= DTConfig::NSTEPL; step++) {
+        if (traco->nTrig(step) > 0) {
+          _cache.push_back(traco->triggerData(step, 1));
           /*
-          std::cout<<"first bti sl3: "<<geom()->localPosition(DTBtiId(wheel(),station(),sector(),3,1))<<std::endl;
-          std::cout<<"traco pos: " << geom()->localPosition((traco->triggerData(step,1).parentId()))<<std::endl; 
+          std::cout<<"first bti sl3:
+          "<<geom()->localPosition(DTBtiId(wheel(),station(),sector(),3,1))<<std::endl;
+          std::cout<<"traco pos: " <<
+          geom()->localPosition((traco->triggerData(step,1).parentId()))<<std::endl;
           traco->triggerData(step,1).print();
-          std::cout<<"pos: " << localPosition(&(traco->triggerData(step,1))) << std::endl;
-          std::cout<<"dir: " << localDirection(&(traco->triggerData(step,1))) << std::endl;
-          std::cout << std::endl;
+          std::cout<<"pos: " << localPosition(&(traco->triggerData(step,1))) <<
+          std::endl; std::cout<<"dir: " <<
+          localDirection(&(traco->triggerData(step,1))) << std::endl; std::cout
+          << std::endl;
           */
-        }  
+        }
         // Store second track only if no first track at previous BX
-	  if( traco->nTrig(step)>1 && traco->useSecondTrack(step) ){
-	    _cache.push_back( traco->triggerData(step,2) );
+        if (traco->nTrig(step) > 1 && traco->useSecondTrack(step)) {
+          _cache.push_back(traco->triggerData(step, 2));
           /*
-          std::cout<<"first bti sl3: "<<geom()->localPosition(DTBtiId(wheel(),station(),sector(),3,1))<<std::endl;
-          std::cout<<"traco pos: " << geom()->localPosition((traco->triggerData(step,2).parentId()))<<std::endl; 
+          std::cout<<"first bti sl3:
+          "<<geom()->localPosition(DTBtiId(wheel(),station(),sector(),3,1))<<std::endl;
+          std::cout<<"traco pos: " <<
+          geom()->localPosition((traco->triggerData(step,2).parentId()))<<std::endl;
           traco->triggerData(step,2).print();
-          std::cout<<"pos: " << localPosition(&(traco->triggerData(step,2))) << std::endl;
-          std::cout<<"dir: " << localDirection(&(traco->triggerData(step,2))) << std::endl;
-          std::cout << std::endl;
+          std::cout<<"pos: " << localPosition(&(traco->triggerData(step,2))) <<
+          std::endl; std::cout<<"dir: " <<
+          localDirection(&(traco->triggerData(step,2))) << std::endl; std::cout
+          << std::endl;
           */
         }
       }
     }
-    if(debug())
-      std::cout << "====================================================" << std::endl;
+    if (debug())
+      std::cout << "===================================================="
+                << std::endl;
   }
 }
 
-DTTracoChip*
-DTTracoCard::activeGetTRACO(int n) {
+DTTracoChip *DTTracoCard::activeGetTRACO(int n) {
 
   // the traco identifier
   DTChamberId sid = geom()->statId();
-  DTTracoId _id = DTTracoId(sid,n);
- 
-  DTTracoChip* traco = nullptr;
+  DTTracoId _id = DTTracoId(sid, n);
+
+  DTTracoChip *traco = nullptr;
   TRACO_iter ptraco = _tracomap.find(n);
-  if( ptraco!=_tracomap.end() ) {
-    traco=(*ptraco).second;
+  if (ptraco != _tracomap.end()) {
+    traco = (*ptraco).second;
   } else {
-    traco = new DTTracoChip(this,n,config_traco(_id));
-    _tracomap[n]=traco;
+    traco = new DTTracoChip(this, n, config_traco(_id));
+    _tracomap[n] = traco;
   }
   return traco;
 }
 
-DTTracoChip*
-DTTracoCard::getTRACO(int n) const {
+DTTracoChip *DTTracoCard::getTRACO(int n) const {
   TRACO_const_iter ptraco = _tracomap.find(n);
-  if( ptraco==_tracomap.end() ) return nullptr;
+  if (ptraco == _tracomap.end())
+    return nullptr;
   return (*ptraco).second;
 }
 
-std::vector<DTTracoChip*> 
-DTTracoCard::tracoList() {
+std::vector<DTTracoChip *> DTTracoCard::tracoList() {
 
-  std::vector<DTTracoChip*> blist;
+  std::vector<DTTracoChip *> blist;
 
-  if(size()<1)return blist;
+  if (size() < 1)
+    return blist;
 
-  for(TRACO_const_iter p=_tracomap.begin();p!=_tracomap.end();p++){
+  for (TRACO_const_iter p = _tracomap.begin(); p != _tracomap.end(); p++) {
     blist.push_back((*p).second);
   }
   return blist;
-
 }
 
-DTTracoTrig*
-DTTracoCard::storeTrigger(DTTracoTrigData td) {
+DTTracoTrig *DTTracoCard::storeTrigger(DTTracoTrigData td) {
   DTTracoId tracoid = td.parentId();
-  if(!(tracoid.wheel()==wheel() &&
-       tracoid.sector()==sector() &&
-       tracoid.station()==station()) ) return nullptr;
+  if (!(tracoid.wheel() == wheel() && tracoid.sector() == sector() &&
+        tracoid.station() == station()))
+    return nullptr;
   std::cout << "DTTracoChip::trigger: trigger not belonging to this card! ";
-  std::cout << "card=(" << wheel() << "," << station() << "," << sector() << ") ";
-  std::cout << "trig=(" << tracoid.wheel() << "," << tracoid.station() << "," 
-       << tracoid.sector() << ")";
+  std::cout << "card=(" << wheel() << "," << station() << "," << sector()
+            << ") ";
+  std::cout << "trig=(" << tracoid.wheel() << "," << tracoid.station() << ","
+            << tracoid.sector() << ")";
   // get the appropriate Traco
-  DTTracoChip* traco = activeGetTRACO(tracoid.traco());
+  DTTracoChip *traco = activeGetTRACO(tracoid.traco());
   // create a new trigger in the Traco
-  DTTracoTrig* trig = new DTTracoTrig(traco,td);
+  DTTracoTrig *trig = new DTTracoTrig(traco, td);
   // add the trigger to the Traco
-  traco->addTrig(td.step(),trig);
+  traco->addTrig(td.step(), trig);
   // return the trigger
   return trig;
 }
 
 /*
-LocalPoint 
+LocalPoint
 DTTracoCard::localPosition(const DTTrigData* tr) const {
 std::cout<<"oldgeo";
 
   //@@ patch for Sun 4.2 compiler
-  DTTracoTrigData* trig = dynamic_cast<DTTracoTrigData*>(const_cast<DTTrigData*>(tr));
+  DTTracoTrigData* trig =
+dynamic_cast<DTTracoTrigData*>(const_cast<DTTrigData*>(tr));
   //  const DTTracoTrigData* trig = dynamic_cast<const DTTracoTrigData*>(tr);
   if(!trig) {
-    std::cout << "DTTracoCard::localPosition called with wrong argument!" << std::endl;
-    return LocalPoint(0,0,0);
+    std::cout << "DTTracoCard::localPosition called with wrong argument!" <<
+std::endl; return LocalPoint(0,0,0);
   }
   float x = geom()->localPosition(trig->parentId()).x();
   float y = geom()->localPosition(trig->parentId()).y();
@@ -372,46 +369,49 @@ std::cout<<"oldgeo";
 }
 */
 
-LocalPoint 
-DTTracoCard::localPosition(const DTTrigData* tr) const {
-  //NEWGEO
-  DTTracoTrigData* trig = dynamic_cast<DTTracoTrigData*>(const_cast<DTTrigData*>(tr));
-  if(!trig) {
-    std::cout << "DTTracoCard::localPosition called with wrong argument!" << std::endl;
-    return LocalPoint(0,0,0);
+LocalPoint DTTracoCard::localPosition(const DTTrigData *tr) const {
+  // NEWGEO
+  DTTracoTrigData *trig =
+      dynamic_cast<DTTracoTrigData *>(const_cast<DTTrigData *>(tr));
+  if (!trig) {
+    std::cout << "DTTracoCard::localPosition called with wrong argument!"
+              << std::endl;
+    return LocalPoint(0, 0, 0);
   }
   float x = geom()->localPosition(trig->parentId()).x();
   float y = geom()->localPosition(trig->parentId()).y();
   float z = geom()->localPosition(trig->parentId()).z();
 
-  float trig_pos = geom()->cellPitch() * ( (float)trig->X() / (float)(config_traco(trig->parentId())->BTIC()));
+  float trig_pos =
+      geom()->cellPitch() *
+      ((float)trig->X() / (float)(config_traco(trig->parentId())->BTIC()));
 
-//  10/7/06 May be not needed anymore in new geometry 
-//   if(geom()->posFE(1)==1)
-//   trig_pos = -trig_pos;
+  //  10/7/06 May be not needed anymore in new geometry
+  //   if(geom()->posFE(1)==1)
+  //   trig_pos = -trig_pos;
 
   x += trig_pos;
 
   // If not correlated get the position of the SL instead of the chamber center
   // z axis toward vertex
-  if(trig->posIn()==0 ) {
+  if (trig->posIn() == 0) {
     z -= 0.5 * geom()->distSL(); // no inner ==> only outer
-  } 
-  else if(trig->posOut()==0) {
+  } else if (trig->posOut() == 0) {
     z += 0.5 * geom()->distSL(); // no outer ==> only inner
   }
-  return LocalPoint(x,y,z);
+  return LocalPoint(x, y, z);
 }
 
 /* OLDGEO
-LocalVector 
+LocalVector
 DTTracoCard::localDirection(const DTTrigData* tr) const {
   //@@ patch for Sun 4.2 compiler
-  DTTracoTrigData* trig = dynamic_cast<DTTracoTrigData*>(const_cast<DTTrigData*>(tr));
+  DTTracoTrigData* trig =
+dynamic_cast<DTTracoTrigData*>(const_cast<DTTrigData*>(tr));
   //  const DTTracoTrigData* trig = dynamic_cast<const DTTracoTrigData*>(tr);
   if(!trig) {
-    std::cout << "DTtracoCard::localDirection called with wrong argument!" << std::endl;
-    return LocalVector(0,0,0);
+    std::cout << "DTtracoCard::localDirection called with wrong argument!" <<
+std::endl; return LocalVector(0,0,0);
   }
   float r,x,y,z;
   x = -(float)trig->K() * geom()->cellPitch() /
@@ -425,55 +425,52 @@ DTTracoCard::localDirection(const DTTrigData* tr) const {
 }
 */
 
-LocalVector 
-DTTracoCard::localDirection(const DTTrigData* tr) const {
-  //NEWGEO
-  DTTracoTrigData* trig = dynamic_cast<DTTracoTrigData*>(const_cast<DTTrigData*>(tr));
-  if(!trig) {
-    std::cout << "DTtracoCard::localDirection called with wrong argument!" << std::endl;
-    return LocalVector(0,0,0);
+LocalVector DTTracoCard::localDirection(const DTTrigData *tr) const {
+  // NEWGEO
+  DTTracoTrigData *trig =
+      dynamic_cast<DTTracoTrigData *>(const_cast<DTTrigData *>(tr));
+  if (!trig) {
+    std::cout << "DTtracoCard::localDirection called with wrong argument!"
+              << std::endl;
+    return LocalVector(0, 0, 0);
   }
 
-  //FE position
-  //int FE = geom()->posFE(3);
+  // FE position
+  // int FE = geom()->posFE(3);
+
+  float psi = atan((float)(trig->K()) * geom()->cellPitch() /
+                   (geom()->distSL() * config_traco(trig->parentId())->BTIC()));
 
-  float psi = atan((float)(trig->K())*geom()->cellPitch()
-                   /( geom()->distSL() * config_traco(trig->parentId())->BTIC()) );
+  if (config_traco(trig->parentId())->debug() == 4)
+    std::cout << "K " << trig->K() << " == psi " << psi << " in FE frame "
+              << std::endl;
 
-  if(config_traco(trig->parentId())->debug()==4)
-    std::cout << "K " << trig->K() << " == psi " << psi << " in FE frame " << std::endl;
-    
   // (xd,yd,zd) in chamber frame
-  float xd=-sin(psi);
-  float yd=0;
-  float zd=-cos(psi);
+  float xd = -sin(psi);
+  float yd = 0;
+  float zd = -cos(psi);
 
   // 10/07/06 Not needed anymore (chages in geometry)
   // if(FE==1){//FE in negative y
   //    xd = - xd;
   //}
 
- 
-  if(config_traco(trig->parentId())->debug()==4)
-    std::cout << "Direction in chamber frame is (" << xd << "," << yd << "," << zd << ")" << std::endl;
- 
-  return LocalVector(xd,yd,zd);
+  if (config_traco(trig->parentId())->debug() == 4)
+    std::cout << "Direction in chamber frame is (" << xd << "," << yd << ","
+              << zd << ")" << std::endl;
+
+  return LocalVector(xd, yd, zd);
 }
 
-DTConfigTraco* 
-DTTracoCard::config_traco(const DTTracoId& tracoid) const
-{
-  //loop on map to find traco
+DTConfigTraco *DTTracoCard::config_traco(const DTTracoId &tracoid) const {
+  // loop on map to find traco
   ConfTracoMap::const_iterator titer = _conf_traco_map.find(tracoid);
-  if (titer == _conf_traco_map.end()){
-    std::cout << "DTTracoCard::config_traco : TRACO (" << tracoid.wheel()
-	      << "," << tracoid.sector()
-	      << "," << tracoid.station()
-	      << "," << tracoid.traco()
-	      << ") not found, return 0" << std::endl;
+  if (titer == _conf_traco_map.end()) {
+    std::cout << "DTTracoCard::config_traco : TRACO (" << tracoid.wheel() << ","
+              << tracoid.sector() << "," << tracoid.station() << ","
+              << tracoid.traco() << ") not found, return 0" << std::endl;
     return nullptr;
   }
 
-  return const_cast<DTConfigTraco*>(&(*titer).second);
-} 
-
+  return const_cast<DTConfigTraco *>(&(*titer).second);
+}
diff --git a/L1Trigger/DTTraco/src/DTTracoChip.cc b/L1Trigger/DTTraco/src/DTTracoChip.cc
index 61d08a3df0d07..c2920dfa5bfd8 100644
--- a/L1Trigger/DTTraco/src/DTTracoChip.cc
+++ b/L1Trigger/DTTraco/src/DTTracoChip.cc
@@ -8,7 +8,7 @@
 //
 //   Author List:
 //   SV 4/II/2003
-//   Modifications: 
+//   Modifications:
 //   22/VI/04 SV : last trigger code update
 //   16/I/07  SV : new DTConfig update
 //   3/IV/07  SV : setTracoAcceptance moved from card to chip
@@ -24,163 +24,171 @@
 //-------------------------------
 // Collaborating Class Headers --
 //-------------------------------
-#include "L1Trigger/DTTraco/interface/DTTracoCard.h"
 #include "L1Trigger/DTBti/interface/DTBtiTrigData.h"
+#include "L1Trigger/DTTraco/interface/DTTracoCand.h"
+#include "L1Trigger/DTTraco/interface/DTTracoCard.h"
 #include "L1Trigger/DTTraco/interface/DTTracoTrig.h"
 #include "L1Trigger/DTTraco/interface/DTTracoTrigData.h"
 #include "L1Trigger/DTTriggerServerTheta/interface/DTTSTheta.h"
-#include "L1Trigger/DTTraco/interface/DTTracoCand.h"
 #include "L1TriggerConfig/DTTPGConfig/interface/BitArray.h"
 
 //---------------
 // C++ Headers --
 //---------------
-#include <iostream>
-#include <cmath>
 #include <algorithm>
+#include <cmath>
+#include <iostream>
 #include <string>
 
 //----------------
 // Constructors --
 //----------------
 
-DTTracoChip::DTTracoChip(DTTracoCard* card, int n, DTConfigTraco* conf) :
-                                _card(card), _config(conf) {
+DTTracoChip::DTTracoChip(DTTracoCard *card, int n, DTConfigTraco *conf)
+    : _card(card), _config(conf) {
 
   _geom = _card->geom();
 
   // n=traco number 1,2,...
-  if(config()->debug()==4){
-    std::cout << "DTTracoChip constructor called for TRACO number " << n << std::endl;
+  if (config()->debug() == 4) {
+    std::cout << "DTTracoChip constructor called for TRACO number " << n
+              << std::endl;
   }
 
   // set acceptances from CMSSW geometry
   setTracoAcceptances();
-  
+
   // reserve the appropriate amount of space for vectors
-  int i=0;
-  for(i=0;i<DTConfigTraco::NSTEPL - DTConfigTraco::NSTEPF;i++) {
+  int i = 0;
+  for (i = 0; i < DTConfigTraco::NSTEPL - DTConfigTraco::NSTEPF; i++) {
     _innerCand[i].reserve(DTConfigTraco::NBTITC);
-    _outerCand[i].reserve(3*DTConfigTraco::NBTITC);
+    _outerCand[i].reserve(3 * DTConfigTraco::NBTITC);
     _tracotrig[i].reserve(2);
   }
- 
+
   // the identifier
   DTChamberId sid = _geom->statId();
-  _id = DTTracoId(sid,n);
- 
+  _id = DTTracoId(sid, n);
+
   // Flags for LTS
   _bxlts.zero();
-  for(int is=0;is<DTConfigTraco::NSTEPL-DTConfigTraco::NSTEPF+1;is++){
+  for (int is = 0; is < DTConfigTraco::NSTEPL - DTConfigTraco::NSTEPF + 1;
+       is++) {
     _flag[is].zero();
   }
 
   // debugging
-  if(config()->debug()==4){
+  if (config()->debug() == 4) {
     std::cout << "CMS position:" << CMSPosition() << std::endl;
     std::cout << " psiRad=" << psiRad() << " KRad=" << KRad() << std::endl;
   }
 
-  //init traco parameters from traco config file
+  // init traco parameters from traco config file
   _krad = config()->KRAD();
-  _btic=config()->BTIC(); 
+  _btic = config()->BTIC();
 
-  //offset from geometry (x1-x3 FE view): converted from cm to ST units (0.9999 for rounding)
-  _ibtioff=static_cast<int>(config()->BTIC()/(_geom->cellPitch())*(_geom->phiSLOffset()/0.9999));  
+  // offset from geometry (x1-x3 FE view): converted from cm to ST units (0.9999
+  // for rounding)
+  _ibtioff = static_cast<int>(config()->BTIC() / (_geom->cellPitch()) *
+                              (_geom->phiSLOffset() / 0.9999));
 
   // 091030 SV lut parameters from DB
   // SV 08/12/12 : added flag for computing luts from DB parameters
-  if( _card->lutFromDBFlag()==1 )
-  {
-    //int board = int( (n-1)/4 );
-    //int traco = int(fmod( double(n-1),4.));
+  if (_card->lutFromDBFlag() == 1) {
+    // int board = int( (n-1)/4 );
+    // int traco = int(fmod( double(n-1),4.));
     // 110208 SV for TRACO hardware bug included SL_shift
     // SL shift
-    float xBTI1_3 	= _geom->localPosition( DTBtiId(DTSuperLayerId(sid.wheel(),sid.station(),sid.sector(),3),1) ).x();
-    float xBTI1_1 	= _geom->localPosition( DTBtiId(DTSuperLayerId(sid.wheel(),sid.station(),sid.sector(),1),1) ).x();
-    float SL_shift 	= xBTI1_3 - xBTI1_1;
-
-    _lutsCCB = new Lut(_card->config_luts(),n,SL_shift);
+    float xBTI1_3 =
+        _geom
+            ->localPosition(DTBtiId(
+                DTSuperLayerId(sid.wheel(), sid.station(), sid.sector(), 3), 1))
+            .x();
+    float xBTI1_1 =
+        _geom
+            ->localPosition(DTBtiId(
+                DTSuperLayerId(sid.wheel(), sid.station(), sid.sector(), 1), 1))
+            .x();
+    float SL_shift = xBTI1_3 - xBTI1_1;
+
+    _lutsCCB = new Lut(_card->config_luts(), n, SL_shift);
     _luts = nullptr;
-  }
-  else
-  //this is always the case with new DTConfig SV 15/I/2007
-  //if( config()->trigSetupGeom()==0 ){
+  } else
+  // this is always the case with new DTConfig SV 15/I/2007
+  // if( config()->trigSetupGeom()==0 ){
   {
     _luts = nullptr;
     _lutsCCB = nullptr;
   }
-/*
-  //SV 21/V/03 for testbeam purpose: parameters from hardware setup
-  if(config()->trigSetupGeom()==1){
-    //init traco parameters
-    _dd=config()->DD();
-    _krad=config()->KRAD();
-    _btic=config()->BTIC();
-    _ibtioff=config()->IBTIOFF();
-
-    //const char* testfile = "traco";   //FIXTB 
-    std::string  testfile = "traco_";
-    int it = number() - 4 - 1;
-    if(it<10)
-      testfile += it+'0';
-    if(it>9){
-      testfile += int(float(it)/10.0) + '0';                //add decimal char
-      testfile += int(fmod(float(it),float(10))) + '0';     //add unit char
-    }
+  /*
+    //SV 21/V/03 for testbeam purpose: parameters from hardware setup
+    if(config()->trigSetupGeom()==1){
+      //init traco parameters
+      _dd=config()->DD();
+      _krad=config()->KRAD();
+      _btic=config()->BTIC();
+      _ibtioff=config()->IBTIOFF();
+
+      //const char* testfile = "traco";   //FIXTB
+      std::string  testfile = "traco_";
+      int it = number() - 4 - 1;
+      if(it<10)
+        testfile += it+'0';
+      if(it>9){
+        testfile += int(float(it)/10.0) + '0';                //add decimal char
+        testfile += int(fmod(float(it),float(10))) + '0';     //add unit char
+      }
 
-    //const char* name = testfile;
-    if(config()->debug()==4)
-      std::cout << "Loading " << testfile << " luts for traco " << number() << std::endl;
-    _luts = new DTTracoLUTs(testfile);
-    _luts->reset();
-    _luts->load();
-    if(config()->debug()==4)
-      _luts->print();
-  }//end hardware setup
-
-  //TB 2004 setup : luts from minicrate ccb equations
-  if(config()->trigSetupGeom()==2){
-    int board = int( (n-1)/4 );
-    int traco = fmod( double(n-1),4. );
-    _lutsCCB = new Lut(sid.station(),board,traco);
-    // 091030 SV this constructur is obsolete now, use setForTestBeam instead
-  }//end TB2004
-*/
+      //const char* name = testfile;
+      if(config()->debug()==4)
+        std::cout << "Loading " << testfile << " luts for traco " << number() <<
+    std::endl; _luts = new DTTracoLUTs(testfile); _luts->reset(); _luts->load();
+      if(config()->debug()==4)
+        _luts->print();
+    }//end hardware setup
+
+    //TB 2004 setup : luts from minicrate ccb equations
+    if(config()->trigSetupGeom()==2){
+      int board = int( (n-1)/4 );
+      int traco = fmod( double(n-1),4. );
+      _lutsCCB = new Lut(sid.station(),board,traco);
+      // 091030 SV this constructur is obsolete now, use setForTestBeam instead
+    }//end TB2004
+  */
 }
 
-
-DTTracoChip::DTTracoChip(const DTTracoChip& traco) : 
-  _geom(traco._geom), _id(traco._id), _card(traco._card), _luts(traco._luts) {
-  int i=0;
-  for(i=0;i<DTConfigTraco::NSTEPL - DTConfigTraco::NSTEPF;i++) {
+DTTracoChip::DTTracoChip(const DTTracoChip &traco)
+    : _geom(traco._geom), _id(traco._id), _card(traco._card),
+      _luts(traco._luts) {
+  int i = 0;
+  for (i = 0; i < DTConfigTraco::NSTEPL - DTConfigTraco::NSTEPF; i++) {
     _innerCand[i].reserve(DTConfigTraco::NBTITC);
     std::vector<DTTracoCand>::const_iterator p;
-    for(p=traco._innerCand[i].begin();p<traco._innerCand[i].end();p++) {
+    for (p = traco._innerCand[i].begin(); p < traco._innerCand[i].end(); p++) {
       _innerCand[i].push_back(*p);
     }
-    _outerCand[i].reserve(3*DTConfigTraco::NBTITC);
-    for(p=traco._outerCand[i].begin();p<traco._outerCand[i].end();p++) {
+    _outerCand[i].reserve(3 * DTConfigTraco::NBTITC);
+    for (p = traco._outerCand[i].begin(); p < traco._outerCand[i].end(); p++) {
       _outerCand[i].push_back(*p);
     }
     _tracotrig[i].reserve(2);
-    std::vector<DTTracoTrig*>::const_iterator p1;
-    for(p1=traco._tracotrig[i].begin();p1<traco._tracotrig[i].end();p1++) {
+    std::vector<DTTracoTrig *>::const_iterator p1;
+    for (p1 = traco._tracotrig[i].begin(); p1 < traco._tracotrig[i].end();
+         p1++) {
       _tracotrig[i].push_back(*p1);
     }
   }
   _bxlts = traco._bxlts;
-  for(int is=0;is<DTConfigTraco::NSTEPL-DTConfigTraco::NSTEPF+1;is++){
+  for (int is = 0; is < DTConfigTraco::NSTEPL - DTConfigTraco::NSTEPF + 1;
+       is++) {
     _flag[is] = traco._flag[is];
   }
-
 }
 
-
 //--------------
 // Destructor --
 //--------------
-DTTracoChip::~DTTracoChip(){
+DTTracoChip::~DTTracoChip() {
   clear();
   /*
   if(config()->trigSetupGeom()==1){
@@ -192,53 +200,54 @@ DTTracoChip::~DTTracoChip(){
     delete _lutsCCB;
   */
 
-  if( _card->lutFromDBFlag()==1 )
+  if (_card->lutFromDBFlag() == 1)
     delete _lutsCCB;
-
 }
 
 //--------------
 // Operations --
 //--------------
 
-DTTracoChip&
-DTTracoChip::operator=(const DTTracoChip& traco) {
-  if(this != &traco){
+DTTracoChip &DTTracoChip::operator=(const DTTracoChip &traco) {
+  if (this != &traco) {
     _geom = traco._geom;
     _id = traco._id;
     _card = traco._card;
-    int i=0;
-    for(i=0;i<DTConfigTraco::NSTEPL - DTConfigTraco::NSTEPF;i++) {
+    int i = 0;
+    for (i = 0; i < DTConfigTraco::NSTEPL - DTConfigTraco::NSTEPF; i++) {
       _innerCand[i].reserve(DTConfigTraco::NBTITC);
       std::vector<DTTracoCand>::const_iterator p;
-      for(p=traco._innerCand[i].begin();p<traco._innerCand[i].end();p++) {
-	_innerCand[i].push_back(*p);
+      for (p = traco._innerCand[i].begin(); p < traco._innerCand[i].end();
+           p++) {
+        _innerCand[i].push_back(*p);
       }
-      _outerCand[i].reserve(3*DTConfigTraco::NBTITC);
-      for(p=traco._outerCand[i].begin();p<traco._outerCand[i].end();p++) {
-	_outerCand[i].push_back(*p);
+      _outerCand[i].reserve(3 * DTConfigTraco::NBTITC);
+      for (p = traco._outerCand[i].begin(); p < traco._outerCand[i].end();
+           p++) {
+        _outerCand[i].push_back(*p);
       }
       _tracotrig[i].reserve(2);
-      std::vector<DTTracoTrig*>::const_iterator p1;
-      for(p1=traco._tracotrig[i].begin();p1<traco._tracotrig[i].end();p1++) {
-	_tracotrig[i].push_back(*p1);
+      std::vector<DTTracoTrig *>::const_iterator p1;
+      for (p1 = traco._tracotrig[i].begin(); p1 < traco._tracotrig[i].end();
+           p1++) {
+        _tracotrig[i].push_back(*p1);
       }
     }
     _bxlts = traco._bxlts;
-    for(int is=0;is<DTConfigTraco::NSTEPL-DTConfigTraco::NSTEPF+1;is++){
+    for (int is = 0; is < DTConfigTraco::NSTEPL - DTConfigTraco::NSTEPF + 1;
+         is++) {
       _flag[is] = traco._flag[is];
     }
   }
   return *this;
 }
 
+void DTTracoChip::clear() {
 
-void
-DTTracoChip::clear() {
-
-  std::vector<DTTracoTrig*>::iterator p1;
-  for(int is=0;is<DTConfigTraco::NSTEPL-DTConfigTraco::NSTEPF+1;is++){
-    for(p1=_tracotrig[is].begin();p1<_tracotrig[is].end();p1++){
+  std::vector<DTTracoTrig *>::iterator p1;
+  for (int is = 0; is < DTConfigTraco::NSTEPL - DTConfigTraco::NSTEPF + 1;
+       is++) {
+    for (p1 = _tracotrig[is].begin(); p1 < _tracotrig[is].end(); p1++) {
       delete (*p1);
     }
     _tracotrig[is].clear();
@@ -249,239 +258,249 @@ DTTracoChip::clear() {
   _bxlts.zero();
 }
 
-
-
-void
-DTTracoChip::run() {
+void DTTracoChip::run() {
 
   // Debugging...
-  if(config()->debug()>1){
-    std::cout << "DTTracoChip::run: Processing TRACO " << _id.traco() << std::endl;
+  if (config()->debug() > 1) {
+    std::cout << "DTTracoChip::run: Processing TRACO " << _id.traco()
+              << std::endl;
   }
   // End debugging
 
-  int maxtc = static_cast<int>(ceil( float(geom()->nCell(1)) / float(DTConfigTraco::NBTITC) ));
+  int maxtc = static_cast<int>(
+      ceil(float(geom()->nCell(1)) / float(DTConfigTraco::NBTITC)));
 
-  if( _id.traco()<1 || _id.traco()>maxtc ) {
-    if(config()->debug()==4)
-      std::cout << "DTTracoChip::run: wrong TRACO number " << _id.traco() << std::endl;
+  if (_id.traco() < 1 || _id.traco() > maxtc) {
+    if (config()->debug() == 4)
+      std::cout << "DTTracoChip::run: wrong TRACO number " << _id.traco()
+                << std::endl;
     return;
   }
 
   // Loop on step
-  for(int is=DTConfigTraco::NSTEPF; is<=DTConfigTraco::NSTEPL;is++) {
-    if(config()->debug()>1){
+  for (int is = DTConfigTraco::NSTEPF; is <= DTConfigTraco::NSTEPL; is++) {
+    if (config()->debug() > 1) {
       std::cout << "\n STEP: " << is << std::endl;
       std::cout << " ================" << std::endl;
     }
 
     // skip if no cand. at this step
-    if(_innerCand[is-DTConfigTraco::NSTEPF].empty() &&
-       _outerCand[is-DTConfigTraco::NSTEPF].empty() ) 
+    if (_innerCand[is - DTConfigTraco::NSTEPF].empty() &&
+        _outerCand[is - DTConfigTraco::NSTEPF].empty())
       continue;
 
     // Debugging...
-    if(config()->debug()==4){
-      std::cout << " --> " << _innerCand[is-DTConfigTraco::NSTEPF].size()+
-                         _outerCand[is-DTConfigTraco::NSTEPF].size();
+    if (config()->debug() == 4) {
+      std::cout << " --> "
+                << _innerCand[is - DTConfigTraco::NSTEPF].size() +
+                       _outerCand[is - DTConfigTraco::NSTEPF].size();
       std::cout << " candidates " << std::endl;
     }
     // End debugging
 
-    // Multiple trigger detection between consecutive TRACO's  
+    // Multiple trigger detection between consecutive TRACO's
     setFlag(is);
 
-    //check if there is a H in bx for LVALIDIFH flag
-    if(config()->LVALIDIFH()){
-      for(unsigned int e=0; e<_innerCand[is-DTConfigTraco::NSTEPF].size(); e++) {
-        if(_innerCand[is-DTConfigTraco::NSTEPF][e].BtiTrig()->code()==8){
-          _flag[is-DTConfigTraco::NSTEPF].set(9);
+    // check if there is a H in bx for LVALIDIFH flag
+    if (config()->LVALIDIFH()) {
+      for (unsigned int e = 0;
+           e < _innerCand[is - DTConfigTraco::NSTEPF].size(); e++) {
+        if (_innerCand[is - DTConfigTraco::NSTEPF][e].BtiTrig()->code() == 8) {
+          _flag[is - DTConfigTraco::NSTEPF].set(9);
           break;
         }
       }
-      for(unsigned int e=0; e<_outerCand[is-DTConfigTraco::NSTEPF].size(); e++) {
-        if(_outerCand[is-DTConfigTraco::NSTEPF][e].BtiTrig()->code()==8){
-          _flag[is-DTConfigTraco::NSTEPF].set(9);
+      for (unsigned int e = 0;
+           e < _outerCand[is - DTConfigTraco::NSTEPF].size(); e++) {
+        if (_outerCand[is - DTConfigTraco::NSTEPF][e].BtiTrig()->code() == 8) {
+          _flag[is - DTConfigTraco::NSTEPF].set(9);
           break;
         }
       }
     }
-   
+
     // Loop over first/second tracks
-    //for(int itk=0; itk < DTConfigTraco::NMAXCAND; itk++){ 
-    // FIX this hardcoded 2!! 
-    for(int itk=0; itk < 2; itk++){ 
-    
-      // Get the best inner and outer segments 
-      if(config()->debug()==4)
+    // for(int itk=0; itk < DTConfigTraco::NMAXCAND; itk++){
+    // FIX this hardcoded 2!!
+    for (int itk = 0; itk < 2; itk++) {
+
+      // Get the best inner and outer segments
+      if (config()->debug() == 4)
         std::cout << "Inner:" << std::endl;
-      DTTracoCand* inner = bestCand(itk,_innerCand[is-DTConfigTraco::NSTEPF]);
-      if(config()->debug()==4)
+      DTTracoCand *inner =
+          bestCand(itk, _innerCand[is - DTConfigTraco::NSTEPF]);
+      if (config()->debug() == 4)
         std::cout << "Outer:" << std::endl;
-      DTTracoCand* outer = bestCand(itk,_outerCand[is-DTConfigTraco::NSTEPF]);
-
-      //debug
-      if(config()->debug()>1){
-        if(inner || outer)
-           std::cout<<"Best candidates for track " << itk+1 << " are:"<<std::endl;
-        if(inner){ 
-          std::cout<<"inner->";
+      DTTracoCand *outer =
+          bestCand(itk, _outerCand[is - DTConfigTraco::NSTEPF]);
+
+      // debug
+      if (config()->debug() > 1) {
+        if (inner || outer)
+          std::cout << "Best candidates for track " << itk + 1
+                    << " are:" << std::endl;
+        if (inner) {
+          std::cout << "inner->";
           inner->print();
         }
-        if(outer){
-          std::cout<<"outer->";
+        if (outer) {
+          std::cout << "outer->";
           outer->print();
         }
       }
 
       // Skip to next step if no suitable candidates found
-      if(inner==nullptr&&outer==nullptr)
+      if (inner == nullptr && outer == nullptr)
         break;
 
       // suppression of LTRIG on BTI close to selected HTRIG
       // SV 24/IX/03 : AND suppression of LTRIG close to H in adiacent Traco
       // SV 31/III/03 : test : only if htprf is off--> NO, it's worse
       // if( config()->prefHtrig(0) && config()->prefHtrig(1) ){
-        if(inner){
-          DoAdjBtiLts( inner, _innerCand[is-DTConfigTraco::NSTEPF] );
-        }
-        if(outer){
-          DoAdjBtiLts( outer, _outerCand[is-DTConfigTraco::NSTEPF] );
-        }
+      if (inner) {
+        DoAdjBtiLts(inner, _innerCand[is - DTConfigTraco::NSTEPF]);
+      }
+      if (outer) {
+        DoAdjBtiLts(outer, _outerCand[is - DTConfigTraco::NSTEPF]);
+      }
       //}
 
       // set candidates unusable by further steps
-      if(inner)inner->setUsed(); 
-      if(outer)outer->setUsed(); 
+      if (inner)
+        inner->setUsed();
+      if (outer)
+        outer->setUsed();
       // Create a new TRACO trigger with preview for TS
-      DTTracoTrig* tct = setPV(itk,inner,outer);
+      DTTracoTrig *tct = setPV(itk, inner, outer);
 
       // skip if no TRACO trigger has been created with this trigger
-      if(!tct) break; // something nasty happened. Go to next step
+      if (!tct)
+        break; // something nasty happened. Go to next step
 
       // try a correlation between segments
       int stored = 0;
-      if(inner && outer) {
-        stored = storeCorr(tct,inner,outer,itk);
+      if (inner && outer) {
+        stored = storeCorr(tct, inner, outer, itk);
       }
 
-      if (!stored) { 
-	// No suitable candidate found or no correlation possible
-	// Fill single trigger
-	stored = storeUncorr(tct,inner,outer,itk);
+      if (!stored) {
+        // No suitable candidate found or no correlation possible
+        // Fill single trigger
+        stored = storeUncorr(tct, inner, outer, itk);
       }
 
       // if trigger has been filled store it in TRACO, otherway delete it
       if (stored) {
-	addTrig(is,tct);
+        addTrig(is, tct);
       } else {
-	delete tct;
-        //break;-> II track is computed even if no I track found...
+        delete tct;
+        // break;-> II track is computed even if no I track found...
       }
 
     } // end loop on first/second track
 
     // Inhibit second track at previous bunch crossing
-    if(config()->debug()==4)
-      std::cout<<"Checking overlap I-II track..." <<std::endl;
-    if(!_tracotrig[is-DTConfigTraco::NSTEPF].empty() && is>DTConfigTraco::NSTEPF
-      && (_tracotrig[is-DTConfigTraco::NSTEPF])[0]->isFirst() ) {    //I track at bx
-      if(nTrig(is-1)>0) {                                           //there is a track at bx-1
-        if( !(trigger(is-1,1)->isFirst())  ||                       //trig 1 is II track
-             ( nTrig(is-1)==2 && !(trigger(is-1,2)->isFirst()) )) { //trig 2 is II track
+    if (config()->debug() == 4)
+      std::cout << "Checking overlap I-II track..." << std::endl;
+    if (!_tracotrig[is - DTConfigTraco::NSTEPF].empty() &&
+        is > DTConfigTraco::NSTEPF &&
+        (_tracotrig[is - DTConfigTraco::NSTEPF])[0]
+            ->isFirst()) {                      // I track at bx
+      if (nTrig(is - 1) > 0) {                  // there is a track at bx-1
+        if (!(trigger(is - 1, 1)->isFirst()) || // trig 1 is II track
+            (nTrig(is - 1) == 2 &&
+             !(trigger(is - 1, 2)->isFirst()))) { // trig 2 is II track
           raiseOverlap(is);
-	  if(config()->debug()==4){
-            std::cout << "II track at step " << std::hex << is-1 <<std::dec << "marked rej."<< std::endl;
-            std::cout << "I track overlap flag at step " << std::hex << is << std::dec << " setted" << std::endl;
+          if (config()->debug() == 4) {
+            std::cout << "II track at step " << std::hex << is - 1 << std::dec
+                      << "marked rej." << std::endl;
+            std::cout << "I track overlap flag at step " << std::hex << is
+                      << std::dec << " setted" << std::endl;
           }
         }
       }
     }
-    //debug...
-    for(int isd=0;isd<=DTConfigTraco::NSTEPL-DTConfigTraco::NSTEPF+1;isd++)
-      if(config()->debug()==4){
-        std::cout << "overlap flag step = " << isd+DTConfigTraco::NSTEPF << 
-           "  " << _flag[isd].element(1) << std::endl;
+    // debug...
+    for (int isd = 0; isd <= DTConfigTraco::NSTEPL - DTConfigTraco::NSTEPF + 1;
+         isd++)
+      if (config()->debug() == 4) {
+        std::cout << "overlap flag step = " << isd + DTConfigTraco::NSTEPF
+                  << "  " << _flag[isd].element(1) << std::endl;
       }
     // debugging...
-    if(config()->debug()>0){    
-      if(nTrig(is)>0) {
-	for(int cc=1;cc<=nTrig(is);cc++){
-	  trigger(is,cc)->print();
-	}
+    if (config()->debug() > 0) {
+      if (nTrig(is) > 0) {
+        for (int cc = 1; cc <= nTrig(is); cc++) {
+          trigger(is, cc)->print();
+        }
       }
-    }// end debugging
-  }// end loop on step
+    } // end debugging
+  }   // end loop on step
 }
 
-
-void
-DTTracoChip::raiseOverlap(int step){
-    _flag[step-DTConfigTraco::NSTEPF].set(1);                    //overlap flag raised
-    _flag[step-DTConfigTraco::NSTEPF-1].set(2);                  //mark II rej.
+void DTTracoChip::raiseOverlap(int step) {
+  _flag[step - DTConfigTraco::NSTEPF].set(1);     // overlap flag raised
+  _flag[step - DTConfigTraco::NSTEPF - 1].set(2); // mark II rej.
 }
 
+void DTTracoChip::setFlag(int step, int ext) {
 
-void
-DTTracoChip::setFlag(int step, int ext) {
-
-  if(ext==0){
-    //this is the original: flags from card
-    DTTracoChip* prevTraco = _card->getTRACO(_id.traco()-1);
-    if(prevTraco!=nullptr){
-      if(prevTraco->edgeBTI(step,1,2))
-        _flag[step-DTConfigTraco::NSTEPF].set(3);
-      if(prevTraco->edgeBTI(step,2,2))
-        _flag[step-DTConfigTraco::NSTEPF].set(5);
+  if (ext == 0) {
+    // this is the original: flags from card
+    DTTracoChip *prevTraco = _card->getTRACO(_id.traco() - 1);
+    if (prevTraco != nullptr) {
+      if (prevTraco->edgeBTI(step, 1, 2))
+        _flag[step - DTConfigTraco::NSTEPF].set(3);
+      if (prevTraco->edgeBTI(step, 2, 2))
+        _flag[step - DTConfigTraco::NSTEPF].set(5);
     }
-    DTTracoChip* nextTraco = _card->getTRACO(_id.traco()+1);
-    if(nextTraco!=nullptr){
-      if(nextTraco->edgeBTI(step,1,1))
-        _flag[step-DTConfigTraco::NSTEPF].set(4);
-      if(nextTraco->edgeBTI(step,2,1))
-        _flag[step-DTConfigTraco::NSTEPF].set(6);
+    DTTracoChip *nextTraco = _card->getTRACO(_id.traco() + 1);
+    if (nextTraco != nullptr) {
+      if (nextTraco->edgeBTI(step, 1, 1))
+        _flag[step - DTConfigTraco::NSTEPF].set(4);
+      if (nextTraco->edgeBTI(step, 2, 1))
+        _flag[step - DTConfigTraco::NSTEPF].set(6);
     }
-  }
-  else{
-    //SV III/03: flags from input EXT: only for testing purpose
-    for(int i=0;i<6;i++){
+  } else {
+    // SV III/03: flags from input EXT: only for testing purpose
+    for (int i = 0; i < 6; i++) {
       int ibit = ext >> i;
-      if(ibit & 0x01)   // bit i+1 -> flag 3,4,5,6 : IL,IR,OL,OR
-        _flag[step-DTConfigTraco::NSTEPF].set(i+1 + 2);
+      if (ibit & 0x01) // bit i+1 -> flag 3,4,5,6 : IL,IR,OL,OR
+        _flag[step - DTConfigTraco::NSTEPF].set(i + 1 + 2);
     }
   }
 
-  //debug:
-  if(config()->debug()==4){
+  // debug:
+  if (config()->debug() == 4) {
     std::cout << "Flags set for bx=" << step << std::endl;
-    std::cout << _flag[step-DTConfigTraco::NSTEPF].element(1)<< "  ";
-    std::cout << _flag[step-DTConfigTraco::NSTEPF].element(2)<< "  ";
-    std::cout << _flag[step-DTConfigTraco::NSTEPF].element(3)<< "  ";
-    std::cout << _flag[step-DTConfigTraco::NSTEPF].element(4)<< "  ";
-    std::cout << _flag[step-DTConfigTraco::NSTEPF].element(5)<< "  ";
-    std::cout << _flag[step-DTConfigTraco::NSTEPF].element(6)<< "  ";
-    std::cout << _flag[step-DTConfigTraco::NSTEPF].element(7)<< "  ";
-    std::cout << _flag[step-DTConfigTraco::NSTEPF].element(8)<< "  ";
-    std::cout << _flag[step-DTConfigTraco::NSTEPF].element(9)<< "  "<<std::endl;
-  } //end debugging
+    std::cout << _flag[step - DTConfigTraco::NSTEPF].element(1) << "  ";
+    std::cout << _flag[step - DTConfigTraco::NSTEPF].element(2) << "  ";
+    std::cout << _flag[step - DTConfigTraco::NSTEPF].element(3) << "  ";
+    std::cout << _flag[step - DTConfigTraco::NSTEPF].element(4) << "  ";
+    std::cout << _flag[step - DTConfigTraco::NSTEPF].element(5) << "  ";
+    std::cout << _flag[step - DTConfigTraco::NSTEPF].element(6) << "  ";
+    std::cout << _flag[step - DTConfigTraco::NSTEPF].element(7) << "  ";
+    std::cout << _flag[step - DTConfigTraco::NSTEPF].element(8) << "  ";
+    std::cout << _flag[step - DTConfigTraco::NSTEPF].element(9) << "  "
+              << std::endl;
+  } // end debugging
 }
 
-
-DTTracoCand*
-DTTracoChip::bestCand(int itk, std::vector<DTTracoCand> & tclist) {
+DTTracoCand *DTTracoChip::bestCand(int itk, std::vector<DTTracoCand> &tclist) {
 
   // Return if no candidates
-  if(tclist.empty()) return nullptr;
+  if (tclist.empty())
+    return nullptr;
 
-  // stl function: sort in Ktc ascending or descending order according 
+  // stl function: sort in Ktc ascending or descending order according
   // to user request comparing by default with user-defined <
   // NB don't reverse if candidates are two with same K
-  stable_sort( tclist.begin(),tclist.end() ); //0=K ascending, 1=K descending
-  if(config()->sortKascend(itk) &&
-     !(tclist.size()==2 && tclist[0].K()==tclist[1].K()) ) {
-     reverse( tclist.begin(),tclist.end() );
-     if(config()->debug()==4)
-       std::cout << "Reversing order of sorted candidate list..." << std::endl;
+  stable_sort(tclist.begin(), tclist.end()); // 0=K ascending, 1=K descending
+  if (config()->sortKascend(itk) &&
+      !(tclist.size() == 2 && tclist[0].K() == tclist[1].K())) {
+    reverse(tclist.begin(), tclist.end());
+    if (config()->debug() == 4)
+      std::cout << "Reversing order of sorted candidate list..." << std::endl;
   }
 
   /*
@@ -492,284 +511,307 @@ DTTracoChip::bestCand(int itk, std::vector<DTTracoCand> & tclist) {
   }
  */
 
- // debugging...
- if(config()->debug()==4){
-    std::cout << "DTTracoChip::findBest - Looking for track number " << itk+1 << std::endl ;
-    std::cout << "Sorted std::vector of usable track candidates is:" << std::endl;
+  // debugging...
+  if (config()->debug() == 4) {
+    std::cout << "DTTracoChip::findBest - Looking for track number " << itk + 1
+              << std::endl;
+    std::cout << "Sorted std::vector of usable track candidates is:"
+              << std::endl;
     int i = 1;
-    for(std::vector<DTTracoCand>::iterator p=tclist.begin();p<tclist.end();p++){
-      if((*p).usable()){
+    for (std::vector<DTTracoCand>::iterator p = tclist.begin();
+         p < tclist.end(); p++) {
+      if ((*p).usable()) {
         std::cout << " DTTracoChip Candidate # " << i++;
         (*p).print();
       }
     }
-    std::cout << "--------------------------------------------------" << std::endl;
+    std::cout << "--------------------------------------------------"
+              << std::endl;
   }
   // end debugging
 
   // return the best candidate
-  int i=0;
-  DTTracoCand* bestltrig = nullptr;
+  int i = 0;
+  DTTracoCand *bestltrig = nullptr;
   std::vector<DTTracoCand>::iterator p;
-  for ( p = tclist.begin(); p < tclist.end(); ++p ) {
+  for (p = tclist.begin(); p < tclist.end(); ++p) {
     i++;
     // candidate must be usable and not suppressed by LTS
-    if(AdjBtiLTSuppressed(&(*p))) 
-      if(config()->debug()==4) 
-        std::cout << "Candidate # " << i << " supp. because next to H in adiacent Tracos" << std::endl;
-    if ( (*p).usable() && !AdjBtiLTSuppressed(&(*p)) ) {
+    if (AdjBtiLTSuppressed(&(*p)))
+      if (config()->debug() == 4)
+        std::cout << "Candidate # " << i
+                  << " supp. because next to H in adiacent Tracos" << std::endl;
+    if ((*p).usable() && !AdjBtiLTSuppressed(&(*p))) {
       // check if preference to HTRIG is set and return first trigger
-      if( !config()->prefHtrig(itk) ) return &(*p);
-      if( (*p).BtiTrig()->code()==8 ) return &(*p);
-      if( bestltrig==nullptr ) bestltrig=&(*p);
+      if (!config()->prefHtrig(itk))
+        return &(*p);
+      if ((*p).BtiTrig()->code() == 8)
+        return &(*p);
+      if (bestltrig == nullptr)
+        bestltrig = &(*p);
     }
   }
   return bestltrig;
-
 }
 
-void
-DTTracoChip::DoAdjBtiLts(DTTracoCand* candidate, std::vector<DTTracoCand> & tclist) {
-  // If requested, do suppression of LTRIG on BTI close to selected HTRIG in same traco
-  //if(!(config()->adjBtiLts()) && candidate->BtiTrig()->code()==8) {
-  // SV this is done always, not parametrized !! 
-  if(candidate->BtiTrig()->code()==8) {
+void DTTracoChip::DoAdjBtiLts(DTTracoCand *candidate,
+                              std::vector<DTTracoCand> &tclist) {
+  // If requested, do suppression of LTRIG on BTI close to selected HTRIG in
+  // same traco
+  // if(!(config()->adjBtiLts()) && candidate->BtiTrig()->code()==8) {
+  // SV this is done always, not parametrized !!
+  if (candidate->BtiTrig()->code() == 8) {
     std::vector<DTTracoCand>::iterator p;
-    for(p=tclist.begin();p<tclist.end();p++){
-      if( (*p).BtiTrig()->code()<8 &&
-	  abs(       (*p).BtiTrig()->btiNumber() -
-	       candidate->BtiTrig()->btiNumber() ) < 2 ) {
-	(*p).setUsed();
-        if(config()->debug()==4){
+    for (p = tclist.begin(); p < tclist.end(); p++) {
+      if ((*p).BtiTrig()->code() < 8 &&
+          abs((*p).BtiTrig()->btiNumber() - candidate->BtiTrig()->btiNumber()) <
+              2) {
+        (*p).setUsed();
+        if (config()->debug() == 4) {
           std::cout << "Candidate :";
           (*p).print();
-          std::cout << "Suppressed because adiacent to H trig" <<std::endl;
+          std::cout << "Suppressed because adiacent to H trig" << std::endl;
         } // end debug
-      } // end if
-    } // end candidate loop 
-  } // end if H
+      }   // end if
+    }     // end candidate loop
+  }       // end if H
 }
 
-int
-DTTracoChip::AdjBtiLTSuppressed(DTTracoCand* candidate) {
+int DTTracoChip::AdjBtiLTSuppressed(DTTracoCand *candidate) {
   // If requested, do suppression of LTRIG on adjacent BTI -> obsolete!
-  //if(!(config()->adjBtiLts()) && candidate->BtiTrig()->code()<8) {
-  //SV: Ltrig always suppressed in hardware if Htrig in adj traco!
-    if(candidate->BtiTrig()->code()<8) {
-      if( _flag[candidate->step()-DTConfigTraco::NSTEPF].element(3) &&
-        candidate->position()==1 )                                   return 1;
-      if( _flag[candidate->step()-DTConfigTraco::NSTEPF].element(4) &&
-        candidate->position()==DTConfigTraco::NBTITC )                return 1;
-      if( _flag[candidate->step()-DTConfigTraco::NSTEPF].element(5) &&
-        candidate->position()== DTConfigTraco::NBTITC+1)              return 1;
-      if( _flag[candidate->step()-DTConfigTraco::NSTEPF].element(6) &&
-        candidate->position()==DTConfigTraco::NBTITC*4 )              return 1;
-    }
+  // if(!(config()->adjBtiLts()) && candidate->BtiTrig()->code()<8) {
+  // SV: Ltrig always suppressed in hardware if Htrig in adj traco!
+  if (candidate->BtiTrig()->code() < 8) {
+    if (_flag[candidate->step() - DTConfigTraco::NSTEPF].element(3) &&
+        candidate->position() == 1)
+      return 1;
+    if (_flag[candidate->step() - DTConfigTraco::NSTEPF].element(4) &&
+        candidate->position() == DTConfigTraco::NBTITC)
+      return 1;
+    if (_flag[candidate->step() - DTConfigTraco::NSTEPF].element(5) &&
+        candidate->position() == DTConfigTraco::NBTITC + 1)
+      return 1;
+    if (_flag[candidate->step() - DTConfigTraco::NSTEPF].element(6) &&
+        candidate->position() == DTConfigTraco::NBTITC * 4)
+      return 1;
+  }
   //}
   return 0;
 }
 
-DTTracoTrig*
-DTTracoChip::setPV(int itk, DTTracoCand* inner, DTTracoCand* outer) {
+DTTracoTrig *DTTracoChip::setPV(int itk, DTTracoCand *inner,
+                                DTTracoCand *outer) {
 
   // debugging...
-  if(config()->debug()==4){
+  if (config()->debug() == 4) {
     std::cout << "DTTracoChip::setPV called for candidates : " << std::endl;
-    if(inner)inner->print();
-    if(outer)outer->print();
-    std::cout << "--------------------------------------------------" << std::endl;
+    if (inner)
+      inner->print();
+    if (outer)
+      outer->print();
+    std::cout << "--------------------------------------------------"
+              << std::endl;
   }
-  //end debugging
+  // end debugging
 
   // first or second track. This is tricky:
   // itk=0 menas first track  ==> first= true=1
   // itk=1 menas second track ==> first=false=0
-  int first = (itk==0) ? 1 : 0;
+  int first = (itk == 0) ? 1 : 0;
 
-  //preview selector: the same as priority selector I !!
+  // preview selector: the same as priority selector I !!
   // select which of the inner/outer segments should be used
 
-  DTTracoCand* candidate=nullptr;  
-  if(inner!=nullptr&&outer!=nullptr) {
-//    if(config()->prefHtrig(itk)){   
-//    ---> BUG! selection is ALWAYS for H trigs
-//    ---> fixed by Sara Vanini 25/III/03
-      if(inner->BtiTrig()->code()==8 && outer->BtiTrig()->code()<8 ){
-        candidate=inner;
-      } else if(inner->BtiTrig()->code()<8  && outer->BtiTrig()->code()==8){
-        candidate=outer;
-      } else { //for same quality tracks, pref. to in/out selection
-        if(!config()->prefInner(itk)) {
-          candidate=inner;
-        } else {
-          candidate=outer;
-	}
-      }
-//    } //end if(config()->prefHtrig...
-/*
-    else {
-      if(!config()->prefInner(itk)) {
-	candidate=inner;
+  DTTracoCand *candidate = nullptr;
+  if (inner != nullptr && outer != nullptr) {
+    //    if(config()->prefHtrig(itk)){
+    //    ---> BUG! selection is ALWAYS for H trigs
+    //    ---> fixed by Sara Vanini 25/III/03
+    if (inner->BtiTrig()->code() == 8 && outer->BtiTrig()->code() < 8) {
+      candidate = inner;
+    } else if (inner->BtiTrig()->code() < 8 && outer->BtiTrig()->code() == 8) {
+      candidate = outer;
+    } else { // for same quality tracks, pref. to in/out selection
+      if (!config()->prefInner(itk)) {
+        candidate = inner;
       } else {
-	candidate=outer;
+        candidate = outer;
       }
     }
-*/
-  } else if(inner==nullptr&&outer!=nullptr) {
-    candidate=outer;
-  } else if(inner!=nullptr&&outer==nullptr) {
-    candidate=inner;
+    //    } //end if(config()->prefHtrig...
+    /*
+        else {
+          if(!config()->prefInner(itk)) {
+            candidate=inner;
+          } else {
+            candidate=outer;
+          }
+        }
+    */
+  } else if (inner == nullptr && outer != nullptr) {
+    candidate = outer;
+  } else if (inner != nullptr && outer == nullptr) {
+    candidate = inner;
   } else {
-    return nullptr; // no candidates 
+    return nullptr; // no candidates
   }
 
   // create new trigger with this candidate
-  DTTracoTrig* tct = new DTTracoTrig(this, candidate->step());
+  DTTracoTrig *tct = new DTTracoTrig(this, candidate->step());
   // store preview for TS
   int cod = candidate->BtiTrig()->code();
-  if(candidate->BtiTrig()->btiSL()==1) cod *= 10;
+  if (candidate->BtiTrig()->btiSL() == 1)
+    cod *= 10;
   // k output is 5 bits!!! SV
-  int K=candidate->K();
-  if(K>31)
-    K-=32;
+  int K = candidate->K();
+  if (K > 31)
+    K -= 32;
   int ioflag = 0;
-  if(candidate->position()>4)
+  if (candidate->position() > 4)
     ioflag = 1;
   tct->setPV(first, cod, K, ioflag); // this is already BTI_K-KRAD
 
-  if(config()->debug()==4){
+  if (config()->debug() == 4) {
     std::cout << "Selected candidate stored for preview is: ";
     candidate->print();
   }
   return tct;
 }
 
-int
-DTTracoChip::storeCorr(DTTracoTrig* tctrig, DTTracoCand* inner, DTTracoCand* outer, int tkn) {
+int DTTracoChip::storeCorr(DTTracoTrig *tctrig, DTTracoCand *inner,
+                           DTTracoCand *outer, int tkn) {
 
   // Bunch crossing
   int is = tctrig->step();
 
   // Debugging...
-  if(config()->debug()==4){
+  if (config()->debug() == 4) {
     std::cout << "DTTracoChip::storeCorr called with candidates: " << std::endl;
-    if(inner)inner->print();
-    if(outer)outer->print();
-    std::cout << "--------------------------------------------------" << std::endl;
+    if (inner)
+      inner->print();
+    if (outer)
+      outer->print();
+    std::cout << "--------------------------------------------------"
+              << std::endl;
   }
   // End debugging
 
-  //old orca shift definition
+  // old orca shift definition
   float shift = 0.;
-  //if( config()->trigSetupGeom()!=1 )
-    shift = (int)( _geom->distSL()/_geom->cellH() + 0.5 );
-  //else
-    //shift = DD();
- 
+  // if( config()->trigSetupGeom()!=1 )
+  shift = (int)(_geom->distSL() / _geom->cellH() + 0.5);
+  // else
+  // shift = DD();
+
   int kcor = 9999;
   int xcor = 0;
   int icor = 0;
 
   // Check correlation only if --> this cuts LL follow by H in next 4 bx
-  // SV 1/IV/04 BUG FIX: this cuts LL preview also, traco outputs preview when LTS cut!!!
-  //if( !config()->TcBxLts() ||          // BX LTS is not enabled or
+  // SV 1/IV/04 BUG FIX: this cuts LL preview also, traco outputs preview when
+  // LTS cut!!!
+  // if( !config()->TcBxLts() ||          // BX LTS is not enabled or
   //    !_bxlts.element(is) ||           // no HTRIG in next 4 BX or
   //    inner->BtiTrig()->code()==8 ||   // inner track is HTRIG  or
   //    outer->BtiTrig()->code()==8 ){   // outer track is HTRIG
-  //otherwise in and out trig are L, and necessary one is suppressed for LTS  
-
-    int xq1 = inner->X();
-    int xq2 = outer->X();
-    xcor = (xq2+xq1)/2;
-    kcor = (xq1-xq2)+512;
-    int kq1 = int(shift/2.) * (inner->BtiTrig()->K()-BTIC()) + 512;
-    int kq2 = int(shift/2.) * (outer->BtiTrig()->K()-BTIC()) + 512;
-    //int kd1 = abs(kcor/16-kq1/16);
-    //int kd2 = abs(kcor/16-kq2/16);
-    int kd1 = abs(kcor/16-kq1/16);
-    int kd2 = abs(kcor/16-kq2/16);
-  
-    icor =  kd1<=config()->TcKToll(tkn) && 
-            kd2<=config()->TcKToll(tkn) && 
-            xcor>0;
- 
-    // Debugging...
-    if(config()->debug()==4){
-      std::cout << "*************************************************************";
-      std::cout << std::endl;
-      std::cout << " shift = " << shift;
-      std::cout << " xq1 = " << xq1;
-      std::cout << " xq2 = " << xq2;
-      std::cout << " xcor = " << xcor;
-      std::cout << " kcor = " << kcor;
-      std::cout << " kq1 = " << kq1;
-      std::cout << " kq2 = " << kq2;
-      std::cout << " kd1 = " << kd1;
-      std::cout << " kd2 = " << kd2;
-      std::cout << " icor = " << icor;
-      std::cout << std::endl;
-      std::cout << "*************************************************************";
-      std::cout << std::endl;
-    }// End debugging
+  // otherwise in and out trig are L, and necessary one is suppressed for LTS
+
+  int xq1 = inner->X();
+  int xq2 = outer->X();
+  xcor = (xq2 + xq1) / 2;
+  kcor = (xq1 - xq2) + 512;
+  int kq1 = int(shift / 2.) * (inner->BtiTrig()->K() - BTIC()) + 512;
+  int kq2 = int(shift / 2.) * (outer->BtiTrig()->K() - BTIC()) + 512;
+  // int kd1 = abs(kcor/16-kq1/16);
+  // int kd2 = abs(kcor/16-kq2/16);
+  int kd1 = abs(kcor / 16 - kq1 / 16);
+  int kd2 = abs(kcor / 16 - kq2 / 16);
+
+  icor = kd1 <= config()->TcKToll(tkn) && kd2 <= config()->TcKToll(tkn) &&
+         xcor > 0;
+
+  // Debugging...
+  if (config()->debug() == 4) {
+    std::cout
+        << "*************************************************************";
+    std::cout << std::endl;
+    std::cout << " shift = " << shift;
+    std::cout << " xq1 = " << xq1;
+    std::cout << " xq2 = " << xq2;
+    std::cout << " xcor = " << xcor;
+    std::cout << " kcor = " << kcor;
+    std::cout << " kq1 = " << kq1;
+    std::cout << " kq2 = " << kq2;
+    std::cout << " kd1 = " << kd1;
+    std::cout << " kd2 = " << kd2;
+    std::cout << " icor = " << icor;
+    std::cout << std::endl;
+    std::cout
+        << "*************************************************************";
+    std::cout << std::endl;
+  } // End debugging
 
   //}//end if TcBxLts....
 
-  if(icor){
+  if (icor) {
     // correlation was successfull
     // set the preview correlation bit. It isn't reset if outside ang. window
     tctrig->setPVCorr(1);
     // set K and X
     tctrig->setK(kcor - 512);
-    //std::cout<<"Set K " << kcor << " instead of " << kcor-512 << std::endl;
-    //tctrig->setK(kcor);
+    // std::cout<<"Set K " << kcor << " instead of " << kcor-512 << std::endl;
+    // tctrig->setK(kcor);
     tctrig->setX(xcor);
     // set codes
-    tctrig->setCodeIn( inner->BtiTrig()->code());
+    tctrig->setCodeIn(inner->BtiTrig()->code());
     tctrig->setCodeOut(outer->BtiTrig()->code());
     // set position mask
-    //tctrig->setPosIn(inner->position());
-    //tctrig->setPosOut(outer->position());
-    //SV number of bti instead of position...
-    tctrig->setPosIn( inner->BtiTrig()->btiNumber() );
-    tctrig->setPosOut( outer->BtiTrig()->btiNumber() );
-    //SV store also equation: pattern numbers are 1-32
-    tctrig->setEqIn( inner->BtiTrig()->eq() + 1 ); 
-    tctrig->setEqOut( outer->BtiTrig()->eq() + 1 );
+    // tctrig->setPosIn(inner->position());
+    // tctrig->setPosOut(outer->position());
+    // SV number of bti instead of position...
+    tctrig->setPosIn(inner->BtiTrig()->btiNumber());
+    tctrig->setPosOut(outer->BtiTrig()->btiNumber());
+    // SV store also equation: pattern numbers are 1-32
+    tctrig->setEqIn(inner->BtiTrig()->eq() + 1);
+    tctrig->setEqOut(outer->BtiTrig()->eq() + 1);
 
     // calculate psi, psi_r and Delta(psi_r)
     calculateAngles(tctrig);
     // check angular window for LL  --> fixed by SV 27/III/03 --> NO, for all!
-    //if( (tctrig->qdec()==4) && !insideAngWindow(tctrig)) {
-    if( !insideAngWindow(tctrig) ) {
-       // reset codes, K, X and angles
-        tctrig->resetVar() ;
-    }     
-    //SV 1/IV/04 BUG FIX: check LTS after angle cut...
-    else if( tctrig->qdec()==4   &&          // cut only LL
-             config()->TcBxLts() ){          // BX LTS is  enabled or
-        // reset codes, K, X and angles
-        if(tkn==0 && _bxlts.element(is) )      // I track : there is H -4,+1
-          tctrig->resetVar() ;
-        if(tkn==1 && _bxlts.element(is+1) )    // II track : there is H -4,+1 1 bx later
-          tctrig->resetVar() ;
+    // if( (tctrig->qdec()==4) && !insideAngWindow(tctrig)) {
+    if (!insideAngWindow(tctrig)) {
+      // reset codes, K, X and angles
+      tctrig->resetVar();
     }
-    else {
+    // SV 1/IV/04 BUG FIX: check LTS after angle cut...
+    else if (tctrig->qdec() == 4 && // cut only LL
+             config()->TcBxLts()) { // BX LTS is  enabled or
+      // reset codes, K, X and angles
+      if (tkn == 0 && _bxlts.element(is)) // I track : there is H -4,+1
+        tctrig->resetVar();
+      if (tkn == 1 &&
+          _bxlts.element(is + 1)) // II track : there is H -4,+1 1 bx later
+        tctrig->resetVar();
+    } else {
       // set links to BTI triggers
       tctrig->addDTBtiTrig(inner->BtiTrig());
       tctrig->addDTBtiTrig(outer->BtiTrig());
     }
 
     // Debugging...
-    if(config()->debug()>1){
-      std::cout << "*************************************************************";
+    if (config()->debug() > 1) {
+      std::cout
+          << "*************************************************************";
       std::cout << std::endl;
-      std::cout << "               Correlation was successfull:                  ";
+      std::cout
+          << "               Correlation was successfull:                  ";
       std::cout << std::endl;
       std::cout << " Code = " << tctrig->code();
       std::cout << " K = " << tctrig->K();
       std::cout << " X = " << tctrig->X();
       std::cout << std::endl;
-      std::cout << "*************************************************************";
+      std::cout
+          << "*************************************************************";
       std::cout << std::endl;
     }
     // End debugging
@@ -777,397 +819,398 @@ DTTracoChip::storeCorr(DTTracoTrig* tctrig, DTTracoCand* inner, DTTracoCand* out
   } else {
 
     // Debugging...
-    if(config()->debug()>1){
-      std::cout << "*************************************************************";
+    if (config()->debug() > 1) {
+      std::cout
+          << "*************************************************************";
       std::cout << std::endl;
-      std::cout << "               No correlation possible                       ";
+      std::cout
+          << "               No correlation possible                       ";
       std::cout << std::endl;
-      std::cout << "*************************************************************";
+      std::cout
+          << "*************************************************************";
       std::cout << std::endl;
     }
     // End debugging
-
   }
 
   return icor;
 }
 
-int
-DTTracoChip::storeUncorr(DTTracoTrig* tctrig, DTTracoCand* inner, DTTracoCand* outer, int tkn) {
+int DTTracoChip::storeUncorr(DTTracoTrig *tctrig, DTTracoCand *inner,
+                             DTTracoCand *outer, int tkn) {
 
   // Bunch crossing
   int is = tctrig->step();
 
   // Debugging...
-  if(config()->debug()==4){
-    std::cout << "DTTracoChip::storeUncorr called with candidates: " << std::endl;
-    if(inner)inner->print();
-    if(outer)outer->print();
-    std::cout << "--------------------------------------------------" << std::endl;
+  if (config()->debug() == 4) {
+    std::cout << "DTTracoChip::storeUncorr called with candidates: "
+              << std::endl;
+    if (inner)
+      inner->print();
+    if (outer)
+      outer->print();
+    std::cout << "--------------------------------------------------"
+              << std::endl;
   }
 
   // End debugging
-  // priority selector 
+  // priority selector
   // select which of the inner/outer segments should be used
   // allow re-use of other segment according to configuration
-  DTTracoCand* candidate=nullptr;  
-  if(inner!=nullptr&&outer!=nullptr) {
-//    if(config()->prefHtrig(tkn)){  
-// --> BUG: selector I preference is ALWAYS for H trig
-// fixed by Sara Vanini - 25/III/03
-      if(inner->BtiTrig()->code()==8 && outer->BtiTrig()->code()<8 ){
-        candidate=inner;
-        //if(config()->TcReuse(1)) outer->setUnused(); // reusable
-      } else if(inner->BtiTrig()->code()<8  && outer->BtiTrig()->code()==8){
-        candidate=outer;
-        //if(config()->TcReuse(0)) inner->setUnused(); // reusable
-      } else { //for the same quality triggers:
-        if(!config()->prefInner(tkn)) {
-          candidate=inner;
-          //if(config()->TcReuse(1))  outer->setUnused(); // reusable
-        } else {
-          candidate=outer;
-          //if(config()->TcReuse(0))  inner->setUnused(); // reusable
-	}
-      }//end else
-/*
-    } else {//no Htrig preference
-      if(!config()->prefInner(tkn)) {
-	candidate=inner;
-	if(config()->TcReuse(1))  outer->setUnused(); // reusable
+  DTTracoCand *candidate = nullptr;
+  if (inner != nullptr && outer != nullptr) {
+    //    if(config()->prefHtrig(tkn)){
+    // --> BUG: selector I preference is ALWAYS for H trig
+    // fixed by Sara Vanini - 25/III/03
+    if (inner->BtiTrig()->code() == 8 && outer->BtiTrig()->code() < 8) {
+      candidate = inner;
+      // if(config()->TcReuse(1)) outer->setUnused(); // reusable
+    } else if (inner->BtiTrig()->code() < 8 && outer->BtiTrig()->code() == 8) {
+      candidate = outer;
+      // if(config()->TcReuse(0)) inner->setUnused(); // reusable
+    } else { // for the same quality triggers:
+      if (!config()->prefInner(tkn)) {
+        candidate = inner;
+        // if(config()->TcReuse(1))  outer->setUnused(); // reusable
       } else {
-	candidate=outer;
-	if(config()->TcReuse(0))  inner->setUnused(); // reusable
+        candidate = outer;
+        // if(config()->TcReuse(0))  inner->setUnused(); // reusable
       }
-    }
-*/
-  } else if(inner==nullptr&&outer!=nullptr) {
-    candidate=outer;
-  } else if(inner!=nullptr&&outer==nullptr) {
-    candidate=inner;
+    } // end else
+    /*
+        } else {//no Htrig preference
+          if(!config()->prefInner(tkn)) {
+            candidate=inner;
+            if(config()->TcReuse(1))  outer->setUnused(); // reusable
+          } else {
+            candidate=outer;
+            if(config()->TcReuse(0))  inner->setUnused(); // reusable
+          }
+        }
+    */
+  } else if (inner == nullptr && outer != nullptr) {
+    candidate = outer;
+  } else if (inner != nullptr && outer == nullptr) {
+    candidate = inner;
   } else {
-    return 0; // no candidates 
+    return 0; // no candidates
   }
 
-  //SV *** FOR TESTBEAM OR TEST BENCH PURPOSE ***
-  //theta trigger bin present(1) or absent(0)
-  //int thTr = (_flag[is-DTConfigTraco::NSTEPF].element(7)) ?
+  // SV *** FOR TESTBEAM OR TEST BENCH PURPOSE ***
+  // theta trigger bin present(1) or absent(0)
+  // int thTr = (_flag[is-DTConfigTraco::NSTEPF].element(7)) ?
   //   _flag[is-DTConfigTraco::NSTEPF].element(7):
   //   _flag[is-DTConfigTraco::NSTEPF].element(8);
 
   // priority selector II: accept or discard candidate according to masks:
   // ** LOW TRIGGERS
-  if( candidate->BtiTrig()->code()<8 ) { 
-    // first check with LVALIDIFH: if 1, accept low if there is a H in traco at bx
-    if(config()->LVALIDIFH() && _flag[is-DTConfigTraco::NSTEPF].element(9)){ 
-      if(config()->debug()>1)
+  if (candidate->BtiTrig()->code() < 8) {
+    // first check with LVALIDIFH: if 1, accept low if there is a H in traco at
+    // bx
+    if (config()->LVALIDIFH() && _flag[is - DTConfigTraco::NSTEPF].element(9)) {
+      if (config()->debug() > 1)
         std::cout << "Low accepted because LVALIDIFH on...." << std::endl;
-    }
-    else {//LVALIDIFH==0 or there isn't H in traco in bx : check theta!
-      //theta check
-      if( !config()->singleLenab(tkn) ) {
+    } else { // LVALIDIFH==0 or there isn't H in traco in bx : check theta!
+      // theta check
+      if (!config()->singleLenab(tkn)) {
         // LTF: single LTRIG not always en. Check cond.:
-        if( config()->singleLflag(tkn)==1 ||      //always discarded
-	    ( config()->singleLflag(tkn)==2 && !(_card->TSTh()->nHTrig(is)) ) ||
-	    ( config()->singleLflag(tkn)==0 && !(_card->TSTh()->nTrig(is))  ) ){ 
-// SV --> for TESTS version
-//        config()->singleLflag(tkn)==0 && thTr==0 ||   //only with theta trig. 
-//        config()->singleLflag(tkn)==2 && thTr==0  ){  //only with theta H trig (not hw)
-        if(config()->debug()>1)
-          std::cout << "Single low trigger discarded by preview and "
-               << "priority selector for ltmsk!" <<std::endl;
-        return 0;}
+        if (config()->singleLflag(tkn) == 1 || // always discarded
+            (config()->singleLflag(tkn) == 2 && !(_card->TSTh()->nHTrig(is))) ||
+            (config()->singleLflag(tkn) == 0 && !(_card->TSTh()->nTrig(is)))) {
+          // SV --> for TESTS version
+          //        config()->singleLflag(tkn)==0 && thTr==0 ||   //only with
+          //        theta trig. config()->singleLflag(tkn)==2 && thTr==0  ){
+          //        //only with theta H trig (not hw)
+          if (config()->debug() > 1)
+            std::cout << "Single low trigger discarded by preview and "
+                      << "priority selector for ltmsk!" << std::endl;
+          return 0;
+        }
         //       ^-------- trigger is suppressed and will not be stored
-      }//end theta
+      } // end theta
 
-    } //end else
-    //REUSE : mark candidates reusable HERE! SV BUG FIX 6IV04
-    if(candidate==inner && config()->TcReuse(1) && outer)
+    } // end else
+    // REUSE : mark candidates reusable HERE! SV BUG FIX 6IV04
+    if (candidate == inner && config()->TcReuse(1) && outer)
       outer->setUnused();
-    if(candidate==outer && config()->TcReuse(0) && inner)
+    if (candidate == outer && config()->TcReuse(0) && inner)
       inner->setUnused();
 
     // LTS suppression
-    if(config()->TcBxLts()){
-      if( (tkn==0 && _bxlts.element(is))       // I track : there is H -4,+1
-                        ||
-          (tkn==1 && _bxlts.element(is+1)) ){  // II track : there is H -4,+1 1 bx later
-        tctrig->resetVar() ;
-        if(config()->debug()>1)
-          std::cout << "Low trigger suppressed because H in next 4 bx "<<
-               " and LTS flag on...." << std::endl;
+    if (config()->TcBxLts()) {
+      if ((tkn == 0 && _bxlts.element(is)) // I track : there is H -4,+1
+          ||
+          (tkn == 1 &&
+           _bxlts.element(is + 1))) { // II track : there is H -4,+1 1 bx later
+        tctrig->resetVar();
+        if (config()->debug() > 1)
+          std::cout << "Low trigger suppressed because H in next 4 bx "
+                    << " and LTS flag on...." << std::endl;
         return 1; // trigger is suppressed but preview will be stored
       }
-    }//end lts
+    } // end lts
 
-//    } //end else
-  } //Low trigs
+    //    } //end else
+  } // Low trigs
 
-  // Preview Htmsk not implemented: awaiting decision 
+  // Preview Htmsk not implemented: awaiting decision
   // --> implemented in priority selector by SV
   else { // HTRIG
-    //if(config()->singleHflag(tkn)==1 && thTr==0 )  //this is for testing
-    if( config()->singleHflag(tkn)==1 && !(_card->TSTh()->nTrig(is) ) )
+    // if(config()->singleHflag(tkn)==1 && thTr==0 )  //this is for testing
+    if (config()->singleHflag(tkn) == 1 && !(_card->TSTh()->nTrig(is)))
       return 0;
-      // ^-----trigger is suppressed and will not be stored
+    // ^-----trigger is suppressed and will not be stored
 
-    //mark candidates reusable HERE! SV BUG FIX 6IV04
-    if(candidate==inner && config()->TcReuse(1) && outer)
+    // mark candidates reusable HERE! SV BUG FIX 6IV04
+    if (candidate == inner && config()->TcReuse(1) && outer)
       outer->setUnused();
-    if(candidate==outer && config()->TcReuse(0) && inner)
+    if (candidate == outer && config()->TcReuse(0) && inner)
       inner->setUnused();
   }
 
-  // set code, position, K and X  
+  // set code, position, K and X
   float shift;
-  //if(config()->trigSetupGeom()!=1 )
-    shift = (int)( _geom->distSL()/_geom->cellH() + 0.5 );
-  //else 
-    //shift = DD();  //SV 19/III/03
-  int kucor = (int)( 0.5*shift * (candidate->BtiTrig()->K()-BTIC()) );
+  // if(config()->trigSetupGeom()!=1 )
+  shift = (int)(_geom->distSL() / _geom->cellH() + 0.5);
+  // else
+  // shift = DD();  //SV 19/III/03
+  int kucor = (int)(0.5 * shift * (candidate->BtiTrig()->K() - BTIC()));
   tctrig->setK(kucor);
-  tctrig->setX( candidate->X() );
+  tctrig->setX(candidate->X());
   // correlation wasn't successfull
-  // set the preview correlation bit. 
+  // set the preview correlation bit.
   tctrig->setPVCorr(0);
-  if(candidate->BtiTrig()->btiSL()==1){    // inner track
+  if (candidate->BtiTrig()->btiSL() == 1) { // inner track
     tctrig->setCodeIn(candidate->BtiTrig()->code());
     tctrig->setCodeOut(0);
-    //tctrig->setPosIn(candidate->position());
-    //SV number of bti instead of position...
-    tctrig->setPosIn(candidate->BtiTrig()->btiNumber() );
+    // tctrig->setPosIn(candidate->position());
+    // SV number of bti instead of position...
+    tctrig->setPosIn(candidate->BtiTrig()->btiNumber());
     tctrig->setPosOut(0);
-    //SV store also equation
-    tctrig->setEqIn( candidate->BtiTrig()->eq() + 1 );
-    tctrig->setEqOut( 0 );
-  } else {                                               // outer track
+    // SV store also equation
+    tctrig->setEqIn(candidate->BtiTrig()->eq() + 1);
+    tctrig->setEqOut(0);
+  } else { // outer track
     tctrig->setCodeIn(0);
     tctrig->setCodeOut(candidate->BtiTrig()->code());
     tctrig->setPosIn(0);
-    //SV number of bti instead of position...
-    tctrig->setPosOut(candidate->BtiTrig()->btiNumber() );
-    //tctrig->setPosOut(candidate->position());
-    //SV store also equation
-    tctrig->setEqIn( 0 );
-    tctrig->setEqOut( candidate->BtiTrig()->eq() + 1);
+    // SV number of bti instead of position...
+    tctrig->setPosOut(candidate->BtiTrig()->btiNumber());
+    // tctrig->setPosOut(candidate->position());
+    // SV store also equation
+    tctrig->setEqIn(0);
+    tctrig->setEqOut(candidate->BtiTrig()->eq() + 1);
   }
 
   // coordinate converter LUT
   // calculate psi, psi_r and Delta(psi_r)
   calculateAngles(tctrig);
   // check angular window only for Low!!  --> fixed SV 27/III/03--> NO, for all!
-  //if( candidate->BtiTrig()->code() < 8 && !insideAngWindow(tctrig) ){
-  if( !insideAngWindow(tctrig) ){
+  // if( candidate->BtiTrig()->code() < 8 && !insideAngWindow(tctrig) ){
+  if (!insideAngWindow(tctrig)) {
     // reset codes, K, X and angles
-    tctrig->resetVar() ;
-    if(config()->debug()>1)
+    tctrig->resetVar();
+    if (config()->debug() > 1)
       std::cout << "L rejected because outside angular window!" << std::endl;
-   } else {
+  } else {
     // set links to BTI trigger
     tctrig->addDTBtiTrig(candidate->BtiTrig());
   }
 
   // Debugging...
-  if(config()->debug()>1){
-    std::cout << "*************************************************************";
+  if (config()->debug() > 1) {
+    std::cout
+        << "*************************************************************";
     std::cout << std::endl;
-    std::cout << "               Single trigger stored:                        ";
+    std::cout
+        << "               Single trigger stored:                        ";
     std::cout << std::endl;
     std::cout << " Code = " << tctrig->code();
     std::cout << " K = " << tctrig->K();
     std::cout << " X = " << tctrig->X();
     std::cout << std::endl;
-    std::cout << "*************************************************************";
+    std::cout
+        << "*************************************************************";
     std::cout << std::endl;
   }
   // End debugging
 
   return 1;
-
 }
 
-void
-DTTracoChip::add_btiT(int step, int pos, const DTBtiTrigData* btitrig) {
+void DTTracoChip::add_btiT(int step, int pos, const DTBtiTrigData *btitrig) {
 
-  if(pos<1 || pos>4*DTConfigTraco::NBTITC) {
+  if (pos < 1 || pos > 4 * DTConfigTraco::NBTITC) {
     std::cout << "DTTracoChip::add_btiT: wrong position: " << pos;
     std::cout << "trigger not added!" << std::endl;
     return;
   }
-  if(step<DTConfigTraco::NSTEPF||step>DTConfigTraco::NSTEPL){
+  if (step < DTConfigTraco::NSTEPF || step > DTConfigTraco::NSTEPL) {
     std::cout << "DTTracoChip::add_btiT: step out of range: " << step;
     std::cout << "trigger not added!" << std::endl;
     return;
   }
 
-  if(!config()->usedBti(pos)) {
-    if(config()->debug()==4){
+  if (!config()->usedBti(pos)) {
+    if (config()->debug() == 4) {
       std::cout << "DTTracoChip::add_btiT: position: " << pos;
       std::cout << "has disconnected bti" << std::endl;
     }
     return;
   }
 
-
   // 091103 SV: acceptances are taken from geometry if useAcceptParam()=false
-  // otherwise cuts based on LL,LH,CL,CH,RL,RH taken from  configuration are applied in TracoCard::loadTraco 
-  if(_card->useAcceptParamFlag()==false) {
+  // otherwise cuts based on LL,LH,CL,CH,RL,RH taken from  configuration are
+  // applied in TracoCard::loadTraco
+  if (_card->useAcceptParamFlag() == false) {
     // check K inside acceptance
-    if(btitrig->K()<_PSIMIN[pos-1] || btitrig->K()>_PSIMAX[pos-1] ) {
-      if(config()->debug()>1){
-        std::cout << "In TRACO num. " << number() << " BTI trig. in pos " << pos << " outside K acceptance (";
-        std::cout << _PSIMIN[pos-1] << "-->";
-        std::cout << _PSIMAX[pos-1] << ") - Not added" << std::endl;
+    if (btitrig->K() < _PSIMIN[pos - 1] || btitrig->K() > _PSIMAX[pos - 1]) {
+      if (config()->debug() > 1) {
+        std::cout << "In TRACO num. " << number() << " BTI trig. in pos " << pos
+                  << " outside K acceptance (";
+        std::cout << _PSIMIN[pos - 1] << "-->";
+        std::cout << _PSIMAX[pos - 1] << ") - Not added" << std::endl;
       }
       return;
     }
-  } 
+  }
 
   // Store trigger candidate
-  if(pos<=DTConfigTraco::NBTITC){
-    _innerCand[step-DTConfigTraco::NSTEPF].push_back(
-      DTTracoCand(this,btitrig,pos,step));
+  if (pos <= DTConfigTraco::NBTITC) {
+    _innerCand[step - DTConfigTraco::NSTEPF].push_back(
+        DTTracoCand(this, btitrig, pos, step));
   } else {
-    _outerCand[step-DTConfigTraco::NSTEPF].push_back(
-      DTTracoCand(this,btitrig,pos,step));
+    _outerCand[step - DTConfigTraco::NSTEPF].push_back(
+        DTTracoCand(this, btitrig, pos, step));
   }
 
   // Fill array for BX LTS
-  if(btitrig->code()==8){
-    for(int is=step-4;is<step;is++){       // set flag for 4 previous BX
-      if(is>0&&is<=DTConfigTraco::NSTEPL) _bxlts.set(is);
+  if (btitrig->code() == 8) {
+    for (int is = step - 4; is < step; is++) { // set flag for 4 previous BX
+      if (is > 0 && is <= DTConfigTraco::NSTEPL)
+        _bxlts.set(is);
     }
-    //SV 1/IV/04 BUG FIX
-    _bxlts.set(step+1);
+    // SV 1/IV/04 BUG FIX
+    _bxlts.set(step + 1);
     // Debugging
-    if(config()->debug()==4)
-      for(int is=0;is<DTConfigTraco::NSTEPL;is++)
-       std::cout<<"_bxlts["<<is<<"]="<<_bxlts.element(is)<<std::endl;
+    if (config()->debug() == 4)
+      for (int is = 0; is < DTConfigTraco::NSTEPL; is++)
+        std::cout << "_bxlts[" << is << "]=" << _bxlts.element(is) << std::endl;
   }
 
   // Debugging
-  if(config()->debug()>1){
+  if (config()->debug() > 1) {
     std::cout << "BTI Trigger added at step " << step;
-    std::cout << " to TRACO " << _id.traco() << " at position " << pos << std::endl;
+    std::cout << " to TRACO " << _id.traco() << " at position " << pos
+              << std::endl;
     btitrig->print();
   } // End debugging
-
 }
 
-
-void
-DTTracoChip::addTrig(int step, DTTracoTrig* tctrig) {
-  if(step<DTConfigTraco::NSTEPF||step>DTConfigTraco::NSTEPL){
+void DTTracoChip::addTrig(int step, DTTracoTrig *tctrig) {
+  if (step < DTConfigTraco::NSTEPF || step > DTConfigTraco::NSTEPL) {
     std::cout << "DTTracoChip::addTrig: step out of range: " << step;
     std::cout << " trigger not added!" << std::endl;
     return;
   }
-  _tracotrig[step-DTConfigTraco::NSTEPF].push_back(tctrig);
+  _tracotrig[step - DTConfigTraco::NSTEPF].push_back(tctrig);
 
   // Debugging...
 
-  if(config()->debug()==4){
-    std::cout << "DTTracoChip::addTrig: adding trigger:"<< std::endl; 
+  if (config()->debug() == 4) {
+    std::cout << "DTTracoChip::addTrig: adding trigger:" << std::endl;
     tctrig->print();
   }
   // End debugging
-
 }
 
-int
-DTTracoChip::nTrig(int step) const {
-  if(step<DTConfigTraco::NSTEPF||step>DTConfigTraco::NSTEPL){
+int DTTracoChip::nTrig(int step) const {
+  if (step < DTConfigTraco::NSTEPF || step > DTConfigTraco::NSTEPL) {
     std::cout << "DTTracoChip::nTrig: step out of range: " << step;
     std::cout << " 0 returned!" << std::endl;
     return 0;
   }
-  return _tracotrig[step-DTConfigTraco::NSTEPF].size();
+  return _tracotrig[step - DTConfigTraco::NSTEPF].size();
 }
 
-DTTracoTrig*
-DTTracoChip::trigger(int step, unsigned n) const {
-  if(step<DTConfigTraco::NSTEPF||step>DTConfigTraco::NSTEPL){
+DTTracoTrig *DTTracoChip::trigger(int step, unsigned n) const {
+  if (step < DTConfigTraco::NSTEPF || step > DTConfigTraco::NSTEPL) {
     std::cout << "DTTracoChip::trigger: step out of range: " << step;
     std::cout << " empty pointer returned!" << std::endl;
     return nullptr;
   }
-  if(n<1 || n>_tracotrig[step-DTConfigTraco::NSTEPF].size()) {
+  if (n < 1 || n > _tracotrig[step - DTConfigTraco::NSTEPF].size()) {
     std::cout << "DTTracoChip::trigger: requested trigger doesn't exist: " << n;
     std::cout << " empty pointer returned!" << std::endl;
     return nullptr;
   }
-  std::vector<DTTracoTrig*>::const_iterator p = 
-    _tracotrig[step-DTConfigTraco::NSTEPF].begin()+n-1;
+  std::vector<DTTracoTrig *>::const_iterator p =
+      _tracotrig[step - DTConfigTraco::NSTEPF].begin() + n - 1;
   return *p;
 }
 
-DTTracoTrigData
-DTTracoChip::triggerData(int step, unsigned n) const {
-  if(step<DTConfigTraco::NSTEPF||step>DTConfigTraco::NSTEPL){
+DTTracoTrigData DTTracoChip::triggerData(int step, unsigned n) const {
+  if (step < DTConfigTraco::NSTEPF || step > DTConfigTraco::NSTEPL) {
     std::cout << "DTTracoChip::triggerData: step out of range: " << step;
     std::cout << " dummy trigger returned!" << std::endl;
     return DTTracoTrigData();
   }
-  if(n<1 || n>_tracotrig[step-DTConfigTraco::NSTEPF].size()) {
+  if (n < 1 || n > _tracotrig[step - DTConfigTraco::NSTEPF].size()) {
     std::cout << "DTTracoChip::trigger: requested trigger doesn't exist: " << n;
     std::cout << " dummy trigger returned!" << std::endl;
     return DTTracoTrigData();
   }
-  std::vector<DTTracoTrig*>::const_iterator p = 
-    _tracotrig[step-DTConfigTraco::NSTEPF].begin()+n-1;
+  std::vector<DTTracoTrig *>::const_iterator p =
+      _tracotrig[step - DTConfigTraco::NSTEPF].begin() + n - 1;
   return (*p)->data();
 }
 
-float
-DTTracoChip::psiRad(int sl) const {
-/*
-  // Radial angle of correlator center in mrad in CMS frame
-  LocalPoint p = localPosition();
-  float x = p.x();
-  float y = p.y();
-  float z = p.z();
-  if        (sl==1) {
-    z -= 0.5 * _geom->distSL();
-  } else if (sl==3) {
-    z += 0.5 * _geom->distSL();
-  }
-  float fpsir = _geom->stat()->toGlobal(LocalPoint(x,y,z)).phi()-
-                _geom->phiCh();
-  if(fpsir<-M_PI)fpsir+=M_PI*2;
-  if(fpsir>M_PI)fpsir-=M_PI*2;
-  return fpsir*1000;
-*/
+float DTTracoChip::psiRad(int sl) const {
+  /*
+    // Radial angle of correlator center in mrad in CMS frame
+    LocalPoint p = localPosition();
+    float x = p.x();
+    float y = p.y();
+    float z = p.z();
+    if        (sl==1) {
+      z -= 0.5 * _geom->distSL();
+    } else if (sl==3) {
+      z += 0.5 * _geom->distSL();
+    }
+    float fpsir = _geom->stat()->toGlobal(LocalPoint(x,y,z)).phi()-
+                  _geom->phiCh();
+    if(fpsir<-M_PI)fpsir+=M_PI*2;
+    if(fpsir>M_PI)fpsir-=M_PI*2;
+    return fpsir*1000;
+  */
   return 0.0;
 }
 
-int
-DTTracoChip::KRad() const {
+int DTTracoChip::KRad() const {
   // K parameter of the radial angle of correlator center
-  //float distp2 = (int)(2*_geom->cellH()*config()->ST()/_geom->cellPitch());
-  //return -(int)(tan(psiRad(sl)/1000)*distp2); // sign is reverted!!!
-  //return _krad;
-  
-  //SV V/03: for harware bug in traco....
-  int KRad=0;
+  // float distp2 = (int)(2*_geom->cellH()*config()->ST()/_geom->cellPitch());
+  // return -(int)(tan(psiRad(sl)/1000)*distp2); // sign is reverted!!!
+  // return _krad;
+
+  // SV V/03: for harware bug in traco....
+  int KRad = 0;
   return KRad;
-   
 }
 
-int
-DTTracoChip::useSecondTrack(int step) const {
+int DTTracoChip::useSecondTrack(int step) const {
   // return 1 if II track use is allow
   // return 0 if II track has been rejected
-  if(step<DTConfigTraco::NSTEPF||step>DTConfigTraco::NSTEPL){
+  if (step < DTConfigTraco::NSTEPF || step > DTConfigTraco::NSTEPL) {
     std::cout << "DTTracoChip::useSecondTrack: step out of range: " << step;
     std::cout << " 0 returned!" << std::endl;
     return 0;
   }
-  return !(_flag[step-DTConfigTraco::NSTEPF].element(2));
+  return !(_flag[step - DTConfigTraco::NSTEPF].element(2));
 }
 
-int
-DTTracoChip::edgeBTI(int step, int io, int lr) const {
-  if(step<DTConfigTraco::NSTEPF||step>DTConfigTraco::NSTEPL){
+int DTTracoChip::edgeBTI(int step, int io, int lr) const {
+  if (step < DTConfigTraco::NSTEPF || step > DTConfigTraco::NSTEPL) {
     std::cout << "DTTracoChip::edgeBTI: step out of range: " << step;
     std::cout << " 0 returned!" << std::endl;
     return 0;
@@ -1177,190 +1220,187 @@ DTTracoChip::edgeBTI(int step, int io, int lr) const {
   // right edge ==> rl=1;  left edge ==> rl=2            |11 12|
   //
   std::vector<DTTracoCand>::const_iterator p;
-  if(io==1){
-    if(!_innerCand[step-DTConfigTraco::NSTEPF].empty()) {
+  if (io == 1) {
+    if (!_innerCand[step - DTConfigTraco::NSTEPF].empty()) {
       // SV 24/IX/03 fix: only HTRIG accepted
-      for(p=_innerCand[step-DTConfigTraco::NSTEPF].begin();
-	  p<_innerCand[step-DTConfigTraco::NSTEPF].end(); p++){
-	if(lr==1 && (*p).position()==1 && (*p).BtiTrig()->code()==8 ) 
-          return  1; 
-	if(lr==2 && (*p).position()==DTConfigTraco::NBTITC && (*p).BtiTrig()->code()==8 )
-          return  1; 
+      for (p = _innerCand[step - DTConfigTraco::NSTEPF].begin();
+           p < _innerCand[step - DTConfigTraco::NSTEPF].end(); p++) {
+        if (lr == 1 && (*p).position() == 1 && (*p).BtiTrig()->code() == 8)
+          return 1;
+        if (lr == 2 && (*p).position() == DTConfigTraco::NBTITC &&
+            (*p).BtiTrig()->code() == 8)
+          return 1;
       }
     }
   } else {
-    if(!_outerCand[step-DTConfigTraco::NSTEPF].empty()) {
-      for(p=_outerCand[step-DTConfigTraco::NSTEPF].begin();
-	  p<_outerCand[step-DTConfigTraco::NSTEPF].end(); p++){
-	//SV: is the following correct???FIX if using _card to set _flag
-        //if(lr==1 && (*p).position()==DTConfigTraco::NBTITC+1)return 1; //or pos=8??
-	//if(lr==2 && (*p).position()==DTConfigTraco::NBTITC*4)return 1; //or pos=13?? 
-        //SV 24/IX/03 fix 
-        if(lr==1 && (*p).position()==DTConfigTraco::NBTITC*3+1 && (*p).BtiTrig()->code()==8 )
-          return  1; 
-	if(lr==2 && (*p).position()==DTConfigTraco::NBTITC*2   && (*p).BtiTrig()->code()==8 )
-          return  1;  
+    if (!_outerCand[step - DTConfigTraco::NSTEPF].empty()) {
+      for (p = _outerCand[step - DTConfigTraco::NSTEPF].begin();
+           p < _outerCand[step - DTConfigTraco::NSTEPF].end(); p++) {
+        // SV: is the following correct???FIX if using _card to set _flag
+        // if(lr==1 && (*p).position()==DTConfigTraco::NBTITC+1)return 1; //or
+        // pos=8?? if(lr==2 && (*p).position()==DTConfigTraco::NBTITC*4)return
+        // 1;
+        // //or pos=13?? SV 24/IX/03 fix
+        if (lr == 1 && (*p).position() == DTConfigTraco::NBTITC * 3 + 1 &&
+            (*p).BtiTrig()->code() == 8)
+          return 1;
+        if (lr == 2 && (*p).position() == DTConfigTraco::NBTITC * 2 &&
+            (*p).BtiTrig()->code() == 8)
+          return 1;
       }
     }
   }
-  return  0;
+  return 0;
 }
 
-void 
-DTTracoChip::calculateAngles(DTTracoTrig* tct) {
+void DTTracoChip::calculateAngles(DTTracoTrig *tct) {
 
-  int ipsi=0;
-  int iphir=0;
-  int idpsir=0; 
-/* obsolete  
-  //TB 2004 luts formula from minicrate CCB
-  if( config()->trigSetupGeom()==2 ){
-    ipsi = _lutsCCB->get_k( (tct->K()+511) );
+  int ipsi = 0;
+  int iphir = 0;
+  int idpsir = 0;
+  /* obsolete
+    //TB 2004 luts formula from minicrate CCB
+    if( config()->trigSetupGeom()==2 ){
+      ipsi = _lutsCCB->get_k( (tct->K()+511) );
 
-    int flag = 0;
-    int qual=tct->data().qdec();
-    if(qual==3 || qual==1)                //case 0:outer
-      flag=0;
-    if(qual==2 || qual==0)                //case 1:inner
-      flag=1;
-    if(qual==6 || qual==5 || qual==4)     //case 2:correlated
-      flag=2;
+      int flag = 0;
+      int qual=tct->data().qdec();
+      if(qual==3 || qual==1)                //case 0:outer
+        flag=0;
+      if(qual==2 || qual==0)                //case 1:inner
+        flag=1;
+      if(qual==6 || qual==5 || qual==4)     //case 2:correlated
+        flag=2;
 
-    iphir = _lutsCCB->get_x( (tct->X()+512*flag) );
+      iphir = _lutsCCB->get_x( (tct->X()+512*flag) );
 
-    idpsir = ipsi - iphir/8;
-  }
+      idpsir = ipsi - iphir/8;
+    }
 
- //TB 2003 luts data format
- if( config()->trigSetupGeom()==1 ){
-    //compute bending angles of traco output with lookup tables
-    //SV TB2003: first trigger board isn't connected;
-    ipsi = _luts->getPsi(tct->K());  
-    int flag = 0;
-    int qual=tct->data().qdec();
-    if(qual==3 || qual==1)                //case 0:outer
-      flag=0;  
-    if(qual==2 || qual==0)                //case 1:inner
-      flag=1;  
-    if(qual==6 || qual==5 || qual==4)     //case 2:correlated
-      flag=2;  
-    iphir = _luts->getPhiRad( tct->X(), flag);
-    idpsir = _luts->getBendAng( tct->X(), tct->K(), flag);
-  }
- */
+   //TB 2003 luts data format
+   if( config()->trigSetupGeom()==1 ){
+      //compute bending angles of traco output with lookup tables
+      //SV TB2003: first trigger board isn't connected;
+      ipsi = _luts->getPsi(tct->K());
+      int flag = 0;
+      int qual=tct->data().qdec();
+      if(qual==3 || qual==1)                //case 0:outer
+        flag=0;
+      if(qual==2 || qual==0)                //case 1:inner
+        flag=1;
+      if(qual==6 || qual==5 || qual==4)     //case 2:correlated
+        flag=2;
+      iphir = _luts->getPhiRad( tct->X(), flag);
+      idpsir = _luts->getBendAng( tct->X(), tct->K(), flag);
+    }
+   */
 
   // 091030 SV angles computed from DB lut parameters
-  if( _card->lutFromDBFlag()==1 )
-  {
-    ipsi = _lutsCCB->get_k( (tct->K()+512) );
+  if (_card->lutFromDBFlag() == 1) {
+    ipsi = _lutsCCB->get_k((tct->K() + 512));
 
     int flag = 0;
-    int qual=tct->data().qdec();
-    if(qual==3 || qual==1)                //case 0:outer
-      flag=0;
-    if(qual==2 || qual==0)                //case 1:inner
-      flag=1;
-    if(qual==6 || qual==5 || qual==4)     //case 2:correlated
-      flag=2;
-
-    iphir = _lutsCCB->get_x( (tct->X()+512*flag) );
-
-    idpsir = ipsi - iphir/8;
-  }
-  else
-  // compute angles from CMSSW geometry 
-  //if( config()->trigSetupGeom()==0 )
+    int qual = tct->data().qdec();
+    if (qual == 3 || qual == 1) // case 0:outer
+      flag = 0;
+    if (qual == 2 || qual == 0) // case 1:inner
+      flag = 1;
+    if (qual == 6 || qual == 5 || qual == 4) // case 2:correlated
+      flag = 2;
+
+    iphir = _lutsCCB->get_x((tct->X() + 512 * flag));
+
+    idpsir = ipsi - iphir / 8;
+  } else
+  // compute angles from CMSSW geometry
+  // if( config()->trigSetupGeom()==0 )
   {
     DTTracoTrigData td = tct->data();
     // psi
-    //  float fpsi = atan( (float)(tct->K()) * _geom->cellPitch() / 
+    //  float fpsi = atan( (float)(tct->K()) * _geom->cellPitch() /
     //		     (_geom->distSL() * config()->ST()) );
-    float fpsi = atan( _card->localDirection(&td).x() /   // e.g. x>0 and
-                     _card->localDirection(&td).z() );    //      z<0 => fpsi<0
+    float fpsi = atan(_card->localDirection(&td).x() / // e.g. x>0 and
+                      _card->localDirection(&td).z()); //      z<0 => fpsi<0
 
     // Change sign in case of wheel<0 or wheel==0 and station == 1,4,5,8,9,12
     int mywh = tct->ChamberId().wheel();
-    if (mywh<0   ||
-	(mywh==0 && (tct->ChamberId().sector()%4)<2))
+    if (mywh < 0 || (mywh == 0 && (tct->ChamberId().sector() % 4) < 2))
       fpsi = -fpsi;
-    
-    fpsi*=DTConfigTraco::RESOLPSI;
-    if(fpsi<=0)
-      fpsi-=1.0;
+
+    fpsi *= DTConfigTraco::RESOLPSI;
+    if (fpsi <= 0)
+      fpsi -= 1.0;
     ipsi = (int)fpsi;
     // if outside range set to lower edge
-    if( ipsi>= DTConfigTraco::RESOLPSI || ipsi< -DTConfigTraco::RESOLPSI ) 
-      ipsi=-DTConfigTraco::RESOLPSI;
-
+    if (ipsi >= DTConfigTraco::RESOLPSI || ipsi < -DTConfigTraco::RESOLPSI)
+      ipsi = -DTConfigTraco::RESOLPSI;
 
     // psi_r
-    float fpsir = _card->CMSPosition(&td).phi()-_geom->phiCh();
-
-    if(fpsir<-M_PI)
-      fpsir+=M_PI*2;
-    if(fpsir>M_PI)
-      fpsir-=M_PI*2;
-    fpsir*=DTConfigTraco::RESOLPSIR;
-    if(fpsir<=0)
-      fpsir-=1.0;
+    float fpsir = _card->CMSPosition(&td).phi() - _geom->phiCh();
+
+    if (fpsir < -M_PI)
+      fpsir += M_PI * 2;
+    if (fpsir > M_PI)
+      fpsir -= M_PI * 2;
+    fpsir *= DTConfigTraco::RESOLPSIR;
+    if (fpsir <= 0)
+      fpsir -= 1.0;
     iphir = (int)fpsir;
     // if outside range set to lower edge
-    if( iphir>= DTConfigTraco::RESOLPSIR/2 || iphir <-DTConfigTraco::RESOLPSIR/2 ) 
-      iphir=-DTConfigTraco::RESOLPSIR/2;
+    if (iphir >= DTConfigTraco::RESOLPSIR / 2 ||
+        iphir < -DTConfigTraco::RESOLPSIR / 2)
+      iphir = -DTConfigTraco::RESOLPSIR / 2;
 
     // Delta(psi_r)
-    int dpsir = (iphir*DTConfigTraco::RESOLPSI) / DTConfigTraco::RESOLPSIR;
-    idpsir = ipsi-dpsir;
+    int dpsir = (iphir * DTConfigTraco::RESOLPSI) / DTConfigTraco::RESOLPSIR;
+    idpsir = ipsi - dpsir;
     // if outside range set to lower edge
-    if(idpsir>= DTConfigTraco::RESOLPSI || idpsir <-DTConfigTraco::RESOLPSI ) 
-      idpsir=-DTConfigTraco::RESOLPSI;
+    if (idpsir >= DTConfigTraco::RESOLPSI || idpsir < -DTConfigTraco::RESOLPSI)
+      idpsir = -DTConfigTraco::RESOLPSI;
   }
-  
-  tct->setAngles(ipsi,iphir,idpsir);
+
+  tct->setAngles(ipsi, iphir, idpsir);
 
   // debugging
-  if(config()->debug()==4){
+  if (config()->debug() == 4) {
     std::cout << "DTTracoChip::calculateAngles :" << std::endl;
     tct->print();
-    std::cout << std::dec << "K = " << tct->K() << " X = " << tct->X(); 
+    std::cout << std::dec << "K = " << tct->K() << " X = " << tct->X();
     std::cout << " ipsi = " << ipsi << " iphir = " << iphir;
     std::cout << " idpsir = " << idpsir << std::endl;
-    if( _card->lutFromDBFlag()==1 )
-      std::cout << "Angles are calculated from LUT parameters from DB!" << std::endl; 
-  }// end debugging
-
+    if (_card->lutFromDBFlag() == 1)
+      std::cout << "Angles are calculated from LUT parameters from DB!"
+                << std::endl;
+  } // end debugging
 }
 
-int
-DTTracoChip::insideAngWindow(DTTracoTrig* tctrig) const {
+int DTTracoChip::insideAngWindow(DTTracoTrig *tctrig) const {
   // check angular window for every station type
   // return 1 for accept, 0 for reject
   // abs value of bending angle is 9 bits
 
   BitArray<10> bendAng;
-  bendAng.assign(0,10,tctrig->DeltaPsiR());
-  //bendAng.print();
-  if(bendAng.element(9))  //negativo!
-    bendAng.twoComplement(); 
-  int bendAngINT = bendAng.read(0,9);
-  //std::cout<<"abs bend angle int ="<< bendAngINT <<std::endl;
-
-  if( config()->BendingAngleCut()!= -1 && 
-     bendAngINT > 2*(config()->BendingAngleCut())) {
+  bendAng.assign(0, 10, tctrig->DeltaPsiR());
+  // bendAng.print();
+  if (bendAng.element(9)) // negativo!
+    bendAng.twoComplement();
+  int bendAngINT = bendAng.read(0, 9);
+  // std::cout<<"abs bend angle int ="<< bendAngINT <<std::endl;
+
+  if (config()->BendingAngleCut() != -1 &&
+      bendAngINT > 2 * (config()->BendingAngleCut())) {
     int absBendAng = tctrig->DeltaPsiR() & 0x1FF;
-    if(config()->debug()==4)
-      std::cout << "Attention: abs(bendAng)=" << absBendAng << " > " 
-           << 2*config()->BendingAngleCut() <<"!! reject trigger"<<std::endl;
+    if (config()->debug() == 4)
+      std::cout << "Attention: abs(bendAng)=" << absBendAng << " > "
+                << 2 * config()->BendingAngleCut() << "!! reject trigger"
+                << std::endl;
     return 0;
   }
   return 1;
 }
 
- 
-void 
-DTTracoChip::setTracoAcceptances()
-{  
-  // Set K acceptances of DTTracoChip MT ports: Ktraco = Xinner - Xouter 
+void DTTracoChip::setTracoAcceptances() {
+  // Set K acceptances of DTTracoChip MT ports: Ktraco = Xinner - Xouter
   float h = _geom->cellH();
   float pitch = _geom->cellPitch();
   float distsl = _geom->distSL();
@@ -1368,44 +1408,41 @@ DTTracoChip::setTracoAcceptances()
   float shiftSL = _geom->phiSLOffset() / pitch * K0;
 
   // mt  ports from orca geometry: this is always the case with new DTConfig
-  //if(config_traco(tracoid)->trigSetupGeom() != 1){
+  // if(config_traco(tracoid)->trigSetupGeom() != 1){
   {
     // Master Plane
     int i = 0;
-    for(i=0;i<DTConfig::NBTITC;i++){
-      float Xin_min     =  (i + DTConfig::NBTITC) * K0 + shiftSL;
-      float Xin_max     =  Xin_min + K0;
-      float Xout_min    =  0;
-      float Xout_max    =  3 * DTConfig::NBTITC * K0;
-      _PSIMAX[i]  =  int( 2.*h/distsl * (Xin_max - Xout_min) + K0 + 1.01 );
-      _PSIMIN[i]  =  int( 2.*h/distsl * (Xin_min - Xout_max) + K0 );
+    for (i = 0; i < DTConfig::NBTITC; i++) {
+      float Xin_min = (i + DTConfig::NBTITC) * K0 + shiftSL;
+      float Xin_max = Xin_min + K0;
+      float Xout_min = 0;
+      float Xout_max = 3 * DTConfig::NBTITC * K0;
+      _PSIMAX[i] = int(2. * h / distsl * (Xin_max - Xout_min) + K0 + 1.01);
+      _PSIMIN[i] = int(2. * h / distsl * (Xin_min - Xout_max) + K0);
     }
 
     // Slave Plane
-    for(i=0;i<3*DTConfig::NBTITC;i++){
-      float Xin_min     =  (DTConfig::NBTITC) * K0 + shiftSL;
-      float Xin_max     =  2. * DTConfig::NBTITC * K0 + shiftSL;
-      float Xout_min    =  i * K0;
-      float Xout_max    =  Xout_min + K0;
-      _PSIMAX[DTConfig::NBTITC+i]  =  int( 2.*h/distsl * (Xin_max - Xout_min) + K0 + 1.01 );
-      _PSIMIN[DTConfig::NBTITC+i]  =  int( 2.*h/distsl * (Xin_min - Xout_max) + K0 );
+    for (i = 0; i < 3 * DTConfig::NBTITC; i++) {
+      float Xin_min = (DTConfig::NBTITC)*K0 + shiftSL;
+      float Xin_max = 2. * DTConfig::NBTITC * K0 + shiftSL;
+      float Xout_min = i * K0;
+      float Xout_max = Xout_min + K0;
+      _PSIMAX[DTConfig::NBTITC + i] =
+          int(2. * h / distsl * (Xin_max - Xout_min) + K0 + 1.01);
+      _PSIMIN[DTConfig::NBTITC + i] =
+          int(2. * h / distsl * (Xin_min - Xout_max) + K0);
     }
   }
 
-
   // debugging
-  if(config()->debug()==4){
-    //if(wheel()==2&&station()==3&&sector()==1){ // only 1 chamber
-      std::cout << "Acceptance of mt ports for offset (cell unit) " 
-           << _geom->phiSLOffset() / pitch << std::endl;
-      for(int i=0;i<4*DTConfig::NBTITC;i++){
-        std::cout << "Port " << i+1 << " : ";
-        std::cout << _PSIMIN[i] << " --> " << _PSIMAX[i] << std::endl;
-      }
+  if (config()->debug() == 4) {
+    // if(wheel()==2&&station()==3&&sector()==1){ // only 1 chamber
+    std::cout << "Acceptance of mt ports for offset (cell unit) "
+              << _geom->phiSLOffset() / pitch << std::endl;
+    for (int i = 0; i < 4 * DTConfig::NBTITC; i++) {
+      std::cout << "Port " << i + 1 << " : ";
+      std::cout << _PSIMIN[i] << " --> " << _PSIMAX[i] << std::endl;
+    }
     //}
-  }// end debugging
-
+  } // end debugging
 }
-
-
-
diff --git a/L1Trigger/DTTraco/src/DTTracoLUTs.cc b/L1Trigger/DTTraco/src/DTTracoLUTs.cc
index e6e1df1de1868..07c11f77084a9 100644
--- a/L1Trigger/DTTraco/src/DTTracoLUTs.cc
+++ b/L1Trigger/DTTraco/src/DTTracoLUTs.cc
@@ -20,11 +20,11 @@
 //---------------
 // C++ Headers --
 //---------------
-#include <iostream>
+#include <algorithm>
+#include <cmath>
 #include <iomanip>
+#include <iostream>
 #include <string>
-#include <cmath>
-#include <algorithm>
 
 //-------------------------------
 // Collaborating Class Headers --
@@ -42,10 +42,7 @@ using namespace std;
 // Constructors --
 //----------------
 
-DTTracoLUTs::DTTracoLUTs(string testfile):
-			_testfile(testfile) {
-}
-
+DTTracoLUTs::DTTracoLUTs(string testfile) : _testfile(testfile) {}
 
 //--------------
 // Destructor --
@@ -54,11 +51,10 @@ DTTracoLUTs::DTTracoLUTs(string testfile):
 DTTracoLUTs::~DTTracoLUTs() {
 
   psi_lut.clear();
-  for(int k=0;k<3;k++)
+  for (int k = 0; k < 3; k++)
     phi_lut[k].clear();
 }
 
-
 //--------------
 // Operations --
 //--------------
@@ -69,11 +65,10 @@ DTTracoLUTs::~DTTracoLUTs() {
 void DTTracoLUTs::reset() {
 
   psi_lut.clear();
-  for(int k=0;k<3;k++)
+  for (int k = 0; k < 3; k++)
     phi_lut[k].clear();
 }
 
-
 //
 // load look-up tables for traco
 //
@@ -82,47 +77,51 @@ int DTTracoLUTs::load() {
   // get file name in current directory
   string ang_file = _testfile + ".anglut";
   string pos_file = _testfile + ".poslut";
- 
-  // open file for PSI 
+
+  // open file for PSI
   DTTPGLutFile filePSI(ang_file);
-  if ( filePSI.open() != 0 ) return -1;
-
-  // ignore comment lines 
-  //filePSI.ignoreLines(14);
-
-  // read file for PSI values --->   psi is 10 bits, 9+sign(10,11...16), resolution 9 bits, 
-  for(int u=0;u<1024;u++){
-      int word  = filePSI.readHex();  //read a 16 bits word
-      //int psi = word & 0x01FF;    //bits  0,1,...8
-      //int sgn = word & 0x0200;    //bit 9
-      //if(sgn)
-        //psi = -psi;
-      psi_lut.push_back(word);      //positive value
+  if (filePSI.open() != 0)
+    return -1;
+
+  // ignore comment lines
+  // filePSI.ignoreLines(14);
+
+  // read file for PSI values --->   psi is 10 bits, 9+sign(10,11...16),
+  // resolution 9 bits,
+  for (int u = 0; u < 1024; u++) {
+    int word = filePSI.readHex(); // read a 16 bits word
+    // int psi = word & 0x01FF;    //bits  0,1,...8
+    // int sgn = word & 0x0200;    //bit 9
+    // if(sgn)
+    // psi = -psi;
+    psi_lut.push_back(word); // positive value
   }
   filePSI.close();
- 
-  // open file for PHI 
+
+  // open file for PHI
   DTTPGLutFile filePHI(pos_file);
-  if ( filePHI.open() != 0 ) return -1;
-
-  // read file for PHI values    --->  phi is 12 bits, 11+sign(12..16), resolution 12 bits
-  for(int y=0;y<3;y++){     //3 series of values: I-outer, II-innner, III-correlated
-    for(int h=0;h<512;h++){
-        int phi  = filePHI.readHex();
-        //phi &= 0x0FFF;                //get 12 bits
-        //int sgn = phi;
-        //sgn >> 11;                    //bit 12 for sign
-        //sgn &= 0x01;
-        //if(sgn==1)                    //negative value
-          //phi = -phi;
-        phi_lut[y].push_back(phi);  //positive value
+  if (filePHI.open() != 0)
+    return -1;
+
+  // read file for PHI values    --->  phi is 12 bits, 11+sign(12..16),
+  // resolution 12 bits
+  for (int y = 0; y < 3;
+       y++) { // 3 series of values: I-outer, II-innner, III-correlated
+    for (int h = 0; h < 512; h++) {
+      int phi = filePHI.readHex();
+      // phi &= 0x0FFF;                //get 12 bits
+      // int sgn = phi;
+      // sgn >> 11;                    //bit 12 for sign
+      // sgn &= 0x01;
+      // if(sgn==1)                    //negative value
+      // phi = -phi;
+      phi_lut[y].push_back(phi); // positive value
     }
-  } 
+  }
   filePHI.close();
   return 0;
 }
 
-
 //
 // print look-up tables for EMU
 //
@@ -133,63 +132,60 @@ void DTTracoLUTs::print() const {
   cout << "====================================================" << endl;
   cout << endl;
 
-//  int i = 0;
+  //  int i = 0;
   //  for debugging
-  for(int x=0;x<1024;x++)
+  for (int x = 0; x < 1024; x++)
     cout << "K=" << x << " ---> " << hex << psi_lut[x] << dec << endl;
-  for(int m=0;m<512;m++)
-    cout << "X=" << m << " ---> " << hex << (phi_lut[0])[m] << "  " 
-                                  << (phi_lut[1])[m] << "  " 
-		                  << (phi_lut[2])[m] << "  " << dec << endl; 
-
+  for (int m = 0; m < 512; m++)
+    cout << "X=" << m << " ---> " << hex << (phi_lut[0])[m] << "  "
+         << (phi_lut[1])[m] << "  " << (phi_lut[2])[m] << "  " << dec << endl;
 }
 
 //
-// get phi radial value for a given position 
+// get phi radial value for a given position
 //
-unsigned short int DTTracoLUTs::getPhiRad(int pos,int flag) const {
-  unsigned short int phi = (phi_lut[flag])[pos]  &  0xFFF;     //12 bits
-  //int sgn = (phi_lut[flag])[pos]  &  0x800;     //bit 12 for sign
-  //if(sgn)
-    //phi = - phi;
+unsigned short int DTTracoLUTs::getPhiRad(int pos, int flag) const {
+  unsigned short int phi = (phi_lut[flag])[pos] & 0xFFF; // 12 bits
+  // int sgn = (phi_lut[flag])[pos]  &  0x800;     //bit 12 for sign
+  // if(sgn)
+  // phi = - phi;
 
   return phi;
 }
 
 //
-// get psi value for a given angle 
+// get psi value for a given angle
 //
 unsigned short int DTTracoLUTs::getPsi(int ang) const {
 
-  unsigned short int ipsi = (psi_lut)[ang+512]; //scritto in complemento a due 
-/*
-  //debug: try with formula
-  float fpsi = atan( ((float)(ang) * 4.2) /(18 * 1.3 * 30 ));
-  fpsi*=512;
-  if(fpsi<=0)fpsi-=1.0;
-  int ipsi = (int)fpsi;
-  // if outside range set to lower edge
-  if( ipsi>= 512 ||
-      ipsi< -512 ) ipsi=-512;
-cout << "psi is="<<ipsi <<endl;
-*/
-   return ipsi;
+  unsigned short int ipsi = (psi_lut)[ang + 512]; // scritto in complemento a
+                                                  // due
+  /*
+    //debug: try with formula
+    float fpsi = atan( ((float)(ang) * 4.2) /(18 * 1.3 * 30 ));
+    fpsi*=512;
+    if(fpsi<=0)fpsi-=1.0;
+    int ipsi = (int)fpsi;
+    // if outside range set to lower edge
+    if( ipsi>= 512 ||
+        ipsi< -512 ) ipsi=-512;
+  cout << "psi is="<<ipsi <<endl;
+  */
+  return ipsi;
 }
 
 //
-// get bending angle 
+// get bending angle
 //
 unsigned short int DTTracoLUTs::getBendAng(int pos, int ang, int flag) const {
-  // bendAng = psi - phi  : psi ha risoluzione 12, phi 9, quindi devo riportarli alla
-  // stessa risoluzione con : phi/8 (scarto i 3 bit meno significativi). 
-  // Il risultato ha risoluzione 10 bits. 
-  unsigned short int BendAng = ( (psi_lut)[ang+512] - ((phi_lut[flag])[pos]/8) ) & 0x3FF;    //10 bits
-   
-  //cout << "Bending angle is:" << hex << BendAng << endl; 
-  //cout << "Abs of bending angle is:" << hex << abs(BendAng) << endl; 
+  // bendAng = psi - phi  : psi ha risoluzione 12, phi 9, quindi devo riportarli
+  // alla stessa risoluzione con : phi/8 (scarto i 3 bit meno significativi). Il
+  // risultato ha risoluzione 10 bits.
+  unsigned short int BendAng =
+      ((psi_lut)[ang + 512] - ((phi_lut[flag])[pos] / 8)) & 0x3FF; // 10 bits
 
+  // cout << "Bending angle is:" << hex << BendAng << endl;
+  // cout << "Abs of bending angle is:" << hex << abs(BendAng) << endl;
 
   return BendAng;
 }
-
-
diff --git a/L1Trigger/DTTraco/src/DTTracoTrig.cc b/L1Trigger/DTTraco/src/DTTracoTrig.cc
index 490c155bebc14..a89f0737daaf0 100644
--- a/L1Trigger/DTTraco/src/DTTracoTrig.cc
+++ b/L1Trigger/DTTraco/src/DTTracoTrig.cc
@@ -7,7 +7,7 @@
 //
 //   Author List:
 //   C. Grandi
-//   Modifications: 
+//   Modifications:
 //   22/VI/04 SV: last trigger code update
 //
 //
@@ -40,11 +40,9 @@ DTTracoTrig::DTTracoTrig() {
   // reserve the appropriate amount of space for vectors
   _btitrig.reserve(2);
   clear();
-
 }
 
-DTTracoTrig::DTTracoTrig(DTTracoChip* tparent, int step) : 
-                                                   _tparent(tparent)     {
+DTTracoTrig::DTTracoTrig(DTTracoChip *tparent, int step) : _tparent(tparent) {
 
   // reserve the appropriate amount of space for vectors
   _btitrig.reserve(2);
@@ -53,51 +51,41 @@ DTTracoTrig::DTTracoTrig(DTTracoChip* tparent, int step) :
   // data part of the trigger
   _data.setStep(step);
   _data.setParent(tparent->id());
-
 }
 
-DTTracoTrig::DTTracoTrig(DTTracoChip* parent , 
-                                 DTTracoTrigData data) : 
-                                 _tparent(parent), _data(data) {
+DTTracoTrig::DTTracoTrig(DTTracoChip *parent, DTTracoTrigData data)
+    : _tparent(parent), _data(data) {
 
   // reserve the appropriate amount of space for vectors
   _btitrig.reserve(2);
-
 }
 
 //--------------
 // Destructor --
 //--------------
-DTTracoTrig::~DTTracoTrig() {
-}
-
+DTTracoTrig::~DTTracoTrig() {}
 
-bool
-DTTracoTrig::operator == (const DTTracoTrig& tt) const {
-  if(qdec()==7 && tt.qdec()==7)
+bool DTTracoTrig::operator==(const DTTracoTrig &tt) const {
+  if (qdec() == 7 && tt.qdec() == 7)
     return true;
 
-  if ( !(  isFirst()     == tt.isFirst())     ||
-       !(  pvK()         == tt.pvK())         ||
-       (  (fmod(double(pvCode()),8.)==0) ^ (fmod(double(tt.pvCode()),8.)==0) )  ||
-       !(  pvCorr()      == tt.pvCorr())      ||
-       !(  psiR()        == tt.psiR())        ||
-       !(  DeltaPsiR()   == tt.DeltaPsiR())   ||
-       !(  qdec()        == tt.qdec())        ||
-       !(  data().pvIO() == tt.data().pvIO())
-                                                        ){
-
-
-    cout<<"fs:"<<isFirst() <<","<< tt.isFirst() <<endl;
-    cout<<"pvCode:"<<pvCode()<<","<<tt.pvCode()<<endl;
-    cout<<"pvK:"<< pvK() <<","<<tt.pvK()<<endl;
-    cout<<"pvCorr:"<<pvCorr()<<","<<tt.pvCorr()<<endl;
-    cout<<"psiR:"<<psiR()<<","<<tt.psiR()<<endl;
-    cout<<"DeltaPsiR:"<<DeltaPsiR()<<","<<tt.DeltaPsiR()<<endl;
-    cout<<"qdec:"<<qdec()<<","<<tt.qdec()<<endl;
-    cout<<"data().pvIO:"<<data().pvIO()<<","<<tt.data().pvIO()<<endl;
-
-     return false;
+  if (!(isFirst() == tt.isFirst()) || !(pvK() == tt.pvK()) ||
+      ((fmod(double(pvCode()), 8.) == 0) ^
+       (fmod(double(tt.pvCode()), 8.) == 0)) ||
+      !(pvCorr() == tt.pvCorr()) || !(psiR() == tt.psiR()) ||
+      !(DeltaPsiR() == tt.DeltaPsiR()) || !(qdec() == tt.qdec()) ||
+      !(data().pvIO() == tt.data().pvIO())) {
+
+    cout << "fs:" << isFirst() << "," << tt.isFirst() << endl;
+    cout << "pvCode:" << pvCode() << "," << tt.pvCode() << endl;
+    cout << "pvK:" << pvK() << "," << tt.pvK() << endl;
+    cout << "pvCorr:" << pvCorr() << "," << tt.pvCorr() << endl;
+    cout << "psiR:" << psiR() << "," << tt.psiR() << endl;
+    cout << "DeltaPsiR:" << DeltaPsiR() << "," << tt.DeltaPsiR() << endl;
+    cout << "qdec:" << qdec() << "," << tt.qdec() << endl;
+    cout << "data().pvIO:" << data().pvIO() << "," << tt.data().pvIO() << endl;
+
+    return false;
   }
   return true;
 }
diff --git a/L1Trigger/DTTraco/src/DTTracoTrigData.cc b/L1Trigger/DTTraco/src/DTTracoTrigData.cc
index cbac7d5111973..6a87c50459c38 100644
--- a/L1Trigger/DTTraco/src/DTTracoTrigData.cc
+++ b/L1Trigger/DTTraco/src/DTTracoTrigData.cc
@@ -7,7 +7,7 @@
 //
 //   Author List:
 //   C. Grandi
-//   Modifications: 
+//   Modifications:
 //   22/VI/04 SV: last trigger code update
 //
 //
@@ -33,46 +33,56 @@ using namespace std;
 // Constructors --
 //----------------
 DTTracoTrigData::DTTracoTrigData(DTTracoId tracoid, int step)
-                                             : _tracoid(tracoid), _step(step) {
+    : _tracoid(tracoid), _step(step) {
   clear();
 }
 
-
 //--------------
 // Operations --
 //--------------
 
-int
-DTTracoTrigData::qdec() const {
+int DTTracoTrigData::qdec() const {
   // This is consistent with memo
-  if (_codeIn==8 && _codeOut==8) return 6; // HH
-  if (_codeIn==8 && _codeOut==0) return 2; // Hinner
-  if (_codeIn==0 && _codeOut==8) return 3; // Houter
-  if (_codeIn >0 && _codeOut==8) return 5; // LH
-  if (_codeIn==8 && _codeOut> 0) return 5; // HL
-  if (_codeIn> 0 && _codeOut> 0) return 4; // LL
-  if (_codeIn> 0 && _codeOut==0) return 0; // Linner
-  if (_codeIn==0 && _codeOut> 0) return 1; // Louter
-  return 7;                                // null
+  if (_codeIn == 8 && _codeOut == 8)
+    return 6; // HH
+  if (_codeIn == 8 && _codeOut == 0)
+    return 2; // Hinner
+  if (_codeIn == 0 && _codeOut == 8)
+    return 3; // Houter
+  if (_codeIn > 0 && _codeOut == 8)
+    return 5; // LH
+  if (_codeIn == 8 && _codeOut > 0)
+    return 5; // HL
+  if (_codeIn > 0 && _codeOut > 0)
+    return 4; // LL
+  if (_codeIn > 0 && _codeOut == 0)
+    return 0; // Linner
+  if (_codeIn == 0 && _codeOut > 0)
+    return 1; // Louter
+  return 7;   // null
 }
 
-void
-DTTracoTrigData::print() const {
-  cout << "TRACO Id=" << " ( " << _tracoid.wheel()   ;
-  cout                << " , " << _tracoid.station() ;
-  cout                << " , " << _tracoid.sector()  ;
-  cout                << " # " << _tracoid.traco()   ;
-  cout                << " ) " << " step: " << step();
+void DTTracoTrigData::print() const {
+  cout << "TRACO Id="
+       << " ( " << _tracoid.wheel();
+  cout << " , " << _tracoid.station();
+  cout << " , " << _tracoid.sector();
+  cout << " # " << _tracoid.traco();
+  cout << " ) "
+       << " step: " << step();
 
   cout << dec << " code=" << code() << " K=" << K() << " X=" << X();
-  cout << dec << " PVcode=" << pvCode() << " PVk=" << pvK() << " qdec=" << qdec();
+  cout << dec << " PVcode=" << pvCode() << " PVk=" << pvK()
+       << " qdec=" << qdec();
   cout << " qdec=" << qdec();
-  cout << hex << " psiR=" << psiR() << "  DeltaPsiR=" << DeltaPsiR() << dec << endl;
-  if(isFirst())
-    cout << " I trk"; 
-  if(!isFirst())
-    cout << " II trk"; 
+  cout << hex << " psiR=" << psiR() << "  DeltaPsiR=" << DeltaPsiR() << dec
+       << endl;
+  if (isFirst())
+    cout << " I trk";
+  if (!isFirst())
+    cout << " II trk";
   cout << " (";
-  if(!pvCorr()) cout << "NOT ";
+  if (!pvCorr())
+    cout << "NOT ";
   cout << "correlated)" << endl;
 }
diff --git a/L1Trigger/DTTraco/src/Lut.cc b/L1Trigger/DTTraco/src/Lut.cc
index 4132c3e84540c..9dd68e30e8a5f 100644
--- a/L1Trigger/DTTraco/src/Lut.cc
+++ b/L1Trigger/DTTraco/src/Lut.cc
@@ -11,136 +11,134 @@
 // Constructors --
 //----------------
 
-Lut::Lut(const DTConfigLUTs* conf, int ntc, float SL_shift): _conf_luts(conf) {
+Lut::Lut(const DTConfigLUTs *conf, int ntc, float SL_shift) : _conf_luts(conf) {
 
   // set parameters from configuration
-  m_d		= _conf_luts->D(); 
-  m_ST		= _conf_luts->BTIC();
-  m_wheel 	= _conf_luts->Wheel();
-
-  // 110208 SV TRACO hardware bug included: Xcn must be corrected because Xcn parameter has been
-  // inserted in hardware strings with the shift included, because TRACO doesn't apply shift in positive cases
-  float Xcn_corr    = _conf_luts->Xcn();
-  if(SL_shift > 0){
-    if(Xcn_corr > 0)
+  m_d = _conf_luts->D();
+  m_ST = _conf_luts->BTIC();
+  m_wheel = _conf_luts->Wheel();
+
+  // 110208 SV TRACO hardware bug included: Xcn must be corrected because Xcn
+  // parameter has been inserted in hardware strings with the shift included,
+  // because TRACO doesn't apply shift in positive cases
+  float Xcn_corr = _conf_luts->Xcn();
+  if (SL_shift > 0) {
+    if (Xcn_corr > 0)
       Xcn_corr = Xcn_corr - SL_shift;
-    if(Xcn_corr < 0)
+    if (Xcn_corr < 0)
       Xcn_corr = Xcn_corr + SL_shift;
   }
-	
-  m_Xcn 	= Xcn_corr - (CELL_PITCH * 4.0 * (float)(ntc-1) * (float) m_wheel);
-  m_pitch_d_ST	= CELL_PITCH / m_ST;
 
+  m_Xcn = Xcn_corr - (CELL_PITCH * 4.0 * (float)(ntc - 1) * (float)m_wheel);
+  m_pitch_d_ST = CELL_PITCH / m_ST;
 
-  //std::cout<< "Lut::Lut  ->  m_d " << m_d << " m_ST " << m_ST << " m_wheel " << m_wheel << " m_Xcn " << m_Xcn << " ntc " << ntc << std::endl;
+  // std::cout<< "Lut::Lut  ->  m_d " << m_d << " m_ST " << m_ST << " m_wheel "
+  // << m_wheel << " m_Xcn " << m_Xcn << " ntc " << ntc << std::endl;
   return;
 }
- 
+
 Lut::~Lut() {}
 
-void Lut::setForTestBeam( int station, int board, int traco ) {
- // set parameters from fixed values for MB1 nd MB3 (used in Testbeams 2003 2004) 
+void Lut::setForTestBeam(int station, int board, int traco) {
+  // set parameters from fixed values for MB1 nd MB3 (used in Testbeams 2003
+  // 2004)
   int nStat = station;
   int nBoard = board;
   int nTraco = traco;
   float tracoPos[50];
 
-  if( nStat ==1 ){
-
-    tracoPos[ 0] = -120.19;
-    tracoPos[ 1] = -103.39;
-    tracoPos[ 2] =  -86.59;
-    tracoPos[ 3] =  -69.80;
-    tracoPos[10] =  -52.99;
-    tracoPos[11] =  -36.19;
-    tracoPos[12] =  -19.39;
-    tracoPos[13] =   -2.59;
-    tracoPos[20] =   14.20;
-    tracoPos[21] =   31.00;
-    tracoPos[22] =   47.80;
-    tracoPos[23] =   64.60;
-    tracoPos[30] =   81.40;
-
-    m_d  = 431.175;
+  if (nStat == 1) {
+
+    tracoPos[0] = -120.19;
+    tracoPos[1] = -103.39;
+    tracoPos[2] = -86.59;
+    tracoPos[3] = -69.80;
+    tracoPos[10] = -52.99;
+    tracoPos[11] = -36.19;
+    tracoPos[12] = -19.39;
+    tracoPos[13] = -2.59;
+    tracoPos[20] = 14.20;
+    tracoPos[21] = 31.00;
+    tracoPos[22] = 47.80;
+    tracoPos[23] = 64.60;
+    tracoPos[30] = 81.40;
+
+    m_d = 431.175;
     m_ST = 31;
-    float m_Xc = tracoPos[ ( nBoard * 10 ) + nTraco ];
+    float m_Xc = tracoPos[(nBoard * 10) + nTraco];
     float m_Xn = +39.0;
-    m_Xcn =  m_Xn - m_Xc; 
-    //m_stsize = m_CELL_PITCH / m_ST;
-    //m_distp2 = 0.5 + ( 2.0 * m_CELL_H * m_ST / m_CELL_PITCH );
+    m_Xcn = m_Xn - m_Xc;
+    // m_stsize = m_CELL_PITCH / m_ST;
+    // m_distp2 = 0.5 + ( 2.0 * m_CELL_H * m_ST / m_CELL_PITCH );
   }
 
-  if( nStat ==3){
-    tracoPos[ 0] = -165.45;
-    tracoPos[ 1] = -148.65;
-    tracoPos[ 2] = -131.85;
-    tracoPos[ 3] = -115.05;
-    tracoPos[10] =  -98.25;
-    tracoPos[11] =  -81.45;
-    tracoPos[12] =  -64.65;
-    tracoPos[13] =  -47.85;
-    tracoPos[20] =  -31.05;
-    tracoPos[21] =  -14.25;
-    tracoPos[22] =    2.54;
-    tracoPos[23] =   19.34;
-    tracoPos[30] =   36.14;
-    tracoPos[31] =   52.94;
-    tracoPos[32] =   69.74;
-    tracoPos[33] =   86.54;
-    tracoPos[40] =  103.34;
-    tracoPos[41] =  120.14;
-    tracoPos[42] =  136.94;
-    tracoPos[43] =  153.74;
-
-    m_d  = 512.47;
+  if (nStat == 3) {
+    tracoPos[0] = -165.45;
+    tracoPos[1] = -148.65;
+    tracoPos[2] = -131.85;
+    tracoPos[3] = -115.05;
+    tracoPos[10] = -98.25;
+    tracoPos[11] = -81.45;
+    tracoPos[12] = -64.65;
+    tracoPos[13] = -47.85;
+    tracoPos[20] = -31.05;
+    tracoPos[21] = -14.25;
+    tracoPos[22] = 2.54;
+    tracoPos[23] = 19.34;
+    tracoPos[30] = 36.14;
+    tracoPos[31] = 52.94;
+    tracoPos[32] = 69.74;
+    tracoPos[33] = 86.54;
+    tracoPos[40] = 103.34;
+    tracoPos[41] = 120.14;
+    tracoPos[42] = 136.94;
+    tracoPos[43] = 153.74;
+
+    m_d = 512.47;
     m_ST = 31;
-    float m_Xc = tracoPos[ ( nBoard * 10 ) + nTraco ];
+    float m_Xc = tracoPos[(nBoard * 10) + nTraco];
     float m_Xn = -21.0;
-    m_Xcn =  m_Xn - m_Xc; 
-    //m_stsize = m_CELL_PITCH / m_ST;
-    //m_distp2 = 0.5 + ( 2.0 * m_CELL_H * m_ST / m_CELL_PITCH );
-  
+    m_Xcn = m_Xn - m_Xc;
+    // m_stsize = m_CELL_PITCH / m_ST;
+    // m_distp2 = 0.5 + ( 2.0 * m_CELL_H * m_ST / m_CELL_PITCH );
   }
 
   return;
 }
 
-
-int Lut::get_k( int addr ) const{
-//FIX attenzione controlla addr - 511 o -512???
+int Lut::get_k(int addr) const {
+  // FIX attenzione controlla addr - 511 o -512???
   int i;
   float x;
   i = addr - 512;
-  x = (float)i * CELL_PITCH / ( SL_D * m_ST );
+  x = (float)i * CELL_PITCH / (SL_D * m_ST);
   x = atanf(x);
   x = x * ANGRESOL;
-  if(m_wheel<0)
+  if (m_wheel < 0)
     x = -x;
 
   return (int)x;
 }
 
-int Lut::get_x( int addr ) const{
+int Lut::get_x(int addr) const {
   int i;
-  float a,b,x;
+  float a, b, x;
 
-  if(addr<=511) //LUT outer
+  if (addr <= 511) // LUT outer
   {
-   	i=addr;
-	b=m_d+SL_DIFF;
-  }
-  else if(addr<=1023) //LUT inner
+    i = addr;
+    b = m_d + SL_DIFF;
+  } else if (addr <= 1023) // LUT inner
   {
-	i=addr-512;
-	b=m_d-SL_DIFF;		
-  }
-  else	//LUT correlati
+    i = addr - 512;
+    b = m_d - SL_DIFF;
+  } else // LUT correlati
   {
- 	i=addr-1024;
- 	b=m_d;
+    i = addr - 1024;
+    b = m_d;
   }
   a = m_Xcn - (m_pitch_d_ST * (float)i * (float)m_wheel);
-  x = a/b;
+  x = a / b;
 
   x = atanf(x);
   x = x * POSRESOL;
@@ -148,13 +146,15 @@ int Lut::get_x( int addr ) const{
   return (int)x;
 }
 
-char exaDigit( int i ) {
-  if ( i < 10 ) return (   i        + '0' );
-  else          return ( ( i - 10 ) + 'A' );
+char exaDigit(int i) {
+  if (i < 10)
+    return (i + '0');
+  else
+    return ((i - 10) + 'A');
 }
 
-std::string lutFmt( int i ) {
-  char* buf = new char[6];
+std::string lutFmt(int i) {
+  char *buf = new char[6];
   buf[2] = ' ';
   buf[5] = '\0';
   int j4 = i % 16;
@@ -164,16 +164,14 @@ std::string lutFmt( int i ) {
   int j2 = i % 16;
   i /= 16;
   int j1 = i % 16;
-  buf[0] = exaDigit( j1 );
-  buf[1] = exaDigit( j2 );
-  buf[3] = exaDigit( j3 );
-  buf[4] = exaDigit( j4 );
-  std::string s( buf );
+  buf[0] = exaDigit(j1);
+  buf[1] = exaDigit(j2);
+  buf[3] = exaDigit(j3);
+  buf[4] = exaDigit(j4);
+  std::string s(buf);
   return s;
 }
 
-
-
 /*  this for dumping luts in minicrate input format - for MB1  -- Testbeam 2004
 
 int main( int argn, char** argv ) {
@@ -238,7 +236,7 @@ int main( int argn, char** argv ) {
           full << "4D " << board << " " << traco << " 0 "
                << lutFmt( nfirst );
 //               << nfirst << " ";
-	}
+        }
 //        file   << lut.get( i ) << " ";
         file   << " " << lutFmt( z );
         full   << " " << lutFmt( z );
@@ -266,7 +264,7 @@ int main( int argn, char** argv ) {
           full << "4D " << board << " " << traco << " 1 "
                << lutFmt( nfirst );
 //               << nfirst << " ";
-	}
+        }
 //        file   << lut.get( i ) << " ";
         file   << " " << lutFmt( z );
         full   << " " << lutFmt( z );
@@ -402,50 +400,43 @@ int main( int argn, char** argv ) {
 
 */
 
-
-
-void DSPtoIEEE32(short DSPmantissa, short DSPexp, float *f)
-{
+void DSPtoIEEE32(short DSPmantissa, short DSPexp, float *f) {
   DSPexp -= 15;
-  *f = DSPmantissa * (float)pow( 2.0, DSPexp );
-  
+  *f = DSPmantissa * (float)pow(2.0, DSPexp);
+
   return;
 }
 
-
-void IEEE32toDSP(float f, short *DSPmantissa, short *DSPexp)
-{
-  //long *pl, lm;
+void IEEE32toDSP(float f, short *DSPmantissa, short *DSPexp) {
+  // long *pl, lm;
   uint32_t pl;
   uint32_t lm;
 
-  //101104 SV convert float to int in safe way
-  union { float f; uint32_t i; } u;
+  // 101104 SV convert float to int in safe way
+  union {
+    float f;
+    uint32_t i;
+  } u;
   u.f = f;
   pl = u.i;
 
-  bool sign=false;
-  if( f==0.0 )
-  {
+  bool sign = false;
+  if (f == 0.0) {
     *DSPexp = 0;
     *DSPmantissa = 0;
-  }
-  else
-  {
-    //pl = reinterpret_cast<uint32_t*> (&f);
-    //pl = (long*) (&f);
-    if((pl & 0x80000000)!=0)
-      sign=true;
-    lm =( 0x800000 | (pl & 0x7FFFFF)); // [1][23bit mantissa]
-    lm >>= 9; //reduce to 15bits
+  } else {
+    // pl = reinterpret_cast<uint32_t*> (&f);
+    // pl = (long*) (&f);
+    if ((pl & 0x80000000) != 0)
+      sign = true;
+    lm = (0x800000 | (pl & 0x7FFFFF)); // [1][23bit mantissa]
+    lm >>= 9;                          // reduce to 15bits
     lm &= 0x7FFF;
-    *DSPexp = ((pl>>23)&0xFF)-126;
+    *DSPexp = ((pl >> 23) & 0xFF) - 126;
     *DSPmantissa = (short)lm;
-    if(sign)
-      *DSPmantissa = - *DSPmantissa; // convert negative value in 2.s
+    if (sign)
+      *DSPmantissa = -*DSPmantissa; // convert negative value in 2.s
     // complement
   }
   return;
 }
-
-
diff --git a/L1Trigger/DTTriggerServerPhi/interface/DTChambPhSegm.h b/L1Trigger/DTTriggerServerPhi/interface/DTChambPhSegm.h
index 0f852cfa6b356..1dc43c9464e2d 100644
--- a/L1Trigger/DTTriggerServerPhi/interface/DTChambPhSegm.h
+++ b/L1Trigger/DTTriggerServerPhi/interface/DTChambPhSegm.h
@@ -2,7 +2,7 @@
 //
 /**  \class DTChambPhSegm
  *
- *    Muon Chamber Trigger Phi candidate 
+ *    Muon Chamber Trigger Phi candidate
  *
  *
  *
@@ -21,8 +21,8 @@
 //----------------------
 
 #include "DataFormats/MuonDetId/interface/DTChamberId.h"
-#include "DataFormats/MuonDetId/interface/DTSuperLayerId.h"
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
+#include "DataFormats/MuonDetId/interface/DTSuperLayerId.h"
 #include "DataFormats/MuonDetId/interface/DTWireId.h"
 #include "L1Trigger/DTTraco/interface/DTTracoTrigData.h"
 #include "L1Trigger/DTUtilities/interface/DTTrigData.h"
@@ -40,105 +40,100 @@ typedef unsigned char myint8;
 
 class DTChambPhSegm : public DTTrigData {
 
-  public:
-
-    /// Constructor
-    DTChambPhSegm(DTChamberId, int);
-
-    /// Constructor
-/*sm   DTChambPhSegm(MuBarChamberId, int, */
-/*sm 		    const DTTracoTrigData* tracotrig, int); */
-    DTChambPhSegm(DTChamberId, int,
-		    const DTTracoTrigData*, int);
-    /// Constructor */
-/*sm   DTChambPhSegm(const DTChambPhSegm& seg); */
-    DTChambPhSegm(const DTChambPhSegm&); 
+public:
+  /// Constructor
+  DTChambPhSegm(DTChamberId, int);
 
-    /// Destructor 
-    ~DTChambPhSegm() override;
+  /// Constructor
+  /*sm   DTChambPhSegm(MuBarChamberId, int, */
+  /*sm 		    const DTTracoTrigData* tracotrig, int); */
+  DTChambPhSegm(DTChamberId, int, const DTTracoTrigData *, int);
+  /// Constructor */
+  /*sm   DTChambPhSegm(const DTChambPhSegm& seg); */
+  DTChambPhSegm(const DTChambPhSegm &);
 
-  
-    /// Assignment operator
-    /*sm    DTChambPhSegm& operator=(const DTChambPhSegm& seg); */
-    DTChambPhSegm& operator=(const DTChambPhSegm&);
-    /// Associate a TRACO trigger
-    inline void setTracoTrig(const DTTracoTrigData* tracotrig, int isFirst) {
+  /// Destructor
+  ~DTChambPhSegm() override;
 
-       m_tracotrig = tracotrig; 
-       m_isFirst = isFirst;
-    }
+  /// Assignment operator
+  /*sm    DTChambPhSegm& operator=(const DTChambPhSegm& seg); */
+  DTChambPhSegm &operator=(const DTChambPhSegm &);
+  /// Associate a TRACO trigger
+  inline void setTracoTrig(const DTTracoTrigData *tracotrig, int isFirst) {
 
-    /// Clear
-    void clear();
+    m_tracotrig = tracotrig;
+    m_isFirst = isFirst;
+  }
 
-    /// Return associated TRACO trigger
-    inline const DTTracoTrigData* tracoTrig() const { return m_tracotrig; }
+  /// Clear
+  void clear();
 
-    /// Return step number
-    inline int step() const { return m_step; }
+  /// Return associated TRACO trigger
+  inline const DTTracoTrigData *tracoTrig() const { return m_tracotrig; }
 
-    /// Return chamber identifier
-    DTChamberId ChamberId() const override { return m_chamberid; }
+  /// Return step number
+  inline int step() const { return m_step; }
 
-    /// Print
-    void print() const override;
+  /// Return chamber identifier
+  DTChamberId ChamberId() const override { return m_chamberid; }
 
-    /// Return parent TRACO number
-    inline int tracoNumber() const { return m_tracotrig->tracoNumber(); }
+  /// Print
+  void print() const override;
 
-    /// Return if it is a first track
-    inline int isFirst() const { return m_isFirst == 1; }
+  /// Return parent TRACO number
+  inline int tracoNumber() const { return m_tracotrig->tracoNumber(); }
 
-    /// Return trigger code (MTTF input format [0,7])
-    int code() const { return m_tracotrig->qdec(); }
+  /// Return if it is a first track
+  inline int isFirst() const { return m_isFirst == 1; }
 
-    /// Return trigger code (10*inner_code+outer_code; X_code=1,2,3,4,8)
-    inline int oldCode() const { return m_tracotrig->code(); }
+  /// Return trigger code (MTTF input format [0,7])
+  int code() const { return m_tracotrig->qdec(); }
 
-    /// Return trigger K parameter
-    inline float K() const { return m_tracotrig->K(); }
+  /// Return trigger code (10*inner_code+outer_code; X_code=1,2,3,4,8)
+  inline int oldCode() const { return m_tracotrig->code(); }
 
-    /// Return trigger X parameter
-    inline float X() const { return m_tracotrig->X(); }
+  /// Return trigger K parameter
+  inline float K() const { return m_tracotrig->K(); }
 
-    /// Return trigger K parameter converted to angle (bit pattern)
-    int psi() const { return m_tracotrig->psi(); }
+  /// Return trigger X parameter
+  inline float X() const { return m_tracotrig->X(); }
 
-    /// Return trigger X parameter converted to angle (bit pattern)
-    int psiR() const { return m_tracotrig->psiR(); }
+  /// Return trigger K parameter converted to angle (bit pattern)
+  int psi() const { return m_tracotrig->psi(); }
 
-    /// Return trigger X parameter converted to angle (bit pattern)
-    int phi() const { return m_tracotrig->psiR(); }
+  /// Return trigger X parameter converted to angle (bit pattern)
+  int psiR() const { return m_tracotrig->psiR(); }
 
-    /// Return bending angle (bit pattern)
-    inline int DeltaPsiR() const { return m_tracotrig->DeltaPsiR(); }
+  /// Return trigger X parameter converted to angle (bit pattern)
+  int phi() const { return m_tracotrig->psiR(); }
 
-    /// Return bending angle (bit pattern)
-    inline int phiB() const { return m_tracotrig->DeltaPsiR(); }
+  /// Return bending angle (bit pattern)
+  inline int DeltaPsiR() const { return m_tracotrig->DeltaPsiR(); }
 
-    /// Return correlator output code (position of segments)
-    inline int posMask() const { return m_tracotrig->posMask(); }
-  
-    /// Return the preview code (10*inner_code or outer_code; X_code=1,2,3,4,8)
-    inline int pvCode() const { return m_tracotrig->pvCode(); }
+  /// Return bending angle (bit pattern)
+  inline int phiB() const { return m_tracotrig->DeltaPsiR(); }
 
-    /// Return the preview K
-    inline int pvK() const { return m_tracotrig->pvK(); }
+  /// Return correlator output code (position of segments)
+  inline int posMask() const { return m_tracotrig->posMask(); }
 
-  private:
+  /// Return the preview code (10*inner_code or outer_code; X_code=1,2,3,4,8)
+  inline int pvCode() const { return m_tracotrig->pvCode(); }
 
-    /// parent chamber
-    DTChamberId m_chamberid;
+  /// Return the preview K
+  inline int pvK() const { return m_tracotrig->pvK(); }
 
-    /// step number
-    myint8 m_step;
+private:
+  /// parent chamber
+  DTChamberId m_chamberid;
 
-    /// first or second track
-    myint8 m_isFirst;
+  /// step number
+  myint8 m_step;
 
-    /// the corresponding traco trigger
-    const DTTracoTrigData* m_tracotrig;
+  /// first or second track
+  myint8 m_isFirst;
 
+  /// the corresponding traco trigger
+  const DTTracoTrigData *m_tracotrig;
 };
 
 #endif
diff --git a/L1Trigger/DTTriggerServerPhi/interface/DTTSCand.h b/L1Trigger/DTTriggerServerPhi/interface/DTTSCand.h
index d799177d4d68b..6415e97e39eed 100644
--- a/L1Trigger/DTTriggerServerPhi/interface/DTTSCand.h
+++ b/L1Trigger/DTTriggerServerPhi/interface/DTTSCand.h
@@ -19,8 +19,8 @@ class DTConfigTSPhi;
 //----------------------
 // Base Class Headers --
 //----------------------
-#include "L1Trigger/DTTriggerServerPhi/interface/DTTSS.h"
 #include "L1Trigger/DTTraco/interface/DTTracoTrigData.h"
+#include "L1Trigger/DTTriggerServerPhi/interface/DTTSS.h"
 #include "L1TriggerConfig/DTTPGConfig/interface/BitArray.h"
 
 //---------------
@@ -34,126 +34,145 @@ class DTConfigTSPhi;
 
 class DTTSCand {
 
-  public:
-
-    /// Constructor
-    DTTSCand(DTTSS*, const DTTracoTrigData*, int, int);
+public:
+  /// Constructor
+  DTTSCand(DTTSS *, const DTTracoTrigData *, int, int);
 
-    /// Constructor
-    DTTSCand();
+  /// Constructor
+  DTTSCand();
 
-    /// Constructor
-    DTTSCand(const DTTSCand& tscand);
-  
-    /// Assignment operator
-    DTTSCand& operator=(const DTTSCand& tscand);
+  /// Constructor
+  DTTSCand(const DTTSCand &tscand);
 
-    /// Destructor 
-    ~DTTSCand();
+  /// Assignment operator
+  DTTSCand &operator=(const DTTSCand &tscand);
 
-    /// Set the quality bits for DTTSS analysis
-    void setBitsTss();
+  /// Destructor
+  ~DTTSCand();
 
-    /// Set the bits for TSM back-up mode
-    void setBitsBkmod();
+  /// Set the quality bits for DTTSS analysis
+  void setBitsTss();
 
-    /// Set the quality bits for DTTSM analysis
-    void setBitsTsm();
+  /// Set the bits for TSM back-up mode
+  void setBitsBkmod();
 
-    /// Set the first track bit to second track (used for carry)
-    // SM sector collector: it becomes bit 14
-    void setSecondTrack() { _dataword.set(14); _isCarry=1; }
+  /// Set the quality bits for DTTSM analysis
+  void setBitsTsm();
 
-    /// Reset the carry bit
-    void resetCarry() { _isCarry=0; }
+  /// Set the first track bit to second track (used for carry)
+  // SM sector collector: it becomes bit 14
+  void setSecondTrack() {
+    _dataword.set(14);
+    _isCarry = 1;
+  }
 
-    /// Clear (set to 1) the quality bits (but first/second track bit)
-    void clearBits(){ _dataword.assign(5,3,0x7); }
+  /// Reset the carry bit
+  void resetCarry() { _isCarry = 0; }
 
-    /// Clear (set to 1) all the bits (back-up mode)
-    void clearBitsBkmod(){ _dataword.assign(0,7,0xff); }
+  /// Clear (set to 1) the quality bits (but first/second track bit)
+  void clearBits() { _dataword.assign(5, 3, 0x7); }
 
-    /// Clear the trigger
-    inline void clear();
+  /// Clear (set to 1) all the bits (back-up mode)
+  void clearBitsBkmod() { _dataword.assign(0, 7, 0xff); }
 
-    /// Configuration set
-    inline const DTConfigTSPhi* config() const { return _tss->config(); }
+  /// Clear the trigger
+  inline void clear();
 
-    /// Return associated TRACO trigger
-    inline const DTTracoTrigData* tracoTr() const { return _tctrig; }
+  /// Configuration set
+  inline const DTConfigTSPhi *config() const { return _tss->config(); }
 
-    /// Retrun the TRACO position inside the TSS
-    inline int TcPos() const { return _tcPos; }
+  /// Return associated TRACO trigger
+  inline const DTTracoTrigData *tracoTr() const { return _tctrig; }
 
-    /// Return the DTTSS
-    inline DTTSS* tss() const { return _tss; }
+  /// Retrun the TRACO position inside the TSS
+  inline int TcPos() const { return _tcPos; }
 
-    /// Return the DTTSS number
-    inline int tssNumber() const { return _tss->number(); }
+  /// Return the DTTSS
+  inline DTTSS *tss() const { return _tss; }
 
-    /// Return the TRACO number
-    inline int tracoNumber() const { return _tctrig->tracoNumber(); }
+  /// Return the DTTSS number
+  inline int tssNumber() const { return _tss->number(); }
 
-    /// Return the first/second track bit
-    inline int isFirst() const { return _dataword.element(14)==0; }
+  /// Return the TRACO number
+  inline int tracoNumber() const { return _tctrig->tracoNumber(); }
 
-    /// Return HTRIG/LTRIG bit
-    inline int isHtrig() const { return _tctrig->pvCode()==8 || 
-                                        _tctrig->pvCode()==80; }
-    /// Return Inner/Outer bit
-    inline int isInner() const { return _tctrig->pvCode()>8; }
+  /// Return the first/second track bit
+  inline int isFirst() const { return _dataword.element(14) == 0; }
 
-    /// Return correlation bit
-    inline int isCorr() const { return _tctrig->pvCorr(); }
+  /// Return HTRIG/LTRIG bit
+  inline int isHtrig() const {
+    return _tctrig->pvCode() == 8 || _tctrig->pvCode() == 80;
+  }
+  /// Return Inner/Outer bit
+  inline int isInner() const { return _tctrig->pvCode() > 8; }
 
-    /// Return the carry bit
-    inline int isCarry() const { return _isCarry; }
+  /// Return correlation bit
+  inline int isCorr() const { return _tctrig->pvCorr(); }
 
-    /// Return if HH or HL
-    inline int isHHorHL() const { return _tctrig->pvCorr() && _tctrig->pvCode()==80; }
- 
-    /// Return if LH
-    inline int isLH() const { return _tctrig->pvCorr() && _tctrig->pvCode()==8; }
- 
-    /// Return if LL
-    inline int isLL() const { return _tctrig->pvCorr() && !(_tctrig->pvCode()==8) &&
-                                                          !(_tctrig->pvCode()==80); }
-    /// Return if H inner
-    inline int isH0() const { return !_tctrig->pvCorr() && _tctrig->pvCode()==80; }
- 
-    /// Return if H outer
-    inline int is0H() const { return !_tctrig->pvCorr() && _tctrig->pvCode()==8; }
- 
-    /// Return if L inner
-    inline int isL0() const {  return !_tctrig->pvCorr() && _tctrig->pvCode()<80 &&
-                                                            _tctrig->pvCode()>8; }
-    /// Return if L outer
-    inline int is0L() const {  return !_tctrig->pvCorr() && _tctrig->pvCode()<8; }
+  /// Return the carry bit
+  inline int isCarry() const { return _isCarry; }
 
-    /// Return an uint16 with the content of the data word (for debugging)
-    inline unsigned dataword() const { return _dataword.dataWord(0)&0x1ff; }
+  /// Return if HH or HL
+  inline int isHHorHL() const {
+    return _tctrig->pvCorr() && _tctrig->pvCode() == 80;
+  }
 
-    /// Operator < used for sorting
-    bool operator < (const DTTSCand& c) const { return _dataword<c._dataword; }
+  /// Return if LH
+  inline int isLH() const {
+    return _tctrig->pvCorr() && _tctrig->pvCode() == 8;
+  }
 
-    /// Operator <= used for sorting
-    bool operator <= (const DTTSCand& c) const { return _dataword<=c._dataword; }
+  /// Return if LL
+  inline int isLL() const {
+    return _tctrig->pvCorr() && !(_tctrig->pvCode() == 8) &&
+           !(_tctrig->pvCode() == 80);
+  }
+  /// Return if H inner
+  inline int isH0() const {
+    return !_tctrig->pvCorr() && _tctrig->pvCode() == 80;
+  }
 
-    // Operator <<= used for sorting in TSM back-up mode
-    // SM double TSM  bool operator <<= (const DTTSCand& c) const { return _datawordbk<c._datawordbk; }
+  /// Return if H outer
+  inline int is0H() const {
+    return !_tctrig->pvCorr() && _tctrig->pvCode() == 8;
+  }
 
-    /// Print the trigger
-    void print() const;
-
-  private:
-  DTTSS* _tss;
-  const DTTracoTrigData* _tctrig;
-    BitArray<15> _dataword;   // the word on which sorting is done. reserve space enough for Preview and full data
-  // SM double TSM  BitArray<9> _datawordbk; // the word on which sorting is done (back-up mode)
-  int _tcPos;            // TRACO position in TSS
+  /// Return if L inner
+  inline int isL0() const {
+    return !_tctrig->pvCorr() && _tctrig->pvCode() < 80 &&
+           _tctrig->pvCode() > 8;
+  }
+  /// Return if L outer
+  inline int is0L() const {
+    return !_tctrig->pvCorr() && _tctrig->pvCode() < 8;
+  }
+
+  /// Return an uint16 with the content of the data word (for debugging)
+  inline unsigned dataword() const { return _dataword.dataWord(0) & 0x1ff; }
+
+  /// Operator < used for sorting
+  bool operator<(const DTTSCand &c) const { return _dataword < c._dataword; }
+
+  /// Operator <= used for sorting
+  bool operator<=(const DTTSCand &c) const { return _dataword <= c._dataword; }
+
+  // Operator <<= used for sorting in TSM back-up mode
+  // SM double TSM  bool operator <<= (const DTTSCand& c) const { return
+  // _datawordbk<c._datawordbk; }
+
+  /// Print the trigger
+  void print() const;
+
+private:
+  DTTSS *_tss;
+  const DTTracoTrigData *_tctrig;
+  BitArray<15> _dataword; // the word on which sorting is done. reserve space
+                          // enough for Preview and full data
+  // SM double TSM  BitArray<9> _datawordbk; // the word on which sorting is
+  // done (back-up mode)
+  int _tcPos; // TRACO position in TSS
   // SM double TSM   int _bkmod;            // TSM back-up mode flag
-  int _isCarry;          // info for TSM
-
+  int _isCarry; // info for TSM
 };
 
 #endif
diff --git a/L1Trigger/DTTriggerServerPhi/interface/DTTSM.h b/L1Trigger/DTTriggerServerPhi/interface/DTTSM.h
index 2086bb3955ba0..3056c934cdcf7 100644
--- a/L1Trigger/DTTriggerServerPhi/interface/DTTSM.h
+++ b/L1Trigger/DTTriggerServerPhi/interface/DTTSM.h
@@ -37,92 +37,77 @@ class DTTrigGeom;
 
 class DTTSM {
 
-  public:
+public:
+  ///  Constructor
+  // SM double TSM
+  DTTSM(int);
 
-    ///  Constructor
-    // SM double TSM 
-    DTTSM(int);   
+  /// Destructor
+  ~DTTSM();
 
-    /// Destructor 
-    ~DTTSM();
-  
-    /// Return identifier
-    inline int number() const { return _n; }
+  /// Return identifier
+  inline int number() const { return _n; }
 
-    /// Set configuration
-    void setConfig(const DTConfigTSPhi *config) {  _config=config; }
+  /// Set configuration
+  void setConfig(const DTConfigTSPhi *config) { _config = config; }
 
-    /// Add a TSS candidate to the TSM, ifs is first/second track flag
-    void addCand(DTTSCand* cand);
+  /// Add a TSS candidate to the TSM, ifs is first/second track flag
+  void addCand(DTTSCand *cand);
 
-    /// Set a flag to skip sort2
-    void ignoreSecondTrack() { _ignoreSecondTrack=1; }
+  /// Set a flag to skip sort2
+  void ignoreSecondTrack() { _ignoreSecondTrack = 1; }
 
-    /// Run the TSM algorithm
-    void run(int bkmod);
+  /// Run the TSM algorithm
+  void run(int bkmod);
 
-    /// Sort 1
-    // added DBSM
-    DTTSCand* sortTSM1(int bkmod);
+  /// Sort 1
+  // added DBSM
+  DTTSCand *sortTSM1(int bkmod);
 
-    /// Sort 2
-    DTTSCand* sortTSM2(int bkmod);
+  /// Sort 2
+  DTTSCand *sortTSM2(int bkmod);
 
-    /// Clear
-    void clear();
+  /// Clear
+  void clear();
 
-    /// Configuration set
-    inline const DTConfigTSPhi* config() const { return _config; }
+  /// Configuration set
+  inline const DTConfigTSPhi *config() const { return _config; }
 
-    /// Return the number of input tracks (first/second)
-    unsigned nCand(int ifs) const;
+  /// Return the number of input tracks (first/second)
+  unsigned nCand(int ifs) const;
 
-    /// Return the number of input first tracks
-    inline int nFirstT() const { return _incand[0].size(); }
+  /// Return the number of input first tracks
+  inline int nFirstT() const { return _incand[0].size(); }
 
-    /// Return the number of input second tracks
-    inline int nSecondT() const { return _incand[1].size(); }
+  /// Return the number of input second tracks
+  inline int nSecondT() const { return _incand[1].size(); }
 
-    /// Return requested TS candidate
-    DTTSCand* getDTTSCand(int ifs, unsigned n) const;
+  /// Return requested TS candidate
+  DTTSCand *getDTTSCand(int ifs, unsigned n) const;
 
-    /// Return requested TRACO trigger
-    const DTTracoTrigData* getTracoT(int ifs, unsigned n) const;
+  /// Return requested TRACO trigger
+  const DTTracoTrigData *getTracoT(int ifs, unsigned n) const;
 
-    /// Return the number of sorted tracks
-    inline int nTracks() const { return _outcand.size(); }
+  /// Return the number of sorted tracks
+  inline int nTracks() const { return _outcand.size(); }
 
-    /// Return the requested track
-    DTTSCand* getTrack(int n) const;
- 
-  private:
+  /// Return the requested track
+  DTTSCand *getTrack(int n) const;
 
-    const DTConfigTSPhi* _config;
+private:
+  const DTConfigTSPhi *_config;
 
+  // SM double TSM
+  // identification (as for DTTSS.h)
+  int _n;
 
-    // SM double TSM
-    // identification (as for DTTSS.h)
-    int _n;
+  // input data
+  std::vector<DTTSCand *> _incand[2];
 
-    // input data
-    std::vector<DTTSCand*> _incand[2];
-
-    // output data
-    std::vector<DTTSCand*> _outcand;
-
-    // internal use variables
-    int _ignoreSecondTrack;
+  // output data
+  std::vector<DTTSCand *> _outcand;
 
+  // internal use variables
+  int _ignoreSecondTrack;
 };
 #endif
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L1Trigger/DTTriggerServerPhi/interface/DTTSPhi.h b/L1Trigger/DTTriggerServerPhi/interface/DTTSPhi.h
index 1c4f08c07853f..8d259b8f0b5ef 100644
--- a/L1Trigger/DTTriggerServerPhi/interface/DTTSPhi.h
+++ b/L1Trigger/DTTriggerServerPhi/interface/DTTSPhi.h
@@ -33,8 +33,8 @@ class DTTrigGeom;
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "L1Trigger/DTUtilities/interface/DTCache.h"
 #include "L1Trigger/DTUtilities/interface/DTGeomSupplier.h"
-#include "L1TriggerConfig/DTTPGConfig/interface/DTConfigTSPhi.h"
 #include "L1TriggerConfig/DTTPGConfig/interface/DTConfigManager.h"
+#include "L1TriggerConfig/DTTPGConfig/interface/DTConfigTSPhi.h"
 
 #include "L1Trigger/DTTriggerServerPhi/interface/DTChambPhSegm.h"
 
@@ -48,79 +48,78 @@ class DTTrigGeom;
 //              ---------------------
 
 typedef std::vector<DTChambPhSegm> DTChambPhVector;
-typedef DTCache < DTChambPhSegm, DTChambPhVector > DTTSPhiManager;
+typedef DTCache<DTChambPhSegm, DTChambPhVector> DTTSPhiManager;
 
 class DTTSPhi : public DTTSPhiManager, public DTGeomSupplier {
-  
- public:
-  
+
+public:
   /// Constructor
-  DTTSPhi(DTTrigGeom*, DTTracoCard*);
+  DTTSPhi(DTTrigGeom *, DTTracoCard *);
 
-  /// Destructor 
+  /// Destructor
   ~DTTSPhi() override;
 
   /// Return the configuration class
-  inline const DTConfigTSPhi* config() const {return _config; }
+  inline const DTConfigTSPhi *config() const { return _config; }
 
   /// Set configuration
   void setConfig(const DTConfigManager *conf);
-  
-  /// Return number of DTTSPhi segments  
+
+  /// Return number of DTTSPhi segments
   int nSegm(int step);
-  
+
   /// Return the requested DTTSPhi segment
-  const DTChambPhSegm* segment(int step, unsigned n);
-  
+  const DTChambPhSegm *segment(int step, unsigned n);
+
   /// Local position in chamber of a trigger-data object
-  LocalPoint localPosition(const DTTrigData*) const override;
-  
+  LocalPoint localPosition(const DTTrigData *) const override;
+
   /// Local direction in chamber of a trigger-data object
-  LocalVector localDirection(const DTTrigData*) const override;
-  
+  LocalVector localDirection(const DTTrigData *) const override;
+
   /// Load TRACO triggers and run TSPhi algorithm
-  void reconstruct() override { loadTSPhi(); runTSPhi(); }
+  void reconstruct() override {
+    loadTSPhi();
+    runTSPhi();
+  }
 
- private:
-  
+private:
   /// store DTTracoChip triggers in the DTTSS's
   void loadTSPhi();
-  
+
   /// run DTTSPhi algorithm (DTTSS+DTTSM)
   void runTSPhi();
-  
-  /// Add a DTTracoChip trigger to the DTTSPhi, ifs is track number (first or second)
-  void addTracoT(int step, const DTTracoTrigData* tracotrig, int ifs);
-  
+
+  /// Add a DTTracoChip trigger to the DTTSPhi, ifs is track number (first or
+  /// second)
+  void addTracoT(int step, const DTTracoTrigData *tracotrig, int ifs);
+
   /// Set a flag to ignore second tracks (if first track at following BX)
   void ignoreSecondTrack(int step, int tracon);
-  
+
   /// Clear
   void localClear();
-  
+
   // Return a DTTSS
-  DTTSS* getDTTSS(int step, unsigned n) const;
-  
+  DTTSS *getDTTSS(int step, unsigned n) const;
+
   // SM double TSM
   // Return a DTTSM
-  DTTSM* getDTTSM(int step, unsigned n) const;
-  
+  DTTSM *getDTTSM(int step, unsigned n) const;
 
-  
- private:
-  
-  DTTracoCard* _tracocard;
+private:
+  DTTracoCard *_tracocard;
+
+  const DTConfigTSPhi *_config;
 
-  const DTConfigTSPhi* _config;
-  
   // Components
-  std::vector<DTTSS*> _tss[DTConfigTSPhi::NSTEPL-DTConfigTSPhi::NSTEPF+1];
+  std::vector<DTTSS *> _tss[DTConfigTSPhi::NSTEPL - DTConfigTSPhi::NSTEPF + 1];
   // DBSM-doubleTSM
-  std::vector<DTTSM*> _tsm[DTConfigTSPhi::NSTEPL-DTConfigTSPhi::NSTEPF+1];
-  
+  std::vector<DTTSM *> _tsm[DTConfigTSPhi::NSTEPL - DTConfigTSPhi::NSTEPF + 1];
+
   // Input data
-  std::vector<DTTSCand*> _tctrig[DTConfigTSPhi::NSTEPL-DTConfigTSPhi::NSTEPF+1];
-  
+  std::vector<DTTSCand *>
+      _tctrig[DTConfigTSPhi::NSTEPL - DTConfigTSPhi::NSTEPF + 1];
 };
 
 #endif
diff --git a/L1Trigger/DTTriggerServerPhi/interface/DTTSS.h b/L1Trigger/DTTriggerServerPhi/interface/DTTSS.h
index efe58b837c6e2..34779080d9af6 100644
--- a/L1Trigger/DTTriggerServerPhi/interface/DTTSS.h
+++ b/L1Trigger/DTTriggerServerPhi/interface/DTTSS.h
@@ -26,8 +26,8 @@ class DTConfigTSPhi;
 //---------------
 // C++ Headers --
 //---------------
-#include <vector>
 #include <string>
+#include <vector>
 
 //              ---------------------
 //              -- Class Interface --
@@ -35,88 +35,85 @@ class DTConfigTSPhi;
 
 class DTTSS {
 
-  public:
-
-    /// Constructor
-    DTTSS(int);
-  
-    /// Destructor 
-    ~DTTSS();
+public:
+  /// Constructor
+  DTTSS(int);
 
-    /// Add a TS candidate to the TSS, ifs is first/second track flag
-    void addDTTSCand(DTTSCand* cand);
+  /// Destructor
+  ~DTTSS();
 
-    /// Set configuration
-    void setConfig(const DTConfigTSPhi *config) {  _config=config; }
+  /// Add a TS candidate to the TSS, ifs is first/second track flag
+  void addDTTSCand(DTTSCand *cand);
 
-    /// Set a flag to skip sort2
-    void ignoreSecondTrack() { _ignoreSecondTrack=1; }
+  /// Set configuration
+  void setConfig(const DTConfigTSPhi *config) { _config = config; }
 
-    /// Run the TSS algorithm
-    void run();
+  /// Set a flag to skip sort2
+  void ignoreSecondTrack() { _ignoreSecondTrack = 1; }
 
-    /// Sort 1
-    DTTSCand* sortTSS1();
+  /// Run the TSS algorithm
+  void run();
 
-    /// Sort 2
-    DTTSCand* sortTSS2();
+  /// Sort 1
+  DTTSCand *sortTSS1();
 
-    /// Clear
-    void clear();
+  /// Sort 2
+  DTTSCand *sortTSS2();
 
-    /// Return identifier
-    inline int number() const { return _n; }
+  /// Clear
+  void clear();
 
-    /// Configuration set
-    inline const DTConfigTSPhi* config() const { return _config; }
+  /// Return identifier
+  inline int number() const { return _n; }
 
-    /// Return the number of input tracks (first/second)
-    unsigned nTracoT(int ifs) const;
+  /// Configuration set
+  inline const DTConfigTSPhi *config() const { return _config; }
 
-    /// Return the number of input first tracks
-    inline int nFirstT() const { return _tctrig[0].size(); }
+  /// Return the number of input tracks (first/second)
+  unsigned nTracoT(int ifs) const;
 
-    /// Return the number of input second tracks
-    inline int nSecondT() const { return _tctrig[1].size(); }
+  /// Return the number of input first tracks
+  inline int nFirstT() const { return _tctrig[0].size(); }
 
-    /// Return requested TS candidate
-    DTTSCand* getDTTSCand(int ifs, unsigned n) const;
+  /// Return the number of input second tracks
+  inline int nSecondT() const { return _tctrig[1].size(); }
 
-    /// Return requested TRACO trigger
-    const DTTracoTrigData* getTracoT(int ifs, unsigned n) const;
+  /// Return requested TS candidate
+  DTTSCand *getDTTSCand(int ifs, unsigned n) const;
 
-    /// Return the carry (for debugging)
-    DTTSCand* getCarry() const;
+  /// Return requested TRACO trigger
+  const DTTracoTrigData *getTracoT(int ifs, unsigned n) const;
 
-    /// Return the number of sorted tracks
-    inline int nTracks() const { return _outcand.size(); }
+  /// Return the carry (for debugging)
+  DTTSCand *getCarry() const;
 
-    /// Return the requested track
-    DTTSCand* getTrack(int n) const;
+  /// Return the number of sorted tracks
+  inline int nTracks() const { return _outcand.size(); }
 
-    /// Return the requested log word
-      std::string logWord(int n) const;
+  /// Return the requested track
+  DTTSCand *getTrack(int n) const;
 
-  private:
+  /// Return the requested log word
+  std::string logWord(int n) const;
 
-    const DTConfigTSPhi* _config;
+private:
+  const DTConfigTSPhi *_config;
 
-    // identification
-    int _n;
+  // identification
+  int _n;
 
-    // input data
-    std::vector<DTTSCand*> _tctrig[2];
+  // input data
+  std::vector<DTTSCand *> _tctrig[2];
 
-    // output data
-    std::vector<DTTSCand*> _outcand;
+  // output data
+  std::vector<DTTSCand *> _outcand;
 
-    // internal use variables
-    int _ignoreSecondTrack;
+  // internal use variables
+  int _ignoreSecondTrack;
 
-    // log words
-    std::string _logWord1;
-    std::string _logWord2;
-  
+  // log words
+  std::string _logWord1;
+  std::string _logWord2;
 };
 
 #endif
diff --git a/L1Trigger/DTTriggerServerPhi/src/DTChambPhSegm.cc b/L1Trigger/DTTriggerServerPhi/src/DTChambPhSegm.cc
index ae6827d05ed94..ba57811c4549a 100644
--- a/L1Trigger/DTTriggerServerPhi/src/DTChambPhSegm.cc
+++ b/L1Trigger/DTTriggerServerPhi/src/DTChambPhSegm.cc
@@ -2,16 +2,16 @@
 //
 //   Class: DTChambPhSegm.cpp
 //
-//   Description: Muon Chamber Trigger Phi candidate 
+//   Description: Muon Chamber Trigger Phi candidate
 //
 //
 //   Author List:
 //   C. Grandi
-//   Modifications: 
+//   Modifications:
 //
 //
 //--------------------------------------------------
- 
+
 //-----------------------
 // This Class's Header --
 //-----------------------
@@ -32,67 +32,55 @@
 //----------------
 // Constructors --
 //----------------
-DTChambPhSegm::DTChambPhSegm(DTChamberId chamberid, int step) : 
-                                         m_chamberid(chamberid), m_step(step) {
+DTChambPhSegm::DTChambPhSegm(DTChamberId chamberid, int step)
+    : m_chamberid(chamberid), m_step(step) {
   clear();
 }
 
-DTChambPhSegm::DTChambPhSegm(DTChamberId chamberid, int step, 
-				     const DTTracoTrigData* tracotrig, 
-				     int isfirst) :
-                                     m_chamberid(chamberid), m_step(step),
-                                     m_isFirst(isfirst),
-                                     m_tracotrig(tracotrig)  {
-}
-  
-DTChambPhSegm::DTChambPhSegm(const DTChambPhSegm& seg) : 
-  m_chamberid(seg.m_chamberid), m_step(seg.m_step), m_isFirst(seg.m_isFirst), 
-  m_tracotrig(seg.m_tracotrig) {
-}
+DTChambPhSegm::DTChambPhSegm(DTChamberId chamberid, int step,
+                             const DTTracoTrigData *tracotrig, int isfirst)
+    : m_chamberid(chamberid), m_step(step), m_isFirst(isfirst),
+      m_tracotrig(tracotrig) {}
+
+DTChambPhSegm::DTChambPhSegm(const DTChambPhSegm &seg)
+    : m_chamberid(seg.m_chamberid), m_step(seg.m_step),
+      m_isFirst(seg.m_isFirst), m_tracotrig(seg.m_tracotrig) {}
 
 //--------------
 // Destructor --
 //--------------
-DTChambPhSegm::~DTChambPhSegm() {
-}
+DTChambPhSegm::~DTChambPhSegm() {}
 
 //--------------
 // Operations --
 //--------------
 
-DTChambPhSegm&
-DTChambPhSegm::operator=(const DTChambPhSegm& seg){
-  if(this != &seg){
+DTChambPhSegm &DTChambPhSegm::operator=(const DTChambPhSegm &seg) {
+  if (this != &seg) {
     m_chamberid = seg.m_chamberid;
     m_step = seg.m_step;
-    m_tracotrig = seg.m_tracotrig ;
-    m_isFirst = seg.m_isFirst ;
+    m_tracotrig = seg.m_tracotrig;
+    m_isFirst = seg.m_isFirst;
   }
   return *this;
 }
 
-void 
-DTChambPhSegm::clear() { 
+void DTChambPhSegm::clear() {
   m_tracotrig = nullptr;
   m_isFirst = 0;
 }
 
-void
-DTChambPhSegm::print() const {
+void DTChambPhSegm::print() const {
   std::cout << "TP at step " << step() << ", in wheel " << wheel();
-  std::cout << ", station " << station() << ", sector " << sector() << std::endl;
-  std::cout << "TSS " << (tracoTrig()->tracoNumber()-1) / DTConfigTSPhi::NTCTSS + 1;
+  std::cout << ", station " << station() << ", sector " << sector()
+            << std::endl;
+  std::cout << "TSS "
+            << (tracoTrig()->tracoNumber() - 1) / DTConfigTSPhi::NTCTSS + 1;
   std::cout << ", TRACO " << tracoNumber() << " : " << std::endl;
   std::cout << "  -->  code " << oldCode() << ", K " << K();
   std::cout << ", X " << X() << ", position mask " << posMask() << std::endl;
-  std::cout << "inner bti equation=" << tracoTrig()->eqIn() <<
-          "    outer bti equation=" << tracoTrig()->eqOut() << std::endl;
+  std::cout << "inner bti equation=" << tracoTrig()->eqIn()
+            << "    outer bti equation=" << tracoTrig()->eqOut() << std::endl;
   std::cout << "        psi " << psi() << ", psiR " << psiR();
   std::cout << ", DeltaPsiR " << DeltaPsiR() << std::endl;
 }
-
-
-
-
-
-
diff --git a/L1Trigger/DTTriggerServerPhi/src/DTTSCand.cc b/L1Trigger/DTTriggerServerPhi/src/DTTSCand.cc
index bccb9ac4a9300..1d4407fc0e310 100644
--- a/L1Trigger/DTTriggerServerPhi/src/DTTSCand.cc
+++ b/L1Trigger/DTTriggerServerPhi/src/DTTSCand.cc
@@ -7,7 +7,7 @@
 //
 //   Author List:
 //   C. Grandi
-//   Modifications: 
+//   Modifications:
 //   S. Marcellini, D. Bonacorsi
 //   04/01/2007 : C. Battilana local config update
 //
@@ -33,42 +33,35 @@
 // Constructors --
 //----------------
 
-DTTSCand::DTTSCand(DTTSS* tss, const DTTracoTrigData* tctrig, 
-			   int ifs, int pos) 
-  : _tss(tss), _tctrig(tctrig), _tcPos(pos), _isCarry(0) {
+DTTSCand::DTTSCand(DTTSS *tss, const DTTracoTrigData *tctrig, int ifs, int pos)
+    : _tss(tss), _tctrig(tctrig), _tcPos(pos), _isCarry(0) {
 
-   _dataword.one();              // reset dataword to 0x1ff
+  _dataword.one(); // reset dataword to 0x1ff
 
-   // SM sector collector Set bit 14 instead of 8, for 1st/2nd track to allow extra space 
-   //      if(ifs==1)_dataword.unset(8); // set bit 8 (0=first, 1=second tracks)
-      if(ifs==1)_dataword.unset(14); // set bit 14 (0=first, 1=second tracks)
-
-}
-
-DTTSCand::DTTSCand(const DTTSCand& tscand) 
-  : _tss(tscand._tss), _tctrig(tscand._tctrig), _tcPos(tscand._tcPos), 
-  _isCarry(tscand._isCarry) {
-
- 
+  // SM sector collector Set bit 14 instead of 8, for 1st/2nd track to allow
+  // extra space
+  //      if(ifs==1)_dataword.unset(8); // set bit 8 (0=first, 1=second tracks)
+  if (ifs == 1)
+    _dataword.unset(14); // set bit 14 (0=first, 1=second tracks)
 }
 
+DTTSCand::DTTSCand(const DTTSCand &tscand)
+    : _tss(tscand._tss), _tctrig(tscand._tctrig), _tcPos(tscand._tcPos),
+      _isCarry(tscand._isCarry) {}
 
 DTTSCand::DTTSCand() {}
 
 //--------------
 // Destructor --
 //--------------
-DTTSCand::~DTTSCand(){
-}
-
+DTTSCand::~DTTSCand() {}
 
 //--------------
 // Operations --
 //--------------
 
-DTTSCand& 
-DTTSCand::operator=(const DTTSCand& tscand) {
-  if(this != &tscand){
+DTTSCand &DTTSCand::operator=(const DTTSCand &tscand) {
+  if (this != &tscand) {
     _tss = tscand._tss;
     _tctrig = tscand._tctrig;
     _tcPos = tscand._tcPos;
@@ -77,133 +70,149 @@ DTTSCand::operator=(const DTTSCand& tscand) {
   return *this;
 }
 
-void
-DTTSCand::clear()  { 
-  _tctrig=nullptr; 
+void DTTSCand::clear() {
+  _tctrig = nullptr;
   _dataword.one();
 
-  _isCarry=0;
-
+  _isCarry = 0;
 }
 
-void
-DTTSCand::setBitsTss() {
+void DTTSCand::setBitsTss() {
   // first/second track already set. Set other 3 bits
-  int itk=_dataword.element(14); // first tracks 0, second tracks 1
- 
-   clearBits();
-      if(_tctrig->pvK()>32|| _tctrig->pvK()<0){ // Check K within 5 bits range
-     std::cout << "DTTSCand::setBitsTss() pvK outside valid range: " << _tctrig->pvK();
-     std::cout << " deltaPsiR set to 31" << std::endl;
-   }
-   else { 
-     // assign preview in dataword (common to any other assignment)
-        _dataword.assign(0,5,_tctrig->pvK());
-     //  _dataword.assign(0,5,0);
-     
-     int posH=-1;
-     int posI=-1;
-     int posC=-1;
-     switch(config()->TssMasking(itk)) {
-     case 123: // H/L, In/Out, Corr/NotC
-       posH = 7;
-       posI = 6;
-       posC = 5;
-       break;
-     case 132: // H/L, Corr/NotC, In/Out
-       posH = 7;
-       posI = 5;
-       posC = 6;
-       break;
-     case 213: // In/Out, H/L, Corr/NotC 
-       posH = 6;
-       posI = 7;
-       posC = 5;
-       break;
-     case 231: // In/Out, Corr/NotC, H/L 
-       posH = 5;
-       posI = 7;
-       posC = 6;
-       break;
-     case 312: // Corr/NotC, H/L, In/Out
-       posH = 6;
-       posI = 5;
-       posC = 7;
-       break;
-     case 321: // Corr/NotC, In/Out, H/L
-       posH = 5;
-       posI = 6;
-       posC = 7;
-       break;
-     default:
-       std::cout << "DTTSCand::DTTSCand(): masking not correct: ";
-       std::cout << config()->TssMasking(itk);
-       std::cout << " All bits set to 1" << std::endl;
-     }
-     // Masking:
-     bool enaH = config()->TssHtrigEna(itk);
-     bool enaI = config()->TssInOutEna(itk);
-     bool enaC = config()->TssCorrEna(itk) ;
-     if(isCarry()) {
-       // Special setting for carry
-       enaH = config()->TssHtrigEnaCarry();
-       enaI = config()->TssInOutEnaCarry();
-       enaC = config()->TssCorrEnaCarry() ;
-     }
-     // Bits set to 0 give higher priority:
-     if(isHtrig()&&enaH&&posH>0)_dataword.unset(posH);
-     if(isInner()&&enaI&&posI>0)_dataword.unset(posI);
-     if(isCorr() &&enaC&&posC>0)_dataword.unset(posC);
-   }
-          
-}
+  int itk = _dataword.element(14); // first tracks 0, second tracks 1
 
+  clearBits();
+  if (_tctrig->pvK() > 32 ||
+      _tctrig->pvK() < 0) { // Check K within 5 bits range
+    std::cout << "DTTSCand::setBitsTss() pvK outside valid range: "
+              << _tctrig->pvK();
+    std::cout << " deltaPsiR set to 31" << std::endl;
+  } else {
+    // assign preview in dataword (common to any other assignment)
+    _dataword.assign(0, 5, _tctrig->pvK());
+    //  _dataword.assign(0,5,0);
+
+    int posH = -1;
+    int posI = -1;
+    int posC = -1;
+    switch (config()->TssMasking(itk)) {
+    case 123: // H/L, In/Out, Corr/NotC
+      posH = 7;
+      posI = 6;
+      posC = 5;
+      break;
+    case 132: // H/L, Corr/NotC, In/Out
+      posH = 7;
+      posI = 5;
+      posC = 6;
+      break;
+    case 213: // In/Out, H/L, Corr/NotC
+      posH = 6;
+      posI = 7;
+      posC = 5;
+      break;
+    case 231: // In/Out, Corr/NotC, H/L
+      posH = 5;
+      posI = 7;
+      posC = 6;
+      break;
+    case 312: // Corr/NotC, H/L, In/Out
+      posH = 6;
+      posI = 5;
+      posC = 7;
+      break;
+    case 321: // Corr/NotC, In/Out, H/L
+      posH = 5;
+      posI = 6;
+      posC = 7;
+      break;
+    default:
+      std::cout << "DTTSCand::DTTSCand(): masking not correct: ";
+      std::cout << config()->TssMasking(itk);
+      std::cout << " All bits set to 1" << std::endl;
+    }
+    // Masking:
+    bool enaH = config()->TssHtrigEna(itk);
+    bool enaI = config()->TssInOutEna(itk);
+    bool enaC = config()->TssCorrEna(itk);
+    if (isCarry()) {
+      // Special setting for carry
+      enaH = config()->TssHtrigEnaCarry();
+      enaI = config()->TssInOutEnaCarry();
+      enaC = config()->TssCorrEnaCarry();
+    }
+    // Bits set to 0 give higher priority:
+    if (isHtrig() && enaH && posH > 0)
+      _dataword.unset(posH);
+    if (isInner() && enaI && posI > 0)
+      _dataword.unset(posI);
+    if (isCorr() && enaC && posC > 0)
+      _dataword.unset(posC);
+  }
+}
 
-void
-DTTSCand::setBitsBkmod() {
-  // first/second track already set. Set other 4 bits (1 for null, 3 for a2, a1, a0)
+void DTTSCand::setBitsBkmod() {
+  // first/second track already set. Set other 4 bits (1 for null, 3 for a2, a1,
+  // a0)
   clearBitsBkmod();
-  //  std::cout << " clearbits in TSM bk mode " << _dataword.print() << std::endl;
+  //  std::cout << " clearbits in TSM bk mode " << _dataword.print() <<
+  //  std::endl;
 
-  int a2  = 6;
-  int a1  = 5;
-  int a0  = 4;
+  int a2 = 6;
+  int a1 = 5;
+  int a0 = 4;
   //
   // std::cout << " _tctrig->qdec(): " << _tctrig->qdec() << std::endl;
-  if( _tctrig->qdec()==6 ) { _dataword.unset(a2); _dataword.unset(a1); _dataword.unset(a0); }  // 1-000
-  if( _tctrig->qdec()==5 ) { _dataword.unset(a2); _dataword.unset(a1); }                         // 1-001
-  if( _tctrig->qdec()==4 ) { _dataword.unset(a2); _dataword.unset(a0); }                         // 1-010
-  if( _tctrig->qdec()==3 ) { _dataword.unset(a1); }                                                // 1-101
-  if( _tctrig->qdec()==2 ) { _dataword.unset(a1); _dataword.unset(a0); }                         // 1-100
-
-  if( _tctrig->qdec()==0 ) { _dataword.unset(a0); }                                                // 1-110
-
-  //    std::cout << " set Bits TSM back up " << _dataword.print() << std::endl;    
+  if (_tctrig->qdec() == 6) {
+    _dataword.unset(a2);
+    _dataword.unset(a1);
+    _dataword.unset(a0);
+  } // 1-000
+  if (_tctrig->qdec() == 5) {
+    _dataword.unset(a2);
+    _dataword.unset(a1);
+  } // 1-001
+  if (_tctrig->qdec() == 4) {
+    _dataword.unset(a2);
+    _dataword.unset(a0);
+  } // 1-010
+  if (_tctrig->qdec() == 3) {
+    _dataword.unset(a1);
+  } // 1-101
+  if (_tctrig->qdec() == 2) {
+    _dataword.unset(a1);
+    _dataword.unset(a0);
+  } // 1-100
+
+  if (_tctrig->qdec() == 0) {
+    _dataword.unset(a0);
+  } // 1-110
+
+  //    std::cout << " set Bits TSM back up " << _dataword.print() << std::endl;
 }
 
-
-void
-DTTSCand::setBitsTsm() {
+void DTTSCand::setBitsTsm() {
   // first/second track already set. Set other 3 bits
-   int itk=_dataword.element(14); // first tracks 0, second tracks 1
+  int itk = _dataword.element(14); // first tracks 0, second tracks 1
 
   clearBits();
 
-  if(_tctrig->pvK()>31|| _tctrig->pvK()<0){ // Check K within 5 bits range
-    std::cout << "DTTSCand::setBitsTsm pvK outside valid range: " << _tctrig->pvK();
+  if (_tctrig->pvK() > 31 ||
+      _tctrig->pvK() < 0) { // Check K within 5 bits range
+    std::cout << "DTTSCand::setBitsTsm pvK outside valid range: "
+              << _tctrig->pvK();
     std::cout << " deltaPsiR set to 31" << std::endl;
-  }
-  else {
+  } else {
     // SM double TSM
     // assign preview in dataword (common to any other assignment)
-     _dataword.assign(0,5,_tctrig->pvK());
-     //  _dataword.assign(0,5,0);
-    // 
-    
-    int posH=-1;
-    int posI=-1;
-    int posC=-1;
-    switch(config()->TsmMasking(itk)) {
+    _dataword.assign(0, 5, _tctrig->pvK());
+    //  _dataword.assign(0,5,0);
+    //
+
+    int posH = -1;
+    int posI = -1;
+    int posC = -1;
+    switch (config()->TsmMasking(itk)) {
     case 123: // H/L, In/Out, Corr/NotC
       posH = 7;
       posI = 6;
@@ -214,12 +223,12 @@ DTTSCand::setBitsTsm() {
       posI = 5;
       posC = 6;
       break;
-    case 213: // In/Out, H/L, Corr/NotC 
+    case 213: // In/Out, H/L, Corr/NotC
       posH = 6;
       posI = 7;
       posC = 5;
       break;
-    case 231: // In/Out, Corr/NotC, H/L 
+    case 231: // In/Out, Corr/NotC, H/L
       posH = 5;
       posI = 7;
       posC = 6;
@@ -238,36 +247,34 @@ DTTSCand::setBitsTsm() {
       std::cout << "DTTSCand::DTTSCand(): masking not correct: ";
       std::cout << config()->TssMasking(itk);
       std::cout << " All bits set to 1" << std::endl;
-      
-    // Masking:
+
+      // Masking:
       bool enaH = config()->TsmHtrigEna(itk);
       bool enaI = config()->TsmInOutEna(itk);
-      bool enaC = config()->TsmCorrEna(itk) ;
-      if(isCarry()) {
-	// Special setting for carry
-	enaH = config()->TsmHtrigEnaCarry();
-	enaI = config()->TsmInOutEnaCarry();
-	enaC = config()->TsmCorrEnaCarry() ;
+      bool enaC = config()->TsmCorrEna(itk);
+      if (isCarry()) {
+        // Special setting for carry
+        enaH = config()->TsmHtrigEnaCarry();
+        enaI = config()->TsmInOutEnaCarry();
+        enaC = config()->TsmCorrEnaCarry();
       }
       // Bits set to 0 give higher priority:
-      if(isHtrig()&&enaH&&posH>0)_dataword.unset(posH);
-      if(isInner()&&enaI&&posI>0)_dataword.unset(posI);
-      if(isCorr() &&enaC&&posC>0)_dataword.unset(posC);
-            
+      if (isHtrig() && enaH && posH > 0)
+        _dataword.unset(posH);
+      if (isInner() && enaI && posI > 0)
+        _dataword.unset(posI);
+      if (isCorr() && enaC && posC > 0)
+        _dataword.unset(posC);
     }
   }
-
-
 }
-void 
-DTTSCand::print() const {
+void DTTSCand::print() const {
   std::cout << " First=" << isFirst();
   std::cout << " HTRIG=" << isHtrig();
   std::cout << " Inner=" << isInner();
-  std::cout << " Corr="  << isCorr();
-  std::cout << " Kpv="   << tracoTr()->pvK();
+  std::cout << " Corr=" << isCorr();
+  std::cout << " Kpv=" << tracoTr()->pvK();
   std::cout << " dataword=";
   _dataword.print();
   std::cout << std::endl;
 }
-
diff --git a/L1Trigger/DTTriggerServerPhi/src/DTTSM.cc b/L1Trigger/DTTriggerServerPhi/src/DTTSM.cc
index 0ecaee5c18a5b..e48542e2a4da5 100644
--- a/L1Trigger/DTTriggerServerPhi/src/DTTSM.cc
+++ b/L1Trigger/DTTriggerServerPhi/src/DTTSM.cc
@@ -7,8 +7,8 @@
 //
 //   Author List:
 //   C. Grandi
-//   Modifications: 
-//   S. Marcellini, D. Bonacorsi 
+//   Modifications:
+//   S. Marcellini, D. Bonacorsi
 //   04/01/2007 : C.Battilana local config update
 //
 //
@@ -22,14 +22,14 @@
 //-------------------------------
 // Collaborating Class Headers --
 //-------------------------------
-#include "L1TriggerConfig/DTTPGConfig/interface/DTConfigTSPhi.h"
 #include "L1Trigger/DTTriggerServerPhi/interface/DTTSCand.h"
+#include "L1TriggerConfig/DTTPGConfig/interface/DTConfigTSPhi.h"
 
 //---------------
 // C++ Headers --
 //---------------
-#include <iostream>
 #include <algorithm>
+#include <iostream>
 
 //----------------
 // Constructors --
@@ -42,145 +42,140 @@ DTTSM::DTTSM(int n) : _n(n), _ignoreSecondTrack(0) {
   _outcand.reserve(2);
 }
 
-
 //--------------
 // Destructor --
 //--------------
-DTTSM::~DTTSM(){
-  clear();
-}
-
+DTTSM::~DTTSM() { clear(); }
 
 //--------------
 // Operations --
 //--------------
 
-void
-DTTSM::clear() {
-  _ignoreSecondTrack=0;
-  for(int itk=0;itk<=1;itk++){
+void DTTSM::clear() {
+  _ignoreSecondTrack = 0;
+  for (int itk = 0; itk <= 1; itk++) {
     // content of _incand is deleted by DTTSPhi
     _incand[itk].clear();
   }
   // content of _outcand is deleted by DTTSPhi
-  _outcand.clear(); 
+  _outcand.clear();
 }
 
-void
-DTTSM::run(int bkmod) {
-  
-  if(config()->debug()){
+void DTTSM::run(int bkmod) {
+
+  if (config()->debug()) {
     std::cout << "DTTSM::run: Processing DTTSM: ";
-    std::cout << nFirstT() << " first & " << nSecondT() << " second tracks" << std::endl;
+    std::cout << nFirstT() << " first & " << nSecondT() << " second tracks"
+              << std::endl;
   }
-  
-  if(nFirstT()<1)return; // skip if no first tracks
+
+  if (nFirstT() < 1)
+    return; // skip if no first tracks
   //
   // SORT 1
   //
-  
+
   // debugging
-  if(config()->debug()){
+  if (config()->debug()) {
     std::cout << "Vector of first tracks in DTTSM: " << std::endl;
-    std::vector<DTTSCand*>::const_iterator p;
-    for(p=_incand[0].begin(); p!=_incand[0].end(); p++) {
+    std::vector<DTTSCand *>::const_iterator p;
+    for (p = _incand[0].begin(); p != _incand[0].end(); p++) {
       (*p)->print();
     }
   }
   // end debugging
-  
-  
-  DTTSCand* first=sortTSM1(bkmod);
-  if(first!=nullptr) {
-    _outcand.push_back(first); 
+
+  DTTSCand *first = sortTSM1(bkmod);
+  if (first != nullptr) {
+    _outcand.push_back(first);
   }
-  if(nSecondT()<1)return; // skip if no second tracks
+  if (nSecondT() < 1)
+    return; // skip if no second tracks
 
   //
   // SORT 2
   //
-  
+
   // debugging
-  if(config()->debug()){
-    std::vector<DTTSCand*>::const_iterator p;
-    std::cout << "Vector of second tracks (including carry) in DTTSM: " << std::endl;
-    for(p=_incand[1].begin(); p!=_incand[1].end(); p++) {
+  if (config()->debug()) {
+    std::vector<DTTSCand *>::const_iterator p;
+    std::cout << "Vector of second tracks (including carry) in DTTSM: "
+              << std::endl;
+    for (p = _incand[1].begin(); p != _incand[1].end(); p++) {
       (*p)->print();
     }
   }
   // end debugging
-  
-  DTTSCand* second=sortTSM2(bkmod);
-  if(second!=nullptr) {
-    
-    _outcand.push_back(second); 
+
+  DTTSCand *second = sortTSM2(bkmod);
+  if (second != nullptr) {
+
+    _outcand.push_back(second);
   }
-  
 }
 
-DTTSCand*
-DTTSM::sortTSM1(int bkmod) {
+DTTSCand *DTTSM::sortTSM1(int bkmod) {
   // Do a sort 1
-  DTTSCand* best=nullptr;
-  DTTSCand* carry=nullptr;
-  std::vector<DTTSCand*>::iterator p;
-  for(p=_incand[0].begin(); p!=_incand[0].end(); p++) {
-    DTTSCand* curr=(*p);
-    
-    if ( bkmod == 1 ) { // NORMAL mode ---> sorting on dataword
-      curr->setBitsTss(); // maybe not necessary, as they are the same as for TSS in the default
-    } else if( bkmod == 0) { //  { // BACKUP mode ---> sorting on modified dataword
+  DTTSCand *best = nullptr;
+  DTTSCand *carry = nullptr;
+  std::vector<DTTSCand *>::iterator p;
+  for (p = _incand[0].begin(); p != _incand[0].end(); p++) {
+    DTTSCand *curr = (*p);
+
+    if (bkmod == 1) {     // NORMAL mode ---> sorting on dataword
+      curr->setBitsTss(); // maybe not necessary, as they are the same as for
+                          // TSS in the default
+    } else if (bkmod ==
+               0) { //  { // BACKUP mode ---> sorting on modified dataword
       curr->setBitsBkmod();
     } else {
-      std::cout << "DTTSM::sortTSM1:  bkmod not properly assigned!" << std::endl;
+      std::cout << "DTTSM::sortTSM1:  bkmod not properly assigned!"
+                << std::endl;
     }
-    
-    
-    if(best==nullptr){
-      best=curr;
-    } 
-    else if((*curr)<(*best)){
-      carry=best;
-      best=curr;
-    } 
-    else if(carry==nullptr){
-      carry=curr;
-    } 
-    else if((*curr)<(*carry)){
-      carry=curr;
-    } //else { }    
+
+    if (best == nullptr) {
+      best = curr;
+    } else if ((*curr) < (*best)) {
+      carry = best;
+      best = curr;
+    } else if (carry == nullptr) {
+      carry = curr;
+    } else if ((*curr) < (*carry)) {
+      carry = curr;
+    } // else { }
   }
-  
-  
+
   // Ghost 1 suppression: use carry only if not suppressed
-  if(carry!=nullptr) {   // A carry is present
-    
+  if (carry != nullptr) { // A carry is present
+
     // Carry enabled if correlated and TRACO is next to best
     bool inner_or_corr;
-    if(config()->TsmGhost1Corr()) {
-      inner_or_corr=carry->isInner() || carry->isCorr();  
+    if (config()->TsmGhost1Corr()) {
+      inner_or_corr = carry->isInner() || carry->isCorr();
     } else {
-      inner_or_corr=carry->isInner();
+      inner_or_corr = carry->isInner();
     }
-    
-    if(config()->TsmGhost1Flag()<2){ // Carry isn't always suppressed
+
+    if (config()->TsmGhost1Flag() < 2) { // Carry isn't always suppressed
       // check if adjacent DTTracoChips
-      int adj = (carry->tssNumber()==best->tssNumber()+1 &&          //next DTTracoChip
-		 best->TcPos()==DTConfigTSPhi::NTCTSS && carry->TcPos()==1 ) ||
-	(carry->tssNumber()==best->tssNumber()-1 &&         // prev DTTracoChip
-	 best->TcPos()==1 && carry->TcPos()==DTConfigTSPhi::NTCTSS ) ||
-	(carry->tssNumber()==best->tssNumber() &&           // same DTTracoChip
-	 abs(carry->TcPos()-best->TcPos())==1                     );   
-      
-      if(config()->TsmGhost1Flag()==0 ||          // Carry always enabled
-	 //       carry->isInner() ||                      // Carry is inner
-	 inner_or_corr ||                         // Carry is inner or corr
-	 !adj                          ) {        // Carry not adj. to best   
-	// add carry to second tracks to for sort 2
-	carry->setSecondTrack(); // change value of first/second track bit
-	// NEW DESIGN: DTTSM is not configurable!
-	// carry->setBitsTsm();     // set quality bits as for second tracks
-	_incand[1].push_back(carry); // add to list of second tracks
+      int adj =
+          (carry->tssNumber() == best->tssNumber() + 1 && // next DTTracoChip
+           best->TcPos() == DTConfigTSPhi::NTCTSS && carry->TcPos() == 1) ||
+          (carry->tssNumber() == best->tssNumber() - 1 && // prev DTTracoChip
+           best->TcPos() == 1 && carry->TcPos() == DTConfigTSPhi::NTCTSS) ||
+          (carry->tssNumber() == best->tssNumber() && // same DTTracoChip
+           abs(carry->TcPos() - best->TcPos()) == 1);
+
+      if (config()->TsmGhost1Flag() == 0 || // Carry always enabled
+                                            //       carry->isInner() || //
+                                            //       Carry is inner
+          inner_or_corr ||                  // Carry is inner or corr
+          !adj) {                           // Carry not adj. to best
+        // add carry to second tracks to for sort 2
+        carry->setSecondTrack(); // change value of first/second track bit
+        // NEW DESIGN: DTTSM is not configurable!
+        // carry->setBitsTsm();     // set quality bits as for second tracks
+        _incand[1].push_back(carry); // add to list of second tracks
       }
     }
   }
@@ -188,133 +183,127 @@ DTTSM::sortTSM1(int bkmod) {
   return best;
 }
 
-
-
-
-DTTSCand*
-DTTSM::sortTSM2(int bkmod) {
+DTTSCand *DTTSM::sortTSM2(int bkmod) {
 
   // If second tracks are always suppressed skip processing
-  if(config()->TsmGhost2Flag()==3)return nullptr;
-  
+  if (config()->TsmGhost2Flag() == 3)
+    return nullptr;
+
   // Check if there are second tracks
-  if(nTracks()<1){
+  if (nTracks() < 1) {
     std::cout << "DTTSM::sortTSM2: called with no first track.";
     std::cout << " empty pointer returned!" << std::endl;
     return nullptr;
   }
-  
-  // If a first track at the following BX is present, ignore second tracks of any kind
-  if(_ignoreSecondTrack){
-    std::vector<DTTSCand*>::iterator p;
-    for(p=_incand[1].begin(); p!=_incand[1].end(); p++) {
-      if((*p)->isCarry()) return (*p);
+
+  // If a first track at the following BX is present, ignore second tracks of
+  // any kind
+  if (_ignoreSecondTrack) {
+    std::vector<DTTSCand *>::iterator p;
+    for (p = _incand[1].begin(); p != _incand[1].end(); p++) {
+      if ((*p)->isCarry())
+        return (*p);
     }
     return nullptr;
   }
-  
+
   // If no first tracks at the following BX, do a sort 2
-  DTTSCand* best=getTrack(1);
-  DTTSCand* second=nullptr;
-  std::vector<DTTSCand*>::iterator p;
-  for(p=_incand[1].begin(); p!=_incand[1].end(); p++) {
-    DTTSCand* curr=(*p);
+  DTTSCand *best = getTrack(1);
+  DTTSCand *second = nullptr;
+  std::vector<DTTSCand *>::iterator p;
+  for (p = _incand[1].begin(); p != _incand[1].end(); p++) {
+    DTTSCand *curr = (*p);
     // ghost 2 suppression: skip track if suppressed
     // this is not needed if config of DTTSM == config of DTTSS
-    
+
     bool inner_or_corr;
-    if(config()->TsmGhost2Corr())
-      {inner_or_corr=curr->isInner() || curr->isCorr();
-      }
-    else
-      {inner_or_corr=curr->isInner();
-      }
-    
-    if(config()->TsmGhost2Flag()!=0){     // 2nd tracks not always enabled
-      if(
-	 //!curr->isInner() &&                // outer track
-         !inner_or_corr &&                    // outer and not corr
-         (curr->tssNumber()==best->tssNumber() &&
-          curr->TcPos()==best->TcPos()) ) { // same correlator of 1st track
-        if(config()->TsmGhost2Flag()==2 ||    // do not look to corr bit of 1st
-           ( (!best->isCorr() ) &&  config()->TsmGhost2Flag()!=4 ) || // skip if best is not corr
-           ( (!best->isCorr() ) &&  best->isInner() && config()->TsmGhost2Flag()==4) )   // skip only if best is inner and not corr
-	  {                 
-	    continue;                             // skip track
-	  }
+    if (config()->TsmGhost2Corr()) {
+      inner_or_corr = curr->isInner() || curr->isCorr();
+    } else {
+      inner_or_corr = curr->isInner();
+    }
+
+    if (config()->TsmGhost2Flag() != 0) { // 2nd tracks not always enabled
+      if (
+          //! curr->isInner() &&                // outer track
+          !inner_or_corr && // outer and not corr
+          (curr->tssNumber() == best->tssNumber() &&
+           curr->TcPos() == best->TcPos())) { // same correlator of 1st track
+        if (config()->TsmGhost2Flag() == 2 || // do not look to corr bit of 1st
+            ((!best->isCorr()) &&
+             config()->TsmGhost2Flag() != 4) || // skip if best is not corr
+            ((!best->isCorr()) && best->isInner() &&
+             config()->TsmGhost2Flag() ==
+                 4)) // skip only if best is inner and not corr
+        {
+          continue; // skip track
+        }
       }
     }
-    
+
     // added DBSM
     // SM double TSM    if ( bkmod == 1 ) { // NORMAL mode ---> sorting with <
-    if ( bkmod == 1 ) { // NORMAL mode ---> sorting on dataword
-      curr->setBitsTss(); // maybe not necessary, as they are the same as for TSS in the default
-    } else if( bkmod == 0) { //  { // BACKUP mode ---> sorting on modified dataword
+    if (bkmod == 1) {     // NORMAL mode ---> sorting on dataword
+      curr->setBitsTss(); // maybe not necessary, as they are the same as for
+                          // TSS in the default
+    } else if (bkmod ==
+               0) { //  { // BACKUP mode ---> sorting on modified dataword
       curr->setBitsBkmod();
     } else {
       std::cout << " DTTSM::sortTSM2 bkmod not properly assigned!" << std::endl;
     }
-    
-    
-    
+
     // added DBSM
     // SM double TSM    if ( bkmod == 1 ) { // NORMAL mode ---> sorting with <
-    
-    if(second==nullptr){
-      second=curr;
-    } 
-    else if((*curr)<(*second)){
-      second=curr;
-    }  
+
+    if (second == nullptr) {
+      second = curr;
+    } else if ((*curr) < (*second)) {
+      second = curr;
+    }
   }
   return second;
 }
 
-
-
-void
-DTTSM::addCand(DTTSCand* cand) {
+void DTTSM::addCand(DTTSCand *cand) {
   // NEW DESIGN: DTTSM is not configurable!
   //  cand->resetCarry(); // reset carry information
   //  cand->setBitsTsm(); // set quality bits for DTTSM sorting
-  _incand[(1-cand->isFirst())].push_back(cand); 
+  _incand[(1 - cand->isFirst())].push_back(cand);
 }
 
-unsigned
-DTTSM::nCand(int ifs) const {
-  if(ifs<1||ifs>2){
+unsigned DTTSM::nCand(int ifs) const {
+  if (ifs < 1 || ifs > 2) {
     std::cout << "DTTSM::nCand: wrong track number: " << ifs;
     std::cout << " 0 returned!" << std::endl;
     return 0;
   }
 
-  return _incand[ifs-1].size();
+  return _incand[ifs - 1].size();
 }
 
-DTTSCand*
-DTTSM::getDTTSCand(int ifs, unsigned n) const {
-  if(ifs<1||ifs>2){
+DTTSCand *DTTSM::getDTTSCand(int ifs, unsigned n) const {
+  if (ifs < 1 || ifs > 2) {
     std::cout << "DTTSM::getDTTSCand: wrong track number: " << ifs;
     std::cout << " empty pointer returned!" << std::endl;
     return nullptr;
   }
-  if(n<1 || n>nCand(ifs)) {
+  if (n < 1 || n > nCand(ifs)) {
     std::cout << "DTTSM::getDTTSCand: requested trigger not present: " << n;
     std::cout << " empty pointer returned!" << std::endl;
     return nullptr;
   }
-  std::vector<DTTSCand*>::const_iterator p = _incand[ifs-1].begin()+n-1;
+  std::vector<DTTSCand *>::const_iterator p = _incand[ifs - 1].begin() + n - 1;
   return (*p);
 }
 
-const DTTracoTrigData*
-DTTSM::getTracoT(int ifs, unsigned n) const {
-  if(ifs<1||ifs>2){
+const DTTracoTrigData *DTTSM::getTracoT(int ifs, unsigned n) const {
+  if (ifs < 1 || ifs > 2) {
     std::cout << "DTTSM::getTracoT: wrong track number: " << ifs;
     std::cout << " empty pointer returned!" << std::endl;
     return nullptr;
   }
-  if(n<1 || n>nCand(ifs)) {
+  if (n < 1 || n > nCand(ifs)) {
     std::cout << "DTTSM::getTracoT: requested trigger not present: " << n;
     std::cout << " empty pointer returned!" << std::endl;
     return nullptr;
@@ -322,20 +311,13 @@ DTTSM::getTracoT(int ifs, unsigned n) const {
   return getDTTSCand(ifs, n)->tracoTr();
 }
 
-DTTSCand*
-DTTSM::getTrack(int n) const {
+DTTSCand *DTTSM::getTrack(int n) const {
 
-  if(n<1 || n>nTracks()) {
+  if (n < 1 || n > nTracks()) {
     std::cout << "DTTSM::getTrack: requested track not present: " << n;
     std::cout << " empty pointer returned!" << std::endl;
     return nullptr;
   }
-  std::vector<DTTSCand*>::const_iterator p = _outcand.begin()+n-1;
+  std::vector<DTTSCand *>::const_iterator p = _outcand.begin() + n - 1;
   return (*p);
 }
-
-
-
-
-
-
diff --git a/L1Trigger/DTTriggerServerPhi/src/DTTSPhi.cc b/L1Trigger/DTTriggerServerPhi/src/DTTSPhi.cc
index 74dd1060a994e..92bf5dd3ce84a 100644
--- a/L1Trigger/DTTriggerServerPhi/src/DTTSPhi.cc
+++ b/L1Trigger/DTTriggerServerPhi/src/DTTSPhi.cc
@@ -7,13 +7,13 @@
 //
 //   Author List:
 //   C. Grandi
-//   Modifications: 
+//   Modifications:
 //   jan02 - D.Bonacorsi/S.Marcellini
 //           improved algorithm for 2nd track handling in case of pile-up in TSM
 //           param: tsmgetcarryflag - value: 1 (default)
 //   feb04 - Implementation of sector collector related stuff(S. Marcellini)
 //   jan07 - C. Battilana local conf update
-//   mar07 - S. Vanini : parameters from DTConfigManager 
+//   mar07 - S. Vanini : parameters from DTConfigManager
 //
 //--------------------------------------------------
 
@@ -29,9 +29,9 @@
 //-------------------------------
 #include "L1Trigger/DTTraco/interface/DTTracoCard.h"
 #include "L1Trigger/DTTraco/interface/DTTracoTrigData.h"
-#include "L1Trigger/DTTriggerServerPhi/interface/DTTSS.h"
-#include "L1Trigger/DTTriggerServerPhi/interface/DTTSM.h"
 #include "L1Trigger/DTTriggerServerPhi/interface/DTTSCand.h"
+#include "L1Trigger/DTTriggerServerPhi/interface/DTTSM.h"
+#include "L1Trigger/DTTriggerServerPhi/interface/DTTSS.h"
 
 //---------------
 // C++ Headers --
@@ -41,500 +41,549 @@
 //----------------
 // Constructors --
 //----------------
-DTTSPhi::DTTSPhi(DTTrigGeom* geom, DTTracoCard* tracocard) : 
-  DTGeomSupplier(geom), _tracocard(tracocard){
+DTTSPhi::DTTSPhi(DTTrigGeom *geom, DTTracoCard *tracocard)
+    : DTGeomSupplier(geom), _tracocard(tracocard) {
 
   // reserve the appropriate amount of space for vectors
-  int i=0;
-  for(i=0;i<DTConfigTSPhi::NSTEPL - DTConfigTSPhi::NSTEPF + 1 ;i++) {  // SM add + 1
+  int i = 0;
+  for (i = 0; i < DTConfigTSPhi::NSTEPL - DTConfigTSPhi::NSTEPF + 1;
+       i++) { // SM add + 1
     _tss[i].reserve(DTConfigTSPhi::NTSSTSM);
     // DBSM-doubleTSM
     _tsm[i].reserve(DTConfigTSPhi::NTSMD);
   }
 
-  for(int is=0;is<DTConfigTSPhi::NSTEPL-DTConfigTSPhi::NSTEPF+1;is++) {
+  for (int is = 0; is < DTConfigTSPhi::NSTEPL - DTConfigTSPhi::NSTEPF + 1;
+       is++) {
 
-    // create DTTSSs  
-    for(int itss=1; itss<=DTConfigTSPhi::NTSSTSM; itss++) {
-      DTTSS* tss = new DTTSS(itss);
+    // create DTTSSs
+    for (int itss = 1; itss <= DTConfigTSPhi::NTSSTSM; itss++) {
+      DTTSS *tss = new DTTSS(itss);
       _tss[is].push_back(tss);
     }
 
-    // create DTTSMs     SM double TSM  
-    for(int itsmd=1; itsmd<=DTConfigTSPhi::NTSMD; itsmd++) {
-      DTTSM* tsm = new DTTSM(itsmd);
+    // create DTTSMs     SM double TSM
+    for (int itsmd = 1; itsmd <= DTConfigTSPhi::NTSMD; itsmd++) {
+      DTTSM *tsm = new DTTSM(itsmd);
       _tsm[is].push_back(tsm);
     }
   }
 }
 
-
 //--------------
 // Destructor --
 //--------------
-DTTSPhi::~DTTSPhi(){
+DTTSPhi::~DTTSPhi() {
 
-  std::vector<DTTSS*>::iterator ptss;
-  std::vector<DTTSM*>::iterator ptsm;
-  for(int is=0;is<DTConfigTSPhi::NSTEPL-DTConfigTSPhi::NSTEPF+1;is++){
+  std::vector<DTTSS *>::iterator ptss;
+  std::vector<DTTSM *>::iterator ptsm;
+  for (int is = 0; is < DTConfigTSPhi::NSTEPL - DTConfigTSPhi::NSTEPF + 1;
+       is++) {
     // clear TSSs
-    for (ptss = _tss[is].begin(); ptss != _tss[is].end(); ptss++){
+    for (ptss = _tss[is].begin(); ptss != _tss[is].end(); ptss++) {
       delete (*ptss);
     }
     _tss[is].clear();
     // clear TSMs
-    for (ptsm = _tsm[is].begin(); ptsm != _tsm[is].end(); ptsm++){
+    for (ptsm = _tsm[is].begin(); ptsm != _tsm[is].end(); ptsm++) {
       delete (*ptsm);
     }
     _tsm[is].clear();
-
   }
-  
+
   localClear();
-  
-  //delete _config;
 
+  // delete _config;
 }
 
-
 //--------------
 // Operations --
 //--------------
 
-void
-DTTSPhi::localClear() {
-  for(int is=0;is<DTConfigTSPhi::NSTEPL-DTConfigTSPhi::NSTEPF+1;is++) {
+void DTTSPhi::localClear() {
+  for (int is = 0; is < DTConfigTSPhi::NSTEPL - DTConfigTSPhi::NSTEPF + 1;
+       is++) {
     // clear buffer
-    std::vector<DTTSCand*>::iterator p1;
-    for(p1 = _tctrig[is].begin(); p1 != _tctrig[is].end(); p1++) {
+    std::vector<DTTSCand *>::iterator p1;
+    for (p1 = _tctrig[is].begin(); p1 != _tctrig[is].end(); p1++) {
       delete (*p1);
     }
     _tctrig[is].clear();
-    
-    std::vector<DTTSS*>::iterator ptss;
-    for(ptss = _tss[is].begin(); ptss != _tss[is].end(); ptss++) {
+
+    std::vector<DTTSS *>::iterator ptss;
+    for (ptss = _tss[is].begin(); ptss != _tss[is].end(); ptss++) {
       (*ptss)->clear();
     }
     // clear all DTTSM
-    std::vector<DTTSM*>::iterator ptsm;
-    for(ptsm = _tsm[is].begin(); ptsm != _tsm[is].end(); ptsm++) {
+    std::vector<DTTSM *>::iterator ptsm;
+    for (ptsm = _tsm[is].begin(); ptsm != _tsm[is].end(); ptsm++) {
       (*ptsm)->clear();
     }
   }
 }
 
-void
-DTTSPhi::setConfig (const DTConfigManager *conf){
+void DTTSPhi::setConfig(const DTConfigManager *conf) {
 
   DTChamberId sid = ChamberId();
   _config = conf->getDTConfigTSPhi(sid);
 
-  for(int is=0;is<DTConfigTSPhi::NSTEPL-DTConfigTSPhi::NSTEPF+1;is++) {
+  for (int is = 0; is < DTConfigTSPhi::NSTEPL - DTConfigTSPhi::NSTEPF + 1;
+       is++) {
 
     // set TSS config
-    std::vector<DTTSS*>::iterator ptss;
-    for (ptss = _tss[is].begin(); ptss != _tss[is].end(); ptss++){
+    std::vector<DTTSS *>::iterator ptss;
+    for (ptss = _tss[is].begin(); ptss != _tss[is].end(); ptss++) {
       (*ptss)->setConfig(config());
     }
     // set TSM config
-    std::vector<DTTSM*>::iterator ptsm;
-    for (ptsm = _tsm[is].begin(); ptsm != _tsm[is].end(); ptsm++){
+    std::vector<DTTSM *>::iterator ptsm;
+    for (ptsm = _tsm[is].begin(); ptsm != _tsm[is].end(); ptsm++) {
       (*ptsm)->setConfig(config());
     }
-
   }
-
 }
 
-void
-DTTSPhi::loadTSPhi() {
+void DTTSPhi::loadTSPhi() {
 
-  // clear DTTSSs and DTTSM 
+  // clear DTTSSs and DTTSM
   localClear();
-  
-  if(config()->debug()){
-    std::cout << "DTTSPhi::loadDTTSPhi called for wheel=" << wheel() ;
-    std::cout <<                                ", station=" << station();
-    std::cout <<                                ", sector="  << sector() << std::endl;
+
+  if (config()->debug()) {
+    std::cout << "DTTSPhi::loadDTTSPhi called for wheel=" << wheel();
+    std::cout << ", station=" << station();
+    std::cout << ", sector=" << sector() << std::endl;
   }
-  
+
   // loop on all TRACO triggers
   std::vector<DTTracoTrigData>::const_iterator p;
-  std::vector<DTTracoTrigData>::const_iterator pend=_tracocard->end();
-  for(p=_tracocard->begin();p!=pend;p++){
+  std::vector<DTTracoTrigData>::const_iterator pend = _tracocard->end();
+  for (p = _tracocard->begin(); p != pend; p++) {
 
-    if(config()->usedTraco(p->tracoNumber()) /*|| config()->usedTraco(p->tracoNumber())==1*/ ) {
+    if (config()->usedTraco(
+            p->tracoNumber()) /*|| config()->usedTraco(p->tracoNumber())==1*/) {
       int step = p->step();
-      int fs = (p->isFirst()) ? 1 : 2 ;
-            
+      int fs = (p->isFirst()) ? 1 : 2;
+
       // if first track is found inhibit second track processing in previous BX
-      if( fs==1 && step>DTConfigTSPhi::NSTEPF)
-	ignoreSecondTrack(step-1,p->tracoNumber());
-      
+      if (fs == 1 && step > DTConfigTSPhi::NSTEPF)
+        ignoreSecondTrack(step - 1, p->tracoNumber());
+
       // load trigger
-      addTracoT( step, &(*p), fs );   
+      addTracoT(step, &(*p), fs);
     }
   }
 }
 
-void
-DTTSPhi::addTracoT(int step, const DTTracoTrigData* tracotrig, int ifs) {
-  if(step<DTConfigTSPhi::NSTEPF||step>DTConfigTSPhi::NSTEPL){
+void DTTSPhi::addTracoT(int step, const DTTracoTrigData *tracotrig, int ifs) {
+  if (step < DTConfigTSPhi::NSTEPF || step > DTConfigTSPhi::NSTEPL) {
     std::cout << "DTTSPhi::addTracoT: step out of range: " << step;
     std::cout << " trigger not added!" << std::endl;
     return;
   }
   // Check that a preview is present and code is not zero
-  if(!tracotrig->pvCode() || !tracotrig->code() ) {
-    std::cout << "DTTSPhi::addTracoT: preview not present in TRACO trigger or its code=0 ";
+  if (!tracotrig->pvCode() || !tracotrig->code()) {
+    std::cout << "DTTSPhi::addTracoT: preview not present in TRACO trigger or "
+                 "its code=0 ";
     std::cout << " trigger not added!" << std::endl;
     return;
   }
-  
+
   // Get the appropriate TSS
-  int itss = (tracotrig->tracoNumber() -1 ) / DTConfigTSPhi::NTCTSS + 1;
-  if(itss<1 || itss>DTConfigTSPhi::NTSSTSM) {
+  int itss = (tracotrig->tracoNumber() - 1) / DTConfigTSPhi::NTCTSS + 1;
+  if (itss < 1 || itss > DTConfigTSPhi::NTSSTSM) {
     std::cout << "DTTSPhi::addTracoT: wrong TRACO number: ";
     std::cout << tracotrig->tracoNumber();
     std::cout << " trigger not added!" << std::endl;
     return;
   }
-  
-  // TSM status check (if it is the case, reject TRACO triggers related to broken TSMData)
-  if( config()->TsmStatus().element(itss)==0){      // TSMD broken
+
+  // TSM status check (if it is the case, reject TRACO triggers related to
+  // broken TSMData)
+  if (config()->TsmStatus().element(itss) == 0) { // TSMD broken
     return;
   }
 
-  int pos = tracotrig->tracoNumber() - (itss-1)*DTConfigTSPhi::NTCTSS;
-  DTTSS* tss = getDTTSS(step,itss);
-  
+  int pos = tracotrig->tracoNumber() - (itss - 1) * DTConfigTSPhi::NTCTSS;
+  DTTSS *tss = getDTTSS(step, itss);
+
   // Create a new Trigger Server candidate
-  DTTSCand* cand = new DTTSCand(tss, tracotrig, ifs, pos);
-  
-  // Add it to the buffer and to the TSS  
-  _tctrig[step-DTConfigTSPhi::NSTEPF].push_back(cand);
+  DTTSCand *cand = new DTTSCand(tss, tracotrig, ifs, pos);
+
+  // Add it to the buffer and to the TSS
+  _tctrig[step - DTConfigTSPhi::NSTEPF].push_back(cand);
   tss->addDTTSCand(cand);
 
   // Debugging...
-  if(config()->debug()){
+  if (config()->debug()) {
     std::cout << "DTTSPhi::addTracoT at step " << step;
-    if(ifs==1) {
+    if (ifs == 1) {
       std::cout << " (first track)";
     } else {
       std::cout << " (second track)";
     }
     std::cout << " from TRACO " << tracotrig->tracoNumber();
-    std::cout << " to TSS " << tss->number() << ", position=" << pos << std::endl;
+    std::cout << " to TSS " << tss->number() << ", position=" << pos
+              << std::endl;
     tracotrig->print();
   }
   // end debugging
-
 }
 
-void
-DTTSPhi::runTSPhi() {
+void DTTSPhi::runTSPhi() {
 
-  DTTSCand* secondPrevBx = nullptr;    // new DTTSCand;
+  DTTSCand *secondPrevBx = nullptr; // new DTTSCand;
 
   bool existSecondPrevBx = false;
-  int itsmd = 1;  // initialize it to 1, default value if not in back up mode
-  int ntsm[DTConfigTSPhi::NSTEPL+1-DTConfigTSPhi::NSTEPF][DTConfigTSPhi::NTSMD];  
+  int itsmd = 1; // initialize it to 1, default value if not in back up mode
+  int ntsm[DTConfigTSPhi::NSTEPL + 1 - DTConfigTSPhi::NSTEPF]
+          [DTConfigTSPhi::NTSMD];
   int i_tsmd;
-  
-  for(int is=DTConfigTSPhi::NSTEPF;is<DTConfigTSPhi::NSTEPL+1;is++) {
+
+  for (int is = DTConfigTSPhi::NSTEPF; is < DTConfigTSPhi::NSTEPL + 1; is++) {
     // loop on DTTSSs
     int ntss = 0;
     i_tsmd = 0;
-    ntsm[is-DTConfigTSPhi::NSTEPF][0] = 0; // counter to make sector collector run if at least a tsm 
-    ntsm[is-DTConfigTSPhi::NSTEPF][1] = 0;
-    std::vector<DTTSS*>::iterator p;
-    for(p=_tss[is-DTConfigTSPhi::NSTEPF].begin(); 
-        p<_tss[is-DTConfigTSPhi::NSTEPF].end(); p++) {
-      if((*p)->nTracoT(1)>0) {
-	// run DTTSS algorithm on non-empty DTTSSs
+    ntsm[is - DTConfigTSPhi::NSTEPF][0] =
+        0; // counter to make sector collector run if at least a tsm
+    ntsm[is - DTConfigTSPhi::NSTEPF][1] = 0;
+    std::vector<DTTSS *>::iterator p;
+    for (p = _tss[is - DTConfigTSPhi::NSTEPF].begin();
+         p < _tss[is - DTConfigTSPhi::NSTEPF].end(); p++) {
+      if ((*p)->nTracoT(1) > 0) {
+        // run DTTSS algorithm on non-empty DTTSSs
         (*p)->run();
-	// load DTTSM with output DTTSS tracks
-        if((*p)->nTracks()>0){
-          for(int it=1;it<=(*p)->nTracks();it++){
-	    //--- SM double TSM    get the corresponding tsm data 
-	    int bkmod = config()->TsmStatus().element(0);
-	    if (bkmod==0) {    // we are in back-up mode
-	      int my_itss = (*p)->number();   // metodo di DTTSS che ritorna itss
-	      int ntsstsmd = config()->TSSinTSMD(station(),sector());
-	      if(ntsstsmd<2 || ntsstsmd>DTConfigTSPhi::NTSSTSMD) {                 
-		std::cout << " DTTSPhi::addTracoT - wrong TSMD: " << ntsstsmd << std::endl;
-	      }
-  
-	      // Get the appropriate TSMD
-	      itsmd = (my_itss -1 ) / ntsstsmd + 1;
-              if(config()->debug()){
-		std::cout << " DTTSPhi::addTracoT: itsmd = (my_itss -1 ) / ntsstsmd + 1  ---> my_itss = " <<
-		  my_itss << "  ntsstsmd = " << ntsstsmd << "  itsmd = " << itsmd << std::endl;}
-	    }
-            else if(bkmod==1) {
-	      itsmd = 1;  // initialize it to 1, default value if not in back up mode
-	    }
-	    if(itsmd>2) std::cout << "****** >DTTSPhi::RunTSPhi wrong  itsmd = " << itsmd << std::endl; 
-            DTTSM* tsm = getDTTSM(is,itsmd); 
+        // load DTTSM with output DTTSS tracks
+        if ((*p)->nTracks() > 0) {
+          for (int it = 1; it <= (*p)->nTracks(); it++) {
+            //--- SM double TSM    get the corresponding tsm data
+            int bkmod = config()->TsmStatus().element(0);
+            if (bkmod == 0) {               // we are in back-up mode
+              int my_itss = (*p)->number(); // metodo di DTTSS che ritorna itss
+              int ntsstsmd = config()->TSSinTSMD(station(), sector());
+              if (ntsstsmd < 2 || ntsstsmd > DTConfigTSPhi::NTSSTSMD) {
+                std::cout << " DTTSPhi::addTracoT - wrong TSMD: " << ntsstsmd
+                          << std::endl;
+              }
+
+              // Get the appropriate TSMD
+              itsmd = (my_itss - 1) / ntsstsmd + 1;
+              if (config()->debug()) {
+                std::cout << " DTTSPhi::addTracoT: itsmd = (my_itss -1 ) / "
+                             "ntsstsmd + 1  ---> my_itss = "
+                          << my_itss << "  ntsstsmd = " << ntsstsmd
+                          << "  itsmd = " << itsmd << std::endl;
+              }
+            } else if (bkmod == 1) {
+              itsmd =
+                  1; // initialize it to 1, default value if not in back up mode
+            }
+            if (itsmd > 2)
+              std::cout << "****** >DTTSPhi::RunTSPhi wrong  itsmd = " << itsmd
+                        << std::endl;
+            DTTSM *tsm = getDTTSM(is, itsmd);
             tsm->addCand((*p)->getTrack(it));
           }
           ntss++;
         } // end loop on output DTTSS tracks
       }
     } // end loop on DTTSSs
-    
-    
+
     // at least a DTTSS with signal. Run DTTSM
- 
-    std::vector<DTTSM*>::iterator p_tsm;
-    
-    for(p_tsm=_tsm[is-DTConfigTSPhi::NSTEPF].begin(); 
-        p_tsm<_tsm[is-DTConfigTSPhi::NSTEPF].end(); p_tsm++) {
-      
-      // Run TSM sorting if at least a first track 
-
-      i_tsmd = (*p_tsm)->number()-1; // returns itsmd (0 in default, 0 or 1 when bkmode )
-      
-      if((*p_tsm)->nCand(1)>0) {  
-	int bkmod = config()->TsmStatus().element(0);
-
-        (*p_tsm)->run(bkmod);   // bkmod 1 normal, 0 backup
-	// Run TSM for current BX in case of 1st Tracks
-	// Run TSM for previous BX for second tracks, to check whether there is a pile up
-	// Tells whether a second track at previous BX exists
-	
-	if((*p_tsm)->nTracks()>0){
-	  // We have a first track. Store it if code is > 0
-	  
-	  if((*p_tsm)->getTrack(1)->tracoTr()->code()>0) {
-	    
-	    DTTSCand* first = (*p_tsm)->getTrack(1);
-	    if( config()->TsmGetCarryFlag()==0 ) {  //  get 1st tk at current BX and ignore any 2nd tk at previous BX
-	      
-              _cache.push_back(DTChambPhSegm(ChamberId(),is,(*p_tsm)->getTrack(1)->tracoTr(),1));
-	      ntsm[is-DTConfigTSPhi::NSTEPF][i_tsmd]++;  // SM increment ntsm at current BX
-	      if( config()->debug())
-	        std::cout << "ntsm = " <<  ntsm[is-DTConfigTSPhi::NSTEPF][i_tsmd] << " is = " << is << " i_tsmd = " << i_tsmd << std::endl; 
-	      if((*p_tsm)->nTracks()>1)   {  // there is a 2nd tk
-		if((*p_tsm)->getTrack(2)->tracoTr()->code()>0) {   // check if its code > 0
-		  ntsm[is-DTConfigTSPhi::NSTEPF][i_tsmd]++;
-		  if( config()->debug())
-                    std::cout << "ntsm = " <<  ntsm[is-DTConfigTSPhi::NSTEPF][i_tsmd] << " is = " << is << " i_tsmd = " << i_tsmd << std::endl; 
-		  
-		  secondPrevBx=(*p_tsm)->getTrack(2) ;   // assign second tk of previous BX
-                  
-		}
-	      }
-	    }
-	    else if( config()->TsmGetCarryFlag()==1 ) {   // compare with 2nd tk in previous BX and get the tk with better quality
-	      existSecondPrevBx = ((is-1-DTConfigTSPhi::NSTEPF>=0) &&  ( ntsm[is-1-DTConfigTSPhi::NSTEPF][i_tsmd]>1) &&   
-				   (secondPrevBx->tracoTr()->code()>0));                
-	      if( (!existSecondPrevBx)  || 
-		  ! (	(secondPrevBx->isCorr() && secondPrevBx->isHtrig() && secondPrevBx->isInner()) ||             
-                        (secondPrevBx->isCorr() && secondPrevBx->isHtrig() && !secondPrevBx->isInner())  ||           
-			(!secondPrevBx->isCorr() && secondPrevBx->isHtrig() && secondPrevBx->isInner()) )           ||
-		  
-		  ( (secondPrevBx->isCorr() && secondPrevBx->isHtrig() && secondPrevBx->isInner()) &&
-		    (first->isCorr() && first->isHtrig() && first->isInner()) ) ||
-		  
-		  ( (secondPrevBx->isCorr() && secondPrevBx->isHtrig() && !secondPrevBx->isInner()) &&
-		    ( (first->isCorr() && first->isHtrig() && first->isInner()) || 
-		      (first->isCorr() && first->isHtrig() && !first->isInner()) ) ) ||
-		  
-		  ( (!secondPrevBx->isCorr() && secondPrevBx->isHtrig() && secondPrevBx->isInner()) && 
-		    !( (!first->isCorr() && first->isHtrig() && !first->isInner())  || 
-		       (!first->isCorr() && !first->isHtrig() && first->isInner())  ||
-		       (!first->isCorr() && !first->isHtrig() && !first->isInner()) ||
-		       (first->isCorr() && !first->isHtrig() && !first->isInner())  ||
-		       (first->isCorr() && !first->isHtrig() && first->isInner()) ) )
-		  ) {
-		// SM sector collector
-		ntsm[is-DTConfigTSPhi::NSTEPF][i_tsmd]++;  // SM increment ntsm at current BX. I need to know if there is at least a first track from TSM to run Sect Coll
-		
-		_cache.push_back(DTChambPhSegm(ChamberId(),is,(*p_tsm)->getTrack(1)->tracoTr(),1));
-		//		(*p_tsm)->getTrack(1)->print();
-		
-		if((*p_tsm)->nTracks()>1)   {  // there is a 2nd tk
-		  ntsm[is-DTConfigTSPhi::NSTEPF][i_tsmd]++;		  
-  		  if((*p_tsm)->getTrack(2)->tracoTr()->code()>0) {   // check if its code > 0
-  		    secondPrevBx=(*p_tsm)->getTrack(2) ;   // assign second previous BX
-		  }
-		}
-	      }
-	      else   {      // if 2nd tk prev BX is better than first present BX skip the event and get 2nd prev BX 
-		ntsm[is-1-DTConfigTSPhi::NSTEPF][i_tsmd]++;  // SM increment ntsm at previous BX.
-		_cache.push_back(DTChambPhSegm(ChamberId(),is-1,secondPrevBx->tracoTr(),2));
-		//secondPrevBx->print();
-	      }
-	    }
-	    
-	    else if( config()->TsmGetCarryFlag()==2 ) {  // neglect first tk if it is a low uncorrelated trigger
-	      existSecondPrevBx = ((is-1-DTConfigTSPhi::NSTEPF>=0) && (ntsm[is-1-DTConfigTSPhi::NSTEPF][i_tsmd] >1) && (secondPrevBx->tracoTr()->code()>0));
-	      if( (!existSecondPrevBx) || first->isHtrig() || first->isCorr()) {
-		ntsm[is-DTConfigTSPhi::NSTEPF][i_tsmd]++;  // SM increment ntsm at current BX. 
-		// SM sector collector: Load DTSectColl with output of DTTSM
-		_cache.push_back(DTChambPhSegm(ChamberId(),is,(*p_tsm)->getTrack(1)->tracoTr(),1));
-		//		(*p_tsm)->getTrack(1)->print();
-		
-		if((*p_tsm)->nTracks()>1)   {  // there is a 2nd tk
-		  ntsm[is-DTConfigTSPhi::NSTEPF][i_tsmd]++;
-		  if((*p_tsm)->getTrack(2)->tracoTr()->code()>0) {   // check if its code > 0
-		    secondPrevBx=(*p_tsm)->getTrack(2) ;   // assign second tk of previous BX
-		  }
-		}
-	      }
-	      else {
-		ntsm[is-1-DTConfigTSPhi::NSTEPF][i_tsmd]++;  // SM increment ntsm at previous BX. 
-		_cache.push_back(DTChambPhSegm(ChamberId(),is-1,secondPrevBx->tracoTr(),2));
-		//		secondPrevBx->print(); 
-	      }
-	    }
-	  }
-	}
-
-
-      }      
-      else if ( ((*p_tsm)->nCand(1) == 0) && (is-1-DTConfigTSPhi::NSTEPF>=0) && ntsm[is-1-DTConfigTSPhi::NSTEPF][i_tsmd] > 0 ) {// it means that the last BX with sort 2 was not the previous one
-	existSecondPrevBx = ((is-1-DTConfigTSPhi::NSTEPF>=0) && (ntsm[is-1-DTConfigTSPhi::NSTEPF][i_tsmd]>1) && (secondPrevBx->tracoTr()->code()>0));
-	if(existSecondPrevBx) {
-	  _cache.push_back(DTChambPhSegm(ChamberId(),is-1,secondPrevBx->tracoTr(),2));
-	  
-	  //	  secondPrevBx->print();
-	}
+
+    std::vector<DTTSM *>::iterator p_tsm;
+
+    for (p_tsm = _tsm[is - DTConfigTSPhi::NSTEPF].begin();
+         p_tsm < _tsm[is - DTConfigTSPhi::NSTEPF].end(); p_tsm++) {
+
+      // Run TSM sorting if at least a first track
+
+      i_tsmd = (*p_tsm)->number() -
+               1; // returns itsmd (0 in default, 0 or 1 when bkmode )
+
+      if ((*p_tsm)->nCand(1) > 0) {
+        int bkmod = config()->TsmStatus().element(0);
+
+        (*p_tsm)->run(bkmod); // bkmod 1 normal, 0 backup
+        // Run TSM for current BX in case of 1st Tracks
+        // Run TSM for previous BX for second tracks, to check whether there is
+        // a pile up Tells whether a second track at previous BX exists
+
+        if ((*p_tsm)->nTracks() > 0) {
+          // We have a first track. Store it if code is > 0
+
+          if ((*p_tsm)->getTrack(1)->tracoTr()->code() > 0) {
+
+            DTTSCand *first = (*p_tsm)->getTrack(1);
+            if (config()->TsmGetCarryFlag() ==
+                0) { //  get 1st tk at current BX and ignore any 2nd tk at
+                     //  previous BX
+
+              _cache.push_back(DTChambPhSegm(
+                  ChamberId(), is, (*p_tsm)->getTrack(1)->tracoTr(), 1));
+              ntsm[is - DTConfigTSPhi::NSTEPF]
+                  [i_tsmd]++; // SM increment ntsm at current BX
+              if (config()->debug())
+                std::cout << "ntsm = "
+                          << ntsm[is - DTConfigTSPhi::NSTEPF][i_tsmd]
+                          << " is = " << is << " i_tsmd = " << i_tsmd
+                          << std::endl;
+              if ((*p_tsm)->nTracks() > 1) { // there is a 2nd tk
+                if ((*p_tsm)->getTrack(2)->tracoTr()->code() >
+                    0) { // check if its code > 0
+                  ntsm[is - DTConfigTSPhi::NSTEPF][i_tsmd]++;
+                  if (config()->debug())
+                    std::cout
+                        << "ntsm = " << ntsm[is - DTConfigTSPhi::NSTEPF][i_tsmd]
+                        << " is = " << is << " i_tsmd = " << i_tsmd
+                        << std::endl;
+
+                  secondPrevBx =
+                      (*p_tsm)->getTrack(2); // assign second tk of previous BX
+                }
+              }
+            } else if (config()->TsmGetCarryFlag() ==
+                       1) { // compare with 2nd tk in previous BX and get the tk
+                            // with better quality
+              existSecondPrevBx =
+                  ((is - 1 - DTConfigTSPhi::NSTEPF >= 0) &&
+                   (ntsm[is - 1 - DTConfigTSPhi::NSTEPF][i_tsmd] > 1) &&
+                   (secondPrevBx->tracoTr()->code() > 0));
+              if ((!existSecondPrevBx) ||
+                  !((secondPrevBx->isCorr() && secondPrevBx->isHtrig() &&
+                     secondPrevBx->isInner()) ||
+                    (secondPrevBx->isCorr() && secondPrevBx->isHtrig() &&
+                     !secondPrevBx->isInner()) ||
+                    (!secondPrevBx->isCorr() && secondPrevBx->isHtrig() &&
+                     secondPrevBx->isInner())) ||
+
+                  ((secondPrevBx->isCorr() && secondPrevBx->isHtrig() &&
+                    secondPrevBx->isInner()) &&
+                   (first->isCorr() && first->isHtrig() && first->isInner())) ||
+
+                  ((secondPrevBx->isCorr() && secondPrevBx->isHtrig() &&
+                    !secondPrevBx->isInner()) &&
+                   ((first->isCorr() && first->isHtrig() && first->isInner()) ||
+                    (first->isCorr() && first->isHtrig() &&
+                     !first->isInner()))) ||
+
+                  ((!secondPrevBx->isCorr() && secondPrevBx->isHtrig() &&
+                    secondPrevBx->isInner()) &&
+                   !((!first->isCorr() && first->isHtrig() &&
+                      !first->isInner()) ||
+                     (!first->isCorr() && !first->isHtrig() &&
+                      first->isInner()) ||
+                     (!first->isCorr() && !first->isHtrig() &&
+                      !first->isInner()) ||
+                     (first->isCorr() && !first->isHtrig() &&
+                      !first->isInner()) ||
+                     (first->isCorr() && !first->isHtrig() &&
+                      first->isInner())))) {
+                // SM sector collector
+                ntsm[is - DTConfigTSPhi::NSTEPF]
+                    [i_tsmd]++; // SM increment ntsm at current BX. I need to
+                                // know if there is at least a first track from
+                                // TSM to run Sect Coll
+
+                _cache.push_back(DTChambPhSegm(
+                    ChamberId(), is, (*p_tsm)->getTrack(1)->tracoTr(), 1));
+                //		(*p_tsm)->getTrack(1)->print();
+
+                if ((*p_tsm)->nTracks() > 1) { // there is a 2nd tk
+                  ntsm[is - DTConfigTSPhi::NSTEPF][i_tsmd]++;
+                  if ((*p_tsm)->getTrack(2)->tracoTr()->code() >
+                      0) { // check if its code > 0
+                    secondPrevBx =
+                        (*p_tsm)->getTrack(2); // assign second previous BX
+                  }
+                }
+              } else { // if 2nd tk prev BX is better than first present BX skip
+                       // the event and get 2nd prev BX
+                ntsm[is - 1 - DTConfigTSPhi::NSTEPF]
+                    [i_tsmd]++; // SM increment ntsm at previous BX.
+                _cache.push_back(DTChambPhSegm(ChamberId(), is - 1,
+                                               secondPrevBx->tracoTr(), 2));
+                // secondPrevBx->print();
+              }
+            }
+
+            else if (config()->TsmGetCarryFlag() ==
+                     2) { // neglect first tk if it is a low uncorrelated
+                          // trigger
+              existSecondPrevBx =
+                  ((is - 1 - DTConfigTSPhi::NSTEPF >= 0) &&
+                   (ntsm[is - 1 - DTConfigTSPhi::NSTEPF][i_tsmd] > 1) &&
+                   (secondPrevBx->tracoTr()->code() > 0));
+              if ((!existSecondPrevBx) || first->isHtrig() || first->isCorr()) {
+                ntsm[is - DTConfigTSPhi::NSTEPF]
+                    [i_tsmd]++; // SM increment ntsm at current BX.
+                // SM sector collector: Load DTSectColl with output of DTTSM
+                _cache.push_back(DTChambPhSegm(
+                    ChamberId(), is, (*p_tsm)->getTrack(1)->tracoTr(), 1));
+                //		(*p_tsm)->getTrack(1)->print();
+
+                if ((*p_tsm)->nTracks() > 1) { // there is a 2nd tk
+                  ntsm[is - DTConfigTSPhi::NSTEPF][i_tsmd]++;
+                  if ((*p_tsm)->getTrack(2)->tracoTr()->code() >
+                      0) { // check if its code > 0
+                    secondPrevBx = (*p_tsm)->getTrack(
+                        2); // assign second tk of previous BX
+                  }
+                }
+              } else {
+                ntsm[is - 1 - DTConfigTSPhi::NSTEPF]
+                    [i_tsmd]++; // SM increment ntsm at previous BX.
+                _cache.push_back(DTChambPhSegm(ChamberId(), is - 1,
+                                               secondPrevBx->tracoTr(), 2));
+                //		secondPrevBx->print();
+              }
+            }
+          }
+        }
+
+      } else if (((*p_tsm)->nCand(1) == 0) &&
+                 (is - 1 - DTConfigTSPhi::NSTEPF >= 0) &&
+                 ntsm[is - 1 - DTConfigTSPhi::NSTEPF][i_tsmd] >
+                     0) { // it means that the last BX with sort 2 was not the
+                          // previous one
+        existSecondPrevBx =
+            ((is - 1 - DTConfigTSPhi::NSTEPF >= 0) &&
+             (ntsm[is - 1 - DTConfigTSPhi::NSTEPF][i_tsmd] > 1) &&
+             (secondPrevBx->tracoTr()->code() > 0));
+        if (existSecondPrevBx) {
+          _cache.push_back(
+              DTChambPhSegm(ChamberId(), is - 1, secondPrevBx->tracoTr(), 2));
+
+          //	  secondPrevBx->print();
+        }
       }
-    } 
-      //---
-    
-  }   // end loop on step  
+    }
+    //---
+
+  } // end loop on step
   // debugging...
-  if(config()->debug()){
-    if(!_cache.empty()){
-      std::cout << "====================================================" << std::endl;
-      std::cout << "                  Phi segments                     " << std::endl;
+  if (config()->debug()) {
+    if (!_cache.empty()) {
+      std::cout << "===================================================="
+                << std::endl;
+      std::cout << "                  Phi segments                     "
+                << std::endl;
       std::vector<DTChambPhSegm>::const_iterator p;
-      for(p=_cache.begin();p<_cache.end();p++) {
-  	p->print();
-	
+      for (p = _cache.begin(); p < _cache.end(); p++) {
+        p->print();
       }
-      std::cout << "====================================================" << std::endl;
+      std::cout << "===================================================="
+                << std::endl;
     }
   }
   //  end debugging
-  
-  
 }
 
-void
-DTTSPhi::ignoreSecondTrack(int step, int tracon) {
-  
+void DTTSPhi::ignoreSecondTrack(int step, int tracon) {
+
   int itsmd = 1; // initialize it to default
-  
-  if(step<DTConfigTSPhi::NSTEPF||step>DTConfigTSPhi::NSTEPL){
+
+  if (step < DTConfigTSPhi::NSTEPF || step > DTConfigTSPhi::NSTEPL) {
     std::cout << "DTTSPhi::ignoreSecondTrack: step out of range: " << step;
     std::cout << " no flag set!" << std::endl;
     return;
   }
-  int itss = (tracon-1 ) / DTConfigTSPhi::NTCTSS + 1;
-  if(itss<1 || itss>DTConfigTSPhi::NTSSTSM) {
+  int itss = (tracon - 1) / DTConfigTSPhi::NTCTSS + 1;
+  if (itss < 1 || itss > DTConfigTSPhi::NTSSTSM) {
     std::cout << "DTTSPhi::ignoreSecondTrack: wrong TRACO number: " << tracon;
     std::cout << " no flag set!" << std::endl;
     return;
   }
-  DTTSS* tss = getDTTSS(step,itss);
+  DTTSS *tss = getDTTSS(step, itss);
   tss->ignoreSecondTrack();
-  
+
   int bkmod = config()->TsmStatus().element(0);
-  if (bkmod==0) {  // we are in back-up mode
-    
-    int ntsstsmd = config()->TSSinTSMD(station(),sector());
+  if (bkmod == 0) { // we are in back-up mode
+
+    int ntsstsmd = config()->TSSinTSMD(station(), sector());
     // Get the appropriate TSMD
-    itsmd = (itss -1 ) / ntsstsmd + 1;
-    
-  } 
-  
-  DTTSM* tsm = getDTTSM(step,itsmd);
+    itsmd = (itss - 1) / ntsstsmd + 1;
+  }
+
+  DTTSM *tsm = getDTTSM(step, itsmd);
   tsm->ignoreSecondTrack();
 }
 
-DTTSS*
-DTTSPhi::getDTTSS(int step, unsigned n) const {
-  if(step<DTConfigTSPhi::NSTEPF||step>DTConfigTSPhi::NSTEPL){
+DTTSS *DTTSPhi::getDTTSS(int step, unsigned n) const {
+  if (step < DTConfigTSPhi::NSTEPF || step > DTConfigTSPhi::NSTEPL) {
     std::cout << "DTTSPhi::getDTTSS: step out of range: " << step;
     std::cout << " empty pointer returned!" << std::endl;
     return nullptr;
   }
-  if(n<1 || n>_tss[step-DTConfigTSPhi::NSTEPF].size()){
+  if (n < 1 || n > _tss[step - DTConfigTSPhi::NSTEPF].size()) {
     std::cout << "DTTSPhi::getDTTSS: requested DTTSS not present: " << n;
     std::cout << " (at step " << step << ")";
     std::cout << " empty pointer returned!" << std::endl;
     return nullptr;
   }
-  
-  std::vector<DTTSS*>::const_iterator p = _tss[step-DTConfigTSPhi::NSTEPF].begin()+n-1;
+
+  std::vector<DTTSS *>::const_iterator p =
+      _tss[step - DTConfigTSPhi::NSTEPF].begin() + n - 1;
   return *p;
-  
-  
 }
 
-
-DTTSM*
-DTTSPhi::getDTTSM(int step, unsigned n) const {
-  if(step<DTConfigTSPhi::NSTEPF||step>DTConfigTSPhi::NSTEPL){
+DTTSM *DTTSPhi::getDTTSM(int step, unsigned n) const {
+  if (step < DTConfigTSPhi::NSTEPF || step > DTConfigTSPhi::NSTEPL) {
     std::cout << "DTTSPhi::getDTTSM: step out of range: " << step;
     std::cout << " empty pointer returned!" << std::endl;
     return nullptr;
   }
-  if(n<1 || n>_tsm[step-DTConfigTSPhi::NSTEPF].size()){
+  if (n < 1 || n > _tsm[step - DTConfigTSPhi::NSTEPF].size()) {
     std::cout << "DTTSPhi::getDTTSM: requested DTTSM not present: " << n;
     std::cout << " (at step " << step << ")";
     std::cout << " empty pointer returned!" << std::endl;
     return nullptr;
   }
-  std::vector<DTTSM*>::const_iterator p_tsm = _tsm[step-DTConfigTSPhi::NSTEPF].begin()+n-1;
+  std::vector<DTTSM *>::const_iterator p_tsm =
+      _tsm[step - DTConfigTSPhi::NSTEPF].begin() + n - 1;
   return *p_tsm;
 }
 
-
-
-int 
-DTTSPhi::nSegm(int step) {
-  int n=0;
-  std::vector<DTChambPhSegm>::const_iterator p; //p=0;
-  for(p=begin(); p<end(); p++) {
-    if(p->step()==step)n++;
+int DTTSPhi::nSegm(int step) {
+  int n = 0;
+  std::vector<DTChambPhSegm>::const_iterator p; // p=0;
+  for (p = begin(); p < end(); p++) {
+    if (p->step() == step)
+      n++;
   }
   return n;
 }
 
-const DTChambPhSegm*
-DTTSPhi::segment(int step, unsigned n) {
-  std::vector<DTChambPhSegm>::const_iterator p; //p=0;
-  for(p=begin();p<end();p++){
-    if(p->step()==step&&((n==1&&p->isFirst())||(n==2&&!p->isFirst())))
-      return  &(*p);// p;
+const DTChambPhSegm *DTTSPhi::segment(int step, unsigned n) {
+  std::vector<DTChambPhSegm>::const_iterator p; // p=0;
+  for (p = begin(); p < end(); p++) {
+    if (p->step() == step &&
+        ((n == 1 && p->isFirst()) || (n == 2 && !p->isFirst())))
+      return &(*p); // p;
   }
   return nullptr;
 }
 
-LocalPoint 
-DTTSPhi::localPosition(const DTTrigData* tr) const {
+LocalPoint DTTSPhi::localPosition(const DTTrigData *tr) const {
   //@@ patch for Sun 4.2 compiler
-  //sm DTChambPhSegm* trig = dynamic_cast<DTChambPhSegm*>(const_cast<DTTrigData*>(tr));
-    const DTChambPhSegm* trig = dynamic_cast<const DTChambPhSegm*>(tr);
-  if(!trig) {
-    std::cout << "DTTSPhi::LocalPosition called with wrong argument!" << std::endl;
-    return LocalPoint(0,0,0);
+  // sm DTChambPhSegm* trig =
+  // dynamic_cast<DTChambPhSegm*>(const_cast<DTTrigData*>(tr));
+  const DTChambPhSegm *trig = dynamic_cast<const DTChambPhSegm *>(tr);
+  if (!trig) {
+    std::cout << "DTTSPhi::LocalPosition called with wrong argument!"
+              << std::endl;
+    return LocalPoint(0, 0, 0);
   }
-     return _tracocard->localPosition(trig->tracoTrig());
+  return _tracocard->localPosition(trig->tracoTrig());
 }
 
-LocalVector 
-DTTSPhi::localDirection(const DTTrigData* tr) const  {
-  DTChambPhSegm* trig = dynamic_cast<DTChambPhSegm*>(const_cast<DTTrigData*>(tr));
+LocalVector DTTSPhi::localDirection(const DTTrigData *tr) const {
+  DTChambPhSegm *trig =
+      dynamic_cast<DTChambPhSegm *>(const_cast<DTTrigData *>(tr));
   //  const DTChambPhSegm* trig = dynamic_cast<const DTChambPhSegm*>(tr);
-  if(!trig) {
-    std::cout << "DTTSPhi::LocalDirection called with wrong argument!" << std::endl;
-    return LocalVector(0,0,0);
+  if (!trig) {
+    std::cout << "DTTSPhi::LocalDirection called with wrong argument!"
+              << std::endl;
+    return LocalVector(0, 0, 0);
   }
-    return _tracocard->localDirection(trig->tracoTrig());
+  return _tracocard->localDirection(trig->tracoTrig());
 }
diff --git a/L1Trigger/DTTriggerServerPhi/src/DTTSS.cc b/L1Trigger/DTTriggerServerPhi/src/DTTSS.cc
index f3f39da06bfa2..887b1728fa485 100644
--- a/L1Trigger/DTTriggerServerPhi/src/DTTSS.cc
+++ b/L1Trigger/DTTriggerServerPhi/src/DTTSS.cc
@@ -27,8 +27,8 @@
 //---------------
 // C++ Headers --
 //---------------
-#include <iostream>
 #include <algorithm>
+#include <iostream>
 
 //----------------
 // Constructors --
@@ -41,140 +41,133 @@ DTTSS::DTTSS(int n) : _n(n), _ignoreSecondTrack(0) {
   //_outcand.reserve(2);
   _logWord1 = "1/----";
   _logWord2 = "2/----";
-
 }
 
-
 //--------------
 // Destructor --
 //--------------
-DTTSS::~DTTSS(){
-  clear();
-}
-
+DTTSS::~DTTSS() { clear(); }
 
 //--------------
 // Operations --
 //--------------
 
-void
-DTTSS::clear() {
-  _ignoreSecondTrack=0;
-  for(int itk=0;itk<=1;itk++){
+void DTTSS::clear() {
+  _ignoreSecondTrack = 0;
+  for (int itk = 0; itk <= 1; itk++) {
     // content of _tctrig is deleted in the DTTSPhi
     _tctrig[itk].clear();
   }
   // content of _outcand is deleted in the DTTSPhi
-  _outcand.clear(); 
+  _outcand.clear();
 
   // log words
   _logWord1 = "1/----";
   _logWord2 = "2/----";
 }
 
-void
-DTTSS::run() {
+void DTTSS::run() {
 
-  if(config()->debug()){
+  if (config()->debug()) {
     std::cout << "DTTSS::run: Processing DTTSS number " << _n << " : ";
-    std::cout << nFirstT() << " first & " << nSecondT() << " second tracks" << std::endl;
+    std::cout << nFirstT() << " first & " << nSecondT() << " second tracks"
+              << std::endl;
   }
 
-  if(nFirstT()<1)return; // skip if no first tracks
+  if (nFirstT() < 1)
+    return; // skip if no first tracks
   //
   // SORT 1
   //
   // debugging
-  if(config()->debug()){
+  if (config()->debug()) {
     std::cout << "Vector of first tracks in DTTSS: " << std::endl;
-    std::vector<DTTSCand*>::const_iterator p;
-    for(p=_tctrig[0].begin(); p!=_tctrig[0].end(); p++) {
+    std::vector<DTTSCand *>::const_iterator p;
+    for (p = _tctrig[0].begin(); p != _tctrig[0].end(); p++) {
       (*p)->print();
     }
   }
   // end debugging
 
-  DTTSCand* first=sortTSS1();
-  if(first!=nullptr) {
-    _outcand.push_back(first); 
+  DTTSCand *first = sortTSS1();
+  if (first != nullptr) {
+    _outcand.push_back(first);
   }
 
-  if(nSecondT()<1)return; // skip if no second tracks
+  if (nSecondT() < 1)
+    return; // skip if no second tracks
   //
   // SORT 2
   //
   // debugging
-  if(config()->debug()){
-    std::vector<DTTSCand*>::const_iterator p;
-    std::cout << "Vector of second tracks (including carry) in DTTSS: " << std::endl;
-    for(p=_tctrig[1].begin(); p!=_tctrig[1].end(); p++) {
+  if (config()->debug()) {
+    std::vector<DTTSCand *>::const_iterator p;
+    std::cout << "Vector of second tracks (including carry) in DTTSS: "
+              << std::endl;
+    for (p = _tctrig[1].begin(); p != _tctrig[1].end(); p++) {
       (*p)->print();
     }
   }
   // end debugging
-  
-  DTTSCand* second=sortTSS2();
-  if(second!=nullptr) {
-    _outcand.push_back(second); 
-  }
 
+  DTTSCand *second = sortTSS2();
+  if (second != nullptr) {
+    _outcand.push_back(second);
+  }
 }
 
-DTTSCand*
-DTTSS::sortTSS1() {
+DTTSCand *DTTSS::sortTSS1() {
 
   // Do a sort 1
-  DTTSCand* best=nullptr;
-  DTTSCand* carry=nullptr;
-  std::vector<DTTSCand*>::iterator p;
-  for(p=_tctrig[0].begin(); p!=_tctrig[0].end(); p++) {
-    DTTSCand* curr= (*p) ? (*p) : nullptr;
+  DTTSCand *best = nullptr;
+  DTTSCand *carry = nullptr;
+  std::vector<DTTSCand *>::iterator p;
+  for (p = _tctrig[0].begin(); p != _tctrig[0].end(); p++) {
+    DTTSCand *curr = (*p) ? (*p) : nullptr;
     // SM sector collector Set bits for tss
-    curr->setBitsTss(); 
-    if(curr->dataword()==0x1ff)continue;   
-    _logWord1[1+curr->TcPos()] = (curr->isFirst()) ? '1' : '2';
-//     std::cout << "Running TSS: --->curr->dataword() sort 1 " << curr->dataword()  << std::endl;
-    if(best==nullptr){
-      best=curr;
-    } 
-    else if((*curr)<=(*best)){
-      carry=best;
-      best=curr;
-    } 
-    else if(carry==nullptr){
-      carry=curr;
-    } 
-    else if((*curr)<=(*carry)){
-      carry=curr;
+    curr->setBitsTss();
+    if (curr->dataword() == 0x1ff)
+      continue;
+    _logWord1[1 + curr->TcPos()] = (curr->isFirst()) ? '1' : '2';
+    //     std::cout << "Running TSS: --->curr->dataword() sort 1 " <<
+    //     curr->dataword()  << std::endl;
+    if (best == nullptr) {
+      best = curr;
+    } else if ((*curr) <= (*best)) {
+      carry = best;
+      best = curr;
+    } else if (carry == nullptr) {
+      carry = curr;
+    } else if ((*curr) <= (*carry)) {
+      carry = curr;
     }
   }
 
   // Ghost 1 suppression: use carry only if not suppressed
 
-  if(carry!=nullptr) { // A carry is present
+  if (carry != nullptr) { // A carry is present
 
-  // Carry enabled if correlated and TRACO is next to best
+    // Carry enabled if correlated and TRACO is next to best
     bool inner_or_corr;
-    if(config()->TssGhost1Corr())
-      {inner_or_corr=carry->isInner() || carry->isCorr();
-
-      }
-    else 
-      {inner_or_corr=carry->isInner(); 
+    if (config()->TssGhost1Corr()) {
+      inner_or_corr = carry->isInner() || carry->isCorr();
 
+    } else {
+      inner_or_corr = carry->isInner();
     }
-    if(config()->TssGhost1Flag()<2 && (       // Carry isn't always suppressed
-       config()->TssGhost1Flag()==0 ||        // Carry always enabled
-       //       carry->isInner() ||                    // Carry is inner
-       inner_or_corr ||                       // carry is inner or corr
-       abs(carry->TcPos()-best->TcPos())!=1)  // Carry not adj. to best   
-                                             ) {
-       // add carry to second tracks for sort 2
-      carry->setSecondTrack(); // change value of first/second track bit
-      carry->setBitsTss();     // set quality bits as for second tracks
+    if (config()->TssGhost1Flag() < 2 &&
+        (                                     // Carry isn't always suppressed
+            config()->TssGhost1Flag() == 0 || // Carry always enabled
+            //       carry->isInner() ||                    // Carry is inner
+            inner_or_corr ||                          // carry is inner or corr
+            abs(carry->TcPos() - best->TcPos()) != 1) // Carry not adj. to best
+    ) {
+      // add carry to second tracks for sort 2
+      carry->setSecondTrack();     // change value of first/second track bit
+      carry->setBitsTss();         // set quality bits as for second tracks
       _tctrig[1].push_back(carry); // add to list of second tracks
     } else {
-      _logWord1[1+carry->TcPos()] = 'g';
+      _logWord1[1 + carry->TcPos()] = 'g';
     }
   }
 
@@ -182,7 +175,7 @@ DTTSS::sortTSS1() {
   if(carry!=0 && config()->TssGhost1Flag()<2){ // Carry isn't always suppressed
     if(config()->TssGhost1Flag()==0 ||           // Carry always enabled
        carry->isInner() ||                       // Carry is inner
-       abs(carry->TcPos()-best->TcPos())!=1) {   // Carry not adj. to best   
+       abs(carry->TcPos()-best->TcPos())!=1) {   // Carry not adj. to best
        // add carry to second tracks to for sort 2
       carry->setSecondTrack(); // change value of first/second track bit
       carry->setBitsTss();     // set quality bits as for second tracks
@@ -190,25 +183,23 @@ DTTSS::sortTSS1() {
     }
   }
   */
-  //std::cout << " best TSS sort 1 = " << best->dataword() << std::endl;
-  //std::cout << " SM end of TSS sort 1: best = " <<  std::endl;
-  //best->print();
-  
-  return best;
+  // std::cout << " best TSS sort 1 = " << best->dataword() << std::endl;
+  // std::cout << " SM end of TSS sort 1: best = " <<  std::endl;
+  // best->print();
 
+  return best;
 }
 
-DTTSCand*
-DTTSS::sortTSS2() {
+DTTSCand *DTTSS::sortTSS2() {
 
   // Check if there are second tracks
-  if(nTracks()<1){
+  if (nTracks() < 1) {
     std::cout << "DTTSS::DTTSSsort2: called with no first track.";
     std::cout << " empty pointer returned!" << std::endl;
     return nullptr;
   }
 
-  if(_ignoreSecondTrack){
+  if (_ignoreSecondTrack) {
     // At the time being if a a first track at the following BX is present,
     // the carry is thrown
     //    std::vector<DTTSCand*>::iterator p;
@@ -216,117 +207,116 @@ DTTSS::sortTSS2() {
     //      if((*p)->isCarry()) return (*p);
     //    }
     // Fill log word
-    std::vector<DTTSCand*>::iterator p;
-    for(p=_tctrig[1].begin(); p!=_tctrig[1].end(); p++)
-      if(!(*p)->isCarry())_logWord2[1+(*p)->TcPos()] = 'o'; // out of time
+    std::vector<DTTSCand *>::iterator p;
+    for (p = _tctrig[1].begin(); p != _tctrig[1].end(); p++)
+      if (!(*p)->isCarry())
+        _logWord2[1 + (*p)->TcPos()] = 'o'; // out of time
     return nullptr;
   }
 
   // If second tracks are always suppressed skip processing
-  if(config()->TssGhost2Flag()==3) {
+  if (config()->TssGhost2Flag() == 3) {
     // Fill log word
-    std::vector<DTTSCand*>::iterator p;
-    for(p=_tctrig[1].begin(); p!=_tctrig[1].end(); p++)
-      _logWord2[1+(*p)->TcPos()] = 'G';
+    std::vector<DTTSCand *>::iterator p;
+    for (p = _tctrig[1].begin(); p != _tctrig[1].end(); p++)
+      _logWord2[1 + (*p)->TcPos()] = 'G';
     return nullptr;
   }
 
   // If no first tracks at the following BX, do a sort 2
-  DTTSCand* best=getTrack(1);
-  DTTSCand* second=nullptr;
-  std::vector<DTTSCand*>::iterator p;
-  for(p=_tctrig[1].begin(); p!=_tctrig[1].end(); p++) {
-    DTTSCand* curr=(*p);
+  DTTSCand *best = getTrack(1);
+  DTTSCand *second = nullptr;
+  std::vector<DTTSCand *>::iterator p;
+  for (p = _tctrig[1].begin(); p != _tctrig[1].end(); p++) {
+    DTTSCand *curr = (*p);
     // SM sector collector set bits for tss
-        curr->setBitsTss(); 
-//     std::cout << "Running TSS sort 2: --- curr->dataword() "  << curr->dataword()  << std::endl;
-    if(!curr->isCarry()) {
-      _logWord2[1+curr->TcPos()] = (curr->isFirst()) ? '1' : '2';
-      if(curr->dataword()==0x1ff)continue;
+    curr->setBitsTss();
+    //     std::cout << "Running TSS sort 2: --- curr->dataword() "  <<
+    //     curr->dataword()  << std::endl;
+    if (!curr->isCarry()) {
+      _logWord2[1 + curr->TcPos()] = (curr->isFirst()) ? '1' : '2';
+      if (curr->dataword() == 0x1ff)
+        continue;
     }
     // ghost 2 suppression: skip track if suppressed
-    if(config()->TssGhost2Flag()!=0){    // 2nd tracks not always enabled
-
-       bool inner_or_corr;
-       if(config()->TssGhost2Corr())
-          {inner_or_corr=curr->isInner() || curr->isCorr();
-
-          }
-       else
-          {inner_or_corr=curr->isInner();
-
-	  }
-
-      if(
-	 //!curr->isInner() &&               // outer track 
-         !inner_or_corr &&                    // outer and not corr
-         curr->TcPos()==best->TcPos()) {   // same correlator of 1st track
-        if(config()->TssGhost2Flag()==2 ||   // do not look to corr bit of 1st
-           ( (!best->isCorr() ) && config()->TssGhost2Flag()!=4)  || // skip if best is not corr
-	   ( (!best->isCorr() ) && best->isInner() && config()->TssGhost2Flag()==4) )   // skip only if best is inner and not corr
- {                
-	  _logWord2[1+curr->TcPos()] = 'G';
-// 	  std::cout << " skip sort 2 in TSS" << std::endl;
-          continue;                            // skip track
+    if (config()->TssGhost2Flag() != 0) { // 2nd tracks not always enabled
+
+      bool inner_or_corr;
+      if (config()->TssGhost2Corr()) {
+        inner_or_corr = curr->isInner() || curr->isCorr();
+
+      } else {
+        inner_or_corr = curr->isInner();
+      }
+
+      if (
+          //! curr->isInner() &&               // outer track
+          !inner_or_corr &&                   // outer and not corr
+          curr->TcPos() == best->TcPos()) {   // same correlator of 1st track
+        if (config()->TssGhost2Flag() == 2 || // do not look to corr bit of 1st
+            ((!best->isCorr()) &&
+             config()->TssGhost2Flag() != 4) || // skip if best is not corr
+            ((!best->isCorr()) && best->isInner() &&
+             config()->TssGhost2Flag() ==
+                 4)) // skip only if best is inner and not corr
+        {
+          _logWord2[1 + curr->TcPos()] = 'G';
+          // 	  std::cout << " skip sort 2 in TSS" << std::endl;
+          continue; // skip track
         }
       }
     }
-    if(second==nullptr){
-      second=curr;
-    } 
-    else if((*curr)<=(*second)){
-      second=curr;
-    } 
+    if (second == nullptr) {
+      second = curr;
+    } else if ((*curr) <= (*second)) {
+      second = curr;
+    }
   }
- //  if(!second==0) {std::cout << " best sort 2 = " << second->dataword() << std::endl;
-//   std::cout << " SM end of TSS sort 2: second = " <<  std::endl;
-//   second->print(); }
+  //  if(!second==0) {std::cout << " best sort 2 = " << second->dataword() <<
+  //  std::endl;
+  //   std::cout << " SM end of TSS sort 2: second = " <<  std::endl;
+  //   second->print(); }
 
   return second;
-
 }
 
-void
-DTTSS::addDTTSCand(DTTSCand* cand) {
+void DTTSS::addDTTSCand(DTTSCand *cand) {
   int ifs = (cand->isFirst()) ? 0 : 1;
   //  std::cout << "SM DTTSS::addDTTSCand ifs = " << ifs << std::endl;
-  _tctrig[ifs].push_back(cand); 
+  _tctrig[ifs].push_back(cand);
 }
 
-unsigned
-DTTSS::nTracoT(int ifs) const {
-  if(ifs<1||ifs>2){
+unsigned DTTSS::nTracoT(int ifs) const {
+  if (ifs < 1 || ifs > 2) {
     std::cout << "DTTSS::nTracoT: wrong track number: " << ifs;
     std::cout << " 0 returned!" << std::endl;
     return 0;
   }
-  return _tctrig[ifs-1].size();
+  return _tctrig[ifs - 1].size();
 }
 
-DTTSCand*
-DTTSS::getDTTSCand(int ifs, unsigned n) const {
-  if(ifs<1||ifs>2){
+DTTSCand *DTTSS::getDTTSCand(int ifs, unsigned n) const {
+  if (ifs < 1 || ifs > 2) {
     std::cout << "DTTSS::getDTTSCand: wrong track number: " << ifs;
     std::cout << " empty pointer returned!" << std::endl;
     return nullptr;
   }
-  if(n<1 || n>nTracoT(ifs)) {
+  if (n < 1 || n > nTracoT(ifs)) {
     std::cout << "DTTSS::getDTTSCand: requested trigger not present: " << n;
     std::cout << " empty pointer returned!" << std::endl;
     return nullptr;
   }
-  std::vector<DTTSCand*>::const_iterator p=_tctrig[ifs-1].begin()+n-1;
+  std::vector<DTTSCand *>::const_iterator p = _tctrig[ifs - 1].begin() + n - 1;
   return (*p);
 }
 
-const DTTracoTrigData*
-DTTSS::getTracoT(int ifs, unsigned n) const {
-  if(ifs<1||ifs>2){
+const DTTracoTrigData *DTTSS::getTracoT(int ifs, unsigned n) const {
+  if (ifs < 1 || ifs > 2) {
     std::cout << "DTTSS::getTracoT: wrong track number: " << ifs;
     std::cout << " empty pointer returned!" << std::endl;
     return nullptr;
   }
-  if(n<1 || n>nTracoT(ifs)) {
+  if (n < 1 || n > nTracoT(ifs)) {
     std::cout << "DTTSS::getTracoT: requested trigger not present: " << n;
     std::cout << " empty pointer returned!" << std::endl;
     return nullptr;
@@ -334,41 +324,36 @@ DTTSS::getTracoT(int ifs, unsigned n) const {
   return getDTTSCand(ifs, n)->tracoTr();
 }
 
-DTTSCand*
-DTTSS::getTrack(int n) const {
-  if(n<1 || n>nTracks()) {
+DTTSCand *DTTSS::getTrack(int n) const {
+  if (n < 1 || n > nTracks()) {
     std::cout << "DTTSS::getTrack: requested track not present: " << n;
     std::cout << " empty pointer returned!" << std::endl;
     return nullptr;
   }
-  std::vector<DTTSCand*>::const_iterator p = _outcand.begin()+n-1;
+  std::vector<DTTSCand *>::const_iterator p = _outcand.begin() + n - 1;
   return (*p);
 }
 
-DTTSCand*
-DTTSS::getCarry() const {
-  std::vector<DTTSCand*>::const_iterator p;
-  for(p=_tctrig[1].begin(); p!=_tctrig[1].end(); p++)
-    if((*p)->isCarry()) return (*p);
+DTTSCand *DTTSS::getCarry() const {
+  std::vector<DTTSCand *>::const_iterator p;
+  for (p = _tctrig[1].begin(); p != _tctrig[1].end(); p++)
+    if ((*p)->isCarry())
+      return (*p);
   return nullptr;
 }
 
-std::string
-DTTSS::logWord(int n) const {
+std::string DTTSS::logWord(int n) const {
   std::string lw = "";
   switch (n) {
   case 1:
-    lw = _logWord1; break;
+    lw = _logWord1;
+    break;
   case 2:
-    lw = _logWord2; break;
+    lw = _logWord2;
+    break;
   default:
     std::cout << "DTTSS::logWord: requested track not present: " << n;
     std::cout << " empty string returned!" << std::endl;
   }
   return lw;
 }
-
-
-
-
-
diff --git a/L1Trigger/DTTriggerServerTheta/src/DTTSTheta.cc b/L1Trigger/DTTriggerServerTheta/src/DTTSTheta.cc
index 060aabe12044c..12543045ccfef 100644
--- a/L1Trigger/DTTriggerServerTheta/src/DTTSTheta.cc
+++ b/L1Trigger/DTTriggerServerTheta/src/DTTSTheta.cc
@@ -116,7 +116,7 @@ OBSOLETE! in NEWGEO the bti number order is the correct one!
       || wheel()==-1 
       || wheel()==-2)
     {n=DTConfigTSTheta::NCELLTH + 1 - n; }
-  
+
 */
 
   if( n<1 || n>geom()->nCell(2) ) {
diff --git a/L1Trigger/DTUtilities/interface/DTCache.h b/L1Trigger/DTUtilities/interface/DTCache.h
index 416b6aeb00fe7..323f1d207c69b 100644
--- a/L1Trigger/DTUtilities/interface/DTCache.h
+++ b/L1Trigger/DTUtilities/interface/DTCache.h
@@ -4,7 +4,7 @@
  *
  *   Trigger Cache
  *   Used to store various trigger data
- *    
+ *
  *
  *
  *
@@ -19,41 +19,37 @@
 
 #include <vector>
 
-template<class T, class Coll=std::vector<T> > class DTCache {
-
-  public:
-  
-  typedef T                                           my_type;
-  typedef Coll                                        my_collection;
-  typedef typename my_collection::iterator            iterator;
-  typedef typename my_collection::const_iterator      const_iterator;
-  
-  public:
-  
+template <class T, class Coll = std::vector<T>> class DTCache {
+
+public:
+  typedef T my_type;
+  typedef Coll my_collection;
+  typedef typename my_collection::iterator iterator;
+  typedef typename my_collection::const_iterator const_iterator;
+
+public:
   //! Constructor
-  DTCache(){}
-  
+  DTCache() {}
+
   //! Destructor
-  virtual ~DTCache(){}
-  
+  virtual ~DTCache() {}
+
   //! Get first cache element
-  const_iterator begin() const { return _cache.begin();}
-  
+  const_iterator begin() const { return _cache.begin(); }
+
   //! Get last cache element
-  const_iterator end() const {return _cache.end();}
-  
+  const_iterator end() const { return _cache.end(); }
+
   //! Get cache vector's size
-  int size() const {return _cache.size();}
+  int size() const { return _cache.size(); }
 
   //! Clear cache vector
-  void clearCache() {_cache.clear();}
+  void clearCache() { _cache.clear(); }
 
   //! Virtual reconstruct member
   virtual void reconstruct() {}
 
-  protected:
-  
+protected:
   my_collection _cache;
-
 };
 #endif
diff --git a/L1Trigger/DTUtilities/interface/DTGeomSupplier.h b/L1Trigger/DTUtilities/interface/DTGeomSupplier.h
index 766a08897d50a..5a935c3f228bb 100644
--- a/L1Trigger/DTUtilities/interface/DTGeomSupplier.h
+++ b/L1Trigger/DTUtilities/interface/DTGeomSupplier.h
@@ -1,7 +1,7 @@
 //-------------------------------------------------
 //
 /**  \class DTGeomSupplier
- *   Defines the ability to calculate coordinates 
+ *   Defines the ability to calculate coordinates
  *   of L1DT Trigger objects
  *
  *
@@ -24,13 +24,12 @@
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "DataFormats/GeometryVector/interface/LocalVector.h"
 #include "DataFormats/MuonDetId/interface/DTChamberId.h"
-#include "DataFormats/MuonDetId/interface/DTSuperLayerId.h"
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
+#include "DataFormats/MuonDetId/interface/DTSuperLayerId.h"
 #include "DataFormats/MuonDetId/interface/DTWireId.h"
 #include "Geometry/DTGeometry/interface/DTChamber.h"
-#include "L1Trigger/DTUtilities/interface/DTTrigGeom.h"
 #include "L1Trigger/DTUtilities/interface/DTTrigData.h"
-
+#include "L1Trigger/DTUtilities/interface/DTTrigGeom.h"
 
 //---------------
 // C++ Headers --
@@ -42,24 +41,23 @@
 
 class DTGeomSupplier {
 
- public:
-
+public:
   ///  Constructor
-  DTGeomSupplier(DTTrigGeom* geom) : _geom(geom) {}
+  DTGeomSupplier(DTTrigGeom *geom) : _geom(geom) {}
 
   /// Destructor
   virtual ~DTGeomSupplier() {}
 
   /// Associated geometry
-  inline DTTrigGeom* geom() const { return _geom; }
+  inline DTTrigGeom *geom() const { return _geom; }
 
   /// Associated chamber
-  inline const DTChamber* stat() const { return _geom->stat(); }
+  inline const DTChamber *stat() const { return _geom->stat(); }
 
   /// Identifier of the associated chamber
   inline DTChamberId ChamberId() const { return _geom->statId(); }
 
-   /// Return wheel number
+  /// Return wheel number
   inline int wheel() const { return _geom->wheel(); }
 
   /// Return station number
@@ -69,28 +67,26 @@ class DTGeomSupplier {
   inline int sector() const { return _geom->sector(); }
 
   /// Local position in chamber of a trigger-data object
-  virtual LocalPoint localPosition(const DTTrigData*) const = 0;
+  virtual LocalPoint localPosition(const DTTrigData *) const = 0;
 
   /// Local direction in chamber of a trigger-data object
-  virtual LocalVector localDirection(const DTTrigData*) const = 0;
+  virtual LocalVector localDirection(const DTTrigData *) const = 0;
 
   /// CMS position in chamber of a trigger-data object
-  inline GlobalPoint CMSPosition(const DTTrigData* trig) const {
+  inline GlobalPoint CMSPosition(const DTTrigData *trig) const {
     return _geom->toGlobal(localPosition(trig));
   }
 
   /// CMS direction in chamber of a trigger -data object
-  inline GlobalVector CMSDirection(const DTTrigData* trig) const {
+  inline GlobalVector CMSDirection(const DTTrigData *trig) const {
     return _geom->toGlobal(localDirection(trig));
   }
 
   /// Print a trigger-data object with also local and global position/direction
-  virtual void print(const DTTrigData* trig) const;
+  virtual void print(const DTTrigData *trig) const;
 
 protected:
-
-  DTTrigGeom* _geom;
-
+  DTTrigGeom *_geom;
 };
 
 #endif
diff --git a/L1Trigger/DTUtilities/interface/DTTPGLutFile.h b/L1Trigger/DTUtilities/interface/DTTPGLutFile.h
index 30b504f25b84c..0eaad4db6e69c 100644
--- a/L1Trigger/DTUtilities/interface/DTTPGLutFile.h
+++ b/L1Trigger/DTUtilities/interface/DTTPGLutFile.h
@@ -17,8 +17,8 @@
 // C++ Headers --
 //---------------
 
-#include <string>
 #include <fstream>
+#include <string>
 
 //----------------------
 // Base Class Headers --
@@ -34,52 +34,49 @@
 
 class DTTPGLutFile {
 
-  public:
- 
-    /// constructor
-    DTTPGLutFile(const std::string name = "" );
-    
-    /// copy constructor
-    DTTPGLutFile(const DTTPGLutFile& ); 
-
-    /// destructor
-    virtual ~DTTPGLutFile();
- 
-    /// assignment operator
-    DTTPGLutFile& operator=(const DTTPGLutFile&);
-
-    /// return filename
-    inline std::string getName() const { return m_file; }
-    
-    /// open file
-    int open();
-    
-    /// return status of file stream
-    inline bool good() { return m_fin.good(); }
-
-    /// return status of file stream
-    inline bool bad() { return m_fin.bad(); }
-    
-    /// close file
-    inline void close() { m_fin.close(); }
-
-    /// read and ignore n lines from file
-    void ignoreLines(int n);
-    
-    /// read one integer from file
-    int readInteger();
-
-    /// read one hex from file
-    int readHex();
-
-    /// read one string from file
-	std::string readString();
-
-  private:
- 
-	std::ifstream m_fin;	   // input file stream
-	std::string   m_file;      // file name
-
-}; 
+public:
+  /// constructor
+  DTTPGLutFile(const std::string name = "");
+
+  /// copy constructor
+  DTTPGLutFile(const DTTPGLutFile &);
+
+  /// destructor
+  virtual ~DTTPGLutFile();
+
+  /// assignment operator
+  DTTPGLutFile &operator=(const DTTPGLutFile &);
+
+  /// return filename
+  inline std::string getName() const { return m_file; }
+
+  /// open file
+  int open();
+
+  /// return status of file stream
+  inline bool good() { return m_fin.good(); }
+
+  /// return status of file stream
+  inline bool bad() { return m_fin.bad(); }
+
+  /// close file
+  inline void close() { m_fin.close(); }
+
+  /// read and ignore n lines from file
+  void ignoreLines(int n);
+
+  /// read one integer from file
+  int readInteger();
+
+  /// read one hex from file
+  int readHex();
+
+  /// read one string from file
+  std::string readString();
+
+private:
+  std::ifstream m_fin; // input file stream
+  std::string m_file;  // file name
+};
 
 #endif
diff --git a/L1Trigger/DTUtilities/interface/DTTrigData.h b/L1Trigger/DTUtilities/interface/DTTrigData.h
index 4a64fb7c4eda2..f3f247a6061f5 100644
--- a/L1Trigger/DTUtilities/interface/DTTrigData.h
+++ b/L1Trigger/DTUtilities/interface/DTTrigData.h
@@ -1,7 +1,8 @@
 //-------------------------------------------------
 //
 /**  \class DTTrigData
- *     Defines the ability to calculate coordinates of Level1 MuDT Trigger objects
+ *     Defines the ability to calculate coordinates of Level1 MuDT Trigger
+ * objects
  *
  *   \author C.Grandi
  */
@@ -18,10 +19,10 @@
 // Base Class Headers --
 //----------------------
 //#include "Profound/MuNumbering/interface/MuBarIdInclude.h"
-//Should become
+// Should become
 #include "DataFormats/MuonDetId/interface/DTChamberId.h"
-#include "DataFormats/MuonDetId/interface/DTSuperLayerId.h"
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
+#include "DataFormats/MuonDetId/interface/DTSuperLayerId.h"
 #include "DataFormats/MuonDetId/interface/DTWireId.h"
 //---------------
 // C++ Headers --
@@ -33,12 +34,11 @@
 
 class DTTrigData {
 
- public:
-
+public:
   ///  Constructor
   DTTrigData() {}
 
-   /// Destructor
+  /// Destructor
   virtual ~DTTrigData() {}
 
   /// Identifier of the associated chamber
@@ -55,10 +55,5 @@ class DTTrigData {
 
   /// Print a trigger-data object with also local and global position/direction
   virtual void print() const = 0;
-
 };
 #endif
-
-
-
-
diff --git a/L1Trigger/DTUtilities/interface/DTTrigGeom.h b/L1Trigger/DTUtilities/interface/DTTrigGeom.h
old mode 100755
new mode 100644
index 129f2f449c457..4fa8ce83e0292
--- a/L1Trigger/DTUtilities/interface/DTTrigGeom.h
+++ b/L1Trigger/DTUtilities/interface/DTTrigGeom.h
@@ -20,16 +20,16 @@
 //----------------------
 // Base Class Headers --
 //----------------------
+#include "DataFormats/GeometryVector/interface/GlobalPoint.h"
+#include "DataFormats/GeometryVector/interface/LocalPoint.h"
+#include "DataFormats/MuonDetId/interface/DTBtiId.h"
 #include "DataFormats/MuonDetId/interface/DTChamberId.h"
-#include "DataFormats/MuonDetId/interface/DTSuperLayerId.h"
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
+#include "DataFormats/MuonDetId/interface/DTSuperLayerId.h"
+#include "DataFormats/MuonDetId/interface/DTTracoId.h"
 #include "DataFormats/MuonDetId/interface/DTWireId.h"
 #include "Geometry/DTGeometry/interface/DTChamber.h"
 #include "L1TriggerConfig/DTTPGConfig/interface/DTConfig.h"
-#include "DataFormats/MuonDetId/interface/DTBtiId.h"
-#include "DataFormats/MuonDetId/interface/DTTracoId.h"
-#include "DataFormats/GeometryVector/interface/LocalPoint.h" 
-#include "DataFormats/GeometryVector/interface/GlobalPoint.h" 
 //---------------
 // C++ Headers --
 //---------------
@@ -40,178 +40,181 @@
 
 class DTTrigGeom {
 
-  public:
-
-    /// Constructor
-    DTTrigGeom(const DTChamber* stat, bool debug);
-  
-    /// Destructor 
-    ~DTTrigGeom();
- 
-    /// Associated chamber
-    inline const DTChamber* stat() const { return _stat; }
-
-    /// Identifier of the associated chamber
-    inline DTChamberId statId() const { return _stat->id(); }
-
-    /// Set/Update Geometry
-    void setGeom(const DTChamber* stat);
-
-    /// Return wheel number
-    inline int wheel() const { return _stat->id().wheel(); }
-
-    /// Return station number
-    inline int station() const { return _stat->id().station(); }
+public:
+  /// Constructor
+  DTTrigGeom(const DTChamber *stat, bool debug);
 
-    /// Return sector number
-    inline int sector() const { return _stat->id().sector(); }
+  /// Destructor
+  ~DTTrigGeom();
 
-    // Access geometrical parameters
+  /// Associated chamber
+  inline const DTChamber *stat() const { return _stat; }
 
-    /// Rotation angle of chamber (deg)
-    inline float phiCh() const { return _PHICH; }
+  /// Identifier of the associated chamber
+  inline DTChamberId statId() const { return _stat->id(); }
 
-    /// Height of a cell (cm)
-    inline float cellH() const { return _H; }
+  /// Set/Update Geometry
+  void setGeom(const DTChamber *stat);
 
-    /// Width of a cell (cm) i.e. distance between ywo wires
-    inline float cellPitch() const { return _PITCH; }
+  /// Return wheel number
+  inline int wheel() const { return _stat->id().wheel(); }
 
-    /// Distance between the phi view superlayers (cms)
-    inline float distSL() const { return fabs(_ZSL[2]-_ZSL[0]); }
+  /// Return station number
+  inline int station() const { return _stat->id().station(); }
 
-    /// Coordinate of center of the 2 Phi SL
-    inline float ZcenterSL() const { return 0.5*(_ZSL[2]+_ZSL[0]); } 
+  /// Return sector number
+  inline int sector() const { return _stat->id().sector(); }
 
-    /// Radial coordinate in chamber frame of center of a superlayer
-    float ZSL(int) const;
+  // Access geometrical parameters
 
-    /// Number of BTIs in a required superlayer (i.e. nCells in lay 1)
-    inline int nCell(int sl) const {
-      return (sl>0&&sl<=3)*_NCELL[sl-1]; 
-    }
+  /// Rotation angle of chamber (deg)
+  inline float phiCh() const { return _PHICH; }
 
-    // NEWGEOmetry update
-    /// Staggering of first wire of layer respect to default: obsolete 19/6/06
-    // int layerFEStaggering(int nsl, int nlay) const; 
+  /// Height of a cell (cm)
+  inline float cellH() const { return _H; }
+
+  /// Width of a cell (cm) i.e. distance between ywo wires
+  inline float cellPitch() const { return _PITCH; }
+
+  /// Distance between the phi view superlayers (cms)
+  inline float distSL() const { return fabs(_ZSL[2] - _ZSL[0]); }
+
+  /// Coordinate of center of the 2 Phi SL
+  inline float ZcenterSL() const { return 0.5 * (_ZSL[2] + _ZSL[0]); }
+
+  /// Radial coordinate in chamber frame of center of a superlayer
+  float ZSL(int) const;
+
+  /// Number of BTIs in a required superlayer (i.e. nCells in lay 1)
+  inline int nCell(int sl) const {
+    return (sl > 0 && sl <= 3) * _NCELL[sl - 1];
+  }
+
+  // NEWGEOmetry update
+  /// Staggering of first wire of layer respect to default: obsolete 19/6/06
+  // int layerFEStaggering(int nsl, int nlay) const;
+
+  /// Map tube number into hw wire number, and reverse hw num->tube
+  /// (nb NOT in bti hardware number, this depends on connectors)
+  int mapTubeInFEch(int nsl, int nlay, int ntube) const;
+
+  /// Superlayer offset in chamber front-end frame, in cm.
+  float phiSLOffset();
+
+  /// Wire position in chamber frame
+  LocalPoint tubePosInCh(int nsl, int nlay, int ntube) const;
+
+  /// Front End position : 1=toward negative y, 0=toward positive y
+  int posFE(int sl) const;
+
+  // Local and global position of a trigger object
+
+  /// Go to CMS coordinate system for a point
+  GlobalPoint toGlobal(const LocalPoint p) const {
+    return _stat->surface().toGlobal(p);
+  }
+
+  /// Go to CMS coordinate system for a vector
+  GlobalVector toGlobal(const LocalVector v) const {
+    return _stat->surface().toGlobal(v);
+  }
+
+  /// Go to Local coordinate system for a point
+  LocalPoint toLocal(const GlobalPoint p) const {
+    return _stat->surface().toLocal(p);
+  }
+
+  /// Go to Local coordinate system for a vector
+  LocalVector toLocal(const GlobalVector v) const {
+    return _stat->surface().toLocal(v);
+  }
+
+  /*!
+      \verbatim
+
+      NB: attention: in NEWGEO definition has changed:
+
+       +---------+---------+---------+
+       | 1  o    | 5  o    | 9  o    |
+       +----+----+----+----+----+----+
+            | 3  o    |  7 o    |
+       +----+----+----+----+----+ - - - -> x/-x
+       | 2  o    | 6  o    |
+       +----+----+----+----+----+
+            | 4  o    | 8  o    |
+            +---------+---------+
+            ^
+            |
+           x=0
+      \endverbatim
+    */
+  /// Local position in chamber of a BTI
+  LocalPoint localPosition(const DTBtiId) const;
+
+  /*!
+     \verbatim
+
+     NB: attention: in NEWGEO definition has changed:
+
+     +----+----+----+----+----+----+----+----+----+----+----+----+
+     |  5 |  6 |  7 |  8 |  9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 |
+     +----+----+----+----+----+----+----+----+----+----+----+----+
+     \                                                           /
+     | \                                                       /
+     |   \                                                   /
+     |     \                                               /
+     |       \                                           /
+ ----|------------------------------------------------------------------->
+     |          \                                     /
+     |            \                                 /
+     |              \                             /
+     |                \                         /
+     |                  \                     /
+     |                   +----+----+----+----+
+     |                   |  1 |  2 |  3 |  4 |
+     |                   +----+----+----+----+
+     X=0
+     ^
+     |
+    traco position
 
-    /// Map tube number into hw wire number, and reverse hw num->tube 
-    /// (nb NOT in bti hardware number, this depends on connectors)
-    int mapTubeInFEch(int nsl, int nlay, int ntube) const; 
 
-    /// Superlayer offset in chamber front-end frame, in cm.
-    float phiSLOffset();
-
-    /// Wire position in chamber frame
-    LocalPoint tubePosInCh(int nsl, int nlay, int ntube) const;
-
-    /// Front End position : 1=toward negative y, 0=toward positive y
-    int posFE(int sl) const;
-
-
-    // Local and global position of a trigger object
-    
-    /// Go to CMS coordinate system for a point
-    GlobalPoint toGlobal(const LocalPoint p) const { return _stat->surface().toGlobal(p); }
-
-    /// Go to CMS coordinate system for a vector
-    GlobalVector toGlobal(const LocalVector v) const { return _stat->surface().toGlobal(v); }
-
-    /// Go to Local coordinate system for a point
-    LocalPoint toLocal(const GlobalPoint p) const { return _stat->surface().toLocal(p); }
-
-    /// Go to Local coordinate system for a vector
-    LocalVector toLocal(const GlobalVector v) const { return _stat->surface().toLocal(v); }
-
-/*!
-    \verbatim
-
-    NB: attention: in NEWGEO definition has changed:
-
-     +---------+---------+---------+
-     | 1  o    | 5  o    | 9  o    |
-     +----+----+----+----+----+----+
-          | 3  o    |  7 o    |
-     +----+----+----+----+----+ - - - -> x/-x
-     | 2  o    | 6  o    |
-     +----+----+----+----+----+
-          | 4  o    | 8  o    |  
-          +---------+---------+
-          ^
-          |
-         x=0
     \endverbatim
-  */
-    /// Local position in chamber of a BTI
-    LocalPoint localPosition(const DTBtiId) const;
-
- /*!
-    \verbatim
-
-    NB: attention: in NEWGEO definition has changed:
-
-    +----+----+----+----+----+----+----+----+----+----+----+----+
-    |  5 |  6 |  7 |  8 |  9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 |
-    +----+----+----+----+----+----+----+----+----+----+----+----+
-    \                                                           /
-    | \                                                       /
-    |   \                                                   /
-    |     \                                               /
-    |       \                                           /
-----|-------------------------------------------------------------------> 
-    |          \                                     /
-    |            \                                 /
-    |              \                             /
-    |                \                         /
-    |                  \                     /
-    |                   +----+----+----+----+
-    |                   |  1 |  2 |  3 |  4 |
-    |                   +----+----+----+----+
-    X=0
-    ^
-    |
-   traco position
-
- 
-   \endverbatim
-   */
-    /// Local position in chamber of a TRACO
-    LocalPoint localPosition(const DTTracoId) const;
-
-    /// CMS position of a BTI
-    inline GlobalPoint CMSPosition(const DTBtiId obj) const { 
-      return  toGlobal(localPosition(obj));
-    }
-
-    /// CMS position of a TRACO
-    inline GlobalPoint CMSPosition(const DTTracoId obj) const { 
-      return toGlobal(localPosition(obj)); 
-    }
-
-    /// Dump the geometry
-    void dumpGeom() const;
-
-    /// Dump the LUT for this chamber
-    void dumpLUT(short int btic);
-    void IEEE32toDSP(float f, short int & DSPmantissa, short int & DSPexp);
-
-  private:
-
-    /// Get the geometry from the station
-    void getGeom();
-
-  private:
-
-    const DTChamber* _stat;     // Pointer to the chamber
-
-    // geometrical parameters
-    float _PHICH;       // angle of normal to the chamber in CMS frame (rad)
-    float _H;           // height of a cell (cm)
-    float _PITCH;       // width of a cell (cm)
-    float _ZSL[3];      // Z coordinate of SL centers
-    int _NCELL[3];      // number of cells (BTI) in SL each SL
-    bool _debug;
-
+    */
+  /// Local position in chamber of a TRACO
+  LocalPoint localPosition(const DTTracoId) const;
+
+  /// CMS position of a BTI
+  inline GlobalPoint CMSPosition(const DTBtiId obj) const {
+    return toGlobal(localPosition(obj));
+  }
+
+  /// CMS position of a TRACO
+  inline GlobalPoint CMSPosition(const DTTracoId obj) const {
+    return toGlobal(localPosition(obj));
+  }
+
+  /// Dump the geometry
+  void dumpGeom() const;
+
+  /// Dump the LUT for this chamber
+  void dumpLUT(short int btic);
+  void IEEE32toDSP(float f, short int &DSPmantissa, short int &DSPexp);
+
+private:
+  /// Get the geometry from the station
+  void getGeom();
+
+private:
+  const DTChamber *_stat; // Pointer to the chamber
+
+  // geometrical parameters
+  float _PHICH;  // angle of normal to the chamber in CMS frame (rad)
+  float _H;      // height of a cell (cm)
+  float _PITCH;  // width of a cell (cm)
+  float _ZSL[3]; // Z coordinate of SL centers
+  int _NCELL[3]; // number of cells (BTI) in SL each SL
+  bool _debug;
 };
 
 #endif
diff --git a/L1Trigger/DTUtilities/src/DTGeomSupplier.cc b/L1Trigger/DTUtilities/src/DTGeomSupplier.cc
index 31b3ee97969c7..07ff8032b23b7 100644
--- a/L1Trigger/DTUtilities/src/DTGeomSupplier.cc
+++ b/L1Trigger/DTUtilities/src/DTGeomSupplier.cc
@@ -1,11 +1,10 @@
 #include "L1Trigger/DTUtilities/interface/DTGeomSupplier.h"
 #include <iostream>
 
-void DTGeomSupplier::print(const DTTrigData* trig) const {
+void DTGeomSupplier::print(const DTTrigData *trig) const {
   trig->print();
   std::cout << " Local (pos)(dir): " << localPosition(trig)
             << localDirection(trig) << std::endl;
-  std::cout << " CMS (pos)(dir): " << CMSPosition(trig) 
-            << CMSDirection(trig) << std::endl;
-}    
-
+  std::cout << " CMS (pos)(dir): " << CMSPosition(trig) << CMSDirection(trig)
+            << std::endl;
+}
diff --git a/L1Trigger/DTUtilities/src/DTTPGLutFile.cc b/L1Trigger/DTUtilities/src/DTTPGLutFile.cc
index 1907f4be4d92a..b0cf3469af6b3 100644
--- a/L1Trigger/DTUtilities/src/DTTPGLutFile.cc
+++ b/L1Trigger/DTUtilities/src/DTTPGLutFile.cc
@@ -2,7 +2,7 @@
 //
 //   Class: DTTPGLutFile
 //
-//   Description: Auxiliary class for 
+//   Description: Auxiliary class for
 //                Look-up table files
 //
 //
@@ -40,8 +40,7 @@ using namespace std;
 
 DTTPGLutFile::DTTPGLutFile(const string name) : m_file(name) {}
 
-DTTPGLutFile::DTTPGLutFile(const DTTPGLutFile& in) : m_file(in.m_file) {}
-
+DTTPGLutFile::DTTPGLutFile(const DTTPGLutFile &in) : m_file(in.m_file) {}
 
 //--------------
 // Destructor --
@@ -53,59 +52,48 @@ DTTPGLutFile::~DTTPGLutFile() {}
 // Operations --
 //--------------
 
-DTTPGLutFile& DTTPGLutFile::operator=(const DTTPGLutFile& lut) {
+DTTPGLutFile &DTTPGLutFile::operator=(const DTTPGLutFile &lut) {
 
   m_file = lut.m_file;
   return *this;
-
 }
 
-
 int DTTPGLutFile::open() {
 
-  const char* file_name = m_file.c_str();
-  m_fin.open(file_name,ios::in);
-  if ( !m_fin ) {
+  const char *file_name = m_file.c_str();
+  m_fin.open(file_name, ios::in);
+  if (!m_fin) {
     cout << "can not open file : " << file_name << endl;
     return -1;
-  }
-  else 	{
+  } else {
     return 0;
   }
-
 }
 
-
 void DTTPGLutFile::ignoreLines(int n) {
 
   char buf[256];
-  for ( int i = 0; i < n; i++ ) m_fin.getline(buf,256);
-
+  for (int i = 0; i < n; i++)
+    m_fin.getline(buf, 256);
 }
 
-
-int DTTPGLutFile::readInteger() { 
+int DTTPGLutFile::readInteger() {
 
   int tmp = 0;
-  m_fin >> tmp; 
+  m_fin >> tmp;
   return tmp;
-
 }
 
-
-int DTTPGLutFile::readHex() { 
+int DTTPGLutFile::readHex() {
 
   int tmp = 0;
-  m_fin >> hex >> tmp; 
+  m_fin >> hex >> tmp;
   return tmp;
-    
 }
 
-
 string DTTPGLutFile::readString() {
 
   string tmp;
   m_fin >> tmp;
   return tmp;
-
 }
diff --git a/L1Trigger/DTUtilities/src/DTTrigGeom.cc b/L1Trigger/DTUtilities/src/DTTrigGeom.cc
old mode 100755
new mode 100644
index 6462083856ced..3575382b2bb1b
--- a/L1Trigger/DTUtilities/src/DTTrigGeom.cc
+++ b/L1Trigger/DTUtilities/src/DTTrigGeom.cc
@@ -7,7 +7,7 @@
 //
 //   Author List:
 //   C. Grandi
-//   Modifications: 
+//   Modifications:
 //   S. Vanini : NEWGEO implementation
 //   S. Vanini 090902 : dumpLUT method implemented
 //   A. Gozzelino May 11th 2012: IEEE32toDSP method bug fix
@@ -25,23 +25,23 @@
 //---------------
 // C++ Headers --
 //---------------
-#include <iostream>
-#include <iomanip>
+#include <cstring>
 #include <fstream>
+#include <iomanip>
+#include <iostream>
 #include <sstream>
-#include <cstring>
 
 //-------------------------------
 // Collaborating Class Headers --
 //-------------------------------
-#include "Geometry/DTGeometry/interface/DTTopology.h"
-#include "Geometry/DTGeometry/interface/DTLayer.h"
-#include "Geometry/DTGeometry/interface/DTSuperLayer.h"
-#include "Geometry/DTGeometry/interface/DTChamber.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 #include "DataFormats/GeometryVector/interface/GlobalVector.h"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "DataFormats/GeometryVector/interface/LocalVector.h"
+#include "Geometry/DTGeometry/interface/DTChamber.h"
+#include "Geometry/DTGeometry/interface/DTLayer.h"
+#include "Geometry/DTGeometry/interface/DTSuperLayer.h"
+#include "Geometry/DTGeometry/interface/DTTopology.h"
 
 using namespace std;
 
@@ -49,33 +49,30 @@ using namespace std;
 // Constructors --
 //----------------
 
-DTTrigGeom::DTTrigGeom(const DTChamber* stat, bool debug) : _stat(stat) , _debug(debug) {
+DTTrigGeom::DTTrigGeom(const DTChamber *stat, bool debug)
+    : _stat(stat), _debug(debug) {
 
   getGeom();
-
 }
 
-
 //--------------
 // Destructor --
 //--------------
 
 DTTrigGeom::~DTTrigGeom() {}
 
-
 //--------------
 // Operations --
 //--------------
 
-float 
-DTTrigGeom::phiSLOffset(){
-  //sl1 offset respect to sl3 - in Front End view!!
-  float x1 = tubePosInCh(1,1,1).x();
-  float x3 = tubePosInCh(3,1,1).x();
-  float offset = x1-x3;
+float DTTrigGeom::phiSLOffset() {
+  // sl1 offset respect to sl3 - in Front End view!!
+  float x1 = tubePosInCh(1, 1, 1).x();
+  float x3 = tubePosInCh(3, 1, 1).x();
+  float offset = x1 - x3;
   //   if(posFE(1)==1)        // Obsolete in
   //     offset = - offset;   // CMSSW
-  
+
   return offset;
 }
 
@@ -85,7 +82,7 @@ DTTrigGeom::layerFEStaggering(int nsl, int nlay) const {
 
   NB the staggering is in FE view!
   return cell staggering respect to first wire in layer 1 in cell units
-  the following is the default: staggering 0 of each layer 
+  the following is the default: staggering 0 of each layer
      +---------+---------+---------+
      | 1  o    | 2  o    | 3  o    |
      +----+----+----+----+----+----+
@@ -94,8 +91,9 @@ DTTrigGeom::layerFEStaggering(int nsl, int nlay) const {
      | 1  o    | 2  o    |
      +----+----+----+----+----+
           | 1  o    | 2  o    |
-          +---------+---------+   ------------> x (y coming out of video) in SL frame
- 
+          +---------+---------+   ------------> x (y coming out of video) in SL
+frame
+
 
   int stag = 0;
 
@@ -106,7 +104,7 @@ DTTrigGeom::layerFEStaggering(int nsl, int nlay) const {
   //position in chamber of wire 1 in layer 1
   LocalPoint posInCh_lay1      = tubePosInCh(nsl,1,1);
   //position in chamber of wire 1 in layer nlay
-  int n1stwire = (nlay==4 ? 2 : 1); 
+  int n1stwire = (nlay==4 ? 2 : 1);
   LocalPoint posInCh_lay       = tubePosInCh(nsl,nlay,n1stwire);
 
  cout << endl;
@@ -115,100 +113,104 @@ DTTrigGeom::layerFEStaggering(int nsl, int nlay) const {
 
 
   //NB PITCH-0.01 for computer approximation bug
-  if(nsl==2){//SL2: first wire is toward positive y 
-    stag = static_cast<int>((-posInCh_lay.y()+posInCh_lay1.y())/(_PITCH-0.01) + 0.5*(fmod(nlay,2.)==0?1:0));
+  if(nsl==2){//SL2: first wire is toward positive y
+    stag = static_cast<int>((-posInCh_lay.y()+posInCh_lay1.y())/(_PITCH-0.01) +
+0.5*(fmod(nlay,2.)==0?1:0));
   }
   else{//SL1 and SL3: first wire is toward negative x
-	  if (nlay==4) {
-		  stag = static_cast<int>((+posInCh_lay.x()-posInCh_lay1.x()+_PITCH)/(_PITCH-0.01) + 0.5*(fmod(nlay,2.)==0?1:0));
-	  }
-	  else {
-		stag = static_cast<int>((+posInCh_lay.x()-posInCh_lay1.x())/(_PITCH-0.01) + 0.5*(fmod(nlay,2.)==0?1:0));
-	  }
+          if (nlay==4) {
+                  stag =
+static_cast<int>((+posInCh_lay.x()-posInCh_lay1.x()+_PITCH)/(_PITCH-0.01) +
+0.5*(fmod(nlay,2.)==0?1:0));
+          }
+          else {
+                stag =
+static_cast<int>((+posInCh_lay.x()-posInCh_lay1.x())/(_PITCH-0.01) +
+0.5*(fmod(nlay,2.)==0?1:0));
+          }
   }
 
   //FEP=1 means in y negative in layer frame
-  const DTLayer* lay  = _stat->superLayer(DTSuperLayerId(statId(),nsl))->layer(DTLayerId(statId(),nsl,nlay));
-  const DTLayer* lay1 = _stat->superLayer(DTSuperLayerId(statId(),nsl))->layer(DTLayerId(statId(),nsl,1));   
-
-  if(lay->getFEPosition()==1){ //FE staggering is reverted                                    //MODIFICARE DOPO!!!!!!
-    int nWire  = lay->specificTopology().channels();  
-    int nWire1 = lay1->specificTopology().channels();
-    stag = - nWire + nWire1 - stag + (fmod(nlay,2.)==0?1:0);
+  const DTLayer* lay  =
+_stat->superLayer(DTSuperLayerId(statId(),nsl))->layer(DTLayerId(statId(),nsl,nlay));
+  const DTLayer* lay1 =
+_stat->superLayer(DTSuperLayerId(statId(),nsl))->layer(DTLayerId(statId(),nsl,1));
+
+  if(lay->getFEPosition()==1){ //FE staggering is reverted //MODIFICARE
+DOPO!!!!!! int nWire  = lay->specificTopology().channels(); int nWire1 =
+lay1->specificTopology().channels(); stag = - nWire + nWire1 - stag +
+(fmod(nlay,2.)==0?1:0);
   }
   return stag;
 }
 */
 
-int
-DTTrigGeom::mapTubeInFEch(int nsl, int nlay, int ntube) const {
+int DTTrigGeom::mapTubeInFEch(int nsl, int nlay, int ntube) const {
   int nch = 0;
-  if(station()==4 && nsl==2){
+  if (station() == 4 && nsl == 2) {
     std::cout << "No theta superlayer in station 4!" << std::endl;
-  }
-  else{
-    // obsolete 19/06/2006  const DTLayer* lay = _stat->superLayer(DTSuperLayerId(statId(),nsl))->layer(DTLayerId(statId(),nsl,nlay));
-	  
-/* obsolete 19/6/06
- if(lay->getFEPosition()==0)         //FE is in Y negative: opposite numbering                
-	  nch = lay->specificTopology().channels() - ntube + 1;	  
-//   if(lay->getFEPosition()==1)         //FE is in Y positive: same numbering digi-trig        
-//     nch = ntube;
-//  }
-*/	
-	// in new geometry depends on SL: theta tube numbering is reverted wrt hardware
-	nch =ntube;
-/*	if(nsl==2){	
-		nch = lay->specificTopology().channels() - ntube + 1;
-	}*/
+  } else {
+    // obsolete 19/06/2006  const DTLayer* lay =
+    // _stat->superLayer(DTSuperLayerId(statId(),nsl))->layer(DTLayerId(statId(),nsl,nlay));
+
+    /* obsolete 19/6/06
+     if(lay->getFEPosition()==0)         //FE is in Y negative: opposite
+    numbering nch = lay->specificTopology().channels() - ntube + 1;
+    //   if(lay->getFEPosition()==1)         //FE is in Y positive: same
+    numbering digi-trig
+    //     nch = ntube;
+    //  }
+    */
+    // in new geometry depends on SL: theta tube numbering is reverted wrt
+    // hardware
+    nch = ntube;
+    /*	if(nsl==2){
+                    nch = lay->specificTopology().channels() - ntube + 1;
+            }*/
   }
   return nch;
 }
 
-LocalPoint 
-DTTrigGeom::tubePosInCh(int nsl, int nlay, int ntube) const {
-  if ( nlay==4 && ntube==1) {
+LocalPoint DTTrigGeom::tubePosInCh(int nsl, int nlay, int ntube) const {
+  if (nlay == 4 && ntube == 1) {
     std::cout << "ATTENTION: no wire nuber 1 for 4th layer!!!" << std::endl;
-    LocalPoint dummyLP(0,0,0);
+    LocalPoint dummyLP(0, 0, 0);
     return dummyLP;
   }
-  const DTSuperLayer* sl   = _stat->superLayer(DTSuperLayerId(statId(),nsl));
-  const DTLayer* lay       = sl->layer(DTLayerId(statId(),nsl,nlay));
-  
-   float localX             = lay->specificTopology().wirePosition(ntube);
-   LocalPoint posInLayer(localX,0,0);
-   LocalPoint posInChamber  = _stat->surface().toLocal(lay->toGlobal(posInLayer));
-   //obsolete 19/06/2006 GlobalPoint  posInCMS = lay->toGlobal(posInLayer);
-  
- /* cout <<endl;
-  cout << "tube " << ntube << " nlay " << nlay << endl;
-  cout << "posinlayer " << posInLayer << "posinchamb " << posInChamber << "posinCMS " << posInCMS << endl;*/
-  
+  const DTSuperLayer *sl = _stat->superLayer(DTSuperLayerId(statId(), nsl));
+  const DTLayer *lay = sl->layer(DTLayerId(statId(), nsl, nlay));
+
+  float localX = lay->specificTopology().wirePosition(ntube);
+  LocalPoint posInLayer(localX, 0, 0);
+  LocalPoint posInChamber = _stat->surface().toLocal(lay->toGlobal(posInLayer));
+  // obsolete 19/06/2006 GlobalPoint  posInCMS = lay->toGlobal(posInLayer);
+
+  /* cout <<endl;
+   cout << "tube " << ntube << " nlay " << nlay << endl;
+   cout << "posinlayer " << posInLayer << "posinchamb " << posInChamber <<
+   "posinCMS " << posInCMS << endl;*/
+
   return posInChamber;
 }
 
-int
-DTTrigGeom::posFE(int sl) const {
-   if( station()!=4 || sl!=2 ) {
-     // obsolete 19/0602006 const DTLayer* lay  = _stat->superLayer(DTSuperLayerId(statId(),sl))->layer(DTLayerId(statId(),sl,1));
-     return 1/*lay->getFEPosition()*/;                                               
-   }
-   else{
+int DTTrigGeom::posFE(int sl) const {
+  if (station() != 4 || sl != 2) {
+    // obsolete 19/0602006 const DTLayer* lay  =
+    // _stat->superLayer(DTSuperLayerId(statId(),sl))->layer(DTLayerId(statId(),sl,1));
+    return 1 /*lay->getFEPosition()*/;
+  } else {
     std::cout << "No theta superlayer in station 4!" << std::endl;
     return 0;
   }
 }
 
-void
-DTTrigGeom::setGeom(const DTChamber* stat) {
+void DTTrigGeom::setGeom(const DTChamber *stat) {
 
-  _stat=stat;
+  _stat = stat;
   getGeom();
-
 }
 
-void
-DTTrigGeom::getGeom() {
+void DTTrigGeom::getGeom() {
 
   // Geometrical constants of chamber
   // Cell width (cm)
@@ -216,248 +218,267 @@ DTTrigGeom::getGeom() {
   // Cell height (cm)
   _H = 1.3;
   // azimuthal angle of normal to the chamber
-  _PHICH = _stat->surface().toGlobal(LocalVector(0,0,-1)).phi();
+  _PHICH = _stat->surface().toGlobal(LocalVector(0, 0, -1)).phi();
 
   // superlayer positions and number of cells
-  DTSuperLayer const* sl[3];
-  DTLayer const* l1[3];
+  DTSuperLayer const *sl[3];
+  DTLayer const *l1[3];
   int i = 0;
-  for(i=0; i<3; i++) {
-    if(station()==4&&i==1) { // No theta SL in MB4
+  for (i = 0; i < 3; i++) {
+    if (station() == 4 && i == 1) { // No theta SL in MB4
       _ZSL[i] = -999;
       _NCELL[i] = 0;
     } else {
-      sl[i] = _stat->superLayer(DTSuperLayerId(statId(),i+1));
-      l1[i] = sl[i]->layer(DTLayerId(statId(),i+1,1));
+      sl[i] = _stat->superLayer(DTSuperLayerId(statId(), i + 1));
+      l1[i] = sl[i]->layer(DTLayerId(statId(), i + 1, 1));
       _ZSL[i] = _stat->surface().toLocal(sl[i]->position()).z(); // - 1.5 * _H;
-      //LocalPoint posInLayer=l1[i]->layType()->getWire(1)->positionInLayer();
-      const DTTopology& tp=l1[i]->specificTopology();
-      float  posX=tp.wirePosition(tp.firstChannel());
-      LocalPoint posInLayer(posX,0,0);
+      // LocalPoint posInLayer=l1[i]->layType()->getWire(1)->positionInLayer();
+      const DTTopology &tp = l1[i]->specificTopology();
+      float posX = tp.wirePosition(tp.firstChannel());
+      LocalPoint posInLayer(posX, 0, 0);
       _NCELL[i] = l1[i]->specificTopology().channels();
     }
   }
 
   // debugging
-  if(_debug){
-    std::cout << setiosflags(std::ios::showpoint | std::ios::fixed) << std::setw(4) <<
-      std::setprecision(1);
+  if (_debug) {
+    std::cout << setiosflags(std::ios::showpoint | std::ios::fixed)
+              << std::setw(4) << std::setprecision(1);
     std::cout << "Identification: wheel=" << wheel();
     std::cout << ", station=" << station();
     std::cout << ", sector=" << sector() << std::endl;
-    GlobalPoint pp = _stat->toGlobal(LocalPoint(0,0,0));
-    std::cout << "Position: Mag=" << pp.mag() << "cm, Phi=" << pp.phi()*180/3.14159;
+    GlobalPoint pp = _stat->toGlobal(LocalPoint(0, 0, 0));
+    std::cout << "Position: Mag=" << pp.mag()
+              << "cm, Phi=" << pp.phi() * 180 / 3.14159;
     std::cout << " deg, Z=" << pp.z() << " cm" << std::endl;
-    std::cout << "Rotation: ANGLE=" << phiCh()*180/3.14159 << std::endl;
-    //if(wheel()==2&&sector()==2){ // only 1 sector-wheel
-      std::cout << "Z of superlayers: phi=" << ZSL(1) << ", ";
-      std::cout << ZSL(3) << " theta=" << ZSL(2);
-      std::cout << " (DeltaY = " << distSL() << ")" << std::endl;
-      std::cout << " ncell: sl 1 " <<  nCell(1) << " sl 2 " <<  nCell(2) <<
-              " sl 3 " <<  nCell(3) << std::endl;   
+    std::cout << "Rotation: ANGLE=" << phiCh() * 180 / 3.14159 << std::endl;
+    // if(wheel()==2&&sector()==2){ // only 1 sector-wheel
+    std::cout << "Z of superlayers: phi=" << ZSL(1) << ", ";
+    std::cout << ZSL(3) << " theta=" << ZSL(2);
+    std::cout << " (DeltaY = " << distSL() << ")" << std::endl;
+    std::cout << " ncell: sl 1 " << nCell(1) << " sl 2 " << nCell(2) << " sl 3 "
+              << nCell(3) << std::endl;
     //}
   }
   // end debugging
-
 }
 
-float 
-DTTrigGeom::ZSL(int sl) const {
-  if(sl<1||sl>3){
+float DTTrigGeom::ZSL(int sl) const {
+  if (sl < 1 || sl > 3) {
     std::cout << "DTTrigGeom::ZSL: wrong SL number: " << sl;
     std::cout << -999 << " returned" << std::endl;
     return -999;
   }
-  return _ZSL[sl-1];
+  return _ZSL[sl - 1];
 }
 
-
-void 
-DTTrigGeom::dumpGeom() const {
+void DTTrigGeom::dumpGeom() const {
   std::cout << "Identification: wheel=" << wheel();
   std::cout << ", station=" << station();
   std::cout << ", sector=" << sector() << std::endl;
-  GlobalPoint pp = _stat->toGlobal(LocalPoint(0,0,0));
-  std::cout << "Position: Mag=" << pp.mag() << "cm, Phi=" << pp.phi()*180/3.14159;
+  GlobalPoint pp = _stat->toGlobal(LocalPoint(0, 0, 0));
+  std::cout << "Position: Mag=" << pp.mag()
+            << "cm, Phi=" << pp.phi() * 180 / 3.14159;
   std::cout << " deg, Z=" << pp.z() << " cm" << std::endl;
-  std::cout << "Rotation: ANGLE=" << phiCh()*180/3.14159 << std::endl;
+  std::cout << "Rotation: ANGLE=" << phiCh() * 180 / 3.14159 << std::endl;
   std::cout << "Z of superlayers: phi=" << ZSL(1) << ", ";
   std::cout << ZSL(3) << " theta=" << ZSL(2) << std::endl;
-  std::cout << "Number of cells: SL1=" << nCell(1) << " SL2=" << nCell(2) <<
-    " SL3=" << nCell(3) << std::endl;
+  std::cout << "Number of cells: SL1=" << nCell(1) << " SL2=" << nCell(2)
+            << " SL3=" << nCell(3) << std::endl;
   std::cout << "First wire positions:" << std::endl;
-  int ii=0;
-  int jj=0;
-  for( ii = 1; ii<=3; ii++ ) {
-    if(station()!=4||ii!=2){
-      for ( jj =1; jj<=4; jj++ ) {
-	std::cout << "    SL=" << ii << ", lay=" << jj << ", wire 1 position=";
-        if ( jj ==4)
-	  std::cout << tubePosInCh( ii, jj, 2) << std::endl;
-	else
-	  std::cout << tubePosInCh( ii, jj, 1) << std::endl;
+  int ii = 0;
+  int jj = 0;
+  for (ii = 1; ii <= 3; ii++) {
+    if (station() != 4 || ii != 2) {
+      for (jj = 1; jj <= 4; jj++) {
+        std::cout << "    SL=" << ii << ", lay=" << jj << ", wire 1 position=";
+        if (jj == 4)
+          std::cout << tubePosInCh(ii, jj, 2) << std::endl;
+        else
+          std::cout << tubePosInCh(ii, jj, 1) << std::endl;
       }
     }
   }
 
-  GlobalPoint gp1 = CMSPosition(DTBtiId(statId(),1,1)); 
-  
+  GlobalPoint gp1 = CMSPosition(DTBtiId(statId(), 1, 1));
 
   std::cout << "First BTI position:";
-  std::cout << " SL1:" << localPosition(DTBtiId(statId(),1,1)) << std::endl;
-  std::cout << " Position: R=" << gp1.perp() << "cm, Phi=" << gp1.phi()*180/3.14159 << " deg, Z=" << gp1.z() << " cm" << std::endl;
-
-  if(station()!=4)
-  {
-	GlobalPoint gp2 = CMSPosition(DTBtiId(statId(),2,1)); 
-	std::cout << " SL2:" << localPosition(DTBtiId(statId(),2,1))<< std::endl;
-	std::cout << " Position: R=" << gp2.perp() << "cm, Phi=" << gp2.phi()*180/3.14159 << " deg, Z=" << gp2.z() << " cm" << std::endl;
+  std::cout << " SL1:" << localPosition(DTBtiId(statId(), 1, 1)) << std::endl;
+  std::cout << " Position: R=" << gp1.perp()
+            << "cm, Phi=" << gp1.phi() * 180 / 3.14159 << " deg, Z=" << gp1.z()
+            << " cm" << std::endl;
+
+  if (station() != 4) {
+    GlobalPoint gp2 = CMSPosition(DTBtiId(statId(), 2, 1));
+    std::cout << " SL2:" << localPosition(DTBtiId(statId(), 2, 1)) << std::endl;
+    std::cout << " Position: R=" << gp2.perp()
+              << "cm, Phi=" << gp2.phi() * 180 / 3.14159
+              << " deg, Z=" << gp2.z() << " cm" << std::endl;
   }
 
-  GlobalPoint gp3 = CMSPosition(DTBtiId(statId(),3,1)); 
-  std::cout << " SL3:" << localPosition(DTBtiId(statId(),3,1)) << std::endl;
-  std::cout << " Position: R=" << gp3.perp() << "cm, Phi=" << gp3.phi()*180/3.14159 << " deg, Z=" << gp3.z() << " cm" << std::endl;
+  GlobalPoint gp3 = CMSPosition(DTBtiId(statId(), 3, 1));
+  std::cout << " SL3:" << localPosition(DTBtiId(statId(), 3, 1)) << std::endl;
+  std::cout << " Position: R=" << gp3.perp()
+            << "cm, Phi=" << gp3.phi() * 180 / 3.14159 << " deg, Z=" << gp3.z()
+            << " cm" << std::endl;
 
   std::cout << "First TRACO position:";
-  std::cout << localPosition(DTTracoId(statId(),1)) << std::endl;
-  std::cout << "******************************************************" << std::endl;
+  std::cout << localPosition(DTTracoId(statId(), 1)) << std::endl;
+  std::cout << "******************************************************"
+            << std::endl;
 }
 
-void 
-DTTrigGeom::dumpLUT(short int btic) {
+void DTTrigGeom::dumpLUT(short int btic) {
 
   // chamber id
   int wh = wheel();
   int st = station();
   int se = sector();
 
-  // open txt file 
+  // open txt file
   string name = "Lut_from_CMSSW_geom";
- /* name += "_wh_";
-  if(wh<0)
-	name += "-";
-  name += abs(wh) + '0';
-  name += "_st_";
-  name += st + '0';
-  name += "_se_";
-  if(se<10)
-	name += se + '0';
-  else 
-  {
-	name += 1 + '0';
-	name += (se-10) + '0';
-  }
-  */ 
+  /* name += "_wh_";
+   if(wh<0)
+         name += "-";
+   name += abs(wh) + '0';
+   name += "_st_";
+   name += st + '0';
+   name += "_se_";
+   if(se<10)
+         name += se + '0';
+   else
+   {
+         name += 1 + '0';
+         name += (se-10) + '0';
+   }
+   */
   name += ".txt";
 
   ofstream fout;
-  fout.open(name.c_str(),ofstream::app);
+  fout.open(name.c_str(), ofstream::app);
 
-// *** dump file header
-//  fout << "Identification: wheel\t" << wh;
-//  fout << "\tstation\t" << st;
-//  fout << "\tsector\t" << se;
+  // *** dump file header
+  //  fout << "Identification: wheel\t" << wh;
+  //  fout << "\tstation\t" << st;
+  //  fout << "\tsector\t" << se;
   fout << wh;
   fout << "\t" << st;
   fout << "\t" << se;
 
   // SL shift
-  float xBTI1_3 	= localPosition( DTBtiId(DTSuperLayerId(wheel(),station(),sector(),3),1) ).x();
-  float xBTI1_1 	= localPosition( DTBtiId(DTSuperLayerId(wheel(),station(),sector(),1),1) ).x();
-  float SL_shift 	= xBTI1_3 - xBTI1_1;
+  float xBTI1_3 =
+      localPosition(DTBtiId(DTSuperLayerId(wheel(), station(), sector(), 3), 1))
+          .x();
+  float xBTI1_1 =
+      localPosition(DTBtiId(DTSuperLayerId(wheel(), station(), sector(), 1), 1))
+          .x();
+  float SL_shift = xBTI1_3 - xBTI1_1;
   //  std::cout << " SL shift " << SL_shift << std::endl;
 
   // traco 1 and 2 global position
-  LocalPoint traco1 	= localPosition(DTTracoId(statId(),1));
-  LocalPoint traco2 	= localPosition(DTTracoId(statId(),2));
-  GlobalPoint traco_1 	= toGlobal(traco1);
-  GlobalPoint traco_2 	= toGlobal(traco2);
-  // std::cout << " tr1 x " << traco_1.x() << " tr2 x " << traco_2.x() << std::endl;
+  LocalPoint traco1 = localPosition(DTTracoId(statId(), 1));
+  LocalPoint traco2 = localPosition(DTTracoId(statId(), 2));
+  GlobalPoint traco_1 = toGlobal(traco1);
+  GlobalPoint traco_2 = toGlobal(traco2);
+  // std::cout << " tr1 x " << traco_1.x() << " tr2 x " << traco_2.x() <<
+  // std::endl;
 
   float d;
   float xcn;
   int xcn_sign;
-  GlobalPoint pp = _stat->toGlobal(LocalPoint(0,0,ZcenterSL()));
-  // std::cout << "Position: x=" << pp.x() << "cm, y=" << pp.y() << "cm, z=" << pp.z() << std::endl;  
-    
-  if(sector()==1 || sector() ==7){  
-  	d = fabs(traco_1.x());
-  	xcn = fabs(traco_1.y());
-        // 110208 SV comment: this was inserted for a TRACO hardware bug
-  	if (SL_shift > 0) 
-		xcn = xcn+SL_shift;
-  	xcn_sign = static_cast<int>(pp.y()/fabs(pp.y()))*static_cast<int>(traco_1.y()/fabs(traco_1.y()));
-  	if(station() == 2 || (station() == 4 && sector() == 1)) 
-		xcn_sign = - xcn_sign;
-  	xcn = xcn*xcn_sign;
-  }
-  else {
-  	float m1 = (traco_2.y()-traco_1.y())/(traco_2.x()-traco_1.x());
-  	float q1 = traco_1.y()-m1*traco_1.x();
-  	float m = tan(phiCh());
-  	float xn = q1/(m-m1);
-  	float yn = m*xn;
-  
-  	d = sqrt(xn*xn+yn*yn);
-  	xcn = sqrt( (xn-traco_1.x())*(xn-traco_1.x()) + (yn-traco_1.y())*(yn-traco_1.y()) );
-        // 110208 SV comment: this was inserted for a TRACO hardware bug
-  	if (SL_shift > 0) 
-		xcn = xcn+SL_shift;
-  
-  	float diff = (pp.x()-traco_1.x())*traco_1.y();
-  	xcn_sign = static_cast<int>(diff/fabs(diff));
-  	xcn = xcn*xcn_sign;
+  GlobalPoint pp = _stat->toGlobal(LocalPoint(0, 0, ZcenterSL()));
+  // std::cout << "Position: x=" << pp.x() << "cm, y=" << pp.y() << "cm, z=" <<
+  // pp.z() << std::endl;
+
+  if (sector() == 1 || sector() == 7) {
+    d = fabs(traco_1.x());
+    xcn = fabs(traco_1.y());
+    // 110208 SV comment: this was inserted for a TRACO hardware bug
+    if (SL_shift > 0)
+      xcn = xcn + SL_shift;
+    xcn_sign = static_cast<int>(pp.y() / fabs(pp.y())) *
+               static_cast<int>(traco_1.y() / fabs(traco_1.y()));
+    if (station() == 2 || (station() == 4 && sector() == 1))
+      xcn_sign = -xcn_sign;
+    xcn = xcn * xcn_sign;
+  } else {
+    float m1 = (traco_2.y() - traco_1.y()) / (traco_2.x() - traco_1.x());
+    float q1 = traco_1.y() - m1 * traco_1.x();
+    float m = tan(phiCh());
+    float xn = q1 / (m - m1);
+    float yn = m * xn;
+
+    d = sqrt(xn * xn + yn * yn);
+    xcn = sqrt((xn - traco_1.x()) * (xn - traco_1.x()) +
+               (yn - traco_1.y()) * (yn - traco_1.y()));
+    // 110208 SV comment: this was inserted for a TRACO hardware bug
+    if (SL_shift > 0)
+      xcn = xcn + SL_shift;
+
+    float diff = (pp.x() - traco_1.x()) * traco_1.y();
+    xcn_sign = static_cast<int>(diff / fabs(diff));
+    xcn = xcn * xcn_sign;
   }
-  // std::cout << " d " << d << " xcn " << xcn << " sign " << xcn_sign << std::endl; 
-  //fout << "\td\t" << d << "\txcn\t" << xcn << "\t"; 
-  //fout << "btic\t" << btic << "\t";
+  // std::cout << " d " << d << " xcn " << xcn << " sign " << xcn_sign <<
+  // std::endl;
+  // fout << "\td\t" << d << "\txcn\t" << xcn << "\t";
+  // fout << "btic\t" << btic << "\t";
 
-// *** dump TRACO LUT command
+  // *** dump TRACO LUT command
   fout << "\tA8";
-  //short int btic = 31;
-  //cout << "CHECK BTIC " << btic << endl;
-  short int Low_byte = (btic & 0x00FF);   // output in hex bytes format with zero padding
-  short int High_byte =( btic>>8 & 0x00FF);
-  fout << setw(2) << setfill('0') << hex << High_byte << setw(2) << setfill('0') << Low_byte;	
-    
+  // short int btic = 31;
+  // cout << "CHECK BTIC " << btic << endl;
+  short int Low_byte =
+      (btic & 0x00FF); // output in hex bytes format with zero padding
+  short int High_byte = (btic >> 8 & 0x00FF);
+  fout << setw(2) << setfill('0') << hex << High_byte << setw(2) << setfill('0')
+       << Low_byte;
+
   // convert parameters from IEE32 float to DSP float format
   short int DSPmantissa = 0;
   short int DSPexp = 0;
 
   // d parameter conversion and dump
   IEEE32toDSP(d, DSPmantissa, DSPexp);
-  Low_byte = (DSPmantissa & 0x00FF);   // output in hex bytes format with zero padding
-  High_byte =( DSPmantissa>>8 & 0x00FF);
-  fout << setw(2) << setfill('0') << hex << High_byte << setw(2) << setfill('0') << Low_byte;	
+  Low_byte =
+      (DSPmantissa & 0x00FF); // output in hex bytes format with zero padding
+  High_byte = (DSPmantissa >> 8 & 0x00FF);
+  fout << setw(2) << setfill('0') << hex << High_byte << setw(2) << setfill('0')
+       << Low_byte;
   Low_byte = (DSPexp & 0x00FF);
-  High_byte =( DSPexp>>8 & 0x00FF);
-  fout << setw(2) << setfill('0') << High_byte << setw(2) << setfill('0') << Low_byte;	
+  High_byte = (DSPexp >> 8 & 0x00FF);
+  fout << setw(2) << setfill('0') << High_byte << setw(2) << setfill('0')
+       << Low_byte;
 
   // xnc parameter conversion and dump
   DSPmantissa = 0;
   DSPexp = 0;
   IEEE32toDSP(xcn, DSPmantissa, DSPexp);
-  Low_byte = (DSPmantissa & 0x00FF);   // output in hex bytes format with zero padding
-  High_byte =( DSPmantissa>>8 & 0x00FF);
-  fout << setw(2) << setfill('0') << hex << High_byte << setw(2) << setfill('0') << Low_byte;	
+  Low_byte =
+      (DSPmantissa & 0x00FF); // output in hex bytes format with zero padding
+  High_byte = (DSPmantissa >> 8 & 0x00FF);
+  fout << setw(2) << setfill('0') << hex << High_byte << setw(2) << setfill('0')
+       << Low_byte;
   Low_byte = (DSPexp & 0x00FF);
-  High_byte =( DSPexp>>8 & 0x00FF);
-  fout << setw(2) << setfill('0') << High_byte << setw(2) << setfill('0') << Low_byte;	
+  High_byte = (DSPexp >> 8 & 0x00FF);
+  fout << setw(2) << setfill('0') << High_byte << setw(2) << setfill('0')
+       << Low_byte;
 
-  // sign bits 
-  Low_byte = (xcn_sign & 0x00FF);   // output in hex bytes format with zero padding
-  High_byte =( xcn_sign>>8 & 0x00FF);
-  fout << setw(2) << setfill('0') << hex << High_byte << setw(2) << setfill('0') << Low_byte << dec << "\n"; 
+  // sign bits
+  Low_byte =
+      (xcn_sign & 0x00FF); // output in hex bytes format with zero padding
+  High_byte = (xcn_sign >> 8 & 0x00FF);
+  fout << setw(2) << setfill('0') << hex << High_byte << setw(2) << setfill('0')
+       << Low_byte << dec << "\n";
 
   fout.close();
 
   return;
- 
 }
 
-/* 
+/*
 // A. Gozzelino May 11th 2012: Old and wrong definition
-void 
+void
 DTTrigGeom::IEEE32toDSP(float f, short int & DSPmantissa, short int & DSPexp)
 {
   long int *pl=0, lm;
@@ -468,17 +489,18 @@ DTTrigGeom::IEEE32toDSP(float f, short int & DSPmantissa, short int & DSPexp)
 
   if( f!=0.0 )
   {
-	memcpy(pl,&f,sizeof(float));
-		
-        if((*pl & 0x80000000)!=0) 
-		sign=true;	  
+        memcpy(pl,&f,sizeof(float));
+
+        if((*pl & 0x80000000)!=0)
+                sign=true;
         lm = ( 0x800000 | (*pl & 0x7FFFFF)); // [1][23bit mantissa]
         lm >>= 9; //reduce to 15bits
-	lm &= 0x7FFF;
+        lm &= 0x7FFF;
         DSPexp = ((*pl>>23)&0xFF)-126;
-	DSPmantissa = (short)lm;
-	if(sign) 
-		DSPmantissa = - DSPmantissa;  // convert negative value in 2.s complement	
+        DSPmantissa = (short)lm;
+        if(sign)
+                DSPmantissa = - DSPmantissa;  // convert negative value in 2.s
+complement
 
   }
   return;
@@ -489,118 +511,120 @@ DTTrigGeom::IEEE32toDSP(float f, short int & DSPmantissa, short int & DSPexp)
 // A.Gozzelino May 11th 2012: bug fix in method IEEE32toDSP
 //******************
 
-void 
-DTTrigGeom::IEEE32toDSP(float f, short int & DSPmantissa, short int & DSPexp)
-{  
+void DTTrigGeom::IEEE32toDSP(float f, short int &DSPmantissa,
+                             short int &DSPexp) {
   long int lm;
   long int pl = 0;
-  
-  bool sign=false;
+
+  bool sign = false;
 
   DSPmantissa = 0;
   DSPexp = 0;
 
-  if( f!=0.0 )
-  {
-	memcpy(&pl,&f,sizeof(float));
-	
-        if((pl & 0x80000000)!=0) 
-		sign=true;	  
-        lm = ( 0x800000 | (pl & 0x7FFFFF)); // [1][23bit mantissa]
-        lm >>= 9; //reduce to 15bits
-	lm &= 0x7FFF;
-        DSPexp = ((pl>>23)&0xFF)-126;
-	DSPmantissa = (short)lm;
-	if(sign) 
-		DSPmantissa = - DSPmantissa;  // convert negative value in 2.s complement	
-
+  if (f != 0.0) {
+    memcpy(&pl, &f, sizeof(float));
+
+    if ((pl & 0x80000000) != 0)
+      sign = true;
+    lm = (0x800000 | (pl & 0x7FFFFF)); // [1][23bit mantissa]
+    lm >>= 9;                          // reduce to 15bits
+    lm &= 0x7FFF;
+    DSPexp = ((pl >> 23) & 0xFF) - 126;
+    DSPmantissa = (short)lm;
+    if (sign)
+      DSPmantissa = -DSPmantissa; // convert negative value in 2.s complement
   }
   return;
 }
 //********************** end bug fix ****************
 
-LocalPoint 
-DTTrigGeom::localPosition(const DTBtiId id) const {
-/* obsolete!
-  float x = 0;
-  float y = 0;
-  float z = ZSL(id.superlayer());
-  if(id.superlayer()==2){
-    // SL 2: Reverse numbering -------V
-    y = Xwire1BTI1SL(id.superlayer()) - ((float)(id.bti()-1)-0.5)*cellPitch();
-  } else {
-    x = Xwire1BTI1SL(id.superlayer()) + ((float)(id.bti()-1)-0.5)*cellPitch();
-  }
-*/
+LocalPoint DTTrigGeom::localPosition(const DTBtiId id) const {
+  /* obsolete!
+    float x = 0;
+    float y = 0;
+    float z = ZSL(id.superlayer());
+    if(id.superlayer()==2){
+      // SL 2: Reverse numbering -------V
+      y = Xwire1BTI1SL(id.superlayer()) - ((float)(id.bti()-1)-0.5)*cellPitch();
+    } else {
+      x = Xwire1BTI1SL(id.superlayer()) + ((float)(id.bti()-1)-0.5)*cellPitch();
+    }
+  */
+
+  // NEWGEO
+  /*  int nsl = id.superlayer();
+    int tube = mapTubeInFEch(nsl,1,id.bti());
+    LocalPoint p = tubePosInCh(nsl,1,tube);
+    //traslation because z axes is in middle of SL, x/y axes on left I of first
+    cell
+
+    LocalPoint p1 = tubePosInCh (nsl,1,1);
+    LocalPoint p2 = tubePosInCh (nsl,2,1);
+    cout << "nbti " << id.bti() << " tube " << tube << " localpoint" << p <<
+    endl; cout << "localpoint layer 1" << p1  << " localpoint layer 2" << p2 <<
+    endl;
+
+    float xt = 0;
+    float yt = 0;
+    float zt = - cellH() * 3./2.;
+    if(nsl==2)
+      yt = - cellPitch()/2.;
+    else
+      xt = + cellPitch()/2.;
+
+    if(posFE(nsl)==0){//FE in positive y
+        xt = - xt;
+        yt = - yt;
+    }
 
-//NEWGEO
-/*  int nsl = id.superlayer();
-  int tube = mapTubeInFEch(nsl,1,id.bti());
-  LocalPoint p = tubePosInCh(nsl,1,tube);
-  //traslation because z axes is in middle of SL, x/y axes on left I of first cell
-  
-  LocalPoint p1 = tubePosInCh (nsl,1,1);
-  LocalPoint p2 = tubePosInCh (nsl,2,1); 
-  cout << "nbti " << id.bti() << " tube " << tube << " localpoint" << p << endl;
-  cout << "localpoint layer 1" << p1  << " localpoint layer 2" << p2 << endl;
-  
-  float xt = 0;
-  float yt = 0;
-  float zt = - cellH() * 3./2.;
-  if(nsl==2)
-    yt = - cellPitch()/2.; 
-  else
-    xt = + cellPitch()/2.; 
-
-  if(posFE(nsl)==0){//FE in positive y
-      xt = - xt;
-      yt = - yt;
-  }
-  
-  cout << "localpoint " << p << ' '  << xt << ' ' << yt << endl;
-
-  return LocalPoint(p.x()+xt,p.y()+yt,p.z()+zt);*/
-	
-	int nsl = id.superlayer();
-	const DTSuperLayer* sl   = _stat->superLayer(DTSuperLayerId(statId(),nsl));
-	const DTLayer* lay       = sl->layer(DTLayerId(statId(),nsl,1));
-	int tube = id.bti();
-	float localX             = lay->specificTopology().wirePosition(tube);
-	float xt = -cellPitch()/2.;
-	float zt = -cellH() * 3./2.;
-	//LocalPoint posInLayer1(localX+xt,yt,0); //Correction now y is left I of first cell of layer 1 y=0 and z in the middle of SL,
-	LocalPoint posInLayer1(localX+xt,0,zt);
-	LocalPoint posInChamber  = _stat->surface().toLocal(lay->toGlobal(posInLayer1));
-	//GlobalPoint posInCMS = lay->toGlobal(posInLayer1);
-
-	/* cout <<endl;
-	cout << "tube " << ntube << " nlay " << nlay << endl;
-	cout << "posinlayer " << posInLayer1 << "posinchamb " << posInChamber << "posinCMS " << posInCMS << endl;*/
-	
-	return posInChamber;
+    cout << "localpoint " << p << ' '  << xt << ' ' << yt << endl;
+
+    return LocalPoint(p.x()+xt,p.y()+yt,p.z()+zt);*/
+
+  int nsl = id.superlayer();
+  const DTSuperLayer *sl = _stat->superLayer(DTSuperLayerId(statId(), nsl));
+  const DTLayer *lay = sl->layer(DTLayerId(statId(), nsl, 1));
+  int tube = id.bti();
+  float localX = lay->specificTopology().wirePosition(tube);
+  float xt = -cellPitch() / 2.;
+  float zt = -cellH() * 3. / 2.;
+  // LocalPoint posInLayer1(localX+xt,yt,0); //Correction now y is left I of
+  // first cell of layer 1 y=0 and z in the middle of SL,
+  LocalPoint posInLayer1(localX + xt, 0, zt);
+  LocalPoint posInChamber =
+      _stat->surface().toLocal(lay->toGlobal(posInLayer1));
+  // GlobalPoint posInCMS = lay->toGlobal(posInLayer1);
+
+  /* cout <<endl;
+  cout << "tube " << ntube << " nlay " << nlay << endl;
+  cout << "posinlayer " << posInLayer1 << "posinchamb " << posInChamber <<
+  "posinCMS " << posInCMS << endl;*/
+
+  return posInChamber;
 }
 
-LocalPoint 
-DTTrigGeom::localPosition(const DTTracoId id) const {
-/* obsolete
-  float x = Xwire1BTI1SL(1) +
-    ( ( (float)(id.traco()) - 0.5 ) * DTConfig::NBTITC - 0.5 )*cellPitch();
-  // half cell shift in SL1 of MB1 (since cmsim116)
-  if(station()==1) x -= 0.5*cellPitch();
-  float y = 0;
-  float z = ZcenterSL();
-*/
-  //NEWGEO
+LocalPoint DTTrigGeom::localPosition(const DTTracoId id) const {
+  /* obsolete
+    float x = Xwire1BTI1SL(1) +
+      ( ( (float)(id.traco()) - 0.5 ) * DTConfig::NBTITC - 0.5 )*cellPitch();
+    // half cell shift in SL1 of MB1 (since cmsim116)
+    if(station()==1) x -= 0.5*cellPitch();
+    float y = 0;
+    float z = ZcenterSL();
+  */
+  // NEWGEO
   // position of first BTI in sl 3 on X
-  float x = localPosition( DTBtiId(DTSuperLayerId(wheel(),station(),sector(),3),1) ).x();
-// 10/7/06 May be not needed anymore in new geometry
-//   if(posFE(3)==1)
-//     x -= (id.traco()-2)*DTConfig::NBTITC * cellPitch();
-//   if(posFE(3)==0)
-    x += (id.traco()-2)*DTConfig::NBTITC * cellPitch();
+  float x =
+      localPosition(DTBtiId(DTSuperLayerId(wheel(), station(), sector(), 3), 1))
+          .x();
+  // 10/7/06 May be not needed anymore in new geometry
+  //   if(posFE(3)==1)
+  //     x -= (id.traco()-2)*DTConfig::NBTITC * cellPitch();
+  //   if(posFE(3)==0)
+  x += (id.traco() - 2) * DTConfig::NBTITC * cellPitch();
 
   float y = 0;
   float z = ZcenterSL();
 
-  return LocalPoint(x,y,z);
+  return LocalPoint(x, y, z);
 }
diff --git a/L1Trigger/GlobalTrigger/interface/L1GlobalTriggerFDL.h b/L1Trigger/GlobalTrigger/interface/L1GlobalTriggerFDL.h
index 2bab68d634033..711225b2b28e6 100644
--- a/L1Trigger/GlobalTrigger/interface/L1GlobalTriggerFDL.h
+++ b/L1Trigger/GlobalTrigger/interface/L1GlobalTriggerFDL.h
@@ -21,13 +21,13 @@
 #include <boost/cstdint.hpp>
 
 // user include files
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetup.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 
-#include "CondFormats/L1TObjects/interface/L1GtFwd.h"
 #include "CondFormats/L1TObjects/interface/L1GtBoard.h"
+#include "CondFormats/L1TObjects/interface/L1GtFwd.h"
 
 // forward declarations
 class L1GlobalTriggerReadoutRecord;
@@ -38,95 +38,80 @@ class L1GlobalTriggerGTL;
 class L1GlobalTriggerPSB;
 
 // class declaration
-class L1GlobalTriggerFDL
-{
+class L1GlobalTriggerFDL {
 
 public:
-
-    /// constructor
-    L1GlobalTriggerFDL();
-
-    /// destructor
-    virtual ~L1GlobalTriggerFDL();
-
-    /// run the FDL
-    void run(
-        edm::Event& iEvent,
-        const std::vector<int>& prescaleFactorsAlgoTrig,
-        const std::vector<int>& prescaleFactorsTechTrig,
-        const std::vector<unsigned int>& triggerMaskAlgoTrig,
-        const std::vector<unsigned int>& triggerMaskTechTrig,
-        const std::vector<unsigned int>& triggerMaskVetoAlgoTrig,
-        const std::vector<unsigned int>& triggerMaskVetoTechTrig,
-        const std::vector<L1GtBoard>& boardMaps,
-        const int totalBxInEvent,
-        const int iBxInEvent,
-        const unsigned int numberPhysTriggers, const unsigned int numberTechnicalTriggers,
-        const unsigned int numberDaqPartitions,
-        const L1GlobalTriggerGTL* ptrGTL,
-        const L1GlobalTriggerPSB* ptrPSB,
-        const int pfAlgoSetIndex,
-        const int pfTechSetIndex,
-        const bool algorithmTriggersUnprescaled,
-        const bool algorithmTriggersUnmasked,
-        const bool technicalTriggersUnprescaled,
-        const bool technicalTriggersUnmasked,
-        const bool technicalTriggersVetoUnmasked
-        );
-
-    /// fill the FDL block in the L1 GT DAQ record for iBxInEvent
-    void fillDaqFdlBlock(const int iBxInEvent,
-            const boost::uint16_t& activeBoardsGtDaq, const int recordLength0,
-            const int recordLength1, const unsigned int altNrBxBoardDaq,
-            const std::vector<L1GtBoard>& boardMaps,
-            L1GlobalTriggerReadoutRecord* gtDaqReadoutRecord);
-
-    /// fill the FDL block in the L1 GT EVM record for iBxInEvent
-    void fillEvmFdlBlock(const int iBxInEvent,
-            const boost::uint16_t& activeBoardsGtEvm, const int recordLength0,
-            const int recordLength1, const unsigned int altNrBxBoardEvm,
-            const std::vector<L1GtBoard>& boardMaps,
-            L1GlobalTriggerEvmReadoutRecord* gtEvmReadoutRecord);
-
-    /// clear FDL
-    void reset();
-
-    /// return the GtFdlWord
-    inline L1GtFdlWord* gtFdlWord() const
-    {
-        return m_gtFdlWord;
-    }
+  /// constructor
+  L1GlobalTriggerFDL();
+
+  /// destructor
+  virtual ~L1GlobalTriggerFDL();
+
+  /// run the FDL
+  void run(edm::Event &iEvent, const std::vector<int> &prescaleFactorsAlgoTrig,
+           const std::vector<int> &prescaleFactorsTechTrig,
+           const std::vector<unsigned int> &triggerMaskAlgoTrig,
+           const std::vector<unsigned int> &triggerMaskTechTrig,
+           const std::vector<unsigned int> &triggerMaskVetoAlgoTrig,
+           const std::vector<unsigned int> &triggerMaskVetoTechTrig,
+           const std::vector<L1GtBoard> &boardMaps, const int totalBxInEvent,
+           const int iBxInEvent, const unsigned int numberPhysTriggers,
+           const unsigned int numberTechnicalTriggers,
+           const unsigned int numberDaqPartitions,
+           const L1GlobalTriggerGTL *ptrGTL, const L1GlobalTriggerPSB *ptrPSB,
+           const int pfAlgoSetIndex, const int pfTechSetIndex,
+           const bool algorithmTriggersUnprescaled,
+           const bool algorithmTriggersUnmasked,
+           const bool technicalTriggersUnprescaled,
+           const bool technicalTriggersUnmasked,
+           const bool technicalTriggersVetoUnmasked);
+
+  /// fill the FDL block in the L1 GT DAQ record for iBxInEvent
+  void fillDaqFdlBlock(const int iBxInEvent,
+                       const boost::uint16_t &activeBoardsGtDaq,
+                       const int recordLength0, const int recordLength1,
+                       const unsigned int altNrBxBoardDaq,
+                       const std::vector<L1GtBoard> &boardMaps,
+                       L1GlobalTriggerReadoutRecord *gtDaqReadoutRecord);
+
+  /// fill the FDL block in the L1 GT EVM record for iBxInEvent
+  void fillEvmFdlBlock(const int iBxInEvent,
+                       const boost::uint16_t &activeBoardsGtEvm,
+                       const int recordLength0, const int recordLength1,
+                       const unsigned int altNrBxBoardEvm,
+                       const std::vector<L1GtBoard> &boardMaps,
+                       L1GlobalTriggerEvmReadoutRecord *gtEvmReadoutRecord);
+
+  /// clear FDL
+  void reset();
+
+  /// return the GtFdlWord
+  inline L1GtFdlWord *gtFdlWord() const { return m_gtFdlWord; }
 
 public:
-
-    inline void setVerbosity(const int verbosity) {
-        m_verbosity = verbosity;
-    }
+  inline void setVerbosity(const int verbosity) { m_verbosity = verbosity; }
 
 private:
+  L1GtFdlWord *m_gtFdlWord;
 
-    L1GtFdlWord* m_gtFdlWord;
-
-    /// prescale counters: NumberPhysTriggers counters per bunch cross in event
-    std::vector<std::vector<int> > m_prescaleCounterAlgoTrig;
+  /// prescale counters: NumberPhysTriggers counters per bunch cross in event
+  std::vector<std::vector<int>> m_prescaleCounterAlgoTrig;
 
-    /// prescale counters: technical trigger counters per bunch cross in event
-    std::vector<std::vector<int> > m_prescaleCounterTechTrig;
+  /// prescale counters: technical trigger counters per bunch cross in event
+  std::vector<std::vector<int>> m_prescaleCounterTechTrig;
 
-    /// logical switches for
-    ///    the first event
-    ///    the first event in the luminosity segment
-    ///    and the first event in the run
-    bool m_firstEv;
-    bool m_firstEvLumiSegment;
-    bool m_firstEvRun;
+  /// logical switches for
+  ///    the first event
+  ///    the first event in the luminosity segment
+  ///    and the first event in the run
+  bool m_firstEv;
+  bool m_firstEvLumiSegment;
+  bool m_firstEvRun;
 
 private:
-
-    /// verbosity level
-    int m_verbosity;
-    bool m_isDebugEnabled;
-
+  /// verbosity level
+  int m_verbosity;
+  bool m_isDebugEnabled;
 };
 
 #endif
diff --git a/L1Trigger/GlobalTrigger/interface/L1GlobalTriggerFunctions.h b/L1Trigger/GlobalTrigger/interface/L1GlobalTriggerFunctions.h
index 89f9be747a598..03aa8f1d870a1 100644
--- a/L1Trigger/GlobalTrigger/interface/L1GlobalTriggerFunctions.h
+++ b/L1Trigger/GlobalTrigger/interface/L1GlobalTriggerFunctions.h
@@ -5,8 +5,8 @@
 #include <vector>
 
 #include <fstream>
-#include <sstream>
 #include <iostream>
+#include <sstream>
 
 /// factorial function
 int factorial(int n);
@@ -14,18 +14,17 @@ int factorial(int n);
 /// convert a hex string to a vector of 64-bit integers,
 /// with the vector size depending on the string size
 /// return false in case of error
-bool hexStringToInt64(const std::string&, std::vector<unsigned long long>&);
+bool hexStringToInt64(const std::string &, std::vector<unsigned long long> &);
 
 /// convert a string to a integer-type number
 /// the third parameter of stringToNumber should be
 /// one of std::hex, std::dec or std::oct
-template<class T>
-bool stringToNumber(T& tmpl, const std::string& str,
-        std::ios_base& (*f)(std::ios_base&)) {
-
-    std::istringstream iss(str);
-    return !(iss >> f >> tmpl).fail();
+template <class T>
+bool stringToNumber(T &tmpl, const std::string &str,
+                    std::ios_base &(*f)(std::ios_base &)) {
 
+  std::istringstream iss(str);
+  return !(iss >> f >> tmpl).fail();
 }
 
 #endif /*GlobalTrigger_L1GlobalTriggerFunctions_h*/
diff --git a/L1Trigger/GlobalTrigger/interface/L1GlobalTriggerGTL.h b/L1Trigger/GlobalTrigger/interface/L1GlobalTriggerGTL.h
index cf672eb5a29b3..0ca0722592fec 100644
--- a/L1Trigger/GlobalTrigger/interface/L1GlobalTriggerGTL.h
+++ b/L1Trigger/GlobalTrigger/interface/L1GlobalTriggerGTL.h
@@ -21,19 +21,18 @@
 #include <vector>
 
 // user include files
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetup.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerObjectMapRecord.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetup.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 #include "L1Trigger/GlobalTrigger/interface/L1GtAlgorithmEvaluation.h"
 
-
 #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTCand.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 
 // forward declarations
 class L1GlobalTriggerPSB;
@@ -43,110 +42,92 @@ class L1MuTriggerScales;
 class L1GtEtaPhiConversions;
 
 // class declaration
-class L1GlobalTriggerGTL
-{
+class L1GlobalTriggerGTL {
 
 public:
+  // constructors
+  L1GlobalTriggerGTL(const edm::InputTag &mutag, edm::ConsumesCollector &&iC);
 
-    // constructors
-    L1GlobalTriggerGTL(const edm::InputTag& mutag,edm::ConsumesCollector && iC);
-
-    // destructor
-    virtual ~L1GlobalTriggerGTL();
+  // destructor
+  virtual ~L1GlobalTriggerGTL();
 
 public:
-
-    /// receive data from Global Muon Trigger
-    void receiveGmtObjectData(
-        edm::Event&,
-        const edm::InputTag&, const int iBxInEvent,
-        const bool receiveMu, const int nrL1Mu);
-
-
-    /// initialize the class (mainly reserve)
-    void init(const int nrL1Mu, const int numberPhysTriggers);
-
-    /// run the GTL
-    void run(edm::Event& iEvent, const edm::EventSetup& evSetup,
-        const L1GlobalTriggerPSB* ptrGtPSB, const bool produceL1GtObjectMapRecord,
-        const int iBxInEvent, L1GlobalTriggerObjectMapRecord* gtObjectMapRecord,
-        const unsigned int numberPhysTriggers,
-        const int nrL1Mu,
-        const int nrL1NoIsoEG,
-        const int nrL1IsoEG,
-        const int nrL1CenJet,
-        const int nrL1ForJet,
-        const int nrL1TauJet,
-        const int nrL1JetCounts,
-        const int ifMuEtaNumberBits,
-        const int ifCaloEtaNumberBits);
-
-    /// clear GTL
-    void reset();
-
-    /// print received Muon dataWord
-    void printGmtData(const int iBxInEvent) const;
-
-    /// return decision
-    inline const std::bitset<L1GlobalTriggerReadoutSetup::NumberPhysTriggers>& getDecisionWord() const
-    {
-        return m_gtlDecisionWord;
-    }
-
-    /// return algorithm OR decision
-    inline const std::bitset<L1GlobalTriggerReadoutSetup::NumberPhysTriggers>& getAlgorithmOR() const
-    {
-        return m_gtlAlgorithmOR;
-    }
-
-    /// return global muon trigger candidate
-    inline const std::vector<const L1MuGMTCand*>* getCandL1Mu() const
-    {
-        return m_candL1Mu;
-    }
+  /// receive data from Global Muon Trigger
+  void receiveGmtObjectData(edm::Event &, const edm::InputTag &,
+                            const int iBxInEvent, const bool receiveMu,
+                            const int nrL1Mu);
+
+  /// initialize the class (mainly reserve)
+  void init(const int nrL1Mu, const int numberPhysTriggers);
+
+  /// run the GTL
+  void run(edm::Event &iEvent, const edm::EventSetup &evSetup,
+           const L1GlobalTriggerPSB *ptrGtPSB,
+           const bool produceL1GtObjectMapRecord, const int iBxInEvent,
+           L1GlobalTriggerObjectMapRecord *gtObjectMapRecord,
+           const unsigned int numberPhysTriggers, const int nrL1Mu,
+           const int nrL1NoIsoEG, const int nrL1IsoEG, const int nrL1CenJet,
+           const int nrL1ForJet, const int nrL1TauJet, const int nrL1JetCounts,
+           const int ifMuEtaNumberBits, const int ifCaloEtaNumberBits);
+
+  /// clear GTL
+  void reset();
+
+  /// print received Muon dataWord
+  void printGmtData(const int iBxInEvent) const;
+
+  /// return decision
+  inline const std::bitset<L1GlobalTriggerReadoutSetup::NumberPhysTriggers> &
+  getDecisionWord() const {
+    return m_gtlDecisionWord;
+  }
+
+  /// return algorithm OR decision
+  inline const std::bitset<L1GlobalTriggerReadoutSetup::NumberPhysTriggers> &
+  getAlgorithmOR() const {
+    return m_gtlAlgorithmOR;
+  }
+
+  /// return global muon trigger candidate
+  inline const std::vector<const L1MuGMTCand *> *getCandL1Mu() const {
+    return m_candL1Mu;
+  }
 
 public:
-
-    inline void setVerbosity(const int verbosity) {
-        m_verbosity = verbosity;
-    }
+  inline void setVerbosity(const int verbosity) { m_verbosity = verbosity; }
 
 private:
+  // cached stuff
 
-    // cached stuff
+  // trigger menu
+  const L1GtTriggerMenu *m_l1GtMenu;
+  unsigned long long m_l1GtMenuCacheID;
 
-    // trigger menu
-    const L1GtTriggerMenu* m_l1GtMenu;
-    unsigned long long m_l1GtMenuCacheID;
+  // L1 scales (phi, eta) for Mu, Calo and EnergySum objects
+  const L1CaloGeometry *m_l1CaloGeometry;
+  unsigned long long m_l1CaloGeometryCacheID;
 
-    // L1 scales (phi, eta) for Mu, Calo and EnergySum objects
-    const L1CaloGeometry* m_l1CaloGeometry;
-    unsigned long long m_l1CaloGeometryCacheID;
+  const L1MuTriggerScales *m_l1MuTriggerScales;
+  unsigned long long m_l1MuTriggerScalesCacheID;
 
-    const L1MuTriggerScales* m_l1MuTriggerScales;
-    unsigned long long m_l1MuTriggerScalesCacheID;
-
-    // conversions for eta and phi
-    L1GtEtaPhiConversions* m_gtEtaPhiConversions;
+  // conversions for eta and phi
+  L1GtEtaPhiConversions *m_gtEtaPhiConversions;
 
 private:
+  std::vector<const L1MuGMTCand *> *m_candL1Mu;
 
-    std::vector<const L1MuGMTCand*>* m_candL1Mu;
-
-    std::bitset<L1GlobalTriggerReadoutSetup::NumberPhysTriggers> m_gtlAlgorithmOR;
-    std::bitset<L1GlobalTriggerReadoutSetup::NumberPhysTriggers> m_gtlDecisionWord;
+  std::bitset<L1GlobalTriggerReadoutSetup::NumberPhysTriggers> m_gtlAlgorithmOR;
+  std::bitset<L1GlobalTriggerReadoutSetup::NumberPhysTriggers>
+      m_gtlDecisionWord;
 
   // cache of maps
-  std::vector<L1GtAlgorithmEvaluation::ConditionEvaluationMap> m_conditionResultMaps;
-  
+  std::vector<L1GtAlgorithmEvaluation::ConditionEvaluationMap>
+      m_conditionResultMaps;
 
 private:
-
-    /// verbosity level
-    int m_verbosity;
-    bool m_isDebugEnabled;
-
-
+  /// verbosity level
+  int m_verbosity;
+  bool m_isDebugEnabled;
 };
 
 #endif
diff --git a/L1Trigger/GlobalTrigger/interface/L1GlobalTriggerPSB.h b/L1Trigger/GlobalTrigger/interface/L1GlobalTriggerPSB.h
index 883eb0f85ec69..f469020c66f94 100644
--- a/L1Trigger/GlobalTrigger/interface/L1GlobalTriggerPSB.h
+++ b/L1Trigger/GlobalTrigger/interface/L1GlobalTriggerPSB.h
@@ -19,12 +19,12 @@
  */
 
 // system include files
-#include <vector>
 #include <boost/cstdint.hpp>
+#include <vector>
 
 // user include files
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetup.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GtTechnicalTriggerRecord.h"
 
 #include "DataFormats/Common/interface/Handle.h"
@@ -32,9 +32,9 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-#include "CondFormats/L1TObjects/interface/L1GtFwd.h"
 #include "CondFormats/L1TObjects/interface/L1GtBoard.h"
 #include "CondFormats/L1TObjects/interface/L1GtBoardMaps.h"
+#include "CondFormats/L1TObjects/interface/L1GtFwd.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 
 // forward declarations
@@ -55,189 +55,156 @@ class L1GctHFRingEtSums;
 class L1GlobalTriggerReadoutRecord;
 
 // class declaration
-class L1GlobalTriggerPSB
-{
+class L1GlobalTriggerPSB {
 
 public:
+  // constructor
+  L1GlobalTriggerPSB(const edm::InputTag &caloTag,
+                     const std::vector<edm::InputTag> &vecTag,
+                     edm::ConsumesCollector &&iC);
 
-    // constructor
-    L1GlobalTriggerPSB(const edm::InputTag & caloTag, const std::vector<edm::InputTag>& vecTag, edm::ConsumesCollector && iC);
-
-    // destructor
-    virtual ~L1GlobalTriggerPSB();
+  // destructor
+  virtual ~L1GlobalTriggerPSB();
 
 public:
-
-    /// initialize the class (mainly reserve)
-    void init(const int nrL1NoIsoEG, const int nrL1IsoEG,
-            const int nrL1CenJet, const int nrL1ForJet, const int nrL1TauJet,
+  /// initialize the class (mainly reserve)
+  void init(const int nrL1NoIsoEG, const int nrL1IsoEG, const int nrL1CenJet,
+            const int nrL1ForJet, const int nrL1TauJet,
             const int numberTechnicalTriggers);
 
-    /// receive Global Calorimeter Trigger objects
-    void receiveGctObjectData(
-        edm::Event& iEvent,
-        const edm::InputTag& caloGctInputTag, const int iBxInEvent,
-        const bool receiveNoIsoEG, const int nrL1NoIsoEG,
-        const bool receiveIsoEG, const int nrL1IsoEG,
-        const bool receiveCenJet, const int nrL1CenJet,
-        const bool receiveForJet, const int nrL1ForJet,
-        const bool receiveTauJet, const int nrL1TauJet,
-        const bool receiveETM, const bool receiveETT, const bool receiveHTT, const bool receiveHTM,
-        const bool receiveJetCounts,
-        const bool receiveHfBitCounts,
-        const bool receiveHfRingEtSums);
-
-    /// receive CASTOR objects
-    void receiveCastorData(
-            edm::Event& iEvent, const edm::InputTag& castorInputTag, const int iBxInEvent,
-            const bool receiveCastor, const bool readFromPsb);
-
-    /// receive BPTX objects
-    void receiveBptxData(edm::Event& iEvent, const edm::InputTag& bptxInputTag,
-            const int iBxInEvent, const bool receiveBptx,
-            const bool readFromPsb);
-
-    /// receive External objects
-    void receiveExternalData(edm::Event& iEvent,
-            const std::vector<edm::InputTag>&  externalInputTags,
-            const int iBxInEvent,
-            const bool receiveExternal, const bool readFromPsb);
-
-    /// receive technical trigger
-    void receiveTechnicalTriggers(edm::Event& iEvent,
-            const std::vector<edm::InputTag>& technicalTriggersInputTags,
-            const int iBxInEvent,
-            const bool receiveTechTr, const int nrL1TechTr);
-
-    /// fill the content of active PSB boards
-    void fillPsbBlock(
-        edm::Event& iEvent,
-        const boost::uint16_t& activeBoardsGtDaq,
-        const int recordLength0,
-        const int recordLength1,
-        const unsigned int altNrBxBoardDaq,
-        const std::vector<L1GtBoard>& boardMaps,
-        const int iBxInEvent,
-        L1GlobalTriggerReadoutRecord* gtDaqReadoutRecord);
-
-    /// clear PSB
-    void reset();
-
-    /// print Global Calorimeter Trigger data
-    void printGctObjectData(const int iBxInEvent) const;
-
-    /// pointer to NoIsoEG data list
-    inline const std::vector<const L1GctCand*>* getCandL1NoIsoEG() const
-    {
-        return m_candL1NoIsoEG;
-    }
-
-    /// pointer to IsoEG data list
-    inline const std::vector<const L1GctCand*>* getCandL1IsoEG() const
-    {
-        return m_candL1IsoEG;
-    }
-
-    /// pointer to CenJet data list
-    inline const std::vector<const L1GctCand*>* getCandL1CenJet() const
-    {
-        return m_candL1CenJet;
-    }
-
-    /// pointer to ForJet data list
-    inline const std::vector<const L1GctCand*>* getCandL1ForJet() const
-    {
-        return m_candL1ForJet;
-    }
-
-    /// pointer to TauJet data list
-    inline const std::vector<const L1GctCand*>* getCandL1TauJet() const
-    {
-        return m_candL1TauJet;
-    }
-
-    /// pointer to ETM data list
-    inline const L1GctEtMiss* getCandL1ETM() const
-    {
-        return m_candETM;
-    }
-
-    /// pointer to ETT data list
-    inline const L1GctEtTotal* getCandL1ETT() const
-    {
-        return m_candETT;
-    }
-
-    /// pointer to HTT data list
-    inline const L1GctEtHad* getCandL1HTT() const
-    {
-        return m_candHTT;
-    }
-
-    /// pointer to HTM data list
-    inline const L1GctHtMiss* getCandL1HTM() const
-    {
-        return m_candHTM;
-    }
-
-    /// pointer to JetCounts data list
-    inline const L1GctJetCounts* getCandL1JetCounts() const
-    {
-        return m_candJetCounts;
-    }
-
-    /// pointer to HfBitCounts data list
-    inline const L1GctHFBitCounts* getCandL1HfBitCounts() const
-    {
-        return m_candHfBitCounts;
-    }
-
-    /// pointer to HfRingEtSums data list
-    inline const L1GctHFRingEtSums* getCandL1HfRingEtSums() const
-    {
-        return m_candHfRingEtSums;
-    }
-
-    /// pointer to technical trigger bits
-    inline const std::vector<bool>* getGtTechnicalTriggers() const
-    {
-        return &m_gtTechnicalTriggers;
-    }
+  /// receive Global Calorimeter Trigger objects
+  void receiveGctObjectData(
+      edm::Event &iEvent, const edm::InputTag &caloGctInputTag,
+      const int iBxInEvent, const bool receiveNoIsoEG, const int nrL1NoIsoEG,
+      const bool receiveIsoEG, const int nrL1IsoEG, const bool receiveCenJet,
+      const int nrL1CenJet, const bool receiveForJet, const int nrL1ForJet,
+      const bool receiveTauJet, const int nrL1TauJet, const bool receiveETM,
+      const bool receiveETT, const bool receiveHTT, const bool receiveHTM,
+      const bool receiveJetCounts, const bool receiveHfBitCounts,
+      const bool receiveHfRingEtSums);
+
+  /// receive CASTOR objects
+  void receiveCastorData(edm::Event &iEvent,
+                         const edm::InputTag &castorInputTag,
+                         const int iBxInEvent, const bool receiveCastor,
+                         const bool readFromPsb);
+
+  /// receive BPTX objects
+  void receiveBptxData(edm::Event &iEvent, const edm::InputTag &bptxInputTag,
+                       const int iBxInEvent, const bool receiveBptx,
+                       const bool readFromPsb);
+
+  /// receive External objects
+  void receiveExternalData(edm::Event &iEvent,
+                           const std::vector<edm::InputTag> &externalInputTags,
+                           const int iBxInEvent, const bool receiveExternal,
+                           const bool readFromPsb);
+
+  /// receive technical trigger
+  void receiveTechnicalTriggers(
+      edm::Event &iEvent,
+      const std::vector<edm::InputTag> &technicalTriggersInputTags,
+      const int iBxInEvent, const bool receiveTechTr, const int nrL1TechTr);
+
+  /// fill the content of active PSB boards
+  void fillPsbBlock(edm::Event &iEvent,
+                    const boost::uint16_t &activeBoardsGtDaq,
+                    const int recordLength0, const int recordLength1,
+                    const unsigned int altNrBxBoardDaq,
+                    const std::vector<L1GtBoard> &boardMaps,
+                    const int iBxInEvent,
+                    L1GlobalTriggerReadoutRecord *gtDaqReadoutRecord);
+
+  /// clear PSB
+  void reset();
+
+  /// print Global Calorimeter Trigger data
+  void printGctObjectData(const int iBxInEvent) const;
+
+  /// pointer to NoIsoEG data list
+  inline const std::vector<const L1GctCand *> *getCandL1NoIsoEG() const {
+    return m_candL1NoIsoEG;
+  }
+
+  /// pointer to IsoEG data list
+  inline const std::vector<const L1GctCand *> *getCandL1IsoEG() const {
+    return m_candL1IsoEG;
+  }
+
+  /// pointer to CenJet data list
+  inline const std::vector<const L1GctCand *> *getCandL1CenJet() const {
+    return m_candL1CenJet;
+  }
+
+  /// pointer to ForJet data list
+  inline const std::vector<const L1GctCand *> *getCandL1ForJet() const {
+    return m_candL1ForJet;
+  }
+
+  /// pointer to TauJet data list
+  inline const std::vector<const L1GctCand *> *getCandL1TauJet() const {
+    return m_candL1TauJet;
+  }
+
+  /// pointer to ETM data list
+  inline const L1GctEtMiss *getCandL1ETM() const { return m_candETM; }
+
+  /// pointer to ETT data list
+  inline const L1GctEtTotal *getCandL1ETT() const { return m_candETT; }
+
+  /// pointer to HTT data list
+  inline const L1GctEtHad *getCandL1HTT() const { return m_candHTT; }
+
+  /// pointer to HTM data list
+  inline const L1GctHtMiss *getCandL1HTM() const { return m_candHTM; }
+
+  /// pointer to JetCounts data list
+  inline const L1GctJetCounts *getCandL1JetCounts() const {
+    return m_candJetCounts;
+  }
+
+  /// pointer to HfBitCounts data list
+  inline const L1GctHFBitCounts *getCandL1HfBitCounts() const {
+    return m_candHfBitCounts;
+  }
+
+  /// pointer to HfRingEtSums data list
+  inline const L1GctHFRingEtSums *getCandL1HfRingEtSums() const {
+    return m_candHfRingEtSums;
+  }
+
+  /// pointer to technical trigger bits
+  inline const std::vector<bool> *getGtTechnicalTriggers() const {
+    return &m_gtTechnicalTriggers;
+  }
 
 public:
-
-    inline void setVerbosity(const int verbosity) {
-        m_verbosity = verbosity;
-    }
+  inline void setVerbosity(const int verbosity) { m_verbosity = verbosity; }
 
 private:
+  std::vector<const L1GctCand *> *m_candL1NoIsoEG;
+  std::vector<const L1GctCand *> *m_candL1IsoEG;
+  std::vector<const L1GctCand *> *m_candL1CenJet;
+  std::vector<const L1GctCand *> *m_candL1ForJet;
+  std::vector<const L1GctCand *> *m_candL1TauJet;
 
-    std::vector<const L1GctCand*>* m_candL1NoIsoEG;
-    std::vector<const L1GctCand*>* m_candL1IsoEG;
-    std::vector<const L1GctCand*>* m_candL1CenJet;
-    std::vector<const L1GctCand*>* m_candL1ForJet;
-    std::vector<const L1GctCand*>* m_candL1TauJet;
-
-    const L1GctEtMiss*  m_candETM;
-    const L1GctEtTotal* m_candETT;
-    const L1GctEtHad*   m_candHTT;
-    const L1GctHtMiss*  m_candHTM;
+  const L1GctEtMiss *m_candETM;
+  const L1GctEtTotal *m_candETT;
+  const L1GctEtHad *m_candHTT;
+  const L1GctHtMiss *m_candHTM;
 
-    const L1GctJetCounts* m_candJetCounts;
+  const L1GctJetCounts *m_candJetCounts;
 
-    const L1GctHFBitCounts* m_candHfBitCounts;
-    const L1GctHFRingEtSums* m_candHfRingEtSums;
+  const L1GctHFBitCounts *m_candHfBitCounts;
+  const L1GctHFRingEtSums *m_candHfRingEtSums;
 
-    /// technical trigger bits
-    std::vector<bool> m_gtTechnicalTriggers;
+  /// technical trigger bits
+  std::vector<bool> m_gtTechnicalTriggers;
 
 private:
-
-    /// verbosity level
-    int m_verbosity;
-    bool m_isDebugEnabled;
-
-
+  /// verbosity level
+  int m_verbosity;
+  bool m_isDebugEnabled;
 };
 
 #endif
diff --git a/L1Trigger/GlobalTrigger/interface/L1GtAlgorithmEvaluation.h b/L1Trigger/GlobalTrigger/interface/L1GtAlgorithmEvaluation.h
index dbdcadcd9574e..9e2e2b1ec40d3 100644
--- a/L1Trigger/GlobalTrigger/interface/L1GtAlgorithmEvaluation.h
+++ b/L1Trigger/GlobalTrigger/interface/L1GtAlgorithmEvaluation.h
@@ -3,15 +3,15 @@
 
 /**
  * \class L1GtAlgorithmEvaluation
- * 
- * 
+ *
+ *
  * Description: Evaluation of a L1 Global Trigger algorithm.
- * 
+ *
  * Implementation:
  *    <TODO: enter implementation details>
- *   
- * \author: Vasile Mihai Ghete   - HEPHY Vienna 
- * 
+ *
+ * \author: Vasile Mihai Ghete   - HEPHY Vienna
+ *
  *
  */
 
@@ -21,11 +21,11 @@
 // system include files
 #include <iostream>
 
-#include <string>
-#include <vector>
 #include <map>
-#include <stack>
 #include <queue>
+#include <stack>
+#include <string>
+#include <vector>
 
 #include <boost/cstdint.hpp>
 
@@ -36,19 +36,18 @@
 //   how to hash std::string, using a "template specialization"
 namespace __gnu_cxx {
 
-    /**
-     Explicit template specialization of hash of a string class,
-     which just uses the internal char* representation as a wrapper.
-     */
-    template<> struct hash<std::string> {
-        size_t operator()(const std::string& x) const {
-            return hash<const char*> ()(x.c_str());
-        }
-    };
-
-}
-// end hash map
+/**
+ Explicit template specialization of hash of a string class,
+ which just uses the internal char* representation as a wrapper.
+ */
+template <> struct hash<std::string> {
+  size_t operator()(const std::string &x) const {
+    return hash<const char *>()(x.c_str());
+  }
+};
 
+} // namespace __gnu_cxx
+// end hash map
 
 // user include files
 
@@ -66,68 +65,64 @@ class L1GtConditionEvaluation;
 class L1GtAlgorithmEvaluation {
 
 public:
-    typedef L1GtLogicParser::TokenRPN TokenRPN;
-    typedef std::vector<TokenRPN> RpnVector;
-    typedef L1GtLogicParser::OperandToken OperandToken;
+  typedef L1GtLogicParser::TokenRPN TokenRPN;
+  typedef std::vector<TokenRPN> RpnVector;
+  typedef L1GtLogicParser::OperandToken OperandToken;
 
-    /// constructor
-    //  L1GtAlgorithmEvaluation();
+  /// constructor
+  //  L1GtAlgorithmEvaluation();
 
-    /// constructor from an algorithm from event setup
-    explicit L1GtAlgorithmEvaluation(const L1GtAlgorithm&);
+  /// constructor from an algorithm from event setup
+  explicit L1GtAlgorithmEvaluation(const L1GtAlgorithm &);
 
-    /// copy constructor
-    // L1GtAlgorithmEvaluation(L1GtAlgorithmEvaluation&);
+  /// copy constructor
+  // L1GtAlgorithmEvaluation(L1GtAlgorithmEvaluation&);
 
-    /// destructor
-    // virtual ~L1GtAlgorithmEvaluation();
+  /// destructor
+  // virtual ~L1GtAlgorithmEvaluation();
 
-    //typedef std::map<std::string, L1GtConditionEvaluation*> ConditionEvaluationMap;
-    typedef __gnu_cxx ::hash_map<std::string, L1GtConditionEvaluation*>
-            ConditionEvaluationMap;
-    typedef ConditionEvaluationMap::const_iterator CItEvalMap;
-    typedef ConditionEvaluationMap::iterator ItEvalMap;
+  // typedef std::map<std::string, L1GtConditionEvaluation*>
+  // ConditionEvaluationMap;
+  typedef __gnu_cxx ::hash_map<std::string, L1GtConditionEvaluation *>
+      ConditionEvaluationMap;
+  typedef ConditionEvaluationMap::const_iterator CItEvalMap;
+  typedef ConditionEvaluationMap::iterator ItEvalMap;
 
 public:
+  /// get / set the result of the algorithm
+  inline bool gtAlgoResult() const { return m_algoResult; }
 
-    /// get / set the result of the algorithm
-    inline bool gtAlgoResult() const {
-        return m_algoResult;
-    }
-
-    inline void setGtAlgoResult(const bool algoResult) {
-        m_algoResult = algoResult;
-    }
+  inline void setGtAlgoResult(const bool algoResult) {
+    m_algoResult = algoResult;
+  }
 
-    /// evaluate an algorithm
-    void evaluateAlgorithm(const int chipNumber, const std::vector<
-            ConditionEvaluationMap>&);
+  /// evaluate an algorithm
+  void evaluateAlgorithm(const int chipNumber,
+                         const std::vector<ConditionEvaluationMap> &);
 
-    /// get all the object combinations evaluated to true in the conditions
-    /// from the algorithm 
-    inline std::vector<CombinationsInCond> & gtAlgoCombinationVector() {
-        return m_algoCombinationVector;
-    }
+  /// get all the object combinations evaluated to true in the conditions
+  /// from the algorithm
+  inline std::vector<CombinationsInCond> &gtAlgoCombinationVector() {
+    return m_algoCombinationVector;
+  }
 
-    inline std::vector<L1GtLogicParser::OperandToken>& operandTokenVector() {
-        return m_operandTokenVector;
-    }
+  inline std::vector<L1GtLogicParser::OperandToken> &operandTokenVector() {
+    return m_operandTokenVector;
+  }
 
-    void print(std::ostream& myCout) const;
+  void print(std::ostream &myCout) const;
 
 private:
+  /// algorithm result
+  bool m_algoResult;
 
-    /// algorithm result
-    bool m_algoResult;
-
-    // input
-    std::string const & m_logicalExpression;
-    RpnVector const & m_rpnVector;
-
-    std::vector<OperandToken> m_operandTokenVector;
+  // input
+  std::string const &m_logicalExpression;
+  RpnVector const &m_rpnVector;
 
-    std::vector<CombinationsInCond> m_algoCombinationVector;
+  std::vector<OperandToken> m_operandTokenVector;
 
+  std::vector<CombinationsInCond> m_algoCombinationVector;
 };
 
 #endif
diff --git a/L1Trigger/GlobalTrigger/interface/L1GtBptxCondition.h b/L1Trigger/GlobalTrigger/interface/L1GtBptxCondition.h
index 36e15d03ecd24..61f451c53e4be 100644
--- a/L1Trigger/GlobalTrigger/interface/L1GtBptxCondition.h
+++ b/L1Trigger/GlobalTrigger/interface/L1GtBptxCondition.h
@@ -29,66 +29,57 @@ class L1GtCondition;
 class L1GtBptxTemplate;
 
 // class declaration
-class L1GtBptxCondition : public L1GtConditionEvaluation
-{
+class L1GtBptxCondition : public L1GtConditionEvaluation {
 
 public:
+  /// constructors
+  ///     default
+  L1GtBptxCondition();
 
-    /// constructors
-    ///     default
-    L1GtBptxCondition();
+  ///     from base template condition (from event setup usually)
+  L1GtBptxCondition(const L1GtCondition *, const bool result);
 
-    ///     from base template condition (from event setup usually)
-    L1GtBptxCondition(const L1GtCondition*, const bool result);
+  // copy constructor
+  L1GtBptxCondition(const L1GtBptxCondition &);
 
-    // copy constructor
-    L1GtBptxCondition(const L1GtBptxCondition&);
+  // destructor
+  ~L1GtBptxCondition() override;
 
-    // destructor
-    ~L1GtBptxCondition() override;
-
-    // assign operator
-    L1GtBptxCondition& operator=(const L1GtBptxCondition&);
+  // assign operator
+  L1GtBptxCondition &operator=(const L1GtBptxCondition &);
 
 public:
+  /// the core function to check if the condition matches
+  const bool evaluateCondition() const override;
 
-    /// the core function to check if the condition matches
-    const bool evaluateCondition() const override;
-
-    /// print condition
-    void print(std::ostream& myCout) const override;
+  /// print condition
+  void print(std::ostream &myCout) const override;
 
 public:
+  ///   get / set the pointer to a L1GtCondition
+  inline const L1GtBptxTemplate *gtBptxTemplate() const {
+    return m_gtBptxTemplate;
+  }
 
-    ///   get / set the pointer to a L1GtCondition
-    inline const L1GtBptxTemplate* gtBptxTemplate() const {
-        return m_gtBptxTemplate;
-    }
-
-    void setGtBptxTemplate(const L1GtBptxTemplate*);
+  void setGtBptxTemplate(const L1GtBptxTemplate *);
 
-    ///   get / set the result
-    inline const bool conditionResult() const {
-        return m_conditionResult;
-    }
+  ///   get / set the result
+  inline const bool conditionResult() const { return m_conditionResult; }
 
-    inline void setConditionResult(const bool result) {
-        m_conditionResult = result;
-    }
+  inline void setConditionResult(const bool result) {
+    m_conditionResult = result;
+  }
 
 private:
-
-    /// copy function for copy constructor and operator=
-    void copy(const L1GtBptxCondition& cp);
+  /// copy function for copy constructor and operator=
+  void copy(const L1GtBptxCondition &cp);
 
 private:
+  /// pointer to a L1GtBptxTemplate
+  const L1GtBptxTemplate *m_gtBptxTemplate;
 
-    /// pointer to a L1GtBptxTemplate
-    const L1GtBptxTemplate* m_gtBptxTemplate;
-
-    /// condition result
-    bool m_conditionResult;
-
+  /// condition result
+  bool m_conditionResult;
 };
 
 #endif
diff --git a/L1Trigger/GlobalTrigger/interface/L1GtCaloCondition.h b/L1Trigger/GlobalTrigger/interface/L1GtCaloCondition.h
index 9800c1f3beefb..7ce467aed3ce7 100644
--- a/L1Trigger/GlobalTrigger/interface/L1GtCaloCondition.h
+++ b/L1Trigger/GlobalTrigger/interface/L1GtCaloCondition.h
@@ -3,15 +3,15 @@
 
 /**
  * \class L1GtCaloCondition
- * 
- * 
+ *
+ *
  * Description: evaluation of a CondCalo condition.
- * 
+ *
  * Implementation:
  *    <TODO: enter implementation details>
- *   
- * \author: Vasile Mihai Ghete   - HEPHY Vienna 
- * 
+ *
+ * \author: Vasile Mihai Ghete   - HEPHY Vienna
+ *
  *
  */
 
@@ -32,98 +32,85 @@ class L1GctCand;
 class L1GlobalTriggerPSB;
 
 // class declaration
-class L1GtCaloCondition : public L1GtConditionEvaluation
-{
+class L1GtCaloCondition : public L1GtConditionEvaluation {
 
 public:
+  /// constructors
+  ///     default
+  L1GtCaloCondition();
 
-    /// constructors
-    ///     default
-    L1GtCaloCondition();
-
-    ///     from base template condition (from event setup usually)
-    L1GtCaloCondition(const L1GtCondition*, const L1GlobalTriggerPSB*,
-            const int nrL1NoIsoEG,
-            const int nrL1IsoEG,
-            const int nrL1CenJet,
-            const int nrL1ForJet,
-            const int nrL1TauJet,
-            const int ifCaloEtaNumberBits);
+  ///     from base template condition (from event setup usually)
+  L1GtCaloCondition(const L1GtCondition *, const L1GlobalTriggerPSB *,
+                    const int nrL1NoIsoEG, const int nrL1IsoEG,
+                    const int nrL1CenJet, const int nrL1ForJet,
+                    const int nrL1TauJet, const int ifCaloEtaNumberBits);
 
-    // copy constructor
-    L1GtCaloCondition(const L1GtCaloCondition&);
+  // copy constructor
+  L1GtCaloCondition(const L1GtCaloCondition &);
 
-    // destructor
-    ~L1GtCaloCondition() override;
+  // destructor
+  ~L1GtCaloCondition() override;
 
-    // assign operator
-    L1GtCaloCondition& operator=(const L1GtCaloCondition&);
+  // assign operator
+  L1GtCaloCondition &operator=(const L1GtCaloCondition &);
 
 public:
+  /// the core function to check if the condition matches
+  const bool evaluateCondition() const override;
 
-    /// the core function to check if the condition matches
-    const bool evaluateCondition() const override;
-
-    /// print condition
-     void print(std::ostream& myCout) const override;
+  /// print condition
+  void print(std::ostream &myCout) const override;
 
 public:
+  ///   get / set the pointer to a L1GtCondition
+  inline const L1GtCaloTemplate *gtCaloTemplate() const {
+    return m_gtCaloTemplate;
+  }
 
-    ///   get / set the pointer to a L1GtCondition
-    inline const L1GtCaloTemplate* gtCaloTemplate() const {
-        return m_gtCaloTemplate;
-    }
-
-    void setGtCaloTemplate(const L1GtCaloTemplate*);
-
-    ///   get / set the pointer to PSB
-    inline const L1GlobalTriggerPSB* gtPSB() const {
-        return m_gtPSB;
-    }
+  void setGtCaloTemplate(const L1GtCaloTemplate *);
 
-    void setGtPSB(const L1GlobalTriggerPSB*);
+  ///   get / set the pointer to PSB
+  inline const L1GlobalTriggerPSB *gtPSB() const { return m_gtPSB; }
 
+  void setGtPSB(const L1GlobalTriggerPSB *);
 
-    ///   get / set the number of bits for eta of calorimeter objects
-    inline const int gtIfCaloEtaNumberBits() const {
-        return m_ifCaloEtaNumberBits;
-    }
+  ///   get / set the number of bits for eta of calorimeter objects
+  inline const int gtIfCaloEtaNumberBits() const {
+    return m_ifCaloEtaNumberBits;
+  }
 
-    void setGtIfCaloEtaNumberBits(const int&);
+  void setGtIfCaloEtaNumberBits(const int &);
 
-    ///   get / set maximum number of bins for the delta phi scales
-    inline const int gtCorrParDeltaPhiNrBins() const {
-        return m_corrParDeltaPhiNrBins;
-    }
+  ///   get / set maximum number of bins for the delta phi scales
+  inline const int gtCorrParDeltaPhiNrBins() const {
+    return m_corrParDeltaPhiNrBins;
+  }
 
-    void setGtCorrParDeltaPhiNrBins(const int&);
+  void setGtCorrParDeltaPhiNrBins(const int &);
 
 private:
+  /// copy function for copy constructor and operator=
+  void copy(const L1GtCaloCondition &cp);
 
-    /// copy function for copy constructor and operator=
-    void copy(const L1GtCaloCondition& cp);
+  /// load calo candidates
+  const L1GctCand *getCandidate(const int indexCand) const;
 
-    /// load calo candidates
-    const L1GctCand* getCandidate(const int indexCand) const;
-
-    /// function to check a single object if it matches a condition
-    const bool
-    checkObjectParameter(const int iCondition, const L1GctCand& cand) const;
+  /// function to check a single object if it matches a condition
+  const bool checkObjectParameter(const int iCondition,
+                                  const L1GctCand &cand) const;
 
 private:
+  /// pointer to a L1GtCaloTemplate
+  const L1GtCaloTemplate *m_gtCaloTemplate;
 
-    /// pointer to a L1GtCaloTemplate
-    const L1GtCaloTemplate* m_gtCaloTemplate;
-
-    /// pointer to PSB, to be able to get the trigger objects
-    const L1GlobalTriggerPSB* m_gtPSB;
-
-    /// number of bits for eta of calorimeter objects
-    int m_ifCaloEtaNumberBits;
+  /// pointer to PSB, to be able to get the trigger objects
+  const L1GlobalTriggerPSB *m_gtPSB;
 
-    // maximum number of bins for the delta phi scales
-    unsigned int m_corrParDeltaPhiNrBins;
+  /// number of bits for eta of calorimeter objects
+  int m_ifCaloEtaNumberBits;
 
+  // maximum number of bins for the delta phi scales
+  unsigned int m_corrParDeltaPhiNrBins;
 };
 
 #endif
diff --git a/L1Trigger/GlobalTrigger/interface/L1GtCastorCondition.h b/L1Trigger/GlobalTrigger/interface/L1GtCastorCondition.h
index db502fa576df7..7304712c5cd1d 100644
--- a/L1Trigger/GlobalTrigger/interface/L1GtCastorCondition.h
+++ b/L1Trigger/GlobalTrigger/interface/L1GtCastorCondition.h
@@ -3,16 +3,16 @@
 
 /**
  * \class L1GtCastorCondition
- * 
- * 
+ *
+ *
  * Description: evaluation of a CondCastor condition.
- * 
+ *
  * Implementation:
- *    Simply put the result read from CASTOR L1 record in the L1GtConditionEvaluation
- *    base class, to be similar with other conditions.
- *   
- * \author: Vasile Mihai Ghete   - HEPHY Vienna 
- * 
+ *    Simply put the result read from CASTOR L1 record in the
+ * L1GtConditionEvaluation base class, to be similar with other conditions.
+ *
+ * \author: Vasile Mihai Ghete   - HEPHY Vienna
+ *
  *
  */
 
@@ -29,66 +29,57 @@ class L1GtCondition;
 class L1GtCastorTemplate;
 
 // class declaration
-class L1GtCastorCondition : public L1GtConditionEvaluation
-{
+class L1GtCastorCondition : public L1GtConditionEvaluation {
 
 public:
+  /// constructors
+  ///     default
+  L1GtCastorCondition();
 
-    /// constructors
-    ///     default
-    L1GtCastorCondition();
-
-    ///     from base template condition (from event setup usually)
-    L1GtCastorCondition(const L1GtCondition*, const bool result);
+  ///     from base template condition (from event setup usually)
+  L1GtCastorCondition(const L1GtCondition *, const bool result);
 
-    // copy constructor
-    L1GtCastorCondition(const L1GtCastorCondition&);
+  // copy constructor
+  L1GtCastorCondition(const L1GtCastorCondition &);
 
-    // destructor
-    ~L1GtCastorCondition() override;
+  // destructor
+  ~L1GtCastorCondition() override;
 
-    // assign operator
-    L1GtCastorCondition& operator=(const L1GtCastorCondition&);
+  // assign operator
+  L1GtCastorCondition &operator=(const L1GtCastorCondition &);
 
 public:
+  /// the core function to check if the condition matches
+  const bool evaluateCondition() const override;
 
-    /// the core function to check if the condition matches
-    const bool evaluateCondition() const override;
-
-    /// print condition
-    void print(std::ostream& myCout) const override;
+  /// print condition
+  void print(std::ostream &myCout) const override;
 
 public:
+  ///   get / set the pointer to a L1GtCondition
+  inline const L1GtCastorTemplate *gtCastorTemplate() const {
+    return m_gtCastorTemplate;
+  }
 
-    ///   get / set the pointer to a L1GtCondition
-    inline const L1GtCastorTemplate* gtCastorTemplate() const {
-        return m_gtCastorTemplate;
-    }
-
-    void setGtCastorTemplate(const L1GtCastorTemplate*);
+  void setGtCastorTemplate(const L1GtCastorTemplate *);
 
-    ///   get / set the result
-    inline const bool conditionResult() const {
-        return m_conditionResult;
-    }
+  ///   get / set the result
+  inline const bool conditionResult() const { return m_conditionResult; }
 
-    inline void setConditionResult(const bool result) {
-        m_conditionResult = result;
-    }
+  inline void setConditionResult(const bool result) {
+    m_conditionResult = result;
+  }
 
 private:
-
-    /// copy function for copy constructor and operator=
-    void copy(const L1GtCastorCondition& cp);
+  /// copy function for copy constructor and operator=
+  void copy(const L1GtCastorCondition &cp);
 
 private:
+  /// pointer to a L1GtCastorTemplate
+  const L1GtCastorTemplate *m_gtCastorTemplate;
 
-    /// pointer to a L1GtCastorTemplate
-    const L1GtCastorTemplate* m_gtCastorTemplate;
-
-    /// condition result
-    bool m_conditionResult;
-
+  /// condition result
+  bool m_conditionResult;
 };
 
 #endif
diff --git a/L1Trigger/GlobalTrigger/interface/L1GtConditionEvaluation.h b/L1Trigger/GlobalTrigger/interface/L1GtConditionEvaluation.h
index 81a673514ee36..555da9df9d4fb 100644
--- a/L1Trigger/GlobalTrigger/interface/L1GtConditionEvaluation.h
+++ b/L1Trigger/GlobalTrigger/interface/L1GtConditionEvaluation.h
@@ -5,7 +5,8 @@
  * \class L1GtConditionEvaluation
  *
  *
- * Description: Base class for evaluation of the L1 Global Trigger object templates.
+ * Description: Base class for evaluation of the L1 Global Trigger object
+ * templates.
  *
  * Implementation:
  *    <TODO: enter implementation details>
@@ -34,169 +35,162 @@
 // forward declarations
 
 // class interface
-class L1GtConditionEvaluation
-{
+class L1GtConditionEvaluation {
 
 public:
+  /// constructor
+  L1GtConditionEvaluation()
+      : m_condMaxNumberObjects(0), m_condLastResult(false), m_verbosity(0) {}
 
-    /// constructor
-    L1GtConditionEvaluation()  :
-    m_condMaxNumberObjects(0),
-    m_condLastResult(false),
-    m_verbosity(0) {}
-
-
-    /// destructor
-  virtual ~L1GtConditionEvaluation(){}
+  /// destructor
+  virtual ~L1GtConditionEvaluation() {}
 
 public:
-
-    /// get / set the maximum number of objects received for the
-    /// evaluation of the condition
-    inline int condMaxNumberObjects() const {
-        return m_condMaxNumberObjects;
-    }
-
-    inline void setCondMaxNumberObjects(int condMaxNumberObjectsValue) {
-        m_condMaxNumberObjects = condMaxNumberObjectsValue;
-    }
-
-    /// get the latest result for the condition
-    inline bool condLastResult() const {
-        return m_condLastResult;
-    }
-
-    /// call evaluateCondition and save last result
-    inline void evaluateConditionStoreResult() {
-        m_condLastResult = evaluateCondition();
-    }
-
-    /// the core function to check if the condition matches
-    virtual const bool evaluateCondition() const = 0;
-
-    /// get numeric expression
-    virtual std::string getNumericExpression() const {
-        if (m_condLastResult) {
-            return "1";
-        }
-        else {
-            return "0";
-        }
-    }
-
-    /// get all the object combinations evaluated to true in the condition
-    inline CombinationsInCond const & getCombinationsInCond() const {
-        return m_combinationsInCond;
+  /// get / set the maximum number of objects received for the
+  /// evaluation of the condition
+  inline int condMaxNumberObjects() const { return m_condMaxNumberObjects; }
+
+  inline void setCondMaxNumberObjects(int condMaxNumberObjectsValue) {
+    m_condMaxNumberObjects = condMaxNumberObjectsValue;
+  }
+
+  /// get the latest result for the condition
+  inline bool condLastResult() const { return m_condLastResult; }
+
+  /// call evaluateCondition and save last result
+  inline void evaluateConditionStoreResult() {
+    m_condLastResult = evaluateCondition();
+  }
+
+  /// the core function to check if the condition matches
+  virtual const bool evaluateCondition() const = 0;
+
+  /// get numeric expression
+  virtual std::string getNumericExpression() const {
+    if (m_condLastResult) {
+      return "1";
+    } else {
+      return "0";
     }
+  }
 
+  /// get all the object combinations evaluated to true in the condition
+  inline CombinationsInCond const &getCombinationsInCond() const {
+    return m_combinationsInCond;
+  }
 
-    /// print condition
-    virtual void print(std::ostream& myCout) const;
+  /// print condition
+  virtual void print(std::ostream &myCout) const;
 
-    inline void setVerbosity(const int verbosity) {
-        m_verbosity = verbosity;
-    }
+  inline void setVerbosity(const int verbosity) { m_verbosity = verbosity; }
 
 protected:
+  /// get all the object combinations (to fill it...)
+  inline CombinationsInCond &combinationsInCond() const {
+    return m_combinationsInCond;
+  }
 
-    /// get all the object combinations (to fill it...)
-    inline CombinationsInCond& combinationsInCond() const {
-        return m_combinationsInCond;
-    }
-
-    /// check if a value is greater than a threshold or
-    /// greater-or-equal depending on the value of the condGEqValue flag
-    template<class Type1, class Type2> const bool checkThreshold(const Type1& threshold,
-        const Type2& value, const bool condGEqValue) const;
+  /// check if a value is greater than a threshold or
+  /// greater-or-equal depending on the value of the condGEqValue flag
+  template <class Type1, class Type2>
+  const bool checkThreshold(const Type1 &threshold, const Type2 &value,
+                            const bool condGEqValue) const;
 
-    ///check if a bit with a given number is set in a mask
-    template<class Type1> const bool checkBit(const Type1& mask, const unsigned int bitNumber) const;
+  /// check if a bit with a given number is set in a mask
+  template <class Type1>
+  const bool checkBit(const Type1 &mask, const unsigned int bitNumber) const;
 
 protected:
+  /// maximum number of objects received for the evaluation of the condition
+  /// usually retrieved from event setup
+  int m_condMaxNumberObjects;
 
-    /// maximum number of objects received for the evaluation of the condition
-    /// usually retrieved from event setup
-    int m_condMaxNumberObjects;
-
-    /// the last result of evaluateCondition()
-    bool m_condLastResult;
+  /// the last result of evaluateCondition()
+  bool m_condLastResult;
 
-    /// store all the object combinations evaluated to true in the condition
-    mutable CombinationsInCond m_combinationsInCond;
-
-    /// verbosity level
-    int m_verbosity;
+  /// store all the object combinations evaluated to true in the condition
+  mutable CombinationsInCond m_combinationsInCond;
 
+  /// verbosity level
+  int m_verbosity;
 };
 
 // define templated methods
 
 // check if a value is greater than a threshold or
 // greater-or-equal depending on the value of the condGEqValue flag
-template<class Type1, class Type2> const bool L1GtConditionEvaluation::checkThreshold(
-    const Type1& threshold, const Type2& value, const bool condGEqValue) const {
-
-    //if (value > 0) {
-    //    LogTrace("L1GlobalTrigger") << "  threshold check for condGEqValue = "
-    //        << condGEqValue << "\n    hex: " << std::hex << "threshold = " << threshold
-    //        << " value = " << value << "\n    dec: " << std::dec << "threshold = " << threshold
-    //        << " value = " << value << std::endl;
-    //}
+template <class Type1, class Type2>
+const bool L1GtConditionEvaluation::checkThreshold(
+    const Type1 &threshold, const Type2 &value, const bool condGEqValue) const {
+
+  // if (value > 0) {
+  //    LogTrace("L1GlobalTrigger") << "  threshold check for condGEqValue = "
+  //        << condGEqValue << "\n    hex: " << std::hex << "threshold = " <<
+  //        threshold
+  //        << " value = " << value << "\n    dec: " << std::dec << "threshold =
+  //        " << threshold
+  //        << " value = " << value << std::endl;
+  //}
+
+  if (condGEqValue) {
+    if (value >= threshold) {
+
+      // LogTrace("L1GlobalTrigger") << "    condGEqValue: value >= threshold"
+      //    << std::endl;
+
+      return true;
+    }
 
-    if (condGEqValue) {
-        if (value >= threshold) {
+    return false;
 
-            //LogTrace("L1GlobalTrigger") << "    condGEqValue: value >= threshold"
-            //    << std::endl;
+  } else {
 
-            return true;
-        }
+    if (value == threshold) {
 
-        return false;
+      // LogTrace("L1GlobalTrigger") << "    condGEqValue: value = threshold"
+      //    << std::endl;
 
+      return true;
     }
-    else {
 
-        if (value == threshold) {
-
-            //LogTrace("L1GlobalTrigger") << "    condGEqValue: value = threshold"
-            //    << std::endl;
-
-            return true;
-        }
-
-        return false;
-    }
+    return false;
+  }
 }
 
 // check if a bit with a given number is set in a mask
-template<class Type1> const bool L1GtConditionEvaluation::checkBit(const Type1& mask,
-    const unsigned int bitNumber) const {
-
-    boost::uint64_t oneBit = 1ULL;
+template <class Type1>
+const bool
+L1GtConditionEvaluation::checkBit(const Type1 &mask,
+                                  const unsigned int bitNumber) const {
 
-    if (bitNumber >= (sizeof(oneBit)*8)) {
+  boost::uint64_t oneBit = 1ULL;
 
-        if (m_verbosity) {
+  if (bitNumber >= (sizeof(oneBit) * 8)) {
 
-            LogTrace("L1GlobalTrigger")
-                << "    checkBit " << "\n     Bit number = "
-                << bitNumber << " larger than maximum allowed " << sizeof ( oneBit ) * 8
-                << std::endl;
-        }
+    if (m_verbosity) {
 
-        return false;
+      LogTrace("L1GlobalTrigger")
+          << "    checkBit "
+          << "\n     Bit number = " << bitNumber
+          << " larger than maximum allowed " << sizeof(oneBit) * 8 << std::endl;
     }
 
-    oneBit <<= bitNumber;
+    return false;
+  }
+
+  oneBit <<= bitNumber;
 
-    //LogTrace("L1GlobalTrigger") << "    checkBit " << "\n     mask address = " << &mask
-    //    << std::dec << "\n     dec: " << "mask = " << mask << " oneBit = " << oneBit
-    //    << " bitNumber = " << bitNumber << std::hex << "\n     hex: " << "mask = " << mask
-    //    << " oneBit = " << oneBit << " bitNumber = " << bitNumber << std::dec
-    //    << "\n     mask & oneBit result = " << bool ( mask & oneBit ) << std::endl;
+  // LogTrace("L1GlobalTrigger") << "    checkBit " << "\n     mask address = "
+  // << &mask
+  //    << std::dec << "\n     dec: " << "mask = " << mask << " oneBit = " <<
+  //    oneBit
+  //    << " bitNumber = " << bitNumber << std::hex << "\n     hex: " << "mask =
+  //    " << mask
+  //    << " oneBit = " << oneBit << " bitNumber = " << bitNumber << std::dec
+  //    << "\n     mask & oneBit result = " << bool ( mask & oneBit ) <<
+  //    std::endl;
 
-    return (mask & oneBit);
+  return (mask & oneBit);
 }
 
 #endif
diff --git a/L1Trigger/GlobalTrigger/interface/L1GtCorrelationCondition.h b/L1Trigger/GlobalTrigger/interface/L1GtCorrelationCondition.h
index 9768c092ccce8..d220919ece399 100644
--- a/L1Trigger/GlobalTrigger/interface/L1GtCorrelationCondition.h
+++ b/L1Trigger/GlobalTrigger/interface/L1GtCorrelationCondition.h
@@ -31,107 +31,93 @@ class L1GlobalTriggerPSB;
 class L1GtEtaPhiConversions;
 
 // class declaration
-class L1GtCorrelationCondition : public L1GtConditionEvaluation
-{
+class L1GtCorrelationCondition : public L1GtConditionEvaluation {
 
 public:
+  /// constructors
+  ///     default
+  L1GtCorrelationCondition();
 
-    /// constructors
-    ///     default
-    L1GtCorrelationCondition();
+  ///     from base template condition (from event setup usually)
+  L1GtCorrelationCondition(const L1GtCondition *, const L1GtCondition *,
+                           const L1GtCondition *, const int, const int,
+                           const int, const int, const L1GlobalTriggerGTL *,
+                           const L1GlobalTriggerPSB *,
+                           const L1GtEtaPhiConversions *);
 
-    ///     from base template condition (from event setup usually)
-    L1GtCorrelationCondition(const L1GtCondition*, const L1GtCondition*,
-            const L1GtCondition*, const int, const int, const int, const int,
-            const L1GlobalTriggerGTL*, const L1GlobalTriggerPSB*,
-            const L1GtEtaPhiConversions*);
+  // copy constructor
+  L1GtCorrelationCondition(const L1GtCorrelationCondition &);
 
-    // copy constructor
-    L1GtCorrelationCondition(const L1GtCorrelationCondition&);
+  // destructor
+  ~L1GtCorrelationCondition() override;
 
-    // destructor
-    ~L1GtCorrelationCondition() override;
-
-    // assign operator
-    L1GtCorrelationCondition& operator=(const L1GtCorrelationCondition&);
+  // assign operator
+  L1GtCorrelationCondition &operator=(const L1GtCorrelationCondition &);
 
 public:
+  /// the core function to check if the condition matches
+  const bool evaluateCondition() const override;
 
-    /// the core function to check if the condition matches
-    const bool evaluateCondition() const override;
-
-    /// print condition
-    void print(std::ostream& myCout) const override;
+  /// print condition
+  void print(std::ostream &myCout) const override;
 
 public:
+  ///   get / set the number of phi bins
+  inline const unsigned int gtNrBinsPhi() const { return m_nrBinsPhi; }
 
-    ///   get / set the number of phi bins
-    inline const unsigned int gtNrBinsPhi() const {
-        return m_nrBinsPhi;
-    }
+  void setGtNrBinsPhi(const unsigned int);
 
-    void setGtNrBinsPhi(const unsigned int);
+  ///   get / set the pointer to a L1GtCondition
+  inline const L1GtCorrelationTemplate *gtCorrelationTemplate() const {
+    return m_gtCorrelationTemplate;
+  }
 
-    ///   get / set the pointer to a L1GtCondition
-    inline const L1GtCorrelationTemplate* gtCorrelationTemplate() const {
-        return m_gtCorrelationTemplate;
-    }
+  void setGtCorrelationTemplate(const L1GtCorrelationTemplate *);
 
-    void setGtCorrelationTemplate(const L1GtCorrelationTemplate*);
+  ///   get / set the pointer to GTL
+  inline const L1GlobalTriggerGTL *gtGTL() const { return m_gtGTL; }
 
-    ///   get / set the pointer to GTL
-    inline const L1GlobalTriggerGTL* gtGTL() const {
-        return m_gtGTL;
-    }
+  void setGtGTL(const L1GlobalTriggerGTL *);
 
-    void setGtGTL(const L1GlobalTriggerGTL*);
+  ///   get / set the pointer to PSB
+  inline const L1GlobalTriggerPSB *gtPSB() const { return m_gtPSB; }
 
-    ///   get / set the pointer to PSB
-    inline const L1GlobalTriggerPSB* gtPSB() const {
-        return m_gtPSB;
-    }
-
-    void setGtPSB(const L1GlobalTriggerPSB*);
+  void setGtPSB(const L1GlobalTriggerPSB *);
 
 private:
-
-    /// copy function for copy constructor and operator=
-    void copy(const L1GtCorrelationCondition& cp);
+  /// copy function for copy constructor and operator=
+  void copy(const L1GtCorrelationCondition &cp);
 
 private:
+  /// pointer to a L1GtCorrelationTemplate
+  const L1GtCorrelationTemplate *m_gtCorrelationTemplate;
 
-    /// pointer to a L1GtCorrelationTemplate
-    const L1GtCorrelationTemplate* m_gtCorrelationTemplate;
+  /// pointer to first sub-condition
+  const L1GtCondition *m_gtCond0;
 
-    /// pointer to first sub-condition
-    const L1GtCondition* m_gtCond0;
+  /// pointer to second sub-condition
+  const L1GtCondition *m_gtCond1;
 
-    /// pointer to second sub-condition
-    const L1GtCondition* m_gtCond1;
+  ///
+  int m_cond0NrL1Objects;
+  int m_cond1NrL1Objects;
+  int m_cond0EtaBits;
+  int m_cond1EtaBits;
 
-    ///
-    int m_cond0NrL1Objects;
-    int m_cond1NrL1Objects;
-    int m_cond0EtaBits;
-    int m_cond1EtaBits;
+  /// number of bins for delta phi
+  unsigned int m_nrBinsPhi;
 
-    /// number of bins for delta phi
-    unsigned int m_nrBinsPhi;
+  /// pointer to GTL, to be able to get the trigger objects
+  const L1GlobalTriggerGTL *m_gtGTL;
 
-    /// pointer to GTL, to be able to get the trigger objects
-    const L1GlobalTriggerGTL* m_gtGTL;
+  /// pointer to PSB, to be able to get the trigger objects
+  const L1GlobalTriggerPSB *m_gtPSB;
 
-    /// pointer to PSB, to be able to get the trigger objects
-    const L1GlobalTriggerPSB* m_gtPSB;
-
-    /// pointer to eta and phi conversion class
-    const L1GtEtaPhiConversions* m_gtEtaPhiConversions;
+  /// pointer to eta and phi conversion class
+  const L1GtEtaPhiConversions *m_gtEtaPhiConversions;
 
 private:
-
-    bool m_isDebugEnabled;
-
-
+  bool m_isDebugEnabled;
 };
 
 #endif
diff --git a/L1Trigger/GlobalTrigger/interface/L1GtEnergySumCondition.h b/L1Trigger/GlobalTrigger/interface/L1GtEnergySumCondition.h
index f03fecacbcdf5..17dfefdba78d7 100644
--- a/L1Trigger/GlobalTrigger/interface/L1GtEnergySumCondition.h
+++ b/L1Trigger/GlobalTrigger/interface/L1GtEnergySumCondition.h
@@ -3,15 +3,15 @@
 
 /**
  * \class L1GtEnergySumCondition
- * 
- * 
+ *
+ *
  * Description: evaluation of a CondEnergySum condition.
- * 
+ *
  * Implementation:
  *    <TODO: enter implementation details>
- *   
- * \author: Vasile Mihai Ghete   - HEPHY Vienna 
- * 
+ *
+ * \author: Vasile Mihai Ghete   - HEPHY Vienna
+ *
  *
  */
 
@@ -30,64 +30,55 @@ class L1GtEnergySumTemplate;
 class L1GlobalTriggerPSB;
 
 // class declaration
-class L1GtEnergySumCondition : public L1GtConditionEvaluation
-{
+class L1GtEnergySumCondition : public L1GtConditionEvaluation {
 
 public:
+  /// constructors
+  ///     default
+  L1GtEnergySumCondition();
 
-    /// constructors
-    ///     default
-    L1GtEnergySumCondition();
-
-    ///     from base template condition (from event setup usually)
-    L1GtEnergySumCondition(const L1GtCondition*, const L1GlobalTriggerPSB*);
+  ///     from base template condition (from event setup usually)
+  L1GtEnergySumCondition(const L1GtCondition *, const L1GlobalTriggerPSB *);
 
-    // copy constructor
-    L1GtEnergySumCondition(const L1GtEnergySumCondition&);
+  // copy constructor
+  L1GtEnergySumCondition(const L1GtEnergySumCondition &);
 
-    // destructor
-    ~L1GtEnergySumCondition() override;
+  // destructor
+  ~L1GtEnergySumCondition() override;
 
-    // assign operator
-    L1GtEnergySumCondition& operator=(const L1GtEnergySumCondition&);
+  // assign operator
+  L1GtEnergySumCondition &operator=(const L1GtEnergySumCondition &);
 
 public:
+  /// the core function to check if the condition matches
+  const bool evaluateCondition() const override;
 
-    /// the core function to check if the condition matches
-     const bool evaluateCondition() const override;
-
-    /// print condition
-     void print(std::ostream& myCout) const override;
+  /// print condition
+  void print(std::ostream &myCout) const override;
 
 public:
+  ///   get / set the pointer to a L1GtCondition
+  inline const L1GtEnergySumTemplate *gtEnergySumTemplate() const {
+    return m_gtEnergySumTemplate;
+  }
 
-    ///   get / set the pointer to a L1GtCondition
-    inline const L1GtEnergySumTemplate* gtEnergySumTemplate() const {
-        return m_gtEnergySumTemplate;
-    }
-
-    void setGtEnergySumTemplate(const L1GtEnergySumTemplate*);
+  void setGtEnergySumTemplate(const L1GtEnergySumTemplate *);
 
-    ///   get / set the pointer to PSB
-    inline const L1GlobalTriggerPSB* gtPSB() const {
-        return m_gtPSB;
-    }
+  ///   get / set the pointer to PSB
+  inline const L1GlobalTriggerPSB *gtPSB() const { return m_gtPSB; }
 
-    void setGtPSB(const L1GlobalTriggerPSB*);
+  void setGtPSB(const L1GlobalTriggerPSB *);
 
 private:
-
-    /// copy function for copy constructor and operator=
-    void copy(const L1GtEnergySumCondition& cp);
+  /// copy function for copy constructor and operator=
+  void copy(const L1GtEnergySumCondition &cp);
 
 private:
+  /// pointer to a L1GtEnergySumTemplate
+  const L1GtEnergySumTemplate *m_gtEnergySumTemplate;
 
-    /// pointer to a L1GtEnergySumTemplate
-    const L1GtEnergySumTemplate* m_gtEnergySumTemplate;
-
-    /// pointer to PSB, to be able to get the trigger objects
-    const L1GlobalTriggerPSB* m_gtPSB;
-
+  /// pointer to PSB, to be able to get the trigger objects
+  const L1GlobalTriggerPSB *m_gtPSB;
 };
 
 #endif
diff --git a/L1Trigger/GlobalTrigger/interface/L1GtEtaPhiConversions.h b/L1Trigger/GlobalTrigger/interface/L1GtEtaPhiConversions.h
index 9ea553bdbc1c4..2472c66bf1e3d 100644
--- a/L1Trigger/GlobalTrigger/interface/L1GtEtaPhiConversions.h
+++ b/L1Trigger/GlobalTrigger/interface/L1GtEtaPhiConversions.h
@@ -3,23 +3,23 @@
 
 /**
  * \class L1GtEtaPhiConversions
- * 
- * 
+ *
+ *
  * Description: convert eta and phi between various L1 trigger objects.
- * 
+ *
  * Implementation:
  *    <TODO: enter implementation details>
- *   
- * \author: Vasile Mihai Ghete   - HEPHY Vienna 
- * 
+ *
+ * \author: Vasile Mihai Ghete   - HEPHY Vienna
+ *
  *
  */
 
 // system include files
+#include <cmath>
 #include <iostream>
-#include <vector>
 #include <utility>
-#include <cmath>
+#include <vector>
 
 // user include files
 
@@ -36,166 +36,154 @@ class L1MuTriggerScales;
 class L1GtEtaPhiConversions {
 
 public:
+  /// constructor
+  L1GtEtaPhiConversions();
 
-    /// constructor
-    L1GtEtaPhiConversions();
-
-    /// destructor
-    virtual ~L1GtEtaPhiConversions();
+  /// destructor
+  virtual ~L1GtEtaPhiConversions();
 
 public:
-
-    /// return the index of a pair in the vector m_gtObjectPairVec, to be used to extract
-    /// the number of phi bins, the conversion of the indices, etc
-    const unsigned int gtObjectPairIndex(const L1GtObject&,
-            const L1GtObject&) const;
-
-    /// convert the phi index initialIndex for an object from pair pairIndex, with position of
-    /// object in pair positionPair to common scale for the L1GtObject pair
-    /// converted index returned by reference
-    /// method return true, if initial index within scale size
-    /// otherwise (hardware error), return false
-    const bool convertPhiIndex(const unsigned int pairIndex,
-            const unsigned int positionPair, const unsigned int initialIndex,
-            unsigned int& convertedIndex) const ;
-
-    /// convert the eta index initialIndex for a L1GtObject object to common scale
-    /// converted index returned by reference
-    /// method return true, if initial index within scale size
-    /// otherwise (hardware error), return false
-    const bool convertEtaIndex(const L1GtObject&, const unsigned int initialIndex,
-            unsigned int& convertedIndex) const;
-
-    /// return the number of phi bins for a GT object
-    const unsigned int gtObjectNrBinsPhi(const L1GtObject&) const;
-
-    /// return the number of phi bins for a pair of GT objects, according to conversion rules
-    const unsigned int gtObjectNrBinsPhi(const L1GtObject&,
-            const L1GtObject&) const;
-
-    /// return the number of phi bins for a pair of GT objects, according to conversion rules,
-    /// when the index of the pair is used
-    const unsigned int gtObjectNrBinsPhi(const unsigned int) const;
-
-    /// perform all scale conversions
-    void convertL1Scales(const L1CaloGeometry*, const L1MuTriggerScales*,
-            const int, const int);
-
-    inline void setVerbosity(const int verbosity) {
-        m_verbosity = verbosity;
-    }
-
-    /// print all the performed conversions
-    virtual void print(std::ostream& myCout) const;
-
-
-
+  /// return the index of a pair in the vector m_gtObjectPairVec, to be used to
+  /// extract the number of phi bins, the conversion of the indices, etc
+  const unsigned int gtObjectPairIndex(const L1GtObject &,
+                                       const L1GtObject &) const;
+
+  /// convert the phi index initialIndex for an object from pair pairIndex, with
+  /// position of object in pair positionPair to common scale for the L1GtObject
+  /// pair converted index returned by reference method return true, if initial
+  /// index within scale size otherwise (hardware error), return false
+  const bool convertPhiIndex(const unsigned int pairIndex,
+                             const unsigned int positionPair,
+                             const unsigned int initialIndex,
+                             unsigned int &convertedIndex) const;
+
+  /// convert the eta index initialIndex for a L1GtObject object to common scale
+  /// converted index returned by reference
+  /// method return true, if initial index within scale size
+  /// otherwise (hardware error), return false
+  const bool convertEtaIndex(const L1GtObject &,
+                             const unsigned int initialIndex,
+                             unsigned int &convertedIndex) const;
+
+  /// return the number of phi bins for a GT object
+  const unsigned int gtObjectNrBinsPhi(const L1GtObject &) const;
+
+  /// return the number of phi bins for a pair of GT objects, according to
+  /// conversion rules
+  const unsigned int gtObjectNrBinsPhi(const L1GtObject &,
+                                       const L1GtObject &) const;
+
+  /// return the number of phi bins for a pair of GT objects, according to
+  /// conversion rules, when the index of the pair is used
+  const unsigned int gtObjectNrBinsPhi(const unsigned int) const;
+
+  /// perform all scale conversions
+  void convertL1Scales(const L1CaloGeometry *, const L1MuTriggerScales *,
+                       const int, const int);
+
+  inline void setVerbosity(const int verbosity) { m_verbosity = verbosity; }
+
+  /// print all the performed conversions
+  virtual void print(std::ostream &myCout) const;
 
 private:
+  /// a bad index value, treated specially when performing the conversions or
+  /// printing the conversion vectors
+  static const unsigned int badIndex;
 
-    /// a bad index value, treated specially when performing the conversions or printing the
-    /// conversion vectors
-    static const unsigned int badIndex;
-
-    ///
-    static const double PiConversion;
-
-    ///  convert phi from rad (-pi, pi] to deg (0, 360)
-    const double rad2deg(const double&) const;
+  ///
+  static const double PiConversion;
 
+  ///  convert phi from rad (-pi, pi] to deg (0, 360)
+  const double rad2deg(const double &) const;
 
 private:
-
-    /// vector of all L1GtObject pairs
-    std::vector<std::pair<L1GtObject, L1GtObject> > m_gtObjectPairVec;
-
-    /// decide which object to convert:
-    /// if m_pairConvertPhiFirstGtObject true, convert pair.first and do not convert pair.second
-    /// if m_pairConvertPhiFirstGtObject false, do not convert pair.first and convert pair.second
-    std::vector<bool> m_pairConvertPhiFirstGtObject;
-
-    /// number of phi bins for each L1GtObject pair in the scale used for that pair
-    /// it is filled correlated with m_gtObjectPairVec, so the index of the pair in
-    /// m_gtObjectPairVec is the index of the m_pairNrPhiBinsVec element containing
-    /// the number of phi bins
-    std::vector<const unsigned int*> m_pairNrPhiBinsVec;
-
-    /// constant references to conversion LUT for a given L1GtObject pair
-    /// it is filled correlated with m_gtObjectPairVec, so the index of the pair in
-    /// m_gtObjectPairVec is the index of the m_pairPhiConvVec element containing the
-    /// reference
-    std::vector<const std::vector<unsigned int>*> m_pairPhiConvVec;
+  /// vector of all L1GtObject pairs
+  std::vector<std::pair<L1GtObject, L1GtObject>> m_gtObjectPairVec;
+
+  /// decide which object to convert:
+  /// if m_pairConvertPhiFirstGtObject true, convert pair.first and do not
+  /// convert pair.second if m_pairConvertPhiFirstGtObject false, do not convert
+  /// pair.first and convert pair.second
+  std::vector<bool> m_pairConvertPhiFirstGtObject;
+
+  /// number of phi bins for each L1GtObject pair in the scale used for that
+  /// pair it is filled correlated with m_gtObjectPairVec, so the index of the
+  /// pair in m_gtObjectPairVec is the index of the m_pairNrPhiBinsVec element
+  /// containing the number of phi bins
+  std::vector<const unsigned int *> m_pairNrPhiBinsVec;
+
+  /// constant references to conversion LUT for a given L1GtObject pair
+  /// it is filled correlated with m_gtObjectPairVec, so the index of the pair
+  /// in m_gtObjectPairVec is the index of the m_pairPhiConvVec element
+  /// containing the reference
+  std::vector<const std::vector<unsigned int> *> m_pairPhiConvVec;
 
 private:
+  /// pointer to calorimetry scales - updated in convertl1Scales method
+  const L1CaloGeometry *m_l1CaloGeometry;
 
-    /// pointer to calorimetry scales - updated in convertl1Scales method
-    const L1CaloGeometry* m_l1CaloGeometry;
-
-    /// pointer to muon scales - updated in convertl1Scales method
-    const L1MuTriggerScales* m_l1MuTriggerScales;
+  /// pointer to muon scales - updated in convertl1Scales method
+  const L1MuTriggerScales *m_l1MuTriggerScales;
 
 private:
+  /// number of phi bins for muons
+  unsigned int m_nrBinsPhiMu;
 
-    /// number of phi bins for muons
-    unsigned int m_nrBinsPhiMu;
-
-    /// number of phi bins for calorimeter objects (*Jet, *EG)
-    unsigned int m_nrBinsPhiJetEg;
+  /// number of phi bins for calorimeter objects (*Jet, *EG)
+  unsigned int m_nrBinsPhiJetEg;
 
-    /// number of phi bins for ETM
-    unsigned int m_nrBinsPhiEtm;
+  /// number of phi bins for ETM
+  unsigned int m_nrBinsPhiEtm;
 
-    /// number of phi bins for HTM
-    unsigned int m_nrBinsPhiHtm;
+  /// number of phi bins for HTM
+  unsigned int m_nrBinsPhiHtm;
 
-    /// number of eta bins for common scale
-    unsigned int m_nrBinsEtaCommon;
+  /// number of eta bins for common scale
+  unsigned int m_nrBinsEtaCommon;
 
 private:
+  /// phi conversion for Mu to (*Jet, EG)
+  std::vector<unsigned int> m_lutPhiMuToJetEg;
 
-    /// phi conversion for Mu to (*Jet, EG)
-    std::vector<unsigned int> m_lutPhiMuToJetEg;
+  /// phi conversion for Mu to ETM
+  std::vector<unsigned int> m_lutPhiMuToEtm;
 
-    /// phi conversion for Mu to ETM
-    std::vector<unsigned int> m_lutPhiMuToEtm;
+  /// phi conversion for Mu to HTM
+  std::vector<unsigned int> m_lutPhiMuToHtm;
 
-    /// phi conversion for Mu to HTM
-    std::vector<unsigned int> m_lutPhiMuToHtm;
+  /// phi conversion for ETM to (*Jet, EG)
+  std::vector<unsigned int> m_lutPhiEtmToJetEg;
 
-    /// phi conversion for ETM to (*Jet, EG)
-    std::vector<unsigned int> m_lutPhiEtmToJetEg;
+  /// phi conversion for ETM to HTM
+  std::vector<unsigned int> m_lutPhiEtmToHtm;
 
-    /// phi conversion for ETM to HTM
-    std::vector<unsigned int> m_lutPhiEtmToHtm;
+  /// phi conversion for HTM to (*Jet, EG)
+  std::vector<unsigned int> m_lutPhiHtmToJetEg;
 
-    /// phi conversion for HTM to (*Jet, EG)
-    std::vector<unsigned int> m_lutPhiHtmToJetEg;
-
-    /// phi conversion for (*Jet, EG) to (*Jet, EG)
-    /// return the same index as the input index, introduced only
-    /// to simplify convertPhiIndex
-    std::vector<unsigned int> m_lutPhiJetEgToJetEg;
+  /// phi conversion for (*Jet, EG) to (*Jet, EG)
+  /// return the same index as the input index, introduced only
+  /// to simplify convertPhiIndex
+  std::vector<unsigned int> m_lutPhiJetEgToJetEg;
 
 private:
+  /// eta conversion of CenJet/TauJet & IsoEG/NoIsoEG
+  /// to a common calorimeter eta scale
+  std::vector<unsigned int> m_lutEtaCentralToCommonCalo;
 
-    /// eta conversion of CenJet/TauJet & IsoEG/NoIsoEG
-    /// to a common calorimeter eta scale
-    std::vector<unsigned int> m_lutEtaCentralToCommonCalo;
-
-    /// eta conversion of ForJet to the common calorimeter eta scale defined before
-    std::vector<unsigned int> m_lutEtaForJetToCommonCalo;
+  /// eta conversion of ForJet to the common calorimeter eta scale defined
+  /// before
+  std::vector<unsigned int> m_lutEtaForJetToCommonCalo;
 
-    /// eta conversion of Mu to the common calorimeter eta scale defined before
-    std::vector<unsigned int> m_lutEtaMuToCommonCalo;
+  /// eta conversion of Mu to the common calorimeter eta scale defined before
+  std::vector<unsigned int> m_lutEtaMuToCommonCalo;
 
 private:
+  /// verbosity level
+  int m_verbosity;
 
-    /// verbosity level
-    int m_verbosity;
-
-    /// cached edm::isDebugEnabled()
-    bool m_isDebugEnabled;
-
+  /// cached edm::isDebugEnabled()
+  bool m_isDebugEnabled;
 };
 
 #endif
diff --git a/L1Trigger/GlobalTrigger/interface/L1GtExternalCondition.h b/L1Trigger/GlobalTrigger/interface/L1GtExternalCondition.h
index 55ff144d4ec69..723021c64db40 100644
--- a/L1Trigger/GlobalTrigger/interface/L1GtExternalCondition.h
+++ b/L1Trigger/GlobalTrigger/interface/L1GtExternalCondition.h
@@ -29,66 +29,57 @@ class L1GtCondition;
 class L1GtExternalTemplate;
 
 // class declaration
-class L1GtExternalCondition : public L1GtConditionEvaluation
-{
+class L1GtExternalCondition : public L1GtConditionEvaluation {
 
 public:
+  /// constructors
+  ///     default
+  L1GtExternalCondition();
 
-    /// constructors
-    ///     default
-    L1GtExternalCondition();
+  ///     from base template condition (from event setup usually)
+  L1GtExternalCondition(const L1GtCondition *, const bool result);
 
-    ///     from base template condition (from event setup usually)
-    L1GtExternalCondition(const L1GtCondition*, const bool result);
+  // copy constructor
+  L1GtExternalCondition(const L1GtExternalCondition &);
 
-    // copy constructor
-    L1GtExternalCondition(const L1GtExternalCondition&);
+  // destructor
+  ~L1GtExternalCondition() override;
 
-    // destructor
-    ~L1GtExternalCondition() override;
-
-    // assign operator
-    L1GtExternalCondition& operator=(const L1GtExternalCondition&);
+  // assign operator
+  L1GtExternalCondition &operator=(const L1GtExternalCondition &);
 
 public:
+  /// the core function to check if the condition matches
+  const bool evaluateCondition() const override;
 
-    /// the core function to check if the condition matches
-    const bool evaluateCondition() const override;
-
-    /// print condition
-    void print(std::ostream& myCout) const override;
+  /// print condition
+  void print(std::ostream &myCout) const override;
 
 public:
+  ///   get / set the pointer to a L1GtCondition
+  inline const L1GtExternalTemplate *gtExternalTemplate() const {
+    return m_gtExternalTemplate;
+  }
 
-    ///   get / set the pointer to a L1GtCondition
-    inline const L1GtExternalTemplate* gtExternalTemplate() const {
-        return m_gtExternalTemplate;
-    }
-
-    void setGtExternalTemplate(const L1GtExternalTemplate*);
+  void setGtExternalTemplate(const L1GtExternalTemplate *);
 
-    ///   get / set the result
-    inline const bool conditionResult() const {
-        return m_conditionResult;
-    }
+  ///   get / set the result
+  inline const bool conditionResult() const { return m_conditionResult; }
 
-    inline void setConditionResult(const bool result) {
-        m_conditionResult = result;
-    }
+  inline void setConditionResult(const bool result) {
+    m_conditionResult = result;
+  }
 
 private:
-
-    /// copy function for copy constructor and operator=
-    void copy(const L1GtExternalCondition& cp);
+  /// copy function for copy constructor and operator=
+  void copy(const L1GtExternalCondition &cp);
 
 private:
+  /// pointer to a L1GtExternalTemplate
+  const L1GtExternalTemplate *m_gtExternalTemplate;
 
-    /// pointer to a L1GtExternalTemplate
-    const L1GtExternalTemplate* m_gtExternalTemplate;
-
-    /// condition result
-    bool m_conditionResult;
-
+  /// condition result
+  bool m_conditionResult;
 };
 
 #endif
diff --git a/L1Trigger/GlobalTrigger/interface/L1GtHfBitCountsCondition.h b/L1Trigger/GlobalTrigger/interface/L1GtHfBitCountsCondition.h
index 36e81bdd27477..da67fa0ebfd5a 100644
--- a/L1Trigger/GlobalTrigger/interface/L1GtHfBitCountsCondition.h
+++ b/L1Trigger/GlobalTrigger/interface/L1GtHfBitCountsCondition.h
@@ -29,64 +29,55 @@ class L1GtHfBitCountsTemplate;
 class L1GlobalTriggerPSB;
 
 // class declaration
-class L1GtHfBitCountsCondition : public L1GtConditionEvaluation
-{
+class L1GtHfBitCountsCondition : public L1GtConditionEvaluation {
 
 public:
+  /// constructors
+  ///     default
+  L1GtHfBitCountsCondition();
 
-    /// constructors
-    ///     default
-    L1GtHfBitCountsCondition();
+  ///     from base template condition (from event setup usually)
+  L1GtHfBitCountsCondition(const L1GtCondition *, const L1GlobalTriggerPSB *);
 
-    ///     from base template condition (from event setup usually)
-    L1GtHfBitCountsCondition(const L1GtCondition*, const L1GlobalTriggerPSB*);
+  // copy constructor
+  L1GtHfBitCountsCondition(const L1GtHfBitCountsCondition &);
 
-    // copy constructor
-    L1GtHfBitCountsCondition(const L1GtHfBitCountsCondition&);
+  // destructor
+  ~L1GtHfBitCountsCondition() override;
 
-    // destructor
-    ~L1GtHfBitCountsCondition() override;
-
-    // assign operator
-    L1GtHfBitCountsCondition& operator=(const L1GtHfBitCountsCondition&);
+  // assign operator
+  L1GtHfBitCountsCondition &operator=(const L1GtHfBitCountsCondition &);
 
 public:
+  /// the core function to check if the condition matches
+  const bool evaluateCondition() const override;
 
-    /// the core function to check if the condition matches
-     const bool evaluateCondition() const override;
-
-    /// print condition
-     void print(std::ostream& myCout) const override;
+  /// print condition
+  void print(std::ostream &myCout) const override;
 
 public:
+  ///   get / set the pointer to a L1GtCondition
+  inline const L1GtHfBitCountsTemplate *gtHfBitCountsTemplate() const {
+    return m_gtHfBitCountsTemplate;
+  }
 
-    ///   get / set the pointer to a L1GtCondition
-    inline const L1GtHfBitCountsTemplate* gtHfBitCountsTemplate() const {
-        return m_gtHfBitCountsTemplate;
-    }
-
-    void setGtHfBitCountsTemplate(const L1GtHfBitCountsTemplate*);
+  void setGtHfBitCountsTemplate(const L1GtHfBitCountsTemplate *);
 
-    ///   get / set the pointer to PSB
-    inline const L1GlobalTriggerPSB* gtPSB() const {
-        return m_gtPSB;
-    }
+  ///   get / set the pointer to PSB
+  inline const L1GlobalTriggerPSB *gtPSB() const { return m_gtPSB; }
 
-    void setGtPSB(const L1GlobalTriggerPSB*);
+  void setGtPSB(const L1GlobalTriggerPSB *);
 
 private:
-
-    /// copy function for copy constructor and operator=
-    void copy(const L1GtHfBitCountsCondition& cp);
+  /// copy function for copy constructor and operator=
+  void copy(const L1GtHfBitCountsCondition &cp);
 
 private:
+  /// pointer to a L1GtHfBitCountsTemplate
+  const L1GtHfBitCountsTemplate *m_gtHfBitCountsTemplate;
 
-    /// pointer to a L1GtHfBitCountsTemplate
-    const L1GtHfBitCountsTemplate* m_gtHfBitCountsTemplate;
-
-    /// pointer to PSB, to be able to get the trigger objects
-    const L1GlobalTriggerPSB* m_gtPSB;
-
+  /// pointer to PSB, to be able to get the trigger objects
+  const L1GlobalTriggerPSB *m_gtPSB;
 };
 
 #endif
diff --git a/L1Trigger/GlobalTrigger/interface/L1GtHfRingEtSumsCondition.h b/L1Trigger/GlobalTrigger/interface/L1GtHfRingEtSumsCondition.h
index 102f083faee31..f3dfc81b08bd0 100644
--- a/L1Trigger/GlobalTrigger/interface/L1GtHfRingEtSumsCondition.h
+++ b/L1Trigger/GlobalTrigger/interface/L1GtHfRingEtSumsCondition.h
@@ -29,64 +29,55 @@ class L1GtHfRingEtSumsTemplate;
 class L1GlobalTriggerPSB;
 
 // class declaration
-class L1GtHfRingEtSumsCondition : public L1GtConditionEvaluation
-{
+class L1GtHfRingEtSumsCondition : public L1GtConditionEvaluation {
 
 public:
+  /// constructors
+  ///     default
+  L1GtHfRingEtSumsCondition();
 
-    /// constructors
-    ///     default
-    L1GtHfRingEtSumsCondition();
+  ///     from base template condition (from event setup usually)
+  L1GtHfRingEtSumsCondition(const L1GtCondition *, const L1GlobalTriggerPSB *);
 
-    ///     from base template condition (from event setup usually)
-    L1GtHfRingEtSumsCondition(const L1GtCondition*, const L1GlobalTriggerPSB*);
+  // copy constructor
+  L1GtHfRingEtSumsCondition(const L1GtHfRingEtSumsCondition &);
 
-    // copy constructor
-    L1GtHfRingEtSumsCondition(const L1GtHfRingEtSumsCondition&);
+  // destructor
+  ~L1GtHfRingEtSumsCondition() override;
 
-    // destructor
-    ~L1GtHfRingEtSumsCondition() override;
-
-    // assign operator
-    L1GtHfRingEtSumsCondition& operator=(const L1GtHfRingEtSumsCondition&);
+  // assign operator
+  L1GtHfRingEtSumsCondition &operator=(const L1GtHfRingEtSumsCondition &);
 
 public:
+  /// the core function to check if the condition matches
+  const bool evaluateCondition() const override;
 
-    /// the core function to check if the condition matches
-     const bool evaluateCondition() const override;
-
-    /// print condition
-     void print(std::ostream& myCout) const override;
+  /// print condition
+  void print(std::ostream &myCout) const override;
 
 public:
+  ///   get / set the pointer to a L1GtCondition
+  inline const L1GtHfRingEtSumsTemplate *gtHfRingEtSumsTemplate() const {
+    return m_gtHfRingEtSumsTemplate;
+  }
 
-    ///   get / set the pointer to a L1GtCondition
-    inline const L1GtHfRingEtSumsTemplate* gtHfRingEtSumsTemplate() const {
-        return m_gtHfRingEtSumsTemplate;
-    }
-
-    void setGtHfRingEtSumsTemplate(const L1GtHfRingEtSumsTemplate*);
+  void setGtHfRingEtSumsTemplate(const L1GtHfRingEtSumsTemplate *);
 
-    ///   get / set the pointer to PSB
-    inline const L1GlobalTriggerPSB* gtPSB() const {
-        return m_gtPSB;
-    }
+  ///   get / set the pointer to PSB
+  inline const L1GlobalTriggerPSB *gtPSB() const { return m_gtPSB; }
 
-    void setGtPSB(const L1GlobalTriggerPSB*);
+  void setGtPSB(const L1GlobalTriggerPSB *);
 
 private:
-
-    /// copy function for copy constructor and operator=
-    void copy(const L1GtHfRingEtSumsCondition& cp);
+  /// copy function for copy constructor and operator=
+  void copy(const L1GtHfRingEtSumsCondition &cp);
 
 private:
+  /// pointer to a L1GtHfRingEtSumsTemplate
+  const L1GtHfRingEtSumsTemplate *m_gtHfRingEtSumsTemplate;
 
-    /// pointer to a L1GtHfRingEtSumsTemplate
-    const L1GtHfRingEtSumsTemplate* m_gtHfRingEtSumsTemplate;
-
-    /// pointer to PSB, to be able to get the trigger objects
-    const L1GlobalTriggerPSB* m_gtPSB;
-
+  /// pointer to PSB, to be able to get the trigger objects
+  const L1GlobalTriggerPSB *m_gtPSB;
 };
 
 #endif
diff --git a/L1Trigger/GlobalTrigger/interface/L1GtJetCountsCondition.h b/L1Trigger/GlobalTrigger/interface/L1GtJetCountsCondition.h
index 98592b8e9a7ec..84fc61f5a08b5 100644
--- a/L1Trigger/GlobalTrigger/interface/L1GtJetCountsCondition.h
+++ b/L1Trigger/GlobalTrigger/interface/L1GtJetCountsCondition.h
@@ -3,15 +3,15 @@
 
 /**
  * \class L1GtJetCountsCondition
- * 
- * 
+ *
+ *
  * Description: evaluation of a CondJetCounts condition.
- * 
+ *
  * Implementation:
  *    <TODO: enter implementation details>
- *   
- * \author: Vasile Mihai Ghete   - HEPHY Vienna 
- * 
+ *
+ * \author: Vasile Mihai Ghete   - HEPHY Vienna
+ *
  *
  */
 
@@ -30,67 +30,59 @@ class L1GtJetCountsTemplate;
 class L1GlobalTriggerPSB;
 
 // class declaration
-class L1GtJetCountsCondition : public L1GtConditionEvaluation
-{
+class L1GtJetCountsCondition : public L1GtConditionEvaluation {
 
 public:
+  /// constructors
+  ///     default
+  L1GtJetCountsCondition();
 
-    /// constructors
-    ///     default
-    L1GtJetCountsCondition();
+  ///     from base template condition (from event setup usually)
+  L1GtJetCountsCondition(const L1GtCondition *, const L1GlobalTriggerPSB *,
+                         const int nrL1JetCounts);
 
-    ///     from base template condition (from event setup usually)
-    L1GtJetCountsCondition(const L1GtCondition*, const L1GlobalTriggerPSB*, const int nrL1JetCounts);
+  // copy constructor
+  L1GtJetCountsCondition(const L1GtJetCountsCondition &);
 
-    // copy constructor
-    L1GtJetCountsCondition(const L1GtJetCountsCondition&);
+  // destructor
+  ~L1GtJetCountsCondition() override;
 
-    // destructor
-    ~L1GtJetCountsCondition() override;
-
-    // assign operator
-    L1GtJetCountsCondition& operator=(const L1GtJetCountsCondition&);
+  // assign operator
+  L1GtJetCountsCondition &operator=(const L1GtJetCountsCondition &);
 
 public:
+  /// the core function to check if the condition matches
+  const bool evaluateCondition() const override;
 
-    /// the core function to check if the condition matches
-     const bool evaluateCondition() const override;
-
-    /// print condition
-     void print(std::ostream& myCout) const override;
+  /// print condition
+  void print(std::ostream &myCout) const override;
 
 public:
+  ///   get / set the pointer to a L1GtCondition
+  inline const L1GtJetCountsTemplate *gtJetCountsTemplate() const {
+    return m_gtJetCountsTemplate;
+  }
 
-    ///   get / set the pointer to a L1GtCondition
-    inline const L1GtJetCountsTemplate* gtJetCountsTemplate() const {
-        return m_gtJetCountsTemplate;
-    }
-
-    void setGtJetCountsTemplate(const L1GtJetCountsTemplate*);
+  void setGtJetCountsTemplate(const L1GtJetCountsTemplate *);
 
-    ///   get / set the pointer to PSB
-    inline const L1GlobalTriggerPSB* gtPSB() const {
-        return m_gtPSB;
-    }
+  ///   get / set the pointer to PSB
+  inline const L1GlobalTriggerPSB *gtPSB() const { return m_gtPSB; }
 
-    void setGtPSB(const L1GlobalTriggerPSB*);
+  void setGtPSB(const L1GlobalTriggerPSB *);
 
 private:
-
-    /// copy function for copy constructor and operator=
-    void copy(const L1GtJetCountsCondition& cp);
+  /// copy function for copy constructor and operator=
+  void copy(const L1GtJetCountsCondition &cp);
 
 private:
+  /// pointer to a L1GtJetCountsTemplate
+  const L1GtJetCountsTemplate *m_gtJetCountsTemplate;
 
-    /// pointer to a L1GtJetCountsTemplate
-    const L1GtJetCountsTemplate* m_gtJetCountsTemplate;
-
-    /// pointer to PSB, to be able to get the trigger objects
-    const L1GlobalTriggerPSB* m_gtPSB;
+  /// pointer to PSB, to be able to get the trigger objects
+  const L1GlobalTriggerPSB *m_gtPSB;
 
-    /// maximum number of jet counts
-    unsigned int m_numberL1JetCounts;
-    
+  /// maximum number of jet counts
+  unsigned int m_numberL1JetCounts;
 };
 
 #endif
diff --git a/L1Trigger/GlobalTrigger/interface/L1GtMuonCondition.h b/L1Trigger/GlobalTrigger/interface/L1GtMuonCondition.h
index 45176a6986ab9..fb92f638190ec 100644
--- a/L1Trigger/GlobalTrigger/interface/L1GtMuonCondition.h
+++ b/L1Trigger/GlobalTrigger/interface/L1GtMuonCondition.h
@@ -3,15 +3,15 @@
 
 /**
  * \class L1GtMuonCondition
- * 
- * 
+ *
+ *
  * Description: evaluation of a CondMuon condition.
- * 
+ *
  * Implementation:
  *    <TODO: enter implementation details>
- *   
- * \author: Vasile Mihai Ghete   - HEPHY Vienna 
- * 
+ *
+ * \author: Vasile Mihai Ghete   - HEPHY Vienna
+ *
  *
  */
 
@@ -32,98 +32,81 @@ class L1MuGMTCand;
 class L1GlobalTriggerGTL;
 
 // class declaration
-class L1GtMuonCondition : public L1GtConditionEvaluation
-{
+class L1GtMuonCondition : public L1GtConditionEvaluation {
 
 public:
+  /// constructors
+  ///     default
+  L1GtMuonCondition();
 
-    /// constructors
-    ///     default
-    L1GtMuonCondition();
-
-    ///     from base template condition (from event setup usually)
-    L1GtMuonCondition(const L1GtCondition*, const L1GlobalTriggerGTL*,
-            const int nrL1Mu,
-            const int ifMuEtaNumberBits);
+  ///     from base template condition (from event setup usually)
+  L1GtMuonCondition(const L1GtCondition *, const L1GlobalTriggerGTL *,
+                    const int nrL1Mu, const int ifMuEtaNumberBits);
 
-    // copy constructor
-    L1GtMuonCondition(const L1GtMuonCondition&);
+  // copy constructor
+  L1GtMuonCondition(const L1GtMuonCondition &);
 
-    // destructor
-    ~L1GtMuonCondition() override;
+  // destructor
+  ~L1GtMuonCondition() override;
 
-    // assign operator
-    L1GtMuonCondition& operator=(const L1GtMuonCondition&);
+  // assign operator
+  L1GtMuonCondition &operator=(const L1GtMuonCondition &);
 
 public:
+  /// the core function to check if the condition matches
+  const bool evaluateCondition() const override;
 
-    /// the core function to check if the condition matches
-    const bool evaluateCondition() const override;
-
-    /// print condition
-    void print(std::ostream& myCout) const override;
+  /// print condition
+  void print(std::ostream &myCout) const override;
 
 public:
+  ///   get / set the pointer to a L1GtCondition
+  inline const L1GtMuonTemplate *gtMuonTemplate() const {
+    return m_gtMuonTemplate;
+  }
 
-    ///   get / set the pointer to a L1GtCondition
-    inline const L1GtMuonTemplate* gtMuonTemplate() const {
-        return m_gtMuonTemplate;
-    }
-
-    void setGtMuonTemplate(const L1GtMuonTemplate*);
+  void setGtMuonTemplate(const L1GtMuonTemplate *);
 
-    ///   get / set the pointer to GTL
-    inline const L1GlobalTriggerGTL* gtGTL() const {
-        return m_gtGTL;
-    }
+  ///   get / set the pointer to GTL
+  inline const L1GlobalTriggerGTL *gtGTL() const { return m_gtGTL; }
 
-    void setGtGTL(const L1GlobalTriggerGTL*);
+  void setGtGTL(const L1GlobalTriggerGTL *);
 
+  ///   get / set the number of bits for eta of muon objects
+  inline const int gtIfMuEtaNumberBits() const { return m_ifMuEtaNumberBits; }
 
-    ///   get / set the number of bits for eta of muon objects
-    inline const int gtIfMuEtaNumberBits() const {
-        return m_ifMuEtaNumberBits;
-    }
+  void setGtIfMuEtaNumberBits(const int &);
 
-    void setGtIfMuEtaNumberBits(const int&);
-
-
-    ///   get / set maximum number of bins for the delta phi scales
-    inline const int gtCorrParDeltaPhiNrBins() const {
-        return m_corrParDeltaPhiNrBins;
-    }
-
-    void setGtCorrParDeltaPhiNrBins(const int&);
+  ///   get / set maximum number of bins for the delta phi scales
+  inline const int gtCorrParDeltaPhiNrBins() const {
+    return m_corrParDeltaPhiNrBins;
+  }
 
+  void setGtCorrParDeltaPhiNrBins(const int &);
 
 private:
+  /// copy function for copy constructor and operator=
+  void copy(const L1GtMuonCondition &cp);
 
-    /// copy function for copy constructor and operator=
-    void copy(const L1GtMuonCondition& cp);
-
-    /// load muon candidates
-    const L1MuGMTCand* getCandidate(const int indexCand) const;
+  /// load muon candidates
+  const L1MuGMTCand *getCandidate(const int indexCand) const;
 
-    /// function to check a single object if it matches a condition
-    const bool checkObjectParameter(const int iCondition,
-        const L1MuGMTCand& cand) const;
+  /// function to check a single object if it matches a condition
+  const bool checkObjectParameter(const int iCondition,
+                                  const L1MuGMTCand &cand) const;
 
 private:
+  /// pointer to a L1GtMuonTemplate
+  const L1GtMuonTemplate *m_gtMuonTemplate;
 
-    /// pointer to a L1GtMuonTemplate
-    const L1GtMuonTemplate* m_gtMuonTemplate;
-
-    /// pointer to GTL, to be able to get the trigger objects
-    const L1GlobalTriggerGTL* m_gtGTL;
-
-    /// number of bits for eta of muon objects
-    int m_ifMuEtaNumberBits;
-
-    // maximum number of bins for the delta phi scales
-    unsigned int m_corrParDeltaPhiNrBins;
-
+  /// pointer to GTL, to be able to get the trigger objects
+  const L1GlobalTriggerGTL *m_gtGTL;
 
+  /// number of bits for eta of muon objects
+  int m_ifMuEtaNumberBits;
 
+  // maximum number of bins for the delta phi scales
+  unsigned int m_corrParDeltaPhiNrBins;
 };
 
 #endif
diff --git a/L1Trigger/GlobalTrigger/plugins/CompareToObjectMapRecord.cc b/L1Trigger/GlobalTrigger/plugins/CompareToObjectMapRecord.cc
index 0e5ffc8c64b76..59fe90400a3e2 100644
--- a/L1Trigger/GlobalTrigger/plugins/CompareToObjectMapRecord.cc
+++ b/L1Trigger/GlobalTrigger/plugins/CompareToObjectMapRecord.cc
@@ -33,19 +33,17 @@
 #include "FWCore/Utilities/interface/Algorithms.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
+CompareToObjectMapRecord::CompareToObjectMapRecord(
+    const edm::ParameterSet &pset)
+    : m_l1GtObjectMapTag(pset.getParameter<edm::InputTag>("L1GtObjectMapTag")),
+      m_l1GtObjectMapsTag(
+          pset.getParameter<edm::InputTag>("L1GtObjectMapsTag")),
+      verbose_(pset.getUntrackedParameter<bool>("verbose", false)) {}
 
-CompareToObjectMapRecord::CompareToObjectMapRecord(const edm::ParameterSet& pset) :
-  m_l1GtObjectMapTag(pset.getParameter<edm::InputTag>("L1GtObjectMapTag")),
-  m_l1GtObjectMapsTag(pset.getParameter<edm::InputTag>("L1GtObjectMapsTag")),
-  verbose_(pset.getUntrackedParameter<bool>("verbose", false))
-{
-}
-
-CompareToObjectMapRecord::~CompareToObjectMapRecord() {
-}
+CompareToObjectMapRecord::~CompareToObjectMapRecord() {}
 
-void CompareToObjectMapRecord::
-analyze(edm::Event const& event, edm::EventSetup const& es) {
+void CompareToObjectMapRecord::analyze(edm::Event const &event,
+                                       edm::EventSetup const &es) {
 
   // Read in the data in the old format
   edm::Handle<L1GlobalTriggerObjectMapRecord> gtObjectMapRecord;
@@ -57,8 +55,9 @@ analyze(edm::Event const& event, edm::EventSetup const& es) {
 
   // In the new format the names are not in the event data,
   // They are in the ParameterSet registry
-  edm::pset::Registry* psetRegistry = edm::pset::Registry::instance();
-  edm::ParameterSet const* pset = psetRegistry->getMapped(gtObjectMaps->namesParameterSetID());
+  edm::pset::Registry *psetRegistry = edm::pset::Registry::instance();
+  edm::ParameterSet const *pset =
+      psetRegistry->getMapped(gtObjectMaps->namesParameterSetID());
   if (pset == nullptr) {
     cms::Exception ex("L1GlobalTrigger");
     ex << "Could not find L1 trigger names ParameterSet in the registry";
@@ -68,14 +67,17 @@ analyze(edm::Event const& event, edm::EventSetup const& es) {
 
   // First compare the algorithm bit numbers
   std::vector<int> algoBitNumbers1;
-  std::vector<L1GlobalTriggerObjectMap> const& vectorInRecord = gtObjectMapRecord->gtObjectMap();
+  std::vector<L1GlobalTriggerObjectMap> const &vectorInRecord =
+      gtObjectMapRecord->gtObjectMap();
   algoBitNumbers1.reserve(vectorInRecord.size());
-  for (std::vector<L1GlobalTriggerObjectMap>::const_iterator i = vectorInRecord.begin(),
-                                                          iEnd = vectorInRecord.end();
+  for (std::vector<L1GlobalTriggerObjectMap>::const_iterator
+           i = vectorInRecord.begin(),
+           iEnd = vectorInRecord.end();
        i != iEnd; ++i) {
     algoBitNumbers1.push_back(i->algoBitNumber());
     if (verbose_) {
-      // This will print out all the data from the L1GlobalTriggerObjectMapRecord
+      // This will print out all the data from the
+      // L1GlobalTriggerObjectMapRecord
       i->print(std::cout);
     }
   }
@@ -91,13 +93,15 @@ analyze(edm::Event const& event, edm::EventSetup const& es) {
   }
 
   // Now test the algorithm names
-  std::vector<std::string> algoNames2 = pset->getParameter<std::vector<std::string> >("@algorithmNames");
+  std::vector<std::string> algoNames2 =
+      pset->getParameter<std::vector<std::string>>("@algorithmNames");
 
   // In the ParameterSet, the algorithm names are referenced by position
   // in the vector. If the bit number for a position in the vector is
   // not assigned, then the algorithm name should be an empty string.
   for (int i = 0; i < static_cast<int>(algoNames2.size()); ++i) {
-    if (!std::binary_search(algoBitNumbers1.begin(), algoBitNumbers1.end(), i)) {
+    if (!std::binary_search(algoBitNumbers1.begin(), algoBitNumbers1.end(),
+                            i)) {
       if (algoNames2[i] != std::string("")) {
         cms::Exception ex("L1GlobalTrigger");
         ex << "Undefined algorithm should have empty name";
@@ -108,11 +112,13 @@ analyze(edm::Event const& event, edm::EventSetup const& es) {
   }
 
   // Main loop over algorithms
-  for (std::vector<int>::const_iterator iBit = algoBitNumbers1.begin(), endBits = algoBitNumbers1.end();
+  for (std::vector<int>::const_iterator iBit = algoBitNumbers1.begin(),
+                                        endBits = algoBitNumbers1.end();
        iBit != endBits; ++iBit) {
 
-    L1GlobalTriggerObjectMap const* objMap = gtObjectMapRecord->getObjectMap(*iBit);
-    const std::string& algoName1 = objMap->algoName();
+    L1GlobalTriggerObjectMap const *objMap =
+        gtObjectMapRecord->getObjectMap(*iBit);
+    const std::string &algoName1 = objMap->algoName();
 
     if (algoName1 != algoNames2.at(*iBit)) {
       cms::Exception ex("L1GlobalTrigger");
@@ -129,10 +135,11 @@ analyze(edm::Event const& event, edm::EventSetup const& es) {
       throw ex;
     }
 
-    std::vector<L1GtLogicParser::OperandToken> const& operandTokens1 =
-      objMap->operandTokenVector();
+    std::vector<L1GtLogicParser::OperandToken> const &operandTokens1 =
+        objMap->operandTokenVector();
 
-    L1GlobalTriggerObjectMaps::ConditionsInAlgorithm conditions2 = gtObjectMaps->getConditionsInAlgorithm(*iBit);
+    L1GlobalTriggerObjectMaps::ConditionsInAlgorithm conditions2 =
+        gtObjectMaps->getConditionsInAlgorithm(*iBit);
     if (conditions2.nConditions() != operandTokens1.size()) {
       cms::Exception ex("L1GlobalTrigger");
       ex << "Number of conditions does not match";
@@ -141,24 +148,28 @@ analyze(edm::Event const& event, edm::EventSetup const& es) {
     }
 
     std::vector<std::string> conditionNames2;
-    conditionNames2 = pset->getParameter<std::vector<std::string> >(algoNames2.at(*iBit));
+    conditionNames2 =
+        pset->getParameter<std::vector<std::string>>(algoNames2.at(*iBit));
 
     // Print out data from L1GlobalTriggerObjectMaps and ParameterSet registry
     if (verbose_) {
-      std::cout << *iBit
-                << "  " << algoNames2[*iBit]
-                << "  " << gtObjectMaps->algorithmResult(*iBit) << "\n";
-
-      for (unsigned j = 0; j < gtObjectMaps->getNumberOfConditions(*iBit); ++j) {
-        L1GlobalTriggerObjectMaps::ConditionsInAlgorithm conditions = gtObjectMaps->getConditionsInAlgorithm(*iBit);
-        std::cout << "    " << j
-                  << "  " << conditionNames2[j]
-                  << "  " << conditions.getConditionResult(j) << "\n";
-        L1GlobalTriggerObjectMaps::CombinationsInCondition combinations = gtObjectMaps->getCombinationsInCondition(*iBit, j);
+      std::cout << *iBit << "  " << algoNames2[*iBit] << "  "
+                << gtObjectMaps->algorithmResult(*iBit) << "\n";
+
+      for (unsigned j = 0; j < gtObjectMaps->getNumberOfConditions(*iBit);
+           ++j) {
+        L1GlobalTriggerObjectMaps::ConditionsInAlgorithm conditions =
+            gtObjectMaps->getConditionsInAlgorithm(*iBit);
+        std::cout << "    " << j << "  " << conditionNames2[j] << "  "
+                  << conditions.getConditionResult(j) << "\n";
+        L1GlobalTriggerObjectMaps::CombinationsInCondition combinations =
+            gtObjectMaps->getCombinationsInCondition(*iBit, j);
         for (unsigned m = 0; m < combinations.nCombinations(); ++m) {
-          std::cout << "    "; 
+          std::cout << "    ";
           for (unsigned n = 0; n < combinations.nObjectsPerCombination(); ++n) {
-            std::cout << "  " << static_cast<unsigned>(combinations.getObjectIndex(m,n)); 
+            std::cout << "  "
+                      << static_cast<unsigned>(
+                             combinations.getObjectIndex(m, n));
           }
           std::cout << "\n";
         }
@@ -167,10 +178,10 @@ analyze(edm::Event const& event, edm::EventSetup const& es) {
 
     // Loop over conditions
     unsigned iCondition = 0;
-    for (std::vector<L1GtLogicParser::OperandToken>::const_iterator iToken1 = operandTokens1.begin(),
-                                                                 endTokens1 = operandTokens1.end();
-         iToken1 != endTokens1;
-         ++iToken1, ++iCondition) {
+    for (std::vector<L1GtLogicParser::OperandToken>::const_iterator
+             iToken1 = operandTokens1.begin(),
+             endTokens1 = operandTokens1.end();
+         iToken1 != endTokens1; ++iToken1, ++iCondition) {
 
       // Compare condition numbers
       if (iToken1->tokenNumber != static_cast<int>(iCondition)) {
@@ -198,35 +209,38 @@ analyze(edm::Event const& event, edm::EventSetup const& es) {
 
       // Compare the combinations of Indexes into the L1 collections
       L1GlobalTriggerObjectMaps::CombinationsInCondition combinations2 =
-        gtObjectMaps->getCombinationsInCondition(*iBit, iCondition);
+          gtObjectMaps->getCombinationsInCondition(*iBit, iCondition);
 
-      CombinationsInCond const* combinations1 = objMap->getCombinationsInCond(iToken1->tokenNumber);
+      CombinationsInCond const *combinations1 =
+          objMap->getCombinationsInCond(iToken1->tokenNumber);
       if (combinations1->size() != combinations2.nCombinations()) {
         cms::Exception ex("L1GlobalTrigger");
         ex << "The number of combinations in a condition does not match";
         ex.addContext("Calling CompareToObjectMapRecord::analyze");
-        throw ex;        
+        throw ex;
       }
 
       for (CombinationsInCond::const_iterator iCombo = combinations1->begin(),
-                                           endCombos = combinations1->end();
+                                              endCombos = combinations1->end();
            iCombo != endCombos; ++iCombo) {
         if (iCombo->size() != combinations2.nObjectsPerCombination()) {
           cms::Exception ex("L1GlobalTrigger");
           ex << "The number of indexes in a combination does not match";
           ex.addContext("Calling CompareToObjectMapRecord::analyze");
-          throw ex;        
+          throw ex;
         }
 
         for (std::vector<int>::const_iterator iIndex = iCombo->begin(),
-                                          endIndexes = iCombo->end();
+                                              endIndexes = iCombo->end();
              iIndex != endIndexes; ++iIndex) {
 
-          if (*iIndex != combinations2.getObjectIndex(iCombo - combinations1->begin(), iIndex - iCombo->begin())) {
+          if (*iIndex !=
+              combinations2.getObjectIndex(iCombo - combinations1->begin(),
+                                           iIndex - iCombo->begin())) {
             cms::Exception ex("L1GlobalTrigger");
             ex << "Object index does not match";
             ex.addContext("Calling CompareToObjectMapRecord::analyze");
-            throw ex;        
+            throw ex;
           }
         }
       }
diff --git a/L1Trigger/GlobalTrigger/plugins/CompareToObjectMapRecord.h b/L1Trigger/GlobalTrigger/plugins/CompareToObjectMapRecord.h
index 0bd43813936a0..46654209b50a7 100644
--- a/L1Trigger/GlobalTrigger/plugins/CompareToObjectMapRecord.h
+++ b/L1Trigger/GlobalTrigger/plugins/CompareToObjectMapRecord.h
@@ -3,20 +3,20 @@
 
 /**
  * \class CompareToObjectMapRecord
- * 
- * 
+ *
+ *
  * Description:Compares the L1GlobalTriggerObjectMapRecord
  *             to the L1GlobalTriggerObjectMaps object and
  *             also the ParameterSet registry and verifies that
  *             the information is consistent or else it
- *             throws.  
+ *             throws.
  *
  * Implementation:
  *    <TODO: enter implementation details>
- *   
+ *
  * \author: Vasile Mihai Ghete - HEPHY Vienna
  * \author: W. David Dagenhart
- * 
+ *
  *
  */
 
@@ -27,15 +27,15 @@
 class CompareToObjectMapRecord : public edm::EDAnalyzer {
 
 public:
-    explicit CompareToObjectMapRecord(const edm::ParameterSet& pset);
-    ~CompareToObjectMapRecord() override;
+  explicit CompareToObjectMapRecord(const edm::ParameterSet &pset);
+  ~CompareToObjectMapRecord() override;
 
-    void analyze(edm::Event const& event, edm::EventSetup const& es) override;
+  void analyze(edm::Event const &event, edm::EventSetup const &es) override;
 
 private:
-    edm::InputTag m_l1GtObjectMapTag;
-    edm::InputTag m_l1GtObjectMapsTag;
-    bool verbose_;
+  edm::InputTag m_l1GtObjectMapTag;
+  edm::InputTag m_l1GtObjectMapsTag;
+  bool verbose_;
 };
 
 #endif
diff --git a/L1Trigger/GlobalTrigger/plugins/ConvertObjectMapRecord.cc b/L1Trigger/GlobalTrigger/plugins/ConvertObjectMapRecord.cc
index f5d0a37a2566a..9eee8cedc2ffc 100644
--- a/L1Trigger/GlobalTrigger/plugins/ConvertObjectMapRecord.cc
+++ b/L1Trigger/GlobalTrigger/plugins/ConvertObjectMapRecord.cc
@@ -26,22 +26,22 @@
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerObjectMaps.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GtLogicParser.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/Algorithms.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-ConvertObjectMapRecord::ConvertObjectMapRecord(const edm::ParameterSet& pset) :
-  m_l1GtObjectMapToken(consumes<L1GlobalTriggerObjectMapRecord>(pset.getParameter<edm::InputTag>("L1GtObjectMapTag"))) {
+ConvertObjectMapRecord::ConvertObjectMapRecord(const edm::ParameterSet &pset)
+    : m_l1GtObjectMapToken(consumes<L1GlobalTriggerObjectMapRecord>(
+          pset.getParameter<edm::InputTag>("L1GtObjectMapTag"))) {
 
   produces<L1GlobalTriggerObjectMaps>();
 }
 
-ConvertObjectMapRecord::~ConvertObjectMapRecord() {
-}
+ConvertObjectMapRecord::~ConvertObjectMapRecord() {}
 
-void ConvertObjectMapRecord::
-produce(edm::Event& event, const edm::EventSetup& es) {
+void ConvertObjectMapRecord::produce(edm::Event &event,
+                                     const edm::EventSetup &es) {
 
   // Read in the existing object from the data
   edm::Handle<L1GlobalTriggerObjectMapRecord> gtObjectMapRecord;
@@ -52,14 +52,17 @@ produce(edm::Event& event, const edm::EventSetup& es) {
   }
 
   // Create the new object we are going to copy the information to
-  std::unique_ptr<L1GlobalTriggerObjectMaps> gtObjectMaps(new L1GlobalTriggerObjectMaps);
+  std::unique_ptr<L1GlobalTriggerObjectMaps> gtObjectMaps(
+      new L1GlobalTriggerObjectMaps);
 
   // get the algorithm bit numbers and sort them
   std::vector<int> algoBitNumbers;
-  std::vector<L1GlobalTriggerObjectMap> const& vectorInRecord = gtObjectMapRecord->gtObjectMap();
+  std::vector<L1GlobalTriggerObjectMap> const &vectorInRecord =
+      gtObjectMapRecord->gtObjectMap();
   algoBitNumbers.reserve(vectorInRecord.size());
-  for (std::vector<L1GlobalTriggerObjectMap>::const_iterator i = vectorInRecord.begin(),
-                                                          iEnd = vectorInRecord.end();
+  for (std::vector<L1GlobalTriggerObjectMap>::const_iterator
+           i = vectorInRecord.begin(),
+           iEnd = vectorInRecord.end();
        i != iEnd; ++i) {
     algoBitNumbers.push_back(i->algoBitNumber());
   }
@@ -86,9 +89,11 @@ produce(edm::Event& event, const edm::EventSetup& es) {
   unsigned startIndexOfConditions = 0;
   unsigned nIndexes = 0;
 
-  for (std::vector<int>::const_iterator iBit = algoBitNumbers.begin(), endBits = algoBitNumbers.end();
+  for (std::vector<int>::const_iterator iBit = algoBitNumbers.begin(),
+                                        endBits = algoBitNumbers.end();
        iBit != endBits; ++iBit) {
-    L1GlobalTriggerObjectMap const* objMap = gtObjectMapRecord->getObjectMap(*iBit);
+    L1GlobalTriggerObjectMap const *objMap =
+        gtObjectMapRecord->getObjectMap(*iBit);
 
     gtObjectMaps->pushBackAlgorithm(startIndexOfConditions,
                                     objMap->algoBitNumber(),
@@ -96,16 +101,16 @@ produce(edm::Event& event, const edm::EventSetup& es) {
 
     savedNames.at(static_cast<unsigned>(*iBit)) = objMap->algoName();
 
-    std::vector<L1GtLogicParser::OperandToken> const& operandTokens =
-      objMap->operandTokenVector();
+    std::vector<L1GtLogicParser::OperandToken> const &operandTokens =
+        objMap->operandTokenVector();
 
     startIndexOfConditions += operandTokens.size();
 
     int tokenCounter = 0;
-    for (std::vector<L1GtLogicParser::OperandToken>::const_iterator iToken = operandTokens.begin(),
-                                                                 endTokens = operandTokens.end();
-         iToken != endTokens;
-         ++iToken, ++tokenCounter) {
+    for (std::vector<L1GtLogicParser::OperandToken>::const_iterator
+             iToken = operandTokens.begin(),
+             endTokens = operandTokens.end();
+         iToken != endTokens; ++iToken, ++tokenCounter) {
 
       if (tokenCounter != iToken->tokenNumber) {
         cms::Exception ex("L1GlobalTrigger");
@@ -114,12 +119,13 @@ produce(edm::Event& event, const edm::EventSetup& es) {
         throw ex;
       }
 
-      CombinationsInCond const* combos = objMap->getCombinationsInCond(iToken->tokenNumber);
+      CombinationsInCond const *combos =
+          objMap->getCombinationsInCond(iToken->tokenNumber);
       for (CombinationsInCond::const_iterator iCombo = combos->begin(),
-                                           endCombos = combos->end();
+                                              endCombos = combos->end();
            iCombo != endCombos; ++iCombo) {
         for (std::vector<int>::const_iterator iIndex = iCombo->begin(),
-                                          endIndexes = iCombo->end();
+                                              endIndexes = iCombo->end();
              iIndex != endIndexes; ++iIndex) {
           ++nIndexes;
         }
@@ -130,75 +136,82 @@ produce(edm::Event& event, const edm::EventSetup& es) {
   gtObjectMaps->reserveForObjectIndexes(nIndexes);
 
   edm::ParameterSet namesPset;
-  namesPset.addParameter<std::vector<std::string> >(std::string("@algorithmNames"), savedNames);
+  namesPset.addParameter<std::vector<std::string>>(
+      std::string("@algorithmNames"), savedNames);
 
   // Now loop a second time and fill the condition and index
   // information.
   unsigned startIndexOfCombinations = 0;
-  for (std::vector<int>::const_iterator iBit = algoBitNumbers.begin(), endBits = algoBitNumbers.end();
+  for (std::vector<int>::const_iterator iBit = algoBitNumbers.begin(),
+                                        endBits = algoBitNumbers.end();
        iBit != endBits; ++iBit) {
-     L1GlobalTriggerObjectMap const* objMap = gtObjectMapRecord->getObjectMap(*iBit);
-
-     std::vector<L1GtLogicParser::OperandToken> const& operandTokens =
-       objMap->operandTokenVector();
-
-     savedNames.clear();
-     if (savedNames.capacity() < operandTokens.size()) {
-       savedNames.reserve(operandTokens.size());
-     }
-
-     for (std::vector<L1GtLogicParser::OperandToken>::const_iterator iToken = operandTokens.begin(),
-                                                                  endTokens = operandTokens.end();
-          iToken != endTokens; ++iToken) {
-
-       savedNames.push_back(iToken->tokenName);
-
-       unsigned short nObjectsPerCombination = 0;
-       bool first = true;
-       unsigned nIndexesInCombination = 0;
-
-       CombinationsInCond const* combos = objMap->getCombinationsInCond(iToken->tokenNumber);
-       for (CombinationsInCond::const_iterator iCombo = combos->begin(),
-                                            endCombos = combos->end();
-            iCombo != endCombos; ++iCombo) {
-         if (first) {
-           if (iCombo->size() > std::numeric_limits<unsigned short>::max()) {
-             cms::Exception ex("L1GlobalTrigger");
-             ex << "Number of objects per combination out of range";
-             ex.addContext("Calling ConvertObjectMapRecord::produce");
-             throw ex;
-           }
-           nObjectsPerCombination = iCombo->size();
-           first = false;
-         } else {
-           if (nObjectsPerCombination != iCombo->size()) {
-             cms::Exception ex("L1GlobalTrigger");
-             ex << "inconsistent number of objects per condition";
-             ex.addContext("Calling ConvertObjectMapRecord::produce");
-             throw ex;
-           }
-         }
-
-         for (std::vector<int>::const_iterator iIndex = iCombo->begin(),
-                                           endIndexes = iCombo->end();
-              iIndex != endIndexes; ++iIndex) {
-
-           if (*iIndex < 0 || *iIndex > std::numeric_limits<unsigned char>::max()) {
-             cms::Exception ex("L1GlobalTrigger");
-             ex << "object index too large, out of range";
-             ex.addContext("Calling ConvertObjectMapRecord::produce");
-             throw ex;
-           }
-           gtObjectMaps->pushBackObjectIndex(*iIndex);
-           ++nIndexesInCombination;
-         }
-       }
-       gtObjectMaps->pushBackCondition(startIndexOfCombinations,
-                                       nObjectsPerCombination,
-                                       iToken->tokenResult);
-       startIndexOfCombinations += nIndexesInCombination;
-     }
-     namesPset.addParameter<std::vector<std::string> >(objMap->algoName(), savedNames);
+    L1GlobalTriggerObjectMap const *objMap =
+        gtObjectMapRecord->getObjectMap(*iBit);
+
+    std::vector<L1GtLogicParser::OperandToken> const &operandTokens =
+        objMap->operandTokenVector();
+
+    savedNames.clear();
+    if (savedNames.capacity() < operandTokens.size()) {
+      savedNames.reserve(operandTokens.size());
+    }
+
+    for (std::vector<L1GtLogicParser::OperandToken>::const_iterator
+             iToken = operandTokens.begin(),
+             endTokens = operandTokens.end();
+         iToken != endTokens; ++iToken) {
+
+      savedNames.push_back(iToken->tokenName);
+
+      unsigned short nObjectsPerCombination = 0;
+      bool first = true;
+      unsigned nIndexesInCombination = 0;
+
+      CombinationsInCond const *combos =
+          objMap->getCombinationsInCond(iToken->tokenNumber);
+      for (CombinationsInCond::const_iterator iCombo = combos->begin(),
+                                              endCombos = combos->end();
+           iCombo != endCombos; ++iCombo) {
+        if (first) {
+          if (iCombo->size() > std::numeric_limits<unsigned short>::max()) {
+            cms::Exception ex("L1GlobalTrigger");
+            ex << "Number of objects per combination out of range";
+            ex.addContext("Calling ConvertObjectMapRecord::produce");
+            throw ex;
+          }
+          nObjectsPerCombination = iCombo->size();
+          first = false;
+        } else {
+          if (nObjectsPerCombination != iCombo->size()) {
+            cms::Exception ex("L1GlobalTrigger");
+            ex << "inconsistent number of objects per condition";
+            ex.addContext("Calling ConvertObjectMapRecord::produce");
+            throw ex;
+          }
+        }
+
+        for (std::vector<int>::const_iterator iIndex = iCombo->begin(),
+                                              endIndexes = iCombo->end();
+             iIndex != endIndexes; ++iIndex) {
+
+          if (*iIndex < 0 ||
+              *iIndex > std::numeric_limits<unsigned char>::max()) {
+            cms::Exception ex("L1GlobalTrigger");
+            ex << "object index too large, out of range";
+            ex.addContext("Calling ConvertObjectMapRecord::produce");
+            throw ex;
+          }
+          gtObjectMaps->pushBackObjectIndex(*iIndex);
+          ++nIndexesInCombination;
+        }
+      }
+      gtObjectMaps->pushBackCondition(startIndexOfCombinations,
+                                      nObjectsPerCombination,
+                                      iToken->tokenResult);
+      startIndexOfCombinations += nIndexesInCombination;
+    }
+    namesPset.addParameter<std::vector<std::string>>(objMap->algoName(),
+                                                     savedNames);
   }
   namesPset.registerIt();
   gtObjectMaps->setNamesParameterSetID(namesPset.id());
diff --git a/L1Trigger/GlobalTrigger/plugins/ConvertObjectMapRecord.h b/L1Trigger/GlobalTrigger/plugins/ConvertObjectMapRecord.h
index 01680764142fe..d57e554dd9e87 100644
--- a/L1Trigger/GlobalTrigger/plugins/ConvertObjectMapRecord.h
+++ b/L1Trigger/GlobalTrigger/plugins/ConvertObjectMapRecord.h
@@ -3,40 +3,38 @@
 
 /**
  * \class ConvertObjectMapRecord
- * 
- * 
+ *
+ *
  * Description: Reads in the L1GlobalTriggerObjectMapRecord
  *              and copies the information it contains into
  *              a L1GlobalTriggerObjectMaps object and also
  *              puts the names it contains into the ParameterSet
- *              registry.  
+ *              registry.
  *
  * Implementation:
  *    <TODO: enter implementation details>
- *   
+ *
  * \author: Vasile Mihai Ghete - HEPHY Vienna
  * \author: W. David Dagenhart
- * 
+ *
  *
  */
 
-#include "FWCore/Framework/interface/stream/EDProducer.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerObjectMapRecord.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerObjectMapRecord.h"
-
 
 class ConvertObjectMapRecord : public edm::stream::EDProducer<> {
 
 public:
-    explicit ConvertObjectMapRecord(const edm::ParameterSet& pset);
-    ~ConvertObjectMapRecord() override;
+  explicit ConvertObjectMapRecord(const edm::ParameterSet &pset);
+  ~ConvertObjectMapRecord() override;
 
-    void produce(edm::Event& event, const edm::EventSetup& es) override;
+  void produce(edm::Event &event, const edm::EventSetup &es) override;
 
 private:
-    edm::EDGetTokenT<L1GlobalTriggerObjectMapRecord> m_l1GtObjectMapToken;
-
+  edm::EDGetTokenT<L1GlobalTriggerObjectMapRecord> m_l1GtObjectMapToken;
 };
 
 #endif
diff --git a/L1Trigger/GlobalTrigger/plugins/L1GTPrescaler.cc b/L1Trigger/GlobalTrigger/plugins/L1GTPrescaler.cc
index b6c3f164d8717..9f7f5c98d3e52 100644
--- a/L1Trigger/GlobalTrigger/plugins/L1GTPrescaler.cc
+++ b/L1Trigger/GlobalTrigger/plugins/L1GTPrescaler.cc
@@ -1,56 +1,57 @@
-#include <vector>
 #include <array>
-#include <memory>
 #include <cassert>
+#include <memory>
+#include <vector>
 
 template <class T, std::size_t N>
-std::array<T, N> make_array(std::vector<T> const & values) {
+std::array<T, N> make_array(std::vector<T> const &values) {
   assert(N == values.size());
   std::array<T, N> ret;
   std::copy(values.begin(), values.end(), ret.begin());
   return ret;
 }
 
-
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/one/EDFilter.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 class L1GTPrescaler : public edm::one::EDFilter<> {
 public:
-  L1GTPrescaler(edm::ParameterSet const& config);
+  L1GTPrescaler(edm::ParameterSet const &config);
 
-  bool filter(edm::Event& event, edm::EventSetup const& setup) override;
+  bool filter(edm::Event &event, edm::EventSetup const &setup) override;
 
-  static  void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 
 private:
   const edm::EDGetTokenT<L1GlobalTriggerReadoutRecord> m_l1ResultsToken;
   const std::array<double, 128> m_algoPrescales;
-  const std::array<double,  64> m_techPrescales;
+  const std::array<double, 64> m_techPrescales;
   std::array<unsigned int, 128> m_algoCounters;
-  std::array<unsigned int,  64> m_techCounters;
-
+  std::array<unsigned int, 64> m_techCounters;
 };
 
-L1GTPrescaler::L1GTPrescaler(edm::ParameterSet const& config) :
-  m_l1ResultsToken( consumes<L1GlobalTriggerReadoutRecord>(config.getParameter<edm::InputTag>("l1Results")) ),
-  m_algoPrescales( make_array<double, 128>(config.getParameter<std::vector<double>>("l1AlgoPrescales")) ),
-  m_techPrescales( make_array<double,  64>(config.getParameter<std::vector<double>>("l1TechPrescales")) )
-{
+L1GTPrescaler::L1GTPrescaler(edm::ParameterSet const &config)
+    : m_l1ResultsToken(consumes<L1GlobalTriggerReadoutRecord>(
+          config.getParameter<edm::InputTag>("l1Results"))),
+      m_algoPrescales(make_array<double, 128>(
+          config.getParameter<std::vector<double>>("l1AlgoPrescales"))),
+      m_techPrescales(make_array<double, 64>(
+          config.getParameter<std::vector<double>>("l1TechPrescales"))) {
   m_algoCounters.fill(0);
   m_techCounters.fill(0);
   produces<L1GlobalTriggerReadoutRecord>();
 }
 
-bool L1GTPrescaler::filter(edm::Event& event, edm::EventSetup const& setup) {
+bool L1GTPrescaler::filter(edm::Event &event, edm::EventSetup const &setup) {
   edm::Handle<L1GlobalTriggerReadoutRecord> handle;
   event.getByToken(m_l1ResultsToken, handle);
-  auto algoWord = handle->decisionWord();               // make a copy of the L1 algo results
-  auto techWord = handle->technicalTriggerWord();       // make a copy of the L1 tech results
+  auto algoWord = handle->decisionWord(); // make a copy of the L1 algo results
+  auto techWord =
+      handle->technicalTriggerWord(); // make a copy of the L1 tech results
   bool finalOr = false;
 
   for (unsigned int i = 0; i < 128; ++i) {
@@ -84,7 +85,8 @@ bool L1GTPrescaler::filter(edm::Event& event, edm::EventSetup const& setup) {
   }
 
   // make a copy of the L1GlobalTriggerReadoutRecord, and set the new decisions
-  std::unique_ptr<L1GlobalTriggerReadoutRecord> result(new L1GlobalTriggerReadoutRecord(*handle));
+  std::unique_ptr<L1GlobalTriggerReadoutRecord> result(
+      new L1GlobalTriggerReadoutRecord(*handle));
   result->setDecisionWord(algoWord);
   result->setTechnicalTriggerWord(techWord);
   result->setDecision(finalOr);
@@ -93,15 +95,15 @@ bool L1GTPrescaler::filter(edm::Event& event, edm::EventSetup const& setup) {
   return finalOr;
 }
 
-void L1GTPrescaler::fillDescriptions(edm::ConfigurationDescriptions & descriptions) {
+void L1GTPrescaler::fillDescriptions(
+    edm::ConfigurationDescriptions &descriptions) {
   edm::ParameterSetDescription desc;
   desc.add<edm::InputTag>("l1Results", edm::InputTag("gtDigis"));
   desc.add<std::vector<double>>("l1AlgoPrescales", std::vector<double>(128, 1));
-  desc.add<std::vector<double>>("l1TechPrescales", std::vector<double>( 64, 1));
+  desc.add<std::vector<double>>("l1TechPrescales", std::vector<double>(64, 1));
   descriptions.add("l1GTPrescaler", desc);
 }
 
-
 // register as a framework plugin
 #include "FWCore/Framework/interface/MakerMacros.h"
 DEFINE_FWK_MODULE(L1GTPrescaler);
diff --git a/L1Trigger/GlobalTrigger/plugins/L1GlobalTrigger.cc b/L1Trigger/GlobalTrigger/plugins/L1GlobalTrigger.cc
index 8cf200e1fb443..392e36f942292 100644
--- a/L1Trigger/GlobalTrigger/plugins/L1GlobalTrigger.cc
+++ b/L1Trigger/GlobalTrigger/plugins/L1GlobalTrigger.cc
@@ -16,1170 +16,1139 @@
 #include "L1GlobalTrigger.h"
 
 // system include files
-#include <memory>
-#include <iostream>
-#include <iomanip>
 #include <algorithm>
+#include <iomanip>
+#include <iostream>
+#include <memory>
 
 #include <boost/cstdint.hpp>
 
 // user include files
-//#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
+//#include
+//"DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerEvmReadoutRecord.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerObjectMapRecord.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
 
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerObjectMap.h"
 
-#include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTReadoutCollection.h"
 #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTCand.h"
 #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTExtendedCand.h"
+#include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTReadoutCollection.h"
 
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctEmCand.h"
-#include "DataFormats/L1GlobalCaloTrigger/interface/L1GctJetCand.h"
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctEtSums.h"
-#include "DataFormats/L1GlobalCaloTrigger/interface/L1GctJetCounts.h"
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctHFBitCounts.h"
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctHFRingEtSums.h"
+#include "DataFormats/L1GlobalCaloTrigger/interface/L1GctJetCand.h"
+#include "DataFormats/L1GlobalCaloTrigger/interface/L1GctJetCounts.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "CondFormats/L1TObjects/interface/L1GtStableParameters.h"
 #include "CondFormats/DataRecord/interface/L1GtStableParametersRcd.h"
+#include "CondFormats/L1TObjects/interface/L1GtStableParameters.h"
 
-#include "CondFormats/L1TObjects/interface/L1GtParameters.h"
 #include "CondFormats/DataRecord/interface/L1GtParametersRcd.h"
+#include "CondFormats/L1TObjects/interface/L1GtParameters.h"
 
-#include "CondFormats/L1TObjects/interface/L1GtFwd.h"
+#include "CondFormats/DataRecord/interface/L1GtBoardMapsRcd.h"
 #include "CondFormats/L1TObjects/interface/L1GtBoard.h"
 #include "CondFormats/L1TObjects/interface/L1GtBoardMaps.h"
-#include "CondFormats/DataRecord/interface/L1GtBoardMapsRcd.h"
+#include "CondFormats/L1TObjects/interface/L1GtFwd.h"
 
-#include "CondFormats/L1TObjects/interface/L1GtPrescaleFactors.h"
 #include "CondFormats/DataRecord/interface/L1GtPrescaleFactorsAlgoTrigRcd.h"
 #include "CondFormats/DataRecord/interface/L1GtPrescaleFactorsTechTrigRcd.h"
+#include "CondFormats/L1TObjects/interface/L1GtPrescaleFactors.h"
 
-#include "CondFormats/L1TObjects/interface/L1GtTriggerMask.h"
 #include "CondFormats/DataRecord/interface/L1GtTriggerMaskAlgoTrigRcd.h"
 #include "CondFormats/DataRecord/interface/L1GtTriggerMaskTechTrigRcd.h"
+#include "CondFormats/L1TObjects/interface/L1GtTriggerMask.h"
 
 #include "CondFormats/DataRecord/interface/L1GtTriggerMaskVetoAlgoTrigRcd.h"
 #include "CondFormats/DataRecord/interface/L1GtTriggerMaskVetoTechTrigRcd.h"
 
-#include "L1Trigger/GlobalTrigger/interface/L1GlobalTriggerPSB.h"
-#include "L1Trigger/GlobalTrigger/interface/L1GlobalTriggerGTL.h"
 #include "L1Trigger/GlobalTrigger/interface/L1GlobalTriggerFDL.h"
+#include "L1Trigger/GlobalTrigger/interface/L1GlobalTriggerGTL.h"
+#include "L1Trigger/GlobalTrigger/interface/L1GlobalTriggerPSB.h"
 
-#include "DataFormats/L1GlobalTrigger/interface/L1GtfeWord.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GtfeExtWord.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GtfeWord.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1TcsWord.h"
 
 #include "DataFormats/Common/interface/RefProd.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/MessageLogger/interface/MessageDrop.h"
-
-
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 // constructors
 
-L1GlobalTrigger::L1GlobalTrigger(const edm::ParameterSet& parSet) :
-            m_muGmtInputTag(parSet.getParameter<edm::InputTag> ("GmtInputTag")),
-            m_caloGctInputTag(parSet.getParameter<edm::InputTag> ("GctInputTag")),
-            m_castorInputTag(parSet.getParameter<edm::InputTag> ("CastorInputTag")),
-            m_technicalTriggersInputTags(parSet.getParameter<std::vector<edm::InputTag> > (
-                    "TechnicalTriggersInputTags")),
-            m_produceL1GtDaqRecord(parSet.getParameter<bool> ("ProduceL1GtDaqRecord")),
-            m_produceL1GtEvmRecord(parSet.getParameter<bool> ("ProduceL1GtEvmRecord")),
-            m_produceL1GtObjectMapRecord(parSet.getParameter<bool> ("ProduceL1GtObjectMapRecord")),
-            m_writePsbL1GtDaqRecord(parSet.getParameter<bool> ("WritePsbL1GtDaqRecord")),
-            m_readTechnicalTriggerRecords(parSet.getParameter<bool> ("ReadTechnicalTriggerRecords")),
-            m_emulateBxInEvent(parSet.getParameter<int> ("EmulateBxInEvent")),
-            m_recordLength(parSet.getParameter<std::vector<int> > ("RecordLength")),
-            m_alternativeNrBxBoardDaq(parSet.getParameter<unsigned int> ("AlternativeNrBxBoardDaq")),
-            m_alternativeNrBxBoardEvm(parSet.getParameter<unsigned int> ("AlternativeNrBxBoardEvm")),
-            m_psBstLengthBytes(parSet.getParameter<int> ("BstLengthBytes")),
-            m_algorithmTriggersUnprescaled(parSet.getParameter<bool> ("AlgorithmTriggersUnprescaled")),
-            m_algorithmTriggersUnmasked(parSet.getParameter<bool> ("AlgorithmTriggersUnmasked")),
-            m_technicalTriggersUnprescaled(parSet.getParameter<bool> ("TechnicalTriggersUnprescaled")),
-            m_technicalTriggersUnmasked(parSet.getParameter<bool> ("TechnicalTriggersUnmasked")),
-            m_technicalTriggersVetoUnmasked(parSet.getParameter<bool> ("TechnicalTriggersVetoUnmasked")),
-            m_verbosity(parSet.getUntrackedParameter<int>("Verbosity", 0)),
-            m_isDebugEnabled(edm::isDebugEnabled())
-
+L1GlobalTrigger::L1GlobalTrigger(const edm::ParameterSet &parSet)
+    : m_muGmtInputTag(parSet.getParameter<edm::InputTag>("GmtInputTag")),
+      m_caloGctInputTag(parSet.getParameter<edm::InputTag>("GctInputTag")),
+      m_castorInputTag(parSet.getParameter<edm::InputTag>("CastorInputTag")),
+      m_technicalTriggersInputTags(
+          parSet.getParameter<std::vector<edm::InputTag>>(
+              "TechnicalTriggersInputTags")),
+      m_produceL1GtDaqRecord(parSet.getParameter<bool>("ProduceL1GtDaqRecord")),
+      m_produceL1GtEvmRecord(parSet.getParameter<bool>("ProduceL1GtEvmRecord")),
+      m_produceL1GtObjectMapRecord(
+          parSet.getParameter<bool>("ProduceL1GtObjectMapRecord")),
+      m_writePsbL1GtDaqRecord(
+          parSet.getParameter<bool>("WritePsbL1GtDaqRecord")),
+      m_readTechnicalTriggerRecords(
+          parSet.getParameter<bool>("ReadTechnicalTriggerRecords")),
+      m_emulateBxInEvent(parSet.getParameter<int>("EmulateBxInEvent")),
+      m_recordLength(parSet.getParameter<std::vector<int>>("RecordLength")),
+      m_alternativeNrBxBoardDaq(
+          parSet.getParameter<unsigned int>("AlternativeNrBxBoardDaq")),
+      m_alternativeNrBxBoardEvm(
+          parSet.getParameter<unsigned int>("AlternativeNrBxBoardEvm")),
+      m_psBstLengthBytes(parSet.getParameter<int>("BstLengthBytes")),
+      m_algorithmTriggersUnprescaled(
+          parSet.getParameter<bool>("AlgorithmTriggersUnprescaled")),
+      m_algorithmTriggersUnmasked(
+          parSet.getParameter<bool>("AlgorithmTriggersUnmasked")),
+      m_technicalTriggersUnprescaled(
+          parSet.getParameter<bool>("TechnicalTriggersUnprescaled")),
+      m_technicalTriggersUnmasked(
+          parSet.getParameter<bool>("TechnicalTriggersUnmasked")),
+      m_technicalTriggersVetoUnmasked(
+          parSet.getParameter<bool>("TechnicalTriggersVetoUnmasked")),
+      m_verbosity(parSet.getUntrackedParameter<int>("Verbosity", 0)),
+      m_isDebugEnabled(edm::isDebugEnabled())
 
 {
 
-    if (m_verbosity) {
+  if (m_verbosity) {
 
-        LogDebug("L1GlobalTrigger") << std::endl;
+    LogDebug("L1GlobalTrigger") << std::endl;
 
-        LogTrace("L1GlobalTrigger")
-                << "\nInput tag for muon collection from GMT:         " << m_muGmtInputTag
-                << "\nInput tag for calorimeter collections from GCT: " << m_caloGctInputTag
-                << "\nInput tag for CASTOR record:                    " << m_castorInputTag
-                << "\nInput tag for technical triggers:               "
-                << std::endl;
-
-        // loop over all producers of technical trigger records
-        for (std::vector<edm::InputTag>::const_iterator it = m_technicalTriggersInputTags.begin(); it
-                != m_technicalTriggersInputTags.end(); it++) {
-            LogTrace("L1GlobalTrigger") << "\n  " << ( *it ) << std::endl;
-        }
+    LogTrace("L1GlobalTrigger")
+        << "\nInput tag for muon collection from GMT:         "
+        << m_muGmtInputTag
+        << "\nInput tag for calorimeter collections from GCT: "
+        << m_caloGctInputTag
+        << "\nInput tag for CASTOR record:                    "
+        << m_castorInputTag
+        << "\nInput tag for technical triggers:               " << std::endl;
 
-        LogTrace("L1GlobalTrigger")
-                << "\nProduce the L1 GT DAQ readout record:           " << m_produceL1GtDaqRecord
-                << "\nProduce the L1 GT EVM readout record:           " << m_produceL1GtEvmRecord
-                << "\nProduce the L1 GT Object Map record:            " << m_produceL1GtObjectMapRecord
-                << " \n"
-                << "\nWrite Psb content to L1 GT DAQ Record:          " << m_writePsbL1GtDaqRecord
-                << " \n"
-                << "\nRead technical trigger records:                 " << m_readTechnicalTriggerRecords
-                << " \n"
-                << "\nNumber of BxInEvent to be emulated:             " << m_emulateBxInEvent
-                << "\nNumber of BXs corresponding to alternative 0:   " << m_recordLength.at(0)
-                << "\nNumber of BXs corresponding to alternative 1:   " << m_recordLength.at(1)
-                << " \n"
-                << "\nAlternative for number of BX in GT DAQ record:   0x" << std::hex
-                << m_alternativeNrBxBoardDaq
-                << "\nAlternative for number of BX in GT EVM record:   0x" << std::hex
-                << m_alternativeNrBxBoardEvm << std::dec
-                << " \n"
-                << "\nLength of BST message [bytes]:                  " << m_psBstLengthBytes
-                << "\n"
-                << "\nRun algorithm triggers unprescaled:             " << m_algorithmTriggersUnprescaled
-                << "\nRun algorithm triggers unmasked (all enabled):  " << m_algorithmTriggersUnmasked
-                << "\n"
-                << "\nRun technical triggers unprescaled:             " << m_technicalTriggersUnprescaled
-                << "\nRun technical triggers unmasked (all enabled):  " << m_technicalTriggersUnmasked
-                << "\nRun technical triggers veto unmasked (no veto): " << m_technicalTriggersUnmasked
-                << "\n"
-                << std::endl;
+    // loop over all producers of technical trigger records
+    for (std::vector<edm::InputTag>::const_iterator it =
+             m_technicalTriggersInputTags.begin();
+         it != m_technicalTriggersInputTags.end(); it++) {
+      LogTrace("L1GlobalTrigger") << "\n  " << (*it) << std::endl;
     }
 
+    LogTrace("L1GlobalTrigger")
+        << "\nProduce the L1 GT DAQ readout record:           "
+        << m_produceL1GtDaqRecord
+        << "\nProduce the L1 GT EVM readout record:           "
+        << m_produceL1GtEvmRecord
+        << "\nProduce the L1 GT Object Map record:            "
+        << m_produceL1GtObjectMapRecord << " \n"
+        << "\nWrite Psb content to L1 GT DAQ Record:          "
+        << m_writePsbL1GtDaqRecord << " \n"
+        << "\nRead technical trigger records:                 "
+        << m_readTechnicalTriggerRecords << " \n"
+        << "\nNumber of BxInEvent to be emulated:             "
+        << m_emulateBxInEvent
+        << "\nNumber of BXs corresponding to alternative 0:   "
+        << m_recordLength.at(0)
+        << "\nNumber of BXs corresponding to alternative 1:   "
+        << m_recordLength.at(1) << " \n"
+        << "\nAlternative for number of BX in GT DAQ record:   0x" << std::hex
+        << m_alternativeNrBxBoardDaq
+        << "\nAlternative for number of BX in GT EVM record:   0x" << std::hex
+        << m_alternativeNrBxBoardEvm << std::dec << " \n"
+        << "\nLength of BST message [bytes]:                  "
+        << m_psBstLengthBytes << "\n"
+        << "\nRun algorithm triggers unprescaled:             "
+        << m_algorithmTriggersUnprescaled
+        << "\nRun algorithm triggers unmasked (all enabled):  "
+        << m_algorithmTriggersUnmasked << "\n"
+        << "\nRun technical triggers unprescaled:             "
+        << m_technicalTriggersUnprescaled
+        << "\nRun technical triggers unmasked (all enabled):  "
+        << m_technicalTriggersUnmasked
+        << "\nRun technical triggers veto unmasked (no veto): "
+        << m_technicalTriggersUnmasked << "\n"
+        << std::endl;
+  }
 
-    if ( ( m_emulateBxInEvent > 0 ) && ( ( m_emulateBxInEvent % 2 ) == 0 )) {
-        m_emulateBxInEvent = m_emulateBxInEvent - 1;
+  if ((m_emulateBxInEvent > 0) && ((m_emulateBxInEvent % 2) == 0)) {
+    m_emulateBxInEvent = m_emulateBxInEvent - 1;
 
-        if (m_verbosity) {
-            edm::LogWarning("L1GlobalTrigger")
-                    << "\nWARNING: Number of bunch crossing to be emulated rounded to: "
-                    << m_emulateBxInEvent << "\n         The number must be an odd number!\n"
-                    << std::endl;
-        }
+    if (m_verbosity) {
+      edm::LogWarning("L1GlobalTrigger")
+          << "\nWARNING: Number of bunch crossing to be emulated rounded to: "
+          << m_emulateBxInEvent
+          << "\n         The number must be an odd number!\n"
+          << std::endl;
     }
+  }
 
-    int requiredRecordLength = std::max(m_recordLength.at(0), m_recordLength.at(1));
-    if ((m_emulateBxInEvent >= 0) && (m_emulateBxInEvent < requiredRecordLength) ) {
-
-        m_emulateBxInEvent = requiredRecordLength;
+  int requiredRecordLength =
+      std::max(m_recordLength.at(0), m_recordLength.at(1));
+  if ((m_emulateBxInEvent >= 0) &&
+      (m_emulateBxInEvent < requiredRecordLength)) {
 
-        if (m_verbosity) {
-            edm::LogWarning("L1GlobalTrigger")
-                    << "\nWARNING: Number of bunch crossing required to be emulated ( "
-                    << m_emulateBxInEvent << " BX) smaller as required in RecordLength:"
-                    << "\n  Number of BXs corresponding to alternative 0:   " << m_recordLength.at(0)
-                    << "\n  Number of BXs corresponding to alternative 1:   " << m_recordLength.at(1)
-                    << "\nEmulating " << requiredRecordLength << " BX!"
-                    << "\n"
-                    << std::endl;
-        }
+    m_emulateBxInEvent = requiredRecordLength;
 
+    if (m_verbosity) {
+      edm::LogWarning("L1GlobalTrigger")
+          << "\nWARNING: Number of bunch crossing required to be emulated ( "
+          << m_emulateBxInEvent << " BX) smaller as required in RecordLength:"
+          << "\n  Number of BXs corresponding to alternative 0:   "
+          << m_recordLength.at(0)
+          << "\n  Number of BXs corresponding to alternative 1:   "
+          << m_recordLength.at(1) << "\nEmulating " << requiredRecordLength
+          << " BX!"
+          << "\n"
+          << std::endl;
     }
+  }
 
-    // register products
-    if (m_produceL1GtDaqRecord) {
-        produces<L1GlobalTriggerReadoutRecord>();
-    }
+  // register products
+  if (m_produceL1GtDaqRecord) {
+    produces<L1GlobalTriggerReadoutRecord>();
+  }
 
-    if (m_produceL1GtEvmRecord) {
-        produces<L1GlobalTriggerEvmReadoutRecord>();
-    }
+  if (m_produceL1GtEvmRecord) {
+    produces<L1GlobalTriggerEvmReadoutRecord>();
+  }
 
-    if (m_produceL1GtObjectMapRecord) {
-        produces<L1GlobalTriggerObjectMapRecord>();
-    }
+  if (m_produceL1GtObjectMapRecord) {
+    produces<L1GlobalTriggerObjectMapRecord>();
+  }
 
-    // create new PSBs
-    m_gtPSB = new L1GlobalTriggerPSB(m_caloGctInputTag,m_technicalTriggersInputTags,consumesCollector());
-    m_gtPSB->setVerbosity(m_verbosity);
+  // create new PSBs
+  m_gtPSB = new L1GlobalTriggerPSB(
+      m_caloGctInputTag, m_technicalTriggersInputTags, consumesCollector());
+  m_gtPSB->setVerbosity(m_verbosity);
 
-    // create new GTL
-    m_gtGTL = new L1GlobalTriggerGTL(m_muGmtInputTag,consumesCollector());
-    m_gtGTL->setVerbosity(m_verbosity);
+  // create new GTL
+  m_gtGTL = new L1GlobalTriggerGTL(m_muGmtInputTag, consumesCollector());
+  m_gtGTL->setVerbosity(m_verbosity);
 
-    // create new FDL
-    m_gtFDL = new L1GlobalTriggerFDL();
-    m_gtFDL->setVerbosity(m_verbosity);
+  // create new FDL
+  m_gtFDL = new L1GlobalTriggerFDL();
+  m_gtFDL->setVerbosity(m_verbosity);
 
-    // initialize cached IDs
+  // initialize cached IDs
 
-    //
-    m_l1GtStableParCacheID = 0ULL;
+  //
+  m_l1GtStableParCacheID = 0ULL;
 
-    m_numberPhysTriggers = 0;
-    m_numberTechnicalTriggers = 0;
-    m_numberDaqPartitions = 0;
+  m_numberPhysTriggers = 0;
+  m_numberTechnicalTriggers = 0;
+  m_numberDaqPartitions = 0;
 
-    m_nrL1Mu = 0;
+  m_nrL1Mu = 0;
 
-    m_nrL1NoIsoEG = 0;
-    m_nrL1IsoEG = 0;
+  m_nrL1NoIsoEG = 0;
+  m_nrL1IsoEG = 0;
 
-    m_nrL1CenJet = 0;
-    m_nrL1ForJet = 0;
-    m_nrL1TauJet = 0;
+  m_nrL1CenJet = 0;
+  m_nrL1ForJet = 0;
+  m_nrL1TauJet = 0;
 
-    m_nrL1JetCounts = 0;
+  m_nrL1JetCounts = 0;
 
-    m_ifMuEtaNumberBits = 0;
-    m_ifCaloEtaNumberBits = 0;
+  m_ifMuEtaNumberBits = 0;
+  m_ifCaloEtaNumberBits = 0;
 
-    //
-    m_l1GtParCacheID = 0ULL;
+  //
+  m_l1GtParCacheID = 0ULL;
 
-    m_totalBxInEvent = 0;
+  m_totalBxInEvent = 0;
 
-    m_activeBoardsGtDaq = 0;
-    m_activeBoardsGtEvm = 0;
-    m_bstLengthBytes = 0;
+  m_activeBoardsGtDaq = 0;
+  m_activeBoardsGtEvm = 0;
+  m_bstLengthBytes = 0;
 
-    //
-    m_l1GtBMCacheID = 0ULL;
+  //
+  m_l1GtBMCacheID = 0ULL;
 
-    //
-    m_l1GtPfAlgoCacheID = 0ULL;
-    m_l1GtPfTechCacheID = 0ULL;
+  //
+  m_l1GtPfAlgoCacheID = 0ULL;
+  m_l1GtPfTechCacheID = 0ULL;
 
-    m_l1GtTmAlgoCacheID = 0ULL;
-    m_l1GtTmTechCacheID = 0ULL;
+  m_l1GtTmAlgoCacheID = 0ULL;
+  m_l1GtTmTechCacheID = 0ULL;
 
-    m_l1GtTmVetoAlgoCacheID = 0ULL;
-    m_l1GtTmVetoTechCacheID = 0ULL;
+  m_l1GtTmVetoAlgoCacheID = 0ULL;
+  m_l1GtTmVetoTechCacheID = 0ULL;
 
-    consumes<L1MuGMTReadoutCollection>(m_muGmtInputTag);
+  consumes<L1MuGMTReadoutCollection>(m_muGmtInputTag);
 }
 
 // destructor
-L1GlobalTrigger::~L1GlobalTrigger()
-{
+L1GlobalTrigger::~L1GlobalTrigger() {
 
-    delete m_gtPSB;
-    delete m_gtGTL;
-    delete m_gtFDL;
+  delete m_gtPSB;
+  delete m_gtGTL;
+  delete m_gtFDL;
 }
 
 // member functions
 
 // method called to produce the data
-void L1GlobalTrigger::produce(edm::Event& iEvent, const edm::EventSetup& evSetup)
-{
-
-    // process event iEvent
+void L1GlobalTrigger::produce(edm::Event &iEvent,
+                              const edm::EventSetup &evSetup) {
 
-	// get / update the stable parameters from the EventSetup
-    // local cache & check on cacheIdentifier
+  // process event iEvent
 
-    unsigned long long l1GtStableParCacheID =
-            evSetup.get<L1GtStableParametersRcd>().cacheIdentifier();
+  // get / update the stable parameters from the EventSetup
+  // local cache & check on cacheIdentifier
 
-    if (m_l1GtStableParCacheID != l1GtStableParCacheID) {
+  unsigned long long l1GtStableParCacheID =
+      evSetup.get<L1GtStableParametersRcd>().cacheIdentifier();
 
-        edm::ESHandle< L1GtStableParameters > l1GtStablePar;
-        evSetup.get< L1GtStableParametersRcd >().get( l1GtStablePar );
-        m_l1GtStablePar = l1GtStablePar.product();
+  if (m_l1GtStableParCacheID != l1GtStableParCacheID) {
 
-        // number of physics triggers
-        m_numberPhysTriggers = m_l1GtStablePar->gtNumberPhysTriggers();
+    edm::ESHandle<L1GtStableParameters> l1GtStablePar;
+    evSetup.get<L1GtStableParametersRcd>().get(l1GtStablePar);
+    m_l1GtStablePar = l1GtStablePar.product();
 
-        // number of technical triggers
-        m_numberTechnicalTriggers = m_l1GtStablePar->gtNumberTechnicalTriggers();
+    // number of physics triggers
+    m_numberPhysTriggers = m_l1GtStablePar->gtNumberPhysTriggers();
 
-        // number of DAQ partitions
-        m_numberDaqPartitions = 8; // FIXME add it to stable parameters
+    // number of technical triggers
+    m_numberTechnicalTriggers = m_l1GtStablePar->gtNumberTechnicalTriggers();
 
-        // number of objects of each type
-        m_nrL1Mu = static_cast<int> (m_l1GtStablePar->gtNumberL1Mu());
+    // number of DAQ partitions
+    m_numberDaqPartitions = 8; // FIXME add it to stable parameters
 
-        m_nrL1NoIsoEG = static_cast<int> (m_l1GtStablePar->gtNumberL1NoIsoEG());
-        m_nrL1IsoEG = static_cast<int> (m_l1GtStablePar->gtNumberL1IsoEG());
+    // number of objects of each type
+    m_nrL1Mu = static_cast<int>(m_l1GtStablePar->gtNumberL1Mu());
 
-        m_nrL1CenJet = static_cast<int> (m_l1GtStablePar->gtNumberL1CenJet());
-        m_nrL1ForJet = static_cast<int> (m_l1GtStablePar->gtNumberL1ForJet());
-        m_nrL1TauJet = static_cast<int> (m_l1GtStablePar->gtNumberL1TauJet());
+    m_nrL1NoIsoEG = static_cast<int>(m_l1GtStablePar->gtNumberL1NoIsoEG());
+    m_nrL1IsoEG = static_cast<int>(m_l1GtStablePar->gtNumberL1IsoEG());
 
-        m_nrL1JetCounts = static_cast<int> (m_l1GtStablePar->gtNumberL1JetCounts());
+    m_nrL1CenJet = static_cast<int>(m_l1GtStablePar->gtNumberL1CenJet());
+    m_nrL1ForJet = static_cast<int>(m_l1GtStablePar->gtNumberL1ForJet());
+    m_nrL1TauJet = static_cast<int>(m_l1GtStablePar->gtNumberL1TauJet());
 
-        // ... the rest of the objects are global
+    m_nrL1JetCounts = static_cast<int>(m_l1GtStablePar->gtNumberL1JetCounts());
 
-        m_ifMuEtaNumberBits = static_cast<int> (m_l1GtStablePar->gtIfMuEtaNumberBits());
-        m_ifCaloEtaNumberBits = static_cast<int> (m_l1GtStablePar->gtIfCaloEtaNumberBits());
+    // ... the rest of the objects are global
 
-        // (re)initialize L1GlobalTriggerGTL
-        m_gtGTL->init(m_nrL1Mu, m_numberPhysTriggers);
+    m_ifMuEtaNumberBits =
+        static_cast<int>(m_l1GtStablePar->gtIfMuEtaNumberBits());
+    m_ifCaloEtaNumberBits =
+        static_cast<int>(m_l1GtStablePar->gtIfCaloEtaNumberBits());
 
-        // (re)initialize L1GlobalTriggerPSB
-        m_gtPSB->init(m_nrL1NoIsoEG, m_nrL1IsoEG,
-                m_nrL1CenJet, m_nrL1ForJet, m_nrL1TauJet,
-                m_numberTechnicalTriggers);
+    // (re)initialize L1GlobalTriggerGTL
+    m_gtGTL->init(m_nrL1Mu, m_numberPhysTriggers);
 
-        //
-        m_l1GtStableParCacheID = l1GtStableParCacheID;
-
-    }
+    // (re)initialize L1GlobalTriggerPSB
+    m_gtPSB->init(m_nrL1NoIsoEG, m_nrL1IsoEG, m_nrL1CenJet, m_nrL1ForJet,
+                  m_nrL1TauJet, m_numberTechnicalTriggers);
 
-    // get / update the parameters from the EventSetup
-    // local cache & check on cacheIdentifier
+    //
+    m_l1GtStableParCacheID = l1GtStableParCacheID;
+  }
 
-    unsigned long long l1GtParCacheID = evSetup.get<L1GtParametersRcd>().cacheIdentifier();
+  // get / update the parameters from the EventSetup
+  // local cache & check on cacheIdentifier
 
-    if (m_l1GtParCacheID != l1GtParCacheID) {
+  unsigned long long l1GtParCacheID =
+      evSetup.get<L1GtParametersRcd>().cacheIdentifier();
 
-        edm::ESHandle< L1GtParameters > l1GtPar;
-        evSetup.get< L1GtParametersRcd >().get( l1GtPar );
-        m_l1GtPar = l1GtPar.product();
+  if (m_l1GtParCacheID != l1GtParCacheID) {
 
-        //    total number of Bx's in the event coming from EventSetup
-        m_totalBxInEvent = m_l1GtPar->gtTotalBxInEvent();
+    edm::ESHandle<L1GtParameters> l1GtPar;
+    evSetup.get<L1GtParametersRcd>().get(l1GtPar);
+    m_l1GtPar = l1GtPar.product();
 
-        //    active boards in L1 GT DAQ record and in L1 GT EVM record
-        m_activeBoardsGtDaq = m_l1GtPar->gtDaqActiveBoards();
-        m_activeBoardsGtEvm = m_l1GtPar->gtEvmActiveBoards();
+    //    total number of Bx's in the event coming from EventSetup
+    m_totalBxInEvent = m_l1GtPar->gtTotalBxInEvent();
 
-        ///   length of BST message (in bytes) for L1 GT EVM record
-        m_bstLengthBytes = m_l1GtPar->gtBstLengthBytes();
+    //    active boards in L1 GT DAQ record and in L1 GT EVM record
+    m_activeBoardsGtDaq = m_l1GtPar->gtDaqActiveBoards();
+    m_activeBoardsGtEvm = m_l1GtPar->gtEvmActiveBoards();
 
+    ///   length of BST message (in bytes) for L1 GT EVM record
+    m_bstLengthBytes = m_l1GtPar->gtBstLengthBytes();
 
-        m_l1GtParCacheID = l1GtParCacheID;
+    m_l1GtParCacheID = l1GtParCacheID;
+  }
 
-    }
+  // negative value: emulate TotalBxInEvent as given in EventSetup
+  if (m_emulateBxInEvent < 0) {
+    m_emulateBxInEvent = m_totalBxInEvent;
+  }
 
-    // negative value: emulate TotalBxInEvent as given in EventSetup
-    if (m_emulateBxInEvent < 0) {
-        m_emulateBxInEvent = m_totalBxInEvent;
-    }
+  int minBxInEvent = (m_emulateBxInEvent + 1) / 2 - m_emulateBxInEvent;
+  int maxBxInEvent = (m_emulateBxInEvent + 1) / 2 - 1;
 
-    int minBxInEvent = (m_emulateBxInEvent + 1)/2 - m_emulateBxInEvent;
-    int maxBxInEvent = (m_emulateBxInEvent + 1)/2 - 1;
+  int recordLength0 = m_recordLength.at(0);
+  int recordLength1 = m_recordLength.at(1);
 
-    int recordLength0 = m_recordLength.at(0);
-    int recordLength1 = m_recordLength.at(1);
+  if ((recordLength0 < 0) || (recordLength1 < 0)) {
 
-    if ((recordLength0 < 0) || (recordLength1 < 0) ) {
+    // take them from event setup
+    // FIXME implement later - temporary solution
 
-        // take them from event setup
-        // FIXME implement later - temporary solution
+    recordLength0 = m_emulateBxInEvent;
+    recordLength1 = m_emulateBxInEvent;
+  }
 
-        recordLength0 = m_emulateBxInEvent;
-        recordLength1 = m_emulateBxInEvent;
+  if (m_verbosity) {
 
-    }
+    LogDebug("L1GlobalTrigger")
+        << "\nTotal number of BX to emulate in the GT readout record: "
+        << m_emulateBxInEvent << " = "
+        << "[" << minBxInEvent << ", " << maxBxInEvent << "] BX\n"
+        << "\nNumber of BX for alternative 0:  " << recordLength0
+        << "\nNumber of BX for alternative 1:  " << recordLength1
+        << "\nActive boards in L1 GT DAQ record (hex format) = " << std::hex
+        << std::setw(sizeof(m_activeBoardsGtDaq) * 2) << std::setfill('0')
+        << m_activeBoardsGtDaq << std::dec << std::setfill(' ')
+        << "\nActive boards in L1 GT EVM record (hex format) = " << std::hex
+        << std::setw(sizeof(m_activeBoardsGtEvm) * 2) << std::setfill('0')
+        << m_activeBoardsGtEvm << std::dec << std::setfill(' ') << "\n"
+        << std::endl;
+  }
 
+  // get / update the board maps from the EventSetup
+  // local cache & check on cacheIdentifier
 
+  typedef std::vector<L1GtBoard>::const_iterator CItBoardMaps;
 
-    if (m_verbosity) {
+  unsigned long long l1GtBMCacheID =
+      evSetup.get<L1GtBoardMapsRcd>().cacheIdentifier();
 
-        LogDebug("L1GlobalTrigger")
-                << "\nTotal number of BX to emulate in the GT readout record: "
-                << m_emulateBxInEvent << " = " << "[" << minBxInEvent << ", " << maxBxInEvent
-                << "] BX\n"
-                << "\nNumber of BX for alternative 0:  " << recordLength0
-                << "\nNumber of BX for alternative 1:  " << recordLength1
-                << "\nActive boards in L1 GT DAQ record (hex format) = " << std::hex
-                << std::setw(sizeof(m_activeBoardsGtDaq) * 2) << std::setfill('0')
-                << m_activeBoardsGtDaq << std::dec << std::setfill(' ')
-                << "\nActive boards in L1 GT EVM record (hex format) = " << std::hex
-                << std::setw(sizeof(m_activeBoardsGtEvm) * 2) << std::setfill('0')
-                << m_activeBoardsGtEvm << std::dec << std::setfill(' ') << "\n"
-                << std::endl;
-    }
+  if (m_l1GtBMCacheID != l1GtBMCacheID) {
 
-    // get / update the board maps from the EventSetup
-    // local cache & check on cacheIdentifier
+    edm::ESHandle<L1GtBoardMaps> l1GtBM;
+    evSetup.get<L1GtBoardMapsRcd>().get(l1GtBM);
+    m_l1GtBM = l1GtBM.product();
 
-    typedef std::vector<L1GtBoard>::const_iterator CItBoardMaps;
+    m_l1GtBMCacheID = l1GtBMCacheID;
+  }
 
-    unsigned long long l1GtBMCacheID = evSetup.get<L1GtBoardMapsRcd>().cacheIdentifier();
+  // TODO need changes in CondFormats to cache the maps
+  const std::vector<L1GtBoard> &boardMaps = m_l1GtBM->gtBoardMaps();
 
-    if (m_l1GtBMCacheID != l1GtBMCacheID) {
+  // get / update the prescale factors from the EventSetup
+  // local cache & check on cacheIdentifier
 
-        edm::ESHandle< L1GtBoardMaps > l1GtBM;
-        evSetup.get< L1GtBoardMapsRcd >().get( l1GtBM );
-        m_l1GtBM = l1GtBM.product();
+  unsigned long long l1GtPfAlgoCacheID =
+      evSetup.get<L1GtPrescaleFactorsAlgoTrigRcd>().cacheIdentifier();
 
-        m_l1GtBMCacheID = l1GtBMCacheID;
+  if (m_l1GtPfAlgoCacheID != l1GtPfAlgoCacheID) {
 
-    }
+    edm::ESHandle<L1GtPrescaleFactors> l1GtPfAlgo;
+    evSetup.get<L1GtPrescaleFactorsAlgoTrigRcd>().get(l1GtPfAlgo);
+    m_l1GtPfAlgo = l1GtPfAlgo.product();
 
-    // TODO need changes in CondFormats to cache the maps
-    const std::vector<L1GtBoard>& boardMaps = m_l1GtBM->gtBoardMaps();
+    m_prescaleFactorsAlgoTrig = &(m_l1GtPfAlgo->gtPrescaleFactors());
 
-    // get / update the prescale factors from the EventSetup
-    // local cache & check on cacheIdentifier
+    m_l1GtPfAlgoCacheID = l1GtPfAlgoCacheID;
+  }
 
-    unsigned long long l1GtPfAlgoCacheID =
-        evSetup.get<L1GtPrescaleFactorsAlgoTrigRcd>().cacheIdentifier();
+  unsigned long long l1GtPfTechCacheID =
+      evSetup.get<L1GtPrescaleFactorsTechTrigRcd>().cacheIdentifier();
 
-    if (m_l1GtPfAlgoCacheID != l1GtPfAlgoCacheID) {
+  if (m_l1GtPfTechCacheID != l1GtPfTechCacheID) {
 
-        edm::ESHandle< L1GtPrescaleFactors > l1GtPfAlgo;
-        evSetup.get< L1GtPrescaleFactorsAlgoTrigRcd >().get( l1GtPfAlgo );
-        m_l1GtPfAlgo = l1GtPfAlgo.product();
+    edm::ESHandle<L1GtPrescaleFactors> l1GtPfTech;
+    evSetup.get<L1GtPrescaleFactorsTechTrigRcd>().get(l1GtPfTech);
+    m_l1GtPfTech = l1GtPfTech.product();
 
-        m_prescaleFactorsAlgoTrig = &(m_l1GtPfAlgo->gtPrescaleFactors());
+    m_prescaleFactorsTechTrig = &(m_l1GtPfTech->gtPrescaleFactors());
 
-        m_l1GtPfAlgoCacheID = l1GtPfAlgoCacheID;
+    m_l1GtPfTechCacheID = l1GtPfTechCacheID;
+  }
 
-    }
+  // get / update the trigger mask from the EventSetup
+  // local cache & check on cacheIdentifier
 
-    unsigned long long l1GtPfTechCacheID =
-        evSetup.get<L1GtPrescaleFactorsTechTrigRcd>().cacheIdentifier();
+  unsigned long long l1GtTmAlgoCacheID =
+      evSetup.get<L1GtTriggerMaskAlgoTrigRcd>().cacheIdentifier();
 
-    if (m_l1GtPfTechCacheID != l1GtPfTechCacheID) {
+  if (m_l1GtTmAlgoCacheID != l1GtTmAlgoCacheID) {
 
-        edm::ESHandle< L1GtPrescaleFactors > l1GtPfTech;
-        evSetup.get< L1GtPrescaleFactorsTechTrigRcd >().get( l1GtPfTech );
-        m_l1GtPfTech = l1GtPfTech.product();
+    edm::ESHandle<L1GtTriggerMask> l1GtTmAlgo;
+    evSetup.get<L1GtTriggerMaskAlgoTrigRcd>().get(l1GtTmAlgo);
+    m_l1GtTmAlgo = l1GtTmAlgo.product();
 
-        m_prescaleFactorsTechTrig = &(m_l1GtPfTech->gtPrescaleFactors());
+    m_triggerMaskAlgoTrig = m_l1GtTmAlgo->gtTriggerMask();
 
-        m_l1GtPfTechCacheID = l1GtPfTechCacheID;
+    m_l1GtTmAlgoCacheID = l1GtTmAlgoCacheID;
+  }
 
-    }
+  unsigned long long l1GtTmTechCacheID =
+      evSetup.get<L1GtTriggerMaskTechTrigRcd>().cacheIdentifier();
 
+  if (m_l1GtTmTechCacheID != l1GtTmTechCacheID) {
 
-    // get / update the trigger mask from the EventSetup
-    // local cache & check on cacheIdentifier
+    edm::ESHandle<L1GtTriggerMask> l1GtTmTech;
+    evSetup.get<L1GtTriggerMaskTechTrigRcd>().get(l1GtTmTech);
+    m_l1GtTmTech = l1GtTmTech.product();
 
-    unsigned long long l1GtTmAlgoCacheID =
-        evSetup.get<L1GtTriggerMaskAlgoTrigRcd>().cacheIdentifier();
+    m_triggerMaskTechTrig = m_l1GtTmTech->gtTriggerMask();
 
-    if (m_l1GtTmAlgoCacheID != l1GtTmAlgoCacheID) {
+    m_l1GtTmTechCacheID = l1GtTmTechCacheID;
+  }
 
-        edm::ESHandle< L1GtTriggerMask > l1GtTmAlgo;
-        evSetup.get< L1GtTriggerMaskAlgoTrigRcd >().get( l1GtTmAlgo );
-        m_l1GtTmAlgo = l1GtTmAlgo.product();
+  unsigned long long l1GtTmVetoAlgoCacheID =
+      evSetup.get<L1GtTriggerMaskVetoAlgoTrigRcd>().cacheIdentifier();
 
-        m_triggerMaskAlgoTrig = m_l1GtTmAlgo->gtTriggerMask();
+  if (m_l1GtTmVetoAlgoCacheID != l1GtTmVetoAlgoCacheID) {
 
-        m_l1GtTmAlgoCacheID = l1GtTmAlgoCacheID;
+    edm::ESHandle<L1GtTriggerMask> l1GtTmVetoAlgo;
+    evSetup.get<L1GtTriggerMaskVetoAlgoTrigRcd>().get(l1GtTmVetoAlgo);
+    m_l1GtTmVetoAlgo = l1GtTmVetoAlgo.product();
 
-    }
+    m_triggerMaskVetoAlgoTrig = m_l1GtTmVetoAlgo->gtTriggerMask();
 
+    m_l1GtTmVetoAlgoCacheID = l1GtTmVetoAlgoCacheID;
+  }
 
-    unsigned long long l1GtTmTechCacheID =
-        evSetup.get<L1GtTriggerMaskTechTrigRcd>().cacheIdentifier();
+  unsigned long long l1GtTmVetoTechCacheID =
+      evSetup.get<L1GtTriggerMaskVetoTechTrigRcd>().cacheIdentifier();
 
-    if (m_l1GtTmTechCacheID != l1GtTmTechCacheID) {
+  if (m_l1GtTmVetoTechCacheID != l1GtTmVetoTechCacheID) {
 
-        edm::ESHandle< L1GtTriggerMask > l1GtTmTech;
-        evSetup.get< L1GtTriggerMaskTechTrigRcd >().get( l1GtTmTech );
-        m_l1GtTmTech = l1GtTmTech.product();
+    edm::ESHandle<L1GtTriggerMask> l1GtTmVetoTech;
+    evSetup.get<L1GtTriggerMaskVetoTechTrigRcd>().get(l1GtTmVetoTech);
+    m_l1GtTmVetoTech = l1GtTmVetoTech.product();
 
-        m_triggerMaskTechTrig = m_l1GtTmTech->gtTriggerMask();
+    m_triggerMaskVetoTechTrig = m_l1GtTmVetoTech->gtTriggerMask();
 
-        m_l1GtTmTechCacheID = l1GtTmTechCacheID;
+    m_l1GtTmVetoTechCacheID = l1GtTmVetoTechCacheID;
+  }
 
-    }
+  // loop over blocks in the GT DAQ record receiving data, count them if they
+  // are active all board type are defined in CondFormats/L1TObjects/L1GtFwd
+  // enum L1GtBoardType { GTFE, FDL, PSB, GMT, TCS, TIM };
+  // &
+  // set the active flag for each object type received from GMT and GCT
+  // all objects in the GT system are defined in enum L1GtObject from
+  // DataFormats/L1Trigger/L1GlobalTriggerReadoutSetupFwd
 
-    unsigned long long l1GtTmVetoAlgoCacheID =
-        evSetup.get<L1GtTriggerMaskVetoAlgoTrigRcd>().cacheIdentifier();
+  int daqNrGtfeBoards = 0;
 
-    if (m_l1GtTmVetoAlgoCacheID != l1GtTmVetoAlgoCacheID) {
+  int daqNrFdlBoards = 0;
+  int daqNrPsbBoards = 0;
+  int daqNrGmtBoards = 0;
+  int daqNrTcsBoards = 0;
+  int daqNrTimBoards = 0;
 
-        edm::ESHandle< L1GtTriggerMask > l1GtTmVetoAlgo;
-        evSetup.get< L1GtTriggerMaskVetoAlgoTrigRcd >().get( l1GtTmVetoAlgo );
-        m_l1GtTmVetoAlgo = l1GtTmVetoAlgo.product();
+  //
+  bool receiveMu = false;
+  bool receiveNoIsoEG = false;
+  bool receiveIsoEG = false;
+  bool receiveCenJet = false;
+  bool receiveForJet = false;
+  bool receiveTauJet = false;
+  bool receiveETM = false;
+  bool receiveETT = false;
+  bool receiveHTT = false;
+  bool receiveHTM = false;
+  bool receiveJetCounts = false;
+  bool receiveHfBitCounts = false;
+  bool receiveHfRingEtSums = false;
 
-        m_triggerMaskVetoAlgoTrig = m_l1GtTmVetoAlgo->gtTriggerMask();
+  bool receiveExternal = false;
 
-        m_l1GtTmVetoAlgoCacheID = l1GtTmVetoAlgoCacheID;
+  bool receiveTechTr = false;
 
-    }
+  for (CItBoardMaps itBoard = boardMaps.begin(); itBoard != boardMaps.end();
+       ++itBoard) {
 
+    int iPosition = itBoard->gtPositionDaqRecord();
+    if (iPosition > 0) {
 
-    unsigned long long l1GtTmVetoTechCacheID =
-        evSetup.get<L1GtTriggerMaskVetoTechTrigRcd>().cacheIdentifier();
+      int iActiveBit = itBoard->gtBitDaqActiveBoards();
+      bool activeBoard = false;
 
-    if (m_l1GtTmVetoTechCacheID != l1GtTmVetoTechCacheID) {
+      if (iActiveBit >= 0) {
+        activeBoard = m_activeBoardsGtDaq & (1 << iActiveBit);
+      }
 
-        edm::ESHandle< L1GtTriggerMask > l1GtTmVetoTech;
-        evSetup.get< L1GtTriggerMaskVetoTechTrigRcd >().get( l1GtTmVetoTech );
-        m_l1GtTmVetoTech = l1GtTmVetoTech.product();
+      // use board if: in the record, but not in ActiveBoardsMap (iActiveBit <
+      // 0)
+      //               in the record and ActiveBoardsMap, and active
+      if ((iActiveBit < 0) || activeBoard) {
 
-        m_triggerMaskVetoTechTrig = m_l1GtTmVetoTech->gtTriggerMask();
+        switch (itBoard->gtBoardType()) {
 
-        m_l1GtTmVetoTechCacheID = l1GtTmVetoTechCacheID;
+        case GTFE: {
+          daqNrGtfeBoards++;
+        }
 
-    }
+        break;
+        case FDL: {
+          daqNrFdlBoards++;
+        }
 
-    // loop over blocks in the GT DAQ record receiving data, count them if they are active
-    // all board type are defined in CondFormats/L1TObjects/L1GtFwd
-    // enum L1GtBoardType { GTFE, FDL, PSB, GMT, TCS, TIM };
-    // &
-    // set the active flag for each object type received from GMT and GCT
-    // all objects in the GT system are defined in enum L1GtObject from
-    // DataFormats/L1Trigger/L1GlobalTriggerReadoutSetupFwd
+        break;
+        case PSB: {
+          daqNrPsbBoards++;
 
-    int daqNrGtfeBoards = 0;
+          // get the objects coming to this PSB
+          std::vector<L1GtPsbQuad> quadInPsb = itBoard->gtQuadInPsb();
+          for (std::vector<L1GtPsbQuad>::const_iterator itQuad =
+                   quadInPsb.begin();
+               itQuad != quadInPsb.end(); ++itQuad) {
 
-    int daqNrFdlBoards = 0;
-    int daqNrPsbBoards = 0;
-    int daqNrGmtBoards = 0;
-    int daqNrTcsBoards = 0;
-    int daqNrTimBoards = 0;
+            switch (*itQuad) {
 
-    //
-    bool receiveMu = false;
-    bool receiveNoIsoEG = false;
-    bool receiveIsoEG = false;
-    bool receiveCenJet = false;
-    bool receiveForJet = false;
-    bool receiveTauJet = false;
-    bool receiveETM = false;
-    bool receiveETT = false;
-    bool receiveHTT = false;
-    bool receiveHTM = false;
-    bool receiveJetCounts = false;
-    bool receiveHfBitCounts = false;
-    bool receiveHfRingEtSums = false;
-
-    bool receiveExternal = false;
-
-    bool receiveTechTr = false;
-
-    for (CItBoardMaps
-            itBoard = boardMaps.begin();
-            itBoard != boardMaps.end(); ++itBoard) {
-
-        int iPosition = itBoard->gtPositionDaqRecord();
-        if (iPosition > 0) {
-
-            int iActiveBit = itBoard->gtBitDaqActiveBoards();
-            bool activeBoard = false;
-
-            if (iActiveBit >= 0) {
-                activeBoard = m_activeBoardsGtDaq & (1 << iActiveBit);
+            case TechTr: {
+              receiveTechTr = true;
             }
 
-            // use board if: in the record, but not in ActiveBoardsMap (iActiveBit < 0)
-            //               in the record and ActiveBoardsMap, and active
-            if ((iActiveBit < 0) || activeBoard) {
-
-                switch (itBoard->gtBoardType()) {
-
-                    case GTFE: {
-                            daqNrGtfeBoards++;
-                        }
-
-                        break;
-                    case FDL: {
-                            daqNrFdlBoards++;
-                        }
-
-                        break;
-                    case PSB: {
-                            daqNrPsbBoards++;
-
-                            // get the objects coming to this PSB
-                            std::vector<L1GtPsbQuad> quadInPsb = itBoard->gtQuadInPsb();
-                            for (std::vector<L1GtPsbQuad>::const_iterator
-                                    itQuad = quadInPsb.begin();
-                                    itQuad != quadInPsb.end(); ++itQuad) {
-
-                                switch (*itQuad) {
-
-                                    case TechTr: {
-                                            receiveTechTr = true;
-                                        }
-
-                                        break;
-                                    case NoIsoEGQ: {
-                                            receiveNoIsoEG = true;
-                                        }
-
-                                        break;
-                                    case IsoEGQ: {
-                                            receiveIsoEG = true;
-                                        }
-
-                                        break;
-                                    case CenJetQ: {
-                                            receiveCenJet = true;
-                                        }
-
-                                        break;
-                                    case ForJetQ: {
-                                            receiveForJet = true;
-                                        }
-
-                                        break;
-                                    case TauJetQ: {
-                                            receiveTauJet = true;
-                                        }
-
-                                        break;
-                                    case ESumsQ: {
-                                            receiveETM = true;
-                                            receiveETT = true;
-                                            receiveHTT = true;
-                                            receiveHTM = true;
-                                        }
-
-                                        break;
-                                    case JetCountsQ: {
-                                            receiveJetCounts = true;
-                                        }
-
-                                        break;
-                                    case CastorQ: {
-                                            // obsolete
-                                        }
-
-                                        break;
-                                    case BptxQ: {
-                                            // obsolete
-                                        }
-
-                                        break;
-                                    case GtExternalQ: {
-                                            receiveExternal = true;
-                                        }
-
-                                        break;
-                                    case HfQ: {
-                                            receiveHfBitCounts = true;
-                                            receiveHfRingEtSums = true;
-                                        }
-
-                                        break;
-                                        // FIXME add MIP/Iso bits
-                                    default: {
-                                            // do nothing
-                                        }
-
-                                        break;
-                                }
-
-                            }
-
-                        }
-
-                        break;
-                    case GMT: {
-                            daqNrGmtBoards++;
-                            receiveMu = true;
-                        }
-
-                        break;
-                    case TCS: {
-                            daqNrTcsBoards++;
-                        }
-
-                        break;
-                    case TIM: {
-                            daqNrTimBoards++;
-                        }
-
-                        break;
-                    default: {
-                            // do nothing, all blocks are given in GtBoardType enum
-                        }
-
-                        break;
-                }
+            break;
+            case NoIsoEGQ: {
+              receiveNoIsoEG = true;
             }
-        }
 
-    }
-
-    // produce the L1GlobalTriggerReadoutRecord now, after we found how many
-    // BxInEvent the record has and how many boards are active
-    std::unique_ptr<L1GlobalTriggerReadoutRecord> gtDaqReadoutRecord(
-        new L1GlobalTriggerReadoutRecord(
-            m_emulateBxInEvent, daqNrFdlBoards, daqNrPsbBoards) );
+            break;
+            case IsoEGQ: {
+              receiveIsoEG = true;
+            }
 
+            break;
+            case CenJetQ: {
+              receiveCenJet = true;
+            }
 
-    // * produce the L1GlobalTriggerEvmReadoutRecord
-    std::unique_ptr<L1GlobalTriggerEvmReadoutRecord> gtEvmReadoutRecord(
-        new L1GlobalTriggerEvmReadoutRecord(m_emulateBxInEvent, daqNrFdlBoards) );
-    // daqNrFdlBoards OK, just reserve memory at this point
+            break;
+            case ForJetQ: {
+              receiveForJet = true;
+            }
 
-    // * produce the L1GlobalTriggerObjectMapRecord
-    std::unique_ptr<L1GlobalTriggerObjectMapRecord> gtObjectMapRecord(
-        new L1GlobalTriggerObjectMapRecord() );
+            break;
+            case TauJetQ: {
+              receiveTauJet = true;
+            }
 
+            break;
+            case ESumsQ: {
+              receiveETM = true;
+              receiveETT = true;
+              receiveHTT = true;
+              receiveHTM = true;
+            }
 
-    // fill the boards not depending on the BxInEvent in the L1 GT DAQ record
-    // GMT, PSB and FDL depend on BxInEvent
+            break;
+            case JetCountsQ: {
+              receiveJetCounts = true;
+            }
 
-    // fill in emulator the same bunch crossing (12 bits - hardwired number of bits...)
-    // and the same local bunch crossing for all boards
-    int bxCross = iEvent.bunchCrossing();
-    boost::uint16_t bxCrossHw = 0;
-    if ((bxCross & 0xFFF) == bxCross) {
-        bxCrossHw = static_cast<boost::uint16_t> (bxCross);
-    }
-    else {
-        bxCrossHw = 0; // Bx number too large, set to 0!
-        if (m_verbosity) {
-
-            LogDebug("L1GlobalTrigger")
-                << "\nBunch cross number [hex] = " << std::hex << bxCross
-                << "\n  larger than 12 bits. Set to 0! \n" << std::dec
-                << std::endl;
-        }
-    }
+            break;
+            case CastorQ: {
+              // obsolete
+            }
 
+            break;
+            case BptxQ: {
+              // obsolete
+            }
 
-    if (m_produceL1GtDaqRecord) {
+            break;
+            case GtExternalQ: {
+              receiveExternal = true;
+            }
 
-        for (CItBoardMaps
-                itBoard = boardMaps.begin();
-                itBoard != boardMaps.end(); ++itBoard) {
+            break;
+            case HfQ: {
+              receiveHfBitCounts = true;
+              receiveHfRingEtSums = true;
+            }
 
-            int iPosition = itBoard->gtPositionDaqRecord();
-            if (iPosition > 0) {
+            break;
+              // FIXME add MIP/Iso bits
+            default: {
+              // do nothing
+            }
 
-                int iActiveBit = itBoard->gtBitDaqActiveBoards();
-                bool activeBoard = false;
+            break;
+            }
+          }
 
-                if (iActiveBit >= 0) {
-                    activeBoard = m_activeBoardsGtDaq & (1 << iActiveBit);
-                }
+        }
 
-                // use board if: in the record, but not in ActiveBoardsMap (iActiveBit < 0)
-                //               in the record and ActiveBoardsMap, and active
-                if ((iActiveBit < 0) || activeBoard) {
+        break;
+        case GMT: {
+          daqNrGmtBoards++;
+          receiveMu = true;
+        }
 
-                    switch (itBoard->gtBoardType()) {
+        break;
+        case TCS: {
+          daqNrTcsBoards++;
+        }
 
-                        case GTFE: {
-                                L1GtfeWord gtfeWordValue;
+        break;
+        case TIM: {
+          daqNrTimBoards++;
+        }
 
-                                gtfeWordValue.setBoardId( itBoard->gtBoardId() );
+        break;
+        default: {
+          // do nothing, all blocks are given in GtBoardType enum
+        }
 
-                                // cast int to boost::uint16_t
-                                // there are normally 3 or 5 BxInEvent
-                                gtfeWordValue.setRecordLength(
-                                    static_cast<boost::uint16_t>(recordLength0));
+        break;
+        }
+      }
+    }
+  }
+
+  // produce the L1GlobalTriggerReadoutRecord now, after we found how many
+  // BxInEvent the record has and how many boards are active
+  std::unique_ptr<L1GlobalTriggerReadoutRecord> gtDaqReadoutRecord(
+      new L1GlobalTriggerReadoutRecord(m_emulateBxInEvent, daqNrFdlBoards,
+                                       daqNrPsbBoards));
+
+  // * produce the L1GlobalTriggerEvmReadoutRecord
+  std::unique_ptr<L1GlobalTriggerEvmReadoutRecord> gtEvmReadoutRecord(
+      new L1GlobalTriggerEvmReadoutRecord(m_emulateBxInEvent, daqNrFdlBoards));
+  // daqNrFdlBoards OK, just reserve memory at this point
+
+  // * produce the L1GlobalTriggerObjectMapRecord
+  std::unique_ptr<L1GlobalTriggerObjectMapRecord> gtObjectMapRecord(
+      new L1GlobalTriggerObjectMapRecord());
+
+  // fill the boards not depending on the BxInEvent in the L1 GT DAQ record
+  // GMT, PSB and FDL depend on BxInEvent
+
+  // fill in emulator the same bunch crossing (12 bits - hardwired number of
+  // bits...) and the same local bunch crossing for all boards
+  int bxCross = iEvent.bunchCrossing();
+  boost::uint16_t bxCrossHw = 0;
+  if ((bxCross & 0xFFF) == bxCross) {
+    bxCrossHw = static_cast<boost::uint16_t>(bxCross);
+  } else {
+    bxCrossHw = 0; // Bx number too large, set to 0!
+    if (m_verbosity) {
 
-                                gtfeWordValue.setRecordLength1(
-                                    static_cast<boost::uint16_t>(recordLength1));
+      LogDebug("L1GlobalTrigger")
+          << "\nBunch cross number [hex] = " << std::hex << bxCross
+          << "\n  larger than 12 bits. Set to 0! \n"
+          << std::dec << std::endl;
+    }
+  }
 
-                                // bunch crossing
-                                gtfeWordValue.setBxNr(bxCrossHw);
+  if (m_produceL1GtDaqRecord) {
 
-                                // set the list of active boards
-                                gtfeWordValue.setActiveBoards(m_activeBoardsGtDaq);
+    for (CItBoardMaps itBoard = boardMaps.begin(); itBoard != boardMaps.end();
+         ++itBoard) {
 
-                                // set alternative for number of BX per board
-                                gtfeWordValue.setAltNrBxBoard(
-                                    static_cast<boost::uint16_t> (m_alternativeNrBxBoardDaq));
+      int iPosition = itBoard->gtPositionDaqRecord();
+      if (iPosition > 0) {
 
-                                // set the TOTAL_TRIGNR as read from iEvent
-                                // TODO check again - PTC stuff
+        int iActiveBit = itBoard->gtBitDaqActiveBoards();
+        bool activeBoard = false;
 
-                                gtfeWordValue.setTotalTriggerNr(
-                                    static_cast<boost::uint32_t>(iEvent.id().event()));
+        if (iActiveBit >= 0) {
+          activeBoard = m_activeBoardsGtDaq & (1 << iActiveBit);
+        }
 
-                                // ** fill L1GtfeWord in GT DAQ record
+        // use board if: in the record, but not in ActiveBoardsMap (iActiveBit <
+        // 0)
+        //               in the record and ActiveBoardsMap, and active
+        if ((iActiveBit < 0) || activeBoard) {
 
-                                gtDaqReadoutRecord->setGtfeWord(gtfeWordValue);
-                            }
+          switch (itBoard->gtBoardType()) {
 
-                            break;
-                        case TCS: {
-                                // nothing
-                            }
+          case GTFE: {
+            L1GtfeWord gtfeWordValue;
 
-                            break;
-                        case TIM: {
-                                // nothing
-                            }
+            gtfeWordValue.setBoardId(itBoard->gtBoardId());
 
-                            break;
-                        default: {
-                                // do nothing, all blocks are given in GtBoardType enum
-                            }
+            // cast int to boost::uint16_t
+            // there are normally 3 or 5 BxInEvent
+            gtfeWordValue.setRecordLength(
+                static_cast<boost::uint16_t>(recordLength0));
 
-                            break;
-                    }
-                }
-            }
+            gtfeWordValue.setRecordLength1(
+                static_cast<boost::uint16_t>(recordLength1));
 
-        }
+            // bunch crossing
+            gtfeWordValue.setBxNr(bxCrossHw);
 
-    }
+            // set the list of active boards
+            gtfeWordValue.setActiveBoards(m_activeBoardsGtDaq);
 
-    // fill the boards not depending on the BxInEvent in the L1 GT EVM record
+            // set alternative for number of BX per board
+            gtfeWordValue.setAltNrBxBoard(
+                static_cast<boost::uint16_t>(m_alternativeNrBxBoardDaq));
 
-    int evmNrFdlBoards = 0;
+            // set the TOTAL_TRIGNR as read from iEvent
+            // TODO check again - PTC stuff
 
-    if (m_produceL1GtEvmRecord) {
+            gtfeWordValue.setTotalTriggerNr(
+                static_cast<boost::uint32_t>(iEvent.id().event()));
 
-        // get the length of the BST message from parameter set or from event setup
+            // ** fill L1GtfeWord in GT DAQ record
 
-        int bstLengthBytes = 0;
+            gtDaqReadoutRecord->setGtfeWord(gtfeWordValue);
+          }
 
-        if (m_psBstLengthBytes < 0) {
-            // length from event setup
-            bstLengthBytes = static_cast<int> (m_bstLengthBytes);
+          break;
+          case TCS: {
+            // nothing
+          }
 
-        } else {
-            // length from parameter set
-            bstLengthBytes = m_psBstLengthBytes;
-        }
+          break;
+          case TIM: {
+            // nothing
+          }
 
-        if (m_verbosity) {
+          break;
+          default: {
+            // do nothing, all blocks are given in GtBoardType enum
+          }
 
-            LogTrace("L1GlobalTrigger")
-                << "\n Length of BST message (in bytes): "
-                << bstLengthBytes << "\n"
-                << std::endl;
+          break;
+          }
         }
+      }
+    }
+  }
 
-        for (CItBoardMaps
-                itBoard = boardMaps.begin();
-                itBoard != boardMaps.end(); ++itBoard) {
-
-            int iPosition = itBoard->gtPositionEvmRecord();
-            if (iPosition > 0) {
-
-                int iActiveBit = itBoard->gtBitEvmActiveBoards();
-                bool activeBoard = false;
-
-                if (iActiveBit >= 0) {
-                    activeBoard = m_activeBoardsGtEvm & (1 << iActiveBit);
-                }
-
-                // use board if: in the record, but not in ActiveBoardsMap (iActiveBit < 0)
-                //               in the record and ActiveBoardsMap, and active
-                if ((iActiveBit < 0) || activeBoard) {
+  // fill the boards not depending on the BxInEvent in the L1 GT EVM record
 
-                    switch (itBoard->gtBoardType()) {
+  int evmNrFdlBoards = 0;
 
-                        case GTFE: {
-                                L1GtfeExtWord gtfeWordValue(bstLengthBytes);
+  if (m_produceL1GtEvmRecord) {
 
-                                gtfeWordValue.setBoardId(itBoard->gtBoardId() );
+    // get the length of the BST message from parameter set or from event setup
 
-                                // cast int to boost::uint16_t
-                                // there are normally 3 or 5 BxInEvent
-                                gtfeWordValue.setRecordLength(
-                                    static_cast<boost::uint16_t>(recordLength0));
+    int bstLengthBytes = 0;
 
-                                gtfeWordValue.setRecordLength1(
-                                    static_cast<boost::uint16_t>(recordLength1));
+    if (m_psBstLengthBytes < 0) {
+      // length from event setup
+      bstLengthBytes = static_cast<int>(m_bstLengthBytes);
 
-                                // bunch crossing
-                                gtfeWordValue.setBxNr(bxCrossHw);
+    } else {
+      // length from parameter set
+      bstLengthBytes = m_psBstLengthBytes;
+    }
 
-                                // set the list of active boards
-                                gtfeWordValue.setActiveBoards(m_activeBoardsGtEvm);
+    if (m_verbosity) {
 
-                                // set alternative for number of BX per board
-                                gtfeWordValue.setAltNrBxBoard(
-                                    static_cast<boost::uint16_t> (m_alternativeNrBxBoardEvm));
+      LogTrace("L1GlobalTrigger")
+          << "\n Length of BST message (in bytes): " << bstLengthBytes << "\n"
+          << std::endl;
+    }
 
-                                // set the TOTAL_TRIGNR as read from iEvent
-                                // TODO check again - PTC stuff
+    for (CItBoardMaps itBoard = boardMaps.begin(); itBoard != boardMaps.end();
+         ++itBoard) {
 
-                                gtfeWordValue.setTotalTriggerNr(
-                                    static_cast<boost::uint32_t>(iEvent.id().event()));
+      int iPosition = itBoard->gtPositionEvmRecord();
+      if (iPosition > 0) {
 
-                                // set the GPS time to the value read from Timestamp
-                                edm::TimeValue_t evTime = iEvent.time().value();
+        int iActiveBit = itBoard->gtBitEvmActiveBoards();
+        bool activeBoard = false;
 
-                                gtfeWordValue.setGpsTime(evTime);
+        if (iActiveBit >= 0) {
+          activeBoard = m_activeBoardsGtEvm & (1 << iActiveBit);
+        }
 
-                                //LogDebug("L1GlobalTrigger")
-                                //<< "\nEvent timestamp value [hex] = " << std::hex << evTime
-                                //<< "\nBST retrieved value [hex]   = " << gtfeWordValue.gpsTime()
-                                //<< std::dec << std::endl;
+        // use board if: in the record, but not in ActiveBoardsMap (iActiveBit <
+        // 0)
+        //               in the record and ActiveBoardsMap, and active
+        if ((iActiveBit < 0) || activeBoard) {
 
-                                // source of BST message: DDDD simulated data
-                                boost::uint16_t bstSourceVal = 0xDDDD;
-                                gtfeWordValue.setBstSource(bstSourceVal);
+          switch (itBoard->gtBoardType()) {
 
-                                // ** fill L1GtfeWord in GT EVM record
+          case GTFE: {
+            L1GtfeExtWord gtfeWordValue(bstLengthBytes);
 
-                                gtEvmReadoutRecord->setGtfeWord(gtfeWordValue);
-                            }
+            gtfeWordValue.setBoardId(itBoard->gtBoardId());
 
-                            break;
-                        case FDL: {
-                                evmNrFdlBoards++;
-                            }
+            // cast int to boost::uint16_t
+            // there are normally 3 or 5 BxInEvent
+            gtfeWordValue.setRecordLength(
+                static_cast<boost::uint16_t>(recordLength0));
 
-                            break;
-                        case TCS: {
+            gtfeWordValue.setRecordLength1(
+                static_cast<boost::uint16_t>(recordLength1));
 
-                                L1TcsWord tcsWordValue;
+            // bunch crossing
+            gtfeWordValue.setBxNr(bxCrossHw);
 
-                                tcsWordValue.setBoardId( itBoard->gtBoardId() );
+            // set the list of active boards
+            gtfeWordValue.setActiveBoards(m_activeBoardsGtEvm);
 
-                                // bunch crossing
-                                tcsWordValue.setBxNr(bxCrossHw);
+            // set alternative for number of BX per board
+            gtfeWordValue.setAltNrBxBoard(
+                static_cast<boost::uint16_t>(m_alternativeNrBxBoardEvm));
 
-                                boost::uint16_t trigType = 0x5; // 0101 simulated event
-                                tcsWordValue.setTriggerType(trigType);
+            // set the TOTAL_TRIGNR as read from iEvent
+            // TODO check again - PTC stuff
 
-                                // luminosity segment number
-                                tcsWordValue.setLuminositySegmentNr(
-                                        static_cast<boost::uint16_t>(iEvent.luminosityBlock()));
+            gtfeWordValue.setTotalTriggerNr(
+                static_cast<boost::uint32_t>(iEvent.id().event()));
 
+            // set the GPS time to the value read from Timestamp
+            edm::TimeValue_t evTime = iEvent.time().value();
 
-                                // set the Event_Nr as read from iEvent
-                                tcsWordValue.setEventNr(
-                                    static_cast<boost::uint32_t>(iEvent.id().event()));
+            gtfeWordValue.setGpsTime(evTime);
 
-                                // orbit number
-                                tcsWordValue.setOrbitNr(
-                                        static_cast<boost::uint64_t>(iEvent.orbitNumber()) );
+            // LogDebug("L1GlobalTrigger")
+            //<< "\nEvent timestamp value [hex] = " << std::hex << evTime
+            //<< "\nBST retrieved value [hex]   = " << gtfeWordValue.gpsTime()
+            //<< std::dec << std::endl;
 
-                                // ** fill L1TcsWord in the EVM record
+            // source of BST message: DDDD simulated data
+            boost::uint16_t bstSourceVal = 0xDDDD;
+            gtfeWordValue.setBstSource(bstSourceVal);
 
-                                gtEvmReadoutRecord->setTcsWord(tcsWordValue);
+            // ** fill L1GtfeWord in GT EVM record
 
-                            }
+            gtEvmReadoutRecord->setGtfeWord(gtfeWordValue);
+          }
 
-                            break;
-                        case TIM: {
-                                // nothing
-                            }
+          break;
+          case FDL: {
+            evmNrFdlBoards++;
+          }
 
-                            break;
-                        default: {
-                                // do nothing, all blocks are given in GtBoardType enum
-                            }
+          break;
+          case TCS: {
 
-                            break;
-                    }
-                }
-            }
+            L1TcsWord tcsWordValue;
 
-        }
+            tcsWordValue.setBoardId(itBoard->gtBoardId());
 
-    }
+            // bunch crossing
+            tcsWordValue.setBxNr(bxCrossHw);
 
-    // get the prescale factor set used in the actual luminosity segment
-    int pfAlgoSetIndex = 0; // FIXME
-    const std::vector<int>& prescaleFactorsAlgoTrig =
-        (*m_prescaleFactorsAlgoTrig).at(pfAlgoSetIndex);
+            boost::uint16_t trigType = 0x5; // 0101 simulated event
+            tcsWordValue.setTriggerType(trigType);
 
-    int pfTechSetIndex = 0; // FIXME
-    const std::vector<int>& prescaleFactorsTechTrig =
-        (*m_prescaleFactorsTechTrig).at(pfTechSetIndex);
+            // luminosity segment number
+            tcsWordValue.setLuminositySegmentNr(
+                static_cast<boost::uint16_t>(iEvent.luminosityBlock()));
 
-    //
+            // set the Event_Nr as read from iEvent
+            tcsWordValue.setEventNr(
+                static_cast<boost::uint32_t>(iEvent.id().event()));
 
-    // loop over BxInEvent
-    for (int iBxInEvent = minBxInEvent; iBxInEvent <= maxBxInEvent;
-            ++iBxInEvent) {
-
-        // * receive GCT object data via PSBs
-        //LogDebug("L1GlobalTrigger")
-        //<< "\nL1GlobalTrigger : receiving PSB data for bx = " << iBxInEvent << "\n"
-        //<< std::endl;
-
-        m_gtPSB->receiveGctObjectData(
-            iEvent,
-            m_caloGctInputTag, iBxInEvent,
-            receiveNoIsoEG, m_nrL1NoIsoEG,
-            receiveIsoEG, m_nrL1IsoEG,
-            receiveCenJet, m_nrL1CenJet,
-            receiveForJet, m_nrL1ForJet,
-            receiveTauJet, m_nrL1TauJet,
-            receiveETM, receiveETT, receiveHTT, receiveHTM,
-            receiveJetCounts,
-            receiveHfBitCounts,
-            receiveHfRingEtSums);
-
-        /// receive technical trigger
-        if (m_readTechnicalTriggerRecords) {
-            m_gtPSB->receiveTechnicalTriggers(iEvent,
-                    m_technicalTriggersInputTags, iBxInEvent, receiveTechTr,
-                    m_numberTechnicalTriggers);
-        }
+            // orbit number
+            tcsWordValue.setOrbitNr(
+                static_cast<boost::uint64_t>(iEvent.orbitNumber()));
 
-        if (receiveExternal) {
-            // FIXME read the external conditions
-        }
+            // ** fill L1TcsWord in the EVM record
 
+            gtEvmReadoutRecord->setTcsWord(tcsWordValue);
 
-        if (m_produceL1GtDaqRecord && m_writePsbL1GtDaqRecord) {
-            m_gtPSB->fillPsbBlock(
-                    iEvent, m_activeBoardsGtDaq, recordLength0, recordLength1,
-                    m_alternativeNrBxBoardDaq, boardMaps, iBxInEvent, gtDaqReadoutRecord.get());
-        }
+          }
 
-        // * receive GMT object data via GTL
-        //LogDebug("L1GlobalTrigger")
-        //<< "\nL1GlobalTrigger : receiving GMT data for bx = " << iBxInEvent << "\n"
-        //<< std::endl;
-
-        m_gtGTL->receiveGmtObjectData(iEvent, m_muGmtInputTag, iBxInEvent,
-                receiveMu, m_nrL1Mu);
-
-        // * run GTL
-        //LogDebug("L1GlobalTrigger")
-        //<< "\nL1GlobalTrigger : running GTL for bx = " << iBxInEvent << "\n"
-        //<< std::endl;
-
-        m_gtGTL->run(iEvent, evSetup, m_gtPSB,
-            m_produceL1GtObjectMapRecord, iBxInEvent, gtObjectMapRecord.get(),
-            m_numberPhysTriggers,
-            m_nrL1Mu,
-            m_nrL1NoIsoEG,
-            m_nrL1IsoEG,
-            m_nrL1CenJet,
-            m_nrL1ForJet,
-            m_nrL1TauJet,
-            m_nrL1JetCounts,
-            m_ifMuEtaNumberBits,
-            m_ifCaloEtaNumberBits);
-
-        //LogDebug("L1GlobalTrigger")
-        //<< "\n AlgorithmOR\n" << m_gtGTL->getAlgorithmOR() << "\n"
-        //<< std::endl;
-
-        // * run FDL
-        //LogDebug("L1GlobalTrigger")
-        //<< "\nL1GlobalTrigger : running FDL for bx = " << iBxInEvent << "\n"
-        //<< std::endl;
-
-        m_gtFDL->run(iEvent,
-                prescaleFactorsAlgoTrig, prescaleFactorsTechTrig,
-                m_triggerMaskAlgoTrig, m_triggerMaskTechTrig,
-                m_triggerMaskVetoAlgoTrig, m_triggerMaskVetoTechTrig,
-                boardMaps, m_emulateBxInEvent, iBxInEvent,
-                m_numberPhysTriggers, m_numberTechnicalTriggers,
-                m_numberDaqPartitions,
-                m_gtGTL, m_gtPSB,
-                pfAlgoSetIndex,
-                pfTechSetIndex,
-                m_algorithmTriggersUnprescaled,
-                m_algorithmTriggersUnmasked,
-                m_technicalTriggersUnprescaled,
-                m_technicalTriggersUnmasked,
-                m_technicalTriggersVetoUnmasked
-                );
-
-        if (m_produceL1GtDaqRecord && ( daqNrFdlBoards > 0 )) {
-            m_gtFDL->fillDaqFdlBlock(iBxInEvent,
-                    m_activeBoardsGtDaq, recordLength0, recordLength1, m_alternativeNrBxBoardDaq,
-                    boardMaps, gtDaqReadoutRecord.get());
-        }
+          break;
+          case TIM: {
+            // nothing
+          }
 
+          break;
+          default: {
+            // do nothing, all blocks are given in GtBoardType enum
+          }
 
-        if (m_produceL1GtEvmRecord && ( evmNrFdlBoards > 0 )) {
-            m_gtFDL->fillEvmFdlBlock(iBxInEvent,
-                    m_activeBoardsGtEvm, recordLength0, recordLength1, m_alternativeNrBxBoardEvm,
-                    boardMaps, gtEvmReadoutRecord.get());
+          break;
+          }
         }
-
-        // reset
-        m_gtPSB->reset();
-        m_gtGTL->reset();
-        m_gtFDL->reset();
-
-        //LogDebug("L1GlobalTrigger") << "\n Reset PSB, GTL, FDL\n" << std::endl;
-
+      }
+    }
+  }
+
+  // get the prescale factor set used in the actual luminosity segment
+  int pfAlgoSetIndex = 0; // FIXME
+  const std::vector<int> &prescaleFactorsAlgoTrig =
+      (*m_prescaleFactorsAlgoTrig).at(pfAlgoSetIndex);
+
+  int pfTechSetIndex = 0; // FIXME
+  const std::vector<int> &prescaleFactorsTechTrig =
+      (*m_prescaleFactorsTechTrig).at(pfTechSetIndex);
+
+  //
+
+  // loop over BxInEvent
+  for (int iBxInEvent = minBxInEvent; iBxInEvent <= maxBxInEvent;
+       ++iBxInEvent) {
+
+    // * receive GCT object data via PSBs
+    // LogDebug("L1GlobalTrigger")
+    //<< "\nL1GlobalTrigger : receiving PSB data for bx = " << iBxInEvent <<
+    //"\n"
+    //<< std::endl;
+
+    m_gtPSB->receiveGctObjectData(
+        iEvent, m_caloGctInputTag, iBxInEvent, receiveNoIsoEG, m_nrL1NoIsoEG,
+        receiveIsoEG, m_nrL1IsoEG, receiveCenJet, m_nrL1CenJet, receiveForJet,
+        m_nrL1ForJet, receiveTauJet, m_nrL1TauJet, receiveETM, receiveETT,
+        receiveHTT, receiveHTM, receiveJetCounts, receiveHfBitCounts,
+        receiveHfRingEtSums);
+
+    /// receive technical trigger
+    if (m_readTechnicalTriggerRecords) {
+      m_gtPSB->receiveTechnicalTriggers(iEvent, m_technicalTriggersInputTags,
+                                        iBxInEvent, receiveTechTr,
+                                        m_numberTechnicalTriggers);
     }
 
+    if (receiveExternal) {
+      // FIXME read the external conditions
+    }
 
-    if ( receiveMu ) {
+    if (m_produceL1GtDaqRecord && m_writePsbL1GtDaqRecord) {
+      m_gtPSB->fillPsbBlock(iEvent, m_activeBoardsGtDaq, recordLength0,
+                            recordLength1, m_alternativeNrBxBoardDaq, boardMaps,
+                            iBxInEvent, gtDaqReadoutRecord.get());
+    }
 
+    // * receive GMT object data via GTL
+    // LogDebug("L1GlobalTrigger")
+    //<< "\nL1GlobalTrigger : receiving GMT data for bx = " << iBxInEvent <<
+    //"\n"
+    //<< std::endl;
+
+    m_gtGTL->receiveGmtObjectData(iEvent, m_muGmtInputTag, iBxInEvent,
+                                  receiveMu, m_nrL1Mu);
+
+    // * run GTL
+    // LogDebug("L1GlobalTrigger")
+    //<< "\nL1GlobalTrigger : running GTL for bx = " << iBxInEvent << "\n"
+    //<< std::endl;
+
+    m_gtGTL->run(iEvent, evSetup, m_gtPSB, m_produceL1GtObjectMapRecord,
+                 iBxInEvent, gtObjectMapRecord.get(), m_numberPhysTriggers,
+                 m_nrL1Mu, m_nrL1NoIsoEG, m_nrL1IsoEG, m_nrL1CenJet,
+                 m_nrL1ForJet, m_nrL1TauJet, m_nrL1JetCounts,
+                 m_ifMuEtaNumberBits, m_ifCaloEtaNumberBits);
+
+    // LogDebug("L1GlobalTrigger")
+    //<< "\n AlgorithmOR\n" << m_gtGTL->getAlgorithmOR() << "\n"
+    //<< std::endl;
+
+    // * run FDL
+    // LogDebug("L1GlobalTrigger")
+    //<< "\nL1GlobalTrigger : running FDL for bx = " << iBxInEvent << "\n"
+    //<< std::endl;
+
+    m_gtFDL->run(iEvent, prescaleFactorsAlgoTrig, prescaleFactorsTechTrig,
+                 m_triggerMaskAlgoTrig, m_triggerMaskTechTrig,
+                 m_triggerMaskVetoAlgoTrig, m_triggerMaskVetoTechTrig,
+                 boardMaps, m_emulateBxInEvent, iBxInEvent,
+                 m_numberPhysTriggers, m_numberTechnicalTriggers,
+                 m_numberDaqPartitions, m_gtGTL, m_gtPSB, pfAlgoSetIndex,
+                 pfTechSetIndex, m_algorithmTriggersUnprescaled,
+                 m_algorithmTriggersUnmasked, m_technicalTriggersUnprescaled,
+                 m_technicalTriggersUnmasked, m_technicalTriggersVetoUnmasked);
+
+    if (m_produceL1GtDaqRecord && (daqNrFdlBoards > 0)) {
+      m_gtFDL->fillDaqFdlBlock(iBxInEvent, m_activeBoardsGtDaq, recordLength0,
+                               recordLength1, m_alternativeNrBxBoardDaq,
+                               boardMaps, gtDaqReadoutRecord.get());
+    }
 
-        //LogDebug("L1GlobalTrigger")
-        //<< "\n**** "
-        //<< "\n  Persistent reference for L1MuGMTReadoutCollection with input tag: "
-        //<< m_muGmtInputTag
-        //<< "\n**** \n"
-        //<< std::endl;
+    if (m_produceL1GtEvmRecord && (evmNrFdlBoards > 0)) {
+      m_gtFDL->fillEvmFdlBlock(iBxInEvent, m_activeBoardsGtEvm, recordLength0,
+                               recordLength1, m_alternativeNrBxBoardEvm,
+                               boardMaps, gtEvmReadoutRecord.get());
+    }
 
-        // get L1MuGMTReadoutCollection reference and set it in GT record
+    // reset
+    m_gtPSB->reset();
+    m_gtGTL->reset();
+    m_gtFDL->reset();
 
-        edm::Handle<L1MuGMTReadoutCollection> gmtRcHandle;
-        iEvent.getByLabel(m_muGmtInputTag, gmtRcHandle);
+    // LogDebug("L1GlobalTrigger") << "\n Reset PSB, GTL, FDL\n" << std::endl;
+  }
 
+  if (receiveMu) {
 
+    // LogDebug("L1GlobalTrigger")
+    //<< "\n**** "
+    //<< "\n  Persistent reference for L1MuGMTReadoutCollection with input tag:
+    //"
+    //<< m_muGmtInputTag
+    //<< "\n**** \n"
+    //<< std::endl;
 
-        if (!gmtRcHandle.isValid()) {
-            if (m_verbosity) {
-                edm::LogWarning("L1GlobalTrigger")
-                        << "\nWarning: L1MuGMTReadoutCollection with input tag " << m_muGmtInputTag
-                        << "\nrequested in configuration, but not found in the event.\n"
-                        << std::endl;
-            }
-        } else {
+    // get L1MuGMTReadoutCollection reference and set it in GT record
 
-            gtDaqReadoutRecord->setMuCollectionRefProd(gmtRcHandle);
+    edm::Handle<L1MuGMTReadoutCollection> gmtRcHandle;
+    iEvent.getByLabel(m_muGmtInputTag, gmtRcHandle);
 
-        }
+    if (!gmtRcHandle.isValid()) {
+      if (m_verbosity) {
+        edm::LogWarning("L1GlobalTrigger")
+            << "\nWarning: L1MuGMTReadoutCollection with input tag "
+            << m_muGmtInputTag
+            << "\nrequested in configuration, but not found in the event.\n"
+            << std::endl;
+      }
+    } else {
 
+      gtDaqReadoutRecord->setMuCollectionRefProd(gmtRcHandle);
     }
+  }
 
-    if ( m_verbosity && m_isDebugEnabled ) {
+  if (m_verbosity && m_isDebugEnabled) {
 
-    	std::ostringstream myCoutStream;
-        gtDaqReadoutRecord->print(myCoutStream);
-        LogTrace("L1GlobalTrigger")
+    std::ostringstream myCoutStream;
+    gtDaqReadoutRecord->print(myCoutStream);
+    LogTrace("L1GlobalTrigger")
         << "\n The following L1 GT DAQ readout record was produced:\n"
         << myCoutStream.str() << "\n"
         << std::endl;
 
-        myCoutStream.str("");
-        myCoutStream.clear();
+    myCoutStream.str("");
+    myCoutStream.clear();
 
-        gtEvmReadoutRecord->print(myCoutStream);
-        LogTrace("L1GlobalTrigger")
+    gtEvmReadoutRecord->print(myCoutStream);
+    LogTrace("L1GlobalTrigger")
         << "\n The following L1 GT EVM readout record was produced:\n"
         << myCoutStream.str() << "\n"
         << std::endl;
 
-        myCoutStream.str("");
-        myCoutStream.clear();
-
-        const std::vector<L1GlobalTriggerObjectMap> objMapVec =
-            gtObjectMapRecord->gtObjectMap();
+    myCoutStream.str("");
+    myCoutStream.clear();
 
-        for (std::vector<L1GlobalTriggerObjectMap>::const_iterator
-                it = objMapVec.begin(); it != objMapVec.end(); ++it) {
+    const std::vector<L1GlobalTriggerObjectMap> objMapVec =
+        gtObjectMapRecord->gtObjectMap();
 
-            (*it).print(myCoutStream);
-
-        }
+    for (std::vector<L1GlobalTriggerObjectMap>::const_iterator it =
+             objMapVec.begin();
+         it != objMapVec.end(); ++it) {
 
+      (*it).print(myCoutStream);
+    }
 
-        LogDebug("L1GlobalTrigger")
-        << "Test gtObjectMapRecord in L1GlobalTrigger \n\n" << myCoutStream.str() << "\n\n"
+    LogDebug("L1GlobalTrigger")
+        << "Test gtObjectMapRecord in L1GlobalTrigger \n\n"
+        << myCoutStream.str() << "\n\n"
         << std::endl;
 
-        myCoutStream.str("");
-        myCoutStream.clear();
+    myCoutStream.str("");
+    myCoutStream.clear();
+  }
 
-    }
+  // **
+  // register products
+  if (m_produceL1GtDaqRecord) {
+    iEvent.put(std::move(gtDaqReadoutRecord));
+  }
 
-    // **
-    // register products
-    if (m_produceL1GtDaqRecord) {
-        iEvent.put(std::move(gtDaqReadoutRecord));
-    }
-
-    if (m_produceL1GtEvmRecord) {
-        iEvent.put(std::move(gtEvmReadoutRecord));
-    }
-
-    if (m_produceL1GtObjectMapRecord) {
-        iEvent.put(std::move(gtObjectMapRecord));
-    }
+  if (m_produceL1GtEvmRecord) {
+    iEvent.put(std::move(gtEvmReadoutRecord));
+  }
 
+  if (m_produceL1GtObjectMapRecord) {
+    iEvent.put(std::move(gtObjectMapRecord));
+  }
 }
 
 // static data members
diff --git a/L1Trigger/GlobalTrigger/plugins/L1GlobalTrigger.h b/L1Trigger/GlobalTrigger/plugins/L1GlobalTrigger.h
index ee89f8729f94b..d6ff8316fa018 100644
--- a/L1Trigger/GlobalTrigger/plugins/L1GlobalTrigger.h
+++ b/L1Trigger/GlobalTrigger/plugins/L1GlobalTrigger.h
@@ -27,8 +27,8 @@
 
 // user include files
 
-#include "CondFormats/L1TObjects/interface/L1GtFwd.h"
 #include "CondFormats/L1TObjects/interface/L1GtBoard.h"
+#include "CondFormats/L1TObjects/interface/L1GtFwd.h"
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/stream/EDProducer.h"
@@ -52,197 +52,184 @@ class L1GtPrescaleFactors;
 class L1GtTriggerMask;
 
 // class declaration
-class L1GlobalTrigger : public edm::stream::EDProducer<>
-{
+class L1GlobalTrigger : public edm::stream::EDProducer<> {
 
 public:
+  explicit L1GlobalTrigger(const edm::ParameterSet &);
+  ~L1GlobalTrigger() override;
 
-    explicit L1GlobalTrigger(const edm::ParameterSet&);
-    ~L1GlobalTrigger() override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
-    void produce(edm::Event&, const edm::EventSetup&) override;
+  // return pointer to PSB
+  inline const L1GlobalTriggerPSB *gtPSB() const { return m_gtPSB; }
 
-    // return pointer to PSB
-    inline const L1GlobalTriggerPSB* gtPSB() const
-    {
-        return m_gtPSB;
-    }
+  // return pointer to GTL
+  inline const L1GlobalTriggerGTL *gtGTL() const { return m_gtGTL; }
 
-    // return pointer to GTL
-    inline const L1GlobalTriggerGTL* gtGTL() const
-    {
-        return m_gtGTL;
-    }
-
-    // return pointer to FDL
-    inline const L1GlobalTriggerFDL* gtFDL() const
-    {
-        return m_gtFDL;
-    }
+  // return pointer to FDL
+  inline const L1GlobalTriggerFDL *gtFDL() const { return m_gtFDL; }
 
 private:
+  /// cached stuff
 
-    /// cached stuff
-
-    /// stable parameters
-    const L1GtStableParameters* m_l1GtStablePar;
-    unsigned long long m_l1GtStableParCacheID;
-
-    /// number of physics triggers
-    unsigned int m_numberPhysTriggers;
-
-    /// number of technical triggers
-    unsigned int m_numberTechnicalTriggers;
-
-    /// number of DAQ partitions
-    unsigned int m_numberDaqPartitions;
+  /// stable parameters
+  const L1GtStableParameters *m_l1GtStablePar;
+  unsigned long long m_l1GtStableParCacheID;
 
-    /// number of objects of each type
-    ///    { Mu, NoIsoEG, IsoEG, CenJet, ForJet, TauJet, ETM, ETT, HTT, JetCounts };
-    int m_nrL1Mu;
+  /// number of physics triggers
+  unsigned int m_numberPhysTriggers;
 
-    int m_nrL1NoIsoEG;
-    int m_nrL1IsoEG;
+  /// number of technical triggers
+  unsigned int m_numberTechnicalTriggers;
 
-    int m_nrL1CenJet;
-    int m_nrL1ForJet;
-    int m_nrL1TauJet;
+  /// number of DAQ partitions
+  unsigned int m_numberDaqPartitions;
 
-    int m_nrL1JetCounts;
+  /// number of objects of each type
+  ///    { Mu, NoIsoEG, IsoEG, CenJet, ForJet, TauJet, ETM, ETT, HTT, JetCounts
+  ///    };
+  int m_nrL1Mu;
 
-    // ... the rest of the objects are global
+  int m_nrL1NoIsoEG;
+  int m_nrL1IsoEG;
 
-    int m_ifMuEtaNumberBits;
-    int m_ifCaloEtaNumberBits;
+  int m_nrL1CenJet;
+  int m_nrL1ForJet;
+  int m_nrL1TauJet;
 
+  int m_nrL1JetCounts;
 
-    /// parameters
-    const L1GtParameters* m_l1GtPar;
-    unsigned long long m_l1GtParCacheID;
+  // ... the rest of the objects are global
 
-    ///    total number of Bx's in the event coming from EventSetup
-    int m_totalBxInEvent;
+  int m_ifMuEtaNumberBits;
+  int m_ifCaloEtaNumberBits;
 
-    ///    active boards in L1 GT DAQ record and in L1 GT EVM record
-    boost::uint16_t m_activeBoardsGtDaq;
-    boost::uint16_t m_activeBoardsGtEvm;
+  /// parameters
+  const L1GtParameters *m_l1GtPar;
+  unsigned long long m_l1GtParCacheID;
 
-    /// length of BST record (in bytes) from event setup
-    unsigned int m_bstLengthBytes;
+  ///    total number of Bx's in the event coming from EventSetup
+  int m_totalBxInEvent;
 
-    /// board maps - cache only the record
-    const L1GtBoardMaps* m_l1GtBM;
-    unsigned long long m_l1GtBMCacheID;
+  ///    active boards in L1 GT DAQ record and in L1 GT EVM record
+  boost::uint16_t m_activeBoardsGtDaq;
+  boost::uint16_t m_activeBoardsGtEvm;
 
+  /// length of BST record (in bytes) from event setup
+  unsigned int m_bstLengthBytes;
 
-    /// prescale factors
-    const L1GtPrescaleFactors* m_l1GtPfAlgo;
-    unsigned long long m_l1GtPfAlgoCacheID;
+  /// board maps - cache only the record
+  const L1GtBoardMaps *m_l1GtBM;
+  unsigned long long m_l1GtBMCacheID;
 
-    const L1GtPrescaleFactors* m_l1GtPfTech;
-    unsigned long long m_l1GtPfTechCacheID;
+  /// prescale factors
+  const L1GtPrescaleFactors *m_l1GtPfAlgo;
+  unsigned long long m_l1GtPfAlgoCacheID;
 
-    const std::vector<std::vector<int> >* m_prescaleFactorsAlgoTrig;
-    const std::vector<std::vector<int> >* m_prescaleFactorsTechTrig;
+  const L1GtPrescaleFactors *m_l1GtPfTech;
+  unsigned long long m_l1GtPfTechCacheID;
 
-    /// trigger masks & veto masks
-    const L1GtTriggerMask* m_l1GtTmAlgo;
-    unsigned long long m_l1GtTmAlgoCacheID;
+  const std::vector<std::vector<int>> *m_prescaleFactorsAlgoTrig;
+  const std::vector<std::vector<int>> *m_prescaleFactorsTechTrig;
 
-    const L1GtTriggerMask* m_l1GtTmTech;
-    unsigned long long m_l1GtTmTechCacheID;
+  /// trigger masks & veto masks
+  const L1GtTriggerMask *m_l1GtTmAlgo;
+  unsigned long long m_l1GtTmAlgoCacheID;
 
-    const L1GtTriggerMask* m_l1GtTmVetoAlgo;
-    unsigned long long m_l1GtTmVetoAlgoCacheID;
+  const L1GtTriggerMask *m_l1GtTmTech;
+  unsigned long long m_l1GtTmTechCacheID;
 
-    const L1GtTriggerMask* m_l1GtTmVetoTech;
-    unsigned long long m_l1GtTmVetoTechCacheID;
+  const L1GtTriggerMask *m_l1GtTmVetoAlgo;
+  unsigned long long m_l1GtTmVetoAlgoCacheID;
 
-    std::vector<unsigned int> m_triggerMaskAlgoTrig;
-    std::vector<unsigned int> m_triggerMaskTechTrig;
+  const L1GtTriggerMask *m_l1GtTmVetoTech;
+  unsigned long long m_l1GtTmVetoTechCacheID;
 
-    std::vector<unsigned int> m_triggerMaskVetoAlgoTrig;
-    std::vector<unsigned int> m_triggerMaskVetoTechTrig;
+  std::vector<unsigned int> m_triggerMaskAlgoTrig;
+  std::vector<unsigned int> m_triggerMaskTechTrig;
 
-    L1GlobalTriggerPSB* m_gtPSB;
-    L1GlobalTriggerGTL* m_gtGTL;
-    L1GlobalTriggerFDL* m_gtFDL;
+  std::vector<unsigned int> m_triggerMaskVetoAlgoTrig;
+  std::vector<unsigned int> m_triggerMaskVetoTechTrig;
 
-    /// input tag for muon collection from GMT
-    const edm::InputTag m_muGmtInputTag;
+  L1GlobalTriggerPSB *m_gtPSB;
+  L1GlobalTriggerGTL *m_gtGTL;
+  L1GlobalTriggerFDL *m_gtFDL;
 
-    /// input tag for calorimeter collections from GCT
-    const edm::InputTag m_caloGctInputTag;
+  /// input tag for muon collection from GMT
+  const edm::InputTag m_muGmtInputTag;
 
-    /// input tag for CASTOR record
-    const edm::InputTag m_castorInputTag;
+  /// input tag for calorimeter collections from GCT
+  const edm::InputTag m_caloGctInputTag;
 
-    /// input tag for technical triggers
-    const std::vector<edm::InputTag> m_technicalTriggersInputTags;
+  /// input tag for CASTOR record
+  const edm::InputTag m_castorInputTag;
 
-    /// logical flag to produce the L1 GT DAQ readout record
-    const bool m_produceL1GtDaqRecord;
+  /// input tag for technical triggers
+  const std::vector<edm::InputTag> m_technicalTriggersInputTags;
 
-    /// logical flag to produce the L1 GT EVM readout record
-    const bool m_produceL1GtEvmRecord;
+  /// logical flag to produce the L1 GT DAQ readout record
+  const bool m_produceL1GtDaqRecord;
 
-    /// logical flag to produce the L1 GT object map record
-    const bool m_produceL1GtObjectMapRecord;
+  /// logical flag to produce the L1 GT EVM readout record
+  const bool m_produceL1GtEvmRecord;
 
-    /// logical flag to write the PSB content in the  L1 GT DAQ record
-    const bool m_writePsbL1GtDaqRecord;
+  /// logical flag to produce the L1 GT object map record
+  const bool m_produceL1GtObjectMapRecord;
 
-    /// logical flag to read the technical trigger records
-    const bool m_readTechnicalTriggerRecords;
+  /// logical flag to write the PSB content in the  L1 GT DAQ record
+  const bool m_writePsbL1GtDaqRecord;
 
-    /// number of "bunch crossing in the event" (BxInEvent) to be emulated
-    /// symmetric around L1Accept (BxInEvent = 0):
-    ///    1 (BxInEvent = 0); 3 (F 0 1) (standard record); 5 (E F 0 1 2) (debug record)
-    /// even numbers (except 0) "rounded" to the nearest lower odd number
-    int m_emulateBxInEvent;
+  /// logical flag to read the technical trigger records
+  const bool m_readTechnicalTriggerRecords;
 
-    /// number of BXs in the event corresponding to alternative 0 and 1 in altNrBxBoard()
-    /// EmulateBxInEvent >= max(RecordLength[0], RecordLength[1])
-    /// negative values: take the numbers from event setup, from L1GtParameters
-    const std::vector<int> m_recordLength;
+  /// number of "bunch crossing in the event" (BxInEvent) to be emulated
+  /// symmetric around L1Accept (BxInEvent = 0):
+  ///    1 (BxInEvent = 0); 3 (F 0 1) (standard record); 5 (E F 0 1 2) (debug
+  ///    record)
+  /// even numbers (except 0) "rounded" to the nearest lower odd number
+  int m_emulateBxInEvent;
 
-    /// alternative for number of BX per active board in GT DAQ record: 0 or 1
-    /// the position is identical with the active board bit
-    const unsigned int m_alternativeNrBxBoardDaq;
+  /// number of BXs in the event corresponding to alternative 0 and 1 in
+  /// altNrBxBoard() EmulateBxInEvent >= max(RecordLength[0], RecordLength[1])
+  /// negative values: take the numbers from event setup, from L1GtParameters
+  const std::vector<int> m_recordLength;
 
-    /// alternative for number of BX per active board in GT EVM record: 0 or 1
-    /// the position is identical with the active board bit
-    const unsigned int m_alternativeNrBxBoardEvm;
+  /// alternative for number of BX per active board in GT DAQ record: 0 or 1
+  /// the position is identical with the active board bit
+  const unsigned int m_alternativeNrBxBoardDaq;
 
-    /// length of BST record (in bytes) from parameter set
-    const int m_psBstLengthBytes;
+  /// alternative for number of BX per active board in GT EVM record: 0 or 1
+  /// the position is identical with the active board bit
+  const unsigned int m_alternativeNrBxBoardEvm;
 
-    /// run algorithm triggers
-    ///     if true, unprescaled (all prescale factors 1)
-    ///     will overwrite the event setup
-    const bool m_algorithmTriggersUnprescaled;
+  /// length of BST record (in bytes) from parameter set
+  const int m_psBstLengthBytes;
 
-    ///     if true, unmasked - all enabled (all trigger masks set to 0)
-    ///     will overwrite the event setup
-    const bool m_algorithmTriggersUnmasked;
+  /// run algorithm triggers
+  ///     if true, unprescaled (all prescale factors 1)
+  ///     will overwrite the event setup
+  const bool m_algorithmTriggersUnprescaled;
 
-    /// run technical triggers
-    ///     if true, unprescaled (all prescale factors 1)
-    ///     will overwrite the event setup
-    const bool m_technicalTriggersUnprescaled;
+  ///     if true, unmasked - all enabled (all trigger masks set to 0)
+  ///     will overwrite the event setup
+  const bool m_algorithmTriggersUnmasked;
 
-    ///     if true, unmasked - all enabled (all trigger masks set to 0)
-    ///     will overwrite the event setup
-    const bool m_technicalTriggersUnmasked;
+  /// run technical triggers
+  ///     if true, unprescaled (all prescale factors 1)
+  ///     will overwrite the event setup
+  const bool m_technicalTriggersUnprescaled;
 
-    ///     if true, veto unmasked - all enabled (all trigger veto masks set to 0)
-    ///     will overwrite the event setup
-    const bool m_technicalTriggersVetoUnmasked;
+  ///     if true, unmasked - all enabled (all trigger masks set to 0)
+  ///     will overwrite the event setup
+  const bool m_technicalTriggersUnmasked;
 
-    /// verbosity level
-    const int m_verbosity;
-    const bool m_isDebugEnabled;
+  ///     if true, veto unmasked - all enabled (all trigger veto masks set to 0)
+  ///     will overwrite the event setup
+  const bool m_technicalTriggersVetoUnmasked;
 
+  /// verbosity level
+  const int m_verbosity;
+  const bool m_isDebugEnabled;
 };
 
 #endif /*GlobalTrigger_L1GlobalTrigger_h*/
diff --git a/L1Trigger/GlobalTrigger/src/L1GlobalTriggerFDL.cc b/L1Trigger/GlobalTrigger/src/L1GlobalTriggerFDL.cc
index 30969cded876f..de8687c85ccbf 100644
--- a/L1Trigger/GlobalTrigger/src/L1GlobalTriggerFDL.cc
+++ b/L1Trigger/GlobalTrigger/src/L1GlobalTriggerFDL.cc
@@ -20,530 +20,485 @@
 #include <iostream>
 
 // user include files
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetup.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GtFdlWord.h"
 
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerEvmReadoutRecord.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
 
 #include "L1Trigger/GlobalTrigger/interface/L1GlobalTriggerGTL.h"
 #include "L1Trigger/GlobalTrigger/interface/L1GlobalTriggerPSB.h"
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/MessageLogger/interface/MessageDrop.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "FWCore/Framework/interface/Event.h"
 
-#include "CondFormats/L1TObjects/interface/L1GtFwd.h"
 #include "CondFormats/L1TObjects/interface/L1GtBoard.h"
-
+#include "CondFormats/L1TObjects/interface/L1GtFwd.h"
 
 // forward declarations
 
-
 // constructor
-L1GlobalTriggerFDL::L1GlobalTriggerFDL() :
-    // logical switches
-    m_firstEv(true),
-    m_firstEvLumiSegment(true),
-    m_firstEvRun(true),
-    m_isDebugEnabled(edm::isDebugEnabled())
-{
-
-    // create empty FDL word
-    m_gtFdlWord = new L1GtFdlWord();
-
+L1GlobalTriggerFDL::L1GlobalTriggerFDL()
+    : // logical switches
+      m_firstEv(true), m_firstEvLumiSegment(true), m_firstEvRun(true),
+      m_isDebugEnabled(edm::isDebugEnabled()) {
 
-    // can not reserve memory here for prescale counters - no access to EventSetup
+  // create empty FDL word
+  m_gtFdlWord = new L1GtFdlWord();
 
+  // can not reserve memory here for prescale counters - no access to EventSetup
 }
 
 // destructor
-L1GlobalTriggerFDL::~L1GlobalTriggerFDL()
-{
-
-    reset();
-    delete m_gtFdlWord;
+L1GlobalTriggerFDL::~L1GlobalTriggerFDL() {
 
+  reset();
+  delete m_gtFdlWord;
 }
 
 // Operations
 
 // run FDL
 void L1GlobalTriggerFDL::run(
-    edm::Event& iEvent,
-    const std::vector<int>& prescaleFactorsAlgoTrig,
-    const std::vector<int>& prescaleFactorsTechTrig,
-    const std::vector<unsigned int>& triggerMaskAlgoTrig,
-    const std::vector<unsigned int>& triggerMaskTechTrig,
-    const std::vector<unsigned int>& triggerMaskVetoAlgoTrig,
-    const std::vector<unsigned int>& triggerMaskVetoTechTrig,
-    const std::vector<L1GtBoard>& boardMaps,
-    const int totalBxInEvent,
-    const int iBxInEvent,
-    const unsigned int numberPhysTriggers, const unsigned int numberTechnicalTriggers,
-    const unsigned int numberDaqPartitions,
-    const L1GlobalTriggerGTL* ptrGTL,
-    const L1GlobalTriggerPSB* ptrPSB,
-    const int pfAlgoSetIndex,
-    const int pfTechSetIndex,
-    const bool algorithmTriggersUnprescaled,
+    edm::Event &iEvent, const std::vector<int> &prescaleFactorsAlgoTrig,
+    const std::vector<int> &prescaleFactorsTechTrig,
+    const std::vector<unsigned int> &triggerMaskAlgoTrig,
+    const std::vector<unsigned int> &triggerMaskTechTrig,
+    const std::vector<unsigned int> &triggerMaskVetoAlgoTrig,
+    const std::vector<unsigned int> &triggerMaskVetoTechTrig,
+    const std::vector<L1GtBoard> &boardMaps, const int totalBxInEvent,
+    const int iBxInEvent, const unsigned int numberPhysTriggers,
+    const unsigned int numberTechnicalTriggers,
+    const unsigned int numberDaqPartitions, const L1GlobalTriggerGTL *ptrGTL,
+    const L1GlobalTriggerPSB *ptrPSB, const int pfAlgoSetIndex,
+    const int pfTechSetIndex, const bool algorithmTriggersUnprescaled,
     const bool algorithmTriggersUnmasked,
     const bool technicalTriggersUnprescaled,
     const bool technicalTriggersUnmasked,
-    const bool technicalTriggersVetoUnmasked
-    )
-{
+    const bool technicalTriggersVetoUnmasked) {
 
-    // FIXME get rid of bitset in GTL in order to use only EventSetup
-    const unsigned int numberPhysTriggersSet =
-        L1GlobalTriggerReadoutSetup::NumberPhysTriggers;
+  // FIXME get rid of bitset in GTL in order to use only EventSetup
+  const unsigned int numberPhysTriggersSet =
+      L1GlobalTriggerReadoutSetup::NumberPhysTriggers;
 
-    // get gtlDecisionWord from GTL
-    std::bitset<numberPhysTriggersSet> gtlDecisionWord = ptrGTL->getAlgorithmOR();
+  // get gtlDecisionWord from GTL
+  std::bitset<numberPhysTriggersSet> gtlDecisionWord = ptrGTL->getAlgorithmOR();
 
-    // convert decision word from std::bitset to std::vector<bool>
-    DecisionWord algoDecisionWord(numberPhysTriggers);
+  // convert decision word from std::bitset to std::vector<bool>
+  DecisionWord algoDecisionWord(numberPhysTriggers);
 
-    for (unsigned int iBit = 0; iBit < numberPhysTriggers; ++iBit) {
+  for (unsigned int iBit = 0; iBit < numberPhysTriggers; ++iBit) {
 
-        bool bitValue = gtlDecisionWord.test( iBit );
-        algoDecisionWord[ iBit ] = bitValue;
-    }
+    bool bitValue = gtlDecisionWord.test(iBit);
+    algoDecisionWord[iBit] = bitValue;
+  }
 
-    // prescale counters are reset at the beginning of the luminosity segment
+  // prescale counters are reset at the beginning of the luminosity segment
 
-    if (m_firstEv) {
+  if (m_firstEv) {
 
-        // prescale counters: numberPhysTriggers counters per bunch cross
-        m_prescaleCounterAlgoTrig.reserve(numberPhysTriggers*totalBxInEvent);
+    // prescale counters: numberPhysTriggers counters per bunch cross
+    m_prescaleCounterAlgoTrig.reserve(numberPhysTriggers * totalBxInEvent);
 
-        for (int iBxInEvent = 0; iBxInEvent <= totalBxInEvent; ++iBxInEvent) {
+    for (int iBxInEvent = 0; iBxInEvent <= totalBxInEvent; ++iBxInEvent) {
 
-            m_prescaleCounterAlgoTrig.push_back(prescaleFactorsAlgoTrig);
-        }
-
-        // prescale counters: numberTechnicalTriggers counters per bunch cross
-        m_prescaleCounterTechTrig.reserve(numberTechnicalTriggers*totalBxInEvent);
+      m_prescaleCounterAlgoTrig.push_back(prescaleFactorsAlgoTrig);
+    }
 
-        for (int iBxInEvent = 0; iBxInEvent <= totalBxInEvent; ++iBxInEvent) {
+    // prescale counters: numberTechnicalTriggers counters per bunch cross
+    m_prescaleCounterTechTrig.reserve(numberTechnicalTriggers * totalBxInEvent);
 
-            m_prescaleCounterTechTrig.push_back(prescaleFactorsTechTrig);
-        }
+    for (int iBxInEvent = 0; iBxInEvent <= totalBxInEvent; ++iBxInEvent) {
 
-        m_firstEv = false;
+      m_prescaleCounterTechTrig.push_back(prescaleFactorsTechTrig);
     }
 
-    // TODO FIXME find the beginning of the luminosity segment
-    if (m_firstEvLumiSegment) {
+    m_firstEv = false;
+  }
 
-        m_prescaleCounterAlgoTrig.clear();
-        for (int iBxInEvent = 0; iBxInEvent <= totalBxInEvent; ++iBxInEvent) {
-            m_prescaleCounterAlgoTrig.push_back(prescaleFactorsAlgoTrig);
-        }
-
-        m_prescaleCounterTechTrig.clear();
-        for (int iBxInEvent = 0; iBxInEvent <= totalBxInEvent; ++iBxInEvent) {
-            m_prescaleCounterTechTrig.push_back(prescaleFactorsTechTrig);
-        }
-
-        m_firstEvLumiSegment = false;
+  // TODO FIXME find the beginning of the luminosity segment
+  if (m_firstEvLumiSegment) {
 
+    m_prescaleCounterAlgoTrig.clear();
+    for (int iBxInEvent = 0; iBxInEvent <= totalBxInEvent; ++iBxInEvent) {
+      m_prescaleCounterAlgoTrig.push_back(prescaleFactorsAlgoTrig);
     }
 
+    m_prescaleCounterTechTrig.clear();
+    for (int iBxInEvent = 0; iBxInEvent <= totalBxInEvent; ++iBxInEvent) {
+      m_prescaleCounterTechTrig.push_back(prescaleFactorsTechTrig);
+    }
 
-    // prescale the algorithm, if necessary
+    m_firstEvLumiSegment = false;
+  }
 
-    // iBxInEvent is ... -2 -1 0 1 2 ... while counters are 0 1 2 3 4 ...
-    int inBxInEvent =  totalBxInEvent/2 + iBxInEvent;
+  // prescale the algorithm, if necessary
 
-    for (unsigned int iBit = 0; iBit < numberPhysTriggers; ++iBit) {
+  // iBxInEvent is ... -2 -1 0 1 2 ... while counters are 0 1 2 3 4 ...
+  int inBxInEvent = totalBxInEvent / 2 + iBxInEvent;
 
-        if ((!algorithmTriggersUnprescaled) && (prescaleFactorsAlgoTrig.at(iBit) != 1)) {
+  for (unsigned int iBit = 0; iBit < numberPhysTriggers; ++iBit) {
 
-            bool bitValue = algoDecisionWord.at( iBit );
-            if (bitValue) {
+    if ((!algorithmTriggersUnprescaled) &&
+        (prescaleFactorsAlgoTrig.at(iBit) != 1)) {
 
-                (m_prescaleCounterAlgoTrig.at(inBxInEvent).at(iBit))--;
-                if (m_prescaleCounterAlgoTrig.at(inBxInEvent).at(iBit) == 0) {
+      bool bitValue = algoDecisionWord.at(iBit);
+      if (bitValue) {
 
-                    // bit already true in algoDecisionWord, just reset counter
-                    m_prescaleCounterAlgoTrig.at(inBxInEvent).at(iBit) =
-                        prescaleFactorsAlgoTrig.at(iBit);
+        (m_prescaleCounterAlgoTrig.at(inBxInEvent).at(iBit))--;
+        if (m_prescaleCounterAlgoTrig.at(inBxInEvent).at(iBit) == 0) {
 
-                    //LogTrace("L1GlobalTrigger")
-                    //<< "\nPrescaled algorithm: " << iBit << ". Reset counter to "
-                    //<< prescaleFactorsAlgoTrig.at(iBit) << "\n"
-                    //<< std::endl;
+          // bit already true in algoDecisionWord, just reset counter
+          m_prescaleCounterAlgoTrig.at(inBxInEvent).at(iBit) =
+              prescaleFactorsAlgoTrig.at(iBit);
 
-                } else {
+          // LogTrace("L1GlobalTrigger")
+          //<< "\nPrescaled algorithm: " << iBit << ". Reset counter to "
+          //<< prescaleFactorsAlgoTrig.at(iBit) << "\n"
+          //<< std::endl;
 
-                    // change bit to false
-                    algoDecisionWord[iBit] = false;;
+        } else {
 
-                    //LogTrace("L1GlobalTrigger")
-                    //<< "\nPrescaled algorithm: " << iBit << ". Result set to false"
-                    //<< std::endl;
+          // change bit to false
+          algoDecisionWord[iBit] = false;
+          ;
 
-                }
-            }
+          // LogTrace("L1GlobalTrigger")
+          //<< "\nPrescaled algorithm: " << iBit << ". Result set to false"
+          //<< std::endl;
         }
+      }
     }
+  }
 
-    // algo decision word written in the FDL readout before the trigger mask
-    // in order to allow multiple DAQ partitions
-
-    //
-    // technical triggers
-    //
+  // algo decision word written in the FDL readout before the trigger mask
+  // in order to allow multiple DAQ partitions
 
-    std::vector<bool> techDecisionWord = *(ptrPSB->getGtTechnicalTriggers());
+  //
+  // technical triggers
+  //
 
-    // prescale the technical trigger, if necessary
+  std::vector<bool> techDecisionWord = *(ptrPSB->getGtTechnicalTriggers());
 
-    for (unsigned int iBit = 0; iBit < numberTechnicalTriggers; ++iBit) {
+  // prescale the technical trigger, if necessary
 
-        if ((!technicalTriggersUnprescaled) && (prescaleFactorsTechTrig.at(iBit) != 1)) {
+  for (unsigned int iBit = 0; iBit < numberTechnicalTriggers; ++iBit) {
 
-            bool bitValue = techDecisionWord.at( iBit );
-            if (bitValue) {
+    if ((!technicalTriggersUnprescaled) &&
+        (prescaleFactorsTechTrig.at(iBit) != 1)) {
 
-                (m_prescaleCounterTechTrig.at(inBxInEvent).at(iBit))--;
-                if (m_prescaleCounterTechTrig.at(inBxInEvent).at(iBit) == 0) {
+      bool bitValue = techDecisionWord.at(iBit);
+      if (bitValue) {
 
-                    // bit already true in techDecisionWord, just reset counter
-                    m_prescaleCounterTechTrig.at(inBxInEvent).at(iBit) =
-                        prescaleFactorsTechTrig.at(iBit);
+        (m_prescaleCounterTechTrig.at(inBxInEvent).at(iBit))--;
+        if (m_prescaleCounterTechTrig.at(inBxInEvent).at(iBit) == 0) {
 
-                    //LogTrace("L1GlobalTrigger")
-                    //<< "\nPrescaled algorithm: " << iBit << ". Reset counter to "
-                    //<< prescaleFactorsTechTrig.at(iBit) << "\n"
-                    //<< std::endl;
+          // bit already true in techDecisionWord, just reset counter
+          m_prescaleCounterTechTrig.at(inBxInEvent).at(iBit) =
+              prescaleFactorsTechTrig.at(iBit);
 
-                } else {
+          // LogTrace("L1GlobalTrigger")
+          //<< "\nPrescaled algorithm: " << iBit << ". Reset counter to "
+          //<< prescaleFactorsTechTrig.at(iBit) << "\n"
+          //<< std::endl;
 
-                    // change bit to false
-                    techDecisionWord[iBit] = false;
+        } else {
 
-                    //LogTrace("L1GlobalTrigger")
-                    //<< "\nPrescaled technical trigger: " << iBit << ". Result set to false"
-                    //<< std::endl;
+          // change bit to false
+          techDecisionWord[iBit] = false;
 
-                }
-            }
+          // LogTrace("L1GlobalTrigger")
+          //<< "\nPrescaled technical trigger: " << iBit << ". Result set to
+          // false"
+          //<< std::endl;
         }
+      }
     }
+  }
 
-    // technical trigger decision word written in the FDL readout before the trigger mask
-    // in order to allow multiple DAQ partitions
-
-    //
-    // compute the final decision word per DAQ partition
-    //
+  // technical trigger decision word written in the FDL readout before the
+  // trigger mask in order to allow multiple DAQ partitions
 
-    boost::uint16_t finalOrValue = 0;
+  //
+  // compute the final decision word per DAQ partition
+  //
 
-    for (unsigned int iDaq = 0; iDaq < numberDaqPartitions; ++iDaq) {
+  boost::uint16_t finalOrValue = 0;
 
-        bool daqPartitionFinalOR = false;
+  for (unsigned int iDaq = 0; iDaq < numberDaqPartitions; ++iDaq) {
 
-        // starts with technical trigger veto mask to minimize computation
-        // no algorithm trigger veto mask is implemented up to now in hardware,
-        // therefore do not implement it here
-        bool vetoTechTrig = false;
+    bool daqPartitionFinalOR = false;
 
-        // vetoTechTrig can change only when using trigger veto masks
-        if (!technicalTriggersVetoUnmasked) {
+    // starts with technical trigger veto mask to minimize computation
+    // no algorithm trigger veto mask is implemented up to now in hardware,
+    // therefore do not implement it here
+    bool vetoTechTrig = false;
 
-            for (unsigned int iBit = 0; iBit < numberTechnicalTriggers; ++iBit) {
+    // vetoTechTrig can change only when using trigger veto masks
+    if (!technicalTriggersVetoUnmasked) {
 
-                int triggerMaskVetoTechTrigBit = triggerMaskVetoTechTrig[iBit]
-                        & (1 << iDaq);
-                //LogTrace("L1GlobalTrigger")
-                //<< "\nTechnical trigger bit: " << iBit
-                //<< " mask = " << triggerMaskVetoTechTrigBit
-                //<< " DAQ partition " << iDaq
-                //<< std::endl;
+      for (unsigned int iBit = 0; iBit < numberTechnicalTriggers; ++iBit) {
 
-                if (triggerMaskVetoTechTrigBit && techDecisionWord[iBit]) {
+        int triggerMaskVetoTechTrigBit =
+            triggerMaskVetoTechTrig[iBit] & (1 << iDaq);
+        // LogTrace("L1GlobalTrigger")
+        //<< "\nTechnical trigger bit: " << iBit
+        //<< " mask = " << triggerMaskVetoTechTrigBit
+        //<< " DAQ partition " << iDaq
+        //<< std::endl;
 
-                    daqPartitionFinalOR = false;
-                    vetoTechTrig = true;
+        if (triggerMaskVetoTechTrigBit && techDecisionWord[iBit]) {
 
-                    //LogTrace("L1GlobalTrigger")
-                    //<< "\nVeto mask technical trigger: " << iBit
-                    // << ". FinalOR for DAQ partition " << iDaq << " set to false"
-                    //<< std::endl;
+          daqPartitionFinalOR = false;
+          vetoTechTrig = true;
 
-                    break;
-                }
+          // LogTrace("L1GlobalTrigger")
+          //<< "\nVeto mask technical trigger: " << iBit
+          // << ". FinalOR for DAQ partition " << iDaq << " set to false"
+          //<< std::endl;
 
-            }
+          break;
         }
+      }
+    }
 
-        // apply algorithm and technical trigger masks only if no veto from technical trigger
-        if (!vetoTechTrig) {
-
-            // algorithm trigger mask
-            bool algoFinalOr = false;
-
-            for (unsigned int iBit = 0; iBit < numberPhysTriggers; ++iBit) {
-
-                bool iBitDecision = false;
-
-                int triggerMaskAlgoTrigBit = -1;
-
-                if (algorithmTriggersUnmasked) {
-                    triggerMaskAlgoTrigBit = 0;
-                } else {
-                    triggerMaskAlgoTrigBit = triggerMaskAlgoTrig[iBit] & (1
-                            << iDaq);
-
-                }
-                //LogTrace("L1GlobalTrigger")
-                //<< "\nAlgorithm trigger bit: " << iBit
-                //<< " mask = " << triggerMaskAlgoTrigBit
-                //<< " DAQ partition " << iDaq
-                //<< std::endl;
-
-                if (triggerMaskAlgoTrigBit) {
-                    iBitDecision = false;
+    // apply algorithm and technical trigger masks only if no veto from
+    // technical trigger
+    if (!vetoTechTrig) {
 
-                    //LogTrace("L1GlobalTrigger")
-                    //<< "\nMasked algorithm trigger: " << iBit << ". Result set to false"
-                    //<< std::endl;
-                } else {
-                    iBitDecision = algoDecisionWord[iBit];
-                }
+      // algorithm trigger mask
+      bool algoFinalOr = false;
 
-                algoFinalOr = algoFinalOr || iBitDecision;
+      for (unsigned int iBit = 0; iBit < numberPhysTriggers; ++iBit) {
 
-            }
+        bool iBitDecision = false;
 
-            // set the technical trigger mask: block the corresponding algorithm if bit value is 1
+        int triggerMaskAlgoTrigBit = -1;
 
-            bool techFinalOr = false;
+        if (algorithmTriggersUnmasked) {
+          triggerMaskAlgoTrigBit = 0;
+        } else {
+          triggerMaskAlgoTrigBit = triggerMaskAlgoTrig[iBit] & (1 << iDaq);
+        }
+        // LogTrace("L1GlobalTrigger")
+        //<< "\nAlgorithm trigger bit: " << iBit
+        //<< " mask = " << triggerMaskAlgoTrigBit
+        //<< " DAQ partition " << iDaq
+        //<< std::endl;
+
+        if (triggerMaskAlgoTrigBit) {
+          iBitDecision = false;
+
+          // LogTrace("L1GlobalTrigger")
+          //<< "\nMasked algorithm trigger: " << iBit << ". Result set to false"
+          //<< std::endl;
+        } else {
+          iBitDecision = algoDecisionWord[iBit];
+        }
 
-            for (unsigned int iBit = 0; iBit < numberTechnicalTriggers; ++iBit) {
+        algoFinalOr = algoFinalOr || iBitDecision;
+      }
 
-                bool iBitDecision = false;
+      // set the technical trigger mask: block the corresponding algorithm if
+      // bit value is 1
 
-                int triggerMaskTechTrigBit = -1;
+      bool techFinalOr = false;
 
-                if (technicalTriggersUnmasked) {
-                    triggerMaskTechTrigBit = 0;
-                } else {
-                    triggerMaskTechTrigBit = triggerMaskTechTrig[iBit] & (1
-                            << iDaq);
-                }
-                //LogTrace("L1GlobalTrigger")
-                //<< "\nTechnical trigger bit: " << iBit
-                //<< " mask = " << triggerMaskTechTrigBit
-                //<< std::endl;
+      for (unsigned int iBit = 0; iBit < numberTechnicalTriggers; ++iBit) {
 
-                if (triggerMaskTechTrigBit) {
+        bool iBitDecision = false;
 
-                    iBitDecision = false;
+        int triggerMaskTechTrigBit = -1;
 
-                    //LogTrace("L1GlobalTrigger")
-                    //<< "\nMasked technical trigger: " << iBit << ". Result set to false"
-                    //<< std::endl;
-                } else {
-                    iBitDecision = techDecisionWord[iBit];
-                }
+        if (technicalTriggersUnmasked) {
+          triggerMaskTechTrigBit = 0;
+        } else {
+          triggerMaskTechTrigBit = triggerMaskTechTrig[iBit] & (1 << iDaq);
+        }
+        // LogTrace("L1GlobalTrigger")
+        //<< "\nTechnical trigger bit: " << iBit
+        //<< " mask = " << triggerMaskTechTrigBit
+        //<< std::endl;
 
-                techFinalOr = techFinalOr || iBitDecision;
-            }
+        if (triggerMaskTechTrigBit) {
 
-            daqPartitionFinalOR = algoFinalOr || techFinalOr;
+          iBitDecision = false;
 
+          // LogTrace("L1GlobalTrigger")
+          //<< "\nMasked technical trigger: " << iBit << ". Result set to false"
+          //<< std::endl;
         } else {
-
-            daqPartitionFinalOR = false; // vetoTechTrig
-
+          iBitDecision = techDecisionWord[iBit];
         }
 
-        // push it in finalOrValue
-        boost::uint16_t daqPartitionFinalORValue =
-            static_cast<boost::uint16_t>(daqPartitionFinalOR);
+        techFinalOr = techFinalOr || iBitDecision;
+      }
 
-        finalOrValue = finalOrValue | (daqPartitionFinalORValue << iDaq);
+      daqPartitionFinalOR = algoFinalOr || techFinalOr;
 
-    }
+    } else {
 
+      daqPartitionFinalOR = false; // vetoTechTrig
+    }
 
-    // fill everything we know in the L1GtFdlWord
-
-    typedef std::vector<L1GtBoard>::const_iterator CItBoardMaps;
-    for (CItBoardMaps
-            itBoard = boardMaps.begin();
-            itBoard != boardMaps.end(); ++itBoard) {
-
+    // push it in finalOrValue
+    boost::uint16_t daqPartitionFinalORValue =
+        static_cast<boost::uint16_t>(daqPartitionFinalOR);
 
-        if ((itBoard->gtBoardType() == FDL)) {
+    finalOrValue = finalOrValue | (daqPartitionFinalORValue << iDaq);
+  }
 
-            m_gtFdlWord->setBoardId( itBoard->gtBoardId() );
+  // fill everything we know in the L1GtFdlWord
 
-            // BxInEvent
-            m_gtFdlWord->setBxInEvent(iBxInEvent);
+  typedef std::vector<L1GtBoard>::const_iterator CItBoardMaps;
+  for (CItBoardMaps itBoard = boardMaps.begin(); itBoard != boardMaps.end();
+       ++itBoard) {
 
-            // bunch crossing
+    if ((itBoard->gtBoardType() == FDL)) {
 
-            // fill in emulator the same bunch crossing (12 bits - hardwired number of bits...)
-            // and the same local bunch crossing for all boards
-            int bxCross = iEvent.bunchCrossing();
-            boost::uint16_t bxCrossHw = 0;
-            if ((bxCross & 0xFFF) == bxCross) {
-                bxCrossHw = static_cast<boost::uint16_t> (bxCross);
-            }
-            else {
-                bxCrossHw = 0; // Bx number too large, set to 0!
-                if (m_verbosity) {
-                    LogDebug("L1GlobalTrigger")
-                        << "\nBunch cross number [hex] = "
-                        << std::hex << bxCross
-                        << "\n  larger than 12 bits. Set to 0! \n"
-                        << std::dec << std::endl;
-                }
-            }
+      m_gtFdlWord->setBoardId(itBoard->gtBoardId());
 
-            m_gtFdlWord->setBxNr(bxCrossHw);
+      // BxInEvent
+      m_gtFdlWord->setBxInEvent(iBxInEvent);
 
-            // set event number since last L1 reset generated in FDL
-            m_gtFdlWord->setEventNr(
-                static_cast<boost::uint32_t>(iEvent.id().event()) );
+      // bunch crossing
 
-            // technical trigger decision word
-            m_gtFdlWord->setGtTechnicalTriggerWord(techDecisionWord);
+      // fill in emulator the same bunch crossing (12 bits - hardwired number of
+      // bits...) and the same local bunch crossing for all boards
+      int bxCross = iEvent.bunchCrossing();
+      boost::uint16_t bxCrossHw = 0;
+      if ((bxCross & 0xFFF) == bxCross) {
+        bxCrossHw = static_cast<boost::uint16_t>(bxCross);
+      } else {
+        bxCrossHw = 0; // Bx number too large, set to 0!
+        if (m_verbosity) {
+          LogDebug("L1GlobalTrigger")
+              << "\nBunch cross number [hex] = " << std::hex << bxCross
+              << "\n  larger than 12 bits. Set to 0! \n"
+              << std::dec << std::endl;
+        }
+      }
 
-            // algorithm trigger decision word
-            m_gtFdlWord->setGtDecisionWord(algoDecisionWord);
+      m_gtFdlWord->setBxNr(bxCrossHw);
 
-            // index of prescale factor set - technical triggers and algo
-            m_gtFdlWord->setGtPrescaleFactorIndexTech(static_cast<boost::uint16_t>(pfTechSetIndex));
-            m_gtFdlWord->setGtPrescaleFactorIndexAlgo(static_cast<boost::uint16_t>(pfAlgoSetIndex));
+      // set event number since last L1 reset generated in FDL
+      m_gtFdlWord->setEventNr(
+          static_cast<boost::uint32_t>(iEvent.id().event()));
 
-            // NoAlgo bit FIXME
+      // technical trigger decision word
+      m_gtFdlWord->setGtTechnicalTriggerWord(techDecisionWord);
 
-            // finalOR
-            m_gtFdlWord->setFinalOR(finalOrValue);
+      // algorithm trigger decision word
+      m_gtFdlWord->setGtDecisionWord(algoDecisionWord);
 
-            // orbit number
-            m_gtFdlWord->setOrbitNr(static_cast<boost::uint32_t>(iEvent.orbitNumber()) );
+      // index of prescale factor set - technical triggers and algo
+      m_gtFdlWord->setGtPrescaleFactorIndexTech(
+          static_cast<boost::uint16_t>(pfTechSetIndex));
+      m_gtFdlWord->setGtPrescaleFactorIndexAlgo(
+          static_cast<boost::uint16_t>(pfAlgoSetIndex));
 
-            // luminosity segment number
-            m_gtFdlWord->setLumiSegmentNr(static_cast<boost::uint16_t>(iEvent.luminosityBlock()));
+      // NoAlgo bit FIXME
 
-            // local bunch crossing - set identical with absolute BxNr
-            m_gtFdlWord->setLocalBxNr(bxCrossHw);
+      // finalOR
+      m_gtFdlWord->setFinalOR(finalOrValue);
 
+      // orbit number
+      m_gtFdlWord->setOrbitNr(
+          static_cast<boost::uint32_t>(iEvent.orbitNumber()));
 
-        }
+      // luminosity segment number
+      m_gtFdlWord->setLumiSegmentNr(
+          static_cast<boost::uint16_t>(iEvent.luminosityBlock()));
 
+      // local bunch crossing - set identical with absolute BxNr
+      m_gtFdlWord->setLocalBxNr(bxCrossHw);
     }
-
+  }
 }
 
 // fill the FDL block in the L1 GT DAQ record for iBxInEvent
-void L1GlobalTriggerFDL::fillDaqFdlBlock(const int iBxInEvent,
-        const boost::uint16_t& activeBoardsGtDaq, const int recordLength0,
-        const int recordLength1, const unsigned int altNrBxBoardDaq,
-        const std::vector<L1GtBoard>& boardMaps,
-        L1GlobalTriggerReadoutRecord* gtDaqReadoutRecord)
-{
-
-    typedef std::vector<L1GtBoard>::const_iterator CItBoardMaps;
-    for (CItBoardMaps
-            itBoard = boardMaps.begin();
-            itBoard != boardMaps.end(); ++itBoard) {
-
-        int iPosition = itBoard->gtPositionDaqRecord();
-        if (iPosition > 0) {
+void L1GlobalTriggerFDL::fillDaqFdlBlock(
+    const int iBxInEvent, const boost::uint16_t &activeBoardsGtDaq,
+    const int recordLength0, const int recordLength1,
+    const unsigned int altNrBxBoardDaq, const std::vector<L1GtBoard> &boardMaps,
+    L1GlobalTriggerReadoutRecord *gtDaqReadoutRecord) {
 
-            int iActiveBit = itBoard->gtBitDaqActiveBoards();
-            bool activeBoard = false;
-            bool writeBoard = false;
+  typedef std::vector<L1GtBoard>::const_iterator CItBoardMaps;
+  for (CItBoardMaps itBoard = boardMaps.begin(); itBoard != boardMaps.end();
+       ++itBoard) {
 
-            int recLength = -1;
+    int iPosition = itBoard->gtPositionDaqRecord();
+    if (iPosition > 0) {
 
-            if (iActiveBit >= 0) {
-                activeBoard = activeBoardsGtDaq & ( 1 << iActiveBit );
+      int iActiveBit = itBoard->gtBitDaqActiveBoards();
+      bool activeBoard = false;
+      bool writeBoard = false;
 
-                int altNrBxBoard = (altNrBxBoardDaq & ( 1 << iActiveBit )) >> iActiveBit;
+      int recLength = -1;
 
-                if (altNrBxBoard == 1) {
-                    recLength = recordLength1;
-                } else {
-                    recLength = recordLength0;
-                }
+      if (iActiveBit >= 0) {
+        activeBoard = activeBoardsGtDaq & (1 << iActiveBit);
 
-                int lowBxInEvent = (recLength + 1)/2 - recLength;
-                int uppBxInEvent = (recLength + 1)/2 - 1;
-
-                if ((iBxInEvent >= lowBxInEvent) && (iBxInEvent <= uppBxInEvent)) {
-                    writeBoard = true;
-                }
-
-            }
-
-            if (activeBoard && writeBoard && (itBoard->gtBoardType() == FDL)) {
-
-                gtDaqReadoutRecord->setGtFdlWord(*m_gtFdlWord);
+        int altNrBxBoard = (altNrBxBoardDaq & (1 << iActiveBit)) >> iActiveBit;
 
+        if (altNrBxBoard == 1) {
+          recLength = recordLength1;
+        } else {
+          recLength = recordLength0;
+        }
 
-            }
+        int lowBxInEvent = (recLength + 1) / 2 - recLength;
+        int uppBxInEvent = (recLength + 1) / 2 - 1;
 
+        if ((iBxInEvent >= lowBxInEvent) && (iBxInEvent <= uppBxInEvent)) {
+          writeBoard = true;
         }
+      }
 
-    }
-
+      if (activeBoard && writeBoard && (itBoard->gtBoardType() == FDL)) {
 
+        gtDaqReadoutRecord->setGtFdlWord(*m_gtFdlWord);
+      }
+    }
+  }
 }
 
 // fill the FDL block in the L1 GT EVM record for iBxInEvent
-void L1GlobalTriggerFDL::fillEvmFdlBlock(const int iBxInEvent,
-        const boost::uint16_t& activeBoardsGtEvm, const int recordLength0,
-        const int recordLength1, const unsigned int altNrBxBoardEvm,
-        const std::vector<L1GtBoard>& boardMaps,
-        L1GlobalTriggerEvmReadoutRecord* gtEvmReadoutRecord)
-{
+void L1GlobalTriggerFDL::fillEvmFdlBlock(
+    const int iBxInEvent, const boost::uint16_t &activeBoardsGtEvm,
+    const int recordLength0, const int recordLength1,
+    const unsigned int altNrBxBoardEvm, const std::vector<L1GtBoard> &boardMaps,
+    L1GlobalTriggerEvmReadoutRecord *gtEvmReadoutRecord) {
 
-    typedef std::vector<L1GtBoard>::const_iterator CItBoardMaps;
-    for (CItBoardMaps
-            itBoard = boardMaps.begin();
-            itBoard != boardMaps.end(); ++itBoard) {
+  typedef std::vector<L1GtBoard>::const_iterator CItBoardMaps;
+  for (CItBoardMaps itBoard = boardMaps.begin(); itBoard != boardMaps.end();
+       ++itBoard) {
 
-        int iPosition = itBoard->gtPositionEvmRecord();
-        if (iPosition > 0) {
+    int iPosition = itBoard->gtPositionEvmRecord();
+    if (iPosition > 0) {
 
-            int iActiveBit = itBoard->gtBitEvmActiveBoards();
-            bool activeBoard = false;
+      int iActiveBit = itBoard->gtBitEvmActiveBoards();
+      bool activeBoard = false;
 
-            if (iActiveBit >= 0) {
-                activeBoard = activeBoardsGtEvm & (1 << iActiveBit);
-            }
+      if (iActiveBit >= 0) {
+        activeBoard = activeBoardsGtEvm & (1 << iActiveBit);
+      }
 
-            if (activeBoard && (itBoard->gtBoardType() == FDL)) {
-
-                gtEvmReadoutRecord->setGtFdlWord(*m_gtFdlWord);
-
-
-            }
-
-        }
+      if (activeBoard && (itBoard->gtBoardType() == FDL)) {
 
+        gtEvmReadoutRecord->setGtFdlWord(*m_gtFdlWord);
+      }
     }
-
+  }
 }
 
-
 // clear FDL
-void L1GlobalTriggerFDL::reset()
-{
-
-    m_gtFdlWord->reset();
+void L1GlobalTriggerFDL::reset() {
 
-    // do NOT reset the prescale counters
+  m_gtFdlWord->reset();
 
+  // do NOT reset the prescale counters
 }
diff --git a/L1Trigger/GlobalTrigger/src/L1GlobalTriggerFunctions.cc b/L1Trigger/GlobalTrigger/src/L1GlobalTriggerFunctions.cc
index 3ecc388cadf2e..20c9f51b1f3d8 100644
--- a/L1Trigger/GlobalTrigger/src/L1GlobalTriggerFunctions.cc
+++ b/L1Trigger/GlobalTrigger/src/L1GlobalTriggerFunctions.cc
@@ -10,42 +10,40 @@
 
 // factorial function
 
-int factorial(int n) {
-    return (n <= 0) ? 1 : (n * factorial(n - 1));
-}
+int factorial(int n) { return (n <= 0) ? 1 : (n * factorial(n - 1)); }
 
 // hex string to a vector of 64-bit integers
-bool hexStringToInt64(const std::string& hexString,
-        std::vector<unsigned long long>& vecInt64) {
+bool hexStringToInt64(const std::string &hexString,
+                      std::vector<unsigned long long> &vecInt64) {
 
-    int iVec = 0;
-    size_t initialPos = 0;
-    unsigned long long iValue = 0ULL;
+  int iVec = 0;
+  size_t initialPos = 0;
+  unsigned long long iValue = 0ULL;
 
-    do {
+  do {
 
-        iValue = 0ULL;
+    iValue = 0ULL;
 
-        if (stringToNumber<unsigned long long> (iValue,
-                hexString.substr(initialPos, 16), std::hex)) {
+    if (stringToNumber<unsigned long long>(
+            iValue, hexString.substr(initialPos, 16), std::hex)) {
 
-            LogTrace("L1GlobalTrigger") << "\n  String " << hexString.substr(
-                    initialPos, 16) << " converted to hex value 0x" << std::hex
-                    << iValue << std::dec << std::endl;
+      LogTrace("L1GlobalTrigger")
+          << "\n  String " << hexString.substr(initialPos, 16)
+          << " converted to hex value 0x" << std::hex << iValue << std::dec
+          << std::endl;
 
-            vecInt64[iVec] = iValue;
-        } else {
-            LogTrace("L1GlobalTrigger")
-                    << "\nstringToNumber failed to convert string "
-                    << hexString.substr(initialPos, 16) << std::endl;
+      vecInt64[iVec] = iValue;
+    } else {
+      LogTrace("L1GlobalTrigger")
+          << "\nstringToNumber failed to convert string "
+          << hexString.substr(initialPos, 16) << std::endl;
 
-            return false;
-        }
+      return false;
+    }
 
-        initialPos = +16;
-        iVec++;
-    } while (hexString.size() >= (initialPos + 16));
+    initialPos = +16;
+    iVec++;
+  } while (hexString.size() >= (initialPos + 16));
 
-    return true;
+  return true;
 }
-
diff --git a/L1Trigger/GlobalTrigger/src/L1GlobalTriggerGTL.cc b/L1Trigger/GlobalTrigger/src/L1GlobalTriggerGTL.cc
index e680d901f9b14..9085cfe17e866 100644
--- a/L1Trigger/GlobalTrigger/src/L1GlobalTriggerGTL.cc
+++ b/L1Trigger/GlobalTrigger/src/L1GlobalTriggerGTL.cc
@@ -24,741 +24,699 @@
 
 #include "CondFormats/L1TObjects/interface/L1GtFwd.h"
 
-#include "CondFormats/L1TObjects/interface/L1GtTriggerMenu.h"
 #include "CondFormats/DataRecord/interface/L1GtTriggerMenuRcd.h"
+#include "CondFormats/L1TObjects/interface/L1GtTriggerMenu.h"
 
-#include "CondFormats/L1TObjects/interface/L1GtCondition.h"
 #include "CondFormats/L1TObjects/interface/L1GtAlgorithm.h"
+#include "CondFormats/L1TObjects/interface/L1GtCondition.h"
 
-#include "CondFormats/L1TObjects/interface/L1GtMuonTemplate.h"
+#include "CondFormats/L1TObjects/interface/L1GtBptxTemplate.h"
 #include "CondFormats/L1TObjects/interface/L1GtCaloTemplate.h"
+#include "CondFormats/L1TObjects/interface/L1GtCastorTemplate.h"
+#include "CondFormats/L1TObjects/interface/L1GtCorrelationTemplate.h"
 #include "CondFormats/L1TObjects/interface/L1GtEnergySumTemplate.h"
-#include "CondFormats/L1TObjects/interface/L1GtJetCountsTemplate.h"
+#include "CondFormats/L1TObjects/interface/L1GtExternalTemplate.h"
 #include "CondFormats/L1TObjects/interface/L1GtHfBitCountsTemplate.h"
 #include "CondFormats/L1TObjects/interface/L1GtHfRingEtSumsTemplate.h"
-#include "CondFormats/L1TObjects/interface/L1GtCastorTemplate.h"
-#include "CondFormats/L1TObjects/interface/L1GtBptxTemplate.h"
-#include "CondFormats/L1TObjects/interface/L1GtExternalTemplate.h"
-#include "CondFormats/L1TObjects/interface/L1GtCorrelationTemplate.h"
+#include "CondFormats/L1TObjects/interface/L1GtJetCountsTemplate.h"
+#include "CondFormats/L1TObjects/interface/L1GtMuonTemplate.h"
 
-#include "CondFormats/L1TObjects/interface/L1MuTriggerScales.h"
+#include "CondFormats/DataRecord/interface/L1CaloGeometryRecord.h"
 #include "CondFormats/DataRecord/interface/L1MuTriggerScalesRcd.h"
 #include "CondFormats/L1TObjects/interface/L1CaloGeometry.h"
-#include "CondFormats/DataRecord/interface/L1CaloGeometryRecord.h"
+#include "CondFormats/L1TObjects/interface/L1MuTriggerScales.h"
 
-#include "L1Trigger/GlobalTrigger/interface/L1GtConditionEvaluation.h"
 #include "L1Trigger/GlobalTrigger/interface/L1GtAlgorithmEvaluation.h"
+#include "L1Trigger/GlobalTrigger/interface/L1GtConditionEvaluation.h"
 
 #include "L1Trigger/GlobalTrigger/interface/L1GlobalTriggerPSB.h"
 
-#include "L1Trigger/GlobalTrigger/interface/L1GtMuonCondition.h"
+#include "L1Trigger/GlobalTrigger/interface/L1GtBptxCondition.h"
 #include "L1Trigger/GlobalTrigger/interface/L1GtCaloCondition.h"
+#include "L1Trigger/GlobalTrigger/interface/L1GtCastorCondition.h"
+#include "L1Trigger/GlobalTrigger/interface/L1GtCorrelationCondition.h"
 #include "L1Trigger/GlobalTrigger/interface/L1GtEnergySumCondition.h"
-#include "L1Trigger/GlobalTrigger/interface/L1GtJetCountsCondition.h"
+#include "L1Trigger/GlobalTrigger/interface/L1GtExternalCondition.h"
 #include "L1Trigger/GlobalTrigger/interface/L1GtHfBitCountsCondition.h"
 #include "L1Trigger/GlobalTrigger/interface/L1GtHfRingEtSumsCondition.h"
-#include "L1Trigger/GlobalTrigger/interface/L1GtCastorCondition.h"
-#include "L1Trigger/GlobalTrigger/interface/L1GtBptxCondition.h"
-#include "L1Trigger/GlobalTrigger/interface/L1GtExternalCondition.h"
-#include "L1Trigger/GlobalTrigger/interface/L1GtCorrelationCondition.h"
+#include "L1Trigger/GlobalTrigger/interface/L1GtJetCountsCondition.h"
+#include "L1Trigger/GlobalTrigger/interface/L1GtMuonCondition.h"
 
 #include "L1Trigger/GlobalTrigger/interface/L1GtEtaPhiConversions.h"
 
 #include "FWCore/Utilities/interface/Exception.h"
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/MessageLogger/interface/MessageDrop.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
 
 // forward declarations
 
 // constructor
-L1GlobalTriggerGTL::L1GlobalTriggerGTL(const edm::InputTag & m_muGmtInputTag,edm::ConsumesCollector && iC) :
-    m_candL1Mu( new std::vector<const L1MuGMTCand*>),
-    m_isDebugEnabled(edm::isDebugEnabled())
-{
+L1GlobalTriggerGTL::L1GlobalTriggerGTL(const edm::InputTag &m_muGmtInputTag,
+                                       edm::ConsumesCollector &&iC)
+    : m_candL1Mu(new std::vector<const L1MuGMTCand *>),
+      m_isDebugEnabled(edm::isDebugEnabled()) {
 
-    m_gtlAlgorithmOR.reset();
-    m_gtlDecisionWord.reset();
+  m_gtlAlgorithmOR.reset();
+  m_gtlDecisionWord.reset();
 
-    // initialize cached IDs
-    m_l1GtMenuCacheID = 0ULL;
-    m_l1CaloGeometryCacheID = 0ULL;
-    m_l1MuTriggerScalesCacheID = 0ULL;
+  // initialize cached IDs
+  m_l1GtMenuCacheID = 0ULL;
+  m_l1CaloGeometryCacheID = 0ULL;
+  m_l1MuTriggerScalesCacheID = 0ULL;
 
-    // pointer to conversion - actually done in the event loop (cached)
-    m_gtEtaPhiConversions = new L1GtEtaPhiConversions();
-    m_gtEtaPhiConversions->setVerbosity(m_verbosity);
-
-    iC.consumes<std::vector<L1MuGMTCand> >(m_muGmtInputTag);
+  // pointer to conversion - actually done in the event loop (cached)
+  m_gtEtaPhiConversions = new L1GtEtaPhiConversions();
+  m_gtEtaPhiConversions->setVerbosity(m_verbosity);
 
+  iC.consumes<std::vector<L1MuGMTCand>>(m_muGmtInputTag);
 }
 
 // destructor
 L1GlobalTriggerGTL::~L1GlobalTriggerGTL() {
 
-    reset();
-    delete m_candL1Mu;
-    delete m_gtEtaPhiConversions;
-
+  reset();
+  delete m_candL1Mu;
+  delete m_gtEtaPhiConversions;
 }
 
 // operations
 void L1GlobalTriggerGTL::init(const int nrL1Mu, const int numberPhysTriggers) {
 
-    m_candL1Mu->reserve(nrL1Mu);
+  m_candL1Mu->reserve(nrL1Mu);
 
-    // FIXME move from bitset to std::vector<bool> to be able to use
-    // numberPhysTriggers from EventSetup
+  // FIXME move from bitset to std::vector<bool> to be able to use
+  // numberPhysTriggers from EventSetup
 
-    //m_gtlAlgorithmOR.reserve(numberPhysTriggers);
-    //m_gtlAlgorithmOR.assign(numberPhysTriggers, false);
-
-    //m_gtlDecisionWord.reserve(numberPhysTriggers);
-    //m_gtlDecisionWord.assign(numberPhysTriggers, false);
+  // m_gtlAlgorithmOR.reserve(numberPhysTriggers);
+  // m_gtlAlgorithmOR.assign(numberPhysTriggers, false);
 
+  // m_gtlDecisionWord.reserve(numberPhysTriggers);
+  // m_gtlDecisionWord.assign(numberPhysTriggers, false);
 }
 
 // receive data from Global Muon Trigger
-void L1GlobalTriggerGTL::receiveGmtObjectData(edm::Event& iEvent,
-    const edm::InputTag& muGmtInputTag, const int iBxInEvent, const bool receiveMu,
-    const int nrL1Mu) {
+void L1GlobalTriggerGTL::receiveGmtObjectData(
+    edm::Event &iEvent, const edm::InputTag &muGmtInputTag,
+    const int iBxInEvent, const bool receiveMu, const int nrL1Mu) {
+
+  if (m_verbosity) {
+    LogDebug("L1GlobalTrigger")
+        << "\n**** L1GlobalTriggerGTL receiving muon data for BxInEvent = "
+        << iBxInEvent << "\n     from input tag " << muGmtInputTag << "\n"
+        << std::endl;
+  }
+
+  reset();
+
+  // get data from Global Muon Trigger
+  if (receiveMu) {
+
+    edm::Handle<std::vector<L1MuGMTCand>> muonData;
+    iEvent.getByLabel(muGmtInputTag, muonData);
+
+    if (!muonData.isValid()) {
+      if (m_verbosity) {
+        edm::LogWarning("L1GlobalTrigger")
+            << "\nWarning: std::vector<L1MuGMTCand> with input tag "
+            << muGmtInputTag
+            << "\nrequested in configuration, but not found in the event.\n"
+            << std::endl;
+      }
+    } else {
 
-    if (m_verbosity) {
-        LogDebug("L1GlobalTrigger")
-                << "\n**** L1GlobalTriggerGTL receiving muon data for BxInEvent = "
-                << iBxInEvent << "\n     from input tag " << muGmtInputTag << "\n"
-                << std::endl;
+      std::vector<L1MuGMTCand>::const_iterator itMuon;
+      for (itMuon = muonData->begin(); itMuon != muonData->end(); itMuon++) {
+        if ((*itMuon).bx() == iBxInEvent) {
 
+          (*m_candL1Mu).push_back(&(*itMuon));
+          // LogTrace("L1GlobalTrigger") << (*itMuon)
+          //        << std::endl;
+        }
+      }
     }
+  }
 
-    reset();
+  if (m_verbosity && m_isDebugEnabled) {
+    printGmtData(iBxInEvent);
+  }
+}
 
-    // get data from Global Muon Trigger
-    if (receiveMu) {
+// run GTL
+void L1GlobalTriggerGTL::run(
+    edm::Event &iEvent, const edm::EventSetup &evSetup,
+    const L1GlobalTriggerPSB *ptrGtPSB, const bool produceL1GtObjectMapRecord,
+    const int iBxInEvent, L1GlobalTriggerObjectMapRecord *gtObjectMapRecord,
+    const unsigned int numberPhysTriggers, const int nrL1Mu,
+    const int nrL1NoIsoEG, const int nrL1IsoEG, const int nrL1CenJet,
+    const int nrL1ForJet, const int nrL1TauJet, const int nrL1JetCounts,
+    const int ifMuEtaNumberBits, const int ifCaloEtaNumberBits) {
 
-        edm::Handle<std::vector<L1MuGMTCand> > muonData;
-        iEvent.getByLabel(muGmtInputTag, muonData);
+  // get / update the trigger menu from the EventSetup
+  // local cache & check on cacheIdentifier
 
-        if (!muonData.isValid()) {
-            if (m_verbosity) {
-                edm::LogWarning("L1GlobalTrigger")
-                        << "\nWarning: std::vector<L1MuGMTCand> with input tag "
-                        << muGmtInputTag
-                        << "\nrequested in configuration, but not found in the event.\n"
-                        << std::endl;
-            }
-        } else {
+  unsigned long long l1GtMenuCacheID =
+      evSetup.get<L1GtTriggerMenuRcd>().cacheIdentifier();
 
-            std::vector<L1MuGMTCand>::const_iterator itMuon;
-            for (itMuon = muonData->begin(); itMuon != muonData->end(); itMuon++) {
-                if ((*itMuon).bx() == iBxInEvent) {
+  if (m_l1GtMenuCacheID != l1GtMenuCacheID) {
 
-                    (*m_candL1Mu).push_back(&(*itMuon));
-                    //LogTrace("L1GlobalTrigger") << (*itMuon)
-                    //        << std::endl;
+    edm::ESHandle<L1GtTriggerMenu> l1GtMenu;
+    evSetup.get<L1GtTriggerMenuRcd>().get(l1GtMenu);
+    m_l1GtMenu = l1GtMenu.product();
+    m_l1GtMenuCacheID = l1GtMenuCacheID;
+  }
 
-                }
+  const std::vector<ConditionMap> &conditionMap = m_l1GtMenu->gtConditionMap();
+  const AlgorithmMap &algorithmMap = m_l1GtMenu->gtAlgorithmMap();
 
-            }
+  const std::vector<std::vector<L1GtMuonTemplate>> &corrMuon =
+      m_l1GtMenu->corMuonTemplate();
 
-        }
-    }
+  const std::vector<std::vector<L1GtCaloTemplate>> &corrCalo =
+      m_l1GtMenu->corCaloTemplate();
 
-    if (m_verbosity && m_isDebugEnabled) {
-        printGmtData(iBxInEvent);
-    }
+  const std::vector<std::vector<L1GtEnergySumTemplate>> &corrEnergySum =
+      m_l1GtMenu->corEnergySumTemplate();
 
-}
+  // conversion needed for correlation conditions
+  // done in the condition loop when the first correlation template is in the
+  // menu
+  bool convertScale = false;
 
-// run GTL
-void L1GlobalTriggerGTL::run(
-        edm::Event& iEvent, const edm::EventSetup& evSetup,
-        const L1GlobalTriggerPSB* ptrGtPSB,
-        const bool produceL1GtObjectMapRecord,
-        const int iBxInEvent,
-        L1GlobalTriggerObjectMapRecord* gtObjectMapRecord,
-        const unsigned int numberPhysTriggers,
-        const int nrL1Mu,
-        const int nrL1NoIsoEG, const int nrL1IsoEG,
-        const int nrL1CenJet, const int nrL1ForJet, const int nrL1TauJet,
-        const int nrL1JetCounts,
-        const int ifMuEtaNumberBits, const int ifCaloEtaNumberBits) {
-
-
-	// get / update the trigger menu from the EventSetup
-    // local cache & check on cacheIdentifier
-
-    unsigned long long l1GtMenuCacheID = evSetup.get<L1GtTriggerMenuRcd>().cacheIdentifier();
-
-    if (m_l1GtMenuCacheID != l1GtMenuCacheID) {
-
-        edm::ESHandle< L1GtTriggerMenu> l1GtMenu;
-        evSetup.get< L1GtTriggerMenuRcd>().get(l1GtMenu) ;
-        m_l1GtMenu =  l1GtMenu.product();
-        m_l1GtMenuCacheID = l1GtMenuCacheID;
-    }
+  // get / update the calorimeter geometry from the EventSetup
+  // local cache & check on cacheIdentifier
+  unsigned long long l1CaloGeometryCacheID =
+      evSetup.get<L1CaloGeometryRecord>().cacheIdentifier();
 
-    const std::vector<ConditionMap>& conditionMap = m_l1GtMenu->gtConditionMap();
-    const AlgorithmMap& algorithmMap = m_l1GtMenu->gtAlgorithmMap();
+  if (m_l1CaloGeometryCacheID != l1CaloGeometryCacheID) {
 
-    const std::vector<std::vector<L1GtMuonTemplate> >& corrMuon =
-            m_l1GtMenu->corMuonTemplate();
+    edm::ESHandle<L1CaloGeometry> l1CaloGeometry;
+    evSetup.get<L1CaloGeometryRecord>().get(l1CaloGeometry);
+    m_l1CaloGeometry = l1CaloGeometry.product();
 
-    const std::vector<std::vector<L1GtCaloTemplate> >& corrCalo =
-            m_l1GtMenu->corCaloTemplate();
+    m_l1CaloGeometryCacheID = l1CaloGeometryCacheID;
+    convertScale = true;
+  }
 
-    const std::vector<std::vector<L1GtEnergySumTemplate> >& corrEnergySum =
-            m_l1GtMenu->corEnergySumTemplate();
+  // get / update the eta and phi muon trigger scales from the EventSetup
+  // local cache & check on cacheIdentifier
+  unsigned long long l1MuTriggerScalesCacheID =
+      evSetup.get<L1MuTriggerScalesRcd>().cacheIdentifier();
 
-    // conversion needed for correlation conditions
-    // done in the condition loop when the first correlation template is in the menu
-    bool convertScale = false;
+  if (m_l1MuTriggerScalesCacheID != l1MuTriggerScalesCacheID) {
 
-    // get / update the calorimeter geometry from the EventSetup
-    // local cache & check on cacheIdentifier
-    unsigned long long l1CaloGeometryCacheID =
-            evSetup.get<L1CaloGeometryRecord>().cacheIdentifier();
+    edm::ESHandle<L1MuTriggerScales> l1MuTriggerScales;
+    evSetup.get<L1MuTriggerScalesRcd>().get(l1MuTriggerScales);
+    m_l1MuTriggerScales = l1MuTriggerScales.product();
 
-    if (m_l1CaloGeometryCacheID != l1CaloGeometryCacheID) {
+    m_l1MuTriggerScalesCacheID = l1MuTriggerScalesCacheID;
+    convertScale = true;
+  }
 
-        edm::ESHandle<L1CaloGeometry> l1CaloGeometry;
-        evSetup.get<L1CaloGeometryRecord>().get(l1CaloGeometry) ;
-        m_l1CaloGeometry =  l1CaloGeometry.product();
+  if (convertScale) {
+    m_gtEtaPhiConversions->setVerbosity(m_verbosity);
+    m_gtEtaPhiConversions->convertL1Scales(
+        m_l1CaloGeometry, m_l1MuTriggerScales, ifCaloEtaNumberBits,
+        ifMuEtaNumberBits);
 
-        m_l1CaloGeometryCacheID = l1CaloGeometryCacheID;
-        convertScale = true;
+    // print the conversions if DEBUG and verbosity enabled
 
+    if (m_verbosity && m_isDebugEnabled) {
+      std::ostringstream myCout;
+      m_gtEtaPhiConversions->print(myCout);
+
+      LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
     }
 
-    // get / update the eta and phi muon trigger scales from the EventSetup
-    // local cache & check on cacheIdentifier
-    unsigned long long l1MuTriggerScalesCacheID =
-            evSetup.get<L1MuTriggerScalesRcd>().cacheIdentifier();
+    // set convertScale to false to avoid executing the conversion
+    // more than once - in case the scales change it will be set to true
+    // in the cache check
+    convertScale = false;
+  }
 
-    if (m_l1MuTriggerScalesCacheID != l1MuTriggerScalesCacheID) {
+  // loop over condition maps (one map per condition chip)
+  // then loop over conditions in the map
+  // save the results in temporary maps
 
-        edm::ESHandle< L1MuTriggerScales> l1MuTriggerScales;
-        evSetup.get< L1MuTriggerScalesRcd>().get(l1MuTriggerScales);
-        m_l1MuTriggerScales = l1MuTriggerScales.product();
+  // never happens in production but at first event...
+  if (m_conditionResultMaps.size() != conditionMap.size()) {
+    m_conditionResultMaps.clear();
+    m_conditionResultMaps.resize(conditionMap.size());
+  }
 
-        m_l1MuTriggerScalesCacheID = l1MuTriggerScalesCacheID;
-        convertScale = true;
-    }
+  int iChip = -1;
 
-    if (convertScale) {
-        m_gtEtaPhiConversions->setVerbosity(m_verbosity);
-        m_gtEtaPhiConversions->convertL1Scales(m_l1CaloGeometry,
-                m_l1MuTriggerScales, ifCaloEtaNumberBits, ifMuEtaNumberBits);
+  for (std::vector<ConditionMap>::const_iterator itCondOnChip =
+           conditionMap.begin();
+       itCondOnChip != conditionMap.end(); itCondOnChip++) {
 
-        // print the conversions if DEBUG and verbosity enabled
+    iChip++;
 
-        if (m_verbosity && m_isDebugEnabled) {
-            std::ostringstream myCout;
-            m_gtEtaPhiConversions->print(myCout);
+    // L1GtAlgorithmEvaluation::ConditionEvaluationMap cMapResults;
+    // L1GtAlgorithmEvaluation::ConditionEvaluationMap
+    // cMapResults((*itCondOnChip).size()); // hash map
+    L1GtAlgorithmEvaluation::ConditionEvaluationMap &cMapResults =
+        m_conditionResultMaps[iChip];
 
-            LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
-        }
-
-        // set convertScale to false to avoid executing the conversion
-        // more than once - in case the scales change it will be set to true
-        // in the cache check
-        convertScale = false;
-    }
+    for (CItCond itCond = itCondOnChip->begin(); itCond != itCondOnChip->end();
+         itCond++) {
 
+      // evaluate condition
+      switch ((itCond->second)->condCategory()) {
+      case CondMuon: {
 
-    // loop over condition maps (one map per condition chip)
-    // then loop over conditions in the map
-    // save the results in temporary maps
+        L1GtMuonCondition *muCondition = new L1GtMuonCondition(
+            itCond->second, this, nrL1Mu, ifMuEtaNumberBits);
 
-    // never happens in production but at first event...
-    if (m_conditionResultMaps.size() != conditionMap.size()) {
-        m_conditionResultMaps.clear();
-        m_conditionResultMaps.resize(conditionMap.size());
-    }
-    
-    int iChip = -1;
+        muCondition->setVerbosity(m_verbosity);
+        muCondition->setGtCorrParDeltaPhiNrBins(
+            (m_gtEtaPhiConversions->gtObjectNrBinsPhi(Mu)) / 2 + 1);
+        muCondition->evaluateConditionStoreResult();
 
-    for (std::vector<ConditionMap>::const_iterator
-    		itCondOnChip = conditionMap.begin(); itCondOnChip != conditionMap.end(); itCondOnChip++) {
+        cMapResults[itCond->first] = muCondition;
 
-        iChip++;
+        if (m_verbosity && m_isDebugEnabled) {
+          std::ostringstream myCout;
+          muCondition->print(myCout);
 
-        //L1GtAlgorithmEvaluation::ConditionEvaluationMap cMapResults;
-        // L1GtAlgorithmEvaluation::ConditionEvaluationMap cMapResults((*itCondOnChip).size()); // hash map
-        L1GtAlgorithmEvaluation::ConditionEvaluationMap& cMapResults =
-                m_conditionResultMaps[iChip];
+          LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
+        }
 
-        for (CItCond itCond = itCondOnChip->begin(); itCond != itCondOnChip->end(); itCond++) {
+        // delete muCondition;
 
-            // evaluate condition
-            switch ((itCond->second)->condCategory()) {
-                case CondMuon: {
+      } break;
+      case CondCalo: {
 
-                    L1GtMuonCondition* muCondition = new L1GtMuonCondition(itCond->second, this,
-                            nrL1Mu, ifMuEtaNumberBits);
+        L1GtCaloCondition *caloCondition = new L1GtCaloCondition(
+            itCond->second, ptrGtPSB, nrL1NoIsoEG, nrL1IsoEG, nrL1CenJet,
+            nrL1ForJet, nrL1TauJet, ifCaloEtaNumberBits);
 
-                    muCondition->setVerbosity(m_verbosity);
-                    muCondition->setGtCorrParDeltaPhiNrBins(
-                            (m_gtEtaPhiConversions->gtObjectNrBinsPhi(Mu)) / 2
-                                    + 1);
-                    muCondition->evaluateConditionStoreResult();
+        caloCondition->setVerbosity(m_verbosity);
+        caloCondition->setGtCorrParDeltaPhiNrBins(
+            (m_gtEtaPhiConversions->gtObjectNrBinsPhi(
+                ((itCond->second)->objectType())[0])) /
+                2 +
+            1);
+        caloCondition->evaluateConditionStoreResult();
 
-                    cMapResults[itCond->first] = muCondition;
+        cMapResults[itCond->first] = caloCondition;
 
-                    if (m_verbosity && m_isDebugEnabled) {
-                        std::ostringstream myCout;
-                        muCondition->print(myCout);
+        if (m_verbosity && m_isDebugEnabled) {
+          std::ostringstream myCout;
+          caloCondition->print(myCout);
 
-                        LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
-                    }
+          LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
+        }
+        //                    delete caloCondition;
 
-                    //delete muCondition;
+      } break;
+      case CondEnergySum: {
+        L1GtEnergySumCondition *eSumCondition =
+            new L1GtEnergySumCondition(itCond->second, ptrGtPSB);
 
-                }
-                    break;
-                case CondCalo: {
+        eSumCondition->setVerbosity(m_verbosity);
+        eSumCondition->evaluateConditionStoreResult();
 
-                    L1GtCaloCondition* caloCondition = new L1GtCaloCondition(
-                            itCond->second, ptrGtPSB,
-                            nrL1NoIsoEG,
-                            nrL1IsoEG,
-                            nrL1CenJet,
-                            nrL1ForJet,
-                            nrL1TauJet,
-                            ifCaloEtaNumberBits);
+        cMapResults[itCond->first] = eSumCondition;
 
-                    caloCondition->setVerbosity(m_verbosity);
-                    caloCondition->setGtCorrParDeltaPhiNrBins(
-                            (m_gtEtaPhiConversions->gtObjectNrBinsPhi(
-                                    ((itCond->second)->objectType())[0])) / 2
-                                    + 1);
-                    caloCondition->evaluateConditionStoreResult();
+        if (m_verbosity && m_isDebugEnabled) {
+          std::ostringstream myCout;
+          eSumCondition->print(myCout);
 
-                    cMapResults[itCond->first] = caloCondition;
+          LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
+        }
+        //                    delete eSumCondition;
 
-                    if (m_verbosity && m_isDebugEnabled) {
-                        std::ostringstream myCout;
-                        caloCondition->print(myCout);
+      } break;
+      case CondJetCounts: {
+        L1GtJetCountsCondition *jcCondition =
+            new L1GtJetCountsCondition(itCond->second, ptrGtPSB, nrL1JetCounts);
 
-                        LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
-                    }
-                    //                    delete caloCondition;
+        jcCondition->setVerbosity(m_verbosity);
+        jcCondition->evaluateConditionStoreResult();
 
-                }
-                    break;
-                case CondEnergySum: {
-                    L1GtEnergySumCondition* eSumCondition = new L1GtEnergySumCondition(
-                            itCond->second, ptrGtPSB);
+        cMapResults[itCond->first] = jcCondition;
 
-                    eSumCondition->setVerbosity(m_verbosity);
-                    eSumCondition->evaluateConditionStoreResult();
+        if (m_verbosity && m_isDebugEnabled) {
+          std::ostringstream myCout;
+          jcCondition->print(myCout);
 
-                    cMapResults[itCond->first] = eSumCondition;
+          LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
+        }
 
-                    if (m_verbosity && m_isDebugEnabled) {
-                        std::ostringstream myCout;
-                        eSumCondition->print(myCout);
+        //                  delete jcCondition;
 
-                        LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
-                    }
-                    //                    delete eSumCondition;
+      } break;
+      case CondHfBitCounts: {
+        L1GtHfBitCountsCondition *bcCondition =
+            new L1GtHfBitCountsCondition(itCond->second, ptrGtPSB);
 
-                }
-                    break;
-                case CondJetCounts: {
-                    L1GtJetCountsCondition* jcCondition = new L1GtJetCountsCondition(
-                            itCond->second, ptrGtPSB, nrL1JetCounts);
+        bcCondition->setVerbosity(m_verbosity);
+        bcCondition->evaluateConditionStoreResult();
 
-                    jcCondition->setVerbosity(m_verbosity);
-                    jcCondition->evaluateConditionStoreResult();
+        cMapResults[itCond->first] = bcCondition;
 
-                    cMapResults[itCond->first] = jcCondition;
+        if (m_isDebugEnabled) {
+          std::ostringstream myCout;
+          bcCondition->print(myCout);
 
-                    if (m_verbosity && m_isDebugEnabled) {
-                        std::ostringstream myCout;
-                        jcCondition->print(myCout);
+          LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
+        }
 
-                        LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
-                    }
+        //                  delete bcCondition;
 
-                    //                  delete jcCondition;
+      } break;
+      case CondHfRingEtSums: {
+        L1GtHfRingEtSumsCondition *etCondition =
+            new L1GtHfRingEtSumsCondition(itCond->second, ptrGtPSB);
 
-                }
-                    break;
-                case CondHfBitCounts: {
-                    L1GtHfBitCountsCondition* bcCondition = new L1GtHfBitCountsCondition(
-                            itCond->second, ptrGtPSB);
+        etCondition->setVerbosity(m_verbosity);
+        etCondition->evaluateConditionStoreResult();
 
-                    bcCondition->setVerbosity(m_verbosity);
-                    bcCondition->evaluateConditionStoreResult();
+        cMapResults[itCond->first] = etCondition;
 
-                    cMapResults[itCond->first] = bcCondition;
+        if (m_verbosity && m_isDebugEnabled) {
+          std::ostringstream myCout;
+          etCondition->print(myCout);
 
-                    if (m_isDebugEnabled ) {
-                        std::ostringstream myCout;
-                        bcCondition->print(myCout);
+          LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
+        }
 
-                        LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
-                    }
+        //                  delete etCondition;
 
-                    //                  delete bcCondition;
+      } break;
+      case CondCastor: {
+        bool castorCondResult = false;
 
-                }
-                    break;
-                case CondHfRingEtSums: {
-                    L1GtHfRingEtSumsCondition* etCondition = new L1GtHfRingEtSumsCondition(
-                            itCond->second, ptrGtPSB);
+        // FIXME need a solution to read CASTOR
+        // if (castorConditionFlag) {
+        //    castorCondResult = castorData->conditionResult(itCond->first);
+        //}
 
-                    etCondition->setVerbosity(m_verbosity);
-                    etCondition->evaluateConditionStoreResult();
+        L1GtCastorCondition *castorCondition =
+            new L1GtCastorCondition(itCond->second, castorCondResult);
 
-                    cMapResults[itCond->first] = etCondition;
+        castorCondition->setVerbosity(m_verbosity);
+        castorCondition->evaluateConditionStoreResult();
 
-                    if (m_verbosity && m_isDebugEnabled) {
-                        std::ostringstream myCout;
-                        etCondition->print(myCout);
+        cMapResults[itCond->first] = castorCondition;
 
-                        LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
-                    }
+        if (m_verbosity && m_isDebugEnabled) {
+          std::ostringstream myCout;
+          castorCondition->print(myCout);
 
-                    //                  delete etCondition;
+          LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
+        }
 
-                }
-                    break;
-                case CondCastor: {
-                    bool castorCondResult = false;
+        //                  delete castorCondition;
 
-                    // FIXME need a solution to read CASTOR
-                    //if (castorConditionFlag) {
-                    //    castorCondResult = castorData->conditionResult(itCond->first);
-                    //}
+      } break;
+      case CondBptx: {
+        bool bptxCondResult = true;
 
-                    L1GtCastorCondition* castorCondition = new L1GtCastorCondition(
-                            itCond->second, castorCondResult);
+        // FIXME need a solution to read BPTX with real value
 
-                    castorCondition->setVerbosity(m_verbosity);
-                    castorCondition->evaluateConditionStoreResult();
+        L1GtBptxCondition *bptxCondition =
+            new L1GtBptxCondition(itCond->second, bptxCondResult);
 
-                    cMapResults[itCond->first] = castorCondition;
+        bptxCondition->setVerbosity(m_verbosity);
+        bptxCondition->evaluateConditionStoreResult();
 
-                    if (m_verbosity && m_isDebugEnabled) {
-                        std::ostringstream myCout;
-                        castorCondition->print(myCout);
+        cMapResults[itCond->first] = bptxCondition;
 
-                        LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
-                    }
+        if (m_verbosity && m_isDebugEnabled) {
+          std::ostringstream myCout;
+          bptxCondition->print(myCout);
 
-                    //                  delete castorCondition;
+          LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
+        }
 
-                }
-                    break;
-                case CondBptx: {
-                    bool bptxCondResult = true;
+        //                  delete bptxCondition;
 
-                    // FIXME need a solution to read BPTX with real value
+      } break;
+      case CondExternal: {
+        bool externalCondResult = true;
 
-                    L1GtBptxCondition* bptxCondition = new L1GtBptxCondition(
-                            itCond->second, bptxCondResult);
+        // FIXME need a solution to read External with real value
 
-                    bptxCondition->setVerbosity(m_verbosity);
-                    bptxCondition->evaluateConditionStoreResult();
+        L1GtExternalCondition *externalCondition =
+            new L1GtExternalCondition(itCond->second, externalCondResult);
 
-                    cMapResults[itCond->first] = bptxCondition;
+        externalCondition->setVerbosity(m_verbosity);
+        externalCondition->evaluateConditionStoreResult();
 
-                    if (m_verbosity && m_isDebugEnabled) {
-                        std::ostringstream myCout;
-                        bptxCondition->print(myCout);
+        cMapResults[itCond->first] = externalCondition;
 
-                        LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
-                    }
-
-                    //                  delete bptxCondition;
-
-                }
-                    break;
-                case CondExternal: {
-                    bool externalCondResult = true;
-
-                    // FIXME need a solution to read External with real value
-
-                    L1GtExternalCondition* externalCondition = new L1GtExternalCondition(
-                            itCond->second, externalCondResult);
-
-                    externalCondition->setVerbosity(m_verbosity);
-                    externalCondition->evaluateConditionStoreResult();
-
-                    cMapResults[itCond->first] = externalCondition;
-
-                    if (m_verbosity && m_isDebugEnabled) {
-                        std::ostringstream myCout;
-                        externalCondition->print(myCout);
-
-                        LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
-                    }
-
-                    //                  delete externalCondition;
-
-                }
-                    break;
-                case CondCorrelation: {
-
-                    // get first the sub-conditions
-                    const L1GtCorrelationTemplate* corrTemplate =
-                        static_cast<const L1GtCorrelationTemplate*>(itCond->second);
-                    const L1GtConditionCategory cond0Categ = corrTemplate->cond0Category();
-                    const L1GtConditionCategory cond1Categ = corrTemplate->cond1Category();
-                    const int cond0Ind = corrTemplate->cond0Index();
-                    const int cond1Ind = corrTemplate->cond1Index();
-
-                    const L1GtCondition* cond0Condition = nullptr;
-                    const L1GtCondition* cond1Condition = nullptr;
-
-                    // maximum number of objects received for evaluation of Type1s condition
-                    int cond0NrL1Objects = 0;
-                    int cond1NrL1Objects = 0;
-
-                    int cond0EtaBits = 0;
-                    int cond1EtaBits = 0;
-
-                    switch (cond0Categ) {
-                        case CondMuon: {
-                            cond0Condition = &((corrMuon[iChip])[cond0Ind]);
-                            cond0NrL1Objects = nrL1Mu;
-                            cond0EtaBits = ifMuEtaNumberBits;
-                        }
-                            break;
-                        case CondCalo: {
-                            cond0Condition = &((corrCalo[iChip])[cond0Ind]);
-
-                            switch ((cond0Condition->objectType())[0]) {
-                                case NoIsoEG:
-                                    cond0NrL1Objects= nrL1NoIsoEG;
-                                    break;
-                                case IsoEG:
-                                    cond0NrL1Objects = nrL1IsoEG;
-                                    break;
-                                case CenJet:
-                                    cond0NrL1Objects = nrL1CenJet;
-                                    break;
-                                case ForJet:
-                                    cond0NrL1Objects = nrL1ForJet;
-                                    break;
-                                case TauJet:
-                                    cond0NrL1Objects = nrL1TauJet;
-                                    break;
-                                default:
-                                    cond0NrL1Objects = 0;
-                                    break;
-                            }
-
-                            cond0EtaBits = ifCaloEtaNumberBits;
-                        }
-                            break;
-                        case CondEnergySum: {
-                            cond0Condition = &((corrEnergySum[iChip])[cond0Ind]);
-                            cond0NrL1Objects = 1;
-                        }
-                            break;
-                        default: {
-                            // do nothing, should not arrive here
-                        }
-                            break;
-                    }
-
-                    switch (cond1Categ) {
-                        case CondMuon: {
-                            cond1Condition = &((corrMuon[iChip])[cond1Ind]);
-                            cond1NrL1Objects = nrL1Mu;
-                            cond1EtaBits = ifMuEtaNumberBits;
-                        }
-                            break;
-                        case CondCalo: {
-                            cond1Condition = &((corrCalo[iChip])[cond1Ind]);
-
-                            switch ((cond1Condition->objectType())[0]) {
-                                case NoIsoEG:
-                                    cond1NrL1Objects= nrL1NoIsoEG;
-                                    break;
-                                case IsoEG:
-                                    cond1NrL1Objects = nrL1IsoEG;
-                                    break;
-                                case CenJet:
-                                    cond1NrL1Objects = nrL1CenJet;
-                                    break;
-                                case ForJet:
-                                    cond1NrL1Objects = nrL1ForJet;
-                                    break;
-                                case TauJet:
-                                    cond1NrL1Objects = nrL1TauJet;
-                                    break;
-                                default:
-                                    cond1NrL1Objects = 0;
-                                    break;
-                            }
-
-                             cond1EtaBits = ifCaloEtaNumberBits;
-                        }
-                            break;
-                        case CondEnergySum: {
-                            cond1Condition = &((corrEnergySum[iChip])[cond1Ind]);
-                            cond1NrL1Objects = 1;
-                        }
-                            break;
-                        default: {
-                            // do nothing, should not arrive here
-                        }
-                            break;
-                    }
-
-                    L1GtCorrelationCondition* correlationCond =
-                        new L1GtCorrelationCondition(itCond->second,
-                            cond0Condition, cond1Condition,
-                            cond0NrL1Objects, cond1NrL1Objects,
-                            cond0EtaBits, cond1EtaBits,
-                            this, ptrGtPSB, m_gtEtaPhiConversions);
-
-                    correlationCond->setVerbosity(m_verbosity);
-                    correlationCond->evaluateConditionStoreResult();
-
-                    cMapResults[itCond->first] = correlationCond;
-
-                    if (m_verbosity && m_isDebugEnabled) {
-                        std::ostringstream myCout;
-                        correlationCond->print(myCout);
-
-                        LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
-                    }
-
-                    //                  delete correlationCond;
-
-                }
-                    break;
-                case CondNull: {
-
-                    // do nothing
-
-                }
-                    break;
-                default: {
-
-                    // do nothing
-
-                }
-                    break;
-            }
+        if (m_verbosity && m_isDebugEnabled) {
+          std::ostringstream myCout;
+          externalCondition->print(myCout);
 
+          LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
         }
 
-    }
+        //                  delete externalCondition;
+
+      } break;
+      case CondCorrelation: {
+
+        // get first the sub-conditions
+        const L1GtCorrelationTemplate *corrTemplate =
+            static_cast<const L1GtCorrelationTemplate *>(itCond->second);
+        const L1GtConditionCategory cond0Categ = corrTemplate->cond0Category();
+        const L1GtConditionCategory cond1Categ = corrTemplate->cond1Category();
+        const int cond0Ind = corrTemplate->cond0Index();
+        const int cond1Ind = corrTemplate->cond1Index();
+
+        const L1GtCondition *cond0Condition = nullptr;
+        const L1GtCondition *cond1Condition = nullptr;
+
+        // maximum number of objects received for evaluation of Type1s condition
+        int cond0NrL1Objects = 0;
+        int cond1NrL1Objects = 0;
+
+        int cond0EtaBits = 0;
+        int cond1EtaBits = 0;
+
+        switch (cond0Categ) {
+        case CondMuon: {
+          cond0Condition = &((corrMuon[iChip])[cond0Ind]);
+          cond0NrL1Objects = nrL1Mu;
+          cond0EtaBits = ifMuEtaNumberBits;
+        } break;
+        case CondCalo: {
+          cond0Condition = &((corrCalo[iChip])[cond0Ind]);
+
+          switch ((cond0Condition->objectType())[0]) {
+          case NoIsoEG:
+            cond0NrL1Objects = nrL1NoIsoEG;
+            break;
+          case IsoEG:
+            cond0NrL1Objects = nrL1IsoEG;
+            break;
+          case CenJet:
+            cond0NrL1Objects = nrL1CenJet;
+            break;
+          case ForJet:
+            cond0NrL1Objects = nrL1ForJet;
+            break;
+          case TauJet:
+            cond0NrL1Objects = nrL1TauJet;
+            break;
+          default:
+            cond0NrL1Objects = 0;
+            break;
+          }
+
+          cond0EtaBits = ifCaloEtaNumberBits;
+        } break;
+        case CondEnergySum: {
+          cond0Condition = &((corrEnergySum[iChip])[cond0Ind]);
+          cond0NrL1Objects = 1;
+        } break;
+        default: {
+          // do nothing, should not arrive here
+        } break;
+        }
 
-    // loop over algorithm map
+        switch (cond1Categ) {
+        case CondMuon: {
+          cond1Condition = &((corrMuon[iChip])[cond1Ind]);
+          cond1NrL1Objects = nrL1Mu;
+          cond1EtaBits = ifMuEtaNumberBits;
+        } break;
+        case CondCalo: {
+          cond1Condition = &((corrCalo[iChip])[cond1Ind]);
+
+          switch ((cond1Condition->objectType())[0]) {
+          case NoIsoEG:
+            cond1NrL1Objects = nrL1NoIsoEG;
+            break;
+          case IsoEG:
+            cond1NrL1Objects = nrL1IsoEG;
+            break;
+          case CenJet:
+            cond1NrL1Objects = nrL1CenJet;
+            break;
+          case ForJet:
+            cond1NrL1Objects = nrL1ForJet;
+            break;
+          case TauJet:
+            cond1NrL1Objects = nrL1TauJet;
+            break;
+          default:
+            cond1NrL1Objects = 0;
+            break;
+          }
+
+          cond1EtaBits = ifCaloEtaNumberBits;
+        } break;
+        case CondEnergySum: {
+          cond1Condition = &((corrEnergySum[iChip])[cond1Ind]);
+          cond1NrL1Objects = 1;
+        } break;
+        default: {
+          // do nothing, should not arrive here
+        } break;
+        }
 
-    // empty vector for object maps - filled during loop
-    std::vector<L1GlobalTriggerObjectMap> objMapVec;
-    if (produceL1GtObjectMapRecord && (iBxInEvent == 0)) objMapVec.reserve(numberPhysTriggers);
+        L1GtCorrelationCondition *correlationCond =
+            new L1GtCorrelationCondition(
+                itCond->second, cond0Condition, cond1Condition,
+                cond0NrL1Objects, cond1NrL1Objects, cond0EtaBits, cond1EtaBits,
+                this, ptrGtPSB, m_gtEtaPhiConversions);
 
-    for (CItAlgo itAlgo = algorithmMap.begin(); itAlgo != algorithmMap.end(); itAlgo++) {
+        correlationCond->setVerbosity(m_verbosity);
+        correlationCond->evaluateConditionStoreResult();
 
-        L1GtAlgorithmEvaluation gtAlg(itAlgo->second);
-        gtAlg.evaluateAlgorithm((itAlgo->second).algoChipNumber(), m_conditionResultMaps);
+        cMapResults[itCond->first] = correlationCond;
 
-        int algBitNumber = (itAlgo->second).algoBitNumber();
-        bool algResult = gtAlg.gtAlgoResult();
+        if (m_verbosity && m_isDebugEnabled) {
+          std::ostringstream myCout;
+          correlationCond->print(myCout);
 
-        if (algResult) {
-            m_gtlAlgorithmOR.set(algBitNumber);
+          LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
         }
 
-        if (m_verbosity && m_isDebugEnabled) {
-            std::ostringstream myCout;
-            ( itAlgo->second ).print(myCout);
-            gtAlg.print(myCout);
+        //                  delete correlationCond;
 
-            LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
-        }
+      } break;
+      case CondNull: {
 
+        // do nothing
 
-        // object maps only for BxInEvent = 0
-        if (produceL1GtObjectMapRecord && (iBxInEvent == 0)) {
+      } break;
+      default: {
 
-            // set object map
-            L1GlobalTriggerObjectMap objMap;
+        // do nothing
 
-            objMap.setAlgoName(itAlgo->first);
-            objMap.setAlgoBitNumber(algBitNumber);
-            objMap.setAlgoGtlResult(algResult);
-            objMap.swapOperandTokenVector(gtAlg.operandTokenVector());
-            objMap.swapCombinationVector(gtAlg.gtAlgoCombinationVector());
-	    // gtAlg is empty now...
+      } break;
+      }
+    }
+  }
 
-            if (m_verbosity && m_isDebugEnabled) {
-                std::ostringstream myCout1;
-                objMap.print(myCout1);
+  // loop over algorithm map
 
-                LogTrace("L1GlobalTrigger") << myCout1.str() << std::endl;
-            }
+  // empty vector for object maps - filled during loop
+  std::vector<L1GlobalTriggerObjectMap> objMapVec;
+  if (produceL1GtObjectMapRecord && (iBxInEvent == 0))
+    objMapVec.reserve(numberPhysTriggers);
 
-            objMapVec.push_back(objMap);
+  for (CItAlgo itAlgo = algorithmMap.begin(); itAlgo != algorithmMap.end();
+       itAlgo++) {
 
-        }
+    L1GtAlgorithmEvaluation gtAlg(itAlgo->second);
+    gtAlg.evaluateAlgorithm((itAlgo->second).algoChipNumber(),
+                            m_conditionResultMaps);
 
+    int algBitNumber = (itAlgo->second).algoBitNumber();
+    bool algResult = gtAlg.gtAlgoResult();
 
+    if (algResult) {
+      m_gtlAlgorithmOR.set(algBitNumber);
+    }
+
+    if (m_verbosity && m_isDebugEnabled) {
+      std::ostringstream myCout;
+      (itAlgo->second).print(myCout);
+      gtAlg.print(myCout);
+
+      LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
     }
 
     // object maps only for BxInEvent = 0
     if (produceL1GtObjectMapRecord && (iBxInEvent == 0)) {
-        gtObjectMapRecord->swapGtObjectMap(objMapVec);
-    }
 
-    // loop over condition maps (one map per condition chip)
-    // then loop over conditions in the map
-    // delete the conditions created with new, zero pointer, do not clear map, keep the vector as is...
-    for (std::vector<L1GtAlgorithmEvaluation::ConditionEvaluationMap>::iterator
-            itCondOnChip  = m_conditionResultMaps.begin();
-            itCondOnChip != m_conditionResultMaps.end(); itCondOnChip++) {
+      // set object map
+      L1GlobalTriggerObjectMap objMap;
 
-        for (L1GtAlgorithmEvaluation::ItEvalMap
-                itCond  = itCondOnChip->begin();
-                itCond != itCondOnChip->end(); itCond++) {
+      objMap.setAlgoName(itAlgo->first);
+      objMap.setAlgoBitNumber(algBitNumber);
+      objMap.setAlgoGtlResult(algResult);
+      objMap.swapOperandTokenVector(gtAlg.operandTokenVector());
+      objMap.swapCombinationVector(gtAlg.gtAlgoCombinationVector());
+      // gtAlg is empty now...
 
-            delete itCond->second;
-            itCond->second = nullptr;
-        }
-    }
+      if (m_verbosity && m_isDebugEnabled) {
+        std::ostringstream myCout1;
+        objMap.print(myCout1);
+
+        LogTrace("L1GlobalTrigger") << myCout1.str() << std::endl;
+      }
 
+      objMapVec.push_back(objMap);
+    }
+  }
+
+  // object maps only for BxInEvent = 0
+  if (produceL1GtObjectMapRecord && (iBxInEvent == 0)) {
+    gtObjectMapRecord->swapGtObjectMap(objMapVec);
+  }
+
+  // loop over condition maps (one map per condition chip)
+  // then loop over conditions in the map
+  // delete the conditions created with new, zero pointer, do not clear map,
+  // keep the vector as is...
+  for (std::vector<L1GtAlgorithmEvaluation::ConditionEvaluationMap>::iterator
+           itCondOnChip = m_conditionResultMaps.begin();
+       itCondOnChip != m_conditionResultMaps.end(); itCondOnChip++) {
+
+    for (L1GtAlgorithmEvaluation::ItEvalMap itCond = itCondOnChip->begin();
+         itCond != itCondOnChip->end(); itCond++) {
+
+      delete itCond->second;
+      itCond->second = nullptr;
+    }
+  }
 }
 
 // clear GTL
 void L1GlobalTriggerGTL::reset() {
 
-    m_candL1Mu->clear();
-
-    m_gtlDecisionWord.reset();
-    m_gtlAlgorithmOR.reset();
+  m_candL1Mu->clear();
 
+  m_gtlDecisionWord.reset();
+  m_gtlAlgorithmOR.reset();
 }
 
 // print Global Muon Trigger data received by GTL
 void L1GlobalTriggerGTL::printGmtData(const int iBxInEvent) const {
 
-    LogTrace("L1GlobalTrigger")
-            << "\nL1GlobalTrigger: GMT data received for BxInEvent = "
-            << iBxInEvent << std::endl;
-
-    int nrL1Mu = m_candL1Mu->size();
-    LogTrace("L1GlobalTrigger")
-            << "Number of GMT muons = " << nrL1Mu << "\n"
-            << std::endl;
-
-    for (std::vector<const L1MuGMTCand*>::const_iterator iter =
-            m_candL1Mu->begin(); iter != m_candL1Mu->end(); iter++) {
+  LogTrace("L1GlobalTrigger")
+      << "\nL1GlobalTrigger: GMT data received for BxInEvent = " << iBxInEvent
+      << std::endl;
 
-        LogTrace("L1GlobalTrigger") << *(*iter) << std::endl;
+  int nrL1Mu = m_candL1Mu->size();
+  LogTrace("L1GlobalTrigger") << "Number of GMT muons = " << nrL1Mu << "\n"
+                              << std::endl;
 
-    }
+  for (std::vector<const L1MuGMTCand *>::const_iterator iter =
+           m_candL1Mu->begin();
+       iter != m_candL1Mu->end(); iter++) {
 
-    LogTrace("L1GlobalTrigger") << std::endl;
+    LogTrace("L1GlobalTrigger") << *(*iter) << std::endl;
+  }
 
+  LogTrace("L1GlobalTrigger") << std::endl;
 }
diff --git a/L1Trigger/GlobalTrigger/src/L1GlobalTriggerPSB.cc b/L1Trigger/GlobalTrigger/src/L1GlobalTriggerPSB.cc
index 595538eb542d6..42b1a3d329fe4 100644
--- a/L1Trigger/GlobalTrigger/src/L1GlobalTriggerPSB.cc
+++ b/L1Trigger/GlobalTrigger/src/L1GlobalTriggerPSB.cc
@@ -18,27 +18,27 @@
 
 // system include files
 #include <bitset>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
 // user include files
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetup.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetup.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctCand.h"
 
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctEmCand.h"
-#include "DataFormats/L1GlobalCaloTrigger/interface/L1GctJetCand.h"
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctEtSums.h"
-#include "DataFormats/L1GlobalCaloTrigger/interface/L1GctJetCounts.h"
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctHFBitCounts.h"
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctHFRingEtSums.h"
+#include "DataFormats/L1GlobalCaloTrigger/interface/L1GctJetCand.h"
+#include "DataFormats/L1GlobalCaloTrigger/interface/L1GctJetCounts.h"
 
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctCollections.h"
 
-#include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Utilities/interface/InputTag.h"
@@ -46,1538 +46,1432 @@
 // forward declarations
 
 // constructor
-L1GlobalTriggerPSB::L1GlobalTriggerPSB(const edm::InputTag & m_caloGctInputTag, const std::vector<edm::InputTag>& m_technicalTriggersInputTags, edm::ConsumesCollector && iC)
-        :
-        m_candL1NoIsoEG ( new std::vector<const L1GctCand*>),
-        m_candL1IsoEG   ( new std::vector<const L1GctCand*>),
-        m_candL1CenJet  ( new std::vector<const L1GctCand*>),
-        m_candL1ForJet  ( new std::vector<const L1GctCand*>),
-        m_candL1TauJet  ( new std::vector<const L1GctCand*>),
-        m_candETM(nullptr),
-        m_candETT(nullptr),
-        m_candHTT(nullptr),
-        m_candHTM(nullptr),
-        m_candJetCounts(nullptr),
-        m_candHfBitCounts(nullptr),
-        m_candHfRingEtSums(nullptr),
-        m_isDebugEnabled(edm::isDebugEnabled())
+L1GlobalTriggerPSB::L1GlobalTriggerPSB(
+    const edm::InputTag &m_caloGctInputTag,
+    const std::vector<edm::InputTag> &m_technicalTriggersInputTags,
+    edm::ConsumesCollector &&iC)
+    : m_candL1NoIsoEG(new std::vector<const L1GctCand *>),
+      m_candL1IsoEG(new std::vector<const L1GctCand *>),
+      m_candL1CenJet(new std::vector<const L1GctCand *>),
+      m_candL1ForJet(new std::vector<const L1GctCand *>),
+      m_candL1TauJet(new std::vector<const L1GctCand *>), m_candETM(nullptr),
+      m_candETT(nullptr), m_candHTT(nullptr), m_candHTM(nullptr),
+      m_candJetCounts(nullptr), m_candHfBitCounts(nullptr),
+      m_candHfRingEtSums(nullptr), m_isDebugEnabled(edm::isDebugEnabled())
 
 {
-    iC.consumes<L1GctEmCandCollection>(edm::InputTag(m_caloGctInputTag.label(),"nonIsoEm",""));
-    iC.consumes<L1GctEmCandCollection>(edm::InputTag(m_caloGctInputTag.label(),"isoEm",""));
-    iC.consumes<L1GctJetCandCollection>(edm::InputTag(m_caloGctInputTag.label(),"cenJets",""));
-    iC.consumes<L1GctJetCandCollection>(edm::InputTag(m_caloGctInputTag.label(),"forJets",""));
-    iC.consumes<L1GctJetCandCollection>(edm::InputTag(m_caloGctInputTag.label(),"tauJets",""));
-    iC.consumes<L1GctEtMissCollection>(m_caloGctInputTag);
-    iC.consumes<L1GctEtTotalCollection>(m_caloGctInputTag);
-    iC.consumes<L1GctEtHadCollection>(m_caloGctInputTag);
-    iC.consumes<L1GctHtMissCollection>(m_caloGctInputTag);
-    iC.consumes<L1GctJetCountsCollection>(m_caloGctInputTag);
-    iC.consumes<L1GctHFBitCountsCollection>(m_caloGctInputTag);
-    iC.consumes<L1GctHFRingEtSumsCollection>(m_caloGctInputTag);
-
-    for (std::vector<edm::InputTag>::const_iterator it = m_technicalTriggersInputTags.begin(); it
-	                != m_technicalTriggersInputTags.end(); it++) {
-	iC.consumes<L1GtTechnicalTriggerRecord>((*it));
-    }
-    // empty
-
+  iC.consumes<L1GctEmCandCollection>(
+      edm::InputTag(m_caloGctInputTag.label(), "nonIsoEm", ""));
+  iC.consumes<L1GctEmCandCollection>(
+      edm::InputTag(m_caloGctInputTag.label(), "isoEm", ""));
+  iC.consumes<L1GctJetCandCollection>(
+      edm::InputTag(m_caloGctInputTag.label(), "cenJets", ""));
+  iC.consumes<L1GctJetCandCollection>(
+      edm::InputTag(m_caloGctInputTag.label(), "forJets", ""));
+  iC.consumes<L1GctJetCandCollection>(
+      edm::InputTag(m_caloGctInputTag.label(), "tauJets", ""));
+  iC.consumes<L1GctEtMissCollection>(m_caloGctInputTag);
+  iC.consumes<L1GctEtTotalCollection>(m_caloGctInputTag);
+  iC.consumes<L1GctEtHadCollection>(m_caloGctInputTag);
+  iC.consumes<L1GctHtMissCollection>(m_caloGctInputTag);
+  iC.consumes<L1GctJetCountsCollection>(m_caloGctInputTag);
+  iC.consumes<L1GctHFBitCountsCollection>(m_caloGctInputTag);
+  iC.consumes<L1GctHFRingEtSumsCollection>(m_caloGctInputTag);
+
+  for (std::vector<edm::InputTag>::const_iterator it =
+           m_technicalTriggersInputTags.begin();
+       it != m_technicalTriggersInputTags.end(); it++) {
+    iC.consumes<L1GtTechnicalTriggerRecord>((*it));
+  }
+  // empty
 }
 
-
 // destructor
-L1GlobalTriggerPSB::~L1GlobalTriggerPSB()
-{
-
-    reset();
+L1GlobalTriggerPSB::~L1GlobalTriggerPSB() {
 
-    delete m_candL1NoIsoEG;
-    delete m_candL1IsoEG;
-    delete m_candL1CenJet;
-    delete m_candL1ForJet;
-    delete m_candL1TauJet;
+  reset();
 
+  delete m_candL1NoIsoEG;
+  delete m_candL1IsoEG;
+  delete m_candL1CenJet;
+  delete m_candL1ForJet;
+  delete m_candL1TauJet;
 }
 
 // operations
 void L1GlobalTriggerPSB::init(const int nrL1NoIsoEG, const int nrL1IsoEG,
-        const int nrL1CenJet, const int nrL1ForJet, const int nrL1TauJet,
-        const int numberTechnicalTriggers)
-{
-
-    m_candL1NoIsoEG->reserve(nrL1NoIsoEG);
-    m_candL1IsoEG->reserve(nrL1IsoEG);
-    m_candL1CenJet->reserve(nrL1CenJet);
-    m_candL1ForJet->reserve(nrL1ForJet);
-    m_candL1TauJet->reserve(nrL1TauJet);
-
-    m_gtTechnicalTriggers.reserve(numberTechnicalTriggers);
-    m_gtTechnicalTriggers.assign(numberTechnicalTriggers, false);
-
+                              const int nrL1CenJet, const int nrL1ForJet,
+                              const int nrL1TauJet,
+                              const int numberTechnicalTriggers) {
+
+  m_candL1NoIsoEG->reserve(nrL1NoIsoEG);
+  m_candL1IsoEG->reserve(nrL1IsoEG);
+  m_candL1CenJet->reserve(nrL1CenJet);
+  m_candL1ForJet->reserve(nrL1ForJet);
+  m_candL1TauJet->reserve(nrL1TauJet);
+
+  m_gtTechnicalTriggers.reserve(numberTechnicalTriggers);
+  m_gtTechnicalTriggers.assign(numberTechnicalTriggers, false);
 }
 
 // receive input data
 
 void L1GlobalTriggerPSB::receiveGctObjectData(
-    edm::Event& iEvent,
-    const edm::InputTag& caloGctInputTag, const int iBxInEvent,
-    const bool receiveNoIsoEG, const int nrL1NoIsoEG,
-    const bool receiveIsoEG, const int nrL1IsoEG,
-    const bool receiveCenJet, const int nrL1CenJet,
-    const bool receiveForJet, const int nrL1ForJet,
-    const bool receiveTauJet, const int nrL1TauJet,
-    const bool receiveETM, const bool receiveETT, const bool receiveHTT, const bool receiveHTM,
-    const bool receiveJetCounts,
-    const bool receiveHfBitCounts,
-    const bool receiveHfRingEtSums)
-{
+    edm::Event &iEvent, const edm::InputTag &caloGctInputTag,
+    const int iBxInEvent, const bool receiveNoIsoEG, const int nrL1NoIsoEG,
+    const bool receiveIsoEG, const int nrL1IsoEG, const bool receiveCenJet,
+    const int nrL1CenJet, const bool receiveForJet, const int nrL1ForJet,
+    const bool receiveTauJet, const int nrL1TauJet, const bool receiveETM,
+    const bool receiveETT, const bool receiveHTT, const bool receiveHTM,
+    const bool receiveJetCounts, const bool receiveHfBitCounts,
+    const bool receiveHfRingEtSums) {
+
+  // LogDebug("L1GlobalTrigger")
+  //        << "\n**** L1GlobalTriggerPSB receiving calorimeter data for
+  //        BxInEvent = "
+  //        << iBxInEvent << "\n     from " << caloGctInputTag << "\n"
+  //        << std::endl;
+
+  reset();
+
+  std::ostringstream warningsStream;
+  bool warningEnabled = edm::isWarningEnabled();
+
+  if (receiveNoIsoEG) {
+
+    // get GCT NoIsoEG
+    edm::Handle<L1GctEmCandCollection> emCands;
+    iEvent.getByLabel(caloGctInputTag.label(), "nonIsoEm", emCands);
+
+    if (!emCands.isValid()) {
+      if (warningEnabled) {
+        warningsStream
+            << "\nWarning: L1GctEmCandCollection with input label "
+            << caloGctInputTag.label() << " and instance \"nonIsoEm\" \n"
+            << "requested in configuration, but not found in the event.\n"
+            << std::endl;
+      }
+    } else {
+
+      for (L1GctEmCandCollection::const_iterator it = emCands->begin();
+           it != emCands->end(); it++) {
+
+        if ((*it).bx() == iBxInEvent) {
+
+          (*m_candL1NoIsoEG).push_back(&(*it));
+          // LogTrace("L1GlobalTrigger") << "NoIsoEG:  " << (*it) << std::endl;
+        }
+      }
+    }
+  }
 
-    //LogDebug("L1GlobalTrigger")
-    //        << "\n**** L1GlobalTriggerPSB receiving calorimeter data for BxInEvent = "
-    //        << iBxInEvent << "\n     from " << caloGctInputTag << "\n"
-    //        << std::endl;
+  if (receiveIsoEG) {
 
-    reset();
+    // get GCT IsoEG
+    edm::Handle<L1GctEmCandCollection> isoEmCands;
+    iEvent.getByLabel(caloGctInputTag.label(), "isoEm", isoEmCands);
 
-    std::ostringstream warningsStream;
-    bool warningEnabled = edm::isWarningEnabled();
+    if (!isoEmCands.isValid()) {
+      if (warningEnabled) {
+        warningsStream
+            << "\nWarning: L1GctEmCandCollection with input label "
+            << caloGctInputTag.label() << " and instance \"isoEm\" \n"
+            << "requested in configuration, but not found in the event.\n"
+            << std::endl;
+      }
+    } else {
 
-    if (receiveNoIsoEG) {
+      for (L1GctEmCandCollection::const_iterator it = isoEmCands->begin();
+           it != isoEmCands->end(); it++) {
 
-        // get GCT NoIsoEG
-        edm::Handle<L1GctEmCandCollection> emCands;
-        iEvent.getByLabel(caloGctInputTag.label(), "nonIsoEm", emCands);
+        if ((*it).bx() == iBxInEvent) {
 
-        if (!emCands.isValid()) {
-            if (warningEnabled) {
-                warningsStream
-                << "\nWarning: L1GctEmCandCollection with input label " << caloGctInputTag.label()
-                << " and instance \"nonIsoEm\" \n"
-                << "requested in configuration, but not found in the event.\n"
-                << std::endl;
-            }
+          (*m_candL1IsoEG).push_back(&(*it));
+          // LogTrace("L1GlobalTrigger") << "IsoEG:    " <<  (*it) << std::endl;
         }
-        else {
+      }
+    }
+  }
 
-            for (L1GctEmCandCollection::const_iterator it = emCands->begin(); it
-                    != emCands->end(); it++) {
+  if (receiveCenJet) {
 
-                if ((*it).bx() == iBxInEvent) {
+    // get GCT CenJet
+    edm::Handle<L1GctJetCandCollection> cenJets;
+    iEvent.getByLabel(caloGctInputTag.label(), "cenJets", cenJets);
 
-                    (*m_candL1NoIsoEG).push_back(&(*it));
-                    //LogTrace("L1GlobalTrigger") << "NoIsoEG:  " << (*it) << std::endl;
+    if (!cenJets.isValid()) {
+      if (warningEnabled) {
+        warningsStream
+            << "\nWarning: L1GctJetCandCollection with input label "
+            << caloGctInputTag.label() << " and instance \"cenJets\" \n"
+            << "requested in configuration, but not found in the event.\n"
+            << std::endl;
+      }
+    } else {
 
-                }
-            }
-        }
+      for (L1GctJetCandCollection::const_iterator it = cenJets->begin();
+           it != cenJets->end(); it++) {
 
-    }
+        if ((*it).bx() == iBxInEvent) {
 
-    if (receiveIsoEG) {
+          (*m_candL1CenJet).push_back(&(*it));
+          // LogTrace("L1GlobalTrigger") << "CenJet    " <<  (*it) << std::endl;
+        }
+      }
+    }
+  }
 
-        // get GCT IsoEG
-        edm::Handle<L1GctEmCandCollection> isoEmCands;
-        iEvent.getByLabel(caloGctInputTag.label(), "isoEm",    isoEmCands);
+  if (receiveForJet) {
 
-        if (!isoEmCands.isValid()) {
-            if (warningEnabled) {
-                warningsStream
-                << "\nWarning: L1GctEmCandCollection with input label "
-                << caloGctInputTag.label()
-                << " and instance \"isoEm\" \n"
-                << "requested in configuration, but not found in the event.\n"
-                << std::endl;
-            }
-        }
-        else {
+    // get GCT ForJet
+    edm::Handle<L1GctJetCandCollection> forJets;
+    iEvent.getByLabel(caloGctInputTag.label(), "forJets", forJets);
 
-            for (L1GctEmCandCollection::const_iterator it = isoEmCands->begin(); it
-                    != isoEmCands->end(); it++) {
+    if (!forJets.isValid()) {
+      if (warningEnabled) {
+        warningsStream
+            << "\nWarning: L1GctJetCandCollection with input label "
+            << caloGctInputTag.label() << " and instance \"forJets\" \n"
+            << "requested in configuration, but not found in the event.\n"
+            << std::endl;
+      }
+    } else {
 
-                if ((*it).bx() == iBxInEvent) {
+      for (L1GctJetCandCollection::const_iterator it = forJets->begin();
+           it != forJets->end(); it++) {
 
-                    (*m_candL1IsoEG).push_back(&(*it));
-                    //LogTrace("L1GlobalTrigger") << "IsoEG:    " <<  (*it) << std::endl;
+        if ((*it).bx() == iBxInEvent) {
 
-                }
-            }
+          (*m_candL1ForJet).push_back(&(*it));
+          // LogTrace("L1GlobalTrigger") << "ForJet    " <<  (*it) << std::endl;
         }
-
+      }
     }
+  }
 
+  if (receiveTauJet) {
 
-    if (receiveCenJet) {
+    // get GCT TauJet
+    edm::Handle<L1GctJetCandCollection> tauJets;
+    iEvent.getByLabel(caloGctInputTag.label(), "tauJets", tauJets);
 
-        // get GCT CenJet
-        edm::Handle<L1GctJetCandCollection> cenJets;
-        iEvent.getByLabel(caloGctInputTag.label(), "cenJets", cenJets);
+    if (!tauJets.isValid()) {
+      if (warningEnabled) {
+        warningsStream
+            << "\nWarning: L1GctJetCandCollection with input label "
+            << caloGctInputTag.label() << " and instance \"tauJets\" \n"
+            << "requested in configuration, but not found in the event.\n"
+            << std::endl;
+      }
+    } else {
 
-        if (!cenJets.isValid()) {
-            if (warningEnabled) {
-                warningsStream
-                << "\nWarning: L1GctJetCandCollection with input label " << caloGctInputTag.label()
-                << " and instance \"cenJets\" \n"
-                << "requested in configuration, but not found in the event.\n"
-                << std::endl;
-            }
-        }
-        else {
+      for (L1GctJetCandCollection::const_iterator it = tauJets->begin();
+           it != tauJets->end(); it++) {
 
-            for (L1GctJetCandCollection::const_iterator it = cenJets->begin(); it
-                    != cenJets->end(); it++) {
+        if ((*it).bx() == iBxInEvent) {
 
-                if ((*it).bx() == iBxInEvent) {
+          (*m_candL1TauJet).push_back(&(*it));
+          // LogTrace("L1GlobalTrigger") << "TauJet    " <<  (*it) << std::endl;
+        }
+      }
+    }
+  }
 
-                    (*m_candL1CenJet).push_back(&(*it));
-                    //LogTrace("L1GlobalTrigger") << "CenJet    " <<  (*it) << std::endl;
+  // get GCT ETM
+  if (receiveETM) {
 
-                }
-            }
-        }
+    edm::Handle<L1GctEtMissCollection> missEtColl;
+    iEvent.getByLabel(caloGctInputTag, missEtColl);
 
-    }
+    if (!missEtColl.isValid()) {
+      if (warningEnabled) {
+        warningsStream
+            << "\nWarning: L1GctEtMissCollection with input tag "
+            << caloGctInputTag
+            << "\nrequested in configuration, but not found in the event.\n"
+            << std::endl;
+      }
+    } else {
 
-    if (receiveForJet) {
+      for (L1GctEtMissCollection::const_iterator it = missEtColl->begin();
+           it != missEtColl->end(); it++) {
 
-        // get GCT ForJet
-        edm::Handle<L1GctJetCandCollection> forJets;
-        iEvent.getByLabel(caloGctInputTag.label(), "forJets", forJets);
+        if ((*it).bx() == iBxInEvent) {
 
-        if (!forJets.isValid()) {
-            if (warningEnabled) {
-                warningsStream
-                << "\nWarning: L1GctJetCandCollection with input label "
-                << caloGctInputTag.label()
-                << " and instance \"forJets\" \n"
-                << "requested in configuration, but not found in the event.\n"
-                << std::endl;
-            }
+          m_candETM = &(*it);
+          // LogTrace("L1GlobalTrigger") << "ETM      " << (*it) << std::endl;
         }
-        else {
+      }
+    }
+  }
 
-            for (L1GctJetCandCollection::const_iterator it = forJets->begin(); it
-                    != forJets->end(); it++) {
+  // get GCT ETT
+  if (receiveETT) {
 
-                if ((*it).bx() == iBxInEvent) {
+    edm::Handle<L1GctEtTotalCollection> sumEtColl;
+    iEvent.getByLabel(caloGctInputTag, sumEtColl);
 
-                    (*m_candL1ForJet).push_back(&(*it));
-                    //LogTrace("L1GlobalTrigger") << "ForJet    " <<  (*it) << std::endl;
+    if (!sumEtColl.isValid()) {
+      if (warningEnabled) {
+        warningsStream
+            << "\nWarning: L1GctEtTotalCollection with input tag "
+            << caloGctInputTag
+            << "\nrequested in configuration, but not found in the event.\n"
+            << std::endl;
+      }
+    } else {
 
-                }
-            }
-        }
+      for (L1GctEtTotalCollection::const_iterator it = sumEtColl->begin();
+           it != sumEtColl->end(); it++) {
 
-    }
+        if ((*it).bx() == iBxInEvent) {
 
-    if (receiveTauJet) {
+          m_candETT = &(*it);
+          // LogTrace("L1GlobalTrigger") << "ETT      " << (*it) << std::endl;
+        }
+      }
+    }
+  }
 
-        // get GCT TauJet
-        edm::Handle<L1GctJetCandCollection> tauJets;
-        iEvent.getByLabel(caloGctInputTag.label(), "tauJets", tauJets);
+  // get GCT HTT
+  if (receiveHTT) {
 
-        if (!tauJets.isValid()) {
-            if (warningEnabled) {
-                warningsStream
-                << "\nWarning: L1GctJetCandCollection with input label " << caloGctInputTag.label()
-                << " and instance \"tauJets\" \n"
-                << "requested in configuration, but not found in the event.\n"
-                << std::endl;
-            }
-        }
-        else {
+    edm::Handle<L1GctEtHadCollection> sumHtColl;
+    iEvent.getByLabel(caloGctInputTag, sumHtColl);
 
-            for (L1GctJetCandCollection::const_iterator it = tauJets->begin(); it
-                    != tauJets->end(); it++) {
+    if (!sumHtColl.isValid()) {
+      if (warningEnabled) {
+        warningsStream
+            << "\nWarning: L1GctEtHadCollection with input tag "
+            << caloGctInputTag
+            << "\nrequested in configuration, but not found in the event.\n"
+            << std::endl;
+      }
+    } else {
 
-                if ((*it).bx() == iBxInEvent) {
+      for (L1GctEtHadCollection::const_iterator it = sumHtColl->begin();
+           it != sumHtColl->end(); it++) {
 
-                    (*m_candL1TauJet).push_back(&(*it));
-                    //LogTrace("L1GlobalTrigger") << "TauJet    " <<  (*it) << std::endl;
+        if ((*it).bx() == iBxInEvent) {
 
-                }
-            }
+          m_candHTT = &(*it);
+          // LogTrace("L1GlobalTrigger") << "HTT      "  << (*it) << std::endl;
         }
-
+      }
     }
+  }
 
-    // get GCT ETM
-    if (receiveETM) {
+  // get GCT HTM
+  if (receiveHTM) {
 
-        edm::Handle<L1GctEtMissCollection> missEtColl;
-        iEvent.getByLabel(caloGctInputTag, missEtColl) ;
+    edm::Handle<L1GctHtMissCollection> missHtColl;
+    iEvent.getByLabel(caloGctInputTag, missHtColl);
 
-        if (!missEtColl.isValid()) {
-            if (warningEnabled) {
-                warningsStream
-                << "\nWarning: L1GctEtMissCollection with input tag " << caloGctInputTag
-                << "\nrequested in configuration, but not found in the event.\n"
-                << std::endl;
-            }
-        }
-        else {
-
-            for (L1GctEtMissCollection::const_iterator it = missEtColl->begin(); it
-                    != missEtColl->end(); it++) {
+    if (!missHtColl.isValid()) {
+      if (warningEnabled) {
+        warningsStream
+            << "\nWarning: L1GctHtMissCollection with input tag "
+            << caloGctInputTag
+            << "\nrequested in configuration, but not found in the event.\n"
+            << std::endl;
+      }
+    } else {
 
-                if ((*it).bx() == iBxInEvent) {
+      for (L1GctHtMissCollection::const_iterator it = missHtColl->begin();
+           it != missHtColl->end(); it++) {
 
-                    m_candETM = &(*it);
-                    //LogTrace("L1GlobalTrigger") << "ETM      " << (*it) << std::endl;
+        if ((*it).bx() == iBxInEvent) {
 
-                }
-            }
+          m_candHTM = &(*it);
+          // LogTrace("L1GlobalTrigger") << "HTM      " << (*it) << std::endl;
         }
-
+      }
     }
+  }
 
-    // get GCT ETT
-    if (receiveETT) {
-
-        edm::Handle<L1GctEtTotalCollection> sumEtColl;
-        iEvent.getByLabel(caloGctInputTag, sumEtColl) ;
+  // get GCT JetCounts
+  if (receiveJetCounts) {
 
-        if (!sumEtColl.isValid()) {
-            if (warningEnabled) {
-                warningsStream
-                << "\nWarning: L1GctEtTotalCollection with input tag " << caloGctInputTag
-                << "\nrequested in configuration, but not found in the event.\n"
-                << std::endl;
-            }
-        }
-        else {
+    edm::Handle<L1GctJetCountsCollection> jetCountColl;
+    iEvent.getByLabel(caloGctInputTag, jetCountColl);
 
-            for (L1GctEtTotalCollection::const_iterator it = sumEtColl->begin(); it
-                    != sumEtColl->end(); it++) {
+    if (!jetCountColl.isValid()) {
+      if (warningEnabled) {
+        warningsStream
+            << "\nWarning: L1GctJetCountsCollection with input tag "
+            << caloGctInputTag
+            << "\nrequested in configuration, but not found in the event.\n"
+            << std::endl;
+      }
+    } else {
 
-                if ((*it).bx() == iBxInEvent) {
+      for (L1GctJetCountsCollection::const_iterator it = jetCountColl->begin();
+           it != jetCountColl->end(); it++) {
 
-                    m_candETT = &(*it);
-                    //LogTrace("L1GlobalTrigger") << "ETT      " << (*it) << std::endl;
+        if ((*it).bx() == iBxInEvent) {
 
-                }
-            }
+          m_candJetCounts = &(*it);
+          // LogTrace("L1GlobalTrigger") << (*it) << std::endl;
         }
-
+      }
     }
+  }
 
-    // get GCT HTT
-    if (receiveHTT) {
+  // get GCT HfBitCounts
+  if (receiveHfBitCounts) {
 
-        edm::Handle<L1GctEtHadCollection> sumHtColl;
-        iEvent.getByLabel(caloGctInputTag, sumHtColl) ;
+    edm::Handle<L1GctHFBitCountsCollection> hfBitCountsColl;
+    iEvent.getByLabel(caloGctInputTag, hfBitCountsColl);
 
-        if (!sumHtColl.isValid()) {
-            if (warningEnabled) {
-                warningsStream
-                << "\nWarning: L1GctEtHadCollection with input tag " << caloGctInputTag
-                << "\nrequested in configuration, but not found in the event.\n"
-                << std::endl;
-            }
+    if (!hfBitCountsColl.isValid()) {
+      if (warningEnabled) {
+        warningsStream
+            << "\nWarning: L1GctHFBitCountsCollection with input tag "
+            << caloGctInputTag
+            << "\nrequested in configuration, but not found in the event.\n"
+            << std::endl;
+      }
+    } else {
+
+      for (L1GctHFBitCountsCollection::const_iterator it =
+               hfBitCountsColl->begin();
+           it != hfBitCountsColl->end(); it++) {
+
+        if ((*it).bx() == iBxInEvent) {
+
+          m_candHfBitCounts = &(*it);
+          // LogTrace("L1GlobalTrigger") << "L1GctHFBitCountsCollection: "
+          //<< (*it) << std::endl;
         }
-        else {
+      }
+    }
+  }
 
-            for (L1GctEtHadCollection::const_iterator it = sumHtColl->begin(); it
-                    != sumHtColl->end(); it++) {
+  // get GCT HfRingEtSums
+  if (receiveHfRingEtSums) {
 
-                if ((*it).bx() == iBxInEvent) {
+    edm::Handle<L1GctHFRingEtSumsCollection> hfRingEtSums;
+    iEvent.getByLabel(caloGctInputTag, hfRingEtSums);
 
-                    m_candHTT = &(*it);
-                    //LogTrace("L1GlobalTrigger") << "HTT      "  << (*it) << std::endl;
+    if (!hfRingEtSums.isValid()) {
+      if (warningEnabled) {
+        warningsStream
+            << "\nWarning: L1GctHFRingEtSumsCollection with input tag "
+            << caloGctInputTag
+            << "\nrequested in configuration, but not found in the event.\n"
+            << std::endl;
+      }
+    } else {
 
-                }
-            }
+      for (L1GctHFRingEtSumsCollection::const_iterator it =
+               hfRingEtSums->begin();
+           it != hfRingEtSums->end(); it++) {
+
+        if ((*it).bx() == iBxInEvent) {
+
+          m_candHfRingEtSums = &(*it);
+          // LogTrace("L1GlobalTrigger") << "L1GctHFRingEtSumsCollection: "
+          //<< (*it) << std::endl;
         }
+      }
+    }
+  }
 
+  if (m_verbosity && warningEnabled) {
+    if (warningsStream.tellp() > 0) {
+      edm::LogWarning("L1GlobalTrigger") << warningsStream.str();
     }
+  }
+
+  if (m_verbosity && m_isDebugEnabled) {
 
-    // get GCT HTM
-    if (receiveHTM) {
+    LogDebug("L1GlobalTrigger")
+        << "\n**** L1GlobalTriggerPSB receiving calorimeter data for BxInEvent "
+           "= "
+        << iBxInEvent << "\n     from " << caloGctInputTag << "\n"
+        << std::endl;
 
-        edm::Handle<L1GctHtMissCollection> missHtColl;
-        iEvent.getByLabel(caloGctInputTag, missHtColl) ;
+    printGctObjectData(iBxInEvent);
+  }
+}
 
-        if (!missHtColl.isValid()) {
-            if (warningEnabled) {
-                warningsStream
-                << "\nWarning: L1GctHtMissCollection with input tag " << caloGctInputTag
-                << "\nrequested in configuration, but not found in the event.\n"
-                << std::endl;
-            }
-        }
-        else {
+// receive CASTOR objects
+void L1GlobalTriggerPSB::receiveCastorData(edm::Event &iEvent,
+                                           const edm::InputTag &castorInputTag,
+                                           const int iBxInEvent,
+                                           const bool receiveCastor,
+                                           const bool readFromPsb) {
+
+  // get the CASTOR record
+
+  // bool castorConditionFlag = true;
+  // FIXME remove the following line and uncomment the line above
+  //       when the L1CastorRecord is available
+  //       until then, all CASTOR conditions are set to false
+  // bool castorConditionFlag = false;
+
+  // edm::Handle<L1CastorRecord > castorData;
+  // iEvent.getByLabel(castorInputTag, castorData);
+
+  // if (receiveCastor) {
+  //
+  //    if (!castorData.isValid()) {
+  //        edm::LogWarning("L1GlobalTrigger")
+  //        << "\nWarning: CASTOR record with input tag " << castorInputTag
+  //        << "\nrequested in configuration, but not found in the event.\n"
+  //        << std::endl;
+  //
+  //        castorConditionFlag = false;
+  //    } else {
+  //            LogTrace("L1GlobalTrigger") << *(castorData.product()) <<
+  //            std::endl;
+  //
+  //    }
+  //
+  //} else {
+  //
+  //    // channel for CASTOR blocked - set all CASTOR to false
+  //    // MUST NEVER BLOCK CASTOR CHANNEL AND USE OPERATOR "NOT" WITH CASTOR
+  //    CONDITION
+  //    //     ==> FALSE RESULTS!
+  //    castorConditionResult = false;
+  //
+  //}
+}
+
+// receive BPTX objects
+//   from a GT record with bptxInputTag - if readFromPsb is true
+//   otherwise, generate them from randomly
+void L1GlobalTriggerPSB::receiveBptxData(edm::Event &iEvent,
+                                         const edm::InputTag &bptxInputTag,
+                                         const int iBxInEvent,
+                                         const bool receiveBptx,
+                                         const bool readFromPsb) {}
 
-            for (L1GctHtMissCollection::const_iterator it = missHtColl->begin(); it
-                    != missHtColl->end(); it++) {
+// receive External objects
+//   from a GT record with ExternalInputTag - if readFromPsb is true
+//   otherwise, generate them from randomly
+void L1GlobalTriggerPSB::receiveExternalData(
+    edm::Event &iEvent, const std::vector<edm::InputTag> &externalInputTags,
+    const int iBxInEvent, const bool receiveExternal, const bool readFromPsb) {}
 
-                if ((*it).bx() == iBxInEvent) {
+// receive technical triggers
+// each L1GtTechnicalTriggerRecord can have more than one technical trigger bit,
+// such that a single producer per system can be used (if desired)
+void L1GlobalTriggerPSB::receiveTechnicalTriggers(
+    edm::Event &iEvent,
+    const std::vector<edm::InputTag> &technicalTriggersInputTags,
+    const int iBxInEvent, const bool receiveTechTr, const int nrL1TechTr) {
 
-                    m_candHTM = &(*it);
-                    //LogTrace("L1GlobalTrigger") << "HTM      " << (*it) << std::endl;
+  std::ostringstream warningsStream;
+  bool warningEnabled = edm::isWarningEnabled();
 
-                }
-            }
-        }
+  // reset the technical trigger bits
+  m_gtTechnicalTriggers = std::vector<bool>(nrL1TechTr, false);
 
-    }
+  if (receiveTechTr) {
 
-    // get GCT JetCounts
-    if (receiveJetCounts) {
+    // get the technical trigger bits from the records and write them in
+    // the decision word for technical triggers
 
-        edm::Handle<L1GctJetCountsCollection> jetCountColl;
-        iEvent.getByLabel(caloGctInputTag, jetCountColl) ;
+    // loop over all producers of technical trigger records
+    for (std::vector<edm::InputTag>::const_iterator it =
+             technicalTriggersInputTags.begin();
+         it != technicalTriggersInputTags.end(); it++) {
 
-        if (!jetCountColl.isValid()) {
-            if (warningEnabled) {
-                warningsStream
-                << "\nWarning: L1GctJetCountsCollection with input tag " << caloGctInputTag
-                << "\nrequested in configuration, but not found in the event.\n"
-                << std::endl;
-            }
+      edm::Handle<L1GtTechnicalTriggerRecord> techTrigRecord;
+      iEvent.getByLabel((*it), techTrigRecord);
+
+      if (!techTrigRecord.isValid()) {
+        if (warningEnabled) {
+          warningsStream
+              << "\nWarning: L1GtTechnicalTriggerRecord with input tag "
+              << (*it)
+              << "\nrequested in configuration, but not found in the event.\n"
+              << std::endl;
         }
-        else {
+      } else {
 
-            for (L1GctJetCountsCollection::const_iterator it =
-                    jetCountColl->begin(); it != jetCountColl->end(); it++) {
+        const std::vector<L1GtTechnicalTrigger> &ttVec =
+            techTrigRecord->gtTechnicalTrigger();
+        size_t ttVecSize = ttVec.size();
 
-                if ((*it).bx() == iBxInEvent) {
+        for (size_t iTT = 0; iTT < ttVecSize; ++iTT) {
 
-                    m_candJetCounts = &(*it);
-                    //LogTrace("L1GlobalTrigger") << (*it) << std::endl;
+          const L1GtTechnicalTrigger &ttBxRecord = ttVec[iTT];
+          int ttBxInEvent = ttBxRecord.bxInEvent();
 
-                }
+          if (ttBxInEvent == iBxInEvent) {
+            int ttBitNumber = ttBxRecord.gtTechnicalTriggerBitNumber();
+            bool ttResult = ttBxRecord.gtTechnicalTriggerResult();
+
+            m_gtTechnicalTriggers.at(ttBitNumber) = ttResult;
+
+            if (m_verbosity) {
+              LogTrace("L1GlobalTrigger")
+                  << "Add for BxInEvent " << iBxInEvent
+                  << " the technical trigger produced by " << (*it)
+                  << " : name " << (ttBxRecord.gtTechnicalTriggerName())
+                  << " , bit number " << ttBitNumber << " and result "
+                  << ttResult << std::endl;
             }
+          }
         }
+      }
+    }
+  }
 
+  if (m_verbosity && warningEnabled) {
+    if (warningsStream.tellp() > 0) {
+      edm::LogWarning("L1GlobalTrigger") << warningsStream.str();
     }
+  }
 
+  if (m_verbosity && m_isDebugEnabled) {
+    LogDebug("L1GlobalTrigger")
+        << "\n**** L1GlobalTriggerPSB receiving technical triggers: "
+        << std::endl;
 
-    // get GCT HfBitCounts
-    if (receiveHfBitCounts) {
+    int sizeW64 = 64; // 64 bits words
+    int iBit = 0;
 
-        edm::Handle<L1GctHFBitCountsCollection> hfBitCountsColl;
-        iEvent.getByLabel(caloGctInputTag, hfBitCountsColl) ;
+    std::ostringstream myCout;
 
-        if (!hfBitCountsColl.isValid()) {
-            if (warningEnabled) {
-                warningsStream
-                << "\nWarning: L1GctHFBitCountsCollection with input tag " << caloGctInputTag
-                << "\nrequested in configuration, but not found in the event.\n"
-                << std::endl;
-            }
-        }
-        else {
+    for (std::vector<bool>::reverse_iterator ritBit =
+             m_gtTechnicalTriggers.rbegin();
+         ritBit != m_gtTechnicalTriggers.rend(); ++ritBit) {
 
-            for (L1GctHFBitCountsCollection::const_iterator it =
-                    hfBitCountsColl->begin(); it != hfBitCountsColl->end(); it++) {
+      myCout << (*ritBit ? '1' : '0');
 
-                if ((*it).bx() == iBxInEvent) {
+      if ((((iBit + 1) % 16) == (sizeW64 % 16)) && (iBit != 63)) {
+        myCout << " ";
+      }
 
-                    m_candHfBitCounts = &(*it);
-                    //LogTrace("L1GlobalTrigger") << "L1GctHFBitCountsCollection: "
-                    //<< (*it) << std::endl;
+      iBit++;
+    }
 
-                }
-            }
-        }
+    LogTrace("L1GlobalTrigger") << myCout.str() << "\n" << std::endl;
+  }
+}
 
+// fill the content of active PSB boards
+void L1GlobalTriggerPSB::fillPsbBlock(
+    edm::Event &iEvent, const boost::uint16_t &activeBoardsGtDaq,
+    const int recordLength0, const int recordLength1,
+    const unsigned int altNrBxBoardDaq, const std::vector<L1GtBoard> &boardMaps,
+    const int iBxInEvent, L1GlobalTriggerReadoutRecord *gtDaqReadoutRecord) {
+
+  // fill in emulator the same bunch crossing (12 bits - hardwired number of
+  // bits...) and the same local bunch crossing for all boards
+  int bxCross = iEvent.bunchCrossing();
+  boost::uint16_t bxCrossHw = 0;
+  if ((bxCross & 0xFFF) == bxCross) {
+    bxCrossHw = static_cast<boost::uint16_t>(bxCross);
+  } else {
+    bxCrossHw = 0; // Bx number too large, set to 0!
+    if (m_verbosity) {
+
+      LogDebug("L1GlobalTrigger")
+          << "\nBunch cross number [hex] = " << std::hex << bxCross
+          << "\n  larger than 12 bits. Set to 0! \n"
+          << std::dec << std::endl;
     }
+  }
 
-    // get GCT HfRingEtSums
-    if (receiveHfRingEtSums) {
+  typedef std::vector<L1GtBoard>::const_iterator CItBoardMaps;
 
-        edm::Handle<L1GctHFRingEtSumsCollection> hfRingEtSums;
-        iEvent.getByLabel(caloGctInputTag, hfRingEtSums) ;
+  // loop over PSB blocks in the GT DAQ record and fill them
+  // with the content of the object list
 
-        if (!hfRingEtSums.isValid()) {
-            if (warningEnabled) {
-                warningsStream
-                << "\nWarning: L1GctHFRingEtSumsCollection with input tag " << caloGctInputTag
-                << "\nrequested in configuration, but not found in the event.\n"
-                << std::endl;
-            }
-        }
-        else {
+  for (CItBoardMaps itBoard = boardMaps.begin(); itBoard != boardMaps.end();
+       ++itBoard) {
 
-            for (L1GctHFRingEtSumsCollection::const_iterator it =
-                    hfRingEtSums->begin(); it != hfRingEtSums->end(); it++) {
+    int iPosition = itBoard->gtPositionDaqRecord();
+    if (iPosition > 0) {
 
-                if ((*it).bx() == iBxInEvent) {
+      int iActiveBit = itBoard->gtBitDaqActiveBoards();
+      bool activeBoard = false;
+      bool writeBoard = false;
 
-                    m_candHfRingEtSums = &(*it);
-                    //LogTrace("L1GlobalTrigger") << "L1GctHFRingEtSumsCollection: "
-                    //<< (*it) << std::endl;
+      int recLength = -1;
 
-                }
-            }
-        }
+      if (iActiveBit >= 0) {
+        activeBoard = activeBoardsGtDaq & (1 << iActiveBit);
 
-    }
+        int altNrBxBoard = (altNrBxBoardDaq & (1 << iActiveBit)) >> iActiveBit;
 
-    if (m_verbosity && warningEnabled) {
-        if (warningsStream.tellp() > 0) {
-            edm::LogWarning("L1GlobalTrigger") << warningsStream.str();
+        if (altNrBxBoard == 1) {
+          recLength = recordLength1;
+        } else {
+          recLength = recordLength0;
         }
-    }
 
-    if (m_verbosity && m_isDebugEnabled) {
+        int lowBxInEvent = (recLength + 1) / 2 - recLength;
+        int uppBxInEvent = (recLength + 1) / 2 - 1;
 
-        LogDebug("L1GlobalTrigger")
-                << "\n**** L1GlobalTriggerPSB receiving calorimeter data for BxInEvent = "
-                << iBxInEvent << "\n     from " << caloGctInputTag << "\n"
-                << std::endl;
+        if ((iBxInEvent >= lowBxInEvent) && (iBxInEvent <= uppBxInEvent)) {
+          writeBoard = true;
+        }
 
-        printGctObjectData(iBxInEvent);
-    }
+        // LogTrace("L1GlobalTrigger")
+        //    << "\nBoard " << std::hex << (itBoard->gtBoardId()) << std::dec
+        //    << "\naltNrBxBoard = " << altNrBxBoard << " recLength " <<
+        //    recLength
+        //    << " lowBxInEvent " << lowBxInEvent
+        //    << " uppBxInEvent " << uppBxInEvent
+        //    << std::endl;
+      }
 
+      // LogTrace("L1GlobalTrigger")
+      //    << "\nBoard " << std::hex << (itBoard->gtBoardId()) << std::dec
+      //    << "\niBxInEvent = " << iBxInEvent << " iActiveBit " << iActiveBit
+      //    << " activeBoard " << activeBoard
+      //    << " writeBoard " << writeBoard
+      //    << std::endl;
 
-}
+      if (activeBoard && writeBoard && (itBoard->gtBoardType() == PSB)) {
 
-// receive CASTOR objects
-void L1GlobalTriggerPSB::receiveCastorData(
-        edm::Event& iEvent, const edm::InputTag& castorInputTag, const int iBxInEvent,
-        const bool receiveCastor, const bool readFromPsb) {
-
-    // get the CASTOR record
-
-    //bool castorConditionFlag = true;
-    // FIXME remove the following line and uncomment the line above
-    //       when the L1CastorRecord is available
-    //       until then, all CASTOR conditions are set to false
-    //bool castorConditionFlag = false;
-
-    //edm::Handle<L1CastorRecord > castorData;
-    //iEvent.getByLabel(castorInputTag, castorData);
-
-    //if (receiveCastor) {
-    //
-    //    if (!castorData.isValid()) {
-    //        edm::LogWarning("L1GlobalTrigger")
-    //        << "\nWarning: CASTOR record with input tag " << castorInputTag
-    //        << "\nrequested in configuration, but not found in the event.\n"
-    //        << std::endl;
-    //
-    //        castorConditionFlag = false;
-    //    } else {
-    //            LogTrace("L1GlobalTrigger") << *(castorData.product()) << std::endl;
-    //
-    //    }
-    //
-    //} else {
-    //
-    //    // channel for CASTOR blocked - set all CASTOR to false
-    //    // MUST NEVER BLOCK CASTOR CHANNEL AND USE OPERATOR "NOT" WITH CASTOR CONDITION
-    //    //     ==> FALSE RESULTS!
-    //    castorConditionResult = false;
-    //
-    //}
+        L1GtPsbWord psbWordValue;
 
+        // set board ID
+        psbWordValue.setBoardId(itBoard->gtBoardId());
 
-}
+        // set bunch cross in the GT event record
+        psbWordValue.setBxInEvent(iBxInEvent);
 
-// receive BPTX objects
-//   from a GT record with bptxInputTag - if readFromPsb is true
-//   otherwise, generate them from randomly
-void L1GlobalTriggerPSB::receiveBptxData(
-        edm::Event& iEvent, const edm::InputTag& bptxInputTag, const int iBxInEvent,
-        const bool receiveBptx, const bool readFromPsb) {
+        // set bunch cross number of the actual bx
+        boost::uint16_t bxNrValue = bxCrossHw;
+        psbWordValue.setBxNr(bxNrValue);
 
+        // set event number since last L1 reset generated in PSB
+        psbWordValue.setEventNr(
+            static_cast<boost::uint32_t>(iEvent.id().event()));
 
-}
+        // set local bunch cross number of the actual bx
+        // set identical to bxCrossHw - other solution?
+        boost::uint16_t localBxNrValue = bxCrossHw;
+        psbWordValue.setLocalBxNr(localBxNrValue);
 
-// receive External objects
-//   from a GT record with ExternalInputTag - if readFromPsb is true
-//   otherwise, generate them from randomly
-void L1GlobalTriggerPSB::receiveExternalData(edm::Event& iEvent,
-        const std::vector<edm::InputTag>&  externalInputTags,
-        const int iBxInEvent,
-        const bool receiveExternal, const bool readFromPsb) {
+        // get the objects coming to this PSB and the quadruplet index
 
+        // two objects writen one after another from the same quadruplet
+        int nrObjRow = 2;
 
-}
+        std::vector<L1GtPsbQuad> quadInPsb = itBoard->gtQuadInPsb();
+        int nrCables = quadInPsb.size();
 
+        boost::uint16_t aDataVal = 0;
+        boost::uint16_t bDataVal = 0;
 
-// receive technical triggers
-// each L1GtTechnicalTriggerRecord can have more than one technical trigger bit,
-// such that a single producer per system can be used (if desired)
-void L1GlobalTriggerPSB::receiveTechnicalTriggers(
-        edm::Event& iEvent, const std::vector<edm::InputTag>& technicalTriggersInputTags,
-        const int iBxInEvent, const bool receiveTechTr, const int nrL1TechTr) {
+        int iCable = -1;
+        for (std::vector<L1GtPsbQuad>::const_iterator itQuad =
+                 quadInPsb.begin();
+             itQuad != quadInPsb.end(); ++itQuad) {
 
-    std::ostringstream warningsStream;
-    bool warningEnabled = edm::isWarningEnabled();
+          iCable++;
 
-    // reset the technical trigger bits
-    m_gtTechnicalTriggers = std::vector<bool>(nrL1TechTr, false);
+          int iAB = (nrCables - iCable - 1) * nrObjRow;
 
-    if (receiveTechTr) {
+          switch (*itQuad) {
 
-        // get the technical trigger bits from the records and write them in
-        // the decision word for technical triggers
+          case TechTr: {
 
-        // loop over all producers of technical trigger records
-        for (std::vector<edm::InputTag>::const_iterator it = technicalTriggersInputTags.begin(); it
-                != technicalTriggersInputTags.end(); it++) {
+            // LogTrace("L1GlobalTrigger")
+            //<< "\nL1GlobalTriggerPSB: write TechTr for BxInEvent = "
+            //<< iBxInEvent
+            //<< "\n PSB " << std::hex << itBoard->gtBoardId() << std::dec
+            //<< " Cable " << iCable << " Quad " << (*itQuad)
+            //<< std::endl;
 
-            edm::Handle<L1GtTechnicalTriggerRecord> techTrigRecord;
-            iEvent.getByLabel( ( *it ), techTrigRecord);
+            // order: 16-bit words
+            int bitsPerWord = 16;
 
-            if (!techTrigRecord.isValid()) {
-                if (warningEnabled) {
-                    warningsStream << "\nWarning: L1GtTechnicalTriggerRecord with input tag "
-                            << ( *it )
-                            << "\nrequested in configuration, but not found in the event.\n"
-                            << std::endl;
-                }
-            } else {
+            //
+            int iPair = 0;
+            aDataVal = 0;
 
-                const std::vector<L1GtTechnicalTrigger>& ttVec =
-                        techTrigRecord->gtTechnicalTrigger();
-                size_t ttVecSize = ttVec.size();
+            int iBit = 0;
+            boost::uint16_t bitVal = 0;
 
-                for (size_t iTT = 0; iTT < ttVecSize; ++iTT) {
+            for (int i = 0; i < bitsPerWord; ++i) {
+              if (m_gtTechnicalTriggers[iBit]) {
+                bitVal = 1;
+              } else {
+                bitVal = 0;
+              }
 
-                    const L1GtTechnicalTrigger& ttBxRecord = ttVec[iTT];
-                    int ttBxInEvent = ttBxRecord.bxInEvent();
+              aDataVal = aDataVal | (bitVal << i);
+              iBit++;
+            }
+            psbWordValue.setAData(aDataVal, iAB + iPair);
 
-                    if (ttBxInEvent == iBxInEvent) {
-                        int ttBitNumber = ttBxRecord.gtTechnicalTriggerBitNumber();
-                        bool ttResult = ttBxRecord.gtTechnicalTriggerResult();
+            //
+            bDataVal = 0;
 
-                        m_gtTechnicalTriggers.at(ttBitNumber) = ttResult;
+            for (int i = 0; i < bitsPerWord; ++i) {
+              if (m_gtTechnicalTriggers[iBit]) {
+                bitVal = 1;
+              } else {
+                bitVal = 0;
+              }
 
-                        if (m_verbosity) {
-                            LogTrace("L1GlobalTrigger") << "Add for BxInEvent " << iBxInEvent
-                                    << " the technical trigger produced by " << (*it) << " : name "
-                                    << ( ttBxRecord.gtTechnicalTriggerName() ) << " , bit number "
-                                    << ttBitNumber << " and result " << ttResult << std::endl;
-                        }
+              bDataVal = bDataVal | (bitVal << i);
+              iBit++;
+            }
+            psbWordValue.setBData(bDataVal, iAB + iPair);
 
-                    }
+            //
+            iPair = 1;
+            aDataVal = 0;
 
-                }
+            for (int i = 0; i < bitsPerWord; ++i) {
+              if (m_gtTechnicalTriggers[iBit]) {
+                bitVal = 1;
+              } else {
+                bitVal = 0;
+              }
 
+              aDataVal = aDataVal | (bitVal << i);
+              iBit++;
             }
+            psbWordValue.setAData(aDataVal, iAB + iPair);
 
-        }
+            bDataVal = 0;
 
-    }
+            for (int i = 0; i < bitsPerWord; ++i) {
+              if (m_gtTechnicalTriggers[iBit]) {
+                bitVal = 1;
+              } else {
+                bitVal = 0;
+              }
 
-    if (m_verbosity && warningEnabled) {
-        if (warningsStream.tellp() > 0) {
-            edm::LogWarning("L1GlobalTrigger") << warningsStream.str();
-        }
-    }
+              bDataVal = bDataVal | (bitVal << i);
+              iBit++;
+            }
+            psbWordValue.setBData(bDataVal, iAB + iPair);
+          }
+
+          break;
+          case NoIsoEGQ: {
+
+            // LogTrace("L1GlobalTrigger")
+            //<< "\nL1GlobalTriggerPSB: write NoIsoEGQ for BxInEvent = "
+            //<< iBxInEvent
+            //<< "\n PSB " << std::hex << itBoard->gtBoardId() << std::dec
+            //<< " Cable " << iCable << " Quad " << (*itQuad)
+            //<< std::endl;
+
+            int recL1NoIsoEG = m_candL1NoIsoEG->size();
+            for (int iPair = 0; iPair < nrObjRow; ++iPair) {
+              if (iPair < recL1NoIsoEG) {
+                aDataVal = (static_cast<const L1GctEmCand *>(
+                                (*m_candL1NoIsoEG)[iPair]))
+                               ->raw();
+              } else {
+                aDataVal = 0;
+              }
+              psbWordValue.setAData(aDataVal, iAB + iPair);
+
+              if ((iPair + nrObjRow) < recL1NoIsoEG) {
+                bDataVal = (static_cast<const L1GctEmCand *>(
+                                (*m_candL1NoIsoEG)[iPair + nrObjRow]))
+                               ->raw();
+              } else {
+                bDataVal = 0;
+              }
+              psbWordValue.setBData(bDataVal, iAB + iPair);
+            }
+          }
+
+          break;
+          case IsoEGQ: {
+
+            // LogTrace("L1GlobalTrigger")
+            //<< "\nL1GlobalTriggerPSB: write IsoEGQ for BxInEvent = "
+            //<< iBxInEvent
+            //<< "\n PSB " << std::hex << itBoard->gtBoardId() << std::dec
+            //<< " Cable " << iCable << " Quad " << (*itQuad)
+            //<< std::endl;
+
+            int recL1IsoEG = m_candL1IsoEG->size();
+            for (int iPair = 0; iPair < nrObjRow; ++iPair) {
+              if (iPair < recL1IsoEG) {
+                aDataVal =
+                    (static_cast<const L1GctEmCand *>((*m_candL1IsoEG)[iPair]))
+                        ->raw();
+              } else {
+                aDataVal = 0;
+              }
+              psbWordValue.setAData(aDataVal, iAB + iPair);
+
+              if ((iPair + nrObjRow) < recL1IsoEG) {
+                bDataVal = (static_cast<const L1GctEmCand *>(
+                                (*m_candL1IsoEG)[iPair + nrObjRow]))
+                               ->raw();
+              } else {
+                bDataVal = 0;
+              }
+              psbWordValue.setBData(bDataVal, iAB + iPair);
+            }
 
-    if (m_verbosity && m_isDebugEnabled) {
-        LogDebug("L1GlobalTrigger")
-                << "\n**** L1GlobalTriggerPSB receiving technical triggers: " << std::endl;
+          }
+
+          break;
+          case CenJetQ: {
+
+            // LogTrace("L1GlobalTrigger")
+            //<< "\nL1GlobalTriggerPSB: write CenJetQ for BxInEvent = "
+            //<< iBxInEvent
+            //<< "\n PSB " << std::hex << itBoard->gtBoardId() << std::dec
+            //<< " Cable " << iCable << " Quad " << (*itQuad)
+            //<< std::endl;
+
+            int recL1CenJet = m_candL1CenJet->size();
+            for (int iPair = 0; iPair < nrObjRow; ++iPair) {
+              if (iPair < recL1CenJet) {
+                aDataVal = (static_cast<const L1GctJetCand *>(
+                                (*m_candL1CenJet)[iPair]))
+                               ->raw();
+              } else {
+                aDataVal = 0;
+              }
+              psbWordValue.setAData(aDataVal, iAB + iPair);
+
+              if ((iPair + nrObjRow) < recL1CenJet) {
+                bDataVal = (static_cast<const L1GctJetCand *>(
+                                (*m_candL1CenJet)[iPair + nrObjRow]))
+                               ->raw();
+              } else {
+                bDataVal = 0;
+              }
+              psbWordValue.setBData(bDataVal, iAB + iPair);
+            }
+          }
+
+          break;
+          case ForJetQ: {
+
+            // LogTrace("L1GlobalTrigger")
+            //<< "\nL1GlobalTriggerPSB: write ForJetQ for BxInEvent = "
+            //<< iBxInEvent
+            //<< "\n PSB " << std::hex << itBoard->gtBoardId() << std::dec
+            //<< " Cable " << iCable << " Quad " << (*itQuad)
+            //<< std::endl;
+
+            int recL1ForJet = m_candL1ForJet->size();
+            for (int iPair = 0; iPair < nrObjRow; ++iPair) {
+              if (iPair < recL1ForJet) {
+                aDataVal = (static_cast<const L1GctJetCand *>(
+                                (*m_candL1ForJet)[iPair]))
+                               ->raw();
+              } else {
+                aDataVal = 0;
+              }
+              psbWordValue.setAData(aDataVal, iAB + iPair);
+
+              if ((iPair + nrObjRow) < recL1ForJet) {
+                bDataVal = (static_cast<const L1GctJetCand *>(
+                                (*m_candL1ForJet)[iPair + nrObjRow]))
+                               ->raw();
+              } else {
+                bDataVal = 0;
+              }
+              psbWordValue.setBData(bDataVal, iAB + iPair);
+            }
+
+          }
+
+          break;
+          case TauJetQ: {
+
+            // LogTrace("L1GlobalTrigger")
+            //<< "\nL1GlobalTriggerPSB: write TauJetQ for BxInEvent = "
+            //<< iBxInEvent
+            //<< "\n PSB " << std::hex << itBoard->gtBoardId() << std::dec
+            //<< " Cable " << iCable << " Quad " << (*itQuad)
+            //<< std::endl;
+
+            int recL1TauJet = m_candL1TauJet->size();
+            for (int iPair = 0; iPair < nrObjRow; ++iPair) {
+              if (iPair < recL1TauJet) {
+                aDataVal = (static_cast<const L1GctJetCand *>(
+                                (*m_candL1TauJet)[iPair]))
+                               ->raw();
+              } else {
+                aDataVal = 0;
+              }
+              psbWordValue.setAData(aDataVal, iAB + iPair);
+
+              if ((iPair + nrObjRow) < recL1TauJet) {
+                bDataVal = (static_cast<const L1GctJetCand *>(
+                                (*m_candL1TauJet)[iPair + nrObjRow]))
+                               ->raw();
+              } else {
+                bDataVal = 0;
+              }
+              psbWordValue.setBData(bDataVal, iAB + iPair);
+
+              // LogTrace("L1GlobalTrigger")
+              //        << "\n aDataVal[" << (iAB + iPair)
+              //        << "] = 0x" << std::hex << aDataVal << std::dec
+              //        << " (object " << iPair << ")"
+              //        << "\n bDataVal[" << (iAB + iPair)
+              //        << "] = 0x" << std::hex << bDataVal << std::dec
+              //        << " (object " << (iPair + nrObjRow) << ")"
+              //        << std::endl;
+            }
 
-        int sizeW64 = 64; // 64 bits words
-        int iBit = 0;
+          }
 
-        std::ostringstream myCout;
+          break;
+          case ESumsQ: {
 
-        for (std::vector<bool>::reverse_iterator ritBit = m_gtTechnicalTriggers.rbegin(); ritBit
-                != m_gtTechnicalTriggers.rend(); ++ritBit) {
+            // LogTrace("L1GlobalTrigger")
+            //<< "\nL1GlobalTriggerPSB: write ESumsQ for BxInEvent = "
+            //<< iBxInEvent
+            //<< "\n PSB " << std::hex << itBoard->gtBoardId() << std::dec
+            //<< " Cable " << iCable << " Quad " << (*itQuad)
+            //<< std::endl;
 
-            myCout << ( *ritBit ? '1' : '0' );
+            // order: ETT, ETM et, HTT, ETM phi... hardcoded here
+            int iPair = 0;
 
-            if ( ( ( ( iBit + 1 ) % 16 ) == ( sizeW64 % 16 ) ) && ( iBit != 63 )) {
-                myCout << " ";
+            if (m_candETT) {
+              aDataVal = m_candETT->raw();
+            } else {
+              aDataVal = 0;
             }
+            psbWordValue.setAData(aDataVal, iAB + iPair);
 
-            iBit++;
-        }
+            if (m_candHTT) {
+              bDataVal = m_candHTT->raw();
+            } else {
+              bDataVal = 0;
+            }
+            psbWordValue.setBData(bDataVal, iAB + iPair);
+
+            // LogTrace("L1GlobalTrigger")
+            //        << "\n aDataVal[" << (iAB + iPair)
+            //        << "] = 0x" << std::hex << aDataVal << std::dec
+            //        << "\n bDataVal[" << (iAB + iPair)
+            //        << "] = 0x" << std::hex << bDataVal << std::dec
+            //        << std::endl;
+            //
+            iPair = 1;
+            if (m_candETM) {
+              // bits 0:15
+              aDataVal = m_candETM->raw() & 0x0000FFFF;
+
+              // LogTrace("L1GlobalTrigger") << std::hex
+              //        << "\n ETM et        = "
+              //        << m_candETM->et()
+              //        << "\n ETM overFlow  = "
+              //       << m_candETM->overFlow() << std::dec
+              //       << std::endl;
+            } else {
+              aDataVal = 0;
+            }
+            psbWordValue.setAData(aDataVal, iAB + iPair);
 
-        LogTrace("L1GlobalTrigger") << myCout.str() << "\n" << std::endl;
+            if (m_candETM) {
 
-    }
+              // bits 16:31
+              bDataVal = (m_candETM->raw() & 0xFFFF0000) >> 16;
 
-}
+              // LogTrace("L1GlobalTrigger") << std::hex
+              //        << "\n ETM phi  = " << m_candETM->phi()
+              //        << std::dec << std::endl;
 
+            } else {
+              bDataVal = 0;
+            }
+            psbWordValue.setBData(bDataVal, iAB + iPair);
 
-// fill the content of active PSB boards
-void L1GlobalTriggerPSB::fillPsbBlock(
-    edm::Event& iEvent,
-    const boost::uint16_t& activeBoardsGtDaq,
-    const int recordLength0,
-    const int recordLength1,
-    const unsigned int altNrBxBoardDaq,
-    const std::vector<L1GtBoard>& boardMaps,
-    const int iBxInEvent,
-    L1GlobalTriggerReadoutRecord* gtDaqReadoutRecord)
-{
+            // FIXME add HTM
 
-    // fill in emulator the same bunch crossing (12 bits - hardwired number of bits...)
-    // and the same local bunch crossing for all boards
-    int bxCross = iEvent.bunchCrossing();
-    boost::uint16_t bxCrossHw = 0;
-    if ((bxCross & 0xFFF) == bxCross) {
-        bxCrossHw = static_cast<boost::uint16_t> (bxCross);
-    }
-    else {
-        bxCrossHw = 0; // Bx number too large, set to 0!
-        if (m_verbosity) {
-
-            LogDebug("L1GlobalTrigger")
-                << "\nBunch cross number [hex] = " << std::hex << bxCross
-                << "\n  larger than 12 bits. Set to 0! \n" << std::dec
-                << std::endl;
-        }
-    }
+            // LogTrace("L1GlobalTrigger")
+            //        << "\n aDataVal[" << (iAB + iPair)
+            //        << "] = 0x" << std::hex << aDataVal << std::dec
+            //       << "\n bDataVal[" << (iAB + iPair)
+            //        << "] = 0x" << std::hex << bDataVal << std::dec
+            //       << std::endl;
 
-    typedef std::vector<L1GtBoard>::const_iterator CItBoardMaps;
+          }
 
-    // loop over PSB blocks in the GT DAQ record and fill them
-    // with the content of the object list
+          break;
+          case JetCountsQ: {
 
-    for (CItBoardMaps
-            itBoard = boardMaps.begin();
-            itBoard != boardMaps.end(); ++itBoard) {
+            // LogTrace("L1GlobalTrigger")
+            //<< "\nL1GlobalTriggerPSB: write JetCountsQ for BxInEvent = "
+            //<< iBxInEvent
+            //<< "\n PSB " << std::hex << itBoard->gtBoardId() << std::dec
+            //<< " Cable " << iCable << " Quad " << (*itQuad)
+            //<< std::endl;
 
-        int iPosition = itBoard->gtPositionDaqRecord();
-        if (iPosition > 0) {
+            // order: 3 JetCounts per 16-bits word ... hardcoded here
+            int jetCountsBits = 5; // FIXME get it from event setup
+            int countsPerWord = 3;
 
-            int iActiveBit = itBoard->gtBitDaqActiveBoards();
-            bool activeBoard = false;
-            bool writeBoard = false;
+            //
+            int iPair = 0;
+            aDataVal = 0;
+            bDataVal = 0;
 
-            int recLength = -1;
+            int iCount = 0;
 
-            if (iActiveBit >= 0) {
-                activeBoard = activeBoardsGtDaq & (1 << iActiveBit);
+            if (m_candJetCounts) {
 
-                int altNrBxBoard = (altNrBxBoardDaq & ( 1 << iActiveBit )) >> iActiveBit;
+              for (int i = 0; i < countsPerWord; ++i) {
+                aDataVal = aDataVal | ((m_candJetCounts->count(iCount))
+                                       << (jetCountsBits * i));
+                iCount++;
+              }
 
-                if (altNrBxBoard == 1) {
-                    recLength = recordLength1;
-                } else {
-                    recLength = recordLength0;
-                }
+              //
 
-                int lowBxInEvent = (recLength + 1)/2 - recLength;
-                int uppBxInEvent = (recLength + 1)/2 - 1;
+              for (int i = 0; i < countsPerWord; ++i) {
+                bDataVal = bDataVal | ((m_candJetCounts->count(iCount))
+                                       << (jetCountsBits * i));
+                iCount++;
+              }
+            }
 
-                if ((iBxInEvent >= lowBxInEvent) && (iBxInEvent <= uppBxInEvent)) {
-                    writeBoard = true;
-                }
+            psbWordValue.setAData(aDataVal, iAB + iPair);
+            psbWordValue.setBData(bDataVal, iAB + iPair);
+
+            //
+            iPair = 1;
+            aDataVal = 0;
+            bDataVal = 0;
+
+            if (m_candJetCounts) {
+              for (int i = 0; i < countsPerWord; ++i) {
+                aDataVal = aDataVal | ((m_candJetCounts->count(iCount))
+                                       << (jetCountsBits * i));
+                iCount++;
+              }
 
-                //LogTrace("L1GlobalTrigger")
-                //    << "\nBoard " << std::hex << (itBoard->gtBoardId()) << std::dec
-                //    << "\naltNrBxBoard = " << altNrBxBoard << " recLength " << recLength
-                //    << " lowBxInEvent " << lowBxInEvent
-                //    << " uppBxInEvent " << uppBxInEvent
-                //    << std::endl;
+              //
+
+              for (int i = 0; i < countsPerWord; ++i) {
+                bDataVal = bDataVal | ((m_candJetCounts->count(iCount))
+                                       << (jetCountsBits * i));
+                iCount++;
+              }
             }
 
-            //LogTrace("L1GlobalTrigger")
-            //    << "\nBoard " << std::hex << (itBoard->gtBoardId()) << std::dec
-            //    << "\niBxInEvent = " << iBxInEvent << " iActiveBit " << iActiveBit
-            //    << " activeBoard " << activeBoard
-            //    << " writeBoard " << writeBoard
-            //    << std::endl;
+            psbWordValue.setAData(aDataVal, iAB + iPair);
+            psbWordValue.setBData(bDataVal, iAB + iPair);
+          }
+
+          break;
+            // FIXME add MIP/Iso bits
+          case HfQ: {
+
+            // LogTrace("L1GlobalTrigger")
+            //<< "\nL1GlobalTriggerPSB: write HfQ for BxInEvent = "
+            //<< iBxInEvent
+            //<< "\n PSB " << std::hex << itBoard->gtBoardId() << std::dec
+            //<< " Cable " << iCable << " Quad " << (*itQuad)
+            //<< std::endl;
+
+            // FIXME get it from event setup?
+            // 3 bits per Hf index
+            // order hardcoded here
+            // HfBitCounts first, followed by HfRingEtSum
+            int hfBits = 3;
+
+            L1GctHFBitCounts hfBitCounts;
+            int nHfBitCounts = hfBitCounts.nCounts();
+
+            L1GctHFRingEtSums hfRingEtSums;
+            int nHfRingEtSums = hfRingEtSums.nSums();
+
+            //
+            int iPair = 0;
+            aDataVal = 0;
+            bDataVal = 0;
+
+            // sizeof return in multiple of 8 bits
+            int hfPerWord = sizeof(aDataVal) * 8 / hfBits;
+            // LogTrace("L1GlobalTrigger")
+            //<< "\n nHfBitCounts  = " << nHfBitCounts
+            //<< "\n nHfRingEtSums = " << nHfRingEtSums
+            //<< "\n hfPerWord     = " << hfPerWord
+            //<< std::endl;
+
+            int iHf = 0;
+            bool aDataFlag = true;
+            bool bDataFlag = false;
+
+            if (m_candHfBitCounts) {
+
+              for (int i = 0; i < nHfBitCounts; ++i) {
+
+                if (aDataFlag) {
+                  if (iHf < hfPerWord) {
+                    // aData (cycle 0) for iPair 0 (object 0)
+                    aDataVal = aDataVal | ((m_candHfBitCounts->bitCount(i))
+                                           << (hfBits * iHf));
+                    iHf++;
+                    // LogTrace("L1GlobalTrigger")
+                    //        << "\n Added HfBitCounts index " << i << " to "
+                    //        << " aDataVal[" << (iAB + iPair) << "]"
+                    //        << std::endl;
+                  } else {
+                    aDataFlag = false;
+                    bDataFlag = true;
+                    iHf = 0;
+                  }
+                }
 
-            if (activeBoard && writeBoard && (itBoard->gtBoardType() == PSB)) {
+                if (bDataFlag) {
+                  if (iHf < hfPerWord) {
+                    // bData (cycle 1) for iPair 0 (object 2)
+                    bDataVal = bDataVal | ((m_candHfBitCounts->bitCount(i))
+                                           << (hfBits * iHf));
+                    iHf++;
+                    // LogTrace("L1GlobalTrigger")
+                    //        << "\n Added HfBitCounts index " << i << " to "
+                    //        << " bDataVal[" << (iAB + iPair) << "]"
+                    //       << std::endl;
+                  } else {
+                    aDataFlag = false;
+                    bDataFlag = false;
+                    iHf = 0;
+                  }
+                }
+              }
+            } else {
+              iHf = nHfBitCounts % hfPerWord;
+              // LogTrace("L1GlobalTrigger")
+              //        << "\n No HfBitCounts collection - skip "
+              //        << iHf*hfBits << " bits "
+              //        << std::endl;
+            }
 
-                L1GtPsbWord psbWordValue;
+            if (aDataFlag && bDataFlag) {
+              LogTrace("L1GlobalTrigger")
+                  << "\n HfBitCounts collection filled aData and bData ["
+                  << (iAB + iPair) << "]"
+                  << "\n HfRingEtSums collection has no space to be written"
+                  << std::endl;
+            }
 
-                // set board ID
-                psbWordValue.setBoardId(itBoard->gtBoardId());
+            if (m_candHfRingEtSums) {
+
+              for (int i = 0; i < nHfRingEtSums; ++i) {
+
+                if (aDataFlag) {
+                  if (iHf < hfPerWord) {
+                    // aData (cycle 0) for iPair 0 (object 0)
+                    aDataVal = aDataVal | ((m_candHfRingEtSums->etSum(i))
+                                           << (hfBits * iHf));
+                    iHf++;
+                    // LogTrace("L1GlobalTrigger")
+                    //        << "\n Added HfRingEtSums index " << i << " to "
+                    //        << " aDataVal[" << (iAB + iPair) << "]"
+                    //       << std::endl;
+                  } else {
+                    aDataFlag = false;
+                    bDataFlag = true;
+                    iHf = 0;
+                  }
+                }
 
-                // set bunch cross in the GT event record
-                psbWordValue.setBxInEvent(iBxInEvent);
+                if (bDataFlag) {
+                  if (iHf < hfPerWord) {
+                    // bData (cycle 1) for iPair 0 (object 2)
+                    bDataVal = bDataVal | ((m_candHfRingEtSums->etSum(i))
+                                           << (hfBits * iHf));
+                    iHf++;
+                    // LogTrace("L1GlobalTrigger")
+                    //        << "\n Added HfRingEtSums index " << i << " to "
+                    //        << " bDataVal[" << (iAB + iPair) << "]"
+                    //        << std::endl;
+                  } else {
+                    aDataFlag = false;
+                    bDataFlag = false;
+                    iHf = 0;
+                  }
+                }
+              }
+            } else {
+              iHf = nHfRingEtSums % hfPerWord;
+              // LogTrace("L1GlobalTrigger")
+              //        << "\n No HfRingEtSums collection - skip "
+              //        << iHf*hfBits << " bits "
+              //        << std::endl;
+            }
 
-                // set bunch cross number of the actual bx
-                boost::uint16_t bxNrValue = bxCrossHw;
-                psbWordValue.setBxNr(bxNrValue);
+            psbWordValue.setAData(aDataVal, iAB + iPair);
+            psbWordValue.setBData(bDataVal, iAB + iPair);
+
+            // LogTrace("L1GlobalTrigger")
+            //        << "\n aDataVal[" << iAB + iPair
+            //        << "] = 0x" << std::hex << aDataVal << std::dec
+            //        << "\n bDataVal[" << (iAB + iPair)
+            //        << "] = 0x" << std::hex << bDataVal << std::dec
+            //       << std::endl;
+
+            if (aDataFlag && bDataFlag) {
+              LogTrace("L1GlobalTrigger")
+                  << "\n aData and bData [" << (iAB + iPair) << "] full"
+                  << "\n HfRingEtSums collection has not enough space to be "
+                     "written"
+                  << std::endl;
+            }
 
+          }
 
-                // set event number since last L1 reset generated in PSB
-                psbWordValue.setEventNr(
-                    static_cast<boost::uint32_t>(iEvent.id().event()) );
+          break;
+          default: {
+            // do nothing
+          }
 
-                // set local bunch cross number of the actual bx
-                // set identical to bxCrossHw - other solution?
-                boost::uint16_t localBxNrValue = bxCrossHw;
-                psbWordValue.setLocalBxNr(localBxNrValue);
+          break;
+          } // end switch (*itQuad)
 
-                // get the objects coming to this PSB and the quadruplet index
+        } // end for: (itQuad)
 
-                // two objects writen one after another from the same quadruplet
-                int nrObjRow = 2;
+        // ** fill L1PsbWord in GT DAQ record
 
-                std::vector<L1GtPsbQuad> quadInPsb = itBoard->gtQuadInPsb();
-                int nrCables = quadInPsb.size();
+        // LogTrace("L1GlobalTrigger")
+        //<< "\nL1GlobalTriggerPSB: write psbWordValue"
+        //<< std::endl;
 
-                boost::uint16_t aDataVal = 0;
-                boost::uint16_t bDataVal = 0;
+        gtDaqReadoutRecord->setGtPsbWord(psbWordValue);
 
-                int iCable = -1;
-                for (std::vector<L1GtPsbQuad>::const_iterator
-                        itQuad = quadInPsb.begin();
-                        itQuad != quadInPsb.end(); ++itQuad) {
-
-                    iCable++;
-
-                    int iAB = (nrCables - iCable - 1)*nrObjRow;
-
-                    switch (*itQuad) {
-
-                        case TechTr: {
-
-                            //LogTrace("L1GlobalTrigger")
-                            //<< "\nL1GlobalTriggerPSB: write TechTr for BxInEvent = "
-                            //<< iBxInEvent
-                            //<< "\n PSB " << std::hex << itBoard->gtBoardId() << std::dec
-                            //<< " Cable " << iCable << " Quad " << (*itQuad)
-                            //<< std::endl;
-
-                            // order: 16-bit words
-                            int bitsPerWord = 16;
-
-                            //
-                            int iPair = 0;
-                            aDataVal = 0;
-
-                            int iBit = 0;
-                            boost::uint16_t bitVal = 0;
-
-                            for (int i = 0; i < bitsPerWord; ++i) {
-                                if (m_gtTechnicalTriggers[iBit]) {
-                                    bitVal = 1;
-                                }
-                                else {
-                                    bitVal = 0;
-                                }
-
-                                aDataVal = aDataVal | (bitVal << i);
-                                iBit++;
-                            }
-                            psbWordValue.setAData(aDataVal, iAB + iPair);
-
-                            //
-                            bDataVal = 0;
-
-                            for (int i = 0; i < bitsPerWord; ++i) {
-                                if (m_gtTechnicalTriggers[iBit]) {
-                                    bitVal = 1;
-                                }
-                                else {
-                                    bitVal = 0;
-                                }
-
-                                bDataVal = bDataVal | (bitVal << i);
-                                iBit++;
-                            }
-                            psbWordValue.setBData(bDataVal, iAB + iPair);
-
-                            //
-                            iPair = 1;
-                            aDataVal = 0;
-
-                            for (int i = 0; i < bitsPerWord; ++i) {
-                                if (m_gtTechnicalTriggers[iBit]) {
-                                    bitVal = 1;
-                                }
-                                else {
-                                    bitVal = 0;
-                                }
-
-                                aDataVal = aDataVal | (bitVal << i);
-                                iBit++;
-                            }
-                            psbWordValue.setAData(aDataVal, iAB + iPair);
-
-                            bDataVal = 0;
-
-                            for (int i = 0; i < bitsPerWord; ++i) {
-                                if (m_gtTechnicalTriggers[iBit]) {
-                                    bitVal = 1;
-                                }
-                                else {
-                                    bitVal = 0;
-                                }
-
-                                bDataVal = bDataVal | (bitVal << i);
-                                iBit++;
-                            }
-                            psbWordValue.setBData(bDataVal, iAB + iPair);
-                        }
-
-                            break;
-                        case NoIsoEGQ: {
-
-                            //LogTrace("L1GlobalTrigger")
-                            //<< "\nL1GlobalTriggerPSB: write NoIsoEGQ for BxInEvent = "
-                            //<< iBxInEvent
-                            //<< "\n PSB " << std::hex << itBoard->gtBoardId() << std::dec
-                            //<< " Cable " << iCable << " Quad " << (*itQuad)
-                            //<< std::endl;
-
-                            int recL1NoIsoEG = m_candL1NoIsoEG->size();
-                            for (int iPair = 0; iPair < nrObjRow; ++iPair) {
-                                if (iPair < recL1NoIsoEG) {
-                                    aDataVal =
-                                        (static_cast<const L1GctEmCand*> ((*m_candL1NoIsoEG)[iPair]))->raw();
-                                }
-                                else {
-                                    aDataVal = 0;
-                                }
-                                psbWordValue.setAData(aDataVal, iAB + iPair);
-
-                                if ((iPair + nrObjRow) < recL1NoIsoEG) {
-                                    bDataVal =
-                                        (static_cast<const L1GctEmCand*> ((*m_candL1NoIsoEG)[iPair + nrObjRow]))->raw();
-                                }
-                                else {
-                                    bDataVal = 0;
-                                }
-                                psbWordValue.setBData(bDataVal, iAB + iPair);
-
-                            }
-                        }
-
-                            break;
-                        case IsoEGQ: {
-
-                            //LogTrace("L1GlobalTrigger")
-                            //<< "\nL1GlobalTriggerPSB: write IsoEGQ for BxInEvent = "
-                            //<< iBxInEvent
-                            //<< "\n PSB " << std::hex << itBoard->gtBoardId() << std::dec
-                            //<< " Cable " << iCable << " Quad " << (*itQuad)
-                            //<< std::endl;
-
-                            int recL1IsoEG = m_candL1IsoEG->size();
-                            for (int iPair = 0; iPair < nrObjRow; ++iPair) {
-                                if (iPair < recL1IsoEG) {
-                                    aDataVal =
-                                        (static_cast<const L1GctEmCand*> ((*m_candL1IsoEG)[iPair]))->raw();
-                                }
-                                else {
-                                    aDataVal = 0;
-                                }
-                                psbWordValue.setAData(aDataVal, iAB + iPair);
-
-                                if ((iPair + nrObjRow) < recL1IsoEG) {
-                                    bDataVal =
-                                        (static_cast<const L1GctEmCand*> ((*m_candL1IsoEG)[iPair + nrObjRow]))->raw();
-                                }
-                                else {
-                                    bDataVal = 0;
-                                }
-                                psbWordValue.setBData(bDataVal, iAB + iPair);
-
-                            }
-
-                        }
-
-                            break;
-                        case CenJetQ: {
-
-                            //LogTrace("L1GlobalTrigger")
-                            //<< "\nL1GlobalTriggerPSB: write CenJetQ for BxInEvent = "
-                            //<< iBxInEvent
-                            //<< "\n PSB " << std::hex << itBoard->gtBoardId() << std::dec
-                            //<< " Cable " << iCable << " Quad " << (*itQuad)
-                            //<< std::endl;
-
-                            int recL1CenJet = m_candL1CenJet->size();
-                            for (int iPair = 0; iPair < nrObjRow; ++iPair) {
-                                if (iPair < recL1CenJet) {
-                                    aDataVal =
-                                        (static_cast<const L1GctJetCand*> ((*m_candL1CenJet)[iPair]))->raw();
-                                }
-                                else {
-                                    aDataVal = 0;
-                                }
-                                psbWordValue.setAData(aDataVal, iAB + iPair);
-
-                                if ((iPair + nrObjRow) < recL1CenJet) {
-                                    bDataVal =
-                                        (static_cast<const L1GctJetCand*> ((*m_candL1CenJet)[iPair + nrObjRow]))->raw();
-                                }
-                                else {
-                                    bDataVal = 0;
-                                }
-                                psbWordValue.setBData(bDataVal, iAB + iPair);
-
-                            }
-                        }
-
-                            break;
-                        case ForJetQ: {
-
-                            //LogTrace("L1GlobalTrigger")
-                            //<< "\nL1GlobalTriggerPSB: write ForJetQ for BxInEvent = "
-                            //<< iBxInEvent
-                            //<< "\n PSB " << std::hex << itBoard->gtBoardId() << std::dec
-                            //<< " Cable " << iCable << " Quad " << (*itQuad)
-                            //<< std::endl;
-
-                            int recL1ForJet = m_candL1ForJet->size();
-                            for (int iPair = 0; iPair < nrObjRow; ++iPair) {
-                                if (iPair < recL1ForJet) {
-                                    aDataVal =
-                                        (static_cast<const L1GctJetCand*> ((*m_candL1ForJet)[iPair]))->raw();
-                                }
-                                else {
-                                    aDataVal = 0;
-                                }
-                                psbWordValue.setAData(aDataVal, iAB + iPair);
-
-                                if ((iPair + nrObjRow) < recL1ForJet) {
-                                    bDataVal =
-                                        (static_cast<const L1GctJetCand*> ((*m_candL1ForJet)[iPair + nrObjRow]))->raw();
-                                }
-                                else {
-                                    bDataVal = 0;
-                                }
-                                psbWordValue.setBData(bDataVal, iAB + iPair);
-
-                            }
-
-                        }
-
-                            break;
-                        case TauJetQ: {
-
-                            //LogTrace("L1GlobalTrigger")
-                            //<< "\nL1GlobalTriggerPSB: write TauJetQ for BxInEvent = "
-                            //<< iBxInEvent
-                            //<< "\n PSB " << std::hex << itBoard->gtBoardId() << std::dec
-                            //<< " Cable " << iCable << " Quad " << (*itQuad)
-                            //<< std::endl;
-
-                            int recL1TauJet = m_candL1TauJet->size();
-                            for (int iPair = 0; iPair < nrObjRow; ++iPair) {
-                                if (iPair < recL1TauJet) {
-                                    aDataVal =
-                                        (static_cast<const L1GctJetCand*> ((*m_candL1TauJet)[iPair]))->raw();
-                                }
-                                else {
-                                    aDataVal = 0;
-                                }
-                                psbWordValue.setAData(aDataVal, iAB + iPair);
-
-                                if ((iPair + nrObjRow) < recL1TauJet) {
-                                    bDataVal =
-                                        (static_cast<const L1GctJetCand*> ((*m_candL1TauJet)[iPair + nrObjRow]))->raw();
-                                }
-                                else {
-                                    bDataVal = 0;
-                                }
-                                psbWordValue.setBData(bDataVal, iAB + iPair);
-
-                                //LogTrace("L1GlobalTrigger")
-                                //        << "\n aDataVal[" << (iAB + iPair)
-                                //        << "] = 0x" << std::hex << aDataVal << std::dec
-                                //        << " (object " << iPair << ")"
-                                //        << "\n bDataVal[" << (iAB + iPair)
-                                //        << "] = 0x" << std::hex << bDataVal << std::dec
-                                //        << " (object " << (iPair + nrObjRow) << ")"
-                                //        << std::endl;
-
-                            }
-
-                        }
-
-                            break;
-                        case ESumsQ: {
-
-                            //LogTrace("L1GlobalTrigger")
-                            //<< "\nL1GlobalTriggerPSB: write ESumsQ for BxInEvent = "
-                            //<< iBxInEvent
-                            //<< "\n PSB " << std::hex << itBoard->gtBoardId() << std::dec
-                            //<< " Cable " << iCable << " Quad " << (*itQuad)
-                            //<< std::endl;
-
-                            // order: ETT, ETM et, HTT, ETM phi... hardcoded here
-                            int iPair = 0;
-
-                            if (m_candETT) {
-                                aDataVal = m_candETT->raw();
-                            }
-                            else {
-                                aDataVal = 0;
-                            }
-                            psbWordValue.setAData(aDataVal, iAB + iPair);
-
-                            if (m_candHTT) {
-                                bDataVal = m_candHTT->raw();
-                            }
-                            else {
-                                bDataVal = 0;
-                            }
-                            psbWordValue.setBData(bDataVal, iAB + iPair);
-
-                            //LogTrace("L1GlobalTrigger")
-                            //        << "\n aDataVal[" << (iAB + iPair)
-                            //        << "] = 0x" << std::hex << aDataVal << std::dec
-                            //        << "\n bDataVal[" << (iAB + iPair)
-                            //        << "] = 0x" << std::hex << bDataVal << std::dec
-                            //        << std::endl;
-                            //
-                            iPair = 1;
-                            if (m_candETM) {
-                                // bits 0:15
-                                aDataVal = m_candETM->raw() & 0x0000FFFF;
-
-                                //LogTrace("L1GlobalTrigger") << std::hex
-                                //        << "\n ETM et        = "
-                                //        << m_candETM->et()
-                                //        << "\n ETM overFlow  = "
-                                //       << m_candETM->overFlow() << std::dec
-                                //       << std::endl;
-                            }
-                            else {
-                                aDataVal = 0;
-                            }
-                            psbWordValue.setAData(aDataVal, iAB + iPair);
-
-                            if (m_candETM) {
-
-                                // bits 16:31
-                                bDataVal = (m_candETM->raw() & 0xFFFF0000) >> 16;
-
-                                //LogTrace("L1GlobalTrigger") << std::hex
-                                //        << "\n ETM phi  = " << m_candETM->phi()
-                                //        << std::dec << std::endl;
-
-                            }
-                            else {
-                                bDataVal = 0;
-                            }
-                            psbWordValue.setBData(bDataVal, iAB + iPair);
-
-                            // FIXME add HTM
-
-                            //LogTrace("L1GlobalTrigger")
-                            //        << "\n aDataVal[" << (iAB + iPair)
-                            //        << "] = 0x" << std::hex << aDataVal << std::dec
-                            //       << "\n bDataVal[" << (iAB + iPair)
-                            //        << "] = 0x" << std::hex << bDataVal << std::dec
-                            //       << std::endl;
-
-                        }
-
-                            break;
-                        case JetCountsQ: {
-
-                            //LogTrace("L1GlobalTrigger")
-                            //<< "\nL1GlobalTriggerPSB: write JetCountsQ for BxInEvent = "
-                            //<< iBxInEvent
-                            //<< "\n PSB " << std::hex << itBoard->gtBoardId() << std::dec
-                            //<< " Cable " << iCable << " Quad " << (*itQuad)
-                            //<< std::endl;
-
-                            // order: 3 JetCounts per 16-bits word ... hardcoded here
-                            int jetCountsBits = 5; // FIXME get it from event setup
-                            int countsPerWord = 3;
-
-                            //
-                            int iPair = 0;
-                            aDataVal = 0;
-                            bDataVal = 0;
-
-                            int iCount = 0;
-
-                            if (m_candJetCounts) {
-
-                                for (int i = 0; i < countsPerWord; ++i) {
-                                    aDataVal = aDataVal
-                                            | ((m_candJetCounts->count(iCount))
-                                                    << (jetCountsBits*i));
-                                    iCount++;
-                                }
-
-                                //
-
-                                for (int i = 0; i < countsPerWord; ++i) {
-                                    bDataVal = bDataVal
-                                            | ((m_candJetCounts->count(iCount))
-                                                    << (jetCountsBits*i));
-                                    iCount++;
-                                }
-
-                            }
-
-                            psbWordValue.setAData(aDataVal, iAB + iPair);
-                            psbWordValue.setBData(bDataVal, iAB + iPair);
-
-                            //
-                            iPair = 1;
-                            aDataVal = 0;
-                            bDataVal = 0;
-
-                            if (m_candJetCounts) {
-                                for (int i = 0; i < countsPerWord; ++i) {
-                                    aDataVal = aDataVal
-                                            | ((m_candJetCounts->count(iCount))
-                                                    << (jetCountsBits*i));
-                                    iCount++;
-                                }
-
-                                //
-
-                                for (int i = 0; i < countsPerWord; ++i) {
-                                    bDataVal = bDataVal
-                                            | ((m_candJetCounts->count(iCount))
-                                                    << (jetCountsBits*i));
-                                    iCount++;
-                                }
-
-                            }
-
-                            psbWordValue.setAData(aDataVal, iAB + iPair);
-                            psbWordValue.setBData(bDataVal, iAB + iPair);
-                        }
-
-                            break;
-                            // FIXME add MIP/Iso bits
-                        case HfQ: {
-
-                            //LogTrace("L1GlobalTrigger")
-                            //<< "\nL1GlobalTriggerPSB: write HfQ for BxInEvent = "
-                            //<< iBxInEvent
-                            //<< "\n PSB " << std::hex << itBoard->gtBoardId() << std::dec
-                            //<< " Cable " << iCable << " Quad " << (*itQuad)
-                            //<< std::endl;
-
-                            // FIXME get it from event setup?
-                            // 3 bits per Hf index
-                            // order hardcoded here
-                            // HfBitCounts first, followed by HfRingEtSum
-                            int hfBits = 3;
-
-                            L1GctHFBitCounts hfBitCounts;
-                            int nHfBitCounts = hfBitCounts.nCounts();
-
-                            L1GctHFRingEtSums hfRingEtSums;
-                            int nHfRingEtSums = hfRingEtSums.nSums();
-
-                            //
-                            int iPair = 0;
-                            aDataVal = 0;
-                            bDataVal = 0;
-
-                            // sizeof return in multiple of 8 bits
-                            int hfPerWord = sizeof(aDataVal)*8/hfBits;
-                            //LogTrace("L1GlobalTrigger")
-                            //<< "\n nHfBitCounts  = " << nHfBitCounts
-                            //<< "\n nHfRingEtSums = " << nHfRingEtSums
-                            //<< "\n hfPerWord     = " << hfPerWord
-                            //<< std::endl;
-
-                            int iHf = 0;
-                            bool aDataFlag = true;
-                            bool bDataFlag = false;
-
-                            if (m_candHfBitCounts) {
-
-                                for (int i = 0; i < nHfBitCounts; ++i) {
-
-                                    if (aDataFlag) {
-                                        if (iHf < hfPerWord) {
-                                            // aData (cycle 0) for iPair 0 (object 0)
-                                            aDataVal = aDataVal
-                                                    | ((m_candHfBitCounts->bitCount(i))
-                                                            << (hfBits*iHf));
-                                            iHf++;
-                                            //LogTrace("L1GlobalTrigger")
-                                            //        << "\n Added HfBitCounts index " << i << " to "
-                                            //        << " aDataVal[" << (iAB + iPair) << "]"
-                                            //        << std::endl;
-                                        } else {
-                                            aDataFlag = false;
-                                            bDataFlag = true;
-                                            iHf = 0;
-                                        }
-                                    }
-
-                                    if (bDataFlag) {
-                                        if (iHf < hfPerWord) {
-                                            // bData (cycle 1) for iPair 0 (object 2)
-                                            bDataVal = bDataVal
-                                                    | ((m_candHfBitCounts->bitCount(i))
-                                                            << (hfBits*iHf));
-                                            iHf++;
-                                            //LogTrace("L1GlobalTrigger")
-                                            //        << "\n Added HfBitCounts index " << i << " to "
-                                            //        << " bDataVal[" << (iAB + iPair) << "]"
-                                            //       << std::endl;
-                                        } else {
-                                            aDataFlag = false;
-                                            bDataFlag = false;
-                                            iHf = 0;
-                                        }
-                                    }
-                                }
-                            } else {
-                                iHf = nHfBitCounts%hfPerWord;
-                                //LogTrace("L1GlobalTrigger")
-                                //        << "\n No HfBitCounts collection - skip "
-                                //        << iHf*hfBits << " bits "
-                                //        << std::endl;
-                            }
-
-                            if (aDataFlag && bDataFlag) {
-                                LogTrace("L1GlobalTrigger")
-                                        << "\n HfBitCounts collection filled aData and bData ["
-                                        << (iAB + iPair) << "]"
-                                        << "\n HfRingEtSums collection has no space to be written"
-                                        << std::endl;
-                            }
-
-                            if (m_candHfRingEtSums) {
-
-                                for (int i = 0; i < nHfRingEtSums; ++i) {
-
-                                    if (aDataFlag) {
-                                        if (iHf < hfPerWord) {
-                                            // aData (cycle 0) for iPair 0 (object 0)
-                                            aDataVal = aDataVal
-                                                    | ((m_candHfRingEtSums->etSum(i))
-                                                            << (hfBits*iHf));
-                                            iHf++;
-                                            //LogTrace("L1GlobalTrigger")
-                                            //        << "\n Added HfRingEtSums index " << i << " to "
-                                            //        << " aDataVal[" << (iAB + iPair) << "]"
-                                            //       << std::endl;
-                                        } else {
-                                            aDataFlag = false;
-                                            bDataFlag = true;
-                                            iHf = 0;
-                                        }
-                                    }
-
-                                    if (bDataFlag) {
-                                        if (iHf < hfPerWord) {
-                                            // bData (cycle 1) for iPair 0 (object 2)
-                                            bDataVal = bDataVal
-                                                    | ((m_candHfRingEtSums->etSum(i))
-                                                            << (hfBits*iHf));
-                                            iHf++;
-                                            //LogTrace("L1GlobalTrigger")
-                                            //        << "\n Added HfRingEtSums index " << i << " to "
-                                            //        << " bDataVal[" << (iAB + iPair) << "]"
-                                            //        << std::endl;
-                                        } else {
-                                            aDataFlag = false;
-                                            bDataFlag = false;
-                                            iHf = 0;
-                                        }
-                                    }
-                                }
-                            } else {
-                                iHf = nHfRingEtSums%hfPerWord;
-                                //LogTrace("L1GlobalTrigger")
-                                //        << "\n No HfRingEtSums collection - skip "
-                                //        << iHf*hfBits << " bits "
-                                //        << std::endl;
-                            }
-
-                            psbWordValue.setAData(aDataVal, iAB + iPair);
-                            psbWordValue.setBData(bDataVal, iAB + iPair);
-
-                            //LogTrace("L1GlobalTrigger")
-                            //        << "\n aDataVal[" << iAB + iPair
-                            //        << "] = 0x" << std::hex << aDataVal << std::dec
-                            //        << "\n bDataVal[" << (iAB + iPair)
-                            //        << "] = 0x" << std::hex << bDataVal << std::dec
-                            //       << std::endl;
-
-                            if (aDataFlag && bDataFlag) {
-                                LogTrace("L1GlobalTrigger")
-                                        << "\n aData and bData ["
-                                        << (iAB + iPair) << "] full"
-                                        << "\n HfRingEtSums collection has not enough space to be written"
-                                        << std::endl;
-                            }
-
-                        }
-
-                            break;
-                        default: {
-                            // do nothing
-                        }
-
-                            break;
-                    } // end switch (*itQuad)
-
-                } // end for: (itQuad)
-
-                // ** fill L1PsbWord in GT DAQ record
-
-                //LogTrace("L1GlobalTrigger")
-                //<< "\nL1GlobalTriggerPSB: write psbWordValue"
-                //<< std::endl;
-
-                gtDaqReadoutRecord->setGtPsbWord(psbWordValue);
-
-            } // end if (active && PSB)
-
-        } // end if (iPosition)
-
-    } // end for (itBoard
+      } // end if (active && PSB)
 
+    } // end if (iPosition)
 
+  } // end for (itBoard
 }
 
 // clear PSB
 
 void L1GlobalTriggerPSB::reset() {
 
-    m_candL1NoIsoEG->clear();
-    m_candL1IsoEG->clear();
-    m_candL1CenJet->clear();
-    m_candL1ForJet->clear();
-    m_candL1TauJet->clear();
+  m_candL1NoIsoEG->clear();
+  m_candL1IsoEG->clear();
+  m_candL1CenJet->clear();
+  m_candL1ForJet->clear();
+  m_candL1TauJet->clear();
 
-    // no reset() available...
-    m_candETM = nullptr;
-    m_candETT = nullptr;
-    m_candHTT = nullptr;
-    m_candHTM = nullptr;
+  // no reset() available...
+  m_candETM = nullptr;
+  m_candETT = nullptr;
+  m_candHTT = nullptr;
+  m_candHTM = nullptr;
 
-    m_candJetCounts = nullptr;
-
-    m_candHfBitCounts = nullptr;
-    m_candHfRingEtSums = nullptr;
+  m_candJetCounts = nullptr;
 
+  m_candHfBitCounts = nullptr;
+  m_candHfRingEtSums = nullptr;
 }
 
 // print Global Calorimeter Trigger data
 // use int to bitset conversion to print
-void L1GlobalTriggerPSB::printGctObjectData(const int iBxInEvent) const
-{
+void L1GlobalTriggerPSB::printGctObjectData(const int iBxInEvent) const {
 
-    LogTrace("L1GlobalTrigger")
-            << "\nL1GlobalTrigger: GCT data [hex] received by PSBs for BxInEvent = "
-            << iBxInEvent << "\n" << std::endl;
+  LogTrace("L1GlobalTrigger")
+      << "\nL1GlobalTrigger: GCT data [hex] received by PSBs for BxInEvent = "
+      << iBxInEvent << "\n"
+      << std::endl;
 
-    std::vector<const L1GctCand*>::const_iterator iterConst;
+  std::vector<const L1GctCand *>::const_iterator iterConst;
 
-    LogTrace("L1GlobalTrigger") << "   GCT NoIsoEG " << std::endl;
-    for ( iterConst = m_candL1NoIsoEG->begin(); iterConst != m_candL1NoIsoEG->end(); iterConst++ ) {
+  LogTrace("L1GlobalTrigger") << "   GCT NoIsoEG " << std::endl;
+  for (iterConst = m_candL1NoIsoEG->begin();
+       iterConst != m_candL1NoIsoEG->end(); iterConst++) {
 
-        LogTrace("L1GlobalTrigger")
-        << std::hex
-        << "Rank = " << (*iterConst)->rank()
+    LogTrace("L1GlobalTrigger")
+        << std::hex << "Rank = " << (*iterConst)->rank()
         << " Eta index = " << (*iterConst)->etaIndex()
-        << " Phi index = " << (*iterConst)->phiIndex()
-        << std::dec
-        << std::endl;
-    }
+        << " Phi index = " << (*iterConst)->phiIndex() << std::dec << std::endl;
+  }
 
-    LogTrace("L1GlobalTrigger") << "   GCT IsoEG " << std::endl;
-    for ( iterConst = m_candL1IsoEG->begin(); iterConst != m_candL1IsoEG->end(); iterConst++ ) {
-        LogTrace("L1GlobalTrigger")
-        << std::hex
-        << "Rank = " << (*iterConst)->rank()
+  LogTrace("L1GlobalTrigger") << "   GCT IsoEG " << std::endl;
+  for (iterConst = m_candL1IsoEG->begin(); iterConst != m_candL1IsoEG->end();
+       iterConst++) {
+    LogTrace("L1GlobalTrigger")
+        << std::hex << "Rank = " << (*iterConst)->rank()
         << " Eta index = " << (*iterConst)->etaIndex()
-        << " Phi index = " << (*iterConst)->phiIndex()
-        << std::dec
-        << std::endl;
-    }
+        << " Phi index = " << (*iterConst)->phiIndex() << std::dec << std::endl;
+  }
 
-    LogTrace("L1GlobalTrigger") << "   GCT CenJet " << std::endl;
-    for ( iterConst = m_candL1CenJet->begin(); iterConst != m_candL1CenJet->end(); iterConst++ ) {
-        LogTrace("L1GlobalTrigger")
-        << std::hex
-        << "Rank = " << (*iterConst)->rank()
+  LogTrace("L1GlobalTrigger") << "   GCT CenJet " << std::endl;
+  for (iterConst = m_candL1CenJet->begin(); iterConst != m_candL1CenJet->end();
+       iterConst++) {
+    LogTrace("L1GlobalTrigger")
+        << std::hex << "Rank = " << (*iterConst)->rank()
         << " Eta index = " << (*iterConst)->etaIndex()
-        << " Phi index = " << (*iterConst)->phiIndex()
-        << std::dec
-        << std::endl;
-    }
+        << " Phi index = " << (*iterConst)->phiIndex() << std::dec << std::endl;
+  }
 
-    LogTrace("L1GlobalTrigger") << "   GCT ForJet " << std::endl;
-    for ( iterConst = m_candL1ForJet->begin(); iterConst != m_candL1ForJet->end(); iterConst++ ) {
-        LogTrace("L1GlobalTrigger")
-        << std::hex
-        << "Rank = " << (*iterConst)->rank()
+  LogTrace("L1GlobalTrigger") << "   GCT ForJet " << std::endl;
+  for (iterConst = m_candL1ForJet->begin(); iterConst != m_candL1ForJet->end();
+       iterConst++) {
+    LogTrace("L1GlobalTrigger")
+        << std::hex << "Rank = " << (*iterConst)->rank()
         << " Eta index = " << (*iterConst)->etaIndex()
-        << " Phi index = " << (*iterConst)->phiIndex()
-        << std::dec
-        << std::endl;
-    }
+        << " Phi index = " << (*iterConst)->phiIndex() << std::dec << std::endl;
+  }
 
-    LogTrace("L1GlobalTrigger") << "   GCT TauJet " << std::endl;
-    for ( iterConst = m_candL1TauJet->begin(); iterConst != m_candL1TauJet->end(); iterConst++ ) {
-        LogTrace("L1GlobalTrigger")
-        << std::hex
-        << "Rank = " << (*iterConst)->rank()
+  LogTrace("L1GlobalTrigger") << "   GCT TauJet " << std::endl;
+  for (iterConst = m_candL1TauJet->begin(); iterConst != m_candL1TauJet->end();
+       iterConst++) {
+    LogTrace("L1GlobalTrigger")
+        << std::hex << "Rank = " << (*iterConst)->rank()
         << " Eta index = " << (*iterConst)->etaIndex()
-        << " Phi index = " << (*iterConst)->phiIndex()
-        << std::dec
-        << std::endl;
-    }
-
-    LogTrace("L1GlobalTrigger") << "   GCT ETM " << std::endl;
-    if ( m_candETM ) {
-        LogTrace("L1GlobalTrigger")
-        << std::hex
-        << "ET  = " << m_candETM->et()
-        << std::dec
-        << std::endl;
-
-        LogTrace("L1GlobalTrigger")
-        << std::hex
-        << "phi = " << m_candETM->phi()
-        << std::dec
-        << std::endl;
-    }
-
-    LogTrace("L1GlobalTrigger") << "   GCT ETT " << std::endl;
-    if ( m_candETT )   {
-        LogTrace("L1GlobalTrigger")
-        << std::hex
-        <<  "ET  = " << m_candETT->et()
-        << std::dec
-        << std::endl;
-    }
-
-    LogTrace("L1GlobalTrigger") << "   GCT HTT " << std::endl;
-    if ( m_candHTT )   {
-        LogTrace("L1GlobalTrigger")
-        << std::hex
-        <<  "ET  = " << m_candHTT->et()
-        << std::dec
-        << std::endl;
-    }
+        << " Phi index = " << (*iterConst)->phiIndex() << std::dec << std::endl;
+  }
 
-    LogTrace("L1GlobalTrigger") << "   GCT HTM " << std::endl;
-    if ( m_candHTM ) {
-        LogTrace("L1GlobalTrigger")
-        << std::hex
-        << "ET  = " << m_candHTM->et()
-        << std::dec
-        << std::endl;
+  LogTrace("L1GlobalTrigger") << "   GCT ETM " << std::endl;
+  if (m_candETM) {
+    LogTrace("L1GlobalTrigger")
+        << std::hex << "ET  = " << m_candETM->et() << std::dec << std::endl;
 
-        LogTrace("L1GlobalTrigger")
-        << std::hex
-        << "phi = " << m_candHTM->phi()
-        << std::dec
-        << std::endl;
-    }
+    LogTrace("L1GlobalTrigger")
+        << std::hex << "phi = " << m_candETM->phi() << std::dec << std::endl;
+  }
 
-    LogTrace("L1GlobalTrigger") << "   GCT JetCounts " << std::endl;
-    if ( m_candJetCounts ) {
-        LogTrace("L1GlobalTrigger") << (*m_candJetCounts) << std::endl;
-    }
+  LogTrace("L1GlobalTrigger") << "   GCT ETT " << std::endl;
+  if (m_candETT) {
+    LogTrace("L1GlobalTrigger")
+        << std::hex << "ET  = " << m_candETT->et() << std::dec << std::endl;
+  }
 
-    LogTrace("L1GlobalTrigger") << "   GCT HfBitCounts " << std::endl;
-    if ( m_candHfBitCounts ) {
-        LogTrace("L1GlobalTrigger") << (*m_candHfBitCounts) << std::endl;
-    }
+  LogTrace("L1GlobalTrigger") << "   GCT HTT " << std::endl;
+  if (m_candHTT) {
+    LogTrace("L1GlobalTrigger")
+        << std::hex << "ET  = " << m_candHTT->et() << std::dec << std::endl;
+  }
 
-    LogTrace("L1GlobalTrigger") << "   GCT HfRingEtSums " << std::endl;
-    if ( m_candHfRingEtSums ) {
-        LogTrace("L1GlobalTrigger") << (*m_candHfRingEtSums) << std::endl;
-    }
+  LogTrace("L1GlobalTrigger") << "   GCT HTM " << std::endl;
+  if (m_candHTM) {
+    LogTrace("L1GlobalTrigger")
+        << std::hex << "ET  = " << m_candHTM->et() << std::dec << std::endl;
 
+    LogTrace("L1GlobalTrigger")
+        << std::hex << "phi = " << m_candHTM->phi() << std::dec << std::endl;
+  }
+
+  LogTrace("L1GlobalTrigger") << "   GCT JetCounts " << std::endl;
+  if (m_candJetCounts) {
+    LogTrace("L1GlobalTrigger") << (*m_candJetCounts) << std::endl;
+  }
+
+  LogTrace("L1GlobalTrigger") << "   GCT HfBitCounts " << std::endl;
+  if (m_candHfBitCounts) {
+    LogTrace("L1GlobalTrigger") << (*m_candHfBitCounts) << std::endl;
+  }
+
+  LogTrace("L1GlobalTrigger") << "   GCT HfRingEtSums " << std::endl;
+  if (m_candHfRingEtSums) {
+    LogTrace("L1GlobalTrigger") << (*m_candHfRingEtSums) << std::endl;
+  }
 }
 
-
-
 // static data members
diff --git a/L1Trigger/GlobalTrigger/src/L1GtAlgorithmEvaluation.cc b/L1Trigger/GlobalTrigger/src/L1GtAlgorithmEvaluation.cc
index 5fd9ed1e744ef..90140758431d7 100644
--- a/L1Trigger/GlobalTrigger/src/L1GtAlgorithmEvaluation.cc
+++ b/L1Trigger/GlobalTrigger/src/L1GtAlgorithmEvaluation.cc
@@ -1,14 +1,14 @@
 /**
  * \class L1GtAlgorithmEvaluation
- * 
- * 
+ *
+ *
  * Description: Evaluation of a L1 Global Trigger algorithm.
- * 
+ *
  * Implementation:
  *    <TODO: enter implementation details>
- *   
- * \author: Vasile Mihai Ghete   - HEPHY Vienna 
- * 
+ *
+ * \author: Vasile Mihai Ghete   - HEPHY Vienna
+ *
  *
  */
 
@@ -18,197 +18,186 @@
 // system include files
 #include <string>
 
-#include <stack>
 #include <queue>
+#include <stack>
 #include <vector>
 
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
 #include <boost/algorithm/string.hpp>
 #include <ext/hash_map>
 
 // user include files
 
-
 //
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerObjectMapFwd.h"
 #include "CondFormats/L1TObjects/interface/L1GtAlgorithm.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerObjectMapFwd.h"
 
 #include "L1Trigger/GlobalTrigger/interface/L1GtConditionEvaluation.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-
 /// constructor from an algorithm from event setup
-L1GtAlgorithmEvaluation::L1GtAlgorithmEvaluation(const L1GtAlgorithm& alg) :
-  m_algoResult(false),
-  m_logicalExpression(alg.algoLogicalExpression()),
-  m_rpnVector(alg.algoRpnVector()){
-
-    // the rest is properly initialized by default
+L1GtAlgorithmEvaluation::L1GtAlgorithmEvaluation(const L1GtAlgorithm &alg)
+    : m_algoResult(false), m_logicalExpression(alg.algoLogicalExpression()),
+      m_rpnVector(alg.algoRpnVector()) {
 
+  // the rest is properly initialized by default
 }
 
-
 // methods
 
 /// evaluate an algorithm
-void L1GtAlgorithmEvaluation::evaluateAlgorithm(const int chipNumber,
-    const std::vector<ConditionEvaluationMap>& conditionResultMaps) {
+void L1GtAlgorithmEvaluation::evaluateAlgorithm(
+    const int chipNumber,
+    const std::vector<ConditionEvaluationMap> &conditionResultMaps) {
 
-    // set result to false if there is no expression 
-    if (m_rpnVector.empty() ) {
-        m_algoResult = false;
+  // set result to false if there is no expression
+  if (m_rpnVector.empty()) {
+    m_algoResult = false;
 
-        // it should never be happen
-        throw cms::Exception("FailModule")
+    // it should never be happen
+    throw cms::Exception("FailModule")
         << "\nEmpty RPN vector for the logical expression = "
-        << m_logicalExpression
-        << std::endl;
+        << m_logicalExpression << std::endl;
+  }
 
-    }
-    
-    // reserve memory
-    int rpnVectorSize = m_rpnVector.size();
-    
-    m_algoCombinationVector.reserve(rpnVectorSize);
-    m_operandTokenVector.reserve(rpnVectorSize);
-
-    // stack containing temporary results
-    // FIXME we shall find a better solution than static
-    std::stack<bool, std::vector<bool> > resultStack;
-    bool b1, b2;
-
-    int opNumber = 0;
-
-    for (RpnVector::const_iterator it = m_rpnVector.begin(); it != m_rpnVector.end(); it++) {
-
-        //LogTrace("L1GlobalTrigger")
-        //<< "\nit->operation = " << it->operation
-        //<< "\nit->operand =   '" << it->operand << "'\n"
-        //<< std::endl;
-
-        switch (it->operation) {
-
-            case L1GtLogicParser::OP_OPERAND: {
-
-                CItEvalMap itCond = (conditionResultMaps.at(chipNumber)).find(it->operand);
-                if (itCond != (conditionResultMaps[chipNumber]).end()) {
-
-                    if (nullptr == itCond->second) {
-                        // it should never be happen, only valid conditions are in the maps
-                        throw cms::Exception("FailModule") << "\nCondition "
-                                << (it->operand)
-                                << " NULL pointer found in condition map"
-                                << std::endl;
-                    }
-
-                    //
-                    bool condResult = (itCond->second)->condLastResult();
-
-                    resultStack.push(condResult);
-
-                    // only conditions are added to /counted in m_operandTokenVector 
-                    // opNumber is the index of the condition in the logical expression
-                    OperandToken opToken;
-                    opToken.tokenName = it->operand;
-                    opToken.tokenNumber = opNumber;
-                    opToken.tokenResult = condResult;
-                    
-                    m_operandTokenVector.push_back(opToken);
-                    opNumber++;
-                    
-                    //
-                    CombinationsInCond const & combInCondition = (itCond->second)->getCombinationsInCond();
-                    m_algoCombinationVector.push_back(combInCondition);
-
-                }
-                else {
-
-                    // it should never be happen, all conditions are in the maps
-                    throw cms::Exception("FailModule")
-                    << "\nCondition " << (it->operand) << " not found in condition map"
-                    << std::endl;
-
-                }
-
-            }
-
-                break;
-	case  L1GtLogicParser::OP_NOT: {
-                b1 = resultStack.top();
-                resultStack.pop(); // pop the top
-                resultStack.push(!b1); // and push the result
-            }
-
-                break;
-            case L1GtLogicParser::OP_OR: {
-                b1 = resultStack.top();
-                resultStack.pop();
-                b2 = resultStack.top();
-                resultStack.pop();
-                resultStack.push(b1 || b2);
-            }
-
-                break;
-            case L1GtLogicParser::OP_AND: {
-                b1 = resultStack.top();
-                resultStack.pop();
-                b2 = resultStack.top();
-                resultStack.pop();
-                resultStack.push(b1 && b2);
-            }
-
-                break;
-            default: {
-                // should not arrive here
-            }
-
-                break;
-        }
+  // reserve memory
+  int rpnVectorSize = m_rpnVector.size();
 
-    }
+  m_algoCombinationVector.reserve(rpnVectorSize);
+  m_operandTokenVector.reserve(rpnVectorSize);
 
-    // get the result in the top of the stack
+  // stack containing temporary results
+  // FIXME we shall find a better solution than static
+  std::stack<bool, std::vector<bool>> resultStack;
+  bool b1, b2;
 
-    m_algoResult = resultStack.top();
+  int opNumber = 0;
 
-    // clear resultStack not needed since it is now a function temporary
+  for (RpnVector::const_iterator it = m_rpnVector.begin();
+       it != m_rpnVector.end(); it++) {
 
-}
+    // LogTrace("L1GlobalTrigger")
+    //<< "\nit->operation = " << it->operation
+    //<< "\nit->operand =   '" << it->operand << "'\n"
+    //<< std::endl;
 
-// print algorithm evaluation
-void L1GtAlgorithmEvaluation::print(std::ostream& myCout) const {
+    switch (it->operation) {
 
-    myCout << std::endl;
+    case L1GtLogicParser::OP_OPERAND: {
 
-    myCout << "    Algorithm result:          " << m_algoResult << std::endl;
+      CItEvalMap itCond =
+          (conditionResultMaps.at(chipNumber)).find(it->operand);
+      if (itCond != (conditionResultMaps[chipNumber]).end()) {
 
-    myCout << "    CombinationVector size:    " << m_algoCombinationVector.size() << std::endl;
+        if (nullptr == itCond->second) {
+          // it should never be happen, only valid conditions are in the maps
+          throw cms::Exception("FailModule")
+              << "\nCondition " << (it->operand)
+              << " NULL pointer found in condition map" << std::endl;
+        }
 
-    int operandTokenVectorSize = m_operandTokenVector.size();
+        //
+        bool condResult = (itCond->second)->condLastResult();
 
-    myCout << "    Operand token vector size: " << operandTokenVectorSize;
+        resultStack.push(condResult);
 
-    if (operandTokenVectorSize == 0) {
-        myCout << "   - not properly initialized! " << std::endl;
-    }
-    else {
-        myCout << std::endl;
+        // only conditions are added to /counted in m_operandTokenVector
+        // opNumber is the index of the condition in the logical expression
+        OperandToken opToken;
+        opToken.tokenName = it->operand;
+        opToken.tokenNumber = opNumber;
+        opToken.tokenResult = condResult;
 
-        for (int i = 0; i < operandTokenVectorSize; ++i) {
+        m_operandTokenVector.push_back(opToken);
+        opNumber++;
 
-            myCout << "      " << std::setw(5) << (m_operandTokenVector[i]).tokenNumber << "\t"
-            << std::setw(25) << (m_operandTokenVector[i]).tokenName << "\t" 
-            << (m_operandTokenVector[i]).tokenResult 
+        //
+        CombinationsInCond const &combInCondition =
+            (itCond->second)->getCombinationsInCond();
+        m_algoCombinationVector.push_back(combInCondition);
+
+      } else {
+
+        // it should never be happen, all conditions are in the maps
+        throw cms::Exception("FailModule")
+            << "\nCondition " << (it->operand) << " not found in condition map"
             << std::endl;
+      }
 
-        }
+    }
 
+    break;
+    case L1GtLogicParser::OP_NOT: {
+      b1 = resultStack.top();
+      resultStack.pop();     // pop the top
+      resultStack.push(!b1); // and push the result
     }
 
-    myCout << std::endl;
+    break;
+    case L1GtLogicParser::OP_OR: {
+      b1 = resultStack.top();
+      resultStack.pop();
+      b2 = resultStack.top();
+      resultStack.pop();
+      resultStack.push(b1 || b2);
+    }
+
+    break;
+    case L1GtLogicParser::OP_AND: {
+      b1 = resultStack.top();
+      resultStack.pop();
+      b2 = resultStack.top();
+      resultStack.pop();
+      resultStack.push(b1 && b2);
+    }
+
+    break;
+    default: {
+      // should not arrive here
+    }
+
+    break;
+    }
+  }
+
+  // get the result in the top of the stack
+
+  m_algoResult = resultStack.top();
+
+  // clear resultStack not needed since it is now a function temporary
 }
 
+// print algorithm evaluation
+void L1GtAlgorithmEvaluation::print(std::ostream &myCout) const {
+
+  myCout << std::endl;
+
+  myCout << "    Algorithm result:          " << m_algoResult << std::endl;
+
+  myCout << "    CombinationVector size:    " << m_algoCombinationVector.size()
+         << std::endl;
+
+  int operandTokenVectorSize = m_operandTokenVector.size();
+
+  myCout << "    Operand token vector size: " << operandTokenVectorSize;
+
+  if (operandTokenVectorSize == 0) {
+    myCout << "   - not properly initialized! " << std::endl;
+  } else {
+    myCout << std::endl;
+
+    for (int i = 0; i < operandTokenVectorSize; ++i) {
+
+      myCout << "      " << std::setw(5)
+             << (m_operandTokenVector[i]).tokenNumber << "\t" << std::setw(25)
+             << (m_operandTokenVector[i]).tokenName << "\t"
+             << (m_operandTokenVector[i]).tokenResult << std::endl;
+    }
+  }
+
+  myCout << std::endl;
+}
diff --git a/L1Trigger/GlobalTrigger/src/L1GtBptxCondition.cc b/L1Trigger/GlobalTrigger/src/L1GtBptxCondition.cc
index b33e3b9899e1c..533679792c652 100644
--- a/L1Trigger/GlobalTrigger/src/L1GtBptxCondition.cc
+++ b/L1Trigger/GlobalTrigger/src/L1GtBptxCondition.cc
@@ -26,83 +26,72 @@
 
 // constructors
 //     default
-L1GtBptxCondition::L1GtBptxCondition() :
-    L1GtConditionEvaluation() {
-
-    m_conditionResult = false;
+L1GtBptxCondition::L1GtBptxCondition() : L1GtConditionEvaluation() {
 
+  m_conditionResult = false;
 }
 
 //     from base template condition (from event setup usually)
-L1GtBptxCondition::L1GtBptxCondition(const L1GtCondition* bptxTemplate,
-        const bool result) :
-            L1GtConditionEvaluation(),
-            m_gtBptxTemplate(static_cast<const L1GtBptxTemplate*>(bptxTemplate)),
-            m_conditionResult(result) {
-
-    // maximum number of objects received for the evaluation of the condition
-    // no object
-    m_condMaxNumberObjects = 0;
-
+L1GtBptxCondition::L1GtBptxCondition(const L1GtCondition *bptxTemplate,
+                                     const bool result)
+    : L1GtConditionEvaluation(),
+      m_gtBptxTemplate(static_cast<const L1GtBptxTemplate *>(bptxTemplate)),
+      m_conditionResult(result) {
+
+  // maximum number of objects received for the evaluation of the condition
+  // no object
+  m_condMaxNumberObjects = 0;
 }
 
 // copy constructor
 void L1GtBptxCondition::copy(const L1GtBptxCondition &cp) {
 
-    m_gtBptxTemplate = cp.gtBptxTemplate();
-    m_conditionResult = cp.conditionResult();
+  m_gtBptxTemplate = cp.gtBptxTemplate();
+  m_conditionResult = cp.conditionResult();
 
-    m_condMaxNumberObjects = cp.condMaxNumberObjects();
-    m_condLastResult = cp.condLastResult();
-    m_combinationsInCond = cp.getCombinationsInCond();
-
-    m_verbosity = cp.m_verbosity;
+  m_condMaxNumberObjects = cp.condMaxNumberObjects();
+  m_condLastResult = cp.condLastResult();
+  m_combinationsInCond = cp.getCombinationsInCond();
 
+  m_verbosity = cp.m_verbosity;
 }
 
-L1GtBptxCondition::L1GtBptxCondition(const L1GtBptxCondition& cp) :
-    L1GtConditionEvaluation() {
-
-    copy(cp);
+L1GtBptxCondition::L1GtBptxCondition(const L1GtBptxCondition &cp)
+    : L1GtConditionEvaluation() {
 
+  copy(cp);
 }
 
 // destructor
 L1GtBptxCondition::~L1GtBptxCondition() {
 
-    // empty
-
+  // empty
 }
 
 // equal operator
-L1GtBptxCondition& L1GtBptxCondition::operator= (const L1GtBptxCondition& cp)
-{
-    copy(cp);
-    return *this;
+L1GtBptxCondition &L1GtBptxCondition::operator=(const L1GtBptxCondition &cp) {
+  copy(cp);
+  return *this;
 }
 
 // methods
 void L1GtBptxCondition::setGtBptxTemplate(
-        const L1GtBptxTemplate* bptxTemplate) {
-
-    m_gtBptxTemplate = bptxTemplate;
+    const L1GtBptxTemplate *bptxTemplate) {
 
+  m_gtBptxTemplate = bptxTemplate;
 }
 
 const bool L1GtBptxCondition::evaluateCondition() const {
 
-    // clear the m_combinationsInCond vector
-    (combinationsInCond()).clear();
-
-    //
-    return m_conditionResult;
+  // clear the m_combinationsInCond vector
+  (combinationsInCond()).clear();
 
+  //
+  return m_conditionResult;
 }
 
-void L1GtBptxCondition::print(std::ostream& myCout) const {
-
-    m_gtBptxTemplate->print(myCout);
-    L1GtConditionEvaluation::print(myCout);
+void L1GtBptxCondition::print(std::ostream &myCout) const {
 
+  m_gtBptxTemplate->print(myCout);
+  L1GtConditionEvaluation::print(myCout);
 }
-
diff --git a/L1Trigger/GlobalTrigger/src/L1GtCaloCondition.cc b/L1Trigger/GlobalTrigger/src/L1GtCaloCondition.cc
index 028541adba80a..e286e499e9bb8 100644
--- a/L1Trigger/GlobalTrigger/src/L1GtCaloCondition.cc
+++ b/L1Trigger/GlobalTrigger/src/L1GtCaloCondition.cc
@@ -16,12 +16,12 @@
 #include "L1Trigger/GlobalTrigger/interface/L1GtCaloCondition.h"
 
 // system include files
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
+#include <algorithm>
 #include <string>
 #include <vector>
-#include <algorithm>
 
 // user include files
 //   base classes
@@ -34,381 +34,366 @@
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctEmCand.h"
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctJetCand.h"
 
-#include "CondFormats/L1TObjects/interface/L1GtStableParameters.h"
 #include "CondFormats/DataRecord/interface/L1GtStableParametersRcd.h"
+#include "CondFormats/L1TObjects/interface/L1GtStableParameters.h"
 
 #include "L1Trigger/GlobalTrigger/interface/L1GlobalTriggerFunctions.h"
 #include "L1Trigger/GlobalTrigger/interface/L1GlobalTriggerPSB.h"
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/MessageLogger/interface/MessageDrop.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 // constructors
 //     default
-L1GtCaloCondition::L1GtCaloCondition() :
-    L1GtConditionEvaluation() {
-
-    m_ifCaloEtaNumberBits = -1;
-    m_corrParDeltaPhiNrBins = 0;
+L1GtCaloCondition::L1GtCaloCondition() : L1GtConditionEvaluation() {
 
+  m_ifCaloEtaNumberBits = -1;
+  m_corrParDeltaPhiNrBins = 0;
 }
 
 //     from base template condition (from event setup usually)
-L1GtCaloCondition::L1GtCaloCondition(const L1GtCondition* caloTemplate, const L1GlobalTriggerPSB* ptrPSB,
-        const int nrL1NoIsoEG,
-        const int nrL1IsoEG,
-        const int nrL1CenJet,
-        const int nrL1ForJet,
-        const int nrL1TauJet,
-        const int ifCaloEtaNumberBits) :
-    L1GtConditionEvaluation(),
-    m_gtCaloTemplate(static_cast<const L1GtCaloTemplate*>(caloTemplate)),
-    m_gtPSB(ptrPSB),
-    m_ifCaloEtaNumberBits(ifCaloEtaNumberBits)
-{
-
-    m_corrParDeltaPhiNrBins = 0;
-
-    // maximum number of objects received for the evaluation of the condition
-    // retrieved before from event setup
-    // for a CondCalo, all objects ar of same type, hence it is enough to get the
-    // type for the first object
-
-    switch ((m_gtCaloTemplate->objectType())[0]) {
-        case NoIsoEG:
-            m_condMaxNumberObjects = nrL1NoIsoEG;
-            break;
-        case IsoEG:
-            m_condMaxNumberObjects = nrL1IsoEG;
-            break;
-        case CenJet:
-            m_condMaxNumberObjects = nrL1CenJet;
-            break;
-        case ForJet:
-            m_condMaxNumberObjects = nrL1ForJet;
-            break;
-        case TauJet:
-            m_condMaxNumberObjects = nrL1TauJet;
-            break;
-        default:
-            m_condMaxNumberObjects = 0;
-            break;
-    }
-
+L1GtCaloCondition::L1GtCaloCondition(const L1GtCondition *caloTemplate,
+                                     const L1GlobalTriggerPSB *ptrPSB,
+                                     const int nrL1NoIsoEG, const int nrL1IsoEG,
+                                     const int nrL1CenJet, const int nrL1ForJet,
+                                     const int nrL1TauJet,
+                                     const int ifCaloEtaNumberBits)
+    : L1GtConditionEvaluation(),
+      m_gtCaloTemplate(static_cast<const L1GtCaloTemplate *>(caloTemplate)),
+      m_gtPSB(ptrPSB), m_ifCaloEtaNumberBits(ifCaloEtaNumberBits) {
+
+  m_corrParDeltaPhiNrBins = 0;
+
+  // maximum number of objects received for the evaluation of the condition
+  // retrieved before from event setup
+  // for a CondCalo, all objects ar of same type, hence it is enough to get the
+  // type for the first object
+
+  switch ((m_gtCaloTemplate->objectType())[0]) {
+  case NoIsoEG:
+    m_condMaxNumberObjects = nrL1NoIsoEG;
+    break;
+  case IsoEG:
+    m_condMaxNumberObjects = nrL1IsoEG;
+    break;
+  case CenJet:
+    m_condMaxNumberObjects = nrL1CenJet;
+    break;
+  case ForJet:
+    m_condMaxNumberObjects = nrL1ForJet;
+    break;
+  case TauJet:
+    m_condMaxNumberObjects = nrL1TauJet;
+    break;
+  default:
+    m_condMaxNumberObjects = 0;
+    break;
+  }
 }
 
 // copy constructor
-void L1GtCaloCondition::copy(const L1GtCaloCondition& cp) {
-
-    m_gtCaloTemplate = cp.gtCaloTemplate();
-    m_gtPSB = cp.gtPSB();
+void L1GtCaloCondition::copy(const L1GtCaloCondition &cp) {
 
-    m_ifCaloEtaNumberBits = cp.gtIfCaloEtaNumberBits();
-    m_corrParDeltaPhiNrBins = cp.m_corrParDeltaPhiNrBins;
+  m_gtCaloTemplate = cp.gtCaloTemplate();
+  m_gtPSB = cp.gtPSB();
 
-    m_condMaxNumberObjects = cp.condMaxNumberObjects();
-    m_condLastResult = cp.condLastResult();
-    m_combinationsInCond = cp.getCombinationsInCond();
+  m_ifCaloEtaNumberBits = cp.gtIfCaloEtaNumberBits();
+  m_corrParDeltaPhiNrBins = cp.m_corrParDeltaPhiNrBins;
 
-    m_verbosity = cp.m_verbosity;
+  m_condMaxNumberObjects = cp.condMaxNumberObjects();
+  m_condLastResult = cp.condLastResult();
+  m_combinationsInCond = cp.getCombinationsInCond();
 
+  m_verbosity = cp.m_verbosity;
 }
 
-L1GtCaloCondition::L1GtCaloCondition(const L1GtCaloCondition& cp) :
-    L1GtConditionEvaluation() {
-
-    copy(cp);
+L1GtCaloCondition::L1GtCaloCondition(const L1GtCaloCondition &cp)
+    : L1GtConditionEvaluation() {
 
+  copy(cp);
 }
 
 // destructor
 L1GtCaloCondition::~L1GtCaloCondition() {
 
-    // empty
-
+  // empty
 }
 
 // equal operator
-L1GtCaloCondition& L1GtCaloCondition::operator=(const L1GtCaloCondition& cp) {
-    copy(cp);
-    return *this;
+L1GtCaloCondition &L1GtCaloCondition::operator=(const L1GtCaloCondition &cp) {
+  copy(cp);
+  return *this;
 }
 
 // methods
-void L1GtCaloCondition::setGtCaloTemplate(const L1GtCaloTemplate* caloTempl) {
-
-    m_gtCaloTemplate = caloTempl;
+void L1GtCaloCondition::setGtCaloTemplate(const L1GtCaloTemplate *caloTempl) {
 
+  m_gtCaloTemplate = caloTempl;
 }
 
 ///   set the pointer to PSB
-void L1GtCaloCondition::setGtPSB(const L1GlobalTriggerPSB* ptrPSB) {
-
-    m_gtPSB = ptrPSB;
+void L1GtCaloCondition::setGtPSB(const L1GlobalTriggerPSB *ptrPSB) {
 
+  m_gtPSB = ptrPSB;
 }
 
 //   set the number of bits for eta of calorimeter objects
-void L1GtCaloCondition::setGtIfCaloEtaNumberBits(const int& ifCaloEtaNumberBitsValue) {
-
-    m_ifCaloEtaNumberBits = ifCaloEtaNumberBitsValue;
+void L1GtCaloCondition::setGtIfCaloEtaNumberBits(
+    const int &ifCaloEtaNumberBitsValue) {
 
+  m_ifCaloEtaNumberBits = ifCaloEtaNumberBitsValue;
 }
 
 //   set the maximum number of bins for the delta phi scales
 void L1GtCaloCondition::setGtCorrParDeltaPhiNrBins(
-        const int& corrParDeltaPhiNrBins) {
-
-    m_corrParDeltaPhiNrBins = corrParDeltaPhiNrBins;
+    const int &corrParDeltaPhiNrBins) {
 
+  m_corrParDeltaPhiNrBins = corrParDeltaPhiNrBins;
 }
 
 // try all object permutations and check spatial correlations, if required
 const bool L1GtCaloCondition::evaluateCondition() const {
 
-    // number of trigger objects in the condition
-    int nObjInCond = m_gtCaloTemplate->nrObjects();
-    //LogTrace("L1GlobalTrigger") << "  nObjInCond: " << nObjInCond
-    //    << std::endl;
-
-    // the candidates
-
-    // objectType() gives the type for nrObjects() only,
-    // but in a CondCalo all objects have the same type
-    // take type from the type of the first object
-
-    const std::vector<const L1GctCand*>* candVec;
-
-    switch ((m_gtCaloTemplate->objectType())[0]) {
-        case NoIsoEG:
-            candVec = m_gtPSB->getCandL1NoIsoEG();
-            break;
-        case IsoEG:
-            candVec = m_gtPSB->getCandL1IsoEG();
-            break;
-        case CenJet:
-            candVec = m_gtPSB->getCandL1CenJet();
-            break;
-        case ForJet:
-            candVec = m_gtPSB->getCandL1ForJet();
-            break;
-        case TauJet:
-            candVec = m_gtPSB->getCandL1TauJet();
-            break;
-        default:
-            return false;
-            break;
-    }
-
-    int numberObjects = candVec->size();
-    //LogTrace("L1GlobalTrigger") << "  numberObjects: " << numberObjects
-    //    << std::endl;
-    if (numberObjects < nObjInCond) {
-        return false;
+  // number of trigger objects in the condition
+  int nObjInCond = m_gtCaloTemplate->nrObjects();
+  // LogTrace("L1GlobalTrigger") << "  nObjInCond: " << nObjInCond
+  //    << std::endl;
+
+  // the candidates
+
+  // objectType() gives the type for nrObjects() only,
+  // but in a CondCalo all objects have the same type
+  // take type from the type of the first object
+
+  const std::vector<const L1GctCand *> *candVec;
+
+  switch ((m_gtCaloTemplate->objectType())[0]) {
+  case NoIsoEG:
+    candVec = m_gtPSB->getCandL1NoIsoEG();
+    break;
+  case IsoEG:
+    candVec = m_gtPSB->getCandL1IsoEG();
+    break;
+  case CenJet:
+    candVec = m_gtPSB->getCandL1CenJet();
+    break;
+  case ForJet:
+    candVec = m_gtPSB->getCandL1ForJet();
+    break;
+  case TauJet:
+    candVec = m_gtPSB->getCandL1TauJet();
+    break;
+  default:
+    return false;
+    break;
+  }
+
+  int numberObjects = candVec->size();
+  // LogTrace("L1GlobalTrigger") << "  numberObjects: " << numberObjects
+  //    << std::endl;
+  if (numberObjects < nObjInCond) {
+    return false;
+  }
+
+  std::vector<int> index(numberObjects);
+
+  for (int i = 0; i < numberObjects; ++i) {
+    index[i] = i;
+  }
+
+  int jumpIndex = 1;
+  int jump = factorial(numberObjects - nObjInCond);
+
+  int totalLoops = 0;
+  int passLoops = 0;
+
+  // condition result condResult set to true if at least one permutation
+  //     passes all requirements
+  // all possible permutations are checked
+  bool condResult = false;
+
+  // store the indices of the calorimeter objects
+  // from the combination evaluated in the condition
+  SingleCombInCond objectsInComb;
+  objectsInComb.reserve(nObjInCond);
+
+  // clear the m_combinationsInCond vector
+  combinationsInCond().clear();
+
+  do {
+
+    if (--jumpIndex)
+      continue;
+
+    jumpIndex = jump;
+    totalLoops++;
+
+    // clear the indices in the combination
+    objectsInComb.clear();
+
+    bool tmpResult = true;
+
+    // check if there is a permutation that matches object-parameter
+    // requirements
+    for (int i = 0; i < nObjInCond; i++) {
+
+      tmpResult &= checkObjectParameter(i, *(*candVec)[index[i]]);
+      objectsInComb.push_back(index[i]);
     }
 
-    std::vector<int> index(numberObjects);
+    // if permutation does not match particle conditions
+    // skip spatial correlations
+    if (!tmpResult) {
 
-    for (int i = 0; i < numberObjects; ++i) {
-        index[i] = i;
+      continue;
     }
 
-    int jumpIndex = 1;
-    int jump = factorial(numberObjects - nObjInCond);
-
-    int totalLoops = 0;
-    int passLoops = 0;
+    if (m_gtCaloTemplate->wsc()) {
 
-    // condition result condResult set to true if at least one permutation
-    //     passes all requirements
-    // all possible permutations are checked
-    bool condResult = false;
+      // wsc requirements have always nObjInCond = 2
+      // one can use directly index[0] and index[1] to compute
+      // eta and phi differences
+      const int ObjInWscComb = 2;
+      if (nObjInCond != ObjInWscComb) {
 
-    // store the indices of the calorimeter objects
-    // from the combination evaluated in the condition
-    SingleCombInCond objectsInComb;
-    objectsInComb.reserve(nObjInCond);
-
-    // clear the m_combinationsInCond vector
-    combinationsInCond().clear();
+        if (m_verbosity) {
+          edm::LogError("L1GlobalTrigger")
+              << "\n  Error: "
+              << "number of particles in condition with spatial correlation = "
+              << nObjInCond << "\n  it must be = " << ObjInWscComb << std::endl;
+        }
 
-    do {
+        continue;
+      }
 
-        if (--jumpIndex)
-            continue;
+      L1GtCaloTemplate::CorrelationParameter corrPar =
+          *(m_gtCaloTemplate->correlationParameter());
 
-        jumpIndex = jump;
-        totalLoops++;
+      unsigned int candDeltaEta;
+      unsigned int candDeltaPhi;
 
-        // clear the indices in the combination
-        objectsInComb.clear();
+      // check candDeltaEta
 
-        bool tmpResult = true;
+      // get eta index and the sign bit of the eta index (MSB is the sign)
+      //   signedEta[i] is the signed eta index of candVec[index[i]]
+      int signedEta[ObjInWscComb];
+      int signBit[ObjInWscComb] = {0, 0};
 
-        // check if there is a permutation that matches object-parameter requirements
-        for (int i = 0; i < nObjInCond; i++) {
+      int scaleEta = 1 << (m_ifCaloEtaNumberBits - 1);
 
-            tmpResult &= checkObjectParameter(i, *(*candVec)[index[i]]);
-            objectsInComb.push_back(index[i]);
+      for (int i = 0; i < ObjInWscComb; ++i) {
+        signBit[i] = ((*candVec)[index[i]]->etaIndex() & scaleEta) >>
+                     (m_ifCaloEtaNumberBits - 1);
+        signedEta[i] = ((*candVec)[index[i]]->etaIndex()) % scaleEta;
 
+        if (signBit[i] == 1) {
+          signedEta[i] = (-1) * signedEta[i];
         }
-
-        // if permutation does not match particle conditions
-        // skip spatial correlations
-        if (!tmpResult) {
-
-            continue;
-
+      }
+
+      // compute candDeltaEta - add 1 if signs are different (due to +0/-0
+      // indices)
+      candDeltaEta = static_cast<int>(std::abs(signedEta[1] - signedEta[0])) +
+                     static_cast<int>(signBit[1] ^ signBit[0]);
+
+      if (!checkBit(corrPar.deltaEtaRange, candDeltaEta)) {
+        continue;
+      }
+
+      // check candDeltaPhi
+
+      // calculate absolute value of candDeltaPhi
+      if ((*candVec)[index[0]]->phiIndex() > (*candVec)[index[1]]->phiIndex()) {
+        candDeltaPhi =
+            (*candVec)[index[0]]->phiIndex() - (*candVec)[index[1]]->phiIndex();
+      } else {
+        candDeltaPhi =
+            (*candVec)[index[1]]->phiIndex() - (*candVec)[index[0]]->phiIndex();
+      }
+
+      // check if candDeltaPhi > 180 (via delta_phi_maxbits)
+      // delta_phi contains bits for 0..180 (0 and 180 included)
+      // protect also against infinite loop...
+
+      int nMaxLoop = 10;
+      int iLoop = 0;
+
+      while (candDeltaPhi >= m_corrParDeltaPhiNrBins) {
+
+        unsigned int candDeltaPhiInitial = candDeltaPhi;
+
+        // candDeltaPhi > 180 ==> take 360 - candDeltaPhi
+        candDeltaPhi = (m_corrParDeltaPhiNrBins - 1) * 2 - candDeltaPhi;
+        if (m_verbosity) {
+          LogTrace("L1GlobalTrigger")
+              << "    Initial candDeltaPhi = " << candDeltaPhiInitial
+              << " > m_corrParDeltaPhiNrBins = " << m_corrParDeltaPhiNrBins
+              << "  ==> candDeltaPhi rescaled to: " << candDeltaPhi
+              << " [ loop index " << iLoop << "; breaks after " << nMaxLoop
+              << " loops ]\n"
+              << std::endl;
         }
 
-        if (m_gtCaloTemplate->wsc()) {
-
-            // wsc requirements have always nObjInCond = 2
-            // one can use directly index[0] and index[1] to compute
-            // eta and phi differences
-            const int ObjInWscComb = 2;
-            if (nObjInCond != ObjInWscComb) {
-
-                if (m_verbosity) {
-                    edm::LogError("L1GlobalTrigger")
-                        << "\n  Error: "
-                        << "number of particles in condition with spatial correlation = "
-                        << nObjInCond << "\n  it must be = " << ObjInWscComb
-                        << std::endl;
-                }
-
-                continue;
-            }
-
-            L1GtCaloTemplate::CorrelationParameter corrPar =
-                *(m_gtCaloTemplate->correlationParameter());
-
-            unsigned int candDeltaEta;
-            unsigned int candDeltaPhi;
-
-            // check candDeltaEta
-
-            // get eta index and the sign bit of the eta index (MSB is the sign)
-            //   signedEta[i] is the signed eta index of candVec[index[i]]
-            int signedEta[ObjInWscComb];
-            int signBit[ObjInWscComb] = { 0, 0 };
-
-            int scaleEta = 1 << (m_ifCaloEtaNumberBits - 1);
-
-            for (int i = 0; i < ObjInWscComb; ++i) {
-                signBit[i] = ((*candVec)[index[i]]->etaIndex() & scaleEta)
-                    >>(m_ifCaloEtaNumberBits - 1);
-                signedEta[i] = ((*candVec)[index[i]]->etaIndex() )%scaleEta;
-
-                if (signBit[i] == 1) {
-                    signedEta[i] = (-1)*signedEta[i];
-                }
-
-            }
-
-            // compute candDeltaEta - add 1 if signs are different (due to +0/-0 indices)
-            candDeltaEta = static_cast<int> (std::abs(signedEta[1] - signedEta[0]))
-                + static_cast<int> (signBit[1]^signBit[0]);
-
-            if ( !checkBit(corrPar.deltaEtaRange, candDeltaEta) ) {
-                continue;
-            }
-
-            // check candDeltaPhi
-
-            // calculate absolute value of candDeltaPhi
-            if ((*candVec)[index[0]]->phiIndex()> (*candVec)[index[1]]->phiIndex()) {
-                candDeltaPhi = (*candVec)[index[0]]->phiIndex() - (*candVec)[index[1]]->phiIndex();
-            }
-            else {
-                candDeltaPhi = (*candVec)[index[1]]->phiIndex() - (*candVec)[index[0]]->phiIndex();
-            }
-
-            // check if candDeltaPhi > 180 (via delta_phi_maxbits)
-            // delta_phi contains bits for 0..180 (0 and 180 included)
-            // protect also against infinite loop...
-
-            int nMaxLoop = 10;
-            int iLoop = 0;
-
-            while (candDeltaPhi >= m_corrParDeltaPhiNrBins) {
-
-                unsigned int candDeltaPhiInitial = candDeltaPhi;
-
-                // candDeltaPhi > 180 ==> take 360 - candDeltaPhi
-                candDeltaPhi = (m_corrParDeltaPhiNrBins - 1) * 2 - candDeltaPhi;
-                if (m_verbosity) {
-                    LogTrace("L1GlobalTrigger")
-                            << "    Initial candDeltaPhi = "
-                            << candDeltaPhiInitial
-                            << " > m_corrParDeltaPhiNrBins = "
-                            << m_corrParDeltaPhiNrBins
-                            << "  ==> candDeltaPhi rescaled to: "
-                            << candDeltaPhi << " [ loop index " << iLoop
-                            << "; breaks after " << nMaxLoop << " loops ]\n"
-                            << std::endl;
-                }
-
-                iLoop++;
-                if (iLoop > nMaxLoop) {
-                    return false;
-                }
-            }
-
-
-            if (!checkBit(corrPar.deltaPhiRange, candDeltaPhi)) {
-                continue;
-            }
+        iLoop++;
+        if (iLoop > nMaxLoop) {
+          return false;
+        }
+      }
 
-        } // end wsc check
+      if (!checkBit(corrPar.deltaPhiRange, candDeltaPhi)) {
+        continue;
+      }
 
-        // if we get here all checks were successful for this combination
-        // set the general result for evaluateCondition to "true"
+    } // end wsc check
 
-        condResult = true;
-        passLoops++;
-        combinationsInCond().push_back(objectsInComb);
+    // if we get here all checks were successful for this combination
+    // set the general result for evaluateCondition to "true"
 
-        //    } while ( std::next_permutation(index, index + nObj) );
-    } while (std::next_permutation(index.begin(), index.end()) );
+    condResult = true;
+    passLoops++;
+    combinationsInCond().push_back(objectsInComb);
 
-    //LogTrace("L1GlobalTrigger")
-    //    << "\n  L1GtCaloCondition: total number of permutations found:          " << totalLoops
-    //    << "\n  L1GtCaloCondition: number of permutations passing requirements: " << passLoops
-    //    << "\n" << std::endl;
+    //    } while ( std::next_permutation(index, index + nObj) );
+  } while (std::next_permutation(index.begin(), index.end()));
 
-    return condResult;
+  // LogTrace("L1GlobalTrigger")
+  //    << "\n  L1GtCaloCondition: total number of permutations found: " <<
+  //    totalLoops
+  //    << "\n  L1GtCaloCondition: number of permutations passing requirements:
+  //    " << passLoops
+  //    << "\n" << std::endl;
 
+  return condResult;
 }
 
 // load calo candidates
-const L1GctCand* L1GtCaloCondition::getCandidate(const int indexCand) const {
-
-    // objectType() gives the type for nrObjects() only,
-    // but in a CondCalo all objects have the same type
-    // take type from the type of the first object
-    switch ((m_gtCaloTemplate->objectType())[0]) {
-        case NoIsoEG:
-            return (*(m_gtPSB->getCandL1NoIsoEG()))[indexCand];
-            break;
-        case IsoEG:
-            return (*(m_gtPSB->getCandL1IsoEG()))[indexCand];
-            break;
-        case CenJet:
-            return (*(m_gtPSB->getCandL1CenJet()))[indexCand];
-            break;
-        case ForJet:
-            return (*(m_gtPSB->getCandL1ForJet()))[indexCand];
-            break;
-        case TauJet:
-            return (*(m_gtPSB->getCandL1TauJet()))[indexCand];
-            break;
-        default:
-            return nullptr;
-            break;
-    }
-
+const L1GctCand *L1GtCaloCondition::getCandidate(const int indexCand) const {
+
+  // objectType() gives the type for nrObjects() only,
+  // but in a CondCalo all objects have the same type
+  // take type from the type of the first object
+  switch ((m_gtCaloTemplate->objectType())[0]) {
+  case NoIsoEG:
+    return (*(m_gtPSB->getCandL1NoIsoEG()))[indexCand];
+    break;
+  case IsoEG:
+    return (*(m_gtPSB->getCandL1IsoEG()))[indexCand];
+    break;
+  case CenJet:
+    return (*(m_gtPSB->getCandL1CenJet()))[indexCand];
+    break;
+  case ForJet:
+    return (*(m_gtPSB->getCandL1ForJet()))[indexCand];
+    break;
+  case TauJet:
+    return (*(m_gtPSB->getCandL1TauJet()))[indexCand];
+    break;
+  default:
     return nullptr;
+    break;
+  }
+
+  return nullptr;
 }
 
 /**
@@ -420,56 +405,59 @@ const L1GctCand* L1GtCaloCondition::getCandidate(const int indexCand) const {
  * @return The result of the comparison (false if a condition does not exist).
  */
 
-const bool L1GtCaloCondition::checkObjectParameter(const int iCondition, const L1GctCand& cand) const {
+const bool
+L1GtCaloCondition::checkObjectParameter(const int iCondition,
+                                        const L1GctCand &cand) const {
 
-    // number of objects in condition
-    int nObjInCond = m_gtCaloTemplate->nrObjects();
+  // number of objects in condition
+  int nObjInCond = m_gtCaloTemplate->nrObjects();
 
-    if (iCondition >= nObjInCond || iCondition < 0) {
-        return false;
-    }
+  if (iCondition >= nObjInCond || iCondition < 0) {
+    return false;
+  }
 
-    // empty candidates can not be compared
-    if (cand.empty()) {
-        return false;
-    }
+  // empty candidates can not be compared
+  if (cand.empty()) {
+    return false;
+  }
 
-    const L1GtCaloTemplate::ObjectParameter objPar = ( *(m_gtCaloTemplate->objectParameter()) )[iCondition];
+  const L1GtCaloTemplate::ObjectParameter objPar =
+      (*(m_gtCaloTemplate->objectParameter()))[iCondition];
 
-    // check energy threshold
-    if ( !checkThreshold(objPar.etThreshold, cand.rank(), m_gtCaloTemplate->condGEq()) ) {
-        return false;
-    }
+  // check energy threshold
+  if (!checkThreshold(objPar.etThreshold, cand.rank(),
+                      m_gtCaloTemplate->condGEq())) {
+    return false;
+  }
 
-    // check eta
-    if (!checkBit(objPar.etaRange, cand.etaIndex())) {
-        return false;
-    }
+  // check eta
+  if (!checkBit(objPar.etaRange, cand.etaIndex())) {
+    return false;
+  }
 
-    // check phi
+  // check phi
 
-    if (!checkBit(objPar.phiRange, cand.phiIndex())) {
-        return false;
-    }
+  if (!checkBit(objPar.phiRange, cand.phiIndex())) {
+    return false;
+  }
 
-    // particle matches if we get here
-    //LogTrace("L1GlobalTrigger")
-    //    << "  checkObjectParameter: calorimeter object OK, passes all requirements\n"
-    //    << std::endl;
+  // particle matches if we get here
+  // LogTrace("L1GlobalTrigger")
+  //    << "  checkObjectParameter: calorimeter object OK, passes all
+  //    requirements\n"
+  //    << std::endl;
 
-    return true;
+  return true;
 }
 
-void L1GtCaloCondition::print(std::ostream& myCout) const {
-
-    m_gtCaloTemplate->print(myCout);
+void L1GtCaloCondition::print(std::ostream &myCout) const {
 
-    myCout << "    Number of bits for eta of calorimeter objects = "
-            << m_ifCaloEtaNumberBits << std::endl;
-    myCout << "    Maximum number of bins for the delta phi scales = "
-            << m_corrParDeltaPhiNrBins << "\n " << std::endl;
+  m_gtCaloTemplate->print(myCout);
 
-    L1GtConditionEvaluation::print(myCout);
+  myCout << "    Number of bits for eta of calorimeter objects = "
+         << m_ifCaloEtaNumberBits << std::endl;
+  myCout << "    Maximum number of bins for the delta phi scales = "
+         << m_corrParDeltaPhiNrBins << "\n " << std::endl;
 
+  L1GtConditionEvaluation::print(myCout);
 }
-
diff --git a/L1Trigger/GlobalTrigger/src/L1GtCastorCondition.cc b/L1Trigger/GlobalTrigger/src/L1GtCastorCondition.cc
index 9aef4236832d9..0631802ea20c4 100644
--- a/L1Trigger/GlobalTrigger/src/L1GtCastorCondition.cc
+++ b/L1Trigger/GlobalTrigger/src/L1GtCastorCondition.cc
@@ -5,8 +5,8 @@
  * Description: evaluation of a CondCastor condition.
  *
  * Implementation:
- *    Simply put the result read from CASTOR L1 record in the L1GtConditionEvaluation
- *    base class, to be similar with other conditions.
+ *    Simply put the result read from CASTOR L1 record in the
+ * L1GtConditionEvaluation base class, to be similar with other conditions.
  *
  * \author: Vasile Mihai Ghete   - HEPHY Vienna
  *
@@ -26,83 +26,74 @@
 
 // constructors
 //     default
-L1GtCastorCondition::L1GtCastorCondition() :
-    L1GtConditionEvaluation() {
-
-    m_conditionResult = false;
+L1GtCastorCondition::L1GtCastorCondition() : L1GtConditionEvaluation() {
 
+  m_conditionResult = false;
 }
 
 //     from base template condition (from event setup usually)
-L1GtCastorCondition::L1GtCastorCondition(const L1GtCondition* castorTemplate,
-        const bool result) :
-            L1GtConditionEvaluation(),
-            m_gtCastorTemplate(static_cast<const L1GtCastorTemplate*>(castorTemplate)),
-            m_conditionResult(result) {
-
-    // maximum number of objects received for the evaluation of the condition
-    // no object
-    m_condMaxNumberObjects = 0;
-
+L1GtCastorCondition::L1GtCastorCondition(const L1GtCondition *castorTemplate,
+                                         const bool result)
+    : L1GtConditionEvaluation(),
+      m_gtCastorTemplate(
+          static_cast<const L1GtCastorTemplate *>(castorTemplate)),
+      m_conditionResult(result) {
+
+  // maximum number of objects received for the evaluation of the condition
+  // no object
+  m_condMaxNumberObjects = 0;
 }
 
 // copy constructor
 void L1GtCastorCondition::copy(const L1GtCastorCondition &cp) {
 
-    m_gtCastorTemplate = cp.gtCastorTemplate();
-    m_conditionResult = cp.conditionResult();
+  m_gtCastorTemplate = cp.gtCastorTemplate();
+  m_conditionResult = cp.conditionResult();
 
-    m_condMaxNumberObjects = cp.condMaxNumberObjects();
-    m_condLastResult = cp.condLastResult();
-    m_combinationsInCond = cp.getCombinationsInCond();
-
-    m_verbosity = cp.m_verbosity;
+  m_condMaxNumberObjects = cp.condMaxNumberObjects();
+  m_condLastResult = cp.condLastResult();
+  m_combinationsInCond = cp.getCombinationsInCond();
 
+  m_verbosity = cp.m_verbosity;
 }
 
-L1GtCastorCondition::L1GtCastorCondition(const L1GtCastorCondition& cp) :
-    L1GtConditionEvaluation() {
-
-    copy(cp);
+L1GtCastorCondition::L1GtCastorCondition(const L1GtCastorCondition &cp)
+    : L1GtConditionEvaluation() {
 
+  copy(cp);
 }
 
 // destructor
 L1GtCastorCondition::~L1GtCastorCondition() {
 
-    // empty
-
+  // empty
 }
 
 // equal operator
-L1GtCastorCondition& L1GtCastorCondition::operator= (const L1GtCastorCondition& cp)
-{
-    copy(cp);
-    return *this;
+L1GtCastorCondition &L1GtCastorCondition::
+operator=(const L1GtCastorCondition &cp) {
+  copy(cp);
+  return *this;
 }
 
 // methods
 void L1GtCastorCondition::setGtCastorTemplate(
-        const L1GtCastorTemplate* castorTemplate) {
-
-    m_gtCastorTemplate = castorTemplate;
+    const L1GtCastorTemplate *castorTemplate) {
 
+  m_gtCastorTemplate = castorTemplate;
 }
 
 const bool L1GtCastorCondition::evaluateCondition() const {
 
-    // clear the m_combinationsInCond vector
-    (combinationsInCond()).clear();
-
-    //
-    return m_conditionResult;
+  // clear the m_combinationsInCond vector
+  (combinationsInCond()).clear();
 
+  //
+  return m_conditionResult;
 }
 
-void L1GtCastorCondition::print(std::ostream& myCout) const {
-
-    m_gtCastorTemplate->print(myCout);
-    L1GtConditionEvaluation::print(myCout);
+void L1GtCastorCondition::print(std::ostream &myCout) const {
 
+  m_gtCastorTemplate->print(myCout);
+  L1GtConditionEvaluation::print(myCout);
 }
-
diff --git a/L1Trigger/GlobalTrigger/src/L1GtConditionEvaluation.cc b/L1Trigger/GlobalTrigger/src/L1GtConditionEvaluation.cc
index 179b221d67fbd..1d45ff0d0d999 100644
--- a/L1Trigger/GlobalTrigger/src/L1GtConditionEvaluation.cc
+++ b/L1Trigger/GlobalTrigger/src/L1GtConditionEvaluation.cc
@@ -2,7 +2,8 @@
  * \class L1GtConditionEvaluation
  *
  *
- * Description: Base class for evaluation of the L1 Global Trigger object templates.
+ * Description: Base class for evaluation of the L1 Global Trigger object
+ * templates.
  *
  * Implementation:
  *    <TODO: enter implementation details>
@@ -16,8 +17,8 @@
 #include "L1Trigger/GlobalTrigger/interface/L1GtConditionEvaluation.h"
 
 // system include files
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 #include <iterator>
 
 // user include files
@@ -27,36 +28,33 @@
 //
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerObjectMapFwd.h"
 
-
-
-
 // methods
 
 /// print condition
-void L1GtConditionEvaluation::print(std::ostream& myCout) const {
-
-    myCout << "\n  L1GtConditionEvaluation print...\n" << std::endl;
-    myCout << "  Maximum number of objects in condition: " << m_condMaxNumberObjects << std::endl;
-    myCout << "  Condition result:                       " << m_condLastResult << std::endl;
+void L1GtConditionEvaluation::print(std::ostream &myCout) const {
 
-    CombinationsInCond::const_iterator itVV;
-    std::ostringstream myCout1;
+  myCout << "\n  L1GtConditionEvaluation print...\n" << std::endl;
+  myCout << "  Maximum number of objects in condition: "
+         << m_condMaxNumberObjects << std::endl;
+  myCout << "  Condition result:                       " << m_condLastResult
+         << std::endl;
 
-    for (itVV = (m_combinationsInCond).begin(); itVV != (m_combinationsInCond).end(); itVV++) {
+  CombinationsInCond::const_iterator itVV;
+  std::ostringstream myCout1;
 
-        myCout1 << "( ";
+  for (itVV = (m_combinationsInCond).begin();
+       itVV != (m_combinationsInCond).end(); itVV++) {
 
-        std::copy((*itVV).begin(), (*itVV).end(), std::ostream_iterator<int> (myCout1, " "));
+    myCout1 << "( ";
 
-        myCout1 << "); ";
+    std::copy((*itVV).begin(), (*itVV).end(),
+              std::ostream_iterator<int>(myCout1, " "));
 
-    }
-
-    myCout
-    << "\n  List of combinations passing all requirements for this condition: \n  "
-    << myCout1.str()
-    << " \n"
-    << std::endl;
+    myCout1 << "); ";
+  }
 
+  myCout << "\n  List of combinations passing all requirements for this "
+            "condition: \n  "
+         << myCout1.str() << " \n"
+         << std::endl;
 }
-
diff --git a/L1Trigger/GlobalTrigger/src/L1GtCorrelationCondition.cc b/L1Trigger/GlobalTrigger/src/L1GtCorrelationCondition.cc
index 06a2d7e2fc531..c66741da3299e 100644
--- a/L1Trigger/GlobalTrigger/src/L1GtCorrelationCondition.cc
+++ b/L1Trigger/GlobalTrigger/src/L1GtCorrelationCondition.cc
@@ -16,33 +16,33 @@
 #include "L1Trigger/GlobalTrigger/interface/L1GtCorrelationCondition.h"
 
 // system include files
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
+#include <algorithm>
 #include <string>
 #include <vector>
-#include <algorithm>
 
 // user include files
 //   base classes
 #include "CondFormats/L1TObjects/interface/L1GtCorrelationTemplate.h"
 
-#include "CondFormats/L1TObjects/interface/L1GtMuonTemplate.h"
 #include "CondFormats/L1TObjects/interface/L1GtCaloTemplate.h"
 #include "CondFormats/L1TObjects/interface/L1GtEnergySumTemplate.h"
+#include "CondFormats/L1TObjects/interface/L1GtMuonTemplate.h"
 
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTCand.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 
-#include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTCand.h"
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctCand.h"
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctEmCand.h"
-#include "DataFormats/L1GlobalCaloTrigger/interface/L1GctJetCand.h"
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctEtSums.h"
+#include "DataFormats/L1GlobalCaloTrigger/interface/L1GctJetCand.h"
+#include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTCand.h"
 
-#include "L1Trigger/GlobalTrigger/interface/L1GtMuonCondition.h"
 #include "L1Trigger/GlobalTrigger/interface/L1GtCaloCondition.h"
 #include "L1Trigger/GlobalTrigger/interface/L1GtEnergySumCondition.h"
+#include "L1Trigger/GlobalTrigger/interface/L1GtMuonCondition.h"
 
 #include "L1Trigger/GlobalTrigger/interface/L1GtEtaPhiConversions.h"
 
@@ -50,818 +50,777 @@
 #include "L1Trigger/GlobalTrigger/interface/L1GlobalTriggerGTL.h"
 #include "L1Trigger/GlobalTrigger/interface/L1GlobalTriggerPSB.h"
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/MessageLogger/interface/MessageDrop.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 // constructors
 //     default
-L1GtCorrelationCondition::L1GtCorrelationCondition() :
-    L1GtConditionEvaluation(),
-    m_isDebugEnabled(edm::isDebugEnabled())
-{
-
-    // empty
+L1GtCorrelationCondition::L1GtCorrelationCondition()
+    : L1GtConditionEvaluation(), m_isDebugEnabled(edm::isDebugEnabled()) {
 
+  // empty
 }
 
 //     from base template condition (from event setup usually)
 L1GtCorrelationCondition::L1GtCorrelationCondition(
-        const L1GtCondition* corrTemplate, const L1GtCondition* cond0Condition,
-        const L1GtCondition* cond1Condition, const int cond0NrL1Objects,
-        const int cond1NrL1Objects, const int cond0EtaBits,
-        const int cond1EtaBits, const L1GlobalTriggerGTL* ptrGTL,
-        const L1GlobalTriggerPSB* ptrPSB,
-        const L1GtEtaPhiConversions* etaPhiConversions) :
-            L1GtConditionEvaluation(),
-            m_gtCorrelationTemplate(static_cast<const L1GtCorrelationTemplate*>(corrTemplate)),
-            m_gtCond0(cond0Condition), m_gtCond1(cond1Condition),
-            m_cond0NrL1Objects(cond0NrL1Objects),
-            m_cond1NrL1Objects(cond1NrL1Objects), m_cond0EtaBits(cond0EtaBits),
-            m_cond1EtaBits(cond1EtaBits), m_gtGTL(ptrGTL), m_gtPSB(ptrPSB),
-            m_gtEtaPhiConversions(etaPhiConversions),
-            m_isDebugEnabled(edm::isDebugEnabled())
-            {
-
-    m_condMaxNumberObjects = 2; // irrelevant for correlation conditions
-    m_nrBinsPhi = 0;
+    const L1GtCondition *corrTemplate, const L1GtCondition *cond0Condition,
+    const L1GtCondition *cond1Condition, const int cond0NrL1Objects,
+    const int cond1NrL1Objects, const int cond0EtaBits, const int cond1EtaBits,
+    const L1GlobalTriggerGTL *ptrGTL, const L1GlobalTriggerPSB *ptrPSB,
+    const L1GtEtaPhiConversions *etaPhiConversions)
+    : L1GtConditionEvaluation(),
+      m_gtCorrelationTemplate(
+          static_cast<const L1GtCorrelationTemplate *>(corrTemplate)),
+      m_gtCond0(cond0Condition), m_gtCond1(cond1Condition),
+      m_cond0NrL1Objects(cond0NrL1Objects),
+      m_cond1NrL1Objects(cond1NrL1Objects), m_cond0EtaBits(cond0EtaBits),
+      m_cond1EtaBits(cond1EtaBits), m_gtGTL(ptrGTL), m_gtPSB(ptrPSB),
+      m_gtEtaPhiConversions(etaPhiConversions),
+      m_isDebugEnabled(edm::isDebugEnabled()) {
+
+  m_condMaxNumberObjects = 2; // irrelevant for correlation conditions
+  m_nrBinsPhi = 0;
 }
 
 // copy constructor
 void L1GtCorrelationCondition::copy(const L1GtCorrelationCondition &cp) {
 
-    m_gtCorrelationTemplate = cp.m_gtCorrelationTemplate;
-
-    m_gtCond0 = cp.m_gtCond0;
-    m_gtCond1 = cp.m_gtCond1;
+  m_gtCorrelationTemplate = cp.m_gtCorrelationTemplate;
 
-    m_cond0NrL1Objects = cp.m_cond0NrL1Objects;
-    m_cond1NrL1Objects = cp.m_cond1NrL1Objects;
-    m_cond0EtaBits = cp.m_cond0EtaBits;
-    m_cond1EtaBits = cp.m_cond1EtaBits;
+  m_gtCond0 = cp.m_gtCond0;
+  m_gtCond1 = cp.m_gtCond1;
 
-    m_nrBinsPhi = cp.m_nrBinsPhi;
+  m_cond0NrL1Objects = cp.m_cond0NrL1Objects;
+  m_cond1NrL1Objects = cp.m_cond1NrL1Objects;
+  m_cond0EtaBits = cp.m_cond0EtaBits;
+  m_cond1EtaBits = cp.m_cond1EtaBits;
 
-    m_gtCorrelationTemplate = cp.m_gtCorrelationTemplate;
-    m_gtGTL = cp.m_gtGTL;
-    m_gtPSB = cp.m_gtPSB;
+  m_nrBinsPhi = cp.m_nrBinsPhi;
 
-    m_gtEtaPhiConversions = cp.m_gtEtaPhiConversions;
+  m_gtCorrelationTemplate = cp.m_gtCorrelationTemplate;
+  m_gtGTL = cp.m_gtGTL;
+  m_gtPSB = cp.m_gtPSB;
 
-    m_condMaxNumberObjects = cp.m_condMaxNumberObjects;
-    m_condLastResult = cp.m_condLastResult;
-    m_combinationsInCond = cp.m_combinationsInCond;
-
-    m_verbosity = cp.m_verbosity;
-    m_isDebugEnabled = cp.m_isDebugEnabled;
+  m_gtEtaPhiConversions = cp.m_gtEtaPhiConversions;
 
+  m_condMaxNumberObjects = cp.m_condMaxNumberObjects;
+  m_condLastResult = cp.m_condLastResult;
+  m_combinationsInCond = cp.m_combinationsInCond;
 
+  m_verbosity = cp.m_verbosity;
+  m_isDebugEnabled = cp.m_isDebugEnabled;
 }
 
 L1GtCorrelationCondition::L1GtCorrelationCondition(
-        const L1GtCorrelationCondition& cp) :
-    L1GtConditionEvaluation() {
-    copy(cp);
+    const L1GtCorrelationCondition &cp)
+    : L1GtConditionEvaluation() {
+  copy(cp);
 }
 
 // destructor
 L1GtCorrelationCondition::~L1GtCorrelationCondition() {
 
-    // empty
-
+  // empty
 }
 
 // equal operator
-L1GtCorrelationCondition& L1GtCorrelationCondition::operator= (
-        const L1GtCorrelationCondition& cp)
-{
-    copy(cp);
-    return *this;
+L1GtCorrelationCondition &L1GtCorrelationCondition::
+operator=(const L1GtCorrelationCondition &cp) {
+  copy(cp);
+  return *this;
 }
 
 // methods
 
 void L1GtCorrelationCondition::setGtNrBinsPhi(const unsigned int nrBins) {
 
-    m_nrBinsPhi = nrBins;
-
+  m_nrBinsPhi = nrBins;
 }
 
 //
 void L1GtCorrelationCondition::setGtCorrelationTemplate(
-        const L1GtCorrelationTemplate* corrTempl) {
-
-    m_gtCorrelationTemplate = corrTempl;
+    const L1GtCorrelationTemplate *corrTempl) {
 
+  m_gtCorrelationTemplate = corrTempl;
 }
 
 //   set the pointer to GTL
-void L1GtCorrelationCondition::setGtGTL(const L1GlobalTriggerGTL* ptrGTL) {
-
-    m_gtGTL = ptrGTL;
+void L1GtCorrelationCondition::setGtGTL(const L1GlobalTriggerGTL *ptrGTL) {
 
+  m_gtGTL = ptrGTL;
 }
 
 //   set the pointer to PSB
-void L1GtCorrelationCondition::setGtPSB(const L1GlobalTriggerPSB* ptrPSB) {
-
-    m_gtPSB = ptrPSB;
+void L1GtCorrelationCondition::setGtPSB(const L1GlobalTriggerPSB *ptrPSB) {
 
+  m_gtPSB = ptrPSB;
 }
 
 // try all object permutations and check spatial correlations, if required
 const bool L1GtCorrelationCondition::evaluateCondition() const {
 
-    // std::cout << "m_isDebugEnabled = " << m_isDebugEnabled << std::endl;
-    // std::cout << "m_verbosity = " << m_verbosity << std::endl;
+  // std::cout << "m_isDebugEnabled = " << m_isDebugEnabled << std::endl;
+  // std::cout << "m_verbosity = " << m_verbosity << std::endl;
 
-    bool condResult = false;
-    bool reqObjResult = false;
+  bool condResult = false;
+  bool reqObjResult = false;
 
-    // number of objects in condition (it is 2, no need to retrieve from
-    // condition template) and their type
-    int nObjInCond = 2;
-    std::vector<L1GtObject> cndObjTypeVec(nObjInCond);
+  // number of objects in condition (it is 2, no need to retrieve from
+  // condition template) and their type
+  int nObjInCond = 2;
+  std::vector<L1GtObject> cndObjTypeVec(nObjInCond);
 
-    // evaluate first the two sub-conditions (Type1s)
+  // evaluate first the two sub-conditions (Type1s)
 
-    const L1GtConditionCategory cond0Categ = m_gtCorrelationTemplate->cond0Category();
-    const L1GtConditionCategory cond1Categ = m_gtCorrelationTemplate->cond1Category();
+  const L1GtConditionCategory cond0Categ =
+      m_gtCorrelationTemplate->cond0Category();
+  const L1GtConditionCategory cond1Categ =
+      m_gtCorrelationTemplate->cond1Category();
 
-    const L1GtMuonTemplate* corrMuon = nullptr;
-    const L1GtCaloTemplate* corrCalo = nullptr;
-    const L1GtEnergySumTemplate* corrEnergySum = nullptr;
+  const L1GtMuonTemplate *corrMuon = nullptr;
+  const L1GtCaloTemplate *corrCalo = nullptr;
+  const L1GtEnergySumTemplate *corrEnergySum = nullptr;
 
-    // FIXME copying is slow...
-    CombinationsInCond cond0Comb;
-    CombinationsInCond cond1Comb;
+  // FIXME copying is slow...
+  CombinationsInCond cond0Comb;
+  CombinationsInCond cond1Comb;
 
-    switch (cond0Categ) {
-        case CondMuon: {
-            corrMuon = static_cast<const L1GtMuonTemplate*>(m_gtCond0);
-            L1GtMuonCondition muCondition(corrMuon, m_gtGTL,
-                    m_cond0NrL1Objects, m_cond0EtaBits);
+  switch (cond0Categ) {
+  case CondMuon: {
+    corrMuon = static_cast<const L1GtMuonTemplate *>(m_gtCond0);
+    L1GtMuonCondition muCondition(corrMuon, m_gtGTL, m_cond0NrL1Objects,
+                                  m_cond0EtaBits);
 
-            muCondition.evaluateConditionStoreResult();
-            reqObjResult = muCondition.condLastResult();
+    muCondition.evaluateConditionStoreResult();
+    reqObjResult = muCondition.condLastResult();
 
-            cond0Comb = (muCondition.getCombinationsInCond());
-            cndObjTypeVec[0] = (corrMuon->objectType())[0];
+    cond0Comb = (muCondition.getCombinationsInCond());
+    cndObjTypeVec[0] = (corrMuon->objectType())[0];
 
-            if (m_verbosity && m_isDebugEnabled ) {
-                std::ostringstream myCout;
-                muCondition.print(myCout);
+    if (m_verbosity && m_isDebugEnabled) {
+      std::ostringstream myCout;
+      muCondition.print(myCout);
 
-                LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
-            }
-        }
-            break;
-        case CondCalo: {
-            corrCalo = static_cast<const L1GtCaloTemplate*>(m_gtCond0);
+      LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
+    }
+  } break;
+  case CondCalo: {
+    corrCalo = static_cast<const L1GtCaloTemplate *>(m_gtCond0);
 
-            L1GtCaloCondition caloCondition(corrCalo, m_gtPSB,
-                    m_cond0NrL1Objects, m_cond0NrL1Objects, m_cond0NrL1Objects,
-                    m_cond0NrL1Objects, m_cond0NrL1Objects, m_cond0EtaBits);
+    L1GtCaloCondition caloCondition(corrCalo, m_gtPSB, m_cond0NrL1Objects,
+                                    m_cond0NrL1Objects, m_cond0NrL1Objects,
+                                    m_cond0NrL1Objects, m_cond0NrL1Objects,
+                                    m_cond0EtaBits);
 
-            caloCondition.evaluateConditionStoreResult();
-            reqObjResult = caloCondition.condLastResult();
+    caloCondition.evaluateConditionStoreResult();
+    reqObjResult = caloCondition.condLastResult();
 
-            cond0Comb = (caloCondition.getCombinationsInCond());
-            cndObjTypeVec[0] = (corrCalo->objectType())[0];
+    cond0Comb = (caloCondition.getCombinationsInCond());
+    cndObjTypeVec[0] = (corrCalo->objectType())[0];
 
-            if (m_verbosity && m_isDebugEnabled) {
-                std::ostringstream myCout;
-                caloCondition.print(myCout);
+    if (m_verbosity && m_isDebugEnabled) {
+      std::ostringstream myCout;
+      caloCondition.print(myCout);
 
-                LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
-            }
-        }
-            break;
-        case CondEnergySum: {
-            corrEnergySum = static_cast<const L1GtEnergySumTemplate*>(m_gtCond0);
-            L1GtEnergySumCondition eSumCondition(corrEnergySum, m_gtPSB);
+      LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
+    }
+  } break;
+  case CondEnergySum: {
+    corrEnergySum = static_cast<const L1GtEnergySumTemplate *>(m_gtCond0);
+    L1GtEnergySumCondition eSumCondition(corrEnergySum, m_gtPSB);
 
-            eSumCondition.evaluateConditionStoreResult();
-            reqObjResult = eSumCondition.condLastResult();
+    eSumCondition.evaluateConditionStoreResult();
+    reqObjResult = eSumCondition.condLastResult();
 
-            cond0Comb = (eSumCondition.getCombinationsInCond());
-            cndObjTypeVec[0] = (corrEnergySum->objectType())[0];
+    cond0Comb = (eSumCondition.getCombinationsInCond());
+    cndObjTypeVec[0] = (corrEnergySum->objectType())[0];
 
-            if (m_verbosity && m_isDebugEnabled ) {
-                std::ostringstream myCout;
-                eSumCondition.print(myCout);
+    if (m_verbosity && m_isDebugEnabled) {
+      std::ostringstream myCout;
+      eSumCondition.print(myCout);
 
-                LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
-            }
-        }
-            break;
-        default: {
-            // should not arrive here, there are no correlation conditions defined for this object
-            return false;
-        }
-            break;
+      LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
     }
-
-    // return if first subcondition is false
-    if (!reqObjResult) {
-        if (m_verbosity && m_isDebugEnabled) {
-            LogTrace("L1GlobalTrigger")
-                    << "\n  First sub-condition false, second sub-condition not evaluated and not printed."
-                    << std::endl;
-        }
-        return false;
+  } break;
+  default: {
+    // should not arrive here, there are no correlation conditions defined for
+    // this object
+    return false;
+  } break;
+  }
+
+  // return if first subcondition is false
+  if (!reqObjResult) {
+    if (m_verbosity && m_isDebugEnabled) {
+      LogTrace("L1GlobalTrigger")
+          << "\n  First sub-condition false, second sub-condition not "
+             "evaluated and not printed."
+          << std::endl;
     }
+    return false;
+  }
 
-    // second object
-    reqObjResult = false;
+  // second object
+  reqObjResult = false;
 
-    switch (cond1Categ) {
-        case CondMuon: {
-            corrMuon = static_cast<const L1GtMuonTemplate*>(m_gtCond1);
-            L1GtMuonCondition muCondition(corrMuon, m_gtGTL,
-                    m_cond1NrL1Objects, m_cond1EtaBits);
+  switch (cond1Categ) {
+  case CondMuon: {
+    corrMuon = static_cast<const L1GtMuonTemplate *>(m_gtCond1);
+    L1GtMuonCondition muCondition(corrMuon, m_gtGTL, m_cond1NrL1Objects,
+                                  m_cond1EtaBits);
 
-            muCondition.evaluateConditionStoreResult();
-            reqObjResult = muCondition.condLastResult();
+    muCondition.evaluateConditionStoreResult();
+    reqObjResult = muCondition.condLastResult();
 
-            cond1Comb = (muCondition.getCombinationsInCond());
-            cndObjTypeVec[1] = (corrMuon->objectType())[0];
+    cond1Comb = (muCondition.getCombinationsInCond());
+    cndObjTypeVec[1] = (corrMuon->objectType())[0];
 
-            if (m_verbosity && m_isDebugEnabled ) {
-                std::ostringstream myCout;
-                muCondition.print(myCout);
+    if (m_verbosity && m_isDebugEnabled) {
+      std::ostringstream myCout;
+      muCondition.print(myCout);
 
-                LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
-            }
-        }
-            break;
-        case CondCalo: {
-            corrCalo = static_cast<const L1GtCaloTemplate*>(m_gtCond1);
-            L1GtCaloCondition caloCondition(corrCalo, m_gtPSB,
-                    m_cond1NrL1Objects, m_cond1NrL1Objects, m_cond1NrL1Objects,
-                    m_cond1NrL1Objects, m_cond1NrL1Objects, m_cond1EtaBits);
-
-            caloCondition.evaluateConditionStoreResult();
-            reqObjResult = caloCondition.condLastResult();
+      LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
+    }
+  } break;
+  case CondCalo: {
+    corrCalo = static_cast<const L1GtCaloTemplate *>(m_gtCond1);
+    L1GtCaloCondition caloCondition(corrCalo, m_gtPSB, m_cond1NrL1Objects,
+                                    m_cond1NrL1Objects, m_cond1NrL1Objects,
+                                    m_cond1NrL1Objects, m_cond1NrL1Objects,
+                                    m_cond1EtaBits);
 
-            cond1Comb = (caloCondition.getCombinationsInCond());
-            cndObjTypeVec[1] = (corrCalo->objectType())[0];
+    caloCondition.evaluateConditionStoreResult();
+    reqObjResult = caloCondition.condLastResult();
 
-            if (m_verbosity && m_isDebugEnabled) {
-                std::ostringstream myCout;
-                caloCondition.print(myCout);
+    cond1Comb = (caloCondition.getCombinationsInCond());
+    cndObjTypeVec[1] = (corrCalo->objectType())[0];
 
-                LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
-            }
+    if (m_verbosity && m_isDebugEnabled) {
+      std::ostringstream myCout;
+      caloCondition.print(myCout);
 
-        }
-            break;
-        case CondEnergySum: {
-            corrEnergySum = static_cast<const L1GtEnergySumTemplate*>(m_gtCond1);
-            L1GtEnergySumCondition eSumCondition(corrEnergySum, m_gtPSB);
-            eSumCondition.evaluateConditionStoreResult();
-            reqObjResult = eSumCondition.condLastResult();
-
-            cond1Comb = (eSumCondition.getCombinationsInCond());
-            cndObjTypeVec[1] = (corrEnergySum->objectType())[0];
-
-            if (m_verbosity && m_isDebugEnabled ) {
-                std::ostringstream myCout;
-                eSumCondition.print(myCout);
-
-                LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
-            }
-        }
-            break;
-        default: {
-            // should not arrive here, there are no correlation conditions defined for this object
-            return false;
-        }
-            break;
+      LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
     }
 
-    // return if second sub-condition is false
-    if (!reqObjResult) {
-        return false;
-    } else {
-        LogTrace("L1GlobalTrigger") << "\n"
-                << "    Both sub-conditions true for object requirements."
-                << "    Evaluate correlation requirements.\n" << std::endl;
+  } break;
+  case CondEnergySum: {
+    corrEnergySum = static_cast<const L1GtEnergySumTemplate *>(m_gtCond1);
+    L1GtEnergySumCondition eSumCondition(corrEnergySum, m_gtPSB);
+    eSumCondition.evaluateConditionStoreResult();
+    reqObjResult = eSumCondition.condLastResult();
 
-    }
+    cond1Comb = (eSumCondition.getCombinationsInCond());
+    cndObjTypeVec[1] = (corrEnergySum->objectType())[0];
 
-    //
-    // evaluate the delta_eta and delta_phi correlations
-    // if here, the object requirements are satisfied for both sub-conditions
-    //
+    if (m_verbosity && m_isDebugEnabled) {
+      std::ostringstream myCout;
+      eSumCondition.print(myCout);
 
-    // get the correlation parameters
+      LogTrace("L1GlobalTrigger") << myCout.str() << std::endl;
+    }
+  } break;
+  default: {
+    // should not arrive here, there are no correlation conditions defined for
+    // this object
+    return false;
+  } break;
+  }
+
+  // return if second sub-condition is false
+  if (!reqObjResult) {
+    return false;
+  } else {
+    LogTrace("L1GlobalTrigger")
+        << "\n"
+        << "    Both sub-conditions true for object requirements."
+        << "    Evaluate correlation requirements.\n"
+        << std::endl;
+  }
+
+  //
+  // evaluate the delta_eta and delta_phi correlations
+  // if here, the object requirements are satisfied for both sub-conditions
+  //
+
+  // get the correlation parameters
+
+  L1GtCorrelationTemplate::CorrelationParameter corrPar =
+      *(m_gtCorrelationTemplate->correlationParameter());
+
+  // convert the eta template requirements from string to 64-bit integers
+  // number of 64-bit integers: string length / 16
+  size_t deltaEtaRangeConvSize = (corrPar.deltaEtaRange).size() / 16 + 1;
+  std::vector<unsigned long long> deltaEtaRangeConv(deltaEtaRangeConvSize);
+
+  if (!(hexStringToInt64(corrPar.deltaEtaRange, deltaEtaRangeConv))) {
+    return false;
+  }
+
+  // convert the phi template requirements from string to 64-bit integers
+  // number of 64-bit integers: string length / 16
+  size_t deltaPhiRangeConvSize = (corrPar.deltaPhiRange).size() / 16 + 1;
+  std::vector<unsigned long long> deltaPhiRangeConv(deltaPhiRangeConvSize);
+
+  if (!(hexStringToInt64(corrPar.deltaPhiRange, deltaPhiRangeConv))) {
+    return false;
+  }
+
+  // get the index of L1 GT object pair
+  unsigned int objPairIndex = (m_gtEtaPhiConversions->gtObjectPairIndex(
+      cndObjTypeVec[0], cndObjTypeVec[1]));
+
+  // get the maximum number of bins for the delta phi scales
+  unsigned int corrParDeltaPhiNrBins =
+      (m_gtEtaPhiConversions->gtObjectNrBinsPhi(objPairIndex)) / 2 + 1;
+
+  // vector to store the indices of the calorimeter objects
+  // from the combination evaluated in the condition
+  SingleCombInCond objectsInComb;
+  objectsInComb.reserve(nObjInCond);
+
+  // clear the m_combinationsInCond vector
+  (combinationsInCond()).clear();
+
+  // pointers to objects
+  const std::vector<const L1MuGMTCand *> *candMuVec = nullptr;
+  const std::vector<const L1GctCand *> *candCaloVec = nullptr;
+  //    only ETM and HTM  can appear in correlation conditions
+  const L1GctEtMiss *candETM = nullptr;
+  const L1GctHtMiss *candHTM = nullptr;
+
+  // make the conversions of the indices, depending on the combination of
+  // objects involved (via pair index)
+
+  unsigned int phiIndex0 = 0;
+  unsigned int phiIndex1 = 0;
+
+  unsigned int phiIndex0Converted = 0;
+  unsigned int phiIndex1Converted = 0;
+
+  unsigned int etaIndex0 = 0;
+  unsigned int etaIndex1 = 0;
+
+  unsigned int etaIndex0Converted = 0;
+  unsigned int etaIndex1Converted = 0;
+
+  LogTrace("L1GlobalTrigger")
+      << "  Sub-condition 0: std::vector<SingleCombInCond> size: "
+      << (cond0Comb.size()) << std::endl;
+  LogTrace("L1GlobalTrigger")
+      << "  Sub-condition 1: std::vector<SingleCombInCond> size: "
+      << (cond1Comb.size()) << std::endl;
+
+  // loop over all combinations which produced individually "true" as Type1s
+  for (std::vector<SingleCombInCond>::const_iterator it0Comb =
+           cond0Comb.begin();
+       it0Comb != cond0Comb.end(); it0Comb++) {
+
+    // Type1s: there is 1 object only, no need for a loop, index 0 should be OK
+    // in (*it0Comb)[0]
+    // ... but add protection to not crash
+    int obj0Index = -1;
+
+    if (!(*it0Comb).empty()) {
+      obj0Index = (*it0Comb)[0];
+    } else {
+      LogTrace("L1GlobalTrigger") << "\n  SingleCombInCond (*it0Comb).size() "
+                                  << ((*it0Comb).size()) << std::endl;
+      return false;
+    }
 
-    L1GtCorrelationTemplate::CorrelationParameter corrPar =
-        *(m_gtCorrelationTemplate->correlationParameter());
+    bool convStatus = false;
 
-    // convert the eta template requirements from string to 64-bit integers
-    // number of 64-bit integers: string length / 16
-    size_t deltaEtaRangeConvSize = (corrPar.deltaEtaRange).size() / 16
-            + 1;
-    std::vector<unsigned long long> deltaEtaRangeConv(
-            deltaEtaRangeConvSize);
+    switch (cond0Categ) {
+    case CondMuon: {
+      candMuVec = m_gtGTL->getCandL1Mu();
+      phiIndex0 = (*candMuVec)[obj0Index]->phiIndex();
+      etaIndex0 = (*candMuVec)[obj0Index]->etaIndex();
+
+      convStatus = m_gtEtaPhiConversions->convertPhiIndex(
+          objPairIndex, 0, phiIndex0, phiIndex0Converted);
 
-    if (!(hexStringToInt64(corrPar.deltaEtaRange, deltaEtaRangeConv))) {
+      if (!convStatus) {
+        // conversion failed, message written in L1GtEtaPhiConversions
         return false;
-    }
+      }
 
-    // convert the phi template requirements from string to 64-bit integers
-    // number of 64-bit integers: string length / 16
-    size_t deltaPhiRangeConvSize = (corrPar.deltaPhiRange).size() / 16
-            + 1;
-    std::vector<unsigned long long> deltaPhiRangeConv(
-            deltaPhiRangeConvSize);
+      convStatus = m_gtEtaPhiConversions->convertEtaIndex(Mu, etaIndex0,
+                                                          etaIndex0Converted);
 
-    if (!(hexStringToInt64(corrPar.deltaPhiRange, deltaPhiRangeConv))) {
+      if (!convStatus) {
+        // conversion failed, message written in L1GtEtaPhiConversions
         return false;
-    }
+      }
+
+    } break;
+    case CondCalo: {
+      switch (cndObjTypeVec[0]) {
+      case NoIsoEG: {
+        candCaloVec = m_gtPSB->getCandL1NoIsoEG();
+      } break;
+      case IsoEG: {
+        candCaloVec = m_gtPSB->getCandL1IsoEG();
+      } break;
+      case CenJet: {
+        candCaloVec = m_gtPSB->getCandL1CenJet();
+      } break;
+      case ForJet: {
+        candCaloVec = m_gtPSB->getCandL1ForJet();
+      } break;
+      case TauJet: {
+        candCaloVec = m_gtPSB->getCandL1TauJet();
+      } break;
+      default: {
+        // do nothing
+      } break;
+      }
+
+      phiIndex0 = (*candCaloVec)[obj0Index]->phiIndex();
+      etaIndex0 = (*candCaloVec)[obj0Index]->etaIndex();
+
+      convStatus = m_gtEtaPhiConversions->convertPhiIndex(
+          objPairIndex, 0, phiIndex0, phiIndex0Converted);
+
+      if (!convStatus) {
+        // conversion failed, message written in L1GtEtaPhiConversions
+        return false;
+      }
 
-    // get the index of L1 GT object pair
-    unsigned int objPairIndex = (m_gtEtaPhiConversions->gtObjectPairIndex(
-            cndObjTypeVec[0], cndObjTypeVec[1]));
+      convStatus = m_gtEtaPhiConversions->convertEtaIndex(
+          cndObjTypeVec[0], etaIndex0, etaIndex0Converted);
 
-    // get the maximum number of bins for the delta phi scales
-    unsigned int corrParDeltaPhiNrBins =
-            (m_gtEtaPhiConversions->gtObjectNrBinsPhi(objPairIndex)) / 2 + 1;
+      if (!convStatus) {
+        // conversion failed, message written in L1GtEtaPhiConversions
+        return false;
+      }
+    } break;
+    case CondEnergySum: {
+      switch (cndObjTypeVec[0]) {
+      case ETM: {
+        candETM = m_gtPSB->getCandL1ETM();
+        phiIndex0 = candETM->phi();
+
+        convStatus = m_gtEtaPhiConversions->convertPhiIndex(
+            objPairIndex, 0, phiIndex0, phiIndex0Converted);
+
+        if (!convStatus) {
+          // conversion failed, message written in L1GtEtaPhiConversions
+          return false;
+        }
 
+      } break;
+      case HTM: {
+        candHTM = m_gtPSB->getCandL1HTM();
+        phiIndex0 = candHTM->phi();
 
-    // vector to store the indices of the calorimeter objects
-    // from the combination evaluated in the condition
-    SingleCombInCond objectsInComb;
-    objectsInComb.reserve(nObjInCond);
+        convStatus = m_gtEtaPhiConversions->convertPhiIndex(
+            objPairIndex, 0, phiIndex0, phiIndex0Converted);
 
-    // clear the m_combinationsInCond vector
-    (combinationsInCond()).clear();
+        if (!convStatus) {
+          // conversion failed, message written in L1GtEtaPhiConversions
+          return false;
+        }
 
-    // pointers to objects
-    const std::vector<const L1MuGMTCand*>* candMuVec = nullptr;
-    const std::vector<const L1GctCand*>* candCaloVec = nullptr;
-    //    only ETM and HTM  can appear in correlation conditions
-    const L1GctEtMiss* candETM = nullptr;
-    const L1GctHtMiss* candHTM = nullptr;
+      } break;
+      default:
+        // do nothing
+        break;
+      }
+    } break;
+    default: {
+      // should not arrive here, there are no correlation conditions defined for
+      // this object
+      return false;
+    } break;
+    }
 
-    // make the conversions of the indices, depending on the combination of objects involved
-    // (via pair index)
+    for (std::vector<SingleCombInCond>::const_iterator it1Comb =
+             cond1Comb.begin();
+         it1Comb != cond1Comb.end(); it1Comb++) {
 
-    unsigned int phiIndex0 = 0;
-    unsigned int phiIndex1 = 0;
+      // Type1s: there is 1 object only, no need for a loop (*it1Comb)[0]
+      // ... but add protection to not crash
+      int obj1Index = -1;
 
-    unsigned int phiIndex0Converted = 0;
-    unsigned int phiIndex1Converted = 0;
+      if (!(*it1Comb).empty()) {
+        obj1Index = (*it1Comb)[0];
+      } else {
+        LogTrace("L1GlobalTrigger") << "\n  SingleCombInCond (*it1Comb).size() "
+                                    << ((*it1Comb).size()) << std::endl;
+        return false;
+      }
 
-    unsigned int etaIndex0 = 0;
-    unsigned int etaIndex1 = 0;
+      switch (cond1Categ) {
+      case CondMuon: {
+        candMuVec = m_gtGTL->getCandL1Mu();
+        phiIndex1 = (*candMuVec)[obj1Index]->phiIndex();
+        etaIndex1 = (*candMuVec)[obj1Index]->etaIndex();
 
-    unsigned int etaIndex0Converted = 0;
-    unsigned int etaIndex1Converted = 0;
+        convStatus = m_gtEtaPhiConversions->convertPhiIndex(
+            objPairIndex, 1, phiIndex1, phiIndex1Converted);
 
-    LogTrace("L1GlobalTrigger")
-            << "  Sub-condition 0: std::vector<SingleCombInCond> size: "
-            << (cond0Comb.size()) << std::endl;
-    LogTrace("L1GlobalTrigger")
-            << "  Sub-condition 1: std::vector<SingleCombInCond> size: "
-            << (cond1Comb.size()) << std::endl;
+        if (!convStatus) {
+          // conversion failed, message written in L1GtEtaPhiConversions
+          return false;
+        }
 
+        convStatus = m_gtEtaPhiConversions->convertEtaIndex(
+            cndObjTypeVec[1], etaIndex1, etaIndex1Converted);
 
-    // loop over all combinations which produced individually "true" as Type1s
-    for (std::vector<SingleCombInCond>::const_iterator it0Comb =
-            cond0Comb.begin(); it0Comb != cond0Comb.end(); it0Comb++) {
+        if (!convStatus) {
+          // conversion failed, message written in L1GtEtaPhiConversions
+          return false;
+        }
+      } break;
+      case CondCalo: {
+        switch (cndObjTypeVec[1]) {
+        case NoIsoEG:
+          candCaloVec = m_gtPSB->getCandL1NoIsoEG();
+          break;
+        case IsoEG:
+          candCaloVec = m_gtPSB->getCandL1IsoEG();
+          break;
+        case CenJet:
+          candCaloVec = m_gtPSB->getCandL1CenJet();
+          break;
+        case ForJet:
+          candCaloVec = m_gtPSB->getCandL1ForJet();
+          break;
+        case TauJet:
+          candCaloVec = m_gtPSB->getCandL1TauJet();
+          break;
+        default:
+          // do nothing
+          break;
+        }
 
-        // Type1s: there is 1 object only, no need for a loop, index 0 should be OK in (*it0Comb)[0]
-        // ... but add protection to not crash
-        int obj0Index = -1;
+        phiIndex1 = (*candCaloVec)[obj1Index]->phiIndex();
+        etaIndex1 = (*candCaloVec)[obj1Index]->etaIndex();
 
-        if (!(*it0Comb).empty()) {
-            obj0Index = (*it0Comb)[0];
-        } else {
-            LogTrace("L1GlobalTrigger")
-                    << "\n  SingleCombInCond (*it0Comb).size() "
-                    << ((*it0Comb).size()) << std::endl;
-            return false;
+        convStatus = m_gtEtaPhiConversions->convertPhiIndex(
+            objPairIndex, 1, phiIndex1, phiIndex1Converted);
+
+        if (!convStatus) {
+          // conversion failed, message written in L1GtEtaPhiConversions
+          return false;
         }
 
-        bool convStatus = false;
-
-        switch (cond0Categ) {
-            case CondMuon: {
-                candMuVec = m_gtGTL->getCandL1Mu();
-                phiIndex0 = (*candMuVec)[obj0Index]->phiIndex();
-                etaIndex0 = (*candMuVec)[obj0Index]->etaIndex();
-
-                convStatus = m_gtEtaPhiConversions->convertPhiIndex(
-                        objPairIndex,  0, phiIndex0, phiIndex0Converted);
-
-                if (!convStatus) {
-                    // conversion failed, message written in L1GtEtaPhiConversions
-                    return false;
-                }
-
-                convStatus = m_gtEtaPhiConversions->convertEtaIndex(
-                        Mu, etaIndex0, etaIndex0Converted);
-
-                if (!convStatus) {
-                    // conversion failed, message written in L1GtEtaPhiConversions
-                    return false;
-                }
-
-            }
-                break;
-            case CondCalo: {
-                switch (cndObjTypeVec[0]) {
-                    case NoIsoEG: {
-                        candCaloVec = m_gtPSB->getCandL1NoIsoEG();
-                    }
-                        break;
-                    case IsoEG: {
-                        candCaloVec = m_gtPSB->getCandL1IsoEG();
-                    }
-                        break;
-                    case CenJet: {
-                        candCaloVec = m_gtPSB->getCandL1CenJet();
-                    }
-                        break;
-                    case ForJet: {
-                        candCaloVec = m_gtPSB->getCandL1ForJet();
-                    }
-                        break;
-                    case TauJet: {
-                        candCaloVec = m_gtPSB->getCandL1TauJet();
-                    }
-                        break;
-                    default: {
-                        // do nothing
-                    }
-                        break;
-                }
-
-                phiIndex0 = (*candCaloVec)[obj0Index]->phiIndex();
-                etaIndex0 = (*candCaloVec)[obj0Index]->etaIndex();
-
-                convStatus = m_gtEtaPhiConversions->convertPhiIndex(
-                        objPairIndex,  0, phiIndex0, phiIndex0Converted);
-
-                if (!convStatus) {
-                    // conversion failed, message written in L1GtEtaPhiConversions
-                    return false;
-                }
-
-                convStatus = m_gtEtaPhiConversions->convertEtaIndex(
-                        cndObjTypeVec[0], etaIndex0, etaIndex0Converted);
-
-                if (!convStatus) {
-                    // conversion failed, message written in L1GtEtaPhiConversions
-                    return false;
-                }
-            }
-                break;
-            case CondEnergySum: {
-                switch (cndObjTypeVec[0]) {
-                    case ETM: {
-                        candETM = m_gtPSB->getCandL1ETM();
-                        phiIndex0 = candETM->phi();
-
-                        convStatus = m_gtEtaPhiConversions->convertPhiIndex(
-                                objPairIndex,  0, phiIndex0, phiIndex0Converted);
-
-                        if (!convStatus) {
-                            // conversion failed, message written in L1GtEtaPhiConversions
-                            return false;
-                        }
-
-                    }
-                        break;
-                    case HTM: {
-                        candHTM = m_gtPSB->getCandL1HTM();
-                        phiIndex0 = candHTM->phi();
-
-                        convStatus = m_gtEtaPhiConversions->convertPhiIndex(
-                                objPairIndex,  0, phiIndex0, phiIndex0Converted);
-
-                        if (!convStatus) {
-                            // conversion failed, message written in L1GtEtaPhiConversions
-                            return false;
-                        }
-
-                    }
-                        break;
-                    default:
-                        // do nothing
-                        break;
-                }
-            }
-                break;
-            default: {
-                // should not arrive here, there are no correlation conditions defined for this object
-                return false;
-            }
-                break;
+        convStatus = m_gtEtaPhiConversions->convertEtaIndex(
+            cndObjTypeVec[1], etaIndex1, etaIndex1Converted);
+
+        if (!convStatus) {
+          // conversion failed, message written in L1GtEtaPhiConversions
+          return false;
         }
 
-        for (std::vector<SingleCombInCond>::const_iterator it1Comb =
-                cond1Comb.begin(); it1Comb != cond1Comb.end(); it1Comb++) {
-
-            // Type1s: there is 1 object only, no need for a loop (*it1Comb)[0]
-            // ... but add protection to not crash
-            int obj1Index = -1;
-
-            if (!(*it1Comb).empty()) {
-                obj1Index = (*it1Comb)[0];
-            } else {
-                LogTrace("L1GlobalTrigger")
-                        << "\n  SingleCombInCond (*it1Comb).size() "
-                        << ((*it1Comb).size()) << std::endl;
-                return false;
-            }
-
-            switch (cond1Categ) {
-                case CondMuon: {
-                    candMuVec = m_gtGTL->getCandL1Mu();
-                    phiIndex1 = (*candMuVec)[obj1Index]->phiIndex();
-                    etaIndex1 = (*candMuVec)[obj1Index]->etaIndex();
-
-                    convStatus = m_gtEtaPhiConversions->convertPhiIndex(
-                            objPairIndex,  1, phiIndex1, phiIndex1Converted);
-
-                    if (!convStatus) {
-                        // conversion failed, message written in L1GtEtaPhiConversions
-                        return false;
-                    }
-
-                    convStatus = m_gtEtaPhiConversions->convertEtaIndex(
-                            cndObjTypeVec[1], etaIndex1, etaIndex1Converted);
-
-                    if (!convStatus) {
-                        // conversion failed, message written in L1GtEtaPhiConversions
-                        return false;
-                    }
-                }
-                    break;
-                case CondCalo: {
-                    switch (cndObjTypeVec[1]) {
-                        case NoIsoEG:
-                            candCaloVec = m_gtPSB->getCandL1NoIsoEG();
-                            break;
-                        case IsoEG:
-                            candCaloVec = m_gtPSB->getCandL1IsoEG();
-                            break;
-                        case CenJet:
-                            candCaloVec = m_gtPSB->getCandL1CenJet();
-                            break;
-                        case ForJet:
-                            candCaloVec = m_gtPSB->getCandL1ForJet();
-                            break;
-                        case TauJet:
-                            candCaloVec = m_gtPSB->getCandL1TauJet();
-                            break;
-                        default:
-                            // do nothing
-                            break;
-                    }
-
-                    phiIndex1 = (*candCaloVec)[obj1Index]->phiIndex();
-                    etaIndex1 = (*candCaloVec)[obj1Index]->etaIndex();
-
-                    convStatus = m_gtEtaPhiConversions->convertPhiIndex(
-                            objPairIndex,  1, phiIndex1, phiIndex1Converted);
-
-                    if (!convStatus) {
-                        // conversion failed, message written in L1GtEtaPhiConversions
-                        return false;
-                    }
-
-                    convStatus = m_gtEtaPhiConversions->convertEtaIndex(
-                            cndObjTypeVec[1], etaIndex1, etaIndex1Converted);
-
-                    if (!convStatus) {
-                        // conversion failed, message written in L1GtEtaPhiConversions
-                        return false;
-                    }
-
-                }
-                    break;
-                case CondEnergySum: {
-                    switch (cndObjTypeVec[1]) {
-                        case ETM: {
-                            candETM = m_gtPSB->getCandL1ETM();
-                            phiIndex1 = candETM->phi();
-
-                            convStatus = m_gtEtaPhiConversions->convertPhiIndex(
-                                    objPairIndex,  1, phiIndex1, phiIndex1Converted);
-
-                            if (!convStatus) {
-                                // conversion failed, message written in L1GtEtaPhiConversions
-                                return false;
-                            }
-                        }
-                            break;
-                        case HTM: {
-                            candHTM = m_gtPSB->getCandL1HTM();
-                            phiIndex1 = candHTM->phi();
-
-                            convStatus = m_gtEtaPhiConversions->convertPhiIndex(
-                                    objPairIndex,  1, phiIndex1, phiIndex1Converted);
-
-                            if (!convStatus) {
-                                // conversion failed, message written in L1GtEtaPhiConversions
-                                return false;
-                            }
-                        }
-                            break;
-                        default:
-                            // do nothing
-                            break;
-                    }
-                }
-                    break;
-                default: {
-                    // should not arrive here, there are no correlation conditions defined for this object
-                    return false;
-                }
-                    break;
-            }
-
-            if (m_verbosity && m_isDebugEnabled ) {
-                LogTrace("L1GlobalTrigger") << "    Correlation pair ["
-                        << l1GtObjectEnumToString(cndObjTypeVec[0]) << ", "
-                        << l1GtObjectEnumToString(cndObjTypeVec[1])
-                        << "] with collection indices [" << obj0Index << ", "
-                        << obj1Index << "] " << " has: \n      phi indices = ["
-                        << phiIndex0 << ", " << phiIndex1 << "] converted to ["
-                        << phiIndex0Converted << ", " << phiIndex1Converted
-                        << "] \n      eta indices [" << etaIndex0 << ", "
-                        << etaIndex1 << "] converted to ["
-                        << etaIndex0Converted << ", " << etaIndex1Converted
-                        << "] \n" << std::endl;
-            }
-
-            // the conversions were successful, need to evaluate requirements now
-
-            bool reqEtaPhiResult = false;
-
-            // evaluate candDeltaPhi requirements
-
-            unsigned int candDeltaPhi;
-
-            // calculate absolute value of candDeltaPhi
-            if (phiIndex0Converted > phiIndex1Converted) {
-                candDeltaPhi = phiIndex0Converted - phiIndex1Converted;
-            } else {
-                candDeltaPhi = phiIndex1Converted - phiIndex0Converted;
-            }
-
-            // check if candDeltaPhi > 180 (via delta_phi_maxbits)
-            // delta_phi contains bits for 0..180 (0 and 180 included)
-            // protect also against infinite loop...
-
-            int nMaxLoop = 10;
-            int iLoop = 0;
-
-            while (candDeltaPhi >= corrParDeltaPhiNrBins) {
-
-                unsigned int candDeltaPhiInitial = candDeltaPhi;
-
-                // candDeltaPhi > 180 ==> take 360 - candDeltaPhi
-                candDeltaPhi = (corrParDeltaPhiNrBins - 1) * 2 - candDeltaPhi;
-                if (m_verbosity) {
-                    LogTrace("L1GlobalTrigger")
-                            << "    Initial candDeltaPhi = "
-                            << candDeltaPhiInitial
-                            << " > corrParDeltaPhiNrBins = "
-                            << corrParDeltaPhiNrBins
-                            << "  ==> candDeltaPhi rescaled to: "
-                            << candDeltaPhi << " [ loop index " << iLoop
-                            << "; breaks after " << nMaxLoop << " loops ]\n"
-                            << std::endl;
-                }
-
-                iLoop++;
-                if (iLoop > nMaxLoop) {
-                    return false;
-                }
-            }
-
-
-            // template requirements already converted from string to 64-bit integers
-            // ...now check for each 64-bit integer against template requirements
-            bool indResult = true;
-
-            for (size_t iDeltaPhi = 0; iDeltaPhi < deltaPhiRangeConv.size(); ++iDeltaPhi) {
-                if (!checkBit(deltaPhiRangeConv[iDeltaPhi], candDeltaPhi)) {
-                    indResult = false;
-                }
-            }
-
-            if (!indResult) {
-
-                if (m_verbosity && m_isDebugEnabled ) {
-                    LogTrace("L1GlobalTrigger") << "      object delta phi = "
-                            << candDeltaPhi << " fails delta phi requirements."
-                            << "\n      Pair fails correlation condition.\n"
-                            << std::endl;
-                }
-
-                reqEtaPhiResult = false;
-                continue;
-
-            } else {
-                if (m_verbosity && m_isDebugEnabled ) {
-                    LogTrace("L1GlobalTrigger") << "      object delta phi = "
-                            << candDeltaPhi
-                            << " passes delta phi requirements."
-                            << std::endl;
-                }
-            }
-
-
-            // evaluate candDeltaEta requirements
-
-            unsigned int candDeltaEta;
-
-            // calculate absolute value of candDeltaEta
-            if (etaIndex0Converted > etaIndex1Converted) {
-                candDeltaEta = etaIndex0Converted - etaIndex1Converted;
-            } else {
-                candDeltaEta = etaIndex1Converted - etaIndex0Converted;
-            }
+      } break;
+      case CondEnergySum: {
+        switch (cndObjTypeVec[1]) {
+        case ETM: {
+          candETM = m_gtPSB->getCandL1ETM();
+          phiIndex1 = candETM->phi();
+
+          convStatus = m_gtEtaPhiConversions->convertPhiIndex(
+              objPairIndex, 1, phiIndex1, phiIndex1Converted);
+
+          if (!convStatus) {
+            // conversion failed, message written in L1GtEtaPhiConversions
+            return false;
+          }
+        } break;
+        case HTM: {
+          candHTM = m_gtPSB->getCandL1HTM();
+          phiIndex1 = candHTM->phi();
 
-            // template requirements already converted from string to 64-bit integers
-            // ...now check for each 64-bit integer against template requirements
-            indResult = true;
+          convStatus = m_gtEtaPhiConversions->convertPhiIndex(
+              objPairIndex, 1, phiIndex1, phiIndex1Converted);
 
-            for (size_t iDeltaEta = 0; iDeltaEta < deltaEtaRangeConv.size(); ++iDeltaEta) {
-                if (!checkBit(deltaEtaRangeConv[iDeltaEta], candDeltaEta)) {
-                    indResult = false;
-                }
-            }
+          if (!convStatus) {
+            // conversion failed, message written in L1GtEtaPhiConversions
+            return false;
+          }
+        } break;
+        default:
+          // do nothing
+          break;
+        }
+      } break;
+      default: {
+        // should not arrive here, there are no correlation conditions defined
+        // for this object
+        return false;
+      } break;
+      }
+
+      if (m_verbosity && m_isDebugEnabled) {
+        LogTrace("L1GlobalTrigger")
+            << "    Correlation pair ["
+            << l1GtObjectEnumToString(cndObjTypeVec[0]) << ", "
+            << l1GtObjectEnumToString(cndObjTypeVec[1])
+            << "] with collection indices [" << obj0Index << ", " << obj1Index
+            << "] "
+            << " has: \n      phi indices = [" << phiIndex0 << ", " << phiIndex1
+            << "] converted to [" << phiIndex0Converted << ", "
+            << phiIndex1Converted << "] \n      eta indices [" << etaIndex0
+            << ", " << etaIndex1 << "] converted to [" << etaIndex0Converted
+            << ", " << etaIndex1Converted << "] \n"
+            << std::endl;
+      }
+
+      // the conversions were successful, need to evaluate requirements now
+
+      bool reqEtaPhiResult = false;
+
+      // evaluate candDeltaPhi requirements
+
+      unsigned int candDeltaPhi;
+
+      // calculate absolute value of candDeltaPhi
+      if (phiIndex0Converted > phiIndex1Converted) {
+        candDeltaPhi = phiIndex0Converted - phiIndex1Converted;
+      } else {
+        candDeltaPhi = phiIndex1Converted - phiIndex0Converted;
+      }
+
+      // check if candDeltaPhi > 180 (via delta_phi_maxbits)
+      // delta_phi contains bits for 0..180 (0 and 180 included)
+      // protect also against infinite loop...
+
+      int nMaxLoop = 10;
+      int iLoop = 0;
+
+      while (candDeltaPhi >= corrParDeltaPhiNrBins) {
+
+        unsigned int candDeltaPhiInitial = candDeltaPhi;
+
+        // candDeltaPhi > 180 ==> take 360 - candDeltaPhi
+        candDeltaPhi = (corrParDeltaPhiNrBins - 1) * 2 - candDeltaPhi;
+        if (m_verbosity) {
+          LogTrace("L1GlobalTrigger")
+              << "    Initial candDeltaPhi = " << candDeltaPhiInitial
+              << " > corrParDeltaPhiNrBins = " << corrParDeltaPhiNrBins
+              << "  ==> candDeltaPhi rescaled to: " << candDeltaPhi
+              << " [ loop index " << iLoop << "; breaks after " << nMaxLoop
+              << " loops ]\n"
+              << std::endl;
+        }
 
-            if (!indResult) {
+        iLoop++;
+        if (iLoop > nMaxLoop) {
+          return false;
+        }
+      }
 
-                if (m_verbosity && m_isDebugEnabled ) {
-                    LogTrace("L1GlobalTrigger") << "      object delta eta = "
-                            << candDeltaEta << " fails delta eta requirements."
-                            << "\n      Pair fails correlation condition.\n"
-                            << std::endl;
-                }
+      // template requirements already converted from string to 64-bit integers
+      // ...now check for each 64-bit integer against template requirements
+      bool indResult = true;
 
-                reqEtaPhiResult = false;
-                continue;
+      for (size_t iDeltaPhi = 0; iDeltaPhi < deltaPhiRangeConv.size();
+           ++iDeltaPhi) {
+        if (!checkBit(deltaPhiRangeConv[iDeltaPhi], candDeltaPhi)) {
+          indResult = false;
+        }
+      }
 
-            } else {
-                if (m_verbosity && m_isDebugEnabled ) {
-                    LogTrace("L1GlobalTrigger") << "      object delta eta = "
-                            << candDeltaEta
-                            << " passes delta eta requirements."
-                            << "\n      Pair passes correlation condition.\n"
-                            << std::endl;
-                }
+      if (!indResult) {
 
-                reqEtaPhiResult = true;
+        if (m_verbosity && m_isDebugEnabled) {
+          LogTrace("L1GlobalTrigger")
+              << "      object delta phi = " << candDeltaPhi
+              << " fails delta phi requirements."
+              << "\n      Pair fails correlation condition.\n"
+              << std::endl;
+        }
 
-            }
+        reqEtaPhiResult = false;
+        continue;
 
+      } else {
+        if (m_verbosity && m_isDebugEnabled) {
+          LogTrace("L1GlobalTrigger")
+              << "      object delta phi = " << candDeltaPhi
+              << " passes delta phi requirements." << std::endl;
+        }
+      }
 
-            // clear the indices in the combination
-            objectsInComb.clear();
+      // evaluate candDeltaEta requirements
 
-            objectsInComb.push_back(obj0Index);
-            objectsInComb.push_back(obj1Index);
+      unsigned int candDeltaEta;
 
-            // if we get here all checks were successful for this combination
-            // set the general result for evaluateCondition to "true"
+      // calculate absolute value of candDeltaEta
+      if (etaIndex0Converted > etaIndex1Converted) {
+        candDeltaEta = etaIndex0Converted - etaIndex1Converted;
+      } else {
+        candDeltaEta = etaIndex1Converted - etaIndex0Converted;
+      }
 
-            if (reqEtaPhiResult) {
+      // template requirements already converted from string to 64-bit integers
+      // ...now check for each 64-bit integer against template requirements
+      indResult = true;
 
-                condResult = true;
-                (combinationsInCond()).push_back(objectsInComb);
+      for (size_t iDeltaEta = 0; iDeltaEta < deltaEtaRangeConv.size();
+           ++iDeltaEta) {
+        if (!checkBit(deltaEtaRangeConv[iDeltaEta], candDeltaEta)) {
+          indResult = false;
+        }
+      }
 
-            }
+      if (!indResult) {
 
+        if (m_verbosity && m_isDebugEnabled) {
+          LogTrace("L1GlobalTrigger")
+              << "      object delta eta = " << candDeltaEta
+              << " fails delta eta requirements."
+              << "\n      Pair fails correlation condition.\n"
+              << std::endl;
         }
 
-    }
+        reqEtaPhiResult = false;
+        continue;
 
-    if (m_verbosity && m_isDebugEnabled && condResult) {
-        LogTrace("L1GlobalTrigger") << (combinationsInCond()).size()
-                << " correlation pair(s) [" << l1GtObjectEnumToString(
-                cndObjTypeVec[0]) << ", " << l1GtObjectEnumToString(
-                cndObjTypeVec[1]) << "] pass(es) the correlation condition.\n"
-                << std::endl;
-    }
+      } else {
+        if (m_verbosity && m_isDebugEnabled) {
+          LogTrace("L1GlobalTrigger")
+              << "      object delta eta = " << candDeltaEta
+              << " passes delta eta requirements."
+              << "\n      Pair passes correlation condition.\n"
+              << std::endl;
+        }
 
-    return condResult;
+        reqEtaPhiResult = true;
+      }
 
-}
+      // clear the indices in the combination
+      objectsInComb.clear();
 
+      objectsInComb.push_back(obj0Index);
+      objectsInComb.push_back(obj1Index);
 
-void L1GtCorrelationCondition::print(std::ostream& myCout) const {
+      // if we get here all checks were successful for this combination
+      // set the general result for evaluateCondition to "true"
 
-    m_gtCorrelationTemplate->print(myCout);
-    L1GtConditionEvaluation::print(myCout);
+      if (reqEtaPhiResult) {
 
+        condResult = true;
+        (combinationsInCond()).push_back(objectsInComb);
+      }
+    }
+  }
+
+  if (m_verbosity && m_isDebugEnabled && condResult) {
+    LogTrace("L1GlobalTrigger")
+        << (combinationsInCond()).size() << " correlation pair(s) ["
+        << l1GtObjectEnumToString(cndObjTypeVec[0]) << ", "
+        << l1GtObjectEnumToString(cndObjTypeVec[1])
+        << "] pass(es) the correlation condition.\n"
+        << std::endl;
+  }
+
+  return condResult;
 }
 
+void L1GtCorrelationCondition::print(std::ostream &myCout) const {
+
+  m_gtCorrelationTemplate->print(myCout);
+  L1GtConditionEvaluation::print(myCout);
+}
diff --git a/L1Trigger/GlobalTrigger/src/L1GtEnergySumCondition.cc b/L1Trigger/GlobalTrigger/src/L1GtEnergySumCondition.cc
index 1914c2785fcb9..fa8fa561d5e0f 100644
--- a/L1Trigger/GlobalTrigger/src/L1GtEnergySumCondition.cc
+++ b/L1Trigger/GlobalTrigger/src/L1GtEnergySumCondition.cc
@@ -16,12 +16,12 @@
 #include "L1Trigger/GlobalTrigger/interface/L1GtEnergySumCondition.h"
 
 // system include files
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
+#include <algorithm>
 #include <string>
 #include <vector>
-#include <algorithm>
 
 // user include files
 //   base classes
@@ -37,252 +37,241 @@
 
 // constructors
 //     default
-L1GtEnergySumCondition::L1GtEnergySumCondition() :
-    L1GtConditionEvaluation() {
-
-    //empty
+L1GtEnergySumCondition::L1GtEnergySumCondition() : L1GtConditionEvaluation() {
 
+  // empty
 }
 
 //     from base template condition (from event setup usually)
-L1GtEnergySumCondition::L1GtEnergySumCondition(const L1GtCondition* eSumTemplate,
-    const L1GlobalTriggerPSB* ptrPSB) :
-    L1GtConditionEvaluation(),
-    m_gtEnergySumTemplate(static_cast<const L1GtEnergySumTemplate*>(eSumTemplate)),
-    m_gtPSB(ptrPSB)
+L1GtEnergySumCondition::L1GtEnergySumCondition(
+    const L1GtCondition *eSumTemplate, const L1GlobalTriggerPSB *ptrPSB)
+    : L1GtConditionEvaluation(),
+      m_gtEnergySumTemplate(
+          static_cast<const L1GtEnergySumTemplate *>(eSumTemplate)),
+      m_gtPSB(ptrPSB)
 
 {
 
-    // maximum number of objects received for the evaluation of the condition
-    // energy sums are global quantities - one object per event
-
-    m_condMaxNumberObjects = 1;
+  // maximum number of objects received for the evaluation of the condition
+  // energy sums are global quantities - one object per event
 
+  m_condMaxNumberObjects = 1;
 }
 
 // copy constructor
 void L1GtEnergySumCondition::copy(const L1GtEnergySumCondition &cp) {
 
-    m_gtEnergySumTemplate = cp.gtEnergySumTemplate();
-    m_gtPSB = cp.gtPSB();
-
-    m_condMaxNumberObjects = cp.condMaxNumberObjects();
-    m_condLastResult = cp.condLastResult();
-    m_combinationsInCond = cp.getCombinationsInCond();
+  m_gtEnergySumTemplate = cp.gtEnergySumTemplate();
+  m_gtPSB = cp.gtPSB();
 
-    m_verbosity = cp.m_verbosity;
+  m_condMaxNumberObjects = cp.condMaxNumberObjects();
+  m_condLastResult = cp.condLastResult();
+  m_combinationsInCond = cp.getCombinationsInCond();
 
+  m_verbosity = cp.m_verbosity;
 }
 
-L1GtEnergySumCondition::L1GtEnergySumCondition(const L1GtEnergySumCondition& cp) :
-    L1GtConditionEvaluation() {
-
-    copy(cp);
+L1GtEnergySumCondition::L1GtEnergySumCondition(const L1GtEnergySumCondition &cp)
+    : L1GtConditionEvaluation() {
 
+  copy(cp);
 }
 
 // destructor
 L1GtEnergySumCondition::~L1GtEnergySumCondition() {
 
-    // empty
-
+  // empty
 }
 
 // equal operator
-L1GtEnergySumCondition& L1GtEnergySumCondition::operator= (const L1GtEnergySumCondition& cp)
-{
-    copy(cp);
-    return *this;
+L1GtEnergySumCondition &L1GtEnergySumCondition::
+operator=(const L1GtEnergySumCondition &cp) {
+  copy(cp);
+  return *this;
 }
 
 // methods
 void L1GtEnergySumCondition::setGtEnergySumTemplate(
-    const L1GtEnergySumTemplate* eSumTempl) {
-
-    m_gtEnergySumTemplate = eSumTempl;
+    const L1GtEnergySumTemplate *eSumTempl) {
 
+  m_gtEnergySumTemplate = eSumTempl;
 }
 
 ///   set the pointer to PSB
-void L1GtEnergySumCondition::setGtPSB(const L1GlobalTriggerPSB* ptrPSB) {
-
-    m_gtPSB = ptrPSB;
+void L1GtEnergySumCondition::setGtPSB(const L1GlobalTriggerPSB *ptrPSB) {
 
+  m_gtPSB = ptrPSB;
 }
 
 // try all object permutations and check spatial correlations, if required
 const bool L1GtEnergySumCondition::evaluateCondition() const {
 
-    // number of trigger objects in the condition
-    // in fact, there is only one object
-    int iCondition = 0;
+  // number of trigger objects in the condition
+  // in fact, there is only one object
+  int iCondition = 0;
 
-    // condition result condResult set to true if the energy sum
-    // passes all requirements
-    bool condResult = false;
+  // condition result condResult set to true if the energy sum
+  // passes all requirements
+  bool condResult = false;
 
-    // store the indices of the calorimeter objects
-    // from the combination evaluated in the condition
-    SingleCombInCond objectsInComb;
+  // store the indices of the calorimeter objects
+  // from the combination evaluated in the condition
+  SingleCombInCond objectsInComb;
 
-    // clear the m_combinationsInCond vector
-    (combinationsInCond()).clear();
+  // clear the m_combinationsInCond vector
+  (combinationsInCond()).clear();
 
-    // clear the indices in the combination
-    objectsInComb.clear();
+  // clear the indices in the combination
+  objectsInComb.clear();
 
-    // get energy, phi (ETM and HTM) and overflow for the trigger object
+  // get energy, phi (ETM and HTM) and overflow for the trigger object
 
-    unsigned int candEt = 0;
-    unsigned int candPhi = 0;
-    bool candOverflow = false;
+  unsigned int candEt = 0;
+  unsigned int candPhi = 0;
+  bool candOverflow = false;
 
-    switch ((m_gtEnergySumTemplate->objectType())[0]) {
-        case ETT: {
-            const L1GctEtTotal* cand1 = m_gtPSB->getCandL1ETT();
+  switch ((m_gtEnergySumTemplate->objectType())[0]) {
+  case ETT: {
+    const L1GctEtTotal *cand1 = m_gtPSB->getCandL1ETT();
 
-            if (cand1 == nullptr) {
-                return false;
-            }
+    if (cand1 == nullptr) {
+      return false;
+    }
 
-            candEt = cand1->et();
-            candOverflow = cand1->overFlow();
+    candEt = cand1->et();
+    candOverflow = cand1->overFlow();
 
-            break;
-        }
-        case ETM: {
-            const L1GctEtMiss* cand2 = m_gtPSB->getCandL1ETM();
+    break;
+  }
+  case ETM: {
+    const L1GctEtMiss *cand2 = m_gtPSB->getCandL1ETM();
 
-            if (cand2 == nullptr) {
-                return false;
-            }
+    if (cand2 == nullptr) {
+      return false;
+    }
 
-            candEt = cand2->et();
-            candPhi = cand2->phi();
-            candOverflow = cand2->overFlow();
+    candEt = cand2->et();
+    candPhi = cand2->phi();
+    candOverflow = cand2->overFlow();
 
-            break;
-        }
-        case HTT: {
-            const L1GctEtHad* cand3 = m_gtPSB->getCandL1HTT();
+    break;
+  }
+  case HTT: {
+    const L1GctEtHad *cand3 = m_gtPSB->getCandL1HTT();
+
+    if (cand3 == nullptr) {
+      return false;
+    }
 
-            if (cand3 == nullptr) {
-                return false;
-            }
+    candEt = cand3->et();
+    candOverflow = cand3->overFlow();
 
-            candEt = cand3->et();
-            candOverflow = cand3->overFlow();
+    break;
+  }
+  case HTM: {
+    const L1GctHtMiss *cand4 = m_gtPSB->getCandL1HTM();
 
-            break;
-        }
-        case HTM: {
-            const L1GctHtMiss* cand4 = m_gtPSB->getCandL1HTM();
+    if (cand4 == nullptr) {
+      return false;
+    }
 
-            if (cand4 == nullptr) {
-                return false;
-            }
+    candEt = cand4->et();
+    candPhi = cand4->phi();
+    candOverflow = cand4->overFlow();
 
-            candEt = cand4->et();
-            candPhi = cand4->phi();
-            candOverflow = cand4->overFlow();
+    break;
+  }
+  default: {
+    // should not arrive here
+    return false;
 
-            break;
-        }
-        default: {
-            // should not arrive here
-            return false;
+    break;
+  }
+  }
 
-            break;
-        }
-    }
+  const L1GtEnergySumTemplate::ObjectParameter objPar =
+      (*(m_gtEnergySumTemplate->objectParameter()))[iCondition];
 
-    const L1GtEnergySumTemplate::ObjectParameter objPar =
-        ( *(m_gtEnergySumTemplate->objectParameter()) )[iCondition];
-
-    // check energy threshold and overflow
-    // overflow evaluation:
-    //     for condGEq >=
-    //         candidate overflow true -> condition true
-    //         candidate overflow false -> evaluate threshold
-    //     for condGEq =
-    //         candidate overflow true -> condition false
-    //         candidate overflow false -> evaluate threshold
-    //
-
-    bool condGEqVal = m_gtEnergySumTemplate->condGEq();
-
-    if (condGEqVal) {
-        if (!candOverflow) {
-            if (!checkThreshold(objPar.etThreshold, candEt, condGEqVal)) {
-                return false;
-            }
-        }
-    } else {
-        if (candOverflow) {
-            return false;
-        } else {
-            if (!checkThreshold(objPar.etThreshold, candEt, condGEqVal)) {
-                return false;
-            }
-        }
+  // check energy threshold and overflow
+  // overflow evaluation:
+  //     for condGEq >=
+  //         candidate overflow true -> condition true
+  //         candidate overflow false -> evaluate threshold
+  //     for condGEq =
+  //         candidate overflow true -> condition false
+  //         candidate overflow false -> evaluate threshold
+  //
+
+  bool condGEqVal = m_gtEnergySumTemplate->condGEq();
 
+  if (condGEqVal) {
+    if (!candOverflow) {
+      if (!checkThreshold(objPar.etThreshold, candEt, condGEqVal)) {
+        return false;
+      }
     }
+  } else {
+    if (candOverflow) {
+      return false;
+    } else {
+      if (!checkThreshold(objPar.etThreshold, candEt, condGEqVal)) {
+        return false;
+      }
+    }
+  }
 
-    // for ETM and HTM check phi also
-    // for overflow, the phi requirements are ignored
+  // for ETM and HTM check phi also
+  // for overflow, the phi requirements are ignored
 
-    if (!candOverflow) {
-        if ( ( m_gtEnergySumTemplate->objectType() )[0] == ETM) {
+  if (!candOverflow) {
+    if ((m_gtEnergySumTemplate->objectType())[0] == ETM) {
 
-            // phi bitmask is saved in two uint64_t (see parser)
-            if (candPhi < 64) {
-                if (!checkBit(objPar.phiRange0Word, candPhi)) {
+      // phi bitmask is saved in two uint64_t (see parser)
+      if (candPhi < 64) {
+        if (!checkBit(objPar.phiRange0Word, candPhi)) {
 
-                    return false;
-                }
-            } else {
-                if (!checkBit(objPar.phiRange1Word, candPhi - 64)) {
+          return false;
+        }
+      } else {
+        if (!checkBit(objPar.phiRange1Word, candPhi - 64)) {
 
-                    return false;
-                }
-            }
+          return false;
+        }
+      }
 
-        } else if ( ( m_gtEnergySumTemplate->objectType() )[0] == HTM) {
+    } else if ((m_gtEnergySumTemplate->objectType())[0] == HTM) {
 
-            // phi bitmask is in the first word for HTM
-            if (candPhi < 64) {
-                if (!checkBit(objPar.phiRange0Word, candPhi)) {
+      // phi bitmask is in the first word for HTM
+      if (candPhi < 64) {
+        if (!checkBit(objPar.phiRange0Word, candPhi)) {
 
-                    return false;
-                }
-            } else {
-                if (!checkBit(objPar.phiRange1Word, candPhi - 64)) {
+          return false;
+        }
+      } else {
+        if (!checkBit(objPar.phiRange1Word, candPhi - 64)) {
 
-                    return false;
-                }
-            }
+          return false;
         }
+      }
     }
+  }
 
+  // index is always zero, as they are global quantities (there is only one
+  // object)
+  int indexObj = 0;
 
-    // index is always zero, as they are global quantities (there is only one object)
-    int indexObj = 0;
+  objectsInComb.push_back(indexObj);
+  (combinationsInCond()).push_back(objectsInComb);
 
-    objectsInComb.push_back(indexObj);
-    (combinationsInCond()).push_back(objectsInComb);
-
-    // if we get here all checks were successfull for this combination
-    // set the general result for evaluateCondition to "true"
-
-    condResult = true;
-    return condResult;
+  // if we get here all checks were successfull for this combination
+  // set the general result for evaluateCondition to "true"
 
+  condResult = true;
+  return condResult;
 }
 
-void L1GtEnergySumCondition::print(std::ostream& myCout) const {
-
-    m_gtEnergySumTemplate->print(myCout);
-    L1GtConditionEvaluation::print(myCout);
+void L1GtEnergySumCondition::print(std::ostream &myCout) const {
 
+  m_gtEnergySumTemplate->print(myCout);
+  L1GtConditionEvaluation::print(myCout);
 }
-
diff --git a/L1Trigger/GlobalTrigger/src/L1GtEtaPhiConversions.cc b/L1Trigger/GlobalTrigger/src/L1GtEtaPhiConversions.cc
index 9b30c7f5e129b..eba2798a2d9ad 100644
--- a/L1Trigger/GlobalTrigger/src/L1GtEtaPhiConversions.cc
+++ b/L1Trigger/GlobalTrigger/src/L1GtEtaPhiConversions.cc
@@ -1,14 +1,14 @@
 /**
  * \class L1GtEtaPhiConversions
- * 
- * 
+ *
+ *
  * Description: convert eta and phi between various L1 trigger objects.
- * 
+ *
  * Implementation:
  *    <TODO: enter implementation details>
- *   
- * \author: Vasile Mihai Ghete   - HEPHY Vienna 
- * 
+ *
+ * \author: Vasile Mihai Ghete   - HEPHY Vienna
+ *
  *
  */
 
@@ -16,8 +16,8 @@
 #include "L1Trigger/GlobalTrigger/interface/L1GtEtaPhiConversions.h"
 
 // system include files
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
 // user include files
 
@@ -26,1896 +26,1822 @@
 //
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerObjectMapFwd.h"
 
-#include "CondFormats/L1TObjects/interface/L1MuTriggerScales.h"
 #include "CondFormats/L1TObjects/interface/L1CaloGeometry.h"
+#include "CondFormats/L1TObjects/interface/L1MuTriggerScales.h"
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/MessageLogger/interface/MessageDrop.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "FWCore/Utilities/interface/Exception.h"
 
 // constructor
-L1GtEtaPhiConversions::L1GtEtaPhiConversions() :
-    m_nrBinsPhiMu(0), m_nrBinsPhiJetEg(0), m_nrBinsPhiEtm(0),
-            m_nrBinsPhiHtm(0), m_nrBinsEtaCommon(0), m_verbosity(0),
-            m_isDebugEnabled(edm::isDebugEnabled()) {
-
-    // prepare the pairs of L1GtObjects, reserve (by hand) memory for vectors
-    // the index of the pair in m_gtObjectPairVec is used to extract
-    // the information from the other vectors, so the push_back must be done
-    // coherently
-
-    std::pair < L1GtObject, L1GtObject > gtObjPair;
-    m_gtObjectPairVec.reserve(56);
-    m_pairConvertPhiFirstGtObject.reserve(56);
-    m_pairNrPhiBinsVec.reserve(56);
-    m_pairPhiConvVec.reserve(56);
-
-
-    // Mu -> Jet & EG & ETM & HTM
-    //
-    gtObjPair = std::make_pair(Mu, CenJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
-
-    gtObjPair = std::make_pair(CenJet, Mu);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
-
-    //
-    gtObjPair = std::make_pair(Mu, ForJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
-
-    gtObjPair = std::make_pair(ForJet, Mu);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
-
-    //
-    gtObjPair = std::make_pair(Mu, TauJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
-
-    gtObjPair = std::make_pair(TauJet, Mu);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
-
-    //
-    gtObjPair = std::make_pair(Mu, NoIsoEG);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
-
-    gtObjPair = std::make_pair(NoIsoEG, Mu);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
-
-    //
-    gtObjPair = std::make_pair(Mu, IsoEG);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
-
-    gtObjPair = std::make_pair(IsoEG, Mu);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
-
-    //
-    gtObjPair = std::make_pair(Mu, ETM);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiEtm);
-    m_pairPhiConvVec.push_back(&m_lutPhiMuToEtm);
-
-    gtObjPair = std::make_pair(ETM, Mu);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiEtm);
-    m_pairPhiConvVec.push_back(&m_lutPhiMuToEtm);
-
-    //
-    gtObjPair = std::make_pair(Mu, HTM);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiHtm);
-    m_pairPhiConvVec.push_back(&m_lutPhiMuToHtm);
-
-    gtObjPair = std::make_pair(HTM, Mu);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiHtm);
-    m_pairPhiConvVec.push_back(&m_lutPhiMuToHtm);
-
-    // ETM -> Jet & EG
-    //
-    gtObjPair = std::make_pair(ETM, CenJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
-
-    gtObjPair = std::make_pair(CenJet, ETM);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
-
-    //
-    gtObjPair = std::make_pair(ETM, ForJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
-
-    gtObjPair = std::make_pair(ForJet, ETM);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
-
-    //
-    gtObjPair = std::make_pair(ETM, TauJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
-
-    gtObjPair = std::make_pair(TauJet, ETM);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
-
-    //
-    gtObjPair = std::make_pair(ETM, NoIsoEG);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
-
-    gtObjPair = std::make_pair(NoIsoEG, ETM);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
-
-    //
-    gtObjPair = std::make_pair(ETM, IsoEG);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
-
-    gtObjPair = std::make_pair(IsoEG, ETM);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
-
-    // HTM -> Jet & EG
-    //
-    gtObjPair = std::make_pair(HTM, CenJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
-
-    gtObjPair = std::make_pair(CenJet, HTM);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
-
-    //
-    gtObjPair = std::make_pair(HTM, ForJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
-
-    gtObjPair = std::make_pair(ForJet, HTM);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
-
-    //
-    gtObjPair = std::make_pair(HTM, TauJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
-
-    gtObjPair = std::make_pair(TauJet, HTM);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
-
-    //
-    gtObjPair = std::make_pair(HTM, NoIsoEG);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
-
-    gtObjPair = std::make_pair(NoIsoEG, HTM);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
-
-    //
-    gtObjPair = std::make_pair(HTM, IsoEG);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
-
-    gtObjPair = std::make_pair(IsoEG, HTM);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
-
-
-    // ETM -> HTM
-    //
-    gtObjPair = std::make_pair(ETM, HTM);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiHtm);
-    m_pairPhiConvVec.push_back(&m_lutPhiEtmToHtm);
-
-    gtObjPair = std::make_pair(HTM, ETM);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiHtm);
-    m_pairPhiConvVec.push_back(&m_lutPhiEtmToHtm);
-
-
-    // Jet & EG -> Jet & EG
-    //
-    gtObjPair = std::make_pair(CenJet, ForJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    gtObjPair = std::make_pair(ForJet, CenJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    //
-    gtObjPair = std::make_pair(CenJet, TauJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    gtObjPair = std::make_pair(TauJet, CenJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    //
-    gtObjPair = std::make_pair(CenJet, NoIsoEG);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    gtObjPair = std::make_pair(NoIsoEG, CenJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    //
-    gtObjPair = std::make_pair(CenJet, IsoEG);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    gtObjPair = std::make_pair(IsoEG, CenJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    //
-    gtObjPair = std::make_pair(ForJet, TauJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    gtObjPair = std::make_pair(TauJet, ForJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    //
-    gtObjPair = std::make_pair(ForJet, NoIsoEG);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    gtObjPair = std::make_pair(NoIsoEG, ForJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    //
-    gtObjPair = std::make_pair(ForJet, IsoEG);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    gtObjPair = std::make_pair(IsoEG, ForJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    //
-    gtObjPair = std::make_pair(TauJet, NoIsoEG);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    gtObjPair = std::make_pair(NoIsoEG, TauJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    //
-    gtObjPair = std::make_pair(TauJet, IsoEG);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    gtObjPair = std::make_pair(IsoEG, TauJet);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    //
-    gtObjPair = std::make_pair(NoIsoEG, IsoEG);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(true);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    gtObjPair = std::make_pair(IsoEG, NoIsoEG);
-    m_gtObjectPairVec.push_back(gtObjPair);
-    m_pairConvertPhiFirstGtObject.push_back(false);
-    m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
-    m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
-
-    // m_verbosity can not be used here, as L1GtEtaPhiConversions is called
-    // in L1GlobalTriggerGTL constructor,  where m_verbosity is not yet set
-    if (m_isDebugEnabled) {
-        LogTrace("L1GlobalTrigger") << "\nm_gtObjectPairVec size: "
-                << (m_gtObjectPairVec.size()) << std::endl;
-
-        unsigned int iPair = 0;
-
-        for (std::vector<std::pair<L1GtObject, L1GtObject> >::const_iterator
-                cIter = m_gtObjectPairVec.begin();
-                cIter != m_gtObjectPairVec.end(); ++cIter) {
-            LogTrace("L1GlobalTrigger") << "m_gtObjectPairVec vector element ["
-                    << l1GtObjectEnumToString((*cIter).first) << ", "
-                    << l1GtObjectEnumToString((*cIter).second)
-                    << "], \t\tpair index =  " << iPair << std::endl;
-
-            iPair++;
+L1GtEtaPhiConversions::L1GtEtaPhiConversions()
+    : m_nrBinsPhiMu(0), m_nrBinsPhiJetEg(0), m_nrBinsPhiEtm(0),
+      m_nrBinsPhiHtm(0), m_nrBinsEtaCommon(0), m_verbosity(0),
+      m_isDebugEnabled(edm::isDebugEnabled()) {
+
+  // prepare the pairs of L1GtObjects, reserve (by hand) memory for vectors
+  // the index of the pair in m_gtObjectPairVec is used to extract
+  // the information from the other vectors, so the push_back must be done
+  // coherently
+
+  std::pair<L1GtObject, L1GtObject> gtObjPair;
+  m_gtObjectPairVec.reserve(56);
+  m_pairConvertPhiFirstGtObject.reserve(56);
+  m_pairNrPhiBinsVec.reserve(56);
+  m_pairPhiConvVec.reserve(56);
+
+  // Mu -> Jet & EG & ETM & HTM
+  //
+  gtObjPair = std::make_pair(Mu, CenJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
+
+  gtObjPair = std::make_pair(CenJet, Mu);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
+
+  //
+  gtObjPair = std::make_pair(Mu, ForJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
+
+  gtObjPair = std::make_pair(ForJet, Mu);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
+
+  //
+  gtObjPair = std::make_pair(Mu, TauJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
+
+  gtObjPair = std::make_pair(TauJet, Mu);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
+
+  //
+  gtObjPair = std::make_pair(Mu, NoIsoEG);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
+
+  gtObjPair = std::make_pair(NoIsoEG, Mu);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
+
+  //
+  gtObjPair = std::make_pair(Mu, IsoEG);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
+
+  gtObjPair = std::make_pair(IsoEG, Mu);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiMuToJetEg);
+
+  //
+  gtObjPair = std::make_pair(Mu, ETM);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiEtm);
+  m_pairPhiConvVec.push_back(&m_lutPhiMuToEtm);
+
+  gtObjPair = std::make_pair(ETM, Mu);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiEtm);
+  m_pairPhiConvVec.push_back(&m_lutPhiMuToEtm);
+
+  //
+  gtObjPair = std::make_pair(Mu, HTM);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiHtm);
+  m_pairPhiConvVec.push_back(&m_lutPhiMuToHtm);
+
+  gtObjPair = std::make_pair(HTM, Mu);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiHtm);
+  m_pairPhiConvVec.push_back(&m_lutPhiMuToHtm);
+
+  // ETM -> Jet & EG
+  //
+  gtObjPair = std::make_pair(ETM, CenJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
+
+  gtObjPair = std::make_pair(CenJet, ETM);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
+
+  //
+  gtObjPair = std::make_pair(ETM, ForJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
+
+  gtObjPair = std::make_pair(ForJet, ETM);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
+
+  //
+  gtObjPair = std::make_pair(ETM, TauJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
+
+  gtObjPair = std::make_pair(TauJet, ETM);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
+
+  //
+  gtObjPair = std::make_pair(ETM, NoIsoEG);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
+
+  gtObjPair = std::make_pair(NoIsoEG, ETM);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
+
+  //
+  gtObjPair = std::make_pair(ETM, IsoEG);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
+
+  gtObjPair = std::make_pair(IsoEG, ETM);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiEtmToJetEg);
+
+  // HTM -> Jet & EG
+  //
+  gtObjPair = std::make_pair(HTM, CenJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
+
+  gtObjPair = std::make_pair(CenJet, HTM);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
+
+  //
+  gtObjPair = std::make_pair(HTM, ForJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
+
+  gtObjPair = std::make_pair(ForJet, HTM);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
+
+  //
+  gtObjPair = std::make_pair(HTM, TauJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
+
+  gtObjPair = std::make_pair(TauJet, HTM);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
+
+  //
+  gtObjPair = std::make_pair(HTM, NoIsoEG);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
+
+  gtObjPair = std::make_pair(NoIsoEG, HTM);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
+
+  //
+  gtObjPair = std::make_pair(HTM, IsoEG);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
+
+  gtObjPair = std::make_pair(IsoEG, HTM);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiHtmToJetEg);
+
+  // ETM -> HTM
+  //
+  gtObjPair = std::make_pair(ETM, HTM);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiHtm);
+  m_pairPhiConvVec.push_back(&m_lutPhiEtmToHtm);
+
+  gtObjPair = std::make_pair(HTM, ETM);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiHtm);
+  m_pairPhiConvVec.push_back(&m_lutPhiEtmToHtm);
+
+  // Jet & EG -> Jet & EG
+  //
+  gtObjPair = std::make_pair(CenJet, ForJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  gtObjPair = std::make_pair(ForJet, CenJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  //
+  gtObjPair = std::make_pair(CenJet, TauJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  gtObjPair = std::make_pair(TauJet, CenJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  //
+  gtObjPair = std::make_pair(CenJet, NoIsoEG);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  gtObjPair = std::make_pair(NoIsoEG, CenJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  //
+  gtObjPair = std::make_pair(CenJet, IsoEG);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  gtObjPair = std::make_pair(IsoEG, CenJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  //
+  gtObjPair = std::make_pair(ForJet, TauJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  gtObjPair = std::make_pair(TauJet, ForJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  //
+  gtObjPair = std::make_pair(ForJet, NoIsoEG);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  gtObjPair = std::make_pair(NoIsoEG, ForJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  //
+  gtObjPair = std::make_pair(ForJet, IsoEG);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  gtObjPair = std::make_pair(IsoEG, ForJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  //
+  gtObjPair = std::make_pair(TauJet, NoIsoEG);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  gtObjPair = std::make_pair(NoIsoEG, TauJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  //
+  gtObjPair = std::make_pair(TauJet, IsoEG);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  gtObjPair = std::make_pair(IsoEG, TauJet);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  //
+  gtObjPair = std::make_pair(NoIsoEG, IsoEG);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(true);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  gtObjPair = std::make_pair(IsoEG, NoIsoEG);
+  m_gtObjectPairVec.push_back(gtObjPair);
+  m_pairConvertPhiFirstGtObject.push_back(false);
+  m_pairNrPhiBinsVec.push_back(&m_nrBinsPhiJetEg);
+  m_pairPhiConvVec.push_back(&m_lutPhiJetEgToJetEg);
+
+  // m_verbosity can not be used here, as L1GtEtaPhiConversions is called
+  // in L1GlobalTriggerGTL constructor,  where m_verbosity is not yet set
+  if (m_isDebugEnabled) {
+    LogTrace("L1GlobalTrigger")
+        << "\nm_gtObjectPairVec size: " << (m_gtObjectPairVec.size())
+        << std::endl;
 
-        }
-    }
+    unsigned int iPair = 0;
+
+    for (std::vector<std::pair<L1GtObject, L1GtObject>>::const_iterator cIter =
+             m_gtObjectPairVec.begin();
+         cIter != m_gtObjectPairVec.end(); ++cIter) {
+      LogTrace("L1GlobalTrigger")
+          << "m_gtObjectPairVec vector element ["
+          << l1GtObjectEnumToString((*cIter).first) << ", "
+          << l1GtObjectEnumToString((*cIter).second)
+          << "], \t\tpair index =  " << iPair << std::endl;
 
+      iPair++;
+    }
+  }
 }
 
 // destructor
 L1GtEtaPhiConversions::~L1GtEtaPhiConversions() {
 
-    // do nothing
-
+  // do nothing
 }
 
 // methods
 
-const unsigned int L1GtEtaPhiConversions::gtObjectPairIndex(
-        const L1GtObject& obj0, const L1GtObject& obj1) const {
+const unsigned int
+L1GtEtaPhiConversions::gtObjectPairIndex(const L1GtObject &obj0,
+                                         const L1GtObject &obj1) const {
 
-    std::pair < L1GtObject, L1GtObject > gtObjPair;
-    gtObjPair = std::make_pair(obj0, obj1);
+  std::pair<L1GtObject, L1GtObject> gtObjPair;
+  gtObjPair = std::make_pair(obj0, obj1);
 
-    //LogTrace("L1GlobalTrigger") << "\nCompute index for pair ["
-    //        << (l1GtObjectEnumToString(obj0)) << ", "
-    //        << (l1GtObjectEnumToString(obj1)) << "]\n" << std::endl;
+  // LogTrace("L1GlobalTrigger") << "\nCompute index for pair ["
+  //        << (l1GtObjectEnumToString(obj0)) << ", "
+  //        << (l1GtObjectEnumToString(obj1)) << "]\n" << std::endl;
 
-    unsigned int iPair = 0;
-    for (std::vector<std::pair<L1GtObject, L1GtObject> >::const_iterator cIter =
-            m_gtObjectPairVec.begin(); cIter != m_gtObjectPairVec.end(); ++cIter) {
-
-        if (*cIter == gtObjPair) {
-            LogTrace("L1GlobalTrigger") << "\n  Index for pair ["
-                    << l1GtObjectEnumToString(obj0) << ", "
-                    << l1GtObjectEnumToString(obj1) << "] = "
-                    << iPair << std::endl;
+  unsigned int iPair = 0;
+  for (std::vector<std::pair<L1GtObject, L1GtObject>>::const_iterator cIter =
+           m_gtObjectPairVec.begin();
+       cIter != m_gtObjectPairVec.end(); ++cIter) {
 
-            return iPair;
-        }
+    if (*cIter == gtObjPair) {
+      LogTrace("L1GlobalTrigger")
+          << "\n  Index for pair [" << l1GtObjectEnumToString(obj0) << ", "
+          << l1GtObjectEnumToString(obj1) << "] = " << iPair << std::endl;
 
-        iPair++;
+      return iPair;
     }
 
-    // if the pair was not found, return index outside vector size
-    // it should never happen, except due to programming error
-    // by using .at one gets an exception when using index outside vector size,
-    // due to the programming error...
-    return m_gtObjectPairVec.size();
+    iPair++;
+  }
+
+  // if the pair was not found, return index outside vector size
+  // it should never happen, except due to programming error
+  // by using .at one gets an exception when using index outside vector size,
+  // due to the programming error...
+  return m_gtObjectPairVec.size();
 }
 
-const bool L1GtEtaPhiConversions::convertPhiIndex(const unsigned int pairIndex,
-        const unsigned int positionPair, const unsigned int initialIndex,
-        unsigned int& convertedIndex) const {
+const bool L1GtEtaPhiConversions::convertPhiIndex(
+    const unsigned int pairIndex, const unsigned int positionPair,
+    const unsigned int initialIndex, unsigned int &convertedIndex) const {
 
-    unsigned int newIndex = badIndex;
-    bool conversionStatus = false;
+  unsigned int newIndex = badIndex;
+  bool conversionStatus = false;
 
-    // check if initial index is within the scale size
-    // could be outside the scale size if there are hardware errors
-    // or wrong scale conversions
-    if (initialIndex >= (*(m_pairPhiConvVec.at(pairIndex))).size()) {
+  // check if initial index is within the scale size
+  // could be outside the scale size if there are hardware errors
+  // or wrong scale conversions
+  if (initialIndex >= (*(m_pairPhiConvVec.at(pairIndex))).size()) {
 
-        conversionStatus = false;
-
-        if (m_verbosity && m_isDebugEnabled) {
-            LogTrace("L1GlobalTrigger") << (positionPair ? "    Second"
-                    : "\n  First") << " object from pair " << pairIndex
-                    << ": initial phi index " << initialIndex << " >= "
-                    << ((*(m_pairPhiConvVec.at(pairIndex))).size())
-                    << " Conversion failed." << std::endl;
-        }
-    } else {
-        if (m_verbosity && m_isDebugEnabled) {
-            LogTrace("L1GlobalTrigger") << (positionPair ? "    Second"
-                    : "\n  First") << " object from pair " << pairIndex
-                    << ": initial phi index " << initialIndex
-                    << " within scale size " <<
-                    ((*(m_pairPhiConvVec.at(pairIndex))).size())
-                    << std::endl;
-        }
+    conversionStatus = false;
 
+    if (m_verbosity && m_isDebugEnabled) {
+      LogTrace("L1GlobalTrigger")
+          << (positionPair ? "    Second" : "\n  First") << " object from pair "
+          << pairIndex << ": initial phi index " << initialIndex
+          << " >= " << ((*(m_pairPhiConvVec.at(pairIndex))).size())
+          << " Conversion failed." << std::endl;
+    }
+  } else {
+    if (m_verbosity && m_isDebugEnabled) {
+      LogTrace("L1GlobalTrigger")
+          << (positionPair ? "    Second" : "\n  First") << " object from pair "
+          << pairIndex << ": initial phi index " << initialIndex
+          << " within scale size "
+          << ((*(m_pairPhiConvVec.at(pairIndex))).size()) << std::endl;
     }
+  }
 
-    // convert the index
-    switch (positionPair) {
-        case 0: {
-            if (m_pairConvertPhiFirstGtObject.at(pairIndex)) {
-
-                newIndex = (*(m_pairPhiConvVec.at(pairIndex))).at(initialIndex);
-
-                if (newIndex != badIndex) {
-
-                    conversionStatus = true;
-
-                    if (m_verbosity && m_isDebugEnabled) {
-                        LogTrace("L1GlobalTrigger")
-                                << (positionPair ? "    Second" : "\n  First")
-                                << " object from pair " << pairIndex
-                                << ": initial phi index " << initialIndex
-                                << " converted to " << newIndex << std::endl;
-                    }
-
-                } else {
-
-                    conversionStatus = false;
-
-                    if (m_verbosity && m_isDebugEnabled) {
-                        LogTrace("L1GlobalTrigger")
-                                << (positionPair ? "    Second" : "\n  First")
-                                << " object from pair " << pairIndex
-                                << ": converted phi index " << newIndex
-                                << "is equal to badIndex " << badIndex
-                                << " Conversion failed." << std::endl;
-                    }
-                }
-
-            } else {
-                newIndex = initialIndex;
-                conversionStatus = true;
-
-                if (m_verbosity && m_isDebugEnabled) {
-                    LogTrace("L1GlobalTrigger") << (positionPair ? "    Second"
-                            : "\n  First") << " object from pair " << pairIndex
-                            << ": initial phi index " << initialIndex
-                            << " not requested to be converted, return index "
-                            << newIndex << std::endl;
-                }
-            }
+  // convert the index
+  switch (positionPair) {
+  case 0: {
+    if (m_pairConvertPhiFirstGtObject.at(pairIndex)) {
+
+      newIndex = (*(m_pairPhiConvVec.at(pairIndex))).at(initialIndex);
+
+      if (newIndex != badIndex) {
+
+        conversionStatus = true;
+
+        if (m_verbosity && m_isDebugEnabled) {
+          LogTrace("L1GlobalTrigger")
+              << (positionPair ? "    Second" : "\n  First")
+              << " object from pair " << pairIndex << ": initial phi index "
+              << initialIndex << " converted to " << newIndex << std::endl;
         }
 
-            break;
-        case 1: {
-            if (m_pairConvertPhiFirstGtObject.at(pairIndex)) {
+      } else {
 
-                newIndex = initialIndex;
-                conversionStatus = true;
+        conversionStatus = false;
 
-                if (m_verbosity && m_isDebugEnabled) {
-                    LogTrace("L1GlobalTrigger") << (positionPair ? "    Second"
-                            : "\n  First") << " object from pair " << pairIndex
-                            << ": initial phi index " << initialIndex
-                            << " not requested to be converted, return index, return index "
-                            << newIndex << std::endl;
-                }
-            } else {
+        if (m_verbosity && m_isDebugEnabled) {
+          LogTrace("L1GlobalTrigger")
+              << (positionPair ? "    Second" : "\n  First")
+              << " object from pair " << pairIndex << ": converted phi index "
+              << newIndex << "is equal to badIndex " << badIndex
+              << " Conversion failed." << std::endl;
+        }
+      }
 
-                newIndex = (*(m_pairPhiConvVec.at(pairIndex))).at(initialIndex);
+    } else {
+      newIndex = initialIndex;
+      conversionStatus = true;
 
-                if (newIndex != badIndex) {
+      if (m_verbosity && m_isDebugEnabled) {
+        LogTrace("L1GlobalTrigger")
+            << (positionPair ? "    Second" : "\n  First")
+            << " object from pair " << pairIndex << ": initial phi index "
+            << initialIndex << " not requested to be converted, return index "
+            << newIndex << std::endl;
+      }
+    }
+  }
 
-                    conversionStatus = true;
+  break;
+  case 1: {
+    if (m_pairConvertPhiFirstGtObject.at(pairIndex)) {
 
-                    if (m_verbosity && m_isDebugEnabled) {
-                        LogTrace("L1GlobalTrigger")
-                                << (positionPair ? "    Second" : "\n  First")
-                                << " object from pair " << pairIndex
-                                << ": initial phi index " << initialIndex
-                                << " converted to " << newIndex << std::endl;
-                    }
+      newIndex = initialIndex;
+      conversionStatus = true;
 
-                } else {
+      if (m_verbosity && m_isDebugEnabled) {
+        LogTrace("L1GlobalTrigger")
+            << (positionPair ? "    Second" : "\n  First")
+            << " object from pair " << pairIndex << ": initial phi index "
+            << initialIndex
+            << " not requested to be converted, return index, return index "
+            << newIndex << std::endl;
+      }
+    } else {
 
-                    conversionStatus = false;
+      newIndex = (*(m_pairPhiConvVec.at(pairIndex))).at(initialIndex);
 
-                    if (m_verbosity && m_isDebugEnabled) {
-                        LogTrace("L1GlobalTrigger")
-                                << (positionPair ? "    Second" : "\n  First")
-                                << " object from pair " << pairIndex
-                                << ": converted phi index " << newIndex
-                                << "is equal to badIndex " << badIndex
-                                << " Conversion failed." << std::endl;
-                    }
-                }
+      if (newIndex != badIndex) {
 
-            }
+        conversionStatus = true;
 
+        if (m_verbosity && m_isDebugEnabled) {
+          LogTrace("L1GlobalTrigger")
+              << (positionPair ? "    Second" : "\n  First")
+              << " object from pair " << pairIndex << ": initial phi index "
+              << initialIndex << " converted to " << newIndex << std::endl;
         }
 
-            break;
-        default: {
+      } else {
 
-            // should not happen (programming error)
-            throw cms::Exception("FailModule")
-                    << "\n  Wrong position in the object pair " << positionPair
-                    << "\n  Programming error - position must be either 0 or 1..."
-                    << std::endl;
+        conversionStatus = false;
 
+        if (m_verbosity && m_isDebugEnabled) {
+          LogTrace("L1GlobalTrigger")
+              << (positionPair ? "    Second" : "\n  First")
+              << " object from pair " << pairIndex << ": converted phi index "
+              << newIndex << "is equal to badIndex " << badIndex
+              << " Conversion failed." << std::endl;
         }
-            break;
+      }
     }
 
-    //
-    convertedIndex = newIndex;
-    return conversionStatus;
-
-}
-
-const bool L1GtEtaPhiConversions::convertEtaIndex(const L1GtObject& gtObject,
-        const unsigned int initialIndex, unsigned int& convertedIndex) const {
+  }
 
-    unsigned int newIndex = badIndex;
-    bool conversionStatus = false;
+  break;
+  default: {
 
-    switch (gtObject) {
+    // should not happen (programming error)
+    throw cms::Exception("FailModule")
+        << "\n  Wrong position in the object pair " << positionPair
+        << "\n  Programming error - position must be either 0 or 1..."
+        << std::endl;
 
-        case Mu: {
+  } break;
+  }
 
-            // check if initial index is within the scale size
-            // could be outside the scale size if there are hardware errors
-            // or wrong scale conversions
-            if (initialIndex >= m_lutEtaMuToCommonCalo.size()) {
+  //
+  convertedIndex = newIndex;
+  return conversionStatus;
+}
 
-                conversionStatus = false;
+const bool
+L1GtEtaPhiConversions::convertEtaIndex(const L1GtObject &gtObject,
+                                       const unsigned int initialIndex,
+                                       unsigned int &convertedIndex) const {
 
-                if (m_verbosity && m_isDebugEnabled) {
-                    LogTrace("L1GlobalTrigger") << "    L1 GT object "
-                            << (l1GtObjectEnumToString(gtObject))
-                            << " has initial eta index " << initialIndex
-                            << " >= " << (m_lutEtaMuToCommonCalo.size())
-                            << " scale size. Conversion failed." << std::endl;
-                }
-            } else {
+  unsigned int newIndex = badIndex;
+  bool conversionStatus = false;
 
-                // convert the index
-                newIndex = m_lutEtaMuToCommonCalo[initialIndex];
+  switch (gtObject) {
 
-                if (newIndex != badIndex) {
+  case Mu: {
 
-                    conversionStatus = true;
+    // check if initial index is within the scale size
+    // could be outside the scale size if there are hardware errors
+    // or wrong scale conversions
+    if (initialIndex >= m_lutEtaMuToCommonCalo.size()) {
 
-                    if (m_verbosity && m_isDebugEnabled) {
-                        LogTrace("L1GlobalTrigger") << "    L1 GT object "
-                                << (l1GtObjectEnumToString(gtObject))
-                                << " initial eta index " << initialIndex
-                                << " (within scale size "
-                                << (m_lutEtaMuToCommonCalo.size())
-                                << ") converted to " << newIndex << std::endl;
-                    }
+      conversionStatus = false;
 
-                } else {
+      if (m_verbosity && m_isDebugEnabled) {
+        LogTrace("L1GlobalTrigger")
+            << "    L1 GT object " << (l1GtObjectEnumToString(gtObject))
+            << " has initial eta index " << initialIndex
+            << " >= " << (m_lutEtaMuToCommonCalo.size())
+            << " scale size. Conversion failed." << std::endl;
+      }
+    } else {
 
-                    conversionStatus = false;
+      // convert the index
+      newIndex = m_lutEtaMuToCommonCalo[initialIndex];
 
-                    if (m_verbosity && m_isDebugEnabled) {
-                        LogTrace("L1GlobalTrigger") << "    L1 GT object "
-                                << (l1GtObjectEnumToString(gtObject))
-                                << " initial eta index " << initialIndex
-                                << " (within scale size "
-                                << (m_lutEtaMuToCommonCalo.size())
-                                << ") converted to badIndex" << newIndex
-                                << " Conversion failed." << std::endl;
-                    }
-                }
+      if (newIndex != badIndex) {
 
-            }
+        conversionStatus = true;
 
+        if (m_verbosity && m_isDebugEnabled) {
+          LogTrace("L1GlobalTrigger")
+              << "    L1 GT object " << (l1GtObjectEnumToString(gtObject))
+              << " initial eta index " << initialIndex << " (within scale size "
+              << (m_lutEtaMuToCommonCalo.size()) << ") converted to "
+              << newIndex << std::endl;
         }
-            break;
-
-        case NoIsoEG:
-        case IsoEG:
-        case CenJet:
-        case TauJet: {
-
-            // check if initial index is within the scale size
-            // could be outside the scale size if there are hardware errors
-            // or wrong scale conversions
-            if (initialIndex >= m_lutEtaCentralToCommonCalo.size()) {
-
-                conversionStatus = false;
-
-                if (m_verbosity && m_isDebugEnabled) {
-                    LogTrace("L1GlobalTrigger") << "    L1 GT object "
-                            << (l1GtObjectEnumToString(gtObject))
-                            << " has initial eta index " << initialIndex
-                            << " >= " << (m_lutEtaCentralToCommonCalo.size())
-                            << " scale size. Conversion failed." << std::endl;
-                }
-            } else {
-
-                // convert the index
-                newIndex = m_lutEtaCentralToCommonCalo[initialIndex];
-
-                if (newIndex != badIndex) {
-
-                    conversionStatus = true;
-
-                    if (m_verbosity && m_isDebugEnabled) {
-                        LogTrace("L1GlobalTrigger") << "    L1 GT object "
-                                << (l1GtObjectEnumToString(gtObject))
-                                << " initial eta index " << initialIndex
-                                << " (within scale size "
-                                << (m_lutEtaMuToCommonCalo.size())
-                                << ") converted to " << newIndex << std::endl;
-                    }
-
-                } else {
-
-                    conversionStatus = false;
-
-                    if (m_verbosity && m_isDebugEnabled) {
-                        LogTrace("L1GlobalTrigger") << "    L1 GT object "
-                                << (l1GtObjectEnumToString(gtObject))
-                                << " initial eta index " << initialIndex
-                                << " (within scale size "
-                                << (m_lutEtaCentralToCommonCalo.size())
-                                << ") converted to badIndex" << newIndex
-                                << " Conversion failed." << std::endl;
-                    }
-                }
-
-            }
 
-        }
-            break;
-
-        case ForJet: {
-
-            // check if initial index is within the scale size
-            // could be outside the scale size if there are hardware errors
-            // or wrong scale conversions
-            if (initialIndex >= m_lutEtaForJetToCommonCalo.size()) {
-
-                conversionStatus = false;
-
-                if (m_verbosity && m_isDebugEnabled) {
-                    LogTrace("L1GlobalTrigger") << "    L1 GT object "
-                            << (l1GtObjectEnumToString(gtObject))
-                            << " has initial eta index " << initialIndex
-                            << " >= " << (m_lutEtaForJetToCommonCalo.size())
-                            << " scale size. Conversion failed." << std::endl;
-                }
-            } else {
-
-                // convert the index
-                newIndex = m_lutEtaForJetToCommonCalo[initialIndex];
-
-                if (newIndex != badIndex) {
-
-                    conversionStatus = true;
-
-                    if (m_verbosity && m_isDebugEnabled) {
-                        LogTrace("L1GlobalTrigger") << "    L1 GT object "
-                                << (l1GtObjectEnumToString(gtObject))
-                                << " initial eta index " << initialIndex
-                                << " (within scale size "
-                                << (m_lutEtaMuToCommonCalo.size())
-                                << ") converted to " << newIndex << std::endl;
-                    }
-
-                } else {
-
-                    conversionStatus = false;
-
-                    if (m_verbosity && m_isDebugEnabled) {
-                        LogTrace("L1GlobalTrigger") << "    L1 GT object "
-                                << (l1GtObjectEnumToString(gtObject))
-                                << " initial eta index " << initialIndex
-                                << " (within scale size "
-                                << (m_lutEtaForJetToCommonCalo.size())
-                                << ") converted to badIndex" << newIndex
-                                << " Conversion failed." << std::endl;
-                    }
-                }
-
-            }
-        }
-            break;
-
-        case ETM:
-        case ETT:
-        case HTT:
-        case HTM:
-        case JetCounts:
-        case HfBitCounts:
-        case HfRingEtSums:
-        case TechTrig:
-        case Castor:
-        case BPTX:
-        case GtExternal:
-        case ObjNull: {
-
-            //no conversions needed, there is no eta quantity for these objects
-            conversionStatus = false;
-        }
-            break;
+      } else {
+
+        conversionStatus = false;
 
-        default: {
-            edm::LogInfo("L1GtObject") << "\n  '" << (l1GtObjectEnumToString(
-                    gtObject)) << "' is not a recognized L1GtObject. "
-                    << "\n Conversion failed. " << std::endl;
-            conversionStatus = false;
+        if (m_verbosity && m_isDebugEnabled) {
+          LogTrace("L1GlobalTrigger")
+              << "    L1 GT object " << (l1GtObjectEnumToString(gtObject))
+              << " initial eta index " << initialIndex << " (within scale size "
+              << (m_lutEtaMuToCommonCalo.size()) << ") converted to badIndex"
+              << newIndex << " Conversion failed." << std::endl;
         }
-            break;
+      }
     }
 
-    //
-    convertedIndex = newIndex;
+  } break;
 
-    return conversionStatus;
+  case NoIsoEG:
+  case IsoEG:
+  case CenJet:
+  case TauJet: {
 
-}
+    // check if initial index is within the scale size
+    // could be outside the scale size if there are hardware errors
+    // or wrong scale conversions
+    if (initialIndex >= m_lutEtaCentralToCommonCalo.size()) {
 
-const unsigned int L1GtEtaPhiConversions::gtObjectNrBinsPhi(
-        const L1GtObject& gtObject) const {
+      conversionStatus = false;
 
-    switch (gtObject) {
+      if (m_verbosity && m_isDebugEnabled) {
+        LogTrace("L1GlobalTrigger")
+            << "    L1 GT object " << (l1GtObjectEnumToString(gtObject))
+            << " has initial eta index " << initialIndex
+            << " >= " << (m_lutEtaCentralToCommonCalo.size())
+            << " scale size. Conversion failed." << std::endl;
+      }
+    } else {
 
-        case Mu: {
-            return m_nrBinsPhiMu;
-        }
-            break;
-
-        case NoIsoEG:
-        case IsoEG:
-        case CenJet:
-        case ForJet:
-        case TauJet: {
-            return m_nrBinsPhiJetEg;
-        }
-            break;
+      // convert the index
+      newIndex = m_lutEtaCentralToCommonCalo[initialIndex];
 
-        case ETM: {
-            return m_nrBinsPhiEtm;
-        }
-            break;
+      if (newIndex != badIndex) {
 
-        case ETT:
-        case HTT: {
-            return 0;
-        }
-            break;
+        conversionStatus = true;
 
-        case HTM: {
-            return m_nrBinsPhiHtm;
-        }
-            break;
-
-        case JetCounts:
-        case HfBitCounts:
-        case HfRingEtSums:
-        case TechTrig:
-        case Castor:
-        case BPTX:
-        case GtExternal:
-        case ObjNull: {
-            return 0;
-        }
-            break;
-
-        default: {
-            edm::LogInfo("L1GtObject") << "\n  '"
-                    << (l1GtObjectEnumToString(gtObject))
-                    << "' is not a recognized L1GtObject. "
-                    << "\n Return 0 bins.";
-            return 0;
+        if (m_verbosity && m_isDebugEnabled) {
+          LogTrace("L1GlobalTrigger")
+              << "    L1 GT object " << (l1GtObjectEnumToString(gtObject))
+              << " initial eta index " << initialIndex << " (within scale size "
+              << (m_lutEtaMuToCommonCalo.size()) << ") converted to "
+              << newIndex << std::endl;
         }
-            break;
-    }
-
-}
 
-const unsigned int L1GtEtaPhiConversions::gtObjectNrBinsPhi(
-        const L1GtObject& obj0, const L1GtObject& obj1) const {
+      } else {
 
-    std::pair < L1GtObject, L1GtObject > gtObjPair;
-    gtObjPair = std::make_pair(obj0, obj1);
-
-    //LogTrace("L1GlobalTrigger") << "\nCompute gtObjectNrBinsPhi ["
-    //        << (l1GtObjectEnumToString(obj0)) << ", "
-    //        << (l1GtObjectEnumToString(obj1)) << "]\n" << std::endl;
-
-    int iPair = 0;
-    for (std::vector<std::pair<L1GtObject, L1GtObject> >::const_iterator cIter =
-            m_gtObjectPairVec.begin(); cIter != m_gtObjectPairVec.end(); ++cIter) {
-
-        if (*cIter == gtObjPair) {
-            LogTrace("L1GlobalTrigger") << "\n  gtObjectNrBinsPhi ["
-                    << l1GtObjectEnumToString(obj0) << ", "
-                    << l1GtObjectEnumToString(obj1) << "] = "
-                    << (*(m_pairNrPhiBinsVec.at(iPair))) << std::endl;
+        conversionStatus = false;
 
-            return *(m_pairNrPhiBinsVec.at(iPair));
+        if (m_verbosity && m_isDebugEnabled) {
+          LogTrace("L1GlobalTrigger")
+              << "    L1 GT object " << (l1GtObjectEnumToString(gtObject))
+              << " initial eta index " << initialIndex << " (within scale size "
+              << (m_lutEtaCentralToCommonCalo.size())
+              << ") converted to badIndex" << newIndex << " Conversion failed."
+              << std::endl;
         }
-
-        iPair++;
+      }
     }
 
-    return 0;
-}
-
-const unsigned int L1GtEtaPhiConversions::gtObjectNrBinsPhi(
-        const unsigned int pairIndex) const {
+  } break;
 
-    if (m_verbosity && m_isDebugEnabled) {
-        LogTrace("L1GlobalTrigger")
-                << "\n  gtObjectNrBinsPhi for L1 GT object pair index "
-                << pairIndex << " = " << (*(m_pairNrPhiBinsVec.at(pairIndex)))
-                << std::endl;
-    }
-
-    return *(m_pairNrPhiBinsVec.at(pairIndex));
-}
+  case ForJet: {
 
+    // check if initial index is within the scale size
+    // could be outside the scale size if there are hardware errors
+    // or wrong scale conversions
+    if (initialIndex >= m_lutEtaForJetToCommonCalo.size()) {
 
+      conversionStatus = false;
 
-// perform all conversions
-void L1GtEtaPhiConversions::convertL1Scales(
-        const L1CaloGeometry* l1CaloGeometry,
-        const L1MuTriggerScales* l1MuTriggerScales,
-        const int ifCaloEtaNumberBits, const int ifMuEtaNumberBits) {
+      if (m_verbosity && m_isDebugEnabled) {
+        LogTrace("L1GlobalTrigger")
+            << "    L1 GT object " << (l1GtObjectEnumToString(gtObject))
+            << " has initial eta index " << initialIndex
+            << " >= " << (m_lutEtaForJetToCommonCalo.size())
+            << " scale size. Conversion failed." << std::endl;
+      }
+    } else {
 
-    // no bullet-proof method, depends on binning ...
-    // decide "by hand / by eyes" which object converts to which object
+      // convert the index
+      newIndex = m_lutEtaForJetToCommonCalo[initialIndex];
 
-    // update the scales used
-    m_l1CaloGeometry = l1CaloGeometry;
-    m_l1MuTriggerScales =  l1MuTriggerScales;
+      if (newIndex != badIndex) {
 
-    // number of bins for all phi scales used
+        conversionStatus = true;
 
-    m_nrBinsPhiMu = 144; // FIXME ask Ivan for size() ...
-    //m_nrBinsPhiMu = m_l1MuTriggerScales->getPhiScale()->size();
+        if (m_verbosity && m_isDebugEnabled) {
+          LogTrace("L1GlobalTrigger")
+              << "    L1 GT object " << (l1GtObjectEnumToString(gtObject))
+              << " initial eta index " << initialIndex << " (within scale size "
+              << (m_lutEtaMuToCommonCalo.size()) << ") converted to "
+              << newIndex << std::endl;
+        }
 
-    m_nrBinsPhiJetEg = m_l1CaloGeometry->numberGctEmJetPhiBins();
-    m_nrBinsPhiEtm = m_l1CaloGeometry->numberGctEtSumPhiBins();
-    m_nrBinsPhiHtm = m_l1CaloGeometry->numberGctHtSumPhiBins();
+      } else {
 
-    //
-    // convert phi scale for muon (finer) to phi scale for (*Jet, EG) / ETM / HTM (coarser)
-    //
+        conversionStatus = false;
 
-    m_lutPhiMuToJetEg.clear();
-    m_lutPhiMuToJetEg.resize(m_nrBinsPhiMu, badIndex);
+        if (m_verbosity && m_isDebugEnabled) {
+          LogTrace("L1GlobalTrigger")
+              << "    L1 GT object " << (l1GtObjectEnumToString(gtObject))
+              << " initial eta index " << initialIndex << " (within scale size "
+              << (m_lutEtaForJetToCommonCalo.size())
+              << ") converted to badIndex" << newIndex << " Conversion failed."
+              << std::endl;
+        }
+      }
+    }
+  } break;
+
+  case ETM:
+  case ETT:
+  case HTT:
+  case HTM:
+  case JetCounts:
+  case HfBitCounts:
+  case HfRingEtSums:
+  case TechTrig:
+  case Castor:
+  case BPTX:
+  case GtExternal:
+  case ObjNull: {
+
+    // no conversions needed, there is no eta quantity for these objects
+    conversionStatus = false;
+  } break;
+
+  default: {
+    edm::LogInfo("L1GtObject") << "\n  '" << (l1GtObjectEnumToString(gtObject))
+                               << "' is not a recognized L1GtObject. "
+                               << "\n Conversion failed. " << std::endl;
+    conversionStatus = false;
+  } break;
+  }
+
+  //
+  convertedIndex = newIndex;
+
+  return conversionStatus;
+}
 
-    m_lutPhiMuToEtm.clear();
-    m_lutPhiMuToEtm.resize(m_nrBinsPhiMu, badIndex);
+const unsigned int
+L1GtEtaPhiConversions::gtObjectNrBinsPhi(const L1GtObject &gtObject) const {
 
-    m_lutPhiMuToHtm.clear();
-    m_lutPhiMuToHtm.resize(m_nrBinsPhiMu, badIndex);
+  switch (gtObject) {
 
-    for (unsigned int phiMuInd = 0; phiMuInd < m_nrBinsPhiMu; ++phiMuInd) {
+  case Mu: {
+    return m_nrBinsPhiMu;
+  } break;
 
-        double phiMuLowEdge = m_l1MuTriggerScales->getPhiScale()->getLowEdge(
-                phiMuInd);
-        double phiMuHighEdge = m_l1MuTriggerScales->getPhiScale()->getHighEdge(
-                phiMuInd);
+  case NoIsoEG:
+  case IsoEG:
+  case CenJet:
+  case ForJet:
+  case TauJet: {
+    return m_nrBinsPhiJetEg;
+  } break;
 
-        // to avoid precision problems, add a small quantity to phiMuLowEdge
-        double phiMuLowEdgeSmallShiftRight = phiMuLowEdge + (phiMuHighEdge
-                - phiMuLowEdge) / 100.;
+  case ETM: {
+    return m_nrBinsPhiEtm;
+  } break;
 
-        // phi Mu -> (*Jet, EG)
+  case ETT:
+  case HTT: {
+    return 0;
+  } break;
+
+  case HTM: {
+    return m_nrBinsPhiHtm;
+  } break;
+
+  case JetCounts:
+  case HfBitCounts:
+  case HfRingEtSums:
+  case TechTrig:
+  case Castor:
+  case BPTX:
+  case GtExternal:
+  case ObjNull: {
+    return 0;
+  } break;
 
-        unsigned int nrBins = m_nrBinsPhiJetEg;
+  default: {
+    edm::LogInfo("L1GtObject") << "\n  '" << (l1GtObjectEnumToString(gtObject))
+                               << "' is not a recognized L1GtObject. "
+                               << "\n Return 0 bins.";
+    return 0;
+  } break;
+  }
+}
 
-        for (unsigned int iBin = nrBins;; --iBin) {
+const unsigned int
+L1GtEtaPhiConversions::gtObjectNrBinsPhi(const L1GtObject &obj0,
+                                         const L1GtObject &obj1) const {
 
-            double phiLowEdge = m_l1CaloGeometry->emJetPhiBinLowEdge(iBin);
-            double phiHighEdge = m_l1CaloGeometry->emJetPhiBinHighEdge(iBin);
+  std::pair<L1GtObject, L1GtObject> gtObjPair;
+  gtObjPair = std::make_pair(obj0, obj1);
 
-            if (phiMuLowEdgeSmallShiftRight >= phiLowEdge) {
-                m_lutPhiMuToJetEg[phiMuInd] = iBin % nrBins;
+  // LogTrace("L1GlobalTrigger") << "\nCompute gtObjectNrBinsPhi ["
+  //        << (l1GtObjectEnumToString(obj0)) << ", "
+  //        << (l1GtObjectEnumToString(obj1)) << "]\n" << std::endl;
 
-                LogTrace("L1GlobalTrigger") << " phiMuIndex \t" << phiMuInd
-                        << " [ " << phiMuLowEdge << " \t, "
-                        << phiMuHighEdge << "] \t==>\t phiMuJetEG \t"
-                        << m_lutPhiMuToJetEg[phiMuInd] << " [ "
-                        << phiLowEdge << "\t, " << phiHighEdge << " ]"
-                        << std::endl;
+  int iPair = 0;
+  for (std::vector<std::pair<L1GtObject, L1GtObject>>::const_iterator cIter =
+           m_gtObjectPairVec.begin();
+       cIter != m_gtObjectPairVec.end(); ++cIter) {
 
-                break;
-            }
-        }
+    if (*cIter == gtObjPair) {
+      LogTrace("L1GlobalTrigger")
+          << "\n  gtObjectNrBinsPhi [" << l1GtObjectEnumToString(obj0) << ", "
+          << l1GtObjectEnumToString(obj1)
+          << "] = " << (*(m_pairNrPhiBinsVec.at(iPair))) << std::endl;
 
-        // phi Mu -> ETM
+      return *(m_pairNrPhiBinsVec.at(iPair));
+    }
 
-        nrBins = m_nrBinsPhiEtm;
+    iPair++;
+  }
 
-        for (unsigned int iBin = nrBins;; --iBin) {
+  return 0;
+}
 
-            double phiLowEdge = m_l1CaloGeometry->etSumPhiBinLowEdge(iBin);
-            double phiHighEdge = m_l1CaloGeometry->etSumPhiBinHighEdge(iBin);
+const unsigned int
+L1GtEtaPhiConversions::gtObjectNrBinsPhi(const unsigned int pairIndex) const {
 
-            if (phiMuLowEdgeSmallShiftRight >= phiLowEdge) {
-                m_lutPhiMuToEtm[phiMuInd] = iBin % nrBins;
+  if (m_verbosity && m_isDebugEnabled) {
+    LogTrace("L1GlobalTrigger")
+        << "\n  gtObjectNrBinsPhi for L1 GT object pair index " << pairIndex
+        << " = " << (*(m_pairNrPhiBinsVec.at(pairIndex))) << std::endl;
+  }
 
-                LogTrace("L1GlobalTrigger") << " phiMuIndex \t" << phiMuInd
-                        << " [ " << phiMuLowEdge << " \t, "
-                        << phiMuHighEdge << "] \t==>\t phiMuToEtm \t"
-                        << m_lutPhiMuToEtm[phiMuInd] << " [ " << phiLowEdge
-                        << "\t, " << phiHighEdge << " ]" << std::endl;
+  return *(m_pairNrPhiBinsVec.at(pairIndex));
+}
 
-                break;
-            }
-        }
+// perform all conversions
+void L1GtEtaPhiConversions::convertL1Scales(
+    const L1CaloGeometry *l1CaloGeometry,
+    const L1MuTriggerScales *l1MuTriggerScales, const int ifCaloEtaNumberBits,
+    const int ifMuEtaNumberBits) {
 
-        // phi Mu -> HTM
+  // no bullet-proof method, depends on binning ...
+  // decide "by hand / by eyes" which object converts to which object
 
-        nrBins = m_nrBinsPhiHtm;
+  // update the scales used
+  m_l1CaloGeometry = l1CaloGeometry;
+  m_l1MuTriggerScales = l1MuTriggerScales;
 
-        for (unsigned int iBin = nrBins;; --iBin) {
+  // number of bins for all phi scales used
 
-            double phiLowEdge = m_l1CaloGeometry->htSumPhiBinLowEdge(iBin);
-            double phiHighEdge = m_l1CaloGeometry->htSumPhiBinHighEdge(iBin);
+  m_nrBinsPhiMu = 144; // FIXME ask Ivan for size() ...
+  // m_nrBinsPhiMu = m_l1MuTriggerScales->getPhiScale()->size();
 
-            if (phiMuLowEdgeSmallShiftRight >= phiLowEdge) {
-                m_lutPhiMuToHtm[phiMuInd] = iBin % nrBins;
+  m_nrBinsPhiJetEg = m_l1CaloGeometry->numberGctEmJetPhiBins();
+  m_nrBinsPhiEtm = m_l1CaloGeometry->numberGctEtSumPhiBins();
+  m_nrBinsPhiHtm = m_l1CaloGeometry->numberGctHtSumPhiBins();
 
-                LogTrace("L1GlobalTrigger") << " phiMuIndex \t" << phiMuInd
-                        << " [ " << phiMuLowEdge << " \t, "
-                        << phiMuHighEdge << "] \t==>\t phiMuToHtm \t"
-                        << m_lutPhiMuToHtm[phiMuInd] << " [ " << phiLowEdge
-                        << "\t, " << phiHighEdge << " ]" << std::endl;
+  //
+  // convert phi scale for muon (finer) to phi scale for (*Jet, EG) / ETM / HTM
+  // (coarser)
+  //
 
-                break;
-            }
-        }
+  m_lutPhiMuToJetEg.clear();
+  m_lutPhiMuToJetEg.resize(m_nrBinsPhiMu, badIndex);
 
-        LogTrace("L1GlobalTrigger") << std::endl;
+  m_lutPhiMuToEtm.clear();
+  m_lutPhiMuToEtm.resize(m_nrBinsPhiMu, badIndex);
 
-    }
+  m_lutPhiMuToHtm.clear();
+  m_lutPhiMuToHtm.resize(m_nrBinsPhiMu, badIndex);
 
-    if (m_verbosity && m_isDebugEnabled) {
-        LogTrace("L1GlobalTrigger") << "Mu phi conversions" << std::endl;
-        for (unsigned int iBin = 0; iBin < m_nrBinsPhiMu; ++iBin) {
-            LogTrace("L1GlobalTrigger") << "  Mu phiIndex \t" << iBin
-                    << "\t converted to index:"
-                    << "\t Jet-EG \t" << m_lutPhiMuToJetEg.at(iBin)
-                    << "\t ETM \t"    << m_lutPhiMuToEtm.at(iBin)
-                    << "\t HTM \t"    << m_lutPhiMuToHtm.at(iBin)
-                    << std::endl;
+  for (unsigned int phiMuInd = 0; phiMuInd < m_nrBinsPhiMu; ++phiMuInd) {
 
-        }
-        LogTrace("L1GlobalTrigger") << std::endl;
-    }
+    double phiMuLowEdge =
+        m_l1MuTriggerScales->getPhiScale()->getLowEdge(phiMuInd);
+    double phiMuHighEdge =
+        m_l1MuTriggerScales->getPhiScale()->getHighEdge(phiMuInd);
 
-    //
-    // convert phi scale for ETM to phi scale for (*Jet, EG) / HTM (coarser)
-    //
+    // to avoid precision problems, add a small quantity to phiMuLowEdge
+    double phiMuLowEdgeSmallShiftRight =
+        phiMuLowEdge + (phiMuHighEdge - phiMuLowEdge) / 100.;
 
-    m_lutPhiEtmToJetEg.clear();
-    m_lutPhiEtmToJetEg.resize(m_nrBinsPhiEtm, badIndex);
+    // phi Mu -> (*Jet, EG)
 
-    m_lutPhiEtmToHtm.clear();
-    m_lutPhiEtmToHtm.resize(m_nrBinsPhiEtm, badIndex);
+    unsigned int nrBins = m_nrBinsPhiJetEg;
 
+    for (unsigned int iBin = nrBins;; --iBin) {
 
-    for (unsigned int phiEtmInd = 0; phiEtmInd < m_nrBinsPhiEtm; ++phiEtmInd) {
+      double phiLowEdge = m_l1CaloGeometry->emJetPhiBinLowEdge(iBin);
+      double phiHighEdge = m_l1CaloGeometry->emJetPhiBinHighEdge(iBin);
 
-        double phiEtmLowEdge = m_l1CaloGeometry->etSumPhiBinLowEdge(phiEtmInd);
-        double phiEtmHighEdge = m_l1CaloGeometry->etSumPhiBinHighEdge(phiEtmInd);
+      if (phiMuLowEdgeSmallShiftRight >= phiLowEdge) {
+        m_lutPhiMuToJetEg[phiMuInd] = iBin % nrBins;
 
-        // to avoid precision problems, add a small quantity to phiEtmLowEdge
-        double phiEtmLowEdgeSmallShiftRight = phiEtmLowEdge + (phiEtmHighEdge
-                - phiEtmLowEdge) / 100.;
+        LogTrace("L1GlobalTrigger")
+            << " phiMuIndex \t" << phiMuInd << " [ " << phiMuLowEdge << " \t, "
+            << phiMuHighEdge << "] \t==>\t phiMuJetEG \t"
+            << m_lutPhiMuToJetEg[phiMuInd] << " [ " << phiLowEdge << "\t, "
+            << phiHighEdge << " ]" << std::endl;
 
-        // phi ETM -> (*Jet, EG)
+        break;
+      }
+    }
 
-        unsigned int nrBins = m_nrBinsPhiJetEg;
+    // phi Mu -> ETM
 
-        for (unsigned int iBin = nrBins;; --iBin) {
+    nrBins = m_nrBinsPhiEtm;
 
-            double phiLowEdge = m_l1CaloGeometry->emJetPhiBinLowEdge(iBin);
-            double phiHighEdge = m_l1CaloGeometry->emJetPhiBinHighEdge(iBin);
+    for (unsigned int iBin = nrBins;; --iBin) {
 
-            if (phiEtmLowEdgeSmallShiftRight >= phiLowEdge) {
-                m_lutPhiEtmToJetEg[phiEtmInd] = iBin % nrBins;
+      double phiLowEdge = m_l1CaloGeometry->etSumPhiBinLowEdge(iBin);
+      double phiHighEdge = m_l1CaloGeometry->etSumPhiBinHighEdge(iBin);
 
-                LogTrace("L1GlobalTrigger") << " phiEtmIndex \t" << phiEtmInd
-                        << " [ " << phiEtmLowEdge << " \t, "
-                        << phiEtmHighEdge << "] \t==>\t phiEtmJetEG \t"
-                        << m_lutPhiEtmToJetEg[phiEtmInd] << " [ "
-                        << phiLowEdge << "\t, " << phiHighEdge << " ]"
-                        << std::endl;
+      if (phiMuLowEdgeSmallShiftRight >= phiLowEdge) {
+        m_lutPhiMuToEtm[phiMuInd] = iBin % nrBins;
 
-                break;
-            }
-        }
+        LogTrace("L1GlobalTrigger")
+            << " phiMuIndex \t" << phiMuInd << " [ " << phiMuLowEdge << " \t, "
+            << phiMuHighEdge << "] \t==>\t phiMuToEtm \t"
+            << m_lutPhiMuToEtm[phiMuInd] << " [ " << phiLowEdge << "\t, "
+            << phiHighEdge << " ]" << std::endl;
 
-        // phi ETM -> HTM
+        break;
+      }
+    }
 
-        nrBins = m_nrBinsPhiHtm;
+    // phi Mu -> HTM
 
-        for (unsigned int iBin = nrBins;; --iBin) {
+    nrBins = m_nrBinsPhiHtm;
 
-            double phiLowEdge = m_l1CaloGeometry->htSumPhiBinLowEdge(iBin);
-            double phiHighEdge = m_l1CaloGeometry->htSumPhiBinHighEdge(iBin);
+    for (unsigned int iBin = nrBins;; --iBin) {
 
-            if (phiEtmLowEdgeSmallShiftRight >= phiLowEdge) {
-                m_lutPhiEtmToHtm[phiEtmInd] = iBin % nrBins;
+      double phiLowEdge = m_l1CaloGeometry->htSumPhiBinLowEdge(iBin);
+      double phiHighEdge = m_l1CaloGeometry->htSumPhiBinHighEdge(iBin);
 
-                LogTrace("L1GlobalTrigger") << " phiEtmIndex \t" << phiEtmInd
-                        << " [ " << phiEtmLowEdge << " \t, "
-                        << phiEtmHighEdge << "] \t==>\t phiEtmToHtm \t"
-                        << m_lutPhiEtmToHtm[phiEtmInd] << " [ " << phiLowEdge
-                        << "\t, " << phiHighEdge << " ]" << std::endl;
+      if (phiMuLowEdgeSmallShiftRight >= phiLowEdge) {
+        m_lutPhiMuToHtm[phiMuInd] = iBin % nrBins;
 
-                break;
-            }
-        }
+        LogTrace("L1GlobalTrigger")
+            << " phiMuIndex \t" << phiMuInd << " [ " << phiMuLowEdge << " \t, "
+            << phiMuHighEdge << "] \t==>\t phiMuToHtm \t"
+            << m_lutPhiMuToHtm[phiMuInd] << " [ " << phiLowEdge << "\t, "
+            << phiHighEdge << " ]" << std::endl;
 
-        LogTrace("L1GlobalTrigger") << std::endl;
+        break;
+      }
+    }
 
+    LogTrace("L1GlobalTrigger") << std::endl;
+  }
+
+  if (m_verbosity && m_isDebugEnabled) {
+    LogTrace("L1GlobalTrigger") << "Mu phi conversions" << std::endl;
+    for (unsigned int iBin = 0; iBin < m_nrBinsPhiMu; ++iBin) {
+      LogTrace("L1GlobalTrigger")
+          << "  Mu phiIndex \t" << iBin << "\t converted to index:"
+          << "\t Jet-EG \t" << m_lutPhiMuToJetEg.at(iBin) << "\t ETM \t"
+          << m_lutPhiMuToEtm.at(iBin) << "\t HTM \t" << m_lutPhiMuToHtm.at(iBin)
+          << std::endl;
     }
+    LogTrace("L1GlobalTrigger") << std::endl;
+  }
 
-    //
-    // convert phi scale for HTM to phi scale for (*Jet, EG)
-    //
+  //
+  // convert phi scale for ETM to phi scale for (*Jet, EG) / HTM (coarser)
+  //
 
-    m_lutPhiHtmToJetEg.clear();
-    m_lutPhiHtmToJetEg.resize(m_nrBinsPhiHtm, badIndex);
+  m_lutPhiEtmToJetEg.clear();
+  m_lutPhiEtmToJetEg.resize(m_nrBinsPhiEtm, badIndex);
 
+  m_lutPhiEtmToHtm.clear();
+  m_lutPhiEtmToHtm.resize(m_nrBinsPhiEtm, badIndex);
 
-    for (unsigned int phiHtmInd = 0; phiHtmInd < m_nrBinsPhiHtm; ++phiHtmInd) {
+  for (unsigned int phiEtmInd = 0; phiEtmInd < m_nrBinsPhiEtm; ++phiEtmInd) {
 
-        double phiHtmLowEdge = m_l1CaloGeometry->htSumPhiBinLowEdge(phiHtmInd);
-        double phiHtmHighEdge = m_l1CaloGeometry->htSumPhiBinHighEdge(phiHtmInd);
+    double phiEtmLowEdge = m_l1CaloGeometry->etSumPhiBinLowEdge(phiEtmInd);
+    double phiEtmHighEdge = m_l1CaloGeometry->etSumPhiBinHighEdge(phiEtmInd);
 
-        // to avoid precision problems, add a small quantity to phiHtmLowEdge
-        double phiHtmLowEdgeSmallShiftRight = phiHtmLowEdge + (phiHtmHighEdge
-                - phiHtmLowEdge) / 100.;
+    // to avoid precision problems, add a small quantity to phiEtmLowEdge
+    double phiEtmLowEdgeSmallShiftRight =
+        phiEtmLowEdge + (phiEtmHighEdge - phiEtmLowEdge) / 100.;
 
-        unsigned int nrBins = m_nrBinsPhiJetEg;
+    // phi ETM -> (*Jet, EG)
 
-        for (unsigned int iBin = nrBins;; --iBin) {
+    unsigned int nrBins = m_nrBinsPhiJetEg;
 
-            double phiLowEdge = m_l1CaloGeometry->emJetPhiBinLowEdge(iBin);
-            double phiHighEdge = m_l1CaloGeometry->emJetPhiBinHighEdge(iBin);
+    for (unsigned int iBin = nrBins;; --iBin) {
 
-            if (phiHtmLowEdgeSmallShiftRight >= phiLowEdge) {
-                m_lutPhiHtmToJetEg[phiHtmInd] = iBin % nrBins;
+      double phiLowEdge = m_l1CaloGeometry->emJetPhiBinLowEdge(iBin);
+      double phiHighEdge = m_l1CaloGeometry->emJetPhiBinHighEdge(iBin);
 
-                LogTrace("L1GlobalTrigger") << " phiHtmIndex \t" << phiHtmInd
-                        << " [ " << phiHtmLowEdge << " \t, "
-                        << phiHtmHighEdge << "] \t==>\t phiHtmJetEG \t"
-                        << m_lutPhiHtmToJetEg[phiHtmInd] << " [ "
-                        << phiLowEdge << "\t, " << phiHighEdge << " ]"
-                        << std::endl;
+      if (phiEtmLowEdgeSmallShiftRight >= phiLowEdge) {
+        m_lutPhiEtmToJetEg[phiEtmInd] = iBin % nrBins;
 
-                break;
-            }
-        }
+        LogTrace("L1GlobalTrigger")
+            << " phiEtmIndex \t" << phiEtmInd << " [ " << phiEtmLowEdge
+            << " \t, " << phiEtmHighEdge << "] \t==>\t phiEtmJetEG \t"
+            << m_lutPhiEtmToJetEg[phiEtmInd] << " [ " << phiLowEdge << "\t, "
+            << phiHighEdge << " ]" << std::endl;
 
+        break;
+      }
     }
 
+    // phi ETM -> HTM
 
-    //
-    // convert phi scale for (*Jet, EG) to (*Jet, EG)
-    // dummy - return the same index as the input index
+    nrBins = m_nrBinsPhiHtm;
 
-    m_lutPhiJetEgToJetEg.clear();
-    m_lutPhiJetEgToJetEg.resize(m_nrBinsPhiJetEg, badIndex);
+    for (unsigned int iBin = nrBins;; --iBin) {
 
-    for (unsigned int phiInd = 0; phiInd < m_nrBinsPhiJetEg; ++phiInd) {
-        m_lutPhiJetEgToJetEg[phiInd] = phiInd;
-    }
+      double phiLowEdge = m_l1CaloGeometry->htSumPhiBinLowEdge(iBin);
+      double phiHighEdge = m_l1CaloGeometry->htSumPhiBinHighEdge(iBin);
 
-    //
-    // eta conversions
-    //
+      if (phiEtmLowEdgeSmallShiftRight >= phiLowEdge) {
+        m_lutPhiEtmToHtm[phiEtmInd] = iBin % nrBins;
 
-    // all objects are converted to a common central / forward calorimeter eta scale,
-    // built by setting together the forward scale and the central scale
-    //
-    // eta is signed,  MSB is the sign for all objects - must be taken into account
-    // in conversion - the common scale is, from 0 to m_nrBinsEtaCommon:
-    //
-    // [ForJet negative bins][Central Jet/IsoEG/NoIsoEG negative bins][Central Jet/IsoEG/NoIsoEG positive bins][ForJet positive bins]
-    //
+        LogTrace("L1GlobalTrigger")
+            << " phiEtmIndex \t" << phiEtmInd << " [ " << phiEtmLowEdge
+            << " \t, " << phiEtmHighEdge << "] \t==>\t phiEtmToHtm \t"
+            << m_lutPhiEtmToHtm[phiEtmInd] << " [ " << phiLowEdge << "\t, "
+            << phiHighEdge << " ]" << std::endl;
 
-    unsigned int nrGctCentralEtaBinsPerHalf =
-            m_l1CaloGeometry->numberGctCentralEtaBinsPerHalf();
+        break;
+      }
+    }
 
-    unsigned int nrGctForwardEtaBinsPerHalf =
-            m_l1CaloGeometry->numberGctForwardEtaBinsPerHalf();
+    LogTrace("L1GlobalTrigger") << std::endl;
+  }
 
-    unsigned int nrGctTotalEtaBinsPerHalf = nrGctCentralEtaBinsPerHalf
-            + nrGctForwardEtaBinsPerHalf;
+  //
+  // convert phi scale for HTM to phi scale for (*Jet, EG)
+  //
 
-    m_nrBinsEtaCommon = 2*nrGctTotalEtaBinsPerHalf;
+  m_lutPhiHtmToJetEg.clear();
+  m_lutPhiHtmToJetEg.resize(m_nrBinsPhiHtm, badIndex);
 
-    //
-    // convert eta scale for CenJet/TauJet & IsoEG/NoIsoEG to a common
-    // central / forward calorimeter eta scale
-    //
-    // get the sign and the index absolute value
+  for (unsigned int phiHtmInd = 0; phiHtmInd < m_nrBinsPhiHtm; ++phiHtmInd) {
 
-    LogTrace("L1GlobalTrigger")
-            << " \nEta conversion: CenJet/TauJet & IsoEG/NoIsoEG to a common calorimeter scale\n"
-            << std::endl;
+    double phiHtmLowEdge = m_l1CaloGeometry->htSumPhiBinLowEdge(phiHtmInd);
+    double phiHtmHighEdge = m_l1CaloGeometry->htSumPhiBinHighEdge(phiHtmInd);
 
-    m_lutEtaCentralToCommonCalo.clear();
-    m_lutEtaCentralToCommonCalo.resize(
-            (nrGctCentralEtaBinsPerHalf | (1 << (ifCaloEtaNumberBits - 1))),
-            badIndex);
+    // to avoid precision problems, add a small quantity to phiHtmLowEdge
+    double phiHtmLowEdgeSmallShiftRight =
+        phiHtmLowEdge + (phiHtmHighEdge - phiHtmLowEdge) / 100.;
 
-    for (unsigned int etaInd = 0; etaInd < nrGctCentralEtaBinsPerHalf; ++etaInd) {
+    unsigned int nrBins = m_nrBinsPhiJetEg;
 
-        // for positive values, the index is etaInd
-        unsigned int globalIndex = m_l1CaloGeometry->globalEtaIndex(
-                m_l1CaloGeometry->etaBinCenter(etaInd, true));
-        m_lutEtaCentralToCommonCalo[etaInd] = globalIndex;
+    for (unsigned int iBin = nrBins;; --iBin) {
 
-        LogTrace("L1GlobalTrigger") << " etaIndex " << etaInd << "\t [hex: "
-                << std::hex << etaInd << "] " << std::dec
-                << " ==> etaIndexGlobal " << globalIndex << std::endl;
+      double phiLowEdge = m_l1CaloGeometry->emJetPhiBinLowEdge(iBin);
+      double phiHighEdge = m_l1CaloGeometry->emJetPhiBinHighEdge(iBin);
 
-        // for negative values, one adds (binary) 1 as MSB to the index
-        unsigned int etaIndNeg = etaInd | (1 << (ifCaloEtaNumberBits - 1));
-        globalIndex = m_l1CaloGeometry->globalEtaIndex(
-                m_l1CaloGeometry->etaBinCenter(etaIndNeg, true));
-        m_lutEtaCentralToCommonCalo[etaIndNeg] = globalIndex;
+      if (phiHtmLowEdgeSmallShiftRight >= phiLowEdge) {
+        m_lutPhiHtmToJetEg[phiHtmInd] = iBin % nrBins;
 
-        LogTrace("L1GlobalTrigger") << " etaIndex " << etaIndNeg
-                << "\t [hex: " << std::hex << etaIndNeg << "] " << std::dec
-                << " ==> etaIndexGlobal " << globalIndex << std::endl;
+        LogTrace("L1GlobalTrigger")
+            << " phiHtmIndex \t" << phiHtmInd << " [ " << phiHtmLowEdge
+            << " \t, " << phiHtmHighEdge << "] \t==>\t phiHtmJetEG \t"
+            << m_lutPhiHtmToJetEg[phiHtmInd] << " [ " << phiLowEdge << "\t, "
+            << phiHighEdge << " ]" << std::endl;
 
+        break;
+      }
     }
+  }
 
-    //
-    // convert eta scale for ForJet to a common
-    // central / forward calorimeter eta scale
-    //
+  //
+  // convert phi scale for (*Jet, EG) to (*Jet, EG)
+  // dummy - return the same index as the input index
 
-    LogTrace("L1GlobalTrigger")
-            << " \nEta conversion: ForJet to a common calorimeter scale\n"
-            << std::endl;
+  m_lutPhiJetEgToJetEg.clear();
+  m_lutPhiJetEgToJetEg.resize(m_nrBinsPhiJetEg, badIndex);
 
-    m_lutEtaForJetToCommonCalo.clear();
-    m_lutEtaForJetToCommonCalo.resize(
-            (nrGctForwardEtaBinsPerHalf | (1 << (ifCaloEtaNumberBits - 1))),
-            badIndex);
+  for (unsigned int phiInd = 0; phiInd < m_nrBinsPhiJetEg; ++phiInd) {
+    m_lutPhiJetEgToJetEg[phiInd] = phiInd;
+  }
 
-    for (unsigned int etaInd = 0; etaInd < nrGctForwardEtaBinsPerHalf; ++etaInd) {
+  //
+  // eta conversions
+  //
 
-        // for positive values, the index is etaInd
-        unsigned int globalIndex = m_l1CaloGeometry->globalEtaIndex(
-                m_l1CaloGeometry->etaBinCenter(etaInd, false));
-        m_lutEtaForJetToCommonCalo[etaInd] = globalIndex;
+  // all objects are converted to a common central / forward calorimeter eta
+  // scale, built by setting together the forward scale and the central scale
+  //
+  // eta is signed,  MSB is the sign for all objects - must be taken into
+  // account in conversion - the common scale is, from 0 to m_nrBinsEtaCommon:
+  //
+  // [ForJet negative bins][Central Jet/IsoEG/NoIsoEG negative bins][Central
+  // Jet/IsoEG/NoIsoEG positive bins][ForJet positive bins]
+  //
 
-        LogTrace("L1GlobalTrigger") << " etaIndex " << etaInd << "\t [hex: "
-                << std::hex << etaInd << "] " << std::dec
-                << " ==> etaIndexGlobal " << globalIndex << std::endl;
+  unsigned int nrGctCentralEtaBinsPerHalf =
+      m_l1CaloGeometry->numberGctCentralEtaBinsPerHalf();
 
-        // for negative values, one adds (binary) 1 as MSB to the index
-        unsigned int etaIndNeg = etaInd | (1 << (ifCaloEtaNumberBits - 1));
-        globalIndex = m_l1CaloGeometry->globalEtaIndex(
-                m_l1CaloGeometry->etaBinCenter(etaIndNeg, false));
-        m_lutEtaForJetToCommonCalo[etaIndNeg] = globalIndex;
-
-        LogTrace("L1GlobalTrigger") << " etaIndex " << etaIndNeg << "\t [hex: "
-                << std::hex << etaIndNeg << "] " << std::dec
-                << " ==> etaIndexGlobal " << globalIndex << std::endl;
-
-    }
+  unsigned int nrGctForwardEtaBinsPerHalf =
+      m_l1CaloGeometry->numberGctForwardEtaBinsPerHalf();
 
-    //
-    // convert eta scale for Mu to a common
-    // central / forward calorimeter eta scale
-    //
+  unsigned int nrGctTotalEtaBinsPerHalf =
+      nrGctCentralEtaBinsPerHalf + nrGctForwardEtaBinsPerHalf;
 
-    LogDebug("L1GlobalTrigger")
-            << " \nEta conversion: Mu to a common calorimeter scale\n"
-            << std::endl;
+  m_nrBinsEtaCommon = 2 * nrGctTotalEtaBinsPerHalf;
 
-    // eta scale defined for positive values - need to be symmetrized
-    unsigned int nrBinsEtaMuPerHalf =
-            m_l1MuTriggerScales->getGMTEtaScale()->getNBins();
-    LogTrace("L1GlobalTrigger") << " \nnrBinsEtaMuPerHalf = "
-            << nrBinsEtaMuPerHalf << "\n" << std::endl;
+  //
+  // convert eta scale for CenJet/TauJet & IsoEG/NoIsoEG to a common
+  // central / forward calorimeter eta scale
+  //
+  // get the sign and the index absolute value
 
-    m_lutEtaMuToCommonCalo.clear();
-    m_lutEtaMuToCommonCalo.resize(
-            (nrBinsEtaMuPerHalf | (1 << (ifMuEtaNumberBits - 1))), badIndex);
+  LogTrace("L1GlobalTrigger") << " \nEta conversion: CenJet/TauJet & "
+                                 "IsoEG/NoIsoEG to a common calorimeter scale\n"
+                              << std::endl;
 
-    for (unsigned int etaMuInd = 0; etaMuInd < nrBinsEtaMuPerHalf; ++etaMuInd) {
+  m_lutEtaCentralToCommonCalo.clear();
+  m_lutEtaCentralToCommonCalo.resize(
+      (nrGctCentralEtaBinsPerHalf | (1 << (ifCaloEtaNumberBits - 1))),
+      badIndex);
 
-        double etaMuLowEdge = m_l1MuTriggerScales->getGMTEtaScale()->getValue(
-                etaMuInd);
-        double etaMuHighEdge = m_l1MuTriggerScales->getGMTEtaScale()->getValue(
-                etaMuInd + 1);
+  for (unsigned int etaInd = 0; etaInd < nrGctCentralEtaBinsPerHalf; ++etaInd) {
 
-        // to avoid precision problems, add a small quantity to etaMuLowEdge
-        double etaMuLowEdgeSmallShiftRight = etaMuLowEdge + (etaMuHighEdge
-                - etaMuLowEdge) / 100.;
+    // for positive values, the index is etaInd
+    unsigned int globalIndex = m_l1CaloGeometry->globalEtaIndex(
+        m_l1CaloGeometry->etaBinCenter(etaInd, true));
+    m_lutEtaCentralToCommonCalo[etaInd] = globalIndex;
 
-        // positive values
-        for (unsigned int iBin = m_nrBinsEtaCommon;; --iBin) {
+    LogTrace("L1GlobalTrigger")
+        << " etaIndex " << etaInd << "\t [hex: " << std::hex << etaInd << "] "
+        << std::dec << " ==> etaIndexGlobal " << globalIndex << std::endl;
 
-            double etaLowEdge = m_l1CaloGeometry->globalEtaBinLowEdge(iBin);
+    // for negative values, one adds (binary) 1 as MSB to the index
+    unsigned int etaIndNeg = etaInd | (1 << (ifCaloEtaNumberBits - 1));
+    globalIndex = m_l1CaloGeometry->globalEtaIndex(
+        m_l1CaloGeometry->etaBinCenter(etaIndNeg, true));
+    m_lutEtaCentralToCommonCalo[etaIndNeg] = globalIndex;
 
-            double etaHighEdge = 0.0;
-            if (iBin == m_nrBinsEtaCommon) {
-                etaHighEdge = etaLowEdge;
-            } else {
-                etaHighEdge = m_l1CaloGeometry->globalEtaBinLowEdge(iBin + 1);
-            }
+    LogTrace("L1GlobalTrigger")
+        << " etaIndex " << etaIndNeg << "\t [hex: " << std::hex << etaIndNeg
+        << "] " << std::dec << " ==> etaIndexGlobal " << globalIndex
+        << std::endl;
+  }
 
-            if (etaMuLowEdgeSmallShiftRight >= etaLowEdge) {
-                m_lutEtaMuToCommonCalo[etaMuInd] = iBin % m_nrBinsEtaCommon;
+  //
+  // convert eta scale for ForJet to a common
+  // central / forward calorimeter eta scale
+  //
 
-                LogTrace("L1GlobalTrigger") << " etaMuIndex \t" << etaMuInd
-                        << "\t [ " << etaMuLowEdge << ", \t" << etaMuHighEdge
-                        << "] ==> etaMuJetEG \t"
-                        << m_lutEtaMuToCommonCalo[etaMuInd] << "\t [ "
-                        << etaLowEdge << ", \t" << etaHighEdge << " ]"
-                        << std::endl;
+  LogTrace("L1GlobalTrigger")
+      << " \nEta conversion: ForJet to a common calorimeter scale\n"
+      << std::endl;
 
-                break;
-            }
-        }
+  m_lutEtaForJetToCommonCalo.clear();
+  m_lutEtaForJetToCommonCalo.resize(
+      (nrGctForwardEtaBinsPerHalf | (1 << (ifCaloEtaNumberBits - 1))),
+      badIndex);
 
-        // for negative values, one adds (binary) 1 as MSB to the index
-        unsigned int etaMuIndNeg = etaMuInd | (1 << (ifMuEtaNumberBits - 1));
-        m_lutEtaMuToCommonCalo[etaMuIndNeg] = m_lutEtaMuToCommonCalo[0]
-                - (m_lutEtaMuToCommonCalo[etaMuInd] - m_lutEtaMuToCommonCalo[0]
-                        + 1);
-
-        LogTrace("L1GlobalTrigger") << " etaMuIndexNeg \t" << etaMuIndNeg
-                << "\t [ " << (-1.0 * etaMuLowEdge) << ", \t" << (-1.0
-                * etaMuHighEdge) << "] ==> etaMuJetEG \t"
-                << m_lutEtaMuToCommonCalo[etaMuIndNeg] << "\t [ "
-                << m_l1CaloGeometry->globalEtaBinLowEdge(
-                        m_lutEtaMuToCommonCalo[etaMuIndNeg]) << ", \t"
-                << m_l1CaloGeometry->globalEtaBinLowEdge(
-                        m_lutEtaMuToCommonCalo[etaMuIndNeg] + 1) << " ]"
-                << std::endl;
+  for (unsigned int etaInd = 0; etaInd < nrGctForwardEtaBinsPerHalf; ++etaInd) {
 
-    }
-
-    if (m_verbosity && m_isDebugEnabled) {
-        LogTrace("L1GlobalTrigger") << std::endl;
-        LogTrace("L1GlobalTrigger") << std::endl;
-    }
+    // for positive values, the index is etaInd
+    unsigned int globalIndex = m_l1CaloGeometry->globalEtaIndex(
+        m_l1CaloGeometry->etaBinCenter(etaInd, false));
+    m_lutEtaForJetToCommonCalo[etaInd] = globalIndex;
 
-}
+    LogTrace("L1GlobalTrigger")
+        << " etaIndex " << etaInd << "\t [hex: " << std::hex << etaInd << "] "
+        << std::dec << " ==> etaIndexGlobal " << globalIndex << std::endl;
 
-// print all the performed conversions
-void L1GtEtaPhiConversions::print(std::ostream& myCout) const {
+    // for negative values, one adds (binary) 1 as MSB to the index
+    unsigned int etaIndNeg = etaInd | (1 << (ifCaloEtaNumberBits - 1));
+    globalIndex = m_l1CaloGeometry->globalEtaIndex(
+        m_l1CaloGeometry->etaBinCenter(etaIndNeg, false));
+    m_lutEtaForJetToCommonCalo[etaIndNeg] = globalIndex;
 
-    // force a page break before each group
-    myCout << "<p style=\"page-break-before: always\">&nbsp;</p>";
+    LogTrace("L1GlobalTrigger")
+        << " etaIndex " << etaIndNeg << "\t [hex: " << std::hex << etaIndNeg
+        << "] " << std::dec << " ==> etaIndexGlobal " << globalIndex
+        << std::endl;
+  }
 
-    myCout
-            << "\n---++Conversion tables for phi and eta variables of the trigger objects used in correlation conditions \n"
-            << std::endl;
+  //
+  // convert eta scale for Mu to a common
+  // central / forward calorimeter eta scale
+  //
 
-    //
-    // phi conversions
-    //
+  LogDebug("L1GlobalTrigger")
+      << " \nEta conversion: Mu to a common calorimeter scale\n"
+      << std::endl;
 
-    // phi Mu -> (*Jet, EG)
+  // eta scale defined for positive values - need to be symmetrized
+  unsigned int nrBinsEtaMuPerHalf =
+      m_l1MuTriggerScales->getGMTEtaScale()->getNBins();
+  LogTrace("L1GlobalTrigger")
+      << " \nnrBinsEtaMuPerHalf = " << nrBinsEtaMuPerHalf << "\n"
+      << std::endl;
 
-    myCout
-            << "\n---+++Phi conversion for muons to jets and e-gamma common phi scale \n"
-            << std::endl;
+  m_lutEtaMuToCommonCalo.clear();
+  m_lutEtaMuToCommonCalo.resize(
+      (nrBinsEtaMuPerHalf | (1 << (ifMuEtaNumberBits - 1))), badIndex);
 
-    size_t lutPhiMuToJetEgSize = m_lutPhiMuToJetEg.size();
-    myCout << "Size of look-up table = " << lutPhiMuToJetEgSize << "\n"
-            << std::endl;
+  for (unsigned int etaMuInd = 0; etaMuInd < nrBinsEtaMuPerHalf; ++etaMuInd) {
 
-    myCout << "|  *Initial Phi Hardware Index*  "
-            << "||  *Initial Phi Range*  ||"
-            << "  *Converted Phi Hardware Index*  "
-            << "||  *Converted Phi Range*  ||" << "\n"
-            << "|  *hex*  |  *dec*  | ^|^|  *hex*  |  *dec*  |^|^|"
-            << std::endl;
+    double etaMuLowEdge =
+        m_l1MuTriggerScales->getGMTEtaScale()->getValue(etaMuInd);
+    double etaMuHighEdge =
+        m_l1MuTriggerScales->getGMTEtaScale()->getValue(etaMuInd + 1);
 
-    for (unsigned int indexToConv = 0; indexToConv < lutPhiMuToJetEgSize; ++indexToConv) {
+    // to avoid precision problems, add a small quantity to etaMuLowEdge
+    double etaMuLowEdgeSmallShiftRight =
+        etaMuLowEdge + (etaMuHighEdge - etaMuLowEdge) / 100.;
 
-        double lowEdgeToConv = m_l1MuTriggerScales->getPhiScale()->getLowEdge(
-                indexToConv);
-        double highEdgeToConv =
-                m_l1MuTriggerScales->getPhiScale()->getHighEdge(indexToConv);
+    // positive values
+    for (unsigned int iBin = m_nrBinsEtaCommon;; --iBin) {
 
-        unsigned int convIndex = m_lutPhiMuToJetEg[indexToConv];
+      double etaLowEdge = m_l1CaloGeometry->globalEtaBinLowEdge(iBin);
 
-        double convLowEdge = 0.;
-        double convHighEdge = 0.;
+      double etaHighEdge = 0.0;
+      if (iBin == m_nrBinsEtaCommon) {
+        etaHighEdge = etaLowEdge;
+      } else {
+        etaHighEdge = m_l1CaloGeometry->globalEtaBinLowEdge(iBin + 1);
+      }
 
-        if (convIndex != badIndex) {
-            convLowEdge = m_l1CaloGeometry->emJetPhiBinLowEdge(convIndex);
-            convHighEdge = m_l1CaloGeometry->emJetPhiBinHighEdge(convIndex);
-        } else {
-            // badIndex means a bad initialIndex
-            lowEdgeToConv = 0.;
-            highEdgeToConv = 0.;
-        }
+      if (etaMuLowEdgeSmallShiftRight >= etaLowEdge) {
+        m_lutEtaMuToCommonCalo[etaMuInd] = iBin % m_nrBinsEtaCommon;
 
-        myCout << "|  0x" << std::setw(3) << std::hex << std::left
-                << indexToConv << "  |  " << std::dec << std::setw(3)
-                << std::left << indexToConv << "  |[ " << std::setw(10)
-                << std::left << (rad2deg(lowEdgeToConv)) << ",  |"
-                << std::setw(10) << std::left << (rad2deg(highEdgeToConv))
-                << " )  |  0x" << std::setw(6) << std::hex << std::left
-                << convIndex << " |  " << std::dec << std::setw(6) << convIndex
-                << "  |[ " << std::setw(10) << std::left << (rad2deg(
-                convLowEdge)) << ",  |" << std::setw(10) << std::left
-                << (rad2deg(convHighEdge)) << " )  |" << std::right
-                << std::endl;
+        LogTrace("L1GlobalTrigger")
+            << " etaMuIndex \t" << etaMuInd << "\t [ " << etaMuLowEdge << ", \t"
+            << etaMuHighEdge << "] ==> etaMuJetEG \t"
+            << m_lutEtaMuToCommonCalo[etaMuInd] << "\t [ " << etaLowEdge
+            << ", \t" << etaHighEdge << " ]" << std::endl;
 
+        break;
+      }
     }
 
-    // phi Mu -> ETM
-
-    // force a page break before each group
-    myCout << "<p style=\"page-break-before: always\">&nbsp;</p>";
-
-    myCout << "\n---+++Phi conversion for muons to ETM phi scale \n"
-            << std::endl;
-
-    size_t lutPhiMuToEtmSize = m_lutPhiMuToEtm.size();
-    myCout << "Size of look-up table = " << lutPhiMuToEtmSize << "\n"
-            << std::endl;
-
-    myCout << "|  *Initial Phi Hardware Index*  "
-            << "||  *Initial Phi Range*  ||"
-            << "  *Converted Phi Hardware Index*  "
-            << "||  *Converted Phi Range*  ||" << "\n"
-            << "|  *hex*  |  *dec*  | ^|^|  *hex*  |  *dec*  |^|^|"
-            << std::endl;
-
-    for (unsigned int indexToConv = 0; indexToConv < lutPhiMuToEtmSize; ++indexToConv) {
+    // for negative values, one adds (binary) 1 as MSB to the index
+    unsigned int etaMuIndNeg = etaMuInd | (1 << (ifMuEtaNumberBits - 1));
+    m_lutEtaMuToCommonCalo[etaMuIndNeg] =
+        m_lutEtaMuToCommonCalo[0] -
+        (m_lutEtaMuToCommonCalo[etaMuInd] - m_lutEtaMuToCommonCalo[0] + 1);
 
-        double lowEdgeToConv = m_l1MuTriggerScales->getPhiScale()->getLowEdge(
-                indexToConv);
-        double highEdgeToConv =
-                m_l1MuTriggerScales->getPhiScale()->getHighEdge(indexToConv);
-
-        unsigned int convIndex = m_lutPhiMuToEtm[indexToConv];
-
-        double convLowEdge = 0.;
-        double convHighEdge = 0.;
-
-        if (convIndex != badIndex) {
-            convLowEdge = m_l1CaloGeometry->etSumPhiBinLowEdge(convIndex);
-            convHighEdge = m_l1CaloGeometry->etSumPhiBinHighEdge(convIndex);
-        } else {
-            // badIndex means a bad initialIndex
-            lowEdgeToConv = 0.;
-            highEdgeToConv = 0.;
-        }
-
-        myCout << "|  0x" << std::setw(3) << std::hex << std::left
-                << indexToConv << "  |  " << std::dec << std::setw(3)
-                << std::left << indexToConv << "  |[ " << std::setw(10)
-                << std::left << (rad2deg(lowEdgeToConv)) << ",  |"
-                << std::setw(10) << std::left << (rad2deg(highEdgeToConv))
-                << " )  |  0x" << std::setw(6) << std::hex << std::left
-                << convIndex << " |  " << std::dec << std::setw(6) << convIndex
-                << "  |[ " << std::setw(10) << std::left << (rad2deg(
-                convLowEdge)) << ",  |" << std::setw(10) << std::left
-                << (rad2deg(convHighEdge)) << " )  |" << std::right
-                << std::endl;
+    LogTrace("L1GlobalTrigger")
+        << " etaMuIndexNeg \t" << etaMuIndNeg << "\t [ "
+        << (-1.0 * etaMuLowEdge) << ", \t" << (-1.0 * etaMuHighEdge)
+        << "] ==> etaMuJetEG \t" << m_lutEtaMuToCommonCalo[etaMuIndNeg]
+        << "\t [ "
+        << m_l1CaloGeometry->globalEtaBinLowEdge(
+               m_lutEtaMuToCommonCalo[etaMuIndNeg])
+        << ", \t"
+        << m_l1CaloGeometry->globalEtaBinLowEdge(
+               m_lutEtaMuToCommonCalo[etaMuIndNeg] + 1)
+        << " ]" << std::endl;
+  }
+
+  if (m_verbosity && m_isDebugEnabled) {
+    LogTrace("L1GlobalTrigger") << std::endl;
+    LogTrace("L1GlobalTrigger") << std::endl;
+  }
+}
 
-    }
+// print all the performed conversions
+void L1GtEtaPhiConversions::print(std::ostream &myCout) const {
 
-    // phi Mu -> HTM
+  // force a page break before each group
+  myCout << "<p style=\"page-break-before: always\">&nbsp;</p>";
 
-    // force a page break before each group
-    myCout << "<p style=\"page-break-before: always\">&nbsp;</p>";
+  myCout << "\n---++Conversion tables for phi and eta variables of the trigger "
+            "objects used in correlation conditions \n"
+         << std::endl;
 
-    myCout << "\n---+++Phi conversion for muons to HTM phi scale \n"
-            << std::endl;
+  //
+  // phi conversions
+  //
 
-    size_t lutPhiMuToHtmSize = m_lutPhiMuToHtm.size();
-    myCout << "Size of look-up table = " << lutPhiMuToHtmSize << "\n"
-            << std::endl;
+  // phi Mu -> (*Jet, EG)
 
-    myCout << "|  *Initial Phi Hardware Index*  "
-            << "||  *Initial Phi Range*  ||"
-            << "  *Converted Phi Hardware Index*  "
-            << "||  *Converted Phi Range*  ||" << "\n"
-            << "|  *hex*  |  *dec*  | ^|^|  *hex*  |  *dec*  |^|^|"
-            << std::endl;
+  myCout << "\n---+++Phi conversion for muons to jets and e-gamma common phi "
+            "scale \n"
+         << std::endl;
 
-    for (unsigned int indexToConv = 0; indexToConv < lutPhiMuToHtmSize; ++indexToConv) {
+  size_t lutPhiMuToJetEgSize = m_lutPhiMuToJetEg.size();
+  myCout << "Size of look-up table = " << lutPhiMuToJetEgSize << "\n"
+         << std::endl;
 
-        double lowEdgeToConv = m_l1MuTriggerScales->getPhiScale()->getLowEdge(
-                indexToConv);
-        double highEdgeToConv =
-                m_l1MuTriggerScales->getPhiScale()->getHighEdge(indexToConv);
+  myCout << "|  *Initial Phi Hardware Index*  "
+         << "||  *Initial Phi Range*  ||"
+         << "  *Converted Phi Hardware Index*  "
+         << "||  *Converted Phi Range*  ||"
+         << "\n"
+         << "|  *hex*  |  *dec*  | ^|^|  *hex*  |  *dec*  |^|^|" << std::endl;
 
-        unsigned int convIndex = m_lutPhiMuToHtm[indexToConv];
+  for (unsigned int indexToConv = 0; indexToConv < lutPhiMuToJetEgSize;
+       ++indexToConv) {
 
-        double convLowEdge = 0.;
-        double convHighEdge = 0.;
+    double lowEdgeToConv =
+        m_l1MuTriggerScales->getPhiScale()->getLowEdge(indexToConv);
+    double highEdgeToConv =
+        m_l1MuTriggerScales->getPhiScale()->getHighEdge(indexToConv);
 
-        if (convIndex != badIndex) {
-            convLowEdge = m_l1CaloGeometry->htSumPhiBinLowEdge(convIndex);
-            convHighEdge = m_l1CaloGeometry->htSumPhiBinHighEdge(convIndex);
-        } else {
-            // badIndex means a bad initialIndex
-            lowEdgeToConv = 0.;
-            highEdgeToConv = 0.;
-        }
+    unsigned int convIndex = m_lutPhiMuToJetEg[indexToConv];
 
-        myCout << "|  0x" << std::setw(3) << std::hex << std::left
-                << indexToConv << "  |  " << std::dec << std::setw(3)
-                << std::left << indexToConv << "  |[ " << std::setw(10)
-                << std::left << (rad2deg(lowEdgeToConv)) << ",  |"
-                << std::setw(10) << std::left << (rad2deg(highEdgeToConv))
-                << " )  |  0x" << std::setw(6) << std::hex << std::left
-                << convIndex << " |  " << std::dec << std::setw(6) << convIndex
-                << "  |[ " << std::setw(10) << std::left << (rad2deg(
-                convLowEdge)) << ",  |" << std::setw(10) << std::left
-                << (rad2deg(convHighEdge)) << " )  |" << std::right
-                << std::endl;
+    double convLowEdge = 0.;
+    double convHighEdge = 0.;
 
+    if (convIndex != badIndex) {
+      convLowEdge = m_l1CaloGeometry->emJetPhiBinLowEdge(convIndex);
+      convHighEdge = m_l1CaloGeometry->emJetPhiBinHighEdge(convIndex);
+    } else {
+      // badIndex means a bad initialIndex
+      lowEdgeToConv = 0.;
+      highEdgeToConv = 0.;
     }
 
-    // phi ETM -> (*Jet, EG)
+    myCout << "|  0x" << std::setw(3) << std::hex << std::left << indexToConv
+           << "  |  " << std::dec << std::setw(3) << std::left << indexToConv
+           << "  |[ " << std::setw(10) << std::left << (rad2deg(lowEdgeToConv))
+           << ",  |" << std::setw(10) << std::left << (rad2deg(highEdgeToConv))
+           << " )  |  0x" << std::setw(6) << std::hex << std::left << convIndex
+           << " |  " << std::dec << std::setw(6) << convIndex << "  |[ "
+           << std::setw(10) << std::left << (rad2deg(convLowEdge)) << ",  |"
+           << std::setw(10) << std::left << (rad2deg(convHighEdge)) << " )  |"
+           << std::right << std::endl;
+  }
 
-    // force a page break before each group
-    myCout << "<p style=\"page-break-before: always\">&nbsp;</p>";
+  // phi Mu -> ETM
 
-    myCout
-            << "\n---+++Phi conversion for ETM to jets and e-gamma scale common phi scale \n"
-            << std::endl;
+  // force a page break before each group
+  myCout << "<p style=\"page-break-before: always\">&nbsp;</p>";
 
-    size_t lutPhiEtmToJetEgSize = m_lutPhiEtmToJetEg.size();
-    myCout << "Size of look-up table = " << lutPhiEtmToJetEgSize << "\n"
-            << std::endl;
+  myCout << "\n---+++Phi conversion for muons to ETM phi scale \n" << std::endl;
 
-    myCout << "|  *Initial Phi Hardware Index*  "
-            << "||  *Initial Phi Range*  ||"
-            << "  *Converted Phi Hardware Index*  "
-            << "||  *Converted Phi Range*  ||" << "\n"
-            << "|  *hex*  |  *dec*  | ^|^|  *hex*  |  *dec*  |^|^|"
-            << std::endl;
+  size_t lutPhiMuToEtmSize = m_lutPhiMuToEtm.size();
+  myCout << "Size of look-up table = " << lutPhiMuToEtmSize << "\n"
+         << std::endl;
 
-    for (unsigned int indexToConv = 0; indexToConv < lutPhiEtmToJetEgSize; ++indexToConv) {
+  myCout << "|  *Initial Phi Hardware Index*  "
+         << "||  *Initial Phi Range*  ||"
+         << "  *Converted Phi Hardware Index*  "
+         << "||  *Converted Phi Range*  ||"
+         << "\n"
+         << "|  *hex*  |  *dec*  | ^|^|  *hex*  |  *dec*  |^|^|" << std::endl;
 
-        double lowEdgeToConv =
-                m_l1CaloGeometry->etSumPhiBinLowEdge(indexToConv);
-        double highEdgeToConv = m_l1CaloGeometry->etSumPhiBinHighEdge(
-                indexToConv);
+  for (unsigned int indexToConv = 0; indexToConv < lutPhiMuToEtmSize;
+       ++indexToConv) {
 
-        unsigned int convIndex = m_lutPhiEtmToJetEg[indexToConv];
+    double lowEdgeToConv =
+        m_l1MuTriggerScales->getPhiScale()->getLowEdge(indexToConv);
+    double highEdgeToConv =
+        m_l1MuTriggerScales->getPhiScale()->getHighEdge(indexToConv);
 
-        double convLowEdge = 0.;
-        double convHighEdge = 0.;
+    unsigned int convIndex = m_lutPhiMuToEtm[indexToConv];
 
-        if (convIndex != badIndex) {
-            convLowEdge = m_l1CaloGeometry->emJetPhiBinLowEdge(convIndex);
-            convHighEdge = m_l1CaloGeometry->emJetPhiBinHighEdge(convIndex);
-        } else {
-            // badIndex means a bad initialIndex
-            lowEdgeToConv = 0.;
-            highEdgeToConv = 0.;
-        }
-
-        myCout << "|  0x" << std::setw(3) << std::hex << std::left
-                << indexToConv << "  |  " << std::dec << std::setw(3)
-                << std::left << indexToConv << "  |[ " << std::setw(10)
-                << std::left << (rad2deg(lowEdgeToConv)) << ",  |"
-                << std::setw(10) << std::left << (rad2deg(highEdgeToConv))
-                << " )  |  0x" << std::setw(6) << std::hex << std::left
-                << convIndex << " |  " << std::dec << std::setw(6) << convIndex
-                << "  |[ " << std::setw(10) << std::left << (rad2deg(
-                convLowEdge)) << ",  |" << std::setw(10) << std::left
-                << (rad2deg(convHighEdge)) << " )  |" << std::right
-                << std::endl;
+    double convLowEdge = 0.;
+    double convHighEdge = 0.;
 
+    if (convIndex != badIndex) {
+      convLowEdge = m_l1CaloGeometry->etSumPhiBinLowEdge(convIndex);
+      convHighEdge = m_l1CaloGeometry->etSumPhiBinHighEdge(convIndex);
+    } else {
+      // badIndex means a bad initialIndex
+      lowEdgeToConv = 0.;
+      highEdgeToConv = 0.;
     }
 
-    // phi ETM -> HTM
-
-    // force a page break before each group
-    myCout << "<p style=\"page-break-before: always\">&nbsp;</p>";
+    myCout << "|  0x" << std::setw(3) << std::hex << std::left << indexToConv
+           << "  |  " << std::dec << std::setw(3) << std::left << indexToConv
+           << "  |[ " << std::setw(10) << std::left << (rad2deg(lowEdgeToConv))
+           << ",  |" << std::setw(10) << std::left << (rad2deg(highEdgeToConv))
+           << " )  |  0x" << std::setw(6) << std::hex << std::left << convIndex
+           << " |  " << std::dec << std::setw(6) << convIndex << "  |[ "
+           << std::setw(10) << std::left << (rad2deg(convLowEdge)) << ",  |"
+           << std::setw(10) << std::left << (rad2deg(convHighEdge)) << " )  |"
+           << std::right << std::endl;
+  }
 
-    myCout << "\n---+++Phi conversion for ETM to HTM phi scale \n" << std::endl;
+  // phi Mu -> HTM
 
-    size_t lutPhiEtmToHtmSize = m_lutPhiEtmToHtm.size();
-    myCout << "Size of look-up table = " << lutPhiEtmToHtmSize << "\n"
-            << std::endl;
+  // force a page break before each group
+  myCout << "<p style=\"page-break-before: always\">&nbsp;</p>";
 
-    myCout << "|  *Initial Phi Hardware Index*  "
-            << "||  *Initial Phi Range*  ||"
-            << "  *Converted Phi Hardware Index*  "
-            << "||  *Converted Phi Range*  ||" << "\n"
-            << "|  *hex*  |  *dec*  | ^|^|  *hex*  |  *dec*  |^|^|"
-            << std::endl;
+  myCout << "\n---+++Phi conversion for muons to HTM phi scale \n" << std::endl;
 
-    for (unsigned int indexToConv = 0; indexToConv < lutPhiEtmToHtmSize; ++indexToConv) {
+  size_t lutPhiMuToHtmSize = m_lutPhiMuToHtm.size();
+  myCout << "Size of look-up table = " << lutPhiMuToHtmSize << "\n"
+         << std::endl;
 
-        double lowEdgeToConv =
-                m_l1CaloGeometry->etSumPhiBinLowEdge(indexToConv);
-        double highEdgeToConv = m_l1CaloGeometry->etSumPhiBinHighEdge(
-                indexToConv);
+  myCout << "|  *Initial Phi Hardware Index*  "
+         << "||  *Initial Phi Range*  ||"
+         << "  *Converted Phi Hardware Index*  "
+         << "||  *Converted Phi Range*  ||"
+         << "\n"
+         << "|  *hex*  |  *dec*  | ^|^|  *hex*  |  *dec*  |^|^|" << std::endl;
 
-        unsigned int convIndex = m_lutPhiEtmToHtm[indexToConv];
+  for (unsigned int indexToConv = 0; indexToConv < lutPhiMuToHtmSize;
+       ++indexToConv) {
 
-        double convLowEdge = 0.;
-        double convHighEdge = 0.;
+    double lowEdgeToConv =
+        m_l1MuTriggerScales->getPhiScale()->getLowEdge(indexToConv);
+    double highEdgeToConv =
+        m_l1MuTriggerScales->getPhiScale()->getHighEdge(indexToConv);
 
-        if (convIndex != badIndex) {
-            convLowEdge = m_l1CaloGeometry->htSumPhiBinLowEdge(convIndex);
-            convHighEdge = m_l1CaloGeometry->htSumPhiBinHighEdge(convIndex);
-        } else {
-            // badIndex means a bad initialIndex
-            lowEdgeToConv = 0.;
-            highEdgeToConv = 0.;
-        }
+    unsigned int convIndex = m_lutPhiMuToHtm[indexToConv];
 
-        myCout << "|  0x" << std::setw(3) << std::hex << std::left
-                << indexToConv << "  |  " << std::dec << std::setw(3)
-                << std::left << indexToConv << "  |[ " << std::setw(10)
-                << std::left << (rad2deg(lowEdgeToConv)) << ",  |"
-                << std::setw(10) << std::left << (rad2deg(highEdgeToConv))
-                << " )  |  0x" << std::setw(6) << std::hex << std::left
-                << convIndex << " |  " << std::dec << std::setw(6) << convIndex
-                << "  |[ " << std::setw(10) << std::left << (rad2deg(
-                convLowEdge)) << ",  |" << std::setw(10) << std::left
-                << (rad2deg(convHighEdge)) << " )  |" << std::right
-                << std::endl;
+    double convLowEdge = 0.;
+    double convHighEdge = 0.;
 
+    if (convIndex != badIndex) {
+      convLowEdge = m_l1CaloGeometry->htSumPhiBinLowEdge(convIndex);
+      convHighEdge = m_l1CaloGeometry->htSumPhiBinHighEdge(convIndex);
+    } else {
+      // badIndex means a bad initialIndex
+      lowEdgeToConv = 0.;
+      highEdgeToConv = 0.;
     }
 
-    // phi HTM -> (*Jet, EG)
+    myCout << "|  0x" << std::setw(3) << std::hex << std::left << indexToConv
+           << "  |  " << std::dec << std::setw(3) << std::left << indexToConv
+           << "  |[ " << std::setw(10) << std::left << (rad2deg(lowEdgeToConv))
+           << ",  |" << std::setw(10) << std::left << (rad2deg(highEdgeToConv))
+           << " )  |  0x" << std::setw(6) << std::hex << std::left << convIndex
+           << " |  " << std::dec << std::setw(6) << convIndex << "  |[ "
+           << std::setw(10) << std::left << (rad2deg(convLowEdge)) << ",  |"
+           << std::setw(10) << std::left << (rad2deg(convHighEdge)) << " )  |"
+           << std::right << std::endl;
+  }
 
+  // phi ETM -> (*Jet, EG)
 
-    // force a page break before each group
-    myCout << "<p style=\"page-break-before: always\">&nbsp;</p>";
+  // force a page break before each group
+  myCout << "<p style=\"page-break-before: always\">&nbsp;</p>";
 
-    myCout
-            << "\n---+++Phi conversion for HTM to jets and e-gamma scale common phi scale \n"
-            << std::endl;
+  myCout << "\n---+++Phi conversion for ETM to jets and e-gamma scale common "
+            "phi scale \n"
+         << std::endl;
 
-    size_t lutPhiHtmToJetEgSize = m_lutPhiHtmToJetEg.size();
-    myCout << "Size of look-up table = " << lutPhiHtmToJetEgSize << "\n"
-            << std::endl;
+  size_t lutPhiEtmToJetEgSize = m_lutPhiEtmToJetEg.size();
+  myCout << "Size of look-up table = " << lutPhiEtmToJetEgSize << "\n"
+         << std::endl;
 
-    myCout << "|  *Initial Phi Hardware Index*  "
-            << "||  *Initial Phi Range*  ||"
-            << "  *Converted Phi Hardware Index*  "
-            << "||  *Converted Phi Range*  ||" << "\n"
-            << "|  *hex*  |  *dec*  | ^|^|  *hex*  |  *dec*  |^|^|"
-            << std::endl;
+  myCout << "|  *Initial Phi Hardware Index*  "
+         << "||  *Initial Phi Range*  ||"
+         << "  *Converted Phi Hardware Index*  "
+         << "||  *Converted Phi Range*  ||"
+         << "\n"
+         << "|  *hex*  |  *dec*  | ^|^|  *hex*  |  *dec*  |^|^|" << std::endl;
 
-    for (unsigned int indexToConv = 0; indexToConv < lutPhiHtmToJetEgSize; ++indexToConv) {
+  for (unsigned int indexToConv = 0; indexToConv < lutPhiEtmToJetEgSize;
+       ++indexToConv) {
 
-        double lowEdgeToConv =
-                m_l1CaloGeometry->htSumPhiBinLowEdge(indexToConv);
-        double highEdgeToConv = m_l1CaloGeometry->htSumPhiBinHighEdge(
-                indexToConv);
+    double lowEdgeToConv = m_l1CaloGeometry->etSumPhiBinLowEdge(indexToConv);
+    double highEdgeToConv = m_l1CaloGeometry->etSumPhiBinHighEdge(indexToConv);
 
-        unsigned int convIndex = m_lutPhiHtmToJetEg[indexToConv];
+    unsigned int convIndex = m_lutPhiEtmToJetEg[indexToConv];
 
-        double convLowEdge = 0.;
-        double convHighEdge = 0.;
-
-        if (convIndex != badIndex) {
-            convLowEdge = m_l1CaloGeometry->emJetPhiBinLowEdge(convIndex);
-            convHighEdge = m_l1CaloGeometry->emJetPhiBinHighEdge(convIndex);
-        } else {
-            // badIndex means a bad initialIndex
-            lowEdgeToConv = 0.;
-            highEdgeToConv = 0.;
-        }
-
-        myCout << "|  0x" << std::setw(3) << std::hex << std::left
-                << indexToConv << "  |  " << std::dec << std::setw(3)
-                << std::left << indexToConv << "  |[ " << std::setw(10)
-                << std::left << (rad2deg(lowEdgeToConv)) << ",  |"
-                << std::setw(10) << std::left << (rad2deg(highEdgeToConv))
-                << " )  |  0x" << std::setw(6) << std::hex << std::left
-                << convIndex << " |  " << std::dec << std::setw(6) << convIndex
-                << "  |[ " << std::setw(10) << std::left << (rad2deg(
-                convLowEdge)) << ",  |" << std::setw(10) << std::left
-                << (rad2deg(convHighEdge)) << " )  |" << std::right
-                << std::endl;
+    double convLowEdge = 0.;
+    double convHighEdge = 0.;
 
+    if (convIndex != badIndex) {
+      convLowEdge = m_l1CaloGeometry->emJetPhiBinLowEdge(convIndex);
+      convHighEdge = m_l1CaloGeometry->emJetPhiBinHighEdge(convIndex);
+    } else {
+      // badIndex means a bad initialIndex
+      lowEdgeToConv = 0.;
+      highEdgeToConv = 0.;
     }
 
-    //
-    // eta conversions
-    //
-
-
-    // CenJet/TauJet & IsoEG/NoIsoEG to a common central / forward calorimeter eta scale
-
+    myCout << "|  0x" << std::setw(3) << std::hex << std::left << indexToConv
+           << "  |  " << std::dec << std::setw(3) << std::left << indexToConv
+           << "  |[ " << std::setw(10) << std::left << (rad2deg(lowEdgeToConv))
+           << ",  |" << std::setw(10) << std::left << (rad2deg(highEdgeToConv))
+           << " )  |  0x" << std::setw(6) << std::hex << std::left << convIndex
+           << " |  " << std::dec << std::setw(6) << convIndex << "  |[ "
+           << std::setw(10) << std::left << (rad2deg(convLowEdge)) << ",  |"
+           << std::setw(10) << std::left << (rad2deg(convHighEdge)) << " )  |"
+           << std::right << std::endl;
+  }
 
-    // force a page break before each group
-    myCout << "<p style=\"page-break-before: always\">&nbsp;</p>";
+  // phi ETM -> HTM
 
-    myCout
-            << "\n---+++Eta conversion for central and tau jets and e-gamma objects to a common central and forward calorimeter eta scale \n"
-            << std::endl;
+  // force a page break before each group
+  myCout << "<p style=\"page-break-before: always\">&nbsp;</p>";
 
-    size_t lutEtaCentralToCommonCaloSize = m_lutEtaCentralToCommonCalo.size();
-    myCout << "Size of look-up table = " << lutEtaCentralToCommonCaloSize
-            << "\n" << std::endl;
+  myCout << "\n---+++Phi conversion for ETM to HTM phi scale \n" << std::endl;
 
-    myCout << "|  *Initial Eta Hardware Index*  "
-            << "||  *Initial Eta Range*  ||"
-            << "  *Converted Eta Hardware Index*  "
-            << "||  *Converted Eta Range*  ||" << "\n"
-            << "|  *hex*  |  *dec*  | ^|^|  *hex*  |  *dec*  |^|^|"
-            << std::endl;
+  size_t lutPhiEtmToHtmSize = m_lutPhiEtmToHtm.size();
+  myCout << "Size of look-up table = " << lutPhiEtmToHtmSize << "\n"
+         << std::endl;
 
-    for (unsigned int indexToConv = 0; indexToConv
-            < lutEtaCentralToCommonCaloSize; ++indexToConv) {
+  myCout << "|  *Initial Phi Hardware Index*  "
+         << "||  *Initial Phi Range*  ||"
+         << "  *Converted Phi Hardware Index*  "
+         << "||  *Converted Phi Range*  ||"
+         << "\n"
+         << "|  *hex*  |  *dec*  | ^|^|  *hex*  |  *dec*  |^|^|" << std::endl;
 
-        double lowEdgeToConv = m_l1CaloGeometry->globalEtaBinLowEdge(
-                m_l1CaloGeometry->globalEtaIndex(
-                        m_l1CaloGeometry->etaBinCenter(indexToConv, true)));
-        double highEdgeToConv = m_l1CaloGeometry->globalEtaBinLowEdge(
-                m_l1CaloGeometry->globalEtaIndex(
-                        m_l1CaloGeometry->etaBinCenter(indexToConv, true)) + 1);
+  for (unsigned int indexToConv = 0; indexToConv < lutPhiEtmToHtmSize;
+       ++indexToConv) {
 
-        unsigned int convIndex = m_lutEtaCentralToCommonCalo[indexToConv];
+    double lowEdgeToConv = m_l1CaloGeometry->etSumPhiBinLowEdge(indexToConv);
+    double highEdgeToConv = m_l1CaloGeometry->etSumPhiBinHighEdge(indexToConv);
 
-        double convLowEdge = 0.;
-        double convHighEdge = 0.;
+    unsigned int convIndex = m_lutPhiEtmToHtm[indexToConv];
 
-        if (convIndex != badIndex) {
-            convLowEdge = m_l1CaloGeometry->globalEtaBinLowEdge(convIndex);
-            convHighEdge = m_l1CaloGeometry->globalEtaBinLowEdge(convIndex + 1);
-        } else {
-            // badIndex means a bad initialIndex
-            lowEdgeToConv = 0.;
-            highEdgeToConv = 0.;
-        }
+    double convLowEdge = 0.;
+    double convHighEdge = 0.;
 
-        myCout << "|  0x" << std::setw(3) << std::hex << std::left
-                << indexToConv << "  |  " << std::dec << std::setw(3)
-                << std::left << indexToConv << "  |[ " << std::setw(10)
-                << std::left << lowEdgeToConv << ",  |" << std::setw(10)
-                << std::left << highEdgeToConv << " )  |  0x" << std::setw(6)
-                << std::hex << std::left << convIndex << " |  " << std::dec
-                << std::setw(6) << convIndex << "  |[ " << std::setw(10)
-                << std::left << convLowEdge << ",  |" << std::setw(10)
-                << std::left << convHighEdge << " )  |" << std::right
-                << std::endl;
+    if (convIndex != badIndex) {
+      convLowEdge = m_l1CaloGeometry->htSumPhiBinLowEdge(convIndex);
+      convHighEdge = m_l1CaloGeometry->htSumPhiBinHighEdge(convIndex);
+    } else {
+      // badIndex means a bad initialIndex
+      lowEdgeToConv = 0.;
+      highEdgeToConv = 0.;
     }
 
-    // ForJet to a common central / forward calorimeter eta scale
+    myCout << "|  0x" << std::setw(3) << std::hex << std::left << indexToConv
+           << "  |  " << std::dec << std::setw(3) << std::left << indexToConv
+           << "  |[ " << std::setw(10) << std::left << (rad2deg(lowEdgeToConv))
+           << ",  |" << std::setw(10) << std::left << (rad2deg(highEdgeToConv))
+           << " )  |  0x" << std::setw(6) << std::hex << std::left << convIndex
+           << " |  " << std::dec << std::setw(6) << convIndex << "  |[ "
+           << std::setw(10) << std::left << (rad2deg(convLowEdge)) << ",  |"
+           << std::setw(10) << std::left << (rad2deg(convHighEdge)) << " )  |"
+           << std::right << std::endl;
+  }
 
+  // phi HTM -> (*Jet, EG)
 
-    // force a page break before each group
-    myCout << "<p style=\"page-break-before: always\">&nbsp;</p>";
+  // force a page break before each group
+  myCout << "<p style=\"page-break-before: always\">&nbsp;</p>";
 
-    myCout
-            << "\n---+++Eta conversion for forward jets to a common central and forward calorimeter eta scale \n"
-            << std::endl;
+  myCout << "\n---+++Phi conversion for HTM to jets and e-gamma scale common "
+            "phi scale \n"
+         << std::endl;
 
-    size_t lutEtaForJetToCommonCaloSize = m_lutEtaForJetToCommonCalo.size();
-    myCout << "Size of look-up table = " << lutEtaForJetToCommonCaloSize
-            << "\n" << std::endl;
+  size_t lutPhiHtmToJetEgSize = m_lutPhiHtmToJetEg.size();
+  myCout << "Size of look-up table = " << lutPhiHtmToJetEgSize << "\n"
+         << std::endl;
 
-    myCout << "|  *Initial Eta Hardware Index*  "
-            << "||  *Initial Eta Range*  ||"
-            << "  *Converted Eta Hardware Index*  "
-            << "||  *Converted Eta Range*  ||" << "\n"
-            << "|  *hex*  |  *dec*  | ^|^|  *hex*  |  *dec*  |^|^|"
-            << std::endl;
+  myCout << "|  *Initial Phi Hardware Index*  "
+         << "||  *Initial Phi Range*  ||"
+         << "  *Converted Phi Hardware Index*  "
+         << "||  *Converted Phi Range*  ||"
+         << "\n"
+         << "|  *hex*  |  *dec*  | ^|^|  *hex*  |  *dec*  |^|^|" << std::endl;
 
-    for (unsigned int indexToConv = 0; indexToConv
-            < lutEtaForJetToCommonCaloSize; ++indexToConv) {
+  for (unsigned int indexToConv = 0; indexToConv < lutPhiHtmToJetEgSize;
+       ++indexToConv) {
 
-        double lowEdgeToConv = m_l1CaloGeometry->globalEtaBinLowEdge(
-                m_l1CaloGeometry->globalEtaIndex(
-                        m_l1CaloGeometry->etaBinCenter(indexToConv, false)));
-        double highEdgeToConv =
-                m_l1CaloGeometry->globalEtaBinLowEdge(
-                        m_l1CaloGeometry->globalEtaIndex(
-                                m_l1CaloGeometry->etaBinCenter(indexToConv,
-                                        false)) + 1);
+    double lowEdgeToConv = m_l1CaloGeometry->htSumPhiBinLowEdge(indexToConv);
+    double highEdgeToConv = m_l1CaloGeometry->htSumPhiBinHighEdge(indexToConv);
 
-        unsigned int convIndex = m_lutEtaForJetToCommonCalo[indexToConv];
+    unsigned int convIndex = m_lutPhiHtmToJetEg[indexToConv];
 
-        double convLowEdge = 0.;
-        double convHighEdge = 0.;
-
-        if (convIndex != badIndex) {
-            convLowEdge = m_l1CaloGeometry->globalEtaBinLowEdge(convIndex);
-            convHighEdge = m_l1CaloGeometry->globalEtaBinLowEdge(convIndex + 1);
-        } else {
-            // badIndex means a bad initialIndex
-            lowEdgeToConv = 0.;
-            highEdgeToConv = 0.;
-        }
+    double convLowEdge = 0.;
+    double convHighEdge = 0.;
 
-        myCout << "|  0x" << std::setw(3) << std::hex << std::left
-                << indexToConv << "  |  " << std::dec << std::setw(3)
-                << std::left << indexToConv << "  |[ " << std::setw(10)
-                << std::left << lowEdgeToConv << ",  |" << std::setw(10)
-                << std::left << highEdgeToConv << " )  |  0x" << std::setw(6)
-                << std::hex << std::left << convIndex << " |  " << std::dec
-                << std::setw(6) << convIndex << "  |[ " << std::setw(10)
-                << std::left << convLowEdge << ",  |" << std::setw(10)
-                << std::left << convHighEdge << " )  |" << std::right
-                << std::endl;
+    if (convIndex != badIndex) {
+      convLowEdge = m_l1CaloGeometry->emJetPhiBinLowEdge(convIndex);
+      convHighEdge = m_l1CaloGeometry->emJetPhiBinHighEdge(convIndex);
+    } else {
+      // badIndex means a bad initialIndex
+      lowEdgeToConv = 0.;
+      highEdgeToConv = 0.;
     }
 
-    // Mu to a common central / forward calorimeter eta scale
-
-    // force a page break before each group
-    myCout << "<p style=\"page-break-before: always\">&nbsp;</p>";
-
-    myCout
-            << "\n---+++Eta conversion for muons to a common central and forward calorimeter eta scale \n"
-            << std::endl;
-
-    size_t lutEtaMuToCommonCaloSize = m_lutEtaMuToCommonCalo.size();
-    myCout << "Size of look-up table = " << lutEtaMuToCommonCaloSize << "\n"
-            << std::endl;
+    myCout << "|  0x" << std::setw(3) << std::hex << std::left << indexToConv
+           << "  |  " << std::dec << std::setw(3) << std::left << indexToConv
+           << "  |[ " << std::setw(10) << std::left << (rad2deg(lowEdgeToConv))
+           << ",  |" << std::setw(10) << std::left << (rad2deg(highEdgeToConv))
+           << " )  |  0x" << std::setw(6) << std::hex << std::left << convIndex
+           << " |  " << std::dec << std::setw(6) << convIndex << "  |[ "
+           << std::setw(10) << std::left << (rad2deg(convLowEdge)) << ",  |"
+           << std::setw(10) << std::left << (rad2deg(convHighEdge)) << " )  |"
+           << std::right << std::endl;
+  }
+
+  //
+  // eta conversions
+  //
+
+  // CenJet/TauJet & IsoEG/NoIsoEG to a common central / forward calorimeter eta
+  // scale
+
+  // force a page break before each group
+  myCout << "<p style=\"page-break-before: always\">&nbsp;</p>";
+
+  myCout << "\n---+++Eta conversion for central and tau jets and e-gamma "
+            "objects to a common central and forward calorimeter eta scale \n"
+         << std::endl;
+
+  size_t lutEtaCentralToCommonCaloSize = m_lutEtaCentralToCommonCalo.size();
+  myCout << "Size of look-up table = " << lutEtaCentralToCommonCaloSize << "\n"
+         << std::endl;
+
+  myCout << "|  *Initial Eta Hardware Index*  "
+         << "||  *Initial Eta Range*  ||"
+         << "  *Converted Eta Hardware Index*  "
+         << "||  *Converted Eta Range*  ||"
+         << "\n"
+         << "|  *hex*  |  *dec*  | ^|^|  *hex*  |  *dec*  |^|^|" << std::endl;
+
+  for (unsigned int indexToConv = 0;
+       indexToConv < lutEtaCentralToCommonCaloSize; ++indexToConv) {
+
+    double lowEdgeToConv =
+        m_l1CaloGeometry->globalEtaBinLowEdge(m_l1CaloGeometry->globalEtaIndex(
+            m_l1CaloGeometry->etaBinCenter(indexToConv, true)));
+    double highEdgeToConv = m_l1CaloGeometry->globalEtaBinLowEdge(
+        m_l1CaloGeometry->globalEtaIndex(
+            m_l1CaloGeometry->etaBinCenter(indexToConv, true)) +
+        1);
+
+    unsigned int convIndex = m_lutEtaCentralToCommonCalo[indexToConv];
+
+    double convLowEdge = 0.;
+    double convHighEdge = 0.;
+
+    if (convIndex != badIndex) {
+      convLowEdge = m_l1CaloGeometry->globalEtaBinLowEdge(convIndex);
+      convHighEdge = m_l1CaloGeometry->globalEtaBinLowEdge(convIndex + 1);
+    } else {
+      // badIndex means a bad initialIndex
+      lowEdgeToConv = 0.;
+      highEdgeToConv = 0.;
+    }
 
-    unsigned int nrBinsEtaMuPerHalf =
-            m_l1MuTriggerScales->getGMTEtaScale()->getNBins();
+    myCout << "|  0x" << std::setw(3) << std::hex << std::left << indexToConv
+           << "  |  " << std::dec << std::setw(3) << std::left << indexToConv
+           << "  |[ " << std::setw(10) << std::left << lowEdgeToConv << ",  |"
+           << std::setw(10) << std::left << highEdgeToConv << " )  |  0x"
+           << std::setw(6) << std::hex << std::left << convIndex << " |  "
+           << std::dec << std::setw(6) << convIndex << "  |[ " << std::setw(10)
+           << std::left << convLowEdge << ",  |" << std::setw(10) << std::left
+           << convHighEdge << " )  |" << std::right << std::endl;
+  }
+
+  // ForJet to a common central / forward calorimeter eta scale
+
+  // force a page break before each group
+  myCout << "<p style=\"page-break-before: always\">&nbsp;</p>";
+
+  myCout << "\n---+++Eta conversion for forward jets to a common central and "
+            "forward calorimeter eta scale \n"
+         << std::endl;
+
+  size_t lutEtaForJetToCommonCaloSize = m_lutEtaForJetToCommonCalo.size();
+  myCout << "Size of look-up table = " << lutEtaForJetToCommonCaloSize << "\n"
+         << std::endl;
+
+  myCout << "|  *Initial Eta Hardware Index*  "
+         << "||  *Initial Eta Range*  ||"
+         << "  *Converted Eta Hardware Index*  "
+         << "||  *Converted Eta Range*  ||"
+         << "\n"
+         << "|  *hex*  |  *dec*  | ^|^|  *hex*  |  *dec*  |^|^|" << std::endl;
+
+  for (unsigned int indexToConv = 0; indexToConv < lutEtaForJetToCommonCaloSize;
+       ++indexToConv) {
+
+    double lowEdgeToConv =
+        m_l1CaloGeometry->globalEtaBinLowEdge(m_l1CaloGeometry->globalEtaIndex(
+            m_l1CaloGeometry->etaBinCenter(indexToConv, false)));
+    double highEdgeToConv = m_l1CaloGeometry->globalEtaBinLowEdge(
+        m_l1CaloGeometry->globalEtaIndex(
+            m_l1CaloGeometry->etaBinCenter(indexToConv, false)) +
+        1);
+
+    unsigned int convIndex = m_lutEtaForJetToCommonCalo[indexToConv];
+
+    double convLowEdge = 0.;
+    double convHighEdge = 0.;
+
+    if (convIndex != badIndex) {
+      convLowEdge = m_l1CaloGeometry->globalEtaBinLowEdge(convIndex);
+      convHighEdge = m_l1CaloGeometry->globalEtaBinLowEdge(convIndex + 1);
+    } else {
+      // badIndex means a bad initialIndex
+      lowEdgeToConv = 0.;
+      highEdgeToConv = 0.;
+    }
 
-    myCout << "|  *Initial Eta Hardware Index*  "
-            << "||  *Initial Eta Range*  ||"
-            << "  *Converted Eta Hardware Index*  "
-            << "||  *Converted Eta Range*  ||" << "\n"
-            << "|  *hex*  |  *dec*  | ^|^|  *hex*  |  *dec*  |^|^|"
-            << std::endl;
+    myCout << "|  0x" << std::setw(3) << std::hex << std::left << indexToConv
+           << "  |  " << std::dec << std::setw(3) << std::left << indexToConv
+           << "  |[ " << std::setw(10) << std::left << lowEdgeToConv << ",  |"
+           << std::setw(10) << std::left << highEdgeToConv << " )  |  0x"
+           << std::setw(6) << std::hex << std::left << convIndex << " |  "
+           << std::dec << std::setw(6) << convIndex << "  |[ " << std::setw(10)
+           << std::left << convLowEdge << ",  |" << std::setw(10) << std::left
+           << convHighEdge << " )  |" << std::right << std::endl;
+  }
+
+  // Mu to a common central / forward calorimeter eta scale
+
+  // force a page break before each group
+  myCout << "<p style=\"page-break-before: always\">&nbsp;</p>";
+
+  myCout << "\n---+++Eta conversion for muons to a common central and forward "
+            "calorimeter eta scale \n"
+         << std::endl;
+
+  size_t lutEtaMuToCommonCaloSize = m_lutEtaMuToCommonCalo.size();
+  myCout << "Size of look-up table = " << lutEtaMuToCommonCaloSize << "\n"
+         << std::endl;
+
+  unsigned int nrBinsEtaMuPerHalf =
+      m_l1MuTriggerScales->getGMTEtaScale()->getNBins();
+
+  myCout << "|  *Initial Eta Hardware Index*  "
+         << "||  *Initial Eta Range*  ||"
+         << "  *Converted Eta Hardware Index*  "
+         << "||  *Converted Eta Range*  ||"
+         << "\n"
+         << "|  *hex*  |  *dec*  | ^|^|  *hex*  |  *dec*  |^|^|" << std::endl;
+
+  for (unsigned int indexToConv = 0; indexToConv < lutEtaMuToCommonCaloSize;
+       ++indexToConv) {
+
+    // Mu scale defined for positive values only, need to be symmetrized
+    unsigned int iBinOffset = 0;
+    double etaSign = 1.;
+
+    if (indexToConv > nrBinsEtaMuPerHalf) {
+      iBinOffset = nrBinsEtaMuPerHalf + 1;
+      etaSign = -1.;
+    }
 
-    for (unsigned int indexToConv = 0; indexToConv < lutEtaMuToCommonCaloSize; ++indexToConv) {
+    double lowEdgeToConv =
+        etaSign * m_l1MuTriggerScales->getGMTEtaScale()->getValue(indexToConv -
+                                                                  iBinOffset);
+    double highEdgeToConv =
+        etaSign * m_l1MuTriggerScales->getGMTEtaScale()->getValue(
+                      indexToConv + 1 - iBinOffset);
 
-        // Mu scale defined for positive values only, need to be symmetrized
-        unsigned int iBinOffset = 0;
-        double etaSign = 1.;
+    unsigned int convIndex = m_lutEtaMuToCommonCalo[indexToConv];
 
-        if (indexToConv > nrBinsEtaMuPerHalf) {
-            iBinOffset = nrBinsEtaMuPerHalf + 1;
-            etaSign = -1.;
-        }
+    double convLowEdge = 0.;
+    double convHighEdge = 0.;
 
-        double lowEdgeToConv = etaSign
-                * m_l1MuTriggerScales->getGMTEtaScale()->getValue(
-                        indexToConv - iBinOffset);
-        double highEdgeToConv = etaSign
-                * m_l1MuTriggerScales->getGMTEtaScale()->getValue(
-                        indexToConv + 1 - iBinOffset);
-
-        unsigned int convIndex = m_lutEtaMuToCommonCalo[indexToConv];
-
-        double convLowEdge = 0.;
-        double convHighEdge = 0.;
-
-        if (convIndex != badIndex) {
-            convLowEdge = m_l1CaloGeometry->globalEtaBinLowEdge(convIndex);
-            convHighEdge = m_l1CaloGeometry->globalEtaBinLowEdge(convIndex + 1);
-        } else {
-            // badIndex means a bad initialIndex
-            lowEdgeToConv = 0.;
-            highEdgeToConv = 0.;
-        }
-
-        myCout << "|  0x" << std::setw(3) << std::hex << std::left
-                << indexToConv << "  |  " << std::dec << std::setw(3)
-                << std::left << indexToConv << "  |[ " << std::setw(10)
-                << std::left << lowEdgeToConv << ",  |" << std::setw(10)
-                << std::left << highEdgeToConv << " )  |  0x" << std::setw(6)
-                << std::hex << std::left << convIndex << " |  " << std::dec
-                << std::setw(6) << convIndex << "  |[ " << std::setw(10)
-                << std::left << convLowEdge << ",  |" << std::setw(10)
-                << std::left << convHighEdge << " )  |" << std::right
-                << std::endl;
+    if (convIndex != badIndex) {
+      convLowEdge = m_l1CaloGeometry->globalEtaBinLowEdge(convIndex);
+      convHighEdge = m_l1CaloGeometry->globalEtaBinLowEdge(convIndex + 1);
+    } else {
+      // badIndex means a bad initialIndex
+      lowEdgeToConv = 0.;
+      highEdgeToConv = 0.;
     }
 
+    myCout << "|  0x" << std::setw(3) << std::hex << std::left << indexToConv
+           << "  |  " << std::dec << std::setw(3) << std::left << indexToConv
+           << "  |[ " << std::setw(10) << std::left << lowEdgeToConv << ",  |"
+           << std::setw(10) << std::left << highEdgeToConv << " )  |  0x"
+           << std::setw(6) << std::hex << std::left << convIndex << " |  "
+           << std::dec << std::setw(6) << convIndex << "  |[ " << std::setw(10)
+           << std::left << convLowEdge << ",  |" << std::setw(10) << std::left
+           << convHighEdge << " )  |" << std::right << std::endl;
+  }
 }
 
 // convert phi from rad (-pi, pi] to deg (0, 360)
-const double L1GtEtaPhiConversions::rad2deg(const double& phiRad) const {
+const double L1GtEtaPhiConversions::rad2deg(const double &phiRad) const {
 
-    if (phiRad < 0.) {
-        return (phiRad * PiConversion) + 360.;
-    } else {
-        return (phiRad * PiConversion);
-    }
+  if (phiRad < 0.) {
+    return (phiRad * PiConversion) + 360.;
+  } else {
+    return (phiRad * PiConversion);
+  }
 }
 
 // static members
 
 const unsigned int L1GtEtaPhiConversions::badIndex = 999999;
 const double L1GtEtaPhiConversions::PiConversion = 180. / acos(-1.);
-
diff --git a/L1Trigger/GlobalTrigger/src/L1GtExternalCondition.cc b/L1Trigger/GlobalTrigger/src/L1GtExternalCondition.cc
index fb50c4ac733d5..f8f4c6352d3d1 100644
--- a/L1Trigger/GlobalTrigger/src/L1GtExternalCondition.cc
+++ b/L1Trigger/GlobalTrigger/src/L1GtExternalCondition.cc
@@ -26,83 +26,74 @@
 
 // constructors
 //     default
-L1GtExternalCondition::L1GtExternalCondition() :
-    L1GtConditionEvaluation() {
-
-    m_conditionResult = false;
+L1GtExternalCondition::L1GtExternalCondition() : L1GtConditionEvaluation() {
 
+  m_conditionResult = false;
 }
 
 //     from base template condition (from event setup usually)
-L1GtExternalCondition::L1GtExternalCondition(const L1GtCondition* externalTemplate,
-        const bool result) :
-            L1GtConditionEvaluation(),
-            m_gtExternalTemplate(static_cast<const L1GtExternalTemplate*>(externalTemplate)),
-            m_conditionResult(result) {
-
-    // maximum number of objects received for the evaluation of the condition
-    // no object
-    m_condMaxNumberObjects = 0;
-
+L1GtExternalCondition::L1GtExternalCondition(
+    const L1GtCondition *externalTemplate, const bool result)
+    : L1GtConditionEvaluation(),
+      m_gtExternalTemplate(
+          static_cast<const L1GtExternalTemplate *>(externalTemplate)),
+      m_conditionResult(result) {
+
+  // maximum number of objects received for the evaluation of the condition
+  // no object
+  m_condMaxNumberObjects = 0;
 }
 
 // copy constructor
 void L1GtExternalCondition::copy(const L1GtExternalCondition &cp) {
 
-    m_gtExternalTemplate = cp.gtExternalTemplate();
-    m_conditionResult = cp.conditionResult();
+  m_gtExternalTemplate = cp.gtExternalTemplate();
+  m_conditionResult = cp.conditionResult();
 
-    m_condMaxNumberObjects = cp.condMaxNumberObjects();
-    m_condLastResult = cp.condLastResult();
-    m_combinationsInCond = cp.getCombinationsInCond();
-
-    m_verbosity = cp.m_verbosity;
+  m_condMaxNumberObjects = cp.condMaxNumberObjects();
+  m_condLastResult = cp.condLastResult();
+  m_combinationsInCond = cp.getCombinationsInCond();
 
+  m_verbosity = cp.m_verbosity;
 }
 
-L1GtExternalCondition::L1GtExternalCondition(const L1GtExternalCondition& cp) :
-    L1GtConditionEvaluation() {
-
-    copy(cp);
+L1GtExternalCondition::L1GtExternalCondition(const L1GtExternalCondition &cp)
+    : L1GtConditionEvaluation() {
 
+  copy(cp);
 }
 
 // destructor
 L1GtExternalCondition::~L1GtExternalCondition() {
 
-    // empty
-
+  // empty
 }
 
 // equal operator
-L1GtExternalCondition& L1GtExternalCondition::operator= (const L1GtExternalCondition& cp)
-{
-    copy(cp);
-    return *this;
+L1GtExternalCondition &L1GtExternalCondition::
+operator=(const L1GtExternalCondition &cp) {
+  copy(cp);
+  return *this;
 }
 
 // methods
 void L1GtExternalCondition::setGtExternalTemplate(
-        const L1GtExternalTemplate* externalTemplate) {
-
-    m_gtExternalTemplate = externalTemplate;
+    const L1GtExternalTemplate *externalTemplate) {
 
+  m_gtExternalTemplate = externalTemplate;
 }
 
 const bool L1GtExternalCondition::evaluateCondition() const {
 
-    // clear the m_combinationsInCond vector
-    (combinationsInCond()).clear();
-
-    //
-    return m_conditionResult;
+  // clear the m_combinationsInCond vector
+  (combinationsInCond()).clear();
 
+  //
+  return m_conditionResult;
 }
 
-void L1GtExternalCondition::print(std::ostream& myCout) const {
-
-    m_gtExternalTemplate->print(myCout);
-    L1GtConditionEvaluation::print(myCout);
+void L1GtExternalCondition::print(std::ostream &myCout) const {
 
+  m_gtExternalTemplate->print(myCout);
+  L1GtConditionEvaluation::print(myCout);
 }
-
diff --git a/L1Trigger/GlobalTrigger/src/L1GtHfBitCountsCondition.cc b/L1Trigger/GlobalTrigger/src/L1GtHfBitCountsCondition.cc
index 9ad67d2ef5651..2808d0ede3630 100644
--- a/L1Trigger/GlobalTrigger/src/L1GtHfBitCountsCondition.cc
+++ b/L1Trigger/GlobalTrigger/src/L1GtHfBitCountsCondition.cc
@@ -16,8 +16,8 @@
 #include "L1Trigger/GlobalTrigger/interface/L1GtHfBitCountsCondition.h"
 
 // system include files
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
 #include <vector>
 
@@ -25,8 +25,8 @@
 //   base class
 #include "L1Trigger/GlobalTrigger/interface/L1GtConditionEvaluation.h"
 
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctHFBitCounts.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 
 #include "CondFormats/L1TObjects/interface/L1GtHfBitCountsTemplate.h"
 
@@ -34,144 +34,137 @@
 
 // constructors
 //     default
-L1GtHfBitCountsCondition::L1GtHfBitCountsCondition() :
-    L1GtConditionEvaluation() {
-
-    //empty
+L1GtHfBitCountsCondition::L1GtHfBitCountsCondition()
+    : L1GtConditionEvaluation() {
 
+  // empty
 }
 
 //     from base template condition (from event setup usually)
 L1GtHfBitCountsCondition::L1GtHfBitCountsCondition(
-        const L1GtCondition* bcTemplate, const L1GlobalTriggerPSB* ptrPSB) :
-    L1GtConditionEvaluation(), m_gtHfBitCountsTemplate(
-            static_cast<const L1GtHfBitCountsTemplate*> (bcTemplate)), m_gtPSB(
-            ptrPSB)
-{
-
-    // maximum number of objects received for the evaluation of the condition
-    // no objects, in fact, just a count
-    m_condMaxNumberObjects = 1;
-
+    const L1GtCondition *bcTemplate, const L1GlobalTriggerPSB *ptrPSB)
+    : L1GtConditionEvaluation(),
+      m_gtHfBitCountsTemplate(
+          static_cast<const L1GtHfBitCountsTemplate *>(bcTemplate)),
+      m_gtPSB(ptrPSB) {
+
+  // maximum number of objects received for the evaluation of the condition
+  // no objects, in fact, just a count
+  m_condMaxNumberObjects = 1;
 }
 
 // copy constructor
 void L1GtHfBitCountsCondition::copy(const L1GtHfBitCountsCondition &cp) {
 
-    m_gtHfBitCountsTemplate = cp.gtHfBitCountsTemplate();
-    m_gtPSB = cp.gtPSB();
+  m_gtHfBitCountsTemplate = cp.gtHfBitCountsTemplate();
+  m_gtPSB = cp.gtPSB();
 
-    m_condMaxNumberObjects = cp.condMaxNumberObjects();
-    m_condLastResult = cp.condLastResult();
-    m_combinationsInCond = cp.getCombinationsInCond();
-
-    m_verbosity = cp.m_verbosity;
+  m_condMaxNumberObjects = cp.condMaxNumberObjects();
+  m_condLastResult = cp.condLastResult();
+  m_combinationsInCond = cp.getCombinationsInCond();
 
+  m_verbosity = cp.m_verbosity;
 }
 
-L1GtHfBitCountsCondition::L1GtHfBitCountsCondition(const L1GtHfBitCountsCondition& cp) :
-    L1GtConditionEvaluation() {
-
-    copy(cp);
+L1GtHfBitCountsCondition::L1GtHfBitCountsCondition(
+    const L1GtHfBitCountsCondition &cp)
+    : L1GtConditionEvaluation() {
 
+  copy(cp);
 }
 
 // destructor
 L1GtHfBitCountsCondition::~L1GtHfBitCountsCondition() {
 
-    // empty
-
+  // empty
 }
 
 // equal operator
-L1GtHfBitCountsCondition& L1GtHfBitCountsCondition::operator= (const L1GtHfBitCountsCondition& cp)
-{
-    copy(cp);
-    return *this;
+L1GtHfBitCountsCondition &L1GtHfBitCountsCondition::
+operator=(const L1GtHfBitCountsCondition &cp) {
+  copy(cp);
+  return *this;
 }
 
 // methods
-void L1GtHfBitCountsCondition::setGtHfBitCountsTemplate(const L1GtHfBitCountsTemplate* bcTemplate) {
-
-    m_gtHfBitCountsTemplate = bcTemplate;
+void L1GtHfBitCountsCondition::setGtHfBitCountsTemplate(
+    const L1GtHfBitCountsTemplate *bcTemplate) {
 
+  m_gtHfBitCountsTemplate = bcTemplate;
 }
 
 ///   set the pointer to PSB
-void L1GtHfBitCountsCondition::setGtPSB(const L1GlobalTriggerPSB* ptrPSB) {
-
-    m_gtPSB = ptrPSB;
+void L1GtHfBitCountsCondition::setGtPSB(const L1GlobalTriggerPSB *ptrPSB) {
 
+  m_gtPSB = ptrPSB;
 }
 
 // try all object permutations and check spatial correlations, if required
 const bool L1GtHfBitCountsCondition::evaluateCondition() const {
 
-    // number of trigger objects in the condition
-    // no objects, in fact, just a count
-    int iCondition = 0;
+  // number of trigger objects in the condition
+  // no objects, in fact, just a count
+  int iCondition = 0;
 
-    // condition result condResult will be set to true if the HF bit counts
-    // passes the requirement
-    bool condResult = false;
+  // condition result condResult will be set to true if the HF bit counts
+  // passes the requirement
+  bool condResult = false;
 
-    // store the index of the HfBitCounts object
-    // from the combination evaluated in the condition
-    SingleCombInCond objectsInComb;
+  // store the index of the HfBitCounts object
+  // from the combination evaluated in the condition
+  SingleCombInCond objectsInComb;
 
-    // clear the m_combinationsInCond vector
-    (combinationsInCond()).clear();
+  // clear the m_combinationsInCond vector
+  (combinationsInCond()).clear();
 
-    // get the HF bit counts (event / condition)
-    const L1GctHFBitCounts* bitCounts = m_gtPSB->getCandL1HfBitCounts();
+  // get the HF bit counts (event / condition)
+  const L1GctHFBitCounts *bitCounts = m_gtPSB->getCandL1HfBitCounts();
 
-    // protection against missing HF bit counts collection
-    if (bitCounts == nullptr) {
-        return false;
-    }
+  // protection against missing HF bit counts collection
+  if (bitCounts == nullptr) {
+    return false;
+  }
 
-    const L1GtHfBitCountsTemplate::ObjectParameter objPar =
-        ( *(m_gtHfBitCountsTemplate->objectParameter()) )[iCondition];
+  const L1GtHfBitCountsTemplate::ObjectParameter objPar =
+      (*(m_gtHfBitCountsTemplate->objectParameter()))[iCondition];
 
-    // FIXME ask GCT to provide a method to retrieve it
-    const unsigned int numberL1HfBitCounts = 4;
+  // FIXME ask GCT to provide a method to retrieve it
+  const unsigned int numberL1HfBitCounts = 4;
 
-    const unsigned int cIndex = objPar.countIndex;
-    if (cIndex >= numberL1HfBitCounts) {
+  const unsigned int cIndex = objPar.countIndex;
+  if (cIndex >= numberL1HfBitCounts) {
 
-        edm::LogError("L1GlobalTrigger") << "\nL1GtHfBitCountsCondition error: countIndex "
-            << cIndex << "greater than GCT maximum index = " << numberL1HfBitCounts
-            << "\n  ==> condResult = false " << std::endl;
-        return false;
+    edm::LogError("L1GlobalTrigger")
+        << "\nL1GtHfBitCountsCondition error: countIndex " << cIndex
+        << "greater than GCT maximum index = " << numberL1HfBitCounts
+        << "\n  ==> condResult = false " << std::endl;
+    return false;
+  }
 
-    }
+  const unsigned int countValue = bitCounts->bitCount(cIndex);
 
-    const unsigned int countValue = bitCounts->bitCount(cIndex);
+  // check countThreshold
+  if (!checkThreshold(objPar.countThreshold, countValue,
+                      m_gtHfBitCountsTemplate->condGEq())) {
 
-    // check countThreshold
-    if ( !checkThreshold(objPar.countThreshold, countValue, m_gtHfBitCountsTemplate->condGEq()) ) {
+    return false;
+  }
 
-        return false;
-    }
+  // index is always zero - the object is in fact a count
+  int indexObj = 0;
 
-    // index is always zero - the object is in fact a count
-    int indexObj = 0;
+  objectsInComb.push_back(indexObj);
+  (combinationsInCond()).push_back(objectsInComb);
 
-    objectsInComb.push_back(indexObj);
-    (combinationsInCond()).push_back(objectsInComb);
-
-    // if we get here all checks were successful for this combination
-    // set the general result for evaluateCondition to "true"
-
-    condResult = true;
-    return condResult;
+  // if we get here all checks were successful for this combination
+  // set the general result for evaluateCondition to "true"
 
+  condResult = true;
+  return condResult;
 }
 
-void L1GtHfBitCountsCondition::print(std::ostream& myCout) const {
-
-    m_gtHfBitCountsTemplate->print(myCout);
-    L1GtConditionEvaluation::print(myCout);
+void L1GtHfBitCountsCondition::print(std::ostream &myCout) const {
 
+  m_gtHfBitCountsTemplate->print(myCout);
+  L1GtConditionEvaluation::print(myCout);
 }
-
diff --git a/L1Trigger/GlobalTrigger/src/L1GtHfRingEtSumsCondition.cc b/L1Trigger/GlobalTrigger/src/L1GtHfRingEtSumsCondition.cc
index 7cc1262aeeb64..f39f0a6253e6b 100644
--- a/L1Trigger/GlobalTrigger/src/L1GtHfRingEtSumsCondition.cc
+++ b/L1Trigger/GlobalTrigger/src/L1GtHfRingEtSumsCondition.cc
@@ -16,8 +16,8 @@
 #include "L1Trigger/GlobalTrigger/interface/L1GtHfRingEtSumsCondition.h"
 
 // system include files
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
 #include <vector>
 
@@ -25,8 +25,8 @@
 //   base class
 #include "L1Trigger/GlobalTrigger/interface/L1GtConditionEvaluation.h"
 
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctHFRingEtSums.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 
 #include "CondFormats/L1TObjects/interface/L1GtHfRingEtSumsTemplate.h"
 
@@ -34,144 +34,137 @@
 
 // constructors
 //     default
-L1GtHfRingEtSumsCondition::L1GtHfRingEtSumsCondition() :
-    L1GtConditionEvaluation() {
-
-    //empty
+L1GtHfRingEtSumsCondition::L1GtHfRingEtSumsCondition()
+    : L1GtConditionEvaluation() {
 
+  // empty
 }
 
 //     from base template condition (from event setup usually)
 L1GtHfRingEtSumsCondition::L1GtHfRingEtSumsCondition(
-        const L1GtCondition* etTemplate, const L1GlobalTriggerPSB* ptrPSB) :
-    L1GtConditionEvaluation(), m_gtHfRingEtSumsTemplate(
-            static_cast<const L1GtHfRingEtSumsTemplate*> (etTemplate)), m_gtPSB(
-            ptrPSB)
-{
-
-    // maximum number of objects received for the evaluation of the condition
-    // no objects, in fact, just a number
-    m_condMaxNumberObjects = 1;
-
+    const L1GtCondition *etTemplate, const L1GlobalTriggerPSB *ptrPSB)
+    : L1GtConditionEvaluation(),
+      m_gtHfRingEtSumsTemplate(
+          static_cast<const L1GtHfRingEtSumsTemplate *>(etTemplate)),
+      m_gtPSB(ptrPSB) {
+
+  // maximum number of objects received for the evaluation of the condition
+  // no objects, in fact, just a number
+  m_condMaxNumberObjects = 1;
 }
 
 // copy constructor
 void L1GtHfRingEtSumsCondition::copy(const L1GtHfRingEtSumsCondition &cp) {
 
-    m_gtHfRingEtSumsTemplate = cp.gtHfRingEtSumsTemplate();
-    m_gtPSB = cp.gtPSB();
+  m_gtHfRingEtSumsTemplate = cp.gtHfRingEtSumsTemplate();
+  m_gtPSB = cp.gtPSB();
 
-    m_condMaxNumberObjects = cp.condMaxNumberObjects();
-    m_condLastResult = cp.condLastResult();
-    m_combinationsInCond = cp.getCombinationsInCond();
-
-    m_verbosity = cp.m_verbosity;
+  m_condMaxNumberObjects = cp.condMaxNumberObjects();
+  m_condLastResult = cp.condLastResult();
+  m_combinationsInCond = cp.getCombinationsInCond();
 
+  m_verbosity = cp.m_verbosity;
 }
 
-L1GtHfRingEtSumsCondition::L1GtHfRingEtSumsCondition(const L1GtHfRingEtSumsCondition& cp) :
-    L1GtConditionEvaluation() {
-
-    copy(cp);
+L1GtHfRingEtSumsCondition::L1GtHfRingEtSumsCondition(
+    const L1GtHfRingEtSumsCondition &cp)
+    : L1GtConditionEvaluation() {
 
+  copy(cp);
 }
 
 // destructor
 L1GtHfRingEtSumsCondition::~L1GtHfRingEtSumsCondition() {
 
-    // empty
-
+  // empty
 }
 
 // equal operator
-L1GtHfRingEtSumsCondition& L1GtHfRingEtSumsCondition::operator= (const L1GtHfRingEtSumsCondition& cp)
-{
-    copy(cp);
-    return *this;
+L1GtHfRingEtSumsCondition &L1GtHfRingEtSumsCondition::
+operator=(const L1GtHfRingEtSumsCondition &cp) {
+  copy(cp);
+  return *this;
 }
 
 // methods
-void L1GtHfRingEtSumsCondition::setGtHfRingEtSumsTemplate(const L1GtHfRingEtSumsTemplate* etTemplate) {
-
-    m_gtHfRingEtSumsTemplate = etTemplate;
+void L1GtHfRingEtSumsCondition::setGtHfRingEtSumsTemplate(
+    const L1GtHfRingEtSumsTemplate *etTemplate) {
 
+  m_gtHfRingEtSumsTemplate = etTemplate;
 }
 
 ///   set the pointer to PSB
-void L1GtHfRingEtSumsCondition::setGtPSB(const L1GlobalTriggerPSB* ptrPSB) {
-
-    m_gtPSB = ptrPSB;
+void L1GtHfRingEtSumsCondition::setGtPSB(const L1GlobalTriggerPSB *ptrPSB) {
 
+  m_gtPSB = ptrPSB;
 }
 
 // try all object permutations and check spatial correlations, if required
 const bool L1GtHfRingEtSumsCondition::evaluateCondition() const {
 
-    // number of trigger objects in the condition
-    // no objects, in fact, just a number
-    int iCondition = 0;
+  // number of trigger objects in the condition
+  // no objects, in fact, just a number
+  int iCondition = 0;
 
-    // condition result condResult will be set to true if the HF Ring Et sums
-    // passes the requirement
-    bool condResult = false;
+  // condition result condResult will be set to true if the HF Ring Et sums
+  // passes the requirement
+  bool condResult = false;
 
-    // store the index of the HfRingEtSums object
-    // from the combination evaluated in the condition
-    SingleCombInCond objectsInComb;
+  // store the index of the HfRingEtSums object
+  // from the combination evaluated in the condition
+  SingleCombInCond objectsInComb;
 
-    // clear the m_combinationsInCond vector
-    (combinationsInCond()).clear();
+  // clear the m_combinationsInCond vector
+  (combinationsInCond()).clear();
 
-    // get the HF Ring Et sums (event / condition)
-    const L1GctHFRingEtSums* etSumCand = m_gtPSB->getCandL1HfRingEtSums();
+  // get the HF Ring Et sums (event / condition)
+  const L1GctHFRingEtSums *etSumCand = m_gtPSB->getCandL1HfRingEtSums();
 
-    // protection against missing HF Ring Et sums collection
-    if (etSumCand == nullptr) {
-        return false;
-    }
+  // protection against missing HF Ring Et sums collection
+  if (etSumCand == nullptr) {
+    return false;
+  }
 
-    const L1GtHfRingEtSumsTemplate::ObjectParameter objPar =
-        ( *(m_gtHfRingEtSumsTemplate->objectParameter()) )[iCondition];
+  const L1GtHfRingEtSumsTemplate::ObjectParameter objPar =
+      (*(m_gtHfRingEtSumsTemplate->objectParameter()))[iCondition];
 
-    // FIXME ask GCT to provide a method to retrieve it
-    const unsigned int numberL1HfRingEtSums = 4;
+  // FIXME ask GCT to provide a method to retrieve it
+  const unsigned int numberL1HfRingEtSums = 4;
 
-    const unsigned int cIndex = objPar.etSumIndex;
-    if (cIndex >= numberL1HfRingEtSums) {
+  const unsigned int cIndex = objPar.etSumIndex;
+  if (cIndex >= numberL1HfRingEtSums) {
 
-        edm::LogError("L1GlobalTrigger") << "\nL1GtHfRingEtSumsCondition error: etSumIndex "
-            << cIndex << "greater than GCT maximum index = " << numberL1HfRingEtSums
-            << "\n  ==> condResult = false " << std::endl;
-        return false;
+    edm::LogError("L1GlobalTrigger")
+        << "\nL1GtHfRingEtSumsCondition error: etSumIndex " << cIndex
+        << "greater than GCT maximum index = " << numberL1HfRingEtSums
+        << "\n  ==> condResult = false " << std::endl;
+    return false;
+  }
 
-    }
+  const unsigned int etSumValue = etSumCand->etSum(cIndex);
 
-    const unsigned int etSumValue = etSumCand->etSum(cIndex);
+  // check countThreshold
+  if (!checkThreshold(objPar.etSumThreshold, etSumValue,
+                      m_gtHfRingEtSumsTemplate->condGEq())) {
 
-    // check countThreshold
-    if ( !checkThreshold(objPar.etSumThreshold, etSumValue, m_gtHfRingEtSumsTemplate->condGEq()) ) {
+    return false;
+  }
 
-        return false;
-    }
+  // index is always zero - the object is in fact a count
+  int indexObj = 0;
 
-    // index is always zero - the object is in fact a count
-    int indexObj = 0;
+  objectsInComb.push_back(indexObj);
+  (combinationsInCond()).push_back(objectsInComb);
 
-    objectsInComb.push_back(indexObj);
-    (combinationsInCond()).push_back(objectsInComb);
-
-    // if we get here all checks were successful for this combination
-    // set the general result for evaluateCondition to "true"
-
-    condResult = true;
-    return condResult;
+  // if we get here all checks were successful for this combination
+  // set the general result for evaluateCondition to "true"
 
+  condResult = true;
+  return condResult;
 }
 
-void L1GtHfRingEtSumsCondition::print(std::ostream& myCout) const {
-
-    m_gtHfRingEtSumsTemplate->print(myCout);
-    L1GtConditionEvaluation::print(myCout);
+void L1GtHfRingEtSumsCondition::print(std::ostream &myCout) const {
 
+  m_gtHfRingEtSumsTemplate->print(myCout);
+  L1GtConditionEvaluation::print(myCout);
 }
-
diff --git a/L1Trigger/GlobalTrigger/src/L1GtJetCountsCondition.cc b/L1Trigger/GlobalTrigger/src/L1GtJetCountsCondition.cc
index 631bc7379c2ad..370299aec2c3d 100644
--- a/L1Trigger/GlobalTrigger/src/L1GtJetCountsCondition.cc
+++ b/L1Trigger/GlobalTrigger/src/L1GtJetCountsCondition.cc
@@ -16,8 +16,8 @@
 #include "L1Trigger/GlobalTrigger/interface/L1GtJetCountsCondition.h"
 
 // system include files
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
 #include <vector>
 
@@ -25,8 +25,8 @@
 //   base classes
 #include "L1Trigger/GlobalTrigger/interface/L1GtConditionEvaluation.h"
 
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctJetCounts.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 
 #include "CondFormats/L1TObjects/interface/L1GtJetCountsTemplate.h"
 
@@ -34,143 +34,135 @@
 
 // constructors
 //     default
-L1GtJetCountsCondition::L1GtJetCountsCondition() :
-    L1GtConditionEvaluation() {
-
-    //empty
+L1GtJetCountsCondition::L1GtJetCountsCondition() : L1GtConditionEvaluation() {
 
+  // empty
 }
 
 //     from base template condition (from event setup usually)
-L1GtJetCountsCondition::L1GtJetCountsCondition(const L1GtCondition* jcTemplate,
-    const L1GlobalTriggerPSB* ptrPSB, const int nrL1JetCounts) :
-    L1GtConditionEvaluation(),
-    m_gtJetCountsTemplate(static_cast<const L1GtJetCountsTemplate*>(jcTemplate)),
-    m_gtPSB(ptrPSB),
-    m_numberL1JetCounts(nrL1JetCounts)
-{
-
-    // maximum number of objects received for the evaluation of the condition
-    // no objects, in fact, just a number
-    m_condMaxNumberObjects = 1;
-
+L1GtJetCountsCondition::L1GtJetCountsCondition(const L1GtCondition *jcTemplate,
+                                               const L1GlobalTriggerPSB *ptrPSB,
+                                               const int nrL1JetCounts)
+    : L1GtConditionEvaluation(),
+      m_gtJetCountsTemplate(
+          static_cast<const L1GtJetCountsTemplate *>(jcTemplate)),
+      m_gtPSB(ptrPSB), m_numberL1JetCounts(nrL1JetCounts) {
+
+  // maximum number of objects received for the evaluation of the condition
+  // no objects, in fact, just a number
+  m_condMaxNumberObjects = 1;
 }
 
 // copy constructor
 void L1GtJetCountsCondition::copy(const L1GtJetCountsCondition &cp) {
 
-    m_gtJetCountsTemplate = cp.gtJetCountsTemplate();
-    m_gtPSB = cp.gtPSB();
+  m_gtJetCountsTemplate = cp.gtJetCountsTemplate();
+  m_gtPSB = cp.gtPSB();
 
-    m_condMaxNumberObjects = cp.condMaxNumberObjects();
-    m_condLastResult = cp.condLastResult();
-    m_combinationsInCond = cp.getCombinationsInCond();
-
-    m_verbosity = cp.m_verbosity;
+  m_condMaxNumberObjects = cp.condMaxNumberObjects();
+  m_condLastResult = cp.condLastResult();
+  m_combinationsInCond = cp.getCombinationsInCond();
 
+  m_verbosity = cp.m_verbosity;
 }
 
-L1GtJetCountsCondition::L1GtJetCountsCondition(const L1GtJetCountsCondition& cp) :
-    L1GtConditionEvaluation() {
-
-    copy(cp);
+L1GtJetCountsCondition::L1GtJetCountsCondition(const L1GtJetCountsCondition &cp)
+    : L1GtConditionEvaluation() {
 
+  copy(cp);
 }
 
 // destructor
 L1GtJetCountsCondition::~L1GtJetCountsCondition() {
 
-    // empty
-
+  // empty
 }
 
 // equal operator
-L1GtJetCountsCondition& L1GtJetCountsCondition::operator= (const L1GtJetCountsCondition& cp)
-{
-    copy(cp);
-    return *this;
+L1GtJetCountsCondition &L1GtJetCountsCondition::
+operator=(const L1GtJetCountsCondition &cp) {
+  copy(cp);
+  return *this;
 }
 
 // methods
-void L1GtJetCountsCondition::setGtJetCountsTemplate(const L1GtJetCountsTemplate* jcTemplate) {
-
-    m_gtJetCountsTemplate = jcTemplate;
+void L1GtJetCountsCondition::setGtJetCountsTemplate(
+    const L1GtJetCountsTemplate *jcTemplate) {
 
+  m_gtJetCountsTemplate = jcTemplate;
 }
 
 ///   set the pointer to PSB
-void L1GtJetCountsCondition::setGtPSB(const L1GlobalTriggerPSB* ptrPSB) {
-
-    m_gtPSB = ptrPSB;
+void L1GtJetCountsCondition::setGtPSB(const L1GlobalTriggerPSB *ptrPSB) {
 
+  m_gtPSB = ptrPSB;
 }
 
 // try all object permutations and check spatial correlations, if required
 const bool L1GtJetCountsCondition::evaluateCondition() const {
 
-    // number of trigger objects in the condition
-    // in fact, there is only one object
-    int iCondition = 0;
-
-    // condition result condResult will be set to true if the jet counts
-    // passes the requirement
-    bool condResult = false;
+  // number of trigger objects in the condition
+  // in fact, there is only one object
+  int iCondition = 0;
 
-    // store the index of the JetCount object
-    // from the combination evaluated in the condition
-    SingleCombInCond objectsInComb;
+  // condition result condResult will be set to true if the jet counts
+  // passes the requirement
+  bool condResult = false;
 
-    // clear the m_combinationsInCond vector
-    (combinationsInCond()).clear();
+  // store the index of the JetCount object
+  // from the combination evaluated in the condition
+  SingleCombInCond objectsInComb;
 
-    // get the jet counts (event / condition)
-    const L1GctJetCounts* jetCounts = m_gtPSB->getCandL1JetCounts();
+  // clear the m_combinationsInCond vector
+  (combinationsInCond()).clear();
 
-    // protection against missing jet counts collection
-    if (jetCounts == nullptr) {
-        return false;
-    }
+  // get the jet counts (event / condition)
+  const L1GctJetCounts *jetCounts = m_gtPSB->getCandL1JetCounts();
 
-    const L1GtJetCountsTemplate::ObjectParameter objPar =
-        ( *(m_gtJetCountsTemplate->objectParameter()) )[iCondition];
+  // protection against missing jet counts collection
+  if (jetCounts == nullptr) {
+    return false;
+  }
 
-    unsigned int cIndex = objPar.countIndex;
+  const L1GtJetCountsTemplate::ObjectParameter objPar =
+      (*(m_gtJetCountsTemplate->objectParameter()))[iCondition];
 
-    if (cIndex >= m_numberL1JetCounts) {
+  unsigned int cIndex = objPar.countIndex;
 
-        edm::LogError("L1GlobalTrigger") << "\nL1GtJetCountsCondition error: countIndex "
-            << cIndex << "greater than maximum allowed count = " << m_numberL1JetCounts
-            << "\n  ==> condResult = false " << std::endl;
-        return false;
+  if (cIndex >= m_numberL1JetCounts) {
 
-    }
+    edm::LogError("L1GlobalTrigger")
+        << "\nL1GtJetCountsCondition error: countIndex " << cIndex
+        << "greater than maximum allowed count = " << m_numberL1JetCounts
+        << "\n  ==> condResult = false " << std::endl;
+    return false;
+  }
 
-    unsigned int countValue = jetCounts->count(cIndex);
+  unsigned int countValue = jetCounts->count(cIndex);
 
-    // check countThreshold
-    if ( !checkThreshold(objPar.countThreshold, countValue, m_gtJetCountsTemplate->condGEq()) ) {
+  // check countThreshold
+  if (!checkThreshold(objPar.countThreshold, countValue,
+                      m_gtJetCountsTemplate->condGEq())) {
 
-        return false;
-    }
+    return false;
+  }
 
-    // index is always zero, as they are global quantities (there is only one object)
-    int indexObj = 0;
+  // index is always zero, as they are global quantities (there is only one
+  // object)
+  int indexObj = 0;
 
-    objectsInComb.push_back(indexObj);
-    (combinationsInCond()).push_back(objectsInComb);
+  objectsInComb.push_back(indexObj);
+  (combinationsInCond()).push_back(objectsInComb);
 
-    // if we get here all checks were successful for this combination
-    // set the general result for evaluateCondition to "true"
-
-    condResult = true;
-    return condResult;
+  // if we get here all checks were successful for this combination
+  // set the general result for evaluateCondition to "true"
 
+  condResult = true;
+  return condResult;
 }
 
-void L1GtJetCountsCondition::print(std::ostream& myCout) const {
-
-    m_gtJetCountsTemplate->print(myCout);
-    L1GtConditionEvaluation::print(myCout);
+void L1GtJetCountsCondition::print(std::ostream &myCout) const {
 
+  m_gtJetCountsTemplate->print(myCout);
+  L1GtConditionEvaluation::print(myCout);
 }
-
diff --git a/L1Trigger/GlobalTrigger/src/L1GtMuonCondition.cc b/L1Trigger/GlobalTrigger/src/L1GtMuonCondition.cc
index 5386a73fecf6b..b62de37d800bf 100644
--- a/L1Trigger/GlobalTrigger/src/L1GtMuonCondition.cc
+++ b/L1Trigger/GlobalTrigger/src/L1GtMuonCondition.cc
@@ -16,12 +16,12 @@
 #include "L1Trigger/GlobalTrigger/interface/L1GtMuonCondition.h"
 
 // system include files
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
+#include <algorithm>
 #include <string>
 #include <vector>
-#include <algorithm>
 
 // user include files
 //   base classes
@@ -35,369 +35,356 @@
 #include "L1Trigger/GlobalTrigger/interface/L1GlobalTriggerFunctions.h"
 #include "L1Trigger/GlobalTrigger/interface/L1GlobalTriggerGTL.h"
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/MessageLogger/interface/MessageDrop.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 // constructors
 //     default
-L1GtMuonCondition::L1GtMuonCondition() :
-    L1GtConditionEvaluation() {
-
-    // empty
+L1GtMuonCondition::L1GtMuonCondition() : L1GtConditionEvaluation() {
 
+  // empty
 }
 
 //     from base template condition (from event setup usually)
-L1GtMuonCondition::L1GtMuonCondition(const L1GtCondition* muonTemplate,
-        const L1GlobalTriggerGTL* ptrGTL, const int nrL1Mu,
-        const int ifMuEtaNumberBits) :
-    L1GtConditionEvaluation(),
-    m_gtMuonTemplate(static_cast<const L1GtMuonTemplate*>(muonTemplate)),
-    m_gtGTL(ptrGTL),
-    m_ifMuEtaNumberBits(ifMuEtaNumberBits)
-{
-    m_corrParDeltaPhiNrBins = 0;
-    m_condMaxNumberObjects = nrL1Mu;
+L1GtMuonCondition::L1GtMuonCondition(const L1GtCondition *muonTemplate,
+                                     const L1GlobalTriggerGTL *ptrGTL,
+                                     const int nrL1Mu,
+                                     const int ifMuEtaNumberBits)
+    : L1GtConditionEvaluation(),
+      m_gtMuonTemplate(static_cast<const L1GtMuonTemplate *>(muonTemplate)),
+      m_gtGTL(ptrGTL), m_ifMuEtaNumberBits(ifMuEtaNumberBits) {
+  m_corrParDeltaPhiNrBins = 0;
+  m_condMaxNumberObjects = nrL1Mu;
 }
 
 // copy constructor
 void L1GtMuonCondition::copy(const L1GtMuonCondition &cp) {
 
-    m_gtMuonTemplate = cp.gtMuonTemplate();
-    m_gtGTL = cp.gtGTL();
-
-    m_ifMuEtaNumberBits = cp.gtIfMuEtaNumberBits();
-    m_corrParDeltaPhiNrBins = cp.m_corrParDeltaPhiNrBins;
+  m_gtMuonTemplate = cp.gtMuonTemplate();
+  m_gtGTL = cp.gtGTL();
 
-    m_condMaxNumberObjects = cp.condMaxNumberObjects();
-    m_condLastResult = cp.condLastResult();
-    m_combinationsInCond = cp.getCombinationsInCond();
+  m_ifMuEtaNumberBits = cp.gtIfMuEtaNumberBits();
+  m_corrParDeltaPhiNrBins = cp.m_corrParDeltaPhiNrBins;
 
-    m_verbosity = cp.m_verbosity;
+  m_condMaxNumberObjects = cp.condMaxNumberObjects();
+  m_condLastResult = cp.condLastResult();
+  m_combinationsInCond = cp.getCombinationsInCond();
 
+  m_verbosity = cp.m_verbosity;
 }
 
-L1GtMuonCondition::L1GtMuonCondition(const L1GtMuonCondition& cp) :
-    L1GtConditionEvaluation() {
-    copy(cp);
+L1GtMuonCondition::L1GtMuonCondition(const L1GtMuonCondition &cp)
+    : L1GtConditionEvaluation() {
+  copy(cp);
 }
 
 // destructor
 L1GtMuonCondition::~L1GtMuonCondition() {
 
-    // empty
-
+  // empty
 }
 
 // equal operator
-L1GtMuonCondition& L1GtMuonCondition::operator= (const L1GtMuonCondition& cp)
-{
-    copy(cp);
-    return *this;
+L1GtMuonCondition &L1GtMuonCondition::operator=(const L1GtMuonCondition &cp) {
+  copy(cp);
+  return *this;
 }
 
 // methods
-void L1GtMuonCondition::setGtMuonTemplate(const L1GtMuonTemplate* muonTempl) {
-
-    m_gtMuonTemplate = muonTempl;
+void L1GtMuonCondition::setGtMuonTemplate(const L1GtMuonTemplate *muonTempl) {
 
+  m_gtMuonTemplate = muonTempl;
 }
 
 ///   set the pointer to GTL
-void L1GtMuonCondition::setGtGTL(const L1GlobalTriggerGTL* ptrGTL) {
-
-    m_gtGTL = ptrGTL;
+void L1GtMuonCondition::setGtGTL(const L1GlobalTriggerGTL *ptrGTL) {
 
+  m_gtGTL = ptrGTL;
 }
 
-
 //   set the number of bits for eta of muon objects
 void L1GtMuonCondition::setGtIfMuEtaNumberBits(
-        const int& ifMuEtaNumberBitsValue) {
-
-    m_ifMuEtaNumberBits = ifMuEtaNumberBitsValue;
+    const int &ifMuEtaNumberBitsValue) {
 
+  m_ifMuEtaNumberBits = ifMuEtaNumberBitsValue;
 }
 
 //   set the maximum number of bins for the delta phi scales
 void L1GtMuonCondition::setGtCorrParDeltaPhiNrBins(
-        const int& corrParDeltaPhiNrBins) {
-
-    m_corrParDeltaPhiNrBins = corrParDeltaPhiNrBins;
+    const int &corrParDeltaPhiNrBins) {
 
+  m_corrParDeltaPhiNrBins = corrParDeltaPhiNrBins;
 }
 
-
 // try all object permutations and check spatial correlations, if required
 const bool L1GtMuonCondition::evaluateCondition() const {
 
-    // number of trigger objects in the condition
-    int nObjInCond = m_gtMuonTemplate->nrObjects();
+  // number of trigger objects in the condition
+  int nObjInCond = m_gtMuonTemplate->nrObjects();
 
-    // the candidates
-    const std::vector<const L1MuGMTCand*>* candVec = m_gtGTL->getCandL1Mu();
+  // the candidates
+  const std::vector<const L1MuGMTCand *> *candVec = m_gtGTL->getCandL1Mu();
 
-    int numberObjects = candVec->size();
-    //LogTrace("L1GlobalTrigger") << "  numberObjects: " << numberObjects
-    //    << std::endl;
-    if (numberObjects < nObjInCond) {
-        return false;
-    }
+  int numberObjects = candVec->size();
+  // LogTrace("L1GlobalTrigger") << "  numberObjects: " << numberObjects
+  //    << std::endl;
+  if (numberObjects < nObjInCond) {
+    return false;
+  }
 
-    std::vector<int> index(numberObjects);
-
-    for (int i = 0; i < numberObjects; ++i) {
-        index[i] = i;
-    }
+  std::vector<int> index(numberObjects);
 
-    int jumpIndex = 1;
-    int jump = factorial(numberObjects - nObjInCond);
+  for (int i = 0; i < numberObjects; ++i) {
+    index[i] = i;
+  }
 
-    int totalLoops = 0;
-    int passLoops = 0;
+  int jumpIndex = 1;
+  int jump = factorial(numberObjects - nObjInCond);
 
-    // condition result condResult set to true if at least one permutation
-    //     passes all requirements
-    // all possible permutations are checked
-    bool condResult = false;
+  int totalLoops = 0;
+  int passLoops = 0;
 
-    // store the indices of the muon objects
-    // from the combination evaluated in the condition
-    SingleCombInCond objectsInComb;
-    objectsInComb.reserve(nObjInCond);
+  // condition result condResult set to true if at least one permutation
+  //     passes all requirements
+  // all possible permutations are checked
+  bool condResult = false;
 
-    // clear the m_combinationsInCond vector
-    (combinationsInCond()).clear();
+  // store the indices of the muon objects
+  // from the combination evaluated in the condition
+  SingleCombInCond objectsInComb;
+  objectsInComb.reserve(nObjInCond);
 
-    do {
+  // clear the m_combinationsInCond vector
+  (combinationsInCond()).clear();
 
-        if (--jumpIndex)
-            continue;
+  do {
 
-        jumpIndex = jump;
-        totalLoops++;
+    if (--jumpIndex)
+      continue;
 
-        // clear the indices in the combination
-        objectsInComb.clear();
+    jumpIndex = jump;
+    totalLoops++;
 
-        bool tmpResult = true;
+    // clear the indices in the combination
+    objectsInComb.clear();
 
-        // check if there is a permutation that matches object-parameter requirements
-        for (int i = 0; i < nObjInCond; i++) {
+    bool tmpResult = true;
 
-            tmpResult &= checkObjectParameter(i, *(*candVec)[index[i]]);
-            objectsInComb.push_back(index[i]);
+    // check if there is a permutation that matches object-parameter
+    // requirements
+    for (int i = 0; i < nObjInCond; i++) {
 
-        }
+      tmpResult &= checkObjectParameter(i, *(*candVec)[index[i]]);
+      objectsInComb.push_back(index[i]);
+    }
 
-        // if permutation does not match particle conditions
-        // skip charge correlation and spatial correlations
-        if ( !tmpResult) {
+    // if permutation does not match particle conditions
+    // skip charge correlation and spatial correlations
+    if (!tmpResult) {
 
-            continue;
+      continue;
+    }
 
-        }
+    // get the correlation parameters (chargeCorrelation included here also)
+    L1GtMuonTemplate::CorrelationParameter corrPar =
+        *(m_gtMuonTemplate->correlationParameter());
 
-        // get the correlation parameters (chargeCorrelation included here also)
-        L1GtMuonTemplate::CorrelationParameter corrPar =
-            *(m_gtMuonTemplate->correlationParameter());
+    // charge_correlation consists of 3 relevant bits (D2, D1, D0)
+    unsigned int chargeCorr = corrPar.chargeCorrelation;
 
-        // charge_correlation consists of 3 relevant bits (D2, D1, D0)
-        unsigned int chargeCorr = corrPar.chargeCorrelation;
+    // charge ignore bit (D0) not set?
+    if ((chargeCorr & 1) == 0) {
 
-        // charge ignore bit (D0) not set?
-        if ((chargeCorr & 1) == 0) {
+      for (int i = 0; i < nObjInCond; i++) {
+        // check valid charge - skip if invalid charge
+        bool chargeValid = (*candVec)[index[i]]->charge_valid();
+        tmpResult &= chargeValid;
 
-            for (int i = 0; i < nObjInCond; i++) {
-                // check valid charge - skip if invalid charge
-                bool chargeValid = (*candVec)[index[i]]->charge_valid();
-                tmpResult &= chargeValid;
+        if (!chargeValid) {
+          continue;
+        }
+      }
 
-                if ( !chargeValid) {
-                    continue;
-                }
-            }
+      if (!tmpResult) {
+        continue;
+      }
 
-            if ( !tmpResult) {
-                continue;
-            }
+      if (nObjInCond == 1) { // one object condition
 
-            if (nObjInCond == 1) { // one object condition
+        // D2..enable pos, D1..enable neg
+        if (!(((chargeCorr & 4) != 0 && (*candVec)[index[0]]->charge() > 0) ||
+              ((chargeCorr & 2) != 0 && (*candVec)[index[0]]->charge() < 0))) {
 
-                // D2..enable pos, D1..enable neg
-                if ( ! ( ( (chargeCorr & 4) != 0 && (*candVec)[index[0]]->charge()> 0 )
-                    || ( (chargeCorr & 2) != 0 && (*candVec)[index[0]]->charge() < 0 ) )) {
+          continue;
+        }
 
-                    continue;
-                }
+      } else { // more objects condition
 
-            }
-            else { // more objects condition
-
-                // find out if signs are equal
-                bool equalSigns = true;
-                for (int i = 0; i < nObjInCond-1; i++) {
-                    if ((*candVec)[index[i]]->charge() != (*candVec)[index[i+1]]->charge()) {
-                        equalSigns = false;
-                        break;
-                    }
-                }
-
-                // two or three particle condition
-                if (nObjInCond == 2 || nObjInCond == 3) {
-                    // D2..enable equal, D1..enable not equal
-                    if ( ! ( ( (chargeCorr & 4) != 0 && equalSigns ) || ( (chargeCorr & 2) != 0
-                        && !equalSigns ) )) {
-
-                        continue;
-                    }
-                }
-
-                // four particle condition
-                if (nObjInCond == 4) {
-                    //counter to count positive charges to determine if there are pairs
-                    unsigned int posCount = 0;
-
-                    for (int i = 0; i < nObjInCond; i++) {
-                        if ((*candVec)[index[i]]->charge()> 0) {
-                            posCount++;
-                        }
-                    }
-
-                    // D2..enable equal, D1..enable pairs
-                    if ( ! ( ( (chargeCorr & 4) != 0 && equalSigns ) || ( (chargeCorr & 2) != 0
-                        && posCount == 2 ) )) {
-
-                        continue;
-                    }
-                }
-            }
-        } // end signchecks
+        // find out if signs are equal
+        bool equalSigns = true;
+        for (int i = 0; i < nObjInCond - 1; i++) {
+          if ((*candVec)[index[i]]->charge() !=
+              (*candVec)[index[i + 1]]->charge()) {
+            equalSigns = false;
+            break;
+          }
+        }
 
+        // two or three particle condition
+        if (nObjInCond == 2 || nObjInCond == 3) {
+          // D2..enable equal, D1..enable not equal
+          if (!(((chargeCorr & 4) != 0 && equalSigns) ||
+                ((chargeCorr & 2) != 0 && !equalSigns))) {
 
-        if (m_gtMuonTemplate->wsc()) {
+            continue;
+          }
+        }
 
-            // wsc requirements have always nObjInCond = 2
-            // one can use directly index[0] and index[1] to compute
-            // eta and phi differences
-            const int ObjInWscComb = 2;
-            if (nObjInCond != ObjInWscComb) {
+        // four particle condition
+        if (nObjInCond == 4) {
+          // counter to count positive charges to determine if there are pairs
+          unsigned int posCount = 0;
 
-                edm::LogError("L1GlobalTrigger") << "\n  Error: "
-                    << "number of particles in condition with spatial correlation = " << nObjInCond
-                    << "\n  it must be = " << ObjInWscComb << std::endl;
-                // TODO Perhaps I should throw here an exception,
-                // since something is really wrong if nObjInCond != ObjInWscComb (=2)
-                continue;
+          for (int i = 0; i < nObjInCond; i++) {
+            if ((*candVec)[index[i]]->charge() > 0) {
+              posCount++;
             }
+          }
 
-            unsigned int candDeltaEta;
-            unsigned int candDeltaPhi;
+          // D2..enable equal, D1..enable pairs
+          if (!(((chargeCorr & 4) != 0 && equalSigns) ||
+                ((chargeCorr & 2) != 0 && posCount == 2))) {
 
-            // check candDeltaEta
+            continue;
+          }
+        }
+      }
+    } // end signchecks
 
-            // get eta index and the sign bit of the eta index (MSB is the sign)
-            //   signedEta[i] is the signed eta index of (*candVec)[index[i]]
-            int signedEta[ObjInWscComb];
-            int signBit[ObjInWscComb] = { 0, 0 };
+    if (m_gtMuonTemplate->wsc()) {
 
-            int scaleEta = 1 << (m_ifMuEtaNumberBits - 1);
+      // wsc requirements have always nObjInCond = 2
+      // one can use directly index[0] and index[1] to compute
+      // eta and phi differences
+      const int ObjInWscComb = 2;
+      if (nObjInCond != ObjInWscComb) {
 
-            for (int i = 0; i < ObjInWscComb; ++i) {
-                signBit[i] = ((*candVec)[index[i]]->etaIndex() & scaleEta)>>(m_ifMuEtaNumberBits - 1);
-                signedEta[i] = ((*candVec)[index[i]]->etaIndex() )%scaleEta;
+        edm::LogError("L1GlobalTrigger")
+            << "\n  Error: "
+            << "number of particles in condition with spatial correlation = "
+            << nObjInCond << "\n  it must be = " << ObjInWscComb << std::endl;
+        // TODO Perhaps I should throw here an exception,
+        // since something is really wrong if nObjInCond != ObjInWscComb (=2)
+        continue;
+      }
 
-                if (signBit[i] == 1) {
-                    signedEta[i] = (-1)*signedEta[i];
-                }
+      unsigned int candDeltaEta;
+      unsigned int candDeltaPhi;
 
-            }
+      // check candDeltaEta
 
-            // compute candDeltaEta - add 1 if signs are different (due to +0/-0 indices)
-            candDeltaEta = static_cast<int> (std::abs(signedEta[1] - signedEta[0]))
-                + static_cast<int> (signBit[1]^signBit[0]);
+      // get eta index and the sign bit of the eta index (MSB is the sign)
+      //   signedEta[i] is the signed eta index of (*candVec)[index[i]]
+      int signedEta[ObjInWscComb];
+      int signBit[ObjInWscComb] = {0, 0};
 
-            if ( !checkBit(corrPar.deltaEtaRange, candDeltaEta) ) {
-                continue;
-            }
+      int scaleEta = 1 << (m_ifMuEtaNumberBits - 1);
 
-            // check candDeltaPhi
+      for (int i = 0; i < ObjInWscComb; ++i) {
+        signBit[i] = ((*candVec)[index[i]]->etaIndex() & scaleEta) >>
+                     (m_ifMuEtaNumberBits - 1);
+        signedEta[i] = ((*candVec)[index[i]]->etaIndex()) % scaleEta;
 
-            // calculate absolute value of candDeltaPhi
-            if ((*candVec)[index[0]]->phiIndex()> (*candVec)[index[1]]->phiIndex()) {
-                candDeltaPhi = (*candVec)[index[0]]->phiIndex() - (*candVec)[index[1]]->phiIndex();
-            }
-            else {
-                candDeltaPhi = (*candVec)[index[1]]->phiIndex() - (*candVec)[index[0]]->phiIndex();
-            }
-
-            // check if candDeltaPhi > 180 (via delta_phi_maxbits)
-            // delta_phi contains bits for 0..180 (0 and 180 included)
-            // protect also against infinite loop...
-
-            int nMaxLoop = 10;
-            int iLoop = 0;
-
-            while (candDeltaPhi >= m_corrParDeltaPhiNrBins) {
-
-                unsigned int candDeltaPhiInitial = candDeltaPhi;
-
-                // candDeltaPhi > 180 ==> take 360 - candDeltaPhi
-                candDeltaPhi = (m_corrParDeltaPhiNrBins - 1) * 2 - candDeltaPhi;
-                if (m_verbosity) {
-                    LogTrace("L1GlobalTrigger")
-                            << "    Initial candDeltaPhi = "
-                            << candDeltaPhiInitial
-                            << " > m_corrParDeltaPhiNrBins = "
-                            << m_corrParDeltaPhiNrBins
-                            << "  ==> candDeltaPhi rescaled to: "
-                            << candDeltaPhi << " [ loop index " << iLoop
-                            << "; breaks after " << nMaxLoop << " loops ]\n"
-                            << std::endl;
-                }
-
-                iLoop++;
-                if (iLoop > nMaxLoop) {
-                    return false;
-                }
-            }
+        if (signBit[i] == 1) {
+          signedEta[i] = (-1) * signedEta[i];
+        }
+      }
+
+      // compute candDeltaEta - add 1 if signs are different (due to +0/-0
+      // indices)
+      candDeltaEta = static_cast<int>(std::abs(signedEta[1] - signedEta[0])) +
+                     static_cast<int>(signBit[1] ^ signBit[0]);
+
+      if (!checkBit(corrPar.deltaEtaRange, candDeltaEta)) {
+        continue;
+      }
+
+      // check candDeltaPhi
+
+      // calculate absolute value of candDeltaPhi
+      if ((*candVec)[index[0]]->phiIndex() > (*candVec)[index[1]]->phiIndex()) {
+        candDeltaPhi =
+            (*candVec)[index[0]]->phiIndex() - (*candVec)[index[1]]->phiIndex();
+      } else {
+        candDeltaPhi =
+            (*candVec)[index[1]]->phiIndex() - (*candVec)[index[0]]->phiIndex();
+      }
+
+      // check if candDeltaPhi > 180 (via delta_phi_maxbits)
+      // delta_phi contains bits for 0..180 (0 and 180 included)
+      // protect also against infinite loop...
+
+      int nMaxLoop = 10;
+      int iLoop = 0;
+
+      while (candDeltaPhi >= m_corrParDeltaPhiNrBins) {
+
+        unsigned int candDeltaPhiInitial = candDeltaPhi;
+
+        // candDeltaPhi > 180 ==> take 360 - candDeltaPhi
+        candDeltaPhi = (m_corrParDeltaPhiNrBins - 1) * 2 - candDeltaPhi;
+        if (m_verbosity) {
+          LogTrace("L1GlobalTrigger")
+              << "    Initial candDeltaPhi = " << candDeltaPhiInitial
+              << " > m_corrParDeltaPhiNrBins = " << m_corrParDeltaPhiNrBins
+              << "  ==> candDeltaPhi rescaled to: " << candDeltaPhi
+              << " [ loop index " << iLoop << "; breaks after " << nMaxLoop
+              << " loops ]\n"
+              << std::endl;
+        }
 
-            // delta_phi bitmask is saved in two boost::uint64_t words
-            if (candDeltaPhi < 64) {
-                if (!checkBit(corrPar.deltaPhiRange0Word, candDeltaPhi) ) {
-                    continue;
-                }
-            }
-            else {
-                if (!checkBit(corrPar.deltaPhiRange1Word, (candDeltaPhi - 64))) {
-                    continue;
-                }
-            }
+        iLoop++;
+        if (iLoop > nMaxLoop) {
+          return false;
+        }
+      }
 
-        } // end wsc check
+      // delta_phi bitmask is saved in two boost::uint64_t words
+      if (candDeltaPhi < 64) {
+        if (!checkBit(corrPar.deltaPhiRange0Word, candDeltaPhi)) {
+          continue;
+        }
+      } else {
+        if (!checkBit(corrPar.deltaPhiRange1Word, (candDeltaPhi - 64))) {
+          continue;
+        }
+      }
 
-        // if we get here all checks were successfull for this combination
-        // set the general result for evaluateCondition to "true"
+    } // end wsc check
 
-        condResult = true;
-        passLoops++;
-        (combinationsInCond()).push_back(objectsInComb);
+    // if we get here all checks were successfull for this combination
+    // set the general result for evaluateCondition to "true"
 
-    } while (std::next_permutation(index.begin(), index.end()) );
+    condResult = true;
+    passLoops++;
+    (combinationsInCond()).push_back(objectsInComb);
 
-    //LogTrace("L1GlobalTrigger")
-    //    << "\n  L1GtMuonCondition: total number of permutations found:          " << totalLoops
-    //    << "\n  L1GtMuonCondition: number of permutations passing requirements: " << passLoops
-    //    << "\n" << std::endl;
+  } while (std::next_permutation(index.begin(), index.end()));
 
-    return condResult;
+  // LogTrace("L1GlobalTrigger")
+  //    << "\n  L1GtMuonCondition: total number of permutations found: " <<
+  //    totalLoops
+  //    << "\n  L1GtMuonCondition: number of permutations passing requirements:
+  //    " << passLoops
+  //    << "\n" << std::endl;
 
+  return condResult;
 }
 
 // load muon candidates
-const L1MuGMTCand* L1GtMuonCondition::getCandidate(const int indexCand) const {
+const L1MuGMTCand *L1GtMuonCondition::getCandidate(const int indexCand) const {
 
-    return (*(m_gtGTL->getCandL1Mu()))[indexCand];
+  return (*(m_gtGTL->getCandL1Mu()))[indexCand];
 }
 
 /**
@@ -409,148 +396,146 @@ const L1MuGMTCand* L1GtMuonCondition::getCandidate(const int indexCand) const {
  * @return The result of the comparison (false if a condition does not exist).
  */
 
-const bool L1GtMuonCondition::checkObjectParameter(const int iCondition, const L1MuGMTCand& cand) const {
+const bool
+L1GtMuonCondition::checkObjectParameter(const int iCondition,
+                                        const L1MuGMTCand &cand) const {
 
-    // number of objects in condition
-    int nObjInCond = m_gtMuonTemplate->nrObjects();
+  // number of objects in condition
+  int nObjInCond = m_gtMuonTemplate->nrObjects();
 
-    if (iCondition >= nObjInCond || iCondition < 0) {
-        return false;
-    }
+  if (iCondition >= nObjInCond || iCondition < 0) {
+    return false;
+  }
 
-    // empty candidates can not be compared
-    if (cand.empty()) {
-        return false;
-    }
+  // empty candidates can not be compared
+  if (cand.empty()) {
+    return false;
+  }
 
-    const L1GtMuonTemplate::ObjectParameter objPar =
-        ( *(m_gtMuonTemplate->objectParameter()) )[iCondition];
+  const L1GtMuonTemplate::ObjectParameter objPar =
+      (*(m_gtMuonTemplate->objectParameter()))[iCondition];
 
-    // using the logic table from GTL-9U-module.pdf
-    // "Truth table for Isolation bit"
+  // using the logic table from GTL-9U-module.pdf
+  // "Truth table for Isolation bit"
 
-    // check thresholds:
+  // check thresholds:
 
-    //   value < low pt threshold
-    //       fail trigger
+  //   value < low pt threshold
+  //       fail trigger
 
-    //   low pt threshold <= value < high pt threshold & non-isolated muon:
-    //       requestIso true:                    fail trigger
-    //       requestIso false, enableIso true:   fail trigger
-    //       requestIso false, enableIso false:  OK,  trigger
+  //   low pt threshold <= value < high pt threshold & non-isolated muon:
+  //       requestIso true:                    fail trigger
+  //       requestIso false, enableIso true:   fail trigger
+  //       requestIso false, enableIso false:  OK,  trigger
 
-    //   low pt threshold <= value < high pt threshold & isolated muon:
-    //       requestIso true:                    OK,  trigger
-    //       requestIso false, enableIso true:   OK,  trigger
-    //       requestIso false, enableIso false:  OK,  trigger
+  //   low pt threshold <= value < high pt threshold & isolated muon:
+  //       requestIso true:                    OK,  trigger
+  //       requestIso false, enableIso true:   OK,  trigger
+  //       requestIso false, enableIso false:  OK,  trigger
 
-    //   value >= high pt threshold & non-isolated muon:
-    //       requestIso true:  fail trigger
-    //       requestIso false: OK,  trigger
+  //   value >= high pt threshold & non-isolated muon:
+  //       requestIso true:  fail trigger
+  //       requestIso false: OK,  trigger
 
-    //   value >= high pt threshold & isolated muon:
-    //       OK, trigger
+  //   value >= high pt threshold & isolated muon:
+  //       OK, trigger
 
+  if (!checkThreshold(objPar.ptHighThreshold, cand.ptIndex(),
+                      m_gtMuonTemplate->condGEq())) {
 
-    if ( !checkThreshold(objPar.ptHighThreshold, cand.ptIndex(), m_gtMuonTemplate->condGEq()) ) {
+    if (!checkThreshold(objPar.ptLowThreshold, cand.ptIndex(),
+                        m_gtMuonTemplate->condGEq())) {
 
-        if ( !checkThreshold(objPar.ptLowThreshold, cand.ptIndex(), m_gtMuonTemplate->condGEq()) ) {
+      return false;
+    } else {
 
-            return false;
-        }
-        else {
-
-            // check isolation
-            if ( !cand.isol() ) {
-                if (objPar.requestIso || objPar.enableIso) {
-
-                    return false;
-                }
-            }
+      // check isolation
+      if (!cand.isol()) {
+        if (objPar.requestIso || objPar.enableIso) {
 
+          return false;
         }
-
+      }
     }
-    else {
 
-        if ( !cand.isol() ) {
-            if (objPar.requestIso) {
+  } else {
 
-                return false;
-            }
-        }
-
-    }
+    if (!cand.isol()) {
+      if (objPar.requestIso) {
 
-    // check eta
-
-    if (!checkBit(objPar.etaRange, cand.etaIndex())) {
         return false;
+      }
     }
+  }
 
-    // check phi  - in the requested range (no LUT used - LUT too big for hw chip)
-    // for phiLow <= phiHigh takes [phiLow, phiHigh]
-    // for phiLow >= phiHigh takes [phiLow, phiHigh] over zero angle!
+  // check eta
 
-    if (objPar.phiHigh >= objPar.phiLow) {
+  if (!checkBit(objPar.etaRange, cand.etaIndex())) {
+    return false;
+  }
 
-        if (! ( (objPar.phiLow <= cand.phiIndex()) && (cand.phiIndex() <= objPar.phiHigh ) )) {
+  // check phi  - in the requested range (no LUT used - LUT too big for hw chip)
+  // for phiLow <= phiHigh takes [phiLow, phiHigh]
+  // for phiLow >= phiHigh takes [phiLow, phiHigh] over zero angle!
 
-            return false;
-        }
+  if (objPar.phiHigh >= objPar.phiLow) {
 
+    if (!((objPar.phiLow <= cand.phiIndex()) &&
+          (cand.phiIndex() <= objPar.phiHigh))) {
+
+      return false;
     }
-    else { // go over zero angle!!
-        if (! ( (objPar.phiLow <= cand.phiIndex()) || (cand.phiIndex() <= objPar.phiHigh ) )) {
 
-            return false;
-        }
+  } else { // go over zero angle!!
+    if (!((objPar.phiLow <= cand.phiIndex()) ||
+          (cand.phiIndex() <= objPar.phiHigh))) {
+
+      return false;
     }
+  }
 
-    // check quality ( bit check )
+  // check quality ( bit check )
 
-    // A number of values is required to trigger (at least one).
-    // "Don’t care" means that all values are allowed.
-    // Qual = 000 means then NO MUON (GTL module)
+  // A number of values is required to trigger (at least one).
+  // "Don’t care" means that all values are allowed.
+  // Qual = 000 means then NO MUON (GTL module)
 
-    if (cand.quality() == 0) {
-        return false;
-    }
+  if (cand.quality() == 0) {
+    return false;
+  }
 
-    if (objPar.qualityRange == 0) {
-        return false;
-    }
-    else {
-        if (!checkBit(objPar.qualityRange, cand.quality())) {
-            return false;
-        }
+  if (objPar.qualityRange == 0) {
+    return false;
+  } else {
+    if (!checkBit(objPar.qualityRange, cand.quality())) {
+      return false;
     }
+  }
 
-    // check mip
-    if (objPar.enableMip) {
-        if (!cand.mip()) {
+  // check mip
+  if (objPar.enableMip) {
+    if (!cand.mip()) {
 
-            return false;
-        }
+      return false;
     }
+  }
 
-    // particle matches if we get here
-    //LogTrace("L1GlobalTrigger")
-    //    << "  checkObjectParameter: muon object OK, passes all requirements\n" << std::endl;
+  // particle matches if we get here
+  // LogTrace("L1GlobalTrigger")
+  //    << "  checkObjectParameter: muon object OK, passes all requirements\n"
+  //    << std::endl;
 
-    return true;
+  return true;
 }
 
-void L1GtMuonCondition::print(std::ostream& myCout) const {
+void L1GtMuonCondition::print(std::ostream &myCout) const {
 
-    m_gtMuonTemplate->print(myCout);
+  m_gtMuonTemplate->print(myCout);
 
-    myCout << "    Number of bits for eta of muon objects = "
-            << m_ifMuEtaNumberBits << std::endl;
-    myCout << "    Maximum number of bins for the delta phi scales = "
-            << m_corrParDeltaPhiNrBins << "\n " << std::endl;
-
-    L1GtConditionEvaluation::print(myCout);
+  myCout << "    Number of bits for eta of muon objects = "
+         << m_ifMuEtaNumberBits << std::endl;
+  myCout << "    Maximum number of bins for the delta phi scales = "
+         << m_corrParDeltaPhiNrBins << "\n " << std::endl;
 
+  L1GtConditionEvaluation::print(myCout);
 }
-
diff --git a/L1Trigger/L1ExtraFromDigis/interface/L1ExtraParticleMapProd.h b/L1Trigger/L1ExtraFromDigis/interface/L1ExtraParticleMapProd.h
index 5fb0cae7dbbc1..42523c793fb63 100644
--- a/L1Trigger/L1ExtraFromDigis/interface/L1ExtraParticleMapProd.h
+++ b/L1Trigger/L1ExtraFromDigis/interface/L1ExtraParticleMapProd.h
@@ -4,26 +4,29 @@
 //
 // Package:     L1ExtraFromDigis
 // Class  :     L1ExtraParticleMapProd
-// 
-/**\class L1ExtraParticleMapProd \file L1ExtraParticleMapProd.h L1Trigger/L1ExtraFromDigis/interface/L1ExtraParticleMapProd.h \author Werner Sun
+//
+/**\class L1ExtraParticleMapProd \file L1ExtraParticleMapProd.h
+ L1Trigger/L1ExtraFromDigis/interface/L1ExtraParticleMapProd.h \author Werner
+ Sun
 
  Description: producer of L1ParticleMap objects from GT emulator object maps.
 */
 //
-// Original Author:  
+// Original Author:
 //         Created:  Tue Oct 17 00:14:00 EDT 2006
 //
 
 // system include files
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
 #include "DataFormats/L1Trigger/interface/L1EmParticle.h"
 #include "DataFormats/L1Trigger/interface/L1EmParticleFwd.h"
 #include "DataFormats/L1Trigger/interface/L1JetParticle.h"
@@ -31,137 +34,134 @@
 #include "DataFormats/L1Trigger/interface/L1MuonParticle.h"
 #include "DataFormats/L1Trigger/interface/L1ParticleMap.h"
 #include "DataFormats/L1Trigger/interface/L1ParticleMapFwd.h"
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
 
 // forward declarations
 
 class L1ExtraParticleMapProd : public edm::EDProducer {
-   public:
-      explicit L1ExtraParticleMapProd(const edm::ParameterSet&);
-      ~L1ExtraParticleMapProd() override;
-
-
-      void produce(edm::Event&, const edm::EventSetup&) override;
-   private:
-
-      // Adds Refs to the objects in handle to the outputRefs vector.
-      template< class TCollection >
-      void addToVectorRefs(
-	 const edm::Handle< TCollection >& handle,               // input
-	 std::vector< edm::Ref< TCollection > >& vectorRefs ) ;  // output
-
-      template< class TCollection >
-      void evaluateSingleObjectTrigger(
-	 const std::vector< edm::Ref< TCollection > >& inputRefs, // input
-	 const double& etThreshold,                               // input
-	 bool& decision,                                          // output
-	 std::vector< edm::Ref< TCollection > >& outputRefs ) ;   // output
-
-      template< class TCollection >
-      void evaluateDoubleSameObjectTrigger(
-	 const std::vector< edm::Ref< TCollection > >& inputRefs, // input
-	 const double& etThreshold,                               // input
-	 bool& decision,                                          // output
-	 std::vector< edm::Ref< TCollection > >& outputRefs,      // output
-	 l1extra::L1ParticleMap::L1IndexComboVector& combos,      // output
-	 bool combinedWithGlobalObject = false ) ; // if true, add entry for
-                                             // HT or MET to particle combos
-
-      template< class TCollection >
-      void evaluateTripleSameObjectTrigger(
-	 const std::vector< edm::Ref< TCollection > >& inputRefs, // input
-	 const double& etThreshold,                               // input
-	 bool& decision,                                          // output
-	 std::vector< edm::Ref< TCollection > >& outputRefs,      // output
-	 l1extra::L1ParticleMap::L1IndexComboVector& combos ) ;   // output
-
-      template< class TCollection1, class TCollection2 >
-      void evaluateDoublePlusSingleObjectTrigger(
-	 const std::vector< edm::Ref< TCollection1 > >& inputRefs1, // input
-	 const std::vector< edm::Ref< TCollection2 > >& inputRefs2, // input
-	 const double& etThreshold1,                                // input
-	 const double& etThreshold2,                                // input
-	 bool& decision,                                            // output
-	 std::vector< edm::Ref< TCollection1 > >& outputRefs1,      // output
-	 std::vector< edm::Ref< TCollection2 > >& outputRefs2,      // output
-	 l1extra::L1ParticleMap::L1IndexComboVector& combos ) ;     // output
-
-      template< class TCollection >
-      void evaluateQuadSameObjectTrigger(
-	 const std::vector< edm::Ref< TCollection > >& inputRefs, // input
-	 const double& etThreshold,                               // input
-	 bool& decision,                                          // output
-	 std::vector< edm::Ref< TCollection > >& outputRefs,      // output
-	 l1extra::L1ParticleMap::L1IndexComboVector& combos ) ;   // output
-
-      template< class TCollection1, class TCollection2 >
-      void evaluateDoubleDifferentObjectTrigger(
-	 const std::vector< edm::Ref< TCollection1 > >& inputRefs1, // input
-	 const std::vector< edm::Ref< TCollection2 > >& inputRefs2, // input
-	 const double& etThreshold1,                                // input
-	 const double& etThreshold2,                                // input
-	 bool& decision,                                            // output
-	 std::vector< edm::Ref< TCollection1 > >& outputRefs1,      // output
-	 std::vector< edm::Ref< TCollection2 > >& outputRefs2,      // output
-	 l1extra::L1ParticleMap::L1IndexComboVector& combos ) ;     // output
-
-      template< class TCollection >
-      void evaluateDoubleDifferentObjectSameTypeTrigger(
-	 const std::vector< edm::Ref< TCollection > >& inputRefs1, // input
-	 const std::vector< edm::Ref< TCollection > >& inputRefs2, // input
-	 const double& etThreshold1,                               // input
-	 const double& etThreshold2,                               // input
-	 bool& decision,                                           // output
-	 std::vector< edm::Ref< TCollection > >& outputRefs,       // output
-	 l1extra::L1ParticleMap::L1IndexComboVector& combos ) ;    // output
-
-      void evaluateDoubleDifferentCaloObjectTrigger(
-	 const l1extra::L1EmParticleVectorRef& inputRefs1,          // input
-	 const l1extra::L1JetParticleVectorRef& inputRefs2,         // input
-	 const double& etThreshold1,                                // input
-	 const double& etThreshold2,                                // input
-	 bool& decision,                                            // output
-	 l1extra::L1EmParticleVectorRef& outputRefs1,               // output
-	 l1extra::L1JetParticleVectorRef& outputRefs2,              // output
-	 l1extra::L1ParticleMap::L1IndexComboVector& combos ) ;     // output
-
-      void evaluateJetGapJetTrigger(
-         const l1extra::L1JetParticleVectorRef& inputRefs,          // input
-         const double& etThreshold,                                 // input
-         bool& decision,                                            // output
-         l1extra::L1JetParticleVectorRef& outputRefs,               // output
-         l1extra::L1ParticleMap::L1IndexComboVector& combos );      // output
-
-       void evaluateForwardRapidityGap(
-          const l1extra::L1JetParticleVectorRef& inputRefs,         // input
-          const double& etThreshold,                                // input
-          bool& decision );                                         // output
-
-       void evaluateDoubleExclusiveIsoEG(
-          const l1extra::L1EmParticleVectorRef& inputRefs1,         // input
-	  const l1extra::L1JetParticleVectorRef& inputRefs2,        // input
-	  const double& etThreshold1,                               // input
-	  const double& etThreshold2,                               // input
-	  bool& decision,                                           // output
-	  l1extra::L1EmParticleVectorRef& outputRefs1,              // output
-	  l1extra::L1ParticleMap::L1IndexComboVector& combos );     // output
-
-      // ----------member data ---------------------------
-      edm::InputTag muonSource_ ;
-      edm::InputTag isoEmSource_ ;
-      edm::InputTag nonIsoEmSource_ ;
-      edm::InputTag cenJetSource_ ;
-      edm::InputTag forJetSource_ ;
-      edm::InputTag tauJetSource_ ;
-      edm::InputTag etMissSource_ ;
-      edm::InputTag htMissSource_ ;
-
-      double singleThresholds_[ l1extra::L1ParticleMap::kNumOfL1TriggerTypes ];
-      int prescales_[ l1extra::L1ParticleMap::kNumOfL1TriggerTypes ] ;
-      int prescaleCounters_[
-	 l1extra::L1ParticleMap::kNumOfL1TriggerTypes ] ;
-      std::pair< double, double >
-         doubleThresholds_[ l1extra::L1ParticleMap::kNumOfL1TriggerTypes ] ;
+public:
+  explicit L1ExtraParticleMapProd(const edm::ParameterSet &);
+  ~L1ExtraParticleMapProd() override;
+
+  void produce(edm::Event &, const edm::EventSetup &) override;
+
+private:
+  // Adds Refs to the objects in handle to the outputRefs vector.
+  template <class TCollection>
+  void
+  addToVectorRefs(const edm::Handle<TCollection> &handle,          // input
+                  std::vector<edm::Ref<TCollection>> &vectorRefs); // output
+
+  template <class TCollection>
+  void evaluateSingleObjectTrigger(
+      const std::vector<edm::Ref<TCollection>> &inputRefs, // input
+      const double &etThreshold,                           // input
+      bool &decision,                                      // output
+      std::vector<edm::Ref<TCollection>> &outputRefs);     // output
+
+  template <class TCollection>
+  void evaluateDoubleSameObjectTrigger(
+      const std::vector<edm::Ref<TCollection>> &inputRefs, // input
+      const double &etThreshold,                           // input
+      bool &decision,                                      // output
+      std::vector<edm::Ref<TCollection>> &outputRefs,      // output
+      l1extra::L1ParticleMap::L1IndexComboVector &combos,  // output
+      bool combinedWithGlobalObject = false); // if true, add entry for
+                                              // HT or MET to particle combos
+
+  template <class TCollection>
+  void evaluateTripleSameObjectTrigger(
+      const std::vector<edm::Ref<TCollection>> &inputRefs, // input
+      const double &etThreshold,                           // input
+      bool &decision,                                      // output
+      std::vector<edm::Ref<TCollection>> &outputRefs,      // output
+      l1extra::L1ParticleMap::L1IndexComboVector &combos); // output
+
+  template <class TCollection1, class TCollection2>
+  void evaluateDoublePlusSingleObjectTrigger(
+      const std::vector<edm::Ref<TCollection1>> &inputRefs1, // input
+      const std::vector<edm::Ref<TCollection2>> &inputRefs2, // input
+      const double &etThreshold1,                            // input
+      const double &etThreshold2,                            // input
+      bool &decision,                                        // output
+      std::vector<edm::Ref<TCollection1>> &outputRefs1,      // output
+      std::vector<edm::Ref<TCollection2>> &outputRefs2,      // output
+      l1extra::L1ParticleMap::L1IndexComboVector &combos);   // output
+
+  template <class TCollection>
+  void evaluateQuadSameObjectTrigger(
+      const std::vector<edm::Ref<TCollection>> &inputRefs, // input
+      const double &etThreshold,                           // input
+      bool &decision,                                      // output
+      std::vector<edm::Ref<TCollection>> &outputRefs,      // output
+      l1extra::L1ParticleMap::L1IndexComboVector &combos); // output
+
+  template <class TCollection1, class TCollection2>
+  void evaluateDoubleDifferentObjectTrigger(
+      const std::vector<edm::Ref<TCollection1>> &inputRefs1, // input
+      const std::vector<edm::Ref<TCollection2>> &inputRefs2, // input
+      const double &etThreshold1,                            // input
+      const double &etThreshold2,                            // input
+      bool &decision,                                        // output
+      std::vector<edm::Ref<TCollection1>> &outputRefs1,      // output
+      std::vector<edm::Ref<TCollection2>> &outputRefs2,      // output
+      l1extra::L1ParticleMap::L1IndexComboVector &combos);   // output
+
+  template <class TCollection>
+  void evaluateDoubleDifferentObjectSameTypeTrigger(
+      const std::vector<edm::Ref<TCollection>> &inputRefs1, // input
+      const std::vector<edm::Ref<TCollection>> &inputRefs2, // input
+      const double &etThreshold1,                           // input
+      const double &etThreshold2,                           // input
+      bool &decision,                                       // output
+      std::vector<edm::Ref<TCollection>> &outputRefs,       // output
+      l1extra::L1ParticleMap::L1IndexComboVector &combos);  // output
+
+  void evaluateDoubleDifferentCaloObjectTrigger(
+      const l1extra::L1EmParticleVectorRef &inputRefs1,    // input
+      const l1extra::L1JetParticleVectorRef &inputRefs2,   // input
+      const double &etThreshold1,                          // input
+      const double &etThreshold2,                          // input
+      bool &decision,                                      // output
+      l1extra::L1EmParticleVectorRef &outputRefs1,         // output
+      l1extra::L1JetParticleVectorRef &outputRefs2,        // output
+      l1extra::L1ParticleMap::L1IndexComboVector &combos); // output
+
+  void evaluateJetGapJetTrigger(
+      const l1extra::L1JetParticleVectorRef &inputRefs,    // input
+      const double &etThreshold,                           // input
+      bool &decision,                                      // output
+      l1extra::L1JetParticleVectorRef &outputRefs,         // output
+      l1extra::L1ParticleMap::L1IndexComboVector &combos); // output
+
+  void evaluateForwardRapidityGap(
+      const l1extra::L1JetParticleVectorRef &inputRefs, // input
+      const double &etThreshold,                        // input
+      bool &decision);                                  // output
+
+  void evaluateDoubleExclusiveIsoEG(
+      const l1extra::L1EmParticleVectorRef &inputRefs1,    // input
+      const l1extra::L1JetParticleVectorRef &inputRefs2,   // input
+      const double &etThreshold1,                          // input
+      const double &etThreshold2,                          // input
+      bool &decision,                                      // output
+      l1extra::L1EmParticleVectorRef &outputRefs1,         // output
+      l1extra::L1ParticleMap::L1IndexComboVector &combos); // output
+
+  // ----------member data ---------------------------
+  edm::InputTag muonSource_;
+  edm::InputTag isoEmSource_;
+  edm::InputTag nonIsoEmSource_;
+  edm::InputTag cenJetSource_;
+  edm::InputTag forJetSource_;
+  edm::InputTag tauJetSource_;
+  edm::InputTag etMissSource_;
+  edm::InputTag htMissSource_;
+
+  double singleThresholds_[l1extra::L1ParticleMap::kNumOfL1TriggerTypes];
+  int prescales_[l1extra::L1ParticleMap::kNumOfL1TriggerTypes];
+  int prescaleCounters_[l1extra::L1ParticleMap::kNumOfL1TriggerTypes];
+  std::pair<double, double>
+      doubleThresholds_[l1extra::L1ParticleMap::kNumOfL1TriggerTypes];
 };
 
 #endif
diff --git a/L1Trigger/L1ExtraFromDigis/interface/L1ExtraParticlesProd.h b/L1Trigger/L1ExtraFromDigis/interface/L1ExtraParticlesProd.h
index 9889746bce005..bc4bd2d026816 100644
--- a/L1Trigger/L1ExtraFromDigis/interface/L1ExtraParticlesProd.h
+++ b/L1Trigger/L1ExtraFromDigis/interface/L1ExtraParticlesProd.h
@@ -4,79 +4,81 @@
 //
 // Package:     L1ExtraFromDigis
 // Class  :     L1ExtraParticlesProd
-// 
-/**\class L1ExtraParticlesProd \file L1ExtraParticlesProd.h L1Trigger/L1ExtraFromDigis/interface/L1ExtraParticlesProd.h \author Werner Sun
+//
+/**\class L1ExtraParticlesProd \file L1ExtraParticlesProd.h
+ L1Trigger/L1ExtraFromDigis/interface/L1ExtraParticlesProd.h \author Werner Sun
 
- Description: producer of L1Extra particle objects from Level-1 hardware objects.
+ Description: producer of L1Extra particle objects from Level-1 hardware
+ objects.
 
 */
 //
-// Original Author:  
+// Original Author:
 //         Created:  Tue Oct 17 00:13:51 EDT 2006
 //
 
 // system include files
 
 // user include files
-#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
 #include "DataFormats/L1Trigger/interface/L1EmParticle.h"
 #include "DataFormats/L1Trigger/interface/L1EmParticleFwd.h"
-#include "DataFormats/L1Trigger/interface/L1JetParticle.h"
-#include "DataFormats/L1Trigger/interface/L1JetParticleFwd.h"
-#include "DataFormats/L1Trigger/interface/L1MuonParticle.h"
-#include "DataFormats/L1Trigger/interface/L1MuonParticleFwd.h"
 #include "DataFormats/L1Trigger/interface/L1EtMissParticle.h"
 #include "DataFormats/L1Trigger/interface/L1EtMissParticleFwd.h"
 #include "DataFormats/L1Trigger/interface/L1HFRings.h"
 #include "DataFormats/L1Trigger/interface/L1HFRingsFwd.h"
+#include "DataFormats/L1Trigger/interface/L1JetParticle.h"
+#include "DataFormats/L1Trigger/interface/L1JetParticleFwd.h"
+#include "DataFormats/L1Trigger/interface/L1MuonParticle.h"
+#include "DataFormats/L1Trigger/interface/L1MuonParticleFwd.h"
 
 // forward declarations
-class L1CaloGeometry ;
+class L1CaloGeometry;
 
 class L1ExtraParticlesProd : public edm::stream::EDProducer<> {
-   public:
-      explicit L1ExtraParticlesProd(const edm::ParameterSet&);
-      ~L1ExtraParticlesProd() override;
+public:
+  explicit L1ExtraParticlesProd(const edm::ParameterSet &);
+  ~L1ExtraParticlesProd() override;
+
+private:
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
-   private:
-      void produce(edm::Event&, const edm::EventSetup&) override;
+  //      math::XYZTLorentzVector gctLorentzVector( const double& et,
+  math::PtEtaPhiMLorentzVector gctLorentzVector(const double &et,
+                                                const L1GctCand &cand,
+                                                const L1CaloGeometry *geom,
+                                                bool central);
 
-      //      math::XYZTLorentzVector gctLorentzVector( const double& et,
-      math::PtEtaPhiMLorentzVector gctLorentzVector( const double& et,
-						     const L1GctCand& cand,
-						     const L1CaloGeometry* geom,
-						     bool central ) ;
-      
-      // ----------member data ---------------------------
-      bool produceMuonParticles_ ;
-      edm::InputTag muonSource_ ;
+  // ----------member data ---------------------------
+  bool produceMuonParticles_;
+  edm::InputTag muonSource_;
 
-      bool produceCaloParticles_ ;
-      edm::InputTag isoEmSource_ ;
-      edm::InputTag nonIsoEmSource_ ;
-      edm::InputTag cenJetSource_ ;
-      edm::InputTag forJetSource_ ;
-      edm::InputTag tauJetSource_ ;
-      edm::InputTag isoTauJetSource_ ;
-      edm::InputTag etTotSource_ ;
-      edm::InputTag etHadSource_ ;
-      edm::InputTag etMissSource_ ;
-      edm::InputTag htMissSource_ ;
-      edm::InputTag hfRingEtSumsSource_ ;
-      edm::InputTag hfRingBitCountsSource_ ;
+  bool produceCaloParticles_;
+  edm::InputTag isoEmSource_;
+  edm::InputTag nonIsoEmSource_;
+  edm::InputTag cenJetSource_;
+  edm::InputTag forJetSource_;
+  edm::InputTag tauJetSource_;
+  edm::InputTag isoTauJetSource_;
+  edm::InputTag etTotSource_;
+  edm::InputTag etHadSource_;
+  edm::InputTag etMissSource_;
+  edm::InputTag htMissSource_;
+  edm::InputTag hfRingEtSumsSource_;
+  edm::InputTag hfRingBitCountsSource_;
 
-      static const double muonMassGeV_ ;
+  static const double muonMassGeV_;
 
-      bool centralBxOnly_ ;
+  bool centralBxOnly_;
 
-      // Set this to true when rerunning on RAW data where the GCT did not
-      // produce a L1GctHtMiss record.
-      bool ignoreHtMiss_ ;
+  // Set this to true when rerunning on RAW data where the GCT did not
+  // produce a L1GctHtMiss record.
+  bool ignoreHtMiss_;
 };
 
 #endif
diff --git a/L1Trigger/L1ExtraFromDigis/src/L1ExtraParticleMapProd.cc b/L1Trigger/L1ExtraFromDigis/src/L1ExtraParticleMapProd.cc
index 90ca4cb96cdd7..4c5ec2ea2cf47 100644
--- a/L1Trigger/L1ExtraFromDigis/src/L1ExtraParticleMapProd.cc
+++ b/L1Trigger/L1ExtraFromDigis/src/L1ExtraParticleMapProd.cc
@@ -2,16 +2,17 @@
 //
 // Package:    L1ExtraParticleMapProd
 // Class:      L1ExtraParticleMapProd
-// 
-/**\class L1ExtraParticleMapProd \file L1ExtraParticleMapProd.cc L1Trigger/L1ExtraParticleMapProd/src/L1ExtraParticleMapProd.cc \author Werner Sun
-*/
+//
+/**\class L1ExtraParticleMapProd \file L1ExtraParticleMapProd.cc
+ * L1Trigger/L1ExtraParticleMapProd/src/L1ExtraParticleMapProd.cc \author Werner
+ * Sun
+ */
 //
 // Original Author:  Werner Sun
 //         Created:  Mon Oct 16 23:19:38 EDT 2006
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -25,7 +26,7 @@
 
 #include "CLHEP/Random/RandFlat.h"
 
-static const int kDefault = -1 ;
+static const int kDefault = -1;
 
 //
 // constants, enums and typedefs
@@ -38,2604 +39,2113 @@ static const int kDefault = -1 ;
 //
 // constructors and destructor
 //
-L1ExtraParticleMapProd::L1ExtraParticleMapProd(
-   const edm::ParameterSet& iConfig)
-   : muonSource_( iConfig.getParameter< edm::InputTag >(
-      "muonSource" ) ),
-     isoEmSource_( iConfig.getParameter< edm::InputTag >(
-	"isolatedEmSource" ) ),
-     nonIsoEmSource_( iConfig.getParameter< edm::InputTag >(
-	"nonIsolatedEmSource" ) ),
-     cenJetSource_( iConfig.getParameter< edm::InputTag >(
-	"centralJetSource" ) ),
-     forJetSource_( iConfig.getParameter< edm::InputTag >(
-	"forwardJetSource" ) ),
-     tauJetSource_( iConfig.getParameter< edm::InputTag >(
-	"tauJetSource" ) ),
-     etMissSource_( iConfig.getParameter< edm::InputTag >(
-        "etMissSource" ) ),
-     htMissSource_( iConfig.getParameter< edm::InputTag >(
-	"htMissSource" ) )
-{
-   using namespace l1extra ;
-
-   //register your products
-   produces< L1ParticleMapCollection >() ;
-   produces< L1GlobalTriggerReadoutRecord >(); 
-
-   //now do what ever other initialization is needed
-   for( int i = 0 ; i < L1ParticleMap::kNumOfL1TriggerTypes ; ++i )
-   {
-      singleThresholds_[ i ] = 0. ;
-      doubleThresholds_[ i ].first = 0. ;
-      doubleThresholds_[ i ].second = 0. ;
-      prescaleCounters_[ i ] = 1 ;
-      prescales_[ i ] = 1 ;
-   }
-
-   // Single object triggers, 5 thresholds each
-
-   singleThresholds_[ L1ParticleMap::kSingleMu3 ] =
-      iConfig.getParameter< double >( "L1_SingleMu3_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleMu3 ] =
-      iConfig.getParameter< int >( "L1_SingleMu3_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleMu5 ] =
-      iConfig.getParameter< double >( "L1_SingleMu5_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleMu5 ] =
-      iConfig.getParameter< int >( "L1_SingleMu5_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleMu7 ] =
-      iConfig.getParameter< double >( "L1_SingleMu7_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleMu7 ] =
-      iConfig.getParameter< int >( "L1_SingleMu7_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleMu10 ] =
-      iConfig.getParameter< double >( "L1_SingleMu10_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleMu10 ] =
-      iConfig.getParameter< int >( "L1_SingleMu10_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleMu14 ] =
-      iConfig.getParameter< double >( "L1_SingleMu14_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleMu14 ] =
-      iConfig.getParameter< int >( "L1_SingleMu14_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleMu20 ] =
-      iConfig.getParameter< double >( "L1_SingleMu20_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleMu20 ] =
-      iConfig.getParameter< int >( "L1_SingleMu20_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleMu25 ] =
-      iConfig.getParameter< double >( "L1_SingleMu25_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleMu25 ] =
-      iConfig.getParameter< int >( "L1_SingleMu25_prescale" ) ;
-
-   singleThresholds_[ L1ParticleMap::kSingleIsoEG5 ] =
-      iConfig.getParameter< double >( "L1_SingleIsoEG5_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleIsoEG5 ] =
-      iConfig.getParameter< int >( "L1_SingleIsoEG5_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleIsoEG8 ] =
-      iConfig.getParameter< double >( "L1_SingleIsoEG8_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleIsoEG8 ] =
-      iConfig.getParameter< int >( "L1_SingleIsoEG8_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleIsoEG10 ] =
-      iConfig.getParameter< double >( "L1_SingleIsoEG10_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleIsoEG10 ] =
-      iConfig.getParameter< int >( "L1_SingleIsoEG10_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleIsoEG12 ] =
-      iConfig.getParameter< double >( "L1_SingleIsoEG12_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleIsoEG12 ] =
-      iConfig.getParameter< int >( "L1_SingleIsoEG12_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleIsoEG15 ] =
-      iConfig.getParameter< double >( "L1_SingleIsoEG15_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleIsoEG15 ] =
-      iConfig.getParameter< int >( "L1_SingleIsoEG15_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleIsoEG20 ] =
-      iConfig.getParameter< double >( "L1_SingleIsoEG20_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleIsoEG20 ] =
-      iConfig.getParameter< int >( "L1_SingleIsoEG20_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleIsoEG25 ] =
-      iConfig.getParameter< double >( "L1_SingleIsoEG25_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleIsoEG25 ] =
-      iConfig.getParameter< int >( "L1_SingleIsoEG25_prescale" ) ;
-
-   singleThresholds_[ L1ParticleMap::kSingleEG5 ] =
-      iConfig.getParameter< double >( "L1_SingleEG5_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleEG5 ] =
-      iConfig.getParameter< int >( "L1_SingleEG5_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleEG8 ] =
-      iConfig.getParameter< double >( "L1_SingleEG8_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleEG8 ] =
-      iConfig.getParameter< int >( "L1_SingleEG8_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleEG10 ] =
-      iConfig.getParameter< double >( "L1_SingleEG10_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleEG10 ] =
-      iConfig.getParameter< int >( "L1_SingleEG10_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleEG12 ] =
-      iConfig.getParameter< double >( "L1_SingleEG12_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleEG12 ] =
-      iConfig.getParameter< int >( "L1_SingleEG12_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleEG15 ] =
-      iConfig.getParameter< double >( "L1_SingleEG15_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleEG15 ] =
-      iConfig.getParameter< int >( "L1_SingleEG15_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleEG20 ] =
-      iConfig.getParameter< double >( "L1_SingleEG20_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleEG20 ] =
-      iConfig.getParameter< int >( "L1_SingleEG20_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleEG25 ] =
-      iConfig.getParameter< double >( "L1_SingleEG25_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleEG25 ] =
-      iConfig.getParameter< int >( "L1_SingleEG25_prescale" ) ;
-
-   singleThresholds_[ L1ParticleMap::kSingleJet15 ] =
-      iConfig.getParameter< double >( "L1_SingleJet15_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleJet15 ] =
-      iConfig.getParameter< int >( "L1_SingleJet15_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleJet20 ] =
-      iConfig.getParameter< double >( "L1_SingleJet20_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleJet20 ] =
-      iConfig.getParameter< int >( "L1_SingleJet20_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleJet30 ] =
-      iConfig.getParameter< double >( "L1_SingleJet30_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleJet30 ] =
-      iConfig.getParameter< int >( "L1_SingleJet30_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleJet50 ] =
-      iConfig.getParameter< double >( "L1_SingleJet50_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleJet50 ] =
-      iConfig.getParameter< int >( "L1_SingleJet50_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleJet70 ] =
-      iConfig.getParameter< double >( "L1_SingleJet70_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleJet70 ] =
-      iConfig.getParameter< int >( "L1_SingleJet70_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleJet100 ] =
-      iConfig.getParameter< double >( "L1_SingleJet100_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleJet100 ] =
-      iConfig.getParameter< int >( "L1_SingleJet100_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleJet150 ] =
-      iConfig.getParameter< double >( "L1_SingleJet150_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleJet150 ] =
-      iConfig.getParameter< int >( "L1_SingleJet150_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleJet200 ] =
-      iConfig.getParameter< double >( "L1_SingleJet200_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleJet200 ] =
-      iConfig.getParameter< int >( "L1_SingleJet200_prescale" ) ;
-
-   singleThresholds_[ L1ParticleMap::kSingleTauJet10 ] =
-      iConfig.getParameter< double >( "L1_SingleTauJet10_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleTauJet10 ] =
-      iConfig.getParameter< int >( "L1_SingleTauJet10_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleTauJet20 ] =
-      iConfig.getParameter< double >( "L1_SingleTauJet20_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleTauJet20 ] =
-      iConfig.getParameter< int >( "L1_SingleTauJet20_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleTauJet30 ] =
-      iConfig.getParameter< double >( "L1_SingleTauJet30_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleTauJet30 ] =
-      iConfig.getParameter< int >( "L1_SingleTauJet30_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleTauJet35 ] =
-      iConfig.getParameter< double >( "L1_SingleTauJet35_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleTauJet35 ] =
-      iConfig.getParameter< int >( "L1_SingleTauJet35_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleTauJet40 ] =
-      iConfig.getParameter< double >( "L1_SingleTauJet40_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleTauJet40 ] =
-      iConfig.getParameter< int >( "L1_SingleTauJet40_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleTauJet60 ] =
-      iConfig.getParameter< double >( "L1_SingleTauJet60_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleTauJet60 ] =
-      iConfig.getParameter< int >( "L1_SingleTauJet60_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleTauJet80 ] =
-      iConfig.getParameter< double >( "L1_SingleTauJet80_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleTauJet80 ] =
-      iConfig.getParameter< int >( "L1_SingleTauJet80_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kSingleTauJet100 ] =
-      iConfig.getParameter< double >( "L1_SingleTauJet100_thresh" ) ;
-   prescales_[ L1ParticleMap::kSingleTauJet100 ] =
-      iConfig.getParameter< int >( "L1_SingleTauJet100_prescale" ) ;
-
-   singleThresholds_[ L1ParticleMap::kHTT100 ] =
-      iConfig.getParameter< double >( "L1_HTT100_thresh" ) ;
-   prescales_[ L1ParticleMap::kHTT100 ] =
-      iConfig.getParameter< int >( "L1_HTT100_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kHTT200 ] =
-      iConfig.getParameter< double >( "L1_HTT200_thresh" ) ;
-   prescales_[ L1ParticleMap::kHTT200 ] =
-      iConfig.getParameter< int >( "L1_HTT200_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kHTT250 ] =
-      iConfig.getParameter< double >( "L1_HTT250_thresh" ) ;
-   prescales_[ L1ParticleMap::kHTT250 ] =
-      iConfig.getParameter< int >( "L1_HTT250_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kHTT300 ] =
-      iConfig.getParameter< double >( "L1_HTT300_thresh" ) ;
-   prescales_[ L1ParticleMap::kHTT300 ] =
-      iConfig.getParameter< int >( "L1_HTT300_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kHTT400 ] =
-      iConfig.getParameter< double >( "L1_HTT400_thresh" ) ;
-   prescales_[ L1ParticleMap::kHTT400 ] =
-      iConfig.getParameter< int >( "L1_HTT400_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kHTT500 ] =
-      iConfig.getParameter< double >( "L1_HTT500_thresh" ) ;
-   prescales_[ L1ParticleMap::kHTT500 ] =
-      iConfig.getParameter< int >( "L1_HTT500_prescale" ) ;
-
-   singleThresholds_[ L1ParticleMap::kETM10 ] =
-      iConfig.getParameter< double >( "L1_ETM10_thresh" ) ;
-   prescales_[ L1ParticleMap::kETM10 ] =
-      iConfig.getParameter< int >( "L1_ETM10_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kETM15 ] =
-      iConfig.getParameter< double >( "L1_ETM15_thresh" ) ;
-   prescales_[ L1ParticleMap::kETM15 ] =
-      iConfig.getParameter< int >( "L1_ETM15_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kETM20 ] =
-      iConfig.getParameter< double >( "L1_ETM20_thresh" ) ;
-   prescales_[ L1ParticleMap::kETM20 ] =
-      iConfig.getParameter< int >( "L1_ETM20_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kETM30 ] =
-      iConfig.getParameter< double >( "L1_ETM30_thresh" ) ;
-   prescales_[ L1ParticleMap::kETM30 ] =
-      iConfig.getParameter< int >( "L1_ETM30_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kETM40 ] =
-      iConfig.getParameter< double >( "L1_ETM40_thresh" ) ;
-   prescales_[ L1ParticleMap::kETM40 ] =
-      iConfig.getParameter< int >( "L1_ETM40_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kETM50 ] =
-      iConfig.getParameter< double >( "L1_ETM50_thresh" ) ;
-   prescales_[ L1ParticleMap::kETM50 ] =
-      iConfig.getParameter< int >( "L1_ETM50_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kETM60 ] =
-      iConfig.getParameter< double >( "L1_ETM60_thresh" ) ;
-   prescales_[ L1ParticleMap::kETM60 ] =
-      iConfig.getParameter< int >( "L1_ETM60_prescale" ) ;
-
-   singleThresholds_[ L1ParticleMap::kETT60 ] =
-      iConfig.getParameter< double >( "L1_ETT60_thresh" ) ;
-   prescales_[ L1ParticleMap::kETT60 ] =
-      iConfig.getParameter< int >( "L1_ETT60_prescale" ) ;
-
-   // AA triggers
-
-   singleThresholds_[ L1ParticleMap::kDoubleMu3 ] =
-      iConfig.getParameter< double >( "L1_DoubleMu3_thresh" ) ;
-   prescales_[ L1ParticleMap::kDoubleMu3 ] =
-      iConfig.getParameter< int >( "L1_DoubleMu3_prescale" ) ;
-
-   singleThresholds_[ L1ParticleMap::kDoubleIsoEG8 ] =
-      iConfig.getParameter< double >( "L1_DoubleIsoEG8_thresh" ) ;
-   prescales_[ L1ParticleMap::kDoubleIsoEG8 ] =
-      iConfig.getParameter< int >( "L1_DoubleIsoEG8_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kDoubleIsoEG10 ] =
-      iConfig.getParameter< double >( "L1_DoubleIsoEG10_thresh" ) ;
-   prescales_[ L1ParticleMap::kDoubleIsoEG10 ] =
-      iConfig.getParameter< int >( "L1_DoubleIsoEG10_prescale" ) ;
-
-   singleThresholds_[ L1ParticleMap::kDoubleEG5 ] =
-      iConfig.getParameter< double >( "L1_DoubleEG5_thresh" ) ;
-   prescales_[ L1ParticleMap::kDoubleEG5 ] =
-      iConfig.getParameter< int >( "L1_DoubleEG5_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kDoubleEG10 ] =
-      iConfig.getParameter< double >( "L1_DoubleEG10_thresh" ) ;
-   prescales_[ L1ParticleMap::kDoubleEG10 ] =
-      iConfig.getParameter< int >( "L1_DoubleEG10_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kDoubleEG15 ] =
-      iConfig.getParameter< double >( "L1_DoubleEG15_thresh" ) ;
-   prescales_[ L1ParticleMap::kDoubleEG15 ] =
-      iConfig.getParameter< int >( "L1_DoubleEG15_prescale" ) ;
-
-   singleThresholds_[ L1ParticleMap::kDoubleJet70 ] =
-      iConfig.getParameter< double >( "L1_DoubleJet70_thresh" ) ;
-   prescales_[ L1ParticleMap::kDoubleJet70 ] =
-      iConfig.getParameter< int >( "L1_DoubleJet70_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kDoubleJet100 ] =
-      iConfig.getParameter< double >( "L1_DoubleJet100_thresh" ) ;
-   prescales_[ L1ParticleMap::kDoubleJet100 ] =
-      iConfig.getParameter< int >( "L1_DoubleJet100_prescale" ) ;
-
-   singleThresholds_[ L1ParticleMap::kDoubleTauJet20 ] =
-      iConfig.getParameter< double >( "L1_DoubleTauJet20_thresh" ) ;
-   prescales_[ L1ParticleMap::kDoubleTauJet20 ] =
-      iConfig.getParameter< int >( "L1_DoubleTauJet20_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kDoubleTauJet30 ] =
-      iConfig.getParameter< double >( "L1_DoubleTauJet30_thresh" ) ;
-   prescales_[ L1ParticleMap::kDoubleTauJet30 ] =
-      iConfig.getParameter< int >( "L1_DoubleTauJet30_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kDoubleTauJet35 ] =
-      iConfig.getParameter< double >( "L1_DoubleTauJet35_thresh" ) ;
-   prescales_[ L1ParticleMap::kDoubleTauJet35 ] =
-      iConfig.getParameter< int >( "L1_DoubleTauJet35_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kDoubleTauJet40 ] =
-      iConfig.getParameter< double >( "L1_DoubleTauJet40_thresh" ) ;
-   prescales_[ L1ParticleMap::kDoubleTauJet40 ] =
-      iConfig.getParameter< int >( "L1_DoubleTauJet40_prescale" ) ;
-
-   // AB triggers
-
-   doubleThresholds_[ L1ParticleMap::kMu3_IsoEG5 ].first =
-      iConfig.getParameter< double >( "L1_Mu3_IsoEG5_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kMu3_IsoEG5 ].second =
-      iConfig.getParameter< double >( "L1_Mu3_IsoEG5_thresh2" ) ;
-   prescales_[ L1ParticleMap::kMu3_IsoEG5 ] =
-      iConfig.getParameter< int >( "L1_Mu3_IsoEG5_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kMu5_IsoEG10 ].first =
-      iConfig.getParameter< double >( "L1_Mu5_IsoEG10_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kMu5_IsoEG10 ].second =
-      iConfig.getParameter< double >( "L1_Mu5_IsoEG10_thresh2" ) ;
-   prescales_[ L1ParticleMap::kMu5_IsoEG10 ] =
-      iConfig.getParameter< int >( "L1_Mu5_IsoEG10_prescale" ) ;
-
-   doubleThresholds_[ L1ParticleMap::kMu3_EG12 ].first =
-      iConfig.getParameter< double >( "L1_Mu3_EG12_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kMu3_EG12 ].second =
-      iConfig.getParameter< double >( "L1_Mu3_EG12_thresh2" ) ;
-   prescales_[ L1ParticleMap::kMu3_EG12 ] =
-      iConfig.getParameter< int >( "L1_Mu3_EG12_prescale" ) ;
-
-   doubleThresholds_[ L1ParticleMap::kMu3_Jet15 ].first =
-      iConfig.getParameter< double >( "L1_Mu3_Jet15_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kMu3_Jet15 ].second =
-      iConfig.getParameter< double >( "L1_Mu3_Jet15_thresh2" ) ;
-   prescales_[ L1ParticleMap::kMu3_Jet15 ] =
-      iConfig.getParameter< int >( "L1_Mu3_Jet15_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kMu5_Jet15 ].first =
-      iConfig.getParameter< double >( "L1_Mu5_Jet15_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kMu5_Jet15 ].second =
-      iConfig.getParameter< double >( "L1_Mu5_Jet15_thresh2" ) ;
-   prescales_[ L1ParticleMap::kMu5_Jet15 ] =
-      iConfig.getParameter< int >( "L1_Mu5_Jet15_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kMu3_Jet70 ].first =
-      iConfig.getParameter< double >( "L1_Mu3_Jet70_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kMu3_Jet70 ].second =
-      iConfig.getParameter< double >( "L1_Mu3_Jet70_thresh2" ) ;
-   prescales_[ L1ParticleMap::kMu3_Jet70 ] =
-      iConfig.getParameter< int >( "L1_Mu3_Jet70_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kMu5_Jet20 ].first =
-      iConfig.getParameter< double >( "L1_Mu5_Jet20_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kMu5_Jet20 ].second =
-      iConfig.getParameter< double >( "L1_Mu5_Jet20_thresh2" ) ;
-   prescales_[ L1ParticleMap::kMu5_Jet20 ] =
-      iConfig.getParameter< int >( "L1_Mu5_Jet20_prescale" ) ;
-
-   doubleThresholds_[ L1ParticleMap::kMu5_TauJet20 ].first =
-      iConfig.getParameter< double >( "L1_Mu5_TauJet20_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kMu5_TauJet20 ].second =
-      iConfig.getParameter< double >( "L1_Mu5_TauJet20_thresh2" ) ;
-   prescales_[ L1ParticleMap::kMu5_TauJet20 ] =
-      iConfig.getParameter< int >( "L1_Mu5_TauJet20_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kMu5_TauJet30 ].first =
-      iConfig.getParameter< double >( "L1_Mu5_TauJet30_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kMu5_TauJet30 ].second =
-      iConfig.getParameter< double >( "L1_Mu5_TauJet30_thresh2" ) ;
-   prescales_[ L1ParticleMap::kMu5_TauJet30 ] =
-      iConfig.getParameter< int >( "L1_Mu5_TauJet30_prescale" ) ;
-
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_EG10 ].first =
-      iConfig.getParameter< double >( "L1_IsoEG10_EG10_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_EG10 ].second =
-      iConfig.getParameter< double >( "L1_IsoEG10_EG10_thresh2" ) ;
-   prescales_[ L1ParticleMap::kIsoEG10_EG10 ] =
-      iConfig.getParameter< int >( "L1_IsoEG10_EG10_prescale" ) ;
-
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_Jet15 ].first =
-      iConfig.getParameter< double >( "L1_IsoEG10_Jet15_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_Jet15 ].second =
-      iConfig.getParameter< double >( "L1_IsoEG10_Jet15_thresh2" ) ;
-   prescales_[ L1ParticleMap::kIsoEG10_Jet15 ] =
-      iConfig.getParameter< int >( "L1_IsoEG10_Jet15_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_Jet30 ].first =
-      iConfig.getParameter< double >( "L1_IsoEG10_Jet30_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_Jet30 ].second =
-      iConfig.getParameter< double >( "L1_IsoEG10_Jet30_thresh2" ) ;
-   prescales_[ L1ParticleMap::kIsoEG10_Jet30 ] =
-      iConfig.getParameter< int >( "L1_IsoEG10_Jet30_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_Jet20 ].first =
-      iConfig.getParameter< double >( "L1_IsoEG10_Jet20_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_Jet20 ].second =
-      iConfig.getParameter< double >( "L1_IsoEG10_Jet20_thresh2" ) ;
-   prescales_[ L1ParticleMap::kIsoEG10_Jet20 ] =
-      iConfig.getParameter< int >( "L1_IsoEG10_Jet20_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_Jet70 ].first =
-      iConfig.getParameter< double >( "L1_IsoEG10_Jet70_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_Jet70 ].second =
-      iConfig.getParameter< double >( "L1_IsoEG10_Jet70_thresh2" ) ;
-   prescales_[ L1ParticleMap::kIsoEG10_Jet70 ] =
-      iConfig.getParameter< int >( "L1_IsoEG10_Jet70_prescale" ) ;
-
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_TauJet20 ].first =
-      iConfig.getParameter< double >( "L1_IsoEG10_TauJet20_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_TauJet20 ].second =
-      iConfig.getParameter< double >( "L1_IsoEG10_TauJet20_thresh2" ) ;
-   prescales_[ L1ParticleMap::kIsoEG10_TauJet20 ] =
-      iConfig.getParameter< int >( "L1_IsoEG10_TauJet20_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_TauJet30 ].first =
-      iConfig.getParameter< double >( "L1_IsoEG10_TauJet30_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_TauJet30 ].second =
-      iConfig.getParameter< double >( "L1_IsoEG10_TauJet30_thresh2" ) ;
-   prescales_[ L1ParticleMap::kIsoEG10_TauJet30 ] =
-      iConfig.getParameter< int >( "L1_IsoEG10_TauJet30_prescale" ) ;
-
-   doubleThresholds_[ L1ParticleMap::kEG10_Jet15 ].first =
-      iConfig.getParameter< double >( "L1_EG10_Jet15_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kEG10_Jet15 ].second =
-      iConfig.getParameter< double >( "L1_EG10_Jet15_thresh2" ) ;
-   prescales_[ L1ParticleMap::kEG10_Jet15 ] =
-      iConfig.getParameter< int >( "L1_EG10_Jet15_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kEG12_Jet20 ].first =
-      iConfig.getParameter< double >( "L1_EG12_Jet20_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kEG12_Jet20 ].second =
-      iConfig.getParameter< double >( "L1_EG12_Jet20_thresh2" ) ;
-   prescales_[ L1ParticleMap::kEG12_Jet20 ] =
-      iConfig.getParameter< int >( "L1_EG12_Jet20_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kEG12_Jet70 ].first =
-      iConfig.getParameter< double >( "L1_EG12_Jet70_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kEG12_Jet70 ].second =
-      iConfig.getParameter< double >( "L1_EG12_Jet70_thresh2" ) ;
-   prescales_[ L1ParticleMap::kEG12_Jet70 ] =
-      iConfig.getParameter< int >( "L1_EG12_Jet70_prescale" ) ;
-
-   doubleThresholds_[ L1ParticleMap::kEG12_TauJet40 ].first =
-      iConfig.getParameter< double >( "L1_EG12_TauJet40_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kEG12_TauJet40 ].second =
-      iConfig.getParameter< double >( "L1_EG12_TauJet40_thresh2" ) ;
-   prescales_[ L1ParticleMap::kEG12_TauJet40 ] =
-      iConfig.getParameter< int >( "L1_EG12_TauJet40_prescale" ) ;
-
-   doubleThresholds_[ L1ParticleMap::kJet70_TauJet40 ].first =
-      iConfig.getParameter< double >( "L1_Jet70_TauJet40_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kJet70_TauJet40 ].second =
-      iConfig.getParameter< double >( "L1_Jet70_TauJet40_thresh2" ) ;
-   prescales_[ L1ParticleMap::kJet70_TauJet40 ] =
-      iConfig.getParameter< int >( "L1_Jet70_TauJet40_prescale" ) ;
-
-   doubleThresholds_[ L1ParticleMap::kMu3_HTT200 ].first =
-      iConfig.getParameter< double >( "L1_Mu3_HTT200_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kMu3_HTT200 ].second =
-      iConfig.getParameter< double >( "L1_Mu3_HTT200_thresh2" ) ;
-   prescales_[ L1ParticleMap::kMu3_HTT200 ] =
-      iConfig.getParameter< int >( "L1_Mu3_HTT200_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_HTT200 ].first =
-      iConfig.getParameter< double >( "L1_IsoEG10_HTT200_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_HTT200 ].second =
-      iConfig.getParameter< double >( "L1_IsoEG10_HTT200_thresh2" ) ;
-   prescales_[ L1ParticleMap::kIsoEG10_HTT200 ] =
-      iConfig.getParameter< int >( "L1_IsoEG10_HTT200_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kEG12_HTT200 ].first =
-      iConfig.getParameter< double >( "L1_EG12_HTT200_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kEG12_HTT200 ].second =
-      iConfig.getParameter< double >( "L1_EG12_HTT200_thresh2" ) ;
-   prescales_[ L1ParticleMap::kEG12_HTT200 ] =
-      iConfig.getParameter< int >( "L1_EG12_HTT200_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kJet70_HTT200 ].first =
-      iConfig.getParameter< double >( "L1_Jet70_HTT200_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kJet70_HTT200 ].second =
-      iConfig.getParameter< double >( "L1_Jet70_HTT200_thresh2" ) ;
-   prescales_[ L1ParticleMap::kJet70_HTT200 ] =
-      iConfig.getParameter< int >( "L1_Jet70_HTT200_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kTauJet40_HTT200 ].first =
-      iConfig.getParameter< double >( "L1_TauJet40_HTT200_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kTauJet40_HTT200 ].second =
-      iConfig.getParameter< double >( "L1_TauJet40_HTT200_thresh2" ) ;
-   prescales_[ L1ParticleMap::kTauJet40_HTT200 ] =
-      iConfig.getParameter< int >( "L1_TauJet40_HTT200_prescale" ) ;
-
-   doubleThresholds_[ L1ParticleMap::kMu3_ETM30 ].first =
-      iConfig.getParameter< double >( "L1_Mu3_ETM30_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kMu3_ETM30 ].second =
-      iConfig.getParameter< double >( "L1_Mu3_ETM30_thresh2" ) ;
-   prescales_[ L1ParticleMap::kMu3_ETM30 ] =
-      iConfig.getParameter< int >( "L1_Mu3_ETM30_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_ETM30 ].first =
-      iConfig.getParameter< double >( "L1_IsoEG10_ETM30_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_ETM30 ].second =
-      iConfig.getParameter< double >( "L1_IsoEG10_ETM30_thresh2" ) ;
-   prescales_[ L1ParticleMap::kIsoEG10_ETM30 ] =
-      iConfig.getParameter< int >( "L1_IsoEG10_ETM30_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kEG12_ETM30 ].first =
-      iConfig.getParameter< double >( "L1_EG12_ETM30_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kEG12_ETM30 ].second =
-      iConfig.getParameter< double >( "L1_EG12_ETM30_thresh2" ) ;
-   prescales_[ L1ParticleMap::kEG12_ETM30 ] =
-      iConfig.getParameter< int >( "L1_EG12_ETM30_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kJet70_ETM40 ].first =
-      iConfig.getParameter< double >( "L1_Jet70_ETM40_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kJet70_ETM40 ].second =
-      iConfig.getParameter< double >( "L1_Jet70_ETM40_thresh2" ) ;
-   prescales_[ L1ParticleMap::kJet70_ETM40 ] =
-      iConfig.getParameter< int >( "L1_Jet70_ETM40_prescale" ) ;
-
-   doubleThresholds_[ L1ParticleMap::kTauJet20_ETM20 ].first =
-      iConfig.getParameter< double >( "L1_TauJet20_ETM20_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kTauJet20_ETM20 ].second =
-      iConfig.getParameter< double >( "L1_TauJet20_ETM20_thresh2" ) ;
-   prescales_[ L1ParticleMap::kTauJet20_ETM20 ] =
-      iConfig.getParameter< int >( "L1_TauJet20_ETM20_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kTauJet30_ETM30 ].first =
-      iConfig.getParameter< double >( "L1_TauJet30_ETM30_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kTauJet30_ETM30 ].second =
-      iConfig.getParameter< double >( "L1_TauJet30_ETM30_thresh2" ) ;
-   prescales_[ L1ParticleMap::kTauJet30_ETM30 ] =
-      iConfig.getParameter< int >( "L1_TauJet30_ETM30_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kTauJet30_ETM40 ].first =
-      iConfig.getParameter< double >( "L1_TauJet30_ETM40_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kTauJet30_ETM40 ].second =
-      iConfig.getParameter< double >( "L1_TauJet30_ETM40_thresh2" ) ;
-   prescales_[ L1ParticleMap::kTauJet30_ETM40 ] =
-      iConfig.getParameter< int >( "L1_TauJet30_ETM40_prescale" ) ;
-
-   doubleThresholds_[ L1ParticleMap::kHTT100_ETM30 ].first =
-      iConfig.getParameter< double >( "L1_HTT100_ETM30_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kHTT100_ETM30 ].second =
-      iConfig.getParameter< double >( "L1_HTT100_ETM30_thresh2" ) ;
-   prescales_[ L1ParticleMap::kHTT100_ETM30 ] =
-      iConfig.getParameter< int >( "L1_HTT100_ETM30_prescale" ) ;
-
-   // AAA triggers
-
-   singleThresholds_[ L1ParticleMap::kTripleMu3 ] =
-      iConfig.getParameter< double >( "L1_TripleMu3_thresh" ) ;
-   prescales_[ L1ParticleMap::kTripleMu3 ] =
-      iConfig.getParameter< int >( "L1_TripleMu3_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kTripleIsoEG5 ] =
-      iConfig.getParameter< double >( "L1_TripleIsoEG5_thresh" ) ;
-   prescales_[ L1ParticleMap::kTripleIsoEG5 ] =
-      iConfig.getParameter< int >( "L1_TripleIsoEG5_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kTripleEG10 ] =
-      iConfig.getParameter< double >( "L1_TripleEG10_thresh" ) ;
-   prescales_[ L1ParticleMap::kTripleEG10 ] =
-      iConfig.getParameter< int >( "L1_TripleEG10_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kTripleJet50 ] =
-      iConfig.getParameter< double >( "L1_TripleJet50_thresh" ) ;
-   prescales_[ L1ParticleMap::kTripleJet50 ] =
-      iConfig.getParameter< int >( "L1_TripleJet50_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kTripleTauJet40 ] =
-      iConfig.getParameter< double >( "L1_TripleTauJet40_thresh" ) ;
-   prescales_[ L1ParticleMap::kTripleTauJet40 ] =
-      iConfig.getParameter< int >( "L1_TripleTauJet40_prescale" ) ;
-
-   // AAB triggers
-
-   doubleThresholds_[ L1ParticleMap::kDoubleMu3_IsoEG5 ].first =
-      iConfig.getParameter< double >( "L1_DoubleMu3_IsoEG5_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleMu3_IsoEG5 ].second =
-      iConfig.getParameter< double >( "L1_DoubleMu3_IsoEG5_thresh2" ) ;
-   prescales_[ L1ParticleMap::kDoubleMu3_IsoEG5 ] =
-      iConfig.getParameter< int >( "L1_DoubleMu3_IsoEG5_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleMu3_EG10 ].first =
-      iConfig.getParameter< double >( "L1_DoubleMu3_EG10_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleMu3_EG10 ].second =
-      iConfig.getParameter< double >( "L1_DoubleMu3_EG10_thresh2" ) ;
-   prescales_[ L1ParticleMap::kDoubleMu3_EG10 ] =
-      iConfig.getParameter< int >( "L1_DoubleMu3_EG10_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleIsoEG5_Mu3 ].first =
-      iConfig.getParameter< double >( "L1_DoubleIsoEG5_Mu3_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleIsoEG5_Mu3 ].second =
-      iConfig.getParameter< double >( "L1_DoubleIsoEG5_Mu3_thresh2" ) ;
-   prescales_[ L1ParticleMap::kDoubleIsoEG5_Mu3 ] =
-      iConfig.getParameter< int >( "L1_DoubleIsoEG5_Mu3_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleEG10_Mu3 ].first =
-      iConfig.getParameter< double >( "L1_DoubleEG10_Mu3_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleEG10_Mu3 ].second =
-      iConfig.getParameter< double >( "L1_DoubleEG10_Mu3_thresh2" ) ;
-   prescales_[ L1ParticleMap::kDoubleEG10_Mu3 ] =
-      iConfig.getParameter< int >( "L1_DoubleEG10_Mu3_prescale" ) ;
-
-   doubleThresholds_[ L1ParticleMap::kDoubleMu3_HTT200 ].first =
-      iConfig.getParameter< double >( "L1_DoubleMu3_HTT200_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleMu3_HTT200 ].second =
-      iConfig.getParameter< double >( "L1_DoubleMu3_HTT200_thresh2" ) ;
-   prescales_[ L1ParticleMap::kDoubleMu3_HTT200 ] =
-      iConfig.getParameter< int >( "L1_DoubleMu3_HTT200_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleIsoEG5_HTT200 ].first =
-      iConfig.getParameter< double >( "L1_DoubleIsoEG5_HTT200_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleIsoEG5_HTT200 ].second =
-      iConfig.getParameter< double >( "L1_DoubleIsoEG5_HTT200_thresh2" ) ;
-   prescales_[ L1ParticleMap::kDoubleIsoEG5_HTT200 ] =
-      iConfig.getParameter< int >( "L1_DoubleIsoEG5_HTT200_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleEG10_HTT200 ].first =
-      iConfig.getParameter< double >( "L1_DoubleEG10_HTT200_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleEG10_HTT200 ].second =
-      iConfig.getParameter< double >( "L1_DoubleEG10_HTT200_thresh2" ) ;
-   prescales_[ L1ParticleMap::kDoubleEG10_HTT200 ] =
-      iConfig.getParameter< int >( "L1_DoubleEG10_HTT200_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleJet50_HTT200 ].first =
-      iConfig.getParameter< double >( "L1_DoubleJet50_HTT200_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleJet50_HTT200 ].second =
-      iConfig.getParameter< double >( "L1_DoubleJet50_HTT200_thresh2" ) ;
-   prescales_[ L1ParticleMap::kDoubleJet50_HTT200 ] =
-      iConfig.getParameter< int >( "L1_DoubleJet50_HTT200_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleTauJet40_HTT200 ].first =
-      iConfig.getParameter< double >( "L1_DoubleTauJet40_HTT200_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleTauJet40_HTT200 ].second =
-      iConfig.getParameter< double >( "L1_DoubleTauJet40_HTT200_thresh2" ) ;
-   prescales_[ L1ParticleMap::kDoubleTauJet40_HTT200 ] =
-      iConfig.getParameter< int >( "L1_DoubleTauJet40_HTT200_prescale" ) ;
-
-   doubleThresholds_[ L1ParticleMap::kDoubleMu3_ETM20 ].first =
-      iConfig.getParameter< double >( "L1_DoubleMu3_ETM20_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleMu3_ETM20 ].second =
-      iConfig.getParameter< double >( "L1_DoubleMu3_ETM20_thresh2" ) ;
-   prescales_[ L1ParticleMap::kDoubleMu3_ETM20 ] =
-      iConfig.getParameter< int >( "L1_DoubleMu3_ETM20_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleIsoEG5_ETM20 ].first =
-      iConfig.getParameter< double >( "L1_DoubleIsoEG5_ETM20_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleIsoEG5_ETM20 ].second =
-      iConfig.getParameter< double >( "L1_DoubleIsoEG5_ETM20_thresh2" ) ;
-   prescales_[ L1ParticleMap::kDoubleIsoEG5_ETM20 ] =
-      iConfig.getParameter< int >( "L1_DoubleIsoEG5_ETM20_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleEG10_ETM20 ].first =
-      iConfig.getParameter< double >( "L1_DoubleEG10_ETM20_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleEG10_ETM20 ].second =
-      iConfig.getParameter< double >( "L1_DoubleEG10_ETM20_thresh2" ) ;
-   prescales_[ L1ParticleMap::kDoubleEG10_ETM20 ] =
-      iConfig.getParameter< int >( "L1_DoubleEG10_ETM20_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleJet50_ETM20 ].first =
-      iConfig.getParameter< double >( "L1_DoubleJet50_ETM20_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleJet50_ETM20 ].second =
-      iConfig.getParameter< double >( "L1_DoubleJet50_ETM20_thresh2" ) ;
-   prescales_[ L1ParticleMap::kDoubleJet50_ETM20 ] =
-      iConfig.getParameter< int >( "L1_DoubleJet50_ETM20_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleTauJet40_ETM20 ].first =
-      iConfig.getParameter< double >( "L1_DoubleTauJet40_ETM20_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kDoubleTauJet40_ETM20 ].second =
-      iConfig.getParameter< double >( "L1_DoubleTauJet40_ETM20_thresh2" ) ;
-   prescales_[ L1ParticleMap::kDoubleTauJet40_ETM20 ] =
-      iConfig.getParameter< int >( "L1_DoubleTauJet40_ETM20_prescale" ) ;
-
-   singleThresholds_[ L1ParticleMap::kQuadJet30 ] =
-      iConfig.getParameter< double >( "L1_QuadJet30_thresh" ) ;
-   prescales_[ L1ParticleMap::kQuadJet30 ] =
-      iConfig.getParameter< int >( "L1_QuadJet30_prescale" ) ;
-
-   // Diffractive triggers
-   doubleThresholds_[ L1ParticleMap::kExclusiveDoubleIsoEG4 ].first =
-        iConfig.getParameter< double >( "L1_ExclusiveDoubleIsoEG4_thresh1" );
-   doubleThresholds_[ L1ParticleMap::kExclusiveDoubleIsoEG4 ].second =
-        iConfig.getParameter< double >( "L1_ExclusiveDoubleIsoEG4_thresh2" ); // for jet rejection
-   prescales_[ L1ParticleMap::kExclusiveDoubleIsoEG4 ] =
-        iConfig.getParameter< int >( "L1_ExclusiveDoubleIsoEG4_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kExclusiveDoubleJet60 ] =
-        iConfig.getParameter< double >( "L1_ExclusiveDoubleJet60_thresh"  ); 
-   prescales_[ L1ParticleMap::kExclusiveDoubleJet60 ] =
-        iConfig.getParameter< int >( "L1_ExclusiveDoubleJet60_prescale" ) ;
-   singleThresholds_[ L1ParticleMap::kExclusiveJet25_Gap_Jet25 ] =
-        iConfig.getParameter< double >( "L1_ExclusiveJet25_Gap_Jet25_thresh" );
-   prescales_[ L1ParticleMap::kExclusiveJet25_Gap_Jet25 ] =
-      iConfig.getParameter< int >( "L1_ExclusiveJet25_Gap_Jet25_prescale" ) ;
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_Jet20_ForJet10 ].first =
-      iConfig.getParameter< double >( "L1_IsoEG10_Jet20_ForJet10_thresh1" ) ;
-   doubleThresholds_[ L1ParticleMap::kIsoEG10_Jet20_ForJet10 ].second =
-      iConfig.getParameter< double >( "L1_IsoEG10_Jet20_ForJet10_thresh2" ) ;
-   singleThresholds_[ L1ParticleMap::kIsoEG10_Jet20_ForJet10 ] =
-      iConfig.getParameter< double >( "L1_IsoEG10_Jet20_ForJet10_thresh3" ) ;
-   prescales_[ L1ParticleMap::kIsoEG10_Jet20_ForJet10 ] =
-      iConfig.getParameter< int >( "L1_IsoEG10_Jet20_ForJet10_prescale" ) ;
-
-   prescales_[ L1ParticleMap::kMinBias_HTT10 ] =
-      iConfig.getParameter< int >( "L1_MinBias_HTT10_prescale" ) ;
-   prescales_[ L1ParticleMap::kZeroBias ] =
-      iConfig.getParameter< int >( "L1_ZeroBias_prescale" ) ;
-
-//    // Print trigger table in Twiki table format.
-//    std::cout << "|  *Trigger Index*  |  *Trigger Name*  |  *E<sub>T</sub> Threshold (!GeV)*  |  *Prescale*  |"
-// 	     << std::endl ;
-
-//    for( int i = 0 ; i < L1ParticleMap::kNumOfL1TriggerTypes ; ++i )
-//    {
-//       std::cout
-// 	 << "|  "
-// 	 << i
-// 	 << "  |  " ;
-//       if( prescales_[ i ] == 999999999 ) std::cout << "<strike>" ;
-//       std::cout
-// 	 << L1ParticleMap::triggerName( ( L1ParticleMap::L1TriggerType ) i ) ;
-//       if( prescales_[ i ] == 999999999 ) std::cout << "</strike>" ;
-//       std::cout << "  |  " ;
-
-//       if( singleThresholds_[ i ] > 0 )
-//       {
-// 	 if( doubleThresholds_[ i ].first > 0 )
-// 	 {
-// 	    std::cout << doubleThresholds_[ i ].first << ", "
-// 		      << doubleThresholds_[ i ].second << ", " ;
-// 	 }
-
-// 	 std::cout << singleThresholds_[ i ] ;
-//       }
-//       else if( doubleThresholds_[ i ].first > 0 )
-//       {
-// 	 std::cout << doubleThresholds_[ i ].first << ", "
-// 		   << doubleThresholds_[ i ].second ;
-//       }
-//       else
-//       {
-// 	 std::cout << "---" ;
-//       }
-
-//       std::cout << "  |  " ;
-//       if( prescales_[ i ] != 999999999 ) std::cout << prescales_[ i ] ;
-//       std::cout << "  |"
-// 		<< std::endl ;
-//    }
+L1ExtraParticleMapProd::L1ExtraParticleMapProd(const edm::ParameterSet &iConfig)
+    : muonSource_(iConfig.getParameter<edm::InputTag>("muonSource")),
+      isoEmSource_(iConfig.getParameter<edm::InputTag>("isolatedEmSource")),
+      nonIsoEmSource_(
+          iConfig.getParameter<edm::InputTag>("nonIsolatedEmSource")),
+      cenJetSource_(iConfig.getParameter<edm::InputTag>("centralJetSource")),
+      forJetSource_(iConfig.getParameter<edm::InputTag>("forwardJetSource")),
+      tauJetSource_(iConfig.getParameter<edm::InputTag>("tauJetSource")),
+      etMissSource_(iConfig.getParameter<edm::InputTag>("etMissSource")),
+      htMissSource_(iConfig.getParameter<edm::InputTag>("htMissSource")) {
+  using namespace l1extra;
+
+  // register your products
+  produces<L1ParticleMapCollection>();
+  produces<L1GlobalTriggerReadoutRecord>();
+
+  // now do what ever other initialization is needed
+  for (int i = 0; i < L1ParticleMap::kNumOfL1TriggerTypes; ++i) {
+    singleThresholds_[i] = 0.;
+    doubleThresholds_[i].first = 0.;
+    doubleThresholds_[i].second = 0.;
+    prescaleCounters_[i] = 1;
+    prescales_[i] = 1;
+  }
+
+  // Single object triggers, 5 thresholds each
+
+  singleThresholds_[L1ParticleMap::kSingleMu3] =
+      iConfig.getParameter<double>("L1_SingleMu3_thresh");
+  prescales_[L1ParticleMap::kSingleMu3] =
+      iConfig.getParameter<int>("L1_SingleMu3_prescale");
+  singleThresholds_[L1ParticleMap::kSingleMu5] =
+      iConfig.getParameter<double>("L1_SingleMu5_thresh");
+  prescales_[L1ParticleMap::kSingleMu5] =
+      iConfig.getParameter<int>("L1_SingleMu5_prescale");
+  singleThresholds_[L1ParticleMap::kSingleMu7] =
+      iConfig.getParameter<double>("L1_SingleMu7_thresh");
+  prescales_[L1ParticleMap::kSingleMu7] =
+      iConfig.getParameter<int>("L1_SingleMu7_prescale");
+  singleThresholds_[L1ParticleMap::kSingleMu10] =
+      iConfig.getParameter<double>("L1_SingleMu10_thresh");
+  prescales_[L1ParticleMap::kSingleMu10] =
+      iConfig.getParameter<int>("L1_SingleMu10_prescale");
+  singleThresholds_[L1ParticleMap::kSingleMu14] =
+      iConfig.getParameter<double>("L1_SingleMu14_thresh");
+  prescales_[L1ParticleMap::kSingleMu14] =
+      iConfig.getParameter<int>("L1_SingleMu14_prescale");
+  singleThresholds_[L1ParticleMap::kSingleMu20] =
+      iConfig.getParameter<double>("L1_SingleMu20_thresh");
+  prescales_[L1ParticleMap::kSingleMu20] =
+      iConfig.getParameter<int>("L1_SingleMu20_prescale");
+  singleThresholds_[L1ParticleMap::kSingleMu25] =
+      iConfig.getParameter<double>("L1_SingleMu25_thresh");
+  prescales_[L1ParticleMap::kSingleMu25] =
+      iConfig.getParameter<int>("L1_SingleMu25_prescale");
+
+  singleThresholds_[L1ParticleMap::kSingleIsoEG5] =
+      iConfig.getParameter<double>("L1_SingleIsoEG5_thresh");
+  prescales_[L1ParticleMap::kSingleIsoEG5] =
+      iConfig.getParameter<int>("L1_SingleIsoEG5_prescale");
+  singleThresholds_[L1ParticleMap::kSingleIsoEG8] =
+      iConfig.getParameter<double>("L1_SingleIsoEG8_thresh");
+  prescales_[L1ParticleMap::kSingleIsoEG8] =
+      iConfig.getParameter<int>("L1_SingleIsoEG8_prescale");
+  singleThresholds_[L1ParticleMap::kSingleIsoEG10] =
+      iConfig.getParameter<double>("L1_SingleIsoEG10_thresh");
+  prescales_[L1ParticleMap::kSingleIsoEG10] =
+      iConfig.getParameter<int>("L1_SingleIsoEG10_prescale");
+  singleThresholds_[L1ParticleMap::kSingleIsoEG12] =
+      iConfig.getParameter<double>("L1_SingleIsoEG12_thresh");
+  prescales_[L1ParticleMap::kSingleIsoEG12] =
+      iConfig.getParameter<int>("L1_SingleIsoEG12_prescale");
+  singleThresholds_[L1ParticleMap::kSingleIsoEG15] =
+      iConfig.getParameter<double>("L1_SingleIsoEG15_thresh");
+  prescales_[L1ParticleMap::kSingleIsoEG15] =
+      iConfig.getParameter<int>("L1_SingleIsoEG15_prescale");
+  singleThresholds_[L1ParticleMap::kSingleIsoEG20] =
+      iConfig.getParameter<double>("L1_SingleIsoEG20_thresh");
+  prescales_[L1ParticleMap::kSingleIsoEG20] =
+      iConfig.getParameter<int>("L1_SingleIsoEG20_prescale");
+  singleThresholds_[L1ParticleMap::kSingleIsoEG25] =
+      iConfig.getParameter<double>("L1_SingleIsoEG25_thresh");
+  prescales_[L1ParticleMap::kSingleIsoEG25] =
+      iConfig.getParameter<int>("L1_SingleIsoEG25_prescale");
+
+  singleThresholds_[L1ParticleMap::kSingleEG5] =
+      iConfig.getParameter<double>("L1_SingleEG5_thresh");
+  prescales_[L1ParticleMap::kSingleEG5] =
+      iConfig.getParameter<int>("L1_SingleEG5_prescale");
+  singleThresholds_[L1ParticleMap::kSingleEG8] =
+      iConfig.getParameter<double>("L1_SingleEG8_thresh");
+  prescales_[L1ParticleMap::kSingleEG8] =
+      iConfig.getParameter<int>("L1_SingleEG8_prescale");
+  singleThresholds_[L1ParticleMap::kSingleEG10] =
+      iConfig.getParameter<double>("L1_SingleEG10_thresh");
+  prescales_[L1ParticleMap::kSingleEG10] =
+      iConfig.getParameter<int>("L1_SingleEG10_prescale");
+  singleThresholds_[L1ParticleMap::kSingleEG12] =
+      iConfig.getParameter<double>("L1_SingleEG12_thresh");
+  prescales_[L1ParticleMap::kSingleEG12] =
+      iConfig.getParameter<int>("L1_SingleEG12_prescale");
+  singleThresholds_[L1ParticleMap::kSingleEG15] =
+      iConfig.getParameter<double>("L1_SingleEG15_thresh");
+  prescales_[L1ParticleMap::kSingleEG15] =
+      iConfig.getParameter<int>("L1_SingleEG15_prescale");
+  singleThresholds_[L1ParticleMap::kSingleEG20] =
+      iConfig.getParameter<double>("L1_SingleEG20_thresh");
+  prescales_[L1ParticleMap::kSingleEG20] =
+      iConfig.getParameter<int>("L1_SingleEG20_prescale");
+  singleThresholds_[L1ParticleMap::kSingleEG25] =
+      iConfig.getParameter<double>("L1_SingleEG25_thresh");
+  prescales_[L1ParticleMap::kSingleEG25] =
+      iConfig.getParameter<int>("L1_SingleEG25_prescale");
+
+  singleThresholds_[L1ParticleMap::kSingleJet15] =
+      iConfig.getParameter<double>("L1_SingleJet15_thresh");
+  prescales_[L1ParticleMap::kSingleJet15] =
+      iConfig.getParameter<int>("L1_SingleJet15_prescale");
+  singleThresholds_[L1ParticleMap::kSingleJet20] =
+      iConfig.getParameter<double>("L1_SingleJet20_thresh");
+  prescales_[L1ParticleMap::kSingleJet20] =
+      iConfig.getParameter<int>("L1_SingleJet20_prescale");
+  singleThresholds_[L1ParticleMap::kSingleJet30] =
+      iConfig.getParameter<double>("L1_SingleJet30_thresh");
+  prescales_[L1ParticleMap::kSingleJet30] =
+      iConfig.getParameter<int>("L1_SingleJet30_prescale");
+  singleThresholds_[L1ParticleMap::kSingleJet50] =
+      iConfig.getParameter<double>("L1_SingleJet50_thresh");
+  prescales_[L1ParticleMap::kSingleJet50] =
+      iConfig.getParameter<int>("L1_SingleJet50_prescale");
+  singleThresholds_[L1ParticleMap::kSingleJet70] =
+      iConfig.getParameter<double>("L1_SingleJet70_thresh");
+  prescales_[L1ParticleMap::kSingleJet70] =
+      iConfig.getParameter<int>("L1_SingleJet70_prescale");
+  singleThresholds_[L1ParticleMap::kSingleJet100] =
+      iConfig.getParameter<double>("L1_SingleJet100_thresh");
+  prescales_[L1ParticleMap::kSingleJet100] =
+      iConfig.getParameter<int>("L1_SingleJet100_prescale");
+  singleThresholds_[L1ParticleMap::kSingleJet150] =
+      iConfig.getParameter<double>("L1_SingleJet150_thresh");
+  prescales_[L1ParticleMap::kSingleJet150] =
+      iConfig.getParameter<int>("L1_SingleJet150_prescale");
+  singleThresholds_[L1ParticleMap::kSingleJet200] =
+      iConfig.getParameter<double>("L1_SingleJet200_thresh");
+  prescales_[L1ParticleMap::kSingleJet200] =
+      iConfig.getParameter<int>("L1_SingleJet200_prescale");
+
+  singleThresholds_[L1ParticleMap::kSingleTauJet10] =
+      iConfig.getParameter<double>("L1_SingleTauJet10_thresh");
+  prescales_[L1ParticleMap::kSingleTauJet10] =
+      iConfig.getParameter<int>("L1_SingleTauJet10_prescale");
+  singleThresholds_[L1ParticleMap::kSingleTauJet20] =
+      iConfig.getParameter<double>("L1_SingleTauJet20_thresh");
+  prescales_[L1ParticleMap::kSingleTauJet20] =
+      iConfig.getParameter<int>("L1_SingleTauJet20_prescale");
+  singleThresholds_[L1ParticleMap::kSingleTauJet30] =
+      iConfig.getParameter<double>("L1_SingleTauJet30_thresh");
+  prescales_[L1ParticleMap::kSingleTauJet30] =
+      iConfig.getParameter<int>("L1_SingleTauJet30_prescale");
+  singleThresholds_[L1ParticleMap::kSingleTauJet35] =
+      iConfig.getParameter<double>("L1_SingleTauJet35_thresh");
+  prescales_[L1ParticleMap::kSingleTauJet35] =
+      iConfig.getParameter<int>("L1_SingleTauJet35_prescale");
+  singleThresholds_[L1ParticleMap::kSingleTauJet40] =
+      iConfig.getParameter<double>("L1_SingleTauJet40_thresh");
+  prescales_[L1ParticleMap::kSingleTauJet40] =
+      iConfig.getParameter<int>("L1_SingleTauJet40_prescale");
+  singleThresholds_[L1ParticleMap::kSingleTauJet60] =
+      iConfig.getParameter<double>("L1_SingleTauJet60_thresh");
+  prescales_[L1ParticleMap::kSingleTauJet60] =
+      iConfig.getParameter<int>("L1_SingleTauJet60_prescale");
+  singleThresholds_[L1ParticleMap::kSingleTauJet80] =
+      iConfig.getParameter<double>("L1_SingleTauJet80_thresh");
+  prescales_[L1ParticleMap::kSingleTauJet80] =
+      iConfig.getParameter<int>("L1_SingleTauJet80_prescale");
+  singleThresholds_[L1ParticleMap::kSingleTauJet100] =
+      iConfig.getParameter<double>("L1_SingleTauJet100_thresh");
+  prescales_[L1ParticleMap::kSingleTauJet100] =
+      iConfig.getParameter<int>("L1_SingleTauJet100_prescale");
+
+  singleThresholds_[L1ParticleMap::kHTT100] =
+      iConfig.getParameter<double>("L1_HTT100_thresh");
+  prescales_[L1ParticleMap::kHTT100] =
+      iConfig.getParameter<int>("L1_HTT100_prescale");
+  singleThresholds_[L1ParticleMap::kHTT200] =
+      iConfig.getParameter<double>("L1_HTT200_thresh");
+  prescales_[L1ParticleMap::kHTT200] =
+      iConfig.getParameter<int>("L1_HTT200_prescale");
+  singleThresholds_[L1ParticleMap::kHTT250] =
+      iConfig.getParameter<double>("L1_HTT250_thresh");
+  prescales_[L1ParticleMap::kHTT250] =
+      iConfig.getParameter<int>("L1_HTT250_prescale");
+  singleThresholds_[L1ParticleMap::kHTT300] =
+      iConfig.getParameter<double>("L1_HTT300_thresh");
+  prescales_[L1ParticleMap::kHTT300] =
+      iConfig.getParameter<int>("L1_HTT300_prescale");
+  singleThresholds_[L1ParticleMap::kHTT400] =
+      iConfig.getParameter<double>("L1_HTT400_thresh");
+  prescales_[L1ParticleMap::kHTT400] =
+      iConfig.getParameter<int>("L1_HTT400_prescale");
+  singleThresholds_[L1ParticleMap::kHTT500] =
+      iConfig.getParameter<double>("L1_HTT500_thresh");
+  prescales_[L1ParticleMap::kHTT500] =
+      iConfig.getParameter<int>("L1_HTT500_prescale");
+
+  singleThresholds_[L1ParticleMap::kETM10] =
+      iConfig.getParameter<double>("L1_ETM10_thresh");
+  prescales_[L1ParticleMap::kETM10] =
+      iConfig.getParameter<int>("L1_ETM10_prescale");
+  singleThresholds_[L1ParticleMap::kETM15] =
+      iConfig.getParameter<double>("L1_ETM15_thresh");
+  prescales_[L1ParticleMap::kETM15] =
+      iConfig.getParameter<int>("L1_ETM15_prescale");
+  singleThresholds_[L1ParticleMap::kETM20] =
+      iConfig.getParameter<double>("L1_ETM20_thresh");
+  prescales_[L1ParticleMap::kETM20] =
+      iConfig.getParameter<int>("L1_ETM20_prescale");
+  singleThresholds_[L1ParticleMap::kETM30] =
+      iConfig.getParameter<double>("L1_ETM30_thresh");
+  prescales_[L1ParticleMap::kETM30] =
+      iConfig.getParameter<int>("L1_ETM30_prescale");
+  singleThresholds_[L1ParticleMap::kETM40] =
+      iConfig.getParameter<double>("L1_ETM40_thresh");
+  prescales_[L1ParticleMap::kETM40] =
+      iConfig.getParameter<int>("L1_ETM40_prescale");
+  singleThresholds_[L1ParticleMap::kETM50] =
+      iConfig.getParameter<double>("L1_ETM50_thresh");
+  prescales_[L1ParticleMap::kETM50] =
+      iConfig.getParameter<int>("L1_ETM50_prescale");
+  singleThresholds_[L1ParticleMap::kETM60] =
+      iConfig.getParameter<double>("L1_ETM60_thresh");
+  prescales_[L1ParticleMap::kETM60] =
+      iConfig.getParameter<int>("L1_ETM60_prescale");
+
+  singleThresholds_[L1ParticleMap::kETT60] =
+      iConfig.getParameter<double>("L1_ETT60_thresh");
+  prescales_[L1ParticleMap::kETT60] =
+      iConfig.getParameter<int>("L1_ETT60_prescale");
+
+  // AA triggers
+
+  singleThresholds_[L1ParticleMap::kDoubleMu3] =
+      iConfig.getParameter<double>("L1_DoubleMu3_thresh");
+  prescales_[L1ParticleMap::kDoubleMu3] =
+      iConfig.getParameter<int>("L1_DoubleMu3_prescale");
+
+  singleThresholds_[L1ParticleMap::kDoubleIsoEG8] =
+      iConfig.getParameter<double>("L1_DoubleIsoEG8_thresh");
+  prescales_[L1ParticleMap::kDoubleIsoEG8] =
+      iConfig.getParameter<int>("L1_DoubleIsoEG8_prescale");
+  singleThresholds_[L1ParticleMap::kDoubleIsoEG10] =
+      iConfig.getParameter<double>("L1_DoubleIsoEG10_thresh");
+  prescales_[L1ParticleMap::kDoubleIsoEG10] =
+      iConfig.getParameter<int>("L1_DoubleIsoEG10_prescale");
+
+  singleThresholds_[L1ParticleMap::kDoubleEG5] =
+      iConfig.getParameter<double>("L1_DoubleEG5_thresh");
+  prescales_[L1ParticleMap::kDoubleEG5] =
+      iConfig.getParameter<int>("L1_DoubleEG5_prescale");
+  singleThresholds_[L1ParticleMap::kDoubleEG10] =
+      iConfig.getParameter<double>("L1_DoubleEG10_thresh");
+  prescales_[L1ParticleMap::kDoubleEG10] =
+      iConfig.getParameter<int>("L1_DoubleEG10_prescale");
+  singleThresholds_[L1ParticleMap::kDoubleEG15] =
+      iConfig.getParameter<double>("L1_DoubleEG15_thresh");
+  prescales_[L1ParticleMap::kDoubleEG15] =
+      iConfig.getParameter<int>("L1_DoubleEG15_prescale");
+
+  singleThresholds_[L1ParticleMap::kDoubleJet70] =
+      iConfig.getParameter<double>("L1_DoubleJet70_thresh");
+  prescales_[L1ParticleMap::kDoubleJet70] =
+      iConfig.getParameter<int>("L1_DoubleJet70_prescale");
+  singleThresholds_[L1ParticleMap::kDoubleJet100] =
+      iConfig.getParameter<double>("L1_DoubleJet100_thresh");
+  prescales_[L1ParticleMap::kDoubleJet100] =
+      iConfig.getParameter<int>("L1_DoubleJet100_prescale");
+
+  singleThresholds_[L1ParticleMap::kDoubleTauJet20] =
+      iConfig.getParameter<double>("L1_DoubleTauJet20_thresh");
+  prescales_[L1ParticleMap::kDoubleTauJet20] =
+      iConfig.getParameter<int>("L1_DoubleTauJet20_prescale");
+  singleThresholds_[L1ParticleMap::kDoubleTauJet30] =
+      iConfig.getParameter<double>("L1_DoubleTauJet30_thresh");
+  prescales_[L1ParticleMap::kDoubleTauJet30] =
+      iConfig.getParameter<int>("L1_DoubleTauJet30_prescale");
+  singleThresholds_[L1ParticleMap::kDoubleTauJet35] =
+      iConfig.getParameter<double>("L1_DoubleTauJet35_thresh");
+  prescales_[L1ParticleMap::kDoubleTauJet35] =
+      iConfig.getParameter<int>("L1_DoubleTauJet35_prescale");
+  singleThresholds_[L1ParticleMap::kDoubleTauJet40] =
+      iConfig.getParameter<double>("L1_DoubleTauJet40_thresh");
+  prescales_[L1ParticleMap::kDoubleTauJet40] =
+      iConfig.getParameter<int>("L1_DoubleTauJet40_prescale");
+
+  // AB triggers
+
+  doubleThresholds_[L1ParticleMap::kMu3_IsoEG5].first =
+      iConfig.getParameter<double>("L1_Mu3_IsoEG5_thresh1");
+  doubleThresholds_[L1ParticleMap::kMu3_IsoEG5].second =
+      iConfig.getParameter<double>("L1_Mu3_IsoEG5_thresh2");
+  prescales_[L1ParticleMap::kMu3_IsoEG5] =
+      iConfig.getParameter<int>("L1_Mu3_IsoEG5_prescale");
+  doubleThresholds_[L1ParticleMap::kMu5_IsoEG10].first =
+      iConfig.getParameter<double>("L1_Mu5_IsoEG10_thresh1");
+  doubleThresholds_[L1ParticleMap::kMu5_IsoEG10].second =
+      iConfig.getParameter<double>("L1_Mu5_IsoEG10_thresh2");
+  prescales_[L1ParticleMap::kMu5_IsoEG10] =
+      iConfig.getParameter<int>("L1_Mu5_IsoEG10_prescale");
+
+  doubleThresholds_[L1ParticleMap::kMu3_EG12].first =
+      iConfig.getParameter<double>("L1_Mu3_EG12_thresh1");
+  doubleThresholds_[L1ParticleMap::kMu3_EG12].second =
+      iConfig.getParameter<double>("L1_Mu3_EG12_thresh2");
+  prescales_[L1ParticleMap::kMu3_EG12] =
+      iConfig.getParameter<int>("L1_Mu3_EG12_prescale");
+
+  doubleThresholds_[L1ParticleMap::kMu3_Jet15].first =
+      iConfig.getParameter<double>("L1_Mu3_Jet15_thresh1");
+  doubleThresholds_[L1ParticleMap::kMu3_Jet15].second =
+      iConfig.getParameter<double>("L1_Mu3_Jet15_thresh2");
+  prescales_[L1ParticleMap::kMu3_Jet15] =
+      iConfig.getParameter<int>("L1_Mu3_Jet15_prescale");
+  doubleThresholds_[L1ParticleMap::kMu5_Jet15].first =
+      iConfig.getParameter<double>("L1_Mu5_Jet15_thresh1");
+  doubleThresholds_[L1ParticleMap::kMu5_Jet15].second =
+      iConfig.getParameter<double>("L1_Mu5_Jet15_thresh2");
+  prescales_[L1ParticleMap::kMu5_Jet15] =
+      iConfig.getParameter<int>("L1_Mu5_Jet15_prescale");
+  doubleThresholds_[L1ParticleMap::kMu3_Jet70].first =
+      iConfig.getParameter<double>("L1_Mu3_Jet70_thresh1");
+  doubleThresholds_[L1ParticleMap::kMu3_Jet70].second =
+      iConfig.getParameter<double>("L1_Mu3_Jet70_thresh2");
+  prescales_[L1ParticleMap::kMu3_Jet70] =
+      iConfig.getParameter<int>("L1_Mu3_Jet70_prescale");
+  doubleThresholds_[L1ParticleMap::kMu5_Jet20].first =
+      iConfig.getParameter<double>("L1_Mu5_Jet20_thresh1");
+  doubleThresholds_[L1ParticleMap::kMu5_Jet20].second =
+      iConfig.getParameter<double>("L1_Mu5_Jet20_thresh2");
+  prescales_[L1ParticleMap::kMu5_Jet20] =
+      iConfig.getParameter<int>("L1_Mu5_Jet20_prescale");
+
+  doubleThresholds_[L1ParticleMap::kMu5_TauJet20].first =
+      iConfig.getParameter<double>("L1_Mu5_TauJet20_thresh1");
+  doubleThresholds_[L1ParticleMap::kMu5_TauJet20].second =
+      iConfig.getParameter<double>("L1_Mu5_TauJet20_thresh2");
+  prescales_[L1ParticleMap::kMu5_TauJet20] =
+      iConfig.getParameter<int>("L1_Mu5_TauJet20_prescale");
+  doubleThresholds_[L1ParticleMap::kMu5_TauJet30].first =
+      iConfig.getParameter<double>("L1_Mu5_TauJet30_thresh1");
+  doubleThresholds_[L1ParticleMap::kMu5_TauJet30].second =
+      iConfig.getParameter<double>("L1_Mu5_TauJet30_thresh2");
+  prescales_[L1ParticleMap::kMu5_TauJet30] =
+      iConfig.getParameter<int>("L1_Mu5_TauJet30_prescale");
+
+  doubleThresholds_[L1ParticleMap::kIsoEG10_EG10].first =
+      iConfig.getParameter<double>("L1_IsoEG10_EG10_thresh1");
+  doubleThresholds_[L1ParticleMap::kIsoEG10_EG10].second =
+      iConfig.getParameter<double>("L1_IsoEG10_EG10_thresh2");
+  prescales_[L1ParticleMap::kIsoEG10_EG10] =
+      iConfig.getParameter<int>("L1_IsoEG10_EG10_prescale");
+
+  doubleThresholds_[L1ParticleMap::kIsoEG10_Jet15].first =
+      iConfig.getParameter<double>("L1_IsoEG10_Jet15_thresh1");
+  doubleThresholds_[L1ParticleMap::kIsoEG10_Jet15].second =
+      iConfig.getParameter<double>("L1_IsoEG10_Jet15_thresh2");
+  prescales_[L1ParticleMap::kIsoEG10_Jet15] =
+      iConfig.getParameter<int>("L1_IsoEG10_Jet15_prescale");
+  doubleThresholds_[L1ParticleMap::kIsoEG10_Jet30].first =
+      iConfig.getParameter<double>("L1_IsoEG10_Jet30_thresh1");
+  doubleThresholds_[L1ParticleMap::kIsoEG10_Jet30].second =
+      iConfig.getParameter<double>("L1_IsoEG10_Jet30_thresh2");
+  prescales_[L1ParticleMap::kIsoEG10_Jet30] =
+      iConfig.getParameter<int>("L1_IsoEG10_Jet30_prescale");
+  doubleThresholds_[L1ParticleMap::kIsoEG10_Jet20].first =
+      iConfig.getParameter<double>("L1_IsoEG10_Jet20_thresh1");
+  doubleThresholds_[L1ParticleMap::kIsoEG10_Jet20].second =
+      iConfig.getParameter<double>("L1_IsoEG10_Jet20_thresh2");
+  prescales_[L1ParticleMap::kIsoEG10_Jet20] =
+      iConfig.getParameter<int>("L1_IsoEG10_Jet20_prescale");
+  doubleThresholds_[L1ParticleMap::kIsoEG10_Jet70].first =
+      iConfig.getParameter<double>("L1_IsoEG10_Jet70_thresh1");
+  doubleThresholds_[L1ParticleMap::kIsoEG10_Jet70].second =
+      iConfig.getParameter<double>("L1_IsoEG10_Jet70_thresh2");
+  prescales_[L1ParticleMap::kIsoEG10_Jet70] =
+      iConfig.getParameter<int>("L1_IsoEG10_Jet70_prescale");
+
+  doubleThresholds_[L1ParticleMap::kIsoEG10_TauJet20].first =
+      iConfig.getParameter<double>("L1_IsoEG10_TauJet20_thresh1");
+  doubleThresholds_[L1ParticleMap::kIsoEG10_TauJet20].second =
+      iConfig.getParameter<double>("L1_IsoEG10_TauJet20_thresh2");
+  prescales_[L1ParticleMap::kIsoEG10_TauJet20] =
+      iConfig.getParameter<int>("L1_IsoEG10_TauJet20_prescale");
+  doubleThresholds_[L1ParticleMap::kIsoEG10_TauJet30].first =
+      iConfig.getParameter<double>("L1_IsoEG10_TauJet30_thresh1");
+  doubleThresholds_[L1ParticleMap::kIsoEG10_TauJet30].second =
+      iConfig.getParameter<double>("L1_IsoEG10_TauJet30_thresh2");
+  prescales_[L1ParticleMap::kIsoEG10_TauJet30] =
+      iConfig.getParameter<int>("L1_IsoEG10_TauJet30_prescale");
+
+  doubleThresholds_[L1ParticleMap::kEG10_Jet15].first =
+      iConfig.getParameter<double>("L1_EG10_Jet15_thresh1");
+  doubleThresholds_[L1ParticleMap::kEG10_Jet15].second =
+      iConfig.getParameter<double>("L1_EG10_Jet15_thresh2");
+  prescales_[L1ParticleMap::kEG10_Jet15] =
+      iConfig.getParameter<int>("L1_EG10_Jet15_prescale");
+  doubleThresholds_[L1ParticleMap::kEG12_Jet20].first =
+      iConfig.getParameter<double>("L1_EG12_Jet20_thresh1");
+  doubleThresholds_[L1ParticleMap::kEG12_Jet20].second =
+      iConfig.getParameter<double>("L1_EG12_Jet20_thresh2");
+  prescales_[L1ParticleMap::kEG12_Jet20] =
+      iConfig.getParameter<int>("L1_EG12_Jet20_prescale");
+  doubleThresholds_[L1ParticleMap::kEG12_Jet70].first =
+      iConfig.getParameter<double>("L1_EG12_Jet70_thresh1");
+  doubleThresholds_[L1ParticleMap::kEG12_Jet70].second =
+      iConfig.getParameter<double>("L1_EG12_Jet70_thresh2");
+  prescales_[L1ParticleMap::kEG12_Jet70] =
+      iConfig.getParameter<int>("L1_EG12_Jet70_prescale");
+
+  doubleThresholds_[L1ParticleMap::kEG12_TauJet40].first =
+      iConfig.getParameter<double>("L1_EG12_TauJet40_thresh1");
+  doubleThresholds_[L1ParticleMap::kEG12_TauJet40].second =
+      iConfig.getParameter<double>("L1_EG12_TauJet40_thresh2");
+  prescales_[L1ParticleMap::kEG12_TauJet40] =
+      iConfig.getParameter<int>("L1_EG12_TauJet40_prescale");
+
+  doubleThresholds_[L1ParticleMap::kJet70_TauJet40].first =
+      iConfig.getParameter<double>("L1_Jet70_TauJet40_thresh1");
+  doubleThresholds_[L1ParticleMap::kJet70_TauJet40].second =
+      iConfig.getParameter<double>("L1_Jet70_TauJet40_thresh2");
+  prescales_[L1ParticleMap::kJet70_TauJet40] =
+      iConfig.getParameter<int>("L1_Jet70_TauJet40_prescale");
+
+  doubleThresholds_[L1ParticleMap::kMu3_HTT200].first =
+      iConfig.getParameter<double>("L1_Mu3_HTT200_thresh1");
+  doubleThresholds_[L1ParticleMap::kMu3_HTT200].second =
+      iConfig.getParameter<double>("L1_Mu3_HTT200_thresh2");
+  prescales_[L1ParticleMap::kMu3_HTT200] =
+      iConfig.getParameter<int>("L1_Mu3_HTT200_prescale");
+  doubleThresholds_[L1ParticleMap::kIsoEG10_HTT200].first =
+      iConfig.getParameter<double>("L1_IsoEG10_HTT200_thresh1");
+  doubleThresholds_[L1ParticleMap::kIsoEG10_HTT200].second =
+      iConfig.getParameter<double>("L1_IsoEG10_HTT200_thresh2");
+  prescales_[L1ParticleMap::kIsoEG10_HTT200] =
+      iConfig.getParameter<int>("L1_IsoEG10_HTT200_prescale");
+  doubleThresholds_[L1ParticleMap::kEG12_HTT200].first =
+      iConfig.getParameter<double>("L1_EG12_HTT200_thresh1");
+  doubleThresholds_[L1ParticleMap::kEG12_HTT200].second =
+      iConfig.getParameter<double>("L1_EG12_HTT200_thresh2");
+  prescales_[L1ParticleMap::kEG12_HTT200] =
+      iConfig.getParameter<int>("L1_EG12_HTT200_prescale");
+  doubleThresholds_[L1ParticleMap::kJet70_HTT200].first =
+      iConfig.getParameter<double>("L1_Jet70_HTT200_thresh1");
+  doubleThresholds_[L1ParticleMap::kJet70_HTT200].second =
+      iConfig.getParameter<double>("L1_Jet70_HTT200_thresh2");
+  prescales_[L1ParticleMap::kJet70_HTT200] =
+      iConfig.getParameter<int>("L1_Jet70_HTT200_prescale");
+  doubleThresholds_[L1ParticleMap::kTauJet40_HTT200].first =
+      iConfig.getParameter<double>("L1_TauJet40_HTT200_thresh1");
+  doubleThresholds_[L1ParticleMap::kTauJet40_HTT200].second =
+      iConfig.getParameter<double>("L1_TauJet40_HTT200_thresh2");
+  prescales_[L1ParticleMap::kTauJet40_HTT200] =
+      iConfig.getParameter<int>("L1_TauJet40_HTT200_prescale");
+
+  doubleThresholds_[L1ParticleMap::kMu3_ETM30].first =
+      iConfig.getParameter<double>("L1_Mu3_ETM30_thresh1");
+  doubleThresholds_[L1ParticleMap::kMu3_ETM30].second =
+      iConfig.getParameter<double>("L1_Mu3_ETM30_thresh2");
+  prescales_[L1ParticleMap::kMu3_ETM30] =
+      iConfig.getParameter<int>("L1_Mu3_ETM30_prescale");
+  doubleThresholds_[L1ParticleMap::kIsoEG10_ETM30].first =
+      iConfig.getParameter<double>("L1_IsoEG10_ETM30_thresh1");
+  doubleThresholds_[L1ParticleMap::kIsoEG10_ETM30].second =
+      iConfig.getParameter<double>("L1_IsoEG10_ETM30_thresh2");
+  prescales_[L1ParticleMap::kIsoEG10_ETM30] =
+      iConfig.getParameter<int>("L1_IsoEG10_ETM30_prescale");
+  doubleThresholds_[L1ParticleMap::kEG12_ETM30].first =
+      iConfig.getParameter<double>("L1_EG12_ETM30_thresh1");
+  doubleThresholds_[L1ParticleMap::kEG12_ETM30].second =
+      iConfig.getParameter<double>("L1_EG12_ETM30_thresh2");
+  prescales_[L1ParticleMap::kEG12_ETM30] =
+      iConfig.getParameter<int>("L1_EG12_ETM30_prescale");
+  doubleThresholds_[L1ParticleMap::kJet70_ETM40].first =
+      iConfig.getParameter<double>("L1_Jet70_ETM40_thresh1");
+  doubleThresholds_[L1ParticleMap::kJet70_ETM40].second =
+      iConfig.getParameter<double>("L1_Jet70_ETM40_thresh2");
+  prescales_[L1ParticleMap::kJet70_ETM40] =
+      iConfig.getParameter<int>("L1_Jet70_ETM40_prescale");
+
+  doubleThresholds_[L1ParticleMap::kTauJet20_ETM20].first =
+      iConfig.getParameter<double>("L1_TauJet20_ETM20_thresh1");
+  doubleThresholds_[L1ParticleMap::kTauJet20_ETM20].second =
+      iConfig.getParameter<double>("L1_TauJet20_ETM20_thresh2");
+  prescales_[L1ParticleMap::kTauJet20_ETM20] =
+      iConfig.getParameter<int>("L1_TauJet20_ETM20_prescale");
+  doubleThresholds_[L1ParticleMap::kTauJet30_ETM30].first =
+      iConfig.getParameter<double>("L1_TauJet30_ETM30_thresh1");
+  doubleThresholds_[L1ParticleMap::kTauJet30_ETM30].second =
+      iConfig.getParameter<double>("L1_TauJet30_ETM30_thresh2");
+  prescales_[L1ParticleMap::kTauJet30_ETM30] =
+      iConfig.getParameter<int>("L1_TauJet30_ETM30_prescale");
+  doubleThresholds_[L1ParticleMap::kTauJet30_ETM40].first =
+      iConfig.getParameter<double>("L1_TauJet30_ETM40_thresh1");
+  doubleThresholds_[L1ParticleMap::kTauJet30_ETM40].second =
+      iConfig.getParameter<double>("L1_TauJet30_ETM40_thresh2");
+  prescales_[L1ParticleMap::kTauJet30_ETM40] =
+      iConfig.getParameter<int>("L1_TauJet30_ETM40_prescale");
+
+  doubleThresholds_[L1ParticleMap::kHTT100_ETM30].first =
+      iConfig.getParameter<double>("L1_HTT100_ETM30_thresh1");
+  doubleThresholds_[L1ParticleMap::kHTT100_ETM30].second =
+      iConfig.getParameter<double>("L1_HTT100_ETM30_thresh2");
+  prescales_[L1ParticleMap::kHTT100_ETM30] =
+      iConfig.getParameter<int>("L1_HTT100_ETM30_prescale");
+
+  // AAA triggers
+
+  singleThresholds_[L1ParticleMap::kTripleMu3] =
+      iConfig.getParameter<double>("L1_TripleMu3_thresh");
+  prescales_[L1ParticleMap::kTripleMu3] =
+      iConfig.getParameter<int>("L1_TripleMu3_prescale");
+  singleThresholds_[L1ParticleMap::kTripleIsoEG5] =
+      iConfig.getParameter<double>("L1_TripleIsoEG5_thresh");
+  prescales_[L1ParticleMap::kTripleIsoEG5] =
+      iConfig.getParameter<int>("L1_TripleIsoEG5_prescale");
+  singleThresholds_[L1ParticleMap::kTripleEG10] =
+      iConfig.getParameter<double>("L1_TripleEG10_thresh");
+  prescales_[L1ParticleMap::kTripleEG10] =
+      iConfig.getParameter<int>("L1_TripleEG10_prescale");
+  singleThresholds_[L1ParticleMap::kTripleJet50] =
+      iConfig.getParameter<double>("L1_TripleJet50_thresh");
+  prescales_[L1ParticleMap::kTripleJet50] =
+      iConfig.getParameter<int>("L1_TripleJet50_prescale");
+  singleThresholds_[L1ParticleMap::kTripleTauJet40] =
+      iConfig.getParameter<double>("L1_TripleTauJet40_thresh");
+  prescales_[L1ParticleMap::kTripleTauJet40] =
+      iConfig.getParameter<int>("L1_TripleTauJet40_prescale");
+
+  // AAB triggers
+
+  doubleThresholds_[L1ParticleMap::kDoubleMu3_IsoEG5].first =
+      iConfig.getParameter<double>("L1_DoubleMu3_IsoEG5_thresh1");
+  doubleThresholds_[L1ParticleMap::kDoubleMu3_IsoEG5].second =
+      iConfig.getParameter<double>("L1_DoubleMu3_IsoEG5_thresh2");
+  prescales_[L1ParticleMap::kDoubleMu3_IsoEG5] =
+      iConfig.getParameter<int>("L1_DoubleMu3_IsoEG5_prescale");
+  doubleThresholds_[L1ParticleMap::kDoubleMu3_EG10].first =
+      iConfig.getParameter<double>("L1_DoubleMu3_EG10_thresh1");
+  doubleThresholds_[L1ParticleMap::kDoubleMu3_EG10].second =
+      iConfig.getParameter<double>("L1_DoubleMu3_EG10_thresh2");
+  prescales_[L1ParticleMap::kDoubleMu3_EG10] =
+      iConfig.getParameter<int>("L1_DoubleMu3_EG10_prescale");
+  doubleThresholds_[L1ParticleMap::kDoubleIsoEG5_Mu3].first =
+      iConfig.getParameter<double>("L1_DoubleIsoEG5_Mu3_thresh1");
+  doubleThresholds_[L1ParticleMap::kDoubleIsoEG5_Mu3].second =
+      iConfig.getParameter<double>("L1_DoubleIsoEG5_Mu3_thresh2");
+  prescales_[L1ParticleMap::kDoubleIsoEG5_Mu3] =
+      iConfig.getParameter<int>("L1_DoubleIsoEG5_Mu3_prescale");
+  doubleThresholds_[L1ParticleMap::kDoubleEG10_Mu3].first =
+      iConfig.getParameter<double>("L1_DoubleEG10_Mu3_thresh1");
+  doubleThresholds_[L1ParticleMap::kDoubleEG10_Mu3].second =
+      iConfig.getParameter<double>("L1_DoubleEG10_Mu3_thresh2");
+  prescales_[L1ParticleMap::kDoubleEG10_Mu3] =
+      iConfig.getParameter<int>("L1_DoubleEG10_Mu3_prescale");
+
+  doubleThresholds_[L1ParticleMap::kDoubleMu3_HTT200].first =
+      iConfig.getParameter<double>("L1_DoubleMu3_HTT200_thresh1");
+  doubleThresholds_[L1ParticleMap::kDoubleMu3_HTT200].second =
+      iConfig.getParameter<double>("L1_DoubleMu3_HTT200_thresh2");
+  prescales_[L1ParticleMap::kDoubleMu3_HTT200] =
+      iConfig.getParameter<int>("L1_DoubleMu3_HTT200_prescale");
+  doubleThresholds_[L1ParticleMap::kDoubleIsoEG5_HTT200].first =
+      iConfig.getParameter<double>("L1_DoubleIsoEG5_HTT200_thresh1");
+  doubleThresholds_[L1ParticleMap::kDoubleIsoEG5_HTT200].second =
+      iConfig.getParameter<double>("L1_DoubleIsoEG5_HTT200_thresh2");
+  prescales_[L1ParticleMap::kDoubleIsoEG5_HTT200] =
+      iConfig.getParameter<int>("L1_DoubleIsoEG5_HTT200_prescale");
+  doubleThresholds_[L1ParticleMap::kDoubleEG10_HTT200].first =
+      iConfig.getParameter<double>("L1_DoubleEG10_HTT200_thresh1");
+  doubleThresholds_[L1ParticleMap::kDoubleEG10_HTT200].second =
+      iConfig.getParameter<double>("L1_DoubleEG10_HTT200_thresh2");
+  prescales_[L1ParticleMap::kDoubleEG10_HTT200] =
+      iConfig.getParameter<int>("L1_DoubleEG10_HTT200_prescale");
+  doubleThresholds_[L1ParticleMap::kDoubleJet50_HTT200].first =
+      iConfig.getParameter<double>("L1_DoubleJet50_HTT200_thresh1");
+  doubleThresholds_[L1ParticleMap::kDoubleJet50_HTT200].second =
+      iConfig.getParameter<double>("L1_DoubleJet50_HTT200_thresh2");
+  prescales_[L1ParticleMap::kDoubleJet50_HTT200] =
+      iConfig.getParameter<int>("L1_DoubleJet50_HTT200_prescale");
+  doubleThresholds_[L1ParticleMap::kDoubleTauJet40_HTT200].first =
+      iConfig.getParameter<double>("L1_DoubleTauJet40_HTT200_thresh1");
+  doubleThresholds_[L1ParticleMap::kDoubleTauJet40_HTT200].second =
+      iConfig.getParameter<double>("L1_DoubleTauJet40_HTT200_thresh2");
+  prescales_[L1ParticleMap::kDoubleTauJet40_HTT200] =
+      iConfig.getParameter<int>("L1_DoubleTauJet40_HTT200_prescale");
+
+  doubleThresholds_[L1ParticleMap::kDoubleMu3_ETM20].first =
+      iConfig.getParameter<double>("L1_DoubleMu3_ETM20_thresh1");
+  doubleThresholds_[L1ParticleMap::kDoubleMu3_ETM20].second =
+      iConfig.getParameter<double>("L1_DoubleMu3_ETM20_thresh2");
+  prescales_[L1ParticleMap::kDoubleMu3_ETM20] =
+      iConfig.getParameter<int>("L1_DoubleMu3_ETM20_prescale");
+  doubleThresholds_[L1ParticleMap::kDoubleIsoEG5_ETM20].first =
+      iConfig.getParameter<double>("L1_DoubleIsoEG5_ETM20_thresh1");
+  doubleThresholds_[L1ParticleMap::kDoubleIsoEG5_ETM20].second =
+      iConfig.getParameter<double>("L1_DoubleIsoEG5_ETM20_thresh2");
+  prescales_[L1ParticleMap::kDoubleIsoEG5_ETM20] =
+      iConfig.getParameter<int>("L1_DoubleIsoEG5_ETM20_prescale");
+  doubleThresholds_[L1ParticleMap::kDoubleEG10_ETM20].first =
+      iConfig.getParameter<double>("L1_DoubleEG10_ETM20_thresh1");
+  doubleThresholds_[L1ParticleMap::kDoubleEG10_ETM20].second =
+      iConfig.getParameter<double>("L1_DoubleEG10_ETM20_thresh2");
+  prescales_[L1ParticleMap::kDoubleEG10_ETM20] =
+      iConfig.getParameter<int>("L1_DoubleEG10_ETM20_prescale");
+  doubleThresholds_[L1ParticleMap::kDoubleJet50_ETM20].first =
+      iConfig.getParameter<double>("L1_DoubleJet50_ETM20_thresh1");
+  doubleThresholds_[L1ParticleMap::kDoubleJet50_ETM20].second =
+      iConfig.getParameter<double>("L1_DoubleJet50_ETM20_thresh2");
+  prescales_[L1ParticleMap::kDoubleJet50_ETM20] =
+      iConfig.getParameter<int>("L1_DoubleJet50_ETM20_prescale");
+  doubleThresholds_[L1ParticleMap::kDoubleTauJet40_ETM20].first =
+      iConfig.getParameter<double>("L1_DoubleTauJet40_ETM20_thresh1");
+  doubleThresholds_[L1ParticleMap::kDoubleTauJet40_ETM20].second =
+      iConfig.getParameter<double>("L1_DoubleTauJet40_ETM20_thresh2");
+  prescales_[L1ParticleMap::kDoubleTauJet40_ETM20] =
+      iConfig.getParameter<int>("L1_DoubleTauJet40_ETM20_prescale");
+
+  singleThresholds_[L1ParticleMap::kQuadJet30] =
+      iConfig.getParameter<double>("L1_QuadJet30_thresh");
+  prescales_[L1ParticleMap::kQuadJet30] =
+      iConfig.getParameter<int>("L1_QuadJet30_prescale");
+
+  // Diffractive triggers
+  doubleThresholds_[L1ParticleMap::kExclusiveDoubleIsoEG4].first =
+      iConfig.getParameter<double>("L1_ExclusiveDoubleIsoEG4_thresh1");
+  doubleThresholds_[L1ParticleMap::kExclusiveDoubleIsoEG4].second =
+      iConfig.getParameter<double>(
+          "L1_ExclusiveDoubleIsoEG4_thresh2"); // for jet rejection
+  prescales_[L1ParticleMap::kExclusiveDoubleIsoEG4] =
+      iConfig.getParameter<int>("L1_ExclusiveDoubleIsoEG4_prescale");
+  singleThresholds_[L1ParticleMap::kExclusiveDoubleJet60] =
+      iConfig.getParameter<double>("L1_ExclusiveDoubleJet60_thresh");
+  prescales_[L1ParticleMap::kExclusiveDoubleJet60] =
+      iConfig.getParameter<int>("L1_ExclusiveDoubleJet60_prescale");
+  singleThresholds_[L1ParticleMap::kExclusiveJet25_Gap_Jet25] =
+      iConfig.getParameter<double>("L1_ExclusiveJet25_Gap_Jet25_thresh");
+  prescales_[L1ParticleMap::kExclusiveJet25_Gap_Jet25] =
+      iConfig.getParameter<int>("L1_ExclusiveJet25_Gap_Jet25_prescale");
+  doubleThresholds_[L1ParticleMap::kIsoEG10_Jet20_ForJet10].first =
+      iConfig.getParameter<double>("L1_IsoEG10_Jet20_ForJet10_thresh1");
+  doubleThresholds_[L1ParticleMap::kIsoEG10_Jet20_ForJet10].second =
+      iConfig.getParameter<double>("L1_IsoEG10_Jet20_ForJet10_thresh2");
+  singleThresholds_[L1ParticleMap::kIsoEG10_Jet20_ForJet10] =
+      iConfig.getParameter<double>("L1_IsoEG10_Jet20_ForJet10_thresh3");
+  prescales_[L1ParticleMap::kIsoEG10_Jet20_ForJet10] =
+      iConfig.getParameter<int>("L1_IsoEG10_Jet20_ForJet10_prescale");
+
+  prescales_[L1ParticleMap::kMinBias_HTT10] =
+      iConfig.getParameter<int>("L1_MinBias_HTT10_prescale");
+  prescales_[L1ParticleMap::kZeroBias] =
+      iConfig.getParameter<int>("L1_ZeroBias_prescale");
+
+  //    // Print trigger table in Twiki table format.
+  //    std::cout << "|  *Trigger Index*  |  *Trigger Name*  |  *E<sub>T</sub>
+  //    Threshold (!GeV)*  |  *Prescale*  |"
+  // 	     << std::endl ;
+
+  //    for( int i = 0 ; i < L1ParticleMap::kNumOfL1TriggerTypes ; ++i )
+  //    {
+  //       std::cout
+  // 	 << "|  "
+  // 	 << i
+  // 	 << "  |  " ;
+  //       if( prescales_[ i ] == 999999999 ) std::cout << "<strike>" ;
+  //       std::cout
+  // 	 << L1ParticleMap::triggerName( ( L1ParticleMap::L1TriggerType ) i ) ;
+  //       if( prescales_[ i ] == 999999999 ) std::cout << "</strike>" ;
+  //       std::cout << "  |  " ;
+
+  //       if( singleThresholds_[ i ] > 0 )
+  //       {
+  // 	 if( doubleThresholds_[ i ].first > 0 )
+  // 	 {
+  // 	    std::cout << doubleThresholds_[ i ].first << ", "
+  // 		      << doubleThresholds_[ i ].second << ", " ;
+  // 	 }
+
+  // 	 std::cout << singleThresholds_[ i ] ;
+  //       }
+  //       else if( doubleThresholds_[ i ].first > 0 )
+  //       {
+  // 	 std::cout << doubleThresholds_[ i ].first << ", "
+  // 		   << doubleThresholds_[ i ].second ;
+  //       }
+  //       else
+  //       {
+  // 	 std::cout << "---" ;
+  //       }
+
+  //       std::cout << "  |  " ;
+  //       if( prescales_[ i ] != 999999999 ) std::cout << prescales_[ i ] ;
+  //       std::cout << "  |"
+  // 		<< std::endl ;
+  //    }
 }
 
-
-L1ExtraParticleMapProd::~L1ExtraParticleMapProd()
-{
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+L1ExtraParticleMapProd::~L1ExtraParticleMapProd() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-L1ExtraParticleMapProd::produce(edm::Event& iEvent,
-				const edm::EventSetup& iSetup)
-{
-   using namespace edm;
-   using namespace std;
-   using namespace reco;
-   using namespace l1extra ;
-
-
-   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   // ~~~~~~~~ Get L1Extra particles ~~~~~~~~
-   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-   Handle< L1EmParticleCollection > isoEmHandle ;
-   iEvent.getByLabel( isoEmSource_, isoEmHandle ) ;
-
-   Handle< L1EmParticleCollection > nonIsoEmHandle ;
-   iEvent.getByLabel( nonIsoEmSource_, nonIsoEmHandle ) ;
-
-   Handle< L1JetParticleCollection > cenJetHandle ;
-   iEvent.getByLabel( cenJetSource_, cenJetHandle ) ;
-
-   Handle< L1JetParticleCollection > forJetHandle ;
-   iEvent.getByLabel( forJetSource_, forJetHandle ) ;
-
-   Handle< L1JetParticleCollection > tauJetHandle ;
-   iEvent.getByLabel( tauJetSource_, tauJetHandle ) ;
-
-   Handle< L1MuonParticleCollection > muHandle ;
-   iEvent.getByLabel( muonSource_, muHandle ) ;
-
-   Handle< L1EtMissParticle > metHandle ;
-   iEvent.getByLabel( etMissSource_, metHandle ) ;
-
-   Handle< L1EtMissParticle > mhtHandle ;
-   iEvent.getByLabel( htMissSource_, mhtHandle ) ;
-
-   double met = metHandle->etMiss() ;
-   double ht = mhtHandle->etTotal() ;
-   double ett = metHandle->etTotal() ;
-
-   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   // ~~~ Evaluate trigger conditions and make a L1ParticleMapCollection. ~~~
-   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-   // First, form the input vector<Ref>s that will be needed.
-   L1EmParticleVectorRef inputIsoEmRefs ;
-   addToVectorRefs( isoEmHandle, inputIsoEmRefs ) ;
-
-   L1EmParticleVectorRef inputRelaxedEmRefs ;
-   addToVectorRefs( isoEmHandle, inputRelaxedEmRefs ) ;
-   addToVectorRefs( nonIsoEmHandle, inputRelaxedEmRefs ) ;
-
-   L1JetParticleVectorRef inputTauRefs ;
-   addToVectorRefs( tauJetHandle, inputTauRefs ) ;
-
-   L1JetParticleVectorRef inputJetRefs ;
-   addToVectorRefs( forJetHandle, inputJetRefs ) ;
-   addToVectorRefs( cenJetHandle, inputJetRefs ) ;
-   addToVectorRefs( tauJetHandle, inputJetRefs ) ;
-
-   L1JetParticleVectorRef inputForJetRefs ;
-   addToVectorRefs( forJetHandle, inputForJetRefs ) ;
-
-   L1JetParticleVectorRef inputCenJetTauJetRefs ;
-   addToVectorRefs( cenJetHandle, inputCenJetTauJetRefs ) ;
-   addToVectorRefs( tauJetHandle, inputCenJetTauJetRefs ) ;
-
-   L1MuonParticleVectorRef inputMuonRefsSingle ;
-   L1MuonParticleVectorRef inputMuonRefsDouble ;
-   L1MuonParticleCollection::const_iterator muItr = muHandle->begin() ;
-   L1MuonParticleCollection::const_iterator muEnd = muHandle->end() ;
-
-   for( size_t i = 0 ; muItr != muEnd ; ++muItr, ++i )
-   {
-      if( !muItr->gmtMuonCand().empty() )
-      {
-	 unsigned int qual = muItr->gmtMuonCand().quality() ;
-
-	 if( qual == 4 ||
-	     qual == 5 ||
-	     qual == 6 ||
-	     qual == 7 )
-	 {
-	    inputMuonRefsSingle.push_back(
-	       edm::Ref< L1MuonParticleCollection >( muHandle, i ) ) ;
-	 }
-
-	 if( qual == 3 ||
-	     qual == 5 ||
-	     qual == 6 ||
-	     qual == 7 )
-	 {
-	    inputMuonRefsDouble.push_back(
-	       edm::Ref< L1MuonParticleCollection >( muHandle, i ) ) ;
-	 }
-      }
-   }
-
-   unique_ptr< L1ParticleMapCollection > mapColl( new L1ParticleMapCollection ) ;
-   bool globalDecision = false ;
-   std::vector< bool > decisionWord ;
-
-   for( int itrig = 0 ; itrig < L1ParticleMap::kNumOfL1TriggerTypes; ++itrig )
-   {
-      bool decision = false ;
-      std::vector< L1ParticleMap::L1ObjectType > objectTypes ;
-      L1EmParticleVectorRef outputEmRefsTmp ;
-      L1JetParticleVectorRef outputJetRefsTmp ;
-      L1MuonParticleVectorRef outputMuonRefsTmp ;
-      L1EtMissParticleRefProd metRefTmp ;
-      L1ParticleMap::L1IndexComboVector combosTmp ; // unfilled for single objs
-
-      if( itrig == L1ParticleMap::kSingleMu3 ||
-	  itrig == L1ParticleMap::kSingleMu5 ||
-	  itrig == L1ParticleMap::kSingleMu7 ||
-	  itrig == L1ParticleMap::kSingleMu10 ||
-	  itrig == L1ParticleMap::kSingleMu14 ||
-	  itrig == L1ParticleMap::kSingleMu20 ||
-	  itrig == L1ParticleMap::kSingleMu25 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-
-	 evaluateSingleObjectTrigger( inputMuonRefsSingle,
-				      singleThresholds_[ itrig ],
-				      decision,
-				      outputMuonRefsTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kSingleIsoEG5 ||
-	       itrig == L1ParticleMap::kSingleIsoEG8 ||
-	       itrig == L1ParticleMap::kSingleIsoEG10 ||
-	       itrig == L1ParticleMap::kSingleIsoEG12 ||
-	       itrig == L1ParticleMap::kSingleIsoEG15 ||
-	       itrig == L1ParticleMap::kSingleIsoEG20 ||
-	       itrig == L1ParticleMap::kSingleIsoEG25 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-
-	 evaluateSingleObjectTrigger( inputIsoEmRefs,
-				      singleThresholds_[ itrig ],
-				      decision,
-				      outputEmRefsTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kSingleEG5 ||
-	       itrig == L1ParticleMap::kSingleEG8 ||
-	       itrig == L1ParticleMap::kSingleEG10 ||
-	       itrig == L1ParticleMap::kSingleEG12 ||
-	       itrig == L1ParticleMap::kSingleEG15 ||
-	       itrig == L1ParticleMap::kSingleEG20 ||
-	       itrig == L1ParticleMap::kSingleEG25 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-
-	 evaluateSingleObjectTrigger( inputRelaxedEmRefs,
-				      singleThresholds_[ itrig ],
-				      decision,
-				      outputEmRefsTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kSingleJet15 ||
-	       itrig == L1ParticleMap::kSingleJet20 ||
-	       itrig == L1ParticleMap::kSingleJet30 ||
-	       itrig == L1ParticleMap::kSingleJet50 ||
-	       itrig == L1ParticleMap::kSingleJet70 ||
-	       itrig == L1ParticleMap::kSingleJet100 ||
-	       itrig == L1ParticleMap::kSingleJet150 ||
-	       itrig == L1ParticleMap::kSingleJet200 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-
-	 evaluateSingleObjectTrigger( inputJetRefs,
-				      singleThresholds_[ itrig ],
-				      decision,
-				      outputJetRefsTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kSingleTauJet10 ||
-	       itrig == L1ParticleMap::kSingleTauJet20 ||
-	       itrig == L1ParticleMap::kSingleTauJet30 ||
-	       itrig == L1ParticleMap::kSingleTauJet35 ||
-	       itrig == L1ParticleMap::kSingleTauJet40 ||
-	       itrig == L1ParticleMap::kSingleTauJet60 ||
-	       itrig == L1ParticleMap::kSingleTauJet80 ||
-	       itrig == L1ParticleMap::kSingleTauJet100 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-
-	 evaluateSingleObjectTrigger( inputTauRefs,
-				      singleThresholds_[ itrig ],
-				      decision,
-				      outputJetRefsTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kHTT100 ||
-	       itrig == L1ParticleMap::kHTT200 ||
-	       itrig == L1ParticleMap::kHTT250 ||
-	       itrig == L1ParticleMap::kHTT300 ||
-	       itrig == L1ParticleMap::kHTT400 ||
-	       itrig == L1ParticleMap::kHTT500 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEtHad ) ;
-
-	 if( ht >= singleThresholds_[ itrig ] )
-	 {
-	    decision = true ;
-	    metRefTmp = L1EtMissParticleRefProd( mhtHandle ) ;
-	 }
-      }
-      else if( itrig == L1ParticleMap::kETM10 ||
-	       itrig == L1ParticleMap::kETM15 ||
-	       itrig == L1ParticleMap::kETM20 ||
-	       itrig == L1ParticleMap::kETM30 ||
-	       itrig == L1ParticleMap::kETM40 ||
-	       itrig == L1ParticleMap::kETM50 ||
-	       itrig == L1ParticleMap::kETM60 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEtMiss ) ;
-
-	 if( met >= singleThresholds_[ itrig ] )
-	 {
-	    decision = true ;
-	    metRefTmp = L1EtMissParticleRefProd( metHandle ) ;
-	 }
-      }
-      else if( itrig == L1ParticleMap::kETT60 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEtTotal ) ;
-
-	 if( ett >= singleThresholds_[ itrig ] )
-	 {
-	    decision = true ;
-	    metRefTmp = L1EtMissParticleRefProd( metHandle ) ;
-	 }
-      }
-      else if( itrig == L1ParticleMap::kDoubleMu3 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-
-	 evaluateDoubleSameObjectTrigger( inputMuonRefsDouble,
-					  singleThresholds_[ itrig ],
-					  decision,
-					  outputMuonRefsTmp,
-					  combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kDoubleIsoEG8 ||
-	       itrig == L1ParticleMap::kDoubleIsoEG10 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-
-	 evaluateDoubleSameObjectTrigger( inputIsoEmRefs,
-					  singleThresholds_[ itrig ],
-					  decision,
-					  outputEmRefsTmp,
-					  combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kDoubleEG5 ||
-	       itrig == L1ParticleMap::kDoubleEG10 ||
-	       itrig == L1ParticleMap::kDoubleEG15 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-
-	 evaluateDoubleSameObjectTrigger( inputRelaxedEmRefs,
-					  singleThresholds_[ itrig ],
-					  decision,
-					  outputEmRefsTmp,
-					  combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kDoubleJet70 ||
-	       itrig == L1ParticleMap::kDoubleJet100 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-
-	 evaluateDoubleSameObjectTrigger( inputJetRefs,
-					  singleThresholds_[ itrig ],
-					  decision,
-					  outputJetRefsTmp,
-					  combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kDoubleTauJet20 ||
-	       itrig == L1ParticleMap::kDoubleTauJet30 ||
-	       itrig == L1ParticleMap::kDoubleTauJet35 ||
-	       itrig == L1ParticleMap::kDoubleTauJet40 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-
-	 evaluateDoubleSameObjectTrigger( inputTauRefs,
-					  singleThresholds_[ itrig ],
-					  decision,
-					  outputJetRefsTmp,
-					  combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kMu3_IsoEG5 ||
-	       itrig == L1ParticleMap::kMu5_IsoEG10 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-
-	 evaluateDoubleDifferentObjectTrigger(
-	    inputMuonRefsSingle,
-	    inputIsoEmRefs,
-	    doubleThresholds_[ itrig ].first,
-	    doubleThresholds_[ itrig ].second,
-	    decision,
-	    outputMuonRefsTmp,
-	    outputEmRefsTmp,
-	    combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kMu3_EG12 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-
-	 evaluateDoubleDifferentObjectTrigger(
-	    inputMuonRefsSingle,
-	    inputRelaxedEmRefs,
-	    doubleThresholds_[ itrig ].first,
-	    doubleThresholds_[ itrig ].second,
-	    decision,
-	    outputMuonRefsTmp,
-	    outputEmRefsTmp,
-	    combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kMu3_Jet15 ||
-	       itrig == L1ParticleMap::kMu5_Jet15 ||
-	       itrig == L1ParticleMap::kMu3_Jet70 ||
-	       itrig == L1ParticleMap::kMu5_Jet20 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-
-	 evaluateDoubleDifferentObjectTrigger(
-	    inputMuonRefsSingle,
-	    inputJetRefs,
-	    doubleThresholds_[ itrig ].first,
-	    doubleThresholds_[ itrig ].second,
-	    decision,
-	    outputMuonRefsTmp,
-	    outputJetRefsTmp,
-	    combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kMu5_TauJet20 ||
-	       itrig == L1ParticleMap::kMu5_TauJet30 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-
-	 evaluateDoubleDifferentObjectTrigger(
-	    inputMuonRefsSingle,
-	    inputTauRefs,
-	    doubleThresholds_[ itrig ].first,
-	    doubleThresholds_[ itrig ].second,
-	    decision,
-	    outputMuonRefsTmp,
-	    outputJetRefsTmp,
-	    combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kIsoEG10_EG10 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-
-	 evaluateDoubleDifferentObjectSameTypeTrigger(
-	    inputIsoEmRefs,
-	    inputRelaxedEmRefs,
-	    doubleThresholds_[ itrig ].first,
-	    doubleThresholds_[ itrig ].second,
-	    decision,
-	    outputEmRefsTmp,
-	    combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kIsoEG10_Jet15 ||
-	       itrig == L1ParticleMap::kIsoEG10_Jet30 ||
-	       itrig == L1ParticleMap::kIsoEG10_Jet20 ||
-	       itrig == L1ParticleMap::kIsoEG10_Jet70 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-
-	 evaluateDoubleDifferentCaloObjectTrigger(
-	    inputIsoEmRefs,
-	    inputJetRefs,
-	    doubleThresholds_[ itrig ].first,
-	    doubleThresholds_[ itrig ].second,
-	    decision,
-	    outputEmRefsTmp,
-	    outputJetRefsTmp,
-	    combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kIsoEG10_TauJet20 ||
-	       itrig == L1ParticleMap::kIsoEG10_TauJet30 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-
-	 evaluateDoubleDifferentCaloObjectTrigger(
-	    inputIsoEmRefs,
-	    inputTauRefs,
-	    doubleThresholds_[ itrig ].first,
-	    doubleThresholds_[ itrig ].second,
-	    decision,
-	    outputEmRefsTmp,
-	    outputJetRefsTmp,
-	    combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kEG10_Jet15 ||
-	       itrig == L1ParticleMap::kEG12_Jet20 ||
-	       itrig == L1ParticleMap::kEG12_Jet70 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-
-	 evaluateDoubleDifferentCaloObjectTrigger(
-	    inputRelaxedEmRefs,
-	    inputJetRefs,
-	    doubleThresholds_[ itrig ].first,
-	    doubleThresholds_[ itrig ].second,
-	    decision,
-	    outputEmRefsTmp,
-	    outputJetRefsTmp,
-	    combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kEG12_TauJet40 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-
-	 evaluateDoubleDifferentCaloObjectTrigger(
-	    inputRelaxedEmRefs,
-	    inputTauRefs,
-	    doubleThresholds_[ itrig ].first,
-	    doubleThresholds_[ itrig ].second,
-	    decision,
-	    outputEmRefsTmp,
-	    outputJetRefsTmp,
-	    combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kJet70_TauJet40 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-
-	 evaluateDoubleDifferentObjectSameTypeTrigger(
-	    inputJetRefs,
-	    inputTauRefs,
-	    doubleThresholds_[ itrig ].first,
-	    doubleThresholds_[ itrig ].second,
-	    decision,
-	    outputJetRefsTmp,
-	    combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kMu3_HTT200 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtHad ) ;
-
-	 if( ht >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateSingleObjectTrigger( inputMuonRefsSingle,
-					 doubleThresholds_[ itrig ].first,
-					 decision,
-					 outputMuonRefsTmp ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( mhtHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kIsoEG10_HTT200 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtHad ) ;
-
-	 if( ht >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateSingleObjectTrigger( inputIsoEmRefs,
-					 doubleThresholds_[ itrig ].first,
-					 decision,
-					 outputEmRefsTmp ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( mhtHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kEG12_HTT200 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtHad ) ;
-
-	 if( ht >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateSingleObjectTrigger( inputRelaxedEmRefs,
-					 doubleThresholds_[ itrig ].first,
-					 decision,
-					 outputEmRefsTmp ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( mhtHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kJet70_HTT200 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtHad ) ;
-
-	 if( ht >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateSingleObjectTrigger( inputJetRefs,
-					 doubleThresholds_[ itrig ].first,
-					 decision,
-					 outputJetRefsTmp ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( mhtHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kTauJet40_HTT200 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtHad ) ;
-
-	 if( ht >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateSingleObjectTrigger( inputTauRefs,
-					 doubleThresholds_[ itrig ].first,
-					 decision,
-					 outputJetRefsTmp ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( mhtHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kMu3_ETM30 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtMiss ) ;
-
-	 if( met >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateSingleObjectTrigger( inputMuonRefsSingle,
-					 doubleThresholds_[ itrig ].first,
-					 decision,
-					 outputMuonRefsTmp ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( metHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kIsoEG10_ETM30 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtMiss ) ;
-
-	 if( met >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateSingleObjectTrigger( inputIsoEmRefs,
-					 doubleThresholds_[ itrig ].first,
-					 decision,
-					 outputEmRefsTmp ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( metHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kEG12_ETM30 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtMiss ) ;
-
-	 if( met >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateSingleObjectTrigger( inputRelaxedEmRefs,
-					 doubleThresholds_[ itrig ].first,
-					 decision,
-					 outputEmRefsTmp ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( metHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kJet70_ETM40 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtMiss ) ;
-
-	 if( met >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateSingleObjectTrigger( inputJetRefs,
-					 doubleThresholds_[ itrig ].first,
-					 decision,
-					 outputJetRefsTmp ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( metHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kTauJet20_ETM20 ||
-	       itrig == L1ParticleMap::kTauJet30_ETM30 ||
-	       itrig == L1ParticleMap::kTauJet30_ETM40 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtMiss ) ;
-
-	 if( met >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateSingleObjectTrigger( inputTauRefs,
-					 doubleThresholds_[ itrig ].first,
-					 decision,
-					 outputJetRefsTmp ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( metHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kHTT100_ETM30 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEtHad ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtMiss ) ;
-
-	 if( ht >= doubleThresholds_[ itrig ].first &&
-	     met >= doubleThresholds_[ itrig ].second )
-	 {
-	    decision = true ;
-	    metRefTmp = L1EtMissParticleRefProd( metHandle ) ;
-	 }
-      }
-      else if( itrig == L1ParticleMap::kTripleMu3 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-
-	 evaluateTripleSameObjectTrigger( inputMuonRefsDouble,
-					  singleThresholds_[ itrig ],
-					  decision,
-					  outputMuonRefsTmp,
-					  combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kTripleIsoEG5 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-
-	 evaluateTripleSameObjectTrigger( inputIsoEmRefs,
-					  singleThresholds_[ itrig ],
-					  decision,
-					  outputEmRefsTmp,
-					  combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kTripleEG10 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-
-	 evaluateTripleSameObjectTrigger( inputRelaxedEmRefs,
-					  singleThresholds_[ itrig ],
-					  decision,
-					  outputEmRefsTmp,
-					  combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kTripleJet50 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-
-	 evaluateTripleSameObjectTrigger( inputJetRefs,
-					  singleThresholds_[ itrig ],
-					  decision,
-					  outputJetRefsTmp,
-					  combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kTripleTauJet40 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-
-	 evaluateTripleSameObjectTrigger( inputTauRefs,
-					  singleThresholds_[ itrig ],
-					  decision,
-					  outputJetRefsTmp,
-					  combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kDoubleMu3_IsoEG5 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-
-	 evaluateDoublePlusSingleObjectTrigger(
-	    inputMuonRefsDouble,
-	    inputIsoEmRefs,
-	    doubleThresholds_[ itrig ].first,
-	    doubleThresholds_[ itrig ].second,
-	    decision,
-	    outputMuonRefsTmp,
-	    outputEmRefsTmp,
-	    combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kDoubleMu3_EG10 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-
-	 evaluateDoublePlusSingleObjectTrigger(
-	    inputMuonRefsDouble,
-	    inputRelaxedEmRefs,
-	    doubleThresholds_[ itrig ].first,
-	    doubleThresholds_[ itrig ].second,
-	    decision,
-	    outputMuonRefsTmp,
-	    outputEmRefsTmp,
-	    combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kDoubleIsoEG5_Mu3 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-
-	 evaluateDoublePlusSingleObjectTrigger(
-	    inputIsoEmRefs,
-	    inputMuonRefsSingle,
-	    doubleThresholds_[ itrig ].first,
-	    doubleThresholds_[ itrig ].second,
-	    decision,
-	    outputEmRefsTmp,
-	    outputMuonRefsTmp,
-	    combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kDoubleEG10_Mu3 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-
-	 evaluateDoublePlusSingleObjectTrigger(
-	    inputRelaxedEmRefs,
-	    inputMuonRefsSingle,
-	    doubleThresholds_[ itrig ].first,
-	    doubleThresholds_[ itrig ].second,
-	    decision,
-	    outputEmRefsTmp,
-	    outputMuonRefsTmp,
-	    combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kDoubleMu3_HTT200 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtHad ) ;
-
-	 if( ht >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateDoubleSameObjectTrigger( inputMuonRefsDouble,
-					     doubleThresholds_[ itrig ].first,
-					     decision,
-					     outputMuonRefsTmp,
-					     combosTmp,
-					     true ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( mhtHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kDoubleIsoEG5_HTT200 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtHad ) ;
-
-	 if( ht >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateDoubleSameObjectTrigger( inputIsoEmRefs,
-					     doubleThresholds_[ itrig ].first,
-					     decision,
-					     outputEmRefsTmp,
-					     combosTmp,
-					     true ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( mhtHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kDoubleEG10_HTT200 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtHad ) ;
-
-	 if( ht >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateDoubleSameObjectTrigger( inputRelaxedEmRefs,
-					     doubleThresholds_[ itrig ].first,
-					     decision,
-					     outputEmRefsTmp,
-					     combosTmp,
-					     true ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( mhtHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kDoubleJet50_HTT200 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtHad ) ;
-
-	 if( ht >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateDoubleSameObjectTrigger( inputJetRefs,
-					     doubleThresholds_[ itrig ].first,
-					     decision,
-					     outputJetRefsTmp,
-					     combosTmp,
-					     true ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( mhtHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kDoubleTauJet40_HTT200 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtHad ) ;
-
-	 if( ht >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateDoubleSameObjectTrigger( inputTauRefs,
-					     doubleThresholds_[ itrig ].first,
-					     decision,
-					     outputJetRefsTmp,
-					     combosTmp,
-					     true ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( mhtHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kDoubleMu3_ETM20 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-	 objectTypes.push_back( L1ParticleMap::kMuon ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtMiss ) ;
-
-	 if( met >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateDoubleSameObjectTrigger( inputMuonRefsDouble,
-					     doubleThresholds_[ itrig ].first,
-					     decision,
-					     outputMuonRefsTmp,
-					     combosTmp,
-					     true ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( metHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kDoubleIsoEG5_ETM20 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtMiss ) ;
-
-	 if( met >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateDoubleSameObjectTrigger( inputIsoEmRefs,
-					     doubleThresholds_[ itrig ].first,
-					     decision,
-					     outputEmRefsTmp,
-					     combosTmp,
-					     true ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( metHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kDoubleEG10_ETM20 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEM ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtMiss ) ;
-
-	 if( met >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateDoubleSameObjectTrigger( inputRelaxedEmRefs,
-					     doubleThresholds_[ itrig ].first,
-					     decision,
-					     outputEmRefsTmp,
-					     combosTmp,
-					     true ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( metHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kDoubleJet50_ETM20 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtMiss ) ;
-
-	 if( met >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateDoubleSameObjectTrigger( inputJetRefs,
-					     doubleThresholds_[ itrig ].first,
-					     decision,
-					     outputJetRefsTmp,
-					     combosTmp,
-					     true ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( metHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kDoubleTauJet40_ETM20 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kEtMiss ) ;
-
-	 if( met >= doubleThresholds_[ itrig ].second )
-	 {
-	    evaluateDoubleSameObjectTrigger( inputTauRefs,
-					     doubleThresholds_[ itrig ].first,
-					     decision,
-					     outputJetRefsTmp,
-					     combosTmp,
-					     true ) ;
-
-	    if( decision )
-	    {
-	       metRefTmp = L1EtMissParticleRefProd( metHandle ) ;
-	    }
-	 }
-      }
-      else if( itrig == L1ParticleMap::kQuadJet30 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-	 objectTypes.push_back( L1ParticleMap::kJet ) ;
-
-	 evaluateQuadSameObjectTrigger( inputJetRefs,
-					singleThresholds_[ itrig ],
-					decision,
-					outputJetRefsTmp,
-					combosTmp ) ;
-      }
-      else if( itrig == L1ParticleMap::kExclusiveDoubleIsoEG4 )
-      {
-         objectTypes.push_back( L1ParticleMap::kEM ) ;
-         objectTypes.push_back( L1ParticleMap::kEM ) ;
-
-         evaluateDoubleExclusiveIsoEG(inputIsoEmRefs,
-                                      inputJetRefs,
-                                      doubleThresholds_[ itrig ].first,
-                                      doubleThresholds_[ itrig ].second,
-                                      decision,
-                                      outputEmRefsTmp,
-                                      combosTmp);
-
-      }
-      else if( itrig == L1ParticleMap::kExclusiveDoubleJet60 )
-      {
-         objectTypes.push_back( L1ParticleMap::kJet ) ;
-         objectTypes.push_back( L1ParticleMap::kJet ) ;
-
-         if( inputJetRefs.size() == 2 )
-         {
-            evaluateDoubleSameObjectTrigger( inputJetRefs,
-                                             singleThresholds_[ itrig ],
-                                             decision,
-                                             outputJetRefsTmp,
-                                             combosTmp ) ;
-         }
-      }
-      else if( itrig == L1ParticleMap::kExclusiveJet25_Gap_Jet25 )
-      {
-         objectTypes.push_back( L1ParticleMap::kJet ) ;
-         objectTypes.push_back( L1ParticleMap::kJet ) ;
-
-         if( inputJetRefs.size() == 2 )
-         {
-            evaluateJetGapJetTrigger( inputForJetRefs,  
-                                      singleThresholds_[ itrig ],
-                                      decision,
-                                      outputJetRefsTmp,
-                                      combosTmp ) ;
-         }
-      }
-      else if( itrig == L1ParticleMap::kIsoEG10_Jet20_ForJet10  )
-      {
-         objectTypes.push_back( L1ParticleMap::kEM ) ;
-         objectTypes.push_back( L1ParticleMap::kJet ) ;
-
-         evaluateForwardRapidityGap(inputForJetRefs,
-                                    singleThresholds_[ itrig ],
-                                    decision);
-
-         if(decision){
-           decision = false;
-           evaluateDoubleDifferentCaloObjectTrigger(
-              inputIsoEmRefs,
-	      inputCenJetTauJetRefs,
-	      doubleThresholds_[ itrig ].first,
-	      doubleThresholds_[ itrig ].second,
-	      decision,
-	      outputEmRefsTmp,
-	      outputJetRefsTmp,
-	      combosTmp );
-         }
-      }
-      else if( itrig == L1ParticleMap::kMinBias_HTT10 )
-      {
-	 objectTypes.push_back( L1ParticleMap::kEtHad ) ;
-
-	 if( ht >= 10. )
-	 {
-	    decision = true ;
-	    metRefTmp = L1EtMissParticleRefProd( mhtHandle ) ;
-	 }
-      }
-      else if( itrig == L1ParticleMap::kZeroBias )
-      {
-	 decision = true ;
-      }
+void L1ExtraParticleMapProd::produce(edm::Event &iEvent,
+                                     const edm::EventSetup &iSetup) {
+  using namespace edm;
+  using namespace std;
+  using namespace reco;
+  using namespace l1extra;
 
-      L1EmParticleVectorRef outputEmRefs ;
-      L1JetParticleVectorRef outputJetRefs ;
-      L1MuonParticleVectorRef outputMuonRefs ;
-      L1EtMissParticleRefProd metRef ;
-      L1ParticleMap::L1IndexComboVector combos ; // unfilled for single objs
-
-      if( decision )
-      {
-//	 if( prescaleCounters_[ itrig ] % prescales_[ itrig ] )
-
-	 double rand = CLHEP::RandFlat::shoot() * ( double ) prescales_[ itrig ] ;
-	 if( rand > 1. )
-	 {
-	    decision = false ;
-	 }
-	 else
-	 {
-	    outputEmRefs = outputEmRefsTmp ;
-	    outputJetRefs = outputJetRefsTmp ;
-	    outputMuonRefs = outputMuonRefsTmp ;
-	    metRef = metRefTmp ;
-	    combos = combosTmp ;
-	 }
-
-	 ++prescaleCounters_[ itrig ] ;
-      }
+  // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  // ~~~~~~~~ Get L1Extra particles ~~~~~~~~
+  // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-      // Construct a L1ParticleMap and add it to the collection.
-      mapColl->push_back( L1ParticleMap(
-	 ( L1ParticleMap::L1TriggerType ) itrig,
-	 decision,
-	 objectTypes,
-	 outputEmRefs,
-	 outputJetRefs,
-	 outputMuonRefs,
-	 metRef,
-	 combos ) ) ;
-
-      globalDecision = globalDecision || decision ;
-      decisionWord.push_back( decision ) ;
-   }
-
-   // Put the L1ParticleMapCollection into the event.
-   iEvent.put(std::move(mapColl)) ;
-
-   // Make a L1GlobalTriggerReadoutRecord and put it into the event.
-   unique_ptr< L1GlobalTriggerReadoutRecord > gtRecord(
-      new L1GlobalTriggerReadoutRecord() ) ;
-   gtRecord->setDecision( globalDecision ) ;
-   gtRecord->setDecisionWord( decisionWord ) ;
-   iEvent.put(std::move(gtRecord)) ;
-
-   return ;
+  Handle<L1EmParticleCollection> isoEmHandle;
+  iEvent.getByLabel(isoEmSource_, isoEmHandle);
+
+  Handle<L1EmParticleCollection> nonIsoEmHandle;
+  iEvent.getByLabel(nonIsoEmSource_, nonIsoEmHandle);
+
+  Handle<L1JetParticleCollection> cenJetHandle;
+  iEvent.getByLabel(cenJetSource_, cenJetHandle);
+
+  Handle<L1JetParticleCollection> forJetHandle;
+  iEvent.getByLabel(forJetSource_, forJetHandle);
+
+  Handle<L1JetParticleCollection> tauJetHandle;
+  iEvent.getByLabel(tauJetSource_, tauJetHandle);
+
+  Handle<L1MuonParticleCollection> muHandle;
+  iEvent.getByLabel(muonSource_, muHandle);
+
+  Handle<L1EtMissParticle> metHandle;
+  iEvent.getByLabel(etMissSource_, metHandle);
+
+  Handle<L1EtMissParticle> mhtHandle;
+  iEvent.getByLabel(htMissSource_, mhtHandle);
+
+  double met = metHandle->etMiss();
+  double ht = mhtHandle->etTotal();
+  double ett = metHandle->etTotal();
+
+  // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  // ~~~ Evaluate trigger conditions and make a L1ParticleMapCollection. ~~~
+  // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  // First, form the input vector<Ref>s that will be needed.
+  L1EmParticleVectorRef inputIsoEmRefs;
+  addToVectorRefs(isoEmHandle, inputIsoEmRefs);
+
+  L1EmParticleVectorRef inputRelaxedEmRefs;
+  addToVectorRefs(isoEmHandle, inputRelaxedEmRefs);
+  addToVectorRefs(nonIsoEmHandle, inputRelaxedEmRefs);
+
+  L1JetParticleVectorRef inputTauRefs;
+  addToVectorRefs(tauJetHandle, inputTauRefs);
+
+  L1JetParticleVectorRef inputJetRefs;
+  addToVectorRefs(forJetHandle, inputJetRefs);
+  addToVectorRefs(cenJetHandle, inputJetRefs);
+  addToVectorRefs(tauJetHandle, inputJetRefs);
+
+  L1JetParticleVectorRef inputForJetRefs;
+  addToVectorRefs(forJetHandle, inputForJetRefs);
+
+  L1JetParticleVectorRef inputCenJetTauJetRefs;
+  addToVectorRefs(cenJetHandle, inputCenJetTauJetRefs);
+  addToVectorRefs(tauJetHandle, inputCenJetTauJetRefs);
+
+  L1MuonParticleVectorRef inputMuonRefsSingle;
+  L1MuonParticleVectorRef inputMuonRefsDouble;
+  L1MuonParticleCollection::const_iterator muItr = muHandle->begin();
+  L1MuonParticleCollection::const_iterator muEnd = muHandle->end();
+
+  for (size_t i = 0; muItr != muEnd; ++muItr, ++i) {
+    if (!muItr->gmtMuonCand().empty()) {
+      unsigned int qual = muItr->gmtMuonCand().quality();
+
+      if (qual == 4 || qual == 5 || qual == 6 || qual == 7) {
+        inputMuonRefsSingle.push_back(
+            edm::Ref<L1MuonParticleCollection>(muHandle, i));
+      }
+
+      if (qual == 3 || qual == 5 || qual == 6 || qual == 7) {
+        inputMuonRefsDouble.push_back(
+            edm::Ref<L1MuonParticleCollection>(muHandle, i));
+      }
+    }
+  }
+
+  unique_ptr<L1ParticleMapCollection> mapColl(new L1ParticleMapCollection);
+  bool globalDecision = false;
+  std::vector<bool> decisionWord;
+
+  for (int itrig = 0; itrig < L1ParticleMap::kNumOfL1TriggerTypes; ++itrig) {
+    bool decision = false;
+    std::vector<L1ParticleMap::L1ObjectType> objectTypes;
+    L1EmParticleVectorRef outputEmRefsTmp;
+    L1JetParticleVectorRef outputJetRefsTmp;
+    L1MuonParticleVectorRef outputMuonRefsTmp;
+    L1EtMissParticleRefProd metRefTmp;
+    L1ParticleMap::L1IndexComboVector combosTmp; // unfilled for single objs
+
+    if (itrig == L1ParticleMap::kSingleMu3 ||
+        itrig == L1ParticleMap::kSingleMu5 ||
+        itrig == L1ParticleMap::kSingleMu7 ||
+        itrig == L1ParticleMap::kSingleMu10 ||
+        itrig == L1ParticleMap::kSingleMu14 ||
+        itrig == L1ParticleMap::kSingleMu20 ||
+        itrig == L1ParticleMap::kSingleMu25) {
+      objectTypes.push_back(L1ParticleMap::kMuon);
+
+      evaluateSingleObjectTrigger(inputMuonRefsSingle, singleThresholds_[itrig],
+                                  decision, outputMuonRefsTmp);
+    } else if (itrig == L1ParticleMap::kSingleIsoEG5 ||
+               itrig == L1ParticleMap::kSingleIsoEG8 ||
+               itrig == L1ParticleMap::kSingleIsoEG10 ||
+               itrig == L1ParticleMap::kSingleIsoEG12 ||
+               itrig == L1ParticleMap::kSingleIsoEG15 ||
+               itrig == L1ParticleMap::kSingleIsoEG20 ||
+               itrig == L1ParticleMap::kSingleIsoEG25) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+
+      evaluateSingleObjectTrigger(inputIsoEmRefs, singleThresholds_[itrig],
+                                  decision, outputEmRefsTmp);
+    } else if (itrig == L1ParticleMap::kSingleEG5 ||
+               itrig == L1ParticleMap::kSingleEG8 ||
+               itrig == L1ParticleMap::kSingleEG10 ||
+               itrig == L1ParticleMap::kSingleEG12 ||
+               itrig == L1ParticleMap::kSingleEG15 ||
+               itrig == L1ParticleMap::kSingleEG20 ||
+               itrig == L1ParticleMap::kSingleEG25) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+
+      evaluateSingleObjectTrigger(inputRelaxedEmRefs, singleThresholds_[itrig],
+                                  decision, outputEmRefsTmp);
+    } else if (itrig == L1ParticleMap::kSingleJet15 ||
+               itrig == L1ParticleMap::kSingleJet20 ||
+               itrig == L1ParticleMap::kSingleJet30 ||
+               itrig == L1ParticleMap::kSingleJet50 ||
+               itrig == L1ParticleMap::kSingleJet70 ||
+               itrig == L1ParticleMap::kSingleJet100 ||
+               itrig == L1ParticleMap::kSingleJet150 ||
+               itrig == L1ParticleMap::kSingleJet200) {
+      objectTypes.push_back(L1ParticleMap::kJet);
+
+      evaluateSingleObjectTrigger(inputJetRefs, singleThresholds_[itrig],
+                                  decision, outputJetRefsTmp);
+    } else if (itrig == L1ParticleMap::kSingleTauJet10 ||
+               itrig == L1ParticleMap::kSingleTauJet20 ||
+               itrig == L1ParticleMap::kSingleTauJet30 ||
+               itrig == L1ParticleMap::kSingleTauJet35 ||
+               itrig == L1ParticleMap::kSingleTauJet40 ||
+               itrig == L1ParticleMap::kSingleTauJet60 ||
+               itrig == L1ParticleMap::kSingleTauJet80 ||
+               itrig == L1ParticleMap::kSingleTauJet100) {
+      objectTypes.push_back(L1ParticleMap::kJet);
+
+      evaluateSingleObjectTrigger(inputTauRefs, singleThresholds_[itrig],
+                                  decision, outputJetRefsTmp);
+    } else if (itrig == L1ParticleMap::kHTT100 ||
+               itrig == L1ParticleMap::kHTT200 ||
+               itrig == L1ParticleMap::kHTT250 ||
+               itrig == L1ParticleMap::kHTT300 ||
+               itrig == L1ParticleMap::kHTT400 ||
+               itrig == L1ParticleMap::kHTT500) {
+      objectTypes.push_back(L1ParticleMap::kEtHad);
+
+      if (ht >= singleThresholds_[itrig]) {
+        decision = true;
+        metRefTmp = L1EtMissParticleRefProd(mhtHandle);
+      }
+    } else if (itrig == L1ParticleMap::kETM10 ||
+               itrig == L1ParticleMap::kETM15 ||
+               itrig == L1ParticleMap::kETM20 ||
+               itrig == L1ParticleMap::kETM30 ||
+               itrig == L1ParticleMap::kETM40 ||
+               itrig == L1ParticleMap::kETM50 ||
+               itrig == L1ParticleMap::kETM60) {
+      objectTypes.push_back(L1ParticleMap::kEtMiss);
+
+      if (met >= singleThresholds_[itrig]) {
+        decision = true;
+        metRefTmp = L1EtMissParticleRefProd(metHandle);
+      }
+    } else if (itrig == L1ParticleMap::kETT60) {
+      objectTypes.push_back(L1ParticleMap::kEtTotal);
+
+      if (ett >= singleThresholds_[itrig]) {
+        decision = true;
+        metRefTmp = L1EtMissParticleRefProd(metHandle);
+      }
+    } else if (itrig == L1ParticleMap::kDoubleMu3) {
+      objectTypes.push_back(L1ParticleMap::kMuon);
+      objectTypes.push_back(L1ParticleMap::kMuon);
+
+      evaluateDoubleSameObjectTrigger(inputMuonRefsDouble,
+                                      singleThresholds_[itrig], decision,
+                                      outputMuonRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kDoubleIsoEG8 ||
+               itrig == L1ParticleMap::kDoubleIsoEG10) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEM);
+
+      evaluateDoubleSameObjectTrigger(inputIsoEmRefs, singleThresholds_[itrig],
+                                      decision, outputEmRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kDoubleEG5 ||
+               itrig == L1ParticleMap::kDoubleEG10 ||
+               itrig == L1ParticleMap::kDoubleEG15) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEM);
+
+      evaluateDoubleSameObjectTrigger(inputRelaxedEmRefs,
+                                      singleThresholds_[itrig], decision,
+                                      outputEmRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kDoubleJet70 ||
+               itrig == L1ParticleMap::kDoubleJet100) {
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kJet);
+
+      evaluateDoubleSameObjectTrigger(inputJetRefs, singleThresholds_[itrig],
+                                      decision, outputJetRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kDoubleTauJet20 ||
+               itrig == L1ParticleMap::kDoubleTauJet30 ||
+               itrig == L1ParticleMap::kDoubleTauJet35 ||
+               itrig == L1ParticleMap::kDoubleTauJet40) {
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kJet);
+
+      evaluateDoubleSameObjectTrigger(inputTauRefs, singleThresholds_[itrig],
+                                      decision, outputJetRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kMu3_IsoEG5 ||
+               itrig == L1ParticleMap::kMu5_IsoEG10) {
+      objectTypes.push_back(L1ParticleMap::kMuon);
+      objectTypes.push_back(L1ParticleMap::kEM);
+
+      evaluateDoubleDifferentObjectTrigger(
+          inputMuonRefsSingle, inputIsoEmRefs, doubleThresholds_[itrig].first,
+          doubleThresholds_[itrig].second, decision, outputMuonRefsTmp,
+          outputEmRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kMu3_EG12) {
+      objectTypes.push_back(L1ParticleMap::kMuon);
+      objectTypes.push_back(L1ParticleMap::kEM);
+
+      evaluateDoubleDifferentObjectTrigger(
+          inputMuonRefsSingle, inputRelaxedEmRefs,
+          doubleThresholds_[itrig].first, doubleThresholds_[itrig].second,
+          decision, outputMuonRefsTmp, outputEmRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kMu3_Jet15 ||
+               itrig == L1ParticleMap::kMu5_Jet15 ||
+               itrig == L1ParticleMap::kMu3_Jet70 ||
+               itrig == L1ParticleMap::kMu5_Jet20) {
+      objectTypes.push_back(L1ParticleMap::kMuon);
+      objectTypes.push_back(L1ParticleMap::kJet);
+
+      evaluateDoubleDifferentObjectTrigger(
+          inputMuonRefsSingle, inputJetRefs, doubleThresholds_[itrig].first,
+          doubleThresholds_[itrig].second, decision, outputMuonRefsTmp,
+          outputJetRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kMu5_TauJet20 ||
+               itrig == L1ParticleMap::kMu5_TauJet30) {
+      objectTypes.push_back(L1ParticleMap::kMuon);
+      objectTypes.push_back(L1ParticleMap::kJet);
+
+      evaluateDoubleDifferentObjectTrigger(
+          inputMuonRefsSingle, inputTauRefs, doubleThresholds_[itrig].first,
+          doubleThresholds_[itrig].second, decision, outputMuonRefsTmp,
+          outputJetRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kIsoEG10_EG10) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEM);
+
+      evaluateDoubleDifferentObjectSameTypeTrigger(
+          inputIsoEmRefs, inputRelaxedEmRefs, doubleThresholds_[itrig].first,
+          doubleThresholds_[itrig].second, decision, outputEmRefsTmp,
+          combosTmp);
+    } else if (itrig == L1ParticleMap::kIsoEG10_Jet15 ||
+               itrig == L1ParticleMap::kIsoEG10_Jet30 ||
+               itrig == L1ParticleMap::kIsoEG10_Jet20 ||
+               itrig == L1ParticleMap::kIsoEG10_Jet70) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kJet);
+
+      evaluateDoubleDifferentCaloObjectTrigger(
+          inputIsoEmRefs, inputJetRefs, doubleThresholds_[itrig].first,
+          doubleThresholds_[itrig].second, decision, outputEmRefsTmp,
+          outputJetRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kIsoEG10_TauJet20 ||
+               itrig == L1ParticleMap::kIsoEG10_TauJet30) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kJet);
+
+      evaluateDoubleDifferentCaloObjectTrigger(
+          inputIsoEmRefs, inputTauRefs, doubleThresholds_[itrig].first,
+          doubleThresholds_[itrig].second, decision, outputEmRefsTmp,
+          outputJetRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kEG10_Jet15 ||
+               itrig == L1ParticleMap::kEG12_Jet20 ||
+               itrig == L1ParticleMap::kEG12_Jet70) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kJet);
+
+      evaluateDoubleDifferentCaloObjectTrigger(
+          inputRelaxedEmRefs, inputJetRefs, doubleThresholds_[itrig].first,
+          doubleThresholds_[itrig].second, decision, outputEmRefsTmp,
+          outputJetRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kEG12_TauJet40) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kJet);
+
+      evaluateDoubleDifferentCaloObjectTrigger(
+          inputRelaxedEmRefs, inputTauRefs, doubleThresholds_[itrig].first,
+          doubleThresholds_[itrig].second, decision, outputEmRefsTmp,
+          outputJetRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kJet70_TauJet40) {
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kJet);
+
+      evaluateDoubleDifferentObjectSameTypeTrigger(
+          inputJetRefs, inputTauRefs, doubleThresholds_[itrig].first,
+          doubleThresholds_[itrig].second, decision, outputJetRefsTmp,
+          combosTmp);
+    } else if (itrig == L1ParticleMap::kMu3_HTT200) {
+      objectTypes.push_back(L1ParticleMap::kMuon);
+      objectTypes.push_back(L1ParticleMap::kEtHad);
+
+      if (ht >= doubleThresholds_[itrig].second) {
+        evaluateSingleObjectTrigger(inputMuonRefsSingle,
+                                    doubleThresholds_[itrig].first, decision,
+                                    outputMuonRefsTmp);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(mhtHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kIsoEG10_HTT200) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEtHad);
+
+      if (ht >= doubleThresholds_[itrig].second) {
+        evaluateSingleObjectTrigger(inputIsoEmRefs,
+                                    doubleThresholds_[itrig].first, decision,
+                                    outputEmRefsTmp);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(mhtHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kEG12_HTT200) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEtHad);
+
+      if (ht >= doubleThresholds_[itrig].second) {
+        evaluateSingleObjectTrigger(inputRelaxedEmRefs,
+                                    doubleThresholds_[itrig].first, decision,
+                                    outputEmRefsTmp);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(mhtHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kJet70_HTT200) {
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kEtHad);
+
+      if (ht >= doubleThresholds_[itrig].second) {
+        evaluateSingleObjectTrigger(inputJetRefs,
+                                    doubleThresholds_[itrig].first, decision,
+                                    outputJetRefsTmp);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(mhtHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kTauJet40_HTT200) {
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kEtHad);
+
+      if (ht >= doubleThresholds_[itrig].second) {
+        evaluateSingleObjectTrigger(inputTauRefs,
+                                    doubleThresholds_[itrig].first, decision,
+                                    outputJetRefsTmp);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(mhtHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kMu3_ETM30) {
+      objectTypes.push_back(L1ParticleMap::kMuon);
+      objectTypes.push_back(L1ParticleMap::kEtMiss);
+
+      if (met >= doubleThresholds_[itrig].second) {
+        evaluateSingleObjectTrigger(inputMuonRefsSingle,
+                                    doubleThresholds_[itrig].first, decision,
+                                    outputMuonRefsTmp);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(metHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kIsoEG10_ETM30) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEtMiss);
+
+      if (met >= doubleThresholds_[itrig].second) {
+        evaluateSingleObjectTrigger(inputIsoEmRefs,
+                                    doubleThresholds_[itrig].first, decision,
+                                    outputEmRefsTmp);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(metHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kEG12_ETM30) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEtMiss);
+
+      if (met >= doubleThresholds_[itrig].second) {
+        evaluateSingleObjectTrigger(inputRelaxedEmRefs,
+                                    doubleThresholds_[itrig].first, decision,
+                                    outputEmRefsTmp);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(metHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kJet70_ETM40) {
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kEtMiss);
+
+      if (met >= doubleThresholds_[itrig].second) {
+        evaluateSingleObjectTrigger(inputJetRefs,
+                                    doubleThresholds_[itrig].first, decision,
+                                    outputJetRefsTmp);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(metHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kTauJet20_ETM20 ||
+               itrig == L1ParticleMap::kTauJet30_ETM30 ||
+               itrig == L1ParticleMap::kTauJet30_ETM40) {
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kEtMiss);
+
+      if (met >= doubleThresholds_[itrig].second) {
+        evaluateSingleObjectTrigger(inputTauRefs,
+                                    doubleThresholds_[itrig].first, decision,
+                                    outputJetRefsTmp);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(metHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kHTT100_ETM30) {
+      objectTypes.push_back(L1ParticleMap::kEtHad);
+      objectTypes.push_back(L1ParticleMap::kEtMiss);
+
+      if (ht >= doubleThresholds_[itrig].first &&
+          met >= doubleThresholds_[itrig].second) {
+        decision = true;
+        metRefTmp = L1EtMissParticleRefProd(metHandle);
+      }
+    } else if (itrig == L1ParticleMap::kTripleMu3) {
+      objectTypes.push_back(L1ParticleMap::kMuon);
+      objectTypes.push_back(L1ParticleMap::kMuon);
+      objectTypes.push_back(L1ParticleMap::kMuon);
+
+      evaluateTripleSameObjectTrigger(inputMuonRefsDouble,
+                                      singleThresholds_[itrig], decision,
+                                      outputMuonRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kTripleIsoEG5) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEM);
+
+      evaluateTripleSameObjectTrigger(inputIsoEmRefs, singleThresholds_[itrig],
+                                      decision, outputEmRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kTripleEG10) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEM);
+
+      evaluateTripleSameObjectTrigger(inputRelaxedEmRefs,
+                                      singleThresholds_[itrig], decision,
+                                      outputEmRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kTripleJet50) {
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kJet);
+
+      evaluateTripleSameObjectTrigger(inputJetRefs, singleThresholds_[itrig],
+                                      decision, outputJetRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kTripleTauJet40) {
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kJet);
+
+      evaluateTripleSameObjectTrigger(inputTauRefs, singleThresholds_[itrig],
+                                      decision, outputJetRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kDoubleMu3_IsoEG5) {
+      objectTypes.push_back(L1ParticleMap::kMuon);
+      objectTypes.push_back(L1ParticleMap::kMuon);
+      objectTypes.push_back(L1ParticleMap::kEM);
+
+      evaluateDoublePlusSingleObjectTrigger(
+          inputMuonRefsDouble, inputIsoEmRefs, doubleThresholds_[itrig].first,
+          doubleThresholds_[itrig].second, decision, outputMuonRefsTmp,
+          outputEmRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kDoubleMu3_EG10) {
+      objectTypes.push_back(L1ParticleMap::kMuon);
+      objectTypes.push_back(L1ParticleMap::kMuon);
+      objectTypes.push_back(L1ParticleMap::kEM);
+
+      evaluateDoublePlusSingleObjectTrigger(
+          inputMuonRefsDouble, inputRelaxedEmRefs,
+          doubleThresholds_[itrig].first, doubleThresholds_[itrig].second,
+          decision, outputMuonRefsTmp, outputEmRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kDoubleIsoEG5_Mu3) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kMuon);
+
+      evaluateDoublePlusSingleObjectTrigger(
+          inputIsoEmRefs, inputMuonRefsSingle, doubleThresholds_[itrig].first,
+          doubleThresholds_[itrig].second, decision, outputEmRefsTmp,
+          outputMuonRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kDoubleEG10_Mu3) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kMuon);
+
+      evaluateDoublePlusSingleObjectTrigger(
+          inputRelaxedEmRefs, inputMuonRefsSingle,
+          doubleThresholds_[itrig].first, doubleThresholds_[itrig].second,
+          decision, outputEmRefsTmp, outputMuonRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kDoubleMu3_HTT200) {
+      objectTypes.push_back(L1ParticleMap::kMuon);
+      objectTypes.push_back(L1ParticleMap::kMuon);
+      objectTypes.push_back(L1ParticleMap::kEtHad);
+
+      if (ht >= doubleThresholds_[itrig].second) {
+        evaluateDoubleSameObjectTrigger(
+            inputMuonRefsDouble, doubleThresholds_[itrig].first, decision,
+            outputMuonRefsTmp, combosTmp, true);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(mhtHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kDoubleIsoEG5_HTT200) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEtHad);
+
+      if (ht >= doubleThresholds_[itrig].second) {
+        evaluateDoubleSameObjectTrigger(
+            inputIsoEmRefs, doubleThresholds_[itrig].first, decision,
+            outputEmRefsTmp, combosTmp, true);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(mhtHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kDoubleEG10_HTT200) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEtHad);
+
+      if (ht >= doubleThresholds_[itrig].second) {
+        evaluateDoubleSameObjectTrigger(
+            inputRelaxedEmRefs, doubleThresholds_[itrig].first, decision,
+            outputEmRefsTmp, combosTmp, true);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(mhtHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kDoubleJet50_HTT200) {
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kEtHad);
+
+      if (ht >= doubleThresholds_[itrig].second) {
+        evaluateDoubleSameObjectTrigger(
+            inputJetRefs, doubleThresholds_[itrig].first, decision,
+            outputJetRefsTmp, combosTmp, true);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(mhtHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kDoubleTauJet40_HTT200) {
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kEtHad);
+
+      if (ht >= doubleThresholds_[itrig].second) {
+        evaluateDoubleSameObjectTrigger(
+            inputTauRefs, doubleThresholds_[itrig].first, decision,
+            outputJetRefsTmp, combosTmp, true);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(mhtHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kDoubleMu3_ETM20) {
+      objectTypes.push_back(L1ParticleMap::kMuon);
+      objectTypes.push_back(L1ParticleMap::kMuon);
+      objectTypes.push_back(L1ParticleMap::kEtMiss);
+
+      if (met >= doubleThresholds_[itrig].second) {
+        evaluateDoubleSameObjectTrigger(
+            inputMuonRefsDouble, doubleThresholds_[itrig].first, decision,
+            outputMuonRefsTmp, combosTmp, true);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(metHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kDoubleIsoEG5_ETM20) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEtMiss);
+
+      if (met >= doubleThresholds_[itrig].second) {
+        evaluateDoubleSameObjectTrigger(
+            inputIsoEmRefs, doubleThresholds_[itrig].first, decision,
+            outputEmRefsTmp, combosTmp, true);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(metHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kDoubleEG10_ETM20) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEtMiss);
+
+      if (met >= doubleThresholds_[itrig].second) {
+        evaluateDoubleSameObjectTrigger(
+            inputRelaxedEmRefs, doubleThresholds_[itrig].first, decision,
+            outputEmRefsTmp, combosTmp, true);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(metHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kDoubleJet50_ETM20) {
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kEtMiss);
+
+      if (met >= doubleThresholds_[itrig].second) {
+        evaluateDoubleSameObjectTrigger(
+            inputJetRefs, doubleThresholds_[itrig].first, decision,
+            outputJetRefsTmp, combosTmp, true);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(metHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kDoubleTauJet40_ETM20) {
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kEtMiss);
+
+      if (met >= doubleThresholds_[itrig].second) {
+        evaluateDoubleSameObjectTrigger(
+            inputTauRefs, doubleThresholds_[itrig].first, decision,
+            outputJetRefsTmp, combosTmp, true);
+
+        if (decision) {
+          metRefTmp = L1EtMissParticleRefProd(metHandle);
+        }
+      }
+    } else if (itrig == L1ParticleMap::kQuadJet30) {
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kJet);
+
+      evaluateQuadSameObjectTrigger(inputJetRefs, singleThresholds_[itrig],
+                                    decision, outputJetRefsTmp, combosTmp);
+    } else if (itrig == L1ParticleMap::kExclusiveDoubleIsoEG4) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kEM);
+
+      evaluateDoubleExclusiveIsoEG(inputIsoEmRefs, inputJetRefs,
+                                   doubleThresholds_[itrig].first,
+                                   doubleThresholds_[itrig].second, decision,
+                                   outputEmRefsTmp, combosTmp);
+
+    } else if (itrig == L1ParticleMap::kExclusiveDoubleJet60) {
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kJet);
+
+      if (inputJetRefs.size() == 2) {
+        evaluateDoubleSameObjectTrigger(inputJetRefs, singleThresholds_[itrig],
+                                        decision, outputJetRefsTmp, combosTmp);
+      }
+    } else if (itrig == L1ParticleMap::kExclusiveJet25_Gap_Jet25) {
+      objectTypes.push_back(L1ParticleMap::kJet);
+      objectTypes.push_back(L1ParticleMap::kJet);
+
+      if (inputJetRefs.size() == 2) {
+        evaluateJetGapJetTrigger(inputForJetRefs, singleThresholds_[itrig],
+                                 decision, outputJetRefsTmp, combosTmp);
+      }
+    } else if (itrig == L1ParticleMap::kIsoEG10_Jet20_ForJet10) {
+      objectTypes.push_back(L1ParticleMap::kEM);
+      objectTypes.push_back(L1ParticleMap::kJet);
+
+      evaluateForwardRapidityGap(inputForJetRefs, singleThresholds_[itrig],
+                                 decision);
+
+      if (decision) {
+        decision = false;
+        evaluateDoubleDifferentCaloObjectTrigger(
+            inputIsoEmRefs, inputCenJetTauJetRefs,
+            doubleThresholds_[itrig].first, doubleThresholds_[itrig].second,
+            decision, outputEmRefsTmp, outputJetRefsTmp, combosTmp);
+      }
+    } else if (itrig == L1ParticleMap::kMinBias_HTT10) {
+      objectTypes.push_back(L1ParticleMap::kEtHad);
+
+      if (ht >= 10.) {
+        decision = true;
+        metRefTmp = L1EtMissParticleRefProd(mhtHandle);
+      }
+    } else if (itrig == L1ParticleMap::kZeroBias) {
+      decision = true;
+    }
+
+    L1EmParticleVectorRef outputEmRefs;
+    L1JetParticleVectorRef outputJetRefs;
+    L1MuonParticleVectorRef outputMuonRefs;
+    L1EtMissParticleRefProd metRef;
+    L1ParticleMap::L1IndexComboVector combos; // unfilled for single objs
+
+    if (decision) {
+      //	 if( prescaleCounters_[ itrig ] % prescales_[ itrig ] )
+
+      double rand = CLHEP::RandFlat::shoot() * (double)prescales_[itrig];
+      if (rand > 1.) {
+        decision = false;
+      } else {
+        outputEmRefs = outputEmRefsTmp;
+        outputJetRefs = outputJetRefsTmp;
+        outputMuonRefs = outputMuonRefsTmp;
+        metRef = metRefTmp;
+        combos = combosTmp;
+      }
+
+      ++prescaleCounters_[itrig];
+    }
+
+    // Construct a L1ParticleMap and add it to the collection.
+    mapColl->push_back(L1ParticleMap(
+        (L1ParticleMap::L1TriggerType)itrig, decision, objectTypes,
+        outputEmRefs, outputJetRefs, outputMuonRefs, metRef, combos));
+
+    globalDecision = globalDecision || decision;
+    decisionWord.push_back(decision);
+  }
+
+  // Put the L1ParticleMapCollection into the event.
+  iEvent.put(std::move(mapColl));
+
+  // Make a L1GlobalTriggerReadoutRecord and put it into the event.
+  unique_ptr<L1GlobalTriggerReadoutRecord> gtRecord(
+      new L1GlobalTriggerReadoutRecord());
+  gtRecord->setDecision(globalDecision);
+  gtRecord->setDecisionWord(decisionWord);
+  iEvent.put(std::move(gtRecord));
+
+  return;
 }
 
-
-template< class TCollection >
-void
-L1ExtraParticleMapProd::addToVectorRefs(
-   const edm::Handle< TCollection >& handle,                // input
-   std::vector< edm::Ref< TCollection > >& vectorRefs )     // output
+template <class TCollection>
+void L1ExtraParticleMapProd::addToVectorRefs(
+    const edm::Handle<TCollection> &handle,         // input
+    std::vector<edm::Ref<TCollection>> &vectorRefs) // output
 {
-   for( size_t i = 0 ; i < handle->size() ; ++i )
-   {
-      vectorRefs.push_back( edm::Ref< TCollection >( handle, i ) ) ;
-   }
+  for (size_t i = 0; i < handle->size(); ++i) {
+    vectorRefs.push_back(edm::Ref<TCollection>(handle, i));
+  }
 }
 
-template< class TCollection >
-void
-L1ExtraParticleMapProd::evaluateSingleObjectTrigger(
-   const std::vector< edm::Ref< TCollection > >& inputRefs, // input
-   const double& etThreshold,                               // input
-   bool& decision,                                          // output
-   std::vector< edm::Ref< TCollection > >& outputRefs )     // output
+template <class TCollection>
+void L1ExtraParticleMapProd::evaluateSingleObjectTrigger(
+    const std::vector<edm::Ref<TCollection>> &inputRefs, // input
+    const double &etThreshold,                           // input
+    bool &decision,                                      // output
+    std::vector<edm::Ref<TCollection>> &outputRefs)      // output
 {
-   for( size_t i = 0 ; i < inputRefs.size() ; ++i )
-   {
-      if( inputRefs[ i ].get()->et() >= etThreshold )
-      {
-	 decision = true ;
-	 outputRefs.push_back( inputRefs[ i ] ) ;
-      }
-   }
+  for (size_t i = 0; i < inputRefs.size(); ++i) {
+    if (inputRefs[i].get()->et() >= etThreshold) {
+      decision = true;
+      outputRefs.push_back(inputRefs[i]);
+    }
+  }
 }
 
-template< class TCollection >
-void
-L1ExtraParticleMapProd::evaluateDoubleSameObjectTrigger(
-   const std::vector< edm::Ref< TCollection > >& inputRefs, // input
-   const double& etThreshold,                               // input
-   bool& decision,                                          // output
-   std::vector< edm::Ref< TCollection > >& outputRefs,      // output
-   l1extra::L1ParticleMap::L1IndexComboVector& combos,      // output
-   bool combinedWithGlobalObject )                          // input
+template <class TCollection>
+void L1ExtraParticleMapProd::evaluateDoubleSameObjectTrigger(
+    const std::vector<edm::Ref<TCollection>> &inputRefs, // input
+    const double &etThreshold,                           // input
+    bool &decision,                                      // output
+    std::vector<edm::Ref<TCollection>> &outputRefs,      // output
+    l1extra::L1ParticleMap::L1IndexComboVector &combos,  // output
+    bool combinedWithGlobalObject)                       // input
 {
-   // Use i+1 < inputRefs.size() instead of i < inputRefs.size()-1
-   // because i is unsigned, and if size() is 0, then RHS undefined.
-   for( size_t i = 0 ; i+1 < inputRefs.size() ; ++i )
-   {
-      const edm::Ref< TCollection >& refi = inputRefs[ i ] ;
-      if( refi.get()->et() >= etThreshold )
-      {
-	 for( size_t j = i+1 ; j < inputRefs.size() ; ++j )
-	 {
-	    const edm::Ref< TCollection >& refj = inputRefs[ j ] ;
-	    if( refj.get()->et() >= etThreshold )
-	    {
-	       decision = true ;
-
-	       // If the two objects are already in the list, find
-	       // their indices.
-	       int iInList = kDefault ;
-	       int jInList = kDefault ;
-	       for( size_t iout = 0 ; iout < outputRefs.size() ; ++iout )
-	       {
-		  if( refi == outputRefs[ iout ] )
-		  {
-		     iInList = iout ;
-		  }
-
-		  if( refj == outputRefs[ iout ] )
-		  {
-		     jInList = iout ;
-		  }
-	       }
-
-	       // If either object is not in the list, add it, and
-	       // record its index.
-	       if( iInList == kDefault )
-	       {
-		  iInList = outputRefs.size() ;
-		  outputRefs.push_back( refi ) ;
-	       }
-		     
-	       if( jInList == kDefault )
-	       {
-		  jInList = outputRefs.size() ;
-		  outputRefs.push_back( refj ) ;
-	       }
-
-	       // Record this object combination.
-	       l1extra::L1ParticleMap::L1IndexCombo combo ;
-	       combo.push_back( iInList ) ;
-	       combo.push_back( jInList ) ;
-	       if( combinedWithGlobalObject ) combo.push_back( 0 ) ;
-	       combos.push_back( combo ) ;
-	    }
-	 }
-      }
-   }
-}
+  // Use i+1 < inputRefs.size() instead of i < inputRefs.size()-1
+  // because i is unsigned, and if size() is 0, then RHS undefined.
+  for (size_t i = 0; i + 1 < inputRefs.size(); ++i) {
+    const edm::Ref<TCollection> &refi = inputRefs[i];
+    if (refi.get()->et() >= etThreshold) {
+      for (size_t j = i + 1; j < inputRefs.size(); ++j) {
+        const edm::Ref<TCollection> &refj = inputRefs[j];
+        if (refj.get()->et() >= etThreshold) {
+          decision = true;
+
+          // If the two objects are already in the list, find
+          // their indices.
+          int iInList = kDefault;
+          int jInList = kDefault;
+          for (size_t iout = 0; iout < outputRefs.size(); ++iout) {
+            if (refi == outputRefs[iout]) {
+              iInList = iout;
+            }
 
+            if (refj == outputRefs[iout]) {
+              jInList = iout;
+            }
+          }
+
+          // If either object is not in the list, add it, and
+          // record its index.
+          if (iInList == kDefault) {
+            iInList = outputRefs.size();
+            outputRefs.push_back(refi);
+          }
+
+          if (jInList == kDefault) {
+            jInList = outputRefs.size();
+            outputRefs.push_back(refj);
+          }
+
+          // Record this object combination.
+          l1extra::L1ParticleMap::L1IndexCombo combo;
+          combo.push_back(iInList);
+          combo.push_back(jInList);
+          if (combinedWithGlobalObject)
+            combo.push_back(0);
+          combos.push_back(combo);
+        }
+      }
+    }
+  }
+}
 
-template< class TCollection >
-void
-L1ExtraParticleMapProd::evaluateTripleSameObjectTrigger(
-   const std::vector< edm::Ref< TCollection > >& inputRefs, // input
-   const double& etThreshold,                               // input
-   bool& decision,                                          // output
-   std::vector< edm::Ref< TCollection > >& outputRefs,      // output
-   l1extra::L1ParticleMap::L1IndexComboVector& combos )     // output
+template <class TCollection>
+void L1ExtraParticleMapProd::evaluateTripleSameObjectTrigger(
+    const std::vector<edm::Ref<TCollection>> &inputRefs, // input
+    const double &etThreshold,                           // input
+    bool &decision,                                      // output
+    std::vector<edm::Ref<TCollection>> &outputRefs,      // output
+    l1extra::L1ParticleMap::L1IndexComboVector &combos)  // output
 {
-   // Use i+2 < inputRefs.size() instead of i < inputRefs.size()-2
-   // because i is unsigned, and if size() is 0, then RHS undefined.
-   for( size_t i = 0 ; i+2 < inputRefs.size() ; ++i )
-   {
-      const edm::Ref< TCollection >& refi = inputRefs[ i ] ;
-      if( refi.get()->et() >= etThreshold )
-      {
-	 for( size_t j = i+1 ; j+1 < inputRefs.size() ; ++j )
-	 {
-	    const edm::Ref< TCollection >& refj = inputRefs[ j ] ;
-	    if( refj.get()->et() >= etThreshold )
-	    {
-	       for( size_t k = j+1 ; k < inputRefs.size() ; ++k )
-	       {
-		  const edm::Ref< TCollection >& refk = inputRefs[ k ] ;
-		  if( refk.get()->et() >= etThreshold )
-		  {
-		     decision = true ;
-
-		     // If the three objects are already in the list, find
-		     // their indices.
-		     int iInList = kDefault ;
-		     int jInList = kDefault ;
-		     int kInList = kDefault ;
-		     for( size_t iout = 0 ; iout < outputRefs.size() ; ++iout )
-		     {
-			if( refi == outputRefs[ iout ] )
-			{
-			   iInList = iout ;
-			}
-
-			if( refj == outputRefs[ iout ] )
-			{
-			   jInList = iout ;
-			}
-
-			if( refk == outputRefs[ iout ] )
-			{
-			   kInList = iout ;
-			}
-		     }
-
-		     // If any object is not in the list, add it, and
-		     // record its index.
-		     if( iInList == kDefault )
-		     {
-			iInList = outputRefs.size() ;
-			outputRefs.push_back( refi );
-		     }
-		     
-		     if( jInList == kDefault )
-		     {
-			jInList = outputRefs.size() ;
-			outputRefs.push_back( refj );
-		     }
-
-		     if( kInList == kDefault )
-		     {
-			kInList = outputRefs.size() ;
-			outputRefs.push_back( refk );
-		     }
-
-		     // Record this object combination.
-		     l1extra::L1ParticleMap::L1IndexCombo combo ;
-		     combo.push_back( iInList ) ;
-		     combo.push_back( jInList ) ;
-		     combo.push_back( kInList ) ;
-		     combos.push_back( combo ) ;
-		  }
-	       }
-	    }
-	 }
+  // Use i+2 < inputRefs.size() instead of i < inputRefs.size()-2
+  // because i is unsigned, and if size() is 0, then RHS undefined.
+  for (size_t i = 0; i + 2 < inputRefs.size(); ++i) {
+    const edm::Ref<TCollection> &refi = inputRefs[i];
+    if (refi.get()->et() >= etThreshold) {
+      for (size_t j = i + 1; j + 1 < inputRefs.size(); ++j) {
+        const edm::Ref<TCollection> &refj = inputRefs[j];
+        if (refj.get()->et() >= etThreshold) {
+          for (size_t k = j + 1; k < inputRefs.size(); ++k) {
+            const edm::Ref<TCollection> &refk = inputRefs[k];
+            if (refk.get()->et() >= etThreshold) {
+              decision = true;
+
+              // If the three objects are already in the list, find
+              // their indices.
+              int iInList = kDefault;
+              int jInList = kDefault;
+              int kInList = kDefault;
+              for (size_t iout = 0; iout < outputRefs.size(); ++iout) {
+                if (refi == outputRefs[iout]) {
+                  iInList = iout;
+                }
+
+                if (refj == outputRefs[iout]) {
+                  jInList = iout;
+                }
+
+                if (refk == outputRefs[iout]) {
+                  kInList = iout;
+                }
+              }
+
+              // If any object is not in the list, add it, and
+              // record its index.
+              if (iInList == kDefault) {
+                iInList = outputRefs.size();
+                outputRefs.push_back(refi);
+              }
+
+              if (jInList == kDefault) {
+                jInList = outputRefs.size();
+                outputRefs.push_back(refj);
+              }
+
+              if (kInList == kDefault) {
+                kInList = outputRefs.size();
+                outputRefs.push_back(refk);
+              }
+
+              // Record this object combination.
+              l1extra::L1ParticleMap::L1IndexCombo combo;
+              combo.push_back(iInList);
+              combo.push_back(jInList);
+              combo.push_back(kInList);
+              combos.push_back(combo);
+            }
+          }
+        }
       }
-   }
+    }
+  }
 }
 
-
-template< class TCollection1, class TCollection2 >
-void
-L1ExtraParticleMapProd::evaluateDoublePlusSingleObjectTrigger(
-   const std::vector< edm::Ref< TCollection1 > >& inputRefs1, // input
-   const std::vector< edm::Ref< TCollection2 > >& inputRefs2, // input
-   const double& etThreshold1,                                // input
-   const double& etThreshold2,                                // input
-   bool& decision,                                            // output
-   std::vector< edm::Ref< TCollection1 > >& outputRefs1,      // output
-   std::vector< edm::Ref< TCollection2 > >& outputRefs2,      // output
-   l1extra::L1ParticleMap::L1IndexComboVector& combos )       // output
+template <class TCollection1, class TCollection2>
+void L1ExtraParticleMapProd::evaluateDoublePlusSingleObjectTrigger(
+    const std::vector<edm::Ref<TCollection1>> &inputRefs1, // input
+    const std::vector<edm::Ref<TCollection2>> &inputRefs2, // input
+    const double &etThreshold1,                            // input
+    const double &etThreshold2,                            // input
+    bool &decision,                                        // output
+    std::vector<edm::Ref<TCollection1>> &outputRefs1,      // output
+    std::vector<edm::Ref<TCollection2>> &outputRefs2,      // output
+    l1extra::L1ParticleMap::L1IndexComboVector &combos)    // output
 {
-   // Use i+1 < inputRefs.size() instead of i < inputRefs.size()-1
-   // because i is unsigned, and if size() is 0, then RHS undefined.
-   for( size_t i = 0 ; i+1 < inputRefs1.size() ; ++i )
-   {
-      const edm::Ref< TCollection1 >& refi = inputRefs1[ i ] ;
-      if( refi.get()->et() >= etThreshold1 )
-      {
-	 for( size_t j = i+1 ; j < inputRefs1.size() ; ++j )
-	 {
-	    const edm::Ref< TCollection1 >& refj = inputRefs1[ j ] ;
-	    if( refj.get()->et() >= etThreshold1 )
-	    {
-	       for( size_t k = 0 ; k < inputRefs2.size() ; ++k )
-	       {
-		  const edm::Ref< TCollection2 >& refk = inputRefs2[ k ] ;
-		  if( refk.get()->et() >= etThreshold2 )
-		  {
-		     decision = true ;
-
-		     // If the three objects are already in the list, find
-		     // their indices.
-		     int iInList = kDefault ;
-		     int jInList = kDefault ;
-
-		     for( size_t iout = 0 ;
-			  iout < outputRefs1.size() ; ++iout )
-		     {
-			if( refi == outputRefs1[ iout ] )
-			{
-			   iInList = iout ;
-			}
-
-			if( refj == outputRefs1[ iout ] )
-			{
-			   jInList = iout ;
-			}
-		     }
-
-		     int kInList = kDefault ;
-		     for( size_t kout = 0 ;
-			  kout < outputRefs2.size() ; ++kout )
-		     {
-			if( refk == outputRefs2[ kout ] )
-			{
-			   kInList = kout ;
-			}
-		     }
-
-		     // If any object is not in the list, add it, and
-		     // record its index.
-		     if( iInList == kDefault )
-		     {
-			iInList = outputRefs1.size() ;
-			outputRefs1.push_back( refi );
-		     }
-		     
-		     if( jInList == kDefault )
-		     {
-			jInList = outputRefs1.size() ;
-			outputRefs1.push_back( refj );
-		     }
-
-		     if( kInList == kDefault )
-		     {
-			kInList = outputRefs2.size() ;
-			outputRefs2.push_back( refk );
-		     }
-
-		     // Record this object combination.
-		     l1extra::L1ParticleMap::L1IndexCombo combo ;
-		     combo.push_back( iInList ) ;
-		     combo.push_back( jInList ) ;
-		     combo.push_back( kInList ) ;
-		     combos.push_back( combo ) ;
-		  }
-	       }
-	    }
-	 }
+  // Use i+1 < inputRefs.size() instead of i < inputRefs.size()-1
+  // because i is unsigned, and if size() is 0, then RHS undefined.
+  for (size_t i = 0; i + 1 < inputRefs1.size(); ++i) {
+    const edm::Ref<TCollection1> &refi = inputRefs1[i];
+    if (refi.get()->et() >= etThreshold1) {
+      for (size_t j = i + 1; j < inputRefs1.size(); ++j) {
+        const edm::Ref<TCollection1> &refj = inputRefs1[j];
+        if (refj.get()->et() >= etThreshold1) {
+          for (size_t k = 0; k < inputRefs2.size(); ++k) {
+            const edm::Ref<TCollection2> &refk = inputRefs2[k];
+            if (refk.get()->et() >= etThreshold2) {
+              decision = true;
+
+              // If the three objects are already in the list, find
+              // their indices.
+              int iInList = kDefault;
+              int jInList = kDefault;
+
+              for (size_t iout = 0; iout < outputRefs1.size(); ++iout) {
+                if (refi == outputRefs1[iout]) {
+                  iInList = iout;
+                }
+
+                if (refj == outputRefs1[iout]) {
+                  jInList = iout;
+                }
+              }
+
+              int kInList = kDefault;
+              for (size_t kout = 0; kout < outputRefs2.size(); ++kout) {
+                if (refk == outputRefs2[kout]) {
+                  kInList = kout;
+                }
+              }
+
+              // If any object is not in the list, add it, and
+              // record its index.
+              if (iInList == kDefault) {
+                iInList = outputRefs1.size();
+                outputRefs1.push_back(refi);
+              }
+
+              if (jInList == kDefault) {
+                jInList = outputRefs1.size();
+                outputRefs1.push_back(refj);
+              }
+
+              if (kInList == kDefault) {
+                kInList = outputRefs2.size();
+                outputRefs2.push_back(refk);
+              }
+
+              // Record this object combination.
+              l1extra::L1ParticleMap::L1IndexCombo combo;
+              combo.push_back(iInList);
+              combo.push_back(jInList);
+              combo.push_back(kInList);
+              combos.push_back(combo);
+            }
+          }
+        }
       }
-   }
+    }
+  }
 }
 
-
-template< class TCollection >
-void
-L1ExtraParticleMapProd::evaluateQuadSameObjectTrigger(
-   const std::vector< edm::Ref< TCollection > >& inputRefs, // input
-   const double& etThreshold,                               // input
-   bool& decision,                                          // output
-   std::vector< edm::Ref< TCollection > >& outputRefs,      // output
-   l1extra::L1ParticleMap::L1IndexComboVector& combos )     // output
+template <class TCollection>
+void L1ExtraParticleMapProd::evaluateQuadSameObjectTrigger(
+    const std::vector<edm::Ref<TCollection>> &inputRefs, // input
+    const double &etThreshold,                           // input
+    bool &decision,                                      // output
+    std::vector<edm::Ref<TCollection>> &outputRefs,      // output
+    l1extra::L1ParticleMap::L1IndexComboVector &combos)  // output
 {
-   // Use i+3 < inputRefs.size() instead of i < inputRefs.size()-3
-   // because i is unsigned, and if size() is 0, then RHS undefined.
-   for( size_t i = 0 ; i+3 < inputRefs.size() ; ++i )
-   {
-      const edm::Ref< TCollection >& refi = inputRefs[ i ] ;
-      if( refi.get()->et() >= etThreshold )
-      {
-	 for( size_t j = i+1 ; j+2 < inputRefs.size() ; ++j )
-	 {
-	    const edm::Ref< TCollection >& refj = inputRefs[ j ] ;
-	    if( refj.get()->et() >= etThreshold )
-	    {
-	       for( size_t k = j+1 ; k+1 < inputRefs.size() ; ++k )
-	       {
-		  const edm::Ref< TCollection >& refk = inputRefs[ k ] ;
-		  if( refk.get()->et() >= etThreshold )
-		  {
-		     for( size_t p = k+1 ; p < inputRefs.size() ; ++p )
-		     {
-			const edm::Ref< TCollection >& refp = inputRefs[ p ] ;
-			if( refp.get()->et() >= etThreshold )
-			{
-			   decision = true ;
-
-			   // If the objects are already in the list, find
-			   // their indices.
-			   int iInList = kDefault ;
-			   int jInList = kDefault ;
-			   int kInList = kDefault ;
-			   int pInList = kDefault ;
-			   for( size_t iout = 0 ;
-				iout < outputRefs.size() ; ++iout )
-			   {
-			      if( refi == outputRefs[ iout ] )
-			      {
-				 iInList = iout ;
-			      }
-
-			      if( refj == outputRefs[ iout ] )
-			      {
-				 jInList = iout ;
-			      }
-
-			      if( refk == outputRefs[ iout ] )
-			      {
-				 kInList = iout ;
-			      }
-
-			      if( refp == outputRefs[ iout ] )
-			      {
-				 pInList = iout ;
-			      }
-			   }
-
-			   // If any object is not in the list, add it, and
-			   // record its index.
-			   if( iInList == kDefault )
-			   {
-			      iInList = outputRefs.size() ;
-			      outputRefs.push_back( refi ) ;
-			   }
-		     
-			   if( jInList == kDefault )
-			   {
-			      jInList = outputRefs.size() ;
-			      outputRefs.push_back( refj ) ;
-			   }
-
-			   if( kInList == kDefault )
-			   {
-			      kInList = outputRefs.size() ;
-			      outputRefs.push_back( refk ) ;
-			   }
-
-			   if( pInList == kDefault )
-			   {
-			      pInList = outputRefs.size() ;
-			      outputRefs.push_back( refp ) ;
-			   }
-
-			   // Record this object combination.
-			   l1extra::L1ParticleMap::L1IndexCombo combo ;
-			   combo.push_back( iInList ) ;
-			   combo.push_back( jInList ) ;
-			   combo.push_back( kInList ) ;
-			   combo.push_back( pInList ) ;
-			   combos.push_back( combo ) ;
-			}
-		     }
-		  }
-	       }
-	    }
-	 }
+  // Use i+3 < inputRefs.size() instead of i < inputRefs.size()-3
+  // because i is unsigned, and if size() is 0, then RHS undefined.
+  for (size_t i = 0; i + 3 < inputRefs.size(); ++i) {
+    const edm::Ref<TCollection> &refi = inputRefs[i];
+    if (refi.get()->et() >= etThreshold) {
+      for (size_t j = i + 1; j + 2 < inputRefs.size(); ++j) {
+        const edm::Ref<TCollection> &refj = inputRefs[j];
+        if (refj.get()->et() >= etThreshold) {
+          for (size_t k = j + 1; k + 1 < inputRefs.size(); ++k) {
+            const edm::Ref<TCollection> &refk = inputRefs[k];
+            if (refk.get()->et() >= etThreshold) {
+              for (size_t p = k + 1; p < inputRefs.size(); ++p) {
+                const edm::Ref<TCollection> &refp = inputRefs[p];
+                if (refp.get()->et() >= etThreshold) {
+                  decision = true;
+
+                  // If the objects are already in the list, find
+                  // their indices.
+                  int iInList = kDefault;
+                  int jInList = kDefault;
+                  int kInList = kDefault;
+                  int pInList = kDefault;
+                  for (size_t iout = 0; iout < outputRefs.size(); ++iout) {
+                    if (refi == outputRefs[iout]) {
+                      iInList = iout;
+                    }
+
+                    if (refj == outputRefs[iout]) {
+                      jInList = iout;
+                    }
+
+                    if (refk == outputRefs[iout]) {
+                      kInList = iout;
+                    }
+
+                    if (refp == outputRefs[iout]) {
+                      pInList = iout;
+                    }
+                  }
+
+                  // If any object is not in the list, add it, and
+                  // record its index.
+                  if (iInList == kDefault) {
+                    iInList = outputRefs.size();
+                    outputRefs.push_back(refi);
+                  }
+
+                  if (jInList == kDefault) {
+                    jInList = outputRefs.size();
+                    outputRefs.push_back(refj);
+                  }
+
+                  if (kInList == kDefault) {
+                    kInList = outputRefs.size();
+                    outputRefs.push_back(refk);
+                  }
+
+                  if (pInList == kDefault) {
+                    pInList = outputRefs.size();
+                    outputRefs.push_back(refp);
+                  }
+
+                  // Record this object combination.
+                  l1extra::L1ParticleMap::L1IndexCombo combo;
+                  combo.push_back(iInList);
+                  combo.push_back(jInList);
+                  combo.push_back(kInList);
+                  combo.push_back(pInList);
+                  combos.push_back(combo);
+                }
+              }
+            }
+          }
+        }
       }
-   }
+    }
+  }
 }
 
-
-template< class TCollection1, class TCollection2 >
-void
-L1ExtraParticleMapProd::evaluateDoubleDifferentObjectTrigger(
-   const std::vector< edm::Ref< TCollection1 > >& inputRefs1, // input
-   const std::vector< edm::Ref< TCollection2 > >& inputRefs2, // input
-   const double& etThreshold1,                                // input
-   const double& etThreshold2,                                // input
-   bool& decision,                                            // output
-   std::vector< edm::Ref< TCollection1 > >& outputRefs1,      // output
-   std::vector< edm::Ref< TCollection2 > >& outputRefs2,      // output
-   l1extra::L1ParticleMap::L1IndexComboVector& combos )       // output
+template <class TCollection1, class TCollection2>
+void L1ExtraParticleMapProd::evaluateDoubleDifferentObjectTrigger(
+    const std::vector<edm::Ref<TCollection1>> &inputRefs1, // input
+    const std::vector<edm::Ref<TCollection2>> &inputRefs2, // input
+    const double &etThreshold1,                            // input
+    const double &etThreshold2,                            // input
+    bool &decision,                                        // output
+    std::vector<edm::Ref<TCollection1>> &outputRefs1,      // output
+    std::vector<edm::Ref<TCollection2>> &outputRefs2,      // output
+    l1extra::L1ParticleMap::L1IndexComboVector &combos)    // output
 {
-   for( size_t i = 0 ; i < inputRefs1.size() ; ++i )
-   {
-      const edm::Ref< TCollection1 >& refi = inputRefs1[ i ] ;
-      if( refi.get()->et() >= etThreshold1 )
-      {
-	 for( size_t j = 0 ; j < inputRefs2.size() ; ++j )
-	 {
-	    const edm::Ref< TCollection2 >& refj = inputRefs2[ j ] ;
-
-	    if( refj.get()->et() >= etThreshold2 )
-	    {
-	       decision = true ;
-
-	       // If the two objects are already in their respective lists,
-	       // find their indices.
-	       int iInList = kDefault ;
-	       for( size_t iout = 0 ; iout < outputRefs1.size() ; ++iout )
-	       {
-		  if( refi == outputRefs1[ iout ] )
-		  {
-		     iInList = iout ;
-		  }
-	       }
-
-	       int jInList = kDefault ;
-	       for( size_t jout = 0 ; jout < outputRefs2.size() ; ++jout )
-	       {
-		  if( refj == outputRefs2[ jout ] )
-		  {
-		     jInList = jout ;
-		  }
-	       }
-
-	       // If either object is not in the list, add it, and
-	       // record its index.
-	       if( iInList == kDefault )
-	       {
-		  iInList = outputRefs1.size() ;
-		  outputRefs1.push_back( refi ) ;
-	       }
-		     
-	       if( jInList == kDefault )
-	       {
-		  jInList = outputRefs2.size() ;
-		  outputRefs2.push_back( refj ) ;
-	       }
-
-	       // Record this object combination.
-	       l1extra::L1ParticleMap::L1IndexCombo combo ;
-	       combo.push_back( iInList ) ;
-	       combo.push_back( jInList ) ;
-	       combos.push_back( combo ) ;
-	    }
-	 }
+  for (size_t i = 0; i < inputRefs1.size(); ++i) {
+    const edm::Ref<TCollection1> &refi = inputRefs1[i];
+    if (refi.get()->et() >= etThreshold1) {
+      for (size_t j = 0; j < inputRefs2.size(); ++j) {
+        const edm::Ref<TCollection2> &refj = inputRefs2[j];
+
+        if (refj.get()->et() >= etThreshold2) {
+          decision = true;
+
+          // If the two objects are already in their respective lists,
+          // find their indices.
+          int iInList = kDefault;
+          for (size_t iout = 0; iout < outputRefs1.size(); ++iout) {
+            if (refi == outputRefs1[iout]) {
+              iInList = iout;
+            }
+          }
+
+          int jInList = kDefault;
+          for (size_t jout = 0; jout < outputRefs2.size(); ++jout) {
+            if (refj == outputRefs2[jout]) {
+              jInList = jout;
+            }
+          }
+
+          // If either object is not in the list, add it, and
+          // record its index.
+          if (iInList == kDefault) {
+            iInList = outputRefs1.size();
+            outputRefs1.push_back(refi);
+          }
+
+          if (jInList == kDefault) {
+            jInList = outputRefs2.size();
+            outputRefs2.push_back(refj);
+          }
+
+          // Record this object combination.
+          l1extra::L1ParticleMap::L1IndexCombo combo;
+          combo.push_back(iInList);
+          combo.push_back(jInList);
+          combos.push_back(combo);
+        }
       }
-   }
+    }
+  }
 }
 
-
-template< class TCollection >
-void
-L1ExtraParticleMapProd::evaluateDoubleDifferentObjectSameTypeTrigger(
-   const std::vector< edm::Ref< TCollection > >& inputRefs1, // input
-   const std::vector< edm::Ref< TCollection > >& inputRefs2, // input
-   const double& etThreshold1,                               // input
-   const double& etThreshold2,                               // input
-   bool& decision,                                           // output
-   std::vector< edm::Ref< TCollection > >& outputRefs,       // output
-   l1extra::L1ParticleMap::L1IndexComboVector& combos )      // output
+template <class TCollection>
+void L1ExtraParticleMapProd::evaluateDoubleDifferentObjectSameTypeTrigger(
+    const std::vector<edm::Ref<TCollection>> &inputRefs1, // input
+    const std::vector<edm::Ref<TCollection>> &inputRefs2, // input
+    const double &etThreshold1,                           // input
+    const double &etThreshold2,                           // input
+    bool &decision,                                       // output
+    std::vector<edm::Ref<TCollection>> &outputRefs,       // output
+    l1extra::L1ParticleMap::L1IndexComboVector &combos)   // output
 {
-   for( size_t i = 0 ; i < inputRefs1.size() ; ++i )
-   {
-      const edm::Ref< TCollection >& refi = inputRefs1[ i ] ;
-      if( refi.get()->et() >= etThreshold1 )
-      {
-	 for( size_t j = 0 ; j < inputRefs2.size() ; ++j )
-	 {
-	    const edm::Ref< TCollection >& refj = inputRefs2[ j ] ;
-
-	    if( refj.get()->et() >= etThreshold2 &&
-		refi != refj )
-	    {
-	       decision = true ;
-
-	       // If the two objects are already in their respective lists,
-	       // find their indices.
-	       int iInList = kDefault ;
-	       for( size_t iout = 0 ; iout < outputRefs.size() ; ++iout )
-	       {
-		  if( refi == outputRefs[ iout ] )
-		  {
-		     iInList = iout ;
-		  }
-	       }
-
-	       int jInList = kDefault ;
-	       for( size_t jout = 0 ; jout < outputRefs.size() ; ++jout )
-	       {
-		  if( refj == outputRefs[ jout ] )
-		  {
-		     jInList = jout ;
-		  }
-	       }
-
-	       // If either object is not in the list, add it, and
-	       // record its index.
-	       if( iInList == kDefault )
-	       {
-		  iInList = outputRefs.size() ;
-		  outputRefs.push_back( refi ) ;
-	       }
-		     
-	       if( jInList == kDefault )
-	       {
-		  jInList = outputRefs.size() ;
-		  outputRefs.push_back( refj ) ;
-	       }
-
-	       // Record this object combination.
-	       l1extra::L1ParticleMap::L1IndexCombo combo ;
-	       combo.push_back( iInList ) ;
-	       combo.push_back( jInList ) ;
-	       combos.push_back( combo ) ;
-	    }
-	 }
+  for (size_t i = 0; i < inputRefs1.size(); ++i) {
+    const edm::Ref<TCollection> &refi = inputRefs1[i];
+    if (refi.get()->et() >= etThreshold1) {
+      for (size_t j = 0; j < inputRefs2.size(); ++j) {
+        const edm::Ref<TCollection> &refj = inputRefs2[j];
+
+        if (refj.get()->et() >= etThreshold2 && refi != refj) {
+          decision = true;
+
+          // If the two objects are already in their respective lists,
+          // find their indices.
+          int iInList = kDefault;
+          for (size_t iout = 0; iout < outputRefs.size(); ++iout) {
+            if (refi == outputRefs[iout]) {
+              iInList = iout;
+            }
+          }
+
+          int jInList = kDefault;
+          for (size_t jout = 0; jout < outputRefs.size(); ++jout) {
+            if (refj == outputRefs[jout]) {
+              jInList = jout;
+            }
+          }
+
+          // If either object is not in the list, add it, and
+          // record its index.
+          if (iInList == kDefault) {
+            iInList = outputRefs.size();
+            outputRefs.push_back(refi);
+          }
+
+          if (jInList == kDefault) {
+            jInList = outputRefs.size();
+            outputRefs.push_back(refj);
+          }
+
+          // Record this object combination.
+          l1extra::L1ParticleMap::L1IndexCombo combo;
+          combo.push_back(iInList);
+          combo.push_back(jInList);
+          combos.push_back(combo);
+        }
       }
-   }
+    }
+  }
 }
 
-void
-L1ExtraParticleMapProd::evaluateDoubleDifferentCaloObjectTrigger(
-   const l1extra::L1EmParticleVectorRef& inputRefs1,         // input
-   const l1extra::L1JetParticleVectorRef& inputRefs2,        // input
-   const double& etThreshold1,                                // input
-   const double& etThreshold2,                                // input
-   bool& decision,                                            // output
-   l1extra::L1EmParticleVectorRef& outputRefs1,               // output
-   l1extra::L1JetParticleVectorRef& outputRefs2,              // output
-   l1extra::L1ParticleMap::L1IndexComboVector& combos )       // output
+void L1ExtraParticleMapProd::evaluateDoubleDifferentCaloObjectTrigger(
+    const l1extra::L1EmParticleVectorRef &inputRefs1,   // input
+    const l1extra::L1JetParticleVectorRef &inputRefs2,  // input
+    const double &etThreshold1,                         // input
+    const double &etThreshold2,                         // input
+    bool &decision,                                     // output
+    l1extra::L1EmParticleVectorRef &outputRefs1,        // output
+    l1extra::L1JetParticleVectorRef &outputRefs2,       // output
+    l1extra::L1ParticleMap::L1IndexComboVector &combos) // output
 {
-   for( size_t i = 0 ; i < inputRefs1.size() ; ++i )
-   {
-      const l1extra::L1EmParticleRef& refi = inputRefs1[ i ] ;
-      if( refi.get()->et() >= etThreshold1 )
-      {
-	 for( size_t j = 0 ; j < inputRefs2.size() ; ++j )
-	 {
-	    const l1extra::L1JetParticleRef& refj = inputRefs2[ j ] ;
-
-	    // Check for identical region only if both HW objects are non-null.
-	    if( refj.get()->et() >= etThreshold2 &&
-		( refi.get()->gctEmCand() == nullptr ||
-		  refj.get()->gctJetCand() == nullptr ||
-		  refi.get()->gctEmCand()->regionId() !=
-		  refj.get()->gctJetCand()->regionId() ) )
-	    {
-	       decision = true ;
-
-	       // If the two objects are already in their respective lists,
-	       // find their indices.
-	       int iInList = kDefault ;
-	       for( size_t iout = 0 ; iout < outputRefs1.size() ; ++iout )
-	       {
-		  if( refi == outputRefs1[ iout ] )
-		  {
-		     iInList = iout ;
-		  }
-	       }
-
-	       int jInList = kDefault ;
-	       for( size_t jout = 0 ; jout < outputRefs2.size() ; ++jout )
-	       {
-		  if( refj == outputRefs2[ jout ] )
-		  {
-		     jInList = jout ;
-		  }
-	       }
-
-	       // If either object is not in the list, add it, and
-	       // record its index.
-	       if( iInList == kDefault )
-	       {
-		  iInList = outputRefs1.size() ;
-		  outputRefs1.push_back( refi ) ;
-	       }
-		     
-	       if( jInList == kDefault )
-	       {
-		  jInList = outputRefs2.size() ;
-		  outputRefs2.push_back( refj ) ;
-	       }
-
-	       // Record this object combination.
-	       l1extra::L1ParticleMap::L1IndexCombo combo ;
-	       combo.push_back( iInList ) ;
-	       combo.push_back( jInList ) ;
-	       combos.push_back( combo ) ;
-	    }
-	 }
+  for (size_t i = 0; i < inputRefs1.size(); ++i) {
+    const l1extra::L1EmParticleRef &refi = inputRefs1[i];
+    if (refi.get()->et() >= etThreshold1) {
+      for (size_t j = 0; j < inputRefs2.size(); ++j) {
+        const l1extra::L1JetParticleRef &refj = inputRefs2[j];
+
+        // Check for identical region only if both HW objects are non-null.
+        if (refj.get()->et() >= etThreshold2 &&
+            (refi.get()->gctEmCand() == nullptr ||
+             refj.get()->gctJetCand() == nullptr ||
+             refi.get()->gctEmCand()->regionId() !=
+                 refj.get()->gctJetCand()->regionId())) {
+          decision = true;
+
+          // If the two objects are already in their respective lists,
+          // find their indices.
+          int iInList = kDefault;
+          for (size_t iout = 0; iout < outputRefs1.size(); ++iout) {
+            if (refi == outputRefs1[iout]) {
+              iInList = iout;
+            }
+          }
+
+          int jInList = kDefault;
+          for (size_t jout = 0; jout < outputRefs2.size(); ++jout) {
+            if (refj == outputRefs2[jout]) {
+              jInList = jout;
+            }
+          }
+
+          // If either object is not in the list, add it, and
+          // record its index.
+          if (iInList == kDefault) {
+            iInList = outputRefs1.size();
+            outputRefs1.push_back(refi);
+          }
+
+          if (jInList == kDefault) {
+            jInList = outputRefs2.size();
+            outputRefs2.push_back(refj);
+          }
+
+          // Record this object combination.
+          l1extra::L1ParticleMap::L1IndexCombo combo;
+          combo.push_back(iInList);
+          combo.push_back(jInList);
+          combos.push_back(combo);
+        }
       }
-   }
+    }
+  }
 }
 
 // ok if both objects are above the threshold and are in opposite hemispheres
 void L1ExtraParticleMapProd::evaluateJetGapJetTrigger(
-   const l1extra::L1JetParticleVectorRef& inputRefs,        // input
-   const double& etThreshold,                               // input
-   bool& decision,                                          // output
-   l1extra::L1JetParticleVectorRef& outputRefs,             // output
-   l1extra::L1ParticleMap::L1IndexComboVector& combos )     // output
+    const l1extra::L1JetParticleVectorRef &inputRefs,   // input
+    const double &etThreshold,                          // input
+    bool &decision,                                     // output
+    l1extra::L1JetParticleVectorRef &outputRefs,        // output
+    l1extra::L1ParticleMap::L1IndexComboVector &combos) // output
 {
-   // Use i+1 < inputRefs.size() instead of i < inputRefs.size()-1
-   // because i is unsigned, and if size() is 0, then RHS undefined.
-   for( size_t i = 0 ; i+1 < inputRefs.size() ; ++i )
-   {
-      const l1extra::L1JetParticleRef& refi = inputRefs[ i ] ;
-      if( refi.get()->et() >= etThreshold )
-      {
-         for( size_t j = i+1 ; j < inputRefs.size() ; ++j )
-         {
-            const l1extra::L1JetParticleRef& refj = inputRefs[ j ] ;
-            if( ( refj.get()->et() >= etThreshold ) &&
-                ( ( ( refi.get()->eta() < 0. ) && ( refj.get()->eta() > 0. ) )
-		  ||
-		  ( ( refi.get()->eta() > 0. ) && ( refj.get()->eta() < 0. ) )
-		  )
-		)
-            {
-               decision = true ;
-
-               // If the two objects are already in the list, find
-               // their indices.
-               int iInList = kDefault ;
-               int jInList = kDefault ;
-               for( size_t iout = 0 ; iout < outputRefs.size() ; ++iout )
-               {
-                  if( refi == outputRefs[ iout ] )
-                  {
-                     iInList = iout ;
-                  }
+  // Use i+1 < inputRefs.size() instead of i < inputRefs.size()-1
+  // because i is unsigned, and if size() is 0, then RHS undefined.
+  for (size_t i = 0; i + 1 < inputRefs.size(); ++i) {
+    const l1extra::L1JetParticleRef &refi = inputRefs[i];
+    if (refi.get()->et() >= etThreshold) {
+      for (size_t j = i + 1; j < inputRefs.size(); ++j) {
+        const l1extra::L1JetParticleRef &refj = inputRefs[j];
+        if ((refj.get()->et() >= etThreshold) &&
+            (((refi.get()->eta() < 0.) && (refj.get()->eta() > 0.)) ||
+             ((refi.get()->eta() > 0.) && (refj.get()->eta() < 0.)))) {
+          decision = true;
+
+          // If the two objects are already in the list, find
+          // their indices.
+          int iInList = kDefault;
+          int jInList = kDefault;
+          for (size_t iout = 0; iout < outputRefs.size(); ++iout) {
+            if (refi == outputRefs[iout]) {
+              iInList = iout;
+            }
 
-                  if( refj == outputRefs[ iout ] )
-                  {
-                     jInList = iout ;
-                  }
-               }
-
-               // If either object is not in the list, add it, and
-               // record its index.
-               if( iInList == kDefault )
-               {
-                  iInList = outputRefs.size() ;
-                  outputRefs.push_back( refi ) ;
-               }
-
-               if( jInList == kDefault )
-               {
-                  jInList = outputRefs.size() ;
-                  outputRefs.push_back( refj ) ;
-               }
-
-               // Record this object combination.
-               l1extra::L1ParticleMap::L1IndexCombo combo ;
-               combo.push_back( iInList ) ;
-               combo.push_back( jInList ) ;
-               combos.push_back( combo ) ;
+            if (refj == outputRefs[iout]) {
+              jInList = iout;
             }
-         }
-      }
-   }
-}
+          }
 
+          // If either object is not in the list, add it, and
+          // record its index.
+          if (iInList == kDefault) {
+            iInList = outputRefs.size();
+            outputRefs.push_back(refi);
+          }
 
-// veto if both forward regions see some jet with e_T > threshold
-void
-L1ExtraParticleMapProd::evaluateForwardRapidityGap(
-   const l1extra::L1JetParticleVectorRef& inputRefs,        // input
-   const double& etThreshold,                               // input
-   bool& decision                                           // output
-   )
-{
-   decision = true;
-
-   // search for forward pair
-   for( size_t k = 0 ; k+1 < inputRefs.size() ; ++k )
-   {
-      const l1extra::L1JetParticleRef& refk = inputRefs[ k ] ;
-      double etak = refk.get()->eta();
-      if( ( refk.get()->type() == l1extra::L1JetParticle::kForward ) &&
-          ( refk.get()->et()   >= etThreshold ) )
-      {
-          for( size_t l = k+1 ; l < inputRefs.size() ; ++l )
-          {
-             const l1extra::L1JetParticleRef& refl = inputRefs[ l ] ;
-             double etal = refl.get()->eta();
-             if( (refl.get()->type()==l1extra::L1JetParticle::kForward) &&
-                 (refl.get()->et()  >= etThreshold    ) &&
-                 ((etak>0 && etal<0) || (etak<0 && etal>0))    )
-             {
-                 decision = false ;
-                 return ;// no need for going further -- for a faster algorithm
-             }
+          if (jInList == kDefault) {
+            jInList = outputRefs.size();
+            outputRefs.push_back(refj);
           }
+
+          // Record this object combination.
+          l1extra::L1ParticleMap::L1IndexCombo combo;
+          combo.push_back(iInList);
+          combo.push_back(jInList);
+          combos.push_back(combo);
+        }
       }
-   }
+    }
+  }
 }
 
-void
-L1ExtraParticleMapProd::evaluateDoubleExclusiveIsoEG(
-   const l1extra::L1EmParticleVectorRef& inputRefs1,         // input
-   const l1extra::L1JetParticleVectorRef& inputRefs2,        // input
-   const double& etThreshold1,                                // input
-   const double& etThreshold2,                                // input
-   bool& decision,                                            // output
-   l1extra::L1EmParticleVectorRef& outputRefs1,               // output
-   l1extra::L1ParticleMap::L1IndexComboVector& combos )       // output
-{
-   if ( inputRefs1.size() ==2 )
-      {  // 2 iso EG
-         decision=true;
-         if (!inputRefs2.empty())
-            {   // should veto if there are jets, with pt>thresh
-               for( size_t j = 0 ; j < inputRefs2.size() ; ++j )
-                  {
-                     if(inputRefs2[j].get()->gctJetCand()->regionId() ==
-			inputRefs1[0].get()->gctEmCand()->regionId())continue;
-                     if(inputRefs2[j].get()->gctJetCand()->regionId() ==
-			inputRefs1[1].get()->gctEmCand()->regionId())continue;
-                     if(inputRefs2[j].get()->et( )> etThreshold2  ) {
-		       decision=false; break; }
-		     // break : for a faster algorithm
-                  }
-            }
-         if(decision)
-           {   // threshold evaluation for the Exclusive double isoEG
-              decision = false;
-              evaluateDoubleSameObjectTrigger( inputRefs1,
-                                               etThreshold1,
-                                               decision,
-                                               outputRefs1,
-                                               combos ) ;
-           }
-      }
+// veto if both forward regions see some jet with e_T > threshold
+void L1ExtraParticleMapProd::evaluateForwardRapidityGap(
+    const l1extra::L1JetParticleVectorRef &inputRefs, // input
+    const double &etThreshold,                        // input
+    bool &decision                                    // output
+) {
+  decision = true;
+
+  // search for forward pair
+  for (size_t k = 0; k + 1 < inputRefs.size(); ++k) {
+    const l1extra::L1JetParticleRef &refk = inputRefs[k];
+    double etak = refk.get()->eta();
+    if ((refk.get()->type() == l1extra::L1JetParticle::kForward) &&
+        (refk.get()->et() >= etThreshold)) {
+      for (size_t l = k + 1; l < inputRefs.size(); ++l) {
+        const l1extra::L1JetParticleRef &refl = inputRefs[l];
+        double etal = refl.get()->eta();
+        if ((refl.get()->type() == l1extra::L1JetParticle::kForward) &&
+            (refl.get()->et() >= etThreshold) &&
+            ((etak > 0 && etal < 0) || (etak < 0 && etal > 0))) {
+          decision = false;
+          return; // no need for going further -- for a faster algorithm
+        }
+      }
+    }
+  }
 }
 
+void L1ExtraParticleMapProd::evaluateDoubleExclusiveIsoEG(
+    const l1extra::L1EmParticleVectorRef &inputRefs1,   // input
+    const l1extra::L1JetParticleVectorRef &inputRefs2,  // input
+    const double &etThreshold1,                         // input
+    const double &etThreshold2,                         // input
+    bool &decision,                                     // output
+    l1extra::L1EmParticleVectorRef &outputRefs1,        // output
+    l1extra::L1ParticleMap::L1IndexComboVector &combos) // output
+{
+  if (inputRefs1.size() == 2) { // 2 iso EG
+    decision = true;
+    if (!inputRefs2.empty()) { // should veto if there are jets, with pt>thresh
+      for (size_t j = 0; j < inputRefs2.size(); ++j) {
+        if (inputRefs2[j].get()->gctJetCand()->regionId() ==
+            inputRefs1[0].get()->gctEmCand()->regionId())
+          continue;
+        if (inputRefs2[j].get()->gctJetCand()->regionId() ==
+            inputRefs1[1].get()->gctEmCand()->regionId())
+          continue;
+        if (inputRefs2[j].get()->et() > etThreshold2) {
+          decision = false;
+          break;
+        }
+        // break : for a faster algorithm
+      }
+    }
+    if (decision) { // threshold evaluation for the Exclusive double isoEG
+      decision = false;
+      evaluateDoubleSameObjectTrigger(inputRefs1, etThreshold1, decision,
+                                      outputRefs1, combos);
+    }
+  }
+}
 
-//define this as a plug-in
-//DEFINE_FWK_MODULE(L1ExtraParticleMapProd);
+// define this as a plug-in
+// DEFINE_FWK_MODULE(L1ExtraParticleMapProd);
diff --git a/L1Trigger/L1ExtraFromDigis/src/L1ExtraParticlesProd.cc b/L1Trigger/L1ExtraFromDigis/src/L1ExtraParticlesProd.cc
index 1bf903fb74ed6..69c614c33f35d 100644
--- a/L1Trigger/L1ExtraFromDigis/src/L1ExtraParticlesProd.cc
+++ b/L1Trigger/L1ExtraFromDigis/src/L1ExtraParticlesProd.cc
@@ -2,16 +2,16 @@
 //
 // Package:    L1ExtraParticlesProd
 // Class:      L1ExtraParticlesProd
-// 
-/**\class L1ExtraParticlesProd \file L1ExtraParticlesProd.cc src/L1ExtraParticlesProd/src/L1ExtraParticlesProd.cc
-*/
+//
+/**\class L1ExtraParticlesProd \file L1ExtraParticlesProd.cc
+ * src/L1ExtraParticlesProd/src/L1ExtraParticlesProd.cc
+ */
 //
 // Original Author:  Werner Sun
 //         Created:  Mon Oct  2 22:45:32 EDT 2006
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -22,24 +22,24 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "DataFormats/Common/interface/OrphanHandle.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 
-#include "CondFormats/L1TObjects/interface/L1CaloGeometry.h"
 #include "CondFormats/DataRecord/interface/L1CaloGeometryRecord.h"
+#include "CondFormats/L1TObjects/interface/L1CaloGeometry.h"
 
-#include "CondFormats/L1TObjects/interface/L1CaloEtScale.h"
 #include "CondFormats/DataRecord/interface/L1EmEtScaleRcd.h"
-#include "CondFormats/DataRecord/interface/L1JetEtScaleRcd.h"
-#include "CondFormats/DataRecord/interface/L1HtMissScaleRcd.h"
+#include "CondFormats/DataRecord/interface/L1GctJetFinderParamsRcd.h"
 #include "CondFormats/DataRecord/interface/L1HfRingEtScaleRcd.h"
+#include "CondFormats/DataRecord/interface/L1HtMissScaleRcd.h"
+#include "CondFormats/DataRecord/interface/L1JetEtScaleRcd.h"
+#include "CondFormats/L1TObjects/interface/L1CaloEtScale.h"
 #include "CondFormats/L1TObjects/interface/L1GctJetFinderParams.h"
-#include "CondFormats/DataRecord/interface/L1GctJetFinderParamsRcd.h"
 
-#include "CondFormats/L1TObjects/interface/L1MuTriggerScales.h"
+#include "CondFormats/DataRecord/interface/L1MuTriggerPtScaleRcd.h"
 #include "CondFormats/DataRecord/interface/L1MuTriggerScalesRcd.h"
 #include "CondFormats/L1TObjects/interface/L1MuTriggerPtScale.h"
-#include "CondFormats/DataRecord/interface/L1MuTriggerPtScaleRcd.h"
+#include "CondFormats/L1TObjects/interface/L1MuTriggerScales.h"
 #include "DataFormats/L1GlobalMuonTrigger/interface/L1MuGMTReadoutCollection.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -50,7 +50,6 @@
 // class decleration
 //
 
-
 //
 // constants, enums and typedefs
 //
@@ -59,1102 +58,907 @@
 // static data member definitions
 //
 
-double const L1ExtraParticlesProd::muonMassGeV_ = 0.105658369 ; // PDG06
+double const L1ExtraParticlesProd::muonMassGeV_ = 0.105658369; // PDG06
 
 //
 // constructors and destructor
 //
-L1ExtraParticlesProd::L1ExtraParticlesProd(const edm::ParameterSet& iConfig)
-   : produceMuonParticles_( iConfig.getParameter< bool >(
-      "produceMuonParticles" ) ),
-     muonSource_( iConfig.getParameter< edm::InputTag >(
-	"muonSource" ) ),
-     produceCaloParticles_( iConfig.getParameter< bool >(
-	"produceCaloParticles" ) ),
-     isoEmSource_( iConfig.getParameter< edm::InputTag >(
-	"isolatedEmSource" ) ),
-     nonIsoEmSource_( iConfig.getParameter< edm::InputTag >(
-	"nonIsolatedEmSource" ) ),
-     cenJetSource_( iConfig.getParameter< edm::InputTag >(
-	"centralJetSource" ) ),
-     forJetSource_( iConfig.getParameter< edm::InputTag >(
-	"forwardJetSource" ) ),
-     tauJetSource_( iConfig.getParameter< edm::InputTag >(
-	"tauJetSource" ) ),
-     isoTauJetSource_( iConfig.getParameter< edm::InputTag >(
-	"isoTauJetSource" ) ),
-     etTotSource_( iConfig.getParameter< edm::InputTag >(
-	"etTotalSource" ) ),
-     etHadSource_( iConfig.getParameter< edm::InputTag >(
-	"etHadSource" ) ),
-     etMissSource_( iConfig.getParameter< edm::InputTag >(
-	"etMissSource" ) ),
-     htMissSource_( iConfig.getParameter< edm::InputTag >(
-	"htMissSource" ) ),
-     hfRingEtSumsSource_( iConfig.getParameter< edm::InputTag >(
-	"hfRingEtSumsSource" ) ),
-     hfRingBitCountsSource_( iConfig.getParameter< edm::InputTag >(
-	"hfRingBitCountsSource" ) ),
-     centralBxOnly_( iConfig.getParameter< bool >( "centralBxOnly" ) ),
-     ignoreHtMiss_( iConfig.getParameter< bool >( "ignoreHtMiss" ) )
-{
-   using namespace l1extra ;
-
-   //register your products
-   produces< L1EmParticleCollection >( "Isolated" ) ;
-   produces< L1EmParticleCollection >( "NonIsolated" ) ;
-   produces< L1JetParticleCollection >( "Central" ) ;
-   produces< L1JetParticleCollection >( "Forward" ) ;
-   produces< L1JetParticleCollection >( "Tau" ) ;
-   produces< L1JetParticleCollection >( "IsoTau" ) ;
-   produces< L1MuonParticleCollection >() ;
-   produces< L1EtMissParticleCollection >( "MET" ) ;
-   produces< L1EtMissParticleCollection >( "MHT" ) ;
-   produces< L1HFRingsCollection >() ;
-
-   //now do what ever other initialization is needed
-   consumes<L1MuGMTReadoutCollection>(muonSource_);
-   consumes<L1GctEmCandCollection>(isoEmSource_);
-   consumes<L1GctEmCandCollection>(nonIsoEmSource_);
-   consumes<L1GctJetCandCollection>(cenJetSource_);
-   consumes<L1GctJetCandCollection>(forJetSource_);
-   consumes<L1GctJetCandCollection>(tauJetSource_);
-   consumes<L1GctJetCandCollection>(isoTauJetSource_);
-   consumes<L1GctEtTotalCollection>(etTotSource_);
-   consumes<L1GctEtMissCollection>(etMissSource_);
-   consumes<L1GctEtHadCollection>(etHadSource_);
-   consumes<L1GctHtMissCollection>(htMissSource_);
-   consumes<L1GctHFRingEtSumsCollection>(hfRingEtSumsSource_);
-   consumes<L1GctHFBitCountsCollection>(hfRingBitCountsSource_);
+L1ExtraParticlesProd::L1ExtraParticlesProd(const edm::ParameterSet &iConfig)
+    : produceMuonParticles_(iConfig.getParameter<bool>("produceMuonParticles")),
+      muonSource_(iConfig.getParameter<edm::InputTag>("muonSource")),
+      produceCaloParticles_(iConfig.getParameter<bool>("produceCaloParticles")),
+      isoEmSource_(iConfig.getParameter<edm::InputTag>("isolatedEmSource")),
+      nonIsoEmSource_(
+          iConfig.getParameter<edm::InputTag>("nonIsolatedEmSource")),
+      cenJetSource_(iConfig.getParameter<edm::InputTag>("centralJetSource")),
+      forJetSource_(iConfig.getParameter<edm::InputTag>("forwardJetSource")),
+      tauJetSource_(iConfig.getParameter<edm::InputTag>("tauJetSource")),
+      isoTauJetSource_(iConfig.getParameter<edm::InputTag>("isoTauJetSource")),
+      etTotSource_(iConfig.getParameter<edm::InputTag>("etTotalSource")),
+      etHadSource_(iConfig.getParameter<edm::InputTag>("etHadSource")),
+      etMissSource_(iConfig.getParameter<edm::InputTag>("etMissSource")),
+      htMissSource_(iConfig.getParameter<edm::InputTag>("htMissSource")),
+      hfRingEtSumsSource_(
+          iConfig.getParameter<edm::InputTag>("hfRingEtSumsSource")),
+      hfRingBitCountsSource_(
+          iConfig.getParameter<edm::InputTag>("hfRingBitCountsSource")),
+      centralBxOnly_(iConfig.getParameter<bool>("centralBxOnly")),
+      ignoreHtMiss_(iConfig.getParameter<bool>("ignoreHtMiss")) {
+  using namespace l1extra;
+
+  // register your products
+  produces<L1EmParticleCollection>("Isolated");
+  produces<L1EmParticleCollection>("NonIsolated");
+  produces<L1JetParticleCollection>("Central");
+  produces<L1JetParticleCollection>("Forward");
+  produces<L1JetParticleCollection>("Tau");
+  produces<L1JetParticleCollection>("IsoTau");
+  produces<L1MuonParticleCollection>();
+  produces<L1EtMissParticleCollection>("MET");
+  produces<L1EtMissParticleCollection>("MHT");
+  produces<L1HFRingsCollection>();
+
+  // now do what ever other initialization is needed
+  consumes<L1MuGMTReadoutCollection>(muonSource_);
+  consumes<L1GctEmCandCollection>(isoEmSource_);
+  consumes<L1GctEmCandCollection>(nonIsoEmSource_);
+  consumes<L1GctJetCandCollection>(cenJetSource_);
+  consumes<L1GctJetCandCollection>(forJetSource_);
+  consumes<L1GctJetCandCollection>(tauJetSource_);
+  consumes<L1GctJetCandCollection>(isoTauJetSource_);
+  consumes<L1GctEtTotalCollection>(etTotSource_);
+  consumes<L1GctEtMissCollection>(etMissSource_);
+  consumes<L1GctEtHadCollection>(etHadSource_);
+  consumes<L1GctHtMissCollection>(htMissSource_);
+  consumes<L1GctHFRingEtSumsCollection>(hfRingEtSumsSource_);
+  consumes<L1GctHFBitCountsCollection>(hfRingBitCountsSource_);
 }
 
+L1ExtraParticlesProd::~L1ExtraParticlesProd() {
 
-L1ExtraParticlesProd::~L1ExtraParticlesProd()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-L1ExtraParticlesProd::produce( edm::Event& iEvent,
-			       const edm::EventSetup& iSetup)
-{
-   using namespace edm ;
-   using namespace l1extra ;
-   using namespace std ;
-
-   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   // ~~~~~~~~~~~~~~~~~~~~ Muons ~~~~~~~~~~~~~~~~~~~~
-   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-   unique_ptr< L1MuonParticleCollection > muColl(
-     new L1MuonParticleCollection );
-
-   if( produceMuonParticles_ )
-   {
-      ESHandle< L1MuTriggerScales > muScales ;
-      iSetup.get< L1MuTriggerScalesRcd >().get( muScales ) ;
-
-      ESHandle< L1MuTriggerPtScale > muPtScale ;
-      iSetup.get< L1MuTriggerPtScaleRcd >().get( muPtScale ) ;
-
-      Handle< L1MuGMTReadoutCollection > hwMuCollection ;
-      iEvent.getByLabel( muonSource_, hwMuCollection ) ;
-
-      vector< L1MuGMTExtendedCand > hwMuCands ;
-
-      if( !hwMuCollection.isValid() )
-	{
-	  LogDebug("L1ExtraParticlesProd")
-	    << "\nWarning: L1MuGMTReadoutCollection with " << muonSource_
-	    << "\nrequested in configuration, but not found in the event."
-	    << std::endl;
-	}
-      else
-	{
-	  if( centralBxOnly_ )
-	    {
-	      // Get GMT candidates from central bunch crossing only
-	      hwMuCands = hwMuCollection->getRecord().getGMTCands() ;
-	    }
-	  else
-	    {
-	      // Get GMT candidates from all bunch crossings
-	      vector< L1MuGMTReadoutRecord > records = hwMuCollection->getRecords();
-	      vector< L1MuGMTReadoutRecord >::const_iterator rItr = records.begin();
-	      vector< L1MuGMTReadoutRecord >::const_iterator rEnd = records.end();
-
-	      for( ; rItr != rEnd ; ++rItr )
-		{
-		  vector< L1MuGMTExtendedCand > tmpCands = rItr->getGMTCands() ;
-
-		  hwMuCands.insert( hwMuCands.end(),
-				    tmpCands.begin(),
-				    tmpCands.end() ) ;
-		}
-	    }
-
-//       cout << "HW muons" << endl ;
-	  vector< L1MuGMTExtendedCand >::const_iterator muItr = hwMuCands.begin() ;
-	  vector< L1MuGMTExtendedCand >::const_iterator muEnd = hwMuCands.end() ;
-	  for( int i = 0 ; muItr != muEnd ; ++muItr, ++i )
-	    {
-// 	 cout << "#" << i
-// 	      << " name " << muItr->name()
-// 	      << " empty " << muItr->empty()
-// 	      << " pt " << muItr->ptIndex()
-// 	      << " eta " << muItr->etaIndex()
-// 	      << " phi " << muItr->phiIndex()
-// 	      << " iso " << muItr->isol()
-// 	      << " mip " << muItr->mip()
-// 	      << " bx " << muItr->bx()
-// 	      << endl ;
-
-	      if( !muItr->empty() )
-		{
-		  // keep x and y components non-zero and protect against roundoff.
-		  double pt =
-		    muPtScale->getPtScale()->getLowEdge( muItr->ptIndex() ) + 1.e-6 ;
-
-// 	    cout << "L1Extra pt " << pt << endl ;
-
-		  double eta =
-		    muScales->getGMTEtaScale()->getCenter( muItr->etaIndex() ) ;
-
-		  double phi =
-		    muScales->getPhiScale()->getLowEdge( muItr->phiIndex() ) ;
-
-		  math::PtEtaPhiMLorentzVector p4( pt,
-						   eta,
-						   phi,
-						   muonMassGeV_ ) ;
-
-		  muColl->push_back(
-				    L1MuonParticle( muItr->charge(),
-						    p4,
-						    *muItr,
-						    muItr->bx() )
-				    ) ;
-		}
-	    }
-	}
-   }
-   
-   OrphanHandle< L1MuonParticleCollection > muHandle =
-     iEvent.put(std::move(muColl ));
-
-
-   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   // ~~~~~~~~~~~~~~~~~~~~ Calorimeter ~~~~~~~~~~~~~~~~~~~~
-   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-   unique_ptr< L1EmParticleCollection > isoEmColl(
-      new L1EmParticleCollection );
-
-   unique_ptr< L1EmParticleCollection > nonIsoEmColl(
-      new L1EmParticleCollection );
-
-   unique_ptr< L1JetParticleCollection > cenJetColl(
-      new L1JetParticleCollection );
-
-   unique_ptr< L1JetParticleCollection > forJetColl(
-      new L1JetParticleCollection );
-
-   unique_ptr< L1JetParticleCollection > tauJetColl(
-      new L1JetParticleCollection );
-
-   unique_ptr< L1JetParticleCollection > isoTauJetColl(
-      new L1JetParticleCollection );
-
-   unique_ptr< L1EtMissParticleCollection > etMissColl(
-      new L1EtMissParticleCollection );
-
-   unique_ptr< L1EtMissParticleCollection > htMissColl(
-      new L1EtMissParticleCollection );
-
-   unique_ptr< L1HFRingsCollection > hfRingsColl( new L1HFRingsCollection );
-
-   if( produceCaloParticles_ )
-   {
-      // ~~~~~~~~~~~~~~~~~~~~ Geometry ~~~~~~~~~~~~~~~~~~~~
-
-      ESHandle< L1CaloGeometry > caloGeomESH ;
-      iSetup.get< L1CaloGeometryRecord >().get( caloGeomESH ) ;
-      const L1CaloGeometry* caloGeom = &( *caloGeomESH ) ;
-
-      // ~~~~~~~~~~~~~~~~~~~~ EM ~~~~~~~~~~~~~~~~~~~~
-
-      ESHandle< L1CaloEtScale > emScale ;
-      iSetup.get< L1EmEtScaleRcd >().get( emScale ) ;
-
-      // Isolated EM
-      Handle< L1GctEmCandCollection > hwIsoEmCands ;
-      iEvent.getByLabel( isoEmSource_, hwIsoEmCands ) ;
-
-      if( !hwIsoEmCands.isValid() )
-	{
-	  LogDebug("L1ExtraParticlesProd")
-	    << "\nWarning: L1GctEmCandCollection with " << isoEmSource_
-	    << "\nrequested in configuration, but not found in the event."
-	    << std::endl;
-	}
-      else
-	{
-//       cout << "HW iso EM" << endl ;
-
-	  L1GctEmCandCollection::const_iterator emItr = hwIsoEmCands->begin() ;
-	  L1GctEmCandCollection::const_iterator emEnd = hwIsoEmCands->end() ;
-	  for( int i = 0 ; emItr != emEnd ; ++emItr, ++i )
-	    {
-// 	 cout << "#" << i
-// 	      << " name " << emItr->name()
-// 	      << " empty " << emItr->empty()
-// 	      << " rank " << emItr->rank()
-// 	      << " eta " << emItr->etaIndex()
-// 	      << " sign " << emItr->etaSign()
-// 	      << " phi " << emItr->phiIndex()
-// 	      << " iso " << emItr->isolated()
-// 	      << " bx " << emItr->bx()
-// 	      << endl ;
-
-	      if( !emItr->empty() &&
-		  ( !centralBxOnly_ || emItr->bx() == 0 ) )
-		{
-		  double et = emScale->et( emItr->rank() ) ;
-
-// 	    cout << "L1Extra et " << et << endl ;
-
-		  isoEmColl->push_back(
-				       L1EmParticle( gctLorentzVector( et, *emItr, caloGeom, true ),
-						     Ref< L1GctEmCandCollection >( hwIsoEmCands,
-										   i ),
-						     emItr->bx() ) ) ;
-		}
-	    }
-	}
-
-
-      // Non-isolated EM
-      Handle< L1GctEmCandCollection > hwNonIsoEmCands ;
-      iEvent.getByLabel( nonIsoEmSource_, hwNonIsoEmCands ) ;
-
-      if( !hwNonIsoEmCands.isValid() )
-	{
-	  LogDebug("L1ExtraParticlesProd")
-	    << "\nWarning: L1GctEmCandCollection with " << nonIsoEmSource_
-	    << "\nrequested in configuration, but not found in the event."
-	    << std::endl;
-	}
-      else
-	{
-//       cout << "HW non-iso EM" << endl ;
-	  L1GctEmCandCollection::const_iterator emItr = hwNonIsoEmCands->begin() ;
-	  L1GctEmCandCollection::const_iterator emEnd = hwNonIsoEmCands->end() ;
-	  for( int i = 0 ; emItr != emEnd ; ++emItr, ++i )
-	    {
-// 	 cout << "#" << i
-// 	      << " name " << emItr->name()
-// 	      << " empty " << emItr->empty()
-// 	      << " rank " << emItr->rank()
-// 	      << " eta " << emItr->etaIndex()
-// 	      << " sign " << emItr->etaSign()
-// 	      << " phi " << emItr->phiIndex()
-// 	      << " iso " << emItr->isolated()
-// 	      << " bx " << emItr->bx()
-// 	      << endl ;
-
-	      if( !emItr->empty() &&
-		  ( !centralBxOnly_ || emItr->bx() == 0 ) )
-		{
-		  double et = emScale->et( emItr->rank() ) ;
-
-// 	    cout << "L1Extra et " << et << endl ;
-
-		  nonIsoEmColl->push_back(
-					  L1EmParticle( gctLorentzVector( et, *emItr, caloGeom, true ),
-							Ref< L1GctEmCandCollection >( hwNonIsoEmCands,
-										      i ),
-							emItr->bx() ) );
-		}
-	    }
-	}
-
-
-      // ~~~~~~~~~~~~~~~~~~~~ Jets ~~~~~~~~~~~~~~~~~~~~
-
-      ESHandle< L1CaloEtScale > jetScale ;
-      iSetup.get< L1JetEtScaleRcd >().get( jetScale ) ;
-
-      // Central jets.
-      Handle< L1GctJetCandCollection > hwCenJetCands ;
-      iEvent.getByLabel( cenJetSource_, hwCenJetCands ) ;
-
-      if( !hwCenJetCands.isValid() )
-	{
-	  LogDebug("L1ExtraParticlesProd")
-	    << "\nWarning: L1GctJetCandCollection with " << cenJetSource_
-	    << "\nrequested in configuration, but not found in the event."
-	    << std::endl;
-	}
-      else
-	{
-//       cout << "HW central jets" << endl ;
-	  L1GctJetCandCollection::const_iterator jetItr = hwCenJetCands->begin() ;
-	  L1GctJetCandCollection::const_iterator jetEnd = hwCenJetCands->end() ;
-	  for( int i = 0 ; jetItr != jetEnd ; ++jetItr, ++i )
-	    {
-// 	 cout << "#" << i
-// 	      << " name " << jetItr->name()
-// 	      << " empty " << jetItr->empty()
-// 	      << " rank " << jetItr->rank()
-// 	      << " eta " << jetItr->etaIndex()
-// 	      << " sign " << jetItr->etaSign()
-// 	      << " phi " << jetItr->phiIndex()
-// 	      << " cen " << jetItr->isCentral()
-// 	      << " for " << jetItr->isForward()
-// 	      << " tau " << jetItr->isTau()
-// 	      << " bx " << jetItr->bx()
-// 	      << endl ;
-
-	      if( !jetItr->empty() &&
-		  ( !centralBxOnly_ || jetItr->bx() == 0 ) )
-		{
-		  double et = jetScale->et( jetItr->rank() ) ;
-
-// 	    cout << "L1Extra et " << et << endl ;
-
-		  cenJetColl->push_back(
-					L1JetParticle( gctLorentzVector( et, *jetItr, caloGeom, true ),
-						       Ref< L1GctJetCandCollection >( hwCenJetCands,
-										      i ),
-						       jetItr->bx() ) ) ;
-		}
-	    }
-	}
-
-
-      // Forward jets.
-      Handle< L1GctJetCandCollection > hwForJetCands ;
-      iEvent.getByLabel( forJetSource_, hwForJetCands ) ;
-
-      if( !hwForJetCands.isValid() )
-	{
-	  LogDebug("L1ExtraParticlesProd")
-	    << "\nWarning: L1GctEmCandCollection with " << forJetSource_
-	    << "\nrequested in configuration, but not found in the event."
-	    << std::endl;
-	}
-      else
-	{
-//       cout << "HW forward jets" << endl ;
-	  L1GctJetCandCollection::const_iterator jetItr = hwForJetCands->begin() ;
-	  L1GctJetCandCollection::const_iterator jetEnd = hwForJetCands->end() ;
-	  for( int i = 0 ; jetItr != jetEnd ; ++jetItr, ++i )
-	    {
-// 	 cout << "#" << i
-// 	      << " name " << jetItr->name()
-// 	      << " empty " << jetItr->empty()
-// 	      << " rank " << jetItr->rank()
-// 	      << " eta " << jetItr->etaIndex()
-// 	      << " sign " << jetItr->etaSign()
-// 	      << " phi " << jetItr->phiIndex()
-// 	      << " cen " << jetItr->isCentral()
-// 	      << " for " << jetItr->isForward()
-// 	      << " tau " << jetItr->isTau()
-// 	      << " bx " << jetItr->bx()
-// 	      << endl ;
-
-	      if( !jetItr->empty() &&
-		  ( !centralBxOnly_ || jetItr->bx() == 0 ) )
-		{
-		  double et = jetScale->et( jetItr->rank() ) ;
-
-// 	    cout << "L1Extra et " << et << endl ;
-
-		  forJetColl->push_back(
-					L1JetParticle( gctLorentzVector( et, *jetItr, caloGeom, false ),
-						       Ref< L1GctJetCandCollection >( hwForJetCands,
-										      i ),
-						       jetItr->bx() ) ) ;
-		}
-	    }
-	}
-
-
-      // Tau jets.
-//       cout << "HW tau jets" << endl ;
-      Handle< L1GctJetCandCollection > hwTauJetCands ;
-      iEvent.getByLabel( tauJetSource_, hwTauJetCands ) ;
-
-      if( !hwTauJetCands.isValid() )
-	{
-	  LogDebug("L1ExtraParticlesProd")
-	    << "\nWarning: L1GctJetCandCollection with " << tauJetSource_
-	    << "\nrequested in configuration, but not found in the event."
-	    << std::endl;
-	}
-      else
-	{
-	  L1GctJetCandCollection::const_iterator jetItr = hwTauJetCands->begin() ;
-	  L1GctJetCandCollection::const_iterator jetEnd = hwTauJetCands->end() ;
-	  for( int i = 0 ; jetItr != jetEnd ; ++jetItr, ++i )
-	    {
-// 	 cout << "#" << i
-// 	      << " name " << jetItr->name()
-// 	      << " empty " << jetItr->empty()
-// 	      << " rank " << jetItr->rank()
-// 	      << " eta " << jetItr->etaIndex()
-// 	      << " sign " << jetItr->etaSign()
-// 	      << " phi " << jetItr->phiIndex()
-// 	      << " cen " << jetItr->isCentral()
-// 	      << " for " << jetItr->isForward()
-// 	      << " tau " << jetItr->isTau()
-// 	      << " bx " << jetItr->bx()
-// 	      << endl ;
-
-	      if( !jetItr->empty() &&
-		  ( !centralBxOnly_ || jetItr->bx() == 0 ) )
-		{
-		  double et = jetScale->et( jetItr->rank() ) ;
-
-// 	    cout << "L1Extra et " << et << endl ;
-
-		  tauJetColl->push_back(
-					L1JetParticle( gctLorentzVector( et, *jetItr, caloGeom, true ),
-						       Ref< L1GctJetCandCollection >( hwTauJetCands,
-										      i ),
-						       jetItr->bx() ) ) ;
-		}
-	    }
-	}
-
-
-      // Isolated Tau jets.
-//       cout << "HW tau jets" << endl ;
-      Handle< L1GctJetCandCollection > hwIsoTauJetCands ;
-      iEvent.getByLabel( isoTauJetSource_, hwIsoTauJetCands ) ;
-
-      if( !hwIsoTauJetCands.isValid() )
-	{
-	  LogDebug("L1ExtraParticlesProd")
-	    << "\nWarning: L1GctJetCandCollection with " << isoTauJetSource_
-	    << "\nrequested in configuration, but not found in the event."
-	    << std::endl;
-	}
-      else
-	{
-	  L1GctJetCandCollection::const_iterator jetItr = hwIsoTauJetCands->begin() ;
-	  L1GctJetCandCollection::const_iterator jetEnd = hwIsoTauJetCands->end() ;
-	  for( int i = 0 ; jetItr != jetEnd ; ++jetItr, ++i )
-	    {
-// 	 cout << "#" << i
-// 	      << " name " << jetItr->name()
-// 	      << " empty " << jetItr->empty()
-// 	      << " rank " << jetItr->rank()
-// 	      << " eta " << jetItr->etaIndex()
-// 	      << " sign " << jetItr->etaSign()
-// 	      << " phi " << jetItr->phiIndex()
-// 	      << " cen " << jetItr->isCentral()
-// 	      << " for " << jetItr->isForward()
-// 	      << " tau " << jetItr->isTau()
-// 	      << " bx " << jetItr->bx()
-// 	      << endl ;
-
-	      if( !jetItr->empty() &&
-		  ( !centralBxOnly_ || jetItr->bx() == 0 ) )
-		{
-		  double et = jetScale->et( jetItr->rank() ) ;
-
-// 	    cout << "L1Extra et " << et << endl ;
-
-		  isoTauJetColl->push_back(
-					L1JetParticle( gctLorentzVector( et, *jetItr, caloGeom, true ),
-						       Ref< L1GctJetCandCollection >( hwIsoTauJetCands,
-										      i ),
-						       jetItr->bx() ) ) ;
-		}
-	    }
-	}
-
-      // ~~~~~~~~~~~~~~~~~~~~ ET Sums ~~~~~~~~~~~~~~~~~~~~
-
-      double etSumLSB = jetScale->linearLsb() ;
-
-      Handle< L1GctEtTotalCollection > hwEtTotColl ;
-      iEvent.getByLabel( etTotSource_, hwEtTotColl ) ;
-
-      Handle< L1GctEtMissCollection > hwEtMissColl ;
-      iEvent.getByLabel( etMissSource_, hwEtMissColl ) ;
-
-      if( !hwEtTotColl.isValid() )
-	{
-	  LogDebug("L1ExtraParticlesProd")
-	    << "\nWarning: L1GctEtTotalCollection with " << etTotSource_
-	    << "\nrequested in configuration, but not found in the event."
-	    << std::endl;
-	}
-      else if( !hwEtMissColl.isValid() )
-	{
-	  LogDebug("L1ExtraParticlesProd")
-	    << "\nWarning: L1GctEtMissCollection with " << etMissSource_
-	    << "\nrequested in configuration, but not found in the event."
-	    << std::endl;
-	}
-      else
-	{
-	  // Make a L1EtMissParticle even if either L1GctEtTotal or L1GctEtMiss
-	  // is missing for a given bx.  Keep track of which L1GctEtMiss objects
-	  // have a corresponding L1GctEtTotal object.
-	  std::vector< bool > etMissMatched ;
-
-	  L1GctEtMissCollection::const_iterator hwEtMissItr =
-	    hwEtMissColl->begin() ;
-	  L1GctEtMissCollection::const_iterator hwEtMissEnd =
-	    hwEtMissColl->end() ;
-	  for( ; hwEtMissItr != hwEtMissEnd ; ++hwEtMissItr )
-	    {
-	      etMissMatched.push_back( false ) ;
-	    }
-      
-	  // Collate energy sums by bx
-	  L1GctEtTotalCollection::const_iterator hwEtTotItr =
-	    hwEtTotColl->begin() ;
-	  L1GctEtTotalCollection::const_iterator hwEtTotEnd =
-	    hwEtTotColl->end() ;
-
-	  int iTot = 0 ;
-	  for( ; hwEtTotItr != hwEtTotEnd ; ++hwEtTotItr, ++iTot )
-	    {
-	      int bx = hwEtTotItr->bx() ;
-
-	      if( !centralBxOnly_ || bx == 0 )
-		{
-		  // ET bin low edge
-		  double etTot =
-		    ( hwEtTotItr->overFlow() ?
-		      ( double ) L1GctEtTotal::kEtTotalMaxValue :
-		      ( double ) hwEtTotItr->et() ) * etSumLSB + 1.e-6 ;
-
-		  int iMiss = 0 ;
-		  hwEtMissItr = hwEtMissColl->begin() ;
-		  hwEtMissEnd = hwEtMissColl->end() ;
-		  for( ; hwEtMissItr != hwEtMissEnd ; ++hwEtMissItr, ++iMiss )
-		    {
-		      if( hwEtMissItr->bx() == bx )
-			{
-			  etMissMatched[ iMiss ] = true ;
-			  break ;
-			}
-		    }
-
-		  double etMiss = 0. ;
-		  double phi = 0. ;
-		  math::PtEtaPhiMLorentzVector p4 ;
-		  Ref< L1GctEtMissCollection > metRef ;
-
-		  // If a L1GctEtMiss with the right bx is not found, itr == end.
-		  if( hwEtMissItr != hwEtMissEnd )
-		    {
-		      // ET bin low edge
-		      etMiss =
-			( hwEtMissItr->overFlow() ?
-			  ( double ) L1GctEtMiss::kEtMissMaxValue :
-			  ( double ) hwEtMissItr->et() ) * etSumLSB + 1.e-6 ;
-		      // keep x and y components non-zero and
-		      // protect against roundoff.
-
-		      phi = caloGeom->etSumPhiBinCenter( hwEtMissItr->phi() ) ;
-
-		      p4 = math::PtEtaPhiMLorentzVector( etMiss,
-							 0.,
-							 phi,
-							 0. ) ;
-
-		      metRef = Ref< L1GctEtMissCollection >( hwEtMissColl, iMiss ) ;
-
-// 	       cout << "HW ET Sums " << endl
-// 		    << "MET: phi " << hwEtMissItr->phi() << " = " << phi
-// 		    << " et " << hwEtMissItr->et() << " = " << etMiss
-// 		    << " EtTot " << hwEtTotItr->et() << " = " << etTot
-// 		    << " bx " << bx
-// 		    << endl ;
-		    }
-// 	   else
-// 	     {
-// 	       cout << "HW ET Sums " << endl
-// 		    << "MET: phi " << phi
-// 		    << " et "<< etMiss
-// 		    << " EtTot " << hwEtTotItr->et() << " = " << etTot
-// 		    << " bx " << bx
-// 		    << endl ;
-// 	     }
-
-		  etMissColl->push_back(
-					L1EtMissParticle(
-							 p4,
-							 L1EtMissParticle::kMET,
-							 etTot,
-							 metRef,
-							 Ref< L1GctEtTotalCollection >( hwEtTotColl, iTot ),
-							 Ref< L1GctHtMissCollection >(),
-							 Ref< L1GctEtHadCollection >(),
-							 bx
-							 ) ) ;
-		}
-	    }
-
-	  if( !centralBxOnly_ )
-	    {
-	      // Make L1EtMissParticles for those L1GctEtMiss objects without
-	      // a matched L1GctEtTotal object.
-
-	      double etTot = 0. ;
-
-	      hwEtMissItr = hwEtMissColl->begin() ;
-	      hwEtMissEnd = hwEtMissColl->end() ;
-	      int iMiss = 0 ;
-	      for( ; hwEtMissItr != hwEtMissEnd ; ++hwEtMissItr, ++iMiss )
-		{
-		  if( !etMissMatched[ iMiss ] )
-		    {
-		      int bx = hwEtMissItr->bx() ;
-
-		      // ET bin low edge
-		      double etMiss =
-			( hwEtMissItr->overFlow() ?
-			  ( double ) L1GctEtMiss::kEtMissMaxValue :
-			  ( double ) hwEtMissItr->et() ) * etSumLSB + 1.e-6 ;
-		      // keep x and y components non-zero and
-		      // protect against roundoff.
-
-		      double phi =
-			caloGeom->etSumPhiBinCenter( hwEtMissItr->phi() ) ;
-
-		      math::PtEtaPhiMLorentzVector p4( etMiss,
-						       0.,
-						       phi,
-						       0. ) ;
-
-// 		  cout << "HW ET Sums " << endl
-// 		       << "MET: phi " << hwEtMissItr->phi() << " = " << phi
-// 		       << " et " << hwEtMissItr->et() << " = " << etMiss
-// 		       << " EtTot " << etTot
-// 		       << " bx " << bx
-// 		       << endl ;
-
-		      etMissColl->push_back(
-					    L1EtMissParticle(
-							     p4,
-							     L1EtMissParticle::kMET,
-							     etTot,
-							     Ref< L1GctEtMissCollection >( hwEtMissColl, iMiss ),
-							     Ref< L1GctEtTotalCollection >(),
-							     Ref< L1GctHtMissCollection >(),
-							     Ref< L1GctEtHadCollection >(),
-							     bx
-							     ) ) ;
-		    }
-		}
-	    }
-	}
-
-      // ~~~~~~~~~~~~~~~~~~~~ HT Sums ~~~~~~~~~~~~~~~~~~~~
-
-      Handle< L1GctEtHadCollection > hwEtHadColl ;
-      iEvent.getByLabel( etHadSource_, hwEtHadColl ) ;
-
-      Handle< L1GctHtMissCollection > hwHtMissColl ;
-      if( !ignoreHtMiss_ )
-	{
-	  iEvent.getByLabel( htMissSource_, hwHtMissColl ) ;
-	}
-
-      ESHandle< L1GctJetFinderParams > jetFinderParams ;
-      iSetup.get< L1GctJetFinderParamsRcd >().get( jetFinderParams ) ;
-      double htSumLSB = jetFinderParams->getHtLsbGeV();
-
-      ESHandle< L1CaloEtScale > htMissScale ;
-      std::vector< bool > htMissMatched ;
-      if( !ignoreHtMiss_ )
-	{
-	  iSetup.get< L1HtMissScaleRcd >().get( htMissScale ) ;
-
-	  if( !hwEtHadColl.isValid() )
-	    {
-	      LogDebug("L1ExtraParticlesProd")
-		<< "\nWarning: L1GctEtHadCollection with " << etHadSource_
-		<< "\nrequested in configuration, but not found in the event."
-		<< std::endl;
-	    }
-	  else if( !hwHtMissColl.isValid() )
-	    {
-	      LogDebug("L1ExtraParticlesProd")
-		<< "\nWarning: L1GctHtMissCollection with " << htMissSource_
-		<< "\nrequested in configuration, but not found in the event."
-		<< std::endl;
-	    }
-	  else
-	    {
-	      // Make a L1EtMissParticle even if either L1GctEtHad or L1GctHtMiss
-	      // is missing for a given bx. Keep track of which L1GctHtMiss objects
-	      // have a corresponding L1GctHtTotal object.
-	      L1GctHtMissCollection::const_iterator hwHtMissItr =
-		hwHtMissColl->begin() ;
-	      L1GctHtMissCollection::const_iterator hwHtMissEnd =
-		hwHtMissColl->end() ;
-	      for( ; hwHtMissItr != hwHtMissEnd ; ++hwHtMissItr )
-		{
-		  htMissMatched.push_back( false ) ;
-		}
-	    }
-	}
-
-      if( !hwEtHadColl.isValid() )
-	{
-	  LogDebug("L1ExtraParticlesProd")
-	    << "\nWarning: L1GctEtHadCollection with " << etHadSource_
-	    << "\nrequested in configuration, but not found in the event."
-	    << std::endl;
-	}
-      else if( !hwHtMissColl.isValid() )
-	{
-	  LogDebug("L1ExtraParticlesProd")
-	    << "\nWarning: L1GctHtMissCollection with " << htMissSource_
-	    << "\nrequested in configuration, but not found in the event."
-	    << std::endl;
-	}
-      else
-	{
-	  L1GctEtHadCollection::const_iterator hwEtHadItr =
-	    hwEtHadColl->begin() ;
-	  L1GctEtHadCollection::const_iterator hwEtHadEnd =
-	    hwEtHadColl->end() ;
-
-	  int iHad = 0 ;
-	  for( ; hwEtHadItr != hwEtHadEnd ; ++hwEtHadItr, ++iHad )
-	    {
-	      int bx = hwEtHadItr->bx() ;
-
-	      if( !centralBxOnly_ || bx == 0 )
-		{
-		  // HT bin low edge
-		  double htTot =
-		    ( hwEtHadItr->overFlow() ?
-		      ( double ) L1GctEtHad::kEtHadMaxValue :
-		      ( double ) hwEtHadItr->et() ) * htSumLSB + 1.e-6 ;
-
-		  double htMiss = 0. ;
-		  double phi = 0. ;
-		  math::PtEtaPhiMLorentzVector p4 ;
-		  Ref< L1GctHtMissCollection > mhtRef ;
-
-		  if( !ignoreHtMiss_ )
-		    {
-		      L1GctHtMissCollection::const_iterator hwHtMissItr =
-			hwHtMissColl->begin() ;
-		      L1GctHtMissCollection::const_iterator hwHtMissEnd =
-			hwHtMissColl->end() ;
-
-		      int iMiss = 0 ;
-		      for( ; hwHtMissItr != hwHtMissEnd ; ++hwHtMissItr, ++iMiss )
-			{
-			  if( hwHtMissItr->bx() == bx )
-			    {
-			      htMissMatched[ iMiss ] = true ;
-			      break ;
-			    }
-			}
-
-		      // If a L1GctHtMiss with the right bx is not found, itr == end.
-		      if( hwHtMissItr != hwHtMissEnd )
-			{
-			  // HT bin low edge
-			  htMiss =
-			    htMissScale->et( hwHtMissItr->overFlow() ?
-					     htMissScale->rankScaleMax() :
-					     hwHtMissItr->et() ) + 1.e-6 ;
-			  // keep x and y components non-zero and
-			  // protect against roundoff.
-
-			  phi =
-			    caloGeom->htSumPhiBinCenter( hwHtMissItr->phi() ) ;
-
-			  p4 = math::PtEtaPhiMLorentzVector( htMiss,
-							     0.,
-							     phi,
-							     0. ) ;
-
-			  mhtRef=Ref< L1GctHtMissCollection >( hwHtMissColl, iMiss );
-
-// 		   cout << "HW HT Sums " << endl
-// 			<< "MHT: phi " << hwHtMissItr->phi() << " = " << phi
-// 			<< " ht " << hwHtMissItr->et() << " = " << htMiss
-// 			<< " HtTot " << hwEtHadItr->et() << " = " << htTot
-// 			<< " bx " << bx
-// 			<< endl ;
-			}
-// 	       else
-// 		 {
-// 		   cout << "HW HT Sums " << endl
-// 			<< "MHT: phi " << phi
-// 			<< " ht " << htMiss
-// 			<< " HtTot " << hwEtHadItr->et() << " = " << htTot
-// 			<< " bx " << bx
-// 			<< endl ;
-// 		 }
-		    }
-
-		  htMissColl->push_back(
-					L1EtMissParticle(
-							 p4,
-							 L1EtMissParticle::kMHT,
-							 htTot,
-							 Ref< L1GctEtMissCollection >(),
-							 Ref< L1GctEtTotalCollection >(),
-							 mhtRef,
-							 Ref< L1GctEtHadCollection >( hwEtHadColl, iHad ),
-							 bx
-							 ) ) ;
-		}
-	    }
-
-	  if( !centralBxOnly_  && !ignoreHtMiss_ )
-	    {
-	      // Make L1EtMissParticles for those L1GctHtMiss objects without
-	      // a matched L1GctHtTotal object.
-	      double htTot = 0. ;
-
-	      L1GctHtMissCollection::const_iterator hwHtMissItr =
-		hwHtMissColl->begin() ;
-	      L1GctHtMissCollection::const_iterator hwHtMissEnd =
-		hwHtMissColl->end() ;
-
-	      int iMiss = 0 ;
-	      for( ; hwHtMissItr != hwHtMissEnd ; ++hwHtMissItr, ++iMiss )
-		{
-		  if( !htMissMatched[ iMiss ] )
-		    {
-		      int bx = hwHtMissItr->bx() ;
-
-		      // HT bin low edge
-		      double htMiss =
-			htMissScale->et( hwHtMissItr->overFlow() ?
-					 htMissScale->rankScaleMax() :
-					 hwHtMissItr->et() ) + 1.e-6 ;
-		      // keep x and y components non-zero and
-		      // protect against roundoff.
-
-		      double phi =
-			caloGeom->htSumPhiBinCenter( hwHtMissItr->phi() ) ;
-
-		      math::PtEtaPhiMLorentzVector p4( htMiss,
-						       0.,
-						       phi,
-						       0. ) ;
-
-// 		  cout << "HW HT Sums " << endl
-// 		       << "MHT: phi " << hwHtMissItr->phi() << " = " << phi
-// 		       << " ht " << hwHtMissItr->et() << " = " << htMiss
-// 		       << " HtTot " << htTot
-// 		       << " bx " << bx
-// 		       << endl ;
-
-		      htMissColl->push_back(
-					    L1EtMissParticle(
-							     p4,
-							     L1EtMissParticle::kMHT,
-							     htTot,
-							     Ref< L1GctEtMissCollection >(),
-							     Ref< L1GctEtTotalCollection >(),
-							     Ref< L1GctHtMissCollection >( hwHtMissColl, iMiss ),
-							     Ref< L1GctEtHadCollection >(),
-							     bx
-							     ) ) ;
-		    }
-		}
-	    }
-	}
-
-      // ~~~~~~~~~~~~~~~~~~~~ HF Rings ~~~~~~~~~~~~~~~~~~~~
-
-      Handle< L1GctHFRingEtSumsCollection > hwHFEtSumsColl ;
-      iEvent.getByLabel( hfRingEtSumsSource_, hwHFEtSumsColl ) ;
-
-      Handle< L1GctHFBitCountsCollection > hwHFBitCountsColl ;
-      iEvent.getByLabel( hfRingBitCountsSource_, hwHFBitCountsColl ) ;
-
-      ESHandle< L1CaloEtScale > hfRingEtScale ;
-      iSetup.get< L1HfRingEtScaleRcd >().get( hfRingEtScale ) ;
-
-      if( !hwHFEtSumsColl.isValid() )
-	{
-	  LogDebug("L1ExtraParticlesProd")
-	    << "\nWarning: L1GctHFRingEtSumsCollection with " << hfRingEtSumsSource_
-	    << "\nrequested in configuration, but not found in the event."
-	    << std::endl;
-	}
-      else if( !hwHFBitCountsColl.isValid() )
-	{
-	  LogDebug("L1ExtraParticlesProd")
-	    << "\nWarning: L1GctHFBitCountsCollection with " << hfRingBitCountsSource_
-	    << "\nrequested in configuration, but not found in the event."
-	    << std::endl;
-	}
-      else
-	{
-	  L1GctHFRingEtSumsCollection::const_iterator hwHFEtSumsItr =
-	    hwHFEtSumsColl->begin() ;
-	  L1GctHFRingEtSumsCollection::const_iterator hwHFEtSumsEnd =
-	    hwHFEtSumsColl->end() ;
-
-	  int iEtSums = 0 ;
-	  for( ; hwHFEtSumsItr != hwHFEtSumsEnd ; ++hwHFEtSumsItr, ++iEtSums )
-	    {
-	      int bx = hwHFEtSumsItr->bx() ;
-
-	      if( !centralBxOnly_ || bx == 0 )
-		{
-		  L1GctHFBitCountsCollection::const_iterator hwHFBitCountsItr =
-		    hwHFBitCountsColl->begin() ;
-		  L1GctHFBitCountsCollection::const_iterator hwHFBitCountsEnd =
-		    hwHFBitCountsColl->end() ;
-
-		  int iBitCounts = 0 ;
-		  for( ; hwHFBitCountsItr != hwHFBitCountsEnd ;
-		       ++hwHFBitCountsItr, ++iBitCounts )
-		    {
-		      if( hwHFBitCountsItr->bx() == bx )
-			{
-			  break ;
-			}
-		    }
-
-		  // If a L1GctHFBitCounts with the right bx is not found, itr == end.
-		  if( hwHFBitCountsItr != hwHFBitCountsEnd )
-		    {
-		      // Construct L1HFRings only if both HW objects are present.
-
-		      // cout << "HF Rings " << endl
-
-		      // HF Et sums
-		      double etSums[ L1HFRings::kNumRings ] ;
-		      etSums[ L1HFRings::kRing1PosEta ] =
-			hfRingEtScale->et( hwHFEtSumsItr->etSum( 0 ) ) + 1.e-6 ;
-		      etSums[ L1HFRings::kRing1NegEta ] =
-			hfRingEtScale->et( hwHFEtSumsItr->etSum( 1 ) ) + 1.e-6 ;
-		      etSums[ L1HFRings::kRing2PosEta ] =
-			hfRingEtScale->et( hwHFEtSumsItr->etSum( 2 ) ) + 1.e-6 ;
-		      etSums[ L1HFRings::kRing2NegEta ] =
-			hfRingEtScale->et( hwHFEtSumsItr->etSum( 3 ) ) + 1.e-6 ;
-		      // protect against roundoff.
-
-// 	       cout << "HF Et Sums "
-// 		    << hwHFEtSumsItr->etSum( 0 ) << " = "
-// 		    << etSums[ L1HFRings::kRing1PosEta ] << " "
-// 		    << hwHFEtSumsItr->etSum( 1 ) << " = "
-// 		    << etSums[ L1HFRings::kRing1NegEta ] << " "
-// 		    << hwHFEtSumsItr->etSum( 2 ) << " = "
-// 		    << etSums[ L1HFRings::kRing2PosEta ] << " "
-// 		    << hwHFEtSumsItr->etSum( 3 ) << " = "
-// 		    << etSums[ L1HFRings::kRing2NegEta ]
-// 		    << endl ;
-
-		      // HF bit counts
-		      int bitCounts[ L1HFRings::kNumRings ] ;
-		      bitCounts[ L1HFRings::kRing1PosEta ] =
-			hwHFBitCountsItr->bitCount( 0 ) ;
-		      bitCounts[ L1HFRings::kRing1NegEta ] =
-			hwHFBitCountsItr->bitCount( 1 ) ;
-		      bitCounts[ L1HFRings::kRing2PosEta ] =
-			hwHFBitCountsItr->bitCount( 2 ) ;
-		      bitCounts[ L1HFRings::kRing2NegEta ] =
-			hwHFBitCountsItr->bitCount( 3 ) ;
-
-// 	       cout << "HF bit counts "
-// 		    << hwHFBitCountsItr->bitCount( 0 ) << " "
-// 		    << hwHFBitCountsItr->bitCount( 1 ) << " "
-// 		    << hwHFBitCountsItr->bitCount( 2 ) << " "
-// 		    << hwHFBitCountsItr->bitCount( 3 ) << " "
-// 		    << endl ;
-
-		      hfRingsColl->push_back(
-					     L1HFRings( etSums,
-							bitCounts,
-							Ref< L1GctHFRingEtSumsCollection >( hwHFEtSumsColl,
-											    iEtSums ),
-							Ref< L1GctHFBitCountsCollection >( hwHFBitCountsColl,
-											   iBitCounts ),
-							bx
-							) ) ;
-		    }
-		}
-	    }
-	}
-   }
-
-   OrphanHandle< L1EmParticleCollection > isoEmHandle =
-     iEvent.put(std::move(isoEmColl), "Isolated" ) ;
-
-   OrphanHandle< L1EmParticleCollection > nonIsoEmHandle =
-     iEvent.put(std::move(nonIsoEmColl), "NonIsolated" ) ;
-
-   OrphanHandle< L1JetParticleCollection > cenJetHandle =
-     iEvent.put(std::move(cenJetColl), "Central" ) ;
-
-   OrphanHandle< L1JetParticleCollection > forJetHandle =
-     iEvent.put(std::move(forJetColl), "Forward" ) ;
-
-   OrphanHandle< L1JetParticleCollection > tauJetHandle =
-     iEvent.put(std::move(tauJetColl), "Tau" ) ;
-
-   OrphanHandle< L1JetParticleCollection > IsoTauJetHandle =
-     iEvent.put(std::move(isoTauJetColl), "IsoTau" ) ;
-
-   OrphanHandle< L1EtMissParticleCollection > etMissCollHandle =
-     iEvent.put(std::move(etMissColl), "MET" ) ;
-
-   OrphanHandle< L1EtMissParticleCollection > htMissCollHandle =
-     iEvent.put(std::move(htMissColl), "MHT" ) ;
-
-   OrphanHandle< L1HFRingsCollection > hfRingsCollHandle =
-     iEvent.put(std::move(hfRingsColl )) ;
+void L1ExtraParticlesProd::produce(edm::Event &iEvent,
+                                   const edm::EventSetup &iSetup) {
+  using namespace edm;
+  using namespace l1extra;
+  using namespace std;
+
+  // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  // ~~~~~~~~~~~~~~~~~~~~ Muons ~~~~~~~~~~~~~~~~~~~~
+  // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  unique_ptr<L1MuonParticleCollection> muColl(new L1MuonParticleCollection);
+
+  if (produceMuonParticles_) {
+    ESHandle<L1MuTriggerScales> muScales;
+    iSetup.get<L1MuTriggerScalesRcd>().get(muScales);
+
+    ESHandle<L1MuTriggerPtScale> muPtScale;
+    iSetup.get<L1MuTriggerPtScaleRcd>().get(muPtScale);
+
+    Handle<L1MuGMTReadoutCollection> hwMuCollection;
+    iEvent.getByLabel(muonSource_, hwMuCollection);
+
+    vector<L1MuGMTExtendedCand> hwMuCands;
+
+    if (!hwMuCollection.isValid()) {
+      LogDebug("L1ExtraParticlesProd")
+          << "\nWarning: L1MuGMTReadoutCollection with " << muonSource_
+          << "\nrequested in configuration, but not found in the event."
+          << std::endl;
+    } else {
+      if (centralBxOnly_) {
+        // Get GMT candidates from central bunch crossing only
+        hwMuCands = hwMuCollection->getRecord().getGMTCands();
+      } else {
+        // Get GMT candidates from all bunch crossings
+        vector<L1MuGMTReadoutRecord> records = hwMuCollection->getRecords();
+        vector<L1MuGMTReadoutRecord>::const_iterator rItr = records.begin();
+        vector<L1MuGMTReadoutRecord>::const_iterator rEnd = records.end();
+
+        for (; rItr != rEnd; ++rItr) {
+          vector<L1MuGMTExtendedCand> tmpCands = rItr->getGMTCands();
+
+          hwMuCands.insert(hwMuCands.end(), tmpCands.begin(), tmpCands.end());
+        }
+      }
+
+      //       cout << "HW muons" << endl ;
+      vector<L1MuGMTExtendedCand>::const_iterator muItr = hwMuCands.begin();
+      vector<L1MuGMTExtendedCand>::const_iterator muEnd = hwMuCands.end();
+      for (int i = 0; muItr != muEnd; ++muItr, ++i) {
+        // 	 cout << "#" << i
+        // 	      << " name " << muItr->name()
+        // 	      << " empty " << muItr->empty()
+        // 	      << " pt " << muItr->ptIndex()
+        // 	      << " eta " << muItr->etaIndex()
+        // 	      << " phi " << muItr->phiIndex()
+        // 	      << " iso " << muItr->isol()
+        // 	      << " mip " << muItr->mip()
+        // 	      << " bx " << muItr->bx()
+        // 	      << endl ;
+
+        if (!muItr->empty()) {
+          // keep x and y components non-zero and protect against roundoff.
+          double pt =
+              muPtScale->getPtScale()->getLowEdge(muItr->ptIndex()) + 1.e-6;
+
+          // 	    cout << "L1Extra pt " << pt << endl ;
+
+          double eta = muScales->getGMTEtaScale()->getCenter(muItr->etaIndex());
+
+          double phi = muScales->getPhiScale()->getLowEdge(muItr->phiIndex());
+
+          math::PtEtaPhiMLorentzVector p4(pt, eta, phi, muonMassGeV_);
+
+          muColl->push_back(
+              L1MuonParticle(muItr->charge(), p4, *muItr, muItr->bx()));
+        }
+      }
+    }
+  }
+
+  OrphanHandle<L1MuonParticleCollection> muHandle =
+      iEvent.put(std::move(muColl));
+
+  // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  // ~~~~~~~~~~~~~~~~~~~~ Calorimeter ~~~~~~~~~~~~~~~~~~~~
+  // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  unique_ptr<L1EmParticleCollection> isoEmColl(new L1EmParticleCollection);
+
+  unique_ptr<L1EmParticleCollection> nonIsoEmColl(new L1EmParticleCollection);
+
+  unique_ptr<L1JetParticleCollection> cenJetColl(new L1JetParticleCollection);
+
+  unique_ptr<L1JetParticleCollection> forJetColl(new L1JetParticleCollection);
+
+  unique_ptr<L1JetParticleCollection> tauJetColl(new L1JetParticleCollection);
+
+  unique_ptr<L1JetParticleCollection> isoTauJetColl(
+      new L1JetParticleCollection);
+
+  unique_ptr<L1EtMissParticleCollection> etMissColl(
+      new L1EtMissParticleCollection);
+
+  unique_ptr<L1EtMissParticleCollection> htMissColl(
+      new L1EtMissParticleCollection);
+
+  unique_ptr<L1HFRingsCollection> hfRingsColl(new L1HFRingsCollection);
+
+  if (produceCaloParticles_) {
+    // ~~~~~~~~~~~~~~~~~~~~ Geometry ~~~~~~~~~~~~~~~~~~~~
+
+    ESHandle<L1CaloGeometry> caloGeomESH;
+    iSetup.get<L1CaloGeometryRecord>().get(caloGeomESH);
+    const L1CaloGeometry *caloGeom = &(*caloGeomESH);
+
+    // ~~~~~~~~~~~~~~~~~~~~ EM ~~~~~~~~~~~~~~~~~~~~
+
+    ESHandle<L1CaloEtScale> emScale;
+    iSetup.get<L1EmEtScaleRcd>().get(emScale);
+
+    // Isolated EM
+    Handle<L1GctEmCandCollection> hwIsoEmCands;
+    iEvent.getByLabel(isoEmSource_, hwIsoEmCands);
+
+    if (!hwIsoEmCands.isValid()) {
+      LogDebug("L1ExtraParticlesProd")
+          << "\nWarning: L1GctEmCandCollection with " << isoEmSource_
+          << "\nrequested in configuration, but not found in the event."
+          << std::endl;
+    } else {
+      //       cout << "HW iso EM" << endl ;
+
+      L1GctEmCandCollection::const_iterator emItr = hwIsoEmCands->begin();
+      L1GctEmCandCollection::const_iterator emEnd = hwIsoEmCands->end();
+      for (int i = 0; emItr != emEnd; ++emItr, ++i) {
+        // 	 cout << "#" << i
+        // 	      << " name " << emItr->name()
+        // 	      << " empty " << emItr->empty()
+        // 	      << " rank " << emItr->rank()
+        // 	      << " eta " << emItr->etaIndex()
+        // 	      << " sign " << emItr->etaSign()
+        // 	      << " phi " << emItr->phiIndex()
+        // 	      << " iso " << emItr->isolated()
+        // 	      << " bx " << emItr->bx()
+        // 	      << endl ;
+
+        if (!emItr->empty() && (!centralBxOnly_ || emItr->bx() == 0)) {
+          double et = emScale->et(emItr->rank());
+
+          // 	    cout << "L1Extra et " << et << endl ;
+
+          isoEmColl->push_back(L1EmParticle(
+              gctLorentzVector(et, *emItr, caloGeom, true),
+              Ref<L1GctEmCandCollection>(hwIsoEmCands, i), emItr->bx()));
+        }
+      }
+    }
+
+    // Non-isolated EM
+    Handle<L1GctEmCandCollection> hwNonIsoEmCands;
+    iEvent.getByLabel(nonIsoEmSource_, hwNonIsoEmCands);
+
+    if (!hwNonIsoEmCands.isValid()) {
+      LogDebug("L1ExtraParticlesProd")
+          << "\nWarning: L1GctEmCandCollection with " << nonIsoEmSource_
+          << "\nrequested in configuration, but not found in the event."
+          << std::endl;
+    } else {
+      //       cout << "HW non-iso EM" << endl ;
+      L1GctEmCandCollection::const_iterator emItr = hwNonIsoEmCands->begin();
+      L1GctEmCandCollection::const_iterator emEnd = hwNonIsoEmCands->end();
+      for (int i = 0; emItr != emEnd; ++emItr, ++i) {
+        // 	 cout << "#" << i
+        // 	      << " name " << emItr->name()
+        // 	      << " empty " << emItr->empty()
+        // 	      << " rank " << emItr->rank()
+        // 	      << " eta " << emItr->etaIndex()
+        // 	      << " sign " << emItr->etaSign()
+        // 	      << " phi " << emItr->phiIndex()
+        // 	      << " iso " << emItr->isolated()
+        // 	      << " bx " << emItr->bx()
+        // 	      << endl ;
+
+        if (!emItr->empty() && (!centralBxOnly_ || emItr->bx() == 0)) {
+          double et = emScale->et(emItr->rank());
+
+          // 	    cout << "L1Extra et " << et << endl ;
+
+          nonIsoEmColl->push_back(L1EmParticle(
+              gctLorentzVector(et, *emItr, caloGeom, true),
+              Ref<L1GctEmCandCollection>(hwNonIsoEmCands, i), emItr->bx()));
+        }
+      }
+    }
+
+    // ~~~~~~~~~~~~~~~~~~~~ Jets ~~~~~~~~~~~~~~~~~~~~
+
+    ESHandle<L1CaloEtScale> jetScale;
+    iSetup.get<L1JetEtScaleRcd>().get(jetScale);
+
+    // Central jets.
+    Handle<L1GctJetCandCollection> hwCenJetCands;
+    iEvent.getByLabel(cenJetSource_, hwCenJetCands);
+
+    if (!hwCenJetCands.isValid()) {
+      LogDebug("L1ExtraParticlesProd")
+          << "\nWarning: L1GctJetCandCollection with " << cenJetSource_
+          << "\nrequested in configuration, but not found in the event."
+          << std::endl;
+    } else {
+      //       cout << "HW central jets" << endl ;
+      L1GctJetCandCollection::const_iterator jetItr = hwCenJetCands->begin();
+      L1GctJetCandCollection::const_iterator jetEnd = hwCenJetCands->end();
+      for (int i = 0; jetItr != jetEnd; ++jetItr, ++i) {
+        // 	 cout << "#" << i
+        // 	      << " name " << jetItr->name()
+        // 	      << " empty " << jetItr->empty()
+        // 	      << " rank " << jetItr->rank()
+        // 	      << " eta " << jetItr->etaIndex()
+        // 	      << " sign " << jetItr->etaSign()
+        // 	      << " phi " << jetItr->phiIndex()
+        // 	      << " cen " << jetItr->isCentral()
+        // 	      << " for " << jetItr->isForward()
+        // 	      << " tau " << jetItr->isTau()
+        // 	      << " bx " << jetItr->bx()
+        // 	      << endl ;
+
+        if (!jetItr->empty() && (!centralBxOnly_ || jetItr->bx() == 0)) {
+          double et = jetScale->et(jetItr->rank());
+
+          // 	    cout << "L1Extra et " << et << endl ;
+
+          cenJetColl->push_back(L1JetParticle(
+              gctLorentzVector(et, *jetItr, caloGeom, true),
+              Ref<L1GctJetCandCollection>(hwCenJetCands, i), jetItr->bx()));
+        }
+      }
+    }
+
+    // Forward jets.
+    Handle<L1GctJetCandCollection> hwForJetCands;
+    iEvent.getByLabel(forJetSource_, hwForJetCands);
+
+    if (!hwForJetCands.isValid()) {
+      LogDebug("L1ExtraParticlesProd")
+          << "\nWarning: L1GctEmCandCollection with " << forJetSource_
+          << "\nrequested in configuration, but not found in the event."
+          << std::endl;
+    } else {
+      //       cout << "HW forward jets" << endl ;
+      L1GctJetCandCollection::const_iterator jetItr = hwForJetCands->begin();
+      L1GctJetCandCollection::const_iterator jetEnd = hwForJetCands->end();
+      for (int i = 0; jetItr != jetEnd; ++jetItr, ++i) {
+        // 	 cout << "#" << i
+        // 	      << " name " << jetItr->name()
+        // 	      << " empty " << jetItr->empty()
+        // 	      << " rank " << jetItr->rank()
+        // 	      << " eta " << jetItr->etaIndex()
+        // 	      << " sign " << jetItr->etaSign()
+        // 	      << " phi " << jetItr->phiIndex()
+        // 	      << " cen " << jetItr->isCentral()
+        // 	      << " for " << jetItr->isForward()
+        // 	      << " tau " << jetItr->isTau()
+        // 	      << " bx " << jetItr->bx()
+        // 	      << endl ;
+
+        if (!jetItr->empty() && (!centralBxOnly_ || jetItr->bx() == 0)) {
+          double et = jetScale->et(jetItr->rank());
+
+          // 	    cout << "L1Extra et " << et << endl ;
+
+          forJetColl->push_back(L1JetParticle(
+              gctLorentzVector(et, *jetItr, caloGeom, false),
+              Ref<L1GctJetCandCollection>(hwForJetCands, i), jetItr->bx()));
+        }
+      }
+    }
+
+    // Tau jets.
+    //       cout << "HW tau jets" << endl ;
+    Handle<L1GctJetCandCollection> hwTauJetCands;
+    iEvent.getByLabel(tauJetSource_, hwTauJetCands);
+
+    if (!hwTauJetCands.isValid()) {
+      LogDebug("L1ExtraParticlesProd")
+          << "\nWarning: L1GctJetCandCollection with " << tauJetSource_
+          << "\nrequested in configuration, but not found in the event."
+          << std::endl;
+    } else {
+      L1GctJetCandCollection::const_iterator jetItr = hwTauJetCands->begin();
+      L1GctJetCandCollection::const_iterator jetEnd = hwTauJetCands->end();
+      for (int i = 0; jetItr != jetEnd; ++jetItr, ++i) {
+        // 	 cout << "#" << i
+        // 	      << " name " << jetItr->name()
+        // 	      << " empty " << jetItr->empty()
+        // 	      << " rank " << jetItr->rank()
+        // 	      << " eta " << jetItr->etaIndex()
+        // 	      << " sign " << jetItr->etaSign()
+        // 	      << " phi " << jetItr->phiIndex()
+        // 	      << " cen " << jetItr->isCentral()
+        // 	      << " for " << jetItr->isForward()
+        // 	      << " tau " << jetItr->isTau()
+        // 	      << " bx " << jetItr->bx()
+        // 	      << endl ;
+
+        if (!jetItr->empty() && (!centralBxOnly_ || jetItr->bx() == 0)) {
+          double et = jetScale->et(jetItr->rank());
+
+          // 	    cout << "L1Extra et " << et << endl ;
+
+          tauJetColl->push_back(L1JetParticle(
+              gctLorentzVector(et, *jetItr, caloGeom, true),
+              Ref<L1GctJetCandCollection>(hwTauJetCands, i), jetItr->bx()));
+        }
+      }
+    }
+
+    // Isolated Tau jets.
+    //       cout << "HW tau jets" << endl ;
+    Handle<L1GctJetCandCollection> hwIsoTauJetCands;
+    iEvent.getByLabel(isoTauJetSource_, hwIsoTauJetCands);
+
+    if (!hwIsoTauJetCands.isValid()) {
+      LogDebug("L1ExtraParticlesProd")
+          << "\nWarning: L1GctJetCandCollection with " << isoTauJetSource_
+          << "\nrequested in configuration, but not found in the event."
+          << std::endl;
+    } else {
+      L1GctJetCandCollection::const_iterator jetItr = hwIsoTauJetCands->begin();
+      L1GctJetCandCollection::const_iterator jetEnd = hwIsoTauJetCands->end();
+      for (int i = 0; jetItr != jetEnd; ++jetItr, ++i) {
+        // 	 cout << "#" << i
+        // 	      << " name " << jetItr->name()
+        // 	      << " empty " << jetItr->empty()
+        // 	      << " rank " << jetItr->rank()
+        // 	      << " eta " << jetItr->etaIndex()
+        // 	      << " sign " << jetItr->etaSign()
+        // 	      << " phi " << jetItr->phiIndex()
+        // 	      << " cen " << jetItr->isCentral()
+        // 	      << " for " << jetItr->isForward()
+        // 	      << " tau " << jetItr->isTau()
+        // 	      << " bx " << jetItr->bx()
+        // 	      << endl ;
+
+        if (!jetItr->empty() && (!centralBxOnly_ || jetItr->bx() == 0)) {
+          double et = jetScale->et(jetItr->rank());
+
+          // 	    cout << "L1Extra et " << et << endl ;
+
+          isoTauJetColl->push_back(L1JetParticle(
+              gctLorentzVector(et, *jetItr, caloGeom, true),
+              Ref<L1GctJetCandCollection>(hwIsoTauJetCands, i), jetItr->bx()));
+        }
+      }
+    }
+
+    // ~~~~~~~~~~~~~~~~~~~~ ET Sums ~~~~~~~~~~~~~~~~~~~~
+
+    double etSumLSB = jetScale->linearLsb();
+
+    Handle<L1GctEtTotalCollection> hwEtTotColl;
+    iEvent.getByLabel(etTotSource_, hwEtTotColl);
+
+    Handle<L1GctEtMissCollection> hwEtMissColl;
+    iEvent.getByLabel(etMissSource_, hwEtMissColl);
+
+    if (!hwEtTotColl.isValid()) {
+      LogDebug("L1ExtraParticlesProd")
+          << "\nWarning: L1GctEtTotalCollection with " << etTotSource_
+          << "\nrequested in configuration, but not found in the event."
+          << std::endl;
+    } else if (!hwEtMissColl.isValid()) {
+      LogDebug("L1ExtraParticlesProd")
+          << "\nWarning: L1GctEtMissCollection with " << etMissSource_
+          << "\nrequested in configuration, but not found in the event."
+          << std::endl;
+    } else {
+      // Make a L1EtMissParticle even if either L1GctEtTotal or L1GctEtMiss
+      // is missing for a given bx.  Keep track of which L1GctEtMiss objects
+      // have a corresponding L1GctEtTotal object.
+      std::vector<bool> etMissMatched;
+
+      L1GctEtMissCollection::const_iterator hwEtMissItr = hwEtMissColl->begin();
+      L1GctEtMissCollection::const_iterator hwEtMissEnd = hwEtMissColl->end();
+      for (; hwEtMissItr != hwEtMissEnd; ++hwEtMissItr) {
+        etMissMatched.push_back(false);
+      }
+
+      // Collate energy sums by bx
+      L1GctEtTotalCollection::const_iterator hwEtTotItr = hwEtTotColl->begin();
+      L1GctEtTotalCollection::const_iterator hwEtTotEnd = hwEtTotColl->end();
+
+      int iTot = 0;
+      for (; hwEtTotItr != hwEtTotEnd; ++hwEtTotItr, ++iTot) {
+        int bx = hwEtTotItr->bx();
+
+        if (!centralBxOnly_ || bx == 0) {
+          // ET bin low edge
+          double etTot =
+              (hwEtTotItr->overFlow() ? (double)L1GctEtTotal::kEtTotalMaxValue
+                                      : (double)hwEtTotItr->et()) *
+                  etSumLSB +
+              1.e-6;
+
+          int iMiss = 0;
+          hwEtMissItr = hwEtMissColl->begin();
+          hwEtMissEnd = hwEtMissColl->end();
+          for (; hwEtMissItr != hwEtMissEnd; ++hwEtMissItr, ++iMiss) {
+            if (hwEtMissItr->bx() == bx) {
+              etMissMatched[iMiss] = true;
+              break;
+            }
+          }
+
+          double etMiss = 0.;
+          double phi = 0.;
+          math::PtEtaPhiMLorentzVector p4;
+          Ref<L1GctEtMissCollection> metRef;
+
+          // If a L1GctEtMiss with the right bx is not found, itr == end.
+          if (hwEtMissItr != hwEtMissEnd) {
+            // ET bin low edge
+            etMiss =
+                (hwEtMissItr->overFlow() ? (double)L1GctEtMiss::kEtMissMaxValue
+                                         : (double)hwEtMissItr->et()) *
+                    etSumLSB +
+                1.e-6;
+            // keep x and y components non-zero and
+            // protect against roundoff.
+
+            phi = caloGeom->etSumPhiBinCenter(hwEtMissItr->phi());
+
+            p4 = math::PtEtaPhiMLorentzVector(etMiss, 0., phi, 0.);
+
+            metRef = Ref<L1GctEtMissCollection>(hwEtMissColl, iMiss);
+
+            // 	       cout << "HW ET Sums " << endl
+            // 		    << "MET: phi " << hwEtMissItr->phi() << " = " << phi
+            // 		    << " et " << hwEtMissItr->et() << " = " << etMiss
+            // 		    << " EtTot " << hwEtTotItr->et() << " = " << etTot
+            // 		    << " bx " << bx
+            // 		    << endl ;
+          }
+          // 	   else
+          // 	     {
+          // 	       cout << "HW ET Sums " << endl
+          // 		    << "MET: phi " << phi
+          // 		    << " et "<< etMiss
+          // 		    << " EtTot " << hwEtTotItr->et() << " = " << etTot
+          // 		    << " bx " << bx
+          // 		    << endl ;
+          // 	     }
+
+          etMissColl->push_back(L1EtMissParticle(
+              p4, L1EtMissParticle::kMET, etTot, metRef,
+              Ref<L1GctEtTotalCollection>(hwEtTotColl, iTot),
+              Ref<L1GctHtMissCollection>(), Ref<L1GctEtHadCollection>(), bx));
+        }
+      }
+
+      if (!centralBxOnly_) {
+        // Make L1EtMissParticles for those L1GctEtMiss objects without
+        // a matched L1GctEtTotal object.
+
+        double etTot = 0.;
+
+        hwEtMissItr = hwEtMissColl->begin();
+        hwEtMissEnd = hwEtMissColl->end();
+        int iMiss = 0;
+        for (; hwEtMissItr != hwEtMissEnd; ++hwEtMissItr, ++iMiss) {
+          if (!etMissMatched[iMiss]) {
+            int bx = hwEtMissItr->bx();
+
+            // ET bin low edge
+            double etMiss =
+                (hwEtMissItr->overFlow() ? (double)L1GctEtMiss::kEtMissMaxValue
+                                         : (double)hwEtMissItr->et()) *
+                    etSumLSB +
+                1.e-6;
+            // keep x and y components non-zero and
+            // protect against roundoff.
+
+            double phi = caloGeom->etSumPhiBinCenter(hwEtMissItr->phi());
+
+            math::PtEtaPhiMLorentzVector p4(etMiss, 0., phi, 0.);
+
+            // 		  cout << "HW ET Sums " << endl
+            // 		       << "MET: phi " << hwEtMissItr->phi() << " = " <<
+            // phi
+            // 		       << " et " << hwEtMissItr->et() << " = " << etMiss
+            // 		       << " EtTot " << etTot
+            // 		       << " bx " << bx
+            // 		       << endl ;
+
+            etMissColl->push_back(L1EtMissParticle(
+                p4, L1EtMissParticle::kMET, etTot,
+                Ref<L1GctEtMissCollection>(hwEtMissColl, iMiss),
+                Ref<L1GctEtTotalCollection>(), Ref<L1GctHtMissCollection>(),
+                Ref<L1GctEtHadCollection>(), bx));
+          }
+        }
+      }
+    }
+
+    // ~~~~~~~~~~~~~~~~~~~~ HT Sums ~~~~~~~~~~~~~~~~~~~~
+
+    Handle<L1GctEtHadCollection> hwEtHadColl;
+    iEvent.getByLabel(etHadSource_, hwEtHadColl);
+
+    Handle<L1GctHtMissCollection> hwHtMissColl;
+    if (!ignoreHtMiss_) {
+      iEvent.getByLabel(htMissSource_, hwHtMissColl);
+    }
+
+    ESHandle<L1GctJetFinderParams> jetFinderParams;
+    iSetup.get<L1GctJetFinderParamsRcd>().get(jetFinderParams);
+    double htSumLSB = jetFinderParams->getHtLsbGeV();
+
+    ESHandle<L1CaloEtScale> htMissScale;
+    std::vector<bool> htMissMatched;
+    if (!ignoreHtMiss_) {
+      iSetup.get<L1HtMissScaleRcd>().get(htMissScale);
+
+      if (!hwEtHadColl.isValid()) {
+        LogDebug("L1ExtraParticlesProd")
+            << "\nWarning: L1GctEtHadCollection with " << etHadSource_
+            << "\nrequested in configuration, but not found in the event."
+            << std::endl;
+      } else if (!hwHtMissColl.isValid()) {
+        LogDebug("L1ExtraParticlesProd")
+            << "\nWarning: L1GctHtMissCollection with " << htMissSource_
+            << "\nrequested in configuration, but not found in the event."
+            << std::endl;
+      } else {
+        // Make a L1EtMissParticle even if either L1GctEtHad or L1GctHtMiss
+        // is missing for a given bx. Keep track of which L1GctHtMiss objects
+        // have a corresponding L1GctHtTotal object.
+        L1GctHtMissCollection::const_iterator hwHtMissItr =
+            hwHtMissColl->begin();
+        L1GctHtMissCollection::const_iterator hwHtMissEnd = hwHtMissColl->end();
+        for (; hwHtMissItr != hwHtMissEnd; ++hwHtMissItr) {
+          htMissMatched.push_back(false);
+        }
+      }
+    }
+
+    if (!hwEtHadColl.isValid()) {
+      LogDebug("L1ExtraParticlesProd")
+          << "\nWarning: L1GctEtHadCollection with " << etHadSource_
+          << "\nrequested in configuration, but not found in the event."
+          << std::endl;
+    } else if (!hwHtMissColl.isValid()) {
+      LogDebug("L1ExtraParticlesProd")
+          << "\nWarning: L1GctHtMissCollection with " << htMissSource_
+          << "\nrequested in configuration, but not found in the event."
+          << std::endl;
+    } else {
+      L1GctEtHadCollection::const_iterator hwEtHadItr = hwEtHadColl->begin();
+      L1GctEtHadCollection::const_iterator hwEtHadEnd = hwEtHadColl->end();
+
+      int iHad = 0;
+      for (; hwEtHadItr != hwEtHadEnd; ++hwEtHadItr, ++iHad) {
+        int bx = hwEtHadItr->bx();
+
+        if (!centralBxOnly_ || bx == 0) {
+          // HT bin low edge
+          double htTot =
+              (hwEtHadItr->overFlow() ? (double)L1GctEtHad::kEtHadMaxValue
+                                      : (double)hwEtHadItr->et()) *
+                  htSumLSB +
+              1.e-6;
+
+          double htMiss = 0.;
+          double phi = 0.;
+          math::PtEtaPhiMLorentzVector p4;
+          Ref<L1GctHtMissCollection> mhtRef;
+
+          if (!ignoreHtMiss_) {
+            L1GctHtMissCollection::const_iterator hwHtMissItr =
+                hwHtMissColl->begin();
+            L1GctHtMissCollection::const_iterator hwHtMissEnd =
+                hwHtMissColl->end();
+
+            int iMiss = 0;
+            for (; hwHtMissItr != hwHtMissEnd; ++hwHtMissItr, ++iMiss) {
+              if (hwHtMissItr->bx() == bx) {
+                htMissMatched[iMiss] = true;
+                break;
+              }
+            }
+
+            // If a L1GctHtMiss with the right bx is not found, itr == end.
+            if (hwHtMissItr != hwHtMissEnd) {
+              // HT bin low edge
+              htMiss = htMissScale->et(hwHtMissItr->overFlow()
+                                           ? htMissScale->rankScaleMax()
+                                           : hwHtMissItr->et()) +
+                       1.e-6;
+              // keep x and y components non-zero and
+              // protect against roundoff.
+
+              phi = caloGeom->htSumPhiBinCenter(hwHtMissItr->phi());
+
+              p4 = math::PtEtaPhiMLorentzVector(htMiss, 0., phi, 0.);
+
+              mhtRef = Ref<L1GctHtMissCollection>(hwHtMissColl, iMiss);
+
+              // 		   cout << "HW HT Sums " << endl
+              // 			<< "MHT: phi " << hwHtMissItr->phi() <<
+              // " = " << phi
+              // 			<< " ht " << hwHtMissItr->et() << " = "
+              // << htMiss
+              // 			<< " HtTot " << hwEtHadItr->et() << " =
+              // "
+              // << htTot
+              // 			<< " bx " << bx
+              // 			<< endl ;
+            }
+            // 	       else
+            // 		 {
+            // 		   cout << "HW HT Sums " << endl
+            // 			<< "MHT: phi " << phi
+            // 			<< " ht " << htMiss
+            // 			<< " HtTot " << hwEtHadItr->et() << " = " <<
+            // htTot
+            // 			<< " bx " << bx
+            // 			<< endl ;
+            // 		 }
+          }
+
+          htMissColl->push_back(L1EtMissParticle(
+              p4, L1EtMissParticle::kMHT, htTot, Ref<L1GctEtMissCollection>(),
+              Ref<L1GctEtTotalCollection>(), mhtRef,
+              Ref<L1GctEtHadCollection>(hwEtHadColl, iHad), bx));
+        }
+      }
+
+      if (!centralBxOnly_ && !ignoreHtMiss_) {
+        // Make L1EtMissParticles for those L1GctHtMiss objects without
+        // a matched L1GctHtTotal object.
+        double htTot = 0.;
+
+        L1GctHtMissCollection::const_iterator hwHtMissItr =
+            hwHtMissColl->begin();
+        L1GctHtMissCollection::const_iterator hwHtMissEnd = hwHtMissColl->end();
+
+        int iMiss = 0;
+        for (; hwHtMissItr != hwHtMissEnd; ++hwHtMissItr, ++iMiss) {
+          if (!htMissMatched[iMiss]) {
+            int bx = hwHtMissItr->bx();
+
+            // HT bin low edge
+            double htMiss = htMissScale->et(hwHtMissItr->overFlow()
+                                                ? htMissScale->rankScaleMax()
+                                                : hwHtMissItr->et()) +
+                            1.e-6;
+            // keep x and y components non-zero and
+            // protect against roundoff.
+
+            double phi = caloGeom->htSumPhiBinCenter(hwHtMissItr->phi());
+
+            math::PtEtaPhiMLorentzVector p4(htMiss, 0., phi, 0.);
+
+            // 		  cout << "HW HT Sums " << endl
+            // 		       << "MHT: phi " << hwHtMissItr->phi() << " = " <<
+            // phi
+            // 		       << " ht " << hwHtMissItr->et() << " = " << htMiss
+            // 		       << " HtTot " << htTot
+            // 		       << " bx " << bx
+            // 		       << endl ;
+
+            htMissColl->push_back(L1EtMissParticle(
+                p4, L1EtMissParticle::kMHT, htTot, Ref<L1GctEtMissCollection>(),
+                Ref<L1GctEtTotalCollection>(),
+                Ref<L1GctHtMissCollection>(hwHtMissColl, iMiss),
+                Ref<L1GctEtHadCollection>(), bx));
+          }
+        }
+      }
+    }
+
+    // ~~~~~~~~~~~~~~~~~~~~ HF Rings ~~~~~~~~~~~~~~~~~~~~
+
+    Handle<L1GctHFRingEtSumsCollection> hwHFEtSumsColl;
+    iEvent.getByLabel(hfRingEtSumsSource_, hwHFEtSumsColl);
+
+    Handle<L1GctHFBitCountsCollection> hwHFBitCountsColl;
+    iEvent.getByLabel(hfRingBitCountsSource_, hwHFBitCountsColl);
+
+    ESHandle<L1CaloEtScale> hfRingEtScale;
+    iSetup.get<L1HfRingEtScaleRcd>().get(hfRingEtScale);
+
+    if (!hwHFEtSumsColl.isValid()) {
+      LogDebug("L1ExtraParticlesProd")
+          << "\nWarning: L1GctHFRingEtSumsCollection with "
+          << hfRingEtSumsSource_
+          << "\nrequested in configuration, but not found in the event."
+          << std::endl;
+    } else if (!hwHFBitCountsColl.isValid()) {
+      LogDebug("L1ExtraParticlesProd")
+          << "\nWarning: L1GctHFBitCountsCollection with "
+          << hfRingBitCountsSource_
+          << "\nrequested in configuration, but not found in the event."
+          << std::endl;
+    } else {
+      L1GctHFRingEtSumsCollection::const_iterator hwHFEtSumsItr =
+          hwHFEtSumsColl->begin();
+      L1GctHFRingEtSumsCollection::const_iterator hwHFEtSumsEnd =
+          hwHFEtSumsColl->end();
+
+      int iEtSums = 0;
+      for (; hwHFEtSumsItr != hwHFEtSumsEnd; ++hwHFEtSumsItr, ++iEtSums) {
+        int bx = hwHFEtSumsItr->bx();
+
+        if (!centralBxOnly_ || bx == 0) {
+          L1GctHFBitCountsCollection::const_iterator hwHFBitCountsItr =
+              hwHFBitCountsColl->begin();
+          L1GctHFBitCountsCollection::const_iterator hwHFBitCountsEnd =
+              hwHFBitCountsColl->end();
+
+          int iBitCounts = 0;
+          for (; hwHFBitCountsItr != hwHFBitCountsEnd;
+               ++hwHFBitCountsItr, ++iBitCounts) {
+            if (hwHFBitCountsItr->bx() == bx) {
+              break;
+            }
+          }
+
+          // If a L1GctHFBitCounts with the right bx is not found, itr == end.
+          if (hwHFBitCountsItr != hwHFBitCountsEnd) {
+            // Construct L1HFRings only if both HW objects are present.
+
+            // cout << "HF Rings " << endl
+
+            // HF Et sums
+            double etSums[L1HFRings::kNumRings];
+            etSums[L1HFRings::kRing1PosEta] =
+                hfRingEtScale->et(hwHFEtSumsItr->etSum(0)) + 1.e-6;
+            etSums[L1HFRings::kRing1NegEta] =
+                hfRingEtScale->et(hwHFEtSumsItr->etSum(1)) + 1.e-6;
+            etSums[L1HFRings::kRing2PosEta] =
+                hfRingEtScale->et(hwHFEtSumsItr->etSum(2)) + 1.e-6;
+            etSums[L1HFRings::kRing2NegEta] =
+                hfRingEtScale->et(hwHFEtSumsItr->etSum(3)) + 1.e-6;
+            // protect against roundoff.
+
+            // 	       cout << "HF Et Sums "
+            // 		    << hwHFEtSumsItr->etSum( 0 ) << " = "
+            // 		    << etSums[ L1HFRings::kRing1PosEta ] << " "
+            // 		    << hwHFEtSumsItr->etSum( 1 ) << " = "
+            // 		    << etSums[ L1HFRings::kRing1NegEta ] << " "
+            // 		    << hwHFEtSumsItr->etSum( 2 ) << " = "
+            // 		    << etSums[ L1HFRings::kRing2PosEta ] << " "
+            // 		    << hwHFEtSumsItr->etSum( 3 ) << " = "
+            // 		    << etSums[ L1HFRings::kRing2NegEta ]
+            // 		    << endl ;
+
+            // HF bit counts
+            int bitCounts[L1HFRings::kNumRings];
+            bitCounts[L1HFRings::kRing1PosEta] = hwHFBitCountsItr->bitCount(0);
+            bitCounts[L1HFRings::kRing1NegEta] = hwHFBitCountsItr->bitCount(1);
+            bitCounts[L1HFRings::kRing2PosEta] = hwHFBitCountsItr->bitCount(2);
+            bitCounts[L1HFRings::kRing2NegEta] = hwHFBitCountsItr->bitCount(3);
+
+            // 	       cout << "HF bit counts "
+            // 		    << hwHFBitCountsItr->bitCount( 0 ) << " "
+            // 		    << hwHFBitCountsItr->bitCount( 1 ) << " "
+            // 		    << hwHFBitCountsItr->bitCount( 2 ) << " "
+            // 		    << hwHFBitCountsItr->bitCount( 3 ) << " "
+            // 		    << endl ;
+
+            hfRingsColl->push_back(L1HFRings(
+                etSums, bitCounts,
+                Ref<L1GctHFRingEtSumsCollection>(hwHFEtSumsColl, iEtSums),
+                Ref<L1GctHFBitCountsCollection>(hwHFBitCountsColl, iBitCounts),
+                bx));
+          }
+        }
+      }
+    }
+  }
+
+  OrphanHandle<L1EmParticleCollection> isoEmHandle =
+      iEvent.put(std::move(isoEmColl), "Isolated");
+
+  OrphanHandle<L1EmParticleCollection> nonIsoEmHandle =
+      iEvent.put(std::move(nonIsoEmColl), "NonIsolated");
+
+  OrphanHandle<L1JetParticleCollection> cenJetHandle =
+      iEvent.put(std::move(cenJetColl), "Central");
+
+  OrphanHandle<L1JetParticleCollection> forJetHandle =
+      iEvent.put(std::move(forJetColl), "Forward");
+
+  OrphanHandle<L1JetParticleCollection> tauJetHandle =
+      iEvent.put(std::move(tauJetColl), "Tau");
+
+  OrphanHandle<L1JetParticleCollection> IsoTauJetHandle =
+      iEvent.put(std::move(isoTauJetColl), "IsoTau");
+
+  OrphanHandle<L1EtMissParticleCollection> etMissCollHandle =
+      iEvent.put(std::move(etMissColl), "MET");
+
+  OrphanHandle<L1EtMissParticleCollection> htMissCollHandle =
+      iEvent.put(std::move(htMissColl), "MHT");
+
+  OrphanHandle<L1HFRingsCollection> hfRingsCollHandle =
+      iEvent.put(std::move(hfRingsColl));
 }
 
-//math::XYZTLorentzVector
+// math::XYZTLorentzVector
 math::PtEtaPhiMLorentzVector
-L1ExtraParticlesProd::gctLorentzVector( const double& et,
-					const L1GctCand& cand,
-					const L1CaloGeometry* geom,
-					bool central )
-{
-   // To keep x and y components non-zero.
-   double etCorr = et + 1.e-6 ; // protect against roundoff, not only for et=0
-
-   double eta = geom->etaBinCenter( cand.etaIndex(), central ) ;
-
-//    double tanThOver2 = exp( -eta ) ;
-//    double ez = etCorr * ( 1. - tanThOver2 * tanThOver2 ) / ( 2. * tanThOver2 );
-//    double e  = etCorr * ( 1. + tanThOver2 * tanThOver2 ) / ( 2. * tanThOver2 );
-
-   double phi = geom->emJetPhiBinCenter( cand.phiIndex() ) ;
-
-//    return math::XYZTLorentzVector( etCorr * cos( phi ),
-// 				   etCorr * sin( phi ),
-// 				   ez,
-// 				   e ) ;
-   return math::PtEtaPhiMLorentzVector( etCorr,
-					eta,
-					phi,
-					0. ) ;
-}     
-
-//define this as a plug-in
+L1ExtraParticlesProd::gctLorentzVector(const double &et, const L1GctCand &cand,
+                                       const L1CaloGeometry *geom,
+                                       bool central) {
+  // To keep x and y components non-zero.
+  double etCorr = et + 1.e-6; // protect against roundoff, not only for et=0
+
+  double eta = geom->etaBinCenter(cand.etaIndex(), central);
+
+  //    double tanThOver2 = exp( -eta ) ;
+  //    double ez = etCorr * ( 1. - tanThOver2 * tanThOver2 ) / ( 2. *
+  //    tanThOver2 ); double e  = etCorr * ( 1. + tanThOver2 * tanThOver2 ) /
+  //    ( 2. * tanThOver2 );
+
+  double phi = geom->emJetPhiBinCenter(cand.phiIndex());
+
+  //    return math::XYZTLorentzVector( etCorr * cos( phi ),
+  // 				   etCorr * sin( phi ),
+  // 				   ez,
+  // 				   e ) ;
+  return math::PtEtaPhiMLorentzVector(etCorr, eta, phi, 0.);
+}
+
+// define this as a plug-in
 DEFINE_FWK_MODULE(L1ExtraParticlesProd);
diff --git a/L1Trigger/L1ExtraFromDigis/src/L1ExtraTestAnalyzer.cc b/L1Trigger/L1ExtraFromDigis/src/L1ExtraTestAnalyzer.cc
index 075faf4f2bccd..a203146bca7e3 100644
--- a/L1Trigger/L1ExtraFromDigis/src/L1ExtraTestAnalyzer.cc
+++ b/L1Trigger/L1ExtraFromDigis/src/L1ExtraTestAnalyzer.cc
@@ -2,8 +2,10 @@
 //
 // Package:    L1ExtraTestAnalyzer
 // Class:      L1ExtraTestAnalyzer
-// 
-/**\class L1ExtraTestAnalyzer \file L1ExtraTestAnalyzer.cc L1TriggerOffline/L1ExtraTestAnalyzer/src/L1ExtraTestAnalyzer.cc \author Werner Sun
+//
+/**\class L1ExtraTestAnalyzer \file L1ExtraTestAnalyzer.cc
+   L1TriggerOffline/L1ExtraTestAnalyzer/src/L1ExtraTestAnalyzer.cc \author
+   Werner Sun
 
    Description: simple analyzer to print out L1Extra object information.
 */
@@ -13,14 +15,13 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <string>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -29,51 +30,51 @@
 #include "FWCore/Utilities/interface/InputTag.h"
 
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
 #include "DataFormats/L1Trigger/interface/L1EmParticle.h"
+#include "DataFormats/L1Trigger/interface/L1EtMissParticle.h"
+#include "DataFormats/L1Trigger/interface/L1HFRings.h"
+#include "DataFormats/L1Trigger/interface/L1HFRingsFwd.h"
 #include "DataFormats/L1Trigger/interface/L1JetParticle.h"
 #include "DataFormats/L1Trigger/interface/L1MuonParticle.h"
-#include "DataFormats/L1Trigger/interface/L1EtMissParticle.h"
 #include "DataFormats/L1Trigger/interface/L1ParticleMap.h"
 #include "DataFormats/L1Trigger/interface/L1ParticleMapFwd.h"
-#include "DataFormats/L1Trigger/interface/L1HFRings.h"
-#include "DataFormats/L1Trigger/interface/L1HFRingsFwd.h"
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "TH1.h"
 #include "TFile.h"
+#include "TH1.h"
 
-using namespace std ;
+using namespace std;
 
 //
 // class decleration
 //
 
 class L1ExtraTestAnalyzer : public edm::EDAnalyzer {
-   public:
-      explicit L1ExtraTestAnalyzer(const edm::ParameterSet&);
-      ~L1ExtraTestAnalyzer() override;
-
-
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-   private:
-      // ----------member data ---------------------------
-
-      edm::InputTag isoEmSource_ ;
-      edm::InputTag nonIsoEmSource_ ;
-      edm::InputTag cenJetSource_ ;
-      edm::InputTag forJetSource_ ;
-      edm::InputTag tauJetSource_ ;
-      edm::InputTag muonSource_ ;
-      edm::InputTag etMissSource_ ;
-      edm::InputTag htMissSource_ ;
-      edm::InputTag hfRingsSource_ ;
-      edm::InputTag gtReadoutSource_ ;
-      edm::InputTag particleMapSource_ ;
-
-      TFile file_ ;
-      TH1F hist_ ;
+public:
+  explicit L1ExtraTestAnalyzer(const edm::ParameterSet &);
+  ~L1ExtraTestAnalyzer() override;
+
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+
+private:
+  // ----------member data ---------------------------
+
+  edm::InputTag isoEmSource_;
+  edm::InputTag nonIsoEmSource_;
+  edm::InputTag cenJetSource_;
+  edm::InputTag forJetSource_;
+  edm::InputTag tauJetSource_;
+  edm::InputTag muonSource_;
+  edm::InputTag etMissSource_;
+  edm::InputTag htMissSource_;
+  edm::InputTag hfRingsSource_;
+  edm::InputTag gtReadoutSource_;
+  edm::InputTag particleMapSource_;
+
+  TFile file_;
+  TH1F hist_;
 };
 
 //
@@ -87,227 +88,161 @@ class L1ExtraTestAnalyzer : public edm::EDAnalyzer {
 //
 // constructors and destructor
 //
-L1ExtraTestAnalyzer::L1ExtraTestAnalyzer(const edm::ParameterSet& iConfig)
-   : isoEmSource_( iConfig.getParameter< edm::InputTag >(
-      "isolatedEmSource" ) ),
-     nonIsoEmSource_( iConfig.getParameter< edm::InputTag >(
-      "nonIsolatedEmSource" ) ),
-     cenJetSource_( iConfig.getParameter< edm::InputTag >(
-      "centralJetSource" ) ),
-     forJetSource_( iConfig.getParameter< edm::InputTag >(
-      "forwardJetSource" ) ),
-     tauJetSource_( iConfig.getParameter< edm::InputTag >(
-      "tauJetSource" ) ),
-     muonSource_( iConfig.getParameter< edm::InputTag >(
-      "muonSource" ) ),
-     etMissSource_( iConfig.getParameter< edm::InputTag >(
-      "etMissSource" ) ),
-     htMissSource_( iConfig.getParameter< edm::InputTag >(
-      "htMissSource" ) ),
-     hfRingsSource_( iConfig.getParameter< edm::InputTag >(
-      "hfRingsSource" ) ),
-     gtReadoutSource_( iConfig.getParameter< edm::InputTag >(
-      "gtReadoutSource" ) ),
-     particleMapSource_( iConfig.getParameter< edm::InputTag >(
-      "particleMapSource" ) ),
-     file_( "l1extra.root", "RECREATE" ),
-     hist_( "triggers", "Triggers",
-	    2*l1extra::L1ParticleMap::kNumOfL1TriggerTypes + 1,
-	    -0.75,
-	    l1extra::L1ParticleMap::kNumOfL1TriggerTypes + 0.5 - 0.75 )
-{
-   //now do what ever initialization is needed
-
+L1ExtraTestAnalyzer::L1ExtraTestAnalyzer(const edm::ParameterSet &iConfig)
+    : isoEmSource_(iConfig.getParameter<edm::InputTag>("isolatedEmSource")),
+      nonIsoEmSource_(
+          iConfig.getParameter<edm::InputTag>("nonIsolatedEmSource")),
+      cenJetSource_(iConfig.getParameter<edm::InputTag>("centralJetSource")),
+      forJetSource_(iConfig.getParameter<edm::InputTag>("forwardJetSource")),
+      tauJetSource_(iConfig.getParameter<edm::InputTag>("tauJetSource")),
+      muonSource_(iConfig.getParameter<edm::InputTag>("muonSource")),
+      etMissSource_(iConfig.getParameter<edm::InputTag>("etMissSource")),
+      htMissSource_(iConfig.getParameter<edm::InputTag>("htMissSource")),
+      hfRingsSource_(iConfig.getParameter<edm::InputTag>("hfRingsSource")),
+      gtReadoutSource_(iConfig.getParameter<edm::InputTag>("gtReadoutSource")),
+      particleMapSource_(
+          iConfig.getParameter<edm::InputTag>("particleMapSource")),
+      file_("l1extra.root", "RECREATE"),
+      hist_("triggers", "Triggers",
+            2 * l1extra::L1ParticleMap::kNumOfL1TriggerTypes + 1, -0.75,
+            l1extra::L1ParticleMap::kNumOfL1TriggerTypes + 0.5 - 0.75) {
+  // now do what ever initialization is needed
 }
 
+L1ExtraTestAnalyzer::~L1ExtraTestAnalyzer() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 
-L1ExtraTestAnalyzer::~L1ExtraTestAnalyzer()
-{
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
-   file_.cd() ;
-   hist_.Write() ;
+  file_.cd();
+  hist_.Write();
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-L1ExtraTestAnalyzer::analyze(const edm::Event& iEvent,
-			     const edm::EventSetup& iSetup)
-{
-   using namespace edm ;
-   using namespace l1extra ;
-
-   static int iev = 0 ;
-   cout << "EVENT " << ++iev << endl ;
-
-   cout << "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" << endl ;
-
-   // Isolated EM particles
-   Handle< L1EmParticleCollection > isoEmColl ;
-   iEvent.getByLabel( isoEmSource_, isoEmColl ) ;
-   cout << "Number of isolated EM " << isoEmColl->size() << endl ;
-
-   for( L1EmParticleCollection::const_iterator emItr = isoEmColl->begin() ;
-        emItr != isoEmColl->end() ;
-        ++emItr )
-   {
-      cout << "  p4 (" << emItr->px()
-	   << ", " << emItr->py()
-	   << ", " << emItr->pz()
-	   << ", " << emItr->energy()
-	   << ") et " << emItr->et()
-	   << " eta " << emItr->eta()
-	   << " phi " << emItr->phi()
-	   << endl ;
-   }
-
-   // Non-isolated EM particles
-   Handle< L1EmParticleCollection > nonIsoEmColl ;
-   iEvent.getByLabel( nonIsoEmSource_, nonIsoEmColl ) ;
-   cout << "Number of non-isolated EM " << nonIsoEmColl->size() << endl ;
-
-   for( L1EmParticleCollection::const_iterator emItr = nonIsoEmColl->begin() ;
-        emItr != nonIsoEmColl->end() ;
-        ++emItr )
-   {
-      cout << "  p4 (" << emItr->px()
-	   << ", " << emItr->py()
-	   << ", " << emItr->pz()
-	   << ", " << emItr->energy()
-	   << ") et " << emItr->et()
-	   << " eta " << emItr->eta()
-	   << " phi " << emItr->phi()
-	   << endl ;
-   }
-
-   // Jet particles
-   Handle< L1JetParticleCollection > cenJetColl ;
-   iEvent.getByLabel( cenJetSource_, cenJetColl ) ;
-   cout << "Number of central jets " << cenJetColl->size() << endl ;
-
-   for( L1JetParticleCollection::const_iterator jetItr = cenJetColl->begin() ;
-        jetItr != cenJetColl->end() ;
-        ++jetItr )
-   {
-      cout << "  p4 (" << jetItr->px()
-	   << ", " << jetItr->py()
-	   << ", " << jetItr->pz()
-	   << ", " << jetItr->energy()
-	   << ") et " << jetItr->et()
-	   << " eta " << jetItr->eta()
-	   << " phi " << jetItr->phi()
-	   << endl ;
-   }
-
-   Handle< L1JetParticleCollection > forJetColl ;
-   iEvent.getByLabel( forJetSource_, forJetColl ) ;
-   cout << "Number of forward jets " << forJetColl->size() << endl ;
-
-   for( L1JetParticleCollection::const_iterator jetItr = forJetColl->begin() ;
-        jetItr != forJetColl->end() ;
-        ++jetItr )
-   {
-      cout << "  p4 (" << jetItr->px()
-	   << ", " << jetItr->py()
-	   << ", " << jetItr->pz()
-	   << ", " << jetItr->energy()
-	   << ") et " << jetItr->et()
-	   << " eta " << jetItr->eta()
-	   << " phi " << jetItr->phi()
-	   << endl ;
-   }
-
-   Handle< L1JetParticleCollection > tauColl ;
-   iEvent.getByLabel( tauJetSource_, tauColl ) ;
-   cout << "Number of tau jets " << tauColl->size() << endl ;
-
-   for( L1JetParticleCollection::const_iterator tauItr = tauColl->begin() ;
-        tauItr != tauColl->end() ;
-        ++tauItr )
-   {
-      cout << "  p4 (" << tauItr->px()
-	   << ", " << tauItr->py()
-	   << ", " << tauItr->pz()
-	   << ", " << tauItr->energy()
-	   << ") et " << tauItr->et()
-	   << " eta " << tauItr->eta()
-	   << " phi " << tauItr->phi()
-	   << endl ;
-   }
-
-   // Muon particles
-   Handle< L1MuonParticleCollection > muColl ;
-   iEvent.getByLabel( muonSource_, muColl ) ;
-   cout << "Number of muons " << muColl->size() << endl ;
-
-   for( L1MuonParticleCollection::const_iterator muItr = muColl->begin() ;
-        muItr != muColl->end() ;
-        ++muItr )
-   {
-      cout << "  q " << muItr->charge()
-	   << " p4 (" << muItr->px()
-	   << ", " << muItr->py()
-	   << ", " << muItr->pz()
-	   << ", " << muItr->energy()
-	   << ") et " << muItr->et()
-	   << " eta " << muItr->eta() << endl
-           << "    phi " << muItr->phi()
-           << " iso " << muItr->isIsolated()
-	   << " mip " << muItr->isMip()
-	   << " fwd " << muItr->isForward()
-	   << " rpc " << muItr->isRPC()
-	   << endl ;
-   }
-
-   // MET
-   Handle< L1EtMissParticleCollection > etMissColl ;
-   iEvent.getByLabel( etMissSource_, etMissColl ) ;
-   cout << "MET Coll (" << etMissColl->begin()->px()
-	<< ", " << etMissColl->begin()->py()
-	<< ", " << etMissColl->begin()->pz()
-	<< ", " << etMissColl->begin()->energy()
-        << ") phi " << etMissColl->begin()->phi()
-        << " EtTot " << etMissColl->begin()->etTotal()
-	<< endl ;
-
-   // MHT
-   Handle< L1EtMissParticleCollection > htMissColl ;
-   iEvent.getByLabel( htMissSource_, htMissColl ) ;
-   cout << "MHT Coll (" << htMissColl->begin()->px()
-	<< ", " << htMissColl->begin()->py()
-	<< ", " << htMissColl->begin()->pz()
-	<< ", " << htMissColl->begin()->energy()
-        << ") phi " << htMissColl->begin()->phi()
-        << " HtTot " << htMissColl->begin()->etTotal()
-	<< endl ;
-
-   // HF Rings
-   Handle< L1HFRingsCollection > hfRingsColl ;
-   iEvent.getByLabel( hfRingsSource_, hfRingsColl ) ;
-   cout << "HF Rings:" << endl ;
-   for( int i = 0 ; i < L1HFRings::kNumRings ; ++i )
-     {
-       cout << "  " << i << ": et sum = "
-	    << hfRingsColl->begin()->hfEtSum( (L1HFRings::HFRingLabels) i )
-	    << ", bit count = "
-	    << hfRingsColl->begin()->hfBitCount( (L1HFRings::HFRingLabels) i )
-	    << endl ;
-     }
-   cout << endl ;
-
-//    // L1GlobalTriggerReadoutRecord
-//    Handle< L1GlobalTriggerReadoutRecord > gtRecord ;
-//    iEvent.getByLabel( gtReadoutSource_, gtRecord ) ;
-//    cout << "Global trigger decision " << gtRecord->decision() << endl ;
-
-   cout << endl ;
+void L1ExtraTestAnalyzer::analyze(const edm::Event &iEvent,
+                                  const edm::EventSetup &iSetup) {
+  using namespace edm;
+  using namespace l1extra;
+
+  static int iev = 0;
+  cout << "EVENT " << ++iev << endl;
+
+  cout << "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" << endl;
+
+  // Isolated EM particles
+  Handle<L1EmParticleCollection> isoEmColl;
+  iEvent.getByLabel(isoEmSource_, isoEmColl);
+  cout << "Number of isolated EM " << isoEmColl->size() << endl;
+
+  for (L1EmParticleCollection::const_iterator emItr = isoEmColl->begin();
+       emItr != isoEmColl->end(); ++emItr) {
+    cout << "  p4 (" << emItr->px() << ", " << emItr->py() << ", "
+         << emItr->pz() << ", " << emItr->energy() << ") et " << emItr->et()
+         << " eta " << emItr->eta() << " phi " << emItr->phi() << endl;
+  }
+
+  // Non-isolated EM particles
+  Handle<L1EmParticleCollection> nonIsoEmColl;
+  iEvent.getByLabel(nonIsoEmSource_, nonIsoEmColl);
+  cout << "Number of non-isolated EM " << nonIsoEmColl->size() << endl;
+
+  for (L1EmParticleCollection::const_iterator emItr = nonIsoEmColl->begin();
+       emItr != nonIsoEmColl->end(); ++emItr) {
+    cout << "  p4 (" << emItr->px() << ", " << emItr->py() << ", "
+         << emItr->pz() << ", " << emItr->energy() << ") et " << emItr->et()
+         << " eta " << emItr->eta() << " phi " << emItr->phi() << endl;
+  }
+
+  // Jet particles
+  Handle<L1JetParticleCollection> cenJetColl;
+  iEvent.getByLabel(cenJetSource_, cenJetColl);
+  cout << "Number of central jets " << cenJetColl->size() << endl;
+
+  for (L1JetParticleCollection::const_iterator jetItr = cenJetColl->begin();
+       jetItr != cenJetColl->end(); ++jetItr) {
+    cout << "  p4 (" << jetItr->px() << ", " << jetItr->py() << ", "
+         << jetItr->pz() << ", " << jetItr->energy() << ") et " << jetItr->et()
+         << " eta " << jetItr->eta() << " phi " << jetItr->phi() << endl;
+  }
+
+  Handle<L1JetParticleCollection> forJetColl;
+  iEvent.getByLabel(forJetSource_, forJetColl);
+  cout << "Number of forward jets " << forJetColl->size() << endl;
+
+  for (L1JetParticleCollection::const_iterator jetItr = forJetColl->begin();
+       jetItr != forJetColl->end(); ++jetItr) {
+    cout << "  p4 (" << jetItr->px() << ", " << jetItr->py() << ", "
+         << jetItr->pz() << ", " << jetItr->energy() << ") et " << jetItr->et()
+         << " eta " << jetItr->eta() << " phi " << jetItr->phi() << endl;
+  }
+
+  Handle<L1JetParticleCollection> tauColl;
+  iEvent.getByLabel(tauJetSource_, tauColl);
+  cout << "Number of tau jets " << tauColl->size() << endl;
+
+  for (L1JetParticleCollection::const_iterator tauItr = tauColl->begin();
+       tauItr != tauColl->end(); ++tauItr) {
+    cout << "  p4 (" << tauItr->px() << ", " << tauItr->py() << ", "
+         << tauItr->pz() << ", " << tauItr->energy() << ") et " << tauItr->et()
+         << " eta " << tauItr->eta() << " phi " << tauItr->phi() << endl;
+  }
+
+  // Muon particles
+  Handle<L1MuonParticleCollection> muColl;
+  iEvent.getByLabel(muonSource_, muColl);
+  cout << "Number of muons " << muColl->size() << endl;
+
+  for (L1MuonParticleCollection::const_iterator muItr = muColl->begin();
+       muItr != muColl->end(); ++muItr) {
+    cout << "  q " << muItr->charge() << " p4 (" << muItr->px() << ", "
+         << muItr->py() << ", " << muItr->pz() << ", " << muItr->energy()
+         << ") et " << muItr->et() << " eta " << muItr->eta() << endl
+         << "    phi " << muItr->phi() << " iso " << muItr->isIsolated()
+         << " mip " << muItr->isMip() << " fwd " << muItr->isForward()
+         << " rpc " << muItr->isRPC() << endl;
+  }
+
+  // MET
+  Handle<L1EtMissParticleCollection> etMissColl;
+  iEvent.getByLabel(etMissSource_, etMissColl);
+  cout << "MET Coll (" << etMissColl->begin()->px() << ", "
+       << etMissColl->begin()->py() << ", " << etMissColl->begin()->pz() << ", "
+       << etMissColl->begin()->energy() << ") phi "
+       << etMissColl->begin()->phi() << " EtTot "
+       << etMissColl->begin()->etTotal() << endl;
+
+  // MHT
+  Handle<L1EtMissParticleCollection> htMissColl;
+  iEvent.getByLabel(htMissSource_, htMissColl);
+  cout << "MHT Coll (" << htMissColl->begin()->px() << ", "
+       << htMissColl->begin()->py() << ", " << htMissColl->begin()->pz() << ", "
+       << htMissColl->begin()->energy() << ") phi "
+       << htMissColl->begin()->phi() << " HtTot "
+       << htMissColl->begin()->etTotal() << endl;
+
+  // HF Rings
+  Handle<L1HFRingsCollection> hfRingsColl;
+  iEvent.getByLabel(hfRingsSource_, hfRingsColl);
+  cout << "HF Rings:" << endl;
+  for (int i = 0; i < L1HFRings::kNumRings; ++i) {
+    cout << "  " << i << ": et sum = "
+         << hfRingsColl->begin()->hfEtSum((L1HFRings::HFRingLabels)i)
+         << ", bit count = "
+         << hfRingsColl->begin()->hfBitCount((L1HFRings::HFRingLabels)i)
+         << endl;
+  }
+  cout << endl;
+
+  //    // L1GlobalTriggerReadoutRecord
+  //    Handle< L1GlobalTriggerReadoutRecord > gtRecord ;
+  //    iEvent.getByLabel( gtReadoutSource_, gtRecord ) ;
+  //    cout << "Global trigger decision " << gtRecord->decision() << endl ;
+
+  cout << endl;
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(L1ExtraTestAnalyzer);
diff --git a/L1Trigger/L1TCaloLayer1/test/testL1TCaloLayer1EmulatorWithSpy.py b/L1Trigger/L1TCaloLayer1/test/testL1TCaloLayer1EmulatorWithSpy.py
index 0c9880bb98953..3fb9028169a38 100644
--- a/L1Trigger/L1TCaloLayer1/test/testL1TCaloLayer1EmulatorWithSpy.py
+++ b/L1Trigger/L1TCaloLayer1/test/testL1TCaloLayer1EmulatorWithSpy.py
@@ -7,8 +7,8 @@
 options.register('maxEvents', 162, VarParsing.multiplicity.singleton, VarParsing.varType.int, 'Maximum number of evnets')
 options.parseArguments()
 
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process("Layer1EmulatorWithSpy", eras.Run2_2016)
+from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
+process = cms.Process("Layer1EmulatorWithSpy", Run2_2016)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/L1Trigger/L1TCalorimeter/python/L1TCaloStage1_PPFromRaw_cff.py b/L1Trigger/L1TCalorimeter/python/L1TCaloStage1_PPFromRaw_cff.py
index 4f910cad344dc..7263a33ea31a4 100644
--- a/L1Trigger/L1TCalorimeter/python/L1TCaloStage1_PPFromRaw_cff.py
+++ b/L1Trigger/L1TCalorimeter/python/L1TCaloStage1_PPFromRaw_cff.py
@@ -43,9 +43,10 @@
 
 
 # the sequence
-L1TCaloStage1_PPFromRaw = cms.Sequence(
+L1TCaloStage1_PPFromRawTask = cms.Task(
     L1TRerunHCALTP_FromRAW
-    +ecalDigis
-    +simRctDigis
-    +L1TCaloStage1
+    ,ecalDigis
+    ,simRctDigis
+    ,L1TCaloStage1Task
 )
+L1TCaloStage1_PPFromRaw = cms.Sequence(L1TCaloStage1_PPFromRawTask)
diff --git a/L1Trigger/L1TCalorimeter/python/L1TCaloStage1_cff.py b/L1Trigger/L1TCalorimeter/python/L1TCaloStage1_cff.py
index a6c86ea979693..72e0b97482b4d 100644
--- a/L1Trigger/L1TCalorimeter/python/L1TCaloStage1_cff.py
+++ b/L1Trigger/L1TCalorimeter/python/L1TCaloStage1_cff.py
@@ -41,9 +41,10 @@
 0.952755905512,	0.96062992126,	0.968503937008,	0.976377952756,	0.984251968504,	0.992125984252,	1.0,
 )
 
-L1TCaloStage1 = cms.Sequence(
-    simRctUpgradeFormatDigis +
-    simCaloStage1Digis +
-    simCaloStage1FinalDigis +
+L1TCaloStage1Task = cms.Task(
+    simRctUpgradeFormatDigis,
+    simCaloStage1Digis,
+    simCaloStage1FinalDigis,
     simCaloStage1LegacyFormatDigis
 )
+L1TCaloStage1 = cms.Sequence(L1TCaloStage1Task)
diff --git a/L1Trigger/L1TCalorimeter/python/L1TCaloStage2_PPFromRaw_cff.py b/L1Trigger/L1TCalorimeter/python/L1TCaloStage2_PPFromRaw_cff.py
index 89404680c558d..196d8881f1bcb 100644
--- a/L1Trigger/L1TCalorimeter/python/L1TCaloStage2_PPFromRaw_cff.py
+++ b/L1Trigger/L1TCalorimeter/python/L1TCaloStage2_PPFromRaw_cff.py
@@ -10,7 +10,8 @@
 caloStage2Layer1Digis.hcalToken = cms.InputTag('simHcalTriggerPrimitiveDigis')
 
 # the sequence
-L1TCaloStage2_PPFromRaw = cms.Sequence(
+L1TCaloStage2_PPFromRawTask = cms.Task(
     L1TRerunHCALTP_FromRAW
-    +L1TCaloStage2
+    ,L1TCaloStage2Task
 )
+L1TCaloStage2_PPFromRaw = cms.Sequence(L1TCaloStage2_PPFromRawTask)
diff --git a/L1Trigger/L1TCalorimeter/python/L1TCaloStage2_cff.py b/L1Trigger/L1TCalorimeter/python/L1TCaloStage2_cff.py
index 72b0380681312..3ca104ba4dad4 100644
--- a/L1Trigger/L1TCalorimeter/python/L1TCaloStage2_cff.py
+++ b/L1Trigger/L1TCalorimeter/python/L1TCaloStage2_cff.py
@@ -3,7 +3,8 @@
 from L1Trigger.L1TCalorimeter.caloStage2Layer1Digis_cfi import *
 from L1Trigger.L1TCalorimeter.caloStage2Digis_cfi import *
 
-L1TCaloStage2 = cms.Sequence(
+L1TCaloStage2Task = cms.Task(
     caloStage2Layer1Digis +
     caloStage2Digis
 )
+L1TCaloStage2 = cms.Sequence(L1TCaloStage2Task)
diff --git a/L1Trigger/L1TCalorimeter/python/L1TRerunHCALTP_FromRaw_cff.py b/L1Trigger/L1TCalorimeter/python/L1TRerunHCALTP_FromRaw_cff.py
index 7a3fafab78f99..bda292c6aed1f 100644
--- a/L1Trigger/L1TCalorimeter/python/L1TRerunHCALTP_FromRaw_cff.py
+++ b/L1Trigger/L1TCalorimeter/python/L1TRerunHCALTP_FromRaw_cff.py
@@ -10,7 +10,7 @@
 
 HcalTPGCoderULUT.LUTGenerationMode = cms.bool(True)
 
-L1TRerunHCALTP_FromRAW = cms.Sequence(
+L1TRerunHCALTP_FromRAW = cms.Task(
     hcalDigis
-    * simHcalTriggerPrimitiveDigis
+    , simHcalTriggerPrimitiveDigis
 )
diff --git a/L1Trigger/L1TCalorimeter/python/simDigis_cff.py b/L1Trigger/L1TCalorimeter/python/simDigis_cff.py
index e994a3400f194..977104f8b73a8 100644
--- a/L1Trigger/L1TCalorimeter/python/simDigis_cff.py
+++ b/L1Trigger/L1TCalorimeter/python/simDigis_cff.py
@@ -15,7 +15,8 @@
 simGctDigis = L1Trigger.GlobalCaloTrigger.gctDigis_cfi.gctDigis.clone(
     inputLabel = 'simRctDigis'
 )
-SimL1TCalorimeter = cms.Sequence(simRctDigis + simGctDigis)
+SimL1TCalorimeterTask = cms.Task(simRctDigis, simGctDigis)
+SimL1TCalorimeter = cms.Sequence(SimL1TCalorimeterTask)
 
 #
 # Stage-1 Trigger
@@ -30,7 +31,7 @@
 from L1Trigger.L1TCalorimeter.caloConfigStage1PP_cfi import *
 from Configuration.Eras.Modifier_stage1L1Trigger_cff import stage1L1Trigger
 from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
-(stage1L1Trigger & ~stage2L1Trigger).toReplaceWith(SimL1TCalorimeter, cms.Sequence(simRctDigis + simRctUpgradeFormatDigis + simCaloStage1Digis + simCaloStage1FinalDigis + simCaloStage1LegacyFormatDigis))
+(stage1L1Trigger & ~stage2L1Trigger).toReplaceWith(SimL1TCalorimeterTask, cms.Task(simRctDigis, simRctUpgradeFormatDigis, simCaloStage1Digis, simCaloStage1FinalDigis, simCaloStage1LegacyFormatDigis))
 
 #
 # Stage-2 Trigger
@@ -41,7 +42,7 @@
 # - layer1 from L1Trigger/L1TCaloLayer1 package
 from L1Trigger.L1TCaloLayer1.simCaloStage2Layer1Digis_cfi import simCaloStage2Layer1Digis
 from L1Trigger.L1TCalorimeter.simCaloStage2Digis_cfi import simCaloStage2Digis
-stage2L1Trigger.toReplaceWith(SimL1TCalorimeter, cms.Sequence( simCaloStage2Layer1Digis + simCaloStage2Digis ))
+stage2L1Trigger.toReplaceWith(SimL1TCalorimeterTask, cms.Task( simCaloStage2Layer1Digis, simCaloStage2Digis ))
 
 def _modifyStage2L1TriggerCaloParams(process):
     from CondCore.CondDB.CondDB_cfi import CondDB
diff --git a/L1Trigger/L1TCommon/test/devHLT.py b/L1Trigger/L1TCommon/test/devHLT.py
index 98d269abe2aee..cfb86d4773a0b 100644
--- a/L1Trigger/L1TCommon/test/devHLT.py
+++ b/L1Trigger/L1TCommon/test/devHLT.py
@@ -5,10 +5,11 @@
 # with command line options: step2 --conditions auto:run2_mc_25ns14e33_v4 -s DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval25ns --datatier GEN-SIM-DIGI-RAW-HLTDEBUG -n 10 --era Run2_25ns --eventcontent FEVTDEBUGHLT --filein filelist:step1_dasquery.log --fileout file:step2.root
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-#process = cms.Process('HLT',eras.Run2_25ns)
-process = cms.Process('HLT',eras.Run2_2016)
+#from Configuration.Eras.Era_Run2_25ns_cff import Run2_25ns
+#process = cms.Process('HLT',Run2_25ns)
+from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
+process = cms.Process('HLT',Run2_2016)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/L1Trigger/L1TCommon/test/runHLT.py b/L1Trigger/L1TCommon/test/runHLT.py
index b7f1b8b31d35c..bbe4fc0ea92ac 100644
--- a/L1Trigger/L1TCommon/test/runHLT.py
+++ b/L1Trigger/L1TCommon/test/runHLT.py
@@ -5,10 +5,11 @@
 # with command line options: debug --no_exec --conditions auto:run2_mc_25ns14e33_v4 -s DIGI:pdigi_valid,L1,DIGI2RAW,RAW2DIGI --datatier GEN-SIM-DIGI-RAW-HLTDEBUG -n 10 --era Run2_25ns --eventcontent FEVTDEBUGHLT --filein filelist:step1_dasquery.log --fileout file:step2.root
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-#process = cms.Process('L1SEQS',eras.Run2_25ns)
-process = cms.Process('L1SEQS',eras.Run2_2016)
+#from Configuration.Eras.Era_Run2_25ns_cff import Run2_25ns
+#process = cms.Process('L1SEQS',Run2_25ns)
+from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
+process = cms.Process('L1SEQS',Run2_2016)
 
 
 # import of standard configurations
diff --git a/L1Trigger/L1TCommon/test/runL1T.py b/L1Trigger/L1TCommon/test/runL1T.py
index af54bad97c285..8e2c0e4db653c 100644
--- a/L1Trigger/L1TCommon/test/runL1T.py
+++ b/L1Trigger/L1TCommon/test/runL1T.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("L1TMuonEmulation", eras.Run2_2016)
+from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
+process = cms.Process("L1TMuonEmulation", Run2_2016)
 import os
 import sys
 import commands
diff --git a/L1Trigger/L1TCommon/test/runStandardSequences.py b/L1Trigger/L1TCommon/test/runStandardSequences.py
index 655da899658d5..57e28bb46882f 100644
--- a/L1Trigger/L1TCommon/test/runStandardSequences.py
+++ b/L1Trigger/L1TCommon/test/runStandardSequences.py
@@ -6,10 +6,11 @@
 # with command line options: debug --no_exec --conditions auto:run2_mc_25ns14e33_v4 -s DIGI:pdigi_valid,L1,DIGI2RAW,RAW2DIGI --datatier GEN-SIM-DIGI-RAW-HLTDEBUG -n 10 --era Run2_25ns --eventcontent FEVTDEBUGHLT --filein filelist:step1_dasquery.log --fileout file:step2.root
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-#process = cms.Process('L1SEQS',eras.Run2_25ns)
-process = cms.Process('L1SEQS',eras.Run2_2016)
+#from Configuration.Eras.Era_Run2_25ns_cff import Run2_25ns
+#process = cms.Process('L1SEQS',Run2_25ns)
+from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
+process = cms.Process('L1SEQS',Run2_2016)
 
 process.MessageLogger = cms.Service(
     "MessageLogger",
diff --git a/L1Trigger/L1TGlobal/python/simDigis_cff.py b/L1Trigger/L1TGlobal/python/simDigis_cff.py
index 4ff0f4484a8b1..f28ba03a69d2f 100644
--- a/L1Trigger/L1TGlobal/python/simDigis_cff.py
+++ b/L1Trigger/L1TGlobal/python/simDigis_cff.py
@@ -22,7 +22,8 @@
         'simCastorTechTrigDigis'
     ]
 )
-SimL1TGlobal = cms.Sequence(simGtDigis)
+SimL1TGlobalTask = cms.Task(simGtDigis)
+SimL1TGlobal = cms.Sequence(SimL1TGlobalTask)
 
 #
 # Stage-2 Trigger
@@ -32,4 +33,4 @@
 #
 from L1Trigger.L1TGlobal.simGtStage2Digis_cfi import *
 from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
-stage2L1Trigger.toReplaceWith(SimL1TGlobal, cms.Sequence(simGtStage2Digis))
+stage2L1Trigger.toReplaceWith(SimL1TGlobalTask, cms.Task(simGtStage2Digis))
diff --git a/L1Trigger/L1TGlobal/test/runGTSummary.py b/L1Trigger/L1TGlobal/test/runGTSummary.py
index fd3e84865ab1f..80d793ab9866a 100644
--- a/L1Trigger/L1TGlobal/test/runGTSummary.py
+++ b/L1Trigger/L1TGlobal/test/runGTSummary.py
@@ -3,8 +3,8 @@
 from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process('L1GTSUMMARY',eras.Run2_2016)
+from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
+process = cms.Process('L1GTSUMMARY',Run2_2016)
 
 process.load('Configuration.StandardSequences.Services_cff')
 process.load('FWCore.MessageService.MessageLogger_cfi')
diff --git a/L1Trigger/L1THGCal/interface/concentrator/HGCalConcentratorSuperTriggerCellImpl.h b/L1Trigger/L1THGCal/interface/concentrator/HGCalConcentratorSuperTriggerCellImpl.h
index 72ed657f7dd4e..bedd5cb2bb5a0 100644
--- a/L1Trigger/L1THGCal/interface/concentrator/HGCalConcentratorSuperTriggerCellImpl.h
+++ b/L1Trigger/L1THGCal/interface/concentrator/HGCalConcentratorSuperTriggerCellImpl.h
@@ -23,18 +23,18 @@ class HGCalConcentratorSuperTriggerCellImpl {
 
 private:
   int getSuperTriggerCellId(int detid) const;
-  static std::map<int, int> kSplit_;
-  static const int kWafer_offset_ = 6;
-  static const int kSTCsizeCoarse_ = 16;
-  static const int kSTCsizeFine_ = 4;
-  static const int kSplit_v8_Coarse_ = 0x30;
-  static const int kSplit_v8_Fine_ = 0x3a;
-  static const int kNLayers_ = 3;
-  static const int kSplit_v9_ = 0x36;
+  static const std::map<int, int> kSplit_;
+  static constexpr int kWafer_offset_ = 6;
+  static constexpr int kSTCsizeCoarse_ = 16;
+  static constexpr int kSTCsizeFine_ = 4;
+  static constexpr int kSplit_v8_Coarse_ = 0x30;
+  static constexpr int kSplit_v8_Fine_ = 0x3a;
+  static constexpr int kNLayers_ = 3;
+  static constexpr int kSplit_v9_ = 0x36;
 
-  static const int kRocShift_ = 6;
-  static const int kRotate4_ = 4;
-  static const int kUShift_ = 3;
+  static constexpr int kRocShift_ = 6;
+  static constexpr int kRotate4_ = 4;
+  static constexpr int kUShift_ = 3;
 
   HGCalTriggerTools triggerTools_;
   HGCSiliconDetIdToROC detIdToROC_;
diff --git a/L1Trigger/L1THGCal/interface/veryfrontend/HGCalVFESummationImpl.h b/L1Trigger/L1THGCal/interface/veryfrontend/HGCalVFESummationImpl.h
index cb74c54138ebb..6a55720ae4ec1 100644
--- a/L1Trigger/L1THGCal/interface/veryfrontend/HGCalVFESummationImpl.h
+++ b/L1Trigger/L1THGCal/interface/veryfrontend/HGCalVFESummationImpl.h
@@ -19,10 +19,13 @@ class HGCalVFESummationImpl {
   void triggerCellSums(const HGCalTriggerGeometryBase&,
                        const std::vector<std::pair<DetId, uint32_t> >&,
                        std::unordered_map<uint32_t, uint32_t>& payload);
-  const std::vector<double>& thicknessCorrections() const { return thickness_corrections_; }
 
 private:
   std::vector<double> thickness_corrections_;
+  double lsb_silicon_fC_;
+  double lsb_scintillator_MIP_;
+  std::vector<double> thresholds_silicon_;
+  double threshold_scintillator_;
   HGCalTriggerTools triggerTools_;
 };
 
diff --git a/L1Trigger/L1THGCal/plugins/veryfrontend/HGCalVFEProcessorSums.cc b/L1Trigger/L1THGCal/plugins/veryfrontend/HGCalVFEProcessorSums.cc
index d547c7612c649..8d5d6d7b462f8 100644
--- a/L1Trigger/L1THGCal/plugins/veryfrontend/HGCalVFEProcessorSums.cc
+++ b/L1Trigger/L1THGCal/plugins/veryfrontend/HGCalVFEProcessorSums.cc
@@ -10,7 +10,7 @@ HGCalVFEProcessorSums::HGCalVFEProcessorSums(const edm::ParameterSet& conf) : HG
   vfeLinearizationImpl_ = std::make_unique<HGCalVFELinearizationImpl>(conf);
   vfeSummationImpl_ = std::make_unique<HGCalVFESummationImpl>(conf);
   vfeCompressionImpl_ = std::make_unique<HGCalVFECompressionImpl>(conf);
-  calibration_ = std::make_unique<HGCalTriggerCellCalibration>(conf.getParameterSet("calib_parameters"));
+  calibration_ = std::make_unique<HGCalTriggerCellCalibration>(conf);
 }
 
 void HGCalVFEProcessorSums::run(const HGCalDigiCollection& digiColl,
diff --git a/L1Trigger/L1THGCal/python/customClustering.py b/L1Trigger/L1THGCal/python/customClustering.py
index c7696c0d528b9..e98cc4e4c4f17 100644
--- a/L1Trigger/L1THGCal/python/customClustering.py
+++ b/L1Trigger/L1THGCal/python/customClustering.py
@@ -1,238 +1,217 @@
 import FWCore.ParameterSet.Config as cms
-
-binSums = cms.vuint32(13,               #0
-                      11, 11, 11,       # 1 - 3
-                      9, 9, 9,          # 4 - 6
-                      7, 7, 7, 7, 7, 7, # 7 - 12
-                      5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,  # 13 - 27
-                      3, 3, 3, 3, 3, 3, 3, 3  # 28 - 35
-                      )
-
-EE_DR_GROUP = 7
-FH_DR_GROUP = 6
-BH_DR_GROUP = 12
-MAX_LAYERS = 52
-
-dr_layerbylayer = ([0] + # no layer 0
-        [0.015]*EE_DR_GROUP + [0.020]*EE_DR_GROUP + [0.030]*EE_DR_GROUP + [0.040]*EE_DR_GROUP + # EM
-        [0.040]*FH_DR_GROUP + [0.050]*FH_DR_GROUP + # FH
-        [0.050]*BH_DR_GROUP) # BH
-
-
-dr_layerbylayer_Bcoefficient = ([0] + # no layer 0
-        [0.020]*EE_DR_GROUP + [0.020]*EE_DR_GROUP + [0.02]*EE_DR_GROUP + [0.020]*EE_DR_GROUP + # EM
-        [0.020]*FH_DR_GROUP + [0.020]*FH_DR_GROUP + # FH
-        [0.020]*BH_DR_GROUP) # BH
-
-
-def custom_2dclustering_distance(process, 
-        distance=6.,# cm
-        seed_threshold=5.,# MipT
-        cluster_threshold=2.# MipT
-        ):
-    parameters_c2d = process.hgcalBackEndLayer1Producer.ProcessorParameters.C2d_parameters
-    parameters_c2d.seeding_threshold_silicon = cms.double(seed_threshold) 
-    parameters_c2d.seeding_threshold_scintillator = cms.double(seed_threshold) 
-    parameters_c2d.clustering_threshold_silicon = cms.double(cluster_threshold) 
-    parameters_c2d.clustering_threshold_scintillator = cms.double(cluster_threshold) 
-    parameters_c2d.dR_cluster = cms.double(distance) 
-    parameters_c2d.clusterType = cms.string('dRC2d') 
+from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import dummy_C2d_params, \
+                                                              distance_C2d_params, \
+                                                              topological_C2d_params, \
+                                                              constrTopological_C2d_params
+from L1Trigger.L1THGCal.hgcalBackEndLayer2Producer_cfi import distance_C3d_params, \
+                                                              dbscan_C3d_params, \
+                                                              histoMax_C3d_params, \
+                                                              histoMaxVariableDR_C3d_params, \
+                                                              histoSecondaryMax_C3d_params, \
+                                                              histoInterpolatedMax_C3d_params, \
+                                                              histoThreshold_C3d_params, \
+                                                              dr_layerbylayer, \
+                                                              dr_layerbylayer_Bcoefficient, \
+                                                              neighbour_weights_1stOrder, \
+                                                              neighbour_weights_2ndOrder, \
+                                                              MAX_LAYERS
+
+
+def set_threshold_params(pset, seed_threshold, cluster_threshold):
+    pset.seeding_threshold_silicon = seed_threshold
+    pset.seeding_threshold_scintillator = seed_threshold
+    pset.clustering_threshold_silicon = cluster_threshold
+    pset.clustering_threshold_scintillator = cluster_threshold
+
+
+def custom_2dclustering_distance(process,
+                                 distance=distance_C2d_params.dR_cluster,  # cm
+                                 seed_threshold=distance_C2d_params.seeding_threshold_silicon,  # MipT
+                                 cluster_threshold=distance_C2d_params.clustering_threshold_silicon  # MipT
+                                 ):
+    parameters_c2d = distance_C2d_params.clone(dR_cluster = distance)
+    set_threshold_params(parameters_c2d, seed_threshold, cluster_threshold)
+    process.hgcalBackEndLayer1Producer.ProcessorParameters.C2d_parameters = parameters_c2d
     return process
 
+
 def custom_2dclustering_topological(process,
-        seed_threshold=5.,# MipT
-        cluster_threshold=2.# MipT
-        ):
-    parameters_c2d = process.hgcalBackEndLayer1Producer.ProcessorParameters.C2d_parameters
-    parameters_c2d.seeding_threshold_silicon = cms.double(seed_threshold) # MipT
-    parameters_c2d.seeding_threshold_scintillator = cms.double(seed_threshold) # MipT
-    parameters_c2d.clustering_threshold_silicon = cms.double(cluster_threshold) # MipT
-    parameters_c2d.clustering_threshold_scintillator = cms.double(cluster_threshold) # MipT
-    parameters_c2d.clusterType = cms.string('NNC2d') 
+                                    seed_threshold=topological_C2d_params.seeding_threshold_silicon,  # MipT
+                                    cluster_threshold=topological_C2d_params.clustering_threshold_silicon  # MipT
+                                    ):
+    parameters_c2d = topological_C2d_params.clone()
+    set_threshold_params(parameters_c2d, seed_threshold, cluster_threshold)
+    process.hgcalBackEndLayer1Producer.ProcessorParameters.C2d_parameters = parameters_c2d
     return process
 
+
 def custom_2dclustering_constrainedtopological(process,
-        distance=6.,# cm
-        seed_threshold=5.,# MipT
-        cluster_threshold=2.# MipT
-        ):
-    parameters_c2d = process.hgcalBackEndLayer1Producer.ProcessorParameters.C2d_parameters
-    parameters_c2d.seeding_threshold_silicon = cms.double(seed_threshold) # MipT
-    parameters_c2d.seeding_threshold_scintillator = cms.double(seed_threshold) # MipT
-    parameters_c2d.clustering_threshold_silicon = cms.double(cluster_threshold) # MipT
-    parameters_c2d.clustering_threshold_scintillator = cms.double(cluster_threshold) # MipT
-    parameters_c2d.dR_cluster = cms.double(distance) # cm
-    parameters_c2d.clusterType = cms.string('dRNNC2d') 
+                                               distance=constrTopological_C2d_params.dR_cluster,  # cm
+                                               seed_threshold=constrTopological_C2d_params.seeding_threshold_silicon,  # MipT
+                                               cluster_threshold=constrTopological_C2d_params.clustering_threshold_silicon  # MipT
+                                               ):
+    parameters_c2d = constrTopological_C2d_params.clone(dR_cluster = distance)
+    set_threshold_params(parameters_c2d, seed_threshold, cluster_threshold)
+    process.hgcalBackEndLayer1Producer.ProcessorParameters.C2d_parameters = parameters_c2d
     return process
 
+
 def custom_2dclustering_dummy(process):
-    parameters_c2d = process.hgcalBackEndLayer1Producer.ProcessorParameters.C2d_parameters
-    parameters_c2d.clusterType = cms.string('dummyC2d')
+    process.hgcalBackEndLayer1Producer.ProcessorParameters.C2d_parameters = dummy_C2d_params.clone()
     return process
 
 
 def custom_3dclustering_distance(process,
-        distance=0.01
-        ):
-    parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
-    parameters_c3d.dR_multicluster = cms.double(distance)
-    parameters_c3d.type_multicluster = cms.string('dRC3d')
+                                 distance=distance_C3d_params.dR_multicluster
+                                 ):
+    parameters_c3d = distance_C3d_params.clone(dR_multicluster = distance)
+    process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters = parameters_c3d
     return process
 
 
 def custom_3dclustering_dbscan(process,
-        distance=0.005,
-        min_points=3
-        ):
-    parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
-    parameters_c3d.dist_dbscan_multicluster = cms.double(distance)
-    parameters_c3d.minN_dbscan_multicluster = cms.uint32(min_points)
-    parameters_c3d.type_multicluster = cms.string('DBSCANC3d')
+                               distance=dbscan_C3d_params.dist_dbscan_multicluster,
+                               min_points=dbscan_C3d_params.minN_dbscan_multicluster
+                               ):
+    parameters_c3d = dbscan_C3d_params.clone(
+            dist_dbscan_multicluster = distance,
+            minN_dbscan_multicluster = min_points
+            )
+    process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters = parameters_c3d
     return process
 
 
-def custom_3dclustering_histoMax(process,
-        distance = 0.03,
-        nBins_R = 36,
-        nBins_Phi = 216,
-        binSumsHisto = binSums,                        
-        seed_threshold = 10,
-        ):
-    parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
-    parameters_c3d.dR_multicluster = cms.double(distance)
-    parameters_c3d.nBins_R_histo_multicluster = cms.uint32(nBins_R)
-    parameters_c3d.nBins_Phi_histo_multicluster = cms.uint32(nBins_Phi)
+def set_histomax_params(parameters_c3d, distance, nBins_R, nBins_Phi, binSumsHisto, seed_threshold):
+    parameters_c3d.dR_multicluster = distance
+    parameters_c3d.nBins_R_histo_multicluster = nBins_R
+    parameters_c3d.nBins_Phi_histo_multicluster = nBins_Phi
     parameters_c3d.binSumsHisto = binSumsHisto
     parameters_c3d.threshold_histo_multicluster = seed_threshold
-    parameters_c3d.type_multicluster = cms.string('HistoMaxC3d')
-    return process
-
-def custom_3dclustering_histoSecondaryMax(process,
-        distance = 0.03, 
-        threshold = 5.,
-        nBins_R = 36,
-        nBins_Phi = 216,
-        binSumsHisto = binSums,
-        ):
-    parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
-    parameters_c3d.dR_multicluster = cms.double(distance)
-    parameters_c3d.nBins_R_histo_multicluster = cms.uint32(nBins_R)
-    parameters_c3d.nBins_Phi_histo_multicluster = cms.uint32(nBins_Phi)
-    parameters_c3d.binSumsHisto = binSumsHisto
-    parameters_c3d.threshold_histo_multicluster = cms.double(threshold)
-    parameters_c3d.type_multicluster = cms.string('HistoSecondaryMaxC3d')
-    return process
-
-
-def custom_3dclustering_histoMax_variableDr(process,
-        distances = dr_layerbylayer,
-        nBins_R = 36,
-        nBins_Phi = 216,
-        binSumsHisto = binSums,                        
-        seed_threshold = 10,
-        ):
-    process = custom_3dclustering_histoMax(process, 0, nBins_R, nBins_Phi, binSumsHisto, seed_threshold)
-    parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
-    parameters_c3d.dR_multicluster_byLayer_coefficientA = cms.vdouble(distances)
-    return process
 
 
-
-def custom_3dclustering_histoInterpolatedMax(process,
-        distance = 0.03,
-        seed_threshold = 5.,
-        nBins_R = 36,
-        nBins_Phi = 216,
-        binSumsHisto = binSums,
-        ):
-    process = custom_3dclustering_histoMax( process, distance, nBins_R, nBins_Phi, binSumsHisto, seed_threshold )    
-    parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
-    parameters_c3d.type_multicluster = cms.string('HistoInterpolatedMaxC3d')
+def custom_3dclustering_histoMax(process,
+                                 distance=histoMax_C3d_params.dR_multicluster,
+                                 nBins_R=histoMax_C3d_params.nBins_R_histo_multicluster,
+                                 nBins_Phi=histoMax_C3d_params.nBins_Phi_histo_multicluster,
+                                 binSumsHisto=histoMax_C3d_params.binSumsHisto,
+                                 seed_threshold=histoMax_C3d_params.threshold_histo_multicluster,
+                                 ):
+    parameters_c3d = histoMax_C3d_params.clone()
+    set_histomax_params(parameters_c3d, distance, nBins_R, nBins_Phi, binSumsHisto, seed_threshold)
+    process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters = parameters_c3d
     return process
 
-def custom_3dclustering_histoInterpolatedMax1stOrder(process, distance = 0.03, seed_threshold = 5. ):
 
-    parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
-    parameters_c3d.neighbour_weights=cms.vdouble(  0    , 0.25, 0   ,
-                                                   0.25 , 0   , 0.25,
-                                                   0    , 0.25, 0
-                                                )
-    process = custom_3dclustering_histoInterpolatedMax( process, distance, seed_threshold )    
+def custom_3dclustering_histoSecondaryMax(process,
+                                          distance=histoSecondaryMax_C3d_params.dR_multicluster,
+                                          threshold=histoSecondaryMax_C3d_params.threshold_histo_multicluster,
+                                          nBins_R=histoSecondaryMax_C3d_params.nBins_R_histo_multicluster,
+                                          nBins_Phi=histoSecondaryMax_C3d_params.nBins_Phi_histo_multicluster,
+                                          binSumsHisto=histoSecondaryMax_C3d_params.binSumsHisto,
+                                          ):
+    parameters_c3d = histoSecondaryMax_C3d_params.clone()
+    set_histomax_params(parameters_c3d, distance, nBins_R, nBins_Phi, binSumsHisto, threshold)
+    process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters = parameters_c3d
     return process
 
 
-
-def custom_3dclustering_histoInterpolatedMax2ndOrder(process, distance = 0.03, seed_threshold = 5.):
-
-    parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
-    parameters_c3d.neighbour_weights=cms.vdouble( -0.25, 0.5, -0.25,
-                                                   0.5 , 0  ,  0.5 ,
-                                                  -0.25, 0.5, -0.25
-                                                )
-    process = custom_3dclustering_histoInterpolatedMax( process, distance, seed_threshold )    
+def custom_3dclustering_histoMax_variableDr(process,
+                                            distances=histoMaxVariableDR_C3d_params.dR_multicluster_byLayer_coefficientA,
+                                            nBins_R=histoMaxVariableDR_C3d_params.nBins_R_histo_multicluster,
+                                            nBins_Phi=histoMaxVariableDR_C3d_params.nBins_Phi_histo_multicluster,
+                                            binSumsHisto=histoMaxVariableDR_C3d_params.binSumsHisto,
+                                            seed_threshold=histoMaxVariableDR_C3d_params.threshold_histo_multicluster,
+                                            ):
+    parameters_c3d = histoMaxVariableDR_C3d_params.clone(
+            dR_multicluster_byLayer_coefficientA = cms.vdouble(distances)
+            )
+    set_histomax_params(parameters_c3d, 0, nBins_R, nBins_Phi, binSumsHisto, seed_threshold)
+    process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters = parameters_c3d
+    return process
+
+
+def custom_3dclustering_histoInterpolatedMax1stOrder(process,
+                                                     distance=histoInterpolatedMax_C3d_params.dR_multicluster,
+                                                     nBins_R=histoInterpolatedMax_C3d_params.nBins_R_histo_multicluster,
+                                                     nBins_Phi=histoInterpolatedMax_C3d_params.nBins_Phi_histo_multicluster,
+                                                     binSumsHisto=histoInterpolatedMax_C3d_params.binSumsHisto,
+                                                     seed_threshold=histoInterpolatedMax_C3d_params.threshold_histo_multicluster
+                                                     ):
+    parameters_c3d = histoInterpolatedMax_C3d_params.clone(
+            neighbour_weights = neighbour_weights_1stOrder
+            )
+    set_histomax_params(parameters_c3d, distance, nBins_R, nBins_Phi, binSumsHisto, seed_threshold)
+    process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters = parameters_c3d
+    return process
+
+
+def custom_3dclustering_histoInterpolatedMax2ndOrder(process,
+                                                     distance=histoInterpolatedMax_C3d_params.dR_multicluster,
+                                                     nBins_R=histoInterpolatedMax_C3d_params.nBins_R_histo_multicluster,
+                                                     nBins_Phi=histoInterpolatedMax_C3d_params.nBins_Phi_histo_multicluster,
+                                                     binSumsHisto=histoInterpolatedMax_C3d_params.binSumsHisto,
+                                                     seed_threshold=histoInterpolatedMax_C3d_params.threshold_histo_multicluster):
+    parameters_c3d = histoInterpolatedMax_C3d_params.clone(
+            neighbour_weights = neighbour_weights_2ndOrder
+            )
+    set_histomax_params(parameters_c3d, distance, nBins_R, nBins_Phi, binSumsHisto, seed_threshold)
+    process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters = parameters_c3d
     return process
 
 
-
 def custom_3dclustering_histoThreshold(process,
-        threshold = 20.,
-        distance = 0.03,
-        nBins_R = 36,
-        nBins_Phi = 216,
-        binSumsHisto = binSums,
-        ):
-    parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
-    parameters_c3d.threshold_histo_multicluster = cms.double(threshold)
-    parameters_c3d.dR_multicluster = cms.double(distance)
-    parameters_c3d.nBins_R_histo_multicluster = cms.uint32(nBins_R)
-    parameters_c3d.nBins_Phi_histo_multicluster = cms.uint32(nBins_Phi)
-    parameters_c3d.binSumsHisto = binSumsHisto
-    parameters_c3d.type_multicluster = cms.string('HistoThresholdC3d')
+                                       distance=histoThreshold_C3d_params.dR_multicluster,
+                                       nBins_R=histoThreshold_C3d_params.nBins_R_histo_multicluster,
+                                       nBins_Phi=histoThreshold_C3d_params.nBins_Phi_histo_multicluster,
+                                       binSumsHisto=histoThreshold_C3d_params.binSumsHisto,
+                                       seed_threshold=histoThreshold_C3d_params.threshold_histo_multicluster
+                                       ):
+    parameters_c3d = histoThreshold_C3d_params.clone()
+    set_histomax_params(parameters_c3d, distance, nBins_R, nBins_Phi, binSumsHisto, seed_threshold)
+    process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters = parameters_c3d
     return process
 
-def custom_3dclustering_clusteringRadiusLayerbyLayerVariableEta(process, distance_coefficientA = dr_layerbylayer, distance_coefficientB = dr_layerbylayer_Bcoefficient):
-    
+
+def custom_3dclustering_clusteringRadiusLayerbyLayerVariableEta(process,
+                                                                distance_coefficientA=dr_layerbylayer,
+                                                                distance_coefficientB=dr_layerbylayer_Bcoefficient):
     parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
     parameters_c3d.dR_multicluster_byLayer_coefficientA = distance_coefficientA
     parameters_c3d.dR_multicluster_byLayer_coefficientB = distance_coefficientB
-
     return process
 
 
-def custom_3dclustering_clusteringRadiusLayerbyLayerFixedEta(process, distance_coefficientA = dr_layerbylayer):
-    
+def custom_3dclustering_clusteringRadiusLayerbyLayerFixedEta(process,
+                                                             distance_coefficientA=dr_layerbylayer):
     parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
     parameters_c3d.dR_multicluster_byLayer_coefficientA = distance_coefficientA
     parameters_c3d.dR_multicluster_byLayer_coefficientB = cms.vdouble( [0]*(MAX_LAYERS+1) )
-
     return process
 
-def custom_3dclustering_clusteringRadiusNoLayerDependenceFixedEta(process, distance_coefficientA = 0.03):
-    
+def custom_3dclustering_clusteringRadiusNoLayerDependenceFixedEta(process,
+                                                                  distance_coefficientA=0.03):
     parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
     parameters_c3d.dR_multicluster_byLayer_coefficientA = cms.vdouble( [distance_coefficientA]*(MAX_LAYERS+1) )
     parameters_c3d.dR_multicluster_byLayer_coefficientB = cms.vdouble( [0]*(MAX_LAYERS+1) )
-
     return process
 
-def custom_3dclustering_clusteringRadiusNoLayerDependenceVariableEta(process, distance_coefficientA = 0.03, distance_coefficientB = 0.02):
-    
+def custom_3dclustering_clusteringRadiusNoLayerDependenceVariableEta(process,
+                                                                     distance_coefficientA=0.03,
+                                                                     distance_coefficientB=0.02):
     parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
     parameters_c3d.dR_multicluster_byLayer_coefficientA = cms.vdouble( [distance_coefficientA]*(MAX_LAYERS+1) )
     parameters_c3d.dR_multicluster_byLayer_coefficientB = cms.vdouble( [distance_coefficientB]*(MAX_LAYERS+1) )
-
     return process
 
 
 def custom_3dclustering_nearestNeighbourAssociation(process):
-    
     parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
     parameters_c3d.cluster_association = cms.string('NearestNeighbour')
 
     return process
 
 def custom_3dclustering_EnergySplitAssociation(process):
-    
+
     parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
     parameters_c3d.cluster_association = cms.string('EnergySplit')
     return process
diff --git a/L1Trigger/L1THGCal/python/customIdentification.py b/L1Trigger/L1THGCal/python/customIdentification.py
index 1cd21422decfb..6712da949e9d2 100644
--- a/L1Trigger/L1THGCal/python/customIdentification.py
+++ b/L1Trigger/L1THGCal/python/customIdentification.py
@@ -12,9 +12,10 @@ def custom_identification_drnn_cone(process,
         if not wp in cat:
             raise KeyError('HGC TPG ID: Cannot find a cut corresponding to the working point {}'.format(wp))
     parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
-    identification = egamma_identification_drnn_cone.clone()
-    identification.WorkingPoints = cms.vdouble(
-            [wps[eff] for wps,eff in zip(working_points_drnn_cone,working_points)]
+    identification = egamma_identification_drnn_cone.clone(
+            WorkingPoints = cms.vdouble(
+                [wps[eff] for wps,eff in zip(working_points_drnn_cone,working_points)]
+                )
             )
     parameters_c3d.EGIdentification = identification
     return process
@@ -30,9 +31,29 @@ def custom_identification_drnn_dbscan(process,
         if not wp in cat:
             raise KeyError('HGC TPG ID: Cannot find a cut corresponding to the working point {}'.format(wp))
     parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
-    identification = egamma_identification_drnn_dbscan.clone()
-    identification.WorkingPoints = cms.vdouble(
-            [wps[eff] for wps,eff in zip(working_points_drnn_dbscan,working_points)]
+    identification = egamma_identification_drnn_dbscan.clone(
+            WorkingPoints = cms.vdouble(
+                [wps[eff] for wps,eff in zip(working_points_drnn_dbscan,working_points)]
+                )
+            )
+    parameters_c3d.EGIdentification = identification
+    return process
+
+
+def custom_identification_histomax(process,
+        working_points=tight_wp
+        ):
+    if len(working_points)!=len(working_points_histomax):
+        raise RuntimeError('HGC TPG ID: Number of working points ({0}) not compatible with number of categories ({1})'.format(
+                    len(working_points), len(working_points_histomax)))
+    for wp,cat in zip(working_points,working_points_drnn_dbscan):
+        if not wp in cat:
+            raise KeyError('HGC TPG ID: Cannot find a cut corresponding to the working point {}'.format(wp))
+    parameters_c3d = process.hgcalBackEndLayer2Producer.ProcessorParameters.C3d_parameters
+    identification = egamma_identification_histomax.clone(
+            WorkingPoints = cms.vdouble(
+                [wps[eff] for wps,eff in zip(working_points_histomax,working_points)]
+                )
             )
     parameters_c3d.EGIdentification = identification
     return process
diff --git a/L1Trigger/L1THGCal/python/customTriggerCellSelect.py b/L1Trigger/L1THGCal/python/customTriggerCellSelect.py
index 7473ef1b7d4ce..6ec000da1564f 100644
--- a/L1Trigger/L1THGCal/python/customTriggerCellSelect.py
+++ b/L1Trigger/L1THGCal/python/customTriggerCellSelect.py
@@ -1,45 +1,31 @@
 import FWCore.ParameterSet.Config as cms
 import SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi as digiparam
+from L1Trigger.L1THGCal.hgcalConcentratorProducer_cfi import threshold_conc_proc, best_conc_proc, supertc_conc_proc
 
-def custom_triggercellselect_supertriggercell(process, 
-                                              stcSize = cms.vuint32(4,4,4)
-                                              ):
-    
-    parameters = process.hgcalConcentratorProducer.ProcessorParameters
-    parameters.Method = cms.string('superTriggerCellSelect')
-    parameters.stcSize = stcSize
 
+def custom_triggercellselect_supertriggercell(process,
+                                              stcSize=supertc_conc_proc.stcSize
+                                              ):
+    parameters = supertc_conc_proc.clone(stcSize = stcSize)
+    process.hgcalConcentratorProducer.ProcessorParameters = parameters
     return process
 
 
 def custom_triggercellselect_threshold(process,
-        threshold=2. # in mipT
-        ):
-    adcSaturationBH_MIP = digiparam.hgchebackDigitizer.digiCfg.feCfg.adcSaturation_fC
-    adcNbitsBH = digiparam.hgchebackDigitizer.digiCfg.feCfg.adcNbits
-
-    parameters = process.hgcalConcentratorProducer.ProcessorParameters
-    parameters.Method = cms.string('thresholdSelect')
-    parameters.linLSB = cms.double(100./1024.)
-    parameters.adcsaturationBH = adcSaturationBH_MIP
-    parameters.adcnBitsBH = adcNbitsBH
-    parameters.TCThreshold_fC = cms.double(0.)
-    parameters.TCThresholdBH_MIP = cms.double(0.)
-    parameters.triggercell_threshold_silicon = cms.double(threshold) # MipT
-    parameters.triggercell_threshold_scintillator = cms.double(threshold) # MipT
+                                       threshold_silicon=threshold_conc_proc.triggercell_threshold_silicon,  # in mipT
+                                       threshold_scintillator=threshold_conc_proc.triggercell_threshold_scintillator  # in mipT
+                                       ):
+    parameters = threshold_conc_proc.clone(
+            triggercell_threshold_silicon = threshold_silicon,
+            triggercell_threshold_scintillator = threshold_scintillator
+            )
+    process.hgcalConcentratorProducer.ProcessorParameters = parameters
     return process
 
 
 def custom_triggercellselect_bestchoice(process,
-       triggercells=12
-        ):
-    adcSaturationBH_MIP = digiparam.hgchebackDigitizer.digiCfg.feCfg.adcSaturation_fC
-    adcNbitsBH = digiparam.hgchebackDigitizer.digiCfg.feCfg.adcNbits
-
-    parameters = process.hgcalConcentratorProducer.ProcessorParameters
-    parameters.Method = cms.string('bestChoiceSelect')
-    parameters.NData = cms.uint32(triggercells)
-    parameters.linLSB = cms.double(100./1024.)
-    parameters.adcsaturationBH = adcSaturationBH_MIP
-    parameters.adcnBitsBH = adcNbitsBH
+                                        triggercells=best_conc_proc.NData
+                                        ):
+    parameters = best_conc_proc.clone(NData = triggercells)
+    process.hgcalConcentratorProducer.ProcessorParameters = parameters
     return process
diff --git a/L1Trigger/L1THGCal/python/egammaIdentification.py b/L1Trigger/L1THGCal/python/egammaIdentification.py
index 44d9df8728e8d..65743918cffbc 100644
--- a/L1Trigger/L1THGCal/python/egammaIdentification.py
+++ b/L1Trigger/L1THGCal/python/egammaIdentification.py
@@ -67,6 +67,31 @@ def __init__(self, eta_min, eta_max, pt_min, pt_max):
         },
         ]
 
+# Identification for 3D HistoMax clustering (as in 3.5.2)
+bdt_weights_histomax = [
+        # Low eta
+        'L1Trigger/L1THGCal/data/egamma_id_histomax_352_loweta_v0.xml',
+        # High eta
+        'L1Trigger/L1THGCal/data/egamma_id_histomax_352_higheta_v0.xml',
+        ]
+
+working_points_histomax = [
+        # Low eta
+        {
+        '900':0.19146989,
+        '950':0.1379665 ,
+        '975':0.03496629,
+        '995':-0.24383164,
+        },
+        # High eta
+        {
+        '900':0.13347613,
+        '950':0.04267797,
+        '975':-0.03698097,
+        '995':-0.23077505,
+        },
+        ]
+
 tight_wp = ['975', '900']
 loose_wp = ['995', '950']
 
@@ -90,3 +115,13 @@ def __init__(self, eta_min, eta_max, pt_min, pt_max):
         Weights=cms.vstring(bdt_weights_drnn_dbscan),
         WorkingPoints=cms.vdouble([wps[eff] for wps,eff in zip(working_points_drnn_dbscan,tight_wp)]),
         )
+
+egamma_identification_histomax = cms.PSet(
+        Inputs=cms.vstring('cl3d_firstlayer', 'cl3d_coreshowerlength', 'cl3d_maxlayer', 'cl3d_srrmean'),
+        CategoriesEtaMin=cms.vdouble([cat.eta_min for cat in categories]),
+        CategoriesEtaMax=cms.vdouble([cat.eta_max for cat in categories]),
+        CategoriesPtMin=cms.vdouble([cat.pt_min for cat in categories]),
+        CategoriesPtMax=cms.vdouble([cat.pt_max for cat in categories]),
+        Weights=cms.vstring(bdt_weights_histomax),
+        WorkingPoints=cms.vdouble([wps[eff] for wps,eff in zip(working_points_histomax,tight_wp)]),
+        )
diff --git a/L1Trigger/L1THGCal/python/hgcalBackEndLayer1Producer_cfi.py b/L1Trigger/L1THGCal/python/hgcalBackEndLayer1Producer_cfi.py
index 38dce63e5f3ce..1b44d5b81257f 100644
--- a/L1Trigger/L1THGCal/python/hgcalBackEndLayer1Producer_cfi.py
+++ b/L1Trigger/L1THGCal/python/hgcalBackEndLayer1Producer_cfi.py
@@ -3,18 +3,64 @@
 
 import SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi as digiparam
 import RecoLocalCalo.HGCalRecProducers.HGCalUncalibRecHit_cfi as recoparam
-import RecoLocalCalo.HGCalRecProducers.HGCalRecHit_cfi as recocalibparam 
+import RecoLocalCalo.HGCalRecProducers.HGCalRecHit_cfi as recocalibparam
 from . import hgcalLayersCalibrationCoefficients_cfi as layercalibparam
 
-C2d_parValues = cms.PSet( clusterType = cms.string('dummyC2d'),
-                          calibSF_cluster=cms.double(1.),
-                          layerWeights = layercalibparam.TrgLayer_weights,
-                          applyLayerCalibration = cms.bool(True)
-            )
+from Configuration.Eras.Modifier_phase2_hgcalV9_cff import phase2_hgcalV9
 
-be_proc = cms.PSet( ProcessorName  = cms.string('HGCalBackendLayer1Processor2DClustering'),
-                    C2d_parameters = C2d_parValues.clone()
-                  )
+c2d_calib_pset = cms.PSet(calibSF_cluster=cms.double(1.),
+                          layerWeights=layercalibparam.TrgLayer_weights,
+                          applyLayerCalibration=cms.bool(True))
+
+c2d_thresholds_pset = cms.PSet(seeding_threshold_silicon=cms.double(5.),
+                               seeding_threshold_scintillator=cms.double(5.),
+                               clustering_threshold_silicon=cms.double(2.),
+                               clustering_threshold_scintillator=cms.double(2.))
+
+# V9 samples have a different defintiion of the dEdx calibrations. To account for it
+# we reascale the thresholds for the clustering
+# (see https://indico.cern.ch/event/806845/contributions/3359859/attachments/1815187/2966402/19-03-20_EGPerf_HGCBE.pdf
+# for more details)
+phase2_hgcalV9.toModify(c2d_thresholds_pset,
+                        seeding_threshold_silicon=3.75,
+                        seeding_threshold_scintillator=3.75,
+                        clustering_threshold_silicon=1.5,
+                        clustering_threshold_scintillator=1.5,
+                        )
+
+# we still don't have layer calibrations for V9 geometry. Switching this off we
+# use the dEdx calibrated energy of the TCs
+phase2_hgcalV9.toModify(c2d_calib_pset,
+                        applyLayerCalibration=False
+                        )
+
+
+dummy_C2d_params = cms.PSet(c2d_calib_pset,
+                            clusterType=cms.string('dummyC2d')
+                            )
+
+
+distance_C2d_params = cms.PSet(c2d_calib_pset,
+                               c2d_thresholds_pset,
+                               clusterType=cms.string('dRC2d'),
+                               dR_cluster=cms.double(6.),
+                               )
+
+topological_C2d_params = cms.PSet(c2d_calib_pset,
+                                  c2d_thresholds_pset,
+                                  clusterType=cms.string('NNC2d'),
+                                  )
+
+constrTopological_C2d_params = cms.PSet(c2d_calib_pset,
+                                        c2d_thresholds_pset,
+                                        clusterType=cms.string('dRNNC2d'),
+                                        dR_cluster=cms.double(6.),
+                                        )
+
+
+be_proc = cms.PSet(ProcessorName  = cms.string('HGCalBackendLayer1Processor2DClustering'),
+                   C2d_parameters = dummy_C2d_params.clone()
+                   )
 
 hgcalBackEndLayer1Producer = cms.EDProducer(
     "HGCalBackendLayer1Producer",
diff --git a/L1Trigger/L1THGCal/python/hgcalBackEndLayer1_cff.py b/L1Trigger/L1THGCal/python/hgcalBackEndLayer1_cff.py
index 568c21ab9d703..b93d9ef86ed01 100644
--- a/L1Trigger/L1THGCal/python/hgcalBackEndLayer1_cff.py
+++ b/L1Trigger/L1THGCal/python/hgcalBackEndLayer1_cff.py
@@ -4,5 +4,5 @@
 from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import *
 
 
-hgcalBackEndLayer1 = cms.Sequence(hgcalBackEndLayer1Producer)
+hgcalBackEndLayer1 = cms.Task(hgcalBackEndLayer1Producer)
 
diff --git a/L1Trigger/L1THGCal/python/hgcalBackEndLayer2Producer_cfi.py b/L1Trigger/L1THGCal/python/hgcalBackEndLayer2Producer_cfi.py
index 1caca9a077339..9997215baf1f3 100644
--- a/L1Trigger/L1THGCal/python/hgcalBackEndLayer2Producer_cfi.py
+++ b/L1Trigger/L1THGCal/python/hgcalBackEndLayer2Producer_cfi.py
@@ -2,31 +2,114 @@
 
 import SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi as digiparam
 import RecoLocalCalo.HGCalRecProducers.HGCalUncalibRecHit_cfi as recoparam
-import RecoLocalCalo.HGCalRecProducers.HGCalRecHit_cfi as recocalibparam 
-
-from L1Trigger.L1THGCal.egammaIdentification import egamma_identification_drnn_cone
-from L1Trigger.L1THGCal.customClustering import binSums, dr_layerbylayer
-
-C3d_parValues = cms.PSet( type_multicluster = cms.string('HistoMaxC3d'),
-                          dR_multicluster = cms.double(0.),
-                          dR_multicluster_byLayer_coefficientA = cms.vdouble(dr_layerbylayer),
-                          dR_multicluster_byLayer_coefficientB = cms.vdouble( [0]*53 ),
-                          minPt_multicluster = cms.double(0.5), # minimum pt of the multicluster (GeV)
-                          nBins_R_histo_multicluster = cms.uint32(36),
-                          nBins_Phi_histo_multicluster = cms.uint32(216),
-                          binSumsHisto = binSums,
-                          threshold_histo_multicluster = cms.double(10.),
-                          cluster_association = cms.string("NearestNeighbour"),
-                          EGIdentification=egamma_identification_drnn_cone.clone(),
-                          neighbour_weights=cms.vdouble(  0    , 0.25, 0   ,
-                                                          0.25 , 0  ,  0.25,
-                                                          0    , 0.25, 0
-                                                          )
- )
-
-be_proc = cms.PSet( ProcessorName  = cms.string('HGCalBackendLayer2Processor3DClustering'),
-                    C3d_parameters = C3d_parValues.clone()
-                  )
+import RecoLocalCalo.HGCalRecProducers.HGCalRecHit_cfi as recocalibparam
+
+from L1Trigger.L1THGCal.egammaIdentification import egamma_identification_drnn_cone, \
+                                                    egamma_identification_drnn_dbscan, \
+                                                    egamma_identification_histomax
+
+from Configuration.Eras.Modifier_phase2_hgcalV9_cff import phase2_hgcalV9
+
+
+binSums = cms.vuint32(13,               # 0
+                      11, 11, 11,       # 1 - 3
+                      9, 9, 9,          # 4 - 6
+                      7, 7, 7, 7, 7, 7,  # 7 - 12
+                      5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,  # 13 - 27
+                      3, 3, 3, 3, 3, 3, 3, 3  # 28 - 35
+                      )
+
+EE_DR_GROUP = 7
+FH_DR_GROUP = 6
+BH_DR_GROUP = 12
+MAX_LAYERS = 52
+
+
+dr_layerbylayer = ([0] + # no layer 0
+        [0.015]*EE_DR_GROUP + [0.020]*EE_DR_GROUP + [0.030]*EE_DR_GROUP + [0.040]*EE_DR_GROUP + # EM
+        [0.040]*FH_DR_GROUP + [0.050]*FH_DR_GROUP + # FH
+        [0.050]*BH_DR_GROUP) # BH
+
+
+dr_layerbylayer_Bcoefficient = ([0] + # no layer 0
+        [0.020]*EE_DR_GROUP + [0.020]*EE_DR_GROUP + [0.02]*EE_DR_GROUP + [0.020]*EE_DR_GROUP + # EM
+        [0.020]*FH_DR_GROUP + [0.020]*FH_DR_GROUP + # FH
+        [0.020]*BH_DR_GROUP) # BH
+
+
+neighbour_weights_1stOrder = cms.vdouble(0, 0.25, 0,
+                                         0.25, 0, 0.25,
+                                         0, 0.25, 0)
+
+neighbour_weights_2ndOrder = cms.vdouble(-0.25, 0.5, -0.25,
+                                         0.5, 0,  0.5,
+                                         -0.25, 0.5, -0.25)
+
+
+distance_C3d_params = cms.PSet(type_multicluster=cms.string('dRC3d'),
+                               dR_multicluster=cms.double(0.01),
+                               minPt_multicluster=cms.double(0.5),  # minimum pt of the multicluster (GeV)
+                               dist_dbscan_multicluster=cms.double(0.),
+                               minN_dbscan_multicluster=cms.uint32(0),
+                               EGIdentification=egamma_identification_drnn_cone.clone(),
+                               )
+
+
+dbscan_C3d_params = cms.PSet(type_multicluster=cms.string('DBSCANC3d'),
+                             dR_multicluster=cms.double(0.),
+                             minPt_multicluster=cms.double(0.5),  # minimum pt of the multicluster (GeV)
+                             dist_dbscan_multicluster=cms.double(0.005),
+                             minN_dbscan_multicluster=cms.uint32(3),
+                             EGIdentification=egamma_identification_drnn_dbscan.clone())
+
+
+histoMax_C3d_params = cms.PSet(type_multicluster=cms.string('HistoMaxC3d'),
+                               dR_multicluster=cms.double(0.03),
+                               dR_multicluster_byLayer_coefficientA=cms.vdouble(),
+                               dR_multicluster_byLayer_coefficientB=cms.vdouble(),
+                               minPt_multicluster=cms.double(0.5),  # minimum pt of the multicluster (GeV)
+                               nBins_R_histo_multicluster=cms.uint32(36),
+                               nBins_Phi_histo_multicluster=cms.uint32(216),
+                               binSumsHisto=binSums,
+                               threshold_histo_multicluster=cms.double(10.),
+                               cluster_association=cms.string("NearestNeighbour"),
+                               EGIdentification=egamma_identification_histomax.clone(),
+                               neighbour_weights=neighbour_weights_1stOrder
+                               )
+# V9 samples have a different defintiion of the dEdx calibrations. To account for it
+# we reascale the thresholds of the clustering seeds
+# (see https://indico.cern.ch/event/806845/contributions/3359859/attachments/1815187/2966402/19-03-20_EGPerf_HGCBE.pdf
+# for more details)
+phase2_hgcalV9.toModify(histoMax_C3d_params,
+                        threshold_histo_multicluster=7.5,  # MipT
+                        )
+
+
+histoMaxVariableDR_C3d_params = histoMax_C3d_params.clone(
+        dR_multicluster = cms.double(0.),
+        dR_multicluster_byLayer_coefficientA = cms.vdouble(dr_layerbylayer),
+        dR_multicluster_byLayer_coefficientB = cms.vdouble([0]*(MAX_LAYERS+1))
+        )
+
+
+histoSecondaryMax_C3d_params = histoMax_C3d_params.clone(
+        type_multicluster = cms.string('HistoSecondaryMaxC3d')
+        )
+
+
+histoInterpolatedMax_C3d_params = histoMax_C3d_params.clone(
+        type_multicluster = cms.string('HistoInterpolatedMaxC3d')
+        )
+
+
+histoThreshold_C3d_params = histoMax_C3d_params.clone(
+        type_multicluster = cms.string('HistoThresholdC3d')
+        )
+
+
+be_proc = cms.PSet(ProcessorName  = cms.string('HGCalBackendLayer2Processor3DClustering'),
+                   C3d_parameters = histoMaxVariableDR_C3d_params.clone()
+                   )
 
 hgcalBackEndLayer2Producer = cms.EDProducer(
     "HGCalBackendLayer2Producer",
diff --git a/L1Trigger/L1THGCal/python/hgcalBackEndLayer2_cff.py b/L1Trigger/L1THGCal/python/hgcalBackEndLayer2_cff.py
index eb374009e1898..e8578130e05fc 100644
--- a/L1Trigger/L1THGCal/python/hgcalBackEndLayer2_cff.py
+++ b/L1Trigger/L1THGCal/python/hgcalBackEndLayer2_cff.py
@@ -4,5 +4,5 @@
 from L1Trigger.L1THGCal.hgcalBackEndLayer2Producer_cfi import *
 
 
-hgcalBackEndLayer2 = cms.Sequence(hgcalBackEndLayer2Producer)
+hgcalBackEndLayer2 = cms.Task(hgcalBackEndLayer2Producer)
 
diff --git a/L1Trigger/L1THGCal/python/hgcalConcentratorProducer_cfi.py b/L1Trigger/L1THGCal/python/hgcalConcentratorProducer_cfi.py
index d6e19f843078f..4b8a95d90d158 100644
--- a/L1Trigger/L1THGCal/python/hgcalConcentratorProducer_cfi.py
+++ b/L1Trigger/L1THGCal/python/hgcalConcentratorProducer_cfi.py
@@ -5,22 +5,55 @@
 adcSaturationBH_MIP = digiparam.hgchebackDigitizer.digiCfg.feCfg.adcSaturation_fC
 adcNbitsBH = digiparam.hgchebackDigitizer.digiCfg.feCfg.adcNbits
 
-conc_proc = cms.PSet(ProcessorName  = cms.string('HGCalConcentratorProcessorSelection'),
-                     Method = cms.string('thresholdSelect'),
-                     NData = cms.uint32(999),
-                     MaxCellsInModule = cms.uint32(288),
-                     linLSB = cms.double(100./1024.),
-                     adcsaturationBH = adcSaturationBH_MIP,
-                     adcnBitsBH = adcNbitsBH,
-                     TCThreshold_fC = cms.double(0.),
-                     TCThresholdBH_MIP = cms.double(0.),
-                     triggercell_threshold_silicon = cms.double(2.), # MipT
-                     triggercell_threshold_scintillator = cms.double(2.), # MipT
-                     )
+
+threshold_conc_proc = cms.PSet(ProcessorName  = cms.string('HGCalConcentratorProcessorSelection'),
+                               Method = cms.string('thresholdSelect'),
+                               NData = cms.uint32(999),
+                               MaxCellsInModule = cms.uint32(288),
+                               linLSB = cms.double(100./1024.),
+                               adcsaturationBH = adcSaturationBH_MIP,
+                               adcnBitsBH = adcNbitsBH,
+                               TCThreshold_fC = cms.double(0.),
+                               TCThresholdBH_MIP = cms.double(0.),
+                               triggercell_threshold_silicon = cms.double(2.), # MipT
+                               triggercell_threshold_scintillator = cms.double(2.), # MipT
+                               )
+
+
+best_conc_proc = cms.PSet(ProcessorName  = cms.string('HGCalConcentratorProcessorSelection'),
+                          Method = cms.string('bestChoiceSelect'),
+                          NData = cms.uint32(12),
+                          MaxCellsInModule = cms.uint32(288),
+                          linLSB = cms.double(100./1024.),
+                          adcsaturationBH = adcSaturationBH_MIP,
+                          adcnBitsBH = adcNbitsBH,
+                          TCThreshold_fC = cms.double(0.),
+                          TCThresholdBH_MIP = cms.double(0.),
+                          triggercell_threshold_silicon = cms.double(0.),
+                          triggercell_threshold_scintillator = cms.double(0.),
+                          )
+
+
+supertc_conc_proc = cms.PSet(ProcessorName  = cms.string('HGCalConcentratorProcessorSelection'),
+                             Method = cms.string('superTriggerCellSelect'),
+                             stcSize = cms.vuint32(4,4,4)
+                             )
+
+
+from Configuration.Eras.Modifier_phase2_hgcalV9_cff import phase2_hgcalV9
+# V9 samples have a different defintiion of the dEdx calibrations. To account for it
+# we reascale the thresholds of the FE selection
+# (see https://indico.cern.ch/event/806845/contributions/3359859/attachments/1815187/2966402/19-03-20_EGPerf_HGCBE.pdf
+# for more details)
+phase2_hgcalV9.toModify(threshold_conc_proc,
+                        triggercell_threshold_silicon=1.5,  # MipT
+                        triggercell_threshold_scintillator=1.5,  # MipT
+                        )
+
 
 hgcalConcentratorProducer = cms.EDProducer(
     "HGCalConcentratorProducer",
     InputTriggerCells = cms.InputTag('hgcalVFEProducer:HGCalVFEProcessorSums'),
     InputTriggerSums = cms.InputTag('hgcalVFEProducer:HGCalVFEProcessorSums'),
-    ProcessorParameters = conc_proc.clone()
+    ProcessorParameters = threshold_conc_proc.clone()
     )
diff --git a/L1Trigger/L1THGCal/python/hgcalConcentrator_cff.py b/L1Trigger/L1THGCal/python/hgcalConcentrator_cff.py
index 562d754e18f8c..6626e48c64ee2 100644
--- a/L1Trigger/L1THGCal/python/hgcalConcentrator_cff.py
+++ b/L1Trigger/L1THGCal/python/hgcalConcentrator_cff.py
@@ -4,5 +4,5 @@
 from L1Trigger.L1THGCal.hgcalConcentratorProducer_cfi import *
 
 
-hgcalConcentrator = cms.Sequence(hgcalConcentratorProducer)
+hgcalConcentrator = cms.Task(hgcalConcentratorProducer)
 
diff --git a/L1Trigger/L1THGCal/python/hgcalTowerMap_cff.py b/L1Trigger/L1THGCal/python/hgcalTowerMap_cff.py
index 08545d65b87f6..48037134dd8ea 100644
--- a/L1Trigger/L1THGCal/python/hgcalTowerMap_cff.py
+++ b/L1Trigger/L1THGCal/python/hgcalTowerMap_cff.py
@@ -4,5 +4,5 @@
 from L1Trigger.L1THGCal.hgcalTowerMapProducer_cfi import *
 
 
-hgcalTowerMap = cms.Sequence(hgcalTowerMapProducer)
+hgcalTowerMap = cms.Task(hgcalTowerMapProducer)
 
diff --git a/L1Trigger/L1THGCal/python/hgcalTower_cff.py b/L1Trigger/L1THGCal/python/hgcalTower_cff.py
index ff693afd31217..ca1faadb6523b 100644
--- a/L1Trigger/L1THGCal/python/hgcalTower_cff.py
+++ b/L1Trigger/L1THGCal/python/hgcalTower_cff.py
@@ -4,5 +4,5 @@
 from L1Trigger.L1THGCal.hgcalTowerProducer_cfi import *
 
 
-hgcalTower = cms.Sequence(hgcalTowerProducer)
+hgcalTower = cms.Task(hgcalTowerProducer)
 
diff --git a/L1Trigger/L1THGCal/python/hgcalTriggerPrimitives_cff.py b/L1Trigger/L1THGCal/python/hgcalTriggerPrimitives_cff.py
index bf6347c9c4f2f..e4214ed1569c6 100644
--- a/L1Trigger/L1THGCal/python/hgcalTriggerPrimitives_cff.py
+++ b/L1Trigger/L1THGCal/python/hgcalTriggerPrimitives_cff.py
@@ -9,13 +9,13 @@
 from L1Trigger.L1THGCal.hgcalTower_cff import *
 
 
-hgcalTriggerPrimitives = cms.Sequence(hgcalVFE*hgcalConcentrator*hgcalBackEndLayer1*hgcalBackEndLayer2*hgcalTowerMap*hgcalTower)
+hgcalTriggerPrimitivesTask = cms.Task(hgcalVFE, hgcalConcentrator, hgcalBackEndLayer1, hgcalBackEndLayer2, hgcalTowerMap, hgcalTower)
+hgcalTriggerPrimitives = cms.Sequence(hgcalTriggerPrimitivesTask)
 
 from Configuration.Eras.Modifier_phase2_hgcalV9_cff import phase2_hgcalV9
 from L1Trigger.L1THGCal.customTriggerGeometry import custom_geometry_V9
 from L1Trigger.L1THGCal.customCalibration import  custom_cluster_calibration_global
 modifyHgcalTriggerPrimitivesWithV9Geometry_ = phase2_hgcalV9.makeProcessModifier(custom_geometry_V9)
-modifyHgcalTriggerPrimitivesCalibWithV9Geometry_ = phase2_hgcalV9.makeProcessModifier(lambda process : custom_cluster_calibration_global(process, factor=1))
 
 from Configuration.ProcessModifiers.convertHGCalDigisSim_cff import convertHGCalDigisSim
 # can't declare a producer version of simHGCalUnsuppressedDigis in the normal flow of things,
@@ -23,5 +23,5 @@
 def _fakeHGCalDigiAlias(process):
 	from EventFilter.HGCalRawToDigi.HGCDigiConverter_cfi import HGCDigiConverter as _HGCDigiConverter
 	process.simHGCalUnsuppressedDigis = _HGCDigiConverter.clone()
-	process.hgcalTriggerPrimitives.insert(0,process.simHGCalUnsuppressedDigis)
+	process.hgcalTriggerPrimitivesTask.add(process.simHGCalUnsuppressedDigis)
 doFakeHGCalDigiAlias = convertHGCalDigisSim.makeProcessModifier(_fakeHGCalDigiAlias)
diff --git a/L1Trigger/L1THGCal/python/hgcalVFEProducer_cfi.py b/L1Trigger/L1THGCal/python/hgcalVFEProducer_cfi.py
index 961d734355225..a3b0525ebb16e 100644
--- a/L1Trigger/L1THGCal/python/hgcalVFEProducer_cfi.py
+++ b/L1Trigger/L1THGCal/python/hgcalVFEProducer_cfi.py
@@ -34,27 +34,30 @@
 triggerCellLsbBeforeCompression = 100./1024.
 triggerCellTruncationBits = 0
 
-calib_parValues = cms.PSet( siliconCellLSB_fC =  cms.double( triggerCellLsbBeforeCompression*(2**triggerCellTruncationBits) ),
-                            scintillatorCellLSB_MIP = cms.double(float(adcSaturationBH_MIP.value())/(2**float(adcNbitsBH.value()))),
-                            fCperMIP = cms.double(fCPerMIP_200),
-                            dEdXweights = layerWeights,
-                            thickCorr = cms.double(thicknessCorrection_200)
-                            )
-
 vfe_proc = cms.PSet( ProcessorName = cms.string('HGCalVFEProcessorSums'),
-                     calib_parameters = calib_parValues.clone(),
-                     linLSB = cms.double(100./1024.),
+                     linLSB = cms.double(triggerCellLsbBeforeCompression),
                      adcsaturation = adcSaturation_fC,
                      tdcnBits = tdcNbits,
                      tdcOnsetfC = tdcOnset_fC,
                      adcnBits = adcNbits,
-                     tdcsaturation = digiparam.hgceeDigitizer.digiCfg.feCfg.tdcSaturation_fC,
+                     tdcsaturation = tdcSaturation_fC,
                      linnBits = cms.uint32(16),
-                     ThicknessCorrections = cms.vdouble(frontend_thickness_corrections),
+                     siliconCellLSB_fC =  cms.double( triggerCellLsbBeforeCompression*(2**triggerCellTruncationBits) ),
+                     scintillatorCellLSB_MIP = cms.double(float(adcSaturationBH_MIP.value())/(2**float(adcNbitsBH.value()))),
+                     # cell thresholds before TC sums
+                     # Cut at 3sigma of the noise
+                     thresholdsSilicon = cms.vdouble([3.*x for x in digiparam.HGCAL_noise_fC.values.value()]),
+                     thresholdScintillator = cms.double(3.*digiparam.HGCAL_noise_MIP.value.value()),
+                     # Floating point compression
                      exponentBits = cms.uint32(4),
                      mantissaBits = cms.uint32(4),
-                     rounding = cms.bool(True)
-                   )
+                     rounding = cms.bool(True),
+                     # Trigger cell calibration
+                     fCperMIP = cms.double(fCPerMIP_200),
+                     dEdXweights = layerWeights,
+                     ThicknessCorrections = cms.vdouble(frontend_thickness_corrections),
+                     thickCorr = cms.double(thicknessCorrection_200)
+                     )
 
 hgcalVFEProducer = cms.EDProducer(
         "HGCalVFEProducer",
diff --git a/L1Trigger/L1THGCal/python/hgcalVFE_cff.py b/L1Trigger/L1THGCal/python/hgcalVFE_cff.py
index dc8e77bcfd929..b8380c01cf50b 100644
--- a/L1Trigger/L1THGCal/python/hgcalVFE_cff.py
+++ b/L1Trigger/L1THGCal/python/hgcalVFE_cff.py
@@ -3,6 +3,5 @@
 from L1Trigger.L1THGCal.hgcalTriggerGeometryESProducer_cfi import *
 from L1Trigger.L1THGCal.hgcalVFEProducer_cfi import *
 
-
-hgcalVFE = cms.Sequence(hgcalVFEProducer)
+hgcalVFE = cms.Task(hgcalVFEProducer)
 
diff --git a/L1Trigger/L1THGCal/src/concentrator/HGCalConcentratorSuperTriggerCellImpl.cc b/L1Trigger/L1THGCal/src/concentrator/HGCalConcentratorSuperTriggerCellImpl.cc
index 9e77e6ab9ab8d..4691013add02c 100644
--- a/L1Trigger/L1THGCal/src/concentrator/HGCalConcentratorSuperTriggerCellImpl.cc
+++ b/L1Trigger/L1THGCal/src/concentrator/HGCalConcentratorSuperTriggerCellImpl.cc
@@ -17,8 +17,8 @@ HGCalConcentratorSuperTriggerCellImpl::HGCalConcentratorSuperTriggerCellImpl(con
   }
 }
 
-std::map<int, int> HGCalConcentratorSuperTriggerCellImpl::kSplit_ = {{kSTCsizeFine_, kSplit_v8_Fine_},
-                                                                     {kSTCsizeCoarse_, kSplit_v8_Coarse_}};
+const std::map<int, int> HGCalConcentratorSuperTriggerCellImpl::kSplit_ = {{kSTCsizeFine_, kSplit_v8_Fine_},
+                                                                           {kSTCsizeCoarse_, kSplit_v8_Coarse_}};
 
 int HGCalConcentratorSuperTriggerCellImpl::getSuperTriggerCellId(int detid) const {
   DetId TC_id(detid);
diff --git a/L1Trigger/L1THGCal/src/veryfrontend/HGCalTriggerCellCalibration.cc b/L1Trigger/L1THGCal/src/veryfrontend/HGCalTriggerCellCalibration.cc
index 19fcc1e79bbab..0663b1341e007 100644
--- a/L1Trigger/L1THGCal/src/veryfrontend/HGCalTriggerCellCalibration.cc
+++ b/L1Trigger/L1THGCal/src/veryfrontend/HGCalTriggerCellCalibration.cc
@@ -1,13 +1,12 @@
 #include "L1Trigger/L1THGCal/interface/veryfrontend/HGCalTriggerCellCalibration.h"
 
 //class constructor
-HGCalTriggerCellCalibration::HGCalTriggerCellCalibration(const edm::ParameterSet& beCodecConfig) {
-  LSB_silicon_fC_ = beCodecConfig.getParameter<double>("siliconCellLSB_fC");
-  LSB_scintillator_MIP_ = beCodecConfig.getParameter<double>("scintillatorCellLSB_MIP");
-  fCperMIP_ = beCodecConfig.getParameter<double>("fCperMIP");
-  dEdX_weights_ = beCodecConfig.getParameter<std::vector<double>>("dEdXweights");
-  thickCorr_ = beCodecConfig.getParameter<double>("thickCorr");
-
+HGCalTriggerCellCalibration::HGCalTriggerCellCalibration(const edm::ParameterSet& conf)
+    : LSB_silicon_fC_(conf.getParameter<double>("siliconCellLSB_fC")),
+      LSB_scintillator_MIP_(conf.getParameter<double>("scintillatorCellLSB_MIP")),
+      fCperMIP_(conf.getParameter<double>("fCperMIP")),
+      thickCorr_(conf.getParameter<double>("thickCorr")),
+      dEdX_weights_(conf.getParameter<std::vector<double>>("dEdXweights")) {
   if (fCperMIP_ <= 0) {
     edm::LogWarning("DivisionByZero") << "WARNING: the MIP->fC correction factor is zero or negative. It won't be "
                                          "applied to correct trigger cell energies.";
diff --git a/L1Trigger/L1THGCal/src/veryfrontend/HGCalVFESummationImpl.cc b/L1Trigger/L1THGCal/src/veryfrontend/HGCalVFESummationImpl.cc
index 586fafd136b01..eb22173804e23 100644
--- a/L1Trigger/L1THGCal/src/veryfrontend/HGCalVFESummationImpl.cc
+++ b/L1Trigger/L1THGCal/src/veryfrontend/HGCalVFESummationImpl.cc
@@ -1,7 +1,22 @@
 #include "L1Trigger/L1THGCal/interface/veryfrontend/HGCalVFESummationImpl.h"
 
 HGCalVFESummationImpl::HGCalVFESummationImpl(const edm::ParameterSet& conf)
-    : thickness_corrections_(conf.getParameter<std::vector<double>>("ThicknessCorrections")) {}
+    : thickness_corrections_(conf.getParameter<std::vector<double>>("ThicknessCorrections")),
+      lsb_silicon_fC_(conf.getParameter<double>("siliconCellLSB_fC")),
+      lsb_scintillator_MIP_(conf.getParameter<double>("scintillatorCellLSB_MIP")),
+      thresholds_silicon_(conf.getParameter<std::vector<double>>("thresholdsSilicon")),
+      threshold_scintillator_(conf.getParameter<double>("thresholdScintillator")) {
+  const unsigned nThickness = 3;
+  if (thickness_corrections_.size() != nThickness) {
+    throw cms::Exception("Configuration")
+        << thickness_corrections_.size() << " thickness corrections are given instead of " << nThickness
+        << " (the number of sensor thicknesses)";
+  }
+  if (thresholds_silicon_.size() != nThickness) {
+    throw cms::Exception("Configuration") << thresholds_silicon_.size() << " silicon thresholds are given instead of "
+                                          << nThickness << " (the number of sensor thicknesses)";
+  }
+}
 
 void HGCalVFESummationImpl::triggerCellSums(const HGCalTriggerGeometryBase& geometry,
                                             const std::vector<std::pair<DetId, uint32_t>>& linearized_dataframes,
@@ -11,14 +26,25 @@ void HGCalVFESummationImpl::triggerCellSums(const HGCalTriggerGeometryBase& geom
   // sum energies in trigger cells
   for (const auto& frame : linearized_dataframes) {
     DetId cellid(frame.first);
+    uint32_t value = frame.second;
+
+    // Apply noise threshold before summing into trigger cells
+    if (triggerTools_.isSilicon(cellid)) {
+      int thickness = triggerTools_.thicknessIndex(cellid);
+      double threshold = thresholds_silicon_.at(thickness);
+      value = (value * lsb_silicon_fC_ > threshold ? value : 0);
+    } else if (triggerTools_.isScintillator(cellid)) {
+      value = (value * lsb_scintillator_MIP_ > threshold_scintillator_ ? value : 0);
+    }
+    if (value == 0)
+      continue;
 
     // find trigger cell associated to cell
     uint32_t tcid = geometry.getTriggerCellFromCell(cellid);
     payload.emplace(tcid, 0);  // do nothing if key exists already
-    uint32_t value = frame.second;
-    unsigned det = cellid.det();
+
     // equalize value among cell thicknesses for Silicon parts
-    if (det == DetId::Forward || det == DetId::HGCalEE || det == DetId::HGCalHSi) {
+    if (triggerTools_.isSilicon(cellid)) {
       int thickness = triggerTools_.thicknessIndex(cellid);
       double thickness_correction = thickness_corrections_.at(thickness);
       value = (double)value * thickness_correction;
diff --git a/L1Trigger/L1THGCal/test/L1Clustering_cfg.py b/L1Trigger/L1THGCal/test/L1Clustering_cfg.py
index 66cfc31556faa..d6232151e5f99 100644
--- a/L1Trigger/L1THGCal/test/L1Clustering_cfg.py
+++ b/L1Trigger/L1THGCal/test/L1Clustering_cfg.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('test',eras.Phase2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('test',Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/L1Trigger/L1THGCal/test/L1TC_CalibWeightExt_cfg.py b/L1Trigger/L1THGCal/test/L1TC_CalibWeightExt_cfg.py
index 119c91aa216bf..8559cd0e7e3be 100644
--- a/L1Trigger/L1THGCal/test/L1TC_CalibWeightExt_cfg.py
+++ b/L1Trigger/L1THGCal/test/L1TC_CalibWeightExt_cfg.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('test',eras.Phase2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('test',Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV9Imp2_cfg.py b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV9Imp2_cfg.py
index f42d8dce8466a..ac197f8d34f27 100644
--- a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV9Imp2_cfg.py
+++ b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV9Imp2_cfg.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('DIGI',eras.Phase2C4)
+from Configuration.Eras.Era_Phase2C4_cff import Phase2C4
+process = cms.Process('DIGI',Phase2C4)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV9_cfg.py b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV9_cfg.py
index 80d73bb9277c1..c87733698cbb3 100644
--- a/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV9_cfg.py
+++ b/L1Trigger/L1THGCal/test/testHGCalL1TGeometryV9_cfg.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('DIGI',eras.Phase2C4)
+from Configuration.Eras.Era_Phase2C4_cff import Phase2C4
+process = cms.Process('DIGI',Phase2C4)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/L1Trigger/L1THGCal/test/testHGCalL1TGeometry_cfg.py b/L1Trigger/L1THGCal/test/testHGCalL1TGeometry_cfg.py
index e3c38ff19fd8b..ab2d13e4bc7e2 100644
--- a/L1Trigger/L1THGCal/test/testHGCalL1TGeometry_cfg.py
+++ b/L1Trigger/L1THGCal/test/testHGCalL1TGeometry_cfg.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('DIGI',eras.Phase2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('DIGI',Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/L1Trigger/L1THGCal/test/testHGCalL1T_RelValV9_cfg.py b/L1Trigger/L1THGCal/test/testHGCalL1T_RelValV9_cfg.py
index 7d5f1e209ba26..b604900851e8c 100644
--- a/L1Trigger/L1THGCal/test/testHGCalL1T_RelValV9_cfg.py
+++ b/L1Trigger/L1THGCal/test/testHGCalL1T_RelValV9_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('DIGI',eras.Phase2C4)
+from Configuration.Eras.Era_Phase2C4_cff import Phase2C4
+process = cms.Process('DIGI',Phase2C4)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/L1Trigger/L1THGCal/test/testHGCalL1T_RelVal_cfg.py b/L1Trigger/L1THGCal/test/testHGCalL1T_RelVal_cfg.py
index 6a0ea6591eee2..821d595995907 100644
--- a/L1Trigger/L1THGCal/test/testHGCalL1T_RelVal_cfg.py
+++ b/L1Trigger/L1THGCal/test/testHGCalL1T_RelVal_cfg.py
@@ -1,10 +1,10 @@
 import FWCore.ParameterSet.Config as cms 
-from Configuration.StandardSequences.Eras import eras
 from Configuration.ProcessModifiers.convertHGCalDigisSim_cff import convertHGCalDigisSim
 
 # For old samples use the digi converter
-#process = cms.Process('DIGI',eras.Phase2,convertHGCalDigisSim)
-process = cms.Process('DIGI',eras.Phase2)
+#from Configuration.Eras.Era_Phase2_cff import Phase2
+#process = cms.Process('DIGI',Phase2,convertHGCalDigisSim)
+process = cms.Process('DIGI',Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/L1Trigger/L1THGCal/test/testHGCalL1T_cfg.py b/L1Trigger/L1THGCal/test/testHGCalL1T_cfg.py
index d335583623d3e..3ad0b2b72e41e 100644
--- a/L1Trigger/L1THGCal/test/testHGCalL1T_cfg.py
+++ b/L1Trigger/L1THGCal/test/testHGCalL1T_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('DIGI',eras.Phase2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('DIGI',Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/L1Trigger/L1THGCalUtilities/plugins/selectors/HGC3DClusterGenMatchSelector.cc b/L1Trigger/L1THGCalUtilities/plugins/selectors/HGC3DClusterGenMatchSelector.cc
new file mode 100644
index 0000000000000..eeada599e9373
--- /dev/null
+++ b/L1Trigger/L1THGCalUtilities/plugins/selectors/HGC3DClusterGenMatchSelector.cc
@@ -0,0 +1,59 @@
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+
+#include "DataFormats/L1THGCal/interface/HGCalMulticluster.h"
+#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
+#include "DataFormats/Math/interface/deltaR.h"
+
+namespace l1t {
+  class HGC3DClusterGenMatchSelector : public edm::stream::EDProducer<> {
+  public:
+    explicit HGC3DClusterGenMatchSelector(const edm::ParameterSet &);
+    ~HGC3DClusterGenMatchSelector() override {}
+
+  private:
+    edm::EDGetTokenT<l1t::HGCalMulticlusterBxCollection> src_;
+    edm::EDGetToken genParticleSrc_;
+    double dR_;
+    void produce(edm::Event &, const edm::EventSetup &) override;
+
+  };  // class
+}  // namespace l1t
+
+l1t::HGC3DClusterGenMatchSelector::HGC3DClusterGenMatchSelector(const edm::ParameterSet &iConfig)
+    : src_(consumes<l1t::HGCalMulticlusterBxCollection>(iConfig.getParameter<edm::InputTag>("src"))),
+      genParticleSrc_(consumes<reco::GenParticleCollection>(iConfig.getParameter<edm::InputTag>("genSrc"))),
+      dR_(iConfig.getParameter<double>("dR")) {
+  produces<l1t::HGCalMulticlusterBxCollection>();
+}
+
+void l1t::HGC3DClusterGenMatchSelector::produce(edm::Event &iEvent, const edm::EventSetup &) {
+  auto out = std::make_unique<l1t::HGCalMulticlusterBxCollection>();
+
+  edm::Handle<l1t::HGCalMulticlusterBxCollection> multiclusters;
+  iEvent.getByToken(src_, multiclusters);
+
+  edm::Handle<reco::GenParticleCollection> genParticles;
+  iEvent.getByToken(genParticleSrc_, genParticles);
+
+  for (int bx = multiclusters->getFirstBX(); bx <= multiclusters->getLastBX(); ++bx) {
+    for (auto it = multiclusters->begin(bx), ed = multiclusters->end(bx); it != ed; ++it) {
+      const auto &multicluster = *it;
+      for (const auto &particle : *genParticles) {
+        if (particle.status() != 1)
+          continue;
+        if (deltaR(multicluster, particle) < dR_) {
+          out->push_back(bx, multicluster);
+          break;  // don't save duplicate multiclusters!
+        }
+      }
+    }
+  }
+
+  iEvent.put(std::move(out));
+}
+using l1t::HGC3DClusterGenMatchSelector;
+DEFINE_FWK_MODULE(HGC3DClusterGenMatchSelector);
diff --git a/L1Trigger/L1THGCalUtilities/python/HGC3DClusterGenMatchSelector_cff.py b/L1Trigger/L1THGCalUtilities/python/HGC3DClusterGenMatchSelector_cff.py
new file mode 100644
index 0000000000000..d4cfb8c1fe095
--- /dev/null
+++ b/L1Trigger/L1THGCalUtilities/python/HGC3DClusterGenMatchSelector_cff.py
@@ -0,0 +1,5 @@
+import FWCore.ParameterSet.Config as cms
+
+from L1Trigger.L1THGCalUtilities.HGC3DClusterGenMatchSelector_cfi import *
+
+hgcalTriggerSelector = cms.Sequence(hgc3DClusterGenMatchSelector)
diff --git a/L1Trigger/L1THGCalUtilities/python/HGC3DClusterGenMatchSelector_cfi.py b/L1Trigger/L1THGCalUtilities/python/HGC3DClusterGenMatchSelector_cfi.py
new file mode 100644
index 0000000000000..7bbb7f3fadb81
--- /dev/null
+++ b/L1Trigger/L1THGCalUtilities/python/HGC3DClusterGenMatchSelector_cfi.py
@@ -0,0 +1,8 @@
+import FWCore.ParameterSet.Config as cms
+
+hgc3DClusterGenMatchSelector = cms.EDProducer(
+    "HGC3DClusterGenMatchSelector",
+    src = cms.InputTag('hgcalBackEndLayer2Producer:HGCalBackendLayer2Processor3DClustering'),
+    genSrc = cms.InputTag('genParticles'),
+    dR = cms.double(0.3)
+)
diff --git a/L1Trigger/L1THGCalUtilities/python/clustering2d.py b/L1Trigger/L1THGCalUtilities/python/clustering2d.py
index c03050115a24f..f5a2fa44dacc8 100644
--- a/L1Trigger/L1THGCalUtilities/python/clustering2d.py
+++ b/L1Trigger/L1THGCalUtilities/python/clustering2d.py
@@ -1,51 +1,56 @@
 import FWCore.ParameterSet.Config as cms
+from L1Trigger.L1THGCal.hgcalBackEndLayer1Producer_cfi import dummy_C2d_params, \
+                                                              distance_C2d_params, \
+                                                              topological_C2d_params, \
+                                                              constrTopological_C2d_params
+from L1Trigger.L1THGCal.customClustering import set_threshold_params
 
 
 def create_distance(process, inputs,
-        distance=6.,# cm
-        seed_threshold=5.,# MipT
-        cluster_threshold=2.# MipT
-        ):
-    producer = process.hgcalBackEndLayer1Producer.clone() 
-    producer.ProcessorParameters.C2d_parameters.seeding_threshold_silicon = cms.double(seed_threshold) 
-    producer.ProcessorParameters.C2d_parameters.seeding_threshold_scintillator = cms.double(seed_threshold) 
-    producer.ProcessorParameters.C2d_parameters.clustering_threshold_silicon = cms.double(cluster_threshold) 
-    producer.ProcessorParameters.C2d_parameters.clustering_threshold_scintillator = cms.double(cluster_threshold) 
-    producer.ProcessorParameters.C2d_parameters.dR_cluster = cms.double(distance) 
-    producer.ProcessorParameters.C2d_parameters.clusterType = cms.string('dRC2d') 
-    producer.InputTriggerCells = cms.InputTag('{}:HGCalConcentratorProcessorSelection'.format(inputs))
+                    distance=distance_C2d_params.dR_cluster,  # cm
+                    seed_threshold=distance_C2d_params.seeding_threshold_silicon,  # MipT
+                    cluster_threshold=distance_C2d_params.clustering_threshold_silicon  # MipT
+                    ):
+    producer = process.hgcalBackEndLayer1Producer.clone(
+            InputTriggerCells = cms.InputTag('{}:HGCalConcentratorProcessorSelection'.format(inputs))
+            )
+    producer.ProcessorParameters.C2d_parameters = distance_C2d_params.clone(
+            dR_cluster = distance
+            )
+    set_threshold_params(producer.ProcessorParameters.C2d_parameters, seed_threshold, cluster_threshold)
     return producer
 
+
 def create_topological(process, inputs,
-        seed_threshold=5.,# MipT
-        cluster_threshold=2.# MipT
-        ):
-    producer = process.hgcalBackEndLayer1Producer.clone() 
-    producer.ProcessorParameters.C2d_parameters.seeding_threshold_silicon = cms.double(seed_threshold) # MipT
-    producer.ProcessorParameters.C2d_parameters.seeding_threshold_scintillator = cms.double(seed_threshold) # MipT
-    producer.ProcessorParameters.C2d_parameters.clustering_threshold_silicon = cms.double(cluster_threshold) # MipT
-    producer.ProcessorParameters.C2d_parameters.clustering_threshold_scintillator = cms.double(cluster_threshold) # MipT
-    producer.ProcessorParameters.C2d_parameters.clusterType = cms.string('NNC2d') 
-    producer.InputTriggerCells = cms.InputTag('{}:HGCalConcentratorProcessorSelection'.format(inputs))
+                       seed_threshold=topological_C2d_params.seeding_threshold_silicon,  # MipT
+                       cluster_threshold=topological_C2d_params.clustering_threshold_silicon  # MipT
+                       ):
+    producer = process.hgcalBackEndLayer1Producer.clone(
+            InputTriggerCells = cms.InputTag('{}:HGCalConcentratorProcessorSelection'.format(inputs))
+            )
+    producer.ProcessorParameters.C2d_parameters = topological_C2d_params.clone()
+    set_threshold_params(producer.ProcessorParameters.C2d_parameters, seed_threshold, cluster_threshold)
     return producer
 
+
 def create_constrainedtopological(process, inputs,
-        distance=6.,# cm
-        seed_threshold=5.,# MipT
-        cluster_threshold=2.# MipT
-        ):
-    producer = process.hgcalBackEndLayer1Producer.clone() 
-    producer.ProcessorParameters.C2d_parameters.seeding_threshold_silicon = cms.double(seed_threshold) # MipT
-    producer.ProcessorParameters.C2d_parameters.seeding_threshold_scintillator = cms.double(seed_threshold) # MipT
-    producer.ProcessorParameters.C2d_parameters.clustering_threshold_silicon = cms.double(cluster_threshold) # MipT
-    producer.ProcessorParameters.C2d_parameters.clustering_threshold_scintillator = cms.double(cluster_threshold) # MipT
-    producer.ProcessorParameters.C2d_parameters.dR_cluster = cms.double(distance) # cm
-    producer.ProcessorParameters.C2d_parameters.clusterType = cms.string('dRNNC2d') 
-    producer.InputTriggerCells = cms.InputTag('{}:HGCalConcentratorProcessorSelection'.format(inputs))
+                                  distance=constrTopological_C2d_params.dR_cluster,  # cm
+                                  seed_threshold=constrTopological_C2d_params.seeding_threshold_silicon,  # MipT
+                                  cluster_threshold=constrTopological_C2d_params.clustering_threshold_silicon  # MipT
+                                  ):
+    producer = process.hgcalBackEndLayer1Producer.clone(
+            InputTriggerCells = cms.InputTag('{}:HGCalConcentratorProcessorSelection'.format(inputs))
+            )
+    producer.ProcessorParameters.C2d_parameters = constrTopological_C2d_params.clone(
+            dR_cluster = distance
+            )
+    set_threshold_params(producer.ProcessorParameters.C2d_parameters, seed_threshold, cluster_threshold)
     return producer
 
+
 def create_dummy(process, inputs):
-    producer = process.hgcalBackEndLayer1Producer.clone() 
-    producer.ProcessorParameters.C2d_parameters.clusterType = cms.string('dummyC2d')
-    producer.InputTriggerCells = cms.InputTag('{}:HGCalConcentratorProcessorSelection'.format(inputs))
+    producer = process.hgcalBackEndLayer1Producer.clone(
+            InputTriggerCells = cms.InputTag('{}:HGCalConcentratorProcessorSelection'.format(inputs))
+            )
+    producer.ProcessorParameters.C2d_parameters = dummy_C2d_params.clone()
     return producer
diff --git a/L1Trigger/L1THGCalUtilities/python/clustering3d.py b/L1Trigger/L1THGCalUtilities/python/clustering3d.py
index 214021d070a96..c65c1f244360f 100644
--- a/L1Trigger/L1THGCalUtilities/python/clustering3d.py
+++ b/L1Trigger/L1THGCalUtilities/python/clustering3d.py
@@ -1,106 +1,119 @@
 import FWCore.ParameterSet.Config as cms
+from L1Trigger.L1THGCal.hgcalBackEndLayer2Producer_cfi import distance_C3d_params, \
+                                                              dbscan_C3d_params, \
+                                                              histoMax_C3d_params, \
+                                                              histoMaxVariableDR_C3d_params, \
+                                                              histoSecondaryMax_C3d_params, \
+                                                              histoInterpolatedMax_C3d_params, \
+                                                              histoThreshold_C3d_params, \
+                                                              neighbour_weights_1stOrder, \
+                                                              neighbour_weights_2ndOrder
 
-from L1Trigger.L1THGCal.customClustering import binSums, dr_layerbylayer
+from L1Trigger.L1THGCal.customClustering import set_histomax_params
 
 
 def create_distance(process, inputs,
-        distance=0.01
-        ):
-    producer = process.hgcalBackEndLayer2Producer.clone() 
-    producer.ProcessorParameters.C3d_parameters.dR_multicluster = cms.double(distance)
-    producer.ProcessorParameters.C3d_parameters.dist_dbscan_multicluster=cms.double(0.)
-    producer.ProcessorParameters.C3d_parameters.minN_dbscan_multicluster=cms.uint32(0)
-    producer.ProcessorParameters.C3d_parameters.type_multicluster = cms.string('dRC3d')
-    producer.InputCluster = cms.InputTag('{}:HGCalBackendLayer1Processor2DClustering'.format(inputs))
+                    distance=distance_C3d_params.dR_multicluster
+                    ):
+    producer = process.hgcalBackEndLayer2Producer.clone(
+            InputCluster = cms.InputTag('{}:HGCalBackendLayer1Processor2DClustering'.format(inputs))
+            )
+    producer.ProcessorParameters.C3d_parameters = distance_C3d_params.clone(
+            dR_multicluster = distance
+            )
     return producer
 
 
 def create_dbscan(process, inputs,
-        distance=0.005,
-        min_points=3
-        ):
-    producer = process.hgcalBackEndLayer2Producer.clone() 
-    producer.ProcessorParameters.C3d_parameters.dR_multicluster = cms.double(0.)
-    producer.ProcessorParameters.C3d_parameters.dist_dbscan_multicluster = cms.double(distance)
-    producer.ProcessorParameters.C3d_parameters.minN_dbscan_multicluster = cms.uint32(min_points)
-    producer.ProcessorParameters.C3d_parameters.type_multicluster = cms.string('DBSCANC3d')
-    producer.InputCluster = cms.InputTag('{}:HGCalBackendLayer1Processor2DClustering'.format(inputs))
+                  distance=dbscan_C3d_params.dist_dbscan_multicluster,
+                  min_points=dbscan_C3d_params.minN_dbscan_multicluster
+                  ):
+    producer = process.hgcalBackEndLayer2Producer.clone(
+            InputCluster = cms.InputTag('{}:HGCalBackendLayer1Processor2DClustering'.format(inputs))
+            )
+    producer.ProcessorParameters.C3d_parameters = dbscan_C3d_params.clone(
+            dist_dbscan_multicluster = distance,
+            minN_dbscan_multicluster = min_points
+            )
     return producer
 
 
 def create_histoMax(process, inputs,
-        distance = 0.03,
-        nBins_R = 36,
-        nBins_Phi = 216,
-        binSumsHisto = binSums,                        
-        seed_threshold = 0,
-        ):
-    producer = process.hgcalBackEndLayer2Producer.clone() 
-    producer.ProcessorParameters.C3d_parameters.dR_multicluster = cms.double(distance)
-    producer.ProcessorParameters.C3d_parameters.nBins_R_histo_multicluster = cms.uint32(nBins_R)
-    producer.ProcessorParameters.C3d_parameters.nBins_Phi_histo_multicluster = cms.uint32(nBins_Phi)
-    producer.ProcessorParameters.C3d_parameters.binSumsHisto = binSumsHisto
-    producer.ProcessorParameters.C3d_parameters.threshold_histo_multicluster = seed_threshold
-    producer.ProcessorParameters.C3d_parameters.type_multicluster = cms.string('HistoMaxC3d')
-    producer.InputCluster = cms.InputTag('{}:HGCalBackendLayer1Processor2DClustering'.format(inputs))
+                    distance=histoMax_C3d_params.dR_multicluster,
+                    nBins_R=histoMax_C3d_params.nBins_R_histo_multicluster,
+                    nBins_Phi=histoMax_C3d_params.nBins_Phi_histo_multicluster,
+                    binSumsHisto=histoMax_C3d_params.binSumsHisto,
+                    seed_threshold=histoMax_C3d_params.threshold_histo_multicluster,
+                    ):
+    producer = process.hgcalBackEndLayer2Producer.clone(
+            InputCluster = cms.InputTag('{}:HGCalBackendLayer1Processor2DClustering'.format(inputs))
+            )
+    producer.ProcessorParameters.C3d_parameters = histoMax_C3d_params.clone()
+    set_histomax_params(producer.ProcessorParameters.C3d_parameters, distance, nBins_R, nBins_Phi, binSumsHisto, seed_threshold)
     return producer
 
 
 def create_histoMax_variableDr(process, inputs,
-        distances = dr_layerbylayer,
-        nBins_R = 36,
-        nBins_Phi = 216,
-        binSumsHisto = binSums,
-        seed_threshold = 0,
-        ):
-    producer = create_histoMax(process, inputs, 0, nBins_R, nBins_Phi, binSumsHisto, seed_threshold)
-    producer.ProcessorParameters.C3d_parameters.dR_multicluster_byLayer = cms.vdouble(distances)
+                               distances=histoMaxVariableDR_C3d_params.dR_multicluster_byLayer_coefficientA,
+                               nBins_R=histoMaxVariableDR_C3d_params.nBins_R_histo_multicluster,
+                               nBins_Phi=histoMaxVariableDR_C3d_params.nBins_Phi_histo_multicluster,
+                               binSumsHisto=histoMaxVariableDR_C3d_params.binSumsHisto,
+                               seed_threshold=histoMaxVariableDR_C3d_params.threshold_histo_multicluster,
+                               ):
+    producer = process.hgcalBackEndLayer2Producer.clone(
+            InputCluster = cms.InputTag('{}:HGCalBackendLayer1Processor2DClustering'.format(inputs))
+            )
+    producer.ProcessorParameters.C3d_parameters = histoMax_C3d_params.clone(
+            dR_multicluster_byLayer_coefficientA = distances
+            )
+    set_histomax_params(producer.ProcessorParameters.C3d_parameters, 0, nBins_R, nBins_Phi, binSumsHisto, seed_threshold)
     return producer
 
 
-def create_histoInterpolatedMax(process, inputs,
-        distance = 0.03,
-        nBins_R = 36,
-        nBins_Phi = 216,
-        binSumsHisto = binSums,
-        ):
-    producer = create_histoMax( process, inputs, distance, nBins_R, nBins_Phi, binSumsHisto )
-    producer.ProcessorParameters.C3d_parameters.type_multicluster = cms.string('HistoInterpolatedMaxC3d')
-    return producer
-
-def create_histoInterpolatedMax1stOrder(process, inputs):
-    producer = create_histoInterpolatedMax( process, inputs )
-    producer.ProcessorParameters.C3d_parameters.neighbour_weights=cms.vdouble(  0    , 0.25, 0   ,
-                                                   0.25 , 0   , 0.25,
-                                                   0    , 0.25, 0
-                                                )
+def create_histoInterpolatedMax1stOrder(process, inputs,
+                                        distance=histoInterpolatedMax_C3d_params.dR_multicluster,
+                                        nBins_R=histoInterpolatedMax_C3d_params.nBins_R_histo_multicluster,
+                                        nBins_Phi=histoInterpolatedMax_C3d_params.nBins_Phi_histo_multicluster,
+                                        binSumsHisto=histoInterpolatedMax_C3d_params.binSumsHisto,
+                                        seed_threshold=histoInterpolatedMax_C3d_params.threshold_histo_multicluster,
+                                        ):
+    producer = process.hgcalBackEndLayer2Producer.clone(
+            InputCluster = cms.InputTag('{}:HGCalBackendLayer1Processor2DClustering'.format(inputs))
+            )
+    producer.ProcessorParameters.C3d_parameters = histoInterpolatedMax_C3d_params.clone(
+            neighbour_weights = neighbour_weights_1stOrder
+            )
+    set_histomax_params(producer.ProcessorParameters.C3d_parameters, distance, nBins_R, nBins_Phi, binSumsHisto, seed_threshold)
     return producer
 
 
-
-def create_histoInterpolatedMax2ndOrder(process, inputs):
-    producer = create_histoInterpolatedMax( process,inputs )
-    producer.ProcessorParameters.C3d_parameters.neighbour_weights=cms.vdouble( -0.25, 0.5, -0.25,
-                                                   0.5 , 0  ,  0.5 ,
-                                                  -0.25, 0.5, -0.25
-                                                )
+def create_histoInterpolatedMax2ndOrder(process, inputs,
+                                        distance=histoInterpolatedMax_C3d_params.dR_multicluster,
+                                        nBins_R=histoInterpolatedMax_C3d_params.nBins_R_histo_multicluster,
+                                        nBins_Phi=histoInterpolatedMax_C3d_params.nBins_Phi_histo_multicluster,
+                                        binSumsHisto=histoInterpolatedMax_C3d_params.binSumsHisto,
+                                        seed_threshold=histoInterpolatedMax_C3d_params.threshold_histo_multicluster,
+                                        ):
+    producer = process.hgcalBackEndLayer2Producer.clone(
+            InputCluster = cms.InputTag('{}:HGCalBackendLayer1Processor2DClustering'.format(inputs))
+            )
+    producer.ProcessorParameters.C3d_parameters = histoInterpolatedMax_C3d_params.clone(
+            neighbour_weights = neighbour_weights_2ndOrder
+            )
+    set_histomax_params(producer.ProcessorParameters.C3d_parameters, distance, nBins_R, nBins_Phi, binSumsHisto, seed_threshold)
     return producer
 
 
-
 def create_histoThreshold(process, inputs,
-        threshold = 20.,
-        distance = 0.03,
-        nBins_R = 36,
-        nBins_Phi = 216,
-        binSumsHisto = binSums,
-        ):
-    producer = process.hgcalBackEndLayer2Producer.clone() 
-    producer.ProcessorParameters.C3d_parameters.threshold_histo_multicluster = cms.double(threshold)
-    producer.ProcessorParameters.C3d_parameters.dR_multicluster = cms.double(distance)
-    producer.ProcessorParameters.C3d_parameters.nBins_R_histo_multicluster = cms.uint32(nBins_R)
-    producer.ProcessorParameters.C3d_parameters.nBins_Phi_histo_multicluster = cms.uint32(nBins_Phi)
-    producer.ProcessorParameters.C3d_parameters.binSumsHisto = binSumsHisto
-    producer.ProcessorParameters.C3d_parameters.type_multicluster = cms.string('HistoThresholdC3d')
-    producer.InputCluster = cms.InputTag('{}:HGCalBackendLayer1Processor2DClustering'.format(inputs))
+                          threshold=histoThreshold_C3d_params.threshold_histo_multicluster,
+                          distance=histoThreshold_C3d_params.dR_multicluster,
+                          nBins_R=histoThreshold_C3d_params.nBins_R_histo_multicluster,
+                          nBins_Phi=histoThreshold_C3d_params.nBins_Phi_histo_multicluster,
+                          binSumsHisto=histoThreshold_C3d_params.binSumsHisto
+                          ):
+    producer = process.hgcalBackEndLayer2Producer.clone(
+            InputCluster = cms.InputTag('{}:HGCalBackendLayer1Processor2DClustering'.format(inputs))
+            )
+    producer.ProcessorParameters.C3d_parameters = histoThreshold_C3d_params.clone()
+    set_histomax_params(producer.ProcessorParameters.C3d_parameters, distance, nBins_R, nBins_Phi, binSumsHisto, threshold)
     return producer
diff --git a/L1Trigger/L1THGCalUtilities/python/concentrator.py b/L1Trigger/L1THGCalUtilities/python/concentrator.py
index daad7e7c1dbe6..8d79beb6c436b 100644
--- a/L1Trigger/L1THGCalUtilities/python/concentrator.py
+++ b/L1Trigger/L1THGCalUtilities/python/concentrator.py
@@ -1,47 +1,44 @@
 import FWCore.ParameterSet.Config as cms
 import SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi as digiparam
+from L1Trigger.L1THGCal.hgcalConcentratorProducer_cfi import threshold_conc_proc, best_conc_proc, supertc_conc_proc
+
 
 def create_supertriggercell(process, inputs,
-        stcSize = cms.vuint32(4,4,4) 
-        ):
-    producer = process.hgcalConcentratorProducer.clone()     
-    producer.ProcessorParameters.Method = cms.string('superTriggerCellSelect')
-    producer.ProcessorParameters.stcSize = stcSize
-    producer.InputTriggerCells = cms.InputTag('{}:HGCalVFEProcessorSums'.format(inputs))
-    producer.InputTriggerSums = cms.InputTag('{}:HGCalVFEProcessorSums'.format(inputs))
+                            stcSize=supertc_conc_proc.stcSize
+                            ):
+    producer = process.hgcalConcentratorProducer.clone(
+            InputTriggerCells = cms.InputTag('{}:HGCalVFEProcessorSums'.format(inputs)),
+            InputTriggerSums = cms.InputTag('{}:HGCalVFEProcessorSums'.format(inputs))
+            )
+    producer.ProcessorParameters = supertc_conc_proc.clone(
+            stcSize = stcSize
+            )
     return producer
 
 
 def create_threshold(process, inputs,
-        threshold=2. # in mipT
-        ):
-    adcSaturationBH_MIP = digiparam.hgchebackDigitizer.digiCfg.feCfg.adcSaturation_fC
-    adcNbitsBH = digiparam.hgchebackDigitizer.digiCfg.feCfg.adcNbits
-    producer = process.hgcalConcentratorProducer.clone()
-    producer.ProcessorParameters.Method = cms.string('thresholdSelect')
-    producer.ProcessorParameters.linLSB = cms.double(100./1024.)
-    producer.ProcessorParameters.adcsaturationBH = adcSaturationBH_MIP
-    producer.ProcessorParameters.adcnBitsBH = adcNbitsBH
-    producer.ProcessorParameters.TCThreshold_fC = cms.double(0.)
-    producer.ProcessorParameters.TCThresholdBH_MIP = cms.double(0.)
-    producer.ProcessorParameters.triggercell_threshold_silicon = cms.double(threshold) # MipT
-    producer.ProcessorParameters.triggercell_threshold_scintillator = cms.double(threshold) # MipT
-    producer.InputTriggerCells = cms.InputTag('{}:HGCalVFEProcessorSums'.format(inputs))
-    producer.InputTriggerSums = cms.InputTag('{}:HGCalVFEProcessorSums'.format(inputs))
+                     threshold_silicon=threshold_conc_proc.triggercell_threshold_silicon,  # in mipT
+                     threshold_scintillator=threshold_conc_proc.triggercell_threshold_scintillator  # in mipT
+                     ):
+    producer = process.hgcalConcentratorProducer.clone(
+            InputTriggerCells = cms.InputTag('{}:HGCalVFEProcessorSums'.format(inputs)),
+            InputTriggerSums = cms.InputTag('{}:HGCalVFEProcessorSums'.format(inputs))
+            )
+    producer.ProcessorParameters = threshold_conc_proc.clone(
+            triggercell_threshold_silicon = threshold_silicon,  # MipT
+            triggercell_threshold_scintillator = threshold_scintillator  # MipT
+            )
     return producer
 
 
 def create_bestchoice(process, inputs,
-       triggercells=12
-        ):
-    adcSaturationBH_MIP = digiparam.hgchebackDigitizer.digiCfg.feCfg.adcSaturation_fC
-    adcNbitsBH = digiparam.hgchebackDigitizer.digiCfg.feCfg.adcNbits
-    producer = process.hgcalConcentratorProducer.clone() 
-    producer.ProcessorParameters.Method = cms.string('bestChoiceSelect')
-    producer.ProcessorParameters.NData = cms.uint32(triggercells)
-    producer.ProcessorParameters.linLSB = cms.double(100./1024.)
-    producer.ProcessorParameters.adcsaturationBH = adcSaturationBH_MIP
-    producer.ProcessorParameters.adcnBitsBH = adcNbitsBH
-    producer.InputTriggerCells = cms.InputTag('{}:HGCalVFEProcessorSums'.format(inputs))
-    producer.InputTriggerSums = cms.InputTag('{}:HGCalVFEProcessorSums'.format(inputs))
+                      triggercells=best_conc_proc.NData
+                      ):
+    producer = process.hgcalConcentratorProducer.clone(
+            InputTriggerCells = cms.InputTag('{}:HGCalVFEProcessorSums'.format(inputs)),
+            InputTriggerSums = cms.InputTag('{}:HGCalVFEProcessorSums'.format(inputs))
+            )
+    producer.ProcessorParameters = best_conc_proc.clone(
+            NData = triggercells
+            )
     return producer
diff --git a/L1Trigger/L1THGCalUtilities/python/customNtuples.py b/L1Trigger/L1THGCalUtilities/python/customNtuples.py
index 21de15da5b5f3..92c3399a4d661 100644
--- a/L1Trigger/L1THGCalUtilities/python/customNtuples.py
+++ b/L1Trigger/L1THGCalUtilities/python/customNtuples.py
@@ -23,13 +23,13 @@ def create_ntuple(process, inputs,
     for ntuple in ntuple_list:
         pset = getattr(process, 'ntuple_'+ntuple).clone()
         if ntuple=='triggercells':
-            pset.TriggerCells = cms.InputTag('{}:HGCalConcentratorProcessorSelection'.format(inputs[0]))
-            pset.Multiclusters = cms.InputTag('{}:HGCalBackendLayer2Processor3DClustering'.format(inputs[2]))
+            pset.TriggerCells = cms.InputTag(inputs[0])
+            pset.Multiclusters = cms.InputTag(inputs[2])
         elif ntuple=='clusters':
-            pset.Clusters = cms.InputTag('{}:HGCalBackendLayer1Processor2DClustering'.format(inputs[1]))
-            pset.Multiclusters = cms.InputTag('{}:HGCalBackendLayer2Processor3DClustering'.format(inputs[2]))
+            pset.Clusters = cms.InputTag(inputs[1])
+            pset.Multiclusters = cms.InputTag(inputs[2])
         elif ntuple=='multiclusters':
-            pset.Multiclusters = cms.InputTag('{}:HGCalBackendLayer2Processor3DClustering'.format(inputs[2]))
+            pset.Multiclusters = cms.InputTag(inputs[2])
         vpset.append(pset)
     ntuplizer = process.hgcalTriggerNtuplizer.clone()
     ntuplizer.Ntuples = cms.VPSet(vpset)
diff --git a/L1Trigger/L1THGCalUtilities/python/hgcalTriggerChains.py b/L1Trigger/L1THGCalUtilities/python/hgcalTriggerChains.py
index 432ae33aef58d..3fb7ade645fe3 100644
--- a/L1Trigger/L1THGCalUtilities/python/hgcalTriggerChains.py
+++ b/L1Trigger/L1THGCalUtilities/python/hgcalTriggerChains.py
@@ -6,6 +6,7 @@ def __init__(self):
         self.concentrator = {}
         self.backend1 = {}
         self.backend2 = {}
+        self.selector = {}
         self.ntuple = {}
         self.chain = []
 
@@ -21,10 +22,13 @@ def register_backend1(self, name, generator):
     def register_backend2(self, name, generator):
         self.backend2[name] = generator
 
+    def register_selector(self, name, generator):
+        self.selector[name] = generator
+
     def register_ntuple(self, name, generator):
         self.ntuple[name] = generator
 
-    def register_chain(self, vfe, concentrator, backend1, backend2, ntuple=''):
+    def register_chain(self, vfe, concentrator, backend1, backend2, selector='', ntuple=''):
         if not vfe in self.vfe: 
             raise KeyError('{} not registered as VFE producer'.format(vfe))
         if not concentrator in self.concentrator: 
@@ -33,47 +37,69 @@ def register_chain(self, vfe, concentrator, backend1, backend2, ntuple=''):
             raise KeyError('{} not registered as backend1 producer'.format(backend1))
         if not backend2 in self.backend2: 
             raise KeyError('{} not registered as backend2 producer'.format(backend2))
+        if selector!='' and not selector in self.selector:
+            raise KeyError('{} not registered as selector'.format(selector))
         if ntuple!='' and not ntuple in self.ntuple: 
             raise KeyError('{} not registered as ntuplizer'.format(ntuple))
-        self.chain.append( (vfe, concentrator, backend1, backend2, ntuple) )
+        self.chain.append( (vfe, concentrator, backend1, backend2, selector, ntuple) )
     
 
     def create_sequences(self, process):
-        tmp = cms.SequencePlaceholder("tmp")
-        vfe_sequence = cms.Sequence(tmp)
-        concentrator_sequence = cms.Sequence(tmp)
-        backend1_sequence = cms.Sequence(tmp)
-        backend2_sequence = cms.Sequence(tmp)
-        ntuple_sequence = cms.Sequence(tmp)
-        for vfe,concentrator,backend1,backend2,ntuple in self.chain:
+        if not hasattr(process, 'hgcalTriggerSelector'):
+            process.load('L1Trigger.L1THGCalUtilities.HGC3DClusterGenMatchSelector_cff')
+        tmp = cms.TaskPlaceholder("tmp")
+        tmpseq = cms.SequencePlaceholder("tmp")
+        vfe_task = cms.Task(tmp)
+        concentrator_task = cms.Task(tmp)
+        backend1_task = cms.Task(tmp)
+        backend2_task = cms.Task(tmp)
+        selector_sequence = cms.Sequence(tmpseq)
+        ntuple_sequence = cms.Sequence(tmpseq)
+        for vfe,concentrator,backend1,backend2,selector,ntuple in self.chain:
             concentrator_name = '{0}{1}'.format(vfe, concentrator)
             backend1_name = '{0}{1}{2}'.format(vfe, concentrator, backend1)
             backend2_name = '{0}{1}{2}{3}'.format(vfe, concentrator, backend1, backend2)
-            ntuple_name = '{0}{1}{2}{3}{4}'.format(vfe, concentrator, backend1, backend2, ntuple)
-            ntuple_inputs = [concentrator_name, backend1_name, backend2_name]
+            selector_name = '{0}{1}{2}{3}{4}'.format(vfe, concentrator, backend1, backend2, selector)
+            ntuple_name = '{0}{1}{2}{3}{4}{5}'.format(vfe, concentrator, backend1, backend2, selector, ntuple)
+            if selector=='':
+                ntuple_inputs = [
+                        concentrator_name+':HGCalConcentratorProcessorSelection',
+                        backend1_name+':HGCalBackendLayer1Processor2DClustering',
+                        backend2_name+':HGCalBackendLayer2Processor3DClustering'
+                        ]
+            else:
+                ntuple_inputs = [
+                        concentrator_name+':HGCalConcentratorProcessorSelection',
+                        backend1_name+':HGCalBackendLayer1Processor2DClustering',
+                        selector_name]
             if not hasattr(process, vfe):
                 setattr(process, vfe, self.vfe[vfe](process))
-                vfe_sequence *= getattr(process, vfe)
+                vfe_task.add(getattr(process, vfe))
             if not hasattr(process, concentrator_name):
                 setattr(process, concentrator_name, self.concentrator[concentrator](process, vfe))
-                concentrator_sequence *= getattr(process, concentrator_name)
+                concentrator_task.add(getattr(process, concentrator_name))
             if not hasattr(process, backend1_name):
                 setattr(process, backend1_name, self.backend1[backend1](process, concentrator_name))
-                backend1_sequence *= getattr(process, backend1_name)
+                backend1_task.add(getattr(process, backend1_name))
             if not hasattr(process, backend2_name):
                 setattr(process, backend2_name, self.backend2[backend2](process, backend1_name))
-                backend2_sequence *= getattr(process, backend2_name)
+                backend2_task.add(getattr(process, backend2_name))
+            if selector!='' and not hasattr(process, selector_name):
+                setattr(process, selector_name, self.selector[selector](process, backend2_name))
+                selector_sequence *= getattr(process, selector_name)
             if ntuple!='' and not hasattr(process, ntuple_name):
                 setattr(process, ntuple_name, self.ntuple[ntuple](process, ntuple_inputs))
                 ntuple_sequence *= getattr(process, ntuple_name)
-        vfe_sequence.remove(tmp)
-        concentrator_sequence.remove(tmp)
-        backend1_sequence.remove(tmp)
-        backend2_sequence.remove(tmp)
-        ntuple_sequence.remove(tmp)
-        process.globalReplace('hgcalVFE', vfe_sequence)
-        process.globalReplace('hgcalConcentrator', concentrator_sequence)
-        process.globalReplace('hgcalBackEndLayer1', backend1_sequence)
-        process.globalReplace('hgcalBackEndLayer2', backend2_sequence)
+        vfe_task.remove(tmp)
+        concentrator_task.remove(tmp)
+        backend1_task.remove(tmp)
+        backend2_task.remove(tmp)
+        selector_sequence.remove(tmpseq)
+        ntuple_sequence.remove(tmpseq)
+        process.globalReplace('hgcalVFE', vfe_task)
+        process.globalReplace('hgcalConcentrator', concentrator_task)
+        process.globalReplace('hgcalBackEndLayer1', backend1_task)
+        process.globalReplace('hgcalBackEndLayer2', backend2_task)
+        process.globalReplace('hgcalTriggerSelector', selector_sequence)
         process.globalReplace('hgcalTriggerNtuples', ntuple_sequence)
         return process
diff --git a/L1Trigger/L1THGCalUtilities/python/hgcalTriggerNtuples_cfi.py b/L1Trigger/L1THGCalUtilities/python/hgcalTriggerNtuples_cfi.py
index 9b03570e3ed85..07ea45d90a9dd 100644
--- a/L1Trigger/L1THGCalUtilities/python/hgcalTriggerNtuples_cfi.py
+++ b/L1Trigger/L1THGCalUtilities/python/hgcalTriggerNtuples_cfi.py
@@ -75,11 +75,11 @@
     FilterClustersInMulticlusters = cms.bool(False)
 )
 
-from L1Trigger.L1THGCal.egammaIdentification import egamma_identification_drnn_cone
+from L1Trigger.L1THGCal.egammaIdentification import egamma_identification_histomax
 ntuple_multiclusters = cms.PSet(
     NtupleName = cms.string('HGCalTriggerNtupleHGCMulticlusters'),
     Multiclusters = cms.InputTag('hgcalBackEndLayer2Producer:HGCalBackendLayer2Processor3DClustering'),
-    EGIdentification = egamma_identification_drnn_cone.clone()
+    EGIdentification = egamma_identification_histomax.clone()
 )
 
 ntuple_panels = cms.PSet(
diff --git a/L1Trigger/L1THGCalUtilities/python/selectors.py b/L1Trigger/L1THGCalUtilities/python/selectors.py
new file mode 100644
index 0000000000000..baddbf9c493fa
--- /dev/null
+++ b/L1Trigger/L1THGCalUtilities/python/selectors.py
@@ -0,0 +1,10 @@
+import FWCore.ParameterSet.Config as cms
+
+def create_genmatch(process, inputs,
+        distance=0.3
+        ):
+    producer = process.hgc3DClusterGenMatchSelector.clone(
+            dR = cms.double(distance),
+            src = cms.InputTag('{}:HGCalBackendLayer2Processor3DClustering'.format(inputs))
+            )
+    return producer
diff --git a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelValV9_cfg.py b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelValV9_cfg.py
index 086c13a665caa..64091ad110af4 100644
--- a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelValV9_cfg.py
+++ b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelValV9_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('DIGI',eras.Phase2C4)
+from Configuration.Eras.Era_Phase2C4_cff import Phase2C4
+process = cms.Process('DIGI',Phase2C4)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelVal_cfg.py b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelVal_cfg.py
index 00a808e58fca8..68b1fb8fa68f3 100644
--- a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelVal_cfg.py
+++ b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_RelVal_cfg.py
@@ -1,10 +1,10 @@
 import FWCore.ParameterSet.Config as cms 
-from Configuration.StandardSequences.Eras import eras
 from Configuration.ProcessModifiers.convertHGCalDigisSim_cff import convertHGCalDigisSim
 
 # For old samples use the digi converter
-#process = cms.Process('DIGI',eras.Phase2,convertHGCalDigisSim)
-process = cms.Process('DIGI',eras.Phase2)
+#from Configuration.Eras.Era_Phase2_cff import Phase2
+#process = cms.Process('DIGI',Phase2,convertHGCalDigisSim)
+process = cms.Process('DIGI',Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_cfg.py b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_cfg.py
index 42ab1b5672792..67cbc1101c22d 100644
--- a/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_cfg.py
+++ b/L1Trigger/L1THGCalUtilities/test/testHGCalL1T_multialgo_cfg.py
@@ -1,10 +1,10 @@
 import FWCore.ParameterSet.Config as cms 
-from Configuration.StandardSequences.Eras import eras
 from Configuration.ProcessModifiers.convertHGCalDigisSim_cff import convertHGCalDigisSim
 
 # For old samples use the digi converter
-#process = cms.Process('DIGI',eras.Phase2,convertHGCalDigisSim)
-process = cms.Process('DIGI',eras.Phase2)
+#from Configuration.Eras.Era_Phase2_cff import Phase2
+#process = cms.Process('DIGI',Phase2,convertHGCalDigisSim)
+process = cms.Process('DIGI',Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
@@ -66,12 +66,14 @@
 
 # load HGCAL TPG simulation
 process.load('L1Trigger.L1THGCal.hgcalTriggerPrimitives_cff')
+process.load('L1Trigger.L1THGCalUtilities.HGC3DClusterGenMatchSelector_cff')
 process.load('L1Trigger.L1THGCalUtilities.hgcalTriggerNtuples_cff')
 from L1Trigger.L1THGCalUtilities.hgcalTriggerChains import HGCalTriggerChains
 import L1Trigger.L1THGCalUtilities.vfe as vfe
 import L1Trigger.L1THGCalUtilities.concentrator as concentrator
 import L1Trigger.L1THGCalUtilities.clustering2d as clustering2d
 import L1Trigger.L1THGCalUtilities.clustering3d as clustering3d
+import L1Trigger.L1THGCalUtilities.selectors as selectors
 import L1Trigger.L1THGCalUtilities.customNtuples as ntuple
 
 
@@ -91,6 +93,8 @@
 chains.register_backend2("Histomaxvardrth0", lambda p,i : clustering3d.create_histoMax_variableDr(p,i,seed_threshold=0.))
 chains.register_backend2("Histomaxvardrth10", lambda p,i : clustering3d.create_histoMax_variableDr(p,i,seed_threshold=10.))
 chains.register_backend2("Histomaxvardrth20", lambda p,i : clustering3d.create_histoMax_variableDr(p,i,seed_threshold=20.))
+# Register selector
+chains.register_selector("Genmatch", selectors.create_genmatch)
 # Register ntuples
 # Store gen info only in the reference ntuple
 ntuple_list_ref = ['event', 'gen', 'multiclusters']
@@ -100,13 +104,13 @@
 
 # Register trigger chains
 ## Reference chain
-chains.register_chain('Floatingpoint8', "Threshold", 'Ref2d', 'Ref3d', 'Genclustersntuple')
+chains.register_chain('Floatingpoint8', "Threshold", 'Ref2d', 'Ref3d', 'Genmatch', 'Genclustersntuple')
 concentrator_algos = ['Supertriggercell', 'Threshold']
 backend_algos = ['Histomax', 'Histomaxvardrth0', 'Histomaxvardrth10', 'Histomaxvardrth20']
 ## Make cross product fo ECON and BE algos
 import itertools
 for cc,be in itertools.product(concentrator_algos,backend_algos):
-    chains.register_chain('Floatingpoint8', cc, 'Dummy', be, 'Clustersntuple')
+    chains.register_chain('Floatingpoint8', cc, 'Dummy', be, 'Genmatch', 'Clustersntuple')
 
 process = chains.create_sequences(process)
 
@@ -115,10 +119,11 @@
 process.hgcalTriggerPrimitives.remove(process.hgcalTower)
 
 process.hgcl1tpg_step = cms.Path(process.hgcalTriggerPrimitives)
+process.selector_step = cms.Path(process.hgcalTriggerSelector)
 process.ntuple_step = cms.Path(process.hgcalTriggerNtuples)
 
 # Schedule definition
-process.schedule = cms.Schedule(process.hgcl1tpg_step, process.ntuple_step)
+process.schedule = cms.Schedule(process.hgcl1tpg_step, process.selector_step, process.ntuple_step)
 
 # Add early deletion of temporary data products to reduce peak memory need
 from Configuration.StandardSequences.earlyDeleteSettings_cff import customiseEarlyDelete
diff --git a/L1Trigger/L1TMuon/python/simDigis_cff.py b/L1Trigger/L1TMuon/python/simDigis_cff.py
index cffde6d9fe12f..37f7b3a697234 100644
--- a/L1Trigger/L1TMuon/python/simDigis_cff.py
+++ b/L1Trigger/L1TMuon/python/simDigis_cff.py
@@ -20,7 +20,8 @@
     CSCWireDigiProducer       = 'simMuonCSCDigis:MuonCSCWireDigi'
 )
 
-SimL1TMuonCommon = cms.Sequence(simDtTriggerPrimitiveDigis + simCscTriggerPrimitiveDigis)
+SimL1TMuonCommonTask = cms.Task(simDtTriggerPrimitiveDigis, simCscTriggerPrimitiveDigis)
+SimL1TMuonCommon = cms.Sequence(SimL1TMuonCommonTask)
 
 #
 # Legacy Trigger:
@@ -66,7 +67,8 @@
 )
 #
 #
-SimL1TMuon = cms.Sequence(SimL1TMuonCommon + simCsctfTrackDigis + simCsctfDigis + simDttfDigis + simRpcTriggerDigis + simGmtDigis)
+SimL1TMuonTask = cms.Task(SimL1TMuonCommonTask, simCsctfTrackDigis, simCsctfDigis, simDttfDigis, simRpcTriggerDigis, simGmtDigis)
+SimL1TMuon = cms.Sequence(SimL1TMuonTask)
 
 #
 # Stage-2 Trigger
@@ -80,11 +82,11 @@
 from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
 #
 #
-stage2L1Trigger.toReplaceWith(SimL1TMuon, cms.Sequence(SimL1TMuonCommon + simTwinMuxDigis + simBmtfDigis + simEmtfDigis + simOmtfDigis + simGmtCaloSumDigis + simGmtStage2Digis))
+stage2L1Trigger.toReplaceWith(SimL1TMuonTask, cms.Task(SimL1TMuonCommonTask, simTwinMuxDigis, simBmtfDigis, simEmtfDigis, simOmtfDigis, simGmtCaloSumDigis, simGmtStage2Digis))
 
 from L1Trigger.ME0Trigger.me0TriggerPseudoDigis_cff import *
-_phase2_SimL1TMuon = SimL1TMuon.copy()
-_phase2_SimL1TMuon += me0TriggerPseudoDigiSequence
+_phase2_SimL1TMuonTask = SimL1TMuonTask.copy()
+_phase2_SimL1TMuonTask.add(me0TriggerPseudoDigiTask)
 
 from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon
-(stage2L1Trigger & phase2_muon).toReplaceWith( SimL1TMuon, _phase2_SimL1TMuon )
+(stage2L1Trigger & phase2_muon).toReplaceWith( SimL1TMuonTask, _phase2_SimL1TMuonTask )
diff --git a/L1Trigger/L1TMuon/test/runMuon.py b/L1Trigger/L1TMuon/test/runMuon.py
index 498e1ed4bce5d..22370bede1e4c 100644
--- a/L1Trigger/L1TMuon/test/runMuon.py
+++ b/L1Trigger/L1TMuon/test/runMuon.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process("L1TMuonEmulation", eras.Run2_2016)
+from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
+process = cms.Process("L1TMuonEmulation", Run2_2016)
 import os
 import sys
 import commands
diff --git a/L1Trigger/L1TMuonCPPF/interface/EmulateCPPF.h b/L1Trigger/L1TMuonCPPF/interface/EmulateCPPF.h
index f5282dac78138..5c268f03fb3d9 100644
--- a/L1Trigger/L1TMuonCPPF/interface/EmulateCPPF.h
+++ b/L1Trigger/L1TMuonCPPF/interface/EmulateCPPF.h
@@ -6,31 +6,29 @@
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-
 class EmulateCPPF {
-  
- public:
-  explicit EmulateCPPF(const edm::ParameterSet& iConfig, edm::ConsumesCollector&& iConsumes);
+
+public:
+  explicit EmulateCPPF(const edm::ParameterSet &iConfig,
+                       edm::ConsumesCollector &&iConsumes);
   ~EmulateCPPF();
-  
+
   void process(
-	       // Input
-	       const edm::Event& iEvent, const edm::EventSetup& iSetup,
-	       // Output
-	       l1t::CPPFDigiCollection& cppf_recHit
-	       );
-  
-  
- private:
-  
+      // Input
+      const edm::Event &iEvent, const edm::EventSetup &iSetup,
+      // Output
+      l1t::CPPFDigiCollection &cppf_recHit);
+
+private:
   // For now, treat CPPF as single board
-  // In the future, may want to treat the 4 CPPF boards in each endcap as separate entities
+  // In the future, may want to treat the 4 CPPF boards in each endcap as
+  // separate entities
   std::array<RecHitProcessor, 1> recHit_processors_;
-  
+
   const edm::EDGetToken recHitToken_;
   enum class CppfSource { File, EventSetup } cppfSource_;
   std::vector<RecHitProcessor::CppfItem> CppfVec_1;
-  int MaxClusterSize_; 
+  int MaxClusterSize_;
 }; // End class EmulateCPPF
 
 #endif // #define L1Trigger_L1TMuonCPPF_EmulateCPPF_h
diff --git a/L1Trigger/L1TMuonCPPF/interface/RecHitProcessor.h b/L1Trigger/L1TMuonCPPF/interface/RecHitProcessor.h
index fe48143e1fa49..4ebbb14f5746a 100644
--- a/L1Trigger/L1TMuonCPPF/interface/RecHitProcessor.h
+++ b/L1Trigger/L1TMuonCPPF/interface/RecHitProcessor.h
@@ -1,39 +1,39 @@
 #ifndef L1Trigger_L1TMuonCPPF_RecHitProcessor_h
 #define L1Trigger_L1TMuonCPPF_RecHitProcessor_h
 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "Geometry/RPCGeometry/interface/RPCRoll.h"
 #include "Geometry/RPCGeometry/interface/RPCGeometry.h"
+#include "Geometry/RPCGeometry/interface/RPCRoll.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
 
+#include "DataFormats/L1TMuon/interface/CPPFDigi.h"
 #include "DataFormats/MuonDetId/interface/RPCDetId.h"
 #include "DataFormats/RPCRecHit/interface/RPCRecHitCollection.h"
-#include "DataFormats/L1TMuon/interface/CPPFDigi.h"
 
-#include "CondFormats/RPCObjects/interface/RPCMaskedStrips.h"
 #include "CondFormats/RPCObjects/interface/RPCDeadStrips.h"
+#include "CondFormats/RPCObjects/interface/RPCMaskedStrips.h"
 
 #include "CondFormats/Serialization/interface/Serializable.h"
 #include "L1Trigger/L1TMuonEndCap/interface/TrackTools.h"
 
-#include<boost/cstdint.hpp>
-#include<vector>
-#include<iostream>
-#include<sstream>
-#include<string> 
-#include<memory>
+#include <boost/cstdint.hpp>
+#include <iostream>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
 
 class RecHitProcessor {
- public:
+public:
   explicit RecHitProcessor();
   ~RecHitProcessor();
-  
+
   struct CppfItem {
-    
+
     int lb;
     int rawId;
     int strip;
@@ -43,37 +43,32 @@ class RecHitProcessor {
     int int_theta;
     COND_SERIALIZABLE;
   };
-  
-  std::vector<CppfItem> const & getCppfVec() const {return CppfVec;}
-  std::vector<CppfItem> CppfVec; 
-  
-  
+
+  std::vector<CppfItem> const &getCppfVec() const { return CppfVec; }
+  std::vector<CppfItem> CppfVec;
+
   void processLook(
-		   // Input
-		   const edm::Event& iEvent,
-		   const edm::EventSetup& iSetup,
-		   const edm::EDGetToken& recHitToken,
-		   std::vector<RecHitProcessor::CppfItem>& CppfVec1, 
-		   // Output
-		   l1t::CPPFDigiCollection& cppfDigis,
-		   const int MaxClusterSize
-		   ) const;
-  
+      // Input
+      const edm::Event &iEvent, const edm::EventSetup &iSetup,
+      const edm::EDGetToken &recHitToken,
+      std::vector<RecHitProcessor::CppfItem> &CppfVec1,
+      // Output
+      l1t::CPPFDigiCollection &cppfDigis, const int MaxClusterSize) const;
+
   void process(
-	       // Input
-	       const edm::Event& iEvent,
-	       const edm::EventSetup& iSetup,
-	       const edm::EDGetToken& recHitToken,
-	       // Output
-	       l1t::CPPFDigiCollection& cppfDigis
-	       ) const;
-  
-  void print(int a, int b, float c, float d) const {std::cout << a << " " << b << " " << c << " " << d << std::endl;};
-  
+      // Input
+      const edm::Event &iEvent, const edm::EventSetup &iSetup,
+      const edm::EDGetToken &recHitToken,
+      // Output
+      l1t::CPPFDigiCollection &cppfDigis) const;
+
+  void print(int a, int b, float c, float d) const {
+    std::cout << a << " " << b << " " << c << " " << d << std::endl;
+  };
+
   COND_SERIALIZABLE;
-  
- private:
-  
+
+private:
 };
 
 #endif /* #define L1Trigger_L1TMuonCPPF_RecHitProcessor_h */
diff --git a/L1Trigger/L1TMuonCPPF/plugins/L1TMuonCPPFDigiProducer.cc b/L1Trigger/L1TMuonCPPF/plugins/L1TMuonCPPFDigiProducer.cc
index a5951b6d0a1e3..f1afc8b690103 100644
--- a/L1Trigger/L1TMuonCPPF/plugins/L1TMuonCPPFDigiProducer.cc
+++ b/L1Trigger/L1TMuonCPPF/plugins/L1TMuonCPPFDigiProducer.cc
@@ -3,39 +3,38 @@
 
 #include "L1TMuonCPPFDigiProducer.h"
 
-
-L1TMuonCPPFDigiProducer::L1TMuonCPPFDigiProducer(const edm::ParameterSet& iConfig) :
-  cppf_emulator_(std::make_unique<EmulateCPPF>(iConfig, consumesCollector()))
-  //cppf_emulator_(new EmulateCPPF(iConfig, consumesCollector()))
+L1TMuonCPPFDigiProducer::L1TMuonCPPFDigiProducer(
+    const edm::ParameterSet &iConfig)
+    : cppf_emulator_(
+          std::make_unique<EmulateCPPF>(iConfig, consumesCollector()))
+// cppf_emulator_(new EmulateCPPF(iConfig, consumesCollector()))
 {
   // produces<l1t::CPPFDigiCollection>("rpcDigi");
   produces<l1t::CPPFDigiCollection>("recHit");
 }
 
-L1TMuonCPPFDigiProducer::~L1TMuonCPPFDigiProducer() {
-}
+L1TMuonCPPFDigiProducer::~L1TMuonCPPFDigiProducer() {}
+
+void L1TMuonCPPFDigiProducer::produce(edm::Event &iEvent,
+                                      const edm::EventSetup &iSetup) {
 
-void L1TMuonCPPFDigiProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
-    
-  // Create pointers to the collections which will store the cppfDigis 
+  // Create pointers to the collections which will store the cppfDigis
   // auto cppf_rpcDigi = std::make_unique<l1t::CPPFDigiCollection>();
-  auto cppf_recHit  = std::make_unique<l1t::CPPFDigiCollection>();
+  auto cppf_recHit = std::make_unique<l1t::CPPFDigiCollection>();
 
-  // Main CPPF emulation process: emulates CPPF output from RPCDigi or RecHit inputs
-  // From src/EmulateCPPF.cc
-  // cppf_emulator_->process(iEvent, iSetup, *cppf_rpcDigi, *cppf_recHit);
+  // Main CPPF emulation process: emulates CPPF output from RPCDigi or RecHit
+  // inputs From src/EmulateCPPF.cc cppf_emulator_->process(iEvent, iSetup,
+  // *cppf_rpcDigi, *cppf_recHit);
   cppf_emulator_->process(iEvent, iSetup, *cppf_recHit);
 
   // Fill the output collections
   // iEvent.put(std::move(cppf_rpcDigi), "rpcDigi");
-  iEvent.put(std::move(cppf_recHit),  "recHit");
+  iEvent.put(std::move(cppf_recHit), "recHit");
 }
 
-void L1TMuonCPPFDigiProducer::beginStream(edm::StreamID iID) {
-}
+void L1TMuonCPPFDigiProducer::beginStream(edm::StreamID iID) {}
 
-void L1TMuonCPPFDigiProducer::endStream(){
-}
+void L1TMuonCPPFDigiProducer::endStream() {}
 
 // Define this as a plug-in
 DEFINE_FWK_MODULE(L1TMuonCPPFDigiProducer);
diff --git a/L1Trigger/L1TMuonCPPF/plugins/L1TMuonCPPFDigiProducer.h b/L1Trigger/L1TMuonCPPF/plugins/L1TMuonCPPFDigiProducer.h
index 1d475522a91fe..5472aded1c1dc 100644
--- a/L1Trigger/L1TMuonCPPF/plugins/L1TMuonCPPFDigiProducer.h
+++ b/L1Trigger/L1TMuonCPPF/plugins/L1TMuonCPPFDigiProducer.h
@@ -26,41 +26,39 @@
 
 #include "CondFormats/RPCObjects/interface/RPCDeadStrips.h"
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "DataFormats/MuonDetId/interface/RPCDetId.h"
 #include "DataFormats/L1TMuon/interface/CPPFDigi.h"
+#include "DataFormats/MuonDetId/interface/RPCDetId.h"
 
-#include "Geometry/RPCGeometry/interface/RPCRoll.h"
 #include "Geometry/RPCGeometry/interface/RPCGeometry.h"
+#include "Geometry/RPCGeometry/interface/RPCRoll.h"
 
 #include "L1Trigger/L1TMuonEndCap/interface/PrimitiveConversion.h"
 #include "L1Trigger/L1TMuonEndCap/interface/SectorProcessorLUT.h"
 
 #include <Geometry/Records/interface/MuonGeometryRecord.h>
 
+#include "TVector3.h"
 #include <cassert>
-#include <string>
 #include <fstream>
-#include "TVector3.h"
+#include <string>
 
 // Class declaration
 class L1TMuonCPPFDigiProducer : public edm::stream::EDProducer<> {
-  
- public:
-  explicit L1TMuonCPPFDigiProducer(const edm::ParameterSet&);
+
+public:
+  explicit L1TMuonCPPFDigiProducer(const edm::ParameterSet &);
   ~L1TMuonCPPFDigiProducer() override;
 
- private:
-  
+private:
   void beginStream(edm::StreamID) override;
   void endStream() override;
-  void produce(edm::Event& event, const edm::EventSetup& setup) override;
-  
- private:
+  void produce(edm::Event &event, const edm::EventSetup &setup) override;
+
+private:
   std::unique_ptr<EmulateCPPF> cppf_emulator_;
-       
 };
 
 #endif /* #define L1Trigger_L1TMuonCPPF_L1TMuonCPPFDigiProducer_h */
diff --git a/L1Trigger/L1TMuonCPPF/src/EmulateCPPF.cc b/L1Trigger/L1TMuonCPPF/src/EmulateCPPF.cc
index fab4fbb6bb095..d2cab03237335 100644
--- a/L1Trigger/L1TMuonCPPF/src/EmulateCPPF.cc
+++ b/L1Trigger/L1TMuonCPPF/src/EmulateCPPF.cc
@@ -1,88 +1,98 @@
 
-#include "L1Trigger/L1TMuonCPPF/interface/EmulateCPPF.h"
-#include "CondFormats/RPCObjects/interface/RPCMaskedStrips.h"
 #include "CondFormats/RPCObjects/interface/RPCDeadStrips.h"
-#include <string>
+#include "CondFormats/RPCObjects/interface/RPCMaskedStrips.h"
+#include "L1Trigger/L1TMuonCPPF/interface/EmulateCPPF.h"
 #include <fstream>
+#include <string>
 
-EmulateCPPF::EmulateCPPF(const edm::ParameterSet& iConfig, edm::ConsumesCollector&& iConsumes) :
-  // rpcDigi_processors_(),
-  recHit_processors_(),
-  // rpcDigiToken_( iConsumes.consumes<RPCTag::digi_collection>(iConfig.getParameter<edm::InputTag>("recHitLabel")) ),
-  recHitToken_(iConsumes.consumes<RPCRecHitCollection>(iConfig.getParameter<edm::InputTag>("recHitLabel"))),
-  cppfSource_(CppfSource::EventSetup),
-  MaxClusterSize_(0)
-{
-   MaxClusterSize_ = iConfig.getParameter<int>("MaxClusterSize");
-  
-  const std::string cppfSource = iConfig.getParameter<std::string>("cppfSource");
-  //Look up table
-  if (cppfSource == "File"){
+EmulateCPPF::EmulateCPPF(const edm::ParameterSet &iConfig,
+                         edm::ConsumesCollector &&iConsumes)
+    : // rpcDigi_processors_(),
+      recHit_processors_(),
+      // rpcDigiToken_(
+      // iConsumes.consumes<RPCTag::digi_collection>(iConfig.getParameter<edm::InputTag>("recHitLabel"))
+      // ),
+      recHitToken_(iConsumes.consumes<RPCRecHitCollection>(
+          iConfig.getParameter<edm::InputTag>("recHitLabel"))),
+      cppfSource_(CppfSource::EventSetup), MaxClusterSize_(0) {
+  MaxClusterSize_ = iConfig.getParameter<int>("MaxClusterSize");
+
+  const std::string cppfSource =
+      iConfig.getParameter<std::string>("cppfSource");
+  // Look up table
+  if (cppfSource == "File") {
     cppfSource_ = CppfSource::File;
     edm::FileInPath fp = iConfig.getParameter<edm::FileInPath>("cppfvecfile");
     std::ifstream inputFile(fp.fullPath().c_str(), std::ios::in);
-    if ( !inputFile ) {
-    throw cms::Exception("No LUT") << "Error: CPPF look up table file cannot not be opened";
+    if (!inputFile) {
+      throw cms::Exception("No LUT")
+          << "Error: CPPF look up table file cannot not be opened";
       exit(1);
     }
-    while ( inputFile.good() ) {
+    while (inputFile.good()) {
       RecHitProcessor::CppfItem Item;
-      inputFile >> Item.rawId >> Item.strip >> Item.lb >> Item.halfchannel >> Item.int_phi >> Item.int_theta;
-      if ( inputFile.good() ) CppfVec_1.push_back(Item);
+      inputFile >> Item.rawId >> Item.strip >> Item.lb >> Item.halfchannel >>
+          Item.int_phi >> Item.int_theta;
+      if (inputFile.good())
+        CppfVec_1.push_back(Item);
     }
     inputFile.close();
   }
-  
-  //RPC Geometry	
+
+  // RPC Geometry
   else if (cppfSource == "Geo") {
     cppfSource_ = CppfSource::EventSetup;
   }
-  //Error for wrong input
+  // Error for wrong input
   else {
-    throw cms::Exception("Invalid option") << "Error: Specify in python/emulatorCppfDigis_cfi 'File' for look up  table or 'Geo' for RPC Geometry";
-    exit(1); 
+    throw cms::Exception("Invalid option")
+        << "Error: Specify in python/emulatorCppfDigis_cfi 'File' for look up  "
+           "table or 'Geo' for RPC Geometry";
+    exit(1);
   }
-  
 }
 
-EmulateCPPF::~EmulateCPPF() {
-}
+EmulateCPPF::~EmulateCPPF() {}
+
+void EmulateCPPF::process(const edm::Event &iEvent,
+                          const edm::EventSetup &iSetup,
+                          // l1t::CPPFDigiCollection& cppf_rpcDigi,
+                          l1t::CPPFDigiCollection &cppf_recHit) {
 
-void EmulateCPPF::process(
-			  const edm::Event& iEvent, const edm::EventSetup& iSetup,
-			  // l1t::CPPFDigiCollection& cppf_rpcDigi,
-			  l1t::CPPFDigiCollection& cppf_recHit
-			  ) {
-  
-  if( cppfSource_ == CppfSource::File ){
-    //Using the look up table to fill the information
+  if (cppfSource_ == CppfSource::File) {
+    // Using the look up table to fill the information
     cppf_recHit.clear();
-    for (auto& recHit_processor : recHit_processors_) {
-      recHit_processor.processLook( iEvent, iSetup, recHitToken_, CppfVec_1, cppf_recHit, MaxClusterSize_);
-    //  recHit_processors_.at(recHit_processor).processLook( iEvent, iSetup, recHitToken_, CppfVec_1, cppf_recHit );
+    for (auto &recHit_processor : recHit_processors_) {
+      recHit_processor.processLook(iEvent, iSetup, recHitToken_, CppfVec_1,
+                                   cppf_recHit, MaxClusterSize_);
+      //  recHit_processors_.at(recHit_processor).processLook( iEvent, iSetup,
+      //  recHitToken_, CppfVec_1, cppf_recHit );
     }
-  }
-  else if (cppfSource_ == CppfSource::EventSetup) {
+  } else if (cppfSource_ == CppfSource::EventSetup) {
     // Clear output collections
     // cppf_rpcDigi.clear();
     cppf_recHit.clear();
-    
+
     // // Get the RPCDigis from the event
     // edm::Handle<RPCTag::digi_collection> rpcDigis;
     // iEvent.getByToken(rpcDigiToken_, rpcDigis);
-    
+
     // _________________________________________________________________________________
-    // Run the CPPF clusterization+coordinate conversion algo on RPCDigis and RecHits
-    
+    // Run the CPPF clusterization+coordinate conversion algo on RPCDigis and
+    // RecHits
+
     // For now, treat CPPF as single board
-    // In the future, may want to treat the 4 CPPF boards in each endcap as separate entities
-    
-    // for (unsigned int iBoard = 0; iBoard < rpcDigi_processors_.size(); iBoard++) {
-    // rpcDigi_processors_.at(iBoard).process( iSetup, rpcDigis, cppf_rpcDigi );
+    // In the future, may want to treat the 4 CPPF boards in each endcap as
+    // separate entities
+
+    // for (unsigned int iBoard = 0; iBoard < rpcDigi_processors_.size();
+    // iBoard++) { rpcDigi_processors_.at(iBoard).process( iSetup, rpcDigis,
+    // cppf_rpcDigi );
     // }
-    for (auto& recHit_processor : recHit_processors_) {
-      recHit_processor.process( iEvent, iSetup, recHitToken_, cppf_recHit );
-      //recHit_processors_.at(recHit_processor).process( iEvent, iSetup, recHitToken_, cppf_recHit );
-    } 
+    for (auto &recHit_processor : recHit_processors_) {
+      recHit_processor.process(iEvent, iSetup, recHitToken_, cppf_recHit);
+      // recHit_processors_.at(recHit_processor).process( iEvent, iSetup,
+      // recHitToken_, cppf_recHit );
+    }
   }
-} // End void EmulateCPPF::process()					   
+} // End void EmulateCPPF::process()
diff --git a/L1Trigger/L1TMuonCPPF/src/RecHitProcessor.cc b/L1Trigger/L1TMuonCPPF/src/RecHitProcessor.cc
index a918890881e11..78b65329cab69 100644
--- a/L1Trigger/L1TMuonCPPF/src/RecHitProcessor.cc
+++ b/L1Trigger/L1TMuonCPPF/src/RecHitProcessor.cc
@@ -1,468 +1,476 @@
 #include "L1Trigger/L1TMuonCPPF/interface/RecHitProcessor.h"
 
-RecHitProcessor::RecHitProcessor() {
-}
+RecHitProcessor::RecHitProcessor() {}
 
-RecHitProcessor::~RecHitProcessor() {
-}
+RecHitProcessor::~RecHitProcessor() {}
 
 void RecHitProcessor::processLook(
-				  const edm::Event& iEvent,
-				  const edm::EventSetup& iSetup,
-				  const edm::EDGetToken& recHitToken,
-				  std::vector<RecHitProcessor::CppfItem>& CppfVec1,
-				  l1t::CPPFDigiCollection& cppfDigis,
-				  const int MaxClusterSize
-				  ) const {
-  
+    const edm::Event &iEvent, const edm::EventSetup &iSetup,
+    const edm::EDGetToken &recHitToken,
+    std::vector<RecHitProcessor::CppfItem> &CppfVec1,
+    l1t::CPPFDigiCollection &cppfDigis, const int MaxClusterSize) const {
+
   edm::Handle<RPCRecHitCollection> recHits;
   iEvent.getByToken(recHitToken, recHits);
-  
+
   edm::ESHandle<RPCGeometry> rpcGeom;
   iSetup.get<MuonGeometryRecord>().get(rpcGeom);
-  
-  // The loop is over the detector container in the rpc geometry collection. We are interested in the RPDdetID (inside of RPCChamber vectors), specifically, the RPCrechits. to assignment the CPPFDigis.
-  for ( TrackingGeometry::DetContainer::const_iterator iDet = rpcGeom->dets().begin(); iDet < rpcGeom->dets().end(); iDet++ ) {
-   
-  //  we do a cast over the class RPCChamber to obtain the RPCroll vectors, inside of them, the RPCRechits are found. in other words, the method ->rolls() does not exist for other kind of vector within DetContainer and we can not obtain the rpcrechits in a suitable way. 
-    if (dynamic_cast<const RPCChamber*>( *iDet ) == nullptr ) continue;
-    
-    auto chamb = dynamic_cast<const RPCChamber* >( *iDet ); 
-
-    std::vector<const RPCRoll*> rolls = (chamb->rolls());
- 
+
+  // The loop is over the detector container in the rpc geometry collection. We
+  // are interested in the RPDdetID (inside of RPCChamber vectors),
+  // specifically, the RPCrechits. to assignment the CPPFDigis.
+  for (TrackingGeometry::DetContainer::const_iterator iDet =
+           rpcGeom->dets().begin();
+       iDet < rpcGeom->dets().end(); iDet++) {
+
+    //  we do a cast over the class RPCChamber to obtain the RPCroll vectors,
+    //  inside of them, the RPCRechits are found. in other words, the method
+    //  ->rolls() does not exist for other kind of vector within DetContainer
+    //  and we can not obtain the rpcrechits in a suitable way.
+    if (dynamic_cast<const RPCChamber *>(*iDet) == nullptr)
+      continue;
+
+    auto chamb = dynamic_cast<const RPCChamber *>(*iDet);
+
+    std::vector<const RPCRoll *> rolls = (chamb->rolls());
+
     // Loop over rolls in the chamber
-    for(auto& iRoll : rolls){
-      
-      RPCDetId rpcId = (*iRoll).id();	
-      
-        
-    
-      typedef std::pair<RPCRecHitCollection::const_iterator, RPCRecHitCollection::const_iterator> rangeRecHits;
-      rangeRecHits recHitCollection =  recHits->get(rpcId);
-      
-      
-      
-      //Loop over the RPC digis
-      for (RPCRecHitCollection::const_iterator rechit_it = recHitCollection.first; rechit_it != recHitCollection.second; rechit_it++) {	
-	
-	//const RPCDetId& rpcId = rechit_it->rpcId();
-	int rawId = rpcId.rawId();
-	//int station = rpcId.station();
-	int Bx = rechit_it->BunchX(); 
-	int isValid = rechit_it->isValid();
-	int firststrip = rechit_it->firstClusterStrip();
-	int clustersize = rechit_it->clusterSize();
-	LocalPoint lPos = rechit_it->localPosition();
-	const RPCRoll* roll = rpcGeom->roll(rpcId);
-	const BoundPlane& rollSurface = roll->surface();
-	GlobalPoint gPos = rollSurface.toGlobal(lPos);
-	float global_theta = emtf::rad_to_deg(gPos.theta().value());
-	float global_phi   = emtf::rad_to_deg(gPos.phi().value());
-	//::::::::::::::::::::::::::::
-	//Establish the average position of the rechit    
-	int rechitstrip = firststrip;
-	
-        if(clustersize > 2) {
-	  int medium = 0;
-	  if (clustersize % 2 == 0) medium = 0.5*(clustersize); 
-	  else medium = 0.5*(clustersize-1);
-	  rechitstrip += medium; 
-	} 
-	
-	if(clustersize > MaxClusterSize) continue;	
-	//This is just for test CPPFDigis with the RPC Geometry, It must be "true" in the normal runs 
-	bool Geo = true;
-	////:::::::::::::::::::::::::::::::::::::::::::::::::
-	//Set the EMTF Sector 	
-	int EMTFsector1 = 0;	
-	int EMTFsector2 = 0;
-	
-	//sector 1
-	if ((global_phi > 15.) && (global_phi <= 16.3)) {
-	  EMTFsector1 = 1;
-	  EMTFsector2 = 6;
-	}
-	else if ((global_phi > 16.3) && (global_phi <= 53.)) {
-	  EMTFsector1 = 1;
-	  EMTFsector2 = 0;
-	}
-	else if ((global_phi > 53.) && (global_phi <= 75.)) {
-	  EMTFsector1 = 1;
-	  EMTFsector2 = 2;
-	}
-	//sector 2 
-	else if ((global_phi > 75.) && (global_phi <= 76.3)) {
-	  EMTFsector1 = 1;
-	  EMTFsector2 = 2;
-	}
-	else if ((global_phi > 76.3) && (global_phi <= 113.)) {
-	  EMTFsector1 = 2;
-	  EMTFsector2 = 0;
-	}
-	else if ((global_phi > 113.) && (global_phi <= 135.)) {
-	  EMTFsector1 = 2;
-	  EMTFsector2 = 3;
-	}
-	//sector 3
-	//less than 180
-	else if ((global_phi > 135.) && (global_phi <= 136.3)) {
-	  EMTFsector1 = 2;
-	  EMTFsector2 = 3;
-	}
-	else if ((global_phi > 136.3) && (global_phi <= 173.)) {
-	  EMTFsector1 = 3;
-	  EMTFsector2 = 0;
-	}
-	else if ((global_phi > 173.) && (global_phi <= 180.)) {
-	  EMTFsector1 = 3;
-	  EMTFsector2 = 4;
-	}
-	//Greater than -180
-	else if ((global_phi < -165.) && (global_phi >= -180.)) {
-	  EMTFsector1 = 3;
-	  EMTFsector2 = 4;
-	}
-	//Fourth sector
-	else if ((global_phi > -165.) && (global_phi <= -163.7)) {
-	  EMTFsector1 = 3;
-	  EMTFsector2 = 4;
-	}
-	else if ((global_phi > -163.7) && (global_phi <= -127.)) {
-	  EMTFsector1 = 4;
-	  EMTFsector2 = 0;
-	}
-	else if ((global_phi > -127.) && (global_phi <= -105.)) {
-	  EMTFsector1 = 4;
-	  EMTFsector2 = 5;
-	}
-	//fifth sector
-	else if ((global_phi > -105.) && (global_phi <= -103.7)) {
-	  EMTFsector1 = 4;
-	  EMTFsector2 = 5;
-	}
-	else if ((global_phi > -103.7) && (global_phi <= -67.)) {
-	  EMTFsector1 = 5;
-	  EMTFsector2 = 0;
-	}
-	else if ((global_phi > -67.) && (global_phi <= -45.)) {
-	  EMTFsector1 = 5;
-	  EMTFsector2 = 6;
-	} 
-	//sixth sector
-	else if ((global_phi > -45.) && (global_phi <= -43.7)) {
-	  EMTFsector1 = 5;
-	  EMTFsector2 = 6;
-	} 
-	else if ((global_phi > -43.7) && (global_phi <= -7.)) {
-	  EMTFsector1 = 6;
-	  EMTFsector2 = 0;
-	}
-	else if ((global_phi > -7.) && (global_phi <= 15.)) {
-	  EMTFsector1 = 6;
-	  EMTFsector2 = 1;
-	} 
-	
-	
-	// std::vector<RecHitProcessor::CppfItem>::iterator it;
-	// for(it = CppfVec1.begin(); it != CppfVec1.end(); it++){
-	//	if( (*it).rawId == rawId) if(Geo_true) std::cout << (*it).rawId << "rawid" << rawId << std::endl;
-	//	}
-	//Loop over the look up table    
-	double EMTFLink1 = 0.;
-	double EMTFLink2 = 0.;
-	
+    for (auto &iRoll : rolls) {
+
+      RPCDetId rpcId = (*iRoll).id();
+
+      typedef std::pair<RPCRecHitCollection::const_iterator,
+                        RPCRecHitCollection::const_iterator>
+          rangeRecHits;
+      rangeRecHits recHitCollection = recHits->get(rpcId);
+
+      // Loop over the RPC digis
+      for (RPCRecHitCollection::const_iterator rechit_it =
+               recHitCollection.first;
+           rechit_it != recHitCollection.second; rechit_it++) {
+
+        // const RPCDetId& rpcId = rechit_it->rpcId();
+        int rawId = rpcId.rawId();
+        // int station = rpcId.station();
+        int Bx = rechit_it->BunchX();
+        int isValid = rechit_it->isValid();
+        int firststrip = rechit_it->firstClusterStrip();
+        int clustersize = rechit_it->clusterSize();
+        LocalPoint lPos = rechit_it->localPosition();
+        const RPCRoll *roll = rpcGeom->roll(rpcId);
+        const BoundPlane &rollSurface = roll->surface();
+        GlobalPoint gPos = rollSurface.toGlobal(lPos);
+        float global_theta = emtf::rad_to_deg(gPos.theta().value());
+        float global_phi = emtf::rad_to_deg(gPos.phi().value());
+        //::::::::::::::::::::::::::::
+        // Establish the average position of the rechit
+        int rechitstrip = firststrip;
+
+        if (clustersize > 2) {
+          int medium = 0;
+          if (clustersize % 2 == 0)
+            medium = 0.5 * (clustersize);
+          else
+            medium = 0.5 * (clustersize - 1);
+          rechitstrip += medium;
+        }
+
+        if (clustersize > MaxClusterSize)
+          continue;
+        // This is just for test CPPFDigis with the RPC Geometry, It must be
+        // "true" in the normal runs
+        bool Geo = true;
+        ////:::::::::::::::::::::::::::::::::::::::::::::::::
+        // Set the EMTF Sector
+        int EMTFsector1 = 0;
+        int EMTFsector2 = 0;
+
+        // sector 1
+        if ((global_phi > 15.) && (global_phi <= 16.3)) {
+          EMTFsector1 = 1;
+          EMTFsector2 = 6;
+        } else if ((global_phi > 16.3) && (global_phi <= 53.)) {
+          EMTFsector1 = 1;
+          EMTFsector2 = 0;
+        } else if ((global_phi > 53.) && (global_phi <= 75.)) {
+          EMTFsector1 = 1;
+          EMTFsector2 = 2;
+        }
+        // sector 2
+        else if ((global_phi > 75.) && (global_phi <= 76.3)) {
+          EMTFsector1 = 1;
+          EMTFsector2 = 2;
+        } else if ((global_phi > 76.3) && (global_phi <= 113.)) {
+          EMTFsector1 = 2;
+          EMTFsector2 = 0;
+        } else if ((global_phi > 113.) && (global_phi <= 135.)) {
+          EMTFsector1 = 2;
+          EMTFsector2 = 3;
+        }
+        // sector 3
+        // less than 180
+        else if ((global_phi > 135.) && (global_phi <= 136.3)) {
+          EMTFsector1 = 2;
+          EMTFsector2 = 3;
+        } else if ((global_phi > 136.3) && (global_phi <= 173.)) {
+          EMTFsector1 = 3;
+          EMTFsector2 = 0;
+        } else if ((global_phi > 173.) && (global_phi <= 180.)) {
+          EMTFsector1 = 3;
+          EMTFsector2 = 4;
+        }
+        // Greater than -180
+        else if ((global_phi < -165.) && (global_phi >= -180.)) {
+          EMTFsector1 = 3;
+          EMTFsector2 = 4;
+        }
+        // Fourth sector
+        else if ((global_phi > -165.) && (global_phi <= -163.7)) {
+          EMTFsector1 = 3;
+          EMTFsector2 = 4;
+        } else if ((global_phi > -163.7) && (global_phi <= -127.)) {
+          EMTFsector1 = 4;
+          EMTFsector2 = 0;
+        } else if ((global_phi > -127.) && (global_phi <= -105.)) {
+          EMTFsector1 = 4;
+          EMTFsector2 = 5;
+        }
+        // fifth sector
+        else if ((global_phi > -105.) && (global_phi <= -103.7)) {
+          EMTFsector1 = 4;
+          EMTFsector2 = 5;
+        } else if ((global_phi > -103.7) && (global_phi <= -67.)) {
+          EMTFsector1 = 5;
+          EMTFsector2 = 0;
+        } else if ((global_phi > -67.) && (global_phi <= -45.)) {
+          EMTFsector1 = 5;
+          EMTFsector2 = 6;
+        }
+        // sixth sector
+        else if ((global_phi > -45.) && (global_phi <= -43.7)) {
+          EMTFsector1 = 5;
+          EMTFsector2 = 6;
+        } else if ((global_phi > -43.7) && (global_phi <= -7.)) {
+          EMTFsector1 = 6;
+          EMTFsector2 = 0;
+        } else if ((global_phi > -7.) && (global_phi <= 15.)) {
+          EMTFsector1 = 6;
+          EMTFsector2 = 1;
+        }
+
+        // std::vector<RecHitProcessor::CppfItem>::iterator it;
+        // for(it = CppfVec1.begin(); it != CppfVec1.end(); it++){
+        //	if( (*it).rawId == rawId) if(Geo_true) std::cout << (*it).rawId
+        //<< "rawid" << rawId << std::endl;
+        //	}
+        // Loop over the look up table
+        double EMTFLink1 = 0.;
+        double EMTFLink2 = 0.;
+
         std::vector<RecHitProcessor::CppfItem>::iterator cppf1;
         std::vector<RecHitProcessor::CppfItem>::iterator cppf;
-        for(cppf1 = CppfVec1.begin(); cppf1 != CppfVec1.end(); cppf1++){
-	  
-          
-	  
-	  //Condition to save the CPPFDigi
-	  if(((*cppf1).rawId == rawId) && ((*cppf1).strip == rechitstrip)){
-	    
-	    int old_strip = (*cppf1).strip;
+        for (cppf1 = CppfVec1.begin(); cppf1 != CppfVec1.end(); cppf1++) {
+
+          // Condition to save the CPPFDigi
+          if (((*cppf1).rawId == rawId) && ((*cppf1).strip == rechitstrip)) {
+
+            int old_strip = (*cppf1).strip;
             int before = 0;
-	    int after = 0;
-	  
-            if(cppf1 != CppfVec1.begin())	    
-	    	before = (*(cppf1-2)).strip;
-	    
-	    else if (cppf1 == CppfVec1.begin())
-		before = (*cppf1).strip;
-		
-            if(cppf1 != CppfVec1.end())
- 	    	after = (*(cppf1+2)).strip;
-		
+            int after = 0;
+
+            if (cppf1 != CppfVec1.begin())
+              before = (*(cppf1 - 2)).strip;
+
+            else if (cppf1 == CppfVec1.begin())
+              before = (*cppf1).strip;
+
+            if (cppf1 != CppfVec1.end())
+              after = (*(cppf1 + 2)).strip;
+
             else if (cppf1 == CppfVec1.end())
-		after = (*cppf1).strip;	
-
-	    cppf = cppf1;
-	    
-	    if(clustersize == 2){
-	      
-	      if(firststrip == 1){
-		if(before < after) cppf=(cppf1-1);
-                else if (before > after) cppf=(cppf1+1); 
-	      }
-	      else if(firststrip > 1){
-		if(before < after) cppf=(cppf1+1);
-		else if (before > after) cppf=(cppf1-1);
-	      }
-	      
-	    }
-	    //Using the RPCGeometry	
-	    if(Geo){
-	      std::shared_ptr<l1t::CPPFDigi> MainVariables1(new l1t::CPPFDigi(rpcId, Bx , (*cppf).int_phi, (*cppf).int_theta, isValid, (*cppf).lb, (*cppf).halfchannel, EMTFsector1, EMTFLink1, old_strip, clustersize, global_phi, global_theta));
-	      std::shared_ptr<l1t::CPPFDigi> MainVariables2(new l1t::CPPFDigi(rpcId, Bx , (*cppf).int_phi, (*cppf).int_theta, isValid, (*cppf).lb, (*cppf).halfchannel, EMTFsector2, EMTFLink2, old_strip, clustersize, global_phi, global_theta));
-
-	      if ((EMTFsector1 > 0) && (EMTFsector2 == 0)){
-		cppfDigis.push_back(*MainVariables1.get());
-	      } 
-	      else if ((EMTFsector1 > 0) && (EMTFsector2 > 0)){
-		cppfDigis.push_back(*MainVariables1.get());
-		cppfDigis.push_back(*MainVariables2.get());
-	      }
-	      else if ((EMTFsector1 == 0) && (EMTFsector2 == 0)) {
-		continue; 
-	      } 
-	    } //Geo is true
-	    else {
-	      global_phi = 0.;
-	      global_theta = 0.;
-	      std::shared_ptr<l1t::CPPFDigi> MainVariables1(new l1t::CPPFDigi(rpcId, Bx , (*cppf).int_phi, (*cppf).int_theta, isValid, (*cppf).lb, (*cppf).halfchannel, EMTFsector1, EMTFLink1, old_strip, clustersize, global_phi, global_theta));
-	      std::shared_ptr<l1t::CPPFDigi> MainVariables2(new l1t::CPPFDigi(rpcId, Bx , (*cppf).int_phi, (*cppf).int_theta, isValid, (*cppf).lb, (*cppf).halfchannel, EMTFsector2, EMTFLink2, old_strip, clustersize, global_phi, global_theta));
-	      if ((EMTFsector1 > 0) && (EMTFsector2 == 0)){
-		cppfDigis.push_back(*MainVariables1.get());
-	      } 
-	      else if ((EMTFsector1 > 0) && (EMTFsector2 > 0)){
-		cppfDigis.push_back(*MainVariables1.get());
-		cppfDigis.push_back(*MainVariables2.get());
-	      }
-	      else if ((EMTFsector1 == 0) && (EMTFsector2 == 0)) {
-		continue;
-	      } 
-	    }
-	  } //Condition to save the CPPFDigi 
-	} //Loop over the LUTVector
-      } //Loop over the recHits
-    } // End loop: for (std::vector<const RPCRoll*>::const_iterator r = rolls.begin(); r != rolls.end(); ++r)
-  } // End loop: for (TrackingGeometry::DetContainer::const_iterator iDet = rpcGeom->dets().begin(); iDet < rpcGeom->dets().end(); iDet++)  
-  
+              after = (*cppf1).strip;
+
+            cppf = cppf1;
+
+            if (clustersize == 2) {
+
+              if (firststrip == 1) {
+                if (before < after)
+                  cppf = (cppf1 - 1);
+                else if (before > after)
+                  cppf = (cppf1 + 1);
+              } else if (firststrip > 1) {
+                if (before < after)
+                  cppf = (cppf1 + 1);
+                else if (before > after)
+                  cppf = (cppf1 - 1);
+              }
+            }
+            // Using the RPCGeometry
+            if (Geo) {
+              std::shared_ptr<l1t::CPPFDigi> MainVariables1(new l1t::CPPFDigi(
+                  rpcId, Bx, (*cppf).int_phi, (*cppf).int_theta, isValid,
+                  (*cppf).lb, (*cppf).halfchannel, EMTFsector1, EMTFLink1,
+                  old_strip, clustersize, global_phi, global_theta));
+              std::shared_ptr<l1t::CPPFDigi> MainVariables2(new l1t::CPPFDigi(
+                  rpcId, Bx, (*cppf).int_phi, (*cppf).int_theta, isValid,
+                  (*cppf).lb, (*cppf).halfchannel, EMTFsector2, EMTFLink2,
+                  old_strip, clustersize, global_phi, global_theta));
+
+              if ((EMTFsector1 > 0) && (EMTFsector2 == 0)) {
+                cppfDigis.push_back(*MainVariables1.get());
+              } else if ((EMTFsector1 > 0) && (EMTFsector2 > 0)) {
+                cppfDigis.push_back(*MainVariables1.get());
+                cppfDigis.push_back(*MainVariables2.get());
+              } else if ((EMTFsector1 == 0) && (EMTFsector2 == 0)) {
+                continue;
+              }
+            } // Geo is true
+            else {
+              global_phi = 0.;
+              global_theta = 0.;
+              std::shared_ptr<l1t::CPPFDigi> MainVariables1(new l1t::CPPFDigi(
+                  rpcId, Bx, (*cppf).int_phi, (*cppf).int_theta, isValid,
+                  (*cppf).lb, (*cppf).halfchannel, EMTFsector1, EMTFLink1,
+                  old_strip, clustersize, global_phi, global_theta));
+              std::shared_ptr<l1t::CPPFDigi> MainVariables2(new l1t::CPPFDigi(
+                  rpcId, Bx, (*cppf).int_phi, (*cppf).int_theta, isValid,
+                  (*cppf).lb, (*cppf).halfchannel, EMTFsector2, EMTFLink2,
+                  old_strip, clustersize, global_phi, global_theta));
+              if ((EMTFsector1 > 0) && (EMTFsector2 == 0)) {
+                cppfDigis.push_back(*MainVariables1.get());
+              } else if ((EMTFsector1 > 0) && (EMTFsector2 > 0)) {
+                cppfDigis.push_back(*MainVariables1.get());
+                cppfDigis.push_back(*MainVariables2.get());
+              } else if ((EMTFsector1 == 0) && (EMTFsector2 == 0)) {
+                continue;
+              }
+            }
+          } // Condition to save the CPPFDigi
+        }   // Loop over the LUTVector
+      }     // Loop over the recHits
+    }       // End loop: for (std::vector<const RPCRoll*>::const_iterator r =
+            // rolls.begin(); r != rolls.end(); ++r)
+  } // End loop: for (TrackingGeometry::DetContainer::const_iterator iDet =
+    // rpcGeom->dets().begin(); iDet < rpcGeom->dets().end(); iDet++)
 }
 
+void RecHitProcessor::process(const edm::Event &iEvent,
+                              const edm::EventSetup &iSetup,
+                              const edm::EDGetToken &recHitToken,
+                              l1t::CPPFDigiCollection &cppfDigis) const {
 
-void RecHitProcessor::process(
-			      const edm::Event& iEvent,
-			      const edm::EventSetup& iSetup,
-			      const edm::EDGetToken& recHitToken,
-			      l1t::CPPFDigiCollection& cppfDigis
-			      ) const {
-  
   // Get the RPC Geometry
   edm::ESHandle<RPCGeometry> rpcGeom;
   iSetup.get<MuonGeometryRecord>().get(rpcGeom);
-  
+
   // Get the RecHits from the event
   edm::Handle<RPCRecHitCollection> recHits;
   iEvent.getByToken(recHitToken, recHits);
-  
- 
-  // The loop is over the detector container in the rpc geometry collection. We are interested in the RPDdetID (inside of RPCChamber vectors), specifically, the RPCrechits. to assignment the CPPFDigis.
-  for ( TrackingGeometry::DetContainer::const_iterator iDet = rpcGeom->dets().begin(); iDet < rpcGeom->dets().end(); iDet++ ) {
-  
-  //  we do a cast over the class RPCChamber to obtain the RPCroll vectors, inside of them, the RPCRechits are found. in other words, the method ->rolls() does not exist for other kind of vector within DetContainer and we can not obtain the rpcrechits in a suitable way.   
-    if (dynamic_cast<const RPCChamber*>( *iDet ) == nullptr ) continue;
-    
-    auto chamb = dynamic_cast<const RPCChamber* >( *iDet ); 
-    std::vector<const RPCRoll*> rolls = (chamb->rolls());
-    
+
+  // The loop is over the detector container in the rpc geometry collection. We
+  // are interested in the RPDdetID (inside of RPCChamber vectors),
+  // specifically, the RPCrechits. to assignment the CPPFDigis.
+  for (TrackingGeometry::DetContainer::const_iterator iDet =
+           rpcGeom->dets().begin();
+       iDet < rpcGeom->dets().end(); iDet++) {
+
+    //  we do a cast over the class RPCChamber to obtain the RPCroll vectors,
+    //  inside of them, the RPCRechits are found. in other words, the method
+    //  ->rolls() does not exist for other kind of vector within DetContainer
+    //  and we can not obtain the rpcrechits in a suitable way.
+    if (dynamic_cast<const RPCChamber *>(*iDet) == nullptr)
+      continue;
+
+    auto chamb = dynamic_cast<const RPCChamber *>(*iDet);
+    std::vector<const RPCRoll *> rolls = (chamb->rolls());
+
     // Loop over rolls in the chamber
-    for(auto& iRoll : rolls){
-      
-      RPCDetId rpcId = (*iRoll).id();	
-      
-      typedef std::pair<RPCRecHitCollection::const_iterator, RPCRecHitCollection::const_iterator> rangeRecHits;
-      rangeRecHits recHitCollection =  recHits->get(rpcId);
-      
-      
-      for (RPCRecHitCollection::const_iterator rechit_it = recHitCollection.first; rechit_it != recHitCollection.second; rechit_it++) {	  
-	
-        //const RPCDetId& rpcId = rechit_it->rpcId();
-        //int rawId = rpcId.rawId();
+    for (auto &iRoll : rolls) {
+
+      RPCDetId rpcId = (*iRoll).id();
+
+      typedef std::pair<RPCRecHitCollection::const_iterator,
+                        RPCRecHitCollection::const_iterator>
+          rangeRecHits;
+      rangeRecHits recHitCollection = recHits->get(rpcId);
+
+      for (RPCRecHitCollection::const_iterator rechit_it =
+               recHitCollection.first;
+           rechit_it != recHitCollection.second; rechit_it++) {
+
+        // const RPCDetId& rpcId = rechit_it->rpcId();
+        // int rawId = rpcId.rawId();
         int region = rpcId.region();
-        //int station = rpcId.station();
-        int Bx = rechit_it->BunchX(); 
+        // int station = rpcId.station();
+        int Bx = rechit_it->BunchX();
         int isValid = rechit_it->isValid();
         int firststrip = rechit_it->firstClusterStrip();
         int clustersize = rechit_it->clusterSize();
         LocalPoint lPos = rechit_it->localPosition();
-        const RPCRoll* roll = rpcGeom->roll(rpcId);
-        const BoundPlane& rollSurface = roll->surface();
+        const RPCRoll *roll = rpcGeom->roll(rpcId);
+        const BoundPlane &rollSurface = roll->surface();
         GlobalPoint gPos = rollSurface.toGlobal(lPos);
         float global_theta = emtf::rad_to_deg(gPos.theta().value());
-        float global_phi   = emtf::rad_to_deg(gPos.phi().value());
-        //Endcap region only
-	
+        float global_phi = emtf::rad_to_deg(gPos.phi().value());
+        // Endcap region only
+
         if (region != 0) {
-	  
-	  int int_theta = (region == -1 ? 180. * 32. / 36.5 : 0.)
-	    + (float)region * global_theta * 32. / 36.5   
-	    - 8.5 * 32 / 36.5;
-	  
-	  if(region == 1) {
-	    if(global_theta < 8.5) int_theta = 0;
-	    if(global_theta > 45.) int_theta = 31;
-	  } 
-	  else if(region == -1) {
-	    if(global_theta < 135.) int_theta = 31;
-	    if(global_theta > 171.5) int_theta = 0;
-	  } 
-	  
-	  //Local EMTF
-	  double local_phi = 0.;
-	  int EMTFsector1 = 0;
-	  int EMTFsector2 = 0;
-	  
-	  //sector 1
-	  if ((global_phi > 15.) && (global_phi <= 16.3)) {
-	    local_phi = global_phi-15.;
-	    EMTFsector1 = 1;
-	    EMTFsector2 = 6;
-	  }
-	  else if ((global_phi > 16.3) && (global_phi <= 53.)) {
-	    local_phi = global_phi-15.;
-	    EMTFsector1 = 1;
-	    EMTFsector2 = 0;
-	  }
-	  else if ((global_phi > 53.) && (global_phi <= 75.)) {
-	    local_phi = global_phi-15.;
-	    EMTFsector1 = 1;
-	    EMTFsector2 = 2;
-	  }
-	  //sector 2 
-	  else if ((global_phi > 75.) && (global_phi <= 76.3)) {
-	    local_phi = global_phi-15.;
-	    EMTFsector1 = 1;
-	    EMTFsector2 = 2;
-	  }
-	  else if ((global_phi > 76.3) && (global_phi <= 113.)) {
-	    local_phi = global_phi-75.;
-	    EMTFsector1 = 2;
-	    EMTFsector2 = 0;
-	  }
-	  else if ((global_phi > 113.) && (global_phi <= 135.)) {
-	    local_phi = global_phi-75.;
-	    EMTFsector1 = 2;
-	    EMTFsector2 = 3;
-	  }
-	  //sector 3
-	  //less than 180
-	  else if ((global_phi > 135.) && (global_phi <= 136.3)) {
-	    local_phi = global_phi-75.;
-	    EMTFsector1 = 2;
-	    EMTFsector2 = 3;
-	  }
-	  else if ((global_phi > 136.3) && (global_phi <= 173.)) {
-	    local_phi = global_phi-135.;
-	    EMTFsector1 = 3;
-	    EMTFsector2 = 0;
-	  }
-	  else if ((global_phi > 173.) && (global_phi <= 180.)) {
-	    local_phi = global_phi-135.;
-	    EMTFsector1 = 3;
-	    EMTFsector2 = 4;
-	  }
-	  //Greater than -180
-	  else if ((global_phi < -165.) && (global_phi >= -180.)) {
-	    local_phi = global_phi+225.;
-	    EMTFsector1 = 3;
-	    EMTFsector2 = 4;
-	  }
-	  //Fourth sector
-	  else if ((global_phi > -165.) && (global_phi <= -163.7)) {
-	    local_phi = global_phi+225.;
-	    EMTFsector1 = 3;
-	    EMTFsector2 = 4;
-	  }
-	  else if ((global_phi > -163.7) && (global_phi <= -127.)) {
-	    local_phi = global_phi+165.;
-	    EMTFsector1 = 4;
-	    EMTFsector2 = 0;
-	  }
-	  else if ((global_phi > -127.) && (global_phi <= -105.)) {
-	    local_phi = global_phi+165.;
-	    EMTFsector1 = 4;
-	    EMTFsector2 = 5;
-	  }
-	  //fifth sector
-	  else if ((global_phi > -105.) && (global_phi <= -103.7)) {
-	    local_phi = global_phi+165.;
-	    EMTFsector1 = 4;
-	    EMTFsector2 = 5;
-	  }
-	  else if ((global_phi > -103.7) && (global_phi <= -67.)) {
-	    local_phi = global_phi+105.;
-	    EMTFsector1 = 5;
-	    EMTFsector2 = 0;
-	  }
-	  else if ((global_phi > -67.) && (global_phi <= -45.)) {
-	    local_phi = global_phi+105.;
-	    EMTFsector1 = 5;
-	    EMTFsector2 = 6;
-	  } 
-	  //sixth sector
-	  else if ((global_phi > -45.) && (global_phi <= -43.7)) {
-	    local_phi = global_phi+105.;
-	    EMTFsector1 = 5;
-	    EMTFsector2 = 6;
-	  } 
-	  else if ((global_phi > -43.7) && (global_phi <= -7.)) {
-	    local_phi = global_phi+45.;
-	    EMTFsector1 = 6;
-	    EMTFsector2 = 0;
-	  }
-	  else if ((global_phi > -7.) && (global_phi <= 15.)) {
-	    local_phi = global_phi+45.;
-	    EMTFsector1 = 6;
-	    EMTFsector2 = 1;
-	  } 
-	  
-	  int int_phi = int((local_phi + 22.0 )*15. + .5); 
-	  
-	  double EMTFLink1 = 0.;
-	  double EMTFLink2 = 0.;
+
+          int int_theta = (region == -1 ? 180. * 32. / 36.5 : 0.) +
+                          (float)region * global_theta * 32. / 36.5 -
+                          8.5 * 32 / 36.5;
+
+          if (region == 1) {
+            if (global_theta < 8.5)
+              int_theta = 0;
+            if (global_theta > 45.)
+              int_theta = 31;
+          } else if (region == -1) {
+            if (global_theta < 135.)
+              int_theta = 31;
+            if (global_theta > 171.5)
+              int_theta = 0;
+          }
+
+          // Local EMTF
+          double local_phi = 0.;
+          int EMTFsector1 = 0;
+          int EMTFsector2 = 0;
+
+          // sector 1
+          if ((global_phi > 15.) && (global_phi <= 16.3)) {
+            local_phi = global_phi - 15.;
+            EMTFsector1 = 1;
+            EMTFsector2 = 6;
+          } else if ((global_phi > 16.3) && (global_phi <= 53.)) {
+            local_phi = global_phi - 15.;
+            EMTFsector1 = 1;
+            EMTFsector2 = 0;
+          } else if ((global_phi > 53.) && (global_phi <= 75.)) {
+            local_phi = global_phi - 15.;
+            EMTFsector1 = 1;
+            EMTFsector2 = 2;
+          }
+          // sector 2
+          else if ((global_phi > 75.) && (global_phi <= 76.3)) {
+            local_phi = global_phi - 15.;
+            EMTFsector1 = 1;
+            EMTFsector2 = 2;
+          } else if ((global_phi > 76.3) && (global_phi <= 113.)) {
+            local_phi = global_phi - 75.;
+            EMTFsector1 = 2;
+            EMTFsector2 = 0;
+          } else if ((global_phi > 113.) && (global_phi <= 135.)) {
+            local_phi = global_phi - 75.;
+            EMTFsector1 = 2;
+            EMTFsector2 = 3;
+          }
+          // sector 3
+          // less than 180
+          else if ((global_phi > 135.) && (global_phi <= 136.3)) {
+            local_phi = global_phi - 75.;
+            EMTFsector1 = 2;
+            EMTFsector2 = 3;
+          } else if ((global_phi > 136.3) && (global_phi <= 173.)) {
+            local_phi = global_phi - 135.;
+            EMTFsector1 = 3;
+            EMTFsector2 = 0;
+          } else if ((global_phi > 173.) && (global_phi <= 180.)) {
+            local_phi = global_phi - 135.;
+            EMTFsector1 = 3;
+            EMTFsector2 = 4;
+          }
+          // Greater than -180
+          else if ((global_phi < -165.) && (global_phi >= -180.)) {
+            local_phi = global_phi + 225.;
+            EMTFsector1 = 3;
+            EMTFsector2 = 4;
+          }
+          // Fourth sector
+          else if ((global_phi > -165.) && (global_phi <= -163.7)) {
+            local_phi = global_phi + 225.;
+            EMTFsector1 = 3;
+            EMTFsector2 = 4;
+          } else if ((global_phi > -163.7) && (global_phi <= -127.)) {
+            local_phi = global_phi + 165.;
+            EMTFsector1 = 4;
+            EMTFsector2 = 0;
+          } else if ((global_phi > -127.) && (global_phi <= -105.)) {
+            local_phi = global_phi + 165.;
+            EMTFsector1 = 4;
+            EMTFsector2 = 5;
+          }
+          // fifth sector
+          else if ((global_phi > -105.) && (global_phi <= -103.7)) {
+            local_phi = global_phi + 165.;
+            EMTFsector1 = 4;
+            EMTFsector2 = 5;
+          } else if ((global_phi > -103.7) && (global_phi <= -67.)) {
+            local_phi = global_phi + 105.;
+            EMTFsector1 = 5;
+            EMTFsector2 = 0;
+          } else if ((global_phi > -67.) && (global_phi <= -45.)) {
+            local_phi = global_phi + 105.;
+            EMTFsector1 = 5;
+            EMTFsector2 = 6;
+          }
+          // sixth sector
+          else if ((global_phi > -45.) && (global_phi <= -43.7)) {
+            local_phi = global_phi + 105.;
+            EMTFsector1 = 5;
+            EMTFsector2 = 6;
+          } else if ((global_phi > -43.7) && (global_phi <= -7.)) {
+            local_phi = global_phi + 45.;
+            EMTFsector1 = 6;
+            EMTFsector2 = 0;
+          } else if ((global_phi > -7.) && (global_phi <= 15.)) {
+            local_phi = global_phi + 45.;
+            EMTFsector1 = 6;
+            EMTFsector2 = 1;
+          }
+
+          int int_phi = int((local_phi + 22.0) * 15. + .5);
+
+          double EMTFLink1 = 0.;
+          double EMTFLink2 = 0.;
           double lb = 0.;
-	  double halfchannel = 0.;
-	  
-	  //Invalid hit
-	  if (isValid == 0) int_phi = 2047;	 
-	  //Right integers range
-	  assert(0 <= int_phi && int_phi < 1250);
-	  assert(0 <= int_theta && int_theta < 32);
-	  
-	  std::shared_ptr<l1t::CPPFDigi> MainVariables1(new l1t::CPPFDigi(rpcId, Bx , int_phi, int_theta, isValid, lb, halfchannel, EMTFsector1, EMTFLink1, firststrip, clustersize, global_phi, global_theta));
-	  std::shared_ptr<l1t::CPPFDigi> MainVariables2(new l1t::CPPFDigi(rpcId, Bx , int_phi, int_theta, isValid, lb, halfchannel, EMTFsector2, EMTFLink2, firststrip, clustersize, global_phi, global_theta));
-	  if(int_theta == 31) continue;
-          if ((EMTFsector1 > 0) && (EMTFsector2 == 0)){
-	    cppfDigis.push_back(*MainVariables1.get());
-	  } 
-          if ((EMTFsector1 > 0) && (EMTFsector2 > 0)){
-	    cppfDigis.push_back(*MainVariables1.get());
-	    cppfDigis.push_back(*MainVariables2.get());
-	  }
-	  if ((EMTFsector1 == 0) && (EMTFsector2 == 0)){
-	    continue;
-	  } 
-        } // No barrel rechits	
-	
-      } // End loop: for (RPCRecHitCollection::const_iterator recHit = recHitCollection.first; recHit != recHitCollection.second; recHit++)
-      
-    } // End loop: for (std::vector<const RPCRoll*>::const_iterator r = rolls.begin(); r != rolls.end(); ++r)
-  } // End loop: for (TrackingGeometry::DetContainer::const_iterator iDet = rpcGeom->dets().begin(); iDet < rpcGeom->dets().end(); iDet++)
-} // End function: void RecHitProcessor::process()
+          double halfchannel = 0.;
 
+          // Invalid hit
+          if (isValid == 0)
+            int_phi = 2047;
+          // Right integers range
+          assert(0 <= int_phi && int_phi < 1250);
+          assert(0 <= int_theta && int_theta < 32);
 
-  
+          std::shared_ptr<l1t::CPPFDigi> MainVariables1(
+              new l1t::CPPFDigi(rpcId, Bx, int_phi, int_theta, isValid, lb,
+                                halfchannel, EMTFsector1, EMTFLink1, firststrip,
+                                clustersize, global_phi, global_theta));
+          std::shared_ptr<l1t::CPPFDigi> MainVariables2(
+              new l1t::CPPFDigi(rpcId, Bx, int_phi, int_theta, isValid, lb,
+                                halfchannel, EMTFsector2, EMTFLink2, firststrip,
+                                clustersize, global_phi, global_theta));
+          if (int_theta == 31)
+            continue;
+          if ((EMTFsector1 > 0) && (EMTFsector2 == 0)) {
+            cppfDigis.push_back(*MainVariables1.get());
+          }
+          if ((EMTFsector1 > 0) && (EMTFsector2 > 0)) {
+            cppfDigis.push_back(*MainVariables1.get());
+            cppfDigis.push_back(*MainVariables2.get());
+          }
+          if ((EMTFsector1 == 0) && (EMTFsector2 == 0)) {
+            continue;
+          }
+        } // No barrel rechits
 
+      } // End loop: for (RPCRecHitCollection::const_iterator recHit =
+        // recHitCollection.first; recHit != recHitCollection.second; recHit++)
 
+    } // End loop: for (std::vector<const RPCRoll*>::const_iterator r =
+      // rolls.begin(); r != rolls.end(); ++r)
+  }   // End loop: for (TrackingGeometry::DetContainer::const_iterator iDet =
+      // rpcGeom->dets().begin(); iDet < rpcGeom->dets().end(); iDet++)
+} // End function: void RecHitProcessor::process()
diff --git a/L1Trigger/L1TMuonEndCap/src/PtAssignmentEngine2017.cc b/L1Trigger/L1TMuonEndCap/src/PtAssignmentEngine2017.cc
index 91b92151a02ce..94596058db27e 100644
--- a/L1Trigger/L1TMuonEndCap/src/PtAssignmentEngine2017.cc
+++ b/L1Trigger/L1TMuonEndCap/src/PtAssignmentEngine2017.cc
@@ -339,7 +339,7 @@ float PtAssignmentEngine2017::calculate_pt_xml(const address_t& address) const {
     // if (not( dTheta == aux().getdTheta( aux().unpackdTheta( dTheta, 3), 3) );
     // { edm::LogError("L1T") << " = " << ; return; }
     // if (not( clctA  == aux().getCLCT( aux().unpackCLCT( clctA, endcap, (sPhiAB == 1 ? 1 : -1), 2), 
-    // 				     endcap, (sPhiAB == 1 ? 1 : -1), 2) );
+    //                               endcap, (sPhiAB == 1 ? 1 : -1), 2) );
     // { edm::LogError("L1T") << " = " << ; return; }
     // int theta_unp = theta;
     // aux().unpackTheta( theta_unp, St1_ring2, 5 );
@@ -353,10 +353,10 @@ float PtAssignmentEngine2017::calculate_pt_xml(const address_t& address) const {
     // if (not( dTheta == aux().getdTheta( aux().unpackdTheta( dTheta, 3), 3) );
     // { edm::LogError("L1T") << " = " << ; return; }
     // if (not( clctA  == aux().getCLCT( aux().unpackCLCT( clctA, endcap, (sPhiAB == 1 ? 1 : -1), 3), 
-    // 				     endcap, (sPhiAB == 1 ? 1 : -1), 3) );
+    //                               endcap, (sPhiAB == 1 ? 1 : -1), 3) );
     // { edm::LogError("L1T") << " = " << ; return; }
     // if (not( clctB  == aux().getCLCT( aux().unpackCLCT( clctB, endcap, (sPhiAB == 1 ? 1 : -1), 3), 
-    // 				     endcap, (sPhiAB == 1 ? 1 : -1), 3) );
+    //                               endcap, (sPhiAB == 1 ? 1 : -1), 3) );
     // { edm::LogError("L1T") << " = " << ; return; }
     // int theta_unp = theta;
     // aux().unpackTheta( theta_unp, St1_ring2, 5 );
diff --git a/L1Trigger/L1TMuonEndCap/test/RunTrackFinder_MC.py b/L1Trigger/L1TMuonEndCap/test/RunTrackFinder_MC.py
index 749beedac1a93..5e8cb24b9468a 100644
--- a/L1Trigger/L1TMuonEndCap/test/RunTrackFinder_MC.py
+++ b/L1Trigger/L1TMuonEndCap/test/RunTrackFinder_MC.py
@@ -8,9 +8,9 @@
 
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('reL1T', eras.Run2_2016)
+from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
+process = cms.Process('reL1T', Run2_2016)
 
 ## Import standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/L1Trigger/L1TMuonEndCap/test/RunTrackFinder_data.py b/L1Trigger/L1TMuonEndCap/test/RunTrackFinder_data.py
index 63d50c91ddf2d..01eb9890cd257 100644
--- a/L1Trigger/L1TMuonEndCap/test/RunTrackFinder_data.py
+++ b/L1Trigger/L1TMuonEndCap/test/RunTrackFinder_data.py
@@ -6,7 +6,6 @@
 import sys
 import commands
 import subprocess
-from Configuration.StandardSequences.Eras import eras
 
 process = cms.Process('L1TMuonEmulation')
 
diff --git a/L1Trigger/L1TMuonEndCap/test/UnpackTrackFinder_data_2016_10_04.py b/L1Trigger/L1TMuonEndCap/test/UnpackTrackFinder_data_2016_10_04.py
index bd6da540c4983..ea2bbaee01b70 100644
--- a/L1Trigger/L1TMuonEndCap/test/UnpackTrackFinder_data_2016_10_04.py
+++ b/L1Trigger/L1TMuonEndCap/test/UnpackTrackFinder_data_2016_10_04.py
@@ -5,7 +5,6 @@
 import sys
 import commands
 import subprocess
-from Configuration.StandardSequences.Eras import eras
 
 process = cms.Process('L1TMuonEmulation')
 
diff --git a/L1Trigger/L1TMuonEndCap/test/tools/make_coordlut_data.py b/L1Trigger/L1TMuonEndCap/test/tools/make_coordlut_data.py
index e0b16ce44c650..77afdb352e977 100644
--- a/L1Trigger/L1TMuonEndCap/test/tools/make_coordlut_data.py
+++ b/L1Trigger/L1TMuonEndCap/test/tools/make_coordlut_data.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("Whatever",eras.Run2_2018)
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+process = cms.Process("Whatever",Run2_2018)
 
 process.load('Configuration.StandardSequences.GeometryRecoDB_cff')  # load from DB
 process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff')
diff --git a/L1Trigger/L1TNtuples/python/L1NtupleEMUCalo_cff.py b/L1Trigger/L1TNtuples/python/L1NtupleEMUCalo_cff.py
index 14a5209ccfe35..febfcc1596a35 100644
--- a/L1Trigger/L1TNtuples/python/L1NtupleEMUCalo_cff.py
+++ b/L1Trigger/L1TNtuples/python/L1NtupleEMUCalo_cff.py
@@ -1,5 +1,4 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
 from L1Trigger.L1TNtuples.l1CaloTowerTree_cfi import *
 from L1Trigger.L1TNtuples.l1UpgradeTree_cfi import *
diff --git a/L1Trigger/ME0Trigger/python/me0TriggerPseudoDigis_cff.py b/L1Trigger/ME0Trigger/python/me0TriggerPseudoDigis_cff.py
index 42e52dcb267d8..6a169ce24feb2 100644
--- a/L1Trigger/ME0Trigger/python/me0TriggerPseudoDigis_cff.py
+++ b/L1Trigger/ME0Trigger/python/me0TriggerPseudoDigis_cff.py
@@ -22,13 +22,13 @@
 ## 1.2 is to make the matching window safely the two nearest strips
 ## 0.35 is the size of an ME0 chamber in radians
 ## nStrips is divided by 2 since we use 2-strip trigger pads
-nStrips = simMuonME0PseudoReDigisCoarse.numberOfStrips.value()/2
+nStrips = simMuonME0PseudoReDigisCoarse.numberOfStrips.value()//2
 maxPhi = 1.2*0.35/nStrips
 me0TriggerPseudoDigis.algo_psets[1].algo_pset.maxPhiAdditional = cms.double(maxPhi)
 me0TriggerPseudoDigis.algo_psets[1].algo_pset.maxPhiSeeds = cms.double(maxPhi)
 
-me0TriggerPseudoDigiSequence = cms.Sequence(
-    simMuonME0PseudoReDigisCoarse *
-    me0RecHitsCoarse *
+me0TriggerPseudoDigiTask = cms.Task(
+    simMuonME0PseudoReDigisCoarse,
+    me0RecHitsCoarse,
     me0TriggerPseudoDigis
 )
diff --git a/L1Trigger/ME0Trigger/test/ME0TPEmulator_cfg.py b/L1Trigger/ME0Trigger/test/ME0TPEmulator_cfg.py
index 7adfd7a300fd1..90660bb1ebdfd 100644
--- a/L1Trigger/ME0Trigger/test/ME0TPEmulator_cfg.py
+++ b/L1Trigger/ME0Trigger/test/ME0TPEmulator_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("ME0TPEmulator", eras.Phase2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process("ME0TPEmulator", Phase2)
 
 process.maxEvents = cms.untracked.PSet(
   input = cms.untracked.int32(10)
diff --git a/L1Trigger/ME0Trigger/test/runME0_Reco_L1.py b/L1Trigger/ME0Trigger/test/runME0_Reco_L1.py
index fdbb38e365026..f7fcb681d045a 100644
--- a/L1Trigger/ME0Trigger/test/runME0_Reco_L1.py
+++ b/L1Trigger/ME0Trigger/test/runME0_Reco_L1.py
@@ -5,9 +5,9 @@
 # with command line options: step2 --conditions auto:phase2_realistic -s DIGI:pdigi_valid,L1,L1TrackTrigger,DIGI2RAW,HLT:@fake2 --datatier GEN-SIM-DIGI-RAW -n 10 --geometry Extended2023D22 --era Phase2 --eventcontent FEVTDEBUGHLT --filein file:step1.root --fileout file:step2.root
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('L1',eras.Phase2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('L1',Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/L1Trigger/RPCTrigger/src/RPCBasicTrigConfig.cc b/L1Trigger/RPCTrigger/src/RPCBasicTrigConfig.cc
index 77f8d8569ebd1..685a9a0db53c4 100644
--- a/L1Trigger/RPCTrigger/src/RPCBasicTrigConfig.cc
+++ b/L1Trigger/RPCTrigger/src/RPCBasicTrigConfig.cc
@@ -120,7 +120,7 @@ const int RPCBasicTrigConfig::m_TB_NUM_FOR_TOWER[2 * RPCConst::ITOW_MAX + 1] = {
 };
 
 const int RPCBasicTrigConfig::m_TOW_ADDR_2_TOW_NUM[36] = {
-//0	  1	  2	  3	  4	  5	  6	 7	8	 9 10	11	12	13	14	15	16	17	
+//0  1  2  3  4  5  6  7  8  9  10  11  12  13  14  15  16  17	
 -16,-15,-14,-13,-12,-11,-10,-9,-8,-7,-6,-5, -4, -3, -2,-99, -1,  0,
 //18  19  20  21  22  23  24  25  26  27  28  29  30  31  32  33  34  35
   1,-99,  2,  3,  4,-99,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16
diff --git a/L1Trigger/RegionalCaloTrigger/interface/L1GctRegion.h b/L1Trigger/RegionalCaloTrigger/interface/L1GctRegion.h
deleted file mode 100644
index 766586a6ed462..0000000000000
--- a/L1Trigger/RegionalCaloTrigger/interface/L1GctRegion.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef L1GCTREGION_H_
-#define L1GCTREGION_H_
-
-#include <bitset>
-
-/*
- * A calorimeter trigger region
- * as represented in the GCT
- * author: Jim Brooke
- * date: 20/2/2006
- * 
- */
-
-
-typedef unsigned long int ULong;
-
-class L1GctRegion
-{
-public:
-
-	L1GctRegion(ULong et=0, bool mip=false, bool quiet=false);
-	~L1GctRegion();
-	
-    // Getters
-	ULong getEt() const { return myEt.to_ulong(); }
-	bool getMip() const { return myMip; }
-	bool getQuiet() const { return myQuiet; }
-    
-    // Setters
-    void setEt(ULong et) { myEt = et; } 
-    void setMip(bool mip) { myMip = mip; }
-    void setQuiet(bool quiet) { myQuiet = quiet; }
-
-	ostream& operator << (ostream& os, const L1GctRegion& s);
-		
-private:
-
-	std::bitset<10> myEt;
-	bool myMip;
-	bool myQuiet;
-	
-};
-
-#endif /*L1GCTREGION_H_*/
diff --git a/L1Trigger/RegionalCaloTrigger/interface/L1RCT.h b/L1Trigger/RegionalCaloTrigger/interface/L1RCT.h
index 0e1ace3ff2cf1..ad58655483bbd 100644
--- a/L1Trigger/RegionalCaloTrigger/interface/L1RCT.h
+++ b/L1Trigger/RegionalCaloTrigger/interface/L1RCT.h
@@ -1,133 +1,127 @@
 #ifndef L1RCT_h
 #define L1RCT_h
 
-#include <vector>
 #include <bitset>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 #include <string>
+#include <vector>
 
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTCrate.h"
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTNeighborMap.h"
 
-#include "DataFormats/L1CaloTrigger/interface/L1CaloRegion.h"
-#include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
+#include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
+#include "DataFormats/L1CaloTrigger/interface/L1CaloRegion.h"
 
 class L1RCTLookupTables;
 
 class L1RCT {
 
- public:
-  
-  L1RCT(const L1RCTLookupTables* rctLookupTables);
+public:
+  L1RCT(const L1RCTLookupTables *rctLookupTables);
 
-  //Organize input for consumption by the cards
+  // Organize input for consumption by the cards
   void input();
 
-  //For testing accept external input
-  void input(const std::vector<std::vector<std::vector<unsigned short> > >& barrelIn,
-	     const std::vector<std::vector<unsigned short> >& hfIn);
+  // For testing accept external input
+  void
+  input(const std::vector<std::vector<std::vector<unsigned short>>> &barrelIn,
+        const std::vector<std::vector<unsigned short>> &hfIn);
 
-  //Should send commands to all crates to send commands to all RCs to
-  //process the input data and then send it on to the EICs and then
-  //to the JSCs
+  // Should send commands to all crates to send commands to all RCs to
+  // process the input data and then send it on to the EICs and then
+  // to the JSCs
   void processEvent();
 
-  void fileInput(const char* filename);       // added "const" also in .cc
+  void fileInput(const char *filename); // added "const" also in .cc
+
+  void digiInput(const EcalTrigPrimDigiCollection &ecalCollection,
+                 const HcalTrigPrimDigiCollection &hcalCollection);
 
-  void digiInput(const EcalTrigPrimDigiCollection& ecalCollection, 
-		 const HcalTrigPrimDigiCollection& hcalCollection);
-  
   void randomInput();
 
   void print();
-  void printCrate(int i){
-    crates.at(i).print();
-  }
-  void printJSC(int i){
-    crates.at(i).printJSC();
-  }
-  void printJSC(){
-    for(int i=0;i<18;i++){
+  void printCrate(int i) { crates.at(i).print(); }
+  void printJSC(int i) { crates.at(i).printJSC(); }
+  void printJSC() {
+    for (int i = 0; i < 18; i++) {
       std::cout << "JSC for Crate " << i << std::endl;
       crates.at(i).printJSC();
     }
   }
-  void printRC(int i, int j){
-    crates.at(i).printRC(j);
-  }
-  void printEIC(int i, int j){
-    crates.at(i).printEIC(j);
-  }
-  void printEICEdges(int i, int j){
-    crates.at(i).printEICEdges(j);
-  }
+  void printRC(int i, int j) { crates.at(i).printRC(j); }
+  void printEIC(int i, int j) { crates.at(i).printEIC(j); }
+  void printEICEdges(int i, int j) { crates.at(i).printEICEdges(j); }
 
   L1CaloEmCollection getIsolatedEGObjects(unsigned crate);
 
   L1CaloEmCollection getNonisolatedEGObjects(unsigned crate);
 
-  std::vector<unsigned short> getJetRegions(unsigned crate){
+  std::vector<unsigned short> getJetRegions(unsigned crate) {
     return crates.at(crate).getJetRegions();
   }
 
   std::vector<L1CaloRegion> getRegions(unsigned crate);
 
-  unsigned short ecalCompressedET(int crate, int card, int tower)
-    {return barrel.at(crate).at(card).at(tower) / 2;}
-  unsigned short ecalFineGrainBit(int crate, int card, int tower)
-    {return barrel.at(crate).at(card).at(tower) & 1;}
-  unsigned short hcalCompressedET(int crate, int card, int tower)
-    {return barrel.at(crate).at(card).at(tower+32) / 2;}
-  unsigned short hcalFineGrainBit(int crate, int card, int tower)
-    {return barrel.at(crate).at(card).at(tower+32) & 1;}
-  unsigned short hfCompressedET(int crate, int tower)
-    {return hf.at(crate).at(tower) / 2;}
-  unsigned short hfFineGrainBit(int crate, int tower)
-    {return hf.at(crate).at(tower) & 1;}
-
- private:
-  
-  L1RCT();  // Do not implement this
-
-  const L1RCTLookupTables* rctLookupTables_;
-
-  //Helper methods called by constructor
-  //Set all the neighbors properly.
-  //Will make use of the internal neighborMap
+  unsigned short ecalCompressedET(int crate, int card, int tower) {
+    return barrel.at(crate).at(card).at(tower) / 2;
+  }
+  unsigned short ecalFineGrainBit(int crate, int card, int tower) {
+    return barrel.at(crate).at(card).at(tower) & 1;
+  }
+  unsigned short hcalCompressedET(int crate, int card, int tower) {
+    return barrel.at(crate).at(card).at(tower + 32) / 2;
+  }
+  unsigned short hcalFineGrainBit(int crate, int card, int tower) {
+    return barrel.at(crate).at(card).at(tower + 32) & 1;
+  }
+  unsigned short hfCompressedET(int crate, int tower) {
+    return hf.at(crate).at(tower) / 2;
+  }
+  unsigned short hfFineGrainBit(int crate, int tower) {
+    return hf.at(crate).at(tower) & 1;
+  }
+
+private:
+  L1RCT(); // Do not implement this
+
+  const L1RCTLookupTables *rctLookupTables_;
+
+  // Helper methods called by constructor
+  // Set all the neighbors properly.
+  // Will make use of the internal neighborMap
   void makeCrates();
   void configureCards();
   void shareNeighbors();
 
   L1RCTRegion empty;
 
-  //Helper class containing information to set all the neighbors for
-  //the receiver cards.  We will use the methods
-  //north,south,west,east,se,sw,ne,nw,which each take in the
-  //indices of the region in question and then return the indices
-  //of the region that is the corresponding neighbor to be used.
+  // Helper class containing information to set all the neighbors for
+  // the receiver cards.  We will use the methods
+  // north,south,west,east,se,sw,ne,nw,which each take in the
+  // indices of the region in question and then return the indices
+  // of the region that is the corresponding neighbor to be used.
   L1RCTNeighborMap neighborMap;
 
-  //Vector of all 18 crates.
-  //Will follow numbering convention listed
-  //in the CaloTrigger Tower Mapping
-  //So 0->8 are eta -5 -> 0
-  //While 9-17 are eta 0 -> 5
-  //Crate i and crate i+9 are next to each other  
+  // Vector of all 18 crates.
+  // Will follow numbering convention listed
+  // in the CaloTrigger Tower Mapping
+  // So 0->8 are eta -5 -> 0
+  // While 9-17 are eta 0 -> 5
+  // Crate i and crate i+9 are next to each other
   std::vector<L1RCTCrate> crates;
 
-  //Data for processing is organized into the crates and cards
-  //in two multilayered vectors of vectors.
-  //The first is of the actual barrel information.
-  //18 crates -> 7 RCs -> 64 unsigned shorts per RC
-  //so it should be a std::vector<std::vector<std::vector<unsigned short> > >
-  //The second is of the HF regions which is just of type
-  //std::vector<std::vector<unsigned short> >
-  std::vector<std::vector<std::vector<unsigned short> > > barrel;
-  std::vector<std::vector<unsigned short> > hf;
-
+  // Data for processing is organized into the crates and cards
+  // in two multilayered vectors of vectors.
+  // The first is of the actual barrel information.
+  // 18 crates -> 7 RCs -> 64 unsigned shorts per RC
+  // so it should be a std::vector<std::vector<std::vector<unsigned short> > >
+  // The second is of the HF regions which is just of type
+  // std::vector<std::vector<unsigned short> >
+  std::vector<std::vector<std::vector<unsigned short>>> barrel;
+  std::vector<std::vector<unsigned short>> hf;
 };
 
 #endif
diff --git a/L1Trigger/RegionalCaloTrigger/interface/L1RCTCrate.h b/L1Trigger/RegionalCaloTrigger/interface/L1RCTCrate.h
index 7bc2f40156b1a..044b4ea72317c 100644
--- a/L1Trigger/RegionalCaloTrigger/interface/L1RCTCrate.h
+++ b/L1Trigger/RegionalCaloTrigger/interface/L1RCTCrate.h
@@ -1,114 +1,98 @@
 #ifndef L1RCTCrate_h
 #define L1RCTCrate_h
 
-#include <vector>
-#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTReceiverCard.h"
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTElectronIsolationCard.h"
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTJetSummaryCard.h"
+#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTReceiverCard.h"
+#include <vector>
 
 class L1RCTLookupTables;
 
 class L1RCTCrate {
 
- public:
-  L1RCTCrate(int crtNo, const L1RCTLookupTables* rctLookupTables);
+public:
+  L1RCTCrate(int crtNo, const L1RCTLookupTables *rctLookupTables);
 
   ~L1RCTCrate();
 
-  int crateNumber(){return crtNo;}
+  int crateNumber() { return crtNo; }
 
-  //For sharing information between crates.
-  //It passes the pointers to the cards rather than the copies of the cards
-  //because we need to modify the actual regions when setting their
-  //neighbors rather than just copies.
-  //Working in non garbage collected languages can really suck sometimes.
-  L1RCTReceiverCard* getReceiverCard(int i) { return &receiverCards.at(i);}
+  // For sharing information between crates.
+  // It passes the pointers to the cards rather than the copies of the cards
+  // because we need to modify the actual regions when setting their
+  // neighbors rather than just copies.
+  // Working in non garbage collected languages can really suck sometimes.
+  L1RCTReceiverCard *getReceiverCard(int i) { return &receiverCards.at(i); }
   // L1RCTJetSummaryCard* getJetSummaryCard { return &jetSummaryCard;}
-  
-  //This method receives the input from the L1RCT class and distributes
-  //the RCInput to the 7 receiver cards and sends the HFInput straight
-  //to the JSC for this crate.  The RCs never see the HF data.  Instead
-  //the JSC acts like a primitive RC for these regions.
-  void input(const std::vector<std::vector<unsigned short> >& RCInput,
-	     const std::vector<unsigned short>& HFInput);
-  //The two following are methods for running the actual data processing
-  //in the RCs and the EICs.  They're to be called for each card
-  //from the L1RCT process method
+
+  // This method receives the input from the L1RCT class and distributes
+  // the RCInput to the 7 receiver cards and sends the HFInput straight
+  // to the JSC for this crate.  The RCs never see the HF data.  Instead
+  // the JSC acts like a primitive RC for these regions.
+  void input(const std::vector<std::vector<unsigned short>> &RCInput,
+             const std::vector<unsigned short> &HFInput);
+  // The two following are methods for running the actual data processing
+  // in the RCs and the EICs.  They're to be called for each card
+  // from the L1RCT process method
   void processReceiverCards();
   void fillElectronIsolationCards();
   void processElectronIsolationCards();
-  //Pulls the information from the RCs and EICs and sends it to the 
-  //JSC.
+  // Pulls the information from the RCs and EICs and sends it to the
+  // JSC.
   void fillJetSummaryCard();
   void processJetSummaryCard();
   void print();
-  void printJSC(){
-    jetSummaryCard.print();
-  }
-  void printRC(int i){
-    receiverCards.at(i).print();
-  }
-  void printEIC(int i){
-    electronCards.at(i).print();
-  }
-  void printEICEdges(int i){
-    electronCards.at(i).printEdges();
-  }
+  void printJSC() { jetSummaryCard.print(); }
+  void printRC(int i) { receiverCards.at(i).print(); }
+  void printEIC(int i) { electronCards.at(i).print(); }
+  void printEICEdges(int i) { electronCards.at(i).printEdges(); }
 
   // region sums
-  std::vector<unsigned short> getJetRegions(){
+  std::vector<unsigned short> getJetRegions() {
     return jetSummaryCard.getJetRegions();
   }
-  std::vector<unsigned short> getBarrelRegions(){
+  std::vector<unsigned short> getBarrelRegions() {
     return jetSummaryCard.getBarrelRegions();
   }
-  std::vector<unsigned short> getHFRegions(){
+  std::vector<unsigned short> getHFRegions() {
     return jetSummaryCard.getHFRegions();
   }
 
   // e-gamma objects
-  std::vector<unsigned short> getIsolatedEGObjects(){
+  std::vector<unsigned short> getIsolatedEGObjects() {
     return jetSummaryCard.getIsolatedEGObjects();
   }
-  std::vector<unsigned short> getNonisolatedEGObjects(){
+  std::vector<unsigned short> getNonisolatedEGObjects() {
     return jetSummaryCard.getNonisolatedEGObjects();
   }
 
   // the bits
-  unsigned short getTauBits(){
-    return jetSummaryCard.getTauBits();
-  }
-  unsigned short getMIPBits(){
-    return jetSummaryCard.getMIPBits();
-  }
-  unsigned short getOverFlowBits(){
-    return jetSummaryCard.getOverFlowBits();
-  }
-  unsigned short getQuietBits(){
-    return jetSummaryCard.getQuietBits();
-  }
+  unsigned short getTauBits() { return jetSummaryCard.getTauBits(); }
+  unsigned short getMIPBits() { return jetSummaryCard.getMIPBits(); }
+  unsigned short getOverFlowBits() { return jetSummaryCard.getOverFlowBits(); }
+  unsigned short getQuietBits() { return jetSummaryCard.getQuietBits(); }
   // hf bit
-  std::vector<unsigned short> getHFFineGrainBits(){
+  std::vector<unsigned short> getHFFineGrainBits() {
     return jetSummaryCard.getHFFineGrainBits();
   }
 
- private:
-  //The seven RCs and EICs
-  //They are laid out according to CMS IN 2004/008
-  //Increasing number towards higher absolute eta
-  //The seventh card is always sideways with respect to the
-  //other six.
+private:
+  // The seven RCs and EICs
+  // They are laid out according to CMS IN 2004/008
+  // Increasing number towards higher absolute eta
+  // The seventh card is always sideways with respect to the
+  // other six.
   std::vector<L1RCTReceiverCard> receiverCards;
   std::vector<L1RCTElectronIsolationCard> electronCards;
-  //The JSC receives the jet and electron information from the 
-  //RCs and EICs.  There is only one per crate.
+  // The JSC receives the jet and electron information from the
+  // RCs and EICs.  There is only one per crate.
   L1RCTJetSummaryCard jetSummaryCard;
-  
+
   int crtNo;
-  const L1RCTLookupTables* rctLookupTables_;
+  const L1RCTLookupTables *rctLookupTables_;
 
   L1RCTCrate() = delete;
 
-  //L1RCTJetCaptureCard jetCaptureCard;
+  // L1RCTJetCaptureCard jetCaptureCard;
 };
 #endif // L1RCTCrate_h
diff --git a/L1Trigger/RegionalCaloTrigger/interface/L1RCTElectronIsolationCard.h b/L1Trigger/RegionalCaloTrigger/interface/L1RCTElectronIsolationCard.h
index 39a31b410e24a..a37dcee5c54b8 100644
--- a/L1Trigger/RegionalCaloTrigger/interface/L1RCTElectronIsolationCard.h
+++ b/L1Trigger/RegionalCaloTrigger/interface/L1RCTElectronIsolationCard.h
@@ -1,62 +1,55 @@
 #ifndef L1RCTElectronIsolationCard_h
 #define L1RCTElectronIsolationCard_h
 
-#include <vector>
-#include <iostream>
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTRegion.h"
+#include <iostream>
+#include <vector>
 
 #include "DataFormats/L1CaloTrigger/interface/L1CaloEmCand.h"
 
-//This class handles the electron isolation card.  Duh.
-//Each card has a crate and a cardnumber to identify it when
-//being called.
-//The class does not actually have instances of L1RCTRegions but
-//rather has pointers to regions that were created in L1RCTReceiverCard
-//for efficiency purposes.
+// This class handles the electron isolation card.  Duh.
+// Each card has a crate and a cardnumber to identify it when
+// being called.
+// The class does not actually have instances of L1RCTRegions but
+// rather has pointers to regions that were created in L1RCTReceiverCard
+// for efficiency purposes.
 
 class L1RCTLookupTables;
 
 class L1RCTElectronIsolationCard {
 
- public:
-
-  L1RCTElectronIsolationCard(int crateNumber,
-			     int cardNumber,
-			     const L1RCTLookupTables *rctLookupTables);
+public:
+  L1RCTElectronIsolationCard(int crateNumber, int cardNumber,
+                             const L1RCTLookupTables *rctLookupTables);
   ~L1RCTElectronIsolationCard();
 
-  int crateNumber() {return crtNo;}
-  int cardNumber() {return cardNo;}
-  
+  int crateNumber() { return crtNo; }
+  int cardNumber() { return cardNo; }
+
   void fillElectronCandidates();
-  void setRegion(int i, const L1RCTRegion& region){
-    regions.at(i) = region;
-  }
-  //Valid arguments to the following two functions are 0 or 1,
-  //corresponding to region0 or region1
-  unsigned short getIsoElectrons(int i) {
-    return isoElectrons.at(i);
-  }
-  
-  unsigned short getNonIsoElectrons(int i) {
-    return nonIsoElectrons.at(i);
-  }
+  void setRegion(int i, const L1RCTRegion &region) { regions.at(i) = region; }
+  // Valid arguments to the following two functions are 0 or 1,
+  // corresponding to region0 or region1
+  unsigned short getIsoElectrons(int i) { return isoElectrons.at(i); }
+
+  unsigned short getNonIsoElectrons(int i) { return nonIsoElectrons.at(i); }
   void print();
-  void printEdges(){
+  void printEdges() {
     regions.at(0).printEdges();
     regions.at(1).printEdges();
   }
 
- private:
-  std::vector<unsigned short> calcElectronCandidates(const L1RCTRegion& region, int regionNum);
-  unsigned short calcMaxSum(unsigned short primaryEt,unsigned short northEt,
-			    unsigned short southEt, unsigned short eastEt,
-			    unsigned short westEt);
+private:
+  std::vector<unsigned short> calcElectronCandidates(const L1RCTRegion &region,
+                                                     int regionNum);
+  unsigned short calcMaxSum(unsigned short primaryEt, unsigned short northEt,
+                            unsigned short southEt, unsigned short eastEt,
+                            unsigned short westEt);
 
   unsigned short crtNo;  // changed from int
-  unsigned short cardNo;  // changed from int
+  unsigned short cardNo; // changed from int
 
-  const L1RCTLookupTables* rctLookupTables_;
+  const L1RCTLookupTables *rctLookupTables_;
 
   L1RCTRegion empty;
 
diff --git a/L1Trigger/RegionalCaloTrigger/interface/L1RCTInputProducer.h b/L1Trigger/RegionalCaloTrigger/interface/L1RCTInputProducer.h
index 658ee6cd556de..8362151da24a9 100644
--- a/L1Trigger/RegionalCaloTrigger/interface/L1RCTInputProducer.h
+++ b/L1Trigger/RegionalCaloTrigger/interface/L1RCTInputProducer.h
@@ -1,13 +1,13 @@
 #ifndef L1RCTInputProducer_h
-#define L1RCTInputProducer_h 
+#define L1RCTInputProducer_h
 
 #include "FWCore/Framework/interface/EDProducer.h"
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
@@ -16,15 +16,15 @@
 class L1RCT;
 class L1RCTLookupTables;
 
-class L1RCTInputProducer : public edm::EDProducer
-{
- public:
-  explicit L1RCTInputProducer(const edm::ParameterSet& ps);
+class L1RCTInputProducer : public edm::EDProducer {
+public:
+  explicit L1RCTInputProducer(const edm::ParameterSet &ps);
   ~L1RCTInputProducer() override;
-  void produce(edm::Event& e, const edm::EventSetup& c) override;
- private:
-  L1RCTLookupTables* rctLookupTables;
-  L1RCT* rct;
+  void produce(edm::Event &e, const edm::EventSetup &c) override;
+
+private:
+  L1RCTLookupTables *rctLookupTables;
+  L1RCT *rct;
   bool useEcal;
   bool useHcal;
   edm::InputTag ecalDigisLabel;
diff --git a/L1Trigger/RegionalCaloTrigger/interface/L1RCTJetSummaryCard.h b/L1Trigger/RegionalCaloTrigger/interface/L1RCTJetSummaryCard.h
index 2346f497a8510..5471e1759a8bc 100644
--- a/L1Trigger/RegionalCaloTrigger/interface/L1RCTJetSummaryCard.h
+++ b/L1Trigger/RegionalCaloTrigger/interface/L1RCTJetSummaryCard.h
@@ -5,16 +5,14 @@
 
 class L1RCTLookupTables;
 
-class L1RCTJetSummaryCard
-{
- public:
-  
-  //There is no default constructor.
-  //It is required to have a crate number attached to it
-  //for bookeeping purposes.  
-  L1RCTJetSummaryCard(int crtNo, const L1RCTLookupTables* rctLookupTables);
-  
-  int crateNumber() {return crtNo;}
+class L1RCTJetSummaryCard {
+public:
+  // There is no default constructor.
+  // It is required to have a crate number attached to it
+  // for bookeeping purposes.
+  L1RCTJetSummaryCard(int crtNo, const L1RCTLookupTables *rctLookupTables);
+
+  int crateNumber() { return crtNo; }
 
   // eGamma Objects
   // The object is defined by a 6 bit rank (temporarily set to 7 bit linear ET)
@@ -24,9 +22,13 @@ class L1RCTJetSummaryCard
   // although, in the case of the emulator they may always be in
   // the descending order of rank
 
-  std::vector<unsigned short> getIsolatedEGObjects() {return isolatedEGObjects;}
-  std::vector<unsigned short> getNonisolatedEGObjects() {return nonisolatedEGObjects;}
-  
+  std::vector<unsigned short> getIsolatedEGObjects() {
+    return isolatedEGObjects;
+  }
+  std::vector<unsigned short> getNonisolatedEGObjects() {
+    return nonisolatedEGObjects;
+  }
+
   // Region sums 10-bit energy (bits 0-9),overflow (bit 10)
   // bit 11 is tau bit
 
@@ -50,9 +52,9 @@ class L1RCTJetSummaryCard
   // that the eta decreases from -5 to 0 for crates 0-8
   // and increases from 0 to +5 for crates 9-17
 
-  std::vector<unsigned short> getJetRegions() {return jetRegions;}
-  std::vector<unsigned short> getBarrelRegions() {return barrelRegions;}
-  std::vector<unsigned short> getHFRegions() {return HFRegions;}
+  std::vector<unsigned short> getJetRegions() { return jetRegions; }
+  std::vector<unsigned short> getBarrelRegions() { return barrelRegions; }
+  std::vector<unsigned short> getHFRegions() { return HFRegions; }
 
   // Muon bits consist of 14 quiet bits and 14 MIP bits
   // These are packed into one unsigned short each
@@ -63,41 +65,44 @@ class L1RCTJetSummaryCard
   // (crdNo6, rgnNo0), (crdNo6, rgnNo1)
   // The same ordering is true for Quiet bits also
 
-  unsigned short getMIPBits() {return mipBits;}
-  unsigned short getQuietBits() {return quietBits;}
+  unsigned short getMIPBits() { return mipBits; }
+  unsigned short getQuietBits() { return quietBits; }
 
-  unsigned short getTauBits() {return tauBits;}
-  unsigned short getOverFlowBits() {return overFlowBits;}
+  unsigned short getTauBits() { return tauBits; }
+  unsigned short getOverFlowBits() { return overFlowBits; }
 
-  std::vector<unsigned short> getHFFineGrainBits() {return hfFineGrainBits;}
+  std::vector<unsigned short> getHFFineGrainBits() { return hfFineGrainBits; }
 
-  void fillHFRegionSums(const std::vector<unsigned short>& hfRegionSums);
-  void fillRegionSums(const std::vector<unsigned short>& regSums){
+  void fillHFRegionSums(const std::vector<unsigned short> &hfRegionSums);
+  void fillRegionSums(const std::vector<unsigned short> &regSums) {
     barrelRegions = regSums;
   }
   void fillJetRegions();
 
-  void fillIsolatedEGObjects(const std::vector<unsigned short>& isoElectrons);
-  void fillNonIsolatedEGObjects(const std::vector<unsigned short>& nonIsoElectrons);
+  void fillIsolatedEGObjects(const std::vector<unsigned short> &isoElectrons);
+  void
+  fillNonIsolatedEGObjects(const std::vector<unsigned short> &nonIsoElectrons);
 
-  void fillMIPBits(const std::vector<unsigned short>& mip);
-  void fillTauBits(const std::vector<unsigned short>& tau);
-  void fillOverFlowBits(const std::vector<unsigned short>& overflow);
+  void fillMIPBits(const std::vector<unsigned short> &mip);
+  void fillTauBits(const std::vector<unsigned short> &tau);
+  void fillOverFlowBits(const std::vector<unsigned short> &overflow);
   void fillQuietBits();
 
   void print();
- private:
 
+private:
   int crtNo;
 
-  const L1RCTLookupTables* rctLookupTables_;
+  const L1RCTLookupTables *rctLookupTables_;
 
   std::vector<unsigned short> isolatedEGObjects;
   std::vector<unsigned short> nonisolatedEGObjects;
   std::vector<unsigned short> jetRegions;
 
-  std::vector<unsigned short> HFRegions;  // 8-bit et + fine grain?
-  std::vector<unsigned short> barrelRegions;  // no, this is 10-bit et, not (activityBit)(etIn9Bits)(HE_FGBit)(etIn7Bits)
+  std::vector<unsigned short> HFRegions; // 8-bit et + fine grain?
+  std::vector<unsigned short>
+      barrelRegions; // no, this is 10-bit et, not
+                     // (activityBit)(etIn9Bits)(HE_FGBit)(etIn7Bits)
 
   unsigned short mipBits;
   unsigned short quietBits;
@@ -106,12 +111,12 @@ class L1RCTJetSummaryCard
 
   std::vector<unsigned short> hfFineGrainBits;
 
-  //unsigned quietThreshold;
+  // unsigned quietThreshold;
   unsigned quietThresholdBarrel;
   unsigned quietThresholdEndcap;
 
-  void asicSort(std::vector<unsigned short>& electrons);
-  void asicCompare(std::vector<unsigned short>& array);
+  void asicSort(std::vector<unsigned short> &electrons);
+  void asicCompare(std::vector<unsigned short> &array);
 
   // Disabled constructors and operators
 
diff --git a/L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h b/L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h
index 70e4aaa5869a2..4d29044ea51a7 100644
--- a/L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h
+++ b/L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h
@@ -9,61 +9,47 @@ class L1CaloHcalScale;
 class L1CaloEtScale;
 
 class L1RCTLookupTables {
- 
- public:
 
+public:
   // constructor
 
-  L1RCTLookupTables() : rctParameters_(nullptr), channelMask_(nullptr), ecalScale_(nullptr), hcalScale_(nullptr), etScale_(nullptr) {}
-  
+  L1RCTLookupTables()
+      : rctParameters_(nullptr), channelMask_(nullptr), ecalScale_(nullptr),
+        hcalScale_(nullptr), etScale_(nullptr) {}
+
   // this needs to be refreshed every event -- constructor inits to zero
   // to indicate that it cannot be used -- if this set function is
   // called, lookup after that call will use it.
-  void setRCTParameters(const L1RCTParameters* rctParameters)
-    {
-      rctParameters_ = rctParameters;
-    }
+  void setRCTParameters(const L1RCTParameters *rctParameters) {
+    rctParameters_ = rctParameters;
+  }
   // ditto for channel mask
-  void setChannelMask(const L1RCTChannelMask* channelMask)
-    {
-      channelMask_ = channelMask;
-    }
-  void setNoisyChannelMask(const L1RCTNoisyChannelMask* channelMask)
-    {
-      noisyChannelMask_ = channelMask;
-    }
+  void setChannelMask(const L1RCTChannelMask *channelMask) {
+    channelMask_ = channelMask;
+  }
+  void setNoisyChannelMask(const L1RCTNoisyChannelMask *channelMask) {
+    noisyChannelMask_ = channelMask;
+  }
 
   // ditto for hcal TPG scale
-  void setHcalScale(const L1CaloHcalScale* hcalScale)
-    {
-      hcalScale_ = hcalScale;
-    }
+  void setHcalScale(const L1CaloHcalScale *hcalScale) {
+    hcalScale_ = hcalScale;
+  }
   // ditto for caloEtScale
-  void setL1CaloEtScale(const L1CaloEtScale* etScale)
-    {
-      etScale_ = etScale;
-    }
+  void setL1CaloEtScale(const L1CaloEtScale *etScale) { etScale_ = etScale; }
   // ditto for ecal TPG Scale
-  void setEcalScale(const L1CaloEcalScale* ecalScale)
-    {
-      ecalScale_ = ecalScale;
-    }
+  void setEcalScale(const L1CaloEcalScale *ecalScale) {
+    ecalScale_ = ecalScale;
+  }
+
+  const L1RCTParameters *rctParameters() const { return rctParameters_; }
 
-  const L1RCTParameters* rctParameters() const {return rctParameters_;}
-  
-  unsigned int lookup(unsigned short ecalInput,
-		      unsigned short hcalInput,
-		      unsigned short fgbit,
-		      unsigned short crtNo,
-		      unsigned short crdNo,
-		      unsigned short twrNo
-		      ) const;
+  unsigned int lookup(unsigned short ecalInput, unsigned short hcalInput,
+                      unsigned short fgbit, unsigned short crtNo,
+                      unsigned short crdNo, unsigned short twrNo) const;
 
-  unsigned int lookup(unsigned short hfInput, 
-		      unsigned short crtNo,
-		      unsigned short crdNo,
-		      unsigned short twrNo
-		      ) const;
+  unsigned int lookup(unsigned short hfInput, unsigned short crtNo,
+                      unsigned short crdNo, unsigned short twrNo) const;
 
   unsigned int emRank(unsigned short energy) const;
   unsigned int eGammaETCode(float ecal, float hcal, int iAbsEta) const;
@@ -71,20 +57,20 @@ class L1RCTLookupTables {
   bool hOeFGVetoBit(float ecal, float hcal, bool fgbit) const;
   bool activityBit(float ecal, float hcal) const;
 
- private:
-
+private:
   // helper functions
 
-  float convertEcal(unsigned short ecal, unsigned short iAbsEta, short sign) const;  
-  float convertHcal(unsigned short hcal, unsigned short iAbsEta, short sign) const;
+  float convertEcal(unsigned short ecal, unsigned short iAbsEta,
+                    short sign) const;
+  float convertHcal(unsigned short hcal, unsigned short iAbsEta,
+                    short sign) const;
   unsigned long convertToInteger(float et, float lsb, int precision) const;
 
-  const L1RCTParameters* rctParameters_;
-  const L1RCTChannelMask* channelMask_;
-  const L1RCTNoisyChannelMask* noisyChannelMask_;
-  const L1CaloEcalScale* ecalScale_;
-  const L1CaloHcalScale* hcalScale_;
-  const L1CaloEtScale* etScale_;
-
+  const L1RCTParameters *rctParameters_;
+  const L1RCTChannelMask *channelMask_;
+  const L1RCTNoisyChannelMask *noisyChannelMask_;
+  const L1CaloEcalScale *ecalScale_;
+  const L1CaloHcalScale *hcalScale_;
+  const L1CaloEtScale *etScale_;
 };
 #endif
diff --git a/L1Trigger/RegionalCaloTrigger/interface/L1RCTLutWriter.h b/L1Trigger/RegionalCaloTrigger/interface/L1RCTLutWriter.h
index b2ab2205c4d94..ed10218f11b04 100644
--- a/L1Trigger/RegionalCaloTrigger/interface/L1RCTLutWriter.h
+++ b/L1Trigger/RegionalCaloTrigger/interface/L1RCTLutWriter.h
@@ -5,8 +5,9 @@
 //
 // Package:    L1RCTLutWriter
 // Class:      L1RCTLutWriter
-// 
-/**\class L1RCTLutWriter L1RCTLutWriter.cc L1RCTLutWriter.h L1Trigger/L1RCTLutWriter/src/L1RCTLutWriter.cc
+//
+/**\class L1RCTLutWriter L1RCTLutWriter.cc L1RCTLutWriter.h
+ L1Trigger/L1RCTLutWriter/src/L1RCTLutWriter.cc
 
  Description: <one line class summary>
 
@@ -19,27 +20,26 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/ESHandle.h"   // why doesn't mkedanlzr
 #include "FWCore/Framework/interface/EventSetup.h" // add these??
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 class L1RCTLookupTables;
 class L1RCTParameters;
-//class L1RCTChannelMask;
+// class L1RCTChannelMask;
 
 //
 // class declaration
@@ -47,28 +47,26 @@ class L1RCTParameters;
 
 class L1RCTLutWriter : public edm::EDAnalyzer {
 public:
-  explicit L1RCTLutWriter(const edm::ParameterSet&);
+  explicit L1RCTLutWriter(const edm::ParameterSet &);
   ~L1RCTLutWriter() override;
-  
-  
+
 private:
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void endJob() override ;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
   void writeRcLutFile(unsigned short card);
   void writeEicLutFile(unsigned short card);
   void writeJscLutFile();
   void writeThresholdsFile(unsigned int eicThreshold,
-			   unsigned int jscThresholdBarrel,
-			   unsigned int jscThresholdEndcap);
-  
+                           unsigned int jscThresholdBarrel,
+                           unsigned int jscThresholdEndcap);
+
   // ----------member data ---------------------------
-  
-  L1RCTLookupTables* lookupTable_;
-  const L1RCTParameters* rctParameters_;
-  //const L1RCTChannelMask* channelMask_;
+
+  L1RCTLookupTables *lookupTable_;
+  const L1RCTParameters *rctParameters_;
+  // const L1RCTChannelMask* channelMask_;
   std::ofstream lutFile_;
   std::string keyName_;
   bool useDebugTpgScales_;
-
 };
 #endif
diff --git a/L1Trigger/RegionalCaloTrigger/interface/L1RCTNeighborMap.h b/L1Trigger/RegionalCaloTrigger/interface/L1RCTNeighborMap.h
index ba1f1c78f2cf7..4f6eb3cf32397 100644
--- a/L1Trigger/RegionalCaloTrigger/interface/L1RCTNeighborMap.h
+++ b/L1Trigger/RegionalCaloTrigger/interface/L1RCTNeighborMap.h
@@ -3,7 +3,7 @@
 #include <vector>
 
 class L1RCTNeighborMap {
- public:
+public:
   std::vector<int> north(int crate, int card, int region);
   std::vector<int> south(int crate, int card, int region);
   std::vector<int> west(int crate, int card, int region);
diff --git a/L1Trigger/RegionalCaloTrigger/interface/L1RCTORCAMap.h b/L1Trigger/RegionalCaloTrigger/interface/L1RCTORCAMap.h
index 9d50ef27eee49..627367aef53ae 100644
--- a/L1Trigger/RegionalCaloTrigger/interface/L1RCTORCAMap.h
+++ b/L1Trigger/RegionalCaloTrigger/interface/L1RCTORCAMap.h
@@ -5,35 +5,34 @@
 
 class L1RCTORCAMap {
 
- public:
- 
+public:
   L1RCTORCAMap();
-  
-  std::vector<std::vector<std::vector<unsigned short> > > giveBarrel();
-  std::vector<std::vector<unsigned short> > giveHF();
 
-  void readData(const std::vector<unsigned>& emet, const std::vector<unsigned>&  hdet,
-		const std::vector<bool>& emfg, const std::vector<bool>& hdfg,
-		const std::vector<unsigned>& hfet);
+  std::vector<std::vector<std::vector<unsigned short>>> giveBarrel();
+  std::vector<std::vector<unsigned short>> giveHF();
+
+  void readData(const std::vector<unsigned> &emet,
+                const std::vector<unsigned> &hdet,
+                const std::vector<bool> &emfg, const std::vector<bool> &hdfg,
+                const std::vector<unsigned> &hfet);
 
   std::vector<int> orcamap(int eta, int phi);
 
   unsigned short combine(unsigned short et, unsigned short fg);
-  std::vector<unsigned short> combVec(const std::vector<unsigned short>& et,
-				 const std::vector<unsigned short>& fg);
-  
+  std::vector<unsigned short> combVec(const std::vector<unsigned short> &et,
+                                      const std::vector<unsigned short> &fg);
+
   void makeBarrelData();
   void makeHFData();
 
- private:
+private:
+  std::vector<std::vector<std::vector<unsigned short>>> barrelData;
+  std::vector<std::vector<unsigned short>> hfData;
 
-  std::vector<std::vector<std::vector<unsigned short> > > barrelData;
-  std::vector<std::vector<unsigned short> > hfData;
-
-  //the barrel data comes in big nasty strips of phi
-  //increasing in eta from -3 up to 3
-  //This has to be broken up into the proper tower number.
-  //The following method does this
+  // the barrel data comes in big nasty strips of phi
+  // increasing in eta from -3 up to 3
+  // This has to be broken up into the proper tower number.
+  // The following method does this
 
   std::vector<int> lowEtaMap(int eta, int phi);
   std::vector<int> highEtaMap(int eta, int phi);
@@ -41,11 +40,10 @@ class L1RCTORCAMap {
   std::vector<unsigned short> rawEMET;
   std::vector<unsigned short> rawEMFG;
   std::vector<unsigned short> rawHDET;
-  std::vector<unsigned short> rawHDFG; 
+  std::vector<unsigned short> rawHDFG;
   std::vector<unsigned short> rawHFET;
   std::vector<unsigned short> combEM;
   std::vector<unsigned short> combHD;
-
 };
 
 #endif
diff --git a/L1Trigger/RegionalCaloTrigger/interface/L1RCTProducer.h b/L1Trigger/RegionalCaloTrigger/interface/L1RCTProducer.h
index df47abf14bb2e..c23ef98a7a349 100644
--- a/L1Trigger/RegionalCaloTrigger/interface/L1RCTProducer.h
+++ b/L1Trigger/RegionalCaloTrigger/interface/L1RCTProducer.h
@@ -1,42 +1,39 @@
 #ifndef L1RCTProducer_h
-#define L1RCTProducer_h 
+#define L1RCTProducer_h
 
 #include "FWCore/Framework/interface/EDProducer.h"
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
+#include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
 
 // default scales
-#include "CondFormats/L1TObjects/interface/L1CaloEcalScale.h"
 #include "CondFormats/DataRecord/interface/L1CaloEcalScaleRcd.h"
-#include "CondFormats/L1TObjects/interface/L1CaloHcalScale.h"
 #include "CondFormats/DataRecord/interface/L1CaloHcalScaleRcd.h"
+#include "CondFormats/L1TObjects/interface/L1CaloEcalScale.h"
+#include "CondFormats/L1TObjects/interface/L1CaloHcalScale.h"
 
-
-#include "CondFormats/L1TObjects/interface/L1RCTParameters.h"
+#include "CondFormats/DataRecord/interface/L1RCTChannelMaskRcd.h"
+#include "CondFormats/DataRecord/interface/L1RCTNoisyChannelMaskRcd.h"
 #include "CondFormats/DataRecord/interface/L1RCTParametersRcd.h"
 #include "CondFormats/L1TObjects/interface/L1RCTChannelMask.h"
-#include "CondFormats/DataRecord/interface/L1RCTChannelMaskRcd.h"
 #include "CondFormats/L1TObjects/interface/L1RCTNoisyChannelMask.h"
-#include "CondFormats/DataRecord/interface/L1RCTNoisyChannelMaskRcd.h"
+#include "CondFormats/L1TObjects/interface/L1RCTParameters.h"
 
-#include "CondFormats/RunInfo/interface/RunInfo.h"
 #include "CondFormats/DataRecord/interface/RunSummaryRcd.h"
-
+#include "CondFormats/RunInfo/interface/RunInfo.h"
 
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCT.h"
-#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h" 
+#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h"
 
-#include "CondFormats/L1TObjects/interface/L1CaloEtScale.h"
 #include "CondFormats/DataRecord/interface/L1EmEtScaleRcd.h"
-
+#include "CondFormats/L1TObjects/interface/L1CaloEtScale.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <string>
@@ -44,44 +41,42 @@
 class L1RCT;
 class L1RCTLookupTables;
 
-class L1RCTProducer : public edm::EDProducer
-{
- public:
-  explicit L1RCTProducer(const edm::ParameterSet& ps);
+class L1RCTProducer : public edm::EDProducer {
+public:
+  explicit L1RCTProducer(const edm::ParameterSet &ps);
   ~L1RCTProducer() override;
-  void beginRun(edm::Run const& r, const edm::EventSetup& c) final;
-  void beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg, const edm::EventSetup& context) final;
-  void produce(edm::Event& e, const edm::EventSetup& c) final;
+  void beginRun(edm::Run const &r, const edm::EventSetup &c) final;
+  void beginLuminosityBlock(edm::LuminosityBlock const &lumiSeg,
+                            const edm::EventSetup &context) final;
+  void produce(edm::Event &e, const edm::EventSetup &c) final;
 
+  void updateConfiguration(const edm::EventSetup &);
 
-  void updateConfiguration(const edm::EventSetup&);
+  void updateFedVector(const edm::EventSetup &, bool getFromOmds, int);
+  const std::vector<int> getFedVectorFromRunInfo(const edm::EventSetup &);
+  const std::vector<int> getFedVectorFromOmds(const edm::EventSetup &);
 
-  void updateFedVector(const edm::EventSetup&, bool getFromOmds, int);
-  const std::vector<int> getFedVectorFromRunInfo(const edm::EventSetup&); 
-  const std::vector<int> getFedVectorFromOmds(const edm::EventSetup&);
-
-  void printFedVector(const std::vector<int>&);
+  void printFedVector(const std::vector<int> &);
   void printUpdatedFedMask();
   void printUpdatedFedMaskVerbose();
 
- private:
-  L1RCTLookupTables* rctLookupTables;
-  L1RCT* rct;
+private:
+  L1RCTLookupTables *rctLookupTables;
+  L1RCT *rct;
   bool useEcal;
   bool useHcal;
   std::vector<edm::InputTag> ecalDigis;
   std::vector<edm::InputTag> hcalDigis;
-  std::vector<int> bunchCrossings; 
+  std::vector<int> bunchCrossings;
   bool getFedsFromOmds;
   unsigned int queryDelayInLS;
   unsigned int queryIntervalInLS;
   std::string conditionsLabel;
 
-  //Create a channel mask object to be updated at every Run....
-  L1RCTChannelMask* fedUpdatedMask;
-
+  // Create a channel mask object to be updated at every Run....
+  L1RCTChannelMask *fedUpdatedMask;
 
-  enum crateSection{
+  enum crateSection {
     c_min,
     ebOddFed = c_min,
     ebEvenFed,
@@ -99,10 +94,7 @@ class L1RCTProducer : public edm::EDProducer
   static const int minEndcap = 17;
   static const int maxEndcap = 28;
   static const int minHF = 29;
-  static const int maxHF =32;
-
-
+  static const int maxHF = 32;
 };
 
-
 #endif
diff --git a/L1Trigger/RegionalCaloTrigger/interface/L1RCTReceiverCard.h b/L1Trigger/RegionalCaloTrigger/interface/L1RCTReceiverCard.h
index a0c3dac480c29..03f550aa7ac8c 100644
--- a/L1Trigger/RegionalCaloTrigger/interface/L1RCTReceiverCard.h
+++ b/L1Trigger/RegionalCaloTrigger/interface/L1RCTReceiverCard.h
@@ -1,37 +1,37 @@
 #ifndef L1RCTReceiverCard_h
 #define L1RCTReceiverCard_h
 
+#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTRegion.h"
+#include <bitset>
 #include <cstdlib>
 #include <fstream>
 #include <iostream>
-#include <vector>
-#include <bitset>
 #include <string>
-#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTRegion.h"
+#include <vector>
 
 class L1RCTLookupTables;
 
 class L1RCTReceiverCard {
 
- public:
-
-  L1RCTReceiverCard(int crateNumber, int cardNumber, const L1RCTLookupTables *rctLookupTables);
+public:
+  L1RCTReceiverCard(int crateNumber, int cardNumber,
+                    const L1RCTLookupTables *rctLookupTables);
   ~L1RCTReceiverCard();
 
-  //Information needed to identify cards
-  int crateNumber() {return crtNo;}
-  int cardNumber() {return cardNo;}
+  // Information needed to identify cards
+  int crateNumber() { return crtNo; }
+  int cardNumber() { return cardNo; }
 
-  //Takes in a 64 element vector of unsigned shorts.
-  //First layer is ecal the second is hcal.
-  //goes in order of (for crate 0,card 0)
+  // Takes in a 64 element vector of unsigned shorts.
+  // First layer is ecal the second is hcal.
+  // goes in order of (for crate 0,card 0)
   // (Region 1)   (Region 0)
   // 29 25 21 17 13 09 05 01
   // 30 26 22 18 14 10 06 02
   // 31 27 23 19 15 11 07 03
-  // 32 28 24 20 16 12 08 04 
+  // 32 28 24 20 16 12 08 04
   //
-  // For card 6 of crate 0 it would look like 
+  // For card 6 of crate 0 it would look like
   //
   // 13 09 05 01
   // 14 10 06 02
@@ -42,55 +42,52 @@ class L1RCTReceiverCard {
   // 19 23 27 31
   // 20 24 28 32
   //
-  //In either case it is set up as so that 0-31 are the 8bit ecal energies
-  //plus the fine grain bit, and 32-63 are the 8bit hcal energies plus
-  //the muon bit.
-  void fillInput(const std::vector<unsigned short>& input);
+  // In either case it is set up as so that 0-31 are the 8bit ecal energies
+  // plus the fine grain bit, and 32-63 are the 8bit hcal energies plus
+  // the muon bit.
+  void fillInput(const std::vector<unsigned short> &input);
   void fillTauBits();
   void fillRegionSums();
   void fillMuonBits();
-   
-  //For each of the following functions the appropriate arguments are
-  //0 or 1
-  L1RCTRegion *getRegion(int i) {
-    return &regions.at(i);
-  }
-  unsigned short getTauBitRegion(int i) {return tauBits.at(i);}
-  unsigned short getMuonBitRegion(int i) {return muonBits.at(i);}
-  unsigned short getOverFlowBitRegion(int i) {return overFlowBits.at(i);}
-  unsigned short getEtIn10BitsRegion(int i) {return etIn10Bits.at(i);}
+
+  // For each of the following functions the appropriate arguments are
+  // 0 or 1
+  L1RCTRegion *getRegion(int i) { return &regions.at(i); }
+  unsigned short getTauBitRegion(int i) { return tauBits.at(i); }
+  unsigned short getMuonBitRegion(int i) { return muonBits.at(i); }
+  unsigned short getOverFlowBitRegion(int i) { return overFlowBits.at(i); }
+  unsigned short getEtIn10BitsRegion(int i) { return etIn10Bits.at(i); }
 
   std::vector<unsigned short> towerToRegionMap(int towernum);
 
   void print();
 
-  void printEdges(){
+  void printEdges() {
     regions.at(0).printEdges();
     regions.at(1).printEdges();
   }
 
   void randomInput();
-  void fileInput(char* filename);
+  void fileInput(char *filename);
 
- private:
- 
+private:
   std::vector<L1RCTRegion> regions;
-  
+
   unsigned short calcRegionSum(L1RCTRegion region);
   unsigned short calcTauBit(L1RCTRegion region);
   unsigned short calcMuonBit(L1RCTRegion region);
   unsigned short crtNo;
   unsigned short cardNo;
 
-  const L1RCTLookupTables* rctLookupTables_;
+  const L1RCTLookupTables *rctLookupTables_;
 
   std::vector<unsigned short> etIn10Bits;
   std::vector<unsigned short> overFlowBits;
   std::vector<unsigned short> muonBits;
   std::vector<unsigned short> tauBits;
 
-  //No default constructor, no copy constructor,
-  //and no assignment operator
+  // No default constructor, no copy constructor,
+  // and no assignment operator
   L1RCTReceiverCard() = delete;
 };
 #endif
diff --git a/L1Trigger/RegionalCaloTrigger/interface/L1RCTRegion.h b/L1Trigger/RegionalCaloTrigger/interface/L1RCTRegion.h
index 8b857dcc37849..018cf7ca67ed9 100644
--- a/L1Trigger/RegionalCaloTrigger/interface/L1RCTRegion.h
+++ b/L1Trigger/RegionalCaloTrigger/interface/L1RCTRegion.h
@@ -5,15 +5,14 @@
 
 class L1RCTRegion {
 
- public:
-
+public:
   L1RCTRegion();
   ~L1RCTRegion();
- 
-  void setEtIn7Bits(int i, int j,unsigned short energy);
+
+  void setEtIn7Bits(int i, int j, unsigned short energy);
   unsigned short getEtIn9Bits(int i, int j) const;
-  void setEtIn9Bits(int i, int j,unsigned short energy);
-  void setHE_FGBit(int i, int j,unsigned short HE_FG);
+  void setEtIn9Bits(int i, int j, unsigned short energy);
+  void setHE_FGBit(int i, int j, unsigned short HE_FG);
   unsigned short getMuonBit(int i, int j) const;
   void setMuonBit(int i, int j, unsigned short muon);
   void setActivityBit(int i, int j, unsigned short activity);
@@ -21,10 +20,10 @@ class L1RCTRegion {
 
   unsigned short getEtIn7Bits(int i, int j) const;
   unsigned short getHE_FGBit(int i, int j) const;
-  
-  //diagnostic print functions.
-  //print prints the data contained in a convenient format
-  //print edges prints the neighboring edge information
+
+  // diagnostic print functions.
+  // print prints the data contained in a convenient format
+  // print edges prints the neighboring edge information
   void print();
   void printEdges();
 
@@ -44,15 +43,15 @@ class L1RCTRegion {
   unsigned short giveSWHE_FG() const;
   unsigned short giveNEHE_FG() const;
   unsigned short giveNWHE_FG() const;
-  
-  void setNorthEt(const std::vector<unsigned short>& north);
-  void setSouthEt(const std::vector<unsigned short>& south);
-  void setWestEt(const std::vector<unsigned short>& west);
-  void setEastEt(const std::vector<unsigned short>& east);
-  void setNorthHE_FG(const std::vector<unsigned short>& north);
-  void setSouthHE_FG(const std::vector<unsigned short>& south);
-  void setWestHE_FG(const std::vector<unsigned short>& west);
-  void setEastHE_FG(const std::vector<unsigned short>& east);
+
+  void setNorthEt(const std::vector<unsigned short> &north);
+  void setSouthEt(const std::vector<unsigned short> &south);
+  void setWestEt(const std::vector<unsigned short> &west);
+  void setEastEt(const std::vector<unsigned short> &east);
+  void setNorthHE_FG(const std::vector<unsigned short> &north);
+  void setSouthHE_FG(const std::vector<unsigned short> &south);
+  void setWestHE_FG(const std::vector<unsigned short> &west);
+  void setEastHE_FG(const std::vector<unsigned short> &east);
   void setSEEt(unsigned short se);
   void setSWEt(unsigned short sw);
   void setNEEt(unsigned short ne);
@@ -61,17 +60,15 @@ class L1RCTRegion {
   void setSWHE_FG(unsigned short sw);
   void setNEHE_FG(unsigned short ne);
   void setNWHE_FG(unsigned short nw);
-  
- private:
-  
-  //6x6 matrices
+
+private:
+  // 6x6 matrices
   std::vector<unsigned short> totalRegionEt;
   std::vector<unsigned short> totalRegionHE_FG;
-  //4x4 matrices
+  // 4x4 matrices
   std::vector<unsigned short> etIn9Bits;
-  //std::vector<unsigned short> HE_FGBit;
+  // std::vector<unsigned short> HE_FGBit;
   std::vector<unsigned short> muonBit;
   std::vector<unsigned short> activityBit;
-
 };
 #endif
diff --git a/L1Trigger/RegionalCaloTrigger/interface/L1RCTRelValAnalyzer.h b/L1Trigger/RegionalCaloTrigger/interface/L1RCTRelValAnalyzer.h
index 9df0496a617da..12c1864306706 100644
--- a/L1Trigger/RegionalCaloTrigger/interface/L1RCTRelValAnalyzer.h
+++ b/L1Trigger/RegionalCaloTrigger/interface/L1RCTRelValAnalyzer.h
@@ -3,7 +3,9 @@
 // Package:    L1RCTRelValAnalyzer
 // Class:      L1RCTRelValAnalyzer
 //
-/**\class L1RCTRelValAnalyzer L1Trigger/RegionalCaloTrigger/interface/L1RCTRelValAnalyzer.h L1Trigger/RegionalCaloTrigger/plugins/L1RCTRelValAnalyzer.cc
+/**\class L1RCTRelValAnalyzer
+ L1Trigger/RegionalCaloTrigger/interface/L1RCTRelValAnalyzer.h
+ L1Trigger/RegionalCaloTrigger/plugins/L1RCTRelValAnalyzer.cc
 
  Description: <one line class summary>
 
@@ -16,19 +18,18 @@
 //
 //
 
-
 // system include files
-#include <memory>
 #include <iostream>
+#include <memory>
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -43,25 +44,25 @@
 
 class L1RCTRelValAnalyzer : public edm::EDAnalyzer {
 public:
-  explicit L1RCTRelValAnalyzer(const edm::ParameterSet&);
+  explicit L1RCTRelValAnalyzer(const edm::ParameterSet &);
   ~L1RCTRelValAnalyzer() override;
-  
-  
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+
 private:
   // ----------member data ---------------------------
   edm::InputTag rctEmCandsLabel;
   edm::InputTag rctRegionsLabel;
 
-  TH1F * h_emRank;
-  TH1F * h_emIeta;
-  TH1F * h_emIphi;
-  TH2F * h_emIsoOccIetaIphi;
-  TH2F * h_emNonIsoOccIetaIphi;
+  TH1F *h_emRank;
+  TH1F *h_emIeta;
+  TH1F *h_emIphi;
+  TH2F *h_emIsoOccIetaIphi;
+  TH2F *h_emNonIsoOccIetaIphi;
 
-  TH1F * h_regionSum;
-  TH2F * h_regionSumIetaIphi;
-  TH2F * h_regionOccIetaIphi;
+  TH1F *h_regionSum;
+  TH2F *h_regionSumIetaIphi;
+  TH2F *h_regionOccIetaIphi;
 };
 
 //
diff --git a/L1Trigger/RegionalCaloTrigger/interface/L1RCTSaveInput.h b/L1Trigger/RegionalCaloTrigger/interface/L1RCTSaveInput.h
index d3c565755f290..7a74c35b92600 100644
--- a/L1Trigger/RegionalCaloTrigger/interface/L1RCTSaveInput.h
+++ b/L1Trigger/RegionalCaloTrigger/interface/L1RCTSaveInput.h
@@ -3,9 +3,10 @@
 // Package:    L1RCTSaveInput
 // Class:      L1RCTSaveInput
 //
-/**\class L1RCTSaveInput L1RCTSaveInput.cc src/L1RCTSaveInput/src/L1RCTSaveInput.cc
+/**\class L1RCTSaveInput L1RCTSaveInput.cc
+ src/L1RCTSaveInput/src/L1RCTSaveInput.cc
 
- Description: Saves the input event from TPGs for loading 
+ Description: Saves the input event from TPGs for loading
               simulated events in hardware
 
  Implementation: Kind of kludgy -- should think of a better way in future
@@ -17,18 +18,18 @@
 //
 //
 
-#include <memory>
-#include <iostream>
 #include <fstream>
+#include <iostream>
+#include <memory>
 
 #include "DataFormats/Common/interface/Handle.h"
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
@@ -37,13 +38,14 @@ class L1RCT;
 
 class L1RCTSaveInput : public edm::EDAnalyzer {
 public:
-  explicit L1RCTSaveInput(const edm::ParameterSet&);
+  explicit L1RCTSaveInput(const edm::ParameterSet &);
   ~L1RCTSaveInput() override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+
 private:
   std::string fileName;
-  L1RCTLookupTables* rctLookupTables;
-  L1RCT* rct;
+  L1RCTLookupTables *rctLookupTables;
+  L1RCT *rct;
   bool useEcal;
   bool useHcal;
   edm::InputTag ecalDigisLabel;
diff --git a/L1Trigger/RegionalCaloTrigger/interface/L1RCTTPGProvider.h b/L1Trigger/RegionalCaloTrigger/interface/L1RCTTPGProvider.h
index db38d5a107b5b..7412856d9e8ec 100644
--- a/L1Trigger/RegionalCaloTrigger/interface/L1RCTTPGProvider.h
+++ b/L1Trigger/RegionalCaloTrigger/interface/L1RCTTPGProvider.h
@@ -2,8 +2,9 @@
 //
 // Package:    L1RCTTPGProvider
 // Class:      L1RCTTPGProvider
-// 
-/**\class L1RCTTPGProvider L1RCTTPGProvider.cc L1Trigger/L1RCTTPGProvider/src/L1RCTTPGProvider.cc
+//
+/**\class L1RCTTPGProvider L1RCTTPGProvider.cc
+ L1Trigger/L1RCTTPGProvider/src/L1RCTTPGProvider.cc
 
  Description: <one line class summary>
 
@@ -16,40 +17,37 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-
 //
 // class decleration
 //
 
 class L1RCTTPGProvider : public edm::EDProducer {
-   public:
-      explicit L1RCTTPGProvider(const edm::ParameterSet&);
-      ~L1RCTTPGProvider() override;
-
-   private:
-      void produce(edm::Event&, const edm::EventSetup&) override;
-      void endJob() override ;
-      
-      // ----------member data ---------------------------
-      edm::InputTag ecalTPG_;
-      edm::InputTag hcalTPG_;
-      bool useHcalCosmicTiming;
-      bool useEcalCosmicTiming;
-      int preSamples;
-      int postSamples;
-      int hfShift;
-      int hbShift;
-
+public:
+  explicit L1RCTTPGProvider(const edm::ParameterSet &);
+  ~L1RCTTPGProvider() override;
+
+private:
+  void produce(edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
+
+  // ----------member data ---------------------------
+  edm::InputTag ecalTPG_;
+  edm::InputTag hcalTPG_;
+  bool useHcalCosmicTiming;
+  bool useEcalCosmicTiming;
+  int preSamples;
+  int postSamples;
+  int hfShift;
+  int hbShift;
 };
diff --git a/L1Trigger/RegionalCaloTrigger/interface/L1RCTTestAnalyzer.h b/L1Trigger/RegionalCaloTrigger/interface/L1RCTTestAnalyzer.h
index 886ad22d12387..8b7255ab5a69e 100644
--- a/L1Trigger/RegionalCaloTrigger/interface/L1RCTTestAnalyzer.h
+++ b/L1Trigger/RegionalCaloTrigger/interface/L1RCTTestAnalyzer.h
@@ -3,7 +3,8 @@
 // Package:    L1RCTTestAnalyzer
 // Class:      L1RCTTestAnalyzer
 //
-/**\class L1RCTTestAnalyzer L1RCTTestAnalyzer.cc src/L1RCTTestAnalyzer/src/L1RCTTestAnalyzer.cc
+/**\class L1RCTTestAnalyzer L1RCTTestAnalyzer.cc
+ src/L1RCTTestAnalyzer/src/L1RCTTestAnalyzer.cc
 
  Description: <one line class summary>
 
@@ -16,51 +17,49 @@
 //
 //
 
-
 // system include files
-#include <memory>
 #include <iostream>
+#include <memory>
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
+#include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
 
 #include "TH1F.h"
 #include "TH2F.h"
 #include "TTree.h"
 
-
 // // outside of class
 // bool compareEmCands(const L1CaloEmCand& cand1, const L1CaloEmCand& cand2)
 // {
 //   return (cand1.rank() < cand2.rank());
 // }
 
-
 //
 // class declaration
 //
 
 class L1RCTTestAnalyzer : public edm::EDAnalyzer {
 public:
-  explicit L1RCTTestAnalyzer(const edm::ParameterSet&);
+  explicit L1RCTTestAnalyzer(const edm::ParameterSet &);
   ~L1RCTTestAnalyzer() override;
-  
-  
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+
 private:
-  static bool compareEmCands(const L1CaloEmCand& cand1, const L1CaloEmCand& cand2);
+  static bool compareEmCands(const L1CaloEmCand &cand1,
+                             const L1CaloEmCand &cand2);
 
   // ----------member data ---------------------------
   std::string m_HepMCProduct;
@@ -70,41 +69,40 @@ class L1RCTTestAnalyzer : public edm::EDAnalyzer {
   edm::InputTag hcalDigisLabel;
   edm::InputTag rctDigisLabel;
 
-  TTree * emTree;
-//   float emRank[8];
-//   float emIeta[8];
-//   float emIphi[8];
-//   float emIso[8];
+  TTree *emTree;
+  //   float emRank[8];
+  //   float emIeta[8];
+  //   float emIphi[8];
+  //   float emIso[8];
   std::vector<int> emRank;
   std::vector<int> emIeta;
   std::vector<int> emIphi;
   std::vector<int> emIso;
 
-  TH1F * h_emRank;
-  TH1F * h_emRankOutOfTime;
-  TH1F * h_emIeta;
-  TH1F * h_emIphi;
-  TH1F * h_emIso;
-  TH2F * h_emRankInIetaIphi;
+  TH1F *h_emRank;
+  TH1F *h_emRankOutOfTime;
+  TH1F *h_emIeta;
+  TH1F *h_emIphi;
+  TH1F *h_emIso;
+  TH2F *h_emRankInIetaIphi;
   // add isolated/non-iso?
-  TH2F * h_emIsoInIetaIphi;
-  TH2F * h_emNonIsoInIetaIphi;
-  TH1F * h_emCandTimeSample;
-
-  TH1F * h_regionSum;
-  TH1F * h_regionIeta;
-  TH1F * h_regionIphi;
-  TH1F * h_regionMip;
-  TH2F * h_regionSumInIetaIphi;
-  // add bits in ieta/iphi?  tau, overflow, mip, quiet, finegrain? 
+  TH2F *h_emIsoInIetaIphi;
+  TH2F *h_emNonIsoInIetaIphi;
+  TH1F *h_emCandTimeSample;
+
+  TH1F *h_regionSum;
+  TH1F *h_regionIeta;
+  TH1F *h_regionIphi;
+  TH1F *h_regionMip;
+  TH2F *h_regionSumInIetaIphi;
+  // add bits in ieta/iphi?  tau, overflow, mip, quiet, finegrain?
   // (is fine grain same thing as mip??)
-  TH2F * h_regionFGInIetaIphi;
-
-  TH1F * h_towerMip;
+  TH2F *h_regionFGInIetaIphi;
 
-  TH1F * h_ecalTimeSample;
-  TH1F * h_hcalTimeSample;
+  TH1F *h_towerMip;
 
+  TH1F *h_ecalTimeSample;
+  TH1F *h_hcalTimeSample;
 };
 
 //
diff --git a/L1Trigger/RegionalCaloTrigger/interface/MaskedRctInputDigiProducer.h b/L1Trigger/RegionalCaloTrigger/interface/MaskedRctInputDigiProducer.h
index f5739ea39b5f6..d928488def585 100644
--- a/L1Trigger/RegionalCaloTrigger/interface/MaskedRctInputDigiProducer.h
+++ b/L1Trigger/RegionalCaloTrigger/interface/MaskedRctInputDigiProducer.h
@@ -5,12 +5,13 @@
 //
 // Package:    MaskedRctInputDigiProducer
 // Class:      MaskedRctInputDigiProducer
-// 
-/**\class MaskedRctInputDigiProducer MaskedRctInputDigiProducer.cc L1Trigger/MaskedRctInputDigiProducer/src/MaskedRctInputDigiProducer.cc
+//
+/**\class MaskedRctInputDigiProducer MaskedRctInputDigiProducer.cc
+L1Trigger/MaskedRctInputDigiProducer/src/MaskedRctInputDigiProducer.cc
 
- Description: Takes collections of ECAL and HCAL digis, masks some towers 
+ Description: Takes collections of ECAL and HCAL digis, masks some towers
 according to a mask in a text file, and creates new collections for use by the
-RCT.  
+RCT.
 
  Implementation:
      <Notes on implementation>
@@ -21,16 +22,15 @@ RCT.
 //
 //
 
-
 // system include files
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDProducer.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -44,14 +44,14 @@ RCT.
 
 class MaskedRctInputDigiProducer : public edm::EDProducer {
 public:
-  explicit MaskedRctInputDigiProducer(const edm::ParameterSet&);
+  explicit MaskedRctInputDigiProducer(const edm::ParameterSet &);
   ~MaskedRctInputDigiProducer() override;
-  
+
 private:
-  void produce(edm::Event&, const edm::EventSetup&) override;
-  void endJob() override ;
-  
-      // ----------member data ---------------------------
+  void produce(edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
+
+  // ----------member data ---------------------------
 
   bool useEcal_;
   bool useHcal_;
diff --git a/L1Trigger/RegionalCaloTrigger/plugins/L1RCTInputProducer.cc b/L1Trigger/RegionalCaloTrigger/plugins/L1RCTInputProducer.cc
index c47c0ce80716a..1da2a90e43ed2 100644
--- a/L1Trigger/RegionalCaloTrigger/plugins/L1RCTInputProducer.cc
+++ b/L1Trigger/RegionalCaloTrigger/plugins/L1RCTInputProducer.cc
@@ -1,24 +1,24 @@
-#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTInputProducer.h" 
+#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTInputProducer.h"
 
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 
-#include "CondFormats/L1TObjects/interface/L1CaloHcalScale.h"
+#include "CondFormats/DataRecord/interface/L1CaloEcalScaleRcd.h"
 #include "CondFormats/DataRecord/interface/L1CaloHcalScaleRcd.h"
 #include "CondFormats/L1TObjects/interface/L1CaloEcalScale.h"
-#include "CondFormats/DataRecord/interface/L1CaloEcalScaleRcd.h"
+#include "CondFormats/L1TObjects/interface/L1CaloHcalScale.h"
 
-#include "CondFormats/L1TObjects/interface/L1CaloEtScale.h"
 #include "CondFormats/DataRecord/interface/L1EmEtScaleRcd.h"
+#include "CondFormats/L1TObjects/interface/L1CaloEtScale.h"
 
-#include "CondFormats/L1TObjects/interface/L1RCTParameters.h"
 #include "CondFormats/DataRecord/interface/L1RCTParametersRcd.h"
+#include "CondFormats/L1TObjects/interface/L1RCTParameters.h"
 
-#include "CondFormats/L1TObjects/interface/L1RCTChannelMask.h"
 #include "CondFormats/DataRecord/interface/L1RCTChannelMaskRcd.h"
+#include "CondFormats/L1TObjects/interface/L1RCTChannelMask.h"
 
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCT.h"
-#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h" 
+#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h"
 
 #include <vector>
 using std::vector;
@@ -27,38 +27,35 @@ using std::vector;
 using std::cout;
 using std::endl;
 
-L1RCTInputProducer::L1RCTInputProducer(const edm::ParameterSet& conf) : 
-  rctLookupTables(new L1RCTLookupTables),
-  rct(new L1RCT(rctLookupTables)),
-  useEcal(conf.getParameter<bool>("useEcal")),
-  useHcal(conf.getParameter<bool>("useHcal")),
-  ecalDigisLabel(conf.getParameter<edm::InputTag>("ecalDigisLabel")),
-  hcalDigisLabel(conf.getParameter<edm::InputTag>("hcalDigisLabel"))
-{
-  produces<std::vector<unsigned short> >("rctCrate");
-  produces<std::vector<unsigned short> >("rctCard");
-  produces<std::vector<unsigned short> >("rctTower");
-  produces<std::vector<unsigned int> >("rctEGammaET");
-  produces<std::vector<bool> >("rctHoEFGVetoBit");
-  produces<std::vector<unsigned int> >("rctJetMETET");
-  produces<std::vector<bool> >("rctTowerActivityBit");
-  produces<std::vector<bool> >("rctTowerMIPBit");
-  produces<std::vector<unsigned short> >("rctHFCrate");
-  produces<std::vector<unsigned short> >("rctHFRegion");
-  produces<std::vector<unsigned int> >("rctHFET");
-  produces<std::vector<bool> >("rctHFFG");
+L1RCTInputProducer::L1RCTInputProducer(const edm::ParameterSet &conf)
+    : rctLookupTables(new L1RCTLookupTables), rct(new L1RCT(rctLookupTables)),
+      useEcal(conf.getParameter<bool>("useEcal")),
+      useHcal(conf.getParameter<bool>("useHcal")),
+      ecalDigisLabel(conf.getParameter<edm::InputTag>("ecalDigisLabel")),
+      hcalDigisLabel(conf.getParameter<edm::InputTag>("hcalDigisLabel")) {
+  produces<std::vector<unsigned short>>("rctCrate");
+  produces<std::vector<unsigned short>>("rctCard");
+  produces<std::vector<unsigned short>>("rctTower");
+  produces<std::vector<unsigned int>>("rctEGammaET");
+  produces<std::vector<bool>>("rctHoEFGVetoBit");
+  produces<std::vector<unsigned int>>("rctJetMETET");
+  produces<std::vector<bool>>("rctTowerActivityBit");
+  produces<std::vector<bool>>("rctTowerMIPBit");
+  produces<std::vector<unsigned short>>("rctHFCrate");
+  produces<std::vector<unsigned short>>("rctHFRegion");
+  produces<std::vector<unsigned int>>("rctHFET");
+  produces<std::vector<bool>>("rctHFFG");
 }
 
-L1RCTInputProducer::~L1RCTInputProducer()
-{
-  if(rct != nullptr) delete rct;
-  if(rctLookupTables != nullptr) delete rctLookupTables;
+L1RCTInputProducer::~L1RCTInputProducer() {
+  if (rct != nullptr)
+    delete rct;
+  if (rctLookupTables != nullptr)
+    delete rctLookupTables;
 }
 
-
-
-void L1RCTInputProducer::produce(edm::Event& event, const edm::EventSetup& eventSetup)
-{
+void L1RCTInputProducer::produce(edm::Event &event,
+                                 const edm::EventSetup &eventSetup) {
 
   // Refresh configuration information every event
   // Hopefully, this does not take too much time
@@ -67,19 +64,19 @@ void L1RCTInputProducer::produce(edm::Event& event, const edm::EventSetup& event
 
   edm::ESHandle<L1RCTParameters> rctParameters;
   eventSetup.get<L1RCTParametersRcd>().get(rctParameters);
-  const L1RCTParameters* r = rctParameters.product();
+  const L1RCTParameters *r = rctParameters.product();
   edm::ESHandle<L1RCTChannelMask> channelMask;
   eventSetup.get<L1RCTChannelMaskRcd>().get(channelMask);
-  const L1RCTChannelMask* c = channelMask.product();
+  const L1RCTChannelMask *c = channelMask.product();
   edm::ESHandle<L1CaloEcalScale> ecalScale;
   eventSetup.get<L1CaloEcalScaleRcd>().get(ecalScale);
-  const L1CaloEcalScale* e = ecalScale.product();
+  const L1CaloEcalScale *e = ecalScale.product();
   edm::ESHandle<L1CaloHcalScale> hcalScale;
   eventSetup.get<L1CaloHcalScaleRcd>().get(hcalScale);
-  const L1CaloHcalScale* h = hcalScale.product();
+  const L1CaloHcalScale *h = hcalScale.product();
   edm::ESHandle<L1CaloEtScale> emScale;
   eventSetup.get<L1EmEtScaleRcd>().get(emScale);
-  const L1CaloEtScale* s = emScale.product();
+  const L1CaloEtScale *s = emScale.product();
 
   rctLookupTables->setRCTParameters(r);
   rctLookupTables->setChannelMask(c);
@@ -89,85 +86,94 @@ void L1RCTInputProducer::produce(edm::Event& event, const edm::EventSetup& event
 
   edm::Handle<EcalTrigPrimDigiCollection> ecal;
   edm::Handle<HcalTrigPrimDigiCollection> hcal;
-  
-  if (useEcal) { event.getByLabel(ecalDigisLabel, ecal); }
-  if (useHcal) { event.getByLabel(hcalDigisLabel, hcal); }
+
+  if (useEcal) {
+    event.getByLabel(ecalDigisLabel, ecal);
+  }
+  if (useHcal) {
+    event.getByLabel(hcalDigisLabel, hcal);
+  }
 
   EcalTrigPrimDigiCollection ecalColl;
   HcalTrigPrimDigiCollection hcalColl;
-  if (ecal.isValid()) { ecalColl = *ecal; }
-  if (hcal.isValid()) { hcalColl = *hcal; }
+  if (ecal.isValid()) {
+    ecalColl = *ecal;
+  }
+  if (hcal.isValid()) {
+    hcalColl = *hcal;
+  }
 
   rct->digiInput(ecalColl, hcalColl);
 
   // Stuff to create
 
-  std::unique_ptr<std::vector<unsigned short> > 
-    rctCrate(new std::vector<unsigned short>);
-  std::unique_ptr<std::vector<unsigned short> > 
-    rctCard(new std::vector<unsigned short>);
-  std::unique_ptr<std::vector<unsigned short> > 
-    rctTower(new std::vector<unsigned short>);
-  std::unique_ptr<std::vector<unsigned int> > 
-    rctEGammaET(new std::vector<unsigned int>);
-  std::unique_ptr<std::vector<bool> > rctHoEFGVetoBit(new std::vector<bool>);
-  std::unique_ptr<std::vector<unsigned int> > 
-    rctJetMETET(new std::vector<unsigned int>);
-  std::unique_ptr<std::vector<bool> > rctTowerActivityBit(new std::vector<bool>);
-  std::unique_ptr<std::vector<bool> > rctTowerMIPBit(new std::vector<bool>);
-  
-  for(int crate = 0; crate < 18; crate++) {
-    for(int card = 0; card < 7; card++) {
-      for(int tower = 0; tower < 32; tower++) {
-	unsigned short ecalCompressedET = 
-	  rct->ecalCompressedET(crate, card, tower);
-	unsigned short ecalFineGrainBit = 
-	  rct->ecalFineGrainBit(crate, card, tower);
-	unsigned short hcalCompressedET = 
-	  rct->hcalCompressedET(crate, card, tower);
-	unsigned int lutBits = 
-	  rctLookupTables->lookup(ecalCompressedET, hcalCompressedET, 
-				  ecalFineGrainBit, crate, card, tower);
-	unsigned int eGammaETCode = lutBits & 0x0000007F;
-	bool hOeFGVetoBit = (lutBits >> 7) & 0x00000001;
-	unsigned int jetMETETCode = (lutBits >> 8) & 0x000001FF;
-	bool activityBit = (lutBits >> 17) & 0x00000001;
-	if(eGammaETCode > 0 || jetMETETCode > 0 || 
-	   hOeFGVetoBit || activityBit) {
-	  rctCrate->push_back(crate);
-	  rctCard->push_back(card);
-	  rctTower->push_back(tower);
-	  rctEGammaET->push_back(eGammaETCode);
-	  rctHoEFGVetoBit->push_back(hOeFGVetoBit);
-	  rctJetMETET->push_back(jetMETETCode);
-	  rctTowerActivityBit->push_back(activityBit);
-	  rctTowerMIPBit->push_back(false); // FIXME: MIP bit is not yet defined
-	}
+  std::unique_ptr<std::vector<unsigned short>> rctCrate(
+      new std::vector<unsigned short>);
+  std::unique_ptr<std::vector<unsigned short>> rctCard(
+      new std::vector<unsigned short>);
+  std::unique_ptr<std::vector<unsigned short>> rctTower(
+      new std::vector<unsigned short>);
+  std::unique_ptr<std::vector<unsigned int>> rctEGammaET(
+      new std::vector<unsigned int>);
+  std::unique_ptr<std::vector<bool>> rctHoEFGVetoBit(new std::vector<bool>);
+  std::unique_ptr<std::vector<unsigned int>> rctJetMETET(
+      new std::vector<unsigned int>);
+  std::unique_ptr<std::vector<bool>> rctTowerActivityBit(new std::vector<bool>);
+  std::unique_ptr<std::vector<bool>> rctTowerMIPBit(new std::vector<bool>);
+
+  for (int crate = 0; crate < 18; crate++) {
+    for (int card = 0; card < 7; card++) {
+      for (int tower = 0; tower < 32; tower++) {
+        unsigned short ecalCompressedET =
+            rct->ecalCompressedET(crate, card, tower);
+        unsigned short ecalFineGrainBit =
+            rct->ecalFineGrainBit(crate, card, tower);
+        unsigned short hcalCompressedET =
+            rct->hcalCompressedET(crate, card, tower);
+        unsigned int lutBits =
+            rctLookupTables->lookup(ecalCompressedET, hcalCompressedET,
+                                    ecalFineGrainBit, crate, card, tower);
+        unsigned int eGammaETCode = lutBits & 0x0000007F;
+        bool hOeFGVetoBit = (lutBits >> 7) & 0x00000001;
+        unsigned int jetMETETCode = (lutBits >> 8) & 0x000001FF;
+        bool activityBit = (lutBits >> 17) & 0x00000001;
+        if (eGammaETCode > 0 || jetMETETCode > 0 || hOeFGVetoBit ||
+            activityBit) {
+          rctCrate->push_back(crate);
+          rctCard->push_back(card);
+          rctTower->push_back(tower);
+          rctEGammaET->push_back(eGammaETCode);
+          rctHoEFGVetoBit->push_back(hOeFGVetoBit);
+          rctJetMETET->push_back(jetMETETCode);
+          rctTowerActivityBit->push_back(activityBit);
+          rctTowerMIPBit->push_back(false); // FIXME: MIP bit is not yet defined
+        }
       }
     }
   }
 
-  std::unique_ptr<std::vector<unsigned short> > 
-    rctHFCrate(new std::vector<unsigned short>);
-  std::unique_ptr<std::vector<unsigned short> > 
-    rctHFRegion(new std::vector<unsigned short>);
-  std::unique_ptr<std::vector<unsigned int> > rctHFET(new std::vector<unsigned int>);
-  std::unique_ptr<std::vector<bool> > rctHFFG(new std::vector<bool>);
-  for(int crate = 0; crate < 18; crate++) {
-    for(int hfRegion = 0; hfRegion < 8; hfRegion++) {
+  std::unique_ptr<std::vector<unsigned short>> rctHFCrate(
+      new std::vector<unsigned short>);
+  std::unique_ptr<std::vector<unsigned short>> rctHFRegion(
+      new std::vector<unsigned short>);
+  std::unique_ptr<std::vector<unsigned int>> rctHFET(
+      new std::vector<unsigned int>);
+  std::unique_ptr<std::vector<bool>> rctHFFG(new std::vector<bool>);
+  for (int crate = 0; crate < 18; crate++) {
+    for (int hfRegion = 0; hfRegion < 8; hfRegion++) {
       unsigned short hfCompressedET = rct->hfCompressedET(crate, hfRegion);
-      unsigned int hfETCode = 
-	rctLookupTables->lookup(hfCompressedET, crate, 999, hfRegion);
-      if(hfETCode > 0) {
-	rctHFCrate->push_back(crate);
-	rctHFRegion->push_back(hfRegion);
-	rctHFET->push_back(hfETCode);
-	rctHFFG->push_back(false); // FIXME: HF FG is not yet defined
+      unsigned int hfETCode =
+          rctLookupTables->lookup(hfCompressedET, crate, 999, hfRegion);
+      if (hfETCode > 0) {
+        rctHFCrate->push_back(crate);
+        rctHFRegion->push_back(hfRegion);
+        rctHFET->push_back(hfETCode);
+        rctHFFG->push_back(false); // FIXME: HF FG is not yet defined
       }
     }
   }
 
-  //putting stuff back into event
+  // putting stuff back into event
   event.put(std::move(rctCrate), "rctCrate");
   event.put(std::move(rctCard), "rctCard");
   event.put(std::move(rctTower), "rctTower");
@@ -180,5 +186,4 @@ void L1RCTInputProducer::produce(edm::Event& event, const edm::EventSetup& event
   event.put(std::move(rctHFRegion), "rctHFRegion");
   event.put(std::move(rctHFET), "rctHFET");
   event.put(std::move(rctHFFG), "rctHFFG");
-
 }
diff --git a/L1Trigger/RegionalCaloTrigger/plugins/L1RCTLutWriter.cc b/L1Trigger/RegionalCaloTrigger/plugins/L1RCTLutWriter.cc
index 44082edcc3136..64543ad2669c1 100644
--- a/L1Trigger/RegionalCaloTrigger/plugins/L1RCTLutWriter.cc
+++ b/L1Trigger/RegionalCaloTrigger/plugins/L1RCTLutWriter.cc
@@ -2,23 +2,23 @@
 
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h"
 
-#include "CondFormats/L1TObjects/interface/L1RCTParameters.h"
+#include "CondFormats/DataRecord/interface/L1RCTChannelMaskRcd.h"
+#include "CondFormats/DataRecord/interface/L1RCTNoisyChannelMaskRcd.h"
 #include "CondFormats/DataRecord/interface/L1RCTParametersRcd.h"
 #include "CondFormats/L1TObjects/interface/L1RCTChannelMask.h"
-#include "CondFormats/DataRecord/interface/L1RCTChannelMaskRcd.h"
 #include "CondFormats/L1TObjects/interface/L1RCTNoisyChannelMask.h"
-#include "CondFormats/DataRecord/interface/L1RCTNoisyChannelMaskRcd.h"
+#include "CondFormats/L1TObjects/interface/L1RCTParameters.h"
 
 // default scales
 #include "CondFormats/DataRecord/interface/L1CaloEcalScaleRcd.h"
-#include "CondFormats/L1TObjects/interface/L1CaloEcalScale.h"
 #include "CondFormats/DataRecord/interface/L1CaloHcalScaleRcd.h"
+#include "CondFormats/L1TObjects/interface/L1CaloEcalScale.h"
 #include "CondFormats/L1TObjects/interface/L1CaloHcalScale.h"
 
 // debug scales
 #include "CalibCalorimetry/EcalTPGTools/interface/EcalTPGScale.h"
-#include "CalibFormats/CaloTPG/interface/CaloTPGTranscoder.h"
 #include "CalibFormats/CaloTPG/interface/CaloTPGRecord.h"
+#include "CalibFormats/CaloTPG/interface/CaloTPGTranscoder.h"
 
 #include "CondFormats/DataRecord/interface/L1EmEtScaleRcd.h"
 #include "CondFormats/L1TObjects/interface/L1CaloEtScale.h"
@@ -34,243 +34,207 @@
 //
 // constructors and destructor
 //
-L1RCTLutWriter::L1RCTLutWriter(const edm::ParameterSet& iConfig) :
-  lookupTable_(new L1RCTLookupTables),
-  keyName_(iConfig.getParameter<std::string>("key")),
-  useDebugTpgScales_(iConfig.getParameter<bool>("useDebugTpgScales"))
-{
-   //now do what ever initialization is needed
- 
+L1RCTLutWriter::L1RCTLutWriter(const edm::ParameterSet &iConfig)
+    : lookupTable_(new L1RCTLookupTables),
+      keyName_(iConfig.getParameter<std::string>("key")),
+      useDebugTpgScales_(iConfig.getParameter<bool>("useDebugTpgScales")) {
+  // now do what ever initialization is needed
 }
 
+L1RCTLutWriter::~L1RCTLutWriter() {
 
-L1RCTLutWriter::~L1RCTLutWriter()
-{
- 
-   // do anything here that needs to be done at destruction time
-   // (e.g. close files, deallocate resources etc.)
-  
-  if (lookupTable_ != nullptr) delete lookupTable_;
-}
+  // do anything here that needs to be done at destruction time
+  // (e.g. close files, deallocate resources etc.)
 
+  if (lookupTable_ != nullptr)
+    delete lookupTable_;
+}
 
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-L1RCTLutWriter::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   
-   // get all the configuration information from the event, set it
-   // in the lookuptable
-   edm::ESHandle<L1RCTParameters> rctParameters;
-   iSetup.get<L1RCTParametersRcd>().get(rctParameters);
-   rctParameters_ = rctParameters.product();
-   edm::ESHandle<L1CaloEtScale> emScale;
-   iSetup.get<L1EmEtScaleRcd>().get(emScale);
-   const L1CaloEtScale* s = emScale.product();
-
-   // make dummy channel mask -- we don't want to mask
-   // any channels when writing LUTs, that comes afterwards
-   L1RCTChannelMask* m = new L1RCTChannelMask;
-   for (int i = 0; i < 18; i++)
-     {
-       for (int j = 0; j < 2; j++)
-	 {
-	   for (int k = 0; k < 28; k++)
-	     {
-	       m->ecalMask[i][j][k] = false;
-	       m->hcalMask[i][j][k] = false;
-	     }
-	   for (int k = 0; k < 4; k++)
-	     {
-	       m->hfMask[i][j][k] = false;
-	     }
-	 }
-     }
-
-
-   //Same for Noisy mask
-   // make dummy channel mask -- we don't want to mask
-   // any channels when writing LUTs, that comes afterwards
-   L1RCTNoisyChannelMask* m2 = new L1RCTNoisyChannelMask;
-   for (int i = 0; i < 18; i++)
-     {
-       for (int j = 0; j < 2; j++)
-	 {
-	   for (int k = 0; k < 28; k++)
-	     {
-	       m2->ecalMask[i][j][k] = false;
-	       m2->hcalMask[i][j][k] = false;
-	     }
-	   for (int k = 0; k < 4; k++)
-	     {
-	       m2->hfMask[i][j][k] = false;
-	     }
-	 }
-     }
-   m2->ecalThreshold = 0.0;
-   m2->hcalThreshold = 0.0;
-   m2->hfThreshold = 0.0;
-
-
-   
+void L1RCTLutWriter::analyze(const edm::Event &iEvent,
+                             const edm::EventSetup &iSetup) {
+
+  // get all the configuration information from the event, set it
+  // in the lookuptable
+  edm::ESHandle<L1RCTParameters> rctParameters;
+  iSetup.get<L1RCTParametersRcd>().get(rctParameters);
+  rctParameters_ = rctParameters.product();
+  edm::ESHandle<L1CaloEtScale> emScale;
+  iSetup.get<L1EmEtScaleRcd>().get(emScale);
+  const L1CaloEtScale *s = emScale.product();
+
+  // make dummy channel mask -- we don't want to mask
+  // any channels when writing LUTs, that comes afterwards
+  L1RCTChannelMask *m = new L1RCTChannelMask;
+  for (int i = 0; i < 18; i++) {
+    for (int j = 0; j < 2; j++) {
+      for (int k = 0; k < 28; k++) {
+        m->ecalMask[i][j][k] = false;
+        m->hcalMask[i][j][k] = false;
+      }
+      for (int k = 0; k < 4; k++) {
+        m->hfMask[i][j][k] = false;
+      }
+    }
+  }
+
+  // Same for Noisy mask
+  // make dummy channel mask -- we don't want to mask
+  // any channels when writing LUTs, that comes afterwards
+  L1RCTNoisyChannelMask *m2 = new L1RCTNoisyChannelMask;
+  for (int i = 0; i < 18; i++) {
+    for (int j = 0; j < 2; j++) {
+      for (int k = 0; k < 28; k++) {
+        m2->ecalMask[i][j][k] = false;
+        m2->hcalMask[i][j][k] = false;
+      }
+      for (int k = 0; k < 4; k++) {
+        m2->hfMask[i][j][k] = false;
+      }
+    }
+  }
+  m2->ecalThreshold = 0.0;
+  m2->hcalThreshold = 0.0;
+  m2->hfThreshold = 0.0;
+
   // use these dummies to get the delete right when using old-style
   // scales to create set of L1CaloXcalScales
-  L1CaloEcalScale* dummyE(nullptr);
-  L1CaloHcalScale* dummyH(nullptr);
+  L1CaloEcalScale *dummyE(nullptr);
+  L1CaloHcalScale *dummyH(nullptr);
 
   if (useDebugTpgScales_) // generate new-style scales from tpg scales
-    {
-
-      std::cout << "Using old-style TPG scales!" << std::endl;
-
-      // old version of hcal energy scale to convert input
-      edm::ESHandle<CaloTPGTranscoder> transcoder;
-      iSetup.get<CaloTPGRecord>().get(transcoder);
-      const CaloTPGTranscoder* h_tpg = transcoder.product();
-
-      // old version of ecal energy scale to convert input
-      EcalTPGScale* e_tpg = new EcalTPGScale();
-      e_tpg->setEventSetup(iSetup);
-
-      L1CaloEcalScale* ecalScale = new L1CaloEcalScale();
-      L1CaloHcalScale* hcalScale = new L1CaloHcalScale();
-
-      // generate L1CaloXcalScales from old-style scales (thanks, werner!)
-
-      // ECAL
-      for( unsigned short ieta = 1 ; ieta <= L1CaloEcalScale::nBinEta; ++ieta )
-	{
-	  for( unsigned short irank = 0 ; irank < L1CaloEcalScale::nBinRank; ++irank )
-	    {
-	      EcalSubdetector subdet = ( ieta <= 17 ) ? EcalBarrel : EcalEndcap ;
-	      double etGeVPos =
-		e_tpg->getTPGInGeV
-		( irank, EcalTrigTowerDetId(1, // +ve eta
-					    subdet,
-					    ieta,
-					    1 )); // dummy phi value
-	      ecalScale->setBin( irank, ieta, 1, etGeVPos ) ;
-	    }
-	}
-      
-      for( unsigned short ieta = 1 ; ieta <= L1CaloEcalScale::nBinEta; ++ieta )
-	{
-	  for( unsigned short irank = 0 ; irank < L1CaloEcalScale::nBinRank; ++irank )
-	    {
-	      EcalSubdetector subdet = ( ieta <= 17 ) ? EcalBarrel : EcalEndcap ;
-	      
-	      double etGeVNeg =
-		e_tpg->getTPGInGeV
-		( irank,
-		  EcalTrigTowerDetId(-1, // -ve eta
-				     subdet,
-				     ieta,
-				     2 )); // dummy phi value
-	      ecalScale->setBin( irank, ieta, -1, etGeVNeg ) ;
-	    }
-	}
-
-      // HCAL
-      for( unsigned short ieta = 1 ; ieta <= L1CaloHcalScale::nBinEta; ++ieta )
-	{
-	  for( unsigned short irank = 0 ; irank < L1CaloHcalScale::nBinRank; ++irank )
-	    {
-	      double etGeV = h_tpg->hcaletValue( ieta, irank ) ;
-
-	      hcalScale->setBin( irank, ieta, 1, etGeV ) ;
-	      hcalScale->setBin( irank, ieta, -1, etGeV ) ;
-	    }
-	}
-
-      // set the input scales
-      lookupTable_->setEcalScale(ecalScale);
-      lookupTable_->setHcalScale(hcalScale);
-
-      dummyE = ecalScale;
-      dummyH = hcalScale;
-
-      delete e_tpg;
-
+  {
+
+    std::cout << "Using old-style TPG scales!" << std::endl;
+
+    // old version of hcal energy scale to convert input
+    edm::ESHandle<CaloTPGTranscoder> transcoder;
+    iSetup.get<CaloTPGRecord>().get(transcoder);
+    const CaloTPGTranscoder *h_tpg = transcoder.product();
+
+    // old version of ecal energy scale to convert input
+    EcalTPGScale *e_tpg = new EcalTPGScale();
+    e_tpg->setEventSetup(iSetup);
+
+    L1CaloEcalScale *ecalScale = new L1CaloEcalScale();
+    L1CaloHcalScale *hcalScale = new L1CaloHcalScale();
+
+    // generate L1CaloXcalScales from old-style scales (thanks, werner!)
+
+    // ECAL
+    for (unsigned short ieta = 1; ieta <= L1CaloEcalScale::nBinEta; ++ieta) {
+      for (unsigned short irank = 0; irank < L1CaloEcalScale::nBinRank;
+           ++irank) {
+        EcalSubdetector subdet = (ieta <= 17) ? EcalBarrel : EcalEndcap;
+        double etGeVPos =
+            e_tpg->getTPGInGeV(irank, EcalTrigTowerDetId(1, // +ve eta
+                                                         subdet, ieta,
+                                                         1)); // dummy phi value
+        ecalScale->setBin(irank, ieta, 1, etGeVPos);
+      }
     }
-  else
-    {
-
-      // get energy scale to convert input from ECAL
-      edm::ESHandle<L1CaloEcalScale> ecalScale;
-      iSetup.get<L1CaloEcalScaleRcd>().get(ecalScale);
-      const L1CaloEcalScale* e = ecalScale.product();
-      
-      // get energy scale to convert input from HCAL
-      edm::ESHandle<L1CaloHcalScale> hcalScale;
-      iSetup.get<L1CaloHcalScaleRcd>().get(hcalScale);
-      const L1CaloHcalScale* h = hcalScale.product();
-
-      // set scales
-      lookupTable_->setEcalScale(e);
-      lookupTable_->setHcalScale(h);
 
+    for (unsigned short ieta = 1; ieta <= L1CaloEcalScale::nBinEta; ++ieta) {
+      for (unsigned short irank = 0; irank < L1CaloEcalScale::nBinRank;
+           ++irank) {
+        EcalSubdetector subdet = (ieta <= 17) ? EcalBarrel : EcalEndcap;
+
+        double etGeVNeg =
+            e_tpg->getTPGInGeV(irank,
+                               EcalTrigTowerDetId(-1, // -ve eta
+                                                  subdet, ieta,
+                                                  2)); // dummy phi value
+        ecalScale->setBin(irank, ieta, -1, etGeVNeg);
+      }
     }
 
-   lookupTable_->setRCTParameters(rctParameters_);
-   lookupTable_->setChannelMask(m);
-   lookupTable_->setNoisyChannelMask(m2);
-   //lookupTable_->setHcalScale(h);
-   //lookupTable_->setEcalScale(e);
-   lookupTable_->setL1CaloEtScale(s);
-
-   for (unsigned short nCard = 0; nCard <= 6; nCard = nCard + 2)
-     {
-       writeRcLutFile(nCard);
-       writeEicLutFile(nCard);
-     }
-   writeJscLutFile();
-
-   unsigned int eicThreshold = rctParameters_->eicIsolationThreshold();
-   unsigned int jscThresholdBarrel = rctParameters_->jscQuietThresholdBarrel();
-   unsigned int jscThresholdEndcap = rctParameters_->jscQuietThresholdEndcap();
-   writeThresholdsFile(eicThreshold, jscThresholdBarrel, jscThresholdEndcap);
-
-  if (dummyE != nullptr) delete dummyE;
-  if (dummyH != nullptr) delete dummyH;
-
-}
-
-
+    // HCAL
+    for (unsigned short ieta = 1; ieta <= L1CaloHcalScale::nBinEta; ++ieta) {
+      for (unsigned short irank = 0; irank < L1CaloHcalScale::nBinRank;
+           ++irank) {
+        double etGeV = h_tpg->hcaletValue(ieta, irank);
 
+        hcalScale->setBin(irank, ieta, 1, etGeV);
+        hcalScale->setBin(irank, ieta, -1, etGeV);
+      }
+    }
 
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-L1RCTLutWriter::endJob() {
+    // set the input scales
+    lookupTable_->setEcalScale(ecalScale);
+    lookupTable_->setHcalScale(hcalScale);
+
+    dummyE = ecalScale;
+    dummyH = hcalScale;
+
+    delete e_tpg;
+
+  } else {
+
+    // get energy scale to convert input from ECAL
+    edm::ESHandle<L1CaloEcalScale> ecalScale;
+    iSetup.get<L1CaloEcalScaleRcd>().get(ecalScale);
+    const L1CaloEcalScale *e = ecalScale.product();
+
+    // get energy scale to convert input from HCAL
+    edm::ESHandle<L1CaloHcalScale> hcalScale;
+    iSetup.get<L1CaloHcalScaleRcd>().get(hcalScale);
+    const L1CaloHcalScale *h = hcalScale.product();
+
+    // set scales
+    lookupTable_->setEcalScale(e);
+    lookupTable_->setHcalScale(h);
+  }
+
+  lookupTable_->setRCTParameters(rctParameters_);
+  lookupTable_->setChannelMask(m);
+  lookupTable_->setNoisyChannelMask(m2);
+  // lookupTable_->setHcalScale(h);
+  // lookupTable_->setEcalScale(e);
+  lookupTable_->setL1CaloEtScale(s);
+
+  for (unsigned short nCard = 0; nCard <= 6; nCard = nCard + 2) {
+    writeRcLutFile(nCard);
+    writeEicLutFile(nCard);
+  }
+  writeJscLutFile();
+
+  unsigned int eicThreshold = rctParameters_->eicIsolationThreshold();
+  unsigned int jscThresholdBarrel = rctParameters_->jscQuietThresholdBarrel();
+  unsigned int jscThresholdEndcap = rctParameters_->jscQuietThresholdEndcap();
+  writeThresholdsFile(eicThreshold, jscThresholdBarrel, jscThresholdEndcap);
+
+  if (dummyE != nullptr)
+    delete dummyE;
+  if (dummyH != nullptr)
+    delete dummyH;
 }
 
+// ------------ method called once each job just after ending the event loop
+// ------------
+void L1RCTLutWriter::endJob() {}
 
 // ------------ method to write one receiver card lut file
-void
-L1RCTLutWriter::writeRcLutFile(unsigned short card)
-{
+void L1RCTLutWriter::writeRcLutFile(unsigned short card) {
 
   // don't mess yet with name
   char filename[256];
   char command[264];
-  if (card != 6)
-    {
-      int card2 = card + 1;
-      sprintf(filename,"RC%i%i-%s.dat",card,card2,keyName_.c_str() );
-      //sprintf(filename, "RC%i%i.dat", card, card2);
-    }
-  else
-    {
-      sprintf(filename,"RC6-%s.dat",keyName_.c_str() );
-      //sprintf(filename, "RC6.dat");
-    }
+  if (card != 6) {
+    int card2 = card + 1;
+    sprintf(filename, "RC%i%i-%s.dat", card, card2, keyName_.c_str());
+    // sprintf(filename, "RC%i%i.dat", card, card2);
+  } else {
+    sprintf(filename, "RC6-%s.dat", keyName_.c_str());
+    // sprintf(filename, "RC6.dat");
+  }
   // open file for writing, delete any existing content
   lutFile_.open(filename, std::ios::trunc);
-  lutFile_ << "Emulator-parameter generated lut file, card " 
-	   << card << " key " << keyName_ << "   ";
+  lutFile_ << "Emulator-parameter generated lut file, card " << card << " key "
+           << keyName_ << "   ";
 
   // close to append timestamp info
   lutFile_.close();
@@ -286,101 +250,82 @@ L1RCTLutWriter::writeRcLutFile(unsigned short card)
   // address = (1<<22)+(nLUT<<19)+(eG?<18)+(hcalEt<<10)+(ecalfg<<9)+(ecalEt<<1)
 
   // loop through the physical LUTs on the card, 0-7
-  for (unsigned short nLUT = 0; nLUT < 8; nLUT++)
-    {
-      // determine ieta, iphi, etc. everything
-      unsigned short iAbsEta = 0;
-      if (card != 6)
-	{
-	  iAbsEta = (card/2)*8 + nLUT + 1;
-	}
-      else
-	{
-	  if (nLUT < 4)
-	    {
-	      iAbsEta = (card/2)*8 + nLUT + 1;
-	    }
-	  else
-	    {
-	      iAbsEta = (card/2)*8 + (3 - (nLUT%4) ) + 1;	      
-	    }
-	  //std::cout << "LUT is " << nLUT << " iAbsEta is " << iAbsEta << std::endl;
-	}
-
-
-      // All RCT stuff uniform in phi, symmetric wrt eta = 0
-
-      // below line always gives crate in +eta; makes no difference to us
-      unsigned short crate = rctParameters_->calcCrate(1, iAbsEta); 
-      unsigned short tower = rctParameters_->calcTower(1, iAbsEta);
-
-      // first do region sums half of LUTs, bit 18 of address is 0
-      // loop through 8 bits of hcal energy, 2^8 is 256
-      for (unsigned int hcalEt = 0; hcalEt < 256; hcalEt++)
-	{
-	  // loop through 1 bit of ecal fine grain
-	  for (unsigned short ecalfg = 0; ecalfg < 2; ecalfg++)
-	    {
-	      // loop through 8 bits of ecal energy
-	      for (unsigned int ecalEt = 0; ecalEt < 256; ecalEt++)
-		{
-		  // assign 10-bit (9et,1mip) sums data here!
-		  unsigned long output = lookupTable_->
-		    lookup(ecalEt, hcalEt, ecalfg, crate, card, tower);
-		  unsigned short etIn9Bits = (output>>8)&511;
-		  unsigned short tauActivityBit = (output>>17)&1;
-		  data = (tauActivityBit<<9)+etIn9Bits;
-		  lutFile_ << std::hex << data << std::dec << std::endl;
-		}
-	    }
-	}
-      // second do egamma half of LUTs, bit 18 of address is 1
-      // loop through 8 bits of hcal energy
-      for (unsigned int hcalEt = 0; hcalEt < 256; hcalEt++)
-        {
-          // loop through 1 bit of ecal fine grain
-          for (unsigned short ecalfg = 0; ecalfg < 2; ecalfg++)
-            {
-              // loop through 8 bits of ecal energy
-              for (unsigned int ecalEt = 0; ecalEt < 256; ecalEt++)
-                {
-                  // assign 8-bit (7et,1veto) egamma data here!
-		  unsigned long output = lookupTable_->
-		    lookup(ecalEt, hcalEt, ecalfg, crate, card, tower);
-		  unsigned short etIn7Bits = output&127;
-		  unsigned short heFgVetoBit = (output>>7)&1;
-		  data = (heFgVetoBit<<7)+etIn7Bits;
-		  lutFile_ << std::hex << data << std::dec << std::endl;
-                }
-            }
+  for (unsigned short nLUT = 0; nLUT < 8; nLUT++) {
+    // determine ieta, iphi, etc. everything
+    unsigned short iAbsEta = 0;
+    if (card != 6) {
+      iAbsEta = (card / 2) * 8 + nLUT + 1;
+    } else {
+      if (nLUT < 4) {
+        iAbsEta = (card / 2) * 8 + nLUT + 1;
+      } else {
+        iAbsEta = (card / 2) * 8 + (3 - (nLUT % 4)) + 1;
+      }
+      // std::cout << "LUT is " << nLUT << " iAbsEta is " << iAbsEta <<
+      // std::endl;
+    }
+
+    // All RCT stuff uniform in phi, symmetric wrt eta = 0
+
+    // below line always gives crate in +eta; makes no difference to us
+    unsigned short crate = rctParameters_->calcCrate(1, iAbsEta);
+    unsigned short tower = rctParameters_->calcTower(1, iAbsEta);
+
+    // first do region sums half of LUTs, bit 18 of address is 0
+    // loop through 8 bits of hcal energy, 2^8 is 256
+    for (unsigned int hcalEt = 0; hcalEt < 256; hcalEt++) {
+      // loop through 1 bit of ecal fine grain
+      for (unsigned short ecalfg = 0; ecalfg < 2; ecalfg++) {
+        // loop through 8 bits of ecal energy
+        for (unsigned int ecalEt = 0; ecalEt < 256; ecalEt++) {
+          // assign 10-bit (9et,1mip) sums data here!
+          unsigned long output =
+              lookupTable_->lookup(ecalEt, hcalEt, ecalfg, crate, card, tower);
+          unsigned short etIn9Bits = (output >> 8) & 511;
+          unsigned short tauActivityBit = (output >> 17) & 1;
+          data = (tauActivityBit << 9) + etIn9Bits;
+          lutFile_ << std::hex << data << std::dec << std::endl;
+        }
+      }
+    }
+    // second do egamma half of LUTs, bit 18 of address is 1
+    // loop through 8 bits of hcal energy
+    for (unsigned int hcalEt = 0; hcalEt < 256; hcalEt++) {
+      // loop through 1 bit of ecal fine grain
+      for (unsigned short ecalfg = 0; ecalfg < 2; ecalfg++) {
+        // loop through 8 bits of ecal energy
+        for (unsigned int ecalEt = 0; ecalEt < 256; ecalEt++) {
+          // assign 8-bit (7et,1veto) egamma data here!
+          unsigned long output =
+              lookupTable_->lookup(ecalEt, hcalEt, ecalfg, crate, card, tower);
+          unsigned short etIn7Bits = output & 127;
+          unsigned short heFgVetoBit = (output >> 7) & 1;
+          data = (heFgVetoBit << 7) + etIn7Bits;
+          lutFile_ << std::hex << data << std::dec << std::endl;
         }
+      }
     }
+  }
 
   lutFile_.close();
   return;
-
 }
 
 // ------------ method to write one electron isolation card lut file
-void
-L1RCTLutWriter::writeEicLutFile(unsigned short card)
-{
+void L1RCTLutWriter::writeEicLutFile(unsigned short card) {
   // try timestamp
   char filename[256];
   char command[264];
-  if (card != 6)
-    {
-      int card2 = card + 1;
-      sprintf(filename,"EIC%i%i-%s.dat", card, card2, keyName_.c_str() );
-    }
-  else
-    {
-      sprintf(filename,"EIC6-%s.dat", keyName_.c_str() );
-    }
+  if (card != 6) {
+    int card2 = card + 1;
+    sprintf(filename, "EIC%i%i-%s.dat", card, card2, keyName_.c_str());
+  } else {
+    sprintf(filename, "EIC6-%s.dat", keyName_.c_str());
+  }
   // open file for writing, delete any existing content
   lutFile_.open(filename, std::ios::trunc);
-  lutFile_ << "Emulator-parameter generated EIC lut file, card " 
-	   << card << " key " << keyName_ << "   ";
+  lutFile_ << "Emulator-parameter generated EIC lut file, card " << card
+           << " key " << keyName_ << "   ";
   // close to append timestamp info
   lutFile_.close();
   sprintf(command, "date >> %s", filename);
@@ -395,31 +340,27 @@ L1RCTLutWriter::writeEicLutFile(unsigned short card)
   // address = (1<<22) + (etIn7Bits<<1)
 
   // 2^7 = 0x7f = 128
-  for (int etIn7Bits = 0; etIn7Bits < 128; etIn7Bits++)
-    {
-      data = lookupTable_->emRank(etIn7Bits);
-      if (data > 0x3f)
-	{
-	  data = 0x3f;
-	}
-      lutFile_ << std::hex << data << std::dec << std::endl;
+  for (int etIn7Bits = 0; etIn7Bits < 128; etIn7Bits++) {
+    data = lookupTable_->emRank(etIn7Bits);
+    if (data > 0x3f) {
+      data = 0x3f;
     }
+    lutFile_ << std::hex << data << std::dec << std::endl;
+  }
   lutFile_.close();
   return;
 }
 
 // ------------ method to write one jet summary card lut file
-void 
-L1RCTLutWriter::writeJscLutFile()
-{
+void L1RCTLutWriter::writeJscLutFile() {
   char filename[256];
   char command[264];
-  sprintf(filename, "JSC-%s.dat", keyName_.c_str() );
+  sprintf(filename, "JSC-%s.dat", keyName_.c_str());
 
   // open file; if it already existed, delete existing content
   lutFile_.open(filename, std::ios::trunc);
-  lutFile_ << "Emulator parameter-generated lut file, key " << keyName_ 
-	   << "   ";
+  lutFile_ << "Emulator parameter-generated lut file, key " << keyName_
+           << "   ";
   // close to append time-stamp
   lutFile_.close();
   sprintf(command, "date >> %s", filename);
@@ -435,67 +376,62 @@ L1RCTLutWriter::writeJscLutFile()
   // address = (1<<22) + (lutbits<<17) + (phi1et<<9) + (phi0et<<1);
 
   // ecl and U93/U225 lut id bits, identify eta segment of hf
-  for (int lutbits = 0; lutbits < 4; lutbits++)
-    {
-      // 8-bit phi_1 et for each eta partition
-      for (unsigned int phi1et = 0; phi1et < 256; phi1et++)
-	{
-	  // 8-bit phi_0 et for each eta
-	  for (unsigned int phi0et = 0; phi0et < 256; phi0et++)
-	    {
-	      // lookup takes "(hf_et, crate, card, tower)"
-	      // "card" convention for hf is 999, tower is 0-7
-	      // but equivalent to 0-3 == lutbits
-	      // crate doesn't matter, take 0
-	      // only |ieta| matters
-	      data0 = lookupTable_->lookup(phi0et, 0, 999, lutbits);
-	      if (data0 > 0xff)
-		{
-		  data0 = 0xff;   // 8-bit output energy for each phi region
-		}
-	      data1 = lookupTable_->lookup(phi1et, 0, 999, lutbits);
-	      if (data1 > 0xff)
-		{
-		  data1 = 0xff;   // 8-bit output energy for each phi region
-		}
-	      data = (data1<<8) + (data0);
-	      lutFile_ << std::hex << data << std::dec << std::endl;
-	      /*
-	      if (phi0et < 10 && phi1et < 10)
-		{
-		  std::cout << "Writer: jsc. lutbits=" << lutbits 
-			    << " phi0et=" << phi0et << " data0=" << data0
-			    << " phi1et=" << phi1et << " data1=" << data1
-			    << std::endl;
-		}
-	      */
-	    }
-	}
+  for (int lutbits = 0; lutbits < 4; lutbits++) {
+    // 8-bit phi_1 et for each eta partition
+    for (unsigned int phi1et = 0; phi1et < 256; phi1et++) {
+      // 8-bit phi_0 et for each eta
+      for (unsigned int phi0et = 0; phi0et < 256; phi0et++) {
+        // lookup takes "(hf_et, crate, card, tower)"
+        // "card" convention for hf is 999, tower is 0-7
+        // but equivalent to 0-3 == lutbits
+        // crate doesn't matter, take 0
+        // only |ieta| matters
+        data0 = lookupTable_->lookup(phi0et, 0, 999, lutbits);
+        if (data0 > 0xff) {
+          data0 = 0xff; // 8-bit output energy for each phi region
+        }
+        data1 = lookupTable_->lookup(phi1et, 0, 999, lutbits);
+        if (data1 > 0xff) {
+          data1 = 0xff; // 8-bit output energy for each phi region
+        }
+        data = (data1 << 8) + (data0);
+        lutFile_ << std::hex << data << std::dec << std::endl;
+        /*
+        if (phi0et < 10 && phi1et < 10)
+          {
+            std::cout << "Writer: jsc. lutbits=" << lutbits
+                      << " phi0et=" << phi0et << " data0=" << data0
+                      << " phi1et=" << phi1et << " data1=" << data1
+                      << std::endl;
+          }
+        */
+      }
     }
-  
+  }
+
   lutFile_.close();
   return;
 }
 
 //-----------Write text file containing the 1 JSC and 2 EIC thresholds
-void
-L1RCTLutWriter::writeThresholdsFile(unsigned int eicThreshold, 
-				    unsigned int jscThresholdBarrel,
-				    unsigned int jscThresholdEndcap)
-{
+void L1RCTLutWriter::writeThresholdsFile(unsigned int eicThreshold,
+                                         unsigned int jscThresholdBarrel,
+                                         unsigned int jscThresholdEndcap) {
   //
   std::ofstream thresholdsFile;
   char filename[256];
-  sprintf(filename, "Thresholds-%s.dat", keyName_.c_str() );
+  sprintf(filename, "Thresholds-%s.dat", keyName_.c_str());
   thresholdsFile.open(filename, std::ios::trunc);
 
   thresholdsFile << "key is " << keyName_ << std::endl << std::endl;
   thresholdsFile << "eicIsolationThreshold " << eicThreshold << std::endl;
-  thresholdsFile << "jscQuietThresholdBarrel " << jscThresholdBarrel << std::endl;
-  thresholdsFile << "jscQuietThresholdEndcap " << jscThresholdEndcap << std::endl;
+  thresholdsFile << "jscQuietThresholdBarrel " << jscThresholdBarrel
+                 << std::endl;
+  thresholdsFile << "jscQuietThresholdEndcap " << jscThresholdEndcap
+                 << std::endl;
 
   thresholdsFile.close();
 }
 
-//define this as a plug-in
-//DEFINE_FWK_MODULE(L1RCTLutWriter); // done in SealModule.cc
+// define this as a plug-in
+// DEFINE_FWK_MODULE(L1RCTLutWriter); // done in SealModule.cc
diff --git a/L1Trigger/RegionalCaloTrigger/plugins/L1RCTProducer.cc b/L1Trigger/RegionalCaloTrigger/plugins/L1RCTProducer.cc
index 97f0fd357f567..40c3eb28f706f 100644
--- a/L1Trigger/RegionalCaloTrigger/plugins/L1RCTProducer.cc
+++ b/L1Trigger/RegionalCaloTrigger/plugins/L1RCTProducer.cc
@@ -1,110 +1,104 @@
-#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTProducer.h" 
+#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTProducer.h"
 
 // RunInfo stuff
 #include "CondFormats/RunInfo/interface/RunInfo.h"
-#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/Framework/interface/LuminosityBlock.h"
+#include "FWCore/Framework/interface/Run.h"
 
 #include <vector>
 using std::vector;
 #include <iostream>
 
-
-
 using std::cout;
 using std::endl;
-const int L1RCTProducer::crateFED[18][6]=
-    {{613, 614, 603, 702, 718, 1118},
-    {611, 612, 602, 700, 718, 1118},
-    {627, 610, 601, 716, 722, 1122},
-    {625, 626, 609, 714, 722, 1122},
-    {623, 624, 608, 712, 722, 1122},
-    {621, 622, 607, 710, 720, 1120},
-    {619, 620, 606, 708, 720, 1120},
-    {617, 618, 605, 706, 720, 1120},
-    {615, 616, 604, 704, 718, 1118},
-    {631, 632, 648, 703, 719, 1118},
-    {629, 630, 647, 701, 719, 1118},
-    {645, 628, 646, 717, 723, 1122},
-    {643, 644, 654, 715, 723, 1122},
-    {641, 642, 653, 713, 723, 1122},
-    {639, 640, 652, 711, 721, 1120},
-    {637, 638, 651, 709, 721, 1120},
-    {635, 636, 650, 707, 721, 1120},
-    {633, 634, 649, 705, 719, 1118}};
-
-L1RCTProducer::L1RCTProducer(const edm::ParameterSet& conf) : 
-  rctLookupTables(new L1RCTLookupTables),
-  rct(new L1RCT(rctLookupTables)),
-  useEcal(conf.getParameter<bool>("useEcal")),
-  useHcal(conf.getParameter<bool>("useHcal")),
-  ecalDigis(conf.getParameter<std::vector<edm::InputTag> >("ecalDigis")),
-  hcalDigis(conf.getParameter<std::vector<edm::InputTag> >("hcalDigis")),
-  bunchCrossings(conf.getParameter<std::vector<int> >("BunchCrossings")),
-  getFedsFromOmds(conf.getParameter<bool>("getFedsFromOmds")),
-  queryDelayInLS(conf.getParameter<unsigned int>("queryDelayInLS")),
-  queryIntervalInLS(conf.getParameter<unsigned int>("queryIntervalInLS")),
-  conditionsLabel(conf.getParameter<std::string>("conditionsLabel")),
-  fedUpdatedMask(nullptr)
-{
+const int L1RCTProducer::crateFED[18][6] = {
+    {613, 614, 603, 702, 718, 1118}, {611, 612, 602, 700, 718, 1118},
+    {627, 610, 601, 716, 722, 1122}, {625, 626, 609, 714, 722, 1122},
+    {623, 624, 608, 712, 722, 1122}, {621, 622, 607, 710, 720, 1120},
+    {619, 620, 606, 708, 720, 1120}, {617, 618, 605, 706, 720, 1120},
+    {615, 616, 604, 704, 718, 1118}, {631, 632, 648, 703, 719, 1118},
+    {629, 630, 647, 701, 719, 1118}, {645, 628, 646, 717, 723, 1122},
+    {643, 644, 654, 715, 723, 1122}, {641, 642, 653, 713, 723, 1122},
+    {639, 640, 652, 711, 721, 1120}, {637, 638, 651, 709, 721, 1120},
+    {635, 636, 650, 707, 721, 1120}, {633, 634, 649, 705, 719, 1118}};
+
+L1RCTProducer::L1RCTProducer(const edm::ParameterSet &conf)
+    : rctLookupTables(new L1RCTLookupTables), rct(new L1RCT(rctLookupTables)),
+      useEcal(conf.getParameter<bool>("useEcal")),
+      useHcal(conf.getParameter<bool>("useHcal")),
+      ecalDigis(conf.getParameter<std::vector<edm::InputTag>>("ecalDigis")),
+      hcalDigis(conf.getParameter<std::vector<edm::InputTag>>("hcalDigis")),
+      bunchCrossings(conf.getParameter<std::vector<int>>("BunchCrossings")),
+      getFedsFromOmds(conf.getParameter<bool>("getFedsFromOmds")),
+      queryDelayInLS(conf.getParameter<unsigned int>("queryDelayInLS")),
+      queryIntervalInLS(conf.getParameter<unsigned int>("queryIntervalInLS")),
+      conditionsLabel(conf.getParameter<std::string>("conditionsLabel")),
+      fedUpdatedMask(nullptr) {
   produces<L1CaloEmCollection>();
   produces<L1CaloRegionCollection>();
 
-  for(unsigned int ihc=0;ihc<hcalDigis.size();ihc++){
-	consumes<edm::SortedCollection<HcalTriggerPrimitiveDigi,edm::StrictWeakOrdering<HcalTriggerPrimitiveDigi> > >(hcalDigis[ihc]);
+  for (unsigned int ihc = 0; ihc < hcalDigis.size(); ihc++) {
+    consumes<edm::SortedCollection<
+        HcalTriggerPrimitiveDigi,
+        edm::StrictWeakOrdering<HcalTriggerPrimitiveDigi>>>(hcalDigis[ihc]);
   }
 
-  for(unsigned int iec=0;iec<ecalDigis.size();iec++){
-	consumes<edm::SortedCollection<EcalTriggerPrimitiveDigi,edm::StrictWeakOrdering<EcalTriggerPrimitiveDigi> > >(ecalDigis[iec]);
+  for (unsigned int iec = 0; iec < ecalDigis.size(); iec++) {
+    consumes<edm::SortedCollection<
+        EcalTriggerPrimitiveDigi,
+        edm::StrictWeakOrdering<EcalTriggerPrimitiveDigi>>>(ecalDigis[iec]);
   }
 }
 
-L1RCTProducer::~L1RCTProducer()
-{
-  if(rct != nullptr) delete rct;
-  if(rctLookupTables != nullptr) delete rctLookupTables;
-  if(fedUpdatedMask != nullptr) delete fedUpdatedMask;
+L1RCTProducer::~L1RCTProducer() {
+  if (rct != nullptr)
+    delete rct;
+  if (rctLookupTables != nullptr)
+    delete rctLookupTables;
+  if (fedUpdatedMask != nullptr)
+    delete fedUpdatedMask;
 }
 
-
-void L1RCTProducer::beginRun(edm::Run const& run, const edm::EventSetup& eventSetup)
-{
+void L1RCTProducer::beginRun(edm::Run const &run,
+                             const edm::EventSetup &eventSetup) {
   //  std::cout << "getFedsFromOmds is " << getFedsFromOmds << std::endl;
 
   updateConfiguration(eventSetup);
-  
-  int runNumber = run.run();
-  updateFedVector(eventSetup,false,runNumber); // RUNINFO ONLY at beginning of run
 
+  int runNumber = run.run();
+  updateFedVector(eventSetup, false,
+                  runNumber); // RUNINFO ONLY at beginning of run
 }
 
-
-void L1RCTProducer::beginLuminosityBlock(edm::LuminosityBlock const& lumiSeg,const edm::EventSetup& context)
-{
-  // check LS number every LS, if the checkOMDS flag is set AND it's the right LS, update the FED vector from OMDS
-  // can pass the flag as the bool??  but only check LS number if flag is true anyhow
-  if (getFedsFromOmds)
+void L1RCTProducer::beginLuminosityBlock(edm::LuminosityBlock const &lumiSeg,
+                                         const edm::EventSetup &context) {
+  // check LS number every LS, if the checkOMDS flag is set AND it's the right
+  // LS, update the FED vector from OMDS can pass the flag as the bool??  but
+  // only check LS number if flag is true anyhow
+  if (getFedsFromOmds) {
+    unsigned int nLumi =
+        lumiSeg.luminosityBlock(); // doesn't even need the (unsigned int) cast
+                                   // because LuminosityBlockNumber_t is already
+                                   // an unsigned int
+    // LS count starts at 1, want to be able to delay 0 LS's intuitively
+    if (((nLumi - 1) == queryDelayInLS) ||
+        (queryIntervalInLS > 0 &&
+         nLumi % queryIntervalInLS ==
+             0)) // to guard against problems if online DQM crashes; every 100
+                 // LS is ~20-30 minutes, not too big a load, hopefully not too
+                 // long between
     {
-      unsigned int nLumi = lumiSeg.luminosityBlock(); // doesn't even need the (unsigned int) cast because LuminosityBlockNumber_t is already an unsigned int
-      // LS count starts at 1, want to be able to delay 0 LS's intuitively
-      if ( ( (nLumi - 1) == queryDelayInLS) 
-	   || (queryIntervalInLS > 0 && nLumi % queryIntervalInLS == 0 ) ) // to guard against problems if online DQM crashes; every 100 LS is ~20-30 minutes, not too big a load, hopefully not too long between
-	{
-	  int runNumber = lumiSeg.run();
-	  //	  std::cout << "Lumi section for this FED vector update is " << nLumi << std::endl;
-	  updateFedVector(context,true,runNumber); // OMDS
-	}
-      else if (queryIntervalInLS <= 0)
-	{
-	  // don't do interval checking... cout message??
-	}
+      int runNumber = lumiSeg.run();
+      //	  std::cout << "Lumi section for this FED vector update is " <<
+      // nLumi << std::endl;
+      updateFedVector(context, true, runNumber); // OMDS
+    } else if (queryIntervalInLS <= 0) {
+      // don't do interval checking... cout message??
     }
-} 
-
-
+  }
+}
 
-void L1RCTProducer::updateConfiguration(const edm::EventSetup& eventSetup)
-{
+void L1RCTProducer::updateConfiguration(const edm::EventSetup &eventSetup) {
   // Refresh configuration information every event
   // Hopefully, this does not take too much time
   // There should be a call back function in future to
@@ -112,24 +106,24 @@ void L1RCTProducer::updateConfiguration(const edm::EventSetup& eventSetup)
   // parameters to configure RCT (thresholds, etc)
   edm::ESHandle<L1RCTParameters> rctParameters;
   eventSetup.get<L1RCTParametersRcd>().get(conditionsLabel, rctParameters);
-  const L1RCTParameters* r = rctParameters.product();
+  const L1RCTParameters *r = rctParameters.product();
 
-  //SCALES
+  // SCALES
 
   // energy scale to convert eGamma output
   edm::ESHandle<L1CaloEtScale> emScale;
   eventSetup.get<L1EmEtScaleRcd>().get(conditionsLabel, emScale);
-  const L1CaloEtScale* s = emScale.product();
+  const L1CaloEtScale *s = emScale.product();
 
- // get energy scale to convert input from ECAL
+  // get energy scale to convert input from ECAL
   edm::ESHandle<L1CaloEcalScale> ecalScale;
   eventSetup.get<L1CaloEcalScaleRcd>().get(conditionsLabel, ecalScale);
-  const L1CaloEcalScale* e = ecalScale.product();
-  
+  const L1CaloEcalScale *e = ecalScale.product();
+
   // get energy scale to convert input from HCAL
   edm::ESHandle<L1CaloHcalScale> hcalScale;
   eventSetup.get<L1CaloHcalScaleRcd>().get(conditionsLabel, hcalScale);
-  const L1CaloHcalScale* h = hcalScale.product();
+  const L1CaloHcalScale *h = hcalScale.product();
 
   // set scales
   rctLookupTables->setEcalScale(e);
@@ -139,356 +133,321 @@ void L1RCTProducer::updateConfiguration(const edm::EventSetup& eventSetup)
   rctLookupTables->setL1CaloEtScale(s);
 }
 
-
-void L1RCTProducer::updateFedVector(const edm::EventSetup& eventSetup, bool getFromOmds, int runNumber) // eventSetup apparently doesn't include run number: http://cmslxr.fnal.gov/lxr/source/FWCore/Framework/interface/EventSetup.h
+void L1RCTProducer::updateFedVector(
+    const edm::EventSetup &eventSetup, bool getFromOmds,
+    int runNumber) // eventSetup apparently doesn't include run number:
+                   // http://cmslxr.fnal.gov/lxr/source/FWCore/Framework/interface/EventSetup.h
 {
   // list of RCT channels to mask
   edm::ESHandle<L1RCTChannelMask> channelMask;
   eventSetup.get<L1RCTChannelMaskRcd>().get(channelMask);
-  const L1RCTChannelMask* cEs = channelMask.product();
-
+  const L1RCTChannelMask *cEs = channelMask.product();
 
   // list of Noisy RCT channels to mask
   edm::ESHandle<L1RCTNoisyChannelMask> hotChannelMask;
   eventSetup.get<L1RCTNoisyChannelMaskRcd>().get(hotChannelMask);
-  const L1RCTNoisyChannelMask* cEsNoise = hotChannelMask.product();
+  const L1RCTNoisyChannelMask *cEsNoise = hotChannelMask.product();
   rctLookupTables->setNoisyChannelMask(cEsNoise);
 
+  // Update the channel mask according to the FED VECTOR
+  // This is the beginning of run. We delete the old
+  // create the new and set it in the LUTs
 
-  
-  //Update the channel mask according to the FED VECTOR
-  //This is the beginning of run. We delete the old
-  //create the new and set it in the LUTs
-
-  if(fedUpdatedMask!=nullptr) delete fedUpdatedMask;
+  if (fedUpdatedMask != nullptr)
+    delete fedUpdatedMask;
 
   fedUpdatedMask = new L1RCTChannelMask();
   // copy a constant object
-  for (int i = 0; i < 18; i++)
-    {
-      for (int j = 0; j < 2; j++)
-	{
-	  for (int k = 0; k < 28; k++)
-	    {
-	      fedUpdatedMask->ecalMask[i][j][k] = cEs->ecalMask[i][j][k];
-	      fedUpdatedMask->hcalMask[i][j][k] = cEs->hcalMask[i][j][k] ;
-	    }
-	  for (int k = 0; k < 4; k++)
-	    {
-	      fedUpdatedMask->hfMask[i][j][k] = cEs->hfMask[i][j][k];
-	    }
-	}
+  for (int i = 0; i < 18; i++) {
+    for (int j = 0; j < 2; j++) {
+      for (int k = 0; k < 28; k++) {
+        fedUpdatedMask->ecalMask[i][j][k] = cEs->ecalMask[i][j][k];
+        fedUpdatedMask->hcalMask[i][j][k] = cEs->hcalMask[i][j][k];
+      }
+      for (int k = 0; k < 4; k++) {
+        fedUpdatedMask->hfMask[i][j][k] = cEs->hfMask[i][j][k];
+      }
     }
+  }
 
+  //   // adding fed mask into channel mask
 
-//   // adding fed mask into channel mask
-  
-  const std::vector<int> Feds = getFromOmds ? getFedVectorFromOmds(eventSetup) : getFedVectorFromRunInfo(eventSetup); 
-  // so can create/initialize/assign const quantity in one line accounting for if statement
-  // wikipedia says this is exactly what it's for: http://en.wikipedia.org/wiki/%3F:#C.2B.2B
+  const std::vector<int> Feds = getFromOmds
+                                    ? getFedVectorFromOmds(eventSetup)
+                                    : getFedVectorFromRunInfo(eventSetup);
+  // so can create/initialize/assign const quantity in one line accounting for
+  // if statement wikipedia says this is exactly what it's for:
+  // http://en.wikipedia.org/wiki/%3F:#C.2B.2B
 
-//   std::cout << "Contents of ";
-//   std::cout << (getFromOmds ? "OMDS RunInfo" : "standard RunInfo");
-//   std::cout << " FED vector" << std::endl;
-//   printFedVector(Feds);
+  //   std::cout << "Contents of ";
+  //   std::cout << (getFromOmds ? "OMDS RunInfo" : "standard RunInfo");
+  //   std::cout << " FED vector" << std::endl;
+  //   printFedVector(Feds);
 
-  bool useUpgradedHF=false;
+  bool useUpgradedHF = false;
 
-  std::vector<int> caloFeds;  // pare down the feds to the interesting ones
+  std::vector<int> caloFeds; // pare down the feds to the interesting ones
   // is this unneccesary?
   // Mike B : This will decrease the find speed so better do it
-  for(std::vector<int>::const_iterator cf = Feds.begin(); cf != Feds.end(); ++cf)
-    {
-      int fedNum = *cf;
-      if((fedNum > 600 && fedNum <724) || fedNum==1118 || fedNum == 1120 || fedNum == 1122) 
-	caloFeds.push_back(fedNum);
-
-      if(fedNum==1118 || fedNum == 1120 || fedNum == 1122) useUpgradedHF=true;
-  
-    }
+  for (std::vector<int>::const_iterator cf = Feds.begin(); cf != Feds.end();
+       ++cf) {
+    int fedNum = *cf;
+    if ((fedNum > 600 && fedNum < 724) || fedNum == 1118 || fedNum == 1120 ||
+        fedNum == 1122)
+      caloFeds.push_back(fedNum);
+
+    if (fedNum == 1118 || fedNum == 1120 || fedNum == 1122)
+      useUpgradedHF = true;
+  }
 
-  for(int  cr = 0; cr < 18; ++cr)
-    {
-      
-      for(crateSection cs = c_min; cs <= c_max; cs = crateSection(cs +1)) 
-	{
-	  bool fedFound = false;
-	  
-	  //Try to find the FED
-	  std::vector<int>::iterator fv= std::find(caloFeds.begin(),caloFeds.end(),crateFED[cr][cs]);
-	  if(fv!=caloFeds.end())
-	    fedFound = true;
-	 
-
- 
-	  if(!fedFound) {
-	    int eta_min=0;
-	    int eta_max=0;
-	    bool phi_even[2] = {false};//, phi_odd = false;
-	    bool ecal=false;
-	    
-	    switch (cs) {
-	    case ebEvenFed :
-	      eta_min = minBarrel;
-	      eta_max = maxBarrel;
-	      phi_even[0] = true;
-	      ecal = true;	
-	      break;
-	      
-	    case ebOddFed:
-	      eta_min = minBarrel;
-	      eta_max = maxBarrel;
-	      phi_even[1] = true;
-	      ecal = true;	
-	      break;
-	      
-	    case eeFed:
-	      eta_min = minEndcap;
-	      eta_max = maxEndcap;
-	      phi_even[0] = true;
-	      phi_even[1] = true;
-	      ecal = true;	
-	      break;	
-	      
-	    case hbheFed:
-	      eta_min = minBarrel;
-	      eta_max = maxEndcap;
-	      phi_even[0] = true;
-	      phi_even[1] = true;
-	      ecal = false;
-	      break;
-	      
-	    case hfFed:	
-	      if(useUpgradedHF) break;
-
-	      eta_min = minHF;
-	      eta_max = maxHF;
-	      
-	      phi_even[0] = true;
-	      phi_even[1] = true;
-	      ecal = false;
-	      break;
-
-	    case hfFedUp:
-	      if(!useUpgradedHF) break;
-
-	      eta_min = minHF;
-	      eta_max = maxHF;
-
-	      phi_even[0] = true;
-	      phi_even[1] = true;
-	      ecal = false;
-	      break;
-
-
-	    default:
-	      break;
-	      
-	    }
-	    for(int ieta = eta_min; ieta <= eta_max; ++ieta)
-	      {
-		if(ieta<=28) // barrel and endcap
-		  for(int even = 0; even<=1 ; even++)
-		    {	 
-		      if(phi_even[even])
-			{
-			  if(ecal)
-			    fedUpdatedMask->ecalMask[cr][even][ieta-1] = true;
-			  else
-			    fedUpdatedMask->hcalMask[cr][even][ieta-1] = true;
-			}
-		    }
-		else
-		  for(int even = 0; even<=1 ; even++)
-		    if(phi_even[even])
-		      fedUpdatedMask->hfMask[cr][even][ieta-29] = true;
-		
-	      }
-	  }
-	}
+  for (int cr = 0; cr < 18; ++cr) {
+
+    for (crateSection cs = c_min; cs <= c_max; cs = crateSection(cs + 1)) {
+      bool fedFound = false;
+
+      // Try to find the FED
+      std::vector<int>::iterator fv =
+          std::find(caloFeds.begin(), caloFeds.end(), crateFED[cr][cs]);
+      if (fv != caloFeds.end())
+        fedFound = true;
+
+      if (!fedFound) {
+        int eta_min = 0;
+        int eta_max = 0;
+        bool phi_even[2] = {false}; //, phi_odd = false;
+        bool ecal = false;
+
+        switch (cs) {
+        case ebEvenFed:
+          eta_min = minBarrel;
+          eta_max = maxBarrel;
+          phi_even[0] = true;
+          ecal = true;
+          break;
+
+        case ebOddFed:
+          eta_min = minBarrel;
+          eta_max = maxBarrel;
+          phi_even[1] = true;
+          ecal = true;
+          break;
+
+        case eeFed:
+          eta_min = minEndcap;
+          eta_max = maxEndcap;
+          phi_even[0] = true;
+          phi_even[1] = true;
+          ecal = true;
+          break;
+
+        case hbheFed:
+          eta_min = minBarrel;
+          eta_max = maxEndcap;
+          phi_even[0] = true;
+          phi_even[1] = true;
+          ecal = false;
+          break;
+
+        case hfFed:
+          if (useUpgradedHF)
+            break;
+
+          eta_min = minHF;
+          eta_max = maxHF;
+
+          phi_even[0] = true;
+          phi_even[1] = true;
+          ecal = false;
+          break;
+
+        case hfFedUp:
+          if (!useUpgradedHF)
+            break;
+
+          eta_min = minHF;
+          eta_max = maxHF;
+
+          phi_even[0] = true;
+          phi_even[1] = true;
+          ecal = false;
+          break;
+
+        default:
+          break;
+        }
+        for (int ieta = eta_min; ieta <= eta_max; ++ieta) {
+          if (ieta <= 28) // barrel and endcap
+            for (int even = 0; even <= 1; even++) {
+              if (phi_even[even]) {
+                if (ecal)
+                  fedUpdatedMask->ecalMask[cr][even][ieta - 1] = true;
+                else
+                  fedUpdatedMask->hcalMask[cr][even][ieta - 1] = true;
+              }
+            }
+          else
+            for (int even = 0; even <= 1; even++)
+              if (phi_even[even])
+                fedUpdatedMask->hfMask[cr][even][ieta - 29] = true;
+        }
+      }
     }
-  
-  rctLookupTables->setChannelMask(fedUpdatedMask); 
+  }
 
+  rctLookupTables->setChannelMask(fedUpdatedMask);
 }
 
-const std::vector<int> L1RCTProducer::getFedVectorFromRunInfo(const edm::EventSetup& eventSetup)
-{
-  //  std::cout << "Getting FED vector from standard RunInfo object" << std::endl;
+const std::vector<int>
+L1RCTProducer::getFedVectorFromRunInfo(const edm::EventSetup &eventSetup) {
+  //  std::cout << "Getting FED vector from standard RunInfo object" <<
+  //  std::endl;
   // get FULL FED vector from RUNINFO
   edm::ESHandle<RunInfo> sum;
   eventSetup.get<RunInfoRcd>().get(sum);
-  const RunInfo* summary=sum.product();
+  const RunInfo *summary = sum.product();
   const std::vector<int> fedvector = summary->m_fed_in;
 
   return fedvector;
 }
 
+const std::vector<int>
+L1RCTProducer::getFedVectorFromOmds(const edm::EventSetup &eventSetup) {
 
-const std::vector<int> L1RCTProducer::getFedVectorFromOmds(const edm::EventSetup& eventSetup)
-{
-
-  //  std::cout << "Getting FED vector from my specific ES RunInfo object" << std::endl;
+  //  std::cout << "Getting FED vector from my specific ES RunInfo object" <<
+  //  std::endl;
 
-  // get FULL FED vector from RunInfo object specifically created to have OMDS fed vector
+  // get FULL FED vector from RunInfo object specifically created to have OMDS
+  // fed vector
   edm::ESHandle<RunInfo> sum;
-  eventSetup.get<RunInfoRcd>().get("OmdsFedVector",sum); // using label to get my specific instance of RunInfo
-  if (sum.isValid())
-    {
-      const RunInfo* summary=sum.product();
-      const std::vector<int> fedvector = summary->m_fed_in;
-
-      return fedvector;
-    }
-  else
-    {
-      return getFedVectorFromRunInfo(eventSetup);
-    }
-  
+  eventSetup.get<RunInfoRcd>().get(
+      "OmdsFedVector",
+      sum); // using label to get my specific instance of RunInfo
+  if (sum.isValid()) {
+    const RunInfo *summary = sum.product();
+    const std::vector<int> fedvector = summary->m_fed_in;
+
+    return fedvector;
+  } else {
+    return getFedVectorFromRunInfo(eventSetup);
+  }
 }
 
+void L1RCTProducer::produce(edm::Event &event,
+                            const edm::EventSetup &eventSetup) {
 
+  std::unique_ptr<L1CaloEmCollection> rctEmCands(new L1CaloEmCollection);
+  std::unique_ptr<L1CaloRegionCollection> rctRegions(
+      new L1CaloRegionCollection);
 
-void L1RCTProducer::produce(edm::Event& event, const edm::EventSetup& eventSetup)
-{
-
-
-  std::unique_ptr<L1CaloEmCollection> rctEmCands (new L1CaloEmCollection);
-  std::unique_ptr<L1CaloRegionCollection> rctRegions (new L1CaloRegionCollection);
-
-
-  if(!(ecalDigis.size()==hcalDigis.size()&&hcalDigis.size()==bunchCrossings.size()))
-      throw cms::Exception("BadInput")
-	<< "From what I see the number of your your ECAL input digi collections.\n"
-        <<"is different from the size of your HCAL digi input collections\n"
-	<<"or the size of your BX factor collection" 
-        <<"They must be the same to correspond to the same Bxs\n"
-	<< "It does not matter if one of them is empty\n"; 
-
-
-
+  if (!(ecalDigis.size() == hcalDigis.size() &&
+        hcalDigis.size() == bunchCrossings.size()))
+    throw cms::Exception("BadInput")
+        << "From what I see the number of your your ECAL input digi "
+           "collections.\n"
+        << "is different from the size of your HCAL digi input collections\n"
+        << "or the size of your BX factor collection"
+        << "They must be the same to correspond to the same Bxs\n"
+        << "It does not matter if one of them is empty\n";
 
   // loop through and process each bx
-    for (unsigned short sample = 0; sample < bunchCrossings.size(); sample++)
-      {
-	edm::Handle<EcalTrigPrimDigiCollection> ecal;
-	edm::Handle<HcalTrigPrimDigiCollection> hcal;
-
-	EcalTrigPrimDigiCollection ecalIn;
-	HcalTrigPrimDigiCollection hcalIn;
-
-
-	if(useHcal&&event.getByLabel(hcalDigis[sample], hcal))
-	  hcalIn = *hcal;
-
-	if(useEcal&&event.getByLabel(ecalDigis[sample],ecal))
-	  ecalIn = *ecal;
-
-	rct->digiInput(ecalIn,hcalIn);
-	rct->processEvent();
-
-      // Stuff to create
-	for (int j = 0; j<18; j++)
-	  {
-	    L1CaloEmCollection isolatedEGObjects = rct->getIsolatedEGObjects(j);
-	    L1CaloEmCollection nonisolatedEGObjects = rct->getNonisolatedEGObjects(j);
-	    for (int i = 0; i<4; i++) 
-	      {
-		isolatedEGObjects.at(i).setBx(bunchCrossings[sample]);
-		nonisolatedEGObjects.at(i).setBx(bunchCrossings[sample]);
-		rctEmCands->push_back(isolatedEGObjects.at(i));
-		rctEmCands->push_back(nonisolatedEGObjects.at(i));
-	      }
-	  }
-      
-      
-	for (int i = 0; i < 18; i++)
-	  {
-	    std::vector<L1CaloRegion> regions = rct->getRegions(i);
-	    for (int j = 0; j < 22; j++)
-	      {
-		regions.at(j).setBx(bunchCrossings[sample]);
-		rctRegions->push_back(regions.at(j));
-	      }
-	  }
+  for (unsigned short sample = 0; sample < bunchCrossings.size(); sample++) {
+    edm::Handle<EcalTrigPrimDigiCollection> ecal;
+    edm::Handle<HcalTrigPrimDigiCollection> hcal;
+
+    EcalTrigPrimDigiCollection ecalIn;
+    HcalTrigPrimDigiCollection hcalIn;
+
+    if (useHcal && event.getByLabel(hcalDigis[sample], hcal))
+      hcalIn = *hcal;
+
+    if (useEcal && event.getByLabel(ecalDigis[sample], ecal))
+      ecalIn = *ecal;
+
+    rct->digiInput(ecalIn, hcalIn);
+    rct->processEvent();
+
+    // Stuff to create
+    for (int j = 0; j < 18; j++) {
+      L1CaloEmCollection isolatedEGObjects = rct->getIsolatedEGObjects(j);
+      L1CaloEmCollection nonisolatedEGObjects = rct->getNonisolatedEGObjects(j);
+      for (int i = 0; i < 4; i++) {
+        isolatedEGObjects.at(i).setBx(bunchCrossings[sample]);
+        nonisolatedEGObjects.at(i).setBx(bunchCrossings[sample]);
+        rctEmCands->push_back(isolatedEGObjects.at(i));
+        rctEmCands->push_back(nonisolatedEGObjects.at(i));
+      }
+    }
 
+    for (int i = 0; i < 18; i++) {
+      std::vector<L1CaloRegion> regions = rct->getRegions(i);
+      for (int j = 0; j < 22; j++) {
+        regions.at(j).setBx(bunchCrossings[sample]);
+        rctRegions->push_back(regions.at(j));
       }
+    }
+  }
 
-  
-  //putting stuff back into event
+  // putting stuff back into event
   event.put(std::move(rctEmCands));
   event.put(std::move(rctRegions));
-  
 }
 
 // print contents of (FULL) FED vector
-void L1RCTProducer::printFedVector(const std::vector<int>& fedVector)
-{
+void L1RCTProducer::printFedVector(const std::vector<int> &fedVector) {
   std::cout << "Contents of given fedVector: ";
-  std::copy(fedVector.begin(), fedVector.end(), std::ostream_iterator<int>(std::cout, ", "));
+  std::copy(fedVector.begin(), fedVector.end(),
+            std::ostream_iterator<int>(std::cout, ", "));
   std::cout << std::endl;
 }
 
 // print contents of RCT channel mask fedUpdatedMask
-void L1RCTProducer::printUpdatedFedMask()
-{
-  if (fedUpdatedMask != nullptr)
-    {
-      fedUpdatedMask->print(std::cout);
-    }
-  else
-    {
-      std::cout << "Trying to print contents of fedUpdatedMask, but it doesn't exist!" << std::endl;
-    }
+void L1RCTProducer::printUpdatedFedMask() {
+  if (fedUpdatedMask != nullptr) {
+    fedUpdatedMask->print(std::cout);
+  } else {
+    std::cout
+        << "Trying to print contents of fedUpdatedMask, but it doesn't exist!"
+        << std::endl;
+  }
 }
 
 // print contents of RCT channel mask fedUpdatedMask
-void L1RCTProducer::printUpdatedFedMaskVerbose()
-{
-  if (fedUpdatedMask != nullptr)
-    {
-      // print contents of fedvector
-      std::cout << "Contents of fedUpdatedMask: ";
-//       std::copy(fedUpdatedMask.begin(), fedUpdatedMask.end(), std::ostream_iterator<int>(std::cout, ", "));
-      std::cout << "--> ECAL mask: " << std::endl;
-      for (int i = 0; i < 18; i++)
-	{
-	  for (int j = 0; j < 2; j++)
-	    {
-	      for (int k = 0; k < 28; k++)
-		{
-		  std::cout << fedUpdatedMask->ecalMask[i][j][k] << ", ";
-		}
-	    }
-	}
-      std::cout << "--> HCAL mask: " << std::endl;
-      for (int i = 0; i < 18; i++)
-	{
-	  for (int j = 0; j < 2; j++)
-	    {
-	      for (int k = 0; k < 28; k++)
-		{
-		  std::cout << fedUpdatedMask->hcalMask[i][j][k] << ", ";
-		}
-	    }
-	}
-      std::cout << "--> HF mask: " << std::endl;
-      for (int i = 0; i < 18; i++)
-	{
-	  for (int j = 0; j < 2; j++)
-	    {
-	      for (int k = 0; k < 4; k++)
-		{
-		  std::cout << fedUpdatedMask->hfMask[i][j][k] << ", ";
-		}
-	    }
-	}
-
-      std::cout << std::endl;
+void L1RCTProducer::printUpdatedFedMaskVerbose() {
+  if (fedUpdatedMask != nullptr) {
+    // print contents of fedvector
+    std::cout << "Contents of fedUpdatedMask: ";
+    //       std::copy(fedUpdatedMask.begin(), fedUpdatedMask.end(),
+    //       std::ostream_iterator<int>(std::cout, ", "));
+    std::cout << "--> ECAL mask: " << std::endl;
+    for (int i = 0; i < 18; i++) {
+      for (int j = 0; j < 2; j++) {
+        for (int k = 0; k < 28; k++) {
+          std::cout << fedUpdatedMask->ecalMask[i][j][k] << ", ";
+        }
+      }
     }
-  else
-    {
-      //print error message
-      std::cout << "Trying to print contents of fedUpdatedMask, but it doesn't exist!" << std::endl;
+    std::cout << "--> HCAL mask: " << std::endl;
+    for (int i = 0; i < 18; i++) {
+      for (int j = 0; j < 2; j++) {
+        for (int k = 0; k < 28; k++) {
+          std::cout << fedUpdatedMask->hcalMask[i][j][k] << ", ";
+        }
+      }
     }
+    std::cout << "--> HF mask: " << std::endl;
+    for (int i = 0; i < 18; i++) {
+      for (int j = 0; j < 2; j++) {
+        for (int k = 0; k < 4; k++) {
+          std::cout << fedUpdatedMask->hfMask[i][j][k] << ", ";
+        }
+      }
+    }
+
+    std::cout << std::endl;
+  } else {
+    // print error message
+    std::cout
+        << "Trying to print contents of fedUpdatedMask, but it doesn't exist!"
+        << std::endl;
+  }
 }
diff --git a/L1Trigger/RegionalCaloTrigger/plugins/L1RCTRelValAnalyzer.cc b/L1Trigger/RegionalCaloTrigger/plugins/L1RCTRelValAnalyzer.cc
index 7a5271c762ca8..d50d74d5fba37 100644
--- a/L1Trigger/RegionalCaloTrigger/plugins/L1RCTRelValAnalyzer.cc
+++ b/L1Trigger/RegionalCaloTrigger/plugins/L1RCTRelValAnalyzer.cc
@@ -2,114 +2,102 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
 
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTRelValAnalyzer.h"
 
-using std::string;
 using std::cout;
 using std::endl;
+using std::string;
 
 //
 // constructors and destructor
 //
-L1RCTRelValAnalyzer::L1RCTRelValAnalyzer(const edm::ParameterSet& iConfig) :
-  rctEmCandsLabel(iConfig.getParameter<edm::InputTag>("rctEmCandsLabel")),
-  rctRegionsLabel(iConfig.getParameter<edm::InputTag>("rctRegionsLabel"))
-{
-   //now do what ever initialization is needed
+L1RCTRelValAnalyzer::L1RCTRelValAnalyzer(const edm::ParameterSet &iConfig)
+    : rctEmCandsLabel(iConfig.getParameter<edm::InputTag>("rctEmCandsLabel")),
+      rctRegionsLabel(iConfig.getParameter<edm::InputTag>("rctRegionsLabel")) {
+  // now do what ever initialization is needed
 
   edm::Service<TFileService> fs;
-  h_emRank = fs->make<TH1F>( "emRank", "emRank", 64, 0., 64. );
-  h_emIeta = fs->make<TH1F>( "emOccupancyIeta", "emOccupancyIeta", 22, 0., 22. );
-  h_emIphi = fs->make<TH1F>( "emOccupancyIphi", "emOccupancyIphi", 18, 0., 18. );
-  h_emIsoOccIetaIphi = fs->make<TH2F>( "emIsoOccupancy2D", "emIsoOccupancy2D", 22, 0., 22.,
-				       18, 0., 18. );
-  h_emNonIsoOccIetaIphi = fs->make<TH2F>( "emNonIsoOccupancy2D", "emNonIsoOccupancy2D", 22, 0., 
-					  22., 18, 0., 18. );
-  
-  h_regionSum = fs->make<TH1F>( "regionSum", "regionSum", 100, 0., 100. );
-  h_regionSumIetaIphi = fs->make<TH2F>( "regionSumEtWeighted2D", "regionSumEtWeighted2D", 22, 
-					  0., 22., 18, 0., 18. );
-  h_regionOccIetaIphi = fs->make<TH2F>( "regionOccupancy2D", "regionOccupancy2D", 
-					22, 0., 22., 18, 0., 18. );
+  h_emRank = fs->make<TH1F>("emRank", "emRank", 64, 0., 64.);
+  h_emIeta = fs->make<TH1F>("emOccupancyIeta", "emOccupancyIeta", 22, 0., 22.);
+  h_emIphi = fs->make<TH1F>("emOccupancyIphi", "emOccupancyIphi", 18, 0., 18.);
+  h_emIsoOccIetaIphi = fs->make<TH2F>("emIsoOccupancy2D", "emIsoOccupancy2D",
+                                      22, 0., 22., 18, 0., 18.);
+  h_emNonIsoOccIetaIphi = fs->make<TH2F>(
+      "emNonIsoOccupancy2D", "emNonIsoOccupancy2D", 22, 0., 22., 18, 0., 18.);
+
+  h_regionSum = fs->make<TH1F>("regionSum", "regionSum", 100, 0., 100.);
+  h_regionSumIetaIphi =
+      fs->make<TH2F>("regionSumEtWeighted2D", "regionSumEtWeighted2D", 22, 0.,
+                     22., 18, 0., 18.);
+  h_regionOccIetaIphi = fs->make<TH2F>("regionOccupancy2D", "regionOccupancy2D",
+                                       22, 0., 22., 18, 0., 18.);
 }
 
+L1RCTRelValAnalyzer::~L1RCTRelValAnalyzer() {
 
-L1RCTRelValAnalyzer::~L1RCTRelValAnalyzer()
-{
-
-   // do anything here that needs to be done at destruction time
-   // (e.g. close files, deallocate resources etc.)
-
+  // do anything here that needs to be done at destruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-L1RCTRelValAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace edm;
+void L1RCTRelValAnalyzer::analyze(const edm::Event &iEvent,
+                                  const edm::EventSetup &iSetup) {
+  using namespace edm;
 #ifdef THIS_IS_AN_EVENT_EXAMPLE
-   Handle<ExampleData> pIn;
-   iEvent.getByLabel("example",pIn);
+  Handle<ExampleData> pIn;
+  iEvent.getByLabel("example", pIn);
 #endif
 
 #ifdef THIS_IS_AN_EVENTSETUP_EXAMPLE
-   ESHandle<SetupData> pSetup;
-   iSetup.get<SetupRecord>().get(pSetup);
+  ESHandle<SetupData> pSetup;
+  iSetup.get<SetupRecord>().get(pSetup);
 #endif
 
-   // as in L1GctTestAnalyzer.cc
-   Handle<L1CaloEmCollection> rctEmCands;
-   Handle<L1CaloRegionCollection> rctRegions;
-
-   L1CaloEmCollection::const_iterator em;
-   L1CaloRegionCollection::const_iterator rgn;
-
-   iEvent.getByLabel(rctEmCandsLabel, rctEmCands);
-   iEvent.getByLabel(rctRegionsLabel, rctRegions);
-
-   for (em=rctEmCands->begin(); em!=rctEmCands->end(); em++)
-     {
-       if ((*em).rank() > 0)
-	 {
-	   h_emRank->Fill( (*em).rank() );
-	   h_emIeta->Fill( (*em).regionId().ieta() );
-	   h_emIphi->Fill( (*em).regionId().iphi() );
-	   if ((*em).isolated())
-	     {
-	       h_emIsoOccIetaIphi->Fill( (*em).regionId().ieta(),
-					(*em).regionId().iphi() );
-	     }
-	   else
-	     {
-	       h_emNonIsoOccIetaIphi->Fill( (*em).regionId().ieta(),
-					   (*em).regionId().iphi() );
-	     }
-	 }
-     }
-   
-   for (rgn=rctRegions->begin(); rgn!=rctRegions->end(); rgn++){
-     if ( (*rgn).et() > 0 )
-       {
-	 h_regionSum->Fill( (*rgn).et() );
-	 h_regionSumIetaIphi->Fill( (*rgn).gctEta(), (*rgn).gctPhi(),
-				      (*rgn).et() );
-	 h_regionOccIetaIphi->Fill( (*rgn).gctEta(), (*rgn).gctPhi() );
-       }
-   }
+  // as in L1GctTestAnalyzer.cc
+  Handle<L1CaloEmCollection> rctEmCands;
+  Handle<L1CaloRegionCollection> rctRegions;
+
+  L1CaloEmCollection::const_iterator em;
+  L1CaloRegionCollection::const_iterator rgn;
+
+  iEvent.getByLabel(rctEmCandsLabel, rctEmCands);
+  iEvent.getByLabel(rctRegionsLabel, rctRegions);
+
+  for (em = rctEmCands->begin(); em != rctEmCands->end(); em++) {
+    if ((*em).rank() > 0) {
+      h_emRank->Fill((*em).rank());
+      h_emIeta->Fill((*em).regionId().ieta());
+      h_emIphi->Fill((*em).regionId().iphi());
+      if ((*em).isolated()) {
+        h_emIsoOccIetaIphi->Fill((*em).regionId().ieta(),
+                                 (*em).regionId().iphi());
+      } else {
+        h_emNonIsoOccIetaIphi->Fill((*em).regionId().ieta(),
+                                    (*em).regionId().iphi());
+      }
+    }
+  }
+
+  for (rgn = rctRegions->begin(); rgn != rctRegions->end(); rgn++) {
+    if ((*rgn).et() > 0) {
+      h_regionSum->Fill((*rgn).et());
+      h_regionSumIetaIphi->Fill((*rgn).gctEta(), (*rgn).gctPhi(), (*rgn).et());
+      h_regionOccIetaIphi->Fill((*rgn).gctEta(), (*rgn).gctPhi());
+    }
+  }
 }
diff --git a/L1Trigger/RegionalCaloTrigger/plugins/L1RCTSaveInput.cc b/L1Trigger/RegionalCaloTrigger/plugins/L1RCTSaveInput.cc
index cca30e009a9c0..581a4a1b20268 100644
--- a/L1Trigger/RegionalCaloTrigger/plugins/L1RCTSaveInput.cc
+++ b/L1Trigger/RegionalCaloTrigger/plugins/L1RCTSaveInput.cc
@@ -1,239 +1,225 @@
+#include <fstream>
+#include <iostream>
 #include <memory>
 #include <string>
-#include <iostream>
-#include <fstream>
-using std::ostream;
-using std::cout;
 using std::cerr;
+using std::cout;
 using std::endl;
+using std::ostream;
 
 #include <iomanip>
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTSaveInput.h"
 
-#include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
+#include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
 
-#include "CondFormats/L1TObjects/interface/L1CaloHcalScale.h"
+#include "CondFormats/DataRecord/interface/L1CaloEcalScaleRcd.h"
 #include "CondFormats/DataRecord/interface/L1CaloHcalScaleRcd.h"
 #include "CondFormats/L1TObjects/interface/L1CaloEcalScale.h"
-#include "CondFormats/DataRecord/interface/L1CaloEcalScaleRcd.h"
+#include "CondFormats/L1TObjects/interface/L1CaloHcalScale.h"
 
 // also include old-style scales -- same as L1RCTProducer?
-#include "CalibFormats/CaloTPG/interface/CaloTPGTranscoder.h"
-#include "CalibFormats/CaloTPG/interface/CaloTPGRecord.h"
 #include "CalibCalorimetry/EcalTPGTools/interface/EcalTPGScale.h"
+#include "CalibFormats/CaloTPG/interface/CaloTPGRecord.h"
+#include "CalibFormats/CaloTPG/interface/CaloTPGTranscoder.h"
 
-#include "CondFormats/L1TObjects/interface/L1CaloEtScale.h"
 #include "CondFormats/DataRecord/interface/L1EmEtScaleRcd.h"
+#include "CondFormats/L1TObjects/interface/L1CaloEtScale.h"
 
-#include "CondFormats/L1TObjects/interface/L1RCTParameters.h"
+#include "CondFormats/DataRecord/interface/L1RCTChannelMaskRcd.h"
 #include "CondFormats/DataRecord/interface/L1RCTParametersRcd.h"
 #include "CondFormats/L1TObjects/interface/L1RCTChannelMask.h"
-#include "CondFormats/DataRecord/interface/L1RCTChannelMaskRcd.h"
+#include "CondFormats/L1TObjects/interface/L1RCTParameters.h"
 
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCT.h"
-#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h" 
-
-L1RCTSaveInput::L1RCTSaveInput(const edm::ParameterSet& conf) :
-  fileName(conf.getUntrackedParameter<std::string>("rctTestInputFile")),
-  rctLookupTables(new L1RCTLookupTables),
-  rct(new L1RCT(rctLookupTables)),
-  useEcal(conf.getParameter<bool>("useEcal")),
-  useHcal(conf.getParameter<bool>("useHcal")),
-  ecalDigisLabel(conf.getParameter<edm::InputTag>("ecalDigisLabel")),
-  hcalDigisLabel(conf.getParameter<edm::InputTag>("hcalDigisLabel")),
-  useDebugTpgScales(conf.getParameter<bool>("useDebugTpgScales"))
-{
+#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h"
+
+L1RCTSaveInput::L1RCTSaveInput(const edm::ParameterSet &conf)
+    : fileName(conf.getUntrackedParameter<std::string>("rctTestInputFile")),
+      rctLookupTables(new L1RCTLookupTables), rct(new L1RCT(rctLookupTables)),
+      useEcal(conf.getParameter<bool>("useEcal")),
+      useHcal(conf.getParameter<bool>("useHcal")),
+      ecalDigisLabel(conf.getParameter<edm::InputTag>("ecalDigisLabel")),
+      hcalDigisLabel(conf.getParameter<edm::InputTag>("hcalDigisLabel")),
+      useDebugTpgScales(conf.getParameter<bool>("useDebugTpgScales")) {
   ofs.open(fileName.c_str(), std::ios::app);
-  if(!ofs)
-    {
-      std::cerr << "Could not create " << fileName << std::endl;
-      exit(1);
-    }
+  if (!ofs) {
+    std::cerr << "Could not create " << fileName << std::endl;
+    exit(1);
+  }
 }
 
-L1RCTSaveInput::~L1RCTSaveInput()
-{
-  if(rct != nullptr) delete rct;
-  if(rctLookupTables != nullptr) delete rctLookupTables;
+L1RCTSaveInput::~L1RCTSaveInput() {
+  if (rct != nullptr)
+    delete rct;
+  if (rctLookupTables != nullptr)
+    delete rctLookupTables;
 }
 
-void
-L1RCTSaveInput::analyze(const edm::Event& event,
-			const edm::EventSetup& eventSetup)
-{
+void L1RCTSaveInput::analyze(const edm::Event &event,
+                             const edm::EventSetup &eventSetup) {
   edm::ESHandle<L1RCTParameters> rctParameters;
   eventSetup.get<L1RCTParametersRcd>().get(rctParameters);
-  const L1RCTParameters* r = rctParameters.product();
+  const L1RCTParameters *r = rctParameters.product();
   edm::ESHandle<L1RCTChannelMask> channelMask;
   eventSetup.get<L1RCTChannelMaskRcd>().get(channelMask);
-  const L1RCTChannelMask* c = channelMask.product();
+  const L1RCTChannelMask *c = channelMask.product();
   edm::ESHandle<L1CaloEtScale> emScale;
   eventSetup.get<L1EmEtScaleRcd>().get(emScale);
-  const L1CaloEtScale* s = emScale.product();
+  const L1CaloEtScale *s = emScale.product();
 
   rctLookupTables->setRCTParameters(r);
   rctLookupTables->setChannelMask(c);
   rctLookupTables->setL1CaloEtScale(s);
 
-  if (useDebugTpgScales)
-    {
-      // use old-style scales
-      edm::ESHandle<CaloTPGTranscoder> transcoder;
-      eventSetup.get<CaloTPGRecord>().get(transcoder);
-      const CaloTPGTranscoder* h_tpg = transcoder.product();
-
-      EcalTPGScale* e_tpg = new EcalTPGScale();
-      e_tpg->setEventSetup(eventSetup);
-
-      L1CaloEcalScale* ecalScale = new L1CaloEcalScale();
-      L1CaloHcalScale* hcalScale = new L1CaloHcalScale();
-
-      // create input scales, werner's code
-      // ECAL
-      std::cout << "ECAL Pos " << L1CaloEcalScale::nBinRank << std::endl ;
-      for( unsigned short ieta = 1 ; ieta <= L1CaloEcalScale::nBinEta; ++ieta )
-        {
-          for( unsigned short irank = 0 ; irank < L1CaloEcalScale::nBinRank; ++irank )
-            {
-              std::cout << ieta << " " << irank ;
-              EcalSubdetector subdet = ( ieta <= 17 ) ? EcalBarrel : EcalEndcap ;
-              double etGeVPos =
-                e_tpg->getTPGInGeV
-                ( irank, EcalTrigTowerDetId(1, // +ve eta
-                                            subdet,
-                                            ieta,
-                                            1 )); // dummy phi value
-              ecalScale->setBin( irank, ieta, 1, etGeVPos ) ;
-	      std::cout << etGeVPos << ", " ;
-            }
-	  std::cout << std::endl ;
-        }
-      std::cout << std::endl ;
-
-      std::cout << "ECAL Neg" << std::endl ;
-      for( unsigned short ieta = 1 ; ieta <= L1CaloEcalScale::nBinEta; ++ieta )
-        {
-          for( unsigned short irank = 0 ; irank < L1CaloEcalScale::nBinRank; ++irank )
-            {
-              EcalSubdetector subdet = ( ieta <= 17 ) ? EcalBarrel : EcalEndcap ;
-
-	      std::cout << ieta << " " << irank ;
-              double etGeVNeg =
-                e_tpg->getTPGInGeV
-                ( irank,
-                  EcalTrigTowerDetId(-1, // -ve eta
-                                     subdet,
-                                     ieta,
-                                     2 )); // dummy phi value
-              ecalScale->setBin( irank, ieta, -1, etGeVNeg ) ;
-	      std::cout << etGeVNeg << ", " ;
-            }
-	  std::cout << std::endl ;
-        }
-      std::cout << std::endl ;
-
-      // HCAL
-      std::cout << "HCAL" << std::endl ;
-      for( unsigned short ieta = 1 ; ieta <= L1CaloHcalScale::nBinEta; ++ieta )
-        {
-          for( unsigned short irank = 0 ; irank < L1CaloHcalScale::nBinRank; ++irank )
-            {
-              double etGeV = h_tpg->hcaletValue( ieta, irank ) ;
-
-              hcalScale->setBin( irank, ieta, 1, etGeV ) ;
-              hcalScale->setBin( irank, ieta, -1, etGeV ) ;
-	      std::cout << etGeV << ", " ;
-	      std::cout << std::endl ;
-	    }
-	  std::cout << std::endl ;
-	}
-
-      // set the input scales
-      rctLookupTables->setEcalScale(ecalScale);
-      rctLookupTables->setHcalScale(hcalScale);
-      
-      delete e_tpg;
-      
+  if (useDebugTpgScales) {
+    // use old-style scales
+    edm::ESHandle<CaloTPGTranscoder> transcoder;
+    eventSetup.get<CaloTPGRecord>().get(transcoder);
+    const CaloTPGTranscoder *h_tpg = transcoder.product();
+
+    EcalTPGScale *e_tpg = new EcalTPGScale();
+    e_tpg->setEventSetup(eventSetup);
+
+    L1CaloEcalScale *ecalScale = new L1CaloEcalScale();
+    L1CaloHcalScale *hcalScale = new L1CaloHcalScale();
+
+    // create input scales, werner's code
+    // ECAL
+    std::cout << "ECAL Pos " << L1CaloEcalScale::nBinRank << std::endl;
+    for (unsigned short ieta = 1; ieta <= L1CaloEcalScale::nBinEta; ++ieta) {
+      for (unsigned short irank = 0; irank < L1CaloEcalScale::nBinRank;
+           ++irank) {
+        std::cout << ieta << " " << irank;
+        EcalSubdetector subdet = (ieta <= 17) ? EcalBarrel : EcalEndcap;
+        double etGeVPos =
+            e_tpg->getTPGInGeV(irank, EcalTrigTowerDetId(1, // +ve eta
+                                                         subdet, ieta,
+                                                         1)); // dummy phi value
+        ecalScale->setBin(irank, ieta, 1, etGeVPos);
+        std::cout << etGeVPos << ", ";
+      }
+      std::cout << std::endl;
     }
-  else
-    {
-      edm::ESHandle<L1CaloHcalScale> hcalScale;
-      eventSetup.get<L1CaloHcalScaleRcd>().get(hcalScale);
-      const L1CaloHcalScale* h = hcalScale.product();
-      edm::ESHandle<L1CaloEcalScale> ecalScale;
-      eventSetup.get<L1CaloEcalScaleRcd>().get(ecalScale);
-      const L1CaloEcalScale* e = ecalScale.product();
-
-      rctLookupTables->setHcalScale(h);
-      rctLookupTables->setEcalScale(e);
-
+    std::cout << std::endl;
+
+    std::cout << "ECAL Neg" << std::endl;
+    for (unsigned short ieta = 1; ieta <= L1CaloEcalScale::nBinEta; ++ieta) {
+      for (unsigned short irank = 0; irank < L1CaloEcalScale::nBinRank;
+           ++irank) {
+        EcalSubdetector subdet = (ieta <= 17) ? EcalBarrel : EcalEndcap;
+
+        std::cout << ieta << " " << irank;
+        double etGeVNeg =
+            e_tpg->getTPGInGeV(irank,
+                               EcalTrigTowerDetId(-1, // -ve eta
+                                                  subdet, ieta,
+                                                  2)); // dummy phi value
+        ecalScale->setBin(irank, ieta, -1, etGeVNeg);
+        std::cout << etGeVNeg << ", ";
+      }
+      std::cout << std::endl;
+    }
+    std::cout << std::endl;
+
+    // HCAL
+    std::cout << "HCAL" << std::endl;
+    for (unsigned short ieta = 1; ieta <= L1CaloHcalScale::nBinEta; ++ieta) {
+      for (unsigned short irank = 0; irank < L1CaloHcalScale::nBinRank;
+           ++irank) {
+        double etGeV = h_tpg->hcaletValue(ieta, irank);
+
+        hcalScale->setBin(irank, ieta, 1, etGeV);
+        hcalScale->setBin(irank, ieta, -1, etGeV);
+        std::cout << etGeV << ", ";
+        std::cout << std::endl;
+      }
+      std::cout << std::endl;
     }
 
+    // set the input scales
+    rctLookupTables->setEcalScale(ecalScale);
+    rctLookupTables->setHcalScale(hcalScale);
+
+    delete e_tpg;
+
+  } else {
+    edm::ESHandle<L1CaloHcalScale> hcalScale;
+    eventSetup.get<L1CaloHcalScaleRcd>().get(hcalScale);
+    const L1CaloHcalScale *h = hcalScale.product();
+    edm::ESHandle<L1CaloEcalScale> ecalScale;
+    eventSetup.get<L1CaloEcalScaleRcd>().get(ecalScale);
+    const L1CaloEcalScale *e = ecalScale.product();
+
+    rctLookupTables->setHcalScale(h);
+    rctLookupTables->setEcalScale(e);
+  }
+
   edm::Handle<EcalTrigPrimDigiCollection> ecal;
   edm::Handle<HcalTrigPrimDigiCollection> hcal;
-  event.getByLabel(ecalDigisLabel, ecal); 
-  event.getByLabel(hcalDigisLabel, hcal); 
+  event.getByLabel(ecalDigisLabel, ecal);
+  event.getByLabel(hcalDigisLabel, hcal);
   EcalTrigPrimDigiCollection ecalColl;
   HcalTrigPrimDigiCollection hcalColl;
-  if (ecal.isValid()) { ecalColl = *ecal; }
-  if (hcal.isValid()) { hcalColl = *hcal; }
+  if (ecal.isValid()) {
+    ecalColl = *ecal;
+  }
+  if (hcal.isValid()) {
+    hcalColl = *hcal;
+  }
   rct->digiInput(ecalColl, hcalColl);
   static int nEvents = 0;
-  if(nEvents == 0)
-    {
-      ofs
-	<< "Crate = 0-17" << std::endl
-	<< "Card = 0-7 within the crate" << std::endl
-	<< "Tower = 0-31 covers 4 x 8 covered by the card" << std::endl
-	<< "EMAddr(0:8) = EMFGBit(0:0)+CompressedEMET(1:8)" << std::endl
-	<< "HDAddr(0:8) = HDFGBit(0:0)+CompressedHDET(1:8) - note: HDFGBit(0:0) is not part of the hardware LUT address" << std::endl
-	<< "LutOut(0:17)= LinearEMET(0:6)+HoEFGVetoBit(7:7)+LinearJetET(8:16)+ActivityBit(17:17)" << std::endl
-	<< "Event" << "\t"
-	<< "Crate" << "\t"
-	<< "Card" << "\t"
-	<< "Tower" << "\t"
-	<< "EMAddr" << "\t"
-	<< "HDAddr" << "\t"
-	<< "LUTOut"
-	<< std::endl;
-    }
-  if(nEvents < 64)
-    {
-      for(unsigned short iCrate = 0; iCrate < 18; iCrate++)
-	{
-	  for(unsigned short iCard = 0; iCard < 7; iCard++)
-	    {
-	      // tower numbered from 0-31
-	      for(unsigned short iTower = 0; iTower < 32; iTower++)
-		{
-		  unsigned short ecal = rct->ecalCompressedET(iCrate, iCard, iTower);
-		  unsigned short hcal = rct->hcalCompressedET(iCrate, iCard, iTower);
-		  unsigned short fgbit = rct->ecalFineGrainBit(iCrate, iCard, iTower);
-		  unsigned short mubit = rct->hcalFineGrainBit(iCrate, iCard, iTower);
-		  unsigned long lutOutput = rctLookupTables->lookup(ecal, hcal, fgbit, iCrate, iCard, iTower);
-		  ofs
-		    << std::hex 
-		    << nEvents << "\t"
-		    << iCrate << "\t"
-		    << iCard << "\t"
-		    << iTower << "\t"
-		    << ecal * 2 + fgbit << "\t"
-		    << hcal * 2 + mubit << "\t"
-		    << lutOutput
-		    << std::dec 
-		    << std::endl;
-		}
-	    }
-	}
+  if (nEvents == 0) {
+    ofs << "Crate = 0-17" << std::endl
+        << "Card = 0-7 within the crate" << std::endl
+        << "Tower = 0-31 covers 4 x 8 covered by the card" << std::endl
+        << "EMAddr(0:8) = EMFGBit(0:0)+CompressedEMET(1:8)" << std::endl
+        << "HDAddr(0:8) = HDFGBit(0:0)+CompressedHDET(1:8) - note: "
+           "HDFGBit(0:0) is not part of the hardware LUT address"
+        << std::endl
+        << "LutOut(0:17)= "
+           "LinearEMET(0:6)+HoEFGVetoBit(7:7)+LinearJetET(8:16)+ActivityBit(17:"
+           "17)"
+        << std::endl
+        << "Event"
+        << "\t"
+        << "Crate"
+        << "\t"
+        << "Card"
+        << "\t"
+        << "Tower"
+        << "\t"
+        << "EMAddr"
+        << "\t"
+        << "HDAddr"
+        << "\t"
+        << "LUTOut" << std::endl;
+  }
+  if (nEvents < 64) {
+    for (unsigned short iCrate = 0; iCrate < 18; iCrate++) {
+      for (unsigned short iCard = 0; iCard < 7; iCard++) {
+        // tower numbered from 0-31
+        for (unsigned short iTower = 0; iTower < 32; iTower++) {
+          unsigned short ecal = rct->ecalCompressedET(iCrate, iCard, iTower);
+          unsigned short hcal = rct->hcalCompressedET(iCrate, iCard, iTower);
+          unsigned short fgbit = rct->ecalFineGrainBit(iCrate, iCard, iTower);
+          unsigned short mubit = rct->hcalFineGrainBit(iCrate, iCard, iTower);
+          unsigned long lutOutput =
+              rctLookupTables->lookup(ecal, hcal, fgbit, iCrate, iCard, iTower);
+          ofs << std::hex << nEvents << "\t" << iCrate << "\t" << iCard << "\t"
+              << iTower << "\t" << ecal * 2 + fgbit << "\t" << hcal * 2 + mubit
+              << "\t" << lutOutput << std::dec << std::endl;
+        }
+      }
     }
+  }
   nEvents++;
 }
diff --git a/L1Trigger/RegionalCaloTrigger/plugins/L1RCTTPGProvider.cc b/L1Trigger/RegionalCaloTrigger/plugins/L1RCTTPGProvider.cc
index 38951e4ae0907..c714c93631ccc 100644
--- a/L1Trigger/RegionalCaloTrigger/plugins/L1RCTTPGProvider.cc
+++ b/L1Trigger/RegionalCaloTrigger/plugins/L1RCTTPGProvider.cc
@@ -1,405 +1,360 @@
-#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTTPGProvider.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
+#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTTPGProvider.h"
 
-L1RCTTPGProvider::L1RCTTPGProvider(const edm::ParameterSet& iConfig):
-  ecalTPG_(iConfig.getParameter<edm::InputTag>("ecalTPGs")),
-  hcalTPG_(iConfig.getParameter<edm::InputTag>("hcalTPGs")),
-  useHcalCosmicTiming(iConfig.getParameter<bool>("useHCALCosmicTiming")),
-  useEcalCosmicTiming(iConfig.getParameter<bool>("useECALCosmicTiming")),
-  preSamples(iConfig.getParameter<int>("preSamples")),
-  postSamples(iConfig.getParameter<int>("postSamples")),
-  hfShift(iConfig.getParameter<int>("HFShift")),
-  hbShift(iConfig.getParameter<int>("HBShift"))
-{
-
-  //Output :The new manipulated TPGs
-  //make it smart - to name the collections
-  //correctly
-    char ecal_label[200];
-    char hcal_label[200];
-
-
-
-    for(int i=preSamples;i>0;--i)
-      {
-        sprintf(ecal_label,"ECALBxminus%d",i);
-        sprintf(hcal_label,"HCALBxminus%d",i);
-        produces<EcalTrigPrimDigiCollection>(ecal_label);
-        produces<HcalTrigPrimDigiCollection>(hcal_label);
-      }
-    
-    produces<EcalTrigPrimDigiCollection>("ECALBx0");
-    produces<HcalTrigPrimDigiCollection>("HCALBx0");
-
-    for(int i=0;i<postSamples;++i)
-      {
-       sprintf(ecal_label,"ECALBxplus%d",i+1);
-       sprintf(hcal_label,"HCALBxplus%d",i+1);
-       produces<EcalTrigPrimDigiCollection>(ecal_label);
-       produces<HcalTrigPrimDigiCollection>(hcal_label);
-      }
+L1RCTTPGProvider::L1RCTTPGProvider(const edm::ParameterSet &iConfig)
+    : ecalTPG_(iConfig.getParameter<edm::InputTag>("ecalTPGs")),
+      hcalTPG_(iConfig.getParameter<edm::InputTag>("hcalTPGs")),
+      useHcalCosmicTiming(iConfig.getParameter<bool>("useHCALCosmicTiming")),
+      useEcalCosmicTiming(iConfig.getParameter<bool>("useECALCosmicTiming")),
+      preSamples(iConfig.getParameter<int>("preSamples")),
+      postSamples(iConfig.getParameter<int>("postSamples")),
+      hfShift(iConfig.getParameter<int>("HFShift")),
+      hbShift(iConfig.getParameter<int>("HBShift")) {
+
+  // Output :The new manipulated TPGs
+  // make it smart - to name the collections
+  // correctly
+  char ecal_label[200];
+  char hcal_label[200];
+
+  for (int i = preSamples; i > 0; --i) {
+    sprintf(ecal_label, "ECALBxminus%d", i);
+    sprintf(hcal_label, "HCALBxminus%d", i);
+    produces<EcalTrigPrimDigiCollection>(ecal_label);
+    produces<HcalTrigPrimDigiCollection>(hcal_label);
+  }
+
+  produces<EcalTrigPrimDigiCollection>("ECALBx0");
+  produces<HcalTrigPrimDigiCollection>("HCALBx0");
+
+  for (int i = 0; i < postSamples; ++i) {
+    sprintf(ecal_label, "ECALBxplus%d", i + 1);
+    sprintf(hcal_label, "HCALBxplus%d", i + 1);
+    produces<EcalTrigPrimDigiCollection>(ecal_label);
+    produces<HcalTrigPrimDigiCollection>(hcal_label);
+  }
 }
 
-L1RCTTPGProvider::~L1RCTTPGProvider()
-{
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+L1RCTTPGProvider::~L1RCTTPGProvider() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-L1RCTTPGProvider::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace edm;
-   //Declare handles
-   Handle<EcalTrigPrimDigiCollection> ecal;
-   Handle<HcalTrigPrimDigiCollection> hcal;
+void L1RCTTPGProvider::produce(edm::Event &iEvent,
+                               const edm::EventSetup &iSetup) {
+  using namespace edm;
+  // Declare handles
+  Handle<EcalTrigPrimDigiCollection> ecal;
+  Handle<HcalTrigPrimDigiCollection> hcal;
 
-   //Declare vector of collection to send for output !
+  // Declare vector of collection to send for output !
 
-   std::vector<EcalTrigPrimDigiCollection> ecalColl(preSamples+1+postSamples);
-   std::vector<HcalTrigPrimDigiCollection> hcalColl(preSamples+1+postSamples);
+  std::vector<EcalTrigPrimDigiCollection> ecalColl(preSamples + 1 +
+                                                   postSamples);
+  std::vector<HcalTrigPrimDigiCollection> hcalColl(preSamples + 1 +
+                                                   postSamples);
 
   unsigned nSamples = preSamples + postSamples + 1;
 
-
-  if(iEvent.getByLabel(ecalTPG_,ecal))
-    if (ecal.isValid()) 
-      { 
+  if (iEvent.getByLabel(ecalTPG_, ecal))
+    if (ecal.isValid()) {
       // loop through all ecal digis
-      for (EcalTrigPrimDigiCollection::const_iterator ecal_it = ecal->begin(); ecal_it != ecal->end(); ecal_it++)
-	{
-	  short zside             = ecal_it->id().zside();
-	  unsigned short ietaAbs  = ecal_it->id().ietaAbs();
-	  short iphi              = ecal_it->id().iphi();
-	  unsigned short digiSize = ecal_it->size();
-	  unsigned short nSOI     = (unsigned short) ( ecal_it->sampleOfInterest() );
-	  if (digiSize < nSamples || nSOI < preSamples || ((int)(digiSize - nSOI) < (int)(nSamples - preSamples)))
-	    {
-	      unsigned short preLoopsZero = (unsigned short) (preSamples)- nSOI;
-
-	      // fill extra bx's at beginning with zeros
-	      for (int sample = 0; sample < preLoopsZero; sample++)
-		{
-		  // fill first few with zeros
-		  EcalTriggerPrimitiveDigi
-		    ecalDigi(EcalTrigTowerDetId((int) zside, EcalTriggerTower,
-						(int) ietaAbs, (int) iphi));
-		  ecalDigi.setSize(1);
-		  ecalDigi.setSample(0, EcalTriggerPrimitiveSample(0,false,0));
-		  ecalColl[sample].push_back(ecalDigi);
-		}
-
-	      // loop through existing data
-	      for (int sample = preLoopsZero;sample < (preLoopsZero + digiSize); sample++)
-		{
-		  // go through data
-		  EcalTriggerPrimitiveDigi
-		    ecalDigi(EcalTrigTowerDetId((int) zside, EcalTriggerTower,
-						(int) ietaAbs, (int) iphi));
-		  ecalDigi.setSize(1);
-		  if (useEcalCosmicTiming && iphi >= 1 && iphi <= 36)
-		    {
-		      if (nSOI < (preSamples + 1))
-			{
-			  edm::LogWarning ("TooLittleData")
-			    << "ECAL data needs at least one presample "
-			    << "more than the number requested "
-			    << "to use ecal cosmic timing mod!  "
-			    << "reverting to useEcalCosmicTiming = false "
-			    << "for rest of job.";
-			  useEcalCosmicTiming = false;
-			}
-		      else
-			{
-			  ecalDigi.setSample(0, EcalTriggerPrimitiveSample
-					     (ecal_it->sample(nSOI + sample - 
-							      preSamples - 
-							      1).raw()));
-			}
-		    }
-		  //else
-		  if ((!useEcalCosmicTiming) || (iphi >=37 && iphi <= 72))
-		    {
-		      ecalDigi.setSample(0, EcalTriggerPrimitiveSample
-					 (ecal_it->sample(nSOI + sample - 
-							  preSamples).raw()));
-		    }
-		  ecalColl[sample].push_back(ecalDigi);
-		}
-	      
-	      // fill extra bx's at end with zeros
-	      for (unsigned int sample = (preLoopsZero + digiSize); 
-		   sample < nSamples; sample++)
-		{
-		  // fill zeros!
-		  EcalTriggerPrimitiveDigi
-		    ecalDigi(EcalTrigTowerDetId((int) zside, EcalTriggerTower,
-						(int) ietaAbs, (int) iphi));
-		  ecalDigi.setSize(1);
-		  ecalDigi.setSample(0, EcalTriggerPrimitiveSample(0,false,0));
-		  ecalColl[sample].push_back(ecalDigi);
-		}
-	    }
-	  else
-	    {
-	      for (unsigned short sample = 0; sample < nSamples; sample++)
-		{
-		  // put each time sample into its own digi
-		  short zside = ecal_it->id().zside();
-		  unsigned short ietaAbs = ecal_it->id().ietaAbs();
-		  short iphi = ecal_it->id().iphi();
-		  EcalTriggerPrimitiveDigi
-		    ecalDigi(EcalTrigTowerDetId((int) zside, EcalTriggerTower,
-						(int) ietaAbs, (int) iphi));
-		  ecalDigi.setSize(1);
-
-		  if (useEcalCosmicTiming && iphi >= 1 && iphi <=36)
-		    {
-		      if (nSOI < (preSamples + 1))
-			{
-			  edm::LogWarning ("TooLittleData")
-			    << "ECAL data needs at least one presample "
-			    << "more than the number requested "
-			    << "to use ecal cosmic timing mod!  "
-			    << "reverting to useEcalCosmicTiming = false "
-			    << "for rest of job.";
-			  useEcalCosmicTiming = false;
-			}
-		      else
-			{
-			  ecalDigi.setSample(0, EcalTriggerPrimitiveSample
-					     (ecal_it->sample
-					      (ecal_it->sampleOfInterest() + 
-					       sample - preSamples - 
-					       1).raw()));
-			}
-		    }
-		  //else
-		  if ((!useEcalCosmicTiming) || (iphi >=37 && iphi <= 72))
-		    {
-		      ecalDigi.setSample(0, EcalTriggerPrimitiveSample
-					 (ecal_it->sample
-					  (ecal_it->sampleOfInterest() + 
-					   sample - preSamples).raw()));
-		    }
-		  // push back each digi into correct "time sample" of coll
-		  ecalColl[sample].push_back(ecalDigi);
-		}
-	    }
-	}
+      for (EcalTrigPrimDigiCollection::const_iterator ecal_it = ecal->begin();
+           ecal_it != ecal->end(); ecal_it++) {
+        short zside = ecal_it->id().zside();
+        unsigned short ietaAbs = ecal_it->id().ietaAbs();
+        short iphi = ecal_it->id().iphi();
+        unsigned short digiSize = ecal_it->size();
+        unsigned short nSOI = (unsigned short)(ecal_it->sampleOfInterest());
+        if (digiSize < nSamples || nSOI < preSamples ||
+            ((int)(digiSize - nSOI) < (int)(nSamples - preSamples))) {
+          unsigned short preLoopsZero = (unsigned short)(preSamples)-nSOI;
+
+          // fill extra bx's at beginning with zeros
+          for (int sample = 0; sample < preLoopsZero; sample++) {
+            // fill first few with zeros
+            EcalTriggerPrimitiveDigi ecalDigi(EcalTrigTowerDetId(
+                (int)zside, EcalTriggerTower, (int)ietaAbs, (int)iphi));
+            ecalDigi.setSize(1);
+            ecalDigi.setSample(0, EcalTriggerPrimitiveSample(0, false, 0));
+            ecalColl[sample].push_back(ecalDigi);
+          }
+
+          // loop through existing data
+          for (int sample = preLoopsZero; sample < (preLoopsZero + digiSize);
+               sample++) {
+            // go through data
+            EcalTriggerPrimitiveDigi ecalDigi(EcalTrigTowerDetId(
+                (int)zside, EcalTriggerTower, (int)ietaAbs, (int)iphi));
+            ecalDigi.setSize(1);
+            if (useEcalCosmicTiming && iphi >= 1 && iphi <= 36) {
+              if (nSOI < (preSamples + 1)) {
+                edm::LogWarning("TooLittleData")
+                    << "ECAL data needs at least one presample "
+                    << "more than the number requested "
+                    << "to use ecal cosmic timing mod!  "
+                    << "reverting to useEcalCosmicTiming = false "
+                    << "for rest of job.";
+                useEcalCosmicTiming = false;
+              } else {
+                ecalDigi.setSample(
+                    0,
+                    EcalTriggerPrimitiveSample(
+                        ecal_it->sample(nSOI + sample - preSamples - 1).raw()));
+              }
+            }
+            // else
+            if ((!useEcalCosmicTiming) || (iphi >= 37 && iphi <= 72)) {
+              ecalDigi.setSample(
+                  0, EcalTriggerPrimitiveSample(
+                         ecal_it->sample(nSOI + sample - preSamples).raw()));
+            }
+            ecalColl[sample].push_back(ecalDigi);
+          }
+
+          // fill extra bx's at end with zeros
+          for (unsigned int sample = (preLoopsZero + digiSize);
+               sample < nSamples; sample++) {
+            // fill zeros!
+            EcalTriggerPrimitiveDigi ecalDigi(EcalTrigTowerDetId(
+                (int)zside, EcalTriggerTower, (int)ietaAbs, (int)iphi));
+            ecalDigi.setSize(1);
+            ecalDigi.setSample(0, EcalTriggerPrimitiveSample(0, false, 0));
+            ecalColl[sample].push_back(ecalDigi);
+          }
+        } else {
+          for (unsigned short sample = 0; sample < nSamples; sample++) {
+            // put each time sample into its own digi
+            short zside = ecal_it->id().zside();
+            unsigned short ietaAbs = ecal_it->id().ietaAbs();
+            short iphi = ecal_it->id().iphi();
+            EcalTriggerPrimitiveDigi ecalDigi(EcalTrigTowerDetId(
+                (int)zside, EcalTriggerTower, (int)ietaAbs, (int)iphi));
+            ecalDigi.setSize(1);
+
+            if (useEcalCosmicTiming && iphi >= 1 && iphi <= 36) {
+              if (nSOI < (preSamples + 1)) {
+                edm::LogWarning("TooLittleData")
+                    << "ECAL data needs at least one presample "
+                    << "more than the number requested "
+                    << "to use ecal cosmic timing mod!  "
+                    << "reverting to useEcalCosmicTiming = false "
+                    << "for rest of job.";
+                useEcalCosmicTiming = false;
+              } else {
+                ecalDigi.setSample(
+                    0, EcalTriggerPrimitiveSample(
+                           ecal_it
+                               ->sample(ecal_it->sampleOfInterest() + sample -
+                                        preSamples - 1)
+                               .raw()));
+              }
+            }
+            // else
+            if ((!useEcalCosmicTiming) || (iphi >= 37 && iphi <= 72)) {
+              ecalDigi.setSample(0,
+                                 EcalTriggerPrimitiveSample(
+                                     ecal_it
+                                         ->sample(ecal_it->sampleOfInterest() +
+                                                  sample - preSamples)
+                                         .raw()));
+            }
+            // push back each digi into correct "time sample" of coll
+            ecalColl[sample].push_back(ecalDigi);
+          }
+        }
+      }
     }
 
-  if(iEvent.getByLabel(hcalTPG_,hcal))
-    if (hcal.isValid()) 
-    { 
+  if (iEvent.getByLabel(hcalTPG_, hcal))
+    if (hcal.isValid()) {
       // loop through all hcal digis
-      for (HcalTrigPrimDigiCollection::const_iterator hcal_it = hcal->begin(); hcal_it != hcal->end(); hcal_it++)
-	{
-	  short ieta = hcal_it->id().ieta();
-	  short iphi = hcal_it->id().iphi();
-	  // loop through time samples for each digi
-	  unsigned short digiSize = hcal_it->size();
-	  // (size of each digi must be no less than nSamples)
-	  unsigned short nSOI = (unsigned short) (hcal_it->presamples());
-	  if (digiSize < nSamples || nSOI < preSamples
-	      || ((int)(digiSize - nSOI) < (int)(nSamples - preSamples)))
-	    {
-	      unsigned short preLoopsZero = (unsigned short) (preSamples) 
-		- nSOI;
-	      // fill extra bx's at beginning with zeros
-	      for (int sample = 0; sample < preLoopsZero; sample++)
-		{
-		  // fill first few with zeros
-		  HcalTriggerPrimitiveDigi hcalDigi(HcalTrigTowerDetId((int) ieta, (int) iphi));
-		  hcalDigi.setSize(1);
-		  hcalDigi.setPresamples(0);
-		  hcalDigi.setSample(0, HcalTriggerPrimitiveSample(0,false,0,0));
-		  hcalColl[sample].push_back(hcalDigi);
-		}
-
-	      // loop through existing data
-	      for (int sample = preLoopsZero; 
-		   sample < (preLoopsZero + digiSize); sample++)
-		{
-		  // go through data
-		  HcalTriggerPrimitiveDigi hcalDigi(HcalTrigTowerDetId((int) ieta, (int) iphi));
-		  hcalDigi.setSize(1);
-		  hcalDigi.setPresamples(0);
-
-		  if (useHcalCosmicTiming && iphi >= 1 && iphi <= 36)
-		    {
-		      if (nSOI < (preSamples + 1))
-			{
-			  edm::LogWarning ("TooLittleData")
-			    << "HCAL data needs at least one presample "
-			    << "more than the number requested "
-			    << "to use hcal cosmic timing mod!  "
-			    << "reverting to useHcalCosmicTiming = false "
-			    << "for rest of job.";
-			  useHcalCosmicTiming = false;
-			}
-		      else
-			{
-			  hcalDigi.setSample(0, HcalTriggerPrimitiveSample
-					     (hcal_it->sample(hcal_it->
-							      presamples() + 
-							      sample - 
-							      preSamples - 
-							      1).raw()));
-			}
-		    }
-		  //else
-		  if ((!useHcalCosmicTiming) || (iphi >= 37 && iphi <= 72))
-		    {
-
-      			  hcalDigi.setSample(0, HcalTriggerPrimitiveSample
-     					     (hcal_it->sample(hcal_it->
-						     presamples() + 
-						      sample - 
-						      preSamples).raw()));
-
-		    }
-		  hcalColl[sample].push_back(hcalDigi);
-		}
-	      
-	      // fill extra bx's at end with zeros
-	      for (unsigned int sample = (preLoopsZero + digiSize); 
-		   sample < nSamples; sample++)
-		{
-		  // fill zeros!
-		  HcalTriggerPrimitiveDigi
-		    hcalDigi(HcalTrigTowerDetId((int) ieta, (int) iphi));
-		  hcalDigi.setSize(1);
-		  hcalDigi.setPresamples(0);
-		  hcalDigi.setSample(0, HcalTriggerPrimitiveSample(0,false,0,0));
-		  hcalColl[sample].push_back(hcalDigi);
-		}
-	    }
-	  else
-	    {
-	      for (unsigned short sample = 0; sample < nSamples; sample++)
-		{
-		  // put each (relevant) time sample into its own digi
-		  HcalTriggerPrimitiveDigi hcalDigi(HcalTrigTowerDetId((int) ieta, (int) iphi));
-		  hcalDigi.setSize(1);
-		  hcalDigi.setPresamples(0);
-
-		  if (useHcalCosmicTiming && iphi >= 1 && iphi <= 36)
-		    {
-		      if (nSOI < (preSamples + 1))
-			{
-			  edm::LogWarning ("TooLittleData")
-			    << "HCAL data needs at least one presample "
-			    << "more than the number requested "
-			    << "to use hcal cosmic timing mod!  "
-			    << "reverting to useHcalCosmicTiming = false "
-			    << "for rest of job.";
-			  useHcalCosmicTiming = false;
-			}
-		      else
-			{
-			  hcalDigi.setSample(0, HcalTriggerPrimitiveSample
-					     (hcal_it->sample(hcal_it->
-							      presamples() + 
-							      sample - 
-							      preSamples - 
-							      1).raw()));
-			}
-		    }
-		  //else
-		  if ((!useHcalCosmicTiming) || (iphi >= 37 && iphi <= 72))
-		    {
-			  if(ieta>-29 && ieta<29) 
-			    hcalDigi.setSample(0, HcalTriggerPrimitiveSample
-					       (hcal_it->sample(hcal_it->
-							      presamples() + 
-								sample - 
-								preSamples+hbShift).raw()));
-			  if(ieta<=-29 || ieta>=29)
-			    hcalDigi.setSample(0, HcalTriggerPrimitiveSample
-					       (hcal_it->sample(hcal_it->
-							      presamples() + 
-								sample - 
-								preSamples+hfShift).raw()));
-		    }
-		  hcalColl[sample].push_back(hcalDigi);  
-		}
-	    }
-	}
+      for (HcalTrigPrimDigiCollection::const_iterator hcal_it = hcal->begin();
+           hcal_it != hcal->end(); hcal_it++) {
+        short ieta = hcal_it->id().ieta();
+        short iphi = hcal_it->id().iphi();
+        // loop through time samples for each digi
+        unsigned short digiSize = hcal_it->size();
+        // (size of each digi must be no less than nSamples)
+        unsigned short nSOI = (unsigned short)(hcal_it->presamples());
+        if (digiSize < nSamples || nSOI < preSamples ||
+            ((int)(digiSize - nSOI) < (int)(nSamples - preSamples))) {
+          unsigned short preLoopsZero = (unsigned short)(preSamples)-nSOI;
+          // fill extra bx's at beginning with zeros
+          for (int sample = 0; sample < preLoopsZero; sample++) {
+            // fill first few with zeros
+            HcalTriggerPrimitiveDigi hcalDigi(
+                HcalTrigTowerDetId((int)ieta, (int)iphi));
+            hcalDigi.setSize(1);
+            hcalDigi.setPresamples(0);
+            hcalDigi.setSample(0, HcalTriggerPrimitiveSample(0, false, 0, 0));
+            hcalColl[sample].push_back(hcalDigi);
+          }
+
+          // loop through existing data
+          for (int sample = preLoopsZero; sample < (preLoopsZero + digiSize);
+               sample++) {
+            // go through data
+            HcalTriggerPrimitiveDigi hcalDigi(
+                HcalTrigTowerDetId((int)ieta, (int)iphi));
+            hcalDigi.setSize(1);
+            hcalDigi.setPresamples(0);
+
+            if (useHcalCosmicTiming && iphi >= 1 && iphi <= 36) {
+              if (nSOI < (preSamples + 1)) {
+                edm::LogWarning("TooLittleData")
+                    << "HCAL data needs at least one presample "
+                    << "more than the number requested "
+                    << "to use hcal cosmic timing mod!  "
+                    << "reverting to useHcalCosmicTiming = false "
+                    << "for rest of job.";
+                useHcalCosmicTiming = false;
+              } else {
+                hcalDigi.setSample(0, HcalTriggerPrimitiveSample(
+                                          hcal_it
+                                              ->sample(hcal_it->presamples() +
+                                                       sample - preSamples - 1)
+                                              .raw()));
+              }
+            }
+            // else
+            if ((!useHcalCosmicTiming) || (iphi >= 37 && iphi <= 72)) {
+
+              hcalDigi.setSample(0, HcalTriggerPrimitiveSample(
+                                        hcal_it
+                                            ->sample(hcal_it->presamples() +
+                                                     sample - preSamples)
+                                            .raw()));
+            }
+            hcalColl[sample].push_back(hcalDigi);
+          }
+
+          // fill extra bx's at end with zeros
+          for (unsigned int sample = (preLoopsZero + digiSize);
+               sample < nSamples; sample++) {
+            // fill zeros!
+            HcalTriggerPrimitiveDigi hcalDigi(
+                HcalTrigTowerDetId((int)ieta, (int)iphi));
+            hcalDigi.setSize(1);
+            hcalDigi.setPresamples(0);
+            hcalDigi.setSample(0, HcalTriggerPrimitiveSample(0, false, 0, 0));
+            hcalColl[sample].push_back(hcalDigi);
+          }
+        } else {
+          for (unsigned short sample = 0; sample < nSamples; sample++) {
+            // put each (relevant) time sample into its own digi
+            HcalTriggerPrimitiveDigi hcalDigi(
+                HcalTrigTowerDetId((int)ieta, (int)iphi));
+            hcalDigi.setSize(1);
+            hcalDigi.setPresamples(0);
+
+            if (useHcalCosmicTiming && iphi >= 1 && iphi <= 36) {
+              if (nSOI < (preSamples + 1)) {
+                edm::LogWarning("TooLittleData")
+                    << "HCAL data needs at least one presample "
+                    << "more than the number requested "
+                    << "to use hcal cosmic timing mod!  "
+                    << "reverting to useHcalCosmicTiming = false "
+                    << "for rest of job.";
+                useHcalCosmicTiming = false;
+              } else {
+                hcalDigi.setSample(0, HcalTriggerPrimitiveSample(
+                                          hcal_it
+                                              ->sample(hcal_it->presamples() +
+                                                       sample - preSamples - 1)
+                                              .raw()));
+              }
+            }
+            // else
+            if ((!useHcalCosmicTiming) || (iphi >= 37 && iphi <= 72)) {
+              if (ieta > -29 && ieta < 29)
+                hcalDigi.setSample(
+                    0, HcalTriggerPrimitiveSample(
+                           hcal_it
+                               ->sample(hcal_it->presamples() + sample -
+                                        preSamples + hbShift)
+                               .raw()));
+              if (ieta <= -29 || ieta >= 29)
+                hcalDigi.setSample(
+                    0, HcalTriggerPrimitiveSample(
+                           hcal_it
+                               ->sample(hcal_it->presamples() + sample -
+                                        preSamples + hfShift)
+                               .raw()));
+            }
+            hcalColl[sample].push_back(hcalDigi);
+          }
+        }
+      }
     }
 
+  // Now put the events back to file
 
-   //Now put the events back to file
-
-  for(int i=0;i<preSamples;++i)
-    {
-      char ecal_label[200];
-      char hcal_label[200];
-
-
-      sprintf(ecal_label,"ECALBxminus%d",preSamples-i);
-      sprintf(hcal_label,"HCALBxminus%d",preSamples-i);
-
-      std::unique_ptr<EcalTrigPrimDigiCollection> ecalIn(new EcalTrigPrimDigiCollection); 
-      std::unique_ptr<HcalTrigPrimDigiCollection> hcalIn(new HcalTrigPrimDigiCollection);
-	  for(unsigned int j=0;j<ecalColl[i].size();++j)
-	    {
-	      ecalIn->push_back((ecalColl[i])[j]);
-	    }
-	  for(unsigned int j=0;j<hcalColl[i].size();++j)
-	    hcalIn->push_back((hcalColl[i])[j]);
+  for (int i = 0; i < preSamples; ++i) {
+    char ecal_label[200];
+    char hcal_label[200];
 
-         iEvent.put(std::move(ecalIn),ecal_label);
-         iEvent.put(std::move(hcalIn),hcal_label);
+    sprintf(ecal_label, "ECALBxminus%d", preSamples - i);
+    sprintf(hcal_label, "HCALBxminus%d", preSamples - i);
 
+    std::unique_ptr<EcalTrigPrimDigiCollection> ecalIn(
+        new EcalTrigPrimDigiCollection);
+    std::unique_ptr<HcalTrigPrimDigiCollection> hcalIn(
+        new HcalTrigPrimDigiCollection);
+    for (unsigned int j = 0; j < ecalColl[i].size(); ++j) {
+      ecalIn->push_back((ecalColl[i])[j]);
     }
+    for (unsigned int j = 0; j < hcalColl[i].size(); ++j)
+      hcalIn->push_back((hcalColl[i])[j]);
+
+    iEvent.put(std::move(ecalIn), ecal_label);
+    iEvent.put(std::move(hcalIn), hcal_label);
+  }
+
+  std::unique_ptr<EcalTrigPrimDigiCollection> ecal0(
+      new EcalTrigPrimDigiCollection);
+  std::unique_ptr<HcalTrigPrimDigiCollection> hcal0(
+      new HcalTrigPrimDigiCollection);
+  for (unsigned int j = 0; j < ecalColl[preSamples].size(); ++j)
+    ecal0->push_back((ecalColl[preSamples])[j]);
+  for (unsigned int j = 0; j < hcalColl[preSamples].size(); ++j)
+    hcal0->push_back((hcalColl[preSamples])[j]);
+
+  iEvent.put(std::move(ecal0), "ECALBx0");
+  iEvent.put(std::move(hcal0), "HCALBx0");
+
+  for (int i = preSamples + 1; i < preSamples + postSamples + 1; ++i) {
+    char ecal_label[200];
+    char hcal_label[200];
 
+    sprintf(ecal_label, "ECALBxplus%d", i - preSamples);
+    sprintf(hcal_label, "HCALBxplus%d", i - preSamples);
 
-   std::unique_ptr<EcalTrigPrimDigiCollection> ecal0(new EcalTrigPrimDigiCollection); 
-   std::unique_ptr<HcalTrigPrimDigiCollection> hcal0(new HcalTrigPrimDigiCollection);
-   for(unsigned int j=0;j<ecalColl[preSamples].size();++j)
-     ecal0->push_back((ecalColl[preSamples])[j]);
-   for(unsigned int j=0;j<hcalColl[preSamples].size();++j)
-     hcal0->push_back((hcalColl[preSamples])[j]);
-
-   iEvent.put(std::move(ecal0),"ECALBx0");
-   iEvent.put(std::move(hcal0),"HCALBx0");
-
-
-  for(int i=preSamples+1;i<preSamples+postSamples+1;++i)
-    {
-      char ecal_label[200];
-      char hcal_label[200];
-
-      sprintf(ecal_label,"ECALBxplus%d",i-preSamples);
-      sprintf(hcal_label,"HCALBxplus%d",i-preSamples);
-
-      std::unique_ptr<EcalTrigPrimDigiCollection> ecalIn2(new EcalTrigPrimDigiCollection); 
-      std::unique_ptr<HcalTrigPrimDigiCollection> hcalIn2(new HcalTrigPrimDigiCollection);
-
-      for(unsigned int j=0;j<ecalColl[i].size();++j)
-	ecalIn2->push_back((ecalColl[i])[j]);
+    std::unique_ptr<EcalTrigPrimDigiCollection> ecalIn2(
+        new EcalTrigPrimDigiCollection);
+    std::unique_ptr<HcalTrigPrimDigiCollection> hcalIn2(
+        new HcalTrigPrimDigiCollection);
 
-      for(unsigned int j=0;j<hcalColl[i].size();++j)
-	hcalIn2->push_back((hcalColl[i])[j]);
+    for (unsigned int j = 0; j < ecalColl[i].size(); ++j)
+      ecalIn2->push_back((ecalColl[i])[j]);
 
+    for (unsigned int j = 0; j < hcalColl[i].size(); ++j)
+      hcalIn2->push_back((hcalColl[i])[j]);
 
-         iEvent.put(std::move(ecalIn2),ecal_label);
-         iEvent.put(std::move(hcalIn2),hcal_label);
-    }
+    iEvent.put(std::move(ecalIn2), ecal_label);
+    iEvent.put(std::move(hcalIn2), hcal_label);
+  }
 }
 
-// ------------ method called once each job just before starting event loop  ------------
-
+// ------------ method called once each job just before starting event loop
+// ------------
 
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-L1RCTTPGProvider::endJob() {
-}
+// ------------ method called once each job just after ending the event loop
+// ------------
+void L1RCTTPGProvider::endJob() {}
diff --git a/L1Trigger/RegionalCaloTrigger/plugins/L1RCTTestAnalyzer.cc b/L1Trigger/RegionalCaloTrigger/plugins/L1RCTTestAnalyzer.cc
index 7346be5cfeef2..21f811696880b 100644
--- a/L1Trigger/RegionalCaloTrigger/plugins/L1RCTTestAnalyzer.cc
+++ b/L1Trigger/RegionalCaloTrigger/plugins/L1RCTTestAnalyzer.cc
@@ -2,290 +2,255 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
 
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTTestAnalyzer.h"
 
-using std::string;
 using std::cout;
 using std::endl;
+using std::string;
 
 //
 // constructors and destructor
 //
-L1RCTTestAnalyzer::L1RCTTestAnalyzer(const edm::ParameterSet& iConfig) :
-  showEmCands(iConfig.getUntrackedParameter<bool>("showEmCands")),
-  showRegionSums(iConfig.getUntrackedParameter<bool>("showRegionSums")),
-  ecalDigisLabel(iConfig.getParameter<edm::InputTag>("ecalDigisLabel")),
-  hcalDigisLabel(iConfig.getParameter<edm::InputTag>("hcalDigisLabel")),
-  rctDigisLabel(iConfig.getParameter<edm::InputTag>("rctDigisLabel"))
-{
-   //now do what ever initialization is needed
+L1RCTTestAnalyzer::L1RCTTestAnalyzer(const edm::ParameterSet &iConfig)
+    : showEmCands(iConfig.getUntrackedParameter<bool>("showEmCands")),
+      showRegionSums(iConfig.getUntrackedParameter<bool>("showRegionSums")),
+      ecalDigisLabel(iConfig.getParameter<edm::InputTag>("ecalDigisLabel")),
+      hcalDigisLabel(iConfig.getParameter<edm::InputTag>("hcalDigisLabel")),
+      rctDigisLabel(iConfig.getParameter<edm::InputTag>("rctDigisLabel")) {
+  // now do what ever initialization is needed
 
   edm::Service<TFileService> fs;
 
-  emTree = fs->make<TTree>("emTree","L1 RCT EM tree");
-//   emTree->Branch("emRank",emRank,"emRank/I");
-//   emTree->Branch("emIeta",emIeta,"emIeta/I");
-//   emTree->Branch("emIphi",emIphi,"emIphi/I");
-//   emTree->Branch("emIso" ,emIso ,"emIso/I");
-  emTree->Branch("emRank",&emRank);
-  emTree->Branch("emIeta",&emIeta);
-  emTree->Branch("emIphi",&emIphi);
-  emTree->Branch("emIso" ,&emIso);
-
-  h_emRank = fs->make<TH1F>( "emRank", "emRank", 64, 0., 64. );
-  h_emRankOutOfTime = fs->make<TH1F>( "emRankOutOfTime", "emRankOutOfTime",
-				      64, 0., 64. );
-  h_emIeta = fs->make<TH1F>( "emIeta", "emIeta", 22, 0., 22. );
-  h_emIphi = fs->make<TH1F>( "emIphi", "emIphi", 18, 0., 18. );
-  h_emIso = fs->make<TH1F>( "emIso", "emIso", 2, 0., 2. );
-  h_emRankInIetaIphi = fs->make<TH2F>( "emRank2D", "emRank2D", 22, 0., 22.,
-				       18, 0., 18. );
-  h_emIsoInIetaIphi = fs->make<TH2F>( "emIso2D", "emIso2D", 22, 0., 22.,
-				      18, 0., 18. );
-  h_emNonIsoInIetaIphi = fs->make<TH2F>( "emNonIso2D", "emNonIso2D", 22, 0., 
-					 22., 18, 0., 18. );
-  h_emCandTimeSample = fs->make<TH1F>( "emCandTimeSample", "emCandTimeSample",
-				       5, -2., 2.);
-
-  h_regionSum = fs->make<TH1F>( "regionSum", "regionSum", 100, 0., 100. );
-  h_regionIeta = fs->make<TH1F>( "regionIeta", "regionIeta", 22, 0., 22. );
-  h_regionIphi = fs->make<TH1F>( "regionIphi", "regionIphi", 18, 0., 18. );
-  h_regionMip = fs->make<TH1F>( "regionMip", "regionMipBit", 2, 0., 2. );
-  h_regionSumInIetaIphi = fs->make<TH2F>( "regionSum2D", "regionSum2D", 22, 
-					  0., 22., 18, 0., 18. );
-  h_regionFGInIetaIphi = fs->make<TH2F>( "regionFG2D", "regionFG2D", 22, 0.,
-					 22., 18, 0., 18. );
-
-  h_towerMip = fs->make<TH1F>( "towerMip", "towerMipBit", 2, 0., 2. );
-
-  h_ecalTimeSample = fs->make<TH1F>( "ecalTimeSample", "ecalTimeSample",
-				     10, 0., 10. );
-  h_hcalTimeSample = fs->make<TH1F>( "hcalTimeSample", "hcalTimeSample",
-				     10, 0., 10. );
+  emTree = fs->make<TTree>("emTree", "L1 RCT EM tree");
+  //   emTree->Branch("emRank",emRank,"emRank/I");
+  //   emTree->Branch("emIeta",emIeta,"emIeta/I");
+  //   emTree->Branch("emIphi",emIphi,"emIphi/I");
+  //   emTree->Branch("emIso" ,emIso ,"emIso/I");
+  emTree->Branch("emRank", &emRank);
+  emTree->Branch("emIeta", &emIeta);
+  emTree->Branch("emIphi", &emIphi);
+  emTree->Branch("emIso", &emIso);
+
+  h_emRank = fs->make<TH1F>("emRank", "emRank", 64, 0., 64.);
+  h_emRankOutOfTime =
+      fs->make<TH1F>("emRankOutOfTime", "emRankOutOfTime", 64, 0., 64.);
+  h_emIeta = fs->make<TH1F>("emIeta", "emIeta", 22, 0., 22.);
+  h_emIphi = fs->make<TH1F>("emIphi", "emIphi", 18, 0., 18.);
+  h_emIso = fs->make<TH1F>("emIso", "emIso", 2, 0., 2.);
+  h_emRankInIetaIphi =
+      fs->make<TH2F>("emRank2D", "emRank2D", 22, 0., 22., 18, 0., 18.);
+  h_emIsoInIetaIphi =
+      fs->make<TH2F>("emIso2D", "emIso2D", 22, 0., 22., 18, 0., 18.);
+  h_emNonIsoInIetaIphi =
+      fs->make<TH2F>("emNonIso2D", "emNonIso2D", 22, 0., 22., 18, 0., 18.);
+  h_emCandTimeSample =
+      fs->make<TH1F>("emCandTimeSample", "emCandTimeSample", 5, -2., 2.);
+
+  h_regionSum = fs->make<TH1F>("regionSum", "regionSum", 100, 0., 100.);
+  h_regionIeta = fs->make<TH1F>("regionIeta", "regionIeta", 22, 0., 22.);
+  h_regionIphi = fs->make<TH1F>("regionIphi", "regionIphi", 18, 0., 18.);
+  h_regionMip = fs->make<TH1F>("regionMip", "regionMipBit", 2, 0., 2.);
+  h_regionSumInIetaIphi =
+      fs->make<TH2F>("regionSum2D", "regionSum2D", 22, 0., 22., 18, 0., 18.);
+  h_regionFGInIetaIphi =
+      fs->make<TH2F>("regionFG2D", "regionFG2D", 22, 0., 22., 18, 0., 18.);
+
+  h_towerMip = fs->make<TH1F>("towerMip", "towerMipBit", 2, 0., 2.);
+
+  h_ecalTimeSample =
+      fs->make<TH1F>("ecalTimeSample", "ecalTimeSample", 10, 0., 10.);
+  h_hcalTimeSample =
+      fs->make<TH1F>("hcalTimeSample", "hcalTimeSample", 10, 0., 10.);
 
   // get names of modules, producing object collections
 }
 
+L1RCTTestAnalyzer::~L1RCTTestAnalyzer() {
 
-L1RCTTestAnalyzer::~L1RCTTestAnalyzer()
-{
-
-   // do anything here that needs to be done at destruction time
-   // (e.g. close files, deallocate resources etc.)
-
+  // do anything here that needs to be done at destruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-L1RCTTestAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace edm;
+void L1RCTTestAnalyzer::analyze(const edm::Event &iEvent,
+                                const edm::EventSetup &iSetup) {
+  using namespace edm;
 #ifdef THIS_IS_AN_EVENT_EXAMPLE
-   Handle<ExampleData> pIn;
-   iEvent.getByLabel("example",pIn);
+  Handle<ExampleData> pIn;
+  iEvent.getByLabel("example", pIn);
 #endif
 
 #ifdef THIS_IS_AN_EVENTSETUP_EXAMPLE
-   ESHandle<SetupData> pSetup;
-   iSetup.get<SetupRecord>().get(pSetup);
+  ESHandle<SetupData> pSetup;
+  iSetup.get<SetupRecord>().get(pSetup);
 #endif
 
-   // as in L1GctTestAnalyzer.cc
-   Handle<L1CaloEmCollection> rctEmCands;
-   Handle<L1CaloRegionCollection> rctRegions;
-   Handle<EcalTrigPrimDigiCollection> ecalColl;
-   Handle<HcalTrigPrimDigiCollection> hcalColl;
-
-   L1CaloEmCollection::const_iterator em;
-   L1CaloRegionCollection::const_iterator rgn;
-   EcalTrigPrimDigiCollection::const_iterator ecal;
-   HcalTrigPrimDigiCollection::const_iterator hcal;
-
-   iEvent.getByLabel(rctDigisLabel, rctEmCands);
-   iEvent.getByLabel(rctDigisLabel, rctRegions);
-   iEvent.getByLabel(ecalDigisLabel, ecalColl);
-   iEvent.getByLabel(hcalDigisLabel, hcalColl);
-
-   // for sorting later
-   L1CaloEmCollection * myL1EmColl = new L1CaloEmCollection;
-
-   for (ecal=ecalColl->begin(); ecal!=ecalColl->end(); ecal++)
-     {
-       for (unsigned short sample = 0; sample < (*ecal).size(); sample++)
-	 {
-	   h_ecalTimeSample->Fill(sample);
-	 }
-     }
-
-   for (hcal=hcalColl->begin(); hcal!=hcalColl->end(); hcal++)
-     {
-       h_towerMip->Fill( (*hcal).SOI_fineGrain() );
-       for (unsigned short sample = 0; sample < (*hcal).size(); sample++)
-	 {
-	   h_hcalTimeSample->Fill(sample);
-	 }
-     }
-
-   if(showEmCands)
-     {
-       //       std::cout << std::endl << "L1 RCT EmCand objects" << std::endl;
-     }
-   for (em=rctEmCands->begin(); em!=rctEmCands->end(); em++){
-     //  std::cout << "(Analyzer)\n" << (*em) << std::endl;
-
-     L1CaloEmCand * myL1EmCand = new L1CaloEmCand(*em);
-     (*myL1EmColl).push_back(*myL1EmCand);
-     delete myL1EmCand;
-
-     h_emCandTimeSample->Fill((*em).bx());
-     if ((*em).bx() == 0)
-       {
-	 unsigned short n_emcands = 0;
-	 //std::cout << std::endl << "rank: " << (*em).rank() ;
-	 
-	 if ((*em).rank() > 0)
-	   {
-	     h_emRank->Fill( (*em).rank() );
-	     h_emIeta->Fill( (*em).regionId().ieta() );
-	     h_emIphi->Fill( (*em).regionId().iphi() );
-	     h_emIso->Fill( (*em).isolated() );
-	     h_emRankInIetaIphi->Fill( (*em).regionId().ieta(), 
-				       (*em).regionId().iphi(),
-				       (*em).rank() );
-	     if ((*em).isolated())
-	       {
-		 h_emIsoInIetaIphi->Fill( (*em).regionId().ieta(),
-					  (*em).regionId().iphi() );
-	       }
-	     else
-	       {
-		 h_emNonIsoInIetaIphi->Fill( (*em).regionId().ieta(),
-					     (*em).regionId().iphi() );
-	       }
-	   }
-	 
-	 if (showEmCands)
-	   {
-	     if ((*em).rank() > 0)
-	       {
-		 //		 std::cout << std::endl << "rank: " << (*em).rank();
-		 unsigned short rgnPhi = 999;
-		 unsigned short rgn = (unsigned short) (*em).rctRegion();
-		 unsigned short card = (unsigned short) (*em).rctCard();
-		 unsigned short crate = (unsigned short) (*em).rctCrate();
-		 
-		 if (card == 6)
-		   {
-		     rgnPhi = rgn;
-		   }
-		 else if (card < 6)
-		   {
-		     rgnPhi = (card % 2);
-		   }
-		 else 
-		   {
-		     std::cout << "rgnPhi not assigned (still " << rgnPhi << ") -- Weird card number! " << card ;
-		   }
-
-		 //unsigned short phi_bin = ((crate % 9) * 2) + rgnPhi;
-		 short eta_bin = (card/2) * 2 + 1;
-		 if (card < 6)
-		   {
-		     eta_bin = eta_bin + rgn;
-		   }
-		 if (crate < 9)
-		   {
-		     eta_bin = -eta_bin;
-		   }
-		 n_emcands++;
-		 
-		 //		   std::cout << /* "rank: " << (*em).rank() << */ "  eta_bin: " << eta_bin << "  phi_bin: " << phi_bin << ".  crate: " << crate << "  card: " << card << "  region: " << rgn << ".  isolated: " << (*em).isolated();
-	       }
-	   }
-       }
-     else
-       {
-	 h_emRankOutOfTime->Fill( (*em).rank() );
-       }
-   }
-   if(showEmCands)
-     {
-       //       std::cout << std::endl;
-     }
-
-   // next: SORT THESE GUYS so they're entered into the tree highest first
-//    std::sort(rctEmCands->begin(),rctEmCands->end(),compareEmCands);
-//    for (em=rctEmCands->begin(); em!=rctEmCands->end(); em++)
-   std::sort(myL1EmColl->begin(),myL1EmColl->end(),compareEmCands);
-   std::reverse(myL1EmColl->begin(),myL1EmColl->end()); // whoops!
-   for (em=myL1EmColl->begin(); em!=myL1EmColl->end(); em++)
-     {
-       emRank.push_back( (*em).rank() );
-       emIeta.push_back( (*em).regionId().ieta() );
-       emIphi.push_back( (*em).regionId().iphi() );
-       emIso.push_back( (*em).isolated() );
-     }
-   emTree->Fill();
-
-
-   if(showRegionSums)
-     {
-       std::cout << "Regions" << std::endl;
-     }
-   for (rgn=rctRegions->begin(); rgn!=rctRegions->end(); rgn++)
-     {
-       if ((*rgn).bx() == 0)
-	 {
-	   if(showRegionSums&&(*rgn).et()>0)
-	     {
-	       std::cout << /* "(Analyzer)\n" << */ (*rgn) << std::endl;
-	     }
-	   if ( (*rgn).et() > 0 )
-	     {
-	       h_regionSum->Fill( (*rgn).et() );
-	       h_regionIeta->Fill( (*rgn).gctEta() );
-	       h_regionIphi->Fill( (*rgn).gctPhi() );
-	       h_regionSumInIetaIphi->Fill( (*rgn).gctEta(), (*rgn).gctPhi(),
-					    (*rgn).et() );
-	       h_regionFGInIetaIphi->Fill( (*rgn).gctEta(), (*rgn).gctPhi(),
-					   (*rgn).fineGrain() );
-	     }
-	   h_regionMip->Fill( (*rgn).mip() );
-	 }
-     }
-   if(showRegionSums)
-     {
-       std::cout << std::endl;
-     }
-
-   emRank.clear();
-   emIeta.clear();
-   emIphi.clear();
-   emIso.clear();
-
-   delete myL1EmColl;
+  // as in L1GctTestAnalyzer.cc
+  Handle<L1CaloEmCollection> rctEmCands;
+  Handle<L1CaloRegionCollection> rctRegions;
+  Handle<EcalTrigPrimDigiCollection> ecalColl;
+  Handle<HcalTrigPrimDigiCollection> hcalColl;
+
+  L1CaloEmCollection::const_iterator em;
+  L1CaloRegionCollection::const_iterator rgn;
+  EcalTrigPrimDigiCollection::const_iterator ecal;
+  HcalTrigPrimDigiCollection::const_iterator hcal;
+
+  iEvent.getByLabel(rctDigisLabel, rctEmCands);
+  iEvent.getByLabel(rctDigisLabel, rctRegions);
+  iEvent.getByLabel(ecalDigisLabel, ecalColl);
+  iEvent.getByLabel(hcalDigisLabel, hcalColl);
+
+  // for sorting later
+  L1CaloEmCollection *myL1EmColl = new L1CaloEmCollection;
+
+  for (ecal = ecalColl->begin(); ecal != ecalColl->end(); ecal++) {
+    for (unsigned short sample = 0; sample < (*ecal).size(); sample++) {
+      h_ecalTimeSample->Fill(sample);
+    }
+  }
+
+  for (hcal = hcalColl->begin(); hcal != hcalColl->end(); hcal++) {
+    h_towerMip->Fill((*hcal).SOI_fineGrain());
+    for (unsigned short sample = 0; sample < (*hcal).size(); sample++) {
+      h_hcalTimeSample->Fill(sample);
+    }
+  }
+
+  if (showEmCands) {
+    //       std::cout << std::endl << "L1 RCT EmCand objects" << std::endl;
+  }
+  for (em = rctEmCands->begin(); em != rctEmCands->end(); em++) {
+    //  std::cout << "(Analyzer)\n" << (*em) << std::endl;
+
+    L1CaloEmCand *myL1EmCand = new L1CaloEmCand(*em);
+    (*myL1EmColl).push_back(*myL1EmCand);
+    delete myL1EmCand;
+
+    h_emCandTimeSample->Fill((*em).bx());
+    if ((*em).bx() == 0) {
+      unsigned short n_emcands = 0;
+      // std::cout << std::endl << "rank: " << (*em).rank() ;
+
+      if ((*em).rank() > 0) {
+        h_emRank->Fill((*em).rank());
+        h_emIeta->Fill((*em).regionId().ieta());
+        h_emIphi->Fill((*em).regionId().iphi());
+        h_emIso->Fill((*em).isolated());
+        h_emRankInIetaIphi->Fill((*em).regionId().ieta(),
+                                 (*em).regionId().iphi(), (*em).rank());
+        if ((*em).isolated()) {
+          h_emIsoInIetaIphi->Fill((*em).regionId().ieta(),
+                                  (*em).regionId().iphi());
+        } else {
+          h_emNonIsoInIetaIphi->Fill((*em).regionId().ieta(),
+                                     (*em).regionId().iphi());
+        }
+      }
+
+      if (showEmCands) {
+        if ((*em).rank() > 0) {
+          //		 std::cout << std::endl << "rank: " << (*em).rank();
+          unsigned short rgnPhi = 999;
+          unsigned short rgn = (unsigned short)(*em).rctRegion();
+          unsigned short card = (unsigned short)(*em).rctCard();
+          unsigned short crate = (unsigned short)(*em).rctCrate();
+
+          if (card == 6) {
+            rgnPhi = rgn;
+          } else if (card < 6) {
+            rgnPhi = (card % 2);
+          } else {
+            std::cout << "rgnPhi not assigned (still " << rgnPhi
+                      << ") -- Weird card number! " << card;
+          }
+
+          // unsigned short phi_bin = ((crate % 9) * 2) + rgnPhi;
+          short eta_bin = (card / 2) * 2 + 1;
+          if (card < 6) {
+            eta_bin = eta_bin + rgn;
+          }
+          if (crate < 9) {
+            eta_bin = -eta_bin;
+          }
+          n_emcands++;
+
+          //		   std::cout << /* "rank: " << (*em).rank() << */ "
+          // eta_bin: " << eta_bin << "  phi_bin: " << phi_bin << ".  crate: "
+          // << crate << "  card: " << card << "  region: " << rgn << ".
+          // isolated: " << (*em).isolated();
+        }
+      }
+    } else {
+      h_emRankOutOfTime->Fill((*em).rank());
+    }
+  }
+  if (showEmCands) {
+    //       std::cout << std::endl;
+  }
+
+  // next: SORT THESE GUYS so they're entered into the tree highest first
+  //    std::sort(rctEmCands->begin(),rctEmCands->end(),compareEmCands);
+  //    for (em=rctEmCands->begin(); em!=rctEmCands->end(); em++)
+  std::sort(myL1EmColl->begin(), myL1EmColl->end(), compareEmCands);
+  std::reverse(myL1EmColl->begin(), myL1EmColl->end()); // whoops!
+  for (em = myL1EmColl->begin(); em != myL1EmColl->end(); em++) {
+    emRank.push_back((*em).rank());
+    emIeta.push_back((*em).regionId().ieta());
+    emIphi.push_back((*em).regionId().iphi());
+    emIso.push_back((*em).isolated());
+  }
+  emTree->Fill();
+
+  if (showRegionSums) {
+    std::cout << "Regions" << std::endl;
+  }
+  for (rgn = rctRegions->begin(); rgn != rctRegions->end(); rgn++) {
+    if ((*rgn).bx() == 0) {
+      if (showRegionSums && (*rgn).et() > 0) {
+        std::cout << /* "(Analyzer)\n" << */ (*rgn) << std::endl;
+      }
+      if ((*rgn).et() > 0) {
+        h_regionSum->Fill((*rgn).et());
+        h_regionIeta->Fill((*rgn).gctEta());
+        h_regionIphi->Fill((*rgn).gctPhi());
+        h_regionSumInIetaIphi->Fill((*rgn).gctEta(), (*rgn).gctPhi(),
+                                    (*rgn).et());
+        h_regionFGInIetaIphi->Fill((*rgn).gctEta(), (*rgn).gctPhi(),
+                                   (*rgn).fineGrain());
+      }
+      h_regionMip->Fill((*rgn).mip());
+    }
+  }
+  if (showRegionSums) {
+    std::cout << std::endl;
+  }
+
+  emRank.clear();
+  emIeta.clear();
+  emIphi.clear();
+  emIso.clear();
+
+  delete myL1EmColl;
 }
 
-bool
-L1RCTTestAnalyzer::compareEmCands(const L1CaloEmCand& cand1, const L1CaloEmCand& cand2)
-{
+bool L1RCTTestAnalyzer::compareEmCands(const L1CaloEmCand &cand1,
+                                       const L1CaloEmCand &cand2) {
   return (cand1.rank() < cand2.rank());
 }
diff --git a/L1Trigger/RegionalCaloTrigger/plugins/MaskedRctInputDigiProducer.cc b/L1Trigger/RegionalCaloTrigger/plugins/MaskedRctInputDigiProducer.cc
index b1938e7e22534..81d90a1d65b17 100644
--- a/L1Trigger/RegionalCaloTrigger/plugins/MaskedRctInputDigiProducer.cc
+++ b/L1Trigger/RegionalCaloTrigger/plugins/MaskedRctInputDigiProducer.cc
@@ -1,389 +1,380 @@
 #include "L1Trigger/RegionalCaloTrigger/interface/MaskedRctInputDigiProducer.h"
 
-#include <vector>
-#include <string>
 #include <fstream>
 #include <iostream>
+#include <string>
+#include <vector>
+using std::endl;
 using std::ifstream;
 using std::vector;
-using std::endl;
 
 //
 // constructors and destructor
 //
 
-MaskedRctInputDigiProducer::MaskedRctInputDigiProducer(const edm::ParameterSet& iConfig):
-  useEcal_(iConfig.getParameter<bool>("useEcal")),
-  useHcal_(iConfig.getParameter<bool>("useHcal")),
-  ecalDigisLabel_(iConfig.getParameter<edm::InputTag>("ecalDigisLabel")),
-  hcalDigisLabel_(iConfig.getParameter<edm::InputTag>("hcalDigisLabel")),
-  maskFile_(iConfig.getParameter<edm::FileInPath>("maskFile"))
-{
-   //register your products
-/* Examples
-   produces<ExampleData2>();
-
-   //if do put with a label
-   produces<ExampleData2>("label");
-*/
+MaskedRctInputDigiProducer::MaskedRctInputDigiProducer(
+    const edm::ParameterSet &iConfig)
+    : useEcal_(iConfig.getParameter<bool>("useEcal")),
+      useHcal_(iConfig.getParameter<bool>("useHcal")),
+      ecalDigisLabel_(iConfig.getParameter<edm::InputTag>("ecalDigisLabel")),
+      hcalDigisLabel_(iConfig.getParameter<edm::InputTag>("hcalDigisLabel")),
+      maskFile_(iConfig.getParameter<edm::FileInPath>("maskFile")) {
+  // register your products
+  /* Examples
+     produces<ExampleData2>();
+
+     //if do put with a label
+     produces<ExampleData2>("label");
+  */
 
   produces<EcalTrigPrimDigiCollection>();
   produces<HcalTrigPrimDigiCollection>();
 
-   //now do what ever other initialization is needed
-  
+  // now do what ever other initialization is needed
 }
 
+MaskedRctInputDigiProducer::~MaskedRctInputDigiProducer() {
 
-MaskedRctInputDigiProducer::~MaskedRctInputDigiProducer()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-MaskedRctInputDigiProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace edm;
-/* This is an event example
-   //Read 'ExampleData' from the Event
-   Handle<ExampleData> pIn;
-   iEvent.getByLabel("example",pIn);
-
-   //Use the ExampleData to create an ExampleData2 which 
-   // is put into the Event
-   std::unique_ptr<ExampleData2> pOut(new ExampleData2(*pIn));
-   iEvent.put(std::move(pOut));
-*/
-
-   edm::Handle<EcalTrigPrimDigiCollection> ecal;
-   edm::Handle<HcalTrigPrimDigiCollection> hcal;
-
-   if (useEcal_) { iEvent.getByLabel(ecalDigisLabel_, ecal); }
-   if (useHcal_) { iEvent.getByLabel(hcalDigisLabel_, hcal); }
-
-   EcalTrigPrimDigiCollection ecalColl;
-   HcalTrigPrimDigiCollection hcalColl;
-   if (ecal.isValid()) { ecalColl = *ecal; }
-   if (hcal.isValid()) { hcalColl = *hcal; }
-
-/* this is an EventSetup example
-   //Read SetupData from the SetupRecord in the EventSetup
-   ESHandle<SetupData> pSetup;
-   iSetup.get<SetupRecord>().get(pSetup);
-*/
- 
-   ifstream maskFileStream(maskFile_.fullPath().c_str());
-   if (!maskFileStream.is_open())
-     {
-       throw cms::Exception("FileInPathError")
-	 << "RCT mask file not opened" << std::endl;;
-     }
-
-   // read and process file (transform mask to new position in phi to match digis)
-   //char junk[256];
-   std::string junk;
-   //char junk[32];
-   do
-     {
-       //maskFileStream.getline(junk, 256);
-       maskFileStream >> junk;
-     }
-   while (junk != "ECAL:");
-
-   //   std::vector<std::vector<std::vector<unsigned short> > > temp(2,std::vector<std::vector<unsigned short> >(72,std::vector<unsigned short>(28,1)));
-   std::vector<std::vector<std::vector<unsigned short> > > ecalMask(2,std::vector<std::vector<unsigned short> >(72,std::vector<unsigned short>(28,1)));
-   std::vector<std::vector<std::vector<unsigned short> > > hcalMask(2,std::vector<std::vector<unsigned short> >(72,std::vector<unsigned short>(28,1)));
-   std::vector<std::vector<std::vector<unsigned short> > > hfMask(2,std::vector<std::vector<unsigned short> >(18,std::vector<unsigned short>(8,1)));
-
-   // read ECAL mask first
-   // loop through rct iphi
-   for (int i = 1; i <= 72; i++)
-     {
-       int phi_index = (72 + 18 - i) % 72;  // transfrom from RCT coords
-       if (phi_index == 0) {phi_index = 72;}
-       //std::cout << "ecal phi index is " << phi_index << std::endl;
-       for (int j = 28; j >= 1; j--)
-	 {
-	   maskFileStream >> junk;
-	   if (junk == "-") 
-	     {}
-	   else if ((junk == "X") || (junk == "x"))
-	     {
-	       ecalMask.at(0).at(phi_index-1).at(j-1) = 0;
-	     }
-	   else
-	     {
-	       std::cerr << "RCT mask producer: error -- unrecognized character" << std::endl;
-	     }
-	 }
-       for (int j = 1; j <= 28; j++)
-	 {
-	   maskFileStream >> junk;
-	   if(junk == "-")
-	     {}
-	   else if((junk == "X") || (junk == "x"))
-	     {
-	       ecalMask.at(1).at(phi_index-1).at(j-1) = 0;
-	     }
-	   else
-	     {
-	       std::cerr << "RCT mask producer: error -- unrecognized character" << std::endl;
-	     }	   
-	 }
-     }
-   //std::cout << "done reading ECAL" << std::endl;
-
-   maskFileStream >> junk;
-   if (junk != "HCAL:")
-     {
-       throw cms::Exception("FileInPathError")
-	 << "RCT mask producer: error reading ECAL mask" << std::endl;;
-     }
-
-   //std::cout << "Starting HCAL read" << std::endl;
-
-   // now read HCAL mask
-   // loop through rct iphi
-   for (int i = 1; i <= 72; i++)
-     {
-       int phi_index = (72 + 18 - i) % 72;  // transfrom from RCT coords
-       if (phi_index == 0) {phi_index = 72;}
-       //std::cout << "hcal phi index is " << phi_index << std::endl;
-       for (int j = 28; j >= 1; j--)
-	 {
-	   maskFileStream >> junk;
-	   if (junk == "-") 
-	     {}
-	   else if ((junk == "X") || (junk == "x"))
-	     {
-	       hcalMask.at(0).at(phi_index-1).at(j-1) = 0;
-	     }
-	   else
-	     {
-	       std::cerr << "RCT mask producer: error -- unrecognized character" << std::endl;
-	     }
-	 }
-       for (int j = 1; j <= 28; j++)
-	 {
-	   maskFileStream >> junk;
-	   if(junk == "-")
-	     {}
-	   else if((junk == "X") || (junk == "x"))
-	     {
-	       hcalMask.at(1).at(phi_index-1).at(j-1) = 0;
-	     }
-	   else
-	     {
-	       std::cerr << "RCT mask producer: error -- unrecognized character" << std::endl;
-	     }	   
-	 }
-     }
-
-   maskFileStream >> junk;
-   if (junk != "HF:")
-     {
-       throw cms::Exception("FileInPathError")
-	 << "RCT mask producer: error reading HCAL mask" << std::endl;;
-     }       
-
-   // loop through the hf phi columns in file
-   for(int i = 0; i < 18; i++)
-     {
-       //std::cout << "iphi for hf file read is " << i << std::endl;
-       for (int j = 4; j >= 1; j--)
-	 {
-	   if (maskFileStream >> junk) {}
-	   else { std::cerr << "RCT mask producer: error reading HF mask" << std::endl; }
-	   if (junk == "-") 
-	     {}
-	   else if ((junk == "X") || (junk == "x"))
-	     {
-	       hfMask.at(0).at(i).at(j-1) = 0;  // just save iphi as 0-17, transform later
-	     }
-	   else
-	     {
-	       std::cerr << "RCT mask producer: error -- unrecognized character" << std::endl;
-	     }
-	 }
-       for (int j = 1; j <= 4; j++)
-	 {
-	   if (maskFileStream >> junk) {}
-	   else { std::cerr << "RCT mask producer: error reading HF mask" << std::endl; }
-	   if (junk == "-") 
-	     {}
-	   else if ((junk == "X") || (junk == "x"))
-	     {
-	       hfMask.at(1).at(i).at(j-1) = 0;
-	     }
-	   else
-	     {
-	       std::cerr << "RCT mask producer: error -- unrecognized character" << std::endl;
-	     }
-	 }	   
-     }
-
-   //std::cout << "HF read done" << std::endl;
-
-   maskFileStream.close();
-
-   //std::cout << "file closed" << std::endl;
-
-   // apply mask
-
-   std::unique_ptr<EcalTrigPrimDigiCollection>
-     maskedEcalTPs(new EcalTrigPrimDigiCollection());
-   std::unique_ptr<HcalTrigPrimDigiCollection>
-     maskedHcalTPs(new HcalTrigPrimDigiCollection());
-   maskedEcalTPs->reserve(56*72);
-   maskedHcalTPs->reserve(56*72+18*8);
-   int nEcalSamples = 0;
-   int nHcalSamples = 0;
-
-   for (unsigned int i = 0; i < ecalColl.size(); i++)
-     {
-       nEcalSamples = ecalColl[i].size();
-       short ieta = (short) ecalColl[i].id().ieta();
-       unsigned short absIeta = (unsigned short) abs(ieta);
-       int sign = ieta / absIeta;
-       short iphi = (unsigned short) ecalColl[i].id().iphi();
-       //if (i < 20) {std::cout << "ieta is " << ieta << ", absIeta is " << absIeta
-       //		      << ", iphi is " << iphi << std::endl;}
-
-       EcalTriggerPrimitiveDigi
-	 ecalDigi(EcalTrigTowerDetId(sign, EcalTriggerTower, absIeta, iphi));
-       ecalDigi.setSize(nEcalSamples);
-
-       for (int nSample = 0; nSample < nEcalSamples; nSample++)
-	 {
-	   
-	   int energy = 0;
-	   bool fineGrain = false;
-	   
-	   if (sign < 0)
-	     {
-	       //std::cout << "eta-: mask is " << ecalMask.at(0).at(iphi-1).at(absIeta-1) << std::endl;
-	       energy = ecalMask.at(0).at(iphi-1).at(absIeta-1) * ecalColl[i].sample(nSample).compressedEt();
-	       fineGrain = (ecalMask.at(0).at(iphi-1).at(absIeta-1) !=0) && ecalColl[i].sample(nSample).fineGrain();
-	     }
-	   else if (sign > 0)
-	     {
-	       //std::cout << "eta+: mask is " << ecalMask.at(1).at(iphi-1).at(absIeta-1) << std::endl;	   
-	       energy = ecalMask.at(1).at(iphi-1).at(absIeta-1) * ecalColl[i].sample(nSample).compressedEt();
-	       fineGrain = (ecalMask.at(1).at(iphi-1).at(absIeta-1) != 0) && ecalColl[i].sample(nSample).fineGrain();
-	     }
-	   
-	   ecalDigi.setSample(nSample, EcalTriggerPrimitiveSample(energy,
-							fineGrain,
-							0));
-	 }
-       maskedEcalTPs->push_back(ecalDigi);
-     }
-   //std::cout << "End of ecal digi masking" << std::endl;
-
-   //std::cout << "nHcalDigis is " << hcalColl.size() << std::endl;
-   for (unsigned int i = 0; i < hcalColl.size(); i++)
-     {
-       nHcalSamples = hcalColl[i].size();
-       //if ((i % 100) == 0 ) {std::cout << "Loop " << i << std::endl;}
-       short ieta = (short) hcalColl[i].id().ieta();
-       unsigned short absIeta = (unsigned short) abs(ieta);
-       int sign = ieta / absIeta;
-       short iphi = (unsigned short) hcalColl[i].id().iphi();
-       //if (i < 20) {std::cout << "ieta is " << ieta << ", absIeta is " << absIeta
-       //      << ", iphi is " << iphi << std::endl;}
-       /*
-       if (hcalColl[i].SOI_compressedEt() != 0)
-	 {
-	   std::cout << "original et " << hcalColl[i].SOI_compressedEt() 
-		     << "  fg " << hcalColl[i].SOI_fineGrain() << "  iphi " 
-		     << iphi << "  ieta " << ieta << std::endl;
-	 }
-       */
-       HcalTriggerPrimitiveDigi
-	 hcalDigi(HcalTrigTowerDetId(ieta,iphi));
-       hcalDigi.setSize(nHcalSamples);
-       hcalDigi.setPresamples(hcalColl[i].presamples());
-
-       for (int nSample = 0; nSample < nHcalSamples; nSample++)
-	 {
-	   
-	   int energy = 0;
-	   bool fineGrain = false;
-	   
-	   if (absIeta < 29)
-	     {
-	       if (sign < 0)
-		 {
-		   energy = hcalMask.at(0).at(iphi-1).at(absIeta-1) * hcalColl[i].sample(nSample).compressedEt();
-		   fineGrain = (hcalMask.at(0).at(iphi-1).at(absIeta-1) != 0) && hcalColl[i].sample(nSample).fineGrain();
-		 }
-	       else if (sign > 0)
-		 {
-		   energy = hcalMask.at(1).at(iphi-1).at(absIeta-1) * hcalColl[i].sample(nSample).compressedEt();
-		   fineGrain = (hcalMask.at(1).at(iphi-1).at(absIeta-1) !=0) && hcalColl[i].sample(nSample).fineGrain();
-		 }
-	     }
-	   else if ((absIeta >= 29) && (absIeta <= 32))
-	     {
-	       //std::cout << "hf iphi: " << iphi << std::endl;
-	       short hf_phi_index = iphi/4;
-	       //iphi = iphi/4;  // change from 1,5,9, etc to access vector positions
-	       //std::cout << "hf phi index: " << hf_phi_index << std::endl;
-	       if (sign < 0)
-		 {
-		   //std::cout << "ieta is " << ieta << ", absIeta is " << absIeta << ", iphi is " << iphi << std::endl;
-		   //std::cout << "eta-: mask is " << hfMask.at(0).at(hf_phi_index).at(absIeta-29) << std::endl; // hf ieta 0-3
-		   energy = hfMask.at(0).at(hf_phi_index).at(absIeta-29) * hcalColl[i].sample(nSample).compressedEt();  // for hf, iphi starts at 0
-		   fineGrain = (hfMask.at(0).at(hf_phi_index).at(absIeta-29) != 0) && hcalColl[i].sample(nSample).fineGrain();
-		 }
-	       else if (sign > 0)
-		 {
-		   //std::cout << "ieta is " << ieta << ", absIeta is " << absIeta << ", iphi is " << iphi << std::endl;
-		   //std::cout << "eta+: mask is " << hfMask.at(1).at(hf_phi_index).at(absIeta-29) << std::endl;
-		   energy = hfMask.at(1).at(hf_phi_index).at(absIeta-29) * hcalColl[i].sample(nSample).compressedEt();
-		   fineGrain = (hfMask.at(1).at(hf_phi_index).at(absIeta-29) != 0) && hcalColl[i].sample(nSample).fineGrain();
-		 }
-	       //iphi = iphi*4 + 1; // change back to original
-	       //std::cout << "New hf iphi = " << iphi << std::endl;
-	     }
-	   
-	   hcalDigi.setSample(nSample, HcalTriggerPrimitiveSample(energy,
-								  fineGrain,
-								  0, 0));
-	   
-	   //if (hcalDigi.SOI_compressedEt() != 0)
-	   //{
-	   //  std::cout << "et " << hcalDigi.SOI_compressedEt()
-	   //     << "fg " << hcalDigi.SOI_fineGrain() << std::endl;
-	   //}
-	 }
-       maskedHcalTPs->push_back(hcalDigi);
-     }
-   //std::cout << "End of hcal digi masking" << std::endl;
-
-   // put new data into event
-
-   iEvent.put(std::move(maskedEcalTPs));
-   iEvent.put(std::move(maskedHcalTPs));
-
+void MaskedRctInputDigiProducer::produce(edm::Event &iEvent,
+                                         const edm::EventSetup &iSetup) {
+  using namespace edm;
+  /* This is an event example
+     //Read 'ExampleData' from the Event
+     Handle<ExampleData> pIn;
+     iEvent.getByLabel("example",pIn);
+
+     //Use the ExampleData to create an ExampleData2 which
+     // is put into the Event
+     std::unique_ptr<ExampleData2> pOut(new ExampleData2(*pIn));
+     iEvent.put(std::move(pOut));
+  */
+
+  edm::Handle<EcalTrigPrimDigiCollection> ecal;
+  edm::Handle<HcalTrigPrimDigiCollection> hcal;
+
+  if (useEcal_) {
+    iEvent.getByLabel(ecalDigisLabel_, ecal);
+  }
+  if (useHcal_) {
+    iEvent.getByLabel(hcalDigisLabel_, hcal);
+  }
+
+  EcalTrigPrimDigiCollection ecalColl;
+  HcalTrigPrimDigiCollection hcalColl;
+  if (ecal.isValid()) {
+    ecalColl = *ecal;
+  }
+  if (hcal.isValid()) {
+    hcalColl = *hcal;
+  }
+
+  /* this is an EventSetup example
+     //Read SetupData from the SetupRecord in the EventSetup
+     ESHandle<SetupData> pSetup;
+     iSetup.get<SetupRecord>().get(pSetup);
+  */
+
+  ifstream maskFileStream(maskFile_.fullPath().c_str());
+  if (!maskFileStream.is_open()) {
+    throw cms::Exception("FileInPathError")
+        << "RCT mask file not opened" << std::endl;
+    ;
+  }
+
+  // read and process file (transform mask to new position in phi to match
+  // digis)
+  // char junk[256];
+  std::string junk;
+  // char junk[32];
+  do {
+    // maskFileStream.getline(junk, 256);
+    maskFileStream >> junk;
+  } while (junk != "ECAL:");
+
+  //   std::vector<std::vector<std::vector<unsigned short> > >
+  //   temp(2,std::vector<std::vector<unsigned short> >(72,std::vector<unsigned
+  //   short>(28,1)));
+  std::vector<std::vector<std::vector<unsigned short>>> ecalMask(
+      2, std::vector<std::vector<unsigned short>>(
+             72, std::vector<unsigned short>(28, 1)));
+  std::vector<std::vector<std::vector<unsigned short>>> hcalMask(
+      2, std::vector<std::vector<unsigned short>>(
+             72, std::vector<unsigned short>(28, 1)));
+  std::vector<std::vector<std::vector<unsigned short>>> hfMask(
+      2, std::vector<std::vector<unsigned short>>(
+             18, std::vector<unsigned short>(8, 1)));
+
+  // read ECAL mask first
+  // loop through rct iphi
+  for (int i = 1; i <= 72; i++) {
+    int phi_index = (72 + 18 - i) % 72; // transfrom from RCT coords
+    if (phi_index == 0) {
+      phi_index = 72;
+    }
+    // std::cout << "ecal phi index is " << phi_index << std::endl;
+    for (int j = 28; j >= 1; j--) {
+      maskFileStream >> junk;
+      if (junk == "-") {
+      } else if ((junk == "X") || (junk == "x")) {
+        ecalMask.at(0).at(phi_index - 1).at(j - 1) = 0;
+      } else {
+        std::cerr << "RCT mask producer: error -- unrecognized character"
+                  << std::endl;
+      }
+    }
+    for (int j = 1; j <= 28; j++) {
+      maskFileStream >> junk;
+      if (junk == "-") {
+      } else if ((junk == "X") || (junk == "x")) {
+        ecalMask.at(1).at(phi_index - 1).at(j - 1) = 0;
+      } else {
+        std::cerr << "RCT mask producer: error -- unrecognized character"
+                  << std::endl;
+      }
+    }
+  }
+  // std::cout << "done reading ECAL" << std::endl;
+
+  maskFileStream >> junk;
+  if (junk != "HCAL:") {
+    throw cms::Exception("FileInPathError")
+        << "RCT mask producer: error reading ECAL mask" << std::endl;
+    ;
+  }
+
+  // std::cout << "Starting HCAL read" << std::endl;
+
+  // now read HCAL mask
+  // loop through rct iphi
+  for (int i = 1; i <= 72; i++) {
+    int phi_index = (72 + 18 - i) % 72; // transfrom from RCT coords
+    if (phi_index == 0) {
+      phi_index = 72;
+    }
+    // std::cout << "hcal phi index is " << phi_index << std::endl;
+    for (int j = 28; j >= 1; j--) {
+      maskFileStream >> junk;
+      if (junk == "-") {
+      } else if ((junk == "X") || (junk == "x")) {
+        hcalMask.at(0).at(phi_index - 1).at(j - 1) = 0;
+      } else {
+        std::cerr << "RCT mask producer: error -- unrecognized character"
+                  << std::endl;
+      }
+    }
+    for (int j = 1; j <= 28; j++) {
+      maskFileStream >> junk;
+      if (junk == "-") {
+      } else if ((junk == "X") || (junk == "x")) {
+        hcalMask.at(1).at(phi_index - 1).at(j - 1) = 0;
+      } else {
+        std::cerr << "RCT mask producer: error -- unrecognized character"
+                  << std::endl;
+      }
+    }
+  }
+
+  maskFileStream >> junk;
+  if (junk != "HF:") {
+    throw cms::Exception("FileInPathError")
+        << "RCT mask producer: error reading HCAL mask" << std::endl;
+    ;
+  }
+
+  // loop through the hf phi columns in file
+  for (int i = 0; i < 18; i++) {
+    // std::cout << "iphi for hf file read is " << i << std::endl;
+    for (int j = 4; j >= 1; j--) {
+      if (maskFileStream >> junk) {
+      } else {
+        std::cerr << "RCT mask producer: error reading HF mask" << std::endl;
+      }
+      if (junk == "-") {
+      } else if ((junk == "X") || (junk == "x")) {
+        hfMask.at(0).at(i).at(j - 1) =
+            0; // just save iphi as 0-17, transform later
+      } else {
+        std::cerr << "RCT mask producer: error -- unrecognized character"
+                  << std::endl;
+      }
+    }
+    for (int j = 1; j <= 4; j++) {
+      if (maskFileStream >> junk) {
+      } else {
+        std::cerr << "RCT mask producer: error reading HF mask" << std::endl;
+      }
+      if (junk == "-") {
+      } else if ((junk == "X") || (junk == "x")) {
+        hfMask.at(1).at(i).at(j - 1) = 0;
+      } else {
+        std::cerr << "RCT mask producer: error -- unrecognized character"
+                  << std::endl;
+      }
+    }
+  }
+
+  // std::cout << "HF read done" << std::endl;
+
+  maskFileStream.close();
+
+  // std::cout << "file closed" << std::endl;
+
+  // apply mask
+
+  std::unique_ptr<EcalTrigPrimDigiCollection> maskedEcalTPs(
+      new EcalTrigPrimDigiCollection());
+  std::unique_ptr<HcalTrigPrimDigiCollection> maskedHcalTPs(
+      new HcalTrigPrimDigiCollection());
+  maskedEcalTPs->reserve(56 * 72);
+  maskedHcalTPs->reserve(56 * 72 + 18 * 8);
+  int nEcalSamples = 0;
+  int nHcalSamples = 0;
+
+  for (unsigned int i = 0; i < ecalColl.size(); i++) {
+    nEcalSamples = ecalColl[i].size();
+    short ieta = (short)ecalColl[i].id().ieta();
+    unsigned short absIeta = (unsigned short)abs(ieta);
+    int sign = ieta / absIeta;
+    short iphi = (unsigned short)ecalColl[i].id().iphi();
+    // if (i < 20) {std::cout << "ieta is " << ieta << ", absIeta is " <<
+    // absIeta
+    //		      << ", iphi is " << iphi << std::endl;}
+
+    EcalTriggerPrimitiveDigi ecalDigi(
+        EcalTrigTowerDetId(sign, EcalTriggerTower, absIeta, iphi));
+    ecalDigi.setSize(nEcalSamples);
+
+    for (int nSample = 0; nSample < nEcalSamples; nSample++) {
+
+      int energy = 0;
+      bool fineGrain = false;
+
+      if (sign < 0) {
+        // std::cout << "eta-: mask is " <<
+        // ecalMask.at(0).at(iphi-1).at(absIeta-1) << std::endl;
+        energy = ecalMask.at(0).at(iphi - 1).at(absIeta - 1) *
+                 ecalColl[i].sample(nSample).compressedEt();
+        fineGrain = (ecalMask.at(0).at(iphi - 1).at(absIeta - 1) != 0) &&
+                    ecalColl[i].sample(nSample).fineGrain();
+      } else if (sign > 0) {
+        // std::cout << "eta+: mask is " <<
+        // ecalMask.at(1).at(iphi-1).at(absIeta-1) << std::endl;
+        energy = ecalMask.at(1).at(iphi - 1).at(absIeta - 1) *
+                 ecalColl[i].sample(nSample).compressedEt();
+        fineGrain = (ecalMask.at(1).at(iphi - 1).at(absIeta - 1) != 0) &&
+                    ecalColl[i].sample(nSample).fineGrain();
+      }
+
+      ecalDigi.setSample(nSample,
+                         EcalTriggerPrimitiveSample(energy, fineGrain, 0));
+    }
+    maskedEcalTPs->push_back(ecalDigi);
+  }
+  // std::cout << "End of ecal digi masking" << std::endl;
+
+  // std::cout << "nHcalDigis is " << hcalColl.size() << std::endl;
+  for (unsigned int i = 0; i < hcalColl.size(); i++) {
+    nHcalSamples = hcalColl[i].size();
+    // if ((i % 100) == 0 ) {std::cout << "Loop " << i << std::endl;}
+    short ieta = (short)hcalColl[i].id().ieta();
+    unsigned short absIeta = (unsigned short)abs(ieta);
+    int sign = ieta / absIeta;
+    short iphi = (unsigned short)hcalColl[i].id().iphi();
+    // if (i < 20) {std::cout << "ieta is " << ieta << ", absIeta is " <<
+    // absIeta
+    //      << ", iphi is " << iphi << std::endl;}
+    /*
+    if (hcalColl[i].SOI_compressedEt() != 0)
+      {
+        std::cout << "original et " << hcalColl[i].SOI_compressedEt()
+                  << "  fg " << hcalColl[i].SOI_fineGrain() << "  iphi "
+                  << iphi << "  ieta " << ieta << std::endl;
+      }
+    */
+    HcalTriggerPrimitiveDigi hcalDigi(HcalTrigTowerDetId(ieta, iphi));
+    hcalDigi.setSize(nHcalSamples);
+    hcalDigi.setPresamples(hcalColl[i].presamples());
+
+    for (int nSample = 0; nSample < nHcalSamples; nSample++) {
+
+      int energy = 0;
+      bool fineGrain = false;
+
+      if (absIeta < 29) {
+        if (sign < 0) {
+          energy = hcalMask.at(0).at(iphi - 1).at(absIeta - 1) *
+                   hcalColl[i].sample(nSample).compressedEt();
+          fineGrain = (hcalMask.at(0).at(iphi - 1).at(absIeta - 1) != 0) &&
+                      hcalColl[i].sample(nSample).fineGrain();
+        } else if (sign > 0) {
+          energy = hcalMask.at(1).at(iphi - 1).at(absIeta - 1) *
+                   hcalColl[i].sample(nSample).compressedEt();
+          fineGrain = (hcalMask.at(1).at(iphi - 1).at(absIeta - 1) != 0) &&
+                      hcalColl[i].sample(nSample).fineGrain();
+        }
+      } else if ((absIeta >= 29) && (absIeta <= 32)) {
+        // std::cout << "hf iphi: " << iphi << std::endl;
+        short hf_phi_index = iphi / 4;
+        // iphi = iphi/4;  // change from 1,5,9, etc to access vector positions
+        // std::cout << "hf phi index: " << hf_phi_index << std::endl;
+        if (sign < 0) {
+          // std::cout << "ieta is " << ieta << ", absIeta is " << absIeta << ",
+          // iphi is " << iphi << std::endl; std::cout << "eta-: mask is " <<
+          // hfMask.at(0).at(hf_phi_index).at(absIeta-29) << std::endl; // hf
+          // ieta 0-3
+          energy = hfMask.at(0).at(hf_phi_index).at(absIeta - 29) *
+                   hcalColl[i]
+                       .sample(nSample)
+                       .compressedEt(); // for hf, iphi starts at 0
+          fineGrain = (hfMask.at(0).at(hf_phi_index).at(absIeta - 29) != 0) &&
+                      hcalColl[i].sample(nSample).fineGrain();
+        } else if (sign > 0) {
+          // std::cout << "ieta is " << ieta << ", absIeta is " << absIeta << ",
+          // iphi is " << iphi << std::endl; std::cout << "eta+: mask is " <<
+          // hfMask.at(1).at(hf_phi_index).at(absIeta-29) << std::endl;
+          energy = hfMask.at(1).at(hf_phi_index).at(absIeta - 29) *
+                   hcalColl[i].sample(nSample).compressedEt();
+          fineGrain = (hfMask.at(1).at(hf_phi_index).at(absIeta - 29) != 0) &&
+                      hcalColl[i].sample(nSample).fineGrain();
+        }
+        // iphi = iphi*4 + 1; // change back to original
+        // std::cout << "New hf iphi = " << iphi << std::endl;
+      }
+
+      hcalDigi.setSample(nSample,
+                         HcalTriggerPrimitiveSample(energy, fineGrain, 0, 0));
+
+      // if (hcalDigi.SOI_compressedEt() != 0)
+      //{
+      //  std::cout << "et " << hcalDigi.SOI_compressedEt()
+      //     << "fg " << hcalDigi.SOI_fineGrain() << std::endl;
+      //}
+    }
+    maskedHcalTPs->push_back(hcalDigi);
+  }
+  // std::cout << "End of hcal digi masking" << std::endl;
+
+  // put new data into event
+
+  iEvent.put(std::move(maskedEcalTPs));
+  iEvent.put(std::move(maskedHcalTPs));
 }
 
-// ------------ method called once each job just before starting event loop  ------------
+// ------------ method called once each job just before starting event loop
+// ------------
 
+// ------------ method called once each job just after ending the event loop
+// ------------
+void MaskedRctInputDigiProducer::endJob() {}
 
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-MaskedRctInputDigiProducer::endJob() {
-}
-
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(MaskedRctInputDigiProducer);
diff --git a/L1Trigger/RegionalCaloTrigger/plugins/SealModule.cc b/L1Trigger/RegionalCaloTrigger/plugins/SealModule.cc
index c9e812fb3c1ab..08ab73bdcf8a0 100644
--- a/L1Trigger/RegionalCaloTrigger/plugins/SealModule.cc
+++ b/L1Trigger/RegionalCaloTrigger/plugins/SealModule.cc
@@ -1,12 +1,11 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTProducer.h"
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTInputProducer.h"
-#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTTestAnalyzer.h"
-#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTSaveInput.h"
-#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTRelValAnalyzer.h"
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLutWriter.h"
+#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTProducer.h"
+#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTRelValAnalyzer.h"
+#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTSaveInput.h"
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTTPGProvider.h"
-
+#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTTestAnalyzer.h"
 
 DEFINE_FWK_MODULE(L1RCTProducer);
 DEFINE_FWK_MODULE(L1RCTTPGProvider);
@@ -16,4 +15,3 @@ DEFINE_FWK_MODULE(L1RCTTestAnalyzer);
 DEFINE_FWK_MODULE(L1RCTSaveInput);
 DEFINE_FWK_MODULE(L1RCTRelValAnalyzer);
 DEFINE_FWK_MODULE(L1RCTLutWriter);
-
diff --git a/L1Trigger/RegionalCaloTrigger/src/L1RCT.cc b/L1Trigger/RegionalCaloTrigger/src/L1RCT.cc
index 3af2f793f564f..5d49c0c38d222 100644
--- a/L1Trigger/RegionalCaloTrigger/src/L1RCT.cc
+++ b/L1Trigger/RegionalCaloTrigger/src/L1RCT.cc
@@ -7,37 +7,37 @@ using std::vector;
 #include <string>
 
 #include <iostream>
-using std::ostream;
-using std::cout;
 using std::cerr;
+using std::cout;
 using std::endl;
+using std::ostream;
 
 #include <iomanip>
 
 //#include "DataFormats/L1CaloTrigger/interface/L1CaloEmCand.h"
 
-#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h"
-#include "CondFormats/L1TObjects/interface/L1RCTParameters.h"
 #include "CondFormats/L1TObjects/interface/L1CaloEtScale.h"
+#include "CondFormats/L1TObjects/interface/L1RCTParameters.h"
+#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h"
 
-//Main method to process a single event, hence the name.
-//First it sets up all the neighbors, sharing the pointers to the proper
-//regions.  This is done via the neighborMap auxiliary class, which
-//is very dry and contains the proper mappings from crate,card,and
-//region numbers to the crate,card, and region numbers of the neighbors.
-//The next step is to pass along the pointers for the regions
-//to their corresponding Electron Isolation Card
-//This is done in the crate method fillElectronIsolationCards
-//Then the actual processing of the data begins with the
-//processReceiverCards and processElectronIsolationCards methods.
-//Next the region sums, tau bits, mip bits, and electron
-//candidates are passed onto the Jet Summary Card, and that's where
-//the data flow ends for the Regional CaloTrigger.
-void L1RCT::processEvent(){
-  for(int i=0; i<18;i++)
+// Main method to process a single event, hence the name.
+// First it sets up all the neighbors, sharing the pointers to the proper
+// regions.  This is done via the neighborMap auxiliary class, which
+// is very dry and contains the proper mappings from crate,card,and
+// region numbers to the crate,card, and region numbers of the neighbors.
+// The next step is to pass along the pointers for the regions
+// to their corresponding Electron Isolation Card
+// This is done in the crate method fillElectronIsolationCards
+// Then the actual processing of the data begins with the
+// processReceiverCards and processElectronIsolationCards methods.
+// Next the region sums, tau bits, mip bits, and electron
+// candidates are passed onto the Jet Summary Card, and that's where
+// the data flow ends for the Regional CaloTrigger.
+void L1RCT::processEvent() {
+  for (int i = 0; i < 18; i++)
     crates.at(i).processReceiverCards();
-  shareNeighbors();  
-  for(int i=0; i<18;i++){
+  shareNeighbors();
+  for (int i = 0; i < 18; i++) {
     crates.at(i).fillElectronIsolationCards();
     crates.at(i).processElectronIsolationCards();
     crates.at(i).fillJetSummaryCard();
@@ -45,202 +45,200 @@ void L1RCT::processEvent(){
   }
 }
 
-void L1RCT::makeCrates()
-{
-  for(int i = 0; i<18; i++){
+void L1RCT::makeCrates() {
+  for (int i = 0; i < 18; i++) {
     L1RCTCrate c(i, rctLookupTables_);
     crates.push_back(c);
   }
 }
 
-L1RCT::L1RCT(const L1RCTLookupTables* rctLookupTables) : 
-  rctLookupTables_(rctLookupTables),
-  empty(),
-  neighborMap(),
-  barrel(18,std::vector<std::vector<unsigned short> >(7,std::vector<unsigned short>(64))),
-  hf(18,std::vector<unsigned short>(8))
-{
+L1RCT::L1RCT(const L1RCTLookupTables *rctLookupTables)
+    : rctLookupTables_(rctLookupTables), empty(), neighborMap(),
+      barrel(18, std::vector<std::vector<unsigned short>>(
+                     7, std::vector<unsigned short>(64))),
+      hf(18, std::vector<unsigned short>(8)) {
   makeCrates();
 }
 
-void L1RCT::input()
-{
-  for(int i = 0; i<18; i++){
-    crates.at(i).input(barrel.at(i),hf.at(i));
+void L1RCT::input() {
+  for (int i = 0; i < 18; i++) {
+    crates.at(i).input(barrel.at(i), hf.at(i));
   }
 }
 
-void L1RCT::input(const std::vector<std::vector<std::vector<unsigned short> > >& barrelIn,
-		  const std::vector<std::vector<unsigned short> >& hfIn)
-{
-  for(int i = 0; i<18; i++){
-    crates.at(i).input(barrelIn.at(i),hfIn.at(i));
+void L1RCT::input(
+    const std::vector<std::vector<std::vector<unsigned short>>> &barrelIn,
+    const std::vector<std::vector<unsigned short>> &hfIn) {
+  for (int i = 0; i < 18; i++) {
+    crates.at(i).input(barrelIn.at(i), hfIn.at(i));
   }
 }
 
-//This is a method for taking input from a file.  Any entries in excess
-//of 18*7*64 will simply be ignored.  This *only* fills input for a single
-//event.  At the moment you cannot put a ton of data and have it be
-//read as separate events.
-void L1RCT::fileInput(const char* filename){            // added "const" also in .h
+// This is a method for taking input from a file.  Any entries in excess
+// of 18*7*64 will simply be ignored.  This *only* fills input for a single
+// event.  At the moment you cannot put a ton of data and have it be
+// read as separate events.
+void L1RCT::fileInput(const char *filename) { // added "const" also in .h
   unsigned short x;
   std::ifstream instream(filename);
-  if(instream){
-    for(int i = 0; i<18;i++){
-      for(int j = 0; j<7; j++){
-	for(int k = 0; k<64; k++){
-	  if(instream >> x){
-	    unsigned short bit = x/256;             // added J.Leonard Aug. 16 06
-	    unsigned short energy = x&255;          //
-	    unsigned short input = energy*2 + bit;  //
-	    barrel.at(i).at(j).at(k) = input;
-	  }
-	  else
-	    break;
-	}
+  if (instream) {
+    for (int i = 0; i < 18; i++) {
+      for (int j = 0; j < 7; j++) {
+        for (int k = 0; k < 64; k++) {
+          if (instream >> x) {
+            unsigned short bit = x / 256;    // added J.Leonard Aug. 16 06
+            unsigned short energy = x & 255; //
+            unsigned short input = energy * 2 + bit; //
+            barrel.at(i).at(j).at(k) = input;
+          } else
+            break;
+        }
       }
-      for(int j = 0; j<8; j++){
-	if(instream >> x){
-	  hf.at(i).at(j) = x;
-	}
-	else
-	  break;
+      for (int j = 0; j < 8; j++) {
+        if (instream >> x) {
+          hf.at(i).at(j) = x;
+        } else
+          break;
       }
     }
   }
   input();
 }
 
-
 // takes hcal and ecal digi input, including HF
-void L1RCT::digiInput(const EcalTrigPrimDigiCollection& ecalCollection,
-		      const HcalTrigPrimDigiCollection& hcalCollection)
-{
+void L1RCT::digiInput(const EcalTrigPrimDigiCollection &ecalCollection,
+                      const HcalTrigPrimDigiCollection &hcalCollection) {
   // fills input vectors with 0's in case ecal or hcal collection not used
-  for (int i = 0; i < 18; i++)
-    {
-      for (int j = 0; j < 7; j++)
-	{
-	  for (int k = 0; k < 64; k++)
-	    {
-	      barrel.at(i).at(j).at(k) = 0;
-	    }
-	}
-      for (int j = 0; j < 8; j++)
-	{
-	  hf.at(i).at(j) = 0;
-	}
+  for (int i = 0; i < 18; i++) {
+    for (int j = 0; j < 7; j++) {
+      for (int k = 0; k < 64; k++) {
+        barrel.at(i).at(j).at(k) = 0;
+      }
+    }
+    for (int j = 0; j < 8; j++) {
+      hf.at(i).at(j) = 0;
     }
+  }
 
   int nEcalDigi = ecalCollection.size();
-  if (nEcalDigi>4032) {nEcalDigi=4032;}
-  for (int i = 0; i < nEcalDigi; i++){
-    short ieta = (short) ecalCollection[i].id().ieta(); 
+  if (nEcalDigi > 4032) {
+    nEcalDigi = 4032;
+  }
+  for (int i = 0; i < nEcalDigi; i++) {
+    short ieta = (short)ecalCollection[i].id().ieta();
     // Note absIeta counts from 1-28 (not 0-27)
-    unsigned short absIeta = (unsigned short) abs(ieta);
-    unsigned short cal_iphi = (unsigned short) ecalCollection[i].id().iphi(); 
-    unsigned short iphi = (72 + 18 - cal_iphi) % 72; // transform TOWERS (not regions) into local rct (intuitive) phi bins
+    unsigned short absIeta = (unsigned short)abs(ieta);
+    unsigned short cal_iphi = (unsigned short)ecalCollection[i].id().iphi();
+    unsigned short iphi =
+        (72 + 18 - cal_iphi) % 72; // transform TOWERS (not regions) into local
+                                   // rct (intuitive) phi bins
 
-    //map digis to crates, cards, and towers
+    // map digis to crates, cards, and towers
     unsigned short crate = 999, card = 999, tower = 999;
     crate = rctLookupTables_->rctParameters()->calcCrate(iphi, ieta);
     card = rctLookupTables_->rctParameters()->calcCard(iphi, absIeta);
     tower = rctLookupTables_->rctParameters()->calcTower(iphi, absIeta);
 
     unsigned short energy = ecalCollection[i].compressedEt();
-    unsigned short fineGrain = (unsigned short) ecalCollection[i].fineGrain();  // 0 or 1
-    unsigned short ecalInput = energy*2 + fineGrain;
+    unsigned short fineGrain =
+        (unsigned short)ecalCollection[i].fineGrain(); // 0 or 1
+    unsigned short ecalInput = energy * 2 + fineGrain;
 
     // put input into correct crate/card/tower of barrel
-    if ((crate<18) && (card<7) && (tower<32)) {             // changed 64 to 32 Sept. 19 J. Leonard, rm -1 7Nov07
-      barrel.at(crate).at(card).at(tower) = ecalInput;        // rm -1
+    if ((crate < 18) && (card < 7) &&
+        (tower < 32)) { // changed 64 to 32 Sept. 19 J. Leonard, rm -1 7Nov07
+      barrel.at(crate).at(card).at(tower) = ecalInput; // rm -1
+    } else {
+      std::cerr << "L1RCT: ecal out of range! tower = " << tower << " iphi is "
+                << iphi << " absieta is " << absIeta << std::endl;
     }
-    else { std::cerr << "L1RCT: ecal out of range! tower = " << tower << " iphi is " << iphi << " absieta is " << absIeta << std::endl; }
   }
 
-//same for hcal, once we get the hcal digis, just need to add 32 to towers:
-// just copied and pasted and changed names where necessary
+  // same for hcal, once we get the hcal digis, just need to add 32 to towers:
+  // just copied and pasted and changed names where necessary
   int nHcalDigi = hcalCollection.size();
-  //if (nHcalDigi != 4176){ std::cout << "L1RCT: Warning: There are " << nHcalDigi << "hcal digis instead of 4176!" << std::endl;}
+  // if (nHcalDigi != 4176){ std::cout << "L1RCT: Warning: There are " <<
+  // nHcalDigi << "hcal digis instead of 4176!" << std::endl;}
   // incl HF 4032 + 144 = 4176
-  for (int i = 0; i < nHcalDigi; i++){
+  for (int i = 0; i < nHcalDigi; i++) {
     if (hcalCollection[i].id().version() != 0) {
       continue;
     }
-    short ieta = (short) hcalCollection[i].id().ieta(); 
-    unsigned short absIeta = (unsigned short) abs(ieta);
-    unsigned short cal_iphi = (unsigned short) hcalCollection[i].id().iphi();
+    short ieta = (short)hcalCollection[i].id().ieta();
+    unsigned short absIeta = (unsigned short)abs(ieta);
+    unsigned short cal_iphi = (unsigned short)hcalCollection[i].id().iphi();
     // All Hcal primitives (including HF) are reported
     // with phi bin numbering in the range 0-72.
     unsigned short iphi = (72 + 18 - cal_iphi) % 72;
-    // transform Hcal TOWERS (1-72)into local rct (intuitive) phi bins (72 bins) 0-71
-    // Use local iphi to work out the region and crate (for HB/HE and HF)
+    // transform Hcal TOWERS (1-72)into local rct (intuitive) phi bins (72 bins)
+    // 0-71 Use local iphi to work out the region and crate (for HB/HE and HF)
     // HF regions need to have local iphi 0-17
     if (absIeta >= 29) {
-      iphi = iphi/4;
+      iphi = iphi / 4;
     }
 
-    //map digis to crates, cards, and towers
+    // map digis to crates, cards, and towers
     unsigned short crate = 999, card = 999, tower = 999;
     crate = rctLookupTables_->rctParameters()->calcCrate(iphi, ieta);
-    if (absIeta < 29){
+    if (absIeta < 29) {
       card = rctLookupTables_->rctParameters()->calcCard(iphi, absIeta);
     }
     tower = rctLookupTables_->rctParameters()->calcTower(iphi, absIeta);
 
-
-    unsigned short energy = hcalCollection[i].SOI_compressedEt();     // access only sample of interest
-    unsigned short fineGrain = (unsigned short) hcalCollection[i].SOI_fineGrain();
-    unsigned short hcalInput = energy*2 + fineGrain;
-    if (absIeta <= 28){
+    unsigned short energy =
+        hcalCollection[i].SOI_compressedEt(); // access only sample of interest
+    unsigned short fineGrain =
+        (unsigned short)hcalCollection[i].SOI_fineGrain();
+    unsigned short hcalInput = energy * 2 + fineGrain;
+    if (absIeta <= 28) {
       // put input into correct crate/card/tower of barrel
-      if ((crate<18) && (card<7) && (tower<32)) {               // changed 64 to 32 Sept. 19 J. Leonard, rm -1 7Nov07
-        barrel.at(crate).at(card).at(tower + 32) = hcalInput;  // hcal towers are ecal + 32 see RC.cc; rm -1 7Nov07
+      if ((crate < 18) && (card < 7) &&
+          (tower < 32)) { // changed 64 to 32 Sept. 19 J. Leonard, rm -1 7Nov07
+        barrel.at(crate).at(card).at(tower + 32) =
+            hcalInput; // hcal towers are ecal + 32 see RC.cc; rm -1 7Nov07
+      } else {
+        std::cout << "L1RCT: hcal out of range!  tower = " << tower
+                  << std::endl;
       }
-      else { std::cout << "L1RCT: hcal out of range!  tower = " << tower << std::endl; }
-    }
-    else if ((absIeta >= 29) && (absIeta <= 32)){
+    } else if ((absIeta >= 29) && (absIeta <= 32)) {
       // put input into correct crate/region of HF
-      if ((crate<18) && (tower<8)) {
+      if ((crate < 18) && (tower < 8)) {
         hf.at(crate).at(tower) = hcalInput;
+      } else {
+        std::cout << "L1RCT: hf out of range!  region = " << tower << std::endl;
       }
-      else { std::cout << "L1RCT: hf out of range!  region = " << tower << std::endl; }
     }
-
   }
-  
+
   input();
 
   return;
-
 }
 
-//As the name implies, it will randomly generate input for the 
-//regional calotrigger.
-void L1RCT::randomInput()
-{
-  for(int i = 0; i<18;i++){
-    for(int j = 0; j<7;j++){
-      for(int k = 0; k<64; k++){
-	barrel.at(i).at(j).at(k) = rand()%511;
+// As the name implies, it will randomly generate input for the
+// regional calotrigger.
+void L1RCT::randomInput() {
+  for (int i = 0; i < 18; i++) {
+    for (int j = 0; j < 7; j++) {
+      for (int k = 0; k < 64; k++) {
+        barrel.at(i).at(j).at(k) = rand() % 511;
       }
     }
-    for(int j = 0; j<8;j++){
-      hf.at(i).at(j) = rand()%255;  // changed from 1023 (10 bits)
+    for (int j = 0; j < 8; j++) {
+      hf.at(i).at(j) = rand() % 255; // changed from 1023 (10 bits)
     }
   }
   input();
   return;
 }
 
-
-//This method handles the bulk of the pointer passing, giving
-//to each region pointers to its neighbors.  If it does *not*
-//have a neighbor in that direction then it passes it a pointer
-//to an empty region that contains no data and is disconnected
-//from anything else.  This makes the electron finding algorithm simpler
-//as then all regions can be treated equally.
-void L1RCT::shareNeighbors(){
+// This method handles the bulk of the pointer passing, giving
+// to each region pointers to its neighbors.  If it does *not*
+// have a neighbor in that direction then it passes it a pointer
+// to an empty region that contains no data and is disconnected
+// from anything else.  This makes the electron finding algorithm simpler
+// as then all regions can be treated equally.
+void L1RCT::shareNeighbors() {
   L1RCTRegion *north;
   L1RCTRegion *south;
   L1RCTRegion *west;
@@ -251,134 +249,158 @@ void L1RCT::shareNeighbors(){
   L1RCTRegion *ne;
   L1RCTRegion *primary;
 
-
-  for(int i = 0; i < 18; i++){
-    for(int j = 0; j < 7; j++){
-      for(int k = 0; k < 2; k++){
-
-	primary = crates.at(i).getReceiverCard(j)->getRegion(k);
-
-	vector<int> northIndices = neighborMap.north(i,j,k);
-	if(northIndices.at(0) != -1)
-	  north = crates.at(northIndices.at(0)).getReceiverCard(northIndices.at(1))->getRegion(northIndices.at(2));
-	else north = &empty;
-
-	vector<int> southIndices = neighborMap.south(i,j,k);
-	if(southIndices.at(0) != -1)
-	  south = crates.at(southIndices.at(0)).getReceiverCard(southIndices.at(1))->getRegion(southIndices.at(2));
-	else south = &empty;
-
-	vector<int> westIndices = neighborMap.west(i,j,k);
-	if(westIndices.at(0) != -1)
-	  west = crates.at(westIndices.at(0)).getReceiverCard(westIndices.at(1))->getRegion(westIndices.at(2));
-	else west = &empty;
-
-	vector<int> eastIndices = neighborMap.east(i,j,k);
-	if(eastIndices.at(0) != -1)
-	  east = crates.at(eastIndices.at(0)).getReceiverCard(eastIndices.at(1))->getRegion(eastIndices.at(2));
-	else east = &empty;
-
-	vector<int> seIndices = neighborMap.se(i,j,k);
-	if(seIndices.at(0) != -1)
-	  se = crates.at(seIndices.at(0)).getReceiverCard(seIndices.at(1))->getRegion(seIndices.at(2));
-	else se = &empty;
-
-	vector<int> swIndices = neighborMap.sw(i,j,k);
-	if(swIndices.at(0) != -1)
-	  sw= crates.at(swIndices.at(0)).getReceiverCard(swIndices.at(1))->getRegion(swIndices.at(2));
-	else sw = &empty;
-
-	vector<int> neIndices = neighborMap.ne(i,j,k);
-	if(neIndices.at(0) != -1)
-	  ne= crates.at(neIndices.at(0)).getReceiverCard(neIndices.at(1))->getRegion(neIndices.at(2));
-	else ne = &empty;
-
-	vector<int> nwIndices = neighborMap.nw(i,j,k);
-	if(nwIndices.at(0) != -1)
-	  nw= crates.at(nwIndices.at(0)).getReceiverCard(nwIndices.at(1))->getRegion(nwIndices.at(2));
-	else nw = &empty;
-
-	primary->setNorthEt(north->giveNorthEt());
-	primary->setNorthHE_FG(north->giveNorthHE_FG());
-	primary->setSouthEt(south->giveSouthEt());
-	primary->setSouthHE_FG(south->giveSouthHE_FG());
-	primary->setEastEt(east->giveEastEt());
-	primary->setEastHE_FG(east->giveEastHE_FG());
-	primary->setWestEt(west->giveWestEt());
-	primary->setWestHE_FG(west->giveWestHE_FG());
-	primary->setSEEt(se->giveSEEt());
-	primary->setSEHE_FG(se->giveSEHE_FG());
-	primary->setSWEt(sw->giveSWEt());
-	primary->setSWHE_FG(sw->giveSWHE_FG());
-	primary->setNWEt(nw->giveNWEt());
-	primary->setNWHE_FG(nw->giveNWHE_FG());
-	primary->setNEEt(ne->giveNEEt());
-	primary->setNEHE_FG(ne->giveNEHE_FG());
-
-
-
+  for (int i = 0; i < 18; i++) {
+    for (int j = 0; j < 7; j++) {
+      for (int k = 0; k < 2; k++) {
+
+        primary = crates.at(i).getReceiverCard(j)->getRegion(k);
+
+        vector<int> northIndices = neighborMap.north(i, j, k);
+        if (northIndices.at(0) != -1)
+          north = crates.at(northIndices.at(0))
+                      .getReceiverCard(northIndices.at(1))
+                      ->getRegion(northIndices.at(2));
+        else
+          north = &empty;
+
+        vector<int> southIndices = neighborMap.south(i, j, k);
+        if (southIndices.at(0) != -1)
+          south = crates.at(southIndices.at(0))
+                      .getReceiverCard(southIndices.at(1))
+                      ->getRegion(southIndices.at(2));
+        else
+          south = &empty;
+
+        vector<int> westIndices = neighborMap.west(i, j, k);
+        if (westIndices.at(0) != -1)
+          west = crates.at(westIndices.at(0))
+                     .getReceiverCard(westIndices.at(1))
+                     ->getRegion(westIndices.at(2));
+        else
+          west = &empty;
+
+        vector<int> eastIndices = neighborMap.east(i, j, k);
+        if (eastIndices.at(0) != -1)
+          east = crates.at(eastIndices.at(0))
+                     .getReceiverCard(eastIndices.at(1))
+                     ->getRegion(eastIndices.at(2));
+        else
+          east = &empty;
+
+        vector<int> seIndices = neighborMap.se(i, j, k);
+        if (seIndices.at(0) != -1)
+          se = crates.at(seIndices.at(0))
+                   .getReceiverCard(seIndices.at(1))
+                   ->getRegion(seIndices.at(2));
+        else
+          se = &empty;
+
+        vector<int> swIndices = neighborMap.sw(i, j, k);
+        if (swIndices.at(0) != -1)
+          sw = crates.at(swIndices.at(0))
+                   .getReceiverCard(swIndices.at(1))
+                   ->getRegion(swIndices.at(2));
+        else
+          sw = &empty;
+
+        vector<int> neIndices = neighborMap.ne(i, j, k);
+        if (neIndices.at(0) != -1)
+          ne = crates.at(neIndices.at(0))
+                   .getReceiverCard(neIndices.at(1))
+                   ->getRegion(neIndices.at(2));
+        else
+          ne = &empty;
+
+        vector<int> nwIndices = neighborMap.nw(i, j, k);
+        if (nwIndices.at(0) != -1)
+          nw = crates.at(nwIndices.at(0))
+                   .getReceiverCard(nwIndices.at(1))
+                   ->getRegion(nwIndices.at(2));
+        else
+          nw = &empty;
+
+        primary->setNorthEt(north->giveNorthEt());
+        primary->setNorthHE_FG(north->giveNorthHE_FG());
+        primary->setSouthEt(south->giveSouthEt());
+        primary->setSouthHE_FG(south->giveSouthHE_FG());
+        primary->setEastEt(east->giveEastEt());
+        primary->setEastHE_FG(east->giveEastHE_FG());
+        primary->setWestEt(west->giveWestEt());
+        primary->setWestHE_FG(west->giveWestHE_FG());
+        primary->setSEEt(se->giveSEEt());
+        primary->setSEHE_FG(se->giveSEHE_FG());
+        primary->setSWEt(sw->giveSWEt());
+        primary->setSWHE_FG(sw->giveSWHE_FG());
+        primary->setNWEt(nw->giveNWEt());
+        primary->setNWHE_FG(nw->giveNWHE_FG());
+        primary->setNEEt(ne->giveNEEt());
+        primary->setNEHE_FG(ne->giveNEHE_FG());
       }
     }
   }
-
 }
 
-void L1RCT::print(){
-  for(int i = 0; i<18; i++){
+void L1RCT::print() {
+  for (int i = 0; i < 18; i++) {
     std::cout << "Crate " << i << std::endl;
     crates.at(i).print();
-  } 
+  }
 }
 
 // Returns the top four isolated electrons from given crate
 // in a vector of L1CaloEmCands
-L1CaloEmCollection L1RCT::getIsolatedEGObjects(unsigned crate){
-  std::vector<unsigned short> isoEmObjects = crates.at(crate).getIsolatedEGObjects();
+L1CaloEmCollection L1RCT::getIsolatedEGObjects(unsigned crate) {
+  std::vector<unsigned short> isoEmObjects =
+      crates.at(crate).getIsolatedEGObjects();
   L1CaloEmCollection isoEmCands;
-  for (uint16_t i = 0; i < 4; i++){
+  for (uint16_t i = 0; i < 4; i++) {
     unsigned rgn = ((isoEmObjects.at(i)) & 1);
-    unsigned crd = (((isoEmObjects.at(i))/2) & 7);
-    unsigned energy = ((isoEmObjects.at(i))/16);
+    unsigned crd = (((isoEmObjects.at(i)) / 2) & 7);
+    unsigned energy = ((isoEmObjects.at(i)) / 16);
     unsigned rank = rctLookupTables_->emRank(energy);
-    L1CaloEmCand isoCand(rank, rgn, crd, crate, true, i, 0);  // includes emcand index
+    L1CaloEmCand isoCand(rank, rgn, crd, crate, true, i,
+                         0); // includes emcand index
     isoEmCands.push_back(isoCand);
   }
   return isoEmCands;
 }
 
-
 // Returns the top four nonisolated electrons from the given crate
 // in a vector of L1CaloEmCands
-L1CaloEmCollection L1RCT::getNonisolatedEGObjects(unsigned crate){
-  std::vector<unsigned short> nonIsoEmObjects = crates.at(crate).getNonisolatedEGObjects();
+L1CaloEmCollection L1RCT::getNonisolatedEGObjects(unsigned crate) {
+  std::vector<unsigned short> nonIsoEmObjects =
+      crates.at(crate).getNonisolatedEGObjects();
   L1CaloEmCollection nonIsoEmCands;
-  for (uint16_t i = 0; i < 4; i++){
+  for (uint16_t i = 0; i < 4; i++) {
     unsigned rgn = ((nonIsoEmObjects.at(i)) & 1);
-    unsigned crd = (((nonIsoEmObjects.at(i))/2) & 7);
-    unsigned energy = ((nonIsoEmObjects.at(i))/16);
+    unsigned crd = (((nonIsoEmObjects.at(i)) / 2) & 7);
+    unsigned energy = ((nonIsoEmObjects.at(i)) / 16);
     unsigned rank = rctLookupTables_->emRank(energy);
-    L1CaloEmCand nonIsoCand(rank, rgn, crd, crate, false, i, 0);  // includes emcand index
+    L1CaloEmCand nonIsoCand(rank, rgn, crd, crate, false, i,
+                            0); // includes emcand index
     nonIsoEmCands.push_back(nonIsoCand);
   }
   return nonIsoEmCands;
 }
 
-vector<L1CaloRegion> L1RCT::getRegions(unsigned crate){
+vector<L1CaloRegion> L1RCT::getRegions(unsigned crate) {
   // barrel regions
-  std::bitset<14> taus( (long) crates.at(crate).getTauBits());
-  std::bitset<14> mips( (long) crates.at(crate).getMIPBits());
-  std::bitset<14> quiets( (long) crates.at(crate).getQuietBits());
-  std::bitset<14> overflows( (long) crates.at(crate).getOverFlowBits());
-  std::vector<unsigned short> barrelEnergies = crates.at(crate).getBarrelRegions();
+  std::bitset<14> taus((long)crates.at(crate).getTauBits());
+  std::bitset<14> mips((long)crates.at(crate).getMIPBits());
+  std::bitset<14> quiets((long)crates.at(crate).getQuietBits());
+  std::bitset<14> overflows((long)crates.at(crate).getOverFlowBits());
+  std::vector<unsigned short> barrelEnergies =
+      crates.at(crate).getBarrelRegions();
   std::vector<L1CaloRegion> regionCollection;
-  for (unsigned card = 0; card < 7; card++){
-    for (unsigned rgn = 0; rgn < 2; rgn++){
-      bool tau = taus[card*2+rgn];
-      bool mip = mips[card*2+rgn];
-      bool quiet = quiets[card*2+rgn];
-      bool overflow = overflows[card*2+rgn];
-      unsigned barrelEnergy = barrelEnergies.at(card*2+rgn);
-      L1CaloRegion region(barrelEnergy, overflow, tau, mip, quiet, crate, card, rgn);
+  for (unsigned card = 0; card < 7; card++) {
+    for (unsigned rgn = 0; rgn < 2; rgn++) {
+      bool tau = taus[card * 2 + rgn];
+      bool mip = mips[card * 2 + rgn];
+      bool quiet = quiets[card * 2 + rgn];
+      bool overflow = overflows[card * 2 + rgn];
+      unsigned barrelEnergy = barrelEnergies.at(card * 2 + rgn);
+      L1CaloRegion region(barrelEnergy, overflow, tau, mip, quiet, crate, card,
+                          rgn);
       regionCollection.push_back(region);
     }
   }
@@ -386,8 +408,11 @@ vector<L1CaloRegion> L1RCT::getRegions(unsigned crate){
   // hf regions
   std::vector<unsigned short> hfEnergies = crates.at(crate).getHFRegions();
   // fine grain bits -- still have to work out digi input
-  std::vector<unsigned short> hfFineGrainBits = crates.at(crate).getHFFineGrainBits();
-  for (unsigned hfRgn = 0; hfRgn<8; hfRgn++){  // region number, see diagram on paper.  make sure know how hf regions come in. 
+  std::vector<unsigned short> hfFineGrainBits =
+      crates.at(crate).getHFFineGrainBits();
+  for (unsigned hfRgn = 0; hfRgn < 8;
+       hfRgn++) { // region number, see diagram on paper.  make sure know how hf
+                  // regions come in.
     unsigned energy = hfEnergies.at(hfRgn);
     bool fineGrain = hfFineGrainBits.at(hfRgn);
     L1CaloRegion hfRegion(energy, fineGrain, crate, hfRgn);
diff --git a/L1Trigger/RegionalCaloTrigger/src/L1RCTCrate.cc b/L1Trigger/RegionalCaloTrigger/src/L1RCTCrate.cc
index f471b24311c63..d27fb0aa2d41f 100644
--- a/L1Trigger/RegionalCaloTrigger/src/L1RCTCrate.cc
+++ b/L1Trigger/RegionalCaloTrigger/src/L1RCTCrate.cc
@@ -1,75 +1,71 @@
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTCrate.h"
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h"
 
-L1RCTCrate::L1RCTCrate(int crtNo, const L1RCTLookupTables* rctLookupTables) : 
-  jetSummaryCard(crtNo, rctLookupTables),
-  crtNo(crtNo),
-  rctLookupTables_(rctLookupTables)
-{
-  for(int i = 0; i <7; i++){
-    L1RCTReceiverCard rc(crtNo,i,rctLookupTables);
-    L1RCTElectronIsolationCard eic(crtNo,i,rctLookupTables);
+L1RCTCrate::L1RCTCrate(int crtNo, const L1RCTLookupTables *rctLookupTables)
+    : jetSummaryCard(crtNo, rctLookupTables), crtNo(crtNo),
+      rctLookupTables_(rctLookupTables) {
+  for (int i = 0; i < 7; i++) {
+    L1RCTReceiverCard rc(crtNo, i, rctLookupTables);
+    L1RCTElectronIsolationCard eic(crtNo, i, rctLookupTables);
     receiverCards.push_back(rc);
     electronCards.push_back(eic);
   }
 }
 
-L1RCTCrate::~L1RCTCrate()
-{
+L1RCTCrate::~L1RCTCrate() {}
 
-}
-
-void L1RCTCrate::input(const std::vector<std::vector<unsigned short> >& RCInput,
-		       const std::vector<unsigned short>& HFInput)
-{
-  //std::cout << "Crate.input() entered" << std::endl;
-  for(int i =0; i<7; i++){
-    //std::cout << "calling RC.fillInput() for RC " << i << std::endl;
+void L1RCTCrate::input(const std::vector<std::vector<unsigned short>> &RCInput,
+                       const std::vector<unsigned short> &HFInput) {
+  // std::cout << "Crate.input() entered" << std::endl;
+  for (int i = 0; i < 7; i++) {
+    // std::cout << "calling RC.fillInput() for RC " << i << std::endl;
     receiverCards.at(i).fillInput(RCInput.at(i));
-    //std::cout << "RC " << i << " filled" << std::endl;
+    // std::cout << "RC " << i << " filled" << std::endl;
   }
-  //std::cout << "calling JSC.fillHFRegionSums()" << std::endl;
+  // std::cout << "calling JSC.fillHFRegionSums()" << std::endl;
   jetSummaryCard.fillHFRegionSums(HFInput);
-  //std::cout << "JSC.fillHF called" << std::endl;
-} 
-void L1RCTCrate::processReceiverCards(){
-  for(int i=0; i<7;i++){
+  // std::cout << "JSC.fillHF called" << std::endl;
+}
+void L1RCTCrate::processReceiverCards() {
+  for (int i = 0; i < 7; i++) {
     receiverCards.at(i).fillTauBits();
     receiverCards.at(i).fillRegionSums();
     receiverCards.at(i).fillMuonBits();
   }
 }
-void L1RCTCrate::fillElectronIsolationCards(){
-  for(int i = 0; i<7; i++){
-    for(int j = 0; j<2; j++){
-      electronCards.at(i).setRegion(j,*receiverCards.at(i).getRegion(j));
+void L1RCTCrate::fillElectronIsolationCards() {
+  for (int i = 0; i < 7; i++) {
+    for (int j = 0; j < 2; j++) {
+      electronCards.at(i).setRegion(j, *receiverCards.at(i).getRegion(j));
     }
   }
 }
-void L1RCTCrate::processElectronIsolationCards(){
-  for(int i = 0; i<7;i++)
+void L1RCTCrate::processElectronIsolationCards() {
+  for (int i = 0; i < 7; i++)
     electronCards.at(i).fillElectronCandidates();
 }
-void L1RCTCrate::fillJetSummaryCard(){
+void L1RCTCrate::fillJetSummaryCard() {
   std::vector<unsigned short> barrelSums(14);
   std::vector<unsigned short> isoElectrons(14);
   std::vector<unsigned short> nonIsoElectrons(14);
   std::vector<unsigned short> mipBits(14);
   std::vector<unsigned short> overFlowBits(14);
   std::vector<unsigned short> tauBits(14);
-  for(int i = 0; i<7;i++){
-    mipBits.at(2*i) = receiverCards.at(i).getMuonBitRegion(0);
-    mipBits.at(2*i+1) = receiverCards.at(i).getMuonBitRegion(1);
-    isoElectrons.at(2*i) = electronCards.at(i).getIsoElectrons(0);
-    isoElectrons.at(2*i+1) = electronCards.at(i).getIsoElectrons(1) + 1;  // the +1 adds region info
-    nonIsoElectrons.at(2*i) = electronCards.at(i).getNonIsoElectrons(0);
-    nonIsoElectrons.at(2*i+1) = electronCards.at(i).getNonIsoElectrons(1) + 1;  // +1 adds region info
-    barrelSums.at(2*i) = receiverCards.at(i).getEtIn10BitsRegion(0);
-    barrelSums.at(2*i+1) = receiverCards.at(i).getEtIn10BitsRegion(1);
-    overFlowBits.at(2*i) = receiverCards.at(i).getOverFlowBitRegion(0);
-    overFlowBits.at(2*i+1) = receiverCards.at(i).getOverFlowBitRegion(1);
-    tauBits.at(2*i) = receiverCards.at(i).getTauBitRegion(0);
-    tauBits.at(2*i+1) = receiverCards.at(i).getTauBitRegion(1);
+  for (int i = 0; i < 7; i++) {
+    mipBits.at(2 * i) = receiverCards.at(i).getMuonBitRegion(0);
+    mipBits.at(2 * i + 1) = receiverCards.at(i).getMuonBitRegion(1);
+    isoElectrons.at(2 * i) = electronCards.at(i).getIsoElectrons(0);
+    isoElectrons.at(2 * i + 1) =
+        electronCards.at(i).getIsoElectrons(1) + 1; // the +1 adds region info
+    nonIsoElectrons.at(2 * i) = electronCards.at(i).getNonIsoElectrons(0);
+    nonIsoElectrons.at(2 * i + 1) =
+        electronCards.at(i).getNonIsoElectrons(1) + 1; // +1 adds region info
+    barrelSums.at(2 * i) = receiverCards.at(i).getEtIn10BitsRegion(0);
+    barrelSums.at(2 * i + 1) = receiverCards.at(i).getEtIn10BitsRegion(1);
+    overFlowBits.at(2 * i) = receiverCards.at(i).getOverFlowBitRegion(0);
+    overFlowBits.at(2 * i + 1) = receiverCards.at(i).getOverFlowBitRegion(1);
+    tauBits.at(2 * i) = receiverCards.at(i).getTauBitRegion(0);
+    tauBits.at(2 * i + 1) = receiverCards.at(i).getTauBitRegion(1);
   }
   jetSummaryCard.fillIsolatedEGObjects(isoElectrons);
   jetSummaryCard.fillNonIsolatedEGObjects(nonIsoElectrons);
@@ -78,13 +74,13 @@ void L1RCTCrate::fillJetSummaryCard(){
   jetSummaryCard.fillTauBits(tauBits);
   jetSummaryCard.fillOverFlowBits(overFlowBits);
 }
-void L1RCTCrate::processJetSummaryCard(){
+void L1RCTCrate::processJetSummaryCard() {
   jetSummaryCard.fillJetRegions();
   jetSummaryCard.fillQuietBits();
 }
 
-void L1RCTCrate::print(){
-  for(int i=0;i<7;i++){
+void L1RCTCrate::print() {
+  for (int i = 0; i < 7; i++) {
     receiverCards.at(i).print();
     electronCards.at(i).print();
   }
diff --git a/L1Trigger/RegionalCaloTrigger/src/L1RCTElectronIsolationCard.cc b/L1Trigger/RegionalCaloTrigger/src/L1RCTElectronIsolationCard.cc
index aeeb3625b8526..3ea1f58523f2d 100644
--- a/L1Trigger/RegionalCaloTrigger/src/L1RCTElectronIsolationCard.cc
+++ b/L1Trigger/RegionalCaloTrigger/src/L1RCTElectronIsolationCard.cc
@@ -1,75 +1,68 @@
+#include "CondFormats/L1TObjects/interface/L1RCTParameters.h"
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTElectronIsolationCard.h"
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h"
-#include "CondFormats/L1TObjects/interface/L1RCTParameters.h"
 
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
-L1RCTElectronIsolationCard::L1RCTElectronIsolationCard(int crateNumber,
-						       int cardNumber,
-						       const L1RCTLookupTables* rctLookupTables) :
-  crtNo(crateNumber),cardNo(cardNumber),
-  rctLookupTables_(rctLookupTables),
-  isoElectrons(2),nonIsoElectrons(2), regions(2)
-{
+L1RCTElectronIsolationCard::L1RCTElectronIsolationCard(
+    int crateNumber, int cardNumber, const L1RCTLookupTables *rctLookupTables)
+    : crtNo(crateNumber), cardNo(cardNumber), rctLookupTables_(rctLookupTables),
+      isoElectrons(2), nonIsoElectrons(2), regions(2) {
   regions.push_back(L1RCTRegion());
   regions.push_back(L1RCTRegion());
 }
 
-L1RCTElectronIsolationCard::~L1RCTElectronIsolationCard()
-{
-  regions.clear();
-}
-
+L1RCTElectronIsolationCard::~L1RCTElectronIsolationCard() { regions.clear(); }
 
-void L1RCTElectronIsolationCard::fillElectronCandidates(){
-  std::vector<unsigned short> region0Electrons = calcElectronCandidates(regions.at(0),0);
-  std::vector<unsigned short> region1Electrons = calcElectronCandidates(regions.at(1),1);
+void L1RCTElectronIsolationCard::fillElectronCandidates() {
+  std::vector<unsigned short> region0Electrons =
+      calcElectronCandidates(regions.at(0), 0);
+  std::vector<unsigned short> region1Electrons =
+      calcElectronCandidates(regions.at(1), 1);
   isoElectrons.at(0) = region0Electrons.at(0);
   isoElectrons.at(1) = region1Electrons.at(0);
   nonIsoElectrons.at(0) = region0Electrons.at(1);
   nonIsoElectrons.at(1) = region1Electrons.at(1);
-
-
 }
 
-
-//This method is the bulk of this class.  It finds the electrons given a pointer to
-//a region.  It will return the largest nonIsoElectron candidate and the largest
-//isoElectron candidate.  A deposit is an electron candidate if the h/e||fg bit is
-//not on and it is higher energy than it's direct four neighbors.
-//An electron candidate is *always* a non-isolated electron.
-//If it also passes the neighbor cuts then it is an isolated electron as well.
+// This method is the bulk of this class.  It finds the electrons given a
+// pointer to a region.  It will return the largest nonIsoElectron candidate and
+// the largest isoElectron candidate.  A deposit is an electron candidate if the
+// h/e||fg bit is not on and it is higher energy than it's direct four
+// neighbors. An electron candidate is *always* a non-isolated electron. If it
+// also passes the neighbor cuts then it is an isolated electron as well.
 std::vector<unsigned short>
-L1RCTElectronIsolationCard::calcElectronCandidates(const L1RCTRegion& region, int regionNum){
-  
+L1RCTElectronIsolationCard::calcElectronCandidates(const L1RCTRegion &region,
+                                                   int regionNum) {
+
   unsigned short nonIsoElectron = 0;
   unsigned short isoElectron = 0;
-  
-  //i is row and j is column
-  for(int i = 0; i<4; i++){
-    for(int j = 0; j<4; j++){
-
-      unsigned short primaryEt = region.getEtIn7Bits(i,j);
-      unsigned short primaryHE_FG = region.getHE_FGBit(i,j); 
-      
-      unsigned short northEt = region.getEtIn7Bits(i-1,  j);
-      unsigned short southEt = region.getEtIn7Bits(i+1,  j);
-      unsigned short westEt  = region.getEtIn7Bits(  i,j-1);
-      unsigned short eastEt  = region.getEtIn7Bits(  i,j+1);
-      unsigned short neEt    = region.getEtIn7Bits(i-1,j+1);
-      unsigned short nwEt    = region.getEtIn7Bits(i-1,j-1);
-      unsigned short seEt    = region.getEtIn7Bits(i+1,j+1);
-      unsigned short swEt    = region.getEtIn7Bits(i+1,j-1);
-
-      unsigned short northHE_FG = region.getHE_FGBit(i-1,  j);
-      unsigned short southHE_FG = region.getHE_FGBit(i+1,  j);
-      unsigned short westHE_FG  = region.getHE_FGBit(  i,j-1);
-      unsigned short eastHE_FG  = region.getHE_FGBit(  i,j+1);
-      unsigned short neHE_FG    = region.getHE_FGBit(i-1,j+1);
-      unsigned short nwHE_FG    = region.getHE_FGBit(i-1,j-1);
-      unsigned short seHE_FG    = region.getHE_FGBit(i+1,j+1);
-      unsigned short swHE_FG    = region.getHE_FGBit(i+1,j-1);
+
+  // i is row and j is column
+  for (int i = 0; i < 4; i++) {
+    for (int j = 0; j < 4; j++) {
+
+      unsigned short primaryEt = region.getEtIn7Bits(i, j);
+      unsigned short primaryHE_FG = region.getHE_FGBit(i, j);
+
+      unsigned short northEt = region.getEtIn7Bits(i - 1, j);
+      unsigned short southEt = region.getEtIn7Bits(i + 1, j);
+      unsigned short westEt = region.getEtIn7Bits(i, j - 1);
+      unsigned short eastEt = region.getEtIn7Bits(i, j + 1);
+      unsigned short neEt = region.getEtIn7Bits(i - 1, j + 1);
+      unsigned short nwEt = region.getEtIn7Bits(i - 1, j - 1);
+      unsigned short seEt = region.getEtIn7Bits(i + 1, j + 1);
+      unsigned short swEt = region.getEtIn7Bits(i + 1, j - 1);
+
+      unsigned short northHE_FG = region.getHE_FGBit(i - 1, j);
+      unsigned short southHE_FG = region.getHE_FGBit(i + 1, j);
+      unsigned short westHE_FG = region.getHE_FGBit(i, j - 1);
+      unsigned short eastHE_FG = region.getHE_FGBit(i, j + 1);
+      unsigned short neHE_FG = region.getHE_FGBit(i - 1, j + 1);
+      unsigned short nwHE_FG = region.getHE_FGBit(i - 1, j - 1);
+      unsigned short seHE_FG = region.getHE_FGBit(i + 1, j + 1);
+      unsigned short swHE_FG = region.getHE_FGBit(i + 1, j - 1);
 
       bool top = false;
 
@@ -78,21 +71,22 @@ L1RCTElectronIsolationCard::calcElectronCandidates(const L1RCTRegion& region, in
       int nRegion = regionNum;
 
       // top row of crate
-      if (nCard == 0 || nCard == 2 || nCard == 4 || (nCard == 6 && nRegion == 0))
-	{
-	  top = true;
-	}
+      if (nCard == 0 || nCard == 2 || nCard == 4 ||
+          (nCard == 6 && nRegion == 0)) {
+        top = true;
+      }
       // bottom row of crate
-      else if (nCard == 1 || nCard == 3 || nCard == 5 || (nCard == 6 && nRegion == 1))
-	{} // top already false
-      else
-	{
-	  std::cerr << "Error! EIC top assignment" << std::endl;  // this shouldn't happen!
-	}
+      else if (nCard == 1 || nCard == 3 || nCard == 5 ||
+               (nCard == 6 && nRegion == 1)) {
+      } // top already false
+      else {
+        std::cerr << "Error! EIC top assignment"
+                  << std::endl; // this shouldn't happen!
+      }
 
       // The following values are used for zeroing and determining whether or
-      // not a tower is a "candidate".  The original primaryEt, northEt, neEt, etc.
-      // are used to calculate vetoes and must not be zeroed.
+      // not a tower is a "candidate".  The original primaryEt, northEt, neEt,
+      // etc. are used to calculate vetoes and must not be zeroed.
 
       unsigned short primaryTowerEt = primaryEt;
       unsigned short northTowerEt = northEt;
@@ -103,246 +97,267 @@ L1RCTElectronIsolationCard::calcElectronCandidates(const L1RCTRegion& region, in
       // In order to ensure proper selection of candidate tower and neighbor,
       // if two neighbor energies are equal, one is set to zero (in the
       // appropriate regions, those for which tp_lf bit is set to 0 in
-      // Pam's JCCTest/EGWithShare.cc). 
-
-      if (primaryEt > 0)  // this value should maybe be customizable?
-	{
-	  if (nCard != 6)  // all cards except 6
-	    {
-	      if(top && nCrate >= 9)  // top row of regions in positive-eta crate
-		{
-		  if(westTowerEt == eastTowerEt) westTowerEt=0;
-		  if(southTowerEt == northTowerEt) southTowerEt=0;
-		  if(southTowerEt == eastTowerEt) southTowerEt=0;
-		  if(westTowerEt == northTowerEt) westTowerEt=0;
-                }
-              else if((!top) && nCrate < 9) // bottom row of regions in negative-eta crate
-		{
-		  if(eastTowerEt == westTowerEt) eastTowerEt=0;
-		  if(northTowerEt == southTowerEt) northTowerEt=0;
-		  if(northTowerEt == westTowerEt) northTowerEt=0;
-		  if(eastTowerEt == southTowerEt) eastTowerEt=0;
-		}
-            }
-          else  // card 6                                            
-            {
-	      // only +eta card 6 needs to have zeroing.  Pam sez.  
-	      // -eta card 6 does what it's supposed to even w/o zeroing.
-              if(nRegion == 0 && nCrate >=9)
-                {
-                  if(westTowerEt == eastTowerEt) westTowerEt=0;
-                  if(southTowerEt == northTowerEt) southTowerEt=0;
-                  if(southTowerEt == eastTowerEt) southTowerEt=0;
-                  if(westTowerEt == northTowerEt) westTowerEt=0;
-                }
-	    }
-	}
-      
+      // Pam's JCCTest/EGWithShare.cc).
+
+      if (primaryEt > 0) // this value should maybe be customizable?
+      {
+        if (nCard != 6) // all cards except 6
+        {
+          if (top && nCrate >= 9) // top row of regions in positive-eta crate
+          {
+            if (westTowerEt == eastTowerEt)
+              westTowerEt = 0;
+            if (southTowerEt == northTowerEt)
+              southTowerEt = 0;
+            if (southTowerEt == eastTowerEt)
+              southTowerEt = 0;
+            if (westTowerEt == northTowerEt)
+              westTowerEt = 0;
+          } else if ((!top) &&
+                     nCrate < 9) // bottom row of regions in negative-eta crate
+          {
+            if (eastTowerEt == westTowerEt)
+              eastTowerEt = 0;
+            if (northTowerEt == southTowerEt)
+              northTowerEt = 0;
+            if (northTowerEt == westTowerEt)
+              northTowerEt = 0;
+            if (eastTowerEt == southTowerEt)
+              eastTowerEt = 0;
+          }
+        } else // card 6
+        {
+          // only +eta card 6 needs to have zeroing.  Pam sez.
+          // -eta card 6 does what it's supposed to even w/o zeroing.
+          if (nRegion == 0 && nCrate >= 9) {
+            if (westTowerEt == eastTowerEt)
+              westTowerEt = 0;
+            if (southTowerEt == northTowerEt)
+              southTowerEt = 0;
+            if (southTowerEt == eastTowerEt)
+              southTowerEt = 0;
+            if (westTowerEt == northTowerEt)
+              westTowerEt = 0;
+          }
+        }
+      }
+
       // This section compares the energies in the primary tower with the
       // surrounding towers to determine whether or not the primary tower
-      // should be considered a "candidate".  
+      // should be considered a "candidate".
 
       bool candidate = false;
 
       // for case where primary tower et greater than all neighbors -> candidate
-      if (primaryEt > northEt && primaryEt > southEt && primaryEt > eastEt
-	  && primaryEt > westEt && !primaryHE_FG)
-	{
-	  candidate = true;
-	}
+      if (primaryEt > northEt && primaryEt > southEt && primaryEt > eastEt &&
+          primaryEt > westEt && !primaryHE_FG) {
+        candidate = true;
+      }
 
-      // if primary et less than any neighbors (or HE_FG veto set) NOT a candidate!
-      else if (primaryEt < northEt || primaryEt < southEt || primaryEt < eastEt
-	  || primaryEt < westEt || primaryHE_FG)
-	{} // candidate already false
+      // if primary et less than any neighbors (or HE_FG veto set) NOT a
+      // candidate!
+      else if (primaryEt < northEt || primaryEt < southEt ||
+               primaryEt < eastEt || primaryEt < westEt || primaryHE_FG) {
+      } // candidate already false
 
       else // Case of primary tower et being equal to any of its neighbors.
-	// This section determines which tower gets the candidate.
-	// See AboutTP.pdf document, figure on p. 4, for clarification.
-	// Zeroed values are used in this calculation.
-	{
-	  if (primaryEt > 0)
-	    {
-	      if (nCrate >=9)  // positive eta
-		{
-		  if (top) // top row of regions in crate.  tp_lf == 0
-		    // priority order: east < south < north < west
-		    {
-		      if (westTowerEt == primaryTowerEt)
-			candidate = true;
-		      else if (northTowerEt == primaryTowerEt)
-			candidate = false;
-		      else if (southTowerEt == primaryTowerEt)
-			candidate = true;
-		      else if (eastTowerEt == primaryTowerEt)
-			candidate = false;
-		    }
-
-		  else // bottom row of regions in crate.  tp_lf == 1
-		    // priority order: west < north < south < east
-		    {
-		      if (eastTowerEt == primaryTowerEt)
-			candidate = true;
-		      else if (southTowerEt == primaryTowerEt)
-			candidate = true;
-		      else if (northTowerEt == primaryTowerEt)
-			candidate = false;
-		      else if (westTowerEt == primaryTowerEt)
-			candidate = false;
-		      if (nCard == 6)  // card 6. tp_lf == 1
-			{
-			  // priority order: east < north < south < west
-			  if (westTowerEt == primaryTowerEt)
-			    candidate = true;
-			  else if (southTowerEt == primaryTowerEt)
-			    candidate = true;
-			  else if (northTowerEt == primaryTowerEt)
-			    candidate = false;
-			  else if (eastTowerEt == primaryTowerEt)
-			    candidate = false;
-			}
-		    }
-		}
-	      else // negative eta
-		{
-		  if (top) // top row of regions in crate.  tp_lf == 1  
-		    // priority order: east < south < north < west
-		    {
-		      if (westTowerEt == primaryTowerEt)
-			candidate = true;
-		      else if (northTowerEt == primaryTowerEt)
-			candidate = true;
-		      else if (southTowerEt == primaryTowerEt)
-			candidate = false;
-		      else if (eastTowerEt == primaryTowerEt)
-			candidate = false;
-		      if (nCard == 6)  // card 6.  tp_lf == 0
-			// east < south < north < west
-			{
-			  if (westTowerEt == primaryTowerEt)
-			    candidate = false;
-			  else if (northTowerEt == primaryTowerEt)
-			    candidate = false;
-			  else if (southTowerEt == primaryTowerEt)
-			    candidate = true;
-			  else if (eastTowerEt == primaryTowerEt)
-			    candidate = true;
-			}
-		    }
-		  else // bottom row of regions.  tp_lf == 0
-		    // west < north < south < east
-		    {
-		      if (eastTowerEt == primaryTowerEt)
-			candidate = true;
-		      else if (southTowerEt == primaryTowerEt)
-			candidate = false;
-		      else if (northTowerEt == primaryTowerEt)
-			candidate = true;
-		      else if (westTowerEt == primaryTowerEt)
-			candidate = false;
-		      
-		      if (nCard == 6) // card 6.  tp_lf == 1
-			// west < north < south < east
-			{
-			  if (eastTowerEt == primaryTowerEt)
-			    candidate = true;
-			  else if (southTowerEt == primaryTowerEt)
-			    candidate = true;
-			  else if (northTowerEt == primaryTowerEt)
-			    candidate = false;
-			  else if (westTowerEt == primaryTowerEt)
-			    candidate = false;
-			}
-		    }
-		}
-	    }
-	} // end of if (primary == neighbors)
-      
+           // This section determines which tower gets the candidate.
+           // See AboutTP.pdf document, figure on p. 4, for clarification.
+           // Zeroed values are used in this calculation.
+      {
+        if (primaryEt > 0) {
+          if (nCrate >= 9) // positive eta
+          {
+            if (top) // top row of regions in crate.  tp_lf == 0
+                     // priority order: east < south < north < west
+            {
+              if (westTowerEt == primaryTowerEt)
+                candidate = true;
+              else if (northTowerEt == primaryTowerEt)
+                candidate = false;
+              else if (southTowerEt == primaryTowerEt)
+                candidate = true;
+              else if (eastTowerEt == primaryTowerEt)
+                candidate = false;
+            }
+
+            else // bottom row of regions in crate.  tp_lf == 1
+                 // priority order: west < north < south < east
+            {
+              if (eastTowerEt == primaryTowerEt)
+                candidate = true;
+              else if (southTowerEt == primaryTowerEt)
+                candidate = true;
+              else if (northTowerEt == primaryTowerEt)
+                candidate = false;
+              else if (westTowerEt == primaryTowerEt)
+                candidate = false;
+              if (nCard == 6) // card 6. tp_lf == 1
+              {
+                // priority order: east < north < south < west
+                if (westTowerEt == primaryTowerEt)
+                  candidate = true;
+                else if (southTowerEt == primaryTowerEt)
+                  candidate = true;
+                else if (northTowerEt == primaryTowerEt)
+                  candidate = false;
+                else if (eastTowerEt == primaryTowerEt)
+                  candidate = false;
+              }
+            }
+          } else // negative eta
+          {
+            if (top) // top row of regions in crate.  tp_lf == 1
+                     // priority order: east < south < north < west
+            {
+              if (westTowerEt == primaryTowerEt)
+                candidate = true;
+              else if (northTowerEt == primaryTowerEt)
+                candidate = true;
+              else if (southTowerEt == primaryTowerEt)
+                candidate = false;
+              else if (eastTowerEt == primaryTowerEt)
+                candidate = false;
+              if (nCard == 6) // card 6.  tp_lf == 0
+                              // east < south < north < west
+              {
+                if (westTowerEt == primaryTowerEt)
+                  candidate = false;
+                else if (northTowerEt == primaryTowerEt)
+                  candidate = false;
+                else if (southTowerEt == primaryTowerEt)
+                  candidate = true;
+                else if (eastTowerEt == primaryTowerEt)
+                  candidate = true;
+              }
+            } else // bottom row of regions.  tp_lf == 0
+                   // west < north < south < east
+            {
+              if (eastTowerEt == primaryTowerEt)
+                candidate = true;
+              else if (southTowerEt == primaryTowerEt)
+                candidate = false;
+              else if (northTowerEt == primaryTowerEt)
+                candidate = true;
+              else if (westTowerEt == primaryTowerEt)
+                candidate = false;
+
+              if (nCard == 6) // card 6.  tp_lf == 1
+                              // west < north < south < east
+              {
+                if (eastTowerEt == primaryTowerEt)
+                  candidate = true;
+                else if (southTowerEt == primaryTowerEt)
+                  candidate = true;
+                else if (northTowerEt == primaryTowerEt)
+                  candidate = false;
+                else if (westTowerEt == primaryTowerEt)
+                  candidate = false;
+              }
+            }
+          }
+        }
+      } // end of if (primary == neighbors)
+
       if (candidate) {
-	
-	// Either zeroed or non-zeroed set of values can be used here --
-	// neighbor tower only zeroed if another neighbor tower of same
-	// energy.  Max sum calculated from primary and only one neighbor
-	// tower, and always one neighbor tower left over, so value of sum
-	// is not affected.  Currently using non-zeroed.
-	unsigned short candidateEt = calcMaxSum(primaryEt,northEt,southEt,
-						eastEt,westEt);
-	
-	// neighbor HE_FG veto true if neighbor has HE_FG set
-	bool neighborVeto = (nwHE_FG || northHE_FG || neHE_FG || westHE_FG ||
-			     eastHE_FG || swHE_FG || southHE_FG || seHE_FG); 
-	
-	// threshold for five-tower corner quiet veto
-	//int quietThreshold = 3;   // 3 - loose isolation 0 - very tight isolation
-	//int quietThreshold = 7; // ECALGREN
-	//int quietThreshold = 0; // HCALGREN
-	unsigned quietThreshold = rctLookupTables_->rctParameters()->eicIsolationThreshold();
-	
-	bool nw = false;
-	bool ne = false;
-	bool sw = false;
-	bool se = false;
-	bool n = false;
-	bool w = false;
-	bool s = false;
-	bool e = false;
-
-	// individual neighbor vetoes set if neighbor is over threshold
-	if (nwEt >= quietThreshold) nw = true;
-	if (neEt >= quietThreshold) ne = true;
-	if (swEt >= quietThreshold) sw = true;
-	if (seEt >= quietThreshold) se = true;
-	if (northEt >= quietThreshold) n = true;
-	if (southEt >= quietThreshold) s = true;
-	if (westEt >= quietThreshold) w = true;
-	if (eastEt >= quietThreshold) e = true;
-
-	// veto TRUE for each corner set if any individual tower in each set is over threshold
-	bool nwC = (sw || w || nw || n || ne);
-	bool neC = (nw || n || ne || e || se);
-	bool seC = (ne || e || se || s || sw);
-	bool swC = (se || s || sw || w || nw);
-
-	// overall quiet veto TRUE only if NO corner sets are quiet 
-	// (all are "loud") -> non-isolated
-	bool quietVeto = (nwC && neC && seC && swC);
-
-	// only isolated if both vetoes are false
-	// Note: quietThreshold = 0 forces all candidates to be non-iso
-	if(!(quietVeto || neighborVeto)){
-	  if(candidateEt > isoElectron)
-	    isoElectron = candidateEt;
-	}
-	// otherwise, non-isolated
-	else if(candidateEt > nonIsoElectron)
-	  nonIsoElectron = candidateEt;
 
+        // Either zeroed or non-zeroed set of values can be used here --
+        // neighbor tower only zeroed if another neighbor tower of same
+        // energy.  Max sum calculated from primary and only one neighbor
+        // tower, and always one neighbor tower left over, so value of sum
+        // is not affected.  Currently using non-zeroed.
+        unsigned short candidateEt =
+            calcMaxSum(primaryEt, northEt, southEt, eastEt, westEt);
+
+        // neighbor HE_FG veto true if neighbor has HE_FG set
+        bool neighborVeto = (nwHE_FG || northHE_FG || neHE_FG || westHE_FG ||
+                             eastHE_FG || swHE_FG || southHE_FG || seHE_FG);
+
+        // threshold for five-tower corner quiet veto
+        // int quietThreshold = 3;   // 3 - loose isolation 0 - very tight
+        // isolation int quietThreshold = 7; // ECALGREN int quietThreshold = 0;
+        // // HCALGREN
+        unsigned quietThreshold =
+            rctLookupTables_->rctParameters()->eicIsolationThreshold();
+
+        bool nw = false;
+        bool ne = false;
+        bool sw = false;
+        bool se = false;
+        bool n = false;
+        bool w = false;
+        bool s = false;
+        bool e = false;
+
+        // individual neighbor vetoes set if neighbor is over threshold
+        if (nwEt >= quietThreshold)
+          nw = true;
+        if (neEt >= quietThreshold)
+          ne = true;
+        if (swEt >= quietThreshold)
+          sw = true;
+        if (seEt >= quietThreshold)
+          se = true;
+        if (northEt >= quietThreshold)
+          n = true;
+        if (southEt >= quietThreshold)
+          s = true;
+        if (westEt >= quietThreshold)
+          w = true;
+        if (eastEt >= quietThreshold)
+          e = true;
+
+        // veto TRUE for each corner set if any individual tower in each set is
+        // over threshold
+        bool nwC = (sw || w || nw || n || ne);
+        bool neC = (nw || n || ne || e || se);
+        bool seC = (ne || e || se || s || sw);
+        bool swC = (se || s || sw || w || nw);
+
+        // overall quiet veto TRUE only if NO corner sets are quiet
+        // (all are "loud") -> non-isolated
+        bool quietVeto = (nwC && neC && seC && swC);
+
+        // only isolated if both vetoes are false
+        // Note: quietThreshold = 0 forces all candidates to be non-iso
+        if (!(quietVeto || neighborVeto)) {
+          if (candidateEt > isoElectron)
+            isoElectron = candidateEt;
+        }
+        // otherwise, non-isolated
+        else if (candidateEt > nonIsoElectron)
+          nonIsoElectron = candidateEt;
       }
     }
   }
 
-  
   std::vector<unsigned short> candidates;
-  unsigned short fullIsoElectron = isoElectron*16 + cardNo*2;  // leaves room for last bit -- region number, added in Crate.cc
+  unsigned short fullIsoElectron =
+      isoElectron * 16 +
+      cardNo *
+          2; // leaves room for last bit -- region number, added in Crate.cc
   candidates.push_back(fullIsoElectron);
-  unsigned short fullNonIsoElectron = nonIsoElectron*16 + cardNo*2;  // leaves room for region info in last bit
+  unsigned short fullNonIsoElectron =
+      nonIsoElectron * 16 +
+      cardNo * 2; // leaves room for region info in last bit
   candidates.push_back(fullNonIsoElectron);
 
   return candidates;
 }
 
-unsigned short 
-L1RCTElectronIsolationCard::calcMaxSum(unsigned short primaryEt,unsigned short northEt,
-					unsigned short southEt,unsigned short eastEt,
-					unsigned short westEt){
-  unsigned short cardinals[4] = {northEt,southEt,eastEt,westEt};
+unsigned short L1RCTElectronIsolationCard::calcMaxSum(unsigned short primaryEt,
+                                                      unsigned short northEt,
+                                                      unsigned short southEt,
+                                                      unsigned short eastEt,
+                                                      unsigned short westEt) {
+  unsigned short cardinals[4] = {northEt, southEt, eastEt, westEt};
   unsigned short max = 0;
-  for(int i = 0; i<4;i++){
-    unsigned short test = primaryEt+cardinals[i];
-    if(test > max)
+  for (int i = 0; i < 4; i++) {
+    unsigned short test = primaryEt + cardinals[i];
+    if (test > max)
       max = test;
   }
-   return max;
+  return max;
 }
 
 void L1RCTElectronIsolationCard::print() {
@@ -351,11 +366,13 @@ void L1RCTElectronIsolationCard::print() {
   regions.at(0).print();
 
   std::cout << "IsoElectron Candidate " << isoElectrons.at(0) << std::endl;
-  std::cout << "NonIsoElectron Candidate " << nonIsoElectrons.at(0) << std::endl << std::endl;
+  std::cout << "NonIsoElectron Candidate " << nonIsoElectrons.at(0) << std::endl
+            << std::endl;
 
   std::cout << "Region 1 Information" << std::endl;
   regions.at(1).print();
 
   std::cout << "IsoElectron Candidate " << isoElectrons.at(1) << std::endl;
-  std::cout << "NonIsoElectron Candidate " << nonIsoElectrons.at(1) << std::endl;
+  std::cout << "NonIsoElectron Candidate " << nonIsoElectrons.at(1)
+            << std::endl;
 }
diff --git a/L1Trigger/RegionalCaloTrigger/src/L1RCTJetSummaryCard.cc b/L1Trigger/RegionalCaloTrigger/src/L1RCTJetSummaryCard.cc
index fc8c6d39d25bd..b1cf95b5cd5d7 100644
--- a/L1Trigger/RegionalCaloTrigger/src/L1RCTJetSummaryCard.cc
+++ b/L1Trigger/RegionalCaloTrigger/src/L1RCTJetSummaryCard.cc
@@ -1,6 +1,6 @@
-#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTJetSummaryCard.h"
-#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h" 
 #include "CondFormats/L1TObjects/interface/L1RCTParameters.h"
+#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTJetSummaryCard.h"
+#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h"
 
 #include <iostream>
 using std::cout;
@@ -10,39 +10,32 @@ using std::vector;
 #include <bitset>
 using std::bitset;
 
-L1RCTJetSummaryCard::L1RCTJetSummaryCard(int crtNo, const L1RCTLookupTables* rctLookupTables) : 
-  crtNo(crtNo),
-  rctLookupTables_(rctLookupTables),
-  isolatedEGObjects(4),
-  nonisolatedEGObjects(4),
-  jetRegions(22),
-  HFRegions(8),
-  barrelRegions(14),
-  mipBits(0),
-  quietBits(0),
-  tauBits(0),
-  overFlowBits(0),
-  hfFineGrainBits(8)
-  //quietThreshold(3)
-{
-}
-
-void L1RCTJetSummaryCard::fillHFRegionSums(const std::vector<unsigned short>& hfRegionSums){
-  //std::cout << "JSC.fillHFRegionSums() entered" << std::endl;
-  for(int i=0;i<8;i++){
-    //std::cout << "filling hf region at " << i << std::endl;
-    HFRegions.at(i) = rctLookupTables_->lookup( (hfRegionSums.at(i)/2), crtNo, 999, i);
-    //std::cout << "hf region " << i << " et filled" << std::endl;
-    hfFineGrainBits.at(i) = (hfRegionSums.at(i)&1);
-    //std::cout << "hf region " << i << " fine grain bit filled" << std::endl;
+L1RCTJetSummaryCard::L1RCTJetSummaryCard(
+    int crtNo, const L1RCTLookupTables *rctLookupTables)
+    : crtNo(crtNo), rctLookupTables_(rctLookupTables), isolatedEGObjects(4),
+      nonisolatedEGObjects(4), jetRegions(22), HFRegions(8), barrelRegions(14),
+      mipBits(0), quietBits(0), tauBits(0), overFlowBits(0), hfFineGrainBits(8)
+// quietThreshold(3)
+{}
+
+void L1RCTJetSummaryCard::fillHFRegionSums(
+    const std::vector<unsigned short> &hfRegionSums) {
+  // std::cout << "JSC.fillHFRegionSums() entered" << std::endl;
+  for (int i = 0; i < 8; i++) {
+    // std::cout << "filling hf region at " << i << std::endl;
+    HFRegions.at(i) =
+        rctLookupTables_->lookup((hfRegionSums.at(i) / 2), crtNo, 999, i);
+    // std::cout << "hf region " << i << " et filled" << std::endl;
+    hfFineGrainBits.at(i) = (hfRegionSums.at(i) & 1);
+    // std::cout << "hf region " << i << " fine grain bit filled" << std::endl;
   }
 }
 
-void L1RCTJetSummaryCard::fillJetRegions(){
-  if(crtNo<9){
-    for(int i = 0; i<4;i++){
+void L1RCTJetSummaryCard::fillJetRegions() {
+  if (crtNo < 9) {
+    for (int i = 0; i < 4; i++) {
       jetRegions.at(i) = HFRegions.at(i);
-      jetRegions.at(i+11) = HFRegions.at(i+4);
+      jetRegions.at(i + 11) = HFRegions.at(i + 4);
     }
     jetRegions.at(4) = barrelRegions.at(12);
     jetRegions.at(5) = barrelRegions.at(9);
@@ -60,7 +53,7 @@ void L1RCTJetSummaryCard::fillJetRegions(){
     jetRegions.at(20) = barrelRegions.at(3);
     jetRegions.at(21) = barrelRegions.at(2);
   }
-  if(crtNo>=9){
+  if (crtNo >= 9) {
     jetRegions.at(0) = barrelRegions.at(0);
     jetRegions.at(1) = barrelRegions.at(1);
     jetRegions.at(2) = barrelRegions.at(4);
@@ -68,7 +61,7 @@ void L1RCTJetSummaryCard::fillJetRegions(){
     jetRegions.at(4) = barrelRegions.at(8);
     jetRegions.at(5) = barrelRegions.at(9);
     jetRegions.at(6) = barrelRegions.at(12);
-    
+
     jetRegions.at(11) = barrelRegions.at(2);
     jetRegions.at(12) = barrelRegions.at(3);
     jetRegions.at(13) = barrelRegions.at(6);
@@ -76,26 +69,27 @@ void L1RCTJetSummaryCard::fillJetRegions(){
     jetRegions.at(15) = barrelRegions.at(10);
     jetRegions.at(16) = barrelRegions.at(11);
     jetRegions.at(17) = barrelRegions.at(13);
-    for(int i = 0; i<4;i++){
-      jetRegions.at(i+7) = HFRegions.at(i);
-      jetRegions.at(i+18) = HFRegions.at(i+4);
+    for (int i = 0; i < 4; i++) {
+      jetRegions.at(i + 7) = HFRegions.at(i);
+      jetRegions.at(i + 18) = HFRegions.at(i + 4);
     }
   }
 }
 
-void L1RCTJetSummaryCard::fillIsolatedEGObjects(const std::vector<unsigned short>& isoElectrons){
-  //sort(isoElectrons.begin(),isoElectrons.end());
-  //reverse(isoElectrons.begin(),isoElectrons.end());
+void L1RCTJetSummaryCard::fillIsolatedEGObjects(
+    const std::vector<unsigned short> &isoElectrons) {
+  // sort(isoElectrons.begin(),isoElectrons.end());
+  // reverse(isoElectrons.begin(),isoElectrons.end());
 
   std::vector<unsigned short> isoCards03(8);
   std::vector<unsigned short> isoCards46(8);
   std::vector<unsigned short> sortIso(8);
 
-  for (int i = 0; i < 8; i++){
+  for (int i = 0; i < 8; i++) {
     isoCards03.at(i) = isoElectrons.at(i);
   }
-  for (int i = 0; i < 6; i++){
-    isoCards46.at(i) = isoElectrons.at(i+8);
+  for (int i = 0; i < 6; i++) {
+    isoCards46.at(i) = isoElectrons.at(i + 8);
   }
   isoCards46.at(6) = 0;
   isoCards46.at(7) = 0;
@@ -114,9 +108,9 @@ void L1RCTJetSummaryCard::fillIsolatedEGObjects(const std::vector<unsigned short
 
   asicSort(sortIso);
 
-  //for(int i = 0; i<4; i++){
-    //isolatedEGObjects.at(i) = isoElectrons.at(i);
-    //isolatedEGObjects.at(i) = sortIso.at(2*i);
+  // for(int i = 0; i<4; i++){
+  // isolatedEGObjects.at(i) = isoElectrons.at(i);
+  // isolatedEGObjects.at(i) = sortIso.at(2*i);
   //}
   isolatedEGObjects.at(0) = sortIso.at(4);
   isolatedEGObjects.at(1) = sortIso.at(6);
@@ -124,19 +118,20 @@ void L1RCTJetSummaryCard::fillIsolatedEGObjects(const std::vector<unsigned short
   isolatedEGObjects.at(3) = sortIso.at(2);
 }
 
-void L1RCTJetSummaryCard::fillNonIsolatedEGObjects(const std::vector<unsigned short>& nonIsoElectrons){
-  //sort(nonIsoElectrons.begin(),nonIsoElectrons.end());
-  //reverse(nonIsoElectrons.begin(),nonIsoElectrons.end());
+void L1RCTJetSummaryCard::fillNonIsolatedEGObjects(
+    const std::vector<unsigned short> &nonIsoElectrons) {
+  // sort(nonIsoElectrons.begin(),nonIsoElectrons.end());
+  // reverse(nonIsoElectrons.begin(),nonIsoElectrons.end());
 
   std::vector<unsigned short> nonIsoCards03(8);
   std::vector<unsigned short> nonIsoCards46(8);
   std::vector<unsigned short> sortNonIso(8);
 
-  for (int i = 0; i < 8; i++){
+  for (int i = 0; i < 8; i++) {
     nonIsoCards03.at(i) = nonIsoElectrons.at(i);
   }
-  for (int i = 0; i < 6; i++){
-    nonIsoCards46.at(i) = nonIsoElectrons.at(i+8);
+  for (int i = 0; i < 6; i++) {
+    nonIsoCards46.at(i) = nonIsoElectrons.at(i + 8);
   }
   nonIsoCards46.at(6) = 0;
   nonIsoCards46.at(7) = 0;
@@ -155,9 +150,9 @@ void L1RCTJetSummaryCard::fillNonIsolatedEGObjects(const std::vector<unsigned sh
 
   asicSort(sortNonIso);
 
-  //for(int i = 0; i<4; i++){
-    //nonisolatedEGObjects.at(i) = nonIsoElectrons.at(i);
-    //nonisolatedEGObjects.at(i) = sortNonIso.at(2*i);
+  // for(int i = 0; i<4; i++){
+  // nonisolatedEGObjects.at(i) = nonIsoElectrons.at(i);
+  // nonisolatedEGObjects.at(i) = sortNonIso.at(2*i);
   //}
   nonisolatedEGObjects.at(0) = sortNonIso.at(4);
   nonisolatedEGObjects.at(1) = sortNonIso.at(6);
@@ -165,44 +160,47 @@ void L1RCTJetSummaryCard::fillNonIsolatedEGObjects(const std::vector<unsigned sh
   nonisolatedEGObjects.at(3) = sortNonIso.at(2);
 }
 
-void L1RCTJetSummaryCard::fillMIPBits(const std::vector<unsigned short>& mip){
+void L1RCTJetSummaryCard::fillMIPBits(const std::vector<unsigned short> &mip) {
   bitset<14> mips;
-  for(int i = 0; i<14; i++)
+  for (int i = 0; i < 14; i++)
     mips[i] = mip.at(i);
   mipBits = mips.to_ulong();
 }
 
-void L1RCTJetSummaryCard::fillTauBits(const std::vector<unsigned short>& tau){
+void L1RCTJetSummaryCard::fillTauBits(const std::vector<unsigned short> &tau) {
   bitset<14> taus;
-  for(int i = 0; i<14; i++)
+  for (int i = 0; i < 14; i++)
     taus[i] = tau.at(i);
   tauBits = taus.to_ulong();
 }
 
-void L1RCTJetSummaryCard::fillOverFlowBits(const std::vector<unsigned short>& overflow){
+void L1RCTJetSummaryCard::fillOverFlowBits(
+    const std::vector<unsigned short> &overflow) {
   bitset<14> overflows;
-  for(int i = 0; i<14; i++)
+  for (int i = 0; i < 14; i++)
     overflows[i] = overflow.at(i);
   overFlowBits = overflows.to_ulong();
 }
 
-void L1RCTJetSummaryCard::fillQuietBits(){
+void L1RCTJetSummaryCard::fillQuietBits() {
   bitset<14> quiet;
 
-  quietThresholdBarrel = rctLookupTables_->rctParameters()->jscQuietThresholdBarrel();
-  quietThresholdEndcap = rctLookupTables_->rctParameters()->jscQuietThresholdEndcap();
+  quietThresholdBarrel =
+      rctLookupTables_->rctParameters()->jscQuietThresholdBarrel();
+  quietThresholdEndcap =
+      rctLookupTables_->rctParameters()->jscQuietThresholdEndcap();
 
   // use one threshold for barrel regions (first 8 in list, cards 0-3)
-  for(int i = 0; i<8; i++){
-    if((barrelRegions.at(i))>quietThresholdBarrel)
-      quiet[i] = false;  //switched 0 and 1
+  for (int i = 0; i < 8; i++) {
+    if ((barrelRegions.at(i)) > quietThresholdBarrel)
+      quiet[i] = false; // switched 0 and 1
     else
       quiet[i] = true;
   }
   // use second for endcap regions (last 6 in list, cards 4-6)
-  for(int i = 8; i<14; i++){
-    if((barrelRegions.at(i))>quietThresholdEndcap)
-      quiet[i] = false;  //switched 0 and 1
+  for (int i = 8; i < 14; i++) {
+    if ((barrelRegions.at(i)) > quietThresholdEndcap)
+      quiet[i] = false; // switched 0 and 1
     else
       quiet[i] = true;
   }
@@ -211,8 +209,7 @@ void L1RCTJetSummaryCard::fillQuietBits(){
 }
 
 // Sorts the egamma candidates with the algorithm used in the ASIC
-void L1RCTJetSummaryCard::asicSort(std::vector<unsigned short>& electrons)
-{
+void L1RCTJetSummaryCard::asicSort(std::vector<unsigned short> &electrons) {
   unsigned short temp, temp2;
 
   asicCompare(electrons);
@@ -253,40 +250,39 @@ void L1RCTJetSummaryCard::asicSort(std::vector<unsigned short>& electrons)
   // Fourth compare
 
   asicCompare(electrons);
-
 }
 
 // Used in ASIC sort algorithm
-void L1RCTJetSummaryCard::asicCompare(std::vector<unsigned short>& array)
-{
+void L1RCTJetSummaryCard::asicCompare(std::vector<unsigned short> &array) {
   int i;
   unsigned short temp;
-  for (i = 0; i < 4; i++)
-    {
+  for (i = 0; i < 4; i++) {
 
-      unsigned short rank1 = rctLookupTables_->emRank(array.at(2 * i)>>4);
-      unsigned short rank2 = rctLookupTables_->emRank(array.at(2 * i + 1)>>4);
+    unsigned short rank1 = rctLookupTables_->emRank(array.at(2 * i) >> 4);
+    unsigned short rank2 = rctLookupTables_->emRank(array.at(2 * i + 1) >> 4);
 
-      if (rank1 < rank2) // currently bottom 3 bits are rgn,crd
-	{
-	  temp = array.at(2 * i);
-	  array.at(2 * i) = array.at((2 * i) + 1);
-	  array.at((2 * i) + 1) = temp;
-	}
+    if (rank1 < rank2) // currently bottom 3 bits are rgn,crd
+    {
+      temp = array.at(2 * i);
+      array.at(2 * i) = array.at((2 * i) + 1);
+      array.at((2 * i) + 1) = temp;
     }
+  }
 }
 
-
-void L1RCTJetSummaryCard::print(){
+void L1RCTJetSummaryCard::print() {
   std::cout << "tauBits " << tauBits << std::endl;
   std::cout << "MIPBits " << mipBits << std::endl;
   std::cout << "QuietBits " << quietBits << std::endl;
-  for(int i=0; i<4;i++) {
-    std::cout << "isoElectron " << i << " " << isolatedEGObjects.at(i) << std::endl;;
-    std::cout << "nonIsoElectron " << i <<" "<< nonisolatedEGObjects.at(i) << std::endl;
+  for (int i = 0; i < 4; i++) {
+    std::cout << "isoElectron " << i << " " << isolatedEGObjects.at(i)
+              << std::endl;
+    ;
+    std::cout << "nonIsoElectron " << i << " " << nonisolatedEGObjects.at(i)
+              << std::endl;
   }
   std::cout << "Jets ";
-  for(int i=0; i<22;i++)
+  for (int i = 0; i < 22; i++)
     std::cout << jetRegions.at(i) << " ";
   std::cout << std::endl;
 }
diff --git a/L1Trigger/RegionalCaloTrigger/src/L1RCTLookupTables.cc b/L1Trigger/RegionalCaloTrigger/src/L1RCTLookupTables.cc
index 53e4b069238b9..92dd172e5206c 100644
--- a/L1Trigger/RegionalCaloTrigger/src/L1RCTLookupTables.cc
+++ b/L1Trigger/RegionalCaloTrigger/src/L1RCTLookupTables.cc
@@ -2,263 +2,237 @@
 using std::cout;
 using std::endl;
 
+#include <cmath>
 #include <fstream>
 #include <string>
 #include <vector>
-#include <cmath>
 
-#include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h"
 
-#include "CondFormats/L1TObjects/interface/L1RCTParameters.h"
-#include "CondFormats/L1TObjects/interface/L1RCTChannelMask.h"
-#include "CondFormats/L1TObjects/interface/L1RCTNoisyChannelMask.h"
 #include "CondFormats/L1TObjects/interface/L1CaloEcalScale.h"
-#include "CondFormats/L1TObjects/interface/L1CaloHcalScale.h"
 #include "CondFormats/L1TObjects/interface/L1CaloEtScale.h"
+#include "CondFormats/L1TObjects/interface/L1CaloHcalScale.h"
+#include "CondFormats/L1TObjects/interface/L1RCTChannelMask.h"
+#include "CondFormats/L1TObjects/interface/L1RCTNoisyChannelMask.h"
+#include "CondFormats/L1TObjects/interface/L1RCTParameters.h"
 
-unsigned int L1RCTLookupTables::lookup(unsigned short ecalInput,
-				       unsigned short hcalInput,
-				       unsigned short fgbit,
-				       unsigned short crtNo,
-				       unsigned short crdNo,
-				       unsigned short twrNo) const
-{
-  if(rctParameters_ == nullptr)
+unsigned int
+L1RCTLookupTables::lookup(unsigned short ecalInput, unsigned short hcalInput,
+                          unsigned short fgbit, unsigned short crtNo,
+                          unsigned short crdNo, unsigned short twrNo) const {
+  if (rctParameters_ == nullptr)
     throw cms::Exception("L1RCTParameters Invalid")
-      << "L1RCTParameters should be set every event" << rctParameters_;
-  if(channelMask_ == nullptr)
+        << "L1RCTParameters should be set every event" << rctParameters_;
+  if (channelMask_ == nullptr)
     throw cms::Exception("L1RCTChannelMask Invalid")
-      << "L1RCTChannelMask should be set every event" << channelMask_;
-  if(noisyChannelMask_ == nullptr)
+        << "L1RCTChannelMask should be set every event" << channelMask_;
+  if (noisyChannelMask_ == nullptr)
     throw cms::Exception("L1RCTNoisyChannelMask Invalid")
-      << "L1RCTNoisyChannelMask should be set every event" << noisyChannelMask_;
-  if(ecalInput > 0xFF) 
-    throw cms::Exception("Invalid Data") 
-      << "ECAL compressedET should be less than 0xFF, is " << ecalInput;
-  if(hcalInput > 0xFF) 
-    throw cms::Exception("Invalid Data") 
-      << "HCAL compressedET should be less than 0xFF, is " << hcalInput;
-  if(fgbit > 1) 
-    throw cms::Exception("Invalid Data") 
-      << "ECAL finegrain should be a single bit, is " << fgbit;
-  short iEta = (short) rctParameters_->calcIEta(crtNo, crdNo, twrNo);
-  unsigned short iAbsEta = (unsigned short) abs(iEta);
-  short sign = iEta/iAbsEta;
+        << "L1RCTNoisyChannelMask should be set every event"
+        << noisyChannelMask_;
+  if (ecalInput > 0xFF)
+    throw cms::Exception("Invalid Data")
+        << "ECAL compressedET should be less than 0xFF, is " << ecalInput;
+  if (hcalInput > 0xFF)
+    throw cms::Exception("Invalid Data")
+        << "HCAL compressedET should be less than 0xFF, is " << hcalInput;
+  if (fgbit > 1)
+    throw cms::Exception("Invalid Data")
+        << "ECAL finegrain should be a single bit, is " << fgbit;
+  short iEta = (short)rctParameters_->calcIEta(crtNo, crdNo, twrNo);
+  unsigned short iAbsEta = (unsigned short)abs(iEta);
+  short sign = iEta / iAbsEta;
   unsigned short iPhi = rctParameters_->calcIPhi(crtNo, crdNo, twrNo);
-  unsigned short phiSide = (iPhi/4)%2;
-  if(iAbsEta < 1 || iAbsEta > 28) 
-    throw cms::Exception("Invalid Data") 
-      << "1 <= |IEta| <= 28, is " << iAbsEta;
-
-
-  //Pre Input bits
-  unsigned short ecalAfterMask=0;
-  unsigned short hcalAfterMask=0;
+  unsigned short phiSide = (iPhi / 4) % 2;
+  if (iAbsEta < 1 || iAbsEta > 28)
+    throw cms::Exception("Invalid Data") << "1 <= |IEta| <= 28, is " << iAbsEta;
 
+  // Pre Input bits
+  unsigned short ecalAfterMask = 0;
+  unsigned short hcalAfterMask = 0;
 
   // using channel mask to mask off ecal channels
-  //Mike: Introducing the hot channel mask 
-  //If the Et is above the threshold then mask it as well
-
+  // Mike: Introducing the hot channel mask
+  // If the Et is above the threshold then mask it as well
 
-  
   float ecalBeforeMask = convertEcal(ecalInput, iAbsEta, sign);
 
+  bool resetECAL =
+      (channelMask_->ecalMask[crtNo][phiSide][iAbsEta - 1]) || // channel mask
+      (noisyChannelMask_->ecalMask[crtNo][phiSide][iAbsEta - 1] &&
+       ecalBeforeMask < noisyChannelMask_->ecalThreshold) || // hot mask
+      (rctParameters_->eGammaECalScaleFactors()[iAbsEta - 1] == 0. &&
+       rctParameters_->jetMETECalScaleFactors()[iAbsEta - 1] == 0.);
+
+  if (resetECAL) {
+    ecalAfterMask = 0;
+  } else {
+    ecalAfterMask = ecalInput;
+  }
 
-  bool resetECAL = (channelMask_->ecalMask[crtNo][phiSide][iAbsEta-1]) || //channel mask
-    (noisyChannelMask_->ecalMask[crtNo][phiSide][iAbsEta-1] &&
-     ecalBeforeMask<noisyChannelMask_->ecalThreshold)||//hot mask
-      (rctParameters_->eGammaECalScaleFactors()[iAbsEta-1] == 0.&&
-       rctParameters_->jetMETECalScaleFactors()[iAbsEta-1] == 0.);       
-    
-
-
-  if (resetECAL)    {
-      ecalAfterMask=0;
-    }
-  else    {
-      ecalAfterMask=ecalInput;
-    }
-
-  float ecal =  convertEcal(ecalAfterMask, iAbsEta, sign);
-
+  float ecal = convertEcal(ecalAfterMask, iAbsEta, sign);
 
   // masking off hcal for channels in channel mask
   float hcalBeforeMask = convertHcal(hcalInput, iAbsEta, sign);
 
-  bool resetHCAL = channelMask_->hcalMask[crtNo][phiSide][iAbsEta-1]||
-    (noisyChannelMask_->hcalMask[crtNo][phiSide][iAbsEta-1] &&
-     hcalBeforeMask<noisyChannelMask_->hcalThreshold)||//hot mask
-      (rctParameters_->eGammaHCalScaleFactors()[iAbsEta-1] == 0.&&
-       rctParameters_->jetMETHCalScaleFactors()[iAbsEta-1] == 0.);
-
-  if (resetHCAL)    {
-      hcalAfterMask=0;
-    }
-  else    {
-      hcalAfterMask=hcalInput;
-    }
+  bool resetHCAL =
+      channelMask_->hcalMask[crtNo][phiSide][iAbsEta - 1] ||
+      (noisyChannelMask_->hcalMask[crtNo][phiSide][iAbsEta - 1] &&
+       hcalBeforeMask < noisyChannelMask_->hcalThreshold) || // hot mask
+      (rctParameters_->eGammaHCalScaleFactors()[iAbsEta - 1] == 0. &&
+       rctParameters_->jetMETHCalScaleFactors()[iAbsEta - 1] == 0.);
+
+  if (resetHCAL) {
+    hcalAfterMask = 0;
+  } else {
+    hcalAfterMask = hcalInput;
+  }
 
   float hcal = convertHcal(hcalAfterMask, iAbsEta, sign);
 
   unsigned long etIn7Bits;
   unsigned long etIn9Bits;
 
-  if((ecalAfterMask == 0 && hcalAfterMask > 0) &&
-     ((rctParameters_->noiseVetoHB() && iAbsEta > 0 && iAbsEta < 18)
-      || (rctParameters_->noiseVetoHEplus() && iAbsEta>17 && crtNo>8)
-      || (rctParameters_->noiseVetoHEminus() && iAbsEta>17 && crtNo<9)))
-    {
-      etIn7Bits = 0;
-      etIn9Bits = 0;
-    }
-  else
-    {
-      etIn7Bits = eGammaETCode(ecal, hcal, iAbsEta);
-      etIn9Bits = jetMETETCode(ecal, hcal, iAbsEta);
-    }
+  if ((ecalAfterMask == 0 && hcalAfterMask > 0) &&
+      ((rctParameters_->noiseVetoHB() && iAbsEta > 0 && iAbsEta < 18) ||
+       (rctParameters_->noiseVetoHEplus() && iAbsEta > 17 && crtNo > 8) ||
+       (rctParameters_->noiseVetoHEminus() && iAbsEta > 17 && crtNo < 9))) {
+    etIn7Bits = 0;
+    etIn9Bits = 0;
+  } else {
+    etIn7Bits = eGammaETCode(ecal, hcal, iAbsEta);
+    etIn9Bits = jetMETETCode(ecal, hcal, iAbsEta);
+  }
   // Saturated input towers cause tower ET pegging at the highest value
-  if((ecalAfterMask == 0xFF && 
-      rctParameters_->eGammaECalScaleFactors()[iAbsEta-1] != 0. ) 
-     || (hcalAfterMask == 0xFF &&
-	 rctParameters_->eGammaHCalScaleFactors()[iAbsEta-1] != 0. )
-     )
-    {
-      etIn7Bits = 0x7F; // egamma path
-    }
-  if((ecalAfterMask == 0xFF &&
-      rctParameters_->jetMETECalScaleFactors()[iAbsEta-1] != 0. )
-     || (hcalAfterMask == 0xFF &&
-	 rctParameters_->jetMETHCalScaleFactors()[iAbsEta-1] != 0. ))
-    {
-      etIn9Bits = 0x1FF; // sums path
-    }
+  if ((ecalAfterMask == 0xFF &&
+       rctParameters_->eGammaECalScaleFactors()[iAbsEta - 1] != 0.) ||
+      (hcalAfterMask == 0xFF &&
+       rctParameters_->eGammaHCalScaleFactors()[iAbsEta - 1] != 0.)) {
+    etIn7Bits = 0x7F; // egamma path
+  }
+  if ((ecalAfterMask == 0xFF &&
+       rctParameters_->jetMETECalScaleFactors()[iAbsEta - 1] != 0.) ||
+      (hcalAfterMask == 0xFF &&
+       rctParameters_->jetMETHCalScaleFactors()[iAbsEta - 1] != 0.)) {
+    etIn9Bits = 0x1FF; // sums path
+  }
 
-  unsigned long shiftEtIn9Bits = etIn9Bits<<8;
-  unsigned long shiftHE_FGBit = hOeFGVetoBit(ecal, hcal, fgbit)<<7;
+  unsigned long shiftEtIn9Bits = etIn9Bits << 8;
+  unsigned long shiftHE_FGBit = hOeFGVetoBit(ecal, hcal, fgbit) << 7;
   unsigned long shiftActivityBit = 0;
-  if ( rctParameters_->jetMETECalScaleFactors()[iAbsEta-1] == 0.
-       && rctParameters_->jetMETHCalScaleFactors()[iAbsEta-1] == 0. )
-    {
-      // do nothing, it's already zero
-    }
-  else if (rctParameters_->jetMETECalScaleFactors()[iAbsEta-1] == 0. )
-    {
-      shiftActivityBit = activityBit(0., hcal)<<17;
-    }
-  else if (rctParameters_->jetMETHCalScaleFactors()[iAbsEta-1] == 0. )
-    {
-      shiftActivityBit = activityBit(ecal, 0.)<<17;
-    }
-  else
-    {
-      shiftActivityBit = activityBit(ecal, hcal)<<17;
-    }
-  unsigned long output=etIn7Bits+shiftHE_FGBit+shiftEtIn9Bits+shiftActivityBit;
+  if (rctParameters_->jetMETECalScaleFactors()[iAbsEta - 1] == 0. &&
+      rctParameters_->jetMETHCalScaleFactors()[iAbsEta - 1] == 0.) {
+    // do nothing, it's already zero
+  } else if (rctParameters_->jetMETECalScaleFactors()[iAbsEta - 1] == 0.) {
+    shiftActivityBit = activityBit(0., hcal) << 17;
+  } else if (rctParameters_->jetMETHCalScaleFactors()[iAbsEta - 1] == 0.) {
+    shiftActivityBit = activityBit(ecal, 0.) << 17;
+  } else {
+    shiftActivityBit = activityBit(ecal, hcal) << 17;
+  }
+  unsigned long output =
+      etIn7Bits + shiftHE_FGBit + shiftEtIn9Bits + shiftActivityBit;
   return output;
 }
 
 unsigned int L1RCTLookupTables::lookup(unsigned short hfInput,
-				       unsigned short crtNo,
-				       unsigned short crdNo,
-				       unsigned short twrNo
-				       ) const
-{
-  if(rctParameters_ == nullptr)
+                                       unsigned short crtNo,
+                                       unsigned short crdNo,
+                                       unsigned short twrNo) const {
+  if (rctParameters_ == nullptr)
     throw cms::Exception("L1RCTParameters Invalid")
-      << "L1RCTParameters should be set every event" << rctParameters_;
-  if(channelMask_ == nullptr)
+        << "L1RCTParameters should be set every event" << rctParameters_;
+  if (channelMask_ == nullptr)
     throw cms::Exception("L1RCTChannelMask Invalid")
-      << "L1RCTChannelMask should be set every event" << channelMask_;
-  if(hfInput > 0xFF) 
-    throw cms::Exception("Invalid Data") 
-      << "HF compressedET should be less than 0xFF, is " << hfInput;
+        << "L1RCTChannelMask should be set every event" << channelMask_;
+  if (hfInput > 0xFF)
+    throw cms::Exception("Invalid Data")
+        << "HF compressedET should be less than 0xFF, is " << hfInput;
   short iEta = rctParameters_->calcIEta(crtNo, crdNo, twrNo);
   unsigned short iAbsEta = abs(iEta);
-  short sign = (iEta/iAbsEta);
-  unsigned short phiSide = twrNo/4;
-  if(iAbsEta < 29 || iAbsEta > 32) 
-    throw cms::Exception("Invalid Data") 
-      << "29 <= |iEta| <= 32, is " << iAbsEta;
-
-  float et = convertHcal(hfInput, iAbsEta, sign);;
-
-
-
-  if (channelMask_->hfMask[crtNo][phiSide][iAbsEta-29]||
-      (noisyChannelMask_->hfMask[crtNo][phiSide][iAbsEta-29]&&
-       et<noisyChannelMask_->hfThreshold))
-    {
-      et = 0;
-    }
+  short sign = (iEta / iAbsEta);
+  unsigned short phiSide = twrNo / 4;
+  if (iAbsEta < 29 || iAbsEta > 32)
+    throw cms::Exception("Invalid Data")
+        << "29 <= |iEta| <= 32, is " << iAbsEta;
+
+  float et = convertHcal(hfInput, iAbsEta, sign);
+  ;
+
+  if (channelMask_->hfMask[crtNo][phiSide][iAbsEta - 29] ||
+      (noisyChannelMask_->hfMask[crtNo][phiSide][iAbsEta - 29] &&
+       et < noisyChannelMask_->hfThreshold)) {
+    et = 0;
+  }
 
-  //cout << (int) rctParameters_->jetMETHCalScaleFactors()[iAbsEta-1] << endl;
+  // cout << (int) rctParameters_->jetMETHCalScaleFactors()[iAbsEta-1] << endl;
 
   float scalehf = 1.;
-  if(rctParameters_->jetMETHCalScaleFactors().size()==32){
-     scalehf = (float) rctParameters_->jetMETHCalScaleFactors()[iAbsEta-1];
+  if (rctParameters_->jetMETHCalScaleFactors().size() == 32) {
+    scalehf = (float)rctParameters_->jetMETHCalScaleFactors()[iAbsEta - 1];
   } // The max eta for the various scale factors is 32, check to see if used.
-  else if(rctParameters_->jetMETHCalScaleFactors().size()==32*10){
-     int ht_bin = ((int) floor(et)/5);
-     // lowest bin (1) is 0-10GeV
-     if ( ht_bin < 1 ) ht_bin = 1;
-     // highest bin (9) is 45GeV and up
-     if ( ht_bin > 9 ) ht_bin = 9;
-     scalehf = (float) rctParameters_->jetMETHCalScaleFactors()[32*ht_bin+iAbsEta-1];
+  else if (rctParameters_->jetMETHCalScaleFactors().size() == 32 * 10) {
+    int ht_bin = ((int)floor(et) / 5);
+    // lowest bin (1) is 0-10GeV
+    if (ht_bin < 1)
+      ht_bin = 1;
+    // highest bin (9) is 45GeV and up
+    if (ht_bin > 9)
+      ht_bin = 9;
+    scalehf =
+        (float)
+            rctParameters_->jetMETHCalScaleFactors()[32 * ht_bin + iAbsEta - 1];
   } // et-dependent scale factors (optional, of course, if set to 1)
 
-  et=scalehf*et; // Allow for scaling the HF as well e.g. zero out if needed
+  et = scalehf * et; // Allow for scaling the HF as well e.g. zero out if needed
 
   unsigned int result = convertToInteger(et, rctParameters_->jetMETLSB(), 8);
   return result;
 }
 
-bool L1RCTLookupTables::hOeFGVetoBit(float ecal, float hcal, bool fgbit) const
-{
-  if(rctParameters_ == nullptr)
+bool L1RCTLookupTables::hOeFGVetoBit(float ecal, float hcal, bool fgbit) const {
+  if (rctParameters_ == nullptr)
     throw cms::Exception("L1RCTParameters Invalid")
-      << "L1RCTParameters should be set every event" << rctParameters_;
+        << "L1RCTParameters should be set every event" << rctParameters_;
   bool veto = false;
-  if(ecal > rctParameters_->eMinForFGCut() && 
-     ecal < rctParameters_->eMaxForFGCut())
-    {
-      if(fgbit) veto = true;
-    }
-  if(ecal >= rctParameters_->eMinForHoECut() && 
-     ecal < rctParameters_->eMaxForHoECut())
-    {
-      if((hcal / ecal) > rctParameters_->hOeCut()) veto = true;
-    }
+  if (ecal > rctParameters_->eMinForFGCut() &&
+      ecal < rctParameters_->eMaxForFGCut()) {
+    if (fgbit)
+      veto = true;
+  }
+  if (ecal >= rctParameters_->eMinForHoECut() &&
+      ecal < rctParameters_->eMaxForHoECut()) {
+    if ((hcal / ecal) > rctParameters_->hOeCut())
+      veto = true;
+  }
   //  else
-  if (ecal < rctParameters_->eMinForHoECut())
-    {
-      if(hcal >= rctParameters_->hMinForHoECut()) veto = true;  // Changed from eMinForHoECut() - JLL 2008-Feb-13
-    }
+  if (ecal < rctParameters_->eMinForHoECut()) {
+    if (hcal >= rctParameters_->hMinForHoECut())
+      veto = true; // Changed from eMinForHoECut() - JLL 2008-Feb-13
+  }
   return veto;
 }
 
-bool L1RCTLookupTables::activityBit(float ecal, float hcal) const
-{
+bool L1RCTLookupTables::activityBit(float ecal, float hcal) const {
   // Redefined for upgrade as EM activity only
-  if(rctParameters_ == nullptr)
+  if (rctParameters_ == nullptr)
     throw cms::Exception("L1RCTParameters Invalid")
-      << "L1RCTParameters should be set every event" << rctParameters_;
+        << "L1RCTParameters should be set every event" << rctParameters_;
   bool aBit = false;
-  if(rctParameters_->eMinForHoECut() < rctParameters_->eMaxForHoECut()) {
+  if (rctParameters_->eMinForHoECut() < rctParameters_->eMaxForHoECut()) {
     // For RCT operations HoE cut and tauVeto are used
-    aBit = ((ecal > rctParameters_->eActivityCut()) || 
-	    (hcal > rctParameters_->hActivityCut()));
-  }
-  else {
-    // We redefine tauVeto() for upgrade as EM activity only  -- 
+    aBit = ((ecal > rctParameters_->eActivityCut()) ||
+            (hcal > rctParameters_->hActivityCut()));
+  } else {
+    // We redefine tauVeto() for upgrade as EM activity only  --
     // both EG and Tau make it through the EIC and JSC to CTP cards
     // In the CTP card we want to rechannel EG/Tau candidates to EG and Tau
-    if(ecal > rctParameters_->eActivityCut()) {
-      if((hcal/ecal) < rctParameters_->hOeCut()) {
-	aBit = true;
+    if (ecal > rctParameters_->eActivityCut()) {
+      if ((hcal / ecal) < rctParameters_->hOeCut()) {
+        aBit = true;
       }
     }
   }
@@ -266,89 +240,79 @@ bool L1RCTLookupTables::activityBit(float ecal, float hcal) const
 }
 
 // uses etScale
-unsigned int L1RCTLookupTables::emRank(unsigned short energy) const 
-{
-  if(etScale_)
-    {
-      return etScale_->rank(energy);
-    }
-  else
-    //    edm::LogInfo("L1RegionalCaloTrigger") 
+unsigned int L1RCTLookupTables::emRank(unsigned short energy) const {
+  if (etScale_) {
+    return etScale_->rank(energy);
+  } else
+    //    edm::LogInfo("L1RegionalCaloTrigger")
     //      << "CaloEtScale was not used - energy instead of rank" << std::endl;
-  return energy;
+    return energy;
 }
 
 // converts compressed ecal energy to linear (real) scale
-float L1RCTLookupTables::convertEcal(unsigned short ecal, unsigned short iAbsEta, short sign) const
-{
-  if(ecalScale_)
-    {
-      //std::cout << "[luts] energy " << ecal << " sign " << sign 
-      //<< " iAbsEta " << iAbsEta << " iPhi "	<< iPhi << std::endl;
-      float dummy = 0;
-      dummy = float (ecalScale_->et( ecal, iAbsEta, sign ));
-      /*
-      if (ecal > 0)
-	{
-	  std::cout << "[luts] ecal converted from " << ecal << " to " 
-		    << dummy << " with iAbsEta " << iAbsEta << std::endl;
-	}
-      */
-      return dummy;
-    }
-  //else if(rctParameters_ == 0)
+float L1RCTLookupTables::convertEcal(unsigned short ecal,
+                                     unsigned short iAbsEta, short sign) const {
+  if (ecalScale_) {
+    // std::cout << "[luts] energy " << ecal << " sign " << sign
+    //<< " iAbsEta " << iAbsEta << " iPhi "	<< iPhi << std::endl;
+    float dummy = 0;
+    dummy = float(ecalScale_->et(ecal, iAbsEta, sign));
+    /*
+    if (ecal > 0)
+      {
+        std::cout << "[luts] ecal converted from " << ecal << " to "
+                  << dummy << " with iAbsEta " << iAbsEta << std::endl;
+      }
+    */
+    return dummy;
+  }
+  // else if(rctParameters_ == 0)
   //  {
   //    throw cms::Exception("L1RCTParameters Invalid")
   //	<< "L1RCTParameters should be set every event" << rctParameters_;
   //  }
-  else
-    {
-      return ((float) ecal) * rctParameters_->eGammaLSB();
-    }
+  else {
+    return ((float)ecal) * rctParameters_->eGammaLSB();
+  }
 }
 
 // converts compressed hcal energy to linear (real) scale
-float L1RCTLookupTables::convertHcal(unsigned short hcal, unsigned short iAbsEta, short sign) const
-{
-  if (hcalScale_ != nullptr)
-    {
-      return (hcalScale_->et( hcal, iAbsEta, sign ));
-    }
-  else
-    {
-      //      edm::LogInfo("L1RegionalCaloTrigger") 
-      //	<< "CaloTPGTranscoder was not used" << std::endl;
-      return ((float) hcal) * rctParameters_->jetMETLSB();
-    }
+float L1RCTLookupTables::convertHcal(unsigned short hcal,
+                                     unsigned short iAbsEta, short sign) const {
+  if (hcalScale_ != nullptr) {
+    return (hcalScale_->et(hcal, iAbsEta, sign));
+  } else {
+    //      edm::LogInfo("L1RegionalCaloTrigger")
+    //	<< "CaloTPGTranscoder was not used" << std::endl;
+    return ((float)hcal) * rctParameters_->jetMETLSB();
+  }
 }
 
 // integerize given an LSB and set maximum value of 2^precision-1
-unsigned long L1RCTLookupTables::convertToInteger(float et, 
-						  float lsb, 
-						  int precision) const
-{
-  unsigned long etBits = (unsigned long)(et/lsb);
+unsigned long L1RCTLookupTables::convertToInteger(float et, float lsb,
+                                                  int precision) const {
+  unsigned long etBits = (unsigned long)(et / lsb);
   unsigned long maxValue = (1 << precision) - 1;
-  if(etBits > maxValue)
+  if (etBits > maxValue)
     return maxValue;
   else
     return etBits;
 }
 
-unsigned int L1RCTLookupTables::eGammaETCode(float ecal, float hcal, int iAbsEta) const
-{
-  if(rctParameters_ == nullptr)
+unsigned int L1RCTLookupTables::eGammaETCode(float ecal, float hcal,
+                                             int iAbsEta) const {
+  if (rctParameters_ == nullptr)
     throw cms::Exception("L1RCTParameters Invalid")
-      << "L1RCTParameters should be set every event" << rctParameters_;
-  float etLinear = rctParameters_->EGammaTPGSum(ecal,hcal,iAbsEta);
+        << "L1RCTParameters should be set every event" << rctParameters_;
+  float etLinear = rctParameters_->EGammaTPGSum(ecal, hcal, iAbsEta);
   return convertToInteger(etLinear, rctParameters_->eGammaLSB(), 7);
 }
 
-unsigned int L1RCTLookupTables::jetMETETCode(float ecal, float hcal, int iAbsEta) const
-{
-  if(rctParameters_ == nullptr)
+unsigned int L1RCTLookupTables::jetMETETCode(float ecal, float hcal,
+                                             int iAbsEta) const {
+  if (rctParameters_ == nullptr)
     throw cms::Exception("L1RCTParameters Invalid")
-      << "L1RCTParameters should be set every event" << rctParameters_;
-  float etLinear = rctParameters_->JetMETTPGSum(ecal,hcal,iAbsEta);
+        << "L1RCTParameters should be set every event" << rctParameters_;
+  float etLinear = rctParameters_->JetMETTPGSum(ecal, hcal, iAbsEta);
   return convertToInteger(etLinear, rctParameters_->jetMETLSB(), 9);
 }
diff --git a/L1Trigger/RegionalCaloTrigger/src/L1RCTNeighborMap.cc b/L1Trigger/RegionalCaloTrigger/src/L1RCTNeighborMap.cc
index b27e4b5b82fda..9bdc3e850d2de 100644
--- a/L1Trigger/RegionalCaloTrigger/src/L1RCTNeighborMap.cc
+++ b/L1Trigger/RegionalCaloTrigger/src/L1RCTNeighborMap.cc
@@ -3,34 +3,31 @@
 #include <vector>
 using std::vector;
 
-vector<int> L1RCTNeighborMap::north(int crate,int card,int region){
+vector<int> L1RCTNeighborMap::north(int crate, int card, int region) {
   std::vector<int> north(3);
-  int newregion(0),newcard(0),newcrate(0);
-  if(card == 0 || card == 2 || card == 4){
-    newcard = card+1;
+  int newregion(0), newcard(0), newcrate(0);
+  if (card == 0 || card == 2 || card == 4) {
+    newcard = card + 1;
     newregion = region;
-    if(crate != 0 && crate != 9)
-      newcrate = crate-1;
+    if (crate != 0 && crate != 9)
+      newcrate = crate - 1;
     else
-      newcrate = crate+8;
-  }
-  else if(card == 1 || card == 3 || card == 5){
-    newcard = card-1;
+      newcrate = crate + 8;
+  } else if (card == 1 || card == 3 || card == 5) {
+    newcard = card - 1;
     newregion = region;
     newcrate = crate;
-  }
-  else if(card == 6){
-    if(region == 0){
+  } else if (card == 6) {
+    if (region == 0) {
       newcard = card;
-      newregion = region+1;
-      if(crate != 0 && crate != 9)
-	newcrate = crate-1;
+      newregion = region + 1;
+      if (crate != 0 && crate != 9)
+        newcrate = crate - 1;
       else
-	newcrate = crate+8;
-    }
-    else {
+        newcrate = crate + 8;
+    } else {
       newcard = card;
-      newregion = region-1;
+      newregion = region - 1;
       newcrate = crate;
     }
   }
@@ -40,35 +37,32 @@ vector<int> L1RCTNeighborMap::north(int crate,int card,int region){
   return north;
 }
 
-vector<int> L1RCTNeighborMap::south(int crate, int card, int region){
-  int newcrate(0),newcard(0),newregion(0);
+vector<int> L1RCTNeighborMap::south(int crate, int card, int region) {
+  int newcrate(0), newcard(0), newregion(0);
   std::vector<int> south(3);
-  if(card == 0 || card == 2 || card == 4){
-    newcard = card+1;
+  if (card == 0 || card == 2 || card == 4) {
+    newcard = card + 1;
     newregion = region;
     newcrate = crate;
-  }
-  else if(card == 1 || card == 3 || card == 5){
-    newcard = card-1;
+  } else if (card == 1 || card == 3 || card == 5) {
+    newcard = card - 1;
     newregion = region;
-    if(crate != 8 && crate != 17)
-      newcrate = crate+1;
+    if (crate != 8 && crate != 17)
+      newcrate = crate + 1;
     else
-      newcrate = crate-8;
-  }
-  else if(card == 6){
-    if(region == 0){
+      newcrate = crate - 8;
+  } else if (card == 6) {
+    if (region == 0) {
       newcrate = crate;
       newcard = card;
-      newregion = region+1;
-    }
-    else {
+      newregion = region + 1;
+    } else {
       newcard = card;
-      newregion = region-1;
-      if(crate != 8 && crate != 17)
-	newcrate = crate+1;
+      newregion = region - 1;
+      if (crate != 8 && crate != 17)
+        newcrate = crate + 1;
       else
-	newcrate = crate-8;
+        newcrate = crate - 8;
     }
   }
   south.at(0) = newcrate;
@@ -76,69 +70,60 @@ vector<int> L1RCTNeighborMap::south(int crate, int card, int region){
   south.at(2) = newregion;
   return south;
 }
-  
-vector<int> L1RCTNeighborMap::west(int crate,int card, int region){
-  int newcrate(0),newcard(0),newregion(0);
+
+vector<int> L1RCTNeighborMap::west(int crate, int card, int region) {
+  int newcrate(0), newcard(0), newregion(0);
   std::vector<int> west(3);
-  if(crate < 9){
+  if (crate < 9) {
     newcrate = crate;
-    if(card != 6){
-      if(region == 0){
-	newcard = card;
-	newregion = region+1;
-      }
-      else{
-	if(card != 4 && card != 5){
-	  newcard = card+2;
-	  newregion = region-1;
-	}
-	else if(card == 4){
-	  newcard = 6;
-	  newregion = 0;
-	}
-	else if(card == 5){
-	  newcard = 6;
-	  newregion = 1;
-	}
-      }
-    }
-    else{
+    if (card != 6) {
+      if (region == 0) {
+        newcard = card;
+        newregion = region + 1;
+      } else {
+        if (card != 4 && card != 5) {
+          newcard = card + 2;
+          newregion = region - 1;
+        } else if (card == 4) {
+          newcard = 6;
+          newregion = 0;
+        } else if (card == 5) {
+          newcard = 6;
+          newregion = 1;
+        }
+      }
+    } else {
       newcrate = -1;
       newcard = -1;
       newregion = -1;
     }
-  }
-  else{
-    if(card == 0 || card == 1){
-      if(region == 0){
-	newcrate = crate-9;
-	newregion = region;
-	newcard = card;
-      }
-      else {
-	newcrate = crate;
-	newregion = region-1;
-	newcard = card;
-      }
-    }
-    else if(card != 6){
+  } else {
+    if (card == 0 || card == 1) {
+      if (region == 0) {
+        newcrate = crate - 9;
+        newregion = region;
+        newcard = card;
+      } else {
+        newcrate = crate;
+        newregion = region - 1;
+        newcard = card;
+      }
+    } else if (card != 6) {
       newcrate = crate;
-      if(region == 0){
-	newcard = card-2;
-	newregion = region+1;
-      }
-      else{
-	newcard = card;
-	newregion = region-1;
-      }
-    }
-    else if(card == 6){
+      if (region == 0) {
+        newcard = card - 2;
+        newregion = region + 1;
+      } else {
+        newcard = card;
+        newregion = region - 1;
+      }
+    } else if (card == 6) {
       newcrate = crate;
       newregion = 1;
-      if(region == 0)
-	newcard = 4;
+      if (region == 0)
+        newcard = 4;
       else
-	newcard = 5;
+        newcard = 5;
     }
   }
   west.at(0) = newcrate;
@@ -147,64 +132,55 @@ vector<int> L1RCTNeighborMap::west(int crate,int card, int region){
   return west;
 }
 
-vector<int> L1RCTNeighborMap::east(int crate,int card, int region){
-  int newcrate(0),newcard(0),newregion(0);
+vector<int> L1RCTNeighborMap::east(int crate, int card, int region) {
+  int newcrate(0), newcard(0), newregion(0);
   std::vector<int> east(3);
-  if(crate < 9){
-    if(card != 0 && card != 1 && card != 6){
+  if (crate < 9) {
+    if (card != 0 && card != 1 && card != 6) {
       newcrate = crate;
-      if(region == 0){
-	newregion = region+1;
-	newcard = card-2;
-      }
-      else{
-	newregion = region-1;
-	newcard = card;
-      }
-    }
-    else if(card == 0 || card == 1){
+      if (region == 0) {
+        newregion = region + 1;
+        newcard = card - 2;
+      } else {
+        newregion = region - 1;
+        newcard = card;
+      }
+    } else if (card == 0 || card == 1) {
       newcard = card;
-      if(region == 0){
-	newcrate = crate+9;
-	newregion = region;
-      }
-      else {
-	newcrate = crate;
-	newregion = region-1;
-      }
-    }
-    else if(card == 6){
+      if (region == 0) {
+        newcrate = crate + 9;
+        newregion = region;
+      } else {
+        newcrate = crate;
+        newregion = region - 1;
+      }
+    } else if (card == 6) {
       newcrate = crate;
       newregion = 1;
-      if(region == 0)
-	newcard = 4;
+      if (region == 0)
+        newcard = 4;
       else
-	newcard = 5;
+        newcard = 5;
     }
-  }
-  else {
+  } else {
     newcrate = crate;
-    if(card != 6){
-      if(region == 0){
-	newcard = card;
-	newregion = region+1;
-      }
-      else{
-	if(card != 4 && card != 5){
-	  newcard = card+2;
-	  newregion = region-1;
-	}
-	else if(card == 4){
-	  newcard = 6;
-	  newregion = 0;
-	}
-	else if(card == 5){
-	  newcard = 6;
-	  newregion = 1;
-	}
-      }
-    }
-    else{
+    if (card != 6) {
+      if (region == 0) {
+        newcard = card;
+        newregion = region + 1;
+      } else {
+        if (card != 4 && card != 5) {
+          newcard = card + 2;
+          newregion = region - 1;
+        } else if (card == 4) {
+          newcard = 6;
+          newregion = 0;
+        } else if (card == 5) {
+          newcard = 6;
+          newregion = 1;
+        }
+      }
+    } else {
       newcrate = -1;
       newcard = -1;
       newregion = -1;
@@ -216,109 +192,95 @@ vector<int> L1RCTNeighborMap::east(int crate,int card, int region){
   return east;
 }
 
-vector<int> L1RCTNeighborMap::se(int crate,int card,int region){
-  int newcrate(0),newcard(0),newregion(0);
+vector<int> L1RCTNeighborMap::se(int crate, int card, int region) {
+  int newcrate(0), newcard(0), newregion(0);
   std::vector<int> se(3);
-  if(crate < 9){
-    if(card == 0){
-      if(region == 0){
-	newcrate = crate+9;
-	newregion = region;
-	newcard = 1;
-      }
-      else{
-	newcrate = crate;
-	newregion = 0;
-	newcard = 1;
-      }
-    }
-    else if(card == 1){
-      if(region == 0){
-	if(crate != 8)
-	  newcrate = crate+10;
-	else 
-	  newcrate = 9;
-	newregion = 0;
-	newcard = 0;
-      }
-      else {
-	if(crate != 8)
-	  newcrate = crate+1;
-	else
-	  newcrate = 0;
-	newregion = 0;
-	newcard = 0;
-      }
-    }
-    else if(card == 2 || card == 4){
+  if (crate < 9) {
+    if (card == 0) {
+      if (region == 0) {
+        newcrate = crate + 9;
+        newregion = region;
+        newcard = 1;
+      } else {
+        newcrate = crate;
+        newregion = 0;
+        newcard = 1;
+      }
+    } else if (card == 1) {
+      if (region == 0) {
+        if (crate != 8)
+          newcrate = crate + 10;
+        else
+          newcrate = 9;
+        newregion = 0;
+        newcard = 0;
+      } else {
+        if (crate != 8)
+          newcrate = crate + 1;
+        else
+          newcrate = 0;
+        newregion = 0;
+        newcard = 0;
+      }
+    } else if (card == 2 || card == 4) {
       newcrate = crate;
       newregion = !region;
-      newcard = card-1+2*region;
-    }
-    else if(card == 5 || card == 3){
+      newcard = card - 1 + 2 * region;
+    } else if (card == 5 || card == 3) {
       newregion = !region;
-      newcard = card-3+2*region;
-      if(crate != 8)
-	newcrate = crate+1;
+      newcard = card - 3 + 2 * region;
+      if (crate != 8)
+        newcrate = crate + 1;
       else
-	newcrate = 0;
-    }
-    else if(card == 6){
-      if(region == 0){
-	newcard = 5;
-	newregion = 1;
-	newcrate = crate;
-      }
-      else{
-	newcard = 4;
-	newregion = 1;
-	if(crate != 8)
-	  newcrate = crate+1;
-	else
-	  newcrate = 0;
-      }
-    }
-  }
-  else{
-    if(card == 0 || card == 2){
+        newcrate = 0;
+    } else if (card == 6) {
+      if (region == 0) {
+        newcard = 5;
+        newregion = 1;
+        newcrate = crate;
+      } else {
+        newcard = 4;
+        newregion = 1;
+        if (crate != 8)
+          newcrate = crate + 1;
+        else
+          newcrate = 0;
+      }
+    }
+  } else {
+    if (card == 0 || card == 2) {
       newregion = !region;
       newcrate = crate;
-      newcard = card+2*region+1;
-    }
-    else if(card == 1 || card == 3){
+      newcard = card + 2 * region + 1;
+    } else if (card == 1 || card == 3) {
       newregion = !region;
-      newcard = card-1+2*region;
-      if(crate != 17)
-	newcrate = crate+1;
+      newcard = card - 1 + 2 * region;
+      if (crate != 17)
+        newcrate = crate + 1;
       else
-	newcrate = 9;
-    }
-    else if(card == 4){
+        newcrate = 9;
+    } else if (card == 4) {
       newcrate = crate;
-      if(region == 0){
-	newregion = 1;
-	newcard = 5;
-      }
-      else{
-	newregion = 1;
-	newcard = 6;
-      }
-    }
-    else if(card == 5){
-      if(region == 0){
-	newcard = 4;
-	newregion = 1;
-      }
-      else{
-	newcard = 6;
-	newregion = 0;
-      }
-      if(crate != 17)
-	newcrate = crate+1;
-      else 
-	newcrate = 9;
-    }
-    else if(card == 6){
+      if (region == 0) {
+        newregion = 1;
+        newcard = 5;
+      } else {
+        newregion = 1;
+        newcard = 6;
+      }
+    } else if (card == 5) {
+      if (region == 0) {
+        newcard = 4;
+        newregion = 1;
+      } else {
+        newcard = 6;
+        newregion = 0;
+      }
+      if (crate != 17)
+        newcrate = crate + 1;
+      else
+        newcrate = 9;
+    } else if (card == 6) {
       newcard = -1;
       newregion = -1;
       newcrate = -1;
@@ -331,109 +293,95 @@ vector<int> L1RCTNeighborMap::se(int crate,int card,int region){
   return se;
 }
 
-vector<int> L1RCTNeighborMap::sw(int crate,int card,int region){
-  int newcrate(0),newcard(0),newregion(0);
+vector<int> L1RCTNeighborMap::sw(int crate, int card, int region) {
+  int newcrate(0), newcard(0), newregion(0);
   std::vector<int> sw(3);
-  if(crate > 8){
-    if(card == 0){
-      if(region == 0){
-	newcrate = crate-9;
-	newregion = region;
-	newcard = 1;
-      }
-      else{
-	newcrate = crate;
-	newregion = 0;
-	newcard = 1;
-      }
-    }
-    else if(card == 1){
-      if(region == 0){
-	if(crate != 17)
-	  newcrate = crate-8;
-	else
-	  newcrate = 0;
-	newregion = 0;
-	newcard = 0;
-      }
-      else {
-	if(crate != 17)
-	  newcrate = crate+1;
-	else
-	  newcrate = 9;
-	newregion = 0;
-	newcard = 0;
-      }
-    }
-    else if(card == 2 || card == 4){
+  if (crate > 8) {
+    if (card == 0) {
+      if (region == 0) {
+        newcrate = crate - 9;
+        newregion = region;
+        newcard = 1;
+      } else {
+        newcrate = crate;
+        newregion = 0;
+        newcard = 1;
+      }
+    } else if (card == 1) {
+      if (region == 0) {
+        if (crate != 17)
+          newcrate = crate - 8;
+        else
+          newcrate = 0;
+        newregion = 0;
+        newcard = 0;
+      } else {
+        if (crate != 17)
+          newcrate = crate + 1;
+        else
+          newcrate = 9;
+        newregion = 0;
+        newcard = 0;
+      }
+    } else if (card == 2 || card == 4) {
       newcrate = crate;
       newregion = !region;
-      newcard = card-1+2*region;
-    }
-    else if(card == 5 || card == 3){
+      newcard = card - 1 + 2 * region;
+    } else if (card == 5 || card == 3) {
       newregion = !region;
-      newcard = card-3+2*region;
-      if(crate != 17)
-	newcrate = crate+1;
+      newcard = card - 3 + 2 * region;
+      if (crate != 17)
+        newcrate = crate + 1;
       else
-	newcrate = 9;
-    }
-    else if(card == 6){
-      if(region == 0){
-	newcard = 5;
-	newregion = 1;
-	newcrate = crate;
-      }
-      else{
-	newcard = 4;
-	newregion = 1;
-	if(crate != 17)
-	  newcrate = crate+1;
-	else
-	  newcrate = 9;
-      }
-    }
-  }
-  else{
-    if(card == 0 || card == 2){
+        newcrate = 9;
+    } else if (card == 6) {
+      if (region == 0) {
+        newcard = 5;
+        newregion = 1;
+        newcrate = crate;
+      } else {
+        newcard = 4;
+        newregion = 1;
+        if (crate != 17)
+          newcrate = crate + 1;
+        else
+          newcrate = 9;
+      }
+    }
+  } else {
+    if (card == 0 || card == 2) {
       newregion = !region;
       newcrate = crate;
-      newcard = card+1+2*region;
-    }
-    else if(card == 1 || card == 3){
+      newcard = card + 1 + 2 * region;
+    } else if (card == 1 || card == 3) {
       newregion = !region;
-      newcard = card-1+2*region;
-      if(crate != 8)
-	newcrate = crate+1;
+      newcard = card - 1 + 2 * region;
+      if (crate != 8)
+        newcrate = crate + 1;
       else
-	newcrate = 0;
-    }
-    else if(card == 4){
+        newcrate = 0;
+    } else if (card == 4) {
       newcrate = crate;
-      if(region == 0){
-	newregion = 1;
-	newcard = 5;
-      }
-      else{
-	newregion = 1;
-	newcard = 6;
-      }
-    }
-    else if(card == 5){
-      if(region == 0){
-	newcard = 4;
-	newregion = 1;
-      }
-      else{
-	newcard = 6;
-	newregion = 0;
-      }
-      if(crate != 8)
-	newcrate = crate+1;
-      else 
-	newcrate = 0;
-    }
-    else if(card == 6){
+      if (region == 0) {
+        newregion = 1;
+        newcard = 5;
+      } else {
+        newregion = 1;
+        newcard = 6;
+      }
+    } else if (card == 5) {
+      if (region == 0) {
+        newcard = 4;
+        newregion = 1;
+      } else {
+        newcard = 6;
+        newregion = 0;
+      }
+      if (crate != 8)
+        newcrate = crate + 1;
+      else
+        newcrate = 0;
+    } else if (card == 6) {
       newcard = -1;
       newregion = -1;
       newcrate = -1;
@@ -446,96 +394,85 @@ vector<int> L1RCTNeighborMap::sw(int crate,int card,int region){
   return sw;
 }
 
-vector<int> L1RCTNeighborMap::ne(int crate,int card,int region){
-  int newcrate(0),newcard(0),newregion(0);
+vector<int> L1RCTNeighborMap::ne(int crate, int card, int region) {
+  int newcrate(0), newcard(0), newregion(0);
   std::vector<int> ne(3);
-  if(crate < 9){
-    if(card == 0){
+  if (crate < 9) {
+    if (card == 0) {
       newregion = 0;
       newcard = 1;
-      if(region == 0){
-	if(crate != 0)
-	  newcrate = crate +8;
-	else
-	  newcrate = 17;
-      }
-      else{
-	if(crate != 0)
-	  newcrate = crate-1;
-	else
-	  newcrate = 8;
-      }
-    }
-    else if(card == 1){
+      if (region == 0) {
+        if (crate != 0)
+          newcrate = crate + 8;
+        else
+          newcrate = 17;
+      } else {
+        if (crate != 0)
+          newcrate = crate - 1;
+        else
+          newcrate = 8;
+      }
+    } else if (card == 1) {
       newregion = 0;
       newcard = 0;
-      if(region == 0)
-	newcrate = crate+9;
+      if (region == 0)
+        newcrate = crate + 9;
       else
-	newcrate = crate;
-    }
-    else if(card == 2 || card == 4){
+        newcrate = crate;
+    } else if (card == 2 || card == 4) {
       newregion = !region;
-      newcard = card-1+2*region;
-      if(crate != 0)
-	newcrate = crate-1;
+      newcard = card - 1 + 2 * region;
+      if (crate != 0)
+        newcrate = crate - 1;
       else
-	newcrate = 8;
-    }
-    else if(card == 5 || card == 3){
+        newcrate = 8;
+    } else if (card == 5 || card == 3) {
       newregion = !region;
-      newcard = card-3+2*region;
+      newcard = card - 3 + 2 * region;
       newcrate = crate;
-    }
-    else if(card == 6){
+    } else if (card == 6) {
       newregion = 1;
-      if(region==0){
-	newcard = 5;
-	if(crate != 0)
-	  newcrate = crate-1;
-	else
-	  newcrate = 8;
-      }
-      else {
-	newcard = 4;
-	newcrate = crate;
-      }
-    }
-  }
-  else {
-    if(card == 0 || card ==2){
+      if (region == 0) {
+        newcard = 5;
+        if (crate != 0)
+          newcrate = crate - 1;
+        else
+          newcrate = 8;
+      } else {
+        newcard = 4;
+        newcrate = crate;
+      }
+    }
+  } else {
+    if (card == 0 || card == 2) {
       newregion = !region;
-      newcard = card+1+2*region;
-      if(crate!=9)
-	newcrate = crate-1;
+      newcard = card + 1 + 2 * region;
+      if (crate != 9)
+        newcrate = crate - 1;
       else
-	newcrate = 17;
-    }
-    else if(card == 1 || card == 3){
+        newcrate = 17;
+    } else if (card == 1 || card == 3) {
       newregion = !region;
-      newcard = card-1+2*region;
+      newcard = card - 1 + 2 * region;
       newcrate = crate;
-    }
-    else if(card == 4){
+    } else if (card == 4) {
       newregion = 1;
-      if(crate != 9)
-	newcrate = crate-1;
+      if (crate != 9)
+        newcrate = crate - 1;
       else
-	newcrate = 17;
-      if(region == 0)
-	newcard = 5;
+        newcrate = 17;
+      if (region == 0)
+        newcard = 5;
       else
-	newcard = 6;
-    }
-    else if(card == 5){
+        newcard = 6;
+    } else if (card == 5) {
       newregion = !region;
       newcrate = crate;
-      if(region == 0)
-	newcard = 4;
+      if (region == 0)
+        newcard = 4;
       else
-	newcard = 6;
-    }
-    else if(card == 6){
+        newcard = 6;
+    } else if (card == 6) {
       newcrate = -1;
       newcard = -1;
       newregion = -1;
@@ -547,96 +484,85 @@ vector<int> L1RCTNeighborMap::ne(int crate,int card,int region){
   return ne;
 }
 
-vector<int> L1RCTNeighborMap::nw(int crate,int card,int region){
-  int newcrate(0),newcard(0),newregion(0);
+vector<int> L1RCTNeighborMap::nw(int crate, int card, int region) {
+  int newcrate(0), newcard(0), newregion(0);
   std::vector<int> nw(3);
-  if(crate > 8){
-    if(card == 0){
+  if (crate > 8) {
+    if (card == 0) {
       newregion = 0;
       newcard = 1;
-      if(region == 0){
-	if(crate != 9)
-	  newcrate = crate -10;
-	else
-	  newcrate = 8;
-      }
-      else{
-	if(crate != 9)
-	  newcrate = crate-1;
-	else
-	  newcrate = 17;
-      }
-    }
-    else if(card == 1){
+      if (region == 0) {
+        if (crate != 9)
+          newcrate = crate - 10;
+        else
+          newcrate = 8;
+      } else {
+        if (crate != 9)
+          newcrate = crate - 1;
+        else
+          newcrate = 17;
+      }
+    } else if (card == 1) {
       newregion = 0;
       newcard = 0;
-      if(region == 0)
-	newcrate = crate-9;
+      if (region == 0)
+        newcrate = crate - 9;
       else
-	newcrate = crate;
-    }
-    else if(card == 2 || card == 4){
+        newcrate = crate;
+    } else if (card == 2 || card == 4) {
       newregion = !region;
-      newcard = card-1+2*region;
-      if(crate != 9)
-	newcrate = crate-1;
+      newcard = card - 1 + 2 * region;
+      if (crate != 9)
+        newcrate = crate - 1;
       else
-	newcrate = 17;
-    }
-    else if(card == 5 || card == 3){
+        newcrate = 17;
+    } else if (card == 5 || card == 3) {
       newregion = !region;
-      newcard = card-3+2*region;
+      newcard = card - 3 + 2 * region;
       newcrate = crate;
-    }
-    else if(card == 6){
+    } else if (card == 6) {
       newregion = 1;
-      if(region==0){
-	newcard = 5;
-	if(crate != 9)
-	  newcrate = crate-1;
-	else
-	  newcrate = 17;
-      }
-      else {
-	newcard = 4;
-	newcrate = crate;
-      }
-    }
-  }
-  else {
-    if(card == 0 || card ==2){
+      if (region == 0) {
+        newcard = 5;
+        if (crate != 9)
+          newcrate = crate - 1;
+        else
+          newcrate = 17;
+      } else {
+        newcard = 4;
+        newcrate = crate;
+      }
+    }
+  } else {
+    if (card == 0 || card == 2) {
       newregion = !region;
-      newcard = card+1+2*region;
-      if(crate!=0)
-	newcrate = crate-1;
+      newcard = card + 1 + 2 * region;
+      if (crate != 0)
+        newcrate = crate - 1;
       else
-	newcrate = 8;
-    }
-    else if(card == 1 || card == 3){
+        newcrate = 8;
+    } else if (card == 1 || card == 3) {
       newregion = !region;
-      newcard = card-1+2*region;
+      newcard = card - 1 + 2 * region;
       newcrate = crate;
-    }
-    else if(card == 4){
+    } else if (card == 4) {
       newregion = 1;
-      if(crate != 0)
-	newcrate = crate-1;
+      if (crate != 0)
+        newcrate = crate - 1;
       else
-	newcrate = 8;
-      if(region == 0)
-	newcard = 5;
+        newcrate = 8;
+      if (region == 0)
+        newcard = 5;
       else
-	newcard = 6;
-    }
-    else if(card == 5){
+        newcard = 6;
+    } else if (card == 5) {
       newregion = !region;
       newcrate = crate;
-      if(region == 0)
-	newcard = 4;
+      if (region == 0)
+        newcard = 4;
       else
-	newcard = 6;
-    }
-    else if(card == 6){
+        newcard = 6;
+    } else if (card == 6) {
       newcrate = -1;
       newcard = -1;
       newregion = -1;
diff --git a/L1Trigger/RegionalCaloTrigger/src/L1RCTORCAMap.cc b/L1Trigger/RegionalCaloTrigger/src/L1RCTORCAMap.cc
index 2a6351ae72588..da02a970d986f 100644
--- a/L1Trigger/RegionalCaloTrigger/src/L1RCTORCAMap.cc
+++ b/L1Trigger/RegionalCaloTrigger/src/L1RCTORCAMap.cc
@@ -3,229 +3,219 @@
 #include <vector>
 using std::vector;
 
-L1RCTORCAMap::L1RCTORCAMap(){
-  rawEMET = std::vector<unsigned short>(56*72);
-  rawHDET = std::vector<unsigned short>(56*72);
-  rawEMFG = std::vector<unsigned short>(56*72);
-  rawHDFG = std::vector<unsigned short>(56*72);
-  rawHFET = std::vector<unsigned short>(8*18);
-  combEM = std::vector<unsigned short>(56*72);
-  combHD = std::vector<unsigned short>(56*72);
-
-  barrelData = std::vector<std::vector<std::vector<unsigned short> > >(18,std::vector<std::vector<unsigned short> >(7,
-							   std::vector<unsigned short>(64)));
-  hfData = std::vector<std::vector<unsigned short> >(18,std::vector<unsigned short>(8));
-  
+L1RCTORCAMap::L1RCTORCAMap() {
+  rawEMET = std::vector<unsigned short>(56 * 72);
+  rawHDET = std::vector<unsigned short>(56 * 72);
+  rawEMFG = std::vector<unsigned short>(56 * 72);
+  rawHDFG = std::vector<unsigned short>(56 * 72);
+  rawHFET = std::vector<unsigned short>(8 * 18);
+  combEM = std::vector<unsigned short>(56 * 72);
+  combHD = std::vector<unsigned short>(56 * 72);
+
+  barrelData = std::vector<std::vector<std::vector<unsigned short>>>(
+      18, std::vector<std::vector<unsigned short>>(
+              7, std::vector<unsigned short>(64)));
+  hfData = std::vector<std::vector<unsigned short>>(
+      18, std::vector<unsigned short>(8));
 }
-vector<std::vector<std::vector<unsigned short> > > L1RCTORCAMap::giveBarrel(){
+vector<std::vector<std::vector<unsigned short>>> L1RCTORCAMap::giveBarrel() {
   return barrelData;
 }
 
-vector<std::vector<unsigned short> > L1RCTORCAMap::giveHF(){
-  return hfData;
-}
-void L1RCTORCAMap::makeHFData(){
+vector<std::vector<unsigned short>> L1RCTORCAMap::giveHF() { return hfData; }
+void L1RCTORCAMap::makeHFData() {
   std::vector<unsigned short> crate(16);
-  for(int i = 0; i< 9; i++){
-    for(int j = 0; j<16; j++){
-      crate.at(j) = rawHFET.at(16*i+j);
+  for (int i = 0; i < 9; i++) {
+    for (int j = 0; j < 16; j++) {
+      crate.at(j) = rawHFET.at(16 * i + j);
     }
     hfData.at(i) = crate;
-  }  
-}  
+  }
+}
 
-void L1RCTORCAMap::makeBarrelData(){
+void L1RCTORCAMap::makeBarrelData() {
   std::vector<int> indices;
-  for(int phi = 0; phi<72;phi++){
-    for(int eta = 0; eta<56;eta++){
-      indices = orcamap(eta,phi);
-      (barrelData.at(indices.at(0))).at(indices.at(1)).at(indices.at(2)) = combEM.at(phi*56 + eta);
-      (barrelData.at(indices.at(0))).at(indices.at(1)).at(indices.at(2)+32) = combHD.at(phi*56 + eta);
+  for (int phi = 0; phi < 72; phi++) {
+    for (int eta = 0; eta < 56; eta++) {
+      indices = orcamap(eta, phi);
+      (barrelData.at(indices.at(0))).at(indices.at(1)).at(indices.at(2)) =
+          combEM.at(phi * 56 + eta);
+      (barrelData.at(indices.at(0))).at(indices.at(1)).at(indices.at(2) + 32) =
+          combHD.at(phi * 56 + eta);
     }
   }
 }
 
-void L1RCTORCAMap::readData(const std::vector<unsigned>& emet, const std::vector<unsigned>&  hdet,
-			    const std::vector<bool>& emfg, const std::vector<bool>& hdfg,
-			    const std::vector<unsigned>& hfet){
-  for(int i = 0; i<4032; i++){
+void L1RCTORCAMap::readData(const std::vector<unsigned> &emet,
+                            const std::vector<unsigned> &hdet,
+                            const std::vector<bool> &emfg,
+                            const std::vector<bool> &hdfg,
+                            const std::vector<unsigned> &hfet) {
+  for (int i = 0; i < 4032; i++) {
     rawEMET.at(i) = emet.at(i);
     rawHDET.at(i) = hdet.at(i);
     rawEMFG.at(i) = emfg.at(i);
     rawHDFG.at(i) = hdfg.at(i);
   }
-  for(int i = 0; i<144; i++)
+  for (int i = 0; i < 144; i++)
     rawHFET.at(i) = hfet.at(i);
 
-  combEM = combVec(rawEMET,rawEMFG);
-  combHD = combVec(rawHDET,rawHDFG);
+  combEM = combVec(rawEMET, rawEMFG);
+  combHD = combVec(rawHDET, rawHDFG);
 
   makeBarrelData();
   makeHFData();
 }
 
-unsigned short L1RCTORCAMap::combine(unsigned short et, unsigned short fg){
+unsigned short L1RCTORCAMap::combine(unsigned short et, unsigned short fg) {
   unsigned short newfg = fg << 8;
   return newfg + et;
 }
 
-vector<unsigned short> L1RCTORCAMap::combVec(const std::vector<unsigned short>& et, 
-					     const std::vector<unsigned short>& fg){
-  std::vector<unsigned short> comb(56*72);
-  for(int i = 0; i<(int)et.size(); i++)
-    comb.at(i) = combine(et.at(i),fg.at(i));
+vector<unsigned short>
+L1RCTORCAMap::combVec(const std::vector<unsigned short> &et,
+                      const std::vector<unsigned short> &fg) {
+  std::vector<unsigned short> comb(56 * 72);
+  for (int i = 0; i < (int)et.size(); i++)
+    comb.at(i) = combine(et.at(i), fg.at(i));
   return comb;
 }
 
-vector<int> L1RCTORCAMap::orcamap(int eta, int phi){
+vector<int> L1RCTORCAMap::orcamap(int eta, int phi) {
   int crateNum(20);
-  std::vector<int> cardTower(2,0);
-  std::vector<int> returnVec(3,0);
-  int modEta = eta%28;
-  int modPhi = phi%8;
-  if(phi < 8)
-    crateNum = 0;  
-  else if( phi < 16)
+  std::vector<int> cardTower(2, 0);
+  std::vector<int> returnVec(3, 0);
+  int modEta = eta % 28;
+  int modPhi = phi % 8;
+  if (phi < 8)
+    crateNum = 0;
+  else if (phi < 16)
     crateNum = 1;
-  else if( phi < 24)
+  else if (phi < 24)
     crateNum = 2;
-  else if( phi < 32)
+  else if (phi < 32)
     crateNum = 3;
-  else if( phi < 40)
+  else if (phi < 40)
     crateNum = 4;
-  else if( phi < 48)
+  else if (phi < 48)
     crateNum = 5;
-  else if( phi < 56)
+  else if (phi < 56)
     crateNum = 6;
-  else if( phi < 64)
+  else if (phi < 64)
     crateNum = 7;
-  else if( phi < 72)
+  else if (phi < 72)
     crateNum = 8;
 
-  if(eta < 28)
-    cardTower = lowEtaMap(modEta,modPhi);
+  if (eta < 28)
+    cardTower = lowEtaMap(modEta, modPhi);
   else {
-    cardTower = highEtaMap(modEta,modPhi);
+    cardTower = highEtaMap(modEta, modPhi);
     crateNum = crateNum + 9;
   }
 
   returnVec.at(0) = crateNum;
-  for(int i =0; i<2; i++){
-    returnVec.at(i+1) = cardTower.at(i);
+  for (int i = 0; i < 2; i++) {
+    returnVec.at(i + 1) = cardTower.at(i);
   }
   return returnVec;
 }
-    
 
-vector<int> L1RCTORCAMap::lowEtaMap(int eta, int phi){
+vector<int> L1RCTORCAMap::lowEtaMap(int eta, int phi) {
   int cardnum = 0;
   int towernum = 0;
   std::vector<int> returnVec(2);
-  if(eta < 4){
+  if (eta < 4) {
     cardnum = 6;
-    if(phi < 4)
-      towernum = (3-eta)*4 + phi;
+    if (phi < 4)
+      towernum = (3 - eta) * 4 + phi;
     else
-      towernum = eta*4 + phi + 12;
-  }
-  else if(eta <12){
-    if(phi < 4){
+      towernum = eta * 4 + phi + 12;
+  } else if (eta < 12) {
+    if (phi < 4) {
       cardnum = 4;
-      if(eta < 8)
-	towernum = (7-eta)*4+phi+16;
+      if (eta < 8)
+        towernum = (7 - eta) * 4 + phi + 16;
       else
-	towernum = (11-eta)*4+phi;
-    }
-    else{
+        towernum = (11 - eta) * 4 + phi;
+    } else {
       cardnum = 5;
-      if(eta < 8)
-	towernum = (7-eta)*4+(phi-4)+16;
+      if (eta < 8)
+        towernum = (7 - eta) * 4 + (phi - 4) + 16;
       else
-	towernum = (11-eta)*4+(phi-4);
+        towernum = (11 - eta) * 4 + (phi - 4);
     }
-  }
-  else if(eta < 20){
-    if(phi < 4){
+  } else if (eta < 20) {
+    if (phi < 4) {
       cardnum = 2;
-      if(eta < 16)
-	towernum = (15-eta)*4+phi+16;
+      if (eta < 16)
+        towernum = (15 - eta) * 4 + phi + 16;
       else
-	towernum = (19-eta)*4+phi;
-    }
-    else{
+        towernum = (19 - eta) * 4 + phi;
+    } else {
       cardnum = 3;
-      if(eta < 16)
-	towernum = (15-eta)*4+(phi-4)+16;
+      if (eta < 16)
+        towernum = (15 - eta) * 4 + (phi - 4) + 16;
       else
-	towernum = (19-eta)*4+(phi-4);
+        towernum = (19 - eta) * 4 + (phi - 4);
     }
-  }
-  else if(eta < 28){
-    if(phi < 4){
+  } else if (eta < 28) {
+    if (phi < 4) {
       cardnum = 0;
-      if(eta < 24)
-	towernum = (23-eta)*4+phi+16;
+      if (eta < 24)
+        towernum = (23 - eta) * 4 + phi + 16;
       else
-	towernum = (27-eta)*4+phi;
-    }
-    else{
+        towernum = (27 - eta) * 4 + phi;
+    } else {
       cardnum = 1;
-      if(eta < 24)
-	towernum = (23-eta)*4+(phi-4)+16;
+      if (eta < 24)
+        towernum = (23 - eta) * 4 + (phi - 4) + 16;
       else
-	towernum = (27-eta)*4+(phi-4);
+        towernum = (27 - eta) * 4 + (phi - 4);
     }
   }
-  
+
   returnVec.at(0) = cardnum;
   returnVec.at(1) = towernum;
   return returnVec;
 }
 
-
-vector<int> L1RCTORCAMap::highEtaMap(int eta, int phi){
+vector<int> L1RCTORCAMap::highEtaMap(int eta, int phi) {
   int cardnum;
   int towernum;
   std::vector<int> returnVec(2);
-  if(eta < 8){
-    if(phi < 4){
+  if (eta < 8) {
+    if (phi < 4) {
       cardnum = 0;
-      towernum = eta*4+phi;
-    }
-    else{
+      towernum = eta * 4 + phi;
+    } else {
       cardnum = 1;
-      towernum = eta*4+(phi-4);
+      towernum = eta * 4 + (phi - 4);
     }
-  }
-  else if(eta < 16){
-    if(phi < 4){
+  } else if (eta < 16) {
+    if (phi < 4) {
       cardnum = 2;
-      towernum = (eta-8)*4+phi;
-    }
-    else{
+      towernum = (eta - 8) * 4 + phi;
+    } else {
       cardnum = 3;
-      towernum = (eta-8)*4+(phi-4);
+      towernum = (eta - 8) * 4 + (phi - 4);
     }
-  }
-  else if(eta < 24){
-    if(phi < 4){
+  } else if (eta < 24) {
+    if (phi < 4) {
       cardnum = 4;
-      towernum = (eta-16)*4+phi;
-    }
-    else{
+      towernum = (eta - 16) * 4 + phi;
+    } else {
       cardnum = 5;
-      towernum = (eta-16)*4+(phi-4);
+      towernum = (eta - 16) * 4 + (phi - 4);
     }
-  }
-  else{
+  } else {
     cardnum = 6;
-    if(phi < 4)
-      towernum = (27-eta)*4+phi;
+    if (phi < 4)
+      towernum = (27 - eta) * 4 + phi;
     else
-      towernum = (27-eta)*4+phi+12;
+      towernum = (27 - eta) * 4 + phi + 12;
   }
 
-  returnVec.at(0)=cardnum;
-  returnVec.at(1)=towernum;
+  returnVec.at(0) = cardnum;
+  returnVec.at(1) = towernum;
   return returnVec;
 }
diff --git a/L1Trigger/RegionalCaloTrigger/src/L1RCTReceiverCard.cc b/L1Trigger/RegionalCaloTrigger/src/L1RCTReceiverCard.cc
index c08061ff9bc44..be9355259c60a 100644
--- a/L1Trigger/RegionalCaloTrigger/src/L1RCTReceiverCard.cc
+++ b/L1Trigger/RegionalCaloTrigger/src/L1RCTReceiverCard.cc
@@ -1,5 +1,5 @@
-#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTReceiverCard.h"
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h"
+#include "L1Trigger/RegionalCaloTrigger/interface/L1RCTReceiverCard.h"
 
 #include <vector>
 using std::vector;
@@ -8,54 +8,52 @@ using std::vector;
 using std::bitset;
 
 #include <iostream>
-using std::cout;
 using std::cerr;
+using std::cout;
 using std::endl;
 
 #include <string>
 using std::string;
 
-L1RCTReceiverCard::L1RCTReceiverCard(int crateNumber,int cardNumber, const L1RCTLookupTables* rctLookupTables) :
-  regions(2),crtNo(crateNumber),cardNo(cardNumber),
-  rctLookupTables_(rctLookupTables),
-  etIn10Bits(2), overFlowBits(2),muonBits(2),tauBits(2)
-{
-}
+L1RCTReceiverCard::L1RCTReceiverCard(int crateNumber, int cardNumber,
+                                     const L1RCTLookupTables *rctLookupTables)
+    : regions(2), crtNo(crateNumber), cardNo(cardNumber),
+      rctLookupTables_(rctLookupTables), etIn10Bits(2), overFlowBits(2),
+      muonBits(2), tauBits(2) {}
 
-L1RCTReceiverCard::~L1RCTReceiverCard(){}
+L1RCTReceiverCard::~L1RCTReceiverCard() {}
 
-void L1RCTReceiverCard::randomInput(){
+void L1RCTReceiverCard::randomInput() {
   std::vector<unsigned short> input(64);
-  for(int i = 0; i<64;i++)
-    input.at(i) = rand()&511;
+  for (int i = 0; i < 64; i++)
+    input.at(i) = rand() & 511;
   fillInput(input);
 }
 
-void L1RCTReceiverCard::fileInput(char* filename){
+void L1RCTReceiverCard::fileInput(char *filename) {
   std::vector<unsigned short> input(64);
   unsigned short x;
   std::ifstream instream(filename);
-  if(instream){
-    for(int i = 0; i<64; i++){
-      if(!(instream >> x))
-	break;
+  if (instream) {
+    for (int i = 0; i < 64; i++) {
+      if (!(instream >> x))
+        break;
       else
-	input.at(i) = x;
+        input.at(i) = x;
     }
   }
   fillInput(input);
 }
 
-
-//First layer is ecal the second is hcal.
-//goes in order of (for crate 0,card 0)
+// First layer is ecal the second is hcal.
+// goes in order of (for crate 0,card 0)
 // (Region 1)   (Region 0)
 // 28 24 20 16 12 08 04 00
 // 29 25 21 17 13 09 05 01
 // 30 26 22 18 14 10 06 02
-// 31 27 23 19 15 11 07 03 
+// 31 27 23 19 15 11 07 03
 //
-// For card 6 of crate 0 it would look like 
+// For card 6 of crate 0 it would look like
 //
 // 12 08 04 00
 // 13 09 05 01
@@ -66,109 +64,99 @@ void L1RCTReceiverCard::fileInput(char* filename){
 // 18 22 26 30
 // 19 23 27 31
 
+void L1RCTReceiverCard::fillInput(const std::vector<unsigned short> &input) {
 
-void L1RCTReceiverCard::fillInput(const std::vector<unsigned short>& input){
-  
   std::vector<unsigned short> ecalInput(32);
   std::vector<unsigned short> ecalFG(32);
   std::vector<unsigned short> hcalInput(32);
   std::vector<unsigned short> hcalMuon(32);
 
-  for(int i = 0; i<32; i++){
-    ecalInput.at(i) = input.at(i)/2;
+  for (int i = 0; i < 32; i++) {
+    ecalInput.at(i) = input.at(i) / 2;
     ecalFG.at(i) = input.at(i) & 1;
-    hcalInput.at(i) = input.at(i+32)/2;
-    hcalMuon.at(i) = input.at(i+32) & 1;
-    unsigned long lookup = rctLookupTables_->lookup(ecalInput.at(i),hcalInput.at(i),ecalFG.at(i),crtNo, cardNo, i); // tower number 0-31 now
-    unsigned short etIn7Bits = lookup&127;
-    unsigned short etIn9Bits = (lookup >> 8)&511;
-    unsigned short HE_FGBit = (lookup>>7)&1;
-    unsigned short activityBit = (lookup>>17)&1;
+    hcalInput.at(i) = input.at(i + 32) / 2;
+    hcalMuon.at(i) = input.at(i + 32) & 1;
+    unsigned long lookup =
+        rctLookupTables_->lookup(ecalInput.at(i), hcalInput.at(i), ecalFG.at(i),
+                                 crtNo, cardNo, i); // tower number 0-31 now
+    unsigned short etIn7Bits = lookup & 127;
+    unsigned short etIn9Bits = (lookup >> 8) & 511;
+    unsigned short HE_FGBit = (lookup >> 7) & 1;
+    unsigned short activityBit = (lookup >> 17) & 1;
     std::vector<unsigned short> indices = towerToRegionMap(i);
     unsigned short r = indices.at(0);
     unsigned short row = indices.at(1);
     unsigned short col = indices.at(2);
-    regions.at(r).setEtIn7Bits(row,col,etIn7Bits);
-    regions.at(r).setEtIn9Bits(row,col,etIn9Bits);
-    regions.at(r).setHE_FGBit(row,col,HE_FGBit);
-    regions.at(r).setMuonBit(row,col,hcalMuon.at(i));
-    regions.at(r).setActivityBit(row,col,activityBit);
+    regions.at(r).setEtIn7Bits(row, col, etIn7Bits);
+    regions.at(r).setEtIn9Bits(row, col, etIn9Bits);
+    regions.at(r).setHE_FGBit(row, col, HE_FGBit);
+    regions.at(r).setMuonBit(row, col, hcalMuon.at(i));
+    regions.at(r).setActivityBit(row, col, activityBit);
   }
-
 }
 
-
-vector<unsigned short> L1RCTReceiverCard::towerToRegionMap(int towernum){
+vector<unsigned short> L1RCTReceiverCard::towerToRegionMap(int towernum) {
   std::vector<unsigned short> returnVec(3);
   unsigned short region;
   unsigned short towerrow;
   unsigned short towercol;
-  if(crtNo <9){
-    if(cardNo != 6){
-      if(towernum < 16){
-	region = 0;
-	towerrow = towernum%4;
-	towercol = 3-(towernum/4);
+  if (crtNo < 9) {
+    if (cardNo != 6) {
+      if (towernum < 16) {
+        region = 0;
+        towerrow = towernum % 4;
+        towercol = 3 - (towernum / 4);
+      } else {
+        region = 1;
+        towerrow = towernum % 4;
+        towercol = 7 - (towernum / 4);
       }
-      else{
-	region = 1;
-	towerrow = towernum%4;
-	towercol = 7-(towernum/4);
+    } else {
+      if (towernum < 16) {
+        region = 0;
+        towerrow = towernum % 4;
+        towercol = 3 - (towernum / 4);
+      } else {
+        region = 1;
+        towerrow = towernum % 4;
+        towercol = (towernum / 4) - 4;
       }
     }
-    else{
-      if(towernum < 16){
-	region = 0;
-	towerrow = towernum%4;
-	towercol = 3-(towernum/4);
+  } else {
+    if (cardNo != 6) {
+      if (towernum < 16) {
+        region = 0;
+        towerrow = towernum % 4;
+        towercol = towernum / 4;
+      } else {
+        region = 1;
+        towerrow = towernum % 4;
+        towercol = (towernum / 4) - 4;
       }
-      else{
-	region = 1;
-	towerrow = towernum%4;
-	towercol = (towernum/4)-4;
+    } else {
+      if (towernum < 16) {
+        region = 0;
+        towerrow = towernum % 4;
+        towercol = towernum / 4;
+      } else {
+        region = 1;
+        towerrow = towernum % 4;
+        towercol = 7 - (towernum / 4);
       }
     }
   }
-  else{
-    if(cardNo != 6){
-      if(towernum < 16){
-	region = 0;
-	towerrow = towernum%4;
-	towercol = towernum/4;
-      }
-      else{
-	region = 1;
-	towerrow = towernum%4;
-	towercol = (towernum/4)-4;
-      }
-    }
-    else{
-      if(towernum < 16){
-	region = 0;
-	towerrow = towernum%4;
-	towercol = towernum/4;
-      }
-      else{
-	region = 1;
-	towerrow = towernum%4;
-	towercol = 7-(towernum/4);
-      }
-    }
-  }
-  returnVec.at(0)=region;
-  returnVec.at(1)=towerrow;
-  returnVec.at(2)=towercol;
+  returnVec.at(0) = region;
+  returnVec.at(1) = towerrow;
+  returnVec.at(2) = towercol;
   return returnVec;
-}    
-  
-
+}
 
-void L1RCTReceiverCard::fillTauBits(){
-  for(int i = 0; i<2; i++)
+void L1RCTReceiverCard::fillTauBits() {
+  for (int i = 0; i < 2; i++)
     tauBits.at(i) = calcTauBit(regions.at(i));
 }
 
-unsigned short L1RCTReceiverCard::calcTauBit(L1RCTRegion region){
+unsigned short L1RCTReceiverCard::calcTauBit(L1RCTRegion region) {
   bitset<4> etaPattern;
   bitset<4> phiPattern;
 
@@ -181,27 +169,29 @@ unsigned short L1RCTReceiverCard::calcTauBit(L1RCTRegion region){
   bitset<4> badPattern14(string("1110"));
   bitset<4> badPattern15(string("1111"));
 
-  for(int i = 0; i<4; i++){
-    phiPattern[i] = region.getActivityBit(i,0) || region.getActivityBit(i,1) ||
-      region.getActivityBit(i,2) || region.getActivityBit(i,3);
-    etaPattern[i] = region.getActivityBit(0,i) || region.getActivityBit(1,i) ||
-      region.getActivityBit(2,i) || region.getActivityBit(3,i);
+  for (int i = 0; i < 4; i++) {
+    phiPattern[i] = region.getActivityBit(i, 0) ||
+                    region.getActivityBit(i, 1) ||
+                    region.getActivityBit(i, 2) || region.getActivityBit(i, 3);
+    etaPattern[i] = region.getActivityBit(0, i) ||
+                    region.getActivityBit(1, i) ||
+                    region.getActivityBit(2, i) || region.getActivityBit(3, i);
   }
 
   bool answer;
-  
-  if(etaPattern != badPattern5 && etaPattern != badPattern7 && 
-     etaPattern != badPattern10 && etaPattern != badPattern11 &&
-     etaPattern != badPattern13 && etaPattern != badPattern14 &&
-     etaPattern != badPattern15 && phiPattern != badPattern5 && 
-     phiPattern != badPattern7 && phiPattern != badPattern10 && 
-     phiPattern != badPattern11 && phiPattern != badPattern13 && 
-     phiPattern != badPattern14 && phiPattern != badPattern15 &&
-     etaPattern != badPattern9 && phiPattern != badPattern9){       // adding in "9"
-    //return false;
+
+  if (etaPattern != badPattern5 && etaPattern != badPattern7 &&
+      etaPattern != badPattern10 && etaPattern != badPattern11 &&
+      etaPattern != badPattern13 && etaPattern != badPattern14 &&
+      etaPattern != badPattern15 && phiPattern != badPattern5 &&
+      phiPattern != badPattern7 && phiPattern != badPattern10 &&
+      phiPattern != badPattern11 && phiPattern != badPattern13 &&
+      phiPattern != badPattern14 && phiPattern != badPattern15 &&
+      etaPattern != badPattern9 && phiPattern != badPattern9) { // adding in "9"
+    // return false;
     answer = false;
   }
-  //else return true;
+  // else return true;
   else {
     answer = true;
   }
@@ -209,53 +199,52 @@ unsigned short L1RCTReceiverCard::calcTauBit(L1RCTRegion region){
   return answer;
 }
 
-void L1RCTReceiverCard::fillRegionSums(){
-  for(int i = 0; i<2; i++){
-    etIn10Bits.at(i) = (calcRegionSum(regions.at(i)))/2;
+void L1RCTReceiverCard::fillRegionSums() {
+  for (int i = 0; i < 2; i++) {
+    etIn10Bits.at(i) = (calcRegionSum(regions.at(i))) / 2;
     overFlowBits.at(i) = (calcRegionSum(regions.at(i)) & 1);
   }
 }
 
-unsigned short L1RCTReceiverCard::calcRegionSum(L1RCTRegion region){
+unsigned short L1RCTReceiverCard::calcRegionSum(L1RCTRegion region) {
   unsigned short sum = 0;
   unsigned short overflow = 0;
-  for(int i = 0; i<4; i++){
-    for(int j = 0; j<4; j++){
-      unsigned short towerEt = region.getEtIn9Bits(i,j);
+  for (int i = 0; i < 4; i++) {
+    for (int j = 0; j < 4; j++) {
+      unsigned short towerEt = region.getEtIn9Bits(i, j);
       // If tower is saturated, peg the region to max value
-      //if(towerEt == 0x1FF) sum = 0x3FF;  // HARDWARE DOESN'T DO THIS!!
-      //else 
+      // if(towerEt == 0x1FF) sum = 0x3FF;  // HARDWARE DOESN'T DO THIS!!
+      // else
       sum = sum + towerEt;
     }
   }
-  if(sum > 1023){
+  if (sum > 1023) {
     sum = 1023;
     overflow = 1;
   }
-  unsigned short sumFullInfo = sum*2 + overflow;
+  unsigned short sumFullInfo = sum * 2 + overflow;
   return sumFullInfo;
 }
 
-void L1RCTReceiverCard::fillMuonBits(){
-  for(int i = 0; i<2; i++)
+void L1RCTReceiverCard::fillMuonBits() {
+  for (int i = 0; i < 2; i++)
     muonBits.at(i) = calcMuonBit(regions.at(i));
 }
 
-unsigned short L1RCTReceiverCard::calcMuonBit(L1RCTRegion region){
+unsigned short L1RCTReceiverCard::calcMuonBit(L1RCTRegion region) {
   unsigned short muonBit = 0;
-  for(int i = 0; i<4; i++){
-    for(int j = 0; j<4; j++){
-      muonBit = muonBit || region.getMuonBit(i,j);
+  for (int i = 0; i < 4; i++) {
+    for (int j = 0; j < 4; j++) {
+      muonBit = muonBit || region.getMuonBit(i, j);
     }
   }
   return muonBit;
-
 }
 
-void L1RCTReceiverCard::print(){
-  std::cout <<"Receiver Card " << cardNo << " in Crate " << crtNo <<std::endl;
+void L1RCTReceiverCard::print() {
+  std::cout << "Receiver Card " << cardNo << " in Crate " << crtNo << std::endl;
 
-  for(int i=0;i<2;i++){
+  for (int i = 0; i < 2; i++) {
     std::cout << "Region " << i << " information" << std::endl;
     regions.at(i).print();
     std::cout << "Region Et sum " << etIn10Bits.at(i) << std::endl;
diff --git a/L1Trigger/RegionalCaloTrigger/src/L1RCTRegion.cc b/L1Trigger/RegionalCaloTrigger/src/L1RCTRegion.cc
index 9752f08e23657..b027642dd4961 100644
--- a/L1Trigger/RegionalCaloTrigger/src/L1RCTRegion.cc
+++ b/L1Trigger/RegionalCaloTrigger/src/L1RCTRegion.cc
@@ -4,307 +4,279 @@
 using std::vector;
 
 #include <iostream>
-using std::cout;
 using std::cerr;
+using std::cout;
 using std::endl;
 
-L1RCTRegion::L1RCTRegion() : totalRegionEt(36),
-			     totalRegionHE_FG(36),
-			     etIn9Bits(16),
-			     muonBit(16),
-			     activityBit(16)
-{
-}
-
+L1RCTRegion::L1RCTRegion()
+    : totalRegionEt(36), totalRegionHE_FG(36), etIn9Bits(16), muonBit(16),
+      activityBit(16) {}
 
-L1RCTRegion::~L1RCTRegion()
-{}
+L1RCTRegion::~L1RCTRegion() {}
 
-//So the whole point of the following two functions is that they provide
-//an interface to the "real" 4x4 region 7 bit energies and h/e||fg bits
-//that are used in electron finding.  
-//Now, you actually *can* give them arguments ranging from -1 to 4 
-//representing the outer neighbors.
-//This is actually quite helpful and allows you to write the electronfinding
-//algorithm in the same form no matter what tower you're centered on.
+// So the whole point of the following two functions is that they provide
+// an interface to the "real" 4x4 region 7 bit energies and h/e||fg bits
+// that are used in electron finding.
+// Now, you actually *can* give them arguments ranging from -1 to 4
+// representing the outer neighbors.
+// This is actually quite helpful and allows you to write the electronfinding
+// algorithm in the same form no matter what tower you're centered on.
 //
-//As a reminder i is row and j is column, just like matrices.
-//row -1 is the northern neighbors and column -1 is the western neighbors
-unsigned short L1RCTRegion::getEtIn7Bits(int i, int j) const{
-  //i & j run 0-3
-  return totalRegionEt.at(6*(i+1) + j+1);
+// As a reminder i is row and j is column, just like matrices.
+// row -1 is the northern neighbors and column -1 is the western neighbors
+unsigned short L1RCTRegion::getEtIn7Bits(int i, int j) const {
+  // i & j run 0-3
+  return totalRegionEt.at(6 * (i + 1) + j + 1);
 }
 
-void L1RCTRegion::setEtIn7Bits(int i, int j,unsigned short energy){
-  //i & j should be 0-3
-  if(energy <= 127)
-    totalRegionEt.at(6*(i+1) + j+1) = energy;
+void L1RCTRegion::setEtIn7Bits(int i, int j, unsigned short energy) {
+  // i & j should be 0-3
+  if (energy <= 127)
+    totalRegionEt.at(6 * (i + 1) + j + 1) = energy;
   else
-    totalRegionEt.at(6*(i+1) + j+1) = 127;
+    totalRegionEt.at(6 * (i + 1) + j + 1) = 127;
 }
 
-
-unsigned short L1RCTRegion::getHE_FGBit(int i, int j) const{
-  return totalRegionHE_FG.at(6*(i+1)+j+1);
+unsigned short L1RCTRegion::getHE_FGBit(int i, int j) const {
+  return totalRegionHE_FG.at(6 * (i + 1) + j + 1);
 }
 
-void L1RCTRegion::setHE_FGBit(int i, int j, unsigned short HE_FG){
-  totalRegionHE_FG.at(6*(i+1)+j+1) = HE_FG;
+void L1RCTRegion::setHE_FGBit(int i, int j, unsigned short HE_FG) {
+  totalRegionHE_FG.at(6 * (i + 1) + j + 1) = HE_FG;
 }
 
-
-//The rest of the data stored in a region only works if i and j are
-//in the 0-3 range.  The arrays truly are 4x4 and will signal an error
-//if misused thanks to the vector function .at
-unsigned short L1RCTRegion::getEtIn9Bits(int i, int j) const{
-  return etIn9Bits.at(4*i + j);
+// The rest of the data stored in a region only works if i and j are
+// in the 0-3 range.  The arrays truly are 4x4 and will signal an error
+// if misused thanks to the vector function .at
+unsigned short L1RCTRegion::getEtIn9Bits(int i, int j) const {
+  return etIn9Bits.at(4 * i + j);
 }
 
-void L1RCTRegion::setEtIn9Bits(int i, int j,unsigned short energy){
-  if(energy <=511)
-    etIn9Bits.at(4*i+j) = energy;
-  else 
-    etIn9Bits.at(4*i+j) = 511;
+void L1RCTRegion::setEtIn9Bits(int i, int j, unsigned short energy) {
+  if (energy <= 511)
+    etIn9Bits.at(4 * i + j) = energy;
+  else
+    etIn9Bits.at(4 * i + j) = 511;
 }
 
-unsigned short L1RCTRegion::getMuonBit(int i, int j) const{
-  return muonBit.at(4*i+j);
+unsigned short L1RCTRegion::getMuonBit(int i, int j) const {
+  return muonBit.at(4 * i + j);
 }
 
-void L1RCTRegion::setMuonBit(int i, int j,unsigned short muon) {
-  muonBit.at(4*i+j) = muon;
+void L1RCTRegion::setMuonBit(int i, int j, unsigned short muon) {
+  muonBit.at(4 * i + j) = muon;
 }
 
-void L1RCTRegion::setActivityBit(int i, int j, unsigned short activity){
-  activityBit.at(4*i+j) = activity;
+void L1RCTRegion::setActivityBit(int i, int j, unsigned short activity) {
+  activityBit.at(4 * i + j) = activity;
 }
 
-unsigned short L1RCTRegion::getActivityBit(int i, int j) const{
-  return activityBit.at(4*i+j);
+unsigned short L1RCTRegion::getActivityBit(int i, int j) const {
+  return activityBit.at(4 * i + j);
 }
 
-//The following list of give and set functions are the core
-//of the work for neighbor sharing swept under the rug.
-//Basically, the way it works is that "give" methods return
-//what would be the appropriate neighbor information so that you can
-//use the set methods on the other region in order to set the neighbor
-//information.  For example, r0:crate 0 card 0 region 0 is the northern
-//neighbor of r1:crate 0 card 1 region 0.  Then to set the northern
-//neighbor information you call r1.setNorthEt(r0.getNorthEt())
-//That's why it's give insted of get.  It doesn't return the region's
-//northern neighbor information, it returns what would be its southern
-//neighbor's northern neighbor information.
-vector<unsigned short> L1RCTRegion::giveNorthEt() const{
+// The following list of give and set functions are the core
+// of the work for neighbor sharing swept under the rug.
+// Basically, the way it works is that "give" methods return
+// what would be the appropriate neighbor information so that you can
+// use the set methods on the other region in order to set the neighbor
+// information.  For example, r0:crate 0 card 0 region 0 is the northern
+// neighbor of r1:crate 0 card 1 region 0.  Then to set the northern
+// neighbor information you call r1.setNorthEt(r0.getNorthEt())
+// That's why it's give insted of get.  It doesn't return the region's
+// northern neighbor information, it returns what would be its southern
+// neighbor's northern neighbor information.
+vector<unsigned short> L1RCTRegion::giveNorthEt() const {
   std::vector<unsigned short> north(4);
-  for(int i = 0; i<4;i++)
-    north.at(i) = getEtIn7Bits(3,i);
+  for (int i = 0; i < 4; i++)
+    north.at(i) = getEtIn7Bits(3, i);
   return north;
 }
-void L1RCTRegion::setNorthEt(const std::vector<unsigned short>& north) {
-  for(int i = 0; i<4; i++)
-    totalRegionEt.at(i+1) = north.at(i);
+void L1RCTRegion::setNorthEt(const std::vector<unsigned short> &north) {
+  for (int i = 0; i < 4; i++)
+    totalRegionEt.at(i + 1) = north.at(i);
 }
-vector<unsigned short> L1RCTRegion::giveNorthHE_FG() const{
+vector<unsigned short> L1RCTRegion::giveNorthHE_FG() const {
   std::vector<unsigned short> north(4);
-  for(int i = 0; i<4; i++)
-    north.at(i) = getHE_FGBit(3,i);
+  for (int i = 0; i < 4; i++)
+    north.at(i) = getHE_FGBit(3, i);
   return north;
 }
-void L1RCTRegion::setNorthHE_FG(const std::vector<unsigned short>& north){
-  for(int i = 0; i<4; i++)
-    totalRegionHE_FG.at(i+1) = north.at(i);
+void L1RCTRegion::setNorthHE_FG(const std::vector<unsigned short> &north) {
+  for (int i = 0; i < 4; i++)
+    totalRegionHE_FG.at(i + 1) = north.at(i);
 }
 
-vector<unsigned short> L1RCTRegion::giveSouthEt() const{
+vector<unsigned short> L1RCTRegion::giveSouthEt() const {
   std::vector<unsigned short> south(4);
-  for(int i = 0; i<4; i++)
-    south.at(i) = getEtIn7Bits(0,i);
+  for (int i = 0; i < 4; i++)
+    south.at(i) = getEtIn7Bits(0, i);
   return south;
 }
-void L1RCTRegion::setSouthEt(const std::vector<unsigned short>& south){
-  for(int i = 0; i<4; i++)
-    totalRegionEt.at(31+i) = south.at(i);
+void L1RCTRegion::setSouthEt(const std::vector<unsigned short> &south) {
+  for (int i = 0; i < 4; i++)
+    totalRegionEt.at(31 + i) = south.at(i);
 }
 
-vector<unsigned short> L1RCTRegion::giveSouthHE_FG() const{
+vector<unsigned short> L1RCTRegion::giveSouthHE_FG() const {
   std::vector<unsigned short> south(4);
-  for(int i = 0; i<4; i++)
-    south.at(i) = getHE_FGBit(0,i);
+  for (int i = 0; i < 4; i++)
+    south.at(i) = getHE_FGBit(0, i);
   return south;
 }
-void L1RCTRegion::setSouthHE_FG(const std::vector<unsigned short>& south){
-  for(int i=0; i<4; i++)
-    totalRegionHE_FG.at(31+i) = south.at(i);
+void L1RCTRegion::setSouthHE_FG(const std::vector<unsigned short> &south) {
+  for (int i = 0; i < 4; i++)
+    totalRegionHE_FG.at(31 + i) = south.at(i);
 }
 
-vector<unsigned short> L1RCTRegion::giveWestEt() const{
+vector<unsigned short> L1RCTRegion::giveWestEt() const {
   std::vector<unsigned short> west(4);
-  for(int i =0; i<4; i++)
-    west.at(i) = getEtIn7Bits(i,3);
+  for (int i = 0; i < 4; i++)
+    west.at(i) = getEtIn7Bits(i, 3);
   return west;
 }
-void L1RCTRegion::setWestEt(const std::vector<unsigned short>& west){
-  for(int i = 0; i<4; i++)
-    totalRegionEt.at(6*(i+1)) = west.at(i);
+void L1RCTRegion::setWestEt(const std::vector<unsigned short> &west) {
+  for (int i = 0; i < 4; i++)
+    totalRegionEt.at(6 * (i + 1)) = west.at(i);
 }
 
-vector<unsigned short> L1RCTRegion::giveWestHE_FG() const{
+vector<unsigned short> L1RCTRegion::giveWestHE_FG() const {
   std::vector<unsigned short> west(4);
-  for(int i = 0; i<4; i++)
-    west.at(i) = getHE_FGBit(i,3);
+  for (int i = 0; i < 4; i++)
+    west.at(i) = getHE_FGBit(i, 3);
   return west;
 }
-void L1RCTRegion::setWestHE_FG(const std::vector<unsigned short>& west){
-  for(int i = 0; i<4; i++)
-    totalRegionHE_FG.at(6*(i+1)) = west.at(i);
+void L1RCTRegion::setWestHE_FG(const std::vector<unsigned short> &west) {
+  for (int i = 0; i < 4; i++)
+    totalRegionHE_FG.at(6 * (i + 1)) = west.at(i);
 }
 
-vector<unsigned short> L1RCTRegion::giveEastEt() const{
+vector<unsigned short> L1RCTRegion::giveEastEt() const {
   std::vector<unsigned short> east(4);
-  for(int i = 0; i<4; i++)
-    east.at(i) = getEtIn7Bits(i,0);
+  for (int i = 0; i < 4; i++)
+    east.at(i) = getEtIn7Bits(i, 0);
   return east;
 }
-void L1RCTRegion::setEastEt(const std::vector<unsigned short>& east){
-  for(int i = 0; i<4; i++)
-    totalRegionEt.at(6*(i+1) + 5) = east.at(i);
+void L1RCTRegion::setEastEt(const std::vector<unsigned short> &east) {
+  for (int i = 0; i < 4; i++)
+    totalRegionEt.at(6 * (i + 1) + 5) = east.at(i);
 }
 
-vector<unsigned short> L1RCTRegion::giveEastHE_FG() const{
+vector<unsigned short> L1RCTRegion::giveEastHE_FG() const {
   std::vector<unsigned short> east(4);
-  for(int i = 0; i<4; i++)
-    east.at(i) = getHE_FGBit(i,0);
+  for (int i = 0; i < 4; i++)
+    east.at(i) = getHE_FGBit(i, 0);
   return east;
 }
-void L1RCTRegion::setEastHE_FG(const std::vector<unsigned short>& east){
-  for(int i = 0; i<4; i++)
-    totalRegionHE_FG.at(6*(i+1) + 5) = east.at(i);
+void L1RCTRegion::setEastHE_FG(const std::vector<unsigned short> &east) {
+  for (int i = 0; i < 4; i++)
+    totalRegionHE_FG.at(6 * (i + 1) + 5) = east.at(i);
 }
 
-unsigned short L1RCTRegion::giveNEEt() const{
-  unsigned short et = getEtIn7Bits(3,0);
-  if(et > 7)
+unsigned short L1RCTRegion::giveNEEt() const {
+  unsigned short et = getEtIn7Bits(3, 0);
+  if (et > 7)
     return 7;
   else
     return et;
 }
-unsigned short L1RCTRegion::giveNEHE_FG() const{
-  return getHE_FGBit(3,0);
-}
-void L1RCTRegion::setNEEt(unsigned short ne){
-  totalRegionEt.at(5) = ne;
-}
-void L1RCTRegion::setNEHE_FG(unsigned short ne){
-  totalRegionHE_FG.at(5) = ne;
-}
+unsigned short L1RCTRegion::giveNEHE_FG() const { return getHE_FGBit(3, 0); }
+void L1RCTRegion::setNEEt(unsigned short ne) { totalRegionEt.at(5) = ne; }
+void L1RCTRegion::setNEHE_FG(unsigned short ne) { totalRegionHE_FG.at(5) = ne; }
 
-unsigned short L1RCTRegion::giveNWEt() const{
-  unsigned short et = getEtIn7Bits(3,3);
-  if(et > 7)
+unsigned short L1RCTRegion::giveNWEt() const {
+  unsigned short et = getEtIn7Bits(3, 3);
+  if (et > 7)
     return 7;
-  else 
+  else
     return et;
 }
-unsigned short L1RCTRegion::giveNWHE_FG() const{
-  return getHE_FGBit(3,3);
-}
-void L1RCTRegion::setNWEt(unsigned short nw){
-  totalRegionEt.at(0) = nw;
-}
-void L1RCTRegion::setNWHE_FG(unsigned short nw){
-  totalRegionHE_FG.at(0) = nw;
-}
+unsigned short L1RCTRegion::giveNWHE_FG() const { return getHE_FGBit(3, 3); }
+void L1RCTRegion::setNWEt(unsigned short nw) { totalRegionEt.at(0) = nw; }
+void L1RCTRegion::setNWHE_FG(unsigned short nw) { totalRegionHE_FG.at(0) = nw; }
 
-unsigned short L1RCTRegion::giveSWEt() const{
-  unsigned short et = getEtIn7Bits(0,3);
-  if(et > 7)
+unsigned short L1RCTRegion::giveSWEt() const {
+  unsigned short et = getEtIn7Bits(0, 3);
+  if (et > 7)
     return 7;
   else
     return et;
 }
-unsigned short L1RCTRegion::giveSWHE_FG() const{
-  return getHE_FGBit(0,3);
-}
-void L1RCTRegion::setSWEt(unsigned short sw){
-  totalRegionEt.at(30) = sw;
-}
-void L1RCTRegion::setSWHE_FG(unsigned short sw){
+unsigned short L1RCTRegion::giveSWHE_FG() const { return getHE_FGBit(0, 3); }
+void L1RCTRegion::setSWEt(unsigned short sw) { totalRegionEt.at(30) = sw; }
+void L1RCTRegion::setSWHE_FG(unsigned short sw) {
   totalRegionHE_FG.at(30) = sw;
 }
 
-unsigned short L1RCTRegion::giveSEEt() const{
-  unsigned short et = getEtIn7Bits(0,0);
-  if(et > 7)
+unsigned short L1RCTRegion::giveSEEt() const {
+  unsigned short et = getEtIn7Bits(0, 0);
+  if (et > 7)
     return 7;
   else
     return et;
 }
-unsigned short L1RCTRegion::giveSEHE_FG() const{
-  return getHE_FGBit(0,0);
-}
-void L1RCTRegion::setSEEt(unsigned short se) {
-  totalRegionEt.at(35) = se;
-}
+unsigned short L1RCTRegion::giveSEHE_FG() const { return getHE_FGBit(0, 0); }
+void L1RCTRegion::setSEEt(unsigned short se) { totalRegionEt.at(35) = se; }
 void L1RCTRegion::setSEHE_FG(unsigned short se) {
   totalRegionHE_FG.at(35) = se;
 }
 
 void L1RCTRegion::print() {
-  
+
   std::cout << " 7 Bit Energies ";
-  for(int i = 0; i<4; i++){
+  for (int i = 0; i < 4; i++) {
     std::cout << std::endl;
-    for(int j = 0; j<4; j++){
-      std::cout << " " << getEtIn7Bits(i,j) << " ";
+    for (int j = 0; j < 4; j++) {
+      std::cout << " " << getEtIn7Bits(i, j) << " ";
     }
   }
 
   std::cout << std::endl << std::endl;
   std::cout << " 9 Bit Energies ";
-  for(int i = 0; i<4; i++){
+  for (int i = 0; i < 4; i++) {
     std::cout << std::endl;
-    for(int j = 0; j<4; j++){
-      std::cout << " " << getEtIn9Bits(i,j) << " ";
+    for (int j = 0; j < 4; j++) {
+      std::cout << " " << getEtIn9Bits(i, j) << " ";
     }
   }
-  
+
   std::cout << std::endl << std::endl;
   std::cout << " HE || FG bit ";
-  for(int i = 0; i<4; i++){
+  for (int i = 0; i < 4; i++) {
     std::cout << std::endl;
-    for(int j = 0; j<4; j++){
-      std::cout << " " << getHE_FGBit(i,j) << " ";
+    for (int j = 0; j < 4; j++) {
+      std::cout << " " << getHE_FGBit(i, j) << " ";
     }
   }
 
   std::cout << std::endl << std::endl;
   std::cout << " Muon Bit ";
-  for(int i = 0; i<4; i++){
+  for (int i = 0; i < 4; i++) {
     std::cout << std::endl;
-    for(int j = 0; j<4; j++){
-      std::cout << " " << getMuonBit(i,j) << " ";
+    for (int j = 0; j < 4; j++) {
+      std::cout << " " << getMuonBit(i, j) << " ";
     }
   }
   std::cout << std::endl;
 }
 
-void L1RCTRegion::printEdges(){
+void L1RCTRegion::printEdges() {
   std::cout << "North" << std::endl;
-  for(int i=0; i<4;i++)
-    std::cout << totalRegionEt.at(i+1) << std::endl;
-  
+  for (int i = 0; i < 4; i++)
+    std::cout << totalRegionEt.at(i + 1) << std::endl;
+
   std::cout << "West" << std::endl;
-  for(int i=0; i<4;i++)
-    std::cout << totalRegionEt.at(6*(i+1)) << std::endl;
+  for (int i = 0; i < 4; i++)
+    std::cout << totalRegionEt.at(6 * (i + 1)) << std::endl;
 
   std::cout << "East" << std::endl;
-  for(int i=0; i<4;i++)
-    std::cout << totalRegionEt.at(6*(i+1)+5) << std::endl;
-  
+  for (int i = 0; i < 4; i++)
+    std::cout << totalRegionEt.at(6 * (i + 1) + 5) << std::endl;
+
   std::cout << "South" << std::endl;
-  for(int i=0; i<4;i++)
-    std::cout << totalRegionEt.at(31+i) << std::endl;
- 
+  for (int i = 0; i < 4; i++)
+    std::cout << totalRegionEt.at(31 + i) << std::endl;
+
   std::cout << "NE " << totalRegionEt.at(5) << std::endl;
   std::cout << "SE " << totalRegionEt.at(35) << std::endl;
   std::cout << "NW " << totalRegionEt.at(0) << std::endl;
diff --git a/L1Trigger/Skimmer/src/L1Filter.cc b/L1Trigger/Skimmer/src/L1Filter.cc
index 8772b17900748..909ae1623f9e2 100644
--- a/L1Trigger/Skimmer/src/L1Filter.cc
+++ b/L1Trigger/Skimmer/src/L1Filter.cc
@@ -1,18 +1,18 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/EDFilter.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 
-#include "CondFormats/L1TObjects/interface/L1GtTriggerMenu.h"
 #include "CondFormats/DataRecord/interface/L1GtTriggerMenuRcd.h"
+#include "CondFormats/L1TObjects/interface/L1GtTriggerMenu.h"
 
-#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetup.h"
+#include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutSetupFwd.h"
 
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerReadoutRecord.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GlobalTriggerRecord.h"
@@ -20,81 +20,70 @@
 #include <iostream>
 #include <string>
 
-class L1Filter : public edm::EDFilter
-{
+class L1Filter : public edm::EDFilter {
 public:
-  explicit L1Filter(edm::ParameterSet const&);
+  explicit L1Filter(edm::ParameterSet const &);
 
   ~L1Filter() override;
 
-  bool filter(edm::Event& e, edm::EventSetup const& c) override;
+  bool filter(edm::Event &e, edm::EventSetup const &c) override;
   void endJob() override;
- 
-private:
 
+private:
   edm::InputTag inputTag_;
   bool useAODRecord_;
   bool useFinalDecision_;
   std::vector<std::string> algos_;
-    
 };
 
-L1Filter::L1Filter(const edm::ParameterSet& ps) :
-  inputTag_(ps.getParameter< edm::InputTag >("inputTag")),
-  useAODRecord_(ps.getParameter< bool >("useAODRecord")),
-  useFinalDecision_(ps.getParameter< bool >("useFinalDecision")),
-  algos_(ps.getParameter< std::vector<std::string> >("algorithms"))
-{
-}
+L1Filter::L1Filter(const edm::ParameterSet &ps)
+    : inputTag_(ps.getParameter<edm::InputTag>("inputTag")),
+      useAODRecord_(ps.getParameter<bool>("useAODRecord")),
+      useFinalDecision_(ps.getParameter<bool>("useFinalDecision")),
+      algos_(ps.getParameter<std::vector<std::string>>("algorithms")) {}
 
-L1Filter::~L1Filter()
-{
-}
+L1Filter::~L1Filter() {}
 
-bool L1Filter::filter(edm::Event& iEvent, edm::EventSetup const& evSetup)
-{
+bool L1Filter::filter(edm::Event &iEvent, edm::EventSetup const &evSetup) {
 
   // get menu
   edm::ESHandle<L1GtTriggerMenu> menuRcd;
-  evSetup.get<L1GtTriggerMenuRcd>().get(menuRcd) ;
-  const L1GtTriggerMenu* menu = menuRcd.product();
+  evSetup.get<L1GtTriggerMenuRcd>().get(menuRcd);
+  const L1GtTriggerMenu *menu = menuRcd.product();
 
   bool passed = false;
   std::vector<std::string>::const_iterator algo;
 
   if (useAODRecord_) {
-    edm::Handle< L1GlobalTriggerRecord > gtRecord;
+    edm::Handle<L1GlobalTriggerRecord> gtRecord;
     iEvent.getByLabel(inputTag_, gtRecord);
     const DecisionWord dWord = gtRecord->decisionWord();
 
-    if (useFinalDecision_) passed = gtRecord->decision();
+    if (useFinalDecision_)
+      passed = gtRecord->decision();
     else {
       for (algo = algos_.begin(); algo != algos_.end(); ++algo) {
-	passed |= menu->gtAlgorithmResult( (*algo), dWord);
+        passed |= menu->gtAlgorithmResult((*algo), dWord);
       }
     }
-  }
-  else {
-    edm::Handle< L1GlobalTriggerReadoutRecord > gtRecord;
+  } else {
+    edm::Handle<L1GlobalTriggerReadoutRecord> gtRecord;
     iEvent.getByLabel(inputTag_, gtRecord);
     const DecisionWord dWord = gtRecord->decisionWord();
 
-    if (useFinalDecision_) passed = gtRecord->decision();
+    if (useFinalDecision_)
+      passed = gtRecord->decision();
     else {
       for (algo = algos_.begin(); algo != algos_.end(); ++algo) {
-	passed |= menu->gtAlgorithmResult( (*algo), dWord);
+        passed |= menu->gtAlgorithmResult((*algo), dWord);
       }
     }
   }
 
   return passed;
-
 }
 
-void L1Filter::endJob()
-{
-
-}
+void L1Filter::endJob() {}
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
diff --git a/L1Trigger/TextToDigi/plugins/GctDigiToPsbText.cc b/L1Trigger/TextToDigi/plugins/GctDigiToPsbText.cc
index 9e244365e01de..2a8b4b5e9c71c 100644
--- a/L1Trigger/TextToDigi/plugins/GctDigiToPsbText.cc
+++ b/L1Trigger/TextToDigi/plugins/GctDigiToPsbText.cc
@@ -2,89 +2,87 @@
 #include "GctDigiToPsbText.h"
 
 #include <iomanip>
-using std::setw;
 using std::setfill;
+using std::setw;
 
-GctDigiToPsbText::GctDigiToPsbText(const edm::ParameterSet& iConfig) : 
-  m_gctInputLabel(iConfig.getParameter<edm::InputTag>("GctInputLabel")),
-  m_textFileName(iConfig.getParameter<std::string>("TextFileName")), 
-  m_hexUpperCase(iConfig.getUntrackedParameter<bool>("HexUpperCase",false)) {
+GctDigiToPsbText::GctDigiToPsbText(const edm::ParameterSet &iConfig)
+    : m_gctInputLabel(iConfig.getParameter<edm::InputTag>("GctInputLabel")),
+      m_textFileName(iConfig.getParameter<std::string>("TextFileName")),
+      m_hexUpperCase(
+          iConfig.getUntrackedParameter<bool>("HexUpperCase", false)) {
   /// open output text files
-  for (unsigned i=0; i<4; i++){
+  for (unsigned i = 0; i < 4; i++) {
     std::stringstream fileStream;
-    int ii = (i<2)?i:i+4;
+    int ii = (i < 2) ? i : i + 4;
     fileStream << m_textFileName << ii << ".txt";
     std::string fileName(fileStream.str());
-    m_file[i].open(fileName.c_str(),std::ios::out);
-    if(!m_file[i].good()) {
+    m_file[i].open(fileName.c_str(), std::ios::out);
+    if (!m_file[i].good()) {
       throw cms::Exception("GctDigiToPsbTextTextFileOpenError")
-	<< "GctDigiToPsbText::GctDigiToPsbText : "
-	<< " couldn't create the file " << fileName 
-	<< std::endl;
+          << "GctDigiToPsbText::GctDigiToPsbText : "
+          << " couldn't create the file " << fileName << std::endl;
     }
   }
 }
 
 GctDigiToPsbText::~GctDigiToPsbText() {
   /// close  files
-  for (unsigned i=0; i<4; i++) 
+  for (unsigned i = 0; i < 4; i++)
     m_file[i].close();
 }
 
+void GctDigiToPsbText::analyze(const edm::Event &iEvent,
+                               const edm::EventSetup &iSetup) {
 
-void
-GctDigiToPsbText::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
-  
-  //static int nevt = -1; nevt++;
+  // static int nevt = -1; nevt++;
 
   // get digis
   edm::Handle<L1GctEmCandCollection> gctIsolaEm;
   edm::Handle<L1GctEmCandCollection> gctNoIsoEm;
-  iEvent.getByLabel(m_gctInputLabel.label(), "isoEm",    gctIsolaEm);
+  iEvent.getByLabel(m_gctInputLabel.label(), "isoEm", gctIsolaEm);
   iEvent.getByLabel(m_gctInputLabel.label(), "nonIsoEm", gctNoIsoEm);
 
   /// buffer
-  uint16_t data[4][2]= {{0}};
-  for (int i=0; i<4; i++)
-    for (int j=0; j<2; j++)
-      data[i][j]=0;
-  
+  uint16_t data[4][2] = {{0}};
+  for (int i = 0; i < 4; i++)
+    for (int j = 0; j < 2; j++)
+      data[i][j] = 0;
+
   std::stringstream sstrm;
-  if(m_hexUpperCase)
+  if (m_hexUpperCase)
     sstrm << std::uppercase;
-  else  
+  else
     sstrm.unsetf(std::ios::uppercase);
 
   // specify cycle bit sequence 1 0 1 0 ... or 0 1 0 1 ...
-  unsigned short cbs[2] = {1,0};
+  unsigned short cbs[2] = {1, 0};
 
   unsigned int ifile;
   unsigned int cycle;
   unsigned iIsola, iNoIso;
 
-  for(int i=0; i<4; i++) {
-    cycle = i/2;
-    ifile = i%2;
-    iIsola = ifile+2;
+  for (int i = 0; i < 4; i++) {
+    cycle = i / 2;
+    ifile = i % 2;
+    iIsola = ifile + 2;
     iNoIso = ifile;
-    
-    //get the data
+
+    // get the data
     data[iIsola][cycle] = gctIsolaEm->at(i).raw();
     data[iNoIso][cycle] = gctNoIsoEm->at(i).raw();
-    
-    //print electrons
+
+    // print electrons
     sstrm.str("");
-    sstrm << setw(4) << setfill('0') << std::hex 
-	  << (data[iIsola][cycle] & 0x7fff) + ((cbs[cycle]&0x1)<<15);
+    sstrm << setw(4) << setfill('0') << std::hex
+          << (data[iIsola][cycle] & 0x7fff) + ((cbs[cycle] & 0x1) << 15);
     m_file[iIsola] << sstrm.str() << std::endl;
     sstrm.str("");
-    sstrm << setw(4) << setfill('0') << std::hex 
-	  << (data[iNoIso][cycle] & 0x7fff) + ((cbs[cycle]&0x1)<<15);
+    sstrm << setw(4) << setfill('0') << std::hex
+          << (data[iNoIso][cycle] & 0x7fff) + ((cbs[cycle] & 0x1) << 15);
     m_file[iNoIso] << sstrm.str() << std::endl;
   }
-  
-  /// flush data to files 
-  for (unsigned i=0; i<4; i++)
+
+  /// flush data to files
+  for (unsigned i = 0; i < 4; i++)
     m_file[i] << std::flush;
-  
 }
diff --git a/L1Trigger/TextToDigi/plugins/GctDigiToPsbText.h b/L1Trigger/TextToDigi/plugins/GctDigiToPsbText.h
index 393070bc7d8d0..b130513145cb1 100644
--- a/L1Trigger/TextToDigi/plugins/GctDigiToPsbText.h
+++ b/L1Trigger/TextToDigi/plugins/GctDigiToPsbText.h
@@ -8,29 +8,28 @@
  */
 
 // system include files
-#include <memory>
-#include <iostream>
 #include <fstream>
+#include <iostream>
+#include <memory>
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 // gct
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctCollections.h"
 
 class GctDigiToPsbText : public edm::EDAnalyzer {
 
- public:
-  explicit GctDigiToPsbText(const edm::ParameterSet&);
+public:
+  explicit GctDigiToPsbText(const edm::ParameterSet &);
   ~GctDigiToPsbText() override;
-  
-  
- private:
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  
+
+private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+
   /// label for input digis
   edm::InputTag m_gctInputLabel;
 
@@ -45,7 +44,6 @@ class GctDigiToPsbText : public edm::EDAnalyzer {
 
   /// handle for debug file
   std::ofstream fdebug;
-
 };
 
 #endif
diff --git a/L1Trigger/TextToDigi/plugins/GtPsbTextToDigi.cc b/L1Trigger/TextToDigi/plugins/GtPsbTextToDigi.cc
index 048d6f3b98c39..4364d1a18acd0 100644
--- a/L1Trigger/TextToDigi/plugins/GtPsbTextToDigi.cc
+++ b/L1Trigger/TextToDigi/plugins/GtPsbTextToDigi.cc
@@ -1,212 +1,220 @@
 
 #include "GtPsbTextToDigi.h"
 // general
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include <iomanip>
 #include <iostream>
 // gct
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctCollections.h"
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctEmCand.h"
-#include "DataFormats/L1GlobalCaloTrigger/interface/L1GctJetCand.h"
 #include "DataFormats/L1GlobalCaloTrigger/interface/L1GctEtSums.h"
+#include "DataFormats/L1GlobalCaloTrigger/interface/L1GctJetCand.h"
 //#include "DataFormats/L1GlobalCaloTrigger/interface/L1GctJetCounts.h"
 
-GtPsbTextToDigi::GtPsbTextToDigi(const edm::ParameterSet& iConfig):
-  m_fileEventOffset(iConfig.getUntrackedParameter<int>("FileEventOffset",0)),
-  m_textFileName(iConfig.getParameter<std::string>("TextFileName")),
-  m_nevt(0) {
+GtPsbTextToDigi::GtPsbTextToDigi(const edm::ParameterSet &iConfig)
+    : m_fileEventOffset(
+          iConfig.getUntrackedParameter<int>("FileEventOffset", 0)),
+      m_textFileName(iConfig.getParameter<std::string>("TextFileName")),
+      m_nevt(0) {
   // Produces collections
   produces<L1GctEmCandCollection>("isoEm");
   produces<L1GctEmCandCollection>("nonIsoEm");
   produces<L1GctJetCandCollection>("cenJets");
   produces<L1GctJetCandCollection>("forJets");
   produces<L1GctJetCandCollection>("tauJets");
-  //produces<L1GctEtTotal>();
+  // produces<L1GctEtTotal>();
 
   // Open the input files
-  for (int ifile=0; ifile<4; ifile++){
+  for (int ifile = 0; ifile < 4; ifile++) {
     // gct em cand coll: (noiso) 0<->0, 1<->1, (iso) 6<->2, 7<->3
-    int ii = (ifile<2)?ifile:ifile+4;
+    int ii = (ifile < 2) ? ifile : ifile + 4;
     std::stringstream fileStream;
     fileStream << m_textFileName << ii << ".txt";
     std::string fileName(fileStream.str());
-    m_file[ifile].open(fileName.c_str(),std::ios::in);
-    if(!m_file[ifile].good()) {
+    m_file[ifile].open(fileName.c_str(), std::ios::in);
+    if (!m_file[ifile].good()) {
       throw cms::Exception("GtPsbTextToDigiTextFileOpenError")
-	//LogDebug("GtPsbTextToDigi")
-	<< "GtPsbTextToDigi::GtPsbTextToDigi : "
-	<< " couldn't open the file " << fileName 
-	//<< "...skipping!" 
-	<< std::endl;
+          // LogDebug("GtPsbTextToDigi")
+          << "GtPsbTextToDigi::GtPsbTextToDigi : "
+          << " couldn't open the file "
+          << fileName
+          //<< "...skipping!"
+          << std::endl;
     }
-    std::hex(m_file[ifile]); 
+    std::hex(m_file[ifile]);
   }
 
   // Initialize bc0 position holder
-  for(int i=0; i<4; i++)
-    m_bc0[i]=-1;  
+  for (int i = 0; i < 4; i++)
+    m_bc0[i] = -1;
 }
 
 GtPsbTextToDigi::~GtPsbTextToDigi() {
   // Close the input files
-  for (unsigned i=0; i<4; i++){  
+  for (unsigned i = 0; i < 4; i++) {
     m_file[i].close();
   }
 }
 
 /// Append empty digi collection
-void GtPsbTextToDigi::putEmptyDigi(edm::Event& iEvent) {
-  std::unique_ptr<L1GctEmCandCollection>  gctIsolaEm( new L1GctEmCandCollection () );
-  std::unique_ptr<L1GctEmCandCollection>  gctNoIsoEm( new L1GctEmCandCollection () );
-  std::unique_ptr<L1GctJetCandCollection> gctCenJets( new L1GctJetCandCollection() );
-  std::unique_ptr<L1GctJetCandCollection> gctForJets( new L1GctJetCandCollection() );
-  std::unique_ptr<L1GctJetCandCollection> gctTauJets( new L1GctJetCandCollection() );
-  //std::unique_ptr<L1GctEtTotal>           gctEtTotal( new L1GctEtTotal          () );
-  for (int i=0; i<4; i++){  
-    gctIsolaEm->push_back(L1GctEmCand (0,true));
-    gctNoIsoEm->push_back(L1GctEmCand (0,false));
-    gctCenJets->push_back(L1GctJetCand(0,false,false));
-    gctForJets->push_back(L1GctJetCand(0,false,true));
-    gctTauJets->push_back(L1GctJetCand(0,true,false));
-    //gctEtTotal->push_back(());
+void GtPsbTextToDigi::putEmptyDigi(edm::Event &iEvent) {
+  std::unique_ptr<L1GctEmCandCollection> gctIsolaEm(
+      new L1GctEmCandCollection());
+  std::unique_ptr<L1GctEmCandCollection> gctNoIsoEm(
+      new L1GctEmCandCollection());
+  std::unique_ptr<L1GctJetCandCollection> gctCenJets(
+      new L1GctJetCandCollection());
+  std::unique_ptr<L1GctJetCandCollection> gctForJets(
+      new L1GctJetCandCollection());
+  std::unique_ptr<L1GctJetCandCollection> gctTauJets(
+      new L1GctJetCandCollection());
+  // std::unique_ptr<L1GctEtTotal>           gctEtTotal( new L1GctEtTotal () );
+  for (int i = 0; i < 4; i++) {
+    gctIsolaEm->push_back(L1GctEmCand(0, true));
+    gctNoIsoEm->push_back(L1GctEmCand(0, false));
+    gctCenJets->push_back(L1GctJetCand(0, false, false));
+    gctForJets->push_back(L1GctJetCand(0, false, true));
+    gctTauJets->push_back(L1GctJetCand(0, true, false));
+    // gctEtTotal->push_back(());
   }
   iEvent.put(std::move(gctIsolaEm), "isoEm");
   iEvent.put(std::move(gctNoIsoEm), "nonIsoEm");
   iEvent.put(std::move(gctCenJets), "cenJets");
   iEvent.put(std::move(gctForJets), "forJets");
   iEvent.put(std::move(gctTauJets), "tauJets");
-  //iEvent.put(std::move(gctEtTotal));
+  // iEvent.put(std::move(gctEtTotal));
 
-  LogDebug("GtPsbTextToDigi") << "putting empty digi (evt:" << m_nevt << ")\n"; 
+  LogDebug("GtPsbTextToDigi") << "putting empty digi (evt:" << m_nevt << ")\n";
 }
 
-void GtPsbTextToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
+void GtPsbTextToDigi::produce(edm::Event &iEvent,
+                              const edm::EventSetup &iSetup) {
 
   // specify clock cycle bit sequence 1 0 1 0... or 0 1 0 1...
-  unsigned short cbs[2] = {1,0};
+  unsigned short cbs[2] = {1, 0};
 
   // Skip event if required
-  if (m_nevt < m_fileEventOffset){ 
+  if (m_nevt < m_fileEventOffset) {
     putEmptyDigi(iEvent);
     LogDebug("GtPsbTextToDigi")
-      << "[GtPsbTextToDigi::produce()] skipping event " << m_nevt 
-      << std::endl;
+        << "[GtPsbTextToDigi::produce()] skipping event " << m_nevt
+        << std::endl;
     m_nevt++;
     return;
-  } else if (m_nevt==0 && m_fileEventOffset<0) {
+  } else if (m_nevt == 0 && m_fileEventOffset < 0) {
     // skip first fileEventOffset input events
     unsigned long int buff;
-    for (int ievt=0; ievt<abs(m_fileEventOffset); ievt++){  
-      for (int ifile=0; ifile<4; ifile++){  
-  	for (int cycle=0; cycle<2; cycle++){  
-	  std::hex(m_file[ifile]);
-  	  m_file[ifile] >> buff;
-	  unsigned tmp = (buff>>15)&0x1;
-	  if(tmp!=cbs[cycle]) {
-	    if(m_bc0[ifile]==-1 && cycle==1 && tmp==1)
-	      m_bc0[ifile] = ievt;
-	    else 
-	      throw cms::Exception("GtPsbTextToDigiTextFileFormatError") 
-		//std::cout << "GtPsbTextToDigiTextFileFormatError" 
-		<< "GtPsbTextToDigi::produce : "
-		<< " found format inconsistency in file #" << ifile 
-		<< "\n in skipped line:" << ievt*2+1
-		<< " cycle:" << tmp << " is different from " << cbs[cycle]
-		<< std::endl;
-	  }
-  	} 
+    for (int ievt = 0; ievt < abs(m_fileEventOffset); ievt++) {
+      for (int ifile = 0; ifile < 4; ifile++) {
+        for (int cycle = 0; cycle < 2; cycle++) {
+          std::hex(m_file[ifile]);
+          m_file[ifile] >> buff;
+          unsigned tmp = (buff >> 15) & 0x1;
+          if (tmp != cbs[cycle]) {
+            if (m_bc0[ifile] == -1 && cycle == 1 && tmp == 1)
+              m_bc0[ifile] = ievt;
+            else
+              throw cms::Exception("GtPsbTextToDigiTextFileFormatError")
+                  // std::cout << "GtPsbTextToDigiTextFileFormatError"
+                  << "GtPsbTextToDigi::produce : "
+                  << " found format inconsistency in file #" << ifile
+                  << "\n in skipped line:" << ievt * 2 + 1 << " cycle:" << tmp
+                  << " is different from " << cbs[cycle] << std::endl;
+          }
+        }
       }
       LogDebug("GtPsbTextToDigi")
-	<< "[GtPsbTextToDigi::produce()] skipping input " << ievt 
-	<< std::endl;
+          << "[GtPsbTextToDigi::produce()] skipping input " << ievt
+          << std::endl;
     }
   }
   m_nevt++;
-  
+
   // New collections
-  std::unique_ptr<L1GctEmCandCollection>  gctIsolaEm( new L1GctEmCandCollection () );
-  std::unique_ptr<L1GctEmCandCollection>  gctNoIsoEm( new L1GctEmCandCollection () );
-  std::unique_ptr<L1GctJetCandCollection> gctCenJets( new L1GctJetCandCollection() ); 
-  std::unique_ptr<L1GctJetCandCollection> gctForJets( new L1GctJetCandCollection() ); 
-  std::unique_ptr<L1GctJetCandCollection> gctTauJets( new L1GctJetCandCollection() );
-  //std::unique_ptr<L1GctEtTotal>           gctEtTotal( new L1GctEtTotal          () );
+  std::unique_ptr<L1GctEmCandCollection> gctIsolaEm(
+      new L1GctEmCandCollection());
+  std::unique_ptr<L1GctEmCandCollection> gctNoIsoEm(
+      new L1GctEmCandCollection());
+  std::unique_ptr<L1GctJetCandCollection> gctCenJets(
+      new L1GctJetCandCollection());
+  std::unique_ptr<L1GctJetCandCollection> gctForJets(
+      new L1GctJetCandCollection());
+  std::unique_ptr<L1GctJetCandCollection> gctTauJets(
+      new L1GctJetCandCollection());
+  // std::unique_ptr<L1GctEtTotal>           gctEtTotal( new L1GctEtTotal () );
 
   /// buffer
-  uint16_t data[4][2]= {{0}};
-  for (int i=0; i<4; i++)
-    for (int j=0; j<2; j++)
-      data[i][j]=0;
+  uint16_t data[4][2] = {{0}};
+  for (int i = 0; i < 4; i++)
+    for (int j = 0; j < 2; j++)
+      data[i][j] = 0;
 
   // Loop over files
-  for (int ifile=0; ifile<4; ifile++){  
-    int ii = (ifile<2)?ifile:ifile+4;
-    
+  for (int ifile = 0; ifile < 4; ifile++) {
+    int ii = (ifile < 2) ? ifile : ifile + 4;
+
     // Check we're not at the end of the file
-    if(m_file[ifile].eof()) {
+    if (m_file[ifile].eof()) {
       LogDebug("GtPsbTextToDigi")
-	<< "GtPsbTextToDigi::produce : "
-	<< " unexpected end of file " << m_textFileName << ii << ".txt"
-	<< std::endl;
+          << "GtPsbTextToDigi::produce : "
+          << " unexpected end of file " << m_textFileName << ii << ".txt"
+          << std::endl;
       putEmptyDigi(iEvent);
       continue;
-    }      
-    
-    if(!m_file[ifile].good()) {
-      LogDebug("GtPsbTextToDigi")
-	<< "GtPsbTextToDigi::produce : "
-	<< " problem reading file " << m_textFileName << ii << ".txt"
-	<< std::endl;
+    }
+
+    if (!m_file[ifile].good()) {
+      LogDebug("GtPsbTextToDigi") << "GtPsbTextToDigi::produce : "
+                                  << " problem reading file " << m_textFileName
+                                  << ii << ".txt" << std::endl;
       putEmptyDigi(iEvent);
       continue;
     }
-    
+
     /// Read in file
     unsigned long int uLongBuffer;
-    
-    for(unsigned cycle=0; cycle<2; cycle++) {
+
+    for (unsigned cycle = 0; cycle < 2; cycle++) {
       m_file[ifile] >> uLongBuffer;
-      unsigned tmp = (uLongBuffer>>15)&0x1;
-      
+      unsigned tmp = (uLongBuffer >> 15) & 0x1;
+
       /// cycle debuging (temporary)
-      if(false && tmp!=cbs[cycle]) 
-      	std::cout << "[GtPsbTextToDigi::produce()] asserting " 
-      		  << " evt:"   << m_nevt
-      		  << " ifile:" << ifile
-      		  << " cycle:" << cbs[cycle]
-      		  << std::hex
-      		  << " buffer:"<< uLongBuffer
-      		  << " tmp: "  << tmp
-      		  << std::dec 
-      		  << "\n\n" << std::flush;
-
-      if(tmp!=cbs[cycle]){
-	if(m_bc0[ifile]==-1 && cycle==1 && tmp==1){
-	  m_bc0[ifile] = (m_nevt-m_fileEventOffset);
-	}else{
-	  throw cms::Exception("GtPsbTextToDigiTextFileFormatError") 
-	    //std::cout << "GtPsbTextToDigiTextFileFormatError " 
-	    << "GtPsbTextToDigi::produce : "
-	    << " found format inconsistency in file #" << ifile 
-	    << "\n in line:" << (m_nevt-m_fileEventOffset)*2-1  
-	    << " cycle:" << tmp << " is different from " << cbs[cycle]
-	    << std::endl;
+      if (false && tmp != cbs[cycle])
+        std::cout << "[GtPsbTextToDigi::produce()] asserting "
+                  << " evt:" << m_nevt << " ifile:" << ifile
+                  << " cycle:" << cbs[cycle] << std::hex
+                  << " buffer:" << uLongBuffer << " tmp: " << tmp << std::dec
+                  << "\n\n"
+                  << std::flush;
+
+      if (tmp != cbs[cycle]) {
+        if (m_bc0[ifile] == -1 && cycle == 1 && tmp == 1) {
+          m_bc0[ifile] = (m_nevt - m_fileEventOffset);
+        } else {
+          throw cms::Exception("GtPsbTextToDigiTextFileFormatError")
+              // std::cout << "GtPsbTextToDigiTextFileFormatError "
+              << "GtPsbTextToDigi::produce : "
+              << " found format inconsistency in file #" << ifile
+              << "\n in line:" << (m_nevt - m_fileEventOffset) * 2 - 1
+              << " cycle:" << tmp << " is different from " << cbs[cycle]
+              << std::endl;
         }
       }
-      data[ifile][cycle] = (uLongBuffer&0x7fff);
-    } //cycle loop
-  } //ifile loop
-  
+      data[ifile][cycle] = (uLongBuffer & 0x7fff);
+    } // cycle loop
+  }   // ifile loop
+
   /// Fill in digi collections
   unsigned iIsola, iNoIso;
-  for (unsigned cycle=0; cycle<2; cycle++){  
-    for (unsigned i=0; i<2; i++){  
-      iIsola = i+2;
+  for (unsigned cycle = 0; cycle < 2; cycle++) {
+    for (unsigned i = 0; i < 2; i++) {
+      iIsola = i + 2;
       iNoIso = i;
-      gctIsolaEm->push_back(L1GctEmCand(data[iIsola][cycle]&0x7fff,true));
-      gctNoIsoEm->push_back(L1GctEmCand(data[iNoIso][cycle]&0x7fff,false));
-      L1GctEmCand candI(data[iIsola][cycle],true);
-      L1GctEmCand candN(data[iNoIso][cycle],false);
+      gctIsolaEm->push_back(L1GctEmCand(data[iIsola][cycle] & 0x7fff, true));
+      gctNoIsoEm->push_back(L1GctEmCand(data[iNoIso][cycle] & 0x7fff, false));
+      L1GctEmCand candI(data[iIsola][cycle], true);
+      L1GctEmCand candN(data[iNoIso][cycle], false);
     }
   }
 
@@ -216,23 +224,22 @@ void GtPsbTextToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
   iEvent.put(std::move(gctCenJets), "cenJets");
   iEvent.put(std::move(gctForJets), "forJets");
   iEvent.put(std::move(gctTauJets), "tauJets");
-  //iEvent.put(std::move(gctEtTotal));
-
+  // iEvent.put(std::move(gctEtTotal));
 }
 
 void GtPsbTextToDigi::endJob() {
   /// Check BC0 signals consistency
   int nmem = 4;
   bool match = true;
-  for(int i=0; i<nmem-1; i++)
-    match &= (m_bc0[i]==m_bc0[i+1]);  
+  for (int i = 0; i < nmem - 1; i++)
+    match &= (m_bc0[i] == m_bc0[i + 1]);
   LogDebug("GtPsbTextToDigi") << "[GtPsbTextToDigi::endJob()] ";
-  if(!match) 
-    LogDebug("GtPsbTextToDigi") << "did not find matching BC0 in all input files: ";
+  if (!match)
+    LogDebug("GtPsbTextToDigi")
+        << "did not find matching BC0 in all input files: ";
   else
     LogDebug("GtPsbTextToDigi") << "detected common BC0 in all input files: ";
-  for(int i=0; i<nmem; i++)
-    LogDebug("GtPsbTextToDigi") << " " << m_bc0[i];  
+  for (int i = 0; i < nmem; i++)
+    LogDebug("GtPsbTextToDigi") << " " << m_bc0[i];
   LogDebug("GtPsbTextToDigi") << std::flush << std::endl;
-
 }
diff --git a/L1Trigger/TextToDigi/plugins/GtPsbTextToDigi.h b/L1Trigger/TextToDigi/plugins/GtPsbTextToDigi.h
index 7e800ffee5ee6..9d0b4238f38c9 100644
--- a/L1Trigger/TextToDigi/plugins/GtPsbTextToDigi.h
+++ b/L1Trigger/TextToDigi/plugins/GtPsbTextToDigi.h
@@ -7,7 +7,7 @@
  *\date 08.08
  */
 
-/*\note on format 
+/*\note on format
   input file names: m_textFileName + mem# + .txt
   each line corresponds to one 80MHz clock (2 cycles/lines per event)
   input data: 16 bits: cycle (msb) + GCT em cand raw data (14:0)
@@ -23,26 +23,26 @@
   as specified to me by I.Mikulec, M.Jeitler, J.Brooke
 */
 
-#include <memory>
-#include <fstream>
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <fstream>
+#include <memory>
 
 class GtPsbTextToDigi : public edm::EDProducer {
- public:
-  explicit GtPsbTextToDigi(const edm::ParameterSet&);
+public:
+  explicit GtPsbTextToDigi(const edm::ParameterSet &);
   ~GtPsbTextToDigi() override;
-  
- private:
-  void produce(edm::Event&, const edm::EventSetup&) override;
+
+private:
+  void produce(edm::Event &, const edm::EventSetup &) override;
   void endJob() override;
 
- private:
+private:
   /// Create empty digi collection
-  void putEmptyDigi(edm::Event&);
+  void putEmptyDigi(edm::Event &);
 
   /// Number of events to be offset wrt input
   int m_fileEventOffset;
@@ -57,7 +57,7 @@ class GtPsbTextToDigi : public edm::EDProducer {
   std::ifstream m_file[4];
 
   /// Hold detected BC0 signal position per file
-  int m_bc0[4];  
+  int m_bc0[4];
 };
 
 #endif
diff --git a/L1Trigger/TextToDigi/plugins/RawToText.cc b/L1Trigger/TextToDigi/plugins/RawToText.cc
index 33f6e52a53e5a..2a9a918487b75 100644
--- a/L1Trigger/TextToDigi/plugins/RawToText.cc
+++ b/L1Trigger/TextToDigi/plugins/RawToText.cc
@@ -2,80 +2,74 @@
 #include "L1Trigger/TextToDigi/plugins/RawToText.h"
 
 // system
-#include <string>
 #include <fstream>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
+#include <string>
 // framework
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"
 // raw data collection
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 
-
-RawToText::RawToText(const edm::ParameterSet& iConfig) :
-  inputLabel_(iConfig.getParameter<edm::InputTag>("inputLabel")),
-  fedId_(iConfig.getUntrackedParameter<int>("fedId", 745)),
-  filename_(iConfig.getUntrackedParameter<std::string>("filename", "slinkOutput.txt")),
-  nevt_(0) {
-  edm::LogInfo("TextToDigi") << "Creating ASCII dump " << filename_ << std::endl;
+RawToText::RawToText(const edm::ParameterSet &iConfig)
+    : inputLabel_(iConfig.getParameter<edm::InputTag>("inputLabel")),
+      fedId_(iConfig.getUntrackedParameter<int>("fedId", 745)),
+      filename_(iConfig.getUntrackedParameter<std::string>("filename",
+                                                           "slinkOutput.txt")),
+      nevt_(0) {
+  edm::LogInfo("TextToDigi")
+      << "Creating ASCII dump " << filename_ << std::endl;
 }
 
-
 RawToText::~RawToText() {}
 
-
-void RawToText::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
+void RawToText::analyze(const edm::Event &iEvent,
+                        const edm::EventSetup &iSetup) {
 
   nevt_++;
-  
+
   // get raw data collection
   edm::Handle<FEDRawDataCollection> feds;
   iEvent.getByLabel(inputLabel_, feds);
-  const FEDRawData& gctRcd = feds->FEDData(fedId_);
-   
-  edm::LogInfo("GCT") << "Upacking FEDRawData of size " 
-		      << std::dec << gctRcd.size() 
-		      << std::endl;
-  
+  const FEDRawData &gctRcd = feds->FEDData(fedId_);
+
+  edm::LogInfo("GCT") << "Upacking FEDRawData of size " << std::dec
+                      << gctRcd.size() << std::endl;
+
   // do a simple check of the raw data
-  if (gctRcd.size()<16) {
-    edm::LogWarning("Invalid Data") 
-      << "Empty/invalid GCT raw data, size = " << gctRcd.size()
-      << std::endl;
+  if (gctRcd.size() < 16) {
+    edm::LogWarning("Invalid Data")
+        << "Empty/invalid GCT raw data, size = " << gctRcd.size() << std::endl;
     return;
   }
-  
-  const unsigned char * data = gctRcd.data();
-  
+
+  const unsigned char *data = gctRcd.data();
+
   int eventSize = gctRcd.size() / 4;
 
   unsigned long d = 0;
-  for(int i=0; i<eventSize; i++) {
+  for (int i = 0; i < eventSize; i++) {
     d = 0;
-    //d  = data[i*4+0] + (data[i*4+1]<<8) + (data[i*4+2]<<16) + (data[i*4+3]<<24);
-    for(int j=0; j<4; j++) {
-      d += ((data[i*4+j]&0xff)<<(8*j));
+    // d  = data[i*4+0] + (data[i*4+1]<<8) + (data[i*4+2]<<16) +
+    // (data[i*4+3]<<24);
+    for (int j = 0; j < 4; j++) {
+      d += ((data[i * 4 + j] & 0xff) << (8 * j));
     }
-    file_ << std::setw(8) << std::setfill('0') << std::hex  << d << std::endl;
+    file_ << std::setw(8) << std::setfill('0') << std::hex << d << std::endl;
   }
   file_ << std::flush << std::endl;
-
 }
 
-
 void RawToText::beginJob() {
-  
+
   // open VME file
   file_.open(filename_.c_str(), std::ios::out);
-  
-  if(!file_.good()) { 
-    edm::LogInfo("RawToText") << "Failed to open ASCII file " << filename_ 
-			      << std::endl; 
+
+  if (!file_.good()) {
+    edm::LogInfo("RawToText")
+        << "Failed to open ASCII file " << filename_ << std::endl;
   }
 }
 
-
-void RawToText::endJob() {
-  file_.close();
-}
+void RawToText::endJob() { file_.close(); }
diff --git a/L1Trigger/TextToDigi/plugins/RawToText.h b/L1Trigger/TextToDigi/plugins/RawToText.h
index a5f83f5c4fd4d..8a06cd64d52b5 100644
--- a/L1Trigger/TextToDigi/plugins/RawToText.h
+++ b/L1Trigger/TextToDigi/plugins/RawToText.h
@@ -10,32 +10,30 @@
  */
 
 // system include files
+#include <fstream>
 #include <memory>
 #include <string>
-#include <fstream>
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DataFormats/FEDRawData/interface/FEDRawData.h"
 
-
 class RawToText : public edm::EDAnalyzer {
- public:
-  explicit RawToText(const edm::ParameterSet&);
+public:
+  explicit RawToText(const edm::ParameterSet &);
   ~RawToText() override;
-  
- private:
-  void beginJob() override;
-  void analyze (const edm::Event&, const edm::EventSetup&) override;
-  void endJob  () override;
 
- private:
+private:
+  void beginJob() override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
 
+private:
   // FED collection label
-  edm::InputTag inputLabel_;  
+  edm::InputTag inputLabel_;
 
   // ID of the FED to emulate
   int fedId_;
diff --git a/L1Trigger/TextToDigi/plugins/RctDigiToRctText.cc b/L1Trigger/TextToDigi/plugins/RctDigiToRctText.cc
index 458be3ad48179..f135382eb83ef 100644
--- a/L1Trigger/TextToDigi/plugins/RctDigiToRctText.cc
+++ b/L1Trigger/TextToDigi/plugins/RctDigiToRctText.cc
@@ -2,48 +2,45 @@
 #include "RctDigiToRctText.h"
 #include <iomanip>
 
-using std::setw;
-using std::setfill;
-using std::hex;
 using std::dec;
 using std::endl;
+using std::hex;
+using std::setfill;
+using std::setw;
 
-
-RctDigiToRctText::RctDigiToRctText(const edm::ParameterSet& iConfig) : 
-  m_rctInputLabel(iConfig.getParameter<edm::InputTag>("RctInputLabel")),
-  m_textFileName(iConfig.getParameter<std::string>("TextFileName")), 
-  m_hexUpperCase(iConfig.getParameter<bool>("HexUpperCase")) {
+RctDigiToRctText::RctDigiToRctText(const edm::ParameterSet &iConfig)
+    : m_rctInputLabel(iConfig.getParameter<edm::InputTag>("RctInputLabel")),
+      m_textFileName(iConfig.getParameter<std::string>("TextFileName")),
+      m_hexUpperCase(iConfig.getParameter<bool>("HexUpperCase")) {
 
   /// open output text files
-  for (unsigned i=0; i<NUM_RCT_CRATES; i++){
+  for (unsigned i = 0; i < NUM_RCT_CRATES; i++) {
     std::stringstream fileStream;
-    fileStream << m_textFileName << std::setw(2) << std::setfill('0') << i << ".txt";
+    fileStream << m_textFileName << std::setw(2) << std::setfill('0') << i
+               << ".txt";
     std::string fileName(fileStream.str());
-    m_file[i].open(fileName.c_str(),std::ios::out);
-    
-    if(!m_file[i].good()) {
+    m_file[i].open(fileName.c_str(), std::ios::out);
+
+    if (!m_file[i].good()) {
       throw cms::Exception("RctDigiToRctTextTextFileOpenError")
-	<< "RctDigiToRctText::RctDigiToRctText : "
-	<< " couldn't create the file " << fileName << std::endl;
+          << "RctDigiToRctText::RctDigiToRctText : "
+          << " couldn't create the file " << fileName << std::endl;
     }
   }
 
   /// open info|debug file
   fdebug.open("rctdigitorcttext_debug.txt", std::ios::out);
-
 }
 
-
 RctDigiToRctText::~RctDigiToRctText() {
   /// close  files
-  for (unsigned i=0; i<NUM_RCT_CRATES; i++) 
+  for (unsigned i = 0; i < NUM_RCT_CRATES; i++)
     m_file[i].close();
   fdebug.close();
 }
 
-
-void
-RctDigiToRctText::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
+void RctDigiToRctText::analyze(const edm::Event &iEvent,
+                               const edm::EventSetup &iSetup) {
 
   /// count bunch crossing
   static int nevt = -1;
@@ -57,23 +54,24 @@ RctDigiToRctText::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu
 
   /// debug flags and stream
   bool ldebug = false;
-  bool debug_NOTEMPTY[18]={false};
-  for(int i=0; i<18; i++) debug_NOTEMPTY[i]=false;
+  bool debug_NOTEMPTY[18] = {false};
+  for (int i = 0; i < 18; i++)
+    debug_NOTEMPTY[i] = false;
   std::stringstream dstrm;
 
-
   /// --- ELECTRONS ---
 
   unsigned long int CAND[18][8];
-  int n_iso [18]={0};
-  int n_niso[18]={0};
+  int n_iso[18] = {0};
+  int n_niso[18] = {0};
   bool iso;
   int id;
 
-  for(L1CaloEmCollection::const_iterator iem=em->begin(); iem!=em->end(); iem++){
-    
-    int crate     = iem->rctCrate();
-    iso           = iem->isolated();
+  for (L1CaloEmCollection::const_iterator iem = em->begin(); iem != em->end();
+       iem++) {
+
+    int crate = iem->rctCrate();
+    iso = iem->isolated();
     unsigned data = iem->raw();
 
     id = iso ? n_iso[crate]++ : 4 + n_niso[crate]++;
@@ -81,170 +79,159 @@ RctDigiToRctText::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu
     CAND[crate][id] = data;
 
     /// debug
-    if(crate>17 || id > 7)
-      throw cms::Exception("RctDigiToRctTextElectronIndexOutBounds") 
-	<< "out of bounds indices  crate:" << crate << "id:" << id << std::endl;
-    if(ldebug&&data!=0) 
+    if (crate > 17 || id > 7)
+      throw cms::Exception("RctDigiToRctTextElectronIndexOutBounds")
+          << "out of bounds indices  crate:" << crate << "id:" << id
+          << std::endl;
+    if (ldebug && data != 0)
       debug_NOTEMPTY[crate] = true;
     dstrm.str("");
-    dstrm << "electron " 
-	  << " bx:"      << nevt 
-	  << " crate:"   << crate
-	  << " iso:"     << iso
-	  << " raw:"     << data
-	  << " \t cand:" << *iem;
-    if(debug_NOTEMPTY[crate]) fdebug << dstrm.str() << std::endl;
+    dstrm << "electron "
+          << " bx:" << nevt << " crate:" << crate << " iso:" << iso
+          << " raw:" << data << " \t cand:" << *iem;
+    if (debug_NOTEMPTY[crate])
+      fdebug << dstrm.str() << std::endl;
   }
-  
 
   /// --- REGIONS ---
 
-  unsigned short MIPbits [18][7][2] = {{{0}}};
-  unsigned short QIEbits [18][7][2] = {{{0}}};
-  unsigned short RC      [18][7][2] = {{{0}}};
-  unsigned short RCof    [18][7][2] = {{{0}}};
-  unsigned short RCtau   [18][7][2] = {{{0}}};
-  unsigned short HF      [18][4][2] = {{{0}}};
+  unsigned short MIPbits[18][7][2] = {{{0}}};
+  unsigned short QIEbits[18][7][2] = {{{0}}};
+  unsigned short RC[18][7][2] = {{{0}}};
+  unsigned short RCof[18][7][2] = {{{0}}};
+  unsigned short RCtau[18][7][2] = {{{0}}};
+  unsigned short HF[18][4][2] = {{{0}}};
 
-  for (L1CaloRegionCollection::const_iterator irgn=rgn->begin(); irgn!=rgn->end(); irgn++){
+  for (L1CaloRegionCollection::const_iterator irgn = rgn->begin();
+       irgn != rgn->end(); irgn++) {
 
     int crate = irgn->rctCrate();
-    int card  = irgn->rctCard();
-    int rgnidx= irgn->rctRegionIndex();
+    int card = irgn->rctCard();
+    int rgnidx = irgn->rctRegionIndex();
 
     dstrm.str("");
-    if (!irgn->id().isHf()){
-      RC     [crate][card][rgnidx]=irgn->et();
-      RCof   [crate][card][rgnidx]=irgn->overFlow();
-      RCtau  [crate][card][rgnidx]=irgn->tauVeto();
-      MIPbits[crate][card][rgnidx]=irgn->mip();
-      QIEbits[crate][card][rgnidx]=irgn->quiet();
+    if (!irgn->id().isHf()) {
+      RC[crate][card][rgnidx] = irgn->et();
+      RCof[crate][card][rgnidx] = irgn->overFlow();
+      RCtau[crate][card][rgnidx] = irgn->tauVeto();
+      MIPbits[crate][card][rgnidx] = irgn->mip();
+      QIEbits[crate][card][rgnidx] = irgn->quiet();
       // debug info
-      dstrm << hex
-	    << "Et="        << irgn->et()
-	    << " OverFlow=" << irgn->overFlow()
-	    << " tauVeto="  << irgn->tauVeto()
-	    << " mip="      << irgn->mip()
-	    << " quiet="    << irgn->quiet()
-	    << " Card="     << irgn->rctCard()
-	    << " Region="   << irgn->rctRegionIndex()
-	    << " Crate="    << irgn->rctCrate()
-	    << dec;
-      if(ldebug) LogDebug("Regions") << dstrm.str();
+      dstrm << hex << "Et=" << irgn->et() << " OverFlow=" << irgn->overFlow()
+            << " tauVeto=" << irgn->tauVeto() << " mip=" << irgn->mip()
+            << " quiet=" << irgn->quiet() << " Card=" << irgn->rctCard()
+            << " Region=" << irgn->rctRegionIndex()
+            << " Crate=" << irgn->rctCrate() << dec;
+      if (ldebug)
+        LogDebug("Regions") << dstrm.str();
     } else {
-      HF [crate][irgn->id().rctEta()-7][irgn->id().rctPhi()]=irgn->et();
+      HF[crate][irgn->id().rctEta() - 7][irgn->id().rctPhi()] = irgn->et();
       // debug info
-      dstrm << hex
-	    << "Et="      << irgn->et()
-	    << " FGrain=" << irgn->fineGrain()
-	    << " Eta="    << irgn->id().rctEta()
-	    << " Phi="    << irgn->id().rctPhi()
-	    << " Crate="  << irgn->rctCrate()
-	    << dec;
-      if(ldebug) LogDebug("HFRegions") << dstrm.str();
+      dstrm << hex << "Et=" << irgn->et() << " FGrain=" << irgn->fineGrain()
+            << " Eta=" << irgn->id().rctEta() << " Phi=" << irgn->id().rctPhi()
+            << " Crate=" << irgn->rctCrate() << dec;
+      if (ldebug)
+        LogDebug("HFRegions") << dstrm.str();
     }
-    
 
-    if(ldebug &&irgn->et()!=0) debug_NOTEMPTY[crate] = true; //debug
-    if(debug_NOTEMPTY[crate]) {
+    if (ldebug && irgn->et() != 0)
+      debug_NOTEMPTY[crate] = true; // debug
+    if (debug_NOTEMPTY[crate]) {
       fdebug << "region"
-	     << " bx:"    << nevt 
-	     << " crate:" << crate
-	     << "\t";
+             << " bx:" << nevt << " crate:" << crate << "\t";
       fdebug << dstrm.str() << std::endl;
     }
   }
-  
 
   std::stringstream sstrm;
-  if(m_hexUpperCase)
+  if (m_hexUpperCase)
     sstrm << std::uppercase;
-  else  
+  else
     sstrm.unsetf(std::ios::uppercase);
-  
 
   /// print electrons
 
-  for (unsigned crate=0; crate<NUM_RCT_CRATES; crate++){
-   
+  for (unsigned crate = 0; crate < NUM_RCT_CRATES; crate++) {
+
     sstrm.str("");
     sstrm << "Crossing " << nevt << std::endl;
 
-    for(int j=0; j<8; j++) {
+    for (int j = 0; j < 8; j++) {
       sstrm << setw(3) << setfill('0') << hex << (CAND[crate][j] & 0x3ff);
-      if(j<7) sstrm << " ";
+      if (j < 7)
+        sstrm << " ";
     }
     sstrm << setfill(' ') << dec;
     m_file[crate] << sstrm.str() << std::endl;
 
     // debug
-    if(debug_NOTEMPTY[crate]) fdebug << sstrm.str() << std::endl;
-    if(ldebug) LogDebug("Electrons") << sstrm.str() << std::endl;
-    
+    if (debug_NOTEMPTY[crate])
+      fdebug << sstrm.str() << std::endl;
+    if (ldebug)
+      LogDebug("Electrons") << sstrm.str() << std::endl;
   }
 
-  
   /// print regions
-  
-  for (unsigned crate=0; crate<NUM_RCT_CRATES; crate++){
-    
+
+  for (unsigned crate = 0; crate < NUM_RCT_CRATES; crate++) {
+
     /// mip bits
     sstrm.str("");
-    for (int card=0; card<7; card++){
-      for (int j=0; j<2; j++){
-	sstrm << " " << MIPbits[crate][card][j];
+    for (int card = 0; card < 7; card++) {
+      for (int j = 0; j < 2; j++) {
+        sstrm << " " << MIPbits[crate][card][j];
       }
     }
     m_file[crate] << sstrm.str() << std::endl;
-    if(debug_NOTEMPTY[crate]) fdebug << sstrm.str() << std::endl; //debug
-    
+    if (debug_NOTEMPTY[crate])
+      fdebug << sstrm.str() << std::endl; // debug
+
     /// quiet bits
     sstrm.str("");
-    for (int card=0; card<7; card++){
-      for (int j=0; j<2; j++){
-	sstrm << " " << QIEbits[crate][card][j];
+    for (int card = 0; card < 7; card++) {
+      for (int j = 0; j < 2; j++) {
+        sstrm << " " << QIEbits[crate][card][j];
       }
     }
     m_file[crate] << sstrm.str() << std::endl;
-    if(debug_NOTEMPTY[crate]) fdebug << sstrm.str() << std::endl; //debug
+    if (debug_NOTEMPTY[crate])
+      fdebug << sstrm.str() << std::endl; // debug
 
     /// region info
     sstrm.str("");
-    for (int card=0; card<7; card++){
-      for (int j=0; j<2; j++){
-	unsigned long int tmp;
-	unsigned et   = RC   [crate][card][j];
-	unsigned ovf  = RCof [crate][card][j];
-	unsigned tau  = RCtau[crate][card][j];
-	//ovf = ovf || (et>=0x400);
-	tmp = ((tau & 0x1) << 11) | ((ovf &0x1)<<10) | ((et & 0x3ff));
-	sstrm << " " << setw(3) << setfill('0') << hex << tmp;
-
+    for (int card = 0; card < 7; card++) {
+      for (int j = 0; j < 2; j++) {
+        unsigned long int tmp;
+        unsigned et = RC[crate][card][j];
+        unsigned ovf = RCof[crate][card][j];
+        unsigned tau = RCtau[crate][card][j];
+        // ovf = ovf || (et>=0x400);
+        tmp = ((tau & 0x1) << 11) | ((ovf & 0x1) << 10) | ((et & 0x3ff));
+        sstrm << " " << setw(3) << setfill('0') << hex << tmp;
       }
     }
     m_file[crate] << sstrm.str() << std::endl;
-    if(debug_NOTEMPTY[crate]) fdebug << sstrm.str() << std::endl << std::endl; //debug
+    if (debug_NOTEMPTY[crate])
+      fdebug << sstrm.str() << std::endl << std::endl; // debug
 
-    
     /// HF
     sstrm.str("");
-    for (int ip=0; ip<2; ip++){
-      for (int ie=0; ie<4; ie++){
-	unsigned et = HF[crate][ie][ip] & 0xff;
-	sstrm << " " << setw(2) << setfill('0') << hex << et;
+    for (int ip = 0; ip < 2; ip++) {
+      for (int ie = 0; ie < 4; ie++) {
+        unsigned et = HF[crate][ie][ip] & 0xff;
+        sstrm << " " << setw(2) << setfill('0') << hex << et;
       }
     }
     m_file[crate] << sstrm.str() << std::endl;
-    if(debug_NOTEMPTY[crate]) fdebug << sstrm.str() << std::endl; //debug
+    if (debug_NOTEMPTY[crate])
+      fdebug << sstrm.str() << std::endl; // debug
     sstrm << setfill(' ') << dec;
 
-  }// end crate loop 
-
+  } // end crate loop
 
-  /// flush data to files 
-  for (unsigned i=0; i<NUM_RCT_CRATES; i++)
+  /// flush data to files
+  for (unsigned i = 0; i < NUM_RCT_CRATES; i++)
     m_file[i] << std::flush;
-  
-  fdebug << std::flush;
 
+  fdebug << std::flush;
 }
diff --git a/L1Trigger/TextToDigi/plugins/RctDigiToRctText.h b/L1Trigger/TextToDigi/plugins/RctDigiToRctText.h
index ad3ad383e12ec..09e3b0a7cb034 100644
--- a/L1Trigger/TextToDigi/plugins/RctDigiToRctText.h
+++ b/L1Trigger/TextToDigi/plugins/RctDigiToRctText.h
@@ -8,37 +8,34 @@
  *\created Thu Mar 29 23:22:57 CEST 2007
  */
 
-
 // system include files
-#include <memory>
-#include <iostream>
 #include <fstream>
+#include <iostream>
+#include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h" // Logger
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
 
 const static unsigned NUM_RCT_CRATES = 18;
 
-
 class RctDigiToRctText : public edm::EDAnalyzer {
 
- public:
-  explicit RctDigiToRctText(const edm::ParameterSet&);
+public:
+  explicit RctDigiToRctText(const edm::ParameterSet &);
   ~RctDigiToRctText() override;
-  
-  
- private:
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  
+
+private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+
   /// label for RCT digis
   edm::InputTag m_rctInputLabel;
 
@@ -53,7 +50,6 @@ class RctDigiToRctText : public edm::EDAnalyzer {
 
   /// handle for debug file
   std::ofstream fdebug;
-
 };
 
 #endif
diff --git a/L1Trigger/TextToDigi/plugins/RctDigiToSourceCardText.cc b/L1Trigger/TextToDigi/plugins/RctDigiToSourceCardText.cc
index 4c5fc3504eb75..4c37f883a4536 100644
--- a/L1Trigger/TextToDigi/plugins/RctDigiToSourceCardText.cc
+++ b/L1Trigger/TextToDigi/plugins/RctDigiToSourceCardText.cc
@@ -2,10 +2,12 @@
 //
 // Package:    RctDigiToSourceCardText
 // Class:      RctDigiToSourceCardText
-// 
-/**\class RctDigiToSourceCardText RctDigiToSourceCardText.cc L1Trigger/TextToDigi/src/RctDigiToSourceCardText.cc
+//
+/**\class RctDigiToSourceCardText RctDigiToSourceCardText.cc
+L1Trigger/TextToDigi/src/RctDigiToSourceCardText.cc
 
-Description: Input RCT digis and output GCT text file to be loaded into the source cards for pattern tests. 
+Description: Input RCT digis and output GCT text file to be loaded into the
+source cards for pattern tests.
 
 */
 //
@@ -14,9 +16,9 @@ Description: Input RCT digis and output GCT text file to be loaded into the sour
 //
 //
 
-#include "RctDigiToSourceCardText.h"
-#include "FWCore/ServiceRegistry/interface/Service.h" // Framework services
 #include "FWCore/MessageLogger/interface/MessageLogger.h" // Logger
+#include "FWCore/ServiceRegistry/interface/Service.h"     // Framework services
+#include "RctDigiToSourceCardText.h"
 
 using namespace edm;
 using namespace std;
@@ -24,35 +26,33 @@ using namespace std;
 // Set constant
 const static int NUM_RCT_CRATES = 18;
 
-RctDigiToSourceCardText::RctDigiToSourceCardText(const edm::ParameterSet& iConfig):
-  m_rctInputLabel(iConfig.getParameter<edm::InputTag>("RctInputLabel")),
-  m_textFileName(iConfig.getParameter<std::string>("TextFileName")),
-  m_nevt(0)
-{
+RctDigiToSourceCardText::RctDigiToSourceCardText(
+    const edm::ParameterSet &iConfig)
+    : m_rctInputLabel(iConfig.getParameter<edm::InputTag>("RctInputLabel")),
+      m_textFileName(iConfig.getParameter<std::string>("TextFileName")),
+      m_nevt(0) {
   // Open the output file
-  m_file.open(m_textFileName.c_str(),std::ios::out);
+  m_file.open(m_textFileName.c_str(), std::ios::out);
 
-  if(!m_file.good())
-    {
-      throw cms::Exception("RctDigiToSourceCardTextFileOpenError")
-	<< "RctDigiToSourceCardText::RctDigiToSourceCardText : "
-	<< " couldn't open the file " << m_textFileName << " for writing" << std::endl;
-    }
+  if (!m_file.good()) {
+    throw cms::Exception("RctDigiToSourceCardTextFileOpenError")
+        << "RctDigiToSourceCardText::RctDigiToSourceCardText : "
+        << " couldn't open the file " << m_textFileName << " for writing"
+        << std::endl;
+  }
 
   // Make a SC routing object
-  SourceCardRouting m_scRouting; 
+  SourceCardRouting m_scRouting;
 }
 
-
-RctDigiToSourceCardText::~RctDigiToSourceCardText()
-{
+RctDigiToSourceCardText::~RctDigiToSourceCardText() {
   // Close the output file
   m_file.close();
 }
 
 // ------------ method called to for each event  ------------
-void RctDigiToSourceCardText::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void RctDigiToSourceCardText::analyze(const edm::Event &iEvent,
+                                      const edm::EventSetup &iSetup) {
 
   // get the RCT data
   Handle<L1CaloEmCollection> em;
@@ -66,27 +66,31 @@ void RctDigiToSourceCardText::analyze(const edm::Event& iEvent, const edm::Event
   std::string dataString;
 
   // Arrays to hold electron variables
-  unsigned short eIsoRank[18][4]={{0}};
-  unsigned short eIsoCardId[18][4]={{0}};
-  unsigned short eIsoRegionId[18][4]={{0}};
-  unsigned short eNonIsoRank[18][4]={{0}};
-  unsigned short eNonIsoCardId[18][4]={{0}};
-  unsigned short eNonIsoRegionId[18][4]={{0}};
+  unsigned short eIsoRank[18][4] = {{0}};
+  unsigned short eIsoCardId[18][4] = {{0}};
+  unsigned short eIsoRegionId[18][4] = {{0}};
+  unsigned short eNonIsoRank[18][4] = {{0}};
+  unsigned short eNonIsoCardId[18][4] = {{0}};
+  unsigned short eNonIsoRegionId[18][4] = {{0}};
 
   // Fill electrons
-  unsigned numIsoEM[18]={0};
-  unsigned numNonIsoEM[18]={0};
-
-  for (L1CaloEmCollection::const_iterator iem=em->begin(); iem!=em->end(); iem++){
-    if (iem->isolated()){
-      eIsoRank[iem->rctCrate()][numIsoEM[iem->rctCrate()]]=iem->rank();
-      eIsoCardId[iem->rctCrate()][numIsoEM[iem->rctCrate()]]=iem->rctCard();
-      eIsoRegionId[iem->rctCrate()][numIsoEM[iem->rctCrate()]]=iem->rctRegion();
+  unsigned numIsoEM[18] = {0};
+  unsigned numNonIsoEM[18] = {0};
+
+  for (L1CaloEmCollection::const_iterator iem = em->begin(); iem != em->end();
+       iem++) {
+    if (iem->isolated()) {
+      eIsoRank[iem->rctCrate()][numIsoEM[iem->rctCrate()]] = iem->rank();
+      eIsoCardId[iem->rctCrate()][numIsoEM[iem->rctCrate()]] = iem->rctCard();
+      eIsoRegionId[iem->rctCrate()][numIsoEM[iem->rctCrate()]] =
+          iem->rctRegion();
       numIsoEM[iem->rctCrate()]++;
     } else {
-      eNonIsoRank[iem->rctCrate()][numNonIsoEM[iem->rctCrate()]]=iem->rank();
-      eNonIsoCardId[iem->rctCrate()][numNonIsoEM[iem->rctCrate()]]=iem->rctCard();
-      eNonIsoRegionId[iem->rctCrate()][numNonIsoEM[iem->rctCrate()]]=iem->rctRegion();
+      eNonIsoRank[iem->rctCrate()][numNonIsoEM[iem->rctCrate()]] = iem->rank();
+      eNonIsoCardId[iem->rctCrate()][numNonIsoEM[iem->rctCrate()]] =
+          iem->rctCard();
+      eNonIsoRegionId[iem->rctCrate()][numNonIsoEM[iem->rctCrate()]] =
+          iem->rctRegion();
       numNonIsoEM[iem->rctCrate()]++;
     }
     // Debug info
@@ -98,31 +102,38 @@ void RctDigiToSourceCardText::analyze(const edm::Event& iEvent, const edm::Event
   }
 
   // Arrays to hold region variables
-  unsigned short RC[18][7][2]={{{0}}};
-  unsigned short RCof[18][7][2]={{{0}}};
-  unsigned short RCtau[18][7][2]={{{0}}};
-  unsigned short HF[18][4][2]={{{0}}};
-  unsigned short HFQ[18][4][2]={{{0}}};
-  unsigned short MIPbits[18][7][2]={{{0}}};
-  unsigned short Qbits[18][7][2]={{{0}}};  
+  unsigned short RC[18][7][2] = {{{0}}};
+  unsigned short RCof[18][7][2] = {{{0}}};
+  unsigned short RCtau[18][7][2] = {{{0}}};
+  unsigned short HF[18][4][2] = {{{0}}};
+  unsigned short HFQ[18][4][2] = {{{0}}};
+  unsigned short MIPbits[18][7][2] = {{{0}}};
+  unsigned short Qbits[18][7][2] = {{{0}}};
 
   // Fill regions
-  for (L1CaloRegionCollection::const_iterator irgn=rgn->begin(); irgn!=rgn->end(); irgn++){
-    if (irgn->id().isHf()){
-      HF[irgn->rctCrate()][irgn->id().rctEta()-7][irgn->id().rctPhi()]=irgn->et();
-      HFQ[irgn->rctCrate()][irgn->id().rctEta()-7][irgn->id().rctPhi()]=irgn->fineGrain();	
+  for (L1CaloRegionCollection::const_iterator irgn = rgn->begin();
+       irgn != rgn->end(); irgn++) {
+    if (irgn->id().isHf()) {
+      HF[irgn->rctCrate()][irgn->id().rctEta() - 7][irgn->id().rctPhi()] =
+          irgn->et();
+      HFQ[irgn->rctCrate()][irgn->id().rctEta() - 7][irgn->id().rctPhi()] =
+          irgn->fineGrain();
       // Debug info
-      LogDebug("HFRegions") << "Et=" << irgn->et()
-                            << " FineGrain=" << irgn->fineGrain()
-                            << " Eta=" << irgn->id().rctEta()
-                            << " Phi=" << irgn->id().rctPhi()
-                            << " Crate=" << irgn->rctCrate();
+      LogDebug("HFRegions")
+          << "Et=" << irgn->et() << " FineGrain=" << irgn->fineGrain()
+          << " Eta=" << irgn->id().rctEta() << " Phi=" << irgn->id().rctPhi()
+          << " Crate=" << irgn->rctCrate();
     } else {
-      RC[irgn->rctCrate()][irgn->rctCard()][irgn->rctRegionIndex()]=irgn->et();		
-      RCof[irgn->rctCrate()][irgn->rctCard()][irgn->rctRegionIndex()]=irgn->overFlow();			
-      RCtau[irgn->rctCrate()][irgn->rctCard()][irgn->rctRegionIndex()]=irgn->tauVeto();
-      MIPbits[irgn->rctCrate()][irgn->rctCard()][irgn->rctRegionIndex()]=irgn->mip();
-      Qbits[irgn->rctCrate()][irgn->rctCard()][irgn->rctRegionIndex()]=irgn->quiet();
+      RC[irgn->rctCrate()][irgn->rctCard()][irgn->rctRegionIndex()] =
+          irgn->et();
+      RCof[irgn->rctCrate()][irgn->rctCard()][irgn->rctRegionIndex()] =
+          irgn->overFlow();
+      RCtau[irgn->rctCrate()][irgn->rctCard()][irgn->rctRegionIndex()] =
+          irgn->tauVeto();
+      MIPbits[irgn->rctCrate()][irgn->rctCard()][irgn->rctRegionIndex()] =
+          irgn->mip();
+      Qbits[irgn->rctCrate()][irgn->rctCard()][irgn->rctRegionIndex()] =
+          irgn->quiet();
       // Debug info
       LogDebug("Regions") << "Et=" << irgn->et()
                           << " OverFlow=" << irgn->overFlow()
@@ -135,86 +146,61 @@ void RctDigiToSourceCardText::analyze(const edm::Event& iEvent, const edm::Event
     }
   }
 
-  for (int crate=0; crate<NUM_RCT_CRATES; crate++){
+  for (int crate = 0; crate < NUM_RCT_CRATES; crate++) {
 
     // Logical Card ID = Source Card number
-    RoutingMode=0;
-    m_scRouting.RoutingModetoLogicalCardID(logicalCardID,RoutingMode,crate);
+    RoutingMode = 0;
+    m_scRouting.RoutingModetoLogicalCardID(logicalCardID, RoutingMode, crate);
 
     // Convert electrons to SC format
-    m_scRouting.EMUtoSTRING(logicalCardID,
-			    m_nevt,
-			    eIsoRank[crate],
-			    eIsoCardId[crate],
-			    eIsoRegionId[crate],
-			    eNonIsoRank[crate],
-			    eNonIsoCardId[crate],
-			    eNonIsoRegionId[crate],
-			    MIPbits[crate],
-			    Qbits[crate],
-			    dataString);
+    m_scRouting.EMUtoSTRING(
+        logicalCardID, m_nevt, eIsoRank[crate], eIsoCardId[crate],
+        eIsoRegionId[crate], eNonIsoRank[crate], eNonIsoCardId[crate],
+        eNonIsoRegionId[crate], MIPbits[crate], Qbits[crate], dataString);
 
     // Write electrons
     m_file << dataString;
 
     // Logical Card ID = Source Card number
-    RoutingMode=1;
-    m_scRouting.RoutingModetoLogicalCardID(logicalCardID,RoutingMode,crate);
- 
+    RoutingMode = 1;
+    m_scRouting.RoutingModetoLogicalCardID(logicalCardID, RoutingMode, crate);
+
     // Convert regions to SC format
-    m_scRouting.RC56HFtoSTRING(logicalCardID,
-                               m_nevt,
-                               RC[crate],
-                               RCof[crate],
-                               RCtau[crate],
-                               HF[crate],
-                               HFQ[crate],
-                               dataString);
-  
+    m_scRouting.RC56HFtoSTRING(logicalCardID, m_nevt, RC[crate], RCof[crate],
+                               RCtau[crate], HF[crate], HFQ[crate], dataString);
+
     // Write regions
     m_file << dataString;
 
-    // Logical Card ID = Source Card number  		
-    RoutingMode=2;
-    m_scRouting.RoutingModetoLogicalCardID(logicalCardID,RoutingMode,crate);
+    // Logical Card ID = Source Card number
+    RoutingMode = 2;
+    m_scRouting.RoutingModetoLogicalCardID(logicalCardID, RoutingMode, crate);
 
-    // Convert regions to SC format  
-    m_scRouting.RC012toSTRING(logicalCardID,
-                              m_nevt,
-                              RC[crate],
-                              RCof[crate],
-                              RCtau[crate],
-                              dataString);
+    // Convert regions to SC format
+    m_scRouting.RC012toSTRING(logicalCardID, m_nevt, RC[crate], RCof[crate],
+                              RCtau[crate], dataString);
 
     // Write regions
     m_file << dataString;
 
     // This is to 9 only as this is the shared source card
-    if (crate<9){ 
+    if (crate < 9) {
       // Logical Card ID = Source Card number
-      RoutingMode=3;					
-      m_scRouting.RoutingModetoLogicalCardID(logicalCardID,RoutingMode,crate);
-  
-      // Convert regions to SC format    
-      m_scRouting.RC234toSTRING(logicalCardID,
-                                m_nevt,
-                                RC[crate],
-                                RCof[crate],
-                                RCtau[crate],
-                                RC[crate+9],
-                                RCof[crate+9],
-                                RCtau[crate+9],
-                                dataString);
-    
+      RoutingMode = 3;
+      m_scRouting.RoutingModetoLogicalCardID(logicalCardID, RoutingMode, crate);
+
+      // Convert regions to SC format
+      m_scRouting.RC234toSTRING(logicalCardID, m_nevt, RC[crate], RCof[crate],
+                                RCtau[crate], RC[crate + 9], RCof[crate + 9],
+                                RCtau[crate + 9], dataString);
+
       // Write regions
       m_file << dataString;
     }
-    
   }
-  
-  // Force write to file 
+
+  // Force write to file
   m_file << flush;
 
   m_nevt++;
 }
-
diff --git a/L1Trigger/TextToDigi/plugins/RctDigiToSourceCardText.h b/L1Trigger/TextToDigi/plugins/RctDigiToSourceCardText.h
index ecfd7b6f2954e..fa60bec28c77e 100644
--- a/L1Trigger/TextToDigi/plugins/RctDigiToSourceCardText.h
+++ b/L1Trigger/TextToDigi/plugins/RctDigiToSourceCardText.h
@@ -5,10 +5,12 @@
 //
 // Package:    RctDigiToSourceCardText
 // Class:      RctDigiToSourceCardText
-// 
-/**\class RctDigiToSourceCardText RctDigiToSourceCardText.h L1Trigger/TextToDigi/interface/RctDigiToSourceCardText.h
+//
+/**\class RctDigiToSourceCardText RctDigiToSourceCardText.h
+ L1Trigger/TextToDigi/interface/RctDigiToSourceCardText.h
 
- Description: Input RCT digis and output text file to be loaded into the source cards for pattern tests. 
+ Description: Input RCT digis and output text file to be loaded into the source
+ cards for pattern tests.
 
  Implementation:
      <Notes on implementation>
@@ -19,13 +21,12 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -37,17 +38,17 @@
 
 #include "L1Trigger/TextToDigi/src/SourceCardRouting.h"
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 
 class RctDigiToSourceCardText : public edm::EDAnalyzer {
- public:
-  explicit RctDigiToSourceCardText(const edm::ParameterSet&);
-      ~RctDigiToSourceCardText() override;
-      
- private:
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-      
+public:
+  explicit RctDigiToSourceCardText(const edm::ParameterSet &);
+  ~RctDigiToSourceCardText() override;
+
+private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+
   /// Label for RCT digis
   edm::InputTag m_rctInputLabel;
 
diff --git a/L1Trigger/TextToDigi/plugins/RctInputTextToDigi.cc b/L1Trigger/TextToDigi/plugins/RctInputTextToDigi.cc
index dce639b3c9c9a..5131db2ce91f9 100644
--- a/L1Trigger/TextToDigi/plugins/RctInputTextToDigi.cc
+++ b/L1Trigger/TextToDigi/plugins/RctInputTextToDigi.cc
@@ -4,234 +4,214 @@
 // constructors and destructor
 //
 
-RctInputTextToDigi::RctInputTextToDigi(const edm::ParameterSet& iConfig) :
-  inputFile_(iConfig.getParameter<edm::FileInPath>("inputFile")),
-  inputStream_(inputFile_.fullPath().c_str()),
-  nEvent_(0),
-  oldVersion_(false),
-  lookupTables_(new L1RCTLookupTables)
-{
-  //register your products
+RctInputTextToDigi::RctInputTextToDigi(const edm::ParameterSet &iConfig)
+    : inputFile_(iConfig.getParameter<edm::FileInPath>("inputFile")),
+      inputStream_(inputFile_.fullPath().c_str()), nEvent_(0),
+      oldVersion_(false), lookupTables_(new L1RCTLookupTables) {
+  // register your products
   /* Examples
      produces<ExampleData2>();
-     
+
      //if do put with a label
      produces<ExampleData2>("label");
   */
-  
+
   produces<EcalTrigPrimDigiCollection>();
   produces<HcalTrigPrimDigiCollection>();
 
-  //now do what ever other initialization is needed
-
-  if ((!inputStream_.is_open())||(!inputStream_))
-    {
-      // not good!!
-      std::cerr << "Input file didn't open!!" << std::endl;
-    }
-  //if (inputStream_.eof()) {std::cout << "Real zeroth eof! " << std::endl;}
+  // now do what ever other initialization is needed
 
+  if ((!inputStream_.is_open()) || (!inputStream_)) {
+    // not good!!
+    std::cerr << "Input file didn't open!!" << std::endl;
+  }
+  // if (inputStream_.eof()) {std::cout << "Real zeroth eof! " << std::endl;}
 }
 
+RctInputTextToDigi::~RctInputTextToDigi() {
 
-RctInputTextToDigi::~RctInputTextToDigi()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 
   inputStream_.close();
-
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-RctInputTextToDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void RctInputTextToDigi::produce(edm::Event &iEvent,
+                                 const edm::EventSetup &iSetup) {
   using namespace edm;
 
-  //std::cout << std::endl << std::endl << "Event number " << nEvent_ << std::endl;
+  // std::cout << std::endl << std::endl << "Event number " << nEvent_ <<
+  // std::endl;
 
-  // This next section taken directly from 
+  // This next section taken directly from
   // L1Trigger/RegionalCaloTrigger/plugins/L1RCTProducer.cc rev. 1.6
   // Refresh configuration information every event
   // Hopefully doesn't take too much time
   ESHandle<L1RCTParameters> rctParameters;
   iSetup.get<L1RCTParametersRcd>().get(rctParameters);
-  const L1RCTParameters* r = rctParameters.product();
+  const L1RCTParameters *r = rctParameters.product();
   lookupTables_->setRCTParameters(r);
 
-  std::unique_ptr<EcalTrigPrimDigiCollection>
-    ecalTPs(new EcalTrigPrimDigiCollection());
-  std::unique_ptr<HcalTrigPrimDigiCollection> 
-    hcalTPs(new HcalTrigPrimDigiCollection());
-  ecalTPs->reserve(56*72); 
-  hcalTPs->reserve(56*72+18*8);  // includes HF
-  const int nEcalSamples = 1;   // we only use 1 sample for each
+  std::unique_ptr<EcalTrigPrimDigiCollection> ecalTPs(
+      new EcalTrigPrimDigiCollection());
+  std::unique_ptr<HcalTrigPrimDigiCollection> hcalTPs(
+      new HcalTrigPrimDigiCollection());
+  ecalTPs->reserve(56 * 72);
+  hcalTPs->reserve(56 * 72 + 18 * 8); // includes HF
+  const int nEcalSamples = 1;         // we only use 1 sample for each
   const int nHcalSamples = 1;
-  
-  int fileEventNumber; 
-  
+
+  int fileEventNumber;
+
   // check to see if need to skip file header and do so before
   // looping through entire event
-  
+
   std::string junk;
-  //bool old_version = false;
-  if (nEvent_ == 0)
-    {
-      //std::string junk;
-      unsigned short junk_counter = 0;
-      //bool old_version = false;
-      do
-	{
-	  if(inputStream_ >> junk) {/*std::cout << "Good: ";*/}
-	  //std::cout << "header junk was input: \"" << junk << "\"."
-	  //		     << std::endl;
-	  // for oldest version, which is same as newest version
-	  //	  if((junk_counter == 11) && (junk.compare("0-32") == 0))
-	  //	    {
-	  //	      oldVersion_ = true;
-	  //	    }
-	  if((junk_counter == 11) && (junk == "1-32"))
-	    {
-	      oldVersion_ = true;
-	    }
-	  junk_counter++;
-	}
-      while (junk != "LUTOut");
-      std::cout << "Skipped file header" << std::endl;
-      if (oldVersion_) {std::cout << "oldVersion_ TRUE (tower 1-32)" << std::endl;}
-      else {std::cout << "oldVersion_ FALSE (tower 0-31)" << std::endl;}
+  // bool old_version = false;
+  if (nEvent_ == 0) {
+    // std::string junk;
+    unsigned short junk_counter = 0;
+    // bool old_version = false;
+    do {
+      if (inputStream_ >> junk) { /*std::cout << "Good: ";*/
+      }
+      // std::cout << "header junk was input: \"" << junk << "\"."
+      //		     << std::endl;
+      // for oldest version, which is same as newest version
+      //	  if((junk_counter == 11) && (junk.compare("0-32") == 0))
+      //	    {
+      //	      oldVersion_ = true;
+      //	    }
+      if ((junk_counter == 11) && (junk == "1-32")) {
+        oldVersion_ = true;
+      }
+      junk_counter++;
+    } while (junk != "LUTOut");
+    std::cout << "Skipped file header" << std::endl;
+    if (oldVersion_) {
+      std::cout << "oldVersion_ TRUE (tower 1-32)" << std::endl;
+    } else {
+      std::cout << "oldVersion_ FALSE (tower 0-31)" << std::endl;
     }
-  
+  }
+
   // can't actually read in phi and eta, file has crate card tower instead
   // do a while loop for event number instead??  dunno
-  for (int i = 0; i < 72; i++)
-    {
-      // negative eta, iEta -28 to -1
-      for (int j = 0; j < 56; j++)
-	{
-	  // calc ieta, iphi coords of tower 
-	  // ieta -28 to -1 or 1 to 28, iphi 1 to 72
-	  // methods in CondFormats/L1TObjects/src/L1RCTParameters.cc
-	  
-	  unsigned short crate;
-	  unsigned short card;
-	  unsigned short tower;
-	  unsigned eAddr;
-	  unsigned hAddr;
-	  
-	  inputStream_ >> std::hex >> fileEventNumber >> crate >> card  
-		       >> tower
-		       >> eAddr >> hAddr >> junk >> std::dec;
-	  
-	  if (oldVersion_)
-	    {
-	      tower = tower - 1;
-	    }
-	  int encodedEtEcal = (int) (eAddr>>1);
-	  bool fineGrainEcal = (bool) (eAddr&1);
-	  int encodedEtHcal = (int) (hAddr>>1);
-	  bool fineGrainHcal = (bool) (hAddr&1);  // mip bit
-	  
-	  //std::cout << "Eventnumber " << fileEventNumber << "\tCrate " 
-	  //    << crate << "\tCard " << card << "\tTower " 
-	  //    << tower << " \teAddr " << eAddr <<"\thAddr "
-	  //    << hAddr << "\tjunk " << junk << std::endl;
-	  
-	  int iEta = lookupTables_->rctParameters()->calcIEta(crate,card,tower);
-	  int iPhi = lookupTables_->rctParameters()->calcIPhi(crate,card,tower);
-	  // transform rct iphi coords into global coords
-	  iPhi = ((72 + 18 - iPhi) % 72);
-	  if (iPhi == 0) {iPhi = 72;}
-	  unsigned absIeta = abs(iEta);
-	  int zSide = (iEta/absIeta);
-	  
-	  /*std::cout << "iEta " << iEta << "\tabsiEta " << absIeta 
-	    << "\tiPhi " << iPhi << "\tzSide " 
-	    << zSide << std::endl;
-	  */
-	  
-	  // args to detid are zside, type of tower, absieta, iphi
-	  // absieta and iphi must be between 1 and 127 inclusive
-
-	  EcalTriggerPrimitiveDigi 
-	    ecalDigi(EcalTrigTowerDetId(zSide, EcalTriggerTower, absIeta,
-					iPhi));
-	  ecalDigi.setSize(nEcalSamples);
-	  
-	  // last arg is 3-bit trigger tower flag, which we don't use
-	  // we only use 8-bit encoded et and 1-bit fg
-	  ecalDigi.setSample(0, EcalTriggerPrimitiveSample(encodedEtEcal, 
-							   fineGrainEcal, 0));
-	  //std::cout << ecalDigi << std::endl;
-	  ecalTPs->push_back(ecalDigi);
-	  
-	  HcalTriggerPrimitiveDigi
-	    hcalDigi(HcalTrigTowerDetId(iEta, iPhi));
-	  
-	  hcalDigi.setSize(nHcalSamples);
-	  
-	  // last two arg's are slb and slb channel, which we don't need
-	  hcalDigi.setSample(0, HcalTriggerPrimitiveSample(encodedEtHcal,
-							   fineGrainHcal,
-							   0, 0));
-	  //std::cout << hcalDigi << std::endl;
-	  hcalTPs->push_back(hcalDigi);
-	}
-      
-      // also need to push_back HF digis!  
-      // file input doesn't include HF, so need empty digis
-      for (int i = 0; i < 18; i++)
-	{
-	  for (int j = 0; j < 8; j++)
-	    {
-	      // HF ieta: +- 29 through 32.  HF iphi: 1,5,9,13,etc.
-	      int hfIEta = (j%4)+29;
-	      if (i < 9)
-		{
-		  hfIEta = hfIEta*(-1);
-		}
-	      // iphi shift not implemented, but not necessary here --
-	      // everything's filled with zeros so it's symmetric anyhow
-	      int hfIPhi = (i%9)*8 + (j/4)*4 + 1;
-	      
-	      HcalTriggerPrimitiveDigi
-		hfDigi(HcalTrigTowerDetId(hfIEta, hfIPhi));
-	      hfDigi.setSize(1);
-	      hfDigi.setSample(0, HcalTriggerPrimitiveSample(0,false,0,0));
-	      hcalTPs->push_back(hfDigi);
-	    }
-	}
+  for (int i = 0; i < 72; i++) {
+    // negative eta, iEta -28 to -1
+    for (int j = 0; j < 56; j++) {
+      // calc ieta, iphi coords of tower
+      // ieta -28 to -1 or 1 to 28, iphi 1 to 72
+      // methods in CondFormats/L1TObjects/src/L1RCTParameters.cc
+
+      unsigned short crate;
+      unsigned short card;
+      unsigned short tower;
+      unsigned eAddr;
+      unsigned hAddr;
+
+      inputStream_ >> std::hex >> fileEventNumber >> crate >> card >> tower >>
+          eAddr >> hAddr >> junk >> std::dec;
+
+      if (oldVersion_) {
+        tower = tower - 1;
+      }
+      int encodedEtEcal = (int)(eAddr >> 1);
+      bool fineGrainEcal = (bool)(eAddr & 1);
+      int encodedEtHcal = (int)(hAddr >> 1);
+      bool fineGrainHcal = (bool)(hAddr & 1); // mip bit
+
+      // std::cout << "Eventnumber " << fileEventNumber << "\tCrate "
+      //    << crate << "\tCard " << card << "\tTower "
+      //    << tower << " \teAddr " << eAddr <<"\thAddr "
+      //    << hAddr << "\tjunk " << junk << std::endl;
+
+      int iEta = lookupTables_->rctParameters()->calcIEta(crate, card, tower);
+      int iPhi = lookupTables_->rctParameters()->calcIPhi(crate, card, tower);
+      // transform rct iphi coords into global coords
+      iPhi = ((72 + 18 - iPhi) % 72);
+      if (iPhi == 0) {
+        iPhi = 72;
+      }
+      unsigned absIeta = abs(iEta);
+      int zSide = (iEta / absIeta);
+
+      /*std::cout << "iEta " << iEta << "\tabsiEta " << absIeta
+        << "\tiPhi " << iPhi << "\tzSide "
+        << zSide << std::endl;
+      */
+
+      // args to detid are zside, type of tower, absieta, iphi
+      // absieta and iphi must be between 1 and 127 inclusive
+
+      EcalTriggerPrimitiveDigi ecalDigi(
+          EcalTrigTowerDetId(zSide, EcalTriggerTower, absIeta, iPhi));
+      ecalDigi.setSize(nEcalSamples);
+
+      // last arg is 3-bit trigger tower flag, which we don't use
+      // we only use 8-bit encoded et and 1-bit fg
+      ecalDigi.setSample(
+          0, EcalTriggerPrimitiveSample(encodedEtEcal, fineGrainEcal, 0));
+      // std::cout << ecalDigi << std::endl;
+      ecalTPs->push_back(ecalDigi);
+
+      HcalTriggerPrimitiveDigi hcalDigi(HcalTrigTowerDetId(iEta, iPhi));
+
+      hcalDigi.setSize(nHcalSamples);
+
+      // last two arg's are slb and slb channel, which we don't need
+      hcalDigi.setSample(
+          0, HcalTriggerPrimitiveSample(encodedEtHcal, fineGrainHcal, 0, 0));
+      // std::cout << hcalDigi << std::endl;
+      hcalTPs->push_back(hcalDigi);
     }
+
+    // also need to push_back HF digis!
+    // file input doesn't include HF, so need empty digis
+    for (int i = 0; i < 18; i++) {
+      for (int j = 0; j < 8; j++) {
+        // HF ieta: +- 29 through 32.  HF iphi: 1,5,9,13,etc.
+        int hfIEta = (j % 4) + 29;
+        if (i < 9) {
+          hfIEta = hfIEta * (-1);
+        }
+        // iphi shift not implemented, but not necessary here --
+        // everything's filled with zeros so it's symmetric anyhow
+        int hfIPhi = (i % 9) * 8 + (j / 4) * 4 + 1;
+
+        HcalTriggerPrimitiveDigi hfDigi(HcalTrigTowerDetId(hfIEta, hfIPhi));
+        hfDigi.setSize(1);
+        hfDigi.setSample(0, HcalTriggerPrimitiveSample(0, false, 0, 0));
+        hcalTPs->push_back(hfDigi);
+      }
+    }
+  }
   iEvent.put(std::move(ecalTPs));
   iEvent.put(std::move(hcalTPs));
-  
+
   nEvent_++;
-  //std::cout << "Produce done" << std::endl;
+  // std::cout << "Produce done" << std::endl;
 }
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-RctInputTextToDigi::beginJob() 
-{
+// ------------ method called once each job just before starting event loop
+// ------------
+void RctInputTextToDigi::beginJob() {
   // open input file to read all events
-  //inputStream_.open(inputFile_.fullPath().c_str());
-  //std::cout << "beginJob entered" << std::endl;
+  // inputStream_.open(inputFile_.fullPath().c_str());
+  // std::cout << "beginJob entered" << std::endl;
 }
 
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-RctInputTextToDigi::endJob() 
-{
+// ------------ method called once each job just after ending the event loop
+// ------------
+void RctInputTextToDigi::endJob() {
   // close input file
-  //inputStream_.close();
+  // inputStream_.close();
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(RctInputTextToDigi);
diff --git a/L1Trigger/TextToDigi/plugins/RctInputTextToDigi.h b/L1Trigger/TextToDigi/plugins/RctInputTextToDigi.h
index 92b4e66b6e86e..04aa86fd045f3 100644
--- a/L1Trigger/TextToDigi/plugins/RctInputTextToDigi.h
+++ b/L1Trigger/TextToDigi/plugins/RctInputTextToDigi.h
@@ -4,11 +4,12 @@
 // -*- C++ -*-
 //
 // Class:      RctInputTextToDigi
-// 
-/**\class RctInputTextToDigi L1Trigger/TextToDigi/plugins/RctInputTextToDigi.cc L1Trigger/TextToDigi/plugins/RctInputTextToDigi.h
+//
+/**\class RctInputTextToDigi L1Trigger/TextToDigi/plugins/RctInputTextToDigi.cc
+ L1Trigger/TextToDigi/plugins/RctInputTextToDigi.h
 
  Description: Creates an EcalTrigPrimDigiCollection and an
- HcalTrigPrimDigiCollection from a text file (formatted as 
+ HcalTrigPrimDigiCollection from a text file (formatted as
  read out from saveRCTInput module), for input to the
  L1Trigger/RegionalCaloTrigger module.
 
@@ -20,28 +21,27 @@
 //
 //
 
-
 // system include files
-#include <memory>
-#include <string>
 #include <fstream>
 #include <iostream>
+#include <memory>
+#include <string>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDProducer.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
+#include "CondFormats/DataRecord/interface/L1RCTParametersRcd.h"
+#include "CondFormats/L1TObjects/interface/L1RCTParameters.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 #include "L1Trigger/RegionalCaloTrigger/interface/L1RCTLookupTables.h"
-#include "CondFormats/L1TObjects/interface/L1RCTParameters.h"
-#include "CondFormats/DataRecord/interface/L1RCTParametersRcd.h"
 
 //
 // class declaration
@@ -49,21 +49,21 @@
 
 class RctInputTextToDigi : public edm::EDProducer {
 public:
-  explicit RctInputTextToDigi(const edm::ParameterSet&);
+  explicit RctInputTextToDigi(const edm::ParameterSet &);
   ~RctInputTextToDigi() override;
 
 private:
   void beginJob() override;
-  void produce(edm::Event&, const edm::EventSetup&) override;
-  void endJob() override ;
-      
+  void produce(edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
+
   // ----------member data ---------------------------
-  
+
   edm::FileInPath inputFile_;
   std::ifstream inputStream_;
   int nEvent_;
   bool oldVersion_;
-  L1RCTLookupTables* lookupTables_;
+  L1RCTLookupTables *lookupTables_;
 };
 
 #endif
diff --git a/L1Trigger/TextToDigi/plugins/RctTextToRctDigi.cc b/L1Trigger/TextToDigi/plugins/RctTextToRctDigi.cc
index 78a79e361c50a..fb2002cd97393 100644
--- a/L1Trigger/TextToDigi/plugins/RctTextToRctDigi.cc
+++ b/L1Trigger/TextToDigi/plugins/RctTextToRctDigi.cc
@@ -2,8 +2,9 @@
 //
 // Package:    RctTextToRctDigi
 // Class:      RctTextToRctDigi
-// 
-/**\class RctTextToRctDigi RctTextToRctDigi.cc L1Trigger/TextToDigi/src/RctTextToRctDigi.cc
+//
+/**\class RctTextToRctDigi RctTextToRctDigi.cc
+L1Trigger/TextToDigi/src/RctTextToRctDigi.cc
 
 Description: Makes RCT digis from the file format specified by Pam Klabbers
 
@@ -12,24 +13,28 @@ Description: Makes RCT digis from the file format specified by Pam Klabbers
 // Original Author:  Alex Tapper
 //         Created:  Fri Mar  9 19:11:51 CET 2007
 
-// Rct Input File Format 
-// Line 1: Crossing no as "Crossing x" (2)     
-// Line 2: isoe0 isoe1 isoe2 isoe3 nonIsoe0 nonIsoe1 nonIso2 nonIso3 (8) 
-// Line 3: RC0mip0 RC0mip1 RC1mip0 RC1mip1 RC2mip0 RC2mip1 RC3mip0 RC3mip1 RC4mip0 RC4mip1 
+// Rct Input File Format
+// Line 1: Crossing no as "Crossing x" (2)
+// Line 2: isoe0 isoe1 isoe2 isoe3 nonIsoe0 nonIsoe1 nonIso2 nonIso3 (8)
+// Line 3: RC0mip0 RC0mip1 RC1mip0 RC1mip1 RC2mip0 RC2mip1 RC3mip0 RC3mip1
+// RC4mip0 RC4mip1
 //         RC5mip0 RC5mip1 RC6mip0 RC6mip1 (14)
-// Line 4: RC0qt0 RCqt1 RC1qt0 RC1qt1 RC2qt0 RC2qt1 RC3qt0 RC3qt1 RC4qt0 RC4qt1 
+// Line 4: RC0qt0 RCqt1 RC1qt0 RC1qt1 RC2qt0 RC2qt1 RC3qt0 RC3qt1 RC4qt0 RC4qt1
 //         RC5qt0 RC5qt1 RC6qt0 RC6qt1 (14)
-// Line 5: RC0reg0 RC0reg1 RC1reg0 RC1reg1 RC2reg0 RC2reg1 RC3reg0 RC3reg1 RC4reg0 RC4reg1
+// Line 5: RC0reg0 RC0reg1 RC1reg0 RC1reg1 RC2reg0 RC2reg1 RC3reg0 RC3reg1
+// RC4reg0 RC4reg1
 //         RC5reg0 RC5reg1 RC6reg0 RC6reg1 (14)
 // Line 6: HF0eta0 HF0eta1 HF0eta2 HF0eta3 HF1eta0 HF1eta1 HF1eta2 HF1eta3 (8)
 //
-// NOTE:  CMS IN 2004/009 specifies that cable four provides 8 Quiet (fineGrain) bits for the HF.  These are not
-//        detailed in the fileformat above, and are not currently dealt with in any way. Set to true.
-// 
+// NOTE:  CMS IN 2004/009 specifies that cable four provides 8 Quiet (fineGrain)
+// bits for the HF.  These are not
+//        detailed in the fileformat above, and are not currently dealt with in
+//        any way. Set to true.
+//
 
-#include "RctTextToRctDigi.h"
-#include "FWCore/ServiceRegistry/interface/Service.h" // Framework services
 #include "FWCore/MessageLogger/interface/MessageLogger.h" // Logger
+#include "FWCore/ServiceRegistry/interface/Service.h"     // Framework services
+#include "RctTextToRctDigi.h"
 #include <iomanip>
 
 using namespace edm;
@@ -38,197 +43,193 @@ using namespace std;
 // Set constant
 const static unsigned NUM_RCT_CRATES = 18;
 
-RctTextToRctDigi::RctTextToRctDigi(const edm::ParameterSet& iConfig):
-  m_textFileName(iConfig.getParameter<std::string>("TextFileName")),
-  m_fileEventOffset(iConfig.getParameter<int>("FileEventOffset")),
-  m_nevt(0)
-{
+RctTextToRctDigi::RctTextToRctDigi(const edm::ParameterSet &iConfig)
+    : m_textFileName(iConfig.getParameter<std::string>("TextFileName")),
+      m_fileEventOffset(iConfig.getParameter<int>("FileEventOffset")),
+      m_nevt(0) {
   // Produces collections
   produces<L1CaloEmCollection>();
   produces<L1CaloRegionCollection>();
 
   // Open the input files
-  for (unsigned i=0; i<NUM_RCT_CRATES; i++){
+  for (unsigned i = 0; i < NUM_RCT_CRATES; i++) {
     std::stringstream fileStream;
-    fileStream << m_textFileName << std::setw(2) << std::setfill('0') << i << ".txt";
+    fileStream << m_textFileName << std::setw(2) << std::setfill('0') << i
+               << ".txt";
     std::string fileName(fileStream.str());
-    m_file[i].open(fileName.c_str(),std::ios::in);
-
-    if(!m_file[i].good())
-      {
-        //throw cms::Exception("RctTextToRctDigiTextFileOpenError")
-	LogDebug("RctTextToRctDigi")
-          << "RctTextToRctDigi::RctTextToRctDigi : "
-          << " couldn't open the file " << fileName << "...skipping!" << std::endl;
-      }
+    m_file[i].open(fileName.c_str(), std::ios::in);
+
+    if (!m_file[i].good()) {
+      // throw cms::Exception("RctTextToRctDigiTextFileOpenError")
+      LogDebug("RctTextToRctDigi") << "RctTextToRctDigi::RctTextToRctDigi : "
+                                   << " couldn't open the file " << fileName
+                                   << "...skipping!" << std::endl;
+    }
   }
 }
 
-RctTextToRctDigi::~RctTextToRctDigi()
-{
+RctTextToRctDigi::~RctTextToRctDigi() {
   // Close the input files
-  for (unsigned i=0; i<NUM_RCT_CRATES; i++){  
+  for (unsigned i = 0; i < NUM_RCT_CRATES; i++) {
     m_file[i].close();
   }
 }
 
 /// Append empty digi collection/n
-void RctTextToRctDigi::putEmptyDigi(edm::Event& iEvent) {
-  std::unique_ptr<L1CaloEmCollection> em (new L1CaloEmCollection);
-  std::unique_ptr<L1CaloRegionCollection> rgn (new L1CaloRegionCollection);
-    for (unsigned i=0; i<NUM_RCT_CRATES; i++){  
-      for (unsigned j=0; j<4; j++) {
-	em->push_back(L1CaloEmCand(0, i, true));
-	em->push_back(L1CaloEmCand(0, i, false));
-      }
-      for (unsigned j=0; j<14; j++)
-	rgn->push_back(L1CaloRegion(0,false,false,false,false,i,j/2,j%2));
-      for (unsigned j=0; j<8; j++)
-	rgn->push_back(L1CaloRegion(0,true,i,j));
+void RctTextToRctDigi::putEmptyDigi(edm::Event &iEvent) {
+  std::unique_ptr<L1CaloEmCollection> em(new L1CaloEmCollection);
+  std::unique_ptr<L1CaloRegionCollection> rgn(new L1CaloRegionCollection);
+  for (unsigned i = 0; i < NUM_RCT_CRATES; i++) {
+    for (unsigned j = 0; j < 4; j++) {
+      em->push_back(L1CaloEmCand(0, i, true));
+      em->push_back(L1CaloEmCand(0, i, false));
     }
-    iEvent.put(std::move(em));
-    iEvent.put(std::move(rgn));
+    for (unsigned j = 0; j < 14; j++)
+      rgn->push_back(
+          L1CaloRegion(0, false, false, false, false, i, j / 2, j % 2));
+    for (unsigned j = 0; j < 8; j++)
+      rgn->push_back(L1CaloRegion(0, true, i, j));
+  }
+  iEvent.put(std::move(em));
+  iEvent.put(std::move(rgn));
 }
 
 /// Syncronize bunch crossing number/n
-void RctTextToRctDigi::bxSynchro(int &bx,int crate) {
+void RctTextToRctDigi::bxSynchro(int &bx, int crate) {
   std::string tmp;
   // bypass bx input until correct bx is reached
-  while(bx<m_nevt+m_fileEventOffset) {
-    for (int j=0; j<6; j++){
-      getline(m_file[crate],tmp);
+  while (bx < m_nevt + m_fileEventOffset) {
+    for (int j = 0; j < 6; j++) {
+      getline(m_file[crate], tmp);
     }
     m_file[crate] >> tmp >> bx;
-    if(tmp!="Crossing")
+    if (tmp != "Crossing")
       throw cms::Exception("RctTextToRctDigiTextFileReadError")
-	<< "RctTextToRctDigi::bxSynchro : "
-	<< " something screwy happened Crossing!=" << tmp << std::endl;
+          << "RctTextToRctDigi::bxSynchro : "
+          << " something screwy happened Crossing!=" << tmp << std::endl;
   }
 }
 
 // ------------ method called to produce the data  ------------
-void RctTextToRctDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void RctTextToRctDigi::produce(edm::Event &iEvent,
+                               const edm::EventSetup &iSetup) {
 
   // Skip event if required
-  if (m_nevt < m_fileEventOffset){ 
-    //string tmp;
-    //for (int i=0; i<6; i++){
+  if (m_nevt < m_fileEventOffset) {
+    // string tmp;
+    // for (int i=0; i<6; i++){
     //  getline(m_file[i],tmp);
-    //} 
+    //}
     putEmptyDigi(iEvent);
     m_nevt++;
     return;
   }
 
   // New collections
-  std::unique_ptr<L1CaloEmCollection> em (new L1CaloEmCollection);
-  std::unique_ptr<L1CaloRegionCollection> rgn (new L1CaloRegionCollection);
+  std::unique_ptr<L1CaloEmCollection> em(new L1CaloEmCollection);
+  std::unique_ptr<L1CaloRegionCollection> rgn(new L1CaloRegionCollection);
 
   // Loop over RCT crates
-  for (unsigned i=0; i<NUM_RCT_CRATES; i++){  
+  for (unsigned i = 0; i < NUM_RCT_CRATES; i++) {
 
-    if(!m_file[i].good()) {
+    if (!m_file[i].good()) {
       continue;
     }
 
     // Check we're not at the end of the file
-    if(m_file[i].eof())
-      {
-        //throw cms::Exception("RctTextToRctDigiTextFileReadError")
-	LogDebug("RctTextToRctDigi")
+    if (m_file[i].eof()) {
+      // throw cms::Exception("RctTextToRctDigiTextFileReadError")
+      LogDebug("RctTextToRctDigi")
           << "RctTextToRctDigi::produce : "
-          << " unexpected end of file " << m_textFileName << i 
-	  << " adding empty collection for event !"
-	  << std::endl;
-	putEmptyDigi(iEvent);
-	continue;
-      }      
-    
+          << " unexpected end of file " << m_textFileName << i
+          << " adding empty collection for event !" << std::endl;
+      putEmptyDigi(iEvent);
+      continue;
+    }
+
     // Check we're at the start of an event
     std::string tmp;
-    m_file[i]>> tmp;
-    if(tmp!="Crossing")
-      {
-        throw cms::Exception("RctTextToRctDigiTextFileReadError")
+    m_file[i] >> tmp;
+    if (tmp != "Crossing") {
+      throw cms::Exception("RctTextToRctDigiTextFileReadError")
           << "RctTextToRctDigi::produce : "
           << " something screwy happened Crossing!=" << tmp << std::endl;
-      }      
+    }
 
     // Read BX number
     dec(m_file[i]);
     int BXNum;
-    m_file[i]>>BXNum;
-    
+    m_file[i] >> BXNum;
+
     /// Synchronize bunch crossing
-    bxSynchro(BXNum,i);
- 
-    if(BXNum!=m_nevt+m_fileEventOffset)
+    bxSynchro(BXNum, i);
+
+    if (BXNum != m_nevt + m_fileEventOffset)
       throw cms::Exception("RctTextToRctDigiTextSyncError")
-	<< "RctTextToRctDigi::produce : "
-	<< " something screwy happened "
-	<< "evt:" << m_nevt << " != bx:" << BXNum << " + " << m_fileEventOffset 
-	<< std::endl;
-    
+          << "RctTextToRctDigi::produce : "
+          << " something screwy happened "
+          << "evt:" << m_nevt << " != bx:" << BXNum << " + "
+          << m_fileEventOffset << std::endl;
+
     // Buffers
     unsigned long int uLongBuffer;
-    bool mipBitBuffer[14],qBitBuffer[14];
+    bool mipBitBuffer[14], qBitBuffer[14];
 
     // All in hex from now on
-    hex(m_file[i]); 
+    hex(m_file[i]);
 
     // Isolated electrons
-    for (unsigned j=0; j<4; j++){
+    for (unsigned j = 0; j < 4; j++) {
       m_file[i] >> uLongBuffer;
-      em->push_back(L1CaloEmCand(uLongBuffer, i, true, j,BXNum,false));
+      em->push_back(L1CaloEmCand(uLongBuffer, i, true, j, BXNum, false));
     }
 
     // Non-isolated electrons
-    for (unsigned j=0; j<4; j++){
+    for (unsigned j = 0; j < 4; j++) {
       m_file[i] >> uLongBuffer;
-      em->push_back(L1CaloEmCand(uLongBuffer, i, false, j,BXNum,false));
-    }      
-    
-    // MIP bits 
-    for (unsigned j=0; j<14; j++){
+      em->push_back(L1CaloEmCand(uLongBuffer, i, false, j, BXNum, false));
+    }
+
+    // MIP bits
+    for (unsigned j = 0; j < 14; j++) {
       m_file[i] >> mipBitBuffer[j];
-    }   
+    }
 
-    // Quiet bits 
-    for (unsigned j=0; j<14; j++){
+    // Quiet bits
+    for (unsigned j = 0; j < 14; j++) {
       m_file[i] >> qBitBuffer[j];
-    }     
+    }
 
     // Barrel and endcap regions
-    for (unsigned j=0; j<14; j++){
+    for (unsigned j = 0; j < 14; j++) {
       m_file[i] >> uLongBuffer;
 
-      unsigned et = uLongBuffer & 0x3ff;  // put the first 10 bits of rawData into the Et
-      uLongBuffer >>= 10;  // shift the remaining bits down to remove the 10 bits of Et
-      
-      bool overFlow = ((uLongBuffer & 0x1)        != 0); //LSB is now overflow bit
-      bool tauVeto  = (((uLongBuffer & 0x2) >> 1) != 0); //2nd bit is tauveto      
+      unsigned et =
+          uLongBuffer & 0x3ff; // put the first 10 bits of rawData into the Et
+      uLongBuffer >>=
+          10; // shift the remaining bits down to remove the 10 bits of Et
+
+      bool overFlow = ((uLongBuffer & 0x1) != 0); // LSB is now overflow bit
+      bool tauVeto = (((uLongBuffer & 0x2) >> 1) != 0); // 2nd bit is tauveto
+
+      rgn->push_back(L1CaloRegion(et, overFlow, tauVeto, mipBitBuffer[j],
+                                  qBitBuffer[j], i, j / 2, j % 2));
+    }
 
-      rgn->push_back(L1CaloRegion(et,overFlow,tauVeto,mipBitBuffer[j],qBitBuffer[j],i,j/2,j%2));
-    }      
-    
     // HF
-    for (unsigned j=0; j<8; j++){
+    for (unsigned j = 0; j < 8; j++) {
       m_file[i] >> uLongBuffer;
 
-      unsigned et = uLongBuffer & 0xff;  // put the first 8 bits into the Et
+      unsigned et = uLongBuffer & 0xff; // put the first 8 bits into the Et
 
-      rgn->push_back(L1CaloRegion(et,true,i,j));
-    }        
+      rgn->push_back(L1CaloRegion(et, true, i, j));
+    }
 
-    dec(m_file[i]); 
+    dec(m_file[i]);
   }
-  
+
   iEvent.put(std::move(em));
   iEvent.put(std::move(rgn));
 
   m_nevt++;
 }
-
-
-
diff --git a/L1Trigger/TextToDigi/plugins/RctTextToRctDigi.h b/L1Trigger/TextToDigi/plugins/RctTextToRctDigi.h
index a1d1aa4f1dd4c..fd8d341e258e2 100644
--- a/L1Trigger/TextToDigi/plugins/RctTextToRctDigi.h
+++ b/L1Trigger/TextToDigi/plugins/RctTextToRctDigi.h
@@ -5,8 +5,9 @@
 //
 // Package:    RctTextToRctDigi
 // Class:      RctTextToRctDigi
-// 
-/**\class RctTextToRctDigi RctTextToRctDigi.h L1Trigger/TextToDigi/src/RctTextToRctDigi.h
+//
+/**\class RctTextToRctDigi RctTextToRctDigi.h
+ L1Trigger/TextToDigi/src/RctTextToRctDigi.h
 
  Description: Makes RCT digis from the file format specified by Pam Klabbers
 
@@ -17,13 +18,12 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -33,22 +33,22 @@
 // RCT data includes
 #include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 
 class RctTextToRctDigi : public edm::EDProducer {
- public:
-  explicit RctTextToRctDigi(const edm::ParameterSet&);
+public:
+  explicit RctTextToRctDigi(const edm::ParameterSet &);
   ~RctTextToRctDigi() override;
-  
- private:
-  void produce(edm::Event&, const edm::EventSetup&) override;
+
+private:
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
   /// Create empty digi collection
-  void putEmptyDigi(edm::Event&);
+  void putEmptyDigi(edm::Event &);
 
   /// Synchronize bunch crossing
-  void bxSynchro(int &,int);
+  void bxSynchro(int &, int);
 
   /// Name out input file
   std::string m_textFileName;
@@ -58,10 +58,9 @@ class RctTextToRctDigi : public edm::EDProducer {
 
   /// Event counter
   int m_nevt;
-  
+
   /// file handle
   std::ifstream m_file[18];
-  
 };
 
 #endif
diff --git a/L1Trigger/TextToDigi/plugins/SealModule.cc b/L1Trigger/TextToDigi/plugins/SealModule.cc
index 402486eaff65f..e8cc1fd44f24d 100644
--- a/L1Trigger/TextToDigi/plugins/SealModule.cc
+++ b/L1Trigger/TextToDigi/plugins/SealModule.cc
@@ -1,13 +1,13 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "TextToRaw.h"
+#include "GctDigiToPsbText.h"
+#include "GtPsbTextToDigi.h"
 #include "RawToText.h"
+#include "RctDigiToRctText.h"
 #include "RctDigiToSourceCardText.h"
-#include "SourceCardTextToRctDigi.h"
 #include "RctTextToRctDigi.h"
-#include "RctDigiToRctText.h"
-#include "GtPsbTextToDigi.h"
-#include "GctDigiToPsbText.h"
+#include "SourceCardTextToRctDigi.h"
+#include "TextToRaw.h"
 
 DEFINE_FWK_MODULE(TextToRaw);
 DEFINE_FWK_MODULE(RawToText);
@@ -17,4 +17,3 @@ DEFINE_FWK_MODULE(RctTextToRctDigi);
 DEFINE_FWK_MODULE(RctDigiToRctText);
 DEFINE_FWK_MODULE(GtPsbTextToDigi);
 DEFINE_FWK_MODULE(GctDigiToPsbText);
-
diff --git a/L1Trigger/TextToDigi/plugins/SourceCardTextToRctDigi.cc b/L1Trigger/TextToDigi/plugins/SourceCardTextToRctDigi.cc
index db540e454d277..82f6a6cbd5468 100644
--- a/L1Trigger/TextToDigi/plugins/SourceCardTextToRctDigi.cc
+++ b/L1Trigger/TextToDigi/plugins/SourceCardTextToRctDigi.cc
@@ -2,10 +2,12 @@
 //
 // Package:    SourceCardTextToRctDigi
 // Class:      SourceCardTextToRctDigi
-// 
-/**\class SourceCardTextToRctDigi SourceCardTextToRctDigi.cc L1Trigger/TextToDigi/src/SourceCardTextToRctDigi.cc
+//
+/**\class SourceCardTextToRctDigi SourceCardTextToRctDigi.cc
+L1Trigger/TextToDigi/src/SourceCardTextToRctDigi.cc
 
-Description: Input text file to be loaded into the source cards and output RCT digis for pattern tests. 
+Description: Input text file to be loaded into the source cards and output RCT
+digis for pattern tests.
 
 */
 //
@@ -14,9 +16,9 @@ Description: Input text file to be loaded into the source cards and output RCT d
 //
 //
 
-#include "SourceCardTextToRctDigi.h"
-#include "FWCore/ServiceRegistry/interface/Service.h" // Framework services
 #include "FWCore/MessageLogger/interface/MessageLogger.h" // Logger
+#include "FWCore/ServiceRegistry/interface/Service.h"     // Framework services
+#include "SourceCardTextToRctDigi.h"
 
 using namespace edm;
 using namespace std;
@@ -25,89 +27,86 @@ using namespace std;
 const static unsigned NUM_LINES_PER_EVENT = 63;
 const static int NUM_RCT_CRATES = 18;
 
-SourceCardTextToRctDigi::SourceCardTextToRctDigi(const edm::ParameterSet& iConfig):
-  m_textFileName(iConfig.getParameter<std::string>("TextFileName")),
-  m_fileEventOffset(iConfig.getParameter<int>("fileEventOffset")),
-  m_nevt(0)
-{
+SourceCardTextToRctDigi::SourceCardTextToRctDigi(
+    const edm::ParameterSet &iConfig)
+    : m_textFileName(iConfig.getParameter<std::string>("TextFileName")),
+      m_fileEventOffset(iConfig.getParameter<int>("fileEventOffset")),
+      m_nevt(0) {
   // Produces collections
   produces<L1CaloEmCollection>();
   produces<L1CaloRegionCollection>();
 
   // Open the input file
-  m_file.open(m_textFileName.c_str(),std::ios::in);
+  m_file.open(m_textFileName.c_str(), std::ios::in);
 
-  if(!m_file.good())
-    {
-      throw cms::Exception("SourceCardTextToRctDigiTextFileOpenError")
+  if (!m_file.good()) {
+    throw cms::Exception("SourceCardTextToRctDigiTextFileOpenError")
         << "SourceCardTextToRctDigi::SourceCardTextToRctDigi : "
-        << " couldn't open the file " << m_textFileName << " for reading" << std::endl;
-    }
+        << " couldn't open the file " << m_textFileName << " for reading"
+        << std::endl;
+  }
 
   // Make a SC routing object
-  SourceCardRouting m_scRouting; 
-
+  SourceCardRouting m_scRouting;
 }
 
-SourceCardTextToRctDigi::~SourceCardTextToRctDigi()
-{
+SourceCardTextToRctDigi::~SourceCardTextToRctDigi() {
   // Close the input file
   m_file.close();
 }
 
 /// Append empty digi collection
-void SourceCardTextToRctDigi::putEmptyDigi(edm::Event& iEvent) {
-  std::unique_ptr<L1CaloEmCollection> em (new L1CaloEmCollection);
-  std::unique_ptr<L1CaloRegionCollection> rgn (new L1CaloRegionCollection);
-  for (int i=0; i<NUM_RCT_CRATES; i++){  
-    for (int j=0; j<4; j++) {
+void SourceCardTextToRctDigi::putEmptyDigi(edm::Event &iEvent) {
+  std::unique_ptr<L1CaloEmCollection> em(new L1CaloEmCollection);
+  std::unique_ptr<L1CaloRegionCollection> rgn(new L1CaloRegionCollection);
+  for (int i = 0; i < NUM_RCT_CRATES; i++) {
+    for (int j = 0; j < 4; j++) {
       em->push_back(L1CaloEmCand(0, i, true));
       em->push_back(L1CaloEmCand(0, i, false));
     }
-    for (int j=0; j<14; j++)
-      rgn->push_back(L1CaloRegion(0,false,false,false,false,i,j/2,j%2));
-    for (unsigned j=0; j<8; j++)
-      rgn->push_back(L1CaloRegion(0,true,i,j));
+    for (int j = 0; j < 14; j++)
+      rgn->push_back(
+          L1CaloRegion(0, false, false, false, false, i, j / 2, j % 2));
+    for (unsigned j = 0; j < 8; j++)
+      rgn->push_back(L1CaloRegion(0, true, i, j));
   }
   iEvent.put(std::move(em));
   iEvent.put(std::move(rgn));
 }
 
 // ------------ method called to produce the data  ------------
-void SourceCardTextToRctDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void SourceCardTextToRctDigi::produce(edm::Event &iEvent,
+                                      const edm::EventSetup &iSetup) {
   // Skip event if required
-  if (m_nevt < m_fileEventOffset){
+  if (m_nevt < m_fileEventOffset) {
     //    std::string tmp;
     // for (unsigned i=0;i<NUM_LINES_PER_EVENT;i++){
-    //getline(m_file,tmp);
+    // getline(m_file,tmp);
     //}
     putEmptyDigi(iEvent);
     m_nevt++;
     return;
-  } else if (m_nevt==0 && m_fileEventOffset<0) {
-    //skip first fileEventOffset input events
-    std::string tmp; 
-    for(int i=0;i<abs(m_fileEventOffset); i++)
-      for (unsigned line=0; line<NUM_LINES_PER_EVENT; line++)  
-	if(!getline(m_file,tmp))
-	  {
-	    throw cms::Exception("SourceCardTextToRctDigiTextFileReadError")
-	      << "SourceCardTextToRctDigi::produce() : "
-	      << " couldn't read from the file " << m_textFileName << std::endl;
-	  }
+  } else if (m_nevt == 0 && m_fileEventOffset < 0) {
+    // skip first fileEventOffset input events
+    std::string tmp;
+    for (int i = 0; i < abs(m_fileEventOffset); i++)
+      for (unsigned line = 0; line < NUM_LINES_PER_EVENT; line++)
+        if (!getline(m_file, tmp)) {
+          throw cms::Exception("SourceCardTextToRctDigiTextFileReadError")
+              << "SourceCardTextToRctDigi::produce() : "
+              << " couldn't read from the file " << m_textFileName << std::endl;
+        }
   }
-  
 
   // New collections
-  std::unique_ptr<L1CaloEmCollection> em (new L1CaloEmCollection);
-  std::unique_ptr<L1CaloRegionCollection> rgn (new L1CaloRegionCollection);
+  std::unique_ptr<L1CaloEmCollection> em(new L1CaloEmCollection);
+  std::unique_ptr<L1CaloRegionCollection> rgn(new L1CaloRegionCollection);
 
-  // General variables  
+  // General variables
   unsigned long VHDCI[2][2];
   int routingMode;
   int crate;
-  std::string dataString; 
+  std::string dataString;
   unsigned short eventNumber;
   unsigned short logicalCardID;
 
@@ -129,95 +128,107 @@ void SourceCardTextToRctDigi::produce(edm::Event& iEvent, const edm::EventSetup&
   unsigned short HFQ[18][4][2];
 
   // Check we're not at the end of the file
-  if(m_file.eof())
-    {
-      throw cms::Exception("SourceCardTextToRctDigiTextFileReadError")
+  if (m_file.eof()) {
+    throw cms::Exception("SourceCardTextToRctDigiTextFileReadError")
         << "SourceCardTextToRctDigi::produce : "
         << " unexpected end of file " << m_textFileName << std::endl;
-    }      
-  
-  int thisEventNumber=-1;  
-  // Read in file one line at a time 
-  for (unsigned line=0; line<NUM_LINES_PER_EVENT; line++){  
-
-    if(!getline(m_file,dataString))
-    {
+  }
+
+  int thisEventNumber = -1;
+  // Read in file one line at a time
+  for (unsigned line = 0; line < NUM_LINES_PER_EVENT; line++) {
+
+    if (!getline(m_file, dataString)) {
       throw cms::Exception("SourceCardTextToRctDigiTextFileReadError")
-        << "SourceCardTextToRctDigi::SourceCardTextToRctDigi : "
-        << " couldn't read from the file " << m_textFileName << std::endl;
-    }   
+          << "SourceCardTextToRctDigi::SourceCardTextToRctDigi : "
+          << " couldn't read from the file " << m_textFileName << std::endl;
+    }
 
     // Convert the string to useful info
-    m_scRouting.STRINGtoVHDCI(logicalCardID,eventNumber,dataString,VHDCI);
-    
+    m_scRouting.STRINGtoVHDCI(logicalCardID, eventNumber, dataString, VHDCI);
+
     // Check crossing number
-    if(line!=0) assert(eventNumber==thisEventNumber);
+    if (line != 0)
+      assert(eventNumber == thisEventNumber);
     thisEventNumber = eventNumber;
 
     // Are we looking at electrons or regions
-    m_scRouting.LogicalCardIDtoRoutingMode(logicalCardID,routingMode,crate); 
-    
-    if (routingMode==0){     
+    m_scRouting.LogicalCardIDtoRoutingMode(logicalCardID, routingMode, crate);
+
+    if (routingMode == 0) {
 
       // Electrons
-      m_scRouting.VHDCItoEMU(eIsoRank[crate],eIsoCardId[crate],eIsoRegionId[crate],
-                             eNonIsoRank[crate],eNonIsoCardId[crate],eNonIsoRegionId[crate], 
-                             MIPbits[crate],Qbits[crate],VHDCI);
+      m_scRouting.VHDCItoEMU(eIsoRank[crate], eIsoCardId[crate],
+                             eIsoRegionId[crate], eNonIsoRank[crate],
+                             eNonIsoCardId[crate], eNonIsoRegionId[crate],
+                             MIPbits[crate], Qbits[crate], VHDCI);
 
-    } else if (routingMode==1) {
+    } else if (routingMode == 1) {
 
       // Regions
-      m_scRouting.VHDCItoRC56HF(RC[crate],RCof[crate],RCtau[crate],HF[crate],HFQ[crate],VHDCI);
+      m_scRouting.VHDCItoRC56HF(RC[crate], RCof[crate], RCtau[crate], HF[crate],
+                                HFQ[crate], VHDCI);
 
-    } else if (routingMode==2) {
+    } else if (routingMode == 2) {
 
       // Regions
-      m_scRouting.VHDCItoRC012(RC[crate],RCof[crate],RCtau[crate],VHDCI);
+      m_scRouting.VHDCItoRC012(RC[crate], RCof[crate], RCtau[crate], VHDCI);
 
-    } else if (routingMode==3) {
+    } else if (routingMode == 3) {
 
       // Regions
-      m_scRouting.VHDCItoRC234(RC[crate],RCof[crate],RCtau[crate],RC[crate+9],RCof[crate+9],RCtau[crate+9],VHDCI);
+      m_scRouting.VHDCItoRC234(RC[crate], RCof[crate], RCtau[crate],
+                               RC[crate + 9], RCof[crate + 9], RCtau[crate + 9],
+                               VHDCI);
 
     } else {
       // Something went wrong
       throw cms::Exception("SourceCardtextToRctDigiError")
-        << "SourceCardTextToRctDigi::produce : "
-        << " unknown routing mode=" << routingMode << std::endl;
+          << "SourceCardTextToRctDigi::produce : "
+          << " unknown routing mode=" << routingMode << std::endl;
     }
   }
 
   // Make RCT digis
-  for (crate=0; crate<NUM_RCT_CRATES; crate++){
+  for (crate = 0; crate < NUM_RCT_CRATES; crate++) {
 
     // Make EM collections
-    for (int i=0; i<4; i++){
-      em->push_back(L1CaloEmCand(eIsoRank[crate][i],eIsoRegionId[crate][i],eIsoCardId[crate][i],crate,true,i,0));
-      em->push_back(L1CaloEmCand(eNonIsoRank[crate][i],eNonIsoRegionId[crate][i],eNonIsoCardId[crate][i],crate,false,i,0));
+    for (int i = 0; i < 4; i++) {
+      em->push_back(L1CaloEmCand(eIsoRank[crate][i], eIsoRegionId[crate][i],
+                                 eIsoCardId[crate][i], crate, true, i, 0));
+      em->push_back(L1CaloEmCand(eNonIsoRank[crate][i],
+                                 eNonIsoRegionId[crate][i],
+                                 eNonIsoCardId[crate][i], crate, false, i, 0));
     }
-    
+
     // Make region collections
-    for (int i=0; i<7; i++){// Receiver card
-      for (int j=0; j<2; j++){// Region
-        rgn->push_back(L1CaloRegion::makeHBHERegion(RC[crate][i][j],RCof[crate][i][j],RCtau[crate][i][j],MIPbits[crate][i][j],Qbits[crate][i][j],crate,i,j));
+    for (int i = 0; i < 7; i++) {   // Receiver card
+      for (int j = 0; j < 2; j++) { // Region
+        rgn->push_back(L1CaloRegion::makeHBHERegion(
+            RC[crate][i][j], RCof[crate][i][j], RCtau[crate][i][j],
+            MIPbits[crate][i][j], Qbits[crate][i][j], crate, i, j));
       }
     }
-    
+
     // Make HF region collections
-    for (int i=0; i<4; i++){// Eta bin
-      for (int j=0; j<2; j++){// HF0, HF1
-        rgn->push_back(L1CaloRegion::makeHFRegion(HF[crate][i][j],HFQ[crate][i][j],crate,i+(4*j)));// region=eta+4*phi for eta 0-3 
+    for (int i = 0; i < 4; i++) {   // Eta bin
+      for (int j = 0; j < 2; j++) { // HF0, HF1
+        rgn->push_back(L1CaloRegion::makeHFRegion(
+            HF[crate][i][j], HFQ[crate][i][j], crate,
+            i + (4 * j))); // region=eta+4*phi for eta 0-3
       }
     }
   }
 
   // Debug info
-  for (L1CaloEmCollection::const_iterator iem=em->begin(); iem!=em->end(); iem++){
+  for (L1CaloEmCollection::const_iterator iem = em->begin(); iem != em->end();
+       iem++) {
     LogDebug("Electrons") << (*iem);
   }
-  
-  for (L1CaloRegionCollection::const_iterator irgn=rgn->begin(); irgn!=rgn->end(); irgn++){
-      LogDebug("HFRegions") << (*irgn);
+
+  for (L1CaloRegionCollection::const_iterator irgn = rgn->begin();
+       irgn != rgn->end(); irgn++) {
+    LogDebug("HFRegions") << (*irgn);
   }
 
   iEvent.put(std::move(em));
@@ -225,4 +236,3 @@ void SourceCardTextToRctDigi::produce(edm::Event& iEvent, const edm::EventSetup&
 
   m_nevt++;
 }
-
diff --git a/L1Trigger/TextToDigi/plugins/SourceCardTextToRctDigi.h b/L1Trigger/TextToDigi/plugins/SourceCardTextToRctDigi.h
index a9a7d3e535599..ef83f7ca8af2d 100644
--- a/L1Trigger/TextToDigi/plugins/SourceCardTextToRctDigi.h
+++ b/L1Trigger/TextToDigi/plugins/SourceCardTextToRctDigi.h
@@ -5,10 +5,12 @@
 //
 // Package:    SourceCardTextToRctDigi
 // Class:      SourceCardTextToRctDigi
-// 
-/**\class SourceCardTextToRctDigi SourceCardTextToRctDigi.h L1Trigger/TextToDigi/src/SourceCardTextToRctDigi.h
+//
+/**\class SourceCardTextToRctDigi SourceCardTextToRctDigi.h
+ L1Trigger/TextToDigi/src/SourceCardTextToRctDigi.h
 
- Description: Input text file to be loaded into the source cards and output RCT digis for pattern tests. 
+ Description: Input text file to be loaded into the source cards and output RCT
+ digis for pattern tests.
 
  Implementation:
      <Notes on implementation>
@@ -19,13 +21,12 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -37,19 +38,19 @@
 
 #include "L1Trigger/TextToDigi/src/SourceCardRouting.h"
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 
 class SourceCardTextToRctDigi : public edm::EDProducer {
- public:
-  explicit SourceCardTextToRctDigi(const edm::ParameterSet&);
+public:
+  explicit SourceCardTextToRctDigi(const edm::ParameterSet &);
   ~SourceCardTextToRctDigi() override;
-  
- private:
-  void produce(edm::Event&, const edm::EventSetup&) override;
+
+private:
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
   /// Create empty digi collection
-  void putEmptyDigi(edm::Event&);
+  void putEmptyDigi(edm::Event &);
 
   /// Name out input file
   std::string m_textFileName;
@@ -62,10 +63,9 @@ class SourceCardTextToRctDigi : public edm::EDProducer {
 
   /// file handle
   std::ifstream m_file;
-  
+
   /// source card router
   SourceCardRouting m_scRouting;
-  
 };
 
 #endif
diff --git a/L1Trigger/TextToDigi/plugins/TextToRaw.cc b/L1Trigger/TextToDigi/plugins/TextToRaw.cc
index bf2a031126f4a..9aa41cfd9cb7a 100644
--- a/L1Trigger/TextToDigi/plugins/TextToRaw.cc
+++ b/L1Trigger/TextToDigi/plugins/TextToRaw.cc
@@ -3,10 +3,10 @@
 #include "L1Trigger/TextToDigi/plugins/TextToRaw.h"
 
 // system
-#include <vector>
-#include <string>
 #include <fstream>
 #include <iostream>
+#include <string>
+#include <vector>
 
 // framework
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -16,147 +16,136 @@
 // Raw data collection
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 
-using std::vector;
 using std::cerr;
 using std::cout;
 using std::endl;
-using std::string;
 using std::ios;
+using std::string;
+using std::vector;
 
 const unsigned TextToRaw::EVT_MAX_SIZE;
 
-TextToRaw::TextToRaw(const edm::ParameterSet& iConfig) :
-  fedId_(iConfig.getUntrackedParameter<int>("fedId", 745)),
-  filename_(iConfig.getUntrackedParameter<std::string>("filename", "slinkOutput.txt")),
-  fileEventOffset_(iConfig.getUntrackedParameter<int>("FileEventOffset", 0)),
-  nevt_(0)
-{
-  edm::LogInfo("TextToDigi") << "Reading ASCII dump from " << filename_ << std::endl;
-
-  //register the products
+TextToRaw::TextToRaw(const edm::ParameterSet &iConfig)
+    : fedId_(iConfig.getUntrackedParameter<int>("fedId", 745)),
+      filename_(iConfig.getUntrackedParameter<std::string>("filename",
+                                                           "slinkOutput.txt")),
+      fileEventOffset_(
+          iConfig.getUntrackedParameter<int>("FileEventOffset", 0)),
+      nevt_(0) {
+  edm::LogInfo("TextToDigi")
+      << "Reading ASCII dump from " << filename_ << std::endl;
+
+  // register the products
   produces<FEDRawDataCollection>();
-
 }
 
+TextToRaw::~TextToRaw() {
 
-TextToRaw::~TextToRaw()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
-
 /// Append empty digi collection
-void TextToRaw::putEmptyDigi(edm::Event& iEvent) {
-  std::unique_ptr<FEDRawDataCollection> rawColl(new FEDRawDataCollection()); 
-  //FEDRawData& feddata=rawColl->FEDData(fedId_);
-  //feddata.data()[0] = 0;
+void TextToRaw::putEmptyDigi(edm::Event &iEvent) {
+  std::unique_ptr<FEDRawDataCollection> rawColl(new FEDRawDataCollection());
+  // FEDRawData& feddata=rawColl->FEDData(fedId_);
+  // feddata.data()[0] = 0;
   iEvent.put(std::move(rawColl));
 }
 
-
 // ------------ method called to produce the data  ------------
-void
-TextToRaw::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void TextToRaw::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace edm;
-   
+
   // Skip event if required
-  if (nevt_ < fileEventOffset_){
+  if (nevt_ < fileEventOffset_) {
     putEmptyDigi(iEvent);
     nevt_++;
     return;
-  } else if (nevt_==0 && fileEventOffset_<0) {
+  } else if (nevt_ == 0 && fileEventOffset_ < 0) {
     std::string line;
-    //skip first fileEventOffset input crossings 
-    for(unsigned i=0; i<(unsigned)abs(fileEventOffset_); i++) {
-      unsigned iline=0;
+    // skip first fileEventOffset input crossings
+    for (unsigned i = 0; i < (unsigned)abs(fileEventOffset_); i++) {
+      unsigned iline = 0;
       while (getline(file_, line) && !line.empty()) {
-	iline++;
-	if(iline*4>=EVT_MAX_SIZE)       
-	  throw cms::Exception("TextToRawEventSizeOverflow")
-	    << "TextToRaw::produce() : "
-	    << " read too many lines (" << iline << ": " << line << ")" 
-	    << ", maximum event size is " << EVT_MAX_SIZE
-	    << std::endl;
+        iline++;
+        if (iline * 4 >= EVT_MAX_SIZE)
+          throw cms::Exception("TextToRawEventSizeOverflow")
+              << "TextToRaw::produce() : "
+              << " read too many lines (" << iline << ": " << line << ")"
+              << ", maximum event size is " << EVT_MAX_SIZE << std::endl;
       }
     }
   }
-  
+
   nevt_++;
-  
-   // read file
-   std::string line;
-   unsigned i=0; // count 32-bit words
-
-   // while not encountering dumb errors
-   while (getline(file_, line) && !line.empty() ) {
-
-     // bail if we reached the EVT_MAX_SIZE
-     if (i*4>=EVT_MAX_SIZE) {
-       throw cms::Exception("TextToRaw")
-         << "Read too many lines from file. Maximum event size is " << EVT_MAX_SIZE << " lines" << std::endl;
-     }
-
-     // convert string to int
-     std::istringstream iss(line);
-     unsigned long d;
-     iss >> std::hex >> d;
-
-     // copy data
-     for (int j=0; j<4; j++) {
-       if ( (i*4+j) < EVT_MAX_SIZE ) { 
-	 char c = (d>>(8*j))&0xff;
-	 data_[i*4+j] = c;
-       }
-     }
-
-     ++i;
-
-     // bail if we reached the EVT_MAX_SIZE
-     if (i>=EVT_MAX_SIZE) {
-       throw cms::Exception("TextToRaw")
-	 << "Read too many lines from file. Maximum event size is " << EVT_MAX_SIZE << " lines" << std::endl;
-     }
-
-   }
-
-   unsigned evtSize = i * 4;
-
-   // create the collection
-   std::unique_ptr<FEDRawDataCollection> rawColl(new FEDRawDataCollection()); 
-   // retrieve the target buffer
-   FEDRawData& feddata=rawColl->FEDData(fedId_);
-   // Allocate space for header+trailer+payload
-   feddata.resize(evtSize);
-
-   // fill FEDRawData object
-   for (unsigned i=0; i<evtSize; ++i) {
-     feddata.data()[i] = data_[i];
-   }
-
-   // put the collection in the event
-   iEvent.put(std::move(rawColl));
-     
-}
 
+  // read file
+  std::string line;
+  unsigned i = 0; // count 32-bit words
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-TextToRaw::beginJob() 
-{
-  // open VME file
-  file_.open(filename_.c_str(), std::ios::in);
-  if(!file_.good()) { edm::LogInfo("TextToDigi") << "Failed to open ASCII file " << filename_ << std::endl; }
-}
+  // while not encountering dumb errors
+  while (getline(file_, line) && !line.empty()) {
 
+    // bail if we reached the EVT_MAX_SIZE
+    if (i * 4 >= EVT_MAX_SIZE) {
+      throw cms::Exception("TextToRaw")
+          << "Read too many lines from file. Maximum event size is "
+          << EVT_MAX_SIZE << " lines" << std::endl;
+    }
+
+    // convert string to int
+    std::istringstream iss(line);
+    unsigned long d;
+    iss >> std::hex >> d;
+
+    // copy data
+    for (int j = 0; j < 4; j++) {
+      if ((i * 4 + j) < EVT_MAX_SIZE) {
+        char c = (d >> (8 * j)) & 0xff;
+        data_[i * 4 + j] = c;
+      }
+    }
+
+    ++i;
+
+    // bail if we reached the EVT_MAX_SIZE
+    if (i >= EVT_MAX_SIZE) {
+      throw cms::Exception("TextToRaw")
+          << "Read too many lines from file. Maximum event size is "
+          << EVT_MAX_SIZE << " lines" << std::endl;
+    }
+  }
+
+  unsigned evtSize = i * 4;
 
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-TextToRaw::endJob() {
-  file_.close();
+  // create the collection
+  std::unique_ptr<FEDRawDataCollection> rawColl(new FEDRawDataCollection());
+  // retrieve the target buffer
+  FEDRawData &feddata = rawColl->FEDData(fedId_);
+  // Allocate space for header+trailer+payload
+  feddata.resize(evtSize);
+
+  // fill FEDRawData object
+  for (unsigned i = 0; i < evtSize; ++i) {
+    feddata.data()[i] = data_[i];
+  }
+
+  // put the collection in the event
+  iEvent.put(std::move(rawColl));
+}
+
+// ------------ method called once each job just before starting event loop
+// ------------
+void TextToRaw::beginJob() {
+  // open VME file
+  file_.open(filename_.c_str(), std::ios::in);
+  if (!file_.good()) {
+    edm::LogInfo("TextToDigi")
+        << "Failed to open ASCII file " << filename_ << std::endl;
+  }
 }
 
+// ------------ method called once each job just after ending the event loop
+// ------------
+void TextToRaw::endJob() { file_.close(); }
diff --git a/L1Trigger/TextToDigi/plugins/TextToRaw.h b/L1Trigger/TextToDigi/plugins/TextToRaw.h
index bbd938dcfb88f..5fd7b1bc97e73 100644
--- a/L1Trigger/TextToDigi/plugins/TextToRaw.h
+++ b/L1Trigger/TextToDigi/plugins/TextToRaw.h
@@ -5,13 +5,15 @@
 //
 // Package:    TextToRaw
 // Class:      TextToRaw
-// 
+//
 /**\class TextToRaw TextToRaw.cc L1Triggr/TextToDigi/src/TextToRaw.cc
 
- Description: Convert ASCII dump of a raw event to FEDRawData format for unpacking
+ Description: Convert ASCII dump of a raw event to FEDRawData format for
+ unpacking
 
  Implementation:
-     Input format is a 32 bit hex string per line (LSW first). Events separated with blank line.
+     Input format is a 32 bit hex string per line (LSW first). Events separated
+ with blank line.
 */
 //
 // Original Author:  Jim Brooke
@@ -19,16 +21,15 @@
 //
 //
 
-
 // system include files
+#include <fstream>
 #include <memory>
 #include <string>
-#include <fstream>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DataFormats/FEDRawData/interface/FEDRawData.h"
@@ -38,17 +39,16 @@
 //
 
 class TextToRaw : public edm::EDProducer {
- public:
-  explicit TextToRaw(const edm::ParameterSet&);
+public:
+  explicit TextToRaw(const edm::ParameterSet &);
   ~TextToRaw() override;
-  
- private: // methods
-  void beginJob() override;
-  void produce(edm::Event&, const edm::EventSetup&) override;
-  void endJob() override ;
 
- private:
+private: // methods
+  void beginJob() override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
 
+private:
   // ID of the FED to emulate
   int fedId_;
 
@@ -57,13 +57,12 @@ class TextToRaw : public edm::EDProducer {
   std::ifstream file_;
 
   // array to store the data
-  static const unsigned EVT_MAX_SIZE=8192;
+  static const unsigned EVT_MAX_SIZE = 8192;
   char data_[EVT_MAX_SIZE];
 
   int fileEventOffset_;
   int nevt_;
-  void putEmptyDigi(edm::Event&);
-
+  void putEmptyDigi(edm::Event &);
 };
 
 #endif
diff --git a/L1Trigger/TextToDigi/src/SourceCardRouting.cc b/L1Trigger/TextToDigi/src/SourceCardRouting.cc
index c549fab03af5a..044821c5619a6 100644
--- a/L1Trigger/TextToDigi/src/SourceCardRouting.cc
+++ b/L1Trigger/TextToDigi/src/SourceCardRouting.cc
@@ -4,7 +4,7 @@
 */
 
 // Prototype class definition
-#include "SourceCardRouting.h"			//hh"
+#include "SourceCardRouting.h" //hh"
 
 // File streams
 #include <iomanip>
@@ -13,794 +13,834 @@
 using namespace std;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// 
-  SourceCardRouting::SourceCardRouting(){
-	//std::cout<<"Constructor"<<std::endl;
-	}
-
-  SourceCardRouting::~SourceCardRouting(){
-	//std::cout<<"Destructor"<<std::endl;
-	}
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//SFP arrays are SFP[cycle<2][sfp number<4]
-//electron arrays are eIsoRank[candidate number<4]
-//muon arrays are MIPbits[rec card number<7][region<2]
-
-void SourceCardRouting::EMUtoSFP(	unsigned short (&eIsoRank)[4],
-			unsigned short (&eIsoCardId)[4],
-			unsigned short (&eIsoRegionId)[4],
-			unsigned short (&eNonIsoRank)[4],
-			unsigned short (&eNonIsoCardId)[4],
-			unsigned short (&eNonIsoRegionId)[4],
-			unsigned short (&MIPbits)[7][2],
-			unsigned short (&Qbits)[7][2],
-			unsigned short (&SFP)[2][4] ) const{
-
-SFP[0][0]=0;
-SFP[1][0]=0x8000;
-
-for (int i=0;i<7;i++){
-	for (int j=0;j<2;j++){
-		SFP[0][0] = SFP[0][0]|((MIPbits[i][j]&0x01)<<((2*i)+j) );
-		SFP[1][0] = SFP[1][0]|((Qbits[i][j]&0x01)<<((2*i)+j) );
-	}
+SourceCardRouting::SourceCardRouting() {
+  // std::cout<<"Constructor"<<std::endl;
 }
 
-      	SFP[0][1] = (eIsoRank[0]&0x3f)|((eIsoRegionId[0]&0x01)<<6)|((eIsoCardId[0]&0x07)<<7)|((eIsoRank[1]&0x7)<<10);
-      	SFP[1][1] = 0x8000|(eIsoRank[2]&0x3f)|((eIsoRegionId[2]&0x01)<<6)|((eIsoCardId[2]&0x07)<<7)|((eIsoRank[3]&0x7)<<10);
-      	SFP[0][2] = (eNonIsoRank[0]&0x3f)|((eNonIsoRegionId[0]&0x01)<<6)|((eNonIsoCardId[0]&0x07)<<7)|((eIsoRank[1]&0x38)<<7)|((eIsoRegionId[1]&0x01)<<13);
-      	SFP[1][2] = 0x8000|(eNonIsoRank[2]&0x3f)|((eNonIsoRegionId[2]&0x01)<<6)|((eNonIsoCardId[2]&0x07)<<7)|((eIsoRank[3]&0x38)<<7)|((eIsoRegionId[3]&0x01)<<13);
-      	SFP[0][3] = (eNonIsoRank[1]&0x3f)|((eNonIsoRegionId[1]&0x01)<<6)|((eNonIsoCardId[1]&0x07)<<7)|((eIsoCardId[1]&0x07)<<10);
-      	SFP[1][3] = 0x8000|(eNonIsoRank[3]&0x3f)|((eNonIsoRegionId[3]&0x01)<<6)|((eNonIsoCardId[3]&0x07)<<7)|((eIsoCardId[3]&0x07)<<10);
+SourceCardRouting::~SourceCardRouting() {
+  // std::cout<<"Destructor"<<std::endl;
 }
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//SFP arrays are SFP[cycle<2][sfp number<4]
-//electron arrays are eIsoRank[candidate number<4]
-//muon arrays are MIPbits[rec card number<7][region<2]
-
-void SourceCardRouting::SFPtoEMU(	unsigned short (&eIsoRank)[4],
-			unsigned short (&eIsoCardId)[4],
-			unsigned short (&eIsoRegionId)[4],
-			unsigned short (&eNonIsoRank)[4],
-			unsigned short (&eNonIsoCardId)[4],
-			unsigned short (&eNonIsoRegionId)[4],
-			unsigned short (&MIPbits)[7][2],
-			unsigned short (&Qbits)[7][2],
-			unsigned short (&SFP)[2][4] ) const{
-
-
-	  for (int i=0; i<7;i++){
-		for (int j=0; j<2;j++){
-  	    		MIPbits[i][j] = (SFP[0][0]>>((2*i)+j) )&0x1;
-  	    		Qbits[i][j] = (SFP[1][0]>>((2*i)+j) )&0x1;
-		}
-	  }
-
-	eIsoRank[0] = SFP[0][1]&0x3f;
-	eIsoRank[1] = ((SFP[0][1]>>10)&0x7)|((SFP[0][2]>>7)&0x38);
-	eIsoRank[2] = SFP[1][1]&0x3f;
-	eIsoRank[3] = ((SFP[1][1]>>10)&0x7)|((SFP[1][2]>>7)&0x38);
-
-	eNonIsoRank[0] = SFP[0][2]&0x3f;
-	eNonIsoRank[1] = SFP[0][3]&0x3f;
-	eNonIsoRank[2] = SFP[1][2]&0x3f;
-	eNonIsoRank[3] = SFP[1][3]&0x3f;
-
-	eIsoRegionId[0] = (SFP[0][1]>>6)&0x1;
-	eIsoRegionId[1] = (SFP[0][2]>>13)&0x1;
-	eIsoRegionId[2] = (SFP[1][1]>>6)&0x1;
-	eIsoRegionId[3] = (SFP[1][2]>>13)&0x1;
-
-	eNonIsoRegionId[0] = (SFP[0][2]>>6)&0x1;
-	eNonIsoRegionId[1] = (SFP[0][3]>>6)&0x1;
-	eNonIsoRegionId[2] = (SFP[1][2]>>6)&0x1;
-	eNonIsoRegionId[3] = (SFP[1][3]>>6)&0x1;
-
-	eIsoCardId[0] = (SFP[0][1]>>7)&0x7;
-	eIsoCardId[1] = (SFP[0][3]>>10)&0x7;
-	eIsoCardId[2] = (SFP[1][1]>>7)&0x7;
-	eIsoCardId[3] = (SFP[1][3]>>10)&0x7;
-
-	eNonIsoCardId[0] = (SFP[0][2]>>7)&0x7;
-	eNonIsoCardId[1] = (SFP[0][3]>>7)&0x7;
-	eNonIsoCardId[2] = (SFP[1][2]>>7)&0x7;
-	eNonIsoCardId[3] = (SFP[1][3]>>7)&0x7;
-
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// SFP arrays are SFP[cycle<2][sfp number<4]
+// electron arrays are eIsoRank[candidate number<4]
+// muon arrays are MIPbits[rec card number<7][region<2]
+
+void SourceCardRouting::EMUtoSFP(
+    unsigned short (&eIsoRank)[4], unsigned short (&eIsoCardId)[4],
+    unsigned short (&eIsoRegionId)[4], unsigned short (&eNonIsoRank)[4],
+    unsigned short (&eNonIsoCardId)[4], unsigned short (&eNonIsoRegionId)[4],
+    unsigned short (&MIPbits)[7][2], unsigned short (&Qbits)[7][2],
+    unsigned short (&SFP)[2][4]) const {
+
+  SFP[0][0] = 0;
+  SFP[1][0] = 0x8000;
+
+  for (int i = 0; i < 7; i++) {
+    for (int j = 0; j < 2; j++) {
+      SFP[0][0] = SFP[0][0] | ((MIPbits[i][j] & 0x01) << ((2 * i) + j));
+      SFP[1][0] = SFP[1][0] | ((Qbits[i][j] & 0x01) << ((2 * i) + j));
+    }
+  }
+
+  SFP[0][1] = (eIsoRank[0] & 0x3f) | ((eIsoRegionId[0] & 0x01) << 6) |
+              ((eIsoCardId[0] & 0x07) << 7) | ((eIsoRank[1] & 0x7) << 10);
+  SFP[1][1] = 0x8000 | (eIsoRank[2] & 0x3f) | ((eIsoRegionId[2] & 0x01) << 6) |
+              ((eIsoCardId[2] & 0x07) << 7) | ((eIsoRank[3] & 0x7) << 10);
+  SFP[0][2] = (eNonIsoRank[0] & 0x3f) | ((eNonIsoRegionId[0] & 0x01) << 6) |
+              ((eNonIsoCardId[0] & 0x07) << 7) | ((eIsoRank[1] & 0x38) << 7) |
+              ((eIsoRegionId[1] & 0x01) << 13);
+  SFP[1][2] = 0x8000 | (eNonIsoRank[2] & 0x3f) |
+              ((eNonIsoRegionId[2] & 0x01) << 6) |
+              ((eNonIsoCardId[2] & 0x07) << 7) | ((eIsoRank[3] & 0x38) << 7) |
+              ((eIsoRegionId[3] & 0x01) << 13);
+  SFP[0][3] = (eNonIsoRank[1] & 0x3f) | ((eNonIsoRegionId[1] & 0x01) << 6) |
+              ((eNonIsoCardId[1] & 0x07) << 7) | ((eIsoCardId[1] & 0x07) << 10);
+  SFP[1][3] = 0x8000 | (eNonIsoRank[3] & 0x3f) |
+              ((eNonIsoRegionId[3] & 0x01) << 6) |
+              ((eNonIsoCardId[3] & 0x07) << 7) | ((eIsoCardId[3] & 0x07) << 10);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//RC arrays are RC[receiver card number<7][region<2]
-//HF arrays are HF[eta<4][HF region<2]
-//SFP arrays are SFP[cycle<2][sfp number<4]
- 
-void SourceCardRouting::RC56HFtoSFP(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			unsigned short (&SFP)[2][4]) const{
-
-	SFP[0][0] = (RC[5][0]&0x3ff)|((RCof[5][0]&0x1)<<10)|((RCtau[5][0]&0x1)<<11)|((HFQ[0][0]&0x1)<<12)|((HFQ[1][0]&0x01)<<13)|((HF[0][0]&0x01)<<14);
-	SFP[1][0] = 0x8000|(RC[5][1]&0x3ff)|((RCof[5][1]&0x1)<<10)|((RCtau[5][1]&0x1)<<11)|((HFQ[2][0]&0x1)<<12)|((HFQ[3][0]&0x01)<<13)|((HF[2][0]&0x01)<<14);
-      	SFP[0][1] = (RC[6][0]&0x3ff)|((RCof[6][0]&0x1)<<10)|((RCtau[6][0]&0x1)<<11)|((HFQ[0][1]&0x1)<<12)|((HFQ[1][1]&0x01)<<13)|((HF[0][1]&0x01)<<14);
-      	SFP[1][1] = 0x8000|(RC[6][1]&0x3ff)|((RCof[6][1]&0x1)<<10)|((RCtau[6][1]&0x1)<<11)|((HFQ[2][1]&0x1)<<12)|((HFQ[3][1]&0x01)<<13)|((HF[2][1]&0x01)<<14);
-      	SFP[0][2] = ((HF[0][0]>>1)&0x7f)|((HF[1][0]&0xff)<<7);
-      	SFP[1][2] = 0x8000|((HF[2][0]>>1)&0x7f)|((HF[3][0]&0xff)<<7);
-      	SFP[0][3] = ((HF[0][1]>>1)&0x7f)|((HF[1][1]&0xff)<<7);
-      	SFP[1][3] = 0x8000|((HF[2][1]>>1)&0x7f)|((HF[3][1]&0xff)<<7);
-
-
+// SFP arrays are SFP[cycle<2][sfp number<4]
+// electron arrays are eIsoRank[candidate number<4]
+// muon arrays are MIPbits[rec card number<7][region<2]
+
+void SourceCardRouting::SFPtoEMU(
+    unsigned short (&eIsoRank)[4], unsigned short (&eIsoCardId)[4],
+    unsigned short (&eIsoRegionId)[4], unsigned short (&eNonIsoRank)[4],
+    unsigned short (&eNonIsoCardId)[4], unsigned short (&eNonIsoRegionId)[4],
+    unsigned short (&MIPbits)[7][2], unsigned short (&Qbits)[7][2],
+    unsigned short (&SFP)[2][4]) const {
+
+  for (int i = 0; i < 7; i++) {
+    for (int j = 0; j < 2; j++) {
+      MIPbits[i][j] = (SFP[0][0] >> ((2 * i) + j)) & 0x1;
+      Qbits[i][j] = (SFP[1][0] >> ((2 * i) + j)) & 0x1;
+    }
+  }
+
+  eIsoRank[0] = SFP[0][1] & 0x3f;
+  eIsoRank[1] = ((SFP[0][1] >> 10) & 0x7) | ((SFP[0][2] >> 7) & 0x38);
+  eIsoRank[2] = SFP[1][1] & 0x3f;
+  eIsoRank[3] = ((SFP[1][1] >> 10) & 0x7) | ((SFP[1][2] >> 7) & 0x38);
+
+  eNonIsoRank[0] = SFP[0][2] & 0x3f;
+  eNonIsoRank[1] = SFP[0][3] & 0x3f;
+  eNonIsoRank[2] = SFP[1][2] & 0x3f;
+  eNonIsoRank[3] = SFP[1][3] & 0x3f;
+
+  eIsoRegionId[0] = (SFP[0][1] >> 6) & 0x1;
+  eIsoRegionId[1] = (SFP[0][2] >> 13) & 0x1;
+  eIsoRegionId[2] = (SFP[1][1] >> 6) & 0x1;
+  eIsoRegionId[3] = (SFP[1][2] >> 13) & 0x1;
+
+  eNonIsoRegionId[0] = (SFP[0][2] >> 6) & 0x1;
+  eNonIsoRegionId[1] = (SFP[0][3] >> 6) & 0x1;
+  eNonIsoRegionId[2] = (SFP[1][2] >> 6) & 0x1;
+  eNonIsoRegionId[3] = (SFP[1][3] >> 6) & 0x1;
+
+  eIsoCardId[0] = (SFP[0][1] >> 7) & 0x7;
+  eIsoCardId[1] = (SFP[0][3] >> 10) & 0x7;
+  eIsoCardId[2] = (SFP[1][1] >> 7) & 0x7;
+  eIsoCardId[3] = (SFP[1][3] >> 10) & 0x7;
+
+  eNonIsoCardId[0] = (SFP[0][2] >> 7) & 0x7;
+  eNonIsoCardId[1] = (SFP[0][3] >> 7) & 0x7;
+  eNonIsoCardId[2] = (SFP[1][2] >> 7) & 0x7;
+  eNonIsoCardId[3] = (SFP[1][3] >> 7) & 0x7;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//RC arrays are RC[receiver card number<7][region<2]
-//HF arrays are HF[eta<4][HF region<2]
-//SFP arrays are SFP[cycle<2][sfp number<4]
- 
-    void SourceCardRouting::SFPtoRC56HF(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			unsigned short (&SFP)[2][4]) const{
-
-	RC[5][0]=SFP[0][0]&0x3ff;
-	RC[5][1]=SFP[1][0]&0x3ff;
-	RC[6][0]=SFP[0][1]&0x3ff;
-	RC[6][1]=SFP[1][1]&0x3ff;
-
-	RCof[5][0]=(SFP[0][0]>>10)&0x1;
-	RCof[5][1]=(SFP[1][0]>>10)&0x1;
-	RCof[6][0]=(SFP[0][1]>>10)&0x1;
-	RCof[6][1]=(SFP[1][1]>>10)&0x1;
-
-	RCtau[5][0]=(SFP[0][0]>>11)&0x1;
-	RCtau[5][1]=(SFP[1][0]>>11)&0x1;
-	RCtau[6][0]=(SFP[0][1]>>11)&0x1;
-	RCtau[6][1]=(SFP[1][1]>>11)&0x1;
-
-	HFQ[0][0]=(SFP[0][0]>>12)&0x1;
-	HFQ[1][0]=(SFP[0][0]>>13)&0x1;
-	HFQ[2][0]=(SFP[1][0]>>12)&0x1;
-	HFQ[3][0]=(SFP[1][0]>>13)&0x1;
-
-	HFQ[0][1]=(SFP[0][1]>>12)&0x1;
-	HFQ[1][1]=(SFP[0][1]>>13)&0x1;
-	HFQ[2][1]=(SFP[1][1]>>12)&0x1;
-	HFQ[3][1]=(SFP[1][1]>>13)&0x1;
-
-	HF[0][0]=((SFP[0][2]&0x7f)<<1)|((SFP[0][0]>>14)&0x01);
-	HF[1][0]=(SFP[0][2]>>7)&0xff;
-	HF[2][0]=((SFP[1][2]&0x7f)<<1)|((SFP[1][0]>>14)&0x01);
-	HF[3][0]=(SFP[1][2]>>7)&0xff;
-
-	HF[0][1]=((SFP[0][3]&0x7f)<<1)|((SFP[0][1]>>14)&0x01);
-	HF[1][1]=(SFP[0][3]>>7)&0xff;
-	HF[2][1]=((SFP[1][3]&0x7f)<<1)|((SFP[1][1]>>14)&0x01);
-	HF[3][1]=(SFP[1][3]>>7)&0xff;
-
+// RC arrays are RC[receiver card number<7][region<2]
+// HF arrays are HF[eta<4][HF region<2]
+// SFP arrays are SFP[cycle<2][sfp number<4]
+
+void SourceCardRouting::RC56HFtoSFP(unsigned short (&RC)[7][2],
+                                    unsigned short (&RCof)[7][2],
+                                    unsigned short (&RCtau)[7][2],
+                                    unsigned short (&HF)[4][2],
+                                    unsigned short (&HFQ)[4][2],
+                                    unsigned short (&SFP)[2][4]) const {
+
+  SFP[0][0] = (RC[5][0] & 0x3ff) | ((RCof[5][0] & 0x1) << 10) |
+              ((RCtau[5][0] & 0x1) << 11) | ((HFQ[0][0] & 0x1) << 12) |
+              ((HFQ[1][0] & 0x01) << 13) | ((HF[0][0] & 0x01) << 14);
+  SFP[1][0] = 0x8000 | (RC[5][1] & 0x3ff) | ((RCof[5][1] & 0x1) << 10) |
+              ((RCtau[5][1] & 0x1) << 11) | ((HFQ[2][0] & 0x1) << 12) |
+              ((HFQ[3][0] & 0x01) << 13) | ((HF[2][0] & 0x01) << 14);
+  SFP[0][1] = (RC[6][0] & 0x3ff) | ((RCof[6][0] & 0x1) << 10) |
+              ((RCtau[6][0] & 0x1) << 11) | ((HFQ[0][1] & 0x1) << 12) |
+              ((HFQ[1][1] & 0x01) << 13) | ((HF[0][1] & 0x01) << 14);
+  SFP[1][1] = 0x8000 | (RC[6][1] & 0x3ff) | ((RCof[6][1] & 0x1) << 10) |
+              ((RCtau[6][1] & 0x1) << 11) | ((HFQ[2][1] & 0x1) << 12) |
+              ((HFQ[3][1] & 0x01) << 13) | ((HF[2][1] & 0x01) << 14);
+  SFP[0][2] = ((HF[0][0] >> 1) & 0x7f) | ((HF[1][0] & 0xff) << 7);
+  SFP[1][2] = 0x8000 | ((HF[2][0] >> 1) & 0x7f) | ((HF[3][0] & 0xff) << 7);
+  SFP[0][3] = ((HF[0][1] >> 1) & 0x7f) | ((HF[1][1] & 0xff) << 7);
+  SFP[1][3] = 0x8000 | ((HF[2][1] >> 1) & 0x7f) | ((HF[3][1] & 0xff) << 7);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//RC arrays are RC[receiver card number<7][region<2]
-//SFP arrays are SFP[cycle<2][sfp number<4]
- 
-    void SourceCardRouting::RC012toSFP(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&SFP)[2][4]) const{
-
-	SFP[0][0] = (RC[0][0]&0x3ff)|((RCof[0][0]&0x1)<<10)|((RCtau[0][0]&0x1)<<11)|((RC[2][0]&0x7)<<12);
-	SFP[1][0] = 0x8000|(RC[0][1]&0x3ff)|((RCof[0][1]&0x1)<<10)|((RCtau[0][1]&0x1)<<11)|((RC[2][1]&0x7)<<12);
-
-      	SFP[0][1] = (RC[1][0]&0x3ff)|((RCof[1][0]&0x1)<<10)|((RCtau[1][0]&0x1)<<11)|((RC[2][0]&0x38)<<9);
-      	SFP[1][1] = 0x8000|(RC[1][1]&0x3ff)|((RCof[1][1]&0x1)<<10)|((RCtau[1][1]&0x1)<<11)|((RC[2][1]&0x38)<<9);
-
-	SFP[0][2] = (RC[0][0]&0x3ff)|((RCof[0][0]&0x1)<<10)|((RCtau[0][0]&0x1)<<11);
-	SFP[1][2] = 0x8000|(RC[0][1]&0x3ff)|((RCof[0][1]&0x1)<<10)|((RCtau[0][1]&0x1)<<11);
-
-      	SFP[0][3] = (RC[1][0]&0x3ff)|((RCof[1][0]&0x1)<<10)|((RCtau[1][0]&0x1)<<11);
-      	SFP[1][3] = 0x8000|(RC[1][1]&0x3ff)|((RCof[1][1]&0x1)<<10)|((RCtau[1][1]&0x1)<<11);
-
+// RC arrays are RC[receiver card number<7][region<2]
+// HF arrays are HF[eta<4][HF region<2]
+// SFP arrays are SFP[cycle<2][sfp number<4]
+
+void SourceCardRouting::SFPtoRC56HF(unsigned short (&RC)[7][2],
+                                    unsigned short (&RCof)[7][2],
+                                    unsigned short (&RCtau)[7][2],
+                                    unsigned short (&HF)[4][2],
+                                    unsigned short (&HFQ)[4][2],
+                                    unsigned short (&SFP)[2][4]) const {
+
+  RC[5][0] = SFP[0][0] & 0x3ff;
+  RC[5][1] = SFP[1][0] & 0x3ff;
+  RC[6][0] = SFP[0][1] & 0x3ff;
+  RC[6][1] = SFP[1][1] & 0x3ff;
+
+  RCof[5][0] = (SFP[0][0] >> 10) & 0x1;
+  RCof[5][1] = (SFP[1][0] >> 10) & 0x1;
+  RCof[6][0] = (SFP[0][1] >> 10) & 0x1;
+  RCof[6][1] = (SFP[1][1] >> 10) & 0x1;
+
+  RCtau[5][0] = (SFP[0][0] >> 11) & 0x1;
+  RCtau[5][1] = (SFP[1][0] >> 11) & 0x1;
+  RCtau[6][0] = (SFP[0][1] >> 11) & 0x1;
+  RCtau[6][1] = (SFP[1][1] >> 11) & 0x1;
+
+  HFQ[0][0] = (SFP[0][0] >> 12) & 0x1;
+  HFQ[1][0] = (SFP[0][0] >> 13) & 0x1;
+  HFQ[2][0] = (SFP[1][0] >> 12) & 0x1;
+  HFQ[3][0] = (SFP[1][0] >> 13) & 0x1;
+
+  HFQ[0][1] = (SFP[0][1] >> 12) & 0x1;
+  HFQ[1][1] = (SFP[0][1] >> 13) & 0x1;
+  HFQ[2][1] = (SFP[1][1] >> 12) & 0x1;
+  HFQ[3][1] = (SFP[1][1] >> 13) & 0x1;
+
+  HF[0][0] = ((SFP[0][2] & 0x7f) << 1) | ((SFP[0][0] >> 14) & 0x01);
+  HF[1][0] = (SFP[0][2] >> 7) & 0xff;
+  HF[2][0] = ((SFP[1][2] & 0x7f) << 1) | ((SFP[1][0] >> 14) & 0x01);
+  HF[3][0] = (SFP[1][2] >> 7) & 0xff;
+
+  HF[0][1] = ((SFP[0][3] & 0x7f) << 1) | ((SFP[0][1] >> 14) & 0x01);
+  HF[1][1] = (SFP[0][3] >> 7) & 0xff;
+  HF[2][1] = ((SFP[1][3] & 0x7f) << 1) | ((SFP[1][1] >> 14) & 0x01);
+  HF[3][1] = (SFP[1][3] >> 7) & 0xff;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//RC arrays are RC[receiver card number<7][region<2]
-//SFP arrays are SFP[cycle<2][sfp number<4]
- 
-    void SourceCardRouting::SFPtoRC012(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&SFP)[2][4]) const{
+// RC arrays are RC[receiver card number<7][region<2]
+// SFP arrays are SFP[cycle<2][sfp number<4]
 
-	RC[0][0]=SFP[0][0]&0x3ff;
-	RC[0][1]=SFP[1][0]&0x3ff;
-	RC[1][0]=SFP[0][1]&0x3ff;
-	RC[1][1]=SFP[1][1]&0x3ff;
-	RC[2][0]=(RC[2][0]&0x3c0)|((SFP[0][0]&0x7000)>>12)|((SFP[0][1]&0x7000)>>9);
-	RC[2][1]=(RC[2][1]&0x3c0)|((SFP[1][0]&0x7000)>>12)|((SFP[1][1]&0x7000)>>9);
+void SourceCardRouting::RC012toSFP(unsigned short (&RC)[7][2],
+                                   unsigned short (&RCof)[7][2],
+                                   unsigned short (&RCtau)[7][2],
+                                   unsigned short (&SFP)[2][4]) const {
 
-	RCof[0][0]=(SFP[0][0]>>10)&0x1;
-	RCof[0][1]=(SFP[1][0]>>10)&0x1;
-	RCof[1][0]=(SFP[0][1]>>10)&0x1;
-	RCof[1][1]=(SFP[1][1]>>10)&0x1;
+  SFP[0][0] = (RC[0][0] & 0x3ff) | ((RCof[0][0] & 0x1) << 10) |
+              ((RCtau[0][0] & 0x1) << 11) | ((RC[2][0] & 0x7) << 12);
+  SFP[1][0] = 0x8000 | (RC[0][1] & 0x3ff) | ((RCof[0][1] & 0x1) << 10) |
+              ((RCtau[0][1] & 0x1) << 11) | ((RC[2][1] & 0x7) << 12);
 
-	RCtau[0][0]=(SFP[0][0]>>11)&0x1;
-	RCtau[0][1]=(SFP[1][0]>>11)&0x1;
-	RCtau[1][0]=(SFP[0][1]>>11)&0x1;
-	RCtau[1][1]=(SFP[1][1]>>11)&0x1;
+  SFP[0][1] = (RC[1][0] & 0x3ff) | ((RCof[1][0] & 0x1) << 10) |
+              ((RCtau[1][0] & 0x1) << 11) | ((RC[2][0] & 0x38) << 9);
+  SFP[1][1] = 0x8000 | (RC[1][1] & 0x3ff) | ((RCof[1][1] & 0x1) << 10) |
+              ((RCtau[1][1] & 0x1) << 11) | ((RC[2][1] & 0x38) << 9);
 
+  SFP[0][2] = (RC[0][0] & 0x3ff) | ((RCof[0][0] & 0x1) << 10) |
+              ((RCtau[0][0] & 0x1) << 11);
+  SFP[1][2] = 0x8000 | (RC[0][1] & 0x3ff) | ((RCof[0][1] & 0x1) << 10) |
+              ((RCtau[0][1] & 0x1) << 11);
 
+  SFP[0][3] = (RC[1][0] & 0x3ff) | ((RCof[1][0] & 0x1) << 10) |
+              ((RCtau[1][0] & 0x1) << 11);
+  SFP[1][3] = 0x8000 | (RC[1][1] & 0x3ff) | ((RCof[1][1] & 0x1) << 10) |
+              ((RCtau[1][1] & 0x1) << 11);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//RC arrays are RC[receiver card number<7][region<2]
-//SFP arrays are SFP[cycle<2][sfp number<4]
- 
-    void SourceCardRouting::RC234toSFP(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			unsigned short (&SFP)[2][4]) const{
-
-	SFP[0][0] = (RC[3][0]&0x3ff)|((RCof[3][0]&0x1)<<10)|((RCtau[3][0]&0x1)<<11)|((RC[2][0]&0x1c0)<<6);
-	SFP[1][0] = 0x8000|(RC[3][1]&0x3ff)|((RCof[3][1]&0x1)<<10)|((RCtau[3][1]&0x1)<<11)|((RC[2][1]&0x1c0)<<6);
-
-      	SFP[0][1] = (RC[4][0]&0x3ff)|((RCof[4][0]&0x1)<<10)|((RCtau[4][0]&0x1)<<11)|((RC[2][0]&0x200)<<3)|((RCof[2][0]&0x1)<<13)|((RCtau[2][0]&0x1)<<14);
-      	SFP[1][1] = 0x8000|(RC[4][1]&0x3ff)|((RCof[4][1]&0x1)<<10)|((RCtau[4][1]&0x1)<<11)|((RC[2][1]&0x200)<<3)|((RCof[2][1]&0x1)<<13)|((RCtau[2][1]&0x1)<<14);
-
-	SFP[0][2] = (sisterRC[3][0]&0x3ff)|((sisterRCof[3][0]&0x1)<<10)|((sisterRCtau[3][0]&0x1)<<11)|((sisterRC[2][0]&0x1c0)<<6);
-	SFP[1][2] = 0x8000|(sisterRC[3][1]&0x3ff)|((sisterRCof[3][1]&0x1)<<10)|((sisterRCtau[3][1]&0x1)<<11)|((sisterRC[2][1]&0x1c0)<<6);
-
-      	SFP[0][3] = (sisterRC[4][0]&0x3ff)|((sisterRCof[4][0]&0x1)<<10)|((sisterRCtau[4][0]&0x1)<<11)|((sisterRC[2][0]&0x200)<<3)|((sisterRCof[2][0]&0x1)<<13)|((sisterRCtau[2][0]&0x1)<<14);
-      	SFP[1][3] = 0x8000|(sisterRC[4][1]&0x3ff)|((sisterRCof[4][1]&0x1)<<10)|((sisterRCtau[4][1]&0x1)<<11)|((sisterRC[2][1]&0x200)<<3)|((sisterRCof[2][1]&0x1)<<13)|((sisterRCtau[2][1]&0x1)<<14);
-
+// RC arrays are RC[receiver card number<7][region<2]
+// SFP arrays are SFP[cycle<2][sfp number<4]
+
+void SourceCardRouting::SFPtoRC012(unsigned short (&RC)[7][2],
+                                   unsigned short (&RCof)[7][2],
+                                   unsigned short (&RCtau)[7][2],
+                                   unsigned short (&SFP)[2][4]) const {
+
+  RC[0][0] = SFP[0][0] & 0x3ff;
+  RC[0][1] = SFP[1][0] & 0x3ff;
+  RC[1][0] = SFP[0][1] & 0x3ff;
+  RC[1][1] = SFP[1][1] & 0x3ff;
+  RC[2][0] = (RC[2][0] & 0x3c0) | ((SFP[0][0] & 0x7000) >> 12) |
+             ((SFP[0][1] & 0x7000) >> 9);
+  RC[2][1] = (RC[2][1] & 0x3c0) | ((SFP[1][0] & 0x7000) >> 12) |
+             ((SFP[1][1] & 0x7000) >> 9);
+
+  RCof[0][0] = (SFP[0][0] >> 10) & 0x1;
+  RCof[0][1] = (SFP[1][0] >> 10) & 0x1;
+  RCof[1][0] = (SFP[0][1] >> 10) & 0x1;
+  RCof[1][1] = (SFP[1][1] >> 10) & 0x1;
+
+  RCtau[0][0] = (SFP[0][0] >> 11) & 0x1;
+  RCtau[0][1] = (SFP[1][0] >> 11) & 0x1;
+  RCtau[1][0] = (SFP[0][1] >> 11) & 0x1;
+  RCtau[1][1] = (SFP[1][1] >> 11) & 0x1;
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//RC arrays are RC[receiver card number<7][region<2]
-//SFP arrays are SFP[cycle<2][sfp number<4]
- 
-     void SourceCardRouting::SFPtoRC234(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			unsigned short (&SFP)[2][4]) const{
-
-	RC[2][0]=(RC[2][0]&0x3f)|((SFP[0][0]&0x7000)>>6)|((SFP[0][1]&0x1000)>>3);
-	RC[3][0]=SFP[0][0]&0x3ff;
-	RC[4][0]=SFP[0][1]&0x3ff;
-	RC[2][1]=(RC[2][1]&0x3f)|((SFP[1][0]&0x7000)>>6)|((SFP[1][1]&0x1000)>>3);
-	RC[3][1]=SFP[1][0]&0x3ff;
-	RC[4][1]=SFP[1][1]&0x3ff;
-
-	RCof[2][0]=(SFP[0][1]>>13)&0x1;
-	RCof[3][0]=(SFP[0][0]>>10)&0x1;
-	RCof[4][0]=(SFP[0][1]>>10)&0x1;
-	RCof[2][1]=(SFP[1][1]>>13)&0x1;
-	RCof[3][1]=(SFP[1][0]>>10)&0x1;
-	RCof[4][1]=(SFP[1][1]>>10)&0x1;
-
-	RCtau[2][0]=(SFP[0][1]>>14)&0x1;
-	RCtau[3][0]=(SFP[0][0]>>11)&0x1;
-	RCtau[4][0]=(SFP[0][1]>>11)&0x1;
-	RCtau[2][1]=(SFP[1][1]>>14)&0x1;
-	RCtau[3][1]=(SFP[1][0]>>11)&0x1;
-	RCtau[4][1]=(SFP[1][1]>>11)&0x1;
-
-	sisterRC[2][0]=(sisterRC[2][0]&~0x3C0)|((SFP[0][2]&0x7000)>>6)|((SFP[0][3]&0x1000)>>3);
-	sisterRC[3][0]=SFP[0][2]&0x3ff;
-	sisterRC[4][0]=SFP[0][3]&0x3ff;
-	sisterRC[2][1]=(sisterRC[2][1]&~0x3C0)|((SFP[1][2]&0x7000)>>6)|((SFP[1][3]&0x1000)>>3);
-	sisterRC[3][1]=SFP[1][2]&0x3ff;
-	sisterRC[4][1]=SFP[1][3]&0x3ff;
-
-	sisterRCof[2][0]=(SFP[0][3]>>13)&0x1;
-	sisterRCof[3][0]=(SFP[0][2]>>10)&0x1;
-	sisterRCof[4][0]=(SFP[0][3]>>10)&0x1;
-	sisterRCof[2][1]=(SFP[1][3]>>13)&0x1;
-	sisterRCof[3][1]=(SFP[1][2]>>10)&0x1;
-	sisterRCof[4][1]=(SFP[1][3]>>10)&0x1;
-
-	sisterRCtau[2][0]=(SFP[0][3]>>14)&0x1;
-	sisterRCtau[3][0]=(SFP[0][2]>>11)&0x1;
-	sisterRCtau[4][0]=(SFP[0][3]>>11)&0x1;
-	sisterRCtau[2][1]=(SFP[1][3]>>14)&0x1;
-	sisterRCtau[3][1]=(SFP[1][2]>>11)&0x1;
-	sisterRCtau[4][1]=(SFP[1][3]>>11)&0x1;
-
+// RC arrays are RC[receiver card number<7][region<2]
+// SFP arrays are SFP[cycle<2][sfp number<4]
+
+void SourceCardRouting::RC234toSFP(unsigned short (&RC)[7][2],
+                                   unsigned short (&RCof)[7][2],
+                                   unsigned short (&RCtau)[7][2],
+                                   unsigned short (&sisterRC)[7][2],
+                                   unsigned short (&sisterRCof)[7][2],
+                                   unsigned short (&sisterRCtau)[7][2],
+                                   unsigned short (&SFP)[2][4]) const {
+
+  SFP[0][0] = (RC[3][0] & 0x3ff) | ((RCof[3][0] & 0x1) << 10) |
+              ((RCtau[3][0] & 0x1) << 11) | ((RC[2][0] & 0x1c0) << 6);
+  SFP[1][0] = 0x8000 | (RC[3][1] & 0x3ff) | ((RCof[3][1] & 0x1) << 10) |
+              ((RCtau[3][1] & 0x1) << 11) | ((RC[2][1] & 0x1c0) << 6);
+
+  SFP[0][1] = (RC[4][0] & 0x3ff) | ((RCof[4][0] & 0x1) << 10) |
+              ((RCtau[4][0] & 0x1) << 11) | ((RC[2][0] & 0x200) << 3) |
+              ((RCof[2][0] & 0x1) << 13) | ((RCtau[2][0] & 0x1) << 14);
+  SFP[1][1] = 0x8000 | (RC[4][1] & 0x3ff) | ((RCof[4][1] & 0x1) << 10) |
+              ((RCtau[4][1] & 0x1) << 11) | ((RC[2][1] & 0x200) << 3) |
+              ((RCof[2][1] & 0x1) << 13) | ((RCtau[2][1] & 0x1) << 14);
+
+  SFP[0][2] = (sisterRC[3][0] & 0x3ff) | ((sisterRCof[3][0] & 0x1) << 10) |
+              ((sisterRCtau[3][0] & 0x1) << 11) |
+              ((sisterRC[2][0] & 0x1c0) << 6);
+  SFP[1][2] =
+      0x8000 | (sisterRC[3][1] & 0x3ff) | ((sisterRCof[3][1] & 0x1) << 10) |
+      ((sisterRCtau[3][1] & 0x1) << 11) | ((sisterRC[2][1] & 0x1c0) << 6);
+
+  SFP[0][3] =
+      (sisterRC[4][0] & 0x3ff) | ((sisterRCof[4][0] & 0x1) << 10) |
+      ((sisterRCtau[4][0] & 0x1) << 11) | ((sisterRC[2][0] & 0x200) << 3) |
+      ((sisterRCof[2][0] & 0x1) << 13) | ((sisterRCtau[2][0] & 0x1) << 14);
+  SFP[1][3] =
+      0x8000 | (sisterRC[4][1] & 0x3ff) | ((sisterRCof[4][1] & 0x1) << 10) |
+      ((sisterRCtau[4][1] & 0x1) << 11) | ((sisterRC[2][1] & 0x200) << 3) |
+      ((sisterRCof[2][1] & 0x1) << 13) | ((sisterRCtau[2][1] & 0x1) << 14);
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// RC arrays are RC[receiver card number<7][region<2]
+// SFP arrays are SFP[cycle<2][sfp number<4]
+
+void SourceCardRouting::SFPtoRC234(unsigned short (&RC)[7][2],
+                                   unsigned short (&RCof)[7][2],
+                                   unsigned short (&RCtau)[7][2],
+                                   unsigned short (&sisterRC)[7][2],
+                                   unsigned short (&sisterRCof)[7][2],
+                                   unsigned short (&sisterRCtau)[7][2],
+                                   unsigned short (&SFP)[2][4]) const {
+
+  RC[2][0] = (RC[2][0] & 0x3f) | ((SFP[0][0] & 0x7000) >> 6) |
+             ((SFP[0][1] & 0x1000) >> 3);
+  RC[3][0] = SFP[0][0] & 0x3ff;
+  RC[4][0] = SFP[0][1] & 0x3ff;
+  RC[2][1] = (RC[2][1] & 0x3f) | ((SFP[1][0] & 0x7000) >> 6) |
+             ((SFP[1][1] & 0x1000) >> 3);
+  RC[3][1] = SFP[1][0] & 0x3ff;
+  RC[4][1] = SFP[1][1] & 0x3ff;
+
+  RCof[2][0] = (SFP[0][1] >> 13) & 0x1;
+  RCof[3][0] = (SFP[0][0] >> 10) & 0x1;
+  RCof[4][0] = (SFP[0][1] >> 10) & 0x1;
+  RCof[2][1] = (SFP[1][1] >> 13) & 0x1;
+  RCof[3][1] = (SFP[1][0] >> 10) & 0x1;
+  RCof[4][1] = (SFP[1][1] >> 10) & 0x1;
+
+  RCtau[2][0] = (SFP[0][1] >> 14) & 0x1;
+  RCtau[3][0] = (SFP[0][0] >> 11) & 0x1;
+  RCtau[4][0] = (SFP[0][1] >> 11) & 0x1;
+  RCtau[2][1] = (SFP[1][1] >> 14) & 0x1;
+  RCtau[3][1] = (SFP[1][0] >> 11) & 0x1;
+  RCtau[4][1] = (SFP[1][1] >> 11) & 0x1;
+
+  sisterRC[2][0] = (sisterRC[2][0] & ~0x3C0) | ((SFP[0][2] & 0x7000) >> 6) |
+                   ((SFP[0][3] & 0x1000) >> 3);
+  sisterRC[3][0] = SFP[0][2] & 0x3ff;
+  sisterRC[4][0] = SFP[0][3] & 0x3ff;
+  sisterRC[2][1] = (sisterRC[2][1] & ~0x3C0) | ((SFP[1][2] & 0x7000) >> 6) |
+                   ((SFP[1][3] & 0x1000) >> 3);
+  sisterRC[3][1] = SFP[1][2] & 0x3ff;
+  sisterRC[4][1] = SFP[1][3] & 0x3ff;
+
+  sisterRCof[2][0] = (SFP[0][3] >> 13) & 0x1;
+  sisterRCof[3][0] = (SFP[0][2] >> 10) & 0x1;
+  sisterRCof[4][0] = (SFP[0][3] >> 10) & 0x1;
+  sisterRCof[2][1] = (SFP[1][3] >> 13) & 0x1;
+  sisterRCof[3][1] = (SFP[1][2] >> 10) & 0x1;
+  sisterRCof[4][1] = (SFP[1][3] >> 10) & 0x1;
+
+  sisterRCtau[2][0] = (SFP[0][3] >> 14) & 0x1;
+  sisterRCtau[3][0] = (SFP[0][2] >> 11) & 0x1;
+  sisterRCtau[4][0] = (SFP[0][3] >> 11) & 0x1;
+  sisterRCtau[2][1] = (SFP[1][3] >> 14) & 0x1;
+  sisterRCtau[3][1] = (SFP[1][2] >> 11) & 0x1;
+  sisterRCtau[4][1] = (SFP[1][3] >> 11) & 0x1;
+}
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
-//SFP arrays are SFP[cycle<2][sfp number<4]
-
-    void SourceCardRouting::SFPtoVHDCI(	int RoutingMode,
-			unsigned short (&SFP)[2][4],
-			unsigned long (&VHDCI)[2][2] ) const{
-
-unsigned short sfp_reverse[2][4]={{0}};
-
-for (int i=0; i<2;i++){
-	for(int j=0; j<4;j++){
-		for (int k=0; k<16;k++){
-			sfp_reverse[i][j]=sfp_reverse[i][j]|(((SFP[i][j]>>k)&0x01)<<(15-k));
-		}
-		//std::cout <<hex<< SFP[i][j]<<'\t'<<sfp_reverse[i][j]<<std::endl;
-	}
-}
-
-	switch (RoutingMode){
-		case 0:
-			VHDCI[0][0]=(SFP[0][1]&0x3ff)|((SFP[0][1]&0x1c00)<<1)|((SFP[0][2]&0x3c00)<<4)|((SFP[0][3]&0x1c00)<<8)|((SFP[0][0]&0xff)<<22);
-			VHDCI[0][1]=(SFP[1][1]&0x3ff)|((SFP[1][1]&0x1c00)<<1)|((SFP[1][2]&0x3c00)<<4)|((SFP[1][3]&0x1c00)<<8)|((SFP[1][0]&0xff)<<22);
-			VHDCI[1][0]=(SFP[0][2]&0x3ff)|((SFP[0][3]&0x3ff)<<11)|((SFP[0][0]&0x3f00)<<14);
-			VHDCI[1][1]=(SFP[1][2]&0x3ff)|((SFP[1][3]&0x3ff)<<11)|((SFP[1][0]&0x3f00)<<14);
-		break;
-		case 1:
-			VHDCI[0][0]=(SFP[0][0]&0xfff)|((SFP[0][1]&0x7)<<12)|((SFP[0][2]&0x80)<<10)|((SFP[0][0]&0x4000)<<4)|((sfp_reverse[0][1]&0xc)<<17)|((sfp_reverse[0][0]&0xc)<<19)|((sfp_reverse[0][1]&0x1ff0)<<19);
-			VHDCI[0][1]=(SFP[1][0]&0xfff)|((SFP[1][1]&0x7)<<12)|((SFP[1][2]&0x80)<<10)|((SFP[1][0]&0x4000)<<4)|((sfp_reverse[1][1]&0xc)<<17)|((sfp_reverse[1][0]&0xc)<<19)|((sfp_reverse[1][1]&0x1ff0)<<19);
-
-			VHDCI[1][0]=(SFP[0][1]&0x4000)|((SFP[0][3]&0x80)<<24);
-			VHDCI[1][1]=(SFP[1][1]&0x4000)|((SFP[1][3]&0x80)<<24);
-
-			for (int i=0; i<7;i++){
-				VHDCI[1][0]=VHDCI[1][0]|(((SFP[0][2]>>i)&0x1)<<(2*i))|(((SFP[0][2]>>(i+8))&0x1)<<((2*i)+1))|(((sfp_reverse[0][3]>>(i+1))&0x1)<<((2*i)+17))|(((sfp_reverse[0][3]>>(i+9))&0x1)<<((2*i)+18));
-				VHDCI[1][1]=VHDCI[1][1]|(((SFP[1][2]>>i)&0x1)<<(2*i))|(((SFP[1][2]>>(i+8))&0x1)<<((2*i)+1))|(((sfp_reverse[1][3]>>(i+1))&0x1)<<((2*i)+17))|(((sfp_reverse[1][3]>>(i+9))&0x1)<<((2*i)+18));		
-			}
-		break;
-		case 2:
-			VHDCI[0][0]=(SFP[0][0]&0xfff)|((SFP[0][1]&0x7)<<12)|((sfp_reverse[0][1]&0xe)<<16)|((sfp_reverse[0][0]&0xe)<<19)|((sfp_reverse[0][1]&0x1ff0)<<19);
-			VHDCI[0][1]=(SFP[1][0]&0xfff)|((SFP[1][1]&0x7)<<12)|((sfp_reverse[1][1]&0xe)<<16)|((sfp_reverse[1][0]&0xe)<<19)|((sfp_reverse[1][1]&0x1ff0)<<19);
-			VHDCI[1][0]=0;
-			VHDCI[1][1]=0;
-		break;
-		case 3:
-			VHDCI[0][0]=((SFP[0][0]>>12)&0x7)|((SFP[0][1]>>9)&0x38)|((SFP[0][0]&0x1ff)<<6)|((sfp_reverse[0][1]&0xfff0)<<13)|((sfp_reverse[0][0]&0x70)<<25);
-			VHDCI[0][1]=((SFP[1][0]>>12)&0x7)|((SFP[1][1]>>9)&0x38)|((SFP[1][0]&0x1ff)<<6)|((sfp_reverse[1][1]&0xfff0)<<13)|((sfp_reverse[1][0]&0x70)<<25);
-
-			VHDCI[1][0]=((SFP[0][2]>>12)&0x7)|((SFP[0][3]>>9)&0x38)|((SFP[0][2]&0x1ff)<<6)|((sfp_reverse[0][3]&0xfff0)<<13)|((sfp_reverse[0][2]&0x70)<<25);
-			VHDCI[1][1]=((SFP[1][2]>>12)&0x7)|((SFP[1][3]>>9)&0x38)|((SFP[1][2]&0x1ff)<<6)|((sfp_reverse[1][3]&0xfff0)<<13)|((sfp_reverse[1][2]&0x70)<<25);
-		break;
-		default:
-			VHDCI[0][0]=0;
-			VHDCI[0][1]=0;
-			VHDCI[1][0]=0;
-			VHDCI[1][1]=0;
-		}
-
+// VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
+// SFP arrays are SFP[cycle<2][sfp number<4]
+
+void SourceCardRouting::SFPtoVHDCI(int RoutingMode, unsigned short (&SFP)[2][4],
+                                   unsigned long (&VHDCI)[2][2]) const {
+
+  unsigned short sfp_reverse[2][4] = {{0}};
+
+  for (int i = 0; i < 2; i++) {
+    for (int j = 0; j < 4; j++) {
+      for (int k = 0; k < 16; k++) {
+        sfp_reverse[i][j] =
+            sfp_reverse[i][j] | (((SFP[i][j] >> k) & 0x01) << (15 - k));
+      }
+      // std::cout <<hex<< SFP[i][j]<<'\t'<<sfp_reverse[i][j]<<std::endl;
+    }
+  }
+
+  switch (RoutingMode) {
+  case 0:
+    VHDCI[0][0] = (SFP[0][1] & 0x3ff) | ((SFP[0][1] & 0x1c00) << 1) |
+                  ((SFP[0][2] & 0x3c00) << 4) | ((SFP[0][3] & 0x1c00) << 8) |
+                  ((SFP[0][0] & 0xff) << 22);
+    VHDCI[0][1] = (SFP[1][1] & 0x3ff) | ((SFP[1][1] & 0x1c00) << 1) |
+                  ((SFP[1][2] & 0x3c00) << 4) | ((SFP[1][3] & 0x1c00) << 8) |
+                  ((SFP[1][0] & 0xff) << 22);
+    VHDCI[1][0] = (SFP[0][2] & 0x3ff) | ((SFP[0][3] & 0x3ff) << 11) |
+                  ((SFP[0][0] & 0x3f00) << 14);
+    VHDCI[1][1] = (SFP[1][2] & 0x3ff) | ((SFP[1][3] & 0x3ff) << 11) |
+                  ((SFP[1][0] & 0x3f00) << 14);
+    break;
+  case 1:
+    VHDCI[0][0] = (SFP[0][0] & 0xfff) | ((SFP[0][1] & 0x7) << 12) |
+                  ((SFP[0][2] & 0x80) << 10) | ((SFP[0][0] & 0x4000) << 4) |
+                  ((sfp_reverse[0][1] & 0xc) << 17) |
+                  ((sfp_reverse[0][0] & 0xc) << 19) |
+                  ((sfp_reverse[0][1] & 0x1ff0) << 19);
+    VHDCI[0][1] = (SFP[1][0] & 0xfff) | ((SFP[1][1] & 0x7) << 12) |
+                  ((SFP[1][2] & 0x80) << 10) | ((SFP[1][0] & 0x4000) << 4) |
+                  ((sfp_reverse[1][1] & 0xc) << 17) |
+                  ((sfp_reverse[1][0] & 0xc) << 19) |
+                  ((sfp_reverse[1][1] & 0x1ff0) << 19);
+
+    VHDCI[1][0] = (SFP[0][1] & 0x4000) | ((SFP[0][3] & 0x80) << 24);
+    VHDCI[1][1] = (SFP[1][1] & 0x4000) | ((SFP[1][3] & 0x80) << 24);
+
+    for (int i = 0; i < 7; i++) {
+      VHDCI[1][0] = VHDCI[1][0] | (((SFP[0][2] >> i) & 0x1) << (2 * i)) |
+                    (((SFP[0][2] >> (i + 8)) & 0x1) << ((2 * i) + 1)) |
+                    (((sfp_reverse[0][3] >> (i + 1)) & 0x1) << ((2 * i) + 17)) |
+                    (((sfp_reverse[0][3] >> (i + 9)) & 0x1) << ((2 * i) + 18));
+      VHDCI[1][1] = VHDCI[1][1] | (((SFP[1][2] >> i) & 0x1) << (2 * i)) |
+                    (((SFP[1][2] >> (i + 8)) & 0x1) << ((2 * i) + 1)) |
+                    (((sfp_reverse[1][3] >> (i + 1)) & 0x1) << ((2 * i) + 17)) |
+                    (((sfp_reverse[1][3] >> (i + 9)) & 0x1) << ((2 * i) + 18));
+    }
+    break;
+  case 2:
+    VHDCI[0][0] = (SFP[0][0] & 0xfff) | ((SFP[0][1] & 0x7) << 12) |
+                  ((sfp_reverse[0][1] & 0xe) << 16) |
+                  ((sfp_reverse[0][0] & 0xe) << 19) |
+                  ((sfp_reverse[0][1] & 0x1ff0) << 19);
+    VHDCI[0][1] = (SFP[1][0] & 0xfff) | ((SFP[1][1] & 0x7) << 12) |
+                  ((sfp_reverse[1][1] & 0xe) << 16) |
+                  ((sfp_reverse[1][0] & 0xe) << 19) |
+                  ((sfp_reverse[1][1] & 0x1ff0) << 19);
+    VHDCI[1][0] = 0;
+    VHDCI[1][1] = 0;
+    break;
+  case 3:
+    VHDCI[0][0] = ((SFP[0][0] >> 12) & 0x7) | ((SFP[0][1] >> 9) & 0x38) |
+                  ((SFP[0][0] & 0x1ff) << 6) |
+                  ((sfp_reverse[0][1] & 0xfff0) << 13) |
+                  ((sfp_reverse[0][0] & 0x70) << 25);
+    VHDCI[0][1] = ((SFP[1][0] >> 12) & 0x7) | ((SFP[1][1] >> 9) & 0x38) |
+                  ((SFP[1][0] & 0x1ff) << 6) |
+                  ((sfp_reverse[1][1] & 0xfff0) << 13) |
+                  ((sfp_reverse[1][0] & 0x70) << 25);
+
+    VHDCI[1][0] = ((SFP[0][2] >> 12) & 0x7) | ((SFP[0][3] >> 9) & 0x38) |
+                  ((SFP[0][2] & 0x1ff) << 6) |
+                  ((sfp_reverse[0][3] & 0xfff0) << 13) |
+                  ((sfp_reverse[0][2] & 0x70) << 25);
+    VHDCI[1][1] = ((SFP[1][2] >> 12) & 0x7) | ((SFP[1][3] >> 9) & 0x38) |
+                  ((SFP[1][2] & 0x1ff) << 6) |
+                  ((sfp_reverse[1][3] & 0xfff0) << 13) |
+                  ((sfp_reverse[1][2] & 0x70) << 25);
+    break;
+  default:
+    VHDCI[0][0] = 0;
+    VHDCI[0][1] = 0;
+    VHDCI[1][0] = 0;
+    VHDCI[1][1] = 0;
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
-//SFP arrays are SFP[cycle<2][sfp number<4]
-    void SourceCardRouting::VHDCItoSFP(	int RoutingMode,
-			unsigned short (&SFP)[2][4],
-			unsigned long (&VHDCI)[2][2]	) const{
-
-unsigned short VHDCI_reverse[2][4]={{0}};
-
-for (int i=0; i<2;i++){
-	for(int j=0; j<2;j++){
-		for (int k=0; k<32;k++){
-			VHDCI_reverse[i][j]=VHDCI_reverse[i][j]|(((VHDCI[i][j]>>k)&0x01)<<(31-k));
-		}
-	}
-}
-
-	switch (RoutingMode){
-		case 0:
-			SFP[0][0]=((VHDCI[0][0]>>22)&0xff)|((VHDCI[1][0]>>14)&0x3f00);
-			SFP[1][0]=0x8000|((VHDCI[0][1]>>22)&0xff)|((VHDCI[1][1]>>14)&0x3f00);
-			SFP[0][1]=(VHDCI[0][0]&0x3ff)|((VHDCI[0][0]>>1)&0x1c00);
-			SFP[1][1]=0x8000|(VHDCI[0][1]&0x3ff)|((VHDCI[0][1]>>1)&0x1c00);
-			SFP[0][2]=(VHDCI[1][0]&0x3ff)|((VHDCI[0][0]>>4)&0x3c00);
-			SFP[1][2]=0x8000|(VHDCI[1][1]&0x3ff)|((VHDCI[0][1]>>4)&0x3c00);
-			SFP[0][3]=((VHDCI[1][0]>>11)&0x3ff)|((VHDCI[0][0]>>8)&0x1c00);
-			SFP[1][3]=0x8000|((VHDCI[1][1]>>11)&0x3ff)|((VHDCI[0][1]>>8)&0x1c00);
-		break;
-		case 1:
-			SFP[0][0]=(VHDCI[0][0]&0xfff)|((VHDCI_reverse[0][0]&0x600)<<3)|((VHDCI_reverse[0][0]&0x2000)<<1);
-			SFP[1][0]=0x8000|(VHDCI[0][1]&0xfff)|((VHDCI_reverse[0][1]&0x600)<<3)|((VHDCI_reverse[0][1]&0x2000)<<1);
-			SFP[0][1]=((VHDCI[0][0]&0x7000)>>12)|((VHDCI_reverse[0][0]&0x1ff)<<3)|((VHDCI_reverse[0][0]&0x1800)<<1)|(VHDCI[1][0]&0x4000);
-			SFP[1][1]=0x8000|((VHDCI[0][1]&0x7000)>>12)|((VHDCI_reverse[0][1]&0x1ff)<<3)|((VHDCI_reverse[0][1]&0x1800)<<1)|(VHDCI[1][1]&0x4000);
-
-			SFP[0][2]=((VHDCI[0][0]&0x20000)>>10);
-			SFP[1][2]=0x8000|((VHDCI[0][1]&0x20000)>>10);
-			SFP[0][3]=((VHDCI[1][0]&0x20000)>>3);
-			SFP[1][3]=0x8000|((VHDCI[1][1]&0x20000)>>3);
-			for (int i=0; i<7;i++){
-				SFP[0][2]=SFP[0][2]|(((VHDCI[1][0]>>(2*i))&0x1)<<i)|(((VHDCI[1][0]>>((2*i)+1))&0x1)<<(i+8));
-				SFP[1][2]=SFP[1][2]|(((VHDCI[1][1]>>(2*i))&0x1)<<i)|(((VHDCI[1][1]>>((2*i)+1))&0x1)<<(i+8));
-				SFP[0][3]=SFP[0][3]|(((VHDCI_reverse[1][0]>>((2*i)+1))&0x1)<<i)|(((VHDCI_reverse[1][0]>>(2*i))&0x1)<<(i+7));
-				SFP[1][3]=SFP[1][3]|(((VHDCI_reverse[1][1]>>((2*i)+1))&0x1)<<i)|(((VHDCI_reverse[1][1]>>(2*i))&0x1)<<(i+7));
-			}
-		break;
-		case 2:
-			SFP[0][0]=(VHDCI[0][0]&0xfff)|((VHDCI_reverse[0][0]&0xe00)<<3);
-			SFP[1][0]=0x8000|(VHDCI[0][1]&0xfff)|((VHDCI_reverse[0][1]&0xe00)<<3);
-			SFP[0][1]=((VHDCI[0][0]&0x7000)>>12)|((VHDCI_reverse[0][0]&0x1ff)<<3)|(VHDCI_reverse[0][0]&0x7000);
-			SFP[1][1]=0x8000|((VHDCI[0][1]&0x7000)>>12)|((VHDCI_reverse[0][1]&0x1ff)<<3)|(VHDCI_reverse[0][1]&0x7000);
-			SFP[0][2]=(VHDCI[0][0]&0xfff);
-			SFP[1][2]=0x8000|(VHDCI[0][1]&0xfff);
-			SFP[0][3]=((VHDCI[0][0]&0x7000)>>12)|((VHDCI_reverse[0][0]&0x1ff)<<3);
-			SFP[1][3]=0x8000|((VHDCI[0][1]&0x7000)>>12)|((VHDCI_reverse[0][1]&0x1ff)<<3);
-		break;
-		case 3:
-			SFP[0][0]=((VHDCI[0][0]&0x7fc0)>>6)|((VHDCI_reverse[0][0]&0x7)<<9)|((VHDCI[0][0]&0x7)<<12);
-			SFP[1][0]=0x8000|((VHDCI[0][1]&0x7fc0)>>6)|((VHDCI_reverse[0][1]&0x7)<<9)|((VHDCI[0][1]&0x7)<<12);
-			SFP[0][1]=((VHDCI_reverse[0][0]&0x7ff8)>>3)|((VHDCI[0][0]&0x38)<<9);
-			SFP[1][1]=0x8000|((VHDCI_reverse[0][1]&0x7ff8)>>3)|((VHDCI[0][1]&0x38)<<9);
-			SFP[0][2]=((VHDCI[1][0]&0x7fc0)>>6)|((VHDCI_reverse[1][0]&0x7)<<9)|((VHDCI[1][0]&0x7)<<12);
-			SFP[1][2]=0x8000|((VHDCI[1][1]&0x7fc0)>>6)|((VHDCI_reverse[1][1]&0x7)<<9)|((VHDCI[1][1]&0x7)<<12);
-			SFP[0][3]=((VHDCI_reverse[1][0]&0x7ff8)>>3)|((VHDCI[1][0]&0x38)<<9);
-			SFP[1][3]=0x8000|((VHDCI_reverse[1][1]&0x7ff8)>>3)|((VHDCI[1][1]&0x38)<<9);
-		break;
-		default:
-			SFP[0][0]=0;
-			SFP[1][0]=0x8000;
-			SFP[0][1]=0;
-			SFP[1][1]=0x8000;
-			SFP[0][2]=0;
-			SFP[1][2]=0x8000;
-			SFP[0][3]=0;
-			SFP[1][3]=0x8000;
-		}
-}
-  
+// VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
+// SFP arrays are SFP[cycle<2][sfp number<4]
+void SourceCardRouting::VHDCItoSFP(int RoutingMode, unsigned short (&SFP)[2][4],
+                                   unsigned long (&VHDCI)[2][2]) const {
+
+  unsigned short VHDCI_reverse[2][4] = {{0}};
+
+  for (int i = 0; i < 2; i++) {
+    for (int j = 0; j < 2; j++) {
+      for (int k = 0; k < 32; k++) {
+        VHDCI_reverse[i][j] =
+            VHDCI_reverse[i][j] | (((VHDCI[i][j] >> k) & 0x01) << (31 - k));
+      }
+    }
+  }
+
+  switch (RoutingMode) {
+  case 0:
+    SFP[0][0] = ((VHDCI[0][0] >> 22) & 0xff) | ((VHDCI[1][0] >> 14) & 0x3f00);
+    SFP[1][0] =
+        0x8000 | ((VHDCI[0][1] >> 22) & 0xff) | ((VHDCI[1][1] >> 14) & 0x3f00);
+    SFP[0][1] = (VHDCI[0][0] & 0x3ff) | ((VHDCI[0][0] >> 1) & 0x1c00);
+    SFP[1][1] = 0x8000 | (VHDCI[0][1] & 0x3ff) | ((VHDCI[0][1] >> 1) & 0x1c00);
+    SFP[0][2] = (VHDCI[1][0] & 0x3ff) | ((VHDCI[0][0] >> 4) & 0x3c00);
+    SFP[1][2] = 0x8000 | (VHDCI[1][1] & 0x3ff) | ((VHDCI[0][1] >> 4) & 0x3c00);
+    SFP[0][3] = ((VHDCI[1][0] >> 11) & 0x3ff) | ((VHDCI[0][0] >> 8) & 0x1c00);
+    SFP[1][3] =
+        0x8000 | ((VHDCI[1][1] >> 11) & 0x3ff) | ((VHDCI[0][1] >> 8) & 0x1c00);
+    break;
+  case 1:
+    SFP[0][0] = (VHDCI[0][0] & 0xfff) | ((VHDCI_reverse[0][0] & 0x600) << 3) |
+                ((VHDCI_reverse[0][0] & 0x2000) << 1);
+    SFP[1][0] = 0x8000 | (VHDCI[0][1] & 0xfff) |
+                ((VHDCI_reverse[0][1] & 0x600) << 3) |
+                ((VHDCI_reverse[0][1] & 0x2000) << 1);
+    SFP[0][1] = ((VHDCI[0][0] & 0x7000) >> 12) |
+                ((VHDCI_reverse[0][0] & 0x1ff) << 3) |
+                ((VHDCI_reverse[0][0] & 0x1800) << 1) | (VHDCI[1][0] & 0x4000);
+    SFP[1][1] = 0x8000 | ((VHDCI[0][1] & 0x7000) >> 12) |
+                ((VHDCI_reverse[0][1] & 0x1ff) << 3) |
+                ((VHDCI_reverse[0][1] & 0x1800) << 1) | (VHDCI[1][1] & 0x4000);
+
+    SFP[0][2] = ((VHDCI[0][0] & 0x20000) >> 10);
+    SFP[1][2] = 0x8000 | ((VHDCI[0][1] & 0x20000) >> 10);
+    SFP[0][3] = ((VHDCI[1][0] & 0x20000) >> 3);
+    SFP[1][3] = 0x8000 | ((VHDCI[1][1] & 0x20000) >> 3);
+    for (int i = 0; i < 7; i++) {
+      SFP[0][2] = SFP[0][2] | (((VHDCI[1][0] >> (2 * i)) & 0x1) << i) |
+                  (((VHDCI[1][0] >> ((2 * i) + 1)) & 0x1) << (i + 8));
+      SFP[1][2] = SFP[1][2] | (((VHDCI[1][1] >> (2 * i)) & 0x1) << i) |
+                  (((VHDCI[1][1] >> ((2 * i) + 1)) & 0x1) << (i + 8));
+      SFP[0][3] = SFP[0][3] |
+                  (((VHDCI_reverse[1][0] >> ((2 * i) + 1)) & 0x1) << i) |
+                  (((VHDCI_reverse[1][0] >> (2 * i)) & 0x1) << (i + 7));
+      SFP[1][3] = SFP[1][3] |
+                  (((VHDCI_reverse[1][1] >> ((2 * i) + 1)) & 0x1) << i) |
+                  (((VHDCI_reverse[1][1] >> (2 * i)) & 0x1) << (i + 7));
+    }
+    break;
+  case 2:
+    SFP[0][0] = (VHDCI[0][0] & 0xfff) | ((VHDCI_reverse[0][0] & 0xe00) << 3);
+    SFP[1][0] =
+        0x8000 | (VHDCI[0][1] & 0xfff) | ((VHDCI_reverse[0][1] & 0xe00) << 3);
+    SFP[0][1] = ((VHDCI[0][0] & 0x7000) >> 12) |
+                ((VHDCI_reverse[0][0] & 0x1ff) << 3) |
+                (VHDCI_reverse[0][0] & 0x7000);
+    SFP[1][1] = 0x8000 | ((VHDCI[0][1] & 0x7000) >> 12) |
+                ((VHDCI_reverse[0][1] & 0x1ff) << 3) |
+                (VHDCI_reverse[0][1] & 0x7000);
+    SFP[0][2] = (VHDCI[0][0] & 0xfff);
+    SFP[1][2] = 0x8000 | (VHDCI[0][1] & 0xfff);
+    SFP[0][3] =
+        ((VHDCI[0][0] & 0x7000) >> 12) | ((VHDCI_reverse[0][0] & 0x1ff) << 3);
+    SFP[1][3] = 0x8000 | ((VHDCI[0][1] & 0x7000) >> 12) |
+                ((VHDCI_reverse[0][1] & 0x1ff) << 3);
+    break;
+  case 3:
+    SFP[0][0] = ((VHDCI[0][0] & 0x7fc0) >> 6) |
+                ((VHDCI_reverse[0][0] & 0x7) << 9) |
+                ((VHDCI[0][0] & 0x7) << 12);
+    SFP[1][0] = 0x8000 | ((VHDCI[0][1] & 0x7fc0) >> 6) |
+                ((VHDCI_reverse[0][1] & 0x7) << 9) |
+                ((VHDCI[0][1] & 0x7) << 12);
+    SFP[0][1] =
+        ((VHDCI_reverse[0][0] & 0x7ff8) >> 3) | ((VHDCI[0][0] & 0x38) << 9);
+    SFP[1][1] = 0x8000 | ((VHDCI_reverse[0][1] & 0x7ff8) >> 3) |
+                ((VHDCI[0][1] & 0x38) << 9);
+    SFP[0][2] = ((VHDCI[1][0] & 0x7fc0) >> 6) |
+                ((VHDCI_reverse[1][0] & 0x7) << 9) |
+                ((VHDCI[1][0] & 0x7) << 12);
+    SFP[1][2] = 0x8000 | ((VHDCI[1][1] & 0x7fc0) >> 6) |
+                ((VHDCI_reverse[1][1] & 0x7) << 9) |
+                ((VHDCI[1][1] & 0x7) << 12);
+    SFP[0][3] =
+        ((VHDCI_reverse[1][0] & 0x7ff8) >> 3) | ((VHDCI[1][0] & 0x38) << 9);
+    SFP[1][3] = 0x8000 | ((VHDCI_reverse[1][1] & 0x7ff8) >> 3) |
+                ((VHDCI[1][1] & 0x38) << 9);
+    break;
+  default:
+    SFP[0][0] = 0;
+    SFP[1][0] = 0x8000;
+    SFP[0][1] = 0;
+    SFP[1][1] = 0x8000;
+    SFP[0][2] = 0;
+    SFP[1][2] = 0x8000;
+    SFP[0][3] = 0;
+    SFP[1][3] = 0x8000;
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
-//electron arrays are eIsoRank[candidate number<4]
-//muon arrays are MIPbits[rec card number<7][region<2]
+// VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
+// electron arrays are eIsoRank[candidate number<4]
+// muon arrays are MIPbits[rec card number<7][region<2]
 
-    void SourceCardRouting::EMUtoVHDCI(	unsigned short (&eIsoRank)[4],
-			unsigned short (&eIsoCardId)[4],
-			unsigned short (&eIsoRegionId)[4],
-			unsigned short (&eNonIsoRank)[4],
-			unsigned short (&eNonIsoCardId)[4],
-			unsigned short (&eNonIsoRegionId)[4],
-			unsigned short (&MIPbits)[7][2],
-			unsigned short (&Qbits)[7][2],
-			unsigned long (&VHDCI)[2][2] ) const{
-
-	unsigned short SFP[2][4]={{0}};
-	EMUtoSFP(eIsoRank,eIsoCardId,eIsoRegionId,eNonIsoRank,eNonIsoCardId,eNonIsoRegionId,MIPbits,Qbits,SFP);
-	SFPtoVHDCI(0,SFP,VHDCI);
+void SourceCardRouting::EMUtoVHDCI(
+    unsigned short (&eIsoRank)[4], unsigned short (&eIsoCardId)[4],
+    unsigned short (&eIsoRegionId)[4], unsigned short (&eNonIsoRank)[4],
+    unsigned short (&eNonIsoCardId)[4], unsigned short (&eNonIsoRegionId)[4],
+    unsigned short (&MIPbits)[7][2], unsigned short (&Qbits)[7][2],
+    unsigned long (&VHDCI)[2][2]) const {
 
+  unsigned short SFP[2][4] = {{0}};
+  EMUtoSFP(eIsoRank, eIsoCardId, eIsoRegionId, eNonIsoRank, eNonIsoCardId,
+           eNonIsoRegionId, MIPbits, Qbits, SFP);
+  SFPtoVHDCI(0, SFP, VHDCI);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
-//electron arrays are eIsoRank[candidate number<4]
-//muon arrays are MIPbits[rec card number<7][region<2]
+// VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
+// electron arrays are eIsoRank[candidate number<4]
+// muon arrays are MIPbits[rec card number<7][region<2]
 
-    void SourceCardRouting::VHDCItoEMU(	unsigned short (&eIsoRank)[4],
-			unsigned short (&eIsoCardId)[4],
-			unsigned short (&eIsoRegionId)[4],
-			unsigned short (&eNonIsoRank)[4],
-			unsigned short (&eNonIsoCardId)[4],
-			unsigned short (&eNonIsoRegionId)[4],
-			unsigned short (&MIPbits)[7][2],
-			unsigned short (&Qbits)[7][2],
-			unsigned long (&VHDCI)[2][2] ) const{
-
-	unsigned short SFP[2][4]={{0}};
-	VHDCItoSFP(0,SFP,VHDCI);
-	SFPtoEMU(eIsoRank,eIsoCardId,eIsoRegionId,eNonIsoRank,eNonIsoCardId,eNonIsoRegionId,MIPbits,Qbits,SFP);
+void SourceCardRouting::VHDCItoEMU(
+    unsigned short (&eIsoRank)[4], unsigned short (&eIsoCardId)[4],
+    unsigned short (&eIsoRegionId)[4], unsigned short (&eNonIsoRank)[4],
+    unsigned short (&eNonIsoCardId)[4], unsigned short (&eNonIsoRegionId)[4],
+    unsigned short (&MIPbits)[7][2], unsigned short (&Qbits)[7][2],
+    unsigned long (&VHDCI)[2][2]) const {
 
+  unsigned short SFP[2][4] = {{0}};
+  VHDCItoSFP(0, SFP, VHDCI);
+  SFPtoEMU(eIsoRank, eIsoCardId, eIsoRegionId, eNonIsoRank, eNonIsoCardId,
+           eNonIsoRegionId, MIPbits, Qbits, SFP);
 }
 
-
-
-
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//RC arrays are RC[receiver card number<7][region<2]
-//HF arrays are HF[eta<4][HF region<2]
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
- 
-    void SourceCardRouting::RC56HFtoVHDCI(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			unsigned long (&VHDCI)[2][2] ) const{
+// RC arrays are RC[receiver card number<7][region<2]
+// HF arrays are HF[eta<4][HF region<2]
+// VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
 
-	unsigned short SFP[2][4]={{0}};
-  	RC56HFtoSFP(RC,RCof,RCtau,HF,HFQ,SFP);
-	SFPtoVHDCI(1,SFP,VHDCI);
+void SourceCardRouting::RC56HFtoVHDCI(unsigned short (&RC)[7][2],
+                                      unsigned short (&RCof)[7][2],
+                                      unsigned short (&RCtau)[7][2],
+                                      unsigned short (&HF)[4][2],
+                                      unsigned short (&HFQ)[4][2],
+                                      unsigned long (&VHDCI)[2][2]) const {
 
+  unsigned short SFP[2][4] = {{0}};
+  RC56HFtoSFP(RC, RCof, RCtau, HF, HFQ, SFP);
+  SFPtoVHDCI(1, SFP, VHDCI);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//RC arrays are RC[receiver card number<7][region<2]
-//HF arrays are HF[eta<4][HF region<2]
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
- 
-    void SourceCardRouting::VHDCItoRC56HF(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			unsigned long (&VHDCI)[2][2] ) const{
+// RC arrays are RC[receiver card number<7][region<2]
+// HF arrays are HF[eta<4][HF region<2]
+// VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
 
-	unsigned short SFP[2][4]={{0}};
-	VHDCItoSFP(1,SFP,VHDCI);
-  	SFPtoRC56HF(RC,RCof,RCtau,HF,HFQ,SFP);
+void SourceCardRouting::VHDCItoRC56HF(unsigned short (&RC)[7][2],
+                                      unsigned short (&RCof)[7][2],
+                                      unsigned short (&RCtau)[7][2],
+                                      unsigned short (&HF)[4][2],
+                                      unsigned short (&HFQ)[4][2],
+                                      unsigned long (&VHDCI)[2][2]) const {
 
+  unsigned short SFP[2][4] = {{0}};
+  VHDCItoSFP(1, SFP, VHDCI);
+  SFPtoRC56HF(RC, RCof, RCtau, HF, HFQ, SFP);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//RC arrays are RC[receiver card number<7][region<2]
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
- 
-    void SourceCardRouting::RC012toVHDCI(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned long (&VHDCI)[2][2] ) const{
+// RC arrays are RC[receiver card number<7][region<2]
+// VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
 
-	unsigned short SFP[2][4]={{0}};
- 	RC012toSFP(RC,RCof,RCtau,SFP);
-	SFPtoVHDCI(2,SFP,VHDCI);
+void SourceCardRouting::RC012toVHDCI(unsigned short (&RC)[7][2],
+                                     unsigned short (&RCof)[7][2],
+                                     unsigned short (&RCtau)[7][2],
+                                     unsigned long (&VHDCI)[2][2]) const {
+
+  unsigned short SFP[2][4] = {{0}};
+  RC012toSFP(RC, RCof, RCtau, SFP);
+  SFPtoVHDCI(2, SFP, VHDCI);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//RC arrays are RC[receiver card number<7][region<2]
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
- 
-    void SourceCardRouting::VHDCItoRC012(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned long (&VHDCI)[2][2] ) const{
+// RC arrays are RC[receiver card number<7][region<2]
+// VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
 
-	unsigned short SFP[2][4]={{0}};
-	VHDCItoSFP(2,SFP,VHDCI);
- 	SFPtoRC012(RC,RCof,RCtau,SFP);
+void SourceCardRouting::VHDCItoRC012(unsigned short (&RC)[7][2],
+                                     unsigned short (&RCof)[7][2],
+                                     unsigned short (&RCtau)[7][2],
+                                     unsigned long (&VHDCI)[2][2]) const {
 
+  unsigned short SFP[2][4] = {{0}};
+  VHDCItoSFP(2, SFP, VHDCI);
+  SFPtoRC012(RC, RCof, RCtau, SFP);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//RC arrays are RC[receiver card number<7][region<2]
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
- 
-    void SourceCardRouting::RC234toVHDCI(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			unsigned long (&VHDCI)[2][2] ) const{
+// RC arrays are RC[receiver card number<7][region<2]
+// VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
 
-	unsigned short SFP[2][4]={{0}};
-  	RC234toSFP(RC,RCof,RCtau,sisterRC,sisterRCof,sisterRCtau,SFP);
-	SFPtoVHDCI(3,SFP,VHDCI);
+void SourceCardRouting::RC234toVHDCI(unsigned short (&RC)[7][2],
+                                     unsigned short (&RCof)[7][2],
+                                     unsigned short (&RCtau)[7][2],
+                                     unsigned short (&sisterRC)[7][2],
+                                     unsigned short (&sisterRCof)[7][2],
+                                     unsigned short (&sisterRCtau)[7][2],
+                                     unsigned long (&VHDCI)[2][2]) const {
 
+  unsigned short SFP[2][4] = {{0}};
+  RC234toSFP(RC, RCof, RCtau, sisterRC, sisterRCof, sisterRCtau, SFP);
+  SFPtoVHDCI(3, SFP, VHDCI);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//RC arrays are RC[receiver card number<7][region<2]
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
- 
-     void SourceCardRouting::VHDCItoRC234(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			unsigned long (&VHDCI)[2][2] ) const{
+// RC arrays are RC[receiver card number<7][region<2]
+// VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
 
-	unsigned short SFP[2][4]={{0}};
-	VHDCItoSFP(3,SFP,VHDCI);
-  	SFPtoRC234(RC,RCof,RCtau,sisterRC,sisterRCof,sisterRCtau,SFP);
+void SourceCardRouting::VHDCItoRC234(unsigned short (&RC)[7][2],
+                                     unsigned short (&RCof)[7][2],
+                                     unsigned short (&RCtau)[7][2],
+                                     unsigned short (&sisterRC)[7][2],
+                                     unsigned short (&sisterRCof)[7][2],
+                                     unsigned short (&sisterRCtau)[7][2],
+                                     unsigned long (&VHDCI)[2][2]) const {
 
+  unsigned short SFP[2][4] = {{0}};
+  VHDCItoSFP(3, SFP, VHDCI);
+  SFPtoRC234(RC, RCof, RCtau, sisterRC, sisterRCof, sisterRCtau, SFP);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//electron arrays are eIsoRank[candidate number<4]
-//muon arrays are MIPbits[rec card number<7][region<2]
-
-    void SourceCardRouting::EMUtoSTRING(	unsigned short &logicalCardID,
-			unsigned short &eventNumber,
-			unsigned short (&eIsoRank)[4],
-			unsigned short (&eIsoCardId)[4],
-			unsigned short (&eIsoRegionId)[4],
-			unsigned short (&eNonIsoRank)[4],
-			unsigned short (&eNonIsoCardId)[4],
-			unsigned short (&eNonIsoRegionId)[4],
-			unsigned short (&MIPbits)[7][2],
-			unsigned short (&Qbits)[7][2],
-			std::string &dataString ) const{
+// electron arrays are eIsoRank[candidate number<4]
+// muon arrays are MIPbits[rec card number<7][region<2]
 
-		unsigned long VHDCI[2][2]={{0}};
-		EMUtoVHDCI(eIsoRank,eIsoCardId,eIsoRegionId,eNonIsoRank,eNonIsoCardId,eNonIsoRegionId,MIPbits,Qbits,VHDCI);
-		VHDCItoSTRING (logicalCardID, eventNumber, dataString, VHDCI);
+void SourceCardRouting::EMUtoSTRING(
+    unsigned short &logicalCardID, unsigned short &eventNumber,
+    unsigned short (&eIsoRank)[4], unsigned short (&eIsoCardId)[4],
+    unsigned short (&eIsoRegionId)[4], unsigned short (&eNonIsoRank)[4],
+    unsigned short (&eNonIsoCardId)[4], unsigned short (&eNonIsoRegionId)[4],
+    unsigned short (&MIPbits)[7][2], unsigned short (&Qbits)[7][2],
+    std::string &dataString) const {
 
+  unsigned long VHDCI[2][2] = {{0}};
+  EMUtoVHDCI(eIsoRank, eIsoCardId, eIsoRegionId, eNonIsoRank, eNonIsoCardId,
+             eNonIsoRegionId, MIPbits, Qbits, VHDCI);
+  VHDCItoSTRING(logicalCardID, eventNumber, dataString, VHDCI);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//RC arrays are RC[receiver card number<7][region<2]
-//HF arrays are HF[eta<4][HF region<2]
-
- 
-    void SourceCardRouting::RC56HFtoSTRING(	unsigned short &logicalCardID,
-			unsigned short &eventNumber,
-			unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			std::string &dataString ) const{
+// RC arrays are RC[receiver card number<7][region<2]
+// HF arrays are HF[eta<4][HF region<2]
 
-		unsigned long VHDCI[2][2]={{0}};
-  		RC56HFtoVHDCI(RC,RCof,RCtau,HF,HFQ,VHDCI);
-		VHDCItoSTRING (logicalCardID, eventNumber, dataString, VHDCI);
+void SourceCardRouting::RC56HFtoSTRING(
+    unsigned short &logicalCardID, unsigned short &eventNumber,
+    unsigned short (&RC)[7][2], unsigned short (&RCof)[7][2],
+    unsigned short (&RCtau)[7][2], unsigned short (&HF)[4][2],
+    unsigned short (&HFQ)[4][2], std::string &dataString) const {
 
+  unsigned long VHDCI[2][2] = {{0}};
+  RC56HFtoVHDCI(RC, RCof, RCtau, HF, HFQ, VHDCI);
+  VHDCItoSTRING(logicalCardID, eventNumber, dataString, VHDCI);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//RC arrays are RC[receiver card number<7][region<2]
-
- 
-    void SourceCardRouting::RC012toSTRING(	unsigned short &logicalCardID,
-			unsigned short &eventNumber,
-			unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			std::string &dataString ) const{
+// RC arrays are RC[receiver card number<7][region<2]
 
-		unsigned long VHDCI[2][2]={{0}};
-  		RC012toVHDCI(RC,RCof,RCtau,VHDCI);
-		VHDCItoSTRING (logicalCardID, eventNumber, dataString, VHDCI);
+void SourceCardRouting::RC012toSTRING(unsigned short &logicalCardID,
+                                      unsigned short &eventNumber,
+                                      unsigned short (&RC)[7][2],
+                                      unsigned short (&RCof)[7][2],
+                                      unsigned short (&RCtau)[7][2],
+                                      std::string &dataString) const {
 
+  unsigned long VHDCI[2][2] = {{0}};
+  RC012toVHDCI(RC, RCof, RCtau, VHDCI);
+  VHDCItoSTRING(logicalCardID, eventNumber, dataString, VHDCI);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//RC arrays are RC[receiver card number<7][region<2]
-
- 
-    void SourceCardRouting::RC234toSTRING(	unsigned short &logicalCardID,
-			unsigned short &eventNumber,
-			unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			std::string &dataString ) const{
+// RC arrays are RC[receiver card number<7][region<2]
 
-		unsigned long VHDCI[2][2]={{0}};
-  		RC234toVHDCI(RC,RCof,RCtau,sisterRC,sisterRCof,sisterRCtau,VHDCI);
-		VHDCItoSTRING (logicalCardID, eventNumber, dataString, VHDCI);
+void SourceCardRouting::RC234toSTRING(
+    unsigned short &logicalCardID, unsigned short &eventNumber,
+    unsigned short (&RC)[7][2], unsigned short (&RCof)[7][2],
+    unsigned short (&RCtau)[7][2], unsigned short (&sisterRC)[7][2],
+    unsigned short (&sisterRCof)[7][2], unsigned short (&sisterRCtau)[7][2],
+    std::string &dataString) const {
 
+  unsigned long VHDCI[2][2] = {{0}};
+  RC234toVHDCI(RC, RCof, RCtau, sisterRC, sisterRCof, sisterRCtau, VHDCI);
+  VHDCItoSTRING(logicalCardID, eventNumber, dataString, VHDCI);
 }
 
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//SFP arrays are SFP[cycle<2][sfp number<4]
-    void SourceCardRouting::SFPtoSTRING(	unsigned short &logicalCardID,
-			unsigned short &eventNumber,
-			int RoutingMode,
-			unsigned short (&SFP)[2][4],
-			std::string &dataString	) const{
-
-		unsigned long VHDCI[2][2]={{0}};
-		SFPtoVHDCI(RoutingMode,SFP,VHDCI);
-		VHDCItoSTRING (logicalCardID, eventNumber, dataString, VHDCI);
+// SFP arrays are SFP[cycle<2][sfp number<4]
+void SourceCardRouting::SFPtoSTRING(unsigned short &logicalCardID,
+                                    unsigned short &eventNumber,
+                                    int RoutingMode,
+                                    unsigned short (&SFP)[2][4],
+                                    std::string &dataString) const {
 
+  unsigned long VHDCI[2][2] = {{0}};
+  SFPtoVHDCI(RoutingMode, SFP, VHDCI);
+  VHDCItoSTRING(logicalCardID, eventNumber, dataString, VHDCI);
 }
 
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
-    void SourceCardRouting::STRINGtoVHDCI(	unsigned short &logicalCardID,
-			unsigned short &eventNumber,
-			std::string &dataString,
-			unsigned long (&VHDCI)[2][2]	) const{
-
-		stringstream temp;
-		
-		if (dataString!=""){
-	        	temp << dataString << std::endl;
-	        	temp >> dec >> eventNumber;
-	       		temp >> dec >> logicalCardID;
-			temp >> hex >> VHDCI[0][0];
-			temp >> hex >> VHDCI[0][1];
-			temp >> hex >> VHDCI[1][0];
-			temp >> hex >> VHDCI[1][1];
-		}else{
-	        	eventNumber=65535;
-	       		logicalCardID=65535;
-			VHDCI[0][0]=0;
-			VHDCI[0][1]=0;
-			VHDCI[1][0]=0;
-			VHDCI[1][1]=0;
-		}
-
+// VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
+void SourceCardRouting::STRINGtoVHDCI(unsigned short &logicalCardID,
+                                      unsigned short &eventNumber,
+                                      std::string &dataString,
+                                      unsigned long (&VHDCI)[2][2]) const {
+
+  stringstream temp;
+
+  if (!dataString.empty()) {
+    temp << dataString << std::endl;
+    temp >> dec >> eventNumber;
+    temp >> dec >> logicalCardID;
+    temp >> hex >> VHDCI[0][0];
+    temp >> hex >> VHDCI[0][1];
+    temp >> hex >> VHDCI[1][0];
+    temp >> hex >> VHDCI[1][1];
+  } else {
+    eventNumber = 65535;
+    logicalCardID = 65535;
+    VHDCI[0][0] = 0;
+    VHDCI[0][1] = 0;
+    VHDCI[1][0] = 0;
+    VHDCI[1][1] = 0;
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
-    void SourceCardRouting::VHDCItoSTRING(	unsigned short &logicalCardID,
-			unsigned short &eventNumber,
-			std::string &dataString,
-			unsigned long (&VHDCI)[2][2]	) const{
-
-		stringstream temp;
-
-		temp << dec << eventNumber << '\t';
-		temp << dec << logicalCardID << '\t';
-		temp << hex << setw(8) << setfill('0') << VHDCI[0][0] << '\t';
-		temp << hex << setw(8) << setfill('0') << VHDCI[0][1] << '\t';
-		temp << hex << setw(8) << setfill('0') << VHDCI[1][0] << '\t';
-		temp << hex << setw(8) << setfill('0') << VHDCI[1][1] << std::endl;
-		dataString = temp.str();
-}
-  
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
+void SourceCardRouting::VHDCItoSTRING(unsigned short &logicalCardID,
+                                      unsigned short &eventNumber,
+                                      std::string &dataString,
+                                      unsigned long (&VHDCI)[2][2]) const {
 
-    void SourceCardRouting::LogicalCardIDtoRoutingMode( unsigned short &logicalCardID,
-				     int &RoutingMode,
-				     int &RCTCrateNumber	) const{
-		
-		RCTCrateNumber = (logicalCardID>>3);
-		if ( (logicalCardID&0x4) != 0)RCTCrateNumber+=9;
-		RoutingMode = (logicalCardID&0x3); 
+  stringstream temp;
 
+  temp << dec << eventNumber << '\t';
+  temp << dec << logicalCardID << '\t';
+  temp << hex << setw(8) << setfill('0') << VHDCI[0][0] << '\t';
+  temp << hex << setw(8) << setfill('0') << VHDCI[0][1] << '\t';
+  temp << hex << setw(8) << setfill('0') << VHDCI[1][0] << '\t';
+  temp << hex << setw(8) << setfill('0') << VHDCI[1][1] << std::endl;
+  dataString = temp.str();
 }
 
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-   void SourceCardRouting::RoutingModetoLogicalCardID( unsigned short &logicalCardID,
-				     int &RoutingMode,
-				     int &RCTCrateNumber	) const{
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-		logicalCardID = ((RCTCrateNumber%9)<<3)|(RCTCrateNumber>8?0x4:0x0)|(RoutingMode&0x3);
+void SourceCardRouting::LogicalCardIDtoRoutingMode(
+    unsigned short &logicalCardID, int &RoutingMode,
+    int &RCTCrateNumber) const {
 
+  RCTCrateNumber = (logicalCardID >> 3);
+  if ((logicalCardID & 0x4) != 0)
+    RCTCrateNumber += 9;
+  RoutingMode = (logicalCardID & 0x3);
 }
 
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+void SourceCardRouting::RoutingModetoLogicalCardID(
+    unsigned short &logicalCardID, int &RoutingMode,
+    int &RCTCrateNumber) const {
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  logicalCardID = ((RCTCrateNumber % 9) << 3) |
+                  (RCTCrateNumber > 8 ? 0x4 : 0x0) | (RoutingMode & 0x3);
+}
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//These were going to be implimented but made things a lot more complicated than necessary
+// These were going to be implimented but made things a lot more complicated
+// than necessary
 
 /*
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -808,29 +848,29 @@ for (int i=0; i<2;i++){
 //HF arrays are HF[eta<4][HF region<2]
 //SFP arrays are SFP[cycle<2][sfp number<4]
     void SourceCardRouting::RCtoSFP(	int &RoutingMode,
-			unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			unsigned short (&SFP)[2][4] ){
-
-	switch(RoutingMode){
-		case 1:
-  			RC56HFtoSFP(RC,RCof,RCtau,HF,HFQ,SFP);
-			break;
-		case 2:
- 			RC012toSFP(RC,RCof,RCtau,SFP);		
-			break;
-		case 3:
-		 	RC234toSFP(RC,RCof,RCtau,sisterRC,sisterRCof,sisterRCtau,SFP);
-			break;
-		default:
-			break;
-	}
+                        unsigned short (&RC)[7][2],
+                        unsigned short (&RCof)[7][2],
+                        unsigned short (&RCtau)[7][2],
+                        unsigned short (&sisterRC)[7][2],
+                        unsigned short (&sisterRCof)[7][2],
+                        unsigned short (&sisterRCtau)[7][2],
+                        unsigned short (&HF)[4][2],
+                        unsigned short (&HFQ)[4][2],
+                        unsigned short (&SFP)[2][4] ){
+
+        switch(RoutingMode){
+                case 1:
+                        RC56HFtoSFP(RC,RCof,RCtau,HF,HFQ,SFP);
+                        break;
+                case 2:
+                        RC012toSFP(RC,RCof,RCtau,SFP);
+                        break;
+                case 3:
+                        RC234toSFP(RC,RCof,RCtau,sisterRC,sisterRCof,sisterRCtau,SFP);
+                        break;
+                default:
+                        break;
+        }
 }
 
 
@@ -839,29 +879,29 @@ for (int i=0; i<2;i++){
 //HF arrays are HF[eta<4][HF region<2]
 //SFP arrays are SFP[cycle<2][sfp number<4]
     void SourceCardRouting::SFPtoRC(	int &RoutingMode,
-			unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			unsigned short (&SFP)[2][4] ){
-
-	switch(RoutingMode){
-		case 1:
-  			SFPtoRC56HF(RC,RCof,RCtau,HF,HFQ,SFP);
-			break;
-		case 2:
- 			SFPtoRC012(RC,RCof,RCtau,SFP);		
-			break;
-		case 3:
-		 	SFPtoRC234(RC,RCof,RCtau,sisterRC,sisterRCof,sisterRCtau,SFP);
-			break;
-		default:
-			break;
-	}
+                        unsigned short (&RC)[7][2],
+                        unsigned short (&RCof)[7][2],
+                        unsigned short (&RCtau)[7][2],
+                        unsigned short (&sisterRC)[7][2],
+                        unsigned short (&sisterRCof)[7][2],
+                        unsigned short (&sisterRCtau)[7][2],
+                        unsigned short (&HF)[4][2],
+                        unsigned short (&HFQ)[4][2],
+                        unsigned short (&SFP)[2][4] ){
+
+        switch(RoutingMode){
+                case 1:
+                        SFPtoRC56HF(RC,RCof,RCtau,HF,HFQ,SFP);
+                        break;
+                case 2:
+                        SFPtoRC012(RC,RCof,RCtau,SFP);
+                        break;
+                case 3:
+                        SFPtoRC234(RC,RCof,RCtau,sisterRC,sisterRCof,sisterRCtau,SFP);
+                        break;
+                default:
+                        break;
+        }
 }
 */
 
@@ -871,29 +911,29 @@ for (int i=0; i<2;i++){
 //HF arrays are HF[eta<4][HF region<2]
 //VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
     void SourceCardRouting::RCtoVHDCI(	int &RoutingMode,
-			unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			unsigned long (&VHDCI)[2][2]	){
-
-	switch(RoutingMode){
-		case 1:
-  			RC56HFtoVHDCI(RC,RCof,RCtau,HF,HFQ,VHDCI);
-			break;
-		case 2:
- 			RC012toVHDCI(RC,RCof,RCtau,VHDCI);		
-			break;
-		case 3:
-		 	RC234toVHDCI(RC,RCof,RCtau,sisterRC,sisterRCof,sisterRCtau,VHDCI);
-			break;
-		default:
-			break;
-	}
+                        unsigned short (&RC)[7][2],
+                        unsigned short (&RCof)[7][2],
+                        unsigned short (&RCtau)[7][2],
+                        unsigned short (&sisterRC)[7][2],
+                        unsigned short (&sisterRCof)[7][2],
+                        unsigned short (&sisterRCtau)[7][2],
+                        unsigned short (&HF)[4][2],
+                        unsigned short (&HFQ)[4][2],
+                        unsigned long (&VHDCI)[2][2]	){
+
+        switch(RoutingMode){
+                case 1:
+                        RC56HFtoVHDCI(RC,RCof,RCtau,HF,HFQ,VHDCI);
+                        break;
+                case 2:
+                        RC012toVHDCI(RC,RCof,RCtau,VHDCI);
+                        break;
+                case 3:
+                        RC234toVHDCI(RC,RCof,RCtau,sisterRC,sisterRCof,sisterRCtau,VHDCI);
+                        break;
+                default:
+                        break;
+        }
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -901,29 +941,28 @@ for (int i=0; i<2;i++){
 //HF arrays are HF[eta<4][HF region<2]
 //VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
     void SourceCardRouting::VHDCItoRC(	int &RoutingMode,
-			unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			unsigned long (&VHDCI)[2][2]	){
-
-	switch(RoutingMode){
-		case 1:
-  			VHDCItoRC56HF(RC,RCof,RCtau,HF,HFQ,VHDCI);
-			break;
-		case 2:
- 			VHDCItoRC012(RC,RCof,RCtau,VHDCI);		
-			break;
-		case 3:
-		 	VHDCItoRC234(RC,RCof,RCtau,sisterRC,sisterRCof,sisterRCtau,VHDCI);
-			break;
-		default:
-			break;
-	}
+                        unsigned short (&RC)[7][2],
+                        unsigned short (&RCof)[7][2],
+                        unsigned short (&RCtau)[7][2],
+                        unsigned short (&sisterRC)[7][2],
+                        unsigned short (&sisterRCof)[7][2],
+                        unsigned short (&sisterRCtau)[7][2],
+                        unsigned short (&HF)[4][2],
+                        unsigned short (&HFQ)[4][2],
+                        unsigned long (&VHDCI)[2][2]	){
+
+        switch(RoutingMode){
+                case 1:
+                        VHDCItoRC56HF(RC,RCof,RCtau,HF,HFQ,VHDCI);
+                        break;
+                case 2:
+                        VHDCItoRC012(RC,RCof,RCtau,VHDCI);
+                        break;
+                case 3:
+                        VHDCItoRC234(RC,RCof,RCtau,sisterRC,sisterRCof,sisterRCtau,VHDCI);
+                        break;
+                default:
+                        break;
+        }
 }
 */
-
diff --git a/L1Trigger/TextToDigi/src/SourceCardRouting.h b/L1Trigger/TextToDigi/src/SourceCardRouting.h
index 8b3f14dcc1f0a..6e09a76b72275 100644
--- a/L1Trigger/TextToDigi/src/SourceCardRouting.h
+++ b/L1Trigger/TextToDigi/src/SourceCardRouting.h
@@ -12,14 +12,13 @@
 
 class SourceCardRouting {
 
- public:
-
+public:
   SourceCardRouting();
   ~SourceCardRouting();
 
-  /// Struct of all data needed for running the emulator to SFP (sourcecard optical output) conversion.
-  struct EmuToSfpData
-  {
+  /// Struct of all data needed for running the emulator to SFP (sourcecard
+  /// optical output) conversion.
+  struct EmuToSfpData {
     // Input data.
     unsigned short eIsoRank[4];
     unsigned short eIsoCardId[4];
@@ -33,375 +32,300 @@ class SourceCardRouting {
     unsigned short sfp[2][4]; // [ cycle ] [ output number ]
   };
 
-//SFP arrays are SFP[cycle<2][sfp number<4]
-//electron arrays are eIsoRank[candidate number<4]
-//muon arrays are MIPbits[rec card number<7][region<2]
-    void EMUtoSFP(	unsigned short (&eIsoRank)[4],
-			unsigned short (&eIsoCardId)[4],
-			unsigned short (&eIsoRegionId)[4],
-			unsigned short (&eNonIsoRank)[4],
-			unsigned short (&eNonIsoCardId)[4],
-			unsigned short (&eNonIsoRegionId)[4],
-			unsigned short (&MIPbits)[7][2],
-			unsigned short (&Qbits)[7][2],
-			unsigned short (&SFP)[2][4] 	) const;
-
-//SFP arrays are SFP[cycle<2][sfp number<4]
-//electron arrays are eIsoRank[candidate number<4]
-//muon arrays are MIPbits[rec card number<7][region<2]
-    void SFPtoEMU(	unsigned short (&eIsoRank)[4],
-			unsigned short (&eIsoCardId)[4],
-			unsigned short (&eIsoRegionId)[4],
-			unsigned short (&eNonIsoRank)[4],
-			unsigned short (&eNonIsoCardId)[4],
-			unsigned short (&eNonIsoRegionId)[4],
-			unsigned short (&MIPbits)[7][2],
-			unsigned short (&Qbits)[7][2],
-			unsigned short (&SFP)[2][4]	) const;
-
-/***********************************************************************************************************************/
-//RC arrays are RC[receiver card number<7][region<2]
-//HF arrays are HF[eta<4][HF region<2]
-//SFP arrays are SFP[cycle<2][sfp number<4]
-    void RC56HFtoSFP(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			unsigned short (&SFP)[2][4]	) const;
-
-//RC arrays are RC[receiver card number<7][region<2]
-//HF arrays are HF[eta<4][HF region<2]
-//SFP arrays are SFP[cycle<2][sfp number<4]
-    void SFPtoRC56HF(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			unsigned short (&SFP)[2][4]	) const;
-
-//RC arrays are RC[receiver card number<7][region<2]
-//SFP arrays are SFP[cycle<2][sfp number<4]
-    void RC012toSFP(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&SFP)[2][4]	) const;
-
-//RC arrays are RC[receiver card number<7][region<2]
-//SFP arrays are SFP[cycle<2][sfp number<4]
-    void SFPtoRC012(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&SFP)[2][4]	) const;
-
-//RC arrays are RC[receiver card number<7][region<2]
-//SFP arrays are SFP[cycle<2][sfp number<4]
-    void RC234toSFP(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			unsigned short (&SFP)[2][4]	) const;
-
-//RC arrays are RC[receiver card number<7][region<2]
-//SFP arrays are SFP[cycle<2][sfp number<4]
-    void SFPtoRC234(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			unsigned short (&SFP)[2][4]	) const;
-
-/***********************************************************************************************************************/
-
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
-//SFP arrays are SFP[cycle<2][sfp number<4]
-
-    void SFPtoVHDCI(	int RoutingMode,
-			unsigned short (&SFP)[2][4],
-			unsigned long (&VHDCI)[2][2] ) const;
-
-
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
-//SFP arrays are SFP[cycle<2][sfp number<4]
-    void VHDCItoSFP(	int RoutingMode,
-			unsigned short (&SFP)[2][4],
-			unsigned long (&VHDCI)[2][2]	) const;
-
-/***********************************************************************************************************************/
-
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
-//electron arrays are eIsoRank[candidate number<4]
-//muon arrays are MIPbits[rec card number<7][region<2]
-
-    void EMUtoVHDCI(	unsigned short (&eIsoRank)[4],
-			unsigned short (&eIsoCardId)[4],
-			unsigned short (&eIsoRegionId)[4],
-			unsigned short (&eNonIsoRank)[4],
-			unsigned short (&eNonIsoCardId)[4],
-			unsigned short (&eNonIsoRegionId)[4],
-			unsigned short (&MIPbits)[7][2],
-			unsigned short (&Qbits)[7][2],
-			unsigned long (&VHDCI)[2][2] 	) const;
-
-
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
-//electron arrays are eIsoRank[candidate number<4]
-//muon arrays are MIPbits[rec card number<7][region<2]
-    void VHDCItoEMU(	unsigned short (&eIsoRank)[4],
-			unsigned short (&eIsoCardId)[4],
-			unsigned short (&eIsoRegionId)[4],
-			unsigned short (&eNonIsoRank)[4],
-			unsigned short (&eNonIsoCardId)[4],
-			unsigned short (&eNonIsoRegionId)[4],
-			unsigned short (&MIPbits)[7][2],
-			unsigned short (&Qbits)[7][2],
-			unsigned long (&VHDCI)[2][2]	) const;
-
-
-
-/***********************************************************************************************************************/
-
-//RC arrays are RC[receiver card number<7][region<2]
-//HF arrays are HF[eta<4][HF region<2]
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
-    void RC56HFtoVHDCI(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			unsigned long (&VHDCI)[2][2]	) const;
-
-//RC arrays are RC[receiver card number<7][region<2]
-//HF arrays are HF[eta<4][HF region<2]
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
-    void VHDCItoRC56HF(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			unsigned long (&VHDCI)[2][2]	) const;
-
-//RC arrays are RC[receiver card number<7][region<2]
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
-    void RC012toVHDCI(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned long (&VHDCI)[2][2]) const;
-
-//RC arrays are RC[receiver card number<7][region<2]
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
-    void VHDCItoRC012(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned long (&VHDCI)[2][2]	) const;
-
-//RC arrays are RC[receiver card number<7][region<2]
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
-    void RC234toVHDCI(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			unsigned long (&VHDCI)[2][2]	) const;
-
-//RC arrays are RC[receiver card number<7][region<2]
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
-    void VHDCItoRC234(	unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			unsigned long (&VHDCI)[2][2]	) const;
-
-/***********************************************************************************************************************/
-
-//electron arrays are eIsoRank[candidate number<4]
-//muon arrays are MIPbits[rec card number<7][region<2]
-
-    void EMUtoSTRING(	unsigned short &logicalCardID,
-			unsigned short &eventNumber,
-			unsigned short (&eIsoRank)[4],
-			unsigned short (&eIsoCardId)[4],
-			unsigned short (&eIsoRegionId)[4],
-			unsigned short (&eNonIsoRank)[4],
-			unsigned short (&eNonIsoCardId)[4],
-			unsigned short (&eNonIsoRegionId)[4],
-			unsigned short (&MIPbits)[7][2],
-			unsigned short (&Qbits)[7][2],
-			std::string &dataString	) const;
-
-//RC arrays are RC[receiver card number<7][region<2]
-//HF arrays are HF[eta<4][HF region<2]
-    void RC56HFtoSTRING(	unsigned short &logicalCardID,
-			unsigned short &eventNumber,
-			unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			std::string &dataString	) const;
-
-//RC arrays are RC[receiver card number<7][region<2]
-    void RC012toSTRING(	unsigned short &logicalCardID,
-			unsigned short &eventNumber,
-			unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			std::string &dataString	) const;
-
-//RC arrays are RC[receiver card number<7][region<2]
-    void RC234toSTRING(	unsigned short &logicalCardID,
-			unsigned short &eventNumber,
-			unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			std::string &dataString	) const;
-
-/***********************************************************************************************************************/
-
-//SFP arrays are SFP[cycle<2][sfp number<4]
-    void SFPtoSTRING(	unsigned short &logicalCardID,
-			unsigned short &eventNumber,
-			int RoutingMode,
-			unsigned short (&SFP)[2][4],
-			std::string &dataString	) const;
-
-/***********************************************************************************************************************/
-
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
-    void STRINGtoVHDCI(	unsigned short &logicalCardID,
-			unsigned short &eventNumber,
-			std::string &dataString,
-			unsigned long (&VHDCI)[2][2]	) const;
-
-
-//VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
-    void VHDCItoSTRING(	unsigned short &logicalCardID,
-			unsigned short &eventNumber,
-			std::string &dataString,
-			unsigned long (&VHDCI)[2][2]	) const;
-
-/***********************************************************************************************************************/
-
-    void LogicalCardIDtoRoutingMode( unsigned short &logicalCardID,
-				     int &RoutingMode,
-				     int &RCTCrateNumber	) const;
-
-   void RoutingModetoLogicalCardID( unsigned short &logicalCardID,
-				     int &RoutingMode,
-				     int &RCTCrateNumber	) const;
-
-
-
-}; //class SourceCardRouting
+  // SFP arrays are SFP[cycle<2][sfp number<4]
+  // electron arrays are eIsoRank[candidate number<4]
+  // muon arrays are MIPbits[rec card number<7][region<2]
+  void EMUtoSFP(unsigned short (&eIsoRank)[4], unsigned short (&eIsoCardId)[4],
+                unsigned short (&eIsoRegionId)[4],
+                unsigned short (&eNonIsoRank)[4],
+                unsigned short (&eNonIsoCardId)[4],
+                unsigned short (&eNonIsoRegionId)[4],
+                unsigned short (&MIPbits)[7][2], unsigned short (&Qbits)[7][2],
+                unsigned short (&SFP)[2][4]) const;
+
+  // SFP arrays are SFP[cycle<2][sfp number<4]
+  // electron arrays are eIsoRank[candidate number<4]
+  // muon arrays are MIPbits[rec card number<7][region<2]
+  void SFPtoEMU(unsigned short (&eIsoRank)[4], unsigned short (&eIsoCardId)[4],
+                unsigned short (&eIsoRegionId)[4],
+                unsigned short (&eNonIsoRank)[4],
+                unsigned short (&eNonIsoCardId)[4],
+                unsigned short (&eNonIsoRegionId)[4],
+                unsigned short (&MIPbits)[7][2], unsigned short (&Qbits)[7][2],
+                unsigned short (&SFP)[2][4]) const;
+
+  /***********************************************************************************************************************/
+  // RC arrays are RC[receiver card number<7][region<2]
+  // HF arrays are HF[eta<4][HF region<2]
+  // SFP arrays are SFP[cycle<2][sfp number<4]
+  void RC56HFtoSFP(unsigned short (&RC)[7][2], unsigned short (&RCof)[7][2],
+                   unsigned short (&RCtau)[7][2], unsigned short (&HF)[4][2],
+                   unsigned short (&HFQ)[4][2],
+                   unsigned short (&SFP)[2][4]) const;
+
+  // RC arrays are RC[receiver card number<7][region<2]
+  // HF arrays are HF[eta<4][HF region<2]
+  // SFP arrays are SFP[cycle<2][sfp number<4]
+  void SFPtoRC56HF(unsigned short (&RC)[7][2], unsigned short (&RCof)[7][2],
+                   unsigned short (&RCtau)[7][2], unsigned short (&HF)[4][2],
+                   unsigned short (&HFQ)[4][2],
+                   unsigned short (&SFP)[2][4]) const;
+
+  // RC arrays are RC[receiver card number<7][region<2]
+  // SFP arrays are SFP[cycle<2][sfp number<4]
+  void RC012toSFP(unsigned short (&RC)[7][2], unsigned short (&RCof)[7][2],
+                  unsigned short (&RCtau)[7][2],
+                  unsigned short (&SFP)[2][4]) const;
+
+  // RC arrays are RC[receiver card number<7][region<2]
+  // SFP arrays are SFP[cycle<2][sfp number<4]
+  void SFPtoRC012(unsigned short (&RC)[7][2], unsigned short (&RCof)[7][2],
+                  unsigned short (&RCtau)[7][2],
+                  unsigned short (&SFP)[2][4]) const;
+
+  // RC arrays are RC[receiver card number<7][region<2]
+  // SFP arrays are SFP[cycle<2][sfp number<4]
+  void RC234toSFP(unsigned short (&RC)[7][2], unsigned short (&RCof)[7][2],
+                  unsigned short (&RCtau)[7][2],
+                  unsigned short (&sisterRC)[7][2],
+                  unsigned short (&sisterRCof)[7][2],
+                  unsigned short (&sisterRCtau)[7][2],
+                  unsigned short (&SFP)[2][4]) const;
+
+  // RC arrays are RC[receiver card number<7][region<2]
+  // SFP arrays are SFP[cycle<2][sfp number<4]
+  void SFPtoRC234(unsigned short (&RC)[7][2], unsigned short (&RCof)[7][2],
+                  unsigned short (&RCtau)[7][2],
+                  unsigned short (&sisterRC)[7][2],
+                  unsigned short (&sisterRCof)[7][2],
+                  unsigned short (&sisterRCtau)[7][2],
+                  unsigned short (&SFP)[2][4]) const;
+
+  /***********************************************************************************************************************/
+
+  // VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
+  // SFP arrays are SFP[cycle<2][sfp number<4]
+
+  void SFPtoVHDCI(int RoutingMode, unsigned short (&SFP)[2][4],
+                  unsigned long (&VHDCI)[2][2]) const;
+
+  // VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
+  // SFP arrays are SFP[cycle<2][sfp number<4]
+  void VHDCItoSFP(int RoutingMode, unsigned short (&SFP)[2][4],
+                  unsigned long (&VHDCI)[2][2]) const;
+
+  /***********************************************************************************************************************/
+
+  // VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
+  // electron arrays are eIsoRank[candidate number<4]
+  // muon arrays are MIPbits[rec card number<7][region<2]
+
+  void EMUtoVHDCI(
+      unsigned short (&eIsoRank)[4], unsigned short (&eIsoCardId)[4],
+      unsigned short (&eIsoRegionId)[4], unsigned short (&eNonIsoRank)[4],
+      unsigned short (&eNonIsoCardId)[4], unsigned short (&eNonIsoRegionId)[4],
+      unsigned short (&MIPbits)[7][2], unsigned short (&Qbits)[7][2],
+      unsigned long (&VHDCI)[2][2]) const;
+
+  // VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
+  // electron arrays are eIsoRank[candidate number<4]
+  // muon arrays are MIPbits[rec card number<7][region<2]
+  void VHDCItoEMU(
+      unsigned short (&eIsoRank)[4], unsigned short (&eIsoCardId)[4],
+      unsigned short (&eIsoRegionId)[4], unsigned short (&eNonIsoRank)[4],
+      unsigned short (&eNonIsoCardId)[4], unsigned short (&eNonIsoRegionId)[4],
+      unsigned short (&MIPbits)[7][2], unsigned short (&Qbits)[7][2],
+      unsigned long (&VHDCI)[2][2]) const;
+
+  /***********************************************************************************************************************/
+
+  // RC arrays are RC[receiver card number<7][region<2]
+  // HF arrays are HF[eta<4][HF region<2]
+  // VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
+  void RC56HFtoVHDCI(unsigned short (&RC)[7][2], unsigned short (&RCof)[7][2],
+                     unsigned short (&RCtau)[7][2], unsigned short (&HF)[4][2],
+                     unsigned short (&HFQ)[4][2],
+                     unsigned long (&VHDCI)[2][2]) const;
+
+  // RC arrays are RC[receiver card number<7][region<2]
+  // HF arrays are HF[eta<4][HF region<2]
+  // VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
+  void VHDCItoRC56HF(unsigned short (&RC)[7][2], unsigned short (&RCof)[7][2],
+                     unsigned short (&RCtau)[7][2], unsigned short (&HF)[4][2],
+                     unsigned short (&HFQ)[4][2],
+                     unsigned long (&VHDCI)[2][2]) const;
+
+  // RC arrays are RC[receiver card number<7][region<2]
+  // VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
+  void RC012toVHDCI(unsigned short (&RC)[7][2], unsigned short (&RCof)[7][2],
+                    unsigned short (&RCtau)[7][2],
+                    unsigned long (&VHDCI)[2][2]) const;
+
+  // RC arrays are RC[receiver card number<7][region<2]
+  // VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
+  void VHDCItoRC012(unsigned short (&RC)[7][2], unsigned short (&RCof)[7][2],
+                    unsigned short (&RCtau)[7][2],
+                    unsigned long (&VHDCI)[2][2]) const;
+
+  // RC arrays are RC[receiver card number<7][region<2]
+  // VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
+  void RC234toVHDCI(unsigned short (&RC)[7][2], unsigned short (&RCof)[7][2],
+                    unsigned short (&RCtau)[7][2],
+                    unsigned short (&sisterRC)[7][2],
+                    unsigned short (&sisterRCof)[7][2],
+                    unsigned short (&sisterRCtau)[7][2],
+                    unsigned long (&VHDCI)[2][2]) const;
+
+  // RC arrays are RC[receiver card number<7][region<2]
+  // VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
+  void VHDCItoRC234(unsigned short (&RC)[7][2], unsigned short (&RCof)[7][2],
+                    unsigned short (&RCtau)[7][2],
+                    unsigned short (&sisterRC)[7][2],
+                    unsigned short (&sisterRCof)[7][2],
+                    unsigned short (&sisterRCtau)[7][2],
+                    unsigned long (&VHDCI)[2][2]) const;
+
+  /***********************************************************************************************************************/
+
+  // electron arrays are eIsoRank[candidate number<4]
+  // muon arrays are MIPbits[rec card number<7][region<2]
+
+  void EMUtoSTRING(
+      unsigned short &logicalCardID, unsigned short &eventNumber,
+      unsigned short (&eIsoRank)[4], unsigned short (&eIsoCardId)[4],
+      unsigned short (&eIsoRegionId)[4], unsigned short (&eNonIsoRank)[4],
+      unsigned short (&eNonIsoCardId)[4], unsigned short (&eNonIsoRegionId)[4],
+      unsigned short (&MIPbits)[7][2], unsigned short (&Qbits)[7][2],
+      std::string &dataString) const;
+
+  // RC arrays are RC[receiver card number<7][region<2]
+  // HF arrays are HF[eta<4][HF region<2]
+  void RC56HFtoSTRING(unsigned short &logicalCardID,
+                      unsigned short &eventNumber, unsigned short (&RC)[7][2],
+                      unsigned short (&RCof)[7][2],
+                      unsigned short (&RCtau)[7][2], unsigned short (&HF)[4][2],
+                      unsigned short (&HFQ)[4][2],
+                      std::string &dataString) const;
+
+  // RC arrays are RC[receiver card number<7][region<2]
+  void RC012toSTRING(unsigned short &logicalCardID, unsigned short &eventNumber,
+                     unsigned short (&RC)[7][2], unsigned short (&RCof)[7][2],
+                     unsigned short (&RCtau)[7][2],
+                     std::string &dataString) const;
+
+  // RC arrays are RC[receiver card number<7][region<2]
+  void RC234toSTRING(unsigned short &logicalCardID, unsigned short &eventNumber,
+                     unsigned short (&RC)[7][2], unsigned short (&RCof)[7][2],
+                     unsigned short (&RCtau)[7][2],
+                     unsigned short (&sisterRC)[7][2],
+                     unsigned short (&sisterRCof)[7][2],
+                     unsigned short (&sisterRCtau)[7][2],
+                     std::string &dataString) const;
+
+  /***********************************************************************************************************************/
+
+  // SFP arrays are SFP[cycle<2][sfp number<4]
+  void SFPtoSTRING(unsigned short &logicalCardID, unsigned short &eventNumber,
+                   int RoutingMode, unsigned short (&SFP)[2][4],
+                   std::string &dataString) const;
+
+  /***********************************************************************************************************************/
+
+  // VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
+  void STRINGtoVHDCI(unsigned short &logicalCardID, unsigned short &eventNumber,
+                     std::string &dataString,
+                     unsigned long (&VHDCI)[2][2]) const;
+
+  // VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
+  void VHDCItoSTRING(unsigned short &logicalCardID, unsigned short &eventNumber,
+                     std::string &dataString,
+                     unsigned long (&VHDCI)[2][2]) const;
+
+  /***********************************************************************************************************************/
+
+  void LogicalCardIDtoRoutingMode(unsigned short &logicalCardID,
+                                  int &RoutingMode, int &RCTCrateNumber) const;
+
+  void RoutingModetoLogicalCardID(unsigned short &logicalCardID,
+                                  int &RoutingMode, int &RCTCrateNumber) const;
+
+}; // class SourceCardRouting
 
 #endif //~SOURCECARDMANAGER_H
 
-
-
-
-
-
-
-
-
-
-
-
-
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//These were going to be implimented but made things a lot more complicated than necessary
+// These were going to be implimented but made things a lot more complicated
+// than necessary
 /*
 //RC arrays are RC[receiver card number<7][region<2]
 //HF arrays are HF[eta<4][HF region<2]
 //SFP arrays are SFP[cycle<2][sfp number<4]
     void RCtoSFP(	int &RoutingMode,
-			unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			unsigned short (&SFP)[2][4] );
+                        unsigned short (&RC)[7][2],
+                        unsigned short (&RCof)[7][2],
+                        unsigned short (&RCtau)[7][2],
+                        unsigned short (&sisterRC)[7][2],
+                        unsigned short (&sisterRCof)[7][2],
+                        unsigned short (&sisterRCtau)[7][2],
+                        unsigned short (&HF)[4][2],
+                        unsigned short (&HFQ)[4][2],
+                        unsigned short (&SFP)[2][4] );
 
 
 //RC arrays are RC[receiver card number<7][region<2]
 //HF arrays are HF[eta<4][HF region<2]
 //SFP arrays are SFP[cycle<2][sfp number<4]
     void SFPtoRC(	int &RoutingMode,
-			unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			unsigned short (&SFP)[2][4] );*/
+                        unsigned short (&RC)[7][2],
+                        unsigned short (&RCof)[7][2],
+                        unsigned short (&RCtau)[7][2],
+                        unsigned short (&sisterRC)[7][2],
+                        unsigned short (&sisterRCof)[7][2],
+                        unsigned short (&sisterRCtau)[7][2],
+                        unsigned short (&HF)[4][2],
+                        unsigned short (&HFQ)[4][2],
+                        unsigned short (&SFP)[2][4] );*/
 
 /*
 //RC arrays are RC[receiver card number<7][region<2]
 //VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
     void RCtoSTRING(	unsigned short &logicalCardID,
-			unsigned short &eventNumber,
-			unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			std::string &dataString	);
-*/	
+                        unsigned short &eventNumber,
+                        unsigned short (&RC)[7][2],
+                        unsigned short (&RCof)[7][2],
+                        unsigned short (&RCtau)[7][2],
+                        unsigned short (&sisterRC)[7][2],
+                        unsigned short (&sisterRCof)[7][2],
+                        unsigned short (&sisterRCtau)[7][2],
+                        unsigned short (&HF)[4][2],
+                        unsigned short (&HFQ)[4][2],
+                        std::string &dataString	);
+*/
 
 /*
 //RC arrays are RC[receiver card number<7][region<2]
 //VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
     void RCtoVHDCI(	int &RoutingMode,
-			unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			unsigned long (&VHDCI)[2][2]	);
+                        unsigned short (&RC)[7][2],
+                        unsigned short (&RCof)[7][2],
+                        unsigned short (&RCtau)[7][2],
+                        unsigned short (&sisterRC)[7][2],
+                        unsigned short (&sisterRCof)[7][2],
+                        unsigned short (&sisterRCtau)[7][2],
+                        unsigned short (&HF)[4][2],
+                        unsigned short (&HFQ)[4][2],
+                        unsigned long (&VHDCI)[2][2]	);
 
 //RC arrays are RC[receiver card number<7][region<2]
 //VHDCI arrays are VHDCI[VHDCI<2][cycle<2]
     void VHDCItoRC(	int &RoutingMode,
-			unsigned short (&RC)[7][2],
-			unsigned short (&RCof)[7][2],
-			unsigned short (&RCtau)[7][2],
-			unsigned short (&sisterRC)[7][2],
-			unsigned short (&sisterRCof)[7][2],
-			unsigned short (&sisterRCtau)[7][2],
-			unsigned short (&HF)[4][2],
-			unsigned short (&HFQ)[4][2],
-			unsigned long (&VHDCI)[2][2]	);
+                        unsigned short (&RC)[7][2],
+                        unsigned short (&RCof)[7][2],
+                        unsigned short (&RCtau)[7][2],
+                        unsigned short (&sisterRC)[7][2],
+                        unsigned short (&sisterRCof)[7][2],
+                        unsigned short (&sisterRCtau)[7][2],
+                        unsigned short (&HF)[4][2],
+                        unsigned short (&HFQ)[4][2],
+                        unsigned long (&VHDCI)[2][2]	);
 */
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/L1Trigger/TextToDigi/test/testSourceCardRouting.cpp b/L1Trigger/TextToDigi/test/testSourceCardRouting.cpp
index 801499c8eca97..c0cd0281201c4 100644
--- a/L1Trigger/TextToDigi/test/testSourceCardRouting.cpp
+++ b/L1Trigger/TextToDigi/test/testSourceCardRouting.cpp
@@ -1,148 +1,180 @@
 #include "L1Trigger/TextToDigi/src/SourceCardRouting.h"
-#include <sstream>
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
+#include <sstream>
 using namespace std;
 
-int main(void){
+int main(void) {
 
-  unsigned short logicalCardID=0;
-  unsigned short eventNumber=0;
+  unsigned short logicalCardID = 0;
+  unsigned short eventNumber = 0;
   std::string tempString;
 
-  unsigned long VHDCI[2][2]={{0}};
+  unsigned long VHDCI[2][2] = {{0}};
   SourceCardRouting temp;
 
-  unsigned short RC[18][7][2]={{{0}}};
-  unsigned short RCof[18][7][2]={{{0}}};
-  unsigned short RCtau[18][7][2]={{{0}}};
-  unsigned short HF[18][4][2]={{{0}}};
-  unsigned short HFQ[18][4][2]={{{0}}};
-
-  unsigned short testRC[18][7][2]={{{0}}};
-  unsigned short testRCof[18][7][2]={{{0}}};
-  unsigned short testRCtau[18][7][2]={{{0}}};
-  unsigned short testHF[18][4][2]={{{0}}};
-  unsigned short testHFQ[18][4][2]={{{0}}};
-
-  std::cout <<"fill with junk..."<<std::endl;
-  for(int RCTcrate=0; RCTcrate<18; RCTcrate++){			
-    for(int RCcard=0; RCcard<7; RCcard++){
-      for(int Region=0; Region<2; Region++){
-	RC[RCTcrate][RCcard][Region]=rand()&0x3ff;  //Fill with junk for the time being			
-	RCof[RCTcrate][RCcard][Region]=rand()&0x1;  //Fill with junk for the time being			
-	RCtau[RCTcrate][RCcard][Region]=rand()&0x1; //Fill with junk for the time being			
+  unsigned short RC[18][7][2] = {{{0}}};
+  unsigned short RCof[18][7][2] = {{{0}}};
+  unsigned short RCtau[18][7][2] = {{{0}}};
+  unsigned short HF[18][4][2] = {{{0}}};
+  unsigned short HFQ[18][4][2] = {{{0}}};
+
+  unsigned short testRC[18][7][2] = {{{0}}};
+  unsigned short testRCof[18][7][2] = {{{0}}};
+  unsigned short testRCtau[18][7][2] = {{{0}}};
+  unsigned short testHF[18][4][2] = {{{0}}};
+  unsigned short testHFQ[18][4][2] = {{{0}}};
+
+  std::cout << "fill with junk..." << std::endl;
+  for (int RCTcrate = 0; RCTcrate < 18; RCTcrate++) {
+    for (int RCcard = 0; RCcard < 7; RCcard++) {
+      for (int Region = 0; Region < 2; Region++) {
+        RC[RCTcrate][RCcard][Region] =
+            rand() & 0x3ff; // Fill with junk for the time being
+        RCof[RCTcrate][RCcard][Region] =
+            rand() & 0x1; // Fill with junk for the time being
+        RCtau[RCTcrate][RCcard][Region] =
+            rand() & 0x1; // Fill with junk for the time being
       }
     }
   }
 
-  for(int RCTcrate=0; RCTcrate<18; RCTcrate++){			
-    for(int HFeta=0; HFeta<4; HFeta++){
-      for(int HFRegion=0; HFRegion<2; HFRegion++){
-	HF[RCTcrate][HFeta][HFRegion]=rand()&0xff; //Fill with junk for the time being			
-	HFQ[RCTcrate][HFeta][HFRegion]=rand()&0x1; //Fill with junk for the time being			
+  for (int RCTcrate = 0; RCTcrate < 18; RCTcrate++) {
+    for (int HFeta = 0; HFeta < 4; HFeta++) {
+      for (int HFRegion = 0; HFRegion < 2; HFRegion++) {
+        HF[RCTcrate][HFeta][HFRegion] =
+            rand() & 0xff; // Fill with junk for the time being
+        HFQ[RCTcrate][HFeta][HFRegion] =
+            rand() & 0x1; // Fill with junk for the time being
       }
     }
   }
 
-  std::cout<<"now do the proper stuff..."<<std::endl;
+  std::cout << "now do the proper stuff..." << std::endl;
 
-  int RoutingMode=1;
-  for(int RCTcrate=0; RCTcrate<18; RCTcrate++){			
+  int RoutingMode = 1;
+  for (int RCTcrate = 0; RCTcrate < 18; RCTcrate++) {
     temp.RoutingModetoLogicalCardID(logicalCardID, RoutingMode, RCTcrate);
-    temp.RC56HFtoSTRING(logicalCardID, eventNumber, RC[RCTcrate], RCof[RCTcrate], RCtau[RCTcrate], HF[RCTcrate], HFQ[RCTcrate], tempString);
-
-		
-    //now check its working ok
-    //std::cout<<"MID: "<<tempString<<std::endl;
-    temp.STRINGtoVHDCI(logicalCardID,eventNumber,tempString,VHDCI);
-    temp.VHDCItoRC56HF(testRC[RCTcrate], testRCof[RCTcrate], testRCtau[RCTcrate], testHF[RCTcrate], testHFQ[RCTcrate], VHDCI);
+    temp.RC56HFtoSTRING(logicalCardID, eventNumber, RC[RCTcrate],
+                        RCof[RCTcrate], RCtau[RCTcrate], HF[RCTcrate],
+                        HFQ[RCTcrate], tempString);
+
+    // now check its working ok
+    // std::cout<<"MID: "<<tempString<<std::endl;
+    temp.STRINGtoVHDCI(logicalCardID, eventNumber, tempString, VHDCI);
+    temp.VHDCItoRC56HF(testRC[RCTcrate], testRCof[RCTcrate],
+                       testRCtau[RCTcrate], testHF[RCTcrate], testHFQ[RCTcrate],
+                       VHDCI);
     /*cout<<"------------------------------------"<<std::endl;
       for(int RCcard=5; RCcard<7; RCcard++){
       for(int Region=0; Region<2; Region++){
-      std::cout << RC[RCTcrate][RCcard][Region] << '\t' << testRC[RCTcrate][RCcard][Region] << '\t';		
-      std::cout <<	RCof[RCTcrate][RCcard][Region] << '\t' << testRCof[RCTcrate][RCcard][Region] << '\t';
-      std::cout <<	RCtau[RCTcrate][RCcard][Region] << '\t' << testRCtau[RCTcrate][RCcard][Region] << std::endl;
+      std::cout << RC[RCTcrate][RCcard][Region] << '\t' <<
+      testRC[RCTcrate][RCcard][Region] << '\t'; std::cout <<
+      RCof[RCTcrate][RCcard][Region] << '\t' <<
+      testRCof[RCTcrate][RCcard][Region] << '\t'; std::cout <<
+      RCtau[RCTcrate][RCcard][Region] << '\t' <<
+      testRCtau[RCTcrate][RCcard][Region] << std::endl;
       }
       }
       for(int HFeta=0; HFeta<4; HFeta++){
       for(int HFRegion=0; HFRegion<2; HFRegion++){
-      std::cout << HF[RCTcrate][HFeta][HFRegion] << '\t' << testHF[RCTcrate][HFeta][HFRegion] << '\t';		
-      std::cout <<	HFQ[RCTcrate][HFeta][HFRegion] << '\t' << testHFQ[RCTcrate][HFeta][HFRegion] << std::endl;
+      std::cout << HF[RCTcrate][HFeta][HFRegion] << '\t' <<
+      testHF[RCTcrate][HFeta][HFRegion] << '\t'; std::cout <<
+      HFQ[RCTcrate][HFeta][HFRegion] << '\t' <<
+      testHFQ[RCTcrate][HFeta][HFRegion] << std::endl;
       }
-      }*/ 
+      }*/
   }
-  		
 
-  RoutingMode=2;
-  for(int RCTcrate=0; RCTcrate<18; RCTcrate++){			
+  RoutingMode = 2;
+  for (int RCTcrate = 0; RCTcrate < 18; RCTcrate++) {
     temp.RoutingModetoLogicalCardID(logicalCardID, RoutingMode, RCTcrate);
-    temp.RC012toSTRING(logicalCardID, eventNumber, RC[RCTcrate], RCof[RCTcrate], RCtau[RCTcrate], tempString);
-
-		
-    //now check its working ok
-    //std::cout<<"MID: "<<tempString<<std::endl;
-    temp.STRINGtoVHDCI(logicalCardID,eventNumber,tempString,VHDCI);
-    temp.VHDCItoRC012(testRC[RCTcrate], testRCof[RCTcrate], testRCtau[RCTcrate], VHDCI);
+    temp.RC012toSTRING(logicalCardID, eventNumber, RC[RCTcrate], RCof[RCTcrate],
+                       RCtau[RCTcrate], tempString);
+
+    // now check its working ok
+    // std::cout<<"MID: "<<tempString<<std::endl;
+    temp.STRINGtoVHDCI(logicalCardID, eventNumber, tempString, VHDCI);
+    temp.VHDCItoRC012(testRC[RCTcrate], testRCof[RCTcrate], testRCtau[RCTcrate],
+                      VHDCI);
     /*cout<<"------------------------------------"<<std::endl;
       for(int RCcard=0; RCcard<7; RCcard++){
       for(int Region=0; Region<2; Region++){
-      std::cout << RC[RCTcrate][RCcard][Region] << '\t' << testRC[RCTcrate][RCcard][Region] << '\t';		
-      std::cout <<	RCof[RCTcrate][RCcard][Region] << '\t' << testRCof[RCTcrate][RCcard][Region] << '\t';
-      std::cout <<	RCtau[RCTcrate][RCcard][Region] << '\t' << testRCtau[RCTcrate][RCcard][Region] << std::endl;
+      std::cout << RC[RCTcrate][RCcard][Region] << '\t' <<
+      testRC[RCTcrate][RCcard][Region] << '\t'; std::cout <<
+      RCof[RCTcrate][RCcard][Region] << '\t' <<
+      testRCof[RCTcrate][RCcard][Region] << '\t'; std::cout <<
+      RCtau[RCTcrate][RCcard][Region] << '\t' <<
+      testRCtau[RCTcrate][RCcard][Region] << std::endl;
       }
       }*/
-
   }
 
-
-  RoutingMode=3;
-  for(int RCTcrate=0; RCTcrate<9; RCTcrate++){			
+  RoutingMode = 3;
+  for (int RCTcrate = 0; RCTcrate < 9; RCTcrate++) {
     temp.RoutingModetoLogicalCardID(logicalCardID, RoutingMode, RCTcrate);
-    temp.RC234toSTRING(logicalCardID, eventNumber, RC[RCTcrate], RCof[RCTcrate], RCtau[RCTcrate], RC[RCTcrate+9], RCof[RCTcrate+9], RCtau[RCTcrate+9], tempString);
-
-		
-    //now check its working ok
-    //std::cout<<"MID: "<<tempString<<std::endl;
-    temp.STRINGtoVHDCI(logicalCardID,eventNumber,tempString,VHDCI);
-    temp.VHDCItoRC234(testRC[RCTcrate], testRCof[RCTcrate], testRCtau[RCTcrate], testRC[RCTcrate+9], testRCof[RCTcrate+9], testRCtau[RCTcrate+9], VHDCI);
+    temp.RC234toSTRING(logicalCardID, eventNumber, RC[RCTcrate], RCof[RCTcrate],
+                       RCtau[RCTcrate], RC[RCTcrate + 9], RCof[RCTcrate + 9],
+                       RCtau[RCTcrate + 9], tempString);
+
+    // now check its working ok
+    // std::cout<<"MID: "<<tempString<<std::endl;
+    temp.STRINGtoVHDCI(logicalCardID, eventNumber, tempString, VHDCI);
+    temp.VHDCItoRC234(testRC[RCTcrate], testRCof[RCTcrate], testRCtau[RCTcrate],
+                      testRC[RCTcrate + 9], testRCof[RCTcrate + 9],
+                      testRCtau[RCTcrate + 9], VHDCI);
     /*cout<<"------------------------------------"<<std::endl;
       for(int RCcard=2; RCcard<5; RCcard++){
       for(int Region=0; Region<2; Region++){
-      std::cout << RC[RCTcrate][RCcard][Region] << '\t' << testRC[RCTcrate][RCcard][Region] << '\t';		
-      std::cout <<	RCof[RCTcrate][RCcard][Region] << '\t' << testRCof[RCTcrate][RCcard][Region] << '\t';
-      std::cout <<	RCtau[RCTcrate][RCcard][Region] << '\t' << testRCtau[RCTcrate][RCcard][Region] << std::endl;
-      std::cout << RC[RCTcrate+9][RCcard][Region] << '\t' << testRC[RCTcrate+9][RCcard][Region] << '\t';		
-      std::cout <<	RCof[RCTcrate+9][RCcard][Region] << '\t' << testRCof[RCTcrate+9][RCcard][Region] << '\t';
-      std::cout <<	RCtau[RCTcrate+9][RCcard][Region] << '\t' << testRCtau[RCTcrate+9][RCcard][Region] << std::endl;
+      std::cout << RC[RCTcrate][RCcard][Region] << '\t' <<
+      testRC[RCTcrate][RCcard][Region] << '\t'; std::cout <<
+      RCof[RCTcrate][RCcard][Region] << '\t' <<
+      testRCof[RCTcrate][RCcard][Region] << '\t'; std::cout <<
+      RCtau[RCTcrate][RCcard][Region] << '\t' <<
+      testRCtau[RCTcrate][RCcard][Region] << std::endl; std::cout <<
+      RC[RCTcrate+9][RCcard][Region] << '\t' <<
+      testRC[RCTcrate+9][RCcard][Region] << '\t'; std::cout <<
+      RCof[RCTcrate+9][RCcard][Region] << '\t' <<
+      testRCof[RCTcrate+9][RCcard][Region] << '\t'; std::cout <<
+      RCtau[RCTcrate+9][RCcard][Region] << '\t' <<
+      testRCtau[RCTcrate+9][RCcard][Region] << std::endl;
       }
       }*/
-
   }
 
-  std::cout<<"and now to check..."<<std::endl;
-  for(int RCTcrate=0; RCTcrate<18; RCTcrate++){			
-    std::cout<<"------------------ "<<RCTcrate<<" ------------------"<<std::endl;
-    for(int RCcard=0; RCcard<7; RCcard++){
-      for(int Region=0; Region<2; Region++){
-	if ( (RC[RCTcrate][RCcard][Region]!=testRC[RCTcrate][RCcard][Region])||(RCof[RCTcrate][RCcard][Region]!=testRCof[RCTcrate][RCcard][Region])||(RCtau[RCTcrate][RCcard][Region]!=testRCtau[RCTcrate][RCcard][Region]) ){
-	  std::cout << RC[RCTcrate][RCcard][Region] << '\t' << testRC[RCTcrate][RCcard][Region] << '\t';		
-	  std::cout <<	RCof[RCTcrate][RCcard][Region] << '\t' << testRCof[RCTcrate][RCcard][Region] << '\t';
-	  std::cout <<	RCtau[RCTcrate][RCcard][Region] << '\t' << testRCtau[RCTcrate][RCcard][Region] << std::endl;
-	}
+  std::cout << "and now to check..." << std::endl;
+  for (int RCTcrate = 0; RCTcrate < 18; RCTcrate++) {
+    std::cout << "------------------ " << RCTcrate << " ------------------"
+              << std::endl;
+    for (int RCcard = 0; RCcard < 7; RCcard++) {
+      for (int Region = 0; Region < 2; Region++) {
+        if ((RC[RCTcrate][RCcard][Region] !=
+             testRC[RCTcrate][RCcard][Region]) ||
+            (RCof[RCTcrate][RCcard][Region] !=
+             testRCof[RCTcrate][RCcard][Region]) ||
+            (RCtau[RCTcrate][RCcard][Region] !=
+             testRCtau[RCTcrate][RCcard][Region])) {
+          std::cout << RC[RCTcrate][RCcard][Region] << '\t'
+                    << testRC[RCTcrate][RCcard][Region] << '\t';
+          std::cout << RCof[RCTcrate][RCcard][Region] << '\t'
+                    << testRCof[RCTcrate][RCcard][Region] << '\t';
+          std::cout << RCtau[RCTcrate][RCcard][Region] << '\t'
+                    << testRCtau[RCTcrate][RCcard][Region] << std::endl;
+        }
       }
     }
-    for(int HFeta=0; HFeta<4; HFeta++){
-      for(int HFRegion=0; HFRegion<2; HFRegion++){
-	if ( (HF[RCTcrate][HFeta][HFRegion]!=testHF[RCTcrate][HFeta][HFRegion])||( HFQ[RCTcrate][HFeta][HFRegion]!=testHFQ[RCTcrate][HFeta][HFRegion]) ){
-	  std::cout << HF[RCTcrate][HFeta][HFRegion] << '\t' << testHF[RCTcrate][HFeta][HFRegion] << '\t';		
-	  std::cout <<	HFQ[RCTcrate][HFeta][HFRegion] << '\t' << testHFQ[RCTcrate][HFeta][HFRegion] << std::endl;
-	} 
+    for (int HFeta = 0; HFeta < 4; HFeta++) {
+      for (int HFRegion = 0; HFRegion < 2; HFRegion++) {
+        if ((HF[RCTcrate][HFeta][HFRegion] !=
+             testHF[RCTcrate][HFeta][HFRegion]) ||
+            (HFQ[RCTcrate][HFeta][HFRegion] !=
+             testHFQ[RCTcrate][HFeta][HFRegion])) {
+          std::cout << HF[RCTcrate][HFeta][HFRegion] << '\t'
+                    << testHF[RCTcrate][HFeta][HFRegion] << '\t';
+          std::cout << HFQ[RCTcrate][HFeta][HFRegion] << '\t'
+                    << testHFQ[RCTcrate][HFeta][HFRegion] << std::endl;
+        }
       }
     }
-
-
   }
-
-
 }
diff --git a/L1TriggerConfig/DTTPGConfigProducers/plugins/DTTPGParamsWriter.cc b/L1TriggerConfig/DTTPGConfigProducers/plugins/DTTPGParamsWriter.cc
index 78c2c7cdcfaf3..e1cf913bb8312 100644
--- a/L1TriggerConfig/DTTPGConfigProducers/plugins/DTTPGParamsWriter.cc
+++ b/L1TriggerConfig/DTTPGConfigProducers/plugins/DTTPGParamsWriter.cc
@@ -4,108 +4,110 @@
  *  \author C. Battilana CIEMAT
  */
 
-#include "L1TriggerConfig/DTTPGConfigProducers/plugins/DTTPGParamsWriter.h"
 #include "CalibMuon/DTCalibration/interface/DTCalibDBUtils.h"
+#include "L1TriggerConfig/DTTPGConfigProducers/plugins/DTTPGParamsWriter.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
 /* C++ Headers */
-#include <vector> 
-#include <iostream>
-#include <string>
-#include <sstream>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string_regex.hpp>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <vector>
 
 using namespace std;
 using namespace edm;
 
-
 // Constructor
-DTTPGParamsWriter::DTTPGParamsWriter(const ParameterSet& pset) {
+DTTPGParamsWriter::DTTPGParamsWriter(const ParameterSet &pset) {
 
   debug_ = pset.getUntrackedParameter<bool>("debug", false);
   inputFileName_ = pset.getUntrackedParameter<string>("inputFile");
   // Create the object to be written to DB
   phaseMap_ = new DTTPGParameters();
-  
-  if(debug_)
-    cout << "[DTTPGParamsWriter]Constructor called!" << endl;
 
+  if (debug_)
+    cout << "[DTTPGParamsWriter]Constructor called!" << endl;
 }
 
-
-
 // Destructor
-DTTPGParamsWriter::~DTTPGParamsWriter(){
+DTTPGParamsWriter::~DTTPGParamsWriter() {
 
-  if(debug_)
+  if (debug_)
     cout << "[DTTPGParamsWriter]Destructor called!" << endl;
-
 }
 
 // Do the job
-void DTTPGParamsWriter::analyze(const Event & event, const EventSetup& eventSetup) {
+void DTTPGParamsWriter::analyze(const Event &event,
+                                const EventSetup &eventSetup) {
 
-  if(debug_)
+  if (debug_)
     cout << "[DTTPGParamsWriter]Reading data from file." << endl;
 
-  std::ifstream inputFile_(inputFileName_.c_str());  
-  int nLines=0;
+  std::ifstream inputFile_(inputFileName_.c_str());
+  int nLines = 0;
   std::string line;
 
-  while(std::getline(inputFile_, line)) {
+  while (std::getline(inputFile_, line)) {
     DTChamberId chId;
     float fine = 0.;
     int coarse = 0;
-    pharseLine(line,chId,fine,coarse);
-    phaseMap_->set(chId,coarse,fine,DTTimeUnits::ns);
+    pharseLine(line, chId, fine, coarse);
+    phaseMap_->set(chId, coarse, fine, DTTimeUnits::ns);
     if (debug_) {
       float fineDB = 0.;
       int coarseDB = 0;
-      phaseMap_->get(chId,coarseDB,fineDB,DTTimeUnits::ns);
-      std::cout << "[DTTPGParamsWriter] Read data for chamber " << chId 
-		<< ". File params -> fine: " << fine << " coarse: " << coarse 
-		<< ". DB params -> fine: " << fineDB << " coarse: " << coarseDB << std::endl;
+      phaseMap_->get(chId, coarseDB, fineDB, DTTimeUnits::ns);
+      std::cout << "[DTTPGParamsWriter] Read data for chamber " << chId
+                << ". File params -> fine: " << fine << " coarse: " << coarse
+                << ". DB params -> fine: " << fineDB << " coarse: " << coarseDB
+                << std::endl;
     }
     nLines++;
   }
   if (debug_) {
-    std::cout << "[DTTPGParamsWriter] # of entries written the the DB: " << nLines << std::endl;
+    std::cout << "[DTTPGParamsWriter] # of entries written the the DB: "
+              << nLines << std::endl;
   }
-  if (nLines!=250) {
-    std::cout << "[DTTPGParamsWriter] # of DB entries != 250. Check you input file!" << std::endl;
+  if (nLines != 250) {
+    std::cout
+        << "[DTTPGParamsWriter] # of DB entries != 250. Check you input file!"
+        << std::endl;
   }
-  
 
   inputFile_.close();
-
-
 }
 
-void DTTPGParamsWriter::pharseLine(std::string &line, DTChamberId& chId, float &fine, int  &coarse) {
+void DTTPGParamsWriter::pharseLine(std::string &line, DTChamberId &chId,
+                                   float &fine, int &coarse) {
 
   std::vector<std::string> elements;
-  boost::algorithm::split(elements,line,boost::algorithm::is_any_of(string(" \t\n")));  // making string conversion explicit (needed to cope with -Warray-bounds in slc5_ia32_gcc434  
+  boost::algorithm::split(
+      elements, line,
+      boost::algorithm::is_any_of(
+          string(" \t\n"))); // making string conversion explicit (needed to
+                             // cope with -Warray-bounds in slc5_ia32_gcc434
   if (elements.size() != 5) {
-    std::cout << "[DTTPGParamsWriter] wrong number of entries in line : " << line << " pleas check your input file syntax!" << std::endl;
+    std::cout << "[DTTPGParamsWriter] wrong number of entries in line : "
+              << line << " pleas check your input file syntax!" << std::endl;
   } else {
-    chId   = DTChamberId(atoi(elements[0].c_str()),atoi(elements[1].c_str()),atoi(elements[2].c_str()));
-    fine   = atof(elements[3].c_str());
+    chId = DTChamberId(atoi(elements[0].c_str()), atoi(elements[1].c_str()),
+                       atoi(elements[2].c_str()));
+    fine = atof(elements[3].c_str());
     coarse = atoi(elements[4].c_str());
   }
-
 }
 
 // Write objects to DB
 void DTTPGParamsWriter::endJob() {
-  if(debug_) 
-	cout << "[DTTPGParamsWriter] Writing ttrig object to DB!" << endl;
+  if (debug_)
+    cout << "[DTTPGParamsWriter] Writing ttrig object to DB!" << endl;
 
   string delayRecord = "DTTPGParametersRcd";
   DTCalibDBUtils::writeToDB(delayRecord, phaseMap_);
-
-}  
+}
diff --git a/L1TriggerConfig/DTTPGConfigProducers/plugins/DTTPGParamsWriter.h b/L1TriggerConfig/DTTPGConfigProducers/plugins/DTTPGParamsWriter.h
index 1162118b8ac82..a68932b9bb80f 100644
--- a/L1TriggerConfig/DTTPGConfigProducers/plugins/DTTPGParamsWriter.h
+++ b/L1TriggerConfig/DTTPGConfigProducers/plugins/DTTPGParamsWriter.h
@@ -2,28 +2,27 @@
 #define DTTPGParamsWriter_H
 
 /* Program to write DT TPG pedestals correction into DB
- 
+
  *  \author C. Battilana - CIEMAT
  */
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "CondFormats/DTObjects/interface/DTTPGParameters.h"
-#include <string>
+#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include <fstream>
-
+#include <string>
 
 namespace edm {
-  class ParameterSet;
-  class Event;
-  class EventSetup;
-}
+class ParameterSet;
+class Event;
+class EventSetup;
+} // namespace edm
 
 class DTChamberId;
 
 class DTTPGParamsWriter : public edm::EDAnalyzer {
 public:
   /// Constructor
-  DTTPGParamsWriter(const edm::ParameterSet& pset);
+  DTTPGParamsWriter(const edm::ParameterSet &pset);
 
   /// Destructor
   ~DTTPGParamsWriter() override;
@@ -31,14 +30,15 @@ class DTTPGParamsWriter : public edm::EDAnalyzer {
   // Operations
 
   /// Compute the ttrig by fiting the TB rising edge
-  void analyze(const edm::Event & event, const edm::EventSetup& eventSetup) override;
+  void analyze(const edm::Event &event,
+               const edm::EventSetup &eventSetup) override;
 
   /// Write ttrig in the DB
   void endJob() override;
 
 private:
-
-  void pharseLine(std::string &line, DTChamberId& chId, float &fine, int &coarse);
+  void pharseLine(std::string &line, DTChamberId &chId, float &fine,
+                  int &coarse);
 
   bool debug_;
   std::string inputFileName_;
diff --git a/L1TriggerConfig/DTTPGConfigProducers/plugins/plugins.cc b/L1TriggerConfig/DTTPGConfigProducers/plugins/plugins.cc
index f503468e66b2d..0fbb21be516c1 100644
--- a/L1TriggerConfig/DTTPGConfigProducers/plugins/plugins.cc
+++ b/L1TriggerConfig/DTTPGConfigProducers/plugins/plugins.cc
@@ -1,7 +1,5 @@
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include  "L1TriggerConfig/DTTPGConfigProducers/plugins/DTTPGParamsWriter.h"
+#include "L1TriggerConfig/DTTPGConfigProducers/plugins/DTTPGParamsWriter.h"
 DEFINE_FWK_MODULE(DTTPGParamsWriter);
-
-
diff --git a/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigDBProducer.cc b/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigDBProducer.cc
index 10470f9b4d6fe..e81ec7ed80685 100644
--- a/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigDBProducer.cc
+++ b/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigDBProducer.cc
@@ -1,123 +1,119 @@
 #include "L1TriggerConfig/DTTPGConfigProducers/src/DTConfigDBProducer.h"
 
 #include "DataFormats/MuonDetId/interface/DTChamberId.h"
-#include "DataFormats/MuonDetId/interface/DTSuperLayerId.h"
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
+#include "DataFormats/MuonDetId/interface/DTSuperLayerId.h"
 
-#include "CondFormats/DataRecord/interface/DTT0Rcd.h"
 #include "CondFormats/DTObjects/interface/DTCCBConfig.h"
-#include "CondFormats/DataRecord/interface/DTCCBConfigRcd.h"
-#include "CondFormats/DataRecord/interface/DTTPGParametersRcd.h"
 #include "CondFormats/DTObjects/interface/DTKeyedConfig.h"
+#include "CondFormats/DataRecord/interface/DTCCBConfigRcd.h"
 #include "CondFormats/DataRecord/interface/DTKeyedConfigListRcd.h"
+#include "CondFormats/DataRecord/interface/DTT0Rcd.h"
+#include "CondFormats/DataRecord/interface/DTTPGParametersRcd.h"
 
 #include "L1TriggerConfig/DTTPGConfig/interface/DTConfigManagerRcd.h"
 #include "L1TriggerConfig/DTTPGConfigProducers/src/DTPosNegType.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
 using std::cout;
 using std::endl;
-using std::vector;
 using std::unique_ptr;
+using std::vector;
 
 //
 // constructors and destructor
 //
 
-DTConfigDBProducer::DTConfigDBProducer(const edm::ParameterSet& p)
-{
+DTConfigDBProducer::DTConfigDBProducer(const edm::ParameterSet &p) {
   // tell the framework what record is being produced
-  setWhatProduced(this,&DTConfigDBProducer::produce);
+  setWhatProduced(this, &DTConfigDBProducer::produce);
 
   cfgConfig = p.getParameter<bool>("cfgConfig");
-    
+
   // get and store parameter set and config manager pointer
   m_ps = p;
-  
+
   // debug flags
-  m_debugDB    = p.getParameter<bool>("debugDB"); 
-  m_debugBti   = p.getParameter<int>("debugBti");
+  m_debugDB = p.getParameter<bool>("debugDB");
+  m_debugBti = p.getParameter<int>("debugBti");
   m_debugTraco = p.getParameter<int>("debugTraco");
-  m_debugTSP   = p.getParameter<bool>("debugTSP");
-  m_debugTST   = p.getParameter<bool>("debugTST");
-  m_debugTU    = p.getParameter<bool>("debugTU");
-  m_debugSC    = p.getParameter<bool>("debugSC");
-  m_debugLUTs  = p.getParameter<bool>("debugLUTs");
-  m_debugPed   = p.getParameter<bool>("debugPed");
+  m_debugTSP = p.getParameter<bool>("debugTSP");
+  m_debugTST = p.getParameter<bool>("debugTST");
+  m_debugTU = p.getParameter<bool>("debugTU");
+  m_debugSC = p.getParameter<bool>("debugSC");
+  m_debugLUTs = p.getParameter<bool>("debugLUTs");
+  m_debugPed = p.getParameter<bool>("debugPed");
+
+  m_UseT0 = p.getParameter<bool>("UseT0"); // CB check for a better way to do it
+}
 
-  m_UseT0 = p.getParameter<bool>("UseT0");  // CB check for a better way to do it
+DTConfigDBProducer::~DTConfigDBProducer() {}
 
-}
+//
+// member functions
+//
 
+std::unique_ptr<DTConfigManager>
+DTConfigDBProducer::produce(const DTConfigManagerRcd &iRecord) {
+  using namespace edm;
 
-DTConfigDBProducer::~DTConfigDBProducer()
-{
+  std::unique_ptr<DTConfigManager> dtConfig =
+      std::unique_ptr<DTConfigManager>(new DTConfigManager());
+  DTConfigManager &dttpgConfig = *(dtConfig.get());
 
-}
+  // DB specific requests
+  bool tracoLutsFromDB = m_ps.getParameter<bool>("TracoLutsFromDB");
+  bool useBtiAcceptParam = m_ps.getParameter<bool>("UseBtiAcceptParam");
 
+  // set specific DB requests
+  dttpgConfig.setLutFromDB(tracoLutsFromDB);
+  dttpgConfig.setUseAcceptParam(useBtiAcceptParam);
 
-//
-// member functions
-//
+  // set debug
+  edm::ParameterSet conf_ps =
+      m_ps.getParameter<edm::ParameterSet>("DTTPGParameters");
+  bool dttpgdebug = conf_ps.getUntrackedParameter<bool>("Debug");
+  dttpgConfig.setDTTPGDebug(dttpgdebug);
+
+  int code;
+  if (cfgConfig) {
+    dttpgConfig.setLutFromDB(false);
+    configFromCfg(dttpgConfig);
+    code = 2;
+  } else {
+    code = readDTCCBConfig(iRecord, dttpgConfig);
+    readDBPedestalsConfig(iRecord, dttpgConfig);
+    // 110628 SV add config check
+    if (code != -1 && checkDTCCBConfig(dttpgConfig) > 0)
+      code = -1;
+  }
+  // cout << "DTConfigDBProducer::produce CODE " << code << endl;
+  if (code == -1) {
+    dttpgConfig.setCCBConfigValidity(false);
+  } else if (code == 2) {
+    LogVerbatim("DTTPG") << "DTConfigDBProducer::produce : Trivial : " << endl
+                         << "configurations has been read from cfg" << endl;
+  } else if (code == 0) {
+    LogVerbatim("DTTPG") << "DTConfigDBProducer::produce : " << endl
+                         << "Configurations successfully read from OMDS"
+                         << endl;
+  } else {
+    LogProblem("DTTPG") << "DTConfigDBProducer::produce : " << endl
+                        << "Wrong configuration return CODE" << endl;
+  }
 
-std::unique_ptr<DTConfigManager> DTConfigDBProducer::produce(const DTConfigManagerRcd& iRecord)
-{
-   using namespace edm;
-
-   std::unique_ptr<DTConfigManager> dtConfig = std::unique_ptr<DTConfigManager>( new DTConfigManager() );
-   DTConfigManager & dttpgConfig = *(dtConfig.get());
-
-   // DB specific requests
-   bool tracoLutsFromDB   = m_ps.getParameter<bool>("TracoLutsFromDB");
-   bool useBtiAcceptParam = m_ps.getParameter<bool>("UseBtiAcceptParam");
-
-   // set specific DB requests
-   dttpgConfig.setLutFromDB(tracoLutsFromDB);
-   dttpgConfig.setUseAcceptParam(useBtiAcceptParam);
-
-   // set debug
-   edm::ParameterSet conf_ps = m_ps.getParameter<edm::ParameterSet>("DTTPGParameters");  
-   bool dttpgdebug = conf_ps.getUntrackedParameter<bool>("Debug");
-   dttpgConfig.setDTTPGDebug(dttpgdebug);
-
-   int code; 
-   if(cfgConfig){
-     dttpgConfig.setLutFromDB(false);
-     configFromCfg(dttpgConfig);
-     code = 2;
-   }  else{
-     code = readDTCCBConfig(iRecord,dttpgConfig);
-     readDBPedestalsConfig(iRecord,dttpgConfig); 
-     // 110628 SV add config check
-     if(code != -1 && checkDTCCBConfig(dttpgConfig) > 0)
-       code=-1;
-   }
-   //cout << "DTConfigDBProducer::produce CODE " << code << endl;
-   if(code==-1) {
-     dttpgConfig.setCCBConfigValidity(false);
-   } else if(code==2) {
-     LogVerbatim ("DTTPG") << "DTConfigDBProducer::produce : Trivial : " << endl
-                           << "configurations has been read from cfg" << endl; 
-   } else if(code==0) {
-     LogVerbatim ("DTTPG") << "DTConfigDBProducer::produce : " << endl 
-                           << "Configurations successfully read from OMDS" << endl; 
-   } else {
-     LogProblem ("DTTPG") << "DTConfigDBProducer::produce : " << endl
-			  << "Wrong configuration return CODE" << endl;
-   }
-
-   return dtConfig ;
+  return dtConfig;
 }
 
-void DTConfigDBProducer::readDBPedestalsConfig(const DTConfigManagerRcd& iRecord,
-					             DTConfigManager   & dttpgConfig){
+void DTConfigDBProducer::readDBPedestalsConfig(
+    const DTConfigManagerRcd &iRecord, DTConfigManager &dttpgConfig) {
 
   edm::ESHandle<DTTPGParameters> dttpgParams;
   iRecord.getRecord<DTTPGParametersRcd>().get(dttpgParams);
@@ -129,140 +125,143 @@ void DTConfigDBProducer::readDBPedestalsConfig(const DTConfigManagerRcd& iRecord
 
     edm::ESHandle<DTT0> t0i;
     iRecord.getRecord<DTT0Rcd>().get(t0i);
- 
+
     pedestals.setUseT0(true);
-    pedestals.setES(dttpgParams.product(),t0i.product());
-    //cout << "checkDTCCBConfig CODE is " << checkDTCCBConfig() << endl;
+    pedestals.setES(dttpgParams.product(), t0i.product());
+    // cout << "checkDTCCBConfig CODE is " << checkDTCCBConfig() << endl;
 
   } else {
 
     pedestals.setUseT0(false);
     pedestals.setES(dttpgParams.product());
-
   }
 
   dttpgConfig.setDTConfigPedestals(pedestals);
-
 }
 
-int DTConfigDBProducer::checkDTCCBConfig(DTConfigManager & dttpgConfig)
-{
+int DTConfigDBProducer::checkDTCCBConfig(DTConfigManager &dttpgConfig) {
   // 110627 SV test if configuration from CCB has correct number of chips,
-  // return error code: 
+  // return error code:
   // check_cfg_code = 1 : NO correct BTI number
   // check_cfg_code = 2 : NO correct TRACO number
   // check_cfg_code = 3 : NO correct valid TSS number
   // check_cfg_code = 4 : NO correct valid TSM number
 
-  int check_cfg_code = 0; 
+  int check_cfg_code = 0;
 
   // do not take chambers from MuonGeometryRecord to avoid geometry dependency
-  for(int iwh=-2;iwh<=2;iwh++){
-    for(int ise=1;ise<=12;ise++){
-      for(int ist=1;ist<=4;ist++){
-
-        check_cfg_code = 0; 
-        DTChamberId chid(iwh,ist,ise);
-
-        //retrive number of configurated chip
-        int nbti      = dttpgConfig.getDTConfigBtiMap(chid).size();
-        int ntraco    = dttpgConfig.getDTConfigTracoMap(chid).size();
-        int ntss      = dttpgConfig.getDTConfigTSPhi(chid)->nValidTSS();
-        int ntsm      = dttpgConfig.getDTConfigTSPhi(chid)->nValidTSM();
-
-        //check BTIs 
-        if((ist==1 && nbti!=168) || 
-           (ist==2 && nbti!=192) || 
-           (ist==3 && nbti!=224) || 
-           (ist==4 && (ise==1||ise==2||ise==3||ise==5||ise==6||ise==7||ise==8||ise==12) && nbti!=192) ||
-           (ist==4 && (ise==9||ise==11) && nbti!=96) ||
-           (ist==4 && ise==10 && nbti!=128) || 
-           (ist==4 && ise==4 && nbti!=160)){  
+  for (int iwh = -2; iwh <= 2; iwh++) {
+    for (int ise = 1; ise <= 12; ise++) {
+      for (int ist = 1; ist <= 4; ist++) {
+
+        check_cfg_code = 0;
+        DTChamberId chid(iwh, ist, ise);
+
+        // retrive number of configurated chip
+        int nbti = dttpgConfig.getDTConfigBtiMap(chid).size();
+        int ntraco = dttpgConfig.getDTConfigTracoMap(chid).size();
+        int ntss = dttpgConfig.getDTConfigTSPhi(chid)->nValidTSS();
+        int ntsm = dttpgConfig.getDTConfigTSPhi(chid)->nValidTSM();
+
+        // check BTIs
+        if ((ist == 1 && nbti != 168) || (ist == 2 && nbti != 192) ||
+            (ist == 3 && nbti != 224) ||
+            (ist == 4 &&
+             (ise == 1 || ise == 2 || ise == 3 || ise == 5 || ise == 6 ||
+              ise == 7 || ise == 8 || ise == 12) &&
+             nbti != 192) ||
+            (ist == 4 && (ise == 9 || ise == 11) && nbti != 96) ||
+            (ist == 4 && ise == 10 && nbti != 128) ||
+            (ist == 4 && ise == 4 && nbti != 160)) {
           check_cfg_code = 1;
           return check_cfg_code;
         }
 
-        //check TRACOs
-        if((ist==1 && ntraco!=13) || 
-           (ist==2 && ntraco!=16) || 
-           (ist==3 && ntraco!=20) || 
-           (ist==4 && (ise==1||ise==2||ise==3||ise==5||ise==6||ise==7||ise==8||ise==12) && ntraco!=24) ||
-           (ist==4 && (ise==9||ise==11) && ntraco!=12) ||
-           (ist==4 && ise==10 && ntraco!=16) || 
-           (ist==4 && ise==4 && ntraco!=20)){  
-           check_cfg_code = 2;
-           return check_cfg_code;
+        // check TRACOs
+        if ((ist == 1 && ntraco != 13) || (ist == 2 && ntraco != 16) ||
+            (ist == 3 && ntraco != 20) ||
+            (ist == 4 &&
+             (ise == 1 || ise == 2 || ise == 3 || ise == 5 || ise == 6 ||
+              ise == 7 || ise == 8 || ise == 12) &&
+             ntraco != 24) ||
+            (ist == 4 && (ise == 9 || ise == 11) && ntraco != 12) ||
+            (ist == 4 && ise == 10 && ntraco != 16) ||
+            (ist == 4 && ise == 4 && ntraco != 20)) {
+          check_cfg_code = 2;
+          return check_cfg_code;
         }
 
-        //check TSS
-        if((ist==1 && ntss!=4) || 
-           (ist==2 && ntss!=4) || 
-           (ist==3 && ntss!=5) || 
-           (ist==4 && (ise==1||ise==2||ise==3||ise==5||ise==6||ise==7||ise==8||ise==12) && ntss!=6) ||
-           (ist==4 && (ise==9||ise==11) && ntss!=3) ||
-           (ist==4 && ise==10 && ntss!=4) || 
-           (ist==4 && ise==4 && ntss!=5) ){ 
-           check_cfg_code = 3;
-           return check_cfg_code;
-        }   
-        
-        //check TSM
-        if(ntsm!=1){ 
+        // check TSS
+        if ((ist == 1 && ntss != 4) || (ist == 2 && ntss != 4) ||
+            (ist == 3 && ntss != 5) ||
+            (ist == 4 &&
+             (ise == 1 || ise == 2 || ise == 3 || ise == 5 || ise == 6 ||
+              ise == 7 || ise == 8 || ise == 12) &&
+             ntss != 6) ||
+            (ist == 4 && (ise == 9 || ise == 11) && ntss != 3) ||
+            (ist == 4 && ise == 10 && ntss != 4) ||
+            (ist == 4 && ise == 4 && ntss != 5)) {
+          check_cfg_code = 3;
+          return check_cfg_code;
+        }
+
+        // check TSM
+        if (ntsm != 1) {
           check_cfg_code = 4;
           return check_cfg_code;
         }
 
-        //if(check_cfg_code){
-        //cout << "nbti " << nbti << " ntraco " << ntraco << " ntss " << ntss << " ntsm " << ntsm << endl; 
-        //cout << "Check: ch " << ist << " sec " << ise << " wh " << iwh << " == >check_cfg_code " << check_cfg_code << endl;
+        // if(check_cfg_code){
+        // cout << "nbti " << nbti << " ntraco " << ntraco << " ntss " << ntss
+        // << " ntsm " << ntsm << endl; cout << "Check: ch " << ist << " sec "
+        // << ise << " wh " << iwh << " == >check_cfg_code " << check_cfg_code
+        // << endl;
         //}
-        }// end st loop
-    }// end sec loop
+      } // end st loop
+    }   // end sec loop
 
     // SV MB4 has two more chambers
-    for(int ise=13;ise<=14;ise++){
-
-      DTChamberId chid(iwh,4,ise);
-
-      int nbti      = dttpgConfig.getDTConfigBtiMap(chid).size();
-      int ntraco    = dttpgConfig.getDTConfigTracoMap(chid).size();
-      int ntss      = dttpgConfig.getDTConfigTSPhi(chid)->nValidTSS();
-      int ntsm      = dttpgConfig.getDTConfigTSPhi(chid)->nValidTSM();
-
-      if((ise==13 && nbti != 160) ||
-         (ise==14 && nbti != 128)){
-         check_cfg_code = 1;
-         return check_cfg_code;
-      }  
-      if((ise==13 && ntraco != 20) || 
-         (ise==14 && ntraco != 16)){
-         check_cfg_code = 2;
-         return check_cfg_code;
-      }  
-      if((ise==13 && ntss != 5) ||
-         (ise==14 && ntss != 4)) {
-         check_cfg_code = 3;
-         return check_cfg_code;
+    for (int ise = 13; ise <= 14; ise++) {
+
+      DTChamberId chid(iwh, 4, ise);
+
+      int nbti = dttpgConfig.getDTConfigBtiMap(chid).size();
+      int ntraco = dttpgConfig.getDTConfigTracoMap(chid).size();
+      int ntss = dttpgConfig.getDTConfigTSPhi(chid)->nValidTSS();
+      int ntsm = dttpgConfig.getDTConfigTSPhi(chid)->nValidTSM();
+
+      if ((ise == 13 && nbti != 160) || (ise == 14 && nbti != 128)) {
+        check_cfg_code = 1;
+        return check_cfg_code;
+      }
+      if ((ise == 13 && ntraco != 20) || (ise == 14 && ntraco != 16)) {
+        check_cfg_code = 2;
+        return check_cfg_code;
+      }
+      if ((ise == 13 && ntss != 5) || (ise == 14 && ntss != 4)) {
+        check_cfg_code = 3;
+        return check_cfg_code;
       }
-      if(ntsm != 1){
+      if (ntsm != 1) {
         check_cfg_code = 4;
         return check_cfg_code;
-      }  
-      //if(check_cfg_code){
-        //cout << "nbti " << nbti << " ntraco " << ntraco << " ntss " << ntss << " ntsm " << ntsm << endl; 
-        //cout << "Check: ch " << 4 << " sec " << ise << " wh " << iwh << " == >check_cfg_code " << check_cfg_code << endl;
+      }
+      // if(check_cfg_code){
+      // cout << "nbti " << nbti << " ntraco " << ntraco << " ntss " << ntss <<
+      // " ntsm " << ntsm << endl; cout << "Check: ch " << 4 << " sec " << ise
+      // << " wh " << iwh << " == >check_cfg_code " << check_cfg_code << endl;
       //}
-    }// end sec 13 14  
+    } // end sec 13 14
 
-  }// end wh loop
+  } // end wh loop
 
-  //cout << "CheckDTCCB: config OK! check_cfg_code = " << check_cfg_code << endl;
+  // cout << "CheckDTCCB: config OK! check_cfg_code = " << check_cfg_code <<
+  // endl;
   return check_cfg_code;
 }
 
-int DTConfigDBProducer::readDTCCBConfig(const DTConfigManagerRcd & iRecord,
-					      DTConfigManager    & dttpgConfig)
-{
+int DTConfigDBProducer::readDTCCBConfig(const DTConfigManagerRcd &iRecord,
+                                        DTConfigManager &dttpgConfig) {
   using namespace edm::eventsetup;
 
   // initialize CCB validity flag
@@ -271,501 +270,506 @@ int DTConfigDBProducer::readDTCCBConfig(const DTConfigManagerRcd & iRecord,
   // get DTCCBConfigRcd from DTConfigManagerRcd (they are dependent records)
   edm::ESHandle<DTCCBConfig> ccb_conf;
   iRecord.getRecord<DTCCBConfigRcd>().get(ccb_conf);
-  int ndata = std::distance( ccb_conf->begin(), ccb_conf->end() );
+  int ndata = std::distance(ccb_conf->begin(), ccb_conf->end());
 
-  const DTKeyedConfigListRcd& keyRecord = iRecord.getRecord<DTKeyedConfigListRcd>();
+  const DTKeyedConfigListRcd &keyRecord =
+      iRecord.getRecord<DTKeyedConfigListRcd>();
 
-  if(m_debugDB)
-  {
-  	cout << ccb_conf->version() << endl;
-  	cout << ndata << " data in the container" << endl;
+  if (m_debugDB) {
+    cout << ccb_conf->version() << endl;
+    cout << ndata << " data in the container" << endl;
   }
 
-  edm::ValidityInterval iov(iRecord.getRecord<DTCCBConfigRcd>().validityInterval() );
+  edm::ValidityInterval iov(
+      iRecord.getRecord<DTCCBConfigRcd>().validityInterval());
   unsigned int currValidityStart = iov.first().eventID().run();
-  unsigned int currValidityEnd   = iov.last( ).eventID().run();
-
-  if(m_debugDB)
-  	cout 	<< "valid since run " << currValidityStart
-            	<< " to run "         << currValidityEnd << endl;  
-	    
-  // if there are no data in the container, configuration from cfg files...	    
-  if( ndata==0 ){
+  unsigned int currValidityEnd = iov.last().eventID().run();
+
+  if (m_debugDB)
+    cout << "valid since run " << currValidityStart << " to run "
+         << currValidityEnd << endl;
+
+  // if there are no data in the container, configuration from cfg files...
+  if (ndata == 0) {
     return -1;
   }
 
   // get DTTPGMap for retrieving bti number and traco number
-  edm::ParameterSet conf_map = m_ps.getUntrackedParameter<edm::ParameterSet>("DTTPGMap");
+  edm::ParameterSet conf_map =
+      m_ps.getUntrackedParameter<edm::ParameterSet>("DTTPGMap");
 
   // loop over chambers
-  DTCCBConfig::ccb_config_map configKeys( ccb_conf->configKeyMap() );
+  DTCCBConfig::ccb_config_map configKeys(ccb_conf->configKeyMap());
   DTCCBConfig::ccb_config_iterator iter = configKeys.begin();
   DTCCBConfig::ccb_config_iterator iend = configKeys.end();
 
   // 110628 SV check that number of CCB is equal to total number of chambers
-  if(ccb_conf->configKeyMap().size() != 250) //check the number of chambers!!!
+  if (ccb_conf->configKeyMap().size() != 250) // check the number of chambers!!!
     return -1;
 
   // read data from CCBConfig
-  while ( iter != iend ) {
-    // 110628 SV moved here from constructor, to check config consistency for EVERY chamber 
-    // initialize flags to check if data are present in OMDS 
-    flagDBBti 	= false;
-    flagDBTraco 	= false;
-    flagDBTSS 	= false;
-    flagDBTSM 	= false;
-    flagDBLUTS    = false;
+  while (iter != iend) {
+    // 110628 SV moved here from constructor, to check config consistency for
+    // EVERY chamber initialize flags to check if data are present in OMDS
+    flagDBBti = false;
+    flagDBTraco = false;
+    flagDBTSS = false;
+    flagDBTSM = false;
+    flagDBLUTS = false;
 
     // get chamber id
-    const DTCCBId& ccbId = iter->first;
-    if(m_debugDB)
-      		cout << " Filling configuration for chamber : wh " << ccbId.wheelId   << " st "
-        	        << ccbId.stationId << " se "
-                	<< ccbId.sectorId  << " -> " << endl;
-
-	// get chamber type and id from ccbId
-      	int mbtype = DTPosNegType::getCT( ccbId.wheelId, ccbId.sectorId, ccbId.stationId );
-      	int posneg = DTPosNegType::getPN( ccbId.wheelId, ccbId.sectorId, ccbId.stationId );
-	if(m_debugDB)
-      		cout << "Chamber type : " <<  mbtype
-      			<< " posneg : " << posneg << endl; 
-	DTChamberId chambid(ccbId.wheelId, ccbId.stationId, ccbId.sectorId);
-			
-	// get brick identifiers list
-      	const std::vector<int>& ccbConf = iter->second;
-      	std::vector<int>::const_iterator cfgIter = ccbConf.begin();
-      	std::vector<int>::const_iterator cfgIend = ccbConf.end();
-
-        //TSS-TSM buffers
-        unsigned short int tss_buffer[7][31];
-        unsigned short int tsm_buffer[9];
-        int ntss=0;
-
-	// loop over configuration bricks
-      	while ( cfgIter != cfgIend ) {
-		// get brick identifier
-        	int id = *cfgIter++;
-		if(m_debugDB)
-			cout << " BRICK " << id << endl;  
-
-		// create strings list
-        	std::vector<std::string> list;
-                cfgCache.getData( keyRecord, id, list );
-
-		// loop over strings
-        	std::vector<std::string>::const_iterator s_iter = list.begin();
-        	std::vector<std::string>::const_iterator s_iend = list.end();
-        	while ( s_iter != s_iend ) {
-			if(m_debugDB)
-				cout << "        ----> " << *s_iter << endl;
-				
-			// copy string in unsigned int buffer
-			std::string str = *s_iter++;
-			unsigned short int buffer[100];		//2 bytes
-			int c = 0;
-			const char* cstr = str.c_str();
-  			const char* ptr = cstr + 2;
-  			const char* end = cstr + str.length();
-			while ( ptr < end ) {
-    				char c1 = *ptr++;
-    				int i1 = 0;
-    				if ( ( c1 >= '0' ) && ( c1 <= '9' ) ) i1 =      c1 - '0';
-    				if ( ( c1 >= 'a' ) && ( c1 <= 'f' ) ) i1 = 10 + c1 - 'a';
-    				if ( ( c1 >= 'A' ) && ( c1 <= 'F' ) ) i1 = 10 + c1 - 'A';
-    				char c2 = *ptr++;
-    				int i2 = 0;
-    				if ( ( c2 >= '0' ) && ( c2 <= '9' ) ) i2 =      c2 - '0';
-    				if ( ( c2 >= 'a' ) && ( c2 <= 'f' ) ) i2 = 10 + c2 - 'a';
-    				if ( ( c2 >= 'A' ) && ( c2 <= 'F' ) ) i2 = 10 + c2 - 'A';
-    				buffer[c] = ( i1 * 16 ) + i2;
-				c++;
-			}// end loop over string
-
-			// BTI configuration string	
-			if (buffer[2]==0x54){
-				if(m_debugDB)
-					cout << "BTI STRING found in DB" << endl;
-
-				// BTI configuration read for BTI
-				flagDBBti = true;
-				
-				// compute sl and bti number from board and chip
-				int brd=buffer[3]; // Board Nr.
-  				int chip=buffer[4]; // Chip Nr.
-
-  				if (brd>7) {
-					cout << "Not existing board ... " << brd << endl;
-					return -1; // Non-existing board
-				}	
-  				if (chip>31) {
-					cout << "Not existing chip... " << chip << endl;
-					return -1; // Non existing chip 
-				}
-				
-				// Is it Phi or Theta board?
-  				bool ThetaSL, PhiSL;
-				PhiSL=false;
-				ThetaSL=false;
-  				switch (mbtype) {
-  					case 1: // mb1
-    						if (brd==6 || brd==7) {
-							ThetaSL=true; 
-							brd-=6;
-						}
-    						else if ((brd<3 && chip<32) || (brd==3 && chip<8)) 
-							PhiSL=true;
-    						break;
-  					case 2: // mb2
-    						if (brd==6 || brd==7) {
-							ThetaSL=true; 
-							brd-=6;
-						}
-    						else if (brd<4 && chip<32) 
-							PhiSL=true;
-    						break;
-  					case 3: // mb3
-    						if (brd==6 || brd==7) {
-							ThetaSL=true; 
-							brd-=6;
-						}
-    						else if (brd<5 && chip<32) 
-							PhiSL=true;
-    						break;
-  					case 4: // mb4-s, mb4_8
-    						if (brd<6 && chip<32) 
-							PhiSL=true;
-    						break;
-  					case 5: // mb4-9
-    						if (brd<3 && chip<32) 
-							PhiSL=true;
-    						break;
-  					case 6: // mb4-4
-    						if (brd<5 && chip<32) 
-							PhiSL=true;
-    						break;
-  					case 7: // mb4-10
-    						if (brd<4 && chip<32) 
-							PhiSL=true;
-    						break;
-  				}
- 				if (!PhiSL && !ThetaSL) {
-					cout << "MB type " << mbtype << endl; 
-					cout << "Board " << brd << " chip " <<chip << endl;
-					cout << "Not phi SL nor Theta SL" << endl; 
-					return -1; // Not PhiSL nor ThetaSL 
-				}	 
-					
-				// compute SL number and bti number
-				int isl = 0;
-				int ibti = 0;
-				if (PhiSL) {
-    					if ((chip%8)<4) 
-						isl=1; 	// Phi1 
-    					else 
-						isl=3; 	// Phi2 
-					ibti=brd*16+(int)(chip/8)*4+(chip%4); 
-				}
-			        else if (ThetaSL){
-    					isl=2; 		// Theta 
-					if ((chip%8)<4)
-      						ibti=brd*32+ chip-4*(int)(chip/8);
-    					else
-      						ibti=brd*32+ chip+12-4*(int)(chip/8);
-				}		 
-			
-				// BTI config constructor from strings	
-			        DTConfigBti bticonf(m_debugBti,buffer);
-                                 
-				dttpgConfig.setDTConfigBti(DTBtiId(chambid,isl,ibti+1),bticonf);
-			    	
-	      			if(m_debugDB)
-					cout << 	"Filling BTI config for chamber : wh " << chambid.wheel() << 
-		  					", st " << chambid.station() << 
-		  					", se " << chambid.sector() << 
-		  					"... sl " << isl << 
-		  					", bti " << ibti+1 << endl;				
-			}
-				
-			// TRACO configuration string 			
-			if (buffer[2]==0x15){
-				if(m_debugDB)
-					cout << "TRACO STRING found in DB" << endl;
-				// TRACO configuration read from OMDS
-				flagDBTraco = true;
-				
-				// TRACO config constructor from strings	
-			        int traco_brd = buffer[3]; 	// Board Nr.;
-  				int traco_chip = buffer[4]; 	// Chip Nr.;
-				int itraco = traco_brd * 4 + traco_chip + 1;
-				DTConfigTraco tracoconf(m_debugTraco,buffer);
-          			dttpgConfig.setDTConfigTraco(DTTracoId(chambid,itraco),tracoconf);
-				
-				if(m_debugDB)
-                			cout << 	"Filling TRACO config for chamber : wh " << chambid.wheel() <<
-                					", st " << chambid.station() <<
-                					", se " << chambid.sector() <<
-					                ", board " << traco_brd <<
-					                ", chip " << traco_chip <<
-                					", traco " << itraco << endl;	
-			}
-			
-			
-			// TSS configuration string	
-			if (buffer[2]==0x16){
-				if(m_debugDB)
-					cout << "TSS STRING found in DB" << endl;
-				// TSS configuration read from OMDS
-				flagDBTSS = true;
-				
-				unsigned short int itss=buffer[3];
-                  		for (int i=0;i<31;i++) 
-					tss_buffer[itss][i]=buffer[i];
-                  		ntss++;
-                	}
-			
-			// TSM configuration string
-                	if (buffer[2]==0x17){
-				if(m_debugDB)
-					cout << "TSM STRING found in DB" << endl;
-			 
-				// TSM configuration read from OMDS
-				flagDBTSM = true;			 
-			 
-                        	for (int i=0; i<9; i++) 
-					tsm_buffer[i]=buffer[i];
-                	} 
-			
-			// LUT configuration string
-			if (buffer[2]==0xA8){
-				if(m_debugDB)
-					cout << "LUT STRING found in DB" << endl;
-
-				// LUT parameters read from OMDS
-                                flagDBLUTS = true;
-				DTConfigLUTs lutconf(m_debugLUTs,buffer);
-				//lutconf.setDebug(m_debugLUTs);
-				dttpgConfig.setDTConfigLUTs(chambid,lutconf);
-			}
-			
-		}//end string iteration					
-      	}//end brick iteration
-	
- 	//TSS + TSM configurations are set in DTConfigTSPhi constructor
-	if(flagDBTSM && flagDBTSS) {
-	  DTConfigTSPhi tsphiconf(m_debugTSP,tss_buffer,ntss,tsm_buffer);
-	  dttpgConfig.setDTConfigTSPhi(chambid,tsphiconf);
-	}
-
- 	// get configuration for TSTheta, SC and TU from .cfg
-	edm::ParameterSet conf_ps = m_ps.getParameter<edm::ParameterSet>("DTTPGParameters");  
-	edm::ParameterSet tups = conf_ps.getParameter<edm::ParameterSet>("TUParameters");
-
-	// TSTheta configuration from .cfg
-	DTConfigTSTheta tsthetaconf(tups.getParameter<edm::ParameterSet>("TSThetaParameters"));
-	tsthetaconf.setDebug(m_debugTST);
-	dttpgConfig.setDTConfigTSTheta(chambid,tsthetaconf);
-
-	// SC configuration from .cfg
-	DTConfigSectColl sectcollconf(conf_ps.getParameter<edm::ParameterSet>("SectCollParameters"));
-	sectcollconf.setDebug(m_debugSC);
-	dttpgConfig.setDTConfigSectColl(DTSectCollId(chambid.wheel(),chambid.sector()),sectcollconf);
-
-	// TU configuration from .cfg
-  	DTConfigTrigUnit trigunitconf(tups);
-	trigunitconf.setDebug(m_debugTU);
-	dttpgConfig.setDTConfigTrigUnit(chambid,trigunitconf);
-       
-	++iter;
-	
-	// 110628 SV moved inside CCB loop to check for every chamber 
-	// moved to exception handling no attempt to configure from cfg is DB is missing
-	// SV comment exception handling and activate flag in DTConfigManager
-	if(!flagDBBti || !flagDBTraco || !flagDBTSS || !flagDBTSM ){
-	  return -1;
-	}
-	if(!flagDBLUTS && dttpgConfig.lutFromDB()==true){
-	  return -1;
-	} 
+    const DTCCBId &ccbId = iter->first;
+    if (m_debugDB)
+      cout << " Filling configuration for chamber : wh " << ccbId.wheelId
+           << " st " << ccbId.stationId << " se " << ccbId.sectorId << " -> "
+           << endl;
+
+    // get chamber type and id from ccbId
+    int mbtype =
+        DTPosNegType::getCT(ccbId.wheelId, ccbId.sectorId, ccbId.stationId);
+    int posneg =
+        DTPosNegType::getPN(ccbId.wheelId, ccbId.sectorId, ccbId.stationId);
+    if (m_debugDB)
+      cout << "Chamber type : " << mbtype << " posneg : " << posneg << endl;
+    DTChamberId chambid(ccbId.wheelId, ccbId.stationId, ccbId.sectorId);
+
+    // get brick identifiers list
+    const std::vector<int> &ccbConf = iter->second;
+    std::vector<int>::const_iterator cfgIter = ccbConf.begin();
+    std::vector<int>::const_iterator cfgIend = ccbConf.end();
+
+    // TSS-TSM buffers
+    unsigned short int tss_buffer[7][31];
+    unsigned short int tsm_buffer[9];
+    int ntss = 0;
+
+    // loop over configuration bricks
+    while (cfgIter != cfgIend) {
+      // get brick identifier
+      int id = *cfgIter++;
+      if (m_debugDB)
+        cout << " BRICK " << id << endl;
+
+      // create strings list
+      std::vector<std::string> list;
+      cfgCache.getData(keyRecord, id, list);
+
+      // loop over strings
+      std::vector<std::string>::const_iterator s_iter = list.begin();
+      std::vector<std::string>::const_iterator s_iend = list.end();
+      while (s_iter != s_iend) {
+        if (m_debugDB)
+          cout << "        ----> " << *s_iter << endl;
+
+        // copy string in unsigned int buffer
+        std::string str = *s_iter++;
+        unsigned short int buffer[100]; // 2 bytes
+        int c = 0;
+        const char *cstr = str.c_str();
+        const char *ptr = cstr + 2;
+        const char *end = cstr + str.length();
+        while (ptr < end) {
+          char c1 = *ptr++;
+          int i1 = 0;
+          if ((c1 >= '0') && (c1 <= '9'))
+            i1 = c1 - '0';
+          if ((c1 >= 'a') && (c1 <= 'f'))
+            i1 = 10 + c1 - 'a';
+          if ((c1 >= 'A') && (c1 <= 'F'))
+            i1 = 10 + c1 - 'A';
+          char c2 = *ptr++;
+          int i2 = 0;
+          if ((c2 >= '0') && (c2 <= '9'))
+            i2 = c2 - '0';
+          if ((c2 >= 'a') && (c2 <= 'f'))
+            i2 = 10 + c2 - 'a';
+          if ((c2 >= 'A') && (c2 <= 'F'))
+            i2 = 10 + c2 - 'A';
+          buffer[c] = (i1 * 16) + i2;
+          c++;
+        } // end loop over string
+
+        // BTI configuration string
+        if (buffer[2] == 0x54) {
+          if (m_debugDB)
+            cout << "BTI STRING found in DB" << endl;
+
+          // BTI configuration read for BTI
+          flagDBBti = true;
+
+          // compute sl and bti number from board and chip
+          int brd = buffer[3];  // Board Nr.
+          int chip = buffer[4]; // Chip Nr.
+
+          if (brd > 7) {
+            cout << "Not existing board ... " << brd << endl;
+            return -1; // Non-existing board
+          }
+          if (chip > 31) {
+            cout << "Not existing chip... " << chip << endl;
+            return -1; // Non existing chip
+          }
+
+          // Is it Phi or Theta board?
+          bool ThetaSL, PhiSL;
+          PhiSL = false;
+          ThetaSL = false;
+          switch (mbtype) {
+          case 1: // mb1
+            if (brd == 6 || brd == 7) {
+              ThetaSL = true;
+              brd -= 6;
+            } else if ((brd < 3 && chip < 32) || (brd == 3 && chip < 8))
+              PhiSL = true;
+            break;
+          case 2: // mb2
+            if (brd == 6 || brd == 7) {
+              ThetaSL = true;
+              brd -= 6;
+            } else if (brd < 4 && chip < 32)
+              PhiSL = true;
+            break;
+          case 3: // mb3
+            if (brd == 6 || brd == 7) {
+              ThetaSL = true;
+              brd -= 6;
+            } else if (brd < 5 && chip < 32)
+              PhiSL = true;
+            break;
+          case 4: // mb4-s, mb4_8
+            if (brd < 6 && chip < 32)
+              PhiSL = true;
+            break;
+          case 5: // mb4-9
+            if (brd < 3 && chip < 32)
+              PhiSL = true;
+            break;
+          case 6: // mb4-4
+            if (brd < 5 && chip < 32)
+              PhiSL = true;
+            break;
+          case 7: // mb4-10
+            if (brd < 4 && chip < 32)
+              PhiSL = true;
+            break;
+          }
+          if (!PhiSL && !ThetaSL) {
+            cout << "MB type " << mbtype << endl;
+            cout << "Board " << brd << " chip " << chip << endl;
+            cout << "Not phi SL nor Theta SL" << endl;
+            return -1; // Not PhiSL nor ThetaSL
+          }
+
+          // compute SL number and bti number
+          int isl = 0;
+          int ibti = 0;
+          if (PhiSL) {
+            if ((chip % 8) < 4)
+              isl = 1; // Phi1
+            else
+              isl = 3; // Phi2
+            ibti = brd * 16 + (int)(chip / 8) * 4 + (chip % 4);
+          } else if (ThetaSL) {
+            isl = 2; // Theta
+            if ((chip % 8) < 4)
+              ibti = brd * 32 + chip - 4 * (int)(chip / 8);
+            else
+              ibti = brd * 32 + chip + 12 - 4 * (int)(chip / 8);
+          }
+
+          // BTI config constructor from strings
+          DTConfigBti bticonf(m_debugBti, buffer);
+
+          dttpgConfig.setDTConfigBti(DTBtiId(chambid, isl, ibti + 1), bticonf);
+
+          if (m_debugDB)
+            cout << "Filling BTI config for chamber : wh " << chambid.wheel()
+                 << ", st " << chambid.station() << ", se " << chambid.sector()
+                 << "... sl " << isl << ", bti " << ibti + 1 << endl;
+        }
+
+        // TRACO configuration string
+        if (buffer[2] == 0x15) {
+          if (m_debugDB)
+            cout << "TRACO STRING found in DB" << endl;
+          // TRACO configuration read from OMDS
+          flagDBTraco = true;
+
+          // TRACO config constructor from strings
+          int traco_brd = buffer[3];  // Board Nr.;
+          int traco_chip = buffer[4]; // Chip Nr.;
+          int itraco = traco_brd * 4 + traco_chip + 1;
+          DTConfigTraco tracoconf(m_debugTraco, buffer);
+          dttpgConfig.setDTConfigTraco(DTTracoId(chambid, itraco), tracoconf);
+
+          if (m_debugDB)
+            cout << "Filling TRACO config for chamber : wh " << chambid.wheel()
+                 << ", st " << chambid.station() << ", se " << chambid.sector()
+                 << ", board " << traco_brd << ", chip " << traco_chip
+                 << ", traco " << itraco << endl;
+        }
+
+        // TSS configuration string
+        if (buffer[2] == 0x16) {
+          if (m_debugDB)
+            cout << "TSS STRING found in DB" << endl;
+          // TSS configuration read from OMDS
+          flagDBTSS = true;
+
+          unsigned short int itss = buffer[3];
+          for (int i = 0; i < 31; i++)
+            tss_buffer[itss][i] = buffer[i];
+          ntss++;
+        }
+
+        // TSM configuration string
+        if (buffer[2] == 0x17) {
+          if (m_debugDB)
+            cout << "TSM STRING found in DB" << endl;
+
+          // TSM configuration read from OMDS
+          flagDBTSM = true;
+
+          for (int i = 0; i < 9; i++)
+            tsm_buffer[i] = buffer[i];
+        }
+
+        // LUT configuration string
+        if (buffer[2] == 0xA8) {
+          if (m_debugDB)
+            cout << "LUT STRING found in DB" << endl;
+
+          // LUT parameters read from OMDS
+          flagDBLUTS = true;
+          DTConfigLUTs lutconf(m_debugLUTs, buffer);
+          // lutconf.setDebug(m_debugLUTs);
+          dttpgConfig.setDTConfigLUTs(chambid, lutconf);
+        }
+
+      } // end string iteration
+    }   // end brick iteration
+
+    // TSS + TSM configurations are set in DTConfigTSPhi constructor
+    if (flagDBTSM && flagDBTSS) {
+      DTConfigTSPhi tsphiconf(m_debugTSP, tss_buffer, ntss, tsm_buffer);
+      dttpgConfig.setDTConfigTSPhi(chambid, tsphiconf);
+    }
+
+    // get configuration for TSTheta, SC and TU from .cfg
+    edm::ParameterSet conf_ps =
+        m_ps.getParameter<edm::ParameterSet>("DTTPGParameters");
+    edm::ParameterSet tups =
+        conf_ps.getParameter<edm::ParameterSet>("TUParameters");
+
+    // TSTheta configuration from .cfg
+    DTConfigTSTheta tsthetaconf(
+        tups.getParameter<edm::ParameterSet>("TSThetaParameters"));
+    tsthetaconf.setDebug(m_debugTST);
+    dttpgConfig.setDTConfigTSTheta(chambid, tsthetaconf);
+
+    // SC configuration from .cfg
+    DTConfigSectColl sectcollconf(
+        conf_ps.getParameter<edm::ParameterSet>("SectCollParameters"));
+    sectcollconf.setDebug(m_debugSC);
+    dttpgConfig.setDTConfigSectColl(
+        DTSectCollId(chambid.wheel(), chambid.sector()), sectcollconf);
+
+    // TU configuration from .cfg
+    DTConfigTrigUnit trigunitconf(tups);
+    trigunitconf.setDebug(m_debugTU);
+    dttpgConfig.setDTConfigTrigUnit(chambid, trigunitconf);
+
+    ++iter;
+
+    // 110628 SV moved inside CCB loop to check for every chamber
+    // moved to exception handling no attempt to configure from cfg is DB is
+    // missing SV comment exception handling and activate flag in
+    // DTConfigManager
+    if (!flagDBBti || !flagDBTraco || !flagDBTSS || !flagDBTSM) {
+      return -1;
+    }
+    if (!flagDBLUTS && dttpgConfig.lutFromDB() == true) {
+      return -1;
+    }
   } // end loop over CCB
 
-  
   return 0;
 }
 
-std::string DTConfigDBProducer::mapEntryName(const DTChamberId & chambid) const
-{
+std::string DTConfigDBProducer::mapEntryName(const DTChamberId &chambid) const {
   int iwh = chambid.wheel();
   std::ostringstream os;
   os << "wh";
   if (iwh < 0) {
-     os << 'm' << -iwh;
-   } else {
-     os << iwh;
+    os << 'm' << -iwh;
+  } else {
+    os << iwh;
   }
   os << "st" << chambid.station() << "se" << chambid.sector();
   return os.str();
 }
 
-
-void DTConfigDBProducer::configFromCfg(DTConfigManager & dttpgConfig){
+void DTConfigDBProducer::configFromCfg(DTConfigManager &dttpgConfig) {
 
   // ... but still set CCB validity flag to let the emulator run
   dttpgConfig.setCCBConfigValidity(true);
 
-  //create config classes&C.
-  edm::ParameterSet conf_ps = m_ps.getParameter<edm::ParameterSet>("DTTPGParameters");
-  edm::ParameterSet conf_map = m_ps.getUntrackedParameter<edm::ParameterSet>("DTTPGMap");
+  // create config classes&C.
+  edm::ParameterSet conf_ps =
+      m_ps.getParameter<edm::ParameterSet>("DTTPGParameters");
+  edm::ParameterSet conf_map =
+      m_ps.getUntrackedParameter<edm::ParameterSet>("DTTPGMap");
   bool dttpgdebug = conf_ps.getUntrackedParameter<bool>("Debug");
-  DTConfigSectColl sectcollconf(conf_ps.getParameter<edm::ParameterSet>("SectCollParameters"));
-  edm::ParameterSet tups = conf_ps.getParameter<edm::ParameterSet>("TUParameters");
+  DTConfigSectColl sectcollconf(
+      conf_ps.getParameter<edm::ParameterSet>("SectCollParameters"));
+  edm::ParameterSet tups =
+      conf_ps.getParameter<edm::ParameterSet>("TUParameters");
   DTConfigBti bticonf(tups.getParameter<edm::ParameterSet>("BtiParameters"));
-  DTConfigTraco tracoconf(tups.getParameter<edm::ParameterSet>("TracoParameters"));
-  DTConfigTSTheta tsthetaconf(tups.getParameter<edm::ParameterSet>("TSThetaParameters"));
-  DTConfigTSPhi tsphiconf(tups.getParameter<edm::ParameterSet>("TSPhiParameters"));
+  DTConfigTraco tracoconf(
+      tups.getParameter<edm::ParameterSet>("TracoParameters"));
+  DTConfigTSTheta tsthetaconf(
+      tups.getParameter<edm::ParameterSet>("TSThetaParameters"));
+  DTConfigTSPhi tsphiconf(
+      tups.getParameter<edm::ParameterSet>("TSPhiParameters"));
   DTConfigTrigUnit trigunitconf(tups);
   DTConfigLUTs lutconf(tups.getParameter<edm::ParameterSet>("LutParameters"));
- 
- 
-  for (int iwh=-2;iwh<=2;++iwh){
-    for (int ist=1;ist<=4;++ist){
-      for (int ise=1;ise<=12;++ise){
-	DTChamberId chambid(iwh,ist,ise);
-	vector<int> nmap = conf_map.getUntrackedParameter<vector<int> >(mapEntryName(chambid).c_str());
-
-	if(dttpgdebug)
-	  {
-	    cout << " Filling configuration for chamber : wh " << chambid.wheel() << 
-	      ", st " << chambid.station() << 
-	      ", se " << chambid.sector() << endl;
-	  }
-	
-	//fill the bti map
-	if(!flagDBBti){
-		for (int isl=1;isl<=3;isl++){
-	  		int ncell = nmap[isl-1];
-	  		//	  cout << ncell <<" , ";
-	  		for (int ibti=0;ibti<ncell;ibti++){
-	      			dttpgConfig.setDTConfigBti(DTBtiId(chambid,isl,ibti+1),bticonf);
-	      			if(dttpgdebug)
-					cout << "Filling BTI config for chamber : wh " << chambid.wheel() << 
-		  				", st " << chambid.station() << 
-		  				", se " << chambid.sector() << 
-		  				"... sl " << isl << 
-		  				", bti " << ibti+1 << endl;
-	    		}     
-		}
-	}		
-	
-	// fill the traco map
-	if(!flagDBTraco){
-		int ntraco = nmap[3];
-		//cout << ntraco << " }" << endl;
-		for (int itraco=0;itraco<ntraco;itraco++){ 
-	    		dttpgConfig.setDTConfigTraco(DTTracoId(chambid,itraco+1),tracoconf);
-	    		if(dttpgdebug)
-	      			cout << "Filling TRACO config for chamber : wh " << chambid.wheel() << 
-					", st " << chambid.station() << 
-					", se " << chambid.sector() << 
-					", traco " << itraco+1 << endl;
-	  	}     
-	}
-	
-	// fill TS & TrigUnit
-	if(!flagDBTSS || !flagDBTSM)
-	{	
-		dttpgConfig.setDTConfigTSTheta(chambid,tsthetaconf);
-		dttpgConfig.setDTConfigTSPhi(chambid,tsphiconf);
-		dttpgConfig.setDTConfigTrigUnit(chambid,trigunitconf);
-	}
 
+  for (int iwh = -2; iwh <= 2; ++iwh) {
+    for (int ist = 1; ist <= 4; ++ist) {
+      for (int ise = 1; ise <= 12; ++ise) {
+        DTChamberId chambid(iwh, ist, ise);
+        vector<int> nmap = conf_map.getUntrackedParameter<vector<int>>(
+            mapEntryName(chambid).c_str());
+
+        if (dttpgdebug) {
+          cout << " Filling configuration for chamber : wh " << chambid.wheel()
+               << ", st " << chambid.station() << ", se " << chambid.sector()
+               << endl;
+        }
+
+        // fill the bti map
+        if (!flagDBBti) {
+          for (int isl = 1; isl <= 3; isl++) {
+            int ncell = nmap[isl - 1];
+            //	  cout << ncell <<" , ";
+            for (int ibti = 0; ibti < ncell; ibti++) {
+              dttpgConfig.setDTConfigBti(DTBtiId(chambid, isl, ibti + 1),
+                                         bticonf);
+              if (dttpgdebug)
+                cout << "Filling BTI config for chamber : wh "
+                     << chambid.wheel() << ", st " << chambid.station()
+                     << ", se " << chambid.sector() << "... sl " << isl
+                     << ", bti " << ibti + 1 << endl;
+            }
+          }
+        }
+
+        // fill the traco map
+        if (!flagDBTraco) {
+          int ntraco = nmap[3];
+          // cout << ntraco << " }" << endl;
+          for (int itraco = 0; itraco < ntraco; itraco++) {
+            dttpgConfig.setDTConfigTraco(DTTracoId(chambid, itraco + 1),
+                                         tracoconf);
+            if (dttpgdebug)
+              cout << "Filling TRACO config for chamber : wh "
+                   << chambid.wheel() << ", st " << chambid.station() << ", se "
+                   << chambid.sector() << ", traco " << itraco + 1 << endl;
+          }
+        }
+
+        // fill TS & TrigUnit
+        if (!flagDBTSS || !flagDBTSM) {
+          dttpgConfig.setDTConfigTSTheta(chambid, tsthetaconf);
+          dttpgConfig.setDTConfigTSPhi(chambid, tsphiconf);
+          dttpgConfig.setDTConfigTrigUnit(chambid, trigunitconf);
+        }
       }
     }
   }
 
-  for (int iwh=-2;iwh<=2;++iwh){
-    for (int ise=13;ise<=14;++ise){
-      int ist =4;
-      DTChamberId chambid(iwh,ist,ise);
-      vector<int> nmap = conf_map.getUntrackedParameter<vector<int> >(mapEntryName(chambid).c_str());
-
-      if(dttpgdebug)
-	{
-	  cout << " Filling configuration for chamber : wh " << chambid.wheel() << 
-	    ", st " << chambid.station() << 
-	    ", se " << chambid.sector() << endl;
-	}
-      
-      //fill the bti map
-      if(!flagDBBti){
-      		for (int isl=1;isl<=3;isl++){
-			int ncell = nmap[isl-1];
-			// 	cout << ncell <<" , ";
-			for (int ibti=0;ibti<ncell;ibti++){
-	    			dttpgConfig.setDTConfigBti(DTBtiId(chambid,isl,ibti+1),bticonf);
-	    			if(dttpgdebug)
-	      				cout << "Filling BTI config for chamber : wh " << chambid.wheel() << 
-						", st " << chambid.station() << 
-						", se " << chambid.sector() << 
-						"... sl " << isl << 
-						", bti " << ibti+1 << endl;
-	  		}     
-      		}
-      }	
-      
+  for (int iwh = -2; iwh <= 2; ++iwh) {
+    for (int ise = 13; ise <= 14; ++ise) {
+      int ist = 4;
+      DTChamberId chambid(iwh, ist, ise);
+      vector<int> nmap = conf_map.getUntrackedParameter<vector<int>>(
+          mapEntryName(chambid).c_str());
+
+      if (dttpgdebug) {
+        cout << " Filling configuration for chamber : wh " << chambid.wheel()
+             << ", st " << chambid.station() << ", se " << chambid.sector()
+             << endl;
+      }
+
+      // fill the bti map
+      if (!flagDBBti) {
+        for (int isl = 1; isl <= 3; isl++) {
+          int ncell = nmap[isl - 1];
+          // 	cout << ncell <<" , ";
+          for (int ibti = 0; ibti < ncell; ibti++) {
+            dttpgConfig.setDTConfigBti(DTBtiId(chambid, isl, ibti + 1),
+                                       bticonf);
+            if (dttpgdebug)
+              cout << "Filling BTI config for chamber : wh " << chambid.wheel()
+                   << ", st " << chambid.station() << ", se "
+                   << chambid.sector() << "... sl " << isl << ", bti "
+                   << ibti + 1 << endl;
+          }
+        }
+      }
+
       // fill the traco map
-      if(!flagDBTraco){
-      		int ntraco = nmap[3];	
-		//       cout << ntraco << " }" << endl;
-      		for (int itraco=0;itraco<ntraco;itraco++){ 
-	  		dttpgConfig.setDTConfigTraco(DTTracoId(chambid,itraco+1),tracoconf);
-	  		if(dttpgdebug)
-	    			cout << "Filling TRACO config for chamber : wh " << chambid.wheel() << 
-	      			", st " << chambid.station() << 
-	      			", se " << chambid.sector() << 
-	      			", traco " << itraco+1 << endl;
-		}     
+      if (!flagDBTraco) {
+        int ntraco = nmap[3];
+        //       cout << ntraco << " }" << endl;
+        for (int itraco = 0; itraco < ntraco; itraco++) {
+          dttpgConfig.setDTConfigTraco(DTTracoId(chambid, itraco + 1),
+                                       tracoconf);
+          if (dttpgdebug)
+            cout << "Filling TRACO config for chamber : wh " << chambid.wheel()
+                 << ", st " << chambid.station() << ", se " << chambid.sector()
+                 << ", traco " << itraco + 1 << endl;
+        }
       }
-      
+
       // fill TS & TrigUnit
-      if(!flagDBTSS || !flagDBTSM)
-      {
-      		dttpgConfig.setDTConfigTSTheta(chambid,tsthetaconf);
-      		dttpgConfig.setDTConfigTSPhi(chambid,tsphiconf);
-      		dttpgConfig.setDTConfigTrigUnit(chambid,trigunitconf);
+      if (!flagDBTSS || !flagDBTSM) {
+        dttpgConfig.setDTConfigTSTheta(chambid, tsthetaconf);
+        dttpgConfig.setDTConfigTSPhi(chambid, tsphiconf);
+        dttpgConfig.setDTConfigTrigUnit(chambid, trigunitconf);
       }
     }
   }
-  
-  //loop on Sector Collectors
-  for (int wh=-2;wh<=2;wh++)
-    for (int se=1;se<=12;se++)
-      dttpgConfig.setDTConfigSectColl(DTSectCollId(wh,se),sectcollconf);
-      
-  //fake collection of pedestals
-  dttpgConfig.setDTConfigPedestals(buildTrivialPedestals());
 
-  return;          
+  // loop on Sector Collectors
+  for (int wh = -2; wh <= 2; wh++)
+    for (int se = 1; se <= 12; se++)
+      dttpgConfig.setDTConfigSectColl(DTSectCollId(wh, se), sectcollconf);
+
+  // fake collection of pedestals
+  dttpgConfig.setDTConfigPedestals(buildTrivialPedestals());
 
+  return;
 }
 
-DTConfigPedestals DTConfigDBProducer::buildTrivialPedestals()
-{
-  DTTPGParameters* m_tpgParams = new DTTPGParameters();
+DTConfigPedestals DTConfigDBProducer::buildTrivialPedestals() {
+  DTTPGParameters *m_tpgParams = new DTTPGParameters();
 
   int counts = m_ps.getParameter<int>("bxOffset");
   float fine = m_ps.getParameter<double>("finePhase");
-   
-  if (m_debugPed) 
+
+  if (m_debugPed)
     cout << "DTConfigTrivialProducer::buildPedestals()" << endl;
 
-  //DTTPGParameters tpgParams;
-  for (int iwh=-2;iwh<=2;++iwh){
-    for (int ist=1;ist<=4;++ist){
-      for (int ise=1;ise<=14;++ise){
-	if (ise>12 && ist!=4) continue;
+  // DTTPGParameters tpgParams;
+  for (int iwh = -2; iwh <= 2; ++iwh) {
+    for (int ist = 1; ist <= 4; ++ist) {
+      for (int ise = 1; ise <= 14; ++ise) {
+        if (ise > 12 && ist != 4)
+          continue;
 
-	DTChamberId chId(iwh,ist,ise);
-	m_tpgParams->set(chId,counts,fine,DTTimeUnits::ns);
+        DTChamberId chId(iwh, ist, ise);
+        m_tpgParams->set(chId, counts, fine, DTTimeUnits::ns);
       }
     }
   }
@@ -773,9 +777,6 @@ DTConfigPedestals DTConfigDBProducer::buildTrivialPedestals()
   DTConfigPedestals tpgPedestals;
   tpgPedestals.setUseT0(false);
   tpgPedestals.setES(m_tpgParams);
- 
-  return tpgPedestals;
 
+  return tpgPedestals;
 }
-
-
diff --git a/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigDBProducer.h b/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigDBProducer.h
index 373b259082a04..c639120e271e5 100644
--- a/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigDBProducer.h
+++ b/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigDBProducer.h
@@ -5,8 +5,9 @@
 //
 // Package:     DTTPGConfigProducers
 // Class:       DTConfigDBProducer
-// 
-/**\class  DTConfigDBProducer  DTConfigDBProducer.h L1TriggerConfig/DTTPGConfigProducers/interface/DTConfigDBProducer.h
+//
+/**\class  DTConfigDBProducer  DTConfigDBProducer.h
+ L1TriggerConfig/DTTPGConfigProducers/interface/DTConfigDBProducer.h
 
  Description: A Producer for the DT config, data retrieved from DB
 
@@ -19,14 +20,13 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <vector>
 
 // user include files
-#include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -43,45 +43,45 @@
 // class declaration
 //
 
-class DTConfigDBProducer : public edm::ESProducer{
-
- public :
+class DTConfigDBProducer : public edm::ESProducer {
 
+public:
   //! Constructor
-  DTConfigDBProducer(const edm::ParameterSet&);
+  DTConfigDBProducer(const edm::ParameterSet &);
 
   //! Destructor
   ~DTConfigDBProducer() override;
-  
+
   //! ES produce method
-  std::unique_ptr<DTConfigManager> produce(const DTConfigManagerRcd&);
-  
- private :
+  std::unique_ptr<DTConfigManager> produce(const DTConfigManagerRcd &);
 
+private:
   //! Read DTTPG pedestal configuration
-  void readDBPedestalsConfig(const DTConfigManagerRcd& iRecord, DTConfigManager & dttpgConfig);
-  
+  void readDBPedestalsConfig(const DTConfigManagerRcd &iRecord,
+                             DTConfigManager &dttpgConfig);
+
   //! Read CCB string configuration
-  int readDTCCBConfig(const DTConfigManagerRcd& iRecord, DTConfigManager & dttpgConfig);
+  int readDTCCBConfig(const DTConfigManagerRcd &iRecord,
+                      DTConfigManager &dttpgConfig);
 
   //! SV for debugging purpose ONLY
-  void configFromCfg(DTConfigManager & dttpgConfig);
+  void configFromCfg(DTConfigManager &dttpgConfig);
 
   //! SV for debugging purpose ONLY
   DTConfigPedestals buildTrivialPedestals();
 
   //! 110629 SV function for CCB configuration check
-  int checkDTCCBConfig(DTConfigManager & dttpgConfig);
+  int checkDTCCBConfig(DTConfigManager &dttpgConfig);
 
-  std::string mapEntryName(const DTChamberId & chambid) const;
+  std::string mapEntryName(const DTChamberId &chambid) const;
 
   // ----------member data ---------------------------
   edm::ParameterSet m_ps;
-  
+
   // debug flags
-  bool m_debugDB; 
-  int  m_debugBti;
-  int  m_debugTraco;
+  bool m_debugDB;
+  int m_debugBti;
+  int m_debugTraco;
   bool m_debugTSP;
   bool m_debugTST;
   bool m_debugTU;
@@ -94,7 +94,7 @@ class DTConfigDBProducer : public edm::ESProducer{
 
   bool cfgConfig;
 
-  bool flagDBBti, flagDBTraco, flagDBTSS, flagDBTSM, flagDBLUTS;  
+  bool flagDBBti, flagDBTraco, flagDBTSS, flagDBTSM, flagDBLUTS;
 
   DTKeyedConfigCache cfgCache;
 };
diff --git a/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTester.cc b/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTester.cc
index 80b5c89bfc125..8c757874bce94 100644
--- a/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTester.cc
+++ b/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTester.cc
@@ -1,179 +1,182 @@
 #include "L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTester.h"
 
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 
 #include "L1TriggerConfig/DTTPGConfig/interface/DTConfigManager.h"
 #include "L1TriggerConfig/DTTPGConfig/interface/DTConfigManagerRcd.h"
 
-#include "DataFormats/MuonDetId/interface/DTChamberId.h"
 #include "DataFormats/MuonDetId/interface/DTBtiId.h"
-#include "DataFormats/MuonDetId/interface/DTTracoId.h"
+#include "DataFormats/MuonDetId/interface/DTChamberId.h"
 #include "DataFormats/MuonDetId/interface/DTSectCollId.h"
+#include "DataFormats/MuonDetId/interface/DTTracoId.h"
 
 using std::cout;
 using std::endl;
 
-DTConfigTester::DTConfigTester(const edm::ParameterSet& ps) {
+DTConfigTester::DTConfigTester(const edm::ParameterSet &ps) {
 
   cout << "DTConfigTester::DTConfigTester()" << endl;
 
-  my_wh    = ps.getUntrackedParameter<int>("wheel");
-  my_sec   = ps.getUntrackedParameter<int>("sector");
-  my_st    = ps.getUntrackedParameter<int>("station");
+  my_wh = ps.getUntrackedParameter<int>("wheel");
+  my_sec = ps.getUntrackedParameter<int>("sector");
+  my_st = ps.getUntrackedParameter<int>("station");
   my_traco = ps.getUntrackedParameter<int>("traco");
-  my_bti   = ps.getUntrackedParameter<int>("bti");
-  my_sl   = ps.getUntrackedParameter<int>("sl");
+  my_bti = ps.getUntrackedParameter<int>("bti");
+  my_sl = ps.getUntrackedParameter<int>("sl");
 }
 
 DTConfigTester::~DTConfigTester() {
 
-  //cout << "DTConfigTester::~DTConfigTester()" << endl;
-
+  // cout << "DTConfigTester::~DTConfigTester()" << endl;
 }
 
-void DTConfigTester::analyze(const edm::Event& e, const edm::EventSetup& es) {
-
-   cout << "DTConfigTester::analyze()" << endl;
-   cout << "\tRun number :" << e.id().run() << endl;
-   cout << "\tEvent number :" << e.id().event() << endl;
+void DTConfigTester::analyze(const edm::Event &e, const edm::EventSetup &es) {
 
-   using namespace edm;
+  cout << "DTConfigTester::analyze()" << endl;
+  cout << "\tRun number :" << e.id().run() << endl;
+  cout << "\tEvent number :" << e.id().event() << endl;
 
-   ESHandle< DTConfigManager > dtConfig ;
-   es.get< DTConfigManagerRcd >().get( dtConfig ) ;
+  using namespace edm;
+
+  ESHandle<DTConfigManager> dtConfig;
+  es.get<DTConfigManagerRcd>().get(dtConfig);
+
+  cout << "\tPrint configuration :" << endl;
+
+  DTBtiId btiid(my_wh, my_st, my_sec, my_sl, my_bti);
+  DTTracoId tracoid(my_wh, my_st, my_sec, my_traco);
+  DTChamberId chid(my_wh, my_st, my_sec);
+  DTSectCollId scid(my_wh, my_sec);
 
-   cout << "\tPrint configuration :" << endl;
+  dtConfig->getDTConfigBti(btiid)->print();
+  dtConfig->getDTConfigTraco(tracoid)->print();
+  dtConfig->getDTConfigTSTheta(chid)->print();
+  dtConfig->getDTConfigTSPhi(chid)->print();
+  dtConfig->getDTConfigTrigUnit(chid)->print();
+
+  if (dtConfig->lutFromDB())
+    dtConfig->getDTConfigLUTs(chid)->print();
+  else {
+    cout << "******************************************************************"
+            "*************"
+         << endl;
+    cout << "*              DTTrigger configuration : LUT parameters from "
+            "GEOMETRY         *"
+         << endl;
+    cout << "******************************************************************"
+            "*************"
+         << endl;
+  }
 
-   DTBtiId btiid(my_wh,my_st,my_sec,my_sl,my_bti);
-   DTTracoId tracoid(my_wh,my_st,my_sec,my_traco);
-   DTChamberId chid(my_wh,my_st,my_sec);
-   DTSectCollId scid(my_wh,my_sec);
+  dtConfig->getDTConfigSectColl(scid)->print();
+  dtConfig->getDTConfigPedestals()->print();
+
+  /*
+     // 100209 SV testing luts for each chamber type: keep in case lut from DB
+     debug is necessary DTChamberId chid1(-2,3,1); cout << "\n CHAMBER -2 3 1"
+     << endl; dtConfig->getDTConfigLUTs(chid1)->print();
 
-   dtConfig->getDTConfigBti(btiid)->print();
-   dtConfig->getDTConfigTraco(tracoid)->print();
-   dtConfig->getDTConfigTSTheta(chid)->print();
-   dtConfig->getDTConfigTSPhi(chid)->print();
-   dtConfig->getDTConfigTrigUnit(chid)->print();
+     DTChamberId chid2(0,2,2);
+     cout << "\n CHAMBER 0 2 2" << endl;
+     dtConfig->getDTConfigLUTs(chid2)->print();
+
+     DTChamberId chid3(-2,4,8);
+     cout << "\n CHAMBER -2 4 8" << endl;
+     dtConfig->getDTConfigLUTs(chid3)->print();
+
+     DTChamberId chid4(1,4,12);
+     cout << "\n CHAMBER 1 4 12" << endl;
+     dtConfig->getDTConfigLUTs(chid4)->print();
+
+     DTChamberId chid5(-2,4,5);
+     cout << "\n CHAMBER -2 4 5 " << endl;
+     dtConfig->getDTConfigLUTs(chid5)->print();
+
+     DTChamberId chid6(0,4,2);
+     cout << "\n CHAMBER 0 4 2" << endl;
+     dtConfig->getDTConfigLUTs(chid6)->print();
+
+     DTChamberId chid7(-2,4,9);
+     cout << "\n CHAMBER -2 4 9" << endl;
+     dtConfig->getDTConfigLUTs(chid7)->print();
+
+     DTChamberId chid8(0,4,11);
+     cout << "\n CHAMBER 0 4 11" << endl;
+     dtConfig->getDTConfigLUTs(chid8)->print();
+
+     DTChamberId chid9(-2,1,1);
+     cout << "\n CHAMBER -2 1 1" << endl;
+     dtConfig->getDTConfigLUTs(chid9)->print();
+
+     DTChamberId chid10(-2,4,13);
+     cout << "\n CHAMBER -2 4 13" << endl;
+     dtConfig->getDTConfigLUTs(chid10)->print();
+
+     DTChamberId chid11(1,4,4);
+     cout << "\n CHAMBER 1 4 4 " << endl;
+     dtConfig->getDTConfigLUTs(chid11)->print();
+
+     DTChamberId chid12(-2,4,14);
+     cout << "\n CHAMBER -2 4 14" << endl;
+     dtConfig->getDTConfigLUTs(chid12)->print();
+
+     DTChamberId chid13(0,4,10);
+     cout << "\n CHAMBER 0 4 10" << endl;
+     dtConfig->getDTConfigLUTs(chid13)->print();
+
+     DTChamberId chid14(-2,4,11);
+     cout << "\n CHAMBER -2 4 11" << endl;
+     dtConfig->getDTConfigLUTs(chid14)->print();
+
+     DTChamberId chid15(1,4,9);
+     cout << "\n CHAMBER 1 4 9" << endl;
+     dtConfig->getDTConfigLUTs(chid15)->print();
+
+     DTChamberId chid16(0,1,2);
+     cout << "\n CHAMBER 0 1 2 " << endl;
+     dtConfig->getDTConfigLUTs(chid16)->print();
+
+     DTChamberId chid17(-2,2,1);
+     cout << "\n CHAMBER -2 2 1" << endl;
+     dtConfig->getDTConfigLUTs(chid17)->print();
+
+     DTChamberId chid18(0,3,2);
+     cout << "\n CHAMBER 0 3 2 " << endl;
+     dtConfig->getDTConfigLUTs(chid18)->print();
+
+     DTChamberId chid19(-2,4,10);
+     cout << "\n CHAMBER 0 2 2" << endl;
+     dtConfig->getDTConfigLUTs(chid19)->print();
+
+     DTChamberId chid20(0,4,14);
+     cout << "\n CHAMBER 0 4 14" << endl;
+     dtConfig->getDTConfigLUTs(chid20)->print();
+
+     DTChamberId chid21(-2,4,12);
+     cout << "\n CHAMBER -2 4 12" << endl;
+     dtConfig->getDTConfigLUTs(chid21)->print();
+
+     DTChamberId chid22(1,4,8);
+     cout << "\n CHAMBER 1 4 8" << endl;
+     dtConfig->getDTConfigLUTs(chid22)->print();
+
+     DTChamberId chid23(-2,4,1);
+     cout << "\n CHAMBER -2 4 1" << endl;
+     dtConfig->getDTConfigLUTs(chid23)->print();
 
-   if(dtConfig->lutFromDB())
-     dtConfig->getDTConfigLUTs(chid)->print();
-   else {
-     cout << "*******************************************************************************" << endl;
-     cout << "*              DTTrigger configuration : LUT parameters from GEOMETRY         *" << endl;
-     cout << "*******************************************************************************" << endl;
-   }
+     DTChamberId chid24(0,4,6);
+     cout << "\n CHAMBER 0 4 6" << endl;
+     dtConfig->getDTConfigLUTs(chid24)->print();
 
-   dtConfig->getDTConfigSectColl(scid)->print();
-   dtConfig->getDTConfigPedestals()->print();
+     DTChamberId chid25(-2,4,4);
+     cout << "\n CHAMBER -2 4 4" << endl;
+     dtConfig->getDTConfigLUTs(chid25)->print();
 
-/*
-   // 100209 SV testing luts for each chamber type: keep in case lut from DB debug is necessary
-   DTChamberId chid1(-2,3,1);
-   cout << "\n CHAMBER -2 3 1" << endl;
-   dtConfig->getDTConfigLUTs(chid1)->print();
+     DTChamberId chid26(1,4,13);
+     cout << "\n CHAMBER 1 4 13 " << endl;
+     dtConfig->getDTConfigLUTs(chid26)->print();
 
-   DTChamberId chid2(0,2,2);
-   cout << "\n CHAMBER 0 2 2" << endl;
-   dtConfig->getDTConfigLUTs(chid2)->print();
-
-   DTChamberId chid3(-2,4,8);
-   cout << "\n CHAMBER -2 4 8" << endl;
-   dtConfig->getDTConfigLUTs(chid3)->print();
-
-   DTChamberId chid4(1,4,12);
-   cout << "\n CHAMBER 1 4 12" << endl;
-   dtConfig->getDTConfigLUTs(chid4)->print();
-
-   DTChamberId chid5(-2,4,5);
-   cout << "\n CHAMBER -2 4 5 " << endl;
-   dtConfig->getDTConfigLUTs(chid5)->print();
-
-   DTChamberId chid6(0,4,2);
-   cout << "\n CHAMBER 0 4 2" << endl;
-   dtConfig->getDTConfigLUTs(chid6)->print();
-
-   DTChamberId chid7(-2,4,9);
-   cout << "\n CHAMBER -2 4 9" << endl;
-   dtConfig->getDTConfigLUTs(chid7)->print();
-
-   DTChamberId chid8(0,4,11);
-   cout << "\n CHAMBER 0 4 11" << endl;
-   dtConfig->getDTConfigLUTs(chid8)->print();
-
-   DTChamberId chid9(-2,1,1);
-   cout << "\n CHAMBER -2 1 1" << endl;
-   dtConfig->getDTConfigLUTs(chid9)->print();
-
-   DTChamberId chid10(-2,4,13);
-   cout << "\n CHAMBER -2 4 13" << endl;
-   dtConfig->getDTConfigLUTs(chid10)->print();
-
-   DTChamberId chid11(1,4,4);
-   cout << "\n CHAMBER 1 4 4 " << endl;
-   dtConfig->getDTConfigLUTs(chid11)->print();
-
-   DTChamberId chid12(-2,4,14);
-   cout << "\n CHAMBER -2 4 14" << endl;
-   dtConfig->getDTConfigLUTs(chid12)->print();
-
-   DTChamberId chid13(0,4,10);
-   cout << "\n CHAMBER 0 4 10" << endl;
-   dtConfig->getDTConfigLUTs(chid13)->print();
-
-   DTChamberId chid14(-2,4,11);
-   cout << "\n CHAMBER -2 4 11" << endl;
-   dtConfig->getDTConfigLUTs(chid14)->print();
-
-   DTChamberId chid15(1,4,9);
-   cout << "\n CHAMBER 1 4 9" << endl;
-   dtConfig->getDTConfigLUTs(chid15)->print();
-
-   DTChamberId chid16(0,1,2);
-   cout << "\n CHAMBER 0 1 2 " << endl;
-   dtConfig->getDTConfigLUTs(chid16)->print();
-
-   DTChamberId chid17(-2,2,1);
-   cout << "\n CHAMBER -2 2 1" << endl;
-   dtConfig->getDTConfigLUTs(chid17)->print();
-
-   DTChamberId chid18(0,3,2);
-   cout << "\n CHAMBER 0 3 2 " << endl;
-   dtConfig->getDTConfigLUTs(chid18)->print();
-
-   DTChamberId chid19(-2,4,10);
-   cout << "\n CHAMBER 0 2 2" << endl;
-   dtConfig->getDTConfigLUTs(chid19)->print();
-
-   DTChamberId chid20(0,4,14);
-   cout << "\n CHAMBER 0 4 14" << endl;
-   dtConfig->getDTConfigLUTs(chid20)->print();
-
-   DTChamberId chid21(-2,4,12);
-   cout << "\n CHAMBER -2 4 12" << endl;
-   dtConfig->getDTConfigLUTs(chid21)->print();
-
-   DTChamberId chid22(1,4,8);
-   cout << "\n CHAMBER 1 4 8" << endl;
-   dtConfig->getDTConfigLUTs(chid22)->print();
-
-   DTChamberId chid23(-2,4,1);
-   cout << "\n CHAMBER -2 4 1" << endl;
-   dtConfig->getDTConfigLUTs(chid23)->print();
-
-   DTChamberId chid24(0,4,6);
-   cout << "\n CHAMBER 0 4 6" << endl;
-   dtConfig->getDTConfigLUTs(chid24)->print();
-
-   DTChamberId chid25(-2,4,4);
-   cout << "\n CHAMBER -2 4 4" << endl;
-   dtConfig->getDTConfigLUTs(chid25)->print();
-
-   DTChamberId chid26(1,4,13);
-   cout << "\n CHAMBER 1 4 13 " << endl;
-   dtConfig->getDTConfigLUTs(chid26)->print();
-   
-*/
-   return;
- 
+  */
+  return;
 }
diff --git a/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTester.h b/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTester.h
index f89c1b2ca6a4f..6f0899011bfec 100644
--- a/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTester.h
+++ b/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTester.h
@@ -2,8 +2,9 @@
 //
 // Package:    DTTPGConfigProducer
 // Class:      DTConfigTester
-// 
-/**\class  DTConfigTester DTConfigTester.h L1Trigger/DTConfigProducer/interface/DTConfigTester.h
+//
+/**\class  DTConfigTester DTConfigTester.h
+ L1Trigger/DTConfigProducer/interface/DTConfigTester.h
 
  Description: tester for DTConfig
 
@@ -13,36 +14,32 @@
 //
 // Original Author:  Sara Vanini
 //         Created:  Sat Mar 17 10:00 CEST 2007
-// $Id: 
+// $Id:
 //
 //
 
-
 // user include files
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-
 //
 // class decleration
 //
 
 class DTConfigTester : public edm::EDAnalyzer {
 
-public :
-
+public:
   //! Constructor
-  explicit DTConfigTester(const edm::ParameterSet&);
+  explicit DTConfigTester(const edm::ParameterSet &);
 
   //! Destructor
   ~DTConfigTester() override;
 
   // Analyze Method
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
 private:
-
   int my_wh;
   int my_sec;
   int my_st;
@@ -50,4 +47,3 @@ public :
   int my_bti;
   int my_sl;
 };
-
diff --git a/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTrivialProducer.cc b/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTrivialProducer.cc
index ceb71b07678fb..048b6154e7464 100644
--- a/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTrivialProducer.cc
+++ b/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTrivialProducer.cc
@@ -1,32 +1,32 @@
-#include "L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTrivialProducer.h"
 #include "DataFormats/MuonDetId/interface/DTChamberId.h"
-#include "DataFormats/MuonDetId/interface/DTSuperLayerId.h"
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
+#include "DataFormats/MuonDetId/interface/DTSuperLayerId.h"
+#include "L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTrivialProducer.h"
 #include <ostream>
 
 using std::cout;
 using std::endl;
-using std::vector;
 using std::unique_ptr;
+using std::vector;
 
 //
 // constructors and destructor
 //
-DTConfigTrivialProducer::DTConfigTrivialProducer(const edm::ParameterSet& ps)
-{
+DTConfigTrivialProducer::DTConfigTrivialProducer(const edm::ParameterSet &ps) {
 
   setWhatProduced(this);
-  
-  //get and store parameter set 
+
+  // get and store parameter set
   m_ps = ps;
   m_manager = new DTConfigManager();
   m_tpgParams = new DTTPGParameters();
 
   // set debug
-  edm::ParameterSet conf_ps = m_ps.getParameter<edm::ParameterSet>("DTTPGParameters");  
+  edm::ParameterSet conf_ps =
+      m_ps.getParameter<edm::ParameterSet>("DTTPGParameters");
   m_debug = conf_ps.getUntrackedParameter<bool>("Debug");
 
-  if (m_debug) 
+  if (m_debug)
     cout << "DTConfigTrivialProducer::DTConfigTrivialProducer()" << endl;
 
   m_manager->setDTTPGDebug(m_debug);
@@ -37,193 +37,191 @@ DTConfigTrivialProducer::DTConfigTrivialProducer(const edm::ParameterSet& ps)
 
   // set specific DB requests
   m_manager->setLutFromDB(tracoLutsFromDB);
-  m_manager->setUseAcceptParam(useBtiAcceptParam);  // CB Are these needed here???
+  m_manager->setUseAcceptParam(
+      useBtiAcceptParam); // CB Are these needed here???
 }
 
+DTConfigTrivialProducer::~DTConfigTrivialProducer() {
 
-DTConfigTrivialProducer::~DTConfigTrivialProducer()
-{
-
-  if (m_debug) 
+  if (m_debug)
     cout << "DTConfigTrivialProducer::~DTConfigTrivialProducer()" << endl;
- 
-
 }
 
-
 //
 // member functions
 //
 
-std::unique_ptr<DTConfigManager> DTConfigTrivialProducer::produce (const DTConfigManagerRcd& iRecord)
-{
+std::unique_ptr<DTConfigManager>
+DTConfigTrivialProducer::produce(const DTConfigManagerRcd &iRecord) {
 
-  if (m_debug) 
+  if (m_debug)
     cout << "DTConfigTrivialProducer::produce()" << endl;
 
-   using namespace edm::es;
-   buildManager();
-
-   //m_manager->getDTConfigPedestals()->print();
+  using namespace edm::es;
+  buildManager();
 
-   std::unique_ptr<DTConfigManager> dtConfig = std::unique_ptr<DTConfigManager>( m_manager );
+  // m_manager->getDTConfigPedestals()->print();
 
-   return dtConfig ;
+  std::unique_ptr<DTConfigManager> dtConfig =
+      std::unique_ptr<DTConfigManager>(m_manager);
 
+  return dtConfig;
 }
 
-void DTConfigTrivialProducer::buildManager()
-{
+void DTConfigTrivialProducer::buildManager() {
 
-  if (m_debug) 
+  if (m_debug)
     cout << "DTConfigTrivialProducer::buildManager()" << endl;
 
-  //create config classes&C.
-  edm::ParameterSet conf_ps = m_ps.getParameter<edm::ParameterSet>("DTTPGParameters");
-  edm::ParameterSet conf_map = m_ps.getUntrackedParameter<edm::ParameterSet>("DTTPGMap");
-  DTConfigSectColl sectcollconf(conf_ps.getParameter<edm::ParameterSet>("SectCollParameters"));
-  edm::ParameterSet tups = conf_ps.getParameter<edm::ParameterSet>("TUParameters");
+  // create config classes&C.
+  edm::ParameterSet conf_ps =
+      m_ps.getParameter<edm::ParameterSet>("DTTPGParameters");
+  edm::ParameterSet conf_map =
+      m_ps.getUntrackedParameter<edm::ParameterSet>("DTTPGMap");
+  DTConfigSectColl sectcollconf(
+      conf_ps.getParameter<edm::ParameterSet>("SectCollParameters"));
+  edm::ParameterSet tups =
+      conf_ps.getParameter<edm::ParameterSet>("TUParameters");
   DTConfigBti bticonf(tups.getParameter<edm::ParameterSet>("BtiParameters"));
-  DTConfigTraco tracoconf(tups.getParameter<edm::ParameterSet>("TracoParameters"));
+  DTConfigTraco tracoconf(
+      tups.getParameter<edm::ParameterSet>("TracoParameters"));
   DTConfigLUTs lutconf(tups.getParameter<edm::ParameterSet>("LutParameters"));
-  DTConfigTSTheta tsthetaconf(tups.getParameter<edm::ParameterSet>("TSThetaParameters"));
-  DTConfigTSPhi tsphiconf(tups.getParameter<edm::ParameterSet>("TSPhiParameters"));
+  DTConfigTSTheta tsthetaconf(
+      tups.getParameter<edm::ParameterSet>("TSThetaParameters"));
+  DTConfigTSPhi tsphiconf(
+      tups.getParameter<edm::ParameterSet>("TSPhiParameters"));
   DTConfigTrigUnit trigunitconf(tups);
-   
-  for (int iwh=-2;iwh<=2;++iwh){
-    for (int ist=1;ist<=4;++ist){
-      for (int ise=1;ise<=12;++ise){
-	DTChamberId chambid(iwh,ist,ise);
-	vector<int> nmap = conf_map.getUntrackedParameter<vector<int> >(mapEntryName(chambid).c_str());
-
-	if(m_debug)
-	  {
-	    std::cout << " Filling configuration for chamber : wh " << chambid.wheel() << 
-	      ", st " << chambid.station() << 
-	      ", se " << chambid.sector() << endl;
-	  }
-	
-	//fill the bti map
-	for (int isl=1;isl<=3;isl++){
-	  int ncell = nmap[isl-1];
-	  //	  std::cout << ncell <<" , ";
-	  for (int ibti=0;ibti<ncell;ibti++)
-	    {
-	      m_manager->setDTConfigBti(DTBtiId(chambid,isl,ibti+1),bticonf);
-	      if(m_debug)
-		std::cout << "Filling BTI config for chamber : wh " << chambid.wheel() << 
-		  ", st " << chambid.station() << 
-		  ", se " << chambid.sector() << 
-		  "... sl " << isl << 
-		  ", bti " << ibti+1 << endl;
-	    }     
-	}
-	
-	// fill the traco map
-	int ntraco = nmap[3];
-	//std::cout << ntraco << " }" << std::endl;
-	for (int itraco=0;itraco<ntraco;itraco++)
-	  { 
-	    m_manager->setDTConfigTraco(DTTracoId(chambid,itraco+1),tracoconf);
-	    if(m_debug)
-	      std::cout << "Filling TRACO config for chamber : wh " << chambid.wheel() << 
-		", st " << chambid.station() << 
-		", se " << chambid.sector() << 
-		", traco " << itraco+1 << endl;
-	  }     
-	
-	// fill TS & TrigUnit
-	m_manager->setDTConfigTSTheta(chambid,tsthetaconf);
-	m_manager->setDTConfigTSPhi(chambid,tsphiconf);
-	m_manager->setDTConfigTrigUnit(chambid,trigunitconf);
-	
-	// fill LUTs
-	m_manager->setDTConfigLUTs(chambid,lutconf);
-        m_manager->setLutFromDB(false);    // 110204 SV to be sure to compute luts from geometry         
+
+  for (int iwh = -2; iwh <= 2; ++iwh) {
+    for (int ist = 1; ist <= 4; ++ist) {
+      for (int ise = 1; ise <= 12; ++ise) {
+        DTChamberId chambid(iwh, ist, ise);
+        vector<int> nmap = conf_map.getUntrackedParameter<vector<int>>(
+            mapEntryName(chambid).c_str());
+
+        if (m_debug) {
+          std::cout << " Filling configuration for chamber : wh "
+                    << chambid.wheel() << ", st " << chambid.station()
+                    << ", se " << chambid.sector() << endl;
+        }
+
+        // fill the bti map
+        for (int isl = 1; isl <= 3; isl++) {
+          int ncell = nmap[isl - 1];
+          //	  std::cout << ncell <<" , ";
+          for (int ibti = 0; ibti < ncell; ibti++) {
+            m_manager->setDTConfigBti(DTBtiId(chambid, isl, ibti + 1), bticonf);
+            if (m_debug)
+              std::cout << "Filling BTI config for chamber : wh "
+                        << chambid.wheel() << ", st " << chambid.station()
+                        << ", se " << chambid.sector() << "... sl " << isl
+                        << ", bti " << ibti + 1 << endl;
+          }
+        }
+
+        // fill the traco map
+        int ntraco = nmap[3];
+        // std::cout << ntraco << " }" << std::endl;
+        for (int itraco = 0; itraco < ntraco; itraco++) {
+          m_manager->setDTConfigTraco(DTTracoId(chambid, itraco + 1),
+                                      tracoconf);
+          if (m_debug)
+            std::cout << "Filling TRACO config for chamber : wh "
+                      << chambid.wheel() << ", st " << chambid.station()
+                      << ", se " << chambid.sector() << ", traco " << itraco + 1
+                      << endl;
+        }
+
+        // fill TS & TrigUnit
+        m_manager->setDTConfigTSTheta(chambid, tsthetaconf);
+        m_manager->setDTConfigTSPhi(chambid, tsphiconf);
+        m_manager->setDTConfigTrigUnit(chambid, trigunitconf);
+
+        // fill LUTs
+        m_manager->setDTConfigLUTs(chambid, lutconf);
+        m_manager->setLutFromDB(
+            false); // 110204 SV to be sure to compute luts from geometry
       }
     }
   }
 
-  for (int iwh=-2;iwh<=2;++iwh){
-    for (int ise=13;ise<=14;++ise){
-      int ist =4;
-      DTChamberId chambid(iwh,ist,ise);
-      vector<int> nmap = conf_map.getUntrackedParameter<vector<int> >(mapEntryName(chambid).c_str());
-
-      if(m_debug)
-	{
-	  std::cout << " Filling configuration for chamber : wh " << chambid.wheel() << 
-	    ", st " << chambid.station() << 
-	    ", se " << chambid.sector() << endl;
-	}
-      
-      //fill the bti map
-      for (int isl=1;isl<=3;isl++){
-	int ncell = nmap[isl-1];
-// 	std::cout << ncell <<" , ";
-	for (int ibti=0;ibti<ncell;ibti++)
-	  {
-	    m_manager->setDTConfigBti(DTBtiId(chambid,isl,ibti+1),bticonf);
-	    if(m_debug)
-	      std::cout << "Filling BTI config for chamber : wh " << chambid.wheel() << 
-		", st " << chambid.station() << 
-		", se " << chambid.sector() << 
-		"... sl " << isl << 
-		", bti " << ibti+1 << endl;
-	  }     
+  for (int iwh = -2; iwh <= 2; ++iwh) {
+    for (int ise = 13; ise <= 14; ++ise) {
+      int ist = 4;
+      DTChamberId chambid(iwh, ist, ise);
+      vector<int> nmap = conf_map.getUntrackedParameter<vector<int>>(
+          mapEntryName(chambid).c_str());
+
+      if (m_debug) {
+        std::cout << " Filling configuration for chamber : wh "
+                  << chambid.wheel() << ", st " << chambid.station() << ", se "
+                  << chambid.sector() << endl;
       }
-      
+
+      // fill the bti map
+      for (int isl = 1; isl <= 3; isl++) {
+        int ncell = nmap[isl - 1];
+        // 	std::cout << ncell <<" , ";
+        for (int ibti = 0; ibti < ncell; ibti++) {
+          m_manager->setDTConfigBti(DTBtiId(chambid, isl, ibti + 1), bticonf);
+          if (m_debug)
+            std::cout << "Filling BTI config for chamber : wh "
+                      << chambid.wheel() << ", st " << chambid.station()
+                      << ", se " << chambid.sector() << "... sl " << isl
+                      << ", bti " << ibti + 1 << endl;
+        }
+      }
+
       // fill the traco map
       int ntraco = nmap[3];
-//       std::cout << ntraco << " }" << std::endl;
-      for (int itraco=0;itraco<ntraco;itraco++)
-	{ 
-	  m_manager->setDTConfigTraco(DTTracoId(chambid,itraco+1),tracoconf);
-	  if(m_debug)
-	    std::cout << "Filling TRACO config for chamber : wh " << chambid.wheel() << 
-	      ", st " << chambid.station() << 
-	      ", se " << chambid.sector() << 
-	      ", traco " << itraco+1 << endl;
-	}     
-      
+      //       std::cout << ntraco << " }" << std::endl;
+      for (int itraco = 0; itraco < ntraco; itraco++) {
+        m_manager->setDTConfigTraco(DTTracoId(chambid, itraco + 1), tracoconf);
+        if (m_debug)
+          std::cout << "Filling TRACO config for chamber : wh "
+                    << chambid.wheel() << ", st " << chambid.station()
+                    << ", se " << chambid.sector() << ", traco " << itraco + 1
+                    << endl;
+      }
+
       // fill TS & TrigUnit
-      m_manager->setDTConfigTSTheta(chambid,tsthetaconf);
-      m_manager->setDTConfigTSPhi(chambid,tsphiconf);
-      m_manager->setDTConfigTrigUnit(chambid,trigunitconf);
+      m_manager->setDTConfigTSTheta(chambid, tsthetaconf);
+      m_manager->setDTConfigTSPhi(chambid, tsphiconf);
+      m_manager->setDTConfigTrigUnit(chambid, trigunitconf);
 
       // fill LUTs
-      m_manager->setDTConfigLUTs(chambid,lutconf);
-      m_manager->setLutFromDB(false);    // 110204 SV to be sure to compute luts from geometry         
+      m_manager->setDTConfigLUTs(chambid, lutconf);
+      m_manager->setLutFromDB(
+          false); // 110204 SV to be sure to compute luts from geometry
     }
   }
-  
-  //loop on Sector Collectors
-  for (int wh=-2;wh<=2;wh++)
-    for (int se=1;se<=12;se++)
-      m_manager->setDTConfigSectColl(DTSectCollId(wh,se),sectcollconf);
 
-  //fake collection of pedestals
-  m_manager->setDTConfigPedestals(buildTrivialPedestals());
+  // loop on Sector Collectors
+  for (int wh = -2; wh <= 2; wh++)
+    for (int se = 1; se <= 12; se++)
+      m_manager->setDTConfigSectColl(DTSectCollId(wh, se), sectcollconf);
 
+  // fake collection of pedestals
+  m_manager->setDTConfigPedestals(buildTrivialPedestals());
 }
 
-DTConfigPedestals DTConfigTrivialProducer::buildTrivialPedestals()
-{
+DTConfigPedestals DTConfigTrivialProducer::buildTrivialPedestals() {
 
   int counts = m_ps.getParameter<int>("bxOffset");
   float fine = m_ps.getParameter<double>("finePhase");
-   
-  if (m_debug) 
+
+  if (m_debug)
     cout << "DTConfigTrivialProducer::buildPedestals()" << endl;
 
-  //DTTPGParameters tpgParams;
-  for (int iwh=-2;iwh<=2;++iwh){
-    for (int ist=1;ist<=4;++ist){
-      for (int ise=1;ise<=14;++ise){
-	if (ise>12 && ist!=4) continue;
+  // DTTPGParameters tpgParams;
+  for (int iwh = -2; iwh <= 2; ++iwh) {
+    for (int ist = 1; ist <= 4; ++ist) {
+      for (int ise = 1; ise <= 14; ++ise) {
+        if (ise > 12 && ist != 4)
+          continue;
 
-	DTChamberId chId(iwh,ist,ise);
-	m_tpgParams->set(chId,counts,fine,DTTimeUnits::ns);
+        DTChamberId chId(iwh, ist, ise);
+        m_tpgParams->set(chId, counts, fine, DTTimeUnits::ns);
       }
     }
   }
@@ -231,21 +229,19 @@ DTConfigPedestals DTConfigTrivialProducer::buildTrivialPedestals()
   DTConfigPedestals tpgPedestals;
   tpgPedestals.setUseT0(false);
   tpgPedestals.setES(m_tpgParams);
- 
-  return tpgPedestals;
 
+  return tpgPedestals;
 }
 
-
-std::string DTConfigTrivialProducer::mapEntryName(const DTChamberId & chambid) const
-{
+std::string
+DTConfigTrivialProducer::mapEntryName(const DTChamberId &chambid) const {
   int iwh = chambid.wheel();
   std::ostringstream os;
   os << "wh";
   if (iwh < 0) {
-     os << 'm' << -iwh;
-   } else {
-     os << iwh;
+    os << 'm' << -iwh;
+  } else {
+    os << iwh;
   }
   os << "st" << chambid.station() << "se" << chambid.sector();
   return os.str();
diff --git a/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTrivialProducer.h b/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTrivialProducer.h
index 1aed7ca583342..f80804707365b 100644
--- a/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTrivialProducer.h
+++ b/L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTrivialProducer.h
@@ -5,8 +5,9 @@
 //
 // Package:     DTTPGConfigProducers
 // Class:       DTConfigTrivialProducer
-// 
-/**\class  DTConfigTrivialProducer  DTConfigTrivialProducer.h L1TriggerConfig/DTTPGConfigProducers/interface/DTConfigTrivialProducer.h
+//
+/**\class  DTConfigTrivialProducer  DTConfigTrivialProducer.h
+ L1TriggerConfig/DTTPGConfigProducers/interface/DTConfigTrivialProducer.h
 
  Description: A Producer for the DT config available via EventSetup
 
@@ -19,14 +20,13 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <vector>
 
 // user include files
-#include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -40,31 +40,28 @@
 
 class DTConfigTrivialProducer : public edm::ESProducer {
 public:
-  
   //! Constructor
-  DTConfigTrivialProducer(const edm::ParameterSet&);
+  DTConfigTrivialProducer(const edm::ParameterSet &);
 
   //! destructor
   ~DTConfigTrivialProducer() override;
 
   //! ES produce method
-  std::unique_ptr<DTConfigManager> produce(const DTConfigManagerRcd&);
+  std::unique_ptr<DTConfigManager> produce(const DTConfigManagerRcd &);
 
 private:
-
   //! Build Config Manager
   void buildManager();
 
   //! Build Config Pedestals
   DTConfigPedestals buildTrivialPedestals();
 
-  std::string mapEntryName(const DTChamberId & chambid) const;
+  std::string mapEntryName(const DTChamberId &chambid) const;
 
   bool m_debug;
   edm::ParameterSet m_ps;
-  DTConfigManager* m_manager;
-  DTTPGParameters* m_tpgParams;
-
+  DTConfigManager *m_manager;
+  DTTPGParameters *m_tpgParams;
 };
 
 #endif
diff --git a/L1TriggerConfig/DTTPGConfigProducers/src/DTPosNegType.cc b/L1TriggerConfig/DTTPGConfigProducers/src/DTPosNegType.cc
index 809050ed64839..dcf7b75ef6a46 100644
--- a/L1TriggerConfig/DTTPGConfigProducers/src/DTPosNegType.cc
+++ b/L1TriggerConfig/DTTPGConfigProducers/src/DTPosNegType.cc
@@ -25,19 +25,17 @@
 // Initializations --
 //-------------------
 bool DTPosNegType::initRequest = true;
-std::map<int,int> DTPosNegType::geomMap;
+std::map<int, int> DTPosNegType::geomMap;
 
 //----------------
 // Constructors --
 //----------------
-DTPosNegType::DTPosNegType() {
-}
+DTPosNegType::DTPosNegType() {}
 
 //--------------
 // Destructor --
 //--------------
-DTPosNegType::~DTPosNegType() {
-}
+DTPosNegType::~DTPosNegType() {}
 
 //--------------
 // Operations --
@@ -52,360 +50,342 @@ DTPosNegCompare::operator()( const DTCCBId& idl,
 
 void DTPosNegType::dump() {
 
-  if ( initRequest ) fillMap();
-  std::map<int,int>::const_iterator iter = geomMap.begin();
-  std::map<int,int>::const_iterator iend = geomMap.end();
-  while ( iter != iend ) {
-    const std::pair<int,int>& entry = *iter++;
+  if (initRequest)
+    fillMap();
+  std::map<int, int>::const_iterator iter = geomMap.begin();
+  std::map<int, int>::const_iterator iend = geomMap.end();
+  while (iter != iend) {
+    const std::pair<int, int> &entry = *iter++;
     int cha = entry.first;
     int pnt = entry.second;
     int whe;
     int sec;
     int sta;
-    decode( cha, whe, sec, sta );
+    decode(cha, whe, sec, sta);
     int p_n;
     int c_t;
-    decode( pnt, p_n, c_t );
-    if ( whe >= 0 ) std::cout << " ";
+    decode(pnt, p_n, c_t);
+    if (whe >= 0)
+      std::cout << " ";
     std::cout << whe << " ";
-    if ( sec < 10 ) std::cout << " ";
-    std::cout << sec << " "
-              << sta << " "
-              << p_n << " "
-              << c_t << std::endl;
-    int pnc = getPN( whe, sec, sta );
-    int ctc = getCT( whe, sec, sta );
-    if ( ( pnc != p_n ) ||
-         ( ctc != c_t ) ) std::cout << "****************** "
-                                    << pnc << " " << ctc << std::endl;
+    if (sec < 10)
+      std::cout << " ";
+    std::cout << sec << " " << sta << " " << p_n << " " << c_t << std::endl;
+    int pnc = getPN(whe, sec, sta);
+    int ctc = getCT(whe, sec, sta);
+    if ((pnc != p_n) || (ctc != c_t))
+      std::cout << "****************** " << pnc << " " << ctc << std::endl;
   }
   return;
-
 }
 
-
-int DTPosNegType::getPN( int whe, int sec, int sta ) {
+int DTPosNegType::getPN(int whe, int sec, int sta) {
   int p_n;
   int c_t;
-  decode( getData( whe, sec, sta ), p_n, c_t );
+  decode(getData(whe, sec, sta), p_n, c_t);
   return p_n;
 }
 
-
-int DTPosNegType::getPN( const DTChamberId& cha ) {
-  return getPN( cha.wheel(),
-                cha.sector(),
-                cha.station() );
+int DTPosNegType::getPN(const DTChamberId &cha) {
+  return getPN(cha.wheel(), cha.sector(), cha.station());
 }
 
-
-int DTPosNegType::getCT( int whe, int sec, int sta ) {
+int DTPosNegType::getCT(int whe, int sec, int sta) {
   int p_n;
   int c_t;
-  decode( getData( whe, sec, sta ), p_n, c_t );
+  decode(getData(whe, sec, sta), p_n, c_t);
   return c_t;
 }
 
-
-int DTPosNegType::getCT( const DTChamberId& cha ) {
-  return getCT( cha.wheel(),
-                cha.sector(),
-                cha.station() );
+int DTPosNegType::getCT(const DTChamberId &cha) {
+  return getCT(cha.wheel(), cha.sector(), cha.station());
 }
 
-
 void DTPosNegType::fillMap() {
-  //std::cout << "DTPosNeg::fillMap()" << std::endl;
+  // std::cout << "DTPosNeg::fillMap()" << std::endl;
   geomMap.clear();
-//  DTChamberId().rawId() , 
-
-
-
-// ---
-  geomMap.insert( std::pair<int,int>( idCode( -2,  1, 1 ), pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  1, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  1, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  1, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  2, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  2, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  2, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  2, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  3, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  3, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  3, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  3, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  4, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  4, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  4, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  4, 4 ),  pnCode(      0, 6 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  5, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  5, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  5, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  5, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  6, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  6, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  6, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  6, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  7, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  7, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  7, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  7, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  8, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  8, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  8, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  8, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  9, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  9, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  9, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2,  9, 4 ),  pnCode(      0, 5 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2, 10, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2, 10, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2, 10, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2, 10, 4 ),  pnCode(      2, 7 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2, 11, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2, 11, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2, 11, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2, 11, 4 ),  pnCode(      0, 5 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2, 12, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2, 12, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2, 12, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2, 12, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2, 13, 4 ),  pnCode(      0, 6 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -2, 14, 4 ),  pnCode(      1, 7 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  1, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  1, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  1, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  1, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  2, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  2, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  2, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  2, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  3, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  3, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  3, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  3, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  4, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  4, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  4, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  4, 4 ),  pnCode(      0, 6 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  5, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  5, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  5, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  5, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  6, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  6, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  6, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  6, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  7, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  7, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  7, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  7, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  8, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  8, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  8, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  8, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  9, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  9, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  9, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1,  9, 4 ),  pnCode(      0, 5 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1, 10, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1, 10, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1, 10, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1, 10, 4 ),  pnCode(      2, 7 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1, 11, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1, 11, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1, 11, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1, 11, 4 ),  pnCode(      0, 5 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1, 12, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1, 12, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1, 12, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1, 12, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1, 13, 4 ),  pnCode(      0, 6 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode( -1, 14, 4 ),  pnCode(      1, 7 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  1, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  1, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  1, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  1, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  2, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  2, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  2, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  2, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  3, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  3, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  3, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  3, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  4, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  4, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  4, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  4, 4 ),  pnCode(      0, 6 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  5, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  5, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  5, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  5, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  6, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  6, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  6, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  6, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  7, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  7, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  7, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  7, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  8, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  8, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  8, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  8, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  9, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  9, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  9, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0,  9, 4 ),  pnCode(      0, 5 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0, 10, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0, 10, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0, 10, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0, 10, 4 ),  pnCode(      2, 7 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0, 11, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0, 11, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0, 11, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0, 11, 4 ),  pnCode(      0, 5 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0, 12, 1 ),  pnCode(      1, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0, 12, 2 ),  pnCode(      2, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0, 12, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0, 12, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0, 13, 4 ),  pnCode(      0, 6 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  0, 14, 4 ),  pnCode(      1, 7 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  1, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  1, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  1, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  1, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  2, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  2, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  2, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  2, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  3, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  3, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  3, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  3, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  4, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  4, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  4, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  4, 4 ),  pnCode(      0, 6 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  5, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  5, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  5, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  5, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  6, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  6, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  6, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  6, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  7, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  7, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  7, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  7, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  8, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  8, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  8, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  8, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  9, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  9, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  9, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1,  9, 4 ),  pnCode(      0, 5 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1, 10, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1, 10, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1, 10, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1, 10, 4 ),  pnCode(      2, 7 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1, 11, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1, 11, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1, 11, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1, 11, 4 ),  pnCode(      0, 5 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1, 12, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1, 12, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1, 12, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1, 12, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1, 13, 4 ),  pnCode(      0, 6 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  1, 14, 4 ),  pnCode(      1, 7 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  1, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  1, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  1, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  1, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  2, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  2, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  2, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  2, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  3, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  3, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  3, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  3, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  4, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  4, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  4, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  4, 4 ),  pnCode(      0, 6 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  5, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  5, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  5, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  5, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  6, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  6, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  6, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  6, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  7, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  7, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  7, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  7, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  8, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  8, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  8, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  8, 4 ),  pnCode(      2, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  9, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  9, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  9, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2,  9, 4 ),  pnCode(      0, 5 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2, 10, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2, 10, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2, 10, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2, 10, 4 ),  pnCode(      2, 7 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2, 11, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2, 11, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2, 11, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2, 11, 4 ),  pnCode(      0, 5 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2, 12, 1 ),  pnCode(      2, 1 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2, 12, 2 ),  pnCode(      1, 2 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2, 12, 3 ),  pnCode(      0, 3 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2, 12, 4 ),  pnCode(      1, 4 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2, 13, 4 ),  pnCode(      0, 6 ) ) );
-  geomMap.insert( std::pair<int,int>( idCode(  2, 14, 4 ),  pnCode(      1, 7 ) ) );
-//
+  //  DTChamberId().rawId() ,
+
+  // ---
+  geomMap.insert(std::pair<int, int>(idCode(-2, 1, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 1, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 1, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 1, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 2, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 2, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 2, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 2, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 3, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 3, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 3, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 3, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 4, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 4, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 4, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 4, 4), pnCode(0, 6)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 5, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 5, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 5, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 5, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 6, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 6, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 6, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 6, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 7, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 7, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 7, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 7, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 8, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 8, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 8, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 8, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 9, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 9, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 9, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 9, 4), pnCode(0, 5)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 10, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 10, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 10, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 10, 4), pnCode(2, 7)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 11, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 11, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 11, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 11, 4), pnCode(0, 5)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 12, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 12, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 12, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 12, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 13, 4), pnCode(0, 6)));
+  geomMap.insert(std::pair<int, int>(idCode(-2, 14, 4), pnCode(1, 7)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 1, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 1, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 1, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 1, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 2, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 2, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 2, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 2, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 3, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 3, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 3, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 3, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 4, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 4, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 4, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 4, 4), pnCode(0, 6)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 5, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 5, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 5, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 5, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 6, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 6, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 6, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 6, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 7, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 7, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 7, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 7, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 8, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 8, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 8, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 8, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 9, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 9, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 9, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 9, 4), pnCode(0, 5)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 10, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 10, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 10, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 10, 4), pnCode(2, 7)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 11, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 11, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 11, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 11, 4), pnCode(0, 5)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 12, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 12, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 12, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 12, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 13, 4), pnCode(0, 6)));
+  geomMap.insert(std::pair<int, int>(idCode(-1, 14, 4), pnCode(1, 7)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 1, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 1, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 1, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 1, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 2, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 2, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 2, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 2, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 3, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 3, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 3, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 3, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 4, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 4, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 4, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 4, 4), pnCode(0, 6)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 5, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 5, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 5, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 5, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 6, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 6, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 6, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 6, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 7, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 7, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 7, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 7, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 8, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 8, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 8, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 8, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 9, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 9, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 9, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 9, 4), pnCode(0, 5)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 10, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 10, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 10, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 10, 4), pnCode(2, 7)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 11, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 11, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 11, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 11, 4), pnCode(0, 5)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 12, 1), pnCode(1, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 12, 2), pnCode(2, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 12, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 12, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 13, 4), pnCode(0, 6)));
+  geomMap.insert(std::pair<int, int>(idCode(0, 14, 4), pnCode(1, 7)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 1, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 1, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 1, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 1, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 2, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 2, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 2, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 2, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 3, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 3, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 3, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 3, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 4, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 4, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 4, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 4, 4), pnCode(0, 6)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 5, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 5, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 5, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 5, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 6, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 6, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 6, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 6, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 7, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 7, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 7, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 7, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 8, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 8, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 8, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 8, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 9, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 9, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 9, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 9, 4), pnCode(0, 5)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 10, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 10, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 10, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 10, 4), pnCode(2, 7)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 11, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 11, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 11, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 11, 4), pnCode(0, 5)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 12, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 12, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 12, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 12, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 13, 4), pnCode(0, 6)));
+  geomMap.insert(std::pair<int, int>(idCode(1, 14, 4), pnCode(1, 7)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 1, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 1, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 1, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 1, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 2, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 2, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 2, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 2, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 3, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 3, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 3, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 3, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 4, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 4, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 4, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 4, 4), pnCode(0, 6)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 5, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 5, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 5, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 5, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 6, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 6, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 6, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 6, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 7, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 7, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 7, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 7, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 8, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 8, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 8, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 8, 4), pnCode(2, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 9, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 9, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 9, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 9, 4), pnCode(0, 5)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 10, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 10, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 10, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 10, 4), pnCode(2, 7)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 11, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 11, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 11, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 11, 4), pnCode(0, 5)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 12, 1), pnCode(2, 1)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 12, 2), pnCode(1, 2)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 12, 3), pnCode(0, 3)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 12, 4), pnCode(1, 4)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 13, 4), pnCode(0, 6)));
+  geomMap.insert(std::pair<int, int>(idCode(2, 14, 4), pnCode(1, 7)));
+  //
   initRequest = false;
 }
 
-
-int DTPosNegType::idCode( int whe, int sec, int sta ) {
-  return ( ( ( ( whe + 3 ) * 100 ) + sec ) * 10 ) + sta;
-}
-
-
-int DTPosNegType::pnCode( int p, int t ) {
-  return ( p * 1000 ) + t;
+int DTPosNegType::idCode(int whe, int sec, int sta) {
+  return ((((whe + 3) * 100) + sec) * 10) + sta;
 }
 
+int DTPosNegType::pnCode(int p, int t) { return (p * 1000) + t; }
 
-void DTPosNegType::decode( int code, int& whe, int& sec, int& sta ) {
-  whe = ( code / 1000 ) - 3;
-  sec = ( code /   10 ) % 100;
-  sta =   code          % 10;
+void DTPosNegType::decode(int code, int &whe, int &sec, int &sta) {
+  whe = (code / 1000) - 3;
+  sec = (code / 10) % 100;
+  sta = code % 10;
   return;
 }
 
-
-void DTPosNegType::decode( int code, int& p, int& t ) {
+void DTPosNegType::decode(int code, int &p, int &t) {
   p = code / 1000;
   t = code % 1000;
   return;
 }
 
-int DTPosNegType::getData( int whe, int sec, int sta ) {
-  if ( initRequest ) fillMap();
-  std::map<int,int>::const_iterator iter = geomMap.find( idCode( whe,                             sec,                             sta ) );
-  std::map<int,int>::const_iterator iend = geomMap.end();
-  if ( iter == iend ) return 999999;
+int DTPosNegType::getData(int whe, int sec, int sta) {
+  if (initRequest)
+    fillMap();
+  std::map<int, int>::const_iterator iter = geomMap.find(idCode(whe, sec, sta));
+  std::map<int, int>::const_iterator iend = geomMap.end();
+  if (iter == iend)
+    return 999999;
   return iter->second;
 }
-
diff --git a/L1TriggerConfig/DTTPGConfigProducers/src/DTPosNegType.h b/L1TriggerConfig/DTTPGConfigProducers/src/DTPosNegType.h
index 528551f7af741..23a2b37ef519b 100644
--- a/L1TriggerConfig/DTTPGConfigProducers/src/DTPosNegType.h
+++ b/L1TriggerConfig/DTTPGConfigProducers/src/DTPosNegType.h
@@ -2,7 +2,7 @@
 #define DTPosNegType_H
 /** \class DTPosNegType
  *
- *  Description: 
+ *  Description:
  *
  *
  *  \author Paolo Ronchese INFN Padova
@@ -13,7 +13,6 @@
 // Base Class Headers --
 //----------------------
 
-
 //------------------------------------
 // Collaborating Class Declarations --
 //------------------------------------
@@ -38,8 +37,7 @@ class DTPosNegCompare {
 
 class DTPosNegType {
 
- public:
-
+public:
   /** Constructor
    */
   DTPosNegType();
@@ -52,31 +50,22 @@ class DTPosNegType {
    */
   /// dump map
   static void dump();
-  static int getPN( int whe, int sec, int sta );
-  static int getPN( const DTChamberId& cha );
-  static int getCT( int whe, int sec, int sta );
-  static int getCT( const DTChamberId& cha );
-
- private:
+  static int getPN(int whe, int sec, int sta);
+  static int getPN(const DTChamberId &cha);
+  static int getCT(int whe, int sec, int sta);
+  static int getCT(const DTChamberId &cha);
 
+private:
   static bool initRequest;
-  static std::map<int,int> geomMap;
-//  static std::map<DTCCBId,int,DTPosNegCompare> geomMap;
+  static std::map<int, int> geomMap;
+  //  static std::map<DTCCBId,int,DTPosNegCompare> geomMap;
 
   static void fillMap();
-  static int idCode( int whe, int sec, int sta );
-  static int pnCode( int p, int t );
-  static void decode( int code, int& whe, int& sec, int& sta );
-  static void decode( int code, int& p, int& t );
-  static int getData( int whe, int sec, int sta );
-
+  static int idCode(int whe, int sec, int sta);
+  static int pnCode(int p, int t);
+  static void decode(int code, int &whe, int &sec, int &sta);
+  static void decode(int code, int &p, int &t);
+  static int getData(int whe, int sec, int sta);
 };
 
-
 #endif // DTPosNegType_H
-
-
-
-
-
-
diff --git a/L1TriggerConfig/DTTPGConfigProducers/src/SealModule.cc b/L1TriggerConfig/DTTPGConfigProducers/src/SealModule.cc
index 9de1b2920d868..8a0bb11cb92d2 100644
--- a/L1TriggerConfig/DTTPGConfigProducers/src/SealModule.cc
+++ b/L1TriggerConfig/DTTPGConfigProducers/src/SealModule.cc
@@ -1,11 +1,10 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/SourceFactory.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 
-#include "L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTrivialProducer.h"
 #include "L1TriggerConfig/DTTPGConfigProducers/src/DTConfigDBProducer.h"
 #include "L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTester.h"
-
+#include "L1TriggerConfig/DTTPGConfigProducers/src/DTConfigTrivialProducer.h"
 
 DEFINE_FWK_EVENTSETUP_MODULE(DTConfigTrivialProducer);
 DEFINE_FWK_EVENTSETUP_MODULE(DTConfigDBProducer);
diff --git a/L1TriggerConfig/L1GeometryProducers/interface/L1CaloGeometryProd.h b/L1TriggerConfig/L1GeometryProducers/interface/L1CaloGeometryProd.h
index 5934a8b4a74e1..27bd87176c75e 100644
--- a/L1TriggerConfig/L1GeometryProducers/interface/L1CaloGeometryProd.h
+++ b/L1TriggerConfig/L1GeometryProducers/interface/L1CaloGeometryProd.h
@@ -4,8 +4,9 @@
 //
 // Package:     L1GeometryProducers
 // Class  :     L1CaloGeometryProd
-// 
-/**\class L1CaloGeometryProd L1CaloGeometryProd.h L1TriggerConfig/L1GeometryProducers/interface/L1CaloGeometryProd.h
+//
+/**\class L1CaloGeometryProd L1CaloGeometryProd.h
+ L1TriggerConfig/L1GeometryProducers/interface/L1CaloGeometryProd.h
 
  Description: <one line class summary>
 
@@ -21,27 +22,27 @@
 // system include files
 
 // user include files
-#include "FWCore/Framework/interface/ModuleFactory.h"
-#include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/ModuleFactory.h"
 
-#include "CondFormats/L1TObjects/interface/L1CaloGeometry.h"
 #include "CondFormats/DataRecord/interface/L1CaloGeometryRecord.h"
+#include "CondFormats/L1TObjects/interface/L1CaloGeometry.h"
 
 // forward declarations
 
 class L1CaloGeometryProd : public edm::ESProducer {
-   public:
-      L1CaloGeometryProd(const edm::ParameterSet&);
-      ~L1CaloGeometryProd() override;
+public:
+  L1CaloGeometryProd(const edm::ParameterSet &);
+  ~L1CaloGeometryProd() override;
 
-      typedef std::unique_ptr<L1CaloGeometry> ReturnType;
+  typedef std::unique_ptr<L1CaloGeometry> ReturnType;
 
-      ReturnType produce(const L1CaloGeometryRecord&);
-   private:
-      // ----------member data ---------------------------
-      L1CaloGeometry m_geom ;
-};
+  ReturnType produce(const L1CaloGeometryRecord &);
 
+private:
+  // ----------member data ---------------------------
+  L1CaloGeometry m_geom;
+};
 
 #endif
diff --git a/L1TriggerConfig/L1GeometryProducers/src/L1CaloGeometryDump.cc b/L1TriggerConfig/L1GeometryProducers/src/L1CaloGeometryDump.cc
index 0528b4a02c2af..727bb489bf57f 100644
--- a/L1TriggerConfig/L1GeometryProducers/src/L1CaloGeometryDump.cc
+++ b/L1TriggerConfig/L1GeometryProducers/src/L1CaloGeometryDump.cc
@@ -2,8 +2,9 @@
 //
 // Package:    L1CaloGeometryDump
 // Class:      L1CaloGeometryDump
-// 
-/**\class L1CaloGeometryDump L1CaloGeometryDump.cc L1TriggerConfig/L1CaloGeometryDump/src/L1CaloGeometryDump.cc
+//
+/**\class L1CaloGeometryDump L1CaloGeometryDump.cc
+ L1TriggerConfig/L1CaloGeometryDump/src/L1CaloGeometryDump.cc
 
  Description: <one line class summary>
 
@@ -17,41 +18,39 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "CondFormats/L1TObjects/interface/L1CaloGeometry.h"
 #include "CondFormats/DataRecord/interface/L1CaloGeometryRecord.h"
+#include "CondFormats/L1TObjects/interface/L1CaloGeometry.h"
 
 //
 // class decleration
 //
 
 class L1CaloGeometryDump : public edm::EDAnalyzer {
-   public:
-      explicit L1CaloGeometryDump(const edm::ParameterSet&);
-      ~L1CaloGeometryDump() override;
-
+public:
+  explicit L1CaloGeometryDump(const edm::ParameterSet &);
+  ~L1CaloGeometryDump() override;
 
-   private:
-      void beginJob() override ;
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      void endJob() override ;
+private:
+  void beginJob() override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
 
-      // ----------member data ---------------------------
+  // ----------member data ---------------------------
 };
 
 //
@@ -65,50 +64,40 @@ class L1CaloGeometryDump : public edm::EDAnalyzer {
 //
 // constructors and destructor
 //
-L1CaloGeometryDump::L1CaloGeometryDump(const edm::ParameterSet& iConfig)
+L1CaloGeometryDump::L1CaloGeometryDump(const edm::ParameterSet &iConfig)
 
 {
-   //now do what ever initialization is needed
-
+  // now do what ever initialization is needed
 }
 
+L1CaloGeometryDump::~L1CaloGeometryDump() {
 
-L1CaloGeometryDump::~L1CaloGeometryDump()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-L1CaloGeometryDump::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace edm;
+void L1CaloGeometryDump::analyze(const edm::Event &iEvent,
+                                 const edm::EventSetup &iSetup) {
+  using namespace edm;
 
-   ESHandle< L1CaloGeometry > pGeom ;
-   iSetup.get< L1CaloGeometryRecord >().get( pGeom ) ;
+  ESHandle<L1CaloGeometry> pGeom;
+  iSetup.get<L1CaloGeometryRecord>().get(pGeom);
 
-   LogDebug( "L1CaloGeometryDump" ) << *pGeom << std::endl ;
+  LogDebug("L1CaloGeometryDump") << *pGeom << std::endl;
 }
 
+// ------------ method called once each job just before starting event loop
+// ------------
+void L1CaloGeometryDump::beginJob() {}
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-L1CaloGeometryDump::beginJob()
-{
-}
-
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-L1CaloGeometryDump::endJob() {
-}
+// ------------ method called once each job just after ending the event loop
+// ------------
+void L1CaloGeometryDump::endJob() {}
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(L1CaloGeometryDump);
diff --git a/L1TriggerConfig/L1GeometryProducers/src/L1CaloGeometryProd.cc b/L1TriggerConfig/L1GeometryProducers/src/L1CaloGeometryProd.cc
index 94ed3d6b873de..a1c1b0313bdd0 100644
--- a/L1TriggerConfig/L1GeometryProducers/src/L1CaloGeometryProd.cc
+++ b/L1TriggerConfig/L1GeometryProducers/src/L1CaloGeometryProd.cc
@@ -2,8 +2,9 @@
 //
 // Package:    L1GeometryProducers
 // Class:      L1CaloGeometryProd
-// 
-/**\class L1CaloGeometryProd L1CaloGeometryProd.h L1TriggerConfig/L1GeometryProducers/interface/L1CaloGeometryProd.h
+//
+/**\class L1CaloGeometryProd L1CaloGeometryProd.h
+ L1TriggerConfig/L1GeometryProducers/interface/L1CaloGeometryProd.h
 
  Description: <one line class summary>
 
@@ -16,14 +17,12 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
 // user include files
 #include "L1TriggerConfig/L1GeometryProducers/interface/L1CaloGeometryProd.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -35,55 +34,48 @@
 //
 // constructors and destructor
 //
-L1CaloGeometryProd::L1CaloGeometryProd(const edm::ParameterSet& ps)
-{
-   //the following line is needed to tell the framework what
-   // data is being produced
-   setWhatProduced(this);
-
-   //now do what ever other initialization is needed
-
-   // This producer should never make more than one version of L1Geometry,
-   // so we can initialize it in the ctor.
-   m_geom =
-     L1CaloGeometry( ps.getParameter<unsigned int>("numberGctEmJetPhiBins"),
-		     ps.getParameter<double>("gctEmJetPhiBinOffset"),
-		     ps.getParameter<unsigned int>("numberGctEtSumPhiBins"),
-		     ps.getParameter<double>("gctEtSumPhiBinOffset"),
-		     ps.getParameter<unsigned int>("numberGctHtSumPhiBins"),
-		     ps.getParameter<double>("gctHtSumPhiBinOffset"),
-		     ps.getParameter<unsigned int>("numberGctCentralEtaBinsPerHalf"),
-		     ps.getParameter<unsigned int>("numberGctForwardEtaBinsPerHalf"),
-		     ps.getParameter<unsigned int>("etaSignBitOffset"),
-		     ps.getParameter< std::vector<double> >("gctEtaBinBoundaries") ) ;
+L1CaloGeometryProd::L1CaloGeometryProd(const edm::ParameterSet &ps) {
+  // the following line is needed to tell the framework what
+  // data is being produced
+  setWhatProduced(this);
+
+  // now do what ever other initialization is needed
+
+  // This producer should never make more than one version of L1Geometry,
+  // so we can initialize it in the ctor.
+  m_geom = L1CaloGeometry(
+      ps.getParameter<unsigned int>("numberGctEmJetPhiBins"),
+      ps.getParameter<double>("gctEmJetPhiBinOffset"),
+      ps.getParameter<unsigned int>("numberGctEtSumPhiBins"),
+      ps.getParameter<double>("gctEtSumPhiBinOffset"),
+      ps.getParameter<unsigned int>("numberGctHtSumPhiBins"),
+      ps.getParameter<double>("gctHtSumPhiBinOffset"),
+      ps.getParameter<unsigned int>("numberGctCentralEtaBinsPerHalf"),
+      ps.getParameter<unsigned int>("numberGctForwardEtaBinsPerHalf"),
+      ps.getParameter<unsigned int>("etaSignBitOffset"),
+      ps.getParameter<std::vector<double>>("gctEtaBinBoundaries"));
 }
 
+L1CaloGeometryProd::~L1CaloGeometryProd() {
 
-L1CaloGeometryProd::~L1CaloGeometryProd()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
 L1CaloGeometryProd::ReturnType
-L1CaloGeometryProd::produce(const L1CaloGeometryRecord& iRecord)
-{
-   using namespace edm::es;
-   std::unique_ptr<L1CaloGeometry> pL1CaloGeometry ;
+L1CaloGeometryProd::produce(const L1CaloGeometryRecord &iRecord) {
+  using namespace edm::es;
+  std::unique_ptr<L1CaloGeometry> pL1CaloGeometry;
 
-   pL1CaloGeometry = std::unique_ptr< L1CaloGeometry >(
-      new L1CaloGeometry( m_geom ) ) ;
+  pL1CaloGeometry = std::unique_ptr<L1CaloGeometry>(new L1CaloGeometry(m_geom));
 
-   return pL1CaloGeometry ;
+  return pL1CaloGeometry;
 }
 
-//define this as a plug-in
-DEFINE_FWK_EVENTSETUP_MODULE(L1CaloGeometryProd) ;
+// define this as a plug-in
+DEFINE_FWK_EVENTSETUP_MODULE(L1CaloGeometryProd);
diff --git a/MagneticField/Interpolation/interface/MFGrid3D.h b/MagneticField/Interpolation/interface/MFGrid3D.h
deleted file mode 100644
index d1678660021be..0000000000000
--- a/MagneticField/Interpolation/interface/MFGrid3D.h
+++ /dev/null
@@ -1 +0,0 @@
-#error "HEAEDER moved in /MagneticField/Interpolation/src, please remove"
diff --git a/MagneticField/ParametrizedEngine/src/rz_harm_poly.cc b/MagneticField/ParametrizedEngine/src/rz_harm_poly.cc
index b2b1b267b6ae4..99ba61a65dd0a 100644
--- a/MagneticField/ParametrizedEngine/src/rz_harm_poly.cc
+++ b/MagneticField/ParametrizedEngine/src/rz_harm_poly.cc
@@ -74,10 +74,9 @@ int rz_harm_poly::GetMaxM()
 //Return max abs(M) for all rz_harm_poly objects created
 //
    int M_cur, M_max = 0;
-   std::set<poly2d_base*>::iterator it;
-   for (it = poly2d_base_set.begin(); it != poly2d_base_set.end(); ++it) {
-      if (typeid(**it) == typeid(rz_harm_poly)) {
-         M_cur = std::abs(((rz_harm_poly*)(*it))->M);
+   for (auto const& poly:  poly2d_base_set) {
+      if (typeid(*poly) == typeid(rz_harm_poly)) {
+         M_cur = std::abs(static_cast<rz_harm_poly const*>(poly)->M);
          if (M_cur > M_max) M_max = M_cur;
       }
    }
diff --git a/MagneticField/VolumeGeometry/interface/MagneticFieldVolume.h b/MagneticField/VolumeGeometry/interface/MagneticFieldVolume.h
deleted file mode 100644
index 0919ef0ecc81a..0000000000000
--- a/MagneticField/VolumeGeometry/interface/MagneticFieldVolume.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef MagneticFieldVolume_H
-#define MagneticFieldVolume_H
-
-class MagneticFieldVolume {
-public:
-
-  /** Position and rotation of field parametrisation reference frame
-   *  with respect to the global frame.
-   */
-  PositionType position() const;
-  RotationType rotation() const;
-
-  // toGlobal and toLocal available from base class...
-
-  /** Returns the field vector in the local frame, at local position p
-   */
-  LocalVector  valueInTesla( const LocalPoint& p) const;
-
-  /** Returns the field vector in the global frame, at global position p
-   */
-  GlobalVector valueInTesla( const GlobalPoint& p) const;
-
-  /** Returns the maximal order of available derivatives.
-   *  Returns 0 if derivatives are not available.
-   */
-  int hasDerivatives() const;
-
-  /** Returns the Nth spacial derivative of the field in the local frame.
-   */
-  LocalVector  derivativeInTeslaPerMeter( const LocalPoint& p, int N) const;
-
-
-};
-
-#endif
diff --git a/Mixing/Base/interface/PoissonPUGenerator.h b/Mixing/Base/interface/PoissonPUGenerator.h
deleted file mode 100644
index 141cbf2ed6536..0000000000000
--- a/Mixing/Base/interface/PoissonPUGenerator.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef POISSON_PU_GENERATOR_H
-#define POISSON_PU_GENERATOR_H
-
-#include "Mixing/Base/interface/PUGenerator.h"
-#include "CLHEP/Random/RandPoissonQ.h"
-
-/*----------------------------------------------------------------------
-
-----------------------------------------------------------------------*/
-
-namespace edm 
-{
-
-  class PoissonPUGenerator: public PUGenerator
-    {
-    public:
-      explicit PoissonPUGenerator(double av) :average(av){ }
-      ~PoissonPUGenerator() { }
-    
-    private:
-      virtual unsigned int numberOfEventsPerBunch() const {return CLHEP::RandPoissonQ::fire(average);}
-      double average;
-    };
-}//edm
-
-#endif 
diff --git a/Mixing/Base/src/PileUp.cc b/Mixing/Base/src/PileUp.cc
index bdc60a500b1ea..3f2aa67c4e87f 100644
--- a/Mixing/Base/src/PileUp.cc
+++ b/Mixing/Base/src/PileUp.cc
@@ -6,6 +6,7 @@
 #include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "FWCore/Framework/interface/Run.h"
 #include "FWCore/Framework/src/SignallingProductRegistry.h"
+#include "FWCore/Framework/interface/ESRecordsToProxyIndices.h"
 #include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"
 #include "FWCore/ServiceRegistry/interface/ProcessContext.h"
 #include "FWCore/Sources/interface/VectorInputSourceDescription.h"
@@ -180,7 +181,8 @@ namespace edm {
     streamContext_.reset(new StreamContext(iID, processContext_.get()));
     input_->doBeginJob();
     if (provider_.get() != nullptr) {
-      provider_->beginJob(*productRegistry_);
+      //TODO for now, we do not support consumes from EventSetup
+      provider_->beginJob(*productRegistry_, eventsetup::ESRecordsToProxyIndices{ {} });
       provider_->beginStream(iID, *streamContext_);
     }
   }
diff --git a/Mixing/Base/src/SecondaryEventProvider.cc b/Mixing/Base/src/SecondaryEventProvider.cc
index d84ece5904d6b..887720ea964bb 100644
--- a/Mixing/Base/src/SecondaryEventProvider.cc
+++ b/Mixing/Base/src/SecondaryEventProvider.cc
@@ -29,6 +29,11 @@ namespace edm {
     }
   } // SecondaryEventProvider::SecondaryEventProvider
 
+
+  void SecondaryEventProvider::beginJob(ProductRegistry const& iRegistry, eventsetup::ESRecordsToProxyIndices const& iIndices) {
+    workerManager_.beginJob(iRegistry, iIndices);
+  }
+
   //NOTE: When the Stream interfaces are propagated to the modules, this code must be updated
   // to also send the stream based transitions
   void SecondaryEventProvider::beginRun(RunPrincipal& run, const EventSetupImpl& setup, ModuleCallingContext const* mcc, StreamContext& sContext) {
diff --git a/Mixing/Base/src/SecondaryEventProvider.h b/Mixing/Base/src/SecondaryEventProvider.h
index 5730b6dbc1a4c..0ca37d96334a2 100644
--- a/Mixing/Base/src/SecondaryEventProvider.h
+++ b/Mixing/Base/src/SecondaryEventProvider.h
@@ -25,7 +25,7 @@ namespace edm {
 
     void setupPileUpEvent(EventPrincipal& ep, const EventSetupImpl& setup, StreamContext& sContext);
 
-    void beginJob(ProductRegistry const& iRegistry) {workerManager_.beginJob(iRegistry);}
+    void beginJob(ProductRegistry const& iRegistry, eventsetup::ESRecordsToProxyIndices const& );
     void endJob() {workerManager_.endJob();}
 
     void beginStream(edm::StreamID iID, StreamContext& sContext);
diff --git a/MuonAnalysis/MomentumScaleCalibration/test/Macros/RooFit/MultiHistoOverlapAll_Base.C b/MuonAnalysis/MomentumScaleCalibration/test/Macros/RooFit/MultiHistoOverlapAll_Base.C
index 44f0efed697c5..7ad03238bbe8b 100644
--- a/MuonAnalysis/MomentumScaleCalibration/test/Macros/RooFit/MultiHistoOverlapAll_Base.C
+++ b/MuonAnalysis/MomentumScaleCalibration/test/Macros/RooFit/MultiHistoOverlapAll_Base.C
@@ -201,6 +201,7 @@ struct Plot_1D{
     canvas->Update();
     canvas->SaveAs(Form("%s/%s%s", directory.Data(), plotname.Data(), ".png"));
     canvas->SaveAs(Form("%s/%s%s", directory.Data(), plotname.Data(), ".pdf"));
+    canvas->SaveAs(Form("%s/%s%s", directory.Data(), plotname.Data(), ".root"));
 
     for (unsigned int hf=0; hf<hfit.size(); hf++) delete hfit.at(hf);
     delete legend;
@@ -418,6 +419,7 @@ void MultiHistoOverlapAll_Base_one(string files, string labels, string colors, s
 	alignment_label.ReplaceAll(" ","_");
 	dummycanvas.SaveAs(Form("%s/%sc%s%s%s", directory.Data(),alignment_label.Data(),"_", plotname2D[s].Data(), ".png"));
 	dummycanvas.SaveAs(Form("%s/%sc%s%s%s", directory.Data(),alignment_label.Data(),"_", plotname2D[s].Data(), ".pdf"));
+	dummycanvas.SaveAs(Form("%s/%sc%s%s%s", directory.Data(),alignment_label.Data(),"_", plotname2D[s].Data(), ".root"));
       }
       
     }
diff --git a/MuonAnalysis/MuonAssociators/test/MuonMCClassifier/testClassByHitsTP_cfg.py b/MuonAnalysis/MuonAssociators/test/MuonMCClassifier/testClassByHitsTP_cfg.py
index 2cc46347ecbe8..b435c21af2842 100644
--- a/MuonAnalysis/MuonAssociators/test/MuonMCClassifier/testClassByHitsTP_cfg.py
+++ b/MuonAnalysis/MuonAssociators/test/MuonMCClassifier/testClassByHitsTP_cfg.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('MuonClassif',eras.Phase2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('MuonClassif',Phase2)
 
 process.load('Configuration.StandardSequences.Services_cff')
 process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi')
diff --git a/OnlineDB/SiStripO2O/plugins/SiStripPopConHandlerUnitTestGain.h b/OnlineDB/SiStripO2O/plugins/SiStripPopConHandlerUnitTestGain.h
index 7386f5706d632..dfc59bdcea807 100644
--- a/OnlineDB/SiStripO2O/plugins/SiStripPopConHandlerUnitTestGain.h
+++ b/OnlineDB/SiStripO2O/plugins/SiStripPopConHandlerUnitTestGain.h
@@ -193,7 +193,7 @@ namespace popcon{
 	  count++;
 	  //Generate Gains for det detid
 	  SiStripApvGain::InputVector inputApvGain;
-	  for(int apv=0; apv<it->second.nApvs; ++apv){
+	  for(int apv=0; apv<it->second.nApvs; ++(++apv)){
 	    
 	    float MeanTick = 555.;
 	    float RmsTick  = 55.;
@@ -210,7 +210,6 @@ namespace popcon{
 						   << std::endl; 	    
 	    inputApvGain.push_back(tick); //APV0
 	    inputApvGain.push_back(tick); //APV1
-	    apv++;
 	  }    
 	  
 	  
diff --git a/PhysicsTools/NanoAOD/python/nanoDQM_cff.py b/PhysicsTools/NanoAOD/python/nanoDQM_cff.py
index d5cf0f8b0eaa4..090d7469d35a3 100644
--- a/PhysicsTools/NanoAOD/python/nanoDQM_cff.py
+++ b/PhysicsTools/NanoAOD/python/nanoDQM_cff.py
@@ -5,7 +5,6 @@
 from PhysicsTools.NanoAOD.nanoDQM_tools_cff import *
 
 ## Modify plots accordingly to era
-from Configuration.StandardSequences.Eras import eras
 _vplots80X = nanoDQM.vplots.clone()
 # Tau plots
 _tauPlots80X = cms.VPSet()
@@ -18,7 +17,8 @@
 _tauPlots80X.append(Plot1D('rawMVAnewDM', 'rawMVAnewDM', 20, -1, 1, 'byIsolationMVArun2v1DBnewDMwLT raw output discriminator'))
 _tauPlots80X.append(Plot1D('rawMVAoldDMdR03', 'rawMVAoldDMdR03', 20, -1, 1, 'byIsolationMVArun2v1DBdR03oldDMwLT raw output discriminator'))
 _vplots80X.Tau.plots = _tauPlots80X
-eras.run2_miniAOD_80XLegacy.toModify(nanoDQM,
+from Configuration.Eras.Modifier_run2_miniAOD_80XLegacy_cff import run2_miniAOD_80XLegacy
+run2_miniAOD_80XLegacy.toModify(nanoDQM,
                                      vplots = _vplots80X
 )
 
@@ -28,7 +28,9 @@
     if plot.name.value().find("fiducial")>-1: continue
     _METFixEE2017_plots.append(plot)
 _METFixEE2017_DQMentry.plots = _METFixEE2017_plots
-for modifier in eras.run2_nanoAOD_94XMiniAODv1, eras.run2_nanoAOD_94XMiniAODv2:
+from Configuration.Eras.Modifier_run2_nanoAOD_94XMiniAODv1_cff import run2_nanoAOD_94XMiniAODv1
+from Configuration.Eras.Modifier_run2_nanoAOD_94XMiniAODv2_cff import run2_nanoAOD_94XMiniAODv2
+for modifier in run2_nanoAOD_94XMiniAODv1, run2_nanoAOD_94XMiniAODv2:
     modifier.toModify(nanoDQM.vplots, METFixEE2017 = _METFixEE2017_DQMentry)
 
 _Electron_plots_with_eCorr = copy.deepcopy(nanoDQM.vplots.Electron.plots)
@@ -61,16 +63,17 @@
 _Flag_plots_80x.append(Plot1D('BadGlobalMuon', 'BadGlobalMuon', 2, -0.5, 1.5, 'Bad muon flag'))
 _Flag_plots_80x.append(Plot1D('CloneGlobalMuon', 'CloneGlobalMuon', 2, -0.5, 1.5, 'Clone muon flag'))
 
-for modifier in eras.run2_nanoAOD_94XMiniAODv1, eras.run2_nanoAOD_94XMiniAODv2:
+for modifier in run2_nanoAOD_94XMiniAODv1, run2_nanoAOD_94XMiniAODv2:
     modifier.toModify(nanoDQM.vplots.Electron, plots = _Electron_plots_with_eCorr)
     modifier.toModify(nanoDQM.vplots.Photon, plots = _Photon_plots_with_eCorr)
-for modifier in eras.run2_miniAOD_80XLegacy, eras.run2_nanoAOD_94X2016:
+from Configuration.Eras.Modifier_run2_nanoAOD_94X2016_cff import run2_nanoAOD_94X2016
+for modifier in run2_miniAOD_80XLegacy, run2_nanoAOD_94X2016:
     modifier.toModify(nanoDQM.vplots.Electron, plots = _Electron_plots_with_eCorr_2016)
     modifier.toModify(nanoDQM.vplots.Photon, plots = _Photon_plots_with_eCorr_2016)
-eras.run2_miniAOD_80XLegacy.toModify(nanoDQM.vplots.FatJet, plots = _FatJet_plots_80x)
-eras.run2_miniAOD_80XLegacy.toModify(nanoDQM.vplots.Flag, plots = _Flag_plots_80x)
+run2_miniAOD_80XLegacy.toModify(nanoDQM.vplots.FatJet, plots = _FatJet_plots_80x)
+run2_miniAOD_80XLegacy.toModify(nanoDQM.vplots.Flag, plots = _Flag_plots_80x)
 
-eras.run2_miniAOD_80XLegacy.toModify(nanoDQM.vplots, IsoTrack = None)
+run2_miniAOD_80XLegacy.toModify(nanoDQM.vplots, IsoTrack = None)
 
 ## MC
 nanoDQMMC = nanoDQM.clone()
diff --git a/PhysicsTools/NanoAOD/python/taus_cff.py b/PhysicsTools/NanoAOD/python/taus_cff.py
index 56edb26f15717..fa387cdb94a60 100644
--- a/PhysicsTools/NanoAOD/python/taus_cff.py
+++ b/PhysicsTools/NanoAOD/python/taus_cff.py
@@ -15,11 +15,13 @@
     cut = cms.string("pt > 18 && tauID('decayModeFindingNewDMs') && (tauID('byLooseCombinedIsolationDeltaBetaCorr3Hits') || tauID('byVLooseIsolationMVArun2v1DBoldDMwLT2015') || tauID('byVLooseIsolationMVArun2v1DBnewDMwLT') || tauID('byVLooseIsolationMVArun2v1DBdR03oldDMwLT') || tauID('byVVLooseIsolationMVArun2v1DBoldDMwLT') || tauID('byVVLooseIsolationMVArun2v1DBoldDMwLT2017v2') || tauID('byVVLooseIsolationMVArun2v1DBnewDMwLT2017v2') || tauID('byVVLooseIsolationMVArun2v1DBdR03oldDMwLT2017v2'))")
 )
 
-for era in [eras.run2_nanoAOD_94XMiniAODv1,]:
+from Configuration.Eras.Modifier_run2_nanoAOD_94XMiniAODv1_cff import run2_nanoAOD_94XMiniAODv1
+for era in [run2_nanoAOD_94XMiniAODv1,]:
     era.toModify(finalTaus,
                  cut = cms.string("pt > 18 && tauID('decayModeFindingNewDMs') && (tauID('byLooseCombinedIsolationDeltaBetaCorr3Hits') || tauID('byVLooseIsolationMVArun2v1DBoldDMwLT') || tauID('byVLooseIsolationMVArun2v1DBnewDMwLT') || tauID('byVLooseIsolationMVArun2v1DBdR03oldDMwLT') || tauID('byVVLooseIsolationMVArun2v1DBoldDMwLT2017v1') || tauID('byVVLooseIsolationMVArun2v1DBoldDMwLT2017v2') || tauID('byVVLooseIsolationMVArun2v1DBnewDMwLT2017v2') || tauID('byVVLooseIsolationMVArun2v1DBdR03oldDMwLT2017v2'))")
     )
-eras.run2_miniAOD_80XLegacy.toModify(finalTaus,
+from Configuration.Eras.Modifier_run2_miniAOD_80XLegacy_cff import run2_miniAOD_80XLegacy
+run2_miniAOD_80XLegacy.toModify(finalTaus,
                                      src = cms.InputTag("slimmedTaus"),
                                      cut =  cms.string("pt > 18 && tauID('decayModeFindingNewDMs') && (tauID('byLooseCombinedIsolationDeltaBetaCorr3Hits') || tauID('byVLooseIsolationMVArun2v1DBoldDMwLT') || tauID('byVLooseIsolationMVArun2v1DBnewDMwLT') || tauID('byVLooseIsolationMVArun2v1DBdR03oldDMwLT'))")
     )
@@ -130,11 +132,11 @@ def _tauId7WPMask(pattern,doc):
 
 tauTable.variables=_variablesMiniV2
 
-for era in [eras.run2_nanoAOD_94XMiniAODv1,]:
+for era in [run2_nanoAOD_94XMiniAODv1,]:
     era.toModify(tauTable,
                  variables = _variablesMiniV1
     )
-eras.run2_miniAOD_80XLegacy.toModify(tauTable,
+run2_miniAOD_80XLegacy.toModify(tauTable,
                                      variables = _variables80X
 )
 tauGenJets.GenParticles = cms.InputTag("prunedGenParticles")
@@ -200,7 +202,7 @@ def _tauId7WPMask(pattern,doc):
 
 tauSequence = cms.Sequence(patTauMVAIDsSeq + finalTaus)
 _tauSequence80X =  cms.Sequence(finalTaus)
-eras.run2_miniAOD_80XLegacy.toReplaceWith(tauSequence,_tauSequence80X)
+run2_miniAOD_80XLegacy.toReplaceWith(tauSequence,_tauSequence80X)
 tauTables = cms.Sequence(tauTable)
 tauMC = cms.Sequence(tauGenJets + tauGenJetsSelectorAllHadrons + genVisTaus + genVisTauTable + tausMCMatchLepTauForTable + tausMCMatchHadTauForTable + tauMCTable)
 
diff --git a/PhysicsTools/NanoAOD/python/taus_updatedMVAIds_cff.py b/PhysicsTools/NanoAOD/python/taus_updatedMVAIds_cff.py
index 48417593d4ef8..99a9c0dbfbeeb 100644
--- a/PhysicsTools/NanoAOD/python/taus_updatedMVAIds_cff.py
+++ b/PhysicsTools/NanoAOD/python/taus_updatedMVAIds_cff.py
@@ -2,7 +2,6 @@
 
 ##################### Updated tau collection with MVA-based tau-Ids rerun #######
 # Used only in some eras
-from Configuration.StandardSequences.Eras import eras
 from RecoTauTag.Configuration.loadRecoTauTagMVAsFromPrepDB_cfi import *
 from RecoTauTag.RecoTau.PATTauDiscriminationByMVAIsolationRun2_cff import *
 
@@ -557,7 +556,8 @@
 
 _patTauMVAIDsSeqWith2017v1 = _patTauMVAIDsSeq2017v2.copy()
 _patTauMVAIDsSeqWith2017v1 += patTauDiscriminationByIsolationMVArun2v1DBoldDMwLT2017v1Seq
-for era in [eras.run2_nanoAOD_94XMiniAODv1,]:
+from Configuration.Eras.Modifier_run2_nanoAOD_94XMiniAODv1_cff import run2_nanoAOD_94XMiniAODv1
+for era in [run2_nanoAOD_94XMiniAODv1,]:
     era.toReplaceWith(patTauMVAIDsSeq,_patTauMVAIDsSeqWith2017v1)
 
 # embed new MVA tau-Ids into new tau collection
@@ -623,7 +623,7 @@
 )
 slimmedTausUpdated.tauIDSources=_tauIDSourcesWith2015
 
-for era in [eras.run2_nanoAOD_94XMiniAODv1,]:
+for era in [run2_nanoAOD_94XMiniAODv1,]:
     era.toModify(slimmedTausUpdated,
                  tauIDSources = _tauIDSourcesWith2017v1
     )
diff --git a/PhysicsTools/NanoAOD/test/nano_cfg.py b/PhysicsTools/NanoAOD/test/nano_cfg.py
index 0853f03ac7200..cf13fd70ed58b 100644
--- a/PhysicsTools/NanoAOD/test/nano_cfg.py
+++ b/PhysicsTools/NanoAOD/test/nano_cfg.py
@@ -1,6 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process('NANO',eras.Run2_2017,eras.run2_nanoAOD_92X)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+from Configuration.Eras.Modifier_run2_nanoAOD_92X_cff import run2_nanoAOD_92X
+process = cms.Process('NANO',Run2_2017,run2_nanoAOD_92X)
 
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
 
diff --git a/PhysicsTools/PatAlgos/interface/BaseIsolator.h b/PhysicsTools/PatAlgos/interface/BaseIsolator.h
index ad492e6aa4717..186ebfd35e8e1 100644
--- a/PhysicsTools/PatAlgos/interface/BaseIsolator.h
+++ b/PhysicsTools/PatAlgos/interface/BaseIsolator.h
@@ -6,6 +6,8 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 
+#include <atomic>
+
 namespace pat { namespace helper {
 class BaseIsolator {
     public:
@@ -34,7 +36,7 @@ class BaseIsolator {
         edm::InputTag input_;
         edm::EDGetTokenT<Isolation> inputToken_;
         float cut_;
-        mutable uint64_t try_, fail_;
+        mutable std::atomic<uint64_t> try_, fail_;
 }; // class BaseIsolator
 } } // namespaces
 
diff --git a/PhysicsTools/PatAlgos/interface/MuonMvaEstimator.h b/PhysicsTools/PatAlgos/interface/MuonMvaEstimator.h
index 042ed59858023..f75b12af2a629 100644
--- a/PhysicsTools/PatAlgos/interface/MuonMvaEstimator.h
+++ b/PhysicsTools/PatAlgos/interface/MuonMvaEstimator.h
@@ -34,6 +34,7 @@ namespace pat {
                      const reco::JetTagCollection& bTags,
                      float& jetPtRatio,
                      float& jetPtRel,
+		     float& miniIsoValue,
                      const reco::JetCorrector* correctorL1=nullptr,
                      const reco::JetCorrector* correctorL1L2L3Res=nullptr) const;
 
diff --git a/PhysicsTools/PatAlgos/plugins/PATMuonProducer.cc b/PhysicsTools/PatAlgos/plugins/PATMuonProducer.cc
index a20931dbdc374..2009bc3522322 100755
--- a/PhysicsTools/PatAlgos/plugins/PATMuonProducer.cc
+++ b/PhysicsTools/PatAlgos/plugins/PATMuonProducer.cc
@@ -62,8 +62,10 @@ PATMuonHeavyObjectCache::PATMuonHeavyObjectCache(const edm::ParameterSet& iConfi
 
   if (iConfig.getParameter<bool>("computeMuonMVA")) {
     edm::FileInPath mvaTrainingFile = iConfig.getParameter<edm::FileInPath>("mvaTrainingFile");
+    edm::FileInPath mvaLowPtTrainingFile = iConfig.getParameter<edm::FileInPath>("lowPtmvaTrainingFile");
     float mvaDrMax = iConfig.getParameter<double>("mvaDrMax");
     muonMvaEstimator_ = std::make_unique<MuonMvaEstimator>(mvaTrainingFile, mvaDrMax);
+    muonLowPtMvaEstimator_ = std::make_unique<MuonMvaEstimator>(mvaLowPtTrainingFile, mvaDrMax);
   }
 
   if (iConfig.getParameter<bool>("computeSoftMuonMVA")) {
@@ -156,6 +158,8 @@ PATMuonProducer::PATMuonProducer(const edm::ParameterSet & iConfig, PATMuonHeavy
 
   computePuppiCombinedIso_ = iConfig.getParameter<bool>("computePuppiCombinedIso");
 
+  effectiveAreaVec_ = iConfig.getParameter<std::vector<double> >("effectiveAreaVec");
+
   miniIsoParams_ = iConfig.getParameter<std::vector<double> >("miniIsoParams");
   if(computeMiniIso_ && miniIsoParams_.size() != 9){
       throw cms::Exception("ParameterError") << "miniIsoParams must have exactly 9 elements.\n";
@@ -605,11 +609,13 @@ void PATMuonProducer::produce(edm::Event & iEvent, const edm::EventSetup & iSetu
 	aMuon.setSimPdgId(msi.pdgId);
 	aMuon.setSimMotherPdgId(msi.motherPdgId);
 	aMuon.setSimBX(msi.tpBX);
+	aMuon.setSimTpEvent(msi.tpEvent);
 	aMuon.setSimProdRho(msi.vertex.Rho());
 	aMuon.setSimProdZ(msi.vertex.Z());
 	aMuon.setSimPt(msi.p4.pt());
 	aMuon.setSimEta(msi.p4.eta());
 	aMuon.setSimPhi(msi.p4.phi());
+	aMuon.setSimMatchQuality(msi.tpAssoQuality);
       }
       patMuons->push_back(aMuon);
     }
@@ -649,11 +655,11 @@ void PATMuonProducer::produce(edm::Event & iEvent, const edm::EventSetup & iSetu
       bool isRun2016BCDEF = (272728 <= iEvent.run() && iEvent.run() <= 278808);
       muon.setSelectors(muon::makeSelectorBitset(muon, pv, isRun2016BCDEF));
     }
-    double miniIsoValue = -1;
+    float miniIsoValue = -1;
     if (computeMiniIso_){
       // MiniIsolation working points
 
-      miniIsoValue = getRelMiniIsoPUCorrected(muon,*rho);
+      miniIsoValue = getRelMiniIsoPUCorrected(muon,*rho, effectiveAreaVec_);
 
       muon.setSelector(reco::Muon::MiniIsoLoose,     miniIsoValue<0.40);
       muon.setSelector(reco::Muon::MiniIsoMedium,    miniIsoValue<0.20);
@@ -673,23 +679,46 @@ void PATMuonProducer::produce(edm::Event & iEvent, const edm::EventSetup & iSetu
     float jetPtRatio = 0.0;
     float jetPtRel = 0.0;
     float mva = 0.0;
-    if (computeMuonMVA_ && primaryVertexIsValid){
-      if (mvaUseJec_)
+    float mva_lowpt = 0.0;
+    if (computeMuonMVA_ && primaryVertexIsValid && computeMiniIso_){
+      if (mvaUseJec_){
         mva = globalCache()->muonMvaEstimator()->computeMva(muon,
                                                             primaryVertex,
                                                             *(mvaBTagCollectionTag.product()),
                                                             jetPtRatio,
                                                             jetPtRel,
+							    miniIsoValue,
                                                             &*mvaL1Corrector,
-                                                            &*mvaL1L2L3ResCorrector);
-      else
+                                                            &*mvaL1L2L3ResCorrector
+							    );
+        mva_lowpt = globalCache()->muonLowPtMvaEstimator()->computeMva(muon,
+								       primaryVertex,
+								       *(mvaBTagCollectionTag.product()),
+								       jetPtRatio,
+								       jetPtRel,
+								       miniIsoValue,
+								       &*mvaL1Corrector,
+								       &*mvaL1L2L3ResCorrector
+								       );
+	
+      }
+      else{
 	mva = globalCache()->muonMvaEstimator()->computeMva(muon,
                                                             primaryVertex,
                                                             *(mvaBTagCollectionTag.product()),
                                                             jetPtRatio,
-                                                            jetPtRel);
+                                                            jetPtRel,
+							    miniIsoValue);
+	mva_lowpt = globalCache()->muonLowPtMvaEstimator()->computeMva(muon,
+								       primaryVertex,
+								       *(mvaBTagCollectionTag.product()),
+								       jetPtRatio,
+								       jetPtRel,
+								       miniIsoValue);
+      }
 
       muon.setMvaValue(mva);
+      muon.setLowPtMvaValue(mva_lowpt);
       muon.setJetPtRatio(jetPtRatio);
       muon.setJetPtRel(jetPtRel);
 
@@ -700,7 +729,7 @@ void PATMuonProducer::produce(edm::Event & iEvent, const edm::EventSetup & iSetu
 
       // MVA working points
       // https://twiki.cern.ch/twiki/bin/viewauth/CMS/LeptonMVA
-      double dB2D  = fabs(muon.dB(pat::Muon::BS2D));
+      double dB2D  = fabs(muon.dB(pat::Muon::PV2D));
       double dB3D  = fabs(muon.dB(pat::Muon::PV3D));
       double edB3D = fabs(muon.edB(pat::Muon::PV3D));
       double sip3D = edB3D>0?dB3D/edB3D:0.0; 
@@ -713,9 +742,16 @@ void PATMuonProducer::produce(edm::Event & iEvent, const edm::EventSetup & iSetu
 	muon.setSelector(reco::Muon::MvaLoose,  muon.mvaValue()>-0.60);
 	muon.setSelector(reco::Muon::MvaMedium, muon.mvaValue()>-0.20);
 	muon.setSelector(reco::Muon::MvaTight,  muon.mvaValue()> 0.15);
+	muon.setSelector(reco::Muon::MvaVTight,  muon.mvaValue()> 0.45);
+	muon.setSelector(reco::Muon::MvaVVTight,  muon.mvaValue()> 0.9);
+      }
+      if (muon.pt()>5 and muon.isLooseMuon() and
+	  sip3D<4 and dB2D < 0.5 and dz < 1){
+	muon.setSelector(reco::Muon::LowPtMvaLoose,  muon.lowptMvaValue()>-0.60);
+	muon.setSelector(reco::Muon::LowPtMvaMedium, muon.lowptMvaValue()>-0.20);
       }
     }
-
+    
     //SOFT MVA
     if (computeSoftMuonMVA_){
       float mva = globalCache()->softMuonMvaEstimator()->computeMva(muon);
@@ -819,13 +855,13 @@ void PATMuonProducer::setMuonMiniIso(Muon& aMuon, const PackedCandidateCollectio
   aMuon.setMiniPFIsolation(miniiso);
 }
 
-double PATMuonProducer::getRelMiniIsoPUCorrected(const pat::Muon& muon, float rho)
+double PATMuonProducer::getRelMiniIsoPUCorrected(const pat::Muon& muon, double rho, const std::vector<double> &area)
 {
-  float mindr(miniIsoParams_[0]);
-  float maxdr(miniIsoParams_[1]);
-  float kt_scale(miniIsoParams_[2]);
-  float drcut = pat::miniIsoDr(muon.p4(),mindr,maxdr,kt_scale);
-  return pat::muonRelMiniIsoPUCorrected(muon.miniPFIsolation(), muon.p4(), drcut, rho);
+  double mindr(miniIsoParams_[0]);
+  double maxdr(miniIsoParams_[1]);
+  double kt_scale(miniIsoParams_[2]);
+  double drcut = pat::miniIsoDr(muon.p4(),mindr,maxdr,kt_scale);
+  return pat::muonRelMiniIsoPUCorrected(muon.miniPFIsolation(), muon.p4(), drcut, rho, area);
 }
 
 
diff --git a/PhysicsTools/PatAlgos/plugins/PATMuonProducer.h b/PhysicsTools/PatAlgos/plugins/PATMuonProducer.h
index 5a0fb40832069..e00db127d5901 100644
--- a/PhysicsTools/PatAlgos/plugins/PATMuonProducer.h
+++ b/PhysicsTools/PatAlgos/plugins/PATMuonProducer.h
@@ -48,12 +48,16 @@ namespace pat {
     std::unique_ptr<const pat::MuonMvaEstimator> const& muonMvaEstimator() const {
       return muonMvaEstimator_;
     }
+    std::unique_ptr<const pat::MuonMvaEstimator> const& muonLowPtMvaEstimator() const {
+      return muonLowPtMvaEstimator_;
+    }
 
     std::unique_ptr<const pat::SoftMuonMvaEstimator> const& softMuonMvaEstimator() const {
       return softMuonMvaEstimator_;
     }
 
   private:
+    std::unique_ptr<const pat::MuonMvaEstimator> muonLowPtMvaEstimator_;
     std::unique_ptr<const pat::MuonMvaEstimator> muonMvaEstimator_;
     std::unique_ptr<const pat::SoftMuonMvaEstimator> softMuonMvaEstimator_;
   };
@@ -99,7 +103,7 @@ namespace pat {
     template<typename T> void readIsolationLabels( const edm::ParameterSet & iConfig, const char* psetName, IsolationLabels& labels, std::vector<edm::EDGetTokenT<edm::ValueMap<T> > > & tokens);
 
     void setMuonMiniIso(pat::Muon& aMuon, const pat::PackedCandidateCollection *pc);
-    double getRelMiniIsoPUCorrected(const pat::Muon& muon, float rho);
+    double getRelMiniIsoPUCorrected(const pat::Muon& muon,  double rho, const std::vector<double> &area);
 
     double puppiCombinedIsolation(const pat::Muon& muon, const pat::PackedCandidateCollection *pc);
     bool isNeutralHadron( long pdgid );
@@ -139,6 +143,7 @@ namespace pat {
     edm::EDGetTokenT<pat::PackedCandidateCollection > pcToken_;
     bool computeMiniIso_;
     bool computePuppiCombinedIso_;
+    std::vector<double> effectiveAreaVec_;
     std::vector<double> miniIsoParams_;
     double relMiniIsoPUCorrected_;
 
diff --git a/PhysicsTools/PatAlgos/plugins/PATPackedCandidateProducer.cc b/PhysicsTools/PatAlgos/plugins/PATPackedCandidateProducer.cc
index 499daebeef426..6e715ee2ffad7 100644
--- a/PhysicsTools/PatAlgos/plugins/PATPackedCandidateProducer.cc
+++ b/PhysicsTools/PatAlgos/plugins/PATPackedCandidateProducer.cc
@@ -1,411 +1,572 @@
 #include <string>
 
-
 #include "DataFormats/Candidate/interface/Candidate.h"
+#include "DataFormats/Common/interface/Association.h"
+#include "DataFormats/Common/interface/ValueMap.h"
+#include "DataFormats/Common/interface/View.h"
+#include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
+#include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
 #include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
+#include "DataFormats/PatCandidates/interface/HcalDepthEnergyFractions.h"
+#include "DataFormats/PatCandidates/interface/Jet.h"
+#include "DataFormats/PatCandidates/interface/PackedCandidate.h"
+#include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
-#include "DataFormats/PatCandidates/interface/PackedCandidate.h"
-#include "DataFormats/PatCandidates/interface/Jet.h"
-#include "DataFormats/Common/interface/Association.h"
-#include "FWCore/Framework/interface/global/EDProducer.h"
-#include "DataFormats/Common/interface/View.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
-#include "DataFormats/MuonReco/interface/Muon.h"
-#include "DataFormats/RecoCandidate/interface/RecoChargedCandidate.h"
+
 /*#include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
-#include "TrackingTools/GeomPropagators/interface/AnalyticalImpactPointExtrapolator.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
-#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 #include "RecoVertex/VertexPrimitives/interface/ConvertToFromReco.h"
+#include
+"TrackingTools/GeomPropagators/interface/AnalyticalImpactPointExtrapolator.h"
+#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 */
-//#define CRAZYSORT 
+//#define CRAZYSORT
 
 namespace pat {
-    ///conversion map from quality flags used in PV association and miniAOD one
-    const static int qualityMap[8]  = {1,0,1,1,4,4,5,6};
-
-    class PATPackedCandidateProducer : public edm::global::EDProducer<> {
-        public:
-            explicit PATPackedCandidateProducer(const edm::ParameterSet&);
-            ~PATPackedCandidateProducer() override;
-
-            void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
-
-            //sorting of cands to maximize the zlib compression
-            static bool candsOrdering(pat::PackedCandidate const& i, pat::PackedCandidate const& j) {
-	      if (std::abs(i.charge()) == std::abs(j.charge())) {
-		if(i.charge()!=0){
-		  if(i.hasTrackDetails() and ! j.hasTrackDetails() ) return true;
-		  if(! i.hasTrackDetails() and  j.hasTrackDetails() ) return false;
-		  if(i.covarianceSchema() >  j.covarianceSchema() ) return true;
-		  if(i.covarianceSchema() <  j.covarianceSchema() ) return false;
-                }
-                if(i.vertexRef() == j.vertexRef()) 
-                  return i.eta() > j.eta();
-                else 
-                  return i.vertexRef().key() < j.vertexRef().key();
-              }
-              return std::abs(i.charge()) > std::abs(j.charge());
-            }
-
-            template <typename T>
-            static std::vector<size_t> sort_indexes(const std::vector<T> &v ) {
-              std::vector<size_t> idx(v.size());
-              for (size_t i = 0; i != idx.size(); ++i) idx[i] = i;
-              std::sort(idx.begin(), idx.end(),[&v](size_t i1, size_t i2) { return candsOrdering(v[i1],v[i2]);});
-              return idx;
-            }
-
-        private: 
-            //if PuppiSrc && PuppiNoLepSrc are empty, usePuppi is false
-            //otherwise assumes that if they are set, you wanted to use puppi and will throw an exception
-            //if the puppis are not found
-            const bool usePuppi_;  
-            
-            const edm::EDGetTokenT<reco::PFCandidateCollection>    Cands_;
-            const edm::EDGetTokenT<reco::VertexCollection>         PVs_;
-            const edm::EDGetTokenT<edm::Association<reco::VertexCollection> > PVAsso_;
-            const edm::EDGetTokenT<edm::ValueMap<int> >            PVAssoQuality_;
-            const edm::EDGetTokenT<reco::VertexCollection>         PVOrigs_;
-            const edm::EDGetTokenT<reco::TrackCollection>          TKOrigs_;
-            const edm::EDGetTokenT< edm::ValueMap<float> >         PuppiWeight_;
-            const edm::EDGetTokenT< edm::ValueMap<float> >         PuppiWeightNoLep_;
-            const edm::EDGetTokenT<edm::ValueMap<reco::CandidatePtr> >    PuppiCandsMap_;
-            const edm::EDGetTokenT<std::vector< reco::PFCandidate >  >    PuppiCands_;
-            const edm::EDGetTokenT<std::vector< reco::PFCandidate >  >    PuppiCandsNoLep_;
-            std::vector< edm::EDGetTokenT<edm::View<reco::Candidate> > > SVWhiteLists_;
-            const bool storeChargedHadronIsolation_;
-            const edm::EDGetTokenT<edm::ValueMap<bool> >            ChargedHadronIsolation_;
-
-            const double minPtForChargedHadronProperties_;
-            const double minPtForTrackProperties_;
-            const int covarianceVersion_;
-            const std::vector<int> covariancePackingSchemas_;
-      
-            const bool storeTiming_;
-      
-            // for debugging
-            float calcDxy(float dx, float dy, float phi) const {
-                return - dx * std::sin(phi) + dy * std::cos(phi);
-            }
-            float calcDz(reco::Candidate::Point p, reco::Candidate::Point v, const reco::Candidate &c) const {
-                return p.Z()-v.Z() - ((p.X()-v.X()) * c.px() + (p.Y()-v.Y())*c.py()) * c.pz()/(c.pt()*c.pt());
-            }
-    };
-}
-
-pat::PATPackedCandidateProducer::PATPackedCandidateProducer(const edm::ParameterSet& iConfig) :
-  usePuppi_(!iConfig.getParameter<edm::InputTag>("PuppiSrc").encode().empty() || 
-	    !iConfig.getParameter<edm::InputTag>("PuppiNoLepSrc").encode().empty()),
-  Cands_(consumes<reco::PFCandidateCollection>(iConfig.getParameter<edm::InputTag>("inputCollection"))),
-  PVs_(consumes<reco::VertexCollection>(iConfig.getParameter<edm::InputTag>("inputVertices"))),
-  PVAsso_(consumes<edm::Association<reco::VertexCollection> >(iConfig.getParameter<edm::InputTag>("vertexAssociator"))),
-  PVAssoQuality_(consumes<edm::ValueMap<int> >(iConfig.getParameter<edm::InputTag>("vertexAssociator"))),
-  PVOrigs_(consumes<reco::VertexCollection>(iConfig.getParameter<edm::InputTag>("originalVertices"))),
-  TKOrigs_(consumes<reco::TrackCollection>(iConfig.getParameter<edm::InputTag>("originalTracks"))),
-  PuppiWeight_(usePuppi_ ? consumes<edm::ValueMap<float> >(iConfig.getParameter<edm::InputTag>("PuppiSrc")) : edm::EDGetTokenT< edm::ValueMap<float> >()),
-  PuppiWeightNoLep_(usePuppi_ ? consumes<edm::ValueMap<float> >(iConfig.getParameter<edm::InputTag>("PuppiNoLepSrc")) : edm::EDGetTokenT< edm::ValueMap<float> >()),
-  PuppiCandsMap_(usePuppi_ ? consumes<edm::ValueMap<reco::CandidatePtr> >(iConfig.getParameter<edm::InputTag>("PuppiSrc")) : edm::EDGetTokenT<edm::ValueMap<reco::CandidatePtr> >() ),
-  PuppiCands_(usePuppi_ ? consumes<std::vector< reco::PFCandidate > >(iConfig.getParameter<edm::InputTag>("PuppiSrc")) : edm::EDGetTokenT<std::vector< reco::PFCandidate > >() ),
-  PuppiCandsNoLep_(usePuppi_ ? consumes<std::vector< reco::PFCandidate > >(iConfig.getParameter<edm::InputTag>("PuppiNoLepSrc")) : edm::EDGetTokenT<std::vector< reco::PFCandidate > >()),
-  storeChargedHadronIsolation_(!iConfig.getParameter<edm::InputTag>("chargedHadronIsolation").encode().empty()),
-  ChargedHadronIsolation_(consumes<edm::ValueMap<bool> >(iConfig.getParameter<edm::InputTag>("chargedHadronIsolation"))),
-  minPtForChargedHadronProperties_(iConfig.getParameter<double>("minPtForChargedHadronProperties")),
-  minPtForTrackProperties_(iConfig.getParameter<double>("minPtForTrackProperties")),
-  covarianceVersion_(iConfig.getParameter<int >("covarianceVersion")),
-  covariancePackingSchemas_(iConfig.getParameter<std::vector<int> >("covariancePackingSchemas")),
-  storeTiming_(iConfig.getParameter<bool>("storeTiming"))  
-{
-  std::vector<edm::InputTag> sv_tags = iConfig.getParameter<std::vector<edm::InputTag> >("secondaryVerticesForWhiteList");
-  for(auto itag : sv_tags){
-    SVWhiteLists_.push_back(
-      consumes<edm::View< reco::Candidate > >(itag)
-      );
+/// conversion map from quality flags used in PV association and miniAOD one
+const static int qualityMap[8] = {1, 0, 1, 1, 4, 4, 5, 6};
+
+class PATPackedCandidateProducer : public edm::global::EDProducer<> {
+public:
+  explicit PATPackedCandidateProducer(const edm::ParameterSet &);
+  ~PATPackedCandidateProducer() override;
+
+  void produce(edm::StreamID, edm::Event &,
+               const edm::EventSetup &) const override;
+
+  // sorting of cands to maximize the zlib compression
+  static bool candsOrdering(pat::PackedCandidate const &i,
+                            pat::PackedCandidate const &j) {
+    if (std::abs(i.charge()) == std::abs(j.charge())) {
+      if (i.charge() != 0) {
+        if (i.hasTrackDetails() and !j.hasTrackDetails())
+          return true;
+        if (!i.hasTrackDetails() and j.hasTrackDetails())
+          return false;
+        if (i.covarianceSchema() > j.covarianceSchema())
+          return true;
+        if (i.covarianceSchema() < j.covarianceSchema())
+          return false;
+      }
+      if (i.vertexRef() == j.vertexRef())
+        return i.eta() > j.eta();
+      else
+        return i.vertexRef().key() < j.vertexRef().key();
+    }
+    return std::abs(i.charge()) > std::abs(j.charge());
   }
 
-  produces< std::vector<pat::PackedCandidate> > ();
-  produces< edm::Association<pat::PackedCandidateCollection> > ();
-  produces< edm::Association<reco::PFCandidateCollection> > ();
-}
-
-pat::PATPackedCandidateProducer::~PATPackedCandidateProducer() {}
+  template <typename T>
+  static std::vector<size_t> sort_indexes(const std::vector<T> &v) {
+    std::vector<size_t> idx(v.size());
+    for (size_t i = 0; i != idx.size(); ++i)
+      idx[i] = i;
+    std::sort(idx.begin(), idx.end(), [&v](size_t i1, size_t i2) {
+      return candsOrdering(v[i1], v[i2]);
+    });
+    return idx;
+  }
 
+private:
+  // if PuppiSrc && PuppiNoLepSrc are empty, usePuppi is false
+  // otherwise assumes that if they are set, you wanted to use puppi and will
+  // throw an exception if the puppis are not found
+  const bool usePuppi_;
+
+  const edm::EDGetTokenT<reco::PFCandidateCollection> Cands_;
+  const edm::EDGetTokenT<reco::VertexCollection> PVs_;
+  const edm::EDGetTokenT<edm::Association<reco::VertexCollection>> PVAsso_;
+  const edm::EDGetTokenT<edm::ValueMap<int>> PVAssoQuality_;
+  const edm::EDGetTokenT<reco::VertexCollection> PVOrigs_;
+  const edm::EDGetTokenT<reco::TrackCollection> TKOrigs_;
+  const edm::EDGetTokenT<edm::ValueMap<float>> PuppiWeight_;
+  const edm::EDGetTokenT<edm::ValueMap<float>> PuppiWeightNoLep_;
+  const edm::EDGetTokenT<edm::ValueMap<reco::CandidatePtr>> PuppiCandsMap_;
+  const edm::EDGetTokenT<std::vector<reco::PFCandidate>> PuppiCands_;
+  const edm::EDGetTokenT<std::vector<reco::PFCandidate>> PuppiCandsNoLep_;
+  std::vector<edm::EDGetTokenT<edm::View<reco::Candidate>>> SVWhiteLists_;
+  const bool storeChargedHadronIsolation_;
+  const edm::EDGetTokenT<edm::ValueMap<bool>> ChargedHadronIsolation_;
+
+  const double minPtForChargedHadronProperties_;
+  const double minPtForTrackProperties_;
+  const int covarianceVersion_;
+  const std::vector<int> covariancePackingSchemas_;
+
+  const std::vector<int> pfCandidateTypesForHcalDepth_;
+  const bool storeHcalDepthEndcapOnly_;
+
+  const bool storeTiming_;
+
+  // for debugging
+  float calcDxy(float dx, float dy, float phi) const {
+    return -dx * std::sin(phi) + dy * std::cos(phi);
+  }
+  float calcDz(reco::Candidate::Point p, reco::Candidate::Point v,
+               const reco::Candidate &c) const {
+    return p.Z() - v.Z() -
+           ((p.X() - v.X()) * c.px() + (p.Y() - v.Y()) * c.py()) * c.pz() /
+               (c.pt() * c.pt());
+  }
+};
+} // namespace pat
+
+pat::PATPackedCandidateProducer::PATPackedCandidateProducer(
+    const edm::ParameterSet &iConfig)
+    : usePuppi_(
+          !iConfig.getParameter<edm::InputTag>("PuppiSrc").encode().empty() ||
+          !iConfig.getParameter<edm::InputTag>("PuppiNoLepSrc")
+               .encode()
+               .empty()),
+      Cands_(consumes<reco::PFCandidateCollection>(
+          iConfig.getParameter<edm::InputTag>("inputCollection"))),
+      PVs_(consumes<reco::VertexCollection>(
+          iConfig.getParameter<edm::InputTag>("inputVertices"))),
+      PVAsso_(consumes<edm::Association<reco::VertexCollection>>(
+          iConfig.getParameter<edm::InputTag>("vertexAssociator"))),
+      PVAssoQuality_(consumes<edm::ValueMap<int>>(
+          iConfig.getParameter<edm::InputTag>("vertexAssociator"))),
+      PVOrigs_(consumes<reco::VertexCollection>(
+          iConfig.getParameter<edm::InputTag>("originalVertices"))),
+      TKOrigs_(consumes<reco::TrackCollection>(
+          iConfig.getParameter<edm::InputTag>("originalTracks"))),
+      PuppiWeight_(usePuppi_
+                       ? consumes<edm::ValueMap<float>>(
+                             iConfig.getParameter<edm::InputTag>("PuppiSrc"))
+                       : edm::EDGetTokenT<edm::ValueMap<float>>()),
+      PuppiWeightNoLep_(
+          usePuppi_ ? consumes<edm::ValueMap<float>>(
+                          iConfig.getParameter<edm::InputTag>("PuppiNoLepSrc"))
+                    : edm::EDGetTokenT<edm::ValueMap<float>>()),
+      PuppiCandsMap_(
+          usePuppi_ ? consumes<edm::ValueMap<reco::CandidatePtr>>(
+                          iConfig.getParameter<edm::InputTag>("PuppiSrc"))
+                    : edm::EDGetTokenT<edm::ValueMap<reco::CandidatePtr>>()),
+      PuppiCands_(usePuppi_
+                      ? consumes<std::vector<reco::PFCandidate>>(
+                            iConfig.getParameter<edm::InputTag>("PuppiSrc"))
+                      : edm::EDGetTokenT<std::vector<reco::PFCandidate>>()),
+      PuppiCandsNoLep_(
+          usePuppi_ ? consumes<std::vector<reco::PFCandidate>>(
+                          iConfig.getParameter<edm::InputTag>("PuppiNoLepSrc"))
+                    : edm::EDGetTokenT<std::vector<reco::PFCandidate>>()),
+      storeChargedHadronIsolation_(
+          !iConfig.getParameter<edm::InputTag>("chargedHadronIsolation")
+               .encode()
+               .empty()),
+      ChargedHadronIsolation_(consumes<edm::ValueMap<bool>>(
+          iConfig.getParameter<edm::InputTag>("chargedHadronIsolation"))),
+      minPtForChargedHadronProperties_(
+          iConfig.getParameter<double>("minPtForChargedHadronProperties")),
+      minPtForTrackProperties_(
+          iConfig.getParameter<double>("minPtForTrackProperties")),
+      covarianceVersion_(iConfig.getParameter<int>("covarianceVersion")),
+      covariancePackingSchemas_(
+          iConfig.getParameter<std::vector<int>>("covariancePackingSchemas")),
+      pfCandidateTypesForHcalDepth_(iConfig.getParameter<std::vector<int>>(
+          "pfCandidateTypesForHcalDepth")),
+      storeHcalDepthEndcapOnly_(
+          iConfig.getParameter<bool>("storeHcalDepthEndcapOnly")),
+      storeTiming_(iConfig.getParameter<bool>("storeTiming")) {
+  std::vector<edm::InputTag> sv_tags =
+      iConfig.getParameter<std::vector<edm::InputTag>>(
+          "secondaryVerticesForWhiteList");
+  for (auto itag : sv_tags) {
+    SVWhiteLists_.push_back(consumes<edm::View<reco::Candidate>>(itag));
+  }
 
+  produces<std::vector<pat::PackedCandidate>>();
+  produces<edm::Association<pat::PackedCandidateCollection>>();
+  produces<edm::Association<reco::PFCandidateCollection>>();
 
-void pat::PATPackedCandidateProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const {
+  if (not pfCandidateTypesForHcalDepth_.empty())
+    produces<edm::ValueMap<pat::HcalDepthEnergyFractions>>(
+        "hcalDepthEnergyFractions");
+}
 
-    edm::Handle<reco::PFCandidateCollection> cands;
-    iEvent.getByToken( Cands_, cands );
+pat::PATPackedCandidateProducer::~PATPackedCandidateProducer() {}
 
-    edm::Handle<edm::ValueMap<float> > puppiWeight;
-    edm::Handle<edm::ValueMap<reco::CandidatePtr> > puppiCandsMap;
-    edm::Handle<std::vector< reco::PFCandidate > > puppiCands;
-    edm::Handle<edm::ValueMap<float> > puppiWeightNoLep;
-    edm::Handle<std::vector< reco::PFCandidate > > puppiCandsNoLep;
-    std::vector<reco::CandidatePtr> puppiCandsNoLepPtrs;
-    if(usePuppi_){
-      iEvent.getByToken( PuppiWeight_, puppiWeight );
-      iEvent.getByToken( PuppiCandsMap_, puppiCandsMap );
-      iEvent.getByToken( PuppiCands_, puppiCands );
-      iEvent.getByToken( PuppiWeightNoLep_, puppiWeightNoLep );
-      iEvent.getByToken( PuppiCandsNoLep_, puppiCandsNoLep );  
-      for (auto pup : *puppiCandsNoLep){
-        puppiCandsNoLepPtrs.push_back(pup.sourceCandidatePtr(0));
+void pat::PATPackedCandidateProducer::produce(
+    edm::StreamID, edm::Event &iEvent, const edm::EventSetup &iSetup) const {
+  edm::Handle<reco::PFCandidateCollection> cands;
+  iEvent.getByToken(Cands_, cands);
+
+  edm::Handle<edm::ValueMap<float>> puppiWeight;
+  edm::Handle<edm::ValueMap<reco::CandidatePtr>> puppiCandsMap;
+  edm::Handle<std::vector<reco::PFCandidate>> puppiCands;
+  edm::Handle<edm::ValueMap<float>> puppiWeightNoLep;
+  edm::Handle<std::vector<reco::PFCandidate>> puppiCandsNoLep;
+  std::vector<reco::CandidatePtr> puppiCandsNoLepPtrs;
+  if (usePuppi_) {
+    iEvent.getByToken(PuppiWeight_, puppiWeight);
+    iEvent.getByToken(PuppiCandsMap_, puppiCandsMap);
+    iEvent.getByToken(PuppiCands_, puppiCands);
+    iEvent.getByToken(PuppiWeightNoLep_, puppiWeightNoLep);
+    iEvent.getByToken(PuppiCandsNoLep_, puppiCandsNoLep);
+    for (auto pup : *puppiCandsNoLep) {
+      puppiCandsNoLepPtrs.push_back(pup.sourceCandidatePtr(0));
+    }
+  }
+  std::vector<int> mappingPuppi(usePuppi_ ? puppiCands->size() : 0);
+
+  edm::Handle<reco::VertexCollection> PVOrigs;
+  iEvent.getByToken(PVOrigs_, PVOrigs);
+
+  edm::Handle<edm::Association<reco::VertexCollection>> assoHandle;
+  iEvent.getByToken(PVAsso_, assoHandle);
+  edm::Handle<edm::ValueMap<int>> assoQualityHandle;
+  iEvent.getByToken(PVAssoQuality_, assoQualityHandle);
+  const edm::Association<reco::VertexCollection> &associatedPV =
+      *(assoHandle.product());
+  const edm::ValueMap<int> &associationQuality = *(assoQualityHandle.product());
+
+  edm::Handle<edm::ValueMap<bool>> chargedHadronIsolationHandle;
+  if (storeChargedHadronIsolation_)
+    iEvent.getByToken(ChargedHadronIsolation_, chargedHadronIsolationHandle);
+
+  std::set<unsigned int> whiteList;
+  std::set<reco::TrackRef> whiteListTk;
+  for (auto itoken : SVWhiteLists_) {
+    edm::Handle<edm::View<reco::Candidate>> svWhiteListHandle;
+    iEvent.getByToken(itoken, svWhiteListHandle);
+    const edm::View<reco::Candidate> &svWhiteList =
+        *(svWhiteListHandle.product());
+    for (unsigned int i = 0; i < svWhiteList.size(); i++) {
+      // Whitelist via Ptrs
+      for (unsigned int j = 0; j < svWhiteList[i].numberOfSourceCandidatePtrs();
+           j++) {
+        const edm::Ptr<reco::Candidate> &c =
+            svWhiteList[i].sourceCandidatePtr(j);
+        if (c.id() == cands.id())
+          whiteList.insert(c.key());
       }
-    }  
-    std::vector<int> mappingPuppi(usePuppi_ ? puppiCands->size() : 0);
-
-    edm::Handle<reco::VertexCollection> PVOrigs;
-    iEvent.getByToken( PVOrigs_, PVOrigs );
-
-    edm::Handle<edm::Association<reco::VertexCollection> > assoHandle;
-    iEvent.getByToken(PVAsso_,assoHandle);
-    edm::Handle<edm::ValueMap<int> > assoQualityHandle;
-    iEvent.getByToken(PVAssoQuality_,assoQualityHandle);
-    const edm::Association<reco::VertexCollection> &  associatedPV=*(assoHandle.product());
-    const edm::ValueMap<int>  &  associationQuality=*(assoQualityHandle.product());
-           
-    edm::Handle<edm::ValueMap<bool> > chargedHadronIsolationHandle;
-    if(storeChargedHadronIsolation_)
-      iEvent.getByToken(ChargedHadronIsolation_,chargedHadronIsolationHandle);
-
-    std::set<unsigned int> whiteList;
-    std::set<reco::TrackRef> whiteListTk;
-    for(auto itoken : SVWhiteLists_) {
-      edm::Handle<edm::View<reco::Candidate > > svWhiteListHandle;
-      iEvent.getByToken(itoken, svWhiteListHandle);
-      const edm::View<reco::Candidate > &  svWhiteList=*(svWhiteListHandle.product());
-      for(unsigned int i=0; i<svWhiteList.size();i++) {
-	//Whitelist via Ptrs
-        for(unsigned int j=0; j< svWhiteList[i].numberOfSourceCandidatePtrs(); j++) {
-          const edm::Ptr<reco::Candidate> & c = svWhiteList[i].sourceCandidatePtr(j);
-          if(c.id() == cands.id()) whiteList.insert(c.key());
-
+      // Whitelist via RecoCharged
+      for (auto dau = svWhiteList[i].begin(); dau != svWhiteList[i].end();
+           dau++) {
+        const reco::RecoChargedCandidate *chCand =
+            dynamic_cast<const reco::RecoChargedCandidate *>(&(*dau));
+        if (chCand != nullptr) {
+          whiteListTk.insert(chCand->track());
         }
-	//Whitelist via RecoCharged
-	for(auto dau = svWhiteList[i].begin(); dau != svWhiteList[i].end() ; dau++){
-            const reco::RecoChargedCandidate * chCand=dynamic_cast<const reco::RecoChargedCandidate *>(&(*dau));
-	    if(chCand!=nullptr) {
-		whiteListTk.insert(chCand->track());
-	    }
-	}
       }
     }
- 
-
-    edm::Handle<reco::VertexCollection> PVs;
-    iEvent.getByToken( PVs_, PVs );
-    reco::VertexRef PV(PVs.id());
-    reco::VertexRefProd PVRefProd(PVs);
-    math::XYZPoint  PVpos;
-
-
-    edm::Handle<reco::TrackCollection> TKOrigs;
-    iEvent.getByToken( TKOrigs_, TKOrigs );
-    auto outPtrP = std::make_unique<std::vector<pat::PackedCandidate>>();
-    std::vector<int> mapping(cands->size());
-    std::vector<int> mappingReverse(cands->size());
-    std::vector<int> mappingTk(TKOrigs->size(), -1);
-
-    for(unsigned int ic=0, nc = cands->size(); ic < nc; ++ic) {
-        const reco::PFCandidate &cand=(*cands)[ic];
-        const reco::Track *ctrack = nullptr;
-        if ((abs(cand.pdgId()) == 11 || cand.pdgId() == 22) && cand.gsfTrackRef().isNonnull()) {
-            ctrack = &*cand.gsfTrackRef();
-        } else if (cand.trackRef().isNonnull()) {
-            ctrack = &*cand.trackRef();
-        }
-        if (ctrack) {
-          float dist=1e99;
-          int pvi=-1;
-          for(size_t ii=0;ii<PVs->size();ii++){
-            float dz=std::abs(ctrack->dz( ((*PVs)[ii]).position()));
-            if(dz<dist) {pvi=ii;dist=dz; }
-          }
-          PV = reco::VertexRef(PVs, pvi);
-          math::XYZPoint vtx = cand.vertex();
-          pat::PackedCandidate::LostInnerHits lostHits = pat::PackedCandidate::noLostInnerHits;
-          const reco::VertexRef & PVOrig = associatedPV[reco::CandidatePtr(cands,ic)];
-          if(PVOrig.isNonnull()) PV = reco::VertexRef(PVs, PVOrig.key()); // WARNING: assume the PV slimmer is keeping same order
-          int quality=associationQuality[reco::CandidatePtr(cands,ic)];
-//          if ((size_t)pvi!=PVOrig.key()) std::cout << "not closest in Z" << pvi << " " << PVOrig.key() << " " << cand.pt() << " " << quality << std::endl;
-          //          TrajectoryStateOnSurface tsos = extrapolator.extrapolate(trajectoryStateTransform::initialFreeState(*ctrack,&*magneticField), RecoVertex::convertPos(PV->position()));
-          //   vtx = tsos.globalPosition();
-          //          phiAtVtx = tsos.globalDirection().phi();
-          vtx = ctrack->referencePoint();
-	  float ptTrk = ctrack->pt();
-	  float etaAtVtx = ctrack->eta();
-          float phiAtVtx = ctrack->phi();
-
-          int nlost = ctrack->hitPattern().numberOfLostHits(reco::HitPattern::MISSING_INNER_HITS);
-          if (nlost == 0) { 
-            if (ctrack->hitPattern().hasValidHitInPixelLayer(PixelSubdetector::SubDetector::PixelBarrel, 1)) {
-              lostHits = pat::PackedCandidate::validHitInFirstPixelBarrelLayer;
-            }
-          } else {
-            lostHits = ( nlost == 1 ? pat::PackedCandidate::oneLostInnerHit : pat::PackedCandidate::moreLostInnerHits);
-          }
+  }
 
-	  
-          outPtrP->push_back( pat::PackedCandidate(cand.polarP4(), vtx, ptTrk, etaAtVtx, phiAtVtx, cand.pdgId(), PVRefProd, PV.key()));
-          outPtrP->back().setAssociationQuality(pat::PackedCandidate::PVAssociationQuality(qualityMap[quality]));
-          outPtrP->back().setCovarianceVersion(covarianceVersion_);
-          if(cand.trackRef().isNonnull() && PVOrig.isNonnull() && PVOrig->trackWeight(cand.trackRef()) > 0.5 && quality == 7) {
-                  outPtrP->back().setAssociationQuality(pat::PackedCandidate::UsedInFitTight);
-          }
-          // properties of the best track 
-          outPtrP->back().setLostInnerHits( lostHits );
-          if(outPtrP->back().pt() > minPtForTrackProperties_ || 
-	     outPtrP->back().ptTrk() > minPtForTrackProperties_ ||
-	     whiteList.find(ic)!=whiteList.end() || 
-             (cand.trackRef().isNonnull() &&  whiteListTk.find(cand.trackRef())!=whiteListTk.end())
-	    ) {
-	      outPtrP->back().setFirstHit(ctrack->hitPattern().getHitPattern(reco::HitPattern::TRACK_HITS, 0));
-              if(abs(outPtrP->back().pdgId())==22) {
-                  outPtrP->back().setTrackProperties(*ctrack,covariancePackingSchemas_[4],covarianceVersion_);
-	      } else { 
-                  if( ctrack->hitPattern().numberOfValidPixelHits() >0) {
-		      outPtrP->back().setTrackProperties(*ctrack,covariancePackingSchemas_[0],covarianceVersion_); //high quality 
-		  }  else { 
-		      outPtrP->back().setTrackProperties(*ctrack,covariancePackingSchemas_[1],covarianceVersion_);
-		  } 
-              }            
-            //outPtrP->back().setTrackProperties(*ctrack,tsos.curvilinearError());
-          } else {
-            if(outPtrP->back().pt() > 0.5 ){ 
-                if(ctrack->hitPattern().numberOfValidPixelHits() >0)  outPtrP->back().setTrackProperties(*ctrack,covariancePackingSchemas_[2],covarianceVersion_); //low quality, with pixels
-                  else       outPtrP->back().setTrackProperties(*ctrack,covariancePackingSchemas_[3],covarianceVersion_); //low quality, without pixels
-            }
-          }
+  edm::Handle<reco::VertexCollection> PVs;
+  iEvent.getByToken(PVs_, PVs);
+  reco::VertexRef PV(PVs.id());
+  reco::VertexRefProd PVRefProd(PVs);
+  math::XYZPoint PVpos;
+
+  std::vector<pat::HcalDepthEnergyFractions> hcalDepthEnergyFractions;
+  hcalDepthEnergyFractions.reserve(cands->size());
+  std::vector<pat::HcalDepthEnergyFractions> hcalDepthEnergyFractions_Ordered;
+  hcalDepthEnergyFractions_Ordered.reserve(cands->size());
+
+  edm::Handle<reco::TrackCollection> TKOrigs;
+  iEvent.getByToken(TKOrigs_, TKOrigs);
+  auto outPtrP = std::make_unique<std::vector<pat::PackedCandidate>>();
+  std::vector<int> mapping(cands->size());
+  std::vector<int> mappingReverse(cands->size());
+  std::vector<int> mappingTk(TKOrigs->size(), -1);
+
+  for (unsigned int ic = 0, nc = cands->size(); ic < nc; ++ic) {
+    const reco::PFCandidate &cand = (*cands)[ic];
+    const reco::Track *ctrack = nullptr;
+    if ((abs(cand.pdgId()) == 11 || cand.pdgId() == 22) &&
+        cand.gsfTrackRef().isNonnull()) {
+      ctrack = &*cand.gsfTrackRef();
+    } else if (cand.trackRef().isNonnull()) {
+      ctrack = &*cand.trackRef();
+    }
+    if (ctrack) {
+      float dist = 1e99;
+      int pvi = -1;
+      for (size_t ii = 0; ii < PVs->size(); ii++) {
+        float dz = std::abs(ctrack->dz(((*PVs)[ii]).position()));
+        if (dz < dist) {
+          pvi = ii;
+          dist = dz;
+        }
+      }
+      PV = reco::VertexRef(PVs, pvi);
+      math::XYZPoint vtx = cand.vertex();
+      pat::PackedCandidate::LostInnerHits lostHits =
+          pat::PackedCandidate::noLostInnerHits;
+      const reco::VertexRef &PVOrig =
+          associatedPV[reco::CandidatePtr(cands, ic)];
+      if (PVOrig.isNonnull())
+        PV = reco::VertexRef(
+            PVs,
+            PVOrig
+                .key()); // WARNING: assume the PV slimmer is keeping same order
+      int quality = associationQuality[reco::CandidatePtr(cands, ic)];
+      //          if ((size_t)pvi!=PVOrig.key()) std::cout << "not closest in Z"
+      //          << pvi << " " << PVOrig.key() << " " << cand.pt() << " " <<
+      //          quality << std::endl; TrajectoryStateOnSurface tsos =
+      //          extrapolator.extrapolate(trajectoryStateTransform::initialFreeState(*ctrack,&*magneticField),
+      //          RecoVertex::convertPos(PV->position()));
+      //   vtx = tsos.globalPosition();
+      //          phiAtVtx = tsos.globalDirection().phi();
+      vtx = ctrack->referencePoint();
+      float ptTrk = ctrack->pt();
+      float etaAtVtx = ctrack->eta();
+      float phiAtVtx = ctrack->phi();
+
+      int nlost = ctrack->hitPattern().numberOfLostHits(
+          reco::HitPattern::MISSING_INNER_HITS);
+      if (nlost == 0) {
+        if (ctrack->hitPattern().hasValidHitInPixelLayer(
+                PixelSubdetector::SubDetector::PixelBarrel, 1)) {
+          lostHits = pat::PackedCandidate::validHitInFirstPixelBarrelLayer;
+        }
+      } else {
+        lostHits = (nlost == 1 ? pat::PackedCandidate::oneLostInnerHit
+                               : pat::PackedCandidate::moreLostInnerHits);
+      }
 
-          // these things are always for the CKF track
-          outPtrP->back().setTrackHighPurity( cand.trackRef().isNonnull() && cand.trackRef()->quality(reco::Track::highPurity) );
-          if (cand.muonRef().isNonnull()) {
-            outPtrP->back().setMuonID(cand.muonRef()->isStandAloneMuon(), cand.muonRef()->isGlobalMuon());
-          }
+      outPtrP->push_back(pat::PackedCandidate(cand.polarP4(), vtx, ptTrk,
+                                              etaAtVtx, phiAtVtx, cand.pdgId(),
+                                              PVRefProd, PV.key()));
+      outPtrP->back().setAssociationQuality(
+          pat::PackedCandidate::PVAssociationQuality(qualityMap[quality]));
+      outPtrP->back().setCovarianceVersion(covarianceVersion_);
+      if (cand.trackRef().isNonnull() && PVOrig.isNonnull() &&
+          PVOrig->trackWeight(cand.trackRef()) > 0.5 && quality == 7) {
+        outPtrP->back().setAssociationQuality(
+            pat::PackedCandidate::UsedInFitTight);
+      }
+      // properties of the best track
+      outPtrP->back().setLostInnerHits(lostHits);
+      if (outPtrP->back().pt() > minPtForTrackProperties_ ||
+          outPtrP->back().ptTrk() > minPtForTrackProperties_ ||
+          whiteList.find(ic) != whiteList.end() ||
+          (cand.trackRef().isNonnull() &&
+           whiteListTk.find(cand.trackRef()) != whiteListTk.end())) {
+        outPtrP->back().setFirstHit(ctrack->hitPattern().getHitPattern(
+            reco::HitPattern::TRACK_HITS, 0));
+        if (abs(outPtrP->back().pdgId()) == 22) {
+          outPtrP->back().setTrackProperties(
+              *ctrack, covariancePackingSchemas_[4], covarianceVersion_);
         } else {
-
-          if (!PVs->empty()) {
-            PV = reco::VertexRef(PVs, 0);
-            PVpos = PV->position();
+          if (ctrack->hitPattern().numberOfValidPixelHits() > 0) {
+            outPtrP->back().setTrackProperties(
+                *ctrack, covariancePackingSchemas_[0],
+                covarianceVersion_); // high quality
+          } else {
+            outPtrP->back().setTrackProperties(
+                *ctrack, covariancePackingSchemas_[1], covarianceVersion_);
           }
-	
-          outPtrP->push_back( pat::PackedCandidate(cand.polarP4(), PVpos, cand.pt(), cand.eta(), cand.phi(), cand.pdgId(), PVRefProd, PV.key()));
-          outPtrP->back().setAssociationQuality(pat::PackedCandidate::PVAssociationQuality(pat::PackedCandidate::UsedInFitTight));
         }
-    
-	// neutrals and isolated charged hadrons
-
-        bool isIsolatedChargedHadron = false;
-        if(storeChargedHadronIsolation_) {
-          const edm::ValueMap<bool>  &  chargedHadronIsolation=*(chargedHadronIsolationHandle.product());
-          isIsolatedChargedHadron=((cand.pt()>minPtForChargedHadronProperties_)&&(chargedHadronIsolation[reco::PFCandidateRef(cands,ic)]));
-          outPtrP->back().setIsIsolatedChargedHadron(isIsolatedChargedHadron);
+        // outPtrP->back().setTrackProperties(*ctrack,tsos.curvilinearError());
+      } else {
+        if (outPtrP->back().pt() > 0.5) {
+          if (ctrack->hitPattern().numberOfValidPixelHits() > 0)
+            outPtrP->back().setTrackProperties(
+                *ctrack, covariancePackingSchemas_[2],
+                covarianceVersion_); // low quality, with pixels
+          else
+            outPtrP->back().setTrackProperties(
+                *ctrack, covariancePackingSchemas_[3],
+                covarianceVersion_); // low quality, without pixels
         }
+      }
 
-	if(abs(cand.pdgId()) == 1 || abs(cand.pdgId()) == 130) {
-	  outPtrP->back().setHcalFraction(cand.hcalEnergy()/(cand.ecalEnergy()+cand.hcalEnergy()));
-        } else if(isIsolatedChargedHadron) {
-          outPtrP->back().setRawCaloFraction((cand.rawEcalEnergy()+cand.rawHcalEnergy())/cand.energy());
-          outPtrP->back().setHcalFraction(cand.rawHcalEnergy()/(cand.rawEcalEnergy()+cand.rawHcalEnergy()));
-	} else {
-	  outPtrP->back().setHcalFraction(0);
-	}
-	
-	//specifically this is the PFLinker requirements to apply the e/gamma regression
-	if(cand.particleId() == reco::PFCandidate::e || (cand.particleId() == reco::PFCandidate::gamma && cand.mva_nothing_gamma()>0.)) { 
-	  outPtrP->back().setGoodEgamma();
-	}
-       
-        if (usePuppi_){
-           reco::PFCandidateRef pkref( cands, ic );
-                 // outPtrP->back().setPuppiWeight( (*puppiWeight)[pkref]);
-           
-           float puppiWeightVal = (*puppiWeight)[pkref];
-           float puppiWeightNoLepVal = 0.0;
-           // Check the "no lepton" puppi weights. 
-           // If present, then it is not a lepton, use stored weight
-           // If absent, it is a lepton, so set the weight to 1.0
-           if ( puppiWeightNoLep.isValid() ) {
-             // Look for the pointer inside the "no lepton" candidate collection.
-             auto pkrefPtr = pkref->sourceCandidatePtr(0);
-
-             bool foundNoLep = false;
-             for ( size_t ipcnl = 0; ipcnl < puppiCandsNoLepPtrs.size(); ipcnl++){
-              if (puppiCandsNoLepPtrs[ipcnl] == pkrefPtr){
-                foundNoLep = true;
-                  puppiWeightNoLepVal = puppiCandsNoLep->at(ipcnl).pt()/cand.pt(); // a hack for now, should use the value map
-                  break;
-                }
-              }
-              if ( !foundNoLep || puppiWeightNoLepVal > 1 ) {
-                puppiWeightNoLepVal = 1.0;
-              }
-            }
-          outPtrP->back().setPuppiWeight( puppiWeightVal, puppiWeightNoLepVal );
-
-          mappingPuppi[((*puppiCandsMap)[pkref]).key()]=ic;
-        }
-	
-        if (storeTiming_ && cand.isTimeValid())  {
-          outPtrP->back().setTime(cand.time(), cand.timeError());
-        }
+      // these things are always for the CKF track
+      outPtrP->back().setTrackHighPurity(
+          cand.trackRef().isNonnull() &&
+          cand.trackRef()->quality(reco::Track::highPurity));
+      if (cand.muonRef().isNonnull()) {
+        outPtrP->back().setMuonID(cand.muonRef()->isStandAloneMuon(),
+                                  cand.muonRef()->isGlobalMuon());
+      }
+    } else {
+      if (!PVs->empty()) {
+        PV = reco::VertexRef(PVs, 0);
+        PVpos = PV->position();
+      }
 
-        mapping[ic] = ic; // trivial at the moment!
-        if (cand.trackRef().isNonnull() && cand.trackRef().id() == TKOrigs.id()) {
-	  mappingTk[cand.trackRef().key()] = ic;	    
-        }
+      outPtrP->push_back(
+          pat::PackedCandidate(cand.polarP4(), PVpos, cand.pt(), cand.eta(),
+                               cand.phi(), cand.pdgId(), PVRefProd, PV.key()));
+      outPtrP->back().setAssociationQuality(
+          pat::PackedCandidate::PVAssociationQuality(
+              pat::PackedCandidate::UsedInFitTight));
+    }
 
+    // neutrals and isolated charged hadrons
+
+    bool isIsolatedChargedHadron = false;
+    if (storeChargedHadronIsolation_) {
+      const edm::ValueMap<bool> &chargedHadronIsolation =
+          *(chargedHadronIsolationHandle.product());
+      isIsolatedChargedHadron =
+          ((cand.pt() > minPtForChargedHadronProperties_) &&
+           (chargedHadronIsolation[reco::PFCandidateRef(cands, ic)]));
+      outPtrP->back().setIsIsolatedChargedHadron(isIsolatedChargedHadron);
     }
 
-    auto outPtrPSorted = std::make_unique<std::vector<pat::PackedCandidate>>();
-    std::vector<size_t> order=sort_indexes(*outPtrP);
-    std::vector<size_t> reverseOrder(order.size());
-    for(size_t i=0,nc=cands->size();i<nc;i++) {
-        outPtrPSorted->push_back((*outPtrP)[order[i]]);
-        reverseOrder[order[i]] = i;
-        mappingReverse[order[i]]=i;
+    if (abs(cand.pdgId()) == 1 || abs(cand.pdgId()) == 130) {
+      outPtrP->back().setHcalFraction(cand.hcalEnergy() /
+                                      (cand.ecalEnergy() + cand.hcalEnergy()));
+    } else if (cand.charge() && cand.pt() > 0.5) {
+      outPtrP->back().setHcalFraction(cand.hcalEnergy() /
+                                      (cand.ecalEnergy() + cand.hcalEnergy()));
+      outPtrP->back().setCaloFraction((cand.hcalEnergy() + cand.ecalEnergy()) /
+                                      cand.energy());
+    } else {
+      outPtrP->back().setHcalFraction(0);
+      outPtrP->back().setCaloFraction(0);
     }
 
-    // Fix track association for sorted candidates
-    for(size_t i=0,ntk=mappingTk.size();i<ntk;i++){
-        if(mappingTk[i] >= 0)
-          mappingTk[i]=reverseOrder[mappingTk[i]];
+    if (isIsolatedChargedHadron) {
+      outPtrP->back().setRawCaloFraction(
+          (cand.rawEcalEnergy() + cand.rawHcalEnergy()) / cand.energy());
+      outPtrP->back().setRawHcalFraction(
+          cand.rawHcalEnergy() / (cand.rawEcalEnergy() + cand.rawHcalEnergy()));
+    } else {
+      outPtrP->back().setRawCaloFraction(0);
+      outPtrP->back().setRawHcalFraction(0);
     }
 
-    for(size_t i=0,ntk=mappingPuppi.size();i<ntk;i++){
-        mappingPuppi[i]=reverseOrder[mappingPuppi[i]];
+    std::vector<float> dummyVector;
+    dummyVector.clear();
+    pat::HcalDepthEnergyFractions hcalDepthEFrac(dummyVector);
+
+    // storing HcalDepthEnergyFraction information
+    if (std::find(pfCandidateTypesForHcalDepth_.begin(),
+                  pfCandidateTypesForHcalDepth_.end(),
+                  abs(cand.pdgId())) != pfCandidateTypesForHcalDepth_.end()) {
+      if (!storeHcalDepthEndcapOnly_ ||
+          fabs(outPtrP->back().eta()) >
+              1.3) { // storeHcalDepthEndcapOnly_==false -> store all eta of
+                     // selected PF types, if true, only |eta|>1.3 of selected
+                     // PF types will be stored
+        std::vector<float> hcalDepthEnergyFractionTmp(
+            cand.hcalDepthEnergyFractions().begin(),
+            cand.hcalDepthEnergyFractions().end());
+        hcalDepthEFrac.reset(hcalDepthEnergyFractionTmp);
+      }
+    }
+    hcalDepthEnergyFractions.push_back(hcalDepthEFrac);
+
+    // specifically this is the PFLinker requirements to apply the e/gamma
+    // regression
+    if (cand.particleId() == reco::PFCandidate::e ||
+        (cand.particleId() == reco::PFCandidate::gamma &&
+         cand.mva_nothing_gamma() > 0.)) {
+      outPtrP->back().setGoodEgamma();
     }
 
-    edm::OrphanHandle<pat::PackedCandidateCollection> oh = iEvent.put(std::move(outPtrPSorted));
+    if (usePuppi_) {
+      reco::PFCandidateRef pkref(cands, ic);
+      // outPtrP->back().setPuppiWeight( (*puppiWeight)[pkref]);
+
+      float puppiWeightVal = (*puppiWeight)[pkref];
+      float puppiWeightNoLepVal = 0.0;
+      // Check the "no lepton" puppi weights.
+      // If present, then it is not a lepton, use stored weight
+      // If absent, it is a lepton, so set the weight to 1.0
+      if (puppiWeightNoLep.isValid()) {
+        // Look for the pointer inside the "no lepton" candidate collection.
+        auto pkrefPtr = pkref->sourceCandidatePtr(0);
+
+        bool foundNoLep = false;
+        for (size_t ipcnl = 0; ipcnl < puppiCandsNoLepPtrs.size(); ipcnl++) {
+          if (puppiCandsNoLepPtrs[ipcnl] == pkrefPtr) {
+            foundNoLep = true;
+            puppiWeightNoLepVal =
+                puppiCandsNoLep->at(ipcnl).pt() /
+                cand.pt(); // a hack for now, should use the value map
+            break;
+          }
+        }
+        if (!foundNoLep || puppiWeightNoLepVal > 1) {
+          puppiWeightNoLepVal = 1.0;
+        }
+      }
+      outPtrP->back().setPuppiWeight(puppiWeightVal, puppiWeightNoLepVal);
 
-    // now build the two maps
-    auto pf2pc = std::make_unique<edm::Association<pat::PackedCandidateCollection>>(oh);
-    auto pc2pf = std::make_unique<edm::Association<reco::PFCandidateCollection>>(cands);
-    edm::Association<pat::PackedCandidateCollection>::Filler pf2pcFiller(*pf2pc);
-    edm::Association<reco::PFCandidateCollection   >::Filler pc2pfFiller(*pc2pf);
-    pf2pcFiller.insert(cands, mappingReverse.begin(), mappingReverse.end());
-    pc2pfFiller.insert(oh   , order.begin(), order.end());
-    // include also the mapping track -> packed PFCand
-    pf2pcFiller.insert(TKOrigs, mappingTk.begin(), mappingTk.end());
-    if(usePuppi_) pf2pcFiller.insert(puppiCands, mappingPuppi.begin(), mappingPuppi.end());
+      mappingPuppi[((*puppiCandsMap)[pkref]).key()] = ic;
+    }
 
-    pf2pcFiller.fill();
-    pc2pfFiller.fill();
-    iEvent.put(std::move(pf2pc));
-    iEvent.put(std::move(pc2pf));
+    if (storeTiming_ && cand.isTimeValid()) {
+      outPtrP->back().setTime(cand.time(), cand.timeError());
+    }
 
-}
+    mapping[ic] = ic; // trivial at the moment!
+    if (cand.trackRef().isNonnull() && cand.trackRef().id() == TKOrigs.id()) {
+      mappingTk[cand.trackRef().key()] = ic;
+    }
+  }
 
+  auto outPtrPSorted = std::make_unique<std::vector<pat::PackedCandidate>>();
+  std::vector<size_t> order = sort_indexes(*outPtrP);
+  std::vector<size_t> reverseOrder(order.size());
+  for (size_t i = 0, nc = cands->size(); i < nc; i++) {
+    outPtrPSorted->push_back((*outPtrP)[order[i]]);
+    reverseOrder[order[i]] = i;
+    mappingReverse[order[i]] = i;
+    hcalDepthEnergyFractions_Ordered.push_back(
+        hcalDepthEnergyFractions[order[i]]);
+  }
+
+  // Fix track association for sorted candidates
+  for (size_t i = 0, ntk = mappingTk.size(); i < ntk; i++) {
+    if (mappingTk[i] >= 0)
+      mappingTk[i] = reverseOrder[mappingTk[i]];
+  }
+
+  for (size_t i = 0, ntk = mappingPuppi.size(); i < ntk; i++) {
+    mappingPuppi[i] = reverseOrder[mappingPuppi[i]];
+  }
+
+  edm::OrphanHandle<pat::PackedCandidateCollection> oh =
+      iEvent.put(std::move(outPtrPSorted));
+
+  // now build the two maps
+  auto pf2pc =
+      std::make_unique<edm::Association<pat::PackedCandidateCollection>>(oh);
+  auto pc2pf =
+      std::make_unique<edm::Association<reco::PFCandidateCollection>>(cands);
+  edm::Association<pat::PackedCandidateCollection>::Filler pf2pcFiller(*pf2pc);
+  edm::Association<reco::PFCandidateCollection>::Filler pc2pfFiller(*pc2pf);
+  pf2pcFiller.insert(cands, mappingReverse.begin(), mappingReverse.end());
+  pc2pfFiller.insert(oh, order.begin(), order.end());
+  // include also the mapping track -> packed PFCand
+  pf2pcFiller.insert(TKOrigs, mappingTk.begin(), mappingTk.end());
+  if (usePuppi_)
+    pf2pcFiller.insert(puppiCands, mappingPuppi.begin(), mappingPuppi.end());
+
+  pf2pcFiller.fill();
+  pc2pfFiller.fill();
+  iEvent.put(std::move(pf2pc));
+  iEvent.put(std::move(pc2pf));
+
+  // HCAL depth energy fraction additions using ValueMap
+  auto hcalDepthEnergyFractionsV =
+      std::make_unique<edm::ValueMap<HcalDepthEnergyFractions>>();
+  edm::ValueMap<HcalDepthEnergyFractions>::Filler
+      fillerHcalDepthEnergyFractions(*hcalDepthEnergyFractionsV);
+  fillerHcalDepthEnergyFractions.insert(
+      cands, hcalDepthEnergyFractions_Ordered.begin(),
+      hcalDepthEnergyFractions_Ordered.end());
+  fillerHcalDepthEnergyFractions.fill();
+
+  if (not pfCandidateTypesForHcalDepth_.empty())
+    iEvent.put(std::move(hcalDepthEnergyFractionsV),
+               "hcalDepthEnergyFractions");
+}
 
 using pat::PATPackedCandidateProducer;
 #include "FWCore/Framework/interface/MakerMacros.h"
diff --git a/PhysicsTools/PatAlgos/python/producersLayer1/muonProducer_cfi.py b/PhysicsTools/PatAlgos/python/producersLayer1/muonProducer_cfi.py
index 7fa0add40d8f2..55e4664306ec4 100644
--- a/PhysicsTools/PatAlgos/python/producersLayer1/muonProducer_cfi.py
+++ b/PhysicsTools/PatAlgos/python/producersLayer1/muonProducer_cfi.py
@@ -99,6 +99,7 @@
     # PhysicsTools/PatUtils/src/PFIsolation.cc
     # only works in miniaod, so set to True in miniAOD_tools.py
     computeMiniIso = cms.bool(False),
+    effectiveAreaVec = cms.vdouble(0.0566, 0.0562, 0.0363, 0.0119, 0.0064),
     pfCandsForMiniIso = cms.InputTag("packedPFCandidates"),
     miniIsoParams = cms.vdouble(0.05, 0.2, 10.0, 0.5, 0.0001, 0.01, 0.01, 0.01, 0.0),
 
@@ -107,7 +108,8 @@
     # Depends on MiniIsolation, so only works in miniaod
     # Don't forget to set flags properly in miniAOD_tools.py                      
     computeMuonMVA = cms.bool(False),
-    mvaTrainingFile = cms.FileInPath("RecoMuon/MuonIdentification/data/mu_BDTG_Run2017.weights.xml"),
+    mvaTrainingFile      = cms.FileInPath("RecoMuon/MuonIdentification/data/mu_2017_BDTG.weights.xml"),
+    lowPtmvaTrainingFile = cms.FileInPath("RecoMuon/MuonIdentification/data/mu_lowpt_BDTG.weights.xml"),
     recomputeBasicSelectors = cms.bool(True),
     mvaUseJec = cms.bool(True),
     mvaDrMax = cms.double(0.4),
@@ -139,13 +141,4 @@
 
 
 
-
-
-
-
-
-
-
-
-
 
diff --git a/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py b/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py
index 4b8b8fb86b78a..bbf20407e05e5 100644
--- a/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py
+++ b/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py
@@ -82,6 +82,8 @@
         'keep recoForwardProtons_ctppsProtons_*_*',
 	# displacedStandAlone muon collection for EXO
 	'keep recoTracks_displacedStandAloneMuons__*',
+        # L1 prefiring weights
+        'keep *_prefiringweight_*_*',
     )
 )
 
@@ -122,6 +124,16 @@
                            ]
 bParking.toModify(MicroEventContent, outputCommands = MicroEventContent.outputCommands + _bParking_extraCommands)
 
+# --- Only for 2018 data & MC
+_run2_HCAL_2018_extraCommands = ["keep *_packedPFCandidates_hcalDepthEnergyFractions_*"]
+from Configuration.Eras.Modifier_run2_HCAL_2018_cff import run2_HCAL_2018
+run2_HCAL_2018.toModify(MicroEventContent, outputCommands = MicroEventContent.outputCommands + _run2_HCAL_2018_extraCommands)
+
+_run3_common_extraCommands = ["drop *_packedPFCandidates_hcalDepthEnergyFractions_*"]
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(MicroEventContent, outputCommands = MicroEventContent.outputCommands + _run3_common_extraCommands)
+# --- 
+
 MicroEventContentMC = cms.PSet(
     outputCommands = cms.untracked.vstring(MicroEventContent.outputCommands)
 )
@@ -148,7 +160,6 @@
 cms.untracked.PSet(branch = cms.untracked.string("EcalRecHitsSorted_reducedEgamma_reducedESRecHits_*"),splitLevel=cms.untracked.int32(99)),
 ])
 
-
 _phase2_hgc_extraCommands = ["keep *_slimmedElectronsFromMultiCl_*_*", "keep *_slimmedPhotonsFromMultiCl_*_*"]
 from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
 phase2_hgcal.toModify(MicroEventContentMC, outputCommands = MicroEventContentMC.outputCommands + _phase2_hgc_extraCommands)
diff --git a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py
index 15a11496fadbd..a7623657c9ebb 100644
--- a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py
+++ b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py
@@ -30,6 +30,13 @@ def miniAOD_customizeCommon(process):
     process.patMuons.computeSoftMuonMVA = True
 
     process.patMuons.addTriggerMatching = True
+    from Configuration.Eras.Modifier_run2_muon_2016_cff import run2_muon_2016
+    from Configuration.Eras.Modifier_run2_muon_2017_cff import run2_muon_2017
+    from Configuration.Eras.Modifier_run2_muon_2018_cff import run2_muon_2018
+    run2_muon_2016.toModify( process.patMuons, effectiveAreaVec = [0.0735,0.0619,0.0465,0.0433,0.0577])
+    run2_muon_2017.toModify( process.patMuons, effectiveAreaVec = [0.0566, 0.0562, 0.0363, 0.0119, 0.0064])
+    run2_muon_2018.toModify( process.patMuons, effectiveAreaVec = [0.0566, 0.0562, 0.0363, 0.0119, 0.0064])
+    run2_muon_2016.toModify( process.patMuons, mvaTrainingFile = "RecoMuon/MuonIdentification/data/mu_2016_BDTG.weights.xml")
 
     process.patMuons.computePuppiCombinedIso = True
     #
@@ -455,6 +462,14 @@ def miniAOD_customizeCommon(process):
     process.load("RecoEgamma.EgammaTools.slimmedEgammaFromMultiCl_cff")
     phase2_hgcal.toModify(task, func=lambda t: t.add(process.slimmedEgammaFromMultiClTask))
 
+    # L1 pre-firing weights for 2016 and 2017
+    from Configuration.Eras.Modifier_run2_L1prefiring_cff import run2_L1prefiring
+    from Configuration.Eras.Modifier_stage1L1Trigger_cff import stage1L1Trigger
+    from Configuration.Eras.Modifier_stage2L1Trigger_2017_cff import stage2L1Trigger_2017
+    process.load("PhysicsTools.PatUtils.L1ECALPrefiringWeightProducer_cff")
+    stage1L1Trigger.toModify(process.prefiringweight, DataEra = "2016BtoH")
+    stage2L1Trigger_2017.toModify(process.prefiringweight, DataEra = "2017BtoF")
+    run2_L1prefiring.toModify(task, func=lambda t: t.add(process.prefiringweight))
 
 def miniAOD_customizeMC(process):
     task = getPatAlgosToolsTask(process)
diff --git a/PhysicsTools/PatAlgos/python/slimming/packedPFCandidates_cfi.py b/PhysicsTools/PatAlgos/python/slimming/packedPFCandidates_cfi.py
index 68d97166bf598..98905cce1dda9 100644
--- a/PhysicsTools/PatAlgos/python/slimming/packedPFCandidates_cfi.py
+++ b/PhysicsTools/PatAlgos/python/slimming/packedPFCandidates_cfi.py
@@ -19,7 +19,9 @@
     minPtForTrackProperties = cms.double(0.95),
     covarianceVersion = cms.int32(0), #so far: 0 is Phase0, 1 is Phase1   
 #    covariancePackingSchemas = cms.vint32(1,257,513,769,0),  # a cheaper schema in kb/ev 
-    covariancePackingSchemas = cms.vint32(8,264,520,776,0),   # more accurate schema +0.6kb/ev   
+    covariancePackingSchemas = cms.vint32(8,264,520,776,0),   # more accurate schema +0.6kb/ev
+    pfCandidateTypesForHcalDepth = cms.vint32(),
+    storeHcalDepthEndcapOnly = cms.bool(False), # switch to store info only for endcap 
     storeTiming = cms.bool(False)
 )
 
@@ -29,6 +31,19 @@
 from Configuration.Eras.Modifier_run2_miniAOD_80XLegacy_cff import run2_miniAOD_80XLegacy
 run2_miniAOD_80XLegacy.toModify(packedPFCandidates, chargedHadronIsolation = "" )
 
+from Configuration.Eras.Modifier_run2_HCAL_2018_cff import run2_HCAL_2018
+run2_HCAL_2018.toModify(packedPFCandidates,
+    pfCandidateTypesForHcalDepth = [130,11,22,211,13],  # PF cand types for adding Hcal depth energy frac information
+                        # (130: neutral h, 11: ele, 22: photon, 211: charged h, 13: mu) # excluding e.g. 1:h_HF, 2:egamma_HF
+    storeHcalDepthEndcapOnly = True
+)
+
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify(packedPFCandidates,
+    pfCandidateTypesForHcalDepth = [], # For now, no PF cand type is considered for addition of Hcal depth energy frac 
+    storeHcalDepthEndcapOnly = False
+)
+
 from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing
 phase2_timing.toModify(packedPFCandidates, storeTiming = cms.bool(True))
 
diff --git a/PhysicsTools/PatAlgos/src/MuonMvaEstimator.cc b/PhysicsTools/PatAlgos/src/MuonMvaEstimator.cc
index fa4a47ea19d61..0c98233faa4d6 100644
--- a/PhysicsTools/PatAlgos/src/MuonMvaEstimator.cc
+++ b/PhysicsTools/PatAlgos/src/MuonMvaEstimator.cc
@@ -30,10 +30,10 @@ namespace {
       kMiniRelIsoCharged,
       kMiniRelIsoNeutral,
       kJetPtRel,
-      kJetPtRatio,
       kJetBTagCSV,
-      kSip,
+      kJetPtRatio,
       kLog_abs_dxyBS,
+      kSip,
       kLog_abs_dzPV,
       kSegmentCompatibility,
       kLast
@@ -56,18 +56,20 @@ float MuonMvaEstimator::computeMva(const pat::Muon& muon,
 				  const reco::JetTagCollection& bTags,
                                   float& jetPtRatio,
                                   float& jetPtRel,
+				  float& miniIsoValue, 
 				  const reco::JetCorrector* correctorL1,
-				  const reco::JetCorrector* correctorL1L2L3Res) const
+				  const reco::JetCorrector* correctorL1L2L3Res
+				   ) const
 {
   float var[kLast]{};
 
   var[kPt] = muon.pt();
   var[kEta] = muon.eta();
   var[kSegmentCompatibility] = muon.segmentCompatibility();
-  var[kMiniRelIsoCharged] = muon.miniPFIsolation().chargedHadronIso();
-  var[kMiniRelIsoNeutral] = muon.miniPFIsolation().neutralHadronIso();
+  var[kMiniRelIsoCharged] = muon.miniPFIsolation().chargedHadronIso() / muon.pt();
+  var[kMiniRelIsoNeutral] = miniIsoValue - var[kMiniRelIsoCharged];
 
-  double dB2D  = fabs(muon.dB(pat::Muon::BS2D));
+  double dB2D  = fabs(muon.dB(pat::Muon::PV2D));
   double dB3D  = muon.dB(pat::Muon::PV3D);
   double edB3D = muon.edB(pat::Muon::PV3D);
   double dz    = fabs(muon.muonBestTrack()->dz(vertex.position()));
diff --git a/PhysicsTools/PatUtils/interface/ElectronSelector.h b/PhysicsTools/PatUtils/interface/ElectronSelector.h
deleted file mode 100644
index e0fcf723bd5bd..0000000000000
--- a/PhysicsTools/PatUtils/interface/ElectronSelector.h
+++ /dev/null
@@ -1,101 +0,0 @@
-#ifndef PhysicsTools_PatUtils_ElectronSelector_h
-#define PhysicsTools_PatUtils_ElectronSelector_h
-
-/**
-    \class pat::ElectronSelector ElectronSelector.h "PhysicsTools/PatUtils/ElectronSelector.h"
-    \brief Selects good electrons
-   
-    The electron selector returns a flag (see pat::ParticleStatus) based on one of the possible
-    selections: either eId-based (cut, likelihood, neural net) or custom (user-defined
-    set of cuts). This is driven by the configuration parameters (see the PATElectronCleaner 
-    documentation for configuration details).
-   
-    The parameters are passed to the selector through an ElectronSelection struct.
-    (An adapter exists for use in CMSSW: reco::modules::ParameterAdapter< pat::ElectronSelector >.)
-
-    \author F.J. Ronga (ETH Zurich)
-    \version $Id: ElectronSelector.h,v 1.11 2008/03/11 13:43:39 fronga Exp $
-**/
-
-#include <string>
-
-#include "AnalysisDataFormats/Egamma/interface/ElectronID.h"
-#include "AnalysisDataFormats/Egamma/interface/ElectronIDAssociation.h"
-#include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
-
-#include "PhysicsTools/PatUtils/interface/ParticleCode.h"
-
-namespace reco {
-  class ClusterShape;
-}
-
-namespace pat {
-
-  /// Structure defining the electron selection
-  struct ElectronSelection {
-    std::string selectionType; ///< Choose selection type (see PATElectronCleaner)
-    
-    double value; ///< Cut value for likelihood or neural net
-    
-    /// @name Cuts for "custom" selection type:
-    //@{
-    double HoverEBarmax;        double HoverEEndmax;
-    double SigmaEtaEtaBarmax;   double SigmaEtaEtaEndmax;
-    double SigmaPhiPhiBarmax;   double SigmaPhiPhiEndmax;
-    double DeltaEtaInBarmax;    double DeltaEtaInEndmax;
-    double DeltaPhiInBarmax;    double DeltaPhiInEndmax;
-    double DeltaPhiOutBarmax;   double DeltaPhiOutEndmax;
-    double EoverPInBarmin;      double EoverPInEndmin;
-    double EoverPOutBarmin;     double EoverPOutEndmin;
-    double InvEMinusInvPBarmax; double InvEMinusInvPEndmax;
-    double E9overE25Barmin;     double E9overE25Endmin;
-    bool   doBremEoverPcomp;    ///< switch to apply cut on comparison between brem and E/P
-    //@}
-  };
-
-  class ElectronSelector {
-
-    typedef reco::GsfElectron            Electron;
-    typedef reco::ElectronIDAssociationCollection  ElectronIDmap;
-
-  public:
-    ElectronSelector( const ElectronSelection& cfg ) : config_( cfg ) {}
-    ~ElectronSelector() {}
-
-    /// Returns 0 if electron matches criteria, a flag otherwise.
-    /// Criteria depend on the selector's configuration.
-    /// Electron IDs are only used if the selection is based
-    /// on it (cut, neural net or likelihood). Cluster shapes are for
-    /// custom selection only.
-    const ParticleStatus
-    filter( const unsigned int&          index,
-            const edm::View<Electron>&   electrons,
-            const ElectronIDmap&         electronIDs,
-            const reco::ClusterShape*    clusterShape
-            ) const;
-    
-
-  private:
-    
-    ElectronSelection config_;
-
-    /// Full-fledged selection based on SusyAnalyser
-    const ParticleStatus
-    customSelection_( const unsigned int&        index,
-                      const edm::View<Electron>& electrons,
-                      const reco::ClusterShape*  clusterShape ) const;
-    
-    /// Returns the electron ID object based on the given electron.
-    /// The latter is defined by an index in the vector of electrons.
-    /// The ID is found in the association map.
-    const reco::ElectronIDRef& 
-    electronID_( const unsigned int&        index,
-                 const edm::View<Electron>& electrons,
-                 const ElectronIDmap&       electronIDs
-                 ) const;
-
-
-  }; // class
-} // namespace
-
-#endif
diff --git a/PhysicsTools/PatUtils/interface/MiniIsolation.h b/PhysicsTools/PatUtils/interface/MiniIsolation.h
index 3d14ab8275f60..9f0bff2de7562 100644
--- a/PhysicsTools/PatUtils/interface/MiniIsolation.h
+++ b/PhysicsTools/PatUtils/interface/MiniIsolation.h
@@ -25,10 +25,11 @@ namespace pat{
                                    float deadcone_pu=0.01, float deadcone_ph=0.01, float deadcone_nh=0.01,
                                    float dZ_cut=0.0);
 
-  float muonRelMiniIsoPUCorrected(const PFIsolation& iso,
-				  const math::XYZTLorentzVector& p4,
-				  float dr,
-				  float rho);
+  double muonRelMiniIsoPUCorrected(const PFIsolation& iso,
+				   const math::XYZTLorentzVector& p4,
+				   double dr,
+				   double rho,
+                                   const std::vector<double> &area);
 }
 
 #endif
diff --git a/PhysicsTools/PatUtils/python/patPFMETCorrections_cff.py b/PhysicsTools/PatUtils/python/patPFMETCorrections_cff.py
index b1e6e4f244f5b..c95b00af81c3f 100644
--- a/PhysicsTools/PatUtils/python/patPFMETCorrections_cff.py
+++ b/PhysicsTools/PatUtils/python/patPFMETCorrections_cff.py
@@ -95,10 +95,6 @@
 patMultPhiCorrParams_T0pcT1SmearTxy_25ns = cms.VPSet( [pset for pset in _shiftMod.multPhiCorrParams_T0pcT1Txy_25ns])
 patMultPhiCorrParams_T0pcT1T2SmearTxy_25ns = cms.VPSet( [pset for pset in _shiftMod.multPhiCorrParams_T0pcT1T2Txy_25ns])
 
-#from Configuration.StandardSequences.Eras import eras
-#eras.run2_50ns_specific.toModify(patPFMetTxyCorr, parameters=patMultPhiCorrParams_Txy_50ns )
-#eras.run2_25ns_specific.toModify(patPFMetTxyCorr, parameters=patMultPhiCorrParams_Txy_25ns )
-
 patPFMetTxyCorrTask = cms.Task(patPFMetTxyCorr)
 patPFMetTxyCorrSequence = cms.Sequence(patPFMetTxyCorrTask)
 
diff --git a/PhysicsTools/PatUtils/python/tools/runMETCorrectionsAndUncertainties.py b/PhysicsTools/PatUtils/python/tools/runMETCorrectionsAndUncertainties.py
index fe4627dd42d4d..bd044895a3275 100644
--- a/PhysicsTools/PatUtils/python/tools/runMETCorrectionsAndUncertainties.py
+++ b/PhysicsTools/PatUtils/python/tools/runMETCorrectionsAndUncertainties.py
@@ -829,6 +829,66 @@ def getMETUncertainties(self, process, metType, metModName, electronCollection,
         #===================================================================================
         # energy shifts
         #===================================================================================
+        # PFMuons, PFElectrons, PFPhotons, and PFTaus will be used 
+        # to calculate MET Uncertainties.
+        #===================================================================================
+        #--------------
+        # PFElectrons :
+        #--------------
+        pfElectrons = cms.EDFilter("CandPtrSelector",
+                                   src = electronCollection,
+                                   cut = cms.string("pt > 5 && isPF && gsfTrack.isAvailable() && gsfTrack.hitPattern().numberOfLostHits(\'MISSING_INNER_HITS\') < 2")
+                                   )
+        addToProcessAndTask("pfElectrons"+postfix, pfElectrons, process, task)
+        metUncSequence += getattr(process, "pfElectrons"+postfix)
+        #--------------------------------------------------------------------
+        # PFTaus :
+        #---------
+        pfTaus = cms.EDFilter("PATTauRefSelector",
+                              src = tauCollection,
+                              cut = cms.string('pt > 18.0 & abs(eta) < 2.6 & tauID("decayModeFinding") > 0.5 & isPFTau')
+                              )
+        addToProcessAndTask("pfTaus"+postfix, pfTaus, process, task)
+        metUncSequence += getattr(process, "pfTaus"+postfix)
+        #---------------------------------------------------------------------
+        # PFMuons :
+        #----------
+        pfMuons = cms.EDFilter("CandPtrSelector",
+                               src = muonCollection,
+                               cut = cms.string("pt > 5.0 && isPFMuon && abs(eta) < 2.4")
+                               )
+        addToProcessAndTask("pfMuons"+postfix, pfMuons, process, task)
+        metUncSequence += getattr(process, "pfMuons"+postfix)
+        #---------------------------------------------------------------------
+        # PFPhotons :
+        #------------
+        if self._parameters["Puppi"].value or not self._parameters["onMiniAOD"].value:
+            cutforpfNoPileUp = cms.string("")
+        else:
+            cutforpfNoPileUp = cms.string("fromPV > 1")
+
+        pfNoPileUp = cms.EDFilter("CandPtrSelector",
+                                  src = pfCandCollection,
+                                  cut = cutforpfNoPileUp
+                                  )
+        addToProcessAndTask("pfNoPileUp"+postfix, pfNoPileUp, process, task)
+        metUncSequence += getattr(process, "pfNoPileUp"+postfix)
+
+        pfPhotons = cms.EDFilter("CandPtrSelector",
+                                 src = cms.InputTag("pfNoPileUp"+postfix),
+                                 cut = cms.string("abs(pdgId) = 22")
+                                 )
+        addToProcessAndTask("pfPhotons"+postfix, pfPhotons, process, task)
+        metUncSequence += getattr(process, "pfPhotons"+postfix)
+        #-------------------------------------------------------------------------
+        # Collections which have only PF Objects for calculating MET uncertainties
+        #-------------------------------------------------------------------------
+        electronCollection = cms.InputTag("pfElectrons"+postfix)
+        muonCollection     = cms.InputTag("pfMuons"+postfix)
+        tauCollection      = cms.InputTag("pfTaus"+postfix)
+        photonCollection   = cms.InputTag("pfPhotons"+postfix)
+
+        
         objectCollections = { "Jet":jetCollection,
                               "Electron":electronCollection,
                               "Photon":photonCollection,
@@ -993,10 +1053,6 @@ def tuneTxyParameters(self, process, corScheme, postfix):
             }
 
         getattr(process, "patPFMetTxyCorr"+postfix).parameters = xyTags[corScheme+"_25ns"] 
-        ##for automatic switch to 50ns / 25ns corrections ==> does not work...
-        #from Configuration.StandardSequences.Eras import eras
-        #eras.run2_50ns_specific.toModify( getattr(process, "patPFMetTxyCorr"+postfix) , parameters=xyTags[corScheme+"_50ns"] )
-        #eras.run2_25ns_specific.toModify( getattr(process, "patPFMetTxyCorr"+postfix) , parameters=xyTags[corScheme+"_25ns"] )
 
 
 #====================================================================================================
diff --git a/PhysicsTools/PatUtils/src/ElectronSelector.cc b/PhysicsTools/PatUtils/src/ElectronSelector.cc
deleted file mode 100644
index 633068fa52ccf..0000000000000
--- a/PhysicsTools/PatUtils/src/ElectronSelector.cc
+++ /dev/null
@@ -1,143 +0,0 @@
-#include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
-#include "DataFormats/EgammaReco/interface/BasicCluster.h"
-#include "DataFormats/EgammaReco/interface/ClusterShape.h"
-
-#include "PhysicsTools/PatUtils/interface/ElectronSelector.h"
-
-using pat::ElectronSelector;
-
-//______________________________________________________________________________
-const pat::ParticleStatus
-ElectronSelector::filter( const unsigned int&        index, 
-                          const edm::View<Electron>& electrons,
-                          const ElectronIDmap&       electronIDs,
-                          const reco::ClusterShape*  clusterShape 
-                          ) const
-{
-
-  // List of possible selections
-  if      ( config_.selectionType == "none"       ) 
-    {
-      return GOOD;
-    }
-  else if ( config_.selectionType == "cut"        ) 
-    {
-      if ( electronID_(index,electrons,electronIDs)->cutBasedDecision() ) return GOOD;
-      return BAD;
-    }
-  else if ( config_.selectionType == "likelihood" )
-    {
-      if ( electronID_(index,electrons,electronIDs)->likelihood() > config_.value ) return GOOD;
-      return BAD;
-    }
-  else if ( config_.selectionType == "neuralnet" ) // FIXME: Check sign of comparison!
-    {
-      if ( electronID_(index,electrons,electronIDs)->neuralNetOutput() > config_.value ) return GOOD;
-      return BAD;
-    }
-  else if ( config_.selectionType == "custom"     ) 
-    {
-      return customSelection_( index, electrons, clusterShape );
-    }
-
-
-  // Throw! unknown configuration
-  throw edm::Exception(edm::errors::Configuration) 
-    << "Unknown electron ID selection " << config_.selectionType;
-
-}
-
-
-//______________________________________________________________________________
-const reco::ElectronIDRef& 
-ElectronSelector::electronID_( const unsigned int& index,
-                               const edm::View<Electron>& electrons,
-                               const ElectronIDmap& electronIDs
-                               ) const
-{
-  // Find electron ID for electron with index index
-  edm::Ref<std::vector<Electron> > elecsRef = electrons.refAt(index).castTo<edm::Ref<std::vector<Electron> > >();
-  ElectronIDmap::const_iterator electronID = electronIDs.find( elecsRef );
-
-  // Return corresponding elecID
-  return electronID->val;
-}
-
-
-//______________________________________________________________________________
-const pat::ParticleStatus
-ElectronSelector::customSelection_( const unsigned int&        index,
-                                    const edm::View<Electron>& electrons,
-                                    const reco::ClusterShape*  clusterShape
-                                    ) const
-{
-
-  // Note: this is all taken from SusyAnalyzer
-
-  const reco::GsfElectron& electron = electrons[index];
-
-  // Retrieve information
-  float eta          = fabs(electron.p4().Eta());
-  float eOverPin     = electron.eSuperClusterOverP();
-  float pin          = electron.trackMomentumAtVtx().R();   
-  float pout         = electron.trackMomentumOut().R(); 
-  float fBrem        = (pin-pout)/pin;
-  float hOverE       = electron.hadronicOverEm();
-  float deltaPhiIn   = electron.deltaPhiSuperClusterTrackAtVtx();
-  float deltaEtaIn   = electron.deltaEtaSuperClusterTrackAtVtx();
-  float deltaPhiOut  = electron.deltaPhiSeedClusterTrackAtCalo();
-  float invEOverInvP = (1./electron.caloEnergy())-(1./electron.trackMomentumAtVtx().R());
-  float sigmaee      = sqrt(clusterShape->covEtaEta());
-  float sigmapp      = sqrt(clusterShape->covPhiPhi());
-  float E9overE25    = clusterShape->e3x3()/clusterShape->e5x5();
-
-  bool inEndCap = false; // Switch between barrel (0) and endcap (2)
-  if (eta > 1.479) { // See EgammaAnalysis/ElectronIDAlgos/src/CutBasedElectronID.cc
-    inEndCap = true; 
-    sigmaee = sigmaee - 0.02*(fabs(eta) - 2.3);   // Correct sigmaetaeta dependence on eta in endcap
-  }
-
-  // Now do the selection
-  // These ones come straight from E/gamma algo
-  if ( (eOverPin < 0.8) && (fBrem < 0.2) ) return BAD;
-  if ( config_.doBremEoverPcomp && (eOverPin < 0.9*(1-fBrem)) ) return BAD;
-
-  if (  (hOverE > config_.HoverEBarmax       && !inEndCap )
-     || (hOverE > config_.HoverEEndmax       &&  inEndCap ) )
-    return HOVERE;
-
-  if (  (E9overE25 < config_.E9overE25Barmin && !inEndCap )
-     || (E9overE25 < config_.E9overE25Endmin &&  inEndCap ) )
-    return SHOWER;
-
-  if (  (sigmaee > config_.SigmaEtaEtaBarmax && !inEndCap )
-     || (sigmaee > config_.SigmaEtaEtaEndmax &&  inEndCap ) )
-    return SHOWER;
-
-  if (  (sigmapp > config_.SigmaPhiPhiBarmax && !inEndCap )
-     || (sigmapp > config_.SigmaPhiPhiEndmax &&  inEndCap ) )
-    return SHOWER;
-
-  if (  (eOverPin < config_.EoverPInBarmin   && !inEndCap )
-     || (eOverPin < config_.EoverPInEndmin   &&  inEndCap ) )
-    return MATCHING;
-
-  if (  (fabs(deltaEtaIn) > config_.DeltaEtaInBarmax   && !inEndCap )
-     || (fabs(deltaEtaIn) > config_.DeltaEtaInEndmax   &&  inEndCap ) )
-    return MATCHING;
-
-  if (  (fabs(deltaPhiIn) < config_.DeltaPhiInBarmax   && !inEndCap )
-     || (fabs(deltaPhiIn) < config_.DeltaPhiInEndmax   &&  inEndCap ) )
-    return MATCHING;
-
-  if (  (fabs(deltaPhiOut) < config_.DeltaPhiOutBarmax && !inEndCap )
-     || (fabs(deltaPhiOut) < config_.DeltaPhiOutEndmax &&  inEndCap ) )
-    return MATCHING;
-
-  if (  (invEOverInvP > config_.InvEMinusInvPBarmax && !inEndCap )
-     || (invEOverInvP > config_.InvEMinusInvPEndmax &&  inEndCap ) )
-    return MATCHING;
-   
-  return GOOD;
-
-}
diff --git a/PhysicsTools/PatUtils/src/MiniIsolation.cc b/PhysicsTools/PatUtils/src/MiniIsolation.cc
index a0f575528e2cd..cb56e5c41d52d 100644
--- a/PhysicsTools/PatUtils/src/MiniIsolation.cc
+++ b/PhysicsTools/PatUtils/src/MiniIsolation.cc
@@ -55,19 +55,21 @@ PFIsolation getMiniPFIsolation(const pat::PackedCandidateCollection *pfcands,
 
 }
 
-  float muonRelMiniIsoPUCorrected(const PFIsolation& iso,
-				  const math::XYZTLorentzVector& p4,
-				  float dr,
-				  float rho)
+  double muonRelMiniIsoPUCorrected(const PFIsolation& iso,
+				   const math::XYZTLorentzVector& p4,
+				   double dr,
+				   double rho,
+                                   const std::vector<double> &area)
   {
-    double absEta = fabs(p4.eta());
+    double absEta = std::abs(p4.eta());
     double ea = 0;
-    //Spring15 version
-    if      (absEta<0.800) ea = 0.0735;
-    else if (absEta<1.300) ea = 0.0619;
-    else if (absEta<2.000) ea = 0.0465;
-    else if (absEta<2.200) ea = 0.0433;
-    else if (absEta<2.500) ea = 0.0577;
+    //Eta dependent effective area
+    if      (absEta<0.800) ea = area.at(0);
+    else if (absEta<1.300) ea = area.at(1);
+    else if (absEta<2.000) ea = area.at(2);
+    else if (absEta<2.200) ea = area.at(3);
+    else if (absEta<2.500) ea = area.at(4);
+
     double correction = rho * ea * (dr/0.3) * (dr/0.3);
     double correctedIso = iso.chargedHadronIso() + std::max(0.0, iso.neutralHadronIso()+iso.photonIso() - correction);
     return correctedIso/p4.pt();
diff --git a/RecoBTag/Combined/python/pfDeepCSVJetTags_cfi.py b/RecoBTag/Combined/python/pfDeepCSVJetTags_cfi.py
index 110526a219b5d..d69455f2bf0c0 100644
--- a/RecoBTag/Combined/python/pfDeepCSVJetTags_cfi.py
+++ b/RecoBTag/Combined/python/pfDeepCSVJetTags_cfi.py
@@ -18,7 +18,7 @@
 phase1Pixel.toModify(pfDeepCSVJetTags, toAdd = cms.PSet())
 
 from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
-phase2_common.toModify(pfDeepCSVJetTags, NNConfig = cms.FileInPath('RecoBTag/Combined/data/DeepCSV_PhaseI.json'))
+phase2_common.toModify(pfDeepCSVJetTags, NNConfig = cms.FileInPath('RecoBTag/Combined/data/DeepCSV_PhaseII.json'))
 phase2_common.toModify(pfDeepCSVJetTags, checkSVForDefaults = cms.bool(True))
 phase2_common.toModify(pfDeepCSVJetTags, meanPadding = cms.bool(True))
 phase2_common.toModify(pfDeepCSVJetTags, toAdd = cms.PSet())
diff --git a/RecoBTag/FeatureTools/plugins/DeepBoostedJetTagInfoProducer.cc b/RecoBTag/FeatureTools/plugins/DeepBoostedJetTagInfoProducer.cc
index 1a7c4205e4a58..6efe37e2f56a9 100644
--- a/RecoBTag/FeatureTools/plugins/DeepBoostedJetTagInfoProducer.cc
+++ b/RecoBTag/FeatureTools/plugins/DeepBoostedJetTagInfoProducer.cc
@@ -12,9 +12,9 @@
 #include "DataFormats/PatCandidates/interface/Jet.h"
 #include "DataFormats/PatCandidates/interface/PackedCandidate.h"
 
-#include "TrackingTools/Records/interface/TransientTrackRecord.h"
 #include "RecoBTag/FeatureTools/interface/TrackInfoBuilder.h"
 #include "RecoBTag/FeatureTools/interface/deep_helpers.h"
+#include "TrackingTools/Records/interface/TransientTrackRecord.h"
 
 #include "DataFormats/Candidate/interface/VertexCompositePtrCandidate.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
@@ -23,23 +23,22 @@
 
 using namespace btagbtvdeep;
 
-class DeepBoostedJetTagInfoProducer : public edm::stream::EDProducer<>
-{
-
+class DeepBoostedJetTagInfoProducer : public edm::stream::EDProducer<> {
 public:
-  explicit DeepBoostedJetTagInfoProducer(const edm::ParameterSet&);
+  explicit DeepBoostedJetTagInfoProducer(const edm::ParameterSet &);
   ~DeepBoostedJetTagInfoProducer() override;
 
-  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 
 private:
-  typedef std::vector<reco::DeepBoostedJetTagInfo> DeepBoostedJetTagInfoCollection;
+  typedef std::vector<reco::DeepBoostedJetTagInfo>
+      DeepBoostedJetTagInfoCollection;
   typedef reco::VertexCompositePtrCandidateCollection SVCollection;
   typedef reco::VertexCollection VertexCollection;
 
   void beginStream(edm::StreamID) override {}
-  void produce(edm::Event&, const edm::EventSetup&) override;
-  void endStream() override{}
+  void produce(edm::Event &, const edm::EventSetup &) override;
+  void endStream() override {}
 
   void fillParticleFeatures(DeepBoostedJetFeatures &fts, const reco::Jet &jet);
   void fillSVFeatures(DeepBoostedJetFeatures &fts, const reco::Jet &jet);
@@ -72,88 +71,55 @@ class DeepBoostedJetTagInfoProducer : public edm::stream::EDProducer<>
   const reco::Vertex *pv_ = nullptr;
 };
 
-const std::vector<std::string> DeepBoostedJetTagInfoProducer::particle_features_ {
-  "pfcand_puppiw",
-  "pfcand_hcalFrac",
-  "pfcand_VTX_ass",
-  "pfcand_lostInnerHits",
-  "pfcand_quality",
-  "pfcand_charge",
-  "pfcand_isEl",
-  "pfcand_isMu",
-  "pfcand_isChargedHad",
-  "pfcand_isGamma",
-  "pfcand_isNeutralHad",
-  "pfcand_phirel",
-  "pfcand_etarel",
-  "pfcand_deltaR",
-  "pfcand_abseta",
-  "pfcand_ptrel_log",
-  "pfcand_erel_log",
-  "pfcand_pt_log",
-  "pfcand_drminsv",
-  "pfcand_drsubjet1",
-  "pfcand_drsubjet2",
-  "pfcand_normchi2",
-  "pfcand_dz",
-  "pfcand_dzsig",
-  "pfcand_dxy",
-  "pfcand_dxysig",
-  "pfcand_dptdpt",
-  "pfcand_detadeta",
-  "pfcand_dphidphi",
-  "pfcand_dxydxy",
-  "pfcand_dzdz",
-  "pfcand_dxydz",
-  "pfcand_dphidxy",
-  "pfcand_dlambdadz",
-  "pfcand_btagEtaRel",
-  "pfcand_btagPtRatio",
-  "pfcand_btagPParRatio",
-  "pfcand_btagSip2dVal",
-  "pfcand_btagSip2dSig",
-  "pfcand_btagSip3dVal",
-  "pfcand_btagSip3dSig",
-  "pfcand_btagJetDistVal",
+const std::vector<std::string>
+    DeepBoostedJetTagInfoProducer::particle_features_{
+        "pfcand_puppiw",        "pfcand_hcalFrac",     "pfcand_VTX_ass",
+        "pfcand_lostInnerHits", "pfcand_quality",      "pfcand_charge",
+        "pfcand_isEl",          "pfcand_isMu",         "pfcand_isChargedHad",
+        "pfcand_isGamma",       "pfcand_isNeutralHad", "pfcand_phirel",
+        "pfcand_etarel",        "pfcand_deltaR",       "pfcand_abseta",
+        "pfcand_ptrel_log",     "pfcand_erel_log",     "pfcand_pt_log",
+        "pfcand_drminsv",       "pfcand_drsubjet1",    "pfcand_drsubjet2",
+        "pfcand_normchi2",      "pfcand_dz",           "pfcand_dzsig",
+        "pfcand_dxy",           "pfcand_dxysig",       "pfcand_dptdpt",
+        "pfcand_detadeta",      "pfcand_dphidphi",     "pfcand_dxydxy",
+        "pfcand_dzdz",          "pfcand_dxydz",        "pfcand_dphidxy",
+        "pfcand_dlambdadz",     "pfcand_btagEtaRel",   "pfcand_btagPtRatio",
+        "pfcand_btagPParRatio", "pfcand_btagSip2dVal", "pfcand_btagSip2dSig",
+        "pfcand_btagSip3dVal",  "pfcand_btagSip3dSig", "pfcand_btagJetDistVal",
+    };
+
+const std::vector<std::string> DeepBoostedJetTagInfoProducer::sv_features_{
+    "sv_phirel",    "sv_etarel",   "sv_deltaR", "sv_abseta",  "sv_mass",
+    "sv_ptrel_log", "sv_erel_log", "sv_pt_log", "sv_ntracks", "sv_normchi2",
+    "sv_dxy",       "sv_dxysig",   "sv_d3d",    "sv_d3dsig",  "sv_costhetasvpv",
 };
 
-const std::vector<std::string> DeepBoostedJetTagInfoProducer::sv_features_ {
-  "sv_phirel",
-  "sv_etarel",
-  "sv_deltaR",
-  "sv_abseta",
-  "sv_mass",
-  "sv_ptrel_log",
-  "sv_erel_log",
-  "sv_pt_log",
-  "sv_ntracks",
-  "sv_normchi2",
-  "sv_dxy",
-  "sv_dxysig",
-  "sv_d3d",
-  "sv_d3dsig",
-  "sv_costhetasvpv",
-};
-
-DeepBoostedJetTagInfoProducer::DeepBoostedJetTagInfoProducer(const edm::ParameterSet& iConfig)
-: has_puppi_weighted_daughters_(iConfig.getParameter<bool>("has_puppi_weighted_daughters"))
-, jet_radius_(iConfig.getParameter<double>("jet_radius"))
-, min_jet_pt_(iConfig.getParameter<double>("min_jet_pt"))
-, min_pt_for_track_properties_(iConfig.getParameter<double>("min_pt_for_track_properties"))
-, jet_token_(consumes<edm::View<reco::Jet>>(iConfig.getParameter<edm::InputTag>("jets")))
-, vtx_token_(consumes<VertexCollection>(iConfig.getParameter<edm::InputTag>("vertices")))
-, sv_token_(consumes<SVCollection>(iConfig.getParameter<edm::InputTag>("secondary_vertices")))
-, use_puppi_value_map_(false)
-, use_pvasq_value_map_(false)
-{
-
-  const auto & puppi_value_map_tag = iConfig.getParameter<edm::InputTag>("puppi_value_map");
+DeepBoostedJetTagInfoProducer::DeepBoostedJetTagInfoProducer(
+    const edm::ParameterSet &iConfig)
+    : has_puppi_weighted_daughters_(
+          iConfig.getParameter<bool>("has_puppi_weighted_daughters")),
+      jet_radius_(iConfig.getParameter<double>("jet_radius")),
+      min_jet_pt_(iConfig.getParameter<double>("min_jet_pt")),
+      min_pt_for_track_properties_(
+          iConfig.getParameter<double>("min_pt_for_track_properties")),
+      jet_token_(consumes<edm::View<reco::Jet>>(
+          iConfig.getParameter<edm::InputTag>("jets"))),
+      vtx_token_(consumes<VertexCollection>(
+          iConfig.getParameter<edm::InputTag>("vertices"))),
+      sv_token_(consumes<SVCollection>(
+          iConfig.getParameter<edm::InputTag>("secondary_vertices"))),
+      use_puppi_value_map_(false), use_pvasq_value_map_(false) {
+  const auto &puppi_value_map_tag =
+      iConfig.getParameter<edm::InputTag>("puppi_value_map");
   if (!puppi_value_map_tag.label().empty()) {
-    puppi_value_map_token_ = consumes<edm::ValueMap<float>>(puppi_value_map_tag);
+    puppi_value_map_token_ =
+        consumes<edm::ValueMap<float>>(puppi_value_map_tag);
     use_puppi_value_map_ = true;
   }
 
-  const auto & pvas_tag = iConfig.getParameter<edm::InputTag>("vertex_associator");
+  const auto &pvas_tag =
+      iConfig.getParameter<edm::InputTag>("vertex_associator");
   if (!pvas_tag.label().empty()) {
     pvasq_value_map_token_ = consumes<edm::ValueMap<int>>(pvas_tag);
     pvas_token_ = consumes<edm::Association<VertexCollection>>(pvas_tag);
@@ -161,15 +127,12 @@ DeepBoostedJetTagInfoProducer::DeepBoostedJetTagInfoProducer(const edm::Paramete
   }
 
   produces<DeepBoostedJetTagInfoCollection>();
-
 }
 
-DeepBoostedJetTagInfoProducer::~DeepBoostedJetTagInfoProducer()
-{
-}
+DeepBoostedJetTagInfoProducer::~DeepBoostedJetTagInfoProducer() {}
 
-void DeepBoostedJetTagInfoProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions)
-{
+void DeepBoostedJetTagInfoProducer::fillDescriptions(
+    edm::ConfigurationDescriptions &descriptions) {
   // pfDeepBoostedJetTagInfos
   edm::ParameterSetDescription desc;
   desc.add<bool>("has_puppi_weighted_daughters", true);
@@ -177,23 +140,25 @@ void DeepBoostedJetTagInfoProducer::fillDescriptions(edm::ConfigurationDescripti
   desc.add<double>("min_jet_pt", 150);
   desc.add<double>("min_pt_for_track_properties", -1);
   desc.add<edm::InputTag>("vertices", edm::InputTag("offlinePrimaryVertices"));
-  desc.add<edm::InputTag>("secondary_vertices", edm::InputTag("inclusiveCandidateSecondaryVertices"));
+  desc.add<edm::InputTag>("secondary_vertices",
+                          edm::InputTag("inclusiveCandidateSecondaryVertices"));
   desc.add<edm::InputTag>("jets", edm::InputTag("ak8PFJetsPuppi"));
   desc.add<edm::InputTag>("puppi_value_map", edm::InputTag("puppi"));
-  desc.add<edm::InputTag>("vertex_associator", edm::InputTag("primaryVertexAssociation","original"));
+  desc.add<edm::InputTag>(
+      "vertex_associator",
+      edm::InputTag("primaryVertexAssociation", "original"));
   descriptions.add("pfDeepBoostedJetTagInfos", desc);
 }
 
-void DeepBoostedJetTagInfoProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-
+void DeepBoostedJetTagInfoProducer::produce(edm::Event &iEvent,
+                                            const edm::EventSetup &iSetup) {
   auto output_tag_infos = std::make_unique<DeepBoostedJetTagInfoCollection>();
 
   edm::Handle<edm::View<reco::Jet>> jets;
   iEvent.getByToken(jet_token_, jets);
 
   iEvent.getByToken(vtx_token_, vtxs_);
-  if (vtxs_->empty()){
+  if (vtxs_->empty()) {
     // produce empty TagInfos in case no primary vertex
     iEvent.put(std::move(output_tag_infos));
     return; // exit event
@@ -203,7 +168,8 @@ void DeepBoostedJetTagInfoProducer::produce(edm::Event& iEvent, const edm::Event
 
   iEvent.getByToken(sv_token_, svs_);
 
-  iSetup.get<TransientTrackRecord>().get("TransientTrackBuilder", track_builder_);
+  iSetup.get<TransientTrackRecord>().get("TransientTrackBuilder",
+                                         track_builder_);
 
   if (use_puppi_value_map_) {
     iEvent.getByToken(puppi_value_map_token_, puppi_value_map_);
@@ -214,23 +180,29 @@ void DeepBoostedJetTagInfoProducer::produce(edm::Event& iEvent, const edm::Event
     iEvent.getByToken(pvas_token_, pvas_);
   }
 
-  for (std::size_t jet_n = 0; jet_n < jets->size(); jet_n++){
-
-    const auto& jet = (*jets)[jet_n];
+  for (std::size_t jet_n = 0; jet_n < jets->size(); jet_n++) {
+    const auto &jet = (*jets)[jet_n];
     edm::RefToBase<reco::Jet> jet_ref(jets, jet_n);
 
     // create jet features
     DeepBoostedJetFeatures features;
     // declare all the feature variables (init as empty vector)
-    for (const auto &name : particle_features_) { features.add(name); }
-    for (const auto &name : sv_features_) { features.add(name); }
+    for (const auto &name : particle_features_) {
+      features.add(name);
+    }
+    for (const auto &name : sv_features_) {
+      features.add(name);
+    }
 
-    // fill values only if above pt threshold and has daughters, otherwise left empty
+    // fill values only if above pt threshold and has daughters, otherwise left
+    // empty
     bool fill_vars = true;
-    if (jet.pt() < min_jet_pt_) fill_vars = false;
-    if (jet.numberOfDaughters() == 0) fill_vars = false;
+    if (jet.pt() < min_jet_pt_)
+      fill_vars = false;
+    if (jet.numberOfDaughters() == 0)
+      fill_vars = false;
 
-    if (fill_vars){
+    if (fill_vars) {
       fillParticleFeatures(features, jet);
       fillSVFeatures(features, jet);
 
@@ -245,88 +217,123 @@ void DeepBoostedJetTagInfoProducer::produce(edm::Event& iEvent, const edm::Event
   iEvent.put(std::move(output_tag_infos));
 }
 
-void DeepBoostedJetTagInfoProducer::fillParticleFeatures(DeepBoostedJetFeatures &fts, const reco::Jet &jet){
-
+void DeepBoostedJetTagInfoProducer::fillParticleFeatures(
+    DeepBoostedJetFeatures &fts, const reco::Jet &jet) {
   // require the input to be a pat::Jet
-  const auto* patJet = dynamic_cast<const pat::Jet*>(&jet);
-  if (!patJet){
-    throw edm::Exception(edm::errors::InvalidReference) << "Input is not a pat::Jet.";
+  const auto *patJet = dynamic_cast<const pat::Jet *>(&jet);
+  if (!patJet) {
+    throw edm::Exception(edm::errors::InvalidReference)
+        << "Input is not a pat::Jet.";
   }
 
   // do nothing if jet does not have constituents
-  if (jet.numberOfDaughters()==0) return;
+  if (jet.numberOfDaughters() == 0)
+    return;
 
   // some jet properties
   math::XYZVector jet_dir = jet.momentum().Unit();
   GlobalVector jet_ref_track_dir(jet.px(), jet.py(), jet.pz());
-  const float etasign = jet.eta()>0 ? 1 : -1;
+  const float etasign = jet.eta() > 0 ? 1 : -1;
 
   std::map<reco::CandidatePtr::key_type, float> puppi_wgt_cache;
-  auto puppiWgt = [&](const reco::CandidatePtr& cand){
-    const auto* pack_cand = dynamic_cast<const pat::PackedCandidate*>(&(*cand));
-    const auto* reco_cand = dynamic_cast<const reco::PFCandidate*>(&(*cand));
+  auto puppiWgt = [&](const reco::CandidatePtr &cand) {
+    const auto *pack_cand =
+        dynamic_cast<const pat::PackedCandidate *>(&(*cand));
+    const auto *reco_cand = dynamic_cast<const reco::PFCandidate *>(&(*cand));
     float wgt = 1.;
     if (pack_cand) {
       wgt = pack_cand->puppiWeight();
     } else if (reco_cand) {
-      if (use_puppi_value_map_){ wgt = (*puppi_value_map_)[cand]; }
-      else { throw edm::Exception(edm::errors::InvalidReference) << "Puppi value map is missing"; }
+      if (use_puppi_value_map_) {
+        wgt = (*puppi_value_map_)[cand];
+      } else {
+        throw edm::Exception(edm::errors::InvalidReference)
+            << "Puppi value map is missing";
+      }
     } else {
-      throw edm::Exception(edm::errors::InvalidReference) << "Cannot convert to either pat::PackedCandidate or reco::PFCandidate";
+      throw edm::Exception(edm::errors::InvalidReference)
+          << "Cannot convert to either pat::PackedCandidate or "
+             "reco::PFCandidate";
     }
     puppi_wgt_cache[cand.key()] = wgt;
     return wgt;
   };
 
   std::vector<reco::CandidatePtr> daughters;
-  for (const auto& cand : jet.daughterPtrVector()){
+  for (const auto &cand : jet.daughterPtrVector()) {
     // remove particles w/ extremely low puppi weights
-    if ((puppiWgt(cand)) < 0.01) continue;
+    if ((puppiWgt(cand)) < 0.01)
+      continue;
     daughters.push_back(cand);
   }
   // sort by (Puppi-weighted) pt
   if (!has_puppi_weighted_daughters_) {
-    std::sort(daughters.begin(), daughters.end(), [&puppi_wgt_cache](const reco::CandidatePtr& a, const reco::CandidatePtr& b){
-      return puppi_wgt_cache.at(a.key())*a->pt() > puppi_wgt_cache.at(b.key())*b->pt(); });
-  }else{
-    std::sort(daughters.begin(), daughters.end(), [](const reco::CandidatePtr& a, const reco::CandidatePtr& b){ return a->pt() > b->pt(); });
+    std::sort(daughters.begin(), daughters.end(),
+              [&puppi_wgt_cache](const reco::CandidatePtr &a,
+                                 const reco::CandidatePtr &b) {
+                return puppi_wgt_cache.at(a.key()) * a->pt() >
+                       puppi_wgt_cache.at(b.key()) * b->pt();
+              });
+  } else {
+    std::sort(daughters.begin(), daughters.end(),
+              [](const reco::CandidatePtr &a, const reco::CandidatePtr &b) {
+                return a->pt() > b->pt();
+              });
   }
 
   // reserve space
-  for (const auto &name : particle_features_) { fts.reserve(name, daughters.size()); }
+  for (const auto &name : particle_features_) {
+    fts.reserve(name, daughters.size());
+  }
 
-  auto useTrackProperties = [&](const reco::PFCandidate* reco_cand) {
-    const auto* trk = reco_cand->bestTrack();
-    return trk!=nullptr && trk->pt()>min_pt_for_track_properties_;
+  auto useTrackProperties = [&](const reco::PFCandidate *reco_cand) {
+    const auto *trk = reco_cand->bestTrack();
+    return trk != nullptr && trk->pt() > min_pt_for_track_properties_;
   };
 
-  for (const auto& cand : daughters){
-    const auto* packed_cand = dynamic_cast<const pat::PackedCandidate*>(&(*cand));
-    const auto* reco_cand = dynamic_cast<const reco::PFCandidate*>(&(*cand));
+  for (const auto &cand : daughters) {
+    const auto *packed_cand =
+        dynamic_cast<const pat::PackedCandidate *>(&(*cand));
+    const auto *reco_cand = dynamic_cast<const reco::PFCandidate *>(&(*cand));
 
     auto puppiP4 = cand->p4();
-    if (packed_cand){
+    if (packed_cand) {
       if (!has_puppi_weighted_daughters_) {
         puppiP4 *= puppi_wgt_cache.at(cand.key());
       }
 
-      fts.fill("pfcand_hcalFrac", packed_cand->hcalFraction());
+      float hcal_fraction = 0.;
+      if (packed_cand->pdgId() == 1 || packed_cand->pdgId() == 130) {
+        hcal_fraction = packed_cand->hcalFraction();
+      } else if (packed_cand->isIsolatedChargedHadron()) {
+        hcal_fraction = packed_cand->rawHcalFraction();
+      }
+
+      fts.fill("pfcand_hcalFrac", hcal_fraction);
       fts.fill("pfcand_VTX_ass", packed_cand->pvAssociationQuality());
       fts.fill("pfcand_lostInnerHits", packed_cand->lostInnerHits());
-      fts.fill("pfcand_quality", packed_cand->bestTrack() ? packed_cand->bestTrack()->qualityMask() : 0);
+      fts.fill("pfcand_quality", packed_cand->bestTrack()
+                                     ? packed_cand->bestTrack()->qualityMask()
+                                     : 0);
 
       fts.fill("pfcand_charge", packed_cand->charge());
-      fts.fill("pfcand_isEl", std::abs(packed_cand->pdgId())==11);
-      fts.fill("pfcand_isMu", std::abs(packed_cand->pdgId())==13);
-      fts.fill("pfcand_isChargedHad", std::abs(packed_cand->pdgId())==211);
-      fts.fill("pfcand_isGamma", std::abs(packed_cand->pdgId())==22);
-      fts.fill("pfcand_isNeutralHad", std::abs(packed_cand->pdgId())==130);
+      fts.fill("pfcand_isEl", std::abs(packed_cand->pdgId()) == 11);
+      fts.fill("pfcand_isMu", std::abs(packed_cand->pdgId()) == 13);
+      fts.fill("pfcand_isChargedHad", std::abs(packed_cand->pdgId()) == 211);
+      fts.fill("pfcand_isGamma", std::abs(packed_cand->pdgId()) == 22);
+      fts.fill("pfcand_isNeutralHad", std::abs(packed_cand->pdgId()) == 130);
 
       // impact parameters
       fts.fill("pfcand_dz", catch_infs(packed_cand->dz()));
-      fts.fill("pfcand_dzsig", packed_cand->bestTrack() ? catch_infs(packed_cand->dz()/packed_cand->dzError()) : 0);
+      fts.fill("pfcand_dzsig",
+               packed_cand->bestTrack()
+                   ? catch_infs(packed_cand->dz() / packed_cand->dzError())
+                   : 0);
       fts.fill("pfcand_dxy", catch_infs(packed_cand->dxy()));
-      fts.fill("pfcand_dxysig", packed_cand->bestTrack() ? catch_infs(packed_cand->dxy()/packed_cand->dxyError()) : 0);
+      fts.fill("pfcand_dxysig",
+               packed_cand->bestTrack()
+                   ? catch_infs(packed_cand->dxy() / packed_cand->dxyError())
+                   : 0);
 
     } else if (reco_cand) {
       // get vertex association quality
@@ -334,33 +341,40 @@ void DeepBoostedJetTagInfoProducer::fillParticleFeatures(DeepBoostedJetFeatures
       float vtx_ass = 0;
       if (use_pvasq_value_map_) {
         pv_ass_quality = (*pvasq_value_map_)[cand];
-        const reco::VertexRef & PV_orig = (*pvas_)[cand];
+        const reco::VertexRef &PV_orig = (*pvas_)[cand];
         vtx_ass = vtx_ass_from_pfcand(*reco_cand, pv_ass_quality, PV_orig);
       } else {
-        throw edm::Exception(edm::errors::InvalidReference) << "Vertex association missing";
+        throw edm::Exception(edm::errors::InvalidReference)
+            << "Vertex association missing";
       }
 
-      fts.fill("pfcand_hcalFrac", reco_cand->hcalEnergy()/(reco_cand->ecalEnergy()+reco_cand->hcalEnergy()));
+      fts.fill("pfcand_hcalFrac",
+               reco_cand->hcalEnergy() /
+                   (reco_cand->ecalEnergy() + reco_cand->hcalEnergy()));
       fts.fill("pfcand_VTX_ass", vtx_ass);
-      fts.fill("pfcand_lostInnerHits", useTrackProperties(reco_cand) ? lost_inner_hits_from_pfcand(*reco_cand) : 0);
-      fts.fill("pfcand_quality", useTrackProperties(reco_cand) ? quality_from_pfcand(*reco_cand) : 0);
+      fts.fill("pfcand_lostInnerHits",
+               useTrackProperties(reco_cand)
+                   ? lost_inner_hits_from_pfcand(*reco_cand)
+                   : 0);
+      fts.fill("pfcand_quality", useTrackProperties(reco_cand)
+                                     ? quality_from_pfcand(*reco_cand)
+                                     : 0);
 
       fts.fill("pfcand_charge", reco_cand->charge());
-      fts.fill("pfcand_isEl", std::abs(reco_cand->pdgId())==11);
-      fts.fill("pfcand_isMu", std::abs(reco_cand->pdgId())==13);
-      fts.fill("pfcand_isChargedHad", std::abs(reco_cand->pdgId())==211);
-      fts.fill("pfcand_isGamma", std::abs(reco_cand->pdgId())==22);
-      fts.fill("pfcand_isNeutralHad", std::abs(reco_cand->pdgId())==130);
+      fts.fill("pfcand_isEl", std::abs(reco_cand->pdgId()) == 11);
+      fts.fill("pfcand_isMu", std::abs(reco_cand->pdgId()) == 13);
+      fts.fill("pfcand_isChargedHad", std::abs(reco_cand->pdgId()) == 211);
+      fts.fill("pfcand_isGamma", std::abs(reco_cand->pdgId()) == 22);
+      fts.fill("pfcand_isNeutralHad", std::abs(reco_cand->pdgId()) == 130);
 
       // impact parameters
-      const auto* trk = reco_cand->bestTrack();
+      const auto *trk = reco_cand->bestTrack();
       float dz = trk ? trk->dz(pv_->position()) : 0;
       float dxy = trk ? trk->dxy(pv_->position()) : 0;
       fts.fill("pfcand_dz", catch_infs(dz));
-      fts.fill("pfcand_dzsig", trk ? catch_infs(dz/trk->dzError()) : 0);
+      fts.fill("pfcand_dzsig", trk ? catch_infs(dz / trk->dzError()) : 0);
       fts.fill("pfcand_dxy", catch_infs(dxy));
-      fts.fill("pfcand_dxysig", trk ? catch_infs(dxy/trk->dxyError()) : 0);
-
+      fts.fill("pfcand_dxysig", trk ? catch_infs(dxy / trk->dxyError()) : 0);
     }
 
     // basic kinematics
@@ -370,41 +384,53 @@ void DeepBoostedJetTagInfoProducer::fillParticleFeatures(DeepBoostedJetFeatures
     fts.fill("pfcand_deltaR", reco::deltaR(puppiP4, jet));
     fts.fill("pfcand_abseta", std::abs(puppiP4.eta()));
 
-    fts.fill("pfcand_ptrel_log", catch_infs(std::log(puppiP4.pt()/jet.pt()), -99));
-    fts.fill("pfcand_erel_log", catch_infs(std::log(puppiP4.energy()/jet.energy()), -99));
+    fts.fill("pfcand_ptrel_log",
+             catch_infs(std::log(puppiP4.pt() / jet.pt()), -99));
+    fts.fill("pfcand_erel_log",
+             catch_infs(std::log(puppiP4.energy() / jet.energy()), -99));
     fts.fill("pfcand_pt_log", catch_infs(std::log(puppiP4.pt()), -99));
 
     double minDR = 999;
-    for (const auto &sv : *svs_){
+    for (const auto &sv : *svs_) {
       double dr = reco::deltaR(*cand, sv);
-      if (dr < minDR) minDR = dr;
+      if (dr < minDR)
+        minDR = dr;
     }
-    fts.fill("pfcand_drminsv", minDR==999 ? -1 : minDR);
+    fts.fill("pfcand_drminsv", minDR == 999 ? -1 : minDR);
 
     // subjets
     auto subjets = patJet->subjets();
-    std::sort(subjets.begin(), subjets.end(), [](const edm::Ptr<pat::Jet>& p1, const edm::Ptr<pat::Jet>& p2){ return p1->pt()>p2->pt(); }); // sort by pt
-    fts.fill("pfcand_drsubjet1", !subjets.empty() ? reco::deltaR(*cand, *subjets.at(0)) : -1);
-    fts.fill("pfcand_drsubjet2", subjets.size()>1 ? reco::deltaR(*cand, *subjets.at(1)) : -1);
+    std::sort(subjets.begin(), subjets.end(),
+              [](const edm::Ptr<pat::Jet> &p1, const edm::Ptr<pat::Jet> &p2) {
+                return p1->pt() > p2->pt();
+              }); // sort by pt
+    fts.fill("pfcand_drsubjet1",
+             !subjets.empty() ? reco::deltaR(*cand, *subjets.at(0)) : -1);
+    fts.fill("pfcand_drsubjet2",
+             subjets.size() > 1 ? reco::deltaR(*cand, *subjets.at(1)) : -1);
 
     const reco::Track *trk = nullptr;
-    if (packed_cand) { trk = packed_cand->bestTrack(); }
-    else if (reco_cand && useTrackProperties(reco_cand)) { trk= reco_cand->bestTrack(); }
-    if (trk){
-      fts.fill("pfcand_normchi2", catch_infs(std::floor(trk->normalizedChi2())));
+    if (packed_cand) {
+      trk = packed_cand->bestTrack();
+    } else if (reco_cand && useTrackProperties(reco_cand)) {
+      trk = reco_cand->bestTrack();
+    }
+    if (trk) {
+      fts.fill("pfcand_normchi2",
+               catch_infs(std::floor(trk->normalizedChi2())));
 
       // track covariance
       auto cov = [&](unsigned i, unsigned j) {
         return catch_infs(trk->covariance(i, j));
       };
-      fts.fill("pfcand_dptdpt", cov(0,0));
-      fts.fill("pfcand_detadeta", cov(1,1));
-      fts.fill("pfcand_dphidphi", cov(2,2));
-      fts.fill("pfcand_dxydxy", cov(3,3));
-      fts.fill("pfcand_dzdz", cov(4,4));
-      fts.fill("pfcand_dxydz", cov(3,4));
-      fts.fill("pfcand_dphidxy", cov(2,3));
-      fts.fill("pfcand_dlambdadz", cov(1,4));
+      fts.fill("pfcand_dptdpt", cov(0, 0));
+      fts.fill("pfcand_detadeta", cov(1, 1));
+      fts.fill("pfcand_dphidphi", cov(2, 2));
+      fts.fill("pfcand_dxydxy", cov(3, 3));
+      fts.fill("pfcand_dzdz", cov(4, 4));
+      fts.fill("pfcand_dxydz", cov(3, 4));
+      fts.fill("pfcand_dphidxy", cov(2, 3));
+      fts.fill("pfcand_dlambdadz", cov(1, 4));
 
       TrackInfoBuilder trkinfo(track_builder_);
       trkinfo.buildTrackInfo(&(*cand), jet_dir, jet_ref_track_dir, *pv_);
@@ -416,7 +442,7 @@ void DeepBoostedJetTagInfoProducer::fillParticleFeatures(DeepBoostedJetFeatures
       fts.fill("pfcand_btagSip3dVal", trkinfo.getTrackSip3dVal());
       fts.fill("pfcand_btagSip3dSig", trkinfo.getTrackSip3dSig());
       fts.fill("pfcand_btagJetDistVal", trkinfo.getTrackJetDistVal());
-    }else{
+    } else {
       fts.fill("pfcand_normchi2", 999);
 
       fts.fill("pfcand_dptdpt", 0);
@@ -437,29 +463,32 @@ void DeepBoostedJetTagInfoProducer::fillParticleFeatures(DeepBoostedJetFeatures
       fts.fill("pfcand_btagSip3dSig", 0);
       fts.fill("pfcand_btagJetDistVal", 0);
     }
-
   }
-
 }
 
-void DeepBoostedJetTagInfoProducer::fillSVFeatures(DeepBoostedJetFeatures &fts, const reco::Jet &jet){
-  std::vector<const reco::VertexCompositePtrCandidate*> jetSVs;
-  for (const auto &sv : *svs_){
-    if (reco::deltaR2(sv, jet) < jet_radius_*jet_radius_) {
+void DeepBoostedJetTagInfoProducer::fillSVFeatures(DeepBoostedJetFeatures &fts,
+                                                   const reco::Jet &jet) {
+  std::vector<const reco::VertexCompositePtrCandidate *> jetSVs;
+  for (const auto &sv : *svs_) {
+    if (reco::deltaR2(sv, jet) < jet_radius_ * jet_radius_) {
       jetSVs.push_back(&sv);
     }
   }
   // sort by dxy significance
-  std::sort(jetSVs.begin(), jetSVs.end(), [&](const reco::VertexCompositePtrCandidate *sva, const reco::VertexCompositePtrCandidate *svb){
-    return sv_vertex_comparator(*sva, *svb, *pv_);
-  });
+  std::sort(jetSVs.begin(), jetSVs.end(),
+            [&](const reco::VertexCompositePtrCandidate *sva,
+                const reco::VertexCompositePtrCandidate *svb) {
+              return sv_vertex_comparator(*sva, *svb, *pv_);
+            });
 
   // reserve space
-  for (const auto &name : sv_features_) { fts.reserve(name, jetSVs.size()); }
+  for (const auto &name : sv_features_) {
+    fts.reserve(name, jetSVs.size());
+  }
 
-  const float etasign = jet.eta()>0 ? 1 : -1;
+  const float etasign = jet.eta() > 0 ? 1 : -1;
 
-  for (const auto *sv : jetSVs){
+  for (const auto *sv : jetSVs) {
     // basic kinematics
     fts.fill("sv_phirel", reco::deltaPhi(*sv, jet));
     fts.fill("sv_etarel", etasign * (sv->eta() - jet.eta()));
@@ -467,8 +496,9 @@ void DeepBoostedJetTagInfoProducer::fillSVFeatures(DeepBoostedJetFeatures &fts,
     fts.fill("sv_abseta", std::abs(sv->eta()));
     fts.fill("sv_mass", sv->mass());
 
-    fts.fill("sv_ptrel_log", catch_infs(std::log(sv->pt()/jet.pt()), -99));
-    fts.fill("sv_erel_log", catch_infs(std::log(sv->energy()/jet.energy()), -99));
+    fts.fill("sv_ptrel_log", catch_infs(std::log(sv->pt() / jet.pt()), -99));
+    fts.fill("sv_erel_log",
+             catch_infs(std::log(sv->energy() / jet.energy()), -99));
     fts.fill("sv_pt_log", catch_infs(std::log(sv->pt()), -99));
 
     // sv properties
@@ -485,7 +515,6 @@ void DeepBoostedJetTagInfoProducer::fillSVFeatures(DeepBoostedJetFeatures &fts,
 
     fts.fill("sv_costhetasvpv", vertexDdotP(*sv, *pv_));
   }
-
 }
 
 // define this as a plug-in
diff --git a/RecoBTag/FeatureTools/plugins/DeepFlavourTagInfoProducer.cc b/RecoBTag/FeatureTools/plugins/DeepFlavourTagInfoProducer.cc
index 97a2d3e07f30d..8ac14b337620e 100644
--- a/RecoBTag/FeatureTools/plugins/DeepFlavourTagInfoProducer.cc
+++ b/RecoBTag/FeatureTools/plugins/DeepFlavourTagInfoProducer.cc
@@ -152,6 +152,15 @@ void DeepFlavourTagInfoProducer::produce(edm::Event& iEvent, const edm::EventSet
 
   edm::Handle<ShallowTagInfoCollection> shallow_tag_infos;
   iEvent.getByToken(shallow_tag_info_token_, shallow_tag_infos);
+  double negative_cut = 0;//used only with flip_
+  if (flip_){//FIXME: Check if can do even less often than once per event
+    const edm::Provenance *prov = shallow_tag_infos.provenance();
+    const edm::ParameterSet& psetFromProvenance = edm::parameterSet(*prov);
+    negative_cut = ( ( psetFromProvenance.getParameter<edm::ParameterSet>("computer")
+                       ).getParameter<edm::ParameterSet>("trackSelection")
+                     ).getParameter<double>("sip3dSigMax");
+  }
+
 
   edm::Handle<edm::ValueMap<float>> puppi_value_map;
   if (use_puppi_value_map_) {
@@ -274,12 +283,6 @@ void DeepFlavourTagInfoProducer::produce(edm::Event& iEvent, const edm::EventSet
     features.n_pf_features.resize(n_sorted.size());
 
 
-    const edm::Provenance *prov = shallow_tag_infos.provenance();
-    const edm::ParameterSet& psetFromProvenance = edm::parameterSet(*prov);
-    double negative_cut = ( ( psetFromProvenance.getParameter<edm::ParameterSet>("computer")
-			      ).getParameter<edm::ParameterSet>("trackSelection")
-			    ).getParameter<double>("sip3dSigMax");
-
   for (unsigned int i = 0; i <  jet.numberOfDaughters(); i++){
 
     // get pointer and check that is correct
diff --git a/RecoBTag/MXNet/python/Parameters/V01/pfDeepBoostedJetPreprocessParams_cfi.py b/RecoBTag/MXNet/python/Parameters/V01/pfDeepBoostedJetPreprocessParams_cfi.py
new file mode 100644
index 0000000000000..7651971bf72f3
--- /dev/null
+++ b/RecoBTag/MXNet/python/Parameters/V01/pfDeepBoostedJetPreprocessParams_cfi.py
@@ -0,0 +1,309 @@
+import FWCore.ParameterSet.Config as cms
+
+pfDeepBoostedJetPreprocessParams = cms.PSet(
+    input_names = cms.vstring(
+        'pfcand', 
+        'sv'
+    ),
+    pfcand = cms.PSet(
+        input_shape = cms.vuint32(1, 42, 100, 1),
+        var_infos = cms.PSet(
+            pfcand_VTX_ass = cms.PSet(
+                median = cms.double(7.0),
+                norm_factor = cms.double(1.0)
+            ),
+            pfcand_abseta = cms.PSet(
+                median = cms.double(0.599505603313),
+                norm_factor = cms.double(1.62486362457)
+            ),
+            pfcand_btagEtaRel = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(0.309551209211)
+            ),
+            pfcand_btagJetDistVal = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(1.0)
+            ),
+            pfcand_btagPParRatio = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(1.00271141529)
+            ),
+            pfcand_btagPtRatio = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(5.73484706879)
+            ),
+            pfcand_btagSip2dSig = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(1.76905345917)
+            ),
+            pfcand_btagSip2dVal = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(605.021118164)
+            ),
+            pfcand_btagSip3dSig = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(0.966644644737)
+            ),
+            pfcand_btagSip3dVal = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(239.708831787)
+            ),
+            pfcand_charge = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(1.0)
+            ),
+            pfcand_deltaR = cms.PSet(
+                median = cms.double(0.22575956583),
+                norm_factor = cms.double(3.81050634384)
+            ),
+            pfcand_detadeta = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(1967329.375)
+            ),
+            pfcand_dlambdadz = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(1.0)
+            ),
+            pfcand_dphidphi = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(1310150.125)
+            ),
+            pfcand_dphidxy = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(1.0)
+            ),
+            pfcand_dptdpt = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(163433.265625)
+            ),
+            pfcand_drminsv = cms.PSet(
+                median = cms.double(0.177426457405),
+                norm_factor = cms.double(2.64722108841)
+            ),
+            pfcand_drsubjet1 = cms.PSet(
+                median = cms.double(0.231124095619),
+                norm_factor = cms.double(3.14072275162)
+            ),
+            pfcand_drsubjet2 = cms.PSet(
+                median = cms.double(0.263272643089),
+                norm_factor = cms.double(2.92228007317)
+            ),
+            pfcand_dxy = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(392.713317871)
+            ),
+            pfcand_dxydxy = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(46519.0234375)
+            ),
+            pfcand_dxydz = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(7626007.0)
+            ),
+            pfcand_dxysig = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(2.0138297081)
+            ),
+            pfcand_dz = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(222.85093689)
+            ),
+            pfcand_dzdz = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(29383.0683594)
+            ),
+            pfcand_dzsig = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(1.67618751526)
+            ),
+            pfcand_erel_log = cms.PSet(
+                median = cms.double(-5.38983869553),
+                norm_factor = cms.double(0.539102613926)
+            ),
+            pfcand_etarel = cms.PSet(
+                median = cms.double(-0.0054658302106),
+                norm_factor = cms.double(5.54556131363)
+            ),
+            pfcand_hcalFrac = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(1.0)
+            ),
+            pfcand_isChargedHad = cms.PSet(
+                median = cms.double(1.0),
+                norm_factor = cms.double(1.0)
+            ),
+            pfcand_isEl = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(1.0)
+            ),
+            pfcand_isGamma = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(1.0)
+            ),
+            pfcand_isMu = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(1.0)
+            ),
+            pfcand_isNeutralHad = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(1.0)
+            ),
+            pfcand_lostInnerHits = cms.PSet(
+                median = cms.double(-1.0),
+                norm_factor = cms.double(1.0)
+            ),
+            pfcand_normchi2 = cms.PSet(
+                median = cms.double(999.0),
+                norm_factor = cms.double(1.0)
+            ),
+            pfcand_phirel = cms.PSet(
+                median = cms.double(-5.10289683007e-05),
+                norm_factor = cms.double(4.63705921173)
+            ),
+            pfcand_pt_log = cms.PSet(
+                median = cms.double(1.09469842911),
+                norm_factor = cms.double(0.518874108791)
+            ),
+            pfcand_ptrel_log = cms.PSet(
+                median = cms.double(-5.38205528259),
+                norm_factor = cms.double(0.53791975975)
+            ),
+            pfcand_puppiw = cms.PSet(
+                median = cms.double(1.0),
+                norm_factor = cms.double(1.0)
+            ),
+            pfcand_quality = cms.PSet(
+                median = cms.double(0.0),
+                norm_factor = cms.double(0.20000000298)
+            )
+        ),
+        var_length = cms.uint32(100),
+        var_names = cms.vstring(
+            'pfcand_pt_log', 
+            'pfcand_ptrel_log', 
+            'pfcand_erel_log', 
+            'pfcand_phirel', 
+            'pfcand_etarel', 
+            'pfcand_deltaR', 
+            'pfcand_abseta', 
+            'pfcand_puppiw', 
+            'pfcand_drminsv', 
+            'pfcand_drsubjet1', 
+            'pfcand_drsubjet2', 
+            'pfcand_charge', 
+            'pfcand_isMu', 
+            'pfcand_isEl', 
+            'pfcand_isChargedHad', 
+            'pfcand_isGamma', 
+            'pfcand_isNeutralHad', 
+            'pfcand_hcalFrac', 
+            'pfcand_VTX_ass', 
+            'pfcand_lostInnerHits', 
+            'pfcand_normchi2', 
+            'pfcand_quality', 
+            'pfcand_dz', 
+            'pfcand_dzsig', 
+            'pfcand_dxy', 
+            'pfcand_dxysig', 
+            'pfcand_dptdpt', 
+            'pfcand_detadeta', 
+            'pfcand_dphidphi', 
+            'pfcand_dxydxy', 
+            'pfcand_dzdz', 
+            'pfcand_dxydz', 
+            'pfcand_dphidxy', 
+            'pfcand_dlambdadz', 
+            'pfcand_btagEtaRel', 
+            'pfcand_btagPtRatio', 
+            'pfcand_btagPParRatio', 
+            'pfcand_btagSip2dVal', 
+            'pfcand_btagSip2dSig', 
+            'pfcand_btagSip3dVal', 
+            'pfcand_btagSip3dSig', 
+            'pfcand_btagJetDistVal'
+        )
+    ),
+    sv = cms.PSet(
+        input_shape = cms.vuint32(1, 15, 7, 1),
+        var_infos = cms.PSet(
+            sv_abseta = cms.PSet(
+                median = cms.double(0.579698801041),
+                norm_factor = cms.double(1.54787838459)
+            ),
+            sv_costhetasvpv = cms.PSet(
+                median = cms.double(0.999744534492),
+                norm_factor = cms.double(4035.89501953)
+            ),
+            sv_d3d = cms.PSet(
+                median = cms.double(0.496477723122),
+                norm_factor = cms.double(0.230671063066)
+            ),
+            sv_d3dsig = cms.PSet(
+                median = cms.double(6.50515079498),
+                norm_factor = cms.double(0.0328928083181)
+            ),
+            sv_deltaR = cms.PSet(
+                median = cms.double(0.105607174337),
+                norm_factor = cms.double(4.58211994171)
+            ),
+            sv_dxy = cms.PSet(
+                median = cms.double(0.369336694479),
+                norm_factor = cms.double(0.277160406113)
+            ),
+            sv_dxysig = cms.PSet(
+                median = cms.double(6.49603271484),
+                norm_factor = cms.double(0.0328965261579)
+            ),
+            sv_erel_log = cms.PSet(
+                median = cms.double(-2.77275466919),
+                norm_factor = cms.double(0.976448118687)
+            ),
+            sv_etarel = cms.PSet(
+                median = cms.double(-0.00318800867535),
+                norm_factor = cms.double(10.1732673645)
+            ),
+            sv_mass = cms.PSet(
+                median = cms.double(1.36728298664),
+                norm_factor = cms.double(0.294783204794)
+            ),
+            sv_normchi2 = cms.PSet(
+                median = cms.double(0.796081960201),
+                norm_factor = cms.double(0.737576127052)
+            ),
+            sv_ntracks = cms.PSet(
+                median = cms.double(3.0),
+                norm_factor = cms.double(0.5)
+            ),
+            sv_phirel = cms.PSet(
+                median = cms.double(0.000510219600983),
+                norm_factor = cms.double(9.11781406403)
+            ),
+            sv_pt_log = cms.PSet(
+                median = cms.double(3.77797603607),
+                norm_factor = cms.double(0.889925837517)
+            ),
+            sv_ptrel_log = cms.PSet(
+                median = cms.double(-2.7622461319),
+                norm_factor = cms.double(0.975634276867)
+            )
+        ),
+        var_length = cms.uint32(7),
+        var_names = cms.vstring(
+            'sv_pt_log', 
+            'sv_ptrel_log', 
+            'sv_erel_log', 
+            'sv_phirel', 
+            'sv_etarel', 
+            'sv_deltaR', 
+            'sv_abseta', 
+            'sv_mass', 
+            'sv_ntracks', 
+            'sv_normchi2', 
+            'sv_dxy', 
+            'sv_dxysig', 
+            'sv_d3d', 
+            'sv_d3dsig', 
+            'sv_costhetasvpv'
+        )
+    )
+)
diff --git a/RecoBTag/MXNet/python/pfDeepBoostedJetPreprocessParams_cfi.py b/RecoBTag/MXNet/python/Parameters/V02/pfDeepBoostedJetPreprocessParams_cfi.py
similarity index 100%
rename from RecoBTag/MXNet/python/pfDeepBoostedJetPreprocessParams_cfi.py
rename to RecoBTag/MXNet/python/Parameters/V02/pfDeepBoostedJetPreprocessParams_cfi.py
diff --git a/RecoBTag/MXNet/python/pfMassDecorrelatedDeepBoostedJetPreprocessParams_cfi.py b/RecoBTag/MXNet/python/Parameters/V02/pfMassDecorrelatedDeepBoostedJetPreprocessParams_cfi.py
similarity index 100%
rename from RecoBTag/MXNet/python/pfMassDecorrelatedDeepBoostedJetPreprocessParams_cfi.py
rename to RecoBTag/MXNet/python/Parameters/V02/pfMassDecorrelatedDeepBoostedJetPreprocessParams_cfi.py
diff --git a/RecoBTag/MXNet/python/pfDeepBoostedJet_cff.py b/RecoBTag/MXNet/python/pfDeepBoostedJet_cff.py
index 8bcf98eed49c8..502d7a5636763 100644
--- a/RecoBTag/MXNet/python/pfDeepBoostedJet_cff.py
+++ b/RecoBTag/MXNet/python/pfDeepBoostedJet_cff.py
@@ -2,8 +2,8 @@
 
 from RecoBTag.FeatureTools.pfDeepBoostedJetTagInfos_cfi import pfDeepBoostedJetTagInfos
 from RecoBTag.MXNet.pfDeepBoostedJetTags_cfi import pfDeepBoostedJetTags as _pfDeepBoostedJetTags
-from RecoBTag.MXNet.pfDeepBoostedJetPreprocessParams_cfi import pfDeepBoostedJetPreprocessParams
-from RecoBTag.MXNet.pfMassDecorrelatedDeepBoostedJetPreprocessParams_cfi import pfMassDecorrelatedDeepBoostedJetPreprocessParams
+from RecoBTag.MXNet.Parameters.V02.pfDeepBoostedJetPreprocessParams_cfi import pfDeepBoostedJetPreprocessParams
+from RecoBTag.MXNet.Parameters.V02.pfMassDecorrelatedDeepBoostedJetPreprocessParams_cfi import pfMassDecorrelatedDeepBoostedJetPreprocessParams
 from RecoBTag.MXNet.pfDeepBoostedDiscriminatorsJetTags_cfi import pfDeepBoostedDiscriminatorsJetTags
 from RecoBTag.MXNet.pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags_cfi import pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags
 
diff --git a/RecoCTPPS/Configuration/test/raw_data_test.py b/RecoCTPPS/Configuration/test/raw_data_test.py
index ac34bde03665f..3a20056b5668a 100644
--- a/RecoCTPPS/Configuration/test/raw_data_test.py
+++ b/RecoCTPPS/Configuration/test/raw_data_test.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("CTPPSReconstructionChainTest", eras.ctpps_2016)
+from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
+process = cms.Process("CTPPSReconstructionChainTest", ctpps_2016)
 
 # minimum of logs
 process.MessageLogger = cms.Service("MessageLogger",
diff --git a/RecoCTPPS/PixelLocal/test/_aa_real_ALL_GT_2.py b/RecoCTPPS/PixelLocal/test/_aa_real_ALL_GT_2.py
index 4d865c8bf105a..27319cf158573 100644
--- a/RecoCTPPS/PixelLocal/test/_aa_real_ALL_GT_2.py
+++ b/RecoCTPPS/PixelLocal/test/_aa_real_ALL_GT_2.py
@@ -5,9 +5,9 @@
 # with command line options: step2 --filein=file:GluGluTo2Jets_M_300_2000_13TeV_exhume_cff_py_GEN_SIM_HECTOR_CTPPS.root --conditions auto:run2_mc -s DIGI:pdigi_valid,DIGI2RAW --datatier GEN-SIM-DIGI-RAW -n 10 --era Run2_2016 --eventcontent FEVTDEBUG --no_exec
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('CTPPS2',eras.Run2_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process('CTPPS2',Run2_2017)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_DB_real_mem.py b/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_DB_real_mem.py
index f5520a79ac139..063614ded72ba 100644
--- a/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_DB_real_mem.py
+++ b/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_DB_real_mem.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('CTPPS2',eras.Run2_25ns)
+from Configuration.Eras.Era_Run2_25ns_cff import Run2_25ns
+process = cms.Process('CTPPS2',Run2_25ns)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_DAQ_TRK.py b/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_DAQ_TRK.py
index d4fd24fe33c5b..43f8b484416d3 100644
--- a/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_DAQ_TRK.py
+++ b/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_DAQ_TRK.py
@@ -1,9 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 import FWCore.ParameterSet.VarParsing as VarParsing
 
-process = cms.Process('CTPPS2',eras.Run2_25ns)
+from Configuration.Eras.Era_Run2_25ns_cff import Run2_25ns
+process = cms.Process('CTPPS2',Run2_25ns)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_DB_real_mem.py b/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_DB_real_mem.py
index 11b73ad9b7cfe..6461f48911d12 100644
--- a/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_DB_real_mem.py
+++ b/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_DB_real_mem.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('CTPPS2',eras.Run2_25ns)
+from Configuration.Eras.Era_Run2_25ns_cff import Run2_25ns
+process = cms.Process('CTPPS2',Run2_25ns)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_mem_testDB_300811.py b/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_mem_testDB_300811.py
index 34171bb23ec67..bc145ed939fad 100644
--- a/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_mem_testDB_300811.py
+++ b/RecoCTPPS/PixelLocal/test/run_only_CTPPS_cfg_CLU_REC_mem_testDB_300811.py
@@ -1,9 +1,9 @@
 
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('CTPPS2',eras.Run2_25ns)
+from Configuration.Eras.Era_Run2_25ns_cff import Run2_25ns
+process = cms.Process('CTPPS2',Run2_25ns)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/RecoCTPPS/ProtonReconstruction/plugins/CTPPSProtonProducer.cc b/RecoCTPPS/ProtonReconstruction/plugins/CTPPSProtonProducer.cc
index 49d6cef0cd929..29174adc207d3 100644
--- a/RecoCTPPS/ProtonReconstruction/plugins/CTPPSProtonProducer.cc
+++ b/RecoCTPPS/ProtonReconstruction/plugins/CTPPSProtonProducer.cc
@@ -104,7 +104,7 @@ class CTPPSProtonProducer : public edm::stream::EDProducer<>
     ProtonReconstructionAlgorithm algorithm_;
 
     bool opticsValid_;
-    float currentCrossingAngle_;
+    edm::ESWatcher<CTPPSInterpolatedOpticsRcd> opticsWatcher_;
 };
 
 //----------------------------------------------------------------------------------------------------
@@ -126,8 +126,7 @@ CTPPSProtonProducer::CTPPSProtonProducer(const edm::ParameterSet& iConfig) :
   max_n_timing_tracks_        (iConfig.getParameter<unsigned int>("max_n_timing_tracks")),
 
   algorithm_                  (iConfig.getParameter<bool>("fitVtxY"), iConfig.getParameter<bool>("useImprovedInitialEstimate"), verbosity_),
-  opticsValid_(false),
-  currentCrossingAngle_(-1.)
+  opticsValid_(false)
 {
   for (const std::string &sector : { "45", "56" })
   {
@@ -219,10 +218,8 @@ void CTPPSProtonProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSe
     iSetup.get<VeryForwardRealGeometryRecord>().get(hGeometry);
 
     // re-initialise algorithm upon crossing-angle change
-    if (hLHCInfo->crossingAngle() != currentCrossingAngle_)
+    if (opticsWatcher_.check(iSetup))
     {
-      currentCrossingAngle_ = hLHCInfo->crossingAngle();
-
       if (hOpticalFunctions->empty()) {
         edm::LogInfo("CTPPSProtonProducer") << "No optical functions available, reconstruction disabled.";
         algorithm_.release();
@@ -290,18 +287,16 @@ void CTPPSProtonProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSe
           }
         }
 
+        // check that exactly two tracking RPs are involved
+        //    - 1 is insufficient for multi-RP reconstruction
+        //    - PPS did not use more than 2 tracking RPs per arm -> algorithms are tuned to this
+        std::set<unsigned int> rpIds;
+        for (const auto &idx : indices)
+          rpIds.insert(hTracks->at(idx).getRPId());
+
         // do multi-RP reco if chosen
-        if (doMultiRPReconstruction_)
+        if (doMultiRPReconstruction_ && rpIds.size() == 2)
         {
-          // check that exactly two tracking RPs are involved
-          //    - 1 is insufficient for multi-RP reconstruction
-          //    - PPS did not use more than 2 tracking RPs per arm -> algorithms are tuned to this
-          std::set<unsigned int> rpIds;
-          for (const auto &idx : indices)
-            rpIds.insert(hTracks->at(idx).getRPId());
-          if (rpIds.size() != 2)
-            continue;
-
           // find matching track pairs from different tracking RPs
           std::vector<std::pair<unsigned int, unsigned int>> idx_pairs;
           std::map<unsigned int, unsigned int> idx_pair_multiplicity;
diff --git a/RecoCTPPS/ProtonReconstruction/src/ProtonReconstructionAlgorithm.cc b/RecoCTPPS/ProtonReconstruction/src/ProtonReconstructionAlgorithm.cc
index 2a525d4686d55..d6c4dd0e3d590 100644
--- a/RecoCTPPS/ProtonReconstruction/src/ProtonReconstructionAlgorithm.cc
+++ b/RecoCTPPS/ProtonReconstruction/src/ProtonReconstructionAlgorithm.cc
@@ -166,8 +166,9 @@ reco::ForwardProton ProtonReconstructionAlgorithm::reconstructFromMultiRP(const
     const double b = i_F.ch0*i_N.la1 - i_N.ch0*i_F.la1 + i_F.ch1*i_N.la0 - i_N.ch1*i_F.la0 + x_N*i_F.la1 - x_F*i_N.la1;
     const double c = x_N*i_F.la0 - x_F*i_N.la0 + i_F.ch0*i_N.la0 - i_N.ch0*i_F.la0;
     const double D = b*b - 4.*a*c;
+    const double sqrt_D = (D >= 0.) ? sqrt(D) : 0.;
 
-    xi_init = (-b + sqrt(D)) / 2. / a;
+    xi_init = (-b + sqrt_D) / 2. / a;
     th_x_init = (x_N - i_N.ch0 - i_N.ch1 * xi_init) / (i_N.la0 + i_N.la1 * xi_init);
   }
   else {
@@ -183,12 +184,16 @@ reco::ForwardProton ProtonReconstructionAlgorithm::reconstructFromMultiRP(const
     xi_init = s_xi0 / s_1;
   }
 
+  if (!std::isfinite(xi_init))
+    xi_init = 0.;
+  if (!std::isfinite(th_x_init))
+    th_x_init = 0.;
+
   // initial estimate of th_y and vtx_y
-  double y[2], v_y[2], L_y[2];
+  double y[2]={0}, v_y[2]={0}, L_y[2]={0};
   unsigned int y_idx = 0;
   for (const auto &track : tracks) {
-    if (y_idx >= 2)
-      continue;
+    if (y_idx >= 2) break;
 
     auto oit = m_rp_optics_.find(track->getRPId());
 
@@ -204,14 +209,19 @@ reco::ForwardProton ProtonReconstructionAlgorithm::reconstructFromMultiRP(const
 
   if (fitVtxY_) {
     const double det_y = v_y[0] * L_y[1] - L_y[0] * v_y[1];
-    vtx_y_init = (L_y[1] * y[0] - L_y[0] * y[1]) / det_y;
-    th_y_init = (v_y[0] * y[1] - v_y[1] * y[0]) / det_y;
+    vtx_y_init = (det_y != 0.) ? (L_y[1] * y[0] - L_y[0] * y[1]) / det_y : 0.;
+    th_y_init = (det_y != 0.) ? (v_y[0] * y[1] - v_y[1] * y[0]) / det_y : 0.;
   }
   else {
     vtx_y_init = 0.;
     th_y_init = (y[1]/L_y[1] + y[0]/L_y[0]) / 2.;
   }
 
+  if (!std::isfinite(vtx_y_init))
+    vtx_y_init = 0.;
+  if (!std::isfinite(th_y_init))
+    th_y_init = 0.;
+
   unsigned int armId = CTPPSDetId((*tracks.begin())->getRPId()).arm();
 
   if (verbosity_)
diff --git a/RecoCTPPS/TotemRPLocal/plugins/CTPPSDiamondRecHitProducer.cc b/RecoCTPPS/TotemRPLocal/plugins/CTPPSDiamondRecHitProducer.cc
index bb1e599e4c73d..0fa347bb7b54c 100644
--- a/RecoCTPPS/TotemRPLocal/plugins/CTPPSDiamondRecHitProducer.cc
+++ b/RecoCTPPS/TotemRPLocal/plugins/CTPPSDiamondRecHitProducer.cc
@@ -43,6 +43,8 @@ class CTPPSDiamondRecHitProducer : public edm::stream::EDProducer<>
 
     edm::EDGetTokenT<edm::DetSetVector<CTPPSDiamondDigi> > digiToken_;
 
+    /// Label to timing calibration tag
+    edm::ESInputTag timingCalibrationTag_;
     /// A watcher to detect timing calibration changes.
     edm::ESWatcher<PPSTimingCalibrationRcd> calibWatcher_;
 
@@ -51,6 +53,7 @@ class CTPPSDiamondRecHitProducer : public edm::stream::EDProducer<>
 
 CTPPSDiamondRecHitProducer::CTPPSDiamondRecHitProducer( const edm::ParameterSet& iConfig ) :
   digiToken_( consumes<edm::DetSetVector<CTPPSDiamondDigi> >( iConfig.getParameter<edm::InputTag>( "digiTag" ) ) ),
+  timingCalibrationTag_( iConfig.getParameter<std::string>( "timingCalibrationTag" ) ),
   algo_( iConfig )
 {
   produces<edm::DetSetVector<CTPPSDiamondRecHit> >();
@@ -68,7 +71,7 @@ CTPPSDiamondRecHitProducer::produce( edm::Event& iEvent, const edm::EventSetup&
   if ( !digis->empty() ) {
     if ( calibWatcher_.check( iSetup ) ) {
       edm::ESHandle<PPSTimingCalibration> hTimingCalib;
-      iSetup.get<PPSTimingCalibrationRcd>().get( hTimingCalib );
+      iSetup.get<PPSTimingCalibrationRcd>().get( timingCalibrationTag_, hTimingCalib );
       algo_.setCalibration( *hTimingCalib );
     }
     // get the geometry
@@ -89,6 +92,8 @@ CTPPSDiamondRecHitProducer::fillDescriptions( edm::ConfigurationDescriptions& de
 
   desc.add<edm::InputTag>( "digiTag", edm::InputTag( "ctppsDiamondRawToDigi", "TimingDiamond" ) )
     ->setComment( "input digis collection to retrieve" );
+  desc.add<std::string>( "timingCalibrationTag", "GlobalTag:PPSDiamondTimingCalibration" )
+    ->setComment( "input tag for timing calibrations retrieval" );
   desc.add<double>( "timeSliceNs", 25.0/1024.0 )
     ->setComment( "conversion constant between HPTDC timing bin size and nanoseconds" );
   desc.add<int>( "timeShift", 0 ) // to be determined at calibration level, will be replaced by a map channel id -> time shift
diff --git a/RecoCTPPS/TotemRPLocal/plugins/CTPPSLocalTrackLiteProducer.cc b/RecoCTPPS/TotemRPLocal/plugins/CTPPSLocalTrackLiteProducer.cc
index 20a0db477695d..1bcc06c706538 100644
--- a/RecoCTPPS/TotemRPLocal/plugins/CTPPSLocalTrackLiteProducer.cc
+++ b/RecoCTPPS/TotemRPLocal/plugins/CTPPSLocalTrackLiteProducer.cc
@@ -7,18 +7,20 @@
  *
  ****************************************************************************/
 
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "DataFormats/Common/interface/DetSetVector.h"
-#include "DataFormats/CTPPSReco/interface/TotemRPLocalTrack.h"
 #include "DataFormats/CTPPSReco/interface/CTPPSDiamondLocalTrack.h"
 #include "DataFormats/CTPPSReco/interface/CTPPSPixelLocalTrack.h"
+#include "DataFormats/CTPPSReco/interface/TotemRPLocalTrack.h"
+#include "DataFormats/Common/interface/DetSetVector.h"
 
 #include "DataFormats/CTPPSReco/interface/CTPPSLocalTrackLite.h"
+#include "DataFormats/CTPPSReco/interface/CTPPSLocalTrackLiteFwd.h"
+
 #include "DataFormats/Math/interface/libminifloat.h"
 
 //----------------------------------------------------------------------------------------------------
@@ -26,167 +28,227 @@
 /**
  * \brief Distills the essential track data from all RPs.
  **/
-class CTPPSLocalTrackLiteProducer : public edm::stream::EDProducer<>
-{
+class CTPPSLocalTrackLiteProducer : public edm::stream::EDProducer<> {
 public:
-  explicit CTPPSLocalTrackLiteProducer( const edm::ParameterSet& );
-  ~CTPPSLocalTrackLiteProducer() override {}
+  explicit CTPPSLocalTrackLiteProducer(const edm::ParameterSet &);
 
-  void produce( edm::Event&, const edm::EventSetup& ) override;
-  static void fillDescriptions( edm::ConfigurationDescriptions& );
+  void produce(edm::Event &, const edm::EventSetup &) override;
+  static void fillDescriptions(edm::ConfigurationDescriptions &);
 
 private:
   /// HPTDC time slice width, in ns
   static constexpr float HPTDC_TIME_SLICE_WIDTH = 25.;
+
   bool includeStrips_;
-  edm::EDGetTokenT< edm::DetSetVector<TotemRPLocalTrack> > siStripTrackToken_;
+  edm::EDGetTokenT<edm::DetSetVector<TotemRPLocalTrack>> siStripTrackToken_;
 
   bool includeDiamonds_;
-  edm::EDGetTokenT< edm::DetSetVector<CTPPSDiamondLocalTrack> > diamondTrackToken_;
+  edm::EDGetTokenT<edm::DetSetVector<CTPPSDiamondLocalTrack>>
+      diamondTrackToken_;
 
   bool includePixels_;
-  edm::EDGetTokenT< edm::DetSetVector<CTPPSPixelLocalTrack> > pixelTrackToken_;
+  edm::EDGetTokenT<edm::DetSetVector<CTPPSPixelLocalTrack>> pixelTrackToken_;
 
-  double pixelTrackTxMin_,pixelTrackTxMax_,pixelTrackTyMin_,pixelTrackTyMax_;
-/// if true, this module will do nothing
-/// needed for consistency with CTPPS-less workflows
-  bool doNothing_;
+  double pixelTrackTxMin_, pixelTrackTxMax_, pixelTrackTyMin_, pixelTrackTyMax_;
   double timingTrackTMin_, timingTrackTMax_;
 };
 
 //----------------------------------------------------------------------------------------------------
 
-CTPPSLocalTrackLiteProducer::CTPPSLocalTrackLiteProducer( const edm::ParameterSet& iConfig ) :
-  doNothing_( iConfig.getParameter<bool>( "doNothing" ) )
-{
-  if ( doNothing_ ) return;
-
-  includeStrips_ = iConfig.getParameter<bool>("includeStrips");
-  siStripTrackToken_ = consumes< edm::DetSetVector<TotemRPLocalTrack> >     ( iConfig.getParameter<edm::InputTag>("tagSiStripTrack") );
-
-  includeDiamonds_ = iConfig.getParameter<bool>("includeDiamonds");
-  diamondTrackToken_ = consumes< edm::DetSetVector<CTPPSDiamondLocalTrack> >( iConfig.getParameter<edm::InputTag>("tagDiamondTrack") );
-
-  timingTrackTMin_ = iConfig.getParameter<double>( "timingTrackTMin" );
-  timingTrackTMax_ = iConfig.getParameter<double>( "timingTrackTMax" );
+CTPPSLocalTrackLiteProducer::CTPPSLocalTrackLiteProducer(
+    const edm::ParameterSet &iConfig)
+    : includeStrips_(iConfig.getParameter<bool>("includeStrips")),
+      includeDiamonds_(iConfig.getParameter<bool>("includeDiamonds")),
+      includePixels_(iConfig.getParameter<bool>("includePixels")),
+      pixelTrackTxMin_(iConfig.getParameter<double>("pixelTrackTxMin")),
+      pixelTrackTxMax_(iConfig.getParameter<double>("pixelTrackTxMax")),
+      pixelTrackTyMin_(iConfig.getParameter<double>("pixelTrackTyMin")),
+      pixelTrackTyMax_(iConfig.getParameter<double>("pixelTrackTyMax")),
+      timingTrackTMin_(iConfig.getParameter<double>("timingTrackTMin")),
+      timingTrackTMax_(iConfig.getParameter<double>("timingTrackTMax")) {
+  auto tagSiStripTrack = iConfig.getParameter<edm::InputTag>("tagSiStripTrack");
+  if (!tagSiStripTrack.label().empty())
+    siStripTrackToken_ =
+        consumes<edm::DetSetVector<TotemRPLocalTrack>>(tagSiStripTrack);
+
+  auto tagDiamondTrack = iConfig.getParameter<edm::InputTag>("tagDiamondTrack");
+  if (!tagDiamondTrack.label().empty())
+    diamondTrackToken_ =
+        consumes<edm::DetSetVector<CTPPSDiamondLocalTrack>>(tagDiamondTrack);
 
-  includePixels_ = iConfig.getParameter<bool>("includePixels");
   auto tagPixelTrack = iConfig.getParameter<edm::InputTag>("tagPixelTrack");
-  if (not tagPixelTrack.label().empty()){
-    pixelTrackToken_   = consumes< edm::DetSetVector<CTPPSPixelLocalTrack> >  (tagPixelTrack);
-  }
+  if (!tagPixelTrack.label().empty())
+    pixelTrackToken_ =
+        consumes<edm::DetSetVector<CTPPSPixelLocalTrack>>(tagPixelTrack);
 
-  pixelTrackTxMin_ = iConfig.getParameter<double>("pixelTrackTxMin");
-  pixelTrackTxMax_ = iConfig.getParameter<double>("pixelTrackTxMax");
-  pixelTrackTyMin_ = iConfig.getParameter<double>("pixelTrackTyMin");
-  pixelTrackTyMax_ = iConfig.getParameter<double>("pixelTrackTyMax");
-  produces< std::vector<CTPPSLocalTrackLite> >();
+  produces<CTPPSLocalTrackLiteCollection>();
 }
 
 //----------------------------------------------------------------------------------------------------
 
-void
-CTPPSLocalTrackLiteProducer::produce( edm::Event& iEvent, const edm::EventSetup& )
-{
-  if ( doNothing_ )
-    return;
-
+void CTPPSLocalTrackLiteProducer::produce(edm::Event &iEvent,
+                                          const edm::EventSetup &) {
   // prepare output
-  std::unique_ptr< std::vector<CTPPSLocalTrackLite> > pOut( new std::vector<CTPPSLocalTrackLite>() );
+  auto pOut = std::make_unique<CTPPSLocalTrackLiteCollection>();
 
   //----- TOTEM strips
 
   // get input from Si strips
-  if (includeStrips_)
-  {
-    edm::Handle< edm::DetSetVector<TotemRPLocalTrack> > inputSiStripTracks;
-    iEvent.getByToken( siStripTrackToken_, inputSiStripTracks );
+  if (includeStrips_) {
+    edm::Handle<edm::DetSetVector<TotemRPLocalTrack>> inputSiStripTracks;
+    iEvent.getByToken(siStripTrackToken_, inputSiStripTracks);
 
     // process tracks from Si strips
-    for ( const auto& rpv : *inputSiStripTracks ) {
+    for (const auto &rpv : *inputSiStripTracks) {
       const uint32_t rpId = rpv.detId();
-      for ( const auto& trk : rpv ) {
-        if ( !trk.isValid() ) continue;
-
-          float roundedX0 = MiniFloatConverter::reduceMantissaToNbitsRounding<14>(trk.getX0());
-          float roundedX0Sigma = MiniFloatConverter::reduceMantissaToNbitsRounding<8>(trk.getX0Sigma());
-          float roundedY0 = MiniFloatConverter::reduceMantissaToNbitsRounding<13>(trk.getY0());
-          float roundedY0Sigma = MiniFloatConverter::reduceMantissaToNbitsRounding<8>(trk.getY0Sigma());
-          float roundedTx = MiniFloatConverter::reduceMantissaToNbitsRounding<11>(trk.getTx());
-          float roundedTxSigma = MiniFloatConverter::reduceMantissaToNbitsRounding<8>(trk.getTxSigma());
-          float roundedTy = MiniFloatConverter::reduceMantissaToNbitsRounding<11>(trk.getTy());
-          float roundedTySigma = MiniFloatConverter::reduceMantissaToNbitsRounding<8>(trk.getTySigma());
-          float roundedChiSquaredOverNDF = MiniFloatConverter::reduceMantissaToNbitsRounding<8>(trk.getChiSquaredOverNDF());
-
-        pOut->emplace_back( rpId, roundedX0, roundedX0Sigma, roundedY0, roundedY0Sigma, roundedTx, roundedTxSigma, roundedTy, roundedTySigma,
-        roundedChiSquaredOverNDF, CTPPSpixelLocalTrackReconstructionInfo::invalid, trk.getNumberOfPointsUsedForFit(),0,0 );
+      for (const auto &trk : rpv) {
+        if (!trk.isValid())
+          continue;
+
+        float roundedX0 =
+            MiniFloatConverter::reduceMantissaToNbitsRounding<14>(trk.getX0());
+        float roundedX0Sigma =
+            MiniFloatConverter::reduceMantissaToNbitsRounding<8>(
+                trk.getX0Sigma());
+        float roundedY0 =
+            MiniFloatConverter::reduceMantissaToNbitsRounding<13>(trk.getY0());
+        float roundedY0Sigma =
+            MiniFloatConverter::reduceMantissaToNbitsRounding<8>(
+                trk.getY0Sigma());
+        float roundedTx =
+            MiniFloatConverter::reduceMantissaToNbitsRounding<11>(trk.getTx());
+        float roundedTxSigma =
+            MiniFloatConverter::reduceMantissaToNbitsRounding<8>(
+                trk.getTxSigma());
+        float roundedTy =
+            MiniFloatConverter::reduceMantissaToNbitsRounding<11>(trk.getTy());
+        float roundedTySigma =
+            MiniFloatConverter::reduceMantissaToNbitsRounding<8>(
+                trk.getTySigma());
+        float roundedChiSquaredOverNDF =
+            MiniFloatConverter::reduceMantissaToNbitsRounding<8>(
+                trk.getChiSquaredOverNDF());
+
+        pOut->emplace_back(rpId, // detector info
+                                 // spatial info
+                           roundedX0, roundedX0Sigma, roundedY0, roundedY0Sigma,
+                           // angular info
+                           roundedTx, roundedTxSigma, roundedTy, roundedTySigma,
+                           // reconstruction info
+                           roundedChiSquaredOverNDF,
+                           CTPPSpixelLocalTrackReconstructionInfo::invalid,
+                           trk.getNumberOfPointsUsedForFit(),
+                           // timing info
+                           0., 0.);
       }
     }
   }
 
   //----- diamond detectors
 
-  if (includeDiamonds_)
-  {
+  if (includeDiamonds_) {
     // get input from diamond detectors
-    edm::Handle< edm::DetSetVector<CTPPSDiamondLocalTrack> > inputDiamondTracks;
-    iEvent.getByToken( diamondTrackToken_, inputDiamondTracks );
+    edm::Handle<edm::DetSetVector<CTPPSDiamondLocalTrack>> inputDiamondTracks;
+    iEvent.getByToken(diamondTrackToken_, inputDiamondTracks);
 
     // process tracks from diamond detectors
-    for ( const auto& rpv : *inputDiamondTracks ) {
+    for (const auto &rpv : *inputDiamondTracks) {
       const unsigned int rpId = rpv.detId();
-      for ( const auto& trk : rpv ) {
-        if ( !trk.isValid() ) continue;
-
-        const float abs_time = trk.getT()+trk.getOOTIndex()*HPTDC_TIME_SLICE_WIDTH;
-        if ( abs_time < timingTrackTMin_ || abs_time > timingTrackTMax_ ) continue;
-
-        float roundedX0 = MiniFloatConverter::reduceMantissaToNbitsRounding<16>(trk.getX0());
-        float roundedX0Sigma = MiniFloatConverter::reduceMantissaToNbitsRounding<8>(trk.getX0Sigma());
-        float roundedY0 = MiniFloatConverter::reduceMantissaToNbitsRounding<13>(trk.getY0());
-        float roundedY0Sigma = MiniFloatConverter::reduceMantissaToNbitsRounding<8>(trk.getY0Sigma());
-        float roundedT = MiniFloatConverter::reduceMantissaToNbitsRounding<16>(abs_time);
-        float roundedTSigma = MiniFloatConverter::reduceMantissaToNbitsRounding<13>(trk.getTSigma());
-
-        pOut->emplace_back(
-          rpId, // detector info
-          roundedX0, roundedX0Sigma, roundedY0, roundedY0Sigma, // spatial info
-          0., 0., 0., 0., 0., // angular info
-          CTPPSpixelLocalTrackReconstructionInfo::invalid, trk.getNumOfPlanes(), // reconstruction info
-          roundedT, roundedTSigma // timing info
-        );
+      for (const auto &trk : rpv) {
+        if (!trk.isValid())
+          continue;
+
+        const float abs_time =
+            trk.getT() + trk.getOOTIndex() * HPTDC_TIME_SLICE_WIDTH;
+        if (abs_time < timingTrackTMin_ || abs_time > timingTrackTMax_)
+          continue;
+
+        float roundedX0 =
+            MiniFloatConverter::reduceMantissaToNbitsRounding<16>(trk.getX0());
+        float roundedX0Sigma =
+            MiniFloatConverter::reduceMantissaToNbitsRounding<8>(
+                trk.getX0Sigma());
+        float roundedY0 =
+            MiniFloatConverter::reduceMantissaToNbitsRounding<13>(trk.getY0());
+        float roundedY0Sigma =
+            MiniFloatConverter::reduceMantissaToNbitsRounding<8>(
+                trk.getY0Sigma());
+        float roundedT =
+            MiniFloatConverter::reduceMantissaToNbitsRounding<16>(abs_time);
+        float roundedTSigma =
+            MiniFloatConverter::reduceMantissaToNbitsRounding<13>(
+                trk.getTSigma());
+
+        pOut->emplace_back(rpId, // detector info
+                                 // spatial info
+                           roundedX0, roundedX0Sigma, roundedY0, roundedY0Sigma,
+                           // angular info
+                           0., 0., 0., 0.,
+                           // reconstruction info
+                           0., CTPPSpixelLocalTrackReconstructionInfo::invalid,
+                           trk.getNumOfPlanes(),
+                           // timing info
+                           roundedT, roundedTSigma);
       }
     }
   }
 
-
   //----- pixel detectors
 
-  if (includePixels_)
-  {
-    edm::Handle< edm::DetSetVector<CTPPSPixelLocalTrack> > inputPixelTracks;
-    if (not pixelTrackToken_.isUninitialized()){
-      iEvent.getByToken( pixelTrackToken_, inputPixelTracks );
+  if (includePixels_) {
+    edm::Handle<edm::DetSetVector<CTPPSPixelLocalTrack>> inputPixelTracks;
+    if (!pixelTrackToken_.isUninitialized()) {
+      iEvent.getByToken(pixelTrackToken_, inputPixelTracks);
 
-    // process tracks from pixels
-      for ( const auto& rpv : *inputPixelTracks ) {
+      // process tracks from pixels
+      for (const auto &rpv : *inputPixelTracks) {
         const uint32_t rpId = rpv.detId();
-        for ( const auto& trk : rpv ) {
-          if ( !trk.isValid() ) continue;
-          if(trk.getTx()>pixelTrackTxMin_ && trk.getTx()<pixelTrackTxMax_
-             && trk.getTy()>pixelTrackTyMin_ && trk.getTy()<pixelTrackTyMax_){
-            float roundedX0 = MiniFloatConverter::reduceMantissaToNbitsRounding<16>(trk.getX0());
-            float roundedX0Sigma = MiniFloatConverter::reduceMantissaToNbitsRounding<8>(trk.getX0Sigma());
-            float roundedY0 = MiniFloatConverter::reduceMantissaToNbitsRounding<13>(trk.getY0());
-            float roundedY0Sigma = MiniFloatConverter::reduceMantissaToNbitsRounding<8>(trk.getY0Sigma());
-            float roundedTx = MiniFloatConverter::reduceMantissaToNbitsRounding<11>(trk.getTx());
-            float roundedTxSigma = MiniFloatConverter::reduceMantissaToNbitsRounding<8>(trk.getTxSigma());
-            float roundedTy = MiniFloatConverter::reduceMantissaToNbitsRounding<11>(trk.getTy());
-            float roundedTySigma = MiniFloatConverter::reduceMantissaToNbitsRounding<8>(trk.getTySigma());
-            float roundedChiSquaredOverNDF = MiniFloatConverter::reduceMantissaToNbitsRounding<8>(trk.getChiSquaredOverNDF());
-
-            pOut->emplace_back( rpId, roundedX0, roundedX0Sigma, roundedY0, roundedY0Sigma, roundedTx, roundedTxSigma, roundedTy, roundedTySigma,
-            roundedChiSquaredOverNDF, trk.getRecoInfo(), trk.getNumberOfPointsUsedForFit(),0.,0. );
+        for (const auto &trk : rpv) {
+          if (!trk.isValid())
+            continue;
+          if (trk.getTx() > pixelTrackTxMin_ &&
+              trk.getTx() < pixelTrackTxMax_ &&
+              trk.getTy() > pixelTrackTyMin_ &&
+              trk.getTy() < pixelTrackTyMax_) {
+            float roundedX0 =
+                MiniFloatConverter::reduceMantissaToNbitsRounding<16>(
+                    trk.getX0());
+            float roundedX0Sigma =
+                MiniFloatConverter::reduceMantissaToNbitsRounding<8>(
+                    trk.getX0Sigma());
+            float roundedY0 =
+                MiniFloatConverter::reduceMantissaToNbitsRounding<13>(
+                    trk.getY0());
+            float roundedY0Sigma =
+                MiniFloatConverter::reduceMantissaToNbitsRounding<8>(
+                    trk.getY0Sigma());
+            float roundedTx =
+                MiniFloatConverter::reduceMantissaToNbitsRounding<11>(
+                    trk.getTx());
+            float roundedTxSigma =
+                MiniFloatConverter::reduceMantissaToNbitsRounding<8>(
+                    trk.getTxSigma());
+            float roundedTy =
+                MiniFloatConverter::reduceMantissaToNbitsRounding<11>(
+                    trk.getTy());
+            float roundedTySigma =
+                MiniFloatConverter::reduceMantissaToNbitsRounding<8>(
+                    trk.getTySigma());
+            float roundedChiSquaredOverNDF =
+                MiniFloatConverter::reduceMantissaToNbitsRounding<8>(
+                    trk.getChiSquaredOverNDF());
+
+            pOut->emplace_back(
+                rpId, // detector info
+                      // spatial info
+                roundedX0, roundedX0Sigma, roundedY0, roundedY0Sigma,
+                // angular info
+                roundedTx, roundedTxSigma, roundedTy, roundedTySigma,
+                // reconstruction info
+                roundedChiSquaredOverNDF, trk.getRecoInfo(),
+                trk.getNumberOfPointsUsedForFit(),
+                // timing info
+                0., 0.);
           }
         }
       }
@@ -194,47 +256,52 @@ CTPPSLocalTrackLiteProducer::produce( edm::Event& iEvent, const edm::EventSetup&
   }
 
   // save output to event
-  iEvent.put( std::move( pOut ) );
+  iEvent.put(std::move(pOut));
 }
 
 //----------------------------------------------------------------------------------------------------
 
-void
-CTPPSLocalTrackLiteProducer::fillDescriptions( edm::ConfigurationDescriptions& descr )
-{
+void CTPPSLocalTrackLiteProducer::fillDescriptions(
+    edm::ConfigurationDescriptions &descr) {
   edm::ParameterSetDescription desc;
 
-  // By default: module enabled (doNothing=false), but all includeXYZ flags set to false.
-  // The includeXYZ are switched on when the "ctpps_2016" era is declared in python config, see:
+  // By default: all includeXYZ flags set to false.
+  // The includeXYZ are switched on when the "ctpps_2016" era is declared in
+  // python config, see:
   // RecoCTPPS/TotemRPLocal/python/ctppsLocalTrackLiteProducer_cff.py
 
-  desc.add<bool>("includeStrips", false)->setComment("whether tracks from Si strips should be included");
-  desc.add<edm::InputTag>( "tagSiStripTrack", edm::InputTag( "totemRPLocalTrackFitter" ) )
-    ->setComment( "input TOTEM strips' local tracks collection to retrieve" );
-
-  desc.add<bool>("includeDiamonds", false)->setComment("whether tracks from diamonds strips should be included");
-  desc.add<edm::InputTag>( "tagDiamondTrack", edm::InputTag( "ctppsDiamondLocalTracks" ) )
-    ->setComment( "input diamond detectors' local tracks collection to retrieve" );
-
-  desc.add<bool>("includePixels", false)->setComment("whether tracks from pixels should be included");
-  desc.add<edm::InputTag>( "tagPixelTrack", edm::InputTag( "ctppsPixelLocalTracks"   ) )
-    ->setComment( "input pixel detectors' local tracks collection to retrieve" );
-  desc.add<bool>( "doNothing", false ) // enable the module by default
-    ->setComment( "disable the module" );
-  desc.add<double>( "timingTrackTMin", -1000. )
-    ->setComment( "minimal track time selection for timing detectors" );
-  desc.add<double>( "timingTrackTMax", +1000. )
-    ->setComment( "maximal track time selection for timing detectors" );
-
-  desc.add<double>("pixelTrackTxMin",-10.0);
+  desc.add<bool>("includeStrips", false)
+      ->setComment("whether tracks from Si strips should be included");
+  desc.add<edm::InputTag>("tagSiStripTrack",
+                          edm::InputTag("totemRPLocalTrackFitter"))
+      ->setComment("input TOTEM strips' local tracks collection to retrieve");
+
+  desc.add<bool>("includeDiamonds", false)
+      ->setComment("whether tracks from diamonds strips should be included");
+  desc.add<edm::InputTag>("tagDiamondTrack",
+                          edm::InputTag("ctppsDiamondLocalTracks"))
+      ->setComment(
+          "input diamond detectors' local tracks collection to retrieve");
+
+  desc.add<bool>("includePixels", false)
+      ->setComment("whether tracks from pixels should be included");
+  desc.add<edm::InputTag>("tagPixelTrack",
+                          edm::InputTag("ctppsPixelLocalTracks"))
+      ->setComment(
+          "input pixel detectors' local tracks collection to retrieve");
+  desc.add<double>("timingTrackTMin", -12.5)
+      ->setComment("minimal track time selection for timing detectors, in ns");
+  desc.add<double>("timingTrackTMax", +12.5)
+      ->setComment("maximal track time selection for timing detectors, in ns");
+
+  desc.add<double>("pixelTrackTxMin", -10.0);
   desc.add<double>("pixelTrackTxMax", 10.0);
-  desc.add<double>("pixelTrackTyMin",-10.0);
+  desc.add<double>("pixelTrackTyMin", -10.0);
   desc.add<double>("pixelTrackTyMax", 10.0);
 
-  descr.add( "ctppsLocalTrackLiteDefaultProducer", desc );
+  descr.add("ctppsLocalTrackLiteDefaultProducer", desc);
 }
 
 //----------------------------------------------------------------------------------------------------
 
-DEFINE_FWK_MODULE( CTPPSLocalTrackLiteProducer );
-
+DEFINE_FWK_MODULE(CTPPSLocalTrackLiteProducer);
diff --git a/RecoCTPPS/TotemRPLocal/plugins/TotemTimingRecHitProducer.cc b/RecoCTPPS/TotemRPLocal/plugins/TotemTimingRecHitProducer.cc
index 66339f1477e89..4187739f9044b 100644
--- a/RecoCTPPS/TotemRPLocal/plugins/TotemTimingRecHitProducer.cc
+++ b/RecoCTPPS/TotemRPLocal/plugins/TotemTimingRecHitProducer.cc
@@ -45,6 +45,8 @@ class TotemTimingRecHitProducer : public edm::stream::EDProducer<>
 
     /// Input digi collection
     edm::EDGetTokenT<edm::DetSetVector<TotemTimingDigi> > digiToken_;
+    /// Label to timing calibration tag
+    edm::ESInputTag timingCalibrationTag_;
     /// Digi-to-rechits transformation algorithm
     TotemTimingRecHitProducerAlgorithm algo_;
     /// Timing calibration parameters watcher
@@ -53,6 +55,7 @@ class TotemTimingRecHitProducer : public edm::stream::EDProducer<>
 
 TotemTimingRecHitProducer::TotemTimingRecHitProducer( const edm::ParameterSet& iConfig ) :
   digiToken_( consumes<edm::DetSetVector<TotemTimingDigi> >( iConfig.getParameter<edm::InputTag>( "digiTag" ) ) ),
+  timingCalibrationTag_( iConfig.getParameter<std::string>( "timingCalibrationTag" ) ),
   algo_( iConfig )
 {
   produces<edm::DetSetVector<TotemTimingRecHit> >();
@@ -72,7 +75,7 @@ TotemTimingRecHitProducer::produce( edm::Event& iEvent, const edm::EventSetup& i
     // check for timing calibration parameters update
     if ( calibWatcher_.check( iSetup ) ) {
       edm::ESHandle<PPSTimingCalibration> hTimingCalib;
-      iSetup.get<PPSTimingCalibrationRcd>().get( hTimingCalib );
+      iSetup.get<PPSTimingCalibrationRcd>().get( timingCalibrationTag_, hTimingCalib );
       algo_.setCalibration( *hTimingCalib );
     }
 
@@ -94,6 +97,8 @@ TotemTimingRecHitProducer::fillDescriptions( edm::ConfigurationDescriptions& des
 
   desc.add<edm::InputTag>( "digiTag", edm::InputTag( "totemTimingRawToDigi", "TotemTiming" ) )
     ->setComment( "input digis collection to retrieve" );
+  desc.add<std::string>( "timingCalibrationTag", "GlobalTag:TotemTimingCalibration" )
+    ->setComment( "input tag for timing calibrations retrieval" );
   desc.add<int>( "baselinePoints", 8 )
     ->setComment( "number of points to be used for the baseline" );
   desc.add<double>( "saturationLimit", 0.85 )
diff --git a/RecoEcal/EgammaClusterAlgos/interface/LogPositionCalc.h b/RecoEcal/EgammaClusterAlgos/interface/LogPositionCalc.h
deleted file mode 100644
index 05349c0909292..0000000000000
--- a/RecoEcal/EgammaClusterAlgos/interface/LogPositionCalc.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef RecoEcal_EcalClusterAlgos_LogPositionCalc_h
-#define RecoEcal_EcalClusterAlgos_LogPositionCalc_h
-
-#include "DataFormats/EcalRecHit/interface/EcalRecHit.h"
-#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
-#include "DataFormats/EcalDetId/interface/EBDetId.h"
-#include "DataFormats/EgammaReco/interface/BasicCluster.h"
-#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
-#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-// CMSSW headers from this subsystem
-#include "DataFormats/Math/interface/Point3D.h"
-// C/C++ headers
-#include <string>
-#include <vector>
-typedef math::XYZPoint Point;
-Point getECALposition(std::vector<reco::EcalRecHitData> recHits, const CaloSubdetectorGeometry);//Position determination
-
-
-
-#endif
diff --git a/RecoEcal/EgammaClusterAlgos/interface/PreshowerClusterAlgo.h b/RecoEcal/EgammaClusterAlgos/interface/PreshowerClusterAlgo.h
index f6b821af258cf..0521bf3214350 100644
--- a/RecoEcal/EgammaClusterAlgos/interface/PreshowerClusterAlgo.h
+++ b/RecoEcal/EgammaClusterAlgos/interface/PreshowerClusterAlgo.h
@@ -44,8 +44,8 @@ class PreshowerClusterAlgo {
    reco::PreshowerCluster makeOneCluster(ESDetId strip,
 					 HitsID *used_strips,
                                          RecHitsMap *rechits_map,
-                                         const CaloSubdetectorGeometry*& geometry_p,
-                                         CaloSubdetectorTopology*& topology_p);
+                                         const CaloSubdetectorGeometry* geometry_p,
+                                         const CaloSubdetectorTopology* topology_p);
 
    bool goodStrip(RecHitsMap::iterator candidate_it);
 
diff --git a/RecoEcal/EgammaClusterAlgos/interface/PreshowerPhiClusterAlgo.h b/RecoEcal/EgammaClusterAlgos/interface/PreshowerPhiClusterAlgo.h
index 1710b62f50e95..4486ca2b822fa 100644
--- a/RecoEcal/EgammaClusterAlgos/interface/PreshowerPhiClusterAlgo.h
+++ b/RecoEcal/EgammaClusterAlgos/interface/PreshowerPhiClusterAlgo.h
@@ -36,8 +36,7 @@ class PreshowerPhiClusterAlgo {
     reco::PreshowerCluster makeOneCluster(ESDetId strip,
 					  HitsID *used_strips,
 					  RecHitsMap *rechits_map,
-					  const CaloSubdetectorGeometry*& geometry_p,
-					  CaloSubdetectorTopology*& topology_p,
+					  const CaloSubdetectorGeometry* geometry_p,
 					  double deltaEta, double minDeltaPhi, double maxDeltaPhi);
     
     bool goodStrip(RecHitsMap::iterator candidate_it);
diff --git a/RecoEcal/EgammaClusterAlgos/src/PreshowerClusterAlgo.cc b/RecoEcal/EgammaClusterAlgos/src/PreshowerClusterAlgo.cc
index 9a0a2c2fdc7ba..b6338efb9a8e7 100644
--- a/RecoEcal/EgammaClusterAlgos/src/PreshowerClusterAlgo.cc
+++ b/RecoEcal/EgammaClusterAlgos/src/PreshowerClusterAlgo.cc
@@ -13,8 +13,8 @@
 reco::PreshowerCluster PreshowerClusterAlgo::makeOneCluster(ESDetId strip,
 							    HitsID *used_strips,
                                                             RecHitsMap *the_rechitsMap_p,
-                                                            const CaloSubdetectorGeometry*& geometry_p,
-                                                            CaloSubdetectorTopology*& topology_p)
+                                                            const CaloSubdetectorGeometry* geometry_p,
+                                                            const CaloSubdetectorTopology* topology_p)
 {
   road_2d.clear();
 
diff --git a/RecoEcal/EgammaClusterAlgos/src/PreshowerPhiClusterAlgo.cc b/RecoEcal/EgammaClusterAlgos/src/PreshowerPhiClusterAlgo.cc
index 7bdd2a64ac48e..334852a56b4cb 100644
--- a/RecoEcal/EgammaClusterAlgos/src/PreshowerPhiClusterAlgo.cc
+++ b/RecoEcal/EgammaClusterAlgos/src/PreshowerPhiClusterAlgo.cc
@@ -15,8 +15,7 @@
 reco::PreshowerCluster PreshowerPhiClusterAlgo::makeOneCluster(ESDetId strip,
 							       HitsID *used_strips,
 							       RecHitsMap *the_rechitsMap_p,
-							       const CaloSubdetectorGeometry*& geometry_p,
-							       CaloSubdetectorTopology*& topology_p,
+							       const CaloSubdetectorGeometry* geometry_p,
 							       double deltaEta, double minDeltaPhi, double maxDeltaPhi)
 {
 
diff --git a/RecoEcal/EgammaClusterProducers/interface/ReducedESRecHitCollectionProducer.h b/RecoEcal/EgammaClusterProducers/interface/ReducedESRecHitCollectionProducer.h
index 43cd769b7ec42..f2ef8a41718d4 100644
--- a/RecoEcal/EgammaClusterProducers/interface/ReducedESRecHitCollectionProducer.h
+++ b/RecoEcal/EgammaClusterProducers/interface/ReducedESRecHitCollectionProducer.h
@@ -34,7 +34,7 @@ class ReducedESRecHitCollectionProducer : public edm::stream::EDProducer<> {
  private :
 
   const EcalPreshowerGeometry *geometry_p;
-  CaloSubdetectorTopology *topology_p;
+  std::unique_ptr<CaloSubdetectorTopology> topology_p;
 
   double scEtThresh_;
 
diff --git a/RecoEcal/EgammaClusterProducers/src/CosmicClusterProducer.cc b/RecoEcal/EgammaClusterProducers/src/CosmicClusterProducer.cc
index 6030e81999fa9..bc6bad6bf7e91 100644
--- a/RecoEcal/EgammaClusterProducers/src/CosmicClusterProducer.cc
+++ b/RecoEcal/EgammaClusterProducers/src/CosmicClusterProducer.cc
@@ -136,18 +136,18 @@ void CosmicClusterProducer::clusterizeECALPart(edm::Event &evt, const edm::Event
   es.get<CaloGeometryRecord>().get(geoHandle);
 
   const CaloSubdetectorGeometry *geometry_p;
-  CaloSubdetectorTopology *topology_p;
+  std::unique_ptr<CaloSubdetectorTopology> topology_p;
 
   std::string clustershapetag;
   if (ecalPart == CosmicClusterAlgo::barrel) 
     {
       geometry_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalBarrel);
-      topology_p = new EcalBarrelTopology(geoHandle);
+      topology_p = std::make_unique<EcalBarrelTopology>(*geoHandle);
     }
   else
     {
       geometry_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalEndcap);
-      topology_p = new EcalEndcapTopology(geoHandle); 
+      topology_p = std::make_unique<EcalEndcapTopology>(*geoHandle);
    }
 
   const CaloSubdetectorGeometry *geometryES_p;
@@ -155,13 +155,13 @@ void CosmicClusterProducer::clusterizeECALPart(edm::Event &evt, const edm::Event
   
   // Run the clusterization algorithm:
   reco::BasicClusterCollection clusters;
-  clusters = island_p->makeClusters(hitCollection_p, uhitCollection_p, geometry_p, topology_p, geometryES_p,  ecalPart);
+  clusters = island_p->makeClusters(hitCollection_p, uhitCollection_p, geometry_p, topology_p.get(), geometryES_p,  ecalPart);
   
   //Create associated ClusterShape objects.
   std::vector <reco::ClusterShape> ClusVec;
  
   for (int erg=0;erg<int(clusters.size());++erg){
-    reco::ClusterShape TestShape = shapeAlgo_.Calculate(clusters[erg],hitCollection_p,geometry_p,topology_p);
+    reco::ClusterShape TestShape = shapeAlgo_.Calculate(clusters[erg],hitCollection_p,geometry_p,topology_p.get());
     ClusVec.push_back(TestShape);
   }
   
@@ -192,6 +192,4 @@ void CosmicClusterProducer::clusterizeECALPart(edm::Event &evt, const edm::Event
     shapeAssocs_p->insert(edm::Ref<reco::BasicClusterCollection>(bccHandle,i),edm::Ref<reco::ClusterShapeCollection>(clusHandle,i));
   }  
   evt.put(std::move(shapeAssocs_p),clusterShapeAssociation);
-  
-  delete topology_p;
 }
diff --git a/RecoEcal/EgammaClusterProducers/src/HybridClusterProducer.cc b/RecoEcal/EgammaClusterProducers/src/HybridClusterProducer.cc
index 3cef31b978ac5..50fb5344a4dcc 100644
--- a/RecoEcal/EgammaClusterProducers/src/HybridClusterProducer.cc
+++ b/RecoEcal/EgammaClusterProducers/src/HybridClusterProducer.cc
@@ -124,7 +124,7 @@ void HybridClusterProducer::produce(edm::Event& evt, const edm::EventSetup& es)
   es.get<EcalSeverityLevelAlgoRcd>().get(sevLv);
  
   geometry_p = geometry.getSubdetectorGeometry(DetId::Ecal, EcalBarrel);
-  topology = std::make_unique<EcalBarrelTopology>(geoHandle);
+  topology = std::make_unique<EcalBarrelTopology>(*geoHandle);
 
   // make the Basic clusters!
   reco::BasicClusterCollection basicClusters;
diff --git a/RecoEcal/EgammaClusterProducers/src/IslandClusterProducer.cc b/RecoEcal/EgammaClusterProducers/src/IslandClusterProducer.cc
index 8c50f8d17b052..499d51119f132 100644
--- a/RecoEcal/EgammaClusterProducers/src/IslandClusterProducer.cc
+++ b/RecoEcal/EgammaClusterProducers/src/IslandClusterProducer.cc
@@ -165,18 +165,18 @@ void IslandClusterProducer::clusterizeECALPart(edm::Event &evt, const edm::Event
   es.get<CaloGeometryRecord>().get(geoHandle);
 
   const CaloSubdetectorGeometry *geometry_p;
-  CaloSubdetectorTopology *topology_p;
+  std::unique_ptr<CaloSubdetectorTopology> topology_p;
 
   std::string clustershapetag;
   if (ecalPart == IslandClusterAlgo::barrel) 
     {
       geometry_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalBarrel);
-      topology_p = new EcalBarrelTopology(geoHandle);
+      topology_p = std::make_unique<EcalBarrelTopology>(*geoHandle);
     }
   else
     {
       geometry_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalEndcap);
-      topology_p = new EcalEndcapTopology(geoHandle); 
+      topology_p = std::make_unique<EcalEndcapTopology>(*geoHandle);
    }
 
   const CaloSubdetectorGeometry *geometryES_p;
@@ -184,12 +184,12 @@ void IslandClusterProducer::clusterizeECALPart(edm::Event &evt, const edm::Event
 
   // Run the clusterization algorithm:
   reco::BasicClusterCollection clusters;
-  clusters = island_p->makeClusters(hitCollection_p, geometry_p, topology_p, geometryES_p, ecalPart);
+  clusters = island_p->makeClusters(hitCollection_p, geometry_p, topology_p.get(), geometryES_p, ecalPart);
 
   //Create associated ClusterShape objects.
   std::vector <reco::ClusterShape> ClusVec;
   for (int erg=0;erg<int(clusters.size());++erg){
-    reco::ClusterShape TestShape = shapeAlgo_.Calculate(clusters[erg],hitCollection_p,geometry_p,topology_p);
+    reco::ClusterShape TestShape = shapeAlgo_.Calculate(clusters[erg],hitCollection_p,geometry_p,topology_p.get());
     ClusVec.push_back(TestShape);
   }
 
@@ -218,6 +218,4 @@ void IslandClusterProducer::clusterizeECALPart(edm::Event &evt, const edm::Event
     shapeAssocs_p->insert(edm::Ref<reco::BasicClusterCollection>(bccHandle,i),edm::Ref<reco::ClusterShapeCollection>(clusHandle,i));
   }  
   evt.put(std::move(shapeAssocs_p),clusterShapeAssociation);
-
-  delete topology_p;
 }
diff --git a/RecoEcal/EgammaClusterProducers/src/Multi5x5ClusterProducer.cc b/RecoEcal/EgammaClusterProducers/src/Multi5x5ClusterProducer.cc
index 0748a99f748f1..9a4d3a08ac2b0 100644
--- a/RecoEcal/EgammaClusterProducers/src/Multi5x5ClusterProducer.cc
+++ b/RecoEcal/EgammaClusterProducers/src/Multi5x5ClusterProducer.cc
@@ -125,17 +125,17 @@ void Multi5x5ClusterProducer::clusterizeECALPart(edm::Event &evt, const edm::Eve
   es.get<CaloGeometryRecord>().get(geoHandle);
 
   const CaloSubdetectorGeometry *geometry_p;
-  CaloSubdetectorTopology *topology_p;
+  std::unique_ptr<CaloSubdetectorTopology> topology_p;
 
   if (detector == reco::CaloID::DET_ECAL_BARREL) 
     {
       geometry_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalBarrel);
-      topology_p = new EcalBarrelTopology(geoHandle);
+      topology_p = std::make_unique<EcalBarrelTopology>(*geoHandle);
     }
   else
     {
       geometry_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalEndcap);
-      topology_p = new EcalEndcapTopology(geoHandle); 
+      topology_p = std::make_unique<EcalEndcapTopology>(*geoHandle);
    }
 
   const CaloSubdetectorGeometry *geometryES_p;
@@ -143,7 +143,7 @@ void Multi5x5ClusterProducer::clusterizeECALPart(edm::Event &evt, const edm::Eve
 
   // Run the clusterization algorithm:
   reco::BasicClusterCollection clusters;
-  clusters = island_p->makeClusters(hitCollection_p, geometry_p, topology_p, geometryES_p, detector);
+  clusters = island_p->makeClusters(hitCollection_p, geometry_p, topology_p.get(), geometryES_p, detector);
 
   // create a unique_ptr to a BasicClusterCollection, copy the barrel clusters into it and put in the Event:
   auto clusters_p = std::make_unique<reco::BasicClusterCollection>();
@@ -153,6 +153,4 @@ void Multi5x5ClusterProducer::clusterizeECALPart(edm::Event &evt, const edm::Eve
     bccHandle = evt.put(std::move(clusters_p), barrelClusterCollection_);
   else
     bccHandle = evt.put(std::move(clusters_p), endcapClusterCollection_);
-
-  delete topology_p;
 }
diff --git a/RecoEcal/EgammaClusterProducers/src/PreshowerClusterProducer.cc b/RecoEcal/EgammaClusterProducers/src/PreshowerClusterProducer.cc
index e2a55e41eac02..657cf75b4cb09 100644
--- a/RecoEcal/EgammaClusterProducers/src/PreshowerClusterProducer.cc
+++ b/RecoEcal/EgammaClusterProducers/src/PreshowerClusterProducer.cc
@@ -103,9 +103,9 @@ void PreshowerClusterProducer::produce(edm::Event& evt, const edm::EventSetup& e
   // create new collection of corrected super clusters
   auto superclusters_p = std::make_unique<reco::SuperClusterCollection>();
   
-  CaloSubdetectorTopology * topology_p=nullptr;
+  std::unique_ptr<CaloSubdetectorTopology> topology_p;
   if (geometry_p)
-    topology_p  = new EcalPreshowerTopology(geoHandle);
+    topology_p  = std::make_unique<EcalPreshowerTopology>();
   
   // fetch the product (pSuperClusters)
   evt.getByToken(endcapSClusterToken_, pSuperClusters);   
@@ -181,13 +181,13 @@ void PreshowerClusterProducer::produce(edm::Event& evt, const edm::EventSetup& e
 	
 	// Get a vector of ES clusters (found by the PreshSeeded algorithm) associated with a given EE basic cluster.           
 	for (int i=0; i<preshNclust_; i++) {
-	  reco::PreshowerCluster cl1 = presh_algo->makeOneCluster(strip1,&used_strips,&rechits_map,geometry_p,topology_p);   
+	  reco::PreshowerCluster cl1 = presh_algo->makeOneCluster(strip1,&used_strips,&rechits_map,geometry_p,topology_p.get());
 	  cl1.setBCRef(*bc_iter);
 	  if (cl1.energy() > preshClustECut) {
 	    clusters1.push_back(cl1);
 	    e1 += cl1.energy();       
 	  }
-	  reco::PreshowerCluster cl2 = presh_algo->makeOneCluster(strip2,&used_strips,&rechits_map,geometry_p,topology_p); 
+	  reco::PreshowerCluster cl2 = presh_algo->makeOneCluster(strip2,&used_strips,&rechits_map,geometry_p,topology_p.get());
 	  cl2.setBCRef(*bc_iter);
 	  
 	  if ( cl2.energy() > preshClustECut) {
@@ -255,9 +255,6 @@ void PreshowerClusterProducer::produce(edm::Event& evt, const edm::EventSetup& e
   evt.put(std::move(superclusters_p), assocSClusterCollection_);
   LogTrace("EcalClusters") << "Corrected SClusters added to the event" ;
   
-  if (topology_p)
-    delete topology_p;
-  
   nEvt_++;
   
 }
diff --git a/RecoEcal/EgammaClusterProducers/src/PreshowerClusterShapeProducer.cc b/RecoEcal/EgammaClusterProducers/src/PreshowerClusterShapeProducer.cc
index 1e70fff8a6d8b..f0c042aadab0f 100644
--- a/RecoEcal/EgammaClusterProducers/src/PreshowerClusterShapeProducer.cc
+++ b/RecoEcal/EgammaClusterProducers/src/PreshowerClusterShapeProducer.cc
@@ -96,9 +96,9 @@ void PreshowerClusterShapeProducer::produce(Event& evt, const EventSetup& es) {
   auto ps_cl_for_pi0_disc_y = std::make_unique<reco::PreshowerClusterShapeCollection>();
 
 
-  CaloSubdetectorTopology* topology_p=nullptr;
+  std::unique_ptr<CaloSubdetectorTopology> topology_p;
   if (geometry)
-      topology_p = new EcalPreshowerTopology(geoHandle);
+    topology_p = std::make_unique<EcalPreshowerTopology>();
 
   
   // fetch the Preshower product (RecHits)
@@ -156,8 +156,8 @@ void PreshowerClusterShapeProducer::produce(Event& evt, const EventSetup& es) {
 	      ESDetId stripX = (tmp_stripX == DetId(0)) ? ESDetId(0) : ESDetId(tmp_stripX);
 	      ESDetId stripY = (tmp_stripY == DetId(0)) ? ESDetId(0) : ESDetId(tmp_stripY);
 	      
-	      vector<float> vout_stripE1 = presh_pi0_algo->findPreshVector(stripX, &rechits_map, topology_p);
-	      vector<float> vout_stripE2 = presh_pi0_algo->findPreshVector(stripY, &rechits_map, topology_p);
+	      vector<float> vout_stripE1 = presh_pi0_algo->findPreshVector(stripX, &rechits_map, topology_p.get());
+	      vector<float> vout_stripE2 = presh_pi0_algo->findPreshVector(stripY, &rechits_map, topology_p.get());
 	      
 	      LogTrace("EcalClusters") << "PreshowerClusterShapeProducer : ES Energy vector associated to the given SC = " ;
 	      for(int k1=0;k1<11;k1++) {
@@ -187,9 +187,6 @@ void PreshowerClusterShapeProducer::produce(Event& evt, const EventSetup& es) {
   evt.put(std::move(ps_cl_for_pi0_disc_x), PreshowerClusterShapeCollectionX_);
   evt.put(std::move(ps_cl_for_pi0_disc_y), PreshowerClusterShapeCollectionY_);  
   LogTrace("EcalClusters") << "PreshowerClusterShapeCollection added to the event" ;
-  
-  if (topology_p)
-    delete topology_p;
 
   nEvt_++;
 
diff --git a/RecoEcal/EgammaClusterProducers/src/PreshowerPhiClusterProducer.cc b/RecoEcal/EgammaClusterProducers/src/PreshowerPhiClusterProducer.cc
index 099c1a42a160d..63f57ebd13c7b 100644
--- a/RecoEcal/EgammaClusterProducers/src/PreshowerPhiClusterProducer.cc
+++ b/RecoEcal/EgammaClusterProducers/src/PreshowerPhiClusterProducer.cc
@@ -95,10 +95,6 @@ void PreshowerPhiClusterProducer::produce(edm::Event& evt, const edm::EventSetup
   // create new collection of corrected super clusters
   auto superclusters_p = std::make_unique<reco::SuperClusterCollection>();
   
-  CaloSubdetectorTopology * topology_p=nullptr;
-  if (geometry_p)
-    topology_p  = new EcalPreshowerTopology(geoHandle);
-  
   // fetch the product (pSuperClusters)
   evt.getByToken(endcapSClusterToken_, pSuperClusters);   
   const reco::SuperClusterCollection* SClusts = pSuperClusters.product();
@@ -197,13 +193,13 @@ void PreshowerPhiClusterProducer::produce(edm::Event& evt, const edm::EventSetup
 	  //cout<<"starting cluster : "<<maxDeltaPhi<<" "<<minDeltaPhi<<" "<<esPhiClusterDeltaEta_<<endl;
 	  //cout<<"do plane 1 === "<<strip1.zside()<<" "<<strip1.plane()<<" "<<strip1.six()<<" "<<strip1.siy()<<" "<<strip1.strip()<<endl;
 	  // Get a vector of ES clusters (found by the PreshSeeded algorithm) associated with a given EE basic cluster.           
-	  reco::PreshowerCluster cl1 = presh_algo->makeOneCluster(strip1,&used_strips,&rechits_map,geometry_p,topology_p,esPhiClusterDeltaEta_,minDeltaPhi,maxDeltaPhi);   
+	  reco::PreshowerCluster cl1 = presh_algo->makeOneCluster(strip1,&used_strips,&rechits_map,geometry_p,esPhiClusterDeltaEta_,minDeltaPhi,maxDeltaPhi);
 	  cl1.setBCRef(*bc_iter);
 	  clusters1.push_back(cl1);
 	  e1 += cl1.energy();       
 	  
 	  //cout<<"do plane 2 === "<<strip2.zside()<<" "<<strip2.plane()<<" "<<strip2.six()<<" "<<strip2.siy()<<" "<<strip2.strip()<<endl;
-	  reco::PreshowerCluster cl2 = presh_algo->makeOneCluster(strip2,&used_strips,&rechits_map,geometry_p,topology_p,esPhiClusterDeltaEta_,minDeltaPhi,maxDeltaPhi); 
+	  reco::PreshowerCluster cl2 = presh_algo->makeOneCluster(strip2,&used_strips,&rechits_map,geometry_p,esPhiClusterDeltaEta_,minDeltaPhi,maxDeltaPhi);
 	  cl2.setBCRef(*bc_iter);
 	  clusters2.push_back(cl2);
 	  e2 += cl2.energy();
@@ -272,8 +268,6 @@ void PreshowerPhiClusterProducer::produce(edm::Event& evt, const edm::EventSetup
   superclusters_p->assign(new_SC.begin(), new_SC.end());
   evt.put(std::move(superclusters_p), assocSClusterCollection_);
   LogTrace("EcalClusters") << "Corrected SClusters added to the event" ;
-  
-  if (topology_p) delete topology_p;
 }
 
 void PreshowerPhiClusterProducer::set(const edm::EventSetup& es) {
diff --git a/RecoEcal/EgammaClusterProducers/src/ReducedESRecHitCollectionProducer.cc b/RecoEcal/EgammaClusterProducers/src/ReducedESRecHitCollectionProducer.cc
index 9b8d57f9b5ca1..be8fb0ff2bfba 100644
--- a/RecoEcal/EgammaClusterProducers/src/ReducedESRecHitCollectionProducer.cc
+++ b/RecoEcal/EgammaClusterProducers/src/ReducedESRecHitCollectionProducer.cc
@@ -18,8 +18,7 @@ using namespace std;
 using namespace reco;
 
 ReducedESRecHitCollectionProducer::ReducedESRecHitCollectionProducer(const edm::ParameterSet& ps):
-  geometry_p(nullptr),
-  topology_p(nullptr)
+  geometry_p(nullptr)
 {
 
  scEtThresh_          = ps.getParameter<double>("scEtThreshold");
@@ -48,9 +47,7 @@ ReducedESRecHitCollectionProducer::ReducedESRecHitCollectionProducer(const edm::
  
 }
 
-ReducedESRecHitCollectionProducer::~ReducedESRecHitCollectionProducer() {
-  if (topology_p) delete topology_p;
-}
+ReducedESRecHitCollectionProducer::~ReducedESRecHitCollectionProducer() = default;
 
 void ReducedESRecHitCollectionProducer::beginRun (edm::Run const&, const edm::EventSetup&iSetup){
   ESHandle<CaloGeometry> geoHandle;
@@ -61,7 +58,7 @@ void ReducedESRecHitCollectionProducer::beginRun (edm::Run const&, const edm::Ev
       "could not cast the subdet geometry to preshower geometry";
   }
   
-  if (geometry_p) topology_p = new EcalPreshowerTopology(geoHandle);
+  if (geometry_p) topology_p = std::make_unique<EcalPreshowerTopology>();
   
 }
 
@@ -178,10 +175,10 @@ void ReducedESRecHitCollectionProducer::collectIds(const ESDetId esDetId1, const
   strip1 = esDetId1;
   strip2 = esDetId2;
 
-  EcalPreshowerNavigator theESNav1(strip1, topology_p);
+  EcalPreshowerNavigator theESNav1(strip1, topology_p.get());
   theESNav1.setHome(strip1);
   
-  EcalPreshowerNavigator theESNav2(strip2, topology_p);
+  EcalPreshowerNavigator theESNav2(strip2, topology_p.get());
   theESNav2.setHome(strip2);
 
   if (row == 1) {
diff --git a/RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h b/RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h
index 97989406aa5ac..b07d07fefa4e2 100644
--- a/RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h
+++ b/RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h
@@ -69,6 +69,7 @@ struct Cluster2ndMoments {
   float sMin;
   // angle between sMaj and phi:
   float alpha;
+  Cluster2ndMoments():sMaj(0.),sMin(0.),alpha(0.){}
 
 };
 
@@ -1229,8 +1230,7 @@ std::vector<float> EcalClusterToolsT<noZS>::scLocalCovariances(const reco::Super
 template<bool noZS>
 Cluster2ndMoments EcalClusterToolsT<noZS>::cluster2ndMoments( const reco::BasicCluster &basicCluster, const EcalRecHitCollection &recHits, double phiCorrectionFactor, double w0, bool useLogWeights) {
 
-  // for now implemented only for EB:
-  //  if( fabs( basicCluster.eta() ) < 1.479 ) { 
+  if(recHits.empty()) return Cluster2ndMoments();
 
   std::vector<std::pair<const EcalRecHit*, float> > RH_ptrs_fracs;
   
@@ -1239,7 +1239,9 @@ Cluster2ndMoments EcalClusterToolsT<noZS>::cluster2ndMoments( const reco::BasicC
   for(unsigned int i=0; i<myHitsPair.size(); i++){
     //get pointer to recHit object
     EcalRecHitCollection::const_iterator myRH = recHits.find(myHitsPair[i].first);
-    RH_ptrs_fracs.push_back(  std::make_pair(&(*myRH) , myHitsPair[i].second)  );
+    if(myRH != recHits.end()){
+      RH_ptrs_fracs.push_back(  std::make_pair(&(*myRH) , myHitsPair[i].second)  );
+    }
   }
   
   return EcalClusterToolsT<noZS>::cluster2ndMoments(RH_ptrs_fracs, phiCorrectionFactor, w0, useLogWeights);
@@ -1248,24 +1250,15 @@ Cluster2ndMoments EcalClusterToolsT<noZS>::cluster2ndMoments( const reco::BasicC
 template<bool noZS>
 Cluster2ndMoments EcalClusterToolsT<noZS>::cluster2ndMoments( const reco::SuperCluster &superCluster, const EcalRecHitCollection &recHits, double phiCorrectionFactor, double w0, bool useLogWeights) {
 
-  // for now returns second moments of supercluster seed cluster:
-  Cluster2ndMoments returnMoments;
-  returnMoments.sMaj = -1.;
-  returnMoments.sMin = -1.;
-  returnMoments.alpha = 0.;
-
-  // for now implemented only for EB:
-  //  if( fabs( superCluster.eta() ) < 1.479 ) { 
-    returnMoments = EcalClusterToolsT<noZS>::cluster2ndMoments( *(superCluster.seed()), recHits, phiCorrectionFactor, w0, useLogWeights);
-    //  }
-
-  return returnMoments;
+  return EcalClusterToolsT<noZS>::cluster2ndMoments( *(superCluster.seed()), recHits, phiCorrectionFactor, w0, useLogWeights);
 
 }
 
 template<bool noZS>
 Cluster2ndMoments EcalClusterToolsT<noZS>::cluster2ndMoments( const std::vector<std::pair<const EcalRecHit*, float> >& RH_ptrs_fracs, double phiCorrectionFactor, double w0, bool useLogWeights) {
 
+  if(RH_ptrs_fracs.empty()) return Cluster2ndMoments();
+
   double mid_eta(0),mid_phi(0),mid_x(0),mid_y(0);
   
   double Etot = EcalClusterToolsT<noZS>::getSumEnergy(  RH_ptrs_fracs  );
diff --git a/RecoEcal/EgammaCoreTools/src/EcalClusterLazyTools.cc b/RecoEcal/EgammaCoreTools/src/EcalClusterLazyTools.cc
index f277e08fe5810..c25f8bec8ba59 100644
--- a/RecoEcal/EgammaCoreTools/src/EcalClusterLazyTools.cc
+++ b/RecoEcal/EgammaCoreTools/src/EcalClusterLazyTools.cc
@@ -41,9 +41,8 @@ EcalClusterLazyToolsBase::EcalClusterLazyToolsBase( const edm::Event &ev, const
 {
   const CaloSubdetectorGeometry *geometryES = geometry_->getSubdetectorGeometry(DetId::Ecal, EcalPreshower);
   if (geometryES) {
-    ecalPS_topology_.reset(new EcalPreshowerTopology(geometry_));
+    ecalPS_topology_ = std::make_shared<EcalPreshowerTopology>();
   } else {
-    ecalPS_topology_.reset();
     edm::LogInfo("subdetector geometry not available") << "EcalPreshower geometry is missing" << std::endl;
   }
 
diff --git a/RecoEgamma/EgammaElectronAlgos/interface/GsfElectronAlgo.h b/RecoEgamma/EgammaElectronAlgos/interface/GsfElectronAlgo.h
index 6045fa0f71acd..a84de3ffa63cf 100644
--- a/RecoEgamma/EgammaElectronAlgos/interface/GsfElectronAlgo.h
+++ b/RecoEgamma/EgammaElectronAlgos/interface/GsfElectronAlgo.h
@@ -7,7 +7,8 @@
 #include "DataFormats/Common/interface/ValueMap.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectronCoreFwd.h"
-#include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
+#include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h" 
+#include "DataFormats/EgammaCandidates/interface/Conversion.h"
 #include "DataFormats/EgammaReco/interface/ElectronSeedFwd.h"
 #include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
 #include "DataFormats/GsfTrackReco/interface/GsfTrackFwd.h"
@@ -66,6 +67,7 @@ class GsfElectronAlgo {
        edm::EDGetTokenT<reco::BeamSpot> beamSpotTag ;
        edm::EDGetTokenT<reco::GsfPFRecTrackCollection> gsfPfRecTracksTag ;
        edm::EDGetTokenT<reco::VertexCollection> vtxCollectionTag;
+       edm::EDGetTokenT<reco::ConversionCollection> conversions;
 
       //IsoVals (PF and EcalDriven)
       edm::ParameterSet pfIsoVals;
@@ -97,6 +99,9 @@ class GsfElectronAlgo {
       // GED-Regression (ECAL and combination)
       bool useEcalRegression;
       bool useCombinationRegression;  
+      //heavy ion in 2015 has no conversions and so cant fill conv vtx fit prob so this bool
+      //stops it from being filled
+      bool fillConvVtxFitProb;
      } ;
 
     struct CutsConfiguration
@@ -194,7 +199,9 @@ class GsfElectronAlgo {
       EcalClusterFunctionBaseClass * crackCorrectionFunction,
       const RegressionHelper::Configuration & regCfg,
       const edm::ParameterSet& tkIsol03Cfg,
-      const edm::ParameterSet& tkIsol04Cfg
+      const edm::ParameterSet& tkIsol04Cfg,
+      const edm::ParameterSet& tkIsolHEEP03Cfg,
+      const edm::ParameterSet& tkIsolHEEP04Cfg
       
       ) ;
 
@@ -279,6 +286,7 @@ class GsfElectronAlgo {
       edm::Handle<reco::ElectronSeedCollection> seeds ;
       edm::Handle<reco::GsfPFRecTrackCollection> gsfPfRecTracks ;
       edm::Handle<reco::VertexCollection> vertices;
+      edm::Handle<reco::ConversionCollection> conversions;
 
       // isolation helpers
       EgammaTowerIsolation hadDepth1Isolation03, hadDepth1Isolation04 ;
@@ -346,6 +354,8 @@ class GsfElectronAlgo {
 
     EleTkIsolFromCands tkIsol03Calc_;
     EleTkIsolFromCands tkIsol04Calc_;
+    EleTkIsolFromCands tkIsolHEEP03Calc_;
+    EleTkIsolFromCands tkIsolHEEP04Calc_;
 
     void checkSetup( edm::EventSetup const& eventSetup ) ;
     EventData beginEvent( edm::Event const& event ) ;
diff --git a/RecoEgamma/EgammaElectronAlgos/interface/GsfElectronTools.h b/RecoEgamma/EgammaElectronAlgos/interface/GsfElectronTools.h
index 5f670b6148095..ee3501bedde8a 100644
--- a/RecoEgamma/EgammaElectronAlgos/interface/GsfElectronTools.h
+++ b/RecoEgamma/EgammaElectronAlgos/interface/GsfElectronTools.h
@@ -5,7 +5,7 @@
 #include "DataFormats/GsfTrackReco/interface/GsfTrackFwd.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 
-namespace GsfElectronTools {
+namespace gsfElectronTools {
 
   // From Puneeth Kalavase : returns the CTF track that has the highest fraction
   // of shared hits in Pixels and the inner strip tracker with the electron Track
diff --git a/RecoEgamma/EgammaElectronAlgos/interface/PixelHitMatcher.h b/RecoEgamma/EgammaElectronAlgos/interface/PixelHitMatcher.h
index b1ced0670c69b..3df0cd761ba58 100644
--- a/RecoEgamma/EgammaElectronAlgos/interface/PixelHitMatcher.h
+++ b/RecoEgamma/EgammaElectronAlgos/interface/PixelHitMatcher.h
@@ -25,7 +25,6 @@
 
 #include "RecoEgamma/EgammaElectronAlgos/interface/BarrelMeasurementEstimator.h"
 #include "RecoEgamma/EgammaElectronAlgos/interface/ForwardMeasurementEstimator.h"
-#include "RecoEgamma/EgammaElectronAlgos/interface/PixelMatchStartLayers.h"
 #include "RecoEgamma/EgammaElectronAlgos/interface/FTSFromVertexToPointFactory.h"
 
 #include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
@@ -210,7 +209,6 @@ class PixelHitMatcher
     BarrelMeasurementEstimator meas2ndBLayer ;
     ForwardMeasurementEstimator meas1stFLayer ;
     ForwardMeasurementEstimator meas2ndFLayer ;
-    PixelMatchStartLayers startLayers ;
     PropagatorWithMaterial * prop1stLayer ;
     PropagatorWithMaterial * prop2ndLayer ;
     const GeometricSearchTracker * theGeometricSearchTracker ;
diff --git a/RecoEgamma/EgammaElectronAlgos/interface/PixelMatchStartLayers.h b/RecoEgamma/EgammaElectronAlgos/interface/PixelMatchStartLayers.h
deleted file mode 100644
index dd3158025a501..0000000000000
--- a/RecoEgamma/EgammaElectronAlgos/interface/PixelMatchStartLayers.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef PIXELMATCHSTARTLAYERS_H
-#define PIXELMATCHSTARTLAYERS_H
-// -*- C++ -*-
-//
-// Package:    EgammaElectronAlgos
-// Class:      PixelMatchStartLayers
-// 
-/**\class PixelMatchStartLayers EgammaElectronAlgos/PixelMatchStartLayers
-
- Description: class to find the innermost pixel forward layers
-
- Implementation:
-     <Notes on implementation>
-*/
-//
-// Original Author:  Ursula Berthon, Claude Charlot
-//         Created:  Mon Mar 27 13:22:06 CEST 2006
-//
-//
-#include "TrackingTools/DetLayers/interface/ForwardDetLayer.h" 
-#include "TrackingTools/DetLayers/interface/BarrelDetLayer.h" 
-#include <vector>
-
-#include <vector>
-
-class GeometricSearchTracker;
-
-/** Class to find the innermost pixel layers 
- */
-
-class PixelMatchStartLayers {
-
-public:
-  typedef std::vector<const ForwardDetLayer*> ForwardLayerContainer;
-  typedef std::vector<const ForwardDetLayer*>::const_iterator ForwardLayerIterator;
-
-  typedef std::vector<const BarrelDetLayer*> BarrelLayerContainer;
-  typedef std::vector<const BarrelDetLayer*>::const_iterator BarrelLayerIterator;
-
-  PixelMatchStartLayers();
-  void setup(const GeometricSearchTracker *);
-
-  ForwardLayerIterator pos1stFLayer()
-  {return posPixel.begin();}
-  ForwardLayerIterator neg1stFLayer()
-  {return negPixel.begin();}
-  BarrelLayerIterator firstBLayer()
-  {return barrelPixel.begin();}
-
- 
-private:
- 
-  ForwardLayerContainer posPixel;
-  ForwardLayerContainer negPixel;
-  BarrelLayerContainer barrelPixel;
-};
-
-#endif
diff --git a/RecoEgamma/EgammaElectronAlgos/src/GsfElectronAlgo.cc b/RecoEgamma/EgammaElectronAlgos/src/GsfElectronAlgo.cc
index 46849148cec7f..febf8d4f707c1 100644
--- a/RecoEgamma/EgammaElectronAlgos/src/GsfElectronAlgo.cc
+++ b/RecoEgamma/EgammaElectronAlgos/src/GsfElectronAlgo.cc
@@ -30,6 +30,7 @@
 #include "RecoEgamma/EgammaElectronAlgos/interface/GsfElectronAlgo.h"
 #include "RecoEgamma/EgammaElectronAlgos/interface/GsfElectronTools.h"
 #include "RecoEgamma/EgammaTools/interface/ConversionFinder.h"
+#include "RecoEgamma/EgammaTools/interface/ConversionTools.h"
 
 
 #include <Math/Point3D.h>
@@ -305,12 +306,16 @@ GsfElectronAlgo::GsfElectronAlgo
    EcalClusterFunctionBaseClass * crackCorrectionFunction,
    const RegressionHelper::Configuration & regCfg,
    const edm::ParameterSet& tkIsol03Cfg,
-   const edm::ParameterSet& tkIsol04Cfg
-   
+   const edm::ParameterSet& tkIsol04Cfg,
+   const edm::ParameterSet& tkIsolHEEP03Cfg,
+   const edm::ParameterSet& tkIsolHEEP04Cfg
+
  )
 : generalData_{inputCfg,strategyCfg,cutsCfg,cutsCfgPflow,isoCfg,recHitsCfg,hcalCfg,hcalCfgPflow,superClusterErrorFunction,crackCorrectionFunction,regCfg},
    eventSetupData_{},
-   tkIsol03Calc_(tkIsol03Cfg),tkIsol04Calc_(tkIsol04Cfg)
+   tkIsol03Calc_(tkIsol03Cfg),tkIsol04Calc_(tkIsol04Cfg),
+   tkIsolHEEP03Calc_(tkIsolHEEP03Cfg),tkIsolHEEP04Calc_(tkIsolHEEP04Cfg)
+  
  {}
 
 void GsfElectronAlgo::checkSetup( const edm::EventSetup & es )
@@ -393,6 +398,7 @@ GsfElectronAlgo::EventData GsfElectronAlgo::beginEvent( edm::Event const& event
       .seeds             = event.getHandle(generalData_.inputCfg.seedsTag),
       .gsfPfRecTracks    = generalData_.strategyCfg.useGsfPfRecTracks ? event.getHandle(generalData_.inputCfg.gsfPfRecTracksTag) : edm::Handle<reco::GsfPFRecTrackCollection>{},
       .vertices          = event.getHandle(generalData_.inputCfg.vtxCollectionTag),
+      .conversions       = generalData_.strategyCfg.fillConvVtxFitProb ? event.getHandle(generalData_.inputCfg.conversions) : edm::Handle<reco::ConversionCollection>(),
       .hadDepth1Isolation03 = EgammaTowerIsolation(egHcalIsoConeSizeOutSmall,egHcalIsoConeSizeIn,egHcalIsoPtMin,egHcalDepth1,&towers),
       .hadDepth1Isolation04 = EgammaTowerIsolation(egHcalIsoConeSizeOutLarge,egHcalIsoConeSizeIn,egHcalIsoPtMin,egHcalDepth1,&towers),
       .hadDepth2Isolation03 = EgammaTowerIsolation(egHcalIsoConeSizeOutSmall,egHcalIsoConeSizeIn,egHcalIsoPtMin,egHcalDepth2,&towers),
@@ -568,7 +574,7 @@ void GsfElectronAlgo::createElectron(reco::GsfElectronCollection & electrons, El
  {
   // eventually check ctf track
   if (generalData_.strategyCfg.ctfTracksCheck && electronData.ctfTrackRef.isNull()) {
-    electronData.ctfTrackRef = GsfElectronTools::getClosestCtfToGsf( electronData.gsfTrackRef,
+    electronData.ctfTrackRef = gsfElectronTools::getClosestCtfToGsf( electronData.gsfTrackRef,
                                                                        eventData.currentCtfTracks ).first;
   }
 
@@ -734,6 +740,18 @@ void GsfElectronAlgo::createElectron(reco::GsfElectronCollection & electrons, El
   conversionVars.dist = conversionInfo.dist  ;
   conversionVars.dcot = conversionInfo.dcot  ;
   conversionVars.radius = conversionInfo.radiusOfConversion  ;
+  if(generalData_.strategyCfg.fillConvVtxFitProb){
+    //this is an intentionally bugged version which ignores the GsfTrack
+    //this is a bug which was introduced in reduced e/gamma where the GsfTrack gets 
+    //relinked to a new collection which means it can no longer match the conversion
+    //as it matches based on product/id
+    //we keep this defination for the MVAs
+    const auto matchedConv =  ConversionTools::matchedConversion(electronData.coreRef->ctfTrack(),
+								 *eventData.conversions,
+								 eventData.beamspot->position(),
+								 2.0,1e-6,0);
+    conversionVars.vtxFitProb = ConversionTools::getVtxFitProb(matchedConv);
+  }
   if ((conversionVars.flags==0)or(conversionVars.flags==1))
     conversionVars.partner = TrackBaseRef(conversionInfo.conversionPartnerCtfTk)  ;
   else if ((conversionVars.flags==2)or(conversionVars.flags==3))
@@ -830,7 +848,9 @@ void GsfElectronAlgo::createElectron(reco::GsfElectronCollection & electrons, El
   reco::GsfElectron::IsolationVariables dr03, dr04 ;
   dr03.tkSumPt = tkIsol03Calc_.calIsolPt(*ele.gsfTrack(),*eventData.currentCtfTracks);
   dr04.tkSumPt = tkIsol04Calc_.calIsolPt(*ele.gsfTrack(),*eventData.currentCtfTracks);
- 
+  dr03.tkSumPtHEEP = tkIsolHEEP03Calc_.calIsolPt(*ele.gsfTrack(),*eventData.currentCtfTracks);
+  dr04.tkSumPtHEEP = tkIsolHEEP04Calc_.calIsolPt(*ele.gsfTrack(),*eventData.currentCtfTracks);
+
   if( !EcalTools::isHGCalDet((DetId::Detector)region) ) {
     dr03.hcalDepth1TowerSumEt = eventData.hadDepth1Isolation03.getTowerEtSum(&ele) ;
     dr03.hcalDepth2TowerSumEt = eventData.hadDepth2Isolation03.getTowerEtSum(&ele) ;
diff --git a/RecoEgamma/EgammaElectronAlgos/src/GsfElectronTools.cc b/RecoEgamma/EgammaElectronAlgos/src/GsfElectronTools.cc
index fd5e7b6a9edf3..ce2e58447f07f 100644
--- a/RecoEgamma/EgammaElectronAlgos/src/GsfElectronTools.cc
+++ b/RecoEgamma/EgammaElectronAlgos/src/GsfElectronTools.cc
@@ -6,7 +6,7 @@
 #include "DataFormats/EgammaReco/interface/ElectronSeed.h"
 #include "RecoEgamma/EgammaElectronAlgos/interface/GsfElectronTools.h"
 
-namespace GsfElectronTools {
+namespace gsfElectronTools {
 
   using namespace reco ;
 
diff --git a/RecoEgamma/EgammaElectronAlgos/src/PixelHitMatcher.cc b/RecoEgamma/EgammaElectronAlgos/src/PixelHitMatcher.cc
index 65342b38d946d..674d66fb86b15 100644
--- a/RecoEgamma/EgammaElectronAlgos/src/PixelHitMatcher.cc
+++ b/RecoEgamma/EgammaElectronAlgos/src/PixelHitMatcher.cc
@@ -24,7 +24,6 @@ PixelHitMatcher::PixelHitMatcher
  : //zmin1 and zmax1 are dummy at this moment, set from beamspot later
    meas1stBLayer(phi1min,phi1max,0.,0.), meas2ndBLayer(phi2minB,phi2maxB,z2minB,z2maxB),
    meas1stFLayer(phi1min,phi1max,0.,0.), meas2ndFLayer(phi2minF,phi2maxF,r2minF,r2maxF),
-   startLayers(),
    prop1stLayer(nullptr), prop2ndLayer(nullptr),theGeometricSearchTracker(nullptr),theTrackerEvent(nullptr),theTracker(nullptr),vertex_(0.),
    searchInTIDTEC_(searchInTIDTEC), useRecoVertex_(false)
  {
@@ -73,7 +72,6 @@ void PixelHitMatcher::setES
    {
     theTracker = theMeasurementTracker;
     theGeometricSearchTracker=theMeasurementTracker->geometricSearchTracker() ;
-    startLayers.setup(theGeometricSearchTracker) ;
    }
 
   theMagField = magField ;
@@ -263,8 +261,7 @@ PixelHitMatcher::compatibleHits
   pred1Meas.clear();
   pred2Meas.clear();
 
-  typedef vector<const BarrelDetLayer*>::const_iterator BarrelLayerIterator;
-  BarrelLayerIterator firstLayer = startLayers.firstBLayer();
+  auto firstLayer = theGeometricSearchTracker->pixelBarrelLayers().begin(); 
 
   FreeTrajectoryState fts = FTSFromVertexToPointFactory::get(*theMagField,xmeas, vprim, energy, charge);
 
@@ -332,14 +329,13 @@ PixelHitMatcher::compatibleHits
 
 
   // check if there are compatible 1st hits the forward disks
-  typedef vector<const ForwardDetLayer*>::const_iterator ForwardLayerIterator;
-  ForwardLayerIterator flayer;
 
   TrajectoryStateOnSurface tsosfwd(fts, *bpb(fts.position(), fts.momentum()));
   if (tsosfwd.isValid()) {
 
     for (int i=0; i<2; i++) {
-      i == 0 ? flayer = startLayers.pos1stFLayer() : flayer = startLayers.neg1stFLayer();
+      auto flayer = i == 0 ? theGeometricSearchTracker->posPixelForwardLayers().begin()
+                           : theGeometricSearchTracker->negPixelForwardLayers().begin();
 
       if (i==0 && xmeas.z() < -100. ) continue;
       if (i==1 && xmeas.z() > 100. ) continue;
diff --git a/RecoEgamma/EgammaElectronAlgos/src/PixelMatchStartLayers.cc b/RecoEgamma/EgammaElectronAlgos/src/PixelMatchStartLayers.cc
deleted file mode 100644
index 4fe64fedfdb6b..0000000000000
--- a/RecoEgamma/EgammaElectronAlgos/src/PixelMatchStartLayers.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-// -*- C++ -*-
-//
-// Package:    EgammaElectronAlgos
-// Class:      PixelMatchStartLayers
-// 
-/**\class PixelMatchStartLayers EgammaElectronAlgos/PixelMatchStartLayers
-
- Description: class to find the innermost pixel forward layers
-
- Implementation:
-     <Notes on implementation>
-*/
-//
-// Original Author:  Ursula Berthon, Claude Charlot
-//         Created:  Mon Mar 27 13:22:06 CEST 2006
-//
-//
-
-#include "RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h"
-#include <iostream> 
-#include <algorithm>
-#include "RecoEgamma/EgammaElectronAlgos/interface/PixelMatchStartLayers.h"
-
-PixelMatchStartLayers::PixelMatchStartLayers() {}
-
-void PixelMatchStartLayers::setup(const GeometricSearchTracker * layers) {
-  barrelPixel = layers->pixelBarrelLayers();
-  posPixel = layers->posPixelForwardLayers();
-  negPixel = layers->negPixelForwardLayers(); 
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/RecoEgamma/EgammaElectronProducers/plugins/GsfElectronBaseProducer.cc b/RecoEgamma/EgammaElectronProducers/plugins/GsfElectronBaseProducer.cc
index a39271072a79d..9591911973c26 100644
--- a/RecoEgamma/EgammaElectronProducers/plugins/GsfElectronBaseProducer.cc
+++ b/RecoEgamma/EgammaElectronProducers/plugins/GsfElectronBaseProducer.cc
@@ -55,6 +55,7 @@ void GsfElectronBaseProducer::fillDescriptions( edm::ConfigurationDescriptions &
   desc.add<edm::InputTag>("previousGsfElectronsTag", edm::InputTag(""));
   desc.add<edm::InputTag>("hcalTowers", edm::InputTag("towerMaker"));
   desc.add<edm::InputTag>("vtxTag", edm::InputTag("offlinePrimaryVertices"));
+  desc.add<edm::InputTag>("conversionsTag", edm::InputTag("allConversions"));
   desc.add<edm::InputTag>("gsfPfRecTracksTag", edm::InputTag("pfTrackElec"));
   desc.add<edm::InputTag>("barrelRecHitCollectionTag", edm::InputTag("ecalRecHit","EcalRecHitsEB"));
   desc.add<edm::InputTag>("endcapRecHitCollectionTag", edm::InputTag("ecalRecHit","EcalRecHitsEE"));
@@ -76,6 +77,7 @@ void GsfElectronBaseProducer::fillDescriptions( edm::ConfigurationDescriptions &
   desc.add<unsigned int>("ambSortingStrategy", 1);
   desc.add<unsigned int>("ambClustersOverlapStrategy", 1);
   desc.add<bool>("addPflowElectrons", true); // this one should be transfered to the "core" level
+  desc.add<bool>("fillConvVtxFitProb", true); 
 
   // Ecal rec hits configuration
   desc.add<std::vector<std::string>>("recHitFlagsToBeExcludedBarrel");
@@ -86,6 +88,8 @@ void GsfElectronBaseProducer::fillDescriptions( edm::ConfigurationDescriptions &
   // Isolation algos configuration
   desc.add("trkIsol03Cfg",EleTkIsolFromCands::pSetDescript());
   desc.add("trkIsol04Cfg",EleTkIsolFromCands::pSetDescript());
+  desc.add("trkIsolHEEP03Cfg",EleTkIsolFromCands::pSetDescript());
+  desc.add("trkIsolHEEP04Cfg",EleTkIsolFromCands::pSetDescript());
   desc.add<bool>("useNumCrystals", true);
   desc.add<double>("etMinBarrel", 0.0);
   desc.add<double>("etMinEndcaps", 0.11);
@@ -251,6 +255,7 @@ GsfElectronBaseProducer::GsfElectronBaseProducer( const edm::ParameterSet& cfg,
   inputCfg_.beamSpotTag = consumes<reco::BeamSpot>(cfg.getParameter<edm::InputTag>("beamSpotTag"));
   inputCfg_.gsfPfRecTracksTag = consumes<reco::GsfPFRecTrackCollection>(cfg.getParameter<edm::InputTag>("gsfPfRecTracksTag"));
   inputCfg_.vtxCollectionTag = consumes<reco::VertexCollection>(cfg.getParameter<edm::InputTag>("vtxTag"));
+  if(cfg.getParameter<bool>("fillConvVtxFitProb") ) inputCfg_.conversions = consumes<reco::ConversionCollection>(cfg.getParameter<edm::InputTag>("conversionsTag"));
 
   if ( cfg.getParameter<bool>("useIsolationValues") ) {
     inputCfg_.pfIsoVals = cfg.getParameter<edm::ParameterSet> ("pfIsolationValues");
@@ -281,6 +286,7 @@ GsfElectronBaseProducer::GsfElectronBaseProducer( const edm::ParameterSet& cfg,
   strategyCfg_.MaxElePtForOnlyMVA = cfg.getParameter<double>("MaxElePtForOnlyMVA");
   strategyCfg_.useEcalRegression = cfg.getParameter<bool>("useEcalRegression");
   strategyCfg_.useCombinationRegression = cfg.getParameter<bool>("useCombinationRegression");
+  strategyCfg_.fillConvVtxFitProb = cfg.getParameter<bool>("fillConvVtxFitProb");
 
   // hcal helpers
   auto const& psetPreselection = cfg.getParameter<edm::ParameterSet>("preselection");
@@ -354,7 +360,9 @@ GsfElectronBaseProducer::GsfElectronBaseProducer( const edm::ParameterSet& cfg,
      crackCorrectionFunction,
      regressionCfg,
      cfg.getParameter<edm::ParameterSet>("trkIsol03Cfg"),
-     cfg.getParameter<edm::ParameterSet>("trkIsol04Cfg")
+     cfg.getParameter<edm::ParameterSet>("trkIsol04Cfg"),
+     cfg.getParameter<edm::ParameterSet>("trkIsolHEEP03Cfg"),
+     cfg.getParameter<edm::ParameterSet>("trkIsolHEEP04Cfg")
    ) ;
  }
 
diff --git a/RecoEgamma/EgammaElectronProducers/plugins/GsfElectronCoreBaseProducer.cc b/RecoEgamma/EgammaElectronProducers/plugins/GsfElectronCoreBaseProducer.cc
index d93f75833a12f..7a3760da14eb8 100644
--- a/RecoEgamma/EgammaElectronProducers/plugins/GsfElectronCoreBaseProducer.cc
+++ b/RecoEgamma/EgammaElectronProducers/plugins/GsfElectronCoreBaseProducer.cc
@@ -51,6 +51,6 @@ void GsfElectronCoreBaseProducer::fillElectronCore( reco::GsfElectronCore * eleC
  {
   const GsfTrackRef & gsfTrackRef = eleCore->gsfTrack() ;
 
-  std::pair<TrackRef,float> ctfpair = GsfElectronTools::getClosestCtfToGsf(gsfTrackRef,ctfTracksH_) ;
+  std::pair<TrackRef,float> ctfpair = gsfElectronTools::getClosestCtfToGsf(gsfTrackRef,ctfTracksH_) ;
   eleCore->setCtfTrack(ctfpair.first,ctfpair.second) ;
  }
diff --git a/RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py b/RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py
index 8a72472925691..4df661cb3284c 100644
--- a/RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py
+++ b/RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py
@@ -3,7 +3,7 @@
 from RecoEcal.EgammaClusterProducers.hybridSuperClusters_cfi import *
 from RecoEcal.EgammaClusterProducers.multi5x5BasicClusters_cfi import *
 
-from RecoEgamma.EgammaIsolationAlgos.electronTrackIsolations_cfi import trkIsol03CfgV1,trkIsol04CfgV1
+from RecoEgamma.EgammaIsolationAlgos.electronTrackIsolations_cfi import trkIsol03CfgV1,trkIsol04CfgV1,trkIsol03CfgV2,trkIsol04CfgV2
 
 
 gedGsfElectronsTmp = cms.EDProducer("GEDGsfElectronProducer",
@@ -45,6 +45,8 @@
     # Isolation algos configuration
     trkIsol03Cfg = trkIsol03CfgV1,
     trkIsol04Cfg = trkIsol04CfgV1,
+    trkIsolHEEP03Cfg = trkIsol03CfgV2,
+    trkIsolHEEP04Cfg = trkIsol04CfgV2,
 
     # regression. The labels are needed in all cases.
     ecalRefinedRegressionWeightLabels = cms.vstring("gedelectron_EBCorrection_offline_v1",
diff --git a/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py b/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py
index 0749aa99f5cbe..f1b7aa988316a 100644
--- a/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py
+++ b/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py
@@ -2,7 +2,7 @@
 from RecoEcal.EgammaClusterProducers.hybridSuperClusters_cfi import *
 from RecoEcal.EgammaClusterProducers.multi5x5BasicClusters_cfi import *
 
-from RecoEgamma.EgammaIsolationAlgos.electronTrackIsolations_cfi import trkIsol03CfgV1,trkIsol04CfgV1
+from RecoEgamma.EgammaIsolationAlgos.electronTrackIsolations_cfi import trkIsol03CfgV1,trkIsol04CfgV1,trkIsol03CfgV2,trkIsol04CfgV2
 
 #==============================================================================
 # Producer of transient ecal driven gsf electrons
@@ -49,6 +49,8 @@
     # Isolation algos configuration
     trkIsol03Cfg = trkIsol03CfgV1,
     trkIsol04Cfg = trkIsol04CfgV1,
+    trkIsolHEEP03Cfg = trkIsol03CfgV2,
+    trkIsolHEEP04Cfg = trkIsol04CfgV2,
 
     # Iso values
     useIsolationValues = cms.bool(False),
diff --git a/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectrons_cfi.py b/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectrons_cfi.py
index fedae8e34fd9f..8e0cfcd1bee30 100644
--- a/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectrons_cfi.py
+++ b/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectrons_cfi.py
@@ -3,6 +3,7 @@
 from RecoEcal.EgammaClusterProducers.multi5x5BasicClusters_cfi import *
 
 from RecoEgamma.EgammaIsolationAlgos.electronTrackIsolations_cfi import trkIsol03CfgV1,trkIsol04CfgV1
+from RecoEgamma.EgammaIsolationAlgos.electronTrackIsolations_cfi import trkIsol03CfgV2,trkIsol04CfgV2
 
 lowPtGsfElectrons = cms.EDProducer(
     "LowPtGsfElectronProducer",
@@ -44,6 +45,8 @@
     # Isolation algos configuration
     trkIsol03Cfg = trkIsol03CfgV1,
     trkIsol04Cfg = trkIsol04CfgV1,
+    trkIsolHEEP03Cfg = trkIsol03CfgV2,
+    trkIsolHEEP04Cfg = trkIsol04CfgV2,
     
     # regression. The labels are needed in all cases.
     ecalRefinedRegressionWeightLabels = cms.vstring(),
diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTHybridClusterProducer.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTHybridClusterProducer.cc
index e1090796c85bc..ca9b9f0a82406 100644
--- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTHybridClusterProducer.cc
+++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTHybridClusterProducer.cc
@@ -174,13 +174,13 @@ void EgammaHLTHybridClusterProducer::produce(edm::Event& evt, const edm::EventSe
  
   if(hitcollection_.instance() == "EcalRecHitsEB") {
     geometry_p = geometry.getSubdetectorGeometry(DetId::Ecal, EcalBarrel);
-    topology.reset(new EcalBarrelTopology(geoHandle));
+    topology = std::make_unique<EcalBarrelTopology>(*geoHandle);
   } else if(hitcollection_.instance() == "EcalRecHitsEE") {
     geometry_p = geometry.getSubdetectorGeometry(DetId::Ecal, EcalEndcap);
-    topology.reset(new EcalEndcapTopology(geoHandle));
+    topology = std::make_unique<EcalEndcapTopology>(*geoHandle);
   } else if(hitcollection_.instance() == "EcalRecHitsPS") {
     geometry_p = geometry.getSubdetectorGeometry(DetId::Ecal, EcalPreshower);
-    topology.reset(new EcalPreshowerTopology (geoHandle));
+    topology = std::make_unique<EcalPreshowerTopology>();
   } else throw(std::runtime_error("\n\nHybrid Cluster Producer encountered invalied ecalhitcollection type.\n\n"));
     
   //Get the L1 EM Particle Collection
diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTIslandClusterProducer.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTIslandClusterProducer.cc
index f22a94838c1ad..f2d543e9d9c04 100644
--- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTIslandClusterProducer.cc
+++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTIslandClusterProducer.cc
@@ -274,17 +274,17 @@ const {
   es.get<CaloGeometryRecord>().get(geoHandle);
 
   const CaloSubdetectorGeometry *geometry_p;
-  CaloSubdetectorTopology *topology_p;
+  std::unique_ptr<CaloSubdetectorTopology> topology_p;
 
   if (ecalPart == IslandClusterAlgo::barrel) 
     {
       geometry_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalBarrel);
-      topology_p = new EcalBarrelTopology(geoHandle);
+      topology_p = std::make_unique<EcalBarrelTopology>(*geoHandle);
     }
   else
     {
       geometry_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalEndcap);
-      topology_p = new EcalEndcapTopology(geoHandle); 
+      topology_p = std::make_unique<EcalEndcapTopology>(*geoHandle);
    }
 
   const CaloSubdetectorGeometry *geometryES_p;
@@ -292,7 +292,7 @@ const {
 
   // Run the clusterization algorithm:
   reco::BasicClusterCollection clusters;
-  clusters = island_p->makeClusters(hitCollection_p, geometry_p, topology_p, geometryES_p, ecalPart, true, regions);
+  clusters = island_p->makeClusters(hitCollection_p, geometry_p, topology_p.get(), geometryES_p, ecalPart, true, regions);
 
   // create an unique_ptr to a BasicClusterCollection, copy the barrel clusters into it and put in the Event:
   auto clusters_p = std::make_unique<reco::BasicClusterCollection>();
@@ -302,6 +302,4 @@ const {
     bccHandle = evt.put(std::move(clusters_p), barrelClusterCollection_);
   else
     bccHandle = evt.put(std::move(clusters_p), endcapClusterCollection_);
-
-  delete topology_p;
 }
diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTMulti5x5ClusterProducer.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTMulti5x5ClusterProducer.cc
index 292dde096becc..051147c6aee5a 100644
--- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTMulti5x5ClusterProducer.cc
+++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTMulti5x5ClusterProducer.cc
@@ -277,17 +277,17 @@ void EgammaHLTMulti5x5ClusterProducer::clusterizeECALPart(edm::Event &evt, const
   es.get<CaloGeometryRecord>().get(geoHandle);
 
   const CaloSubdetectorGeometry *geometry_p;
-  CaloSubdetectorTopology *topology_p;
+  std::unique_ptr<CaloSubdetectorTopology>topology_p;
 
   if (detector == reco::CaloID::DET_ECAL_BARREL) 
     {
       geometry_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalBarrel);
-      topology_p = new EcalBarrelTopology(geoHandle);
+      topology_p = std::make_unique<EcalBarrelTopology>(*geoHandle);
     }
   else
     {
       geometry_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalEndcap);
-      topology_p = new EcalEndcapTopology(geoHandle); 
+      topology_p = std::make_unique<EcalEndcapTopology>(*geoHandle);
    }
 
 
@@ -296,7 +296,7 @@ void EgammaHLTMulti5x5ClusterProducer::clusterizeECALPart(edm::Event &evt, const
 
   // Run the clusterization algorithm:
   reco::BasicClusterCollection clusters;
-  clusters = Multi5x5_p->makeClusters(hitCollection_p, geometry_p, topology_p, geometryES_p, detector, true, regions);
+  clusters = Multi5x5_p->makeClusters(hitCollection_p, geometry_p, topology_p.get(), geometryES_p, detector, true, regions);
 
   // create an unique_ptr to a BasicClusterCollection, copy the barrel clusters into it and put in the Event:
   auto clusters_p = std::make_unique<reco::BasicClusterCollection>();
@@ -306,6 +306,4 @@ void EgammaHLTMulti5x5ClusterProducer::clusterizeECALPart(edm::Event &evt, const
     bccHandle = evt.put(std::move(clusters_p), barrelClusterCollection_);
   else
     bccHandle = evt.put(std::move(clusters_p), endcapClusterCollection_);
-
-  delete topology_p;
 }
diff --git a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTNxNClusterProducer.cc b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTNxNClusterProducer.cc
index 3440060404ed2..bb2fd42ba1688 100644
--- a/RecoEgamma/EgammaHLTProducers/src/EgammaHLTNxNClusterProducer.cc
+++ b/RecoEgamma/EgammaHLTProducers/src/EgammaHLTNxNClusterProducer.cc
@@ -184,10 +184,10 @@ void EgammaHLTNxNClusterProducer::makeNxNClusters(edm::Event &evt, const edm::Ev
   std::unique_ptr<CaloSubdetectorTopology> topology_p;
   if (detector == reco::CaloID::DET_ECAL_BARREL) {
     geometry_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalBarrel);
-    topology_p.reset(new EcalBarrelTopology(geoHandle));
+    topology_p = std::make_unique<EcalBarrelTopology>(*geoHandle);
   }else {
     geometry_p = geoHandle->getSubdetectorGeometry(DetId::Ecal, EcalEndcap);
-    topology_p.reset(new EcalEndcapTopology(geoHandle)); 
+    topology_p = std::make_unique<EcalEndcapTopology>(*geoHandle);
   }
   
   const CaloSubdetectorGeometry *geometryES_p;
diff --git a/RecoEgamma/EgammaHLTProducers/src/HLTRechitInRegionsProducer.cc b/RecoEgamma/EgammaHLTProducers/src/HLTRechitInRegionsProducer.cc
index 2e8853ea1b706..3049b789267ee 100644
--- a/RecoEgamma/EgammaHLTProducers/src/HLTRechitInRegionsProducer.cc
+++ b/RecoEgamma/EgammaHLTProducers/src/HLTRechitInRegionsProducer.cc
@@ -139,13 +139,13 @@ void HLTRechitInRegionsProducer<T1>::produce(edm::Event& evt, const edm::EventSe
       if (!uncalibRecHits->empty()) {
 	if ((*uncalibRecHits)[0].id().subdetId() == EcalBarrel) {
 	  geometry_p = geometry.getSubdetectorGeometry(DetId::Ecal, EcalBarrel);
-	  topology = std::make_unique<EcalBarrelTopology>(geoHandle);
+	  topology = std::make_unique<EcalBarrelTopology>(*geoHandle);
 	} else if ((*uncalibRecHits)[0].id().subdetId() == EcalEndcap) {
 	  geometry_p = geometry.getSubdetectorGeometry(DetId::Ecal, EcalEndcap);
-	  topology = std::make_unique<EcalEndcapTopology>(geoHandle);
+	  topology = std::make_unique<EcalEndcapTopology>(*geoHandle);
 	} else if ((*uncalibRecHits)[0].id().subdetId() == EcalPreshower) {
 	  geometry_p = geometry.getSubdetectorGeometry(DetId::Ecal, EcalPreshower);
-	  topology = std::make_unique<EcalPreshowerTopology>(geoHandle);
+	  topology = std::make_unique<EcalPreshowerTopology>();
 	} else throw(std::runtime_error("\n\nProducer encountered invalied ecalhitcollection type.\n\n"));
 	
 	if(!regions.empty()) {
@@ -184,13 +184,13 @@ void HLTRechitInRegionsProducer<T1>::produce(edm::Event& evt, const edm::EventSe
       if (!recHits->empty()) {
 	if ((*recHits)[0].id().subdetId() == EcalBarrel) {
 	  geometry_p = geometry.getSubdetectorGeometry(DetId::Ecal, EcalBarrel);
-	  topology = std::make_unique<EcalBarrelTopology>(geoHandle);
+	  topology = std::make_unique<EcalBarrelTopology>(*geoHandle);
 	} else if ((*recHits)[0].id().subdetId() == EcalEndcap) {
 	  geometry_p = geometry.getSubdetectorGeometry(DetId::Ecal, EcalEndcap);
-	  topology = std::make_unique<EcalEndcapTopology>(geoHandle);
+	  topology = std::make_unique<EcalEndcapTopology>(*geoHandle);
 	} else if ((*recHits)[0].id().subdetId() == EcalPreshower) {
 	  geometry_p = geometry.getSubdetectorGeometry(DetId::Ecal, EcalPreshower);
-	  topology = std::make_unique<EcalPreshowerTopology>(geoHandle);
+	  topology = std::make_unique<EcalPreshowerTopology>();
 	} else throw(std::runtime_error("\n\nProducer encountered invalied ecalhitcollection type.\n\n"));
 	
 	if(!regions.empty()) {
diff --git a/RecoEgamma/EgammaMCTools/test/pfClusterForCalibration.py b/RecoEgamma/EgammaMCTools/test/pfClusterForCalibration.py
index 5fbc70cef8bfd..a4744648f99ae 100644
--- a/RecoEgamma/EgammaMCTools/test/pfClusterForCalibration.py
+++ b/RecoEgamma/EgammaMCTools/test/pfClusterForCalibration.py
@@ -4,8 +4,8 @@
 import FWCore.ParameterSet.Config as cms
 
 # Run with the 2017 detector
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process('SKIM',eras.Run2_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process('SKIM',Run2_2017)
 
 # Import the standard packages for reconstruction and digitization
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/RecoEgamma/EgammaPhotonProducers/interface/GEDPhotonProducer.h b/RecoEgamma/EgammaPhotonProducers/interface/GEDPhotonProducer.h
index 69c5a5fb19c08..17efb13a263ed 100644
--- a/RecoEgamma/EgammaPhotonProducers/interface/GEDPhotonProducer.h
+++ b/RecoEgamma/EgammaPhotonProducers/interface/GEDPhotonProducer.h
@@ -84,9 +84,13 @@ class GEDPhotonProducer : public edm::stream::EDProducer<> {
 			   edm::ValueMap<reco::PhotonRef>  pfEGCandToPhotonMap,
 			   edm::Handle< reco::VertexCollection >&  pvVertices,
 			   reco::PhotonCollection & outputCollection,
-			   int& iSC, const edm::Handle<edm::ValueMap<float>>& chargedHadrons,
+			   int& iSC, 
+			   const edm::Handle<edm::ValueMap<float>>& chargedHadrons,
 			   const edm::Handle<edm::ValueMap<float>>& neutralHadrons, 
 			   const edm::Handle<edm::ValueMap<float>>& photons,
+			   const edm::Handle<edm::ValueMap<float>>& chargedHadronsWorstVtx,
+			   const edm::Handle<edm::ValueMap<float>>& chargedHadronsWorstVtxGeomVeto,
+			   const edm::Handle<edm::ValueMap<float>>& chargedHadronsPFPV,
 			   const edm::Handle<edm::ValueMap<float>>& pfEcalClusters,
 			   const edm::Handle<edm::ValueMap<float>>& pfHcalClusters);
    
@@ -109,9 +113,13 @@ class GEDPhotonProducer : public edm::stream::EDProducer<> {
  //for isolation with map-based veto
  edm::EDGetTokenT<edm::ValueMap<std::vector<reco::PFCandidateRef > > > particleBasedIsolationToken;
   //photon isolation sums
-  edm::EDGetTokenT<edm::ValueMap<float> > phoChargedIsolationTokenCITK_; 
-  edm::EDGetTokenT<edm::ValueMap<float> > phoNeutralHadronIsolationTokenCITK_; 
-  edm::EDGetTokenT<edm::ValueMap<float> > phoPhotonIsolationTokenCITK_; 
+  edm::EDGetTokenT<edm::ValueMap<float> > phoChargedIsolationToken_; 
+  edm::EDGetTokenT<edm::ValueMap<float> > phoNeutralHadronIsolationToken_; 
+  edm::EDGetTokenT<edm::ValueMap<float> > phoPhotonIsolationToken_; 
+  edm::EDGetTokenT<edm::ValueMap<float> > phoChargedWorstVtxIsoToken_; 
+  edm::EDGetTokenT<edm::ValueMap<float> > phoChargedWorstVtxGeomVetoIsoToken_; 
+  edm::EDGetTokenT<edm::ValueMap<float> > phoChargedPFPVIsoToken_; 
+
   edm::EDGetTokenT<edm::ValueMap<float> > phoPFECALClusIsolationToken_; 
   edm::EDGetTokenT<edm::ValueMap<float> > phoPFHCALClusIsolationToken_; 
  
diff --git a/RecoEgamma/EgammaPhotonProducers/python/gedPhotonSequence_cff.py b/RecoEgamma/EgammaPhotonProducers/python/gedPhotonSequence_cff.py
index 7bd6f62a4281f..d78beddf505fa 100644
--- a/RecoEgamma/EgammaPhotonProducers/python/gedPhotonSequence_cff.py
+++ b/RecoEgamma/EgammaPhotonProducers/python/gedPhotonSequence_cff.py
@@ -22,11 +22,18 @@
 gedPhotons.photonProducer = cms.InputTag("gedPhotonsTmp")
 gedPhotons.outputPhotonCollection = cms.string("")
 gedPhotons.reconstructionStep = cms.string("final")
-gedPhotons.chargedHadronIsolation = cms.InputTag("egmPhotonIsolationCITK:h+-DR030-")
-gedPhotons.neutralHadronIsolation = cms.InputTag("egmPhotonIsolationCITK:h0-DR030-")
-gedPhotons.photonIsolation = cms.InputTag("egmPhotonIsolationCITK:gamma-DR030-")
 gedPhotons.pfECALClusIsolation = cms.InputTag("photonEcalPFClusterIsolationProducer")
 gedPhotons.pfHCALClusIsolation = cms.InputTag("photonHcalPFClusterIsolationProducer")
+gedPhotons.pfIsolCfg = cms.PSet(
+    chargedHadronIso = cms.InputTag("photonIDValueMaps","phoChargedIsolation"),
+    neutralHadronIso = cms.InputTag("photonIDValueMaps","phoNeutralHadronIsolation"),
+    photonIso = cms.InputTag("photonIDValueMaps","phoPhotonIsolation"),
+    chargedHadronWorstVtxIso = cms.InputTag("photonIDValueMaps","phoWorstChargedIsolation"),
+    chargedHadronWorstVtxGeomVetoIso = cms.InputTag("photonIDValueMaps","phoWorstChargedIsolationConeVeto"),
+    chargedHadronPFPVIso = cms.InputTag("egmPhotonIsolationCITK:h+-DR030-"),
+    )
+    
+
 gedPhotonSequence    = cms.Sequence(gedPhotons)
 
 
diff --git a/RecoEgamma/EgammaPhotonProducers/python/ootPhotons_cff.py b/RecoEgamma/EgammaPhotonProducers/python/ootPhotons_cff.py
index c30429dde5453..ee7c468fea38b 100644
--- a/RecoEgamma/EgammaPhotonProducers/python/ootPhotons_cff.py
+++ b/RecoEgamma/EgammaPhotonProducers/python/ootPhotons_cff.py
@@ -15,9 +15,14 @@
     candidateP4type = "fromEcalEnergy",
     reconstructionStep = "ootfinal",
     pfEgammaCandidates = "",
-    chargedHadronIsolation = cms.InputTag(""),
-    neutralHadronIsolation = cms.InputTag(""),
-    photonIsolation = cms.InputTag(""),
+    pfIsolCfg = cms.PSet(
+        chargedHadronIso = cms.InputTag(""),
+        neutralHadronIso = cms.InputTag(""),
+        photonIso = cms.InputTag(""),
+        chargedHadronWorstVtxIso = cms.InputTag(""),
+        chargedHadronWorstVtxGeomVetoIso = cms.InputTag(""),
+        chargedHadronPFPVIso = cms.InputTag(""),
+    ),
     pfECALClusIsolation = cms.InputTag("ootPhotonEcalPFClusterIsolationProducer"),
     pfHCALClusIsolation = cms.InputTag("ootPhotonHcalPFClusterIsolationProducer"),
     valueMapPhotons = ""
diff --git a/RecoEgamma/EgammaPhotonProducers/src/GEDPhotonProducer.cc b/RecoEgamma/EgammaPhotonProducers/src/GEDPhotonProducer.cc
index fb62f17db2446..e9bada750e359 100644
--- a/RecoEgamma/EgammaPhotonProducers/src/GEDPhotonProducer.cc
+++ b/RecoEgamma/EgammaPhotonProducers/src/GEDPhotonProducer.cc
@@ -80,12 +80,17 @@ GEDPhotonProducer::GEDPhotonProducer(const edm::ParameterSet& config) :
     pfCandidates_      = 
       consumes<reco::PFCandidateCollection>(conf_.getParameter<edm::InputTag>("pfCandidates"));
 
-    phoChargedIsolationTokenCITK_      = 
-      consumes<edm::ValueMap<float>>(conf_.getParameter<edm::InputTag>("chargedHadronIsolation"));
-    phoNeutralHadronIsolationTokenCITK_      = 
-      consumes<edm::ValueMap<float>>(conf_.getParameter<edm::InputTag>("neutralHadronIsolation"));
-    phoPhotonIsolationTokenCITK_      = 
-      consumes<edm::ValueMap<float>>(conf_.getParameter<edm::InputTag>("photonIsolation"));   
+    const edm::ParameterSet& pfIsolCfg = conf_.getParameter<edm::ParameterSet>("pfIsolCfg");
+    auto getVMToken = [&pfIsolCfg,this](const std::string& name){
+      return consumes<edm::ValueMap<float> >(pfIsolCfg.getParameter<edm::InputTag>(name));
+    };
+    phoChargedIsolationToken_ = getVMToken("chargedHadronIso");
+    phoNeutralHadronIsolationToken_ = getVMToken("neutralHadronIso");
+    phoPhotonIsolationToken_ = getVMToken("photonIso");
+    phoChargedWorstVtxIsoToken_ = getVMToken("chargedHadronWorstVtxIso");
+    phoChargedWorstVtxGeomVetoIsoToken_ = getVMToken("chargedHadronWorstVtxGeomVetoIso");
+    phoChargedPFPVIsoToken_ = getVMToken("chargedHadronPFPVIso");
+
     //OOT photons in legacy 80X re-miniAOD do not have PF cluster embeded into the reco object
     //to preserve 80X behaviour
     if(conf_.exists("pfECALClusIsolation")){ 
@@ -269,18 +274,26 @@ void GEDPhotonProducer::produce(edm::Event& theEvent, const edm::EventSetup& the
   bool validPhotonHandle= false;
   Handle<reco::PhotonCollection> photonHandle;
   //value maps for isolation
-  edm::Handle<edm::ValueMap<float> > phoChargedIsolationMapCITK;
-  edm::Handle<edm::ValueMap<float> > phoNeutralHadronIsolationMapCITK;
-  edm::Handle<edm::ValueMap<float> > phoPhotonIsolationMapCITK;
+  edm::Handle<edm::ValueMap<float> > phoChargedIsolationMap;
+  edm::Handle<edm::ValueMap<float> > phoNeutralHadronIsolationMap;
+  edm::Handle<edm::ValueMap<float> > phoPhotonIsolationMap;
+  edm::Handle<edm::ValueMap<float> > phoChargedWorstVtxIsoMap;
+  edm::Handle<edm::ValueMap<float> > phoChargedWorstVtxGeomVetoIsoMap;
+  edm::Handle<edm::ValueMap<float> > phoChargedPFPVIsoMap;
+
   edm::Handle<edm::ValueMap<float> > phoPFECALClusIsolationMap;
   edm::Handle<edm::ValueMap<float> > phoPFHCALClusIsolationMap;
 
   if ( recoStep_.isFinal() ) { 
     theEvent.getByToken(photonProducerT_,photonHandle);
     //get isolation objects
-    theEvent.getByToken(phoChargedIsolationTokenCITK_,phoChargedIsolationMapCITK);
-    theEvent.getByToken(phoNeutralHadronIsolationTokenCITK_,phoNeutralHadronIsolationMapCITK);
-    theEvent.getByToken(phoPhotonIsolationTokenCITK_,phoPhotonIsolationMapCITK);
+    theEvent.getByToken(phoChargedIsolationToken_,phoChargedIsolationMap);
+    theEvent.getByToken(phoNeutralHadronIsolationToken_,phoNeutralHadronIsolationMap);
+    theEvent.getByToken(phoPhotonIsolationToken_,phoPhotonIsolationMap);
+    theEvent.getByToken(phoChargedWorstVtxIsoToken_,phoChargedWorstVtxIsoMap);
+    theEvent.getByToken(phoChargedWorstVtxGeomVetoIsoToken_,phoChargedWorstVtxGeomVetoIsoMap);
+    theEvent.getByToken(phoChargedPFPVIsoToken_,phoChargedPFPVIsoMap);
+
     //OOT photons in legacy 80X re-miniAOD workflow dont have cluster isolation embed in them
     if(!phoPFECALClusIsolationToken_.isUninitialized()) {
       theEvent.getByToken(phoPFECALClusIsolationToken_,phoPFECALClusIsolationMap);
@@ -434,9 +447,12 @@ void GEDPhotonProducer::produce(edm::Event& theEvent, const edm::EventSetup& the
 			 vertexHandle,
 			 outputPhotonCollection,
 			 iSC,
-			 phoChargedIsolationMapCITK,
-			 phoNeutralHadronIsolationMapCITK,
-			 phoPhotonIsolationMapCITK,
+			 phoChargedIsolationMap,
+			 phoNeutralHadronIsolationMap,
+			 phoPhotonIsolationMap,
+			 phoChargedWorstVtxIsoMap,
+			 phoChargedWorstVtxGeomVetoIsoMap,
+			 phoChargedPFPVIsoMap,
 			 phoPFECALClusIsolationMap,
 			 phoPFHCALClusIsolationMap);
 
@@ -656,6 +672,18 @@ void GEDPhotonProducer::fillPhotonCollection(edm::Event& evt,
     showerShape.e2x5Right     = ( hits != nullptr ? EcalClusterTools::e2x5Right(*(scRef->seed()), &(*hits), &(*topology)) : 0.f );
     showerShape.e2x5Top       = ( hits != nullptr ? EcalClusterTools::e2x5Top(*(scRef->seed()), &(*hits), &(*topology)) : 0.f );
     showerShape.e2x5Bottom    = ( hits != nullptr ? EcalClusterTools::e2x5Bottom(*(scRef->seed()), &(*hits), &(*topology)) : 0.f );
+    if(hits){
+      Cluster2ndMoments clus2ndMoments = EcalClusterTools::cluster2ndMoments(*(scRef->seed()),*hits);
+      showerShape.smMajor = clus2ndMoments.sMaj;
+      showerShape.smMinor = clus2ndMoments.sMin;
+      showerShape.smAlpha = clus2ndMoments.alpha;
+    }else{
+      showerShape.smMajor = 0.f;
+      showerShape.smMinor = 0.f;
+      showerShape.smAlpha = 0.f;
+    }
+
+
     // fill preshower shapes
     EcalClusterLazyTools toolsforES(evt, es, barrelEcalHits_, endcapEcalHits_, preshowerHits_);
     const float sigmaRR =  toolsforES.eseffsirir( *scRef );
@@ -709,6 +737,16 @@ void GEDPhotonProducer::fillPhotonCollection(edm::Event& evt,
     full5x5_showerShape.e2x5Right     = ( hits != nullptr ? noZS::EcalClusterTools::e2x5Right(*(scRef->seed()), &(*hits), &(*topology)) : 0.f );
     full5x5_showerShape.e2x5Top       = ( hits != nullptr ? noZS::EcalClusterTools::e2x5Top(*(scRef->seed()), &(*hits), &(*topology)) : 0.f );
     full5x5_showerShape.e2x5Bottom    = ( hits != nullptr ? noZS::EcalClusterTools::e2x5Bottom(*(scRef->seed()), &(*hits), &(*topology)) : 0.f );
+    if(hits){
+      Cluster2ndMoments clus2ndMoments = noZS::EcalClusterTools::cluster2ndMoments(*(scRef->seed()),*hits);
+      full5x5_showerShape.smMajor = clus2ndMoments.sMaj;
+      full5x5_showerShape.smMinor = clus2ndMoments.sMin;
+      full5x5_showerShape.smAlpha = clus2ndMoments.alpha;
+    }else{
+      full5x5_showerShape.smMajor = 0.f;
+      full5x5_showerShape.smMinor = 0.f;
+      full5x5_showerShape.smAlpha = 0.f;
+    }
      // fill preshower shapes
     full5x5_showerShape.effSigmaRR = sigmaRR;
     newCandidate.full5x5_setShowerShapeVariables ( full5x5_showerShape );     
@@ -802,6 +840,9 @@ void GEDPhotonProducer::fillPhotonCollection(edm::Event& evt,
 					     const edm::Handle<edm::ValueMap<float>>& chargedHadrons, 
 					     const edm::Handle<edm::ValueMap<float>>& neutralHadrons, 
 					     const edm::Handle<edm::ValueMap<float>>& photons,
+					     const edm::Handle<edm::ValueMap<float>>& chargedHadronsWorstVtx,
+					     const edm::Handle<edm::ValueMap<float>>& chargedHadronsWorstVtxGeomVeto,
+					     const edm::Handle<edm::ValueMap<float>>& chargedHadronsPFPV,
 					     const edm::Handle<edm::ValueMap<float>>& pfEcalClusters,
 					     const edm::Handle<edm::ValueMap<float>>& pfHcalClusters){
 
@@ -846,6 +887,9 @@ void GEDPhotonProducer::fillPhotonCollection(edm::Event& evt,
       pfIso.chargedHadronIso = (*chargedHadrons)[photonPtr] ;
       pfIso.neutralHadronIso = (*neutralHadrons)[photonPtr];
       pfIso.photonIso        = (*photons)[photonPtr];
+      pfIso.chargedHadronWorstVtxIso = (*chargedHadronsWorstVtx)[photonPtr];
+      pfIso.chargedHadronWorstVtxGeomVetoIso = (*chargedHadronsWorstVtxGeomVeto)[photonPtr];
+      pfIso.chargedHadronPFPVIso = (*chargedHadronsPFPV)[photonPtr];
     }
     
     //OOT photons in legacy 80X reminiAOD workflow dont have pf cluster isolation embeded into them at this stage
diff --git a/RecoEgamma/EgammaTools/interface/ConversionTools.h b/RecoEgamma/EgammaTools/interface/ConversionTools.h
index ad9cd5b948172..242535bf39f77 100644
--- a/RecoEgamma/EgammaTools/interface/ConversionTools.h
+++ b/RecoEgamma/EgammaTools/interface/ConversionTools.h
@@ -41,6 +41,7 @@ class ConversionTools
     static bool                        isGoodConversion(const reco::Conversion &conv, const math::XYZPoint &beamspot, float lxyMin=2.0, float probMin=1e-6, unsigned int nHitsBeforeVtxMax=1);
     
     static bool                        matchesConversion(const reco::GsfElectron &ele, const reco::Conversion &conv, bool allowCkfMatch=true, bool allowAmbiguousGsfMatch=false);
+    static bool                        matchesConversion(const reco::GsfElectronCore &eleCore, const reco::Conversion &conv, bool allowCkfMatch=true);
     static bool                        matchesConversion(const reco::SuperCluster &sc, const reco::Conversion &conv, float dRMax = 0.1, float dEtaMax = 999., float dPhiMax = 999.);
     static bool                        matchesConversion(const edm::RefToBase<reco::Track> &trk, const reco::Conversion &conv);
     static bool                        matchesConversion(const reco::TrackRef &trk, const reco::Conversion &conv);
@@ -60,6 +61,9 @@ class ConversionTools
     static reco::Conversion const*         matchedConversion(const reco::GsfElectron &ele,
                                                   const reco::ConversionCollection &convCol, const math::XYZPoint &beamspot, bool allowCkfMatch=true, float lxyMin=2.0, float probMin=1e-6, unsigned int nHitsBeforeVtxMax=0);
 
+    static reco::Conversion const*         matchedConversion(const reco::GsfElectronCore &eleCore,
+                                                  const reco::ConversionCollection &convCol, const math::XYZPoint &beamspot, bool allowCkfMatch=true, float lxyMin=2.0, float probMin=1e-6, unsigned int nHitsBeforeVtxMax=0);
+
     static reco::Conversion const*         matchedConversion(const reco::TrackRef &trk,
                                                   const reco::ConversionCollection &convCol, const math::XYZPoint &beamspot, float lxyMin=2.0, float probMin=1e-6, unsigned int nHitsBeforeVtxMax=1);
 
@@ -72,6 +76,8 @@ class ConversionTools
 
     static reco::GsfElectron const*        matchedPromptElectron(const reco::SuperClusterRef &sc, const reco::GsfElectronCollection &eleCol,
                                                   const reco::ConversionCollection &convCol, const math::XYZPoint &beamspot, bool allowCkfMatch=true, float lxyMin=2.0, float probMin=1e-6, unsigned int nHitsBeforeVtxMax=0);
+  
+  static float                             getVtxFitProb(const reco::Conversion* conv);
 
 };
 #endif
diff --git a/RecoEgamma/EgammaTools/plugins/EG9X105XObjectUpdateModifier.cc b/RecoEgamma/EgammaTools/plugins/EG9X105XObjectUpdateModifier.cc
new file mode 100644
index 0000000000000..c37a3f752fcd1
--- /dev/null
+++ b/RecoEgamma/EgammaTools/plugins/EG9X105XObjectUpdateModifier.cc
@@ -0,0 +1,184 @@
+#include "CommonTools/CandAlgos/interface/ModifyObjectValueBase.h"
+#include "FWCore/Utilities/interface/InputTag.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
+#include "FWCore/Framework/interface/ESHandle.h" 
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/Common/interface/ValueMap.h"
+#include "DataFormats/BeamSpot/interface/BeamSpot.h"
+#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
+#include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
+#include "DataFormats/EgammaCandidates/interface/Photon.h"
+#include "DataFormats/EgammaCandidates/interface/Conversion.h"
+#include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h"
+#include "RecoEgamma/EgammaTools/interface/ConversionTools.h"
+
+
+#include <vdt/vdtMath.h>
+
+//this modifier fills variables where not present in CMSSW_92X to CMSSW_105X
+//use case is when reading older new samples in newer releases, aka legacy
+//note we suffer from the problem of needing to use the electrons/photons the valuemaps 
+//are keyed to (something that is thankfully going away in 11X!) so we have to take 
+//those collections in and figure out which ele/pho matches to them
+class EG9X105XObjectUpdateModifier : public ModifyObjectValueBase {
+public:
+  template<typename T>
+  class TokenHandlePair{
+  public:
+    TokenHandlePair(const edm::ParameterSet& conf, const std::string& name,edm::ConsumesCollector& cc):
+      token_(cc.consumes<T>(conf.getParameter<edm::InputTag>(name))){}
+    void setHandle(const edm::Event& iEvent){
+      iEvent.getByToken(token_,handle_);
+    }
+    const edm::Handle<T>& handle()const{return handle_;}
+  private:
+    edm::EDGetTokenT<T> token_;
+    edm::Handle<T> handle_;
+  };
+
+  EG9X105XObjectUpdateModifier(const edm::ParameterSet& conf, edm::ConsumesCollector& cc);
+  ~EG9X105XObjectUpdateModifier() override{}
+  
+  void setEvent(const edm::Event&) final;
+  void setEventContent(const edm::EventSetup&) final;
+  
+  void modifyObject(reco::GsfElectron& ele) const final;
+  void modifyObject(reco::Photon& pho) const final;
+  
+  void modifyObject(pat::Electron& ele) const final{return modifyObject(static_cast<reco::GsfElectron&>(ele));}
+  void modifyObject(pat::Photon& pho) const final{return modifyObject(static_cast<reco::Photon&>(pho));}
+  
+private:
+  template<typename ObjType>
+  static edm::Ptr<ObjType> getPtrForValueMap(const ObjType& obj,
+					     const edm::Handle<edm::View<ObjType> >& objsVMIsKeyedTo);
+  
+  TokenHandlePair<edm::View<reco::GsfElectron> > eleCollVMsAreKeyedTo_;
+  TokenHandlePair<edm::View<reco::Photon> > phoCollVMsAreKeyedTo_;
+
+  TokenHandlePair<reco::ConversionCollection> conversions_;
+  TokenHandlePair<reco::BeamSpot> beamspot_;
+  TokenHandlePair<EcalRecHitCollection> ecalRecHitsEB_;
+  TokenHandlePair<EcalRecHitCollection> ecalRecHitsEE_;
+  
+  TokenHandlePair<edm::ValueMap<float> > eleTrkIso_;
+  TokenHandlePair<edm::ValueMap<float> > eleTrkIso04_;
+  TokenHandlePair<edm::ValueMap<float> > phoPhotonIso_;
+  TokenHandlePair<edm::ValueMap<float> > phoNeutralHadIso_;
+  TokenHandlePair<edm::ValueMap<float> > phoChargedHadIso_;
+  TokenHandlePair<edm::ValueMap<float> > phoChargedHadWorstVtxIso_;
+  TokenHandlePair<edm::ValueMap<float> > phoChargedHadWorstVtxConeVetoIso_;
+  
+  
+};
+
+EG9X105XObjectUpdateModifier::EG9X105XObjectUpdateModifier(const edm::ParameterSet& conf, edm::ConsumesCollector& cc):
+  ModifyObjectValueBase(conf),
+  eleCollVMsAreKeyedTo_(conf,"eleCollVMsAreKeyedTo",cc),
+  phoCollVMsAreKeyedTo_(conf,"phoCollVMsAreKeyedTo",cc),
+  conversions_(conf,"conversions",cc),
+  beamspot_(conf,"beamspot",cc),
+  ecalRecHitsEB_(conf,"ecalRecHitsEB",cc),
+  ecalRecHitsEE_(conf,"ecalRecHitsEE",cc),
+  eleTrkIso_(conf,"eleTrkIso",cc),
+  eleTrkIso04_(conf,"eleTrkIso04",cc),
+  phoPhotonIso_(conf,"phoPhotonIso",cc),
+  phoNeutralHadIso_(conf,"phoNeutralHadIso",cc),
+  phoChargedHadIso_(conf,"phoChargedHadIso",cc),
+  phoChargedHadWorstVtxIso_(conf,"phoChargedHadWorstVtxIso",cc),
+  phoChargedHadWorstVtxConeVetoIso_(conf,"phoChargedHadWorstVtxConeVetoIso",cc)
+{
+  
+
+}
+
+void EG9X105XObjectUpdateModifier::setEvent(const edm::Event& iEvent)
+{
+  eleCollVMsAreKeyedTo_.setHandle(iEvent);
+  phoCollVMsAreKeyedTo_.setHandle(iEvent);
+  conversions_.setHandle(iEvent);
+  beamspot_.setHandle(iEvent);
+  ecalRecHitsEB_.setHandle(iEvent);
+  ecalRecHitsEE_.setHandle(iEvent);
+  eleTrkIso_.setHandle(iEvent);
+  eleTrkIso04_.setHandle(iEvent);
+  phoPhotonIso_.setHandle(iEvent);
+  phoNeutralHadIso_.setHandle(iEvent);
+  phoChargedHadIso_.setHandle(iEvent);
+  phoChargedHadWorstVtxIso_.setHandle(iEvent);
+  phoChargedHadWorstVtxConeVetoIso_.setHandle(iEvent);
+}
+
+void EG9X105XObjectUpdateModifier::setEventContent(const edm::EventSetup& iSetup)
+{
+
+}
+
+void EG9X105XObjectUpdateModifier::modifyObject(reco::GsfElectron& ele)const
+{
+  edm::Ptr<reco::GsfElectron> ptrForVM = getPtrForValueMap(ele,eleCollVMsAreKeyedTo_.handle());
+  if(ptrForVM.isNull()){
+    throw cms::Exception("LogicError") <<" in EG9X105ObjectUpdateModifier, line "<<__LINE__<<" electron "<<ele.et()<<" "<<ele.eta()<<" "<<ele.superCluster()->seed()->seed().rawId()<<" failed to match to the electrons the key map was keyed to, check the map collection is correct";
+  }
+  reco::GsfElectron::ConversionRejection convRejVars = ele.conversionRejectionVariables();
+  //its rather important to use the core function here to get the org trk ref
+  convRejVars.vtxFitProb = ConversionTools::getVtxFitProb(ConversionTools::matchedConversion(ele.core()->ctfTrack(),*conversions_.handle(),beamspot_.handle()->position(),2.0,1e-6,0));
+  ele.setConversionRejectionVariables(convRejVars);
+  
+  reco::GsfElectron::IsolationVariables isolVars03 = ele.dr03IsolationVariables();
+  isolVars03.tkSumPtHEEP = (*eleTrkIso_.handle())[ptrForVM];
+  ele.setDr03Isolation(isolVars03);
+  reco::GsfElectron::IsolationVariables isolVars04 = ele.dr04IsolationVariables();
+  isolVars04.tkSumPtHEEP = (*eleTrkIso04_.handle())[ptrForVM];
+  ele.setDr04Isolation(isolVars04);
+}
+
+void EG9X105XObjectUpdateModifier::modifyObject(reco::Photon& pho)const
+{
+  edm::Ptr<reco::Photon> ptrForVM = getPtrForValueMap(pho,phoCollVMsAreKeyedTo_.handle());
+  if(ptrForVM.isNull()){
+    throw cms::Exception("LogicError") <<" in EG9X105ObjectUpdateModifier, line "<<__LINE__<<" photon "<<pho.et()<<" "<<pho.eta()<<" "<<pho.superCluster()->seed()->seed().rawId()<<" failed to match to the photons the key map was keyed to, check the map collection is correct";
+  }
+  
+  reco::Photon::PflowIsolationVariables pfIso = pho.getPflowIsolationVariables();
+  pfIso.photonIso = (*phoPhotonIso_.handle())[ptrForVM];
+  pfIso.neutralHadronIso = (*phoNeutralHadIso_.handle())[ptrForVM];
+  pfIso.chargedHadronIso = (*phoChargedHadIso_.handle())[ptrForVM];
+  pfIso.chargedHadronWorstVtxIso = (*phoChargedHadWorstVtxIso_.handle())[ptrForVM];
+  pfIso.chargedHadronWorstVtxGeomVetoIso = (*phoChargedHadWorstVtxConeVetoIso_.handle())[ptrForVM];
+  pho.setPflowIsolationVariables(pfIso);
+
+  reco::Photon::ShowerShape fracSS = pho.showerShapeVariables();
+  reco::Photon::ShowerShape fullSS = pho.full5x5_showerShapeVariables();
+
+  const reco::CaloClusterPtr seedClus = pho.superCluster()->seed();
+  const bool isEB = seedClus->seed().subdetId()==EcalBarrel;
+  const auto& recHits = isEB ? *ecalRecHitsEB_.handle() : *ecalRecHitsEE_.handle();
+  Cluster2ndMoments clus2ndMomFrac = EcalClusterTools::cluster2ndMoments(*seedClus,recHits);
+  Cluster2ndMoments clus2ndMomFull = noZS::EcalClusterTools::cluster2ndMoments(*seedClus,recHits);
+  fracSS.smMajor = clus2ndMomFrac.sMaj;
+  fracSS.smMinor = clus2ndMomFrac.sMin;
+  fracSS.smAlpha = clus2ndMomFrac.alpha;
+  fullSS.smMajor = clus2ndMomFull.sMaj;
+  fullSS.smMinor = clus2ndMomFull.sMin;
+  fullSS.smAlpha = clus2ndMomFull.alpha;
+  pho.setShowerShapeVariables(fracSS);
+  pho.full5x5_setShowerShapeVariables(fullSS);
+
+}
+
+template<typename ObjType> edm::Ptr<ObjType> EG9X105XObjectUpdateModifier::
+getPtrForValueMap(const ObjType& obj,
+		  const edm::Handle<edm::View<ObjType> >& objsVMIsKeyedTo)
+{
+  for(auto& objVMPtr : objsVMIsKeyedTo->ptrs()){
+    if(obj.superCluster()->seed()->seed()==objVMPtr->superCluster()->seed()->seed()) return objVMPtr;
+  }
+  return edm::Ptr<ObjType>(objsVMIsKeyedTo.id()); //return null ptr if not found
+}
+
+  
+DEFINE_EDM_PLUGIN(ModifyObjectValueFactory,
+		  EG9X105XObjectUpdateModifier,
+		  "EG9X105XObjectUpdateModifier");
diff --git a/RecoEgamma/EgammaTools/plugins/EGPfIsolationModifier.cc b/RecoEgamma/EgammaTools/plugins/EGPfIsolationModifier.cc
deleted file mode 100644
index 858d224a13937..0000000000000
--- a/RecoEgamma/EgammaTools/plugins/EGPfIsolationModifier.cc
+++ /dev/null
@@ -1,213 +0,0 @@
-#include "CommonTools/CandAlgos/interface/ModifyObjectValueBase.h"
-
-#include "FWCore/Utilities/interface/InputTag.h"
-#include "FWCore/Utilities/interface/EDGetToken.h"
-#include "DataFormats/Common/interface/ValueMap.h"
-
-#include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
-#include "DataFormats/EgammaCandidates/interface/Photon.h"
-
-#include <tuple>
-#include <array>
-
-namespace {
-  const edm::EDGetTokenT<edm::ValueMap<float> > empty_token;
-  const edm::InputTag empty_tag("");
-
-  const std::array<std::string,7>  electron_vars = { { "sumChargedHadronPt",
-                                                              "sumNeutralHadronEt",
-                                                              "sumPhotonEt",
-                                                              "sumChargedParticlePt",
-                                                              "sumNeutralHadronEtHighThreshold",
-                                                              "sumPhotonEtHighThreshold",
-                                                              "sumPUPt" } };
-  
-  const std::array<std::string,9> photon_vars = { { "chargedHadronIso",
-                                                           "chargedHadronIsoWrongVtx",
-                                                           "neutralHadronIso",
-                                                           "photonIso",
-                                                           "modFrixione",
-                                                           "sumChargedParticlePt",
-                                                           "sumNeutralHadronEtHighThreshold",
-                                                           "sumPhotonEtHighThreshold",
-                                                           "sumPUPt" } };
-}
-
-#include <unordered_map>
-
-class EGPfIsolationModifierFromValueMaps : public ModifyObjectValueBase {
-public:
-  typedef std::unordered_map<std::string, edm::EDGetTokenT<edm::ValueMap<float> > > input_map;
-  
-  struct electron_config {
-    edm::EDGetTokenT<edm::View<pat::Electron> > tok_electron_src;
-    input_map electron_inputs;
-  };
-  
-  struct photon_config {
-    edm::EDGetTokenT<edm::View<pat::Photon> > tok_photon_src;
-    input_map photon_inputs;
-  };
-
-  EGPfIsolationModifierFromValueMaps(const edm::ParameterSet& conf, edm::ConsumesCollector& cc);
-  
-  void setEvent(const edm::Event&) final;
-  
-  void modifyObject(pat::Electron&) const final;
-  void modifyObject(pat::Photon&) const final;
-
-private:
-  electron_config e_conf;
-  photon_config   ph_conf;
-  std::vector<edm::Ptr<reco::GsfElectron>> eles_by_oop; // indexed by original object ptr
-  std::unordered_map<unsigned,edm::Handle<edm::ValueMap<float> > > ele_vmaps;
-  std::vector<edm::Ptr<reco::Photon>> phos_by_oop;
-  std::unordered_map<unsigned,edm::Handle<edm::ValueMap<float> > > pho_vmaps;
-  mutable unsigned ele_idx,pho_idx; // hack here until we figure out why some slimmedPhotons don't have original object ptrs
-};
-
-DEFINE_EDM_PLUGIN(ModifyObjectValueFactory,
-		  EGPfIsolationModifierFromValueMaps,
-		  "EGPfIsolationModifierFromValueMaps");
-
-EGPfIsolationModifierFromValueMaps::
-EGPfIsolationModifierFromValueMaps(const edm::ParameterSet& conf, edm::ConsumesCollector& cc) :
-  ModifyObjectValueBase(conf) {
-  if( conf.exists("electron_config") ) {
-    const edm::ParameterSet& electrons = conf.getParameter<edm::ParameterSet>("electron_config");
-    if( electrons.exists("electronSrc") ) e_conf.tok_electron_src = cc.consumes<edm::View<pat::Electron>>(electrons.getParameter<edm::InputTag>("electronSrc"));
-    for( const std::string& varname : electron_vars ) {
-      if( electrons.exists(varname) ) {
-        e_conf.electron_inputs[varname] = cc.consumes<edm::ValueMap<float>>(electrons.getParameter<edm::InputTag>(varname));
-      }
-    }      
-  }
-  if( conf.exists("photon_config") ) {
-    const edm::ParameterSet& photons = conf.getParameter<edm::ParameterSet>("photon_config");
-    if( photons.exists("photonSrc") ) ph_conf.tok_photon_src = cc.consumes<edm::View<pat::Photon>>(photons.getParameter<edm::InputTag>("photonSrc"));
-    for( const std::string& varname : photon_vars ) {
-      if( photons.exists(varname) ) {
-        ph_conf.photon_inputs[varname] = cc.consumes<edm::ValueMap<float>>(photons.getParameter<edm::InputTag>(varname));
-      }
-    }     
-  }
-  
-  ele_idx = pho_idx = 0;
-}
-
-namespace {
-  inline void get_product(const edm::Event& evt,
-                          const edm::EDGetTokenT<edm::ValueMap<float> >& tok,
-                          std::unordered_map<unsigned, edm::Handle<edm::ValueMap<float> > >& map) {
-    if( !tok.isUninitialized() ) evt.getByToken(tok,map[tok.index()]);
-  }
-}
-
-void EGPfIsolationModifierFromValueMaps::
-setEvent(const edm::Event& evt) {
-  eles_by_oop.clear();
-  phos_by_oop.clear();  
-  ele_vmaps.clear();
-  pho_vmaps.clear();
-
-  ele_idx = pho_idx = 0;
-
-  if( !e_conf.tok_electron_src.isUninitialized() ) {
-    edm::Handle<edm::View<pat::Electron> > eles;
-    evt.getByToken(e_conf.tok_electron_src,eles);
-    
-    eles_by_oop.resize(eles->size());
-    std::copy(eles->ptrs().begin(), eles->ptrs().end(), eles_by_oop.begin());
-  }
-
-  for( const std::string& varname : electron_vars ) {
-    auto& inputs = e_conf.electron_inputs;
-    if( inputs.find(varname) == inputs.end() ) continue;
-    get_product(evt,inputs[varname],ele_vmaps);
-  }  
-
-  if( !ph_conf.tok_photon_src.isUninitialized() ) {
-    edm::Handle<edm::View<pat::Photon> > phos;
-    evt.getByToken(ph_conf.tok_photon_src,phos);
-
-    phos_by_oop.resize(phos->size());
-    std::copy(phos->ptrs().begin(), phos->ptrs().end(), phos_by_oop.begin());
-  }
-  
-  for( const std::string& varname : photon_vars ) {
-    auto& inputs = ph_conf.photon_inputs;
-    if( inputs.find(varname) == inputs.end() ) continue;
-    get_product(evt,inputs[varname],pho_vmaps);
-  }   
-}
-
-namespace {
-  template<typename T, typename U, typename V>
-  inline void assignValue(const T& ptr, const U& input_map, const std::string& name, const V& map, float& value) {
-    auto itr = input_map.find(name);
-    if( itr == input_map.end() ) return;
-    const auto& tok = itr->second;
-    if( !tok.isUninitialized() ) value = map.find(tok.index())->second->get(ptr.id(),ptr.key());
-  }
-}
-
-void EGPfIsolationModifierFromValueMaps::
-modifyObject(pat::Electron& ele) const {
-  // we encounter two cases here, either we are running AOD -> MINIAOD
-  // and the value maps are to the reducedEG object, can use original object ptr
-  // or we are running MINIAOD->MINIAOD and we need to fetch the pat objects to reference    
-  edm::Ptr<reco::Candidate> ptr(ele.originalObjectRef());
-
-  // The calls to this function should be matched to the order of the electrons
-  // in eles_by_oop. In case it is called too many times, it will throw thanks
-  // to the use of std::vector<T>::at().
-  if( !e_conf.tok_electron_src.isUninitialized() ) ptr = eles_by_oop.at(ele_idx);
-
-  //now we go through and modify the objects using the valuemaps we read in
-  auto pfIso = ele.pfIsolationVariables();
-    
-  const auto& e_inputs = e_conf.electron_inputs;
-
-  assignValue(ptr,e_inputs,electron_vars[0],ele_vmaps,pfIso.sumChargedHadronPt);
-  assignValue(ptr,e_inputs,electron_vars[1],ele_vmaps,pfIso.sumNeutralHadronEt);
-  assignValue(ptr,e_inputs,electron_vars[2],ele_vmaps,pfIso.sumPhotonEt);
-  assignValue(ptr,e_inputs,electron_vars[3],ele_vmaps,pfIso.sumChargedParticlePt);
-  assignValue(ptr,e_inputs,electron_vars[4],ele_vmaps,pfIso.sumNeutralHadronEtHighThreshold);
-  assignValue(ptr,e_inputs,electron_vars[5],ele_vmaps,pfIso.sumPhotonEtHighThreshold);
-  assignValue(ptr,e_inputs,electron_vars[6],ele_vmaps,pfIso.sumPUPt);
-  
-  ele.setPfIsolationVariables(pfIso);
-  ++ele_idx;
-}
-
-
-void EGPfIsolationModifierFromValueMaps::
-modifyObject(pat::Photon& pho) const {
-  // we encounter two cases here, either we are running AOD -> MINIAOD
-  // and the value maps are to the reducedEG object, can use original object ptr
-  // or we are running MINIAOD->MINIAOD and we need to fetch the pat objects to reference
-  edm::Ptr<reco::Candidate> ptr(pho.originalObjectRef());
-
-  // The calls to this function should be matched to the order of the electrons
-  // in eles_by_oop. In case it is called too many times, it will throw thanks
-  // to the use of std::vector<T>::at().
-  if( !ph_conf.tok_photon_src.isUninitialized() ) ptr = phos_by_oop.at(pho_idx);
-
-  //now we go through and modify the objects using the valuemaps we read in
-  auto pfIso = pho.getPflowIsolationVariables();
-
-  const auto& ph_inputs = ph_conf.photon_inputs;
-
-  assignValue(ptr,ph_inputs,photon_vars[0],pho_vmaps,pfIso.chargedHadronIso);
-  assignValue(ptr,ph_inputs,photon_vars[1],pho_vmaps,pfIso.chargedHadronIsoWrongVtx);
-  assignValue(ptr,ph_inputs,photon_vars[2],pho_vmaps,pfIso.neutralHadronIso);
-  assignValue(ptr,ph_inputs,photon_vars[3],pho_vmaps,pfIso.photonIso);
-  assignValue(ptr,ph_inputs,photon_vars[4],pho_vmaps,pfIso.modFrixione);
-  assignValue(ptr,ph_inputs,photon_vars[5],pho_vmaps,pfIso.sumChargedParticlePt);
-  assignValue(ptr,ph_inputs,photon_vars[6],pho_vmaps,pfIso.sumNeutralHadronEtHighThreshold);
-  assignValue(ptr,ph_inputs,photon_vars[7],pho_vmaps,pfIso.sumPhotonEtHighThreshold);
-  assignValue(ptr,ph_inputs,photon_vars[8],pho_vmaps,pfIso.sumPUPt);
-  
-  pho.setPflowIsolationVariables(pfIso);
-  ++pho_idx;
-}
diff --git a/RecoEgamma/EgammaTools/src/ConversionTools.cc b/RecoEgamma/EgammaTools/src/ConversionTools.cc
index 16257e3b12ee4..e20f9ef2bf2ad 100644
--- a/RecoEgamma/EgammaTools/src/ConversionTools.cc
+++ b/RecoEgamma/EgammaTools/src/ConversionTools.cc
@@ -67,6 +67,26 @@ bool ConversionTools::matchesConversion(const reco::GsfElectron &ele, const reco
   return false;
 }
 
+//--------------------------------------------------------------------------------------------------
+bool ConversionTools::matchesConversion(const reco::GsfElectronCore &eleCore, const reco::Conversion &conv, bool allowCkfMatch)
+{
+
+  //check if a given GsfElectronCore matches a given conversion (no quality cuts applied)
+  //matching is always attempted through the gsf track ref, and optionally attempted through the
+  //closest ctf track ref
+
+  for (const auto& trkRef : conv.tracks() ){
+    if ( eleCore.gsfTrack().isNonnull() && eleCore.gsfTrack().id()==trkRef.id() &&
+	 eleCore.gsfTrack().key()==trkRef.key()) return true;
+    else if ( allowCkfMatch && eleCore.ctfTrack().isNonnull() &&
+	      eleCore.ctfTrack().id()==trkRef.id() &&
+	      eleCore.ctfTrack().key()==trkRef.key() ) return true;
+  }
+
+  return false;
+}
+
+
 //--------------------------------------------------------------------------------------------------
 bool ConversionTools::matchesConversion(const reco::SuperCluster &sc, const reco::Conversion &conv, float dRMax, float dEtaMax, float dPhiMax) {
 
@@ -234,6 +254,34 @@ reco::Conversion const* ConversionTools::matchedConversion(const reco::GsfElectr
   
 }
 
+//--------------------------------------------------------------------------------------------------
+reco::Conversion const* ConversionTools::matchedConversion(const reco::GsfElectronCore &eleCore,
+                                                  const reco::ConversionCollection &convCol,
+                                                  const math::XYZPoint &beamspot, bool allowCkfMatch, float lxyMin, float probMin, unsigned int nHitsBeforeVtxMax)
+{
+  //check if a given electron candidate matches to at least one conversion candidate in the
+  //collection which also passes the selection cuts, optionally match with the closestckf track in
+  //in addition to just the gsf track (enabled in default arguments)
+  //If multiple conversions are found, returned reference corresponds to minimum
+  //conversion radius
+  
+  reco::Conversion const* match = nullptr;
+  
+  double minRho = 999.;
+  for(auto const& it : convCol) {
+    float rho = it.conversionVertex().position().rho();
+    if (rho>minRho) continue;
+    if (!matchesConversion(eleCore, it, allowCkfMatch)) continue;
+    if (!isGoodConversion(it,beamspot,lxyMin,probMin,nHitsBeforeVtxMax)) continue;
+   
+    minRho = rho;
+    match = &it;
+  }
+  
+  return match;
+  
+}
+
 //--------------------------------------------------------------------------------------------------
 reco::Conversion const* ConversionTools::matchedConversion(const reco::TrackRef &trk,
                                                   const reco::ConversionCollection &convCol,
@@ -331,3 +379,15 @@ reco::GsfElectron const* ConversionTools::matchedPromptElectron(const reco::Supe
 
 
 }
+
+//--------------------------------------------------------------------------------------------------
+float ConversionTools::getVtxFitProb(const reco::Conversion* conv)
+{
+  if (conv!=nullptr) {
+    const reco::Vertex& vtx = conv->conversionVertex();
+    if( vtx.isValid() ) {
+      return TMath::Prob(vtx.chi2(),vtx.ndof()) ;
+    } 
+  }
+  return -1;
+}
diff --git a/RecoEgamma/ElectronIdentification/plugins/ElectronHEEPIDValueMapProducer.cc b/RecoEgamma/ElectronIdentification/plugins/ElectronHEEPIDValueMapProducer.cc
index 3ec6ec6dfed1a..0ef7131113b3c 100644
--- a/RecoEgamma/ElectronIdentification/plugins/ElectronHEEPIDValueMapProducer.cc
+++ b/RecoEgamma/ElectronIdentification/plugins/ElectronHEEPIDValueMapProducer.cc
@@ -68,11 +68,12 @@ class ElectronHEEPIDValueMapProducer : public edm::stream::EDProducer<> {
 				  edm::Handle<EcalRecHitCollection>& eeHits,
 				  edm::ESHandle<CaloTopology>& caloTopo);
 
-  float calTrkIso(const reco::GsfElectron& ele,		  
-		  const edm::View<reco::GsfElectron>& eles,
-		  const std::vector<edm::Handle<pat::PackedCandidateCollection> >& handles,
-		  const std::vector<EleTkIsolFromCands::PIDVeto>& pidVetos)const;
-    
+  static float calTrkIso(const reco::GsfElectron& ele,		  
+			 const edm::View<reco::GsfElectron>& eles,
+			 const std::vector<edm::Handle<pat::PackedCandidateCollection> >& handles,
+			 const std::vector<EleTkIsolFromCands::PIDVeto>& pidVetos,
+			 const EleTkIsolFromCands& trkIsoCalc);
+  
   template <typename T> void setToken(edm::EDGetTokenT<T>& token,edm::InputTag tag){token=consumes<T>(tag);}
   template <typename T> void setToken(edm::EDGetTokenT<T>& token,const edm::ParameterSet& iPara,const std::string& tag){token=consumes<T>(iPara.getParameter<edm::InputTag>(tag));}
   template <typename T> void setToken(std::vector<edm::EDGetTokenT<T> >& tokens,const edm::ParameterSet& iPara,const std::string& tagName){
@@ -154,21 +155,27 @@ class ElectronHEEPIDValueMapProducer : public edm::stream::EDProducer<> {
   edm::EDGetTokenT<reco::BeamSpot> beamSpotToken_;
 
   EleTkIsolFromCands trkIsoCalc_;
+  EleTkIsolFromCands trkIso04Calc_;
+  bool makeTrkIso04_;
   DataFormat dataFormat_;
   std::vector<EleTkIsolFromCands::PIDVeto> candVetosAOD_;
   std::vector<EleTkIsolFromCands::PIDVeto> candVetosMiniAOD_;
   
   static const std::string eleTrkPtIsoLabel_;
+  static const std::string eleTrkPtIso04Label_;
   static const std::string eleNrSaturateIn5x5Label_;
 };
 
 const std::string ElectronHEEPIDValueMapProducer::eleTrkPtIsoLabel_="eleTrkPtIso";
+const std::string ElectronHEEPIDValueMapProducer::eleTrkPtIso04Label_="eleTrkPtIso04";
 const std::string ElectronHEEPIDValueMapProducer::eleNrSaturateIn5x5Label_="eleNrSaturateIn5x5";
  
 
 
 ElectronHEEPIDValueMapProducer::ElectronHEEPIDValueMapProducer(const edm::ParameterSet& iConfig):
   trkIsoCalc_(iConfig.getParameter<edm::ParameterSet>("trkIsoConfig")),
+  trkIso04Calc_(iConfig.getParameter<edm::ParameterSet>("trkIso04Config")),
+  makeTrkIso04_(iConfig.getParameter<bool>("makeTrkIso04")),
   dataFormat_(iConfig.getParameter<int>("dataFormat"))
 {
   setToken(ebRecHitToken_,iConfig,"ebRecHitsAOD","ebRecHitsMiniAOD",dataFormat_);
@@ -192,6 +199,7 @@ ElectronHEEPIDValueMapProducer::ElectronHEEPIDValueMapProducer(const edm::Parame
   }
 
   produces<edm::ValueMap<float> >(eleTrkPtIsoLabel_);  
+  if(makeTrkIso04_) produces<edm::ValueMap<float> >(eleTrkPtIso04Label_);  
   produces<edm::ValueMap<int> >(eleNrSaturateIn5x5Label_);  
 }
 
@@ -215,13 +223,18 @@ void ElectronHEEPIDValueMapProducer::produce(edm::Event& iEvent, const edm::Even
   iSetup.get<CaloTopologyRecord>().get(caloTopoHandle);
   
   std::vector<float> eleTrkPtIso;
+  std::vector<float> eleTrkPtIso04;
   std::vector<int> eleNrSaturateIn5x5;
   for(auto const& ele : *eleHandle) {
-    eleTrkPtIso.push_back(calTrkIso(ele,*eleHandle,candHandles,candVetos));
+    eleTrkPtIso.push_back(calTrkIso(ele,*eleHandle,candHandles,candVetos,trkIsoCalc_));
+    if(makeTrkIso04_){
+      eleTrkPtIso04.push_back(calTrkIso(ele,*eleHandle,candHandles,candVetos,trkIso04Calc_));
+    }
     eleNrSaturateIn5x5.push_back(nrSaturatedCrysIn5x5(ele,ebRecHitHandle,eeRecHitHandle,caloTopoHandle));    
   }
   
   writeValueMap(iEvent,eleHandle,eleTrkPtIso,eleTrkPtIsoLabel_);  
+  if(makeTrkIso04_) writeValueMap(iEvent,eleHandle,eleTrkPtIso04,eleTrkPtIso04Label_);  
   writeValueMap(iEvent,eleHandle,eleNrSaturateIn5x5,eleNrSaturateIn5x5Label_);  
 }
 
@@ -240,7 +253,8 @@ float ElectronHEEPIDValueMapProducer::
 calTrkIso(const reco::GsfElectron& ele,		  
 	  const edm::View<reco::GsfElectron>& eles,
 	  const std::vector<edm::Handle<pat::PackedCandidateCollection> >& handles,
-	  const std::vector<EleTkIsolFromCands::PIDVeto>& pidVetos)const
+	  const std::vector<EleTkIsolFromCands::PIDVeto>& pidVetos,
+	  const EleTkIsolFromCands& trkIsoCalc)
 {
   if(ele.gsfTrack().isNull()) return std::numeric_limits<float>::max();
   else{
@@ -249,7 +263,7 @@ calTrkIso(const reco::GsfElectron& ele,
       auto& handle = handles[handleNr];
       if(handle.isValid()){
 	if(handleNr<pidVetos.size()){
-	  trkIso+= trkIsoCalc_.calIsolPt(*ele.gsfTrack(),*handle,pidVetos[handleNr]);
+	  trkIso+= trkIsoCalc.calIsolPt(*ele.gsfTrack(),*handle,pidVetos[handleNr]);
 	}else{
 	  throw cms::Exception("LogicError") <<" somehow the pidVetos and handles do not much, given this is checked at construction time, something has gone wrong in the code handle nr "<<handleNr<<" size of vetos "<<pidVetos.size();
 	}
@@ -288,8 +302,9 @@ void ElectronHEEPIDValueMapProducer::fillDescriptions(edm::ConfigurationDescript
   desc.add<std::vector<std::string> >("candVetosMiniAOD",{"none"});
   desc.add<edm::InputTag>("elesMiniAOD",edm::InputTag("gedGsfElectrons"));
   desc.add<int>("dataFormat",0);
-  
+  desc.add<bool>("makeTrkIso04",false);
   desc.add("trkIsoConfig",EleTkIsolFromCands::pSetDescript());
+  desc.add("trkIso04Config",EleTkIsolFromCands::pSetDescript());
 
   descriptions.addDefault(desc);
 }
diff --git a/RecoEgamma/ElectronIdentification/python/heepIdVarValueMapProducer_cfi.py b/RecoEgamma/ElectronIdentification/python/heepIdVarValueMapProducer_cfi.py
index ca570ab199c99..755470ded10d9 100644
--- a/RecoEgamma/ElectronIdentification/python/heepIdVarValueMapProducer_cfi.py
+++ b/RecoEgamma/ElectronIdentification/python/heepIdVarValueMapProducer_cfi.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from RecoEgamma.EgammaIsolationAlgos.electronTrackIsolations_cfi import trkIsol03CfgV2
+from RecoEgamma.EgammaIsolationAlgos.electronTrackIsolations_cfi import trkIsol03CfgV2,trkIsol04CfgV2
 
 heepIDVarValueMaps = cms.EDProducer("ElectronHEEPIDValueMapProducer",
                                     beamSpot=cms.InputTag("offlineBeamSpot"),
@@ -22,5 +22,7 @@
                                     candVetosMiniAOD=cms.vstring("ELES","NONE","NONELES"),
                                     elesMiniAOD=cms.InputTag("slimmedElectrons"),
                                     dataFormat=cms.int32(0),#0 = auto detection, 1 = AOD, 2 = miniAOD
-                                    trkIsoConfig= trkIsol03CfgV2
+                                    trkIsoConfig= trkIsol03CfgV2,
+                                    trkIso04Config= trkIsol04CfgV2,
+                                    makeTrkIso04 = cms.bool(True)
                                     )
diff --git a/RecoHI/Configuration/python/Reconstruction_hiPF_cff.py b/RecoHI/Configuration/python/Reconstruction_hiPF_cff.py
index 9c53f700a40ab..f0575ca2b82c6 100644
--- a/RecoHI/Configuration/python/Reconstruction_hiPF_cff.py
+++ b/RecoHI/Configuration/python/Reconstruction_hiPF_cff.py
@@ -12,10 +12,13 @@
 gedGsfElectronsTmp.vtxTag = cms.InputTag("hiSelectedVertex")
 gedGsfElectronsTmp.preselection.minSCEtBarrel = cms.double(15.0)
 gedGsfElectronsTmp.preselection.minSCEtEndcaps = cms.double(15.0)
+gedGsfElectronsTmp.fillConvVtxFitProb = cms.bool(False)
+
 gedPhotonsTmp.primaryVertexProducer = cms.InputTag("hiSelectedVertex")
 gedPhotonsTmp.isolationSumsCalculatorSet.trackProducer = cms.InputTag("hiGeneralTracks")
 gedPhotons.primaryVertexProducer = cms.InputTag("hiSelectedVertex")
 gedPhotons.isolationSumsCalculatorSet.trackProducer = cms.InputTag("hiGeneralTracks")
+photonIDValueMaps.vertices = cms.InputTag("hiSelectedVertex")
 from RecoHI.HiEgammaAlgos.photonIsolationHIProducer_cfi import photonIsolationHIProducer
 photonIsolationHIProducerGED = photonIsolationHIProducer.clone(photonProducer=cms.InputTag("gedPhotonsTmp"))
 
diff --git a/RecoHI/HiEgammaAlgos/python/HiElectronSequence_cff.py b/RecoHI/HiEgammaAlgos/python/HiElectronSequence_cff.py
index f3d91ddb6b702..aed5ec3421c94 100644
--- a/RecoHI/HiEgammaAlgos/python/HiElectronSequence_cff.py
+++ b/RecoHI/HiEgammaAlgos/python/HiElectronSequence_cff.py
@@ -20,6 +20,8 @@
 gsfElectronCores.ctfTracks = cms.InputTag("hiGeneralTracks")
 pfElectronTranslator.emptyIsOk = cms.bool(True)
 
+gsfElectrons.fillConvVtxFitProb = cms.bool(False)
+
 ecalDrivenGsfElectrons.ctfTracksTag = cms.InputTag("hiGeneralTracks")
 ecalDrivenGsfElectronCores.ctfTracks = cms.InputTag("hiGeneralTracks")
 ecalDrivenGsfElectrons.vtxTag = cms.InputTag("hiSelectedVertex")
@@ -28,7 +30,7 @@
 ecalDrivenGsfElectrons.preselection.maxHOverEEndcapsCone = cms.double(0.25)
 ecalDrivenGsfElectrons.preselection.maxHOverEBarrelTower = cms.double(0.)
 ecalDrivenGsfElectrons.preselection.maxHOverEEndcapsTower = cms.double(0.)
-
+ecalDrivenGsfElectrons.fillConvVtxFitProb = cms.bool(False)
 
 
 from RecoParticleFlow.PFTracking.pfTrack_cfi import *
diff --git a/RecoJets/Configuration/python/GenJetParticles_cff.py b/RecoJets/Configuration/python/GenJetParticles_cff.py
index 752f96cf3d7d9..f529b8efb09d9 100644
--- a/RecoJets/Configuration/python/GenJetParticles_cff.py
+++ b/RecoJets/Configuration/python/GenJetParticles_cff.py
@@ -27,4 +27,5 @@
 genParticlesForJetsNoMuNoNu = genParticlesForJets.clone()
 genParticlesForJetsNoMuNoNu.ignoreParticleIDs += cms.vuint32( 12,13,14,16)
 
-genJetParticles = cms.Sequence(genParticlesForJets+genParticlesForJetsNoNu)
+genJetParticlesTask = cms.Task(genParticlesForJets, genParticlesForJetsNoNu)
+genJetParticles = cms.Sequence(genJetParticlesTask)
diff --git a/RecoJets/Configuration/python/RecoGenJets_cff.py b/RecoJets/Configuration/python/RecoGenJets_cff.py
index 56dcfaf35b3df..4959ed184ecad 100644
--- a/RecoJets/Configuration/python/RecoGenJets_cff.py
+++ b/RecoJets/Configuration/python/RecoGenJets_cff.py
@@ -12,11 +12,12 @@
 ak4GenJetsNoMuNoNu = ak4GenJets.clone( src = cms.InputTag("genParticlesForJetsNoMuNoNu") )
 ak8GenJetsNoMuNoNu = ak8GenJets.clone( src = cms.InputTag("genParticlesForJetsNoMuNoNu") )
 
-recoGenJets  = cms.Sequence(ak4GenJets+
-                            ak8GenJets+
-                            ak4GenJetsNoNu+
-                            ak8GenJetsNoNu
-			    )
+recoGenJetsTask = cms.Task(ak4GenJets,
+                           ak8GenJets,
+                           ak4GenJetsNoNu,
+                           ak8GenJetsNoNu
+                           )
+recoGenJets  = cms.Sequence(recoGenJetsTask)
 
 recoAllGenJets=cms.Sequence(ak4GenJets+
                             ak8GenJets)
diff --git a/RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelService.h b/RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelService.h
deleted file mode 100644
index 4916b04d9144c..0000000000000
--- a/RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelService.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
-   \file
-   Implementation of class EcalSeverityLevelService
-
-   \author Stefano Argiro
-   \date 11 Jan 2011
-*/
-
-#include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgo.h"
-#include "FWCore/ServiceRegistry/interface/ActivityRegistry.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "CondFormats/EcalObjects/interface/EcalChannelStatus.h"
-
-
-/// A service to retrieve to provide a hook to EcalSeverityLevelAlgo
-class EcalSeverityLevelService {
-  
-public:
-  EcalSeverityLevelService(const edm::ParameterSet& p, 
-			   edm::ActivityRegistry& r){
-    algo_ = new EcalSeverityLevelAlgo(p);
-  }
-
-  ~EcalSeverityLevelService(){delete algo_;}
-  
-
-  EcalSeverityLevelAlgo::EcalSeverityLevel 
-  severityLevel(const EcalRecHit& rh) const {
-    return algo_->severityLevel(rh);
-  }
-
-  EcalSeverityLevelAlgo::EcalSeverityLevel 
-  severityLevel(const DetId& id, 
-		const EcalRecHitCollection& rhs, 
-		const edm::EventSetup& es) const {
-    return algo_->severityLevel(id,rhs,es);
-  }
-  
-  
-  EcalSeverityLevelAlgo::EcalSeverityLevel 
-  severityLevel(const DetId& id, 
-		const EcalRecHitCollection& rhs, 
-		const EcalChannelStatus& chs) const {
-    return algo_->severityLevel(id,rhs,chs);
-  }
-  
-  const EcalSeverityLevelAlgo* getAlgorithm() const {return algo_;}
-
-private:
-  EcalSeverityLevelAlgo * algo_;
-
-};
-
-
-// Configure (x)emacs for this file ...
-// Local Variables:
-// mode:c++
-// compile-command: "cd ..; scram b"
-// End:
diff --git a/RecoLocalCalo/HGCalRecAlgos/interface/RecHitTools.h b/RecoLocalCalo/HGCalRecAlgos/interface/RecHitTools.h
index 9464434cd0346..0121f8eb9b01d 100644
--- a/RecoLocalCalo/HGCalRecAlgos/interface/RecHitTools.h
+++ b/RecoLocalCalo/HGCalRecAlgos/interface/RecHitTools.h
@@ -59,6 +59,7 @@ namespace hgcal {
     unsigned int lastLayerFH() const {return fhLastLayer_;}
     unsigned int maxNumberOfWafersPerLayer() const {return maxNumberOfWafersPerLayer_;}
     inline int getGeometryType() const {return geometryType_;}
+    bool maskCell(const DetId& id, int corners=3) const;
   private:
     const CaloGeometry* geom_;
     unsigned int        fhOffset_, bhOffset_, fhLastLayer_, maxNumberOfWafersPerLayer_;
diff --git a/RecoLocalCalo/HGCalRecAlgos/src/RecHitTools.cc b/RecoLocalCalo/HGCalRecAlgos/src/RecHitTools.cc
index cfab767a79519..eeb9219164833 100644
--- a/RecoLocalCalo/HGCalRecAlgos/src/RecHitTools.cc
+++ b/RecoLocalCalo/HGCalRecAlgos/src/RecHitTools.cc
@@ -371,3 +371,12 @@ float RecHitTools::getPt(const DetId& id, const float& hitEnergy, const float& v
   float pt = hitEnergy / cosh(eta);
   return pt;
 }
+
+bool RecHitTools::maskCell(const DetId& id, int corners) const {
+  if (id.det() == DetId::Hcal) {
+    return false;
+  } else {
+    auto hg = static_cast<const HGCalGeometry*>(getSubdetectorGeometry(id));
+    return hg->topology().dddConstants().maskCell(id, corners);
+  }
+}
diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_DIGI_Extended2015MuonGEMDev_RPCGEMME0Customs_cfg.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_DIGI_Extended2015MuonGEMDev_RPCGEMME0Customs_cfg.py
index 84c8de8ae807e..4e28dcd8c20af 100644
--- a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_DIGI_Extended2015MuonGEMDev_RPCGEMME0Customs_cfg.py
+++ b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_DIGI_Extended2015MuonGEMDev_RPCGEMME0Customs_cfg.py
@@ -5,9 +5,9 @@
 # with command line options: step2 -s DIGI --conditions auto:run2_mc --magField 38T_PostLS1 --datatier GEN-SIM-DIGI --geometry Extended2015MuonGEMDev,Extended2015MuonGEMDevReco --eventcontent FEVTDEBUGHLT --era Run2_25ns --customise=SimMuon/GEMDigitizer/customizeGEMDigi.customize_digi_addGEM_nocalo,SLHCUpgradeSimulations/Configuration/fixMissingUpgradeGTPayloads.fixRPCConditions,SLHCUpgradeSimulations/Configuration/me0Customs.customise -n 100 --no_exec --filein file:out_sim.root --fileout out_digi.root --python_filename SingleMuPt100_cfi_DIGI_Extended2015MuonGEMDev_RPCGEMME0Customs_cfg.py
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('DIGI',eras.Run2_25ns)
+from Configuration.Eras.Era_Run2_25ns_cff import Run2_25ns
+process = cms.Process('DIGI',Run2_25ns)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev.py
index a9a13b4dd7920..1e402f6e76324 100644
--- a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev.py
+++ b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev.py
@@ -5,9 +5,9 @@
 # with command line options: SingleMuPt100_cfi -s GEN,SIM,DIGI --conditions auto:run2_mc --magField 38T_PostLS1 --datatier GEN-SIM-DIGI --geometry Extended2015MuonGEMDev,Extended2015MuonGEMDevReco --eventcontent FEVTDEBUGHLT --era Run2_25ns --customise=SimMuon/GEMDigitizer/customizeGEMDigi.customize_digi_addGEM_muon_only,SLHCUpgradeSimulations/Configuration/fixMissingUpgradeGTPayloads.fixRPCConditions,SLHCUpgradeSimulations/Configuration/me0Customs.customize_Digi -n 100 --no_exec --fileout out_digi.root --python_filename SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev_cfg.py
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('DIGI',eras.Run2_25ns)
+from Configuration.Eras.Era_Run2_25ns_cff import Run2_25ns
+process = cms.Process('DIGI',Run2_25ns)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev_RPCGEMME0Customs_cfg.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev_RPCGEMME0Customs_cfg.py
index 3b4235473ee78..aa780e57f942f 100644
--- a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev_RPCGEMME0Customs_cfg.py
+++ b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev_RPCGEMME0Customs_cfg.py
@@ -5,9 +5,9 @@
 # with command line options: SingleMuPt100_cfi -s GEN,SIM,DIGI --conditions auto:run2_mc --magField 38T_PostLS1 --datatier GEN-SIM-DIGI --geometry Extended2015MuonGEMDev,Extended2015MuonGEMDevReco --eventcontent FEVTDEBUGHLT --era Run2_25ns --customise=SimMuon/GEMDigitizer/customizeGEMDigi.customize_digi_addGEM_nocalo,SLHCUpgradeSimulations/Configuration/fixMissingUpgradeGTPayloads.fixRPCConditions,SLHCUpgradeSimulations/Configuration/me0Customs.customise -n 100 --no_exec --fileout out_digi.root --python_filename SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev_RPCGEMME0Customs_cfg.py
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('DIGI',eras.Run2_25ns)
+from Configuration.Eras.Era_Run2_25ns_cff import Run2_25ns
+process = cms.Process('DIGI',Run2_25ns)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM_Extended2015MuonGEMDev_RPCGEMME0Customs_cfg.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM_Extended2015MuonGEMDev_RPCGEMME0Customs_cfg.py
index 8121c6179b555..b16342db78d83 100644
--- a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM_Extended2015MuonGEMDev_RPCGEMME0Customs_cfg.py
+++ b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM_Extended2015MuonGEMDev_RPCGEMME0Customs_cfg.py
@@ -5,9 +5,9 @@
 # with command line options: SingleMuPt100_cfi -s GEN,SIM --conditions auto:run2_mc --magField 38T_PostLS1 --datatier GEN-SIM --geometry Extended2015MuonGEMDev,Extended2015MuonGEMDevReco --eventcontent FEVTDEBUGHLT --era Run2_25ns --customise=SLHCUpgradeSimulations/Configuration/me0Customs.customise -n 100 --no_exec --fileout out_sim.root --python_filename SingleMuPt100_cfi_GEM-SIM_Extended2015MuonGEMDev_RPCGEMME0Customs_cfg.py
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('SIM',eras.Run2_25ns)
+from Configuration.Eras.Era_Run2_25ns_cff import Run2_25ns
+process = cms.Process('SIM',Run2_25ns)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.cc b/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.cc
index 95d1e7475e33e..c208cc79527cd 100644
--- a/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.cc
+++ b/RecoLocalTracker/SiPixelClusterizer/plugins/SiPixelClusterProducer.cc
@@ -205,7 +205,7 @@ void SiPixelClusterProducer::fillDescriptions(edm::ConfigurationDescriptions& de
     
     //LogDebug ("SiPixelClusterProducer") << " Executing " 
     //      << clusterMode_ << " resulted in " << numberOfClusters
-    //				    << " SiPixelClusters in " << numberOfDetUnits << " DetUnits."; 
+    //      << " SiPixelClusters in " << numberOfDetUnits << " DetUnits."; 
   }
 
 
diff --git a/RecoMET/Configuration/python/GenMETParticles_cff.py b/RecoMET/Configuration/python/GenMETParticles_cff.py
index e434c689ead9c..16772b1d1cbbe 100644
--- a/RecoMET/Configuration/python/GenMETParticles_cff.py
+++ b/RecoMET/Configuration/python/GenMETParticles_cff.py
@@ -53,4 +53,5 @@
     )
     )                                        
 
-genMETParticles = cms.Sequence(genCandidatesForMET+genParticlesForMETAllVisible)
+genMETParticlesTask = cms.Task(genCandidatesForMET, genParticlesForMETAllVisible)
+genMETParticles = cms.Sequence(genMETParticlesTask)
diff --git a/RecoMET/Configuration/python/RecoGenMET_cff.py b/RecoMET/Configuration/python/RecoGenMET_cff.py
index 2071abe6c5207..e1ebb0f022883 100644
--- a/RecoMET/Configuration/python/RecoGenMET_cff.py
+++ b/RecoMET/Configuration/python/RecoGenMET_cff.py
@@ -11,5 +11,6 @@
 from RecoMET.METProducers.genMetFromGenJets_cfi import *
 #
 
-recoGenMET = cms.Sequence(genMetCalo+genMetTrue)
+recoGenMETTask = cms.Task(genMetCalo, genMetTrue)
+recoGenMET = cms.Sequence(recoGenMETTask)
 
diff --git a/RecoMET/METProducers/src/HcalNoiseInfoProducer.cc b/RecoMET/METProducers/src/HcalNoiseInfoProducer.cc
index 07459daf7a52c..4347605710d56 100644
--- a/RecoMET/METProducers/src/HcalNoiseInfoProducer.cc
+++ b/RecoMET/METProducers/src/HcalNoiseInfoProducer.cc
@@ -584,7 +584,7 @@ HcalNoiseInfoProducer::filldigis(edm::Event& iEvent, const edm::EventSetup& iSet
     if(mySeverity->dropChannel(mydigistatus->getValue())) continue;
     if(digi.zsMarkAndPass()) continue;
     // Drop if exclude bit set
-    if ((mydigistatus->getValue() & (1 <<HcalChannelStatus::HcalCellExcludeFromHBHENoiseSummary))==1) continue;
+    if (mydigistatus->isBitSet(HcalChannelStatus::HcalCellExcludeFromHBHENoiseSummary)) continue;
       
     // get the calibrations and coder
     const HcalCalibrations& calibrations=conditions->getHcalCalibrations(cell);
@@ -848,19 +848,19 @@ HcalNoiseInfoProducer::fillrechits(edm::Event& iEvent, const edm::EventSetup& iS
       uint32_t bitset = (1 << HcalRecHitFlagsToBeExcluded_[i]);
       recHitFlag = (recHitFlag & bitset) ? recHitFlag-bitset : recHitFlag;
     }
-    const uint32_t dbStatusFlag = dbHcalChStatus->getValues(id)->getValue();
+    const HcalChannelStatus* dbStatus = dbHcalChStatus->getValues(id);
 
     // Ignore rechit if exclude bit set, regardless of severity of other bits
-    if ((dbStatusFlag & (1 <<HcalChannelStatus::HcalCellExcludeFromHBHENoiseSummary))==1) continue;
+    if (dbStatus->isBitSet(HcalChannelStatus::HcalCellExcludeFromHBHENoiseSummary)) continue;
       
-    int severityLevel = hcalSevLvlComputer->getSeverityLevel(id, recHitFlag, dbStatusFlag);
+    int severityLevel = hcalSevLvlComputer->getSeverityLevel(id, recHitFlag, dbStatus->getValue());
     bool isRecovered  = hcalSevLvlComputer->recoveredRecHit(id, recHitFlag);
     if(severityLevel!=0 && !isRecovered && severityLevel>static_cast<int>(HcalAcceptSeverityLevel_)) continue;
 
     // do some rechit counting and energies
     summary.rechitCount_ = summary.rechitCount_ + 1;
     summary.rechitEnergy_ = summary.rechitEnergy_ + rechit.eraw();
-    if ((dbStatusFlag & (1 <<HcalChannelStatus::HcalBadLaserSignal))==1) // hit comes from a region where no laser calibration pulse is normally seen
+    if (dbStatus->isBitSet(HcalChannelStatus::HcalBadLaserSignal)) // hit comes from a region where no laser calibration pulse is normally seen
       {
 	++summary.hitsInNonLaserRegion_;
 	summary.energyInNonLaserRegion_+=rechit.eraw();
@@ -915,7 +915,7 @@ HcalNoiseInfoProducer::fillrechits(edm::Event& iEvent, const edm::EventSetup& iS
     }
 
     if(rechit.flags() & ts4ts5bitset) {
-      if ((dbStatusFlag & (1 <<HcalChannelStatus::HcalCellExcludeFromHBHENoiseSummaryR45))==0)  // only add to TS4TS5 if the bit is not marked as "HcalCellExcludeFromHBHENoiseSummaryR45"
+      if (not dbStatus->isBitSet(HcalChannelStatus::HcalCellExcludeFromHBHENoiseSummaryR45))  // only add to TS4TS5 if the bit is not marked as "HcalCellExcludeFromHBHENoiseSummaryR45"
 	{
 	  summary.nts4ts5noise_++;
 	  summary.ts4ts5noisee_ += rechit.eraw();
diff --git a/RecoMuon/GlobalTrackingTools/interface/MuonTkNavigationSchool.h b/RecoMuon/GlobalTrackingTools/interface/MuonTkNavigationSchool.h
deleted file mode 100644
index bddfb694517fd..0000000000000
--- a/RecoMuon/GlobalTrackingTools/interface/MuonTkNavigationSchool.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#error "obsolete"
-
diff --git a/RecoMuon/MuonIdentification/python/muons1stStep_cfi.py b/RecoMuon/MuonIdentification/python/muons1stStep_cfi.py
index cc4961e9be4c5..4b1ada6b61fd1 100644
--- a/RecoMuon/MuonIdentification/python/muons1stStep_cfi.py
+++ b/RecoMuon/MuonIdentification/python/muons1stStep_cfi.py
@@ -100,3 +100,11 @@
 
 from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
 pp_on_AA_2018.toModify(muons1stStep, minPt = 0.8)
+
+from Configuration.ProcessModifiers.recoFromReco_cff import recoFromReco
+recoFromReco.toModify(muons1stStep,fillShowerDigis = False)
+
+
+
+
+   
diff --git a/RecoMuon/MuonIdentification/test/runME0MuonReco_Example.py b/RecoMuon/MuonIdentification/test/runME0MuonReco_Example.py
index ca536620344c1..1c35fa2c8dfc7 100644
--- a/RecoMuon/MuonIdentification/test/runME0MuonReco_Example.py
+++ b/RecoMuon/MuonIdentification/test/runME0MuonReco_Example.py
@@ -19,9 +19,9 @@
 process.load('TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorOpposite_cfi')
 process.load('TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorAlong_cfi')
 
-## global tag for 2019 upgrade studies
+## global tag for 2021 upgrade studies
 from Configuration.AlCa.GlobalTag import GlobalTag
-#process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgrade2019', '')
+#process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgrade2021', '')
 #process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS3', '')
 
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '')
diff --git a/RecoMuon/MuonIsolation/interface/MuIsoExtractor.h b/RecoMuon/MuonIsolation/interface/MuIsoExtractor.h
deleted file mode 100644
index 10a46abbe824b..0000000000000
--- a/RecoMuon/MuonIsolation/interface/MuIsoExtractor.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MuonIsolation_MuIsoExtractor_H
-#define MuonIsolation_MuIsoExtractor_H
-
-#error This file is obsolete: include "PhysicsTools/IsolationAlgos/interface/IsoDepositExtractor.h" instead
-
-#endif
diff --git a/RecoMuon/MuonIsolation/interface/MuIsoExtractorFactory.h b/RecoMuon/MuonIsolation/interface/MuIsoExtractorFactory.h
deleted file mode 100644
index ed6c4e1d5ecc8..0000000000000
--- a/RecoMuon/MuonIsolation/interface/MuIsoExtractorFactory.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef MuonIsolation_MuIsoExtractorFactory_H
-#define MuonIsolation_MuIsoExtractorFactory_H
-
-#error This file is obsolete: include "PhysicsTools/IsolationAlgos/interface/IsoExtractorFactory.h" instead
-
-#endif
diff --git a/RecoParticleFlow/PFClusterProducer/interface/PFECALHashNavigator.h b/RecoParticleFlow/PFClusterProducer/interface/PFECALHashNavigator.h
index c6683ff4faa38..4e5ea42ec4a0b 100644
--- a/RecoParticleFlow/PFClusterProducer/interface/PFECALHashNavigator.h
+++ b/RecoParticleFlow/PFClusterProducer/interface/PFECALHashNavigator.h
@@ -59,8 +59,8 @@ class PFECALHashNavigator : public PFRecHitNavigatorBase {
       endcapGeometry_  = dynamic_cast < const EcalEndcapGeometry* > (eeTmp);
 
       // get the ecalBarrel topology
-      barrelTopology_ = new  EcalBarrelTopology(geoHandle);
-      endcapTopology_ = new  EcalEndcapTopology(geoHandle);
+      barrelTopology_ = std::make_unique<EcalBarrelTopology>(*geoHandle);
+      endcapTopology_ = std::make_unique<EcalEndcapTopology>(*geoHandle);
 
       ecalNeighbArray(*barrelGeometry_,*barrelTopology_,*endcapGeometry_,*endcapTopology_);
 
@@ -418,8 +418,8 @@ DetId move(DetId cell,
 }
 
 
-  EcalEndcapTopology *endcapTopology_;
-  EcalBarrelTopology *barrelTopology_;
+  std::unique_ptr<EcalEndcapTopology> endcapTopology_;
+  std::unique_ptr<EcalBarrelTopology> barrelTopology_;
 
   const EcalEndcapGeometry *endcapGeometry_;
   const EcalBarrelGeometry *barrelGeometry_;
diff --git a/RecoParticleFlow/PFClusterProducer/plugins/Navigators.cc b/RecoParticleFlow/PFClusterProducer/plugins/Navigators.cc
index b9782fecdff3c..828288425f1e8 100644
--- a/RecoParticleFlow/PFClusterProducer/plugins/Navigators.cc
+++ b/RecoParticleFlow/PFClusterProducer/plugins/Navigators.cc
@@ -20,7 +20,7 @@ class PFRecHitEcalBarrelNavigatorWithTime : public PFRecHitCaloNavigatorWithTime
   void beginEvent(const edm::EventSetup& iSetup) override {
     edm::ESHandle<CaloGeometry> geoHandle;
     iSetup.get<CaloGeometryRecord>().get(geoHandle);
-    topology_.reset( new EcalBarrelTopology(geoHandle) );
+    topology_ = std::make_unique<EcalBarrelTopology>(*geoHandle);
   }
 };
 
@@ -35,7 +35,7 @@ class PFRecHitEcalEndcapNavigatorWithTime : public PFRecHitCaloNavigatorWithTime
   void beginEvent(const edm::EventSetup& iSetup) override {
     edm::ESHandle<CaloGeometry> geoHandle;
     iSetup.get<CaloGeometryRecord>().get(geoHandle);
-    topology_.reset( new EcalEndcapTopology(geoHandle) );
+    topology_ = std::make_unique<EcalEndcapTopology>(*geoHandle);
   }
 };
 
@@ -48,7 +48,7 @@ class PFRecHitEcalBarrelNavigator final : public PFRecHitCaloNavigator<EBDetId,E
   void beginEvent(const edm::EventSetup& iSetup) override {
     edm::ESHandle<CaloGeometry> geoHandle;
     iSetup.get<CaloGeometryRecord>().get(geoHandle);
-    topology_.reset( new EcalBarrelTopology(geoHandle) );
+    topology_ = std::make_unique<EcalBarrelTopology>(*geoHandle);
   }
 };
 
@@ -61,7 +61,7 @@ class PFRecHitEcalEndcapNavigator final : public PFRecHitCaloNavigator<EEDetId,E
   void beginEvent(const edm::EventSetup& iSetup) override {
     edm::ESHandle<CaloGeometry> geoHandle;
     iSetup.get<CaloGeometryRecord>().get(geoHandle);
-    topology_.reset( new EcalEndcapTopology(geoHandle) );
+    topology_ = std::make_unique<EcalEndcapTopology>(*geoHandle);
   }
 };
 
@@ -73,9 +73,7 @@ class PFRecHitPreshowerNavigator final : public PFRecHitCaloNavigator<ESDetId,Ec
 
 
   void beginEvent(const edm::EventSetup& iSetup) override {
-    edm::ESHandle<CaloGeometry> geoHandle;
-    iSetup.get<CaloGeometryRecord>().get(geoHandle);
-    topology_.reset( new EcalPreshowerTopology(geoHandle) );
+    topology_ = std::make_unique<EcalPreshowerTopology>();
   }
 };
 
diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py
index 94aaf14000537..a37a6f16f57ff 100644
--- a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py
+++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py
@@ -43,7 +43,7 @@
     ),
 )
 
-# offline 2019
+# offline 2021
 from Configuration.Eras.Modifier_run3_HB_cff import run3_HB
 run3_HB.toModify(particleFlowClusterHCAL,
     pfClusterBuilder = dict(
diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py
index 1584d80f51c2f..596a49bd693a7 100644
--- a/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py
+++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py
@@ -51,7 +51,7 @@
     producers = {0 : dict(qualityTests = {0 : dict(cuts = {1 : dict(threshold = _thresholdsHEphase1) } ) } ) },
 )
 
-# offline 2019
+# offline 2021
 from Configuration.Eras.Modifier_run3_HB_cff import run3_HB
 run3_HB.toModify(particleFlowRecHitHBHE,
     producers = {0 : dict(qualityTests = {0 : dict(cuts = {0 : dict(threshold = _thresholdsHBphase1) } ) } ) },
diff --git a/RecoParticleFlow/PFClusterTools/interface/PFEnergyCalibration.h b/RecoParticleFlow/PFClusterTools/interface/PFEnergyCalibration.h
index 3d9202c27c60a..2003d92408bb0 100644
--- a/RecoParticleFlow/PFClusterTools/interface/PFEnergyCalibration.h
+++ b/RecoParticleFlow/PFClusterTools/interface/PFEnergyCalibration.h
@@ -107,6 +107,14 @@ class PFEnergyCalibration
   std::unique_ptr<TF1> faEtaEndcapH; 
   std::unique_ptr<TF1> fbEtaEndcapH; 
 
+  //added by Bhumika on 2 august 2018
+  std::unique_ptr<TF1> fcEtaBarrelEH;
+  std::unique_ptr<TF1> fcEtaEndcapEH;
+  std::unique_ptr<TF1> fdEtaEndcapEH;
+  std::unique_ptr<TF1> fcEtaBarrelH;
+  std::unique_ptr<TF1> fcEtaEndcapH;
+  std::unique_ptr<TF1> fdEtaEndcapH;
+
  private:
   
   double minimum(double a,double b) const;
@@ -141,6 +149,14 @@ class PFEnergyCalibration
   double bEtaEndcapEH(double x) const;
   double aEtaEndcapH(double x) const; 
   double bEtaEndcapH(double x) const;
+  //added by Bhumika on 3 august 2018
+  double cEtaBarrelEH(double x) const;
+  double cEtaEndcapEH(double x) const;
+  double dEtaEndcapEH(double x) const;
+  double cEtaBarrelH(double x) const;
+  double cEtaEndcapH(double x) const;
+  double dEtaEndcapH(double x) const;
+
 
   // Threshold correction (offset)
   double threshE, threshH;
diff --git a/RecoParticleFlow/PFClusterTools/src/PFEnergyCalibration.cc b/RecoParticleFlow/PFClusterTools/src/PFEnergyCalibration.cc
index 4ee129b3d3bf9..d24d696936c48 100644
--- a/RecoParticleFlow/PFClusterTools/src/PFEnergyCalibration.cc
+++ b/RecoParticleFlow/PFClusterTools/src/PFEnergyCalibration.cc
@@ -1,3 +1,4 @@
+
 #include "RecoParticleFlow/PFClusterTools/interface/PFEnergyCalibration.h"
 #include "CondFormats/PhysicsToolsObjects/interface/PerformancePayloadFromTFormula.h"
 
@@ -29,18 +30,19 @@ PFEnergyCalibration::initializeCalibrationFunctions() {
   threshE = 3.5;
   threshH = 2.5;
 
-  //calibChrisClean.C calibration parameters shubham May 01, 2017
-  faBarrel = std::make_unique<TF1>("faBarrel","[0]+((([1]+([2]/sqrt(x)))*exp(-(x^[6]/[3])))-([4]*exp(-(x^[7]/[5]))))",1.,1000.);
-  faBarrel->SetParameter(0,-13.9219);
-  faBarrel->SetParameter(1,14.9124);
-  faBarrel->SetParameter(2,5.38578);
-  faBarrel->SetParameter(3,0.861981);
-  faBarrel->SetParameter(4,-0.00759275);
-  faBarrel->SetParameter(5,0.00373563);
-  faBarrel->SetParameter(6,-1.17946);
-  faBarrel->SetParameter(7,-1.69561);
-  fbBarrel = std::make_unique<TF1>("fbBarrel","[0]+((([1]+([2]/sqrt(x)))*exp(-(x^[6]/[3])))-([4]*exp(-(x^[7]/[5]))))",1.,1000.);
-  fbBarrel->SetParameter(0,2.25366);
+
+ //calibChrisClean.C calibration parameters bhumika Nov, 2018
+  faBarrel = std::make_unique<TF1>("faBarrel","[0]+((([1]+([2]/sqrt(x)))*exp(-(x^[6]/[3])))-([4]*exp(-(x^[7]/[5]))))",0.,1000.);
+  faBarrel->SetParameter(0,-30.7141);
+  faBarrel->SetParameter(1,31.7583);
+  faBarrel->SetParameter(2,4.40594);
+  faBarrel->SetParameter(3,1.70914);
+  faBarrel->SetParameter(4,0.0613696);
+  faBarrel->SetParameter(5,0.000104857);
+  faBarrel->SetParameter(6,-1.38927);
+  faBarrel->SetParameter(7,-0.743082);
+  fbBarrel = std::make_unique<TF1>("fbBarrel","[0]+((([1]+([2]/sqrt(x)))*exp(-(x^[6]/[3])))-([4]*exp(-(x^[7]/[5]))))",0.,1000.);
+  fbBarrel->SetParameter(0,2.25366);	
   fbBarrel->SetParameter(1,0.537715);
   fbBarrel->SetParameter(2,-4.81375);
   fbBarrel->SetParameter(3,12.109);
@@ -48,7 +50,8 @@ PFEnergyCalibration::initializeCalibrationFunctions() {
   fbBarrel->SetParameter(5,0.187919);
   fbBarrel->SetParameter(6,-6.26234);
   fbBarrel->SetParameter(7,-0.607392);
-  fcBarrel = std::make_unique<TF1>("fcBarrel","[0]+((([1]+([2]/sqrt(x)))*exp(-(x^[6]/[3])))-([4]*exp(-(x^[7]/[5]))))",1.,1000.);
+  fcBarrel = std::make_unique<TF1>("fcBarrel","[0]+((([1]+([2]/sqrt(x)))*exp(-(x^[6]/[3])))-([4]*exp(-(x^[7]/[5]))))",0.,1000.);
+  fcBarrel->SetParameter(0,1.5125962);
   fcBarrel->SetParameter(1,0.855057);
   fcBarrel->SetParameter(2,-6.04199);
   fcBarrel->SetParameter(3,2.08229);
@@ -56,69 +59,110 @@ PFEnergyCalibration::initializeCalibrationFunctions() {
   fcBarrel->SetParameter(5,0.0291232);
   fcBarrel->SetParameter(6,0.364802);
   fcBarrel->SetParameter(7,-1.50142);
-  faEtaBarrelEH = std::make_unique<TF1>("faEtaBarrelEH","[0]+[1]*exp(-x/[2])",1.,1000.);
+  faEtaBarrelEH = std::make_unique<TF1>("faEtaBarrelEH","[0]+[1]*exp(-x/[2])",0.,1000.);
   faEtaBarrelEH->SetParameter(0,0.0185555);
   faEtaBarrelEH->SetParameter(1,-0.0470674);
   faEtaBarrelEH->SetParameter(2,396.959);
-  fbEtaBarrelEH = std::make_unique<TF1>("fbEtaBarrelEH","[0]+[1]*exp(-x/[2])",1.,1000.);
+  fbEtaBarrelEH = std::make_unique<TF1>("fbEtaBarrelEH","[0]+[1]*exp(-x/[2])",0.,1000.);
   fbEtaBarrelEH->SetParameter(0,0.0396458);
   fbEtaBarrelEH->SetParameter(1,0.114128);
   fbEtaBarrelEH->SetParameter(2,251.405);
-  faEtaBarrelH = std::make_unique<TF1>("faEtaBarrelH","[0]+[1]*x",1.,1000.);
+  faEtaBarrelH = std::make_unique<TF1>("faEtaBarrelH","[0]+[1]*x",0.,1000.);
   faEtaBarrelH->SetParameter(0,0.00434994);
   faEtaBarrelH->SetParameter(1,-5.16564e-06);
-  fbEtaBarrelH = std::make_unique<TF1>("fbEtaBarrelH","[0]+[1]*exp(-x/[2])",1.,1000.);
+  fbEtaBarrelH = std::make_unique<TF1>("fbEtaBarrelH","[0]+[1]*exp(-x/[2])",0.,1000.);
   fbEtaBarrelH->SetParameter(0,-0.0232604);
   fbEtaBarrelH->SetParameter(1,0.0937525);
   fbEtaBarrelH->SetParameter(2,34.9935);
 
-  faEndcap = std::make_unique<TF1>("faEndcap","[0]+((([1]+([2]/sqrt(x)))*exp(-(x^[6]/[3])))-([4]*exp(-(x^[7]/[5]))))",1.,1000.);
-  faEndcap->SetParameter(0,0.962468);
-  faEndcap->SetParameter(1,11.9536);
-  faEndcap->SetParameter(2,-27.7088);
-  faEndcap->SetParameter(3,0.755474);
-  faEndcap->SetParameter(4,0.0791012);
-  faEndcap->SetParameter(5,0.0011082);
-  faEndcap->SetParameter(6,0.158734);
-  faEndcap->SetParameter(7,-2.1);
-  fbEndcap = std::make_unique<TF1>("fbEndcap","[0]+((([1]+([2]/sqrt(x)))*exp(-(x^[6]/[3])))-([4]*exp(-(x^[7]/[5]))))",1.,1000.);
-  fbEndcap->SetParameter(0,-0.629923);
-  fbEndcap->SetParameter(1,2.59634);
-  fbEndcap->SetParameter(2,-2.27786);
-  fbEndcap->SetParameter(3,1.20771);
-  fbEndcap->SetParameter(4,-1.59129);
-  fbEndcap->SetParameter(5,0.0189607);
-  fbEndcap->SetParameter(6,0.270027);
-  fbEndcap->SetParameter(7,-2.30372);
-  fcEndcap = std::make_unique<TF1>("fcEndcap","[0]+((([1]+([2]/sqrt(x)))*exp(-(x^[6]/[3])))-([4]*exp(-(x^[7]/[5]))))",1.,1000.);
-  fcEndcap->SetParameter(0,1.83168);
-  fcEndcap->SetParameter(1,1.41883);
-  fcEndcap->SetParameter(2,-5.50085);
-  fcEndcap->SetParameter(3,29.2208);
-  fcEndcap->SetParameter(4,0.923959);
-  fcEndcap->SetParameter(5,0.268974);
-  fcEndcap->SetParameter(6,1.37756);
-  fcEndcap->SetParameter(7,-0.901421);
-  faEtaEndcapEH = std::make_unique<TF1>("faEtaEndcapEH","[0]+[1]*exp(-x/[2])",1.,1000.);
-  faEtaEndcapEH->SetParameter(0,384.307);
-  faEtaEndcapEH->SetParameter(1,-384.305);
-  faEtaEndcapEH->SetParameter(2,2.16374e+08);
-  fbEtaEndcapEH = std::make_unique<TF1>("fbEtaEndcapEH","[0]+[1]*exp(-x/[2])",1.,1000.);
-  fbEtaEndcapEH->SetParameter(0,0.0120097);
-  fbEtaEndcapEH->SetParameter(1,-0.131464);
-  fbEtaEndcapEH->SetParameter(2,57.1104);
-  faEtaEndcapH = std::make_unique<TF1>("faEtaEndcapH","[0]+[1]*exp(-x/[2])+[3]*[3]*exp(-x*x/([4]*[4]))",1.,1000.);
+  faEndcap = std::make_unique<TF1>("faEndcap","[0]+((([1]+([2]/sqrt(x)))*exp(-(x^[6]/[3])))-([4]*exp(-(x^[7]/[5]))))",0.,1000.);
+  faEndcap->SetParameter(0,1.17227);
+  faEndcap->SetParameter(1,13.1489);
+  faEndcap->SetParameter(2,-29.1672);
+  faEndcap->SetParameter(3,0.604223);
+  faEndcap->SetParameter(4,0.0426363);
+  faEndcap->SetParameter(5,3.30898e-15);
+  faEndcap->SetParameter(6,0.165293);
+  faEndcap->SetParameter(7,-7.56786);
+  fbEndcap = std::make_unique<TF1>("fbEndcap","[0]+((([1]+([2]/sqrt(x)))*exp(-(x^[6]/[3])))-([4]*exp(-(x^[7]/[5]))))",0.,1000.);
+  fbEndcap->SetParameter(0,-0.974251);
+  fbEndcap->SetParameter(1,1.61733);
+  fbEndcap->SetParameter(2,0.0629183);
+  fbEndcap->SetParameter(3,7.78495);
+  fbEndcap->SetParameter(4,-0.774289);
+  fbEndcap->SetParameter(5,7.81399e-05);
+  fbEndcap->SetParameter(6,0.139116);
+  fbEndcap->SetParameter(7,-4.25551);
+  fcEndcap = std::make_unique<TF1>("fcEndcap","[0]+((([1]+([2]/sqrt(x)))*exp(-(x^[6]/[3])))-([4]*exp(-(x^[7]/[5]))))",0.,1000.);
+  fcEndcap->SetParameter(0,1.01863);
+  fcEndcap->SetParameter(1,1.29787);
+  fcEndcap->SetParameter(2,-3.97293);
+  fcEndcap->SetParameter(3,21.7805);
+  fcEndcap->SetParameter(4,0.810195);
+  fcEndcap->SetParameter(5,0.234134);
+  fcEndcap->SetParameter(6,1.42226);
+  fcEndcap->SetParameter(7,-0.0997326);
+  faEtaEndcapEH = std::make_unique<TF1>("faEtaEndcapEH","[0]+[1]*exp(-x/[2])",0.,1000.);
+  faEtaEndcapEH->SetParameter(0,0.0112692);
+  faEtaEndcapEH->SetParameter(1,-2.68063);
+  faEtaEndcapEH->SetParameter(2,2.90973);
+  fbEtaEndcapEH = std::make_unique<TF1>("fbEtaEndcapEH","[0]+[1]*exp(-x/[2])",0.,1000.);
+  fbEtaEndcapEH->SetParameter(0,-0.0192991);
+  fbEtaEndcapEH->SetParameter(1,-0.265);
+  fbEtaEndcapEH->SetParameter(2,80.5502);
+  faEtaEndcapH = std::make_unique<TF1>("faEtaEndcapH","[0]+[1]*exp(-x/[2])+[3]*[3]*exp(-x*x/([4]*[4]))",0.,1000.);
   faEtaEndcapH->SetParameter(0,-0.0106029);
   faEtaEndcapH->SetParameter(1,-0.692207);
   faEtaEndcapH->SetParameter(2,0.0542991);
   faEtaEndcapH->SetParameter(3,-0.171435);
   faEtaEndcapH->SetParameter(4,-61.2277);
-  fbEtaEndcapH = std::make_unique<TF1>("fbEtaEndcapH","[0]+[1]*exp(-x/[2])+[3]*[3]*exp(-x*x/([4]*[4]))",1.,1000.);
+  fbEtaEndcapH = std::make_unique<TF1>("fbEtaEndcapH","[0]+[1]*exp(-x/[2])+[3]*[3]*exp(-x*x/([4]*[4]))",0.,1000.);
   fbEtaEndcapH->SetParameter(0,0.0214894);
   fbEtaEndcapH->SetParameter(1,-0.266704);
   fbEtaEndcapH->SetParameter(2,5.2112);
   fbEtaEndcapH->SetParameter(3,0.303578);
   fbEtaEndcapH->SetParameter(4,-104.367);
+
+  //added by Bhumika on 2 august 2018
+
+  fcEtaBarrelH = std::make_unique<TF1>("fcEtaBarrelH","[3]*((x-[0])^[1])+[2]",0.,1000.);
+  fcEtaBarrelH->SetParameter(0,0);
+  fcEtaBarrelH->SetParameter(1,2);
+  fcEtaBarrelH->SetParameter(2,0);
+  fcEtaBarrelH->SetParameter(3,1);
+
+  fcEtaEndcapH = std::make_unique<TF1>("fcEtaEndcapH","[3]*((x-[0])^[1])+[2]",0.,1000.);
+  fcEtaEndcapH->SetParameter(0,0);
+  fcEtaEndcapH->SetParameter(1,0);
+  fcEtaEndcapH->SetParameter(2,0.05);
+  fcEtaEndcapH->SetParameter(3,0);
+  
+  fdEtaEndcapH = std::make_unique<TF1>("fdEtaEndcapH","[3]*((x-[0])^[1])+[2]",0.,1000.);
+  fdEtaEndcapH->SetParameter(0,1.5);
+  fdEtaEndcapH->SetParameter(1,4);
+  fdEtaEndcapH->SetParameter(2,-1.1);
+  fdEtaEndcapH->SetParameter(3,1.0);
+
+  fcEtaBarrelEH = std::make_unique<TF1>("fcEtaBarrelEH","[3]*((x-[0])^[1])+[2]",0.,1000.);
+  fcEtaBarrelEH->SetParameter(0,0);
+  fcEtaBarrelEH->SetParameter(1,2);
+  fcEtaBarrelEH->SetParameter(2,0);
+  fcEtaBarrelEH->SetParameter(3,1);
+
+  fcEtaEndcapEH = std::make_unique<TF1>("fcEtaEndcapEH","[3]*((x-[0])^[1])+[2]",0.,1000.);
+  fcEtaEndcapEH->SetParameter(0,0);
+  fcEtaEndcapEH->SetParameter(1,0);
+  fcEtaEndcapEH->SetParameter(2,0);
+  fcEtaEndcapEH->SetParameter(3,0);
+  
+  fdEtaEndcapEH = std::make_unique<TF1>("fdEtaEndcapEH","[3]*((x-[0])^[1])+[2]",0.,1000.);
+  fdEtaEndcapEH->SetParameter(0,1.5);
+  fdEtaEndcapEH->SetParameter(1,2.0);
+  fdEtaEndcapEH->SetParameter(2,0.6);
+  fdEtaEndcapEH->SetParameter(3,1.0);
+  
+
+
 }
 
 void 
@@ -155,11 +199,13 @@ PFEnergyCalibration::energyEmHad(double t, double& e, double&h, double eta, doub
 
     // The angular correction 
     if ( e > 0. && thresh > 0. ) {
-      etaCorrE = 1.0 + aEtaBarrelEH(t) + 1.3*bEtaBarrelEH(t)*absEta*absEta;
+      etaCorrE = 1.0 + aEtaBarrelEH(t) + 1.3*bEtaBarrelEH(t)*cEtaBarrelEH(absEta);
       etaCorrH = 1.0;
     } else {
-      etaCorrE = 1.0 + aEtaBarrelH(t) + 1.3*bEtaBarrelH(t)*absEta*absEta; 
-      etaCorrH = 1.0 + aEtaBarrelH(t) + bEtaBarrelH(t)*absEta*absEta;
+      etaCorrE = 1.0 + aEtaBarrelH(t) + 1.3*bEtaBarrelH(t)*cEtaBarrelH(absEta);
+      etaCorrH = 1.0 + aEtaBarrelH(t) + bEtaBarrelH(t)*cEtaBarrelH(absEta);
+
+
     }
     if ( e > 0. && thresh > 0. ) 
       e = h > 0. ? threshE-threshH + etaCorrE * a * e : threshE + etaCorrE * a * e;
@@ -191,21 +237,21 @@ PFEnergyCalibration::energyEmHad(double t, double& e, double&h, double eta, doub
 
     if ( e > 0. && thresh > 0. ) {
       if(absEta<2.5) {
-        etaCorrE = 1. + aEtaEndcapEH(t) ;
+        etaCorrE = 1. + aEtaEndcapEH(t) + bEtaEndcapEH(t)*cEtaEndcapEH(absEta);
       }
       else {
-        etaPow = dEta * dEta;
-        etaCorrE = 1. + aEtaEndcapEH(t) + 1.3*bEtaEndcapEH(t)*(0.6 + etaPow);
+
+        etaCorrE = 1. + aEtaEndcapEH(t) + 1.3*bEtaEndcapEH(t)*dEtaEndcapEH(absEta);
       }
-      etaPow = dEta * dEta * dEta * dEta;
-      etaCorrH = 1. + aEtaEndcapEH(t) + bEtaEndcapEH(t)*(0.04 + etaPow);
+
+        etaCorrH = 1. + aEtaEndcapEH(t) + bEtaEndcapEH(t)*(0.04 + etaPow);
     } else {
-      etaCorrE = 1. + aEtaEndcapH(t) + 1.3*bEtaEndcapH(t)*(0.04 + etaPow);
+      etaCorrE = 1.;
       if(absEta<2.5) {
-        etaCorrH = 1. + aEtaEndcapH(t) + 0.05*bEtaEndcapH(t);
+        etaCorrH = 1. + aEtaEndcapH(t) + bEtaEndcapH(t)*cEtaEndcapH(absEta);
       }
       else {
-        etaCorrH = 1. + aEtaEndcapH(t) + bEtaEndcapH(t)*(etaPow - 1.1);
+        etaCorrH = 1. + aEtaEndcapH(t) + bEtaEndcapH(t)*dEtaEndcapH(absEta);
       }
     }
 
@@ -447,15 +493,90 @@ PFEnergyCalibration::bEtaEndcapH(double x) const {
     BinningPointByMap point;
     point.insert(BinningVariables::JetEt, x);
     return pfCalibrations->getResult(PerformanceResult::PFfbEta_ENDCAPH,point); 
+  } else { 
+    return fbEtaEndcapH->Eval(x); 
 
+  }
+}
+
+//added by Bhumika Kansal on 3 august 2018
+
+double 
+PFEnergyCalibration::cEtaBarrelH(double x) const { 
+  if ( pfCalibrations ) { 
+    BinningPointByMap point;
+    point.insert(BinningVariables::JetEt, x);
+    return pfCalibrations->getResult(PerformanceResult::PFfcEta_BARRELH,point); 
+    
   } else { 
+    return fcEtaBarrelH->Eval(x); 
+  }
+}
+double 
+PFEnergyCalibration::cEtaEndcapH(double x) const { 
+  if ( pfCalibrations ) { 
+    BinningPointByMap point;
+    point.insert(BinningVariables::JetEt, x);
+    return pfCalibrations->getResult(PerformanceResult::PFfcEta_ENDCAPH,point); 
+    
+  } else{  
 
-    return fbEtaEndcapH->Eval(x); 
+    return fcEtaEndcapH->Eval(x); 
+  }
+}
 
+double 
+PFEnergyCalibration::dEtaEndcapH(double x) const { 
+  if ( pfCalibrations ) { 
+    BinningPointByMap point;
+    point.insert(BinningVariables::JetEt, x);
+    return pfCalibrations->getResult(PerformanceResult::PFfdEta_ENDCAPH,point); 
+    
+  } else{ 
+
+    return fdEtaEndcapH->Eval(x); 
+  }
+}
+
+double 
+PFEnergyCalibration::cEtaBarrelEH(double x) const { 
+  if ( pfCalibrations ) { 
+    BinningPointByMap point;
+    point.insert(BinningVariables::JetEt, x);
+    return pfCalibrations->getResult(PerformanceResult::PFfcEta_BARRELEH,point); 
+    
+  } else{  
+
+    return fcEtaBarrelEH->Eval(x); 
+  }
+}
+
+double 
+PFEnergyCalibration::cEtaEndcapEH(double x) const { 
+  if ( pfCalibrations ) { 
+    BinningPointByMap point;
+    point.insert(BinningVariables::JetEt, x);
+    return pfCalibrations->getResult(PerformanceResult::PFfcEta_ENDCAPEH,point); 
+    
+  } else{  
+
+    return fcEtaEndcapEH->Eval(x); 
   }
 }
 
+double 
+PFEnergyCalibration::dEtaEndcapEH(double x) const { 
+  if ( pfCalibrations ) { 
+    BinningPointByMap point;
+    point.insert(BinningVariables::JetEt, x);
+    return pfCalibrations->getResult(PerformanceResult::PFfdEta_ENDCAPEH,point); 
+    
+  } else{  
 
+    return fdEtaEndcapEH->Eval(x); 
+  }
+}
+//
 double
 PFEnergyCalibration::energyEm(const reco::PFCluster& clusterEcal,
 			      std::vector<double> &EclustersPS1,
@@ -532,9 +653,17 @@ std::ostream& operator<<(std::ostream& out,
       {"PFfaEta_BARRELEH", PerformanceResult::PFfaEta_BARRELEH},
       {"PFfaEta_ENDCAPEH", PerformanceResult::PFfaEta_ENDCAPEH},
       {"PFfbEta_BARRELEH", PerformanceResult::PFfbEta_BARRELEH},
-      {"PFfbEta_ENDCAPEH", PerformanceResult::PFfbEta_ENDCAPEH}
+      {"PFfbEta_ENDCAPEH", PerformanceResult::PFfbEta_ENDCAPEH},
+      {"PFfcEta_BARRELH", PerformanceResult::PFfcEta_BARRELH},
+      {"PFfcEta_ENDCAPH", PerformanceResult::PFfcEta_ENDCAPH},
+      {"PFfdEta_ENDCAPH", PerformanceResult::PFfdEta_ENDCAPH},
+      {"PFfcEta_BARRELEH", PerformanceResult::PFfcEta_BARRELEH},
+      {"PFfcEta_ENDCAPEH", PerformanceResult::PFfcEta_ENDCAPEH},
+      {"PFfdEta_ENDCAPEH", PerformanceResult::PFfdEta_ENDCAPEH}
+
     };
-    
+
+        
     for(std::map<std::string,PerformanceResult::ResultType>::const_iterator 
 	  func = functType.begin(); 
         func != functType.end(); 
@@ -563,6 +692,7 @@ std::ostream& operator<<(std::ostream& out,
     calib.fbEtaEndcapEH->Print();
     calib.faEtaEndcapH->Print();
     calib.fbEtaEndcapH->Print();
+    //
 
   }
     
diff --git a/RecoParticleFlow/PFClusterTools/test/BuildFile.xml b/RecoParticleFlow/PFClusterTools/test/BuildFile.xml
new file mode 100644
index 0000000000000..3aa42b5339e1f
--- /dev/null
+++ b/RecoParticleFlow/PFClusterTools/test/BuildFile.xml
@@ -0,0 +1,11 @@
+<use   name="FWCore/Framework"/>
+<use   name="FWCore/MessageLogger"/>
+<use   name="FWCore/ParameterSet"/>
+<use   name="CondCore/DBOutputService"/>
+<use   name="CondFormats/DataRecord"/>
+<use   name="CondFormats/PhysicsToolsObjects"/>
+<use   name="boost"/>
+<use   name="root"/>
+<library   name="RecoParticleFlowPFClusterToolsTest" file="*.cc">
+  <flags   EDM_PLUGIN="1"/>
+</library>
diff --git a/RecoParticleFlow/PFClusterTools/test/ProducePFCalibration.py b/RecoParticleFlow/PFClusterTools/test/ProducePFCalibration.py
new file mode 100644
index 0000000000000..e14ded804ab9b
--- /dev/null
+++ b/RecoParticleFlow/PFClusterTools/test/ProducePFCalibration.py
@@ -0,0 +1,204 @@
+import FWCore.ParameterSet.Config as cms
+
+
+
+################################################################
+#### This config is used to generate payload for PFCalibration 
+################################################################
+
+
+process = cms.Process("myprocess")
+#process.load("CondCore.DBCommon.CondDBCommon_cfi")
+process.load("CondCore.CondDB.CondDB_cfi")
+#process.CondDBCommon.connect = 'sqlite_file:PhysicsPerformance.db'
+
+
+
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(1)
+)
+process.source = cms.Source("EmptySource",
+                            firstRun = cms.untracked.uint32(10)
+                            )
+
+# process.PoolDBOutputService.DBParameters.messageLevel = 3
+
+
+process.mywriter = cms.EDAnalyzer(
+  "ProducePFCalibrationObject",
+  write = cms.untracked.bool(False),
+  toWrite = cms.VPSet(
+            cms.PSet(fType      = cms.untracked.string("PFfa_BARREL"),
+                     formula    = cms.untracked.string("[0]+((([1]+([2]/sqrt(x)))*exp(-(x^[6]/[3])))-([4]*exp(-(x^[7]/[5]))))"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(-30.7141, 31.7583, 4.40594, 1.70914, 0.0613696, 0.000104857, -1.38927, -0.743082, )
+                    ),
+            cms.PSet(fType      = cms.untracked.string("PFfb_BARREL"),
+                     formula    = cms.untracked.string("[0]+((([1]+([2]/sqrt(x)))*exp(-(x^[6]/[3])))-([4]*exp(-(x^[7]/[5]))))"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(2.25366, 0.537715, -4.81375, 12.109, 1.80577, 0.187919, -6.26234, -0.607392, )
+                    ),
+            cms.PSet(fType      = cms.untracked.string("PFfc_BARREL"),
+                     formula    = cms.untracked.string("[0]+((([1]+([2]/sqrt(x)))*exp(-(x^[6]/[3])))-([4]*exp(-(x^[7]/[5]))))"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(1.5126, 0.855057, -6.04199, 2.08229, 0.592266, 0.0291232, 0.364802, -1.50142, )
+                    ),
+            cms.PSet(fType      = cms.untracked.string("PFfaEta_BARRELEH"),
+                     formula    = cms.untracked.string("[0]+[1]*exp(-x/[2])"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(0.0185555, -0.0470674, 396.959, )
+                    ),
+            cms.PSet(fType      = cms.untracked.string("PFfbEta_BARRELEH"),
+                     formula    = cms.untracked.string("[0]+[1]*exp(-x/[2])"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(0.0396458, 0.114128, 251.405, )
+                    ),
+            cms.PSet(fType      = cms.untracked.string("PFfaEta_BARRELH"),
+                     formula    = cms.untracked.string("[0]+[1]*x"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(0.00434994, -5.16564e-06, )
+                    ),
+            cms.PSet(fType      = cms.untracked.string("PFfbEta_BARRELH"),
+                     formula    = cms.untracked.string("[0]+[1]*exp(-x/[2])"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(-0.0232604, 0.0937525, 34.9935, )
+                    ),
+
+            cms.PSet(fType      = cms.untracked.string("PFfa_ENDCAP"),
+                     formula    = cms.untracked.string("[0]+((([1]+([2]/sqrt(x)))*exp(-(x^[6]/[3])))-([4]*exp(-(x^[7]/[5]))))"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(1.17227, 13.1489, -29.1672, 0.604223, 0.0426363, 3.30898e-15, 0.165293, -7.56786, )
+                    ),
+            cms.PSet(fType      = cms.untracked.string("PFfb_ENDCAP"),
+                     formula    = cms.untracked.string("[0]+((([1]+([2]/sqrt(x)))*exp(-(x^[6]/[3])))-([4]*exp(-(x^[7]/[5]))))"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(-0.974251, 1.61733, 0.0629183, 7.78495, -0.774289, 7.81399e-05, 0.139116, -4.25551, )
+                    ),
+            cms.PSet(fType      = cms.untracked.string("PFfc_ENDCAP"),
+                     formula    = cms.untracked.string("[0]+((([1]+([2]/sqrt(x)))*exp(-(x^[6]/[3])))-([4]*exp(-(x^[7]/[5]))))"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(1.01863, 1.29787, -3.97293, 21.7805, 0.810195, 0.234134, 1.42226, -0.0997326, )
+                    ),
+            cms.PSet(fType      = cms.untracked.string("PFfaEta_ENDCAPEH"),
+                     formula    = cms.untracked.string("[0]+[1]*exp(-x/[2])"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(0.0112692, -2.68063, 2.90973, )
+                    ),
+            cms.PSet(fType      = cms.untracked.string("PFfbEta_ENDCAPEH"),
+                     formula    = cms.untracked.string("[0]+[1]*exp(-x/[2])"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(-0.0192991, -0.265, 80.5502, )
+                    ),
+
+            cms.PSet(fType      = cms.untracked.string("PFfaEta_ENDCAPH"),
+                     formula    = cms.untracked.string("[0]+[1]*exp(-x/[2])+[3]*[3]*exp(-x*x/([4]*[4]))"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(-0.0106029, -0.692207, 0.0542991, -0.171435, -61.2277, )
+                    ),
+            cms.PSet(fType      = cms.untracked.string("PFfbEta_ENDCAPH"),
+                     formula    = cms.untracked.string("[0]+[1]*exp(-x/[2])+[3]*[3]*exp(-x*x/([4]*[4]))"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(0.0214894, -0.266704, 5.2112, 0.303578, -104.367, )
+                    ),
+#########################################################################################################
+            cms.PSet(fType      = cms.untracked.string("PFfcEta_BARRELH"),
+                     formula    = cms.untracked.string("[3]*((x-[0])^[1])+[2]"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(0., 2., 0., 1., )
+                    ),
+            cms.PSet(fType      = cms.untracked.string("PFfcEta_ENDCAPH"),
+                     formula    = cms.untracked.string("[3]*((x-[0])^[1])+[2]"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(0., 0., 0.05, 0., )
+                    ),
+            cms.PSet(fType      = cms.untracked.string("PFfdEta_ENDCAPH"),
+                     formula    = cms.untracked.string("[3]*((x-[0])^[1])+[2]"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(1.5, 4., -1.1, 1., )
+                    ),
+            cms.PSet(fType      = cms.untracked.string("PFfcEta_BARRELEH"),
+                     formula    = cms.untracked.string("[3]*((x-[0])^[1])+[2]"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(0., 2., 0., 1., )
+                    ),
+            cms.PSet(fType      = cms.untracked.string("PFfcEta_ENDCAPEH"),
+                     formula    = cms.untracked.string("[3]*((x-[0])^[1])+[2]"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(0., 0., 0., 0., )
+                    ),
+            cms.PSet(fType      = cms.untracked.string("PFfdEta_ENDCAPEH"),
+                     formula    = cms.untracked.string("[3]*((x-[0])^[1])+[2]"),
+                     limits     = cms.untracked.vdouble(0., 1000.),
+                     parameters = cms.untracked.vdouble(1.5, 2., 0.6, 1., )
+                    ),
+            
+            ),
+
+
+  read = cms.untracked.bool(True),
+  toRead = cms.untracked.vstring("PFfa_BARREL",
+                                 "PFfb_BARREL",
+                                 "PFfc_BARREL",
+                                 "PFfa_ENDCAP",
+                                 "PFfb_ENDCAP",
+                                 "PFfc_ENDCAP",
+                                 #### New Functions
+                                 "PFfaEta_BARRELEH",
+                                 "PFfbEta_BARRELEH",
+                                 "PFfaEta_ENDCAPEH",
+                                 "PFfbEta_ENDCAPEH",
+                                 "PFfaEta_BARRELH",
+                                 "PFfbEta_BARRELH",
+                                 "PFfaEta_ENDCAPH",
+                                 "PFfbEta_ENDCAPH",
+                                 #### Left older functions untouched for backward compatibility
+                                 "PFfaEta_BARREL",
+                                 "PFfbEta_BARREL",
+                                 "PFfaEta_ENDCAP",
+                                 "PFfbEta_ENDCAP",
+                                 
+                                 #### New functions by Bhumika on September 2018
+
+                                 "PFfcEta_BARRELH",
+                                 "PFfcEta_ENDCAPH",
+                                 "PFfdEta_ENDCAPH",
+                                 "PFfcEta_BARRELEH",
+                                 "PFfcEta_ENDCAPEH",
+                                 "PFfdEta_ENDCAPEH",
+
+
+                                 ) # same strings as fType
+)
+
+
+process.p = cms.Path(process.mywriter)
+
+from CondCore.DBCommon.CondDBCommon_cfi import CondDBCommon
+CondDBCommon.connect = "sqlite_file:PFCalibration.db"
+
+
+process.PoolDBOutputService = cms.Service("PoolDBOutputService",
+                                  CondDBCommon,
+                                  toPut = cms.VPSet(cms.PSet(record = cms.string('PFCalibrationRcd'),
+                                                             tag = cms.string('PFCalibration_v10_mc'),
+                                                             timetype   = cms.untracked.string('runnumber')
+                                                             )
+                                                             ),
+                                  loadBlobStreamer = cms.untracked.bool(False),
+                                  #    timetype   = cms.untracked.string('lumiid')
+                                  #    timetype   = cms.untracked.string('runnumber')
+                                  )
+
+process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
+#process.GlobalTag.globaltag = '90X_upgrade2017_realistic_v20'
+#process.GlobalTag.connect   = 'sqlite_file:/afs/cern.ch/user/c/cerminar/public/Alca/GlobalTag/GR_R_311_V2.db'
+process.GlobalTag.globaltag = '103X_upgrade2018_realistic_v8'
+
+process.GlobalTag.toGet = cms.VPSet(
+    cms.PSet(record = cms.string("PFCalibrationRcd"),
+             tag = cms.string("PFCalibration_v10_mc"),
+             connect = cms.string("sqlite_file:PFCalibration.db")
+             #connect = cms.untracked.string("sqlite_file:PFCalibration.db")
+             )
+    )
diff --git a/RecoParticleFlow/PFClusterTools/test/ProducePFCalibrationObject.cc b/RecoParticleFlow/PFClusterTools/test/ProducePFCalibrationObject.cc
new file mode 100644
index 0000000000000..c9c6346433d79
--- /dev/null
+++ b/RecoParticleFlow/PFClusterTools/test/ProducePFCalibrationObject.cc
@@ -0,0 +1,277 @@
+
+/*
+ *  See header file for a description of this class.
+ *
+ *  Original author G. Cerminara - CERN
+ *  Modified by  spandey/bkansal
+ */
+
+#include "ProducePFCalibrationObject.h"
+
+#include <iostream>
+#include <vector>
+#include "CondFormats/PhysicsToolsObjects/interface/PerformancePayloadFromTFormula.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "CondCore/DBOutputService/interface/PoolDBOutputService.h"
+
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+
+#include "CondFormats/DataRecord/interface/PFCalibrationRcd.h"
+
+
+#include "TF1.h"
+
+
+using namespace std;
+using namespace edm;
+
+ProducePFCalibrationObject::ProducePFCalibrationObject(const edm::ParameterSet& pSet) {
+  
+
+  read = pSet.getUntrackedParameter<bool>("read");
+  write = pSet.getUntrackedParameter<bool>("write");
+
+  fToWrite =  pSet.getParameter<vector<ParameterSet> >("toWrite");
+  fToRead =  pSet.getUntrackedParameter<vector<string> >("toRead");
+
+}
+
+ProducePFCalibrationObject::~ProducePFCalibrationObject(){}
+
+
+
+
+// void ProducePFCalibrationObject::beginJob() {
+void ProducePFCalibrationObject::beginRun(const edm::Run& run, const edm::EventSetup& eSetup) {
+
+  cout << "[ProducePFCalibrationObject] beginJob" << endl;
+
+
+
+  string record = "PFCalibrationRcd";
+
+  static map<string, PerformanceResult::ResultType> functType;
+  functType["PFfa_BARREL"] = PerformanceResult::PFfa_BARREL;
+  functType["PFfa_ENDCAP"] = PerformanceResult::PFfa_ENDCAP;
+  functType["PFfb_BARREL"] = PerformanceResult::PFfb_BARREL;
+  functType["PFfb_ENDCAP"] = PerformanceResult::PFfb_ENDCAP;
+  functType["PFfc_BARREL"] = PerformanceResult::PFfc_BARREL;
+  functType["PFfc_ENDCAP"] = PerformanceResult::PFfc_ENDCAP;
+  //New added functions for H/EH hadrons
+  functType["PFfaEta_BARRELH"] = PerformanceResult::PFfaEta_BARRELH;
+  functType["PFfaEta_ENDCAPH"] = PerformanceResult::PFfaEta_ENDCAPH;
+  functType["PFfbEta_BARRELH"] = PerformanceResult::PFfbEta_BARRELH;
+  functType["PFfbEta_ENDCAPH"] = PerformanceResult::PFfbEta_ENDCAPH;
+  functType["PFfaEta_BARRELEH"] = PerformanceResult::PFfaEta_BARRELEH;
+  functType["PFfaEta_ENDCAPEH"] = PerformanceResult::PFfaEta_ENDCAPEH;
+  functType["PFfbEta_BARRELEH"] = PerformanceResult::PFfbEta_BARRELEH;
+  functType["PFfbEta_ENDCAPEH"] = PerformanceResult::PFfbEta_ENDCAPEH;
+  //Left older functions untouched for backward compatibility 
+  functType["PFfaEta_BARREL"] = PerformanceResult::PFfaEta_BARREL;
+  functType["PFfaEta_ENDCAP"] = PerformanceResult::PFfaEta_ENDCAP;
+  functType["PFfbEta_BARREL"] = PerformanceResult::PFfbEta_BARREL;
+  functType["PFfbEta_ENDCAP"] = PerformanceResult::PFfbEta_ENDCAP;
+
+  functType["PFfcEta_BARRELH"] = PerformanceResult::PFfcEta_BARRELH;
+  functType["PFfcEta_ENDCAPH"] = PerformanceResult::PFfcEta_ENDCAPH;
+  functType["PFfdEta_ENDCAPH"] = PerformanceResult::PFfdEta_ENDCAPH;
+  functType["PFfcEta_BARRELEH"] = PerformanceResult::PFfcEta_BARRELEH;
+  functType["PFfcEta_ENDCAPEH"] = PerformanceResult::PFfcEta_ENDCAPEH;
+  functType["PFfdEta_ENDCAPEH"] = PerformanceResult::PFfdEta_ENDCAPEH;
+
+
+  // ---------------------------------------------------------------------------------
+  // Write the payload
+
+ 
+
+  if(write) {
+
+    vector<pair<float, float> > limitsToWrite;
+    vector<string> formulasToWrite;
+    vector<PerformanceResult::ResultType> resToWrite;
+    vector<BinningVariables::BinningVariablesType> binsToWrite;
+    binsToWrite.push_back(BinningVariables::JetEt);
+
+
+
+    // loop over all the pSets for the TF1 that we want to write to DB
+    for(vector<ParameterSet>::const_iterator fSetup = fToWrite.begin();
+	fSetup != fToWrite.end();
+	++fSetup) {
+
+      // read from cfg
+      string fType = (*fSetup).getUntrackedParameter<string>("fType");
+      //FIXME: should check that the give type exists
+      string formula = (*fSetup).getUntrackedParameter<string>("formula");
+      pair<float, float> limits = make_pair((*fSetup).getUntrackedParameter<vector<double> >("limits")[0],
+					    (*fSetup).getUntrackedParameter<vector<double> >("limits")[1]);
+      vector<double> parameters = (*fSetup).getUntrackedParameter<vector<double> >("parameters");
+    
+      TF1 *function = new TF1(fType.c_str(),  formula.c_str(), limits.first, limits.second);
+      for(unsigned int index = 0; index != parameters.size(); ++index) {
+	function->SetParameter(index, parameters[index]);
+      }
+
+      // write them in the containers for the storage
+      limitsToWrite.push_back(limits);
+      formulasToWrite.push_back(string(function->GetExpFormula("p").Data()));
+      resToWrite.push_back(functType[fType]);
+
+    }
+    
+
+    // create the actual object storing the functions
+    PhysicsTFormulaPayload allTFormulas(limitsToWrite, formulasToWrite);
+  
+    // put them in the container
+    PerformancePayloadFromTFormula * pfCalibrationFormulas =
+      new PerformancePayloadFromTFormula(resToWrite,
+					 binsToWrite,
+					 allTFormulas);
+
+  
+    // actually write to DB
+    edm::Service<cond::service::PoolDBOutputService> dbOut;
+    if(dbOut.isAvailable()) {
+      dbOut->writeOne<PerformancePayloadFromTFormula>(pfCalibrationFormulas, 1, record);
+    }
+
+  }
+
+
+  
+  
+  if(read) {
+    // ---------------------------------------------------------------------------------
+    // Read the objects
+    edm::ESHandle<PerformancePayload> perfH;
+    eSetup.get<PFCalibrationRcd>().get(perfH);
+
+    const PerformancePayloadFromTFormula *pfCalibrations = static_cast< const PerformancePayloadFromTFormula *>(perfH.product());
+
+    for(vector<string>::const_iterator name = fToRead.begin();
+	name != fToRead.end(); ++name) {
+
+      
+
+      cout << "Function: " << *name << endl;
+      PerformanceResult::ResultType fType = functType[*name];
+      pfCalibrations->printFormula(fType);
+
+      // evaluate it @ 10 GeV
+      float energy = 10.;
+      
+      BinningPointByMap point;
+      point.insert(BinningVariables::JetEt, energy);
+
+      if(pfCalibrations->isInPayload(fType, point)) {
+	float value = pfCalibrations->getResult(fType, point);
+	cout << "   Energy before:: " << energy << " after: " << value << endl;
+      } else cout <<  "outside limits!" << endl;
+
+    }
+  }
+  ///  if(pfCalibrationFormulas->isInPayload(etaBin, point)) {
+//     float value = pfCalibrationFormulas->getResult(etaBin, point);
+//     cout << "t: " << t << " eta: " << eta << " CalibObj: " <<
+//       value << endl;
+//   } else cout <<  "INVALID result!!!" << endl;
+
+
+//   TF1* faBarrel = new TF1("faBarrel","[0]+([1]+[2]/sqrt(x))*exp(-x/[3])-[4]*exp(-x*x/[5])",1.,1000.);
+
+//   faBarrel->SetParameter(0,1.10772);
+//   faBarrel->SetParameter(1,0.186273);
+//   faBarrel->SetParameter(2,-0.47812);
+//   faBarrel->SetParameter(3,62.5754);
+//   faBarrel->SetParameter(4,1.31965);
+//   faBarrel->SetParameter(5,35.2559);
+
+//   // faBarrel->GetExpFormula("p").Data()
+//   TF1 * faEndcap = new TF1("faEndcap","[0]+([1]+[2]/sqrt(x))*exp(-x/[3])-[4]*exp(-x*x/[5])",1.,1000.);
+//   faEndcap->SetParameter(0,1.0877);
+//   faEndcap->SetParameter(1,0.28939);
+//   faEndcap->SetParameter(2,-0.57635);
+//   faEndcap->SetParameter(3,86.5501);
+//   faEndcap->SetParameter(4,1.02296);
+//   faEndcap->SetParameter(5,64.0116);
+
+//   std::vector< std::pair<float, float> > limits;
+//   limits.push_back(make_pair(0,99999999));
+//   //  limits.push_back(make_pair(0,1.48 ));
+
+//   limits.push_back(make_pair(0,99999999));
+//   //  limits.push_back(make_pair(1.48,5));
+
+
+
+//   std::vector<std::string> formulas;
+//   formulas.push_back(string(faBarrel->GetExpFormula("p").Data()));
+//   formulas.push_back(string(faEndcap->GetExpFormula("p").Data()));
+
+//   std::vector<PerformanceResult::ResultType> res;
+//   res.push_back(PerformanceResult::PFfa_BARREL);
+//   res.push_back(PerformanceResult::PFfa_ENDCAP);
+		   
+//   std::vector<BinningVariables::BinningVariablesType> bin;
+//   bin.push_back(BinningVariables::JetEt);
+//   //  bin.push_back(BinningVariables::JetAbsEta);
+
+//   bin.push_back(BinningVariables::JetEt);
+//   //  bin.push_back(BinningVariables::JetAbsEta);
+
+  
+//   PhysicsTFormulaPayload ppl(limits, formulas);
+// //   PerformanceResult::PFfa_BARREL
+    
+//   PerformancePayloadFromTFormula * pfCalibrationFormulas =
+//     new PerformancePayloadFromTFormula(res,
+// 				       bin,
+// 				       ppl);
+  
+
+//   double t = 10.;
+//   double eta = 2.1;
+
+//   BinningPointByMap point;
+//   point.insert(BinningVariables::JetEt, t);
+//   //point.insert(BinningVariables::JetAbsEta, eta);
+
+//   PerformanceResult::ResultType etaBin;
+
+
+//   if(fabs(eta) < 1.48 ) {
+//     // this is the barrel
+//     etaBin = PerformanceResult::PFfa_BARREL;
+//     cout << " f_barrel(a): " << faBarrel->Eval(t) << endl;
+
+
+//   } else {
+//     // this is the endcap
+//     etaBin = PerformanceResult::PFfa_BARREL;
+//     cout << " f_endcap(a): " << faEndcap->Eval(t) << endl;
+    
+// //     if(pfCalibrationFormulas->isInPayload(PerformanceResult::PFfa_ENDCAP, point)){
+// //       float value = pfCalibrationFormulas->getResult(PerformanceResult::PFfa_ENDCAP, point);
+// //       cout << "t: " << t << " eta: " << eta << " f_endcap(a): " << faEndcap->Eval(t) << " CalibObj: " <<
+// // 	value << endl;
+// //     } else cout <<  "INVALID result!!!" << endl;
+//   }
+
+//   if(pfCalibrationFormulas->isInPayload(etaBin, point)) {
+//     float value = pfCalibrationFormulas->getResult(etaBin, point);
+//     cout << "t: " << t << " eta: " << eta << " CalibObj: " <<
+//       value << endl;
+//   } else cout <<  "INVALID result!!!" << endl;
+
+  
+
+
+}
+
+     
+#include "FWCore/Framework/interface/MakerMacros.h"
+
+DEFINE_FWK_MODULE(ProducePFCalibrationObject);
diff --git a/RecoParticleFlow/PFClusterTools/test/ProducePFCalibrationObject.h b/RecoParticleFlow/PFClusterTools/test/ProducePFCalibrationObject.h
new file mode 100644
index 0000000000000..602a7704e48ae
--- /dev/null
+++ b/RecoParticleFlow/PFClusterTools/test/ProducePFCalibrationObject.h
@@ -0,0 +1,46 @@
+#ifndef ProducePFCalibrationObject_H
+#define ProducePFCalibrationObject_H
+
+/** \class ProducePFCalibrationObject
+ *  
+ *  
+ *  This is used by ProducePFCalibration.py config to 
+ *  generate payload for offline and HLT PF hadron calibration.
+ *  
+ *  \Original author G. Cerminara - CERN
+ */
+
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+
+#include <vector>
+#include <string>
+
+class ProducePFCalibrationObject  : public edm::EDAnalyzer {
+public:
+  /// Constructor
+  ProducePFCalibrationObject(const edm::ParameterSet&);
+
+  /// Destructor
+  virtual ~ProducePFCalibrationObject();
+
+  // Operations
+//   virtual void beginJob();
+  virtual void beginRun(const edm::Run& run, const edm::EventSetup& eSetup);
+  
+  virtual void analyze(const edm::Event&, const edm::EventSetup&) {}
+  virtual void endJob() {}
+
+protected:
+
+private:
+
+  bool read;
+  bool write;
+
+  std::vector<edm::ParameterSet> fToWrite;
+  std::vector<std::string> fToRead;
+
+};
+#endif
+
diff --git a/RecoParticleFlow/PFProducer/interface/KDTreeLinkerAlgo.h b/RecoParticleFlow/PFProducer/interface/KDTreeLinkerAlgo.h
deleted file mode 100644
index 37f02e2690b1c..0000000000000
--- a/RecoParticleFlow/PFProducer/interface/KDTreeLinkerAlgo.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef KDTreeLinkerAlgo_h
-#define KDTreeLinkerAlgo_h
-
-#include "RecoParticleFlow/PFProducer/interface/KDTreeLinkerTools.h"
-
-#include <vector>
-
-// Class that implements the KDTree partition of 2D space and 
-// a closest point search algorithme.
-class KDTreeLinkerAlgo
-{
- public:
-  KDTreeLinkerAlgo();
-  
-  // Dtor calls clear()
-  ~KDTreeLinkerAlgo();
-  
-  // Here we build the KD tree from the "eltList" in the space define by "region".
-  void build(std::vector<KDTreeNodeInfo>	&eltList,
-	     const KDTreeBox			&region);
-  
-  // Here we search in the KDTree for all points that would be 
-  // contained in the given searchbox. The founded points are stored in resRecHitList.
-  void search(const KDTreeBox			&searchBox,
-	      std::vector<KDTreeNodeInfo>	&resRecHitList);
-  
-  // This method clears all allocated structures.
-  void clear();
-  
- private:
-  // The KDTree root
-  KDTreeNode*	root_;
-  
-  // The node pool allow us to do just 1 call to new for each tree building.
-  KDTreeNode*	nodePool_;
-  int		nodePoolSize_;
-  int		nodePoolPos_;
-
- private:
-  // Basic swap function.
-  void swap(KDTreeNodeInfo &e1, KDTreeNodeInfo &e2);
-
-  // Get next node from the node pool.
-  KDTreeNode* getNextNode();
-
-  //Fast median search with Wirth algorithm in eltList between low and high indexes.
-  int medianSearch(std::vector<KDTreeNodeInfo>	&eltList,
-		   int				low,
-		   int				high,
-		   int				treeDepth);
-
-  // Recursif kdtree builder. Is called by build()
-  KDTreeNode *recBuild(std::vector<KDTreeNodeInfo>	&eltList, 
-		       int				low,
-		       int				hight,
-		       int				depth,
-		       const KDTreeBox&			region);
-
-  // Recursif kdtree search. Is called by search()
-  void recSearch(const KDTreeNode		*current,
-		 const KDTreeBox		&trackBox,
-		 std::vector<KDTreeNodeInfo>	&recHits);    
-
-  // Add all elements of an subtree to the closest elements. Used during the recSearch().
-  void addSubtree(const KDTreeNode		*current, 
-		  std::vector<KDTreeNodeInfo>	&recHits);
-
-  // This method frees the KDTree.     
-  void clearTree();
-};
-
-#endif
diff --git a/RecoParticleFlow/PFProducer/interface/KDTreeLinkerBase.h b/RecoParticleFlow/PFProducer/interface/KDTreeLinkerBase.h
index 379606f2ef49c..f790076aa4091 100644
--- a/RecoParticleFlow/PFProducer/interface/KDTreeLinkerBase.h
+++ b/RecoParticleFlow/PFProducer/interface/KDTreeLinkerBase.h
@@ -3,8 +3,17 @@
 
 #include "DataFormats/ParticleFlowReco/interface/PFRecHitFraction.h"
 #include "DataFormats/ParticleFlowReco/interface/PFBlockElement.h"
+#include "DataFormats/ParticleFlowReco/interface/PFRecHit.h"
 
 #include <vector>
+#include <map>
+#include <set>
+
+using BlockEltSet = std::set<reco::PFBlockElement *>;
+using RecHitSet = std::set<const reco::PFRecHit *>;
+
+using RecHit2BlockEltMap = std::map<const reco::PFRecHit *, BlockEltSet>;
+using BlockElt2BlockEltMap = std::map<reco::PFBlockElement *, BlockEltSet>;
 
 class KDTreeLinkerBase
 {
diff --git a/RecoParticleFlow/PFProducer/interface/KDTreeLinkerTools.h b/RecoParticleFlow/PFProducer/interface/KDTreeLinkerTools.h
deleted file mode 100644
index f6bccc82b9120..0000000000000
--- a/RecoParticleFlow/PFProducer/interface/KDTreeLinkerTools.h
+++ /dev/null
@@ -1,95 +0,0 @@
-#ifndef KDTreeLinkerTools_h
-#define KDTreeLinkerTools_h
-
-#include "DataFormats/ParticleFlowReco/interface/PFRecHit.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElement.h"
-
-#include <map>
-#include <set>
-
-typedef std::set<reco::PFBlockElement*>				BlockEltSet; 
-typedef std::set<const reco::PFRecHit*>				RecHitSet;
-
-typedef std::map<const reco::PFRecHit*, BlockEltSet>		RecHit2BlockEltMap;
-typedef std::map<reco::PFBlockElement*, BlockEltSet>		BlockElt2BlockEltMap;
-
-
-// Box structure used to define 2D field.
-// It's used in KDTree building step to divide the detector
-// space (ECAL, HCAL...) and in searching step to create a bounding
-// box around the demanded point (Track collision point, PS projection...).
-struct KDTreeBox
-{
-  double dim1min, dim1max;
-  double dim2min, dim2max;
-  
-  public:
-
-  KDTreeBox(double d1min, double d1max, 
-	    double d2min, double d2max)
-    : dim1min (d1min), dim1max(d1max)
-    , dim2min (d2min), dim2max(d2max)
-  {}
-
-  KDTreeBox()
-    : dim1min (0), dim1max(0)
-    , dim2min (0), dim2max(0)
-  {}
-};
-
-  
-// Data stored in each KDTree node.
-// The dim1/dim2 fields are usually the duplication of some PFRecHit values
-// (eta/phi or x/y). But in some situations, phi field is shifted by +-2.Pi
-struct KDTreeNodeInfo 
-{
-  const reco::PFRecHit *ptr;
-  double dim1;
-  double dim2;
-  
-  public:
-  KDTreeNodeInfo()
-    : ptr(nullptr)
-  {}
-  
-  KDTreeNodeInfo(const reco::PFRecHit	*rhptr,
-		 double			d1,
-		 double			d2)
-    : ptr(rhptr), dim1(d1), dim2(d2)
-  {}  
-};
-
-
-// KDTree node.
-struct KDTreeNode
-{
-  // Data
-  KDTreeNodeInfo rh;
-  
-  // Right/left sons.
-  KDTreeNode *left, *right;
-  
-  // Region bounding box.
-  KDTreeBox region;
-  
-  public:
-  KDTreeNode()
-    : left(nullptr), right(nullptr)
-  {}
-  
-  void setAttributs(const KDTreeBox&		regionBox,
-		    const KDTreeNodeInfo&	rhinfo) 
-  {
-    rh = rhinfo;
-    region = regionBox;
-  }
-  
-  void setAttributs(const KDTreeBox&   regionBox) 
-  {
-    region = regionBox;
-  }
-};
-
-
-
-#endif
diff --git a/RecoParticleFlow/PFProducer/interface/PFAlgo.h b/RecoParticleFlow/PFProducer/interface/PFAlgo.h
index 88d272e4debf8..46e55fe22634e 100644
--- a/RecoParticleFlow/PFProducer/interface/PFAlgo.h
+++ b/RecoParticleFlow/PFProducer/interface/PFAlgo.h
@@ -27,10 +27,13 @@
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
 #include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
+#include "DataFormats/Common/interface/ValueMap.h"
+
 #include "RecoParticleFlow/PFProducer/interface/PFCandConnector.h"
 #include "RecoParticleFlow/PFProducer/interface/PFMuonAlgo.h"
 #include "RecoParticleFlow/PFProducer/interface/PFEGammaFilters.h"
-#include "DataFormats/Common/interface/ValueMap.h"
+#include "RecoParticleFlow/PFProducer/interface/PFElectronAlgo.h"
+#include "RecoParticleFlow/PFProducer/interface/PFPhotonAlgo.h"
 
 /// \brief Particle Flow Algorithm
 /*!
@@ -42,8 +45,6 @@
 class PFEnergyCalibration;
 class PFSCEnergyCalibration;
 class PFEnergyCalibrationHF;
-class PFElectronAlgo;
-class PFPhotonAlgo;
 class PFMuonAlgo;
 
 class PFAlgo {
@@ -51,16 +52,12 @@ class PFAlgo {
  public:
 
   /// constructor
-  PFAlgo();
-
-  /// destructor
-  ~PFAlgo();
+  PFAlgo(bool debug);
 
   void setHOTag(bool ho) { useHO_ = ho;}
   void setAlgo( int algo ) {algo_ = algo;}
   void setPFMuonAlgo(PFMuonAlgo* algo) {pfmu_ =algo;}
   void setMuonHandle(const edm::Handle<reco::MuonCollection>&);
-  void setDebug( bool debug ) {debug_ = debug; connector_.setDebug(debug_); }
 
   void setParameters(double nSigmaECAL,
                      double nSigmaHCAL, 
@@ -207,9 +204,9 @@ class PFAlgo {
     return std::move(pfCleanedCandidates_);
   }
   
-    /// \return unique_ptr to the collection of candidates (transfers ownership)
-  std::unique_ptr< reco::PFCandidateCollection> transferCandidates() {
-    return connector_.connect(pfCandidates_);
+  /// \return the collection of candidates
+  reco::PFCandidateCollection transferCandidates() {
+    return connector_.connect(*pfCandidates_);
   }
   
   /// return the pointer to the calibration function
@@ -312,7 +309,7 @@ class PFAlgo {
 
   bool               useHO_;
   int                algo_;
-  bool               debug_;
+  const bool         debug_;
 
   /// Variables for PFElectrons
   std::string mvaWeightFileEleID_;
@@ -331,8 +328,8 @@ class PFAlgo {
   double sumPtTrackIsoForEgammaSC_endcap_;
   double coneTrackIsoForEgammaSC_;
   unsigned int nTrackIsoForEgammaSC_;
-  PFElectronAlgo *pfele_;
-  PFPhotonAlgo *pfpho_;
+  std::unique_ptr<PFElectronAlgo> pfele_;
+  std::unique_ptr<PFPhotonAlgo> pfpho_;
   PFMuonAlgo *pfmu_;
 
 
diff --git a/RecoParticleFlow/PFProducer/interface/PFBlockAlgo.h b/RecoParticleFlow/PFProducer/interface/PFBlockAlgo.h
index 614ffc850d7ad..875743ea8e861 100644
--- a/RecoParticleFlow/PFProducer/interface/PFBlockAlgo.h
+++ b/RecoParticleFlow/PFProducer/interface/PFBlockAlgo.h
@@ -1,68 +1,20 @@
 #ifndef RecoParticleFlow_PFProducer_PFBlockAlgo_h
 #define RecoParticleFlow_PFProducer_PFBlockAlgo_h 
 
-#include <set>
-#include <vector>
-#include <iostream>
-
-// #include "FWCore/Framework/interface/Handle.h"
-#include "DataFormats/Common/interface/Handle.h"
-// #include "FWCore/Framework/interface/OrphanHandle.h"
-#include "DataFormats/Common/interface/OrphanHandle.h"
-
-
-#include "DataFormats/ParticleFlowReco/interface/PFClusterFwd.h"
-#include "DataFormats/ParticleFlowReco/interface/PFRecTrackFwd.h"
-#include "DataFormats/ParticleFlowReco/interface/PFCluster.h"
-#include "DataFormats/ParticleFlowReco/interface/PFRecTrack.h"
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedTrackerVertex.h" // gouzevitch
-#include "DataFormats/ParticleFlowReco/interface/PFConversionFwd.h"
-#include "DataFormats/ParticleFlowReco/interface/PFConversion.h"
-#include "DataFormats/ParticleFlowReco/interface/PFV0Fwd.h"
-#include "DataFormats/ParticleFlowReco/interface/PFV0.h"
-#include "DataFormats/ParticleFlowReco/interface/GsfPFRecTrack.h"
-#include "DataFormats/ParticleFlowReco/interface/GsfPFRecTrackFwd.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBrem.h"
-#include "DataFormats/ParticleFlowReco/interface/PFTrajectoryPoint.h"
-
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElement.h"
 #include "DataFormats/ParticleFlowReco/interface/PFBlock.h"
+#include "DataFormats/ParticleFlowReco/interface/PFBlockElement.h"
 #include "DataFormats/ParticleFlowReco/interface/PFBlockFwd.h"
-
-// Glowinski & Gouzevitch
-#include "DataFormats/ParticleFlowReco/interface/PFRecHit.h"             
-#include "RecoParticleFlow/PFProducer/interface/KDTreeLinkerBase.h" 
-// !Glowinski & Gouzevitch
-
-// #include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
-
-#include "RecoParticleFlow/PFProducer/interface/PFMuonAlgo.h"
-#include "RecoParticleFlow/PFProducer/interface/PhotonSelectorAlgo.h"
-#include "RecoParticleFlow/PFProducer/interface/PFBlockElementSCEqual.h"
-#include "RecoParticleFlow/PFClusterTools/interface/PFResolutionMap.h"
-
-#include "DataFormats/MuonReco/interface/MuonFwd.h"
-#include "DataFormats/MuonReco/interface/Muon.h"
-#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
-#include "DataFormats/EgammaReco/interface/SuperCluster.h"
-#include "DataFormats/GsfTrackReco/interface/GsfTrackFwd.h"
-#include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
-#include "DataFormats/EgammaReco/interface/ElectronSeedFwd.h"
-#include "DataFormats/EgammaReco/interface/ElectronSeed.h"
-#include "DataFormats/EgammaCandidates/interface/PhotonFwd.h"
-#include "DataFormats/EgammaCandidates/interface/Photon.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementSuperCluster.h"
-
-#include "RecoParticleFlow/PFClusterTools/interface/ClusterClusterMapping.h"
-
-#include "RecoParticleFlow/PFProducer/interface/PFBlockLink.h"
-
-#include "RecoParticleFlow/PFProducer/interface/BlockElementLinkerBase.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "RecoParticleFlow/PFProducer/interface/BlockElementImporterBase.h"
+#include "RecoParticleFlow/PFProducer/interface/BlockElementLinkerBase.h"
+#include "RecoParticleFlow/PFProducer/interface/KDTreeLinkerBase.h"
+#include "DataFormats/Common/interface/OwnVector.h"
 
-#include <map>
+#include <memory>
+#include <string>
 #include <unordered_map>
-#include <unordered_set>
+#include <vector>
 
 namespace std {
   template<>
@@ -73,13 +25,6 @@ namespace std {
       return arg.first ^ (arg.second << 1);
     }
   };
-  template<>
-    struct equal_to<std::pair<unsigned int,unsigned int> > {
-    typedef std::pair<unsigned int,unsigned int> arg_type;    
-    bool operator()(const arg_type& arg1, const arg_type& arg2) const {
-      return ( (arg1.first == arg2.first) & (arg1.second == arg2.second) );
-    }
-  };
 }
 
 /// \brief Particle Flow Algorithm
@@ -93,13 +38,6 @@ class PFBlockAlgo {
  public:
   // the element list should **always** be a list of (smart) pointers
   typedef std::vector<std::unique_ptr<reco::PFBlockElement> > ElementList;
-  typedef std::unique_ptr<BlockElementImporterBase> ImporterPtr;
-  typedef std::unique_ptr<BlockElementLinkerBase> LinkTestPtr;  
-  typedef std::unique_ptr<KDTreeLinkerBase> KDTreePtr;
-  /// define these in *Fwd files in DataFormats/ParticleFlowReco?
-  typedef ElementList::iterator IE;
-  typedef ElementList::const_iterator IEC;  
-  typedef reco::PFBlockCollection::const_iterator IBC;
   //for skipping ranges
   typedef std::array<std::pair<unsigned int,unsigned int>,reco::PFBlockElement::kNBETypes> ElementRanges;
   
@@ -129,17 +67,11 @@ class PFBlockAlgo {
   /// compute missing links in the blocks 
   /// (the recursive procedure does not build all links)  
   void packLinks(reco::PFBlock& block, 
-		 const std::unordered_map<std::pair<unsigned int,unsigned int>,PFBlockLink>& links) const; 
+		 const std::unordered_map<std::pair<unsigned int,unsigned int>,double>& links) const; 
   
-  /// Avoid to check links when not useful
-  inline bool linkPrefilter(const reco::PFBlockElement* last, 
-			    const reco::PFBlockElement* next) const;
-
-  /// check whether 2 elements are linked. Returns distance and linktype
+  /// check whether 2 elements are linked. Returns distance
   inline void link( const reco::PFBlockElement* el1, 
 		    const reco::PFBlockElement* el2, 
-		    PFBlockLink::Type& linktype, 
-		    reco::PFBlock::LinkTest& linktest,
 		    double& dist) const;
   
   // the test elements will be transferred to the blocks
@@ -152,22 +84,14 @@ class PFBlockAlgo {
   friend std::ostream& operator<<(std::ostream&, const PFBlockAlgo&);
   bool useHO_;
 
-  std::vector<ImporterPtr> importers_;
+  std::vector<std::unique_ptr<BlockElementImporterBase>> importers_;
 
   const std::unordered_map<std::string,reco::PFBlockElement::Type> 
     elementTypes_;
-  std::vector<LinkTestPtr> linkTests_;
+  std::vector<std::unique_ptr<BlockElementLinkerBase>> linkTests_;
   unsigned int linkTestSquare_[reco::PFBlockElement::kNBETypes][reco::PFBlockElement::kNBETypes];
   
-  std::vector<KDTreePtr> kdtrees_;
+  std::vector<std::unique_ptr<KDTreeLinkerBase>> kdtrees_;
 };
 
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementGsfTrack.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementBrem.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementTrack.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlockElementCluster.h"
-#include "DataFormats/ParticleFlowReco/interface/PFLayer.h"
-
 #endif
-
-
diff --git a/RecoParticleFlow/PFProducer/interface/PFBlockElementSCEqual.h b/RecoParticleFlow/PFProducer/interface/PFBlockElementSCEqual.h
index 71f822580d13d..469d466a395d2 100644
--- a/RecoParticleFlow/PFProducer/interface/PFBlockElementSCEqual.h
+++ b/RecoParticleFlow/PFProducer/interface/PFBlockElementSCEqual.h
@@ -3,12 +3,10 @@
 
 #include "DataFormats/ParticleFlowReco/interface/PFBlockElementSuperCluster.h"
 #include "DataFormats/ParticleFlowReco/interface/PFBlockElement.h"
-//#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
 
 class PFBlockElementSCEqual {
  public:
   PFBlockElementSCEqual(reco::SuperClusterRef scRef):ref_(scRef) {;}
-    ~PFBlockElementSCEqual(){;}
     inline bool operator() (const std::unique_ptr<reco::PFBlockElement>& el) {
       return (el->type()==reco::PFBlockElement::SC && (static_cast<const reco::PFBlockElementSuperCluster*>(el.get()))->superClusterRef()==ref_);
     }
@@ -20,5 +18,3 @@ class PFBlockElementSCEqual {
 };
 
 #endif
-
-
diff --git a/RecoParticleFlow/PFProducer/interface/PFBlockLink.h b/RecoParticleFlow/PFProducer/interface/PFBlockLink.h
deleted file mode 100644
index 0e970ecfe7ad6..0000000000000
--- a/RecoParticleFlow/PFProducer/interface/PFBlockLink.h
+++ /dev/null
@@ -1,113 +0,0 @@
-#ifndef RecoParticleFlow_PFAlgo_PFBlockLink_h
-#define RecoParticleFlow_PFAlgo_PFBlockLink_h 
-
-#include <vector>
-#include "DataFormats/ParticleFlowReco/interface/PFBlock.h"
-
-/// \brief link between 2 elements
-///
-/// \author Colin Bernet
-/// \date March 2006
-class PFBlockLink {
-
- public:
-    
-  /// possible types. WARNING: have a look at PFBlockElement
-  enum Type {
-    NONE=0,
-    ECALandECAL=0x8,
-    TRACKandECAL=0x9,
-    TRACKandHCAL=0x11,
-    ECALandHCAL=0x18,
-    PS1andECAL=0xA,
-    PS2andECAL = 0xC,
-    TRACKandPS1 = 0x3,
-    TRACKandPS2 = 0x5,
-    PS1andPS2 = 0x6,
-    TRACKandTRACK = 0x1,
-    ECALandGSF = 0x28,
-    HCALandGSF = 0x30,
-    TRACKandGSF = 0x21,
-    GSFandBREM =0x60,
-    GSFandGSF = 0x20,
-    ECALandBREM = 0x48,
-    HCALandBREM = 0x50,
-    PS1andGSF = 0x22,
-    PS2andGSF = 0x24,
-    PS1andBREM = 0x42,
-    PS2andBREM = 0x44,
-    HFEMandHFHAD = 0x180,
-    SCandECAL = 0x208,
-    TRACKandHO= 0x401,
-    HCALandHO= 0x410
-  };
-  
-  /// default constructor
-  /// \todo not sure it's useful
-  PFBlockLink() : 
-    type_(NONE), 
-    test_(reco::PFBlock::LINKTEST_RECHIT),
-    dist_(0),
-    element1_( 0 ), 
-    element2_( 0 ) {}  
-  
-  /// standard constructor
-  PFBlockLink(Type type, 
-	      reco::PFBlock::LinkTest test,
-	      double dist,
-	      unsigned elem1, 
-	      unsigned elem2) 
-    :  
-    type_(type), 
-    test_(test), 
-    dist_(dist),
-    element1_(elem1), 
-    element2_(elem2) {}
-  
-  
-  /// \return index to neighbouring element
-  unsigned neighbour(unsigned elem) const {
-    if( elem == element1_ ) return element2_;
-    else if(elem == element2_ ) return element1_;
-    else return elem;
-  }
-
-  /// \return the type
-  Type type() const {return type_;}  
-
-  /// \return the test: test used to compute the 
-  /// value of the distance
-  reco::PFBlock::LinkTest test() const {return test_;}  
-  
-  /// \return the distance
-  double dist() const {return dist_;}
-  
-  /// \return index to first element
-  unsigned element1() const {return element1_;}
-  
-  /// \return index to second element
-  unsigned element2() const {return element2_;}
-  
-  
-  /// print the link
-  friend std::ostream& operator<<(std::ostream& out, const PFBlockLink& l); 
-  
- private:
-  /// type of the link
-  Type    type_;
-  
-  /// type of test
-  reco::PFBlock::LinkTest test_;
-
-  /// distance of the link
-  double dist_;
-  
-  /// element 1
-  unsigned  element1_;
-
-  /// element 2
-  unsigned  element2_;
-  
-};  
-
-#endif
diff --git a/RecoParticleFlow/PFProducer/interface/PFCandConnector.h b/RecoParticleFlow/PFProducer/interface/PFCandConnector.h
index 114d7018cac83..ec05f08b46fb3 100644
--- a/RecoParticleFlow/PFProducer/interface/PFCandConnector.h
+++ b/RecoParticleFlow/PFProducer/interface/PFCandConnector.h
@@ -17,9 +17,9 @@ class PFCandConnector {
     
     public :
        
-       PFCandConnector( ) { 
-	 pfC_ = std::make_unique<reco::PFCandidateCollection>(); 
-	 debug_ = false;
+       PFCandConnector(bool debug=false)
+       : debug_(debug)
+       { 
 	 bCorrect_ = false;
 	 bCalibPrimary_ =  false;
 
@@ -61,21 +61,20 @@ class PFCandConnector {
 
 
        void setParameters(bool bCorrect, bool bCalibPrimary, double dptRel_PrimaryTrack, double dptRel_MergedTrack, double ptErrorSecondary, const std::vector<double>& nuclCalibFactors);
-       void setDebug( bool debug ) {debug_ = debug;}
 
        
 
-       std::unique_ptr<reco::PFCandidateCollection> connect(std::unique_ptr<reco::PFCandidateCollection>& pfCand);
+       reco::PFCandidateCollection connect(reco::PFCandidateCollection& pfCand) const;
 
        
  
     private :
 
        /// Analyse nuclear interactions where a primary or merged track is present
-       void analyseNuclearWPrim(std::unique_ptr<reco::PFCandidateCollection>&, unsigned int);
+       void analyseNuclearWPrim(reco::PFCandidateCollection&, std::vector<bool> &, unsigned int) const;
 
        /// Analyse nuclear interactions where a secondary track is present
-       void analyseNuclearWSec(std::unique_ptr<reco::PFCandidateCollection>&, unsigned int);
+       void analyseNuclearWSec(reco::PFCandidateCollection&, std::vector<bool> &, unsigned int) const;
 
        bool isPrimaryNucl( const reco::PFCandidate& pf ) const;
 
@@ -84,13 +83,8 @@ class PFCandConnector {
        /// Return a calibration factor for a reconstructed nuclear interaction
        double rescaleFactor( const double pt, const double cFrac ) const;
 
-       /// Collection of primary PFCandidates to be transmitted to the Event
-       std::unique_ptr<reco::PFCandidateCollection> pfC_;
-       /// A mask to define the candidates which shall not be transmitted
-       std::vector<bool> bMask_;
-
        /// Parameters
-       bool debug_;
+       const bool debug_;
        bool bCorrect_;
 
        /// Calibration parameters for the reconstructed nuclear interactions
diff --git a/RecoParticleFlow/PFProducer/interface/PFEGammaAlgo.h b/RecoParticleFlow/PFProducer/interface/PFEGammaAlgo.h
index a4c7a668a2430..5195824227a18 100644
--- a/RecoParticleFlow/PFProducer/interface/PFEGammaAlgo.h
+++ b/RecoParticleFlow/PFProducer/interface/PFEGammaAlgo.h
@@ -79,9 +79,8 @@ class PFEGammaAlgo {
     float > KFValMap;  
     
   struct ProtoEGObject {
-    ProtoEGObject() : parentSC(nullptr) {}
     reco::PFBlockRef parentBlock;
-    const PFSCElement* parentSC; // if ECAL driven
+    const PFSCElement* parentSC = nullptr; // if ECAL driven
     reco::ElectronSeedRef electronSeed; // if there is one
     // this is a mutable list of clusters
     // if ECAL driven we take the PF SC and refine it
@@ -117,8 +116,6 @@ class PFEGammaAlgo {
 
   //constructor
   PFEGammaAlgo(const PFEGConfigInfo&);
-  //destructor
-  ~PFEGammaAlgo(){ };
 
   void setEEtoPSAssociation(EEtoPSAssociation const& eetops) { eetops_ = &eetops; }
 
@@ -134,9 +131,6 @@ class PFEGammaAlgo {
     cfg_.primaryVtx = & primary;
   }
 
-  void RunPFEG(const pfEGHelpers::HeavyObjectCache* hoc,
-               const reco::PFBlockRef&  blockRef);
-  
   //get PFCandidate collection
   reco::PFCandidateCollection& getCandidates() {return outcands_;}
 
@@ -145,6 +139,10 @@ class PFEGammaAlgo {
   
   //get refined SCs
   reco::SuperClusterCollection& getRefinedSCs() {return refinedscs_;}
+
+  // this runs the functions below
+  void buildAndRefineEGObjects(const pfEGHelpers::HeavyObjectCache* hoc,
+                               const reco::PFBlockRef& block);
   
 private: 
   
@@ -178,9 +176,6 @@ class PFEGammaAlgo {
   std::list<ProtoEGObject> _refinableObjects;
 
   // functions:
-  // this runs the functions below
-  void buildAndRefineEGObjects(const pfEGHelpers::HeavyObjectCache* hoc,
-                               const reco::PFBlockRef& block);
 
   // build proto eg object using all available unflagged resources in block.
   // this will be kind of like the old 'SetLinks' but with simplified and 
@@ -259,14 +254,6 @@ class PFEGammaAlgo {
 
   bool isPrimaryTrack(const reco::PFBlockElementTrack& KfEl,
 		      const reco::PFBlockElementGsfTrack& GsfEl);  
-  
- 
-  //std::vector<double> BDToutput_;
-  //std::vector<reco::PFCandidateElectronExtra > electronExtra_;
-  std::vector<bool> lockExtraKf_;
-  std::vector<bool> GsfTrackSingleEcal_;
-  std::vector< std::pair <unsigned int, unsigned int> > fifthStepKfTrack_;
-  std::vector< std::pair <unsigned int, unsigned int> > convGsfTrack_;
 
   PFEGConfigInfo cfg_;
 
diff --git a/RecoParticleFlow/PFProducer/interface/PFElectronExtraEqual.h b/RecoParticleFlow/PFProducer/interface/PFElectronExtraEqual.h
index b7dc126199522..391e594493b6c 100644
--- a/RecoParticleFlow/PFProducer/interface/PFElectronExtraEqual.h
+++ b/RecoParticleFlow/PFProducer/interface/PFElectronExtraEqual.h
@@ -8,7 +8,6 @@
 class PFElectronExtraEqual {
  public:
   PFElectronExtraEqual(const reco::GsfTrackRef & gsfTrackRef):ref_(gsfTrackRef) {;}
-    ~PFElectronExtraEqual(){;}
     inline bool operator() (const reco::PFCandidateElectronExtra & extra) {
       return (ref_==extra.gsfTrackRef());
     }
@@ -16,16 +15,4 @@ class PFElectronExtraEqual {
     reco::GsfTrackRef ref_;
 };
 
-class PFElectronExtraKfEqual {
- public:
-  PFElectronExtraKfEqual(const reco::TrackRef & trackRef):ref_(trackRef) {;}
-    ~PFElectronExtraKfEqual(){;}
-    inline bool operator() (const reco::PFCandidateElectronExtra & extra) {
-      return (ref_==extra.kfTrackRef());
-    }
- private:
-    reco::TrackRef ref_;
-};
-
-
 #endif
diff --git a/RecoParticleFlow/PFProducer/plugins/BuildFile.xml b/RecoParticleFlow/PFProducer/plugins/BuildFile.xml
index c000d79be04e6..59332d422eca2 100644
--- a/RecoParticleFlow/PFProducer/plugins/BuildFile.xml
+++ b/RecoParticleFlow/PFProducer/plugins/BuildFile.xml
@@ -1,4 +1,5 @@
 <library   name="RecoParticleFlowPFProducerPlugins_kdtrees" file="kdtrees/*.cc">
+  <use   name="CommonTools/RecoAlgos"/>
   <use   name="CondFormats/DataRecord"/>
   <use   name="CondFormats/PhysicsToolsObjects"/>
   <use   name="DataFormats/CaloRecHit"/>
diff --git a/RecoParticleFlow/PFProducer/plugins/PFBlockProducer.cc b/RecoParticleFlow/PFProducer/plugins/PFBlockProducer.cc
index cae35887ad7bd..db8091fd3d8ea 100644
--- a/RecoParticleFlow/PFProducer/plugins/PFBlockProducer.cc
+++ b/RecoParticleFlow/PFProducer/plugins/PFBlockProducer.cc
@@ -1,21 +1,5 @@
 #include "RecoParticleFlow/PFProducer/plugins/PFBlockProducer.h"
 
-#include "RecoParticleFlow/PFClusterTools/interface/PFEnergyCalibration.h"
-#include "RecoParticleFlow/PFClusterTools/interface/PFEnergyResolution.h"
-
-
-#include "FWCore/Framework/interface/ESHandle.h"
-
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Utilities/interface/Exception.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-
-#include "DataFormats/MuonReco/interface/MuonFwd.h"
-
-#include "FWCore/ParameterSet/interface/FileInPath.h"
-
-#include <set>
-
 using namespace std;
 using namespace edm;
 
@@ -63,9 +47,8 @@ PFBlockProducer::produce(Event& iEvent,
     str<<"number of blocks : "<<blocks.size()<<endl;
     str<<endl;
     
-    for(PFBlockAlgo::IBC ib=blocks.begin(); 
-	ib != blocks.end(); ++ib) {
-      str<<(*ib)<<endl;
+    for(auto const& block : blocks) {
+      str<< block <<endl;
     }
 
     LogInfo("PFBlockProducer") << str.str()<<endl;
diff --git a/RecoParticleFlow/PFProducer/plugins/PFBlockProducer.h b/RecoParticleFlow/PFProducer/plugins/PFBlockProducer.h
index 61879d27dc5b7..af5673fae3cf8 100644
--- a/RecoParticleFlow/PFProducer/plugins/PFBlockProducer.h
+++ b/RecoParticleFlow/PFProducer/plugins/PFBlockProducer.h
@@ -1,34 +1,12 @@
 #ifndef RecoParticleFlow_PFProducer_PFBlockProducer_h_
 #define RecoParticleFlow_PFProducer_PFBlockProducer_h_
 
-// system include files
-#include <memory>
-#include <string>
-
-// user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/stream/EDProducer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-
+#include "RecoParticleFlow/PFProducer/interface/PFBlockAlgo.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Utilities/interface/EDPutToken.h"
-
-#include "RecoParticleFlow/PFProducer/interface/PFBlockAlgo.h"
-
-#include "DataFormats/ParticleFlowReco/interface/PFLayer.h"
-#include "DataFormats/ParticleFlowReco/interface/PFCluster.h"
-#include "DataFormats/ParticleFlowReco/interface/PFRecTrack.h" 
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertexFwd.h"
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertex.h"
-#include "DataFormats/ParticleFlowReco/interface/PFConversionFwd.h"
-#include "DataFormats/ParticleFlowReco/interface/PFConversion.h"
-#include "DataFormats/ParticleFlowReco/interface/PFV0Fwd.h"
-#include "DataFormats/ParticleFlowReco/interface/PFV0.h"
-
-#include "DataFormats/EgammaCandidates/interface/Photon.h"
-#include "DataFormats/EgammaCandidates/interface/PhotonFwd.h"
-
+#include "FWCore/Utilities/interface/Exception.h"
 
 /**\class PFBlockProducer 
 \brief Producer for particle flow blocks
diff --git a/RecoParticleFlow/PFProducer/plugins/PFEGammaProducer.cc b/RecoParticleFlow/PFProducer/plugins/PFEGammaProducer.cc
index b46fde05e7124..7e4ded0709a68 100644
--- a/RecoParticleFlow/PFProducer/plugins/PFEGammaProducer.cc
+++ b/RecoParticleFlow/PFProducer/plugins/PFEGammaProducer.cc
@@ -187,7 +187,7 @@ PFEGammaProducer::produce(edm::Event& iEvent,
     // make a copy of the link data, which will be edited.
     //PFBlock::LinkData linkData =  block.linkData();
     
-    pfeg_->RunPFEG(globalCache(),blockref);
+    pfeg_->buildAndRefineEGObjects(globalCache(),blockref);
 
     if( !pfeg_->getCandidates().empty() ) {
       LOGDRESSED("PFEGammaProducer")
diff --git a/RecoParticleFlow/PFProducer/plugins/PFProducer.cc b/RecoParticleFlow/PFProducer/plugins/PFProducer.cc
index 8cd9cb185d742..9c15fa4bcc64b 100644
--- a/RecoParticleFlow/PFProducer/plugins/PFProducer.cc
+++ b/RecoParticleFlow/PFProducer/plugins/PFProducer.cc
@@ -1,6 +1,4 @@
 #include "RecoParticleFlow/PFProducer/plugins/PFProducer.h"
-#include "RecoParticleFlow/PFProducer/interface/PFAlgo.h"
-
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -20,6 +18,8 @@ using namespace edm;
 
 
 PFProducer::PFProducer(const edm::ParameterSet& iConfig)
+  : putToken_{produces<reco::PFCandidateCollection>()}
+  , pfAlgo_(iConfig.getUntrackedParameter<bool>("debug",false))
 {
   //--ab: get calibration factors for HF:
   auto thepfEnergyCalibrationHF = std::make_shared<PFEnergyCalibrationHF>(
@@ -103,7 +103,6 @@ PFProducer::PFProducer(const edm::ParameterSet& iConfig)
 
 
   // register products
-  produces<reco::PFCandidateCollection>();
   produces<reco::PFCandidateCollection>("CleanedHF");
   produces<reco::PFCandidateCollection>("CleanedCosmicsMuons");
   produces<reco::PFCandidateCollection>("CleanedTrackerAndGlobalMuons");
@@ -231,25 +230,14 @@ PFProducer::PFProducer(const edm::ParameterSet& iConfig)
     calibrationsLabel_ = iConfig.getParameter<std::string>("calibrationsLabel");
 
   auto calibration = std::make_shared<PFEnergyCalibration>();
-
-  int algoType 
-    = iConfig.getParameter<unsigned>("algoType");
-  
-  switch(algoType) {
-  case 0:
-    pfAlgo_.reset( new PFAlgo);
-    break;
-   default:
-    assert(0);
-  }
   
-  pfAlgo_->setParameters( nSigmaECAL, 
+  pfAlgo_.setParameters( nSigmaECAL, 
 			  nSigmaHCAL,
 			  calibration,
 			  thepfEnergyCalibrationHF);
 
   //PFElectrons: call the method setpfeleparameters
-  pfAlgo_->setPFEleParameters(mvaEleCut,
+  pfAlgo_.setPFEleParameters(mvaEleCut,
 			      path_mvaWeightFileEleID,
 			      usePFElectrons_,
 			      thePFSCEnergyCalibration,
@@ -266,10 +254,10 @@ PFProducer::PFProducer(const edm::ParameterSet& iConfig)
 			      useEGammaElectrons_,
 			      useEGammaSupercluster);
   
-  //  pfAlgo_->setPFConversionParameters(usePFConversions);
+  //  pfAlgo_.setPFConversionParameters(usePFConversions);
 
   // PFPhotons: 
-  pfAlgo_->setPFPhotonParameters(usePFPhotons_,
+  pfAlgo_.setPFPhotonParameters(usePFPhotons_,
 				 path_mvaWeightFileConvID,
 				 mvaConvCut,
 				 usePhotonReg_,
@@ -280,14 +268,14 @@ PFProducer::PFProducer(const edm::ParameterSet& iConfig)
 
 
   // NEW EGamma Filters
-   pfAlgo_->setEGammaParameters(use_EGammaFilters_, useProtectionsForJetMET);
+   pfAlgo_.setEGammaParameters(use_EGammaFilters_, useProtectionsForJetMET);
 
   if(use_EGammaFilters_) pfegamma_ = std::make_unique<PFEGammaFilters>(iConfig);
 
 
   //Secondary tracks and displaced vertices parameters
   
-  pfAlgo_->setDisplacedVerticesParameters(rejectTracks_Bad,
+  pfAlgo_.setDisplacedVerticesParameters(rejectTracks_Bad,
 					  rejectTracks_Step45,
 					  usePFNuclearInteractions,
  					  usePFConversions,
@@ -295,13 +283,13 @@ PFProducer::PFProducer(const edm::ParameterSet& iConfig)
 					  dptRel_DispVtx);
   
   if (usePFNuclearInteractions)
-    pfAlgo_->setCandConnectorParameters( iCfgCandConnector );
+    pfAlgo_.setCandConnectorParameters( iCfgCandConnector );
 
   
 
   // Set muon and fake track parameters
-  pfAlgo_->setPFMuonAndFakeParameters(iConfig);
-  pfAlgo_->setBadHcalTrackParams(iConfig);
+  pfAlgo_.setPFMuonAndFakeParameters(iConfig);
+  pfAlgo_.setBadHcalTrackParams(iConfig);
   
   //Post cleaning of the HF
   postHFCleaning_
@@ -320,7 +308,7 @@ PFProducer::PFProducer(const edm::ParameterSet& iConfig)
     = iConfig.getParameter<double>("minDeltaMet");
 
   // Set post HF cleaning muon parameters
-  pfAlgo_->setPostHFCleaningParameters(postHFCleaning_,
+  pfAlgo_.setPostHFCleaningParameters(postHFCleaning_,
 				       minHFCleaningPt,
 				       minSignificance,
 				       maxSignificance,
@@ -338,16 +326,10 @@ PFProducer::PFProducer(const edm::ParameterSet& iConfig)
 
   // Use HO clusters and links in the PF reconstruction
   useHO_= iConfig.getParameter<bool>("useHO");
-  pfAlgo_->setHOTag(useHO_);
+  pfAlgo_.setHOTag(useHO_);
 
   verbose_ = 
     iConfig.getUntrackedParameter<bool>("verbose",false);
-
-  bool debug_ = 
-    iConfig.getUntrackedParameter<bool>("debug",false);
-
-  pfAlgo_->setDebug( debug_ );
-
 }
 
 
@@ -379,7 +361,7 @@ PFProducer::beginRun(const edm::Run & run,
 
     PerformancePayloadFromTFormula const * pfCalibrations = static_cast< const PerformancePayloadFromTFormula *>(perfH.product());
     
-    pfAlgo_->thePFEnergyCalibration()->setCalibrationFunctions(pfCalibrations);
+    pfAlgo_.thePFEnergyCalibration()->setCalibrationFunctions(pfCalibrations);
   }
   
   /*
@@ -429,8 +411,8 @@ PFProducer::beginRun(const edm::Run & run,
   } 
 
     if(usePFPhotons_){
-      //pfAlgo_->setPFPhotonRegWeights(ReaderLC_, ReaderGC_, ReaderRes_);
-      pfAlgo_->setPFPhotonRegWeights(ReaderLCEB_,ReaderLCEE_,ReaderGCBarrel_,ReaderGCEndCapHighr9_, ReaderGCEndCapLowr9_, ReaderEcalRes_ );
+      //pfAlgo_.setPFPhotonRegWeights(ReaderLC_, ReaderGC_, ReaderRes_);
+      pfAlgo_.setPFPhotonRegWeights(ReaderLCEB_,ReaderLCEE_,ReaderGCBarrel_,ReaderGCEndCapHighr9_, ReaderGCEndCapLowr9_, ReaderEcalRes_ );
     }
 }
 
@@ -441,30 +423,30 @@ PFProducer::produce(Event& iEvent, const EventSetup& iSetup)
   LogDebug("PFProducer")<<"START event: " <<iEvent.id().event() <<" in run "<<iEvent.id().run()<<endl;
 
   //Assign the PFAlgo Parameters
-  pfAlgo_->setPFVertexParameters(useVerticesForNeutral_, iEvent.get(vertices_));
+  pfAlgo_.setPFVertexParameters(useVerticesForNeutral_, iEvent.get(vertices_));
 
   // get the collection of blocks 
   auto blocks = iEvent.getHandle( inputTagBlocks_);
   assert( blocks.isValid() );
 
   // get the collection of muons 
-  if ( postMuonCleaning_ ) pfAlgo_->setMuonHandle( iEvent.getHandle(inputTagMuons_) );
+  if ( postMuonCleaning_ ) pfAlgo_.setMuonHandle( iEvent.getHandle(inputTagMuons_) );
 
-  if (useEGammaElectrons_) pfAlgo_->setEGElectronCollection( iEvent.get(inputTagEgammaElectrons_) );
+  if (useEGammaElectrons_) pfAlgo_.setEGElectronCollection( iEvent.get(inputTagEgammaElectrons_) );
 
-  if(use_EGammaFilters_) pfAlgo_->setEGammaCollections( iEvent.get(inputTagPFEGammaCandidates_),
+  if(use_EGammaFilters_) pfAlgo_.setEGammaCollections( iEvent.get(inputTagPFEGammaCandidates_),
                                                         iEvent.get(inputTagValueMapGedElectrons_),
                                                         iEvent.get(inputTagValueMapGedPhotons_));
 
 
   LogDebug("PFProducer")<<"particle flow is starting"<<endl;
 
-  pfAlgo_->reconstructParticles( blocks, pfegamma_.get() );
+  pfAlgo_.reconstructParticles( blocks, pfegamma_.get() );
   
   if(verbose_) {
     ostringstream  str;
-    str<<(*pfAlgo_)<<endl;
-    //    cout << (*pfAlgo_) << endl;
+    str<< pfAlgo_ <<endl;
+    //    cout << pfAlgo_ << endl;
     LogInfo("PFProducer") <<str.str()<<endl;
   }  
 
@@ -472,41 +454,41 @@ PFProducer::produce(Event& iEvent, const EventSetup& iSetup)
   // Florian 5/01/2011
   // Save the PFElectron Extra Collection First as to be able to create valid References  
   if(usePFElectrons_)   {  
-    std::unique_ptr<reco::PFCandidateElectronExtraCollection> pOutputElectronCandidateExtraCollection( pfAlgo_->transferElectronExtra() ); 
+    std::unique_ptr<reco::PFCandidateElectronExtraCollection> pOutputElectronCandidateExtraCollection( pfAlgo_.transferElectronExtra() ); 
 
     const edm::OrphanHandle<reco::PFCandidateElectronExtraCollection > electronExtraProd=
       iEvent.put(std::move(pOutputElectronCandidateExtraCollection),electronExtraOutputCol_);      
-    pfAlgo_->setElectronExtraRef(electronExtraProd);
+    pfAlgo_.setElectronExtraRef(electronExtraProd);
   }
 
   // Daniele 18/05/2011
   // Save the PFPhoton Extra Collection First as to be able to create valid References  
   if(usePFPhotons_)   {  
-    std::unique_ptr<reco::PFCandidatePhotonExtraCollection> pOutputPhotonCandidateExtraCollection( pfAlgo_->transferPhotonExtra() ); 
+    std::unique_ptr<reco::PFCandidatePhotonExtraCollection> pOutputPhotonCandidateExtraCollection( pfAlgo_.transferPhotonExtra() ); 
 
     const edm::OrphanHandle<reco::PFCandidatePhotonExtraCollection > photonExtraProd=
       iEvent.put(std::move(pOutputPhotonCandidateExtraCollection),photonExtraOutputCol_);      
-    pfAlgo_->setPhotonExtraRef(photonExtraProd);
+    pfAlgo_.setPhotonExtraRef(photonExtraProd);
   }
 
    // Save cosmic cleaned muon candidates
     std::unique_ptr<reco::PFCandidateCollection> 
-      pCosmicsMuonCleanedCandidateCollection( pfAlgo_->getPFMuonAlgo()->transferCleanedCosmicCandidates() ); 
+      pCosmicsMuonCleanedCandidateCollection( pfAlgo_.getPFMuonAlgo()->transferCleanedCosmicCandidates() ); 
     // Save tracker/global cleaned muon candidates
     std::unique_ptr<reco::PFCandidateCollection> 
-      pTrackerAndGlobalCleanedMuonCandidateCollection( pfAlgo_->getPFMuonAlgo()->transferCleanedTrackerAndGlobalCandidates() ); 
+      pTrackerAndGlobalCleanedMuonCandidateCollection( pfAlgo_.getPFMuonAlgo()->transferCleanedTrackerAndGlobalCandidates() ); 
     // Save fake cleaned muon candidates
     std::unique_ptr<reco::PFCandidateCollection> 
-      pFakeCleanedMuonCandidateCollection( pfAlgo_->getPFMuonAlgo()->transferCleanedFakeCandidates() ); 
+      pFakeCleanedMuonCandidateCollection( pfAlgo_.getPFMuonAlgo()->transferCleanedFakeCandidates() ); 
     // Save punch-through cleaned muon candidates
     std::unique_ptr<reco::PFCandidateCollection> 
-      pPunchThroughMuonCleanedCandidateCollection( pfAlgo_->getPFMuonAlgo()->transferPunchThroughCleanedMuonCandidates() ); 
+      pPunchThroughMuonCleanedCandidateCollection( pfAlgo_.getPFMuonAlgo()->transferPunchThroughCleanedMuonCandidates() ); 
     // Save punch-through cleaned neutral hadron candidates
     std::unique_ptr<reco::PFCandidateCollection> 
-      pPunchThroughHadronCleanedCandidateCollection( pfAlgo_->getPFMuonAlgo()->transferPunchThroughCleanedHadronCandidates() ); 
+      pPunchThroughHadronCleanedCandidateCollection( pfAlgo_.getPFMuonAlgo()->transferPunchThroughCleanedHadronCandidates() ); 
     // Save added muon candidates
     std::unique_ptr<reco::PFCandidateCollection> 
-      pAddedMuonCandidateCollection( pfAlgo_->getPFMuonAlgo()->transferAddedMuonCandidates() ); 
+      pAddedMuonCandidateCollection( pfAlgo_.getPFMuonAlgo()->transferAddedMuonCandidates() ); 
 
   // Check HF overcleaning
   reco::PFRecHitCollection hfCopy;
@@ -520,30 +502,30 @@ PFProducer::produce(Event& iEvent, const EventSetup& iSetup)
   }
 
   if (postHFCleaning_)
-    pfAlgo_->checkCleaning( hfCopy );
+    pfAlgo_.checkCleaning( hfCopy );
 
   // Save recovered HF candidates
-  std::unique_ptr<reco::PFCandidateCollection> pCleanedCandidateCollection( pfAlgo_->transferCleanedCandidates() ); 
+  std::unique_ptr<reco::PFCandidateCollection> pCleanedCandidateCollection( pfAlgo_.transferCleanedCandidates() ); 
 
   
   // Save the final PFCandidate collection
-  std::unique_ptr<reco::PFCandidateCollection> pOutputCandidateCollection( pfAlgo_->transferCandidates() ); 
+  reco::PFCandidateCollection pOutputCandidateCollection = pfAlgo_.transferCandidates();
   
 
   
   LogDebug("PFProducer")<<"particle flow: putting products in the event"<<endl;
   if ( verbose_ ) std::cout <<"particle flow: putting products in the event. Here the full list"<<endl;
   int nC=0;
-  for( reco::PFCandidateCollection::const_iterator  itCand =  (*pOutputCandidateCollection).begin(); itCand !=  (*pOutputCandidateCollection).end(); itCand++) {
+  for(auto const& cand : pOutputCandidateCollection) {
     nC++;
-      if (verbose_ ) std::cout << nC << ")" << (*itCand).particleId() << std::endl;
+      if (verbose_ ) std::cout << nC << ")" << cand.particleId() << std::endl;
 
   }
 
 
 
   // Write in the event
-  iEvent.put(std::move(pOutputCandidateCollection));
+  iEvent.emplace(putToken_,pOutputCandidateCollection);
   iEvent.put(std::move(pCleanedCandidateCollection),"CleanedHF");
 
     if ( postMuonCleaning_ ) { 
@@ -558,7 +540,7 @@ PFProducer::produce(Event& iEvent, const EventSetup& iSetup)
   if(usePFElectrons_)
     {
       std::unique_ptr<reco::PFCandidateCollection>  
-	pOutputElectronCandidateCollection( pfAlgo_->transferElectronCandidates() ); 
+	pOutputElectronCandidateCollection( pfAlgo_.transferElectronCandidates() ); 
       iEvent.put(std::move(pOutputElectronCandidateCollection),electronOutputCol_);
 
     }
diff --git a/RecoParticleFlow/PFProducer/plugins/PFProducer.h b/RecoParticleFlow/PFProducer/plugins/PFProducer.h
index 5a9261fca0755..6d119f7a0ff41 100644
--- a/RecoParticleFlow/PFProducer/plugins/PFProducer.h
+++ b/RecoParticleFlow/PFProducer/plugins/PFProducer.h
@@ -8,6 +8,7 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Utilities/interface/EDPutToken.h"
 
 // useful?
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -26,8 +27,8 @@
 #include "DataFormats/ParticleFlowReco/interface/PFBlockFwd.h"
 #include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
 #include "RecoParticleFlow/PFProducer/interface/PFEGammaFilters.h"
+#include "RecoParticleFlow/PFProducer/interface/PFAlgo.h"
 
-class PFAlgo;
 class PFEnergyCalibrationHF;
 class GBRForest;
 
@@ -48,6 +49,8 @@ class PFProducer : public edm::stream::EDProducer<> {
   void beginRun(const edm::Run &, const edm::EventSetup &) override;
 
  private:
+  const edm::EDPutTokenT<reco::PFCandidateCollection> putToken_;
+
   edm::EDGetTokenT<reco::PFBlockCollection>  inputTagBlocks_;
   edm::EDGetTokenT<reco::MuonCollection>     inputTagMuons_;
   edm::EDGetTokenT<reco::VertexCollection>   vertices_;
@@ -110,7 +113,7 @@ class PFProducer : public edm::stream::EDProducer<> {
   // std::vector<std::string> fToRead;
   
   /// particle flow algorithm
-  std::shared_ptr<PFAlgo>      pfAlgo_;
+  PFAlgo pfAlgo_;
 
 };
 
diff --git a/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerPSEcal.cc b/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerPSEcal.cc
index 2bd756ff9d651..ceb6a7c3c4c65 100644
--- a/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerPSEcal.cc
+++ b/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerPSEcal.cc
@@ -75,10 +75,10 @@ KDTreeLinkerPSEcal::buildTree()
 
 void 
 KDTreeLinkerPSEcal::buildTree(const RecHitSet	&rechitsSet,
-			      KDTreeLinkerAlgo	&tree)
+			      KDTreeLinkerAlgo<reco::PFRecHit const*>	&tree)
 {
   // List of pseudo-rechits that will be used to create the KDTree
-  std::vector<KDTreeNodeInfo> eltList;
+  std::vector<KDTreeNodeInfo<reco::PFRecHit const*>> eltList;
 
   // Filling of this eltList
   for(RecHitSet::const_iterator it = rechitsSet.begin(); 
@@ -87,12 +87,12 @@ KDTreeLinkerPSEcal::buildTree(const RecHitSet	&rechitsSet,
     const reco::PFRecHit* rh = *it;
     const auto & posxyz = rh->position();
         
-    KDTreeNodeInfo rhinfo (rh, posxyz.x(), posxyz.y());
+    KDTreeNodeInfo rhinfo {rh, posxyz.x(), posxyz.y()};
     eltList.push_back(rhinfo);
   }
 
   // xmin-xmax, ymain-ymax
-  KDTreeBox region(-150., 150., -150., 150.);
+  KDTreeBox region{-150., 150., -150., 150.};
 
   // We may now build the KDTree
   tree.build(eltList, region);
@@ -154,7 +154,7 @@ KDTreeLinkerPSEcal::searchLinks()
     double rangeY = maxEcalRadius * (1 + (0.05 + 1.0 / maxEcalRadius * deltaY / 2.)) * inflation; 
     
     // We search for all candidate recHits, ie all recHits contained in the maximal size envelope.
-    std::vector<KDTreeNodeInfo> recHits;
+    std::vector<reco::PFRecHit const*> recHits;
     KDTreeBox trackBox(xPSonEcal - rangeX, xPSonEcal + rangeX, 
 		  yPSonEcal - rangeY, yPSonEcal + rangeY);
 
@@ -164,13 +164,12 @@ KDTreeLinkerPSEcal::searchLinks()
       treePos_.search(trackBox, recHits);
 
 
-    for(std::vector<KDTreeNodeInfo>::const_iterator rhit = recHits.begin(); 
-	rhit != recHits.end(); ++rhit) {
+    for(auto const& recHit : recHits) {
            
-      const auto & corners = rhit->ptr->getCornersXYZ();
+      const auto & corners = recHit->getCornersXYZ();
 
       // Find all clusters associated to given rechit
-      RecHit2BlockEltMap::iterator ret = rechit2ClusterLinks_.find(rhit->ptr);
+      RecHit2BlockEltMap::iterator ret = rechit2ClusterLinks_.find(recHit);
       
       for(BlockEltSet::const_iterator clusterIt = ret->second.begin(); 
 	  clusterIt != ret->second.end(); clusterIt++) {
@@ -178,7 +177,7 @@ KDTreeLinkerPSEcal::searchLinks()
 	reco::PFClusterRef clusterref = (*clusterIt)->clusterRef();
 	double clusterz = clusterref->position().z();
 
-	const auto & posxyz = rhit->ptr->position() * zPS / clusterz;
+	const auto & posxyz = recHit->position() * zPS / clusterz;
 
 	double x[5];
 	double y[5];
diff --git a/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerPSEcal.h b/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerPSEcal.h
index 1b0465317c9e0..ed9b6f58b8b3a 100644
--- a/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerPSEcal.h
+++ b/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerPSEcal.h
@@ -2,8 +2,8 @@
 #define KDTreeLinkerPSEcal_h
 
 #include "RecoParticleFlow/PFProducer/interface/KDTreeLinkerBase.h"
-#include "RecoParticleFlow/PFProducer/interface/KDTreeLinkerTools.h"
-#include "RecoParticleFlow/PFProducer/interface/KDTreeLinkerAlgo.h"
+#include "CommonTools/RecoAlgos/interface/KDTreeLinkerAlgo.h"
+#include "CommonTools/RecoAlgos/interface/KDTreeLinkerTools.h"
 
 
 // This class is used to find all links between PreShower clusters and ECAL clusters
@@ -42,7 +42,7 @@ class KDTreeLinkerPSEcal : public KDTreeLinkerBase
  private:
   // This method allows us to build the "tree" from the "rechitsSet".
   void buildTree(const RecHitSet	&rechitsSet,
-		   KDTreeLinkerAlgo	&tree);
+		   KDTreeLinkerAlgo<reco::PFRecHit const*>	&tree);
 
  private:
   // Some const values. 
@@ -67,8 +67,8 @@ class KDTreeLinkerPSEcal : public KDTreeLinkerBase
   RecHit2BlockEltMap	rechit2ClusterLinks_;
     
   // KD trees
-  KDTreeLinkerAlgo	treeNeg_;
-  KDTreeLinkerAlgo	treePos_;
+  KDTreeLinkerAlgo<reco::PFRecHit const*>	treeNeg_;
+  KDTreeLinkerAlgo<reco::PFRecHit const*>	treePos_;
 };
 
 #endif /* !KDTreeLinkerPSEcal_h */
diff --git a/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerTrackEcal.cc b/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerTrackEcal.cc
index 46bc08ce9591c..d35f414f3d779 100644
--- a/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerTrackEcal.cc
+++ b/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerTrackEcal.cc
@@ -63,7 +63,7 @@ void
 KDTreeLinkerTrackEcal::buildTree()
 {
   // List of pseudo-rechits that will be used to create the KDTree
-  std::vector<KDTreeNodeInfo> eltList;
+  std::vector<KDTreeNodeInfo<reco::PFRecHit const*>> eltList;
 
   // Filling of this list
   for(RecHitSet::const_iterator it = rechitsSet_.begin(); 
@@ -71,20 +71,20 @@ KDTreeLinkerTrackEcal::buildTree()
     
     const reco::PFRecHit::REPPoint &posrep = (*it)->positionREP();
     
-    KDTreeNodeInfo rh1 (*it, posrep.eta(), posrep.phi());
+    KDTreeNodeInfo<reco::PFRecHit const*> rh1 (*it, posrep.eta(), posrep.phi());
     eltList.push_back(rh1);
     
     // Here we solve the problem of phi circular set by duplicating some rechits
     // too close to -Pi (or to Pi) and adding (substracting) to them 2 * Pi.
-    if (rh1.dim2 > (M_PI - phiOffset_)) {
-      double phi = rh1.dim2 - 2 * M_PI;
-      KDTreeNodeInfo rh2(*it, posrep.eta(), phi); 
+    if (rh1.dim[1] > (M_PI - phiOffset_)) {
+      double phi = rh1.dim[1] - 2 * M_PI;
+      KDTreeNodeInfo rh2(*it, posrep.eta(), phi);
       eltList.push_back(rh2);
     }
 
-    if (rh1.dim2 < (M_PI * -1.0 + phiOffset_)) {
-      double phi = rh1.dim2 + 2 * M_PI;
-      KDTreeNodeInfo rh3(*it, posrep.eta(), phi); 
+    if (rh1.dim[1] < (M_PI * -1.0 + phiOffset_)) {
+      double phi = rh1.dim[1] + 2 * M_PI;
+      KDTreeNodeInfo rh3(*it, posrep.eta(), phi);
       eltList.push_back(rh3);
     }
   }
@@ -136,18 +136,17 @@ KDTreeLinkerTrackEcal::searchLinks()
     double range = cristalPhiEtaMaxSize_ * (2.0 + 1.0 / std::min(1., trackPt / 2.)); 
 
     // We search for all candidate recHits, ie all recHits contained in the maximal size envelope.
-    std::vector<KDTreeNodeInfo> recHits;
+    std::vector<reco::PFRecHit const*> recHits;
     KDTreeBox trackBox(tracketa-range, tracketa+range, trackphi-range, trackphi+range);
     tree_.search(trackBox, recHits);
     
     // Here we check all rechit candidates using the non-approximated method.
-    for(std::vector<KDTreeNodeInfo>::const_iterator rhit = recHits.begin(); 
-	rhit != recHits.end(); ++rhit) {
+    for(auto const& recHit : recHits) {
            
-      const auto & cornersxyz      = rhit->ptr->getCornersXYZ();
-      const auto & posxyz			   = rhit->ptr->position();
-      const auto &rhrep		   = rhit->ptr->positionREP();
-      const auto & corners = rhit->ptr->getCornersREP();
+      const auto & cornersxyz      = recHit->getCornersXYZ();
+      const auto & posxyz			   = recHit->position();
+      const auto &rhrep		   = recHit->positionREP();
+      const auto & corners = recHit->getCornersREP();
       
       double rhsizeeta = fabs(corners[3].eta() - corners[1].eta());
       double rhsizephi = fabs(corners[3].phi() - corners[1].phi());
@@ -158,7 +157,7 @@ KDTreeLinkerTrackEcal::searchLinks()
       if ( dphi > M_PI ) dphi = 2.*M_PI - dphi;
       
       // Find all clusters associated to given rechit
-      RecHit2BlockEltMap::iterator ret = rechit2ClusterLinks_.find(rhit->ptr);
+      RecHit2BlockEltMap::iterator ret = rechit2ClusterLinks_.find(recHit);
       
       for(BlockEltSet::const_iterator clusterIt = ret->second.begin(); 
 	  clusterIt != ret->second.end(); clusterIt++) {
diff --git a/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerTrackEcal.h b/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerTrackEcal.h
index 4d4288c721ec5..43fe84bdb734a 100644
--- a/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerTrackEcal.h
+++ b/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerTrackEcal.h
@@ -2,8 +2,8 @@
 #define KDTreeLinkerTrackEcal_h
 
 #include "RecoParticleFlow/PFProducer/interface/KDTreeLinkerBase.h"
-#include "RecoParticleFlow/PFProducer/interface/KDTreeLinkerTools.h"
-#include "RecoParticleFlow/PFProducer/interface/KDTreeLinkerAlgo.h"
+#include "CommonTools/RecoAlgos/interface/KDTreeLinkerAlgo.h"
+#include "CommonTools/RecoAlgos/interface/KDTreeLinkerTools.h"
 
 
 // This class is used to find all links between Tracks and ECAL clusters
@@ -54,7 +54,7 @@ class KDTreeLinkerTrackEcal : public KDTreeLinkerBase
   RecHit2BlockEltMap	rechit2ClusterLinks_;
     
   // KD trees
-  KDTreeLinkerAlgo	tree_;
+  KDTreeLinkerAlgo<reco::PFRecHit const*>	tree_;
 
 };
 
diff --git a/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerTrackHcal.cc b/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerTrackHcal.cc
index 6838e038d4053..3e638d3539e90 100644
--- a/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerTrackHcal.cc
+++ b/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerTrackHcal.cc
@@ -66,7 +66,7 @@ void
 KDTreeLinkerTrackHcal::buildTree()
 {
   // List of pseudo-rechits that will be used to create the KDTree
-  std::vector<KDTreeNodeInfo> eltList;
+  std::vector<KDTreeNodeInfo<reco::PFRecHit const*>> eltList;
 
   // Filling of this list
   for(RecHitSet::const_iterator it = rechitsSet_.begin(); 
@@ -74,20 +74,20 @@ KDTreeLinkerTrackHcal::buildTree()
     
     const reco::PFRecHit::REPPoint &posrep = (*it)->positionREP();
     
-    KDTreeNodeInfo rh1 (*it, posrep.eta(), posrep.phi());
+    KDTreeNodeInfo<reco::PFRecHit const*> rh1 (*it, posrep.eta(), posrep.phi());
     eltList.push_back(rh1);
     
     // Here we solve the problem of phi circular set by duplicating some rechits
     // too close to -Pi (or to Pi) and adding (substracting) to them 2 * Pi.
-    if (rh1.dim2 > (M_PI - phiOffset_)) {
-      double phi = rh1.dim2 - 2 * M_PI;
-      KDTreeNodeInfo rh2(*it, posrep.eta(), phi); 
+    if (rh1.dim[1] > (M_PI - phiOffset_)) {
+      double phi = rh1.dim[1] - 2 * M_PI;
+      KDTreeNodeInfo rh2(*it, posrep.eta(), phi);
       eltList.push_back(rh2);
     }
 
-    if (rh1.dim2 < (M_PI * -1.0 + phiOffset_)) {
-      double phi = rh1.dim2 + 2 * M_PI;
-      KDTreeNodeInfo rh3(*it, posrep.eta(), phi); 
+    if (rh1.dim[1] < (M_PI * -1.0 + phiOffset_)) {
+      double phi = rh1.dim[1] + 2 * M_PI;
+      KDTreeNodeInfo rh3(*it, posrep.eta(), phi);
       eltList.push_back(rh3);
     }
   }
@@ -140,17 +140,16 @@ KDTreeLinkerTrackHcal::searchLinks()
     double rangephi = (cristalPhiEtaMaxSize_ * (1.5 + 0.5) + 0.2 * fabs(dHphi)) * inflation; 
 
     // We search for all candidate recHits, ie all recHits contained in the maximal size envelope.
-    std::vector<KDTreeNodeInfo> recHits;
-    KDTreeBox trackBox(tracketa - rangeeta, tracketa + rangeeta, 
+    std::vector<reco::PFRecHit const*> recHits;
+    KDTreeBox trackBox(tracketa - rangeeta, tracketa + rangeeta,
 		       trackphi - rangephi, trackphi + rangephi);
     tree_.search(trackBox, recHits);
     
     // Here we check all rechit candidates using the non-approximated method.
-    for(std::vector<KDTreeNodeInfo>::const_iterator rhit = recHits.begin(); 
-	rhit != recHits.end(); ++rhit) {
+    for(auto const& recHit : recHits) {
 
-      const auto &rhrep		   = rhit->ptr->positionREP();
-      const auto & corners = rhit->ptr->getCornersREP();
+      const auto &rhrep		   = recHit->positionREP();
+      const auto & corners = recHit->getCornersREP();
       
       double rhsizeeta = fabs(corners[3].eta() - corners[1].eta());
       double rhsizephi = fabs(corners[3].phi() - corners[1].phi());
@@ -161,7 +160,7 @@ KDTreeLinkerTrackHcal::searchLinks()
       if ( dphi > M_PI ) dphi = 2.*M_PI - dphi;
       
       // Find all clusters associated to given rechit
-      RecHit2BlockEltMap::iterator ret = rechit2ClusterLinks_.find(rhit->ptr);
+      RecHit2BlockEltMap::iterator ret = rechit2ClusterLinks_.find(recHit);
       
       for(BlockEltSet::iterator clusterIt = ret->second.begin(); 
 	  clusterIt != ret->second.end(); clusterIt++) {
diff --git a/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerTrackHcal.h b/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerTrackHcal.h
index 0dc2843464da8..41014915feabe 100644
--- a/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerTrackHcal.h
+++ b/RecoParticleFlow/PFProducer/plugins/kdtrees/KDTreeLinkerTrackHcal.h
@@ -2,8 +2,8 @@
 #define KDTreeLinkerTrackHcal_h
 
 #include "RecoParticleFlow/PFProducer/interface/KDTreeLinkerBase.h"
-#include "RecoParticleFlow/PFProducer/interface/KDTreeLinkerTools.h"
-#include "RecoParticleFlow/PFProducer/interface/KDTreeLinkerAlgo.h"
+#include "CommonTools/RecoAlgos/interface/KDTreeLinkerAlgo.h"
+#include "CommonTools/RecoAlgos/interface/KDTreeLinkerTools.h"
 
 
 // This class is used to find all links between Tracks and HCAL clusters
@@ -54,7 +54,7 @@ class KDTreeLinkerTrackHcal : public KDTreeLinkerBase
   RecHit2BlockEltMap	rechit2ClusterLinks_;
     
   // KD trees
-  KDTreeLinkerAlgo	tree_;
+  KDTreeLinkerAlgo<reco::PFRecHit const*>	tree_;
 
 };
 
diff --git a/RecoParticleFlow/PFProducer/python/particleFlowEGamma_cff.py b/RecoParticleFlow/PFProducer/python/particleFlowEGamma_cff.py
index 158737b253095..4b997aab8b5f2 100644
--- a/RecoParticleFlow/PFProducer/python/particleFlowEGamma_cff.py
+++ b/RecoParticleFlow/PFProducer/python/particleFlowEGamma_cff.py
@@ -53,10 +53,35 @@
 egmElectronIsolationPileUpCITK.srcToIsolate = cms.InputTag("gedGsfElectronsTmp")
 egmElectronIsolationPileUpCITK.srcForIsolationCone = cms.InputTag("pfPileUpAllChargedParticles")
 
+photonIDValueMaps = cms.EDProducer(
+  "PhotonIDValueMapProducer",
+  ebReducedRecHitCollection = cms.InputTag("ecalRecHit","EcalRecHitsEB"),
+  ebReducedRecHitCollectionMiniAOD = cms.InputTag(""),
+  eeReducedRecHitCollection = cms.InputTag("ecalRecHit","EcalRecHitsEE"),
+  eeReducedRecHitCollectionMiniAOD = cms.InputTag(""),
+  esReducedRecHitCollection  = cms.InputTag("ecalPreshowerRecHit","EcalRecHitsES"),
+  esReducedRecHitCollectionMiniAOD = cms.InputTag(""),
+  particleBasedIsolation = cms.InputTag("particleBasedIsolationTmp","gedPhotonsTmp"),
+  pfCandidates = cms.InputTag("particleFlowTmp"),
+  pfCandidatesMiniAOD = cms.InputTag(""),
+  src = cms.InputTag("gedPhotonsTmp"),
+  srcMiniAOD = cms.InputTag(""),
+  vertices = cms.InputTag("offlinePrimaryVertices"),
+  verticesMiniAOD = cms.InputTag("")
+  )
+
+
 particleFlowEGammaFull = cms.Sequence(particleFlowEGamma*gedGsfElectronSequenceTmp*gedPhotonSequenceTmp*ootPhotonSequence)
-particleFlowEGammaFinal = cms.Sequence(particleBasedIsolationTmp*\
-pfNoPileUpIsoSequence*cms.ignore(pfNoPileUpCandidates)*cms.ignore(pfPileUpAllChargedParticles)*\
-egmPhotonIsolationCITK*egmElectronIsolationCITK*egmElectronIsolationPileUpCITK*gedPhotonSequence*gedElectronPFIsoSequence)
+particleFlowEGammaFinal = cms.Sequence(particleBasedIsolationTmp*
+                                       pfNoPileUpIsoSequence*
+                                       cms.ignore(pfNoPileUpCandidates)*
+                                       cms.ignore(pfPileUpAllChargedParticles)*
+                                       egmPhotonIsolationCITK*
+                                       egmElectronIsolationCITK*
+                                       egmElectronIsolationPileUpCITK*
+                                       photonIDValueMaps*
+                                       gedPhotonSequence*
+                                       gedElectronPFIsoSequence)
 
 from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018
 pp_on_AA_2018.toReplaceWith(particleFlowEGammaFull, particleFlowEGammaFull.copyAndExclude([ootPhotonSequence]))
diff --git a/RecoParticleFlow/PFProducer/src/KDTreeLinkerAlgo.cc b/RecoParticleFlow/PFProducer/src/KDTreeLinkerAlgo.cc
deleted file mode 100644
index 266f937ca580e..0000000000000
--- a/RecoParticleFlow/PFProducer/src/KDTreeLinkerAlgo.cc
+++ /dev/null
@@ -1,252 +0,0 @@
-#include "RecoParticleFlow/PFProducer/interface/KDTreeLinkerAlgo.h"
-
-KDTreeLinkerAlgo::KDTreeLinkerAlgo()
-  : root_ (nullptr),
-    nodePool_(nullptr),
-    nodePoolSize_(-1),
-    nodePoolPos_(-1)
-{
-}
-
-KDTreeLinkerAlgo::~KDTreeLinkerAlgo()
-{
-  clear();
-}
-
-void
-KDTreeLinkerAlgo::build(std::vector<KDTreeNodeInfo>	&eltList, 
-			const KDTreeBox			&region)
-{
-  if (!eltList.empty()) {
-    nodePoolSize_ = eltList.size() * 2 - 1;
-    nodePool_ = new KDTreeNode[nodePoolSize_];
-
-    // Here we build the KDTree
-    root_ = recBuild(eltList, 0, eltList.size(), 0, region);
-  }
-}
-
-
-KDTreeNode*
-KDTreeLinkerAlgo::recBuild(std::vector<KDTreeNodeInfo>	&eltList, 
-			   int				low, 
-			   int				high, 
-			   int				depth,
-			   const KDTreeBox&		region)
-{
-  int portionSize = high - low;
-
-  // By construction, portionSize > 0 can't happend.
-  assert(portionSize > 0);
-
-  if (portionSize == 1) { // Leaf case
-   
-    KDTreeNode *leaf = getNextNode();
-    leaf->setAttributs(region, eltList[low]);
-    return leaf;
-
-  } else { // Node case
-    
-    // The even depth is associated to dim1 dimension
-    // The odd one to dim2 dimension
-    int medianId = medianSearch(eltList, low, high, depth);
-
-    // We create the node
-    KDTreeNode *node = getNextNode();
-    node->setAttributs(region);
-
-
-    // Here we split into 2 halfplanes the current plane
-    KDTreeBox leftRegion = region;
-    KDTreeBox rightRegion = region;
-    if (depth & 1) {
-
-      double medianVal = eltList[medianId].dim2;
-      leftRegion.dim2max = medianVal;
-      rightRegion.dim2min = medianVal;
-
-    } else {
-
-      double medianVal = eltList[medianId].dim1;
-      leftRegion.dim1max = medianVal;
-      rightRegion.dim1min = medianVal;
-
-    }
-
-    ++depth;
-    ++medianId;
-
-    // We recursively build the son nodes
-    node->left = recBuild(eltList, low, medianId, depth, leftRegion);
-    node->right = recBuild(eltList, medianId, high, depth, rightRegion);
-
-    return node;
-  }
-}
-
-
-//Fast median search with Wirth algorithm in eltList between low and high indexes.
-int
-KDTreeLinkerAlgo::medianSearch(std::vector<KDTreeNodeInfo>	&eltList,
-			       int				low,
-			       int				high,
-			       int				treeDepth)
-{
-  //We should have at least 1 element to calculate the median...
-  assert(low < high);
-
-  int nbrElts = high - low;
-  int median = (nbrElts & 1)	? nbrElts / 2 
-				: nbrElts / 2 - 1;
-  median += low;
-
-  int l = low;
-  int m = high - 1;
-  
-  while (l < m) {
-    KDTreeNodeInfo elt = eltList[median];
-    int i = l;
-    int j = m;
-
-    do {
-
-      // The even depth is associated to dim1 dimension
-      // The odd one to dim2 dimension
-      if (treeDepth & 1) {
-	while (eltList[i].dim2 < elt.dim2) i++;
-	while (eltList[j].dim2 > elt.dim2) j--;
-      } else {
-	while (eltList[i].dim1 < elt.dim1) i++;
-	while (eltList[j].dim1 > elt.dim1) j--;
-      }
-
-      if (i <= j){
-	swap(eltList[i], eltList[j]);
-	i++; 
-	j--;
-      }
-    } while (i <= j);
-    if (j < median) l = i;
-    if (i > median) m = j;
-  }
-
-  return median;
-}
-
-void 
-KDTreeLinkerAlgo::swap(KDTreeNodeInfo	&e1, 
-		       KDTreeNodeInfo	&e2)
-{
-  KDTreeNodeInfo tmp = e1;
-  e1 = e2;
-  e2 = tmp;
-}
-
-void
-KDTreeLinkerAlgo::search(const KDTreeBox		&trackBox,
-			 std::vector<KDTreeNodeInfo>	&recHits)
-{
-  if (root_)
-    recSearch(root_, trackBox, recHits);
-}
-
-void 
-KDTreeLinkerAlgo::recSearch(const KDTreeNode		*current,
-			    const KDTreeBox		&trackBox,
-			    std::vector<KDTreeNodeInfo>	&recHits)
-{
-  // By construction, current can't be null
-  assert(current != nullptr);
-
-  // By Construction, a node can't have just 1 son.
-  assert (!(((current->left == nullptr) && (current->right != nullptr)) ||
-	    ((current->left != nullptr) && (current->right == nullptr))));
-    
-  if ((current->left == nullptr) && (current->right == nullptr)) {//leaf case
-  
-    // If point inside the rectangle/area
-    if ((current->rh.dim1 >= trackBox.dim1min) && (current->rh.dim1 <= trackBox.dim1max) &&
-	(current->rh.dim2 >= trackBox.dim2min) && (current->rh.dim2 <= trackBox.dim2max))
-      recHits.push_back(current->rh);
-
-  } else {
-
-    //if region( v->left ) is fully contained in the rectangle
-    if ((current->left->region.dim1min >= trackBox.dim1min) && 
-	(current->left->region.dim1max <= trackBox.dim1max) &&
-	(current->left->region.dim2min >= trackBox.dim2min) && 
-	(current->left->region.dim2max <= trackBox.dim2max))
-      addSubtree(current->left, recHits);
-    
-    else { //if region( v->left ) intersects the rectangle
-      
-      if (!((current->left->region.dim1min >= trackBox.dim1max) || 
-	    (current->left->region.dim1max <= trackBox.dim1min) ||
-	    (current->left->region.dim2min >= trackBox.dim2max) || 
-	    (current->left->region.dim2max <= trackBox.dim2min)))
-	recSearch(current->left, trackBox, recHits);
-    }
-    
-    //if region( v->right ) is fully contained in the rectangle
-    if ((current->right->region.dim1min >= trackBox.dim1min) && 
-	(current->right->region.dim1max <= trackBox.dim1max) &&
-	(current->right->region.dim2min >= trackBox.dim2min) && 
-	(current->right->region.dim2max <= trackBox.dim2max))
-      addSubtree(current->right, recHits);
-
-    else { //if region( v->right ) intersects the rectangle
-     
-      if (!((current->right->region.dim1min >= trackBox.dim1max) || 
-	    (current->right->region.dim1max <= trackBox.dim1min) ||
-	    (current->right->region.dim2min >= trackBox.dim2max) || 
-	    (current->right->region.dim2max <= trackBox.dim2min)))
-	recSearch(current->right, trackBox, recHits);
-    } 
-  }
-}
-
-void
-KDTreeLinkerAlgo::addSubtree(const KDTreeNode		*current, 
-		   std::vector<KDTreeNodeInfo>	&recHits)
-{
-  // By construction, current can't be null
-  assert(current != nullptr);
-
-  if ((current->left == nullptr) && (current->right == nullptr)) // leaf
-    recHits.push_back(current->rh);
-  else { // node
-    addSubtree(current->left, recHits);
-    addSubtree(current->right, recHits);
-  }
-}
-
-
-void 
-KDTreeLinkerAlgo::clearTree()
-{
-  delete[] nodePool_;
-  nodePool_ = nullptr;
-  root_ = nullptr;
-  nodePoolSize_ = -1;
-  nodePoolPos_ = -1;
-}
-
-void 
-KDTreeLinkerAlgo::clear()
-{
-  if (root_)
-    clearTree();
-}
-
-
-KDTreeNode* 
-KDTreeLinkerAlgo::getNextNode()
-{
-  ++nodePoolPos_;
-
-  // The tree size is exactly 2 * nbrElts - 1 and this is the total allocated memory.
-  // If we have used more than that....there is a big problem.
-  assert(nodePoolPos_ < nodePoolSize_);
-
-  return &(nodePool_[nodePoolPos_]);
-}
diff --git a/RecoParticleFlow/PFProducer/src/PFAlgo.cc b/RecoParticleFlow/PFProducer/src/PFAlgo.cc
index 2f4ba4d8e1a72..1381fae7b4bc3 100644
--- a/RecoParticleFlow/PFProducer/src/PFAlgo.cc
+++ b/RecoParticleFlow/PFProducer/src/PFAlgo.cc
@@ -2,8 +2,6 @@
 
 #include "RecoParticleFlow/PFProducer/interface/PFAlgo.h"
 #include "RecoParticleFlow/PFProducer/interface/PFMuonAlgo.h"
-#include "RecoParticleFlow/PFProducer/interface/PFElectronAlgo.h"
-#include "RecoParticleFlow/PFProducer/interface/PFPhotonAlgo.h"
 #include "RecoParticleFlow/PFProducer/interface/PFElectronExtraEqual.h"
 #include "RecoParticleFlow/PFTracking/interface/PFTrackAlgoTools.h"
 
@@ -48,23 +46,18 @@ using namespace std;
 using namespace reco;
 
 
-PFAlgo::PFAlgo()
+PFAlgo::PFAlgo(bool debug)
   : pfCandidates_( new PFCandidateCollection),
     nSigmaECAL_(0),
     nSigmaHCAL_(1),
     algo_(1),
-    debug_(false),
+    debug_(debug),
     pfele_(nullptr),
     pfpho_(nullptr),
+    connector_(debug),
     useVertices_(false)
 {}
 
-PFAlgo::~PFAlgo() {
-  if (usePFElectrons_) delete pfele_;
-  if (usePFPhotons_)     delete pfpho_;
-}
-
-
 void
 PFAlgo::setParameters(double nSigmaECAL,
                       double nSigmaHCAL,
@@ -131,7 +124,7 @@ PFAlgo::setPFEleParameters(double mvaEleCut,
     err += "'";
     throw invalid_argument( err );
   }
-  pfele_= new PFElectronAlgo(mvaEleCut_,mvaWeightFileEleID_,
+  pfele_= std::make_unique<PFElectronAlgo>(mvaEleCut_,mvaWeightFileEleID_,
 			     thePFSCEnergyCalibration_,
 			     thePFEnergyCalibration,
 			     applyCrackCorrectionsElectrons_,
@@ -187,7 +180,7 @@ PFAlgo::setPFPhotonParameters(bool usePFPhotons,
     throw invalid_argument( err );
   }
   const reco::Vertex* pv=&dummy;
-  pfpho_ = new PFPhotonAlgo(mvaWeightFileConvID,
+  pfpho_ = std::make_unique<PFPhotonAlgo>(mvaWeightFileConvID,
 			    mvaConvCut,
 			    useReg,
 			    X0_Map,
@@ -3743,8 +3736,10 @@ void PFAlgo::setElectronExtraRef(const edm::OrphanHandle<reco::PFCandidateElectr
     else  // else save the mva and the extra as well !
       {
 	if(cand.trackRef().isNonnull()) {
-	  PFElectronExtraKfEqual myExtraEqual(cand.trackRef());
-	  std::vector<PFCandidateElectronExtra>::const_iterator it=find_if(pfElectronExtra_.begin(),pfElectronExtra_.end(),myExtraEqual);
+	  auto it = find_if(pfElectronExtra_.begin(),pfElectronExtra_.end(),
+              [&cand](const reco::PFCandidateElectronExtra & extra) {
+                  return cand.trackRef() == extra.kfTrackRef();
+              });
 	  if(it!=pfElectronExtra_.end()) {
 	    cand.set_mva_e_pi(it->mvaVariable(PFCandidateElectronExtra::MVA_MVA));
 	    reco::PFCandidateElectronExtraRef theRef(extrah,it-pfElectronExtra_.begin());
diff --git a/RecoParticleFlow/PFProducer/src/PFBlockAlgo.cc b/RecoParticleFlow/PFProducer/src/PFBlockAlgo.cc
index 71bd4bd14c7ea..7bf00a5793980 100644
--- a/RecoParticleFlow/PFProducer/src/PFBlockAlgo.cc
+++ b/RecoParticleFlow/PFProducer/src/PFBlockAlgo.cc
@@ -1,14 +1,17 @@
 #include "RecoParticleFlow/PFProducer/interface/PFBlockAlgo.h"
-#include "RecoParticleFlow/PFClusterTools/interface/LinkByRecHit.h"
-#include "DataFormats/ParticleFlowReco/interface/PFBlock.h"
-#include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/ParticleFlowReco/interface/PFDisplacedVertex.h" // gouzevitch
+#include "FWCore/Framework/interface/ProductRegistryHelper.h"
+#include "FWCore/Framework/src/WorkerMaker.h"
+#include "FWCore/MessageLogger/interface/ErrorObj.h"
+#include "FWCore/ParameterSet/interface/ParameterSetDescriptionFiller.h"
+#include "FWCore/PluginManager/interface/PluginFactory.h"
 
-#include "DataFormats/ParticleFlowReco/interface/PFRecHit.h"
-
-#include <stdexcept>
 #include <algorithm>
-#include "TMath.h"
+#include <iostream>
+#include <array>
+#include <iterator>
+#include <sstream>
+#include <type_traits>
+#include <utility>
 
 using namespace std;
 using namespace reco;
@@ -112,7 +115,7 @@ void PFBlockAlgo::setLinkers(const std::vector<edm::ParameterSet>& confs) {
     const PFBlockElement::Type type1 = elementTypes_.at(link1);
     const PFBlockElement::Type type2 = elementTypes_.at(link2);    
     const unsigned index  = rowsize*std::max(type1,type2)+std::min(type1,type2);
-    linkTests_[index] = LinkTestPtr{BlockElementLinkerFactory::get()->create(linkerName,conf)};
+    linkTests_[index].reset(BlockElementLinkerFactory::get()->create(linkerName,conf));
     linkTestSquare_[type1][type2] = index;
     linkTestSquare_[type2][type1] = index;
     // setup KDtree if requested
@@ -191,8 +194,6 @@ reco::PFBlockCollection PFBlockAlgo::findBlocks() {
     blocksmap.emplace(key,i);
   }
 
-  PFBlockLink::Type linktype = PFBlockLink::NONE;
-  PFBlock::LinkTest linktest = PFBlock::LINKTEST_RECHIT;
   for( auto key : keys ) {
     blocks.push_back( reco::PFBlock() );
     auto range = blocksmap.equal_range(key);
@@ -201,7 +202,7 @@ reco::PFBlockCollection PFBlockAlgo::findBlocks() {
     the_block.addElement(p1);
     const unsigned block_size = blocksmap.count(key) + 1;
     //reserve up to 1M or 8MB; pay rehash cost for more
-    std::unordered_map<std::pair<unsigned int,unsigned int>, PFBlockLink > links(min(1000000u,block_size*block_size));
+    std::unordered_map<std::pair<unsigned int,unsigned int>, double > links(min(1000000u,block_size*block_size));
     auto itr = range.first;
     ++itr;
     for( ; itr != range.second; ++itr ) {
@@ -209,14 +210,10 @@ reco::PFBlockCollection PFBlockAlgo::findBlocks() {
       const PFBlockElement::Type type1 = p1->type();
       const PFBlockElement::Type type2 = p2->type();        
       the_block.addElement(p2);
-      linktest = PFBlock::LINKTEST_RECHIT; //rechit by default 
-      linktype = static_cast<PFBlockLink::Type>(1<<(type1-1)|1<<(type2-1));
       const unsigned index = linkTestSquare_[type1][type2];
       if( nullptr != linkTests_[index] ) {
         const double dist = linkTests_[index]->testLink(p1,p2);
-        links.emplace( std::make_pair(p1->index(), p2->index()) ,
-                       PFBlockLink( linktype, linktest, dist,
-                                    p1->index(), p2->index() ) );
+        links.emplace( std::make_pair(p1->index(), p2->index()), dist );
       }
     }
     packLinks( the_block, links );    
@@ -229,7 +226,7 @@ reco::PFBlockCollection PFBlockAlgo::findBlocks() {
 
 void 
 PFBlockAlgo::packLinks( reco::PFBlock& block, 
-			   const std::unordered_map<std::pair<unsigned int,unsigned int>,PFBlockLink>& links ) const {
+			   const std::unordered_map<std::pair<unsigned int,unsigned int>,double>& links ) const {
   constexpr unsigned rowsize = reco::PFBlockElement::kNBETypes;
   
   const edm::OwnVector< reco::PFBlockElement >& els = block.elements();
@@ -246,15 +243,12 @@ PFBlockAlgo::packLinks( reco::PFBlock& block,
       double dist = -1;
       
       bool linked = false;
-      PFBlock::LinkTest linktest 
-	= PFBlock::LINKTEST_RECHIT; 
 
       // are these elements already linked ?
       // this can be optimized
       const auto link_itr = links.find(std::make_pair(i2,i1));
       if( link_itr != links.end() ) {
-	dist = link_itr->second.dist();
-	linktest = link_itr->second.test();
+	dist = link_itr->second;
 	linked = true;
       }      
       
@@ -263,50 +257,26 @@ PFBlockAlgo::packLinks( reco::PFBlock& block,
         const PFBlockElement::Type type2 = els[i2].type();
         const auto minmax = std::minmax(type1,type2);
         const unsigned index = rowsize*minmax.second + minmax.first;
-	PFBlockLink::Type linktype = PFBlockLink::NONE;
 	bool bTestLink = ( nullptr == linkTests_[index] ? false : linkTests_[index]->linkPrefilter(&(els[i1]),&(els[i2])) );
-	if (bTestLink) link( & els[i1], & els[i2], linktype, linktest, dist);
+	if (bTestLink) link( & els[i1], & els[i2], dist);
       }
 
       //loading link data according to link test used: RECHIT 
       //block.setLink( i1, i2, chi2, block.linkData() );
-#ifdef PFLOW_DEBUG
-      if( debug_ )
-	cout << "Setting link between elements " << i1 << " and " << i2
-	     << " of dist =" << dist << " computed from link test "
-	     << linktest << endl;
-#endif
-      block.setLink( i1, i2, dist, block.linkData(), linktest );
+      block.setLink( i1, i2, dist, block.linkData() );
     }
   }
 
 }
 
-// see plugins/linkers for the functions that calculate distances
-// for each available link type
-inline bool
-PFBlockAlgo::linkPrefilter(const reco::PFBlockElement* last, 
-			      const reco::PFBlockElement* next) const {
-  constexpr unsigned rowsize = reco::PFBlockElement::kNBETypes;
-  const PFBlockElement::Type type1 = (last)->type();
-  const PFBlockElement::Type type2 = (next)->type();
-  const unsigned index = rowsize*std::max(type1,type2) + std::min(type1,type2);
-  bool result =  linkTests_[index]->linkPrefilter(last,next);
-  return result;  
-}
-
 inline void 
 PFBlockAlgo::link( const reco::PFBlockElement* el1, 
 		      const reco::PFBlockElement* el2, 
-		      PFBlockLink::Type& linktype, 
-		      reco::PFBlock::LinkTest& linktest,
 		      double& dist) const {
   constexpr unsigned rowsize = reco::PFBlockElement::kNBETypes;
   dist=-1.0;
-  linktest = PFBlock::LINKTEST_RECHIT; //rechit by default 
   const PFBlockElement::Type type1 = el1->type();
   const PFBlockElement::Type type2 = el2->type();
-  linktype = static_cast<PFBlockLink::Type>(1<<(type1-1)|1<<(type2-1));
   const unsigned index = rowsize*std::max(type1,type2) + std::min(type1,type2);
   if(debug_ ) { 
     std::cout << " PFBlockAlgo links type1 " << type1 
@@ -377,9 +347,8 @@ std::ostream& operator<<(std::ostream& out, const PFBlockAlgo& a) {
   out<<"number of unassociated elements : "<<a.elements_.size()<<endl;
   out<<endl;
   
-  for(PFBlockAlgo::IEC ie = a.elements_.begin(); 
-      ie != a.elements_.end(); ++ie) {
-    out<<"\t"<<**ie <<endl;
+  for(auto const& element : a.elements_) {
+    out<<"\t"<< *element <<endl;
   }
   
   return out;
diff --git a/RecoParticleFlow/PFProducer/src/PFBlockLink.cc b/RecoParticleFlow/PFProducer/src/PFBlockLink.cc
deleted file mode 100644
index e9ce179e1b3fa..0000000000000
--- a/RecoParticleFlow/PFProducer/src/PFBlockLink.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "RecoParticleFlow/PFProducer/interface/PFBlockLink.h"
-
-#include <iomanip>
-
-using namespace std;
-
-std::ostream& operator<<(std::ostream& out, 
-			 const PFBlockLink& l) {
-  if(!out) return out;  
-
-  out<<setiosflags(ios::fixed);
-  
-  out<<"link : "
-     <<" 0x"<<std::hex<<l.type_<<std::dec<<"\t";
-
-  out<<setiosflags(ios::right);
-  out<<setw(10)<<l.dist_
-     <<" "<<l.element1_<<" "<<l.element2_;
-  
-  out<<resetiosflags(ios::right|ios::fixed);
-  
-  return out;  
-}
diff --git a/RecoParticleFlow/PFProducer/src/PFCandConnector.cc b/RecoParticleFlow/PFProducer/src/PFCandConnector.cc
index 27fec41bfc3af..febb2b47ac907 100644
--- a/RecoParticleFlow/PFProducer/src/PFCandConnector.cc
+++ b/RecoParticleFlow/PFProducer/src/PFCandConnector.cc
@@ -50,15 +50,14 @@ void PFCandConnector::setParameters(bool bCorrect, bool bCalibPrimary, double dp
 
 
 
-std::unique_ptr<reco::PFCandidateCollection>
-PFCandConnector::connect(std::unique_ptr<PFCandidateCollection>& pfCand) {
+reco::PFCandidateCollection
+PFCandConnector::connect(PFCandidateCollection& pfCand) const {
    
-  if(pfC_.get() ) pfC_->clear();
-  else 
-    pfC_.reset( new PFCandidateCollection );
-
-  bMask_.clear();
-  bMask_.resize(pfCand->size(), false);
+  /// Collection of primary PFCandidates to be transmitted to the Event
+  PFCandidateCollection pfC{};
+  /// A mask to define the candidates which shall not be transmitted
+  std::vector<bool> bMask;
+  bMask.resize(pfCand.size(), false);
 
   // debug_ = true;
 
@@ -69,31 +68,31 @@ PFCandConnector::connect(std::unique_ptr<PFCandidateCollection>& pfCand) {
       cout << "==================== ------------------------------ ===============" << endl;
       cout << "====================         Cand Connector         ===============" << endl;
       cout << "==================== ------------------------------ ===============" << endl;
-      cout << "====================   \tfor " <<  pfCand->size() << " Candidates\t  =============" << endl; 
+      cout << "====================   \tfor " <<  pfCand.size() << " Candidates\t  =============" << endl; 
       cout << "==================== primary calibrated " << bCalibPrimary_ << "     =============" << endl;
     }
 
-    for( unsigned int ce1=0; ce1 < pfCand->size(); ++ce1){
-      if ( isPrimaryNucl(pfCand->at(ce1)) ){
+    for( unsigned int ce1=0; ce1 < pfCand.size(); ++ce1){
+      if ( isPrimaryNucl(pfCand.at(ce1)) ){
 
 	if (debug_) 
 	  cout << "" << endl << "Nuclear Interaction w Primary Candidate " << ce1 
-	       << " " << pfCand->at(ce1) << endl
-	       << " based on the Track " << pfCand->at(ce1).trackRef().key()
-	       << " w pT = " << pfCand->at(ce1).trackRef()->pt()
-	       << " #pm " << pfCand->at(ce1).trackRef()->ptError()/pfCand->at(ce1).trackRef()->pt()*100 << " %" 
-	       << " ECAL = " << pfCand->at(ce1).ecalEnergy() 
-	       << " HCAL = " << pfCand->at(ce1).hcalEnergy() << endl;
+	       << " " << pfCand.at(ce1) << endl
+	       << " based on the Track " << pfCand.at(ce1).trackRef().key()
+	       << " w pT = " << pfCand.at(ce1).trackRef()->pt()
+	       << " #pm " << pfCand.at(ce1).trackRef()->ptError()/pfCand.at(ce1).trackRef()->pt()*100 << " %" 
+	       << " ECAL = " << pfCand.at(ce1).ecalEnergy() 
+	       << " HCAL = " << pfCand.at(ce1).hcalEnergy() << endl;
 
-	if (debug_) (pfCand->at(ce1)).displacedVertexRef(fT_TO_DISP_)->Dump();
+	if (debug_) (pfCand.at(ce1)).displacedVertexRef(fT_TO_DISP_)->Dump();
 
-	analyseNuclearWPrim(pfCand, ce1);
+	analyseNuclearWPrim(pfCand, bMask, ce1);
 	    
 	if (debug_){
 	  cout << "After Connection the candidate " << ce1 
-	       << " is " << pfCand->at(ce1) << endl << endl;
+	       << " is " << pfCand.at(ce1) << endl << endl;
 	  
-	  PFCandidate::ElementsInBlocks elementsInBlocks = pfCand->at(ce1).elementsInBlocks();
+	  PFCandidate::ElementsInBlocks elementsInBlocks = pfCand.at(ce1).elementsInBlocks();
 	  for (unsigned blockElem = 0; blockElem < elementsInBlocks.size(); blockElem++){
 	    if (blockElem == 0) cout << *(elementsInBlocks[blockElem].first) << endl;  
 	    cout << " position " << elementsInBlocks[blockElem].second;
@@ -104,29 +103,29 @@ PFCandConnector::connect(std::unique_ptr<PFCandidateCollection>& pfCand) {
 
     }
 
-    for( unsigned int ce1=0; ce1 < pfCand->size(); ++ce1){
-      if ( !bMask_[ce1] && isSecondaryNucl(pfCand->at(ce1)) ){
+    for( unsigned int ce1=0; ce1 < pfCand.size(); ++ce1){
+      if ( !bMask[ce1] && isSecondaryNucl(pfCand.at(ce1)) ){
 	if (debug_) 
 	  cout << "" << endl << "Nuclear Interaction w no Primary Candidate " << ce1 
-	       << " " << pfCand->at(ce1) << endl
-	       << " based on the Track " << pfCand->at(ce1).trackRef().key()
-	       << " w pT = " << pfCand->at(ce1).trackRef()->pt()
-	       << " #pm " << pfCand->at(ce1).trackRef()->ptError() << " %" 
-	       << " ECAL = " << pfCand->at(ce1).ecalEnergy() 
-	       << " HCAL = " << pfCand->at(ce1).hcalEnergy() 
-	       << " dE(Trk-CALO) = " << pfCand->at(ce1).trackRef()->p()-pfCand->at(ce1).ecalEnergy()-pfCand->at(ce1).hcalEnergy() 
-	       << " Nmissing hits = " << pfCand->at(ce1).trackRef()->hitPattern().numberOfLostHits(reco::HitPattern::MISSING_OUTER_HITS) << endl;
-
-	if (debug_) (pfCand->at(ce1)).displacedVertexRef(fT_FROM_DISP_)->Dump();
+	       << " " << pfCand.at(ce1) << endl
+	       << " based on the Track " << pfCand.at(ce1).trackRef().key()
+	       << " w pT = " << pfCand.at(ce1).trackRef()->pt()
+	       << " #pm " << pfCand.at(ce1).trackRef()->ptError() << " %" 
+	       << " ECAL = " << pfCand.at(ce1).ecalEnergy() 
+	       << " HCAL = " << pfCand.at(ce1).hcalEnergy() 
+	       << " dE(Trk-CALO) = " << pfCand.at(ce1).trackRef()->p()-pfCand.at(ce1).ecalEnergy()-pfCand.at(ce1).hcalEnergy() 
+	       << " Nmissing hits = " << pfCand.at(ce1).trackRef()->hitPattern().numberOfLostHits(reco::HitPattern::MISSING_OUTER_HITS) << endl;
+
+	if (debug_) (pfCand.at(ce1)).displacedVertexRef(fT_FROM_DISP_)->Dump();
 		
-	analyseNuclearWSec(pfCand, ce1);
+	analyseNuclearWSec(pfCand, bMask, ce1);
 	
 	if (debug_) {
 	  cout << "After Connection the candidate " << ce1 
-	       << " is " << pfCand->at(ce1)
+	       << " is " << pfCand.at(ce1)
 	       << " and elements connected to it are: " << endl;
 	  
-	  PFCandidate::ElementsInBlocks elementsInBlocks = pfCand->at(ce1).elementsInBlocks();
+	  PFCandidate::ElementsInBlocks elementsInBlocks = pfCand.at(ce1).elementsInBlocks();
 	  for (unsigned blockElem = 0; blockElem < elementsInBlocks.size(); blockElem++){
 	    if (blockElem == 0) cout << *(elementsInBlocks[blockElem].first) << endl;  
 	    cout << " position " << elementsInBlocks[blockElem].second;
@@ -142,24 +141,24 @@ PFCandConnector::connect(std::unique_ptr<PFCandidateCollection>& pfCand) {
 
     
 
-  for( unsigned int ce1=0; ce1 < pfCand->size(); ++ce1)
-    if (!bMask_[ce1]) pfC_->push_back(pfCand->at(ce1));
+  for( unsigned int ce1=0; ce1 < pfCand.size(); ++ce1)
+    if (!bMask[ce1]) pfC.push_back(pfCand.at(ce1));
 
 
   if(debug_ && bCorrect_) cout << "==================== ------------------------------ ===============" << endl<< endl << endl;
    
-  return std::move(pfC_);
+  return pfC;
 
 
 }
 
 void 
-PFCandConnector::analyseNuclearWPrim(std::unique_ptr<PFCandidateCollection>& pfCand, unsigned int ce1) {
+PFCandConnector::analyseNuclearWPrim(PFCandidateCollection& pfCand, std::vector<bool> & bMask, unsigned int ce1) const {
 
 
   PFDisplacedVertexRef ref1, ref2, ref1_bis;  
 
-  PFCandidate primaryCand = pfCand->at(ce1);
+  PFCandidate primaryCand = pfCand.at(ce1);
 
   // ------- look for the little friends -------- //
 
@@ -175,65 +174,65 @@ PFCandConnector::analyseNuclearWPrim(std::unique_ptr<PFCandidateCollection>& pfC
     
   ref1 = primaryCand.displacedVertexRef(fT_TO_DISP_);
   
-  for( unsigned int ce2=0; ce2 < pfCand->size(); ++ce2) {
-    if (ce2 != ce1 && isSecondaryNucl(pfCand->at(ce2))){
+  for( unsigned int ce2=0; ce2 < pfCand.size(); ++ce2) {
+    if (ce2 != ce1 && isSecondaryNucl(pfCand.at(ce2))){
       
-      ref2 = (pfCand->at(ce2)).displacedVertexRef(fT_FROM_DISP_);
+      ref2 = (pfCand.at(ce2)).displacedVertexRef(fT_FROM_DISP_);
       
       if (ref1 == ref2) {
 	
 	if (debug_) cout << "\t here is a Secondary Candidate " << ce2  
-			 << " " << pfCand->at(ce2) << endl
-			 << "\t based on the Track " << pfCand->at(ce2).trackRef().key()
-			 << " w p = " << pfCand->at(ce2).trackRef()->p()
-			 << " w pT = " << pfCand->at(ce2).trackRef()->pt()
-			 << " #pm " << pfCand->at(ce2).trackRef()->ptError() << " %"
-			 << " ECAL = " << pfCand->at(ce2).ecalEnergy() 
-			 << " HCAL = " << pfCand->at(ce2).hcalEnergy() 
-			 << " dE(Trk-CALO) = " << pfCand->at(ce2).trackRef()->p()-pfCand->at(ce2).ecalEnergy()-pfCand->at(ce2).hcalEnergy() 
-			 << " Nmissing hits = " << pfCand->at(ce2).trackRef()->hitPattern().numberOfLostHits(reco::HitPattern::MISSING_OUTER_HITS) << endl;
-
-	if(isPrimaryNucl(pfCand->at(ce2))){
+			 << " " << pfCand.at(ce2) << endl
+			 << "\t based on the Track " << pfCand.at(ce2).trackRef().key()
+			 << " w p = " << pfCand.at(ce2).trackRef()->p()
+			 << " w pT = " << pfCand.at(ce2).trackRef()->pt()
+			 << " #pm " << pfCand.at(ce2).trackRef()->ptError() << " %"
+			 << " ECAL = " << pfCand.at(ce2).ecalEnergy() 
+			 << " HCAL = " << pfCand.at(ce2).hcalEnergy() 
+			 << " dE(Trk-CALO) = " << pfCand.at(ce2).trackRef()->p()-pfCand.at(ce2).ecalEnergy()-pfCand.at(ce2).hcalEnergy() 
+			 << " Nmissing hits = " << pfCand.at(ce2).trackRef()->hitPattern().numberOfLostHits(reco::HitPattern::MISSING_OUTER_HITS) << endl;
+
+	if(isPrimaryNucl(pfCand.at(ce2))){
 	  if (debug_) cout << "\t\t but it is also a Primary Candidate " << ce2 << endl;
 	  
-	  ref1_bis = (pfCand->at(ce2)).displacedVertexRef(fT_TO_DISP_);
-	  if(ref1_bis.isNonnull()) analyseNuclearWPrim(pfCand, ce2);  
+	  ref1_bis = (pfCand.at(ce2)).displacedVertexRef(fT_TO_DISP_);
+	  if(ref1_bis.isNonnull()) analyseNuclearWPrim(pfCand, bMask, ce2);  
 	}
 
 	// Take now the parameters of the secondary track that are relevant and use them to construct the NI candidate
 
-	PFCandidate::ElementsInBlocks elementsInBlocks = pfCand->at(ce2).elementsInBlocks();
-	PFCandidate::ElementsInBlocks elementsAlreadyInBlocks = pfCand->at(ce1).elementsInBlocks();
+	PFCandidate::ElementsInBlocks elementsInBlocks = pfCand.at(ce2).elementsInBlocks();
+	PFCandidate::ElementsInBlocks elementsAlreadyInBlocks = pfCand.at(ce1).elementsInBlocks();
 	for (unsigned blockElem = 0; blockElem < elementsInBlocks.size(); blockElem++){
 	  bool isAlreadyHere = false;
 	  for (unsigned alreadyBlock = 0; alreadyBlock < elementsAlreadyInBlocks.size(); alreadyBlock++){
 	    if (elementsAlreadyInBlocks[alreadyBlock].second == elementsInBlocks[blockElem].second) isAlreadyHere = true;
 	  }
-	  if (!isAlreadyHere) pfCand->at(ce1).addElementInBlock( elementsInBlocks[blockElem].first,  elementsInBlocks[blockElem].second);
+	  if (!isAlreadyHere) pfCand.at(ce1).addElementInBlock( elementsInBlocks[blockElem].first,  elementsInBlocks[blockElem].second);
 	}
 
-	double caloEn = pfCand->at(ce2).ecalEnergy() + pfCand->at(ce2).hcalEnergy();
-	double deltaEn =  pfCand->at(ce2).p4().E() - caloEn;
-	int nMissOuterHits = pfCand->at(ce2).trackRef()->hitPattern().numberOfLostHits(reco::HitPattern::MISSING_OUTER_HITS);
+	double caloEn = pfCand.at(ce2).ecalEnergy() + pfCand.at(ce2).hcalEnergy();
+	double deltaEn =  pfCand.at(ce2).p4().E() - caloEn;
+	int nMissOuterHits = pfCand.at(ce2).trackRef()->hitPattern().numberOfLostHits(reco::HitPattern::MISSING_OUTER_HITS);
 	
 
 	// Check if the difference Track Calo is not too large and if we can trust the track, ie it doesn't miss too much hits.
 	if (deltaEn > 1  && nMissOuterHits > 1) {
-	  math::XYZTLorentzVectorD momentumToAdd = pfCand->at(ce2).p4()*caloEn/pfCand->at(ce2).p4().E();
+	  math::XYZTLorentzVectorD momentumToAdd = pfCand.at(ce2).p4()*caloEn/pfCand.at(ce2).p4().E();
 	  momentumSec += momentumToAdd;
 	  if (debug_) cout << "The difference track-calo s really large and the track miss at least 2 hits. A secondary NI may have happened. Let's trust the calo energy" << endl << "add " << momentumToAdd << endl;
 	  
 	} else {
 	  // Check if the difference Track Calo is not too large and if we can trust the track, ie it doesn't miss too much hits.
 	  if (caloEn > 0.01 && deltaEn > 1  && nMissOuterHits > 0) {
-	    math::XYZTLorentzVectorD momentumExcess = pfCand->at(ce2).p4()*deltaEn/pfCand->at(ce2).p4().E();
-	    candidatesWithTrackExcess[pfCand->at(ce2).trackRef()->pt()/pfCand->at(ce2).trackRef()->ptError()] =  momentumExcess;
+	    math::XYZTLorentzVectorD momentumExcess = pfCand.at(ce2).p4()*deltaEn/pfCand.at(ce2).p4().E();
+	    candidatesWithTrackExcess[pfCand.at(ce2).trackRef()->pt()/pfCand.at(ce2).trackRef()->ptError()] =  momentumExcess;
 	  }
-	  else if(caloEn < 0.01) candidatesWithoutCalo[pfCand->at(ce2).trackRef()->pt()/pfCand->at(ce2).trackRef()->ptError()] = pfCand->at(ce2).p4();
-	  momentumSec += (pfCand->at(ce2)).p4();
+	  else if(caloEn < 0.01) candidatesWithoutCalo[pfCand.at(ce2).trackRef()->pt()/pfCand.at(ce2).trackRef()->ptError()] = pfCand.at(ce2).p4();
+	  momentumSec += (pfCand.at(ce2)).p4();
 	}
 
-	bMask_[ce2] = true;
+	bMask[ce2] = true;
 
 
 	
@@ -271,10 +270,10 @@ PFCandConnector::analyseNuclearWPrim(std::unique_ptr<PFCandidateCollection>& pfC
 
     
 
-  double dpt = pfCand->at(ce1).trackRef()->ptError()/pfCand->at(ce1).trackRef()->pt()*100; 
+  double dpt = pfCand.at(ce1).trackRef()->ptError()/pfCand.at(ce1).trackRef()->pt()*100; 
 
   if (momentumSec.E() < 0.1) {
-    bMask_[ce1] = true;
+    bMask[ce1] = true;
     return;
   }
   
@@ -295,7 +294,7 @@ PFCandConnector::analyseNuclearWPrim(std::unique_ptr<PFCandidateCollection>& pfC
     double pz = momentumPrim.Pz()*momentumSec.P()/momentumPrim.P();
     double E  = sqrt(px*px + py*py + pz*pz + pion_mass2);
     math::XYZTLorentzVectorD momentum(px, py, pz, E);
-    pfCand->at(ce1).setP4(momentum);
+    pfCand.at(ce1).setP4(momentum);
     
     return;
     
@@ -307,7 +306,7 @@ PFCandConnector::analyseNuclearWPrim(std::unique_ptr<PFCandidateCollection>& pfC
     if (primDir.Mag2() < 0.1){
       // It might be 0 but this situation should never happend. Throw a warning if it happens.
       edm::LogWarning("PFCandConnector") << "A Nuclear Interaction do not have primary direction" << std::endl;
-      pfCand->at(ce1).setP4(momentumSec);
+      pfCand.at(ce1).setP4(momentumSec);
       return;
     } else {
       // rescale the primary direction to the optimal momentum. But take care of the factthat it shall not be completly 0 to avoid a warning if Jet Area. 
@@ -319,7 +318,7 @@ PFCandConnector::analyseNuclearWPrim(std::unique_ptr<PFCandidateCollection>& pfC
       double E  = sqrt(px*px + py*py + pz*pz + pion_mass2);
       
       math::XYZTLorentzVectorD momentum(px, py, pz, E);
-      pfCand->at(ce1).setP4(momentum);
+      pfCand.at(ce1).setP4(momentum);
       return;
     }
   }
@@ -332,19 +331,19 @@ PFCandConnector::analyseNuclearWPrim(std::unique_ptr<PFCandidateCollection>& pfC
 
 
 void 
-PFCandConnector::analyseNuclearWSec(std::unique_ptr<PFCandidateCollection>& pfCand, unsigned int ce1){
+PFCandConnector::analyseNuclearWSec(PFCandidateCollection& pfCand, std::vector<bool> & bMask, unsigned int ce1) const {
 
   PFDisplacedVertexRef ref1, ref2;  
 
 
   // Check if the track excess was not too large and track may miss some outer hits. This may point to a secondary NI.
 
-  double caloEn = pfCand->at(ce1).ecalEnergy() + pfCand->at(ce1).hcalEnergy();
-  double deltaEn =  pfCand->at(ce1).p4().E() - caloEn;
-  int nMissOuterHits = pfCand->at(ce1).trackRef()->hitPattern().numberOfLostHits(reco::HitPattern::MISSING_OUTER_HITS);
+  double caloEn = pfCand.at(ce1).ecalEnergy() + pfCand.at(ce1).hcalEnergy();
+  double deltaEn =  pfCand.at(ce1).p4().E() - caloEn;
+  int nMissOuterHits = pfCand.at(ce1).trackRef()->hitPattern().numberOfLostHits(reco::HitPattern::MISSING_OUTER_HITS);
 
 
-  ref1 = pfCand->at(ce1).displacedVertexRef(fT_FROM_DISP_);
+  ref1 = pfCand.at(ce1).displacedVertexRef(fT_FROM_DISP_);
 
   // ------- check if an electron or a muon vas spotted as incoming track -------- //
   // ------- this mean probably that the NI was fake thus we do not correct it -------- /
@@ -357,34 +356,34 @@ PFCandConnector::analyseNuclearWSec(std::unique_ptr<PFCandidateCollection>& pfCa
       if (ref1->isIncomingTrack(primaryBaseRef))
 	if (debug_) cout << "There is a Primary track ref with pt = " << primaryBaseRef->pt()<< endl;
 
-      for( unsigned int ce=0; ce < pfCand->size(); ++ce){
-	//	  cout << "PFCand Id = " << (pfCand->at(ce)).particleId() << endl;
-	if ((pfCand->at(ce)).particleId() == reco::PFCandidate::e || (pfCand->at(ce)).particleId() == reco::PFCandidate::mu) {
+      for( unsigned int ce=0; ce < pfCand.size(); ++ce){
+	//	  cout << "PFCand Id = " << (pfCand.at(ce)).particleId() << endl;
+	if ((pfCand.at(ce)).particleId() == reco::PFCandidate::e || (pfCand.at(ce)).particleId() == reco::PFCandidate::mu) {
 
-	  if (debug_) cout << " It is an electron and it has a ref to a track " << (pfCand->at(ce)).trackRef().isNonnull() << endl;
+	  if (debug_) cout << " It is an electron and it has a ref to a track " << (pfCand.at(ce)).trackRef().isNonnull() << endl;
 	  
 
-	  if ( (pfCand->at(ce)).trackRef().isNonnull() ){
-	    reco::TrackRef tRef = (pfCand->at(ce)).trackRef();
+	  if ( (pfCand.at(ce)).trackRef().isNonnull() ){
+	    reco::TrackRef tRef = (pfCand.at(ce)).trackRef();
 	    reco::TrackBaseRef bRef(tRef);
-	    if (debug_) cout << "With Track Ref pt = " << (pfCand->at(ce)).trackRef()->pt() << endl;
+	    if (debug_) cout << "With Track Ref pt = " << (pfCand.at(ce)).trackRef()->pt() << endl;
 
 	    if (bRef == primaryBaseRef) {
-	      if (debug_ && (pfCand->at(ce)).particleId() == reco::PFCandidate::e) cout << "It is a NI from electron. NI Discarded. Just release the candidate." << endl; 
-	      if (debug_ && (pfCand->at(ce)).particleId() == reco::PFCandidate::mu) cout << "It is a NI from muon. NI Discarded. Just release the candidate" << endl; 
+	      if (debug_ && (pfCand.at(ce)).particleId() == reco::PFCandidate::e) cout << "It is a NI from electron. NI Discarded. Just release the candidate." << endl; 
+	      if (debug_ && (pfCand.at(ce)).particleId() == reco::PFCandidate::mu) cout << "It is a NI from muon. NI Discarded. Just release the candidate" << endl; 
 	
 	      // release the track but take care of not overcounting bad tracks. In fact those tracks was protected against destruction in 
 	      // PFAlgo. Now we treat them as if they was treated in PFAlgo
 
-	      if (caloEn < 0.1 && pfCand->at(ce1).trackRef()->ptError() > ptErrorSecondary_) { 
+	      if (caloEn < 0.1 && pfCand.at(ce1).trackRef()->ptError() > ptErrorSecondary_) { 
 		cout << "discarded track since no calo energy and ill measured" << endl; 
-		bMask_[ce1] = true;
+		bMask[ce1] = true;
 	      }
-	      if (caloEn > 0.1 && deltaEn >ptErrorSecondary_  && pfCand->at(ce1).trackRef()->ptError() > ptErrorSecondary_) { 
+	      if (caloEn > 0.1 && deltaEn >ptErrorSecondary_  && pfCand.at(ce1).trackRef()->ptError() > ptErrorSecondary_) { 
 		cout << "rescaled momentum of the track since no calo energy and ill measured" << endl;
 		
-		double factor = caloEn/pfCand->at(ce1).p4().E();
-		pfCand->at(ce1).rescaleMomentum(factor);
+		double factor = caloEn/pfCand.at(ce1).p4().E();
+		pfCand.at(ce1).rescaleMomentum(factor);
 	      }
 
 	      return;
@@ -396,57 +395,57 @@ PFCandConnector::analyseNuclearWSec(std::unique_ptr<PFCandidateCollection>& pfCa
   }
 
 
-  PFCandidate secondaryCand = pfCand->at(ce1);
+  PFCandidate secondaryCand = pfCand.at(ce1);
 
   math::XYZTLorentzVectorD momentumSec = secondaryCand.p4();
 
   if (deltaEn > ptErrorSecondary_  && nMissOuterHits > 1) {
-    math::XYZTLorentzVectorD momentumToAdd = pfCand->at(ce1).p4()*caloEn/pfCand->at(ce1).p4().E();
+    math::XYZTLorentzVectorD momentumToAdd = pfCand.at(ce1).p4()*caloEn/pfCand.at(ce1).p4().E();
     momentumSec = momentumToAdd;
     if (debug_) cout << "The difference track-calo s really large and the track miss at least 2 hits. A secondary NI may have happened. Let's trust the calo energy" << endl << "add " << momentumToAdd << endl;  
   }
 
 
   // ------- look for the little friends -------- //
-  for( unsigned int ce2=ce1+1; ce2 < pfCand->size(); ++ce2) {
-    if (isSecondaryNucl(pfCand->at(ce2))){
-      ref2 = (pfCand->at(ce2)).displacedVertexRef(fT_FROM_DISP_);
+  for( unsigned int ce2=ce1+1; ce2 < pfCand.size(); ++ce2) {
+    if (isSecondaryNucl(pfCand.at(ce2))){
+      ref2 = (pfCand.at(ce2)).displacedVertexRef(fT_FROM_DISP_);
 
       if (ref1 == ref2) {
 	 
 	if (debug_) cout << "\t here is a Secondary Candidate " << ce2  
-			 << " " << pfCand->at(ce2) << endl
-			 << "\t based on the Track " << pfCand->at(ce2).trackRef().key()
-			 << " w pT = " << pfCand->at(ce2).trackRef()->pt()
-			 << " #pm " << pfCand->at(ce2).trackRef()->ptError() << " %" 
-			 << " ECAL = " << pfCand->at(ce2).ecalEnergy() 
-			 << " HCAL = " << pfCand->at(ce2).hcalEnergy() 
-			 << " dE(Trk-CALO) = " << pfCand->at(ce2).trackRef()->p()-pfCand->at(ce2).ecalEnergy()-pfCand->at(ce2).hcalEnergy() 
-			 << " Nmissing hits = " << pfCand->at(ce2).trackRef()->hitPattern().numberOfLostHits(reco::HitPattern::MISSING_OUTER_HITS) << endl;
+			 << " " << pfCand.at(ce2) << endl
+			 << "\t based on the Track " << pfCand.at(ce2).trackRef().key()
+			 << " w pT = " << pfCand.at(ce2).trackRef()->pt()
+			 << " #pm " << pfCand.at(ce2).trackRef()->ptError() << " %" 
+			 << " ECAL = " << pfCand.at(ce2).ecalEnergy() 
+			 << " HCAL = " << pfCand.at(ce2).hcalEnergy() 
+			 << " dE(Trk-CALO) = " << pfCand.at(ce2).trackRef()->p()-pfCand.at(ce2).ecalEnergy()-pfCand.at(ce2).hcalEnergy() 
+			 << " Nmissing hits = " << pfCand.at(ce2).trackRef()->hitPattern().numberOfLostHits(reco::HitPattern::MISSING_OUTER_HITS) << endl;
 
 	// Take now the parameters of the secondary track that are relevant and use them to construct the NI candidate
-	PFCandidate::ElementsInBlocks elementsInBlocks = pfCand->at(ce2).elementsInBlocks();
-	PFCandidate::ElementsInBlocks elementsAlreadyInBlocks = pfCand->at(ce1).elementsInBlocks();
+	PFCandidate::ElementsInBlocks elementsInBlocks = pfCand.at(ce2).elementsInBlocks();
+	PFCandidate::ElementsInBlocks elementsAlreadyInBlocks = pfCand.at(ce1).elementsInBlocks();
 	for (unsigned blockElem = 0; blockElem < elementsInBlocks.size(); blockElem++){
 	  bool isAlreadyHere = false;
 	  for (unsigned alreadyBlock = 0; alreadyBlock < elementsAlreadyInBlocks.size(); alreadyBlock++){
 	    if (elementsAlreadyInBlocks[alreadyBlock].second == elementsInBlocks[blockElem].second) isAlreadyHere = true;
 	  }
-	  if (!isAlreadyHere) pfCand->at(ce1).addElementInBlock( elementsInBlocks[blockElem].first,  elementsInBlocks[blockElem].second);
+	  if (!isAlreadyHere) pfCand.at(ce1).addElementInBlock( elementsInBlocks[blockElem].first,  elementsInBlocks[blockElem].second);
 	}
 
-	double caloEn = pfCand->at(ce2).ecalEnergy() + pfCand->at(ce2).hcalEnergy();
-	double deltaEn =  pfCand->at(ce2).p4().E() - caloEn;
-	int nMissOuterHits = pfCand->at(ce2).trackRef()->hitPattern().numberOfLostHits(reco::HitPattern::MISSING_OUTER_HITS); 
+	double caloEn = pfCand.at(ce2).ecalEnergy() + pfCand.at(ce2).hcalEnergy();
+	double deltaEn =  pfCand.at(ce2).p4().E() - caloEn;
+	int nMissOuterHits = pfCand.at(ce2).trackRef()->hitPattern().numberOfLostHits(reco::HitPattern::MISSING_OUTER_HITS); 
 	if (deltaEn > ptErrorSecondary_ && nMissOuterHits > 1) {
-	  math::XYZTLorentzVectorD momentumToAdd = pfCand->at(ce2).p4()*caloEn/pfCand->at(ce2).p4().E();
+	  math::XYZTLorentzVectorD momentumToAdd = pfCand.at(ce2).p4()*caloEn/pfCand.at(ce2).p4().E();
 	  momentumSec += momentumToAdd;
 	  if (debug_) cout << "The difference track-calo s really large and the track miss at least 2 hits. A secondary NI may have happened. Let's trust the calo energy" << endl << "add " << momentumToAdd << endl;  
 	} else {
-	  momentumSec += (pfCand->at(ce2)).p4();	
+	  momentumSec += (pfCand.at(ce2)).p4();	
 	}
 
-	bMask_[ce2] = true;
+	bMask[ce2] = true;
       }
     }
   }
@@ -458,7 +457,7 @@ PFCandConnector::analyseNuclearWSec(std::unique_ptr<PFCandidateCollection>& pfCa
 
   if (primDir.Mag2() < 0.1){
     // It might be 0 but this situation should never happend. Throw a warning if it happens.
-    pfCand->at(ce1).setP4(momentumSec);
+    pfCand.at(ce1).setP4(momentumSec);
     edm::LogWarning("PFCandConnector") << "A Nuclear Interaction do not have primary direction" << std::endl;
     return;
   } else {
@@ -472,7 +471,7 @@ PFCandConnector::analyseNuclearWSec(std::unique_ptr<PFCandidateCollection>& pfCa
      
     math::XYZTLorentzVectorD momentum(px, py, pz, E);
      
-    pfCand->at(ce1).setP4(momentum);
+    pfCand.at(ce1).setP4(momentum);
     return;
   }
 
diff --git a/RecoParticleFlow/PFProducer/src/PFEGammaAlgo.cc b/RecoParticleFlow/PFProducer/src/PFEGammaAlgo.cc
index 77160bb0eb0fb..bacddb8b0261c 100644
--- a/RecoParticleFlow/PFProducer/src/PFEGammaAlgo.cc
+++ b/RecoParticleFlow/PFProducer/src/PFEGammaAlgo.cc
@@ -17,7 +17,6 @@
 #include "RecoParticleFlow/PFClusterTools/interface/PFSCEnergyCalibration.h"
 #include "RecoParticleFlow/PFClusterTools/interface/PFEnergyResolution.h"
 #include "RecoParticleFlow/PFClusterTools/interface/PFClusterWidthAlgo.h"
-#include "RecoParticleFlow/PFProducer/interface/PFElectronExtraEqual.h"
 #include "RecoParticleFlow/PFTracking/interface/PFTrackAlgoTools.h"
 #include "DataFormats/Common/interface/RefToPtr.h"
 #include "RecoEcal/EgammaCoreTools/interface/Mustache.h"
@@ -583,16 +582,6 @@ PFEGammaAlgo::
 PFEGammaAlgo(const PFEGammaAlgo::PFEGConfigInfo& cfg) : cfg_(cfg)
 {}
 
-void PFEGammaAlgo::RunPFEG(const pfEGHelpers::HeavyObjectCache* hoc,
-                           const reco::PFBlockRef&  blockRef)
-{  
-
-  fifthStepKfTrack_.clear();
-  convGsfTrack_.clear();
-  
-  buildAndRefineEGObjects(hoc, blockRef);
-}
-
 float PFEGammaAlgo::evaluateSingleLegMVA(const pfEGHelpers::HeavyObjectCache* hoc,
                                          const reco::PFBlockRef& blockRef, 
                                          const reco::Vertex& primaryVtx, 
@@ -1759,8 +1748,8 @@ linkRefinableObjectSecondaryKFsToECAL(ProtoEGObject& RO) {
 	docast(const reco::PFBlockElementCluster*,ecal->first);      
       if( addPFClusterToROSafe(elemascluster,RO) ) {
 	attachPSClusters(elemascluster,RO.ecal2ps[elemascluster]);
-	RO.localMap.push_back(ElementMap::value_type(skf.first,elemascluster));
-	RO.localMap.push_back(ElementMap::value_type(elemascluster,skf.first));
+	RO.localMap.emplace_back(skf.first,elemascluster);
+	RO.localMap.emplace_back(elemascluster,skf.first);
 	ecal->second = false;      
       }
     }
@@ -1985,7 +1974,7 @@ float PFEGammaAlgo::calculateEleMVA(const pfEGHelpers::HeavyObjectCache* hoc,
     xtra.setGsfElectronClusterRef(_currentblock,*(ro.electronClusters[0]));
     firstEcalGsfEnergy = cref->correctedEnergy();    
     dEtGsfEcal = cref->positionREP().eta() - etaOutGsf;
-    gsfCluster.push_back(&*cref);
+    gsfCluster.push_back(cref.get());
     PFClusterWidthAlgo pfwidth(gsfCluster);
     sigmaEtaEta = pfwidth.pflowSigmaEtaEta();
   } 
diff --git a/RecoPixelVertexing/PixelLowPtUtilities/test/clusterShapeExtractor_phase1_cfg.py b/RecoPixelVertexing/PixelLowPtUtilities/test/clusterShapeExtractor_phase1_cfg.py
index cd1c560377b10..b296b74a92ffc 100644
--- a/RecoPixelVertexing/PixelLowPtUtilities/test/clusterShapeExtractor_phase1_cfg.py
+++ b/RecoPixelVertexing/PixelLowPtUtilities/test/clusterShapeExtractor_phase1_cfg.py
@@ -5,9 +5,9 @@
 # with command line options: step3 --conditions auto:phase1_2017_realistic -n 10 --era Run2_2017 --eventcontent RECOSIM,DQM --runUnscheduled -s RAW2DIGI,RECO:reconstruction_trackingOnly,VALIDATION:@trackingOnlyValidation,DQM:@trackingOnlyDQM --datatier GEN-SIM-RECO,DQMIO --geometry DB:Extended --filein file:step2.root --fileout file:step3.root
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('RECO',eras.Run2_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process('RECO',Run2_2017)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/RecoPixelVertexing/PixelLowPtUtilities/test/clusterShapeExtractor_phase2_cfg.py b/RecoPixelVertexing/PixelLowPtUtilities/test/clusterShapeExtractor_phase2_cfg.py
index 9cb576a5b051f..0c3158650f49f 100644
--- a/RecoPixelVertexing/PixelLowPtUtilities/test/clusterShapeExtractor_phase2_cfg.py
+++ b/RecoPixelVertexing/PixelLowPtUtilities/test/clusterShapeExtractor_phase2_cfg.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('RECO',eras.Phase2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('RECO',Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/RecoPixelVertexing/PixelTriplets/interface/CombinedHitTripletGenerator.h b/RecoPixelVertexing/PixelTriplets/interface/CombinedHitTripletGenerator.h
deleted file mode 100644
index 8e28bf6b64d4a..0000000000000
--- a/RecoPixelVertexing/PixelTriplets/interface/CombinedHitTripletGenerator.h
+++ /dev/null
@@ -1 +0,0 @@
-#error "moved to plugins: please remove reference"
diff --git a/RecoPixelVertexing/PixelTriplets/interface/ThirdHitPredictionFromInvLine.h b/RecoPixelVertexing/PixelTriplets/interface/ThirdHitPredictionFromInvLine.h
deleted file mode 100644
index a2cec7722461a..0000000000000
--- a/RecoPixelVertexing/PixelTriplets/interface/ThirdHitPredictionFromInvLine.h
+++ /dev/null
@@ -1 +0,0 @@
-#error "moved to plugin"
diff --git a/RecoPixelVertexing/PixelTriplets/interface/ThirdHitPredictionFromInvParabola.h b/RecoPixelVertexing/PixelTriplets/interface/ThirdHitPredictionFromInvParabola.h
deleted file mode 100644
index a2cec7722461a..0000000000000
--- a/RecoPixelVertexing/PixelTriplets/interface/ThirdHitPredictionFromInvParabola.h
+++ /dev/null
@@ -1 +0,0 @@
-#error "moved to plugin"
diff --git a/RecoPixelVertexing/PixelTriplets/interface/ThirdHitRZPrediction.h b/RecoPixelVertexing/PixelTriplets/interface/ThirdHitRZPrediction.h
deleted file mode 100644
index a2cec7722461a..0000000000000
--- a/RecoPixelVertexing/PixelTriplets/interface/ThirdHitRZPrediction.h
+++ /dev/null
@@ -1 +0,0 @@
-#error "moved to plugin"
diff --git a/RecoPixelVertexing/PixelTriplets/plugins/BuildFile.xml b/RecoPixelVertexing/PixelTriplets/plugins/BuildFile.xml
index 6b1a66a0725a3..c0353421246fc 100644
--- a/RecoPixelVertexing/PixelTriplets/plugins/BuildFile.xml
+++ b/RecoPixelVertexing/PixelTriplets/plugins/BuildFile.xml
@@ -1,3 +1,4 @@
+<use   name="CommonTools/RecoAlgos"/>
 <use   name="RecoTracker/TkTrackingRegions"/>
 <use   name="RecoPixelVertexing/PixelTriplets"/>
 <use   name="RecoTracker/TkSeedingLayers"/>
diff --git a/RecoPixelVertexing/PixelTriplets/plugins/PixelTripletHLTGenerator.cc b/RecoPixelVertexing/PixelTriplets/plugins/PixelTripletHLTGenerator.cc
index d3ffcb6adb280..98a3fdcb2f98a 100644
--- a/RecoPixelVertexing/PixelTriplets/plugins/PixelTripletHLTGenerator.cc
+++ b/RecoPixelVertexing/PixelTriplets/plugins/PixelTripletHLTGenerator.cc
@@ -18,8 +18,8 @@
 #include "RecoTracker/TkSeedingLayers/interface/SeedComparitor.h"
 
 #include "DataFormats/GeometryVector/interface/Pi.h"
-#include "RecoPixelVertexing/PixelTriplets/plugins/KDTreeLinkerAlgo.h" //amend to point at your copy...
-#include "RecoPixelVertexing/PixelTriplets/plugins/KDTreeLinkerTools.h"
+#include "CommonTools/RecoAlgos/interface/KDTreeLinkerAlgo.h"
+#include "CommonTools/RecoAlgos/interface/KDTreeLinkerTools.h"
 
 #include "CommonTools/Utils/interface/DynArray.h"
 
diff --git a/RecoPixelVertexing/PixelTriplets/plugins/PixelTripletLargeTipGenerator.cc b/RecoPixelVertexing/PixelTriplets/plugins/PixelTripletLargeTipGenerator.cc
index d67df0d04a8ce..fdf0584e15162 100644
--- a/RecoPixelVertexing/PixelTriplets/plugins/PixelTripletLargeTipGenerator.cc
+++ b/RecoPixelVertexing/PixelTriplets/plugins/PixelTripletLargeTipGenerator.cc
@@ -14,8 +14,8 @@
 #include "RecoTracker/TkHitPairs/interface/RecHitsSortedInPhi.h"
 
 #include "MatchedHitRZCorrectionFromBending.h"
-#include "RecoPixelVertexing/PixelTriplets/plugins/KDTreeLinkerAlgo.h" //amend to point at our version...
-#include "RecoPixelVertexing/PixelTriplets/plugins/KDTreeLinkerTools.h"
+#include "CommonTools/RecoAlgos/interface/KDTreeLinkerAlgo.h"
+#include "CommonTools/RecoAlgos/interface/KDTreeLinkerTools.h"
 
 #include <algorithm>
 #include <iostream>
diff --git a/RecoTBCalo/EcalTBRecProducers/src/EcalTBWeightUncalibRecHitProducer.cc b/RecoTBCalo/EcalTBRecProducers/src/EcalTBWeightUncalibRecHitProducer.cc
index c3a150c2a4191..77135f9a41583 100644
--- a/RecoTBCalo/EcalTBRecProducers/src/EcalTBWeightUncalibRecHitProducer.cc
+++ b/RecoTBCalo/EcalTBRecProducers/src/EcalTBWeightUncalibRecHitProducer.cc
@@ -468,8 +468,8 @@ EcalTBWeightUncalibRecHitProducer::produce(edm::Event& evt, const edm::EventSetu
  					      << "uncalib rechit amplitude: " << aHit.amplitude()
 
 // 	   std::cout << "processed EEDataFrame with id: "
-// 					      << EEDetId(itdg.id()) << "\n"
-// 					      << "uncalib rechit amplitude: " << aHit.amplitude() << std::endl;
+//                   << EEDetId(itdg.id()) << "\n"
+//                   << "uncalib rechit amplitude: " << aHit.amplitude() << std::endl;
 	     ;
 	 }
 #endif
diff --git a/RecoTauTag/Configuration/python/HPSPFTaus_cff.py b/RecoTauTag/Configuration/python/HPSPFTaus_cff.py
index c52e3626ce1e3..be5342256cd15 100644
--- a/RecoTauTag/Configuration/python/HPSPFTaus_cff.py
+++ b/RecoTauTag/Configuration/python/HPSPFTaus_cff.py
@@ -526,7 +526,7 @@
     PFTauProducer = cms.InputTag('hpsPFTauProducer'),
     Prediscriminants = requireDecayMode.clone(),
     loadMVAfromDB = cms.bool(True),
-    mvaName = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v1"),
+    mvaName = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v2"),
     mvaOpt = cms.string("DBoldDMwLTwGJ"),
     srcTauTransverseImpactParameters = cms.InputTag('hpsPFTauTransverseImpactParameters'),
     srcChargedIsoPtSum = cms.InputTag('hpsPFTauChargedIsoPtSum'),
@@ -543,31 +543,31 @@
     toMultiplex = cms.InputTag('hpsPFTauDiscriminationByIsolationMVArun2v1DBoldDMwLTraw'),
     key = cms.InputTag('hpsPFTauDiscriminationByIsolationMVArun2v1DBoldDMwLTraw:category'),
     loadMVAfromDB = cms.bool(True),
-    mvaOutput_normalization = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v1_mvaOutput_normalization"),
+    mvaOutput_normalization = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v2_mvaOutput_normalization"),
     mapping = cms.VPSet(
         cms.PSet(
             category = cms.uint32(0),
-            cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v1_WPEff90"),
+            cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v2_WPEff90"),
             variable = cms.string("pt")
         )
     )
 )
 hpsPFTauDiscriminationByVVLooseIsolationMVArun2v1DBoldDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBoldDMwLT.clone()
-hpsPFTauDiscriminationByVVLooseIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v1_WPEff95")
+hpsPFTauDiscriminationByVVLooseIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v2_WPEff95")
 hpsPFTauDiscriminationByLooseIsolationMVArun2v1DBoldDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBoldDMwLT.clone()
-hpsPFTauDiscriminationByLooseIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v1_WPEff80")
+hpsPFTauDiscriminationByLooseIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v2_WPEff80")
 hpsPFTauDiscriminationByMediumIsolationMVArun2v1DBoldDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBoldDMwLT.clone()
-hpsPFTauDiscriminationByMediumIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v1_WPEff70")
+hpsPFTauDiscriminationByMediumIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v2_WPEff70")
 hpsPFTauDiscriminationByTightIsolationMVArun2v1DBoldDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBoldDMwLT.clone()
-hpsPFTauDiscriminationByTightIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v1_WPEff60")
+hpsPFTauDiscriminationByTightIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v2_WPEff60")
 hpsPFTauDiscriminationByVTightIsolationMVArun2v1DBoldDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBoldDMwLT.clone()
-hpsPFTauDiscriminationByVTightIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v1_WPEff50")
+hpsPFTauDiscriminationByVTightIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v2_WPEff50")
 hpsPFTauDiscriminationByVVTightIsolationMVArun2v1DBoldDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBoldDMwLT.clone()
-hpsPFTauDiscriminationByVVTightIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v1_WPEff40")
+hpsPFTauDiscriminationByVVTightIsolationMVArun2v1DBoldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMwLT2017v2_WPEff40")
 
 hpsPFTauDiscriminationByIsolationMVArun2v1DBnewDMwLTraw = hpsPFTauDiscriminationByIsolationMVArun2v1DBoldDMwLTraw.clone(
-    mvaName = cms.string("RecoTauTag_tauIdMVADBnewDMwLTv1"),
-    mvaOpt = cms.string("DBnewDMwLT"),
+    mvaName = cms.string("RecoTauTag_tauIdMVAIsoDBnewDMwLT2017v2"),
+    mvaOpt = cms.string("DBnewDMwLTwGJ"),
     verbosity = cms.int32(0)
 )
 
@@ -575,25 +575,25 @@
     toMultiplex = cms.InputTag('hpsPFTauDiscriminationByIsolationMVArun2v1DBnewDMwLTraw'),
     key = cms.InputTag('hpsPFTauDiscriminationByIsolationMVArun2v1DBnewDMwLTraw:category'),
     loadMVAfromDB = cms.bool(True),
-    mvaOutput_normalization = cms.string("RecoTauTag_tauIdMVADBnewDMwLTv1_mvaOutput_normalization"),
+    mvaOutput_normalization = cms.string("RecoTauTag_tauIdMVAIsoDBnewDMwLT2017v2_mvaOutput_normalization"),
     mapping = cms.VPSet(
         cms.PSet(
             category = cms.uint32(0),
-            cut = cms.string("RecoTauTag_tauIdMVADBnewDMwLTv1_WPEff90"),
+            cut = cms.string("RecoTauTag_tauIdMVAIsoDBnewDMwLT2017v2_WPEff90"),
             variable = cms.string("pt")
         )
     )
 )
 hpsPFTauDiscriminationByLooseIsolationMVArun2v1DBnewDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBnewDMwLT.clone()
-hpsPFTauDiscriminationByLooseIsolationMVArun2v1DBnewDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVADBnewDMwLTv1_WPEff80")
+hpsPFTauDiscriminationByLooseIsolationMVArun2v1DBnewDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBnewDMwLT2017v2_WPEff80")
 hpsPFTauDiscriminationByMediumIsolationMVArun2v1DBnewDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBnewDMwLT.clone()
-hpsPFTauDiscriminationByMediumIsolationMVArun2v1DBnewDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVADBnewDMwLTv1_WPEff70")
+hpsPFTauDiscriminationByMediumIsolationMVArun2v1DBnewDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBnewDMwLT2017v2_WPEff70")
 hpsPFTauDiscriminationByTightIsolationMVArun2v1DBnewDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBnewDMwLT.clone()
-hpsPFTauDiscriminationByTightIsolationMVArun2v1DBnewDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVADBnewDMwLTv1_WPEff60")
+hpsPFTauDiscriminationByTightIsolationMVArun2v1DBnewDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBnewDMwLT2017v2_WPEff60")
 hpsPFTauDiscriminationByVTightIsolationMVArun2v1DBnewDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBnewDMwLT.clone()
-hpsPFTauDiscriminationByVTightIsolationMVArun2v1DBnewDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVADBnewDMwLTv1_WPEff50")
+hpsPFTauDiscriminationByVTightIsolationMVArun2v1DBnewDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBnewDMwLT2017v2_WPEff50")
 hpsPFTauDiscriminationByVVTightIsolationMVArun2v1DBnewDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBnewDMwLT.clone()
-hpsPFTauDiscriminationByVVTightIsolationMVArun2v1DBnewDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVADBnewDMwLTv1_WPEff40")
+hpsPFTauDiscriminationByVVTightIsolationMVArun2v1DBnewDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBnewDMwLT2017v2_WPEff40")
 
 hpsPFTauDiscriminationByIsolationMVArun2v1PWoldDMwLTraw = hpsPFTauDiscriminationByIsolationMVArun2v1DBoldDMwLTraw.clone(
     mvaName = cms.string("RecoTauTag_tauIdMVAPWoldDMwLTv1"),
@@ -702,8 +702,8 @@
 )
 
 hpsPFTauDiscriminationByIsolationMVArun2v1DBdR03oldDMwLTraw = hpsPFTauDiscriminationByIsolationMVArun2v1DBoldDMwLTraw.clone(
-    mvaName = cms.string("RecoTauTag_tauIdMVADBdR03oldDMwLTv1"),
-    mvaOpt = cms.string("DBoldDMwLT"),
+    mvaName = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMdR0p3wLT2017v2"),
+    mvaOpt = cms.string("DBoldDMwLTwGJ"),
     srcChargedIsoPtSum = cms.InputTag('hpsPFTauChargedIsoPtSumdR03'),
     srcNeutralIsoPtSum = cms.InputTag('hpsPFTauNeutralIsoPtSumdR03'),
     srcPUcorrPtSum = cms.InputTag('hpsPFTauPUcorrPtSumdR03'),
@@ -717,25 +717,25 @@
     toMultiplex = cms.InputTag('hpsPFTauDiscriminationByIsolationMVArun2v1DBdR03oldDMwLTraw'),
     key = cms.InputTag('hpsPFTauDiscriminationByIsolationMVArun2v1DBdR03oldDMwLTraw:category'),
     loadMVAfromDB = cms.bool(True),
-    mvaOutput_normalization = cms.string("RecoTauTag_tauIdMVADBdR03oldDMwLTv1_mvaOutput_normalization"),
+    mvaOutput_normalization = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMdR0p3wLT2017v2_mvaOutput_normalization"),
     mapping = cms.VPSet(
         cms.PSet(
             category = cms.uint32(0),
-            cut = cms.string("RecoTauTag_tauIdMVADBdR03oldDMwLTv1_WPEff90"),
+            cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMdR0p3wLT2017v2_WPEff90"),
             variable = cms.string("pt")
         )
     )
 )
 hpsPFTauDiscriminationByLooseIsolationMVArun2v1DBdR03oldDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBdR03oldDMwLT.clone()
-hpsPFTauDiscriminationByLooseIsolationMVArun2v1DBdR03oldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVADBdR03oldDMwLTv1_WPEff80")
+hpsPFTauDiscriminationByLooseIsolationMVArun2v1DBdR03oldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMdR0p3wLT2017v2_WPEff80")
 hpsPFTauDiscriminationByMediumIsolationMVArun2v1DBdR03oldDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBdR03oldDMwLT.clone()
-hpsPFTauDiscriminationByMediumIsolationMVArun2v1DBdR03oldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVADBdR03oldDMwLTv1_WPEff70")
+hpsPFTauDiscriminationByMediumIsolationMVArun2v1DBdR03oldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMdR0p3wLT2017v2_WPEff70")
 hpsPFTauDiscriminationByTightIsolationMVArun2v1DBdR03oldDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBdR03oldDMwLT.clone()
-hpsPFTauDiscriminationByTightIsolationMVArun2v1DBdR03oldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVADBdR03oldDMwLTv1_WPEff60")
+hpsPFTauDiscriminationByTightIsolationMVArun2v1DBdR03oldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMdR0p3wLT2017v2_WPEff60")
 hpsPFTauDiscriminationByVTightIsolationMVArun2v1DBdR03oldDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBdR03oldDMwLT.clone()
-hpsPFTauDiscriminationByVTightIsolationMVArun2v1DBdR03oldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVADBdR03oldDMwLTv1_WPEff50")
+hpsPFTauDiscriminationByVTightIsolationMVArun2v1DBdR03oldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMdR0p3wLT2017v2_WPEff50")
 hpsPFTauDiscriminationByVVTightIsolationMVArun2v1DBdR03oldDMwLT = hpsPFTauDiscriminationByVLooseIsolationMVArun2v1DBdR03oldDMwLT.clone()
-hpsPFTauDiscriminationByVVTightIsolationMVArun2v1DBdR03oldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVADBdR03oldDMwLTv1_WPEff40")
+hpsPFTauDiscriminationByVVTightIsolationMVArun2v1DBdR03oldDMwLT.mapping[0].cut = cms.string("RecoTauTag_tauIdMVAIsoDBoldDMdR0p3wLT2017v2_WPEff40")
 
 hpsPFTauDiscriminationByIsolationMVArun2v1PWdR03oldDMwLTraw = hpsPFTauDiscriminationByIsolationMVArun2v1DBdR03oldDMwLTraw.clone(
     mvaName = cms.string("RecoTauTag_tauIdMVAPWdR03oldDMwLTv1"),
diff --git a/RecoTauTag/RecoTau/plugins/PATTauDiscriminantCutMultiplexer.cc b/RecoTauTag/RecoTau/plugins/PATTauDiscriminantCutMultiplexer.cc
index b123b58c3fcae..c1ddb2f02dd40 100644
--- a/RecoTauTag/RecoTau/plugins/PATTauDiscriminantCutMultiplexer.cc
+++ b/RecoTauTag/RecoTau/plugins/PATTauDiscriminantCutMultiplexer.cc
@@ -104,9 +104,7 @@ namespace
       throw cms::Exception("PATTauDiscriminantCutMultiplexer::loadObjectFromFile") 
 	<< " Failed to load Object = " << objectName.data() << " from file = " << inputFile.GetName() << " !!\n";
     //Need to use TObject::Clone since the type T might be a base class
-    std::unique_ptr<const T> copy{ static_cast<T*>(object->Clone()) };
-	
-    return std::move(copy);
+    return std::unique_ptr<const T>{ static_cast<T*>(object->Clone()) };
   }
 	
   std::unique_ptr<const TGraph> loadTGraphFromDB(const edm::EventSetup& es, const std::string& graphName, const int& verbosity_ = 0)
diff --git a/RecoTauTag/RecoTau/plugins/RecoTauDiscriminantCutMultiplexer.cc b/RecoTauTag/RecoTau/plugins/RecoTauDiscriminantCutMultiplexer.cc
index 4d0791773405e..73377b6339bd0 100644
--- a/RecoTauTag/RecoTau/plugins/RecoTauDiscriminantCutMultiplexer.cc
+++ b/RecoTauTag/RecoTau/plugins/RecoTauDiscriminantCutMultiplexer.cc
@@ -103,9 +103,7 @@ namespace
       throw cms::Exception("RecoTauDiscriminantCutMultiplexer::loadObjectFromFile") 
         << " Failed to load Object = " << objectName.data() << " from file = " << inputFile.GetName() << " !!\n";
     //Need to use TObject::Clone since the type T might be a base class
-    std::unique_ptr<const T> copy{ static_cast<T*>(object->Clone()) };
-
-    return std::move(copy);
+    return std::unique_ptr<const T>{ static_cast<T*>(object->Clone()) };
   }
 
   std::unique_ptr<const TGraph> loadTGraphFromDB(const edm::EventSetup& es, const std::string& graphName, const int& verbosity_ = 0)
diff --git a/RecoTauTag/RecoTau/src/RecoTauVertexAssociator.cc b/RecoTauTag/RecoTau/src/RecoTauVertexAssociator.cc
index dae7990818046..51b30db7e7d56 100644
--- a/RecoTauTag/RecoTau/src/RecoTauVertexAssociator.cc
+++ b/RecoTauTag/RecoTau/src/RecoTauVertexAssociator.cc
@@ -12,8 +12,6 @@
 #include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 
-#include <TMath.h>
-
 namespace reco { namespace tau {
 
 namespace {
@@ -81,17 +79,18 @@ const reco::CandidatePtr RecoTauVertexAssociator::getLeadCand(const Jet& jet) co
       for ( std::vector<CandidatePtr>::const_iterator pfCand = selectedPFCands.begin();
 	    pfCand != selectedPFCands.end(); ++pfCand ) {
         const reco::Track* track = getTrack(**pfCand);
-        double actualTrackPt = 0.;
-        if ( track != nullptr )
+        double actualTrackPt = 0. , actualTrackPtError = 0.;
+        if ( track != nullptr ) {
           actualTrackPt = track->pt();
+          actualTrackPtError = track->ptError();
+	}
         double trackPt = 0.;
         if ( leadingTrkOrPFCandOption_ == kLeadTrack ) {
-	  //double trackPt = track->pt();
-	  trackPt = actualTrackPt - 2.*track->ptError();
+	  trackPt = actualTrackPt - 2.*actualTrackPtError;
         } else if ( leadingTrkOrPFCandOption_ == kLeadPFCand ) {
 	  trackPt = (*pfCand)->pt();
         } else if ( leadingTrkOrPFCandOption_ == kMinLeadTrackOrPFCand ) {
-	  trackPt = TMath::Min(actualTrackPt, (double)(*pfCand)->pt());
+	  trackPt = std::min(actualTrackPt, (double)(*pfCand)->pt());
 	} else assert(0);
         if ( trackPt > leadTrackPt ) {
           leadCand = (*pfCand);
diff --git a/RecoTauTag/RecoTau/test/rerunTauRecoOnMiniAOD.py b/RecoTauTag/RecoTau/test/rerunTauRecoOnMiniAOD.py
index c5dfe0406ad08..b29f5a4c10a02 100644
--- a/RecoTauTag/RecoTau/test/rerunTauRecoOnMiniAOD.py
+++ b/RecoTauTag/RecoTau/test/rerunTauRecoOnMiniAOD.py
@@ -33,10 +33,11 @@
 print('\t Output mode:', outMode)
 
 #####
-from Configuration.StandardSequences.Eras import eras
-era = eras.Run2_2018
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+era = Run2_2018
 if phase2:
-    era = eras.Phase2_timing
+    from Configuration.Eras.Era_Phase2_timing_cff import Phase2_timing
+    era = Phase2_timing
 process = cms.Process("TAURECO", era)
 # for CH reco
 process.load("Configuration.StandardSequences.MagneticField_cff")
diff --git a/RecoTauTag/TauTagTools/interface/ElementsInEllipseRef.h b/RecoTauTag/TauTagTools/interface/ElementsInEllipseRef.h
deleted file mode 100644
index 5d6c6fdffc133..0000000000000
--- a/RecoTauTag/TauTagTools/interface/ElementsInEllipseRef.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef ElementsInEllipseRef_h
-#define ElementsInEllipseRef_h
-
-#include "RecoTauTag/TauTagTools/interface/Ellipse.h"
-#include "DataFormats/Common/interface/RefVector.h"
-#include <utility>
-
-template  <typename T, typename C>
-  class ElementsInEllipse{
-    public:
-      ElementsInEllipseRef(){}
-      ~ElementsInEllipseRef(){}
-     
-      const std::pair<edm::RefVector<C>, edm::RefVector<C> > operator()(const T& axis, double rPhi, double rEta, const edm::RefVector<C>& elements)const{
-	edm::RefVector<C> elementsInEllipse;
-	edm::RefVector<C> elementsOutEllipse;
-	for(typename edm::RefVector<C>::const_iterator element = elements.begin(); element != elements.end(); ++element){
-	  double distance = ellipse(axis, (*element)->momentum(), rPhi, rEta);
-	  if(distance <= 1.)elementsInEllipse.push_back(*element);
-	  else elementsOutEllipse.push_back(*element);
-	}
-        std::pair<edm::RefVector<C>, edm::RefVector<C> > theInOutPair(elementsInEllipse, elementsOutEllipse);
-	return theInOutPair;
-      }
-  };
-#endif
diff --git a/RecoTracker/CkfPattern/interface/bqueue.h b/RecoTracker/CkfPattern/interface/bqueue.h
deleted file mode 100644
index afdc36f2b4b55..0000000000000
--- a/RecoTracker/CkfPattern/interface/bqueue.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#error header has moved to TrackingTools/PatternTools/interface/bqueue.h
-#include "TrackingTools/PatternTools/interface/bqueue.h"
diff --git a/RecoTracker/FinalTrackSelectors/plugins/TrackerTrackHitFilter.cc b/RecoTracker/FinalTrackSelectors/plugins/TrackerTrackHitFilter.cc
index 0a0579bcfc523..8d75a0bd59eec 100644
--- a/RecoTracker/FinalTrackSelectors/plugins/TrackerTrackHitFilter.cc
+++ b/RecoTracker/FinalTrackSelectors/plugins/TrackerTrackHitFilter.cc
@@ -29,7 +29,7 @@
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit1D.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h"
-#include "AnalysisDataFormats/SiStripClusterInfo/interface/SiStripClusterInfo.h"
+#include "RecoLocalTracker/SiStripClusterizer/interface/SiStripClusterInfo.h"
 //for angle cut
 #include "TrackingTools/PatternTools/interface/Trajectory.h"
 #include "TrackingTools/PatternTools/interface/TrajectoryMeasurement.h"
diff --git a/RecoTracker/MeasurementDet/interface/NonPropagatingDetMeasurements.h b/RecoTracker/MeasurementDet/interface/NonPropagatingDetMeasurements.h
deleted file mode 100644
index 44c9ab062b55d..0000000000000
--- a/RecoTracker/MeasurementDet/interface/NonPropagatingDetMeasurements.h
+++ /dev/null
@@ -1 +0,0 @@
-#error "HEAEDER moved in RecoTracker/MeasurementDet/plugin, please remove"
diff --git a/RecoTracker/MeasurementDet/interface/OnDemandMeasurementTracker.h b/RecoTracker/MeasurementDet/interface/OnDemandMeasurementTracker.h
deleted file mode 100644
index 44c9ab062b55d..0000000000000
--- a/RecoTracker/MeasurementDet/interface/OnDemandMeasurementTracker.h
+++ /dev/null
@@ -1 +0,0 @@
-#error "HEAEDER moved in RecoTracker/MeasurementDet/plugin, please remove"
diff --git a/RecoTracker/MeasurementDet/interface/RecHitPropagator.h b/RecoTracker/MeasurementDet/interface/RecHitPropagator.h
deleted file mode 100644
index 44c9ab062b55d..0000000000000
--- a/RecoTracker/MeasurementDet/interface/RecHitPropagator.h
+++ /dev/null
@@ -1 +0,0 @@
-#error "HEAEDER moved in RecoTracker/MeasurementDet/plugin, please remove"
diff --git a/RecoTracker/MeasurementDet/interface/StripClusterAboveU.h b/RecoTracker/MeasurementDet/interface/StripClusterAboveU.h
deleted file mode 100644
index 44c9ab062b55d..0000000000000
--- a/RecoTracker/MeasurementDet/interface/StripClusterAboveU.h
+++ /dev/null
@@ -1 +0,0 @@
-#error "HEAEDER moved in RecoTracker/MeasurementDet/plugin, please remove"
diff --git a/RecoTracker/MeasurementDet/test/measTkTest.py b/RecoTracker/MeasurementDet/test/measTkTest.py
index 321d93acb34a6..64e6745933770 100644
--- a/RecoTracker/MeasurementDet/test/measTkTest.py
+++ b/RecoTracker/MeasurementDet/test/measTkTest.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("TEST",eras.Run2_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process("TEST",Run2_2017)
 
 process.source = cms.Source("EmptySource")
 process.maxEvents = cms.untracked.PSet(
diff --git a/RecoTracker/Record/interface/Records.h b/RecoTracker/Record/interface/Records.h
deleted file mode 100644
index edb57a271413f..0000000000000
--- a/RecoTracker/Record/interface/Records.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "RecoTracker/Records/interface/CkfComponentsRecord.h"
-#include "RecoTracker/Records/interface/MultiRecHitRecord.h"
-#include "RecoTracker/Records/interface/NavigationSchoolRecord.h"
-#include "RecoTracker/Records/interface/TrackerRecoGeometryRecord.h"
diff --git a/RecoTracker/TkSeedGenerator/interface/SeedFromConsecutiveHitsCreator.h b/RecoTracker/TkSeedGenerator/interface/SeedFromConsecutiveHitsCreator.h
deleted file mode 100644
index 8e28bf6b64d4a..0000000000000
--- a/RecoTracker/TkSeedGenerator/interface/SeedFromConsecutiveHitsCreator.h
+++ /dev/null
@@ -1 +0,0 @@
-#error "moved to plugins: please remove reference"
diff --git a/RecoTracker/TkSeedGenerator/interface/SeedFromConsecutiveHitsStraightLineCreator.h b/RecoTracker/TkSeedGenerator/interface/SeedFromConsecutiveHitsStraightLineCreator.h
deleted file mode 100644
index 8e28bf6b64d4a..0000000000000
--- a/RecoTracker/TkSeedGenerator/interface/SeedFromConsecutiveHitsStraightLineCreator.h
+++ /dev/null
@@ -1 +0,0 @@
-#error "moved to plugins: please remove reference"
diff --git a/RecoTracker/TkSeedGenerator/interface/SeedFromConsecutiveHitsTripletOnlyCreator.h b/RecoTracker/TkSeedGenerator/interface/SeedFromConsecutiveHitsTripletOnlyCreator.h
deleted file mode 100644
index 8e28bf6b64d4a..0000000000000
--- a/RecoTracker/TkSeedGenerator/interface/SeedFromConsecutiveHitsTripletOnlyCreator.h
+++ /dev/null
@@ -1 +0,0 @@
-#error "moved to plugins: please remove reference"
diff --git a/RecoTracker/TkSeedGenerator/plugins/BuildFile.xml b/RecoTracker/TkSeedGenerator/plugins/BuildFile.xml
index 03a79068c2223..9dd022b67ea0b 100644
--- a/RecoTracker/TkSeedGenerator/plugins/BuildFile.xml
+++ b/RecoTracker/TkSeedGenerator/plugins/BuildFile.xml
@@ -1,3 +1,4 @@
+<use   name="CommonTools/RecoAlgos"/>
 <use   name="RecoTracker/TkSeedGenerator"/>
 <use   name="RecoTracker/TkTrackingRegions"/>
 <use   name="RecoPixelVertexing/PixelTriplets"/>
diff --git a/RecoTracker/TkSeedGenerator/plugins/MultiHitGeneratorFromChi2.cc b/RecoTracker/TkSeedGenerator/plugins/MultiHitGeneratorFromChi2.cc
index 80c5b895d4ba6..2bbd595d1d467 100644
--- a/RecoTracker/TkSeedGenerator/plugins/MultiHitGeneratorFromChi2.cc
+++ b/RecoTracker/TkSeedGenerator/plugins/MultiHitGeneratorFromChi2.cc
@@ -11,8 +11,8 @@
 #include "RecoPixelVertexing/PixelTriplets/plugins/ThirdHitCorrection.h"
 #include "RecoTracker/TkHitPairs/interface/RecHitsSortedInPhi.h"
 
-#include "RecoPixelVertexing/PixelTriplets/plugins/KDTreeLinkerAlgo.h" 
-#include "RecoPixelVertexing/PixelTriplets/plugins/KDTreeLinkerTools.h"
+#include "CommonTools/RecoAlgos/interface/KDTreeLinkerAlgo.h"
+#include "CommonTools/RecoAlgos/interface/KDTreeLinkerTools.h"
 
 #include "RecoPixelVertexing/PixelTrackFitting/interface/RZLine.h"
 #include "RecoTracker/TkSeedGenerator/interface/FastHelix.h"
diff --git a/RecoTracker/TrackProducer/test/RefitWithSim.py b/RecoTracker/TrackProducer/test/RefitWithSim.py
index f87c8adbd663d..44371e5c13dbe 100644
--- a/RecoTracker/TrackProducer/test/RefitWithSim.py
+++ b/RecoTracker/TrackProducer/test/RefitWithSim.py
@@ -5,9 +5,9 @@
 # with command line options: step3 --conditions auto:phase1_2018_realistic -n 10 --era Run2_2018 --eventcontent RECOSIM,DQM --runUnscheduled -s RAW2DIGI,RECO:reconstruction_trackingOnly,VALIDATION:@trackingOnlyValidation,DQM:@trackingOnlyDQM --datatier GEN-SIM-RECO,DQMIO --geometry DB:Extended -n 10 --filein file:step2.root --fileout file:step3.root --nThreads 8 --no_exec
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('RECO',eras.Run2_2018)
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+process = cms.Process('RECO',Run2_2018)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/RecoVertex/KinematicFitPrimitives/interface/KinematicVertexAssociator.h b/RecoVertex/KinematicFitPrimitives/interface/KinematicVertexAssociator.h
deleted file mode 100644
index 0c10c252a652c..0000000000000
--- a/RecoVertex/KinematicFitPrimitives/interface/KinematicVertexAssociator.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef KinematicVertexAssociator_H
-#define KinematicVertexAssociator_H
-
-#include <vector>
-#include "TrackerReco/TkEvent/interface/TkSimVertex.h"
-#include "RecoVertex/KinematicFitPrimitives/interface/RefCountedKinematicVertex.h"
-/**
- * A prototype class for associators linking the
- * KinematicVertices to the SimVertices. Must be generalized later,
- * when KinematicVertex becomes an instance of the Vertex class.
- *
- * Kirill Prokofiev, October 2004
- */
-
-
-class TkSimVertex;
-//class RefCountedKinematicVertex;
-
-class KinematicVertexAssociator {
-public:
-    
-  typedef std::vector<RefCountedKinematicVertex> KinematicVertexContainer;
-  typedef std::vector<const TkSimVertex *> SimVertexPtrContainer;   
-  typedef std::vector<const TkSimVertex> SimVertexContainer;   
-
-  virtual ~KinematicVertexAssociator() {}
-
-  virtual SimVertexPtrContainer simVertices(const RefCountedKinematicVertex&) const = 0;
-  
-  virtual KinematicVertexContainer recVertices(const TkSimVertex&) const = 0;
-
-  virtual KinematicVertexAssociator * clone() const = 0;
-  
-};
-
-
-#endif
diff --git a/RecoVertex/KinematicFitPrimitives/interface/KinematicVertexDistance.h b/RecoVertex/KinematicFitPrimitives/interface/KinematicVertexDistance.h
deleted file mode 100644
index 2dff24fd095d5..0000000000000
--- a/RecoVertex/KinematicFitPrimitives/interface/KinematicVertexDistance.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef KinematicVertexDistance_H
-#define KinematicVertexDistance_H
-
-/** 
- *  Abstact class which defines a distance and compatibility between 
- * a  SimVertex descendent and a kinematicVertex.
- */
-
-#include "RecoVertex/KinematicFitPrimitives/interface/RefCountedKinematicVertex.h"
-#include "TrackerReco/TkEvent/interface/TkSimVertex.h"
-
-class Measurement1D;
-
-class KinematicVertexDistance{
-
-public:
-
-  virtual ~KinematicVertexDistance() {}
-
-  virtual Measurement1D distance(const RefCountedKinematicVertex, const TkSimVertex &) const = 0;
-
-  virtual float compatibility (const RefCountedKinematicVertex, const TkSimVertex &) const = 0;
-
-  virtual KinematicVertexDistance * clone() const = 0;
-};
-#endif
diff --git a/RecoVertex/MultiVertexFit/interface/LinPtFinderFromAdaptiveFitter.h b/RecoVertex/MultiVertexFit/interface/LinPtFinderFromAdaptiveFitter.h
deleted file mode 100644
index e5e2f6d344df7..0000000000000
--- a/RecoVertex/MultiVertexFit/interface/LinPtFinderFromAdaptiveFitter.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef LinPtFinderFromAdaptiveFitter_H
-#define LinPtFinderFromAdaptiveFitter_H
-
-#include "Vertex/LinearizationPointFinders/interface/LinPtFinderFromVertexFitter.h"
-// LinPtFinderFromVertexFitter
-
-class LinPtFinderFromAdaptiveFitter : public LinPtFinderFromVertexFitter
-{
-public:
-  LinPtFinderFromAdaptiveFitter ();
-};
-
-#endif
diff --git a/RecoVertex/MultiVertexFit/src/LinPtFinderFromAdaptiveFitter.cc b/RecoVertex/MultiVertexFit/src/LinPtFinderFromAdaptiveFitter.cc
deleted file mode 100644
index 9700e616f7fde..0000000000000
--- a/RecoVertex/MultiVertexFit/src/LinPtFinderFromAdaptiveFitter.cc
+++ /dev/null
@@ -1,8 +0,0 @@
-#if 0
-#include "RecoVertex/MultiVertexFit/interface/LinPtFinderFromAdaptiveFitter.h"
-#include "RecoVertex/RobustVertexFit/interface/AdaptiveVertexFitter.h"
-
-LinPtFinderFromAdaptiveFitter::LinPtFinderFromAdaptiveFitter () :
-    LinPtFinderFromVertexFitter ( AdaptiveVertexFitter() ) {}
-
-#endif
diff --git a/SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py b/SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py
index f0b4528ab5cb1..62847c1d0cc0f 100644
--- a/SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py
+++ b/SLHCUpgradeSimulations/Configuration/python/phase1TkCustoms.py
@@ -10,9 +10,9 @@ def customise(process):
 #   If using cmsDriver:
 #       1) add the option "--era Run2_2017" 
 #   If using a pre-made configuration file:
-#       1) add "from Configuration.StandardSequences.Eras import eras" to the TOP of the config file (above
+#       1) add "from Configuration.Eras.Era_Run2_2017_cff import Run2_2017" to the TOP of the config file (above
 #          the process declaration).
-#       2) add "eras.Run2_2017" as a parameter to the process object, e.g. "process = cms.Process('HLT',eras.Run2_2017)" 
+#       2) add "Run2_2017" as a parameter to the process object, e.g. "process = cms.Process('HLT',Run2_2017)" 
 #
 # If you are targeting something else than 2017 and have to use a
 # customize function from SLHC-times, you have to modify the customize
diff --git a/SLHCUpgradeSimulations/Configuration/python/postLS1Customs.py b/SLHCUpgradeSimulations/Configuration/python/postLS1Customs.py
index d81e6806dac47..079760c723ad1 100644
--- a/SLHCUpgradeSimulations/Configuration/python/postLS1Customs.py
+++ b/SLHCUpgradeSimulations/Configuration/python/postLS1Customs.py
@@ -55,9 +55,9 @@ def customisePostLS1(process,displayDeprecationWarning=True):
         #       2) add the option "--era Run2_25ns" 
         #   If using a pre-made configuration file:
         #       1) remove or comment out the "process = customisePostLS1(process)" line.
-        #       2) add "from Configuration.StandardSequences.Eras import eras" to the TOP of the config file (above
+        #       2) add "from Configuration.Eras.Era_Run2_25ns_cff import Run2_25ns" to the TOP of the config file (above
         #          the process declaration).
-        #       3) add "eras.Run2_25ns" as a parameter to the process object, e.g. "process = cms.Process('HLT',eras.Run2_25ns)" 
+        #       3) add "Run2_25ns" as a parameter to the process object, e.g. "process = cms.Process('HLT',Run2_25ns)" 
         #
         # There is more information at https://twiki.cern.ch/twiki/bin/view/CMSPublic/SWGuideCmsDriverEras
         #
@@ -99,9 +99,9 @@ def customisePostLS1_50ns(process,displayDeprecationWarning=True):
         #       2) add the option "--era Run2_50ns"
         #   If using a pre-made configuration file:
         #       1) remove or comment out the "process = customisePostLS1_50ns(process)" line.
-        #       2) add "from Configuration.StandardSequences.Eras import eras" to the TOP of the config file (above
+        #       2) add "from Configuration.Eras.Era_Run2_50ns_cff import Run2_50ns" to the TOP of the config file (above
         #          the process declaration).
-        #       3) add "eras.Run2_50ns" as a parameter to the process object, e.g. "process = cms.Process('HLT',eras.Run2_50ns)"
+        #       3) add "Run2_50ns" as a parameter to the process object, e.g. "process = cms.Process('HLT',Run2_50ns)"
         #
         # There is more information at https://twiki.cern.ch/twiki/bin/view/CMSPublic/SWGuideCmsDriverEras
         #
@@ -130,9 +130,9 @@ def customisePostLS1_HI(process,displayDeprecationWarning=True):
         #       2) add the option "--era Run2_HI"
         #   If using a pre-made configuration file:
         #       1) remove or comment out the "process = customisePostLS1_HI(process)" line.
-        #       2) add "from Configuration.StandardSequences.Eras import eras" to the TOP of the config file (above
+        #       2) add "from Configuration.Eras.Era_Run2_HI_cff import Run2_HI" to the TOP of the config file (above
         #          the process declaration).
-        #       3) add "eras.Run2_HI" as a parameter to the process object, e.g. "process = cms.Process('HLT',eras.Run2_HI)"
+        #       3) add "Run2_HI" as a parameter to the process object, e.g. "process = cms.Process('HLT',Run2_HI)"
         #
         # There is more information at https://twiki.cern.ch/twiki/bin/view/CMSPublic/SWGuideCmsDriverEras
         #
diff --git a/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py b/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py
index 4ab47dd98ca29..89d06735c711c 100644
--- a/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py
+++ b/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py
@@ -5,9 +5,9 @@
 # with command line options: step2 --conditions auto:phase2_realistic -s DIGI:pdigi_valid,L1,L1TrackTrigger,DIGI2RAW,HLT:@fake2,RAW2DIGI,L1Reco,RECO --datatier GEN-SIM-RECO -n 10 --geometry Extended2023D21 --era Phase2 --eventcontent FEVTDEBUGHLT --filein file:SingleMuPt1000_pythia8_cfi_GEN_SIM.root --runUnscheduled --no_exec
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('Phase2PixelNtuple',eras.Phase2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('Phase2PixelNtuple',Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/SLHCUpgradeSimulations/Geometry/test/phase2_reco_pixelntuple_cfg.py b/SLHCUpgradeSimulations/Geometry/test/phase2_reco_pixelntuple_cfg.py
index 40a4b0358c881..6b5a5215b7db9 100644
--- a/SLHCUpgradeSimulations/Geometry/test/phase2_reco_pixelntuple_cfg.py
+++ b/SLHCUpgradeSimulations/Geometry/test/phase2_reco_pixelntuple_cfg.py
@@ -5,9 +5,9 @@
 # with command line options: step2 --conditions auto:phase2_realistic -s DIGI:pdigi_valid,L1,L1TrackTrigger,DIGI2RAW,HLT:@fake2,RAW2DIGI,L1Reco,RECO --datatier GEN-SIM-RECO -n 10 --geometry Extended2023D21 --era Phase2 --eventcontent FEVTDEBUGHLT --filein file:SingleMuPt1000_pythia8_cfi_GEN_SIM.root --runUnscheduled --no_exec
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('Phase2PixelNtuple',eras.Phase2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('Phase2PixelNtuple',Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/SimCalorimetry/CaloSimAlgos/interface/CaloCachedShapeIntegrator.h b/SimCalorimetry/CaloSimAlgos/interface/CaloCachedShapeIntegrator.h
index 1b708e805bd0f..38743104a1d76 100644
--- a/SimCalorimetry/CaloSimAlgos/interface/CaloCachedShapeIntegrator.h
+++ b/SimCalorimetry/CaloSimAlgos/interface/CaloCachedShapeIntegrator.h
@@ -9,22 +9,18 @@
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVShape.h"
 #include <vector>
 
-class CaloCachedShapeIntegrator: public CaloVShape
-{
-   public:
+class CaloCachedShapeIntegrator : public CaloVShape {
+public:
+  CaloCachedShapeIntegrator(const CaloVShape *aShape);
 
-      CaloCachedShapeIntegrator( const CaloVShape* aShape ) ;
+  ~CaloCachedShapeIntegrator() override;
 
-      ~CaloCachedShapeIntegrator() override ;
+  double operator()(double startTime) const override;
+  double timeToRise() const override;
 
-      double operator () ( double startTime ) const override ;
-      double timeToRise()                     const override ;
-
-   private:
-
-      std::vector<double> v_;
-      double timeToRise_;
+private:
+  std::vector<double> v_;
+  double timeToRise_;
 };
 
 #endif
-
diff --git a/SimCalorimetry/CaloSimAlgos/interface/CaloDigiCollectionSorter.h b/SimCalorimetry/CaloSimAlgos/interface/CaloDigiCollectionSorter.h
index d60ad87662655..540673af670e6 100644
--- a/SimCalorimetry/CaloSimAlgos/interface/CaloDigiCollectionSorter.h
+++ b/SimCalorimetry/CaloSimAlgos/interface/CaloDigiCollectionSorter.h
@@ -2,32 +2,31 @@
 #define CaloDigiCollectionSorter_h
 
 /** For test purposes, users might want to sort
-    a collection of digis to find the highest 
+    a collection of digis to find the highest
     energies.  This class does that, and should
     work for all ECAL and HCAL digi types
 
     \Author Rick Wilkinson
 */
 
-#include <vector>
-#include <algorithm>
 #include "DataFormats/Common/interface/SortedCollection.h"
-
+#include <algorithm>
+#include <vector>
 
 class CaloDigiCollectionSorter {
 public:
   CaloDigiCollectionSorter(int bin) : theMaxBin(bin) {}
 
   /// embedded class to be used as a sort predicate
-  template<class T>
+  template <class T>
   class CaloDigiSortByMaxBin {
   public:
     CaloDigiSortByMaxBin(int bin) : theMaxBin(bin) {}
 
-    bool operator()(const T & df1, const T & df2) const {
-       // should work for HcalQIESamples & EcalMPGASamples
-       // sort in reverse order, so highest bins come first
-       return (df1[theMaxBin].raw() > df2[theMaxBin].raw());
+    bool operator()(const T &df1, const T &df2) const {
+      // should work for HcalQIESamples & EcalMPGASamples
+      // sort in reverse order, so highest bins come first
+      return (df1[theMaxBin].raw() > df2[theMaxBin].raw());
     }
 
   private:
@@ -36,17 +35,16 @@ class CaloDigiCollectionSorter {
 
   /// takes a digi collection and returns a vector of digis,
   /// sorted by the peak bin
-  template<class T>
-  std::vector<T> sortedVector(const edm::SortedCollection<T> & input) const {
-     std::vector<T> result;
-     result.reserve(input.size());
-     for(unsigned int i = 0; i < input.size() ; ++i) 
-     {
-       result.push_back(input[i]);
-     }
-     // now sort
-     std::sort(result.begin(), result.end(), CaloDigiSortByMaxBin<T>(theMaxBin));
-     return result;
+  template <class T>
+  std::vector<T> sortedVector(const edm::SortedCollection<T> &input) const {
+    std::vector<T> result;
+    result.reserve(input.size());
+    for (unsigned int i = 0; i < input.size(); ++i) {
+      result.push_back(input[i]);
+    }
+    // now sort
+    std::sort(result.begin(), result.end(), CaloDigiSortByMaxBin<T>(theMaxBin));
+    return result;
   }
 
 private:
@@ -54,4 +52,3 @@ class CaloDigiCollectionSorter {
 };
 
 #endif
-
diff --git a/SimCalorimetry/CaloSimAlgos/interface/CaloHitAnalyzer.h b/SimCalorimetry/CaloSimAlgos/interface/CaloHitAnalyzer.h
index d62f81a776588..c91c5596304d2 100644
--- a/SimCalorimetry/CaloSimAlgos/interface/CaloHitAnalyzer.h
+++ b/SimCalorimetry/CaloSimAlgos/interface/CaloHitAnalyzer.h
@@ -1,10 +1,10 @@
 #ifndef CaloSimAlgos_CaloHitAnalyzer_h
 #define CaloSimAlgos_CaloHitAnalyzer_h
 
-#include <map>
-#include <string>
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloValidationStatistics.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
+#include <map>
+#include <string>
 
 /**
   Sums up all the SimHit energy in each cell, and uses that
@@ -18,29 +18,26 @@ class CaloVHitFilter;
 #include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 #include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 
-
-class CaloHitAnalyzer 
-{
+class CaloHitAnalyzer {
 public:
-  CaloHitAnalyzer(const std::string & name,
+  CaloHitAnalyzer(const std::string &name,
                   double hitEnergyThreshold,
-                  const CaloVSimParameterMap * parameterMap,
-                  const CaloVHitFilter * filter = nullptr);
+                  const CaloVSimParameterMap *parameterMap,
+                  const CaloVHitFilter *filter = nullptr);
 
   /// should be called each event
-  void fillHits(MixCollection<PCaloHit> & hits);
-  
+  void fillHits(MixCollection<PCaloHit> &hits);
+
   /// to be called for each RecHit
   void analyze(int detId, double recEnergy);
 
 public:
   std::map<int, double> hitEnergySumMap_;
   double hitEnergyThreshold_;
-  const CaloVSimParameterMap * simParameterMap_;
-  const CaloVHitFilter * hitFilter_;
+  const CaloVSimParameterMap *simParameterMap_;
+  const CaloVHitFilter *hitFilter_;
   CaloValidationStatistics summary_;
   int noiseHits_;
 };
 
 #endif
-
diff --git a/SimCalorimetry/CaloSimAlgos/interface/CaloHitResponse.h b/SimCalorimetry/CaloSimAlgos/interface/CaloHitResponse.h
index 2c4e69557bd98..1e3156c82757f 100644
--- a/SimCalorimetry/CaloSimAlgos/interface/CaloHitResponse.h
+++ b/SimCalorimetry/CaloSimAlgos/interface/CaloHitResponse.h
@@ -4,18 +4,18 @@
 #include "CalibFormats/CaloObjects/interface/CaloSamples.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
-#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
-#include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVPECorrection.h"
+#include "SimDataFormats/CaloHit/interface/PCaloHit.h"
+#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 
-#include<map>
-#include<vector>
+#include <map>
+#include <vector>
 
 /**
 
  \class CaloHitResponse
 
- \brief Creates electronics signals from hits 
+ \brief Creates electronics signals from hits
 
 */
 
@@ -30,15 +30,14 @@ class CaloVHitCorrection;
 class CaloVHitFilter;
 class CaloSimParameters;
 
-class CaloHitResponse 
-{
+class CaloHitResponse {
 public:
   typedef std::map<DetId, CaloSamples> AnalogSignalMap;
   // get this from somewhere external
-  enum {BUNCHSPACE=25};
+  enum { BUNCHSPACE = 25 };
 
-  CaloHitResponse(const CaloVSimParameterMap * parameterMap, const CaloVShape * shape);
-  CaloHitResponse(const CaloVSimParameterMap * parameterMap, const CaloShapes * shapes);
+  CaloHitResponse(const CaloVSimParameterMap *parameterMap, const CaloVShape *shape);
+  CaloHitResponse(const CaloVSimParameterMap *parameterMap, const CaloShapes *shapes);
 
   /// doesn't delete the pointers passed in
   virtual ~CaloHitResponse();
@@ -47,96 +46,88 @@ class CaloHitResponse
   void setBunchRange(int minBunch, int maxBunch);
 
   /// geometry needed for time-of-flight
-  void setGeometry(const CaloGeometry * geometry) { theGeometry = geometry; }
+  void setGeometry(const CaloGeometry *geometry) { theGeometry = geometry; }
 
-  virtual bool keepBlank() const { return true ; }
+  virtual bool keepBlank() const { return true; }
 
   /// Initialize hits
   virtual void initializeHits() {}
 
   /// Finalize hits
-  virtual void finalizeHits(CLHEP::HepRandomEngine*) {}
+  virtual void finalizeHits(CLHEP::HepRandomEngine *) {}
 
   /// Complete cell digitization.
-  virtual void run(const MixCollection<PCaloHit> & hits, CLHEP::HepRandomEngine*);
+  virtual void run(const MixCollection<PCaloHit> &hits, CLHEP::HepRandomEngine *);
 
   /// process a single SimHit
-  virtual void add(const PCaloHit & hit, CLHEP::HepRandomEngine*);
+  virtual void add(const PCaloHit &hit, CLHEP::HepRandomEngine *);
 
   /// add a signal, in units of pe
-  virtual void add(const CaloSamples & signal);
+  virtual void add(const CaloSamples &signal);
 
-  /// if you want to reject hits, for example, from a certain subdetector, set this
-  void setHitFilter(const CaloVHitFilter * filter) {
-    theHitFilter = filter;
-  }
+  /// if you want to reject hits, for example, from a certain subdetector, set
+  /// this
+  void setHitFilter(const CaloVHitFilter *filter) { theHitFilter = filter; }
 
   /// If you want to correct hits, for attenuation or delay, set this.
-  void setHitCorrection(const CaloVHitCorrection * hitCorrection) {
-    theHitCorrection = hitCorrection;
-  }
+  void setHitCorrection(const CaloVHitCorrection *hitCorrection) { theHitCorrection = hitCorrection; }
 
   /// if you want to correct the photoelectrons
-  void setPECorrection(const CaloVPECorrection * peCorrection) {
-    thePECorrection = peCorrection;
-  }
+  void setPECorrection(const CaloVPECorrection *peCorrection) { thePECorrection = peCorrection; }
 
   /// frees up memory
-  void clear() {theAnalogSignalMap.clear();}
- 
+  void clear() { theAnalogSignalMap.clear(); }
+
   /// adds the amplitude for a single hit to the frame
-  void addHit(const PCaloHit * hit, CaloSamples & frame) const;
+  void addHit(const PCaloHit *hit, CaloSamples &frame) const;
 
   /// creates the signal corresponding to this hit
-  virtual CaloSamples makeAnalogSignal(const PCaloHit & inputHit, CLHEP::HepRandomEngine*) const;
+  virtual CaloSamples makeAnalogSignal(const PCaloHit &inputHit, CLHEP::HepRandomEngine *) const;
 
   /// finds the amplitude contribution from this hit, applying
   /// photostatistics, if needed.  Results are in photoelectrons
-  double analogSignalAmplitude(const DetId & id, float energy, const CaloSimParameters & parameters, CLHEP::HepRandomEngine*) const;
+  double analogSignalAmplitude(const DetId &id,
+                               float energy,
+                               const CaloSimParameters &parameters,
+                               CLHEP::HepRandomEngine *) const;
 
   /// users can look for the signal for a given cell
-  CaloSamples * findSignal(const DetId & detId);
+  CaloSamples *findSignal(const DetId &detId);
 
   /// number of signals in the current cache
-  int nSignals() const {return theAnalogSignalMap.size();}
+  int nSignals() const { return theAnalogSignalMap.size(); }
 
   /// creates an empty signal for this DetId
-  CaloSamples makeBlankSignal(const DetId & detId) const;
-
+  CaloSamples makeBlankSignal(const DetId &detId) const;
 
   /// time-of-flight, in ns, to get to this cell
   /// returns 0 if no geometry has been set
-  double timeOfFlight(const DetId & detId) const;
+  double timeOfFlight(const DetId &detId) const;
 
   /// setting the phase shift for asynchronous trigger (e.g. test beams)
-  void setPhaseShift(const double & thePhaseShift) { thePhaseShift_ = thePhaseShift; }
+  void setPhaseShift(const double &thePhaseShift) { thePhaseShift_ = thePhaseShift; }
 
   /// check if crossing is within bunch range:
 
   bool withinBunchRange(int bunchCrossing) const {
-    return(bunchCrossing >= theMinBunch && bunchCrossing <= theMaxBunch);
+    return (bunchCrossing >= theMinBunch && bunchCrossing <= theMaxBunch);
   }
 
-  void setStorePrecise(bool sp) {
-    storePrecise = sp;
-  }
+  void setStorePrecise(bool sp) { storePrecise = sp; }
 
-  void setIgnoreGeantTime(bool gt) {
-    ignoreTime = gt;
-  }
+  void setIgnoreGeantTime(bool gt) { ignoreTime = gt; }
 
 protected:
-
   AnalogSignalMap theAnalogSignalMap;
 
-  const CaloVSimParameterMap * theParameterMap;
-  const CaloShapes * theShapes;
-  const CaloVShape * theShape;
-  const CaloVHitCorrection * theHitCorrection;
-  const CaloVPECorrection * thePECorrection;
-  const CaloVHitFilter * theHitFilter;
+  const CaloVSimParameterMap *theParameterMap;
+  const CaloShapes *theShapes;
+  const CaloVShape *theShape;
+  const CaloVHitCorrection *theHitCorrection;
+  const CaloVPECorrection *thePECorrection;
+  const CaloVHitFilter *theHitFilter;
 
-  const CaloGeometry * theGeometry;
+  const CaloGeometry *theGeometry;
 
   int theMinBunch;
   int theMaxBunch;
diff --git a/SimCalorimetry/CaloSimAlgos/interface/CaloShapeIntegrator.h b/SimCalorimetry/CaloSimAlgos/interface/CaloShapeIntegrator.h
index f46846dd196cd..7488b39460973 100644
--- a/SimCalorimetry/CaloSimAlgos/interface/CaloShapeIntegrator.h
+++ b/SimCalorimetry/CaloSimAlgos/interface/CaloShapeIntegrator.h
@@ -8,24 +8,19 @@
 
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVShape.h"
 
+class CaloShapeIntegrator : public CaloVShape {
+public:
+  enum { BUNCHSPACE = 25 };
 
-class CaloShapeIntegrator: public CaloVShape
-{
-   public:
+  CaloShapeIntegrator(const CaloVShape *aShape);
 
-      enum {BUNCHSPACE = 25};
+  ~CaloShapeIntegrator() override;
 
-      CaloShapeIntegrator( const CaloVShape* aShape ) ;
+  double operator()(double startTime) const override;
+  double timeToRise() const override;
 
-      ~CaloShapeIntegrator() override ;
-
-      double operator () ( double startTime ) const override ;
-      double timeToRise()                     const override ;
-
-   private:
-
-      const CaloVShape* m_shape ;
+private:
+  const CaloVShape *m_shape;
 };
 
 #endif
-
diff --git a/SimCalorimetry/CaloSimAlgos/interface/CaloShapes.h b/SimCalorimetry/CaloSimAlgos/interface/CaloShapes.h
index 91a7a88d3f957..0a86cf1250bdf 100644
--- a/SimCalorimetry/CaloSimAlgos/interface/CaloShapes.h
+++ b/SimCalorimetry/CaloSimAlgos/interface/CaloShapes.h
@@ -2,21 +2,20 @@
 #define CaloSimAlgos_CaloShapes_h
 
 /** A mechanism to let you pick shapes, based on DetId
-*/
+ */
 #include "DataFormats/DetId/interface/DetId.h"
 class CaloVShape;
 
-class CaloShapes
-{
+class CaloShapes {
 public:
-  CaloShapes(): theShape(nullptr) {}
+  CaloShapes() : theShape(nullptr) {}
   // doesn't take ownership of the pointer
-  CaloShapes(const CaloVShape * shape) : theShape(shape) {}
-  virtual const CaloVShape * shape(const DetId & detId, bool precise=false) const {return theShape;}
+  CaloShapes(const CaloVShape *shape) : theShape(shape) {}
+  virtual const CaloVShape *shape(const DetId &detId, bool precise = false) const { return theShape; }
   virtual ~CaloShapes() = default;
+
 private:
-  const CaloVShape * theShape;
+  const CaloVShape *theShape;
 };
 
 #endif
-
diff --git a/SimCalorimetry/CaloSimAlgos/interface/CaloSimParameters.h b/SimCalorimetry/CaloSimAlgos/interface/CaloSimParameters.h
index 8b0985bfb6944..cc2f5753e927b 100644
--- a/SimCalorimetry/CaloSimAlgos/interface/CaloSimParameters.h
+++ b/SimCalorimetry/CaloSimAlgos/interface/CaloSimParameters.h
@@ -1,58 +1,61 @@
 #ifndef CaloSimAlgos_CaloSimParameters_h
 #define CaloSimAlgos_CaloSimParameters_h
 
-#include <iosfwd>
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/DetId/interface/DetId.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <iosfwd>
 /**
 
    \class CaloSimParameters
 
    \brief Main class for Parameters in different subdetectors.
-   
+
 */
-class CaloSimParameters
-{
+class CaloSimParameters {
 public:
   // note: sampling factor not used
-  CaloSimParameters(double simHitToPhotoelectrons, double photoelectronsToAnalog, 
-                 double samplingFactor, double timePhase,
-                 int readoutFrameSize, int binOfMaximum,
-                 bool doPhotostatistics, bool syncPhase=true);
+  CaloSimParameters(double simHitToPhotoelectrons,
+                    double photoelectronsToAnalog,
+                    double samplingFactor,
+                    double timePhase,
+                    int readoutFrameSize,
+                    int binOfMaximum,
+                    bool doPhotostatistics,
+                    bool syncPhase = true);
 
-  CaloSimParameters(const edm::ParameterSet & p, bool skipPe2Fc=false);
+  CaloSimParameters(const edm::ParameterSet &p, bool skipPe2Fc = false);
 
-  virtual ~CaloSimParameters() {};
+  virtual ~CaloSimParameters(){};
 
   /// the factor which goes from whatever units the SimHit amplitudes
   /// are in (could be deposited GeV, real GeV, or photoelectrons)
   /// and converts to photoelectrons
   /// probably should make everything virtual, but this is enough for HCAL
-  double simHitToPhotoelectrons() const { return simHitToPhotoelectrons_;}
-  virtual double simHitToPhotoelectrons(const DetId &) const { return simHitToPhotoelectrons_;}
+  double simHitToPhotoelectrons() const { return simHitToPhotoelectrons_; }
+  virtual double simHitToPhotoelectrons(const DetId &) const { return simHitToPhotoelectrons_; }
 
   /// the factor which goes from photoelectrons to whatever gets read by ADCs
-  double photoelectronsToAnalog() const {return photoelectronsToAnalog_;}
-  virtual  double photoelectronsToAnalog(const DetId & detId) const {return photoelectronsToAnalog_;}
+  double photoelectronsToAnalog() const { return photoelectronsToAnalog_; }
+  virtual double photoelectronsToAnalog(const DetId &detId) const { return photoelectronsToAnalog_; }
 
   /// the adjustment you need to apply to get the signal where you want it
-  double timePhase() const {return timePhase_;}
+  double timePhase() const { return timePhase_; }
 
   /// for now, the LinearFrames and trhe digis will be one-to-one.
-  int readoutFrameSize() const {return readoutFrameSize_;}
+  int readoutFrameSize() const { return readoutFrameSize_; }
 
-  int binOfMaximum() const {return binOfMaximum_;}
+  int binOfMaximum() const { return binOfMaximum_; }
 
   /// some datamixing apps need this to be set dynamically
-  void setReadoutFrameSize(int frameSize) {readoutFrameSize_ = frameSize;}
-  void setBinOfMaximum(int binOfMax) {binOfMaximum_ = binOfMax;}
+  void setReadoutFrameSize(int frameSize) { readoutFrameSize_ = frameSize; }
+  void setBinOfMaximum(int binOfMax) { binOfMaximum_ = binOfMax; }
 
   /// whether or not to apply Poisson statistics to photoelectrons
-  bool doPhotostatistics() const {return doPhotostatistics_;}
-
-  /// choice of the ADC time alignment (synchronous for LHC, asynchronous for test beams)
-  bool syncPhase() const {return syncPhase_; }
+  bool doPhotostatistics() const { return doPhotostatistics_; }
 
+  /// choice of the ADC time alignment (synchronous for LHC, asynchronous for
+  /// test beams)
+  bool syncPhase() const { return syncPhase_; }
 
 private:
   double simHitToPhotoelectrons_;
@@ -62,11 +65,8 @@ class CaloSimParameters
   int binOfMaximum_;
   bool doPhotostatistics_;
   bool syncPhase_;
-
 };
 
-std::ostream & operator<<(std::ostream & os, const CaloSimParameters & p);
+std::ostream &operator<<(std::ostream &os, const CaloSimParameters &p);
 
 #endif
-
-
diff --git a/SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h b/SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h
index f9de4f71dcd7c..40a512e57fc6b 100644
--- a/SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h
+++ b/SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h
@@ -1,15 +1,16 @@
 #ifndef CaloSimAlgos_CaloTDigitizer_h
 #define CaloSimAlgos_CaloTDigitizer_h
 
-/** Turns hits into digis.  Assumes that 
+/** Turns hits into digis.  Assumes that
     there's an ElectroncsSim class with the
-    interface analogToDigital(CLHEP::HepRandomEngine*, const CaloSamples &, Digi &);
+    interface analogToDigital(CLHEP::HepRandomEngine*, const CaloSamples &, Digi
+   &);
 
 */
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloHitResponse.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVNoiseSignalGenerator.h"
-#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHit.h"
+#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 #include <cassert>
 #include <vector>
 
@@ -17,25 +18,28 @@ namespace CLHEP {
   class HepRandomEngine;
 }
 
-template<class Traits>
+template <class Traits>
 class CaloTDigitizerDefaultRun {
 public:
   typedef typename Traits::ElectronicsSim ElectronicsSim;
   typedef typename Traits::Digi Digi;
   typedef typename Traits::DigiCollection DigiCollection;
 
-  void operator()(DigiCollection & output, CLHEP::HepRandomEngine* engine, CaloSamples * analogSignal, std::vector<DetId>::const_iterator idItr, ElectronicsSim* theElectronicsSim){
+  void operator()(DigiCollection &output,
+                  CLHEP::HepRandomEngine *engine,
+                  CaloSamples *analogSignal,
+                  std::vector<DetId>::const_iterator idItr,
+                  ElectronicsSim *theElectronicsSim) {
     Digi digi(*idItr);
-    theElectronicsSim->analogToDigital(engine, *analogSignal , digi);
+    theElectronicsSim->analogToDigital(engine, *analogSignal, digi);
     output.push_back(std::move(digi));
   }
-  
 };
 
-//second parameter changes the operation of run() slightly (default value for old-style with edm::SortedCollection instead of edm::DataFrameContainer)
-template<class Traits, template <class> class runHelper=CaloTDigitizerDefaultRun>
-class CaloTDigitizer
-{
+// second parameter changes the operation of run() slightly (default value for
+// old-style with edm::SortedCollection instead of edm::DataFrameContainer)
+template <class Traits, template <class> class runHelper = CaloTDigitizerDefaultRun>
+class CaloTDigitizer {
 public:
   /// these are the types that need to be defined in the Traits
   /// class.  The ElectronicsSim needs to have an interface
@@ -44,92 +48,82 @@ class CaloTDigitizer
   typedef typename Traits::Digi Digi;
   typedef typename Traits::DigiCollection DigiCollection;
 
-  CaloTDigitizer(CaloHitResponse * hitResponse, ElectronicsSim * electronicsSim, bool addNoise)
-  :  theHitResponse(hitResponse),
-     theNoiseSignalGenerator(nullptr),
-     theElectronicsSim(electronicsSim),
-     theDetIds(nullptr),
-     addNoise_(addNoise),
-     debugCS_(false)
-  {
-  }
-
+  CaloTDigitizer(CaloHitResponse *hitResponse, ElectronicsSim *electronicsSim, bool addNoise)
+      : theHitResponse(hitResponse),
+        theNoiseSignalGenerator(nullptr),
+        theElectronicsSim(electronicsSim),
+        theDetIds(nullptr),
+        addNoise_(addNoise),
+        debugCS_(false) {}
 
   /// doesn't delete the pointers passed in
   ~CaloTDigitizer() {}
 
   /// tell the digitizer which cells exist
-  const std::vector<DetId>&  detIds() const {assert( 0 != theDetIds ) ; return *theDetIds;}
-  void setDetIds(const std::vector<DetId> & detIds) {theDetIds = &detIds;}
-
-  void setNoiseSignalGenerator(CaloVNoiseSignalGenerator * generator)
-  {
-    theNoiseSignalGenerator = generator;
+  const std::vector<DetId> &detIds() const {
+    assert(0 != theDetIds);
+    return *theDetIds;
   }
+  void setDetIds(const std::vector<DetId> &detIds) { theDetIds = &detIds; }
 
-  void setDebugCaloSamples(bool debug){
-    debugCS_ = debug;
-  }
+  void setNoiseSignalGenerator(CaloVNoiseSignalGenerator *generator) { theNoiseSignalGenerator = generator; }
 
-  const CaloSamplesCollection& getCaloSamples() const {
-    return csColl_;
-  }
+  void setDebugCaloSamples(bool debug) { debugCS_ = debug; }
+
+  const CaloSamplesCollection &getCaloSamples() const { return csColl_; }
 
-  void add(const std::vector<PCaloHit> & hits, int bunchCrossing, CLHEP::HepRandomEngine* engine) {
-    if(theHitResponse->withinBunchRange(bunchCrossing)) {
-      for(std::vector<PCaloHit>::const_iterator it = hits.begin(), itEnd = hits.end(); it != itEnd; ++it) {
+  void add(const std::vector<PCaloHit> &hits, int bunchCrossing, CLHEP::HepRandomEngine *engine) {
+    if (theHitResponse->withinBunchRange(bunchCrossing)) {
+      for (std::vector<PCaloHit>::const_iterator it = hits.begin(), itEnd = hits.end(); it != itEnd; ++it) {
         theHitResponse->add(*it, engine);
       }
     }
   }
 
-  void initializeHits() {
-     theHitResponse->initializeHits();
-  }
+  void initializeHits() { theHitResponse->initializeHits(); }
 
   /// turns hits into digis
-  void run(MixCollection<PCaloHit> &, DigiCollection &) {
-    assert(0);
-  }
+  void run(MixCollection<PCaloHit> &, DigiCollection &) { assert(0); }
 
   /// Collects the digis
 
-  void run(DigiCollection & output, CLHEP::HepRandomEngine* engine) {
+  void run(DigiCollection &output, CLHEP::HepRandomEngine *engine) {
     assert(!theDetIds->empty());
 
-    if(theNoiseSignalGenerator != nullptr) addNoiseSignals(engine);
+    if (theNoiseSignalGenerator != nullptr)
+      addNoiseSignals(engine);
 
     theHitResponse->finalizeHits(engine);
-    //std::cout << " In CaloTDigitizer, after finalize hits " << std::endl;
+    // std::cout << " In CaloTDigitizer, after finalize hits " << std::endl;
 
     theElectronicsSim->newEvent(engine);
 
     // reserve space for how many digis we expect
     int nDigisExpected = addNoise_ ? theDetIds->size() : theHitResponse->nSignals();
     output.reserve(nDigisExpected);
-    if(debugCS_) {
+    if (debugCS_) {
       csColl_.clear();
       csColl_.reserve(nDigisExpected);
       theHitResponse->setStorePrecise(true);
     }
 
     // make a raw digi for evey cell
-    for(std::vector<DetId>::const_iterator idItr = theDetIds->begin();
-        idItr != theDetIds->end(); ++idItr)
-    {
-       CaloSamples * analogSignal = theHitResponse->findSignal(*idItr);
-       if(analogSignal && debugCS_) csColl_.push_back(*analogSignal);
-       bool needToDeleteSignal = false;
-       // don't bother digitizing if no signal and no noise
-       if(analogSignal == nullptr && addNoise_) {
-         // I guess we need to make a blank signal for this cell.
-         // Don't bother storing it anywhere.
-         analogSignal = new CaloSamples(theHitResponse->makeBlankSignal(*idItr));
-         needToDeleteSignal = true;
-       }
-       if(analogSignal != nullptr) { 
-         runAnalogToDigital(output,engine,analogSignal,idItr,theElectronicsSim);
-         if(needToDeleteSignal) delete analogSignal;
+    for (std::vector<DetId>::const_iterator idItr = theDetIds->begin(); idItr != theDetIds->end(); ++idItr) {
+      CaloSamples *analogSignal = theHitResponse->findSignal(*idItr);
+      if (analogSignal && debugCS_)
+        csColl_.push_back(*analogSignal);
+      bool needToDeleteSignal = false;
+      // don't bother digitizing if no signal and no noise
+      if (analogSignal == nullptr && addNoise_) {
+        // I guess we need to make a blank signal for this cell.
+        // Don't bother storing it anywhere.
+        analogSignal = new CaloSamples(theHitResponse->makeBlankSignal(*idItr));
+        needToDeleteSignal = true;
+      }
+      if (analogSignal != nullptr) {
+        runAnalogToDigital(output, engine, analogSignal, idItr, theElectronicsSim);
+        if (needToDeleteSignal)
+          delete analogSignal;
       }
     }
 
@@ -137,29 +131,27 @@ class CaloTDigitizer
     theHitResponse->clear();
   }
 
-  void addNoiseSignals(CLHEP::HepRandomEngine* engine)
-  {
+  void addNoiseSignals(CLHEP::HepRandomEngine *engine) {
     std::vector<CaloSamples> noiseSignals;
     // noise signals need to be in units of photoelectrons.  Fractional is OK
     theNoiseSignalGenerator->fillEvent(engine);
     theNoiseSignalGenerator->getNoiseSignals(noiseSignals);
-    for(std::vector<CaloSamples>::const_iterator signalItr = noiseSignals.begin(),
-        signalEnd = noiseSignals.end(); signalItr != signalEnd; ++signalItr)
-    {
+    for (std::vector<CaloSamples>::const_iterator signalItr = noiseSignals.begin(), signalEnd = noiseSignals.end();
+         signalItr != signalEnd;
+         ++signalItr) {
       theHitResponse->add(*signalItr);
     }
   }
 
 private:
   runHelper<Traits> runAnalogToDigital;
-  CaloHitResponse * theHitResponse;
-  CaloVNoiseSignalGenerator * theNoiseSignalGenerator;
-  ElectronicsSim * theElectronicsSim;
-  const std::vector<DetId>* theDetIds;
+  CaloHitResponse *theHitResponse;
+  CaloVNoiseSignalGenerator *theNoiseSignalGenerator;
+  ElectronicsSim *theElectronicsSim;
+  const std::vector<DetId> *theDetIds;
   bool addNoise_;
   bool debugCS_;
   CaloSamplesCollection csColl_;
 };
 
 #endif
-
diff --git a/SimCalorimetry/CaloSimAlgos/interface/CaloVHitCorrection.h b/SimCalorimetry/CaloSimAlgos/interface/CaloVHitCorrection.h
index 910c902fee9c5..c8814541b1e90 100644
--- a/SimCalorimetry/CaloSimAlgos/interface/CaloVHitCorrection.h
+++ b/SimCalorimetry/CaloSimAlgos/interface/CaloVHitCorrection.h
@@ -10,8 +10,7 @@ namespace CLHEP {
 class CaloVHitCorrection {
 public:
   virtual ~CaloVHitCorrection() = default;
-  virtual double delay(const PCaloHit & hit, CLHEP::HepRandomEngine*) const = 0;
+  virtual double delay(const PCaloHit &hit, CLHEP::HepRandomEngine *) const = 0;
 };
 
 #endif
-
diff --git a/SimCalorimetry/CaloSimAlgos/interface/CaloVHitFilter.h b/SimCalorimetry/CaloSimAlgos/interface/CaloVHitFilter.h
index dc8cbd54ba4b0..24b6a64acd96a 100644
--- a/SimCalorimetry/CaloSimAlgos/interface/CaloVHitFilter.h
+++ b/SimCalorimetry/CaloSimAlgos/interface/CaloVHitFilter.h
@@ -3,12 +3,10 @@
 
 #include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 
-
 class CaloVHitFilter {
 public:
   virtual ~CaloVHitFilter() = default;
-  virtual bool accepts(const PCaloHit & hit) const = 0;
+  virtual bool accepts(const PCaloHit &hit) const = 0;
 };
 
 #endif
-
diff --git a/SimCalorimetry/CaloSimAlgos/interface/CaloVNoiseSignalGenerator.h b/SimCalorimetry/CaloSimAlgos/interface/CaloVNoiseSignalGenerator.h
index 2e39a01ae7f71..c640ffdd81796 100644
--- a/SimCalorimetry/CaloSimAlgos/interface/CaloVNoiseSignalGenerator.h
+++ b/SimCalorimetry/CaloSimAlgos/interface/CaloVNoiseSignalGenerator.h
@@ -1,36 +1,35 @@
 #ifndef CaloSimAlgos_CaloVNoiseSignalGenerator_h
 #define CaloSimAlgos_CaloVNoiseSignalGenerator_h
 
-#include<vector>
 #include "CalibFormats/CaloObjects/interface/CaloSamples.h"
+#include <vector>
 
 namespace CLHEP {
   class HepRandomEngine;
 }
 
-class CaloVNoiseSignalGenerator
-{
+class CaloVNoiseSignalGenerator {
 public:
   CaloVNoiseSignalGenerator();
   virtual ~CaloVNoiseSignalGenerator() {}
 
   ///  fill theNoiseSignals with one event's worth of noise, in units of pe
-  void fillEvent(CLHEP::HepRandomEngine*);
+  void fillEvent(CLHEP::HepRandomEngine *);
 
-  void fillEvent(); //don't need random engine for some tasks
+  void fillEvent();  // don't need random engine for some tasks
 
-  void getNoiseSignals(std::vector<CaloSamples> & noiseSignals) { noiseSignals = theNoiseSignals; }
+  void getNoiseSignals(std::vector<CaloSamples> &noiseSignals) { noiseSignals = theNoiseSignals; }
 
-  bool contains(const DetId & detId) const;
+  bool contains(const DetId &detId) const;
 
   /// if you want to externally fill signals for the event, call this
   /// before fillEvent gets called.
-  void setNoiseSignals(const std::vector<CaloSamples> & noiseSignals);
+  void setNoiseSignals(const std::vector<CaloSamples> &noiseSignals);
 
 protected:
   /// if you want to fill signals on demand, override this
   /// subclass is responsible for clearing theNoiseSignals before adding
-  virtual void fillNoiseSignals(CLHEP::HepRandomEngine*) = 0;
+  virtual void fillNoiseSignals(CLHEP::HepRandomEngine *) = 0;
   virtual void fillNoiseSignals() = 0;
   std::vector<CaloSamples> theNoiseSignals;
 
@@ -40,4 +39,3 @@ class CaloVNoiseSignalGenerator
 };
 
 #endif
-
diff --git a/SimCalorimetry/CaloSimAlgos/interface/CaloVPECorrection.h b/SimCalorimetry/CaloSimAlgos/interface/CaloVPECorrection.h
index edfa3ed2176e3..182983eea7bb4 100644
--- a/SimCalorimetry/CaloSimAlgos/interface/CaloVPECorrection.h
+++ b/SimCalorimetry/CaloSimAlgos/interface/CaloVPECorrection.h
@@ -11,12 +11,10 @@ namespace CLHEP {
   class HepRandomEngine;
 }
 
-class CaloVPECorrection
-{
+class CaloVPECorrection {
 public:
   virtual ~CaloVPECorrection() {}
-  virtual double correctPE(const DetId & detId, double npe, CLHEP::HepRandomEngine*) const = 0;
+  virtual double correctPE(const DetId &detId, double npe, CLHEP::HepRandomEngine *) const = 0;
 };
 
 #endif
-
diff --git a/SimCalorimetry/CaloSimAlgos/interface/CaloVShape.h b/SimCalorimetry/CaloSimAlgos/interface/CaloVShape.h
index c88851d2f0486..f04c092552839 100644
--- a/SimCalorimetry/CaloSimAlgos/interface/CaloVShape.h
+++ b/SimCalorimetry/CaloSimAlgos/interface/CaloVShape.h
@@ -8,19 +8,16 @@
    \brief Electronic response of the preamp
 */
 
-class CaloVShape 
-{
- public:
-
+class CaloVShape {
+public:
   CaloVShape() {}
   virtual ~CaloVShape() {}
 
-  virtual double       operator () (double) const = 0 ;
-  virtual double       timeToRise()         const = 0 ;
-
- protected:
+  virtual double operator()(double) const = 0;
+  virtual double timeToRise() const = 0;
 
- private:
+protected:
+private:
 };
 
 #endif
diff --git a/SimCalorimetry/CaloSimAlgos/interface/CaloVSimParameterMap.h b/SimCalorimetry/CaloSimAlgos/interface/CaloVSimParameterMap.h
index 02183e615142a..95344645e7265 100644
--- a/SimCalorimetry/CaloSimAlgos/interface/CaloVSimParameterMap.h
+++ b/SimCalorimetry/CaloSimAlgos/interface/CaloVSimParameterMap.h
@@ -4,13 +4,10 @@
 class DetId;
 class CaloSimParameters;
 
-class CaloVSimParameterMap
-{
+class CaloVSimParameterMap {
 public:
   virtual ~CaloVSimParameterMap() = default;
-  virtual const CaloSimParameters & simParameters(const DetId & id) const = 0;
+  virtual const CaloSimParameters &simParameters(const DetId &id) const = 0;
 };
 
-
 #endif
-
diff --git a/SimCalorimetry/CaloSimAlgos/interface/CaloValidationStatistics.h b/SimCalorimetry/CaloSimAlgos/interface/CaloValidationStatistics.h
index f389a02df6aac..b90398e91da86 100644
--- a/SimCalorimetry/CaloSimAlgos/interface/CaloValidationStatistics.h
+++ b/SimCalorimetry/CaloSimAlgos/interface/CaloValidationStatistics.h
@@ -6,19 +6,18 @@
 
   \Author Rick Wilkinson
 */
-#include <string>
 #include <iosfwd>
+#include <string>
 
-class CaloValidationStatistics
-{
+class CaloValidationStatistics {
 public:
   CaloValidationStatistics(std::string name, float expectedMean, float expectedRMS);
   /// prints to LogInfo upon destruction
   ~CaloValidationStatistics();
 
-  void addEntry(float value, float weight=1.);
+  void addEntry(float value, float weight = 1.);
 
-  std::string name() const {return name_;}
+  std::string name() const { return name_; }
 
   float mean() const;
 
@@ -26,14 +25,13 @@ class CaloValidationStatistics
 
   float weightedMean() const;
 
-  float expectedMean() const {return expectedMean_;}
+  float expectedMean() const { return expectedMean_; }
 
-  float expectedRMS() const {return expectedRMS_;}
+  float expectedRMS() const { return expectedRMS_; }
 
-  int nEntries() const {return n_;}
+  int nEntries() const { return n_; }
 
 private:
-
   std::string name_;
   float expectedMean_;
   float expectedRMS_;
@@ -44,7 +42,6 @@ class CaloValidationStatistics
   int n_;
 };
 
-std::ostream & operator<<(std::ostream & os, const CaloValidationStatistics & stat);
+std::ostream &operator<<(std::ostream &os, const CaloValidationStatistics &stat);
 
 #endif
-
diff --git a/SimCalorimetry/CaloSimAlgos/src/CaloCachedShapeIntegrator.cc b/SimCalorimetry/CaloSimAlgos/src/CaloCachedShapeIntegrator.cc
index 04c8e3b7bb854..eac10d71c4a47 100644
--- a/SimCalorimetry/CaloSimAlgos/src/CaloCachedShapeIntegrator.cc
+++ b/SimCalorimetry/CaloSimAlgos/src/CaloCachedShapeIntegrator.cc
@@ -1,38 +1,24 @@
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloCachedShapeIntegrator.h"
 
-const int NBINS = 281; // 256, plus 25 before 
+const int NBINS = 281;  // 256, plus 25 before
 
-CaloCachedShapeIntegrator::CaloCachedShapeIntegrator( const CaloVShape* aShape ) :
-  v_(NBINS, 0.),
-  timeToRise_(aShape->timeToRise())
-{
-  for(int t = 0; t < 256; ++t) 
-  {
+CaloCachedShapeIntegrator::CaloCachedShapeIntegrator(const CaloVShape *aShape)
+    : v_(NBINS, 0.), timeToRise_(aShape->timeToRise()) {
+  for (int t = 0; t < 256; ++t) {
     double amount = (*aShape)(t);
-    for(int istep = 0; istep < 25; ++istep) 
-    {
+    for (int istep = 0; istep < 25; ++istep) {
       int ibin = t + istep;
       v_[ibin] += amount;
     }
   }
 }
 
-CaloCachedShapeIntegrator::~CaloCachedShapeIntegrator() 
-{
-}
+CaloCachedShapeIntegrator::~CaloCachedShapeIntegrator() {}
 
-double 
-CaloCachedShapeIntegrator::timeToRise() const 
-{
-   return timeToRise_;
-}
+double CaloCachedShapeIntegrator::timeToRise() const { return timeToRise_; }
 
-double 
-CaloCachedShapeIntegrator::operator() ( double startTime ) const 
-{
-  // round up, and account for the -25 ns offset 
-  int ibin = static_cast<int>(startTime+25.0);
-  return (ibin<0 || ibin >= NBINS) ? 0. : v_[ibin];
+double CaloCachedShapeIntegrator::operator()(double startTime) const {
+  // round up, and account for the -25 ns offset
+  int ibin = static_cast<int>(startTime + 25.0);
+  return (ibin < 0 || ibin >= NBINS) ? 0. : v_[ibin];
 }
-
-
diff --git a/SimCalorimetry/CaloSimAlgos/src/CaloHitAnalyzer.cc b/SimCalorimetry/CaloSimAlgos/src/CaloHitAnalyzer.cc
index 3a5020689cd51..88d866ca7f6f7 100644
--- a/SimCalorimetry/CaloSimAlgos/src/CaloHitAnalyzer.cc
+++ b/SimCalorimetry/CaloSimAlgos/src/CaloHitAnalyzer.cc
@@ -1,44 +1,41 @@
+#include "DataFormats/DetId/interface/DetId.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloHitAnalyzer.h"
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloValidationStatistics.h"
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloVSimParameterMap.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloSimParameters.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVHitFilter.h"
-#include "DataFormats/DetId/interface/DetId.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloVSimParameterMap.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloValidationStatistics.h"
 
 #include <iostream>
 
-CaloHitAnalyzer::CaloHitAnalyzer(const std::string & name,
-                      double hitEnergyThreshold,
-                      const CaloVSimParameterMap * parameterMap,
-                      const CaloVHitFilter * filter)
-: hitEnergySumMap_(),
-  hitEnergyThreshold_(hitEnergyThreshold),
-  simParameterMap_(parameterMap),
-  hitFilter_(filter),
-  summary_(name, 1., 0.),
-  noiseHits_(0)
-{
-}
-
+CaloHitAnalyzer::CaloHitAnalyzer(const std::string &name,
+                                 double hitEnergyThreshold,
+                                 const CaloVSimParameterMap *parameterMap,
+                                 const CaloVHitFilter *filter)
+    : hitEnergySumMap_(),
+      hitEnergyThreshold_(hitEnergyThreshold),
+      simParameterMap_(parameterMap),
+      hitFilter_(filter),
+      summary_(name, 1., 0.),
+      noiseHits_(0) {}
 
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
-void CaloHitAnalyzer::fillHits(MixCollection<PCaloHit> & hits) {
+void CaloHitAnalyzer::fillHits(MixCollection<PCaloHit> &hits) {
   hitEnergySumMap_.clear();
   noiseHits_ = 0;
   // store the energy of each hit in a map
   MixCollection<PCaloHit>::MixItr hitItr = hits.begin();
   MixCollection<PCaloHit>::MixItr last = hits.end();
-  for( ; hitItr != last; ++hitItr) 
-  {
-    if(hitFilter_ == nullptr || hitFilter_->accepts(*hitItr)) {
+  for (; hitItr != last; ++hitItr) {
+    if (hitFilter_ == nullptr || hitFilter_->accepts(*hitItr)) {
       int id = hitItr->id();
-      //double samplingFactor = simParameterMap_->simParameters(DetId(id)).samplingFactor();
+      // double samplingFactor =
+      // simParameterMap_->simParameters(DetId(id)).samplingFactor();
       double samplingFactor = 1.;
       double energy = hitItr->energy() * samplingFactor;
 
       // add it to the map
       std::map<int, double>::iterator mapItr = hitEnergySumMap_.find(id);
-      if(mapItr == hitEnergySumMap_.end()) {
+      if (mapItr == hitEnergySumMap_.end()) {
         hitEnergySumMap_[id] = energy;
       } else {
         mapItr->second += energy;
@@ -47,16 +44,14 @@ void CaloHitAnalyzer::fillHits(MixCollection<PCaloHit> & hits) {
   }
 }
 
-
 void CaloHitAnalyzer::analyze(int id, double recEnergy) {
-  if(recEnergy > hitEnergyThreshold_) {
+  if (recEnergy > hitEnergyThreshold_) {
     std::map<int, double>::iterator mapItr = hitEnergySumMap_.find(id);
-    if(mapItr == hitEnergySumMap_.end()) {
+    if (mapItr == hitEnergySumMap_.end()) {
       ++noiseHits_;
     } else {
-       // keep statistics of the rec energy / sim energy
-      summary_.addEntry(recEnergy/mapItr->second);
+      // keep statistics of the rec energy / sim energy
+      summary_.addEntry(recEnergy / mapItr->second);
     }
   }
 }
-
diff --git a/SimCalorimetry/CaloSimAlgos/src/CaloHitResponse.cc b/SimCalorimetry/CaloSimAlgos/src/CaloHitResponse.cc
index 49a2adcfe39c3..9ab701a08f291 100644
--- a/SimCalorimetry/CaloSimAlgos/src/CaloHitResponse.cc
+++ b/SimCalorimetry/CaloSimAlgos/src/CaloHitResponse.cc
@@ -1,180 +1,170 @@
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloHitResponse.h" 
-#include "SimDataFormats/CaloHit/interface/PCaloHit.h" 
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloVSimParameterMap.h"
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloSimParameters.h"
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloVShape.h"
+#include "DataFormats/HcalDetId/interface/HcalDetId.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/isFinite.h"
+#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
+#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloHitResponse.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloShapes.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloSimParameters.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVHitCorrection.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVHitFilter.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
-#include "DataFormats/HcalDetId/interface/HcalDetId.h"
-#include "FWCore/Utilities/interface/isFinite.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloVShape.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloVSimParameterMap.h"
+#include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 
 #include "CLHEP/Random/RandPoissonQ.h"
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h" 
-
-#include<iostream>
-
-CaloHitResponse::CaloHitResponse(const CaloVSimParameterMap * parametersMap, 
-                                 const CaloVShape * shape)
-: theAnalogSignalMap(),
-  theParameterMap(parametersMap), 
-  theShapes(nullptr),  
-  theShape(shape),  
-  theHitCorrection(nullptr),
-  thePECorrection(nullptr),
-  theHitFilter(nullptr),
-  theGeometry(nullptr),
-  theMinBunch(-10), 
-  theMaxBunch(10),
-  thePhaseShift_(1.),
-  storePrecise(false),
-  ignoreTime(false) {}
-
-CaloHitResponse::CaloHitResponse(const CaloVSimParameterMap * parametersMap,
-                                 const CaloShapes * shapes)
-: theAnalogSignalMap(),
-  theParameterMap(parametersMap),
-  theShapes(shapes),
-  theShape(nullptr),
-  theHitCorrection(nullptr),
-  thePECorrection(nullptr),
-  theHitFilter(nullptr),
-  theGeometry(nullptr),
-  theMinBunch(-10),
-  theMaxBunch(10),
-  thePhaseShift_(1.),
-  storePrecise(false),
-  ignoreTime(false) {}
-
-CaloHitResponse::~CaloHitResponse() {
-}
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
+
+#include <iostream>
+
+CaloHitResponse::CaloHitResponse(const CaloVSimParameterMap *parametersMap, const CaloVShape *shape)
+    : theAnalogSignalMap(),
+      theParameterMap(parametersMap),
+      theShapes(nullptr),
+      theShape(shape),
+      theHitCorrection(nullptr),
+      thePECorrection(nullptr),
+      theHitFilter(nullptr),
+      theGeometry(nullptr),
+      theMinBunch(-10),
+      theMaxBunch(10),
+      thePhaseShift_(1.),
+      storePrecise(false),
+      ignoreTime(false) {}
+
+CaloHitResponse::CaloHitResponse(const CaloVSimParameterMap *parametersMap, const CaloShapes *shapes)
+    : theAnalogSignalMap(),
+      theParameterMap(parametersMap),
+      theShapes(shapes),
+      theShape(nullptr),
+      theHitCorrection(nullptr),
+      thePECorrection(nullptr),
+      theHitFilter(nullptr),
+      theGeometry(nullptr),
+      theMinBunch(-10),
+      theMaxBunch(10),
+      thePhaseShift_(1.),
+      storePrecise(false),
+      ignoreTime(false) {}
+
+CaloHitResponse::~CaloHitResponse() {}
 
 void CaloHitResponse::setBunchRange(int minBunch, int maxBunch) {
   theMinBunch = minBunch;
   theMaxBunch = maxBunch;
 }
 
-void CaloHitResponse::run(const MixCollection<PCaloHit> & hits, CLHEP::HepRandomEngine* engine) {
-
-  for(MixCollection<PCaloHit>::MixItr hitItr = hits.begin();
-      hitItr != hits.end(); ++hitItr) {
-    if(withinBunchRange(hitItr.bunch())) {
+void CaloHitResponse::run(const MixCollection<PCaloHit> &hits, CLHEP::HepRandomEngine *engine) {
+  for (MixCollection<PCaloHit>::MixItr hitItr = hits.begin(); hitItr != hits.end(); ++hitItr) {
+    if (withinBunchRange(hitItr.bunch())) {
       add(*hitItr, engine);
-    } // loop over hits
+    }  // loop over hits
   }
 }
 
-void CaloHitResponse::add( const PCaloHit& hit, CLHEP::HepRandomEngine* engine ) {
+void CaloHitResponse::add(const PCaloHit &hit, CLHEP::HepRandomEngine *engine) {
   // check the hit time makes sense
-  if ( edm::isNotFinite(hit.time()) ) { return; }
+  if (edm::isNotFinite(hit.time())) {
+    return;
+  }
 
   // maybe it's not from this subdetector
-  if(theHitFilter == nullptr || theHitFilter->accepts(hit)) {
+  if (theHitFilter == nullptr || theHitFilter->accepts(hit)) {
     LogDebug("CaloHitResponse") << hit;
-    CaloSamples signal( makeAnalogSignal( hit, engine ) ) ;
-    bool keep ( keepBlank() ) ;  // here we  check for blank signal if not keeping them
-    if( !keep )
-    {
-       const unsigned int size ( signal.size() ) ;
-       if( 0 != size )
-       {
-	  for( unsigned int i ( 0 ) ; i != size ; ++i )
-	  {
-	     keep = keep || signal[i] > 1.e-7 ;
-	  }
-       }
+    CaloSamples signal(makeAnalogSignal(hit, engine));
+    bool keep(keepBlank());  // here we  check for blank signal if not keeping them
+    if (!keep) {
+      const unsigned int size(signal.size());
+      if (0 != size) {
+        for (unsigned int i(0); i != size; ++i) {
+          keep = keep || signal[i] > 1.e-7;
+        }
+      }
     }
 
-    if( keep ) add(signal);
+    if (keep)
+      add(signal);
   }
 }
 
-
-void CaloHitResponse::add(const CaloSamples & signal)
-{
+void CaloHitResponse::add(const CaloSamples &signal) {
   DetId id(signal.id());
-  CaloSamples * oldSignal = findSignal(id);
+  CaloSamples *oldSignal = findSignal(id);
   if (oldSignal == nullptr) {
     theAnalogSignalMap[id] = signal;
 
-  } else  {
+  } else {
     (*oldSignal) += signal;
   }
 }
 
-
-CaloSamples CaloHitResponse::makeAnalogSignal(const PCaloHit & hit, CLHEP::HepRandomEngine* engine) const {
-
+CaloSamples CaloHitResponse::makeAnalogSignal(const PCaloHit &hit, CLHEP::HepRandomEngine *engine) const {
   DetId detId(hit.id());
-  const CaloSimParameters & parameters = theParameterMap->simParameters(detId);
+  const CaloSimParameters &parameters = theParameterMap->simParameters(detId);
   double signal = analogSignalAmplitude(detId, hit.energy(), parameters, engine);
 
   double time = hit.time();
   double tof = timeOfFlight(detId);
-  if(ignoreTime) time = tof;
-  if(theHitCorrection != nullptr) {
+  if (ignoreTime)
+    time = tof;
+  if (theHitCorrection != nullptr) {
     time += theHitCorrection->delay(hit, engine);
   }
   double jitter = time - tof;
 
-  const CaloVShape * shape = theShape;
-  if(!shape) {
-    shape = theShapes->shape(detId,storePrecise);
+  const CaloVShape *shape = theShape;
+  if (!shape) {
+    shape = theShapes->shape(detId, storePrecise);
   }
   // assume bins count from zero, go for center of bin
-  const double tzero = ( shape->timeToRise()
-			 + parameters.timePhase() 
-			 - jitter 
-			 - BUNCHSPACE*( parameters.binOfMaximum()
-					- thePhaseShift_          ) ) ;
+  const double tzero = (shape->timeToRise() + parameters.timePhase() - jitter -
+                        BUNCHSPACE * (parameters.binOfMaximum() - thePhaseShift_));
   double binTime = tzero;
 
   CaloSamples result(makeBlankSignal(detId));
 
-  if(storePrecise){
+  if (storePrecise) {
     result.resetPrecise();
     int sampleBin(0);
-    //use 1ns binning for precise sample
-    for(int bin = 0; bin < result.size()*BUNCHSPACE; bin++) {
-      sampleBin = bin/BUNCHSPACE;
-      double pulseBit = (*shape)(binTime)* signal;
+    // use 1ns binning for precise sample
+    for (int bin = 0; bin < result.size() * BUNCHSPACE; bin++) {
+      sampleBin = bin / BUNCHSPACE;
+      double pulseBit = (*shape)(binTime)*signal;
       result[sampleBin] += pulseBit;
       result.preciseAtMod(bin) += pulseBit;
       binTime += 1.0;
     }
-  }
-  else {
-    for(int bin = 0; bin < result.size(); bin++) {
-      result[bin] += (*shape)(binTime)* signal;
+  } else {
+    for (int bin = 0; bin < result.size(); bin++) {
+      result[bin] += (*shape)(binTime)*signal;
       binTime += BUNCHSPACE;
     }
   }
   return result;
-} 
-
-double CaloHitResponse::analogSignalAmplitude(const DetId & detId, float energy, const CaloSimParameters & parameters, CLHEP::HepRandomEngine* engine) const {
+}
 
+double CaloHitResponse::analogSignalAmplitude(const DetId &detId,
+                                              float energy,
+                                              const CaloSimParameters &parameters,
+                                              CLHEP::HepRandomEngine *engine) const {
   // OK, the "energy" in the hit could be a real energy, deposited energy,
   // or pe count.  This factor converts to photoelectrons
-  //GMA Smeared in photon production it self  
+  // GMA Smeared in photon production it self
   double npe = energy * parameters.simHitToPhotoelectrons(detId);
   // do we need to doPoisson statistics for the photoelectrons?
-  if(parameters.doPhotostatistics()) {
-    npe = CLHEP::RandPoissonQ::shoot(engine,npe);
+  if (parameters.doPhotostatistics()) {
+    npe = CLHEP::RandPoissonQ::shoot(engine, npe);
   }
-  if(thePECorrection) npe = thePECorrection->correctPE(detId, npe, engine);
+  if (thePECorrection)
+    npe = thePECorrection->correctPE(detId, npe, engine);
   return npe;
 }
 
-
-CaloSamples * CaloHitResponse::findSignal(const DetId & detId) {
-  CaloSamples * result = nullptr;
+CaloSamples *CaloHitResponse::findSignal(const DetId &detId) {
+  CaloSamples *result = nullptr;
   AnalogSignalMap::iterator signalItr = theAnalogSignalMap.find(detId);
-  if(signalItr == theAnalogSignalMap.end()) {
+  if (signalItr == theAnalogSignalMap.end()) {
     result = nullptr;
   } else {
     result = &(signalItr->second);
@@ -182,36 +172,31 @@ CaloSamples * CaloHitResponse::findSignal(const DetId & detId) {
   return result;
 }
 
-
-CaloSamples CaloHitResponse::makeBlankSignal(const DetId & detId) const {
-  const CaloSimParameters & parameters = theParameterMap->simParameters(detId);
-  int preciseSize(storePrecise ? parameters.readoutFrameSize()*BUNCHSPACE : 0);
-  CaloSamples result(detId, parameters.readoutFrameSize(),preciseSize);
-  result.setPresamples(parameters.binOfMaximum()-1);
-  if(storePrecise) result.setPrecise(result.presamples()*BUNCHSPACE,1.0);
+CaloSamples CaloHitResponse::makeBlankSignal(const DetId &detId) const {
+  const CaloSimParameters &parameters = theParameterMap->simParameters(detId);
+  int preciseSize(storePrecise ? parameters.readoutFrameSize() * BUNCHSPACE : 0);
+  CaloSamples result(detId, parameters.readoutFrameSize(), preciseSize);
+  result.setPresamples(parameters.binOfMaximum() - 1);
+  if (storePrecise)
+    result.setPrecise(result.presamples() * BUNCHSPACE, 1.0);
   return result;
 }
 
-
-double CaloHitResponse::timeOfFlight(const DetId & detId) const {
+double CaloHitResponse::timeOfFlight(const DetId &detId) const {
   // not going to assume there's one of these per subdetector.
   // Take the whole CaloGeometry and find the right subdet
   double result = 0.;
-  if(theGeometry == nullptr) {
+  if (theGeometry == nullptr) {
     edm::LogWarning("CaloHitResponse") << "No Calo Geometry set, so no time of flight correction";
-  } 
-  else {
+  } else {
     auto cellGeometry = theGeometry->getSubdetectorGeometry(detId)->getGeometry(detId);
-    if(cellGeometry == nullptr) {
-       edm::LogWarning("CaloHitResponse") << "No Calo cell found for ID"
-         << detId.rawId() << " so no time-of-flight subtraction will be done";
-    }
-    else {
+    if (cellGeometry == nullptr) {
+      edm::LogWarning("CaloHitResponse") << "No Calo cell found for ID" << detId.rawId()
+                                         << " so no time-of-flight subtraction will be done";
+    } else {
       double distance = cellGeometry->getPosition().mag();
-      result =  distance * cm / c_light; // Units of c_light: mm/ns
+      result = distance * cm / c_light;  // Units of c_light: mm/ns
     }
   }
   return result;
 }
-
-
diff --git a/SimCalorimetry/CaloSimAlgos/src/CaloShapeIntegrator.cc b/SimCalorimetry/CaloSimAlgos/src/CaloShapeIntegrator.cc
index 7085b36473f06..70ab3fa479e2e 100644
--- a/SimCalorimetry/CaloSimAlgos/src/CaloShapeIntegrator.cc
+++ b/SimCalorimetry/CaloSimAlgos/src/CaloShapeIntegrator.cc
@@ -1,33 +1,19 @@
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloShapeIntegrator.h"
 
-CaloShapeIntegrator::CaloShapeIntegrator( const CaloVShape* aShape ) :
-   m_shape ( aShape )
-{
-}
+CaloShapeIntegrator::CaloShapeIntegrator(const CaloVShape *aShape) : m_shape(aShape) {}
 
-CaloShapeIntegrator::~CaloShapeIntegrator() 
-{
-}
+CaloShapeIntegrator::~CaloShapeIntegrator() {}
 
-double 
-CaloShapeIntegrator::timeToRise() const 
-{
-   return m_shape->timeToRise() ;
-}
+double CaloShapeIntegrator::timeToRise() const { return m_shape->timeToRise(); }
 
-double 
-CaloShapeIntegrator::operator() ( double startTime ) const 
-{
-   double sum = 0.;
+double CaloShapeIntegrator::operator()(double startTime) const {
+  double sum = 0.;
 
-   double time = startTime + 0.5 ;
+  double time = startTime + 0.5;
 
-   for( unsigned istep = 0; istep < BUNCHSPACE ; ++istep )
-   {
-      sum += (*m_shape)( time ) ;
-      time = time + 1.0 ;
-   }
-   return sum;
+  for (unsigned istep = 0; istep < BUNCHSPACE; ++istep) {
+    sum += (*m_shape)(time);
+    time = time + 1.0;
+  }
+  return sum;
 }
-
-
diff --git a/SimCalorimetry/CaloSimAlgos/src/CaloSimParameters.cc b/SimCalorimetry/CaloSimAlgos/src/CaloSimParameters.cc
index 9018b0b6dfb23..7e8761ffc857c 100644
--- a/SimCalorimetry/CaloSimAlgos/src/CaloSimParameters.cc
+++ b/SimCalorimetry/CaloSimAlgos/src/CaloSimParameters.cc
@@ -1,46 +1,44 @@
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloSimParameters.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include<iostream>
-  
-CaloSimParameters::CaloSimParameters(double simHitToPhotoelectrons, double photoelectronsToAnalog,
-                 double samplingFactor, double timePhase,
-                 int readoutFrameSize, int binOfMaximum,
-                 bool doPhotostatistics, bool syncPhase)
-: simHitToPhotoelectrons_(simHitToPhotoelectrons),
-  photoelectronsToAnalog_(photoelectronsToAnalog),
-  timePhase_(timePhase),
-  readoutFrameSize_(readoutFrameSize),
-  binOfMaximum_(binOfMaximum),
-  doPhotostatistics_(doPhotostatistics),
-  syncPhase_(syncPhase)
-{
-}
-
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloSimParameters.h"
+#include <iostream>
 
+CaloSimParameters::CaloSimParameters(double simHitToPhotoelectrons,
+                                     double photoelectronsToAnalog,
+                                     double samplingFactor,
+                                     double timePhase,
+                                     int readoutFrameSize,
+                                     int binOfMaximum,
+                                     bool doPhotostatistics,
+                                     bool syncPhase)
+    : simHitToPhotoelectrons_(simHitToPhotoelectrons),
+      photoelectronsToAnalog_(photoelectronsToAnalog),
+      timePhase_(timePhase),
+      readoutFrameSize_(readoutFrameSize),
+      binOfMaximum_(binOfMaximum),
+      doPhotostatistics_(doPhotostatistics),
+      syncPhase_(syncPhase) {}
 
-CaloSimParameters::CaloSimParameters(const edm::ParameterSet & p, bool skipPe2Fc)
-: simHitToPhotoelectrons_( p.getParameter<double>("simHitToPhotoelectrons") ),
-  photoelectronsToAnalog_( 0. ),
-  timePhase_( p.getParameter<double>("timePhase") ),
-  readoutFrameSize_( p.getParameter<int>("readoutFrameSize") ),
-  binOfMaximum_( p.getParameter<int>("binOfMaximum") ),
-  doPhotostatistics_( p.getParameter<bool>("doPhotoStatistics") ),
-  syncPhase_( p.getParameter<bool>("syncPhase") )
-{
+CaloSimParameters::CaloSimParameters(const edm::ParameterSet &p, bool skipPe2Fc)
+    : simHitToPhotoelectrons_(p.getParameter<double>("simHitToPhotoelectrons")),
+      photoelectronsToAnalog_(0.),
+      timePhase_(p.getParameter<double>("timePhase")),
+      readoutFrameSize_(p.getParameter<int>("readoutFrameSize")),
+      binOfMaximum_(p.getParameter<int>("binOfMaximum")),
+      doPhotostatistics_(p.getParameter<bool>("doPhotoStatistics")),
+      syncPhase_(p.getParameter<bool>("syncPhase")) {
   // some subsystems may not want a single number for this
-  if(p.existsAs<double>("photoelectronsToAnalog")) {
+  if (p.existsAs<double>("photoelectronsToAnalog")) {
     photoelectronsToAnalog_ = p.getParameter<double>("photoelectronsToAnalog");
-  } else if(p.existsAs<std::vector<double> >("photoelectronsToAnalog")) {
+  } else if (p.existsAs<std::vector<double>>("photoelectronsToAnalog")) {
     // just take the first one
-    photoelectronsToAnalog_ = p.getParameter<std::vector<double> >("photoelectronsToAnalog").at(0);
-  } else if(!skipPe2Fc) {
+    photoelectronsToAnalog_ = p.getParameter<std::vector<double>>("photoelectronsToAnalog").at(0);
+  } else if (!skipPe2Fc) {
     throw cms::Exception("CaloSimParameters") << "Cannot find parameter photoelectronsToAnalog";
   }
   // some subsystems may not want this at all
 }
 
-
-std::ostream & operator<<(std::ostream & os, const CaloSimParameters & p) {
+std::ostream &operator<<(std::ostream &os, const CaloSimParameters &p) {
   DetId dummy(0);
   os << "CALO SIM PARAMETERS" << std::endl;
   os << p.simHitToPhotoelectrons(dummy) << " pe per SimHit energy " << std::endl;
@@ -48,4 +46,3 @@ std::ostream & operator<<(std::ostream & os, const CaloSimParameters & p) {
   os << " Incident energy / SimHit Energy " << std::endl;
   return os;
 }
-
diff --git a/SimCalorimetry/CaloSimAlgos/src/CaloVNoiseSignalGenerator.cc b/SimCalorimetry/CaloSimAlgos/src/CaloVNoiseSignalGenerator.cc
index fb9282adcf5cd..a9b27bc68e9fa 100644
--- a/SimCalorimetry/CaloSimAlgos/src/CaloVNoiseSignalGenerator.cc
+++ b/SimCalorimetry/CaloSimAlgos/src/CaloVNoiseSignalGenerator.cc
@@ -1,54 +1,34 @@
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloVNoiseSignalGenerator.h"
 #include "FWCore/Utilities/interface/Algorithms.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloVNoiseSignalGenerator.h"
 #include <iostream>
 
-CaloVNoiseSignalGenerator::CaloVNoiseSignalGenerator()
-: theNoiseSignals(),
-  theDetIds()
-{
-}
-
+CaloVNoiseSignalGenerator::CaloVNoiseSignalGenerator() : theNoiseSignals(), theDetIds() {}
 
-void CaloVNoiseSignalGenerator::fillEvent(CLHEP::HepRandomEngine* engine)
-{
+void CaloVNoiseSignalGenerator::fillEvent(CLHEP::HepRandomEngine *engine) {
   theDetIds.clear();
   fillNoiseSignals(engine);
   fillDetIds();
 }
 
-
-void CaloVNoiseSignalGenerator::fillEvent()
-{
+void CaloVNoiseSignalGenerator::fillEvent() {
   theDetIds.clear();
   fillNoiseSignals();
   fillDetIds();
 }
 
-
-void CaloVNoiseSignalGenerator::setNoiseSignals(const std::vector<CaloSamples> & noiseSignals)
-{
+void CaloVNoiseSignalGenerator::setNoiseSignals(const std::vector<CaloSamples> &noiseSignals) {
   theNoiseSignals = noiseSignals;
 }
 
-
-bool CaloVNoiseSignalGenerator::contains(const DetId & detId) const
-{
+bool CaloVNoiseSignalGenerator::contains(const DetId &detId) const {
   return edm::binary_search_all(theDetIds, detId.rawId());
 }
 
-
-void CaloVNoiseSignalGenerator::fillDetIds()
-{
+void CaloVNoiseSignalGenerator::fillDetIds() {
   theDetIds.reserve(theNoiseSignals.size());
-  for(std::vector<CaloSamples>::const_iterator sampleItr = theNoiseSignals.begin();
-      sampleItr != theNoiseSignals.end(); ++sampleItr)
-  {
-
+  for (std::vector<CaloSamples>::const_iterator sampleItr = theNoiseSignals.begin(); sampleItr != theNoiseSignals.end();
+       ++sampleItr) {
     theDetIds.push_back(sampleItr->id().rawId());
-
   }
   edm::sort_all(theDetIds);
 }
-
-
-
diff --git a/SimCalorimetry/CaloSimAlgos/src/CaloValidationStatistics.cc b/SimCalorimetry/CaloSimAlgos/src/CaloValidationStatistics.cc
index 86781cb2ec3b2..c2dc12e2d802a 100644
--- a/SimCalorimetry/CaloSimAlgos/src/CaloValidationStatistics.cc
+++ b/SimCalorimetry/CaloSimAlgos/src/CaloValidationStatistics.cc
@@ -1,63 +1,45 @@
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloValidationStatistics.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloValidationStatistics.h"
 #include <cmath>
 #include <iostream>
 
-CaloValidationStatistics::CaloValidationStatistics(std::string name, float expectedMean, float expectedRMS) 
-:  name_(name),
-   expectedMean_(expectedMean),
-   expectedRMS_(expectedRMS),
-   sum_(0.),
-   sumOfSquares_(0.),
-   weightedSum_(0.),
-   sumOfWeights_(0.),
-   n_(0)
-{
-}
-
+CaloValidationStatistics::CaloValidationStatistics(std::string name, float expectedMean, float expectedRMS)
+    : name_(name),
+      expectedMean_(expectedMean),
+      expectedRMS_(expectedRMS),
+      sum_(0.),
+      sumOfSquares_(0.),
+      weightedSum_(0.),
+      sumOfWeights_(0.),
+      n_(0) {}
 
-CaloValidationStatistics::~CaloValidationStatistics() 
-{
-  edm::LogInfo("CaloValidationStatistics") << *this;
-}
+CaloValidationStatistics::~CaloValidationStatistics() { edm::LogInfo("CaloValidationStatistics") << *this; }
 
 void CaloValidationStatistics::addEntry(float value, float weight) {
   sum_ += value;
-  sumOfSquares_ += (value*value);
-  weightedSum_ += value*weight;
+  sumOfSquares_ += (value * value);
+  weightedSum_ += value * weight;
   sumOfWeights_ += weight;
   ++n_;
 }
 
-
-float CaloValidationStatistics::mean() const {
-  return sum_/n_;
-}
-
+float CaloValidationStatistics::mean() const { return sum_ / n_; }
 
 float CaloValidationStatistics::RMS() const {
-  float numerator = n_ * sumOfSquares_ - sum_*sum_;
-  int denominator = n_ * (n_-1);
-  return std::sqrt(numerator/denominator);
-}
-
- 
-float CaloValidationStatistics::weightedMean() const  {
-  return weightedSum_ / sumOfWeights_;
+  float numerator = n_ * sumOfSquares_ - sum_ * sum_;
+  int denominator = n_ * (n_ - 1);
+  return std::sqrt(numerator / denominator);
 }
 
+float CaloValidationStatistics::weightedMean() const { return weightedSum_ / sumOfWeights_; }
 
-std::ostream& operator<<(std::ostream & os,const CaloValidationStatistics & stat) {
+std::ostream &operator<<(std::ostream &os, const CaloValidationStatistics &stat) {
   os << "OVAL " << stat.name() << " entries:" << stat.nEntries();
-  if(stat.nEntries() > 0) {
-     os << " Mean: " << stat.mean() 
-        << " (expect " << stat.expectedMean() << ")";
+  if (stat.nEntries() > 0) {
+    os << " Mean: " << stat.mean() << " (expect " << stat.expectedMean() << ")";
   }
-  if(stat.nEntries() > 1) {      
-		 os << "  RMS: " << stat.RMS()
-        << " (expect " << stat.expectedRMS() << ")";
+  if (stat.nEntries() > 1) {
+    os << "  RMS: " << stat.RMS() << " (expect " << stat.expectedRMS() << ")";
   }
   return os;
 }
-
-
diff --git a/SimCalorimetry/CastorSim/plugins/CastorDigiAnalyzer.cc b/SimCalorimetry/CastorSim/plugins/CastorDigiAnalyzer.cc
index e09dc9b0ab4d6..ed70c08e184f2 100644
--- a/SimCalorimetry/CastorSim/plugins/CastorDigiAnalyzer.cc
+++ b/SimCalorimetry/CastorSim/plugins/CastorDigiAnalyzer.cc
@@ -1,45 +1,39 @@
-#include "SimCalorimetry/CastorSim/plugins/CastorDigiAnalyzer.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include<iostream>
-
-
-CastorDigiAnalyzer::CastorDigiAnalyzer(edm::ParameterSet const& conf) 
-: hitReadoutName_("CastorHits"),
-  simParameterMap_(),
-  castorHitAnalyzer_("CASTORDigi", 1., &simParameterMap_, &castorFilter_),
-  castorDigiStatistics_("CASTORDigi", 3, 10., 6., 0.1, 0.5, castorHitAnalyzer_),
-  castorDigiCollectionTag_(conf.getParameter<edm::InputTag>("castorDigiCollectionTag"))
-{
-}
+#include "SimCalorimetry/CastorSim/plugins/CastorDigiAnalyzer.h"
+#include <iostream>
 
+CastorDigiAnalyzer::CastorDigiAnalyzer(edm::ParameterSet const &conf)
+    : hitReadoutName_("CastorHits"),
+      simParameterMap_(),
+      castorHitAnalyzer_("CASTORDigi", 1., &simParameterMap_, &castorFilter_),
+      castorDigiStatistics_("CASTORDigi", 3, 10., 6., 0.1, 0.5, castorHitAnalyzer_),
+      castorDigiCollectionTag_(conf.getParameter<edm::InputTag>("castorDigiCollectionTag")) {}
 
 namespace CastorDigiAnalyzerImpl {
-  template<class Collection>
-  void analyze(edm::Event const& e, CastorDigiStatistics & statistics, edm::InputTag& tag) {
+  template <class Collection>
+  void analyze(edm::Event const &e, CastorDigiStatistics &statistics, edm::InputTag &tag) {
     edm::Handle<Collection> digis;
     e.getByLabel(tag, digis);
     if (!digis.isValid()) {
       edm::LogError("CastorDigiAnalyzer") << "Could not find Castor Digi Container ";
     } else {
-      for(unsigned i = 0; i < digis->size(); ++i) {
+      for (unsigned i = 0; i < digis->size(); ++i) {
         statistics.analyze((*digis)[i]);
       }
     }
   }
-}
-
+}  // namespace CastorDigiAnalyzerImpl
 
-void CastorDigiAnalyzer::analyze(edm::Event const& e, edm::EventSetup const& c) {
+void CastorDigiAnalyzer::analyze(edm::Event const &e, edm::EventSetup const &c) {
   //  edm::Handle<edm::PCaloHitContainer> hits;
-edm::Handle<CrossingFrame<PCaloHit> > castorcf;
-
-e.getByLabel("mix", "g4SimHitsCastorFI", castorcf);
+  edm::Handle<CrossingFrame<PCaloHit>> castorcf;
 
+  e.getByLabel("mix", "g4SimHitsCastorFI", castorcf);
 
-//access to SimHits
-std::unique_ptr<MixCollection<PCaloHit> > hits(new MixCollection<PCaloHit>(castorcf.product()));
-//  if (hits.isValid()) {
-    castorHitAnalyzer_.fillHits(*hits);
-    CastorDigiAnalyzerImpl::analyze<CastorDigiCollection>(e, castorDigiStatistics_, castorDigiCollectionTag_);
-  }
+  // access to SimHits
+  std::unique_ptr<MixCollection<PCaloHit>> hits(new MixCollection<PCaloHit>(castorcf.product()));
+  //  if (hits.isValid()) {
+  castorHitAnalyzer_.fillHits(*hits);
+  CastorDigiAnalyzerImpl::analyze<CastorDigiCollection>(e, castorDigiStatistics_, castorDigiCollectionTag_);
+}
diff --git a/SimCalorimetry/CastorSim/plugins/CastorDigiAnalyzer.h b/SimCalorimetry/CastorSim/plugins/CastorDigiAnalyzer.h
index 97fab96686923..e717f4f737a22 100644
--- a/SimCalorimetry/CastorSim/plugins/CastorDigiAnalyzer.h
+++ b/SimCalorimetry/CastorSim/plugins/CastorDigiAnalyzer.h
@@ -1,30 +1,26 @@
 #ifndef CastorSim_CastorDigiAnalyzer_h
 #define CastorSim_CastorDigiAnalyzer_h
 
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloHitAnalyzer.h"
-#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "SimCalorimetry/CastorSim/src/CastorSimParameterMap.h"
-#include "SimCalorimetry/CastorSim/src/CastorHitFilter.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloHitAnalyzer.h"
 #include "SimCalorimetry/CastorSim/plugins/CastorDigiStatistics.h"
-#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
+#include "SimCalorimetry/CastorSim/src/CastorHitFilter.h"
+#include "SimCalorimetry/CastorSim/src/CastorSimParameterMap.h"
 #include <string>
 
 /**  Castor digis
  Author: Panos Katsas
 */
 
-
-class CastorDigiAnalyzer : public edm::one::EDAnalyzer<>
-{
+class CastorDigiAnalyzer : public edm::one::EDAnalyzer<> {
 public:
-
-  explicit CastorDigiAnalyzer(edm::ParameterSet const& conf);
-  void analyze(edm::Event const& e, edm::EventSetup const& c) override;
-
+  explicit CastorDigiAnalyzer(edm::ParameterSet const &conf);
+  void analyze(edm::Event const &e, edm::EventSetup const &c) override;
 
 private:
   std::string hitReadoutName_;
@@ -36,5 +32,3 @@ class CastorDigiAnalyzer : public edm::one::EDAnalyzer<>
 };
 
 #endif
-
-
diff --git a/SimCalorimetry/CastorSim/plugins/CastorDigiProducer.cc b/SimCalorimetry/CastorSim/plugins/CastorDigiProducer.cc
index 9ae5d992e4c47..e9af319128984 100644
--- a/SimCalorimetry/CastorSim/plugins/CastorDigiProducer.cc
+++ b/SimCalorimetry/CastorSim/plugins/CastorDigiProducer.cc
@@ -1,45 +1,46 @@
-#include "SimCalorimetry/CastorSim/plugins/CastorDigiProducer.h"
+#include "CalibFormats/CastorObjects/interface/CastorDbRecord.h"
+#include "CalibFormats/CastorObjects/interface/CastorDbService.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/HcalDetId/interface/HcalCastorDetId.h"
+#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/EDProducer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h"
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloShapeIntegrator.h"
-#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
+#include "FWCore/Utilities/interface/StreamID.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
-#include "CalibFormats/CastorObjects/interface/CastorDbService.h"
-#include "CalibFormats/CastorObjects/interface/CastorDbRecord.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloShapeIntegrator.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h"
+#include "SimCalorimetry/CastorSim/plugins/CastorDigiProducer.h"
 #include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
 #include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
-#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
-#include "FWCore/Utilities/interface/StreamID.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DataFormats/HcalDetId/interface/HcalCastorDetId.h"
 #include "SimGeneral/MixingModule/interface/PileUpEventPrincipal.h"
 
-CastorDigiProducer::CastorDigiProducer(const edm::ParameterSet& ps, edm::ProducerBase& mixMod, edm::ConsumesCollector& iC)
-: theParameterMap(new CastorSimParameterMap(ps)),
-  theCastorShape(new CastorShape()),
-  theCastorIntegratedShape(new CaloShapeIntegrator(theCastorShape)),
-  theCastorResponse(new CaloHitResponse(theParameterMap, theCastorIntegratedShape)),
-  theAmplifier(nullptr),
-  theCoderFactory(nullptr),
-  theElectronicsSim(nullptr),
-  theHitCorrection(nullptr),
-  theCastorDigitizer(nullptr),
-  theCastorHits()
-{
+CastorDigiProducer::CastorDigiProducer(const edm::ParameterSet &ps,
+                                       edm::ProducerBase &mixMod,
+                                       edm::ConsumesCollector &iC)
+    : theParameterMap(new CastorSimParameterMap(ps)),
+      theCastorShape(new CastorShape()),
+      theCastorIntegratedShape(new CaloShapeIntegrator(theCastorShape)),
+      theCastorResponse(new CaloHitResponse(theParameterMap, theCastorIntegratedShape)),
+      theAmplifier(nullptr),
+      theCoderFactory(nullptr),
+      theElectronicsSim(nullptr),
+      theHitCorrection(nullptr),
+      theCastorDigitizer(nullptr),
+      theCastorHits() {
   theHitsProducerTag = ps.getParameter<edm::InputTag>("hitsProducer");
-  iC.consumes<std::vector<PCaloHit> >(theHitsProducerTag);
-  
+  iC.consumes<std::vector<PCaloHit>>(theHitsProducerTag);
+
   mixMod.produces<CastorDigiCollection>();
 
   theCastorResponse->setHitFilter(&theCastorHitFilter);
 
   bool doTimeSlew = ps.getParameter<bool>("doTimeSlew");
-  if(doTimeSlew) {
+  if (doTimeSlew) {
     // no time slewing for HF
     theCastorResponse->setHitCorrection(theHitCorrection);
   }
@@ -52,15 +53,14 @@ CastorDigiProducer::CastorDigiProducer(const edm::ParameterSet& ps, edm::Produce
   theCastorDigitizer = new CastorDigitizer(theCastorResponse, theElectronicsSim, doNoise);
 
   edm::Service<edm::RandomNumberGenerator> rng;
-  if ( ! rng.isAvailable()) {
-    throw cms::Exception("Configuration")
-      << "CastorDigiProducer requires the RandomNumberGeneratorService\n"
-         "which is not present in the configuration file.  You must add the service\n"
-         "in the configuration file or remove the modules that require it.";
+  if (!rng.isAvailable()) {
+    throw cms::Exception("Configuration") << "CastorDigiProducer requires the RandomNumberGeneratorService\n"
+                                             "which is not present in the configuration file.  You must add the "
+                                             "service\n"
+                                             "in the configuration file or remove the modules that require it.";
   }
 }
 
-
 CastorDigiProducer::~CastorDigiProducer() {
   delete theCastorDigitizer;
   delete theParameterMap;
@@ -73,7 +73,7 @@ CastorDigiProducer::~CastorDigiProducer() {
   delete theHitCorrection;
 }
 
-void CastorDigiProducer::initializeEvent(edm::Event const& event, edm::EventSetup const& eventSetup) {
+void CastorDigiProducer::initializeEvent(edm::Event const &event, edm::EventSetup const &eventSetup) {
   // get the appropriate gains, noises, & widths for this event
   edm::ESHandle<CastorDbService> conditions;
   eventSetup.get<CastorDbRecord>().get(conditions);
@@ -89,38 +89,40 @@ void CastorDigiProducer::initializeEvent(edm::Event const& event, edm::EventSetu
 
   // get the correct geometry
   checkGeometry(eventSetup);
-  
+
   theCastorHits.clear();
 
   theCastorDigitizer->initializeHits();
 }
 
-void CastorDigiProducer::accumulateCaloHits(std::vector<PCaloHit> const& hcalHits, int bunchCrossing) {
-  //fillFakeHits();
+void CastorDigiProducer::accumulateCaloHits(std::vector<PCaloHit> const &hcalHits, int bunchCrossing) {
+  // fillFakeHits();
 
-  if(theHitCorrection != nullptr) {
+  if (theHitCorrection != nullptr) {
     theHitCorrection->fillChargeSums(hcalHits);
   }
   theCastorDigitizer->add(hcalHits, bunchCrossing, randomEngine_);
 }
 
-void CastorDigiProducer::accumulate(edm::Event const& e, edm::EventSetup const&) {
-  // Step A: Get and accumulate digitized hits 
-  edm::Handle<std::vector<PCaloHit> > castorHandle;
+void CastorDigiProducer::accumulate(edm::Event const &e, edm::EventSetup const &) {
+  // Step A: Get and accumulate digitized hits
+  edm::Handle<std::vector<PCaloHit>> castorHandle;
   e.getByLabel(theHitsProducerTag, castorHandle);
 
   accumulateCaloHits(*castorHandle.product(), 0);
 }
 
-void CastorDigiProducer::accumulate(PileUpEventPrincipal const& e, edm::EventSetup const&, edm::StreamID const& streamID) {
-  // Step A: Get and accumulate digitized hits 
-  edm::Handle<std::vector<PCaloHit> > castorHandle;
+void CastorDigiProducer::accumulate(PileUpEventPrincipal const &e,
+                                    edm::EventSetup const &,
+                                    edm::StreamID const &streamID) {
+  // Step A: Get and accumulate digitized hits
+  edm::Handle<std::vector<PCaloHit>> castorHandle;
   e.getByLabel(theHitsProducerTag, castorHandle);
 
   accumulateCaloHits(*castorHandle.product(), e.bunchCrossing());
 }
 
-void CastorDigiProducer::finalizeEvent(edm::Event& e, const edm::EventSetup& eventSetup) {
+void CastorDigiProducer::finalizeEvent(edm::Event &e, const edm::EventSetup &eventSetup) {
   // Step B: Create empty output
 
   std::unique_ptr<CastorDigiCollection> castorResult(new CastorDigiCollection());
@@ -133,38 +135,35 @@ void CastorDigiProducer::finalizeEvent(edm::Event& e, const edm::EventSetup& eve
   // Step D: Put outputs into event
   e.put(std::move(castorResult));
 
-  randomEngine_ = nullptr; // to prevent access outside event
+  randomEngine_ = nullptr;  // to prevent access outside event
 }
 
-
-void CastorDigiProducer::sortHits(const edm::PCaloHitContainer & hits){
-  for(edm::PCaloHitContainer::const_iterator hitItr = hits.begin();
-      hitItr != hits.end(); ++hitItr){
+void CastorDigiProducer::sortHits(const edm::PCaloHitContainer &hits) {
+  for (edm::PCaloHitContainer::const_iterator hitItr = hits.begin(); hitItr != hits.end(); ++hitItr) {
     DetId detId = hitItr->id();
-    if (detId.det()==DetId::Calo && detId.subdetId()==HcalCastorDetId::SubdetectorId){
+    if (detId.det() == DetId::Calo && detId.subdetId() == HcalCastorDetId::SubdetectorId) {
       theCastorHits.push_back(*hitItr);
+    } else {
+      edm::LogError("CastorDigiProducer") << "Bad Hit subdetector " << detId.subdetId();
     }
-      else {
-	edm::LogError("CastorDigiProducer") << "Bad Hit subdetector " << detId.subdetId();
-      }
   }
 }
 
 void CastorDigiProducer::fillFakeHits() {
-  HcalCastorDetId castorDetId(HcalCastorDetId::Section(2),true,1,1);
+  HcalCastorDetId castorDetId(HcalCastorDetId::Section(2), true, 1, 1);
 
   theCastorHits.emplace_back(castorDetId.rawId(), 50.0, 0.);
 }
 
-
-void CastorDigiProducer::checkGeometry(const edm::EventSetup & eventSetup) {
+void CastorDigiProducer::checkGeometry(const edm::EventSetup &eventSetup) {
   // TODO find a way to avoid doing this every event
   edm::ESHandle<CaloGeometry> geometry;
   eventSetup.get<CaloGeometryRecord>().get(geometry);
   theCastorResponse->setGeometry(&*geometry);
 
-  const std::vector<DetId>& castorCells = geometry->getValidDetIds(DetId::Calo, HcalCastorDetId::SubdetectorId);
+  const std::vector<DetId> &castorCells = geometry->getValidDetIds(DetId::Calo, HcalCastorDetId::SubdetectorId);
 
-  //std::cout<<"CastorDigiProducer::CheckGeometry number of cells: "<<castorCells.size()<<std::endl;
+  // std::cout<<"CastorDigiProducer::CheckGeometry number of cells:
+  // "<<castorCells.size()<<std::endl;
   theCastorDigitizer->setDetIds(castorCells);
 }
diff --git a/SimCalorimetry/CastorSim/plugins/CastorDigiProducer.h b/SimCalorimetry/CastorSim/plugins/CastorDigiProducer.h
index bdf793e344fd6..61607b52c687d 100644
--- a/SimCalorimetry/CastorSim/plugins/CastorDigiProducer.h
+++ b/SimCalorimetry/CastorSim/plugins/CastorDigiProducer.h
@@ -1,21 +1,21 @@
 #ifndef CastorDigiProducer_h
 #define CastorDigiProducer_h
 
-#include "FWCore/Framework/interface/ProducerBase.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ProducerBase.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "SimCalorimetry/CastorSim/src/CastorDigitizerTraits.h"
-#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h"
-#include "SimCalorimetry/CastorSim/src/CastorSimParameterMap.h"
-#include "SimCalorimetry/CastorSim/src/CastorShape.h"
-#include "SimCalorimetry/CastorSim/src/CastorElectronicsSim.h"
-#include "SimCalorimetry/CastorSim/src/CastorHitFilter.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloHitResponse.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h"
 #include "SimCalorimetry/CastorSim/src/CastorAmplifier.h"
 #include "SimCalorimetry/CastorSim/src/CastorCoderFactory.h"
+#include "SimCalorimetry/CastorSim/src/CastorDigitizerTraits.h"
+#include "SimCalorimetry/CastorSim/src/CastorElectronicsSim.h"
 #include "SimCalorimetry/CastorSim/src/CastorHitCorrection.h"
+#include "SimCalorimetry/CastorSim/src/CastorHitFilter.h"
+#include "SimCalorimetry/CastorSim/src/CastorShape.h"
+#include "SimCalorimetry/CastorSim/src/CastorSimParameterMap.h"
+#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 #include "SimGeneral/MixingModule/interface/DigiAccumulatorMixMod.h"
 
 #include <vector>
@@ -23,7 +23,7 @@
 namespace edm {
   class StreamID;
   class ConsumesCollector;
-}
+}  // namespace edm
 
 namespace CLHEP {
   class HepRandomEngine;
@@ -34,53 +34,49 @@ class PileUpEventPrincipal;
 
 class CastorDigiProducer : public DigiAccumulatorMixMod {
 public:
-
-  explicit CastorDigiProducer(const edm::ParameterSet& ps, edm::ProducerBase& mixMod, edm::ConsumesCollector& iC);
+  explicit CastorDigiProducer(const edm::ParameterSet &ps, edm::ProducerBase &mixMod, edm::ConsumesCollector &iC);
   ~CastorDigiProducer() override;
 
-  void initializeEvent(edm::Event const& e, edm::EventSetup const& c) override;
-  void accumulate(edm::Event const& e, edm::EventSetup const& c) override;
-  void accumulate(PileUpEventPrincipal const& e, edm::EventSetup const& c, edm::StreamID const&) override;
-  void finalizeEvent(edm::Event& e, edm::EventSetup const& c) override;
+  void initializeEvent(edm::Event const &e, edm::EventSetup const &c) override;
+  void accumulate(edm::Event const &e, edm::EventSetup const &c) override;
+  void accumulate(PileUpEventPrincipal const &e, edm::EventSetup const &c, edm::StreamID const &) override;
+  void finalizeEvent(edm::Event &e, edm::EventSetup const &c) override;
 
 private:
-  
-
-  void accumulateCaloHits(std::vector<PCaloHit> const&, int bunchCrossing);
+  void accumulateCaloHits(std::vector<PCaloHit> const &, int bunchCrossing);
 
   /// fills the vectors for each subdetector
-  void sortHits(const edm::PCaloHitContainer & hits);
+  void sortHits(const edm::PCaloHitContainer &hits);
   /// some hits in each subdetector, just for testing purposes
   void fillFakeHits();
   /// make sure the digitizer has the correct list of all cells that
   /// exist in the geometry
-  void checkGeometry(const edm::EventSetup& eventSetup);
+  void checkGeometry(const edm::EventSetup &eventSetup);
 
   edm::InputTag theHitsProducerTag;
 
   /** Reconstruction algorithm*/
   typedef CaloTDigitizer<CastorDigitizerTraits> CastorDigitizer;
- 
-  CastorSimParameterMap * theParameterMap;
-  CaloVShape * theCastorShape;
-  CaloVShape * theCastorIntegratedShape;
 
-  CaloHitResponse * theCastorResponse;
+  CastorSimParameterMap *theParameterMap;
+  CaloVShape *theCastorShape;
+  CaloVShape *theCastorIntegratedShape;
 
-  CastorAmplifier * theAmplifier;
-  CastorCoderFactory * theCoderFactory;
-  CastorElectronicsSim * theElectronicsSim;
+  CaloHitResponse *theCastorResponse;
+
+  CastorAmplifier *theAmplifier;
+  CastorCoderFactory *theCoderFactory;
+  CastorElectronicsSim *theElectronicsSim;
 
   CastorHitFilter theCastorHitFilter;
 
-  CastorHitCorrection * theHitCorrection;
+  CastorHitCorrection *theHitCorrection;
 
-  CastorDigitizer* theCastorDigitizer;
+  CastorDigitizer *theCastorDigitizer;
 
   std::vector<PCaloHit> theCastorHits;
 
-  CLHEP::HepRandomEngine* randomEngine_ = nullptr;
+  CLHEP::HepRandomEngine *randomEngine_ = nullptr;
 };
 
 #endif
-
diff --git a/SimCalorimetry/CastorSim/plugins/CastorDigiStatistics.h b/SimCalorimetry/CastorSim/plugins/CastorDigiStatistics.h
index 8f9afdf44d64d..9d82fdd537693 100644
--- a/SimCalorimetry/CastorSim/plugins/CastorDigiStatistics.h
+++ b/SimCalorimetry/CastorSim/plugins/CastorDigiStatistics.h
@@ -2,31 +2,28 @@
 #define CastorSim_CastorDigiStatistics_h
 
 #include "CalibFormats/CaloObjects/interface/CaloSamples.h"
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloValidationStatistics.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloHitAnalyzer.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloValidationStatistics.h"
 #include <string>
 
-class CastorDigiStatistics
-{
+class CastorDigiStatistics {
 public:
   CastorDigiStatistics(std::string name,
-                     int maxBin,
-                     float amplitudeThreshold,
-                     float expectedPedestal,
-                     float binPrevToBinMax,
-                     float binNextToBinMax,
-                     CaloHitAnalyzer & amplitudeAnalyzer)
-:  maxBin_(maxBin),
-   amplitudeThreshold_(amplitudeThreshold),
-   pedestal_(name+" pedestal", expectedPedestal, 0.),
-   binPrevToBinMax_(name+" binPrevToBinMax", binPrevToBinMax, 0.),
-   binNextToBinMax_(name+" binNextToBinMax", binNextToBinMax, 0.),
-   amplitudeAnalyzer_(amplitudeAnalyzer)
-{
-}
-
-  template<class Digi>
-  void analyze(const Digi & digi);
+                       int maxBin,
+                       float amplitudeThreshold,
+                       float expectedPedestal,
+                       float binPrevToBinMax,
+                       float binNextToBinMax,
+                       CaloHitAnalyzer &amplitudeAnalyzer)
+      : maxBin_(maxBin),
+        amplitudeThreshold_(amplitudeThreshold),
+        pedestal_(name + " pedestal", expectedPedestal, 0.),
+        binPrevToBinMax_(name + " binPrevToBinMax", binPrevToBinMax, 0.),
+        binNextToBinMax_(name + " binNextToBinMax", binNextToBinMax, 0.),
+        amplitudeAnalyzer_(amplitudeAnalyzer) {}
+
+  template <class Digi>
+  void analyze(const Digi &digi);
 
 private:
   int maxBin_;
@@ -34,41 +31,29 @@ class CastorDigiStatistics
   CaloValidationStatistics pedestal_;
   CaloValidationStatistics binPrevToBinMax_;
   CaloValidationStatistics binNextToBinMax_;
-  CaloHitAnalyzer & amplitudeAnalyzer_;
+  CaloHitAnalyzer &amplitudeAnalyzer_;
 };
 
+template <class Digi>
+void CastorDigiStatistics::analyze(const Digi &digi) {
+  pedestal_.addEntry(digi[0].adc());
+  pedestal_.addEntry(digi[1].adc());
+
+  double pedestal_fC = 0.5 * (digi[0].nominal_fC() + digi[1].nominal_fC());
 
-template<class Digi>
-void CastorDigiStatistics::analyze(const Digi & digi) {
-   pedestal_.addEntry(digi[0].adc());
-   pedestal_.addEntry(digi[1].adc());
-                                                                               
-                                                                               
-   double pedestal_fC = 0.5*(digi[0].nominal_fC() + digi[1].nominal_fC());
-                                                                               
-                                                                              
-  double maxAmplitude = digi[maxBin_].nominal_fC()   - pedestal_fC;
-                                                                              
-  if(maxAmplitude > amplitudeThreshold_) {
-                                                                              
-    double binPrevToBinMax = (digi[maxBin_-1].nominal_fC() - pedestal_fC)
-                           / maxAmplitude;
+  double maxAmplitude = digi[maxBin_].nominal_fC() - pedestal_fC;
+
+  if (maxAmplitude > amplitudeThreshold_) {
+    double binPrevToBinMax = (digi[maxBin_ - 1].nominal_fC() - pedestal_fC) / maxAmplitude;
     binPrevToBinMax_.addEntry(binPrevToBinMax);
-                                                                              
-                                                                              
-    double binNextToBinMax = (digi[maxBin_+1].nominal_fC() - pedestal_fC)
-                           / maxAmplitude;
+
+    double binNextToBinMax = (digi[maxBin_ + 1].nominal_fC() - pedestal_fC) / maxAmplitude;
     binNextToBinMax_.addEntry(binNextToBinMax);
-                                                                              
-    double amplitude = digi[maxBin_].nominal_fC()
-                   + digi[maxBin_+1].nominal_fC()
-                   - 2*pedestal_fC;
-                                                                                
-                                                                                
+
+    double amplitude = digi[maxBin_].nominal_fC() + digi[maxBin_ + 1].nominal_fC() - 2 * pedestal_fC;
+
     amplitudeAnalyzer_.analyze(digi.id().rawId(), amplitude);
-                                                                                
   }
 }
 
 #endif
-
diff --git a/SimCalorimetry/CastorSim/plugins/CastorHitAnalyzer.cc b/SimCalorimetry/CastorSim/plugins/CastorHitAnalyzer.cc
index 9acec0a92b80c..1d5b3b02b424f 100644
--- a/SimCalorimetry/CastorSim/plugins/CastorHitAnalyzer.cc
+++ b/SimCalorimetry/CastorSim/plugins/CastorHitAnalyzer.cc
@@ -1,45 +1,36 @@
-#include "SimCalorimetry/CastorSim/plugins/CastorHitAnalyzer.h"
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include<iostream>
-
-
-CastorHitAnalyzer::CastorHitAnalyzer(edm::ParameterSet const& conf) 
-  : hitReadoutName_("CastorHits"),
-  simParameterMap_(),
-  castorFilter_(),
-  castorAnalyzer_("CASTOR", 1., &simParameterMap_, &castorFilter_),
-  castorRecHitCollectionTag_(conf.getParameter<edm::InputTag>("castorRecHitCollectionTag"))
-{
-}
+#include "SimCalorimetry/CastorSim/plugins/CastorHitAnalyzer.h"
+#include <iostream>
 
+CastorHitAnalyzer::CastorHitAnalyzer(edm::ParameterSet const &conf)
+    : hitReadoutName_("CastorHits"),
+      simParameterMap_(),
+      castorFilter_(),
+      castorAnalyzer_("CASTOR", 1., &simParameterMap_, &castorFilter_),
+      castorRecHitCollectionTag_(conf.getParameter<edm::InputTag>("castorRecHitCollectionTag")) {}
 
 namespace CastorHitAnalyzerImpl {
-  template<class Collection>
-  void analyze(edm::Event const& e, CaloHitAnalyzer & analyzer, edm::InputTag& tag) {
+  template <class Collection>
+  void analyze(edm::Event const &e, CaloHitAnalyzer &analyzer, edm::InputTag &tag) {
     edm::Handle<Collection> recHits;
     e.getByLabel(tag, recHits);
     if (!recHits.isValid()) {
       edm::LogError("CastorHitAnalyzer") << "Could not find Castor RecHitContainer ";
     } else {
-      for(unsigned i = 0 ; i < recHits->size(); ++i) {
+      for (unsigned i = 0; i < recHits->size(); ++i) {
         analyzer.analyze((*recHits)[i].id().rawId(), (*recHits)[i].energy());
       }
     }
   }
-}
-
-
-void CastorHitAnalyzer::analyze(edm::Event const& e, edm::EventSetup const& c) {
-edm::Handle<CrossingFrame<PCaloHit> > castorcf;
-e.getByLabel("mix", "g4SimHitsCastorFI", castorcf);  
+}  // namespace CastorHitAnalyzerImpl
 
+void CastorHitAnalyzer::analyze(edm::Event const &e, edm::EventSetup const &c) {
+  edm::Handle<CrossingFrame<PCaloHit>> castorcf;
+  e.getByLabel("mix", "g4SimHitsCastorFI", castorcf);
 
   // access to SimHits
-std::unique_ptr<MixCollection<PCaloHit> > hits(new MixCollection<PCaloHit>(castorcf.product()));
-    castorAnalyzer_.fillHits(*hits);
-    CastorHitAnalyzerImpl::analyze<CastorRecHitCollection>(e, castorAnalyzer_, castorRecHitCollectionTag_);
-  }
-
-
-
+  std::unique_ptr<MixCollection<PCaloHit>> hits(new MixCollection<PCaloHit>(castorcf.product()));
+  castorAnalyzer_.fillHits(*hits);
+  CastorHitAnalyzerImpl::analyze<CastorRecHitCollection>(e, castorAnalyzer_, castorRecHitCollectionTag_);
+}
diff --git a/SimCalorimetry/CastorSim/plugins/CastorHitAnalyzer.h b/SimCalorimetry/CastorSim/plugins/CastorHitAnalyzer.h
index c13546926e2fb..86fd8db0ae0b3 100644
--- a/SimCalorimetry/CastorSim/plugins/CastorHitAnalyzer.h
+++ b/SimCalorimetry/CastorSim/plugins/CastorHitAnalyzer.h
@@ -1,14 +1,14 @@
 #ifndef CastorSim_CastorHitAnalyzer_h
 #define CastorSim_CastorHitAnalyzer_h
 
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloHitAnalyzer.h"
-#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "SimCalorimetry/CastorSim/src/CastorSimParameterMap.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloHitAnalyzer.h"
 #include "SimCalorimetry/CastorSim/src/CastorHitFilter.h"
+#include "SimCalorimetry/CastorSim/src/CastorSimParameterMap.h"
 #include <string>
 
 /** Compares RecHits to SimHit
@@ -16,13 +16,10 @@
   \Author P. Katsas, Univ. of Athens
 */
 
-class CastorHitAnalyzer : public edm::one::EDAnalyzer<>
-{
+class CastorHitAnalyzer : public edm::one::EDAnalyzer<> {
 public:
-
-  explicit CastorHitAnalyzer(edm::ParameterSet const& conf);
-  void analyze(edm::Event const& e, edm::EventSetup const& c) override;
-
+  explicit CastorHitAnalyzer(edm::ParameterSet const &conf);
+  void analyze(edm::Event const &e, edm::EventSetup const &c) override;
 
 private:
   std::string hitReadoutName_;
@@ -33,5 +30,3 @@ class CastorHitAnalyzer : public edm::one::EDAnalyzer<>
 };
 
 #endif
-
-
diff --git a/SimCalorimetry/CastorSim/plugins/SealModule.cc b/SimCalorimetry/CastorSim/plugins/SealModule.cc
index 233f5cb454fc1..ac62feb638824 100644
--- a/SimCalorimetry/CastorSim/plugins/SealModule.cc
+++ b/SimCalorimetry/CastorSim/plugins/SealModule.cc
@@ -1,10 +1,9 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "SimCalorimetry/CastorSim/plugins/CastorDigiAnalyzer.h"
 #include "SimCalorimetry/CastorSim/plugins/CastorDigiProducer.h"
 #include "SimCalorimetry/CastorSim/plugins/CastorHitAnalyzer.h"
-#include "SimCalorimetry/CastorSim/plugins/CastorDigiAnalyzer.h"
 #include "SimGeneral/MixingModule/interface/DigiAccumulatorMixModFactory.h"
 
 DEFINE_DIGI_ACCUMULATOR(CastorDigiProducer);
 DEFINE_FWK_MODULE(CastorHitAnalyzer);
 DEFINE_FWK_MODULE(CastorDigiAnalyzer);
-
diff --git a/SimCalorimetry/CastorSim/src/CastorAmplifier.cc b/SimCalorimetry/CastorSim/src/CastorAmplifier.cc
index ea3717932b5af..63dd3a5d4897c 100644
--- a/SimCalorimetry/CastorSim/src/CastorAmplifier.cc
+++ b/SimCalorimetry/CastorSim/src/CastorAmplifier.cc
@@ -1,53 +1,46 @@
-#include "SimCalorimetry/CastorSim/src/CastorAmplifier.h"
-#include "SimCalorimetry/CastorSim/src/CastorSimParameters.h"
+#include "CalibFormats/CaloObjects/interface/CaloSamples.h"
 #include "CalibFormats/CastorObjects/interface/CastorDbService.h"
-#include "CondFormats/CastorObjects/interface/CastorPedestal.h"
 #include "CondFormats/CastorObjects/interface/CastorGain.h"
-#include "CondFormats/CastorObjects/interface/CastorPedestalWidth.h"
 #include "CondFormats/CastorObjects/interface/CastorGainWidth.h"
-#include "CalibFormats/CaloObjects/interface/CaloSamples.h"
+#include "CondFormats/CastorObjects/interface/CastorPedestal.h"
+#include "CondFormats/CastorObjects/interface/CastorPedestalWidth.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimCalorimetry/CastorSim/src/CastorAmplifier.h"
+#include "SimCalorimetry/CastorSim/src/CastorSimParameters.h"
 
 #include "CLHEP/Random/RandGaussQ.h"
 
-#include<iostream>
+#include <iostream>
 
-CastorAmplifier::CastorAmplifier(const CastorSimParameterMap * parameters, bool addNoise) :
-  theDbService(nullptr),
-  theParameterMap(parameters),
-  theStartingCapId(0),
-  addNoise_(addNoise)
-{
-}
+CastorAmplifier::CastorAmplifier(const CastorSimParameterMap *parameters, bool addNoise)
+    : theDbService(nullptr), theParameterMap(parameters), theStartingCapId(0), addNoise_(addNoise) {}
 
-void CastorAmplifier::amplify(CaloSamples & frame, CLHEP::HepRandomEngine* engine) const {
-  const CastorSimParameters & parameters = theParameterMap->castorParameters();
+void CastorAmplifier::amplify(CaloSamples &frame, CLHEP::HepRandomEngine *engine) const {
+  const CastorSimParameters &parameters = theParameterMap->castorParameters();
   assert(theDbService != nullptr);
   HcalGenericDetId hcalGenDetId(frame.id());
-  const CastorPedestal* peds = theDbService->getPedestal(hcalGenDetId);
-  const CastorPedestalWidth* pwidths = theDbService->getPedestalWidth(hcalGenDetId);
-  if (!peds || !pwidths )
-  {
-    edm::LogError("CastorAmplifier") 
-      << "Could not fetch HCAL/CASTOR conditions for channel " << hcalGenDetId;
-  }
-  else 
-  {
-    double gauss [32]; //big enough
-    double noise [32]; //big enough
+  const CastorPedestal *peds = theDbService->getPedestal(hcalGenDetId);
+  const CastorPedestalWidth *pwidths = theDbService->getPedestalWidth(hcalGenDetId);
+  if (!peds || !pwidths) {
+    edm::LogError("CastorAmplifier") << "Could not fetch HCAL/CASTOR conditions for channel " << hcalGenDetId;
+  } else {
+    double gauss[32];  // big enough
+    double noise[32];  // big enough
     double fCperPE = parameters.photoelectronsToAnalog(frame.id());
     double nominalfCperPE = parameters.getNominalfCperPE();
 
-    for (int i = 0; i < frame.size(); i++) { gauss[i] = CLHEP::RandGaussQ::shoot(engine, 0., 1.); }
-    if(addNoise_) {
-      pwidths->makeNoise (frame.size(), gauss, noise);
+    for (int i = 0; i < frame.size(); i++) {
+      gauss[i] = CLHEP::RandGaussQ::shoot(engine, 0., 1.);
+    }
+    if (addNoise_) {
+      pwidths->makeNoise(frame.size(), gauss, noise);
     }
-    for(int tbin = 0; tbin < frame.size(); ++tbin) {
-      int capId = (theStartingCapId + tbin)%4;
+    for (int tbin = 0; tbin < frame.size(); ++tbin) {
+      int capId = (theStartingCapId + tbin) % 4;
       double pedestal = peds->getValue(capId);
-      if(addNoise_) {
-	pedestal += noise [tbin]*(fCperPE/nominalfCperPE);
+      if (addNoise_) {
+        pedestal += noise[tbin] * (fCperPE / nominalfCperPE);
       }
       frame[tbin] *= fCperPE;
       frame[tbin] += pedestal;
diff --git a/SimCalorimetry/CastorSim/src/CastorAmplifier.h b/SimCalorimetry/CastorSim/src/CastorAmplifier.h
index 0dcec57489f83..178cfc5e033ae 100644
--- a/SimCalorimetry/CastorSim/src/CastorAmplifier.h
+++ b/SimCalorimetry/CastorSim/src/CastorAmplifier.h
@@ -1,6 +1,6 @@
 #ifndef CastorSim_CastorAmplifier_h
 #define CastorSim_CastorAmplifier_h
-  
+
 #include "CalibFormats/CaloObjects/interface/CaloSamples.h"
 #include "SimCalorimetry/CastorSim/src/CastorSimParameterMap.h"
 
@@ -12,21 +12,19 @@ namespace CLHEP {
 
 class CastorAmplifier {
 public:
-  CastorAmplifier(const CastorSimParameterMap * parameters, bool addNoise);
-  virtual ~CastorAmplifier(){ }
+  CastorAmplifier(const CastorSimParameterMap *parameters, bool addNoise);
+  virtual ~CastorAmplifier() {}
 
   /// the Producer will probably update this every event
-  void setDbService(const CastorDbService * service) {
-    theDbService = service;
-  }
+  void setDbService(const CastorDbService *service) { theDbService = service; }
 
-  virtual void amplify(CaloSamples & linearFrame, CLHEP::HepRandomEngine*) const;
+  virtual void amplify(CaloSamples &linearFrame, CLHEP::HepRandomEngine *) const;
 
-  void setStartingCapId(int capId) {theStartingCapId = capId;}
+  void setStartingCapId(int capId) { theStartingCapId = capId; }
 
 private:
-  const CastorDbService * theDbService;
-  const CastorSimParameterMap * theParameterMap;
+  const CastorDbService *theDbService;
+  const CastorSimParameterMap *theParameterMap;
 
   unsigned theStartingCapId;
   bool addNoise_;
diff --git a/SimCalorimetry/CastorSim/src/CastorCoderFactory.cc b/SimCalorimetry/CastorSim/src/CastorCoderFactory.cc
index 4f73b98e1dc6e..c87725ef721ef 100644
--- a/SimCalorimetry/CastorSim/src/CastorCoderFactory.cc
+++ b/SimCalorimetry/CastorSim/src/CastorCoderFactory.cc
@@ -1,23 +1,16 @@
-#include "SimCalorimetry/CastorSim/src/CastorCoderFactory.h"
 #include "CalibFormats/CastorObjects/interface/CastorCoderDb.h"
 #include "CalibFormats/CastorObjects/interface/CastorNominalCoder.h"
+#include "SimCalorimetry/CastorSim/src/CastorCoderFactory.h"
 
+CastorCoderFactory::CastorCoderFactory(CoderType coderType) : theCoderType(coderType), theDbService(nullptr) {}
 
-
-CastorCoderFactory::CastorCoderFactory(CoderType coderType) 
-: theCoderType(coderType),
-  theDbService(nullptr)
-{
-}
-
-
-std::unique_ptr<CastorCoder> CastorCoderFactory::coder(const DetId & id) const {
-  CastorCoder * result = nullptr;
-  if(theCoderType == DB) {
+std::unique_ptr<CastorCoder> CastorCoderFactory::coder(const DetId &id) const {
+  CastorCoder *result = nullptr;
+  if (theCoderType == DB) {
     assert(theDbService != nullptr);
     HcalGenericDetId hcalGenDetId(id);
-    const CastorQIECoder * qieCoder = theDbService->getCastorCoder(hcalGenDetId );
-    const CastorQIEShape * qieShape = theDbService->getCastorShape();
+    const CastorQIECoder *qieCoder = theDbService->getCastorCoder(hcalGenDetId);
+    const CastorQIEShape *qieShape = theDbService->getCastorShape();
     result = new CastorCoderDb(*qieCoder, *qieShape);
   }
 
@@ -26,4 +19,3 @@ std::unique_ptr<CastorCoder> CastorCoderFactory::coder(const DetId & id) const {
   }
   return std::unique_ptr<CastorCoder>(result);
 }
-
diff --git a/SimCalorimetry/CastorSim/src/CastorCoderFactory.h b/SimCalorimetry/CastorSim/src/CastorCoderFactory.h
index b7eacfa6dd23f..d5a62217ef181 100644
--- a/SimCalorimetry/CastorSim/src/CastorCoderFactory.h
+++ b/SimCalorimetry/CastorSim/src/CastorCoderFactory.h
@@ -1,27 +1,24 @@
 #ifndef CastorSim_CastorCoderFactory_h
 #define CastorSim_CastorCoderFactory_h
 
-#include <memory>
-#include "CalibFormats/CastorObjects/interface/CastorDbService.h"
 #include "CalibFormats/CastorObjects/interface/CastorCoder.h"
+#include "CalibFormats/CastorObjects/interface/CastorDbService.h"
+#include <memory>
 
-class CastorCoderFactory
-{
+class CastorCoderFactory {
 public:
-  enum CoderType {DB, NOMINAL};
+  enum CoderType { DB, NOMINAL };
 
   CastorCoderFactory(CoderType coderType);
 
-  void setDbService(const CastorDbService * service) {theDbService = service;}
+  void setDbService(const CastorDbService *service) { theDbService = service; }
 
   /// user gets control of the pointer
-  std::unique_ptr<CastorCoder> coder(const DetId & detId) const;
+  std::unique_ptr<CastorCoder> coder(const DetId &detId) const;
 
 private:
-
   CoderType theCoderType;
-  const CastorDbService * theDbService;
+  const CastorDbService *theDbService;
 };
 
 #endif
-
diff --git a/SimCalorimetry/CastorSim/src/CastorDigitizerTraits.h b/SimCalorimetry/CastorSim/src/CastorDigitizerTraits.h
index 56f6033922365..ed2ff0e52626b 100644
--- a/SimCalorimetry/CastorSim/src/CastorDigitizerTraits.h
+++ b/SimCalorimetry/CastorSim/src/CastorDigitizerTraits.h
@@ -11,6 +11,4 @@ class CastorDigitizerTraits {
   typedef CastorElectronicsSim ElectronicsSim;
 };
 
-
 #endif
-
diff --git a/SimCalorimetry/CastorSim/src/CastorElectronicsSim.cc b/SimCalorimetry/CastorSim/src/CastorElectronicsSim.cc
index 53af31abdeb47..fdacab15fc53e 100644
--- a/SimCalorimetry/CastorSim/src/CastorElectronicsSim.cc
+++ b/SimCalorimetry/CastorSim/src/CastorElectronicsSim.cc
@@ -1,36 +1,27 @@
-#include "SimCalorimetry/CastorSim/src/CastorElectronicsSim.h"
+#include "DataFormats/HcalDigi/interface/CastorDataFrame.h"
 #include "SimCalorimetry/CastorSim/src/CastorAmplifier.h"
 #include "SimCalorimetry/CastorSim/src/CastorCoderFactory.h"
-#include "DataFormats/HcalDigi/interface/CastorDataFrame.h"
+#include "SimCalorimetry/CastorSim/src/CastorElectronicsSim.h"
 
 #include "CLHEP/Random/RandFlat.h"
 
+CastorElectronicsSim::CastorElectronicsSim(CastorAmplifier *amplifier, const CastorCoderFactory *coderFactory)
+    : theAmplifier(amplifier), theCoderFactory(coderFactory), theStartingCapId(0) {}
 
+CastorElectronicsSim::~CastorElectronicsSim() {}
 
-CastorElectronicsSim::CastorElectronicsSim(CastorAmplifier * amplifier, const CastorCoderFactory * coderFactory)
-  : theAmplifier(amplifier),
-    theCoderFactory(coderFactory),
-    theStartingCapId(0)
-{
-}
-
-
-CastorElectronicsSim::~CastorElectronicsSim()
-{
-}
-
-template<class Digi> 
-void CastorElectronicsSim::convert(CaloSamples & frame, Digi & result, CLHEP::HepRandomEngine* engine) {
+template <class Digi>
+void CastorElectronicsSim::convert(CaloSamples &frame, Digi &result, CLHEP::HepRandomEngine *engine) {
   result.setSize(frame.size());
   theAmplifier->amplify(frame, engine);
   theCoderFactory->coder(frame.id())->fC2adc(frame, result, theStartingCapId);
 }
 
-void CastorElectronicsSim::analogToDigital(CLHEP::HepRandomEngine* engine, CaloSamples & lf, CastorDataFrame & result) {
+void CastorElectronicsSim::analogToDigital(CLHEP::HepRandomEngine *engine, CaloSamples &lf, CastorDataFrame &result) {
   convert<CastorDataFrame>(lf, result, engine);
 }
 
-void CastorElectronicsSim::newEvent(CLHEP::HepRandomEngine* engine) {
+void CastorElectronicsSim::newEvent(CLHEP::HepRandomEngine *engine) {
   // pick a new starting Capacitor ID
   theStartingCapId = CLHEP::RandFlat::shootInt(engine, 4);
   theAmplifier->setStartingCapId(theStartingCapId);
diff --git a/SimCalorimetry/CastorSim/src/CastorElectronicsSim.h b/SimCalorimetry/CastorSim/src/CastorElectronicsSim.h
index 43022997dc5cd..a71d70ca35634 100644
--- a/SimCalorimetry/CastorSim/src/CastorElectronicsSim.h
+++ b/SimCalorimetry/CastorSim/src/CastorElectronicsSim.h
@@ -1,10 +1,10 @@
 #ifndef CastorSim_CastorElectronicsSim_h
 #define CastorSim_CastorElectronicsSim_h
-  
-  /** This class turns a CaloSamples, representing the analog
-      signal input to the readout electronics, into a
-      digitized data frame
-   */
+
+/** This class turns a CaloSamples, representing the analog
+    signal input to the readout electronics, into a
+    digitized data frame
+ */
 #include "CalibFormats/CaloObjects/interface/CaloSamples.h"
 
 class CastorDataFrame;
@@ -18,24 +18,22 @@ namespace CLHEP {
 
 class CastorElectronicsSim {
 public:
-  CastorElectronicsSim(CastorAmplifier * amplifier, 
-                     const CastorCoderFactory * coderFactory);
+  CastorElectronicsSim(CastorAmplifier *amplifier, const CastorCoderFactory *coderFactory);
   ~CastorElectronicsSim();
 
-  void analogToDigital(CLHEP::HepRandomEngine*, CaloSamples & linearFrame, CastorDataFrame & result);
+  void analogToDigital(CLHEP::HepRandomEngine *, CaloSamples &linearFrame, CastorDataFrame &result);
 
   /// Things that need to be initialized every event
-  void newEvent(CLHEP::HepRandomEngine*);
+  void newEvent(CLHEP::HepRandomEngine *);
 
 private:
-  template<class Digi> void convert(CaloSamples & frame, Digi & result, CLHEP::HepRandomEngine*);
+  template <class Digi>
+  void convert(CaloSamples &frame, Digi &result, CLHEP::HepRandomEngine *);
 
-  CastorAmplifier * theAmplifier;
-  const CastorCoderFactory * theCoderFactory;
+  CastorAmplifier *theAmplifier;
+  const CastorCoderFactory *theCoderFactory;
 
   int theStartingCapId;
 };
 
-  
 #endif
-  
diff --git a/SimCalorimetry/CastorSim/src/CastorHitCorrection.cc b/SimCalorimetry/CastorSim/src/CastorHitCorrection.cc
index e7da952bf4aaa..5b39c8b516c7a 100644
--- a/SimCalorimetry/CastorSim/src/CastorHitCorrection.cc
+++ b/SimCalorimetry/CastorSim/src/CastorHitCorrection.cc
@@ -1,115 +1,90 @@
-#include "SimCalorimetry/CastorSim/src/CastorHitCorrection.h"
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloSimParameters.h"
 #include "CalibCalorimetry/CastorCalib/interface/CastorTimeSlew.h"
 #include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "DataFormats/HcalDetId/interface/HcalCastorDetId.h"
-#include "FWCore/Utilities/interface/Exception.h"
+#include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/Exception.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloSimParameters.h"
+#include "SimCalorimetry/CastorSim/src/CastorHitCorrection.h"
 
-CastorHitCorrection::CastorHitCorrection(const CaloVSimParameterMap * parameterMap)
-: theParameterMap(parameterMap)
-{
-}
-
+CastorHitCorrection::CastorHitCorrection(const CaloVSimParameterMap *parameterMap) : theParameterMap(parameterMap) {}
 
-void CastorHitCorrection::fillChargeSums(MixCollection<PCaloHit> & hits)
-{
+void CastorHitCorrection::fillChargeSums(MixCollection<PCaloHit> &hits) {
   //  clear();
-  for(MixCollection<PCaloHit>::MixItr hitItr = hits.begin();
-      hitItr != hits.end(); ++hitItr)
-  {
+  for (MixCollection<PCaloHit>::MixItr hitItr = hits.begin(); hitItr != hits.end(); ++hitItr) {
     LogDebug("CastorHitCorrection") << "CastorHitCorrection::Hit 0x" << std::hex << hitItr->id() << std::dec;
     int tbin = timeBin(*hitItr);
     LogDebug("CastorHitCorrection") << "CastorHitCorrection::Hit tbin" << tbin;
-    if(tbin >= 0 && tbin < 10) 
-    {  
+    if (tbin >= 0 && tbin < 10) {
       theChargeSumsForTimeBin[tbin][DetId(hitItr->id())] += charge(*hitItr);
     }
   }
 }
 
-void CastorHitCorrection::fillChargeSums(const std::vector<PCaloHit> & hits)
-{
+void CastorHitCorrection::fillChargeSums(const std::vector<PCaloHit> &hits) {
   //  clear();
-  for(std::vector<PCaloHit>::const_iterator hitItr = hits.begin();
-      hitItr != hits.end(); ++hitItr)
-  {
+  for (std::vector<PCaloHit>::const_iterator hitItr = hits.begin(); hitItr != hits.end(); ++hitItr) {
     LogDebug("CastorHitCorrection") << "CastorHitCorrection::Hit 0x" << std::hex << hitItr->id() << std::dec;
     int tbin = timeBin(*hitItr);
     LogDebug("CastorHitCorrection") << "CastorHitCorrection::Hit tbin" << tbin;
-    if(tbin >= 0 && tbin < 10) 
-    {  
+    if (tbin >= 0 && tbin < 10) {
       theChargeSumsForTimeBin[tbin][DetId(hitItr->id())] += charge(*hitItr);
     }
   }
 }
 
-
-void CastorHitCorrection::clear()
-{
-  for(int i = 0; i < 10; ++i)
-  {
+void CastorHitCorrection::clear() {
+  for (int i = 0; i < 10; ++i) {
     theChargeSumsForTimeBin[i].clear();
   }
 }
 
-double CastorHitCorrection::charge(const PCaloHit & hit) const
-{
+double CastorHitCorrection::charge(const PCaloHit &hit) const {
   DetId detId(hit.id());
-  const CaloSimParameters & parameters = theParameterMap->simParameters(detId);
-  double simHitToCharge = parameters.simHitToPhotoelectrons()
-                        * parameters.photoelectronsToAnalog();
+  const CaloSimParameters &parameters = theParameterMap->simParameters(detId);
+  double simHitToCharge = parameters.simHitToPhotoelectrons() * parameters.photoelectronsToAnalog();
   return hit.energy() * simHitToCharge;
 }
 
-double CastorHitCorrection::delay(const PCaloHit & hit, CLHEP::HepRandomEngine*) const
-{
+double CastorHitCorrection::delay(const PCaloHit &hit, CLHEP::HepRandomEngine *) const {
   // HO goes slow, HF shouldn't be used at all
-  //Castor not used for the moment
+  // Castor not used for the moment
 
   DetId detId(hit.id());
-  if(detId.det()==DetId::Calo && (detId.subdetId()==HcalCastorDetId::SubdetectorId)) return 0;
+  if (detId.det() == DetId::Calo && (detId.subdetId() == HcalCastorDetId::SubdetectorId))
+    return 0;
 
   HcalDetId hcalDetId(hit.id());
-  if(hcalDetId.subdet() == HcalForward) return 0;  
-  CastorTimeSlew::BiasSetting biasSetting = (hcalDetId.subdet() == HcalOuter) ?
-                                          CastorTimeSlew::Slow :
-                                          CastorTimeSlew::Medium;
+  if (hcalDetId.subdet() == HcalForward)
+    return 0;
+  CastorTimeSlew::BiasSetting biasSetting =
+      (hcalDetId.subdet() == HcalOuter) ? CastorTimeSlew::Slow : CastorTimeSlew::Medium;
   double delay = 0.;
   int tbin = timeBin(hit);
-  if(tbin >= 0 && tbin < 10)
-  {
+  if (tbin >= 0 && tbin < 10) {
     ChargeSumsByChannel::const_iterator totalChargeItr = theChargeSumsForTimeBin[tbin].find(detId);
-    if(totalChargeItr == theChargeSumsForTimeBin[tbin].end())
-    {
+    if (totalChargeItr == theChargeSumsForTimeBin[tbin].end()) {
       throw cms::Exception("CastorHitCorrection") << "Cannot find HCAL/CASTOR charge sum for hit " << hit;
     }
     double totalCharge = totalChargeItr->second;
     delay = CastorTimeSlew::delay(totalCharge, biasSetting);
-    LogDebug("CastorHitCorrection") << "TIMESLEWcharge " << charge(hit) 
-				  << "  totalcharge " << totalCharge 
-				  << " olddelay "  << CastorTimeSlew::delay(charge(hit), biasSetting) 
-				  << " newdelay " << delay;
+    LogDebug("CastorHitCorrection") << "TIMESLEWcharge " << charge(hit) << "  totalcharge " << totalCharge
+                                    << " olddelay " << CastorTimeSlew::delay(charge(hit), biasSetting) << " newdelay "
+                                    << delay;
   }
 
   return delay;
 }
 
-
-int CastorHitCorrection::timeBin(const PCaloHit & hit) const
-{
-  const CaloSimParameters & parameters = theParameterMap->simParameters(DetId(hit.id()));
+int CastorHitCorrection::timeBin(const PCaloHit &hit) const {
+  const CaloSimParameters &parameters = theParameterMap->simParameters(DetId(hit.id()));
   double t = hit.time() - timeOfFlight(DetId(hit.id())) + parameters.timePhase();
-  return static_cast<int> (t / 25) + parameters.binOfMaximum() - 1;
+  return static_cast<int>(t / 25) + parameters.binOfMaximum() - 1;
 }
 
-
-double CastorHitCorrection::timeOfFlight(const DetId & detId) const
-{
-    if(detId.det()==DetId::Calo && detId.subdetId()==HcalCastorDetId::SubdetectorId)
-	return 37.666;
-    else
-	throw cms::Exception("not HcalCastorDetId"); 
+double CastorHitCorrection::timeOfFlight(const DetId &detId) const {
+  if (detId.det() == DetId::Calo && detId.subdetId() == HcalCastorDetId::SubdetectorId)
+    return 37.666;
+  else
+    throw cms::Exception("not HcalCastorDetId");
 }
-
diff --git a/SimCalorimetry/CastorSim/src/CastorHitCorrection.h b/SimCalorimetry/CastorSim/src/CastorHitCorrection.h
index fcf7871e92fcb..3dfd8c5e75693 100644
--- a/SimCalorimetry/CastorSim/src/CastorHitCorrection.h
+++ b/SimCalorimetry/CastorSim/src/CastorHitCorrection.h
@@ -3,13 +3,13 @@
 
 /** Applies a correction for time slewing
     Makes bigger signals come at a delayed time
-  
+
  */
 
+#include "DataFormats/DetId/interface/DetId.h"
+#include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVHitCorrection.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVSimParameterMap.h"
-#include "DataFormats/HcalDetId/interface/HcalDetId.h"
-#include "DataFormats/DetId/interface/DetId.h"
 #include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 #include <map>
 #include <vector>
@@ -18,40 +18,35 @@ namespace CLHEP {
   class HepRandomEngine;
 }
 
-
-class CastorHitCorrection : public CaloVHitCorrection
-{
+class CastorHitCorrection : public CaloVHitCorrection {
 public:
   typedef std::map<DetId, double> ChargeSumsByChannel;
 
-  CastorHitCorrection(const CaloVSimParameterMap * parameterMap);
+  CastorHitCorrection(const CaloVSimParameterMap *parameterMap);
   ~CastorHitCorrection() override {}
 
-  void fillChargeSums(MixCollection<PCaloHit> & hits);
+  void fillChargeSums(MixCollection<PCaloHit> &hits);
 
-  void fillChargeSums(const std::vector<PCaloHit> & hits);
+  void fillChargeSums(const std::vector<PCaloHit> &hits);
 
   void clear();
 
   /// how much charge we expect from this hit
-  double charge(const PCaloHit & hit) const;
+  double charge(const PCaloHit &hit) const;
 
   /// how much delay this hit will get
-  double delay(const PCaloHit & hit, CLHEP::HepRandomEngine*) const override;
+  double delay(const PCaloHit &hit, CLHEP::HepRandomEngine *) const override;
 
   /// which time bin the peak of the signal will fall in
-  int timeBin(const PCaloHit & hit) const;
+  int timeBin(const PCaloHit &hit) const;
 
   /// simple average approximation
-  double timeOfFlight(const DetId & id) const;
+  double timeOfFlight(const DetId &id) const;
 
 private:
-
-  const CaloVSimParameterMap * theParameterMap;
+  const CaloVSimParameterMap *theParameterMap;
 
   ChargeSumsByChannel theChargeSumsForTimeBin[10];
-
 };
 
 #endif
-
diff --git a/SimCalorimetry/CastorSim/src/CastorHitFilter.h b/SimCalorimetry/CastorSim/src/CastorHitFilter.h
index 7c64812810e8c..8348765c4bc98 100644
--- a/SimCalorimetry/CastorSim/src/CastorHitFilter.h
+++ b/SimCalorimetry/CastorSim/src/CastorHitFilter.h
@@ -1,16 +1,15 @@
 #ifndef CastorSim_CastorHitFilter_h
 #define CastorSim_CastorHitFilter_h
 
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloVHitFilter.h"
-#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
 #include "DataFormats/HcalDetId/interface/HcalCastorDetId.h"
+#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloVHitFilter.h"
 
 class CastorHitFilter : public CaloVHitFilter {
-  bool accepts(const PCaloHit & hit) const override {
+  bool accepts(const PCaloHit &hit) const override {
     DetId detId(hit.id());
-    return (detId.det()==DetId::Calo && detId.subdetId()==HcalCastorDetId::SubdetectorId);
+    return (detId.det() == DetId::Calo && detId.subdetId() == HcalCastorDetId::SubdetectorId);
   }
 };
 
 #endif
-
diff --git a/SimCalorimetry/CastorSim/src/CastorShape.cc b/SimCalorimetry/CastorSim/src/CastorShape.cc
index 7f04291c91f75..4717b388a71a7 100644
--- a/SimCalorimetry/CastorSim/src/CastorShape.cc
+++ b/SimCalorimetry/CastorSim/src/CastorShape.cc
@@ -1,61 +1,40 @@
 #include "SimCalorimetry/CastorSim/src/CastorShape.h"
 #include <cmath>
-  
-CastorShape::CastorShape()
-: nbin_(256),
-  nt_(nbin_, 0.)
-{   
-  computeShapeCastor();
-}
-
 
-CastorShape::CastorShape(const CastorShape&d)
-: CaloVShape(d),
-  nbin_(d.nbin_),
-  nt_(d.nt_)
-{
-}
+CastorShape::CastorShape() : nbin_(256), nt_(nbin_, 0.) { computeShapeCastor(); }
 
-  
-void CastorShape::computeShapeCastor()
-{
+CastorShape::CastorShape(const CastorShape &d) : CaloVShape(d), nbin_(d.nbin_), nt_(d.nt_) {}
 
+void CastorShape::computeShapeCastor() {
   //  cout << endl << " ===== computeShapeCastor  !!! " << endl << endl;
 
-  const float ts = 3.0;           // time constant in   t * exp(-(t/ts)**2)
-
+  const float ts = 3.0;  // time constant in   t * exp(-(t/ts)**2)
 
   int j;
   float norm;
 
   // HF SHAPE
   norm = 0.0;
-  for( j = 0; j < 3 * ts && j < nbin_; j++){
-    //nt_[j] = ((float)j)*exp(-((float)(j*j))/(ts*ts));
-    nt_[j] = j * exp(-(j*j)/(ts*ts));
+  for (j = 0; j < 3 * ts && j < nbin_; j++) {
+    // nt_[j] = ((float)j)*exp(-((float)(j*j))/(ts*ts));
+    nt_[j] = j * exp(-(j * j) / (ts * ts));
     norm += nt_[j];
   }
   // normalize pulse area to 1.0
-  for( j = 0; j < 3 * ts && j < nbin_; j++){
+  for (j = 0; j < 3 * ts && j < nbin_; j++) {
     nt_[j] /= norm;
   }
 }
 
-double CastorShape::operator () (double time) const
-{
-
+double CastorShape::operator()(double time) const {
   // return pulse amplitude for request time in ns
   int jtime;
-  jtime = static_cast<int>(time+0.5);
+  jtime = static_cast<int>(time + 0.5);
 
-  if(jtime >= 0 && jtime < nbin_)
+  if (jtime >= 0 && jtime < nbin_)
     return nt_[jtime];
-  else 
+  else
     return 0.0;
 }
 
-double
-CastorShape::timeToRise() const
-{
-   return 0.0 ;
-}  
+double CastorShape::timeToRise() const { return 0.0; }
diff --git a/SimCalorimetry/CastorSim/src/CastorShape.h b/SimCalorimetry/CastorSim/src/CastorShape.h
index d5e3ae907f928..833333cd6726b 100644
--- a/SimCalorimetry/CastorSim/src/CastorShape.h
+++ b/SimCalorimetry/CastorSim/src/CastorShape.h
@@ -1,37 +1,32 @@
 #ifndef CastorSim_CastorShape_h
 #define CastorSim_CastorShape_h
-#include<vector>
-  
+#include <vector>
+
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVShape.h"
-  
+
 /**
-  
+
    \class CastorShape
-  
+
    \brief  shaper for Castor
-     
+
 */
-  
 
-class CastorShape : public CaloVShape
-{
+class CastorShape : public CaloVShape {
 public:
-  
   CastorShape();
-  CastorShape(const CastorShape&d);
+  CastorShape(const CastorShape &d);
+
+  ~CastorShape() override {}
 
-  ~CastorShape() override{}
-  
-  double operator () (double time) const override;
-  double timeToRise()              const override ;
+  double operator()(double time) const override;
+  double timeToRise() const override;
 
- private:
+private:
   void computeShapeCastor();
-  
+
   int nbin_;
   std::vector<float> nt_;
-  
 };
 
 #endif
-  
diff --git a/SimCalorimetry/CastorSim/src/CastorSimParameterMap.cc b/SimCalorimetry/CastorSim/src/CastorSimParameterMap.cc
index bfdb3e1bf149c..8cc070761a544 100644
--- a/SimCalorimetry/CastorSim/src/CastorSimParameterMap.cc
+++ b/SimCalorimetry/CastorSim/src/CastorSimParameterMap.cc
@@ -1,18 +1,12 @@
-#include "SimCalorimetry/CastorSim/src/CastorSimParameterMap.h"
 #include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
-#include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "DataFormats/HcalDetId/interface/HcalCastorDetId.h"
+#include "DataFormats/HcalDetId/interface/HcalDetId.h"
+#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
+#include "SimCalorimetry/CastorSim/src/CastorSimParameterMap.h"
 #include <iostream>
 
-
-//some arbitrary numbers for now
-CastorSimParameterMap::CastorSimParameterMap() :
-  theCastorParameters(1., 4.3333,
-                   2.09 , -4.,
-                   false)
-{
-}
+// some arbitrary numbers for now
+CastorSimParameterMap::CastorSimParameterMap() : theCastorParameters(1., 4.3333, 2.09, -4., false) {}
 /*
   CaloSimParameters(double photomultiplierGain, double amplifierGain,
                  double samplingFactor, double timePhase,
@@ -20,27 +14,22 @@ CastorSimParameterMap::CastorSimParameterMap() :
                  bool doPhotostatistics);
 */
 
-CastorSimParameterMap::CastorSimParameterMap(const edm::ParameterSet & p)
-:  theCastorParameters( p.getParameter<edm::ParameterSet>("castor") ) 
-{
-}
+CastorSimParameterMap::CastorSimParameterMap(const edm::ParameterSet &p)
+    : theCastorParameters(p.getParameter<edm::ParameterSet>("castor")) {}
 
-const CaloSimParameters& CastorSimParameterMap::simParameters(const DetId & detId) const 
-{
-    HcalGenericDetId genericId(detId);
+const CaloSimParameters &CastorSimParameterMap::simParameters(const DetId &detId) const {
+  HcalGenericDetId genericId(detId);
 
-    //  if(detId.det()==DetId::Calo && detId.subdetId()==HcalCastorDetId::SubdetectorId)
-    
-    if(genericId.isHcalCastorDetId())
-	return theCastorParameters;
-    
-    else
-	throw cms::Exception("not HcalCastorDetId"); 
-    
-}
+  //  if(detId.det()==DetId::Calo &&
+  //  detId.subdetId()==HcalCastorDetId::SubdetectorId)
+
+  if (genericId.isHcalCastorDetId())
+    return theCastorParameters;
 
-void CastorSimParameterMap::setDbService(const CastorDbService * dbService)
-{
-theCastorParameters.setDbService(dbService);
+  else
+    throw cms::Exception("not HcalCastorDetId");
 }
 
+void CastorSimParameterMap::setDbService(const CastorDbService *dbService) {
+  theCastorParameters.setDbService(dbService);
+}
diff --git a/SimCalorimetry/CastorSim/src/CastorSimParameterMap.h b/SimCalorimetry/CastorSim/src/CastorSimParameterMap.h
index 2d2b2efad2063..d4fc1563b52f5 100644
--- a/SimCalorimetry/CastorSim/src/CastorSimParameterMap.h
+++ b/SimCalorimetry/CastorSim/src/CastorSimParameterMap.h
@@ -1,37 +1,30 @@
 #ifndef CastorSim_CastorSimParameterMap_h
 #define CastorSim_CastorSimParameterMap_h
 
+#include "DataFormats/HcalDetId/interface/HcalDetId.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVSimParameterMap.h"
 #include "SimCalorimetry/CastorSim/src/CastorSimParameters.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/HcalDetId/interface/HcalDetId.h"
 
-class CastorSimParameterMap : public CaloVSimParameterMap
-{
+class CastorSimParameterMap : public CaloVSimParameterMap {
 public:
   /// hardcoded default parameters
   CastorSimParameterMap();
   /// configurable parameters
-  CastorSimParameterMap(const edm::ParameterSet & p);
+  CastorSimParameterMap(const edm::ParameterSet &p);
 
   ~CastorSimParameterMap() override {}
 
-  const CaloSimParameters & simParameters(const DetId & id) const override;
+  const CaloSimParameters &simParameters(const DetId &id) const override;
 
   /// accessors
-  //CaloSimParameters castorParameters() const  {return theCastorParameters;}
-    CastorSimParameters castorParameters() const 
-	{
-	    return theCastorParameters;
-	}
-    
-    
+  // CaloSimParameters castorParameters() const  {return theCastorParameters;}
+  CastorSimParameters castorParameters() const { return theCastorParameters; }
 
-  void setDbService(const CastorDbService * service);
+  void setDbService(const CastorDbService *service);
 
 private:
   CastorSimParameters theCastorParameters;
 };
 
 #endif
-
diff --git a/SimCalorimetry/CastorSim/src/CastorSimParameters.cc b/SimCalorimetry/CastorSim/src/CastorSimParameters.cc
index fe37f19607e09..d9e814951322c 100644
--- a/SimCalorimetry/CastorSim/src/CastorSimParameters.cc
+++ b/SimCalorimetry/CastorSim/src/CastorSimParameters.cc
@@ -1,57 +1,49 @@
-#include "SimCalorimetry/CastorSim/src/CastorSimParameters.h"
-#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
-#include "DataFormats/HcalDetId/interface/HcalGenericDetId.h"
-#include "DataFormats/HcalDetId/interface/HcalDetId.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "CLHEP/Random/RandGaussQ.h"
 #include "CondFormats/CastorObjects/interface/CastorGain.h"
 #include "CondFormats/CastorObjects/interface/CastorGainWidth.h"
-#include "CLHEP/Random/RandGaussQ.h"
-
-
-CastorSimParameters::CastorSimParameters(double simHitToPhotoelectrons, double photoelectronsToAnalog,double samplingFactor, double timePhase, bool syncPhase)
-: CaloSimParameters(simHitToPhotoelectrons, photoelectronsToAnalog, samplingFactor, timePhase, 6, 4, false, syncPhase),
-  theDbService(nullptr),
-  theSamplingFactor( samplingFactor ),
-  nominalfCperPE( 1)
-{
-}
-
-
-CastorSimParameters::CastorSimParameters(const edm::ParameterSet & p)
-:  CaloSimParameters(p),
-   theDbService(nullptr),
-   theSamplingFactor( p.getParameter<double>("samplingFactor") ),
-   nominalfCperPE( p.getParameter<double>("photoelectronsToAnalog") )
-{
-}
+#include "DataFormats/HcalDetId/interface/HcalDetId.h"
+#include "DataFormats/HcalDetId/interface/HcalGenericDetId.h"
+#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimCalorimetry/CastorSim/src/CastorSimParameters.h"
 
-double CastorSimParameters::getNominalfCperPE() const 
-{
+CastorSimParameters::CastorSimParameters(double simHitToPhotoelectrons,
+                                         double photoelectronsToAnalog,
+                                         double samplingFactor,
+                                         double timePhase,
+                                         bool syncPhase)
+    : CaloSimParameters(
+          simHitToPhotoelectrons, photoelectronsToAnalog, samplingFactor, timePhase, 6, 4, false, syncPhase),
+      theDbService(nullptr),
+      theSamplingFactor(samplingFactor),
+      nominalfCperPE(1) {}
+
+CastorSimParameters::CastorSimParameters(const edm::ParameterSet &p)
+    : CaloSimParameters(p),
+      theDbService(nullptr),
+      theSamplingFactor(p.getParameter<double>("samplingFactor")),
+      nominalfCperPE(p.getParameter<double>("photoelectronsToAnalog")) {}
+
+double CastorSimParameters::getNominalfCperPE() const {
   // return the nominal PMT gain value of CASTOR from the config file.
   return nominalfCperPE;
 }
 
-double CastorSimParameters::photoelectronsToAnalog(const DetId & detId) const
-{
-  // calculate factor (PMT gain) using sampling factor value & available electron gain
-  return theSamplingFactor/fCtoGeV(detId);
+double CastorSimParameters::photoelectronsToAnalog(const DetId &detId) const {
+  // calculate factor (PMT gain) using sampling factor value & available
+  // electron gain
+  return theSamplingFactor / fCtoGeV(detId);
 }
 
-
-
-double CastorSimParameters::fCtoGeV(const DetId & detId) const
-{
+double CastorSimParameters::fCtoGeV(const DetId &detId) const {
   assert(theDbService != nullptr);
   HcalGenericDetId hcalGenDetId(detId);
-  const CastorGain* gains = theDbService->getGain(hcalGenDetId);
-  const CastorGainWidth* gwidths = theDbService->getGainWidth(hcalGenDetId);
+  const CastorGain *gains = theDbService->getGain(hcalGenDetId);
+  const CastorGainWidth *gwidths = theDbService->getGainWidth(hcalGenDetId);
   double result = 0.0;
-  if (!gains || !gwidths )
-  {
+  if (!gains || !gwidths) {
     edm::LogError("CastorAmplifier") << "Could not fetch HCAL conditions for channel " << hcalGenDetId;
-  }
-  else 
-  {
+  } else {
     // only one gain will be recorded per channel, so just use capID 0 for now
     result = gains->getValue(0);
   }
diff --git a/SimCalorimetry/CastorSim/src/CastorSimParameters.h b/SimCalorimetry/CastorSim/src/CastorSimParameters.h
index e668ea0b5f6ba..84dce9b885d74 100644
--- a/SimCalorimetry/CastorSim/src/CastorSimParameters.h
+++ b/SimCalorimetry/CastorSim/src/CastorSimParameters.h
@@ -1,32 +1,33 @@
 #ifndef CastorSim_CastorSimParameters_h
 #define CastorSim_CastorSimParameters_h
 
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloSimParameters.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "CalibFormats/CastorObjects/interface/CastorDbService.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloSimParameters.h"
 
-class CastorSimParameters : public CaloSimParameters
-{
+class CastorSimParameters : public CaloSimParameters {
 public:
+  CastorSimParameters(double simHitToPhotoelectrons,
+                      double photoelectronsToAnalog,
+                      double samplingFactor,
+                      double timePhase,
+                      bool syncPhase);
+  CastorSimParameters(const edm::ParameterSet &p);
 
-CastorSimParameters(double simHitToPhotoelectrons, double photoelectronsToAnalog, double samplingFactor, double timePhase, bool syncPhase);
-CastorSimParameters(const edm::ParameterSet & p);
-
-~CastorSimParameters() override {}
-
-void setDbService(const CastorDbService * service) {theDbService = service;}
+  ~CastorSimParameters() override {}
 
-double getNominalfCperPE() const;
+  void setDbService(const CastorDbService *service) { theDbService = service; }
 
-double photoelectronsToAnalog(const DetId & detId) const override;
+  double getNominalfCperPE() const;
 
-double fCtoGeV(const DetId & detId) const;
+  double photoelectronsToAnalog(const DetId &detId) const override;
 
+  double fCtoGeV(const DetId &detId) const;
 
 private:
-const CastorDbService * theDbService;
-double theSamplingFactor;
-double nominalfCperPE;
+  const CastorDbService *theDbService;
+  double theSamplingFactor;
+  double nominalfCperPE;
 };
 
 #endif
diff --git a/SimCalorimetry/CastorSim/test/CastorDigitizerTest.cpp b/SimCalorimetry/CastorSim/test/CastorDigitizerTest.cpp
index 8d690aa745597..ec9e5a28341d9 100644
--- a/SimCalorimetry/CastorSim/test/CastorDigitizerTest.cpp
+++ b/SimCalorimetry/CastorSim/test/CastorDigitizerTest.cpp
@@ -1,47 +1,46 @@
+#include "CalibCalorimetry/CastorCalib/interface/CastorDbHardcode.h"
+#include "CalibFormats/CastorObjects/interface/CastorDbService.h"
 #include "DataFormats/HcalDetId/interface/HcalCastorDetId.h"
 #include "DataFormats/HcalDigi/interface/CastorDataFrame.h"
-#include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloHitResponse.h"
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloShapeIntegrator.h"
-#include "SimCalorimetry/CastorSim/src/CastorSimParameterMap.h"
-#include "SimCalorimetry/CastorSim/src/CastorShape.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h"
 #include "SimCalorimetry/CastorSim/src/CastorElectronicsSim.h"
-#include "CalibCalorimetry/CastorCalib/interface/CastorDbHardcode.h"
-#include "CalibFormats/CastorObjects/interface/CastorDbService.h"
+#include "SimCalorimetry/CastorSim/src/CastorShape.h"
+#include "SimCalorimetry/CastorSim/src/CastorSimParameterMap.h"
+#include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 //#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
+#include "CLHEP/Random/JamesRandom.h"
+#include "CondFormats/CastorObjects/interface/CastorGainWidths.h"
+#include "CondFormats/CastorObjects/interface/CastorGains.h"
+#include "CondFormats/CastorObjects/interface/CastorPedestalWidths.h"
+#include "CondFormats/CastorObjects/interface/CastorPedestals.h"
+#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
+#include "Geometry/ForwardGeometry/interface/CastorHardcodeGeometryLoader.h"
+#include "Geometry/HcalTowerAlgo/interface/HcalHardcodeGeometryLoader.h"
 #include "SimCalorimetry/CastorSim/src/CastorAmplifier.h"
 #include "SimCalorimetry/CastorSim/src/CastorCoderFactory.h"
-#include "SimCalorimetry/CastorSim/src/CastorHitFilter.h"
-#include "CondFormats/CastorObjects/interface/CastorPedestals.h"
-#include "CondFormats/CastorObjects/interface/CastorPedestalWidths.h"
-#include "CondFormats/CastorObjects/interface/CastorGains.h"
-#include "CondFormats/CastorObjects/interface/CastorGainWidths.h"
 #include "SimCalorimetry/CastorSim/src/CastorDigitizerTraits.h"
 #include "SimCalorimetry/CastorSim/src/CastorHitCorrection.h"
-#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "Geometry/HcalTowerAlgo/interface/HcalHardcodeGeometryLoader.h"
-#include "Geometry/ForwardGeometry/interface/CastorHardcodeGeometryLoader.h"
-#include "CLHEP/Random/JamesRandom.h"
+#include "SimCalorimetry/CastorSim/src/CastorHitFilter.h"
+#include <iostream>
+#include <iterator>
 #include <vector>
-#include<iostream>
-#include<iterator>
 using namespace std;
 using namespace cms;
 
-void testHitCorrection(CastorHitCorrection * correction, std::vector<PCaloHit> & hits)
-{
+void testHitCorrection(CastorHitCorrection *correction, std::vector<PCaloHit> &hits) {
   correction->fillChargeSums(hits);
-  for(PCaloHit& hit : hits)
-    {
-      DetId detId(hit.id());
-      if (detId.det()==DetId::Calo && detId.subdetId()==HcalCastorDetId::SubdetectorId){
-	std::cout<<"Castor -- ";
-    } 
-      std::cout << "HIT charge " << correction->charge(hit) << " delay " 
-		//<< correction->delay(*hitItr)
-		<< " Timebin " << correction->timeBin(hit) <<std::endl;
+  for (PCaloHit &hit : hits) {
+    DetId detId(hit.id());
+    if (detId.det() == DetId::Calo && detId.subdetId() == HcalCastorDetId::SubdetectorId) {
+      std::cout << "Castor -- ";
     }
+    std::cout << "HIT charge " << correction->charge(hit)
+              << " delay "
+              //<< correction->delay(*hitItr)
+              << " Timebin " << correction->timeBin(hit) << std::endl;
+  }
 }
 
 int main() {
@@ -51,10 +50,10 @@ int main() {
   HcalCastorDetId castorDetId(HcalCastorDetId::Section(2), true, 1, 1);
   PCaloHit castorHit(castorDetId.rawId(), 50.0, 0.123);
 
-  //assert(castorDetId.zside() == true);
-   
-  std::cout<<castorDetId<<std::endl;
-  std::cout<<castorHit<<std::endl;
+  // assert(castorDetId.zside() == true);
+
+  std::cout << castorDetId << std::endl;
+  std::cout << castorHit << std::endl;
 
   vector<DetId> hcastorDetIds;
   hcastorDetIds.push_back(castorDetId);
@@ -65,11 +64,12 @@ int main() {
 
   std::cout<<"generic Id "<< genericId <<std::endl;
   std::cout<< genericId.det() <<" "<< genericId.subdetId() <<std::endl;
- 
+
   std::cout<<"castor id "<< castorDetId <<std::endl;
   std::cout<< castorDetId.det() <<" "<< castorDetId.subdetId() <<std::endl;
 
-  std::cout<<"should be: "<< DetId::Calo <<" "<< HcalCastorDetId::SubdetectorId <<std::endl;
+  std::cout<<"should be: "<< DetId::Calo <<" "<< HcalCastorDetId::SubdetectorId
+  <<std::endl;
   */
   /*
     DEBUG
@@ -78,8 +78,8 @@ int main() {
 
   vector<HcalCastorDetId>::iterator testDetId = hcastorDetIds.begin();
   std::cout<< (*testDetId).zside() <<" "
-	   << (*testDetId).sector() <<" "
-	   << (*testDetId).module() <<std::endl;
+           << (*testDetId).sector() <<" "
+           << (*testDetId).module() <<std::endl;
   */
 
   vector<DetId> allDetIds;
@@ -90,7 +90,7 @@ int main() {
   string hitsName = "CastorHits";
   vector<string> caloDets;
 
-  CrossingFrame<PCaloHit> crossingFrame(-5, 5, 25,  hitsName, 0);
+  CrossingFrame<PCaloHit> crossingFrame(-5, 5, 25, hitsName, 0);
   edm::EventID eventId;
   crossingFrame.addSignals(&hits, eventId);
 
@@ -121,41 +121,42 @@ int main() {
   CastorGainWidths gainWidths;
 
   // make a calibration service by hand
-  for(vector<DetId>::const_iterator detItr = allDetIds.begin(); 
-      detItr != allDetIds.end(); ++detItr) 
-  {
-/* check CastorCondObjectContainer!
-      pedestals.addValues(*detItr, CastorDbHardcode::makePedestal(*detItr).getValues ());
-      *pedestalWidths.setWidth(*detItr) = CastorDbHardcode::makePedestalWidth(*detItr);
-      gains.addValues(*detItr, CastorDbHardcode::makeGain(*detItr).getValues ());
-      gainWidths.addValues(*detItr, CastorDbHardcode::makeGainWidth(*detItr).getValues ());
-*/
-      pedestals.addValues(CastorDbHardcode::makePedestal(*detItr));
-      pedestalWidths.addValues(CastorDbHardcode::makePedestalWidth(*detItr));
-      gains.addValues(CastorDbHardcode::makeGain(*detItr));
-      gainWidths.addValues(CastorDbHardcode::makeGainWidth(*detItr));
-
+  for (vector<DetId>::const_iterator detItr = allDetIds.begin(); detItr != allDetIds.end(); ++detItr) {
+    /* check CastorCondObjectContainer!
+          pedestals.addValues(*detItr,
+       CastorDbHardcode::makePedestal(*detItr).getValues ());
+          *pedestalWidths.setWidth(*detItr) =
+       CastorDbHardcode::makePedestalWidth(*detItr); gains.addValues(*detItr,
+       CastorDbHardcode::makeGain(*detItr).getValues ());
+          gainWidths.addValues(*detItr,
+       CastorDbHardcode::makeGainWidth(*detItr).getValues ());
+    */
+    pedestals.addValues(CastorDbHardcode::makePedestal(*detItr));
+    pedestalWidths.addValues(CastorDbHardcode::makePedestalWidth(*detItr));
+    gains.addValues(CastorDbHardcode::makeGain(*detItr));
+    gainWidths.addValues(CastorDbHardcode::makeGainWidth(*detItr));
   }
 
-/* obsolete stuff 
+  /* obsolete stuff
 
-  pedestals.sort();
-  pedestalWidths.sort();
-  gains.sort();
-  gainWidths.sort();
+    pedestals.sort();
+    pedestalWidths.sort();
+    gains.sort();
+    gainWidths.sort();
 
 
-//  std::cout << "TEST Pedestal " << pedestals.getValue(barrelDetId,  1) << std::endl;
-  std::cout << "Castor pedestals " << pedestals.getValue(castorDetId,  1) << std::endl;
-  std::cout << "Castor pedestal widths " << pedestalWidths.getWidth(castorDetId,  1) << std::endl;
-  std::cout << "Castor gains " << gains.getValue(castorDetId,  1) << std::endl;
-  std::cout << "Castor gain widths " << gainWidths.getValue(castorDetId,  1) << std::endl;
+  //  std::cout << "TEST Pedestal " << pedestals.getValue(barrelDetId,  1) <<
+  std::endl; std::cout << "Castor pedestals " << pedestals.getValue(castorDetId,
+  1) << std::endl; std::cout << "Castor pedestal widths " <<
+  pedestalWidths.getWidth(castorDetId,  1) << std::endl; std::cout << "Castor
+  gains " << gains.getValue(castorDetId,  1) << std::endl; std::cout << "Castor
+  gain widths " << gainWidths.getValue(castorDetId,  1) << std::endl;
 
-*/
+  */
 
   CastorDbService calibratorHandle;
 
-//  CastorDbService calibratorHandle;
+  //  CastorDbService calibratorHandle;
   calibratorHandle.setData(&pedestals);
   calibratorHandle.setData(&pedestalWidths);
   calibratorHandle.setData(&gains);
@@ -178,22 +179,18 @@ int main() {
   unique_ptr<CastorDigiCollection> castorResult(new CastorDigiCollection);
   cout << "castorResult" << std::endl;
   cout << "test hit correction" << std::endl;
-  //something breaks here!
+  // something breaks here!
   testHitCorrection(&hitCorrection, hits);
   castorDigitizer.add(hits, 0, &randomEngine);
   // TODO Add pileups
-  //testHitCorrection(&hitCorrection, pileups);
-  //castorDigitizer.add(pileups, -3);
- 
+  // testHitCorrection(&hitCorrection, pileups);
+  // castorDigitizer.add(pileups, -3);
 
   cout << "castordigitizer.run" << std::endl;
   castorDigitizer.run(*castorResult, &randomEngine);
 
   cout << "Castor Frames" << std::endl;
   copy(castorResult->begin(), castorResult->end(), std::ostream_iterator<CastorDataFrame>(std::cout, "\n"));
-  
+
   return 0;
 }
-
-
- 
diff --git a/SimCalorimetry/CastorTechTrigProducer/src/CastorTTRecord.cc b/SimCalorimetry/CastorTechTrigProducer/src/CastorTTRecord.cc
index 70a030b4a3869..36957a25c355f 100644
--- a/SimCalorimetry/CastorTechTrigProducer/src/CastorTTRecord.cc
+++ b/SimCalorimetry/CastorTechTrigProducer/src/CastorTTRecord.cc
@@ -1,262 +1,266 @@
 #include "SimCalorimetry/CastorTechTrigProducer/src/CastorTTRecord.h"
 
-#include "DataFormats/HcalDigi/interface/HcalTTPDigi.h"
+#include "CalibFormats/CastorObjects/interface/CastorCalibrations.h"
+#include "CalibFormats/CastorObjects/interface/CastorCoderDb.h"
+#include "CalibFormats/CastorObjects/interface/CastorDbRecord.h"
+#include "CalibFormats/CastorObjects/interface/CastorDbService.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
+#include "DataFormats/HcalDigi/interface/HcalTTPDigi.h"
 #include "DataFormats/L1GlobalTrigger/interface/L1GtTechnicalTriggerRecord.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "CalibFormats/CastorObjects/interface/CastorCoderDb.h"
-#include "CalibFormats/CastorObjects/interface/CastorCalibrations.h"
-#include "CalibFormats/CastorObjects/interface/CastorDbService.h"
-#include "CalibFormats/CastorObjects/interface/CastorDbRecord.h"
 
-CastorTTRecord::CastorTTRecord(const edm::ParameterSet& ps) 
-{
-    CastorDigiColl_ = consumes<CastorDigiCollection>(ps.getParameter<edm::InputTag>("CastorDigiCollection")) ;
-    CastorSignalTS_ = ps.getParameter< unsigned int >("CastorSignalTS") ;
+CastorTTRecord::CastorTTRecord(const edm::ParameterSet &ps) {
+  CastorDigiColl_ = consumes<CastorDigiCollection>(ps.getParameter<edm::InputTag>("CastorDigiCollection"));
+  CastorSignalTS_ = ps.getParameter<unsigned int>("CastorSignalTS");
 
-    ttpBits_        = ps.getParameter< std::vector<unsigned int> >("ttpBits");
-    TrigNames_      = ps.getParameter< std::vector<std::string> >("TriggerBitNames");
-    TrigThresholds_ = ps.getParameter< std::vector<double> >("TriggerThresholds");
+  ttpBits_ = ps.getParameter<std::vector<unsigned int>>("ttpBits");
+  TrigNames_ = ps.getParameter<std::vector<std::string>>("TriggerBitNames");
+  TrigThresholds_ = ps.getParameter<std::vector<double>>("TriggerThresholds");
 
-    reweighted_gain = 1.0;
+  reweighted_gain = 1.0;
 
-    produces<L1GtTechnicalTriggerRecord>();
+  produces<L1GtTechnicalTriggerRecord>();
 }
 
+CastorTTRecord::~CastorTTRecord() {}
 
-CastorTTRecord::~CastorTTRecord() {
-}
-
-void CastorTTRecord::produce(edm::Event& e, const edm::EventSetup& eventSetup) {
+void CastorTTRecord::produce(edm::Event &e, const edm::EventSetup &eventSetup) {
+  // std::cerr << "**** RUNNING THROUGH CastorTTRecord::produce" << std::endl;
 
-    // std::cerr << "**** RUNNING THROUGH CastorTTRecord::produce" << std::endl;
+  std::vector<L1GtTechnicalTrigger> vecTT(ttpBits_.size());
 
-    std::vector<L1GtTechnicalTrigger> vecTT(ttpBits_.size()) ;
+  // Get Inputs
+  edm::Handle<CastorDigiCollection> CastorDigiColl;
+  e.getByToken(CastorDigiColl_, CastorDigiColl);
 
-    // Get Inputs
-    edm::Handle<CastorDigiCollection> CastorDigiColl ; 
-    e.getByToken(CastorDigiColl_,CastorDigiColl) ;
+  if (!CastorDigiColl.failedToGet()) {
+    double cas_efC[16][14];
+    getEnergy_fC(cas_efC, CastorDigiColl, e, eventSetup);
 
-    if ( !CastorDigiColl.failedToGet() ) { 
+    std::vector<bool> decision(ttpBits_.size());
 
-        double cas_efC[16][14];
-        getEnergy_fC(cas_efC,CastorDigiColl,e,eventSetup);
+    getTriggerDecisions(decision, cas_efC);
 
-
-        std::vector<bool> decision(ttpBits_.size());
-
-        getTriggerDecisions(decision,cas_efC);
-
-        for(unsigned int i=0; i<ttpBits_.size(); i++) {
-            // if( decision.at(i) ) std::cerr << "**** Something Triggered" << std::endl;
-            // std::cout << "Run CastorTTRecord::produce. TriggerBit = " << ttpBits_.at(i) << "; TriggerName = " << TrigNames_.at(i) << "; Decision = " << decision[i] << std::endl;
-            vecTT.at(i) = L1GtTechnicalTrigger(TrigNames_.at(i), ttpBits_.at(i), 0, decision.at(i)) ;
-        }
-
-    } else {
-        vecTT.clear() ;
+    for (unsigned int i = 0; i < ttpBits_.size(); i++) {
+      // if( decision.at(i) ) std::cerr << "**** Something Triggered" <<
+      // std::endl; std::cout << "Run CastorTTRecord::produce. TriggerBit = " <<
+      // ttpBits_.at(i) << "; TriggerName = " << TrigNames_.at(i) << "; Decision
+      // = " << decision[i] << std::endl;
+      vecTT.at(i) = L1GtTechnicalTrigger(TrigNames_.at(i), ttpBits_.at(i), 0, decision.at(i));
     }
 
-    // Put output into event
-    std::unique_ptr<L1GtTechnicalTriggerRecord> output(new L1GtTechnicalTriggerRecord()) ;
-    output->setGtTechnicalTrigger(vecTT) ;    
-    e.put(std::move(output)) ;
+  } else {
+    vecTT.clear();
+  }
+
+  // Put output into event
+  std::unique_ptr<L1GtTechnicalTriggerRecord> output(new L1GtTechnicalTriggerRecord());
+  output->setGtTechnicalTrigger(vecTT);
+  e.put(std::move(output));
 }
 
+void CastorTTRecord::getEnergy_fC(double energy[16][14],
+                                  edm::Handle<CastorDigiCollection> &CastorDigiColl,
+                                  edm::Event &e,
+                                  const edm::EventSetup &eventSetup) {
+  // std::cerr << "**** RUNNING THROUGH CastorTTRecord::getEnergy_fC" <<
+  // std::endl;
 
-void CastorTTRecord::getEnergy_fC(double energy[16][14], edm::Handle<CastorDigiCollection>& CastorDigiColl,
-                                  edm::Event& e, const edm::EventSetup& eventSetup)
-{
-    // std::cerr << "**** RUNNING THROUGH CastorTTRecord::getEnergy_fC" << std::endl;
+  // Get Conditions
+  edm::ESHandle<CastorDbService> conditions;
+  eventSetup.get<CastorDbRecord>().get(conditions);
+  const CastorQIEShape *shape = conditions->getCastorShape();  // this one is generic
 
-    // Get Conditions
-    edm::ESHandle<CastorDbService> conditions ;
-    eventSetup.get<CastorDbRecord>().get(conditions) ;
-    const CastorQIEShape* shape = conditions->getCastorShape () ; // this one is generic
+  for (int isec = 0; isec < 16; isec++)
+    for (int imod = 0; imod < 14; imod++)
+      energy[isec][imod] = 0;
 
-    for(int isec=0; isec<16; isec++) for(int imod=0; imod<14; imod++) energy[isec][imod] = 0;
+  // Loop over digis
+  CastorDigiCollection::const_iterator idigi;
+  for (idigi = CastorDigiColl->begin(); idigi != CastorDigiColl->end(); idigi++) {
+    const CastorDataFrame &digi = (*idigi);
+    HcalCastorDetId cell = digi.id();
 
-    // Loop over digis
-    CastorDigiCollection::const_iterator idigi ;
-    for (idigi=CastorDigiColl->begin(); idigi!=CastorDigiColl->end(); idigi++) {
-        const CastorDataFrame & digi = (*idigi) ;
-        HcalCastorDetId cell = digi.id() ;
+    // Get Castor Coder
+    const CastorQIECoder *channelCoder = conditions->getCastorCoder(cell);
+    CastorCoderDb coder(*channelCoder, *shape);
 
-        // Get Castor Coder
-        const CastorQIECoder* channelCoder = conditions->getCastorCoder(cell);
-        CastorCoderDb coder (*channelCoder, *shape);
+    // Get Castor Calibration
+    const CastorCalibrations &calibrations = conditions->getCastorCalibrations(cell);
 
-        // Get Castor Calibration
-        const CastorCalibrations& calibrations=conditions->getCastorCalibrations(cell);
+    // convert adc to fC
+    CaloSamples tool;
+    coder.adc2fC(digi, tool);
 
-        // convert adc to fC
-        CaloSamples tool ;
-        coder.adc2fC(digi,tool) ;
+    // pedestal substraction
+    int capid = digi[CastorSignalTS_].capid();
+    double fC = tool[CastorSignalTS_] - calibrations.pedestal(capid);
 
-        // pedestal substraction
-        int capid=digi[CastorSignalTS_].capid();
-        double fC = tool[CastorSignalTS_] - calibrations.pedestal(capid);
+    // to correct threshold levels in fC for different gains
+    reweighted_gain = calibrations.gain(capid) / 0.015;
 
-        // to correct threshold levels in fC for different gains
-        reweighted_gain = calibrations.gain(capid) / 0.015;
-        
-        energy[digi.id().sector()-1][digi.id().module()-1] = fC;
-    }
+    energy[digi.id().sector() - 1][digi.id().module() - 1] = fC;
+  }
 }
 
-void CastorTTRecord::getTriggerDecisions(std::vector<bool>& decision, double energy[16][14]) const
-{
-    // std::cerr << "**** RUNNING THROUGH CastorTTRecord::getTriggerDecisions" << std::endl;
-
-    // check if number of bits is at least four
-    if( decision.size() < 4 ) return;
-
-    std::vector<bool> tdpo[8]; // TriggerDecisionsPerOctant
-    getTriggerDecisionsPerOctant(tdpo,energy);
-
-
-    // preset trigger decisions
-    decision.at(0) = true;
-    decision.at(1) = false;
-    decision.at(2) = false;
-    decision.at(3) = false;
-
+void CastorTTRecord::getTriggerDecisions(std::vector<bool> &decision, double energy[16][14]) const {
+  // std::cerr << "**** RUNNING THROUGH CastorTTRecord::getTriggerDecisions" <<
+  // std::endl;
+
+  // check if number of bits is at least four
+  if (decision.size() < 4)
+    return;
+
+  std::vector<bool> tdpo[8];  // TriggerDecisionsPerOctant
+  getTriggerDecisionsPerOctant(tdpo, energy);
+
+  // preset trigger decisions
+  decision.at(0) = true;
+  decision.at(1) = false;
+  decision.at(2) = false;
+  decision.at(3) = false;
+
+  // canceld for low pt jet
+  // bool EM_decision = false;
+  // bool HAD_decision = false;
+  // loop over castor octants
+  for (int ioct = 0; ioct < 8; ioct++) {
+    int next_oct = (ioct + 1) % 8;
+    int prev_oct = (ioct + 8 - 1) % 8;
+
+    // gap Trigger
+    if (!tdpo[ioct].at(0))
+      decision.at(0) = false;
+    if (!tdpo[ioct].at(1))
+      decision.at(0) = false;
+
+    // jet Trigger
+    if (tdpo[ioct].at(2))
+      decision.at(1) = true;
+
+    // electron
     // canceld for low pt jet
-    // bool EM_decision = false;
-    // bool HAD_decision = false;
-    // loop over castor octants
-    for(int ioct=0; ioct<8; ioct++) {
-        int next_oct = (ioct+1)%8;
-        int prev_oct = (ioct+8-1)%8;
-
-        // gap Trigger
-        if( !tdpo[ioct].at(0) ) decision.at(0) = false;
-        if( !tdpo[ioct].at(1) ) decision.at(0) = false;
-
-        // jet Trigger
-        if( tdpo[ioct].at(2) ) decision.at(1) = true;
-
-        // electron
-        // canceld for low pt jet
-        // if( tdpo[ioct].at(3) ) EM_decision = true;
-        // if( tdpo[ioct].at(4) ) HAD_decision = true;
-
-        // iso muon
-        if( tdpo[ioct].at(5) ) {
-            // was one of the other sectors 
-            // in the octant empty ?
-            if( tdpo[ioct].at(0) ) {
-                if( tdpo[prev_oct].at(1) && 
-                    tdpo[next_oct].at(0) && 
-                    tdpo[next_oct].at(1) )
-                    decision.at(3) = true;
-            }
-            else if( tdpo[ioct].at(1) ) {
-                if( tdpo[prev_oct].at(0) && 
-                    tdpo[prev_oct].at(1) && 
-                    tdpo[next_oct].at(0) )
-                    decision.at(3) = true;
-            }
-            // when not no iso muon
-        }
-
-        // low pt jet Trigger
-        if( tdpo[ioct].at(6) ) decision.at(2) = true;
+    // if( tdpo[ioct].at(3) ) EM_decision = true;
+    // if( tdpo[ioct].at(4) ) HAD_decision = true;
+
+    // iso muon
+    if (tdpo[ioct].at(5)) {
+      // was one of the other sectors
+      // in the octant empty ?
+      if (tdpo[ioct].at(0)) {
+        if (tdpo[prev_oct].at(1) && tdpo[next_oct].at(0) && tdpo[next_oct].at(1))
+          decision.at(3) = true;
+      } else if (tdpo[ioct].at(1)) {
+        if (tdpo[prev_oct].at(0) && tdpo[prev_oct].at(1) && tdpo[next_oct].at(0))
+          decision.at(3) = true;
+      }
+      // when not no iso muon
     }
 
-    // for EM Trigger whole castor not hadronic and somewhere EM
-    // canceld for low pt jet
-    // decision.at(2) = EM_decision && !HAD_decision;
+    // low pt jet Trigger
+    if (tdpo[ioct].at(6))
+      decision.at(2) = true;
+  }
+
+  // for EM Trigger whole castor not hadronic and somewhere EM
+  // canceld for low pt jet
+  // decision.at(2) = EM_decision && !HAD_decision;
 }
 
-void CastorTTRecord::getTriggerDecisionsPerOctant(std::vector<bool> tdpo[8], double energy[16][14]) const
-{
-    // std::cerr << "**** RUNNING THROUGH CastorTTRecord::getTriggerDecisionsPerOctant" << std::endl;
-
-    // loop over octatants
-    for(int ioct=0; ioct<8; ioct++)
-    {
-        // six bits from HTR card
-        // 0. first sector empty
-        // 1. second sector empty
-        // 2. jet any sector
-        // 3. EM any sector
-        // 4. HAD any sector
-        // 5. muon any sector
-        // add instead of EM Trigger (not bit 6 in real)
-        // 6. low pt jet any sector
-        tdpo[ioct].resize(7);
-
-        for(int ibit=0; ibit<7; ibit++)
-            tdpo[ioct].at(ibit) = false;
-
-        // loop over castor sectors in octant
-        for(int ioctsec=0; ioctsec<2; ioctsec++)
-        {
-            // absolute sector number
-            int isec = 2*ioct+ioctsec;
-
-            // init module sums for every sector
-            double fCsum_mod = 0;
-            double fCsum_em = 0, fCsum_ha = 0;
-            double fCsum_jet_had = 0;
-            double fCsum_col[3] = { 0, 0, 0 };
-            
-            // loop over modules
-            for(int imod=0; imod<14; imod++) { 
-                // total sum
-                fCsum_mod += energy[isec][imod];
-                
-                // EM & HAD sum
-                if( imod < 2 ) fCsum_em += energy[isec][imod];
-                if( imod > 2 && imod < 12 ) fCsum_ha += energy[isec][imod];
-                
-                // sum over three sector parts
-                if( imod < 4 )       fCsum_col[0] += energy[isec][imod];
-                else if( imod < 8 )  fCsum_col[1] += energy[isec][imod];
-                else if( imod < 12 ) fCsum_col[2] += energy[isec][imod];
-
-                // HAD sum for jet trigger v2
-                if( imod > 1 && imod < 5 ) fCsum_jet_had += energy[isec][imod];
-            }
-
-            // gap Trigger
-            if( fCsum_mod < TrigThresholds_.at(0) ) {
-                if( ioctsec == 0 ) tdpo[ioct].at(0) = true;
-                else if( ioctsec == 1 ) tdpo[ioct].at(1) = true;
-            }
-
-            // jet Trigger 
-            // with gain correction
-            /* old version of jet trigger ( deprecated because of saturation )
-            if( fCsum_mod > TrigThresholds_.at(1) / reweighted_gain ) 
-                tdpo[ioct].at(2) = true; 
-            */
-            if( fCsum_jet_had > TrigThresholds_.at(1) / reweighted_gain )
-            // additional high threshold near saturation for EM part
-                if( energy[isec][0] > 26000 / reweighted_gain && energy[isec][1] > 26000 / reweighted_gain )
-                    tdpo[ioct].at(2) = true;
-
-            // low pt jet Trigger
-            if( fCsum_mod > TrigThresholds_.at(5) / reweighted_gain ) 
-                tdpo[ioct].at(6) = true; 
-
-            // egamma Trigger
-            // with gain correction only in the EM threshold
-            if( fCsum_em > TrigThresholds_.at(2) / reweighted_gain )
-                tdpo[ioct].at(3) = true;
-            if( fCsum_ha > TrigThresholds_.at(3) ) 
-                tdpo[ioct].at(4) = true; 
-
-            // muon Trigger
-            int countColumns = 0;
-            for( int icol=0; icol<3; icol++ ) 
-                if( fCsum_col[icol] > TrigThresholds_.at(4) ) 
-                    countColumns++;
-            if( countColumns >= 2 )
-                tdpo[ioct].at(5) = true;
-        }
+void CastorTTRecord::getTriggerDecisionsPerOctant(std::vector<bool> tdpo[8], double energy[16][14]) const {
+  // std::cerr << "**** RUNNING THROUGH
+  // CastorTTRecord::getTriggerDecisionsPerOctant" << std::endl;
+
+  // loop over octatants
+  for (int ioct = 0; ioct < 8; ioct++) {
+    // six bits from HTR card
+    // 0. first sector empty
+    // 1. second sector empty
+    // 2. jet any sector
+    // 3. EM any sector
+    // 4. HAD any sector
+    // 5. muon any sector
+    // add instead of EM Trigger (not bit 6 in real)
+    // 6. low pt jet any sector
+    tdpo[ioct].resize(7);
+
+    for (int ibit = 0; ibit < 7; ibit++)
+      tdpo[ioct].at(ibit) = false;
+
+    // loop over castor sectors in octant
+    for (int ioctsec = 0; ioctsec < 2; ioctsec++) {
+      // absolute sector number
+      int isec = 2 * ioct + ioctsec;
+
+      // init module sums for every sector
+      double fCsum_mod = 0;
+      double fCsum_em = 0, fCsum_ha = 0;
+      double fCsum_jet_had = 0;
+      double fCsum_col[3] = {0, 0, 0};
+
+      // loop over modules
+      for (int imod = 0; imod < 14; imod++) {
+        // total sum
+        fCsum_mod += energy[isec][imod];
+
+        // EM & HAD sum
+        if (imod < 2)
+          fCsum_em += energy[isec][imod];
+        if (imod > 2 && imod < 12)
+          fCsum_ha += energy[isec][imod];
+
+        // sum over three sector parts
+        if (imod < 4)
+          fCsum_col[0] += energy[isec][imod];
+        else if (imod < 8)
+          fCsum_col[1] += energy[isec][imod];
+        else if (imod < 12)
+          fCsum_col[2] += energy[isec][imod];
+
+        // HAD sum for jet trigger v2
+        if (imod > 1 && imod < 5)
+          fCsum_jet_had += energy[isec][imod];
+      }
+
+      // gap Trigger
+      if (fCsum_mod < TrigThresholds_.at(0)) {
+        if (ioctsec == 0)
+          tdpo[ioct].at(0) = true;
+        else if (ioctsec == 1)
+          tdpo[ioct].at(1) = true;
+      }
+
+      // jet Trigger
+      // with gain correction
+      /* old version of jet trigger ( deprecated because of saturation )
+      if( fCsum_mod > TrigThresholds_.at(1) / reweighted_gain )
+          tdpo[ioct].at(2) = true;
+      */
+      if (fCsum_jet_had > TrigThresholds_.at(1) / reweighted_gain)
+        // additional high threshold near saturation for EM part
+        if (energy[isec][0] > 26000 / reweighted_gain && energy[isec][1] > 26000 / reweighted_gain)
+          tdpo[ioct].at(2) = true;
+
+      // low pt jet Trigger
+      if (fCsum_mod > TrigThresholds_.at(5) / reweighted_gain)
+        tdpo[ioct].at(6) = true;
+
+      // egamma Trigger
+      // with gain correction only in the EM threshold
+      if (fCsum_em > TrigThresholds_.at(2) / reweighted_gain)
+        tdpo[ioct].at(3) = true;
+      if (fCsum_ha > TrigThresholds_.at(3))
+        tdpo[ioct].at(4) = true;
+
+      // muon Trigger
+      int countColumns = 0;
+      for (int icol = 0; icol < 3; icol++)
+        if (fCsum_col[icol] > TrigThresholds_.at(4))
+          countColumns++;
+      if (countColumns >= 2)
+        tdpo[ioct].at(5) = true;
     }
+  }
 }
diff --git a/SimCalorimetry/CastorTechTrigProducer/src/CastorTTRecord.h b/SimCalorimetry/CastorTechTrigProducer/src/CastorTTRecord.h
index d3d9e81075046..afe2230ef05e2 100644
--- a/SimCalorimetry/CastorTechTrigProducer/src/CastorTTRecord.h
+++ b/SimCalorimetry/CastorTechTrigProducer/src/CastorTTRecord.h
@@ -1,44 +1,43 @@
 #ifndef CastorTechTrigProducer_CastorTTRecord_h
 #define CastorTechTrigProducer_CastorTTRecord_h
 
-#include "FWCore/Framework/interface/one/EDProducer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/one/EDProducer.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 
-class CastorTTRecord : public edm::one::EDProducer<>
-{
+class CastorTTRecord : public edm::one::EDProducer<> {
 public:
+  explicit CastorTTRecord(const edm::ParameterSet &ps);
+  ~CastorTTRecord() override;
 
-    explicit CastorTTRecord(const edm::ParameterSet& ps);
-    ~CastorTTRecord() override;
-    
-    void produce(edm::Event& e, const edm::EventSetup& c) override;
+  void produce(edm::Event &e, const edm::EventSetup &c) override;
 
-    // get fC from digis and save it to array double energy[16 sectors][14 modules]
-    void getEnergy_fC(double energy[16][14], edm::Handle<CastorDigiCollection>& CastorDigiColl,
-    				  edm::Event& e, const edm::EventSetup& c);
+  // get fC from digis and save it to array double energy[16 sectors][14
+  // modules]
+  void getEnergy_fC(double energy[16][14],
+                    edm::Handle<CastorDigiCollection> &CastorDigiColl,
+                    edm::Event &e,
+                    const edm::EventSetup &c);
 
-    // get Trigger decisions | vector needs same SIZE and ORDER as in 'ttpBits_'
-    void getTriggerDecisions(std::vector<bool>& decision, double energy[16][14]) const;
+  // get Trigger decisions | vector needs same SIZE and ORDER as in 'ttpBits_'
+  void getTriggerDecisions(std::vector<bool> &decision, double energy[16][14]) const;
 
-    // get Trigger decisions for every octant | vector has size of 6 -> 6 HTR card bits
-    void getTriggerDecisionsPerOctant(std::vector<bool> tdps[16], double energy[16][14]) const;
+  // get Trigger decisions for every octant | vector has size of 6 -> 6 HTR card
+  // bits
+  void getTriggerDecisionsPerOctant(std::vector<bool> tdps[16], double energy[16][14]) const;
 
 private:
-    
-    edm::EDGetTokenT<CastorDigiCollection> CastorDigiColl_;
-    unsigned int CastorSignalTS_;
+  edm::EDGetTokenT<CastorDigiCollection> CastorDigiColl_;
+  unsigned int CastorSignalTS_;
 
-    std::vector<unsigned int> ttpBits_ ;
-    std::vector<std::string> TrigNames_ ; 
-   	std::vector<double> TrigThresholds_ ;
+  std::vector<unsigned int> ttpBits_;
+  std::vector<std::string> TrigNames_;
+  std::vector<double> TrigThresholds_;
 
-    double reweighted_gain;
+  double reweighted_gain;
 };
 
 #endif
-
-
diff --git a/SimCalorimetry/CastorTechTrigProducer/src/SealModule.cc b/SimCalorimetry/CastorTechTrigProducer/src/SealModule.cc
index 0f8c1cdc15b70..265d15106a35e 100644
--- a/SimCalorimetry/CastorTechTrigProducer/src/SealModule.cc
+++ b/SimCalorimetry/CastorTechTrigProducer/src/SealModule.cc
@@ -1,5 +1,5 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "SimCalorimetry/CastorTechTrigProducer/src/CastorTTRecord.h"
 
 DEFINE_FWK_MODULE(CastorTTRecord);
diff --git a/SimCalorimetry/Configuration/python/SimCalorimetry_cff.py b/SimCalorimetry/Configuration/python/SimCalorimetry_cff.py
index 5e44d4befa8c4..b1ada7a5a09fa 100644
--- a/SimCalorimetry/Configuration/python/SimCalorimetry_cff.py
+++ b/SimCalorimetry/Configuration/python/SimCalorimetry_cff.py
@@ -3,8 +3,10 @@
 from SimCalorimetry.Configuration.ecalDigiSequence_cff import *
 from SimCalorimetry.Configuration.hcalDigiSequence_cff import *
 from SimCalorimetry.Configuration.castorDigiSequence_cff import *
-calDigi = cms.Sequence(ecalDigiSequence+hcalDigiSequence+castorDigiSequence)
+
+calDigiTask = cms.Task(ecalDigiTask, hcalDigiTask, castorDigiTask)
+calDigi = cms.Sequence(calDigiTask)
 
 # fastsim has no castor model
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
-fastSim.toReplaceWith(calDigi, calDigi.copyAndExclude([castorDigiSequence]))
+fastSim.toReplaceWith(calDigiTask, calDigiTask.copyAndExclude([castorDigiTask]))
diff --git a/SimCalorimetry/Configuration/python/castorDigiSequence_cff.py b/SimCalorimetry/Configuration/python/castorDigiSequence_cff.py
index 84debadc13f60..65b543c94905b 100644
--- a/SimCalorimetry/Configuration/python/castorDigiSequence_cff.py
+++ b/SimCalorimetry/Configuration/python/castorDigiSequence_cff.py
@@ -1,5 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
 from SimCalorimetry.CastorSim.castordigi_cfi import *
+castorDigiTask = cms.Task()
 castorDigiSequence = cms.Sequence()
 
diff --git a/SimCalorimetry/Configuration/python/ecalDigiSequence_cff.py b/SimCalorimetry/Configuration/python/ecalDigiSequence_cff.py
index eb6315cbd6fe0..c8250bc348ae8 100644
--- a/SimCalorimetry/Configuration/python/ecalDigiSequence_cff.py
+++ b/SimCalorimetry/Configuration/python/ecalDigiSequence_cff.py
@@ -9,18 +9,19 @@
 # Preshower Zero suppression producer
 from SimCalorimetry.EcalZeroSuppressionProducers.ecalPreshowerDigis_cfi import *
 # simEcalUnsuppressedDigis is now done inside mixing module
-ecalDigiSequence = cms.Sequence(simEcalTriggerPrimitiveDigis*simEcalDigis*simEcalPreshowerDigis)
+ecalDigiTask = cms.Task(simEcalTriggerPrimitiveDigis, simEcalDigis, simEcalPreshowerDigis)
+ecalDigiSequence = cms.Sequence(ecalDigiTask)
 
 
 # This is extra, since the configuration skips it anyway.  Belts and suspenders.
 from Configuration.ProcessModifiers.premix_stage1_cff import premix_stage1
-premix_stage1.toReplaceWith(ecalDigiSequence, ecalDigiSequence.copyAndExclude([simEcalPreshowerDigis]))
+premix_stage1.toReplaceWith(ecalDigiTask, ecalDigiTask.copyAndExclude([simEcalPreshowerDigis]))
 
 from SimCalorimetry.EcalEBTrigPrimProducers.ecalEBTriggerPrimitiveDigis_cff import *
-_phase2_ecalDigiSequence = ecalDigiSequence.copy()
-_phase2_ecalDigiSequence.insert(0,simEcalEBTriggerPrimitiveDigis)
+_phase2_ecalDigiTask = ecalDigiTask.copy()
+_phase2_ecalDigiTask.add(simEcalEBTriggerPrimitiveDigis)
 
 from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
-phase2_common.toReplaceWith(ecalDigiSequence,_phase2_ecalDigiSequence)
+phase2_common.toReplaceWith(ecalDigiTask,_phase2_ecalDigiTask)
 
 
diff --git a/SimCalorimetry/Configuration/python/hcalDigiSequence_cff.py b/SimCalorimetry/Configuration/python/hcalDigiSequence_cff.py
index 3f5e620df414c..7ade9b0db5c21 100644
--- a/SimCalorimetry/Configuration/python/hcalDigiSequence_cff.py
+++ b/SimCalorimetry/Configuration/python/hcalDigiSequence_cff.py
@@ -5,11 +5,10 @@
 from SimCalorimetry.HcalTrigPrimProducers.hcalTTPDigis_cfi import *
 
 # simHcalUnsuppressedDigis is now done inside mixing module
-hcalDigiSequence = cms.Sequence(simHcalTriggerPrimitiveDigis
-                                +simHcalDigis
-                                *simHcalTTPDigis)
+hcalDigiTask = cms.Task(simHcalTriggerPrimitiveDigis, simHcalDigis, simHcalTTPDigis)
+hcalDigiSequence = cms.Sequence(hcalDigiTask)
 
 # remove HCAL TP sim for premixing stage1
 # not needed, sometimes breaks
 from Configuration.ProcessModifiers.premix_stage1_cff import premix_stage1
-premix_stage1.toReplaceWith(hcalDigiSequence, cms.Sequence(simHcalDigis))
+premix_stage1.toReplaceWith(hcalDigiTask, cms.Task(simHcalDigis))
diff --git a/SimCalorimetry/EcalElectronicsEmulation/bin/GenABIO.cc b/SimCalorimetry/EcalElectronicsEmulation/bin/GenABIO.cc
index f244633577afe..bb77a0b319e89 100644
--- a/SimCalorimetry/EcalElectronicsEmulation/bin/GenABIO.cc
+++ b/SimCalorimetry/EcalElectronicsEmulation/bin/GenABIO.cc
@@ -7,13 +7,13 @@
  * Run 'GenABIO -h' for usage.
  */
 
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <vector>
 #include <cassert>
 #include <cstdlib>
 #include <cstring>
+#include <fstream>
+#include <iostream>
+#include <sstream>
+#include <vector>
 
 #include "ecalDccMap.h"
 
@@ -22,88 +22,77 @@
 /* getline implementation is copied from glibc. */
 
 #ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
+#define SIZE_MAX ((size_t)-1)
 #endif
 #ifndef SSIZE_MAX
-# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
+#define SSIZE_MAX ((ssize_t)(SIZE_MAX / 2))
 #endif
 namespace {
-ssize_t getline (char **lineptr, size_t *n, FILE *fp)
-{
+  ssize_t getline(char **lineptr, size_t *n, FILE *fp) {
     ssize_t result;
     size_t cur_len = 0;
 
-    if (lineptr == NULL || n == NULL || fp == NULL)
-    {
-        errno = EINVAL;
-        return -1;
-   }
-
-    if (*lineptr == NULL || *n == 0)
-    {
-        *n = 120;
-        *lineptr = (char *) malloc (*n);
-        if (*lineptr == NULL)
-        {
-            result = -1;
-            goto end;
-        }
+    if (lineptr == NULL || n == NULL || fp == NULL) {
+      errno = EINVAL;
+      return -1;
     }
 
-    for (;;)
-    {
-        int i;
+    if (*lineptr == NULL || *n == 0) {
+      *n = 120;
+      *lineptr = (char *)malloc(*n);
+      if (*lineptr == NULL) {
+        result = -1;
+        goto end;
+      }
+    }
+
+    for (;;) {
+      int i;
+
+      i = getc(fp);
+      if (i == EOF) {
+        result = -1;
+        break;
+      }
 
-        i = getc (fp);
-        if (i == EOF)
-        {
-            result = -1;
-            break;
+      /* Make enough space for len+1 (for final NUL) bytes.  */
+      if (cur_len + 1 >= *n) {
+        size_t needed_max = SSIZE_MAX < SIZE_MAX ? (size_t)SSIZE_MAX + 1 : SIZE_MAX;
+        size_t needed = 2 * *n + 1; /* Be generous. */
+        char *new_lineptr;
+
+        if (needed_max < needed)
+          needed = needed_max;
+        if (cur_len + 1 >= needed) {
+          result = -1;
+          goto end;
         }
 
-        /* Make enough space for len+1 (for final NUL) bytes.  */
-        if (cur_len + 1 >= *n)
-        {
-            size_t needed_max =
-                SSIZE_MAX < SIZE_MAX ? (size_t) SSIZE_MAX + 1 : SIZE_MAX;
-            size_t needed = 2 * *n + 1;   /* Be generous. */
-            char *new_lineptr;
-
-            if (needed_max < needed)
-                needed = needed_max;
-            if (cur_len + 1 >= needed)
-            {
-                result = -1;
-                goto end;
-            }
-
-            new_lineptr = (char *) realloc (*lineptr, needed);
-            if (new_lineptr == NULL)
-            {
-                result = -1;
-                goto end;
-            }
-
-            *lineptr = new_lineptr;
-            *n = needed;
+        new_lineptr = (char *)realloc(*lineptr, needed);
+        if (new_lineptr == NULL) {
+          result = -1;
+          goto end;
         }
 
-        (*lineptr)[cur_len] = i;
-        cur_len++;
+        *lineptr = new_lineptr;
+        *n = needed;
+      }
+
+      (*lineptr)[cur_len] = i;
+      cur_len++;
 
-        if (i == '\n')
-            break;
+      if (i == '\n')
+        break;
     }
     (*lineptr)[cur_len] = '\0';
-    result = cur_len ? (ssize_t) cur_len : result;
+    result = cur_len ? (ssize_t)cur_len : result;
 
-end:
+  end:
     return result;
-}
-}
+  }
+}  // namespace
 #endif
 
-
 using namespace std;
 
 /** Range of the x-index of endcap crystals (xman-xmin+1).
@@ -117,10 +106,10 @@ const static int nEndcapYBins = 100;
 const static int supercrystalEdge = 5;
 /** Range of endcap supercrystal x-index (xmax-xmin+1)
  */
-const static int nSupercrystalXBins = nEndcapXBins/supercrystalEdge;
+const static int nSupercrystalXBins = nEndcapXBins / supercrystalEdge;
 /** Range of endcap supercrystal y-index (ymay-ymin+1)
  */
-const static int nSupercrystalYBins = nEndcapYBins/supercrystalEdge;
+const static int nSupercrystalYBins = nEndcapYBins / supercrystalEdge;
 /** Number of endcap, obviously tow
  */
 const static int nEndcaps = 2;
@@ -132,363 +121,367 @@ const static int nEndcapTTInEta = 11;
 const static int nBarrelTTInEta = 34;
 /** Number of trigger towers along eta for the whole ECAL
  */
-const static int nTTInEta =
-2*nEndcapTTInEta+nBarrelTTInEta;
+const static int nTTInEta = 2 * nEndcapTTInEta + nBarrelTTInEta;
 /** Number of trigger towers in an eta ring
  */
 const static int nTTInPhi = 72;
 /** Number of ABs in a phi-sector
  */
-const int nABInEta=4;
+const int nABInEta = 4;
 /** Number of ABs in an eta slice
  */
-const int nABInPhi=3;
+const int nABInPhi = 3;
 /** Number of DCCs in an endcap
  */
 const int nDCCEE = 9;
-const int nABABCh = 8;//nbr of AB input/output ch. on an AB
-const int nABTCCCh = 12;//nbr of TCC inputs on an AB
-const int nDCCCh = 12;//nbr of DCC outputs on an AB
-const int nTCCInEta = 6; //nbr of TCC bins along eta
-const int nAB = nABInPhi*nABInEta;
-const int nTTInABAlongPhi=nTTInPhi/nABInPhi;
-const int iTTEtaMin[nABInEta] = {0,11,28,45};
-const int iTTEtaMax[nABInEta] = {10,27,44,55};
-const int iTTEtaSign[nABInEta] = {-1,-1,1,1};
-
-//Eta bounds for TCC partionning
-//a TCC covers from iTCCEtaBounds[iTCCEta] included to
-//iTCCEtaBounds[iTCCEta+1] excluded.
-const int iTCCEtaBounds[nTCCInEta+1] = {0,7,11,28,45,49,56};
-
-const char* abTTFFilePrefix = "TTF_AB";
-const char* abTTFFilePostfix = ".txt";
-const char* abSRFFilePrefix = "AF_AB";
-const char* abSRFFilePostfix = ".txt";
-const char* abIOFilePrefix = "IO_AB";
-const char* abIOFilePostfix = ".txt";
-
-const char* srfFilename = "SRF.txt";
-const char* ttfFilename = "TTF.txt";
-const char* xconnectFilename = "xconnect_universal.txt";
-
-const char srpFlagMarker[] = {'.', 'S', 'N', 'C', '4','5','6','7'};
+const int nABABCh = 8;    // nbr of AB input/output ch. on an AB
+const int nABTCCCh = 12;  // nbr of TCC inputs on an AB
+const int nDCCCh = 12;    // nbr of DCC outputs on an AB
+const int nTCCInEta = 6;  // nbr of TCC bins along eta
+const int nAB = nABInPhi * nABInEta;
+const int nTTInABAlongPhi = nTTInPhi / nABInPhi;
+const int iTTEtaMin[nABInEta] = {0, 11, 28, 45};
+const int iTTEtaMax[nABInEta] = {10, 27, 44, 55};
+const int iTTEtaSign[nABInEta] = {-1, -1, 1, 1};
+
+// Eta bounds for TCC partionning
+// a TCC covers from iTCCEtaBounds[iTCCEta] included to
+// iTCCEtaBounds[iTCCEta+1] excluded.
+const int iTCCEtaBounds[nTCCInEta + 1] = {0, 7, 11, 28, 45, 49, 56};
+
+const char *abTTFFilePrefix = "TTF_AB";
+const char *abTTFFilePostfix = ".txt";
+const char *abSRFFilePrefix = "AF_AB";
+const char *abSRFFilePostfix = ".txt";
+const char *abIOFilePrefix = "IO_AB";
+const char *abIOFilePostfix = ".txt";
+
+const char *srfFilename = "SRF.txt";
+const char *ttfFilename = "TTF.txt";
+const char *xconnectFilename = "xconnect_universal.txt";
+
+const char srpFlagMarker[] = {'.', 'S', 'N', 'C', '4', '5', '6', '7'};
 const char tccFlagMarker[] = {'.', 'S', '?', 'C', '4', '5', '6', '7'};
 
 char srp2roFlags[128];
 
-typedef enum {suppress=0, sr2, sr1, full, fsuppress, fsr2, fsr1, ffull} roAction_t;
-char roFlagMarker[] = {/*suppress*/'.', /*sr1*/'z', /*sr1*/'Z', /*full*/'F',
-		       /*fsuppress*/'4', /*fsr2*/'5', /*fsr1*/'6', /*ffull*/'7'
-};
+typedef enum { suppress = 0, sr2, sr1, full, fsuppress, fsr2, fsr1, ffull } roAction_t;
+char roFlagMarker[] = {
+    /*suppress*/ '.',
+    /*sr1*/ 'z',
+    /*sr1*/ 'Z',
+    /*full*/ 'F',
+    /*fsuppress*/ '4',
+    /*fsr2*/ '5',
+    /*fsr1*/ '6',
+    /*ffull*/ '7'};
 
 const int nactions = 8;
-//can be overwritten according by cmd line arguments
-roAction_t actions[nactions] = {/*LI->*/sr2,/*S->*/full,/*N->*/ full,/*C->*/full,
-				/*fLI->*/sr2,/*fS->*/sr2,/*fN->*/sr2,/*fC->*/sr2}; 
-
-//list of SC deserves by an endcap DCC [0(EE-)|1(EE+)][iDCCPhi]
-vector<pair<int, int> > ecalDccSC[nEndcaps][nDCCEE];
-
-void fillABTTFFiles(const char ttFlags[nTTInEta][nTTInPhi],
-                    ofstream files[]);
+// can be overwritten according by cmd line arguments
+roAction_t actions[nactions] = {
+    /*LI->*/ sr2,
+    /*S->*/ full,
+    /*N->*/ full,
+    /*C->*/ full,
+    /*fLI->*/ sr2,
+    /*fS->*/ sr2,
+    /*fN->*/ sr2,
+    /*fC->*/ sr2};
+
+// list of SC deserves by an endcap DCC [0(EE-)|1(EE+)][iDCCPhi]
+vector<pair<int, int>> ecalDccSC[nEndcaps][nDCCEE];
+
+void fillABTTFFiles(const char ttFlags[nTTInEta][nTTInPhi], ofstream files[]);
 void fillABSRPFiles(const char barrelSrFlags[nBarrelTTInEta][nTTInPhi],
-                    const char endcapSrFlags[nEndcaps][nSupercrystalXBins]
-                    [nSupercrystalYBins],
+                    const char endcapSrFlags[nEndcaps][nSupercrystalXBins][nSupercrystalYBins],
                     ofstream files[]);
 void fillABIOFiles(const char ttFlags[nTTInEta][nTTInPhi],
                    const char barrelSrFlags[nBarrelTTInEta][nTTInPhi],
-                   const char endcapSrFlags[nEndcaps][nSupercrystalXBins]
-                   [nSupercrystalYBins],
+                   const char endcapSrFlags[nEndcaps][nSupercrystalXBins][nSupercrystalYBins],
                    ofstream files[]);
-inline int abNum(int iABEta, int iABPhi){return 3*iABEta+iABPhi;}
-
-bool readTTF(FILE* file, char ttFlags[nTTInEta][nTTInPhi]);
-bool readSRF(FILE* file,
-	     char barrelSrFlags[nBarrelTTInEta][nTTInPhi],
-	     char endcapSrFlags[nEndcaps][nSupercrystalXBins]
-	     [nSupercrystalYBins]);
-
-void writeABTTFFileHeader(ofstream& f, int abNum);
-void writeABSRFFileHeader(ofstream& f, int abNum);
-void writeABIOFileHeader(ofstream& f, int abNum);
-string getFlagStream(char flags[nTTInEta][nTTInPhi], int iEtaMin, int iEtaMax,
-                     int iPhiMin, int iPhiMax);
-string getABTCCInputStream(const char tccFlags[nTTInEta][nTTInPhi],
-                           int iABEta, int iABPhi, int iTCCCh);
-void getABTTPhiBounds(int iABPhi, int& iTTPhiMin, int& iTTPhiMax);
-string getABABOutputStream(const char tccFlags[nTTInEta][nTTInPhi],
-                           int iABEta, int iABPhi, int iABCh);
-string getABABInputStream(const char tccFlags[nTTInEta][nTTInPhi], int iABEta, 
-			  int iABPhi, int iABCh);
+inline int abNum(int iABEta, int iABPhi) { return 3 * iABEta + iABPhi; }
+
+bool readTTF(FILE *file, char ttFlags[nTTInEta][nTTInPhi]);
+bool readSRF(FILE *file,
+             char barrelSrFlags[nBarrelTTInEta][nTTInPhi],
+             char endcapSrFlags[nEndcaps][nSupercrystalXBins][nSupercrystalYBins]);
+
+void writeABTTFFileHeader(ofstream &f, int abNum);
+void writeABSRFFileHeader(ofstream &f, int abNum);
+void writeABIOFileHeader(ofstream &f, int abNum);
+string getFlagStream(char flags[nTTInEta][nTTInPhi], int iEtaMin, int iEtaMax, int iPhiMin, int iPhiMax);
+string getABTCCInputStream(const char tccFlags[nTTInEta][nTTInPhi], int iABEta, int iABPhi, int iTCCCh);
+void getABTTPhiBounds(int iABPhi, int &iTTPhiMin, int &iTTPhiMax);
+string getABABOutputStream(const char tccFlags[nTTInEta][nTTInPhi], int iABEta, int iABPhi, int iABCh);
+string getABABInputStream(const char tccFlags[nTTInEta][nTTInPhi], int iABEta, int iABPhi, int iABCh);
 string getABDCCOutputStream(const char barrelSrFlags[nBarrelTTInEta][nTTInPhi],
-                            const char endcapSrFlags[nEndcaps][nSupercrystalXBins]
-                            [nSupercrystalYBins],
-                            int iABEta, int iABPhi, int DCCCh);
-void abConnect(int iAB,int iABCh,int& iOtherAB,int& iOtherABCh);
+                            const char endcapSrFlags[nEndcaps][nSupercrystalXBins][nSupercrystalYBins],
+                            int iABEta,
+                            int iABPhi,
+                            int DCCCh);
+void abConnect(int iAB, int iABCh, int &iOtherAB, int &iOtherABCh);
 
 int iEvent = 0;
 
 int theAB = -1;
 
-int main(int argc, char* argv[]){
+int main(int argc, char *argv[]) {
   char barrelSrFlags[nBarrelTTInEta][nTTInPhi];
-  char endcapSrFlags[nEndcaps][nEndcapXBins/5][nEndcapYBins/5];
+  char endcapSrFlags[nEndcaps][nEndcapXBins / 5][nEndcapYBins / 5];
   char ttFlags[nTTInEta][nTTInPhi];
   ofstream abTTFFiles[nAB];
   ofstream abSRFFiles[nAB];
   ofstream abIOFiles[nAB];
 
   int iarg = 0;
-  while(++iarg<argc){
-    if(strcmp(argv[iarg],"-h")==0||strcmp(argv[iarg],"--help")==0){
+  while (++iarg < argc) {
+    if (strcmp(argv[iarg], "-h") == 0 || strcmp(argv[iarg], "--help") == 0) {
       cout << "Usage: GenABIO [OPTIONS]\n\n"
-	"Produces TT and SR flag files for each SRP board from TTF.txt and "
-	"SRF.txt global flag files. Requires the SRP cross-connect description"
-	" description file (xconnect_universal.txt). TTF.txt, SRF.txt and "
-	"xconnect_universal.txt must be in the directory the command is "
-	"launched.\n\n"
-	"OPTIONS:\n"
-        "  -A, --actions IJKLMNOP. IJKLMNOP I..P integers from 0 to 7.\n"
-	"                I: action flag for low interest RUs\n"
-	"                J: action flag for single RUs\n"
-	"                K: action flag for neighbour RUs\n"
-	"                L: action flag for centers RUs\n"
-	"                M: action flag for forced low interest RUs\n"
-	"                N: action flag for forced single RUs\n"
-	"                O: action flag for forced neighbour RUs\n"
-	"                P: action flag for forced centers RUs\n\n"
-	" -h, --help display this help\n"
-	" -a n, --ab n specifies indices of the AB whose file must be "
-	"produced. The ab number runs from 1 to 12. Use -1 to produce files "
-	"for every AB\n\n"
-	;
-      
+              "Produces TT and SR flag files for each SRP board from TTF.txt "
+              "and "
+              "SRF.txt global flag files. Requires the SRP cross-connect "
+              "description"
+              " description file (xconnect_universal.txt). TTF.txt, SRF.txt and "
+              "xconnect_universal.txt must be in the directory the command is "
+              "launched.\n\n"
+              "OPTIONS:\n"
+              "  -A, --actions IJKLMNOP. IJKLMNOP I..P integers from 0 to 7.\n"
+              "                I: action flag for low interest RUs\n"
+              "                J: action flag for single RUs\n"
+              "                K: action flag for neighbour RUs\n"
+              "                L: action flag for centers RUs\n"
+              "                M: action flag for forced low interest RUs\n"
+              "                N: action flag for forced single RUs\n"
+              "                O: action flag for forced neighbour RUs\n"
+              "                P: action flag for forced centers RUs\n\n"
+              " -h, --help display this help\n"
+              " -a n, --ab n specifies indices of the AB whose file must be "
+              "produced. The ab number runs from 1 to 12. Use -1 to produce "
+              "files "
+              "for every AB\n\n";
+
       return 0;
     }
-    
-    if(!strcmp(argv[iarg],"-A") || !strcmp(argv[iarg],"-A")){//actions
-      if(++iarg>=argc){ cout << "Option error. Try -h\n"; return 1; }
-      for(int i=0; i<8; ++i){
-	int act = argv[iarg][i]-'0';
-	if(act<0 || act>=nactions){
-	  cout << "Error. Action argument is invalid.\n";
-	  return 1;
-	} else{
-	  actions[i] = (roAction_t)act;
-	}
+
+    if (!strcmp(argv[iarg], "-A") || !strcmp(argv[iarg], "-A")) {  // actions
+      if (++iarg >= argc) {
+        cout << "Option error. Try -h\n";
+        return 1;
+      }
+      for (int i = 0; i < 8; ++i) {
+        int act = argv[iarg][i] - '0';
+        if (act < 0 || act >= nactions) {
+          cout << "Error. Action argument is invalid.\n";
+          return 1;
+        } else {
+          actions[i] = (roAction_t)act;
+        }
       }
       continue;
     }
-    if(!strcmp(argv[iarg],"-a")||!strcmp(argv[iarg],"--ab")){
-      if(++iarg>=argc){ cout << "Option error. Try -h\n"; return 1; }
+    if (!strcmp(argv[iarg], "-a") || !strcmp(argv[iarg], "--ab")) {
+      if (++iarg >= argc) {
+        cout << "Option error. Try -h\n";
+        return 1;
+      }
       theAB = strtoul(argv[iarg], nullptr, 0);
-      if(theAB>=0) --theAB;
-      if(theAB<-1 || theAB>11){
-	cout << "AB number is incorrect. Try -h option to get help.\n";
+      if (theAB >= 0)
+        --theAB;
+      if (theAB < -1 || theAB > 11) {
+        cout << "AB number is incorrect. Try -h option to get help.\n";
       }
       continue;
     }
   }
 
-  for(size_t i=0; i<sizeof(srp2roFlags)/sizeof(srp2roFlags[0]); srp2roFlags[i++]='?');
-  for(size_t i=0; i<sizeof(actions)/sizeof(actions[0]); ++i){
+  for (size_t i = 0; i < sizeof(srp2roFlags) / sizeof(srp2roFlags[0]); srp2roFlags[i++] = '?')
+    ;
+  for (size_t i = 0; i < sizeof(actions) / sizeof(actions[0]); ++i) {
     srp2roFlags[(int)srpFlagMarker[i]] = roFlagMarker[actions[i]];
   }
 
-  for(int iEE=0; iEE < nEndcaps; ++iEE){
-    for(int iY = 0; iY < nSupercrystalXBins; ++iY){
-      for(int iX = 0; iX < nSupercrystalYBins; ++iX){
-	int iDCCPhi = dccPhiIndexOfRU(iEE==0?0:2,iX,iY);
-	if(iDCCPhi>=0){//SC exists
-	  ecalDccSC[iEE][iDCCPhi].push_back(pair<int,int>(iX,iY));
-	}
+  for (int iEE = 0; iEE < nEndcaps; ++iEE) {
+    for (int iY = 0; iY < nSupercrystalXBins; ++iY) {
+      for (int iX = 0; iX < nSupercrystalYBins; ++iX) {
+        int iDCCPhi = dccPhiIndexOfRU(iEE == 0 ? 0 : 2, iX, iY);
+        if (iDCCPhi >= 0) {  // SC exists
+          ecalDccSC[iEE][iDCCPhi].push_back(pair<int, int>(iX, iY));
+        }
       }
     }
   }
-  
+
   stringstream s;
-  for(int iAB=0; iAB< nAB; ++iAB){
-    if(theAB!=-1 && theAB!=iAB) continue;
+  for (int iAB = 0; iAB < nAB; ++iAB) {
+    if (theAB != -1 && theAB != iAB)
+      continue;
     s.str("");
-    s << abTTFFilePrefix << (iAB<9?"0":"") << iAB+1 << abTTFFilePostfix;
+    s << abTTFFilePrefix << (iAB < 9 ? "0" : "") << iAB + 1 << abTTFFilePostfix;
     abTTFFiles[iAB].open(s.str().c_str(), ios::out);
     writeABTTFFileHeader(abTTFFiles[iAB], iAB);
     s.str("");
-    s << abSRFFilePrefix << (iAB<9?"0":"") << iAB+1 << abSRFFilePostfix;
+    s << abSRFFilePrefix << (iAB < 9 ? "0" : "") << iAB + 1 << abSRFFilePostfix;
     abSRFFiles[iAB].open(s.str().c_str(), ios::out);
     writeABSRFFileHeader(abSRFFiles[iAB], iAB);
     s.str("");
-    s << abIOFilePrefix << (iAB<9?"0":"") << iAB+1 << abIOFilePostfix;
+    s << abIOFilePrefix << (iAB < 9 ? "0" : "") << iAB + 1 << abIOFilePostfix;
     abIOFiles[iAB].open(s.str().c_str(), ios::out);
     writeABIOFileHeader(abIOFiles[iAB], iAB);
   }
 
-  FILE* srfFile = fopen(srfFilename, "r");
-  if(srfFile==nullptr){
+  FILE *srfFile = fopen(srfFilename, "r");
+  if (srfFile == nullptr) {
     cerr << "Failed to open SRF file, " << srfFilename << endl;
     exit(EXIT_FAILURE);
   }
 
-  FILE* ttfFile = fopen(ttfFilename, "r");
-  if(ttfFile==nullptr){
+  FILE *ttfFile = fopen(ttfFilename, "r");
+  if (ttfFile == nullptr) {
     cerr << "Failed to open TTF file, " << ttfFilename << endl;
     exit(EXIT_FAILURE);
   }
-  
+
   iEvent = 0;
-  while(readSRF(srfFile,barrelSrFlags,endcapSrFlags)
-	&& readTTF(ttfFile,ttFlags)){
-    if(iEvent%100==0){
+  while (readSRF(srfFile, barrelSrFlags, endcapSrFlags) && readTTF(ttfFile, ttFlags)) {
+    if (iEvent % 100 == 0) {
       cout << "Event " << iEvent << endl;
     }
-    fillABTTFFiles(ttFlags,abTTFFiles);
+    fillABTTFFiles(ttFlags, abTTFFiles);
     fillABSRPFiles(barrelSrFlags, endcapSrFlags, abSRFFiles);
-    fillABIOFiles(ttFlags,barrelSrFlags,endcapSrFlags,abIOFiles);
+    fillABIOFiles(ttFlags, barrelSrFlags, endcapSrFlags, abIOFiles);
     ++iEvent;
   }
-  
+
   return 0;
 }
 
 /** Produces one file per AB. Each file contains the TT flags
  * the AB receives from its inputs.
  */
-void  fillABTTFFiles(const char ttFlags[nTTInEta][nTTInPhi],
-		     ofstream files[]){
-  for(int iABEta=0; iABEta<nABInEta; ++iABEta){
-    for(int iABPhi=0; iABPhi<nABInPhi; ++iABPhi){
-      int iAB = abNum(iABEta,iABPhi);
+void fillABTTFFiles(const char ttFlags[nTTInEta][nTTInPhi], ofstream files[]) {
+  for (int iABEta = 0; iABEta < nABInEta; ++iABEta) {
+    for (int iABPhi = 0; iABPhi < nABInPhi; ++iABPhi) {
+      int iAB = abNum(iABEta, iABPhi);
       int iTTPhiMin;
       int iTTPhiMax;
       getABTTPhiBounds(iABPhi, iTTPhiMin, iTTPhiMax);
       //      writeEventHeader(files[iAB], iEvent, nTTInABAlongPhi);
       files[iAB] << "# Event " << iEvent << "\n";
-      
-      for(int i = 0 ; i <= iTTEtaMax[iABEta]-iTTEtaMin[iABEta];
-	  ++i){
-	int iTTEta;
-	if(iTTEtaSign[iABEta]>0){
-	  iTTEta = iTTEtaMin[iABEta] + i;
-	} else{
-	  iTTEta = iTTEtaMax[iABEta] - i;
-	}
-	for(int iTTPhi = iTTPhiMin;
-	    mod(iTTPhiMax-iTTPhi,nTTInPhi) < nTTInABAlongPhi;
-	    iTTPhi = mod(++iTTPhi, nTTInPhi)){
-	  files[iAB] << ttFlags[iTTEta][iTTPhi];
-	}
-	files[iAB] << "\n";
+
+      for (int i = 0; i <= iTTEtaMax[iABEta] - iTTEtaMin[iABEta]; ++i) {
+        int iTTEta;
+        if (iTTEtaSign[iABEta] > 0) {
+          iTTEta = iTTEtaMin[iABEta] + i;
+        } else {
+          iTTEta = iTTEtaMax[iABEta] - i;
+        }
+        for (int iTTPhi = iTTPhiMin; mod(iTTPhiMax - iTTPhi, nTTInPhi) < nTTInABAlongPhi;
+             iTTPhi = mod(++iTTPhi, nTTInPhi)) {
+          files[iAB] << ttFlags[iTTEta][iTTPhi];
+        }
+        files[iAB] << "\n";
       }
       files[iAB] << "#\n";
-      //writeEventTrailer(files[iAB], nTTInABAlongPhi);
+      // writeEventTrailer(files[iAB], nTTInABAlongPhi);
     }
-  }  
+  }
 }
 
-void  fillABSRPFiles(const char barrelSrFlags[nBarrelTTInEta][nTTInPhi],
-		     const char endcapSrFlags[nEndcaps][nSupercrystalXBins]
-		     [nSupercrystalYBins],
-		     ofstream files[nAB]){
-  //event headers:
-  for(int iAB=0; iAB < nAB; ++iAB){
+void fillABSRPFiles(const char barrelSrFlags[nBarrelTTInEta][nTTInPhi],
+                    const char endcapSrFlags[nEndcaps][nSupercrystalXBins][nSupercrystalYBins],
+                    ofstream files[nAB]) {
+  // event headers:
+  for (int iAB = 0; iAB < nAB; ++iAB) {
     files[iAB] << "# Event " << iEvent << "\n";
   }
-  
+
   bool lineAppended[nAB];
-  for(int i=0; i< nAB; lineAppended[i++]=false)/*empty*/;
-  
-  //EE:
-  for(int iEE = 0; iEE < nEndcaps; ++iEE){
-    for(int iX = 0; iX < nSupercrystalXBins; ++iX){
-      for(int iY=0; iY < nSupercrystalYBins; ++iY){
-	//        int iDCC = dccIndex(iEE==0?0:2,iX*5,iY*5);
-	int iDCC = dccIndexOfRU(iEE==0?0:2,iX,iY);
-	if(iDCC>=0){
-	  int iAB = abOfDcc(iDCC);
-	  if(!lineAppended[iAB]){
-	    for(int i=0; i< iY; ++i) files[iAB] << ' ';
-	  }
-	  files[iAB] << srp2roFlags[(int)endcapSrFlags[iEE][iX][iY]];
-	  lineAppended[iAB] = true;
-	}
-      }//next iY
-      for(int iFile=0; iFile< nAB; ++iFile){
-	if(lineAppended[iFile]){
-	  files[iFile] << "\n";
-	  lineAppended[iFile] = false;
-	}
+  for (int i = 0; i < nAB; lineAppended[i++] = false) /*empty*/
+    ;
+
+  // EE:
+  for (int iEE = 0; iEE < nEndcaps; ++iEE) {
+    for (int iX = 0; iX < nSupercrystalXBins; ++iX) {
+      for (int iY = 0; iY < nSupercrystalYBins; ++iY) {
+        //        int iDCC = dccIndex(iEE==0?0:2,iX*5,iY*5);
+        int iDCC = dccIndexOfRU(iEE == 0 ? 0 : 2, iX, iY);
+        if (iDCC >= 0) {
+          int iAB = abOfDcc(iDCC);
+          if (!lineAppended[iAB]) {
+            for (int i = 0; i < iY; ++i)
+              files[iAB] << ' ';
+          }
+          files[iAB] << srp2roFlags[(int)endcapSrFlags[iEE][iX][iY]];
+          lineAppended[iAB] = true;
+        }
+      }  // next iY
+      for (int iFile = 0; iFile < nAB; ++iFile) {
+        if (lineAppended[iFile]) {
+          files[iFile] << "\n";
+          lineAppended[iFile] = false;
+        }
       }
-    }//next iX
+    }  // next iX
   }
-  
-  //EB:
-  for(int iABEta=1; iABEta<3; ++iABEta){
-    for(int iABPhi=0; iABPhi<nABInPhi; ++iABPhi){
-      int iAB = abNum(iABEta,iABPhi);
+
+  // EB:
+  for (int iABEta = 1; iABEta < 3; ++iABEta) {
+    for (int iABPhi = 0; iABPhi < nABInPhi; ++iABPhi) {
+      int iAB = abNum(iABEta, iABPhi);
       int iTTPhiMin;
       int iTTPhiMax;
       getABTTPhiBounds(iABPhi, iTTPhiMin, iTTPhiMax);
-      //writeEventHeader(files[iAB], iEvent, nTTInABAlongPhi);
-      for(int i = 0 ; i <= iTTEtaMax[iABEta]-iTTEtaMin[iABEta];
-	  ++i){
-	int iTTEta;
-	if(iTTEtaSign[iABEta]>0){
-	  iTTEta = iTTEtaMin[iABEta] + i;
-	} else{
-	  iTTEta = iTTEtaMax[iABEta] - i;
-	}
-	for(int iTTPhi = iTTPhiMin;
-	    mod(iTTPhiMax-iTTPhi,nTTInPhi) < nTTInABAlongPhi;
-	    iTTPhi = mod(++iTTPhi, nTTInPhi)){
-	  files[iAB] << srp2roFlags[(int)barrelSrFlags[iTTEta-nEndcapTTInEta][iTTPhi]];
-	}
-	files[iAB] << "\n";
+      // writeEventHeader(files[iAB], iEvent, nTTInABAlongPhi);
+      for (int i = 0; i <= iTTEtaMax[iABEta] - iTTEtaMin[iABEta]; ++i) {
+        int iTTEta;
+        if (iTTEtaSign[iABEta] > 0) {
+          iTTEta = iTTEtaMin[iABEta] + i;
+        } else {
+          iTTEta = iTTEtaMax[iABEta] - i;
+        }
+        for (int iTTPhi = iTTPhiMin; mod(iTTPhiMax - iTTPhi, nTTInPhi) < nTTInABAlongPhi;
+             iTTPhi = mod(++iTTPhi, nTTInPhi)) {
+          files[iAB] << srp2roFlags[(int)barrelSrFlags[iTTEta - nEndcapTTInEta][iTTPhi]];
+        }
+        files[iAB] << "\n";
       }
       //      writeEventTrailer(files[iAB], nTTInABAlongPhi);
       files[iAB] << "#\n";
     }
   }
 
-  //file trailers
-  for(int iAB=0; iAB < nAB; ++iAB){
+  // file trailers
+  for (int iAB = 0; iAB < nAB; ++iAB) {
     files[iAB] << "#\n";
   }
 }
 
-void  fillABIOFiles(const char ttFlags[nTTInEta][nTTInPhi],
-		    const char barrelSrFlags[nBarrelTTInEta][nTTInPhi],
-		    const char endcapSrFlags[nEndcaps][nSupercrystalXBins][nSupercrystalYBins],
-		    ofstream files[]){
-  for(int iABEta=0; iABEta < nABInEta; ++iABEta){
-    for(int iABPhi=0; iABPhi < nABInPhi; ++iABPhi){
+void fillABIOFiles(const char ttFlags[nTTInEta][nTTInPhi],
+                   const char barrelSrFlags[nBarrelTTInEta][nTTInPhi],
+                   const char endcapSrFlags[nEndcaps][nSupercrystalXBins][nSupercrystalYBins],
+                   ofstream files[]) {
+  for (int iABEta = 0; iABEta < nABInEta; ++iABEta) {
+    for (int iABPhi = 0; iABPhi < nABInPhi; ++iABPhi) {
       int iAB = abNum(iABEta, iABPhi);
       //      writeABIOFileHeader(files[iAB], iAB);
-      files[iAB] << "# Event " << iEvent << "\n"; 
-      //TCC inputs:
-      for(int iTCC=0; iTCC< nABTCCCh; ++iTCC){
-	files[iAB] << "ITCC" << iTCC+1 << ":"
-		   << getABTCCInputStream(ttFlags, iABEta, iABPhi, iTCC)
-		   << "\n";
+      files[iAB] << "# Event " << iEvent << "\n";
+      // TCC inputs:
+      for (int iTCC = 0; iTCC < nABTCCCh; ++iTCC) {
+        files[iAB] << "ITCC" << iTCC + 1 << ":" << getABTCCInputStream(ttFlags, iABEta, iABPhi, iTCC) << "\n";
       }
-      //AB inputs:
-      for(int iABCh=0; iABCh<nABABCh; ++iABCh){
-	files[iAB] << "IAB" <<  iABCh+1 << ":"
-		   << getABABInputStream(ttFlags, iABEta, iABPhi, iABCh)
-		   << "\n";
+      // AB inputs:
+      for (int iABCh = 0; iABCh < nABABCh; ++iABCh) {
+        files[iAB] << "IAB" << iABCh + 1 << ":" << getABABInputStream(ttFlags, iABEta, iABPhi, iABCh) << "\n";
       }
-      //AB outputs:
-      for(int iABCh=0; iABCh<nABABCh; ++iABCh){
-	files[iAB] << "OAB" <<  iABCh+1 << ":"
-		   << getABABOutputStream(ttFlags, iABEta, iABPhi, iABCh)
-		   << "\n";
+      // AB outputs:
+      for (int iABCh = 0; iABCh < nABABCh; ++iABCh) {
+        files[iAB] << "OAB" << iABCh + 1 << ":" << getABABOutputStream(ttFlags, iABEta, iABPhi, iABCh) << "\n";
       }
-      //DCC output:
-      for(int iDCCCh=0; iDCCCh<nDCCCh; ++iDCCCh){
-	files[iAB] << "ODCC";
-	files[iAB]<< (iDCCCh<=8?"0":"") << iDCCCh+1 << ":"
-		  << getABDCCOutputStream(barrelSrFlags, endcapSrFlags, iABEta, iABPhi,iDCCCh)
-		  << "\n";
+      // DCC output:
+      for (int iDCCCh = 0; iDCCCh < nDCCCh; ++iDCCCh) {
+        files[iAB] << "ODCC";
+        files[iAB] << (iDCCCh <= 8 ? "0" : "") << iDCCCh + 1 << ":"
+                   << getABDCCOutputStream(barrelSrFlags, endcapSrFlags, iABEta, iABPhi, iDCCCh) << "\n";
       }
       files[iAB] << "#\n";
     }
@@ -503,107 +496,105 @@ void  fillABIOFiles(const char ttFlags[nTTInEta][nTTInPhi],
 
 */
 
-bool readTTF(FILE* f, char ttFlags[nTTInEta][nTTInPhi]){
-  char* buffer = nullptr;
+bool readTTF(FILE *f, char ttFlags[nTTInEta][nTTInPhi]) {
+  char *buffer = nullptr;
   size_t bufferSize = 0;
   int read;
-  if(f==nullptr) exit(EXIT_FAILURE);
-  int line=0;
+  if (f == nullptr)
+    exit(EXIT_FAILURE);
+  int line = 0;
   int iEta = 0;
-  while(iEta<nTTInEta && (read=getline(&buffer, &bufferSize,f))!=-1){
+  while (iEta < nTTInEta && (read = getline(&buffer, &bufferSize, f)) != -1) {
     ++line;
-    char* pos = buffer;
-    while(*pos==' ' || *pos=='\t') ++pos; //skip spaces
-    if(*pos!='#' && *pos!='\n'){//not a comment line nor an empty line
-      if(read-1!=nTTInPhi){
-	cerr << "Error: line " << line
-	     << " of file "<< ttfFilename << " has incorrect length"
-	  //             << " (" << read-1 << " instead of " << nTTInPhi << ")"
-	     << endl;
-	exit(EXIT_FAILURE);
+    char *pos = buffer;
+    while (*pos == ' ' || *pos == '\t')
+      ++pos;                            // skip spaces
+    if (*pos != '#' && *pos != '\n') {  // not a comment line nor an empty line
+      if (read - 1 != nTTInPhi) {
+        cerr << "Error: line " << line << " of file " << ttfFilename
+             << " has incorrect length"
+             //             << " (" << read-1 << " instead of " << nTTInPhi <<
+             //             ")"
+             << endl;
+        exit(EXIT_FAILURE);
       }
-      for(int iPhi=0; iPhi<nTTInPhi; ++iPhi){
-	ttFlags[iEta][iPhi] = buffer[iPhi];
-	//         if(ttFlags[iEta][iPhi]!='.'){
-	//           cout << __FILE__ << ":" << __LINE__ << ": "
-	//                << iEta << "," << iPhi
-	//                << " " << ttFlags[iEta][iPhi] << "\n";
-	//         }
+      for (int iPhi = 0; iPhi < nTTInPhi; ++iPhi) {
+        ttFlags[iEta][iPhi] = buffer[iPhi];
+        //         if(ttFlags[iEta][iPhi]!='.'){
+        //           cout << __FILE__ << ":" << __LINE__ << ": "
+        //                << iEta << "," << iPhi
+        //                << " " << ttFlags[iEta][iPhi] << "\n";
+        //         }
       }
       ++iEta;
     }
   }
-  //returns true if all TT were read (not at end of file)
-  return (iEta==nTTInEta)?true:false;
+  // returns true if all TT were read (not at end of file)
+  return (iEta == nTTInEta) ? true : false;
 }
 
-bool readSRF(FILE* f,
-	     char barrelSrFlags[nBarrelTTInEta][nTTInPhi],
-	     char endcapSrFlags[nEndcaps][nSupercrystalXBins]
-	     [nSupercrystalYBins]){
-  char* buffer = nullptr;
+bool readSRF(FILE *f,
+             char barrelSrFlags[nBarrelTTInEta][nTTInPhi],
+             char endcapSrFlags[nEndcaps][nSupercrystalXBins][nSupercrystalYBins]) {
+  char *buffer = nullptr;
   size_t bufferSize = 0;
   int read;
-  if(f==nullptr) exit(EXIT_FAILURE);
-  int line=0;
+  if (f == nullptr)
+    exit(EXIT_FAILURE);
+  int line = 0;
   int iEta = 0;
   int iXm = 0;
   int iXp = 0;
-  int iReadLine = 0;//number of read line, comment lines excluded
-  //number of non-comment lines to read:
-  const int nReadLine = nBarrelTTInEta + nEndcaps*nSupercrystalXBins; 
-  while(iReadLine<nReadLine && (read=getline(&buffer, &bufferSize,f))!=-1){
+  int iReadLine = 0;  // number of read line, comment lines excluded
+  // number of non-comment lines to read:
+  const int nReadLine = nBarrelTTInEta + nEndcaps * nSupercrystalXBins;
+  while (iReadLine < nReadLine && (read = getline(&buffer, &bufferSize, f)) != -1) {
     ++line;
-    char* pos = buffer;
-    while(*pos==' ' || *pos=='\t') ++pos; //skip spaces
-    if(*pos!='#' && *pos!='\n'){//not a comment line nor an empty line
-      //go back to beginning of line:
+    char *pos = buffer;
+    while (*pos == ' ' || *pos == '\t')
+      ++pos;                            // skip spaces
+    if (*pos != '#' && *pos != '\n') {  // not a comment line nor an empty line
+      // go back to beginning of line:
       pos = buffer;
-      if(iReadLine<nSupercrystalXBins){//EE- reading
-	if(read-1!=nSupercrystalYBins){
-	  cerr << "Error: line " << line
-	       << " of file "<< srfFilename << " has incorrect length"
-	       << " (" << read-1 << " instead of " << nSupercrystalYBins << ")"
-	       << endl;
-	  exit(EXIT_FAILURE);
-	}
-	for(int iY=0; iY<nSupercrystalYBins; ++iY){
-	  endcapSrFlags[0][iXm][iY] = buffer[iY];
-	}
-	++iXm;
-      } else if(iReadLine<nSupercrystalYBins+nBarrelTTInEta){//EB reading
-	if(read-1!=nTTInPhi){
-	  cerr << "Error: line " << line
-	       << " of file "<< srfFilename << " has incorrect length"
-	       << " (" << read-1 << " instead of " << nTTInPhi << ")"
-	       << endl;
-	  exit(EXIT_FAILURE);
-	}
-	for(int iPhi=0; iPhi<nTTInPhi; ++iPhi){
-	  barrelSrFlags[iEta][iPhi] = buffer[iPhi];
-	}
-	++iEta;
-      } else if(iReadLine<2*nSupercrystalXBins+nBarrelTTInEta){ //EE+ reading
-	if(read-1!=nSupercrystalYBins){
-	  cerr << "Error: line " << line
-	       << " of file "<< srfFilename << " has incorrect length"
-	       << " (" << read-1 << " instead of " << nSupercrystalYBins << ")"
-	       << endl;
-	  exit(EXIT_FAILURE);
-	}
-	for(int iY=0; iY<nSupercrystalYBins; ++iY){
-	  endcapSrFlags[1][iXp][iY] = buffer[iY];
-	}
-	++iXp;
+      if (iReadLine < nSupercrystalXBins) {  // EE- reading
+        if (read - 1 != nSupercrystalYBins) {
+          cerr << "Error: line " << line << " of file " << srfFilename << " has incorrect length"
+               << " (" << read - 1 << " instead of " << nSupercrystalYBins << ")" << endl;
+          exit(EXIT_FAILURE);
+        }
+        for (int iY = 0; iY < nSupercrystalYBins; ++iY) {
+          endcapSrFlags[0][iXm][iY] = buffer[iY];
+        }
+        ++iXm;
+      } else if (iReadLine < nSupercrystalYBins + nBarrelTTInEta) {  // EB
+                                                                     // reading
+        if (read - 1 != nTTInPhi) {
+          cerr << "Error: line " << line << " of file " << srfFilename << " has incorrect length"
+               << " (" << read - 1 << " instead of " << nTTInPhi << ")" << endl;
+          exit(EXIT_FAILURE);
+        }
+        for (int iPhi = 0; iPhi < nTTInPhi; ++iPhi) {
+          barrelSrFlags[iEta][iPhi] = buffer[iPhi];
+        }
+        ++iEta;
+      } else if (iReadLine < 2 * nSupercrystalXBins + nBarrelTTInEta) {  // EE+ reading
+        if (read - 1 != nSupercrystalYBins) {
+          cerr << "Error: line " << line << " of file " << srfFilename << " has incorrect length"
+               << " (" << read - 1 << " instead of " << nSupercrystalYBins << ")" << endl;
+          exit(EXIT_FAILURE);
+        }
+        for (int iY = 0; iY < nSupercrystalYBins; ++iY) {
+          endcapSrFlags[1][iXp][iY] = buffer[iY];
+        }
+        ++iXp;
       }
-      ++iReadLine;      
-    }//not a comment or empty line
+      ++iReadLine;
+    }  // not a comment or empty line
   }
-  //returns 0 if all TT were read:
-  return (iReadLine==nReadLine)?true:false;
+  // returns 0 if all TT were read:
+  return (iReadLine == nReadLine) ? true : false;
 }
 
-
 // void writeEventHeader(ofstream& f, int iEvent, int nPhi){
 //   //event header:
 //   stringstream header;
@@ -627,245 +618,285 @@ bool readSRF(FILE* f,
 //   f << "+\n";
 // }
 
-void writeABTTFFileHeader(ofstream& f, int abNum){
+void writeABTTFFileHeader(ofstream &f, int abNum) {
   time_t t;
   time(&t);
-  const char* date = ctime(&t);
-  f << "# TTF flag map covered by AB " << abNum+1 <<"\n#\n"
-    "# Generated on : " << date << "#\n"
-    "# +---> Phi          " << srpFlagMarker[0] << ": 000 (low interest)\n"
-    "# |                  " << srpFlagMarker[1] << ": 001 (single)\n"     
-    "# |                  " << srpFlagMarker[2] << ": 010 (neighbour)\n"    
-    "# V |Eta|            " << srpFlagMarker[3] << ": 011 (center)\n"     
-    "#\n";
+  const char *date = ctime(&t);
+  f << "# TTF flag map covered by AB " << abNum + 1
+    << "\n#\n"
+       "# Generated on : "
+    << date
+    << "#\n"
+       "# +---> Phi          "
+    << srpFlagMarker[0]
+    << ": 000 (low interest)\n"
+       "# |                  "
+    << srpFlagMarker[1]
+    << ": 001 (single)\n"
+       "# |                  "
+    << srpFlagMarker[2]
+    << ": 010 (neighbour)\n"
+       "# V |Eta|            "
+    << srpFlagMarker[3]
+    << ": 011 (center)\n"
+       "#\n";
 }
 
-void writeABSRFFileHeader(ofstream& f, int abNum){
+void writeABSRFFileHeader(ofstream &f, int abNum) {
   time_t t;
   time(&t);
-  const char* date = ctime(&t);
-  const char* xLabel;
-  const char* yLabel;
-  if(abNum<3 || abNum>8){//endcap
+  const char *date = ctime(&t);
+  const char *xLabel;
+  const char *yLabel;
+  if (abNum < 3 || abNum > 8) {  // endcap
     xLabel = "Y  ";
     yLabel = "X    ";
-  } else{//barrel
+  } else {  // barrel
     xLabel = "Phi";
     yLabel = "|Eta|";
   }
-  f << "# SRF flag map covered by AB " << abNum+1 <<"\n#\n"
-    "# Generated on : " << date << "#\n"
-    "# +---> " << xLabel << "          " << roFlagMarker[0] << ": 000 (suppress)\n"          
-    "# |                  "              << roFlagMarker[1] << ": 010 (SR Threshold 2)\n"     
-    "# |                  "              << roFlagMarker[2] << ": 001 (SR Threshold 1)\n"     
-    "# V " << yLabel << "            "   << roFlagMarker[3] << ": 011 (Full readout)\n"     
-    "#\n"
-    "# action table (when forced):\n"
-    "# LI-> " << roFlagMarker[actions[0]] << " (" << roFlagMarker[actions[4]]<< ")" << "\n"
-    "# S -> " << roFlagMarker[actions[1]] << " (" << roFlagMarker[actions[5]]<< ")" << "\n"
-    "# N -> " << roFlagMarker[actions[2]] << " (" << roFlagMarker[actions[6]]<< ")" << "\n"
-    "# C -> " << roFlagMarker[actions[3]] << " (" << roFlagMarker[actions[7]]<< ")" << "\n";
+  f << "# SRF flag map covered by AB " << abNum + 1
+    << "\n#\n"
+       "# Generated on : "
+    << date
+    << "#\n"
+       "# +---> "
+    << xLabel << "          " << roFlagMarker[0]
+    << ": 000 (suppress)\n"
+       "# |                  "
+    << roFlagMarker[1]
+    << ": 010 (SR Threshold 2)\n"
+       "# |                  "
+    << roFlagMarker[2]
+    << ": 001 (SR Threshold 1)\n"
+       "# V "
+    << yLabel << "            " << roFlagMarker[3]
+    << ": 011 (Full readout)\n"
+       "#\n"
+       "# action table (when forced):\n"
+       "# LI-> "
+    << roFlagMarker[actions[0]] << " (" << roFlagMarker[actions[4]] << ")"
+    << "\n"
+       "# S -> "
+    << roFlagMarker[actions[1]] << " (" << roFlagMarker[actions[5]] << ")"
+    << "\n"
+       "# N -> "
+    << roFlagMarker[actions[2]] << " (" << roFlagMarker[actions[6]] << ")"
+    << "\n"
+       "# C -> "
+    << roFlagMarker[actions[3]] << " (" << roFlagMarker[actions[7]] << ")"
+    << "\n";
 }
 
-void writeABIOFileHeader(ofstream& f, int abNum){
+void writeABIOFileHeader(ofstream &f, int abNum) {
   time_t t;
   time(&t);
-  const char* date = ctime(&t);
-  f << "# AB " << abNum+1 <<" I/O \n#\n"
-    "# Generated on : " << date << "#\n"
-    "# " << srpFlagMarker[0] << ": 000 (low interest)   " << tccFlagMarker[0] << ": 000 (low interest)   " << roFlagMarker[0] << ": 000 (suppress)\n"
-    "# " << srpFlagMarker[1] << ": 001 (single)         " << tccFlagMarker[1] << ": 001 (mid interest)   " << roFlagMarker[1] << ": 010 (SR Threshold 2)\n"
-    "# " << srpFlagMarker[2] << ": 010 (neighbour)      " << tccFlagMarker[2] << ": 010 (not valid)      " << roFlagMarker[2] << ": 001 (SR Threshold 1)\n"   
-    "# " << srpFlagMarker[3] << ": 011 (center)         " << tccFlagMarker[3] << ": 011 (high interest)  " <<	roFlagMarker[3] << ": 011 (Full readout)\n"
-    "#\n"
-    "# action table (when forced):\n"
-    "# LI-> " << roFlagMarker[actions[0]] << " (" << roFlagMarker[actions[4]]<< ")" << "\n"
-    "# S -> " << roFlagMarker[actions[1]] << " (" << roFlagMarker[actions[5]]<< ")" << "\n"
-    "# N -> " << roFlagMarker[actions[2]] << " (" << roFlagMarker[actions[6]]<< ")" << "\n"
-    "# C -> " << roFlagMarker[actions[3]] << " (" << roFlagMarker[actions[7]]<< ")" << "\n"
-    "#\n"; 
+  const char *date = ctime(&t);
+  f << "# AB " << abNum + 1
+    << " I/O \n#\n"
+       "# Generated on : "
+    << date
+    << "#\n"
+       "# "
+    << srpFlagMarker[0] << ": 000 (low interest)   " << tccFlagMarker[0] << ": 000 (low interest)   " << roFlagMarker[0]
+    << ": 000 (suppress)\n"
+       "# "
+    << srpFlagMarker[1] << ": 001 (single)         " << tccFlagMarker[1] << ": 001 (mid interest)   " << roFlagMarker[1]
+    << ": 010 (SR Threshold 2)\n"
+       "# "
+    << srpFlagMarker[2] << ": 010 (neighbour)      " << tccFlagMarker[2] << ": 010 (not valid)      " << roFlagMarker[2]
+    << ": 001 (SR Threshold 1)\n"
+       "# "
+    << srpFlagMarker[3] << ": 011 (center)         " << tccFlagMarker[3] << ": 011 (high interest)  " << roFlagMarker[3]
+    << ": 011 (Full readout)\n"
+       "#\n"
+       "# action table (when forced):\n"
+       "# LI-> "
+    << roFlagMarker[actions[0]] << " (" << roFlagMarker[actions[4]] << ")"
+    << "\n"
+       "# S -> "
+    << roFlagMarker[actions[1]] << " (" << roFlagMarker[actions[5]] << ")"
+    << "\n"
+       "# N -> "
+    << roFlagMarker[actions[2]] << " (" << roFlagMarker[actions[6]] << ")"
+    << "\n"
+       "# C -> "
+    << roFlagMarker[actions[3]] << " (" << roFlagMarker[actions[7]] << ")"
+    << "\n"
+       "#\n";
 }
 
-string getFlagStream(const char flags[nTTInEta][nTTInPhi], int iEtaMin,
-		     int iEtaMax, int iPhiMin, int iPhiMax){
-  assert(0<=iEtaMin && iEtaMin<=iEtaMax && iEtaMax<nTTInEta);
-  if(iEtaMin<=nTTInEta/2 && iEtaMax>nTTInEta){
-    cerr << "Implementation Errror:"
-	 << __FILE__ << ":" << __LINE__ 
-	 << ": A flag stream cannot covers parts of both half-ECAL!"
-	 << endl;
+string getFlagStream(const char flags[nTTInEta][nTTInPhi], int iEtaMin, int iEtaMax, int iPhiMin, int iPhiMax) {
+  assert(0 <= iEtaMin && iEtaMin <= iEtaMax && iEtaMax < nTTInEta);
+  if (iEtaMin <= nTTInEta / 2 && iEtaMax > nTTInEta) {
+    cerr << "Implementation Errror:" << __FILE__ << ":" << __LINE__
+         << ": A flag stream cannot covers parts of both half-ECAL!" << endl;
     exit(EXIT_FAILURE);
   }
 
-  bool zPos = (iEtaMin>=nTTInEta/2);
+  bool zPos = (iEtaMin >= nTTInEta / 2);
 
   stringstream buffer;
   buffer.str("");
-  for(int jEta = 0; jEta <= iEtaMax-iEtaMin; ++jEta){
-    //loops on iEta in |eta| increasing order:
+  for (int jEta = 0; jEta <= iEtaMax - iEtaMin; ++jEta) {
+    // loops on iEta in |eta| increasing order:
     int iEta;
-    if(zPos){
+    if (zPos) {
       iEta = iEtaMin + jEta;
-    } else{
+    } else {
       iEta = iEtaMax - jEta;
     }
 
-    for(int iPhi = mod(iPhiMin,nTTInPhi);
-	mod(iPhiMax+1-iPhi,nTTInPhi) != 0;
-	iPhi = mod(++iPhi, nTTInPhi)){
+    for (int iPhi = mod(iPhiMin, nTTInPhi); mod(iPhiMax + 1 - iPhi, nTTInPhi) != 0; iPhi = mod(++iPhi, nTTInPhi)) {
       buffer << flags[iEta][iPhi];
     }
   }
-  
+
   return buffer.str();
 }
 
-string getABTCCInputStream(const char tccFlags[nTTInEta][nTTInPhi],
-			   int iABEta, int iABPhi, int iTCCCh){
-  //gets eta bounds for this tcc channel:
+string getABTCCInputStream(const char tccFlags[nTTInEta][nTTInPhi], int iABEta, int iABPhi, int iTCCCh) {
+  // gets eta bounds for this tcc channel:
   int iTCCEta;
-  if(iABEta==1 || iABEta==2){//barrel
-    if(iTCCCh>5) return ""; //only 6 TCCs per AB for barrel
-    iTCCEta =  1 + iABEta;
-  } else{//endcap
-    if(iABEta==0){//EE-
-      iTCCEta = (iTCCCh<6)?1:0;
-    } else{//EE+
-      iTCCEta = (iTCCCh<6)?4:5;
+  if (iABEta == 1 || iABEta == 2) {  // barrel
+    if (iTCCCh > 5)
+      return "";  // only 6 TCCs per AB for barrel
+    iTCCEta = 1 + iABEta;
+  } else {              // endcap
+    if (iABEta == 0) {  // EE-
+      iTCCEta = (iTCCCh < 6) ? 1 : 0;
+    } else {  // EE+
+      iTCCEta = (iTCCCh < 6) ? 4 : 5;
     }
-  }      
+  }
   int iEtaMin = iTCCEtaBounds[iTCCEta];
-  int iEtaMax = iTCCEtaBounds[iTCCEta+1]-1;
+  int iEtaMax = iTCCEtaBounds[iTCCEta + 1] - 1;
 
-  //gets phi bounds:
+  // gets phi bounds:
   int iPhiMin;
   int iPhiMax;
   getABTTPhiBounds(iABPhi, iPhiMin, iPhiMax);
-  //phi is increasing with TTC channel number
-  //a TTC covers a 4TT-wide phi-sector
-  //=>iPhiMin(iTTCCh) = iPhiMin(AB) + 4*iTTCCh for iTCCCh<6 
-  iPhiMin += 4*(iTCCCh%6);
+  // phi is increasing with TTC channel number
+  // a TTC covers a 4TT-wide phi-sector
+  //=>iPhiMin(iTTCCh) = iPhiMin(AB) + 4*iTTCCh for iTCCCh<6
+  iPhiMin += 4 * (iTCCCh % 6);
   iPhiMax = iPhiMin + 4 - 1;
-  
+
   return getFlagStream(tccFlags, iEtaMin, iEtaMax, iPhiMin, iPhiMax);
 }
 
-string getABABOutputStream(const char tccFlags[nTTInEta][nTTInPhi],
-			   int iABEta, int iABPhi, int iABCh){
+string getABABOutputStream(const char tccFlags[nTTInEta][nTTInPhi], int iABEta, int iABPhi, int iABCh) {
   stringstream buffer;
   buffer.str("");
-  bool barrel = (iABEta==1 || iABEta==2); //true for barrel, false for endcap
-  switch(iABCh){
-  case 0:
-    //to AB ch #0 are sent the 16 1st TCC flags received on TCC input Ch. 0
-    buffer << getABTCCInputStream(tccFlags, iABEta, iABPhi, 0).substr(0,16);
-    break;
-  case 1:
-    //to AB ch #1 are sent the 16 1st TCC flags received on TCC input Ch. 0 to 5:
-    for(int iTCCCh=0; iTCCCh<6; ++iTCCCh){
-      buffer <<
-	getABTCCInputStream(tccFlags, iABEta, iABPhi, iTCCCh).substr(0,16);
-    }
-    break;
-  case 2:
-    //to AB ch #2 are sent the 16 1st TCC flags received on TCC input Ch. 5:
-    buffer << getABTCCInputStream(tccFlags, iABEta, iABPhi, 5).substr(0,16);
-    break;
-  case 3:
-    //to AB ch #3 are sent TCC flags received on TCC input Ch. 0 and 6:
-    buffer << getABTCCInputStream(tccFlags, iABEta, iABPhi, 0);
-    buffer << getABTCCInputStream(tccFlags, iABEta, iABPhi, 6);
-    break;
-  case 4:
-    //to AB ch #4 are sent TCC flags received on TCC input Ch 5 and 11:
-    buffer << getABTCCInputStream(tccFlags, iABEta, iABPhi, 5);
-    buffer << getABTCCInputStream(tccFlags, iABEta, iABPhi, 11);
-    break;
-  case 5:
-    //for endcaps AB output ch 5 is not used.
-    //for barrel, to AB ch #5 are sent the 16 last TCC flags received on TCC
-    //input Ch. 0:
-    if(barrel){//in barrel
-      string s = getABTCCInputStream(tccFlags, iABEta, iABPhi, 0);
-      assert(s.size()>=16);
-      buffer << s.substr(s.size()-16,16);
-    }
-    break;
-  case 6:
-    //for endcaps AB output ch 6 is not used.
-    //for barrel, to AB ch #6 are sent the 16 last TCC flags received on TCC
-    //input Ch. 0 to 5:
-    if(barrel){//in barrel
-      for(int iTCCCh=0; iTCCCh<6; ++iTCCCh){
-	string s = getABTCCInputStream(tccFlags, iABEta, iABPhi, iTCCCh); 
-	buffer << s.substr(s.size()-16,16);
+  bool barrel = (iABEta == 1 || iABEta == 2);  // true for barrel, false for endcap
+  switch (iABCh) {
+    case 0:
+      // to AB ch #0 are sent the 16 1st TCC flags received on TCC input Ch. 0
+      buffer << getABTCCInputStream(tccFlags, iABEta, iABPhi, 0).substr(0, 16);
+      break;
+    case 1:
+      // to AB ch #1 are sent the 16 1st TCC flags received on TCC input Ch. 0 to
+      // 5:
+      for (int iTCCCh = 0; iTCCCh < 6; ++iTCCCh) {
+        buffer << getABTCCInputStream(tccFlags, iABEta, iABPhi, iTCCCh).substr(0, 16);
       }
-    }
-    break;
-  case 7:
-    //for endcaps AB output ch 7 is not used.
-    //for barrel, to AB ch #7 are sent the 16 last TCC flags received on TCC
-    //input Ch. 5:
-    if(barrel){//in barrel
-      string s = getABTCCInputStream(tccFlags, iABEta, iABPhi, 5);
-      assert(s.size()>=16);
-      buffer << s.substr(s.size()-16,16);
-    }
-    break;
-  default:
-    assert(false);
+      break;
+    case 2:
+      // to AB ch #2 are sent the 16 1st TCC flags received on TCC input Ch. 5:
+      buffer << getABTCCInputStream(tccFlags, iABEta, iABPhi, 5).substr(0, 16);
+      break;
+    case 3:
+      // to AB ch #3 are sent TCC flags received on TCC input Ch. 0 and 6:
+      buffer << getABTCCInputStream(tccFlags, iABEta, iABPhi, 0);
+      buffer << getABTCCInputStream(tccFlags, iABEta, iABPhi, 6);
+      break;
+    case 4:
+      // to AB ch #4 are sent TCC flags received on TCC input Ch 5 and 11:
+      buffer << getABTCCInputStream(tccFlags, iABEta, iABPhi, 5);
+      buffer << getABTCCInputStream(tccFlags, iABEta, iABPhi, 11);
+      break;
+    case 5:
+      // for endcaps AB output ch 5 is not used.
+      // for barrel, to AB ch #5 are sent the 16 last TCC flags received on TCC
+      // input Ch. 0:
+      if (barrel) {  // in barrel
+        string s = getABTCCInputStream(tccFlags, iABEta, iABPhi, 0);
+        assert(s.size() >= 16);
+        buffer << s.substr(s.size() - 16, 16);
+      }
+      break;
+    case 6:
+      // for endcaps AB output ch 6 is not used.
+      // for barrel, to AB ch #6 are sent the 16 last TCC flags received on TCC
+      // input Ch. 0 to 5:
+      if (barrel) {  // in barrel
+        for (int iTCCCh = 0; iTCCCh < 6; ++iTCCCh) {
+          string s = getABTCCInputStream(tccFlags, iABEta, iABPhi, iTCCCh);
+          buffer << s.substr(s.size() - 16, 16);
+        }
+      }
+      break;
+    case 7:
+      // for endcaps AB output ch 7 is not used.
+      // for barrel, to AB ch #7 are sent the 16 last TCC flags received on TCC
+      // input Ch. 5:
+      if (barrel) {  // in barrel
+        string s = getABTCCInputStream(tccFlags, iABEta, iABPhi, 5);
+        assert(s.size() >= 16);
+        buffer << s.substr(s.size() - 16, 16);
+      }
+      break;
+    default:
+      assert(false);
   }
   return buffer.str();
 }
 
-string getABABInputStream(const char tccFlags[nTTInEta][nTTInPhi], int iABEta, 
-			  int iABPhi, int iABCh){
+string getABABInputStream(const char tccFlags[nTTInEta][nTTInPhi], int iABEta, int iABPhi, int iABCh) {
   int iAB = abNum(iABEta, iABPhi);
-  int iOtherAB; //AB which this channel is connected to
-  int iOtherABCh; //ch # on the other side of the AB-AB link
-  abConnect(iAB,iABCh,iOtherAB,iOtherABCh);
-  int iOtherABEta = iOtherAB/3;
-  int iOtherABPhi = iOtherAB%3;
+  int iOtherAB;    // AB which this channel is connected to
+  int iOtherABCh;  // ch # on the other side of the AB-AB link
+  abConnect(iAB, iABCh, iOtherAB, iOtherABCh);
+  int iOtherABEta = iOtherAB / 3;
+  int iOtherABPhi = iOtherAB % 3;
   return getABABOutputStream(tccFlags, iOtherABEta, iOtherABPhi, iOtherABCh);
 }
 
-
-void getABTTPhiBounds(int iABPhi, int& iTTPhiMin, int& iTTPhiMax){
-  iTTPhiMin = mod(-6+iABPhi*nTTInABAlongPhi,nTTInPhi);
-  iTTPhiMax = mod(iTTPhiMin+nTTInABAlongPhi-1, nTTInPhi);
+void getABTTPhiBounds(int iABPhi, int &iTTPhiMin, int &iTTPhiMax) {
+  iTTPhiMin = mod(-6 + iABPhi * nTTInABAlongPhi, nTTInPhi);
+  iTTPhiMax = mod(iTTPhiMin + nTTInABAlongPhi - 1, nTTInPhi);
 }
 
-void abConnect(int iAB,int iABCh,int& iOtherAB,int& iOtherABCh){
+void abConnect(int iAB, int iABCh, int &iOtherAB, int &iOtherABCh) {
   static bool firstCall = true;
   static int xconnectMap[nAB][nABABCh][2];
-  if(firstCall){
-    FILE* f = fopen(xconnectFilename, "r");
-    if(f==nullptr){
-      cerr << "Error. Failed to open xconnect definition file,"
-	   << xconnectFilename << endl;
+  if (firstCall) {
+    FILE *f = fopen(xconnectFilename, "r");
+    if (f == nullptr) {
+      cerr << "Error. Failed to open xconnect definition file," << xconnectFilename << endl;
       exit(EXIT_FAILURE);
     }
-    //skips two first lines:
-    for(int i=0; i<2; ++i){
+    // skips two first lines:
+    for (int i = 0; i < 2; ++i) {
       int c;
-      while((c=getc(f))!='\n' && c >=0);
+      while ((c = getc(f)) != '\n' && c >= 0)
+        ;
     }
-    int ilink = 0 ;
-    while(!feof(f)){
+    int ilink = 0;
+    while (!feof(f)) {
       int abIn;
       int pinIn;
       int abOut;
       int pinOut;
-      if(4==fscanf(f, "%d\t%d\t%d\t%d", &abIn, &pinIn, &abOut, &pinOut)){
-	xconnectMap[abIn][pinIn][0] = abOut;
-	xconnectMap[abIn][pinIn][1] = pinOut;
-	++ilink;
+      if (4 == fscanf(f, "%d\t%d\t%d\t%d", &abIn, &pinIn, &abOut, &pinOut)) {
+        xconnectMap[abIn][pinIn][0] = abOut;
+        xconnectMap[abIn][pinIn][1] = pinOut;
+        ++ilink;
       }
     }
-    if(ilink!=nAB*nABABCh){
+    if (ilink != nAB * nABABCh) {
       cerr << "Error cross-connect definition file " << xconnectFilename
-	   << " contains an unexpected number of link definition."
-	   << endl;
+           << " contains an unexpected number of link definition." << endl;
       exit(EXIT_FAILURE);
     }
     firstCall = false;
@@ -876,32 +907,33 @@ void abConnect(int iAB,int iABCh,int& iOtherAB,int& iOtherABCh){
 }
 
 string getABDCCOutputStream(const char barrelSrFlags[nBarrelTTInEta][nTTInPhi],
-			    const char endcapSrFlags[nEndcaps][nSupercrystalXBins]
-			    [nSupercrystalYBins],
-			    int iABEta, int iABPhi, int iDCCCh){
-  bool barrel = (iABEta==1||iABEta==2);
-  if(barrel){
-    //same as TCC with same ch number but with TCC flags replaced by SRP flags:
-    string stream = getABTCCInputStream(barrelSrFlags-nEndcapTTInEta, iABEta, iABPhi, iDCCCh);
-    //converts srp flags to readout flags:
-    for(size_t i=0; i< stream.size(); ++i){
+                            const char endcapSrFlags[nEndcaps][nSupercrystalXBins][nSupercrystalYBins],
+                            int iABEta,
+                            int iABPhi,
+                            int iDCCCh) {
+  bool barrel = (iABEta == 1 || iABEta == 2);
+  if (barrel) {
+    // same as TCC with same ch number but with TCC flags replaced by SRP flags:
+    string stream = getABTCCInputStream(barrelSrFlags - nEndcapTTInEta, iABEta, iABPhi, iDCCCh);
+    // converts srp flags to readout flags:
+    for (size_t i = 0; i < stream.size(); ++i) {
       stream[i] = srp2roFlags[(int)stream[i]];
     }
     return stream;
-  } else{//endcap
-    if(iDCCCh<3){//used DCC output channel
-      //endcap index:
-      int iEE=(iABEta==0)?0:1;
+  } else {             // endcap
+    if (iDCCCh < 3) {  // used DCC output channel
+      // endcap index:
+      int iEE = (iABEta == 0) ? 0 : 1;
       stringstream buffer("");
-      //3 DCC per AB and AB DCC output channel in
-      //increasing DCC phi position:
-      int iDCCPhi = iABPhi*3+iDCCCh;
-      for(size_t iSC=0; iSC < ecalDccSC[iEE][iDCCPhi].size(); ++iSC){
-	pair<int,int> sc = ecalDccSC[iEE][iDCCPhi][iSC];
-	buffer << srp2roFlags[(int)endcapSrFlags[iEE][sc.first][sc.second]];
+      // 3 DCC per AB and AB DCC output channel in
+      // increasing DCC phi position:
+      int iDCCPhi = iABPhi * 3 + iDCCCh;
+      for (size_t iSC = 0; iSC < ecalDccSC[iEE][iDCCPhi].size(); ++iSC) {
+        pair<int, int> sc = ecalDccSC[iEE][iDCCPhi][iSC];
+        buffer << srp2roFlags[(int)endcapSrFlags[iEE][sc.first][sc.second]];
       }
       return buffer.str();
-    } else{//unused output channel
+    } else {  // unused output channel
       return "";
     }
   }
diff --git a/SimCalorimetry/EcalElectronicsEmulation/bin/ecalDccMap.h b/SimCalorimetry/EcalElectronicsEmulation/bin/ecalDccMap.h
index 906b83a86e6e4..dc7db6ef31c01 100644
--- a/SimCalorimetry/EcalElectronicsEmulation/bin/ecalDccMap.h
+++ b/SimCalorimetry/EcalElectronicsEmulation/bin/ecalDccMap.h
@@ -1,32 +1,32 @@
 #include <iostream>
 
-template<class T>
-T mod(const T& a, const T& b){
-  T c = a%b;
-  return c<0?c+b:c;
+template <class T>
+T mod(const T &a, const T &b) {
+  T c = a % b;
+  return c < 0 ? c + b : c;
 }
 
 static const char endcapDccMap[401] = {
-  "       777777       "      
-  "    666777777888    "      
-  "   66667777778888   "      
-  "  6666667777888888  "
-  " 666666677778888888 "
-  " 566666677778888880 "             //    Z          
-  " 555666667788888000 "             //     x-----> X 
-  "55555566677888000000"             //     |         
-  "555555566  880000000"             //     |         
-  "55555555    00000000"//_          //     |         
-  "55555554    10000000"             //     V Y       
-  "554444444  111111100"
-  "44444444332211111111"
-  " 444444333222111111 "
-  " 444443333222211111 "
-  " 444433333222221111 "
-  "  4443333322222111  "
-  "   43333332222221   "
-  "    333333222222    "
-  "       333222       "};
+    "       777777       "
+    "    666777777888    "
+    "   66667777778888   "
+    "  6666667777888888  "
+    " 666666677778888888 "
+    " 566666677778888880 "  //    Z
+    " 555666667788888000 "  //     x-----> X
+    "55555566677888000000"  //     |
+    "555555566  880000000"  //     |
+    "55555555    00000000"  //_          // |
+    "55555554    10000000"  //     V Y
+    "554444444  111111100"
+    "44444444332211111111"
+    " 444444333222111111 "
+    " 444443333222211111 "
+    " 444433333222221111 "
+    "  4443333322222111  "
+    "   43333332222221   "
+    "    333333222222    "
+    "       333222       "};
 
 /** Gets the phi index of the DCC reading a RU (SC or TT)
  * @param iDet 0 for EE-, 1 for EB, 2 for EE+
@@ -35,17 +35,16 @@ static const char endcapDccMap[401] = {
  * @return DCC phi index between 0 and 8 for EE
  * and between 0 and 17 for EB
  */
-inline int dccPhiIndexOfRU(int iDet, int i, int j){
-  if(iDet==1){//barrel
-    //iEta=i, iPhi=j
-    //phi edge of a SM is 4 TT
-    return j/4;
+inline int dccPhiIndexOfRU(int iDet, int i, int j) {
+  if (iDet == 1) {  // barrel
+    // iEta=i, iPhi=j
+    // phi edge of a SM is 4 TT
+    return j / 4;
   }
-  char flag=endcapDccMap[i+j*20];
-  return (flag==' ')?-1:(flag-'0');
+  char flag = endcapDccMap[i + j * 20];
+  return (flag == ' ') ? -1 : (flag - '0');
 }
 
-
 /** Gets the phi index of the DCC reading a crystal
  * @param iDet 0 for EE-, 1 for EB, 2 for EE+
  * @param i iEta or iX
@@ -53,73 +52,74 @@ inline int dccPhiIndexOfRU(int iDet, int i, int j){
  * @return DCC phi index between 0 and 8 for EE
  * and between 0 and 17 for EB
  */
-inline int dccPhiIndex(int iDet, int i, int j){
-  return dccPhiIndexOfRU(iDet, i/5, j/5);
-}
+inline int dccPhiIndex(int iDet, int i, int j) { return dccPhiIndexOfRU(iDet, i / 5, j / 5); }
 
 /** Gets the index of the DCC reading a crystal
  * @param iDet 0 for EE-, 1 for EB, 2 for EE+
  * @param i iEta or iX
  * @param j iPhi or iY
- * @return DCC index between 0 and 53 
+ * @return DCC index between 0 and 53
  */
-inline int dccIndex(int iDet, int i, int j){
-  if(iDet==1){//barrel
-    //a SM is 85 crystal long:
-    int iEtaSM = i/85;
-    //a SM is 20 crystal wide:
-    int iPhiSM = j/20;
-    //DCC numbers start at 9 in the barrel and there 18 DCC/SM
-    return 9+18*iEtaSM+iPhiSM;
+inline int dccIndex(int iDet, int i, int j) {
+  if (iDet == 1) {  // barrel
+    // a SM is 85 crystal long:
+    int iEtaSM = i / 85;
+    // a SM is 20 crystal wide:
+    int iPhiSM = j / 20;
+    // DCC numbers start at 9 in the barrel and there 18 DCC/SM
+    return 9 + 18 * iEtaSM + iPhiSM;
   }
   int iPhi = dccPhiIndex(iDet, i, j);
-  if(iPhi<0) return -1;
-  //34 DCCs in barrel and 8 in EE-=>in EE+ DCC numbering starts at 45,
-  //iDet/2 is 0 for EE- and 1 for EE+:
-  return iPhi+iDet/2*45;
+  if (iPhi < 0)
+    return -1;
+  // 34 DCCs in barrel and 8 in EE-=>in EE+ DCC numbering starts at 45,
+  // iDet/2 is 0 for EE- and 1 for EE+:
+  return iPhi + iDet / 2 * 45;
 }
 
 /** Gets the index of the DCC reading a crystal
  * @param iDet 0 for EE-, 1 for EB, 2 for EE+
  * @param i iEta (staring at eta=-1.48)  or iX
  * @param j iPhi or iY
- * @return DCC index between 0 and 53 
+ * @return DCC index between 0 and 53
  */
-inline int dccIndexOfRU(int iDet, int i, int j){
-  if(iDet==1){//barrel
-    //a SM is 17 RU long:
-    int iEtaSM = i/17;
-    //a SM is 4 RU wide:
-    int iPhiSM = j/4;
-    //DCC numbers start at 9 in the barrel and there 18 DCC/SM
-    return 9+18*iEtaSM+iPhiSM;
+inline int dccIndexOfRU(int iDet, int i, int j) {
+  if (iDet == 1) {  // barrel
+    // a SM is 17 RU long:
+    int iEtaSM = i / 17;
+    // a SM is 4 RU wide:
+    int iPhiSM = j / 4;
+    // DCC numbers start at 9 in the barrel and there 18 DCC/SM
+    return 9 + 18 * iEtaSM + iPhiSM;
   }
   int iPhi = dccPhiIndexOfRU(iDet, i, j);
-  if(iPhi<0) return -1;
-  //34 DCCs in barrel and 8 in EE-=>in EE+ DCC numbering starts at 45,
-  //iDet/2 is 0 for EE- and 1 for EE+:
-  return iPhi+iDet/2*45;
+  if (iPhi < 0)
+    return -1;
+  // 34 DCCs in barrel and 8 in EE-=>in EE+ DCC numbering starts at 45,
+  // iDet/2 is 0 for EE- and 1 for EE+:
+  return iPhi + iDet / 2 * 45;
 }
 
-inline int abOfDcc(int iDCC){
-  if(iDCC<0||iDCC>54) return -1;
-  if(iDCC<9){//EE-
-    return iDCC/3;
-  } else if(iDCC<27){//EB-
-    //an EB AB is made of 6 DCCs,
-    //first EB- AB is numbered 3
-    //and "1st" DCC of AB 3 is DCC 26
+inline int abOfDcc(int iDCC) {
+  if (iDCC < 0 || iDCC > 54)
+    return -1;
+  if (iDCC < 9) {  // EE-
+    return iDCC / 3;
+  } else if (iDCC < 27) {  // EB-
+    // an EB AB is made of 6 DCCs,
+    // first EB- AB is numbered 3
+    // and "1st" DCC of AB 3 is DCC 26
     //(AB 3 made of DCCs 26,9,10,11,12,13):
-    return 3+mod(iDCC-26,18)/6;
-  } else if(iDCC<45){//EB+
-    //an EB AB is made of 6 DCCs,
-    //first EB+ AB is numbered 6
-    //and "1st" DCC of AB6 is DCC 44
+    return 3 + mod(iDCC - 26, 18) / 6;
+  } else if (iDCC < 45) {  // EB+
+    // an EB AB is made of 6 DCCs,
+    // first EB+ AB is numbered 6
+    // and "1st" DCC of AB6 is DCC 44
     //(AB 6 made of DCCs 44,27,28,29,30,31):
-    return 6+mod(iDCC-44,18)/6;
-  } else{//EE+
-    //AB numbering starts at DCC=45 and runs along phi in increasing phi
-    //first EE+ AB is numbered 9:
-    return 9+(iDCC-45)/3;
+    return 6 + mod(iDCC - 44, 18) / 6;
+  } else {  // EE+
+    // AB numbering starts at DCC=45 and runs along phi in increasing phi
+    // first EE+ AB is numbered 9:
+    return 9 + (iDCC - 45) / 3;
   }
 }
diff --git a/SimCalorimetry/EcalElectronicsEmulation/interface/EcalFEtoDigi.h b/SimCalorimetry/EcalElectronicsEmulation/interface/EcalFEtoDigi.h
index b4606d6569681..7579280adb433 100644
--- a/SimCalorimetry/EcalElectronicsEmulation/interface/EcalFEtoDigi.h
+++ b/SimCalorimetry/EcalElectronicsEmulation/interface/EcalFEtoDigi.h
@@ -8,50 +8,47 @@
  * Created:  Thu Feb 22 11:32:53 CET 2007
  */
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/one/EDProducer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/one/EDProducer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
-//#include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h" 
+//#include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h"
 
-#include <memory>
-#include <iostream>
 #include <fstream>
-#include <vector>
 #include <iomanip>
+#include <iostream>
+#include <memory>
+#include <vector>
 
 #include "SimCalorimetry/EcalElectronicsEmulation/interface/TCCinput.h"
 
-struct TCCinput; 
+struct TCCinput;
 typedef std::vector<TCCinput> TCCInputData;
-static const int N_SM = 36; //number of ecal barrel supermodules
+static const int N_SM = 36;  // number of ecal barrel supermodules
 
 class EcalFEtoDigi : public edm::one::EDProducer<> {
-
 public:
+  explicit EcalFEtoDigi(const edm::ParameterSet &);
+  ~EcalFEtoDigi() override {}
 
-  explicit EcalFEtoDigi(const edm::ParameterSet&);
-  ~EcalFEtoDigi() override{}
-  
 private:
-
-  void beginJob() override ;
-  void produce(edm::Event&, const edm::EventSetup&) override;
+  void beginJob() override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
   void endJob() override;
 
   void readInput();
-  EcalTrigTowerDetId         create_TTDetId (TCCinput);
-  EcalTriggerPrimitiveSample create_TPSample(TCCinput, const edm::EventSetup&);
-  EcalTriggerPrimitiveSample create_TPSampleTcp(TCCinput, const edm::EventSetup&);
+  EcalTrigTowerDetId create_TTDetId(TCCinput);
+  EcalTriggerPrimitiveSample create_TPSample(TCCinput, const edm::EventSetup &);
+  EcalTriggerPrimitiveSample create_TPSampleTcp(TCCinput, const edm::EventSetup &);
   int SMidToTCCid(const int) const;
-  void getLUT(unsigned int * lut, const int towerId,  const edm::EventSetup&) const ;
+  void getLUT(unsigned int *lut, const int towerId, const edm::EventSetup &) const;
 
   TCCInputData inputdata_[N_SM];
 
@@ -63,7 +60,6 @@ class EcalFEtoDigi : public edm::one::EDProducer<> {
   int fileEventOffset_;
   bool debug_;
   std::ofstream outfile;
-
 };
 
 #endif
diff --git a/SimCalorimetry/EcalElectronicsEmulation/interface/EcalSimRawData.h b/SimCalorimetry/EcalElectronicsEmulation/interface/EcalSimRawData.h
index 115388080500d..e3205ec6fbeb3 100644
--- a/SimCalorimetry/EcalElectronicsEmulation/interface/EcalSimRawData.h
+++ b/SimCalorimetry/EcalElectronicsEmulation/interface/EcalSimRawData.h
@@ -1,16 +1,15 @@
-/*  
+/*
  */
 
+#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
-#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
-#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloTopology/interface/EcalTrigTowerConstituentsMap.h"
 #include "SimCalorimetry/EcalSelectiveReadoutAlgos/src/EcalSelectiveReadout.h"
-#include <string>
 #include <fstream>
+#include <string>
 
 /** The EcalSimRawData CMSSW module produces raw data from digis. The raw data
  * are written into files which can be loaded into the TCC DCC and SRP boards
@@ -25,25 +24,27 @@
  *    <LI>string EBSrFlagCollection: EB SR flags product instance name</LI>
  *    <LI>string EESrFlagCollection: EE SR flags product instance name</LI>
  *    <LI>string trigPrimProducer: trigger primitive digi label"</LI>
- *    <LI>string trigPrimDigiCollection: trigger primitive digi product instance name</LI>
- *    <LI>string tcpPrimDigiCollection: TCP FENIX output trigger primitive digi product instance name</LI>
- *    <LI>string writeMode: output format. "write", "littleEndian", "bigEndian"
- *    <LI>untracked bool tpVerbose: make verbose the trigger primitive processing</LI>
- *    <LI>untracked bool xtalVerbose: make verbose the crystal digi processing</LI>
- *    <LI>untracked int32 dccNum: Id of the dcc raw data must be produced for. -1 means every DCC</LI>
- *    <LI>untracked int32 tccNum: Id of the tcc raw data must be produced for. -1 means every TCC</LI>
- *    <LI>untracked bool tcc2dccData: switch for TCC->DCC data stream production</LI>
- *    <LI>untracked bool srp2dccData: switch for SRP->DCC data stream production</LI>
- *    <LI>untracked int32 tccInDefaultVal: default TriggerPrimitive values if the trigger tower is abscent</LI>
+ *    <LI>string trigPrimDigiCollection: trigger primitive digi product instance
+ * name</LI> <LI>string tcpPrimDigiCollection: TCP FENIX output trigger
+ * primitive digi product instance name</LI> <LI>string writeMode: output
+ * format. "write", "littleEndian", "bigEndian" <LI>untracked bool tpVerbose:
+ * make verbose the trigger primitive processing</LI> <LI>untracked bool
+ * xtalVerbose: make verbose the crystal digi processing</LI> <LI>untracked
+ * int32 dccNum: Id of the dcc raw data must be produced for. -1 means every
+ * DCC</LI> <LI>untracked int32 tccNum: Id of the tcc raw data must be produced
+ * for. -1 means every TCC</LI> <LI>untracked bool tcc2dccData: switch for
+ * TCC->DCC data stream production</LI> <LI>untracked bool srp2dccData: switch
+ * for SRP->DCC data stream production</LI> <LI>untracked int32 tccInDefaultVal:
+ * default TriggerPrimitive values if the trigger tower is abscent</LI>
  *    <LI>untracked string outputBaseName: basename for output files</LI>
  *    </UL>
  */
-class EcalSimRawData: public edm::one::EDAnalyzer<> {
-  public:
+class EcalSimRawData : public edm::one::EDAnalyzer<> {
+public:
   /** Constructor
    * @param pset CMSSW configuration
    */
-  explicit EcalSimRawData(const edm::ParameterSet& pset);
+  explicit EcalSimRawData(const edm::ParameterSet &pset);
 
   /** Destructor
    */
@@ -52,10 +53,9 @@ class EcalSimRawData: public edm::one::EDAnalyzer<> {
   /** Main method. Called back for each event. This method produced the
    * raw data and write them to disk.
    */
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
 private:
-
   int iEvent;
 
   /** Number of crystals in ECAL barrel along eta
@@ -91,7 +91,7 @@ class EcalSimRawData: public edm::one::EDAnalyzer<> {
   static const int nScY = 20;
 
   /* Edge size of a barrel TT in num. of crystals
-  */
+   */
   static const int ttEdge = 5;
 
   /** Number of TTs along SM phi
@@ -104,11 +104,11 @@ class EcalSimRawData: public edm::one::EDAnalyzer<> {
 
   /** Number of TTs along Ecal Phi
    */
-  static const int nTtPhi = nEbPhi/ttEdge;//72
+  static const int nTtPhi = nEbPhi / ttEdge;  // 72
 
   /** Number of TTs along Ecal barrel eta
    */
-  static const int nEbTtEta = nEbEta/ttEdge;//34
+  static const int nEbTtEta = nEbEta / ttEdge;  // 34
 
   /** Number of TTs along eta for one endcap.
    */
@@ -116,7 +116,7 @@ class EcalSimRawData: public edm::one::EDAnalyzer<> {
 
   /** Number of TTs along ECAL eta
    */
-  static const int nTtEta = nEbTtEta+2*nEeTtEta;//56
+  static const int nTtEta = nEbTtEta + 2 * nEeTtEta;  // 56
 
   /** Number of barrel DCCs along Phi
    */
@@ -143,11 +143,11 @@ class EcalSimRawData: public edm::one::EDAnalyzer<> {
   static const int ebDccPhiEdge = 20;
 
   /** Number of trigger towers alng phi covered by a DCC
-   */ 
+   */
   static const int nTtPhisPerEbDcc = 4;
 
   /** Number of trigger towers alng phi covered by a TCC
-   */ 
+   */
   static const int nTtPhisPerEbTcc = 4;
 
   /** Number of barrel trigger tower types (in term of VFE card orientation)
@@ -182,44 +182,41 @@ class EcalSimRawData: public edm::one::EDAnalyzer<> {
    * control software.</I>
    * </UL>
    */
-  enum writeMode_t {littleEndian, bigEndian, ascii};
-  
+  enum writeMode_t { littleEndian, bigEndian, ascii };
+
 private:
   /*
   const EBDigiCollection*
   getEBDigis(const edm::Event& event) const;
-  
+
   const EEDigiCollection*
   getEEDigis(const edm::Event& event) const;
 
   const EcalTrigPrimDigiCollection*
   getTrigPrims(const edm::Event& event) const;
   */
-  
+
   /// call these once an event, to make sure everything
   /// is up-to-date
-  void
-  checkGeometry(const edm::EventSetup& eventSetup);
-  void
-  checkTriggerMap(const edm::EventSetup& eventSetup);
+  void checkGeometry(const edm::EventSetup &eventSetup);
+  void checkTriggerMap(const edm::EventSetup &eventSetup);
 
   /** Converts std CMSSW crystal eta index into a c-index (contiguous integer
    * starting from 0 and increasing with pseudo-rapidity).
    * @param iEta std CMSSW crystal eta index
    * @return the c-array index
    */
-  int iEta2cIndex(int iEta) const{
-    return (iEta<0)?iEta+85:iEta+84;
-  }
+  int iEta2cIndex(int iEta) const { return (iEta < 0) ? iEta + 85 : iEta + 84; }
 
   /** Converts std CMSSW crystal phi index into a c-index (contiguous integer
    * starting from 0 at phi=0deg and increasing with phi).
    * @param iPhi std CMSSW crystal phi index
    * @return the c-array index
    */
-  int iPhi2cIndex(int iPhi) const{
-    int iPhi0 = iPhi -11;
-    if(iPhi0<0) iPhi0+=nEbPhi;
+  int iPhi2cIndex(int iPhi) const {
+    int iPhi0 = iPhi - 11;
+    if (iPhi0 < 0)
+      iPhi0 += nEbPhi;
     return iPhi0;
   }
 
@@ -229,34 +226,26 @@ class EcalSimRawData: public edm::one::EDAnalyzer<> {
    * @param iEta std CMSSW trigger tower eta index
    * @return the c-array index
    */
-  int iTtEta2cIndex(int iTtEta) const{
-    return (iTtEta<0)?(iTtEta+28):(iTtEta+27);
-  }
+  int iTtEta2cIndex(int iTtEta) const { return (iTtEta < 0) ? (iTtEta + 28) : (iTtEta + 27); }
 
   /** Converse of iTtEta2cIndex
    * @param iTtEta0 c eta index of TT
    * @param std CMSSW TT eta index
    */
-  int cIndex2iTtEta(int iTtEta0) const{
-    return (iTtEta0<28)?(iTtEta0-28):(iTtEta0-27);
-  }
+  int cIndex2iTtEta(int iTtEta0) const { return (iTtEta0 < 28) ? (iTtEta0 - 28) : (iTtEta0 - 27); }
 
   /** Converse of iTtPhi2cIndex
    * @param iTtPhi0 phi index of TT
    * @return std CMSS TT index
    */
-  int cIndex2TtPhi(int iTtPhi0) const{
-    return iTtPhi0+1;
-  }
-  
+  int cIndex2TtPhi(int iTtPhi0) const { return iTtPhi0 + 1; }
+
   /** Converts std CMSSW ECAL trigger tower phi index into a c-index
    * (contiguous integer starting from 0 at phi=0deg and increasing with phi).
    * @param iPhi std CMSSW ECAL trigger tower phi index
    * @return the c-array index
    */
-  int iTtPhi2cIndex(int iTtPhi) const{
-    return iTtPhi-1;
-  }
+  int iTtPhi2cIndex(int iTtPhi) const { return iTtPhi - 1; }
 
   /*
     int iXY2cIndex(int iX) const{
@@ -273,13 +262,12 @@ class EcalSimRawData: public edm::one::EDAnalyzer<> {
    * @param [out] iEta0 eta c index of the channel
    * @param [out] iPhi0 eta c index of the channel
    */
-  void elec2GeomNum(int ittEta0, int ittPhi0, int strip1,
-		    int ch1, int& iEta0, int& iPhi0) const;
+  void elec2GeomNum(int ittEta0, int ittPhi0, int strip1, int ch1, int &iEta0, int &iPhi0) const;
 
   /* Set horizontal parity of a 16-bit word of FE data
    * @param a the word whose parity must be set.
    */
-  void setHParity(uint16_t& a) const;
+  void setHParity(uint16_t &a) const;
 
   /** Generates FE crystal data
    * @param basename base for the output file name. DCC number is appended to
@@ -287,9 +275,7 @@ class EcalSimRawData: public edm::one::EDAnalyzer<> {
    * @param iEvent event index
    * @param adcCount the payload, the ADC count of the channels.
    */
-  void genFeData(std::string basename, int iEvent,
-		 const std::vector<uint16_t> adcCount[nEbEta][nEbPhi]) const;
-
+  void genFeData(std::string basename, int iEvent, const std::vector<uint16_t> adcCount[nEbEta][nEbPhi]) const;
 
   /** Generates FE trigger primitives data
    * @param basename base for the output file name. DCC number is appended to
@@ -297,8 +283,7 @@ class EcalSimRawData: public edm::one::EDAnalyzer<> {
    * @param iEvent event index
    * @param tps the payload, the trigger primitives
    */
-  void genTccIn(std::string basename, int iEvent,
-		const int tps[nTtEta][nTtPhi]) const;
+  void genTccIn(std::string basename, int iEvent, const int tps[nTtEta][nTtPhi]) const;
 
   /** Generates TCC->DCC data
    * @param basename base for the output file name. DCC number is appended to
@@ -306,18 +291,13 @@ class EcalSimRawData: public edm::one::EDAnalyzer<> {
    * @param iEvent event index
    * @param tps the payload, the trigger primitives
    */
-  void genTccOut(std::string basename, int iEvent,
-		 const int tps[nTtEta][nTtPhi]) const;
+  void genTccOut(std::string basename, int iEvent, const int tps[nTtEta][nTtPhi]) const;
 
-
-  
   /** Retrieves barrel digis (APD ADC count).
    * @param event CMS event
-   * @param adc [out] the adc counts: adc[iEta0][iPhi0][iTimeSample0] 
+   * @param adc [out] the adc counts: adc[iEta0][iPhi0][iTimeSample0]
    */
-  void getEbDigi(const edm::Event& event,
-		 std::vector<uint16_t> adc[nEbEta][nEbPhi]) const;
-
+  void getEbDigi(const edm::Event &event, std::vector<uint16_t> adc[nEbEta][nEbPhi]) const;
 
   /** Extracts the trigger primitive (TP). The collection name
    * parameter permits to select either the TCP Fenix output
@@ -327,10 +307,8 @@ class EcalSimRawData: public edm::one::EDAnalyzer<> {
    * @param collName label of the EDM collection containing the TP.
    * @param tp [out] the trigger primitives
    */
-  void getTp(const edm::Event& event, const std::string& collName,
-	     int tp[nTtEta][nTtPhi]) const;
+  void getTp(const edm::Event &event, const std::string &collName, int tp[nTtEta][nTtPhi]) const;
 
-  
   /** Help function to get the file extension which depends on the output
    * formats.
    */
@@ -345,17 +323,14 @@ class EcalSimRawData: public edm::one::EDAnalyzer<> {
    * @param hpar if true the horizontal odd word parity is set before writing
    * the word into the file.
    */
-  void fwrite(std::ofstream& f, uint16_t data, int& iword,
-	      bool hpar = true) const;
-
+  void fwrite(std::ofstream &f, uint16_t data, int &iword, bool hpar = true) const;
 
   /** Computes the selective readout flags.
    * @param [in] event CMS event
    * @param [out] ebSrf the computed SR flags for barrel
    * @param [out] eeSrf the computed SR flags for endcaps
    */
-  void getSrfs(const edm::Event& event, int ebSrf[nTtEta][nTtPhi],
-	       int eeSrf[nEndcaps][nScX][nScY]) const;
+  void getSrfs(const edm::Event &event, int ebSrf[nTtEta][nTtPhi], int eeSrf[nEndcaps][nScX][nScY]) const;
 
   /** Generates SR flags
    * @param basename base for the output file name. DCC number is appended to
@@ -363,9 +338,8 @@ class EcalSimRawData: public edm::one::EDAnalyzer<> {
    * @param iEvent event index
    * @param the trigger tower flags
    */
-  void genSrData(std::string basename, int iEvent,
-		 int ttf[nEbTtEta][nTtPhi]) const;
-  
+  void genSrData(std::string basename, int iEvent, int ttf[nEbTtEta][nTtPhi]) const;
+
 private:
   /** Name of module/plugin/producer making digis
    */
@@ -379,12 +353,11 @@ class EcalSimRawData: public edm::one::EDAnalyzer<> {
    */
   std::string eeDigiCollection_;
 
-
   /** Label of SR flags and suppressed digis
    */
   std::string srDigiProducer_;
-  
-   /** EB SRP flag digi product instance name
+
+  /** EB SRP flag digi product instance name
    */
   std::string ebSrFlagCollection_;
 
@@ -394,15 +367,15 @@ class EcalSimRawData: public edm::one::EDAnalyzer<> {
 
   /** Trigger primitive digi product instance name
    */
-  std::string tpDigiCollection_; 
+  std::string tpDigiCollection_;
 
   /** TCP Fenix output digi product instance name
    */
-  std::string tcpDigiCollection_; 
-  
+  std::string tcpDigiCollection_;
+
   /** Calorimeter geometry
    */
-  const CaloGeometry * theGeometry;
+  const CaloGeometry *theGeometry;
 
   /** Name of the trigger primitive label
    */
@@ -438,7 +411,7 @@ class EcalSimRawData: public edm::one::EDAnalyzer<> {
 
   /** ECAL endcap trigger tower map
    */
-  const EcalTrigTowerConstituentsMap * theTriggerTowerMap;
+  const EcalTrigTowerConstituentsMap *theTriggerTowerMap;
 
   /** Selective readout simulator
    */
@@ -455,17 +428,16 @@ class EcalSimRawData: public edm::one::EDAnalyzer<> {
   /** Index of the TCC, FE data must be produced for. -1 for all TTCs
    */
   int tccNum_;
-  
+
   /** Index of the DCC, FE data must be produced for. -1 for all TTCs
    */
   int dccNum_;
-  
+
   /** default TriggerPrimitive values if the trigger tower is abscent
    */
   int tccInDefaultVal_;
-  
+
   /** basename for output files
    */
   std::string basename_;
 };
-
diff --git a/SimCalorimetry/EcalElectronicsEmulation/interface/EcalSimpleProducer.h b/SimCalorimetry/EcalElectronicsEmulation/interface/EcalSimpleProducer.h
index d641bd7064636..fbfca487646a9 100644
--- a/SimCalorimetry/EcalElectronicsEmulation/interface/EcalSimpleProducer.h
+++ b/SimCalorimetry/EcalElectronicsEmulation/interface/EcalSimpleProducer.h
@@ -2,8 +2,8 @@
 #define SimCalorimetry_EcalElectronicsEmulationEcalSimpleProducer_h
 
 #include "FWCore/Framework/interface/one/EDProducer.h"
-#include <memory>
 #include <TFormula.h>
+#include <memory>
 #include <string>
 
 /** This edm producer generates Ecal Digis (data frames and TPGs)
@@ -18,15 +18,15 @@
  * </UL>
  * The crystal ADC formula is parametrized with the following variables:
  * <UL><LI>ieta0: crystal eta index starting from 0 at eta- end of barrel</LI>
- *     <LI>iphi0: crystal phi index starting at Phi=0deg. in std CMS coordinates</LI>
- *     <LI>ievt0 event sequence number within the job run starting from 0</LI> 
- *     <LI>isample0 sample time position starting from 0</LI>
+ *     <LI>iphi0: crystal phi index starting at Phi=0deg. in std CMS
+ * coordinates</LI> <LI>ievt0 event sequence number within the job run starting
+ * from 0</LI> <LI>isample0 sample time position starting from 0</LI>
  * </UL>
  * The trigger primitive formula is parametrized with the following variables:
- * <UL><LI>ieta0: trigger tower eta index starting from 0 at eta- end of barrel</LI>
- *     <LI>iphi0: trigger tower index starting at Phi=0deg. in std CMS coordinates</LI>
- *     <LI>ievt0 event sequence number within the job run starting from 0</LI> 
- *     <LI>isample0 sample time position starting from 0</LI>
+ * <UL><LI>ieta0: trigger tower eta index starting from 0 at eta- end of
+ * barrel</LI> <LI>iphi0: trigger tower index starting at Phi=0deg. in std CMS
+ * coordinates</LI> <LI>ievt0 event sequence number within the job run starting
+ * from 0</LI> <LI>isample0 sample time position starting from 0</LI>
  * </UL>
  * In both formulae 'itt0' shortcut can be used for the trigger tower index
  * within the SM starting at 0 from lowest relative eta and lowest phi and
@@ -35,15 +35,14 @@
  * TFormula</A>
  *
  */
-class EcalSimpleProducer: public edm::one::EDProducer<> {
-
-  //constructor(s) and destructor(s)
+class EcalSimpleProducer : public edm::one::EDProducer<> {
+  // constructor(s) and destructor(s)
 public:
   /** Constructs an EcalSimpleProducer
    * @param pset CMSSW configuration
    * @param sdesc description of this input source
    */
-  EcalSimpleProducer(const edm::ParameterSet& pset);
+  EcalSimpleProducer(const edm::ParameterSet &pset);
 
   /**Destructor
    */
@@ -57,9 +56,9 @@ class EcalSimpleProducer: public edm::one::EDProducer<> {
   /** The main method. It produces the event.
    * @param evt [out] produced event.
    */
-  void produce(edm::Event& evt, const edm::EventSetup&) override;
-  
-  //method(s)
+  void produce(edm::Event &evt, const edm::EventSetup &) override;
+
+  // method(s)
 public:
 private:
   /** Help function to replace a pattern within a string. Every occurance
@@ -68,46 +67,37 @@ class EcalSimpleProducer: public edm::one::EDProducer<> {
    * @param pattern to replace.
    * @param string to substitute to the pattern
    */
-  void replaceAll(std::string& s, const std::string& from,
-		  const std::string& to) const;
+  void replaceAll(std::string &s, const std::string &from, const std::string &to) const;
 
   /** Converts c-array index (contiguous integer starting from 0) to
    * std CMSSW ECAL crystal eta index.
    * @param iEta0 c-array index. '0' postfix reminds the index starts from 0
    * @return std CMSSW ECAL crystal index.
    */
-  int cIndex2iEta(int iEta0) const{
-    return (iEta0<85)?iEta0-85:iEta0-84;
-  }
-  
+  int cIndex2iEta(int iEta0) const { return (iEta0 < 85) ? iEta0 - 85 : iEta0 - 84; }
+
   /** Converts c-array index (contiguous integer starting from 0) to
    * std CMSSW ECAL crystal phi index.
    * @param iPhi0 c-array index. '0' postfix reminds the index starts from 0
    * @return std CMSSW ECAL crystal index.
    */
-  int cIndex2iPhi(int iPhi0) const{
-    return (iPhi0+10)%360+1;
-  }
-  
+  int cIndex2iPhi(int iPhi0) const { return (iPhi0 + 10) % 360 + 1; }
+
   /** Converts c-array index (contiguous integer starting from 0) to
    * std CMSSW ECAL trigger tower eta index.
    * @param iEta0 c-array index. '0' postfix reminds the index starts from 0
    * @return std CMSSW ECAL trigger tower index.
    */
-  int cIndex2iTtEta(int iEta0) const{
-    return (iEta0<28)?iEta0-28:iEta0-27;
-  }
-  
+  int cIndex2iTtEta(int iEta0) const { return (iEta0 < 28) ? iEta0 - 28 : iEta0 - 27; }
+
   /** Converts c-array index (contiguous integer starting from 0) to
    * std CMSSW ECAL trigger tower phi index.
    * @param iPhi0 c-array index. '0' postfix reminds the index starts from 0
    * @return std CMSSW ECAL trigger tower index.
    */
-  int cIndex2iTtPhi(int iPhi0) const{
-    return iPhi0+1;
-  }
-  
-  //attribute(s)
+  int cIndex2iTtPhi(int iPhi0) const { return iPhi0 + 1; }
+
+  // attribute(s)
 protected:
 private:
   /** Formula defining the data frame samples
@@ -121,7 +111,7 @@ class EcalSimpleProducer: public edm::one::EDProducer<> {
   /** Formula defining the sim hits
    */
   std::unique_ptr<TFormula> simHitFormula_;
-  
+
   /** Verbosity switch
    */
   bool verbose_;
diff --git a/SimCalorimetry/EcalElectronicsEmulation/interface/TCCinput.h b/SimCalorimetry/EcalElectronicsEmulation/interface/TCCinput.h
index 4dafc249fbe40..6d6b1ce31cc94 100644
--- a/SimCalorimetry/EcalElectronicsEmulation/interface/TCCinput.h
+++ b/SimCalorimetry/EcalElectronicsEmulation/interface/TCCinput.h
@@ -7,57 +7,42 @@
  *\date February 2007
  */
 
-#include <iostream> 
+#include <iostream>
 
 struct TCCinput {
-  
-  int tower;         //tower number in SM
-  int bunchCrossing; 
-  unsigned input;    //11 bit value input (10 energy, 1 fg)
-  
-  TCCinput(int tt=0, int bx=0, unsigned val=0x0) : 
-    tower(tt), bunchCrossing(bx), input(val) {
-    if (input>0x7ff)  {
-      std::cout << "[TCCinput] saturated value 0x" 
-		<< std::hex << input << std::dec
-		<< std::endl;
+  int tower;  // tower number in SM
+  int bunchCrossing;
+  unsigned input;  // 11 bit value input (10 energy, 1 fg)
+
+  TCCinput(int tt = 0, int bx = 0, unsigned val = 0x0) : tower(tt), bunchCrossing(bx), input(val) {
+    if (input > 0x7ff) {
+      std::cout << "[TCCinput] saturated value 0x" << std::hex << input << std::dec << std::endl;
       input &= 0x7ff;
     }
-  }; 
- 
+  };
+
   int get_energy() const {
-    return input & 0x3ff; //get bits 9:0
+    return input & 0x3ff;  // get bits 9:0
   }
-  
+
   int get_fg() const {
-    return input & 0x400; //get bit number 10
+    return input & 0x400;  // get bit number 10
   }
 
-  bool is_current (int n) const {
-    return (n==bunchCrossing);
-  }
+  bool is_current(int n) const { return (n == bunchCrossing); }
 
   bool operator<(const TCCinput &) const;
-  
-  std::ostream& operator<<(std::ostream&);
 
+  std::ostream &operator<<(std::ostream &);
 };
 
-inline 
-std::ostream& TCCinput::operator<<(std::ostream& os) {
-  os << " tcc input " 
-     << " bx:"     << bunchCrossing 
-     << " tt:"     << tower 
-     << " raw:0x"  << std::hex  << input << std::dec  
-     << " fg:"     << this->get_fg()
-     << " energy:" << this->get_energy()
-     << std::endl;
+inline std::ostream &TCCinput::operator<<(std::ostream &os) {
+  os << " tcc input "
+     << " bx:" << bunchCrossing << " tt:" << tower << " raw:0x" << std::hex << input << std::dec
+     << " fg:" << this->get_fg() << " energy:" << this->get_energy() << std::endl;
   return os;
 }
 
-inline
-bool TCCinput::operator< (const TCCinput &k) const {
-  return (bunchCrossing < k.bunchCrossing);
-}
+inline bool TCCinput::operator<(const TCCinput &k) const { return (bunchCrossing < k.bunchCrossing); }
 
-#endif 
+#endif
diff --git a/SimCalorimetry/EcalElectronicsEmulation/src/EcalFEtoDigi.cc b/SimCalorimetry/EcalElectronicsEmulation/src/EcalFEtoDigi.cc
index a8ae684d3c588..76866e7e8065e 100644
--- a/SimCalorimetry/EcalElectronicsEmulation/src/EcalFEtoDigi.cc
+++ b/SimCalorimetry/EcalElectronicsEmulation/src/EcalFEtoDigi.cc
@@ -1,345 +1,321 @@
-#include "CondFormats/EcalObjects/interface/EcalTPGLutIdMap.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGLutGroup.h"
-#include "CondFormats/DataRecord/interface/EcalTPGLutIdMapRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGLutGroupRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGLutIdMapRcd.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGLutGroup.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGLutIdMap.h"
 #include "SimCalorimetry/EcalElectronicsEmulation/interface/EcalFEtoDigi.h"
 
-EcalFEtoDigi::EcalFEtoDigi(const edm::ParameterSet& iConfig) {
-  basename_           = iConfig.getUntrackedParameter<std::string>("FlatBaseName","ecal_tcc_");
-  sm_                 = iConfig.getUntrackedParameter<int>("SuperModuleId",-1);
-  fileEventOffset_    = iConfig.getUntrackedParameter<int>("FileEventOffset",0);
-  useIdentityLUT_     = iConfig.getUntrackedParameter<bool>("UseIdentityLUT",false);
-  debug_              = iConfig.getUntrackedParameter<bool>("debugPrintFlag", false);
+EcalFEtoDigi::EcalFEtoDigi(const edm::ParameterSet &iConfig) {
+  basename_ = iConfig.getUntrackedParameter<std::string>("FlatBaseName", "ecal_tcc_");
+  sm_ = iConfig.getUntrackedParameter<int>("SuperModuleId", -1);
+  fileEventOffset_ = iConfig.getUntrackedParameter<int>("FileEventOffset", 0);
+  useIdentityLUT_ = iConfig.getUntrackedParameter<bool>("UseIdentityLUT", false);
+  debug_ = iConfig.getUntrackedParameter<bool>("debugPrintFlag", false);
 
-  singlefile = (sm_==-1)?false:true;
+  singlefile = (sm_ == -1) ? false : true;
 
   produces<EcalTrigPrimDigiCollection>();
-  produces<EcalTrigPrimDigiCollection >("formatTCP");
- 
+  produces<EcalTrigPrimDigiCollection>("formatTCP");
 }
 
 /// method called to produce the data
-void
-EcalFEtoDigi::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-
+void EcalFEtoDigi::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   /// event counter
   static int current_bx = -1;
   current_bx++;
 
   /// re-read input (needed in case of event-by-event input production)
-  //readInput();
+  // readInput();
 
-  if(debug_)
+  if (debug_)
     std::cout << "[EcalFEtoDigi::produce] producing event " << current_bx << std::endl;
-  
-  std::unique_ptr<EcalTrigPrimDigiCollection>
-    e_tpdigis (new EcalTrigPrimDigiCollection);
-  std::unique_ptr<EcalTrigPrimDigiCollection>
-    e_tpdigisTcp (new EcalTrigPrimDigiCollection);
 
-  std::vector<TCCinput>::const_iterator it;
-
-  for(int i=0; i<N_SM; i++) {
+  std::unique_ptr<EcalTrigPrimDigiCollection> e_tpdigis(new EcalTrigPrimDigiCollection);
+  std::unique_ptr<EcalTrigPrimDigiCollection> e_tpdigisTcp(new EcalTrigPrimDigiCollection);
 
-    if(!singlefile)
-      sm_=i+1;
+  std::vector<TCCinput>::const_iterator it;
 
-    for(it = inputdata_[i].begin(); it != inputdata_[i].end(); it++) {
+  for (int i = 0; i < N_SM; i++) {
+    if (!singlefile)
+      sm_ = i + 1;
 
-      if(!(*it).is_current(current_bx+fileEventOffset_)) 
-	continue;
-      else
-      	if(debug_ && (*it).input!=0 )
-	  std::cout << "[EcalFEtoDigi] " 
-	       << "\tsupermodule:" << sm_ 
-	       << "\tevent: "      << current_bx 
-	       << "\tbx: "         << (*it).bunchCrossing
-	       << "\tvalue:0x"     << std::setfill('0') << std::setw(4) 
-	       << std::hex << (*it).input << std::setfill(' ') << std::dec 
-	       << std::endl;
+    for (it = inputdata_[i].begin(); it != inputdata_[i].end(); it++) {
+      if (!(*it).is_current(current_bx + fileEventOffset_))
+        continue;
+      else if (debug_ && (*it).input != 0)
+        std::cout << "[EcalFEtoDigi] "
+                  << "\tsupermodule:" << sm_ << "\tevent: " << current_bx << "\tbx: " << (*it).bunchCrossing
+                  << "\tvalue:0x" << std::setfill('0') << std::setw(4) << std::hex << (*it).input << std::setfill(' ')
+                  << std::dec << std::endl;
 
-      
       /// create EcalTrigTowerDetId
-      const EcalTrigTowerDetId  e_id = create_TTDetId(*it);
-      
-      //EcalElectronicsMapping theMapping;
-      //const EcalTrigTowerDetId  e_id 
+      const EcalTrigTowerDetId e_id = create_TTDetId(*it);
+
+      // EcalElectronicsMapping theMapping;
+      // const EcalTrigTowerDetId  e_id
       //= theMapping.getTrigTowerDetId(SMidToTCCid(sm_),(*it).tower);
-      //EcalElectronicsMapping::getTrigTowerDetId(int TCCid, int iTT)
-      
+      // EcalElectronicsMapping::getTrigTowerDetId(int TCCid, int iTT)
+
       /// create EcalTriggerPrimitiveDigi
       EcalTriggerPrimitiveDigi *e_digi = new EcalTriggerPrimitiveDigi(e_id);
       EcalTriggerPrimitiveDigi *e_digiTcp = new EcalTriggerPrimitiveDigi(e_id);
-      
+
       /// create EcalTriggerPrimitiveSample
       EcalTriggerPrimitiveSample e_sample = create_TPSample(*it, iSetup);
       EcalTriggerPrimitiveSample e_sampleTcp = create_TPSampleTcp(*it, iSetup);
 
       /// set sample
-      e_digi->setSize(1); //set sampleOfInterest to 0
-      e_digi->setSample(0,e_sample);
-      
-      /// add to EcalTrigPrimDigiCollection 
+      e_digi->setSize(1);  // set sampleOfInterest to 0
+      e_digi->setSample(0, e_sample);
+
+      /// add to EcalTrigPrimDigiCollection
       e_tpdigis->push_back(*e_digi);
-    
+
       /// set sample (uncompressed format)
-      e_digiTcp->setSize(1); //set sampleOfInterest to 0
-      e_digiTcp->setSample(0,e_sampleTcp);
-      
-      /// add to EcalTrigPrimDigiCollection (uncompressed format) 
+      e_digiTcp->setSize(1);  // set sampleOfInterest to 0
+      e_digiTcp->setSample(0, e_sampleTcp);
+
+      /// add to EcalTrigPrimDigiCollection (uncompressed format)
       e_tpdigisTcp->push_back(*e_digiTcp);
 
-      if(debug_) 
-	outfile << (*it).tower << '\t' 
-		<< (*it).bunchCrossing << '\t'<< std::setfill('0') << std::hex
-		<< "0x" << std::setw(4) << (*it).input << '\t'
-		<< "0"	<< std::dec << std::setfill(' ') 
-		<< std::endl;
+      if (debug_)
+        outfile << (*it).tower << '\t' << (*it).bunchCrossing << '\t' << std::setfill('0') << std::hex << "0x"
+                << std::setw(4) << (*it).input << '\t' << "0" << std::dec << std::setfill(' ') << std::endl;
 
       /// print & debug
-      if(debug_ && (*it).input!=0 )
-	std::cout << "[EcalFEtoDigi] debug id: " << e_digi->id() << "\n\t" 
-		  << std::dec 
-		  << "\tieta: "     << e_digi->id().ieta()
-		  << "\tiphi: "     << e_digi->id().iphi()
-		  << "\tsize: "     << e_digi->size()
-		  << "\tfg: "       <<(e_digi->fineGrain()?1:0)    
-		  << std::hex 	 
-		  << "\tEt: 0x"     << e_digi->compressedEt() 
-		  << " (0x"         << (*it).get_energy() << ")" 
-		  << "\tttflag: 0x" << e_digi->ttFlag()
-		  << std::dec
-		  << std::endl;
+      if (debug_ && (*it).input != 0)
+        std::cout << "[EcalFEtoDigi] debug id: " << e_digi->id() << "\n\t" << std::dec
+                  << "\tieta: " << e_digi->id().ieta() << "\tiphi: " << e_digi->id().iphi()
+                  << "\tsize: " << e_digi->size() << "\tfg: " << (e_digi->fineGrain() ? 1 : 0) << std::hex << "\tEt: 0x"
+                  << e_digi->compressedEt() << " (0x" << (*it).get_energy() << ")"
+                  << "\tttflag: 0x" << e_digi->ttFlag() << std::dec << std::endl;
 
       delete e_digi;
       delete e_digiTcp;
-
     }
-    
-    if(singlefile)
+
+    if (singlefile)
       break;
   }
 
-  ///in case no info was found for the event:need to create something
-  if(e_tpdigis->empty()) {
+  /// in case no info was found for the event:need to create something
+  if (e_tpdigis->empty()) {
     std::cout << "[EcalFEtoDigi] creating empty collection for the event!\n";
     EcalTriggerPrimitiveDigi *e_digi = new EcalTriggerPrimitiveDigi();
     e_tpdigis->push_back(*e_digi);
   }
 
   iEvent.put(std::move(e_tpdigis));
-  iEvent.put(std::move(e_tpdigisTcp),"formatTCP");
-
+  iEvent.put(std::move(e_tpdigisTcp), "formatTCP");
 }
 
-
 /// open and read in input (flat) data file
-void 
-EcalFEtoDigi::readInput() {
-
-  if(debug_)
+void EcalFEtoDigi::readInput() {
+  if (debug_)
     std::cout << "\n[EcalFEtoDigi::readInput] Reading input data\n";
-  
-  if(!singlefile)
-    sm_=-1;
-  for(int i=0; i<N_SM; i++)
+
+  if (!singlefile)
+    sm_ = -1;
+  for (int i = 0; i < N_SM; i++)
     inputdata_[i].clear();
 
   std::stringstream s;
   int tcc;
 
-  for (int i=0; i<N_SM; i++) {
-
-    tcc = (sm_==-1)?SMidToTCCid(i+1):SMidToTCCid(sm_);
+  for (int i = 0; i < N_SM; i++) {
+    tcc = (sm_ == -1) ? SMidToTCCid(i + 1) : SMidToTCCid(sm_);
 
     s.str("");
-    s << basename_ << tcc << ".txt"; 
+    s << basename_ << tcc << ".txt";
 
     std::ifstream f(s.str().c_str());
-    
-    if(debug_) {
+
+    if (debug_) {
       std::cout << "  opening " << s.str().c_str() << "..." << std::endl;
-      if(!f.good())
-	std::cout << " skipped!"; 
-      std::cout << std::endl;       
+      if (!f.good())
+        std::cout << " skipped!";
+      std::cout << std::endl;
     }
-    //if (!f.good() || f.eof()) 
-    //  throw cms::Exception("BadInputFile") 
-    //	<< "EcalFEtoDigi: cannot open file " << s.str().c_str() << std::endl; 
-    
-    int n_bx=0;
-    int tt; int bx; unsigned val; int dummy;
-
-    while(f.good()) {
-      if(f.eof()) break;
-      tt=0; bx=-1; val=0x0; dummy=0;
+    // if (!f.good() || f.eof())
+    //  throw cms::Exception("BadInputFile")
+    //	<< "EcalFEtoDigi: cannot open file " << s.str().c_str() << std::endl;
+
+    int n_bx = 0;
+    int tt;
+    int bx;
+    unsigned val;
+    int dummy;
+
+    while (f.good()) {
+      if (f.eof())
+        break;
+      tt = 0;
+      bx = -1;
+      val = 0x0;
+      dummy = 0;
       f >> tt >> bx >> std::hex >> val >> std::dec >> dummy;
-      if(bx==-1 || bx < fileEventOffset_ ) continue;
-      if( !n_bx || (bx!=(inputdata_[i].back()).bunchCrossing) )
-	n_bx++;
-      TCCinput ttdata(tt,bx,val);
+      if (bx == -1 || bx < fileEventOffset_)
+        continue;
+      if (!n_bx || (bx != (inputdata_[i].back()).bunchCrossing))
+        n_bx++;
+      TCCinput ttdata(tt, bx, val);
       inputdata_[i].push_back(ttdata);
-      
-      if(debug_&&val!=0)
-	printf("\treading tower:%d  bx:%d input:0x%x dummy:%2d\n", 
-	       tt, bx, val, dummy);
-    } 
-    
+
+      if (debug_ && val != 0)
+        printf("\treading tower:%d  bx:%d input:0x%x dummy:%2d\n", tt, bx, val, dummy);
+    }
+
     f.close();
-    
-    if(sm_!=-1)
-      break;    
+
+    if (sm_ != -1)
+      break;
   }
 
-  if(debug_)
+  if (debug_)
     std::cout << "[EcalFEtoDigi::readInput] Done reading." << std::endl;
 
-  return; 
+  return;
 }
 
 /// create EcalTrigTowerDetId from input data (line)
-EcalTrigTowerDetId 
-EcalFEtoDigi::create_TTDetId(TCCinput data) {
-
+EcalTrigTowerDetId EcalFEtoDigi::create_TTDetId(TCCinput data) {
   // (EcalBarrel only)
   static const int kTowersInPhi = 4;
-  
-  int iTT   = data.tower;
-  int zside = (sm_>18)?-1:+1;
-  int SMid  = sm_;
 
-  int jtower = iTT-1;
-  int etaTT  = jtower / kTowersInPhi +1;
+  int iTT = data.tower;
+  int zside = (sm_ > 18) ? -1 : +1;
+  int SMid = sm_;
+
+  int jtower = iTT - 1;
+  int etaTT = jtower / kTowersInPhi + 1;
   int phiTT;
-  if (zside < 0) 
-    phiTT = (SMid-19) * kTowersInPhi + jtower % kTowersInPhi;
-  else 
-    phiTT = (SMid- 1) * kTowersInPhi + kTowersInPhi-(jtower % kTowersInPhi)-1;
+  if (zside < 0)
+    phiTT = (SMid - 19) * kTowersInPhi + jtower % kTowersInPhi;
+  else
+    phiTT = (SMid - 1) * kTowersInPhi + kTowersInPhi - (jtower % kTowersInPhi) - 1;
 
-  phiTT ++;
-  //needed as phi=0 (iphi=1) is at middle of lower SMs (1 and 19), need shift by 2
-  phiTT = phiTT -2; 
-  if (phiTT <= 0) phiTT = 72+phiTT;
+  phiTT++;
+  // needed as phi=0 (iphi=1) is at middle of lower SMs (1 and 19), need shift
+  // by 2
+  phiTT = phiTT - 2;
+  if (phiTT <= 0)
+    phiTT = 72 + phiTT;
 
   /// construct the EcalTrigTowerDetId object
-  if(debug_&&data.get_energy()!=0)
-    printf("[EcalFEtoDigi] Creating EcalTrigTowerDetId (SMid,itt)=(%d,%d)->(eta,phi)=(%d,%d) \n", SMid, iTT, etaTT, phiTT);
-  
-  EcalTrigTowerDetId 
-    e_id( zside , EcalBarrel, etaTT, phiTT, 0);
-  
+  if (debug_ && data.get_energy() != 0)
+    printf(
+        "[EcalFEtoDigi] Creating EcalTrigTowerDetId "
+        "(SMid,itt)=(%d,%d)->(eta,phi)=(%d,%d) \n",
+        SMid,
+        iTT,
+        etaTT,
+        phiTT);
+
+  EcalTrigTowerDetId e_id(zside, EcalBarrel, etaTT, phiTT, 0);
+
   return e_id;
 }
 
 /// create EcalTriggerPrimitiveSample from input data (line)
-EcalTriggerPrimitiveSample 
-EcalFEtoDigi::create_TPSample(TCCinput data, const edm::EventSetup& evtSetup) {
-
-  int tower      = create_TTDetId(data).rawId() ; 
-  int  Et        = data.get_energy();
-  bool tt_fg     = data.get_fg();
-  //unsigned input = data.input;
-  //int  Et    = input & 0x3ff; //get bits 0-9
-  //bool tt_fg = input & 0x400; //get bit number 10
+EcalTriggerPrimitiveSample EcalFEtoDigi::create_TPSample(TCCinput data, const edm::EventSetup &evtSetup) {
+  int tower = create_TTDetId(data).rawId();
+  int Et = data.get_energy();
+  bool tt_fg = data.get_fg();
+  // unsigned input = data.input;
+  // int  Et    = input & 0x3ff; //get bits 0-9
+  // bool tt_fg = input & 0x400; //get bit number 10
 
   /// setup look up table
-  unsigned int lut_[1024] ;
-  if(!useIdentityLUT_)
-    getLUT(lut_, tower, evtSetup) ;
+  unsigned int lut_[1024];
+  if (!useIdentityLUT_)
+    getLUT(lut_, tower, evtSetup);
   else
-    for(int i=0; i<1024; i++) lut_[i] = i ; //identity lut!
-  
+    for (int i = 0; i < 1024; i++)
+      lut_[i] = i;  // identity lut!
+
   /// compress energy 10 -> 8  bit
   int lut_out = lut_[Et];
-  int ttFlag  = (lut_out & 0x700) >> 8;
-  int cEt     = (lut_out & 0xff );
-
-  ///crate sample
-  if(debug_&&data.get_energy()!=0)
-    printf("[EcalFEtoDigi] Creating sample; input:0x%X (Et:0x%x) cEt:0x%x fg:%d ttflag:0x%x \n",
-	   data.input, Et, cEt, tt_fg, ttFlag);
-  
+  int ttFlag = (lut_out & 0x700) >> 8;
+  int cEt = (lut_out & 0xff);
+
+  /// crate sample
+  if (debug_ && data.get_energy() != 0)
+    printf(
+        "[EcalFEtoDigi] Creating sample; input:0x%X (Et:0x%x) cEt:0x%x "
+        "fg:%d ttflag:0x%x \n",
+        data.input,
+        Et,
+        cEt,
+        tt_fg,
+        ttFlag);
+
   EcalTriggerPrimitiveSample e_sample(cEt, tt_fg, ttFlag);
-  
+
   return e_sample;
 }
 
 /// create EcalTriggerPrimitiveSample in tcp format (uncomrpessed energy)
-EcalTriggerPrimitiveSample 
-EcalFEtoDigi::create_TPSampleTcp(TCCinput data, const edm::EventSetup& evtSetup) {
-
-  int tower      = create_TTDetId(data).rawId() ; 
-  int  Et        = data.get_energy();
-  bool tt_fg     = data.get_fg();
+EcalTriggerPrimitiveSample EcalFEtoDigi::create_TPSampleTcp(TCCinput data, const edm::EventSetup &evtSetup) {
+  int tower = create_TTDetId(data).rawId();
+  int Et = data.get_energy();
+  bool tt_fg = data.get_fg();
 
   /// setup look up table
-  unsigned int lut_[1024] ;
-  if(!useIdentityLUT_)
-    getLUT(lut_, tower, evtSetup) ;
+  unsigned int lut_[1024];
+  if (!useIdentityLUT_)
+    getLUT(lut_, tower, evtSetup);
   else
-    for(int i=0; i<1024; i++) lut_[i] = i ; //identity lut!
-  
+    for (int i = 0; i < 1024; i++)
+      lut_[i] = i;  // identity lut!
+
   int lut_out = lut_[Et];
-  int ttFlag  = (lut_out & 0x700) >> 8;
-  int tcpdata = ((ttFlag&0x7)<<11) | ((tt_fg & 0x1)<<10) |  (Et & 0x3ff) ;
+  int ttFlag = (lut_out & 0x700) >> 8;
+  int tcpdata = ((ttFlag & 0x7) << 11) | ((tt_fg & 0x1) << 10) | (Et & 0x3ff);
 
   EcalTriggerPrimitiveSample e_sample(tcpdata);
-  
+
   return e_sample;
 }
 
-
 /// method called once each job just before starting event loop
-void 
-EcalFEtoDigi::beginJob(){
-
-  ///check SM numbering convetion: 1-38 
+void EcalFEtoDigi::beginJob() {
+  /// check SM numbering convetion: 1-38
   /// [or -1 flag to indicate all sm's are to be read in]
-  if(sm_!=-1 && (sm_<1 || sm_>36)) 
-    throw cms::Exception("EcalFEtoDigiInvalidDetId") 
-      << "EcalFEtoDigi: Adapt SM numbering convention.\n";
+  if (sm_ != -1 && (sm_ < 1 || sm_ > 36))
+    throw cms::Exception("EcalFEtoDigiInvalidDetId") << "EcalFEtoDigi: Adapt SM numbering convention.\n";
 
-  ///debug: open file for recreating input copy
-  if(debug_)
+  /// debug: open file for recreating input copy
+  if (debug_)
     outfile.open("inputcopy.txt");
 
   readInput();
-  
-}  
-
+}
 
 /// method called once each job just after ending the event loop
-void 
-EcalFEtoDigi::endJob() {
-  if(outfile.is_open())
+void EcalFEtoDigi::endJob() {
+  if (outfile.is_open())
     outfile.close();
 }
 
 /// translate input supermodule id into TCC id (barrel)
-int 
-EcalFEtoDigi::SMidToTCCid( const int smid ) const {
-
-  return (smid<=18) ? smid+55-1 : smid+37-19;
-
-}
+int EcalFEtoDigi::SMidToTCCid(const int smid) const { return (smid <= 18) ? smid + 55 - 1 : smid + 37 - 19; }
 
 /// return the LUT from eventSetup
-void EcalFEtoDigi::getLUT(unsigned int * lut, const int towerId,  const edm::EventSetup& evtSetup) const 
-{
+void EcalFEtoDigi::getLUT(unsigned int *lut, const int towerId, const edm::EventSetup &evtSetup) const {
   edm::ESHandle<EcalTPGLutGroup> lutGrpHandle;
-  evtSetup.get<EcalTPGLutGroupRcd>().get( lutGrpHandle );
-  const EcalTPGGroups::EcalTPGGroupsMap & lutGrpMap = lutGrpHandle.product()->getMap() ;  
-  EcalTPGGroups::EcalTPGGroupsMapItr itgrp = lutGrpMap.find(towerId) ;
-  uint32_t lutGrp = 999 ;
-  if (itgrp != lutGrpMap.end()) lutGrp = itgrp->second ;
-  
+  evtSetup.get<EcalTPGLutGroupRcd>().get(lutGrpHandle);
+  const EcalTPGGroups::EcalTPGGroupsMap &lutGrpMap = lutGrpHandle.product()->getMap();
+  EcalTPGGroups::EcalTPGGroupsMapItr itgrp = lutGrpMap.find(towerId);
+  uint32_t lutGrp = 999;
+  if (itgrp != lutGrpMap.end())
+    lutGrp = itgrp->second;
+
   edm::ESHandle<EcalTPGLutIdMap> lutMapHandle;
-  evtSetup.get<EcalTPGLutIdMapRcd>().get( lutMapHandle );
-  const EcalTPGLutIdMap::EcalTPGLutMap & lutMap = lutMapHandle.product()->getMap() ;  
-  EcalTPGLutIdMap::EcalTPGLutMapItr itLut = lutMap.find(lutGrp) ;
+  evtSetup.get<EcalTPGLutIdMapRcd>().get(lutMapHandle);
+  const EcalTPGLutIdMap::EcalTPGLutMap &lutMap = lutMapHandle.product()->getMap();
+  EcalTPGLutIdMap::EcalTPGLutMapItr itLut = lutMap.find(lutGrp);
   if (itLut != lutMap.end()) {
-    const unsigned int * theLut = (itLut->second).getLut() ;
-    for (unsigned int i=0 ; i<1024 ; i++) lut[i] = theLut[i] ;
+    const unsigned int *theLut = (itLut->second).getLut();
+    for (unsigned int i = 0; i < 1024; i++)
+      lut[i] = theLut[i];
   }
 }
diff --git a/SimCalorimetry/EcalElectronicsEmulation/src/EcalSimRawData.cc b/SimCalorimetry/EcalElectronicsEmulation/src/EcalSimRawData.cc
index 5d5b82bce8417..aeaa8bf37d931 100644
--- a/SimCalorimetry/EcalElectronicsEmulation/src/EcalSimRawData.cc
+++ b/SimCalorimetry/EcalElectronicsEmulation/src/EcalSimRawData.cc
@@ -1,59 +1,53 @@
-#include "SimCalorimetry/EcalElectronicsEmulation/interface/EcalSimRawData.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "Geometry/Records/interface/IdealGeometryRecord.h"
+#include "SimCalorimetry/EcalElectronicsEmulation/interface/EcalSimRawData.h"
 
 #include <memory>
 
-#include <fstream> //used for debugging
-#include <iostream>
-#include <iomanip>
-#include <cmath>
 #include "DataFormats/EcalDigi/interface/EcalMGPASample.h"
 #include "FWCore/Utilities/interface/Exception.h"
+#include <cmath>
+#include <fstream>  //used for debugging
+#include <iomanip>
+#include <iostream>
 
 using namespace std;
 using namespace edm;
 
 const int EcalSimRawData::ttType[nEbTtEta] = {
-  0,0,1,1,0,0,1,1,0,0,1,1,0,0,1,1,1, //EE-
-  0,0,0,1,1,0,0,1,1,0,0,1,1,0,0,1,1//EE+
+    0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1,  // EE-
+    0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1   // EE+
 };
 
 const int EcalSimRawData::stripCh2Phi[nTtTypes][ttEdge][ttEdge] = {
-  //TT type 0:
-  /*ch-->*/
-  {{4,3,2,1,0}, /*strip*/		
-   {0,1,2,3,4}, /*|*/
-   {4,3,2,1,0}, /*|*/
-   {0,1,2,3,4}, /*|*/
-   {4,3,2,1,0}},/*V*/
-  //TT type 1:
-  {{0,1,2,3,4},
-   {4,3,2,1,0},
-   {0,1,2,3,4},
-   {4,3,2,1,0},
-   {0,1,2,3,4}}
-};
+    // TT type 0:
+    /*ch-->*/
+    {{4, 3, 2, 1, 0},  /*strip*/
+     {0, 1, 2, 3, 4},  /*|*/
+     {4, 3, 2, 1, 0},  /*|*/
+     {0, 1, 2, 3, 4},  /*|*/
+     {4, 3, 2, 1, 0}}, /*V*/
+    // TT type 1:
+    {{0, 1, 2, 3, 4}, {4, 3, 2, 1, 0}, {0, 1, 2, 3, 4}, {4, 3, 2, 1, 0}, {0, 1, 2, 3, 4}}};
 
 const int EcalSimRawData::strip2Eta[nTtTypes][ttEdge] = {
-  {4,3,2,1,0}, //TT type 0
-  {0,1,2,3,4}  //TT type 1
+    {4, 3, 2, 1, 0},  // TT type 0
+    {0, 1, 2, 3, 4}   // TT type 1
 };
 
-EcalSimRawData::EcalSimRawData(const edm::ParameterSet& params){
-  //sets up parameters:
+EcalSimRawData::EcalSimRawData(const edm::ParameterSet &params) {
+  // sets up parameters:
   digiProducer_ = params.getParameter<string>("unsuppressedDigiProducer");
   ebDigiCollection_ = params.getParameter<std::string>("EBdigiCollection");
   eeDigiCollection_ = params.getParameter<std::string>("EEdigiCollection");
   srDigiProducer_ = params.getParameter<string>("srProducer");
   ebSrFlagCollection_ = params.getParameter<std::string>("EBSrFlagCollection");
   eeSrFlagCollection_ = params.getParameter<std::string>("EESrFlagCollection");
-  tpDigiCollection_
-    = params.getParameter<std::string>("trigPrimDigiCollection");
+  tpDigiCollection_ = params.getParameter<std::string>("trigPrimDigiCollection");
   tcpDigiCollection_ = params.getParameter<std::string>("tcpDigiCollection");
   tpProducer_ = params.getParameter<string>("trigPrimProducer");
   xtalVerbose_ = params.getUntrackedParameter<bool>("xtalVerbose", false);
@@ -71,574 +65,521 @@ EcalSimRawData::EcalSimRawData(const edm::ParameterSet& params){
 
   string writeMode = params.getParameter<string>("writeMode");
 
-  if(writeMode==string("littleEndian")){
+  if (writeMode == string("littleEndian")) {
     writeMode_ = littleEndian;
-  } else if(writeMode==string("bigEndian")){
+  } else if (writeMode == string("bigEndian")) {
     writeMode_ = bigEndian;
-  } else{
+  } else {
     writeMode_ = ascii;
   }
 }
 
-void
-EcalSimRawData::analyze(const edm::Event& event,
-			const edm::EventSetup& es){
-  //Event counter:
-  ++iEvent; 
-    
-  if(xtalVerbose_ | tpVerbose_){
-    cout << "======================================================================\n"
-	 << " Event " << iEvent << "\n"
-	 << "----------------------------------------------------------------------\n";
+void EcalSimRawData::analyze(const edm::Event &event, const edm::EventSetup &es) {
+  // Event counter:
+  ++iEvent;
+
+  if (xtalVerbose_ | tpVerbose_) {
+    cout << "=================================================================="
+            "====\n"
+         << " Event " << iEvent << "\n"
+         << "------------------------------------------------------------------"
+            "----\n";
   }
 
-  if(fe2dcc_){
+  if (fe2dcc_) {
     vector<uint16_t> adc[nEbEta][nEbPhi];
     getEbDigi(event, adc);
     genFeData(basename_, iEvent, adc);
   }
 
-  if(fe2tcc_){
-    int tcp[nTtEta][nTtPhi]={{0}};
+  if (fe2tcc_) {
+    int tcp[nTtEta][nTtPhi] = {{0}};
     getTp(event, tcpDigiCollection_, tcp);
     genTccIn(basename_, iEvent, tcp);
   }
-  
-  if(tcc2dcc_){
-    int tp[nTtEta][nTtPhi]={{0}};
-    getTp(event, tpDigiCollection_, tp); 
+
+  if (tcc2dcc_) {
+    int tp[nTtEta][nTtPhi] = {{0}};
+    getTp(event, tpDigiCollection_, tp);
     genTccOut(basename_, iEvent, tp);
   }
-  
-  //SR flags:
+
+  // SR flags:
   int ebSrf[nTtEta][nTtPhi];
   int eeSrf[nEndcaps][nScX][nScY];
 
-  if(srp2dcc_){
+  if (srp2dcc_) {
     getSrfs(event, ebSrf, eeSrf);
     genSrData(basename_, iEvent, ebSrf);
   }
-  
 }
 
-void EcalSimRawData::elec2GeomNum(int ittEta0, int ittPhi0, int strip1,
-				  int ch1, int& iEta0, int& iPhi0) const{
-  assert(0<=ittEta0 && ittEta0<nEbTtEta);
-  assert(0<=ittPhi0 && ittPhi0<nTtPhi);
-  assert(1<=strip1&& strip1<=ttEdge);
-  assert(1<=ch1 && ch1<=ttEdge);
+void EcalSimRawData::elec2GeomNum(int ittEta0, int ittPhi0, int strip1, int ch1, int &iEta0, int &iPhi0) const {
+  assert(0 <= ittEta0 && ittEta0 < nEbTtEta);
+  assert(0 <= ittPhi0 && ittPhi0 < nTtPhi);
+  assert(1 <= strip1 && strip1 <= ttEdge);
+  assert(1 <= ch1 && ch1 <= ttEdge);
   const int type = ttType[ittEta0];
-  iEta0 = ittEta0*ttEdge + strip2Eta[type][strip1-1];
-  iPhi0 = ittPhi0*ttEdge + stripCh2Phi[type][strip1-1][ch1-1];
-  assert(0<=iEta0 && iEta0<nEbEta);
-  assert(0<=iPhi0 && iPhi0<nEbPhi);
+  iEta0 = ittEta0 * ttEdge + strip2Eta[type][strip1 - 1];
+  iPhi0 = ittPhi0 * ttEdge + stripCh2Phi[type][strip1 - 1][ch1 - 1];
+  assert(0 <= iEta0 && iEta0 < nEbEta);
+  assert(0 <= iPhi0 && iPhi0 < nEbPhi);
 }
 
-void EcalSimRawData::fwrite(ofstream& f, uint16_t data,
-			    int& iWord, bool hpar) const{
-
-  if(hpar){
-    //set horizontal odd parity bit:
+void EcalSimRawData::fwrite(ofstream &f, uint16_t data, int &iWord, bool hpar) const {
+  if (hpar) {
+    // set horizontal odd parity bit:
     setHParity(data);
   }
-  
-  switch(writeMode_){
-  case littleEndian:
-    {
+
+  switch (writeMode_) {
+    case littleEndian: {
       char c = data & 0x00FF;
       f.write(&c, sizeof(c));
-      c = (data >>8) & 0x00FF;
+      c = (data >> 8) & 0x00FF;
       f.write(&c, sizeof(c));
-    }
-    break;
-  case bigEndian:
-    {
-      char c = (data >>8) & 0x00FF; 
+    } break;
+    case bigEndian: {
+      char c = (data >> 8) & 0x00FF;
       f.write(&c, sizeof(c));
       c = data & 0x00FF;
       f.write(&c, sizeof(c));
-    }
-    break;
-  case ascii:
-    f << ((iWord%8==0&&iWord!=0)?"\n":"")
-      << "0x" << setfill('0') << setw(4) << hex << data << "\t"
-      << dec << setfill(' ');
-    break;
+    } break;
+    case ascii:
+      f << ((iWord % 8 == 0 && iWord != 0) ? "\n" : "") << "0x" << setfill('0') << setw(4) << hex << data << "\t" << dec
+        << setfill(' ');
+      break;
   }
   ++iWord;
 }
 
-string EcalSimRawData::getExt() const{
-  switch(writeMode_){
-  case littleEndian:
-    return ".le";
-  case bigEndian:
-    return ".be";
-  case ascii:
-    return ".txt";
-  default:
-    return".?";
-  }  
+string EcalSimRawData::getExt() const {
+  switch (writeMode_) {
+    case littleEndian:
+      return ".le";
+    case bigEndian:
+      return ".be";
+    case ascii:
+      return ".txt";
+    default:
+      return ".?";
+  }
 }
 
-void EcalSimRawData::genFeData(string basename, int iEvent,
-			       const vector<uint16_t> adcCount[nEbEta][nEbPhi]
-			       ) const{
+void EcalSimRawData::genFeData(string basename, int iEvent, const vector<uint16_t> adcCount[nEbEta][nEbPhi]) const {
   int smf = 0;
   int gmf = 0;
   int nPendingEvt = 0;
   int monitorFlag = 0;
   int chFrameLen = adcCount[0][0].size() + 1;
-  
+
   int iWord = 0;
-  
-  for(int iZ0 = 0; iZ0<2; ++iZ0){
-    for(int iDccPhi0 = 0; iDccPhi0<nDccInPhi; ++iDccPhi0){
-      int iDcc1 = iDccPhi0 + iZ0*nDccInPhi + nDccEndcap + 1;
 
-      if(dccNum_!=-1  && dccNum_!=iDcc1) continue;
-      
+  for (int iZ0 = 0; iZ0 < 2; ++iZ0) {
+    for (int iDccPhi0 = 0; iDccPhi0 < nDccInPhi; ++iDccPhi0) {
+      int iDcc1 = iDccPhi0 + iZ0 * nDccInPhi + nDccEndcap + 1;
+
+      if (dccNum_ != -1 && dccNum_ != iDcc1)
+        continue;
+
       stringstream s;
       s.str("");
-      const string& ext = getExt();
-      s << basename << "_fe2dcc" << setfill('0') << setw(2) << iDcc1
-	<< setfill(' ') << ext;
-      ofstream f(s.str().c_str(), (iEvent==1?ios::ate:ios::app));
-
-      if(f.fail()) return;
+      const string &ext = getExt();
+      s << basename << "_fe2dcc" << setfill('0') << setw(2) << iDcc1 << setfill(' ') << ext;
+      ofstream f(s.str().c_str(), (iEvent == 1 ? ios::ate : ios::app));
 
+      if (f.fail())
+        return;
 
-      if(writeMode_==ascii){
-	f << (iEvent==1?"":"\n") << "[Event:" << iEvent << "]\n";
+      if (writeMode_ == ascii) {
+        f << (iEvent == 1 ? "" : "\n") << "[Event:" << iEvent << "]\n";
       }
-      
-      for(int iTtEtaInSm0 = 0; iTtEtaInSm0 < nTtSmEta; ++iTtEtaInSm0){
-	int iTtEta0 = iZ0*nTtSmEta + iTtEtaInSm0;
-	for(int iTtPhiInSm0 = 0; iTtPhiInSm0 < nTtSmPhi; ++iTtPhiInSm0){
-	  //phi=0deg at middle of 1st barrel DCC:
-	  int iTtPhi0 = -nTtPhisPerEbDcc/2 + iDccPhi0*nTtPhisPerEbDcc
-	    + iTtPhiInSm0;
-	  if(iTtPhi0<0) iTtPhi0 += nTtPhi;
-	  for(int stripId1 = 1; stripId1 <= ttEdge; ++stripId1){
-	    uint16_t stripHeader =
-	      0xF << 11
-	      | (nPendingEvt & 0x3F) << 5
-	      | (gmf & 0x1) << 4
-	      | (smf & 0x1) << 3
-	      | (stripId1 & 0x7);
-	    ///	    stripHeader |= parity(stripHeader) << 15;
-	    fwrite(f,stripHeader, iWord);
-
-	    for(int xtalId1 = 1; xtalId1 <= ttEdge; ++xtalId1){
-	      
-	      uint16_t crystalHeader =
-		1 <<14
-		| (chFrameLen & 0xFF) <<4
-		| (monitorFlag & 0x1) <<3
-		| (xtalId1 & 0x7);
-	      //	      crystalHeader |=parity(crystalHeader) << 15;
-	      fwrite(f, crystalHeader, iWord);
-	      
-	      int iEta0;
-	      int iPhi0;
-	      elec2GeomNum(iTtEta0, iTtPhi0, stripId1, xtalId1,
-			   iEta0, iPhi0);
-	      if(xtalVerbose_){
-		cout << dec
-		     << "iDcc1 = " << iDcc1 << "\t"
-		     << "iEbTtEta0 = " << iTtEta0 << "\t"
-		     << "iEbTtPhi0 = " << iTtPhi0 << "\t"
-		     << "stripId1 = " << stripId1 << "\t"
-		     << "xtalId1 = " << xtalId1 << "\t"
-		     << "iEta0 = " << iEta0 << "\t"
-		     << "iPhi0 = " << iPhi0 << "\t"
-		     << "adc[5] = 0x" << hex << adcCount[iEta0][iPhi0][5]
-		     << dec << "\n";
-	      }
-	      
-
-	      const vector<uint16_t>& adc = adcCount[iEta0][iPhi0];
-	      for(unsigned iSample=0; iSample  < adc.size(); ++iSample){
-		uint16_t data = adc[iSample] & 0x3FFF;
-		//		data |= parity(data);
-		fwrite(f, data, iWord);
-	      } //next time sample
-	    } //next crystal in strip
-	  } //next strip in TT
-	} //next TT along phi
-      } //next TT along eta
-    } //next DCC
-  } //next half-barrel
+
+      for (int iTtEtaInSm0 = 0; iTtEtaInSm0 < nTtSmEta; ++iTtEtaInSm0) {
+        int iTtEta0 = iZ0 * nTtSmEta + iTtEtaInSm0;
+        for (int iTtPhiInSm0 = 0; iTtPhiInSm0 < nTtSmPhi; ++iTtPhiInSm0) {
+          // phi=0deg at middle of 1st barrel DCC:
+          int iTtPhi0 = -nTtPhisPerEbDcc / 2 + iDccPhi0 * nTtPhisPerEbDcc + iTtPhiInSm0;
+          if (iTtPhi0 < 0)
+            iTtPhi0 += nTtPhi;
+          for (int stripId1 = 1; stripId1 <= ttEdge; ++stripId1) {
+            uint16_t stripHeader =
+                0xF << 11 | (nPendingEvt & 0x3F) << 5 | (gmf & 0x1) << 4 | (smf & 0x1) << 3 | (stripId1 & 0x7);
+            ///	    stripHeader |= parity(stripHeader) << 15;
+            fwrite(f, stripHeader, iWord);
+
+            for (int xtalId1 = 1; xtalId1 <= ttEdge; ++xtalId1) {
+              uint16_t crystalHeader = 1 << 14 | (chFrameLen & 0xFF) << 4 | (monitorFlag & 0x1) << 3 | (xtalId1 & 0x7);
+              //	      crystalHeader |=parity(crystalHeader) << 15;
+              fwrite(f, crystalHeader, iWord);
+
+              int iEta0;
+              int iPhi0;
+              elec2GeomNum(iTtEta0, iTtPhi0, stripId1, xtalId1, iEta0, iPhi0);
+              if (xtalVerbose_) {
+                cout << dec << "iDcc1 = " << iDcc1 << "\t"
+                     << "iEbTtEta0 = " << iTtEta0 << "\t"
+                     << "iEbTtPhi0 = " << iTtPhi0 << "\t"
+                     << "stripId1 = " << stripId1 << "\t"
+                     << "xtalId1 = " << xtalId1 << "\t"
+                     << "iEta0 = " << iEta0 << "\t"
+                     << "iPhi0 = " << iPhi0 << "\t"
+                     << "adc[5] = 0x" << hex << adcCount[iEta0][iPhi0][5] << dec << "\n";
+              }
+
+              const vector<uint16_t> &adc = adcCount[iEta0][iPhi0];
+              for (unsigned iSample = 0; iSample < adc.size(); ++iSample) {
+                uint16_t data = adc[iSample] & 0x3FFF;
+                //		data |= parity(data);
+                fwrite(f, data, iWord);
+              }  // next time sample
+            }    // next crystal in strip
+          }      // next strip in TT
+        }        // next TT along phi
+      }          // next TT along eta
+    }            // next DCC
+  }              // next half-barrel
 }
 
-void EcalSimRawData::genSrData(string basename, int iEvent,
-			       int srf[nEbTtEta][nTtPhi]) const{
-  for(int iZ0 = 0; iZ0<2; ++iZ0){
-    for(int iDccPhi0 = 0; iDccPhi0<nDccInPhi; ++iDccPhi0){
-      int iDcc1 = iDccPhi0 + iZ0*nDccInPhi + nDccEndcap + 1;
-      if(dccNum_!=-1  && dccNum_!=iDcc1) continue;
+void EcalSimRawData::genSrData(string basename, int iEvent, int srf[nEbTtEta][nTtPhi]) const {
+  for (int iZ0 = 0; iZ0 < 2; ++iZ0) {
+    for (int iDccPhi0 = 0; iDccPhi0 < nDccInPhi; ++iDccPhi0) {
+      int iDcc1 = iDccPhi0 + iZ0 * nDccInPhi + nDccEndcap + 1;
+      if (dccNum_ != -1 && dccNum_ != iDcc1)
+        continue;
       stringstream s;
       s.str("");
-      s << basename << "_ab2dcc" << setfill('0') << setw(2) << iDcc1
-	<< setfill(' ') << getExt();
-      ofstream f(s.str().c_str(), (iEvent==1?ios::ate:ios::app));
-      
-      if(f.fail()) throw cms::Exception(string("Cannot create/open file ")
-				  + s.str() + ".");
-      
+      s << basename << "_ab2dcc" << setfill('0') << setw(2) << iDcc1 << setfill(' ') << getExt();
+      ofstream f(s.str().c_str(), (iEvent == 1 ? ios::ate : ios::app));
+
+      if (f.fail())
+        throw cms::Exception(string("Cannot create/open file ") + s.str() + ".");
+
       int iWord = 0;
-  
-      if(writeMode_==ascii){
-	f << (iEvent==1?"":"\n")<< "[Event:" << iEvent << "]\n";
+
+      if (writeMode_ == ascii) {
+        f << (iEvent == 1 ? "" : "\n") << "[Event:" << iEvent << "]\n";
       }
 
       const uint16_t le1 = 0;
       const uint16_t le0 = 0;
       const uint16_t h1 = 1;
       const uint16_t nFlags = 68;
-      uint16_t data =  (h1 & 0x1)<< 14
-	| (le1 & 0x1) << 12
-	| (le0 & 0x1) << 11
-	| (nFlags & 0x7F);
-      
+      uint16_t data = (h1 & 0x1) << 14 | (le1 & 0x1) << 12 | (le0 & 0x1) << 11 | (nFlags & 0x7F);
+
       fwrite(f, data, iWord, true);
-      
+
       int iFlag = 0;
       data = 0;
 
-      for(int iTtEtaInSm0 = 0; iTtEtaInSm0 < nTtSmEta; ++iTtEtaInSm0){
-	//	int iTtEbEta0 = iZ0*nTtSmEta + iTtEtaInSm0;
-	int iTtEta0 = nEeTtEta + iZ0*nTtSmEta + iTtEtaInSm0;
-	for(int iTtPhiInSm0 = 0; iTtPhiInSm0 < nTtSmPhi; ++iTtPhiInSm0){
-	  //phi=0deg at middle of 1st barrel DCC:
-	  int iTtPhi0 = -nTtPhisPerEbDcc/2 + iDccPhi0*nTtPhisPerEbDcc
-	    + iTtPhiInSm0;
-	  if(iTtPhi0<0) iTtPhi0 += nTtPhi;
-	  //flags are packed by four:
-	  //|15 |14 |13-12 |11      9|8      6|5      3|2      0| 
-	  //| P | 0 | X  X |  srf i+3| srf i+2| srf i+1| srf i  |
-	  //|   |   |      | field 3 |field 2 | field 1| field 0|
-	  const int field = iFlag%4;
-	  //cout << "TtEta0: " << iTtEta0 << "\tTtPhi0: " << iTtPhi0 << "\n";
-	  //cout << "#" << oct << (int)srf[iTtEta0][iTtPhi0] << "o ****> #" << oct << (srf[iTtEta0][iTtPhi0] << (field*3)) << "o\n" << dec;
-	  
-	  data |= srf[iTtEta0][iTtPhi0] << (field*3);
-
-	  if(field==3){
-	    //cout <<  srf[iTtEta0][iTtPhi0] << "----> 0x" << hex << data << "\n";
-	    fwrite(f, data, iWord, true);
-	    data = 0;
-	  }
-	  ++iFlag;
-	} //next TT along phi
-      } //next TT along eta
-    } //next DCC
-  } //next half-barrel
+      for (int iTtEtaInSm0 = 0; iTtEtaInSm0 < nTtSmEta; ++iTtEtaInSm0) {
+        //	int iTtEbEta0 = iZ0*nTtSmEta + iTtEtaInSm0;
+        int iTtEta0 = nEeTtEta + iZ0 * nTtSmEta + iTtEtaInSm0;
+        for (int iTtPhiInSm0 = 0; iTtPhiInSm0 < nTtSmPhi; ++iTtPhiInSm0) {
+          // phi=0deg at middle of 1st barrel DCC:
+          int iTtPhi0 = -nTtPhisPerEbDcc / 2 + iDccPhi0 * nTtPhisPerEbDcc + iTtPhiInSm0;
+          if (iTtPhi0 < 0)
+            iTtPhi0 += nTtPhi;
+          // flags are packed by four:
+          //|15 |14 |13-12 |11      9|8      6|5      3|2      0|
+          //| P | 0 | X  X |  srf i+3| srf i+2| srf i+1| srf i  |
+          //|   |   |      | field 3 |field 2 | field 1| field 0|
+          const int field = iFlag % 4;
+          // cout << "TtEta0: " << iTtEta0 << "\tTtPhi0: " << iTtPhi0 << "\n";
+          // cout << "#" << oct << (int)srf[iTtEta0][iTtPhi0] << "o ****> #" <<
+          // oct << (srf[iTtEta0][iTtPhi0] << (field*3)) << "o\n" << dec;
+
+          data |= srf[iTtEta0][iTtPhi0] << (field * 3);
+
+          if (field == 3) {
+            // cout <<  srf[iTtEta0][iTtPhi0] << "----> 0x" << hex << data <<
+            // "\n";
+            fwrite(f, data, iWord, true);
+            data = 0;
+          }
+          ++iFlag;
+        }  // next TT along phi
+      }    // next TT along eta
+    }      // next DCC
+  }        // next half-barrel
 }
 
+void EcalSimRawData::genTccIn(string basename, int iEvent, const int tcp[nTtEta][nTtPhi]) const {
+  for (int iZ0 = 0; iZ0 < 2; ++iZ0) {
+    for (int iTccPhi0 = 0; iTccPhi0 < nTccInPhi; ++iTccPhi0) {
+      int iTcc1 = iTccPhi0 + iZ0 * nTccInPhi + nTccEndcap + 1;
+
+      if (tccNum_ != -1 && tccNum_ != iTcc1)
+        continue;
 
-void EcalSimRawData::genTccIn(string basename, int iEvent,
-			      const int tcp[nTtEta][nTtPhi]) const{
-  for(int iZ0 = 0; iZ0<2; ++iZ0){
-    for(int iTccPhi0 = 0; iTccPhi0<nTccInPhi; ++iTccPhi0){
-      int iTcc1 = iTccPhi0 + iZ0*nTccInPhi + nTccEndcap + 1;
-      
-      if(tccNum_!=-1  && tccNum_!=iTcc1) continue;
-      
       stringstream s;
       s.str("");
-      const char* ext = ".txt"; //only ascii mode supported for TCP
+      const char *ext = ".txt";  // only ascii mode supported for TCP
+
+      s << basename << "_tcc" << setfill('0') << setw(2) << iTcc1 << setfill(' ') << ext;
+      ofstream fe2tcc(s.str().c_str(), (iEvent == 1 ? ios::ate : ios::app));
 
-      s << basename << "_tcc" << setfill('0') << setw(2) << iTcc1
-	<< setfill(' ') << ext;
-      ofstream fe2tcc(s.str().c_str(), (iEvent==1?ios::ate:ios::app));
+      if (fe2tcc.fail())
+        throw cms::Exception(string("Failed to create file ") + s.str() + ".");
 
-      if(fe2tcc.fail()) throw cms::Exception(string("Failed to create file ")
-				       + s.str() + ".");
-      
-      int memPos = iEvent-1;
+      int memPos = iEvent - 1;
       int iCh1 = 1;
-      for(int iTtEtaInSm0 = 0; iTtEtaInSm0 < nTtSmEta; ++iTtEtaInSm0){
-	int iTtEta0 = (iZ0==0) ? 27 - iTtEtaInSm0 : 28 + iTtEtaInSm0; 
-	for(int iTtPhiInSm0 = 0; iTtPhiInSm0 < nTtSmPhi; ++iTtPhiInSm0){
-	  //phi=0deg at middle of 1st barrel DCC:
-	  int iTtPhi0 = -nTtPhisPerEbTcc/2 + iTccPhi0*nTtPhisPerEbTcc
-	    + iTtPhiInSm0;
-	  iTtPhi0 += nTtPhisPerEbTcc*iTccPhi0;
-	  if(iTtPhi0<0) iTtPhi0 += nTtPhi;
-	  uint16_t tp_fe2tcc = (tcp[iTtEta0][iTtPhi0] & 0x7ff) ; //keep only Et (9:0) and FineGrain (10)
- 	  
-	  if(tpVerbose_ && tp_fe2tcc!=0){
-	    cout << dec
-		 << "iTcc1 = " << iTcc1 << "\t"
-		 << "iTtEta0 = " << iTtEta0 << "\t"
-		 << "iTtPhi0 = " << iTtPhi0 << "\t"
-		 << "iCh1 = " << iCh1 << "\t"
-		 << "memPos = " << memPos << "\t" 
-		 << "tp = 0x" << setfill('0') << hex << setw(3)
-		 << tp_fe2tcc
-		 << dec << setfill(' ') << "\n";
-	  }
-	  fe2tcc << iCh1 << "\t"
-		 << memPos << "\t"
-		 << setfill('0') << hex
-		 << "0x" << setw(4) << tp_fe2tcc << "\t"
-		 << "0"
-		 << dec << setfill(' ') << "\n";
-	  ++iCh1;
-	} //next TT along phi
-      } //next TT along eta
+      for (int iTtEtaInSm0 = 0; iTtEtaInSm0 < nTtSmEta; ++iTtEtaInSm0) {
+        int iTtEta0 = (iZ0 == 0) ? 27 - iTtEtaInSm0 : 28 + iTtEtaInSm0;
+        for (int iTtPhiInSm0 = 0; iTtPhiInSm0 < nTtSmPhi; ++iTtPhiInSm0) {
+          // phi=0deg at middle of 1st barrel DCC:
+          int iTtPhi0 = -nTtPhisPerEbTcc / 2 + iTccPhi0 * nTtPhisPerEbTcc + iTtPhiInSm0;
+          iTtPhi0 += nTtPhisPerEbTcc * iTccPhi0;
+          if (iTtPhi0 < 0)
+            iTtPhi0 += nTtPhi;
+          uint16_t tp_fe2tcc = (tcp[iTtEta0][iTtPhi0] & 0x7ff);  // keep only Et (9:0) and FineGrain (10)
+
+          if (tpVerbose_ && tp_fe2tcc != 0) {
+            cout << dec << "iTcc1 = " << iTcc1 << "\t"
+                 << "iTtEta0 = " << iTtEta0 << "\t"
+                 << "iTtPhi0 = " << iTtPhi0 << "\t"
+                 << "iCh1 = " << iCh1 << "\t"
+                 << "memPos = " << memPos << "\t"
+                 << "tp = 0x" << setfill('0') << hex << setw(3) << tp_fe2tcc << dec << setfill(' ') << "\n";
+          }
+          fe2tcc << iCh1 << "\t" << memPos << "\t" << setfill('0') << hex << "0x" << setw(4) << tp_fe2tcc << "\t"
+                 << "0" << dec << setfill(' ') << "\n";
+          ++iCh1;
+        }  // next TT along phi
+      }    // next TT along eta
       fe2tcc << std::flush;
       fe2tcc.close();
-    } //next TCC
-  } //next half-barrel
+    }  // next TCC
+  }    // next half-barrel
 }
 
-
-void EcalSimRawData::genTccOut(string basename, int iEvent,
-			       const int tps[nTtEta][nTtPhi]) const{
+void EcalSimRawData::genTccOut(string basename, int iEvent, const int tps[nTtEta][nTtPhi]) const {
   int iDccWord = 0;
 
-  for(int iZ0 = 0; iZ0<2; ++iZ0){
-    for(int iTccPhi0 = 0; iTccPhi0<nTccInPhi; ++iTccPhi0){
-      int iTcc1 = iTccPhi0 + iZ0*nTccInPhi + nTccEndcap + 1;
+  for (int iZ0 = 0; iZ0 < 2; ++iZ0) {
+    for (int iTccPhi0 = 0; iTccPhi0 < nTccInPhi; ++iTccPhi0) {
+      int iTcc1 = iTccPhi0 + iZ0 * nTccInPhi + nTccEndcap + 1;
+
+      if (tccNum_ != -1 && tccNum_ != iTcc1)
+        continue;
 
-      if(tccNum_!=-1  && tccNum_!=iTcc1) continue;
-      
       stringstream s;
       s.str("");
-      const char* ext = ".txt"; //only ascii mode supported for TCP
+      const char *ext = ".txt";  // only ascii mode supported for TCP
 
-      s << basename << "_tcc" << setfill('0') << setw(2) << iTcc1
-	<< setfill(' ') << ext;
+      s << basename << "_tcc" << setfill('0') << setw(2) << iTcc1 << setfill(' ') << ext;
 
       s.str("");
-      s << basename << "_tcc2dcc" << setfill('0') << setw(2) << iTcc1
-	<< setfill(' ') << getExt();
-      ofstream dccF(s.str().c_str(), (iEvent==1?ios::ate:ios::app));
-      
-      if(dccF.fail()){
-	cout << "Warning: failed to create or open file " << s.str() << ".\n";
-	return;
+      s << basename << "_tcc2dcc" << setfill('0') << setw(2) << iTcc1 << setfill(' ') << getExt();
+      ofstream dccF(s.str().c_str(), (iEvent == 1 ? ios::ate : ios::app));
+
+      if (dccF.fail()) {
+        cout << "Warning: failed to create or open file " << s.str() << ".\n";
+        return;
       }
-      
+
       const uint16_t h1 = 1;
       const uint16_t le1 = 0;
       const uint16_t le0 = 0;
       const uint16_t nSamples = 1;
       const uint16_t nTts = 68;
-      const uint16_t data = (h1 & 0x1) << 14
-	| (le1 & 0x1) << 12
-	| (le0 & 0x1) << 11
-	| (nSamples & 0xF) << 7
-	| (nTts & 0x7F);	
-      dccF << (iEvent==1?"":"\n") << "[Event:" << iEvent << "]\n";
+      const uint16_t data =
+          (h1 & 0x1) << 14 | (le1 & 0x1) << 12 | (le0 & 0x1) << 11 | (nSamples & 0xF) << 7 | (nTts & 0x7F);
+      dccF << (iEvent == 1 ? "" : "\n") << "[Event:" << iEvent << "]\n";
       fwrite(dccF, data, iDccWord, false);
-      
-      int memPos = iEvent-1;
+
+      int memPos = iEvent - 1;
       int iCh1 = 1;
-      for(int iTtEtaInSm0 = 0; iTtEtaInSm0 < nTtSmEta; ++iTtEtaInSm0){
-	int iTtEta0 = nEeTtEta + iZ0*nTtSmEta + iTtEtaInSm0;
-	for(int iTtPhiInSm0 = 0; iTtPhiInSm0 < nTtSmPhi; ++iTtPhiInSm0){
-	  //phi=0deg at middle of 1st barrel DCC:
-	  int iTtPhi0 = -nTtPhisPerEbTcc/2 + iTccPhi0*nTtPhisPerEbTcc
-	    + iTtPhiInSm0;
-	  if(iTtPhi0<0) iTtPhi0 += nTtPhi;
-	  
-	  if(tpVerbose_){
-	    cout << dec
-		 << "iTcc1 = " << iTcc1 << "\t"
-		 << "iTtEta0 = " << iTtEta0 << "\t"
-		 << "iTtPhi0 = " << iTtPhi0 << "\t"
-		 << "iCh1 = " << iCh1 << "\t"
-		 << "memPos = " << memPos << "\t" 
-		 << "tp = 0x" << hex << tps[iTtEta0][iTtPhi0]
-		 << dec << "\n";
-	  }
-	  fwrite(dccF, tps[iTtEta0][iTtPhi0], iDccWord, false);
-	  ++iCh1;
-	} //next TT along phi
-      } //next TT along eta
-    } //next TCC
-  } //next half-barrel
+      for (int iTtEtaInSm0 = 0; iTtEtaInSm0 < nTtSmEta; ++iTtEtaInSm0) {
+        int iTtEta0 = nEeTtEta + iZ0 * nTtSmEta + iTtEtaInSm0;
+        for (int iTtPhiInSm0 = 0; iTtPhiInSm0 < nTtSmPhi; ++iTtPhiInSm0) {
+          // phi=0deg at middle of 1st barrel DCC:
+          int iTtPhi0 = -nTtPhisPerEbTcc / 2 + iTccPhi0 * nTtPhisPerEbTcc + iTtPhiInSm0;
+          if (iTtPhi0 < 0)
+            iTtPhi0 += nTtPhi;
+
+          if (tpVerbose_) {
+            cout << dec << "iTcc1 = " << iTcc1 << "\t"
+                 << "iTtEta0 = " << iTtEta0 << "\t"
+                 << "iTtPhi0 = " << iTtPhi0 << "\t"
+                 << "iCh1 = " << iCh1 << "\t"
+                 << "memPos = " << memPos << "\t"
+                 << "tp = 0x" << hex << tps[iTtEta0][iTtPhi0] << dec << "\n";
+          }
+          fwrite(dccF, tps[iTtEta0][iTtPhi0], iDccWord, false);
+          ++iCh1;
+        }  // next TT along phi
+      }    // next TT along eta
+    }      // next TCC
+  }        // next half-barrel
 }
 
-
-void EcalSimRawData::setHParity(uint16_t& a) const{
-  const int odd = 1 <<15;
+void EcalSimRawData::setHParity(uint16_t &a) const {
+  const int odd = 1 << 15;
   const int even = 0;
-  //parity bit of numbers from 0x0 to 0xF:
-  //                    0   1   2    3   4    5    6   7   8    9    A   B    C   D   E    F           
-  const int p[16] = {even,odd,odd,even,odd,even,even,odd,odd,even,even,odd,even,odd,odd,even};
-  //inverts parity bit (LSB) of 'a' in case of even parity:
-  a ^= p[a&0xF] ^ p[(a>>4)&0xF] ^ p[(a>>8)&0xF] ^ p[a>>12&0xF] ^ odd;   
+  // parity bit of numbers from 0x0 to 0xF:
+  //                    0   1   2    3   4    5    6   7   8    9    A   B    C
+  //                    D   E    F
+  const int p[16] = {even, odd, odd, even, odd, even, even, odd, odd, even, even, odd, even, odd, odd, even};
+  // inverts parity bit (LSB) of 'a' in case of even parity:
+  a ^= p[a & 0xF] ^ p[(a >> 4) & 0xF] ^ p[(a >> 8) & 0xF] ^ p[a >> 12 & 0xF] ^ odd;
 }
 
-void EcalSimRawData::getSrfs(const edm::Event& event,
-			     int ebSrf[nTtEta][nTtPhi],
-			     int eeSrf[nEndcaps][nScX][nScY]) const{
-
-  //EE
+void EcalSimRawData::getSrfs(const edm::Event &event,
+                             int ebSrf[nTtEta][nTtPhi],
+                             int eeSrf[nEndcaps][nScX][nScY]) const {
+  // EE
   edm::Handle<EESrFlagCollection> hEeSrFlags;
   event.getByLabel(srDigiProducer_, eeSrFlagCollection_, hEeSrFlags);
-  for(size_t i=0; i < (nEndcaps*nScX*nScY); ((int*)eeSrf)[i++] = -1){};
-  if(hEeSrFlags.isValid()){
-    for(EESrFlagCollection::const_iterator it = hEeSrFlags->begin();
-	it != hEeSrFlags->end(); ++it){
-      const EESrFlag& flag = *it;
-      int iZ0 = flag.id().zside()>0?1:0;
-      int iX0 = flag.id().ix()-1;
-      int iY0 = flag.id().iy()-1;
-      assert(iZ0>=0 && iZ0<nEndcaps);
-      assert(iX0>=0 && iX0<nScX);
-      assert(iY0>=0 && iY0<nScY);
+  for (size_t i = 0; i < (nEndcaps * nScX * nScY); ((int *)eeSrf)[i++] = -1) {
+  };
+  if (hEeSrFlags.isValid()) {
+    for (EESrFlagCollection::const_iterator it = hEeSrFlags->begin(); it != hEeSrFlags->end(); ++it) {
+      const EESrFlag &flag = *it;
+      int iZ0 = flag.id().zside() > 0 ? 1 : 0;
+      int iX0 = flag.id().ix() - 1;
+      int iY0 = flag.id().iy() - 1;
+      assert(iZ0 >= 0 && iZ0 < nEndcaps);
+      assert(iX0 >= 0 && iX0 < nScX);
+      assert(iY0 >= 0 && iY0 < nScY);
       eeSrf[iZ0][iX0][iY0] = flag.value();
     }
-  } else{
+  } else {
     LogWarning("EcalSimRawData") << "EE SR flag not found ("
-				 << "Product label: " << srDigiProducer_
-				 << "Producet instance: "
-				 << eeSrFlagCollection_ << ")";
+                                 << "Product label: " << srDigiProducer_ << "Producet instance: " << eeSrFlagCollection_
+                                 << ")";
   }
 
-  //EB
+  // EB
   edm::Handle<EBSrFlagCollection> hEbSrFlags;
   event.getByLabel(srDigiProducer_, ebSrFlagCollection_, hEbSrFlags);
-  for(size_t i=0; i<(nTtEta*nTtPhi); ((int*)ebSrf)[i++] = -1){};
-  if(hEbSrFlags.isValid()){
-    for(EBSrFlagCollection::const_iterator it = hEbSrFlags->begin();
-	it != hEbSrFlags->end(); ++it){
-      
-      const EBSrFlag& flag = *it;
+  for (size_t i = 0; i < (nTtEta * nTtPhi); ((int *)ebSrf)[i++] = -1) {
+  };
+  if (hEbSrFlags.isValid()) {
+    for (EBSrFlagCollection::const_iterator it = hEbSrFlags->begin(); it != hEbSrFlags->end(); ++it) {
+      const EBSrFlag &flag = *it;
       int iEta = flag.id().ieta();
-      int iEta0 = iEta + nTtEta/2 - (iEta>=0?1:0); //0->55 from eta=-3 to eta=3
-      int iEbEta0 = iEta0 - nEeTtEta;//0->33 from eta=-1.48 to eta=1.48
+      int iEta0 = iEta + nTtEta / 2 - (iEta >= 0 ? 1 : 0);  // 0->55 from eta=-3 to eta=3
+      int iEbEta0 = iEta0 - nEeTtEta;                       // 0->33 from eta=-1.48 to eta=1.48
       int iPhi0 = flag.id().iphi() - 1;
 
-      assert(iEbEta0>=0 && iEbEta0<nEbTtEta);
-      assert(iPhi0>=0 && iPhi0<nTtPhi);
-      
+      assert(iEbEta0 >= 0 && iEbEta0 < nEbTtEta);
+      assert(iPhi0 >= 0 && iPhi0 < nTtPhi);
+
       ebSrf[iEbEta0][iPhi0] = flag.value();
     }
-  } else{
+  } else {
     LogWarning("EcalSimRawData") << "EB SR flag not found ("
-				 << "Product label: " << srDigiProducer_
-				 << "Producet instance: "
-				 << ebSrFlagCollection_ << ")";
+                                 << "Product label: " << srDigiProducer_ << "Producet instance: " << ebSrFlagCollection_
+                                 << ")";
   }
 }
 
-void EcalSimRawData::getEbDigi(const edm::Event& event,
-			       vector<uint16_t> adc[nEbEta][nEbPhi]) const{
-
+void EcalSimRawData::getEbDigi(const edm::Event &event, vector<uint16_t> adc[nEbEta][nEbPhi]) const {
   edm::Handle<EBDigiCollection> hEbDigis;
   event.getByLabel(digiProducer_, ebDigiCollection_, hEbDigis);
 
   int nSamples = 0;
-  if(hEbDigis.isValid() && !hEbDigis->empty()){//there is at least one digi
-    nSamples  = hEbDigis->begin()->size();//gets the sample count from 1st digi
+  if (hEbDigis.isValid() && !hEbDigis->empty()) {  // there is at least one digi
+    nSamples = hEbDigis->begin()->size();          // gets the sample count from 1st digi
   }
 
-
   const uint16_t suppressed = 0xFFFF;
 
   adc[0][0] = vector<uint16_t>(nSamples, suppressed);
-  
-  for(int iEbEta=0; iEbEta<nEbEta; ++iEbEta){
-    for(int iEbPhi=0; iEbPhi<nEbPhi; ++iEbPhi){
+
+  for (int iEbEta = 0; iEbEta < nEbEta; ++iEbEta) {
+    for (int iEbPhi = 0; iEbPhi < nEbPhi; ++iEbPhi) {
       adc[iEbEta][iEbPhi] = adc[0][0];
     }
   }
-  if(hEbDigis.isValid()){
-    if(xtalVerbose_) cout << setfill('0');
-    for(EBDigiCollection::const_iterator it = hEbDigis->begin();
-	it != hEbDigis->end(); ++it){
-      const EBDataFrame& frame = *it;
-      
+  if (hEbDigis.isValid()) {
+    if (xtalVerbose_)
+      cout << setfill('0');
+    for (EBDigiCollection::const_iterator it = hEbDigis->begin(); it != hEbDigis->end(); ++it) {
+      const EBDataFrame &frame = *it;
+
       int iEta0 = iEta2cIndex((frame.id()).ieta());
       int iPhi0 = iPhi2cIndex((frame.id()).iphi());
-      
+
       //     cout << "xtl indices conv: (" << frame.id().ieta() << ","
       // 	 << frame.id().iphi() << ") -> ("
       // 	 << iEta0 << "," << iPhi0 << ")\n";
-    
-      if(iEta0<0 || iEta0>=nEbEta){
-	cout << "iEta0 (= " << iEta0 << ") is out of range ("
-	     << "[0," << nEbEta -1 << "])\n";
+
+      if (iEta0 < 0 || iEta0 >= nEbEta) {
+        cout << "iEta0 (= " << iEta0 << ") is out of range ("
+             << "[0," << nEbEta - 1 << "])\n";
       }
-      if(iPhi0<0 || iPhi0>=nEbPhi){
-	cout << "iPhi0 (= " << iPhi0 << ") is out of range ("
-	     << "[0," << nEbPhi -1 << "])\n";
+      if (iPhi0 < 0 || iPhi0 >= nEbPhi) {
+        cout << "iPhi0 (= " << iPhi0 << ") is out of range ("
+             << "[0," << nEbPhi - 1 << "])\n";
       }
-    
-      if(xtalVerbose_){
-	cout << iEta0 << "\t" << iPhi0 << ":\t";
-	cout << hex;
+
+      if (xtalVerbose_) {
+        cout << iEta0 << "\t" << iPhi0 << ":\t";
+        cout << hex;
       }
-      
-      if(nSamples!=frame.size()){
-	throw cms::Exception("EcalSimRawData", "Found EB digis with different sample count! This is not supported by EcalSimRawData.");
+
+      if (nSamples != frame.size()) {
+        throw cms::Exception("EcalSimRawData",
+                             "Found EB digis with different sample count! This "
+                             "is not supported by EcalSimRawData.");
       }
-    
-      for(int iSample=0; iSample<nSamples; ++iSample){
-	const EcalMGPASample& sample = frame.sample(iSample);
-	uint16_t encodedAdc = sample.raw();
-	adc[iEta0][iPhi0][iSample] = encodedAdc;  
-	if(xtalVerbose_){
-	  cout << (iSample>0?" ":"") << "0x" << setw(4) 
-	       << encodedAdc;
-	}
+
+      for (int iSample = 0; iSample < nSamples; ++iSample) {
+        const EcalMGPASample &sample = frame.sample(iSample);
+        uint16_t encodedAdc = sample.raw();
+        adc[iEta0][iPhi0][iSample] = encodedAdc;
+        if (xtalVerbose_) {
+          cout << (iSample > 0 ? " " : "") << "0x" << setw(4) << encodedAdc;
+        }
       }
-      if(xtalVerbose_) cout << "\n" << dec;
+      if (xtalVerbose_)
+        cout << "\n" << dec;
     }
-    if(xtalVerbose_) cout << setfill(' ');
+    if (xtalVerbose_)
+      cout << setfill(' ');
   }
 }
-  
 
-void EcalSimRawData::getTp(const edm::Event& event,
-			   const std::string& collName,
-			   int tcp[nTtEta][nTtPhi]) const{
+void EcalSimRawData::getTp(const edm::Event &event, const std::string &collName, int tcp[nTtEta][nTtPhi]) const {
   edm::Handle<EcalTrigPrimDigiCollection> hTpDigis;
   event.getByLabel(tpProducer_, collName, hTpDigis);
-  if(hTpDigis.isValid() && !hTpDigis->empty()){
-    const EcalTrigPrimDigiCollection& tpDigis = *hTpDigis.product();
+  if (hTpDigis.isValid() && !hTpDigis->empty()) {
+    const EcalTrigPrimDigiCollection &tpDigis = *hTpDigis.product();
 
     //    EcalSelectiveReadout::ttFlag_t ttf[nTtEta][nTtPhi];
-    for(int iTtEta0=0; iTtEta0 < nTtEta; ++iTtEta0){
-      for(int iTtPhi0=0; iTtPhi0 < nTtPhi; ++iTtPhi0){
-	tcp[iTtEta0][iTtPhi0] = tccInDefaultVal_ ;
+    for (int iTtEta0 = 0; iTtEta0 < nTtEta; ++iTtEta0) {
+      for (int iTtPhi0 = 0; iTtPhi0 < nTtPhi; ++iTtPhi0) {
+        tcp[iTtEta0][iTtPhi0] = tccInDefaultVal_;
       }
     }
-    if(tpVerbose_){
+    if (tpVerbose_) {
       cout << setfill('0');
     }
-    for(EcalTrigPrimDigiCollection::const_iterator it = tpDigis.begin();
-	it != tpDigis.end(); ++it){
-      const EcalTriggerPrimitiveDigi& tp = *it;
+    for (EcalTrigPrimDigiCollection::const_iterator it = tpDigis.begin(); it != tpDigis.end(); ++it) {
+      const EcalTriggerPrimitiveDigi &tp = *it;
       int iTtEta0 = iTtEta2cIndex(tp.id().ieta());
       int iTtPhi0 = iTtPhi2cIndex(tp.id().iphi());
-      if(iTtEta0<0 || iTtEta0>=nTtEta){
-	cout << "iTtEta0 (= " << iTtEta0 << ") is out of range ("
-	     << "[0," << nEbTtEta -1 << "])\n";
+      if (iTtEta0 < 0 || iTtEta0 >= nTtEta) {
+        cout << "iTtEta0 (= " << iTtEta0 << ") is out of range ("
+             << "[0," << nEbTtEta - 1 << "])\n";
       }
-      if(iTtPhi0<0 || iTtPhi0>=nTtPhi){
-	cout << "iTtPhi0 (= " << iTtPhi0 << ") is out of range ("
-	     << "[0," << nTtPhi -1 << "])\n";
+      if (iTtPhi0 < 0 || iTtPhi0 >= nTtPhi) {
+        cout << "iTtPhi0 (= " << iTtPhi0 << ") is out of range ("
+             << "[0," << nTtPhi - 1 << "])\n";
       }
 
       tcp[iTtEta0][iTtPhi0] = tp[tp.sampleOfInterest()].raw();
 
-      if(tpVerbose_){
-	if(tcp[iTtEta0][iTtPhi0]!=0) //print non-zero values only
-	cout << collName << (collName.empty()?"":" ")
-	     << "TP(" << setw(2) << iTtEta0 << "," << iTtPhi0 << ") = "
-	     << "0x" << setw(4) 
-	     << tcp[iTtEta0][iTtPhi0]
-	     << "\tcmssw indices: "
-	     << tp.id().ieta() << " " << tp.id().iphi() << "\n";
+      if (tpVerbose_) {
+        if (tcp[iTtEta0][iTtPhi0] != 0)  // print non-zero values only
+          cout << collName << (collName.empty() ? "" : " ") << "TP(" << setw(2) << iTtEta0 << "," << iTtPhi0 << ") = "
+               << "0x" << setw(4) << tcp[iTtEta0][iTtPhi0] << "\tcmssw indices: " << tp.id().ieta() << " "
+               << tp.id().iphi() << "\n";
       }
-    }//next TP
-    if(tpVerbose_) cout << setfill(' ');
+    }  // next TP
+    if (tpVerbose_)
+      cout << setfill(' ');
   }
 }
diff --git a/SimCalorimetry/EcalElectronicsEmulation/src/EcalSimpleProducer.cc b/SimCalorimetry/EcalElectronicsEmulation/src/EcalSimpleProducer.cc
index 0bc66dc9addb9..f619ff7563d5a 100644
--- a/SimCalorimetry/EcalElectronicsEmulation/src/EcalSimpleProducer.cc
+++ b/SimCalorimetry/EcalElectronicsEmulation/src/EcalSimpleProducer.cc
@@ -1,107 +1,107 @@
-#include "SimCalorimetry/EcalElectronicsEmulation/interface/EcalSimpleProducer.h"
-#include "TFormula.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
-#include "DataFormats/EcalDigi/interface/EBDataFrame.h"
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
+#include "DataFormats/EcalDigi/interface/EBDataFrame.h"
+#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/Exception.h"
+#include "SimCalorimetry/EcalElectronicsEmulation/interface/EcalSimpleProducer.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
+#include "TFormula.h"
 #include <iostream>
 #include <string>
 
 using namespace std;
 using namespace edm;
 
-void EcalSimpleProducer::produce(edm::Event& evt, const edm::EventSetup&){
+void EcalSimpleProducer::produce(edm::Event &evt, const edm::EventSetup &) {
   const int ievt = evt.id().event();
-  if(formula_.get()!=nullptr){
+  if (formula_.get() != nullptr) {
     unique_ptr<EBDigiCollection> digis(new EBDigiCollection);
-    
-    digis->reserve(170*360);
-    
+
+    digis->reserve(170 * 360);
+
     const int nSamples = digis->stride();
-    for(int iEta0=0; iEta0<170; ++iEta0){
-      for(int iPhi0=0; iPhi0<360; ++iPhi0){
-	int iEta1 = cIndex2iEta(iEta0);
-	int iPhi = cIndex2iPhi(iPhi0);
-	if(verbose_) cout << "(" << iEta0 << "," << iPhi0 << "): ";
-	digis->push_back(EBDetId(iEta1,iPhi));
-	DataFrame dframe(digis->back());
-	
-	for(int t = 0; t < nSamples; ++t){
-	  uint16_t encodedAdc = (uint16_t)formula_->Eval(iEta0, iPhi0, ievt-1, t);
-	  if(verbose_) cout << encodedAdc << ((t<(nSamples-1))?"\t":"\n");
-	  dframe[t]=encodedAdc;
-	}
+    for (int iEta0 = 0; iEta0 < 170; ++iEta0) {
+      for (int iPhi0 = 0; iPhi0 < 360; ++iPhi0) {
+        int iEta1 = cIndex2iEta(iEta0);
+        int iPhi = cIndex2iPhi(iPhi0);
+        if (verbose_)
+          cout << "(" << iEta0 << "," << iPhi0 << "): ";
+        digis->push_back(EBDetId(iEta1, iPhi));
+        DataFrame dframe(digis->back());
+
+        for (int t = 0; t < nSamples; ++t) {
+          uint16_t encodedAdc = (uint16_t)formula_->Eval(iEta0, iPhi0, ievt - 1, t);
+          if (verbose_)
+            cout << encodedAdc << ((t < (nSamples - 1)) ? "\t" : "\n");
+          dframe[t] = encodedAdc;
+        }
       }
     }
     evt.put(std::move(digis));
-    //puts an empty digi collecion for endcap:
+    // puts an empty digi collecion for endcap:
     evt.put(unique_ptr<EEDigiCollection>(new EEDigiCollection()));
   }
-  if(tpFormula_.get()!=nullptr){
-    unique_ptr<EcalTrigPrimDigiCollection> tps
-      = unique_ptr<EcalTrigPrimDigiCollection>(new EcalTrigPrimDigiCollection);
-    tps->reserve(56*72);
+  if (tpFormula_.get() != nullptr) {
+    unique_ptr<EcalTrigPrimDigiCollection> tps = unique_ptr<EcalTrigPrimDigiCollection>(new EcalTrigPrimDigiCollection);
+    tps->reserve(56 * 72);
     const int nSamples = 5;
-    for(int iTtEta0=0; iTtEta0<56; ++iTtEta0){
-      for(int iTtPhi0=0; iTtPhi0<72; ++iTtPhi0){
-	int iTtEta1 = cIndex2iTtEta(iTtEta0);
-	int iTtPhi = cIndex2iTtPhi(iTtPhi0);
-	
-	if(verbose_) cout << "(" << iTtEta0 << "," << iTtPhi0 << "): ";
-	int zside = iTtEta1<0?-1:1;
-	EcalTriggerPrimitiveDigi
-	  tpframe(EcalTrigTowerDetId(zside, EcalTriggerTower,
-				     abs(iTtEta1), iTtPhi));
-	
-	tpframe.setSize(nSamples);
-	
-	if(verbose_) cout << "TP: ";
-	for(int t = 0; t < nSamples; ++t){
-	  uint16_t encodedTp = (uint16_t)tpFormula_->Eval(iTtEta0, iTtPhi0, ievt-1, t);
-	  
-	  if(verbose_) cout << "TP(" << iTtEta0 << "," << iTtPhi0 << ") = "
-			    << encodedTp << ((t<(nSamples-1))?"\t":"\n");
-	  tpframe.setSample(t, EcalTriggerPrimitiveSample(encodedTp));
-	}
-	tps->push_back(tpframe);
+    for (int iTtEta0 = 0; iTtEta0 < 56; ++iTtEta0) {
+      for (int iTtPhi0 = 0; iTtPhi0 < 72; ++iTtPhi0) {
+        int iTtEta1 = cIndex2iTtEta(iTtEta0);
+        int iTtPhi = cIndex2iTtPhi(iTtPhi0);
+
+        if (verbose_)
+          cout << "(" << iTtEta0 << "," << iTtPhi0 << "): ";
+        int zside = iTtEta1 < 0 ? -1 : 1;
+        EcalTriggerPrimitiveDigi tpframe(EcalTrigTowerDetId(zside, EcalTriggerTower, abs(iTtEta1), iTtPhi));
+
+        tpframe.setSize(nSamples);
+
+        if (verbose_)
+          cout << "TP: ";
+        for (int t = 0; t < nSamples; ++t) {
+          uint16_t encodedTp = (uint16_t)tpFormula_->Eval(iTtEta0, iTtPhi0, ievt - 1, t);
+
+          if (verbose_)
+            cout << "TP(" << iTtEta0 << "," << iTtPhi0 << ") = " << encodedTp << ((t < (nSamples - 1)) ? "\t" : "\n");
+          tpframe.setSample(t, EcalTriggerPrimitiveSample(encodedTp));
+        }
+        tps->push_back(tpframe);
       }
     }
     evt.put(std::move(tps));
   }
-  if(simHitFormula_.get()!=nullptr){//generation of barrel sim hits
-    unique_ptr<PCaloHitContainer> hits
-      = unique_ptr<PCaloHitContainer>(new PCaloHitContainer);
-    for(int iEta0=0; iEta0<170; ++iEta0){
-      for(int iPhi0=0; iPhi0<360; ++iPhi0){
-	int iEta1 = cIndex2iEta(iEta0);
-	int iPhi = cIndex2iPhi(iPhi0);
-	if(verbose_) cout << "(" << iEta0 << "," << iPhi0 << "): ";
-	
-	double em = simHitFormula_->Eval(iEta0, iPhi0, ievt-1);
+  if (simHitFormula_.get() != nullptr) {  // generation of barrel sim hits
+    unique_ptr<PCaloHitContainer> hits = unique_ptr<PCaloHitContainer>(new PCaloHitContainer);
+    for (int iEta0 = 0; iEta0 < 170; ++iEta0) {
+      for (int iPhi0 = 0; iPhi0 < 360; ++iPhi0) {
+        int iEta1 = cIndex2iEta(iEta0);
+        int iPhi = cIndex2iPhi(iPhi0);
+        if (verbose_)
+          cout << "(" << iEta0 << "," << iPhi0 << "): ";
+
+        double em = simHitFormula_->Eval(iEta0, iPhi0, ievt - 1);
         double eh = 0.;
-	double t = 0.;
-	const PCaloHit hit(EBDetId(iEta1,iPhi).rawId(), em, eh, t, 0);
-	hits->push_back(hit);
+        double t = 0.;
+        const PCaloHit hit(EBDetId(iEta1, iPhi).rawId(), em, eh, t, 0);
+        hits->push_back(hit);
       }
     }
     evt.put(std::move(hits), "EcalHitsEB");
-    //puts an empty digi collecion for endcap:
-    evt.put(unique_ptr<PCaloHitContainer>(new PCaloHitContainer()),
-	    "EcalHitsEE");
+    // puts an empty digi collecion for endcap:
+    evt.put(unique_ptr<PCaloHitContainer>(new PCaloHitContainer()), "EcalHitsEE");
   }
 }
 
-EcalSimpleProducer::EcalSimpleProducer(const edm::ParameterSet& pset):
-  EDProducer(){
+EcalSimpleProducer::EcalSimpleProducer(const edm::ParameterSet &pset) : EDProducer() {
   string formula = pset.getParameter<string>("formula");
   string tpFormula = pset.getParameter<string>("tpFormula");
   string simHitFormula = pset.getParameter<string>("simHitFormula");
-  
+
   verbose_ = pset.getUntrackedParameter<bool>("verbose", false);
-  //  replaceAll(formula, "itt0", "((((ieta0<85)*(84-ieta0)+(ieta0>=85)*(ieta0-85))/5-18)*4+((iphi0/5+2)%4))");
+  //  replaceAll(formula, "itt0",
+  //  "((((ieta0<85)*(84-ieta0)+(ieta0>=85)*(ieta0-85))/5-18)*4+((iphi0/5+2)%4))");
   replaceAll(formula, "ebm", "(ieta0<85)");
   replaceAll(formula, "ebp", "(ieta0>84)");
   replaceAll(formula, "ieta0", "x");
@@ -109,7 +109,7 @@ EcalSimpleProducer::EcalSimpleProducer(const edm::ParameterSet& pset):
   replaceAll(formula, "ievt0", "z");
   replaceAll(formula, "isample0", "t");
   //  cout << "----------> " << formula << endl;
-  
+
   replaceAll(tpFormula, "itt0", "((ieta0<28)*(27-ieta0)+(ieta0>=28)*(ieta0-28))*4+(iphi0+2)%4");
   replaceAll(tpFormula, "eb", "(ieta0>10 && ieta0<45)");
   replaceAll(tpFormula, "ebm", "(ieta0>10 && ieta0<28)");
@@ -121,53 +121,52 @@ EcalSimpleProducer::EcalSimpleProducer(const edm::ParameterSet& pset):
   replaceAll(tpFormula, "iphi0", "y");
   replaceAll(tpFormula, "ievt0", "z");
   replaceAll(tpFormula, "isample0", "t");
-  //cout << "----------> " << tpFormula << endl;
-  
+  // cout << "----------> " << tpFormula << endl;
 
-  //replaceAll(simHitormula, "itt0", "((((ieta0<85)*(84-ieta0)+(ieta0>=85)*(ieta0-85))/5-18)*4+((iphi0/5+2)%4))");
+  // replaceAll(simHitormula, "itt0",
+  // "((((ieta0<85)*(84-ieta0)+(ieta0>=85)*(ieta0-85))/5-18)*4+((iphi0/5+2)%4))");
   replaceAll(simHitFormula, "ebm", "(ieta0<85)");
   replaceAll(simHitFormula, "ebp", "(ieta0>84)");
   replaceAll(simHitFormula, "ieta0", "x");
   replaceAll(simHitFormula, "iphi0", "y");
   replaceAll(simHitFormula, "ievt0", "z");
-  
-  if(!formula.empty()){
+
+  if (!formula.empty()) {
     formula_ = unique_ptr<TFormula>(new TFormula("f", formula.c_str()));
     Int_t err = formula_->Compile();
-    if(err!=0){
+    if (err != 0) {
       throw cms::Exception("Error in EcalSimpleProducer 'formula' config.");
     }
     produces<EBDigiCollection>();
     produces<EEDigiCollection>();
   }
-  if(!tpFormula.empty()){
+  if (!tpFormula.empty()) {
     tpFormula_ = unique_ptr<TFormula>(new TFormula("f", tpFormula.c_str()));
     Int_t err = tpFormula_->Compile();
-    if(err!=0){
+    if (err != 0) {
       throw cms::Exception("Error in EcalSimpleProducer 'tpFormula' config.");
     }
     produces<EcalTrigPrimDigiCollection>();
   }
-  if(!simHitFormula.empty()){
-    simHitFormula_
-      = unique_ptr<TFormula>(new TFormula("f", simHitFormula.c_str()));
+  if (!simHitFormula.empty()) {
+    simHitFormula_ = unique_ptr<TFormula>(new TFormula("f", simHitFormula.c_str()));
     Int_t err = simHitFormula_->Compile();
-    if(err!=0){
-      throw cms::Exception("Error in EcalSimpleProducer "
-			   "'simHitFormula' config.");
+    if (err != 0) {
+      throw cms::Exception(
+          "Error in EcalSimpleProducer "
+          "'simHitFormula' config.");
     }
     produces<edm::PCaloHitContainer>("EcalHitsEB");
     produces<edm::PCaloHitContainer>("EcalHitsEE");
   }
 }
 
-void EcalSimpleProducer::replaceAll(std::string& s, const std::string& from,
-				  const std::string& to) const{
+void EcalSimpleProducer::replaceAll(std::string &s, const std::string &from, const std::string &to) const {
   string::size_type pos = 0;
   //  cout << "replaceAll(" << s << "," << from << "," << to << ")\n";
-  while((pos=s.find(from, pos))!=string::npos){
+  while ((pos = s.find(from, pos)) != string::npos) {
     // cout << "replace(" << pos << "," << from.size() << "," << to << ")\n";
     s.replace(pos, from.size(), to);
-    //   cout << " -> " << s << "\n"; 
+    //   cout << " -> " << s << "\n";
   }
 }
diff --git a/SimCalorimetry/EcalElectronicsEmulation/src/SealModules.cc b/SimCalorimetry/EcalElectronicsEmulation/src/SealModules.cc
index 6dfa3542d8177..1986039f3dd4f 100644
--- a/SimCalorimetry/EcalElectronicsEmulation/src/SealModules.cc
+++ b/SimCalorimetry/EcalElectronicsEmulation/src/SealModules.cc
@@ -1,9 +1,8 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "SimCalorimetry/EcalElectronicsEmulation/interface/EcalSimpleProducer.h"
-#include "SimCalorimetry/EcalElectronicsEmulation/interface/EcalSimRawData.h"
 #include "SimCalorimetry/EcalElectronicsEmulation/interface/EcalFEtoDigi.h"
-
+#include "SimCalorimetry/EcalElectronicsEmulation/interface/EcalSimRawData.h"
+#include "SimCalorimetry/EcalElectronicsEmulation/interface/EcalSimpleProducer.h"
 
 DEFINE_FWK_MODULE(EcalSimpleProducer);
 DEFINE_FWK_MODULE(EcalSimRawData);
diff --git a/SimCalorimetry/EcalSelectiveReadoutProducers/src/EcalSelectiveReadoutProducer.cc b/SimCalorimetry/EcalSelectiveReadoutProducers/src/EcalSelectiveReadoutProducer.cc
index 5d8458add37b6..6b621b4020981 100644
--- a/SimCalorimetry/EcalSelectiveReadoutProducers/src/EcalSelectiveReadoutProducer.cc
+++ b/SimCalorimetry/EcalSelectiveReadoutProducers/src/EcalSelectiveReadoutProducer.cc
@@ -515,8 +515,8 @@ void EcalSelectiveReadoutProducer::checkValidity(const EcalSRSettings& settings)
 //      && settings.dccNormalizedWeights_.size() != 54
 //      && settings.dccNormalizedWeights_.size() != 75848){
 //     throw cms::Exception("Configuration") << "Invalid number of DCC weight set (" << settings.dccNormalizedWeights_.size()
-// 					  << ") in condition object EcalSRSetting::dccNormalizedWeights_. "
-// 					  << "Valid counts are: 1 (single set), 2 (EB and EE), 54 (one per DCC) and 75848 "
+//       << ") in condition object EcalSRSetting::dccNormalizedWeights_. "
+//       << "Valid counts are: 1 (single set), 2 (EB and EE), 54 (one per DCC) and 75848 "
 //       "(one per crystal)\n";
 //   }
   
diff --git a/SimCalorimetry/EcalSimAlgos/interface/APDShape.h b/SimCalorimetry/EcalSimAlgos/interface/APDShape.h
index a0aaba08669a1..814ef4b8fcd64 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/APDShape.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/APDShape.h
@@ -3,17 +3,19 @@
 
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalShapeBase.h"
 
-class APDShape : public EcalShapeBase
-{
-   public:
-   APDShape(bool useDB):EcalShapeBase(useDB){if(!useDB)buildMe();} // if useDB = true, then buildMe is executed when setEventSetup and DB conditions are available
-//   APDShape():EcalShapeBase(false){;}
+class APDShape : public EcalShapeBase {
+public:
+  APDShape(bool useDB) : EcalShapeBase(useDB) {
+    if (!useDB)
+      buildMe();
+  }  // if useDB = true, then buildMe is executed when setEventSetup and DB conditions are available
+     //   APDShape():EcalShapeBase(false){;}
 
-   protected:
-      void fillShape(float &time_interval, double &m_thresh, EcalShapeBase::DVec& aVec, const edm::EventSetup* es) const override ;
+protected:
+  void fillShape(float& time_interval,
+                 double& m_thresh,
+                 EcalShapeBase::DVec& aVec,
+                 const edm::EventSetup* es) const override;
 };
-  
-
 
 #endif
-  
diff --git a/SimCalorimetry/EcalSimAlgos/interface/APDSimParameters.h b/SimCalorimetry/EcalSimAlgos/interface/APDSimParameters.h
index 6cf80af1f70af..511b9bac99257 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/APDSimParameters.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/APDSimParameters.h
@@ -5,56 +5,53 @@
 #include <string>
 #include <vector>
 
-class APDSimParameters
-{
-   public:
-
-      APDSimParameters( bool   addToBarrel  ,
-			bool   separateDigi ,
-			double simToPELow   , 
-		        double simToPEHigh  , 
-		        double timeOffset   ,
-		        double timeOffWidth ,
-			bool   doPEStats    ,
-			const std::string& digiTag,
-			const std::vector<double>& nonlParms ) :
-
-	 m_addToBarrel  ( addToBarrel  ) ,
-	 m_separateDigi ( separateDigi ) ,
-	 m_simToPELow   ( simToPELow   ) ,
-	 m_simToPEHigh  ( simToPEHigh  ) ,
-	 m_timeOffset   ( timeOffset   ) ,
-	 m_timeOffWidth ( fabs( timeOffWidth ) ) ,
-	 m_doPEStats    ( doPEStats    ) ,
-	 m_digiTag      ( digiTag      ) ,
-	 m_nonlParms    ( nonlParms    )      {}
-
-      virtual ~APDSimParameters() {}
-
-      bool   addToBarrel()  const { return m_addToBarrel  ; }
-      bool   separateDigi() const { return m_separateDigi ; }
-      double simToPELow()   const { return m_simToPELow   ; }
-      double simToPEHigh()  const { return m_simToPEHigh  ; }
-      double timeOffset()   const { return m_timeOffset   ; }
-      double timeOffWidth() const { return m_timeOffWidth ; }
-      bool   doPEStats()    const { return m_doPEStats    ; }
-
-      const std::string& digiTag() const { return m_digiTag    ; }
-
-      const std::vector<double>& nonlParms() const { return m_nonlParms ; }
-
-   private:
-
-      bool   m_addToBarrel  ;
-      bool   m_separateDigi ;
-      double m_simToPELow   ;
-      double m_simToPEHigh  ;
-      double m_timeOffset   ;
-      double m_timeOffWidth ;
-      bool   m_doPEStats    ;
-      std::string m_digiTag ;
-      std::vector<double> m_nonlParms ;
+class APDSimParameters {
+public:
+  APDSimParameters(bool addToBarrel,
+                   bool separateDigi,
+                   double simToPELow,
+                   double simToPEHigh,
+                   double timeOffset,
+                   double timeOffWidth,
+                   bool doPEStats,
+                   const std::string& digiTag,
+                   const std::vector<double>& nonlParms)
+      :
+
+        m_addToBarrel(addToBarrel),
+        m_separateDigi(separateDigi),
+        m_simToPELow(simToPELow),
+        m_simToPEHigh(simToPEHigh),
+        m_timeOffset(timeOffset),
+        m_timeOffWidth(fabs(timeOffWidth)),
+        m_doPEStats(doPEStats),
+        m_digiTag(digiTag),
+        m_nonlParms(nonlParms) {}
+
+  virtual ~APDSimParameters() {}
+
+  bool addToBarrel() const { return m_addToBarrel; }
+  bool separateDigi() const { return m_separateDigi; }
+  double simToPELow() const { return m_simToPELow; }
+  double simToPEHigh() const { return m_simToPEHigh; }
+  double timeOffset() const { return m_timeOffset; }
+  double timeOffWidth() const { return m_timeOffWidth; }
+  bool doPEStats() const { return m_doPEStats; }
+
+  const std::string& digiTag() const { return m_digiTag; }
+
+  const std::vector<double>& nonlParms() const { return m_nonlParms; }
+
+private:
+  bool m_addToBarrel;
+  bool m_separateDigi;
+  double m_simToPELow;
+  double m_simToPEHigh;
+  double m_timeOffset;
+  double m_timeOffWidth;
+  bool m_doPEStats;
+  std::string m_digiTag;
+  std::vector<double> m_nonlParms;
 };
 
 #endif
-
diff --git a/SimCalorimetry/EcalSimAlgos/interface/EBHitResponse.h b/SimCalorimetry/EcalSimAlgos/interface/EBHitResponse.h
index 5e12bd5658e5b..80699d98f24a7 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/EBHitResponse.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/EBHitResponse.h
@@ -5,102 +5,94 @@
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalHitResponse.h"
 #include "CondFormats/EcalObjects/interface/EcalIntercalibConstantsMC.h"
 
-class APDSimParameters ;
+class APDSimParameters;
 
 namespace CLHEP {
-   class HepRandomEngine;
+  class HepRandomEngine;
 }
 
-class EBHitResponse : public EcalHitResponse
-{
-   public:
+class EBHitResponse : public EcalHitResponse {
+public:
+  typedef CaloTSamples<float, 10> EBSamples;
 
-      typedef CaloTSamples<float,10> EBSamples ;
+  typedef std::vector<double> VecD;
 
-      typedef std::vector<double> VecD ;
+  enum { kNOffsets = 2000 };
 
-      enum { kNOffsets = 2000 } ;
+  EBHitResponse(const CaloVSimParameterMap* parameterMap,
+                const CaloVShape* shape,
+                bool apdOnly,
+                const APDSimParameters* apdPars,
+                const CaloVShape* apdShape);
 
-      EBHitResponse( const CaloVSimParameterMap* parameterMap , 
-		     const CaloVShape*           shape        ,
-		     bool                        apdOnly      ,
-		     const APDSimParameters*     apdPars      , 
-		     const CaloVShape*           apdShape       ) ;
+  ~EBHitResponse() override;
 
-      ~EBHitResponse() override ;
+  void initialize(CLHEP::HepRandomEngine*);
 
-      void initialize(CLHEP::HepRandomEngine*);
+  virtual bool keepBlank() const { return false; }
 
-      virtual bool keepBlank() const { return false ; }
+  void setIntercal(const EcalIntercalibConstantsMC* ical);
 
-      void setIntercal( const EcalIntercalibConstantsMC* ical ) ;
+  void add(const PCaloHit& hit, CLHEP::HepRandomEngine*) override;
 
+  void initializeHits() override;
 
-      void add( const PCaloHit&  hit, CLHEP::HepRandomEngine* ) override;
+  void finalizeHits() override;
 
-      void initializeHits() override;
+  void run(MixCollection<PCaloHit>& hits, CLHEP::HepRandomEngine*) override;
 
-      void finalizeHits() override;
+  unsigned int samplesSize() const override;
 
-      void run( MixCollection<PCaloHit>& hits, CLHEP::HepRandomEngine* ) override;
+  EcalSamples* operator[](unsigned int i) override;
 
-      unsigned int samplesSize() const override;
+  const EcalSamples* operator[](unsigned int i) const override;
 
-      EcalSamples* operator[]( unsigned int i ) override;
+protected:
+  unsigned int samplesSizeAll() const override;
 
-      const EcalSamples* operator[]( unsigned int i ) const override;
+  EcalSamples* vSamAll(unsigned int i) override;
 
-   protected:
+  const EcalSamples* vSamAll(unsigned int i) const override;
 
-      unsigned int samplesSizeAll() const override;
+  EcalSamples* vSam(unsigned int i) override;
 
-      EcalSamples* vSamAll( unsigned int i ) override;
+  void putAPDSignal(const DetId& detId, double npe, double time);
 
-      const EcalSamples* vSamAll( unsigned int i ) const override;
+private:
+  const VecD& offsets() const { return m_timeOffVec; }
 
-      EcalSamples* vSam( unsigned int i ) override ;
+  const double nonlFunc(double enr) const {
+    return (pelo > enr ? pext : (pehi > enr ? nonlFunc1(enr) : pfac * atan(log10(enr - pehi + 0.00001)) + poff));
+  }
 
-      void putAPDSignal( const DetId& detId, double npe, double time ) ;
+  const double nonlFunc1(double energy) const {
+    const double enr(log10(energy));
+    const double enr2(enr * enr);
+    const double enr3(enr2 * enr);
+    return (pcub * enr3 + pqua * enr2 + plin * enr + pcon);
+  }
 
-   private:
+  const APDSimParameters* apdParameters() const;
+  const CaloVShape* apdShape() const;
 
-      const VecD& offsets() const { return m_timeOffVec ; }
+  double apdSignalAmplitude(const PCaloHit& hit, CLHEP::HepRandomEngine*) const;
 
-      const double nonlFunc( double enr ) const {
-	 return ( pelo > enr ? pext :
-		  ( pehi > enr ? nonlFunc1( enr ) : 
-		    pfac*atan( log10( enr - pehi + 0.00001 ) ) + poff ) ) ; }
+  void findIntercalibConstant(const DetId& detId, double& icalconst) const;
 
-      const double nonlFunc1( double energy ) const {
-	 const double enr ( log10(energy) ) ;
-	 const double enr2 ( enr*enr ) ;
-	 const double enr3 ( enr2*enr ) ;
-	 return ( pcub*enr3 + pqua*enr2 + plin*enr + pcon ) ; }
+  const bool m_apdOnly;
+  const APDSimParameters* m_apdPars;
+  const CaloVShape* m_apdShape;
+  const EcalIntercalibConstantsMC* m_intercal;
 
-      const APDSimParameters* apdParameters() const ;
-      const CaloVShape*       apdShape()      const ;
+  std::vector<double> m_timeOffVec;
 
-      double apdSignalAmplitude( const PCaloHit& hit, CLHEP::HepRandomEngine* ) const ;
+  std::vector<double> m_apdNpeVec;
+  std::vector<double> m_apdTimeVec;
 
-      void findIntercalibConstant( const DetId& detId, 
-				   double&      icalconst ) const ;
+  const double pcub, pqua, plin, pcon, pelo, pehi, pasy, pext, poff, pfac;
 
-      const bool                       m_apdOnly  ;
-      const APDSimParameters*          m_apdPars  ;
-      const CaloVShape*                m_apdShape ;
-      const EcalIntercalibConstantsMC* m_intercal ;
+  std::vector<EBSamples> m_vSam;
 
-      std::vector<double> m_timeOffVec ;
-
-      std::vector<double> m_apdNpeVec ;
-      std::vector<double> m_apdTimeVec ;
-
-      const double pcub, pqua, plin, pcon, pelo, pehi, pasy, pext, poff, pfac ;
-
-      std::vector<EBSamples> m_vSam ;
-
-      bool m_isInitialized;
+  bool m_isInitialized;
 };
 #endif
-
-
diff --git a/SimCalorimetry/EcalSimAlgos/interface/EBShape.h b/SimCalorimetry/EcalSimAlgos/interface/EBShape.h
index 947ed1f122604..6a4e268e19bb2 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/EBShape.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/EBShape.h
@@ -3,17 +3,19 @@
 
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalShapeBase.h"
 
-class EBShape : public EcalShapeBase
-{
-   public:
-   EBShape(bool useDB):EcalShapeBase(useDB){if(!useDB)buildMe();} // if useDB = true, then buildMe is executed when setEventSetup and DB conditions are available 
-   //EBShape():EcalShapeBase(false){;}
+class EBShape : public EcalShapeBase {
+public:
+  EBShape(bool useDB) : EcalShapeBase(useDB) {
+    if (!useDB)
+      buildMe();
+  }  // if useDB = true, then buildMe is executed when setEventSetup and DB conditions are available
+  //EBShape():EcalShapeBase(false){;}
 
-   protected:
-      void fillShape(float &time_interval, double &m_thresh, EcalShapeBase::DVec& aVec, const edm::EventSetup* es) const override ;
+protected:
+  void fillShape(float& time_interval,
+                 double& m_thresh,
+                 EcalShapeBase::DVec& aVec,
+                 const edm::EventSetup* es) const override;
 };
-  
-
 
 #endif
-  
diff --git a/SimCalorimetry/EcalSimAlgos/interface/EEHitResponse.h b/SimCalorimetry/EcalSimAlgos/interface/EEHitResponse.h
index c1b3460e5eed4..62fc30826f421 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/EEHitResponse.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/EEHitResponse.h
@@ -4,39 +4,32 @@
 #include "CalibFormats/CaloObjects/interface/CaloTSamples.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalHitResponse.h"
 
-class EEHitResponse : public EcalHitResponse
-{
-   public:
+class EEHitResponse : public EcalHitResponse {
+public:
+  typedef CaloTSamples<float, 10> EESamples;
 
-      typedef CaloTSamples<float,10> EESamples ;
+  EEHitResponse(const CaloVSimParameterMap* parameterMap, const CaloVShape* shape);
 
-      EEHitResponse( const CaloVSimParameterMap* parameterMap , 
-		     const CaloVShape*           shape          ) ;
+  ~EEHitResponse() override;
 
-      ~EEHitResponse() override ;
+  virtual bool keepBlank() const { return false; }
 
-      virtual bool keepBlank() const { return false ; }
+  unsigned int samplesSize() const override;
 
-      unsigned int samplesSize() const override ;
+  EcalSamples* operator[](unsigned int i) override;
 
-      EcalSamples* operator[]( unsigned int i ) override ;
+  const EcalSamples* operator[](unsigned int i) const override;
 
-      const EcalSamples* operator[]( unsigned int i ) const override ;
+protected:
+  unsigned int samplesSizeAll() const override;
 
-   protected:
+  EcalSamples* vSamAll(unsigned int i) override;
 
-      unsigned int samplesSizeAll() const override ;
+  const EcalSamples* vSamAll(unsigned int i) const override;
 
-      EcalSamples* vSamAll( unsigned int i ) override ;
+  EcalSamples* vSam(unsigned int i) override;
 
-      const EcalSamples* vSamAll( unsigned int i ) const override ;
-
-      EcalSamples* vSam( unsigned int i ) override ;
-
-   private:
-
-      std::vector<EESamples> m_vSam ;
+private:
+  std::vector<EESamples> m_vSam;
 };
 #endif
-
-
diff --git a/SimCalorimetry/EcalSimAlgos/interface/EEShape.h b/SimCalorimetry/EcalSimAlgos/interface/EEShape.h
index 0b4be5a78631c..2ccf37bc9de64 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/EEShape.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/EEShape.h
@@ -3,17 +3,19 @@
 
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalShapeBase.h"
 
-class EEShape : public EcalShapeBase
-{
-   public:
-   EEShape(bool useDB):EcalShapeBase(useDB){if(!useDB)buildMe();} // if useDB = true, then buildMe is executed when setEventSetup and DB conditions are available}
-//   EEShape():EcalShapeBase(false){;}
+class EEShape : public EcalShapeBase {
+public:
+  EEShape(bool useDB) : EcalShapeBase(useDB) {
+    if (!useDB)
+      buildMe();
+  }  // if useDB = true, then buildMe is executed when setEventSetup and DB conditions are available}
+     //   EEShape():EcalShapeBase(false){;}
 
-   protected:
-      void fillShape(float &time_interval, double &m_thresh, EcalShapeBase::DVec& aVec, const edm::EventSetup* es) const override ;
+protected:
+  void fillShape(float& time_interval,
+                 double& m_thresh,
+                 EcalShapeBase::DVec& aVec,
+                 const edm::EventSetup* es) const override;
 };
-  
-
 
 #endif
-  
diff --git a/SimCalorimetry/EcalSimAlgos/interface/ESDigitizer.h b/SimCalorimetry/EcalSimAlgos/interface/ESDigitizer.h
index 17e14385cd192..36390ef375fd3 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/ESDigitizer.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/ESDigitizer.h
@@ -5,60 +5,48 @@
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalDigitizerTraits.h"
 
 namespace CLHEP {
-   class RandGeneral;
-   class HepRandomEngine;
-}
+  class RandGeneral;
+  class HepRandomEngine;
+}  // namespace CLHEP
 
 #include <vector>
 
-class ESDigitizer : public EcalTDigitizer< ESDigitizerTraits >
-{
-   public:
+class ESDigitizer : public EcalTDigitizer<ESDigitizerTraits> {
+public:
+  typedef ESDigitizerTraits::ElectronicsSim ElectronicsSim;
 
-      typedef ESDigitizerTraits::ElectronicsSim ElectronicsSim ;
+  ESDigitizer(EcalHitResponse* hitResponse, ElectronicsSim* electronicsSim, bool addNoise);
 
-      ESDigitizer( EcalHitResponse* hitResponse    ,
-		   ElectronicsSim*  electronicsSim ,
-		   bool             addNoise         ) ;
+  ~ESDigitizer() override;
 
-      ~ESDigitizer() override ;
+  void run(ESDigiCollection& output, CLHEP::HepRandomEngine*) override;
 
-      void run( ESDigiCollection& output, CLHEP::HepRandomEngine* ) override;
+  void setDetIds(const std::vector<DetId>& detIds);
 
-      void setDetIds( const std::vector<DetId>& detIds ) ;
+  void setGain(const int gain);
 
-      void setGain( const int gain ) ;
+private:
+  void createNoisyList(std::vector<DetId>& abThreshCh, CLHEP::HepRandomEngine*);
 
-   private:
+  const std::vector<DetId>* m_detIds;
+  CLHEP::RandGeneral* m_ranGeneral;
+  int m_ESGain;
+  double m_histoBin;
+  double m_histoInf;
+  double m_histoWid;
+  double m_meanNoisy;
 
-      void createNoisyList( std::vector<DetId>& abThreshCh, CLHEP::HepRandomEngine* ) ;
+  class Triplet {
+  public:
+    Triplet() : first(0), second(0), third(0) {}
+    Triplet(uint32_t a0, uint32_t a1, uint32_t a2) : first(a0), second(a1), third(a2) {}
+    ~Triplet(){};
+    uint32_t first;
+    uint32_t second;
+    uint32_t third;
+  };
 
-      const std::vector<DetId>* m_detIds      ;
-      CLHEP::RandGeneral*       m_ranGeneral  ;
-      int                       m_ESGain      ;
-      double                    m_histoBin    ;
-      double                    m_histoInf    ;
-      double                    m_histoWid    ;
-      double                    m_meanNoisy   ;
-
-      class Triplet
-      {
-	 public:
-	    Triplet() : first ( 0 ), second ( 0 ), third ( 0 ) {}
-	    Triplet( uint32_t a0 ,
-		     uint32_t a1 ,
-		     uint32_t a2  ) :
-	       first ( a0 ), second ( a1 ), third ( a2 ) {}
-	    ~Triplet() {} ;
-	    uint32_t first  ;
-	    uint32_t second ;
-	    uint32_t third  ;
-      };
-
-
-
-
-      std::vector<Triplet> m_trip ;
+  std::vector<Triplet> m_trip;
 };
 
 #endif
diff --git a/SimCalorimetry/EcalSimAlgos/interface/ESElectronicsSim.h b/SimCalorimetry/EcalSimAlgos/interface/ESElectronicsSim.h
index 1199c38eab7e6..a828a28c3ae6d 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/ESElectronicsSim.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/ESElectronicsSim.h
@@ -7,26 +7,24 @@
 #include "CondFormats/ESObjects/interface/ESPedestals.h"
 #include "CondFormats/ESObjects/interface/ESIntercalibConstants.h"
 
-#include<vector>
+#include <vector>
 
 namespace CLHEP {
   class HepRandomEngine;
 }
 
-class ESElectronicsSim
-{
- public:
+class ESElectronicsSim {
+public:
+  enum { MAXADC = 4095 };
+  enum { MINADC = 0 };
 
-  enum {MAXADC = 4095};
-  enum {MINADC = 0};
-
-  ESElectronicsSim (bool addNoise);
+  ESElectronicsSim(bool addNoise);
   virtual ~ESElectronicsSim();
 
-  void setGain (const int gain) { gain_ = gain; }
+  void setGain(const int gain) { gain_ = gain; }
   void setPedestals(const ESPedestals* peds) { peds_ = peds; }
   void setMIPs(const ESIntercalibConstants* mips) { mips_ = mips; }
-  void setMIPToGeV (const double MIPToGeV) { MIPToGeV_ = MIPToGeV; }
+  void setMIPToGeV(const double MIPToGeV) { MIPToGeV_ = MIPToGeV; }
 
   virtual void analogToDigital(CLHEP::HepRandomEngine*, const CaloSamples& cs, ESDataFrame& df) const;
   virtual void digitalToAnalog(const ESDataFrame& df, CaloSamples& cs) const;
@@ -34,18 +32,15 @@ class ESElectronicsSim
   ///  anything that needs to be done once per event
   void newEvent(CLHEP::HepRandomEngine*) {}
 
-  private :
-
-    bool addNoise_;
-    int gain_;
-    const ESPedestals *peds_;
-    const ESIntercalibConstants *mips_;
-    double MIPToGeV_;
-
-    std::vector<ESSample> encode(const CaloSamples& timeframe, CLHEP::HepRandomEngine*) const;
-    double decode(const ESSample & sample, const DetId & detId) const;
-
-} ;
+private:
+  bool addNoise_;
+  int gain_;
+  const ESPedestals* peds_;
+  const ESIntercalibConstants* mips_;
+  double MIPToGeV_;
 
+  std::vector<ESSample> encode(const CaloSamples& timeframe, CLHEP::HepRandomEngine*) const;
+  double decode(const ESSample& sample, const DetId& detId) const;
+};
 
 #endif
diff --git a/SimCalorimetry/EcalSimAlgos/interface/ESElectronicsSimFast.h b/SimCalorimetry/EcalSimAlgos/interface/ESElectronicsSimFast.h
index 0b5362391ff7c..1bd2964b0c481 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/ESElectronicsSimFast.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/ESElectronicsSimFast.h
@@ -13,44 +13,35 @@ namespace CLHEP {
   class HepRandomEngine;
 }
 
-class ESElectronicsSimFast
-{
-   public:
+class ESElectronicsSimFast {
+public:
+  typedef CaloTSamples<float, 3> ESSamples;
 
-      typedef CaloTSamples<float,3> ESSamples ;
+  enum { MAXADC = 4095, MINADC = 0 };
 
-      enum { MAXADC = 4095,
-	     MINADC =    0 } ;
-  
-      ESElectronicsSimFast( bool addNoise , bool PreMix1) ;
-      ~ESElectronicsSimFast() ;
+  ESElectronicsSimFast(bool addNoise, bool PreMix1);
+  ~ESElectronicsSimFast();
 
-      void setPedestals( const ESPedestals* peds ) ;
+  void setPedestals(const ESPedestals* peds);
 
-      void setMIPs( const ESIntercalibConstants* mips ) ;
+  void setMIPs(const ESIntercalibConstants* mips);
 
-      void setMIPToGeV( double MIPToGeV ) ;
+  void setMIPToGeV(double MIPToGeV);
 
-      void analogToDigital( CLHEP::HepRandomEngine*,
-                            ESSamples&   cs ,
-			    ESDataFrame& df ,
-			    bool         isNoise = false ) const ;
+  void analogToDigital(CLHEP::HepRandomEngine*, ESSamples& cs, ESDataFrame& df, bool isNoise = false) const;
 
-      void newEvent() {}
+  void newEvent() {}
 
+private:
+  bool m_addNoise;
 
+  bool m_PreMix1;
 
-   private :
+  double m_MIPToGeV;
 
-      bool m_addNoise ;
+  const ESPedestals* m_peds;
 
-      bool m_PreMix1;
-
-      double m_MIPToGeV ;
-
-      const ESPedestals* m_peds ;
-
-      const ESIntercalibConstants* m_mips ;
-} ;
+  const ESIntercalibConstants* m_mips;
+};
 
 #endif
diff --git a/SimCalorimetry/EcalSimAlgos/interface/ESHitResponse.h b/SimCalorimetry/EcalSimAlgos/interface/ESHitResponse.h
index cc5611fdbd2c1..8187b76af136f 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/ESHitResponse.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/ESHitResponse.h
@@ -4,39 +4,32 @@
 #include "CalibFormats/CaloObjects/interface/CaloTSamples.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalHitResponse.h"
 
-class ESHitResponse : public EcalHitResponse
-{
-   public:
+class ESHitResponse : public EcalHitResponse {
+public:
+  typedef CaloTSamples<float, 3> ESSamples;
 
-      typedef CaloTSamples<float,3> ESSamples ;
+  ESHitResponse(const CaloVSimParameterMap* parameterMap, const CaloVShape* shape);
 
-      ESHitResponse( const CaloVSimParameterMap* parameterMap , 
-		     const CaloVShape*           shape          ) ;
+  ~ESHitResponse() override;
 
-      ~ESHitResponse() override ;
+  virtual bool keepBlank() const { return false; }
 
-      virtual bool keepBlank() const { return false ; }
+  unsigned int samplesSize() const override;
 
-      unsigned int samplesSize() const override ;
+  EcalSamples* operator[](unsigned int i) override;
 
-      EcalSamples* operator[]( unsigned int i ) override ;
+  const EcalSamples* operator[](unsigned int i) const override;
 
-      const EcalSamples* operator[]( unsigned int i ) const override ;
+protected:
+  unsigned int samplesSizeAll() const override;
 
-   protected:
+  EcalSamples* vSamAll(unsigned int i) override;
 
-      unsigned int samplesSizeAll() const override ;
+  const EcalSamples* vSamAll(unsigned int i) const override;
 
-      EcalSamples* vSamAll( unsigned int i ) override ;
+  EcalSamples* vSam(unsigned int i) override;
 
-      const EcalSamples* vSamAll( unsigned int i ) const override ;
-
-      EcalSamples* vSam( unsigned int i ) override ;
-
-   private:
-
-      std::vector<ESSamples> m_vSam ;
+private:
+  std::vector<ESSamples> m_vSam;
 };
 #endif
-
-
diff --git a/SimCalorimetry/EcalSimAlgos/interface/ESShape.h b/SimCalorimetry/EcalSimAlgos/interface/ESShape.h
index 6dd54a57a11cb..e8907d5ef95b1 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/ESShape.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/ESShape.h
@@ -12,27 +12,22 @@
  * 
  * Preshower three time samples happen at -5, 20 and 45 ns 
  *
- */                                                                                            
-class ESShape : public CaloVShape 
-{
-  
- public:
-  
+ */
+class ESShape : public CaloVShape {
+public:
   /// ctor
   ESShape();
   /// dtor
-  ~ESShape() override{}
-  
-  void setGain (const int gain) { theGain_ = gain; }
-  double operator () (double time) const override;
-  double timeToRise()              const override ;
-  
-  void display () const {}
+  ~ESShape() override {}
 
- private:
+  void setGain(const int gain) { theGain_ = gain; }
+  double operator()(double time) const override;
+  double timeToRise() const override;
 
-  int theGain_;
+  void display() const {}
 
+private:
+  int theGain_;
 };
 
 #endif
diff --git a/SimCalorimetry/EcalSimAlgos/interface/EcalBaseSignalGenerator.h b/SimCalorimetry/EcalSimAlgos/interface/EcalBaseSignalGenerator.h
index 63e54a8b7804d..19c7f6f3f6c0b 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/EcalBaseSignalGenerator.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/EcalBaseSignalGenerator.h
@@ -5,26 +5,19 @@
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalSimParameterMap.h"
 class EcalElectronicsSim;
 
-class EcalBaseSignalGenerator : public CaloVNoiseSignalGenerator
-{
+class EcalBaseSignalGenerator : public CaloVNoiseSignalGenerator {
 public:
   EcalBaseSignalGenerator() {}
-    
+
   ~EcalBaseSignalGenerator() override {}
 
-  
 protected:
-
   //  void fC2pe(CaloSamples & samples) const
   // {
   //  assert(theParameterMap != 0);
   //  float factor = 1./theParameterMap->simParameters(samples.id()).photoelectronsToAnalog(samples.id());
   //  samples *= factor;
   // }
-
 };
 
 #endif
-
-
-
diff --git a/SimCalorimetry/EcalSimAlgos/interface/EcalCoder.h b/SimCalorimetry/EcalSimAlgos/interface/EcalCoder.h
index 0d4e89b92c544..ec60ac2f2af2a 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/EcalCoder.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/EcalCoder.h
@@ -8,12 +8,13 @@
 #include "CondFormats/EcalObjects/interface/EcalGainRatios.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalCorrelatedNoiseMatrix.h"
 
-template<typename M> class CorrelatedNoisifier ;
+template <typename M>
+class CorrelatedNoisifier;
 class EcalMGPASample;
 class EcalDataFrame;
 class DetId;
 
-#include<vector>
+#include <vector>
 
 namespace CLHEP {
   class HepRandomEngine;
@@ -23,90 +24,77 @@ namespace CLHEP {
  * \brief Converts CaloDataFrame in CaloTimeSample and vice versa.
  *
  */
-class EcalCoder
-{
-   public:
-
-      typedef CaloTSamples<float,10> EcalSamples ;
-      
-      typedef CorrelatedNoisifier<EcalCorrMatrix> Noisifier ;
-
-      enum { NBITS         =   12 , // number of available bits
-	     MAXADC        = 4095 , // 2^12 -1,  adc max range
-	     ADCGAINSWITCH = 4079 , // adc gain switch
-	     NGAINS        =    3   // number of electronic gains
-      };
-
-      /// ctor
-      EcalCoder( bool        addNoise        , 
-		 bool        PreMix1         ,
-		 Noisifier* ebCorrNoise0     ,
-		 Noisifier* eeCorrNoise0 = nullptr ,
-		 Noisifier* ebCorrNoise1 = nullptr ,
-		 Noisifier* eeCorrNoise1 = nullptr ,
-		 Noisifier* ebCorrNoise2 = nullptr ,
-		 Noisifier* eeCorrNoise2 = nullptr   ) ; // make EE version optional for tb compatibility
-      /// dtor
-      virtual ~EcalCoder() ;
-
-      /// can be fetched every event from the EventSetup
-      void setPedestals( const EcalPedestals* pedestals ) ;
-
-      void setGainRatios( const EcalGainRatios* gainRatios ) ;
-
-      void setFullScaleEnergy( double EBscale ,
-			       double EEscale   ) ;
-
-      void setIntercalibConstants( const EcalIntercalibConstantsMC* ical ) ; 
- 
-
-      /// from EcalSamples to EcalDataFrame
-      virtual void analogToDigital( CLHEP::HepRandomEngine*,
-                                    const EcalSamples& clf ,
-				    EcalDataFrame&     df    ) const;
- 
-   private:
-
-      /// limit on the energy scale due to the electronics range
-      double fullScaleEnergy( const DetId & did ) const ;
-
-      /// produce the pulse-shape
-      void encode( const EcalSamples& ecalSamples , 
-		   EcalDataFrame&     df,
-                   CLHEP::HepRandomEngine* ) const ;
-
-//      double decode( const EcalMGPASample& sample , 
-//		     const DetId&          detId    ) const ;
-
-      /// not yet implemented
-      //      void noisify( const EcalIntercalibConstantsMC* values ,
-      //		    int                              size     ) const ;
-
-      void findPedestal( const DetId& detId    , 
-			 int          gainId   , 
-			 double&      pedestal ,
-			 double&      width      ) const ;
-    
-      void findGains( const DetId& detId, 
-		      double       theGains[] ) const ;
-
-      void findIntercalibConstant( const DetId& detId ,
-				   double&      icalconst ) const ;
-   
-      const EcalPedestals* m_peds ;
-      
-      const EcalGainRatios* m_gainRatios ; // the electronics gains
-
-      const EcalIntercalibConstantsMC* m_intercals ; //record specific for simulation of gain variation in MC
-
-      double m_maxEneEB ; // max attainable energy in the ecal barrel
-      double m_maxEneEE ; // max attainable energy in the ecal endcap
-      
-      bool m_addNoise ;   // whether add noise to the pedestals and the gains
-      bool m_PreMix1 ;   // Follow necessary steps for PreMixing input
-
-      const Noisifier* m_ebCorrNoise[3] ;
-      const Noisifier* m_eeCorrNoise[3] ;
+class EcalCoder {
+public:
+  typedef CaloTSamples<float, 10> EcalSamples;
+
+  typedef CorrelatedNoisifier<EcalCorrMatrix> Noisifier;
+
+  enum {
+    NBITS = 12,            // number of available bits
+    MAXADC = 4095,         // 2^12 -1,  adc max range
+    ADCGAINSWITCH = 4079,  // adc gain switch
+    NGAINS = 3             // number of electronic gains
+  };
+
+  /// ctor
+  EcalCoder(bool addNoise,
+            bool PreMix1,
+            Noisifier* ebCorrNoise0,
+            Noisifier* eeCorrNoise0 = nullptr,
+            Noisifier* ebCorrNoise1 = nullptr,
+            Noisifier* eeCorrNoise1 = nullptr,
+            Noisifier* ebCorrNoise2 = nullptr,
+            Noisifier* eeCorrNoise2 = nullptr);  // make EE version optional for tb compatibility
+  /// dtor
+  virtual ~EcalCoder();
+
+  /// can be fetched every event from the EventSetup
+  void setPedestals(const EcalPedestals* pedestals);
+
+  void setGainRatios(const EcalGainRatios* gainRatios);
+
+  void setFullScaleEnergy(double EBscale, double EEscale);
+
+  void setIntercalibConstants(const EcalIntercalibConstantsMC* ical);
+
+  /// from EcalSamples to EcalDataFrame
+  virtual void analogToDigital(CLHEP::HepRandomEngine*, const EcalSamples& clf, EcalDataFrame& df) const;
+
+private:
+  /// limit on the energy scale due to the electronics range
+  double fullScaleEnergy(const DetId& did) const;
+
+  /// produce the pulse-shape
+  void encode(const EcalSamples& ecalSamples, EcalDataFrame& df, CLHEP::HepRandomEngine*) const;
+
+  //      double decode( const EcalMGPASample& sample ,
+  //		     const DetId&          detId    ) const ;
+
+  /// not yet implemented
+  //      void noisify( const EcalIntercalibConstantsMC* values ,
+  //		    int                              size     ) const ;
+
+  void findPedestal(const DetId& detId, int gainId, double& pedestal, double& width) const;
+
+  void findGains(const DetId& detId, double theGains[]) const;
+
+  void findIntercalibConstant(const DetId& detId, double& icalconst) const;
+
+  const EcalPedestals* m_peds;
+
+  const EcalGainRatios* m_gainRatios;  // the electronics gains
+
+  const EcalIntercalibConstantsMC* m_intercals;  //record specific for simulation of gain variation in MC
+
+  double m_maxEneEB;  // max attainable energy in the ecal barrel
+  double m_maxEneEE;  // max attainable energy in the ecal endcap
+
+  bool m_addNoise;  // whether add noise to the pedestals and the gains
+  bool m_PreMix1;   // Follow necessary steps for PreMixing input
+
+  const Noisifier* m_ebCorrNoise[3];
+  const Noisifier* m_eeCorrNoise[3];
 };
 
 #endif
diff --git a/SimCalorimetry/EcalSimAlgos/interface/EcalDigitizerTraits.h b/SimCalorimetry/EcalSimAlgos/interface/EcalDigitizerTraits.h
index a60d1a068f8fb..f5565cc5d9cfd 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/EcalDigitizerTraits.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/EcalDigitizerTraits.h
@@ -11,76 +11,68 @@
 #include "DataFormats/EcalDigi/interface/EBDataFrame.h"
 #include "DataFormats/EcalDigi/interface/EEDataFrame.h"
 
-class EcalHitResponse ;
+class EcalHitResponse;
 
-class EBDigitizerTraits 
-{
-   public:
-      /// the digis collection
-      typedef EBDigiCollection DigiCollection;
-      /// the dataframes
-      typedef EBDataFrame Digi;
-      /// the electronics simulation
-      typedef EcalElectronicsSim ElectronicsSim;
+class EBDigitizerTraits {
+public:
+  /// the digis collection
+  typedef EBDigiCollection DigiCollection;
+  /// the dataframes
+  typedef EBDataFrame Digi;
+  /// the electronics simulation
+  typedef EcalElectronicsSim ElectronicsSim;
 
-      typedef CaloTSamples<float,10> EcalSamples ;
+  typedef CaloTSamples<float, 10> EcalSamples;
 
-      static void fix( Digi& digi, edm::DataFrame df ) {};
+  static void fix(Digi& digi, edm::DataFrame df){};
 };
 
-class EEDigitizerTraits 
-{
-   public:
-      /// the digis collection
-      typedef EEDigiCollection DigiCollection;
-      /// the dataframes
-      typedef EEDataFrame Digi;
-      /// the electronics simulation
-      typedef EcalElectronicsSim ElectronicsSim;
+class EEDigitizerTraits {
+public:
+  /// the digis collection
+  typedef EEDigiCollection DigiCollection;
+  /// the dataframes
+  typedef EEDataFrame Digi;
+  /// the electronics simulation
+  typedef EcalElectronicsSim ElectronicsSim;
 
-      typedef CaloTSamples<float,10> EcalSamples ;
+  typedef CaloTSamples<float, 10> EcalSamples;
 
-      static void fix( Digi& digi, edm::DataFrame df ) {}
+  static void fix(Digi& digi, edm::DataFrame df) {}
 };
 
-class ESDigitizerTraits 
-{
-   public:
-      /// the digis collection
-      typedef ESDigiCollection DigiCollection ;
-      /// the dataframes
-      typedef ESDataFrame Digi ;
-      /// the electronics simulation
-      typedef ESElectronicsSimFast ElectronicsSim ;
-
-      typedef CaloTSamples<float,3> EcalSamples ;
-
-      static void fix( Digi& digi, edm::DataFrame df ) {
-	 for( unsigned int i ( 0 ) ; i != 3; ++i )
-	 {
-	    static const int offset ( 65536 ) ; // for int16 to uint16
-	    const int16_t dshort ( digi[i].raw() ) ;
-	    const int     dint   ( (int) dshort + // add offset for uint16 conversion
-				   ( (int16_t) 0 > dshort ? 
-				     offset : (int) 0 ) ) ;
-	    df[i] = dint ;
-	 }
-      }
+class ESDigitizerTraits {
+public:
+  /// the digis collection
+  typedef ESDigiCollection DigiCollection;
+  /// the dataframes
+  typedef ESDataFrame Digi;
+  /// the electronics simulation
+  typedef ESElectronicsSimFast ElectronicsSim;
+
+  typedef CaloTSamples<float, 3> EcalSamples;
+
+  static void fix(Digi& digi, edm::DataFrame df) {
+    for (unsigned int i(0); i != 3; ++i) {
+      static const int offset(65536);  // for int16 to uint16
+      const int16_t dshort(digi[i].raw());
+      const int dint((int)dshort +  // add offset for uint16 conversion
+                     ((int16_t)0 > dshort ? offset : (int)0));
+      df[i] = dint;
+    }
+  }
 };
 
-class ESOldDigitizerTraits 
-{
-   public:
-      /// the digis collection
-      typedef ESDigiCollection DigiCollection ;
-      /// the dataframes
-      typedef ESDataFrame Digi ;
-      /// the electronics simulation
-      typedef ESElectronicsSim ElectronicsSim ;
+class ESOldDigitizerTraits {
+public:
+  /// the digis collection
+  typedef ESDigiCollection DigiCollection;
+  /// the dataframes
+  typedef ESDataFrame Digi;
+  /// the electronics simulation
+  typedef ESElectronicsSim ElectronicsSim;
 
-//      typedef CaloTSamples<float,3> EcalSamples ;
+  //      typedef CaloTSamples<float,3> EcalSamples ;
 };
 
-
 #endif
-
diff --git a/SimCalorimetry/EcalSimAlgos/interface/EcalElectronicsSim.h b/SimCalorimetry/EcalSimAlgos/interface/EcalElectronicsSim.h
index f483a1d4e20dc..73f159b2644be 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/EcalElectronicsSim.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/EcalElectronicsSim.h
@@ -1,14 +1,12 @@
 #ifndef EcalSimAlgos_EcalElectronicsSim_h
 #define EcalSimAlgos_EcalElectronicsSim_h 1
 
-
 #include "CalibFormats/CaloObjects/interface/CaloTSamples.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVNoiseSignalGenerator.h"
 
-
-class EcalCoder           ;
-class EcalDataFrame       ;
-class EcalSimParameterMap ;
+class EcalCoder;
+class EcalDataFrame;
+class EcalSimParameterMap;
 
 namespace CLHEP {
   class HepRandomEngine;
@@ -19,44 +17,40 @@ namespace CLHEP {
  * 
  */
 
-class EcalElectronicsSim
-{
-   public:
-
-      typedef CaloTSamples<float,10> EcalSamples ;
-
-      EcalElectronicsSim( const EcalSimParameterMap* parameterMap      , 
-			  EcalCoder*                 coder             , 
-			  bool                       applyConstantTerm , 
-			  double                     rmsConstantTerm     ) ;
-
-      ~EcalElectronicsSim() ;
+class EcalElectronicsSim {
+public:
+  typedef CaloTSamples<float, 10> EcalSamples;
 
-      /// from EcalSamples to EcalDataFrame
-      void analogToDigital( CLHEP::HepRandomEngine*, EcalSamples& clf, EcalDataFrame& df ) const ;
+  EcalElectronicsSim(const EcalSimParameterMap* parameterMap,
+                     EcalCoder* coder,
+                     bool applyConstantTerm,
+                     double rmsConstantTerm);
 
-      void newEvent() {}
+  ~EcalElectronicsSim();
 
-      void setNoiseSignalGenerator(const CaloVNoiseSignalGenerator * noiseSignalGenerator) {
-	theNoiseSignalGenerator = noiseSignalGenerator;
-      }
+  /// from EcalSamples to EcalDataFrame
+  void analogToDigital(CLHEP::HepRandomEngine*, EcalSamples& clf, EcalDataFrame& df) const;
 
-   private:
+  void newEvent() {}
 
-      /// input signal is in pe.  Converted in GeV
-      void amplify( EcalSamples& clf, CLHEP::HepRandomEngine* ) const ;
+  void setNoiseSignalGenerator(const CaloVNoiseSignalGenerator* noiseSignalGenerator) {
+    theNoiseSignalGenerator = noiseSignalGenerator;
+  }
 
-      /// map of parameters
+private:
+  /// input signal is in pe.  Converted in GeV
+  void amplify(EcalSamples& clf, CLHEP::HepRandomEngine*) const;
 
-      const EcalSimParameterMap* m_simMap ;
+  /// map of parameters
 
-      const CaloVNoiseSignalGenerator * theNoiseSignalGenerator;
+  const EcalSimParameterMap* m_simMap;
 
-      EcalCoder*                 m_theCoder ;
+  const CaloVNoiseSignalGenerator* theNoiseSignalGenerator;
 
-      const double               m_thisCT;
-      const bool                 m_applyConstantTerm;
-} ;
+  EcalCoder* m_theCoder;
 
+  const double m_thisCT;
+  const bool m_applyConstantTerm;
+};
 
 #endif
diff --git a/SimCalorimetry/EcalSimAlgos/interface/EcalHitResponse.h b/SimCalorimetry/EcalSimAlgos/interface/EcalHitResponse.h
index 98573dc506465..925080ee2539d 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/EcalHitResponse.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/EcalHitResponse.h
@@ -14,133 +14,126 @@
 
 typedef unsigned long long TimeValue_t;
 
-class CaloVShape              ;
-class CaloVSimParameterMap    ;
-class CaloVHitCorrection      ;
-class CaloVHitFilter          ;
-class CaloSimParameters       ;
-class CaloSubdetectorGeometry ;
-class CaloVPECorrection       ;
-namespace CLHEP 
-{ 
-   class HepRandomEngine      ;
+class CaloVShape;
+class CaloVSimParameterMap;
+class CaloVHitCorrection;
+class CaloVHitFilter;
+class CaloSimParameters;
+class CaloSubdetectorGeometry;
+class CaloVPECorrection;
+namespace CLHEP {
+  class HepRandomEngine;
 }
 
-class EcalHitResponse 
-{
-   public:
+class EcalHitResponse {
+public:
+  typedef CaloTSamplesBase<float> EcalSamples;
 
-      typedef CaloTSamplesBase<float> EcalSamples ;
+  typedef std::vector<unsigned int> VecInd;
 
-      typedef std::vector< unsigned int > VecInd ;
+  typedef std::unordered_map<uint32_t, double> CalibCache;
 
-      typedef std::unordered_map<uint32_t,double> CalibCache;
+  enum { BUNCHSPACE = 25 };
 
-      enum { BUNCHSPACE = 25 } ;
+  EcalHitResponse(const CaloVSimParameterMap* parameterMap, const CaloVShape* shape);
 
-      EcalHitResponse( const CaloVSimParameterMap* parameterMap ,
-		       const CaloVShape*           shape          ) ;
+  virtual ~EcalHitResponse();
 
-      virtual ~EcalHitResponse() ;
+  void setBunchRange(int minBunch, int maxBunch);
 
-      void setBunchRange( int minBunch ,
-			  int maxBunch   ) ;
+  void setGeometry(const CaloSubdetectorGeometry* geometry);
 
-      void setGeometry( const CaloSubdetectorGeometry* geometry ) ;
+  void setPhaseShift(double phaseShift);
 
-      void setPhaseShift( double phaseShift ) ;
+  void setHitFilter(const CaloVHitFilter* filter);
 
-      void setHitFilter( const CaloVHitFilter* filter) ;
+  void setHitCorrection(const CaloVHitCorrection* hitCorrection);
 
-      void setHitCorrection( const CaloVHitCorrection* hitCorrection) ;
+  void setPECorrection(const CaloVPECorrection* peCorrection);
 
-      void setPECorrection( const CaloVPECorrection* peCorrection ) ;
+  void setEventTime(const edm::TimeValue_t& iTime);
 
-      void setEventTime(const edm::TimeValue_t& iTime);
+  void setLaserConstants(const EcalLaserDbService* laser, bool& useLCcorrection);
 
-      void setLaserConstants(const EcalLaserDbService* laser, bool& useLCcorrection);
+  void add(const EcalSamples* pSam);
 
-      void add( const EcalSamples* pSam ) ;
+  virtual void add(const PCaloHit& hit, CLHEP::HepRandomEngine*);
 
-      virtual void add( const PCaloHit&  hit, CLHEP::HepRandomEngine* ) ;
+  virtual void add(const CaloSamples& hit);
 
-      virtual void add( const CaloSamples&  hit ) ;
+  virtual void initializeHits();
 
-      virtual void initializeHits() ;
+  virtual void finalizeHits();
 
-      virtual void finalizeHits() ;
+  virtual void run(MixCollection<PCaloHit>& hits, CLHEP::HepRandomEngine*);
 
-      virtual void run( MixCollection<PCaloHit>& hits, CLHEP::HepRandomEngine* ) ;
+  virtual unsigned int samplesSize() const = 0;
 
-      virtual unsigned int samplesSize() const = 0 ;
+  virtual EcalSamples* operator[](unsigned int i) = 0;
 
-      virtual EcalSamples* operator[]( unsigned int i ) = 0;
+  virtual const EcalSamples* operator[](unsigned int i) const = 0;
 
-      virtual const EcalSamples* operator[]( unsigned int i ) const = 0;
+  const EcalSamples* findDetId(const DetId& detId) const;
 
-      const EcalSamples* findDetId( const DetId& detId ) const ;
+  bool withinBunchRange(int bunchCrossing) const;
 
-      bool withinBunchRange(int bunchCrossing) const ;
+protected:
+  virtual unsigned int samplesSizeAll() const = 0;
 
-   protected:
+  virtual EcalSamples* vSam(unsigned int i) = 0;
 
-      virtual unsigned int samplesSizeAll() const = 0 ;
+  virtual EcalSamples* vSamAll(unsigned int i) = 0;
 
-      virtual EcalSamples* vSam( unsigned int i ) = 0 ;
+  virtual const EcalSamples* vSamAll(unsigned int i) const = 0;
 
-      virtual EcalSamples* vSamAll( unsigned int i ) = 0 ;
+  virtual void putAnalogSignal(const PCaloHit& inputHit, CLHEP::HepRandomEngine*);
 
-      virtual const EcalSamples* vSamAll( unsigned int i ) const = 0 ;
+  double findLaserConstant(const DetId& detId) const;
 
-      virtual void putAnalogSignal( const PCaloHit& inputHit, CLHEP::HepRandomEngine*) ;
+  EcalSamples* findSignal(const DetId& detId);
 
-      double findLaserConstant(const DetId& detId) const;
+  double analogSignalAmplitude(const DetId& id, double energy, CLHEP::HepRandomEngine*);
 
-      EcalSamples* findSignal( const DetId& detId ) ;
+  double timeOfFlight(const DetId& detId) const;
 
-      double analogSignalAmplitude( const DetId& id, double energy, CLHEP::HepRandomEngine* );
+  double phaseShift() const;
 
-      double timeOfFlight( const DetId& detId ) const ;
+  void blankOutUsedSamples();
 
-      double phaseShift() const ;
+  const CaloSimParameters* params(const DetId& detId) const;
 
-      void blankOutUsedSamples() ;
+  const CaloVShape* shape() const;
 
-      const CaloSimParameters* params( const DetId& detId ) const ;
+  const CaloSubdetectorGeometry* geometry() const;
 
-      const CaloVShape* shape() const ;
+  int minBunch() const;
 
-      const CaloSubdetectorGeometry* geometry() const ;
+  int maxBunch() const;
 
-      int minBunch() const ;
+  VecInd& index();
 
-      int maxBunch() const ;
+  const VecInd& index() const;
 
-      VecInd& index() ;
+  const CaloVHitFilter* hitFilter() const;
 
-      const VecInd& index() const ;
+private:
+  const CaloVSimParameterMap* m_parameterMap;
+  const CaloVShape* m_shape;
+  const CaloVHitCorrection* m_hitCorrection;
+  const CaloVPECorrection* m_PECorrection;
+  const CaloVHitFilter* m_hitFilter;
+  const CaloSubdetectorGeometry* m_geometry;
+  const EcalLaserDbService* m_lasercals;
 
-      const CaloVHitFilter* hitFilter() const ;
+  int m_minBunch;
+  int m_maxBunch;
+  double m_phaseShift;
 
-   private:
+  edm::TimeValue_t m_iTime;
+  bool m_useLCcorrection;
+  CalibCache m_laserCalibCache;
 
-      const CaloVSimParameterMap*    m_parameterMap  ;
-      const CaloVShape*              m_shape         ;
-      const CaloVHitCorrection*      m_hitCorrection ;
-      const CaloVPECorrection*       m_PECorrection  ;
-      const CaloVHitFilter*          m_hitFilter     ;
-      const CaloSubdetectorGeometry* m_geometry      ;
-      const EcalLaserDbService*      m_lasercals     ;
-
-      int    m_minBunch   ;
-      int    m_maxBunch   ;
-      double m_phaseShift ;
-
-      edm::TimeValue_t               m_iTime;
-      bool                           m_useLCcorrection;
-      CalibCache                     m_laserCalibCache;
-
-      VecInd m_index ;
+  VecInd m_index;
 };
 
 #endif
diff --git a/SimCalorimetry/EcalSimAlgos/interface/EcalShapeBase.h b/SimCalorimetry/EcalSimAlgos/interface/EcalShapeBase.h
index 99ac0aef63983..6feb103cfd007 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/EcalShapeBase.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/EcalShapeBase.h
@@ -1,12 +1,12 @@
 #ifndef EcalSimAlgos_EcalShapeBase_h
 #define EcalSimAlgos_EcalShapeBase_h
 
-#include<vector>
+#include <vector>
 //#include<stdexcept>
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVShape.h"
-  
+
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h" 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "CondFormats/EcalObjects/interface/EcalSimPulseShape.h"
 #include "CondFormats/DataRecord/interface/EcalSimPulseShapeRcd.h"
 
@@ -21,55 +21,51 @@
    and sampling time from the DB or false if the Phase I hard coded arrays
    with 1 ns sampling should be used. -- K. Theofilatos
 */
-class EcalShapeBase : public CaloVShape
-{
-   public:
+class EcalShapeBase : public CaloVShape {
+public:
+  typedef std::vector<double> DVec;
 
-      typedef std::vector<double> DVec ;
-  
-      EcalShapeBase(bool) ;
+  EcalShapeBase(bool);
 
-      ~EcalShapeBase() override ;
+  ~EcalShapeBase() override;
 
-      double operator() ( double aTime ) const override ;
+  double operator()(double aTime) const override;
 
-      double         timeOfThr()  const ;
-      double         timeOfMax()  const ;
-      double timeToRise() const override ;
+  double timeOfThr() const;
+  double timeOfMax() const;
+  double timeToRise() const override;
 
-      double threshold() const;
-  
-      double derivative ( double time ) const ; // appears to not be used anywhere
+  double threshold() const;
 
-      void m_shape_print(const char *fileName);     
-      void setEventSetup(const edm::EventSetup & evtSetup); 
+  double derivative(double time) const;  // appears to not be used anywhere
 
-   protected:
+  void m_shape_print(const char* fileName);
+  void setEventSetup(const edm::EventSetup& evtSetup);
 
-      unsigned int timeIndex( double aTime ) const ;
+protected:
+  unsigned int timeIndex(double aTime) const;
 
-      void buildMe(const edm::EventSetup* = nullptr ) ;
+  void buildMe(const edm::EventSetup* = nullptr);
 
-      virtual void   fillShape(float &time_interval, double &m_thresh, EcalShapeBase::DVec& aVec, const edm::EventSetup* es) const = 0 ;
-      bool         m_useDBShape;
+  virtual void fillShape(float& time_interval,
+                         double& m_thresh,
+                         EcalShapeBase::DVec& aVec,
+                         const edm::EventSetup* es) const = 0;
+  bool m_useDBShape;
 
-   private:
+private:
+  unsigned int m_firstIndexOverThreshold;
+  double m_firstTimeOverThreshold;
+  unsigned int m_indexOfMax;
+  double m_timeOfMax;
+  double m_thresh;
+  unsigned int m_kNBinsPerNSec;
+  DVec m_shape;
+  DVec m_deriv;
 
-      unsigned int m_firstIndexOverThreshold ;
-      double       m_firstTimeOverThreshold  ;
-      unsigned int m_indexOfMax ;
-      double       m_timeOfMax  ;
-      double       m_thresh;
-      unsigned int m_kNBinsPerNSec;
-      DVec  m_shape ;
-      DVec  m_deriv ;
-  
-      unsigned int m_arraySize;
-      unsigned int m_denseArraySize;   
-      double m_qNSecPerBin;
+  unsigned int m_arraySize;
+  unsigned int m_denseArraySize;
+  double m_qNSecPerBin;
 };
-  
-
 
 #endif
-  
diff --git a/SimCalorimetry/EcalSimAlgos/interface/EcalSignalGenerator.h b/SimCalorimetry/EcalSimAlgos/interface/EcalSignalGenerator.h
index 4900f508c6c7d..6419e8b69c870 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/EcalSignalGenerator.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/EcalSignalGenerator.h
@@ -42,145 +42,135 @@ namespace edm {
   class ModuleCallingContext;
 }
 
-template<class ECALDIGITIZERTRAITS>
-class EcalSignalGenerator : public EcalBaseSignalGenerator
-{
+template <class ECALDIGITIZERTRAITS>
+class EcalSignalGenerator : public EcalBaseSignalGenerator {
 public:
   typedef typename ECALDIGITIZERTRAITS::Digi DIGI;
   typedef typename ECALDIGITIZERTRAITS::DigiCollection COLLECTION;
 
-  EcalSignalGenerator():EcalBaseSignalGenerator() { }
-
-    EcalSignalGenerator(const edm::InputTag & inputTag, const edm::EDGetTokenT<COLLECTION> &t, const double EBs25notCont, const double EEs25notCont, const double peToABarrel, const double peToAEndcap)
-    : EcalBaseSignalGenerator(), 
-      theEvent(nullptr), 
-      theEventPrincipal(nullptr), 
-      theInputTag(inputTag), 
-      tok_(t)
-      { 
-	EcalMGPAGainRatio * defaultRatios = new EcalMGPAGainRatio();
-	theDefaultGains[2] = defaultRatios->gain6Over1() ;
-	theDefaultGains[1] = theDefaultGains[2]*(defaultRatios->gain12Over6()) ;
-	m_EBs25notCont = EBs25notCont; 
-	m_EEs25notCont = EEs25notCont; 
-	m_peToABarrel = peToABarrel;
-	m_peToAEndcap = peToAEndcap;
-
-      }
+  EcalSignalGenerator() : EcalBaseSignalGenerator() {}
+
+  EcalSignalGenerator(const edm::InputTag& inputTag,
+                      const edm::EDGetTokenT<COLLECTION>& t,
+                      const double EBs25notCont,
+                      const double EEs25notCont,
+                      const double peToABarrel,
+                      const double peToAEndcap)
+      : EcalBaseSignalGenerator(), theEvent(nullptr), theEventPrincipal(nullptr), theInputTag(inputTag), tok_(t) {
+    EcalMGPAGainRatio* defaultRatios = new EcalMGPAGainRatio();
+    theDefaultGains[2] = defaultRatios->gain6Over1();
+    theDefaultGains[1] = theDefaultGains[2] * (defaultRatios->gain12Over6());
+    m_EBs25notCont = EBs25notCont;
+    m_EEs25notCont = EEs25notCont;
+    m_peToABarrel = peToABarrel;
+    m_peToAEndcap = peToAEndcap;
+  }
 
   ~EcalSignalGenerator() override {}
 
-
-  void initializeEvent(const edm::Event * event, const edm::EventSetup * eventSetup)
-  {
+  void initializeEvent(const edm::Event* event, const edm::EventSetup* eventSetup) {
     theEvent = event;
-    eventSetup->get<EcalGainRatiosRcd>().get(grHandle); // find the gains
+    eventSetup->get<EcalGainRatiosRcd>().get(grHandle);  // find the gains
     // Ecal Intercalibration Constants
-    eventSetup->get<EcalIntercalibConstantsMCRcd>().get( pIcal ) ;
+    eventSetup->get<EcalIntercalibConstantsMCRcd>().get(pIcal);
     ical = pIcal.product();
     // adc to GeV
     eventSetup->get<EcalADCToGeVConstantRcd>().get(pAgc);
     agc = pAgc.product();
 
-    m_maxEneEB = (agc->getEBValue())*theDefaultGains[1]*MAXADC*m_EBs25notCont  ;
-    m_maxEneEE = (agc->getEEValue())*theDefaultGains[1]*MAXADC*m_EEs25notCont  ;
+    m_maxEneEB = (agc->getEBValue()) * theDefaultGains[1] * MAXADC * m_EBs25notCont;
+    m_maxEneEE = (agc->getEEValue()) * theDefaultGains[1] * MAXADC * m_EEs25notCont;
 
     //ES
-    eventSetup->get<ESGainRcd>().               get( hesgain      ) ;
-    eventSetup->get<ESMIPToGeVConstantRcd>().   get( hesMIPToGeV  ) ;
-    eventSetup->get<ESIntercalibConstantsRcd>().get( hesMIPs      ) ;
-
-    esgain     = hesgain.product()      ;
-    esmips     = hesMIPs.product()      ;
-    esMipToGeV = hesMIPToGeV.product()  ;
-    if( 1.1 > esgain->getESGain() ) ESgain = 1;
-    else ESgain = 2;
-    if( ESgain ==1 ) ESMIPToGeV = esMipToGeV->getESValueLow();
-    else ESMIPToGeV = esMipToGeV->getESValueHigh();
+    eventSetup->get<ESGainRcd>().get(hesgain);
+    eventSetup->get<ESMIPToGeVConstantRcd>().get(hesMIPToGeV);
+    eventSetup->get<ESIntercalibConstantsRcd>().get(hesMIPs);
+
+    esgain = hesgain.product();
+    esmips = hesMIPs.product();
+    esMipToGeV = hesMIPToGeV.product();
+    if (1.1 > esgain->getESGain())
+      ESgain = 1;
+    else
+      ESgain = 2;
+    if (ESgain == 1)
+      ESMIPToGeV = esMipToGeV->getESValueLow();
+    else
+      ESMIPToGeV = esMipToGeV->getESValueHigh();
   }
 
   /// some users use EventPrincipals, not Events.  We support both
-  void initializeEvent(const edm::EventPrincipal * eventPrincipal, const edm::EventSetup * eventSetup)
-  {
+  void initializeEvent(const edm::EventPrincipal* eventPrincipal, const edm::EventSetup* eventSetup) {
     theEventPrincipal = eventPrincipal;
     eventSetup->get<EcalGainRatiosRcd>().get(grHandle);  // find the gains
     // Ecal Intercalibration Constants
-    eventSetup->get<EcalIntercalibConstantsMCRcd>().get( pIcal ) ;
+    eventSetup->get<EcalIntercalibConstantsMCRcd>().get(pIcal);
     ical = pIcal.product();
     // adc to GeV
     eventSetup->get<EcalADCToGeVConstantRcd>().get(pAgc);
     agc = pAgc.product();
-    m_maxEneEB = (agc->getEBValue())*theDefaultGains[1]*MAXADC*m_EBs25notCont  ;
-    m_maxEneEE = (agc->getEEValue())*theDefaultGains[1]*MAXADC*m_EEs25notCont  ;
+    m_maxEneEB = (agc->getEBValue()) * theDefaultGains[1] * MAXADC * m_EBs25notCont;
+    m_maxEneEE = (agc->getEEValue()) * theDefaultGains[1] * MAXADC * m_EEs25notCont;
 
     //ES
-    eventSetup->get<ESGainRcd>().               get( hesgain      ) ;
-    eventSetup->get<ESMIPToGeVConstantRcd>().   get( hesMIPToGeV  ) ;
-    eventSetup->get<ESIntercalibConstantsRcd>().get( hesMIPs      ) ;
-
-    esgain     = hesgain.product()      ;
-    esmips     = hesMIPs.product()      ;
-    esMipToGeV = hesMIPToGeV.product()  ;
-    if( 1.1 > esgain->getESGain() ) ESgain = 1;
-    else ESgain = 2;
-    if( ESgain ==1 ) ESMIPToGeV = esMipToGeV->getESValueLow();
-    else ESMIPToGeV = esMipToGeV->getESValueHigh();
+    eventSetup->get<ESGainRcd>().get(hesgain);
+    eventSetup->get<ESMIPToGeVConstantRcd>().get(hesMIPToGeV);
+    eventSetup->get<ESIntercalibConstantsRcd>().get(hesMIPs);
+
+    esgain = hesgain.product();
+    esmips = hesMIPs.product();
+    esMipToGeV = hesMIPToGeV.product();
+    if (1.1 > esgain->getESGain())
+      ESgain = 1;
+    else
+      ESgain = 2;
+    if (ESgain == 1)
+      ESMIPToGeV = esMipToGeV->getESValueLow();
+    else
+      ESMIPToGeV = esMipToGeV->getESValueHigh();
   }
 
-  virtual void fill(edm::ModuleCallingContext const* mcc)
-  {
-
+  virtual void fill(edm::ModuleCallingContext const* mcc) {
     theNoiseSignals.clear();
     edm::Handle<COLLECTION> pDigis;
-    const COLLECTION *  digis = nullptr;
+    const COLLECTION* digis = nullptr;
     // try accessing by whatever is set, Event or EventPrincipal
-    if(theEvent) 
-     {
-      if( theEvent->getByToken(tok_, pDigis) ) {
-        digis = pDigis.product(); // get a ptr to the product
-      }
-      else
-      {
+    if (theEvent) {
+      if (theEvent->getByToken(tok_, pDigis)) {
+        digis = pDigis.product();  // get a ptr to the product
+      } else {
         throw cms::Exception("EcalSignalGenerator") << "Cannot find input data " << theInputTag;
       }
-    }
-    else if(theEventPrincipal)
-    {
-       std::shared_ptr<edm::Wrapper<COLLECTION>  const> digisPTR =
-          edm::getProductByTag<COLLECTION>(*theEventPrincipal, theInputTag, mcc );
-       if(digisPTR) {
-          digis = digisPTR->product();
-       }
-    }
-    else
-    {
+    } else if (theEventPrincipal) {
+      std::shared_ptr<edm::Wrapper<COLLECTION> const> digisPTR =
+          edm::getProductByTag<COLLECTION>(*theEventPrincipal, theInputTag, mcc);
+      if (digisPTR) {
+        digis = digisPTR->product();
+      }
+    } else {
       throw cms::Exception("EcalSignalGenerator") << "No Event or EventPrincipal was set";
     }
 
-    if (digis)
-    {
+    if (digis) {
       // loop over digis, adding these to the existing maps
-      for(typename COLLECTION::const_iterator it  = digis->begin();
-          it != digis->end(); ++it) 
-      {
-	// need to convert to something useful
-	if(validDigi(*it)){
-	  theNoiseSignals.push_back(samplesInPE(*it));
-	}
+      for (typename COLLECTION::const_iterator it = digis->begin(); it != digis->end(); ++it) {
+        // need to convert to something useful
+        if (validDigi(*it)) {
+          theNoiseSignals.push_back(samplesInPE(*it));
+        }
       }
     }
     //else { std::cout << " NO digis for this input: " << theInputTag << std::endl;}
   }
 
 private:
-
-  bool validDigi(const DIGI & digi)
-  {
+  bool validDigi(const DIGI& digi) {
     int DigiSum = 0;
-    for(int id = 0; id<digi.size(); id++) {
-      if(digi[id].adc() > 0) ++DigiSum;
+    for (int id = 0; id < digi.size(); id++) {
+      if (digi[id].adc() > 0)
+        ++DigiSum;
     }
-    return(DigiSum>0);
+    return (DigiSum > 0);
   }
 
   void fillNoiseSignals() override {}
@@ -188,61 +178,55 @@ class EcalSignalGenerator : public EcalBaseSignalGenerator
 
   // much of this stolen from EcalSimAlgos/EcalCoder
 
-  enum { NBITS         =   12 , // number of available bits
-	 MAXADC        = 4095 , // 2^12 -1,  adc max range
-	 ADCGAINSWITCH = 4079 , // adc gain switch
-	 NGAINS        =    3 };  // number of electronic gains
-
-  CaloSamples samplesInPE(const DIGI & digi);  // have to define this separately for ES
+  enum {
+    NBITS = 12,            // number of available bits
+    MAXADC = 4095,         // 2^12 -1,  adc max range
+    ADCGAINSWITCH = 4079,  // adc gain switch
+    NGAINS = 3
+  };  // number of electronic gains
 
-  const std::vector<float>  GetGainRatios(const DetId& detid) {
+  CaloSamples samplesInPE(const DIGI& digi);  // have to define this separately for ES
 
+  const std::vector<float> GetGainRatios(const DetId& detid) {
     std::vector<float> gainRatios(4);
-    // get gain ratios  
-    EcalMGPAGainRatio theRatio= (*grHandle)[detid];
-    
+    // get gain ratios
+    EcalMGPAGainRatio theRatio = (*grHandle)[detid];
+
     gainRatios[0] = 0.;
     gainRatios[3] = 1.;
     gainRatios[2] = theRatio.gain6Over1();
-    gainRatios[1] = theRatio.gain6Over1()  * theRatio.gain12Over6();
+    gainRatios[1] = theRatio.gain6Over1() * theRatio.gain12Over6();
 
     return gainRatios;
   }
 
+  double fullScaleEnergy(const DetId& detId) const { return detId.subdetId() == EcalBarrel ? m_maxEneEB : m_maxEneEE; }
 
-  double fullScaleEnergy( const DetId & detId ) const 
-  {
-     return detId.subdetId() == EcalBarrel ? m_maxEneEB : m_maxEneEE ;
+  double peToAConversion(const DetId& detId) const {
+    return detId.subdetId() == EcalBarrel ? m_peToABarrel : m_peToAEndcap;
   }
 
-
-  double peToAConversion( const DetId & detId ) const 
-  {
-     return detId.subdetId() == EcalBarrel ? m_peToABarrel : m_peToAEndcap ;
-  }
-
-    
   /// these fields are set in initializeEvent()
-  const edm::Event * theEvent;
-  const edm::EventPrincipal * theEventPrincipal;
+  const edm::Event* theEvent;
+  const edm::EventPrincipal* theEventPrincipal;
 
-  edm::ESHandle<EcalGainRatios> grHandle; 
+  edm::ESHandle<EcalGainRatios> grHandle;
   edm::ESHandle<EcalIntercalibConstantsMC> pIcal;
   edm::ESHandle<EcalADCToGeVConstant> pAgc;
 
- /// these come from the ParameterSet
+  /// these come from the ParameterSet
   edm::InputTag theInputTag;
   edm::EDGetTokenT<COLLECTION> tok_;
 
-  edm::ESHandle<ESGain>                hesgain      ;
-  edm::ESHandle<ESMIPToGeVConstant>    hesMIPToGeV  ;
-  edm::ESHandle<ESIntercalibConstants> hesMIPs      ;
+  edm::ESHandle<ESGain> hesgain;
+  edm::ESHandle<ESMIPToGeVConstant> hesMIPToGeV;
+  edm::ESHandle<ESIntercalibConstants> hesMIPs;
 
-  const ESGain*                esgain;
+  const ESGain* esgain;
   const ESIntercalibConstants* esmips;
-  const ESMIPToGeVConstant*    esMipToGeV;
-  int ESgain ;
-  double ESMIPToGeV; 
+  const ESMIPToGeVConstant* esMipToGeV;
+  int ESgain;
+  double ESMIPToGeV;
 
   double m_EBs25notCont;
   double m_EEs25notCont;
@@ -250,19 +234,17 @@ class EcalSignalGenerator : public EcalBaseSignalGenerator
   double m_peToABarrel;
   double m_peToAEndcap;
 
-  double m_maxEneEB ; // max attainable energy in the ecal barrel
-  double m_maxEneEE ; // max attainable energy in the ecal endcap
+  double m_maxEneEB;  // max attainable energy in the ecal barrel
+  double m_maxEneEE;  // max attainable energy in the ecal endcap
 
   const EcalADCToGeVConstant* agc;
   const EcalIntercalibConstantsMC* ical;
 
   double theDefaultGains[NGAINS];
-
 };
 
-typedef EcalSignalGenerator<EBDigitizerTraits>   EBSignalGenerator;
-typedef EcalSignalGenerator<EEDigitizerTraits>   EESignalGenerator;
-typedef EcalSignalGenerator<ESDigitizerTraits>   ESSignalGenerator;
+typedef EcalSignalGenerator<EBDigitizerTraits> EBSignalGenerator;
+typedef EcalSignalGenerator<EEDigitizerTraits> EESignalGenerator;
+typedef EcalSignalGenerator<ESDigitizerTraits> ESSignalGenerator;
 
 #endif
-
diff --git a/SimCalorimetry/EcalSimAlgos/interface/EcalSimParameterMap.h b/SimCalorimetry/EcalSimAlgos/interface/EcalSimParameterMap.h
index 1226bff93c081..a9dccd9e976b8 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/EcalSimParameterMap.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/EcalSimParameterMap.h
@@ -4,28 +4,29 @@
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVSimParameterMap.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloSimParameters.h"
 
-
 /* \class EcalSimParametersMap
  * \brief map of parameters for the ECAL (EE, EB, preshower) simulation
  *
  */
-class EcalSimParameterMap : public CaloVSimParameterMap
-{
+class EcalSimParameterMap : public CaloVSimParameterMap {
 public:
   /// ctor
   EcalSimParameterMap();
-  EcalSimParameterMap(double simHitToPhotoelectronsBarrel, 
-                      double simHitToPhotoelectronsEndcap, 
-                      double photoelectronsToAnalogBarrel, 
-                      double photoelectronsToAnalogEndcap, 
-                      double samplingFactor, double timePhase,
-                      int readoutFrameSize, int binOfMaximum,
-                      bool doPhotostatistics, bool syncPhase);
+  EcalSimParameterMap(double simHitToPhotoelectronsBarrel,
+                      double simHitToPhotoelectronsEndcap,
+                      double photoelectronsToAnalogBarrel,
+                      double photoelectronsToAnalogEndcap,
+                      double samplingFactor,
+                      double timePhase,
+                      int readoutFrameSize,
+                      int binOfMaximum,
+                      bool doPhotostatistics,
+                      bool syncPhase);
   /// dtor
   ~EcalSimParameterMap() override {}
 
   /// return the sim parameters relative to the right subdet
-  const CaloSimParameters & simParameters(const DetId & id) const override;
+  const CaloSimParameters& simParameters(const DetId& id) const override;
 
 private:
   /// EB
@@ -37,4 +38,3 @@ class EcalSimParameterMap : public CaloVSimParameterMap
 };
 
 #endif
-
diff --git a/SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.h b/SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.h
index ec79d8ea8979e..70c578cb80484 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.h
@@ -12,61 +12,50 @@
 #include "CalibFormats/CaloObjects/interface/CaloTSamplesBase.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalBaseSignalGenerator.h"
 
-class EcalHitResponse ;
+class EcalHitResponse;
 class EcalBaseSignalGenerator;
 
 namespace CLHEP {
   class HepRandomEngine;
 }
 
-template< class Traits >
-class EcalTDigitizer
-{
-   public:
+template <class Traits>
+class EcalTDigitizer {
+public:
+  typedef typename Traits::ElectronicsSim ElectronicsSim;
+  typedef typename Traits::Digi Digi;
+  typedef typename Traits::DigiCollection DigiCollection;
+  typedef typename Traits::EcalSamples EcalSamples;
 
-      typedef typename Traits::ElectronicsSim ElectronicsSim ;
-      typedef typename Traits::Digi           Digi           ;
-      typedef typename Traits::DigiCollection DigiCollection ;
-      typedef typename Traits::EcalSamples    EcalSamples    ;
+  EcalTDigitizer<Traits>(EcalHitResponse* hitResponse, ElectronicsSim* electronicsSim, bool addNoise);
 
-      EcalTDigitizer< Traits >( EcalHitResponse* hitResponse    ,
-				ElectronicsSim*  electronicsSim ,
-				bool             addNoise         ) ;
+  virtual ~EcalTDigitizer<Traits>();
 
-      virtual ~EcalTDigitizer< Traits >() ;
+  void add(const std::vector<PCaloHit>& hits, int bunchCrossing, CLHEP::HepRandomEngine*);
 
-      void add(const std::vector<PCaloHit> & hits, int bunchCrossing, CLHEP::HepRandomEngine*);
+  virtual void initializeHits();
 
-      virtual void initializeHits();
+  virtual void run(DigiCollection& output, CLHEP::HepRandomEngine*);
 
-      virtual void run(DigiCollection&          output, CLHEP::HepRandomEngine* );
+  virtual void run(MixCollection<PCaloHit>& input, DigiCollection& output) { assert(0); }
 
-      virtual void run( MixCollection<PCaloHit>& input ,
-			DigiCollection&          output  ) {
-         assert(0);
-      }
+  void setNoiseSignalGenerator(EcalBaseSignalGenerator* noiseSignalGenerator);
 
-      void setNoiseSignalGenerator(EcalBaseSignalGenerator * noiseSignalGenerator);
+  void addNoiseSignals();
 
-      void addNoiseSignals();
+protected:
+  bool addNoise() const;
 
-   protected:
+  const EcalHitResponse* hitResponse() const;
 
-      bool addNoise() const ;
+  const ElectronicsSim* elecSim() const;
 
-      const EcalHitResponse* hitResponse() const ;
-
-      const ElectronicsSim* elecSim() const ;
-
-   private:
-
-      EcalHitResponse* m_hitResponse    ;
-      ElectronicsSim*  m_electronicsSim ;
-      bool             m_addNoise       ;
-
-      EcalBaseSignalGenerator * theNoiseSignalGenerator;
+private:
+  EcalHitResponse* m_hitResponse;
+  ElectronicsSim* m_electronicsSim;
+  bool m_addNoise;
 
+  EcalBaseSignalGenerator* theNoiseSignalGenerator;
 };
 
 #endif
-
diff --git a/SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.icc b/SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.icc
index 488b35a61ad70..2b9d48424fe1b 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.icc
+++ b/SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.icc
@@ -7,115 +7,86 @@
 #include "CalibFormats/CaloObjects/interface/CaloSamples.h"
 
 template <class Traits>
-EcalTDigitizer<Traits>::EcalTDigitizer( EcalHitResponse* hitResponse    ,
-					ElectronicsSim*  electronicsSim ,
-					bool             addNoise         ) :
-   m_hitResponse    ( hitResponse    ) ,
-   m_electronicsSim ( electronicsSim ) ,
-   m_addNoise       ( addNoise       ) ,
-   theNoiseSignalGenerator (nullptr)
-{
-}
+EcalTDigitizer<Traits>::EcalTDigitizer(EcalHitResponse* hitResponse, ElectronicsSim* electronicsSim, bool addNoise)
+    : m_hitResponse(hitResponse),
+      m_electronicsSim(electronicsSim),
+      m_addNoise(addNoise),
+      theNoiseSignalGenerator(nullptr) {}
 
 template <class Traits>
-EcalTDigitizer<Traits>::~EcalTDigitizer()
-{
-}
+EcalTDigitizer<Traits>::~EcalTDigitizer() {}
 
 template <class Traits>
-void
-EcalTDigitizer<Traits>::add(const std::vector<PCaloHit> & hits, int bunchCrossing, CLHEP::HepRandomEngine* engine) {
-  if(m_hitResponse->withinBunchRange(bunchCrossing)) {
-    for(std::vector<PCaloHit>::const_iterator it = hits.begin(), itEnd = hits.end(); it != itEnd; ++it) {
+void EcalTDigitizer<Traits>::add(const std::vector<PCaloHit>& hits, int bunchCrossing, CLHEP::HepRandomEngine* engine) {
+  if (m_hitResponse->withinBunchRange(bunchCrossing)) {
+    for (std::vector<PCaloHit>::const_iterator it = hits.begin(), itEnd = hits.end(); it != itEnd; ++it) {
       m_hitResponse->add(*it, engine);
     }
   }
 }
 
 template <class Traits>
-void
-EcalTDigitizer<Traits>::initializeHits() {
+void EcalTDigitizer<Traits>::initializeHits() {
   m_hitResponse->initializeHits();
 }
 
-
 template <class Traits>
-void
-EcalTDigitizer<Traits>::setNoiseSignalGenerator(EcalBaseSignalGenerator* noiseSignalGenerator) {
-
-   theNoiseSignalGenerator = noiseSignalGenerator;
+void EcalTDigitizer<Traits>::setNoiseSignalGenerator(EcalBaseSignalGenerator* noiseSignalGenerator) {
+  theNoiseSignalGenerator = noiseSignalGenerator;
 }
 
+template <class Traits>
+void EcalTDigitizer<Traits>::run(DigiCollection& output, CLHEP::HepRandomEngine* engine) {
+  m_hitResponse->finalizeHits();
 
+  if (theNoiseSignalGenerator != nullptr) {
+    addNoiseSignals();
+  }
 
-template <class Traits>
-void 
-EcalTDigitizer<Traits>::run( DigiCollection& output, CLHEP::HepRandomEngine* engine  )
-{
-
-   m_hitResponse->finalizeHits()  ;
-
-   if(theNoiseSignalGenerator != nullptr) {
-	addNoiseSignals();	
-   }
-
-   m_electronicsSim->newEvent() ;
-
-   const unsigned int ssize ( m_hitResponse->samplesSize() ) ;
-   output.reserve( ssize ) ;
-
-   for( unsigned int i ( 0 ) ; i != ssize ; ++i )
-   {
-      EcalSamples& analogSignal ( *static_cast<EcalSamples*>( (*m_hitResponse)[ i ]) ) ;
-      if( m_addNoise              ||    // digitize if real or adding noise
-	  !analogSignal.zero()       )
-      {
-	 output.push_back( analogSignal.id().rawId() ) ;
-	 Digi digi ( output.back() ) ;  // why does this work without &
-	 m_electronicsSim->analogToDigital( engine, analogSignal , digi ) ;
-	 Traits::fix( digi, output.back() ) ;
-      }
-   }
-}
+  m_electronicsSim->newEvent();
 
+  const unsigned int ssize(m_hitResponse->samplesSize());
+  output.reserve(ssize);
 
-template <class Traits>
-void 
-EcalTDigitizer<Traits>::addNoiseSignals()
-  {
-    std::vector<CaloSamples> noiseSignals;
-    // noise signals need to be in units of photoelectrons.  Fractional is OK
-    theNoiseSignalGenerator->fillEvent();
-    theNoiseSignalGenerator->getNoiseSignals(noiseSignals);
-    for(typename std::vector<CaloSamples>::const_iterator signalItr = noiseSignals.begin(),
-        signalEnd = noiseSignals.end(); signalItr != signalEnd; ++signalItr)
-    {
-      m_hitResponse->add(*signalItr);
+  for (unsigned int i(0); i != ssize; ++i) {
+    EcalSamples& analogSignal(*static_cast<EcalSamples*>((*m_hitResponse)[i]));
+    if (m_addNoise ||  // digitize if real or adding noise
+        !analogSignal.zero()) {
+      output.push_back(analogSignal.id().rawId());
+      Digi digi(output.back());  // why does this work without &
+      m_electronicsSim->analogToDigital(engine, analogSignal, digi);
+      Traits::fix(digi, output.back());
     }
   }
+}
 
 template <class Traits>
-bool
-EcalTDigitizer<Traits>::addNoise() const 
-{
-   return m_addNoise ;
+void EcalTDigitizer<Traits>::addNoiseSignals() {
+  std::vector<CaloSamples> noiseSignals;
+  // noise signals need to be in units of photoelectrons.  Fractional is OK
+  theNoiseSignalGenerator->fillEvent();
+  theNoiseSignalGenerator->getNoiseSignals(noiseSignals);
+  for (typename std::vector<CaloSamples>::const_iterator signalItr = noiseSignals.begin(),
+                                                         signalEnd = noiseSignals.end();
+       signalItr != signalEnd;
+       ++signalItr) {
+    m_hitResponse->add(*signalItr);
+  }
 }
 
-
 template <class Traits>
-const EcalHitResponse* 
-EcalTDigitizer<Traits>::hitResponse() const
-{
-   return m_hitResponse ;
+bool EcalTDigitizer<Traits>::addNoise() const {
+  return m_addNoise;
 }
 
 template <class Traits>
-const typename Traits::ElectronicsSim*
-EcalTDigitizer<Traits>::elecSim() const 
-{
-   return m_electronicsSim ;
+const EcalHitResponse* EcalTDigitizer<Traits>::hitResponse() const {
+  return m_hitResponse;
 }
 
+template <class Traits>
+const typename Traits::ElectronicsSim* EcalTDigitizer<Traits>::elecSim() const {
+  return m_electronicsSim;
+}
 
 #endif
-
diff --git a/SimCalorimetry/EcalSimAlgos/interface/EcalTimeMapDigitizer.h b/SimCalorimetry/EcalSimAlgos/interface/EcalTimeMapDigitizer.h
index add1b2eedf13d..c271e426fb8e5 100644
--- a/SimCalorimetry/EcalSimAlgos/interface/EcalTimeMapDigitizer.h
+++ b/SimCalorimetry/EcalSimAlgos/interface/EcalTimeMapDigitizer.h
@@ -14,146 +14,126 @@
 #include "CalibFormats/CaloObjects/interface/CaloTSamplesBase.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 
-class CaloSubdetectorGeometry ;
+class CaloSubdetectorGeometry;
 
-class EcalTimeMapDigitizer
-{
- public:
-
-  struct time_average{
-
-    static const unsigned short time_average_capacity=10;
+class EcalTimeMapDigitizer {
+public:
+  struct time_average {
+    static const unsigned short time_average_capacity = 10;
 
     DetId id;
     float average_time[time_average_capacity];
     unsigned int nhits[time_average_capacity];
     float tot_energy[time_average_capacity];
-    
-    time_average(const DetId& myId):
-      id(myId)
-    {
-      for (unsigned int i(0);i<time_average_capacity;++i)
-	{
-	  average_time[i]=0;
-	  nhits[i]=0;
-	  tot_energy[i]=0;
-	}
 
+    time_average(const DetId& myId) : id(myId) {
+      for (unsigned int i(0); i < time_average_capacity; ++i) {
+        average_time[i] = 0;
+        nhits[i] = 0;
+        tot_energy[i] = 0;
+      }
     };
 
-    void 
-    calculateAverage()
-    {
-      for (unsigned int i(0);i<time_average_capacity;++i)
-	{
-	  if (nhits[i]>0)
-	    average_time[i]=average_time[i]/tot_energy[i];
-	  else
-	    average_time[i]=0;
-	}
+    void calculateAverage() {
+      for (unsigned int i(0); i < time_average_capacity; ++i) {
+        if (nhits[i] > 0)
+          average_time[i] = average_time[i] / tot_energy[i];
+        else
+          average_time[i] = 0;
+      }
     };
-    
-    void 
-    setZero()
-    {
-      for (unsigned int i(0);i<time_average_capacity;++i)
-	{
-	  average_time[i]=0;
-	  nhits[i]=0;
-	  tot_energy[i]=0;
-	}
+
+    void setZero() {
+      for (unsigned int i(0); i < time_average_capacity; ++i) {
+        average_time[i] = 0;
+        nhits[i] = 0;
+        tot_energy[i] = 0;
+      }
     };
 
-    bool
-    zero()
-    {
-      for (unsigned int i(0);i<time_average_capacity;++i)
-	{
-	  if(nhits[i]>0)
-	    return false;
-	}
+    bool zero() {
+      for (unsigned int i(0); i < time_average_capacity; ++i) {
+        if (nhits[i] > 0)
+          return false;
+      }
       return true;
     };
-    
   };
 
   typedef time_average TimeSamples;
 
   typedef EcalTimeDigi Digi;
 
-  typedef std::vector< unsigned int > VecInd ;
+  typedef std::vector<unsigned int> VecInd;
 
   explicit EcalTimeMapDigitizer(EcalSubdetector myDet);
-  
+
   virtual ~EcalTimeMapDigitizer();
-  
-  void add(const std::vector<PCaloHit> & hits, int bunchCrossing);
-  
-  void setGeometry( const CaloSubdetectorGeometry* geometry ) ;
+
+  void add(const std::vector<PCaloHit>& hits, int bunchCrossing);
+
+  void setGeometry(const CaloSubdetectorGeometry* geometry);
 
   void initializeMap();
-  
-  void run(EcalTimeDigiCollection& output  );
+
+  void run(EcalTimeDigiCollection& output);
 
   void finalizeHits();
-  
-  inline void setTimeLayerId( const int& layerId ) { m_timeLayerId = layerId; };
-  
+
+  inline void setTimeLayerId(const int& layerId) { m_timeLayerId = layerId; };
+
   int getTimeLayerId() { return m_timeLayerId; };
-  
+
   EcalSubdetector subdetector() { return m_subDet; };
 
-  int  minBunch() const ;
+  int minBunch() const;
 
-  int  maxBunch() const  ;
+  int maxBunch() const;
 
-  void blankOutUsedSamples() ; // blank out previously used elements
-  
+  void blankOutUsedSamples();  // blank out previously used elements
 
-/*   const CaloVHitFilter* hitFilter() const ; */
+  /*   const CaloVHitFilter* hitFilter() const ; */
 
- private:
-  
-  TimeSamples* findSignal( const DetId& detId );
+private:
+  TimeSamples* findSignal(const DetId& detId);
 
-  VecInd& index() ;
-  
-  const VecInd& index() const ;
+  VecInd& index();
+
+  const VecInd& index() const;
 
   unsigned int samplesSize() const;
 
   unsigned int samplesSizeAll() const;
 
-  const TimeSamples*  operator[]( unsigned int i ) const;
+  const TimeSamples* operator[](unsigned int i) const;
 
-  TimeSamples*  operator[]( unsigned int i );
+  TimeSamples* operator[](unsigned int i);
 
-  TimeSamples*  vSam( unsigned int i );
+  TimeSamples* vSam(unsigned int i);
 
-  TimeSamples*  vSamAll( unsigned int i );
+  TimeSamples* vSamAll(unsigned int i);
 
-  const TimeSamples*  vSamAll( unsigned int i ) const;
+  const TimeSamples* vSamAll(unsigned int i) const;
 
   EcalSubdetector m_subDet;
   //time difference between bunches
 
-  static const int BUNCHSPACE=25;
+  static const int BUNCHSPACE = 25;
+
+  static const float MIN_ENERGY_THRESHOLD;  //50 KeV threshold to consider a valid hit in the timing detector
 
-  static const float MIN_ENERGY_THRESHOLD; //50 KeV threshold to consider a valid hit in the timing detector
+  static const int m_minBunch = -4;
+  static const int m_maxBunch = 5;
 
-  static const int    m_minBunch=-4;
-  static const int    m_maxBunch=5;
-  
   int m_timeLayerId;
-  
-  const CaloSubdetectorGeometry* m_geometry ;
-  
-  double timeOfFlight( const DetId& detId , int layer) const; 
 
-  std::vector<TimeSamples> m_vSam;
+  const CaloSubdetectorGeometry* m_geometry;
+
+  double timeOfFlight(const DetId& detId, int layer) const;
 
-  VecInd m_index;  
+  std::vector<TimeSamples> m_vSam;
 
+  VecInd m_index;
 };
 
 #endif
diff --git a/SimCalorimetry/EcalSimAlgos/src/APDShape.cc b/SimCalorimetry/EcalSimAlgos/src/APDShape.cc
index ed35a79489a1d..8a66db4271fd7 100644
--- a/SimCalorimetry/EcalSimAlgos/src/APDShape.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/APDShape.cc
@@ -2,37 +2,33 @@
 
 #include "SimCalorimetry/EcalSimAlgos/interface/APDShape.h"
 
-#include<cassert>
+#include <cassert>
 
-void
-APDShape::fillShape(float &time_interval, double &m_thresh, EcalShapeBase::DVec& aVec, const edm::EventSetup* es) const
-{
-    if(m_useDBShape) 
-    {
-        if(es == nullptr)
-        {
-	    throw cms::Exception("EcalShapeBase:: DB conditions are not available, const edm::EventSetup* es == nullptr ");
-	}
-	edm::ESHandle<EcalSimPulseShape> esps;
-	es->get<EcalSimPulseShapeRcd>().get(esps);
-
-	aVec = esps->apd_shape; 
-	time_interval = esps->time_interval;
-	m_thresh = esps->apd_thresh;
+void APDShape::fillShape(float& time_interval,
+                         double& m_thresh,
+                         EcalShapeBase::DVec& aVec,
+                         const edm::EventSetup* es) const {
+  if (m_useDBShape) {
+    if (es == nullptr) {
+      throw cms::Exception("EcalShapeBase:: DB conditions are not available, const edm::EventSetup* es == nullptr ");
     }
-    else
-    {
-	m_thresh = 0.0;
-        time_interval = 1.0; 
-        aVec.reserve(500);
-        const double m_tStart=74.5;
-        const double m_tau=40.5;
+    edm::ESHandle<EcalSimPulseShape> esps;
+    es->get<EcalSimPulseShapeRcd>().get(esps);
+
+    aVec = esps->apd_shape;
+    time_interval = esps->time_interval;
+    m_thresh = esps->apd_thresh;
+  } else {
+    m_thresh = 0.0;
+    time_interval = 1.0;
+    aVec.reserve(500);
+    const double m_tStart = 74.5;
+    const double m_tau = 40.5;
 
-	for( unsigned int i ( 0 ) ; i != 500 ; ++i )
-	{
-	    const double ctime ( ( 1.*i + 0.5 - m_tStart )/m_tau ) ;
-            double val =  0 > ctime ? 0 : ctime * exp( 1. - ctime );
-	    aVec.push_back(val);
-	}
+    for (unsigned int i(0); i != 500; ++i) {
+      const double ctime((1. * i + 0.5 - m_tStart) / m_tau);
+      double val = 0 > ctime ? 0 : ctime * exp(1. - ctime);
+      aVec.push_back(val);
     }
+  }
 }
diff --git a/SimCalorimetry/EcalSimAlgos/src/EBHitResponse.cc b/SimCalorimetry/EcalSimAlgos/src/EBHitResponse.cc
index 86411c1be3d9b..c500007a729eb 100644
--- a/SimCalorimetry/EcalSimAlgos/src/EBHitResponse.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/EBHitResponse.cc
@@ -1,5 +1,5 @@
-#include "SimCalorimetry/EcalSimAlgos/interface/EBHitResponse.h" 
-#include "SimCalorimetry/EcalSimAlgos/interface/APDSimParameters.h" 
+#include "SimCalorimetry/EcalSimAlgos/interface/EBHitResponse.h"
+#include "SimCalorimetry/EcalSimAlgos/interface/APDSimParameters.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVSimParameterMap.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloSimParameters.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVHitFilter.h"
@@ -12,340 +12,244 @@
 #include "FWCore/Utilities/interface/isFinite.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-
-EBHitResponse::EBHitResponse( const CaloVSimParameterMap* parameterMap , 
-			      const CaloVShape*           shape        ,
-			      bool                        apdOnly      ,
-			      const APDSimParameters*     apdPars  = nullptr , 
-			      const CaloVShape*           apdShape = nullptr   ) :
-
-   EcalHitResponse( parameterMap, shape ) ,
-
-   m_apdOnly  ( apdOnly  ) ,
-   m_apdPars  ( apdPars  ) ,
-   m_apdShape ( apdShape ) ,
-   m_timeOffVec ( kNOffsets, apdParameters()->timeOffset() ) ,
-   pcub ( nullptr == apdPars ? 0 : apdParameters()->nonlParms()[0] ) ,
-   pqua ( nullptr == apdPars ? 0 : apdParameters()->nonlParms()[1] ) ,
-   plin ( nullptr == apdPars ? 0 : apdParameters()->nonlParms()[2] ) ,
-   pcon ( nullptr == apdPars ? 0 : apdParameters()->nonlParms()[3] ) ,
-   pelo ( nullptr == apdPars ? 0 : apdParameters()->nonlParms()[4] ) ,
-   pehi ( nullptr == apdPars ? 0 : apdParameters()->nonlParms()[5] ) ,
-   pasy ( nullptr == apdPars ? 0 : apdParameters()->nonlParms()[6] ) ,
-   pext ( nullptr == apdPars ? 0 : nonlFunc1( pelo ) ) ,
-   poff ( nullptr == apdPars ? 0 : nonlFunc1( pehi ) ) ,
-   pfac ( nullptr == apdPars ? 0 : ( pasy - poff )*2./M_PI ),
-   m_isInitialized(false)
-{
-   const EBDetId detId ( EBDetId::detIdFromDenseIndex( 0 ) ) ;
-   const CaloSimParameters& parameters ( parameterMap->simParameters( detId ) ) ;
-
-   const unsigned int rSize ( parameters.readoutFrameSize() ) ;
-   const unsigned int nPre  ( parameters.binOfMaximum() - 1 ) ;
-
-   const unsigned int size ( EBDetId::kSizeForDenseIndexing ) ;
-
-   m_vSam.reserve( size ) ;
-
-   for( unsigned int i ( 0 ) ; i != size ; ++i )
-   {
-      m_vSam.emplace_back(CaloGenericDetId( detId.det(), detId.subdetId(), i ) ,
-		    rSize, nPre );
-   }
+EBHitResponse::EBHitResponse(const CaloVSimParameterMap* parameterMap,
+                             const CaloVShape* shape,
+                             bool apdOnly,
+                             const APDSimParameters* apdPars = nullptr,
+                             const CaloVShape* apdShape = nullptr)
+    :
+
+      EcalHitResponse(parameterMap, shape),
+
+      m_apdOnly(apdOnly),
+      m_apdPars(apdPars),
+      m_apdShape(apdShape),
+      m_timeOffVec(kNOffsets, apdParameters()->timeOffset()),
+      pcub(nullptr == apdPars ? 0 : apdParameters()->nonlParms()[0]),
+      pqua(nullptr == apdPars ? 0 : apdParameters()->nonlParms()[1]),
+      plin(nullptr == apdPars ? 0 : apdParameters()->nonlParms()[2]),
+      pcon(nullptr == apdPars ? 0 : apdParameters()->nonlParms()[3]),
+      pelo(nullptr == apdPars ? 0 : apdParameters()->nonlParms()[4]),
+      pehi(nullptr == apdPars ? 0 : apdParameters()->nonlParms()[5]),
+      pasy(nullptr == apdPars ? 0 : apdParameters()->nonlParms()[6]),
+      pext(nullptr == apdPars ? 0 : nonlFunc1(pelo)),
+      poff(nullptr == apdPars ? 0 : nonlFunc1(pehi)),
+      pfac(nullptr == apdPars ? 0 : (pasy - poff) * 2. / M_PI),
+      m_isInitialized(false) {
+  const EBDetId detId(EBDetId::detIdFromDenseIndex(0));
+  const CaloSimParameters& parameters(parameterMap->simParameters(detId));
+
+  const unsigned int rSize(parameters.readoutFrameSize());
+  const unsigned int nPre(parameters.binOfMaximum() - 1);
+
+  const unsigned int size(EBDetId::kSizeForDenseIndexing);
+
+  m_vSam.reserve(size);
+
+  for (unsigned int i(0); i != size; ++i) {
+    m_vSam.emplace_back(CaloGenericDetId(detId.det(), detId.subdetId(), i), rSize, nPre);
+  }
 }
 
-EBHitResponse::~EBHitResponse()
-{
-}
+EBHitResponse::~EBHitResponse() {}
 
-void
-EBHitResponse::initialize(CLHEP::HepRandomEngine* engine)
-{
-   m_isInitialized = true;
-   for( unsigned int i ( 0 ) ; i != kNOffsets ; ++i )
-   {
-      m_timeOffVec[ i ] +=
-        CLHEP::RandGaussQ::shoot(engine, 0, apdParameters()->timeOffWidth() ) ;
-   }
+void EBHitResponse::initialize(CLHEP::HepRandomEngine* engine) {
+  m_isInitialized = true;
+  for (unsigned int i(0); i != kNOffsets; ++i) {
+    m_timeOffVec[i] += CLHEP::RandGaussQ::shoot(engine, 0, apdParameters()->timeOffWidth());
+  }
 }
 
-const APDSimParameters*
-EBHitResponse::apdParameters() const
-{
-   assert ( nullptr != m_apdPars ) ;
-   return m_apdPars ;
+const APDSimParameters* EBHitResponse::apdParameters() const {
+  assert(nullptr != m_apdPars);
+  return m_apdPars;
 }
 
-const CaloVShape*
-EBHitResponse::apdShape() const
-{
-   assert( nullptr != m_apdShape ) ;
-   return m_apdShape ;
+const CaloVShape* EBHitResponse::apdShape() const {
+  assert(nullptr != m_apdShape);
+  return m_apdShape;
 }
 
-void
-EBHitResponse::putAPDSignal( const DetId& detId  ,
-			     double       npe    ,
-			     double       time     )
-{
-   const CaloSimParameters& parameters ( *params( detId ) ) ;
+void EBHitResponse::putAPDSignal(const DetId& detId, double npe, double time) {
+  const CaloSimParameters& parameters(*params(detId));
 
-   const double energyFac ( 1./parameters.simHitToPhotoelectrons( detId ) ) ;
+  const double energyFac(1. / parameters.simHitToPhotoelectrons(detId));
 
-//   std::cout<<"******** Input APD Npe="<<npe<<", Efactor="<<energyFac
-//	    <<", Energy="<<npe*energyFac
-//	    <<", nonlFunc="<<nonlFunc( npe*energyFac )<<std::endl ;
+  //   std::cout<<"******** Input APD Npe="<<npe<<", Efactor="<<energyFac
+  //	    <<", Energy="<<npe*energyFac
+  //	    <<", nonlFunc="<<nonlFunc( npe*energyFac )<<std::endl ;
 
-   const double signal ( npe*nonlFunc( npe*energyFac ) ) ;
+  const double signal(npe * nonlFunc(npe * energyFac));
 
-   const double jitter ( time - timeOfFlight( detId ) ) ;
+  const double jitter(time - timeOfFlight(detId));
 
-   if(!m_isInitialized) {
-      throw cms::Exception("LogicError")
-        << "EBHitResponse::putAPDSignal called without initializing\n";
-   }
+  if (!m_isInitialized) {
+    throw cms::Exception("LogicError") << "EBHitResponse::putAPDSignal called without initializing\n";
+  }
 
-   const double tzero ( apdShape()->timeToRise()
-			- jitter
-			- offsets()[ EBDetId( detId ).denseIndex()%kNOffsets ]
-			- BUNCHSPACE*( parameters.binOfMaximum()
-				       - phaseShift()            ) ) ;
+  const double tzero(apdShape()->timeToRise() - jitter - offsets()[EBDetId(detId).denseIndex() % kNOffsets] -
+                     BUNCHSPACE * (parameters.binOfMaximum() - phaseShift()));
 
-   double binTime ( tzero ) ;
+  double binTime(tzero);
 
-   EcalSamples& result ( *findSignal( detId ) );
+  EcalSamples& result(*findSignal(detId));
 
-   for( unsigned int bin ( 0 ) ; bin != result.size(); ++bin )
-   {
-      result[bin] += (*apdShape())(binTime)*signal ;
-      binTime += BUNCHSPACE ;
-   }
+  for (unsigned int bin(0); bin != result.size(); ++bin) {
+    result[bin] += (*apdShape())(binTime)*signal;
+    binTime += BUNCHSPACE;
+  }
 }
 
-double 
-EBHitResponse::apdSignalAmplitude( const PCaloHit& hit, CLHEP::HepRandomEngine* engine ) const
-{
+double EBHitResponse::apdSignalAmplitude(const PCaloHit& hit, CLHEP::HepRandomEngine* engine) const {
   int iddepth = (hit.depth() & PCaloHit::kEcalDepthIdMask);
-  assert( 1 == iddepth || 2 == iddepth ) ;
-
-   double npe ( hit.energy()*( 2 == iddepth ?
-			       apdParameters()->simToPELow() :
-			       apdParameters()->simToPEHigh() ) ) ;
+  assert(1 == iddepth || 2 == iddepth);
 
-   // do we need to do Poisson statistics for the photoelectrons?
-   if( apdParameters()->doPEStats() &&
-       !m_apdOnly                      ) {
+  double npe(hit.energy() * (2 == iddepth ? apdParameters()->simToPELow() : apdParameters()->simToPEHigh()));
 
-      CLHEP::RandPoissonQ randPoissonQ(*engine, npe);
-      npe = randPoissonQ.fire();
-   }
-   assert( nullptr != m_intercal ) ;
-   double fac ( 1 ) ;
-   findIntercalibConstant( hit.id(), fac ) ;
+  // do we need to do Poisson statistics for the photoelectrons?
+  if (apdParameters()->doPEStats() && !m_apdOnly) {
+    CLHEP::RandPoissonQ randPoissonQ(*engine, npe);
+    npe = randPoissonQ.fire();
+  }
+  assert(nullptr != m_intercal);
+  double fac(1);
+  findIntercalibConstant(hit.id(), fac);
 
-   npe *= fac ;
+  npe *= fac;
 
-//   edm::LogError( "EBHitResponse" ) << "--- # photoelectrons for "
-/*   std::cout << "--- # photoelectrons for "
+  //   edm::LogError( "EBHitResponse" ) << "--- # photoelectrons for "
+  /*   std::cout << "--- # photoelectrons for "
 	     << EBDetId( hit.id() ) 
 	     <<" is " << npe //;
 	     <<std::endl ;*/
 
-   return npe ;
+  return npe;
 }
 
-void 
-EBHitResponse::setIntercal( const EcalIntercalibConstantsMC* ical )
-{
-   m_intercal = ical ;
-}
+void EBHitResponse::setIntercal(const EcalIntercalibConstantsMC* ical) { m_intercal = ical; }
 
-void 
-EBHitResponse::findIntercalibConstant( const DetId& detId, 
-				       double&      icalconst ) const
-{
-   EcalIntercalibConstantMC thisconst ( 1. ) ;
-
-   if( nullptr == m_intercal )
-   {
-      edm::LogError( "EBHitResponse" ) << 
-	 "No intercal constant defined for EBHitResponse" ;
-   }
-   else
-   {
-      const EcalIntercalibConstantMCMap&          icalMap ( m_intercal->getMap()  ) ;
-      EcalIntercalibConstantMCMap::const_iterator icalit  ( icalMap.find( detId ) ) ;
-      if( icalit != icalMap.end() )
-      {
-	 thisconst = *icalit ;
-	 if ( thisconst == 0. ) thisconst = 1. ; 
-      } 
-      else
-      {
-	 edm::LogError("EBHitResponse") << "No intercalib const found for xtal " 
-					<< detId.rawId() 
-					<< "! something wrong with EcalIntercalibConstants in your DB? ";
-      }
-   }
-   icalconst = thisconst ;
+void EBHitResponse::findIntercalibConstant(const DetId& detId, double& icalconst) const {
+  EcalIntercalibConstantMC thisconst(1.);
+
+  if (nullptr == m_intercal) {
+    edm::LogError("EBHitResponse") << "No intercal constant defined for EBHitResponse";
+  } else {
+    const EcalIntercalibConstantMCMap& icalMap(m_intercal->getMap());
+    EcalIntercalibConstantMCMap::const_iterator icalit(icalMap.find(detId));
+    if (icalit != icalMap.end()) {
+      thisconst = *icalit;
+      if (thisconst == 0.)
+        thisconst = 1.;
+    } else {
+      edm::LogError("EBHitResponse") << "No intercalib const found for xtal " << detId.rawId()
+                                     << "! something wrong with EcalIntercalibConstants in your DB? ";
+    }
+  }
+  icalconst = thisconst;
 }
 
-void 
-EBHitResponse::initializeHits() {
-   if( !index().empty() ) blankOutUsedSamples() ;
+void EBHitResponse::initializeHits() {
+  if (!index().empty())
+    blankOutUsedSamples();
 
-   const unsigned int bSize ( EBDetId::kSizeForDenseIndexing ) ;
+  const unsigned int bSize(EBDetId::kSizeForDenseIndexing);
 
-   if( m_apdNpeVec.empty() )
-   {
-      m_apdNpeVec  = std::vector<double>( bSize, (double)0.0 ) ;
-      m_apdTimeVec = std::vector<double>( bSize, (double)0.0 ) ;
-   }
+  if (m_apdNpeVec.empty()) {
+    m_apdNpeVec = std::vector<double>(bSize, (double)0.0);
+    m_apdTimeVec = std::vector<double>(bSize, (double)0.0);
+  }
 }
 
-void 
-EBHitResponse::finalizeHits() {
-   const unsigned int bSize ( EBDetId::kSizeForDenseIndexing ) ;
-   if( apdParameters()->addToBarrel() ||
-       m_apdOnly                         )
-   {
-      for( unsigned int i ( 0 ) ; i != bSize ; ++i )
-      {
-         if( 0 < m_apdNpeVec[i] )
-         {
-            putAPDSignal( EBDetId::detIdFromDenseIndex( i ),
-                          m_apdNpeVec[i] ,
-                          m_apdTimeVec[i]                    ) ;
-
-            // now zero out for next time
-            m_apdNpeVec[i] = 0. ;
-            m_apdTimeVec[i] = 0. ;
-         }
+void EBHitResponse::finalizeHits() {
+  const unsigned int bSize(EBDetId::kSizeForDenseIndexing);
+  if (apdParameters()->addToBarrel() || m_apdOnly) {
+    for (unsigned int i(0); i != bSize; ++i) {
+      if (0 < m_apdNpeVec[i]) {
+        putAPDSignal(EBDetId::detIdFromDenseIndex(i), m_apdNpeVec[i], m_apdTimeVec[i]);
+
+        // now zero out for next time
+        m_apdNpeVec[i] = 0.;
+        m_apdTimeVec[i] = 0.;
       }
-   }
+    }
+  }
 }
 
-void 
-EBHitResponse::add( const PCaloHit& hit, CLHEP::HepRandomEngine* engine )
-{
-  if (!edm::isNotFinite( hit.time() ) && ( nullptr == hitFilter() || hitFilter()->accepts( hit ) ) ) {
+void EBHitResponse::add(const PCaloHit& hit, CLHEP::HepRandomEngine* engine) {
+  if (!edm::isNotFinite(hit.time()) && (nullptr == hitFilter() || hitFilter()->accepts(hit))) {
     int iddepth = (hit.depth() & PCaloHit::kEcalDepthIdMask);
-    if ( 0 == iddepth ) // for now take only nonAPD hits
-     {
-       if( !m_apdOnly ) putAnalogSignal( hit, engine ) ;
-     }
-     else // APD hits here
-     {
-        if( apdParameters()->addToBarrel() ||
-            m_apdOnly                         )
-        {
-           const unsigned int icell ( EBDetId( hit.id() ).denseIndex() ) ;
-           m_apdNpeVec[ icell ] += apdSignalAmplitude( hit, engine ) ;
-           if( 0 == m_apdTimeVec[ icell ] ) m_apdTimeVec[ icell ] = hit.time() ;
-        }
-     }
+    if (0 == iddepth)  // for now take only nonAPD hits
+    {
+      if (!m_apdOnly)
+        putAnalogSignal(hit, engine);
+    } else  // APD hits here
+    {
+      if (apdParameters()->addToBarrel() || m_apdOnly) {
+        const unsigned int icell(EBDetId(hit.id()).denseIndex());
+        m_apdNpeVec[icell] += apdSignalAmplitude(hit, engine);
+        if (0 == m_apdTimeVec[icell])
+          m_apdTimeVec[icell] = hit.time();
+      }
+    }
   }
 }
 
-void 
-EBHitResponse::run( MixCollection<PCaloHit>& hits, CLHEP::HepRandomEngine* engine )
-{
-   if( !index().empty() ) blankOutUsedSamples() ;
-
-   const unsigned int bSize ( EBDetId::kSizeForDenseIndexing ) ;
-
-   if( m_apdNpeVec.empty() ) 
-   {
-      m_apdNpeVec  = std::vector<double>( bSize, (double)0.0 ) ;
-      m_apdTimeVec = std::vector<double>( bSize, (double)0.0 ) ;
-   }
-
-   for( MixCollection<PCaloHit>::MixItr hitItr ( hits.begin() ) ;
-	hitItr != hits.end() ; ++hitItr )
-   {
-      const PCaloHit& hit ( *hitItr ) ;
-      const int bunch ( hitItr.bunch() ) ;
-      if( minBunch() <= bunch  &&
-	  maxBunch() >= bunch  &&
-	  !edm::isNotFinite( hit.time() ) &&
-	  ( nullptr == hitFilter() ||
-	    hitFilter()->accepts( hit ) ) )
-      { 
-	int iddepth = (hit.depth() & PCaloHit::kEcalDepthIdMask);
-	if( 0 == iddepth ) // for now take only nonAPD hits
-	  {
-	    if( !m_apdOnly ) putAnalogSignal( hit, engine ) ;
-	  }
-	else // APD hits here
-	  {
-	    if( apdParameters()->addToBarrel() ||
-		m_apdOnly                         )
-	      {
-		const unsigned int icell ( EBDetId( hit.id() ).denseIndex() ) ;
-		m_apdNpeVec[ icell ] += apdSignalAmplitude( hit, engine ) ;
-		if( 0 == m_apdTimeVec[ icell ] ) m_apdTimeVec[ icell ] = hit.time() ;
-	      }
-	  }
+void EBHitResponse::run(MixCollection<PCaloHit>& hits, CLHEP::HepRandomEngine* engine) {
+  if (!index().empty())
+    blankOutUsedSamples();
+
+  const unsigned int bSize(EBDetId::kSizeForDenseIndexing);
+
+  if (m_apdNpeVec.empty()) {
+    m_apdNpeVec = std::vector<double>(bSize, (double)0.0);
+    m_apdTimeVec = std::vector<double>(bSize, (double)0.0);
+  }
+
+  for (MixCollection<PCaloHit>::MixItr hitItr(hits.begin()); hitItr != hits.end(); ++hitItr) {
+    const PCaloHit& hit(*hitItr);
+    const int bunch(hitItr.bunch());
+    if (minBunch() <= bunch && maxBunch() >= bunch && !edm::isNotFinite(hit.time()) &&
+        (nullptr == hitFilter() || hitFilter()->accepts(hit))) {
+      int iddepth = (hit.depth() & PCaloHit::kEcalDepthIdMask);
+      if (0 == iddepth)  // for now take only nonAPD hits
+      {
+        if (!m_apdOnly)
+          putAnalogSignal(hit, engine);
+      } else  // APD hits here
+      {
+        if (apdParameters()->addToBarrel() || m_apdOnly) {
+          const unsigned int icell(EBDetId(hit.id()).denseIndex());
+          m_apdNpeVec[icell] += apdSignalAmplitude(hit, engine);
+          if (0 == m_apdTimeVec[icell])
+            m_apdTimeVec[icell] = hit.time();
+        }
       }
-   }
-   
-   if( apdParameters()->addToBarrel() ||
-       m_apdOnly                         )
-     {
-       for( unsigned int i ( 0 ) ; i != bSize ; ++i )
-	 {
-	   if( 0 < m_apdNpeVec[i] )
-	     {
-	       putAPDSignal( EBDetId::detIdFromDenseIndex( i ),
-			     m_apdNpeVec[i] ,
-			     m_apdTimeVec[i]                    ) ;
-	       
-	       // now zero out for next time
-	       m_apdNpeVec[i] = 0. ;
-	       m_apdTimeVec[i] = 0. ;
-	     }
-	 }
-     }
-}
+    }
+  }
 
-unsigned int
-EBHitResponse::samplesSize() const
-{
-   return m_vSam.size() ;
-}
+  if (apdParameters()->addToBarrel() || m_apdOnly) {
+    for (unsigned int i(0); i != bSize; ++i) {
+      if (0 < m_apdNpeVec[i]) {
+        putAPDSignal(EBDetId::detIdFromDenseIndex(i), m_apdNpeVec[i], m_apdTimeVec[i]);
 
-unsigned int
-EBHitResponse::samplesSizeAll() const
-{
-   return m_vSam.size() ;
+        // now zero out for next time
+        m_apdNpeVec[i] = 0.;
+        m_apdTimeVec[i] = 0.;
+      }
+    }
+  }
 }
 
-const EcalHitResponse::EcalSamples* 
-EBHitResponse::operator[]( unsigned int i ) const
-{
-   return &m_vSam[ i ] ;
-}
+unsigned int EBHitResponse::samplesSize() const { return m_vSam.size(); }
 
-EcalHitResponse::EcalSamples* 
-EBHitResponse::operator[]( unsigned int i )
-{
-   return &m_vSam[ i ] ;
-}
+unsigned int EBHitResponse::samplesSizeAll() const { return m_vSam.size(); }
 
-EcalHitResponse::EcalSamples* 
-EBHitResponse::vSam( unsigned int i )
-{
-   return &m_vSam[ i ] ;
-}
+const EcalHitResponse::EcalSamples* EBHitResponse::operator[](unsigned int i) const { return &m_vSam[i]; }
 
-EcalHitResponse::EcalSamples* 
-EBHitResponse::vSamAll( unsigned int i )
-{
-   return &m_vSam[ i ] ;
-}
+EcalHitResponse::EcalSamples* EBHitResponse::operator[](unsigned int i) { return &m_vSam[i]; }
 
-const EcalHitResponse::EcalSamples* 
-EBHitResponse::vSamAll( unsigned int i ) const
-{
-   return &m_vSam[ i ] ;
-}
+EcalHitResponse::EcalSamples* EBHitResponse::vSam(unsigned int i) { return &m_vSam[i]; }
+
+EcalHitResponse::EcalSamples* EBHitResponse::vSamAll(unsigned int i) { return &m_vSam[i]; }
+
+const EcalHitResponse::EcalSamples* EBHitResponse::vSamAll(unsigned int i) const { return &m_vSam[i]; }
diff --git a/SimCalorimetry/EcalSimAlgos/src/EBShape.cc b/SimCalorimetry/EcalSimAlgos/src/EBShape.cc
index 353ff934d432e..568938eab35f0 100644
--- a/SimCalorimetry/EcalSimAlgos/src/EBShape.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/EBShape.cc
@@ -2,280 +2,61 @@
 
 #include "SimCalorimetry/EcalSimAlgos/interface/EBShape.h"
 
+void EBShape::fillShape(float& time_interval,
+                        double& m_thresh,
+                        EcalShapeBase::DVec& aVec,
+                        const edm::EventSetup* es) const {
+  if (m_useDBShape) {
+    if (es == nullptr) {
+      throw cms::Exception("EcalShapeBase:: DB conditions are not available, const edm::EventSetup* es == nullptr ");
+    }
+    edm::ESHandle<EcalSimPulseShape> esps;
+    es->get<EcalSimPulseShapeRcd>().get(esps);
 
+    aVec = esps->barrel_shape;
+    time_interval = esps->time_interval;
+    m_thresh = esps->barrel_thresh;
 
-void
-EBShape::fillShape( float &time_interval, double &m_thresh, EcalShapeBase::DVec& aVec, const edm::EventSetup* es) const
-{
-    if(m_useDBShape) 
-    {
-        if(es == nullptr)
-        {
-	    throw cms::Exception("EcalShapeBase:: DB conditions are not available, const edm::EventSetup* es == nullptr ");
-	}
-	edm::ESHandle<EcalSimPulseShape> esps;
-	es->get<EcalSimPulseShapeRcd>().get(esps);
-
-	aVec = esps->barrel_shape; 
-	time_interval = esps->time_interval;
-	m_thresh = esps->barrel_thresh;
-
-    } else   // use old hardcoded arrays
-    {
-        m_thresh = 0.00013;
-        time_interval = 1.0; 
-        aVec.reserve(500);
-     	aVec = {6.94068e-05,
-                -5.03304e-05, 
-		-2.13404e-05, 
-		6.017e-05, 
-        	2.01697e-05, 
-        	0.000114845, 
-        	2.13998e-05, 
-        	2.74476e-05, 
-        	5.2824e-05, 
-        	8.754e-05, 
-        	2.95346e-06, 
-        	-7.58699e-05, 
-        	-2.72224e-05, 
-        	3.10997e-06, 
-        	-3.97771e-05, 
-        	-1.06916e-05, 
-        	-0.000113865, 
-        	6.05044e-05, 
-        	-5.81202e-05, 
-        	-6.58974e-06, 
-        	5.37494e-05, 
-        	-0.000123729, 
-        	7.50938e-06, 
-        	-1.35628e-05, 
-        	8.33725e-05, 
-        	3.19299e-05, 
-        	-3.09232e-05, 
-        	-7.0086e-05, 
-        	1.78937e-06, 
-        	-2.20365e-05, 
-        	7.68054e-05, 
-        	-2.5368e-05, 
-        	5.67291e-06, 
-        	5.87096e-05, 
-        	-2.62771e-06, 
-        	4.31832e-05, 
-        	8.33616e-06, 
-        	7.27813e-05, 
-        	7.6159e-05, 
-        	-1.60446e-05, 
-        	-4.12127e-06, 
-        	-5.93381e-05, 
-        	1.61444e-05, 
-        	-5.49559e-05, 
-        	5.55254e-05, 
-        	3.32251e-05, 
-        	-3.15897e-05, 
-        	7.86588e-05, 
-        	-2.9704e-05, 
-        	5.66838e-05, 
-        	2.85281e-05, 
-        	-3.02436e-05, 
-        	-4.16265e-05, 
-        	-1.63191e-05, 
-        	6.61193e-05, 
-        	9.23766e-05, 
-        	6.68903e-05, 
-        	-3.20994e-05, 
-        	0.00011082, 
-        	-4.07997e-05, 
-        	-8.29046e-06, 
-        	-7.42197e-05, 
-        	-1.64386e-05, 
-        	1.02508e-05, 
-        	7.10995e-06, 
-        	-5.87486e-05, 
-        	-0.000101201, 
-        	1.62003e-05, 
-        	-2.53093e-05, 
-        	2.65239e-05, 
-        	-2.68722e-05, 
-        	-4.02001e-05, 
-        	5.0674e-05, 
-        	-1.75884e-05, 
-        	4.7902e-05, 
-        	-1.01079e-05, 
-        	1.08427e-05, 
-        	-0.000112906, 
-        	3.33076e-05, 
-        	0.000181201, 
-        	0.000426875, 
-        	0.00114222, 
-        	0.00237804, 
-        	0.00541858, 
-        	0.0089021, 
-        	0.0149157, 
-        	0.0231397, 
-        	0.0344671, 
-        	0.0471013, 
-        	0.0625517, 
-        	0.0857351, 
-        	0.108561, 
-        	0.133481, 
-        	0.163557, 
-        	0.200243, 
-        	0.225919, 
-        	0.269213, 
-        	0.302929, 
-        	0.342722, 
-        	0.378522, 
-        	0.436563, 
-        	0.467581, 
-        	0.510133, 
-        	0.550063, 
-        	0.583509, 
-        	0.619187, 
-        	0.653245, 
-        	0.686101, 
-        	0.721178, 
-        	0.745129, 
-        	0.774163, 
-        	0.799011, 
-        	0.822177, 
-        	0.838315, 
-        	0.858847, 
-        	0.875559, 
-        	0.891294, 
-        	0.90537, 
-        	0.919617, 
-        	0.930632, 
-        	0.936216, 
-        	0.947739, 
-        	0.955306, 
-        	0.961876, 
-        	0.968124, 
-        	0.97327, 
-        	0.977513, 
-        	0.984885, 
-        	0.986497, 
-        	0.990039, 
-        	0.994798, 
-        	0.994884, 
-        	0.99795, 
-        	0.99834, 
-        	0.999607, 
-        	1, 
-        	0.999047, 
-        	0.998745, 
-        	0.999219, 
-        	0.99814, 
-        	0.995082, 
-        	0.992449, 
-        	0.990418, 
-        	0.985032, 
-        	0.982308, 
-        	0.978696, 
-        	0.975656, 
-        	0.971027, 
-        	0.964811, 
-        	0.959428, 
-        	0.95096, 
-        	0.947428, 
-        	0.9419, 
-        	0.933223, 
-        	0.926482, 
-        	0.922172, 
-        	0.912777, 
-        	0.907388, 
-        	0.897289, 
-        	0.891889, 
-        	0.882056, 
-        	0.873382, 
-        	0.865442, 
-        	0.860032, 
-        	0.85202, 
-        	0.841013, 
-        	0.833802, 
-        	0.825259, 
-        	0.815013, 
-        	0.807465, 
-        	0.799428, 
-        	0.792165, 
-        	0.783088, 
-        	0.773392, 
-        	0.764982, 
-        	0.752174, 
-        	0.746487, 
-        	0.737678, 
-        	0.727396, 
-        	0.718692, 
-        	0.712737, 
-        	0.702738, 
-        	0.69559, 
-        	0.684389, 
-        	0.677989, 
-        	0.667643, 
-        	0.659009, 
-        	0.650217, 
-        	0.644479, 
-        	0.636017, 
-        	0.625257, 
-        	0.618507, 
-        	0.609798, 
-        	0.600097, 
-        	0.592788, 
-        	0.584895, 
-        	0.578228, 
-        	0.569299, 
-        	0.560576, 
-        	0.552404, 
-        	0.541405, 
-        	0.536271, 
-        	0.528734, 
-        	0.519813, 
-        	0.512264, 
-        	0.507001, 
-        	0.49828, 
-        	0.492416, 
-        	0.483181, 
-        	0.477907, 
-        	0.469623, 
-        	0.462528, 
-        	0.455099, 
-        	0.45055, 
-        	0.443576, 
-        	0.435364, 
-        	0.429789, 
-        	0.422724, 
-        	0.415621, 
-        	0.409469, 
-        	0.40401, 
-        	0.398121, 
-        	0.391079, 
-        	0.384414, 
-        	0.378214, 
-        	0.369851, 
-        	0.365966, 
-        	0.359865, 
-        	0.353505, 
-        	0.347899, 
-        	0.343829, 
-        	0.337585, 
-        	0.333089, 
-        	0.326289, 
-        	0.322249, 
-        	0.316079, 
-        	0.31061, 
-        	0.305426, 
-        	0.301885, 
-        	0.296753, 
-        	0.290931, 
-        	0.286877, 
-        	0.281831, 
-        	0.276633, 
-        	0.272283, 
-        	0.268069, 
-        	0.26399, 
-        	0.258457, 
-        	0.253549, 
-        	0.249493}; 
+  } else  // use old hardcoded arrays
+  {
+    m_thresh = 0.00013;
+    time_interval = 1.0;
+    aVec.reserve(500);
+    aVec = {
+        6.94068e-05,  -5.03304e-05, -2.13404e-05, 6.017e-05,    2.01697e-05,  0.000114845,  2.13998e-05,  2.74476e-05,
+        5.2824e-05,   8.754e-05,    2.95346e-06,  -7.58699e-05, -2.72224e-05, 3.10997e-06,  -3.97771e-05, -1.06916e-05,
+        -0.000113865, 6.05044e-05,  -5.81202e-05, -6.58974e-06, 5.37494e-05,  -0.000123729, 7.50938e-06,  -1.35628e-05,
+        8.33725e-05,  3.19299e-05,  -3.09232e-05, -7.0086e-05,  1.78937e-06,  -2.20365e-05, 7.68054e-05,  -2.5368e-05,
+        5.67291e-06,  5.87096e-05,  -2.62771e-06, 4.31832e-05,  8.33616e-06,  7.27813e-05,  7.6159e-05,   -1.60446e-05,
+        -4.12127e-06, -5.93381e-05, 1.61444e-05,  -5.49559e-05, 5.55254e-05,  3.32251e-05,  -3.15897e-05, 7.86588e-05,
+        -2.9704e-05,  5.66838e-05,  2.85281e-05,  -3.02436e-05, -4.16265e-05, -1.63191e-05, 6.61193e-05,  9.23766e-05,
+        6.68903e-05,  -3.20994e-05, 0.00011082,   -4.07997e-05, -8.29046e-06, -7.42197e-05, -1.64386e-05, 1.02508e-05,
+        7.10995e-06,  -5.87486e-05, -0.000101201, 1.62003e-05,  -2.53093e-05, 2.65239e-05,  -2.68722e-05, -4.02001e-05,
+        5.0674e-05,   -1.75884e-05, 4.7902e-05,   -1.01079e-05, 1.08427e-05,  -0.000112906, 3.33076e-05,  0.000181201,
+        0.000426875,  0.00114222,   0.00237804,   0.00541858,   0.0089021,    0.0149157,    0.0231397,    0.0344671,
+        0.0471013,    0.0625517,    0.0857351,    0.108561,     0.133481,     0.163557,     0.200243,     0.225919,
+        0.269213,     0.302929,     0.342722,     0.378522,     0.436563,     0.467581,     0.510133,     0.550063,
+        0.583509,     0.619187,     0.653245,     0.686101,     0.721178,     0.745129,     0.774163,     0.799011,
+        0.822177,     0.838315,     0.858847,     0.875559,     0.891294,     0.90537,      0.919617,     0.930632,
+        0.936216,     0.947739,     0.955306,     0.961876,     0.968124,     0.97327,      0.977513,     0.984885,
+        0.986497,     0.990039,     0.994798,     0.994884,     0.99795,      0.99834,      0.999607,     1,
+        0.999047,     0.998745,     0.999219,     0.99814,      0.995082,     0.992449,     0.990418,     0.985032,
+        0.982308,     0.978696,     0.975656,     0.971027,     0.964811,     0.959428,     0.95096,      0.947428,
+        0.9419,       0.933223,     0.926482,     0.922172,     0.912777,     0.907388,     0.897289,     0.891889,
+        0.882056,     0.873382,     0.865442,     0.860032,     0.85202,      0.841013,     0.833802,     0.825259,
+        0.815013,     0.807465,     0.799428,     0.792165,     0.783088,     0.773392,     0.764982,     0.752174,
+        0.746487,     0.737678,     0.727396,     0.718692,     0.712737,     0.702738,     0.69559,      0.684389,
+        0.677989,     0.667643,     0.659009,     0.650217,     0.644479,     0.636017,     0.625257,     0.618507,
+        0.609798,     0.600097,     0.592788,     0.584895,     0.578228,     0.569299,     0.560576,     0.552404,
+        0.541405,     0.536271,     0.528734,     0.519813,     0.512264,     0.507001,     0.49828,      0.492416,
+        0.483181,     0.477907,     0.469623,     0.462528,     0.455099,     0.45055,      0.443576,     0.435364,
+        0.429789,     0.422724,     0.415621,     0.409469,     0.40401,      0.398121,     0.391079,     0.384414,
+        0.378214,     0.369851,     0.365966,     0.359865,     0.353505,     0.347899,     0.343829,     0.337585,
+        0.333089,     0.326289,     0.322249,     0.316079,     0.31061,      0.305426,     0.301885,     0.296753,
+        0.290931,     0.286877,     0.281831,     0.276633,     0.272283,     0.268069,     0.26399,      0.258457,
+        0.253549,     0.249493};
 
-	for( unsigned int i ( 250 ) ; i != 500 ; ++i ) aVec.push_back( exp(2.39735 - 0.0151053* ((double)i+1.0)) );
-    }
+    for (unsigned int i(250); i != 500; ++i)
+      aVec.push_back(exp(2.39735 - 0.0151053 * ((double)i + 1.0)));
+  }
 }
diff --git a/SimCalorimetry/EcalSimAlgos/src/EEHitResponse.cc b/SimCalorimetry/EcalSimAlgos/src/EEHitResponse.cc
index caa3024e8ff3e..ebc936e04f9ce 100644
--- a/SimCalorimetry/EcalSimAlgos/src/EEHitResponse.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/EEHitResponse.cc
@@ -1,5 +1,5 @@
-#include "SimCalorimetry/EcalSimAlgos/interface/EEHitResponse.h" 
-#include "SimCalorimetry/EcalSimAlgos/interface/APDSimParameters.h" 
+#include "SimCalorimetry/EcalSimAlgos/interface/EEHitResponse.h"
+#include "SimCalorimetry/EcalSimAlgos/interface/APDSimParameters.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVSimParameterMap.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloSimParameters.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVHitFilter.h"
@@ -7,71 +7,37 @@
 #include "Geometry/CaloGeometry/interface/CaloGenericDetId.h"
 #include "DataFormats/EcalDetId/interface/EEDetId.h"
 
+EEHitResponse::EEHitResponse(const CaloVSimParameterMap* parameterMap, const CaloVShape* shape)
+    :
 
-EEHitResponse::EEHitResponse( const CaloVSimParameterMap* parameterMap , 
-			      const CaloVShape*           shape         ) :
+      EcalHitResponse(parameterMap, shape) {
+  const EEDetId detId(EEDetId::detIdFromDenseIndex(0));
+  const CaloSimParameters& parameters(parameterMap->simParameters(detId));
 
-   EcalHitResponse( parameterMap, shape )
-{
-   const EEDetId detId ( EEDetId::detIdFromDenseIndex( 0 ) ) ;
-   const CaloSimParameters& parameters ( parameterMap->simParameters( detId ) ) ;
+  const unsigned int rSize(parameters.readoutFrameSize());
+  const unsigned int nPre(parameters.binOfMaximum() - 1);
 
-   const unsigned int rSize ( parameters.readoutFrameSize() ) ;
-   const unsigned int nPre  ( parameters.binOfMaximum() - 1 ) ;
+  const unsigned int size(EEDetId::kSizeForDenseIndexing);
 
-   const unsigned int size ( EEDetId::kSizeForDenseIndexing ) ;
+  m_vSam.reserve(size);
 
-   m_vSam.reserve( size ) ;
-
-   for( unsigned int i ( 0 ) ; i != size ; ++i )
-   {
-      m_vSam.emplace_back(CaloGenericDetId( detId.det(), detId.subdetId(), i ) ,
-		    rSize, nPre ) ;
-   }
+  for (unsigned int i(0); i != size; ++i) {
+    m_vSam.emplace_back(CaloGenericDetId(detId.det(), detId.subdetId(), i), rSize, nPre);
+  }
 }
 
-EEHitResponse::~EEHitResponse()
-{
-}
+EEHitResponse::~EEHitResponse() {}
 
-unsigned int
-EEHitResponse::samplesSize() const
-{
-   return m_vSam.size() ;
-}
+unsigned int EEHitResponse::samplesSize() const { return m_vSam.size(); }
 
-unsigned int
-EEHitResponse::samplesSizeAll() const
-{
-   return m_vSam.size() ;
-}
+unsigned int EEHitResponse::samplesSizeAll() const { return m_vSam.size(); }
 
-const EcalHitResponse::EcalSamples* 
-EEHitResponse::operator[]( unsigned int i ) const
-{
-   return &m_vSam[ i ] ;
-}
+const EcalHitResponse::EcalSamples* EEHitResponse::operator[](unsigned int i) const { return &m_vSam[i]; }
 
-EcalHitResponse::EcalSamples* 
-EEHitResponse::operator[]( unsigned int i )
-{
-   return &m_vSam[ i ] ;
-}
+EcalHitResponse::EcalSamples* EEHitResponse::operator[](unsigned int i) { return &m_vSam[i]; }
 
-EcalHitResponse::EcalSamples* 
-EEHitResponse::vSam( unsigned int i )
-{
-   return &m_vSam[ i ] ;
-}
+EcalHitResponse::EcalSamples* EEHitResponse::vSam(unsigned int i) { return &m_vSam[i]; }
 
-EcalHitResponse::EcalSamples* 
-EEHitResponse::vSamAll( unsigned int i )
-{
-   return &m_vSam[ i ] ;
-}
+EcalHitResponse::EcalSamples* EEHitResponse::vSamAll(unsigned int i) { return &m_vSam[i]; }
 
-const EcalHitResponse::EcalSamples* 
-EEHitResponse::vSamAll( unsigned int i ) const
-{
-   return &m_vSam[ i ] ;
-}
+const EcalHitResponse::EcalSamples* EEHitResponse::vSamAll(unsigned int i) const { return &m_vSam[i]; }
diff --git a/SimCalorimetry/EcalSimAlgos/src/EEShape.cc b/SimCalorimetry/EcalSimAlgos/src/EEShape.cc
index 3ca01d86d46bd..d193a51fbc75c 100644
--- a/SimCalorimetry/EcalSimAlgos/src/EEShape.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/EEShape.cc
@@ -2,278 +2,59 @@
 
 #include "SimCalorimetry/EcalSimAlgos/interface/EEShape.h"
 
-void
-EEShape::fillShape(float &time_interval, double &m_thresh, EcalShapeBase::DVec& aVec, const edm::EventSetup* es ) const
-{
-    
-    if(m_useDBShape) 
-    {
-        if(es == nullptr)
-        {
-	    throw cms::Exception("EcalShapeBase:: DB conditions are not available, const edm::EventSetup* es == nullptr ");
-	}
-	edm::ESHandle<EcalSimPulseShape> esps;
-	es->get<EcalSimPulseShapeRcd>().get(esps);
+void EEShape::fillShape(float& time_interval,
+                        double& m_thresh,
+                        EcalShapeBase::DVec& aVec,
+                        const edm::EventSetup* es) const {
+  if (m_useDBShape) {
+    if (es == nullptr) {
+      throw cms::Exception("EcalShapeBase:: DB conditions are not available, const edm::EventSetup* es == nullptr ");
+    }
+    edm::ESHandle<EcalSimPulseShape> esps;
+    es->get<EcalSimPulseShapeRcd>().get(esps);
 
-	aVec = esps->endcap_shape; 
-	time_interval = esps->time_interval;
-	m_thresh = esps->endcap_thresh;
-    } else
-    {
-	m_thresh = 0.00025;
-        time_interval = 1.0; 
-        aVec.reserve(500);
-   	aVec = {9.09091e-05,
-   	        9.96016e-05,
-   	        8.08219e-05,
-   	        0.000119685,
-   	        9.56522e-05,
-   	        0.000143969,
-   	        0.000101639,
-   	        0.000115789,
-        	8.31461e-05,
-        	0.000117091,
-        	0.000141224,
-        	5.38745e-05,
-        	0.000158079,
-        	0.000104906,
-        	7.91946e-05,
-        	8e-05,
-        	0.000119703,
-        	9.96516e-05,
-        	8.82591e-05,
-        	0.000146988,
-        	0.000120588,
-        	9.89474e-05,
-        	0.000116788,
-        	0.000151292,
-        	0.000108434,
-        	0.000108651,
-        	8.5259e-05,
-        	0.000146575,
-        	8.66142e-05,
-        	0.000103679,
-        	0.000153307,
-        	7.80328e-05,
-        	8.42105e-05,
-        	0.000114607,
-        	6.90909e-05,
-        	9.22449e-05,
-        	8.92989e-05,
-        	0.000105677,
-        	9.58491e-05,
-        	0.000107383,
-        	8.85714e-05,
-        	0.000119703,
-        	0.000141463,
-        	0.000122267,
-        	6.0241e-05,
-        	0.000120588,
-        	0.000115789,
-        	0.000121168,
-        	8.04428e-05,
-        	9.39759e-05,
-        	3.391e-05,
-        	-7.72908e-05,
-        	5.61644e-05,
-        	0.000181102,
-        	-3.67893e-05,
-        	6.45914e-05,
-        	2.68852e-05,
-        	-1.57895e-05,
-        	-2.47191e-05,
-        	-5.30909e-05,
-        	-1.06122e-05,
-        	-3.69004e-06,
-        	5.85153e-05,
-        	-3.54717e-05,
-        	-9.39597e-06,
-        	5e-05,
-        	-3.19703e-05,
-        	3.69338e-05,
-        	-0.000169231,
-        	-4.09639e-05,
-        	-1.61765e-05,
-        	-8.21053e-05,
-        	6.86131e-05,
-        	-6.12546e-05,
-        	-6.50602e-05,
-        	2.56055e-05,
-        	-3.90438e-05,
-        	-5.89041e-05,
-        	0.000195276,
-        	-7.29097e-05,
-        	1.32296e-05,
-        	3.27869e-06,
-        	-6.31579e-05,
-        	-3.37079e-05,
-        	5.16364e-05,
-        	-4.97959e-05,
-        	8.92989e-05,
-        	0.000561572,
-        	0.00171698,
-        	0.0035906,
-        	0.00742143,
-        	0.01249,
-        	0.020922,
-        	0.030336,
-        	0.043588,
-        	0.0593529,
-        	0.0764947,
-        	0.0958978,
-        	0.11567,
-        	0.137087,
-        	0.160643,
-        	0.188973,
-        	0.218062,
-        	0.240682,
-        	0.265773,
-        	0.293327,
-        	0.320832,
-        	0.348689,
-        	0.374411,
-        	0.403575,
-        	0.431147,
-        	0.458644,
-        	0.488217,
-        	0.515254,
-        	0.53902,
-        	0.566819,
-        	0.589752,
-        	0.615587,
-        	0.63808,
-        	0.664137,
-        	0.687959,
-        	0.707379,
-        	0.726826,
-        	0.747043,
-        	0.762952,
-        	0.781342,
-        	0.799515,
-        	0.818559,
-        	0.832301,
-        	0.846658,
-        	0.860791,
-        	0.874009,
-        	0.886242,
-        	0.896982,
-        	0.908713,
-        	0.9189,
-        	0.9283,
-        	0.938453,
-        	0.945995,
-        	0.95186,
-        	0.958876,
-        	0.963283,
-        	0.968989,
-        	0.972846,
-        	0.977824,
-        	0.981341,
-        	0.982743,
-        	0.984082,
-        	0.986609,
-        	0.985925,
-        	0.984707,
-        	0.981384,
-        	0.980941,
-        	0.980132,
-        	0.978176,
-        	0.975987,
-        	0.973396,
-        	0.970395,
-        	0.967422,
-        	0.96346,
-        	0.959622,
-        	0.955396,
-        	0.950846,
-        	0.945995,
-        	0.940835,
-        	0.935373,
-        	0.929544,
-        	0.923836,
-        	0.91787,
-        	0.910812,
-        	0.903924,
-        	0.897669,
-        	0.89127,
-        	0.884613,
-        	0.878051,
-        	0.867734,
-        	0.856756,
-        	0.848477,
-        	0.842189,
-        	0.833787,
-        	0.825903,
-        	0.817931,
-        	0.8102,
-        	0.802771,
-        	0.79388,
-        	0.785348,
-        	0.777295,
-        	0.767854,
-        	0.759619,
-        	0.752358,
-        	0.743394,
-        	0.736674,
-        	0.726982,
-        	0.719321,
-        	0.708937,
-        	0.700003,
-        	0.693202,
-        	0.685961,
-        	0.676889,
-        	0.670513,
-        	0.658788,
-        	0.648343,
-        	0.639381,
-        	0.632761,
-        	0.623614,
-        	0.616164,
-        	0.607884,
-        	0.601437,
-        	0.593944,
-        	0.585817,
-        	0.577248,
-        	0.570328,
-        	0.56147,
-        	0.553509,
-        	0.548765,
-        	0.539964,
-        	0.53343,
-        	0.525787,
-        	0.519868,
-        	0.510817,
-        	0.503274,
-        	0.498478,
-        	0.493058,
-        	0.484176,
-        	0.479896,
-        	0.469998,
-        	0.462893,
-        	0.45576,
-        	0.450375,
-        	0.442683,
-        	0.437887,
-        	0.430736,
-        	0.427216,
-        	0.420775,
-        	0.41485,
-        	0.407769,
-        	0.403546,
-        	0.397028,
-        	0.389534,
-        	0.388569,
-        	0.380296,
-        	0.375312,
-        	0.369457,
-        	0.365884,
-        	0.358889,
-        	0.353344,
-        	0.350364,
-        	0.347136,
-        	0.33872,
-        	0.336706};
+    aVec = esps->endcap_shape;
+    time_interval = esps->time_interval;
+    m_thresh = esps->endcap_thresh;
+  } else {
+    m_thresh = 0.00025;
+    time_interval = 1.0;
+    aVec.reserve(500);
+    aVec = {
+        9.09091e-05,  9.96016e-05,  8.08219e-05,  0.000119685,  9.56522e-05,  0.000143969,  0.000101639,  0.000115789,
+        8.31461e-05,  0.000117091,  0.000141224,  5.38745e-05,  0.000158079,  0.000104906,  7.91946e-05,  8e-05,
+        0.000119703,  9.96516e-05,  8.82591e-05,  0.000146988,  0.000120588,  9.89474e-05,  0.000116788,  0.000151292,
+        0.000108434,  0.000108651,  8.5259e-05,   0.000146575,  8.66142e-05,  0.000103679,  0.000153307,  7.80328e-05,
+        8.42105e-05,  0.000114607,  6.90909e-05,  9.22449e-05,  8.92989e-05,  0.000105677,  9.58491e-05,  0.000107383,
+        8.85714e-05,  0.000119703,  0.000141463,  0.000122267,  6.0241e-05,   0.000120588,  0.000115789,  0.000121168,
+        8.04428e-05,  9.39759e-05,  3.391e-05,    -7.72908e-05, 5.61644e-05,  0.000181102,  -3.67893e-05, 6.45914e-05,
+        2.68852e-05,  -1.57895e-05, -2.47191e-05, -5.30909e-05, -1.06122e-05, -3.69004e-06, 5.85153e-05,  -3.54717e-05,
+        -9.39597e-06, 5e-05,        -3.19703e-05, 3.69338e-05,  -0.000169231, -4.09639e-05, -1.61765e-05, -8.21053e-05,
+        6.86131e-05,  -6.12546e-05, -6.50602e-05, 2.56055e-05,  -3.90438e-05, -5.89041e-05, 0.000195276,  -7.29097e-05,
+        1.32296e-05,  3.27869e-06,  -6.31579e-05, -3.37079e-05, 5.16364e-05,  -4.97959e-05, 8.92989e-05,  0.000561572,
+        0.00171698,   0.0035906,    0.00742143,   0.01249,      0.020922,     0.030336,     0.043588,     0.0593529,
+        0.0764947,    0.0958978,    0.11567,      0.137087,     0.160643,     0.188973,     0.218062,     0.240682,
+        0.265773,     0.293327,     0.320832,     0.348689,     0.374411,     0.403575,     0.431147,     0.458644,
+        0.488217,     0.515254,     0.53902,      0.566819,     0.589752,     0.615587,     0.63808,      0.664137,
+        0.687959,     0.707379,     0.726826,     0.747043,     0.762952,     0.781342,     0.799515,     0.818559,
+        0.832301,     0.846658,     0.860791,     0.874009,     0.886242,     0.896982,     0.908713,     0.9189,
+        0.9283,       0.938453,     0.945995,     0.95186,      0.958876,     0.963283,     0.968989,     0.972846,
+        0.977824,     0.981341,     0.982743,     0.984082,     0.986609,     0.985925,     0.984707,     0.981384,
+        0.980941,     0.980132,     0.978176,     0.975987,     0.973396,     0.970395,     0.967422,     0.96346,
+        0.959622,     0.955396,     0.950846,     0.945995,     0.940835,     0.935373,     0.929544,     0.923836,
+        0.91787,      0.910812,     0.903924,     0.897669,     0.89127,      0.884613,     0.878051,     0.867734,
+        0.856756,     0.848477,     0.842189,     0.833787,     0.825903,     0.817931,     0.8102,       0.802771,
+        0.79388,      0.785348,     0.777295,     0.767854,     0.759619,     0.752358,     0.743394,     0.736674,
+        0.726982,     0.719321,     0.708937,     0.700003,     0.693202,     0.685961,     0.676889,     0.670513,
+        0.658788,     0.648343,     0.639381,     0.632761,     0.623614,     0.616164,     0.607884,     0.601437,
+        0.593944,     0.585817,     0.577248,     0.570328,     0.56147,      0.553509,     0.548765,     0.539964,
+        0.53343,      0.525787,     0.519868,     0.510817,     0.503274,     0.498478,     0.493058,     0.484176,
+        0.479896,     0.469998,     0.462893,     0.45576,      0.450375,     0.442683,     0.437887,     0.430736,
+        0.427216,     0.420775,     0.41485,      0.407769,     0.403546,     0.397028,     0.389534,     0.388569,
+        0.380296,     0.375312,     0.369457,     0.365884,     0.358889,     0.353344,     0.350364,     0.347136,
+        0.33872,      0.336706};
 
-	for( unsigned int i ( 250 ) ; i != 500 ; ++i ) aVec.push_back( exp(2.63163e-01 - 1.37795e-02*(i - 151.0))  );
-    }
+    for (unsigned int i(250); i != 500; ++i)
+      aVec.push_back(exp(2.63163e-01 - 1.37795e-02 * (i - 151.0)));
+  }
 }
diff --git a/SimCalorimetry/EcalSimAlgos/src/ESDigitizer.cc b/SimCalorimetry/EcalSimAlgos/src/ESDigitizer.cc
index 29a79c392a922..e3e3856504812 100644
--- a/SimCalorimetry/EcalSimAlgos/src/ESDigitizer.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/ESDigitizer.cc
@@ -10,226 +10,175 @@
 #include <gsl/gsl_sf_erf.h>
 #include <gsl/gsl_sf_result.h>
 
-ESDigitizer::ESDigitizer( EcalHitResponse*      hitResponse    , 
-			  ESElectronicsSimFast* electronicsSim ,
-			  bool                  addNoise         ) :
-   EcalTDigitizer< ESDigitizerTraits >( hitResponse, electronicsSim, addNoise ) ,
-   m_detIds      ( nullptr              ) ,
-   m_ranGeneral  ( nullptr              ) ,
-   m_ESGain      ( 0              ) ,
-   m_histoBin    ( 0              ) ,
-   m_histoInf    ( 0              ) ,
-   m_histoWid    ( 0              ) ,
-   m_meanNoisy   ( 0              ) ,
-   m_trip        (                )
-{
-   m_trip.reserve( 2500 ) ; 
+ESDigitizer::ESDigitizer(EcalHitResponse* hitResponse, ESElectronicsSimFast* electronicsSim, bool addNoise)
+    : EcalTDigitizer<ESDigitizerTraits>(hitResponse, electronicsSim, addNoise),
+      m_detIds(nullptr),
+      m_ranGeneral(nullptr),
+      m_ESGain(0),
+      m_histoBin(0),
+      m_histoInf(0),
+      m_histoWid(0),
+      m_meanNoisy(0),
+      m_trip() {
+  m_trip.reserve(2500);
 }
 
-ESDigitizer::~ESDigitizer() 
-{
-   delete m_ranGeneral ;
-}
+ESDigitizer::~ESDigitizer() { delete m_ranGeneral; }
 
 /// tell the digitizer which cells exist; cannot change during a run
-void 
-ESDigitizer::setDetIds( const std::vector<DetId>& detIds )
-{
-   assert( nullptr       == m_detIds ||
-	   &detIds == m_detIds    ) ; // sanity check; don't allow to change midstream
-   m_detIds = &detIds ;
+void ESDigitizer::setDetIds(const std::vector<DetId>& detIds) {
+  assert(nullptr == m_detIds || &detIds == m_detIds);  // sanity check; don't allow to change midstream
+  m_detIds = &detIds;
 }
 
-void 
-ESDigitizer::setGain( const int gain ) 
-{
-   if( 0 != m_ESGain )
-   {
-      assert( gain == m_ESGain ) ; // only allow one value
-   }
-   else
-   {
-      assert( nullptr != m_detIds &&
-	      !m_detIds->empty() ) ; // detIds must already be set as we need size
-
-      assert( 1 == gain ||
-	      2 == gain    ) ; // legal values
-      
-      m_ESGain = gain ;
-      
-      if( addNoise() ) 
-      {
-	 double zsThresh ( 0. ) ;
-	 std::string refFile ;
-
-	 if( 1 == m_ESGain ) 
-	 {
-	    zsThresh = 3 ;
-	    refFile = "SimCalorimetry/EcalSimProducers/data/esRefHistosFile_LG.txt";
-	 }
-	 else
-	 {
-	    zsThresh = 4 ;
-	    refFile = "SimCalorimetry/EcalSimProducers/data/esRefHistosFile_HG.txt";
-	 }
-
-	 gsl_sf_result result ;
-	 int status  = gsl_sf_erf_Q_e( zsThresh, &result ) ;
-	 if( status != 0 ) std::cerr << "ESDigitizer::could not compute gaussian tail probability for the threshold chosen" << std::endl ;
-
-	 const double probabilityLeft ( result.val ) ;
-	 m_meanNoisy = probabilityLeft * m_detIds->size() ;
-
-	 std::ifstream histofile ( edm::FileInPath( refFile ).fullPath().c_str() ) ;
-	 if( !histofile.good() )
-	 { 
-	    throw edm::Exception(edm::errors::InvalidReference,"NullPointer")
-	       << "Reference histos file not opened" ;
-	 }
-	 else
-	 {
-	    // number of bins
-	    char buffer[200] ;
-	    int thisLine = 0 ;
-	    while( 0 == thisLine ) 
-	    {
-	       histofile.getline( buffer, 200 ) ;
-	       if( !strstr(buffer,"#")  && 
-		   !(strspn(buffer," ") == strlen(buffer) ) )
-	       {	
-		  float histoBin ; 
-		  sscanf( buffer, "%f" , &histoBin ) ; 
-		  m_histoBin = (double) histoBin ;
-		  ++thisLine ;
-	       }
-	    }
-	    const uint32_t histoBin1 ( (int) m_histoBin    ) ;
-	    const uint32_t histoBin2 ( histoBin1*histoBin1 ) ;
-
-	    double t_histoSup ( 0 ) ;
-
-	    std::vector<double> t_refHistos ;
-	    t_refHistos.reserve( 2500 ) ;
-
-	    int thisBin = -2 ;
-	    while( !( histofile.eof() ) )
-	    {
-	       histofile.getline( buffer, 200 ) ;
-	       if( !strstr( buffer, "#" ) &&
-		   !( strspn( buffer, " " ) == strlen( buffer ) ) )
-	       {
-		  if( -2 == thisBin )
-		  {
-		     float histoInf ;
-		     sscanf( buffer, "%f" , &histoInf ) ;
-		     m_histoInf = (double) histoInf ;
-		  }
-		  if( -1 == thisBin  )
-		  {
-		     float histoSup ;
-		     sscanf( buffer, "%f" , &histoSup ) ;
-		     t_histoSup = (double) histoSup ;
-		  }
-		  if( 0 <= thisBin )
-		  { 
-		     float refBin ; 
-		     sscanf( buffer, "%f", &refBin ) ;
-		     if( 0.5 < refBin ) 
-		     {
-			t_refHistos.push_back( (double) refBin ) ;
-			const uint32_t i2 ( thisBin/histoBin2 ) ;
-			const uint32_t off ( i2*histoBin2 ) ;
-			const uint32_t i1 ( ( thisBin - off )/histoBin1 ) ;
-			const uint32_t i0 ( thisBin - off - i1*histoBin1 ) ;
-			m_trip.emplace_back(i0, i1, i2) ;
-		     }
-		  }
-		  ++thisBin ;
-	       }
-	    }
-	    m_histoWid = ( t_histoSup - m_histoInf )/m_histoBin ;
-
-	    m_histoInf -= 1000. ;
-
-	    // creating the reference distribution to extract random numbers
-	    m_ranGeneral = new CLHEP::RandGeneral( nullptr              ,
-						   &t_refHistos.front() ,
-						   t_refHistos.size()   ,
-						   0             ) ;
-	    histofile.close();
-	 }
+void ESDigitizer::setGain(const int gain) {
+  if (0 != m_ESGain) {
+    assert(gain == m_ESGain);  // only allow one value
+  } else {
+    assert(nullptr != m_detIds && !m_detIds->empty());  // detIds must already be set as we need size
+
+    assert(1 == gain || 2 == gain);  // legal values
+
+    m_ESGain = gain;
+
+    if (addNoise()) {
+      double zsThresh(0.);
+      std::string refFile;
+
+      if (1 == m_ESGain) {
+        zsThresh = 3;
+        refFile = "SimCalorimetry/EcalSimProducers/data/esRefHistosFile_LG.txt";
+      } else {
+        zsThresh = 4;
+        refFile = "SimCalorimetry/EcalSimProducers/data/esRefHistosFile_HG.txt";
+      }
+
+      gsl_sf_result result;
+      int status = gsl_sf_erf_Q_e(zsThresh, &result);
+      if (status != 0)
+        std::cerr << "ESDigitizer::could not compute gaussian tail probability for the threshold chosen" << std::endl;
+
+      const double probabilityLeft(result.val);
+      m_meanNoisy = probabilityLeft * m_detIds->size();
+
+      std::ifstream histofile(edm::FileInPath(refFile).fullPath().c_str());
+      if (!histofile.good()) {
+        throw edm::Exception(edm::errors::InvalidReference, "NullPointer") << "Reference histos file not opened";
+      } else {
+        // number of bins
+        char buffer[200];
+        int thisLine = 0;
+        while (0 == thisLine) {
+          histofile.getline(buffer, 200);
+          if (!strstr(buffer, "#") && !(strspn(buffer, " ") == strlen(buffer))) {
+            float histoBin;
+            sscanf(buffer, "%f", &histoBin);
+            m_histoBin = (double)histoBin;
+            ++thisLine;
+          }
+        }
+        const uint32_t histoBin1((int)m_histoBin);
+        const uint32_t histoBin2(histoBin1 * histoBin1);
+
+        double t_histoSup(0);
+
+        std::vector<double> t_refHistos;
+        t_refHistos.reserve(2500);
+
+        int thisBin = -2;
+        while (!(histofile.eof())) {
+          histofile.getline(buffer, 200);
+          if (!strstr(buffer, "#") && !(strspn(buffer, " ") == strlen(buffer))) {
+            if (-2 == thisBin) {
+              float histoInf;
+              sscanf(buffer, "%f", &histoInf);
+              m_histoInf = (double)histoInf;
+            }
+            if (-1 == thisBin) {
+              float histoSup;
+              sscanf(buffer, "%f", &histoSup);
+              t_histoSup = (double)histoSup;
+            }
+            if (0 <= thisBin) {
+              float refBin;
+              sscanf(buffer, "%f", &refBin);
+              if (0.5 < refBin) {
+                t_refHistos.push_back((double)refBin);
+                const uint32_t i2(thisBin / histoBin2);
+                const uint32_t off(i2 * histoBin2);
+                const uint32_t i1((thisBin - off) / histoBin1);
+                const uint32_t i0(thisBin - off - i1 * histoBin1);
+                m_trip.emplace_back(i0, i1, i2);
+              }
+            }
+            ++thisBin;
+          }
+        }
+        m_histoWid = (t_histoSup - m_histoInf) / m_histoBin;
+
+        m_histoInf -= 1000.;
+
+        // creating the reference distribution to extract random numbers
+        m_ranGeneral = new CLHEP::RandGeneral(nullptr, &t_refHistos.front(), t_refHistos.size(), 0);
+        histofile.close();
       }
-   }
+    }
+  }
 }
 
 /// turns hits into digis
-void 
-ESDigitizer::run( ESDigiCollection& output, CLHEP::HepRandomEngine* engine )
-{
-    assert( nullptr != m_detIds         &&
-	    !m_detIds->empty() &&
-	    ( !addNoise()         ||
-	      nullptr != m_ranGeneral ) ) ; // sanity check
-
-    // reserve space for how many digis we expect, with some cushion
-    output.reserve( 2*( (int) m_meanNoisy ) + hitResponse()->samplesSize() ) ;
-
-    EcalTDigitizer< ESDigitizerTraits >::run( output, engine ) ;
-
-    // random generation of channel above threshold
-    std::vector<DetId> abThreshCh ;
-    if( addNoise() ) createNoisyList( abThreshCh, engine ) ;
-
-    // first make a raw digi for every cell where we have noise
-    for( std::vector<DetId>::const_iterator idItr ( abThreshCh.begin() ) ;
-	 idItr != abThreshCh.end(); ++idItr ) 
+void ESDigitizer::run(ESDigiCollection& output, CLHEP::HepRandomEngine* engine) {
+  assert(nullptr != m_detIds && !m_detIds->empty() && (!addNoise() || nullptr != m_ranGeneral));  // sanity check
+
+  // reserve space for how many digis we expect, with some cushion
+  output.reserve(2 * ((int)m_meanNoisy) + hitResponse()->samplesSize());
+
+  EcalTDigitizer<ESDigitizerTraits>::run(output, engine);
+
+  // random generation of channel above threshold
+  std::vector<DetId> abThreshCh;
+  if (addNoise())
+    createNoisyList(abThreshCh, engine);
+
+  // first make a raw digi for every cell where we have noise
+  for (std::vector<DetId>::const_iterator idItr(abThreshCh.begin()); idItr != abThreshCh.end(); ++idItr) {
+    if (hitResponse()->findDetId(*idItr)->zero())  // only if no true hit!
     {
-       if( hitResponse()->findDetId( *idItr )->zero() ) // only if no true hit!
-       {
-	  ESHitResponse::ESSamples analogSignal ( *idItr, 3 ) ; // space for the noise hit
-	  uint32_t myBin ( (uint32_t) m_trip.size()*m_ranGeneral->shoot(engine) ) ;
-	  if( myBin == m_trip.size() ) --myBin ; // guard against roundup
-	  assert( myBin < m_trip.size() ) ;
-	  const Triplet& trip ( m_trip[ myBin ] ) ;
-	  analogSignal[ 0 ] = m_histoInf + m_histoWid*trip.first  ;
-	  analogSignal[ 1 ] = m_histoInf + m_histoWid*trip.second ;
-	  analogSignal[ 2 ] = m_histoInf + m_histoWid*trip.third  ;
-	  ESDataFrame digi( *idItr ) ;
-	  const_cast<ESElectronicsSimFast*>(elecSim())->
-             analogToDigital( engine,
-                              analogSignal ,
-			      digi         ,
-			      true           ) ;	
-	  output.push_back( std::move(digi) ) ;  
-       }
+      ESHitResponse::ESSamples analogSignal(*idItr, 3);  // space for the noise hit
+      uint32_t myBin((uint32_t)m_trip.size() * m_ranGeneral->shoot(engine));
+      if (myBin == m_trip.size())
+        --myBin;  // guard against roundup
+      assert(myBin < m_trip.size());
+      const Triplet& trip(m_trip[myBin]);
+      analogSignal[0] = m_histoInf + m_histoWid * trip.first;
+      analogSignal[1] = m_histoInf + m_histoWid * trip.second;
+      analogSignal[2] = m_histoInf + m_histoWid * trip.third;
+      ESDataFrame digi(*idItr);
+      const_cast<ESElectronicsSimFast*>(elecSim())->analogToDigital(engine, analogSignal, digi, true);
+      output.push_back(std::move(digi));
     }
+  }
 }
 
 // preparing the list of channels where the noise has to be generated
-void 
-ESDigitizer::createNoisyList( std::vector<DetId>& abThreshCh, CLHEP::HepRandomEngine* engine )
-{
-   CLHEP::RandPoissonQ randPoissonQ(*engine, m_meanNoisy);
-   const unsigned int nChan (randPoissonQ.fire());
-   abThreshCh.reserve( nChan ) ;
-
-   for( unsigned int i ( 0 ) ; i != nChan ; ++i )
-   {
-      std::vector<DetId>::const_iterator idItr ( abThreshCh.end() ) ;
-      uint32_t iChan ( 0 ) ;
-      DetId id ;
-      do 
-      {
-         iChan = (uint32_t) CLHEP::RandFlat::shoot(engine, m_detIds->size());
-	 if( iChan == m_detIds->size() ) --iChan ; //protect against roundup at end
-	 assert( m_detIds->size() > iChan ) ;      // sanity check
-	 id = (*m_detIds)[ iChan ] ;
-	 idItr = find( abThreshCh.begin() ,
-		       abThreshCh.end()   ,
-		       id                  ) ;
-      }
-      while( idItr != abThreshCh.end() ) ;
-
-      abThreshCh.push_back( std::move(id) ) ;
-   }
+void ESDigitizer::createNoisyList(std::vector<DetId>& abThreshCh, CLHEP::HepRandomEngine* engine) {
+  CLHEP::RandPoissonQ randPoissonQ(*engine, m_meanNoisy);
+  const unsigned int nChan(randPoissonQ.fire());
+  abThreshCh.reserve(nChan);
+
+  for (unsigned int i(0); i != nChan; ++i) {
+    std::vector<DetId>::const_iterator idItr(abThreshCh.end());
+    uint32_t iChan(0);
+    DetId id;
+    do {
+      iChan = (uint32_t)CLHEP::RandFlat::shoot(engine, m_detIds->size());
+      if (iChan == m_detIds->size())
+        --iChan;                         //protect against roundup at end
+      assert(m_detIds->size() > iChan);  // sanity check
+      id = (*m_detIds)[iChan];
+      idItr = find(abThreshCh.begin(), abThreshCh.end(), id);
+    } while (idItr != abThreshCh.end());
+
+    abThreshCh.push_back(std::move(id));
+  }
 }
diff --git a/SimCalorimetry/EcalSimAlgos/src/ESElectronicsSim.cc b/SimCalorimetry/EcalSimAlgos/src/ESElectronicsSim.cc
index a8ffc464e29d3..d03e946dbbba0 100644
--- a/SimCalorimetry/EcalSimAlgos/src/ESElectronicsSim.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/ESElectronicsSim.cc
@@ -8,83 +8,72 @@
 #include "FWCore/Utilities/interface/Exception.h"
 #include <iostream>
 
-ESElectronicsSim::ESElectronicsSim (bool addNoise):
-  addNoise_(addNoise), peds_(nullptr), mips_(nullptr)
-{
+ESElectronicsSim::ESElectronicsSim(bool addNoise) : addNoise_(addNoise), peds_(nullptr), mips_(nullptr) {
   // Preshower Electronics Simulation
-  // gain = 1 : low gain for data taking 
+  // gain = 1 : low gain for data taking
   // gain = 2 : high gain for calibration and low energy runs
   // For 300(310/320) um Si, the MIP is 78.47(81.08/83.7) keV
 }
 
-ESElectronicsSim::~ESElectronicsSim ()
-{}
-
-void ESElectronicsSim::analogToDigital(CLHEP::HepRandomEngine* engine, const CaloSamples& cs, ESDataFrame& df) const
-{
+ESElectronicsSim::~ESElectronicsSim() {}
 
+void ESElectronicsSim::analogToDigital(CLHEP::HepRandomEngine* engine, const CaloSamples& cs, ESDataFrame& df) const {
   std::vector<ESSample> essamples = encode(cs, engine);
 
   df.setSize(cs.size());
-  for(int i=0; i<df.size(); i++) {
+  for (int i = 0; i < df.size(); i++) {
     df.setSample(i, essamples[i]);
   }
-
 }
 
-void ESElectronicsSim::digitalToAnalog(const ESDataFrame& df, CaloSamples& cs) const 
-{
-
-  for(int i = 0; i < df.size(); i++) {
+void ESElectronicsSim::digitalToAnalog(const ESDataFrame& df, CaloSamples& cs) const {
+  for (int i = 0; i < df.size(); i++) {
     cs[i] = decode(df[i], df.id());
   }
-
 }
 
-std::vector<ESSample>
-ESElectronicsSim::encode(const CaloSamples& timeframe, CLHEP::HepRandomEngine* engine) const
-{
+std::vector<ESSample> ESElectronicsSim::encode(const CaloSamples& timeframe, CLHEP::HepRandomEngine* engine) const {
   edm::Service<edm::RandomNumberGenerator> rng;
-  if ( ! rng.isAvailable()) {
+  if (!rng.isAvailable()) {
     throw cms::Exception("Configuration")
-      << "ESElectroncSim requires the RandomNumberGeneratorService\n"
-      "which is not present in the configuration file.  You must add the service\n"
-      "in the configuration file or remove the modules that require it.";
+        << "ESElectroncSim requires the RandomNumberGeneratorService\n"
+           "which is not present in the configuration file.  You must add the service\n"
+           "in the configuration file or remove the modules that require it.";
   }
 
-
   std::vector<ESSample> results;
   results.reserve(timeframe.size());
 
   ESPedestals::const_iterator it_ped = peds_->find(timeframe.id());
   ESIntercalibConstantMap::const_iterator it_mip = mips_->getMap().find(timeframe.id());
-  int baseline_  = (int) it_ped->getMean();
-  double sigma_  = (double) it_ped->getRms();
-  double MIPADC_ = (double) (*it_mip);
-
-  int adc = 0; 
-  double ADCGeV = MIPADC_/MIPToGeV_;
+  int baseline_ = (int)it_ped->getMean();
+  double sigma_ = (double)it_ped->getRms();
+  double MIPADC_ = (double)(*it_mip);
 
-  for (int i=0; i<timeframe.size(); i++) {
+  int adc = 0;
+  double ADCGeV = MIPADC_ / MIPToGeV_;
 
+  for (int i = 0; i < timeframe.size(); i++) {
     double noi = 0;
-    double signal = 0;    
+    double signal = 0;
 
     if (addNoise_) {
       noi = CLHEP::RandGaussQ::shoot(engine, 0., sigma_);
     }
 
-    signal = timeframe[i]*ADCGeV + noi + baseline_;
-    
-    if (signal>0) 
+    signal = timeframe[i] * ADCGeV + noi + baseline_;
+
+    if (signal > 0)
       signal += 0.5;
-    else if (signal<0)
+    else if (signal < 0)
       signal -= 0.5;
-    
+
     adc = int(signal);
 
-    if (adc>MAXADC) adc = MAXADC;
-    if (adc<MINADC) adc = MINADC;
+    if (adc > MAXADC)
+      adc = MAXADC;
+    if (adc < MINADC)
+      adc = MINADC;
 
     results.emplace_back(adc);
   }
@@ -92,10 +81,4 @@ ESElectronicsSim::encode(const CaloSamples& timeframe, CLHEP::HepRandomEngine* e
   return results;
 }
 
-double ESElectronicsSim::decode(const ESSample & sample, const DetId & id) const
-{
-  return 0. ;
-}
-
-
-
+double ESElectronicsSim::decode(const ESSample& sample, const DetId& id) const { return 0.; }
diff --git a/SimCalorimetry/EcalSimAlgos/src/ESElectronicsSimFast.cc b/SimCalorimetry/EcalSimAlgos/src/ESElectronicsSimFast.cc
index 372d7d05965c1..0f47a1205fb6e 100644
--- a/SimCalorimetry/EcalSimAlgos/src/ESElectronicsSimFast.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/ESElectronicsSimFast.cc
@@ -5,100 +5,73 @@
 
 #include <iostream>
 
-ESElectronicsSimFast::ESElectronicsSimFast( bool addNoise , bool PreMix1 ) :
-   m_addNoise ( addNoise ) ,
-   m_PreMix1  ( PreMix1  ) ,
-   m_MIPToGeV (        0 ) ,
-   m_peds     (        nullptr ) ,
-   m_mips     (        nullptr )
-{
-   // Preshower "Fast" Electronics Simulation
-   // gain = 1 : low gain for data taking 
-   // gain = 2 : high gain for calibration and low energy runs
-   // For 300(310/320) um Si, the MIP is 78.47(81.08/83.7) keV
+ESElectronicsSimFast::ESElectronicsSimFast(bool addNoise, bool PreMix1)
+    : m_addNoise(addNoise), m_PreMix1(PreMix1), m_MIPToGeV(0), m_peds(nullptr), m_mips(nullptr) {
+  // Preshower "Fast" Electronics Simulation
+  // gain = 1 : low gain for data taking
+  // gain = 2 : high gain for calibration and low energy runs
+  // For 300(310/320) um Si, the MIP is 78.47(81.08/83.7) keV
 }
 
-ESElectronicsSimFast::~ESElectronicsSimFast()
-{
-}
+ESElectronicsSimFast::~ESElectronicsSimFast() {}
 
-void 
-ESElectronicsSimFast::setPedestals( const ESPedestals* peds ) 
-{
-   m_peds = peds ;
-} 
+void ESElectronicsSimFast::setPedestals(const ESPedestals* peds) { m_peds = peds; }
 
-void 
-ESElectronicsSimFast::setMIPs( const ESIntercalibConstants* mips ) 
-{
-   m_mips = mips ;
-}
+void ESElectronicsSimFast::setMIPs(const ESIntercalibConstants* mips) { m_mips = mips; }
 
-void 
-ESElectronicsSimFast::setMIPToGeV( double MIPToGeV )
-{
-   m_MIPToGeV = MIPToGeV ;
-}
+void ESElectronicsSimFast::setMIPToGeV(double MIPToGeV) { m_MIPToGeV = MIPToGeV; }
+
+void ESElectronicsSimFast::analogToDigital(CLHEP::HepRandomEngine* engine,
+                                           ESSamples& cs,
+                                           ESDataFrame& df,
+                                           bool isNoise) const {
+  assert(nullptr != m_peds && nullptr != m_mips && 0 < m_MIPToGeV);  // sanity check
+
+  df.setSize(cs.size());
+
+  const DetId id(cs.id());
+  ESPedestals::const_iterator it_ped(m_peds->find(id));
+  ESIntercalibConstantMap::const_iterator it_mip(isNoise ? m_mips->getMap().end() : m_mips->getMap().find(id));
+
+  const double baseline((double)it_ped->getMean());
+  const double sigma(isNoise ? 0. : (double)it_ped->getRms());
+  const double MIPADC(isNoise ? 0. : (double)(*it_mip));
+  const double ADCGeV(isNoise ? 1. : MIPADC / m_MIPToGeV);
+
+  int adc = 0;
+  //   std::cout<<"   **Id="<<ESDetId(df.id())<<", size="<<df.size();
+  for (unsigned int i(0); i != cs.size(); ++i) {
+    const double noi(isNoise || (!m_addNoise) ? 0 : sigma * CLHEP::RandGaussQ::shoot(engine, 0, 1));
+    double signal;
+
+    if (!m_PreMix1)
+      signal = cs[i] * ADCGeV + noi + baseline;
+    else
+      signal = cs[i] * ADCGeV;
+
+    if (0 <= signal) {
+      signal += 0.5;
+    } else {
+      signal -= 0.5;
+    }
+
+    adc = int(signal);
+
+    if (!m_PreMix1)
+      assert(0 < adc);
+
+    if (0.5 < signal - adc)
+      ++adc;
+
+    if (MAXADC < adc) {
+      adc = MAXADC;
+    } else {
+      if (MINADC > adc)
+        adc = MINADC;
+    }
 
-void 
-ESElectronicsSimFast::analogToDigital( CLHEP::HepRandomEngine* engine,
-                                       ESSamples&   cs,
-			               ESDataFrame& df,
-			               bool         isNoise ) const
-{
-   assert( nullptr != m_peds &&
-	   nullptr != m_mips &&
-	   0 < m_MIPToGeV ) ; // sanity check
-
-   df.setSize( cs.size() ) ;
-
-   const DetId id ( cs.id() ) ;
-   ESPedestals::const_iterator it_ped ( m_peds->find( id ) ) ;
-   ESIntercalibConstantMap::const_iterator it_mip (
-      isNoise ? m_mips->getMap().end() : m_mips->getMap().find( id ) ) ;
-
-   const double baseline ( (double) it_ped->getMean() ) ;
-   const double sigma    ( isNoise ? 0. : (double) it_ped->getRms() ) ;
-   const double MIPADC   ( isNoise ? 0. : (double) (*it_mip) ) ;
-   const double ADCGeV   ( isNoise ? 1. : MIPADC/m_MIPToGeV ) ;
-
-   int adc = 0 ;
-//   std::cout<<"   **Id="<<ESDetId(df.id())<<", size="<<df.size();
-   for( unsigned int i ( 0 ) ; i != cs.size(); ++i ) 
-   {
-      const double noi ( isNoise || (!m_addNoise) ? 0 :
-			 sigma*CLHEP::RandGaussQ::shoot(engine, 0, 1) ) ;
-      double signal;
-
-      if(!m_PreMix1) signal = cs[i]*ADCGeV + noi + baseline ;
-      else signal = cs[i]*ADCGeV ;
-
-      if( 0 <= signal )
-      { 
-	 signal += 0.5 ;
-      }
-      else
-      {
-	 signal -= 0.5 ;
-      }
-    
-      adc = int( signal ) ;
-
-      if(!m_PreMix1) assert( 0 < adc ) ;
-
-      if( 0.5 < signal - adc ) ++adc ;
-
-      if( MAXADC < adc )
-      {
-	 adc = MAXADC ;
-      }
-      else
-      {
-	 if( MINADC > adc ) adc = MINADC ;
-      }
-
-      df.setSample( i, ESSample( adc ) ) ;
-//      std::cout<<", "<<df[i];
-   }
-//   std::cout<<std::endl ;
+    df.setSample(i, ESSample(adc));
+    //      std::cout<<", "<<df[i];
+  }
+  //   std::cout<<std::endl ;
 }
diff --git a/SimCalorimetry/EcalSimAlgos/src/ESHitResponse.cc b/SimCalorimetry/EcalSimAlgos/src/ESHitResponse.cc
index 8d8b0e4d6d4c3..3142051124150 100644
--- a/SimCalorimetry/EcalSimAlgos/src/ESHitResponse.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/ESHitResponse.cc
@@ -1,4 +1,4 @@
-#include "SimCalorimetry/EcalSimAlgos/interface/ESHitResponse.h" 
+#include "SimCalorimetry/EcalSimAlgos/interface/ESHitResponse.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVSimParameterMap.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloSimParameters.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVHitFilter.h"
@@ -6,73 +6,37 @@
 #include "Geometry/CaloGeometry/interface/CaloGenericDetId.h"
 #include "DataFormats/EcalDetId/interface/ESDetId.h"
 
+ESHitResponse::ESHitResponse(const CaloVSimParameterMap* parameterMap, const CaloVShape* shape)
+    : EcalHitResponse(parameterMap, shape) {
+  assert(nullptr != parameterMap);
+  assert(nullptr != shape);
+  const ESDetId detId(ESDetId::detIdFromDenseIndex(0));
+  const CaloSimParameters& parameters(parameterMap->simParameters(detId));
 
-ESHitResponse::ESHitResponse( const CaloVSimParameterMap* parameterMap , 
-			      const CaloVShape*           shape          ) :
-   EcalHitResponse( parameterMap , shape )
-{
-   assert( nullptr != parameterMap ) ;
-   assert( nullptr != shape ) ;
-   const ESDetId detId ( ESDetId::detIdFromDenseIndex( 0 ) ) ;
-   const CaloSimParameters& parameters ( parameterMap->simParameters( detId ) ) ;
+  const unsigned int rSize(parameters.readoutFrameSize());
+  const unsigned int nPre(parameters.binOfMaximum() - 1);
 
-   const unsigned int rSize ( parameters.readoutFrameSize() ) ;
-   const unsigned int nPre  ( parameters.binOfMaximum() - 1 ) ;
+  const unsigned int size(ESDetId::kSizeForDenseIndexing);
 
-   const unsigned int size ( ESDetId::kSizeForDenseIndexing ) ;
+  m_vSam.reserve(size);
 
-   m_vSam.reserve( size ) ;
-
-   for( unsigned int i ( 0 ) ; i != size ; ++i )
-   {
-      m_vSam.emplace_back(
-	 CaloGenericDetId( detId.det(), detId.subdetId(), i ) ,
-		    rSize, nPre ) ;
-   }
+  for (unsigned int i(0); i != size; ++i) {
+    m_vSam.emplace_back(CaloGenericDetId(detId.det(), detId.subdetId(), i), rSize, nPre);
+  }
 }
 
-ESHitResponse::~ESHitResponse()
-{
-}
+ESHitResponse::~ESHitResponse() {}
 
-unsigned int
-ESHitResponse::samplesSize() const
-{
-   return index().size() ;
-}
+unsigned int ESHitResponse::samplesSize() const { return index().size(); }
 
-unsigned int
-ESHitResponse::samplesSizeAll() const
-{
-   return ESDetId::kSizeForDenseIndexing ;
-}
+unsigned int ESHitResponse::samplesSizeAll() const { return ESDetId::kSizeForDenseIndexing; }
 
-const EcalHitResponse::EcalSamples* 
-ESHitResponse::operator[]( unsigned int i ) const
-{
-   return &m_vSam[ index()[ i ] ] ;
-}
+const EcalHitResponse::EcalSamples* ESHitResponse::operator[](unsigned int i) const { return &m_vSam[index()[i]]; }
 
-EcalHitResponse::EcalSamples* 
-ESHitResponse::operator[]( unsigned int i )
-{
-   return &m_vSam[ index()[ i ] ] ;
-}
+EcalHitResponse::EcalSamples* ESHitResponse::operator[](unsigned int i) { return &m_vSam[index()[i]]; }
 
-EcalHitResponse::EcalSamples* 
-ESHitResponse::vSam( unsigned int i )
-{
-   return &m_vSam[ index()[ i ] ] ;
-}
+EcalHitResponse::EcalSamples* ESHitResponse::vSam(unsigned int i) { return &m_vSam[index()[i]]; }
 
-EcalHitResponse::EcalSamples* 
-ESHitResponse::vSamAll( unsigned int i )
-{
-   return &m_vSam[ i ] ;
-}
+EcalHitResponse::EcalSamples* ESHitResponse::vSamAll(unsigned int i) { return &m_vSam[i]; }
 
-const EcalHitResponse::EcalSamples* 
-ESHitResponse::vSamAll( unsigned int i ) const
-{
-   return &m_vSam[ i ] ;
-}
+const EcalHitResponse::EcalSamples* ESHitResponse::vSamAll(unsigned int i) const { return &m_vSam[i]; }
diff --git a/SimCalorimetry/EcalSimAlgos/src/ESShape.cc b/SimCalorimetry/EcalSimAlgos/src/ESShape.cc
index 109b0083002b9..63ab8f8f302cf 100644
--- a/SimCalorimetry/EcalSimAlgos/src/ESShape.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/ESShape.cc
@@ -1,31 +1,23 @@
 #include "SimCalorimetry/EcalSimAlgos/interface/ESShape.h"
 #include <cmath>
 
-ESShape::ESShape() {
-}
-
-double ESShape::operator () (double time_) const
-{   
-  if (time_>0.00001) {
+ESShape::ESShape() {}
 
+double ESShape::operator()(double time_) const {
+  if (time_ > 0.00001) {
     double wc = 0.07291;
-    double n  = 1.798; // n-1 (in fact)
-    double v1 = pow(wc/n*time_, n);
-    double v2 = exp(n-wc*time_);
-    double v  = v1*v2;
+    double n = 1.798;  // n-1 (in fact)
+    double v1 = pow(wc / n * time_, n);
+    double v2 = exp(n - wc * time_);
+    double v = v1 * v2;
 
     return v;
-  } 
-  else {
+  } else {
     return 0.0;
   }
 }
 
-double
-ESShape::timeToRise() const
-{
-   return 0.0 ;
-}
+double ESShape::timeToRise() const { return 0.0; }
 
 /*
 double ESShape::derivative (double time_) const
@@ -39,4 +31,3 @@ double ESShape::derivative (double time_) const
   }
 }
 */
-
diff --git a/SimCalorimetry/EcalSimAlgos/src/EcalCoder.cc b/SimCalorimetry/EcalSimAlgos/src/EcalCoder.cc
index d04b9eea48db1..ae2560dfedfc8 100644
--- a/SimCalorimetry/EcalSimAlgos/src/EcalCoder.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/EcalCoder.cc
@@ -8,77 +8,51 @@
 
 //#include "Geometry/CaloGeometry/interface/CaloGenericDetId.h"
 
-
-EcalCoder::EcalCoder( bool                  addNoise     , 
-		      bool                  PreMix1      ,
-		      EcalCoder::Noisifier* ebCorrNoise0 ,
-		      EcalCoder::Noisifier* eeCorrNoise0 ,
-		      EcalCoder::Noisifier* ebCorrNoise1 ,
-		      EcalCoder::Noisifier* eeCorrNoise1 ,
-		      EcalCoder::Noisifier* ebCorrNoise2 ,
-		      EcalCoder::Noisifier* eeCorrNoise2   ) :
-   m_peds        (           nullptr ) ,
-   m_gainRatios  (           nullptr ) ,
-   m_intercals   (           nullptr ) ,
-   m_maxEneEB    (      1668.3 ) , // 4095(MAXADC)*12(gain 2)*0.035(GeVtoADC)*0.97
-   m_maxEneEE    (      2859.9 ) , // 4095(MAXADC)*12(gain 2)*0.060(GeVtoADC)*0.97
-   m_addNoise    ( addNoise    ) ,
-   m_PreMix1     ( PreMix1     ) 
-   {
-   m_ebCorrNoise[0] = ebCorrNoise0 ;
-   assert( nullptr != m_ebCorrNoise[0] ) ;
-   m_eeCorrNoise[0] = eeCorrNoise0 ;
-   m_ebCorrNoise[1] = ebCorrNoise1 ;
-   m_eeCorrNoise[1] = eeCorrNoise1 ;
-   m_ebCorrNoise[2] = ebCorrNoise2 ;
-   m_eeCorrNoise[2] = eeCorrNoise2 ;
-}  
-
-EcalCoder::~EcalCoder()
-{
-}
-
-void 
-EcalCoder::setFullScaleEnergy( double EBscale ,
-			       double EEscale   )
-{
-   m_maxEneEB = EBscale ;
-   m_maxEneEE = EEscale ;
+EcalCoder::EcalCoder(bool addNoise,
+                     bool PreMix1,
+                     EcalCoder::Noisifier* ebCorrNoise0,
+                     EcalCoder::Noisifier* eeCorrNoise0,
+                     EcalCoder::Noisifier* ebCorrNoise1,
+                     EcalCoder::Noisifier* eeCorrNoise1,
+                     EcalCoder::Noisifier* ebCorrNoise2,
+                     EcalCoder::Noisifier* eeCorrNoise2)
+    : m_peds(nullptr),
+      m_gainRatios(nullptr),
+      m_intercals(nullptr),
+      m_maxEneEB(1668.3),  // 4095(MAXADC)*12(gain 2)*0.035(GeVtoADC)*0.97
+      m_maxEneEE(2859.9),  // 4095(MAXADC)*12(gain 2)*0.060(GeVtoADC)*0.97
+      m_addNoise(addNoise),
+      m_PreMix1(PreMix1) {
+  m_ebCorrNoise[0] = ebCorrNoise0;
+  assert(nullptr != m_ebCorrNoise[0]);
+  m_eeCorrNoise[0] = eeCorrNoise0;
+  m_ebCorrNoise[1] = ebCorrNoise1;
+  m_eeCorrNoise[1] = eeCorrNoise1;
+  m_ebCorrNoise[2] = ebCorrNoise2;
+  m_eeCorrNoise[2] = eeCorrNoise2;
 }
 
+EcalCoder::~EcalCoder() {}
 
-void  
-EcalCoder::setPedestals( const EcalPedestals* pedestals ) 
-{
-   m_peds = pedestals ;
+void EcalCoder::setFullScaleEnergy(double EBscale, double EEscale) {
+  m_maxEneEB = EBscale;
+  m_maxEneEE = EEscale;
 }
 
-void  
-EcalCoder::setGainRatios( const EcalGainRatios* gainRatios ) 
-{
-   m_gainRatios = gainRatios ; 
-}
+void EcalCoder::setPedestals(const EcalPedestals* pedestals) { m_peds = pedestals; }
 
-void 
-EcalCoder::setIntercalibConstants( const EcalIntercalibConstantsMC* ical ) 
-{
-   m_intercals = ical ;
-}
+void EcalCoder::setGainRatios(const EcalGainRatios* gainRatios) { m_gainRatios = gainRatios; }
 
-double 
-EcalCoder::fullScaleEnergy( const DetId & detId ) const 
-{
-   return detId.subdetId() == EcalBarrel ? m_maxEneEB : m_maxEneEE ;
+void EcalCoder::setIntercalibConstants(const EcalIntercalibConstantsMC* ical) { m_intercals = ical; }
+
+double EcalCoder::fullScaleEnergy(const DetId& detId) const {
+  return detId.subdetId() == EcalBarrel ? m_maxEneEB : m_maxEneEE;
 }
 
-void 
-EcalCoder::analogToDigital( CLHEP::HepRandomEngine* engine,
-                            const EcalSamples& clf ,
-			    EcalDataFrame&     df    ) const 
-{
-   df.setSize( clf.size() ) ;
-   encode( clf, df, engine );
-/*   std::cout<<"   **Id=" ;
+void EcalCoder::analogToDigital(CLHEP::HepRandomEngine* engine, const EcalSamples& clf, EcalDataFrame& df) const {
+  df.setSize(clf.size());
+  encode(clf, df, engine);
+  /*   std::cout<<"   **Id=" ;
    if( CaloGenericDetId( clf.id() ).isEB() )
    {
       std::cout<<EBDetId( clf.id() ) ;
@@ -95,221 +69,178 @@ EcalCoder::analogToDigital( CLHEP::HepRandomEngine* engine,
    std::cout<<std::endl ;*/
 }
 
-void 
-EcalCoder::encode( const EcalSamples& ecalSamples , 
-		   EcalDataFrame&     df,
-                   CLHEP::HepRandomEngine* engine ) const
-{
-   assert( nullptr != m_peds ) ;
-
-   const unsigned int csize ( ecalSamples.size() ) ;
-
-  
-   DetId detId = ecalSamples.id();             
-   double Emax = fullScaleEnergy(detId);       
-
-   //....initialisation
-   if ( ecalSamples[5] > 0. ) LogDebug("EcalCoder") << "Input caloSample" << "\n" << ecalSamples;
-  
-   double LSB[NGAINS+1];
-   double pedestals[NGAINS+1];
-   double widths[NGAINS+1];
-   double gains[NGAINS+1];
-   int    maxADC[NGAINS+1];
-   double trueRMS[NGAINS+1];
-
-   double icalconst = 1. ;
-   findIntercalibConstant( detId, icalconst );
-
-   for( unsigned int igain ( 0 ); igain <= NGAINS ; ++igain ) 
-   {
-      // fill in the pedestal and width
-      findPedestal( detId ,
-		    igain , 
-		    pedestals[igain] , 
-		    widths[igain]      ) ;
-
-      if( 0 < igain ) 
-	 trueRMS[igain] = std::sqrt( widths[igain]*widths[igain] - 1./12. ) ;
-
-      // set nominal value first
-      findGains( detId , 
-		 gains  );               
-
-      LSB[igain] = 0.;
-      if ( igain > 0 ) LSB[igain]= Emax/(MAXADC*gains[igain]);
-      maxADC[igain] = ADCGAINSWITCH;                   // saturation at 4080 for middle and high gains x6 & x12
-      if ( igain == NGAINS ) maxADC[igain] = MAXADC;   // saturation at 4095 for low gain x1 
-   }
-
-   CaloSamples noiseframe[] = { CaloSamples( detId , csize ) ,
-				CaloSamples( detId , csize ) ,
-				CaloSamples( detId , csize )   } ;
-
-   const Noisifier* noisy[3] = { ( nullptr == m_eeCorrNoise[0]          ||
-				   EcalBarrel == detId.subdetId()    ?
-				   m_ebCorrNoise[0] :
-				   m_eeCorrNoise[0]                  ) ,
-				 ( EcalBarrel == detId.subdetId() ?
-				   m_ebCorrNoise[1] :
-				   m_eeCorrNoise[1]                  ) ,
-				 ( EcalBarrel == detId.subdetId() ?
-				   m_ebCorrNoise[2] :
-				   m_eeCorrNoise[2]                  )   } ;
-
-   if( m_addNoise )
-   {
-     noisy[0]->noisify( noiseframe[0], engine ) ; // high gain
-      if( nullptr == noisy[1] ) noisy[0]->noisify( noiseframe[1] ,
-                                             engine,
-					     &noisy[0]->vecgau() ) ; // med 
-      if( nullptr == noisy[2] ) noisy[0]->noisify( noiseframe[2] ,
-                                             engine,
-					     &noisy[0]->vecgau() ) ; // low
-   }
-
-
-   //   std::cout << " intercal, LSBs, gains " << icalconst << " " << LSB[0] << " " << LSB[1] << " " << gains[0] << " " << gains[1] << " " << Emax <<  std::endl;
-
-   int wait = 0 ;
-   int gainId = 0 ;
-   bool isSaturated = false;
-
-   for( unsigned int i ( 0 ) ; i != csize ; ++i )
-   {    
-      bool done ( false ) ;
-      int adc = MAXADC ;
-      if( 0 == wait ) gainId = 1 ;
-
-      // see which gain bin it fits in
-      int igain ( gainId - 1 ) ;
-      do
+void EcalCoder::encode(const EcalSamples& ecalSamples, EcalDataFrame& df, CLHEP::HepRandomEngine* engine) const {
+  assert(nullptr != m_peds);
+
+  const unsigned int csize(ecalSamples.size());
+
+  DetId detId = ecalSamples.id();
+  double Emax = fullScaleEnergy(detId);
+
+  //....initialisation
+  if (ecalSamples[5] > 0.)
+    LogDebug("EcalCoder") << "Input caloSample"
+                          << "\n"
+                          << ecalSamples;
+
+  double LSB[NGAINS + 1];
+  double pedestals[NGAINS + 1];
+  double widths[NGAINS + 1];
+  double gains[NGAINS + 1];
+  int maxADC[NGAINS + 1];
+  double trueRMS[NGAINS + 1];
+
+  double icalconst = 1.;
+  findIntercalibConstant(detId, icalconst);
+
+  for (unsigned int igain(0); igain <= NGAINS; ++igain) {
+    // fill in the pedestal and width
+    findPedestal(detId, igain, pedestals[igain], widths[igain]);
+
+    if (0 < igain)
+      trueRMS[igain] = std::sqrt(widths[igain] * widths[igain] - 1. / 12.);
+
+    // set nominal value first
+    findGains(detId, gains);
+
+    LSB[igain] = 0.;
+    if (igain > 0)
+      LSB[igain] = Emax / (MAXADC * gains[igain]);
+    maxADC[igain] = ADCGAINSWITCH;  // saturation at 4080 for middle and high gains x6 & x12
+    if (igain == NGAINS)
+      maxADC[igain] = MAXADC;  // saturation at 4095 for low gain x1
+  }
+
+  CaloSamples noiseframe[] = {CaloSamples(detId, csize), CaloSamples(detId, csize), CaloSamples(detId, csize)};
+
+  const Noisifier* noisy[3] = {
+      (nullptr == m_eeCorrNoise[0] || EcalBarrel == detId.subdetId() ? m_ebCorrNoise[0] : m_eeCorrNoise[0]),
+      (EcalBarrel == detId.subdetId() ? m_ebCorrNoise[1] : m_eeCorrNoise[1]),
+      (EcalBarrel == detId.subdetId() ? m_ebCorrNoise[2] : m_eeCorrNoise[2])};
+
+  if (m_addNoise) {
+    noisy[0]->noisify(noiseframe[0], engine);  // high gain
+    if (nullptr == noisy[1])
+      noisy[0]->noisify(noiseframe[1], engine,
+                        &noisy[0]->vecgau());  // med
+    if (nullptr == noisy[2])
+      noisy[0]->noisify(noiseframe[2], engine,
+                        &noisy[0]->vecgau());  // low
+  }
+
+  //   std::cout << " intercal, LSBs, gains " << icalconst << " " << LSB[0] << " " << LSB[1] << " " << gains[0] << " " << gains[1] << " " << Emax <<  std::endl;
+
+  int wait = 0;
+  int gainId = 0;
+  bool isSaturated = false;
+
+  for (unsigned int i(0); i != csize; ++i) {
+    bool done(false);
+    int adc = MAXADC;
+    if (0 == wait)
+      gainId = 1;
+
+    // see which gain bin it fits in
+    int igain(gainId - 1);
+    do {
+      ++igain;
+
+      //	 if( igain != gainId ) std::cout <<"$$$$ Gain switch from " << gainId
+      //					 <<" to "<< igain << std::endl ;
+
+      if (1 != igain &&                     // not high gain
+          m_addNoise &&                     // want to add noise
+          nullptr != noisy[igain - 1] &&    // exists
+          noiseframe[igain - 1].isBlank())  // not already done
       {
-	 ++igain ;
-
-//	 if( igain != gainId ) std::cout <<"$$$$ Gain switch from " << gainId
-//					 <<" to "<< igain << std::endl ;
-
-	 if( 1 != igain                    &&   // not high gain
-	     m_addNoise                    &&   // want to add noise
-	     nullptr != noisy[igain-1]           &&   // exists
-	     noiseframe[igain-1].isBlank()    ) // not already done
-	 {
-	    noisy[igain-1]->noisify( noiseframe[igain-1] ,
-                                     engine,
-				     &noisy[0]->vecgau()   ) ;
-	    //std::cout<<"....noisifying gain level = "<<igain<<std::endl ;
-	 }
-	
-	 double signal;
-
-	 if(!m_PreMix1) {
-
-	   // noiseframe filled with zeros if !m_addNoise
-	   const double asignal ( pedestals[igain] +
-			       ecalSamples[i] /( LSB[igain]*icalconst ) +
-			       trueRMS[igain]*noiseframe[igain-1][i]      ) ;
-	   signal = asignal;
-	 }
-	 else {  // Any changes made here must be reverse-engineered in EcalSignalGenerator!
-
-           if( igain == 1) {
-             const double asignal ( ecalSamples[i]*1000. );  // save low level info                   
-             signal = asignal;
-           }
-           else if( igain == 2) {
-             const double asignal ( ecalSamples[i]/( LSB[1]*icalconst ));
-             signal = asignal;
-           }
-           else if( igain == 3) {   // bet that no pileup hit has an energy over Emax/2             
-             const double asignal ( ecalSamples[i]/( LSB[2]*icalconst ) );
-             signal = asignal;
-           }
-	   else { //not sure we ever get here at gain=0, but hit wil be saturated anyway
-	     const double asignal ( ecalSamples[i]/( LSB[3]*icalconst ) ); // just calculate something
-             signal = asignal;
-	   }
-	   // old version
-	   //const double asignal ( // no pedestals for pre-mixing
-	   //			 ecalSamples[i] /( LSB[igain]*icalconst ) );
-	   //signal = asignal;
-	 }
-
-	 //	 std::cout << " " << ecalSamples[i] << " " << noiseframe[igain-1][i] << std::endl;
-
-
-	 const int isignal ( signal ) ;
-	 const int tmpadc ( signal - (double)isignal < 0.5 ?
-			    isignal : isignal + 1 ) ;
-	 // LogDebug("EcalCoder") << "DetId " << detId.rawId() << " gain " << igain << " caloSample " 
-	 //                       <<  ecalSamples[i] << " pededstal " << pedestals[igain] 
-	 //                       << " noise " << widths[igain] << " conversion factor " << LSB[igain] 
-	 //                       << " result (ped,tmpadc)= " << ped << " " << tmpadc;
-         
-	 if( tmpadc <= maxADC[igain] ) 
-	 {
-	    adc = tmpadc;
-	    done = true ;
-	 }
+        noisy[igain - 1]->noisify(noiseframe[igain - 1], engine, &noisy[0]->vecgau());
+        //std::cout<<"....noisifying gain level = "<<igain<<std::endl ;
       }
-      while( !done       &&
-	     igain < 3    ) ;
 
-      if (igain == 1 ) 
-      {
-         wait = 0 ;
-         gainId = igain ;
-      }
-      else 
-      {
-         if (igain == gainId) --wait ;
-         else 
-	 {
-	    wait = 5 ;
-	    gainId = igain ;
-	 }
+      double signal;
+
+      if (!m_PreMix1) {
+        // noiseframe filled with zeros if !m_addNoise
+        const double asignal(pedestals[igain] + ecalSamples[i] / (LSB[igain] * icalconst) +
+                             trueRMS[igain] * noiseframe[igain - 1][i]);
+        signal = asignal;
+      } else {  // Any changes made here must be reverse-engineered in EcalSignalGenerator!
+
+        if (igain == 1) {
+          const double asignal(ecalSamples[i] * 1000.);  // save low level info
+          signal = asignal;
+        } else if (igain == 2) {
+          const double asignal(ecalSamples[i] / (LSB[1] * icalconst));
+          signal = asignal;
+        } else if (igain == 3) {  // bet that no pileup hit has an energy over Emax/2
+          const double asignal(ecalSamples[i] / (LSB[2] * icalconst));
+          signal = asignal;
+        } else {  //not sure we ever get here at gain=0, but hit wil be saturated anyway
+          const double asignal(ecalSamples[i] / (LSB[3] * icalconst));  // just calculate something
+          signal = asignal;
+        }
+        // old version
+        //const double asignal ( // no pedestals for pre-mixing
+        //			 ecalSamples[i] /( LSB[igain]*icalconst ) );
+        //signal = asignal;
       }
 
+      //	 std::cout << " " << ecalSamples[i] << " " << noiseframe[igain-1][i] << std::endl;
 
-      // change the gain for saturation
-      int storeGainId = gainId;
-      if ( gainId == 3 && adc == MAXADC ) 
-      {
-	 storeGainId = 0;
-	 isSaturated = true;
+      const int isignal(signal);
+      const int tmpadc(signal - (double)isignal < 0.5 ? isignal : isignal + 1);
+      // LogDebug("EcalCoder") << "DetId " << detId.rawId() << " gain " << igain << " caloSample "
+      //                       <<  ecalSamples[i] << " pededstal " << pedestals[igain]
+      //                       << " noise " << widths[igain] << " conversion factor " << LSB[igain]
+      //                       << " result (ped,tmpadc)= " << ped << " " << tmpadc;
+
+      if (tmpadc <= maxADC[igain]) {
+        adc = tmpadc;
+        done = true;
       }
-      // LogDebug("EcalCoder") << " Writing out frame " << i << " ADC = " << adc << " gainId = " << gainId << " storeGainId = " << storeGainId ; 
-     
-      df.setSample( i, EcalMGPASample( adc, storeGainId ) );   
-   }
-   // handle saturation properly according to IN-2007/056
-   // N.B. - FIXME 
-   // still missing the possibility for a signal to pass the saturation threshold
-   // again within the 5 subsequent samples (higher order effect).
+    } while (!done && igain < 3);
 
-   if ( isSaturated ) 
-   {
-      for (unsigned int i = 0 ; i < ecalSamples.size() ; ++i) 
-      {
-	 if ( df.sample(i).gainId() == 0 ) 
-	 {
-	    unsigned int hyst = i+1+2;
-	    for ( unsigned int j = i+1; j < hyst && j < ecalSamples.size(); ++j ) 
-	    {
-	       df.setSample(j, EcalMGPASample(MAXADC, 0));   
-	    }
-	 }
+    if (igain == 1) {
+      wait = 0;
+      gainId = igain;
+    } else {
+      if (igain == gainId)
+        --wait;
+      else {
+        wait = 5;
+        gainId = igain;
       }
-   }
+    }
+
+    // change the gain for saturation
+    int storeGainId = gainId;
+    if (gainId == 3 && adc == MAXADC) {
+      storeGainId = 0;
+      isSaturated = true;
+    }
+    // LogDebug("EcalCoder") << " Writing out frame " << i << " ADC = " << adc << " gainId = " << gainId << " storeGainId = " << storeGainId ;
+
+    df.setSample(i, EcalMGPASample(adc, storeGainId));
+  }
+  // handle saturation properly according to IN-2007/056
+  // N.B. - FIXME
+  // still missing the possibility for a signal to pass the saturation threshold
+  // again within the 5 subsequent samples (higher order effect).
+
+  if (isSaturated) {
+    for (unsigned int i = 0; i < ecalSamples.size(); ++i) {
+      if (df.sample(i).gainId() == 0) {
+        unsigned int hyst = i + 1 + 2;
+        for (unsigned int j = i + 1; j < hyst && j < ecalSamples.size(); ++j) {
+          df.setSample(j, EcalMGPASample(MAXADC, 0));
+        }
+      }
+    }
+  }
 }
 
-void 
-EcalCoder::findPedestal( const DetId & detId  , 
-			 int           gainId , 
-			 double&       ped    , 
-			 double&       width     ) const
-{
-   /*
+void EcalCoder::findPedestal(const DetId& detId, int gainId, double& ped, double& width) const {
+  /*
      EcalPedestalsMapIterator mapItr 
      = m_peds->m_pedestals.find(detId.rawId());
      // should I care if it doesn't get found?
@@ -318,21 +249,21 @@ EcalCoder::findPedestal( const DetId & detId  ,
      } else {
      EcalPedestals::Item item = mapItr->second;
    */
-   
-   /*   
+
+  /*   
 	EcalPedestals::Item const & item = (*m_peds)(detId);
 	ped = item.mean(gainId);
 	width = item.rms(gainId);
    */
 
-   EcalPedestalsMap::const_iterator itped = m_peds->getMap().find( detId );
-   ped   = (*itped).mean(gainId);
-   width = (*itped).rms(gainId);
-  
-   if ( (detId.subdetId() != EcalBarrel) && (detId.subdetId() != EcalEndcap) ) 
-   { 
-      edm::LogError("EcalCoder") << "Could not find pedestal for " << detId.rawId() << " among the " << m_peds->getMap().size();
-   } 
+  EcalPedestalsMap::const_iterator itped = m_peds->getMap().find(detId);
+  ped = (*itped).mean(gainId);
+  width = (*itped).rms(gainId);
+
+  if ((detId.subdetId() != EcalBarrel) && (detId.subdetId() != EcalEndcap)) {
+    edm::LogError("EcalCoder") << "Could not find pedestal for " << detId.rawId() << " among the "
+                               << m_peds->getMap().size();
+  }
 
   /*
     switch(gainId) {
@@ -357,14 +288,11 @@ EcalCoder::findPedestal( const DetId & detId  ,
     }
   */
 
-   LogDebug("EcalCoder") << "Pedestals for " << detId.rawId() << " gain range " << gainId << " : \n" << "Mean = " << ped << " rms = " << width;
+  LogDebug("EcalCoder") << "Pedestals for " << detId.rawId() << " gain range " << gainId << " : \n"
+                        << "Mean = " << ped << " rms = " << width;
 }
 
-
-void 
-EcalCoder::findGains( const DetId & detId , 
-		      double Gains[]        ) const
-{
+void EcalCoder::findGains(const DetId& detId, double Gains[]) const {
   /*
     EcalGainRatios::EcalGainRatioMap::const_iterator grit=m_gainRatios->getMap().find(detId.rawId());
     EcalMGPAGainRatio mgpa;
@@ -380,36 +308,31 @@ EcalCoder::findGains( const DetId & detId ,
     }
   */
 
-   EcalGainRatioMap::const_iterator grit = m_gainRatios->getMap().find( detId );
-   Gains[0] = 0.;
-   Gains[3] = 1.;
-   Gains[2] = (*grit).gain6Over1();
-   Gains[1] = Gains[2]*( (*grit).gain12Over6() );   
-   
-  
-   if ( (detId.subdetId() != EcalBarrel) && (detId.subdetId() != EcalEndcap) ) 
-   { 
-      edm::LogError("EcalCoder") << "Could not find gain ratios for " << detId.rawId() << " among the " << m_gainRatios->getMap().size();
-   }   
-  
+  EcalGainRatioMap::const_iterator grit = m_gainRatios->getMap().find(detId);
+  Gains[0] = 0.;
+  Gains[3] = 1.;
+  Gains[2] = (*grit).gain6Over1();
+  Gains[1] = Gains[2] * ((*grit).gain12Over6());
+
+  if ((detId.subdetId() != EcalBarrel) && (detId.subdetId() != EcalEndcap)) {
+    edm::LogError("EcalCoder") << "Could not find gain ratios for " << detId.rawId() << " among the "
+                               << m_gainRatios->getMap().size();
+  }
 }
 
-void 
-EcalCoder::findIntercalibConstant( const DetId& detId, 
-				   double&      icalconst ) const
-{
-   EcalIntercalibConstantMC thisconst = 1.;
-   // find intercalib constant for this xtal
-   const EcalIntercalibConstantMCMap &icalMap = m_intercals->getMap();
-   EcalIntercalibConstantMCMap::const_iterator icalit = icalMap.find(detId);
-   if( icalit!=icalMap.end() )
-   {
-      thisconst = (*icalit);
-      if ( icalconst == 0. ) { thisconst = 1.; }
-   } 
-   else
-   {
-      edm::LogError("EcalCoder") << "No intercalib const found for xtal " << detId.rawId() << "! something wrong with EcalIntercalibConstants in your DB? ";
-   }
-   icalconst = thisconst;
+void EcalCoder::findIntercalibConstant(const DetId& detId, double& icalconst) const {
+  EcalIntercalibConstantMC thisconst = 1.;
+  // find intercalib constant for this xtal
+  const EcalIntercalibConstantMCMap& icalMap = m_intercals->getMap();
+  EcalIntercalibConstantMCMap::const_iterator icalit = icalMap.find(detId);
+  if (icalit != icalMap.end()) {
+    thisconst = (*icalit);
+    if (icalconst == 0.) {
+      thisconst = 1.;
+    }
+  } else {
+    edm::LogError("EcalCoder") << "No intercalib const found for xtal " << detId.rawId()
+                               << "! something wrong with EcalIntercalibConstants in your DB? ";
+  }
+  icalconst = thisconst;
 }
diff --git a/SimCalorimetry/EcalSimAlgos/src/EcalCorrelatedNoiseMatrix.cc b/SimCalorimetry/EcalSimAlgos/src/EcalCorrelatedNoiseMatrix.cc
index 0a50b18d0153a..20d9745aacfb3 100644
--- a/SimCalorimetry/EcalSimAlgos/src/EcalCorrelatedNoiseMatrix.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/EcalCorrelatedNoiseMatrix.cc
@@ -1,12 +1,8 @@
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalCorrelatedNoiseMatrix.h"
 #include "SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.icc"
 
-template class CorrelatedNoisifier< EcalCorrMatrix > ;
-
-template
-void
-CorrelatedNoisifier< EcalCorrMatrix >::noisify(CaloSamples&,
-                                               CLHEP::HepRandomEngine*,
-					       const std::vector<double>* rangau ) const ;
-
+template class CorrelatedNoisifier<EcalCorrMatrix>;
 
+template void CorrelatedNoisifier<EcalCorrMatrix>::noisify(CaloSamples&,
+                                                           CLHEP::HepRandomEngine*,
+                                                           const std::vector<double>* rangau) const;
diff --git a/SimCalorimetry/EcalSimAlgos/src/EcalDigitizers.cc b/SimCalorimetry/EcalSimAlgos/src/EcalDigitizers.cc
index d5f7e809704b5..4c3dc081c69bc 100644
--- a/SimCalorimetry/EcalSimAlgos/src/EcalDigitizers.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/EcalDigitizers.cc
@@ -1,6 +1,6 @@
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalDigitizerTraits.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.icc"
 
-template class EcalTDigitizer< EBDigitizerTraits > ;
-template class EcalTDigitizer< EEDigitizerTraits > ;
-template class EcalTDigitizer< ESDigitizerTraits > ;
+template class EcalTDigitizer<EBDigitizerTraits>;
+template class EcalTDigitizer<EEDigitizerTraits>;
+template class EcalTDigitizer<ESDigitizerTraits>;
diff --git a/SimCalorimetry/EcalSimAlgos/src/EcalElectronicsSim.cc b/SimCalorimetry/EcalSimAlgos/src/EcalElectronicsSim.cc
index 2fffa53e7d614..35e7ec36d9ffa 100644
--- a/SimCalorimetry/EcalSimAlgos/src/EcalElectronicsSim.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/EcalElectronicsSim.cc
@@ -10,43 +10,28 @@
 #include <unistd.h>
 #include <fstream>
 
-EcalElectronicsSim::EcalElectronicsSim( const EcalSimParameterMap* parameterMap      , 
-					EcalCoder*                 coder             , 
-					bool                       applyConstantTerm , 
-					double                     rmsConstantTerm     ) :
-   m_simMap             ( parameterMap ) ,
-   m_theCoder           ( coder        ) ,
-   m_thisCT             ( rmsConstantTerm ),
-   m_applyConstantTerm  ( applyConstantTerm )
-{
-}
-
-EcalElectronicsSim::~EcalElectronicsSim()
-{  
-}
+EcalElectronicsSim::EcalElectronicsSim(const EcalSimParameterMap* parameterMap,
+                                       EcalCoder* coder,
+                                       bool applyConstantTerm,
+                                       double rmsConstantTerm)
+    : m_simMap(parameterMap), m_theCoder(coder), m_thisCT(rmsConstantTerm), m_applyConstantTerm(applyConstantTerm) {}
 
-void 
-EcalElectronicsSim::analogToDigital( CLHEP::HepRandomEngine* engine,
-                                     EcalElectronicsSim::EcalSamples& clf ,
-				     EcalDataFrame&                   df    ) const 
-{
+EcalElectronicsSim::~EcalElectronicsSim() {}
 
-   //PG input signal is in pe.  Converted in GeV
-  amplify( clf, engine ) ;
+void EcalElectronicsSim::analogToDigital(CLHEP::HepRandomEngine* engine,
+                                         EcalElectronicsSim::EcalSamples& clf,
+                                         EcalDataFrame& df) const {
+  //PG input signal is in pe.  Converted in GeV
+  amplify(clf, engine);
 
-  m_theCoder->analogToDigital( engine, clf, df ) ;
+  m_theCoder->analogToDigital(engine, clf, df);
 }
 
-void 
-EcalElectronicsSim::amplify( EcalElectronicsSim::EcalSamples& clf, CLHEP::HepRandomEngine* engine ) const
-{
-   const double fac ( m_simMap->simParameters( clf.id() ).photoelectronsToAnalog() ) ;
-   if( m_applyConstantTerm )
-   {
-      clf *= fac*CLHEP::RandGaussQ::shoot(engine, 1.0, m_thisCT);
-   }
-   else
-   {
-      clf *= fac ;
-   }
+void EcalElectronicsSim::amplify(EcalElectronicsSim::EcalSamples& clf, CLHEP::HepRandomEngine* engine) const {
+  const double fac(m_simMap->simParameters(clf.id()).photoelectronsToAnalog());
+  if (m_applyConstantTerm) {
+    clf *= fac * CLHEP::RandGaussQ::shoot(engine, 1.0, m_thisCT);
+  } else {
+    clf *= fac;
+  }
 }
diff --git a/SimCalorimetry/EcalSimAlgos/src/EcalHitResponse.cc b/SimCalorimetry/EcalSimAlgos/src/EcalHitResponse.cc
index 1f232bec753ed..b86a7f949a051 100644
--- a/SimCalorimetry/EcalSimAlgos/src/EcalHitResponse.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/EcalHitResponse.cc
@@ -1,4 +1,4 @@
-#include "SimCalorimetry/EcalSimAlgos/interface/EcalHitResponse.h" 
+#include "SimCalorimetry/EcalSimAlgos/interface/EcalHitResponse.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVSimParameterMap.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloSimParameters.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVShape.h"
@@ -14,319 +14,214 @@
 #include "FWCore/Utilities/interface/isFinite.h"
 
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h" 
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include <iostream>
 
+EcalHitResponse::EcalHitResponse(const CaloVSimParameterMap* parameterMap, const CaloVShape* shape)
+    : m_parameterMap(parameterMap),
+      m_shape(shape),
+      m_hitCorrection(nullptr),
+      m_PECorrection(nullptr),
+      m_hitFilter(nullptr),
+      m_geometry(nullptr),
+      m_lasercals(nullptr),
+      m_minBunch(-32),
+      m_maxBunch(10),
+      m_phaseShift(1),
+      m_iTime(0),
+      m_useLCcorrection(false) {}
 
+EcalHitResponse::~EcalHitResponse() {}
 
-EcalHitResponse::EcalHitResponse( const CaloVSimParameterMap* parameterMap ,
-				  const CaloVShape*           shape         ) :
-   m_parameterMap    ( parameterMap ) ,
-   m_shape           ( shape        ) ,
-   m_hitCorrection   ( nullptr            ) ,
-   m_PECorrection    ( nullptr            ) ,
-   m_hitFilter       ( nullptr            ) ,
-   m_geometry        ( nullptr            ) ,
-   m_lasercals       ( nullptr            ) ,
-   m_minBunch        ( -32          ) ,
-   m_maxBunch        (  10          ) ,
-   m_phaseShift      ( 1            ) ,
-   m_iTime           ( 0            ) ,
-   m_useLCcorrection ( false            )  
-{
+const CaloSimParameters* EcalHitResponse::params(const DetId& detId) const {
+  assert(nullptr != m_parameterMap);
+  return &m_parameterMap->simParameters(detId);
 }
 
-EcalHitResponse::~EcalHitResponse()
-{
+const CaloVShape* EcalHitResponse::shape() const {
+  assert(nullptr != m_shape);
+  return m_shape;
 }
 
-const CaloSimParameters*
-EcalHitResponse::params( const DetId& detId ) const
-{
-   assert( nullptr != m_parameterMap ) ;
-   return &m_parameterMap->simParameters( detId ) ;
+const CaloSubdetectorGeometry* EcalHitResponse::geometry() const {
+  assert(nullptr != m_geometry);
+  return m_geometry;
 }
 
-const CaloVShape*
-EcalHitResponse::shape() const
-{
-   assert( nullptr != m_shape ) ;
-   return m_shape ;
+void EcalHitResponse::setBunchRange(int minBunch, int maxBunch) {
+  m_minBunch = minBunch;
+  m_maxBunch = maxBunch;
 }
 
-const CaloSubdetectorGeometry*
-EcalHitResponse::geometry() const
-{
-   assert( nullptr != m_geometry ) ;
-   return m_geometry ;
-}
+void EcalHitResponse::setGeometry(const CaloSubdetectorGeometry* geometry) { m_geometry = geometry; }
 
-void 
-EcalHitResponse::setBunchRange( int minBunch , 
-				int maxBunch  ) 
-{
-   m_minBunch = minBunch ;
-   m_maxBunch = maxBunch ;
-}
+void EcalHitResponse::setPhaseShift(double phaseShift) { m_phaseShift = phaseShift; }
 
-void 
-EcalHitResponse::setGeometry( const CaloSubdetectorGeometry* geometry )
-{
-  m_geometry = geometry ;
-}
+double EcalHitResponse::phaseShift() const { return m_phaseShift; }
 
-void 
-EcalHitResponse::setPhaseShift( double phaseShift )
-{
-   m_phaseShift = phaseShift ;
-}
+void EcalHitResponse::setHitFilter(const CaloVHitFilter* filter) { m_hitFilter = filter; }
 
-double
-EcalHitResponse::phaseShift() const
-{
-   return m_phaseShift ;
-}
+void EcalHitResponse::setHitCorrection(const CaloVHitCorrection* hitCorrection) { m_hitCorrection = hitCorrection; }
 
-void 
-EcalHitResponse::setHitFilter( const CaloVHitFilter* filter)
-{
-   m_hitFilter = filter ;
-}
+void EcalHitResponse::setPECorrection(const CaloVPECorrection* peCorrection) { m_PECorrection = peCorrection; }
 
-void 
-EcalHitResponse::setHitCorrection( const CaloVHitCorrection* hitCorrection)
-{
-   m_hitCorrection = hitCorrection ;
-}
-
-void 
-EcalHitResponse::setPECorrection( const CaloVPECorrection* peCorrection )
-{
-   m_PECorrection = peCorrection ;
-}
-
-void
-EcalHitResponse::setEventTime(const edm::TimeValue_t& iTime)
-{
+void EcalHitResponse::setEventTime(const edm::TimeValue_t& iTime) {
   m_iTime = iTime;
   //clear the laser cache for each event time
-  CalibCache().swap(m_laserCalibCache);  
+  CalibCache().swap(m_laserCalibCache);
 }
 
-void 
-EcalHitResponse::setLaserConstants(const EcalLaserDbService* laser, bool& useLCcorrection)
-{
+void EcalHitResponse::setLaserConstants(const EcalLaserDbService* laser, bool& useLCcorrection) {
   m_lasercals = laser;
   m_useLCcorrection = useLCcorrection;
 }
 
-void 
-EcalHitResponse::blankOutUsedSamples()  // blank out previously used elements
+void EcalHitResponse::blankOutUsedSamples()  // blank out previously used elements
 {
-   const unsigned int size ( m_index.size() ) ;
-
-   for( unsigned int i ( 0 ) ; i != size ; ++i )
-   {
-      vSamAll( m_index[i] )->setZero() ;
-   }
-   m_index.erase( m_index.begin() ,    // done and make ready to start over
-		  m_index.end()    ) ;
+  const unsigned int size(m_index.size());
+
+  for (unsigned int i(0); i != size; ++i) {
+    vSamAll(m_index[i])->setZero();
+  }
+  m_index.erase(m_index.begin(),  // done and make ready to start over
+                m_index.end());
 }
 
-void 
-EcalHitResponse::add( const PCaloHit& hit, CLHEP::HepRandomEngine* engine )
-{
-  if (!edm::isNotFinite( hit.time() ) && ( nullptr == m_hitFilter || m_hitFilter->accepts( hit ) ) ) {
-    putAnalogSignal( hit, engine ) ;
+void EcalHitResponse::add(const PCaloHit& hit, CLHEP::HepRandomEngine* engine) {
+  if (!edm::isNotFinite(hit.time()) && (nullptr == m_hitFilter || m_hitFilter->accepts(hit))) {
+    putAnalogSignal(hit, engine);
   }
 }
 
-void 
-EcalHitResponse::add( const CaloSamples& hit ) 
-{
-  const DetId detId ( hit.id() ) ;
+void EcalHitResponse::add(const CaloSamples& hit) {
+  const DetId detId(hit.id());
 
-  EcalSamples& result ( *findSignal( detId ) ) ;
+  EcalSamples& result(*findSignal(detId));
 
-  const int rsize ( result.size() ) ;
+  const int rsize(result.size());
 
-  if(rsize != hit.size()) {
-    throw cms::Exception("EcalDigitization")
-      << "CaloSamples and EcalSamples have different sizes. Type Mismatach";
+  if (rsize != hit.size()) {
+    throw cms::Exception("EcalDigitization") << "CaloSamples and EcalSamples have different sizes. Type Mismatach";
   }
 
-  for( int bin ( 0 ) ; bin != rsize ; ++bin )
-    {
-      result[ bin ] += hit[ bin ] ;
-    }
-
+  for (int bin(0); bin != rsize; ++bin) {
+    result[bin] += hit[bin];
+  }
 }
 
-
-bool
-EcalHitResponse::withinBunchRange(int bunchCrossing) const
-{
-   return(m_minBunch <= bunchCrossing && m_maxBunch >= bunchCrossing);
+bool EcalHitResponse::withinBunchRange(int bunchCrossing) const {
+  return (m_minBunch <= bunchCrossing && m_maxBunch >= bunchCrossing);
 }
 
-void
-EcalHitResponse::initializeHits()
-{
-   blankOutUsedSamples() ;
-}
+void EcalHitResponse::initializeHits() { blankOutUsedSamples(); }
 
-void
-EcalHitResponse::finalizeHits()
-{
-}
+void EcalHitResponse::finalizeHits() {}
 
-void 
-EcalHitResponse::run( MixCollection<PCaloHit>& hits, CLHEP::HepRandomEngine* engine )
-{
-   blankOutUsedSamples() ;
-
-   for( MixCollection<PCaloHit>::MixItr hitItr ( hits.begin() ) ;
-	hitItr != hits.end() ; ++hitItr )
-   {
-      const PCaloHit& hit ( *hitItr ) ;
-      const int bunch ( hitItr.bunch() ) ;
-      if( withinBunchRange(bunch)  &&
-	  !edm::isNotFinite( hit.time() ) &&
-	  ( nullptr == m_hitFilter ||
-	    m_hitFilter->accepts( hit ) ) ) putAnalogSignal( hit, engine ) ;
-   }
-   
+void EcalHitResponse::run(MixCollection<PCaloHit>& hits, CLHEP::HepRandomEngine* engine) {
+  blankOutUsedSamples();
+
+  for (MixCollection<PCaloHit>::MixItr hitItr(hits.begin()); hitItr != hits.end(); ++hitItr) {
+    const PCaloHit& hit(*hitItr);
+    const int bunch(hitItr.bunch());
+    if (withinBunchRange(bunch) && !edm::isNotFinite(hit.time()) &&
+        (nullptr == m_hitFilter || m_hitFilter->accepts(hit)))
+      putAnalogSignal(hit, engine);
+  }
 }
 
-void
-EcalHitResponse::putAnalogSignal( const PCaloHit& hit, CLHEP::HepRandomEngine* engine )
-{
-   const DetId detId ( hit.id() ) ;
+void EcalHitResponse::putAnalogSignal(const PCaloHit& hit, CLHEP::HepRandomEngine* engine) {
+  const DetId detId(hit.id());
 
-   const CaloSimParameters* parameters ( params( detId ) ) ;
+  const CaloSimParameters* parameters(params(detId));
 
-   const double signal ( analogSignalAmplitude( detId, hit.energy(), engine ) ) ;
+  const double signal(analogSignalAmplitude(detId, hit.energy(), engine));
 
-   double time = hit.time();
+  double time = hit.time();
 
-   if(m_hitCorrection) {
-     time += m_hitCorrection->delay( hit, engine ) ;
-   }
+  if (m_hitCorrection) {
+    time += m_hitCorrection->delay(hit, engine);
+  }
 
-   const double jitter ( time - timeOfFlight( detId ) ) ;
+  const double jitter(time - timeOfFlight(detId));
 
-   const double tzero = ( shape()->timeToRise()
-			  + parameters->timePhase() 
-			  - jitter 
-			  - BUNCHSPACE*( parameters->binOfMaximum()
-					 - m_phaseShift             ) ) ;
-   double binTime ( tzero ) ;
+  const double tzero = (shape()->timeToRise() + parameters->timePhase() - jitter -
+                        BUNCHSPACE * (parameters->binOfMaximum() - m_phaseShift));
+  double binTime(tzero);
 
-   EcalSamples& result ( *findSignal( detId ) ) ;
+  EcalSamples& result(*findSignal(detId));
 
-   const unsigned int rsize ( result.size() ) ;
+  const unsigned int rsize(result.size());
 
-   for( unsigned int bin ( 0 ) ; bin != rsize ; ++bin )
-   {
-      result[ bin ] += (*shape())( binTime )*signal ;
-      binTime += BUNCHSPACE ;
-   }
+  for (unsigned int bin(0); bin != rsize; ++bin) {
+    result[bin] += (*shape())(binTime)*signal;
+    binTime += BUNCHSPACE;
+  }
 }
 
-double
-EcalHitResponse::findLaserConstant(const DetId& detId) const
-{
+double EcalHitResponse::findLaserConstant(const DetId& detId) const {
   const edm::Timestamp& evtTimeStamp = edm::Timestamp(m_iTime);
   return (m_lasercals->getLaserCorrection(detId, evtTimeStamp));
 }
 
-EcalHitResponse::EcalSamples* 
-EcalHitResponse::findSignal( const DetId& detId )
-{
-   const unsigned int di ( CaloGenericDetId( detId ).denseIndex() ) ;
-   EcalSamples* result ( vSamAll( di ) ) ;
-   if( result->zero() ) m_index.push_back( di ) ;
-   return result ;
+EcalHitResponse::EcalSamples* EcalHitResponse::findSignal(const DetId& detId) {
+  const unsigned int di(CaloGenericDetId(detId).denseIndex());
+  EcalSamples* result(vSamAll(di));
+  if (result->zero())
+    m_index.push_back(di);
+  return result;
 }
 
-double 
-EcalHitResponse::analogSignalAmplitude( const DetId& detId, double energy, CLHEP::HepRandomEngine* engine )
-{
-  const CaloSimParameters& parameters ( *params( detId ) ) ;
-
-   // OK, the "energy" in the hit could be a real energy, deposited energy,
-   // or pe count.  This factor converts to photoelectrons
-  
-   double lasercalib = 1.;
-   if(m_useLCcorrection == true && detId.subdetId() != 3) {
-     auto cache = m_laserCalibCache.find(detId);
-     if( cache != m_laserCalibCache.end() ) {
-       lasercalib = cache->second;
-     } else {
-       lasercalib = 1.0/findLaserConstant(detId);
-       m_laserCalibCache.emplace(detId,lasercalib);
-     }
-   }
-
-   double npe ( energy*lasercalib*parameters.simHitToPhotoelectrons( detId ) ) ;
-
-   // do we need to doPoisson statistics for the photoelectrons?
-   if( parameters.doPhotostatistics() ) {
-     npe = CLHEP::RandPoissonQ::shoot(engine, npe);
-   }
-   if( nullptr != m_PECorrection ) npe = m_PECorrection->correctPE( detId, npe, engine ) ;
-
-   return npe ;
-}
+double EcalHitResponse::analogSignalAmplitude(const DetId& detId, double energy, CLHEP::HepRandomEngine* engine) {
+  const CaloSimParameters& parameters(*params(detId));
 
-double 
-EcalHitResponse::timeOfFlight( const DetId& detId ) const 
-{
-  auto cellGeometry ( geometry()->getGeometry( detId ) ) ;
-  assert( nullptr != cellGeometry ) ;
-  return cellGeometry->getPosition().mag()*cm/c_light ; // Units of c_light: mm/ns
-}
+  // OK, the "energy" in the hit could be a real energy, deposited energy,
+  // or pe count.  This factor converts to photoelectrons
 
-void 
-EcalHitResponse::add( const EcalSamples* pSam )
-{
-   EcalSamples& sam ( *findSignal( pSam->id() ) ) ;
-   sam += (*pSam) ;
-}
+  double lasercalib = 1.;
+  if (m_useLCcorrection == true && detId.subdetId() != 3) {
+    auto cache = m_laserCalibCache.find(detId);
+    if (cache != m_laserCalibCache.end()) {
+      lasercalib = cache->second;
+    } else {
+      lasercalib = 1.0 / findLaserConstant(detId);
+      m_laserCalibCache.emplace(detId, lasercalib);
+    }
+  }
 
-int 
-EcalHitResponse::minBunch() const 
-{
-   return m_minBunch ; 
-}
+  double npe(energy * lasercalib * parameters.simHitToPhotoelectrons(detId));
 
-int 
-EcalHitResponse::maxBunch() const 
-{
-   return m_maxBunch ; 
-}
+  // do we need to doPoisson statistics for the photoelectrons?
+  if (parameters.doPhotostatistics()) {
+    npe = CLHEP::RandPoissonQ::shoot(engine, npe);
+  }
+  if (nullptr != m_PECorrection)
+    npe = m_PECorrection->correctPE(detId, npe, engine);
 
-EcalHitResponse::VecInd& 
-EcalHitResponse::index() 
-{
-   return m_index ; 
+  return npe;
 }
 
-const EcalHitResponse::VecInd& 
-EcalHitResponse::index() const
-{
-   return m_index ; 
+double EcalHitResponse::timeOfFlight(const DetId& detId) const {
+  auto cellGeometry(geometry()->getGeometry(detId));
+  assert(nullptr != cellGeometry);
+  return cellGeometry->getPosition().mag() * cm / c_light;  // Units of c_light: mm/ns
 }
 
-const CaloVHitFilter* 
-EcalHitResponse::hitFilter() const 
-{ 
-   return m_hitFilter ; 
+void EcalHitResponse::add(const EcalSamples* pSam) {
+  EcalSamples& sam(*findSignal(pSam->id()));
+  sam += (*pSam);
 }
 
-const EcalHitResponse::EcalSamples* 
-EcalHitResponse::findDetId( const DetId& detId ) const
-{
-   const unsigned int di ( CaloGenericDetId( detId ).denseIndex() ) ;
-   return vSamAll( di ) ;
+int EcalHitResponse::minBunch() const { return m_minBunch; }
+
+int EcalHitResponse::maxBunch() const { return m_maxBunch; }
+
+EcalHitResponse::VecInd& EcalHitResponse::index() { return m_index; }
+
+const EcalHitResponse::VecInd& EcalHitResponse::index() const { return m_index; }
+
+const CaloVHitFilter* EcalHitResponse::hitFilter() const { return m_hitFilter; }
+
+const EcalHitResponse::EcalSamples* EcalHitResponse::findDetId(const DetId& detId) const {
+  const unsigned int di(CaloGenericDetId(detId).denseIndex());
+  return vSamAll(di);
 }
diff --git a/SimCalorimetry/EcalSimAlgos/src/EcalShapeBase.cc b/SimCalorimetry/EcalSimAlgos/src/EcalShapeBase.cc
index bf5274ac9dd66..b608d388b0b09 100644
--- a/SimCalorimetry/EcalSimAlgos/src/EcalShapeBase.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/EcalShapeBase.cc
@@ -6,160 +6,123 @@
 
 #include <iostream>
 
-EcalShapeBase::~EcalShapeBase()
-{
-}
+EcalShapeBase::~EcalShapeBase() {}
 
-EcalShapeBase::EcalShapeBase(bool useDBShape) :
-   m_useDBShape              (useDBShape),
-   m_firstIndexOverThreshold ( 0   ) ,
-   m_firstTimeOverThreshold  ( 0.0 ) ,
-   m_indexOfMax              ( 0   ) ,
-   m_timeOfMax               ( 0.0 ) , 
-   m_thresh                  ( 0.0 )
-{
-}
+EcalShapeBase::EcalShapeBase(bool useDBShape)
+    : m_useDBShape(useDBShape),
+      m_firstIndexOverThreshold(0),
+      m_firstTimeOverThreshold(0.0),
+      m_indexOfMax(0),
+      m_timeOfMax(0.0),
+      m_thresh(0.0) {}
 
-void EcalShapeBase::setEventSetup( const edm::EventSetup & evtSetup ){ buildMe( &evtSetup );} 
+void EcalShapeBase::setEventSetup(const edm::EventSetup& evtSetup) { buildMe(&evtSetup); }
 
+double EcalShapeBase::timeOfThr() const { return m_firstTimeOverThreshold; }
 
-double 
-EcalShapeBase::timeOfThr()  const 
-{
-   return m_firstTimeOverThreshold ;
- }
+double EcalShapeBase::timeOfMax() const { return m_timeOfMax; }
 
-double 
-EcalShapeBase::timeOfMax()  const 
-{
-   return m_timeOfMax              ; 
-}
+double EcalShapeBase::timeToRise() const { return timeOfMax() - timeOfThr(); }
 
-double 
-EcalShapeBase::timeToRise() const 
-{
-   return timeOfMax() - timeOfThr() ;
-}
+double EcalShapeBase::threshold() const { return m_thresh; }
 
+void EcalShapeBase::buildMe(const edm::EventSetup* evtSetup) {
+  DVec shapeArray;
 
-double 
-EcalShapeBase::threshold()  const 
-{
-   return m_thresh; 
-}
+  float time_interval = 0;
+  fillShape(time_interval,
+            m_thresh,
+            shapeArray,
+            evtSetup);              // pure virtual function, implementation may vary for EB/EE/APD ...
+  m_arraySize = shapeArray.size();  // original data
+
+  m_denseArraySize = 10 * m_arraySize;  // dense array with interpolation between data
+  m_kNBinsPerNSec =
+      (unsigned int)(10 /
+                     time_interval);  // used to be an unsigned int = 10 in  < CMSSW10X, should work for time intervals ~0.1, 0.2, 0.5, 1
+  m_qNSecPerBin = time_interval / 10.;
+
+  m_deriv.resize(m_denseArraySize);
+  m_shape.resize(m_denseArraySize);
+
+  const double maxel(*max_element(shapeArray.begin(), shapeArray.end()));
+
+  const double maxelt(1.e-5 < maxel ? maxel : 1);
 
+  for (unsigned int i(0); i != shapeArray.size(); ++i) {
+    shapeArray[i] = shapeArray[i] / maxelt;
+  }
 
-void
-EcalShapeBase::buildMe(const edm::EventSetup* evtSetup )
-{
-   DVec shapeArray;
-
-   float time_interval = 0;
-   fillShape(time_interval, m_thresh, shapeArray, evtSetup) ; // pure virtual function, implementation may vary for EB/EE/APD ...
-   m_arraySize = shapeArray.size();  // original data
-  
-   m_denseArraySize    = 10*m_arraySize; // dense array with interpolation between data 
-   m_kNBinsPerNSec     = (unsigned int) (10/time_interval); // used to be an unsigned int = 10 in  < CMSSW10X, should work for time intervals ~0.1, 0.2, 0.5, 1
-   m_qNSecPerBin = time_interval/10.; 
-
-   m_deriv.resize(m_denseArraySize);
-   m_shape.resize(m_denseArraySize);
-
-   const double maxel ( *max_element( shapeArray.begin(), shapeArray.end() ) ) ;
-
-   const double maxelt ( 1.e-5 < maxel ? maxel : 1 ) ;
-
-   for( unsigned int i ( 0 ) ; i != shapeArray.size(); ++i )
-   {
-      shapeArray[i] = shapeArray[i]/maxelt ;
-   } 
-
-   const double thresh ( threshold()/maxelt ) ;
-
-   
-
-   const double delta ( m_qNSecPerBin/2. ) ; 
-
-   for( unsigned int denseIndex ( 0 ) ; denseIndex != m_denseArraySize ; ++denseIndex )
-   {
-      const double xb ( ( denseIndex + 0.5 )*m_qNSecPerBin ) ; 
-
-      const unsigned int ibin ( denseIndex/10 ) ; 
-
-      double value = 0.0 ;
-      double deriv = 0.0 ;
-
-      if( 0                 ==     ibin ||
-	  shapeArray.size() == 1 + ibin    ) // cannot do quadratic interpolation at ends
-      {
-	 value = shapeArray[ibin]; 
-	 deriv = 0.0 ;
-      }
-      else 
-      {
-	 const double x  ( xb - ( ibin + 0.5 )*time_interval ) ;
-	 const double f1 ( shapeArray[ ibin - 1 ] ) ;
-	 const double f2 ( shapeArray[ ibin     ] ) ;
-	 const double f3 ( shapeArray[ ibin + 1 ] ) ;
-	 const double a  ( f2 ) ;
-	 const double b  ( ( f3 - f1 )/(2.*time_interval) ) ;
-	 const double c  ( (( f1 + f3 )/2. - f2 )/(time_interval*time_interval) );
-	 value = a + b*x + c*x*x;
-	 deriv = ( b + 2*c*x )/delta ;
-      }
-
-      m_shape[ denseIndex ] = value;
-      m_deriv[ denseIndex ] = deriv;
-
-      if( 0      <  denseIndex                         &&
-	  thresh <  value                     &&
-	  0      == m_firstIndexOverThreshold     )
-      {
-	 m_firstIndexOverThreshold = denseIndex - 1 ;
-	 m_firstTimeOverThreshold  = m_firstIndexOverThreshold*m_qNSecPerBin ;
-      }
-
-      if( m_shape[ m_indexOfMax ] < value )
-      {
-	 m_indexOfMax = denseIndex ;
-      }
-
-   }
-   m_timeOfMax = m_indexOfMax*m_qNSecPerBin ;
+  const double thresh(threshold() / maxelt);
 
+  const double delta(m_qNSecPerBin / 2.);
+
+  for (unsigned int denseIndex(0); denseIndex != m_denseArraySize; ++denseIndex) {
+    const double xb((denseIndex + 0.5) * m_qNSecPerBin);
+
+    const unsigned int ibin(denseIndex / 10);
+
+    double value = 0.0;
+    double deriv = 0.0;
+
+    if (0 == ibin || shapeArray.size() == 1 + ibin)  // cannot do quadratic interpolation at ends
+    {
+      value = shapeArray[ibin];
+      deriv = 0.0;
+    } else {
+      const double x(xb - (ibin + 0.5) * time_interval);
+      const double f1(shapeArray[ibin - 1]);
+      const double f2(shapeArray[ibin]);
+      const double f3(shapeArray[ibin + 1]);
+      const double a(f2);
+      const double b((f3 - f1) / (2. * time_interval));
+      const double c(((f1 + f3) / 2. - f2) / (time_interval * time_interval));
+      value = a + b * x + c * x * x;
+      deriv = (b + 2 * c * x) / delta;
+    }
+
+    m_shape[denseIndex] = value;
+    m_deriv[denseIndex] = deriv;
+
+    if (0 < denseIndex && thresh < value && 0 == m_firstIndexOverThreshold) {
+      m_firstIndexOverThreshold = denseIndex - 1;
+      m_firstTimeOverThreshold = m_firstIndexOverThreshold * m_qNSecPerBin;
+    }
+
+    if (m_shape[m_indexOfMax] < value) {
+      m_indexOfMax = denseIndex;
+    }
+  }
+  m_timeOfMax = m_indexOfMax * m_qNSecPerBin;
 }
 
-unsigned int
-EcalShapeBase::timeIndex( double aTime ) const
-{
-   const int index ( m_firstIndexOverThreshold +
-		     (unsigned int) ( aTime*m_kNBinsPerNSec + 0.5 ) ) ;
+unsigned int EcalShapeBase::timeIndex(double aTime) const {
+  const int index(m_firstIndexOverThreshold + (unsigned int)(aTime * m_kNBinsPerNSec + 0.5));
 
-   const bool bad ( (int) m_firstIndexOverThreshold >  index || 
-		    (int) m_denseArraySize              <= index    ) ;
+  const bool bad((int)m_firstIndexOverThreshold > index || (int)m_denseArraySize <= index);
 
-   if(		    (int) m_denseArraySize              <= index    )
-   {
-      LogDebug("EcalShapeBase") << " ECAL MGPA shape requested for out of range time " << aTime ;
-   }
-   return ( bad ? m_denseArraySize : (unsigned int) index ) ;
+  if ((int)m_denseArraySize <= index) {
+    LogDebug("EcalShapeBase") << " ECAL MGPA shape requested for out of range time " << aTime;
+  }
+  return (bad ? m_denseArraySize : (unsigned int)index);
 }
 
-double 
-EcalShapeBase::operator() ( double aTime ) const
-{
-   // return pulse amplitude for request time in ns
+double EcalShapeBase::operator()(double aTime) const {
+  // return pulse amplitude for request time in ns
 
-   const unsigned int index ( timeIndex( aTime ) ) ;
-   return ( m_denseArraySize == index ? 0 : m_shape[ index ] ) ;
+  const unsigned int index(timeIndex(aTime));
+  return (m_denseArraySize == index ? 0 : m_shape[index]);
 }
 
-double 
-EcalShapeBase::derivative( double aTime ) const
-{
-   const unsigned int index ( timeIndex( aTime ) ) ;
-   return ( m_denseArraySize == index         ? 0 : m_deriv[ index ] ) ;
+double EcalShapeBase::derivative(double aTime) const {
+  const unsigned int index(timeIndex(aTime));
+  return (m_denseArraySize == index ? 0 : m_deriv[index]);
 }
 
-void 
-EcalShapeBase::m_shape_print(const char *fileName){std::ofstream fs; fs.open(fileName); for (auto i:m_shape) fs << "vec.push_back(" << i << ");\n"; fs.close();}
+void EcalShapeBase::m_shape_print(const char* fileName) {
+  std::ofstream fs;
+  fs.open(fileName);
+  for (auto i : m_shape)
+    fs << "vec.push_back(" << i << ");\n";
+  fs.close();
+}
diff --git a/SimCalorimetry/EcalSimAlgos/src/EcalSignalGenerator.cc b/SimCalorimetry/EcalSimAlgos/src/EcalSignalGenerator.cc
index d695885d9e8f4..66f40e8aba7d4 100644
--- a/SimCalorimetry/EcalSimAlgos/src/EcalSignalGenerator.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/EcalSignalGenerator.cc
@@ -1,186 +1,176 @@
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalSignalGenerator.h"
 
+template <>
+CaloSamples EcalSignalGenerator<EBDigitizerTraits>::samplesInPE(const DIGI &digi) {
+  // calibration, for future reference:  (same block for all Ecal types)
+  //EcalDetId cell = digi.id();
+  //         const EcalCalibrations& calibrations=conditions->getEcalCalibrations(cell);
+  //const EcalQIECoder* channelCoder = theConditions->getEcalCoder (cell);
+  //const EcalQIEShape* channelShape = theConditions->getEcalShape (cell);
+  //EcalCoderDb coder (*channelCoder, *channelShape);
+  //CaloSamples result;
+  //coder.adc2fC(digi, result);
+  //fC2pe(result);
+
+  DetId detId = digi.id();
+
+  double Emax = fullScaleEnergy(detId);
+  double LSB[NGAINS + 1];
+
+  //double icalconst = findIntercalibConstant( detId );
+
+  double icalconst = 1.;  // find the correct value.
+
+  const EcalIntercalibConstantMCMap &icalMap = ical->getMap();
+  EcalIntercalibConstantMCMap::const_iterator icalit = icalMap.find(detId);
+  if (icalit != icalMap.end()) {
+    icalconst = (*icalit);
+  }
 
-  template <>
-  CaloSamples EcalSignalGenerator<EBDigitizerTraits>::samplesInPE(const DIGI & digi)
-  {
-    // calibration, for future reference:  (same block for all Ecal types)
-    //EcalDetId cell = digi.id();
-    //         const EcalCalibrations& calibrations=conditions->getEcalCalibrations(cell);
-    //const EcalQIECoder* channelCoder = theConditions->getEcalCoder (cell);
-    //const EcalQIEShape* channelShape = theConditions->getEcalShape (cell);
-    //EcalCoderDb coder (*channelCoder, *channelShape);
-    //CaloSamples result;
-    //coder.adc2fC(digi, result);
-    //fC2pe(result);
-
-    DetId detId = digi.id();
-
-    double Emax = fullScaleEnergy(detId); 
-    double LSB[NGAINS+1]; 
-
-    //double icalconst = findIntercalibConstant( detId );
-
-    double icalconst = 1.;  // find the correct value.
-
-    const EcalIntercalibConstantMCMap &icalMap = ical->getMap();
-    EcalIntercalibConstantMCMap::const_iterator icalit = icalMap.find(detId);
-    if( icalit!=icalMap.end() )
-    {
-        icalconst = (*icalit);
-    }
-
-    double peToA = peToAConversion ( detId ) ;
-
-    const std::vector<float> gainRatios = GetGainRatios(detId);
-
-    for( unsigned int igain ( 0 ); igain <= NGAINS ; ++igain ) 
-      {
-	LSB[igain] = 0.;
-	if ( igain > 0 ) LSB[igain]= Emax/(MAXADC*gainRatios[igain]);
-      }
+  double peToA = peToAConversion(detId);
 
-    //    std::cout << " intercal, LSBs, egains " << icalconst << " " << LSB[0] << " " << LSB[1] << " " << gainRatios[0] << " " << gainRatios[1] << " " << Emax << std::endl;
+  const std::vector<float> gainRatios = GetGainRatios(detId);
 
-    CaloSamples result(detId, digi.size());
+  for (unsigned int igain(0); igain <= NGAINS; ++igain) {
+    LSB[igain] = 0.;
+    if (igain > 0)
+      LSB[igain] = Emax / (MAXADC * gainRatios[igain]);
+  }
 
-    for(int isample = 0; isample<digi.size(); ++isample){
+  //    std::cout << " intercal, LSBs, egains " << icalconst << " " << LSB[0] << " " << LSB[1] << " " << gainRatios[0] << " " << gainRatios[1] << " " << Emax << std::endl;
 
-      int gainId = digi[isample].gainId();
-      //int gainId = 1;
+  CaloSamples result(detId, digi.size());
 
-      if(gainId == 1) {
-        result[isample] = float(digi[isample].adc())/1000./peToA; // special coding                   
-      }
-      else if(gainId > 1) {
-        result[isample] = float(digi[isample].adc())*LSB[gainId-1]*icalconst/peToA;
-      }  // gain = 0                                                                                  
-      else { result[isample] = float(digi[isample].adc())*LSB[gainId]*icalconst/peToA;}
+  for (int isample = 0; isample < digi.size(); ++isample) {
+    int gainId = digi[isample].gainId();
+    //int gainId = 1;
 
-      // old version:
-      //result[isample] = float(digi[isample].adc())*LSB[gainId]*icalconst/peToA;
+    if (gainId == 1) {
+      result[isample] = float(digi[isample].adc()) / 1000. / peToA;  // special coding
+    } else if (gainId > 1) {
+      result[isample] = float(digi[isample].adc()) * LSB[gainId - 1] * icalconst / peToA;
+    }  // gain = 0
+    else {
+      result[isample] = float(digi[isample].adc()) * LSB[gainId] * icalconst / peToA;
     }
 
-    //std::cout << " EcalSignalGenerator:EB noise input " << digi << std::endl;
-
-    //std::cout << " converted noise sample " << std::endl;
-    //for(int isample = 0; isample<digi.size(); ++isample){
-    //  std::cout << " " << result[isample] ;
-    //}
-    //std::cout << std::endl;
-
-    return result;
+    // old version:
+    //result[isample] = float(digi[isample].adc())*LSB[gainId]*icalconst/peToA;
   }
 
+  //std::cout << " EcalSignalGenerator:EB noise input " << digi << std::endl;
 
-  template <>
-  CaloSamples EcalSignalGenerator<EEDigitizerTraits>::samplesInPE(const DIGI & digi)
-  {
-    // calibration, for future reference:  (same block for all Ecal types)
-    //EcalDetId cell = digi.id();
-    //         const EcalCalibrations& calibrations=conditions->getEcalCalibrations(cell);
-    //const EcalQIECoder* channelCoder = theConditions->getEcalCoder (cell);
-    //const EcalQIEShape* channelShape = theConditions->getEcalShape (cell);
-    //EcalCoderDb coder (*channelCoder, *channelShape);
-    //CaloSamples result;
-    //coder.adc2fC(digi, result);
-    //fC2pe(result);
+  //std::cout << " converted noise sample " << std::endl;
+  //for(int isample = 0; isample<digi.size(); ++isample){
+  //  std::cout << " " << result[isample] ;
+  //}
+  //std::cout << std::endl;
 
-    DetId detId = digi.id();
+  return result;
+}
 
-    double Emax = fullScaleEnergy(detId); 
-    double LSB[NGAINS+1]; 
+template <>
+CaloSamples EcalSignalGenerator<EEDigitizerTraits>::samplesInPE(const DIGI &digi) {
+  // calibration, for future reference:  (same block for all Ecal types)
+  //EcalDetId cell = digi.id();
+  //         const EcalCalibrations& calibrations=conditions->getEcalCalibrations(cell);
+  //const EcalQIECoder* channelCoder = theConditions->getEcalCoder (cell);
+  //const EcalQIEShape* channelShape = theConditions->getEcalShape (cell);
+  //EcalCoderDb coder (*channelCoder, *channelShape);
+  //CaloSamples result;
+  //coder.adc2fC(digi, result);
+  //fC2pe(result);
 
-    double icalconst = 1.; //findIntercalibConstant( detId );
+  DetId detId = digi.id();
 
-    const EcalIntercalibConstantMCMap &icalMap = ical->getMap();
-    EcalIntercalibConstantMCMap::const_iterator icalit = icalMap.find(detId);
-    if( icalit!=icalMap.end() )
-    {
-        icalconst = (*icalit);
-    }
+  double Emax = fullScaleEnergy(detId);
+  double LSB[NGAINS + 1];
 
+  double icalconst = 1.;  //findIntercalibConstant( detId );
 
-    double peToA = peToAConversion ( detId ) ;
-
-    const std::vector<float> gainRatios = GetGainRatios(detId);
+  const EcalIntercalibConstantMCMap &icalMap = ical->getMap();
+  EcalIntercalibConstantMCMap::const_iterator icalit = icalMap.find(detId);
+  if (icalit != icalMap.end()) {
+    icalconst = (*icalit);
+  }
 
-    for( unsigned int igain ( 0 ); igain <= NGAINS ; ++igain ) 
-      {
-	LSB[igain] = 0.;
-	if ( igain > 0 ) LSB[igain]= Emax/(MAXADC*gainRatios[igain]);
-      }
+  double peToA = peToAConversion(detId);
 
-    //    std::cout << " intercal, LSBs, egains " << icalconst << " " << LSB[0] << " " << LSB[1] << " " << gainRatios[0] << " " << gainRatios[1] << " " << Emax << std::endl;
+  const std::vector<float> gainRatios = GetGainRatios(detId);
 
-    CaloSamples result(detId, digi.size());
+  for (unsigned int igain(0); igain <= NGAINS; ++igain) {
+    LSB[igain] = 0.;
+    if (igain > 0)
+      LSB[igain] = Emax / (MAXADC * gainRatios[igain]);
+  }
 
-    for(int isample = 0; isample<digi.size(); ++isample){
+  //    std::cout << " intercal, LSBs, egains " << icalconst << " " << LSB[0] << " " << LSB[1] << " " << gainRatios[0] << " " << gainRatios[1] << " " << Emax << std::endl;
 
-      int gainId = digi[isample].gainId();
-      //int gainId = 1;
+  CaloSamples result(detId, digi.size());
 
-      if(gainId == 1) {
-        result[isample] = float(digi[isample].adc())/1000./peToA; // special coding                   
-      }
-      else if(gainId > 1) {
-        result[isample] = float(digi[isample].adc())*LSB[gainId-1]*icalconst/peToA;
-      }  // gain = 0                                                                                  
-      else { result[isample] = float(digi[isample].adc())*LSB[gainId]*icalconst/peToA;}
+  for (int isample = 0; isample < digi.size(); ++isample) {
+    int gainId = digi[isample].gainId();
+    //int gainId = 1;
 
-      // old version
-      //result[isample] = float(digi[isample].adc())*LSB[gainId]*icalconst/peToA;
+    if (gainId == 1) {
+      result[isample] = float(digi[isample].adc()) / 1000. / peToA;  // special coding
+    } else if (gainId > 1) {
+      result[isample] = float(digi[isample].adc()) * LSB[gainId - 1] * icalconst / peToA;
+    }  // gain = 0
+    else {
+      result[isample] = float(digi[isample].adc()) * LSB[gainId] * icalconst / peToA;
     }
 
-    //std::cout << " EcalSignalGenerator:EE noise input " << digi << std::endl;
-
-    //std::cout << " converted noise sample " << std::endl;
-    //for(int isample = 0; isample<digi.size(); ++isample){
-    //  std::cout << " " << result[isample] ;
-    // }
-    //std::cout << std::endl;
+    // old version
+    //result[isample] = float(digi[isample].adc())*LSB[gainId]*icalconst/peToA;
+  }
 
-    return result;
+  //std::cout << " EcalSignalGenerator:EE noise input " << digi << std::endl;
+
+  //std::cout << " converted noise sample " << std::endl;
+  //for(int isample = 0; isample<digi.size(); ++isample){
+  //  std::cout << " " << result[isample] ;
+  // }
+  //std::cout << std::endl;
+
+  return result;
+}
+
+template <>
+CaloSamples EcalSignalGenerator<ESDigitizerTraits>::samplesInPE(const DIGI &digi) {
+  // calibration, for future reference:  (same block for all Ecal types)
+  //EcalDetId cell = digi.id();
+  //         const EcalCalibrations& calibrations=conditions->getEcalCalibrations(cell);
+  //const EcalQIECoder* channelCoder = theConditions->getEcalCoder (cell);
+  //const EcalQIEShape* channelShape = theConditions->getEcalShape (cell);
+  //EcalCoderDb coder (*channelCoder, *channelShape);
+  //CaloSamples result;
+  //coder.adc2fC(digi, result);
+  //fC2pe(result);
+
+  DetId detId = digi.id();
+
+  double icalconst = 1.;  //findIntercalibConstant( detId );
+
+  const ESIntercalibConstantMap &icalMap = esmips->getMap();
+  ESIntercalibConstantMap::const_iterator icalit = icalMap.find(detId);
+  if (icalit != icalMap.end()) {
+    icalconst = double(*icalit);
   }
 
-  template <>
-  CaloSamples EcalSignalGenerator<ESDigitizerTraits>::samplesInPE(const DIGI & digi)
-  {
-    // calibration, for future reference:  (same block for all Ecal types)
-    //EcalDetId cell = digi.id();
-    //         const EcalCalibrations& calibrations=conditions->getEcalCalibrations(cell);
-    //const EcalQIECoder* channelCoder = theConditions->getEcalCoder (cell);
-    //const EcalQIEShape* channelShape = theConditions->getEcalShape (cell);
-    //EcalCoderDb coder (*channelCoder, *channelShape);
-    //CaloSamples result;
-    //coder.adc2fC(digi, result);
-    //fC2pe(result);
-
-    DetId detId = digi.id();
-
-    double icalconst = 1.; //findIntercalibConstant( detId );
-
-    const ESIntercalibConstantMap &icalMap = esmips->getMap();
-    ESIntercalibConstantMap::const_iterator icalit = icalMap.find(detId);
-    if( icalit!=icalMap.end() )
-      {
-	icalconst = double (*icalit);
-      }
-
-    CaloSamples result(detId, digi.size());
-
-    for(int isample = 0; isample<digi.size(); ++isample){
-      result[isample] = float(digi[isample].adc())/icalconst*ESMIPToGeV;
-    }
+  CaloSamples result(detId, digi.size());
 
-    //std::cout << " EcalSignalGenerator:ES noise input " << digi << std::endl;
+  for (int isample = 0; isample < digi.size(); ++isample) {
+    result[isample] = float(digi[isample].adc()) / icalconst * ESMIPToGeV;
+  }
 
-    //std::cout << " converted noise sample " << std::endl;
-    //for(int isample = 0; isample<digi.size(); ++isample){
-    //  std::cout << " " << result[isample] ;
-    //}
-    //std::cout << std::endl;
+  //std::cout << " EcalSignalGenerator:ES noise input " << digi << std::endl;
 
-    return result;
-  }
+  //std::cout << " converted noise sample " << std::endl;
+  //for(int isample = 0; isample<digi.size(); ++isample){
+  //  std::cout << " " << result[isample] ;
+  //}
+  //std::cout << std::endl;
 
+  return result;
+}
diff --git a/SimCalorimetry/EcalSimAlgos/src/EcalSimParameterMap.cc b/SimCalorimetry/EcalSimAlgos/src/EcalSimParameterMap.cc
index 22b1285a0e087..22d200c3d44e5 100644
--- a/SimCalorimetry/EcalSimAlgos/src/EcalSimParameterMap.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/EcalSimParameterMap.cc
@@ -2,53 +2,58 @@
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 #include <iostream>
-  
+
 /** Relevant constants are:
   4.5 photoelectrons per MeV (J. Nash's slides)
   APD gain 50, but analog signal stays in GeV
   Account for excess noise factor
  */
- 
-EcalSimParameterMap::EcalSimParameterMap() :
-  theBarrelParameters(2250., 1./2250., 
-                   1., 0, 
-                   10, 6, true, true),
-  theEndcapParameters( 1800., 1./1800., 
-                   1., 0, 
-        	       10, 6, true, true),
-  theESParameters(1., 1., 1., 20., 3, 2, false, true)
-{}
 
-EcalSimParameterMap::EcalSimParameterMap(double simHitToPhotoelectronsBarrel, 
-                                         double simHitToPhotoelectronsEndcap, 
-                                         double photoelectronsToAnalogBarrel, 
-                                         double photoelectronsToAnalogEndcap, 
-                                         double samplingFactor, double timePhase,
-                                         int readoutFrameSize, int binOfMaximum,
-                                         bool doPhotostatistics, bool syncPhase) : 
-  theBarrelParameters(simHitToPhotoelectronsBarrel, photoelectronsToAnalogBarrel,
-                      samplingFactor, timePhase, 
-                      readoutFrameSize, binOfMaximum, doPhotostatistics, syncPhase),
-  theEndcapParameters(simHitToPhotoelectronsEndcap, photoelectronsToAnalogEndcap, 
-                      samplingFactor, timePhase, 
-                      readoutFrameSize, binOfMaximum, doPhotostatistics, syncPhase),
-  theESParameters(1., 1., 1., 20., 3, 2, false, syncPhase)
-{}
+EcalSimParameterMap::EcalSimParameterMap()
+    : theBarrelParameters(2250., 1. / 2250., 1., 0, 10, 6, true, true),
+      theEndcapParameters(1800., 1. / 1800., 1., 0, 10, 6, true, true),
+      theESParameters(1., 1., 1., 20., 3, 2, false, true) {}
+
+EcalSimParameterMap::EcalSimParameterMap(double simHitToPhotoelectronsBarrel,
+                                         double simHitToPhotoelectronsEndcap,
+                                         double photoelectronsToAnalogBarrel,
+                                         double photoelectronsToAnalogEndcap,
+                                         double samplingFactor,
+                                         double timePhase,
+                                         int readoutFrameSize,
+                                         int binOfMaximum,
+                                         bool doPhotostatistics,
+                                         bool syncPhase)
+    : theBarrelParameters(simHitToPhotoelectronsBarrel,
+                          photoelectronsToAnalogBarrel,
+                          samplingFactor,
+                          timePhase,
+                          readoutFrameSize,
+                          binOfMaximum,
+                          doPhotostatistics,
+                          syncPhase),
+      theEndcapParameters(simHitToPhotoelectronsEndcap,
+                          photoelectronsToAnalogEndcap,
+                          samplingFactor,
+                          timePhase,
+                          readoutFrameSize,
+                          binOfMaximum,
+                          doPhotostatistics,
+                          syncPhase),
+      theESParameters(1., 1., 1., 20., 3, 2, false, syncPhase) {}
 
-  /*
+/*
   CaloSimParameters(double simHitToPhotoelectrons, double photoelectronsToAnalog, 
                  double samplingFactor, double timePhase,
                  int readoutFrameSize, int binOfMaximum,
                  bool doPhotostatistics, bool syncPhase)
   */
-  
-const CaloSimParameters & EcalSimParameterMap::simParameters(const DetId & detId) const 
-{
-  if (EcalSubdetector(detId.subdetId()) == EcalBarrel) 
+
+const CaloSimParameters& EcalSimParameterMap::simParameters(const DetId& detId) const {
+  if (EcalSubdetector(detId.subdetId()) == EcalBarrel)
     return theBarrelParameters;
   else if (EcalSubdetector(detId.subdetId()) == EcalEndcap)
     return theEndcapParameters;
-  else 
+  else
     return theESParameters;
 }
-
diff --git a/SimCalorimetry/EcalSimAlgos/src/EcalTimeMapDigitizer.cc b/SimCalorimetry/EcalSimAlgos/src/EcalTimeMapDigitizer.cc
index 9e5cc9f63ad37..bfdbb01bd7e89 100644
--- a/SimCalorimetry/EcalSimAlgos/src/EcalTimeMapDigitizer.cc
+++ b/SimCalorimetry/EcalSimAlgos/src/EcalTimeMapDigitizer.cc
@@ -1,4 +1,4 @@
-#include "SimCalorimetry/EcalSimAlgos/interface/EcalTimeMapDigitizer.h" 
+#include "SimCalorimetry/EcalSimAlgos/interface/EcalTimeMapDigitizer.h"
 
 #include "Geometry/CaloGeometry/interface/CaloGenericDetId.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
@@ -16,186 +16,156 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h" 
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 
 #include <iostream>
 
 //#define ecal_time_debug 1
 
-const float EcalTimeMapDigitizer::MIN_ENERGY_THRESHOLD=5e-5; //50 KeV threshold to consider a valid hit in the timing detector
-
-EcalTimeMapDigitizer::EcalTimeMapDigitizer(EcalSubdetector myDet):
-  m_subDet(myDet),
-  m_geometry(nullptr)
-{
-//    edm::Service<edm::RandomNumberGenerator> rng ;
-//    if ( !rng.isAvailable() ) 
-//    {
-//       throw cms::Exception("Configuration")
-// 	 << "EcalTimeMapDigitizer requires the RandomNumberGeneratorService\n"
-// 	 "which is not present in the configuration file.  You must add the service\n"
-// 	 "in the configuration file or remove the modules that require it.";
-//    }
-//    m_RandPoisson = new CLHEP::RandPoissonQ( rng->getEngine() ) ;
-//    m_RandGauss   = new CLHEP::RandGaussQ(   rng->getEngine() ) ;
-
-  unsigned int size=0;
+const float EcalTimeMapDigitizer::MIN_ENERGY_THRESHOLD =
+    5e-5;  //50 KeV threshold to consider a valid hit in the timing detector
+
+EcalTimeMapDigitizer::EcalTimeMapDigitizer(EcalSubdetector myDet) : m_subDet(myDet), m_geometry(nullptr) {
+  //    edm::Service<edm::RandomNumberGenerator> rng ;
+  //    if ( !rng.isAvailable() )
+  //    {
+  //       throw cms::Exception("Configuration")
+  // 	 << "EcalTimeMapDigitizer requires the RandomNumberGeneratorService\n"
+  // 	 "which is not present in the configuration file.  You must add the service\n"
+  // 	 "in the configuration file or remove the modules that require it.";
+  //    }
+  //    m_RandPoisson = new CLHEP::RandPoissonQ( rng->getEngine() ) ;
+  //    m_RandGauss   = new CLHEP::RandGaussQ(   rng->getEngine() ) ;
+
+  unsigned int size = 0;
   DetId detId(0);
 
   //Initialize the map
-  if (myDet==EcalBarrel)
-    {
-      size=EBDetId::kSizeForDenseIndexing;
-      detId=EBDetId::detIdFromDenseIndex( 0 ) ;
-    }
-  else if (myDet==EcalEndcap)
-    {
-      size=EEDetId::kSizeForDenseIndexing;
-      detId=EEDetId::detIdFromDenseIndex( 0 ) ;
-    }
-  else 
-    edm::LogError("TimeDigiError") << "[EcalTimeMapDigitizer]::ERROR::This subdetector " << myDet << " is not implemented";
-
-
-   assert(m_maxBunch-m_minBunch+1<=10);
-   assert(m_minBunch<=0);
-
-   m_vSam.reserve( size ) ;
-
-   for( unsigned int i ( 0 ) ; i != size ; ++i )
-   {
-     //       m_vSam.emplace_back(CaloGenericDetId( detId.det(), detId.subdetId(), i ) ,
-     // 			  m_maxBunch-m_minBunch+1, abs(m_minBunch) );
-     m_vSam.emplace_back(TimeSamples(CaloGenericDetId( detId.det(), detId.subdetId(), i )));
-   }
+  if (myDet == EcalBarrel) {
+    size = EBDetId::kSizeForDenseIndexing;
+    detId = EBDetId::detIdFromDenseIndex(0);
+  } else if (myDet == EcalEndcap) {
+    size = EEDetId::kSizeForDenseIndexing;
+    detId = EEDetId::detIdFromDenseIndex(0);
+  } else
+    edm::LogError("TimeDigiError") << "[EcalTimeMapDigitizer]::ERROR::This subdetector " << myDet
+                                   << " is not implemented";
+
+  assert(m_maxBunch - m_minBunch + 1 <= 10);
+  assert(m_minBunch <= 0);
+
+  m_vSam.reserve(size);
+
+  for (unsigned int i(0); i != size; ++i) {
+    //       m_vSam.emplace_back(CaloGenericDetId( detId.det(), detId.subdetId(), i ) ,
+    // 			  m_maxBunch-m_minBunch+1, abs(m_minBunch) );
+    m_vSam.emplace_back(TimeSamples(CaloGenericDetId(detId.det(), detId.subdetId(), i)));
+  }
 
-   
-   edm::LogInfo("TimeDigiInfo") << "[EcalTimeDigitizer]::Subdetector " << m_subDet << "::Reserved size for time digis " << m_vSam.size();
+  edm::LogInfo("TimeDigiInfo") << "[EcalTimeDigitizer]::Subdetector " << m_subDet << "::Reserved size for time digis "
+                               << m_vSam.size();
 
 #ifdef ecal_time_debug
-   std::cout  << "[EcalTimeDigitizer]::Subdetector " << m_subDet << "::Reserved size for time digis " << m_vSam.size() << std::endl;
+  std::cout << "[EcalTimeDigitizer]::Subdetector " << m_subDet << "::Reserved size for time digis " << m_vSam.size()
+            << std::endl;
 #endif
-   
 }
 
-EcalTimeMapDigitizer::~EcalTimeMapDigitizer()
-{
-}
+EcalTimeMapDigitizer::~EcalTimeMapDigitizer() {}
 
-void
-EcalTimeMapDigitizer::add(const std::vector<PCaloHit> & hits, int bunchCrossing) {
-  if(bunchCrossing>=m_minBunch && bunchCrossing<=m_maxBunch ) {
-
-    for(std::vector<PCaloHit>::const_iterator it = hits.begin(), itEnd = hits.end(); it != itEnd; ++it) {
+void EcalTimeMapDigitizer::add(const std::vector<PCaloHit>& hits, int bunchCrossing) {
+  if (bunchCrossing >= m_minBunch && bunchCrossing <= m_maxBunch) {
+    for (std::vector<PCaloHit>::const_iterator it = hits.begin(), itEnd = hits.end(); it != itEnd; ++it) {
       //here goes the map logic
 
-      if (edm::isNotFinite( (*it).time() ) )
-	continue;
+      if (edm::isNotFinite((*it).time()))
+        continue;
 
       //Just consider only the hits belonging to the specified time layer
-      int depth2 = (((*it).depth() >> PCaloHit::kEcalDepthOffset) & 
-		    PCaloHit::kEcalDepthMask);
-      
-      if (depth2 != m_timeLayerId) continue;
-
-      if ((*it).energy()<MIN_ENERGY_THRESHOLD) //apply a minimal cut on the hit energy
-	continue;
-      
-       const DetId detId ( (*it).id() ) ;
-    
-       double time = (*it).time();
-
-       //time of flight is not corrected here for the vertex position 
-       const double jitter ( time - timeOfFlight( detId, m_timeLayerId ) ) ;
-       
-       TimeSamples& result ( *findSignal( detId ) ) ;
-
-       //here fill the result for the given bunch crossing
-       result.average_time[bunchCrossing-m_minBunch]+=jitter*(*it).energy();
-       result.tot_energy[bunchCrossing-m_minBunch]+=(*it).energy();
-       result.nhits[bunchCrossing-m_minBunch]++;
+      int depth2 = (((*it).depth() >> PCaloHit::kEcalDepthOffset) & PCaloHit::kEcalDepthMask);
+
+      if (depth2 != m_timeLayerId)
+        continue;
+
+      if ((*it).energy() < MIN_ENERGY_THRESHOLD)  //apply a minimal cut on the hit energy
+        continue;
+
+      const DetId detId((*it).id());
+
+      double time = (*it).time();
+
+      //time of flight is not corrected here for the vertex position
+      const double jitter(time - timeOfFlight(detId, m_timeLayerId));
+
+      TimeSamples& result(*findSignal(detId));
+
+      //here fill the result for the given bunch crossing
+      result.average_time[bunchCrossing - m_minBunch] += jitter * (*it).energy();
+      result.tot_energy[bunchCrossing - m_minBunch] += (*it).energy();
+      result.nhits[bunchCrossing - m_minBunch]++;
 
 #ifdef ecal_time_debug
-       std::cout << (*it).id()  << "\t" << (*it).depth() << "\t" << jitter << "\t" <<  (*it).energy() << "\t" << result.average_time[bunchCrossing-m_minBunch] << "\t" << result.nhits[bunchCrossing-m_minBunch] << "\t" <<  timeOfFlight( detId, m_timeLayerId ) << std::endl;
+      std::cout << (*it).id() << "\t" << (*it).depth() << "\t" << jitter << "\t" << (*it).energy() << "\t"
+                << result.average_time[bunchCrossing - m_minBunch] << "\t" << result.nhits[bunchCrossing - m_minBunch]
+                << "\t" << timeOfFlight(detId, m_timeLayerId) << std::endl;
 #endif
     }
   }
 }
 
-
-EcalTimeMapDigitizer::TimeSamples* 
-EcalTimeMapDigitizer::findSignal( const DetId& detId )
-{
-   const unsigned int di ( CaloGenericDetId( detId ).denseIndex() ) ;
-   TimeSamples* result ( vSamAll( di ) ) ;
-   if( result->zero() ) m_index.push_back( di ) ;
-   return result ;
-}
-
-
-
-void 
-EcalTimeMapDigitizer::setGeometry( const CaloSubdetectorGeometry* geometry )
-{
-  m_geometry = geometry ;
+EcalTimeMapDigitizer::TimeSamples* EcalTimeMapDigitizer::findSignal(const DetId& detId) {
+  const unsigned int di(CaloGenericDetId(detId).denseIndex());
+  TimeSamples* result(vSamAll(di));
+  if (result->zero())
+    m_index.push_back(di);
+  return result;
 }
 
+void EcalTimeMapDigitizer::setGeometry(const CaloSubdetectorGeometry* geometry) { m_geometry = geometry; }
 
-void 
-EcalTimeMapDigitizer::blankOutUsedSamples()  // blank out previously used elements
+void EcalTimeMapDigitizer::blankOutUsedSamples()  // blank out previously used elements
 {
-   const unsigned int size ( m_index.size() ) ;
-
+  const unsigned int size(m_index.size());
 
-   for( unsigned int i ( 0 ) ; i != size ; ++i )
-   {
-#ifdef ecal_time_debug 
-     std::cout << "Zeroing " << m_index[i] << std::endl;
+  for (unsigned int i(0); i != size; ++i) {
+#ifdef ecal_time_debug
+    std::cout << "Zeroing " << m_index[i] << std::endl;
 #endif
-      vSamAll( m_index[i] )->setZero() ;
-   }
+    vSamAll(m_index[i])->setZero();
+  }
 
-   m_index.erase( m_index.begin() ,    // done and make ready to start over
-		  m_index.end()    ) ;
+  m_index.erase(m_index.begin(),  // done and make ready to start over
+                m_index.end());
 }
 
-
-void
-EcalTimeMapDigitizer::finalizeHits()
-{
+void EcalTimeMapDigitizer::finalizeHits() {
   //Getting the size from the actual hits
-   const unsigned int size ( m_index.size() ) ;
+  const unsigned int size(m_index.size());
 
-   //Here just averaging the MC truth
-   for( unsigned int i ( 0 ) ; i != size ; ++i )
-   {
-#ifdef ecal_time_debug 
-     std::cout << "Averaging " << m_index[i] << std::endl;
+  //Here just averaging the MC truth
+  for (unsigned int i(0); i != size; ++i) {
+#ifdef ecal_time_debug
+    std::cout << "Averaging " << m_index[i] << std::endl;
 #endif
-      vSamAll( m_index[i] )->calculateAverage() ;
-#ifdef ecal_time_debug 
-      for ( unsigned int j ( 0 ) ; j !=  vSamAll( m_index[i] )->time_average_capacity; ++j )
-	std::cout << j << "\t" <<  vSamAll( m_index[i] )->average_time[j] <<  "\t" <<  vSamAll( m_index[i] )->nhits[j] << "\t" <<  vSamAll( m_index[i] )->tot_energy[j] << std::endl;
+    vSamAll(m_index[i])->calculateAverage();
+#ifdef ecal_time_debug
+    for (unsigned int j(0); j != vSamAll(m_index[i])->time_average_capacity; ++j)
+      std::cout << j << "\t" << vSamAll(m_index[i])->average_time[j] << "\t" << vSamAll(m_index[i])->nhits[j] << "\t"
+                << vSamAll(m_index[i])->tot_energy[j] << std::endl;
 #endif
-   }
-   
-   //Noise can be added here
+  }
 
+  //Noise can be added here
 }
 
-void
-EcalTimeMapDigitizer::initializeMap()
-{
+void EcalTimeMapDigitizer::initializeMap() {
 #ifdef ecal_time_debug
   std::cout << "[EcalTimeMapDigitizer]::Zeroing the used samples" << std::endl;
 #endif
-   blankOutUsedSamples();
+  blankOutUsedSamples();
 }
 
-
-void 
-EcalTimeMapDigitizer::run( EcalTimeDigiCollection& output  )
-{
+void EcalTimeMapDigitizer::run(EcalTimeDigiCollection& output) {
 #ifdef ecal_time_debug
   std::cout << "[EcalTimeMapDigitizer]::Finalizing hits and fill output collection" << std::endl;
 #endif
@@ -204,139 +174,87 @@ EcalTimeMapDigitizer::run( EcalTimeDigiCollection& output  )
   finalizeHits();
 
   //Until we do now simulated noise we can get the size from the index vector
-  const unsigned int ssize ( m_index.size() ) ;
+  const unsigned int ssize(m_index.size());
 
-  output.reserve( ssize ) ;
-  
-  for( unsigned int i ( 0 ) ; i != ssize ; ++i )
-    {
+  output.reserve(ssize);
 
- #ifdef ecal_time_debug
-      std::cout << "----- in digi loop " << i << std::endl;
- #endif
+  for (unsigned int i(0); i != ssize; ++i) {
+#ifdef ecal_time_debug
+    std::cout << "----- in digi loop " << i << std::endl;
+#endif
 
-      output.push_back( Digi(vSamAll( m_index[i] )->id) );
+    output.push_back(Digi(vSamAll(m_index[i])->id));
 
-      unsigned int nTimeHits=0;
-      float timeHits[vSamAll( m_index[i] )->time_average_capacity];
-      unsigned int timeBX[vSamAll( m_index[i] )->time_average_capacity];
+    unsigned int nTimeHits = 0;
+    float timeHits[vSamAll(m_index[i])->time_average_capacity];
+    unsigned int timeBX[vSamAll(m_index[i])->time_average_capacity];
 
-      for ( unsigned int j ( 0 ) ; j !=  vSamAll( m_index[i] )->time_average_capacity; ++j ) //here sampling on the OOTPU 
-	{
-	  if (vSamAll( m_index[i] )->nhits[j]>0)
-	    {
-	      timeHits[nTimeHits]= vSamAll( m_index[i] )->average_time[j];
-	      timeBX[nTimeHits++]= m_minBunch+j;
-	    }
-	}
+    for (unsigned int j(0); j != vSamAll(m_index[i])->time_average_capacity; ++j)  //here sampling on the OOTPU
+    {
+      if (vSamAll(m_index[i])->nhits[j] > 0) {
+        timeHits[nTimeHits] = vSamAll(m_index[i])->average_time[j];
+        timeBX[nTimeHits++] = m_minBunch + j;
+      }
+    }
 
-      output.back().setSize(nTimeHits);
+    output.back().setSize(nTimeHits);
 
-      for (unsigned int j ( 0 ) ; j !=  nTimeHits; ++j ) //filling the !zero hits
-	{
-	  output.back().setSample(j,timeHits[j]);
-	  if (timeBX[j]==0)
-	    {
+    for (unsigned int j(0); j != nTimeHits; ++j)  //filling the !zero hits
+    {
+      output.back().setSample(j, timeHits[j]);
+      if (timeBX[j] == 0) {
 #ifdef ecal_time_debug
-	      std::cout << "setting interesting sample " << j << std::endl;
+        std::cout << "setting interesting sample " << j << std::endl;
 #endif
-	    output.back().setSampleOfInterest(j);
-	    }
-	}
-      
- #ifdef ecal_time_debug
-      std::cout << "digi " << output.back().id().rawId() << "\t" << output.back().size();
-       if (output.back().sampleOfInterest()>0)
- 	std::cout <<  "\tBX0 time " << output.back().sample(output.back().sampleOfInterest()) << std::endl;
-       else
- 	std::cout <<  "\tNo in time hits" << std::endl;
- #endif
+        output.back().setSampleOfInterest(j);
+      }
     }
+
+#ifdef ecal_time_debug
+    std::cout << "digi " << output.back().id().rawId() << "\t" << output.back().size();
+    if (output.back().sampleOfInterest() > 0)
+      std::cout << "\tBX0 time " << output.back().sample(output.back().sampleOfInterest()) << std::endl;
+    else
+      std::cout << "\tNo in time hits" << std::endl;
+#endif
+  }
 #ifdef ecal_time_debug
   std::cout << "[EcalTimeMapDigitizer]::Output collection size " << output.size() << std::endl;
 #endif
-
 }
 
-
-double 
-EcalTimeMapDigitizer::timeOfFlight( const DetId& detId , int layer) const 
-{
+double EcalTimeMapDigitizer::timeOfFlight(const DetId& detId, int layer) const {
   //not using the layer yet
-   auto cellGeometry ( m_geometry->getGeometry( detId ) ) ;
-   assert( nullptr != cellGeometry ) ;
-   GlobalPoint layerPos = (cellGeometry)->getPosition( double(layer)+0.5 ); //depth in mm in the middle of the layer position
-   return layerPos.mag()*cm/c_light ;
+  auto cellGeometry(m_geometry->getGeometry(detId));
+  assert(nullptr != cellGeometry);
+  GlobalPoint layerPos =
+      (cellGeometry)->getPosition(double(layer) + 0.5);  //depth in mm in the middle of the layer position
+  return layerPos.mag() * cm / c_light;
 }
 
+unsigned int EcalTimeMapDigitizer::samplesSize() const { return m_vSam.size(); }
 
-unsigned int
-EcalTimeMapDigitizer::samplesSize() const
-{
-   return m_vSam.size() ;
-}
+unsigned int EcalTimeMapDigitizer::samplesSizeAll() const { return m_vSam.size(); }
 
-unsigned int
-EcalTimeMapDigitizer::samplesSizeAll() const
-{
-   return m_vSam.size() ;
-}
+const EcalTimeMapDigitizer::TimeSamples* EcalTimeMapDigitizer::operator[](unsigned int i) const { return &m_vSam[i]; }
 
-const EcalTimeMapDigitizer::TimeSamples* 
-EcalTimeMapDigitizer::operator[]( unsigned int i ) const
-{
-   return &m_vSam[ i ] ;
-}
+EcalTimeMapDigitizer::TimeSamples* EcalTimeMapDigitizer::operator[](unsigned int i) { return &m_vSam[i]; }
 
-EcalTimeMapDigitizer::TimeSamples* 
-EcalTimeMapDigitizer::operator[]( unsigned int i )
-{
-   return &m_vSam[ i ] ;
-}
+EcalTimeMapDigitizer::TimeSamples* EcalTimeMapDigitizer::vSam(unsigned int i) { return &m_vSam[i]; }
 
-EcalTimeMapDigitizer::TimeSamples* 
-EcalTimeMapDigitizer::vSam( unsigned int i )
-{
-   return &m_vSam[ i ] ;
-}
+EcalTimeMapDigitizer::TimeSamples* EcalTimeMapDigitizer::vSamAll(unsigned int i) { return &m_vSam[i]; }
 
-EcalTimeMapDigitizer::TimeSamples* 
-EcalTimeMapDigitizer::vSamAll( unsigned int i )
-{
-   return &m_vSam[ i ] ;
-}
-
-const EcalTimeMapDigitizer::TimeSamples* 
-EcalTimeMapDigitizer::vSamAll( unsigned int i ) const
-{
-   return &m_vSam[ i ] ;
-}
+const EcalTimeMapDigitizer::TimeSamples* EcalTimeMapDigitizer::vSamAll(unsigned int i) const { return &m_vSam[i]; }
 
-int 
-EcalTimeMapDigitizer::minBunch() const 
-{
-  return m_minBunch ; 
-}
+int EcalTimeMapDigitizer::minBunch() const { return m_minBunch; }
 
-int 
-EcalTimeMapDigitizer::maxBunch() const 
-{
-  return m_maxBunch ; 
-}
+int EcalTimeMapDigitizer::maxBunch() const { return m_maxBunch; }
 
-EcalTimeMapDigitizer::VecInd& 
-EcalTimeMapDigitizer::index() 
-{
-  return m_index ; 
-}
+EcalTimeMapDigitizer::VecInd& EcalTimeMapDigitizer::index() { return m_index; }
 
-const EcalTimeMapDigitizer::VecInd& 
-EcalTimeMapDigitizer::index() const
-{
-  return m_index ; 
-}
+const EcalTimeMapDigitizer::VecInd& EcalTimeMapDigitizer::index() const { return m_index; }
 
-// const EcalTimeMapDigitizer::TimeSamples* 
+// const EcalTimeMapDigitizer::TimeSamples*
 // EcalTimeMapDigitizer::findDetId( const DetId& detId ) const
 // {
 //    const unsigned int di ( CaloGenericDetId( detId ).denseIndex() ) ;
diff --git a/SimCalorimetry/EcalSimAlgos/test/testCorrNoise.cpp b/SimCalorimetry/EcalSimAlgos/test/testCorrNoise.cpp
index 0b85fae0e421a..cbd6046f913f8 100644
--- a/SimCalorimetry/EcalSimAlgos/test/testCorrNoise.cpp
+++ b/SimCalorimetry/EcalSimAlgos/test/testCorrNoise.cpp
@@ -12,12 +12,11 @@
 #include "TH1F.h"
 #include "TCanvas.h"
 
-#include<iostream>
-#include<iomanip>
-#include<fstream>
+#include <iostream>
+#include <iomanip>
+#include <fstream>
 
-int main()
-{
+int main() {
   edm::MessageDrop::instance()->debugEnabled = false;
 
   const long seed = 12345;
@@ -27,178 +26,176 @@ int main()
 
   EcalCorrMatrix thisMatrix;
 
-  thisMatrix(0,0) = 1.;
-  thisMatrix(0,1) = 0.67;
-  thisMatrix(0,2) = 0.53;
-  thisMatrix(0,3) = 0.44;
-  thisMatrix(0,4) = 0.39;
-  thisMatrix(0,5) = 0.36;
-  thisMatrix(0,6) = 0.38;
-  thisMatrix(0,7) = 0.35;
-  thisMatrix(0,8) = 0.36;
-  thisMatrix(0,9) = 0.32;
-  
-  thisMatrix(1,0) = 0.67;
-  thisMatrix(1,1) = 1.;
-  thisMatrix(1,2) = 0.67;
-  thisMatrix(1,3) = 0.53;
-  thisMatrix(1,4) = 0.44;
-  thisMatrix(1,5) = 0.39;
-  thisMatrix(1,6) = 0.36;
-  thisMatrix(1,7) = 0.38;
-  thisMatrix(1,8) = 0.35;
-  thisMatrix(1,9) = 0.36;
-  
-  thisMatrix(2,0) = 0.53;
-  thisMatrix(2,1) = 0.67;
-  thisMatrix(2,2) = 1.;
-  thisMatrix(2,3) = 0.67;
-  thisMatrix(2,4) = 0.53;
-  thisMatrix(2,5) = 0.44;
-  thisMatrix(2,6) = 0.39;
-  thisMatrix(2,7) = 0.36;
-  thisMatrix(2,8) = 0.38;
-  thisMatrix(2,9) = 0.35;
-  
-  thisMatrix(3,0) = 0.44;
-  thisMatrix(3,1) = 0.53;
-  thisMatrix(3,2) = 0.67;
-  thisMatrix(3,3) = 1.;
-  thisMatrix(3,4) = 0.67;
-  thisMatrix(3,5) = 0.53;
-  thisMatrix(3,6) = 0.44;
-  thisMatrix(3,7) = 0.39;
-  thisMatrix(3,8) = 0.36;
-  thisMatrix(3,9) = 0.38;
-  
-  thisMatrix(4,0) = 0.39;
-  thisMatrix(4,1) = 0.44;
-  thisMatrix(4,2) = 0.53;
-  thisMatrix(4,3) = 0.67;
-  thisMatrix(4,4) = 1.;
-  thisMatrix(4,5) = 0.67;
-  thisMatrix(4,6) = 0.53;
-  thisMatrix(4,7) = 0.44;
-  thisMatrix(4,8) = 0.39;
-  thisMatrix(4,9) = 0.36;
-  
-  thisMatrix(5,0) = 0.36;
-  thisMatrix(5,1) = 0.39;
-  thisMatrix(5,2) = 0.44;
-  thisMatrix(5,3) = 0.53;
-  thisMatrix(5,4) = 0.67;
-  thisMatrix(5,5) = 1.;
-  thisMatrix(5,6) = 0.67;
-  thisMatrix(5,7) = 0.53;
-  thisMatrix(5,8) = 0.44;
-  thisMatrix(5,9) = 0.39;
-  
-  thisMatrix(6,0) = 0.38;
-  thisMatrix(6,1) = 0.36;
-  thisMatrix(6,2) = 0.39;
-  thisMatrix(6,3) = 0.44;
-  thisMatrix(6,4) = 0.53;
-  thisMatrix(6,5) = 0.67;
-  thisMatrix(6,6) = 1.;
-  thisMatrix(6,7) = 0.67;
-  thisMatrix(6,8) = 0.53;
-  thisMatrix(6,9) = 0.44;
-  
-  thisMatrix(7,0) = 0.35;
-  thisMatrix(7,1) = 0.38;
-  thisMatrix(7,2) = 0.36;
-  thisMatrix(7,3) = 0.39;
-  thisMatrix(7,4) = 0.44;
-  thisMatrix(7,5) = 0.53;
-  thisMatrix(7,6) = 0.67;
-  thisMatrix(7,7) = 1.;
-  thisMatrix(7,8) = 0.67;
-  thisMatrix(7,9) = 0.53;
-  
-  thisMatrix(8,0) = 0.36;
-  thisMatrix(8,1) = 0.35;
-  thisMatrix(8,2) = 0.38;
-  thisMatrix(8,3) = 0.36;
-  thisMatrix(8,4) = 0.39;
-  thisMatrix(8,5) = 0.44;
-  thisMatrix(8,6) = 0.53;
-  thisMatrix(8,7) = 0.67;
-  thisMatrix(8,8) = 1.;
-  thisMatrix(8,9) = 0.67;
-  
-  thisMatrix(9,0) = 0.32;
-  thisMatrix(9,1) = 0.36;
-  thisMatrix(9,2) = 0.35;
-  thisMatrix(9,3) = 0.38;
-  thisMatrix(9,4) = 0.36;
-  thisMatrix(9,5) = 0.39;
-  thisMatrix(9,6) = 0.44;
-  thisMatrix(9,7) = 0.53;
-  thisMatrix(9,8) = 0.67;
-  thisMatrix(9,9) = 1.;
+  thisMatrix(0, 0) = 1.;
+  thisMatrix(0, 1) = 0.67;
+  thisMatrix(0, 2) = 0.53;
+  thisMatrix(0, 3) = 0.44;
+  thisMatrix(0, 4) = 0.39;
+  thisMatrix(0, 5) = 0.36;
+  thisMatrix(0, 6) = 0.38;
+  thisMatrix(0, 7) = 0.35;
+  thisMatrix(0, 8) = 0.36;
+  thisMatrix(0, 9) = 0.32;
+
+  thisMatrix(1, 0) = 0.67;
+  thisMatrix(1, 1) = 1.;
+  thisMatrix(1, 2) = 0.67;
+  thisMatrix(1, 3) = 0.53;
+  thisMatrix(1, 4) = 0.44;
+  thisMatrix(1, 5) = 0.39;
+  thisMatrix(1, 6) = 0.36;
+  thisMatrix(1, 7) = 0.38;
+  thisMatrix(1, 8) = 0.35;
+  thisMatrix(1, 9) = 0.36;
+
+  thisMatrix(2, 0) = 0.53;
+  thisMatrix(2, 1) = 0.67;
+  thisMatrix(2, 2) = 1.;
+  thisMatrix(2, 3) = 0.67;
+  thisMatrix(2, 4) = 0.53;
+  thisMatrix(2, 5) = 0.44;
+  thisMatrix(2, 6) = 0.39;
+  thisMatrix(2, 7) = 0.36;
+  thisMatrix(2, 8) = 0.38;
+  thisMatrix(2, 9) = 0.35;
+
+  thisMatrix(3, 0) = 0.44;
+  thisMatrix(3, 1) = 0.53;
+  thisMatrix(3, 2) = 0.67;
+  thisMatrix(3, 3) = 1.;
+  thisMatrix(3, 4) = 0.67;
+  thisMatrix(3, 5) = 0.53;
+  thisMatrix(3, 6) = 0.44;
+  thisMatrix(3, 7) = 0.39;
+  thisMatrix(3, 8) = 0.36;
+  thisMatrix(3, 9) = 0.38;
+
+  thisMatrix(4, 0) = 0.39;
+  thisMatrix(4, 1) = 0.44;
+  thisMatrix(4, 2) = 0.53;
+  thisMatrix(4, 3) = 0.67;
+  thisMatrix(4, 4) = 1.;
+  thisMatrix(4, 5) = 0.67;
+  thisMatrix(4, 6) = 0.53;
+  thisMatrix(4, 7) = 0.44;
+  thisMatrix(4, 8) = 0.39;
+  thisMatrix(4, 9) = 0.36;
+
+  thisMatrix(5, 0) = 0.36;
+  thisMatrix(5, 1) = 0.39;
+  thisMatrix(5, 2) = 0.44;
+  thisMatrix(5, 3) = 0.53;
+  thisMatrix(5, 4) = 0.67;
+  thisMatrix(5, 5) = 1.;
+  thisMatrix(5, 6) = 0.67;
+  thisMatrix(5, 7) = 0.53;
+  thisMatrix(5, 8) = 0.44;
+  thisMatrix(5, 9) = 0.39;
+
+  thisMatrix(6, 0) = 0.38;
+  thisMatrix(6, 1) = 0.36;
+  thisMatrix(6, 2) = 0.39;
+  thisMatrix(6, 3) = 0.44;
+  thisMatrix(6, 4) = 0.53;
+  thisMatrix(6, 5) = 0.67;
+  thisMatrix(6, 6) = 1.;
+  thisMatrix(6, 7) = 0.67;
+  thisMatrix(6, 8) = 0.53;
+  thisMatrix(6, 9) = 0.44;
+
+  thisMatrix(7, 0) = 0.35;
+  thisMatrix(7, 1) = 0.38;
+  thisMatrix(7, 2) = 0.36;
+  thisMatrix(7, 3) = 0.39;
+  thisMatrix(7, 4) = 0.44;
+  thisMatrix(7, 5) = 0.53;
+  thisMatrix(7, 6) = 0.67;
+  thisMatrix(7, 7) = 1.;
+  thisMatrix(7, 8) = 0.67;
+  thisMatrix(7, 9) = 0.53;
+
+  thisMatrix(8, 0) = 0.36;
+  thisMatrix(8, 1) = 0.35;
+  thisMatrix(8, 2) = 0.38;
+  thisMatrix(8, 3) = 0.36;
+  thisMatrix(8, 4) = 0.39;
+  thisMatrix(8, 5) = 0.44;
+  thisMatrix(8, 6) = 0.53;
+  thisMatrix(8, 7) = 0.67;
+  thisMatrix(8, 8) = 1.;
+  thisMatrix(8, 9) = 0.67;
+
+  thisMatrix(9, 0) = 0.32;
+  thisMatrix(9, 1) = 0.36;
+  thisMatrix(9, 2) = 0.35;
+  thisMatrix(9, 3) = 0.38;
+  thisMatrix(9, 4) = 0.36;
+  thisMatrix(9, 5) = 0.39;
+  thisMatrix(9, 6) = 0.44;
+  thisMatrix(9, 7) = 0.53;
+  thisMatrix(9, 8) = 0.67;
+  thisMatrix(9, 9) = 1.;
 
   CorrelatedNoisifier<EcalCorrMatrix> theCorrNoise(thisMatrix);
 
   EcalCorrMatrix thisTrivialMatrix;
-  for (unsigned int i = 0; i < readoutFrameSize; i++ )
-    {
-      thisTrivialMatrix(i,i) = 1.;
-      for ( unsigned int j = i+1; j < readoutFrameSize; j++ )
-        {
-          thisTrivialMatrix(i,j) = 0.;
-          thisTrivialMatrix(j,i) = 0.;
-        }
+  for (unsigned int i = 0; i < readoutFrameSize; i++) {
+    thisTrivialMatrix(i, i) = 1.;
+    for (unsigned int j = i + 1; j < readoutFrameSize; j++) {
+      thisTrivialMatrix(i, j) = 0.;
+      thisTrivialMatrix(j, i) = 0.;
     }
+  }
   CorrelatedNoisifier<EcalCorrMatrix> theUncorrNoise(thisTrivialMatrix);
 
   std::cout << "Using the correlation matrix: " << thisMatrix << std::endl;
 
   std::cout << "\n And the unit matrix: " << thisTrivialMatrix << std::endl;
 
-  EBDetId detId(1,1);
+  EBDetId detId(1, 1);
 
-  TH1F* uncorr = new TH1F("uncorr","first 3 samples, uncorrelated distribution",200,-10.,10.);
-  TH1F* corr = new TH1F("corr","first 3 samples, correlated distribution",200,-10.,10.);
+  TH1F* uncorr = new TH1F("uncorr", "first 3 samples, uncorrelated distribution", 200, -10., 10.);
+  TH1F* corr = new TH1F("corr", "first 3 samples, correlated distribution", 200, -10., 10.);
 
-  TH1F* uncorrPed = new TH1F("uncorrPed","first 3 samples, uncorrelated average",200,-10.,10.);
-  TH1F* corrPed = new TH1F("corrPed","first 3 samples, correlated average",200,-10.,10.);
+  TH1F* uncorrPed = new TH1F("uncorrPed", "first 3 samples, uncorrelated average", 200, -10., 10.);
+  TH1F* corrPed = new TH1F("corrPed", "first 3 samples, correlated average", 200, -10., 10.);
 
   TH1F* frame[(int)readoutFrameSize];
   Char_t histo[200];
-  for ( Int_t i = 0; i < (int)readoutFrameSize; ++i) {
-    sprintf (histo,"frame %02d",i) ;
-    frame[i] = new TH1F(histo,histo,200,-10.,10.);
+  for (Int_t i = 0; i < (int)readoutFrameSize; ++i) {
+    sprintf(histo, "frame %02d", i);
+    frame[i] = new TH1F(histo, histo, 200, -10., 10.);
   }
 
-  for ( int i = 0; i < 100000; ++i ) {
+  for (int i = 0; i < 100000; ++i) {
     CaloSamples noiseframe(detId, readoutFrameSize);
     theCorrNoise.noisify(noiseframe, &engine);
     CaloSamples flatframe(detId, readoutFrameSize);
     theUncorrNoise.noisify(flatframe, &engine);
-    for ( int j = 0; j < 3; ++j ) {
+    for (int j = 0; j < 3; ++j) {
       uncorr->Fill(flatframe[j]);
       corr->Fill(noiseframe[j]);
     }
-    for ( int j = 0; j < (int)readoutFrameSize; ++j ) {
+    for (int j = 0; j < (int)readoutFrameSize; ++j) {
       frame[j]->Fill(noiseframe[j]);
     }
-    float thisUncorrPed = (flatframe[0]+flatframe[1]+flatframe[2])/3.;
-    float thisCorrPed = (noiseframe[0]+noiseframe[1]+noiseframe[2])/3.;
+    float thisUncorrPed = (flatframe[0] + flatframe[1] + flatframe[2]) / 3.;
+    float thisCorrPed = (noiseframe[0] + noiseframe[1] + noiseframe[2]) / 3.;
     uncorrPed->Fill(thisUncorrPed);
     corrPed->Fill(thisCorrPed);
   }
 
-  uncorr->Fit("gaus","VE");
-  corr->Fit("gaus","VE");
+  uncorr->Fit("gaus", "VE");
+  corr->Fit("gaus", "VE");
 
-  uncorrPed->Fit("gaus","VE");
-  corrPed->Fit("gaus","VE");
+  uncorrPed->Fit("gaus", "VE");
+  corrPed->Fit("gaus", "VE");
 
   const int csize = 500;
-  TCanvas * showNoise = new TCanvas("showNoise","showNoise",2*csize,2*csize);
+  TCanvas* showNoise = new TCanvas("showNoise", "showNoise", 2 * csize, 2 * csize);
+
+  showNoise->Divide(2, 2);
 
-  showNoise->Divide(2,2);
-  
   gStyle->SetOptFit(1111);
 
   showNoise->cd(1);
@@ -211,16 +208,15 @@ int main()
   corrPed->Draw();
   showNoise->SaveAs("EcalNoise.jpg");
 
-  TCanvas * showNoiseFrame = new TCanvas("showNoiseFrame","showNoiseFrame",2*csize,2*csize);
-  showNoiseFrame->Divide(2,5);
-  for ( int i = 0; i < (int)readoutFrameSize; ++i) {
-    showNoiseFrame->cd(i+1);
-    frame[i]->Fit("gaus","Q");
+  TCanvas* showNoiseFrame = new TCanvas("showNoiseFrame", "showNoiseFrame", 2 * csize, 2 * csize);
+  showNoiseFrame->Divide(2, 5);
+  for (int i = 0; i < (int)readoutFrameSize; ++i) {
+    showNoiseFrame->cd(i + 1);
+    frame[i]->Fit("gaus", "Q");
     frame[i]->Draw();
   }
   showNoiseFrame->SaveAs("EcalNoiseFrame.jpg");
 
-
   delete uncorr;
   delete corr;
   delete uncorrPed;
@@ -229,5 +225,4 @@ int main()
   delete showNoiseFrame;
 
   return 0;
-
 }
diff --git a/SimCalorimetry/EcalSimAlgos/test/testEcalShape.cpp b/SimCalorimetry/EcalSimAlgos/test/testEcalShape.cpp
index 41296ead460f1..10cba1998e487 100644
--- a/SimCalorimetry/EcalSimAlgos/test/testEcalShape.cpp
+++ b/SimCalorimetry/EcalSimAlgos/test/testEcalShape.cpp
@@ -5,8 +5,8 @@
 #include "SimCalorimetry/EcalSimAlgos/interface/EBShape.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EEShape.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include<iostream>
-#include<iomanip>
+#include <iostream>
+#include <iomanip>
 
 #include "TROOT.h"
 #include "TStyle.h"
@@ -14,44 +14,36 @@
 #include "TCanvas.h"
 #include "TF1.h"
 
-int main() 
-{
-   edm::MessageDrop::instance()->debugEnabled = false;
+int main() {
+  edm::MessageDrop::instance()->debugEnabled = false;
 
-   const EcalSimParameterMap parameterMap ;
+  const EcalSimParameterMap parameterMap;
 
-   bool useDBShape = false; // for the purpose of testing the EcalShape class, doesn't need to (should not) fetch a shape from the DB but just to assume the testbeam one
-   const APDShape theAPDShape(useDBShape) ;
-   const EBShape theEBShape(useDBShape) ;
-   const EEShape theEEShape(useDBShape) ;
+  bool useDBShape =
+      false;  // for the purpose of testing the EcalShape class, doesn't need to (should not) fetch a shape from the DB but just to assume the testbeam one
+  const APDShape theAPDShape(useDBShape);
+  const EBShape theEBShape(useDBShape);
+  const EEShape theEEShape(useDBShape);
 
-   const int nsamp = 500; // phase I hardcoded ECAL shapes arrays
-   const int tconv = 10;  // kNBinsPerNSec = 10
+  const int nsamp = 500;  // phase I hardcoded ECAL shapes arrays
+  const int tconv = 10;   // kNBinsPerNSec = 10
 
-   const unsigned int histsiz = nsamp*tconv;
+  const unsigned int histsiz = nsamp * tconv;
 
-   for( unsigned int i ( 0 ) ; i != 3 ; ++i )
-   {
+  for (unsigned int i(0); i != 3; ++i) {
+    const DetId id(0 == i || 2 == i ? (DetId)EBDetId(1, 1) : (DetId)EEDetId(1, 50, 1));
 
-      const DetId id ( 0 == i || 2 == i ?
-		       (DetId) EBDetId(1,1) :
-		       (DetId) EEDetId(1,50,1) ) ;
+    const EcalShapeBase* theShape(0 == i ? (EcalShapeBase*)&theEBShape
+                                         : (1 == i ? (EcalShapeBase*)&theEEShape : (EcalShapeBase*)&theAPDShape));
 
-      const EcalShapeBase* theShape ( 0 == i ? 
-				      (EcalShapeBase*) &theEBShape : 
-				      ( 1 == i ? 
-					(EcalShapeBase*) &theEEShape :
-					(EcalShapeBase*) &theAPDShape  ) ) ;
-      
-      const double ToM ( theShape->timeOfMax()  ) ;
-      const double T0  ( theShape->timeOfThr()  ) ;
-      const double rT  ( theShape->timeToRise() ) ;
+    const double ToM(theShape->timeOfMax());
+    const double T0(theShape->timeOfThr());
+    const double rT(theShape->timeToRise());
 
-
-      // standard display of the implemented shape function
-      const int csize = 500;
-      TCanvas * showShape = new TCanvas("showShape","showShape",2*csize,csize);
-/*
+    // standard display of the implemented shape function
+    const int csize = 500;
+    TCanvas* showShape = new TCanvas("showShape", "showShape", 2 * csize, csize);
+    /*
 
 //  const std::vector<double>& nt = theShape.getTimeTable();
 //  const std::vector<double>& ntd = theShape.getDerivTable();
@@ -86,77 +78,67 @@ int main()
   delete deriv1;
 */
 
-      const std::string name ( 0 == i ? "Barrel" : 
-			       ( 1 == i ? "Endcap" :
-				 "APD" ) ) ;
-
-      std::cout << "\n ********************* "
-		<< name 
-		<< "************************" ; 
-
-      std::cout << "\n Maximum time from tabulated values = " 
-		<< std::fixed    << std::setw(6)   
-		<< std::setprecision(2) << ToM << std::endl ;
-
-      std::cout << "\n Tzero from tabulated values        = " 
-		<< std::fixed    << std::setw(6)   
-		<< std::setprecision(2) << T0 << std::endl ;
-
-      std::cout << "\n Rising time from tabulated values  = " 
-		<< std::fixed    << std::setw(6)   
-		<< std::setprecision(2) << rT << std::endl;
-
-      // signal used with the nominal parameters and no jitter
-
-      std::cout << "\n computed ECAL " << name 
-		<< " pulse shape and its derivative (LHC timePhaseShift = 1) \n" << std::endl;
-      const double tzero = rT - ( parameterMap.simParameters( id ).binOfMaximum() - 1. )*25. ;
-      double x = tzero ;
-
-      const std::string title1 ( "Computed Ecal " + name + " MGPA shape" ) ;
-      const std::string title2 ( "Computed Ecal " + name + " MGPA derivative" ) ;
-
-      TH1F* shape2 = new TH1F( "shape2", title1.c_str(), nsamp, 0., (float) nsamp ) ;
-      TH1F* deriv2 = new TH1F( "deriv2", title2.c_str(), nsamp, 0., (float) nsamp ) ;
-      double y = 0.;
-      double dy = 0.;
-
-      for( unsigned int i ( 0 ) ; i != histsiz ; ++i ) 
-      {
-	 y  = (*theShape)(x);
-	 dy = theShape->derivative(x);
-	 shape2->Fill((float)(x-tzero),(float)y);
-	 deriv2->Fill((float)(x-tzero),(float)dy);
-	 std::cout << " time (ns) = "  << std::fixed    << std::setw(6)         << std::setprecision(2) << x-tzero 
-		   << " shape = "      << std::setw(11) << std::setprecision(5) << y
-		   << " derivative = " << std::setw(11) << std::setprecision(5) << dy << std::endl;
-	 x = x+1./(double)tconv;
-      }
-
-      for( unsigned int iSample ( 0 ) ; iSample != 10 ; ++iSample ) 
-      {
-	 std::cout << (*theShape)(tzero + iSample*25.0) << std::endl; 
-      }
-
-      showShape->Divide(2,1);
-      showShape->cd(1);
-      gPad->SetGrid();
-      shape2->GetXaxis()->SetNdivisions(10,kFALSE);
-      shape2->Draw();
-
-      showShape->cd(2);
-      gPad->SetGrid();
-      deriv2->GetXaxis()->SetNdivisions(10,kFALSE);
-      deriv2->Draw();
-
-      const std::string fname ( name + "EcalShapeUsed.jpg" ) ;
-      showShape->SaveAs( fname.c_str() );
-
-      delete shape2;
-      delete deriv2;
-      delete showShape;
-
-   }
-
-   return 0;
-} 
+    const std::string name(0 == i ? "Barrel" : (1 == i ? "Endcap" : "APD"));
+
+    std::cout << "\n ********************* " << name << "************************";
+
+    std::cout << "\n Maximum time from tabulated values = " << std::fixed << std::setw(6) << std::setprecision(2) << ToM
+              << std::endl;
+
+    std::cout << "\n Tzero from tabulated values        = " << std::fixed << std::setw(6) << std::setprecision(2) << T0
+              << std::endl;
+
+    std::cout << "\n Rising time from tabulated values  = " << std::fixed << std::setw(6) << std::setprecision(2) << rT
+              << std::endl;
+
+    // signal used with the nominal parameters and no jitter
+
+    std::cout << "\n computed ECAL " << name << " pulse shape and its derivative (LHC timePhaseShift = 1) \n"
+              << std::endl;
+    const double tzero = rT - (parameterMap.simParameters(id).binOfMaximum() - 1.) * 25.;
+    double x = tzero;
+
+    const std::string title1("Computed Ecal " + name + " MGPA shape");
+    const std::string title2("Computed Ecal " + name + " MGPA derivative");
+
+    TH1F* shape2 = new TH1F("shape2", title1.c_str(), nsamp, 0., (float)nsamp);
+    TH1F* deriv2 = new TH1F("deriv2", title2.c_str(), nsamp, 0., (float)nsamp);
+    double y = 0.;
+    double dy = 0.;
+
+    for (unsigned int i(0); i != histsiz; ++i) {
+      y = (*theShape)(x);
+      dy = theShape->derivative(x);
+      shape2->Fill((float)(x - tzero), (float)y);
+      deriv2->Fill((float)(x - tzero), (float)dy);
+      std::cout << " time (ns) = " << std::fixed << std::setw(6) << std::setprecision(2) << x - tzero
+                << " shape = " << std::setw(11) << std::setprecision(5) << y << " derivative = " << std::setw(11)
+                << std::setprecision(5) << dy << std::endl;
+      x = x + 1. / (double)tconv;
+    }
+
+    for (unsigned int iSample(0); iSample != 10; ++iSample) {
+      std::cout << (*theShape)(tzero + iSample * 25.0) << std::endl;
+    }
+
+    showShape->Divide(2, 1);
+    showShape->cd(1);
+    gPad->SetGrid();
+    shape2->GetXaxis()->SetNdivisions(10, kFALSE);
+    shape2->Draw();
+
+    showShape->cd(2);
+    gPad->SetGrid();
+    deriv2->GetXaxis()->SetNdivisions(10, kFALSE);
+    deriv2->Draw();
+
+    const std::string fname(name + "EcalShapeUsed.jpg");
+    showShape->SaveAs(fname.c_str());
+
+    delete shape2;
+    delete deriv2;
+    delete showShape;
+  }
+
+  return 0;
+}
diff --git a/SimCalorimetry/EcalSimProducers/interface/EcalDigiProducer.h b/SimCalorimetry/EcalSimProducers/interface/EcalDigiProducer.h
index 8bcdcd654e971..cf5b390c1ee08 100644
--- a/SimCalorimetry/EcalSimProducers/interface/EcalDigiProducer.h
+++ b/SimCalorimetry/EcalSimProducers/interface/EcalDigiProducer.h
@@ -1,153 +1,158 @@
 #ifndef SimCalorimetry_EcalSimProducers_EcalDigiProducer_h
 #define SimCalorimetry_EcalSimProducers_EcalDigiProducer_h
 
+#include "DataFormats/Math/interface/Error.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/APDShape.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EBShape.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EEShape.h"
+#include "SimCalorimetry/EcalSimAlgos/interface/ESElectronicsSim.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/ESShape.h"
-#include "DataFormats/Math/interface/Error.h"
-#include "SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalCorrelatedNoiseMatrix.h"
-#include "SimCalorimetry/EcalSimAlgos/interface/ESElectronicsSim.h"
+#include "SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.h"
 
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h"
-#include "SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalDigitizerTraits.h"
+#include "SimCalorimetry/EcalSimAlgos/interface/EcalTDigitizer.h"
 #include "SimGeneral/MixingModule/interface/DigiAccumulatorMixMod.h"
 
-
 #include <vector>
 
-typedef EcalTDigitizer<EBDigitizerTraits> EBDigitizer  ;
-typedef EcalTDigitizer<EEDigitizerTraits> EEDigitizer  ;
-typedef CaloTDigitizer<ESOldDigitizerTraits> ESOldDigitizer  ;
-
-class ESDigitizer ;
-
-class APDSimParameters ;
-class EBHitResponse ;
-class EEHitResponse ;
-class ESHitResponse ;
-class CaloHitResponse ;
-class EcalSimParameterMap ;
-class EcalCoder ;
-class EcalElectronicsSim ;
-class ESElectronicsSim ;
-class ESElectronicsSimFast ;
+typedef EcalTDigitizer<EBDigitizerTraits> EBDigitizer;
+typedef EcalTDigitizer<EEDigitizerTraits> EEDigitizer;
+typedef CaloTDigitizer<ESOldDigitizerTraits> ESOldDigitizer;
+
+class ESDigitizer;
+
+class APDSimParameters;
+class EBHitResponse;
+class EEHitResponse;
+class ESHitResponse;
+class CaloHitResponse;
+class EcalSimParameterMap;
+class EcalCoder;
+class EcalElectronicsSim;
+class ESElectronicsSim;
+class ESElectronicsSimFast;
 class EcalBaseSignalGenerator;
-class CaloGeometry ;
-class EBDigiCollection ;
-class EEDigiCollection ;
-class ESDigiCollection ;
-class PileUpEventPrincipal ;
+class CaloGeometry;
+class EBDigiCollection;
+class EEDigiCollection;
+class ESDigiCollection;
+class PileUpEventPrincipal;
 
 namespace edm {
   class ConsumesCollector;
   class ProducerBase;
   class Event;
   class EventSetup;
-  template<typename T> class Handle;
+  template <typename T>
+  class Handle;
   class ParameterSet;
   class StreamID;
-}
+}  // namespace edm
 
 namespace CLHEP {
   class HepRandomEngine;
 }
 
 class EcalDigiProducer : public DigiAccumulatorMixMod {
-   public:
+public:
+  EcalDigiProducer(const edm::ParameterSet &params, edm::ProducerBase &mixMod, edm::ConsumesCollector &iC);
+  EcalDigiProducer(const edm::ParameterSet &params, edm::ConsumesCollector &iC);
+  ~EcalDigiProducer() override;
+
+  void initializeEvent(edm::Event const &e, edm::EventSetup const &c) override;
+  void accumulate(edm::Event const &e, edm::EventSetup const &c) override;
+  void accumulate(PileUpEventPrincipal const &e, edm::EventSetup const &c, edm::StreamID const &) override;
+  void finalizeEvent(edm::Event &e, edm::EventSetup const &c) override;
+  void beginLuminosityBlock(edm::LuminosityBlock const &lumi, edm::EventSetup const &setup) override;
+  void beginRun(edm::Run const &run, edm::EventSetup const &setup) override;
+
+  void setEBNoiseSignalGenerator(EcalBaseSignalGenerator *noiseGenerator);
+  void setEENoiseSignalGenerator(EcalBaseSignalGenerator *noiseGenerator);
+  void setESNoiseSignalGenerator(EcalBaseSignalGenerator *noiseGenerator);
 
-      EcalDigiProducer( const edm::ParameterSet& params , edm::ProducerBase& mixMod, edm::ConsumesCollector& iC);
-      EcalDigiProducer( const edm::ParameterSet& params , edm::ConsumesCollector& iC);
-      ~EcalDigiProducer() override;
+private:
+  virtual void cacheEBDigis(const EBDigiCollection *ebDigiPtr) const {}
+  virtual void cacheEEDigis(const EEDigiCollection *eeDigiPtr) const {}
 
-      void initializeEvent(edm::Event const& e, edm::EventSetup const& c) override;
-      void accumulate(edm::Event const& e, edm::EventSetup const& c) override;
-      void accumulate(PileUpEventPrincipal const& e, edm::EventSetup const& c, edm::StreamID const&) override;
-      void finalizeEvent(edm::Event& e, edm::EventSetup const& c) override;
-      void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& setup) override;
-      void beginRun(edm::Run const& run, edm::EventSetup const& setup) override;
+  typedef edm::Handle<std::vector<PCaloHit>> HitsHandle;
+  void accumulateCaloHits(HitsHandle const &ebHandle,
+                          HitsHandle const &eeHandle,
+                          HitsHandle const &esHandle,
+                          int bunchCrossing);
 
-      void setEBNoiseSignalGenerator(EcalBaseSignalGenerator * noiseGenerator);
-      void setEENoiseSignalGenerator(EcalBaseSignalGenerator * noiseGenerator);
-      void setESNoiseSignalGenerator(EcalBaseSignalGenerator * noiseGenerator);
+  void checkGeometry(const edm::EventSetup &eventSetup);
 
-   private:
+  void updateGeometry();
 
-      virtual void cacheEBDigis( const EBDigiCollection* ebDigiPtr ) const { }
-      virtual void cacheEEDigis( const EEDigiCollection* eeDigiPtr ) const { }
+  void checkCalibrations(const edm::Event &event, const edm::EventSetup &eventSetup);
 
-      typedef edm::Handle<std::vector<PCaloHit> > HitsHandle;
-      void accumulateCaloHits(HitsHandle const& ebHandle, HitsHandle const& eeHandle, HitsHandle const& esHandle, int bunchCrossing);
+  APDShape m_APDShape;
+  EBShape m_EBShape;
+  EEShape m_EEShape;
+  ESShape m_ESShape;  // no const because gain must be set
 
-      void checkGeometry(const edm::EventSetup& eventSetup) ;
+  const std::string m_EBdigiCollection;
+  const std::string m_EEdigiCollection;
+  const std::string m_ESdigiCollection;
+  const std::string m_hitsProducerTag;
 
-      void updateGeometry() ;
+  bool m_useLCcorrection;
 
-      void checkCalibrations(const edm::Event& event, const edm::EventSetup& eventSetup) ;
+  const bool m_apdSeparateDigi;
 
-      APDShape m_APDShape ;
-      EBShape  m_EBShape  ;
-      EEShape  m_EEShape  ;
-      ESShape        m_ESShape  ; // no const because gain must be set
+  const double m_EBs25notCont;
+  const double m_EEs25notCont;
 
-      const std::string m_EBdigiCollection ;
-      const std::string m_EEdigiCollection ;
-      const std::string m_ESdigiCollection ;
-      const std::string m_hitsProducerTag  ;
+  const unsigned int m_readoutFrameSize;
 
-      bool  m_useLCcorrection;
+protected:
+  std::unique_ptr<const EcalSimParameterMap> m_ParameterMap;
 
-      const bool m_apdSeparateDigi ;
+private:
+  const std::string m_apdDigiTag;
+  std::unique_ptr<const APDSimParameters> m_apdParameters;
 
-      const double m_EBs25notCont ;
-      const double m_EEs25notCont ;
+  std::unique_ptr<EBHitResponse> m_APDResponse;
 
-      const unsigned int         m_readoutFrameSize ;
-   protected:
-      std::unique_ptr<const EcalSimParameterMap> m_ParameterMap  ;
-   private:
-      const std::string          m_apdDigiTag    ;
-      std::unique_ptr<const APDSimParameters>    m_apdParameters ;
+protected:
+  std::unique_ptr<EBHitResponse> m_EBResponse;
+  std::unique_ptr<EEHitResponse> m_EEResponse;
 
-      std::unique_ptr<EBHitResponse> m_APDResponse ;
-   protected:
-      std::unique_ptr<EBHitResponse> m_EBResponse ;
-      std::unique_ptr<EEHitResponse> m_EEResponse ;
-   private:
-      std::unique_ptr<ESHitResponse> m_ESResponse ;
-      std::unique_ptr<CaloHitResponse> m_ESOldResponse ;
+private:
+  std::unique_ptr<ESHitResponse> m_ESResponse;
+  std::unique_ptr<CaloHitResponse> m_ESOldResponse;
 
-      const bool m_addESNoise ;
-      const bool m_PreMix1 ;
-      const bool m_PreMix2 ;
+  const bool m_addESNoise;
+  const bool m_PreMix1;
+  const bool m_PreMix2;
 
-      const bool m_doFastES   ;
+  const bool m_doFastES;
 
-      const bool m_doEB, m_doEE, m_doES;
+  const bool m_doEB, m_doEE, m_doES;
 
-      std::unique_ptr<ESElectronicsSim>     m_ESElectronicsSim     ;
-      std::unique_ptr<ESOldDigitizer>       m_ESOldDigitizer       ;
-      std::unique_ptr<ESElectronicsSimFast> m_ESElectronicsSimFast ;
-      std::unique_ptr<ESDigitizer>          m_ESDigitizer          ;
+  std::unique_ptr<ESElectronicsSim> m_ESElectronicsSim;
+  std::unique_ptr<ESOldDigitizer> m_ESOldDigitizer;
+  std::unique_ptr<ESElectronicsSimFast> m_ESElectronicsSimFast;
+  std::unique_ptr<ESDigitizer> m_ESDigitizer;
 
-      std::unique_ptr<EBDigitizer>          m_APDDigitizer ;
-      std::unique_ptr<EBDigitizer>          m_BarrelDigitizer ;
-      std::unique_ptr<EEDigitizer>          m_EndcapDigitizer ;
+  std::unique_ptr<EBDigitizer> m_APDDigitizer;
+  std::unique_ptr<EBDigitizer> m_BarrelDigitizer;
+  std::unique_ptr<EEDigitizer> m_EndcapDigitizer;
 
-      std::unique_ptr<EcalElectronicsSim>   m_ElectronicsSim ;
-      std::unique_ptr<EcalCoder>            m_Coder ;
+  std::unique_ptr<EcalElectronicsSim> m_ElectronicsSim;
+  std::unique_ptr<EcalCoder> m_Coder;
 
-      std::unique_ptr<EcalElectronicsSim>   m_APDElectronicsSim ;
-      std::unique_ptr<EcalCoder>            m_APDCoder ;
+  std::unique_ptr<EcalElectronicsSim> m_APDElectronicsSim;
+  std::unique_ptr<EcalCoder> m_APDCoder;
 
-      const CaloGeometry*   m_Geometry ;
+  const CaloGeometry *m_Geometry;
 
-      std::array< std::unique_ptr<CorrelatedNoisifier<EcalCorrMatrix> >, 3 > m_EBCorrNoise ;
-      std::array< std::unique_ptr<CorrelatedNoisifier<EcalCorrMatrix> >, 3 > m_EECorrNoise ;
+  std::array<std::unique_ptr<CorrelatedNoisifier<EcalCorrMatrix>>, 3> m_EBCorrNoise;
+  std::array<std::unique_ptr<CorrelatedNoisifier<EcalCorrMatrix>>, 3> m_EECorrNoise;
 
-      CLHEP::HepRandomEngine* randomEngine_ = nullptr;
+  CLHEP::HepRandomEngine *randomEngine_ = nullptr;
 };
 
-#endif 
+#endif
diff --git a/SimCalorimetry/EcalSimProducers/interface/EcalTimeDigiProducer.h b/SimCalorimetry/EcalSimProducers/interface/EcalTimeDigiProducer.h
index 3e3acc5de9813..f250f42fd9d6f 100644
--- a/SimCalorimetry/EcalSimProducers/interface/EcalTimeDigiProducer.h
+++ b/SimCalorimetry/EcalSimProducers/interface/EcalTimeDigiProducer.h
@@ -1,68 +1,66 @@
 #ifndef SimCalorimetry_EcalSimProducers_EcalTimeDigiProducer_h
 #define SimCalorimetry_EcalSimProducers_EcalTimeDigiProducer_h
 
-
 #include "DataFormats/Math/interface/Error.h"
 
-#include "SimCalorimetry/EcalSimAlgos/interface/EcalDigitizerTraits.h"
-#include "SimGeneral/MixingModule/interface/DigiAccumulatorMixMod.h"
-#include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
-#include "FWCore/Utilities/interface/EDGetToken.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
+#include "SimCalorimetry/EcalSimAlgos/interface/EcalDigitizerTraits.h"
+#include "SimDataFormats/CaloHit/interface/PCaloHit.h"
+#include "SimGeneral/MixingModule/interface/DigiAccumulatorMixMod.h"
 
 #include "FWCore/Framework/interface/ProducerBase.h"
 
 #include <vector>
 
-class ESDigitizer ;
+class ESDigitizer;
 
-class CaloGeometry ;
-class EcalSimParameterMap ;
-class PileUpEventPrincipal ;
+class CaloGeometry;
+class EcalSimParameterMap;
+class PileUpEventPrincipal;
 class EcalTimeMapDigitizer;
 
 namespace edm {
   class Event;
   class EventSetup;
-  template<typename T> class Handle;
+  template <typename T>
+  class Handle;
   class ParameterSet;
-}
+}  // namespace edm
 
 class EcalTimeDigiProducer : public DigiAccumulatorMixMod {
-   public:
-
-  EcalTimeDigiProducer( const edm::ParameterSet& params , edm::ProducerBase& mixMod, edm::ConsumesCollector&);
-      ~EcalTimeDigiProducer() override;
-
-      void initializeEvent(edm::Event const& e, edm::EventSetup const& c) override;
-      void accumulate(edm::Event const& e, edm::EventSetup const& c) override;
-      void accumulate(PileUpEventPrincipal const& e, edm::EventSetup const& c, edm::StreamID const&) override;
-      void finalizeEvent(edm::Event& e, edm::EventSetup const& c) override;
+public:
+  EcalTimeDigiProducer(const edm::ParameterSet &params, edm::ProducerBase &mixMod, edm::ConsumesCollector &);
+  ~EcalTimeDigiProducer() override;
 
-   private:
+  void initializeEvent(edm::Event const &e, edm::EventSetup const &c) override;
+  void accumulate(edm::Event const &e, edm::EventSetup const &c) override;
+  void accumulate(PileUpEventPrincipal const &e, edm::EventSetup const &c, edm::StreamID const &) override;
+  void finalizeEvent(edm::Event &e, edm::EventSetup const &c) override;
 
-      typedef edm::Handle<std::vector<PCaloHit> > HitsHandle;
-      void accumulateCaloHits(HitsHandle const& ebHandle, HitsHandle const& eeHandle,  int bunchCrossing);
+private:
+  typedef edm::Handle<std::vector<PCaloHit>> HitsHandle;
+  void accumulateCaloHits(HitsHandle const &ebHandle, HitsHandle const &eeHandle, int bunchCrossing);
 
-      void checkGeometry(const edm::EventSetup& eventSetup) ;
+  void checkGeometry(const edm::EventSetup &eventSetup);
 
-      void updateGeometry() ;
+  void updateGeometry();
 
-      const std::string m_EBdigiCollection ;
-      const std::string m_EEdigiCollection ;
-      const edm::InputTag m_hitsProducerTagEB  ;
-      const edm::InputTag m_hitsProducerTagEE  ;
-      const edm::EDGetTokenT<std::vector<PCaloHit> > m_hitsProducerTokenEB  ;
-      const edm::EDGetTokenT<std::vector<PCaloHit> > m_hitsProducerTokenEE  ;
+  const std::string m_EBdigiCollection;
+  const std::string m_EEdigiCollection;
+  const edm::InputTag m_hitsProducerTagEB;
+  const edm::InputTag m_hitsProducerTagEE;
+  const edm::EDGetTokenT<std::vector<PCaloHit>> m_hitsProducerTokenEB;
+  const edm::EDGetTokenT<std::vector<PCaloHit>> m_hitsProducerTokenEE;
 
-   private:
-      int m_timeLayerEB;
-      int m_timeLayerEE;
-      const CaloGeometry*   m_Geometry ;
+private:
+  int m_timeLayerEB;
+  int m_timeLayerEE;
+  const CaloGeometry *m_Geometry;
 
-      EcalTimeMapDigitizer* m_BarrelDigitizer;
-      EcalTimeMapDigitizer* m_EndcapDigitizer;
+  EcalTimeMapDigitizer *m_BarrelDigitizer;
+  EcalTimeMapDigitizer *m_EndcapDigitizer;
 };
 
-#endif 
+#endif
diff --git a/SimCalorimetry/EcalSimProducers/plugins/PreMixingEcalWorker.cc b/SimCalorimetry/EcalSimProducers/plugins/PreMixingEcalWorker.cc
index 0b1b76d62eae8..ec0a922d0ecc7 100644
--- a/SimCalorimetry/EcalSimProducers/plugins/PreMixingEcalWorker.cc
+++ b/SimCalorimetry/EcalSimProducers/plugins/PreMixingEcalWorker.cc
@@ -1,45 +1,45 @@
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/ProducerBase.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "SimGeneral/MixingModule/interface/PileUpEventPrincipal.h"
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "DataFormats/EcalDigi/interface/EBDataFrame.h"
 #include "DataFormats/EcalDigi/interface/EEDataFrame.h"
 #include "DataFormats/EcalDigi/interface/ESDataFrame.h"
-#include "SimCalorimetry/EcalSimProducers/interface/EcalDigiProducer.h"
+#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalSignalGenerator.h"
+#include "SimCalorimetry/EcalSimProducers/interface/EcalDigiProducer.h"
 
 #include "SimGeneral/PreMixingModule/interface/PreMixingWorker.h"
 #include "SimGeneral/PreMixingModule/interface/PreMixingWorkerFactory.h"
 
-class PreMixingEcalWorker: public PreMixingWorker {
+class PreMixingEcalWorker : public PreMixingWorker {
 public:
-  PreMixingEcalWorker(const edm::ParameterSet& ps, edm::ProducerBase& producer, edm::ConsumesCollector&& iC);
+  PreMixingEcalWorker(const edm::ParameterSet &ps, edm::ProducerBase &producer, edm::ConsumesCollector &&iC);
   ~PreMixingEcalWorker() override = default;
 
-  PreMixingEcalWorker(const PreMixingEcalWorker&) = delete;
-  PreMixingEcalWorker& operator=(const PreMixingEcalWorker&) = delete;
+  PreMixingEcalWorker(const PreMixingEcalWorker &) = delete;
+  PreMixingEcalWorker &operator=(const PreMixingEcalWorker &) = delete;
 
-  void beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& setup) override;
+  void beginLuminosityBlock(edm::LuminosityBlock const &lumi, edm::EventSetup const &setup) override;
 
-  void initializeEvent(edm::Event const& e, edm::EventSetup const& ES) override;
-  void addSignals(edm::Event const& e, edm::EventSetup const& ES) override;
-  void addPileups(PileUpEventPrincipal const& pep, edm::EventSetup const& es) override;
-  void put(edm::Event &e, edm::EventSetup const& iSetup, std::vector<PileupSummaryInfo> const& ps, int bs) override;
+  void initializeEvent(edm::Event const &e, edm::EventSetup const &ES) override;
+  void addSignals(edm::Event const &e, edm::EventSetup const &ES) override;
+  void addPileups(PileUpEventPrincipal const &pep, edm::EventSetup const &es) override;
+  void put(edm::Event &e, edm::EventSetup const &iSetup, std::vector<PileupSummaryInfo> const &ps, int bs) override;
 
 private:
-  edm::InputTag EBPileInputTag_; // InputTag for Pileup Digis collection
-  edm::InputTag EEPileInputTag_  ; // InputTag for Pileup Digis collection
-  edm::InputTag ESPileInputTag_  ; // InputTag for Pileup Digis collection
+  edm::InputTag EBPileInputTag_;  // InputTag for Pileup Digis collection
+  edm::InputTag EEPileInputTag_;  // InputTag for Pileup Digis collection
+  edm::InputTag ESPileInputTag_;  // InputTag for Pileup Digis collection
 
-  std::string EBDigiCollectionDM_; // secondary name to be given to collection of digis
-  std::string EEDigiCollectionDM_  ; // secondary name to be given to collection of digis
-  std::string ESDigiCollectionDM_  ; // secondary name to be given to collection of digis
+  std::string EBDigiCollectionDM_;  // secondary name to be given to collection of digis
+  std::string EEDigiCollectionDM_;  // secondary name to be given to collection of digis
+  std::string ESDigiCollectionDM_;  // secondary name to be given to collection of digis
 
   edm::EDGetTokenT<EBDigitizerTraits::DigiCollection> tok_eb_;
   edm::EDGetTokenT<EEDigitizerTraits::DigiCollection> tok_ee_;
@@ -56,48 +56,48 @@ class PreMixingEcalWorker: public PreMixingWorker {
   EcalDigiProducer myEcalDigitizer_;
 };
 
-
 // Constructor
-PreMixingEcalWorker::PreMixingEcalWorker(const edm::ParameterSet& ps, edm::ProducerBase& producer, edm::ConsumesCollector&& iC) : 
-  EBPileInputTag_(ps.getParameter<edm::InputTag>("EBPileInputTag")),
-  EEPileInputTag_(ps.getParameter<edm::InputTag>("EEPileInputTag")),
-  ESPileInputTag_(ps.getParameter<edm::InputTag>("ESPileInputTag")),
-  tok_eb_(iC.consumes<EBDigitizerTraits::DigiCollection>(EBPileInputTag_)),
-  tok_ee_(iC.consumes<EEDigitizerTraits::DigiCollection>(EEPileInputTag_)),
-  tok_es_(iC.consumes<ESDigitizerTraits::DigiCollection>(ESPileInputTag_)),
-  m_EBs25notCont(ps.getParameter<double>("EBs25notContainment") ) ,
-  m_EEs25notCont(ps.getParameter<double>("EEs25notContainment") ) ,
-  m_peToABarrel(ps.getParameter<double>("photoelectronsToAnalogBarrel") ) ,
-  m_peToAEndcap(ps.getParameter<double>("photoelectronsToAnalogEndcap") ),
-  theEBSignalGenerator(EBPileInputTag_,tok_eb_, m_EBs25notCont, m_EEs25notCont, m_peToABarrel, m_peToAEndcap),
-  theEESignalGenerator(EEPileInputTag_,tok_ee_, m_EBs25notCont, m_EEs25notCont, m_peToABarrel, m_peToAEndcap),
-  theESSignalGenerator(ESPileInputTag_,tok_es_, m_EBs25notCont, m_EEs25notCont, m_peToABarrel, m_peToAEndcap),
-  myEcalDigitizer_(ps, iC)
-{
-  EBDigiCollectionDM_   = ps.getParameter<std::string>("EBDigiCollectionDM");
-  EEDigiCollectionDM_   = ps.getParameter<std::string>("EEDigiCollectionDM");
-  ESDigiCollectionDM_   = ps.getParameter<std::string>("ESDigiCollectionDM");
-
-  producer.produces< EBDigiCollection >(EBDigiCollectionDM_);
-  producer.produces< EEDigiCollection >(EEDigiCollectionDM_);
-  producer.produces< ESDigiCollection >(ESDigiCollectionDM_);
-
-  myEcalDigitizer_.setEBNoiseSignalGenerator( & theEBSignalGenerator );
-  myEcalDigitizer_.setEENoiseSignalGenerator( & theEESignalGenerator );
-  myEcalDigitizer_.setESNoiseSignalGenerator( & theESSignalGenerator );
+PreMixingEcalWorker::PreMixingEcalWorker(const edm::ParameterSet &ps,
+                                         edm::ProducerBase &producer,
+                                         edm::ConsumesCollector &&iC)
+    : EBPileInputTag_(ps.getParameter<edm::InputTag>("EBPileInputTag")),
+      EEPileInputTag_(ps.getParameter<edm::InputTag>("EEPileInputTag")),
+      ESPileInputTag_(ps.getParameter<edm::InputTag>("ESPileInputTag")),
+      tok_eb_(iC.consumes<EBDigitizerTraits::DigiCollection>(EBPileInputTag_)),
+      tok_ee_(iC.consumes<EEDigitizerTraits::DigiCollection>(EEPileInputTag_)),
+      tok_es_(iC.consumes<ESDigitizerTraits::DigiCollection>(ESPileInputTag_)),
+      m_EBs25notCont(ps.getParameter<double>("EBs25notContainment")),
+      m_EEs25notCont(ps.getParameter<double>("EEs25notContainment")),
+      m_peToABarrel(ps.getParameter<double>("photoelectronsToAnalogBarrel")),
+      m_peToAEndcap(ps.getParameter<double>("photoelectronsToAnalogEndcap")),
+      theEBSignalGenerator(EBPileInputTag_, tok_eb_, m_EBs25notCont, m_EEs25notCont, m_peToABarrel, m_peToAEndcap),
+      theEESignalGenerator(EEPileInputTag_, tok_ee_, m_EBs25notCont, m_EEs25notCont, m_peToABarrel, m_peToAEndcap),
+      theESSignalGenerator(ESPileInputTag_, tok_es_, m_EBs25notCont, m_EEs25notCont, m_peToABarrel, m_peToAEndcap),
+      myEcalDigitizer_(ps, iC) {
+  EBDigiCollectionDM_ = ps.getParameter<std::string>("EBDigiCollectionDM");
+  EEDigiCollectionDM_ = ps.getParameter<std::string>("EEDigiCollectionDM");
+  ESDigiCollectionDM_ = ps.getParameter<std::string>("ESDigiCollectionDM");
+
+  producer.produces<EBDigiCollection>(EBDigiCollectionDM_);
+  producer.produces<EEDigiCollection>(EEDigiCollectionDM_);
+  producer.produces<ESDigiCollection>(ESDigiCollectionDM_);
+
+  myEcalDigitizer_.setEBNoiseSignalGenerator(&theEBSignalGenerator);
+  myEcalDigitizer_.setEENoiseSignalGenerator(&theEESignalGenerator);
+  myEcalDigitizer_.setESNoiseSignalGenerator(&theESSignalGenerator);
 }
 
-void PreMixingEcalWorker::initializeEvent(const edm::Event &e, const edm::EventSetup& ES) {
+void PreMixingEcalWorker::initializeEvent(const edm::Event &e, const edm::EventSetup &ES) {
   myEcalDigitizer_.initializeEvent(e, ES);
 }
 
-void PreMixingEcalWorker::addSignals(const edm::Event &e,const edm::EventSetup& ES) { 
+void PreMixingEcalWorker::addSignals(const edm::Event &e, const edm::EventSetup &ES) {
   myEcalDigitizer_.accumulate(e, ES);
 }
 
-void PreMixingEcalWorker::addPileups(const PileUpEventPrincipal& pep, const edm::EventSetup& ES) {
-
-  LogDebug("PreMixingEcalWorker") <<"\n===============> adding pileups from event  "<<pep.principal().id()<<" for bunchcrossing "<<pep.bunchCrossing();
+void PreMixingEcalWorker::addPileups(const PileUpEventPrincipal &pep, const edm::EventSetup &ES) {
+  LogDebug("PreMixingEcalWorker") << "\n===============> adding pileups from event  " << pep.principal().id()
+                                  << " for bunchcrossing " << pep.bunchCrossing();
 
   theEBSignalGenerator.initializeEvent(&pep.principal(), &ES);
   theEESignalGenerator.initializeEvent(&pep.principal(), &ES);
@@ -109,12 +109,15 @@ void PreMixingEcalWorker::addPileups(const PileUpEventPrincipal& pep, const edm:
   theESSignalGenerator.fill(pep.moduleCallingContext());
 }
 
-void PreMixingEcalWorker::put(edm::Event &e,const edm::EventSetup& ES, std::vector<PileupSummaryInfo> const& ps, int bs) {
-  myEcalDigitizer_.finalizeEvent( e, ES );
+void PreMixingEcalWorker::put(edm::Event &e,
+                              const edm::EventSetup &ES,
+                              std::vector<PileupSummaryInfo> const &ps,
+                              int bs) {
+  myEcalDigitizer_.finalizeEvent(e, ES);
 }
 
-void PreMixingEcalWorker::beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& setup) {
-  myEcalDigitizer_.beginLuminosityBlock(lumi,setup);
+void PreMixingEcalWorker::beginLuminosityBlock(edm::LuminosityBlock const &lumi, edm::EventSetup const &setup) {
+  myEcalDigitizer_.beginLuminosityBlock(lumi, setup);
 }
 
 DEFINE_PREMIXING_WORKER(PreMixingEcalWorker);
diff --git a/SimCalorimetry/EcalSimProducers/plugins/SealModule.cc b/SimCalorimetry/EcalSimProducers/plugins/SealModule.cc
index 17db6a577e626..43a5ed18e678d 100644
--- a/SimCalorimetry/EcalSimProducers/plugins/SealModule.cc
+++ b/SimCalorimetry/EcalSimProducers/plugins/SealModule.cc
@@ -1,8 +1,7 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "SimGeneral/MixingModule/interface/DigiAccumulatorMixModFactory.h"
 #include "SimCalorimetry/EcalSimProducers/interface/EcalDigiProducer.h"
 #include "SimCalorimetry/EcalSimProducers/interface/EcalTimeDigiProducer.h"
+#include "SimGeneral/MixingModule/interface/DigiAccumulatorMixModFactory.h"
 
 DEFINE_DIGI_ACCUMULATOR(EcalDigiProducer);
 DEFINE_DIGI_ACCUMULATOR(EcalTimeDigiProducer);
-
diff --git a/SimCalorimetry/EcalSimProducers/src/EcalDigiProducer.cc b/SimCalorimetry/EcalSimProducers/src/EcalDigiProducer.cc
index 12ce7fe2bf6db..eecef45149300 100644
--- a/SimCalorimetry/EcalSimProducers/src/EcalDigiProducer.cc
+++ b/SimCalorimetry/EcalSimProducers/src/EcalDigiProducer.cc
@@ -1,336 +1,314 @@
+#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "SimCalorimetry/EcalSimProducers/interface/EcalDigiProducer.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloHitResponse.h"
+#include "SimCalorimetry/EcalSimAlgos/interface/APDSimParameters.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EBHitResponse.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EEHitResponse.h"
+#include "SimCalorimetry/EcalSimAlgos/interface/ESElectronicsSim.h"
+#include "SimCalorimetry/EcalSimAlgos/interface/ESElectronicsSimFast.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/ESHitResponse.h"
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloHitResponse.h"
-#include "SimCalorimetry/EcalSimAlgos/interface/EcalSimParameterMap.h"
-#include "SimCalorimetry/EcalSimAlgos/interface/APDSimParameters.h"
-#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalCoder.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalElectronicsSim.h"
-#include "SimCalorimetry/EcalSimAlgos/interface/ESElectronicsSimFast.h"
-#include "SimCalorimetry/EcalSimAlgos/interface/ESElectronicsSim.h"
+#include "SimCalorimetry/EcalSimAlgos/interface/EcalSimParameterMap.h"
+#include "SimCalorimetry/EcalSimProducers/interface/EcalDigiProducer.h"
 //#include "SimCalorimetry/EcalSimAlgos/interface/ESFastTDigitizer.h"
-#include "SimCalorimetry/EcalSimAlgos/interface/ESDigitizer.h"
-#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
+#include "CalibCalorimetry/EcalLaserCorrection/interface/EcalLaserDbRecord.h"
+#include "CalibCalorimetry/EcalLaserCorrection/interface/EcalLaserDbService.h"
 #include "CalibFormats/CaloObjects/interface/CaloSamples.h"
-#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "CondFormats/DataRecord/interface/EcalADCToGeVConstantRcd.h"
+#include "CondFormats/DataRecord/interface/EcalGainRatiosRcd.h"
+#include "CondFormats/DataRecord/interface/EcalIntercalibConstantsMCRcd.h"
+#include "CondFormats/DataRecord/interface/EcalPedestalsRcd.h"
+#include "CondFormats/EcalObjects/interface/EcalADCToGeVConstant.h"
+#include "CondFormats/EcalObjects/interface/EcalGainRatios.h"
+#include "CondFormats/EcalObjects/interface/EcalIntercalibConstantsMC.h"
+#include "CondFormats/EcalObjects/interface/EcalPedestals.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
-#include "FWCore/Framework/interface/ProducerBase.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/LuminosityBlock.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/ProducerBase.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 #include "FWCore/Utilities/interface/StreamID.h"
-#include "SimGeneral/MixingModule/interface/PileUpEventPrincipal.h"
-#include "SimDataFormats/CaloHit/interface/PCaloHit.h"
+#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
+#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
-#include "CondFormats/EcalObjects/interface/EcalPedestals.h"
-#include "CondFormats/DataRecord/interface/EcalPedestalsRcd.h"
-#include "CondFormats/EcalObjects/interface/EcalIntercalibConstantsMC.h"
-#include "CondFormats/DataRecord/interface/EcalIntercalibConstantsMCRcd.h"
-#include "CalibCalorimetry/EcalLaserCorrection/interface/EcalLaserDbService.h"
-#include "CalibCalorimetry/EcalLaserCorrection/interface/EcalLaserDbRecord.h"
-#include "CondFormats/EcalObjects/interface/EcalADCToGeVConstant.h"
-#include "CondFormats/DataRecord/interface/EcalADCToGeVConstantRcd.h"
-#include "CondFormats/EcalObjects/interface/EcalGainRatios.h"
-#include "CondFormats/DataRecord/interface/EcalGainRatiosRcd.h"
+#include "SimCalorimetry/EcalSimAlgos/interface/ESDigitizer.h"
+#include "SimDataFormats/CaloHit/interface/PCaloHit.h"
+#include "SimGeneral/MixingModule/interface/PileUpEventPrincipal.h"
 
-#include "CondFormats/ESObjects/interface/ESIntercalibConstants.h"
+#include "CondFormats/DataRecord/interface/ESGainRcd.h"
 #include "CondFormats/DataRecord/interface/ESIntercalibConstantsRcd.h"
-#include "CondFormats/ESObjects/interface/ESMIPToGeVConstant.h"
 #include "CondFormats/DataRecord/interface/ESMIPToGeVConstantRcd.h"
+#include "CondFormats/DataRecord/interface/ESPedestalsRcd.h"
 #include "CondFormats/ESObjects/interface/ESGain.h"
-#include "CondFormats/DataRecord/interface/ESGainRcd.h"
+#include "CondFormats/ESObjects/interface/ESIntercalibConstants.h"
+#include "CondFormats/ESObjects/interface/ESMIPToGeVConstant.h"
 #include "CondFormats/ESObjects/interface/ESPedestals.h"
-#include "CondFormats/DataRecord/interface/ESPedestalsRcd.h"
 #include "Geometry/EcalAlgo/interface/EcalEndcapGeometry.h"
 
+EcalDigiProducer::EcalDigiProducer(const edm::ParameterSet &params,
+                                   edm::ProducerBase &mixMod,
+                                   edm::ConsumesCollector &iC)
+    : EcalDigiProducer(params, iC) {
+  if (m_apdSeparateDigi)
+    mixMod.produces<EBDigiCollection>(m_apdDigiTag);
 
-EcalDigiProducer::EcalDigiProducer( const edm::ParameterSet& params, edm::ProducerBase& mixMod, edm::ConsumesCollector& iC) :
-  EcalDigiProducer(params, iC)
-{
-   if(m_apdSeparateDigi) mixMod.produces<EBDigiCollection>(m_apdDigiTag);
-     
-   mixMod.produces<EBDigiCollection>(m_EBdigiCollection);
-   mixMod.produces<EEDigiCollection>(m_EEdigiCollection);
-   mixMod.produces<ESDigiCollection>(m_ESdigiCollection);
+  mixMod.produces<EBDigiCollection>(m_EBdigiCollection);
+  mixMod.produces<EEDigiCollection>(m_EEdigiCollection);
+  mixMod.produces<ESDigiCollection>(m_ESdigiCollection);
 }
 
 // version for Pre-Mixing, for use outside of MixingModule
-EcalDigiProducer::EcalDigiProducer( const edm::ParameterSet& params,  edm::ConsumesCollector& iC) :
-   DigiAccumulatorMixMod(),
-   m_APDShape         ( true ) ,
-   m_EBShape          ( true ) ,
-   m_EEShape          ( true ) ,
-   m_ESShape          (   ) ,
-   m_EBdigiCollection ( params.getParameter<std::string>("EBdigiCollection") ) ,
-   m_EEdigiCollection ( params.getParameter<std::string>("EEdigiCollection") ) ,
-   m_ESdigiCollection ( params.getParameter<std::string>("ESdigiCollection") ) ,
-   m_hitsProducerTag  ( params.getParameter<std::string>("hitsProducer"    ) ) ,
-   m_useLCcorrection  ( params.getUntrackedParameter<bool>("UseLCcorrection") ) ,
-   m_apdSeparateDigi  ( params.getParameter<bool>       ("apdSeparateDigi") ) ,
-
-   m_EBs25notCont     ( params.getParameter<double>     ("EBs25notContainment") ) ,
-   m_EEs25notCont     ( params.getParameter<double>     ("EEs25notContainment") ) ,
-
-   m_readoutFrameSize ( params.getParameter<int>       ("readoutFrameSize") ) ,
-   m_ParameterMap     ( new EcalSimParameterMap(
-			   params.getParameter<double> ("simHitToPhotoelectronsBarrel") ,
-			   params.getParameter<double> ("simHitToPhotoelectronsEndcap") , 
-			   params.getParameter<double> ("photoelectronsToAnalogBarrel") ,
-			   params.getParameter<double> ("photoelectronsToAnalogEndcap") , 
-			   params.getParameter<double> ("samplingFactor") ,
-			   params.getParameter<double> ("timePhase") ,
-			   m_readoutFrameSize ,
-			   params.getParameter<int>    ("binOfMaximum") , 
-			   params.getParameter<bool>   ("doPhotostatistics") ,
-			   params.getParameter<bool>   ("syncPhase") ) ) ,
-   
-   m_apdDigiTag    ( params.getParameter<std::string> ("apdDigiTag"  )      ) ,
-   m_apdParameters ( new APDSimParameters( 
-			params.getParameter<bool>        ("apdAddToBarrel"  ) ,
-			m_apdSeparateDigi ,
-			params.getParameter<double>      ("apdSimToPELow"   ) ,
-			params.getParameter<double>      ("apdSimToPEHigh"  ) ,
-			params.getParameter<double>      ("apdTimeOffset"   ) ,
-			params.getParameter<double>      ("apdTimeOffWidth" ) ,
-			params.getParameter<bool>        ("apdDoPEStats"    ) ,
-			m_apdDigiTag ,
-			params.getParameter<std::vector<double> > ( "apdNonlParms" ) ) ) ,
-
-   m_APDResponse ( !m_apdSeparateDigi ? nullptr :
-		   new EBHitResponse( m_ParameterMap.get()  ,
-				      &m_EBShape      ,
-				      true            ,
-				      m_apdParameters.get() ,
-				      &m_APDShape       ) ) ,
-   
-   m_EBResponse ( new EBHitResponse( m_ParameterMap.get()  ,
-				     &m_EBShape      ,
-				     false           , // barrel
-				     m_apdParameters.get() ,
-				     &m_APDShape       ) ) ,
-
-   m_EEResponse ( new EEHitResponse( m_ParameterMap.get(),
-				     &m_EEShape       ) ) ,
-   m_ESResponse ( new ESHitResponse( m_ParameterMap.get(), &m_ESShape ) ) ,
-   m_ESOldResponse ( new CaloHitResponse( m_ParameterMap.get(), &m_ESShape ) ) ,
-
-   m_addESNoise           ( params.getParameter<bool> ("doESNoise") ) ,
-   m_PreMix1              ( params.getParameter<bool> ("EcalPreMixStage1") ) ,
-   m_PreMix2              ( params.getParameter<bool> ("EcalPreMixStage2") ) ,
-
-   m_doFastES             ( params.getParameter<bool> ("doFast"   ) ) ,
-
-   m_doEB                 ( params.getParameter<bool> ("doEB"     ) ) ,
-   m_doEE                 ( params.getParameter<bool> ("doEE"     ) ) ,
-   m_doES                 ( params.getParameter<bool> ("doES"     ) ) ,
-
-   m_ESElectronicsSim     ( m_doFastES ? nullptr :
-			    new ESElectronicsSim( m_addESNoise ) ) ,
-	 
-   m_ESOldDigitizer       ( m_doFastES ? nullptr :
-			    new ESOldDigitizer( m_ESOldResponse.get()    , 
-						m_ESElectronicsSim.get() ,
-						m_addESNoise         ) ) ,
-   
-   m_ESElectronicsSimFast ( !m_doFastES ? nullptr :
-			    new ESElectronicsSimFast( m_addESNoise, 
-						      m_PreMix1      ) ) ,
-
-   m_ESDigitizer          ( !m_doFastES ? nullptr :
-			    new ESDigitizer( m_ESResponse.get()           ,
-					     m_ESElectronicsSimFast.get() ,
-					     m_addESNoise            ) ) ,
-
-   m_APDDigitizer      ( nullptr ) ,
-   m_BarrelDigitizer   ( nullptr ) ,
-   m_EndcapDigitizer   ( nullptr ) ,
-   m_ElectronicsSim    ( nullptr ) ,
-   m_Coder             ( nullptr ) ,
-   m_APDElectronicsSim ( nullptr ) ,
-   m_APDCoder          ( nullptr ) ,
-   m_Geometry          ( nullptr ) ,
-   m_EBCorrNoise       ( { {nullptr, nullptr, nullptr} } ) ,
-   m_EECorrNoise       ( { {nullptr, nullptr, nullptr} } ) 
-{
+EcalDigiProducer::EcalDigiProducer(const edm::ParameterSet &params, edm::ConsumesCollector &iC)
+    : DigiAccumulatorMixMod(),
+      m_APDShape(true),
+      m_EBShape(true),
+      m_EEShape(true),
+      m_ESShape(),
+      m_EBdigiCollection(params.getParameter<std::string>("EBdigiCollection")),
+      m_EEdigiCollection(params.getParameter<std::string>("EEdigiCollection")),
+      m_ESdigiCollection(params.getParameter<std::string>("ESdigiCollection")),
+      m_hitsProducerTag(params.getParameter<std::string>("hitsProducer")),
+      m_useLCcorrection(params.getUntrackedParameter<bool>("UseLCcorrection")),
+      m_apdSeparateDigi(params.getParameter<bool>("apdSeparateDigi")),
+
+      m_EBs25notCont(params.getParameter<double>("EBs25notContainment")),
+      m_EEs25notCont(params.getParameter<double>("EEs25notContainment")),
+
+      m_readoutFrameSize(params.getParameter<int>("readoutFrameSize")),
+      m_ParameterMap(new EcalSimParameterMap(params.getParameter<double>("simHitToPhotoelectronsBarrel"),
+                                             params.getParameter<double>("simHitToPhotoelectronsEndcap"),
+                                             params.getParameter<double>("photoelectronsToAnalogBarrel"),
+                                             params.getParameter<double>("photoelectronsToAnalogEndcap"),
+                                             params.getParameter<double>("samplingFactor"),
+                                             params.getParameter<double>("timePhase"),
+                                             m_readoutFrameSize,
+                                             params.getParameter<int>("binOfMaximum"),
+                                             params.getParameter<bool>("doPhotostatistics"),
+                                             params.getParameter<bool>("syncPhase"))),
+
+      m_apdDigiTag(params.getParameter<std::string>("apdDigiTag")),
+      m_apdParameters(new APDSimParameters(params.getParameter<bool>("apdAddToBarrel"),
+                                           m_apdSeparateDigi,
+                                           params.getParameter<double>("apdSimToPELow"),
+                                           params.getParameter<double>("apdSimToPEHigh"),
+                                           params.getParameter<double>("apdTimeOffset"),
+                                           params.getParameter<double>("apdTimeOffWidth"),
+                                           params.getParameter<bool>("apdDoPEStats"),
+                                           m_apdDigiTag,
+                                           params.getParameter<std::vector<double>>("apdNonlParms"))),
+
+      m_APDResponse(
+          !m_apdSeparateDigi
+              ? nullptr
+              : new EBHitResponse(m_ParameterMap.get(), &m_EBShape, true, m_apdParameters.get(), &m_APDShape)),
+
+      m_EBResponse(new EBHitResponse(m_ParameterMap.get(),
+                                     &m_EBShape,
+                                     false,  // barrel
+                                     m_apdParameters.get(),
+                                     &m_APDShape)),
+
+      m_EEResponse(new EEHitResponse(m_ParameterMap.get(), &m_EEShape)),
+      m_ESResponse(new ESHitResponse(m_ParameterMap.get(), &m_ESShape)),
+      m_ESOldResponse(new CaloHitResponse(m_ParameterMap.get(), &m_ESShape)),
+
+      m_addESNoise(params.getParameter<bool>("doESNoise")),
+      m_PreMix1(params.getParameter<bool>("EcalPreMixStage1")),
+      m_PreMix2(params.getParameter<bool>("EcalPreMixStage2")),
+
+      m_doFastES(params.getParameter<bool>("doFast")),
+
+      m_doEB(params.getParameter<bool>("doEB")),
+      m_doEE(params.getParameter<bool>("doEE")),
+      m_doES(params.getParameter<bool>("doES")),
+
+      m_ESElectronicsSim(m_doFastES ? nullptr : new ESElectronicsSim(m_addESNoise)),
+
+      m_ESOldDigitizer(m_doFastES ? nullptr
+                                  : new ESOldDigitizer(m_ESOldResponse.get(), m_ESElectronicsSim.get(), m_addESNoise)),
+
+      m_ESElectronicsSimFast(!m_doFastES ? nullptr : new ESElectronicsSimFast(m_addESNoise, m_PreMix1)),
+
+      m_ESDigitizer(!m_doFastES ? nullptr
+                                : new ESDigitizer(m_ESResponse.get(), m_ESElectronicsSimFast.get(), m_addESNoise)),
+
+      m_APDDigitizer(nullptr),
+      m_BarrelDigitizer(nullptr),
+      m_EndcapDigitizer(nullptr),
+      m_ElectronicsSim(nullptr),
+      m_Coder(nullptr),
+      m_APDElectronicsSim(nullptr),
+      m_APDCoder(nullptr),
+      m_Geometry(nullptr),
+      m_EBCorrNoise({{nullptr, nullptr, nullptr}}),
+      m_EECorrNoise({{nullptr, nullptr, nullptr}}) {
   // "produces" statements taken care of elsewhere.
   //   if(m_apdSeparateDigi) mixMod.produces<EBDigiCollection>(m_apdDigiTag);
   // mixMod.produces<EBDigiCollection>(m_EBdigiCollection);
   // mixMod.produces<EEDigiCollection>(m_EEdigiCollection);
   // mixMod.produces<ESDigiCollection>(m_ESdigiCollection);
-   if ( m_doEB ) iC.consumes<std::vector<PCaloHit> >(edm::InputTag(m_hitsProducerTag, "EcalHitsEB"));   
-   if ( m_doEE ) iC.consumes<std::vector<PCaloHit> >(edm::InputTag(m_hitsProducerTag, "EcalHitsEE"));
-   if ( m_doES ) iC.consumes<std::vector<PCaloHit> >(edm::InputTag(m_hitsProducerTag, "EcalHitsES"));
-
-   const std::vector<double> ebCorMatG12 = params.getParameter< std::vector<double> >("EBCorrNoiseMatrixG12");
-   const std::vector<double> eeCorMatG12 = params.getParameter< std::vector<double> >("EECorrNoiseMatrixG12");
-   const std::vector<double> ebCorMatG06 = params.getParameter< std::vector<double> >("EBCorrNoiseMatrixG06");
-   const std::vector<double> eeCorMatG06 = params.getParameter< std::vector<double> >("EECorrNoiseMatrixG06");
-   const std::vector<double> ebCorMatG01 = params.getParameter< std::vector<double> >("EBCorrNoiseMatrixG01");
-   const std::vector<double> eeCorMatG01 = params.getParameter< std::vector<double> >("EECorrNoiseMatrixG01");
-
-   const bool applyConstantTerm          = params.getParameter<bool>       ("applyConstantTerm");
-   const double rmsConstantTerm          = params.getParameter<double>     ("ConstantTerm");
-
-   const bool addNoise                   = params.getParameter<bool>       ("doENoise"); 
-   const bool cosmicsPhase               = params.getParameter<bool>       ("cosmicsPhase");
-   const double cosmicsShift             = params.getParameter<double>     ("cosmicsShift");
-
-//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-   // further phase for cosmics studies
-   if( cosmicsPhase ) 
-   {
-     if( m_doEB ) m_EBResponse->setPhaseShift( 1. + cosmicsShift ) ;
-     if( m_doEE ) m_EEResponse->setPhaseShift( 1. + cosmicsShift ) ;
-   }
-
-   EcalCorrMatrix ebMatrix[ 3 ] ;
-   EcalCorrMatrix eeMatrix[ 3 ] ;
-
-   assert( ebCorMatG12.size() == m_readoutFrameSize ) ;
-   assert( eeCorMatG12.size() == m_readoutFrameSize ) ;
-   assert( ebCorMatG06.size() == m_readoutFrameSize ) ;
-   assert( eeCorMatG06.size() == m_readoutFrameSize ) ;
-   assert( ebCorMatG01.size() == m_readoutFrameSize ) ;
-   assert( eeCorMatG01.size() == m_readoutFrameSize ) ;
-
-   assert( 1.e-7 > fabs( ebCorMatG12[0] - 1.0 ) ) ;
-   assert( 1.e-7 > fabs( ebCorMatG06[0] - 1.0 ) ) ;
-   assert( 1.e-7 > fabs( ebCorMatG01[0] - 1.0 ) ) ;
-   assert( 1.e-7 > fabs( eeCorMatG12[0] - 1.0 ) ) ;
-   assert( 1.e-7 > fabs( eeCorMatG06[0] - 1.0 ) ) ;
-   assert( 1.e-7 > fabs( eeCorMatG01[0] - 1.0 ) ) ;
-
-   for ( unsigned int row ( 0 ) ; row != m_readoutFrameSize ; ++row )
-   {
-      assert( 0 == row || 1. >= ebCorMatG12[row] ) ;
-      assert( 0 == row || 1. >= ebCorMatG06[row] ) ;
-      assert( 0 == row || 1. >= ebCorMatG01[row] ) ;
-      assert( 0 == row || 1. >= eeCorMatG12[row] ) ;
-      assert( 0 == row || 1. >= eeCorMatG06[row] ) ;
-      assert( 0 == row || 1. >= eeCorMatG01[row] ) ;
-      for ( unsigned int column ( 0 ) ; column <= row ; ++column )
-      {
-	 const unsigned int index ( row - column ) ;
-	 ebMatrix[0]( row, column ) = ebCorMatG12[ index ] ;
-	 eeMatrix[0]( row, column ) = eeCorMatG12[ index ] ;
-	 ebMatrix[1]( row, column ) = ebCorMatG06[ index ] ;
-	 eeMatrix[1]( row, column ) = eeCorMatG06[ index ] ;
-	 ebMatrix[2]( row, column ) = ebCorMatG01[ index ] ;
-	 eeMatrix[2]( row, column ) = eeCorMatG01[ index ] ;
-      }
-   }
-			  
-   m_EBCorrNoise[0].reset( new CorrelatedNoisifier<EcalCorrMatrix>( ebMatrix[0] ) );
-   m_EECorrNoise[0].reset( new CorrelatedNoisifier<EcalCorrMatrix>( eeMatrix[0] ) );
-   m_EBCorrNoise[1].reset( new CorrelatedNoisifier<EcalCorrMatrix>( ebMatrix[1] ) );
-   m_EECorrNoise[1].reset( new CorrelatedNoisifier<EcalCorrMatrix>( eeMatrix[1] ) );
-   m_EBCorrNoise[2].reset( new CorrelatedNoisifier<EcalCorrMatrix>( ebMatrix[2] ) );
-   m_EECorrNoise[2].reset( new CorrelatedNoisifier<EcalCorrMatrix>( eeMatrix[2] ) );
-
-   m_Coder.reset( new EcalCoder( addNoise         , 
-                                 m_PreMix1        ,
-                                 m_EBCorrNoise[0].get() ,
-                                 m_EECorrNoise[0].get() ,
-                                 m_EBCorrNoise[1].get() ,
-                                 m_EECorrNoise[1].get() ,
-                                 m_EBCorrNoise[2].get() ,
-                                 m_EECorrNoise[2].get()   ) );
-
-   m_ElectronicsSim.reset( new EcalElectronicsSim( m_ParameterMap.get()    ,
-                                                   m_Coder.get()           ,
-                                                   applyConstantTerm ,
-                                                   rmsConstantTerm     ) );
-				  
-   if( m_apdSeparateDigi )
-   {
-     m_APDCoder.reset( new EcalCoder( false            , 
-                                      m_PreMix1        ,
-                                      m_EBCorrNoise[0].get() ,
-                                      m_EECorrNoise[0].get() ,
-                                      m_EBCorrNoise[1].get() ,
-                                      m_EECorrNoise[1].get() ,
-                                      m_EBCorrNoise[2].get() ,
-                                      m_EECorrNoise[2].get()   ) );
-     
-     m_APDElectronicsSim.reset( new EcalElectronicsSim( m_ParameterMap.get()    ,
-                                                        m_APDCoder.get()        ,
-                                                        applyConstantTerm ,
-                                                        rmsConstantTerm     ) );
-     
-     m_APDDigitizer.reset( new EBDigitizer( m_APDResponse.get()       , 
-                                            m_APDElectronicsSim.get() ,
-                                            false                 ) );
-   }
-
-   if( m_doEB ) {
-     m_BarrelDigitizer.reset( new EBDigitizer( m_EBResponse.get()     , 
-                                               m_ElectronicsSim.get() ,
-                                               addNoise            ) );
-   }
-
-   if( m_doEE ) {
-     m_EndcapDigitizer.reset( new EEDigitizer( m_EEResponse.get()     ,
-                                               m_ElectronicsSim.get() , 
-                                               addNoise            ) );
-   }
-}
+  if (m_doEB)
+    iC.consumes<std::vector<PCaloHit>>(edm::InputTag(m_hitsProducerTag, "EcalHitsEB"));
+  if (m_doEE)
+    iC.consumes<std::vector<PCaloHit>>(edm::InputTag(m_hitsProducerTag, "EcalHitsEE"));
+  if (m_doES)
+    iC.consumes<std::vector<PCaloHit>>(edm::InputTag(m_hitsProducerTag, "EcalHitsES"));
+
+  const std::vector<double> ebCorMatG12 = params.getParameter<std::vector<double>>("EBCorrNoiseMatrixG12");
+  const std::vector<double> eeCorMatG12 = params.getParameter<std::vector<double>>("EECorrNoiseMatrixG12");
+  const std::vector<double> ebCorMatG06 = params.getParameter<std::vector<double>>("EBCorrNoiseMatrixG06");
+  const std::vector<double> eeCorMatG06 = params.getParameter<std::vector<double>>("EECorrNoiseMatrixG06");
+  const std::vector<double> ebCorMatG01 = params.getParameter<std::vector<double>>("EBCorrNoiseMatrixG01");
+  const std::vector<double> eeCorMatG01 = params.getParameter<std::vector<double>>("EECorrNoiseMatrixG01");
+
+  const bool applyConstantTerm = params.getParameter<bool>("applyConstantTerm");
+  const double rmsConstantTerm = params.getParameter<double>("ConstantTerm");
+
+  const bool addNoise = params.getParameter<bool>("doENoise");
+  const bool cosmicsPhase = params.getParameter<bool>("cosmicsPhase");
+  const double cosmicsShift = params.getParameter<double>("cosmicsShift");
+
+  //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+  // further phase for cosmics studies
+  if (cosmicsPhase) {
+    if (m_doEB)
+      m_EBResponse->setPhaseShift(1. + cosmicsShift);
+    if (m_doEE)
+      m_EEResponse->setPhaseShift(1. + cosmicsShift);
+  }
+
+  EcalCorrMatrix ebMatrix[3];
+  EcalCorrMatrix eeMatrix[3];
+
+  assert(ebCorMatG12.size() == m_readoutFrameSize);
+  assert(eeCorMatG12.size() == m_readoutFrameSize);
+  assert(ebCorMatG06.size() == m_readoutFrameSize);
+  assert(eeCorMatG06.size() == m_readoutFrameSize);
+  assert(ebCorMatG01.size() == m_readoutFrameSize);
+  assert(eeCorMatG01.size() == m_readoutFrameSize);
+
+  assert(1.e-7 > fabs(ebCorMatG12[0] - 1.0));
+  assert(1.e-7 > fabs(ebCorMatG06[0] - 1.0));
+  assert(1.e-7 > fabs(ebCorMatG01[0] - 1.0));
+  assert(1.e-7 > fabs(eeCorMatG12[0] - 1.0));
+  assert(1.e-7 > fabs(eeCorMatG06[0] - 1.0));
+  assert(1.e-7 > fabs(eeCorMatG01[0] - 1.0));
+
+  for (unsigned int row(0); row != m_readoutFrameSize; ++row) {
+    assert(0 == row || 1. >= ebCorMatG12[row]);
+    assert(0 == row || 1. >= ebCorMatG06[row]);
+    assert(0 == row || 1. >= ebCorMatG01[row]);
+    assert(0 == row || 1. >= eeCorMatG12[row]);
+    assert(0 == row || 1. >= eeCorMatG06[row]);
+    assert(0 == row || 1. >= eeCorMatG01[row]);
+    for (unsigned int column(0); column <= row; ++column) {
+      const unsigned int index(row - column);
+      ebMatrix[0](row, column) = ebCorMatG12[index];
+      eeMatrix[0](row, column) = eeCorMatG12[index];
+      ebMatrix[1](row, column) = ebCorMatG06[index];
+      eeMatrix[1](row, column) = eeCorMatG06[index];
+      ebMatrix[2](row, column) = ebCorMatG01[index];
+      eeMatrix[2](row, column) = eeCorMatG01[index];
+    }
+  }
 
+  m_EBCorrNoise[0].reset(new CorrelatedNoisifier<EcalCorrMatrix>(ebMatrix[0]));
+  m_EECorrNoise[0].reset(new CorrelatedNoisifier<EcalCorrMatrix>(eeMatrix[0]));
+  m_EBCorrNoise[1].reset(new CorrelatedNoisifier<EcalCorrMatrix>(ebMatrix[1]));
+  m_EECorrNoise[1].reset(new CorrelatedNoisifier<EcalCorrMatrix>(eeMatrix[1]));
+  m_EBCorrNoise[2].reset(new CorrelatedNoisifier<EcalCorrMatrix>(ebMatrix[2]));
+  m_EECorrNoise[2].reset(new CorrelatedNoisifier<EcalCorrMatrix>(eeMatrix[2]));
+
+  m_Coder.reset(new EcalCoder(addNoise,
+                              m_PreMix1,
+                              m_EBCorrNoise[0].get(),
+                              m_EECorrNoise[0].get(),
+                              m_EBCorrNoise[1].get(),
+                              m_EECorrNoise[1].get(),
+                              m_EBCorrNoise[2].get(),
+                              m_EECorrNoise[2].get()));
+
+  m_ElectronicsSim.reset(
+      new EcalElectronicsSim(m_ParameterMap.get(), m_Coder.get(), applyConstantTerm, rmsConstantTerm));
+
+  if (m_apdSeparateDigi) {
+    m_APDCoder.reset(new EcalCoder(false,
+                                   m_PreMix1,
+                                   m_EBCorrNoise[0].get(),
+                                   m_EECorrNoise[0].get(),
+                                   m_EBCorrNoise[1].get(),
+                                   m_EECorrNoise[1].get(),
+                                   m_EBCorrNoise[2].get(),
+                                   m_EECorrNoise[2].get()));
+
+    m_APDElectronicsSim.reset(
+        new EcalElectronicsSim(m_ParameterMap.get(), m_APDCoder.get(), applyConstantTerm, rmsConstantTerm));
+
+    m_APDDigitizer.reset(new EBDigitizer(m_APDResponse.get(), m_APDElectronicsSim.get(), false));
+  }
 
-EcalDigiProducer::~EcalDigiProducer() 
-{}
+  if (m_doEB) {
+    m_BarrelDigitizer.reset(new EBDigitizer(m_EBResponse.get(), m_ElectronicsSim.get(), addNoise));
+  }
 
-void
-EcalDigiProducer::initializeEvent(edm::Event const& event, edm::EventSetup const& eventSetup) {
+  if (m_doEE) {
+    m_EndcapDigitizer.reset(new EEDigitizer(m_EEResponse.get(), m_ElectronicsSim.get(), addNoise));
+  }
+}
+
+EcalDigiProducer::~EcalDigiProducer() {}
+
+void EcalDigiProducer::initializeEvent(edm::Event const &event, edm::EventSetup const &eventSetup) {
   edm::Service<edm::RandomNumberGenerator> rng;
   randomEngine_ = &rng->getEngine(event.streamID());
 
-   checkGeometry( eventSetup );
-   checkCalibrations( event, eventSetup );
-   if( m_doEB ) {
-     m_BarrelDigitizer->initializeHits();
-     if(m_apdSeparateDigi) {
-       m_APDDigitizer->initializeHits();
-     }
-   }
-   if( m_doEE ) {
-     m_EndcapDigitizer->initializeHits();
-   }
-   if( m_doES ) {
-     if(m_doFastES) {
-       m_ESDigitizer->initializeHits();
-     } else {
-       m_ESOldDigitizer->initializeHits();
-     }
-   }
+  checkGeometry(eventSetup);
+  checkCalibrations(event, eventSetup);
+  if (m_doEB) {
+    m_BarrelDigitizer->initializeHits();
+    if (m_apdSeparateDigi) {
+      m_APDDigitizer->initializeHits();
+    }
+  }
+  if (m_doEE) {
+    m_EndcapDigitizer->initializeHits();
+  }
+  if (m_doES) {
+    if (m_doFastES) {
+      m_ESDigitizer->initializeHits();
+    } else {
+      m_ESOldDigitizer->initializeHits();
+    }
+  }
 }
 
-void
-EcalDigiProducer::accumulateCaloHits(HitsHandle const& ebHandle, HitsHandle const& eeHandle, HitsHandle const& esHandle, int bunchCrossing) {
-  if(m_doEB && ebHandle.isValid()) {
+void EcalDigiProducer::accumulateCaloHits(HitsHandle const &ebHandle,
+                                          HitsHandle const &eeHandle,
+                                          HitsHandle const &esHandle,
+                                          int bunchCrossing) {
+  if (m_doEB && ebHandle.isValid()) {
     m_BarrelDigitizer->add(*ebHandle.product(), bunchCrossing, randomEngine_);
 
-    if(m_apdSeparateDigi) {
+    if (m_apdSeparateDigi) {
       m_APDDigitizer->add(*ebHandle.product(), bunchCrossing, randomEngine_);
     }
   }
 
-  if(m_doEE && eeHandle.isValid()) {
+  if (m_doEE && eeHandle.isValid()) {
     m_EndcapDigitizer->add(*eeHandle.product(), bunchCrossing, randomEngine_);
   }
 
-  if(m_doES && esHandle.isValid()) {
-    if(m_doFastES) {
+  if (m_doES && esHandle.isValid()) {
+    if (m_doFastES) {
       m_ESDigitizer->add(*esHandle.product(), bunchCrossing, randomEngine_);
     } else {
       m_ESOldDigitizer->add(*esHandle.product(), bunchCrossing, randomEngine_);
@@ -338,26 +316,27 @@ EcalDigiProducer::accumulateCaloHits(HitsHandle const& ebHandle, HitsHandle cons
   }
 }
 
-void
-EcalDigiProducer::accumulate(edm::Event const& e, edm::EventSetup const& eventSetup) {
+void EcalDigiProducer::accumulate(edm::Event const &e, edm::EventSetup const &eventSetup) {
   // Step A: Get Inputs
-  edm::Handle<std::vector<PCaloHit> > ebHandle;
-  if(m_doEB) {
-    m_EBShape.setEventSetup(eventSetup);  // need to set the eventSetup here, otherwise pre-mixing module will not wrk
-    m_APDShape.setEventSetup(eventSetup); //
+  edm::Handle<std::vector<PCaloHit>> ebHandle;
+  if (m_doEB) {
+    m_EBShape.setEventSetup(eventSetup);   // need to set the eventSetup here, otherwise pre-mixing
+                                           // module will not wrk
+    m_APDShape.setEventSetup(eventSetup);  //
     edm::InputTag ebTag(m_hitsProducerTag, "EcalHitsEB");
     e.getByLabel(ebTag, ebHandle);
   }
 
-  edm::Handle<std::vector<PCaloHit> > eeHandle;
-  if(m_doEE) {
-    m_EEShape.setEventSetup(eventSetup); // need to set the eventSetup here, otherwise pre-mixing module will not work
+  edm::Handle<std::vector<PCaloHit>> eeHandle;
+  if (m_doEE) {
+    m_EEShape.setEventSetup(eventSetup);  // need to set the eventSetup here, otherwise pre-mixing
+                                          // module will not work
     edm::InputTag eeTag(m_hitsProducerTag, "EcalHitsEE");
     e.getByLabel(eeTag, eeHandle);
   }
 
-  edm::Handle<std::vector<PCaloHit> > esHandle;
-  if(m_doES) {
+  edm::Handle<std::vector<PCaloHit>> esHandle;
+  if (m_doES) {
     edm::InputTag esTag(m_hitsProducerTag, "EcalHitsES");
     e.getByLabel(esTag, esHandle);
   }
@@ -365,23 +344,24 @@ EcalDigiProducer::accumulate(edm::Event const& e, edm::EventSetup const& eventSe
   accumulateCaloHits(ebHandle, eeHandle, esHandle, 0);
 }
 
-void
-EcalDigiProducer::accumulate(PileUpEventPrincipal const& e, edm::EventSetup const& eventSetup, edm::StreamID const& streamID) {
+void EcalDigiProducer::accumulate(PileUpEventPrincipal const &e,
+                                  edm::EventSetup const &eventSetup,
+                                  edm::StreamID const &streamID) {
   // Step A: Get Inputs
-  edm::Handle<std::vector<PCaloHit> > ebHandle;
-  if(m_doEB) {
+  edm::Handle<std::vector<PCaloHit>> ebHandle;
+  if (m_doEB) {
     edm::InputTag ebTag(m_hitsProducerTag, "EcalHitsEB");
     e.getByLabel(ebTag, ebHandle);
   }
 
-  edm::Handle<std::vector<PCaloHit> > eeHandle;
-  if(m_doEE) {
+  edm::Handle<std::vector<PCaloHit>> eeHandle;
+  if (m_doEE) {
     edm::InputTag eeTag(m_hitsProducerTag, "EcalHitsEE");
     e.getByLabel(eeTag, eeHandle);
   }
 
-  edm::Handle<std::vector<PCaloHit> > esHandle;
-  if(m_doES) {
+  edm::Handle<std::vector<PCaloHit>> esHandle;
+  if (m_doES) {
     edm::InputTag esTag(m_hitsProducerTag, "EcalHitsES");
     e.getByLabel(esTag, esHandle);
   }
@@ -389,271 +369,247 @@ EcalDigiProducer::accumulate(PileUpEventPrincipal const& e, edm::EventSetup cons
   accumulateCaloHits(ebHandle, eeHandle, esHandle, e.bunchCrossing());
 }
 
-void 
-EcalDigiProducer::finalizeEvent(edm::Event& event, edm::EventSetup const& eventSetup) {
-   // Step B: Create empty output
-   std::unique_ptr<EBDigiCollection> apdResult      ( !m_apdSeparateDigi || !m_doEB ? nullptr :
-						    new EBDigiCollection() ) ;
-   std::unique_ptr<EBDigiCollection> barrelResult   ( new EBDigiCollection() ) ;
-   std::unique_ptr<EEDigiCollection> endcapResult   ( new EEDigiCollection() ) ;
-   std::unique_ptr<ESDigiCollection> preshowerResult( new ESDigiCollection() ) ;
-   
-   // run the algorithm
-
-   if( m_doEB ) {
-     m_BarrelDigitizer->run( *barrelResult, randomEngine_ ) ;
-     cacheEBDigis( &*barrelResult ) ;
-     
-     edm::LogInfo("DigiInfo") << "EB Digis: " << barrelResult->size() ;
-     
-     if( m_apdSeparateDigi ) {
-       m_APDDigitizer->run( *apdResult, randomEngine_ ) ;
-       edm::LogInfo("DigiInfo") << "APD Digis: " << apdResult->size() ;
-     }
-   }
-
-   if( m_doEE ) {
-     m_EndcapDigitizer->run( *endcapResult, randomEngine_ ) ;
-     edm::LogInfo("EcalDigi") << "EE Digis: " << endcapResult->size() ;
-     cacheEEDigis( &*endcapResult ) ;
-   }
-   if( m_doES ) {
-     if(m_doFastES) {
-       m_ESDigitizer->run( *preshowerResult, randomEngine_ ) ;
-     } else {
-       m_ESOldDigitizer->run( *preshowerResult, randomEngine_ ) ;
-     }
-     edm::LogInfo("EcalDigi") << "ES Digis: " << preshowerResult->size();
-   }
-
-
-   // Step D: Put outputs into event
-   if( m_apdSeparateDigi ) {
-     //event.put(std::move(apdResult),    m_apdDigiTag         ) ;
-   }
-
-   event.put(std::move(barrelResult),    m_EBdigiCollection ) ;
-   event.put(std::move(endcapResult),    m_EEdigiCollection ) ;
-   event.put(std::move(preshowerResult), m_ESdigiCollection ) ;
-
-   randomEngine_ = nullptr; // to prevent access outside event
+void EcalDigiProducer::finalizeEvent(edm::Event &event, edm::EventSetup const &eventSetup) {
+  // Step B: Create empty output
+  std::unique_ptr<EBDigiCollection> apdResult(!m_apdSeparateDigi || !m_doEB ? nullptr : new EBDigiCollection());
+  std::unique_ptr<EBDigiCollection> barrelResult(new EBDigiCollection());
+  std::unique_ptr<EEDigiCollection> endcapResult(new EEDigiCollection());
+  std::unique_ptr<ESDigiCollection> preshowerResult(new ESDigiCollection());
+
+  // run the algorithm
+
+  if (m_doEB) {
+    m_BarrelDigitizer->run(*barrelResult, randomEngine_);
+    cacheEBDigis(&*barrelResult);
+
+    edm::LogInfo("DigiInfo") << "EB Digis: " << barrelResult->size();
+
+    if (m_apdSeparateDigi) {
+      m_APDDigitizer->run(*apdResult, randomEngine_);
+      edm::LogInfo("DigiInfo") << "APD Digis: " << apdResult->size();
+    }
+  }
+
+  if (m_doEE) {
+    m_EndcapDigitizer->run(*endcapResult, randomEngine_);
+    edm::LogInfo("EcalDigi") << "EE Digis: " << endcapResult->size();
+    cacheEEDigis(&*endcapResult);
+  }
+  if (m_doES) {
+    if (m_doFastES) {
+      m_ESDigitizer->run(*preshowerResult, randomEngine_);
+    } else {
+      m_ESOldDigitizer->run(*preshowerResult, randomEngine_);
+    }
+    edm::LogInfo("EcalDigi") << "ES Digis: " << preshowerResult->size();
+  }
+
+  // Step D: Put outputs into event
+  if (m_apdSeparateDigi) {
+    // event.put(std::move(apdResult),    m_apdDigiTag         ) ;
+  }
+
+  event.put(std::move(barrelResult), m_EBdigiCollection);
+  event.put(std::move(endcapResult), m_EEdigiCollection);
+  event.put(std::move(preshowerResult), m_ESdigiCollection);
+
+  randomEngine_ = nullptr;  // to prevent access outside event
 }
 
-void
-EcalDigiProducer::beginLuminosityBlock(edm::LuminosityBlock const& lumi, edm::EventSetup const& setup)
-{
-   edm::Service<edm::RandomNumberGenerator> rng;
-   if ( ! rng.isAvailable() ) {
-      throw cms::Exception("Configuration") <<
-         "RandomNumberGenerator service is not available.\n"
-         "You must add the service in the configuration file\n"
-         "or remove the module that requires it.";
-   }
-   CLHEP::HepRandomEngine* engine = &rng->getEngine(lumi.index());
-
-   if( m_doEB ) {
-     if( nullptr != m_APDResponse ) m_APDResponse->initialize(engine);
-     m_EBResponse->initialize(engine);
-   }
+void EcalDigiProducer::beginLuminosityBlock(edm::LuminosityBlock const &lumi, edm::EventSetup const &setup) {
+  edm::Service<edm::RandomNumberGenerator> rng;
+  if (!rng.isAvailable()) {
+    throw cms::Exception("Configuration") << "RandomNumberGenerator service is not available.\n"
+                                             "You must add the service in the configuration file\n"
+                                             "or remove the module that requires it.";
+  }
+  CLHEP::HepRandomEngine *engine = &rng->getEngine(lumi.index());
+
+  if (m_doEB) {
+    if (nullptr != m_APDResponse)
+      m_APDResponse->initialize(engine);
+    m_EBResponse->initialize(engine);
+  }
 }
 
-void  
-EcalDigiProducer::checkCalibrations(const edm::Event& event, const edm::EventSetup& eventSetup ) 
-{
-   // Pedestals from event setup
-
-   edm::ESHandle<EcalPedestals>            dbPed   ;
-   eventSetup.get<EcalPedestalsRcd>().get( dbPed ) ;
-   const EcalPedestals* pedestals        ( dbPed.product() ) ;
-  
-   m_Coder->setPedestals( pedestals ) ;
-   if( nullptr != m_APDCoder ) m_APDCoder->setPedestals( pedestals ) ;
-
-   // Ecal Intercalibration Constants
-   edm::ESHandle<EcalIntercalibConstantsMC>            pIcal   ;
-   eventSetup.get<EcalIntercalibConstantsMCRcd>().get( pIcal ) ;
-   const EcalIntercalibConstantsMC* ical             ( pIcal.product() ) ;
-  
-   m_Coder->setIntercalibConstants( ical ) ;
-   if( nullptr != m_APDCoder) m_APDCoder->setIntercalibConstants( ical ) ;
-
-   m_EBResponse->setIntercal( ical ) ;
-   if( nullptr != m_APDResponse ) m_APDResponse->setIntercal( ical ) ;
-
-   // Ecal LaserCorrection Constants                                
-   edm::ESHandle<EcalLaserDbService> laser;
-   eventSetup.get<EcalLaserDbRecord>().get(laser);
-   const edm::TimeValue_t eventTimeValue = event.time().value();
-
-   m_EBResponse->setEventTime(eventTimeValue);
-   m_EBResponse->setLaserConstants(laser.product(), m_useLCcorrection);
-
-   m_EEResponse->setEventTime(eventTimeValue);
-   m_EEResponse->setLaserConstants(laser.product(), m_useLCcorrection);
-
-   // ADC -> GeV Scale
-   edm::ESHandle<EcalADCToGeVConstant> pAgc;
-   eventSetup.get<EcalADCToGeVConstantRcd>().get(pAgc);
-   const EcalADCToGeVConstant* agc = pAgc.product();
-  
-   // Gain Ratios
-   edm::ESHandle<EcalGainRatios> pRatio;
-   eventSetup.get<EcalGainRatiosRcd>().get(pRatio);
-   const EcalGainRatios* gr = pRatio.product();
-
-   m_Coder->setGainRatios( gr );
-   if( nullptr != m_APDCoder) m_APDCoder->setGainRatios( gr );
-
-   EcalMGPAGainRatio * defaultRatios = new EcalMGPAGainRatio();
-
-   double theGains[m_Coder->NGAINS+1];
-   theGains[0] = 0.;
-   theGains[3] = 1.;
-   theGains[2] = defaultRatios->gain6Over1() ;
-   theGains[1] = theGains[2]*(defaultRatios->gain12Over6()) ;
-
-   LogDebug("EcalDigi") << " Gains: " << "\n" << " g1 = " << theGains[1] 
-			<< "\n" << " g2 = " << theGains[2] 
-			<< "\n" << " g3 = " << theGains[3] ;
-
-   delete defaultRatios;
-
-   const double EBscale (
-      ( agc->getEBValue())*theGains[1]*(m_Coder->MAXADC)*m_EBs25notCont ) ;
-
-   LogDebug("EcalDigi") << " GeV/ADC = " << agc->getEBValue() 
-			<< "\n" << " notCont = " << m_EBs25notCont 
-			<< "\n" << " saturation for EB = " << EBscale 
-			<< ", " << m_EBs25notCont ;
-
-   const double EEscale (
-      (agc->getEEValue())*theGains[1]*(m_Coder->MAXADC)*m_EEs25notCont ) ;
-
-   LogDebug("EcalDigi") << " GeV/ADC = " << agc->getEEValue() 
-			<< "\n" << " notCont = " << m_EEs25notCont 
-			<< "\n" << " saturation for EB = " << EEscale 
-			<< ", " << m_EEs25notCont ;
-
-   m_Coder->setFullScaleEnergy( EBscale , 
-				EEscale   ) ;
-   if( nullptr != m_APDCoder ) m_APDCoder->setFullScaleEnergy( EBscale ,
-							 EEscale   ) ;
-
-   if( nullptr != m_ESOldDigitizer ||
-       nullptr != m_ESDigitizer       )
-   {
-      // ES condition objects
-      edm::ESHandle<ESGain>                hesgain      ;
-      edm::ESHandle<ESMIPToGeVConstant>    hesMIPToGeV  ;
-      edm::ESHandle<ESPedestals>           hesPedestals ;
-      edm::ESHandle<ESIntercalibConstants> hesMIPs      ;
-
-      eventSetup.get<ESGainRcd>().               get( hesgain      ) ;
-      eventSetup.get<ESMIPToGeVConstantRcd>().   get( hesMIPToGeV  ) ;
-      eventSetup.get<ESPedestalsRcd>().          get( hesPedestals ) ;
-      eventSetup.get<ESIntercalibConstantsRcd>().get( hesMIPs      ) ;
-
-      const ESGain*                esgain     ( hesgain.product()      ) ;
-      const ESPedestals*           espeds     ( hesPedestals.product() ) ;
-      const ESIntercalibConstants* esmips     ( hesMIPs.product()      ) ;
-      const ESMIPToGeVConstant*    esMipToGeV ( hesMIPToGeV.product()  ) ;
-      const int ESGain ( 1.1 > esgain->getESGain() ? 1 : 2 ) ;
-      const double ESMIPToGeV ( ( 1 == ESGain ) ?
-				esMipToGeV->getESValueLow()  :
-				esMipToGeV->getESValueHigh()   ) ; 
-   
-      if( m_doES ) {
-        m_ESShape.setGain( ESGain );      
-        if( !m_doFastES )
-          {
-            m_ESElectronicsSim->setGain(      ESGain     ) ;
-            m_ESElectronicsSim->setPedestals( espeds     ) ;
-            m_ESElectronicsSim->setMIPs(      esmips     ) ;
-            m_ESElectronicsSim->setMIPToGeV(  ESMIPToGeV ) ;
-          }
-        else
-          {
-            m_ESDigitizer->setGain(               ESGain     ) ;
-            m_ESElectronicsSimFast->setPedestals( espeds     ) ;
-            m_ESElectronicsSimFast->setMIPs(      esmips     ) ;
-            m_ESElectronicsSimFast->setMIPToGeV(  ESMIPToGeV ) ;
-          }
+void EcalDigiProducer::checkCalibrations(const edm::Event &event, const edm::EventSetup &eventSetup) {
+  // Pedestals from event setup
+
+  edm::ESHandle<EcalPedestals> dbPed;
+  eventSetup.get<EcalPedestalsRcd>().get(dbPed);
+  const EcalPedestals *pedestals(dbPed.product());
+
+  m_Coder->setPedestals(pedestals);
+  if (nullptr != m_APDCoder)
+    m_APDCoder->setPedestals(pedestals);
+
+  // Ecal Intercalibration Constants
+  edm::ESHandle<EcalIntercalibConstantsMC> pIcal;
+  eventSetup.get<EcalIntercalibConstantsMCRcd>().get(pIcal);
+  const EcalIntercalibConstantsMC *ical(pIcal.product());
+
+  m_Coder->setIntercalibConstants(ical);
+  if (nullptr != m_APDCoder)
+    m_APDCoder->setIntercalibConstants(ical);
+
+  m_EBResponse->setIntercal(ical);
+  if (nullptr != m_APDResponse)
+    m_APDResponse->setIntercal(ical);
+
+  // Ecal LaserCorrection Constants
+  edm::ESHandle<EcalLaserDbService> laser;
+  eventSetup.get<EcalLaserDbRecord>().get(laser);
+  const edm::TimeValue_t eventTimeValue = event.time().value();
+
+  m_EBResponse->setEventTime(eventTimeValue);
+  m_EBResponse->setLaserConstants(laser.product(), m_useLCcorrection);
+
+  m_EEResponse->setEventTime(eventTimeValue);
+  m_EEResponse->setLaserConstants(laser.product(), m_useLCcorrection);
+
+  // ADC -> GeV Scale
+  edm::ESHandle<EcalADCToGeVConstant> pAgc;
+  eventSetup.get<EcalADCToGeVConstantRcd>().get(pAgc);
+  const EcalADCToGeVConstant *agc = pAgc.product();
+
+  // Gain Ratios
+  edm::ESHandle<EcalGainRatios> pRatio;
+  eventSetup.get<EcalGainRatiosRcd>().get(pRatio);
+  const EcalGainRatios *gr = pRatio.product();
+
+  m_Coder->setGainRatios(gr);
+  if (nullptr != m_APDCoder)
+    m_APDCoder->setGainRatios(gr);
+
+  EcalMGPAGainRatio *defaultRatios = new EcalMGPAGainRatio();
+
+  double theGains[m_Coder->NGAINS + 1];
+  theGains[0] = 0.;
+  theGains[3] = 1.;
+  theGains[2] = defaultRatios->gain6Over1();
+  theGains[1] = theGains[2] * (defaultRatios->gain12Over6());
+
+  LogDebug("EcalDigi") << " Gains: "
+                       << "\n"
+                       << " g1 = " << theGains[1] << "\n"
+                       << " g2 = " << theGains[2] << "\n"
+                       << " g3 = " << theGains[3];
+
+  delete defaultRatios;
+
+  const double EBscale((agc->getEBValue()) * theGains[1] * (m_Coder->MAXADC) * m_EBs25notCont);
+
+  LogDebug("EcalDigi") << " GeV/ADC = " << agc->getEBValue() << "\n"
+                       << " notCont = " << m_EBs25notCont << "\n"
+                       << " saturation for EB = " << EBscale << ", " << m_EBs25notCont;
+
+  const double EEscale((agc->getEEValue()) * theGains[1] * (m_Coder->MAXADC) * m_EEs25notCont);
+
+  LogDebug("EcalDigi") << " GeV/ADC = " << agc->getEEValue() << "\n"
+                       << " notCont = " << m_EEs25notCont << "\n"
+                       << " saturation for EB = " << EEscale << ", " << m_EEs25notCont;
+
+  m_Coder->setFullScaleEnergy(EBscale, EEscale);
+  if (nullptr != m_APDCoder)
+    m_APDCoder->setFullScaleEnergy(EBscale, EEscale);
+
+  if (nullptr != m_ESOldDigitizer || nullptr != m_ESDigitizer) {
+    // ES condition objects
+    edm::ESHandle<ESGain> hesgain;
+    edm::ESHandle<ESMIPToGeVConstant> hesMIPToGeV;
+    edm::ESHandle<ESPedestals> hesPedestals;
+    edm::ESHandle<ESIntercalibConstants> hesMIPs;
+
+    eventSetup.get<ESGainRcd>().get(hesgain);
+    eventSetup.get<ESMIPToGeVConstantRcd>().get(hesMIPToGeV);
+    eventSetup.get<ESPedestalsRcd>().get(hesPedestals);
+    eventSetup.get<ESIntercalibConstantsRcd>().get(hesMIPs);
+
+    const ESGain *esgain(hesgain.product());
+    const ESPedestals *espeds(hesPedestals.product());
+    const ESIntercalibConstants *esmips(hesMIPs.product());
+    const ESMIPToGeVConstant *esMipToGeV(hesMIPToGeV.product());
+    const int ESGain(1.1 > esgain->getESGain() ? 1 : 2);
+    const double ESMIPToGeV((1 == ESGain) ? esMipToGeV->getESValueLow() : esMipToGeV->getESValueHigh());
+
+    if (m_doES) {
+      m_ESShape.setGain(ESGain);
+      if (!m_doFastES) {
+        m_ESElectronicsSim->setGain(ESGain);
+        m_ESElectronicsSim->setPedestals(espeds);
+        m_ESElectronicsSim->setMIPs(esmips);
+        m_ESElectronicsSim->setMIPToGeV(ESMIPToGeV);
+      } else {
+        m_ESDigitizer->setGain(ESGain);
+        m_ESElectronicsSimFast->setPedestals(espeds);
+        m_ESElectronicsSimFast->setMIPs(esmips);
+        m_ESElectronicsSimFast->setMIPToGeV(ESMIPToGeV);
       }
-   }
+    }
+  }
 }
 
-void 
-EcalDigiProducer::checkGeometry( const edm::EventSetup & eventSetup ) 
-{
-   // TODO find a way to avoid doing this every event
-   edm::ESHandle<CaloGeometry>               hGeometry   ;
-   eventSetup.get<CaloGeometryRecord>().get( hGeometry ) ;
+void EcalDigiProducer::checkGeometry(const edm::EventSetup &eventSetup) {
+  // TODO find a way to avoid doing this every event
+  edm::ESHandle<CaloGeometry> hGeometry;
+  eventSetup.get<CaloGeometryRecord>().get(hGeometry);
 
-   const CaloGeometry* pGeometry = &*hGeometry;
+  const CaloGeometry *pGeometry = &*hGeometry;
 
-   if( pGeometry != m_Geometry )
-   {
-      m_Geometry = pGeometry;
-      updateGeometry();
-   }
+  if (pGeometry != m_Geometry) {
+    m_Geometry = pGeometry;
+    updateGeometry();
+  }
 }
 
-void
-EcalDigiProducer::updateGeometry() 
-{
-  if( m_doEB ) {
-    if( nullptr != m_APDResponse ) m_APDResponse->setGeometry(
-      m_Geometry->getSubdetectorGeometry( DetId::Ecal, EcalBarrel    ) ) ;
-    m_EBResponse->setGeometry(
-      m_Geometry->getSubdetectorGeometry( DetId::Ecal, EcalBarrel    ) ) ;
+void EcalDigiProducer::updateGeometry() {
+  if (m_doEB) {
+    if (nullptr != m_APDResponse)
+      m_APDResponse->setGeometry(m_Geometry->getSubdetectorGeometry(DetId::Ecal, EcalBarrel));
+    m_EBResponse->setGeometry(m_Geometry->getSubdetectorGeometry(DetId::Ecal, EcalBarrel));
   }
-  if( m_doEE ) {
-    m_EEResponse->setGeometry(
-      m_Geometry->getSubdetectorGeometry( DetId::Ecal, EcalEndcap    ) ) ;
+  if (m_doEE) {
+    m_EEResponse->setGeometry(m_Geometry->getSubdetectorGeometry(DetId::Ecal, EcalEndcap));
   }
-  if( m_doES ) {
-    m_ESResponse->setGeometry(
-      m_Geometry->getSubdetectorGeometry( DetId::Ecal, EcalPreshower    ) ) ;
-    m_ESOldResponse->setGeometry( m_Geometry ) ;
-   
-   const std::vector<DetId>* theESDets ( 
-      nullptr != m_Geometry->getSubdetectorGeometry(DetId::Ecal, EcalPreshower) ?
-      &m_Geometry->getSubdetectorGeometry(DetId::Ecal, EcalPreshower)->getValidDetIds() : nullptr ) ;
-
-   if( !m_doFastES ) 
-   {
-      if( nullptr != m_ESOldDigitizer &&
-	  nullptr != theESDets             )
-	 m_ESOldDigitizer->setDetIds( *theESDets ) ;
-   }
-   else
-   {
-      if( nullptr != m_ESDigitizer &&
-	  nullptr != theESDets         )
-	 m_ESDigitizer->setDetIds( *theESDets ) ; 
-   }
+  if (m_doES) {
+    m_ESResponse->setGeometry(m_Geometry->getSubdetectorGeometry(DetId::Ecal, EcalPreshower));
+    m_ESOldResponse->setGeometry(m_Geometry);
+
+    const std::vector<DetId> *theESDets(
+        nullptr != m_Geometry->getSubdetectorGeometry(DetId::Ecal, EcalPreshower)
+            ? &m_Geometry->getSubdetectorGeometry(DetId::Ecal, EcalPreshower)->getValidDetIds()
+            : nullptr);
+
+    if (!m_doFastES) {
+      if (nullptr != m_ESOldDigitizer && nullptr != theESDets)
+        m_ESOldDigitizer->setDetIds(*theESDets);
+    } else {
+      if (nullptr != m_ESDigitizer && nullptr != theESDets)
+        m_ESDigitizer->setDetIds(*theESDets);
+    }
   }
 }
 
-void EcalDigiProducer::setEBNoiseSignalGenerator(EcalBaseSignalGenerator * noiseGenerator) {
-  //noiseGenerator->setParameterMap(theParameterMap);
-  if(nullptr != m_BarrelDigitizer) m_BarrelDigitizer->setNoiseSignalGenerator(noiseGenerator);
+void EcalDigiProducer::setEBNoiseSignalGenerator(EcalBaseSignalGenerator *noiseGenerator) {
+  // noiseGenerator->setParameterMap(theParameterMap);
+  if (nullptr != m_BarrelDigitizer)
+    m_BarrelDigitizer->setNoiseSignalGenerator(noiseGenerator);
 }
 
-void EcalDigiProducer::setEENoiseSignalGenerator(EcalBaseSignalGenerator * noiseGenerator) {
-  //noiseGenerator->setParameterMap(theParameterMap);
-  if(nullptr != m_EndcapDigitizer) m_EndcapDigitizer->setNoiseSignalGenerator(noiseGenerator);
+void EcalDigiProducer::setEENoiseSignalGenerator(EcalBaseSignalGenerator *noiseGenerator) {
+  // noiseGenerator->setParameterMap(theParameterMap);
+  if (nullptr != m_EndcapDigitizer)
+    m_EndcapDigitizer->setNoiseSignalGenerator(noiseGenerator);
 }
 
-void EcalDigiProducer::setESNoiseSignalGenerator(EcalBaseSignalGenerator * noiseGenerator) {
-  //noiseGenerator->setParameterMap(theParameterMap);
-  if(nullptr != m_ESDigitizer) m_ESDigitizer->setNoiseSignalGenerator(noiseGenerator);  
+void EcalDigiProducer::setESNoiseSignalGenerator(EcalBaseSignalGenerator *noiseGenerator) {
+  // noiseGenerator->setParameterMap(theParameterMap);
+  if (nullptr != m_ESDigitizer)
+    m_ESDigitizer->setNoiseSignalGenerator(noiseGenerator);
 }
 
-
-void EcalDigiProducer::beginRun(edm::Run const& run, edm::EventSetup const& setup) {
-   m_EBShape.setEventSetup(setup); 
-   m_EEShape.setEventSetup(setup);
-   m_APDShape.setEventSetup(setup);
+void EcalDigiProducer::beginRun(edm::Run const &run, edm::EventSetup const &setup) {
+  m_EBShape.setEventSetup(setup);
+  m_EEShape.setEventSetup(setup);
+  m_APDShape.setEventSetup(setup);
 }
-
diff --git a/SimCalorimetry/EcalSimProducers/src/EcalTimeDigiProducer.cc b/SimCalorimetry/EcalSimProducers/src/EcalTimeDigiProducer.cc
index 1bb01256260f8..bd736524e5ddd 100644
--- a/SimCalorimetry/EcalSimProducers/src/EcalTimeDigiProducer.cc
+++ b/SimCalorimetry/EcalSimProducers/src/EcalTimeDigiProducer.cc
@@ -1,85 +1,83 @@
 #include "FWCore/Framework/interface/Event.h"
-#include "SimCalorimetry/EcalSimProducers/interface/EcalTimeDigiProducer.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EcalTimeMapDigitizer.h"
+#include "SimCalorimetry/EcalSimProducers/interface/EcalTimeDigiProducer.h"
 
 #include "CalibFormats/CaloObjects/interface/CaloSamples.h"
 
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "Geometry/EcalAlgo/interface/EcalEndcapGeometry.h"
+#include "Geometry/Records/interface/CaloGeometryRecord.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "SimGeneral/MixingModule/interface/PileUpEventPrincipal.h"
 
-
 //#define ecal_time_debug 1
 
-EcalTimeDigiProducer::EcalTimeDigiProducer( const edm::ParameterSet& params, edm::ProducerBase& mixMod,edm::ConsumesCollector& sumes) :
-   DigiAccumulatorMixMod(),
-   m_EBdigiCollection ( params.getParameter<std::string>("EBtimeDigiCollection") ) ,
-   m_EEdigiCollection ( params.getParameter<std::string>("EEtimeDigiCollection") ) ,
-   m_hitsProducerTagEB  ( params.getParameter<edm::InputTag>("hitsProducerEB"    ) ) ,
-   m_hitsProducerTagEE  ( params.getParameter<edm::InputTag>("hitsProducerEE"    ) ) ,
-   m_hitsProducerTokenEB  ( sumes.consumes<std::vector<PCaloHit> >( m_hitsProducerTagEB) ) ,
-   m_hitsProducerTokenEE  ( sumes.consumes<std::vector<PCaloHit> >( m_hitsProducerTagEE) ) ,
-   m_timeLayerEB     (  params.getParameter<int> ("timeLayerBarrel") ),
-   m_timeLayerEE     (  params.getParameter<int> ("timeLayerEndcap") ),
-   m_Geometry          ( nullptr ) 
-{
-   mixMod.produces<EcalTimeDigiCollection>(m_EBdigiCollection);
-   mixMod.produces<EcalTimeDigiCollection>(m_EEdigiCollection);
-
-   m_BarrelDigitizer = new EcalTimeMapDigitizer(EcalBarrel);
-   m_EndcapDigitizer = new EcalTimeMapDigitizer(EcalEndcap);
+EcalTimeDigiProducer::EcalTimeDigiProducer(const edm::ParameterSet &params,
+                                           edm::ProducerBase &mixMod,
+                                           edm::ConsumesCollector &sumes)
+    : DigiAccumulatorMixMod(),
+      m_EBdigiCollection(params.getParameter<std::string>("EBtimeDigiCollection")),
+      m_EEdigiCollection(params.getParameter<std::string>("EEtimeDigiCollection")),
+      m_hitsProducerTagEB(params.getParameter<edm::InputTag>("hitsProducerEB")),
+      m_hitsProducerTagEE(params.getParameter<edm::InputTag>("hitsProducerEE")),
+      m_hitsProducerTokenEB(sumes.consumes<std::vector<PCaloHit>>(m_hitsProducerTagEB)),
+      m_hitsProducerTokenEE(sumes.consumes<std::vector<PCaloHit>>(m_hitsProducerTagEE)),
+      m_timeLayerEB(params.getParameter<int>("timeLayerBarrel")),
+      m_timeLayerEE(params.getParameter<int>("timeLayerEndcap")),
+      m_Geometry(nullptr) {
+  mixMod.produces<EcalTimeDigiCollection>(m_EBdigiCollection);
+  mixMod.produces<EcalTimeDigiCollection>(m_EEdigiCollection);
+
+  m_BarrelDigitizer = new EcalTimeMapDigitizer(EcalBarrel);
+  m_EndcapDigitizer = new EcalTimeMapDigitizer(EcalEndcap);
 
 #ifdef ecal_time_debug
-   std::cout << "[EcalTimeDigiProducer]::Create EB " << m_EBdigiCollection << " and EE " << m_EEdigiCollection << " collections and digitizers" << std::endl;
+  std::cout << "[EcalTimeDigiProducer]::Create EB " << m_EBdigiCollection << " and EE " << m_EEdigiCollection
+            << " collections and digitizers" << std::endl;
 #endif
 
-   m_BarrelDigitizer->setTimeLayerId(m_timeLayerEB);
-   m_EndcapDigitizer->setTimeLayerId(m_timeLayerEE);
+  m_BarrelDigitizer->setTimeLayerId(m_timeLayerEB);
+  m_EndcapDigitizer->setTimeLayerId(m_timeLayerEE);
 }
 
-EcalTimeDigiProducer::~EcalTimeDigiProducer() 
-{
-}
+EcalTimeDigiProducer::~EcalTimeDigiProducer() {}
 
-void
-EcalTimeDigiProducer::initializeEvent(edm::Event const& event, edm::EventSetup const& eventSetup) {
-   checkGeometry( eventSetup );
-   //    checkCalibrations( event, eventSetup );
-   // here the methods to clean the maps
-   m_BarrelDigitizer->initializeMap();
-   m_EndcapDigitizer->initializeMap();
+void EcalTimeDigiProducer::initializeEvent(edm::Event const &event, edm::EventSetup const &eventSetup) {
+  checkGeometry(eventSetup);
+  //    checkCalibrations( event, eventSetup );
+  // here the methods to clean the maps
+  m_BarrelDigitizer->initializeMap();
+  m_EndcapDigitizer->initializeMap();
 }
 
-void
-EcalTimeDigiProducer::accumulateCaloHits(HitsHandle const& ebHandle, HitsHandle const& eeHandle, int bunchCrossing) {
-  // accumulate the simHits and do the averages in a given layer per bunch crossing
-  if(ebHandle.isValid()) {
+void EcalTimeDigiProducer::accumulateCaloHits(HitsHandle const &ebHandle,
+                                              HitsHandle const &eeHandle,
+                                              int bunchCrossing) {
+  // accumulate the simHits and do the averages in a given layer per bunch
+  // crossing
+  if (ebHandle.isValid()) {
     m_BarrelDigitizer->add(*ebHandle.product(), bunchCrossing);
   }
 
-  if(eeHandle.isValid()) {
+  if (eeHandle.isValid()) {
     m_EndcapDigitizer->add(*eeHandle.product(), bunchCrossing);
   }
-
 }
 
-void
-EcalTimeDigiProducer::accumulate(edm::Event const& e, edm::EventSetup const& eventSetup) {
+void EcalTimeDigiProducer::accumulate(edm::Event const &e, edm::EventSetup const &eventSetup) {
   // Step A: Get Inputs
-  edm::Handle<std::vector<PCaloHit> > ebHandle;
+  edm::Handle<std::vector<PCaloHit>> ebHandle;
   e.getByToken(m_hitsProducerTokenEB, ebHandle);
 
-  edm::Handle<std::vector<PCaloHit> > eeHandle;
+  edm::Handle<std::vector<PCaloHit>> eeHandle;
   e.getByToken(m_hitsProducerTokenEE, eeHandle);
 
 #ifdef ecal_time_debug
@@ -89,12 +87,13 @@ EcalTimeDigiProducer::accumulate(edm::Event const& e, edm::EventSetup const& eve
   accumulateCaloHits(ebHandle, eeHandle, 0);
 }
 
-void
-EcalTimeDigiProducer::accumulate(PileUpEventPrincipal const& e, edm::EventSetup const& eventSetup, edm::StreamID const&) {
-  edm::Handle<std::vector<PCaloHit> > ebHandle;
+void EcalTimeDigiProducer::accumulate(PileUpEventPrincipal const &e,
+                                      edm::EventSetup const &eventSetup,
+                                      edm::StreamID const &) {
+  edm::Handle<std::vector<PCaloHit>> ebHandle;
   e.getByLabel(m_hitsProducerTagEB, ebHandle);
 
-  edm::Handle<std::vector<PCaloHit> > eeHandle;
+  edm::Handle<std::vector<PCaloHit>> eeHandle;
   e.getByLabel(m_hitsProducerTagEE, eeHandle);
 
 #ifdef ecal_time_debug
@@ -103,61 +102,53 @@ EcalTimeDigiProducer::accumulate(PileUpEventPrincipal const& e, edm::EventSetup
   accumulateCaloHits(ebHandle, eeHandle, e.bunchCrossing());
 }
 
-void 
-EcalTimeDigiProducer::finalizeEvent(edm::Event& event, edm::EventSetup const& eventSetup) {
-   std::unique_ptr<EcalTimeDigiCollection> barrelResult   ( new EcalTimeDigiCollection() ) ;
-   std::unique_ptr<EcalTimeDigiCollection> endcapResult   ( new EcalTimeDigiCollection() ) ;
+void EcalTimeDigiProducer::finalizeEvent(edm::Event &event, edm::EventSetup const &eventSetup) {
+  std::unique_ptr<EcalTimeDigiCollection> barrelResult(new EcalTimeDigiCollection());
+  std::unique_ptr<EcalTimeDigiCollection> endcapResult(new EcalTimeDigiCollection());
 
 #ifdef ecal_time_debug
-   std::cout << "[EcalTimeDigiProducer]::finalizeEvent" << std::endl;
+  std::cout << "[EcalTimeDigiProducer]::finalizeEvent" << std::endl;
 #endif
 
-   // here basically just put everything in the final collections
-   m_BarrelDigitizer->run( *barrelResult ) ;
+  // here basically just put everything in the final collections
+  m_BarrelDigitizer->run(*barrelResult);
 
 #ifdef ecal_time_debug
-   std::cout << "[EcalTimeDigiProducer]::EB Digi size " <<  barrelResult->size() << std::endl;
+  std::cout << "[EcalTimeDigiProducer]::EB Digi size " << barrelResult->size() << std::endl;
 #endif
 
-   edm::LogInfo("TimeDigiInfo") << "EB time Digis: " << barrelResult->size() ;
+  edm::LogInfo("TimeDigiInfo") << "EB time Digis: " << barrelResult->size();
 
-   m_EndcapDigitizer->run( *endcapResult ) ;
+  m_EndcapDigitizer->run(*endcapResult);
 
 #ifdef ecal_time_debug
-   std::cout << "[EcalTimeDigiProducer]::EE Digi size " <<  endcapResult->size() << std::endl;
+  std::cout << "[EcalTimeDigiProducer]::EE Digi size " << endcapResult->size() << std::endl;
 #endif
 
-    edm::LogInfo("TimeDigiInfo") << "EE Digis: " << endcapResult->size() ;
+  edm::LogInfo("TimeDigiInfo") << "EE Digis: " << endcapResult->size();
 
 #ifdef ecal_time_debug
-    std::cout << "[EcalTimeDigiProducer]::putting collections into the event " << std::endl;
+  std::cout << "[EcalTimeDigiProducer]::putting collections into the event " << std::endl;
 #endif
 
-    event.put( std::move(barrelResult),    m_EBdigiCollection ) ;
-    event.put( std::move(endcapResult),    m_EEdigiCollection ) ;
+  event.put(std::move(barrelResult), m_EBdigiCollection);
+  event.put(std::move(endcapResult), m_EEdigiCollection);
 }
 
-void 
-EcalTimeDigiProducer::checkGeometry( const edm::EventSetup & eventSetup ) 
-{
-   // TODO find a way to avoid doing this every event
-   edm::ESHandle<CaloGeometry>               hGeometry   ;
-   eventSetup.get<CaloGeometryRecord>().get( hGeometry ) ;
+void EcalTimeDigiProducer::checkGeometry(const edm::EventSetup &eventSetup) {
+  // TODO find a way to avoid doing this every event
+  edm::ESHandle<CaloGeometry> hGeometry;
+  eventSetup.get<CaloGeometryRecord>().get(hGeometry);
 
-   const CaloGeometry* pGeometry = &*hGeometry;
+  const CaloGeometry *pGeometry = &*hGeometry;
 
-   if( pGeometry != m_Geometry )
-   {
-      m_Geometry = pGeometry;
-      updateGeometry();
-   }
+  if (pGeometry != m_Geometry) {
+    m_Geometry = pGeometry;
+    updateGeometry();
+  }
 }
 
-void
-EcalTimeDigiProducer::updateGeometry() 
-{
-   m_BarrelDigitizer->setGeometry(
-      m_Geometry->getSubdetectorGeometry( DetId::Ecal, EcalBarrel    ) ) ;
-   m_EndcapDigitizer->setGeometry(
-      m_Geometry->getSubdetectorGeometry( DetId::Ecal, EcalEndcap    ) ) ;
+void EcalTimeDigiProducer::updateGeometry() {
+  m_BarrelDigitizer->setGeometry(m_Geometry->getSubdetectorGeometry(DetId::Ecal, EcalBarrel));
+  m_EndcapDigitizer->setGeometry(m_Geometry->getSubdetectorGeometry(DetId::Ecal, EcalEndcap));
 }
diff --git a/SimCalorimetry/EcalSimProducers/test/ESDigisReferenceDistrib.cc b/SimCalorimetry/EcalSimProducers/test/ESDigisReferenceDistrib.cc
index cfeb3bdc9eda1..fe8d1cce65e6a 100644
--- a/SimCalorimetry/EcalSimProducers/test/ESDigisReferenceDistrib.cc
+++ b/SimCalorimetry/EcalSimProducers/test/ESDigisReferenceDistrib.cc
@@ -2,95 +2,101 @@
  * \file ESDigisReferenceDistrib.cc
  * \ creating reference distribuitons for ES digitization
  *
-*/
+ */
 
 #include <SimCalorimetry/EcalSimProducers/test/ESDigisReferenceDistrib.h>
 
-ESDigisReferenceDistrib::ESDigisReferenceDistrib(const edm::ParameterSet& ps):
-  ESdigiCollection_(ps.getParameter<edm::InputTag>("ESdigiCollection"))
-{
+ESDigisReferenceDistrib::ESDigisReferenceDistrib(const edm::ParameterSet &ps)
+    : ESdigiCollection_(ps.getParameter<edm::InputTag>("ESdigiCollection")) {
   // root and txt outputs
   outputRootFile_ = ps.getUntrackedParameter<std::string>("outputRootFile", "");
-  outputTxtFile_  = ps.getUntrackedParameter<std::string>("outputTxtFile", "");
-  
+  outputTxtFile_ = ps.getUntrackedParameter<std::string>("outputTxtFile", "");
+
   // histos
   char histo[200];
-  for (int ii = 0; ii<3 ; ii++) {
-    sprintf (histo, "esRefHistos%02d", ii) ;
-    meESDigiADC_[ii] = new TH1F(histo, histo, 80, 960.5, 1040.5) ;
+  for (int ii = 0; ii < 3; ii++) {
+    sprintf(histo, "esRefHistos%02d", ii);
+    meESDigiADC_[ii] = new TH1F(histo, histo, 80, 960.5, 1040.5);
   }
-  
-  meESDigi3D_ = new TH3F("meESDigi3D_", "meESDigi3D_", 80, 960.5, 1040.5, 80, 960.5, 1040.5, 80, 960.5, 1040.5) ;
-}
 
-ESDigisReferenceDistrib::~ESDigisReferenceDistrib(){ 
+  meESDigi3D_ = new TH3F("meESDigi3D_", "meESDigi3D_", 80, 960.5, 1040.5, 80, 960.5, 1040.5, 80, 960.5, 1040.5);
+}
 
+ESDigisReferenceDistrib::~ESDigisReferenceDistrib() {
   // preparing the txt file with the histo infos
-   std::ofstream *outFile_ = new std::ofstream(outputTxtFile_.c_str(),std::ios::out);
-  *outFile_ << "# number of bin"                         << std::endl;
-  *outFile_ << "# axis inf (common to the three axes"    << std::endl;
-  *outFile_ << "# axis sup (common to the three axes"    << std::endl;
-  *outFile_ << "# bin x bin content"                     << std::endl;
-  *outFile_ << "# "                                      << std::endl;
-  
-  if(!meESDigi3D_) throw cms::Exception("ESDigisReferenceDistrib: problems with the reference histo");
+  std::ofstream *outFile_ = new std::ofstream(outputTxtFile_.c_str(), std::ios::out);
+  *outFile_ << "# number of bin" << std::endl;
+  *outFile_ << "# axis inf (common to the three axes" << std::endl;
+  *outFile_ << "# axis sup (common to the three axes" << std::endl;
+  *outFile_ << "# bin x bin content" << std::endl;
+  *outFile_ << "# " << std::endl;
+
+  if (!meESDigi3D_)
+    throw cms::Exception("ESDigisReferenceDistrib: problems with the reference histo");
   else {
     float histoBin_ = meESDigi3D_->GetNbinsX();
-    float histoInf_ = meESDigi3D_->GetBinLowEdge(1); 
-    float histoSup_ = meESDigi3D_->GetBinLowEdge((int)histoBin_)+meESDigi3D_->GetBinWidth((int)histoBin_);
-    
-    *outFile_ << histoBin_  << std::endl;  
-    *outFile_ << histoInf_  << std::endl;
-    *outFile_ << histoSup_  << std::endl;
-    
-    for (int thisBinZ = 1; thisBinZ <= meESDigi3D_->GetNbinsZ(); thisBinZ++){                  // sample2
-      for (int thisBinY = 1; thisBinY <= meESDigi3D_->GetNbinsY(); thisBinY++){                // sample1
-	for (int thisBinX = 1; thisBinX <= meESDigi3D_->GetNbinsX(); thisBinX++){	       // sample0    
-	  *outFile_ << meESDigi3D_->GetBinContent(thisBinX, thisBinY, thisBinZ) << std::endl;
-	}
+    float histoInf_ = meESDigi3D_->GetBinLowEdge(1);
+    float histoSup_ = meESDigi3D_->GetBinLowEdge((int)histoBin_) + meESDigi3D_->GetBinWidth((int)histoBin_);
+
+    *outFile_ << histoBin_ << std::endl;
+    *outFile_ << histoInf_ << std::endl;
+    *outFile_ << histoSup_ << std::endl;
+
+    for (int thisBinZ = 1; thisBinZ <= meESDigi3D_->GetNbinsZ(); thisBinZ++) {      // sample2
+      for (int thisBinY = 1; thisBinY <= meESDigi3D_->GetNbinsY(); thisBinY++) {    // sample1
+        for (int thisBinX = 1; thisBinX <= meESDigi3D_->GetNbinsX(); thisBinX++) {  // sample0
+          *outFile_ << meESDigi3D_->GetBinContent(thisBinX, thisBinY, thisBinZ) << std::endl;
+        }
       }
     }
   }
-  
+
   // saving and deleting
-  TFile file(outputRootFile_.c_str(),"RECREATE");
-  for (int ii=0; ii<3 ; ii++) { meESDigiADC_[ii] -> Write(); }  
-  meESDigi3D_ -> Write();
+  TFile file(outputRootFile_.c_str(), "RECREATE");
+  for (int ii = 0; ii < 3; ii++) {
+    meESDigiADC_[ii]->Write();
+  }
+  meESDigi3D_->Write();
   file.Close();
 
-  for (int ii=0; ii<3; ii++) { if (meESDigiADC_[ii]){ delete meESDigiADC_[ii]; }}
-  if (meESDigi3D_) delete meESDigi3D_;
+  for (int ii = 0; ii < 3; ii++) {
+    if (meESDigiADC_[ii]) {
+      delete meESDigiADC_[ii];
+    }
+  }
+  if (meESDigi3D_)
+    delete meESDigi3D_;
 }
 
-void ESDigisReferenceDistrib::beginJob(){ }
+void ESDigisReferenceDistrib::beginJob() {}
 
-void ESDigisReferenceDistrib::endJob(){ }
+void ESDigisReferenceDistrib::endJob() {}
 
-void ESDigisReferenceDistrib::analyze(const edm::Event& e, const edm::EventSetup& c){
+void ESDigisReferenceDistrib::analyze(const edm::Event &e, const edm::EventSetup &c) {
+  edm::Handle<ESDigiCollection> EcalDigiES;
+  e.getByLabel(ESdigiCollection_, EcalDigiES);
 
-   edm::Handle<ESDigiCollection> EcalDigiES;  
-  e.getByLabel( ESdigiCollection_ , EcalDigiES );
-  
   // loop over Digis
-  const ESDigiCollection * preshowerDigi = EcalDigiES.product () ;
-  
-  std::vector<double> esADCCounts ;
+  const ESDigiCollection *preshowerDigi = EcalDigiES.product();
+
+  std::vector<double> esADCCounts;
   esADCCounts.reserve(ESDataFrame::MAXSAMPLES);
-  
-  for (unsigned int digis=0; digis<EcalDigiES->size(); ++digis) {
 
-    ESDataFrame esdf=(*preshowerDigi)[digis];
-    int nrSamples=esdf.size();
+  for (unsigned int digis = 0; digis < EcalDigiES->size(); ++digis) {
+    ESDataFrame esdf = (*preshowerDigi)[digis];
+    int nrSamples = esdf.size();
 
-    if ( meESDigi3D_ ) meESDigi3D_ -> Fill(esdf[0].adc(),esdf[1].adc(),esdf[2].adc());
-    for (int sample = 0 ; sample < nrSamples; ++sample) {
+    if (meESDigi3D_)
+      meESDigi3D_->Fill(esdf[0].adc(), esdf[1].adc(), esdf[2].adc());
+    for (int sample = 0; sample < nrSamples; ++sample) {
       ESSample mySample = esdf[sample];
-      if (meESDigiADC_[sample]) { meESDigiADC_[sample] ->Fill(mySample.adc()); }
+      if (meESDigiADC_[sample]) {
+        meESDigiADC_[sample]->Fill(mySample.adc());
+      }
     }
   }
 }
 
-
-//define this as a plug-in
+// define this as a plug-in
 
 DEFINE_FWK_MODULE(ESDigisReferenceDistrib);
diff --git a/SimCalorimetry/EcalSimProducers/test/ESDigisReferenceDistrib.h b/SimCalorimetry/EcalSimProducers/test/ESDigisReferenceDistrib.h
index f477cc70c74cd..2f99a30f93856 100644
--- a/SimCalorimetry/EcalSimProducers/test/ESDigisReferenceDistrib.h
+++ b/SimCalorimetry/EcalSimProducers/test/ESDigisReferenceDistrib.h
@@ -1,60 +1,56 @@
 #ifndef ESDigisReferenceDistrib_H
 #define ESDigisReferenceDistrib_H
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DataFormats/EcalDigi/interface/ESDataFrame.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 
 #include "TFile.h"
 #include "TH1F.h"
 #include "TH3F.h"
 
-class ESDigisReferenceDistrib: public edm::EDAnalyzer{
-  
- public:
-  
+class ESDigisReferenceDistrib : public edm::EDAnalyzer {
+public:
   /// Constructor
-  ESDigisReferenceDistrib(const edm::ParameterSet& ps);
-  
+  ESDigisReferenceDistrib(const edm::ParameterSet &ps);
+
   /// Destructor
   ~ESDigisReferenceDistrib() override;
-  
- protected:
-  
+
+protected:
   /// Analyze
-  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
-  
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
+
   // BeginJob
   void beginJob() override;
-  
+
   // EndJob
   void endJob(void) override;
-  
- private:
-  
+
+private:
   bool verbose_;
-  
+
   std::string outputRootFile_;
   std::string outputTxtFile_;
-  
+
   edm::InputTag ESdigiCollection_;
-  
-  TH3F* meESDigi3D_;  
-  TH1F* meESDigiADC_[3];
+
+  TH3F *meESDigi3D_;
+  TH1F *meESDigiADC_[3];
 };
 
 #endif
diff --git a/SimCalorimetry/EcalTestBeam/interface/EcalTBDigiProducer.h b/SimCalorimetry/EcalTestBeam/interface/EcalTBDigiProducer.h
index 79fae38cd4387..e2c6cd95bfba9 100644
--- a/SimCalorimetry/EcalTestBeam/interface/EcalTBDigiProducer.h
+++ b/SimCalorimetry/EcalTestBeam/interface/EcalTBDigiProducer.h
@@ -1,10 +1,10 @@
 #ifndef SimCalorimetry_EcalTestBeam_EcalTBDigiProducer_h
 #define SimCalorimetry_EcalTestBeam_EcalTBDigiProducer_h
 
-#include "SimCalorimetry/EcalSimProducers/interface/EcalDigiProducer.h"
 #include "Geometry/CaloTopology/interface/EcalTrigTowerConstituentsMap.h"
-#include "SimCalorimetry/EcalTestBeamAlgos/interface/EcalTBReadout.h"
 #include "RecoTBCalo/EcalTBTDCReconstructor/interface/EcalTBTDCRecInfoAlgo.h"
+#include "SimCalorimetry/EcalSimProducers/interface/EcalDigiProducer.h"
+#include "SimCalorimetry/EcalTestBeamAlgos/interface/EcalTBReadout.h"
 #include "TBDataFormats/EcalTBObjects/interface/EcalTBTDCRawInfo.h"
 
 namespace edm {
@@ -13,50 +13,46 @@ namespace edm {
   class Event;
   class EventSetup;
   class ParameterSet;
-}
+}  // namespace edm
 class PEcalTBInfo;
 class PileUpEventPrincipal;
 
-class EcalTBDigiProducer : public EcalDigiProducer
-{
-   public:
-
-      EcalTBDigiProducer( const edm::ParameterSet& params, edm::ProducerBase& mixMod, edm::ConsumesCollector& iC) ;
-      ~EcalTBDigiProducer() override ;
-
+class EcalTBDigiProducer : public EcalDigiProducer {
+public:
+  EcalTBDigiProducer(const edm::ParameterSet &params, edm::ProducerBase &mixMod, edm::ConsumesCollector &iC);
+  ~EcalTBDigiProducer() override;
 
-      void initializeEvent(edm::Event const&, edm::EventSetup const&) override;
-      void finalizeEvent(edm::Event&, edm::EventSetup const&) override;
+  void initializeEvent(edm::Event const &, edm::EventSetup const &) override;
+  void finalizeEvent(edm::Event &, edm::EventSetup const &) override;
 
-   private:
+private:
+  void cacheEBDigis(const EBDigiCollection *ebDigiPtr) const override;
+  void cacheEEDigis(const EEDigiCollection *eeDigiPtr) const override;
 
-      void cacheEBDigis( const EBDigiCollection* ebDigiPtr ) const override ;
-      void cacheEEDigis( const EEDigiCollection* eeDigiPtr ) const override ; 
+  void setPhaseShift(const DetId &detId);
 
-      void setPhaseShift( const DetId& detId ) ;
+  void fillTBTDCRawInfo(EcalTBTDCRawInfo &theTBTDCRawInfo);
 
-      void fillTBTDCRawInfo( EcalTBTDCRawInfo& theTBTDCRawInfo ) ;
+  const EcalTrigTowerConstituentsMap m_theTTmap;
+  EcalTBReadout *m_theTBReadout;
 
-      const EcalTrigTowerConstituentsMap m_theTTmap        ;
-      EcalTBReadout*                     m_theTBReadout    ;
+  std::string m_ecalTBInfoLabel;
+  std::string m_EBdigiFinalTag;
+  std::string m_EBdigiTempTag;
 
-      std::string m_ecalTBInfoLabel ;
-      std::string m_EBdigiFinalTag  ;
-      std::string m_EBdigiTempTag   ;
+  bool m_doPhaseShift;
+  double m_thisPhaseShift;
 
-      bool   m_doPhaseShift   ;
-      double m_thisPhaseShift ;
+  bool m_doReadout;
 
-      bool   m_doReadout      ;
+  std::vector<EcalTBTDCRecInfoAlgo::EcalTBTDCRanges> m_tdcRanges;
+  bool m_use2004OffsetConvention;
 
-      std::vector<EcalTBTDCRecInfoAlgo::EcalTBTDCRanges> m_tdcRanges ;
-      bool   m_use2004OffsetConvention ;
-      
-      double m_tunePhaseShift ;
+  double m_tunePhaseShift;
 
-      mutable std::unique_ptr<EBDigiCollection> m_ebDigis ;
-      mutable std::unique_ptr<EEDigiCollection> m_eeDigis ;
-      mutable std::unique_ptr<EcalTBTDCRawInfo> m_TDCproduct ;
+  mutable std::unique_ptr<EBDigiCollection> m_ebDigis;
+  mutable std::unique_ptr<EEDigiCollection> m_eeDigis;
+  mutable std::unique_ptr<EcalTBTDCRawInfo> m_TDCproduct;
 };
 
-#endif 
+#endif
diff --git a/SimCalorimetry/EcalTestBeam/src/EcalTBDigiProducer.cc b/SimCalorimetry/EcalTestBeam/src/EcalTBDigiProducer.cc
index 9372632ccad57..e432512fcdb85 100644
--- a/SimCalorimetry/EcalTestBeam/src/EcalTBDigiProducer.cc
+++ b/SimCalorimetry/EcalTestBeam/src/EcalTBDigiProducer.cc
@@ -1,181 +1,148 @@
 
-#include "SimCalorimetry/EcalTestBeam/interface/EcalTBDigiProducer.h"
-#include "SimDataFormats/EcalTestBeam/interface/PEcalTBInfo.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
-#include "FWCore/Framework/interface/ProducerBase.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/ProducerBase.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
-#include "SimCalorimetry/EcalSimAlgos/interface/EcalSimParameterMap.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EBHitResponse.h"
 #include "SimCalorimetry/EcalSimAlgos/interface/EEHitResponse.h"
+#include "SimCalorimetry/EcalSimAlgos/interface/EcalSimParameterMap.h"
+#include "SimCalorimetry/EcalTestBeam/interface/EcalTBDigiProducer.h"
+#include "SimDataFormats/EcalTestBeam/interface/PEcalTBInfo.h"
 
-EcalTBDigiProducer::EcalTBDigiProducer( const edm::ParameterSet& params, edm::ProducerBase& mixMod, edm::ConsumesCollector& iC) :
-   EcalDigiProducer(params, mixMod, iC)
-{
-   std::string const instance("simEcalUnsuppressedDigis");
-   m_EBdigiFinalTag = params.getParameter<std::string>( "EBdigiFinalCollection" ) ;
-   m_EBdigiTempTag  = params.getParameter<std::string>( "EBdigiCollection");
+EcalTBDigiProducer::EcalTBDigiProducer(const edm::ParameterSet &params,
+                                       edm::ProducerBase &mixMod,
+                                       edm::ConsumesCollector &iC)
+    : EcalDigiProducer(params, mixMod, iC) {
+  std::string const instance("simEcalUnsuppressedDigis");
+  m_EBdigiFinalTag = params.getParameter<std::string>("EBdigiFinalCollection");
+  m_EBdigiTempTag = params.getParameter<std::string>("EBdigiCollection");
 
-   mixMod.produces<EBDigiCollection>(instance + m_EBdigiFinalTag) ; // after selective readout
-   mixMod.produces<EcalTBTDCRawInfo>(instance) ;
+  mixMod.produces<EBDigiCollection>(instance + m_EBdigiFinalTag);  // after selective readout
+  mixMod.produces<EcalTBTDCRawInfo>(instance);
 
-   const bool syncPhase ( params.getParameter<bool>("syncPhase") ) ;
+  const bool syncPhase(params.getParameter<bool>("syncPhase"));
 
-   // possible phase shift for asynchronous trigger (e.g. test-beam)
+  // possible phase shift for asynchronous trigger (e.g. test-beam)
 
-   m_doPhaseShift = !syncPhase ;
-   m_thisPhaseShift = 1. ;
+  m_doPhaseShift = !syncPhase;
+  m_thisPhaseShift = 1.;
 
-   typedef std::vector< edm::ParameterSet > Parameters;
-   Parameters ranges=params.getParameter<Parameters>( "tdcRanges" ) ;
-   for( Parameters::iterator itRanges = ranges.begin(); 
-	itRanges != ranges.end(); ++itRanges )
-   {
-      EcalTBTDCRecInfoAlgo::EcalTBTDCRanges aRange;
-      aRange.runRanges.first = itRanges->getParameter<int>("startRun");
-      aRange.runRanges.second = itRanges->getParameter<int>("endRun");
-      aRange.tdcMin = itRanges->getParameter< std::vector<double> >("tdcMin");
-      aRange.tdcMax = itRanges->getParameter< std::vector<double> >("tdcMax");
-      m_tdcRanges.push_back(std::move(aRange));
-   }
+  typedef std::vector<edm::ParameterSet> Parameters;
+  Parameters ranges = params.getParameter<Parameters>("tdcRanges");
+  for (Parameters::iterator itRanges = ranges.begin(); itRanges != ranges.end(); ++itRanges) {
+    EcalTBTDCRecInfoAlgo::EcalTBTDCRanges aRange;
+    aRange.runRanges.first = itRanges->getParameter<int>("startRun");
+    aRange.runRanges.second = itRanges->getParameter<int>("endRun");
+    aRange.tdcMin = itRanges->getParameter<std::vector<double>>("tdcMin");
+    aRange.tdcMax = itRanges->getParameter<std::vector<double>>("tdcMax");
+    m_tdcRanges.push_back(std::move(aRange));
+  }
 
-   m_use2004OffsetConvention = 
-      params.getUntrackedParameter< bool >("use2004OffsetConvention",
-					   false ) ;
+  m_use2004OffsetConvention = params.getUntrackedParameter<bool>("use2004OffsetConvention", false);
 
-   m_ecalTBInfoLabel =
-      params.getUntrackedParameter<std::string>( "EcalTBInfoLabel" ,
-						 "SimEcalTBG4Object" ) ;
+  m_ecalTBInfoLabel = params.getUntrackedParameter<std::string>("EcalTBInfoLabel", "SimEcalTBG4Object");
 
-   m_doReadout = params.getParameter<bool>( "doReadout" ) ;
+  m_doReadout = params.getParameter<bool>("doReadout");
 
-   m_theTBReadout = new EcalTBReadout( m_ecalTBInfoLabel ) ;
+  m_theTBReadout = new EcalTBReadout(m_ecalTBInfoLabel);
 
-   m_tunePhaseShift =  params.getParameter<double>( "tunePhaseShift" ) ;
+  m_tunePhaseShift = params.getParameter<double>("tunePhaseShift");
 
-   if( m_doPhaseShift )
-   {
-     iC.consumes<PEcalTBInfo>(edm::InputTag(params.getUntrackedParameter<std::string>("EcalTBInfoLabel","SimEcalTBG4Object")));
-   }
+  if (m_doPhaseShift) {
+    iC.consumes<PEcalTBInfo>(
+        edm::InputTag(params.getUntrackedParameter<std::string>("EcalTBInfoLabel", "SimEcalTBG4Object")));
+  }
 }
 
-EcalTBDigiProducer::~EcalTBDigiProducer()
-{
-}
+EcalTBDigiProducer::~EcalTBDigiProducer() {}
 
-void EcalTBDigiProducer::initializeEvent(edm::Event const& event, edm::EventSetup const& eventSetup) {
-  std::cout<<"====****Entering EcalTBDigiProducer produce()"<<std::endl ;
-   edm::ESHandle<CaloGeometry>               hGeometry ;
-   eventSetup.get<CaloGeometryRecord>().get( hGeometry ) ;
-   const std::vector<DetId>& theBarrelDets (
-      hGeometry->getValidDetIds(DetId::Ecal, EcalBarrel) ) ;
+void EcalTBDigiProducer::initializeEvent(edm::Event const &event, edm::EventSetup const &eventSetup) {
+  std::cout << "====****Entering EcalTBDigiProducer produce()" << std::endl;
+  edm::ESHandle<CaloGeometry> hGeometry;
+  eventSetup.get<CaloGeometryRecord>().get(hGeometry);
+  const std::vector<DetId> &theBarrelDets(hGeometry->getValidDetIds(DetId::Ecal, EcalBarrel));
 
-   m_theTBReadout->setDetIds( theBarrelDets ) ;
+  m_theTBReadout->setDetIds(theBarrelDets);
 
-   m_TDCproduct.reset( new EcalTBTDCRawInfo(1) ) ;
-   if( m_doPhaseShift ) 
-   {
-      edm::Handle<PEcalTBInfo>             theEcalTBInfo   ;
-      event.getByLabel( m_ecalTBInfoLabel, theEcalTBInfo ) ;
-      m_thisPhaseShift = theEcalTBInfo->phaseShift() ;
+  m_TDCproduct.reset(new EcalTBTDCRawInfo(1));
+  if (m_doPhaseShift) {
+    edm::Handle<PEcalTBInfo> theEcalTBInfo;
+    event.getByLabel(m_ecalTBInfoLabel, theEcalTBInfo);
+    m_thisPhaseShift = theEcalTBInfo->phaseShift();
 
-      DetId detId( DetId::Ecal, 1 ) ;
-      setPhaseShift( detId ) ;
+    DetId detId(DetId::Ecal, 1);
+    setPhaseShift(detId);
 
-      fillTBTDCRawInfo( *m_TDCproduct ) ; // fill the TDC info in the event    
-   }
-   EcalDigiProducer::initializeEvent( event, eventSetup ) ;
+    fillTBTDCRawInfo(*m_TDCproduct);  // fill the TDC info in the event
+  }
+  EcalDigiProducer::initializeEvent(event, eventSetup);
 }
 
-void EcalTBDigiProducer::finalizeEvent( edm::Event& event, const edm::EventSetup& eventSetup ) {
-   m_ebDigis.reset( new EBDigiCollection ) ;
+void EcalTBDigiProducer::finalizeEvent(edm::Event &event, const edm::EventSetup &eventSetup) {
+  m_ebDigis.reset(new EBDigiCollection);
 
-   EcalDigiProducer::finalizeEvent( event, eventSetup ) ;
+  EcalDigiProducer::finalizeEvent(event, eventSetup);
 
-   const EBDigiCollection* barrelResult ( &*m_ebDigis ) ;
+  const EBDigiCollection *barrelResult(&*m_ebDigis);
 
-   std::unique_ptr<EBDigiCollection> barrelReadout( new EBDigiCollection() ) ;
-   if( m_doReadout ) 
-   {
-      m_theTBReadout->performReadout( event,
-				      m_theTTmap,
-				      *barrelResult,
-				      *barrelReadout ) ;
-   }
-   else 
-   {
-      *barrelReadout = *barrelResult ;
-   }
+  std::unique_ptr<EBDigiCollection> barrelReadout(new EBDigiCollection());
+  if (m_doReadout) {
+    m_theTBReadout->performReadout(event, m_theTTmap, *barrelResult, *barrelReadout);
+  } else {
+    *barrelReadout = *barrelResult;
+  }
 
-   std::cout<< "===**** EcalTBDigiProducer: number of barrel digis = "
-	    << barrelReadout->size()<<std::endl ;
+  std::cout << "===**** EcalTBDigiProducer: number of barrel digis = " << barrelReadout->size() << std::endl;
 
-   std::string const instance("simEcalUnsuppressedDigis");
-   event.put(std::move(barrelReadout), instance + m_EBdigiFinalTag) ;
-   event.put(std::move(m_TDCproduct), instance) ;
+  std::string const instance("simEcalUnsuppressedDigis");
+  event.put(std::move(barrelReadout), instance + m_EBdigiFinalTag);
+  event.put(std::move(m_TDCproduct), instance);
 
-   m_ebDigis.reset(); // release memory
-   m_eeDigis.reset(); // release memory
+  m_ebDigis.reset();  // release memory
+  m_eeDigis.reset();  // release memory
 }
 
-void 
-EcalTBDigiProducer::setPhaseShift( const DetId& detId ) 
-{  
-   const CaloSimParameters& parameters ( 
-      EcalDigiProducer::m_ParameterMap->simParameters( detId ) ) ;
-
-   if ( !parameters.syncPhase() ) 
-   {
-      const int myDet ( detId.subdetId() ) ;
-
-      LogDebug("EcalDigi") << "Setting the phase shift " 
-			   << m_thisPhaseShift 
-			   << " and the offset " 
-			   << m_tunePhaseShift 
-			   << " for the subdetector " 
-			   << myDet;
-
-      if( myDet == 1 ) 
-      {
-	 double passPhaseShift ( m_thisPhaseShift + m_tunePhaseShift ) ;
-	 if( m_use2004OffsetConvention ) passPhaseShift = 1. - passPhaseShift ;
-	 EcalDigiProducer::m_EBResponse->setPhaseShift( passPhaseShift ) ;
-	 EcalDigiProducer::m_EEResponse->setPhaseShift( passPhaseShift ) ;
-      }
-   }
+void EcalTBDigiProducer::setPhaseShift(const DetId &detId) {
+  const CaloSimParameters &parameters(EcalDigiProducer::m_ParameterMap->simParameters(detId));
+
+  if (!parameters.syncPhase()) {
+    const int myDet(detId.subdetId());
+
+    LogDebug("EcalDigi") << "Setting the phase shift " << m_thisPhaseShift << " and the offset " << m_tunePhaseShift
+                         << " for the subdetector " << myDet;
+
+    if (myDet == 1) {
+      double passPhaseShift(m_thisPhaseShift + m_tunePhaseShift);
+      if (m_use2004OffsetConvention)
+        passPhaseShift = 1. - passPhaseShift;
+      EcalDigiProducer::m_EBResponse->setPhaseShift(passPhaseShift);
+      EcalDigiProducer::m_EEResponse->setPhaseShift(passPhaseShift);
+    }
+  }
 }
 
-void 
-EcalTBDigiProducer::fillTBTDCRawInfo( EcalTBTDCRawInfo& theTBTDCRawInfo ) 
-{
-   const unsigned int thisChannel ( 1 ) ;
-  
-   const unsigned int thisCount ( 
-      (unsigned int)( m_thisPhaseShift*( m_tdcRanges[0].tdcMax[0]
-					 - m_tdcRanges[0].tdcMin[0] ) 
-		      + m_tdcRanges[0].tdcMin[0] ) ) ;
+void EcalTBDigiProducer::fillTBTDCRawInfo(EcalTBTDCRawInfo &theTBTDCRawInfo) {
+  const unsigned int thisChannel(1);
+
+  const unsigned int thisCount((unsigned int)(m_thisPhaseShift * (m_tdcRanges[0].tdcMax[0] - m_tdcRanges[0].tdcMin[0]) +
+                                              m_tdcRanges[0].tdcMin[0]));
 
-   EcalTBTDCSample theTBTDCSample ( thisChannel, thisCount ) ;
+  EcalTBTDCSample theTBTDCSample(thisChannel, thisCount);
 
-   const unsigned int sampleIndex ( 0 ) ;
-   theTBTDCRawInfo.setSample( sampleIndex, theTBTDCSample ) ;
+  const unsigned int sampleIndex(0);
+  theTBTDCRawInfo.setSample(sampleIndex, theTBTDCSample);
 
-   LogDebug("EcalDigi") << theTBTDCSample << "\n" << theTBTDCRawInfo ;
+  LogDebug("EcalDigi") << theTBTDCSample << "\n" << theTBTDCRawInfo;
 }
 
-void 
-EcalTBDigiProducer::cacheEBDigis( const EBDigiCollection* ebDigiPtr ) const
-{
-   m_ebDigis.reset( new EBDigiCollection ) ;
-   *m_ebDigis = *ebDigiPtr ;
+void EcalTBDigiProducer::cacheEBDigis(const EBDigiCollection *ebDigiPtr) const {
+  m_ebDigis.reset(new EBDigiCollection);
+  *m_ebDigis = *ebDigiPtr;
 }
 
-void 
-EcalTBDigiProducer::cacheEEDigis( const EEDigiCollection* eeDigiPtr ) const
-{
-   std::cout<< "===**** EcalTBDigiProducer: number of endcap digis = "
-	    << eeDigiPtr->size()<<std::endl ;
+void EcalTBDigiProducer::cacheEEDigis(const EEDigiCollection *eeDigiPtr) const {
+  std::cout << "===**** EcalTBDigiProducer: number of endcap digis = " << eeDigiPtr->size() << std::endl;
 }
diff --git a/SimCalorimetry/EcalTestBeam/src/SealModule.cc b/SimCalorimetry/EcalTestBeam/src/SealModule.cc
index 156559906b856..e0605bec76b17 100644
--- a/SimCalorimetry/EcalTestBeam/src/SealModule.cc
+++ b/SimCalorimetry/EcalTestBeam/src/SealModule.cc
@@ -1,6 +1,5 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "SimGeneral/MixingModule/interface/DigiAccumulatorMixModFactory.h"
 #include "SimCalorimetry/EcalTestBeam/interface/EcalTBDigiProducer.h"
+#include "SimGeneral/MixingModule/interface/DigiAccumulatorMixModFactory.h"
 
 DEFINE_DIGI_ACCUMULATOR(EcalTBDigiProducer);
-
diff --git a/SimCalorimetry/EcalTestBeamAlgos/interface/EcalTBReadout.h b/SimCalorimetry/EcalTestBeamAlgos/interface/EcalTBReadout.h
index 9074cb402df85..2bdd97a4c9243 100644
--- a/SimCalorimetry/EcalTestBeamAlgos/interface/EcalTBReadout.h
+++ b/SimCalorimetry/EcalTestBeamAlgos/interface/EcalTBReadout.h
@@ -9,60 +9,52 @@
 #include <string>
 #include <vector>
 
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
 #include "DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloTopology/interface/EcalTrigTowerConstituentsMap.h"
 
-class EcalTBReadout 
-{
-   public:
-
-      EcalTBReadout(const std::string theEcalTBInfoLabel);
-      ~EcalTBReadout(){};
+class EcalTBReadout {
+public:
+  EcalTBReadout(const std::string theEcalTBInfoLabel);
+  ~EcalTBReadout(){};
 
-      /// tell the readout which cells exist
-      void setDetIds(const std::vector<DetId> & detIds) {theDetIds = &detIds;}
+  /// tell the readout which cells exist
+  void setDetIds(const std::vector<DetId> &detIds) { theDetIds = &detIds; }
 
-      /// search for the TT to be read
-      void findTTlist( const int& crysId , 
-		       const EcalTrigTowerConstituentsMap& etmap);
+  /// search for the TT to be read
+  void findTTlist(const int &crysId, const EcalTrigTowerConstituentsMap &etmap);
 
-      /// read only the digis from the selected TT
-      void readOut( const EBDigiCollection&             input  , 
-		    EBDigiCollection&                   output , 
-		    const EcalTrigTowerConstituentsMap& etmap    ) ;
+  /// read only the digis from the selected TT
+  void readOut(const EBDigiCollection &input, EBDigiCollection &output, const EcalTrigTowerConstituentsMap &etmap);
 
-      /// read only the digis from the selected TT
-      void readOut( const EEDigiCollection&             input  ,
-		    EEDigiCollection&                   output ,
-		    const EcalTrigTowerConstituentsMap& etmap   ) ;
+  /// read only the digis from the selected TT
+  void readOut(const EEDigiCollection &input, EEDigiCollection &output, const EcalTrigTowerConstituentsMap &etmap);
 
-      /// master function to be called once per event
-      void performReadout( edm::Event&                         event    , 
-			   const EcalTrigTowerConstituentsMap& theTTmap , 
-			   const EBDigiCollection&             input    , 
-			   EBDigiCollection&                   output     ) ;
+  /// master function to be called once per event
+  void performReadout(edm::Event &event,
+                      const EcalTrigTowerConstituentsMap &theTTmap,
+                      const EBDigiCollection &input,
+                      EBDigiCollection &output);
 
-      /// master function to be called once per event
-      void performReadout( edm::Event&                         event    , 
-			   const EcalTrigTowerConstituentsMap& theTTmap , 
-			   const EEDigiCollection&             input    , 
-			   EEDigiCollection&                   output     ) ;
+  /// master function to be called once per event
+  void performReadout(edm::Event &event,
+                      const EcalTrigTowerConstituentsMap &theTTmap,
+                      const EEDigiCollection &input,
+                      EEDigiCollection &output);
 
-   private:
+private:
+  int theTargetCrystal_;
 
-      int theTargetCrystal_;
+  std::vector<EcalTrigTowerDetId> theTTlist_;
 
-      std::vector<EcalTrigTowerDetId> theTTlist_;
+  static const int NCRYMATRIX = 7;
 
-      static const int NCRYMATRIX = 7;
-  
-      const std::vector<DetId>* theDetIds;
+  const std::vector<DetId> *theDetIds;
 
-      std::string ecalTBInfoLabel_;
+  std::string ecalTBInfoLabel_;
 };
 
-#endif 
+#endif
diff --git a/SimCalorimetry/EcalTestBeamAlgos/src/EcalTBReadout.cc b/SimCalorimetry/EcalTestBeamAlgos/src/EcalTBReadout.cc
index 71198b8830ded..eeb585c776ff9 100644
--- a/SimCalorimetry/EcalTestBeamAlgos/src/EcalTBReadout.cc
+++ b/SimCalorimetry/EcalTestBeamAlgos/src/EcalTBReadout.cc
@@ -1,216 +1,190 @@
 #include <algorithm>
 #include <iostream>
 
-#include "SimCalorimetry/EcalTestBeamAlgos/interface/EcalTBReadout.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"
+#include "SimCalorimetry/EcalTestBeamAlgos/interface/EcalTBReadout.h"
 #include "SimDataFormats/EcalTestBeam/interface/PEcalTBInfo.h"
 
-EcalTBReadout::EcalTBReadout(const std::string theEcalTBInfoLabel) : 
-   ecalTBInfoLabel_(theEcalTBInfoLabel)
-{
-   theTargetCrystal_ = -1 ;
-   theTTlist_.reserve(1) ;
+EcalTBReadout::EcalTBReadout(const std::string theEcalTBInfoLabel) : ecalTBInfoLabel_(theEcalTBInfoLabel) {
+  theTargetCrystal_ = -1;
+  theTTlist_.reserve(1);
 }
 
-void 
-EcalTBReadout::findTTlist( const int& crysId, 
-			   const EcalTrigTowerConstituentsMap& etmap ) 
-{
-
+void EcalTBReadout::findTTlist(const int &crysId, const EcalTrigTowerConstituentsMap &etmap) {
   // search for the TT involved in the NCRYMATRIX x NCRYMATRIX
   // around the target crystal if a new target, otherwise use
   // the list already filled
 
-   if ( crysId == theTargetCrystal_ ) { return; }
-
-   theTTlist_.clear();
-
-   /// step 1:
-   /// find the correspondence between the crystal identified in module and its DetId
-   /// assuming only 1 SM present
-  
-   EBDetId theTargetId;
-   std::vector<DetId>::const_iterator idItr = theDetIds->begin();
-   unsigned int ncount = 0;
-   bool found = false;
-  
-   while  ( (ncount < theDetIds->size()) && !found ) 
-   {
-      EBDetId thisEBdetid(idItr->rawId());
-      if (thisEBdetid.ic() == crysId) {
-	 theTargetId = thisEBdetid;
-	 found = true;
+  if (crysId == theTargetCrystal_) {
+    return;
+  }
+
+  theTTlist_.clear();
+
+  /// step 1:
+  /// find the correspondence between the crystal identified in module and its
+  /// DetId assuming only 1 SM present
+
+  EBDetId theTargetId;
+  std::vector<DetId>::const_iterator idItr = theDetIds->begin();
+  unsigned int ncount = 0;
+  bool found = false;
+
+  while ((ncount < theDetIds->size()) && !found) {
+    EBDetId thisEBdetid(idItr->rawId());
+    if (thisEBdetid.ic() == crysId) {
+      theTargetId = thisEBdetid;
+      found = true;
+    }
+    ++idItr;
+    ++ncount;
+  }
+  if (!found) {
+    throw cms::Exception("ObjectNotFound", "Ecal TB target crystal not found in geometry");
+    return;
+  }
+  theTargetCrystal_ = theTargetId.ic();
+
+  /// step 2:
+  /// find the crystals in the matrix and fill the TT list
+
+  int myEta = theTargetId.ieta();
+  int myPhi = theTargetId.iphi();
+
+  for (int icrysEta = (myEta - (NCRYMATRIX - 1) / 2); icrysEta <= (myEta + (NCRYMATRIX - 1) / 2); ++icrysEta) {
+    for (int icrysPhi = (myPhi - (NCRYMATRIX - 1) / 2); icrysPhi <= (myPhi + (NCRYMATRIX - 1) / 2); ++icrysPhi) {
+      /// loop on all the valid DetId and search for the good ones
+
+      EBDetId thisEBdetid;
+
+      idItr = theDetIds->begin();
+      ncount = 0;
+      found = false;
+
+      while ((ncount < theDetIds->size()) && !found) {
+        EBDetId myEBdetid(idItr->rawId());
+        if ((myEBdetid.ieta() == icrysEta) && (myEBdetid.iphi() == icrysPhi)) {
+          thisEBdetid = myEBdetid;
+          found = true;
+        }
+        ++idItr;
+        ++ncount;
       }
-      ++idItr;
-      ++ncount;
-   }
-   if ( !found ) {
-      throw cms::Exception("ObjectNotFound", "Ecal TB target crystal not found in geometry");
-      return;
-   }
-   theTargetCrystal_ = theTargetId.ic();
-
-   /// step 2:
-   /// find the crystals in the matrix and fill the TT list
-
-   int myEta = theTargetId.ieta();
-   int myPhi = theTargetId.iphi();
-
-
-   for ( int icrysEta = (myEta-(NCRYMATRIX-1)/2) ; icrysEta <= (myEta+(NCRYMATRIX-1)/2) ; ++icrysEta ) {
-      for ( int icrysPhi = (myPhi-(NCRYMATRIX-1)/2) ; icrysPhi <= (myPhi+(NCRYMATRIX-1)/2) ; ++icrysPhi ) {
-      
-	 /// loop on all the valid DetId and search for the good ones
-
-	 EBDetId thisEBdetid;
-
-	 idItr = theDetIds->begin();
-	 ncount = 0;
-	 found = false;
-  
-	 while  ( (ncount < theDetIds->size()) && !found ) 
-	 {
-	    EBDetId myEBdetid(idItr->rawId());
-	    if ( (myEBdetid.ieta() == icrysEta) && (myEBdetid.iphi() == icrysPhi) ) {
-	       thisEBdetid = myEBdetid;
-	       found = true;
-	    }
-	    ++idItr;
-	    ++ncount;
-	 }
-
-	 if ( found ) {
-	    
-	    EcalTrigTowerDetId thisTTdetId=etmap.towerOf(thisEBdetid);
-	    
-	    LogDebug("EcalDigi") << "Crystal to be readout: sequential id = " << thisEBdetid.ic() << " eta = " << icrysEta << " phi = " << icrysPhi << " from TT = " << thisTTdetId;
-	    
-	    if ( theTTlist_.empty() || ( theTTlist_.size() == 1 && theTTlist_[0] != thisTTdetId )) {
-	       theTTlist_.push_back(thisTTdetId);
-	    }
-	    else {
-	       std::vector<EcalTrigTowerDetId>::iterator ttFound = find(theTTlist_.begin(), theTTlist_.end(), thisTTdetId);
-	       if ( theTTlist_.size() > 1 && ttFound == theTTlist_.end() && *(theTTlist_.end()) != thisTTdetId ) { 
-		  theTTlist_.push_back(thisTTdetId);
-	       }
-	    }
-	 }
+
+      if (found) {
+        EcalTrigTowerDetId thisTTdetId = etmap.towerOf(thisEBdetid);
+
+        LogDebug("EcalDigi") << "Crystal to be readout: sequential id = " << thisEBdetid.ic() << " eta = " << icrysEta
+                             << " phi = " << icrysPhi << " from TT = " << thisTTdetId;
+
+        if (theTTlist_.empty() || (theTTlist_.size() == 1 && theTTlist_[0] != thisTTdetId)) {
+          theTTlist_.push_back(thisTTdetId);
+        } else {
+          std::vector<EcalTrigTowerDetId>::iterator ttFound = find(theTTlist_.begin(), theTTlist_.end(), thisTTdetId);
+          if (theTTlist_.size() > 1 && ttFound == theTTlist_.end() && *(theTTlist_.end()) != thisTTdetId) {
+            theTTlist_.push_back(thisTTdetId);
+          }
+        }
       }
-   }
-   
-   edm::LogInfo("EcalDigi") << " TT to be read: ";
-   for ( unsigned int i = 0 ; i < theTTlist_.size() ; ++i ) {
-      edm::LogInfo("EcalDigi") << " TT " << i << " " << theTTlist_[i];
-   }
+    }
+  }
+
+  edm::LogInfo("EcalDigi") << " TT to be read: ";
+  for (unsigned int i = 0; i < theTTlist_.size(); ++i) {
+    edm::LogInfo("EcalDigi") << " TT " << i << " " << theTTlist_[i];
+  }
 }
 
-void 
-EcalTBReadout::readOut( const  EBDigiCollection&            input  ,
-			EBDigiCollection&                   output ,
-			const EcalTrigTowerConstituentsMap& etmap    ) 
-{
+void EcalTBReadout::readOut(const EBDigiCollection &input,
+                            EBDigiCollection &output,
+                            const EcalTrigTowerConstituentsMap &etmap) {
   /*
   for(EBDigiCollection::const_iterator digiItr = input.begin();
       digiItr != input.end(); ++digiItr)
     {
       EcalTrigTowerDetId thisTTdetId=etmap.towerOf(digiItr->id());
-      std::vector<EcalTrigTowerDetId>::iterator ttFound = find(theTTlist_.begin(), theTTlist_.end(), thisTTdetId);
-      if ((ttFound != theTTlist_.end()) || *(theTTlist_.end()) == thisTTdetId) { 
+      std::vector<EcalTrigTowerDetId>::iterator ttFound =
+  find(theTTlist_.begin(), theTTlist_.end(), thisTTdetId); if ((ttFound !=
+  theTTlist_.end()) || *(theTTlist_.end()) == thisTTdetId) {
         output.push_back(*digiItr);
       }
     }
   edm::LogInfo("EcalDigi") << "Read EB Digis: " << output.size();
   */
 
-   std::cout<<"%%%%%%% In readOut(), size="<< input.size() <<std::endl ;
-
-   for( unsigned int digis=0; digis<input.size(); ++digis )
-   {
-      EBDataFrame ebdf = input[digis];
-    
-      EcalTrigTowerDetId thisTTdetId=etmap.towerOf(ebdf.id());
-      std::vector<EcalTrigTowerDetId>::iterator ttFound = find(theTTlist_.begin(), theTTlist_.end(), thisTTdetId);
-
-      if ((ttFound != theTTlist_.end()) || *(theTTlist_.end()) == thisTTdetId) {      
-	 output.push_back( ebdf.id() ) ;
-	 EBDataFrame ebdf2( output.back() );
-	 std::copy( ebdf.frame().begin(),
-		    ebdf.frame().end(),
-		    ebdf2.frame().begin() );
-      }
-   }
+  std::cout << "%%%%%%% In readOut(), size=" << input.size() << std::endl;
+
+  for (unsigned int digis = 0; digis < input.size(); ++digis) {
+    EBDataFrame ebdf = input[digis];
+
+    EcalTrigTowerDetId thisTTdetId = etmap.towerOf(ebdf.id());
+    std::vector<EcalTrigTowerDetId>::iterator ttFound = find(theTTlist_.begin(), theTTlist_.end(), thisTTdetId);
+
+    if ((ttFound != theTTlist_.end()) || *(theTTlist_.end()) == thisTTdetId) {
+      output.push_back(ebdf.id());
+      EBDataFrame ebdf2(output.back());
+      std::copy(ebdf.frame().begin(), ebdf.frame().end(), ebdf2.frame().begin());
+    }
+  }
 }
 
-void 
-EcalTBReadout::readOut( const EEDigiCollection&             input  , 
-			EEDigiCollection&                   output , 
-			const EcalTrigTowerConstituentsMap& etmap    ) 
-{
-   for (unsigned int digis=0; digis<input.size(); ++digis)
-   { 
-      EEDataFrame eedf ( input[digis] ) ;
-
-      EcalTrigTowerDetId thisTTdetId ( etmap.towerOf( eedf.id() ) ) ;
-
-      std::vector<EcalTrigTowerDetId>::iterator ttFound 
-	 ( find(theTTlist_.begin(), theTTlist_.end(), thisTTdetId ) ) ;
-
-      if( ( ttFound != theTTlist_.end() ) ||
-	  *(theTTlist_.end()) == thisTTdetId ) 
-      {      
-	 output.push_back( eedf.id() ) ;
-	 EEDataFrame eedf2( output.back() ) ;
-	 std::copy( eedf.frame().begin(), 
-		    eedf.frame().end(),
-		    eedf2.frame().begin() );
-      }
-   }
+void EcalTBReadout::readOut(const EEDigiCollection &input,
+                            EEDigiCollection &output,
+                            const EcalTrigTowerConstituentsMap &etmap) {
+  for (unsigned int digis = 0; digis < input.size(); ++digis) {
+    EEDataFrame eedf(input[digis]);
+
+    EcalTrigTowerDetId thisTTdetId(etmap.towerOf(eedf.id()));
+
+    std::vector<EcalTrigTowerDetId>::iterator ttFound(find(theTTlist_.begin(), theTTlist_.end(), thisTTdetId));
+
+    if ((ttFound != theTTlist_.end()) || *(theTTlist_.end()) == thisTTdetId) {
+      output.push_back(eedf.id());
+      EEDataFrame eedf2(output.back());
+      std::copy(eedf.frame().begin(), eedf.frame().end(), eedf2.frame().begin());
+    }
+  }
 }
 
-void
-EcalTBReadout::performReadout( edm::Event&                         event    , 
-			       const EcalTrigTowerConstituentsMap& theTTmap , 
-			       const EBDigiCollection&             input    , 
-			       EBDigiCollection&                   output     ) 
-{
-   // TB readout
-   // step 1: get the target crystal index
+void EcalTBReadout::performReadout(edm::Event &event,
+                                   const EcalTrigTowerConstituentsMap &theTTmap,
+                                   const EBDigiCollection &input,
+                                   EBDigiCollection &output) {
+  // TB readout
+  // step 1: get the target crystal index
+
+  edm::Handle<PEcalTBInfo> theEcalTBInfo;
+  event.getByLabel(ecalTBInfoLabel_, theEcalTBInfo);
 
-   edm::Handle<PEcalTBInfo> theEcalTBInfo;
-   event.getByLabel(ecalTBInfoLabel_,theEcalTBInfo);
+  int crysId = theEcalTBInfo->nCrystal();
 
-   int crysId = theEcalTBInfo->nCrystal();
-  
-   // step 2: update (if needed) the TT list to be read
+  // step 2: update (if needed) the TT list to be read
 
-   findTTlist(crysId, theTTmap);
+  findTTlist(crysId, theTTmap);
 
-   // step 3: perform the readout
+  // step 3: perform the readout
 
-   readOut( input, output, theTTmap ) ;
+  readOut(input, output, theTTmap);
 }
 
-void 
-EcalTBReadout::performReadout( edm::Event&                         event    , 
-			       const EcalTrigTowerConstituentsMap& theTTmap , 
-			       const EEDigiCollection&             input    , 
-			       EEDigiCollection&                   output      ) 
-{
+void EcalTBReadout::performReadout(edm::Event &event,
+                                   const EcalTrigTowerConstituentsMap &theTTmap,
+                                   const EEDigiCollection &input,
+                                   EEDigiCollection &output) {
+  // TB readout
+  // step 1: get the target crystal index
 
-   // TB readout
-   // step 1: get the target crystal index
+  edm::Handle<PEcalTBInfo> theEcalTBInfo;
+  event.getByLabel(ecalTBInfoLabel_, theEcalTBInfo);
 
-   edm::Handle<PEcalTBInfo> theEcalTBInfo;
-   event.getByLabel(ecalTBInfoLabel_,theEcalTBInfo);
+  int crysId = theEcalTBInfo->nCrystal();
 
-   int crysId = theEcalTBInfo->nCrystal();
-  
-   // step 2: update (if needed) the TT list to be read
+  // step 2: update (if needed) the TT list to be read
 
-   findTTlist(crysId, theTTmap);
+  findTTlist(crysId, theTTmap);
 
-   // step 3: perform the readout
+  // step 3: perform the readout
 
-   readOut( input, output, theTTmap) ;
+  readOut(input, output, theTTmap);
 }
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixAmplitudeFilter.h b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixAmplitudeFilter.h
index 4ad755c9b40b4..399559b21e2bd 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixAmplitudeFilter.h
+++ b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixAmplitudeFilter.h
@@ -1,41 +1,41 @@
 #ifndef ECAL_FENIX_AMPLITUDE_FILTER_H
 #define ECAL_FENIX_AMPLITUDE_FILTER_H
 
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 class EcalTPGWeightIdMap;
 class EcalTPGWeightGroup;
 
-  /** 
-   \ class EcalFenixAmplitudeFilter
-   \brief calculates .... for Fenix strip, barrel
-   *  input: 18 bits
-   *  output: 18 bits
-   *  
-   */
+/**
+ \ class EcalFenixAmplitudeFilter
+ \brief calculates .... for Fenix strip, barrel
+ *  input: 18 bits
+ *  output: 18 bits
+ *
+ */
 class EcalFenixAmplitudeFilter {
 
-
- private:
+private:
   int peakFlag_[5];
   int inputsAlreadyIn_;
   int buffer_[5];
   int fgvbBuffer_[5];
   int weights_[5];
   int shift_;
-  int setInput(int input,int fgvb);
+  int setInput(int input, int fgvb);
   void process();
-  
+
   int processedOutput_;
   int processedFgvbOutput_;
 
- public:
+public:
   EcalFenixAmplitudeFilter();
   virtual ~EcalFenixAmplitudeFilter();
-  virtual void process(std::vector<int> & addout, std::vector<int> & output, std::vector<int> &fgvbIn, std::vector<int> &fgvbOut);
-  void setParameters(uint32_t raw,const EcalTPGWeightIdMap * ecaltpgWeightMap,const EcalTPGWeightGroup * ecaltpgWeightGroup);
-  
+  virtual void process(std::vector<int> &addout, std::vector<int> &output,
+                       std::vector<int> &fgvbIn, std::vector<int> &fgvbOut);
+  void setParameters(uint32_t raw, const EcalTPGWeightIdMap *ecaltpgWeightMap,
+                     const EcalTPGWeightGroup *ecaltpgWeightGroup);
 };
 
 #endif
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixBypassLin.h b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixBypassLin.h
index fff7f8edd7998..46975a50a56da 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixBypassLin.h
+++ b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixBypassLin.h
@@ -3,23 +3,23 @@
 
 #include <vector>
 
-/** 
+/**
     \class EcalFenixBypassLin
     \brief Linearisation for Tcp
     *  input: 16 bits
     *  output: 12 bits +1 going to fgvb (???)
-    *  
-    *      ----> c un output de 13 bits, le 13 eme bit est le resultat du fvgb du FenixStrip
+    *
+    *      ----> c un output de 13 bits, le 13 eme bit est le resultat du fvgb
+   du FenixStrip
     */
 
-class EcalFenixBypassLin  {
+class EcalFenixBypassLin {
 
- public:
+public:
   EcalFenixBypassLin();
   virtual ~EcalFenixBypassLin();
 
-  void process(std::vector<int>&, std::vector<int>& );
+  void process(std::vector<int> &, std::vector<int> &);
 };
 
-
 #endif
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixEtStrip.h b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixEtStrip.h
index 13fda5e45766b..81ac5f5d0cf0c 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixEtStrip.h
+++ b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixEtStrip.h
@@ -2,28 +2,28 @@
 #define ECAL_FENIX_ET_STRIP_H
 #include <vector>
 
-  /** 
-     \class EcalFenixEtStrip
+/**
+   \class EcalFenixEtStrip
 
-     class for calculation of Et for Fenix strip
-   *  input: 5x18 bits
-   *  output: 18 bits representing sum
-   *  
-   *  sum method gets vector of CaloTimeSamples
-   *  as input (steph comment : Ursula, why CaloTimeSample ?)
-   *  simple sum, test for max?
-   *  max in h4ana is 0x3FFFF 
-   *  
-   *  ---> if overflow sum= (2^18-1)
-   */
+   class for calculation of Et for Fenix strip
+ *  input: 5x18 bits
+ *  output: 18 bits representing sum
+ *
+ *  sum method gets vector of CaloTimeSamples
+ *  as input (steph comment : Ursula, why CaloTimeSample ?)
+ *  simple sum, test for max?
+ *  max in h4ana is 0x3FFFF
+ *
+ *  ---> if overflow sum= (2^18-1)
+ */
 
-class EcalFenixEtStrip  {
- private:
-
- public:
+class EcalFenixEtStrip {
+private:
+public:
   EcalFenixEtStrip();
   virtual ~EcalFenixEtStrip();
-  void process(const std::vector<std::vector<int> > &linout, int nrXtals, std::vector<int> & output);
+  void process(const std::vector<std::vector<int>> &linout, int nrXtals,
+               std::vector<int> &output);
 };
 
 #endif
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixEtTot.h b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixEtTot.h
index b2312013359e9..ebbf3f0ad8b79 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixEtTot.h
+++ b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixEtTot.h
@@ -4,35 +4,35 @@
 #include "DataFormats/EcalDigi/interface/EBDataFrame.h"
 #include <vector>
 
-/** 
+/**
     \class EcalFenixEtTot
 
     \brief class for calculation of Et for Fenix tcp
     *  calculates the sum
-    *  
-    *  inputs: 
-    *        -5x 12 bits (12 first bits of output of passlin or take 13 bits and select the first 12 ones in the class...
+    *
+    *  inputs:
+    *        -5x 12 bits (12 first bits of output of passlin or take 13 bits and
+   select the first 12 ones in the class...
     *         for EBDataFrame
               5X 10 bits (10 first bits)
-	      according to the second parameter)
+              according to the second parameter)
     *        -number of interesting bits according EE or EBDataFrame
-    *  
+    *
     *  output :12 bits (EB) or 10(EE)
-    *  
+    *
     *  in case of overflow, result is set to (2**12)-1 or (2**10)-1
     */
 class EcalFenixEtTot {
 
-
- public:
+public:
   EcalFenixEtTot();
   virtual ~EcalFenixEtTot();
-  virtual std::vector<int> process(const std::vector<EBDataFrame *> &); 
-    
-  void process(std::vector<std::vector <int> >&,int nStr, int bitMask , std::vector<int> & out);
+  virtual std::vector<int> process(const std::vector<EBDataFrame *> &);
 
- private:
-};
+  void process(std::vector<std::vector<int>> &, int nStr, int bitMask,
+               std::vector<int> &out);
 
+private:
+};
 
 #endif
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixFgvbEB.h b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixFgvbEB.h
index e76c605caf88f..39ba725ed312b 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixFgvbEB.h
+++ b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixFgvbEB.h
@@ -1,41 +1,43 @@
 #ifndef ECAL_FENIX_FGVB_EB_H
 #define ECAL_FENIX_FGVB_EB_H
 
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 class EcalTPGFineGrainEBGroup;
 class EcalTPGFineGrainEBIdMap;
 
-/** 
+/**
     \class EcalFenixFgvbEB
     \brief calculation of Fgvb for Fenix Tcp, format barrel
     *  calculates fgvb for the barrel
-    *  
-    *  
+    *
+    *
     *  input: 2X12 bits ( 12 bits Ettot + 12 bits maxof2)
-    *  output: 1 bit 
-    *  
-    *  
-    *  makes comparisons between maxof2 and 2 fractions of Ettot and  uses this comparison to decide ---> needs to get some values from outside
+    *  output: 1 bit
+    *
+    *
+    *  makes comparisons between maxof2 and 2 fractions of Ettot and  uses this
+   comparison to decide ---> needs to get some values from outside
     */
 class EcalFenixFgvbEB {
 
- private:
-  uint32_t ETlow_,  EThigh_,  Ratlow_,  Rathigh_, lut_;
+private:
+  uint32_t ETlow_, EThigh_, Ratlow_, Rathigh_, lut_;
   //    std::vector<int> adder_out_;
   //    std::vector<int> maxOf2_out_;
   //    std::vector<int> fgvb_out_;
-    std::vector<int> add_out_8_;
+  std::vector<int> add_out_8_;
 
+public:
+  EcalFenixFgvbEB(int maxNrSamples);
+  virtual ~EcalFenixFgvbEB();
+  void setParameters(uint32_t towid,
+                     const EcalTPGFineGrainEBGroup *ecaltpgFgEBGroup,
+                     const EcalTPGFineGrainEBIdMap *ecaltpgFineGrainEB);
 
- public:
-    EcalFenixFgvbEB(int maxNrSamples) ;
-    virtual ~EcalFenixFgvbEB();
-    void setParameters(uint32_t towid,const EcalTPGFineGrainEBGroup *ecaltpgFgEBGroup,const EcalTPGFineGrainEBIdMap *ecaltpgFineGrainEB );
-    
-    void process( std::vector<int> &add_out, std::vector<int> &maxof2_out, std::vector<int> & output);
+  void process(std::vector<int> &add_out, std::vector<int> &maxof2_out,
+               std::vector<int> &output);
 };
 
-
 #endif
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixLinearizer.h b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixLinearizer.h
index db7701fc7f409..5891fa91fd86b 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixLinearizer.h
+++ b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixLinearizer.h
@@ -1,68 +1,67 @@
 #ifndef ECAL_FENIX_LINEARIZER_H
 #define ECAL_FENIX_LINEARIZER_H
 
-#include <DataFormats/EcalDigi/interface/EcalMGPASample.h>
-#include <CondFormats/EcalObjects/interface/EcalTPGPedestals.h>
-#include <CondFormats/EcalObjects/interface/EcalTPGLinearizationConst.h>
 #include <CondFormats/EcalObjects/interface/EcalTPGCrystalStatus.h>
+#include <CondFormats/EcalObjects/interface/EcalTPGLinearizationConst.h>
+#include <CondFormats/EcalObjects/interface/EcalTPGPedestals.h>
+#include <DataFormats/EcalDigi/interface/EcalMGPASample.h>
+
+#include <vector>
 
-#include <vector> 
+/**
+ \class EcalFenixLinearizer
+ \brief Linearisation for Fenix strip
+ *  input: 16 bits  corresponding to input EBDataFrame
+ *  output: 18 bits
+ *
+ */
 
-  /** 
-   \class EcalFenixLinearizer
-   \brief Linearisation for Fenix strip
-   *  input: 16 bits  corresponding to input EBDataFrame
-   *  output: 18 bits 
-   *  
-   */
+class EcalFenixLinearizer {
 
-  class EcalFenixLinearizer  {
+private:
+  bool famos_;
+  int uncorrectedSample_;
+  int gainID_;
+  int base_;
+  int mult_;
+  int shift_;
+  int strip_;
+  bool init_;
 
+  const EcalTPGLinearizationConstant *linConsts_;
+  const EcalTPGPedestal *peds_;
+  const EcalTPGCrystalStatusCode *badXStatus_;
 
-  private:
-    bool famos_;
-    int uncorrectedSample_;
-    int gainID_;
-    int base_;
-    int mult_;
-    int shift_;
-    int strip_;
-    bool init_;
-    
-    const EcalTPGLinearizationConstant  *linConsts_;
-    const EcalTPGPedestal *peds_;
-    const EcalTPGCrystalStatusCode *badXStatus_;
-    
-    std::vector<const EcalTPGCrystalStatusCode *> vectorbadXStatus_;
-     	
-    int setInput(const EcalMGPASample &RawSam) ;
-    int process() ;
+  std::vector<const EcalTPGCrystalStatusCode *> vectorbadXStatus_;
 
+  int setInput(const EcalMGPASample &RawSam);
+  int process();
 
-  public:
-    EcalFenixLinearizer(bool famos);
-    virtual ~EcalFenixLinearizer();
+public:
+  EcalFenixLinearizer(bool famos);
+  virtual ~EcalFenixLinearizer();
 
-    template <class T>  
-      void process(const T &, std::vector<int>&); 
-    void setParameters(uint32_t raw, const EcalTPGPedestals * ecaltpPed,const EcalTPGLinearizationConst * ecaltpLin, const EcalTPGCrystalStatus * ecaltpBadX) ;
+  template <class T> void process(const T &, std::vector<int> &);
+  void setParameters(uint32_t raw, const EcalTPGPedestals *ecaltpPed,
+                     const EcalTPGLinearizationConst *ecaltpLin,
+                     const EcalTPGCrystalStatus *ecaltpBadX);
 };
 
-template <class T> 
-void EcalFenixLinearizer::process(const T&df, std::vector<int> & output_percry)
-{
+template <class T>
+void EcalFenixLinearizer::process(const T &df,
+                                  std::vector<int> &output_percry) {
 
-  //We know a tower numbering is:
-// S1 S2 S3 S4 S5
-//
-// 4  5  14 15 24
-// 3  6  13 16 23
-// 2  7  12 17 22
-// 1  8  11 18 21
-// 0  9  10 19 20
-  for (int i=0;i<df.size();i++) {
+  // We know a tower numbering is:
+  // S1 S2 S3 S4 S5
+  //
+  // 4  5  14 15 24
+  // 3  6  13 16 23
+  // 2  7  12 17 22
+  // 1  8  11 18 21
+  // 0  9  10 19 20
+  for (int i = 0; i < df.size(); i++) {
     setInput(df[i]);
-    output_percry[i]=process();
+    output_percry[i] = process();
   }
 
   return;
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixMaxof2.h b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixMaxof2.h
index 0c6bd6425753f..112d020880a77 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixMaxof2.h
+++ b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixMaxof2.h
@@ -3,28 +3,29 @@
 
 #include <vector>
 
-  /** 
-   *  finds max sum of two adjacent samples
-   *  
-   *  input: 5x 12 bits (les 12 premiers bits sortant du bypasslin)
-   *  output: 12 bits 
-   *  
-   *  computes 4 sums of 2 strips and gives the max
-   *  max limited by 0xfff
-   *  
-   *  
-   */
+/**
+ *  finds max sum of two adjacent samples
+ *
+ *  input: 5x 12 bits (les 12 premiers bits sortant du bypasslin)
+ *  output: 12 bits
+ *
+ *  computes 4 sums of 2 strips and gives the max
+ *  max limited by 0xfff
+ *
+ *
+ */
 
 class EcalFenixMaxof2 {
 
 public:
-  EcalFenixMaxof2(int maxNrSamples,int nbMaxStrips) ;
-  virtual ~EcalFenixMaxof2() ;
-  void process(std::vector<std::vector <int> > &, int nStr, int bitMask, std::vector<int> &out);
+  EcalFenixMaxof2(int maxNrSamples, int nbMaxStrips);
+  virtual ~EcalFenixMaxof2();
+  void process(std::vector<std::vector<int>> &, int nStr, int bitMask,
+               std::vector<int> &out);
 
- private:
+private:
   int nbMaxStrips_;
-  std::vector<std::vector<int> >  sumby2_; 
+  std::vector<std::vector<int>> sumby2_;
 };
 
 #endif
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixPeakFinder.h b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixPeakFinder.h
index 1d914f601e2be..291f6769bf8c7 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixPeakFinder.h
+++ b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixPeakFinder.h
@@ -3,19 +3,20 @@
 
 #include <vector>
 
-  /** 
-   \ class EcalFenixPeakFinder
-   \brief calculates the peak for Fenix strip, barrel
-   *  input : 18 bits
-   *  output: boolean
-   *  
-   *  --->gets the sample where the value is max. the  value is 1 for this max sample, 0 for the others .needs 3 samples to proceed.
-   *  ----> do we really need caloVShape?
-   */
+/**
+ \ class EcalFenixPeakFinder
+ \brief calculates the peak for Fenix strip, barrel
+ *  input : 18 bits
+ *  output: boolean
+ *
+ *  --->gets the sample where the value is max. the  value is 1 for this max
+ sample, 0 for the others .needs 3 samples to proceed.
+ *  ----> do we really need caloVShape?
+ */
 
 class EcalFenixPeakFinder {
 
- private:
+private:
   bool disabled;
   int setInput(int input);
   int process();
@@ -23,14 +24,14 @@ class EcalFenixPeakFinder {
   int inputsAlreadyIn_;
   int buffer_[3];
 
- public:
-
+public:
   EcalFenixPeakFinder();
   virtual ~EcalFenixPeakFinder();
-  virtual std::vector<int> process(std::vector<int>& filtout, std::vector<int> & output);
+  virtual std::vector<int> process(std::vector<int> &filtout,
+                                   std::vector<int> &output);
   // from CaloVShape
   //  virtual double operator()(double) const {return 0.;}
   //  virtual double derivative(double) const {return 0.;}
- };
+};
 
 #endif
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStrip.h b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStrip.h
index ddd15a2905c97..8b70db93d010f 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStrip.h
+++ b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStrip.h
@@ -1,20 +1,18 @@
 #ifndef ECAL_FENIXSTRIP_H
 #define ECAL_FENIXSTRIP_H
 
-#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixLinearizer.h>
 #include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixAmplitudeFilter.h>
-#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixPeakFinder.h>
 #include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixEtStrip.h>
 #include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixLinearizer.h>
-#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixEtStrip.h>
+#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixPeakFinder.h>
 #include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFgvbEE.h>
 
 #include "DataFormats/EcalDetId/interface/EcalTriggerElectronicsId.h"
-#include <DataFormats/EcalDigi/interface/EBDataFrame.h>
-#include <DataFormats/EcalDigi/interface/EEDataFrame.h>
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 #include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h"
+#include <DataFormats/EcalDigi/interface/EBDataFrame.h>
+#include <DataFormats/EcalDigi/interface/EEDataFrame.h>
 
 class EBDataFrame;
 class EcalTriggerPrimitiveSample;
@@ -25,41 +23,41 @@ class EcalFenixStripFormatEB;
 class EcalFenixStripFormatEE;
 class EcalTPGStripStatus;
 
-/** 
+/**
     \class EcalFenixStrip
     \brief class representing the Fenix chip, format strip
 */
 class EcalFenixStrip {
- public:
-
+public:
   // constructor, destructor
-  EcalFenixStrip(const edm::EventSetup& setup, const EcalElectronicsMapping* theMapping,bool debug,bool famos,int maxNrSamples, int nbMaxXtals);
-  virtual ~EcalFenixStrip() ;
+  EcalFenixStrip(const edm::EventSetup &setup,
+                 const EcalElectronicsMapping *theMapping, bool debug,
+                 bool famos, int maxNrSamples, int nbMaxXtals);
+  virtual ~EcalFenixStrip();
 
- private:
- const EcalElectronicsMapping* theMapping_;
+private:
+  const EcalElectronicsMapping *theMapping_;
 
   bool debug_;
   bool famos_;
   int nbMaxXtals_;
-    
-  std::vector <EcalFenixLinearizer *> linearizer_; 
 
-  EcalFenixAmplitudeFilter *amplitude_filter_; 
+  std::vector<EcalFenixLinearizer *> linearizer_;
+
+  EcalFenixAmplitudeFilter *amplitude_filter_;
+
+  EcalFenixPeakFinder *peak_finder_;
+
+  EcalFenixStripFormatEB *fenixFormatterEB_;
 
-  EcalFenixPeakFinder *peak_finder_; 
-    
-  EcalFenixStripFormatEB *fenixFormatterEB_;   
-    
   EcalFenixStripFormatEE *fenixFormatterEE_;
-    
 
   EcalFenixEtStrip *adder_;
-    
+
   EcalFenixStripFgvbEE *fgvbEE_;
 
   // data formats for each event
-  std::vector<std::vector<int> > lin_out_;
+  std::vector<std::vector<int>> lin_out_;
   std::vector<int> add_out_;
   std::vector<int> filt_out_;
   std::vector<int> peak_out_;
@@ -67,7 +65,7 @@ class EcalFenixStrip {
   std::vector<int> fgvb_out_;
   std::vector<int> fgvb_out_temp_;
 
-  const EcalTPGPedestals * ecaltpPed_;
+  const EcalTPGPedestals *ecaltpPed_;
   const EcalTPGLinearizationConst *ecaltpLin_;
   const EcalTPGWeightIdMap *ecaltpgWeightMap_;
   const EcalTPGWeightGroup *ecaltpgWeightGroup_;
@@ -78,188 +76,219 @@ class EcalFenixStrip {
 
   bool identif_;
 
- public:
-
-  void setPointers(  const EcalTPGPedestals * ecaltpPed,
-		     const EcalTPGLinearizationConst *ecaltpLin,
-		     const EcalTPGWeightIdMap *ecaltpgWeightMap,
-		     const EcalTPGWeightGroup *ecaltpgWeightGroup,
-		     const EcalTPGSlidingWindow *ecaltpgSlidW,
-		     const EcalTPGFineGrainStripEE *ecaltpgFgStripEE,
-		     const EcalTPGCrystalStatus *ecaltpgBadX,
-                     const EcalTPGStripStatus *ecaltpgStripStatus)
-    {
-      ecaltpPed_=ecaltpPed;
-      ecaltpLin_=ecaltpLin;
-      ecaltpgWeightMap_=ecaltpgWeightMap;
-      ecaltpgWeightGroup_= ecaltpgWeightGroup;
-      ecaltpgSlidW_=ecaltpgSlidW;
-      ecaltpgFgStripEE_=ecaltpgFgStripEE;
-      ecaltpgBadX_=ecaltpgBadX;
-      ecaltpgStripStatus_=ecaltpgStripStatus;
-    }
+public:
+  void setPointers(const EcalTPGPedestals *ecaltpPed,
+                   const EcalTPGLinearizationConst *ecaltpLin,
+                   const EcalTPGWeightIdMap *ecaltpgWeightMap,
+                   const EcalTPGWeightGroup *ecaltpgWeightGroup,
+                   const EcalTPGSlidingWindow *ecaltpgSlidW,
+                   const EcalTPGFineGrainStripEE *ecaltpgFgStripEE,
+                   const EcalTPGCrystalStatus *ecaltpgBadX,
+                   const EcalTPGStripStatus *ecaltpgStripStatus) {
+    ecaltpPed_ = ecaltpPed;
+    ecaltpLin_ = ecaltpLin;
+    ecaltpgWeightMap_ = ecaltpgWeightMap;
+    ecaltpgWeightGroup_ = ecaltpgWeightGroup;
+    ecaltpgSlidW_ = ecaltpgSlidW;
+    ecaltpgFgStripEE_ = ecaltpgFgStripEE;
+    ecaltpgBadX_ = ecaltpgBadX;
+    ecaltpgStripStatus_ = ecaltpgStripStatus;
+  }
 
   // main methods
   // process method is splitted in 2 parts:
   //   the first one is templated, the same except input
   //   the second part is slightly different for barrel/endcap
-  template <class T> 
-  void process(const edm::EventSetup&, std::vector<const T> &, int nrxtals, std::vector<int> & out);
-  void process_part2_barrel(uint32_t stripid,const EcalTPGSlidingWindow * ecaltpgSlidW,const EcalTPGFineGrainStripEE * ecaltpgFgStripEE);
+  template <class T>
+  void process(const edm::EventSetup &, std::vector<const T> &, int nrxtals,
+               std::vector<int> &out);
+  void process_part2_barrel(uint32_t stripid,
+                            const EcalTPGSlidingWindow *ecaltpgSlidW,
+                            const EcalTPGFineGrainStripEE *ecaltpgFgStripEE);
+
+  void process_part2_endcap(uint32_t stripid,
+                            const EcalTPGSlidingWindow *ecaltpgSlidW,
+                            const EcalTPGFineGrainStripEE *ecaltpgFgStripEE,
+                            const EcalTPGStripStatus *ecaltpgStripStatus);
 
-  void process_part2_endcap(uint32_t stripid, const EcalTPGSlidingWindow * ecaltpgSlidW,const EcalTPGFineGrainStripEE * ecaltpgFgStripEE,const EcalTPGStripStatus * ecaltpgStripStatus);
+  // getters for the algorithms  ;
 
+  EcalFenixLinearizer *getLinearizer(int i) const { return linearizer_[i]; }
+  EcalFenixEtStrip *getAdder() const { return adder_; }
+  EcalFenixAmplitudeFilter *getFilter() const { return amplitude_filter_; }
+  EcalFenixPeakFinder *getPeakFinder() const { return peak_finder_; }
 
-  // getters for the algorithms  ;
+  EcalFenixStripFormatEB *getFormatterEB() const { return fenixFormatterEB_; }
+  EcalFenixStripFormatEE *getFormatterEE() const { return fenixFormatterEE_; }
 
-  EcalFenixLinearizer *getLinearizer (int i) const { return linearizer_[i];}
-  EcalFenixEtStrip *getAdder() const { return  adder_;}
-  EcalFenixAmplitudeFilter *getFilter() const { return amplitude_filter_;}
-  EcalFenixPeakFinder *getPeakFinder() const { return peak_finder_;}
-    
-  EcalFenixStripFormatEB *getFormatterEB() const { return fenixFormatterEB_;}
-  EcalFenixStripFormatEE *getFormatterEE() const { return fenixFormatterEE_;}
-    
-  EcalFenixStripFgvbEE *getFGVB()      const { return fgvbEE_;}
+  EcalFenixStripFgvbEE *getFGVB() const { return fgvbEE_; }
 
-  void setbadStripMissing(bool flag) { identif_ = flag; } 
-  bool getbadStripMissing() const {return identif_;}
+  void setbadStripMissing(bool flag) { identif_ = flag; }
+  bool getbadStripMissing() const { return identif_; }
 
-  // ========================= implementations ==============================================================
-  void process(const edm::EventSetup &setup, std::vector<EBDataFrame> &samples, int nrXtals,std::vector<int> &out){
+  // ========================= implementations
+  // ==============================================================
+  void process(const edm::EventSetup &setup, std::vector<EBDataFrame> &samples,
+               int nrXtals, std::vector<int> &out) {
 
     // now call processing
     if (samples.empty()) {
-      std::cout<<" Warning: 0 size vector found in EcalFenixStripProcess!!!!!"<<std::endl;
+      std::cout << " Warning: 0 size vector found in EcalFenixStripProcess!!!!!"
+                << std::endl;
       return;
+    }
+    const EcalTriggerElectronicsId elId =
+        theMapping_->getTriggerElectronicsId(samples[0].id());
+    uint32_t stripid = elId.rawId() & 0xfffffff8; // from Pascal
 
+    identif_ = getFGVB()->getMissedStripFlag();
+
+    process_part1(identif_, samples, nrXtals, stripid, ecaltpPed_, ecaltpLin_,
+                  ecaltpgWeightMap_, ecaltpgWeightGroup_,
+                  ecaltpgBadX_); // templated part
+    process_part2_barrel(stripid, ecaltpgSlidW_,
+                         ecaltpgFgStripEE_); // part different for barrel/endcap
+    out = format_out_;
+  }
+
+  void process(const edm::EventSetup &setup, std::vector<EEDataFrame> &samples,
+               int nrXtals, std::vector<int> &out) {
+
+    // now call processing
+    if (samples.empty()) {
+      std::cout << " Warning: 0 size vector found in EcalFenixStripProcess!!!!!"
+                << std::endl;
+      return;
     }
-    const EcalTriggerElectronicsId elId = theMapping_->getTriggerElectronicsId(samples[0].id());
-    uint32_t stripid=elId.rawId() & 0xfffffff8;   //from Pascal
-    
+    const EcalTriggerElectronicsId elId =
+        theMapping_->getTriggerElectronicsId(samples[0].id());
+    uint32_t stripid = elId.rawId() & 0xfffffff8; // from Pascal
+
     identif_ = getFGVB()->getMissedStripFlag();
-    
-    process_part1(identif_,samples,nrXtals,stripid,ecaltpPed_,ecaltpLin_,ecaltpgWeightMap_,ecaltpgWeightGroup_,ecaltpgBadX_);//templated part
-    process_part2_barrel(stripid,ecaltpgSlidW_,ecaltpgFgStripEE_);//part different for barrel/endcap
-    out=format_out_;
+
+    process_part1(identif_, samples, nrXtals, stripid, ecaltpPed_, ecaltpLin_,
+                  ecaltpgWeightMap_, ecaltpgWeightGroup_,
+                  ecaltpgBadX_); // templated part
+    process_part2_endcap(stripid, ecaltpgSlidW_, ecaltpgFgStripEE_,
+                         ecaltpgStripStatus_);
+    out = format_out_; // FIXME: timing
+    return;
   }
 
- void  process(const edm::EventSetup &setup, std::vector<EEDataFrame> &samples, int nrXtals, std::vector<int> & out){
-
-// now call processing
-   if (samples.empty()) {
-     std::cout<<" Warning: 0 size vector found in EcalFenixStripProcess!!!!!"<<std::endl;
-     return;
-   }
-   const EcalTriggerElectronicsId elId = theMapping_->getTriggerElectronicsId(samples[0].id());
-   uint32_t stripid=elId.rawId() & 0xfffffff8;   //from Pascal
-   
-   identif_ = getFGVB()->getMissedStripFlag();
-   
-   process_part1(identif_,samples,nrXtals,stripid,ecaltpPed_,ecaltpLin_,ecaltpgWeightMap_,ecaltpgWeightGroup_,ecaltpgBadX_); //templated part
-   process_part2_endcap(stripid,ecaltpgSlidW_,ecaltpgFgStripEE_,ecaltpgStripStatus_);
-   out=format_out_; //FIXME: timing
-   return;
- }
-
- template <class T> 
- void  process_part1(int identif, std::vector<T> & df,int nrXtals, uint32_t stripid, const EcalTPGPedestals * ecaltpPed, const
- EcalTPGLinearizationConst *ecaltpLin,const EcalTPGWeightIdMap * ecaltpgWeightMap,const EcalTPGWeightGroup * ecaltpgWeightGroup, const EcalTPGCrystalStatus * ecaltpBadX)
-   {
-  
-      if(debug_)  std::cout<<"\n\nEcalFenixStrip input is a vector of size: "<<nrXtals<< std::endl;
-
-      //loop over crystals
-      for (int cryst=0;cryst<nrXtals;cryst++) {
-	if(debug_){
-	  std::cout<<std::endl;
-	  std::cout <<"cryst= "<<cryst<<" EBDataFrame/EEDataFrame is: "<<std::endl; 
-	  for ( int i = 0; i<df[cryst].size();i++){
-	    std::cout <<" "<<std::dec<<df[cryst][i].adc();
-	  }
-	  std::cout<<std::endl;
-	}
-	// call linearizer
-	this->getLinearizer(cryst)->setParameters(df[cryst].id().rawId(),ecaltpPed,ecaltpLin,ecaltpBadX) ; 
-	this->getLinearizer(cryst)->process(df[cryst],lin_out_[cryst]);
+  template <class T>
+  void process_part1(int identif, std::vector<T> &df, int nrXtals,
+                     uint32_t stripid, const EcalTPGPedestals *ecaltpPed,
+                     const EcalTPGLinearizationConst *ecaltpLin,
+                     const EcalTPGWeightIdMap *ecaltpgWeightMap,
+                     const EcalTPGWeightGroup *ecaltpgWeightGroup,
+                     const EcalTPGCrystalStatus *ecaltpBadX) {
+
+    if (debug_)
+      std::cout << "\n\nEcalFenixStrip input is a vector of size: " << nrXtals
+                << std::endl;
+
+    // loop over crystals
+    for (int cryst = 0; cryst < nrXtals; cryst++) {
+      if (debug_) {
+        std::cout << std::endl;
+        std::cout << "cryst= " << cryst
+                  << " EBDataFrame/EEDataFrame is: " << std::endl;
+        for (int i = 0; i < df[cryst].size(); i++) {
+          std::cout << " " << std::dec << df[cryst][i].adc();
+        }
+        std::cout << std::endl;
       }
+      // call linearizer
+      this->getLinearizer(cryst)->setParameters(
+          df[cryst].id().rawId(), ecaltpPed, ecaltpLin, ecaltpBadX);
+      this->getLinearizer(cryst)->process(df[cryst], lin_out_[cryst]);
+    }
 
-      if(debug_){
-	std::cout<< "output of linearizer is a vector of size: "
-              <<std::dec<<lin_out_.size()<<" of which used "<<nrXtals<<std::endl; 
-	for (int ix=0;ix<nrXtals;ix++){
-	  std::cout<< "cryst: "<<ix<<"  value : "<<std::dec<<std::endl;
-	  std::cout<<" lin_out[ix].size()= "<<std::dec<<lin_out_[ix].size()<<std::endl;
-	  for (unsigned int i =0; i<lin_out_[ix].size();i++){
-	    std::cout <<" "<<std::dec<<(lin_out_[ix])[i];
-	  }
-	  std::cout<<std::endl;
-	}
-    
-	std::cout<<std::endl;
-      }
- 
-      // Now call the sFGVB - this is common between EB and EE!
-      getFGVB()->setParameters(identif, stripid,ecaltpgFgStripEE_);
-      getFGVB()->process(lin_out_,fgvb_out_temp_);
-
-      if(debug_)
-      {
-        std::cout << "output of strip fgvb is a vector of size: " <<std::dec<<fgvb_out_temp_.size()<<std::endl;
-        for (unsigned int i =0; i<fgvb_out_temp_.size();i++){
-          std::cout << " " << std::dec << (fgvb_out_temp_[i]);
+    if (debug_) {
+      std::cout << "output of linearizer is a vector of size: " << std::dec
+                << lin_out_.size() << " of which used " << nrXtals << std::endl;
+      for (int ix = 0; ix < nrXtals; ix++) {
+        std::cout << "cryst: " << ix << "  value : " << std::dec << std::endl;
+        std::cout << " lin_out[ix].size()= " << std::dec << lin_out_[ix].size()
+                  << std::endl;
+        for (unsigned int i = 0; i < lin_out_[ix].size(); i++) {
+          std::cout << " " << std::dec << (lin_out_[ix])[i];
         }
-        std::cout<<std::endl;
+        std::cout << std::endl;
       }
- 
-      // call adder
-      this->getAdder()->process(lin_out_,nrXtals,add_out_);  //add_out is of size SIZEMAX=maxNrSamples
- 
-      if(debug_){
-	std::cout<< "output of adder is a vector of size: "<<std::dec<<add_out_.size()<<std::endl; 
-	for (unsigned int ix=0;ix<add_out_.size();ix++){
-	  std::cout<< "cryst: "<<ix<<"  value : "<<std::dec<<add_out_[ix]<<std::endl;
-	}
-	std::cout<<std::endl;
+
+      std::cout << std::endl;
+    }
+
+    // Now call the sFGVB - this is common between EB and EE!
+    getFGVB()->setParameters(identif, stripid, ecaltpgFgStripEE_);
+    getFGVB()->process(lin_out_, fgvb_out_temp_);
+
+    if (debug_) {
+      std::cout << "output of strip fgvb is a vector of size: " << std::dec
+                << fgvb_out_temp_.size() << std::endl;
+      for (unsigned int i = 0; i < fgvb_out_temp_.size(); i++) {
+        std::cout << " " << std::dec << (fgvb_out_temp_[i]);
+      }
+      std::cout << std::endl;
+    }
+
+    // call adder
+    this->getAdder()->process(
+        lin_out_, nrXtals, add_out_); // add_out is of size SIZEMAX=maxNrSamples
+
+    if (debug_) {
+      std::cout << "output of adder is a vector of size: " << std::dec
+                << add_out_.size() << std::endl;
+      for (unsigned int ix = 0; ix < add_out_.size(); ix++) {
+        std::cout << "cryst: " << ix << "  value : " << std::dec << add_out_[ix]
+                  << std::endl;
       }
- 
-
-      if (famos_) {
-	filt_out_[0]= add_out_[0];
-	peak_out_[0]= add_out_[0];
-	return;
-      }else {
-	// call amplitudefilter
-	this->getFilter()->setParameters(stripid,ecaltpgWeightMap,ecaltpgWeightGroup); 
-	this->getFilter()->process(add_out_,filt_out_,fgvb_out_temp_,fgvb_out_); 
-
-	if(debug_){
-	  std::cout<< "output of filter is a vector of size: "<<std::dec<<filt_out_.size()<<std::endl; 
-	  for (unsigned int ix=0;ix<filt_out_.size();ix++){
-	    std::cout<< "cryst: "<<ix<<"  value : "<<std::dec<<filt_out_[ix]<<std::endl;
-	  }
-	  std::cout<<std::endl;
-
-          std::cout<< "output of sfgvb after filter is a vector of size: "<<std::dec<<fgvb_out_.size()<<std::endl;
-          for (unsigned int ix=0;ix<fgvb_out_.size();ix++){
-            std::cout<< "cryst: "<<ix<<"  value : "<<std::dec<<fgvb_out_[ix]<<std::endl;
-          }
-          std::cout<<std::endl;
-	}
-
-	// call peakfinder
-	this->getPeakFinder()->process(filt_out_,peak_out_);
-	if(debug_){
-	  std::cout<< "output of peakfinder is a vector of size: "<<peak_out_.size()<<std::endl; 
-	  for (unsigned int ix=0;ix<peak_out_.size();ix++){
-	    std::cout<< "cryst: "<<ix<<"  value : "<<peak_out_[ix]<<std::endl;
-	  }
-	  std::cout<<std::endl;
-	}
-	return;
+      std::cout << std::endl;
+    }
+
+    if (famos_) {
+      filt_out_[0] = add_out_[0];
+      peak_out_[0] = add_out_[0];
+      return;
+    } else {
+      // call amplitudefilter
+      this->getFilter()->setParameters(stripid, ecaltpgWeightMap,
+                                       ecaltpgWeightGroup);
+      this->getFilter()->process(add_out_, filt_out_, fgvb_out_temp_,
+                                 fgvb_out_);
+
+      if (debug_) {
+        std::cout << "output of filter is a vector of size: " << std::dec
+                  << filt_out_.size() << std::endl;
+        for (unsigned int ix = 0; ix < filt_out_.size(); ix++) {
+          std::cout << "cryst: " << ix << "  value : " << std::dec
+                    << filt_out_[ix] << std::endl;
+        }
+        std::cout << std::endl;
+
+        std::cout << "output of sfgvb after filter is a vector of size: "
+                  << std::dec << fgvb_out_.size() << std::endl;
+        for (unsigned int ix = 0; ix < fgvb_out_.size(); ix++) {
+          std::cout << "cryst: " << ix << "  value : " << std::dec
+                    << fgvb_out_[ix] << std::endl;
+        }
+        std::cout << std::endl;
       }
-   }
 
+      // call peakfinder
+      this->getPeakFinder()->process(filt_out_, peak_out_);
+      if (debug_) {
+        std::cout << "output of peakfinder is a vector of size: "
+                  << peak_out_.size() << std::endl;
+        for (unsigned int ix = 0; ix < peak_out_.size(); ix++) {
+          std::cout << "cryst: " << ix << "  value : " << peak_out_[ix]
+                    << std::endl;
+        }
+        std::cout << std::endl;
+      }
+      return;
+    }
+  }
 };
 #endif
-
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFgvbEE.h b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFgvbEE.h
index 58b6a7282fe24..0ab14aa86d286 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFgvbEE.h
+++ b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFgvbEE.h
@@ -4,38 +4,37 @@
 
 #include <vector>
 
-class EEDataFrame ;
-//class EcalTPGFineGrainStripEE;
+class EEDataFrame;
+// class EcalTPGFineGrainStripEE;
 
-/** 
+/**
     \class EcalFenixStripFgvbEE
-    \brief calculation of Fgvb for the endcap in Fenix Strip 
+    \brief calculation of Fgvb for the endcap in Fenix Strip
     *  calculates fgvb for the endcap in Fenix Strip
-    *  
-    *  
+    *
+    *
     *  input: 5X18 bits
-    *  output: 1 bit 
-    *  
-    *  
+    *  output: 1 bit
+    *
+    *
     */
-class EcalFenixStripFgvbEE  {
+class EcalFenixStripFgvbEE {
 
- private:
+private:
   int threshold_fg_;
   int lut_fg_;
   int identif_;
   bool flagBadStripMiss_;
 
- public:
-  EcalFenixStripFgvbEE() ;
+public:
+  EcalFenixStripFgvbEE();
   virtual ~EcalFenixStripFgvbEE();
-  void    setParameters(int identif, uint32_t id, const EcalTPGFineGrainStripEE*);
-  void process( std::vector<std::vector<int> > &lin_out, std::vector<int> &output);
-  
-  void setbadStripMissing(bool flag) {flagBadStripMiss_ = flag; }
-  bool getMissedStripFlag() const {return flagBadStripMiss_;}
+  void setParameters(int identif, uint32_t id, const EcalTPGFineGrainStripEE *);
+  void process(std::vector<std::vector<int>> &lin_out,
+               std::vector<int> &output);
 
+  void setbadStripMissing(bool flag) { flagBadStripMiss_ = flag; }
+  bool getMissedStripFlag() const { return flagBadStripMiss_; }
 };
 
-
 #endif
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFormatEB.h b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFormatEB.h
index ff7e7f43c50b9..a951f006ebd07 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFormatEB.h
+++ b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFormatEB.h
@@ -1,24 +1,23 @@
 #ifndef ECAL_FENIX_STRIP_FORMAT_EB_H
 #define ECAL_FENIX_STRIP_FORMAT_EB_H
 
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 class EcalTPGSlidingWindow;
 
-  /** 
-    \class EcalFenixStripFormatEB
-   \brief Formatting for Fenix strip
-  *  input: 18 bits + 3x 1bit (fgvb, gapflagbit, output from peakfinder)
-   *  output:16 bits
-   *  The output corresponds to 1 calodataframe per strip
-   *  --- not really a calodataframe no?
-   */
-   
+/**
+  \class EcalFenixStripFormatEB
+ \brief Formatting for Fenix strip
+*  input: 18 bits + 3x 1bit (fgvb, gapflagbit, output from peakfinder)
+ *  output:16 bits
+ *  The output corresponds to 1 calodataframe per strip
+ *  --- not really a calodataframe no?
+ */
+
+class EcalFenixStripFormatEB {
 
- class EcalFenixStripFormatEB {
-  
- private:
+private:
   int inputsFGVB_;
   int inputPeak_;
   int input_;
@@ -28,10 +27,11 @@ class EcalTPGSlidingWindow;
   int setInput(int input, int inputPeak, int inputsFGVB);
   int process();
 
- public:
+public:
   EcalFenixStripFormatEB();
   virtual ~EcalFenixStripFormatEB();
-  virtual void  process(std::vector<int> &, std::vector<int> &, std::vector<int> &, std::vector<int> &) ;
-  void setParameters(uint32_t&, const EcalTPGSlidingWindow*&);
+  virtual void process(std::vector<int> &, std::vector<int> &,
+                       std::vector<int> &, std::vector<int> &);
+  void setParameters(uint32_t &, const EcalTPGSlidingWindow *&);
 };
 #endif
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFormatEE.h b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFormatEE.h
index 85904c45b6ff3..ce094c75fdbbc 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFormatEE.h
+++ b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFormatEE.h
@@ -1,23 +1,23 @@
 #ifndef ECAL_FENIX_STRIP_FORMAT_EE_H
 #define ECAL_FENIX_STRIP_FORMAT_EE_H
 
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 class EcalTPGSlidingWindow;
 class EcalTPGStripStatus;
 
-  /** 
-    \class EcalFenixStripFormatEE
-   \brief Formatting for Fenix strip
-  *  input: 18 bits + 3x 1bit (fgvb, gapflagbit, output from peakfinder)
-   *  output:16 bits
-   *  The output corresponds to 1 calodataframe per strip
-   *  --- not really a calodataframe no?
-   */
-
- class EcalFenixStripFormatEE {   
- private:
+/**
+  \class EcalFenixStripFormatEE
+ \brief Formatting for Fenix strip
+*  input: 18 bits + 3x 1bit (fgvb, gapflagbit, output from peakfinder)
+ *  output:16 bits
+ *  The output corresponds to 1 calodataframe per strip
+ *  --- not really a calodataframe no?
+ */
+
+class EcalFenixStripFormatEE {
+private:
   int inputPeak_;
   int input_;
   uint32_t shift_;
@@ -27,13 +27,14 @@ class EcalTPGStripStatus;
   int setInput(int input, int inputPeak, int fgvb);
   int process();
 
-
- public:
+public:
   EcalFenixStripFormatEE();
   virtual ~EcalFenixStripFormatEE();
 
-  virtual void  process(std::vector<int>& ,std::vector<int>& , std::vector<int>&,std::vector<int>&) ;
-  void setParameters(uint32_t id, const EcalTPGSlidingWindow*&,const EcalTPGStripStatus *);
+  virtual void process(std::vector<int> &, std::vector<int> &,
+                       std::vector<int> &, std::vector<int> &);
+  void setParameters(uint32_t id, const EcalTPGSlidingWindow *&,
+                     const EcalTPGStripStatus *);
 };
 
 #endif
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcp.h b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcp.h
index befa424f19f09..b6da126487106 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcp.h
+++ b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcp.h
@@ -1,23 +1,22 @@
 #ifndef ECAL_FENIX_TCP_H
 #define ECAL_FENIX_TCP_H
 
-#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixEtTot.h>
 #include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixBypassLin.h>
-#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixMaxof2.h>
-#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpFormat.h>
+#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixEtTot.h>
 #include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixFgvbEB.h>
+#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixMaxof2.h>
 #include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpFgvbEE.h>
+#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpFormat.h>
 #include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpsFgvbEB.h>
 
-
-#include <DataFormats/EcalDigi/interface/EcalTriggerPrimitiveSample.h>
 #include <DataFormats/EcalDigi/interface/EBDataFrame.h>
 #include <DataFormats/EcalDigi/interface/EEDataFrame.h>
+#include <DataFormats/EcalDigi/interface/EcalTriggerPrimitiveSample.h>
 
 #include "FWCore/Framework/interface/EventSetup.h"
 
-#include <vector> 
 #include <iostream>
+#include <vector>
 
 class EcalTPGFineGrainEBGroup;
 class EcalTPGLutGroup;
@@ -27,13 +26,13 @@ class EcalTPGFineGrainTowerEE;
 class EcalTrigTowerDetId;
 class EcalTPGTowerStatus;
 
-/** 
+/**
     \class EcalFenixTcp
     \brief class representing the Fenix chip, format strip
 */
 class EcalFenixTcp {
 
- private:
+private:
   bool debug_;
 
   int nbMaxStrips_;
@@ -43,92 +42,95 @@ class EcalFenixTcp {
   EcalFenixEtTot *adder_;
   EcalFenixFgvbEB *fgvbEB_;
   EcalFenixTcpFgvbEE *fgvbEE_;
-  EcalFenixTcpsFgvbEB *sfgvbEB_;  
+  EcalFenixTcpsFgvbEB *sfgvbEB_;
 
   EcalFenixTcpFormat *formatter_;
 
   // permanent data structures
-  std::vector<std::vector<int> > bypasslin_out_;
+  std::vector<std::vector<int>> bypasslin_out_;
   std::vector<int> adder_out_;
   std::vector<int> maxOf2_out_;
   std::vector<int> fgvb_out_;
   std::vector<int> strip_fgvb_out_;
-   
- public:
+
+public:
   // temporary, for timing tests
-  void setPointers(  const EcalTPGFineGrainEBGroup * ecaltpgFgEBGroup,
-		     const EcalTPGLutGroup * ecaltpgLutGroup,
-		     const EcalTPGLutIdMap * ecaltpgLut,
-		     const EcalTPGFineGrainEBIdMap * ecaltpgFineGrainEB,
-		     const EcalTPGFineGrainTowerEE * ecaltpgFineGrainTowerEE,
-		     const EcalTPGTowerStatus * ecaltpgBadTT,
-                     const EcalTPGSpike * ecaltpgSpike)
-    {
-      ecaltpgFgEBGroup_=ecaltpgFgEBGroup;
-      ecaltpgLutGroup_=ecaltpgLutGroup;
-      ecaltpgLut_=ecaltpgLut;
-      ecaltpgFineGrainEB_=ecaltpgFineGrainEB;
-      ecaltpgFineGrainTowerEE_=ecaltpgFineGrainTowerEE;
-      ecaltpgBadTT_=ecaltpgBadTT;
-      ecaltpgSpike_=ecaltpgSpike;
-   }
+  void setPointers(const EcalTPGFineGrainEBGroup *ecaltpgFgEBGroup,
+                   const EcalTPGLutGroup *ecaltpgLutGroup,
+                   const EcalTPGLutIdMap *ecaltpgLut,
+                   const EcalTPGFineGrainEBIdMap *ecaltpgFineGrainEB,
+                   const EcalTPGFineGrainTowerEE *ecaltpgFineGrainTowerEE,
+                   const EcalTPGTowerStatus *ecaltpgBadTT,
+                   const EcalTPGSpike *ecaltpgSpike) {
+    ecaltpgFgEBGroup_ = ecaltpgFgEBGroup;
+    ecaltpgLutGroup_ = ecaltpgLutGroup;
+    ecaltpgLut_ = ecaltpgLut;
+    ecaltpgFineGrainEB_ = ecaltpgFineGrainEB;
+    ecaltpgFineGrainTowerEE_ = ecaltpgFineGrainTowerEE;
+    ecaltpgBadTT_ = ecaltpgBadTT;
+    ecaltpgSpike_ = ecaltpgSpike;
+  }
   // end temporary, for timing tests
 
-  EcalFenixTcp(const edm::EventSetup & setup, bool tcpFormat, bool debug, bool famos, int binOfMax, int maxNrSamples,int nbMaxStrips);
-  virtual ~EcalFenixTcp() ;
-
-  void process(const edm::EventSetup & setup,
-               std::vector <EBDataFrame> &bid,             //dummy argument for template call 
-	       std::vector<std::vector<int> > & tpframetow, int nStr,
-	       std::vector< EcalTriggerPrimitiveSample> & tptow,
-	       std::vector< EcalTriggerPrimitiveSample> & tptow2,
-	       bool isInInnerRings, EcalTrigTowerDetId thisTower);
-  void process(const edm::EventSetup & setup,
-               std::vector <EEDataFrame> &bid,             //dummy argument for template call 
-	       std::vector<std::vector<int> > & tpframetow, int nStr,
-	       std::vector< EcalTriggerPrimitiveSample> & tptow,
-	       std::vector< EcalTriggerPrimitiveSample> & tptow2,
-	       bool isInInnerRings, EcalTrigTowerDetId thisTower);
-
-  void process_part1(std::vector<std::vector<int> > &tpframetow, int nStr,int bitMask);
-
-  void  process_part2_barrel(std::vector<std::vector<int> > &, int nStr,int bitMask,
-			     const EcalTPGFineGrainEBGroup *ecaltpgFgEBGroup,
-			     const EcalTPGLutGroup*ecaltpgLutGroup,
-			     const EcalTPGLutIdMap *ecaltpgLut,
-			     const EcalTPGFineGrainEBIdMap *ecaltpgFineGrainEB,
-			     const EcalTPGTowerStatus *ecaltpgBadTT,
-                             const EcalTPGSpike * ecaltpgSpike,
-			     std::vector< EcalTriggerPrimitiveSample> &tptow,
-			     std::vector< EcalTriggerPrimitiveSample> &tptow2,
-			     EcalTrigTowerDetId towid);
-			       
-  void  process_part2_endcap(std::vector<std::vector<int> > &, int nStr,int bitMask,
-			     const EcalTPGLutGroup *ecaltpgLutGroup,
-			     const EcalTPGLutIdMap *ecaltpgLut,
-			     const EcalTPGFineGrainTowerEE *ecaltpgFineGrainTowerEE,
-			     const EcalTPGTowerStatus *ecaltpgBadTT,
-			     std::vector< EcalTriggerPrimitiveSample> &tptow,
-			     std::vector< EcalTriggerPrimitiveSample> &tptow2,bool isInInnerRings,      
-			     EcalTrigTowerDetId towid);
-				   
-
-  EcalFenixBypassLin *getBypasslin(int i) const {return bypasslin_[i];}
-  EcalFenixEtTot *getAdder() const { return  adder_;}
-  EcalFenixMaxof2 *getMaxOf2() const {return maxOf2_;}
-  EcalFenixTcpFormat *getFormatter() const {return formatter_;}
-  EcalFenixFgvbEB *getFGVBEB() const {return fgvbEB_;}
-  EcalFenixTcpFgvbEE *getFGVBEE() const {return fgvbEE_;}
-  EcalFenixTcpsFgvbEB *getsFGVBEB() const {return sfgvbEB_;}
-	        	      
-  const EcalTPGFineGrainEBGroup * ecaltpgFgEBGroup_;
-  const EcalTPGLutGroup * ecaltpgLutGroup_;
-  const EcalTPGLutIdMap * ecaltpgLut_;
-  const EcalTPGFineGrainEBIdMap * ecaltpgFineGrainEB_;
-  const EcalTPGFineGrainTowerEE * ecaltpgFineGrainTowerEE_;
-  const EcalTPGTowerStatus * ecaltpgBadTT_;
-  const EcalTPGSpike * ecaltpgSpike_;
+  EcalFenixTcp(const edm::EventSetup &setup, bool tcpFormat, bool debug,
+               bool famos, int binOfMax, int maxNrSamples, int nbMaxStrips);
+  virtual ~EcalFenixTcp();
+
+  void
+  process(const edm::EventSetup &setup,
+          std::vector<EBDataFrame> &bid, // dummy argument for template call
+          std::vector<std::vector<int>> &tpframetow, int nStr,
+          std::vector<EcalTriggerPrimitiveSample> &tptow,
+          std::vector<EcalTriggerPrimitiveSample> &tptow2, bool isInInnerRings,
+          EcalTrigTowerDetId thisTower);
+  void
+  process(const edm::EventSetup &setup,
+          std::vector<EEDataFrame> &bid, // dummy argument for template call
+          std::vector<std::vector<int>> &tpframetow, int nStr,
+          std::vector<EcalTriggerPrimitiveSample> &tptow,
+          std::vector<EcalTriggerPrimitiveSample> &tptow2, bool isInInnerRings,
+          EcalTrigTowerDetId thisTower);
+
+  void process_part1(std::vector<std::vector<int>> &tpframetow, int nStr,
+                     int bitMask);
+
+  void process_part2_barrel(std::vector<std::vector<int>> &, int nStr,
+                            int bitMask,
+                            const EcalTPGFineGrainEBGroup *ecaltpgFgEBGroup,
+                            const EcalTPGLutGroup *ecaltpgLutGroup,
+                            const EcalTPGLutIdMap *ecaltpgLut,
+                            const EcalTPGFineGrainEBIdMap *ecaltpgFineGrainEB,
+                            const EcalTPGTowerStatus *ecaltpgBadTT,
+                            const EcalTPGSpike *ecaltpgSpike,
+                            std::vector<EcalTriggerPrimitiveSample> &tptow,
+                            std::vector<EcalTriggerPrimitiveSample> &tptow2,
+                            EcalTrigTowerDetId towid);
+
+  void
+  process_part2_endcap(std::vector<std::vector<int>> &, int nStr, int bitMask,
+                       const EcalTPGLutGroup *ecaltpgLutGroup,
+                       const EcalTPGLutIdMap *ecaltpgLut,
+                       const EcalTPGFineGrainTowerEE *ecaltpgFineGrainTowerEE,
+                       const EcalTPGTowerStatus *ecaltpgBadTT,
+                       std::vector<EcalTriggerPrimitiveSample> &tptow,
+                       std::vector<EcalTriggerPrimitiveSample> &tptow2,
+                       bool isInInnerRings, EcalTrigTowerDetId towid);
+
+  EcalFenixBypassLin *getBypasslin(int i) const { return bypasslin_[i]; }
+  EcalFenixEtTot *getAdder() const { return adder_; }
+  EcalFenixMaxof2 *getMaxOf2() const { return maxOf2_; }
+  EcalFenixTcpFormat *getFormatter() const { return formatter_; }
+  EcalFenixFgvbEB *getFGVBEB() const { return fgvbEB_; }
+  EcalFenixTcpFgvbEE *getFGVBEE() const { return fgvbEE_; }
+  EcalFenixTcpsFgvbEB *getsFGVBEB() const { return sfgvbEB_; }
+
+  const EcalTPGFineGrainEBGroup *ecaltpgFgEBGroup_;
+  const EcalTPGLutGroup *ecaltpgLutGroup_;
+  const EcalTPGLutIdMap *ecaltpgLut_;
+  const EcalTPGFineGrainEBIdMap *ecaltpgFineGrainEB_;
+  const EcalTPGFineGrainTowerEE *ecaltpgFineGrainTowerEE_;
+  const EcalTPGTowerStatus *ecaltpgBadTT_;
+  const EcalTPGSpike *ecaltpgSpike_;
 };
 
-
 #endif
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpFgvbEE.h b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpFgvbEE.h
index 95d7aac141009..4542e4c1fb68d 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpFgvbEE.h
+++ b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpFgvbEE.h
@@ -1,36 +1,39 @@
 #ifndef ECAL_FENIXTCP_FGVB_EE_H
 #define ECAL_FENIXTCP_FGVB_EE_H
 
-#include <vector>
 #include <cstdint>
+#include <vector>
 
 class EcalTPGFineGrainTowerEE;
 
-/** 
+/**
     \class EcalFenixTcpFgvbEE
     \brief calculation of Fgvb for Fenix Tcp, format endcap
     *  calculates fgvb for the endcap
-    *  
-    *  
-    *  input :  5x 11th  bit of Bypasslin ouput 
-    *  output: 1 bit 
-    *  
-    *  
-    *  the five bit_strips + 3 bits (nb of strips) (are used to make a LUT_tower address (max size :2**8=256)
+    *
+    *
+    *  input :  5x 11th  bit of Bypasslin ouput
+    *  output: 1 bit
+    *
+    *
+    *  the five bit_strips + 3 bits (nb of strips) (are used to make a LUT_tower
+   address (max size :2**8=256)
     *  the output is 1 value.
     */
-    
-class EcalFenixTcpFgvbEE  {
 
- private:
-   uint32_t fgee_lut_;
-   std::vector<int> indexLut_;
+class EcalFenixTcpFgvbEE {
+
+private:
+  uint32_t fgee_lut_;
+  std::vector<int> indexLut_;
 
- public:
-   EcalFenixTcpFgvbEE(int maxNrSamples);
-   virtual ~EcalFenixTcpFgvbEE();
-   void setParameters(uint32_t towid, const EcalTPGFineGrainTowerEE *ecaltpgFineGrainTowerEE);
+public:
+  EcalFenixTcpFgvbEE(int maxNrSamples);
+  virtual ~EcalFenixTcpFgvbEE();
+  void setParameters(uint32_t towid,
+                     const EcalTPGFineGrainTowerEE *ecaltpgFineGrainTowerEE);
 
-   void process( std::vector <std::vector<int> > &bypasslin_out,int nStr, int bitMask, std::vector<int> & output);
+  void process(std::vector<std::vector<int>> &bypasslin_out, int nStr,
+               int bitMask, std::vector<int> &output);
 };
 #endif
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpFormat.h b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpFormat.h
index aecf04eaa7723..eac1da9a19d52 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpFormat.h
+++ b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpFormat.h
@@ -4,33 +4,44 @@
 #include "DataFormats/EcalDigi/interface/EcalTriggerPrimitiveSample.h"
 #include <vector>
 
-class EcalTPGLutGroup ;
+class EcalTPGLutGroup;
 class EcalTPGLutIdMap;
 class EcalTPGTowerStatus;
 class EcalTPGSpike;
 
-/** 
+/**
     \class EcalFenixStripFormat
     \brief Formatting for Fenix Tcp
-    *  input 10 bits from Ettot 
+    *  input 10 bits from Ettot
     *         1 bit from fgvb
-    *         3 bits TriggerTowerFlag 
+    *         3 bits TriggerTowerFlag
     *  output: 16 bits
     *  simple formatting
-    *  
+    *
     */
-class EcalFenixTcpFormat  {
+class EcalFenixTcpFormat {
 
- public:
-  EcalFenixTcpFormat(bool tccFormat, bool debug, bool famos, int binOfMax); 
+public:
+  EcalFenixTcpFormat(bool tccFormat, bool debug, bool famos, int binOfMax);
   virtual ~EcalFenixTcpFormat();
-  virtual std::vector<int> process(const std::vector<int>&,const std::vector<int>&) {  std::vector<int> v;return v;}
-  void process(std::vector<int> &Et, std::vector<int> &fgvb, std::vector<int> &sfgvb, int eTTotShift, std::vector<EcalTriggerPrimitiveSample> & out, std::vector<EcalTriggerPrimitiveSample> & outTcc, bool isInInnerRings) ;
-  void setParameters(uint32_t towid,const EcalTPGLutGroup *ecaltpgLutGroup,const EcalTPGLutIdMap *ecaltpgLut, const EcalTPGTowerStatus *ecaltpgbadTT, const EcalTPGSpike * ecaltpgSpike);
+  virtual std::vector<int> process(const std::vector<int> &,
+                                   const std::vector<int> &) {
+    std::vector<int> v;
+    return v;
+  }
+  void process(std::vector<int> &Et, std::vector<int> &fgvb,
+               std::vector<int> &sfgvb, int eTTotShift,
+               std::vector<EcalTriggerPrimitiveSample> &out,
+               std::vector<EcalTriggerPrimitiveSample> &outTcc,
+               bool isInInnerRings);
+  void setParameters(uint32_t towid, const EcalTPGLutGroup *ecaltpgLutGroup,
+                     const EcalTPGLutIdMap *ecaltpgLut,
+                     const EcalTPGTowerStatus *ecaltpgbadTT,
+                     const EcalTPGSpike *ecaltpgSpike);
 
- private:
-  const unsigned int * lut_ ;
-  const uint16_t * badTTStatus_;
+private:
+  const unsigned int *lut_;
+  const uint16_t *badTTStatus_;
   uint16_t status_;
   bool tcpFormat_;
   bool debug_;
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpsFgvbEB.h b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpsFgvbEB.h
index 19cf8a16a3f7b..173053e22e425 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpsFgvbEB.h
+++ b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpsFgvbEB.h
@@ -1,22 +1,23 @@
 #ifndef ECAL_FENIXTCP_SFGVB_EB_H
 #define ECAL_FENIXTCP_SFGVB_EB_H
 
-#include <vector>
 #include <cstdint>
+#include <vector>
 
-/** 
+/**
     \class EcalFenixTcpsFgvbEB
     \brief calculation of strip Fgvb for Fenix Tcp, format barrel
     *  calculates fgvb for the barrel
-    *  
-    * Takes the OR of all strip bits 
+    *
+    * Takes the OR of all strip bits
     */
-    
-class EcalFenixTcpsFgvbEB  {
- public:
-   EcalFenixTcpsFgvbEB();
-   virtual ~EcalFenixTcpsFgvbEB();
 
-   void process( std::vector <std::vector<int> > &bypasslin_out,int nStr, int bitMask, std::vector<int> & output);
+class EcalFenixTcpsFgvbEB {
+public:
+  EcalFenixTcpsFgvbEB();
+  virtual ~EcalFenixTcpsFgvbEB();
+
+  void process(std::vector<std::vector<int>> &bypasslin_out, int nStr,
+               int bitMask, std::vector<int> &output);
 };
 #endif
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalTrigPrimFunctionalAlgo.h b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalTrigPrimFunctionalAlgo.h
index 093177b19d392..1bbbc3c0b1cf6 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalTrigPrimFunctionalAlgo.h
+++ b/SimCalorimetry/EcalTrigPrimAlgos/interface/EcalTrigPrimFunctionalAlgo.h
@@ -15,8 +15,8 @@
 
  *
  ************************************************************/
-#include <sys/time.h>
 #include <iostream>
+#include <sys/time.h>
 #include <vector>
 
 #include "Geometry/CaloTopology/interface/EcalTrigTowerConstituentsMap.h"
@@ -27,8 +27,8 @@
 #include "DataFormats/Common/interface/SortedCollection.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include <map>
@@ -36,7 +36,6 @@
 
 /** Main Algo for Ecal trigger primitives. */
 
-
 class EcalTrigTowerDetId;
 class ETPCoherenceTest;
 class EcalTriggerPrimitiveSample;
@@ -45,67 +44,89 @@ class EBDataFrame;
 class EEDataFrame;
 class EcalElectronicsMapping;
 
- 
-class EcalTrigPrimFunctionalAlgo
-{  
- public:
-  
-  explicit EcalTrigPrimFunctionalAlgo(const edm::EventSetup & setup, int binofmax, bool tcpFormat, bool barrelOnly, bool debug, bool famos);
+class EcalTrigPrimFunctionalAlgo {
+public:
+  explicit EcalTrigPrimFunctionalAlgo(const edm::EventSetup &setup,
+                                      int binofmax, bool tcpFormat,
+                                      bool barrelOnly, bool debug, bool famos);
 
   virtual ~EcalTrigPrimFunctionalAlgo();
 
-  void run(const edm::EventSetup &, const EBDigiCollection *col, EcalTrigPrimDigiCollection & result, EcalTrigPrimDigiCollection & resultTcp);
-  void run(const edm::EventSetup&,  const EEDigiCollection *col, EcalTrigPrimDigiCollection & result, EcalTrigPrimDigiCollection & resultTcp);
-  void run_part1_EB(EBDigiCollection const * col);
-  void run_part1_EE(EEDigiCollection const * col);
-  template <class Coll> 
-    void run_part2(const edm::EventSetup &, Coll const * col, 
-		   std::vector<std::vector<std::pair<int,std::vector<typename Coll::Digi> > > > &towerMap,
-		   EcalTrigPrimDigiCollection & result,
-		   EcalTrigPrimDigiCollection & resultTcp);
-
-  void setPointers(const EcalTPGLinearizationConst *ecaltpLin,const EcalTPGPedestals *ecaltpPed,const EcalTPGSlidingWindow * ecaltpgSlidW,const EcalTPGWeightIdMap * ecaltpgWeightMap,const EcalTPGWeightGroup * ecaltpgWeightGroup,const EcalTPGFineGrainStripEE * ecaltpgFgStripEE, const EcalTPGCrystalStatus * ecaltpgBadX, const EcalTPGStripStatus * ecaltpgStripStatus)  {
-    estrip_->setPointers(ecaltpPed,ecaltpLin,ecaltpgWeightMap,ecaltpgWeightGroup,ecaltpgSlidW,ecaltpgFgStripEE,ecaltpgBadX,ecaltpgStripStatus);
-
+  void run(const edm::EventSetup &, const EBDigiCollection *col,
+           EcalTrigPrimDigiCollection &result,
+           EcalTrigPrimDigiCollection &resultTcp);
+  void run(const edm::EventSetup &, const EEDigiCollection *col,
+           EcalTrigPrimDigiCollection &result,
+           EcalTrigPrimDigiCollection &resultTcp);
+  void run_part1_EB(EBDigiCollection const *col);
+  void run_part1_EE(EEDigiCollection const *col);
+  template <class Coll>
+  void run_part2(
+      const edm::EventSetup &, Coll const *col,
+      std::vector<std::vector<std::pair<int, std::vector<typename Coll::Digi>>>>
+          &towerMap,
+      EcalTrigPrimDigiCollection &result,
+      EcalTrigPrimDigiCollection &resultTcp);
+
+  void setPointers(const EcalTPGLinearizationConst *ecaltpLin,
+                   const EcalTPGPedestals *ecaltpPed,
+                   const EcalTPGSlidingWindow *ecaltpgSlidW,
+                   const EcalTPGWeightIdMap *ecaltpgWeightMap,
+                   const EcalTPGWeightGroup *ecaltpgWeightGroup,
+                   const EcalTPGFineGrainStripEE *ecaltpgFgStripEE,
+                   const EcalTPGCrystalStatus *ecaltpgBadX,
+                   const EcalTPGStripStatus *ecaltpgStripStatus) {
+    estrip_->setPointers(ecaltpPed, ecaltpLin, ecaltpgWeightMap,
+                         ecaltpgWeightGroup, ecaltpgSlidW, ecaltpgFgStripEE,
+                         ecaltpgBadX, ecaltpgStripStatus);
   }
-  void setPointers2(  const EcalTPGFineGrainEBGroup * ecaltpgFgEBGroup,
-		      const EcalTPGLutGroup * ecaltpgLutGroup,
-		      const EcalTPGLutIdMap * ecaltpgLut,
-		      const EcalTPGFineGrainEBIdMap * ecaltpgFineGrainEB,
-		      const EcalTPGFineGrainTowerEE * ecaltpgFineGrainTowerEE,
-		      const EcalTPGTowerStatus * ecaltpgBadTT,
-                      const EcalTPGSpike * ecaltpgSpike){
-   
-  etcp_->setPointers(ecaltpgFgEBGroup,ecaltpgLutGroup,ecaltpgLut,ecaltpgFineGrainEB,ecaltpgFineGrainTowerEE,ecaltpgBadTT,ecaltpgSpike);
+  void setPointers2(const EcalTPGFineGrainEBGroup *ecaltpgFgEBGroup,
+                    const EcalTPGLutGroup *ecaltpgLutGroup,
+                    const EcalTPGLutIdMap *ecaltpgLut,
+                    const EcalTPGFineGrainEBIdMap *ecaltpgFineGrainEB,
+                    const EcalTPGFineGrainTowerEE *ecaltpgFineGrainTowerEE,
+                    const EcalTPGTowerStatus *ecaltpgBadTT,
+                    const EcalTPGSpike *ecaltpgSpike) {
+
+    etcp_->setPointers(ecaltpgFgEBGroup, ecaltpgLutGroup, ecaltpgLut,
+                       ecaltpgFineGrainEB, ecaltpgFineGrainTowerEE,
+                       ecaltpgBadTT, ecaltpgSpike);
   }
 
- private:
-
-  void init(const edm::EventSetup&);
-  template <class T>  
-    void initStructures(std::vector<std::vector<std::pair<int,std::vector<T> > > > & towMap);
-  template <class T> 
-    void clean(std::vector<std::vector<std::pair<int,std::vector<T> > > > &towerMap);
-  template <class Coll> 
-    void fillMap(Coll const * col, std::vector<std::vector<std::pair<int,std::vector<typename Coll::Digi> > > > &towerMap);
+private:
+  void init(const edm::EventSetup &);
+  template <class T>
+  void initStructures(
+      std::vector<std::vector<std::pair<int, std::vector<T>>>> &towMap);
+  template <class T>
+  void
+  clean(std::vector<std::vector<std::pair<int, std::vector<T>>>> &towerMap);
+  template <class Coll>
+  void fillMap(
+      Coll const *col,
+      std::vector<std::vector<std::pair<int, std::vector<typename Coll::Digi>>>>
+          &towerMap);
   int findStripNr(const EBDetId &id);
   int findStripNr(const EEDetId &id);
 
   // FIXME: temporary until hashedIndex works alsom for endcap
-  int getIndex(const  EBDigiCollection *, EcalTrigTowerDetId& id) {return id.hashedIndex();}
+  int getIndex(const EBDigiCollection *, EcalTrigTowerDetId &id) {
+    return id.hashedIndex();
+  }
   // mind that eta is continuous between barrel+endcap
-  int getIndex(const  EEDigiCollection *, EcalTrigTowerDetId& id) {
-    int ind=(id.ietaAbs()-18)*72 + id.iphi();
-    if (id.zside()<0) ind+=792;
+  int getIndex(const EEDigiCollection *, EcalTrigTowerDetId &id) {
+    int ind = (id.ietaAbs() - 18) * 72 + id.iphi();
+    if (id.zside() < 0)
+      ind += 792;
     return ind;
   }
 
-  EcalFenixStrip * estrip_;
-  EcalFenixTcp * etcp_;
+  EcalFenixStrip *estrip_;
+  EcalFenixTcp *etcp_;
 
   edm::ESHandle<EcalTrigTowerConstituentsMap> eTTmap_;
   const CaloSubdetectorGeometry *theEndcapGeometry;
-  const EcalElectronicsMapping* theMapping_;
+  const EcalElectronicsMapping *theMapping_;
 
   float threshold;
 
@@ -114,191 +135,227 @@ class EcalTrigPrimFunctionalAlgo
 
   bool tcpFormat_;
   bool barrelOnly_;
-  bool debug_;  
-  bool famos_;  
+  bool debug_;
+  bool famos_;
 
-  static const unsigned int nrSamples_; //nr samples to write, should not be changed since by convention the size means that it is coming from simulation
-  static const unsigned int maxNrSamplesOut_; //to be placed in the intermediate samples
-  static const unsigned int maxNrTowers_; //would be better to get from somewhere..
-  static const unsigned int maxNrTPs_; //would be better to get from somewhere..
+  static const unsigned int
+      nrSamples_; // nr samples to write, should not be changed since by
+                  // convention the size means that it is coming from simulation
+  static const unsigned int
+      maxNrSamplesOut_; // to be placed in the intermediate samples
+  static const unsigned int
+      maxNrTowers_; // would be better to get from somewhere..
+  static const unsigned int maxNrTPs_; // would be better to get from
+                                       // somewhere..
 
-  int nrTowers_;   // nr of towers found by fillmap method
+  int nrTowers_; // nr of towers found by fillmap method
 
   // data structures kept during the whole run
-  std::vector<std::vector<int> > striptp_;
-  std::vector<std::vector<std::pair<int,std::vector<EBDataFrame> > > > towerMapEB_;
-  std::vector<std::vector<std::pair<int,std::vector<EEDataFrame> > > > towerMapEE_;
-  std::vector<std::pair<int,EcalTrigTowerDetId> > hitTowers_;
+  std::vector<std::vector<int>> striptp_;
+  std::vector<std::vector<std::pair<int, std::vector<EBDataFrame>>>>
+      towerMapEB_;
+  std::vector<std::vector<std::pair<int, std::vector<EEDataFrame>>>>
+      towerMapEE_;
+  std::vector<std::pair<int, EcalTrigTowerDetId>> hitTowers_;
   std::vector<EcalTriggerPrimitiveSample> towtp_;
   std::vector<EcalTriggerPrimitiveSample> towtp2_;
 
-  enum {nbMaxStrips_=5};
-  enum {nbMaxXtals_=5};
+  enum { nbMaxStrips_ = 5 };
+  enum { nbMaxXtals_ = 5 };
 };
 
-//=================================== implementations =============================================
+//=================================== implementations
+//=============================================
 
-template <class Coll> 
-void EcalTrigPrimFunctionalAlgo::run_part2(const edm::EventSetup &setup,Coll const * col, std::vector<std::vector<std::pair<int,std::vector<typename Coll::Digi> > > > &towerMap,
-					   EcalTrigPrimDigiCollection & result,
-					   EcalTrigPrimDigiCollection & resultTcp)
-{
+template <class Coll>
+void EcalTrigPrimFunctionalAlgo::run_part2(
+    const edm::EventSetup &setup, Coll const *col,
+    std::vector<std::vector<std::pair<int, std::vector<typename Coll::Digi>>>>
+        &towerMap,
+    EcalTrigPrimDigiCollection &result, EcalTrigPrimDigiCollection &resultTcp) {
   typedef typename Coll::Digi Digi;
- 
+
   // prepare writing of TP-s
 
-  int firstSample = binOfMaximum_-1 -nrSamples_/2;
-  int lastSample = binOfMaximum_-1 +nrSamples_/2;
-  int nrTP=0;
+  int firstSample = binOfMaximum_ - 1 - nrSamples_ / 2;
+  int lastSample = binOfMaximum_ - 1 + nrSamples_ / 2;
+  int nrTP = 0;
   std::vector<typename Coll::Digi> dummy;
   EcalTriggerPrimitiveDigi tptow[2];
   EcalTriggerPrimitiveDigi tptowTcp[2];
-  
+
   estrip_->getFGVB()->setbadStripMissing(false);
 
-  for(int itow=0;itow<nrTowers_;++itow) 
-    {
-
-      int index=hitTowers_[itow].first;
-      const EcalTrigTowerDetId &thisTower=hitTowers_[itow].second;
-
-      // loop over all strips assigned to this trigger tower
-      int nstr=0;
-      for(unsigned int i = 0; i < towerMap[itow].size();++i)
-	{
-	  std::vector<Digi> &df = (towerMap[index])[i].second;//vector of dataframes for this strip, size; nr of crystals/strip
-
-	  if ((towerMap[index])[i].first > 0) {  
-	    estrip_->process(setup,df,(towerMap[index])[i].first,striptp_[nstr++]);
-	  }
-	}//loop over strips in one tower
-
-      bool isInInnerRings=false;
-      if (thisTower.subDet()==EcalEndcap && (thisTower.ietaAbs()==27 || thisTower.ietaAbs()==28 )) isInInnerRings=true;
-      etcp_->process(setup,dummy,striptp_,nstr,towtp_,towtp2_,isInInnerRings,thisTower);
-
-      // prepare TP-s
-      // special treatment for 2 inner endcap rings
-      int nrTowers;
-      if (isInInnerRings)
-        {
-          nrTowers=2;
-          int phi=2*((thisTower.iphi()-1)/2);
-          tptow[0]=EcalTriggerPrimitiveDigi(EcalTrigTowerDetId(thisTower.zside(),thisTower.subDet(),thisTower.ietaAbs(),phi+1));
-          tptow[1]=EcalTriggerPrimitiveDigi(EcalTrigTowerDetId(thisTower.zside(),thisTower.subDet(),thisTower.ietaAbs(),phi+2));
-
-	  if (tcpFormat_){
-	    tptowTcp[0]=EcalTriggerPrimitiveDigi(EcalTrigTowerDetId(thisTower.zside(),thisTower.subDet(),thisTower.ietaAbs(),phi+1));
-	    tptowTcp[1]=EcalTriggerPrimitiveDigi(EcalTrigTowerDetId(thisTower.zside(),thisTower.subDet(),thisTower.ietaAbs(),phi+2));
-	  }
-        }else {
-          nrTowers=1;
-          tptow[0]=EcalTriggerPrimitiveDigi(thisTower);
-          if (tcpFormat_)   tptowTcp[0]=EcalTriggerPrimitiveDigi(thisTower);
-	}
-
-      // now fill in
-      for (int nrt=0;nrt<nrTowers;nrt++) {
-        (tptow[nrt]).setSize(nrSamples_);
-        if (towtp_.size()<nrSamples_)  {  //FIXME: only once
-          edm::LogWarning("") <<"Too few samples produced, nr is "<<towtp_.size();
-          break;
-        }
-        int isam=0;
-        for (int i=firstSample;i<=lastSample;++i) {
-	  tptow[nrt].setSample(isam++,EcalTriggerPrimitiveSample(towtp_[i]));
-        }
-	nrTP++; 
-        LogDebug("EcalTPG") <<" For tower "<<itow<<" created TP nr "<<nrTP<<" with Et "<<tptow[nrt].compressedEt();
-	result.push_back(tptow[nrt]);
+  for (int itow = 0; itow < nrTowers_; ++itow) {
+
+    int index = hitTowers_[itow].first;
+    const EcalTrigTowerDetId &thisTower = hitTowers_[itow].second;
+
+    // loop over all strips assigned to this trigger tower
+    int nstr = 0;
+    for (unsigned int i = 0; i < towerMap[itow].size(); ++i) {
+      std::vector<Digi> &df =
+          (towerMap[index])[i].second; // vector of dataframes for this strip,
+                                       // size; nr of crystals/strip
+
+      if ((towerMap[index])[i].first > 0) {
+        estrip_->process(setup, df, (towerMap[index])[i].first,
+                         striptp_[nstr++]);
       }
+    } // loop over strips in one tower
+
+    bool isInInnerRings = false;
+    if (thisTower.subDet() == EcalEndcap &&
+        (thisTower.ietaAbs() == 27 || thisTower.ietaAbs() == 28))
+      isInInnerRings = true;
+    etcp_->process(setup, dummy, striptp_, nstr, towtp_, towtp2_,
+                   isInInnerRings, thisTower);
+
+    // prepare TP-s
+    // special treatment for 2 inner endcap rings
+    int nrTowers;
+    if (isInInnerRings) {
+      nrTowers = 2;
+      int phi = 2 * ((thisTower.iphi() - 1) / 2);
+      tptow[0] = EcalTriggerPrimitiveDigi(EcalTrigTowerDetId(
+          thisTower.zside(), thisTower.subDet(), thisTower.ietaAbs(), phi + 1));
+      tptow[1] = EcalTriggerPrimitiveDigi(EcalTrigTowerDetId(
+          thisTower.zside(), thisTower.subDet(), thisTower.ietaAbs(), phi + 2));
 
       if (tcpFormat_) {
+        tptowTcp[0] = EcalTriggerPrimitiveDigi(
+            EcalTrigTowerDetId(thisTower.zside(), thisTower.subDet(),
+                               thisTower.ietaAbs(), phi + 1));
+        tptowTcp[1] = EcalTriggerPrimitiveDigi(
+            EcalTrigTowerDetId(thisTower.zside(), thisTower.subDet(),
+                               thisTower.ietaAbs(), phi + 2));
+      }
+    } else {
+      nrTowers = 1;
+      tptow[0] = EcalTriggerPrimitiveDigi(thisTower);
+      if (tcpFormat_)
+        tptowTcp[0] = EcalTriggerPrimitiveDigi(thisTower);
+    }
 
-	for (int nrt=0;nrt<nrTowers;nrt++) {
-	  tptowTcp[nrt].setSize(nrSamples_);
-	  if (towtp2_.size()<nrSamples_)  {  //FIXME: only once
-	    edm::LogWarning("") <<"Too few samples produced, nr is "<<towtp2_.size();
-	    break;
-	  }
-	  int isam=0;
-	  for (int i=firstSample;i<=lastSample;++i) {
-	    if (nrTowers<=1)  tptowTcp[nrt].setSample(isam++,EcalTriggerPrimitiveSample(towtp2_[i]));
-	    else {
-	      int et=towtp2_[i].compressedEt()/2;
-	      tptowTcp[nrt].setSample(isam++,EcalTriggerPrimitiveSample(et,towtp2_[i].fineGrain(),towtp2_[i].ttFlag()));
-	    }
-	  }
-	  resultTcp.push_back(tptowTcp[nrt]);
-	}
+    // now fill in
+    for (int nrt = 0; nrt < nrTowers; nrt++) {
+      (tptow[nrt]).setSize(nrSamples_);
+      if (towtp_.size() < nrSamples_) { // FIXME: only once
+        edm::LogWarning("")
+            << "Too few samples produced, nr is " << towtp_.size();
+        break;
+      }
+      int isam = 0;
+      for (int i = firstSample; i <= lastSample; ++i) {
+        tptow[nrt].setSample(isam++, EcalTriggerPrimitiveSample(towtp_[i]));
       }
-    } 
+      nrTP++;
+      LogDebug("EcalTPG") << " For tower " << itow << " created TP nr " << nrTP
+                          << " with Et " << tptow[nrt].compressedEt();
+      result.push_back(tptow[nrt]);
+    }
+
+    if (tcpFormat_) {
+
+      for (int nrt = 0; nrt < nrTowers; nrt++) {
+        tptowTcp[nrt].setSize(nrSamples_);
+        if (towtp2_.size() < nrSamples_) { // FIXME: only once
+          edm::LogWarning("")
+              << "Too few samples produced, nr is " << towtp2_.size();
+          break;
+        }
+        int isam = 0;
+        for (int i = firstSample; i <= lastSample; ++i) {
+          if (nrTowers <= 1)
+            tptowTcp[nrt].setSample(isam++,
+                                    EcalTriggerPrimitiveSample(towtp2_[i]));
+          else {
+            int et = towtp2_[i].compressedEt() / 2;
+            tptowTcp[nrt].setSample(
+                isam++, EcalTriggerPrimitiveSample(et, towtp2_[i].fineGrain(),
+                                                   towtp2_[i].ttFlag()));
+          }
+        }
+        resultTcp.push_back(tptowTcp[nrt]);
+      }
+    }
+  }
   return;
 }
 
-template <class Coll> 
-void EcalTrigPrimFunctionalAlgo::fillMap(Coll const * col, 
-					 std::vector<std::vector<std::pair<int,std::vector<typename Coll::Digi> > > > &towerMap)
-{
+template <class Coll>
+void EcalTrigPrimFunctionalAlgo::fillMap(
+    Coll const *col,
+    std::vector<std::vector<std::pair<int, std::vector<typename Coll::Digi>>>>
+        &towerMap) {
   typedef typename Coll::Digi Digi;
 
   // implementation for Barrel and Endcap
 
   if (col) {
-    nrTowers_=0;
-    LogDebug("EcalTPG") <<"Fill mapping, Collection size = "<<col->size();
-    for(unsigned int i = 0; i < col->size() ; ++i) {
-      Digi samples((*col)[i]); 
-      EcalTrigTowerDetId coarser=(*eTTmap_).towerOf(samples.id());
-      int index=getIndex(col,coarser);
-      int stripnr=findStripNr(samples.id());
-
-      int filled=0;
-      for (unsigned int ij=0;ij<towerMap[index].size();++ij) filled+=towerMap[index][ij].first;
+    nrTowers_ = 0;
+    LogDebug("EcalTPG") << "Fill mapping, Collection size = " << col->size();
+    for (unsigned int i = 0; i < col->size(); ++i) {
+      Digi samples((*col)[i]);
+      EcalTrigTowerDetId coarser = (*eTTmap_).towerOf(samples.id());
+      int index = getIndex(col, coarser);
+      int stripnr = findStripNr(samples.id());
+
+      int filled = 0;
+      for (unsigned int ij = 0; ij < towerMap[index].size(); ++ij)
+        filled += towerMap[index][ij].first;
       if (!filled) {
-	hitTowers_[nrTowers_++]=std::pair <int,EcalTrigTowerDetId>(index,coarser);
+        hitTowers_[nrTowers_++] =
+            std::pair<int, EcalTrigTowerDetId>(index, coarser);
       }
 
-      //FIXME: temporary protection
-      int ncryst=towerMap[index][stripnr-1].first;
-      if (ncryst>=nbMaxXtals_ ) {
-        edm::LogError("EcalTrigPrimFunctionAlgo")<<"! Too many xtals for TT "<<coarser<<" stripnr "<<stripnr<<" xtalid "<<samples.id() ;
-	continue;
+      // FIXME: temporary protection
+      int ncryst = towerMap[index][stripnr - 1].first;
+      if (ncryst >= nbMaxXtals_) {
+        edm::LogError("EcalTrigPrimFunctionAlgo")
+            << "! Too many xtals for TT " << coarser << " stripnr " << stripnr
+            << " xtalid " << samples.id();
+        continue;
       }
-      ((towerMap[index])[stripnr-1].second)[ncryst]=samples;
-      (towerMap[index])[stripnr-1].first++;
+      ((towerMap[index])[stripnr - 1].second)[ncryst] = samples;
+      (towerMap[index])[stripnr - 1].first++;
     }
-  
-    LogDebug("EcalTPG")<<"fillMap"<<"[EcalTrigPrimFunctionalAlgo] (found " 
-		       << col->size() << " frames in "<< towerMap.size() << " towers) ";
-  }
-  else {
-    LogDebug("EcalTPG")<<"FillMap - FillMap Collection size=0 !!!!";
+
+    LogDebug("EcalTPG") << "fillMap"
+                        << "[EcalTrigPrimFunctionalAlgo] (found " << col->size()
+                        << " frames in " << towerMap.size() << " towers) ";
+  } else {
+    LogDebug("EcalTPG") << "FillMap - FillMap Collection size=0 !!!!";
   }
 }
 
-template <class T> 
-void EcalTrigPrimFunctionalAlgo::clean( std::vector<std::vector<std::pair<int,std::vector<T> > > > & towMap) {  
+template <class T>
+void EcalTrigPrimFunctionalAlgo::clean(
+    std::vector<std::vector<std::pair<int, std::vector<T>>>> &towMap) {
   // clean internal data structures
-  for (unsigned int i=0;i<maxNrTowers_;++i) 
-    for (int j=0;j<nbMaxStrips_ ;++j) (towMap[i])[j].first=0;
+  for (unsigned int i = 0; i < maxNrTowers_; ++i)
+    for (int j = 0; j < nbMaxStrips_; ++j)
+      (towMap[i])[j].first = 0;
   return;
 }
- 
-template <class T> 
-void EcalTrigPrimFunctionalAlgo::initStructures( std::vector<std::vector<std::pair<int,std::vector<T> > > > & towMap) {  
-  //initialise internal data structures
-
-  std::vector <T> vec0(nbMaxXtals_ );
-  std::vector<std::pair<int,std::vector<T> > > vec1(nbMaxStrips_);
-  for (int i=0;i<nbMaxStrips_ ;++i) vec1[i]=std::pair<int,std::vector<T> >(0,vec0);
-  towMap.resize(maxNrTowers_); 
-  for (unsigned int i=0;i<maxNrTowers_;++i) towMap[i]=vec1;
-  
+
+template <class T>
+void EcalTrigPrimFunctionalAlgo::initStructures(
+    std::vector<std::vector<std::pair<int, std::vector<T>>>> &towMap) {
+  // initialise internal data structures
+
+  std::vector<T> vec0(nbMaxXtals_);
+  std::vector<std::pair<int, std::vector<T>>> vec1(nbMaxStrips_);
+  for (int i = 0; i < nbMaxStrips_; ++i)
+    vec1[i] = std::pair<int, std::vector<T>>(0, vec0);
+  towMap.resize(maxNrTowers_);
+  for (unsigned int i = 0; i < maxNrTowers_; ++i)
+    towMap[i] = vec1;
+
   std::vector<int> vecint(maxNrSamples_);
   striptp_.resize(nbMaxStrips_);
-  for (int i=0;i<nbMaxStrips_;++i) striptp_[i]=vecint;
-  
+  for (int i = 0; i < nbMaxStrips_; ++i)
+    striptp_[i] = vecint;
 }
 
 #endif
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixAmplitudeFilter.cc b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixAmplitudeFilter.cc
index 32e7dd684c016..c9c8d286147ad 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixAmplitudeFilter.cc
+++ b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixAmplitudeFilter.cc
@@ -1,124 +1,119 @@
-#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixAmplitudeFilter.h>
-#include "CondFormats/EcalObjects/interface/EcalTPGWeightIdMap.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGWeightGroup.h"
 #include "CondFormats/EcalObjects/interface/EcalTPGGroups.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGWeightGroup.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGWeightIdMap.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixAmplitudeFilter.h>
 #include <iostream>
 
 EcalFenixAmplitudeFilter::EcalFenixAmplitudeFilter()
-  :inputsAlreadyIn_(0), shift_(6) {
-  }
+    : inputsAlreadyIn_(0), shift_(6) {}
 
-EcalFenixAmplitudeFilter::~EcalFenixAmplitudeFilter(){
-}
+EcalFenixAmplitudeFilter::~EcalFenixAmplitudeFilter() {}
 
-int EcalFenixAmplitudeFilter::setInput(int input, int fgvb)
-{
-  if(input>0X3FFFF)
-    {
-      std::cout<<"ERROR IN INPUT OF AMPLITUDE FILTER"<<std::endl;
-      return -1;
-    }
-  if(inputsAlreadyIn_<5)
-    {
-      buffer_[inputsAlreadyIn_]=input;
-      fgvbBuffer_[inputsAlreadyIn_]=fgvb;
-      inputsAlreadyIn_++;
-    }
-  else
-    {
-      for(int i=0; i<4; i++)
-      {
-         buffer_[i]=buffer_[i+1];
-         fgvbBuffer_[i]=fgvbBuffer_[i+1];
-      }
-      buffer_[4]=input;
-      fgvbBuffer_[4]=fgvb;
+int EcalFenixAmplitudeFilter::setInput(int input, int fgvb) {
+  if (input > 0X3FFFF) {
+    std::cout << "ERROR IN INPUT OF AMPLITUDE FILTER" << std::endl;
+    return -1;
+  }
+  if (inputsAlreadyIn_ < 5) {
+    buffer_[inputsAlreadyIn_] = input;
+    fgvbBuffer_[inputsAlreadyIn_] = fgvb;
+    inputsAlreadyIn_++;
+  } else {
+    for (int i = 0; i < 4; i++) {
+      buffer_[i] = buffer_[i + 1];
+      fgvbBuffer_[i] = fgvbBuffer_[i + 1];
     }
+    buffer_[4] = input;
+    fgvbBuffer_[4] = fgvb;
+  }
   return 1;
 }
 
-void EcalFenixAmplitudeFilter::process(std::vector<int> &addout,std::vector<int> &output, std::vector<int> &fgvbIn, std::vector<int> &fgvbOut)
-{
+void EcalFenixAmplitudeFilter::process(std::vector<int> &addout,
+                                       std::vector<int> &output,
+                                       std::vector<int> &fgvbIn,
+                                       std::vector<int> &fgvbOut) {
   // test
-  inputsAlreadyIn_=0;
-  for (unsigned int i =0;i<5;i++){
-     buffer_[i]=0;//FIXME: 5
-     fgvbBuffer_[i]=0;
+  inputsAlreadyIn_ = 0;
+  for (unsigned int i = 0; i < 5; i++) {
+    buffer_[i] = 0; // FIXME: 5
+    fgvbBuffer_[i] = 0;
   }
-  
+
   // test end
-  
-  for (unsigned int i =0;i<addout.size();i++){
-    
-    setInput(addout[i],fgvbIn[i]);
+
+  for (unsigned int i = 0; i < addout.size(); i++) {
+
+    setInput(addout[i], fgvbIn[i]);
     process();
-    output[i]=processedOutput_;
-    fgvbOut[i]=processedFgvbOutput_;
+    output[i] = processedOutput_;
+    fgvbOut[i] = processedFgvbOutput_;
   }
   // shift the result by 1!
-  for (unsigned int i=0 ; i<(output.size());i++){
-    if (i!=output.size()-1){
-       output[i]=output[i+1];
-       fgvbOut[i] = fgvbOut[i+1];
-    }
-    else{
-      output[i]=0;
+  for (unsigned int i = 0; i < (output.size()); i++) {
+    if (i != output.size() - 1) {
+      output[i] = output[i + 1];
+      fgvbOut[i] = fgvbOut[i + 1];
+    } else {
+      output[i] = 0;
       fgvbOut[i] = 0;
     }
-  }  
+  }
   return;
 }
 
-void EcalFenixAmplitudeFilter::process()
-{
-  //UB FIXME: 5
+void EcalFenixAmplitudeFilter::process() {
+  // UB FIXME: 5
   processedOutput_ = 0;
   processedFgvbOutput_ = 0;
-  if(inputsAlreadyIn_<5) return;
-  int output=0;
+  if (inputsAlreadyIn_ < 5)
+    return;
+  int output = 0;
   int fgvbInt = 0;
-  for(int i=0; i<5; i++)
-  {
-    output+=(weights_[i]*buffer_[i])>>shift_;
-    if((fgvbBuffer_[i] == 1 && i == 3) || fgvbInt == 1)
-    {
+  for (int i = 0; i < 5; i++) {
+    output += (weights_[i] * buffer_[i]) >> shift_;
+    if ((fgvbBuffer_[i] == 1 && i == 3) || fgvbInt == 1) {
       fgvbInt = 1;
     }
   }
-  if(output<0) output=0;
-  if(output>0X3FFFF)  output=0X3FFFF;
+  if (output < 0)
+    output = 0;
+  if (output > 0X3FFFF)
+    output = 0X3FFFF;
   processedOutput_ = output;
   processedFgvbOutput_ = fgvbInt;
 }
 
-void EcalFenixAmplitudeFilter::setParameters(uint32_t raw,const EcalTPGWeightIdMap * ecaltpgWeightMap,const EcalTPGWeightGroup * ecaltpgWeightGroup)
-{
+void EcalFenixAmplitudeFilter::setParameters(
+    uint32_t raw, const EcalTPGWeightIdMap *ecaltpgWeightMap,
+    const EcalTPGWeightGroup *ecaltpgWeightGroup) {
   uint32_t params_[5];
-  const EcalTPGGroups::EcalTPGGroupsMap & groupmap = ecaltpgWeightGroup -> getMap();
+  const EcalTPGGroups::EcalTPGGroupsMap &groupmap =
+      ecaltpgWeightGroup->getMap();
   EcalTPGGroups::EcalTPGGroupsMapItr it = groupmap.find(raw);
-  if (it!=groupmap.end()) {
-    uint32_t weightid =(*it).second;
-    const EcalTPGWeightIdMap::EcalTPGWeightMap & weightmap = ecaltpgWeightMap -> getMap();
+  if (it != groupmap.end()) {
+    uint32_t weightid = (*it).second;
+    const EcalTPGWeightIdMap::EcalTPGWeightMap &weightmap =
+        ecaltpgWeightMap->getMap();
     EcalTPGWeightIdMap::EcalTPGWeightMapItr itw = weightmap.find(weightid);
-    (*itw).second.getValues(params_[0],params_[1],params_[2],params_[3],params_[4]);
+    (*itw).second.getValues(params_[0], params_[1], params_[2], params_[3],
+                            params_[4]);
 
-    // we have to transform negative coded in 7 bits into negative coded in 32 bits
-    // maybe this should go into the getValue method??
-    //std::cout << "peak flag settings" << std::endl;
-    for (int i=0;i<5;++i){
-      weights_[i] = (params_[i] & 0x40) ?    (int)( params_[i] | 0xffffffc0) : (int)(params_[i]);
+    // we have to transform negative coded in 7 bits into negative coded in 32
+    // bits maybe this should go into the getValue method??
+    // std::cout << "peak flag settings" << std::endl;
+    for (int i = 0; i < 5; ++i) {
+      weights_[i] = (params_[i] & 0x40) ? (int)(params_[i] | 0xffffffc0)
+                                        : (int)(params_[i]);
 
       // Construct the peakFlag for sFGVB processing
-      //peakFlag_[i] = ((params_[i] & 0x80) > 0x0) ? 1 : 0;
-      //std::cout << " " << params_[i] << std::endl;
-      //std::cout << " " << peakFlag_[i] << std::endl;
+      // peakFlag_[i] = ((params_[i] & 0x80) > 0x0) ? 1 : 0;
+      // std::cout << " " << params_[i] << std::endl;
+      // std::cout << " " << peakFlag_[i] << std::endl;
     }
-    //std::cout << std::endl;
-  }
-  else edm::LogWarning("EcalTPG")<<" could not find EcalTPGGroupsMap entry for "<<raw;
+    // std::cout << std::endl;
+  } else
+    edm::LogWarning("EcalTPG")
+        << " could not find EcalTPGGroupsMap entry for " << raw;
 }
-
-
-
-
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixBypassLin.cc b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixBypassLin.cc
index d759535d6033b..28806125904af 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixBypassLin.cc
+++ b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixBypassLin.cc
@@ -5,15 +5,11 @@
 
 class EBDataFrame;
 
-  EcalFenixBypassLin::EcalFenixBypassLin(){
-  }
-  EcalFenixBypassLin::~EcalFenixBypassLin(){
-  }
-  void EcalFenixBypassLin::process(std::vector<int> &stripin,std::vector<int> &out)
-  {
-    //    return stripin;
-    out=stripin;
-    return;
-  }
-
-
+EcalFenixBypassLin::EcalFenixBypassLin() {}
+EcalFenixBypassLin::~EcalFenixBypassLin() {}
+void EcalFenixBypassLin::process(std::vector<int> &stripin,
+                                 std::vector<int> &out) {
+  //    return stripin;
+  out = stripin;
+  return;
+}
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixEtStrip.cc b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixEtStrip.cc
index 3511c6ebe5f13..085dbef3a1c26 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixEtStrip.cc
+++ b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixEtStrip.cc
@@ -1,26 +1,21 @@
 #include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixEtStrip.h>
-  
-EcalFenixEtStrip::EcalFenixEtStrip(){
-}
-EcalFenixEtStrip::~EcalFenixEtStrip(){
-}
-  
-void EcalFenixEtStrip::process(const std::vector<std::vector<int> > &linout,int nrXtals, std::vector<int> &output)
-{
-  for (unsigned int i =0;i<output.size();i++){
-    output[i]=0;
+
+EcalFenixEtStrip::EcalFenixEtStrip() {}
+EcalFenixEtStrip::~EcalFenixEtStrip() {}
+
+void EcalFenixEtStrip::process(const std::vector<std::vector<int>> &linout,
+                               int nrXtals, std::vector<int> &output) {
+  for (unsigned int i = 0; i < output.size(); i++) {
+    output[i] = 0;
   }
-  for(int ixtal=0;ixtal<nrXtals;ixtal++){
-    for (unsigned int i=0;i<output.size();i++) {
-      output[i]+=(linout[ixtal])[i];
+  for (int ixtal = 0; ixtal < nrXtals; ixtal++) {
+    for (unsigned int i = 0; i < output.size(); i++) {
+      output[i] += (linout[ixtal])[i];
     }
   }
-  for (unsigned int i=0;i<output.size();i++) {
-    if(output[i]>0X3FFFF)output[i]=0X3FFFF;
+  for (unsigned int i = 0; i < output.size(); i++) {
+    if (output[i] > 0X3FFFF)
+      output[i] = 0X3FFFF;
   }
   return;
 }
-  
-  
-
-							       
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixEtTot.cc b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixEtTot.cc
index d91012328815d..749d3e94ae98a 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixEtTot.cc
+++ b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixEtTot.cc
@@ -1,30 +1,31 @@
 #include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixEtTot.h>
 
 //----------------------------------------------------------------------------------------
-EcalFenixEtTot::EcalFenixEtTot()
-{}
-//----------------------------------------------------------------------------------------  
-EcalFenixEtTot::~EcalFenixEtTot()
-{}
+EcalFenixEtTot::EcalFenixEtTot() {}
 //----------------------------------------------------------------------------------------
-std::vector<int> EcalFenixEtTot::process(const std::vector<EBDataFrame *> &calodatafr)
-{
-    std::vector<int> out;
-    return out;
+EcalFenixEtTot::~EcalFenixEtTot() {}
+//----------------------------------------------------------------------------------------
+std::vector<int>
+EcalFenixEtTot::process(const std::vector<EBDataFrame *> &calodatafr) {
+  std::vector<int> out;
+  return out;
 }
 //----------------------------------------------------------------------------------------
-void EcalFenixEtTot::process(std::vector<std::vector <int> >  &bypasslinout, int nStr, int bitMask, std::vector<int> & output)
-{
+void EcalFenixEtTot::process(std::vector<std::vector<int>> &bypasslinout,
+                             int nStr, int bitMask, std::vector<int> &output) {
 
-  for (unsigned int i=0;i<output.size();i++){
-    output[i]= 0;
+  for (unsigned int i = 0; i < output.size(); i++) {
+    output[i] = 0;
   }
 
-  int mask = (1<<bitMask)-1;
-  for(int istrip=0;istrip<nStr;istrip++){
-    for (unsigned int i=0;i<bypasslinout[istrip].size();i++) {
-      output[i]+= (bypasslinout[istrip][i] & mask) ; //fix bug inn case of EE: MSB are set for FG, so need to apply mask in summation.
-      if (output[i]>mask) output[i]= mask;
+  int mask = (1 << bitMask) - 1;
+  for (int istrip = 0; istrip < nStr; istrip++) {
+    for (unsigned int i = 0; i < bypasslinout[istrip].size(); i++) {
+      output[i] += (bypasslinout[istrip][i] &
+                    mask); // fix bug inn case of EE: MSB are set for FG, so
+                           // need to apply mask in summation.
+      if (output[i] > mask)
+        output[i] = mask;
     }
   }
   return;
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixFgvbEB.cc b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixFgvbEB.cc
index 0a59f4e5bc77b..4e3f380b2a5ab 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixFgvbEB.cc
+++ b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixFgvbEB.cc
@@ -1,72 +1,97 @@
-#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixFgvbEB.h>
 #include "CondFormats/EcalObjects/interface/EcalTPGFineGrainEBGroup.h"
 #include "CondFormats/EcalObjects/interface/EcalTPGFineGrainEBIdMap.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixFgvbEB.h>
 
-EcalFenixFgvbEB::EcalFenixFgvbEB(int maxNrSamples)
- {
-   add_out_8_.resize(maxNrSamples); 
+EcalFenixFgvbEB::EcalFenixFgvbEB(int maxNrSamples) {
+  add_out_8_.resize(maxNrSamples);
 }
 
-EcalFenixFgvbEB::~EcalFenixFgvbEB(){
-}
+EcalFenixFgvbEB::~EcalFenixFgvbEB() {}
 
-void EcalFenixFgvbEB::process( std::vector<int> &add_out, std::vector<int> &maxof2_out, std::vector<int> &output) {
+void EcalFenixFgvbEB::process(std::vector<int> &add_out,
+                              std::vector<int> &maxof2_out,
+                              std::vector<int> &output) {
 
-    int Elow, Ehigh, Tlow, Thigh, lut;
-    int ERatLow,ERatHigh;
-    //    std::vector<int> add_out_8(add_out.size());
-    int COMP3, COMP2, COMP1, COMP0;
-   
-   //  Elow = (*params_)[1024];
-//     Ehigh = (*params_)[1025];
-//     Tlow = (*params_)[1026];
-//     Thigh = (*params_)[1027];
-//     lut = (*params_)[1028];
+  int Elow, Ehigh, Tlow, Thigh, lut;
+  int ERatLow, ERatHigh;
+  //    std::vector<int> add_out_8(add_out.size());
+  int COMP3, COMP2, COMP1, COMP0;
 
-    Elow = ETlow_;
-    Ehigh = EThigh_;
-    Tlow = Ratlow_;
-    Thigh = Rathigh_;
-    lut = lut_;
+  //  Elow = (*params_)[1024];
+  //     Ehigh = (*params_)[1025];
+  //     Tlow = (*params_)[1026];
+  //     Thigh = (*params_)[1027];
+  //     lut = (*params_)[1028];
 
-    
-    if (Tlow > 127) Tlow=Tlow-128;
-    if (Thigh > 127) Thigh=Thigh-128;
-   
-    for (unsigned int i =0;i<add_out.size();i++) {
-      
-      ERatLow=add_out[i]*Tlow>>7;
-      if (ERatLow>0xFFF) ERatLow=0xFFF;
-      ERatHigh=add_out[i]*Thigh>>7;
-      if (ERatHigh>0xFFF) ERatHigh=0xFFF;
-      if (add_out[i] >0XFF) add_out_8_[i]=0xFF; else add_out_8_[i]=add_out[i];
+  Elow = ETlow_;
+  Ehigh = EThigh_;
+  Tlow = Ratlow_;
+  Thigh = Rathigh_;
+  lut = lut_;
 
-      if( maxof2_out[i] >= ERatLow)  COMP3=1; else COMP3=0;
-      if( maxof2_out[i] >= ERatHigh) COMP2=1; else COMP2=0;
-      if( add_out_8_[i]  >= Elow)     COMP1=1; else COMP1=0;
-      if( add_out_8_[i]  >= Ehigh)    COMP0=1; else COMP0=0;
+  if (Tlow > 127)
+    Tlow = Tlow - 128;
+  if (Thigh > 127)
+    Thigh = Thigh - 128;
 
-      int ilut= (COMP3<<3) + (COMP2<<2) + (COMP1<<1) + COMP0;
-      int mask = 1<<(ilut);
-      output[i]= (lut) & (mask);
-      if (output[i]>0) output[i]=1;
-    }
-    return;
-  }
+  for (unsigned int i = 0; i < add_out.size(); i++) {
 
-void  EcalFenixFgvbEB::setParameters(uint32_t towid,const EcalTPGFineGrainEBGroup *ecaltpgFgEBGroup,const EcalTPGFineGrainEBIdMap *ecaltpgFineGrainEB ){
+    ERatLow = add_out[i] * Tlow >> 7;
+    if (ERatLow > 0xFFF)
+      ERatLow = 0xFFF;
+    ERatHigh = add_out[i] * Thigh >> 7;
+    if (ERatHigh > 0xFFF)
+      ERatHigh = 0xFFF;
+    if (add_out[i] > 0XFF)
+      add_out_8_[i] = 0xFF;
+    else
+      add_out_8_[i] = add_out[i];
 
-  const EcalTPGGroups::EcalTPGGroupsMap &groupmap = ecaltpgFgEBGroup -> getMap();
-  EcalTPGGroups::EcalTPGGroupsMapItr it= groupmap.find(towid);
-  if (it!=groupmap.end()) {
-//     uint32_t fgid =(*it).second;
-//     const EcalTPGFineGrainEBIdMap::EcalTPGFineGrainEBMap fgmap = ecaltpgFineGrainEB -> getMap();
-//     EcalTPGFineGrainEBIdMap::EcalTPGFineGrainEBMapItr itfg = fgmap.find(fgid);
-//     (*itfg).second.getValues( ETlow_,  EThigh_,  Ratlow_,  Rathigh_, lut_);
-     EcalTPGFineGrainEBIdMap::EcalTPGFineGrainEBMapItr itfg = (ecaltpgFineGrainEB -> getMap()).find((*it).second);
-     (*itfg).second.getValues( ETlow_,  EThigh_,  Ratlow_,  Rathigh_, lut_);
+    if (maxof2_out[i] >= ERatLow)
+      COMP3 = 1;
+    else
+      COMP3 = 0;
+    if (maxof2_out[i] >= ERatHigh)
+      COMP2 = 1;
+    else
+      COMP2 = 0;
+    if (add_out_8_[i] >= Elow)
+      COMP1 = 1;
+    else
+      COMP1 = 0;
+    if (add_out_8_[i] >= Ehigh)
+      COMP0 = 1;
+    else
+      COMP0 = 0;
+
+    int ilut = (COMP3 << 3) + (COMP2 << 2) + (COMP1 << 1) + COMP0;
+    int mask = 1 << (ilut);
+    output[i] = (lut) & (mask);
+    if (output[i] > 0)
+      output[i] = 1;
   }
-  else edm::LogWarning("EcalTPG")<<" could not find EcalTPGGroupsMap entry for "<<towid;
- 
+  return;
+}
+
+void EcalFenixFgvbEB::setParameters(
+    uint32_t towid, const EcalTPGFineGrainEBGroup *ecaltpgFgEBGroup,
+    const EcalTPGFineGrainEBIdMap *ecaltpgFineGrainEB) {
+
+  const EcalTPGGroups::EcalTPGGroupsMap &groupmap = ecaltpgFgEBGroup->getMap();
+  EcalTPGGroups::EcalTPGGroupsMapItr it = groupmap.find(towid);
+  if (it != groupmap.end()) {
+    //     uint32_t fgid =(*it).second;
+    //     const EcalTPGFineGrainEBIdMap::EcalTPGFineGrainEBMap fgmap =
+    //     ecaltpgFineGrainEB -> getMap();
+    //     EcalTPGFineGrainEBIdMap::EcalTPGFineGrainEBMapItr itfg =
+    //     fgmap.find(fgid);
+    //     (*itfg).second.getValues( ETlow_,  EThigh_,  Ratlow_,  Rathigh_,
+    //     lut_);
+    EcalTPGFineGrainEBIdMap::EcalTPGFineGrainEBMapItr itfg =
+        (ecaltpgFineGrainEB->getMap()).find((*it).second);
+    (*itfg).second.getValues(ETlow_, EThigh_, Ratlow_, Rathigh_, lut_);
+  } else
+    edm::LogWarning("EcalTPG")
+        << " could not find EcalTPGGroupsMap entry for " << towid;
 }
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixLinearizer.cc b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixLinearizer.cc
index fb6f175667fbc..ecd101734219a 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixLinearizer.cc
+++ b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixLinearizer.cc
@@ -1,130 +1,126 @@
 #include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixLinearizer.h>
 
+#include <CondFormats/EcalObjects/interface/EcalTPGCrystalStatus.h>
 #include <CondFormats/EcalObjects/interface/EcalTPGLinearizationConst.h>
 #include <CondFormats/EcalObjects/interface/EcalTPGPedestals.h>
-#include <CondFormats/EcalObjects/interface/EcalTPGCrystalStatus.h>
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 EcalFenixLinearizer::EcalFenixLinearizer(bool famos)
-  : famos_(famos), init_(false)
-{
-}
+    : famos_(famos), init_(false) {}
 
-EcalFenixLinearizer::~EcalFenixLinearizer(){
+EcalFenixLinearizer::~EcalFenixLinearizer() {
   if (init_) {
-    for (int i=0;i<(int)vectorbadXStatus_.size();i++){
+    for (int i = 0; i < (int)vectorbadXStatus_.size(); i++) {
       delete vectorbadXStatus_[i];
     }
-  }    
+  }
 }
 
-void EcalFenixLinearizer::setParameters(uint32_t raw, const EcalTPGPedestals * ecaltpPed, const EcalTPGLinearizationConst * ecaltpLin, const EcalTPGCrystalStatus * ecaltpBadX)
-{
-  const EcalTPGLinearizationConstMap & linMap = ecaltpLin->getMap() ; 
-  EcalTPGLinearizationConstMapIterator it=linMap.find(raw);
-  if (it!=linMap.end()) {
-    linConsts_=&(*it);
-  }
-  else edm::LogWarning("EcalTPG")<<" could not find EcalTPGLinearizationConstMap entry for "<<raw;
-  
-  const EcalTPGPedestalsMap & pedMap = ecaltpPed->getMap() ; 
-  EcalTPGPedestalsMapIterator itped=pedMap.find(raw);
-  if (itped!=pedMap.end())   peds_=&(*itped);
-  else edm::LogWarning("EcalTPG")<<" could not find EcalTPGPedestalsMap entry for "<<raw;
-
-  const EcalTPGCrystalStatusMap & badXMap = ecaltpBadX->getMap();
-  EcalTPGCrystalStatusMapIterator itbadX=badXMap.find(raw); 
-  
-  if (itbadX!=badXMap.end()) {
-    badXStatus_=&(*itbadX);
-  }  
-  else 
-  {   
-    edm::LogWarning("EcalTPG")<<" could not find EcalTPGCrystalStatusMap entry for "<<raw; 
+void EcalFenixLinearizer::setParameters(
+    uint32_t raw, const EcalTPGPedestals *ecaltpPed,
+    const EcalTPGLinearizationConst *ecaltpLin,
+    const EcalTPGCrystalStatus *ecaltpBadX) {
+  const EcalTPGLinearizationConstMap &linMap = ecaltpLin->getMap();
+  EcalTPGLinearizationConstMapIterator it = linMap.find(raw);
+  if (it != linMap.end()) {
+    linConsts_ = &(*it);
+  } else
+    edm::LogWarning("EcalTPG")
+        << " could not find EcalTPGLinearizationConstMap entry for " << raw;
+
+  const EcalTPGPedestalsMap &pedMap = ecaltpPed->getMap();
+  EcalTPGPedestalsMapIterator itped = pedMap.find(raw);
+  if (itped != pedMap.end())
+    peds_ = &(*itped);
+  else
+    edm::LogWarning("EcalTPG")
+        << " could not find EcalTPGPedestalsMap entry for " << raw;
+
+  const EcalTPGCrystalStatusMap &badXMap = ecaltpBadX->getMap();
+  EcalTPGCrystalStatusMapIterator itbadX = badXMap.find(raw);
+
+  if (itbadX != badXMap.end()) {
+    badXStatus_ = &(*itbadX);
+  } else {
+    edm::LogWarning("EcalTPG")
+        << " could not find EcalTPGCrystalStatusMap entry for " << raw;
     badXStatus_ = new EcalTPGCrystalStatusCode();
     vectorbadXStatus_.push_back(&(*badXStatus_));
-    init_ = true;  	
+    init_ = true;
   }
 }
 
-int EcalFenixLinearizer::process()
-{
-  int output=(uncorrectedSample_-base_); //Substract base
-  if(famos_ || output<0) return 0;
-  
-  if(output<0) return shift_ << 12; // FENIX bug(!)
-  output=(output*mult_)>>(shift_+2);        //Apply multiplicative factor
-  if(output>0X3FFFF)output=0X3FFFF;         //Saturation if too high
+int EcalFenixLinearizer::process() {
+  int output = (uncorrectedSample_ - base_); // Substract base
+  if (famos_ || output < 0)
+    return 0;
+
+  if (output < 0)
+    return shift_ << 12;                     // FENIX bug(!)
+  output = (output * mult_) >> (shift_ + 2); // Apply multiplicative factor
+  if (output > 0X3FFFF)
+    output = 0X3FFFF; // Saturation if too high
   return output;
 }
 
-int EcalFenixLinearizer::setInput(const EcalMGPASample &RawSam)
-{ 
-  if(RawSam.raw()>0X3FFF)
-    {
-      LogDebug("EcalTPG")<<"ERROR IN INPUT SAMPLE OF FENIX LINEARIZER";
-      return -1;
-    }
-  uncorrectedSample_=RawSam.adc(); //uncorrectedSample_ is coded in the 12 LSB
-  gainID_=RawSam.gainId();       //uncorrectedSample_ is coded in the 2 next bits!
-  //if (gainID_==0)    gainID_=3;
+int EcalFenixLinearizer::setInput(const EcalMGPASample &RawSam) {
+  if (RawSam.raw() > 0X3FFF) {
+    LogDebug("EcalTPG") << "ERROR IN INPUT SAMPLE OF FENIX LINEARIZER";
+    return -1;
+  }
+  uncorrectedSample_ = RawSam.adc(); // uncorrectedSample_ is coded in the 12
+                                     // LSB
+  gainID_ = RawSam.gainId(); // uncorrectedSample_ is coded in the 2 next bits!
+  // if (gainID_==0)    gainID_=3;
 
-  if(gainID_ == 0)
-  {
+  if (gainID_ == 0) {
     base_ = 0;
     shift_ = 0;
     mult_ = 0xFF;
-    if((linConsts_->mult_x12 == 0) && (linConsts_->mult_x6 == 0) && (linConsts_->mult_x1 == 0))
-    {
+    if ((linConsts_->mult_x12 == 0) && (linConsts_->mult_x6 == 0) &&
+        (linConsts_->mult_x1 == 0)) {
       mult_ = 0; // Implemented in CCSSupervisor to
                  // reject overflow cases in rejected channels
     }
-  }
-  else if (gainID_==1) {
-    base_ = peds_ -> mean_x12; 
-    shift_ = linConsts_ -> shift_x12;
-    
+  } else if (gainID_ == 1) {
+    base_ = peds_->mean_x12;
+    shift_ = linConsts_->shift_x12;
+
     // take into account the badX
     // badXStatus_ == 0 if the crystal works
     // badXStatus_ !=0 some problem with the crystal
-    if (badXStatus_->getStatusCode()!=0){
+    if (badXStatus_->getStatusCode() != 0) {
       mult_ = 0;
+    } else {
+      mult_ = linConsts_->mult_x12;
     }
-    else{ 
-      mult_ = linConsts_ -> mult_x12;
-    }
-  }
-  else if (gainID_==2) {
-    base_ = peds_ -> mean_x6;
-    shift_ = linConsts_ -> shift_x6;
-    
+  } else if (gainID_ == 2) {
+    base_ = peds_->mean_x6;
+    shift_ = linConsts_->shift_x6;
+
     // take into account the badX
-    // check if the badX has a status code=0 or 1 
-    if (badXStatus_->getStatusCode()!=0){
+    // check if the badX has a status code=0 or 1
+    if (badXStatus_->getStatusCode() != 0) {
       mult_ = 0;
+    } else {
+      mult_ = linConsts_->mult_x6;
     }
-    else{
-      mult_ = linConsts_ -> mult_x6;
-    }  
-  }
-  else if (gainID_==3){
-    base_ = peds_-> mean_x1; 
-    shift_ = linConsts_ -> shift_x1;
-    
-    // take into account the badX 
+  } else if (gainID_ == 3) {
+    base_ = peds_->mean_x1;
+    shift_ = linConsts_->shift_x1;
+
+    // take into account the badX
     // check if the badX has a status code=0 or 1
-    if (badXStatus_->getStatusCode()!=0){
+    if (badXStatus_->getStatusCode() != 0) {
       mult_ = 0;
+    } else {
+      mult_ = linConsts_->mult_x1;
     }
-    else{
-      mult_ = linConsts_ -> mult_x1;
-    } 
   }
-  
-  
-  if (famos_) base_=200; //FIXME by preparing a correct TPG.txt for Famos
+
+  if (famos_)
+    base_ = 200; // FIXME by preparing a correct TPG.txt for Famos
 
   return 1;
 }
-
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixMaxof2.cc b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixMaxof2.cc
index 7eea8244cab43..39706345f0b74 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixMaxof2.cc
+++ b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixMaxof2.cc
@@ -1,38 +1,38 @@
 #include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixMaxof2.h>
 
-
-// global type definitions for class implementation in source file defined by Tag entries in ArgoUML
-// Result: typedef <typedef_global_source> <tag_value>;
-EcalFenixMaxof2::EcalFenixMaxof2(int maxNrSamples, int nbMaxStrips) : nbMaxStrips_(nbMaxStrips)
-{
-  std::vector<int> vec(maxNrSamples,0);
-  for (int i2strip =0;i2strip<nbMaxStrips_-1;++i2strip)
+// global type definitions for class implementation in source file defined by
+// Tag entries in ArgoUML Result: typedef <typedef_global_source> <tag_value>;
+EcalFenixMaxof2::EcalFenixMaxof2(int maxNrSamples, int nbMaxStrips)
+    : nbMaxStrips_(nbMaxStrips) {
+  std::vector<int> vec(maxNrSamples, 0);
+  for (int i2strip = 0; i2strip < nbMaxStrips_ - 1; ++i2strip)
     sumby2_.push_back(vec);
 }
-  
-EcalFenixMaxof2::~EcalFenixMaxof2(){
-}
-  
-void EcalFenixMaxof2::process(std::vector<std::vector <int> > &bypasslinout, int nstrip, int bitMask,std::vector<int> &output)
-{
-  int mask = (1<<bitMask)-1;
-  for (int i2strip =0;i2strip<nstrip-1;++i2strip)
-    for (unsigned int i=0;i<output.size();i++)	    sumby2_[i2strip][i]=0; 
-  for (unsigned int i=0;i<output.size();i++) output[i] = 0;
-  
-  for (unsigned int i=0;i<output.size();i++){
-    if (nstrip-1==0){
-      output[i]=((bypasslinout[0][i])&mask);
-    }else {
-      for ( int i2strip=0; i2strip< nstrip-1;++i2strip){ 
-	sumby2_[i2strip][i]= ((bypasslinout[i2strip][i])&mask)+((bypasslinout[i2strip+1][i])&mask);
-	if (sumby2_[i2strip][i]>output[i]){
-	  output[i]=sumby2_[i2strip][i];
-	}
+
+EcalFenixMaxof2::~EcalFenixMaxof2() {}
+
+void EcalFenixMaxof2::process(std::vector<std::vector<int>> &bypasslinout,
+                              int nstrip, int bitMask,
+                              std::vector<int> &output) {
+  int mask = (1 << bitMask) - 1;
+  for (int i2strip = 0; i2strip < nstrip - 1; ++i2strip)
+    for (unsigned int i = 0; i < output.size(); i++)
+      sumby2_[i2strip][i] = 0;
+  for (unsigned int i = 0; i < output.size(); i++)
+    output[i] = 0;
+
+  for (unsigned int i = 0; i < output.size(); i++) {
+    if (nstrip - 1 == 0) {
+      output[i] = ((bypasslinout[0][i]) & mask);
+    } else {
+      for (int i2strip = 0; i2strip < nstrip - 1; ++i2strip) {
+        sumby2_[i2strip][i] = ((bypasslinout[i2strip][i]) & mask) +
+                              ((bypasslinout[i2strip + 1][i]) & mask);
+        if (sumby2_[i2strip][i] > output[i]) {
+          output[i] = sumby2_[i2strip][i];
+        }
       }
     }
   }
   return;
 }
-
-
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixPeakFinder.cc b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixPeakFinder.cc
index f7a77cb22c7c7..4c46775f5924b 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixPeakFinder.cc
+++ b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixPeakFinder.cc
@@ -1,59 +1,52 @@
 #include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixPeakFinder.h>
-  
-EcalFenixPeakFinder::EcalFenixPeakFinder()
-  :inputsAlreadyIn_(0){ 
-}
 
-  
-EcalFenixPeakFinder::~EcalFenixPeakFinder(){
-}
+EcalFenixPeakFinder::EcalFenixPeakFinder() : inputsAlreadyIn_(0) {}
 
-int EcalFenixPeakFinder::setInput(int input)
-{
-  if(inputsAlreadyIn_<3)
-    {
-      buffer_[inputsAlreadyIn_]=input;
-      inputsAlreadyIn_++;
-    }
-  else
-    {
-      for(int i=0; i<2; i++) buffer_[i]=buffer_[i+1];
-      buffer_[2]=input;
-    }
+EcalFenixPeakFinder::~EcalFenixPeakFinder() {}
+
+int EcalFenixPeakFinder::setInput(int input) {
+  if (inputsAlreadyIn_ < 3) {
+    buffer_[inputsAlreadyIn_] = input;
+    inputsAlreadyIn_++;
+  } else {
+    for (int i = 0; i < 2; i++)
+      buffer_[i] = buffer_[i + 1];
+    buffer_[2] = input;
+  }
   return 1;
 }
-  
-int EcalFenixPeakFinder::process()
-{
-
-  if(inputsAlreadyIn_<3) return 0;
-  if(buffer_[1]>buffer_[0] && buffer_[1]>buffer_[2]) return 1;
-  else return 0;
-    
+
+int EcalFenixPeakFinder::process() {
+
+  if (inputsAlreadyIn_ < 3)
+    return 0;
+  if (buffer_[1] > buffer_[0] && buffer_[1] > buffer_[2])
+    return 1;
+  else
+    return 0;
 }
 
-std::vector<int> EcalFenixPeakFinder::process(std::vector<int> &filtout, std::vector<int> & output)
-{
-  
+std::vector<int> EcalFenixPeakFinder::process(std::vector<int> &filtout,
+                                              std::vector<int> &output) {
+
   // FIXME: 3
-  inputsAlreadyIn_=0;
-  for (unsigned int i =0;i<3;i++) buffer_[i]=0;
+  inputsAlreadyIn_ = 0;
+  for (unsigned int i = 0; i < 3; i++)
+    buffer_[i] = 0;
 
   //  std::vector<int> output;
-  
+
   // attention, we have to shift by one, because the peak is found one too late
-  for (unsigned int i =0;i<filtout.size();i++){
-    
+  for (unsigned int i = 0; i < filtout.size(); i++) {
+
     setInput(filtout[i]);
-    if (i>0) {
+    if (i > 0) {
       //      int outone = process();
       //      output.push_back(outone);
-      output[i-1]= process();
+      output[i - 1] = process();
     }
   }
   //  output.resize(filtout.size());
 
   return output;
 }
-
-
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixStrip.cc b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixStrip.cc
index 402ec01cc8e6d..5119c616da46a 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixStrip.cc
+++ b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixStrip.cc
@@ -8,22 +8,28 @@
 #include <DataFormats/EcalDigi/interface/EcalTriggerPrimitiveSample.h>
 
 //-------------------------------------------------------------------------------------
-EcalFenixStrip::EcalFenixStrip(const edm::EventSetup & setup, const EcalElectronicsMapping* theMapping,bool debug, bool famos,int maxNrSamples, int nbMaxXtals): theMapping_(theMapping), debug_(debug), famos_(famos), nbMaxXtals_(nbMaxXtals)
-{ 
+EcalFenixStrip::EcalFenixStrip(const edm::EventSetup &setup,
+                               const EcalElectronicsMapping *theMapping,
+                               bool debug, bool famos, int maxNrSamples,
+                               int nbMaxXtals)
+    : theMapping_(theMapping), debug_(debug), famos_(famos),
+      nbMaxXtals_(nbMaxXtals) {
   linearizer_.resize(nbMaxXtals_);
-  for (int i=0;i<nbMaxXtals_;i++) linearizer_[i] = new  EcalFenixLinearizer(famos_); 
-  adder_ = new  EcalFenixEtStrip();
+  for (int i = 0; i < nbMaxXtals_; i++)
+    linearizer_[i] = new EcalFenixLinearizer(famos_);
+  adder_ = new EcalFenixEtStrip();
   amplitude_filter_ = new EcalFenixAmplitudeFilter();
-  peak_finder_ = new  EcalFenixPeakFinder();
+  peak_finder_ = new EcalFenixPeakFinder();
   fenixFormatterEB_ = new EcalFenixStripFormatEB();
   fenixFormatterEE_ = new EcalFenixStripFormatEE();
   fgvbEE_ = new EcalFenixStripFgvbEE();
 
   // prepare data storage for all events
-  std::vector <int> v;
+  std::vector<int> v;
   v.resize(maxNrSamples);
-  lin_out_.resize(nbMaxXtals_);  
-  for (int i=0;i<5;i++) lin_out_[i]=v;
+  lin_out_.resize(nbMaxXtals_);
+  for (int i = 0; i < 5; i++)
+    lin_out_[i] = v;
   add_out_.resize(maxNrSamples);
   filt_out_.resize(maxNrSamples);
   peak_out_.resize(maxNrSamples);
@@ -34,9 +40,10 @@ EcalFenixStrip::EcalFenixStrip(const edm::EventSetup & setup, const EcalElectron
 
 //-------------------------------------------------------------------------------------
 EcalFenixStrip::~EcalFenixStrip() {
-  for (int i=0;i<nbMaxXtals_;i++) delete linearizer_[i]; 
-  delete adder_; 
-  delete amplitude_filter_; 
+  for (int i = 0; i < nbMaxXtals_; i++)
+    delete linearizer_[i];
+  delete adder_;
+  delete amplitude_filter_;
   delete peak_finder_;
   delete fenixFormatterEB_;
   delete fenixFormatterEE_;
@@ -44,49 +51,55 @@ EcalFenixStrip::~EcalFenixStrip() {
 }
 
 //----------------------------------------------------------------------------------
-void EcalFenixStrip::process_part2_barrel(uint32_t stripid,const EcalTPGSlidingWindow * ecaltpgSlidW,const EcalTPGFineGrainStripEE * ecaltpgFgStripEE) {
-  
+void EcalFenixStrip::process_part2_barrel(
+    uint32_t stripid, const EcalTPGSlidingWindow *ecaltpgSlidW,
+    const EcalTPGFineGrainStripEE *ecaltpgFgStripEE) {
+
   // call  Fgvb
-  //this->getFGVB()->setParameters(stripid,ecaltpgFgStripEE);
-  //this->getFGVB()->process(lin_out_,fgvb_out_);
+  // this->getFGVB()->setParameters(stripid,ecaltpgFgStripEE);
+  // this->getFGVB()->process(lin_out_,fgvb_out_);
 
   // call formatter
-  this->getFormatterEB()->setParameters(stripid,ecaltpgSlidW) ; 
-  this->getFormatterEB()->process(fgvb_out_,peak_out_,filt_out_,format_out_);     
-  //this is a test:
+  this->getFormatterEB()->setParameters(stripid, ecaltpgSlidW);
+  this->getFormatterEB()->process(fgvb_out_, peak_out_, filt_out_, format_out_);
+  // this is a test:
   if (debug_) {
-    std::cout<< "output of formatter is a vector of size: "<<format_out_.size()<<std::endl; 
-    std::cout<< "value : "<<std::endl;
-    for (unsigned int i =0; i<format_out_.size();i++){
-      std::cout <<" "<<format_out_[i];
-    }    
-    std::cout<<std::endl;
-
+    std::cout << "output of formatter is a vector of size: "
+              << format_out_.size() << std::endl;
+    std::cout << "value : " << std::endl;
+    for (unsigned int i = 0; i < format_out_.size(); i++) {
+      std::cout << " " << format_out_[i];
+    }
+    std::cout << std::endl;
   }
   return;
-
 }
 //-------------------------------------------------------------------------------------
-void  EcalFenixStrip::process_part2_endcap(uint32_t stripid,const EcalTPGSlidingWindow * ecaltpgSlidW,const EcalTPGFineGrainStripEE * ecaltpgFgStripEE,const EcalTPGStripStatus * ecaltpgStripStatus) {
-   
+void EcalFenixStrip::process_part2_endcap(
+    uint32_t stripid, const EcalTPGSlidingWindow *ecaltpgSlidW,
+    const EcalTPGFineGrainStripEE *ecaltpgFgStripEE,
+    const EcalTPGStripStatus *ecaltpgStripStatus) {
+
   // call  Fgvb
-  //this->getFGVB()->setParameters(stripid,ecaltpgFgStripEE); 
-  //this->getFGVB()->process(lin_out_,fgvb_out_);
+  // this->getFGVB()->setParameters(stripid,ecaltpgFgStripEE);
+  // this->getFGVB()->process(lin_out_,fgvb_out_);
 
   // call formatter
-  this->getFormatterEE()->setParameters(stripid,ecaltpgSlidW,ecaltpgStripStatus) ;
+  this->getFormatterEE()->setParameters(stripid, ecaltpgSlidW,
+                                        ecaltpgStripStatus);
 
-  this->getFormatterEE()->process(fgvb_out_,peak_out_,filt_out_,format_out_);
-     
-  //this is a test:
-   if (debug_) {
-     std::cout<< "output of formatter is a vector of size: "<<format_out_.size()<<std::endl; 
-      std::cout<< "value : "<<std::endl;
-      for (unsigned int i =0; i<format_out_.size();i++){
-        std::cout <<" "<<std::dec<<format_out_[i];
-      }    
-     std::cout<<std::endl;
-   }
+  this->getFormatterEE()->process(fgvb_out_, peak_out_, filt_out_, format_out_);
 
-   return;
+  // this is a test:
+  if (debug_) {
+    std::cout << "output of formatter is a vector of size: "
+              << format_out_.size() << std::endl;
+    std::cout << "value : " << std::endl;
+    for (unsigned int i = 0; i < format_out_.size(); i++) {
+      std::cout << " " << std::dec << format_out_[i];
+    }
+    std::cout << std::endl;
+  }
+
+  return;
 }
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixStripFgvbEE.cc b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixStripFgvbEE.cc
index 365af1f36eaef..35359f4224ab1 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixStripFgvbEE.cc
+++ b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixStripFgvbEE.cc
@@ -1,55 +1,55 @@
-#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFgvbEE.h>
-#include <DataFormats/EcalDigi/interface/EEDataFrame.h>
-#include <CondFormats/EcalObjects/interface/EcalTPGFineGrainStripEE.h>
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include <CondFormats/EcalObjects/interface/EcalTPGFineGrainStripEE.h>
+#include <DataFormats/EcalDigi/interface/EEDataFrame.h>
+#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFgvbEE.h>
 #include <iostream>
 
-EcalFenixStripFgvbEE::EcalFenixStripFgvbEE()
-{
-  identif_=0;
-  flagBadStripMiss_=false;
+EcalFenixStripFgvbEE::EcalFenixStripFgvbEE() {
+  identif_ = 0;
+  flagBadStripMiss_ = false;
 }
 
-EcalFenixStripFgvbEE::~EcalFenixStripFgvbEE(){
-}
+EcalFenixStripFgvbEE::~EcalFenixStripFgvbEE() {}
 
-void EcalFenixStripFgvbEE::process( std::vector<std::vector<int> > &linout ,std::vector<int> & output)
-{
+void EcalFenixStripFgvbEE::process(std::vector<std::vector<int>> &linout,
+                                   std::vector<int> &output) {
   std::vector<int> indexLut(output.size());
 
-  for (unsigned int i=0;i<output.size();i++) {
-    output[i]=0;
-    indexLut[i]=0;
-    for (unsigned int ixtal=0;ixtal<linout.size();ixtal++) {
-      int adc=linout[ixtal][i];
-      int res = (((adc & 0xffff) > threshold_fg_) || ((adc & 0x30000) != 0x0)) ? 1 : 0;
+  for (unsigned int i = 0; i < output.size(); i++) {
+    output[i] = 0;
+    indexLut[i] = 0;
+    for (unsigned int ixtal = 0; ixtal < linout.size(); ixtal++) {
+      int adc = linout[ixtal][i];
+      int res = (((adc & 0xffff) > threshold_fg_) || ((adc & 0x30000) != 0x0))
+                    ? 1
+                    : 0;
       indexLut[i] = indexLut[i] | (res << ixtal);
     }
-    int mask = 1<<(indexLut[i]);
-    output[i]= ((lut_fg_ & mask) == 0x0) ? 0 : 1;
-    if(i > 0) output[i-1] = output[i]; // Delay one clock
+    int mask = 1 << (indexLut[i]);
+    output[i] = ((lut_fg_ & mask) == 0x0) ? 0 : 1;
+    if (i > 0)
+      output[i - 1] = output[i]; // Delay one clock
   }
   return;
-}  
+}
 
-void EcalFenixStripFgvbEE::setParameters(int identif, uint32_t id,const EcalTPGFineGrainStripEE * ecaltpgFgStripEE)
-{
-  const EcalTPGFineGrainStripEEMap &fgmap = ecaltpgFgStripEE -> getMap();
-  EcalTPGFineGrainStripEEMapIterator it=fgmap.find(id);
-  if (it!=fgmap.end()){
-     threshold_fg_ = it->second.threshold;
-     lut_fg_ = it->second.lut;
-  }
-  else
-  {
-     if (identif == false){
-       edm::LogWarning("EcalTPG")<<" could not find EcalTPGFineGrainStripEEMap entry for at least one stripId";
-       flagBadStripMiss_ = true;
-     }
-     
-     // Use the FENIX power-up values
-     threshold_fg_ = 65535;
-     lut_fg_ = 0x0;
-  }
+void EcalFenixStripFgvbEE::setParameters(
+    int identif, uint32_t id, const EcalTPGFineGrainStripEE *ecaltpgFgStripEE) {
+  const EcalTPGFineGrainStripEEMap &fgmap = ecaltpgFgStripEE->getMap();
+  EcalTPGFineGrainStripEEMapIterator it = fgmap.find(id);
+  if (it != fgmap.end()) {
+    threshold_fg_ = it->second.threshold;
+    lut_fg_ = it->second.lut;
+  } else {
+    if (identif == false) {
+      edm::LogWarning("EcalTPG")
+          << " could not find EcalTPGFineGrainStripEEMap entry for at least "
+             "one stripId";
+      flagBadStripMiss_ = true;
+    }
 
+    // Use the FENIX power-up values
+    threshold_fg_ = 65535;
+    lut_fg_ = 0x0;
+  }
 }
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixStripFormatEB.cc b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixStripFormatEB.cc
index e23e2210d469a..5e42f86d9fcf5 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixStripFormatEB.cc
+++ b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixStripFormatEB.cc
@@ -1,55 +1,58 @@
-#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFormatEB.h>
-#include <CondFormats/EcalObjects/interface/EcalTPGSlidingWindow.h>
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include <CondFormats/EcalObjects/interface/EcalTPGSlidingWindow.h>
+#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFormatEB.h>
+
+EcalFenixStripFormatEB::EcalFenixStripFormatEB() : shift_(0) {}
 
-  EcalFenixStripFormatEB::EcalFenixStripFormatEB() 
-    : shift_(0)
-{
+EcalFenixStripFormatEB::~EcalFenixStripFormatEB() {}
+
+int EcalFenixStripFormatEB::setInput(int input, int inputPeak, int inputsFGVB) {
+  inputsFGVB_ = inputsFGVB;
+  inputPeak_ = inputPeak;
+  input_ = input;
+  return 0;
 }
 
-  EcalFenixStripFormatEB::~EcalFenixStripFormatEB() {
-  }
+int EcalFenixStripFormatEB::process() {
+  //    buffer_=input_>>shift_;  //FIXME: buffer why?
+
+  if (inputPeak_ == 0)
+    return ((inputsFGVB_ & 0x1) << 12);
+  //    int output=buffer_;
+  int output = input_ >> shift_;
+  if (output > 0XFFF)
+    output = 0XFFF; // ok: barrel saturates at 12 bits
+  // Add stripFGVB
+  output |= ((inputsFGVB_ & 0x1) << 12);
+
+  return output;
+}
 
-  int EcalFenixStripFormatEB::setInput(int input, int inputPeak, int inputsFGVB) 
-  {
-    inputsFGVB_ = inputsFGVB;
-    inputPeak_=inputPeak;
-    input_=input;
-    return 0;
-  }  
-  
-  int EcalFenixStripFormatEB::process()
-  {
-    //    buffer_=input_>>shift_;  //FIXME: buffer why?
-
-    if(inputPeak_==0) return ((inputsFGVB_&0x1)<<12);
-    //    int output=buffer_;
-    int output=input_>>shift_;
-    if(output>0XFFF) output=0XFFF;   //ok: barrel saturates at 12 bits
-    // Add stripFGVB
-    output |= ((inputsFGVB_&0x1)<<12);
-   
-    return output;    
-  } 
-
-void EcalFenixStripFormatEB::process(std::vector<int> &sFGVBout, std::vector<int> &peakout, std::vector<int> &filtout, std::vector<int> & output)
-{
-  if  (peakout.size()!=filtout.size() || sFGVBout.size()!=filtout.size()){
-    edm::LogWarning("EcalTPG")<<" problem in EcalFenixStripFormatEB: sfgvb_out, peak_out and filt_out don't have the same size";
+void EcalFenixStripFormatEB::process(std::vector<int> &sFGVBout,
+                                     std::vector<int> &peakout,
+                                     std::vector<int> &filtout,
+                                     std::vector<int> &output) {
+  if (peakout.size() != filtout.size() || sFGVBout.size() != filtout.size()) {
+    edm::LogWarning("EcalTPG")
+        << " problem in EcalFenixStripFormatEB: sfgvb_out, peak_out and "
+           "filt_out don't have the same size";
   }
-  for  (unsigned int i =0;i<filtout.size();i++){
-    setInput(filtout[i],peakout[i], sFGVBout[i]);
+  for (unsigned int i = 0; i < filtout.size(); i++) {
+    setInput(filtout[i], peakout[i], sFGVBout[i]);
 
-    output[i]=process();
+    output[i] = process();
   }
   return;
 }
 
-void EcalFenixStripFormatEB::setParameters(uint32_t& id, const EcalTPGSlidingWindow*& slWin)
-{
+void EcalFenixStripFormatEB::setParameters(uint32_t &id,
+                                           const EcalTPGSlidingWindow *&slWin) {
 
-  const EcalTPGSlidingWindowMap &slwinmap = slWin -> getMap();
-  EcalTPGSlidingWindowMapIterator it=slwinmap.find(id);
-  if (it!=slwinmap.end()) shift_=(*it).second;
-  else edm::LogWarning("EcalTPG")<<" could not find EcalTPGSlidingWindowMap entry for "<<id;
+  const EcalTPGSlidingWindowMap &slwinmap = slWin->getMap();
+  EcalTPGSlidingWindowMapIterator it = slwinmap.find(id);
+  if (it != slwinmap.end())
+    shift_ = (*it).second;
+  else
+    edm::LogWarning("EcalTPG")
+        << " could not find EcalTPGSlidingWindowMap entry for " << id;
 }
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixStripFormatEE.cc b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixStripFormatEE.cc
index b3256abbce5a1..fa781982fb173 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixStripFormatEE.cc
+++ b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixStripFormatEE.cc
@@ -1,79 +1,84 @@
-#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFormatEE.h>
 #include <CondFormats/EcalObjects/interface/EcalTPGSlidingWindow.h>
 #include <CondFormats/EcalObjects/interface/EcalTPGStripStatus.h>
+#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStripFormatEE.h>
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <iostream>
 
-
 //-----------------------------------------------------------------------------------------
-EcalFenixStripFormatEE::EcalFenixStripFormatEE() 
-  : shift_(0)
-{
-}
+EcalFenixStripFormatEE::EcalFenixStripFormatEE() : shift_(0) {}
 //------------------------------------------------------------------------------------------
 
-EcalFenixStripFormatEE::~EcalFenixStripFormatEE() {
-}
+EcalFenixStripFormatEE::~EcalFenixStripFormatEE() {}
 
 //-----------------------------------------------------------------------------------------
 
-
-int EcalFenixStripFormatEE::setInput(int input, int inputPeak, int fgvb ) {
-  inputPeak_=inputPeak;
-  input_=input;
-  fgvb_=fgvb;
+int EcalFenixStripFormatEE::setInput(int input, int inputPeak, int fgvb) {
+  inputPeak_ = inputPeak;
+  input_ = input;
+  fgvb_ = fgvb;
   return 0;
-}  
+}
 //-----------------------------------------------------------------------------------------
-  
-int EcalFenixStripFormatEE::process(){
+
+int EcalFenixStripFormatEE::process() {
   // Bad strip - zero everything
-  if(stripStatus_ != 0) return 0;
+  if (stripStatus_ != 0)
+    return 0;
 
   // Peak not found - only return fgvb
-  if(inputPeak_==0) return ((fgvb_ & 0x1) << 12);
-    
-  int output=input_>>shift_;
+  if (inputPeak_ == 0)
+    return ((fgvb_ & 0x1) << 12);
+
+  int output = input_ >> shift_;
 
-  //barrel saturates at 12 bits, endcap at 10!
+  // barrel saturates at 12 bits, endcap at 10!
   // Pascal: finally no,endcap has 12 bits as in EB (bug in FENIX!!!!)
-  if(output>0XFFF) output=0XFFF; 
-  output=output|((fgvb_ & 0x1) << 12); //Pascal (was 10)
+  if (output > 0XFFF)
+    output = 0XFFF;
+  output = output | ((fgvb_ & 0x1) << 12); // Pascal (was 10)
 
-  return output;    
-} 
+  return output;
+}
 //------------------------------------------------------------------------------------------
 
-void EcalFenixStripFormatEE::process(std::vector<int> &fgvbout,std::vector<int> &peakout,
-				     std::vector<int> &filtout, std::vector<int> &output){
-  if  (peakout.size()!=filtout.size()){
-    edm::LogWarning("EcalTPG")<<" problem in EcalFenixStripFormatEE: peak_out and filt_out don't have the same size";
-    std::cout<<" Size peak_out"<< peakout.size()<<", size filt_out:"<<filtout.size()<<std::flush<<std::endl;
+void EcalFenixStripFormatEE::process(std::vector<int> &fgvbout,
+                                     std::vector<int> &peakout,
+                                     std::vector<int> &filtout,
+                                     std::vector<int> &output) {
+  if (peakout.size() != filtout.size()) {
+    edm::LogWarning("EcalTPG")
+        << " problem in EcalFenixStripFormatEE: peak_out and filt_out don't "
+           "have the same size";
+    std::cout << " Size peak_out" << peakout.size()
+              << ", size filt_out:" << filtout.size() << std::flush
+              << std::endl;
   }
-  for  (unsigned int i =0;i<filtout.size();i++){
-    setInput(filtout[i],peakout[i],fgvbout[i]);
-    output[i]=process();
+  for (unsigned int i = 0; i < filtout.size(); i++) {
+    setInput(filtout[i], peakout[i], fgvbout[i]);
+    output[i] = process();
   }
   return;
 }
 //-----------------------------------------------------------------------------------------
 
-void EcalFenixStripFormatEE::setParameters(uint32_t id,const EcalTPGSlidingWindow*& slWin,const EcalTPGStripStatus *stripStatus){
+void EcalFenixStripFormatEE::setParameters(
+    uint32_t id, const EcalTPGSlidingWindow *&slWin,
+    const EcalTPGStripStatus *stripStatus) {
 
-  const EcalTPGSlidingWindowMap &slwinmap = slWin -> getMap();
-  EcalTPGSlidingWindowMapIterator it=slwinmap.find(id);
-  if (it!=slwinmap.end()) shift_=(*it).second;
-  else edm::LogWarning("EcalTPG")<<" could not find EcalTPGSlidingWindowMap entry for "<<id;
+  const EcalTPGSlidingWindowMap &slwinmap = slWin->getMap();
+  EcalTPGSlidingWindowMapIterator it = slwinmap.find(id);
+  if (it != slwinmap.end())
+    shift_ = (*it).second;
+  else
+    edm::LogWarning("EcalTPG")
+        << " could not find EcalTPGSlidingWindowMap entry for " << id;
 
   const EcalTPGStripStatusMap &statusMap = stripStatus->getMap();
   EcalTPGStripStatusMapIterator sit = statusMap.find(id);
-  if(sit != statusMap.end())
-  {
+  if (sit != statusMap.end()) {
     stripStatus_ = (*sit).second;
-  }
-  else
-  {
+  } else {
     stripStatus_ = 0; // Assume strip OK
   }
 }
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixTcp.cc b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixTcp.cc
index 789ae57e54cc3..1a04b987b0b4b 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixTcp.cc
+++ b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixTcp.cc
@@ -2,207 +2,222 @@
 #include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpFormat.h>
 
 #include "CondFormats/EcalObjects/interface/EcalTPGFineGrainEBGroup.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGLutGroup.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGLutIdMap.h"
 #include "CondFormats/EcalObjects/interface/EcalTPGFineGrainEBIdMap.h"
 #include "CondFormats/EcalObjects/interface/EcalTPGFineGrainTowerEE.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGLutGroup.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGLutIdMap.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
 
 #include <vector>
 //----------------------------------------------------------------------------------------
-EcalFenixTcp::EcalFenixTcp(const edm::EventSetup& setup,bool tcpFormat, bool debug,bool famos, int binOfMax, int maxNrSamples, int nbMaxStrips): debug_(debug),nbMaxStrips_(nbMaxStrips)
- { 
-    bypasslin_.resize(nbMaxStrips_);
-    for (int i=0;i<nbMaxStrips_;i++) bypasslin_[i] = new EcalFenixBypassLin();
-    adder_= new EcalFenixEtTot();
-    maxOf2_=new EcalFenixMaxof2(maxNrSamples,nbMaxStrips_);
-    formatter_= new EcalFenixTcpFormat(tcpFormat, debug_, famos, binOfMax);
-    fgvbEB_= new EcalFenixFgvbEB(maxNrSamples);
-    fgvbEE_= new EcalFenixTcpFgvbEE(maxNrSamples);
-    sfgvbEB_ = new EcalFenixTcpsFgvbEB();
-
-    // permanent data structures
-    bypasslin_out_.resize(nbMaxStrips_);
-    std::vector<int> vec(maxNrSamples,0);
-    for (int i=0;i<nbMaxStrips_;i++) bypasslin_out_[i]=vec;
-    adder_out_.resize(maxNrSamples);
-    maxOf2_out_.resize(maxNrSamples);
-    fgvb_out_.resize(maxNrSamples);
-    strip_fgvb_out_.resize(maxNrSamples);
+EcalFenixTcp::EcalFenixTcp(const edm::EventSetup &setup, bool tcpFormat,
+                           bool debug, bool famos, int binOfMax,
+                           int maxNrSamples, int nbMaxStrips)
+    : debug_(debug), nbMaxStrips_(nbMaxStrips) {
+  bypasslin_.resize(nbMaxStrips_);
+  for (int i = 0; i < nbMaxStrips_; i++)
+    bypasslin_[i] = new EcalFenixBypassLin();
+  adder_ = new EcalFenixEtTot();
+  maxOf2_ = new EcalFenixMaxof2(maxNrSamples, nbMaxStrips_);
+  formatter_ = new EcalFenixTcpFormat(tcpFormat, debug_, famos, binOfMax);
+  fgvbEB_ = new EcalFenixFgvbEB(maxNrSamples);
+  fgvbEE_ = new EcalFenixTcpFgvbEE(maxNrSamples);
+  sfgvbEB_ = new EcalFenixTcpsFgvbEB();
+
+  // permanent data structures
+  bypasslin_out_.resize(nbMaxStrips_);
+  std::vector<int> vec(maxNrSamples, 0);
+  for (int i = 0; i < nbMaxStrips_; i++)
+    bypasslin_out_[i] = vec;
+  adder_out_.resize(maxNrSamples);
+  maxOf2_out_.resize(maxNrSamples);
+  fgvb_out_.resize(maxNrSamples);
+  strip_fgvb_out_.resize(maxNrSamples);
+}
+//-----------------------------------------------------------------------------------------
+EcalFenixTcp::~EcalFenixTcp() {
+  for (int i = 0; i < nbMaxStrips_; i++)
+    delete bypasslin_[i];
+  delete adder_;
+  delete maxOf2_;
+  delete formatter_;
+  delete fgvbEB_;
+  delete fgvbEE_;
+}
+//-----------------------------------------------------------------------------------------
 
-  }
-//-----------------------------------------------------------------------------------------  
-  EcalFenixTcp::~EcalFenixTcp() {
-    for (int i=0;i<nbMaxStrips_;i++) delete bypasslin_[i];
-    delete adder_; 
-    delete maxOf2_;
-    delete formatter_;
-    delete fgvbEB_;
-    delete fgvbEE_;
-  }
-//-----------------------------------------------------------------------------------------  
-
-void EcalFenixTcp::process(const edm::EventSetup& setup,
-                           std::vector <EBDataFrame> &bid,             //dummy argument for template call 
-			   std::vector<std::vector<int> > & tpframetow, int nStr,
-			   std::vector< EcalTriggerPrimitiveSample> & tptow,
-			   std::vector< EcalTriggerPrimitiveSample> & tptow2,
-			   bool isInInnerRing, EcalTrigTowerDetId towid) 
-{
+void EcalFenixTcp::process(
+    const edm::EventSetup &setup,
+    std::vector<EBDataFrame> &bid, // dummy argument for template call
+    std::vector<std::vector<int>> &tpframetow, int nStr,
+    std::vector<EcalTriggerPrimitiveSample> &tptow,
+    std::vector<EcalTriggerPrimitiveSample> &tptow2, bool isInInnerRing,
+    EcalTrigTowerDetId towid) {
 
-  int bitMask=12; 
-  process_part1(tpframetow,nStr,bitMask);
+  int bitMask = 12;
+  process_part1(tpframetow, nStr, bitMask);
 
- 
-process_part2_barrel(tpframetow,nStr,bitMask,ecaltpgFgEBGroup_,ecaltpgLutGroup_,ecaltpgLut_,ecaltpgFineGrainEB_,ecaltpgBadTT_,ecaltpgSpike_,tptow,tptow2,towid);
+  process_part2_barrel(tpframetow, nStr, bitMask, ecaltpgFgEBGroup_,
+                       ecaltpgLutGroup_, ecaltpgLut_, ecaltpgFineGrainEB_,
+                       ecaltpgBadTT_, ecaltpgSpike_, tptow, tptow2, towid);
 }
- 
-//-----------------------------------------------------------------------------------------  
-void EcalFenixTcp::process(const edm::EventSetup& setup,
-                           std::vector <EEDataFrame> &bid,  //dummy argument for template call 
-			   std::vector<std::vector<int> > & tpframetow, int nStr,
-			   std::vector< EcalTriggerPrimitiveSample> & tptow,
-			   std::vector< EcalTriggerPrimitiveSample> & tptow2,
-			   bool isInInnerRing, EcalTrigTowerDetId towid) 
-{
-  int bitMask=12; // Pascal: endcap has 12 bits as in EB (bug in FENIX!!!!) {was 10 before]
-  process_part1(tpframetow,nStr,bitMask);
- 
-  process_part2_endcap(tpframetow,nStr,bitMask,ecaltpgLutGroup_,ecaltpgLut_,ecaltpgFineGrainTowerEE_,ecaltpgBadTT_,tptow,tptow2,isInInnerRing, towid);
+
+//-----------------------------------------------------------------------------------------
+void EcalFenixTcp::process(
+    const edm::EventSetup &setup,
+    std::vector<EEDataFrame> &bid, // dummy argument for template call
+    std::vector<std::vector<int>> &tpframetow, int nStr,
+    std::vector<EcalTriggerPrimitiveSample> &tptow,
+    std::vector<EcalTriggerPrimitiveSample> &tptow2, bool isInInnerRing,
+    EcalTrigTowerDetId towid) {
+  int bitMask = 12; // Pascal: endcap has 12 bits as in EB (bug in FENIX!!!!)
+                    // {was 10 before]
+  process_part1(tpframetow, nStr, bitMask);
+
+  process_part2_endcap(tpframetow, nStr, bitMask, ecaltpgLutGroup_, ecaltpgLut_,
+                       ecaltpgFineGrainTowerEE_, ecaltpgBadTT_, tptow, tptow2,
+                       isInInnerRing, towid);
 }
-//----------------------------------------------------------------------------------------- 
-void EcalFenixTcp::process_part1(std::vector<std::vector<int> > &tpframetow, int nStr, int bitMask)
-{
-//  //call bypasslin
-//     for (int istrip=0;istrip<nStr;istrip ++){
-//       this->getBypasslin(istrip)->process(tpframetow[istrip],bypasslin_out_[istrip]);
-//     }
-//     //this is a test
-//     if (debug_) {
-//       std::cout<<"bypasslinout = "<<std::endl;
-//       for (int istrip=0;istrip<nStr;istrip ++){
-// 	std::vector<int> stripin= bypasslin_out_[istrip];
-// 	for (unsigned int is=0;is<stripin.size();is++){
-// 	  std::cout<<stripin[is]<<" ";
-// 	}
-// 	std::cout<<std::endl;
-//       }
-//     }
-
-//     //call adder
-//     this->getAdder()->process(bypasslin_out_, nStr, bitMask,adder_out_);
-     this->getAdder()->process(tpframetow, nStr, bitMask,adder_out_);
-    //this is a test:
-    if (debug_) {
-      std::cout<< "output of adder is a vector of size: "<<adder_out_.size()<<std::endl; 
-      std::cout<< "value : "<<std::endl;
-      for (unsigned int i =0; i<adder_out_.size();i++){
-	std::cout <<" "<<adder_out_[i];
-      }    
-      std::cout<<std::endl;
+//-----------------------------------------------------------------------------------------
+void EcalFenixTcp::process_part1(std::vector<std::vector<int>> &tpframetow,
+                                 int nStr, int bitMask) {
+  //  //call bypasslin
+  //     for (int istrip=0;istrip<nStr;istrip ++){
+  //       this->getBypasslin(istrip)->process(tpframetow[istrip],bypasslin_out_[istrip]);
+  //     }
+  //     //this is a test
+  //     if (debug_) {
+  //       std::cout<<"bypasslinout = "<<std::endl;
+  //       for (int istrip=0;istrip<nStr;istrip ++){
+  // 	std::vector<int> stripin= bypasslin_out_[istrip];
+  // 	for (unsigned int is=0;is<stripin.size();is++){
+  // 	  std::cout<<stripin[is]<<" ";
+  // 	}
+  // 	std::cout<<std::endl;
+  //       }
+  //     }
+
+  //     //call adder
+  //     this->getAdder()->process(bypasslin_out_, nStr, bitMask,adder_out_);
+  this->getAdder()->process(tpframetow, nStr, bitMask, adder_out_);
+  // this is a test:
+  if (debug_) {
+    std::cout << "output of adder is a vector of size: " << adder_out_.size()
+              << std::endl;
+    std::cout << "value : " << std::endl;
+    for (unsigned int i = 0; i < adder_out_.size(); i++) {
+      std::cout << " " << adder_out_[i];
     }
-    //    return adder_out;
-    return;
-    
+    std::cout << std::endl;
+  }
+  //    return adder_out;
+  return;
 }
 //-----------------------------------------------------------------------------------------
-void EcalFenixTcp::process_part2_barrel(std::vector<std::vector<int> > & bypasslinout,
-                                        int nStr, int bitMask,
-                                        const EcalTPGFineGrainEBGroup *ecaltpgFgEBGroup,
-                                        const EcalTPGLutGroup *ecaltpgLutGroup,
-                                        const EcalTPGLutIdMap *ecaltpgLut,
-                                        const EcalTPGFineGrainEBIdMap *ecaltpgFineGrainEB,
-					const EcalTPGTowerStatus *ecaltpgBadTT,
-                                        const EcalTPGSpike * ecaltpgSpike,
-					std::vector< EcalTriggerPrimitiveSample> & tcp_out,
-                                        std::vector< EcalTriggerPrimitiveSample> & tcp_outTcc,
-					EcalTrigTowerDetId towid)
-{
-  //call maxof2
+void EcalFenixTcp::process_part2_barrel(
+    std::vector<std::vector<int>> &bypasslinout, int nStr, int bitMask,
+    const EcalTPGFineGrainEBGroup *ecaltpgFgEBGroup,
+    const EcalTPGLutGroup *ecaltpgLutGroup, const EcalTPGLutIdMap *ecaltpgLut,
+    const EcalTPGFineGrainEBIdMap *ecaltpgFineGrainEB,
+    const EcalTPGTowerStatus *ecaltpgBadTT, const EcalTPGSpike *ecaltpgSpike,
+    std::vector<EcalTriggerPrimitiveSample> &tcp_out,
+    std::vector<EcalTriggerPrimitiveSample> &tcp_outTcc,
+    EcalTrigTowerDetId towid) {
+  // call maxof2
   //  this->getMaxOf2()->process(bypasslin_out_,nStr,maxOf2_out_);
-  this->getMaxOf2()->process(bypasslinout,nStr,bitMask,maxOf2_out_);
+  this->getMaxOf2()->process(bypasslinout, nStr, bitMask, maxOf2_out_);
   // this is a test:
   if (debug_) {
-    std::cout<< "output of maxof2 is a vector of size: "<<maxOf2_out_.size()<<std::endl; 
-    std::cout<< "value : "<<std::endl;
-    for (unsigned int i =0; i<maxOf2_out_.size();i++){
-      std::cout <<" "<<std::dec<<maxOf2_out_[i];
-    }    
-    std::cout<<std::endl;
+    std::cout << "output of maxof2 is a vector of size: " << maxOf2_out_.size()
+              << std::endl;
+    std::cout << "value : " << std::endl;
+    for (unsigned int i = 0; i < maxOf2_out_.size(); i++) {
+      std::cout << " " << std::dec << maxOf2_out_[i];
+    }
+    std::cout << std::endl;
   }
-   
-  //call fgvb
 
-  this->getFGVBEB()->setParameters(towid.rawId(),ecaltpgFgEBGroup,ecaltpgFineGrainEB);
-  this->getFGVBEB()->process(adder_out_,maxOf2_out_,fgvb_out_);
+  // call fgvb
+
+  this->getFGVBEB()->setParameters(towid.rawId(), ecaltpgFgEBGroup,
+                                   ecaltpgFineGrainEB);
+  this->getFGVBEB()->process(adder_out_, maxOf2_out_, fgvb_out_);
 
   // Call sFGVB
-  this->getsFGVBEB()->process(bypasslinout,nStr,bitMask,strip_fgvb_out_);
+  this->getsFGVBEB()->process(bypasslinout, nStr, bitMask, strip_fgvb_out_);
 
-  //this is a test:
+  // this is a test:
   if (debug_) {
-    std::cout<< "output of fgvb is a vector of size: "<<fgvb_out_.size()<<std::endl; 
-    std::cout<< "value : "<<std::endl;
-    for (unsigned int i =0; i<fgvb_out_.size();i++){
-      std::cout <<" "<<std::dec<<fgvb_out_[i];
-    }    
-    std::cout<<std::endl;
+    std::cout << "output of fgvb is a vector of size: " << fgvb_out_.size()
+              << std::endl;
+    std::cout << "value : " << std::endl;
+    for (unsigned int i = 0; i < fgvb_out_.size(); i++) {
+      std::cout << " " << std::dec << fgvb_out_[i];
+    }
+    std::cout << std::endl;
   }
 
   // call formatter
-  int eTTotShift=2;
- 
-  this->getFormatter()->setParameters(towid.rawId(),ecaltpgLutGroup,ecaltpgLut,ecaltpgBadTT,ecaltpgSpike);
-  this->getFormatter()->process(adder_out_,fgvb_out_,strip_fgvb_out_,eTTotShift,tcp_out,tcp_outTcc,false);
-  //this is a test:
+  int eTTotShift = 2;
+
+  this->getFormatter()->setParameters(towid.rawId(), ecaltpgLutGroup,
+                                      ecaltpgLut, ecaltpgBadTT, ecaltpgSpike);
+  this->getFormatter()->process(adder_out_, fgvb_out_, strip_fgvb_out_,
+                                eTTotShift, tcp_out, tcp_outTcc, false);
+  // this is a test:
   if (debug_) {
-    std::cout<< "output of TCP formatter Barrel is a vector of size: "<<std::dec<<tcp_out.size()<<std::endl; 
-    std::cout<< "value : "<<std::endl;
-    for (unsigned int i =0; i<tcp_out.size();i++){
-      std::cout <<" "<<i<<" "<<std::dec<<tcp_out[i];
-    }    
-    std::cout<<std::endl;
+    std::cout << "output of TCP formatter Barrel is a vector of size: "
+              << std::dec << tcp_out.size() << std::endl;
+    std::cout << "value : " << std::endl;
+    for (unsigned int i = 0; i < tcp_out.size(); i++) {
+      std::cout << " " << i << " " << std::dec << tcp_out[i];
+    }
+    std::cout << std::endl;
   }
-    
+
   return;
 }
 //-----------------------------------------------------------------------------------------
-void EcalFenixTcp::process_part2_endcap(std::vector<std::vector<int> > & bypasslinout, int nStr, int bitMask,
-                                        const EcalTPGLutGroup *ecaltpgLutGroup,
-                                        const EcalTPGLutIdMap *ecaltpgLut,
-                                        const EcalTPGFineGrainTowerEE *ecaltpgFineGrainTowerEE,
-					const EcalTPGTowerStatus *ecaltpgbadTT,
-					std::vector< EcalTriggerPrimitiveSample> & tcp_out,
-                                        std::vector< EcalTriggerPrimitiveSample> & tcp_outTcc,bool isInInnerRings,					
-					EcalTrigTowerDetId towid)
+void EcalFenixTcp::process_part2_endcap(
+    std::vector<std::vector<int>> &bypasslinout, int nStr, int bitMask,
+    const EcalTPGLutGroup *ecaltpgLutGroup, const EcalTPGLutIdMap *ecaltpgLut,
+    const EcalTPGFineGrainTowerEE *ecaltpgFineGrainTowerEE,
+    const EcalTPGTowerStatus *ecaltpgbadTT,
+    std::vector<EcalTriggerPrimitiveSample> &tcp_out,
+    std::vector<EcalTriggerPrimitiveSample> &tcp_outTcc, bool isInInnerRings,
+    EcalTrigTowerDetId towid)
 
 {
   // Zero EB strip records
-  for(unsigned int i = 0; i < strip_fgvb_out_.size(); ++i)
-  {
+  for (unsigned int i = 0; i < strip_fgvb_out_.size(); ++i) {
     strip_fgvb_out_[i] = 0;
   }
 
-  //call fgvb
-  this->getFGVBEE()->setParameters(towid.rawId(),ecaltpgFineGrainTowerEE);
+  // call fgvb
+  this->getFGVBEE()->setParameters(towid.rawId(), ecaltpgFineGrainTowerEE);
   //  fgvbEE_->process(bypasslin_out_,nStr,bitMask,fgvb_out_);
-  fgvbEE_->process(bypasslinout,nStr,bitMask,fgvb_out_);
+  fgvbEE_->process(bypasslinout, nStr, bitMask, fgvb_out_);
 
-  //call formatter
-  int eTTotShift=2; // Pascal: endcap has 12 bits as in EB (bug in FENIX!!!!) so shift must be applied to just keep [11:2]
+  // call formatter
+  int eTTotShift = 2; // Pascal: endcap has 12 bits as in EB (bug in FENIX!!!!)
+                      // so shift must be applied to just keep [11:2]
 
-  this->getFormatter()->setParameters(towid.rawId(),ecaltpgLutGroup,ecaltpgLut,ecaltpgbadTT,nullptr);
+  this->getFormatter()->setParameters(towid.rawId(), ecaltpgLutGroup,
+                                      ecaltpgLut, ecaltpgbadTT, nullptr);
 
-  this->getFormatter()->process(adder_out_,fgvb_out_,strip_fgvb_out_,eTTotShift,tcp_out,tcp_outTcc,isInInnerRings);
-  //this is a test:
+  this->getFormatter()->process(adder_out_, fgvb_out_, strip_fgvb_out_,
+                                eTTotShift, tcp_out, tcp_outTcc,
+                                isInInnerRings);
+  // this is a test:
   if (debug_) {
-    std::cout<< "output of TCP formatter(endcap) is a vector of size: "<<std::dec<<tcp_out.size()<<std::endl; 
-    std::cout<< "value : "<<std::endl;
-    for (unsigned int i =0; i<tcp_out.size();i++){
-      std::cout <<" "<<i<<" "<<std::dec<<tcp_out[i]<<std::endl;
-    }    
-    std::cout<<std::endl;
+    std::cout << "output of TCP formatter(endcap) is a vector of size: "
+              << std::dec << tcp_out.size() << std::endl;
+    std::cout << "value : " << std::endl;
+    for (unsigned int i = 0; i < tcp_out.size(); i++) {
+      std::cout << " " << i << " " << std::dec << tcp_out[i] << std::endl;
+    }
+    std::cout << std::endl;
   }
   return;
 }
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixTcpFgvbEE.cc b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixTcpFgvbEE.cc
index 598bba83c8ced..d048e92f49448 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixTcpFgvbEE.cc
+++ b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixTcpFgvbEE.cc
@@ -1,74 +1,52 @@
-#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpFgvbEE.h>
 #include "CondFormats/EcalObjects/interface/EcalTPGFineGrainTowerEE.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpFgvbEE.h>
 #include <iostream>
 
 //---------------------------------------------------------------
-EcalFenixTcpFgvbEE::EcalFenixTcpFgvbEE(int maxNrSamples)
-{
-  indexLut_.resize(maxNrSamples); 
-}//---------------------------------------------------------------
-EcalFenixTcpFgvbEE::~EcalFenixTcpFgvbEE()
-{
-}
+EcalFenixTcpFgvbEE::EcalFenixTcpFgvbEE(int maxNrSamples) {
+  indexLut_.resize(maxNrSamples);
+} //---------------------------------------------------------------
+EcalFenixTcpFgvbEE::~EcalFenixTcpFgvbEE() {}
 //---------------------------------------------------------------
-void EcalFenixTcpFgvbEE::process(std::vector<std::vector<int> > & bypasslin_out, int nStr,int bitMask,std::vector<int> & output)
-{
+void EcalFenixTcpFgvbEE::process(std::vector<std::vector<int>> &bypasslin_out,
+                                 int nStr, int bitMask,
+                                 std::vector<int> &output) {
   //  std::vector<int> indexLut(output.size());
-  
-  for (unsigned int i=0;i<output.size();i++) {
-    output[i]=0;
-    indexLut_[i]=0;
+
+  for (unsigned int i = 0; i < output.size(); i++) {
+    output[i] = 0;
+    indexLut_[i] = 0;
   }
-    
-  for (unsigned int i=0;i<output.size();i++) {
-    for (int istrip=0;istrip<nStr;istrip++) {
-      int res = (bypasslin_out[istrip])[i]; 
-      res = (res >>bitMask) & 1; //res is FGVB at this stage
-      indexLut_[i]= indexLut_[i] | (res << istrip);
+
+  for (unsigned int i = 0; i < output.size(); i++) {
+    for (int istrip = 0; istrip < nStr; istrip++) {
+      int res = (bypasslin_out[istrip])[i];
+      res = (res >> bitMask) & 1; // res is FGVB at this stage
+      indexLut_[i] = indexLut_[i] | (res << istrip);
     }
-    indexLut_[i]= indexLut_[i] | (nStr << 5);
-     
-    int mask = 1<<indexLut_[i];
-    output[i]= fgee_lut_ & mask;
-    if (output[i]>0) output[i]=1;
+    indexLut_[i] = indexLut_[i] | (nStr << 5);
+
+    int mask = 1 << indexLut_[i];
+    output[i] = fgee_lut_ & mask;
+    if (output[i] > 0)
+      output[i] = 1;
   }
   return;
-} 
-
-//------------------------------------------------------------------- 
-
-void EcalFenixTcpFgvbEE::setParameters(uint32_t towid,const EcalTPGFineGrainTowerEE *ecaltpgFineGrainTowerEE)
-{
-
-  const  EcalTPGFineGrainTowerEEMap &fgee_map = ecaltpgFineGrainTowerEE -> getMap();
-
-  EcalTPGFineGrainTowerEEMapIterator it=fgee_map.find(towid);
-  if (it!=fgee_map.end()) fgee_lut_=(*it).second;
-  else edm::LogWarning("EcalTPG")<<" could not find EcalTPGFineGrainTowerEEMap for "<<towid;
 }
 
+//-------------------------------------------------------------------
 
+void EcalFenixTcpFgvbEE::setParameters(
+    uint32_t towid, const EcalTPGFineGrainTowerEE *ecaltpgFineGrainTowerEE) {
 
+  const EcalTPGFineGrainTowerEEMap &fgee_map =
+      ecaltpgFineGrainTowerEE->getMap();
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  EcalTPGFineGrainTowerEEMapIterator it = fgee_map.find(towid);
+  if (it != fgee_map.end())
+    fgee_lut_ = (*it).second;
+  else
+    edm::LogWarning("EcalTPG")
+        << " could not find EcalTPGFineGrainTowerEEMap for " << towid;
+}
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixTcpFormat.cc b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixTcpFormat.cc
index 0b7272faef77c..b85a5199d0dd1 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixTcpFormat.cc
+++ b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixTcpFormat.cc
@@ -1,127 +1,130 @@
-#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpFormat.h>
 #include "CondFormats/EcalObjects/interface/EcalTPGLutGroup.h"
 #include "CondFormats/EcalObjects/interface/EcalTPGLutIdMap.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGTowerStatus.h"
 #include "CondFormats/EcalObjects/interface/EcalTPGSpike.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGTowerStatus.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpFormat.h>
 #include <iostream>
 
-using  namespace std;
+using namespace std;
 
-EcalFenixTcpFormat::EcalFenixTcpFormat(bool tcpFormat, bool debug, bool famos,int binOfMax)
-  : tcpFormat_(tcpFormat),debug_(debug),famos_(famos),binOfMax_(binOfMax)
-{
-  status_=0;
-  badTTStatus_=&status_;
-}
- 
-EcalFenixTcpFormat::~EcalFenixTcpFormat() {
+EcalFenixTcpFormat::EcalFenixTcpFormat(bool tcpFormat, bool debug, bool famos,
+                                       int binOfMax)
+    : tcpFormat_(tcpFormat), debug_(debug), famos_(famos), binOfMax_(binOfMax) {
+  status_ = 0;
+  badTTStatus_ = &status_;
 }
 
- 
+EcalFenixTcpFormat::~EcalFenixTcpFormat() {}
+
 void EcalFenixTcpFormat::process(std::vector<int> &Et, std::vector<int> &fgvb,
-                                 std::vector<int> &sfgvb,int eTTotShift,
-				 std::vector<EcalTriggerPrimitiveSample> & out,
-				 std::vector<EcalTriggerPrimitiveSample> & out2, bool isInInnerRings){
+                                 std::vector<int> &sfgvb, int eTTotShift,
+                                 std::vector<EcalTriggerPrimitiveSample> &out,
+                                 std::vector<EcalTriggerPrimitiveSample> &out2,
+                                 bool isInInnerRings) {
   // put TP-s in the output
-  // on request also in TcpFormat    
+  // on request also in TcpFormat
   // for famos version we have to write dummies except for the middle
-  
+
   int myEt;
   if (famos_) {
-    for (unsigned int i=0; i<out.size();++i) {
-      if (i==binOfMax_-1) {
-	myEt=Et[0]>>eTTotShift;
-	if (myEt>0x3ff) myEt=0x3ff ;
-	if (isInInnerRings) myEt = myEt /2 ;
-	
-	// badTTStatus_ ==0 if the TT works
-	// badTTStatus_ !=0 if there are some problems
-	int lut_out;
-	if (*badTTStatus_!=0){
-	  lut_out = 0;
-	}
-	else
-	  lut_out = (lut_)[myEt] ;
-	
-	int ttFlag = (lut_out & 0x700) >> 8 ;
-	myEt = lut_out & 0xff ;
-	out[i]=EcalTriggerPrimitiveSample( myEt,fgvb[0],sfgvb[0],ttFlag); 
-      }
-      else out[i]=EcalTriggerPrimitiveSample( );
+    for (unsigned int i = 0; i < out.size(); ++i) {
+      if (i == binOfMax_ - 1) {
+        myEt = Et[0] >> eTTotShift;
+        if (myEt > 0x3ff)
+          myEt = 0x3ff;
+        if (isInInnerRings)
+          myEt = myEt / 2;
+
+        // badTTStatus_ ==0 if the TT works
+        // badTTStatus_ !=0 if there are some problems
+        int lut_out;
+        if (*badTTStatus_ != 0) {
+          lut_out = 0;
+        } else
+          lut_out = (lut_)[myEt];
+
+        int ttFlag = (lut_out & 0x700) >> 8;
+        myEt = lut_out & 0xff;
+        out[i] = EcalTriggerPrimitiveSample(myEt, fgvb[0], sfgvb[0], ttFlag);
+      } else
+        out[i] = EcalTriggerPrimitiveSample();
     }
-  }
-  else {
-    for (unsigned int i=0; i<Et.size();++i) {
-      int myFgvb=fgvb[i];
-      int mysFgvb=sfgvb[i];
-      //myEt=Et[i]>>eTTotShift;
-      //if (myEt>0x3ff) myEt=0x3ff ;
-      //if (isInInnerRings) myEt = myEt /2 ;  
+  } else {
+    for (unsigned int i = 0; i < Et.size(); ++i) {
+      int myFgvb = fgvb[i];
+      int mysFgvb = sfgvb[i];
+      // myEt=Et[i]>>eTTotShift;
+      // if (myEt>0x3ff) myEt=0x3ff ;
+      // if (isInInnerRings) myEt = myEt /2 ;
 
       // bug fix 091009:
-      myEt=Et[i]; 
-      if (myEt>0xfff) 
-	myEt=0xfff ;
-      if (isInInnerRings) 
-	myEt = myEt /2 ;  
-      myEt >>= eTTotShift ;
-      if (myEt>0x3ff) myEt=0x3ff ;
+      myEt = Et[i];
+      if (myEt > 0xfff)
+        myEt = 0xfff;
+      if (isInInnerRings)
+        myEt = myEt / 2;
+      myEt >>= eTTotShift;
+      if (myEt > 0x3ff)
+        myEt = 0x3ff;
 
       // Spike killing
-      if((myEt > spikeZeroThresh_) && (mysFgvb == 0))
-      {
+      if ((myEt > spikeZeroThresh_) && (mysFgvb == 0)) {
         myEt = 0;
       }
 
-	int lut_out;
-	if (*badTTStatus_!=0){
-	  lut_out = 0;
-	}
-	else
-	  lut_out = (lut_)[myEt] ;
-      
-      int ttFlag = (lut_out & 0x700) >> 8 ;
-      if (tcpFormat_)  {
-	out2[i]=EcalTriggerPrimitiveSample( ((ttFlag&0x7)<<11) | ((myFgvb & 0x1)<<10) |  (myEt & 0x3ff));
+      int lut_out;
+      if (*badTTStatus_ != 0) {
+        lut_out = 0;
+      } else
+        lut_out = (lut_)[myEt];
+
+      int ttFlag = (lut_out & 0x700) >> 8;
+      if (tcpFormat_) {
+        out2[i] = EcalTriggerPrimitiveSample(
+            ((ttFlag & 0x7) << 11) | ((myFgvb & 0x1) << 10) | (myEt & 0x3ff));
       }
-      myEt = lut_out & 0xff ;
-      out[i]=EcalTriggerPrimitiveSample( myEt,myFgvb,mysFgvb,ttFlag); 
+      myEt = lut_out & 0xff;
+      out[i] = EcalTriggerPrimitiveSample(myEt, myFgvb, mysFgvb, ttFlag);
     }
   }
 }
 
-void EcalFenixTcpFormat::setParameters(uint32_t towid,const EcalTPGLutGroup *ecaltpgLutGroup, const EcalTPGLutIdMap *ecaltpgLut, const EcalTPGTowerStatus *ecaltpgbadTT,const EcalTPGSpike * ecaltpgSpike)
-{
-  // Get TP zeroing threshold - defaut to 1023 for old data (no record found or EE)
+void EcalFenixTcpFormat::setParameters(uint32_t towid,
+                                       const EcalTPGLutGroup *ecaltpgLutGroup,
+                                       const EcalTPGLutIdMap *ecaltpgLut,
+                                       const EcalTPGTowerStatus *ecaltpgbadTT,
+                                       const EcalTPGSpike *ecaltpgSpike) {
+  // Get TP zeroing threshold - defaut to 1023 for old data (no record found or
+  // EE)
   spikeZeroThresh_ = 1023;
-  if(ecaltpgSpike != nullptr)
-  {
+  if (ecaltpgSpike != nullptr) {
     const EcalTPGSpike::EcalTPGSpikeMap &spikeMap = ecaltpgSpike->getMap();
-    EcalTPGSpike:: EcalTPGSpikeMapIterator sit = spikeMap.find(towid);
-    if(sit != spikeMap.end())
-    {
+    EcalTPGSpike::EcalTPGSpikeMapIterator sit = spikeMap.find(towid);
+    if (sit != spikeMap.end()) {
       spikeZeroThresh_ = sit->second;
     }
   }
 
-  const EcalTPGGroups::EcalTPGGroupsMap & groupmap = ecaltpgLutGroup -> getMap();
-  EcalTPGGroups::EcalTPGGroupsMapItr it=groupmap.find(towid);
-  if (it!=groupmap.end()) {
-    uint32_t lutid=(*it).second;
-    const EcalTPGLutIdMap::EcalTPGLutMap &lutmap = ecaltpgLut-> getMap();
-    EcalTPGLutIdMap::EcalTPGLutMapItr itl=lutmap.find(lutid);
-    if (itl!=lutmap.end()) {
-      lut_=(*itl).second.getLut();
-    }  else edm::LogWarning("EcalTPG")<<" could not find EcalTPGLutMap for "<<lutid;
+  const EcalTPGGroups::EcalTPGGroupsMap &groupmap = ecaltpgLutGroup->getMap();
+  EcalTPGGroups::EcalTPGGroupsMapItr it = groupmap.find(towid);
+  if (it != groupmap.end()) {
+    uint32_t lutid = (*it).second;
+    const EcalTPGLutIdMap::EcalTPGLutMap &lutmap = ecaltpgLut->getMap();
+    EcalTPGLutIdMap::EcalTPGLutMapItr itl = lutmap.find(lutid);
+    if (itl != lutmap.end()) {
+      lut_ = (*itl).second.getLut();
+    } else
+      edm::LogWarning("EcalTPG")
+          << " could not find EcalTPGLutMap for " << lutid;
 
-  }
-  else edm::LogWarning("EcalTPG")<<" could not find EcalTPGFineGrainTowerEEMap for "<<towid;
-  
-  const EcalTPGTowerStatusMap & badTTMap = ecaltpgbadTT -> getMap();
+  } else
+    edm::LogWarning("EcalTPG")
+        << " could not find EcalTPGFineGrainTowerEEMap for " << towid;
+
+  const EcalTPGTowerStatusMap &badTTMap = ecaltpgbadTT->getMap();
   EcalTPGTowerStatusMapIterator itbadTT = badTTMap.find(towid);
-  if (itbadTT!=badTTMap.end()) {
-    badTTStatus_=&(*itbadTT).second;
+  if (itbadTT != badTTMap.end()) {
+    badTTStatus_ = &(*itbadTT).second;
   }
 }
-
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixTcpsFgvbEB.cc b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixTcpsFgvbEB.cc
index ad0c5ddafa1c3..a0f74112b4c0c 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixTcpsFgvbEB.cc
+++ b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalFenixTcpsFgvbEB.cc
@@ -1,31 +1,28 @@
 #include <SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcpsFgvbEB.h>
 
 //---------------------------------------------------------------
-EcalFenixTcpsFgvbEB::EcalFenixTcpsFgvbEB()
-{
-}//---------------------------------------------------------------
-EcalFenixTcpsFgvbEB::~EcalFenixTcpsFgvbEB()
-{
-}
+EcalFenixTcpsFgvbEB::EcalFenixTcpsFgvbEB() {
+} //---------------------------------------------------------------
+EcalFenixTcpsFgvbEB::~EcalFenixTcpsFgvbEB() {}
 //---------------------------------------------------------------
-void EcalFenixTcpsFgvbEB::process(std::vector<std::vector<int> > & bypasslin_out, int nStr,int bitMask,std::vector<int> & output)
-{
+void EcalFenixTcpsFgvbEB::process(std::vector<std::vector<int>> &bypasslin_out,
+                                  int nStr, int bitMask,
+                                  std::vector<int> &output) {
   //  std::vector<int> indexLut(output.size());
-  
-  for (unsigned int i=0;i<output.size();i++) {
-    output[i]=0;
+
+  for (unsigned int i = 0; i < output.size(); i++) {
+    output[i] = 0;
   }
-    
-  for (unsigned int i=0;i<output.size();i++) {
+
+  for (unsigned int i = 0; i < output.size(); i++) {
     int towRes = 0;
-    for (int istrip=0;istrip<nStr;istrip++) {
-      int res = (bypasslin_out[istrip])[i]; 
-      res = (res >>bitMask) & 1; //res is sFGVB at this stage
+    for (int istrip = 0; istrip < nStr; istrip++) {
+      int res = (bypasslin_out[istrip])[i];
+      res = (res >> bitMask) & 1; // res is sFGVB at this stage
       towRes |= res;
     }
-     
-    output[i]= towRes;
+
+    output[i] = towRes;
   }
   return;
-} 
-
+}
diff --git a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalTrigPrimFunctionalAlgo.cc b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalTrigPrimFunctionalAlgo.cc
index e3fad2fa6ec74..cde0864688d40 100644
--- a/SimCalorimetry/EcalTrigPrimAlgos/src/EcalTrigPrimFunctionalAlgo.cc
+++ b/SimCalorimetry/EcalTrigPrimAlgos/src/EcalTrigPrimFunctionalAlgo.cc
@@ -12,69 +12,77 @@
 
  *
  ************************************************************/
-#include <string>
 #include <algorithm>
-#include <numeric>
 #include <functional>
+#include <numeric>
+#include <string>
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
-#include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "Geometry/EcalMapping/interface/EcalElectronicsMapping.h"
 #include "Geometry/EcalMapping/interface/EcalMappingRcd.h"
+#include "Geometry/Records/interface/CaloGeometryRecord.h"
 
-#include "SimCalorimetry/EcalTrigPrimAlgos/interface/EcalTrigPrimFunctionalAlgo.h"
 #include "SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixLinearizer.h"
 #include "SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixStrip.h"
 #include "SimCalorimetry/EcalTrigPrimAlgos/interface/EcalFenixTcp.h"
+#include "SimCalorimetry/EcalTrigPrimAlgos/interface/EcalTrigPrimFunctionalAlgo.h"
 
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
-#include "DataFormats/EcalDigi/interface/EBDataFrame.h"
-#include "DataFormats/EcalDigi/interface/EEDataFrame.h"
 #include "DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h"
 #include "DataFormats/EcalDetId/interface/EcalTriggerElectronicsId.h"
+#include "DataFormats/EcalDigi/interface/EBDataFrame.h"
+#include "DataFormats/EcalDigi/interface/EEDataFrame.h"
 
-#include "CondFormats/EcalObjects/interface/EcalTPGPedestals.h"
 #include "CondFormats/DataRecord/interface/EcalTPGPedestalsRcd.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGPedestals.h"
 
-#include <TTree.h>
 #include <TMath.h>
+#include <TTree.h>
 
-const unsigned int EcalTrigPrimFunctionalAlgo::nrSamples_=5;  //to be written
-const unsigned int EcalTrigPrimFunctionalAlgo::maxNrSamplesOut_=10;  
-const unsigned int EcalTrigPrimFunctionalAlgo::maxNrTowers_=2448;
-const unsigned int EcalTrigPrimFunctionalAlgo::maxNrTPs_=2448; //FIXME??
+const unsigned int EcalTrigPrimFunctionalAlgo::nrSamples_ = 5; // to be written
+const unsigned int EcalTrigPrimFunctionalAlgo::maxNrSamplesOut_ = 10;
+const unsigned int EcalTrigPrimFunctionalAlgo::maxNrTowers_ = 2448;
+const unsigned int EcalTrigPrimFunctionalAlgo::maxNrTPs_ = 2448; // FIXME??
 
 //----------------------------------------------------------------------
 
-EcalTrigPrimFunctionalAlgo::EcalTrigPrimFunctionalAlgo(const edm::EventSetup & setup,int binofmax,bool tcpFormat, bool barrelOnly,bool debug,bool famos): binOfMaximum_(binofmax),
-  tcpFormat_(tcpFormat), barrelOnly_(barrelOnly), debug_(debug), famos_(famos)
+EcalTrigPrimFunctionalAlgo::EcalTrigPrimFunctionalAlgo(
+    const edm::EventSetup &setup, int binofmax, bool tcpFormat, bool barrelOnly,
+    bool debug, bool famos)
+    : binOfMaximum_(binofmax), tcpFormat_(tcpFormat), barrelOnly_(barrelOnly),
+      debug_(debug), famos_(famos)
 
 {
- if (famos_) maxNrSamples_=1;  //get from input??
- else maxNrSamples_=10;
- this->init(setup);
+  if (famos_)
+    maxNrSamples_ = 1; // get from input??
+  else
+    maxNrSamples_ = 10;
+  this->init(setup);
 }
 
 //----------------------------------------------------------------------
-void EcalTrigPrimFunctionalAlgo::init(const edm::EventSetup & setup) {
+void EcalTrigPrimFunctionalAlgo::init(const edm::EventSetup &setup) {
   if (!barrelOnly_) {
     edm::ESHandle<CaloGeometry> theGeometry;
     edm::ESHandle<CaloSubdetectorGeometry> theEndcapGeometry_handle;
-    setup.get<CaloGeometryRecord>().get( theGeometry );
-    setup.get<EcalEndcapGeometryRecord>().get("EcalEndcap",theEndcapGeometry_handle);
+    setup.get<CaloGeometryRecord>().get(theGeometry);
+    setup.get<EcalEndcapGeometryRecord>().get("EcalEndcap",
+                                              theEndcapGeometry_handle);
     theEndcapGeometry = &(*theEndcapGeometry_handle);
     setup.get<IdealGeometryRecord>().get(eTTmap_);
   }
   // endcap mapping
-  edm::ESHandle< EcalElectronicsMapping > ecalmapping;
-  setup.get< EcalMappingRcd >().get(ecalmapping);
+  edm::ESHandle<EcalElectronicsMapping> ecalmapping;
+  setup.get<EcalMappingRcd>().get(ecalmapping);
   theMapping_ = ecalmapping.product();
 
-  //create main sub algos
-  estrip_= new EcalFenixStrip(setup,theMapping_,debug_,famos_,maxNrSamples_,nbMaxXtals_);
-  etcp_ = new EcalFenixTcp(setup,tcpFormat_,debug_,famos_,binOfMaximum_,maxNrSamples_,nbMaxStrips_) ;
+  // create main sub algos
+  estrip_ = new EcalFenixStrip(setup, theMapping_, debug_, famos_,
+                               maxNrSamples_, nbMaxXtals_);
+  etcp_ = new EcalFenixTcp(setup, tcpFormat_, debug_, famos_, binOfMaximum_,
+                           maxNrSamples_, nbMaxStrips_);
 
   // initialise data structures
   initStructures(towerMapEB_);
@@ -83,58 +91,60 @@ void EcalTrigPrimFunctionalAlgo::init(const edm::EventSetup & setup) {
   hitTowers_.resize(maxNrTowers_);
   towtp_.resize(maxNrSamplesOut_);
   towtp2_.resize(maxNrSamplesOut_);
-  
 }
 //----------------------------------------------------------------------
 
-EcalTrigPrimFunctionalAlgo::~EcalTrigPrimFunctionalAlgo() 
-{
-    delete estrip_;
-    delete etcp_;
+EcalTrigPrimFunctionalAlgo::~EcalTrigPrimFunctionalAlgo() {
+  delete estrip_;
+  delete etcp_;
 }
 //----------------------------------------------------------------------
-void EcalTrigPrimFunctionalAlgo::run(const edm::EventSetup & setup, EBDigiCollection const * col,
-				     EcalTrigPrimDigiCollection & result,
-				     EcalTrigPrimDigiCollection & resultTcp)
-{
+void EcalTrigPrimFunctionalAlgo::run(const edm::EventSetup &setup,
+                                     EBDigiCollection const *col,
+                                     EcalTrigPrimDigiCollection &result,
+                                     EcalTrigPrimDigiCollection &resultTcp) {
   run_part1_EB(col);
-  run_part2(setup,col,towerMapEB_,result,resultTcp);
+  run_part2(setup, col, towerMapEB_, result, resultTcp);
 }
 
 //----------------------------------------------------------------------
-void EcalTrigPrimFunctionalAlgo::run(const edm::EventSetup & setup, EEDigiCollection const * col,
-                                                        EcalTrigPrimDigiCollection & result,
-							EcalTrigPrimDigiCollection & resultTcp)
-{
+void EcalTrigPrimFunctionalAlgo::run(const edm::EventSetup &setup,
+                                     EEDigiCollection const *col,
+                                     EcalTrigPrimDigiCollection &result,
+                                     EcalTrigPrimDigiCollection &resultTcp) {
 
   run_part1_EE(col);
-  run_part2(setup, col,towerMapEE_,result,resultTcp);
+  run_part2(setup, col, towerMapEE_, result, resultTcp);
 }
 //----------------------------------------------------------------------
-int  EcalTrigPrimFunctionalAlgo::findStripNr(const EBDetId &id){
+int EcalTrigPrimFunctionalAlgo::findStripNr(const EBDetId &id) {
   int stripnr;
-  int n=((id.ic()-1)%100)/20; //20 corresponds to 4 * ecal_barrel_crystals_per_strip FIXME!!
-  if (id.ieta()<0) stripnr = n+1;
-  else stripnr =nbMaxStrips_ - n; 
+  int n = ((id.ic() - 1) % 100) /
+          20; // 20 corresponds to 4 * ecal_barrel_crystals_per_strip FIXME!!
+  if (id.ieta() < 0)
+    stripnr = n + 1;
+  else
+    stripnr = nbMaxStrips_ - n;
   return stripnr;
 }
 //----------------------------------------------------------------------
-int  EcalTrigPrimFunctionalAlgo::findStripNr(const EEDetId &id){
+int EcalTrigPrimFunctionalAlgo::findStripNr(const EEDetId &id) {
   int stripnr;
-  const EcalTriggerElectronicsId elId = theMapping_->getTriggerElectronicsId(id);
-  stripnr=elId.pseudoStripId();
+  const EcalTriggerElectronicsId elId =
+      theMapping_->getTriggerElectronicsId(id);
+  stripnr = elId.pseudoStripId();
   return stripnr;
 }
 //----------------------------------------------------------------------
 
-void EcalTrigPrimFunctionalAlgo::run_part1_EB(EBDigiCollection const * col){
+void EcalTrigPrimFunctionalAlgo::run_part1_EB(EBDigiCollection const *col) {
   clean(towerMapEB_);
-  // loop over dataframes and fill map 
-  fillMap(col,towerMapEB_);
+  // loop over dataframes and fill map
+  fillMap(col, towerMapEB_);
 }
 //----------------------------------------------------------------------
-void EcalTrigPrimFunctionalAlgo::run_part1_EE(EEDigiCollection const * col){
+void EcalTrigPrimFunctionalAlgo::run_part1_EE(EEDigiCollection const *col) {
   clean(towerMapEE_);
-  // loop over dataframes and fill map 
-  fillMap(col,towerMapEE_);
+  // loop over dataframes and fill map
+  fillMap(col, towerMapEE_);
 }
diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPCondAnalyzer.cc b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPCondAnalyzer.cc
index 4d253323b3bcb..d129ce6fa5296 100644
--- a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPCondAnalyzer.cc
+++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPCondAnalyzer.cc
@@ -15,389 +15,440 @@
 //
 //
 
-
 // system include files
+#include <fstream>
+#include <iostream>
 #include <memory>
 #include <utility>
-#include <iostream>
-#include <fstream>
 
 // user include files
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 
-#include "CondFormats/DataRecord/interface/EcalTPGPhysicsConstRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGCrystalStatusRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGFineGrainEBGroupRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGLutGroupRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGLutIdMapRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGFineGrainEBIdMapRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGFineGrainStripEERcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGFineGrainTowerEERcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGLinearizationConstRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGLutGroupRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGLutIdMapRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGPedestalsRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGPhysicsConstRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGSlidingWindowRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGWeightIdMapRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGWeightGroupRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGFineGrainStripEERcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGCrystalStatusRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGTowerStatusRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGStripStatusRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGSpikeRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGStripStatusRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGTowerStatusRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGWeightGroupRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGWeightIdMapRcd.h"
 
 #include "DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h"
 #include "DataFormats/EcalDetId/interface/EcalTriggerElectronicsId.h"
-#include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
+#include "Geometry/Records/interface/CaloGeometryRecord.h"
 
 #include "SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPCondAnalyzer.h"
 
-EcalTPCondAnalyzer::EcalTPCondAnalyzer(const edm::ParameterSet&  iConfig)
+EcalTPCondAnalyzer::EcalTPCondAnalyzer(const edm::ParameterSet &iConfig)
 
 {}
 
-void EcalTPCondAnalyzer::beginRun(const edm::Run & run, edm::EventSetup const& evtSetup){
- // get geometry
-  
-  edm::ESHandle<CaloSubdetectorGeometry> theEndcapGeometry_handle, theBarrelGeometry_handle;
-  evtSetup.get<EcalEndcapGeometryRecord>().get("EcalEndcap",theEndcapGeometry_handle);
-  evtSetup.get<EcalBarrelGeometryRecord>().get("EcalBarrel",theBarrelGeometry_handle);
+void EcalTPCondAnalyzer::beginRun(const edm::Run &run,
+                                  edm::EventSetup const &evtSetup) {
+  // get geometry
+
+  edm::ESHandle<CaloSubdetectorGeometry> theEndcapGeometry_handle,
+      theBarrelGeometry_handle;
+  evtSetup.get<EcalEndcapGeometryRecord>().get("EcalEndcap",
+                                               theEndcapGeometry_handle);
+  evtSetup.get<EcalBarrelGeometryRecord>().get("EcalBarrel",
+                                               theBarrelGeometry_handle);
   theEndcapGeometry_ = &(*theEndcapGeometry_handle);
   theBarrelGeometry_ = &(*theBarrelGeometry_handle);
 
-  cacheID_=this->getRecords(evtSetup);
+  cacheID_ = this->getRecords(evtSetup);
 }
 
-void EcalTPCondAnalyzer::beginJob() 
-{}
-
+void EcalTPCondAnalyzer::beginJob() {}
 
-EcalTPCondAnalyzer::~EcalTPCondAnalyzer() {
-}
+EcalTPCondAnalyzer::~EcalTPCondAnalyzer() {}
 
-unsigned long long  EcalTPCondAnalyzer::getRecords(edm::EventSetup const& setup) {
+unsigned long long
+EcalTPCondAnalyzer::getRecords(edm::EventSetup const &setup) {
   //
   // get Eventsetup records and print them
   //
-   printComment();
+  printComment();
 
-   edm::ESHandle<EcalTPGPhysicsConst> theEcalTPGPhysConst_handle;
+  edm::ESHandle<EcalTPGPhysicsConst> theEcalTPGPhysConst_handle;
   setup.get<EcalTPGPhysicsConstRcd>().get(theEcalTPGPhysConst_handle);
-  const EcalTPGPhysicsConst * ecaltpPhysConst = theEcalTPGPhysConst_handle.product();
+  const EcalTPGPhysicsConst *ecaltpPhysConst =
+      theEcalTPGPhysConst_handle.product();
   printEcalTPGPhysicsConst(ecaltpPhysConst);
   // for EcalFenixStrip...
 
   // get parameter records for xtals
   edm::ESHandle<EcalTPGLinearizationConst> theEcalTPGLinearization_handle;
   setup.get<EcalTPGLinearizationConstRcd>().get(theEcalTPGLinearization_handle);
-  const EcalTPGLinearizationConst * ecaltpLin = theEcalTPGLinearization_handle.product();
+  const EcalTPGLinearizationConst *ecaltpLin =
+      theEcalTPGLinearization_handle.product();
 
   edm::ESHandle<EcalTPGPedestals> theEcalTPGPedestals_handle;
   setup.get<EcalTPGPedestalsRcd>().get(theEcalTPGPedestals_handle);
-  const EcalTPGPedestals * ecaltpPed = theEcalTPGPedestals_handle.product();
-  printCRYSTAL(ecaltpPed,ecaltpLin );
-
+  const EcalTPGPedestals *ecaltpPed = theEcalTPGPedestals_handle.product();
+  printCRYSTAL(ecaltpPed, ecaltpLin);
 
-  //weight
+  // weight
   edm::ESHandle<EcalTPGWeightIdMap> theEcalTPGWEightIdMap_handle;
   setup.get<EcalTPGWeightIdMapRcd>().get(theEcalTPGWEightIdMap_handle);
-  const EcalTPGWeightIdMap * ecaltpgWeightMap = theEcalTPGWEightIdMap_handle.product();
+  const EcalTPGWeightIdMap *ecaltpgWeightMap =
+      theEcalTPGWEightIdMap_handle.product();
   printWEIGHT(ecaltpgWeightMap);
 
-   // .. and for EcalFenixTcp
+  // .. and for EcalFenixTcp
 
   edm::ESHandle<EcalTPGFineGrainEBIdMap> theEcalTPGFineGrainEBIdMap_handle;
-  setup.get<EcalTPGFineGrainEBIdMapRcd>().get(theEcalTPGFineGrainEBIdMap_handle);
-  const EcalTPGFineGrainEBIdMap * ecaltpgFineGrainEB = theEcalTPGFineGrainEBIdMap_handle.product();
+  setup.get<EcalTPGFineGrainEBIdMapRcd>().get(
+      theEcalTPGFineGrainEBIdMap_handle);
+  const EcalTPGFineGrainEBIdMap *ecaltpgFineGrainEB =
+      theEcalTPGFineGrainEBIdMap_handle.product();
   printEcalTPGFineGrainEBIdMap(ecaltpgFineGrainEB);
 
-
   edm::ESHandle<EcalTPGLutIdMap> theEcalTPGLutIdMap_handle;
   setup.get<EcalTPGLutIdMapRcd>().get(theEcalTPGLutIdMap_handle);
-  const EcalTPGLutIdMap * ecaltpgLut = theEcalTPGLutIdMap_handle.product();
+  const EcalTPGLutIdMap *ecaltpgLut = theEcalTPGLutIdMap_handle.product();
   printEcalTPGLutIdMap(ecaltpgLut);
 
-  //for strips
+  // for strips
   edm::ESHandle<EcalTPGSlidingWindow> theEcalTPGSlidingWindow_handle;
   setup.get<EcalTPGSlidingWindowRcd>().get(theEcalTPGSlidingWindow_handle);
-  const EcalTPGSlidingWindow * ecaltpgSlidW = theEcalTPGSlidingWindow_handle.product();
+  const EcalTPGSlidingWindow *ecaltpgSlidW =
+      theEcalTPGSlidingWindow_handle.product();
   edm::ESHandle<EcalTPGFineGrainStripEE> theEcalTPGFineGrainStripEE_handle;
-  setup.get<EcalTPGFineGrainStripEERcd>().get(theEcalTPGFineGrainStripEE_handle);
-  const EcalTPGFineGrainStripEE * ecaltpgFgStripEE = theEcalTPGFineGrainStripEE_handle.product();     
+  setup.get<EcalTPGFineGrainStripEERcd>().get(
+      theEcalTPGFineGrainStripEE_handle);
+  const EcalTPGFineGrainStripEE *ecaltpgFgStripEE =
+      theEcalTPGFineGrainStripEE_handle.product();
   edm::ESHandle<EcalTPGWeightGroup> theEcalTPGWEightGroup_handle;
   setup.get<EcalTPGWeightGroupRcd>().get(theEcalTPGWEightGroup_handle);
-  const EcalTPGWeightGroup * ecaltpgWeightGroup = theEcalTPGWEightGroup_handle.product();
-  printSTRIP(ecaltpgSlidW,ecaltpgWeightGroup,ecaltpgFgStripEE);
+  const EcalTPGWeightGroup *ecaltpgWeightGroup =
+      theEcalTPGWEightGroup_handle.product();
+  printSTRIP(ecaltpgSlidW, ecaltpgWeightGroup, ecaltpgFgStripEE);
 
   // get parameter records for towers
   edm::ESHandle<EcalTPGLutGroup> theEcalTPGLutGroup_handle;
   setup.get<EcalTPGLutGroupRcd>().get(theEcalTPGLutGroup_handle);
-  const EcalTPGLutGroup * ecaltpgLutGroup = theEcalTPGLutGroup_handle.product();
+  const EcalTPGLutGroup *ecaltpgLutGroup = theEcalTPGLutGroup_handle.product();
 
   edm::ESHandle<EcalTPGFineGrainEBGroup> theEcalTPGFineGrainEBGroup_handle;
-  setup.get<EcalTPGFineGrainEBGroupRcd>().get(theEcalTPGFineGrainEBGroup_handle);
-  const EcalTPGFineGrainEBGroup * ecaltpgFgEBGroup = theEcalTPGFineGrainEBGroup_handle.product();
+  setup.get<EcalTPGFineGrainEBGroupRcd>().get(
+      theEcalTPGFineGrainEBGroup_handle);
+  const EcalTPGFineGrainEBGroup *ecaltpgFgEBGroup =
+      theEcalTPGFineGrainEBGroup_handle.product();
   edm::ESHandle<EcalTPGSpike> theEcalTPGSpike_handle;
   setup.get<EcalTPGSpikeRcd>().get(theEcalTPGSpike_handle);
-  const EcalTPGSpike * ecaltpgSpikeTh = theEcalTPGSpike_handle.product();
+  const EcalTPGSpike *ecaltpgSpikeTh = theEcalTPGSpike_handle.product();
 
-  printTOWEREB(ecaltpgSpikeTh, ecaltpgFgEBGroup,ecaltpgLutGroup);
+  printTOWEREB(ecaltpgSpikeTh, ecaltpgFgEBGroup, ecaltpgLutGroup);
   edm::ESHandle<EcalTPGFineGrainTowerEE> theEcalTPGFineGrainTowerEE_handle;
-  setup.get<EcalTPGFineGrainTowerEERcd>().get(theEcalTPGFineGrainTowerEE_handle);
-  const EcalTPGFineGrainTowerEE * ecaltpgFineGrainTowerEE = theEcalTPGFineGrainTowerEE_handle.product();
+  setup.get<EcalTPGFineGrainTowerEERcd>().get(
+      theEcalTPGFineGrainTowerEE_handle);
+  const EcalTPGFineGrainTowerEE *ecaltpgFineGrainTowerEE =
+      theEcalTPGFineGrainTowerEE_handle.product();
 
   printTOWEREE(ecaltpgFineGrainTowerEE, ecaltpgLutGroup);
 
   // get parameters for BadX
-/*  edm::ESHandle<EcalTPGCrystalStatus> theEcalTPGCrystalStatus_handle;
-  setup.get<EcalTPGCrystalStatusRcd>().get(theEcalTPGCrystalStatus_handle);
-  const EcalTPGCrystalStatus * ecaltpgBadX = theEcalTPGCrystalStatus_handle.product();
-  printBadX(ecaltpgBadX);
-
-  // get parameters for BadTT
-  edm::ESHandle<EcalTPGTowerStatus> theEcalTPGTowerStatus_handle;
-  setup.get<EcalTPGTowerStatusRcd>().get(theEcalTPGTowerStatus_handle);
-  const EcalTPGTowerStatus * ecaltpgBadTT = theEcalTPGTowerStatus_handle.product();
-  printBadTT(ecaltpgBadTT);
-*/  
-  
+  /*  edm::ESHandle<EcalTPGCrystalStatus> theEcalTPGCrystalStatus_handle;
+    setup.get<EcalTPGCrystalStatusRcd>().get(theEcalTPGCrystalStatus_handle);
+    const EcalTPGCrystalStatus * ecaltpgBadX =
+    theEcalTPGCrystalStatus_handle.product(); printBadX(ecaltpgBadX);
+
+    // get parameters for BadTT
+    edm::ESHandle<EcalTPGTowerStatus> theEcalTPGTowerStatus_handle;
+    setup.get<EcalTPGTowerStatusRcd>().get(theEcalTPGTowerStatus_handle);
+    const EcalTPGTowerStatus * ecaltpgBadTT =
+    theEcalTPGTowerStatus_handle.product(); printBadTT(ecaltpgBadTT);
+  */
+
   // get parameters for BadStrip
-/*  edm::ESHandle<EcalTPGStripStatus> theEcalTPGStripStatus_handle;
-  setup.get<EcalTPGStripStatusRcd>().get(theEcalTPGStripStatus_handle);
-  const EcalTPGStripStatus * ecaltpgBadStrip = theEcalTPGStripStatus_handle.product();
-  printBadStrip(ecaltpgBadStrip);
-*/
+  /*  edm::ESHandle<EcalTPGStripStatus> theEcalTPGStripStatus_handle;
+    setup.get<EcalTPGStripStatusRcd>().get(theEcalTPGStripStatus_handle);
+    const EcalTPGStripStatus * ecaltpgBadStrip =
+    theEcalTPGStripStatus_handle.product(); printBadStrip(ecaltpgBadStrip);
+  */
 
-  
-  std::cout<<"EOF"<<std::endl;
+  std::cout << "EOF" << std::endl;
 
   return setup.get<EcalTPGFineGrainTowerEERcd>().cacheIdentifier();
 }
 
 // ------------ method called to analyze the data  ------------
-void
-EcalTPCondAnalyzer::analyze(const edm::Event& iEvent, const  edm::EventSetup & iSetup){
-}
+void EcalTPCondAnalyzer::analyze(const edm::Event &iEvent,
+                                 const edm::EventSetup &iSetup) {}
 
-void
-EcalTPCondAnalyzer::endJob(){
-}
+void EcalTPCondAnalyzer::endJob() {}
 
-void EcalTPCondAnalyzer::printEcalTPGPhysicsConst(const EcalTPGPhysicsConst *ecaltpgPhysConst) const {
+void EcalTPCondAnalyzer::printEcalTPGPhysicsConst(
+    const EcalTPGPhysicsConst *ecaltpgPhysConst) const {
   EcalTPGPhysicsConstMapIterator it;
-  const EcalTPGPhysicsConstMap& mymap=ecaltpgPhysConst->getMap();
-  for (it=mymap.begin();it!=mymap.end();++it) {
-    if (it==mymap.begin()) {
-      std::cout<<"\nPHYSICS_EB "<<(*it).first<<std::endl;
+  const EcalTPGPhysicsConstMap &mymap = ecaltpgPhysConst->getMap();
+  for (it = mymap.begin(); it != mymap.end(); ++it) {
+    if (it == mymap.begin()) {
+      std::cout << "\nPHYSICS_EB " << (*it).first << std::endl;
     } else {
-      std::cout<<"\nPHYSICS_EE "<<(*it).first<<std::endl;
+      std::cout << "\nPHYSICS_EE " << (*it).first << std::endl;
     }
-    std::cout<<(*it).second.EtSat<<" "<<(*it).second.ttf_threshold_Low<<" "<<(*it).second.ttf_threshold_High<<std::endl;
-    std::cout<<(*it).second.FG_lowThreshold<<" "<<(*it).second.FG_highThreshold<<" "<<(*it).second.FG_lowRatio<<" "<<(*it).second.FG_highRatio<<std::endl;
+    std::cout << (*it).second.EtSat << " " << (*it).second.ttf_threshold_Low
+              << " " << (*it).second.ttf_threshold_High << std::endl;
+    std::cout << (*it).second.FG_lowThreshold << " "
+              << (*it).second.FG_highThreshold << " "
+              << (*it).second.FG_lowRatio << " " << (*it).second.FG_highRatio
+              << std::endl;
   }
 }
 
-void  EcalTPCondAnalyzer::printSTRIP(const EcalTPGSlidingWindow *slWin,const EcalTPGWeightGroup *ecaltpgWeightGroup,const EcalTPGFineGrainStripEE * ecaltpgFgStripEE) const {
+void EcalTPCondAnalyzer::printSTRIP(
+    const EcalTPGSlidingWindow *slWin,
+    const EcalTPGWeightGroup *ecaltpgWeightGroup,
+    const EcalTPGFineGrainStripEE *ecaltpgFgStripEE) const {
   // print STRIP information
-  const EcalTPGSlidingWindowMap &slwinmap = slWin -> getMap();
-  const EcalTPGFineGrainStripEEMap &fgstripEEmap= ecaltpgFgStripEE->getMap();
+  const EcalTPGSlidingWindowMap &slwinmap = slWin->getMap();
+  const EcalTPGFineGrainStripEEMap &fgstripEEmap = ecaltpgFgStripEE->getMap();
   EcalTPGSlidingWindowMapIterator it;
-  const EcalTPGGroups::EcalTPGGroupsMap &gMap=ecaltpgWeightGroup->getMap();
+  const EcalTPGGroups::EcalTPGGroupsMap &gMap = ecaltpgWeightGroup->getMap();
   EcalTPGGroups::EcalTPGGroupsMapItr groupId;
 
-  std::cout<<std::endl;
-  for (int mysub=1;mysub<=2;++mysub) {
-    std::cout<<std::endl;
-    for (it=slwinmap.begin();it!=slwinmap.end();++it) {
+  std::cout << std::endl;
+  for (int mysub = 1; mysub <= 2; ++mysub) {
+    std::cout << std::endl;
+    for (it = slwinmap.begin(); it != slwinmap.end(); ++it) {
       EcalTriggerElectronicsId elid((*it).first);
-      groupId=gMap.find((*it).first);
-      int subdet =elid.subdet();
-      if (subdet==mysub) {
-	if (subdet==1) {
-	  std::cout<<"STRIP_EB "<<std::dec<<(*it).first<<std::endl;
-	  std::cout << std::hex << "0x" <<(*it).second<<std::endl ;
-	  std::cout  <<"" <<(*groupId).second<< std::endl ; //weightgroupid
-	  EcalTPGFineGrainStripEEMapIterator it2=fgstripEEmap.find((*it).first);
-	  if (it2==fgstripEEmap.end()) {
-	    edm::LogWarning("EcalTPGCondAnalyzer") <<" could not find strip Id "<<(*it).first<<", given in sliding window, inside the EcalTPGFineGranStripEEMap!!!";
-	  } else {
-	    EcalTPGFineGrainStripEE::Item item=(*it2).second;
-	    std::cout<<std::hex<<"0x"<<item.threshold<<" 0x"<<item.lut<<std::endl ;  
-	  }
-	}else if (subdet==2) {
-	  std::cout<<"STRIP_EE "<<std::dec<<(*it).first<<std::endl;
-	  std::cout << std::hex << "0x" <<(*it).second<<std::endl ;
-	  std::cout <<" " <<(*groupId).second<<std::endl ;//weightgroupid
-	  EcalTPGFineGrainStripEEMapIterator it2=fgstripEEmap.find((*it).first);
-	  if (it2==fgstripEEmap.end()) {
-	    edm::LogWarning("EcalTPGCondAnalyzer") <<" could not find strip Id "<<(*it).first<<", given in sliding window, inside the EcalTPGFineGranStripEEMap!!!";
-	  } else {
-	    EcalTPGFineGrainStripEE::Item item=(*it2).second;
-	    std::cout<<std::hex<<"0x"<<item.threshold<<" 0x"<<item.lut<<std::endl ;  
-	  }
-	}
+      groupId = gMap.find((*it).first);
+      int subdet = elid.subdet();
+      if (subdet == mysub) {
+        if (subdet == 1) {
+          std::cout << "STRIP_EB " << std::dec << (*it).first << std::endl;
+          std::cout << std::hex << "0x" << (*it).second << std::endl;
+          std::cout << "" << (*groupId).second << std::endl; // weightgroupid
+          EcalTPGFineGrainStripEEMapIterator it2 =
+              fgstripEEmap.find((*it).first);
+          if (it2 == fgstripEEmap.end()) {
+            edm::LogWarning("EcalTPGCondAnalyzer")
+                << " could not find strip Id " << (*it).first
+                << ", given in sliding window, inside the "
+                   "EcalTPGFineGranStripEEMap!!!";
+          } else {
+            EcalTPGFineGrainStripEE::Item item = (*it2).second;
+            std::cout << std::hex << "0x" << item.threshold << " 0x" << item.lut
+                      << std::endl;
+          }
+        } else if (subdet == 2) {
+          std::cout << "STRIP_EE " << std::dec << (*it).first << std::endl;
+          std::cout << std::hex << "0x" << (*it).second << std::endl;
+          std::cout << " " << (*groupId).second << std::endl; // weightgroupid
+          EcalTPGFineGrainStripEEMapIterator it2 =
+              fgstripEEmap.find((*it).first);
+          if (it2 == fgstripEEmap.end()) {
+            edm::LogWarning("EcalTPGCondAnalyzer")
+                << " could not find strip Id " << (*it).first
+                << ", given in sliding window, inside the "
+                   "EcalTPGFineGranStripEEMap!!!";
+          } else {
+            EcalTPGFineGrainStripEE::Item item = (*it2).second;
+            std::cout << std::hex << "0x" << item.threshold << " 0x" << item.lut
+                      << std::endl;
+          }
+        }
       }
     }
   }
 }
 
-void EcalTPCondAnalyzer::printWEIGHT(const EcalTPGWeightIdMap * ecaltpgWeightIdMap) const {
-    
-  std::cout<<std::endl;
-    EcalTPGWeightIdMap::EcalTPGWeightMapItr it;
-    uint32_t w0,w1,w2,w3,w4;
-    const EcalTPGWeightIdMap::EcalTPGWeightMap& map=ecaltpgWeightIdMap->getMap();
-    for (it=map.begin();it!=map.end();++it) {
-      std::cout <<"WEIGHT "<<(*it).first<<std::endl;
-      (*it).second.getValues(w0,w1,w2,w3,w4);
-      std::cout <<std::hex<<"0x"<<w0<<" 0x"<<w1<<" 0x"<<w2<<" 0x"<<w3<<" 0x"<<w4<<" "<<std::endl;
-      std::cout<<std::endl;
-      std::cout<<std::endl;
-    }
+void EcalTPCondAnalyzer::printWEIGHT(
+    const EcalTPGWeightIdMap *ecaltpgWeightIdMap) const {
+
+  std::cout << std::endl;
+  EcalTPGWeightIdMap::EcalTPGWeightMapItr it;
+  uint32_t w0, w1, w2, w3, w4;
+  const EcalTPGWeightIdMap::EcalTPGWeightMap &map =
+      ecaltpgWeightIdMap->getMap();
+  for (it = map.begin(); it != map.end(); ++it) {
+    std::cout << "WEIGHT " << (*it).first << std::endl;
+    (*it).second.getValues(w0, w1, w2, w3, w4);
+    std::cout << std::hex << "0x" << w0 << " 0x" << w1 << " 0x" << w2 << " 0x"
+              << w3 << " 0x" << w4 << " " << std::endl;
+    std::cout << std::endl;
+    std::cout << std::endl;
+  }
 }
 
-void  EcalTPCondAnalyzer::printEcalTPGFineGrainEBIdMap(const EcalTPGFineGrainEBIdMap *ecaltpgFineGrainEB) const {
-    EcalTPGFineGrainEBIdMap::EcalTPGFineGrainEBMapItr it;
-    const EcalTPGFineGrainEBIdMap::EcalTPGFineGrainEBMap& map=ecaltpgFineGrainEB->getMap();
-    uint32_t ThresholdETLow, ThresholdETHigh, RatioLow, RatioHigh, LUT;
-
-    //std::cout<<std::endl;
-    for (it=map.begin();it!=map.end();++it) {
-      std::cout <<"FG "<<(*it).first<<std::endl;
-      (*it).second.getValues(ThresholdETLow, ThresholdETHigh, RatioLow, RatioHigh, LUT);
-      std::cout <<std::hex<<"0x"<<ThresholdETLow<<" 0x"<<ThresholdETHigh<<" 0x"<<RatioLow<<" 0x"<<RatioHigh<<" 0x"<<LUT<<std::endl;
-    }
+void EcalTPCondAnalyzer::printEcalTPGFineGrainEBIdMap(
+    const EcalTPGFineGrainEBIdMap *ecaltpgFineGrainEB) const {
+  EcalTPGFineGrainEBIdMap::EcalTPGFineGrainEBMapItr it;
+  const EcalTPGFineGrainEBIdMap::EcalTPGFineGrainEBMap &map =
+      ecaltpgFineGrainEB->getMap();
+  uint32_t ThresholdETLow, ThresholdETHigh, RatioLow, RatioHigh, LUT;
+
+  // std::cout<<std::endl;
+  for (it = map.begin(); it != map.end(); ++it) {
+    std::cout << "FG " << (*it).first << std::endl;
+    (*it).second.getValues(ThresholdETLow, ThresholdETHigh, RatioLow, RatioHigh,
+                           LUT);
+    std::cout << std::hex << "0x" << ThresholdETLow << " 0x" << ThresholdETHigh
+              << " 0x" << RatioLow << " 0x" << RatioHigh << " 0x" << LUT
+              << std::endl;
+  }
 }
 
-
-void EcalTPCondAnalyzer::printEcalTPGLutIdMap(const EcalTPGLutIdMap *ecaltpgLut) const {
-    EcalTPGLutIdMap::EcalTPGLutMapItr it;
-    const EcalTPGLutIdMap::EcalTPGLutMap& map=ecaltpgLut->getMap();
-
-    std::cout<<std::endl;
-    for (it=map.begin();it!=map.end();++it) {
-      std::cout <<"LUT "<<(*it).first<<std::endl;
-      const unsigned int * lut=(*it).second.getLut();
-      for (unsigned int i=0;i<1024;++i)  std::cout <<std::hex<<"0x"<<*lut++<<std::endl;
-    }
+void EcalTPCondAnalyzer::printEcalTPGLutIdMap(
+    const EcalTPGLutIdMap *ecaltpgLut) const {
+  EcalTPGLutIdMap::EcalTPGLutMapItr it;
+  const EcalTPGLutIdMap::EcalTPGLutMap &map = ecaltpgLut->getMap();
+
+  std::cout << std::endl;
+  for (it = map.begin(); it != map.end(); ++it) {
+    std::cout << "LUT " << (*it).first << std::endl;
+    const unsigned int *lut = (*it).second.getLut();
+    for (unsigned int i = 0; i < 1024; ++i)
+      std::cout << std::hex << "0x" << *lut++ << std::endl;
+  }
 }
 
-void EcalTPCondAnalyzer::printCRYSTAL(const EcalTPGPedestals * ecaltpPed, const EcalTPGLinearizationConst * ecaltpLin ) {
-
-  std::cout<<std::endl;
-  const EcalTPGPedestalsMap& pedMap=ecaltpPed->getMap();
-  const EcalTPGLinearizationConstMap& linMap=ecaltpLin->getMap();
-
-  const std::vector<DetId> & ebCells = theBarrelGeometry_->getValidDetIds(DetId::Ecal, EcalBarrel);
-
-  std::cout<<"COMMENT ====== barrel crystals ====== "<<std::endl; 
-  for (std::vector<DetId>::const_iterator it = ebCells.begin(); it != ebCells.end(); ++it) {
-    EBDetId id(*it) ;
-    std::cout <<"CRYSTAL "<<std::dec<<id.rawId()<<std::endl;
-    const EcalTPGPedestal &ped=pedMap[id.rawId()];
-    const EcalTPGLinearizationConstant &lin=linMap[id.rawId()];
-    std::cout<<std::hex<<" 0x"<<ped.mean_x12<<" 0x"<<lin.mult_x12<<" 0x"<<lin.shift_x12<<std::endl;
-    std::cout<<std::hex<<" 0x"<<ped.mean_x6 <<" 0x"<<lin.mult_x6 <<" 0x"<<lin.shift_x6<<std::endl;
-    std::cout<<std::hex<<" 0x"<<ped.mean_x1 <<" 0x"<<lin.mult_x1 <<" 0x"<<lin.shift_x1<<std::endl;
+void EcalTPCondAnalyzer::printCRYSTAL(
+    const EcalTPGPedestals *ecaltpPed,
+    const EcalTPGLinearizationConst *ecaltpLin) {
+
+  std::cout << std::endl;
+  const EcalTPGPedestalsMap &pedMap = ecaltpPed->getMap();
+  const EcalTPGLinearizationConstMap &linMap = ecaltpLin->getMap();
+
+  const std::vector<DetId> &ebCells =
+      theBarrelGeometry_->getValidDetIds(DetId::Ecal, EcalBarrel);
+
+  std::cout << "COMMENT ====== barrel crystals ====== " << std::endl;
+  for (std::vector<DetId>::const_iterator it = ebCells.begin();
+       it != ebCells.end(); ++it) {
+    EBDetId id(*it);
+    std::cout << "CRYSTAL " << std::dec << id.rawId() << std::endl;
+    const EcalTPGPedestal &ped = pedMap[id.rawId()];
+    const EcalTPGLinearizationConstant &lin = linMap[id.rawId()];
+    std::cout << std::hex << " 0x" << ped.mean_x12 << " 0x" << lin.mult_x12
+              << " 0x" << lin.shift_x12 << std::endl;
+    std::cout << std::hex << " 0x" << ped.mean_x6 << " 0x" << lin.mult_x6
+              << " 0x" << lin.shift_x6 << std::endl;
+    std::cout << std::hex << " 0x" << ped.mean_x1 << " 0x" << lin.mult_x1
+              << " 0x" << lin.shift_x1 << std::endl;
   }
 
-  const std::vector<DetId> & eeCells = theEndcapGeometry_->getValidDetIds(DetId::Ecal, EcalEndcap);
-  std::cout<<"COMMENT ====== endcap crystals ====== "<<std::endl; 
-  for (std::vector<DetId>::const_iterator it = eeCells.begin(); it != eeCells.end(); ++it) {
-    EEDetId id(*it) ;
-    std::cout <<"CRYSTAL "<<std::dec<<id.rawId()<<std::endl;
-    const EcalTPGPedestal &ped=pedMap[id.rawId()];
-    const EcalTPGLinearizationConstant &lin=linMap[id.rawId()];
-    std::cout<<std::hex<<" 0x"<<ped.mean_x12<<" 0x"<<lin.mult_x12<<" 0x"<<lin.shift_x12<<std::endl;
-    std::cout<<std::hex<<" 0x"<<ped.mean_x6 <<" 0x"<<lin.mult_x6 <<" 0x"<<lin.shift_x6<<std::endl;
-    std::cout<<std::hex<<" 0x"<<ped.mean_x1 <<" 0x"<<lin.mult_x1 <<" 0x"<<lin.shift_x1<<std::endl;
+  const std::vector<DetId> &eeCells =
+      theEndcapGeometry_->getValidDetIds(DetId::Ecal, EcalEndcap);
+  std::cout << "COMMENT ====== endcap crystals ====== " << std::endl;
+  for (std::vector<DetId>::const_iterator it = eeCells.begin();
+       it != eeCells.end(); ++it) {
+    EEDetId id(*it);
+    std::cout << "CRYSTAL " << std::dec << id.rawId() << std::endl;
+    const EcalTPGPedestal &ped = pedMap[id.rawId()];
+    const EcalTPGLinearizationConstant &lin = linMap[id.rawId()];
+    std::cout << std::hex << " 0x" << ped.mean_x12 << " 0x" << lin.mult_x12
+              << " 0x" << lin.shift_x12 << std::endl;
+    std::cout << std::hex << " 0x" << ped.mean_x6 << " 0x" << lin.mult_x6
+              << " 0x" << lin.shift_x6 << std::endl;
+    std::cout << std::hex << " 0x" << ped.mean_x1 << " 0x" << lin.mult_x1
+              << " 0x" << lin.shift_x1 << std::endl;
   }
 }
 void EcalTPCondAnalyzer::printComment() const {
-  std::cout<<"COMMENT put your comments here\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT           physics EB structure\n"<<
-  "COMMENT\n"<<
-  "COMMENT  EtSaturation (GeV), ttf_threshold_Low (GeV), ttf_threshold_High (GeV)\n"<<
-  "COMMENT  FG_lowThreshold (GeV), FG_highThreshold (GeV), FG_lowRatio, FG_highRatio\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT           physics EE structure\n"<<
-  "COMMENT\n"<<
-  "COMMENT  EtSaturation (GeV), ttf_threshold_Low (GeV), ttf_threshold_High (GeV)\n"<<
-  "COMMENT  FG_Threshold (GeV), dummy, dummy, dummy\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT           crystal structure (same for EB and EE)\n"<<
-  "COMMENT\n"<<
-  "COMMENT  ped, mult, shift [gain12]\n"<<
-  "COMMENT  ped, mult, shift [gain6]\n"<<
-  "COMMENT  ped, mult, shift [gain1]\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT           strip EB structure\n"<<
-  "COMMENT\n"<<
-  "COMMENT  sliding_window\n"<<
-  "COMMENT  weightGroupId\n"<<
-  "COMMENT  threshold_sfg lut_sfg\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT           strip EE structure\n"<<
-  "COMMENT\n"<<
-  "COMMENT  sliding_window\n"<<
-  "COMMENT  weightGroupId\n"<<
-  "COMMENT  threshold_fg lut_fg\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT           tower EB structure\n"<<
-  "COMMENT\n"<<
-  "COMMENT  LUTGroupId\n"<<
-  "COMMENT  FgGroupId\n"<<
-  "COMMENT  spike_killing_threshold\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT           tower EE structure\n"<<
-  "COMMENT\n"<<
-  "COMMENT  LUTGroupId\n"<<
-  "COMMENT  tower_lut_fg\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT           Weight structure\n"<<
-  "COMMENT\n"<<
-  "COMMENT  weightGroupId\n"<<
-  "COMMENT  w0, w1, w2, w3, w4\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT           lut structure\n"<<
-  "COMMENT\n"<<
-  "COMMENT  LUTGroupId\n"<<
-  "COMMENT  LUT[1-1024]\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT           fg EB structure\n"<<
-  "COMMENT\n"<<
-  "COMMENT  FgGroupId\n"<<
-  "COMMENT  el, eh, tl, th, lut_fg\n"<<
-  "COMMENT =================================\n"<<
-  "COMMENT"<<std::endl;
+  std::cout << "COMMENT put your comments here\n"
+            << "COMMENT =================================\n"
+            << "COMMENT           physics EB structure\n"
+            << "COMMENT\n"
+            << "COMMENT  EtSaturation (GeV), ttf_threshold_Low (GeV), "
+               "ttf_threshold_High (GeV)\n"
+            << "COMMENT  FG_lowThreshold (GeV), FG_highThreshold (GeV), "
+               "FG_lowRatio, FG_highRatio\n"
+            << "COMMENT =================================\n"
+            << "COMMENT\n"
+            << "COMMENT =================================\n"
+            << "COMMENT           physics EE structure\n"
+            << "COMMENT\n"
+            << "COMMENT  EtSaturation (GeV), ttf_threshold_Low (GeV), "
+               "ttf_threshold_High (GeV)\n"
+            << "COMMENT  FG_Threshold (GeV), dummy, dummy, dummy\n"
+            << "COMMENT =================================\n"
+            << "COMMENT\n"
+            << "COMMENT =================================\n"
+            << "COMMENT           crystal structure (same for EB and EE)\n"
+            << "COMMENT\n"
+            << "COMMENT  ped, mult, shift [gain12]\n"
+            << "COMMENT  ped, mult, shift [gain6]\n"
+            << "COMMENT  ped, mult, shift [gain1]\n"
+            << "COMMENT =================================\n"
+            << "COMMENT\n"
+            << "COMMENT =================================\n"
+            << "COMMENT           strip EB structure\n"
+            << "COMMENT\n"
+            << "COMMENT  sliding_window\n"
+            << "COMMENT  weightGroupId\n"
+            << "COMMENT  threshold_sfg lut_sfg\n"
+            << "COMMENT =================================\n"
+            << "COMMENT\n"
+            << "COMMENT =================================\n"
+            << "COMMENT           strip EE structure\n"
+            << "COMMENT\n"
+            << "COMMENT  sliding_window\n"
+            << "COMMENT  weightGroupId\n"
+            << "COMMENT  threshold_fg lut_fg\n"
+            << "COMMENT =================================\n"
+            << "COMMENT\n"
+            << "COMMENT =================================\n"
+            << "COMMENT           tower EB structure\n"
+            << "COMMENT\n"
+            << "COMMENT  LUTGroupId\n"
+            << "COMMENT  FgGroupId\n"
+            << "COMMENT  spike_killing_threshold\n"
+            << "COMMENT =================================\n"
+            << "COMMENT\n"
+            << "COMMENT =================================\n"
+            << "COMMENT           tower EE structure\n"
+            << "COMMENT\n"
+            << "COMMENT  LUTGroupId\n"
+            << "COMMENT  tower_lut_fg\n"
+            << "COMMENT =================================\n"
+            << "COMMENT\n"
+            << "COMMENT =================================\n"
+            << "COMMENT           Weight structure\n"
+            << "COMMENT\n"
+            << "COMMENT  weightGroupId\n"
+            << "COMMENT  w0, w1, w2, w3, w4\n"
+            << "COMMENT =================================\n"
+            << "COMMENT\n"
+            << "COMMENT =================================\n"
+            << "COMMENT           lut structure\n"
+            << "COMMENT\n"
+            << "COMMENT  LUTGroupId\n"
+            << "COMMENT  LUT[1-1024]\n"
+            << "COMMENT =================================\n"
+            << "COMMENT\n"
+            << "COMMENT =================================\n"
+            << "COMMENT           fg EB structure\n"
+            << "COMMENT\n"
+            << "COMMENT  FgGroupId\n"
+            << "COMMENT  el, eh, tl, th, lut_fg\n"
+            << "COMMENT =================================\n"
+            << "COMMENT" << std::endl;
 }
 
-/*void EcalTPCondAnalyzer::printTOWEREB(const EcalTPGFineGrainEBGroup *ecaltpgFgEBGroup,const EcalTPGLutGroup *ecaltpgLutGroup) const {
+/*void EcalTPCondAnalyzer::printTOWEREB(const EcalTPGFineGrainEBGroup
+*ecaltpgFgEBGroup,const EcalTPGLutGroup *ecaltpgLutGroup) const {
 
     const EcalTPGGroups::EcalTPGGroupsMap &lutMap=ecaltpgLutGroup->getMap();
     EcalTPGGroups::EcalTPGGroupsMapItr lutGroupId;
     const EcalTPGGroups::EcalTPGGroupsMap &fgMap=ecaltpgFgEBGroup->getMap();
     EcalTPGGroups::EcalTPGGroupsMapItr it;
-    
+
     std::cout<<std::endl;
     for (it=fgMap.begin();it!=fgMap.end();++it) {
       std::cout <<"TOWER_EB "<<std::dec<<(*it).first<<std::endl;
@@ -408,116 +459,126 @@ void EcalTPCondAnalyzer::printComment() const {
 }
 */
 
-void EcalTPCondAnalyzer::printTOWEREB(const EcalTPGSpike *ecaltpgSpikeTh, const EcalTPGFineGrainEBGroup *ecaltpgFgEBGroup,const EcalTPGLutGroup *ecaltpgLutGroup) const {
- 
-    const EcalTPGGroups::EcalTPGGroupsMap &lutMap=ecaltpgLutGroup->getMap();
-    EcalTPGGroups::EcalTPGGroupsMapItr lutGroupId;
-    const EcalTPGGroups::EcalTPGGroupsMap &fgMap=ecaltpgFgEBGroup->getMap();
-    EcalTPGGroups::EcalTPGGroupsMapItr it;
-    
-    const EcalTPGSpike::EcalTPGSpikeMap& spikeThMap = ecaltpgSpikeTh->getMap();
-    EcalTPGSpike::EcalTPGSpikeMapIterator itSpikeTh;
-    
-    std::cout<<std::endl;
-    for (it=fgMap.begin();it!=fgMap.end();++it) {
-      std::cout <<"TOWER_EB "<<std::dec<<(*it).first<<std::endl;
-      lutGroupId=lutMap.find((*it).first);
-      itSpikeTh=spikeThMap.find((*it).first);
-      std::cout <<" "<<(*it).second<<std::endl;
-      std::cout <<" "<<(*lutGroupId).second<<std::endl;
-      std::cout <<" "<<(*itSpikeTh).second<<std::endl; 
-    }
+void EcalTPCondAnalyzer::printTOWEREB(
+    const EcalTPGSpike *ecaltpgSpikeTh,
+    const EcalTPGFineGrainEBGroup *ecaltpgFgEBGroup,
+    const EcalTPGLutGroup *ecaltpgLutGroup) const {
+
+  const EcalTPGGroups::EcalTPGGroupsMap &lutMap = ecaltpgLutGroup->getMap();
+  EcalTPGGroups::EcalTPGGroupsMapItr lutGroupId;
+  const EcalTPGGroups::EcalTPGGroupsMap &fgMap = ecaltpgFgEBGroup->getMap();
+  EcalTPGGroups::EcalTPGGroupsMapItr it;
+
+  const EcalTPGSpike::EcalTPGSpikeMap &spikeThMap = ecaltpgSpikeTh->getMap();
+  EcalTPGSpike::EcalTPGSpikeMapIterator itSpikeTh;
+
+  std::cout << std::endl;
+  for (it = fgMap.begin(); it != fgMap.end(); ++it) {
+    std::cout << "TOWER_EB " << std::dec << (*it).first << std::endl;
+    lutGroupId = lutMap.find((*it).first);
+    itSpikeTh = spikeThMap.find((*it).first);
+    std::cout << " " << (*it).second << std::endl;
+    std::cout << " " << (*lutGroupId).second << std::endl;
+    std::cout << " " << (*itSpikeTh).second << std::endl;
+  }
 }
 
-void EcalTPCondAnalyzer::printTOWEREE(const EcalTPGFineGrainTowerEE *ecaltpgFineGrainTowerEE,const EcalTPGLutGroup *ecaltpgLutGroup) const {
-
-    EcalTPGFineGrainTowerEEMapIterator it;
-    const EcalTPGFineGrainTowerEEMap& map=ecaltpgFineGrainTowerEE->getMap();
-    const EcalTPGGroups::EcalTPGGroupsMap &lutMap=ecaltpgLutGroup->getMap();
-    EcalTPGGroups::EcalTPGGroupsMapItr lutGroupId;
-
-    std::cout<<std::endl;
-    for (it=map.begin();it!=map.end();++it) {
-      std::cout <<"TOWER_EE "<<std::dec<<(*it).first<<std::endl;
-      lutGroupId=lutMap.find((*it).first);
-      std::cout <<" "<<(*lutGroupId).second<<std::endl;
-      std::cout <<std::hex<<"0x"<<(*it).second<<std::endl;
-    }
+void EcalTPCondAnalyzer::printTOWEREE(
+    const EcalTPGFineGrainTowerEE *ecaltpgFineGrainTowerEE,
+    const EcalTPGLutGroup *ecaltpgLutGroup) const {
+
+  EcalTPGFineGrainTowerEEMapIterator it;
+  const EcalTPGFineGrainTowerEEMap &map = ecaltpgFineGrainTowerEE->getMap();
+  const EcalTPGGroups::EcalTPGGroupsMap &lutMap = ecaltpgLutGroup->getMap();
+  EcalTPGGroups::EcalTPGGroupsMapItr lutGroupId;
+
+  std::cout << std::endl;
+  for (it = map.begin(); it != map.end(); ++it) {
+    std::cout << "TOWER_EE " << std::dec << (*it).first << std::endl;
+    lutGroupId = lutMap.find((*it).first);
+    std::cout << " " << (*lutGroupId).second << std::endl;
+    std::cout << std::hex << "0x" << (*it).second << std::endl;
+  }
 }
 
-/*void EcalTPCondAnalyzer::printBadX(const EcalTPGCrystalStatus *ecaltpgBadX) const {
-  
+/*void EcalTPCondAnalyzer::printBadX(const EcalTPGCrystalStatus *ecaltpgBadX)
+const {
+
   std::ofstream myfile;
   myfile.open("badXvalues.txt");
-  
+
   const EcalTPGCrystalStatusMap & badXMap = ecaltpgBadX->getMap();
 
-  const std::vector<DetId> & ebCells = theBarrelGeometry_->getValidDetIds(DetId::Ecal, EcalBarrel);
+  const std::vector<DetId> & ebCells =
+theBarrelGeometry_->getValidDetIds(DetId::Ecal, EcalBarrel);
 
-  myfile <<"COMMENT ====== barrel masked crystals ====== "<<std::endl; 
-  myfile << "RawId         eta      phi   " << std::endl; 
+  myfile <<"COMMENT ====== barrel masked crystals ====== "<<std::endl;
+  myfile << "RawId         eta      phi   " << std::endl;
 
-  for (std::vector<DetId>::const_iterator it = ebCells.begin(); it != ebCells.end(); ++it) {
+  for (std::vector<DetId>::const_iterator it = ebCells.begin(); it !=
+ebCells.end(); ++it) {
 
     EBDetId id(*it) ;
     const EcalTPGCrystalStatusCode &badXeb=badXMap[id.rawId()];
     // Print in the text file obly the masked crystals
-    if (badXeb.getStatusCode() != 0){    
-      myfile << "" << id.rawId() << "      " << id.ieta() << "      " << id.iphi() << std::endl;
+    if (badXeb.getStatusCode() != 0){
+      myfile << "" << id.rawId() << "      " << id.ieta() << "      " <<
+id.iphi() << std::endl;
     }
-    
+
   }
-  
+
   myfile << " " << std::endl;
 
-  const std::vector<DetId> & eeCells = theEndcapGeometry_->getValidDetIds(DetId::Ecal, EcalEndcap);
-  
-  myfile <<"COMMENT ====== endcap masked crystals ====== "<<std::endl; 
-  myfile << "RawId       x      y      z   " << std::endl; 
-  
-  for (std::vector<DetId>::const_iterator it = eeCells.begin(); it != eeCells.end(); ++it) {
-    
+  const std::vector<DetId> & eeCells =
+theEndcapGeometry_->getValidDetIds(DetId::Ecal, EcalEndcap);
+
+  myfile <<"COMMENT ====== endcap masked crystals ====== "<<std::endl;
+  myfile << "RawId       x      y      z   " << std::endl;
+
+  for (std::vector<DetId>::const_iterator it = eeCells.begin(); it !=
+eeCells.end(); ++it) {
+
     EEDetId id(*it) ;
     const EcalTPGCrystalStatusCode &badXee=badXMap[id.rawId()];
     // Print in the text file only the masked clystals
-    if (badXee.getStatusCode() != 0){ 
-      myfile << "" << id.rawId() << "   " << id.ix() << "      " << id.iy() << "     "<< id.zside() << std::endl;
-    } 
+    if (badXee.getStatusCode() != 0){
+      myfile << "" << id.rawId() << "   " << id.ix() << "      " << id.iy() << "
+"<< id.zside() << std::endl;
+    }
   }
-  
+
   myfile.close();
 }
 */
 
+/*void EcalTPCondAnalyzer::printBadTT(const EcalTPGTowerStatus *ecaltpgBadTT)
+const { std::ofstream myfilebadTT; myfilebadTT.open("badTTvalues.txt"); int ieta
+= 0; int iphi = 0;
 
-/*void EcalTPCondAnalyzer::printBadTT(const EcalTPGTowerStatus *ecaltpgBadTT) const {
-  std::ofstream myfilebadTT;
-  myfilebadTT.open("badTTvalues.txt");
-  int ieta = 0;
-  int iphi = 0;
-  
   const EcalTPGTowerStatusMap & badTTMap = ecaltpgBadTT -> getMap();
   EcalTPGTowerStatusMapIterator it;
-  
+
   myfilebadTT <<"Barrel and endcap masked Trigger Towers"<<std::endl;
   myfilebadTT <<"RawId " << "     iphi " << "  ieta " << std::endl;
   myfilebadTT <<""<< std::endl;
-  
+
   for (it=badTTMap.begin();it!=badTTMap.end();++it) {
-    
+
     // Print in the text file only the masked barrel and endcap TTs
     if ((*it).second != 0){
-    
+
       EcalTrigTowerDetId  ttId((*it).first);
       ieta = ttId.ieta();
       iphi = ttId.iphi();
 
-      myfilebadTT <<""<< std::dec<<(*it).first << "  " << iphi << "     " << ieta << std::endl;
-      
+      myfilebadTT <<""<< std::dec<<(*it).first << "  " << iphi << "     " <<
+ieta << std::endl;
+
     }
   }
-  
-  
+
+
   myfilebadTT.close();
 
 }
diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPCondAnalyzer.h b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPCondAnalyzer.h
index e122d4129f213..3d5f8209ff2a3 100644
--- a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPCondAnalyzer.h
+++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPCondAnalyzer.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // Class:      EcalTPCondAnalyzer
-// 
+//
 /**\class EcalTPCondAnalyzer
 
  Description: prints the TPG conditions coming from the conditions DB
@@ -14,10 +14,9 @@
 //
 //
 
-
 // system include files
-#include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
@@ -26,64 +25,67 @@
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "CondFormats/EcalObjects/interface/EcalTPGLinearizationConst.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGPedestals.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGSlidingWindow.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGWeightIdMap.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGWeightGroup.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainStripEE.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGCrystalStatus.h"
 #include "CondFormats/EcalObjects/interface/EcalTPGFineGrainEBGroup.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGLutGroup.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGLutIdMap.h"
 #include "CondFormats/EcalObjects/interface/EcalTPGFineGrainEBIdMap.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainStripEE.h"
 #include "CondFormats/EcalObjects/interface/EcalTPGFineGrainTowerEE.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGLinearizationConst.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGLutGroup.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGLutIdMap.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGPedestals.h"
 #include "CondFormats/EcalObjects/interface/EcalTPGPhysicsConst.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGCrystalStatus.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGTowerStatus.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGStripStatus.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGSlidingWindow.h"
 #include "CondFormats/EcalObjects/interface/EcalTPGSpike.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGStripStatus.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGTowerStatus.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGWeightGroup.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGWeightIdMap.h"
 
-class CaloSubdetectorGeometry ;
+class CaloSubdetectorGeometry;
 
-#include <vector>
 #include <string>
+#include <vector>
 
 //
 // class declaration
 //
 
 class EcalTPCondAnalyzer : public edm::one::EDAnalyzer<> {
- public:
-  explicit EcalTPCondAnalyzer(const edm::ParameterSet&);
+public:
+  explicit EcalTPCondAnalyzer(const edm::ParameterSet &);
   ~EcalTPCondAnalyzer() override;
 
-
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
   void beginJob() override;
-  void beginRun(const edm::Run & run, const edm::EventSetup& es);
+  void beginRun(const edm::Run &run, const edm::EventSetup &es);
   void endJob() override;
 
- private:
-
-  unsigned long long getRecords(edm::EventSetup const& setup);
+private:
+  unsigned long long getRecords(edm::EventSetup const &setup);
   unsigned long long cacheID_;
 
-  const CaloSubdetectorGeometry * theEndcapGeometry_ ;
-  const CaloSubdetectorGeometry * theBarrelGeometry_ ;
+  const CaloSubdetectorGeometry *theEndcapGeometry_;
+  const CaloSubdetectorGeometry *theBarrelGeometry_;
 
   void printComment() const;
   void printEcalTPGPhysicsConst(const EcalTPGPhysicsConst *) const;
-  void printCRYSTAL(const EcalTPGPedestals * ecaltpPed, const EcalTPGLinearizationConst * ecaltpLin ) ;
-  void printSTRIP(const EcalTPGSlidingWindow *ecaltpgSlidW,const EcalTPGWeightGroup *ecaltpgWeightGroup,const EcalTPGFineGrainStripEE * ecaltpgFgStripEE) const;
-  void printWEIGHT(const EcalTPGWeightIdMap * ecaltpgWeightMap) const ;
-  void printTOWEREB(const EcalTPGSpike *ecaltpgSpike, const EcalTPGFineGrainEBGroup *ecaltpgFgEBGroup,const EcalTPGLutGroup *ecaltpgLutGroup) const;
+  void printCRYSTAL(const EcalTPGPedestals *ecaltpPed,
+                    const EcalTPGLinearizationConst *ecaltpLin);
+  void printSTRIP(const EcalTPGSlidingWindow *ecaltpgSlidW,
+                  const EcalTPGWeightGroup *ecaltpgWeightGroup,
+                  const EcalTPGFineGrainStripEE *ecaltpgFgStripEE) const;
+  void printWEIGHT(const EcalTPGWeightIdMap *ecaltpgWeightMap) const;
+  void printTOWEREB(const EcalTPGSpike *ecaltpgSpike,
+                    const EcalTPGFineGrainEBGroup *ecaltpgFgEBGroup,
+                    const EcalTPGLutGroup *ecaltpgLutGroup) const;
   void printEcalTPGLutIdMap(const EcalTPGLutIdMap *ecaltpgLut) const;
-  void printEcalTPGFineGrainEBIdMap(const EcalTPGFineGrainEBIdMap *ecaltpgFineGrainEB) const ;
-  void printTOWEREE(const EcalTPGFineGrainTowerEE *ecaltpgFineGrainTowerEE,const EcalTPGLutGroup *ecaltpgLutGroup) const ;
-  void printBadX(const EcalTPGCrystalStatus *ecaltpgBadX) const; 
+  void printEcalTPGFineGrainEBIdMap(
+      const EcalTPGFineGrainEBIdMap *ecaltpgFineGrainEB) const;
+  void printTOWEREE(const EcalTPGFineGrainTowerEE *ecaltpgFineGrainTowerEE,
+                    const EcalTPGLutGroup *ecaltpgLutGroup) const;
+  void printBadX(const EcalTPGCrystalStatus *ecaltpgBadX) const;
   void printBadTT(const EcalTPGTowerStatus *ecaltpgBadTT) const;
   void printBadStrip(const EcalTPGStripStatus *ecaltpgBadStrip) const;
   void printSpikeTh(const EcalTPGSpike *ecaltpgSpike) const;
-
 };
-
diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.cc b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.cc
index 50764642e6884..2f80cd022a3e7 100644
--- a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.cc
+++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.cc
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // Class:      EcalTPInputAnalyzer
-// 
+//
 /**\class EcalTPInputAnalyzer
 
  Description: test of the input of EcalTrigPrimProducer
@@ -14,129 +14,122 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <utility>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "EcalTPInputAnalyzer.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "DataFormats/EcalDigi/interface/EcalTriggerPrimitiveDigi.h"
+#include "EcalTPInputAnalyzer.h"
 
 using namespace edm;
 
-EcalTPInputAnalyzer::EcalTPInputAnalyzer(const edm::ParameterSet& iConfig)
+EcalTPInputAnalyzer::EcalTPInputAnalyzer(const edm::ParameterSet &iConfig)
 
 {
-  histfile_=new TFile("histos.root","UPDATE");
-  histEndc = new TH1I("AdcE","Adc-s for Endcap",100,0.,5000.);
-  histBar = new TH1I("AdcB","Adc-s for Barrel",100,0.,5000.);
+  histfile_ = new TFile("histos.root", "UPDATE");
+  histEndc = new TH1I("AdcE", "Adc-s for Endcap", 100, 0., 5000.);
+  histBar = new TH1I("AdcB", "Adc-s for Barrel", 100, 0., 5000.);
   ecal_parts_.push_back("Barrel");
   ecal_parts_.push_back("Endcap");
 
-//   for (unsigned int i=0;i<2;++i) {
-//     ecal_et_[i]=new TH1I(ecal_parts_[i].c_str(),"Et",255,0,255);
-//     char title[30];
-//     sprintf(title,"%s_ttf",ecal_parts_[i].c_str());
-//     ecal_tt_[i]=new TH1I(title,"TTF",10,0,10);
-//     sprintf(title,"%s_fgvb",ecal_parts_[i].c_str());
-//     ecal_fgvb_[i]=new TH1I(title,"FGVB",10,0,10);
-//   }
-   producer_= iConfig.getParameter<std::string>("Producer");
-   ebLabel_= iConfig.getParameter<std::string>("EBLabel");
-   eeLabel_= iConfig.getParameter<std::string>("EELabel");
+  //   for (unsigned int i=0;i<2;++i) {
+  //     ecal_et_[i]=new TH1I(ecal_parts_[i].c_str(),"Et",255,0,255);
+  //     char title[30];
+  //     sprintf(title,"%s_ttf",ecal_parts_[i].c_str());
+  //     ecal_tt_[i]=new TH1I(title,"TTF",10,0,10);
+  //     sprintf(title,"%s_fgvb",ecal_parts_[i].c_str());
+  //     ecal_fgvb_[i]=new TH1I(title,"FGVB",10,0,10);
+  //   }
+  producer_ = iConfig.getParameter<std::string>("Producer");
+  ebLabel_ = iConfig.getParameter<std::string>("EBLabel");
+  eeLabel_ = iConfig.getParameter<std::string>("EELabel");
 }
 
+EcalTPInputAnalyzer::~EcalTPInputAnalyzer() {
 
-EcalTPInputAnalyzer::~EcalTPInputAnalyzer()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 
   histfile_->Write();
   histfile_->Close();
-
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to analyze the data  ------------
-void
-EcalTPInputAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void EcalTPInputAnalyzer::analyze(const edm::Event &iEvent,
+                                  const edm::EventSetup &iSetup) {
   using namespace edm;
   using namespace std;
 
-  bool barrel=true;
+  bool barrel = true;
   edm::Handle<EBDigiCollection> ebDigis;
   edm::Handle<EEDigiCollection> eeDigis;
-  if (!iEvent.getByLabel(producer_,ebLabel_,ebDigis)) {
-    barrel=false;
-    edm::LogWarning("EcalTPG") <<" Couldnt find Barrel dataframes with Producer:"<<producer_<<" and label: "<<ebLabel_;
+  if (!iEvent.getByLabel(producer_, ebLabel_, ebDigis)) {
+    barrel = false;
+    edm::LogWarning("EcalTPG")
+        << " Couldnt find Barrel dataframes with Producer:" << producer_
+        << " and label: " << ebLabel_;
   }
-  bool endcap=true;
-  if (!iEvent.getByLabel(producer_,eeLabel_,eeDigis)) {
-    endcap=false;
-    edm::LogWarning("EcalTPG") <<" Couldnt find Endcap dataframes with Producer:"<<producer_<<" and label: "<<eeLabel_;
+  bool endcap = true;
+  if (!iEvent.getByLabel(producer_, eeLabel_, eeDigis)) {
+    endcap = false;
+    edm::LogWarning("EcalTPG")
+        << " Couldnt find Endcap dataframes with Producer:" << producer_
+        << " and label: " << eeLabel_;
   }
-  //barrel
+  // barrel
   if (barrel) {
-    const EBDigiCollection *ebdb=ebDigis.product();
-    for (unsigned int i=0;i<ebDigis->size();++i) {
-      EBDataFrame ebdf=(*ebdb)[i];
-      int nrSamples=ebdf.size();
-      //unsigned int nrSamples=(ebDigis.product())[i].size();
-      for (int is=0;is<nrSamples;++is) {
-	//	EcalMGPASample sam=((ebDigis.product())[i])[is];
-	EcalMGPASample sam=ebdf[is];
-	histBar->Fill(sam.adc());
+    const EBDigiCollection *ebdb = ebDigis.product();
+    for (unsigned int i = 0; i < ebDigis->size(); ++i) {
+      EBDataFrame ebdf = (*ebdb)[i];
+      int nrSamples = ebdf.size();
+      // unsigned int nrSamples=(ebDigis.product())[i].size();
+      for (int is = 0; is < nrSamples; ++is) {
+        //	EcalMGPASample sam=((ebDigis.product())[i])[is];
+        EcalMGPASample sam = ebdf[is];
+        histBar->Fill(sam.adc());
       }
     }
   }
-  //endcap
+  // endcap
   if (endcap) {
-    const EEDigiCollection *eedb=eeDigis.product();
-    for (unsigned int i=0;i<eeDigis->size();++i) {
-      EEDataFrame eedf=(*eedb)[i];
-      int nrSamples=eedf.size();
-      for (int is=0;is<nrSamples;++is) {
-	EcalMGPASample sam=eedf[is];
-	histEndc->Fill(sam.adc());
+    const EEDigiCollection *eedb = eeDigis.product();
+    for (unsigned int i = 0; i < eeDigis->size(); ++i) {
+      EEDataFrame eedf = (*eedb)[i];
+      int nrSamples = eedf.size();
+      for (int is = 0; is < nrSamples; ++is) {
+        EcalMGPASample sam = eedf[is];
+        histEndc->Fill(sam.adc());
       }
     }
   }
-//   // Get input
-//   edm::Handle<EcalTrigPrimDigiCollection> tp;
-//   iEvent.getByLabel(label_,producer_,tp);
-//   for (unsigned int i=0;i<tp.product()->size();i++) {
-//     EcalTriggerPrimitiveDigi d=(*(tp.product()))[i];
-//     int subdet=d.id().subDet()-1;
-//       ecal_et_[subdet]->Fill(d.compressedEt());
-//       ecal_tt_[subdet]->Fill(d.ttFlag());
-//       ecal_fgvb_[subdet]->Fill(d.fineGrain());
-//   }
+  //   // Get input
+  //   edm::Handle<EcalTrigPrimDigiCollection> tp;
+  //   iEvent.getByLabel(label_,producer_,tp);
+  //   for (unsigned int i=0;i<tp.product()->size();i++) {
+  //     EcalTriggerPrimitiveDigi d=(*(tp.product()))[i];
+  //     int subdet=d.id().subDet()-1;
+  //       ecal_et_[subdet]->Fill(d.compressedEt());
+  //       ecal_tt_[subdet]->Fill(d.ttFlag());
+  //       ecal_fgvb_[subdet]->Fill(d.fineGrain());
+  //   }
 }
 
-void
-EcalTPInputAnalyzer::endJob(){
-  histEndc ->Write();
-  histBar  ->Write();
+void EcalTPInputAnalyzer::endJob() {
+  histEndc->Write();
+  histBar->Write();
 }
-  
-    
-
-
diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.h b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.h
index 57d956e80c045..ecbdd22bad579 100644
--- a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.h
+++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.h
@@ -3,7 +3,7 @@
 // -*- C++ -*-
 //
 // Class:      EcalTPInutAnalyzer
-// 
+//
 /**\class EcalTPInutAnalyzer
 
  Description: rereads the result of the EcalTrigPrimProducer
@@ -15,46 +15,42 @@
 //
 //
 
-
 // system include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include <vector>
-#include <string>
-#include <TH1I.h>
 #include <TFile.h>
-
+#include <TH1I.h>
+#include <string>
+#include <vector>
 
 //
 // class declaration
 //
 
 class EcalTPInputAnalyzer : public edm::EDAnalyzer {
-   public:
-      explicit EcalTPInputAnalyzer(const edm::ParameterSet&);
-      ~EcalTPInputAnalyzer() override;
+public:
+  explicit EcalTPInputAnalyzer(const edm::ParameterSet &);
+  ~EcalTPInputAnalyzer() override;
 
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      void endJob() override;
-
-   private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
 
+private:
   // for histos of nr of hits
   std::vector<std::string> ecal_parts_;
-  TH1I * ecal_et_[2];
-  TH1I * ecal_tt_[2];
-  TH1I * ecal_fgvb_[2];
-  TH1I *histEndc,*histBar;
+  TH1I *ecal_et_[2];
+  TH1I *ecal_tt_[2];
+  TH1I *ecal_fgvb_[2];
+  TH1I *histEndc, *histBar;
   TFile *histfile_;
-  
+
   std::string ebLabel_;
   std::string eeLabel_;
   std::string producer_;
-
 };
 #endif
diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.cc b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.cc
index 859c3da1c4f7a..cce989a6bdb4b 100644
--- a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.cc
+++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.cc
@@ -14,7 +14,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <utility>
@@ -24,19 +23,19 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "Geometry/CaloTopology/interface/EcalTrigTowerConstituentsMap.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "Geometry/CaloTopology/interface/EcalTrigTowerConstituentsMap.h"
 
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "DataFormats/EcalDigi/interface/EcalTriggerPrimitiveDigi.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHit.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 
+#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 
 #include "CalibCalorimetry/EcalTPGTools/interface/EcalTPGScale.h"
@@ -48,190 +47,193 @@
 using namespace edm;
 class CaloSubdetectorGeometry;
 
-EcalTrigPrimAnalyzer::EcalTrigPrimAnalyzer(const edm::ParameterSet&  iConfig)
+EcalTrigPrimAnalyzer::EcalTrigPrimAnalyzer(const edm::ParameterSet &iConfig)
 
 {
   ecal_parts_.push_back("Barrel");
   ecal_parts_.push_back("Endcap");
 
-  histfile_=new TFile("histos.root","RECREATE");
-  tree_ = new TTree("TPGtree","TPGtree");
-  tree_->Branch("iphi",&iphi_,"iphi/I");
-  tree_->Branch("ieta",&ieta_,"ieta/I");
-  tree_->Branch("eRec",&eRec_,"eRec/F");
-  tree_->Branch("tpgADC",&tpgADC_,"tpgADC/I");
-  tree_->Branch("tpgGeV",&tpgGeV_,"tpgGeV/F");
-  tree_->Branch("ttf",&ttf_,"ttf/I");
-  tree_->Branch("fg",&fg_,"fg/I");
-  for (unsigned int i=0;i<2;++i) {
-    ecal_et_[i]=new TH1I(ecal_parts_[i].c_str(),"Et",255,0,255);
+  histfile_ = new TFile("histos.root", "RECREATE");
+  tree_ = new TTree("TPGtree", "TPGtree");
+  tree_->Branch("iphi", &iphi_, "iphi/I");
+  tree_->Branch("ieta", &ieta_, "ieta/I");
+  tree_->Branch("eRec", &eRec_, "eRec/F");
+  tree_->Branch("tpgADC", &tpgADC_, "tpgADC/I");
+  tree_->Branch("tpgGeV", &tpgGeV_, "tpgGeV/F");
+  tree_->Branch("ttf", &ttf_, "ttf/I");
+  tree_->Branch("fg", &fg_, "fg/I");
+  for (unsigned int i = 0; i < 2; ++i) {
+    ecal_et_[i] = new TH1I(ecal_parts_[i].c_str(), "Et", 255, 0, 255);
     char title[30];
-    sprintf(title,"%s_ttf",ecal_parts_[i].c_str());
-    ecal_tt_[i]=new TH1I(title,"TTF",10,0,10);
-    sprintf(title,"%s_fgvb",ecal_parts_[i].c_str());
-    ecal_fgvb_[i]=new TH1I(title,"FGVB",10,0,10);
+    sprintf(title, "%s_ttf", ecal_parts_[i].c_str());
+    ecal_tt_[i] = new TH1I(title, "TTF", 10, 0, 10);
+    sprintf(title, "%s_fgvb", ecal_parts_[i].c_str());
+    ecal_fgvb_[i] = new TH1I(title, "FGVB", 10, 0, 10);
   }
 
-  recHits_= iConfig.getParameter<bool>("AnalyzeRecHits");
-  label_=iConfig.getParameter<edm::InputTag>("inputTP");
+  recHits_ = iConfig.getParameter<bool>("AnalyzeRecHits");
+  label_ = iConfig.getParameter<edm::InputTag>("inputTP");
   if (recHits_) {
-    hTPvsRechit_= new TH2F("TP_vs_RecHit","TP vs  rechit",256,-1,255,255,0,255);
-    hTPoverRechit_= new TH1F("TP_over_RecHit","TP over rechit",500,0,4);
-    rechits_labelEB_=iConfig.getParameter<edm::InputTag>("inputRecHitsEB");
-    rechits_labelEE_=iConfig.getParameter<edm::InputTag>("inputRecHitsEE");
+    hTPvsRechit_ =
+        new TH2F("TP_vs_RecHit", "TP vs  rechit", 256, -1, 255, 255, 0, 255);
+    hTPoverRechit_ = new TH1F("TP_over_RecHit", "TP over rechit", 500, 0, 4);
+    rechits_labelEB_ = iConfig.getParameter<edm::InputTag>("inputRecHitsEB");
+    rechits_labelEE_ = iConfig.getParameter<edm::InputTag>("inputRecHitsEE");
   }
 }
 
+EcalTrigPrimAnalyzer::~EcalTrigPrimAnalyzer() {
 
-EcalTrigPrimAnalyzer::~EcalTrigPrimAnalyzer()
-{
-
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 
   histfile_->Write();
   histfile_->Close();
-
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to analyze the data  ------------
-void
-EcalTrigPrimAnalyzer::analyze(const edm::Event& iEvent, const  edm::EventSetup & iSetup)
-{
+void EcalTrigPrimAnalyzer::analyze(const edm::Event &iEvent,
+                                   const edm::EventSetup &iSetup) {
   using namespace edm;
   using namespace std;
 
   // Get input
   edm::Handle<EcalTrigPrimDigiCollection> tp;
-  iEvent.getByLabel(label_,tp);
-  for (unsigned int i=0;i<tp.product()->size();i++) {
-    EcalTriggerPrimitiveDigi d=(*(tp.product()))[i];
-    int subdet=d.id().subDet()-1;
-    if (subdet==0) {
+  iEvent.getByLabel(label_, tp);
+  for (unsigned int i = 0; i < tp.product()->size(); i++) {
+    EcalTriggerPrimitiveDigi d = (*(tp.product()))[i];
+    int subdet = d.id().subDet() - 1;
+    if (subdet == 0) {
       ecal_et_[subdet]->Fill(d.compressedEt());
-    }
-    else {
-      if (d.id().ietaAbs()==27 || d.id().ietaAbs()==28) {
-	if (i%2) ecal_et_[subdet]->Fill(d.compressedEt()*2.);
-      }
-      else ecal_et_[subdet]->Fill(d.compressedEt());
+    } else {
+      if (d.id().ietaAbs() == 27 || d.id().ietaAbs() == 28) {
+        if (i % 2)
+          ecal_et_[subdet]->Fill(d.compressedEt() * 2.);
+      } else
+        ecal_et_[subdet]->Fill(d.compressedEt());
     }
     ecal_tt_[subdet]->Fill(d.ttFlag());
     ecal_fgvb_[subdet]->Fill(d.fineGrain());
-
   }
-  if (!recHits_) return;
+  if (!recHits_)
+    return;
 
   // comparison with RecHits
   edm::Handle<EcalRecHitCollection> rechit_EB_col;
-  iEvent.getByLabel(rechits_labelEB_,rechit_EB_col);
+  iEvent.getByLabel(rechits_labelEB_, rechit_EB_col);
 
   edm::Handle<EcalRecHitCollection> rechit_EE_col;
-  iEvent.getByLabel(rechits_labelEE_,rechit_EE_col);
-  
+  iEvent.getByLabel(rechits_labelEE_, rechit_EE_col);
 
   edm::ESHandle<CaloGeometry> theGeometry;
   edm::ESHandle<CaloSubdetectorGeometry> theBarrelGeometry_handle;
   edm::ESHandle<CaloSubdetectorGeometry> theEndcapGeometry_handle;
-  iSetup.get<CaloGeometryRecord>().get( theGeometry );
-  iSetup.get<EcalEndcapGeometryRecord>().get("EcalEndcap",theEndcapGeometry_handle);
-  iSetup.get<EcalBarrelGeometryRecord>().get("EcalBarrel",theBarrelGeometry_handle);
-
-  const CaloSubdetectorGeometry* theEndcapGeometry = theEndcapGeometry_handle.product();
-  const CaloSubdetectorGeometry* theBarrelGeometry = theBarrelGeometry_handle.product();
+  iSetup.get<CaloGeometryRecord>().get(theGeometry);
+  iSetup.get<EcalEndcapGeometryRecord>().get("EcalEndcap",
+                                             theEndcapGeometry_handle);
+  iSetup.get<EcalBarrelGeometryRecord>().get("EcalBarrel",
+                                             theBarrelGeometry_handle);
+
+  const CaloSubdetectorGeometry *theEndcapGeometry =
+      theEndcapGeometry_handle.product();
+  const CaloSubdetectorGeometry *theBarrelGeometry =
+      theBarrelGeometry_handle.product();
   edm::ESHandle<EcalTrigTowerConstituentsMap> eTTmap_;
   iSetup.get<IdealGeometryRecord>().get(eTTmap_);
 
   map<EcalTrigTowerDetId, float> mapTow_Et;
 
-
-  for (unsigned int i=0;i<rechit_EB_col.product()->size();i++) {
-    const EBDetId & myid1=(*rechit_EB_col.product())[i].id();
-    EcalTrigTowerDetId towid1= myid1.tower();
-    float theta =  theBarrelGeometry->getGeometry(myid1)->getPosition().theta();
-    float Etsum=((*rechit_EB_col.product())[i].energy())*sin(theta);
-    bool test_alreadyin= false;
-    map<EcalTrigTowerDetId, float>::iterator ittest=  mapTow_Et.find(towid1);
-    if (ittest!= mapTow_Et.end()) test_alreadyin=true;
-    if (test_alreadyin) continue;
-    unsigned int j=i+1;
-    bool loopend=false;
-    unsigned int count=0;
-    while( j<rechit_EB_col.product()->size() && !loopend){
+  for (unsigned int i = 0; i < rechit_EB_col.product()->size(); i++) {
+    const EBDetId &myid1 = (*rechit_EB_col.product())[i].id();
+    EcalTrigTowerDetId towid1 = myid1.tower();
+    float theta = theBarrelGeometry->getGeometry(myid1)->getPosition().theta();
+    float Etsum = ((*rechit_EB_col.product())[i].energy()) * sin(theta);
+    bool test_alreadyin = false;
+    map<EcalTrigTowerDetId, float>::iterator ittest = mapTow_Et.find(towid1);
+    if (ittest != mapTow_Et.end())
+      test_alreadyin = true;
+    if (test_alreadyin)
+      continue;
+    unsigned int j = i + 1;
+    bool loopend = false;
+    unsigned int count = 0;
+    while (j < rechit_EB_col.product()->size() && !loopend) {
       count++;
-      const EBDetId & myid2=(*rechit_EB_col.product())[j].id();
-      EcalTrigTowerDetId towid2= myid2.tower();
-      if( towid1==towid2 ) {
-	float  theta=theBarrelGeometry->getGeometry(myid2)->getPosition().theta();
-	Etsum += (*rechit_EB_col.product())[j].energy()*sin(theta);
+      const EBDetId &myid2 = (*rechit_EB_col.product())[j].id();
+      EcalTrigTowerDetId towid2 = myid2.tower();
+      if (towid1 == towid2) {
+        float theta =
+            theBarrelGeometry->getGeometry(myid2)->getPosition().theta();
+        Etsum += (*rechit_EB_col.product())[j].energy() * sin(theta);
       }
       j++;
-      if (count>1800) loopend=true;
+      if (count > 1800)
+        loopend = true;
     }
-    mapTow_Et.insert(pair<EcalTrigTowerDetId,float>(towid1, Etsum));
+    mapTow_Et.insert(pair<EcalTrigTowerDetId, float>(towid1, Etsum));
   }
 
-
-  for (unsigned int i=0;i<rechit_EE_col.product()->size();i++) {
-    const EEDetId & myid1=(*rechit_EE_col.product())[i].id();
-    EcalTrigTowerDetId towid1= (*eTTmap_).towerOf(myid1);
-    float  theta=theEndcapGeometry->getGeometry(myid1)->getPosition().theta();
-    float Etsum=(*rechit_EE_col.product())[i].energy()*sin(theta);
-    bool test_alreadyin= false;
-    map<EcalTrigTowerDetId, float>::iterator ittest=  mapTow_Et.find(towid1);
-    if (ittest!= mapTow_Et.end()) test_alreadyin=true;
-    if (test_alreadyin) continue;
-    unsigned int j=i+1;
-    bool loopend=false;
-    unsigned int count=0;
-    while( j<rechit_EE_col.product()->size() && !loopend){
-      const EEDetId & myid2=(*rechit_EE_col.product())[j].id();
-      EcalTrigTowerDetId towid2= (*eTTmap_).towerOf(myid2);
-      if( towid1==towid2 ) {
-	float  theta=theEndcapGeometry->getGeometry(myid2)->getPosition().theta();
-	Etsum += (*rechit_EE_col.product())[j].energy()*sin(theta);
+  for (unsigned int i = 0; i < rechit_EE_col.product()->size(); i++) {
+    const EEDetId &myid1 = (*rechit_EE_col.product())[i].id();
+    EcalTrigTowerDetId towid1 = (*eTTmap_).towerOf(myid1);
+    float theta = theEndcapGeometry->getGeometry(myid1)->getPosition().theta();
+    float Etsum = (*rechit_EE_col.product())[i].energy() * sin(theta);
+    bool test_alreadyin = false;
+    map<EcalTrigTowerDetId, float>::iterator ittest = mapTow_Et.find(towid1);
+    if (ittest != mapTow_Et.end())
+      test_alreadyin = true;
+    if (test_alreadyin)
+      continue;
+    unsigned int j = i + 1;
+    bool loopend = false;
+    unsigned int count = 0;
+    while (j < rechit_EE_col.product()->size() && !loopend) {
+      const EEDetId &myid2 = (*rechit_EE_col.product())[j].id();
+      EcalTrigTowerDetId towid2 = (*eTTmap_).towerOf(myid2);
+      if (towid1 == towid2) {
+        float theta =
+            theEndcapGeometry->getGeometry(myid2)->getPosition().theta();
+        Etsum += (*rechit_EE_col.product())[j].energy() * sin(theta);
       }
       //  else loopend=true;
       j++;
-      if (count>500) loopend=true;
+      if (count > 500)
+        loopend = true;
     }
     //    alreadyin_EE.push_back(towid1);
-    mapTow_Et.insert(pair<EcalTrigTowerDetId,float>(towid1, Etsum));
+    mapTow_Et.insert(pair<EcalTrigTowerDetId, float>(towid1, Etsum));
   }
 
-
-  EcalTPGScale ecalScale ;
-  ecalScale.setEventSetup(iSetup) ;
-  for (unsigned int i=0;i<tp.product()->size();i++) {
-    EcalTriggerPrimitiveDigi d=(*(tp.product()))[i];
-    const EcalTrigTowerDetId TPtowid= d.id();
-    map<EcalTrigTowerDetId, float>::iterator it=  mapTow_Et.find(TPtowid);
-    float Et = ecalScale.getTPGInGeV(d.compressedEt(), TPtowid) ; 
-    if (d.id().ietaAbs()==27 || d.id().ietaAbs()==28)    Et*=2;
-    iphi_ = TPtowid.iphi() ;
-    ieta_ = TPtowid.ieta() ;
-    tpgADC_ = d.compressedEt() ;
-    tpgGeV_ = Et ;
-    ttf_ = d.ttFlag() ;
-    fg_ = d.fineGrain() ;
-    if (it!= mapTow_Et.end()) {
-      hTPvsRechit_->Fill(it->second,Et);
-      hTPoverRechit_->Fill(Et/it->second);
-      eRec_ = it->second ;
+  EcalTPGScale ecalScale;
+  ecalScale.setEventSetup(iSetup);
+  for (unsigned int i = 0; i < tp.product()->size(); i++) {
+    EcalTriggerPrimitiveDigi d = (*(tp.product()))[i];
+    const EcalTrigTowerDetId TPtowid = d.id();
+    map<EcalTrigTowerDetId, float>::iterator it = mapTow_Et.find(TPtowid);
+    float Et = ecalScale.getTPGInGeV(d.compressedEt(), TPtowid);
+    if (d.id().ietaAbs() == 27 || d.id().ietaAbs() == 28)
+      Et *= 2;
+    iphi_ = TPtowid.iphi();
+    ieta_ = TPtowid.ieta();
+    tpgADC_ = d.compressedEt();
+    tpgGeV_ = Et;
+    ttf_ = d.ttFlag();
+    fg_ = d.fineGrain();
+    if (it != mapTow_Et.end()) {
+      hTPvsRechit_->Fill(it->second, Et);
+      hTPoverRechit_->Fill(Et / it->second);
+      eRec_ = it->second;
     }
-    tree_->Fill() ;
+    tree_->Fill();
   }
-
 }
 
-void
-EcalTrigPrimAnalyzer::endJob(){
-  for (unsigned int i=0;i<2;++i) {
+void EcalTrigPrimAnalyzer::endJob() {
+  for (unsigned int i = 0; i < 2; ++i) {
     ecal_et_[i]->Write();
     ecal_tt_[i]->Write();
     ecal_fgvb_[i]->Write();
@@ -241,4 +243,3 @@ EcalTrigPrimAnalyzer::endJob(){
     hTPoverRechit_->Write();
   }
 }
-  
diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.h b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.h
index 75d4505dfd5e7..ffaabda9f6c78 100644
--- a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.h
+++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 //
 // Class:      EcalTrigPrimAnalyzer
-// 
+//
 /**\class EcalTrigPrimAnalyzer
 
  Description: rereads the result of the EcalTrigPrimProducer
@@ -13,51 +13,49 @@
 //
 //
 
-
 // system include files
 //#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include <vector>
-#include <string>
-#include <TH1I.h>
 #include <TFile.h>
-#include <TTree.h>
-#include <TH2F.h>
 #include <TH1F.h>
+#include <TH1I.h>
+#include <TH2F.h>
+#include <TTree.h>
+#include <string>
+#include <vector>
 
 //
 // class declaration
 //
 
 class EcalTrigPrimAnalyzer : public edm::one::EDAnalyzer<> {
-   public:
-      explicit EcalTrigPrimAnalyzer(const edm::ParameterSet&);
-      ~EcalTrigPrimAnalyzer() override;
+public:
+  explicit EcalTrigPrimAnalyzer(const edm::ParameterSet &);
+  ~EcalTrigPrimAnalyzer() override;
 
-
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
   void endJob() override;
-   private:
 
+private:
   // for histos of nr of hits
   std::vector<std::string> ecal_parts_;
-  TH1I * ecal_et_[2];
-  TH1I * ecal_tt_[2];
-  TH1I * ecal_fgvb_[2];
-  TH1I *histEndc,*histBar;
+  TH1I *ecal_et_[2];
+  TH1I *ecal_tt_[2];
+  TH1I *ecal_fgvb_[2];
+  TH1I *histEndc, *histBar;
   TFile *histfile_;
   TH2F *hTPvsRechit_;
   TH1F *hTPoverRechit_;
-  TTree *tree_ ;
+  TTree *tree_;
 
-  int iphi_, ieta_ , tpgADC_, ttf_, fg_ ;
-  float eRec_, tpgGeV_ ;
+  int iphi_, ieta_, tpgADC_, ttf_, fg_;
+  float eRec_, tpgGeV_;
 
   edm::InputTag label_;
 
@@ -66,4 +64,3 @@ class EcalTrigPrimAnalyzer : public edm::one::EDAnalyzer<> {
 
   bool recHits_;
 };
-
diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimESProducer.cc b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimESProducer.cc
index d4480f68d2c8c..7f813c479abc3 100644
--- a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimESProducer.cc
+++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimESProducer.cc
@@ -1,9 +1,9 @@
 // user include files
 #include "EcalTrigPrimESProducer.h"
 
-#include <iostream>
-#include <fstream>
 #include <TMath.h>
+#include <fstream>
+#include <iostream>
 #include <sstream>
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -12,83 +12,70 @@
 // input stream from a gz file
 //
 
-struct GzInputStream
- {
+struct GzInputStream {
   gzFile gzf;
-  char buffer[256] ;
-  std::istringstream iss ;
-  bool eof ;
-  GzInputStream( const char * file )
-   : eof(false)
-   {
-    gzf = gzopen(file,"rb") ;
-    if (gzf==Z_NULL)
-     {
-      eof = true ;
-      edm::LogWarning("EcalTPG") <<"Database file "<<file<<" not found!!!";
-     }
-    else readLine() ;
-   }
-  void readLine()
-   {
-    char * res = gzgets(gzf,buffer,256) ;
-    eof = (res==Z_NULL) ;
-    if (!eof)
-     {
-      iss.clear() ;
-      iss.str(buffer) ;
-     }
-   }
-  ~GzInputStream()
-   { gzclose(gzf) ; }
-  explicit operator bool() const
-  {
+  char buffer[256];
+  std::istringstream iss;
+  bool eof;
+  GzInputStream(const char *file) : eof(false) {
+    gzf = gzopen(file, "rb");
+    if (gzf == Z_NULL) {
+      eof = true;
+      edm::LogWarning("EcalTPG") << "Database file " << file << " not found!!!";
+    } else
+      readLine();
+  }
+  void readLine() {
+    char *res = gzgets(gzf, buffer, 256);
+    eof = (res == Z_NULL);
+    if (!eof) {
+      iss.clear();
+      iss.str(buffer);
+    }
+  }
+  ~GzInputStream() { gzclose(gzf); }
+  explicit operator bool() const {
     return ((eof == true) ? false : !iss.fail());
   }
- } ;
-
-template <typename T>
-GzInputStream & operator>>( GzInputStream & gis, T & var )
- {
-  while ((bool)gis && !(gis.iss >> var))
-   { gis.readLine() ; }
-  return gis ;
- }
+};
 
+template <typename T> GzInputStream &operator>>(GzInputStream &gis, T &var) {
+  while ((bool)gis && !(gis.iss >> var)) {
+    gis.readLine();
+  }
+  return gis;
+}
 
 //
 // constructors and destructor
 //
 
-EcalTrigPrimESProducer::EcalTrigPrimESProducer(const edm::ParameterSet& iConfig) :
-  dbFilename_(iConfig.getUntrackedParameter<std::string>("DatabaseFile","")),
-  flagPrint_(iConfig.getParameter<bool>("WriteInFile"))
-{
-  //the following line is needed to tell the framework what
+EcalTrigPrimESProducer::EcalTrigPrimESProducer(const edm::ParameterSet &iConfig)
+    : dbFilename_(
+          iConfig.getUntrackedParameter<std::string>("DatabaseFile", "")),
+      flagPrint_(iConfig.getParameter<bool>("WriteInFile")) {
+  // the following line is needed to tell the framework what
   // data is being produced
-  setWhatProduced(this, &EcalTrigPrimESProducer::producePedestals) ;
-  setWhatProduced(this, &EcalTrigPrimESProducer::produceLinearizationConst) ;
-  setWhatProduced(this, &EcalTrigPrimESProducer::produceSlidingWindow) ;
-  setWhatProduced(this, &EcalTrigPrimESProducer::produceFineGrainEB) ;
-  setWhatProduced(this, &EcalTrigPrimESProducer::produceFineGrainEEstrip) ;
-  setWhatProduced(this, &EcalTrigPrimESProducer::produceFineGrainEEtower) ;
-  setWhatProduced(this, &EcalTrigPrimESProducer::produceLUT) ;
-  setWhatProduced(this, &EcalTrigPrimESProducer::produceWeight) ;
-  setWhatProduced(this, &EcalTrigPrimESProducer::produceWeightGroup) ;
-  setWhatProduced(this, &EcalTrigPrimESProducer::produceLutGroup) ;
-  setWhatProduced(this, &EcalTrigPrimESProducer::produceFineGrainEBGroup) ;
-  setWhatProduced(this, &EcalTrigPrimESProducer::producePhysicsConst) ;
-  setWhatProduced(this, &EcalTrigPrimESProducer::produceBadX) ;
-  setWhatProduced(this, &EcalTrigPrimESProducer::produceBadStrip) ;
-  setWhatProduced(this, &EcalTrigPrimESProducer::produceBadTT) ;
-  setWhatProduced(this, &EcalTrigPrimESProducer::produceSpike) ;
-  //now do what ever other initialization is needed
+  setWhatProduced(this, &EcalTrigPrimESProducer::producePedestals);
+  setWhatProduced(this, &EcalTrigPrimESProducer::produceLinearizationConst);
+  setWhatProduced(this, &EcalTrigPrimESProducer::produceSlidingWindow);
+  setWhatProduced(this, &EcalTrigPrimESProducer::produceFineGrainEB);
+  setWhatProduced(this, &EcalTrigPrimESProducer::produceFineGrainEEstrip);
+  setWhatProduced(this, &EcalTrigPrimESProducer::produceFineGrainEEtower);
+  setWhatProduced(this, &EcalTrigPrimESProducer::produceLUT);
+  setWhatProduced(this, &EcalTrigPrimESProducer::produceWeight);
+  setWhatProduced(this, &EcalTrigPrimESProducer::produceWeightGroup);
+  setWhatProduced(this, &EcalTrigPrimESProducer::produceLutGroup);
+  setWhatProduced(this, &EcalTrigPrimESProducer::produceFineGrainEBGroup);
+  setWhatProduced(this, &EcalTrigPrimESProducer::producePhysicsConst);
+  setWhatProduced(this, &EcalTrigPrimESProducer::produceBadX);
+  setWhatProduced(this, &EcalTrigPrimESProducer::produceBadStrip);
+  setWhatProduced(this, &EcalTrigPrimESProducer::produceBadTT);
+  setWhatProduced(this, &EcalTrigPrimESProducer::produceSpike);
+  // now do what ever other initialization is needed
 }
 
-
-EcalTrigPrimESProducer::~EcalTrigPrimESProducer()
-{ 
-}
+EcalTrigPrimESProducer::~EcalTrigPrimESProducer() {}
 
 //
 // member functions
@@ -96,677 +83,678 @@ EcalTrigPrimESProducer::~EcalTrigPrimESProducer()
 
 // ------------ method called to produce the data  ------------
 
-
-std::unique_ptr<EcalTPGPedestals> EcalTrigPrimESProducer::producePedestals(const EcalTPGPedestalsRcd & iRecord)
-{
+std::unique_ptr<EcalTPGPedestals>
+EcalTrigPrimESProducer::producePedestals(const EcalTPGPedestalsRcd &iRecord) {
   auto prod = std::make_unique<EcalTPGPedestals>();
-  parseTextFile() ;
-  std::map<uint32_t, std::vector<uint32_t> >::const_iterator it ;
-  for (it = mapXtal_.begin() ; it != mapXtal_.end() ; it++) {
-    EcalTPGPedestal item ;
-    item.mean_x12 = (it->second)[0] ;
-    item.mean_x6  = (it->second)[3] ;
-    item.mean_x1  = (it->second)[6] ;
-    prod->setValue(it->first,item) ;
+  parseTextFile();
+  std::map<uint32_t, std::vector<uint32_t>>::const_iterator it;
+  for (it = mapXtal_.begin(); it != mapXtal_.end(); it++) {
+    EcalTPGPedestal item;
+    item.mean_x12 = (it->second)[0];
+    item.mean_x6 = (it->second)[3];
+    item.mean_x1 = (it->second)[6];
+    prod->setValue(it->first, item);
   }
   return prod;
 }
 
-std::unique_ptr<EcalTPGLinearizationConst> EcalTrigPrimESProducer::produceLinearizationConst(const EcalTPGLinearizationConstRcd & iRecord)
-{
+std::unique_ptr<EcalTPGLinearizationConst>
+EcalTrigPrimESProducer::produceLinearizationConst(
+    const EcalTPGLinearizationConstRcd &iRecord) {
   auto prod = std::make_unique<EcalTPGLinearizationConst>();
-  parseTextFile() ;
-  std::map<uint32_t, std::vector<uint32_t> >::const_iterator it ;
-  for (it = mapXtal_.begin() ; it != mapXtal_.end() ; it++) {
-    EcalTPGLinearizationConstant item ;
-    item.mult_x12 = (it->second)[1] ;
-    item.mult_x6  = (it->second)[4] ;
-    item.mult_x1  = (it->second)[7] ;
-    item.shift_x12 = (it->second)[2] ;
-    item.shift_x6  = (it->second)[5] ;
-    item.shift_x1  = (it->second)[8] ;
-    prod->setValue(it->first,item) ;
+  parseTextFile();
+  std::map<uint32_t, std::vector<uint32_t>>::const_iterator it;
+  for (it = mapXtal_.begin(); it != mapXtal_.end(); it++) {
+    EcalTPGLinearizationConstant item;
+    item.mult_x12 = (it->second)[1];
+    item.mult_x6 = (it->second)[4];
+    item.mult_x1 = (it->second)[7];
+    item.shift_x12 = (it->second)[2];
+    item.shift_x6 = (it->second)[5];
+    item.shift_x1 = (it->second)[8];
+    prod->setValue(it->first, item);
   }
   return prod;
 }
 
-std::unique_ptr<EcalTPGSlidingWindow> EcalTrigPrimESProducer::produceSlidingWindow(const EcalTPGSlidingWindowRcd & iRecord)
-{
+std::unique_ptr<EcalTPGSlidingWindow>
+EcalTrigPrimESProducer::produceSlidingWindow(
+    const EcalTPGSlidingWindowRcd &iRecord) {
   auto prod = std::make_unique<EcalTPGSlidingWindow>();
-  parseTextFile() ;
-  for (int subdet=0 ; subdet<2 ; subdet++) {
-    std::map<uint32_t, std::vector<uint32_t> >::const_iterator it ;
-    for (it = mapStrip_[subdet].begin() ; it != mapStrip_[subdet].end() ; it++) {
-      prod->setValue(it->first,(it->second)[0]) ;
+  parseTextFile();
+  for (int subdet = 0; subdet < 2; subdet++) {
+    std::map<uint32_t, std::vector<uint32_t>>::const_iterator it;
+    for (it = mapStrip_[subdet].begin(); it != mapStrip_[subdet].end(); it++) {
+      prod->setValue(it->first, (it->second)[0]);
     }
   }
   return prod;
 }
 
-std::unique_ptr<EcalTPGFineGrainEBIdMap> EcalTrigPrimESProducer::produceFineGrainEB(const EcalTPGFineGrainEBIdMapRcd & iRecord)
-{
+std::unique_ptr<EcalTPGFineGrainEBIdMap>
+EcalTrigPrimESProducer::produceFineGrainEB(
+    const EcalTPGFineGrainEBIdMapRcd &iRecord) {
   auto prod = std::make_unique<EcalTPGFineGrainEBIdMap>();
-  parseTextFile() ;
-  EcalTPGFineGrainConstEB fg ;
-  std::map<uint32_t, std::vector<uint32_t> >::const_iterator it ;
-  for (it = mapFg_.begin() ; it != mapFg_.end() ; it++) {
-    fg.setValues((it->second)[0], (it->second)[1], (it->second)[2], (it->second)[3], (it->second)[4]) ;
-    prod->setValue(it->first,fg) ;
+  parseTextFile();
+  EcalTPGFineGrainConstEB fg;
+  std::map<uint32_t, std::vector<uint32_t>>::const_iterator it;
+  for (it = mapFg_.begin(); it != mapFg_.end(); it++) {
+    fg.setValues((it->second)[0], (it->second)[1], (it->second)[2],
+                 (it->second)[3], (it->second)[4]);
+    prod->setValue(it->first, fg);
   }
   return prod;
 }
 
-std::unique_ptr<EcalTPGFineGrainStripEE> EcalTrigPrimESProducer::produceFineGrainEEstrip(const EcalTPGFineGrainStripEERcd & iRecord)
-{
+std::unique_ptr<EcalTPGFineGrainStripEE>
+EcalTrigPrimESProducer::produceFineGrainEEstrip(
+    const EcalTPGFineGrainStripEERcd &iRecord) {
   auto prod = std::make_unique<EcalTPGFineGrainStripEE>();
-  parseTextFile() ;
+  parseTextFile();
   // EE Strips
-  std::map<uint32_t, std::vector<uint32_t> >::const_iterator it ;
-  for (it = mapStrip_[1].begin() ; it != mapStrip_[1].end() ; it++) {
-    EcalTPGFineGrainStripEE::Item item ;
-    item.threshold = (it->second)[2] ;
-    item.lut  = (it->second)[3] ;
-    prod->setValue(it->first,item) ;
+  std::map<uint32_t, std::vector<uint32_t>>::const_iterator it;
+  for (it = mapStrip_[1].begin(); it != mapStrip_[1].end(); it++) {
+    EcalTPGFineGrainStripEE::Item item;
+    item.threshold = (it->second)[2];
+    item.lut = (it->second)[3];
+    prod->setValue(it->first, item);
   }
   // EB Strips
-  for (it = mapStrip_[0].begin() ; it != mapStrip_[0].end() ; it++) {
-    EcalTPGFineGrainStripEE::Item item ;
-    item.threshold = (it->second)[2] ;
-    item.lut  = (it->second)[3] ;
-    prod->setValue(it->first,item) ;
+  for (it = mapStrip_[0].begin(); it != mapStrip_[0].end(); it++) {
+    EcalTPGFineGrainStripEE::Item item;
+    item.threshold = (it->second)[2];
+    item.lut = (it->second)[3];
+    prod->setValue(it->first, item);
   }
   return prod;
 }
 
-std::unique_ptr<EcalTPGFineGrainTowerEE> EcalTrigPrimESProducer::produceFineGrainEEtower(const EcalTPGFineGrainTowerEERcd & iRecord)
-{
+std::unique_ptr<EcalTPGFineGrainTowerEE>
+EcalTrigPrimESProducer::produceFineGrainEEtower(
+    const EcalTPGFineGrainTowerEERcd &iRecord) {
   auto prod = std::make_unique<EcalTPGFineGrainTowerEE>();
-  parseTextFile() ;
-  std::map<uint32_t, std::vector<uint32_t> >::const_iterator it ;
-  for (it = mapTower_[1].begin() ; it != mapTower_[1].end() ; it++) {
-    prod->setValue(it->first,(it->second)[1]) ;
+  parseTextFile();
+  std::map<uint32_t, std::vector<uint32_t>>::const_iterator it;
+  for (it = mapTower_[1].begin(); it != mapTower_[1].end(); it++) {
+    prod->setValue(it->first, (it->second)[1]);
   }
   return prod;
 }
 
-std::unique_ptr<EcalTPGLutIdMap> EcalTrigPrimESProducer::produceLUT(const EcalTPGLutIdMapRcd & iRecord)
-{
+std::unique_ptr<EcalTPGLutIdMap>
+EcalTrigPrimESProducer::produceLUT(const EcalTPGLutIdMapRcd &iRecord) {
   auto prod = std::make_unique<EcalTPGLutIdMap>();
-  parseTextFile() ;
-  EcalTPGLut lut ;
-  std::map<uint32_t, std::vector<uint32_t> >::const_iterator it ;
-  for (it = mapLut_.begin() ; it != mapLut_.end() ; it++) {
-    unsigned int lutArray[1024] ;
-    for (int i=0 ; i <1024 ; i++) lutArray[i] = (it->second)[i] ;
-    lut.setLut(lutArray) ;
-    prod->setValue(it->first,lut) ;
+  parseTextFile();
+  EcalTPGLut lut;
+  std::map<uint32_t, std::vector<uint32_t>>::const_iterator it;
+  for (it = mapLut_.begin(); it != mapLut_.end(); it++) {
+    unsigned int lutArray[1024];
+    for (int i = 0; i < 1024; i++)
+      lutArray[i] = (it->second)[i];
+    lut.setLut(lutArray);
+    prod->setValue(it->first, lut);
   }
   return prod;
 }
 
-std::unique_ptr<EcalTPGWeightIdMap> EcalTrigPrimESProducer::produceWeight(const EcalTPGWeightIdMapRcd & iRecord)
-{
+std::unique_ptr<EcalTPGWeightIdMap>
+EcalTrigPrimESProducer::produceWeight(const EcalTPGWeightIdMapRcd &iRecord) {
   auto prod = std::make_unique<EcalTPGWeightIdMap>();
-  parseTextFile() ;
-  EcalTPGWeights weights ;
-  std::map<uint32_t, std::vector<uint32_t> >::const_iterator it ;
-  for (it = mapWeight_.begin() ; it != mapWeight_.end() ; it++) {
-    weights.setValues((it->second)[0], 
-		      (it->second)[1],
-		      (it->second)[2], 
-		      (it->second)[3],
-		      (it->second)[4]) ;
-    prod->setValue(it->first,weights) ;
+  parseTextFile();
+  EcalTPGWeights weights;
+  std::map<uint32_t, std::vector<uint32_t>>::const_iterator it;
+  for (it = mapWeight_.begin(); it != mapWeight_.end(); it++) {
+    weights.setValues((it->second)[0], (it->second)[1], (it->second)[2],
+                      (it->second)[3], (it->second)[4]);
+    prod->setValue(it->first, weights);
   }
   return prod;
 }
 
-std::unique_ptr<EcalTPGWeightGroup> EcalTrigPrimESProducer::produceWeightGroup(const EcalTPGWeightGroupRcd & iRecord)
-{
+std::unique_ptr<EcalTPGWeightGroup> EcalTrigPrimESProducer::produceWeightGroup(
+    const EcalTPGWeightGroupRcd &iRecord) {
   auto prod = std::make_unique<EcalTPGWeightGroup>();
-  parseTextFile() ;
-  for (int subdet=0 ; subdet<2 ; subdet++) {
-    std::map<uint32_t, std::vector<uint32_t> >::const_iterator it ;
-    for (it = mapStrip_[subdet].begin() ; it != mapStrip_[subdet].end() ; it++) {
-      prod->setValue(it->first,(it->second)[1]) ;
+  parseTextFile();
+  for (int subdet = 0; subdet < 2; subdet++) {
+    std::map<uint32_t, std::vector<uint32_t>>::const_iterator it;
+    for (it = mapStrip_[subdet].begin(); it != mapStrip_[subdet].end(); it++) {
+      prod->setValue(it->first, (it->second)[1]);
     }
   }
   return prod;
 }
 
-std::unique_ptr<EcalTPGLutGroup> EcalTrigPrimESProducer::produceLutGroup(const EcalTPGLutGroupRcd & iRecord)
-{
+std::unique_ptr<EcalTPGLutGroup>
+EcalTrigPrimESProducer::produceLutGroup(const EcalTPGLutGroupRcd &iRecord) {
   auto prod = std::make_unique<EcalTPGLutGroup>();
-  parseTextFile() ;
-  for (int subdet=0 ; subdet<2 ; subdet++) {
-    std::map<uint32_t, std::vector<uint32_t> >::const_iterator it ;
-    for (it = mapTower_[subdet].begin() ; it != mapTower_[subdet].end() ; it++) {
-      prod->setValue(it->first,(it->second)[0]) ;
+  parseTextFile();
+  for (int subdet = 0; subdet < 2; subdet++) {
+    std::map<uint32_t, std::vector<uint32_t>>::const_iterator it;
+    for (it = mapTower_[subdet].begin(); it != mapTower_[subdet].end(); it++) {
+      prod->setValue(it->first, (it->second)[0]);
     }
   }
   return prod;
 }
 
-std::unique_ptr<EcalTPGFineGrainEBGroup> EcalTrigPrimESProducer::produceFineGrainEBGroup(const EcalTPGFineGrainEBGroupRcd & iRecord)
-{
+std::unique_ptr<EcalTPGFineGrainEBGroup>
+EcalTrigPrimESProducer::produceFineGrainEBGroup(
+    const EcalTPGFineGrainEBGroupRcd &iRecord) {
   auto prod = std::make_unique<EcalTPGFineGrainEBGroup>();
-  parseTextFile() ;
-  std::map<uint32_t, std::vector<uint32_t> >::const_iterator it ;
-  for (it = mapTower_[0].begin() ; it != mapTower_[0].end() ; it++) {
-    prod->setValue(it->first,(it->second)[1]) ;
+  parseTextFile();
+  std::map<uint32_t, std::vector<uint32_t>>::const_iterator it;
+  for (it = mapTower_[0].begin(); it != mapTower_[0].end(); it++) {
+    prod->setValue(it->first, (it->second)[1]);
   }
   return prod;
 }
 
-std::unique_ptr<EcalTPGPhysicsConst> EcalTrigPrimESProducer::producePhysicsConst(const EcalTPGPhysicsConstRcd & iRecord)
-{
+std::unique_ptr<EcalTPGPhysicsConst>
+EcalTrigPrimESProducer::producePhysicsConst(
+    const EcalTPGPhysicsConstRcd &iRecord) {
   auto prod = std::make_unique<EcalTPGPhysicsConst>();
-  parseTextFile() ;
-  std::map<uint32_t, std::vector<float> >::const_iterator it ;
-  for (it = mapPhys_.begin() ; it != mapPhys_.end() ; it++) {
-    EcalTPGPhysicsConst::Item item ;
-    item.EtSat = (it->second)[0] ;
-    item.ttf_threshold_Low = (it->second)[1] ;
-    item.ttf_threshold_High = (it->second)[2] ;
-    item.FG_lowThreshold = (it->second)[3] ;
-    item.FG_highThreshold = (it->second)[4] ;
-    item.FG_lowRatio = (it->second)[5] ;
-    item.FG_highRatio = (it->second)[6] ;
-    prod->setValue(it->first,item) ;
+  parseTextFile();
+  std::map<uint32_t, std::vector<float>>::const_iterator it;
+  for (it = mapPhys_.begin(); it != mapPhys_.end(); it++) {
+    EcalTPGPhysicsConst::Item item;
+    item.EtSat = (it->second)[0];
+    item.ttf_threshold_Low = (it->second)[1];
+    item.ttf_threshold_High = (it->second)[2];
+    item.FG_lowThreshold = (it->second)[3];
+    item.FG_highThreshold = (it->second)[4];
+    item.FG_lowRatio = (it->second)[5];
+    item.FG_highRatio = (it->second)[6];
+    prod->setValue(it->first, item);
   }
   return prod;
 }
 
-std::unique_ptr<EcalTPGCrystalStatus> EcalTrigPrimESProducer::produceBadX(const EcalTPGCrystalStatusRcd & iRecord)
-{
+std::unique_ptr<EcalTPGCrystalStatus>
+EcalTrigPrimESProducer::produceBadX(const EcalTPGCrystalStatusRcd &iRecord) {
   auto prod = std::make_unique<EcalTPGCrystalStatus>();
-  parseTextFile() ;
-  std::map<uint32_t, std::vector<uint32_t> >::const_iterator it ;
-  for (it = mapXtal_.begin() ; it != mapXtal_.end() ; it++) {
-    
+  parseTextFile();
+  std::map<uint32_t, std::vector<uint32_t>>::const_iterator it;
+  for (it = mapXtal_.begin(); it != mapXtal_.end(); it++) {
+
     EcalTPGCrystalStatusCode badXValue;
     badXValue.setStatusCode(0);
-    prod->setValue(it->first,badXValue) ;
+    prod->setValue(it->first, badXValue);
   }
   return prod;
-  
 }
 
-std::unique_ptr<EcalTPGStripStatus> EcalTrigPrimESProducer::produceBadStrip(const EcalTPGStripStatusRcd & iRecord)
-{
+std::unique_ptr<EcalTPGStripStatus>
+EcalTrigPrimESProducer::produceBadStrip(const EcalTPGStripStatusRcd &iRecord) {
   auto prod = std::make_unique<EcalTPGStripStatus>();
-  // returns an empty map     
+  // returns an empty map
   return prod;
-  
 }
 
-std::unique_ptr<EcalTPGTowerStatus> EcalTrigPrimESProducer::produceBadTT(const EcalTPGTowerStatusRcd & iRecord)
-{
+std::unique_ptr<EcalTPGTowerStatus>
+EcalTrigPrimESProducer::produceBadTT(const EcalTPGTowerStatusRcd &iRecord) {
   auto prod = std::make_unique<EcalTPGTowerStatus>();
-  parseTextFile() ;
-  std::map<uint32_t, std::vector<uint32_t> >::const_iterator it ;
-  //Barrel
-  for (it = mapTower_[0].begin() ; it != mapTower_[0].end() ; it++) {
-    //set the BadTT status to 0
-    prod->setValue(it->first,0) ;
+  parseTextFile();
+  std::map<uint32_t, std::vector<uint32_t>>::const_iterator it;
+  // Barrel
+  for (it = mapTower_[0].begin(); it != mapTower_[0].end(); it++) {
+    // set the BadTT status to 0
+    prod->setValue(it->first, 0);
   }
-  //Endcap
-  for (it = mapTower_[1].begin() ; it != mapTower_[1].end() ; it++) {
-    //set the BadTT status to 0
-    prod->setValue(it->first,0) ;
+  // Endcap
+  for (it = mapTower_[1].begin(); it != mapTower_[1].end(); it++) {
+    // set the BadTT status to 0
+    prod->setValue(it->first, 0);
   }
-  
-  return prod; 
+
+  return prod;
 }
 
-std::unique_ptr<EcalTPGSpike> EcalTrigPrimESProducer::produceSpike(const EcalTPGSpikeRcd &iRecord)
-{
+std::unique_ptr<EcalTPGSpike>
+EcalTrigPrimESProducer::produceSpike(const EcalTPGSpikeRcd &iRecord) {
   auto prod = std::make_unique<EcalTPGSpike>();
   parseTextFile();
   // Only need to do barrel
-  std::map<uint32_t, std::vector<uint32_t> >::const_iterator it;
-  for(it = mapTower_[0].begin(); it != mapTower_[0].end(); ++it)
-  {
+  std::map<uint32_t, std::vector<uint32_t>>::const_iterator it;
+  for (it = mapTower_[0].begin(); it != mapTower_[0].end(); ++it) {
     prod->setValue(it->first, (it->second)[2]);
   }
   return prod;
 }
 
-void EcalTrigPrimESProducer::parseTextFile()
-{
-  if (!mapXtal_.empty()) return ; // just parse the file once!
+void EcalTrigPrimESProducer::parseTextFile() {
+  if (!mapXtal_.empty())
+    return; // just parse the file once!
 
-  uint32_t id ;
-  std::string dataCard ;
+  uint32_t id;
+  std::string dataCard;
   std::string line;
-  std::ifstream infile ; 
-  std::vector<unsigned int> param ;
-  std::vector<float> paramF ;
-  int NBstripparams[2] = {4, 4} ;
-  unsigned int data ;
-  float dataF ;
+  std::ifstream infile;
+  std::vector<unsigned int> param;
+  std::vector<float> paramF;
+  int NBstripparams[2] = {4, 4};
+  unsigned int data;
+  float dataF;
 
   std::string bufString;
   std::string iString;
   std::string fString;
-  std::string filename = "SimCalorimetry/EcalTrigPrimProducers/data/"+dbFilename_;
-  std::string finalFileName ;
-  size_t slash=dbFilename_.find("/");
-  if (slash!=0) {
+  std::string filename =
+      "SimCalorimetry/EcalTrigPrimProducers/data/" + dbFilename_;
+  std::string finalFileName;
+  size_t slash = dbFilename_.find("/");
+  if (slash != 0) {
     edm::FileInPath fileInPath(filename);
-    finalFileName = fileInPath.fullPath() ;
-  }
-  else {
-    finalFileName = dbFilename_ ;
-    edm::LogWarning("EcalTPG") <<"Couldnt find database file via fileinpath, trying with pathname directly!!";
+    finalFileName = fileInPath.fullPath();
+  } else {
+    finalFileName = dbFilename_;
+    edm::LogWarning("EcalTPG") << "Couldnt find database file via fileinpath, "
+                                  "trying with pathname directly!!";
   }
 
+  int k = 0;
 
-  int k=0;
-
-  GzInputStream gis(finalFileName.c_str()) ;
-  while (gis>>dataCard) {
+  GzInputStream gis(finalFileName.c_str());
+  while (gis >> dataCard) {
 
     if (dataCard == "PHYSICS_EB" || dataCard == "PHYSICS_EE") {
-      gis>>std::dec>>id ;
-      
-      if (flagPrint_){
-        std::cout<<dataCard<<" "<<std::dec<<id <<std::endl;
+      gis >> std::dec >> id;
+
+      if (flagPrint_) {
+        std::cout << dataCard << " " << std::dec << id << std::endl;
       }
-      
-      paramF.clear() ;
-      
+
+      paramF.clear();
+
       std::string st1;
       std::string st2;
-      
-      for (int i=0 ; i <7 ; i++) {
-        gis>>std::dec>>dataF ;
-        paramF.push_back(dataF) ;
-	
-        //std::cout<<", "<<std::dec<<dataF ;
-        if (flagPrint_){
-	//---------------------------------
-	  if (i < 3){
-	    std::ostringstream oss;
-	    oss << dataF; 
-	    std::string result1 = oss.str();
+
+      for (int i = 0; i < 7; i++) {
+        gis >> std::dec >> dataF;
+        paramF.push_back(dataF);
+
+        // std::cout<<", "<<std::dec<<dataF ;
+        if (flagPrint_) {
+          //---------------------------------
+          if (i < 3) {
+            std::ostringstream oss;
+            oss << dataF;
+            std::string result1 = oss.str();
 
             st1.append(result1);
-	    if (i != 2)
+            if (i != 2)
               st1.append(" ");
-	  }
+          }
+
+          if (i > 2) {
+            std::ostringstream oss;
+            oss << dataF;
+            std::string result2 = oss.str();
 
-	  if (i > 2){
-	    std::ostringstream oss;
-	    oss << dataF; 
-	    std::string result2 = oss.str();
- 
             st2.append(result2);
-            if (i != 6)  
-	      st2.append(" ");
-	  }
-	//----------------------------------     
-	}
+            if (i != 6)
+              st2.append(" ");
+          }
+          //----------------------------------
+        }
       }
-      
-      if (flagPrint_){
+
+      if (flagPrint_) {
         std::cout << "" << st1 << std::endl;
-	std::cout << "" << st2 << std::endl;
-	std::cout << ""<< std::endl;  
+        std::cout << "" << st2 << std::endl;
+        std::cout << "" << std::endl;
       }
-      
-      //std::cout<<std::endl ;
-      mapPhys_[id] = paramF ;
+
+      // std::cout<<std::endl ;
+      mapPhys_[id] = paramF;
     }
 
     if (dataCard == "CRYSTAL") {
-      
-      gis>>std::dec>>id ;
-      //std::cout<<dataCard<<" "<<std::dec<<id;
+
+      gis >> std::dec >> id;
+      // std::cout<<dataCard<<" "<<std::dec<<id;
       std::string st3;
       std::string st4;
-      std::string st5;      
-      
-      if(flagPrint_){
-      //Print this comment only one time 
-        if(k==0)
-          std::cout << "COMMENT ====== barrel crystals ====== " <<std::endl;
-      
-        if (k==61200)
-          std::cout << "COMMENT ====== endcap crystals ====== " <<std::endl;
-        
-	k=k+1;
-
-        std::cout<<dataCard<<" "<<std::dec<<id << std::endl;
+      std::string st5;
+
+      if (flagPrint_) {
+        // Print this comment only one time
+        if (k == 0)
+          std::cout << "COMMENT ====== barrel crystals ====== " << std::endl;
+
+        if (k == 61200)
+          std::cout << "COMMENT ====== endcap crystals ====== " << std::endl;
+
+        k = k + 1;
+
+        std::cout << dataCard << " " << std::dec << id << std::endl;
       }
-      
-      param.clear() ;
-      for (int i=0 ; i <9 ; i++) {
-        gis>>std::hex>>data ;
-        //std::cout<<", "<<std::hex<<data ;
+
+      param.clear();
+      for (int i = 0; i < 9; i++) {
+        gis >> std::hex >> data;
+        // std::cout<<", "<<std::hex<<data ;
         param.push_back(data);
-	
-	if(flagPrint_){
-	  if (i<3){
-	    std::ostringstream oss;
-	    oss << std::hex<< data; 
-	    std::string result1 = oss.str();
-           
-	    st3.append("0x"); 
+
+        if (flagPrint_) {
+          if (i < 3) {
+            std::ostringstream oss;
+            oss << std::hex << data;
+            std::string result1 = oss.str();
+
+            st3.append("0x");
             st3.append(result1);
-            if (i !=2)
-	      st3.append(" ");
-	
-	  }else if(i>2 && i<6){
-	    std::ostringstream oss;
-	    oss << std::hex << data; 
-	    std::string result2 = oss.str();
-          
-	    st4.append("0x");
+            if (i != 2)
+              st3.append(" ");
+
+          } else if (i > 2 && i < 6) {
+            std::ostringstream oss;
+            oss << std::hex << data;
+            std::string result2 = oss.str();
+
+            st4.append("0x");
             st4.append(result2);
-            if (i != 5) 
+            if (i != 5)
               st4.append(" ");
-	  }else if(i>5 && i<9){
-	    std::ostringstream oss;
-	    oss << std::hex<< data; 
-	    std::string result3 = oss.str();
-	  
-	    st5.append("0x");
+          } else if (i > 5 && i < 9) {
+            std::ostringstream oss;
+            oss << std::hex << data;
+            std::string result3 = oss.str();
+
+            st5.append("0x");
             st5.append(result3);
             if (i != 8)
-	      st5.append(" ");
-	  }
-	}
-	
-      }//end for
-      
-      if(flagPrint_){
+              st5.append(" ");
+          }
+        }
+
+      } // end for
+
+      if (flagPrint_) {
         std::cout << " " << st3 << std::endl;
         std::cout << " " << st4 << std::endl;
         std::cout << " " << st5 << std::endl;
       }
-      
-      //std::cout<<std::endl ;
-      mapXtal_[id] = param ;
+
+      // std::cout<<std::endl ;
+      mapXtal_[id] = param;
     }
 
     if (dataCard == "STRIP_EB") {
-      gis>>std::dec>>id ;
-      
+      gis >> std::dec >> id;
+
       std::string st1;
-      
-      if(flagPrint_)
-        std::cout<<dataCard<<" "<<std::dec<<id <<std::endl;
-       
-      param.clear() ;
-      for (int i=0 ; i <NBstripparams[0] ; i++) {
-        gis>>std::hex>>data ;
-	//std::cout << " data = " << data << std::endl;
+
+      if (flagPrint_)
+        std::cout << dataCard << " " << std::dec << id << std::endl;
+
+      param.clear();
+      for (int i = 0; i < NBstripparams[0]; i++) {
+        gis >> std::hex >> data;
+        // std::cout << " data = " << data << std::endl;
         param.push_back(data);
-	
-	if(flagPrint_){
-	  if (i==0){
-	   std::cout<<"0x"<<std::hex<< data << std::endl;
-	  }
-	  else if (i==1){
-	    std::cout<<""<<std::hex<< data << std::endl;
-	  }
-	  else if (i>1){
-	    std::ostringstream oss;
-	    if (i==2){
-	      oss<<"0x"<<std::hex<<data;
-	      std::string result4 = oss.str();
-	      st1.append(result4);
-	    }else if(i==3){
-	      std::ostringstream oss;
-	      oss<<" 0x"<<std::hex<<data;
-	      std::string result5 = oss.str();
-	  
-	      st1.append(result5);
-	      std::cout<< "" << st1 << std::endl;
-	   }
-	  }
-	}
+
+        if (flagPrint_) {
+          if (i == 0) {
+            std::cout << "0x" << std::hex << data << std::endl;
+          } else if (i == 1) {
+            std::cout << "" << std::hex << data << std::endl;
+          } else if (i > 1) {
+            std::ostringstream oss;
+            if (i == 2) {
+              oss << "0x" << std::hex << data;
+              std::string result4 = oss.str();
+              st1.append(result4);
+            } else if (i == 3) {
+              std::ostringstream oss;
+              oss << " 0x" << std::hex << data;
+              std::string result5 = oss.str();
+
+              st1.append(result5);
+              std::cout << "" << st1 << std::endl;
+            }
+          }
+        }
       }
-      
-      //std::cout<<std::endl ;
-      mapStrip_[0][id] = param ;
+
+      // std::cout<<std::endl ;
+      mapStrip_[0][id] = param;
     }
 
     if (dataCard == "STRIP_EE") {
-      gis>>std::dec>>id ;
-      
+      gis >> std::dec >> id;
+
       std::string st6;
-      
-      if(flagPrint_){
-        std::cout<<dataCard<<" "<<std::dec<<id << std::endl;
+
+      if (flagPrint_) {
+        std::cout << dataCard << " " << std::dec << id << std::endl;
       }
-      
-      param.clear() ;
-      for (int i=0 ; i <NBstripparams[1] ; i++) {
-        gis>>std::hex>>data ;
+
+      param.clear();
+      for (int i = 0; i < NBstripparams[1]; i++) {
+        gis >> std::hex >> data;
         param.push_back(data);
-        
-	if(flagPrint_){
-	  if (i==0){
-	    std::cout<<"0x"<<std::hex<<data << std::endl;
-	  }else if (i==1){
-	    std::cout<<" "<<std::hex<<data<< std::endl;
-	  }else if (i>1){
-	    std::ostringstream oss;
-	    if (i==2){
-	      oss<<"0x"<<std::hex<<data;
-	      std::string result4 = oss.str();
-	      st6.append(result4);
-	    }else if(i==3){
-	      std::ostringstream oss;
-	      oss<<" 0x"<<std::hex<<data;
-	      std::string result5 = oss.str();
-	  
-	      st6.append(result5);
-	      std::cout<< "" << st6 << std::endl;
-	   }
-	  }
+
+        if (flagPrint_) {
+          if (i == 0) {
+            std::cout << "0x" << std::hex << data << std::endl;
+          } else if (i == 1) {
+            std::cout << " " << std::hex << data << std::endl;
+          } else if (i > 1) {
+            std::ostringstream oss;
+            if (i == 2) {
+              oss << "0x" << std::hex << data;
+              std::string result4 = oss.str();
+              st6.append(result4);
+            } else if (i == 3) {
+              std::ostringstream oss;
+              oss << " 0x" << std::hex << data;
+              std::string result5 = oss.str();
+
+              st6.append(result5);
+              std::cout << "" << st6 << std::endl;
+            }
+          }
         }
       }
-      
-      //std::cout<<std::endl ;
-      mapStrip_[1][id] = param ;
+
+      // std::cout<<std::endl ;
+      mapStrip_[1][id] = param;
     }
-    
-    if(dataCard == "TOWER_EE"){
-      gis>>std::dec>>id ;
-      
-      if(flagPrint_)
-        std::cout<<dataCard<<" "<<std::dec<<id <<std::endl;
-
-      param.clear() ;
-      for (int i=0 ; i <2 ; i++) {
-        gis>>std::hex>>data ;
+
+    if (dataCard == "TOWER_EE") {
+      gis >> std::dec >> id;
+
+      if (flagPrint_)
+        std::cout << dataCard << " " << std::dec << id << std::endl;
+
+      param.clear();
+      for (int i = 0; i < 2; i++) {
+        gis >> std::hex >> data;
         param.push_back(data);
-      
-        if(flagPrint_){
-	  if(i==1){
-	    std::cout << "0x" <<std::dec<<data << std::endl;
-	  }else{
-	    std::cout << " " <<std::dec<<data << std::endl;
-	  }
-	}
+
+        if (flagPrint_) {
+          if (i == 1) {
+            std::cout << "0x" << std::dec << data << std::endl;
+          } else {
+            std::cout << " " << std::dec << data << std::endl;
+          }
+        }
       }
-      
-      //std::cout<<std::endl ;
-      mapTower_[1][id] = param ;
+
+      // std::cout<<std::endl ;
+      mapTower_[1][id] = param;
     }
 
     if (dataCard == "TOWER_EB") {
-      gis>>std::dec>>id ;
-      
-      if(flagPrint_)
-        std::cout<<dataCard<<" "<<std::dec<<id << std::endl;
-
-      param.clear() ;
-      for (int i=0 ; i <3 ; i++) {
-        gis>>std::dec>>data ;
-        
-	if(flagPrint_){	
-          std::cout << " " << std::dec <<  data << std::endl;
+      gis >> std::dec >> id;
+
+      if (flagPrint_)
+        std::cout << dataCard << " " << std::dec << id << std::endl;
+
+      param.clear();
+      for (int i = 0; i < 3; i++) {
+        gis >> std::dec >> data;
+
+        if (flagPrint_) {
+          std::cout << " " << std::dec << data << std::endl;
         }
-	
-        param.push_back(data) ;
+
+        param.push_back(data);
       }
-      
-      //std::cout<<std::endl ;
-      mapTower_[0][id] = param ;
+
+      // std::cout<<std::endl ;
+      mapTower_[0][id] = param;
     }
 
     if (dataCard == "WEIGHT") {
-          
-      if(flagPrint_) 
-        std::cout<<std::endl;
-     
-      gis>>std::hex>>id ;  
-      if(flagPrint_){
-        std::cout<<dataCard<<" "<<std::dec<<id <<std::endl;
+
+      if (flagPrint_)
+        std::cout << std::endl;
+
+      gis >> std::hex >> id;
+      if (flagPrint_) {
+        std::cout << dataCard << " " << std::dec << id << std::endl;
       }
-      
-      param.clear() ;
-     
+
+      param.clear();
+
       std::string st6;
-      for (int i=0 ; i <5 ; i++) {
-        gis>>std::hex>>data ;
+      for (int i = 0; i < 5; i++) {
+        gis >> std::hex >> data;
         param.push_back(data);
-        
-	if(flagPrint_){
-	  std::ostringstream oss;
-	  oss << std::hex<< data; 
-	  std::string result4 = oss.str();
+
+        if (flagPrint_) {
+          std::ostringstream oss;
+          oss << std::hex << data;
+          std::string result4 = oss.str();
 
           st6.append("0x");
           st6.append(result4);
-	  st6.append(" ");
-	}
-        
+          st6.append(" ");
+        }
       }
-      
-      if(flagPrint_){
+
+      if (flagPrint_) {
         std::cout << st6 << std::endl;
-	std::cout<<std::endl;
+        std::cout << std::endl;
       }
-       
-      //std::cout<<std::endl ;
-      mapWeight_[id] = param ;
+
+      // std::cout<<std::endl ;
+      mapWeight_[id] = param;
     }
 
     if (dataCard == "FG") {
-      
-      if(flagPrint_)
-        std::cout <<std::endl;
-      
-      gis>>std::hex>>id ;      
-      if(flagPrint_)
-        std::cout<<dataCard<<" "<<std::dec<<id <<std::endl;
-
-      param.clear() ;
+
+      if (flagPrint_)
+        std::cout << std::endl;
+
+      gis >> std::hex >> id;
+      if (flagPrint_)
+        std::cout << dataCard << " " << std::dec << id << std::endl;
+
+      param.clear();
       std::string st7;
-      for (int i=0 ; i <5 ; i++) {
-        gis>>std::hex>>data ;
+      for (int i = 0; i < 5; i++) {
+        gis >> std::hex >> data;
         param.push_back(data);
-	
-       	if(flagPrint_){
-	  std::ostringstream oss;
-	  oss << std::hex<< data; 
-	
-	  std::string result5 = oss.str();
+
+        if (flagPrint_) {
+          std::ostringstream oss;
+          oss << std::hex << data;
+
+          std::string result5 = oss.str();
 
           st7.append("0x");
           st7.append(result5);
           if (i != 4)
-	    st7.append(" ");
-	}
+            st7.append(" ");
+        }
       }
-      
-      if(flagPrint_){
+
+      if (flagPrint_) {
         std::cout << st7 << std::endl;
-        std::cout<<std::endl ;
+        std::cout << std::endl;
       }
-      
-      mapFg_[id] = param ;
+
+      mapFg_[id] = param;
     }
- 
+
     if (dataCard == "LUT") {
-      gis>>std::hex>>id ;
-      
-      if(flagPrint_)
-        std::cout<<dataCard<<" "<<std::dec<<id <<std::endl;
-
-      param.clear() ;
-      for (int i=0 ; i <1024 ; i++) {
-        gis>>std::hex>>data ;
+      gis >> std::hex >> id;
+
+      if (flagPrint_)
+        std::cout << dataCard << " " << std::dec << id << std::endl;
+
+      param.clear();
+      for (int i = 0; i < 1024; i++) {
+        gis >> std::hex >> data;
         param.push_back(data);
-       
-        if(flagPrint_){
-	  std::cout<<"0x"<<std::hex<<data <<std::endl;
-	}
+
+        if (flagPrint_) {
+          std::cout << "0x" << std::hex << data << std::endl;
+        }
       }
-      
-      if(flagPrint_) {
-        std::cout<<std::endl ;
-        std::cout<<std::endl ;
+
+      if (flagPrint_) {
+        std::cout << std::endl;
+        std::cout << std::endl;
       }
-	
-      mapLut_[id] = param ;
+
+      mapLut_[id] = param;
     }
   }
 }
 
-std::vector<int> EcalTrigPrimESProducer::getRange(int subdet, int tccNb, int towerNbInTcc, int stripNbInTower, int xtalNbInStrip)
-{
-  std::vector<int> range ;
-  if (subdet == 0) { 
+std::vector<int> EcalTrigPrimESProducer::getRange(int subdet, int tccNb,
+                                                  int towerNbInTcc,
+                                                  int stripNbInTower,
+                                                  int xtalNbInStrip) {
+  std::vector<int> range;
+  if (subdet == 0) {
     // Barrel
-    range.push_back(37)  ; // stccNbMin
-    range.push_back(73) ; // tccNbMax
-    range.push_back(1)  ; // towerNbMin
-    range.push_back(69) ; // towerNbMax
-    range.push_back(1)  ; // stripNbMin
-    range.push_back(6)  ; // stripNbMax
-    range.push_back(1)  ; // xtalNbMin
-    range.push_back(6)  ; // xtalNbMax
+    range.push_back(37); // stccNbMin
+    range.push_back(73); // tccNbMax
+    range.push_back(1);  // towerNbMin
+    range.push_back(69); // towerNbMax
+    range.push_back(1);  // stripNbMin
+    range.push_back(6);  // stripNbMax
+    range.push_back(1);  // xtalNbMin
+    range.push_back(6);  // xtalNbMax
   } else {
     // Endcap eta >0
-    if (subdet >0 ) {
-      range.push_back(73) ; // tccNbMin
-      range.push_back(109) ; // tccNbMax
-    } else { //endcap eta <0
-      range.push_back(1) ; // tccNbMin
-      range.push_back(37) ; // tccNbMax
+    if (subdet > 0) {
+      range.push_back(73);  // tccNbMin
+      range.push_back(109); // tccNbMax
+    } else {                // endcap eta <0
+      range.push_back(1);   // tccNbMin
+      range.push_back(37);  // tccNbMax
     }
-    range.push_back(1)  ; // towerNbMin
-    range.push_back(29) ; // towerNbMax
-    range.push_back(1)  ; // stripNbMin
-    range.push_back(6)  ; // stripNbMax
-    range.push_back(1)  ; // xtalNbMin
-    range.push_back(6)  ; // xtalNbMax
+    range.push_back(1);  // towerNbMin
+    range.push_back(29); // towerNbMax
+    range.push_back(1);  // stripNbMin
+    range.push_back(6);  // stripNbMax
+    range.push_back(1);  // xtalNbMin
+    range.push_back(6);  // xtalNbMax
   }
 
-  if (tccNb>0) {
-    range[0] = tccNb ; 
-    range[1] = tccNb+1 ;
+  if (tccNb > 0) {
+    range[0] = tccNb;
+    range[1] = tccNb + 1;
   }
-  if (towerNbInTcc>0) {
-    range[2] = towerNbInTcc ; 
-    range[3] = towerNbInTcc+1 ;
+  if (towerNbInTcc > 0) {
+    range[2] = towerNbInTcc;
+    range[3] = towerNbInTcc + 1;
   }
-  if (stripNbInTower>0) {
-    range[4] = stripNbInTower ; 
-    range[5] = stripNbInTower+1 ;
+  if (stripNbInTower > 0) {
+    range[4] = stripNbInTower;
+    range[5] = stripNbInTower + 1;
   }
-  if (xtalNbInStrip>0) {
-    range[6] = xtalNbInStrip ; 
-    range[7] = xtalNbInStrip+1 ;
+  if (xtalNbInStrip > 0) {
+    range[6] = xtalNbInStrip;
+    range[7] = xtalNbInStrip + 1;
   }
 
-  return range ;
+  return range;
 }
 
 // bool EcalTrigPrimESProducer::getNextString(gzFile &gzf){
@@ -791,11 +779,11 @@ std::vector<int> EcalTrigPrimESProducer::getRange(int subdet, int tccNb, int tow
 //   if (blank==std::string::npos) bufpos_=0;
 //   return false;
 // }
-//  
+//
 // int EcalTrigPrimESProducer::converthex() {
 //   // converts hex dec string sub to hexa
 //   //FIXME:: find something better (istrstream?)!!!!
-// 
+//
 //   std::string chars("0123456789abcdef");
 //   int hex=0;
 //   for (size_t i=2;i<sub_.length();++i) {
diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimESProducer.h b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimESProducer.h
index 604fc4158bc93..a2c82fd535be3 100644
--- a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimESProducer.h
+++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimESProducer.h
@@ -2,44 +2,44 @@
 #define SimCalorimetry_EcalTrigPrimProducers_EcalTrigPrimESProducer_H
 
 // user include files
-#include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/ModuleFactory.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "CondFormats/EcalObjects/interface/EcalTPGPedestals.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGLinearizationConst.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGSlidingWindow.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainEBIdMap.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainStripEE.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainTowerEE.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGLutIdMap.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGWeightIdMap.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGWeightGroup.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGLutGroup.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainEBGroup.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGPhysicsConst.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGCrystalStatus.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGStripStatus.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGTowerStatus.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGSpike.h"
-#include "CondFormats/DataRecord/interface/EcalTPGPedestalsRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGLinearizationConstRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGSlidingWindowRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGCrystalStatusRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGFineGrainEBGroupRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGFineGrainEBIdMapRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGFineGrainStripEERcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGFineGrainTowerEERcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGLutIdMapRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGWeightIdMapRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGWeightGroupRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGLinearizationConstRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGLutGroupRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGFineGrainEBGroupRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGLutIdMapRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGPedestalsRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGPhysicsConstRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGCrystalStatusRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGSlidingWindowRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGSpikeRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGStripStatusRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGTowerStatusRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGSpikeRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGWeightGroupRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGWeightIdMapRcd.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGCrystalStatus.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainEBGroup.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainEBIdMap.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainStripEE.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainTowerEE.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGLinearizationConst.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGLutGroup.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGLutIdMap.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGPedestals.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGPhysicsConst.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGSlidingWindow.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGSpike.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGStripStatus.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGTowerStatus.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGWeightGroup.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGWeightIdMap.h"
 
 #include "zlib.h"
 
@@ -48,53 +48,63 @@
 //
 
 class EcalTrigPrimESProducer : public edm::ESProducer {
- public:
-  EcalTrigPrimESProducer(const edm::ParameterSet&);
+public:
+  EcalTrigPrimESProducer(const edm::ParameterSet &);
   ~EcalTrigPrimESProducer() override;
 
-  std::unique_ptr<EcalTPGPedestals> producePedestals(const EcalTPGPedestalsRcd &) ;
-  std::unique_ptr<EcalTPGLinearizationConst> produceLinearizationConst(const EcalTPGLinearizationConstRcd &) ;
-  std::unique_ptr<EcalTPGSlidingWindow> produceSlidingWindow(const EcalTPGSlidingWindowRcd &) ;
-  std::unique_ptr<EcalTPGFineGrainEBIdMap> produceFineGrainEB(const EcalTPGFineGrainEBIdMapRcd &) ;
-  std::unique_ptr<EcalTPGFineGrainStripEE> produceFineGrainEEstrip(const EcalTPGFineGrainStripEERcd &) ;
-  std::unique_ptr<EcalTPGFineGrainTowerEE> produceFineGrainEEtower(const EcalTPGFineGrainTowerEERcd &) ;
-  std::unique_ptr<EcalTPGLutIdMap> produceLUT(const EcalTPGLutIdMapRcd &) ;
-  std::unique_ptr<EcalTPGWeightIdMap> produceWeight(const EcalTPGWeightIdMapRcd &) ;
-  std::unique_ptr<EcalTPGWeightGroup> produceWeightGroup(const EcalTPGWeightGroupRcd &) ;
-  std::unique_ptr<EcalTPGLutGroup> produceLutGroup(const EcalTPGLutGroupRcd &) ;
-  std::unique_ptr<EcalTPGFineGrainEBGroup> produceFineGrainEBGroup(const EcalTPGFineGrainEBGroupRcd &) ;
-  std::unique_ptr<EcalTPGPhysicsConst> producePhysicsConst(const EcalTPGPhysicsConstRcd &) ;
-  std::unique_ptr<EcalTPGCrystalStatus> produceBadX(const EcalTPGCrystalStatusRcd &) ;
-  std::unique_ptr<EcalTPGStripStatus> produceBadStrip(const EcalTPGStripStatusRcd &) ;
-  std::unique_ptr<EcalTPGTowerStatus> produceBadTT(const EcalTPGTowerStatusRcd &) ;
-  std::unique_ptr<EcalTPGSpike> produceSpike(const EcalTPGSpikeRcd &) ;
-
- private:
+  std::unique_ptr<EcalTPGPedestals>
+  producePedestals(const EcalTPGPedestalsRcd &);
+  std::unique_ptr<EcalTPGLinearizationConst>
+  produceLinearizationConst(const EcalTPGLinearizationConstRcd &);
+  std::unique_ptr<EcalTPGSlidingWindow>
+  produceSlidingWindow(const EcalTPGSlidingWindowRcd &);
+  std::unique_ptr<EcalTPGFineGrainEBIdMap>
+  produceFineGrainEB(const EcalTPGFineGrainEBIdMapRcd &);
+  std::unique_ptr<EcalTPGFineGrainStripEE>
+  produceFineGrainEEstrip(const EcalTPGFineGrainStripEERcd &);
+  std::unique_ptr<EcalTPGFineGrainTowerEE>
+  produceFineGrainEEtower(const EcalTPGFineGrainTowerEERcd &);
+  std::unique_ptr<EcalTPGLutIdMap> produceLUT(const EcalTPGLutIdMapRcd &);
+  std::unique_ptr<EcalTPGWeightIdMap>
+  produceWeight(const EcalTPGWeightIdMapRcd &);
+  std::unique_ptr<EcalTPGWeightGroup>
+  produceWeightGroup(const EcalTPGWeightGroupRcd &);
+  std::unique_ptr<EcalTPGLutGroup> produceLutGroup(const EcalTPGLutGroupRcd &);
+  std::unique_ptr<EcalTPGFineGrainEBGroup>
+  produceFineGrainEBGroup(const EcalTPGFineGrainEBGroupRcd &);
+  std::unique_ptr<EcalTPGPhysicsConst>
+  producePhysicsConst(const EcalTPGPhysicsConstRcd &);
+  std::unique_ptr<EcalTPGCrystalStatus>
+  produceBadX(const EcalTPGCrystalStatusRcd &);
+  std::unique_ptr<EcalTPGStripStatus>
+  produceBadStrip(const EcalTPGStripStatusRcd &);
+  std::unique_ptr<EcalTPGTowerStatus>
+  produceBadTT(const EcalTPGTowerStatusRcd &);
+  std::unique_ptr<EcalTPGSpike> produceSpike(const EcalTPGSpikeRcd &);
 
-  void parseTextFile() ;
-  std::vector<int> getRange(int subdet, int smNb, int towerNbInSm, int stripNbInTower=0, int xtalNbInStrip=0) ;
+private:
+  void parseTextFile();
+  std::vector<int> getRange(int subdet, int smNb, int towerNbInSm,
+                            int stripNbInTower = 0, int xtalNbInStrip = 0);
 
   // ----------member data ---------------------------
   std::string dbFilename_;
   bool flagPrint_;
-  std::map<uint32_t, std::vector<uint32_t> > mapXtal_ ;
-  std::map<uint32_t, std::vector<uint32_t> > mapStrip_[2] ;
-  std::map<uint32_t, std::vector<uint32_t> > mapTower_[2] ;
-  std::map<uint32_t, std::vector<uint32_t> > mapWeight_ ;
-  std::map<uint32_t, std::vector<uint32_t> > mapFg_ ;
-  std::map<uint32_t, std::vector<uint32_t> > mapLut_ ;
-  std::map<uint32_t, std::vector<float> > mapPhys_ ;
-
-
-//   typedef voidp gzFile;
-//   bool getNextString(gzFile &gzf);
-//   int converthex();
-//   char buf_[100];
-//   std::string bufString_;
-//   std::string sub_;
-//   int bufpos_;
+  std::map<uint32_t, std::vector<uint32_t>> mapXtal_;
+  std::map<uint32_t, std::vector<uint32_t>> mapStrip_[2];
+  std::map<uint32_t, std::vector<uint32_t>> mapTower_[2];
+  std::map<uint32_t, std::vector<uint32_t>> mapWeight_;
+  std::map<uint32_t, std::vector<uint32_t>> mapFg_;
+  std::map<uint32_t, std::vector<uint32_t>> mapLut_;
+  std::map<uint32_t, std::vector<float>> mapPhys_;
 
+  //   typedef voidp gzFile;
+  //   bool getNextString(gzFile &gzf);
+  //   int converthex();
+  //   char buf_[100];
+  //   std::string bufString_;
+  //   std::string sub_;
+  //   int bufpos_;
 };
 
-
 #endif
diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimProducer.cc b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimProducer.cc
index f068c0e95a557..0032c941ef621 100644
--- a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimProducer.cc
+++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimProducer.cc
@@ -3,7 +3,8 @@
  *
  * EcalTrigPrimProducer produces a EcalTrigPrimDigiCollection
  * The barrel code does a detailed simulation
- * The code for the endcap is simulated in a rough way, due to missing  strip geometry
+ * The code for the endcap is simulated in a rough way, due to missing  strip
+ geometry
  *
  *
  * \author Ursula Berthon, Stephanie Baffioni,  LLR Palaiseau
@@ -21,275 +22,342 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-#include "DataFormats/Provenance/interface/ProductID.h"
+#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "DataFormats/Provenance/interface/ParameterSetID.h"
+#include "DataFormats/Provenance/interface/ProductID.h"
 #include "DataFormats/Provenance/interface/Provenance.h"
-#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 
+#include "CondFormats/DataRecord/interface/EcalTPGCrystalStatusRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGFineGrainEBGroupRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGLutGroupRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGLutIdMapRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGFineGrainEBIdMapRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGFineGrainStripEERcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGFineGrainTowerEERcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGCrystalStatusRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGTowerStatusRcd.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainEBGroup.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGLutGroup.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGLutIdMap.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainEBIdMap.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainTowerEE.h"
 #include "CondFormats/DataRecord/interface/EcalTPGLinearizationConstRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGLutGroupRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGLutIdMapRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGPedestalsRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGSlidingWindowRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGWeightIdMapRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGSpikeRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGStripStatusRcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGTowerStatusRcd.h"
 #include "CondFormats/DataRecord/interface/EcalTPGWeightGroupRcd.h"
-#include "CondFormats/DataRecord/interface/EcalTPGFineGrainStripEERcd.h"
+#include "CondFormats/DataRecord/interface/EcalTPGWeightIdMapRcd.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGCrystalStatus.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainEBGroup.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainEBIdMap.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainStripEE.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainTowerEE.h"
 #include "CondFormats/EcalObjects/interface/EcalTPGLinearizationConst.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGLutGroup.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGLutIdMap.h"
 #include "CondFormats/EcalObjects/interface/EcalTPGPedestals.h"
 #include "CondFormats/EcalObjects/interface/EcalTPGSlidingWindow.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGWeightIdMap.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGWeightGroup.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGFineGrainStripEE.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGCrystalStatus.h"
-#include "CondFormats/EcalObjects/interface/EcalTPGTowerStatus.h"
-#include "CondFormats/DataRecord/interface/EcalTPGSpikeRcd.h"
 #include "CondFormats/EcalObjects/interface/EcalTPGSpike.h"
-#include "CondFormats/DataRecord/interface/EcalTPGStripStatusRcd.h"
 #include "CondFormats/EcalObjects/interface/EcalTPGStripStatus.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGTowerStatus.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGWeightGroup.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGWeightIdMap.h"
 
 #include "EcalTrigPrimProducer.h"
 #include "SimCalorimetry/EcalTrigPrimAlgos/interface/EcalTrigPrimFunctionalAlgo.h"
 
-EcalTrigPrimProducer::EcalTrigPrimProducer(const edm::ParameterSet&  iConfig):
-  barrelOnly_(iConfig.getParameter<bool>("BarrelOnly")),
-  tcpFormat_(iConfig.getParameter<bool>("TcpOutput")),
-  debug_(iConfig.getParameter<bool>("Debug")),
-  famos_(iConfig.getParameter<bool>("Famos")),
-  tokenEB_(consumes <EBDigiCollection>(edm::InputTag(iConfig.getParameter<std::string>("Label"), iConfig.getParameter<std::string>("InstanceEB")))),
-  tokenEE_(consumes <EEDigiCollection>(edm::InputTag(iConfig.getParameter<std::string>("Label"), iConfig.getParameter<std::string>("InstanceEE")))),
-  binOfMaximum_(iConfig.getParameter<int>("binOfMaximum")),
-  fillBinOfMaximumFromHistory_(-1==binOfMaximum_)
-{  
-  //register your products
-  produces <EcalTrigPrimDigiCollection >();
-  if (tcpFormat_) produces <EcalTrigPrimDigiCollection >("formatTCP");
+EcalTrigPrimProducer::EcalTrigPrimProducer(const edm::ParameterSet &iConfig)
+    : barrelOnly_(iConfig.getParameter<bool>("BarrelOnly")),
+      tcpFormat_(iConfig.getParameter<bool>("TcpOutput")),
+      debug_(iConfig.getParameter<bool>("Debug")),
+      famos_(iConfig.getParameter<bool>("Famos")),
+      tokenEB_(consumes<EBDigiCollection>(
+          edm::InputTag(iConfig.getParameter<std::string>("Label"),
+                        iConfig.getParameter<std::string>("InstanceEB")))),
+      tokenEE_(consumes<EEDigiCollection>(
+          edm::InputTag(iConfig.getParameter<std::string>("Label"),
+                        iConfig.getParameter<std::string>("InstanceEE")))),
+      binOfMaximum_(iConfig.getParameter<int>("binOfMaximum")),
+      fillBinOfMaximumFromHistory_(-1 == binOfMaximum_) {
+  // register your products
+  produces<EcalTrigPrimDigiCollection>();
+  if (tcpFormat_)
+    produces<EcalTrigPrimDigiCollection>("formatTCP");
 }
 
-static
-int findBinOfMaximum(bool iFillFromHistory, int iPSetValue, edm::ProcessHistory const& iHistory) {
+static int findBinOfMaximum(bool iFillFromHistory, int iPSetValue,
+                            edm::ProcessHistory const &iHistory) {
   //  get  binOfMax
   //  try first in cfg, then in ProcessHistory
   //  =6 is default (1-10 possible values)
-  int binOfMaximum=0;  //starts at 1!
-  if(not iFillFromHistory) {
-    binOfMaximum=iPSetValue;
-    edm::LogInfo("EcalTPG") <<"EcalTrigPrimProducer is using binOfMaximum found in cfg file :  "<<binOfMaximum;
+  int binOfMaximum = 0; // starts at 1!
+  if (not iFillFromHistory) {
+    binOfMaximum = iPSetValue;
+    edm::LogInfo("EcalTPG")
+        << "EcalTrigPrimProducer is using binOfMaximum found in cfg file :  "
+        << binOfMaximum;
   }
-  
-  //search backwards in history looking for the particular module
-  const std::string kModuleName{ "ecalUnsuppressedDigis" };
-  for(auto it = iHistory.rbegin(), itEnd = iHistory.rend();
-      it != itEnd; ++it) {
-    auto const& topLevelPSet = getParameterSet(it->parameterSetID());
-    if(topLevelPSet.exists(kModuleName)) {
-      int psetBinOfMax = topLevelPSet.getParameter<edm::ParameterSet>(kModuleName).getParameter<int>("binOfMaximum");
-
-      if (not iFillFromHistory ) {
-	if ( psetBinOfMax!=binOfMaximum)edm:: LogWarning("EcalTPG")<< "binofMaximum given in configuration (="<<binOfMaximum<<") is different from the one found in ProductRegistration(="<<psetBinOfMax<<")!!!";
-      }else {
-	binOfMaximum=psetBinOfMax;
-	edm::LogInfo("EcalTPG") <<"EcalTrigPrimProducer is using binOfMaximum found in ProductRegistry :  "<<binOfMaximum;
+
+  // search backwards in history looking for the particular module
+  const std::string kModuleName{"ecalUnsuppressedDigis"};
+  for (auto it = iHistory.rbegin(), itEnd = iHistory.rend(); it != itEnd;
+       ++it) {
+    auto const &topLevelPSet = getParameterSet(it->parameterSetID());
+    if (topLevelPSet.exists(kModuleName)) {
+      int psetBinOfMax =
+          topLevelPSet.getParameter<edm::ParameterSet>(kModuleName)
+              .getParameter<int>("binOfMaximum");
+
+      if (not iFillFromHistory) {
+        if (psetBinOfMax != binOfMaximum)
+          edm::LogWarning("EcalTPG")
+              << "binofMaximum given in configuration (=" << binOfMaximum
+              << ") is different from the one found in ProductRegistration(="
+              << psetBinOfMax << ")!!!";
+      } else {
+        binOfMaximum = psetBinOfMax;
+        edm::LogInfo("EcalTPG") << "EcalTrigPrimProducer is using binOfMaximum "
+                                   "found in ProductRegistry :  "
+                                << binOfMaximum;
       }
       break;
     }
   }
-  if (binOfMaximum==0) {
-    binOfMaximum=6;
-    edm::LogWarning("EcalTPG")<<"Could not find product registry of EBDigiCollection (label ecalUnsuppressedDigis), had to set the following parameters by Hand:  binOfMaximum="<<binOfMaximum;
+  if (binOfMaximum == 0) {
+    binOfMaximum = 6;
+    edm::LogWarning("EcalTPG")
+        << "Could not find product registry of EBDigiCollection (label "
+           "ecalUnsuppressedDigis), had to set the following parameters by "
+           "Hand:  binOfMaximum="
+        << binOfMaximum;
   }
   return binOfMaximum;
 }
 
+void EcalTrigPrimProducer::beginRun(edm::Run const &run,
+                                    edm::EventSetup const &setup) {
+  // ProcessHistory is guaranteed to be constant for an entire Run
+  binOfMaximum_ = findBinOfMaximum(fillBinOfMaximumFromHistory_, binOfMaximum_,
+                                   run.processHistory());
 
-void EcalTrigPrimProducer::beginRun(edm::Run const & run,edm::EventSetup const& setup) {
-  //ProcessHistory is guaranteed to be constant for an entire Run
-  binOfMaximum_ = findBinOfMaximum(fillBinOfMaximumFromHistory_,binOfMaximum_,run.processHistory());
-
-  algo_.reset( new EcalTrigPrimFunctionalAlgo(setup,binOfMaximum_,tcpFormat_,barrelOnly_,debug_,famos_) );
+  algo_.reset(new EcalTrigPrimFunctionalAlgo(setup, binOfMaximum_, tcpFormat_,
+                                             barrelOnly_, debug_, famos_));
 
   // get a first version of the records
-  cacheID_=this->getRecords(setup);
+  cacheID_ = this->getRecords(setup);
 }
 
-void EcalTrigPrimProducer::endRun(edm::Run const& run,edm::EventSetup const& setup) {
+void EcalTrigPrimProducer::endRun(edm::Run const &run,
+                                  edm::EventSetup const &setup) {
   algo_.reset();
 }
 
-unsigned long long  EcalTrigPrimProducer::getRecords(edm::EventSetup const& setup) {
+unsigned long long
+EcalTrigPrimProducer::getRecords(edm::EventSetup const &setup) {
   // get Eventsetup records
 
   // for EcalFenixStrip...
   // get parameter records for xtals
   edm::ESHandle<EcalTPGLinearizationConst> theEcalTPGLinearization_handle;
   setup.get<EcalTPGLinearizationConstRcd>().get(theEcalTPGLinearization_handle);
-  const EcalTPGLinearizationConst * ecaltpLin = theEcalTPGLinearization_handle.product();
+  const EcalTPGLinearizationConst *ecaltpLin =
+      theEcalTPGLinearization_handle.product();
   edm::ESHandle<EcalTPGPedestals> theEcalTPGPedestals_handle;
   setup.get<EcalTPGPedestalsRcd>().get(theEcalTPGPedestals_handle);
-  const EcalTPGPedestals * ecaltpPed = theEcalTPGPedestals_handle.product();
+  const EcalTPGPedestals *ecaltpPed = theEcalTPGPedestals_handle.product();
   edm::ESHandle<EcalTPGCrystalStatus> theEcalTPGCrystalStatus_handle;
   setup.get<EcalTPGCrystalStatusRcd>().get(theEcalTPGCrystalStatus_handle);
-  const EcalTPGCrystalStatus * ecaltpgBadX = theEcalTPGCrystalStatus_handle.product();
-
+  const EcalTPGCrystalStatus *ecaltpgBadX =
+      theEcalTPGCrystalStatus_handle.product();
 
-  //for strips
+  // for strips
   edm::ESHandle<EcalTPGSlidingWindow> theEcalTPGSlidingWindow_handle;
   setup.get<EcalTPGSlidingWindowRcd>().get(theEcalTPGSlidingWindow_handle);
-  const EcalTPGSlidingWindow * ecaltpgSlidW = theEcalTPGSlidingWindow_handle.product();
+  const EcalTPGSlidingWindow *ecaltpgSlidW =
+      theEcalTPGSlidingWindow_handle.product();
   edm::ESHandle<EcalTPGWeightIdMap> theEcalTPGWEightIdMap_handle;
   setup.get<EcalTPGWeightIdMapRcd>().get(theEcalTPGWEightIdMap_handle);
-  const EcalTPGWeightIdMap * ecaltpgWeightMap = theEcalTPGWEightIdMap_handle.product();
+  const EcalTPGWeightIdMap *ecaltpgWeightMap =
+      theEcalTPGWEightIdMap_handle.product();
   edm::ESHandle<EcalTPGWeightGroup> theEcalTPGWEightGroup_handle;
   setup.get<EcalTPGWeightGroupRcd>().get(theEcalTPGWEightGroup_handle);
-  const EcalTPGWeightGroup * ecaltpgWeightGroup = theEcalTPGWEightGroup_handle.product();
+  const EcalTPGWeightGroup *ecaltpgWeightGroup =
+      theEcalTPGWEightGroup_handle.product();
   edm::ESHandle<EcalTPGFineGrainStripEE> theEcalTPGFineGrainStripEE_handle;
-  setup.get<EcalTPGFineGrainStripEERcd>().get(theEcalTPGFineGrainStripEE_handle);
-  const EcalTPGFineGrainStripEE * ecaltpgFgStripEE = theEcalTPGFineGrainStripEE_handle.product();     
+  setup.get<EcalTPGFineGrainStripEERcd>().get(
+      theEcalTPGFineGrainStripEE_handle);
+  const EcalTPGFineGrainStripEE *ecaltpgFgStripEE =
+      theEcalTPGFineGrainStripEE_handle.product();
   edm::ESHandle<EcalTPGStripStatus> theEcalTPGStripStatus_handle;
   setup.get<EcalTPGStripStatusRcd>().get(theEcalTPGStripStatus_handle);
-  const EcalTPGStripStatus * ecaltpgStripStatus = theEcalTPGStripStatus_handle.product();     
- 
-  algo_->setPointers(ecaltpLin,ecaltpPed,ecaltpgSlidW,ecaltpgWeightMap,ecaltpgWeightGroup,ecaltpgFgStripEE,ecaltpgBadX,ecaltpgStripStatus);
+  const EcalTPGStripStatus *ecaltpgStripStatus =
+      theEcalTPGStripStatus_handle.product();
+
+  algo_->setPointers(ecaltpLin, ecaltpPed, ecaltpgSlidW, ecaltpgWeightMap,
+                     ecaltpgWeightGroup, ecaltpgFgStripEE, ecaltpgBadX,
+                     ecaltpgStripStatus);
 
   // .. and for EcalFenixTcp
   // get parameter records for towers
   edm::ESHandle<EcalTPGFineGrainEBGroup> theEcalTPGFineGrainEBGroup_handle;
-  setup.get<EcalTPGFineGrainEBGroupRcd>().get(theEcalTPGFineGrainEBGroup_handle);
-  const EcalTPGFineGrainEBGroup * ecaltpgFgEBGroup = theEcalTPGFineGrainEBGroup_handle.product();
+  setup.get<EcalTPGFineGrainEBGroupRcd>().get(
+      theEcalTPGFineGrainEBGroup_handle);
+  const EcalTPGFineGrainEBGroup *ecaltpgFgEBGroup =
+      theEcalTPGFineGrainEBGroup_handle.product();
 
   edm::ESHandle<EcalTPGLutGroup> theEcalTPGLutGroup_handle;
   setup.get<EcalTPGLutGroupRcd>().get(theEcalTPGLutGroup_handle);
-  const EcalTPGLutGroup * ecaltpgLutGroup = theEcalTPGLutGroup_handle.product();
+  const EcalTPGLutGroup *ecaltpgLutGroup = theEcalTPGLutGroup_handle.product();
 
   edm::ESHandle<EcalTPGLutIdMap> theEcalTPGLutIdMap_handle;
   setup.get<EcalTPGLutIdMapRcd>().get(theEcalTPGLutIdMap_handle);
-  const EcalTPGLutIdMap * ecaltpgLut = theEcalTPGLutIdMap_handle.product();
+  const EcalTPGLutIdMap *ecaltpgLut = theEcalTPGLutIdMap_handle.product();
 
   edm::ESHandle<EcalTPGFineGrainEBIdMap> theEcalTPGFineGrainEBIdMap_handle;
-  setup.get<EcalTPGFineGrainEBIdMapRcd>().get(theEcalTPGFineGrainEBIdMap_handle);
-  const EcalTPGFineGrainEBIdMap * ecaltpgFineGrainEB = theEcalTPGFineGrainEBIdMap_handle.product();
+  setup.get<EcalTPGFineGrainEBIdMapRcd>().get(
+      theEcalTPGFineGrainEBIdMap_handle);
+  const EcalTPGFineGrainEBIdMap *ecaltpgFineGrainEB =
+      theEcalTPGFineGrainEBIdMap_handle.product();
 
   edm::ESHandle<EcalTPGFineGrainTowerEE> theEcalTPGFineGrainTowerEE_handle;
-  setup.get<EcalTPGFineGrainTowerEERcd>().get(theEcalTPGFineGrainTowerEE_handle);
-  const EcalTPGFineGrainTowerEE * ecaltpgFineGrainTowerEE = theEcalTPGFineGrainTowerEE_handle.product();
+  setup.get<EcalTPGFineGrainTowerEERcd>().get(
+      theEcalTPGFineGrainTowerEE_handle);
+  const EcalTPGFineGrainTowerEE *ecaltpgFineGrainTowerEE =
+      theEcalTPGFineGrainTowerEE_handle.product();
 
   edm::ESHandle<EcalTPGTowerStatus> theEcalTPGTowerStatus_handle;
   setup.get<EcalTPGTowerStatusRcd>().get(theEcalTPGTowerStatus_handle);
-  const EcalTPGTowerStatus * ecaltpgBadTT = theEcalTPGTowerStatus_handle.product();
+  const EcalTPGTowerStatus *ecaltpgBadTT =
+      theEcalTPGTowerStatus_handle.product();
 
   edm::ESHandle<EcalTPGSpike> theEcalTPGSpike_handle;
   setup.get<EcalTPGSpikeRcd>().get(theEcalTPGSpike_handle);
-  const EcalTPGSpike * ecaltpgSpike = theEcalTPGSpike_handle.product();
+  const EcalTPGSpike *ecaltpgSpike = theEcalTPGSpike_handle.product();
 
-  algo_->setPointers2(ecaltpgFgEBGroup,ecaltpgLutGroup,ecaltpgLut,ecaltpgFineGrainEB,ecaltpgFineGrainTowerEE,ecaltpgBadTT,ecaltpgSpike);
+  algo_->setPointers2(ecaltpgFgEBGroup, ecaltpgLutGroup, ecaltpgLut,
+                      ecaltpgFineGrainEB, ecaltpgFineGrainTowerEE, ecaltpgBadTT,
+                      ecaltpgSpike);
 
-  // we will suppose that everything is to be updated if the EcalTPGLinearizationConstRcd has changed
+  // we will suppose that everything is to be updated if the
+  // EcalTPGLinearizationConstRcd has changed
   return setup.get<EcalTPGLinearizationConstRcd>().cacheIdentifier();
 }
 
-EcalTrigPrimProducer::~EcalTrigPrimProducer()
-{}
-
+EcalTrigPrimProducer::~EcalTrigPrimProducer() {}
 
 // ------------ method called to produce the data  ------------
-void
-EcalTrigPrimProducer::produce(edm::Event& e, const edm::EventSetup&  iSetup)
-{
+void EcalTrigPrimProducer::produce(edm::Event &e,
+                                   const edm::EventSetup &iSetup) {
 
   // update constants if necessary
-  if (iSetup.get<EcalTPGLinearizationConstRcd>().cacheIdentifier()!=cacheID_) cacheID_=this->getRecords(iSetup);
+  if (iSetup.get<EcalTPGLinearizationConstRcd>().cacheIdentifier() != cacheID_)
+    cacheID_ = this->getRecords(iSetup);
 
   // get input collections
 
   edm::Handle<EBDigiCollection> ebDigis;
   edm::Handle<EEDigiCollection> eeDigis;
-  bool barrel=true;
-  bool endcap=true;
-  if (barrelOnly_) endcap=false;
+  bool barrel = true;
+  bool endcap = true;
+  if (barrelOnly_)
+    endcap = false;
 
-  if (!e.getByToken(tokenEB_,ebDigis)) {
-    barrel=false;
+  if (!e.getByToken(tokenEB_, ebDigis)) {
+    barrel = false;
     edm::EDConsumerBase::Labels labels;
     labelsForToken(tokenEB_, labels);
-    edm::LogWarning("EcalTPG") <<" Couldnt find Barrel dataframes with producer "<<labels.module<<" and label "<<labels.productInstance<<"!!!";
+    edm::LogWarning("EcalTPG")
+        << " Couldnt find Barrel dataframes with producer " << labels.module
+        << " and label " << labels.productInstance << "!!!";
   }
   if (!barrelOnly_) {
-    if (!e.getByToken(tokenEE_,eeDigis)) {
-      endcap=false;
+    if (!e.getByToken(tokenEE_, eeDigis)) {
+      endcap = false;
       edm::EDConsumerBase::Labels labels;
       labelsForToken(tokenEE_, labels);
-      edm::LogWarning("EcalTPG") <<" Couldnt find Endcap dataframes with producer "<<labels.module<<" and label "<<labels.productInstance<<"!!!";
+      edm::LogWarning("EcalTPG")
+          << " Couldnt find Endcap dataframes with producer " << labels.module
+          << " and label " << labels.productInstance << "!!!";
     }
   }
   if (!barrel && !endcap) {
     edm::EDConsumerBase::Labels labels;
     labelsForToken(tokenEB_, labels);
-    throw cms::Exception(" ProductNotFound") <<"No EBDataFrames(EEDataFrames) with producer "<<labels.module<<" and label "<<labels.productInstance<<" found in input!!\n";
+    throw cms::Exception(" ProductNotFound")
+        << "No EBDataFrames(EEDataFrames) with producer " << labels.module
+        << " and label " << labels.productInstance << " found in input!!\n";
   }
 
-  if (!barrelOnly_)   LogDebug("EcalTPG") <<" =================> Treating event  "<<e.id()<<", Number of EBDataFrames "<<ebDigis.product()->size()<<", Number of EEDataFrames "<<eeDigis.product()->size() ;
-  else  LogDebug("EcalTPG") <<" =================> Treating event  "<<e.id()<<", Number of EBDataFrames "<<ebDigis.product()->size();
+  if (!barrelOnly_)
+    LogDebug("EcalTPG") << " =================> Treating event  " << e.id()
+                        << ", Number of EBDataFrames "
+                        << ebDigis.product()->size()
+                        << ", Number of EEDataFrames "
+                        << eeDigis.product()->size();
+  else
+    LogDebug("EcalTPG") << " =================> Treating event  " << e.id()
+                        << ", Number of EBDataFrames "
+                        << ebDigis.product()->size();
 
   auto pOut = std::make_unique<EcalTrigPrimDigiCollection>();
   auto pOutTcp = std::make_unique<EcalTrigPrimDigiCollection>();
- 
 
-  // invoke algorithm 
+  // invoke algorithm
 
-  const EBDigiCollection *ebdc=nullptr;
-  const EEDigiCollection *eedc=nullptr;
+  const EBDigiCollection *ebdc = nullptr;
+  const EEDigiCollection *eedc = nullptr;
   if (barrel) {
-    ebdc=ebDigis.product();
-    algo_->run(iSetup,ebdc,*pOut,*pOutTcp);
+    ebdc = ebDigis.product();
+    algo_->run(iSetup, ebdc, *pOut, *pOutTcp);
   }
 
   if (endcap) {
-    eedc=eeDigis.product();
-    algo_->run(iSetup,eedc,*pOut,*pOutTcp);
+    eedc = eeDigis.product();
+    algo_->run(iSetup, eedc, *pOut, *pOutTcp);
   }
 
-  edm::LogInfo("produce") <<"For Barrel + Endcap, "<<pOut->size()<<" TP  Digis were produced";
+  edm::LogInfo("produce") << "For Barrel + Endcap, " << pOut->size()
+                          << " TP  Digis were produced";
 
   //  debug prints if TP >0
 
-  for (unsigned int i=0;i<pOut->size();++i) {
-    bool print=false;
-    for (int isam=0;isam<(*pOut)[i].size();++isam) {
-      if ((*pOut)[i][isam].raw()) print=true;
+  for (unsigned int i = 0; i < pOut->size(); ++i) {
+    bool print = false;
+    for (int isam = 0; isam < (*pOut)[i].size(); ++isam) {
+      if ((*pOut)[i][isam].raw())
+        print = true;
     }
-    if (print) LogDebug("EcalTPG") <<" For tower  "<<(((*pOut)[i])).id()<<", TP is "<<(*pOut)[i];
+    if (print)
+      LogDebug("EcalTPG") << " For tower  " << (((*pOut)[i])).id() << ", TP is "
+                          << (*pOut)[i];
   }
-  if (barrelOnly_)  LogDebug("EcalTPG") <<"\n =================> For Barrel , "<<pOut->size()<<" TP  Digis were produced (including zero ones)";
-  else      LogDebug("EcalTPG") <<"\n =================> For Barrel + Endcap, "<<pOut->size()<<" TP  Digis were produced (including zero ones)";
+  if (barrelOnly_)
+    LogDebug("EcalTPG") << "\n =================> For Barrel , " << pOut->size()
+                        << " TP  Digis were produced (including zero ones)";
+  else
+    LogDebug("EcalTPG") << "\n =================> For Barrel + Endcap, "
+                        << pOut->size()
+                        << " TP  Digis were produced (including zero ones)";
 
   // put result into the Event
 
   e.put(std::move(pOut));
-  if (tcpFormat_) e.put(std::move(pOutTcp),"formatTCP");
+  if (tcpFormat_)
+    e.put(std::move(pOutTcp), "formatTCP");
 }
 
-void 
-EcalTrigPrimProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+void EcalTrigPrimProducer::fillDescriptions(
+    edm::ConfigurationDescriptions &descriptions) {
 
   edm::ParameterSetDescription desc;
-  desc.add<bool>("BarrelOnly",false);
-  desc.add<bool>("TcpOutput",false);
-  desc.add<bool>("Debug",false);
-  desc.add<bool>("Famos",false);
-  desc.add<std::string>("Label","simEcalUnsuppressedDigis");
-  desc.add<std::string>("InstanceEB","");
-  desc.add<std::string>("InstanceEE","");
-  const std::string kComment("A value of -1 will make the module lookup the value of 'binOfMaximum' from the module 'ecalUnsuppressedDigis' from the process history. Allowed values are -1 and from 1-10."); 
-  //The code before the existence of fillDescriptions did something special if 'binOfMaximum' was missing. This replicates that behavior.
-  desc.add<int>("binOfMaximum",-1)->setComment(kComment);
+  desc.add<bool>("BarrelOnly", false);
+  desc.add<bool>("TcpOutput", false);
+  desc.add<bool>("Debug", false);
+  desc.add<bool>("Famos", false);
+  desc.add<std::string>("Label", "simEcalUnsuppressedDigis");
+  desc.add<std::string>("InstanceEB", "");
+  desc.add<std::string>("InstanceEE", "");
+  const std::string kComment(
+      "A value of -1 will make the module lookup the value of 'binOfMaximum' "
+      "from the module 'ecalUnsuppressedDigis' from the process history. "
+      "Allowed values are -1 and from 1-10.");
+  // The code before the existence of fillDescriptions did something special if
+  // 'binOfMaximum' was missing. This replicates that behavior.
+  desc.add<int>("binOfMaximum", -1)->setComment(kComment);
   descriptions.addDefault(desc);
 }
diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimProducer.h b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimProducer.h
index 6156a5078cc6b..63cf6d232200e 100644
--- a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimProducer.h
+++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimProducer.h
@@ -1,6 +1,6 @@
 #ifndef EcaltrigprimProducer_h
 #define EcaltrigprimProducer_h
-  
+
 /** \class EcalTrigPrimProducer
  *
  * EcalTrigPrimProducer produces a EcalTrigPrimDigiCollection
@@ -18,35 +18,33 @@
  ************************************************************/
 
 #include <memory>
- 
-#include "FWCore/Framework/interface/stream/EDProducer.h"
+
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
- 
+
 #include "DataFormats/Common/interface/Handle.h"
- 
+
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-  
+
 class EcalTrigPrimFunctionalAlgo;
 class EBDigiCollection;
 class EEDigiCollection;
- 
-class EcalTrigPrimProducer : public edm::stream::EDProducer<>
-{
- public:
-  
-  explicit EcalTrigPrimProducer(const edm::ParameterSet& conf);
-  
+
+class EcalTrigPrimProducer : public edm::stream::EDProducer<> {
+public:
+  explicit EcalTrigPrimProducer(const edm::ParameterSet &conf);
+
   ~EcalTrigPrimProducer() override;
-  
-  void beginRun(const edm::Run& run, const edm::EventSetup& es) override;
-  void endRun(const edm::Run&, const edm::EventSetup&) override;
-  void produce(edm::Event& e, const edm::EventSetup& c) override;
 
-  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-  
- private:
+  void beginRun(const edm::Run &run, const edm::EventSetup &es) override;
+  void endRun(const edm::Run &, const edm::EventSetup &) override;
+  void produce(edm::Event &e, const edm::EventSetup &c) override;
+
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
+
+private:
   std::unique_ptr<EcalTrigPrimFunctionalAlgo> algo_;
   bool barrelOnly_;
   bool tcpFormat_;
@@ -58,12 +56,9 @@ class EcalTrigPrimProducer : public edm::stream::EDProducer<>
   int binOfMaximum_;
   bool fillBinOfMaximumFromHistory_;
 
-  //method to get EventSetupRecords
-  unsigned long long getRecords(edm::EventSetup const& setup);
+  // method to get EventSetupRecords
+  unsigned long long getRecords(edm::EventSetup const &setup);
   unsigned long long cacheID_;
 };
-  
-#endif
- 
-
 
+#endif
diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimSpikeESProducer.cc b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimSpikeESProducer.cc
index b640fd09d6b6e..5683234e6a238 100644
--- a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimSpikeESProducer.cc
+++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimSpikeESProducer.cc
@@ -1,23 +1,22 @@
 // user include files
 #include "EcalTrigPrimSpikeESProducer.h"
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DataFormats/EcalDetId/interface/EcalTrigTowerDetId.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 //
 // constructors and destructor
 //
-EcalTrigPrimSpikeESProducer::EcalTrigPrimSpikeESProducer(const edm::ParameterSet& iConfig) :
-  zeroThresh_(iConfig.getUntrackedParameter<uint32_t>("TCCZeroingThreshold", 0))
-{
+EcalTrigPrimSpikeESProducer::EcalTrigPrimSpikeESProducer(
+    const edm::ParameterSet &iConfig)
+    : zeroThresh_(
+          iConfig.getUntrackedParameter<uint32_t>("TCCZeroingThreshold", 0)) {
   // Indicate we produce the spike record
-  setWhatProduced(this, &EcalTrigPrimSpikeESProducer::produceSpike) ;
+  setWhatProduced(this, &EcalTrigPrimSpikeESProducer::produceSpike);
 
   // Cache all EB TT raw DetIDs
-  for(unsigned int i = 1; i <= 17; ++i)
-  {
-    for(unsigned int j = 1; j <= 72; ++j)
-    {
+  for (unsigned int i = 1; i <= 17; ++i) {
+    for (unsigned int j = 1; j <= 72; ++j) {
       EcalTrigTowerDetId posTT(1, EcalBarrel, i, j);
       EcalTrigTowerDetId negTT(-1, EcalBarrel, i, j);
       towerIDs_.push_back(posTT.rawId());
@@ -26,19 +25,15 @@ EcalTrigPrimSpikeESProducer::EcalTrigPrimSpikeESProducer(const edm::ParameterSet
   }
 }
 
-EcalTrigPrimSpikeESProducer::~EcalTrigPrimSpikeESProducer()
-{ 
-}
-
+EcalTrigPrimSpikeESProducer::~EcalTrigPrimSpikeESProducer() {}
 
 // ------------ method called to produce the data  ------------
-std::unique_ptr<EcalTPGSpike> EcalTrigPrimSpikeESProducer::produceSpike(const EcalTPGSpikeRcd &iRecord)
-{
+std::unique_ptr<EcalTPGSpike>
+EcalTrigPrimSpikeESProducer::produceSpike(const EcalTPGSpikeRcd &iRecord) {
   auto prod = std::make_unique<EcalTPGSpike>();
-  for(std::vector<uint32_t>::const_iterator it = towerIDs_.begin(); it != towerIDs_.end(); ++it)
-  {
+  for (std::vector<uint32_t>::const_iterator it = towerIDs_.begin();
+       it != towerIDs_.end(); ++it) {
     prod->setValue(*it, zeroThresh_);
   }
   return prod;
 }
-
diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimSpikeESProducer.h b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimSpikeESProducer.h
index d8cdf3e44644b..db8639725369d 100644
--- a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimSpikeESProducer.h
+++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimSpikeESProducer.h
@@ -2,14 +2,14 @@
 #define SimCalorimetry_EcalTrigPrimProducers_EcalTrigPrimSpikeESProducer_H
 
 // user include files
-#include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/ModuleFactory.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "CondFormats/EcalObjects/interface/EcalTPGSpike.h"
 #include "CondFormats/DataRecord/interface/EcalTPGSpikeRcd.h"
+#include "CondFormats/EcalObjects/interface/EcalTPGSpike.h"
 
 #include <vector>
 
@@ -18,16 +18,15 @@
 //
 
 class EcalTrigPrimSpikeESProducer : public edm::ESProducer {
- public:
-  EcalTrigPrimSpikeESProducer(const edm::ParameterSet&);
+public:
+  EcalTrigPrimSpikeESProducer(const edm::ParameterSet &);
   ~EcalTrigPrimSpikeESProducer() override;
 
-  std::unique_ptr<EcalTPGSpike> produceSpike(const EcalTPGSpikeRcd &) ;
+  std::unique_ptr<EcalTPGSpike> produceSpike(const EcalTPGSpikeRcd &);
 
- private:
+private:
   std::vector<uint32_t> towerIDs_;
   uint16_t zeroThresh_;
 };
 
-
 #endif
diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/SealModules.cc b/SimCalorimetry/EcalTrigPrimProducers/plugins/SealModules.cc
index c625389496905..6ddabdd17a83b 100644
--- a/SimCalorimetry/EcalTrigPrimProducers/plugins/SealModules.cc
+++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/SealModules.cc
@@ -3,14 +3,13 @@
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "EcalTrigPrimProducer.h"
-#include "EcalTrigPrimAnalyzer.h"
-#include "EcalTPInputAnalyzer.h"
 #include "EcalTPCondAnalyzer.h"
+#include "EcalTPInputAnalyzer.h"
+#include "EcalTrigPrimAnalyzer.h"
 #include "EcalTrigPrimESProducer.h"
+#include "EcalTrigPrimProducer.h"
 #include "EcalTrigPrimSpikeESProducer.h"
 
-
 DEFINE_FWK_MODULE(EcalTrigPrimProducer);
 DEFINE_FWK_MODULE(EcalTPInputAnalyzer);
 DEFINE_FWK_MODULE(EcalTrigPrimAnalyzer);
diff --git a/SimCalorimetry/EcalZeroSuppressionAlgos/interface/EcalZeroSuppressor.h b/SimCalorimetry/EcalZeroSuppressionAlgos/interface/EcalZeroSuppressor.h
index a45a66d52ac74..19a9a58f26635 100644
--- a/SimCalorimetry/EcalZeroSuppressionAlgos/interface/EcalZeroSuppressor.h
+++ b/SimCalorimetry/EcalZeroSuppressionAlgos/interface/EcalZeroSuppressor.h
@@ -6,48 +6,45 @@
  *
  * \author F. Cossutti
  *
-*/
+ */
 
 #include "FWCore/Framework/interface/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "CondFormats/DataRecord/interface/EcalPedestalsRcd.h"
 #include "CondFormats/EcalObjects/interface/EcalPedestals.h"
+#include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 
 #include "SimCalorimetry/EcalZeroSuppressionAlgos/interface/TrivialAmplitudeAlgo.h"
 
 #include <vector>
 
-template<class C> class EcalZeroSuppressor 
-{
+template <class C>
+class EcalZeroSuppressor {
 public:
-  
   virtual ~EcalZeroSuppressor(){};
 
-  // the threshold has to be expressed in number of noise sigmas for ADC counts in the highest gain
+  // the threshold has to be expressed in number of noise sigmas for ADC counts
+  // in the highest gain
 
   // bool accept(const C& frame, const double & threshold);
-  bool accept(const C& frame, const double & threshold);
-  
+  bool accept(const C &frame, const double &threshold);
+
   /// can be fetched every event from the EventSetup
-  void setPedestals(const EcalPedestals * pedestals) {thePedestals = pedestals;} 
+  void setPedestals(const EcalPedestals *pedestals) { thePedestals = pedestals; }
+
+private:
+  const EcalPedestals *thePedestals;
 
- private:
+  void findGain12Pedestal(const DetId &detId, double &pedestal, double &width);
 
-  const EcalPedestals * thePedestals;
- 
-  void findGain12Pedestal(const DetId & detId, 
-                          double & pedestal, double & width);
-  
   TrivialAmplitudeAlgo<C> theEnergy_;
-  
 };
 
 #include "EcalZeroSuppressor.icc"
diff --git a/SimCalorimetry/EcalZeroSuppressionAlgos/interface/EcalZeroSuppressor.icc b/SimCalorimetry/EcalZeroSuppressionAlgos/interface/EcalZeroSuppressor.icc
index 6212a8bd80fbc..e0905827b4a61 100644
--- a/SimCalorimetry/EcalZeroSuppressionAlgos/interface/EcalZeroSuppressor.icc
+++ b/SimCalorimetry/EcalZeroSuppressionAlgos/interface/EcalZeroSuppressor.icc
@@ -1,24 +1,23 @@
-template <class C> void EcalZeroSuppressor<C>::findGain12Pedestal(const DetId & detId, double & ped, double & width) 
-{
+template <class C>
+void EcalZeroSuppressor<C>::findGain12Pedestal(const DetId &detId, double &ped, double &width) {
   ped = 200.;
   width = 1.;
   EcalPedestalsMapIterator mapItr = thePedestals->getMap().find(detId);
   // should I care if it doesn't get found?
-  if(mapItr == thePedestals->getMap().end()) {
-    edm::LogError("SetupInfo") << "Could not find pedestal for " << detId.rawId() << " among the " << thePedestals->getMap().size();
+  if (mapItr == thePedestals->getMap().end()) {
+    edm::LogError("SetupInfo") << "Could not find pedestal for " << detId.rawId() << " among the "
+                               << thePedestals->getMap().size();
   } else {
     ped = (*mapItr).mean_x12;
     width = (*mapItr).rms_x12;
   }
 }
- 
-
-template <class C> bool EcalZeroSuppressor<C>::accept(const C& frame, const double & threshold) 
-{
 
+template <class C>
+bool EcalZeroSuppressor<C>::accept(const C &frame, const double &threshold) {
   bool pass = true;
 
-  DetId  detId = frame.id();
+  DetId detId = frame.id();
 
   double ped;
   double width;
@@ -27,8 +26,8 @@ template <class C> bool EcalZeroSuppressor<C>::accept(const C& frame, const doub
   double Erec = 0.;
   Erec = theEnergy_.energy(frame);
 
-  if (Erec<=threshold*width) pass = false;
-  
-  return pass;
+  if (Erec <= threshold * width)
+    pass = false;
 
+  return pass;
 }
diff --git a/SimCalorimetry/EcalZeroSuppressionAlgos/interface/TrivialAmplitudeAlgo.h b/SimCalorimetry/EcalZeroSuppressionAlgos/interface/TrivialAmplitudeAlgo.h
index 441ddb1e2c702..6e9ad9a3a5288 100644
--- a/SimCalorimetry/EcalZeroSuppressionAlgos/interface/TrivialAmplitudeAlgo.h
+++ b/SimCalorimetry/EcalZeroSuppressionAlgos/interface/TrivialAmplitudeAlgo.h
@@ -8,36 +8,32 @@
  *
  * simple weights algorithm for energy and pedestal reconstruction
  *
-*/
-
+ */
 
 #include "FWCore/Framework/interface/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 
 #include <vector>
 
-template<class C> class TrivialAmplitudeAlgo 
-{
+template <class C>
+class TrivialAmplitudeAlgo {
 public:
-
   explicit TrivialAmplitudeAlgo();
   virtual ~TrivialAmplitudeAlgo(){};
 
-  double energy(const C& frame);
+  double energy(const C &frame);
 
-  double pedestal(const C& frame);
-
- private:
+  double pedestal(const C &frame);
 
+private:
   std::vector<double> theWeights;
   std::vector<double> theGainFactors;
-
 };
 
 #include "TrivialAmplitudeAlgo.icc"
diff --git a/SimCalorimetry/EcalZeroSuppressionAlgos/interface/TrivialAmplitudeAlgo.icc b/SimCalorimetry/EcalZeroSuppressionAlgos/interface/TrivialAmplitudeAlgo.icc
index 13c35c019e35f..d1360271b3aa8 100644
--- a/SimCalorimetry/EcalZeroSuppressionAlgos/interface/TrivialAmplitudeAlgo.icc
+++ b/SimCalorimetry/EcalZeroSuppressionAlgos/interface/TrivialAmplitudeAlgo.icc
@@ -1,15 +1,17 @@
-template <class C> TrivialAmplitudeAlgo<C>::TrivialAmplitudeAlgo() 
-{ 
-
+template <class C>
+TrivialAmplitudeAlgo<C>::TrivialAmplitudeAlgo() {
   // 3+1 set of trivial weights
 
   theWeights.reserve(10);
-  for (int sample = 0 ; sample < 10 ; ++sample)
-    {
-      if (sample<3) { theWeights[sample] = -1./3.; }
-      else if (sample==5) { theWeights[sample] = 1.; }
-      else { theWeights[sample] = 0.; }
+  for (int sample = 0; sample < 10; ++sample) {
+    if (sample < 3) {
+      theWeights[sample] = -1. / 3.;
+    } else if (sample == 5) {
+      theWeights[sample] = 1.;
+    } else {
+      theWeights[sample] = 0.;
     }
+  }
 
   // nominal gain factors
 
@@ -18,54 +20,42 @@ template <class C> TrivialAmplitudeAlgo<C>::TrivialAmplitudeAlgo()
   theGainFactors[1] = 1.;
   theGainFactors[2] = 2.;
   theGainFactors[3] = 12.;
-
 }
 
-
-template <class C> double TrivialAmplitudeAlgo<C>::energy(const C & frame) 
-{
-
-  double Erec = 0. ;
+template <class C>
+double TrivialAmplitudeAlgo<C>::energy(const C &frame) {
+  double Erec = 0.;
 
   // Simple energy computation with the weight method
   // using the weigths method with fixed weigths -1/3, -1/3, -1/3, 0, 0, 1, 0...
 
-  for (int sample = 0 ; sample < frame.size () ; ++sample)
-    {
-      int gain = (frame.sample (sample).gainId());
-      if (gain >= 1 || gain <=3 ) {
-        Erec = Erec+theWeights[sample]*(frame.sample (sample).adc ())*theGainFactors[gain];
-      }
-      else {
-        edm::LogWarning("EcalAmplitudeError") << "Wrong gain in frame " << sample << " \n" << frame;
-      }
+  for (int sample = 0; sample < frame.size(); ++sample) {
+    int gain = (frame.sample(sample).gainId());
+    if (gain >= 1 || gain <= 3) {
+      Erec = Erec + theWeights[sample] * (frame.sample(sample).adc()) * theGainFactors[gain];
+    } else {
+      edm::LogWarning("EcalAmplitudeError") << "Wrong gain in frame " << sample << " \n" << frame;
     }
+  }
 
   return Erec;
-
 }
 
-
-template <class C> double TrivialAmplitudeAlgo<C>::pedestal(const C & frame) 
-{
-
-  double PrePed = 0. ;
+template <class C>
+double TrivialAmplitudeAlgo<C>::pedestal(const C &frame) {
+  double PrePed = 0.;
 
   // Simple predestal from 3 first samples
   // using the weigths method with fixed weigths -1/3, -1/3, -1/3, 0, 0, 1, 0...
 
-  for (int sample = 0 ; sample < 3 ; ++sample)
-    {
-      int gain = (frame.sample (sample).gainId());
-      if (gain >= 1 || gain <=3 ) {
-        PrePed = PrePed+theWeights[sample]*(frame.sample (sample).adc ())*theGainFactors[gain];
-      }
-      else {
-        edm::LogWarning("EcalAmplitudeError") << "Wrong gain in frame " << sample << " \n" << frame;
-      }
+  for (int sample = 0; sample < 3; ++sample) {
+    int gain = (frame.sample(sample).gainId());
+    if (gain >= 1 || gain <= 3) {
+      PrePed = PrePed + theWeights[sample] * (frame.sample(sample).adc()) * theGainFactors[gain];
+    } else {
+      edm::LogWarning("EcalAmplitudeError") << "Wrong gain in frame " << sample << " \n" << frame;
     }
+  }
 
-  return -1.*PrePed;
-
+  return -1. * PrePed;
 }
-
diff --git a/SimCalorimetry/EcalZeroSuppressionProducers/interface/ESZeroSuppressionProducer.h b/SimCalorimetry/EcalZeroSuppressionProducers/interface/ESZeroSuppressionProducer.h
index dbd32d25ed794..8fbdc0d52770f 100644
--- a/SimCalorimetry/EcalZeroSuppressionProducers/interface/ESZeroSuppressionProducer.h
+++ b/SimCalorimetry/EcalZeroSuppressionProducers/interface/ESZeroSuppressionProducer.h
@@ -1,35 +1,31 @@
 #ifndef ESZEROSUPPRESSIONPRODUCER_H
 #define ESZEROSUPPRESSIONPRODUCER_H
 
-#include "FWCore/Framework/interface/ConsumesCollector.h"
-#include "FWCore/Framework/interface/stream/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
+#include "CondFormats/DataRecord/interface/ESPedestalsRcd.h"
+#include "CondFormats/DataRecord/interface/ESThresholdsRcd.h"
+#include "CondFormats/ESObjects/interface/ESPedestals.h"
+#include "CondFormats/ESObjects/interface/ESThresholds.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
+#include "DataFormats/Provenance/interface/Provenance.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/Provenance/interface/Provenance.h"
-#include "CondFormats/ESObjects/interface/ESThresholds.h"
-#include "CondFormats/DataRecord/interface/ESThresholdsRcd.h"
-#include "CondFormats/ESObjects/interface/ESPedestals.h"
-#include "CondFormats/DataRecord/interface/ESPedestalsRcd.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class ESZeroSuppressionProducer : public edm::stream::EDProducer<>
-{
- public:
-    
-  explicit ESZeroSuppressionProducer(const edm::ParameterSet& ps);
+class ESZeroSuppressionProducer : public edm::stream::EDProducer<> {
+public:
+  explicit ESZeroSuppressionProducer(const edm::ParameterSet &ps);
   ~ESZeroSuppressionProducer() override;
-  
+
   /**Produces the EDM products,*/
-  void produce(edm::Event& event, const edm::EventSetup& eventSetup) override;
-  
-  
- private:
+  void produce(edm::Event &event, const edm::EventSetup &eventSetup) override;
 
+private:
   std::string digiProducer_;
   std::string ESdigiCollection_;
   std::string ESZSdigiCollection_;
@@ -38,7 +34,6 @@ class ESZeroSuppressionProducer : public edm::stream::EDProducer<>
   edm::ESHandle<ESPedestals> espeds_;
 
   edm::EDGetTokenT<ESDigiCollection> ES_token;
-
 };
 
-#endif 
+#endif
diff --git a/SimCalorimetry/EcalZeroSuppressionProducers/interface/EcalZeroSuppressionProducer.h b/SimCalorimetry/EcalZeroSuppressionProducers/interface/EcalZeroSuppressionProducer.h
index d43ab8d851755..87eec5fa8512c 100644
--- a/SimCalorimetry/EcalZeroSuppressionProducers/interface/EcalZeroSuppressionProducer.h
+++ b/SimCalorimetry/EcalZeroSuppressionProducers/interface/EcalZeroSuppressionProducer.h
@@ -1,58 +1,53 @@
 #ifndef ECALZEROSUPPRESSIONPRODUCER_H
 #define ECALZEROSUPPRESSIONPRODUCER_H
 
-#include "FWCore/Framework/interface/ConsumesCollector.h"
-#include "FWCore/Framework/interface/stream/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
+#include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
+#include "CondFormats/DataRecord/interface/EcalPedestalsRcd.h"
+#include "CondFormats/EcalObjects/interface/EcalGainRatios.h"
+#include "CondFormats/EcalObjects/interface/EcalPedestals.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
+#include "DataFormats/Provenance/interface/Provenance.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/Provenance/interface/Provenance.h"
-#include "CondFormats/DataRecord/interface/EcalPedestalsRcd.h"
-#include "CondFormats/EcalObjects/interface/EcalPedestals.h"
-#include "CondFormats/EcalObjects/interface/EcalGainRatios.h"
-#include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
- 
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "SimCalorimetry/EcalZeroSuppressionAlgos/interface/EcalZeroSuppressor.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloDigiCollectionSorter.h"
+#include "SimCalorimetry/EcalZeroSuppressionAlgos/interface/EcalZeroSuppressor.h"
 
-class EcalZeroSuppressionProducer : public edm::stream::EDProducer<>
-{
+class EcalZeroSuppressionProducer : public edm::stream::EDProducer<> {
 public:
-
   // The following is not yet used, but will be the primary
   // constructor when the parameter set system is available.
   //
-  explicit EcalZeroSuppressionProducer(const edm::ParameterSet& params);
+  explicit EcalZeroSuppressionProducer(const edm::ParameterSet &params);
   ~EcalZeroSuppressionProducer() override;
 
   /**Produces the EDM products,*/
-  void produce(edm::Event& event, const edm::EventSetup& eventSetup) override;
+  void produce(edm::Event &event, const edm::EventSetup &eventSetup) override;
 
-  void initCalibrations(const edm::EventSetup & eventSetup);
+  void initCalibrations(const edm::EventSetup &eventSetup);
 
 private:
-
   double glbBarrelThreshold_;
   double glbEndcapThreshold_;
-  
-  std::string digiProducer_; // name of module/plugin/producer making digis
-  std::string EBdigiCollection_; // secondary name given to collection of digis
-  std::string EEdigiCollection_; // secondary name given to collection of digis
-  std::string EBZSdigiCollection_; // secondary name given to collection of digis
-  std::string EEZSdigiCollection_; // secondary name given to collection of digis
+
+  std::string digiProducer_;        // name of module/plugin/producer making digis
+  std::string EBdigiCollection_;    // secondary name given to collection of digis
+  std::string EEdigiCollection_;    // secondary name given to collection of digis
+  std::string EBZSdigiCollection_;  // secondary name given to collection of digis
+  std::string EEZSdigiCollection_;  // secondary name given to collection of digis
 
   EcalZeroSuppressor<EBDataFrame> theBarrelZeroSuppressor_;
   EcalZeroSuppressor<EEDataFrame> theEndcapZeroSuppressor_;
 
   edm::EDGetTokenT<EBDigiCollection> EB_token;
   edm::EDGetTokenT<EEDigiCollection> EE_token;
- 
 };
 
-#endif 
+#endif
diff --git a/SimCalorimetry/EcalZeroSuppressionProducers/src/ESZeroSuppressionProducer.cc b/SimCalorimetry/EcalZeroSuppressionProducers/src/ESZeroSuppressionProducer.cc
index 7feb994ade8e2..91d1a07a0f85f 100644
--- a/SimCalorimetry/EcalZeroSuppressionProducers/src/ESZeroSuppressionProducer.cc
+++ b/SimCalorimetry/EcalZeroSuppressionProducers/src/ESZeroSuppressionProducer.cc
@@ -1,25 +1,21 @@
-#include "SimCalorimetry/EcalZeroSuppressionProducers/interface/ESZeroSuppressionProducer.h"
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "DataFormats/EcalDigi/interface/ESDataFrame.h"
+#include "Geometry/Records/interface/IdealGeometryRecord.h"
+#include "SimCalorimetry/EcalZeroSuppressionProducers/interface/ESZeroSuppressionProducer.h"
 
-ESZeroSuppressionProducer::ESZeroSuppressionProducer(const edm::ParameterSet& ps) {
-
-  digiProducer_   = ps.getParameter<std::string>("digiProducer");
+ESZeroSuppressionProducer::ESZeroSuppressionProducer(const edm::ParameterSet &ps) {
+  digiProducer_ = ps.getParameter<std::string>("digiProducer");
   ESdigiCollection_ = ps.getParameter<std::string>("ESdigiCollection");
   ESZSdigiCollection_ = ps.getParameter<std::string>("ESZSdigiCollection");
- 
-  produces<ESDigiCollection>(ESZSdigiCollection_);
-
-  ES_token = consumes<ESDigiCollection>(edm::InputTag(digiProducer_));;
 
-}
-
-ESZeroSuppressionProducer::~ESZeroSuppressionProducer() { 
+  produces<ESDigiCollection>(ESZSdigiCollection_);
 
+  ES_token = consumes<ESDigiCollection>(edm::InputTag(digiProducer_));
+  ;
 }
 
-void ESZeroSuppressionProducer::produce(edm::Event& event, const edm::EventSetup& eventSetup) {
+ESZeroSuppressionProducer::~ESZeroSuppressionProducer() {}
 
+void ESZeroSuppressionProducer::produce(edm::Event &event, const edm::EventSetup &eventSetup) {
   eventSetup.get<ESThresholdsRcd>().get(esthresholds_);
   const ESThresholds *thresholds = esthresholds_.product();
 
@@ -33,27 +29,25 @@ void ESZeroSuppressionProducer::produce(edm::Event& event, const edm::EventSetup
   bool fullESDigis = true;
   event.getByToken(ES_token, ESDigis);
   if (!ESDigis.isValid()) {
-    edm::LogError("ZeroSuppressionError") << "Error! can't get the product " << ESdigiCollection_.c_str() ;
+    edm::LogError("ZeroSuppressionError") << "Error! can't get the product " << ESdigiCollection_.c_str();
     fullESDigis = false;
-  }  
+  }
 
   std::unique_ptr<ESDigiCollection> ESZSDigis(new ESDigiCollection());
-  
-  if (fullESDigis) {
-    for (ESDigiCollection::const_iterator i (ESDigis->begin()); 
-         i!=ESDigis->end(); ++i) {            
 
+  if (fullESDigis) {
+    for (ESDigiCollection::const_iterator i(ESDigis->begin()); i != ESDigis->end(); ++i) {
       ESDataFrame dataframe = (*i);
 
       ESPedestals::const_iterator it_ped = pedestals->find(dataframe.id());
 
-      if (dataframe.sample(1).adc() > (ts2Threshold+it_ped->getMean())) {
-	//std::cout<<dataframe.sample(1).adc()<<" "<<ts2Threshold+it_ped->getMean()<<std::endl;
-	(*ESZSDigis).push_back(*i);
+      if (dataframe.sample(1).adc() > (ts2Threshold + it_ped->getMean())) {
+        // std::cout<<dataframe.sample(1).adc()<<"
+        // "<<ts2Threshold+it_ped->getMean()<<std::endl;
+        (*ESZSDigis).push_back(*i);
       }
     }
-  }     
-  
+  }
+
   event.put(std::move(ESZSDigis), ESZSdigiCollection_);
 }
-
diff --git a/SimCalorimetry/EcalZeroSuppressionProducers/src/EcalZeroSuppressionProducer.cc b/SimCalorimetry/EcalZeroSuppressionProducers/src/EcalZeroSuppressionProducer.cc
index c040e36369e53..1c207d6ed0fe7 100644
--- a/SimCalorimetry/EcalZeroSuppressionProducers/src/EcalZeroSuppressionProducer.cc
+++ b/SimCalorimetry/EcalZeroSuppressionProducers/src/EcalZeroSuppressionProducer.cc
@@ -1,9 +1,8 @@
 
 #include "SimCalorimetry/EcalZeroSuppressionProducers/interface/EcalZeroSuppressionProducer.h"
 
-EcalZeroSuppressionProducer::EcalZeroSuppressionProducer(const edm::ParameterSet& params) 
-{
-  digiProducer_   = params.getParameter<std::string>("digiProducer");
+EcalZeroSuppressionProducer::EcalZeroSuppressionProducer(const edm::ParameterSet &params) {
+  digiProducer_ = params.getParameter<std::string>("digiProducer");
   EBdigiCollection_ = params.getParameter<std::string>("EBdigiCollection");
   EEdigiCollection_ = params.getParameter<std::string>("EEdigiCollection");
   EBZSdigiCollection_ = params.getParameter<std::string>("EBZSdigiCollection");
@@ -11,123 +10,106 @@ EcalZeroSuppressionProducer::EcalZeroSuppressionProducer(const edm::ParameterSet
 
   // initialize the default values for the thresholds in number of noise sigmas
 
-  glbBarrelThreshold_ = params.getUntrackedParameter<double>("glbBarrelThreshold",0.2);
-  glbEndcapThreshold_ = params.getUntrackedParameter<double>("glbEndcapThreshold",0.4);
+  glbBarrelThreshold_ = params.getUntrackedParameter<double>("glbBarrelThreshold", 0.2);
+  glbEndcapThreshold_ = params.getUntrackedParameter<double>("glbEndcapThreshold", 0.4);
 
   produces<EBDigiCollection>(EBZSdigiCollection_);
   produces<EEDigiCollection>(EEZSdigiCollection_);
 
   EB_token = consumes<EBDigiCollection>(edm::InputTag(digiProducer_));
-  EE_token = consumes<EEDigiCollection>(edm::InputTag(digiProducer_));;
-
+  EE_token = consumes<EEDigiCollection>(edm::InputTag(digiProducer_));
+  ;
 }
 
+EcalZeroSuppressionProducer::~EcalZeroSuppressionProducer() {}
 
-EcalZeroSuppressionProducer::~EcalZeroSuppressionProducer() 
-{ }
-
-
-void EcalZeroSuppressionProducer::produce(edm::Event& event, const edm::EventSetup& eventSetup) 
-{
-  
+void EcalZeroSuppressionProducer::produce(edm::Event &event, const edm::EventSetup &eventSetup) {
   // Get Inputs
 
   initCalibrations(eventSetup);
-  
-  edm::Handle< EBDigiCollection > pEBDigis;
-  edm::Handle< EEDigiCollection > pEEDigis;
-  
-  const EBDigiCollection* fullBarrelDigis =nullptr;
-  const EEDigiCollection* fullEndcapDigis =nullptr;
-  
-  event.getByToken( EB_token, pEBDigis);
-  if (pEBDigis.isValid()){ 
-    fullBarrelDigis = pEBDigis.product(); // get a ptr to the produc
-    edm::LogInfo("ZeroSuppressionInfo") << "total # fullBarrelDigis: " << fullBarrelDigis->size() ;
+
+  edm::Handle<EBDigiCollection> pEBDigis;
+  edm::Handle<EEDigiCollection> pEEDigis;
+
+  const EBDigiCollection *fullBarrelDigis = nullptr;
+  const EEDigiCollection *fullEndcapDigis = nullptr;
+
+  event.getByToken(EB_token, pEBDigis);
+  if (pEBDigis.isValid()) {
+    fullBarrelDigis = pEBDigis.product();  // get a ptr to the produc
+    edm::LogInfo("ZeroSuppressionInfo") << "total # fullBarrelDigis: " << fullBarrelDigis->size();
   } else {
-    edm::LogError("ZeroSuppressionError") << "Error! can't get the product " << EBdigiCollection_.c_str() ;
+    edm::LogError("ZeroSuppressionError") << "Error! can't get the product " << EBdigiCollection_.c_str();
   }
-  
-  event.getByToken( EE_token, pEEDigis);
-  if (pEEDigis.isValid()){ 
-    fullEndcapDigis = pEEDigis.product(); // get a ptr to the product
-    edm::LogInfo("ZeroSuppressionInfo") << "total # fullEndcapDigis: " << fullEndcapDigis->size() ;
+
+  event.getByToken(EE_token, pEEDigis);
+  if (pEEDigis.isValid()) {
+    fullEndcapDigis = pEEDigis.product();  // get a ptr to the product
+    edm::LogInfo("ZeroSuppressionInfo") << "total # fullEndcapDigis: " << fullEndcapDigis->size();
   } else {
-    edm::LogError("ZeroSuppressionError") << "Error! can't get the product " << EEdigiCollection_.c_str() ;
+    edm::LogError("ZeroSuppressionError") << "Error! can't get the product " << EEdigiCollection_.c_str();
   }
 
   // collection of zero suppressed digis to put in the event
-  
-  std::unique_ptr< EBDigiCollection > gzsBarrelDigis(new EBDigiCollection());
-  std::unique_ptr< EEDigiCollection > gzsEndcapDigis(new EEDigiCollection());
+
+  std::unique_ptr<EBDigiCollection> gzsBarrelDigis(new EBDigiCollection());
+  std::unique_ptr<EEDigiCollection> gzsEndcapDigis(new EEDigiCollection());
 
   CaloDigiCollectionSorter sorter(5);
 
   // Barrel zero suppression
 
   if (fullBarrelDigis) {
-
-    for(EBDigiCollection::const_iterator digiItr = (*fullBarrelDigis).begin();
-        digiItr != (*fullBarrelDigis).end(); ++digiItr)
-      {
-        
-        bool isAccepted = theBarrelZeroSuppressor_.accept(*digiItr, glbBarrelThreshold_);
-        if (isAccepted) {
-          (*gzsBarrelDigis).push_back(digiItr->id(), digiItr->begin());
-        }
-        
+    for (EBDigiCollection::const_iterator digiItr = (*fullBarrelDigis).begin(); digiItr != (*fullBarrelDigis).end();
+         ++digiItr) {
+      bool isAccepted = theBarrelZeroSuppressor_.accept(*digiItr, glbBarrelThreshold_);
+      if (isAccepted) {
+        (*gzsBarrelDigis).push_back(digiItr->id(), digiItr->begin());
       }
+    }
     edm::LogInfo("ZeroSuppressionInfo") << "EB Digis: " << gzsBarrelDigis->size();
 
-
-    //std::vector<EBDataFrame> sortedDigisEB = sorter.sortedVector(*gzsBarrelDigis);
-    //LogDebug("ZeroSuppressionDump") << "Top 10 EB digis";
-    //for(int i = 0; i < std::min(10,(int) sortedDigisEB.size()); ++i) 
+    // std::vector<EBDataFrame> sortedDigisEB =
+    // sorter.sortedVector(*gzsBarrelDigis); LogDebug("ZeroSuppressionDump") <<
+    // "Top 10 EB digis"; for(int i = 0; i < std::min(10,(int)
+    // sortedDigisEB.size()); ++i)
     //  {
     //    LogDebug("ZeroSuppressionDump") << sortedDigisEB[i];
     //  }
   }
-  
+
   // Endcap zero suppression
 
   if (fullEndcapDigis) {
-
-    for(EEDigiCollection::const_iterator digiItr = (*fullEndcapDigis).begin();
-        digiItr != (*fullEndcapDigis).end(); ++digiItr)
-      {
-        
-        bool isAccepted = theEndcapZeroSuppressor_.accept(*digiItr, glbEndcapThreshold_);
-        if (isAccepted) {
-          (*gzsEndcapDigis).push_back(digiItr->id(), digiItr->begin());
-        }
-        
+    for (EEDigiCollection::const_iterator digiItr = (*fullEndcapDigis).begin(); digiItr != (*fullEndcapDigis).end();
+         ++digiItr) {
+      bool isAccepted = theEndcapZeroSuppressor_.accept(*digiItr, glbEndcapThreshold_);
+      if (isAccepted) {
+        (*gzsEndcapDigis).push_back(digiItr->id(), digiItr->begin());
       }
+    }
     edm::LogInfo("ZeroSuppressionInfo") << "EB Digis: " << gzsBarrelDigis->size();
-    
-    //    std::vector<EEDataFrame> sortedDigisEE = sorter.sortedVector(*gzsEndcapDigis);
-    //LogDebug("ZeroSuppressionDump")  << "Top 10 EE digis";
-    //for(int i = 0; i < std::min(10,(int) sortedDigisEE.size()); ++i) 
+
+    //    std::vector<EEDataFrame> sortedDigisEE =
+    //    sorter.sortedVector(*gzsEndcapDigis);
+    // LogDebug("ZeroSuppressionDump")  << "Top 10 EE digis";
+    // for(int i = 0; i < std::min(10,(int) sortedDigisEE.size()); ++i)
     //  {
     //    LogDebug("ZeroSuppressionDump") << sortedDigisEE[i];
     //  }
-  
   }
   // Step D: Put outputs into event
   event.put(std::move(gzsBarrelDigis), EBZSdigiCollection_);
   event.put(std::move(gzsEndcapDigis), EEZSdigiCollection_);
-
 }
 
-
-void EcalZeroSuppressionProducer::initCalibrations(const edm::EventSetup & eventSetup) {
-
+void EcalZeroSuppressionProducer::initCalibrations(const edm::EventSetup &eventSetup) {
   // Pedestals from event setup
-                                                                                                                                                             
+
   edm::ESHandle<EcalPedestals> dbPed;
-  eventSetup.get<EcalPedestalsRcd>().get( dbPed );
-  const EcalPedestals * thePedestals=dbPed.product();
+  eventSetup.get<EcalPedestalsRcd>().get(dbPed);
+  const EcalPedestals *thePedestals = dbPed.product();
 
-  theBarrelZeroSuppressor_.setPedestals( thePedestals );
-  theEndcapZeroSuppressor_.setPedestals( thePedestals );
-                                                                                                                                                             
+  theBarrelZeroSuppressor_.setPedestals(thePedestals);
+  theEndcapZeroSuppressor_.setPedestals(thePedestals);
 }
diff --git a/SimCalorimetry/EcalZeroSuppressionProducers/src/SealModule.cc b/SimCalorimetry/EcalZeroSuppressionProducers/src/SealModule.cc
index 031e642159f40..badf381bdd9b0 100644
--- a/SimCalorimetry/EcalZeroSuppressionProducers/src/SealModule.cc
+++ b/SimCalorimetry/EcalZeroSuppressionProducers/src/SealModule.cc
@@ -1,13 +1,11 @@
-/*  
+/*
  *  \author  F. Cossutti - INFN Trieste
  */
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "SimCalorimetry/EcalZeroSuppressionProducers/interface/EcalZeroSuppressionProducer.h"
 #include "SimCalorimetry/EcalZeroSuppressionProducers/interface/ESZeroSuppressionProducer.h"
+#include "SimCalorimetry/EcalZeroSuppressionProducers/interface/EcalZeroSuppressionProducer.h"
 
-
-DEFINE_FWK_MODULE (EcalZeroSuppressionProducer) ;
-DEFINE_FWK_MODULE (ESZeroSuppressionProducer) ;
-
+DEFINE_FWK_MODULE(EcalZeroSuppressionProducer);
+DEFINE_FWK_MODULE(ESZeroSuppressionProducer);
diff --git a/SimCalorimetry/HcalSimProducers/interface/HcalDigiProducer.h b/SimCalorimetry/HcalSimProducers/interface/HcalDigiProducer.h
index a7d359c197100..d5d2213be0841 100644
--- a/SimCalorimetry/HcalSimProducers/interface/HcalDigiProducer.h
+++ b/SimCalorimetry/HcalSimProducers/interface/HcalDigiProducer.h
@@ -1,8 +1,8 @@
 #ifndef SimCalorimetry_HcalSimProducers_HcalDigiProducer_h
 #define SimCalorimetry_HcalSimProducers_HcalDigiProducer_h
 
-#include "SimGeneral/MixingModule/interface/DigiAccumulatorMixMod.h"
 #include "SimCalorimetry/HcalSimProducers/interface/HcalDigitizer.h"
+#include "SimGeneral/MixingModule/interface/DigiAccumulatorMixMod.h"
 
 #include <vector>
 
@@ -11,7 +11,7 @@ namespace edm {
   class ProducerBase;
   class ParameterSet;
   class StreamID;
-}
+}  // namespace edm
 
 namespace CLHEP {
   class HepRandomEngine;
@@ -19,28 +19,28 @@ namespace CLHEP {
 
 class HcalDigiProducer : public DigiAccumulatorMixMod {
 public:
-  HcalDigiProducer(edm::ParameterSet const& pset, edm::ProducerBase& mixMod, edm::ConsumesCollector& iC);
+  HcalDigiProducer(edm::ParameterSet const &pset, edm::ProducerBase &mixMod, edm::ConsumesCollector &iC);
 
-  HcalDigiProducer(edm::ParameterSet const& pset, edm::ConsumesCollector& iC);
+  HcalDigiProducer(edm::ParameterSet const &pset, edm::ConsumesCollector &iC);
 
-  void initializeEvent(edm::Event const&, edm::EventSetup const&) override;
-  void finalizeEvent(edm::Event&, edm::EventSetup const&) override;
-  void accumulate(edm::Event const&, edm::EventSetup const&) override;
-  void accumulate(PileUpEventPrincipal const&, edm::EventSetup const&, edm::StreamID const&) override;
-  void beginRun(edm::Run const&, edm::EventSetup const&) override;
-  void endRun(edm::Run const&, edm::EventSetup const&) override;
+  void initializeEvent(edm::Event const &, edm::EventSetup const &) override;
+  void finalizeEvent(edm::Event &, edm::EventSetup const &) override;
+  void accumulate(edm::Event const &, edm::EventSetup const &) override;
+  void accumulate(PileUpEventPrincipal const &, edm::EventSetup const &, edm::StreamID const &) override;
+  void beginRun(edm::Run const &, edm::EventSetup const &) override;
+  void endRun(edm::Run const &, edm::EventSetup const &) override;
 
-  void setHBHENoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator);
-  void setHFNoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator);
-  void setHONoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator);
-  void setZDCNoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator);
-  void setQIE10NoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator);
-  void setQIE11NoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator);
+  void setHBHENoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator);
+  void setHFNoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator);
+  void setHONoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator);
+  void setZDCNoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator);
+  void setQIE10NoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator);
+  void setQIE11NoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator);
 
 private:
   HcalDigitizer theDigitizer_;
 
-  CLHEP::HepRandomEngine* randomEngine_ = nullptr;
+  CLHEP::HepRandomEngine *randomEngine_ = nullptr;
 };
 
 #endif
diff --git a/SimCalorimetry/HcalSimProducers/interface/HcalDigitizer.h b/SimCalorimetry/HcalSimProducers/interface/HcalDigitizer.h
index d34cec350051c..a8746947ba475 100644
--- a/SimCalorimetry/HcalSimProducers/interface/HcalDigitizer.h
+++ b/SimCalorimetry/HcalSimProducers/interface/HcalDigitizer.h
@@ -1,25 +1,25 @@
 #ifndef HcalSimProducers_HcalDigitizer_h
 #define HcalSimProducers_HcalDigitizer_h
 
-#include "SimCalorimetry/HcalSimAlgos/interface/HcalDigitizerTraits.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/HcalSimParameterMap.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/HcalShapes.h"
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/HcalQIE1011Traits.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/HcalHitFilter.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/ZDCHitFilter.h"
-#include "Geometry/HcalCommonData/interface/HcalHitRelabeller.h"
-#include "Geometry/HcalCommonData/interface/HcalDDDRecConstants.h"
-#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
-#include "DataFormats/DetId/interface/DetId.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "CalibCalorimetry/HcalAlgos/interface/HcalTimeSlew.h"
 #include "CondFormats/HcalObjects/interface/HBHEDarkening.h"
+#include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/HcalCalibObjects/interface/HFRecalibration.h"
-#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
-#include "CalibCalorimetry/HcalAlgos/interface/HcalTimeSlew.h"
 #include "FWCore/Framework/interface/ESWatcher.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
+#include "Geometry/HcalCommonData/interface/HcalDDDRecConstants.h"
+#include "Geometry/HcalCommonData/interface/HcalHitRelabeller.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "Geometry/Records/interface/HcalRecNumberingRecord.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HcalDigitizerTraits.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HcalHitFilter.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HcalQIE1011Traits.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HcalShapes.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HcalSimParameterMap.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/ZDCHitFilter.h"
+#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 
 #include <vector>
 
@@ -43,57 +43,59 @@ namespace CLHEP {
   class HepRandomEngine;
 }
 
-class HcalDigitizer
-{
+class HcalDigitizer {
 public:
-
-  explicit HcalDigitizer(const edm::ParameterSet& ps, edm::ConsumesCollector& iC);
+  explicit HcalDigitizer(const edm::ParameterSet &ps, edm::ConsumesCollector &iC);
   virtual ~HcalDigitizer();
 
   /**Produces the EDM products,*/
-  void initializeEvent(edm::Event const& e, edm::EventSetup const& c);
-  void accumulate(edm::Event const& e, edm::EventSetup const& c, CLHEP::HepRandomEngine*);
-  void accumulate(PileUpEventPrincipal const& e, edm::EventSetup const& c, CLHEP::HepRandomEngine*);
-  void finalizeEvent(edm::Event& e, edm::EventSetup const& c, CLHEP::HepRandomEngine*);
-  
-  void setHBHENoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator);
-  void setHFNoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator);
-  void setHONoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator);
-  void setZDCNoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator);
-  void setQIE10NoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator);
-  void setQIE11NoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator);
+  void initializeEvent(edm::Event const &e, edm::EventSetup const &c);
+  void accumulate(edm::Event const &e, edm::EventSetup const &c, CLHEP::HepRandomEngine *);
+  void accumulate(PileUpEventPrincipal const &e, edm::EventSetup const &c, CLHEP::HepRandomEngine *);
+  void finalizeEvent(edm::Event &e, edm::EventSetup const &c, CLHEP::HepRandomEngine *);
+
+  void setHBHENoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator);
+  void setHFNoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator);
+  void setHONoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator);
+  void setZDCNoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator);
+  void setQIE10NoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator);
+  void setQIE11NoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator);
 
 private:
-  void setup(const edm::EventSetup & es);
-  void accumulateCaloHits(edm::Handle<std::vector<PCaloHit> > const& hcalHits, edm::Handle<std::vector<PCaloHit> > const& zdcHits, int bunchCrossing, CLHEP::HepRandomEngine*, const HcalTopology *h);
+  void setup(const edm::EventSetup &es);
+  void accumulateCaloHits(edm::Handle<std::vector<PCaloHit>> const &hcalHits,
+                          edm::Handle<std::vector<PCaloHit>> const &zdcHits,
+                          int bunchCrossing,
+                          CLHEP::HepRandomEngine *,
+                          const HcalTopology *h);
 
   /// some hits in each subdetector, just for testing purposes
   void fillFakeHits();
   /// make sure the digitizer has the correct list of all cells that
   /// exist in the geometry
-  void checkGeometry(const edm::EventSetup& eventSetup);
+  void checkGeometry(const edm::EventSetup &eventSetup);
   edm::ESWatcher<CaloGeometryRecord> theGeometryWatcher_;
   edm::ESWatcher<HcalRecNumberingRecord> theRecNumberWatcher_;
-  const CaloGeometry * theGeometry;
-  const HcalDDDRecConstants * theRecNumber;
-  void updateGeometry(const edm::EventSetup& eventSetup);
+  const CaloGeometry *theGeometry;
+  const HcalDDDRecConstants *theRecNumber;
+  void updateGeometry(const edm::EventSetup &eventSetup);
 
-  void buildHOSiPMCells(const std::vector<DetId>& allCells, const edm::EventSetup& eventSetup);
-  void buildHFQIECells(const std::vector<DetId>& allCells, const edm::EventSetup& eventSetup);
-  void buildHBHEQIECells(const std::vector<DetId>& allCells, const edm::EventSetup& eventSetup);
+  void buildHOSiPMCells(const std::vector<DetId> &allCells, const edm::EventSetup &eventSetup);
+  void buildHFQIECells(const std::vector<DetId> &allCells, const edm::EventSetup &eventSetup);
+  void buildHBHEQIECells(const std::vector<DetId> &allCells, const edm::EventSetup &eventSetup);
+
+  // function to evaluate aging at the digi level
+  void darkening(std::vector<PCaloHit> &hcalHits);
 
-  //function to evaluate aging at the digi level
-  void darkening(std::vector<PCaloHit>& hcalHits);
-  
   /** Reconstruction algorithm*/
-  typedef CaloTDigitizer<HBHEDigitizerTraits,CaloTDigitizerQIE8Run> HBHEDigitizer;
-  typedef CaloTDigitizer<HODigitizerTraits,CaloTDigitizerQIE8Run>   HODigitizer;
-  typedef CaloTDigitizer<HFDigitizerTraits,CaloTDigitizerQIE8Run>   HFDigitizer;
-  typedef CaloTDigitizer<ZDCDigitizerTraits,CaloTDigitizerQIE8Run>  ZDCDigitizer;
-  typedef CaloTDigitizer<HcalQIE10DigitizerTraits,CaloTDigitizerQIE1011Run> QIE10Digitizer;
-  typedef CaloTDigitizer<HcalQIE11DigitizerTraits,CaloTDigitizerQIE1011Run> QIE11Digitizer;
-
-  HcalSimParameterMap  theParameterMap;
+  typedef CaloTDigitizer<HBHEDigitizerTraits, CaloTDigitizerQIE8Run> HBHEDigitizer;
+  typedef CaloTDigitizer<HODigitizerTraits, CaloTDigitizerQIE8Run> HODigitizer;
+  typedef CaloTDigitizer<HFDigitizerTraits, CaloTDigitizerQIE8Run> HFDigitizer;
+  typedef CaloTDigitizer<ZDCDigitizerTraits, CaloTDigitizerQIE8Run> ZDCDigitizer;
+  typedef CaloTDigitizer<HcalQIE10DigitizerTraits, CaloTDigitizerQIE1011Run> QIE10Digitizer;
+  typedef CaloTDigitizer<HcalQIE11DigitizerTraits, CaloTDigitizerQIE1011Run> QIE11Digitizer;
+
+  HcalSimParameterMap theParameterMap;
   HcalShapes theShapes;
 
   std::unique_ptr<CaloHitResponse> theHBHEResponse;
@@ -125,11 +127,11 @@ class HcalDigitizer
 
   HBHEHitFilter theHBHEHitFilter;
   HBHEHitFilter theHBHEQIE11HitFilter;
-  HFHitFilter   theHFHitFilter;
-  HFHitFilter   theHFQIE10HitFilter;
+  HFHitFilter theHFHitFilter;
+  HFHitFilter theHFQIE10HitFilter;
   HOHitFilter theHOHitFilter;
   HOHitFilter theHOSiPMHitFilter;
-  ZDCHitFilter  theZDCHitFilter;
+  ZDCHitFilter theZDCHitFilter;
 
   std::unique_ptr<HcalTimeSlewSim> theTimeSlewSim;
 
@@ -150,7 +152,7 @@ class HcalDigitizer
   std::vector<DetId> theHOSiPMDetIds;
   std::vector<DetId> theHFQIE8DetIds, theHFQIE10DetIds;
 
-  bool isZDC,isHCAL,zdcgeo,hbhegeo,hogeo,hfgeo;
+  bool isZDC, isHCAL, zdcgeo, hbhegeo, hogeo, hfgeo;
   bool testNumbering_;
   bool doHFWindow_;
   bool killHE_;
@@ -161,14 +163,14 @@ class HcalDigitizer
   std::string hitsProducer_;
 
   int theHOSiPMCode;
-  
+
   double deliveredLumi;
   bool agingFlagHB, agingFlagHE;
-  const HBHEDarkening* m_HBDarkening;
-  const HBHEDarkening* m_HEDarkening;
+  const HBHEDarkening *m_HBDarkening;
+  const HBHEDarkening *m_HEDarkening;
   std::unique_ptr<HFRecalibration> m_HFRecalibration;
 
-  const HcalTimeSlew* hcalTimeSlew_delay_;
+  const HcalTimeSlew *hcalTimeSlew_delay_;
 
   std::vector<double> injectedHitsEnergy_;
   std::vector<double> injectedHitsTime_;
@@ -177,6 +179,3 @@ class HcalDigitizer
 };
 
 #endif
-
-
- 
diff --git a/SimCalorimetry/HcalSimProducers/plugins/PreMixingHcalWorker.cc b/SimCalorimetry/HcalSimProducers/plugins/PreMixingHcalWorker.cc
index 55cf087346cec..e7c018f288736 100644
--- a/SimCalorimetry/HcalSimProducers/plugins/PreMixingHcalWorker.cc
+++ b/SimCalorimetry/HcalSimProducers/plugins/PreMixingHcalWorker.cc
@@ -1,52 +1,54 @@
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/ProducerBase.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "SimGeneral/MixingModule/interface/PileUpEventPrincipal.h"
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 #include "DataFormats/HcalDigi/interface/HBHEDataFrame.h"
-#include "DataFormats/HcalDigi/interface/HODataFrame.h"
 #include "DataFormats/HcalDigi/interface/HFDataFrame.h"
+#include "DataFormats/HcalDigi/interface/HODataFrame.h"
+#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 #include "DataFormats/HcalDigi/interface/QIE10DataFrame.h"
 #include "DataFormats/HcalDigi/interface/QIE11DataFrame.h"
-#include "SimCalorimetry/HcalSimProducers/interface/HcalDigiProducer.h"
 #include "SimCalorimetry/HcalSimAlgos/interface/HcalSignalGenerator.h"
+#include "SimCalorimetry/HcalSimProducers/interface/HcalDigiProducer.h"
 
 #include "SimGeneral/PreMixingModule/interface/PreMixingWorker.h"
 #include "SimGeneral/PreMixingModule/interface/PreMixingWorkerFactory.h"
 
-class PreMixingHcalWorker: public PreMixingWorker {
+class PreMixingHcalWorker : public PreMixingWorker {
 public:
-  PreMixingHcalWorker(const edm::ParameterSet& ps, edm::ProducerBase& producer, edm::ConsumesCollector&& iC);
+  PreMixingHcalWorker(const edm::ParameterSet &ps, edm::ProducerBase &producer, edm::ConsumesCollector &&iC);
   ~PreMixingHcalWorker() override = default;
 
-  PreMixingHcalWorker(const PreMixingHcalWorker&) = delete;
-  PreMixingHcalWorker& operator=(const PreMixingHcalWorker&) = delete;
-
-  void beginRun(const edm::Run& run, const edm::EventSetup& ES) override;
-  void initializeEvent(const edm::Event &e, const edm::EventSetup& ES) override;
-  void addSignals(const edm::Event &e, const edm::EventSetup& ES) override;
-  void addPileups(const PileUpEventPrincipal&, const edm::EventSetup& ES) override;
-  void put(edm::Event &e,const edm::EventSetup& ES, std::vector<PileupSummaryInfo> const& ps, int bs) override;
+  PreMixingHcalWorker(const PreMixingHcalWorker &) = delete;
+  PreMixingHcalWorker &operator=(const PreMixingHcalWorker &) = delete;
 
+  void beginRun(const edm::Run &run, const edm::EventSetup &ES) override;
+  void initializeEvent(const edm::Event &e, const edm::EventSetup &ES) override;
+  void addSignals(const edm::Event &e, const edm::EventSetup &ES) override;
+  void addPileups(const PileUpEventPrincipal &, const edm::EventSetup &ES) override;
+  void put(edm::Event &e, const edm::EventSetup &ES, std::vector<PileupSummaryInfo> const &ps, int bs) override;
 
 private:
-  edm::InputTag HBHEPileInputTag_; // InputTag for Pileup Digis collection  
-  edm::InputTag HOPileInputTag_  ; // InputTag for Pileup Digis collection
-  edm::InputTag HFPileInputTag_  ; // InputTag for Pileup Digis collection
-  edm::InputTag ZDCPileInputTag_ ; // InputTag for Pileup Digis collection
-  edm::InputTag QIE10PileInputTag_ ; // InputTag for Pileup Digis collection
-  edm::InputTag QIE11PileInputTag_ ; // InputTag for Pileup Digis collection
-  std::string HBHEDigiCollectionDM_; // secondary name to be given to collection of digis
-  std::string HODigiCollectionDM_  ; // secondary name to be given to collection of digis
-  std::string HFDigiCollectionDM_  ; // secondary name to be given to collection of digis
-  std::string ZDCDigiCollectionDM_ ; // secondary name to be given to collection of digis
-  std::string QIE10DigiCollectionDM_ ; // secondary name to be given to collection of digis
-  std::string QIE11DigiCollectionDM_ ; // secondary name to be given to collection of digis
+  edm::InputTag HBHEPileInputTag_;     // InputTag for Pileup Digis collection
+  edm::InputTag HOPileInputTag_;       // InputTag for Pileup Digis collection
+  edm::InputTag HFPileInputTag_;       // InputTag for Pileup Digis collection
+  edm::InputTag ZDCPileInputTag_;      // InputTag for Pileup Digis collection
+  edm::InputTag QIE10PileInputTag_;    // InputTag for Pileup Digis collection
+  edm::InputTag QIE11PileInputTag_;    // InputTag for Pileup Digis collection
+  std::string HBHEDigiCollectionDM_;   // secondary name to be given to collection
+                                       // of digis
+  std::string HODigiCollectionDM_;     // secondary name to be given to collection of digis
+  std::string HFDigiCollectionDM_;     // secondary name to be given to collection of digis
+  std::string ZDCDigiCollectionDM_;    // secondary name to be given to collection of digis
+  std::string QIE10DigiCollectionDM_;  // secondary name to be given to
+                                       // collection of digis
+  std::string QIE11DigiCollectionDM_;  // secondary name to be given to
+                                       // collection of digis
 
   edm::EDGetTokenT<HBHEDigitizerTraits::DigiCollection> tok_hbhe_;
   edm::EDGetTokenT<HODigitizerTraits::DigiCollection> tok_ho_;
@@ -64,16 +66,17 @@ class PreMixingHcalWorker: public PreMixingWorker {
   QIE11SignalGenerator theQIE11SignalGenerator;
 };
 
-// Constructor 
-PreMixingHcalWorker::PreMixingHcalWorker(const edm::ParameterSet& ps, edm::ProducerBase& producer, edm::ConsumesCollector&& iC): 
-  HBHEPileInputTag_(ps.getParameter<edm::InputTag>("HBHEPileInputTag")),
-  HOPileInputTag_(ps.getParameter<edm::InputTag>("HOPileInputTag")),
-  HFPileInputTag_(ps.getParameter<edm::InputTag>("HFPileInputTag")),
-  ZDCPileInputTag_(ps.getParameter<edm::InputTag>("ZDCPileInputTag")),
-  QIE10PileInputTag_(ps.getParameter<edm::InputTag>("QIE10PileInputTag")),
-  QIE11PileInputTag_(ps.getParameter<edm::InputTag>("QIE11PileInputTag")),
-  myHcalDigitizer_(ps, iC)
-{  
+// Constructor
+PreMixingHcalWorker::PreMixingHcalWorker(const edm::ParameterSet &ps,
+                                         edm::ProducerBase &producer,
+                                         edm::ConsumesCollector &&iC)
+    : HBHEPileInputTag_(ps.getParameter<edm::InputTag>("HBHEPileInputTag")),
+      HOPileInputTag_(ps.getParameter<edm::InputTag>("HOPileInputTag")),
+      HFPileInputTag_(ps.getParameter<edm::InputTag>("HFPileInputTag")),
+      ZDCPileInputTag_(ps.getParameter<edm::InputTag>("ZDCPileInputTag")),
+      QIE10PileInputTag_(ps.getParameter<edm::InputTag>("QIE10PileInputTag")),
+      QIE11PileInputTag_(ps.getParameter<edm::InputTag>("QIE11PileInputTag")),
+      myHcalDigitizer_(ps, iC) {
   tok_hbhe_ = iC.consumes<HBHEDigitizerTraits::DigiCollection>(HBHEPileInputTag_);
   tok_ho_ = iC.consumes<HODigitizerTraits::DigiCollection>(HOPileInputTag_);
   tok_hf_ = iC.consumes<HFDigitizerTraits::DigiCollection>(HFPileInputTag_);
@@ -81,56 +84,56 @@ PreMixingHcalWorker::PreMixingHcalWorker(const edm::ParameterSet& ps, edm::Produ
   tok_qie10_ = iC.consumes<HcalQIE10DigitizerTraits::DigiCollection>(QIE10PileInputTag_);
   tok_qie11_ = iC.consumes<HcalQIE11DigitizerTraits::DigiCollection>(QIE11PileInputTag_);
 
-  theHBHESignalGenerator = HBHESignalGenerator(HBHEPileInputTag_,tok_hbhe_);
-  theHOSignalGenerator = HOSignalGenerator(HOPileInputTag_,tok_ho_);
-  theHFSignalGenerator = HFSignalGenerator(HFPileInputTag_,tok_hf_);
-  theZDCSignalGenerator = ZDCSignalGenerator(ZDCPileInputTag_,tok_zdc_);
-  theQIE10SignalGenerator = QIE10SignalGenerator(QIE10PileInputTag_,tok_qie10_);
-  theQIE11SignalGenerator = QIE11SignalGenerator(QIE11PileInputTag_,tok_qie11_);
+  theHBHESignalGenerator = HBHESignalGenerator(HBHEPileInputTag_, tok_hbhe_);
+  theHOSignalGenerator = HOSignalGenerator(HOPileInputTag_, tok_ho_);
+  theHFSignalGenerator = HFSignalGenerator(HFPileInputTag_, tok_hf_);
+  theZDCSignalGenerator = ZDCSignalGenerator(ZDCPileInputTag_, tok_zdc_);
+  theQIE10SignalGenerator = QIE10SignalGenerator(QIE10PileInputTag_, tok_qie10_);
+  theQIE11SignalGenerator = QIE11SignalGenerator(QIE11PileInputTag_, tok_qie11_);
 
-  // Hcal 
+  // Hcal
   // Signal inputs now handled by HcalDigitizer - gets pSimHits directly
 
   HBHEDigiCollectionDM_ = ps.getParameter<std::string>("HBHEDigiCollectionDM");
-  HODigiCollectionDM_   = ps.getParameter<std::string>("HODigiCollectionDM");
-  HFDigiCollectionDM_   = ps.getParameter<std::string>("HFDigiCollectionDM");
-  ZDCDigiCollectionDM_  = ps.getParameter<std::string>("ZDCDigiCollectionDM");
-  QIE10DigiCollectionDM_  = ps.getParameter<std::string>("QIE10DigiCollectionDM");
-  QIE11DigiCollectionDM_  = ps.getParameter<std::string>("QIE11DigiCollectionDM");
+  HODigiCollectionDM_ = ps.getParameter<std::string>("HODigiCollectionDM");
+  HFDigiCollectionDM_ = ps.getParameter<std::string>("HFDigiCollectionDM");
+  ZDCDigiCollectionDM_ = ps.getParameter<std::string>("ZDCDigiCollectionDM");
+  QIE10DigiCollectionDM_ = ps.getParameter<std::string>("QIE10DigiCollectionDM");
+  QIE11DigiCollectionDM_ = ps.getParameter<std::string>("QIE11DigiCollectionDM");
 
-  producer.produces< HBHEDigiCollection >();
-  producer.produces< HODigiCollection >();
-  producer.produces< HFDigiCollection >();
-  producer.produces< ZDCDigiCollection >();
+  producer.produces<HBHEDigiCollection>();
+  producer.produces<HODigiCollection>();
+  producer.produces<HFDigiCollection>();
+  producer.produces<ZDCDigiCollection>();
 
   producer.produces<QIE10DigiCollection>("HFQIE10DigiCollection");
   producer.produces<QIE11DigiCollection>("HBHEQIE11DigiCollection");
 
   // initialize HcalDigitizer here...
-  myHcalDigitizer_.setHBHENoiseSignalGenerator( & theHBHESignalGenerator );
-  myHcalDigitizer_.setHFNoiseSignalGenerator( & theHFSignalGenerator );
-  myHcalDigitizer_.setHONoiseSignalGenerator( & theHOSignalGenerator );
-  myHcalDigitizer_.setZDCNoiseSignalGenerator( & theZDCSignalGenerator );
-  myHcalDigitizer_.setQIE10NoiseSignalGenerator( & theQIE10SignalGenerator );
-  myHcalDigitizer_.setQIE11NoiseSignalGenerator( & theQIE11SignalGenerator );
-
+  myHcalDigitizer_.setHBHENoiseSignalGenerator(&theHBHESignalGenerator);
+  myHcalDigitizer_.setHFNoiseSignalGenerator(&theHFSignalGenerator);
+  myHcalDigitizer_.setHONoiseSignalGenerator(&theHOSignalGenerator);
+  myHcalDigitizer_.setZDCNoiseSignalGenerator(&theZDCSignalGenerator);
+  myHcalDigitizer_.setQIE10NoiseSignalGenerator(&theQIE10SignalGenerator);
+  myHcalDigitizer_.setQIE11NoiseSignalGenerator(&theQIE11SignalGenerator);
 }
-	       
-void PreMixingHcalWorker::beginRun(const edm::Run& run, const edm::EventSetup& ES) {
-  myHcalDigitizer_.beginRun(run, ES); 
+
+void PreMixingHcalWorker::beginRun(const edm::Run &run, const edm::EventSetup &ES) {
+  myHcalDigitizer_.beginRun(run, ES);
 }
 
-void PreMixingHcalWorker::initializeEvent(const edm::Event &e, const edm::EventSetup& ES) {
-  myHcalDigitizer_.initializeEvent(e, ES); 
+void PreMixingHcalWorker::initializeEvent(const edm::Event &e, const edm::EventSetup &ES) {
+  myHcalDigitizer_.initializeEvent(e, ES);
 }
 
-void PreMixingHcalWorker::addSignals(const edm::Event &e,const edm::EventSetup& ES) { 
+void PreMixingHcalWorker::addSignals(const edm::Event &e, const edm::EventSetup &ES) {
   myHcalDigitizer_.accumulate(e, ES);
 }
 
-void PreMixingHcalWorker::addPileups(const PileUpEventPrincipal& pep, const edm::EventSetup& ES) {
-  const auto& ep = pep.principal();
-  LogDebug("PreMixingHcalWorker") <<"\n===============> adding pileups from event  "<<ep.id()<<" for bunchcrossing "<<pep.bunchCrossing();
+void PreMixingHcalWorker::addPileups(const PileUpEventPrincipal &pep, const edm::EventSetup &ES) {
+  const auto &ep = pep.principal();
+  LogDebug("PreMixingHcalWorker") << "\n===============> adding pileups from event  " << ep.id()
+                                  << " for bunchcrossing " << pep.bunchCrossing();
 
   theHBHESignalGenerator.initializeEvent(&ep, &ES);
   theHOSignalGenerator.initializeEvent(&ep, &ES);
@@ -149,8 +152,11 @@ void PreMixingHcalWorker::addPileups(const PileUpEventPrincipal& pep, const edm:
   theQIE11SignalGenerator.fill(mcc);
 }
 
-void PreMixingHcalWorker::put(edm::Event &e,const edm::EventSetup& ES, std::vector<PileupSummaryInfo> const& ps, int bs) {
-  myHcalDigitizer_.finalizeEvent( e, ES);
+void PreMixingHcalWorker::put(edm::Event &e,
+                              const edm::EventSetup &ES,
+                              std::vector<PileupSummaryInfo> const &ps,
+                              int bs) {
+  myHcalDigitizer_.finalizeEvent(e, ES);
 }
 
 DEFINE_PREMIXING_WORKER(PreMixingHcalWorker);
diff --git a/SimCalorimetry/HcalSimProducers/plugins/SealModule.cc b/SimCalorimetry/HcalSimProducers/plugins/SealModule.cc
index 35cac6632bbd3..011759fa42e9c 100644
--- a/SimCalorimetry/HcalSimProducers/plugins/SealModule.cc
+++ b/SimCalorimetry/HcalSimProducers/plugins/SealModule.cc
@@ -1,8 +1,8 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "SimGeneral/MixingModule/interface/DigiAccumulatorMixModFactory.h"
-#include "SimCalorimetry/HcalSimProducers/src/HcalHitAnalyzer.h"
-#include "SimCalorimetry/HcalSimProducers/src/HcalDigiAnalyzer.h"
 #include "SimCalorimetry/HcalSimProducers/interface/HcalDigiProducer.h"
+#include "SimCalorimetry/HcalSimProducers/src/HcalDigiAnalyzer.h"
+#include "SimCalorimetry/HcalSimProducers/src/HcalHitAnalyzer.h"
+#include "SimGeneral/MixingModule/interface/DigiAccumulatorMixModFactory.h"
 
 DEFINE_FWK_MODULE(HcalHitAnalyzer);
 DEFINE_FWK_MODULE(HcalDigiAnalyzer);
diff --git a/SimCalorimetry/HcalSimProducers/src/HcalDigiAnalyzer.cc b/SimCalorimetry/HcalSimProducers/src/HcalDigiAnalyzer.cc
index 1fa467f8508ea..97ba9eff7c788 100644
--- a/SimCalorimetry/HcalSimProducers/src/HcalDigiAnalyzer.cc
+++ b/SimCalorimetry/HcalSimProducers/src/HcalDigiAnalyzer.cc
@@ -1,58 +1,54 @@
-#include "SimCalorimetry/HcalSimProducers/src/HcalDigiAnalyzer.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include<iostream>
-
-
-HcalDigiAnalyzer::HcalDigiAnalyzer(edm::ParameterSet const& conf) 
-: hitReadoutName_("HcalHits"),
-  simParameterMap_(),
-  hbheFilter_(),
-  hoFilter_(),
-  hfFilter_(),
-  hbheHitAnalyzer_("HBHEDigi", 1., &simParameterMap_, &hbheFilter_),
-  hoHitAnalyzer_("HODigi", 1., &simParameterMap_, &hoFilter_),
-  hfHitAnalyzer_("HFDigi", 1., &simParameterMap_, &hfFilter_),
-  zdcHitAnalyzer_("ZDCDigi", 1., &simParameterMap_, &zdcFilter_),
-  hbheDigiStatistics_("HBHEDigi", 4, 10., 6., 0.1, 0.5, hbheHitAnalyzer_),
-  hoDigiStatistics_("HODigi", 4, 10., 6., 0.1, 0.5, hoHitAnalyzer_),
-  hfDigiStatistics_("HFDigi", 3, 10., 6., 0.1, 0.5, hfHitAnalyzer_),
-  zdcDigiStatistics_("ZDCDigi", 3, 10., 6., 0.1, 0.5, zdcHitAnalyzer_),
-  hbheDigiCollectionTag_(conf.getParameter<edm::InputTag>("hbheDigiCollectionTag")),
-  hoDigiCollectionTag_(conf.getParameter<edm::InputTag>("hoDigiCollectionTag")),
-  hfDigiCollectionTag_(conf.getParameter<edm::InputTag>("hfDigiCollectionTag"))
-{
-}
+#include "SimCalorimetry/HcalSimProducers/src/HcalDigiAnalyzer.h"
+#include <iostream>
 
+HcalDigiAnalyzer::HcalDigiAnalyzer(edm::ParameterSet const &conf)
+    : hitReadoutName_("HcalHits"),
+      simParameterMap_(),
+      hbheFilter_(),
+      hoFilter_(),
+      hfFilter_(),
+      hbheHitAnalyzer_("HBHEDigi", 1., &simParameterMap_, &hbheFilter_),
+      hoHitAnalyzer_("HODigi", 1., &simParameterMap_, &hoFilter_),
+      hfHitAnalyzer_("HFDigi", 1., &simParameterMap_, &hfFilter_),
+      zdcHitAnalyzer_("ZDCDigi", 1., &simParameterMap_, &zdcFilter_),
+      hbheDigiStatistics_("HBHEDigi", 4, 10., 6., 0.1, 0.5, hbheHitAnalyzer_),
+      hoDigiStatistics_("HODigi", 4, 10., 6., 0.1, 0.5, hoHitAnalyzer_),
+      hfDigiStatistics_("HFDigi", 3, 10., 6., 0.1, 0.5, hfHitAnalyzer_),
+      zdcDigiStatistics_("ZDCDigi", 3, 10., 6., 0.1, 0.5, zdcHitAnalyzer_),
+      hbheDigiCollectionTag_(conf.getParameter<edm::InputTag>("hbheDigiCollectionTag")),
+      hoDigiCollectionTag_(conf.getParameter<edm::InputTag>("hoDigiCollectionTag")),
+      hfDigiCollectionTag_(conf.getParameter<edm::InputTag>("hfDigiCollectionTag")) {}
 
 namespace HcalDigiAnalyzerImpl {
-  template<class Collection>
-  void analyze(edm::Event const& e, HcalDigiStatistics & statistics, edm::InputTag& tag) {
+  template <class Collection>
+  void analyze(edm::Event const &e, HcalDigiStatistics &statistics, edm::InputTag &tag) {
     edm::Handle<Collection> digis;
     e.getByLabel(tag, digis);
-    for(unsigned i = 0; i < digis->size(); ++i) {
+    for (unsigned i = 0; i < digis->size(); ++i) {
       std::cout << (*digis)[i] << std::endl;
       statistics.analyze((*digis)[i]);
     }
   }
-}
+}  // namespace HcalDigiAnalyzerImpl
 
-
-void HcalDigiAnalyzer::analyze(edm::Event const& e, edm::EventSetup const& c) {
+void HcalDigiAnalyzer::analyze(edm::Event const &e, edm::EventSetup const &c) {
   // Step A: Get Inputs
-  edm::Handle<CrossingFrame<PCaloHit> > cf, zdccf;
-  e.getByLabel("mix", "HcalHits",cf);
-  //e.getByLabel("mix", "ZDCHits", zdccf);
-  
+  edm::Handle<CrossingFrame<PCaloHit>> cf, zdccf;
+  e.getByLabel("mix", "HcalHits", cf);
+  // e.getByLabel("mix", "ZDCHits", zdccf);
+
   // test access to SimHits for HcalHits and ZDC hits
-  std::unique_ptr<MixCollection<PCaloHit> > hits(new MixCollection<PCaloHit>(cf.product()));
-  //std::unique_ptr<MixCollection<PCaloHit> > zdcHits(new MixCollection<PCaloHit>(zdccf.product()));
+  std::unique_ptr<MixCollection<PCaloHit>> hits(new MixCollection<PCaloHit>(cf.product()));
+  // std::unique_ptr<MixCollection<PCaloHit> > zdcHits(new
+  // MixCollection<PCaloHit>(zdccf.product()));
   hbheHitAnalyzer_.fillHits(*hits);
   hoHitAnalyzer_.fillHits(*hits);
   hfHitAnalyzer_.fillHits(*hits);
-  //zdcHitAnalyzer_.fillHits(*zdcHits);
+  // zdcHitAnalyzer_.fillHits(*zdcHits);
   HcalDigiAnalyzerImpl::analyze<HBHEDigiCollection>(e, hbheDigiStatistics_, hbheDigiCollectionTag_);
   HcalDigiAnalyzerImpl::analyze<HODigiCollection>(e, hoDigiStatistics_, hoDigiCollectionTag_);
   HcalDigiAnalyzerImpl::analyze<HFDigiCollection>(e, hfDigiStatistics_, hfDigiCollectionTag_);
-  //HcalDigiAnalyzerImpl::analyze<ZDCDigiCollection>(e, zdcDigiStatistics_);
+  // HcalDigiAnalyzerImpl::analyze<ZDCDigiCollection>(e, zdcDigiStatistics_);
 }
diff --git a/SimCalorimetry/HcalSimProducers/src/HcalDigiAnalyzer.h b/SimCalorimetry/HcalSimProducers/src/HcalDigiAnalyzer.h
index 85b691d503d19..21362e42457a3 100644
--- a/SimCalorimetry/HcalSimProducers/src/HcalDigiAnalyzer.h
+++ b/SimCalorimetry/HcalSimProducers/src/HcalDigiAnalyzer.h
@@ -1,17 +1,17 @@
 #ifndef HcalSimProducers_HcalDigiAnalyzer_h
 #define HcalSimProducers_HcalDigiAnalyzer_h
 
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloHitAnalyzer.h"
-#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/HcalSimParameterMap.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloHitAnalyzer.h"
 #include "SimCalorimetry/HcalSimAlgos/interface/HcalHitFilter.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HcalSimParameterMap.h"
 #include "SimCalorimetry/HcalSimAlgos/interface/ZDCHitFilter.h"
 #include "SimCalorimetry/HcalSimProducers/src/HcalDigiStatistics.h"
-#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 #include <string>
 
 /** Studies Hcal digis
@@ -19,14 +19,10 @@
   \Author Rick Wilkinson, Caltech
 */
 
-
-class HcalDigiAnalyzer : public edm::one::EDAnalyzer<>
-{
+class HcalDigiAnalyzer : public edm::one::EDAnalyzer<> {
 public:
-
-  explicit HcalDigiAnalyzer(edm::ParameterSet const& conf);
-  void analyze(edm::Event const& e, edm::EventSetup const& c) override;
-
+  explicit HcalDigiAnalyzer(edm::ParameterSet const &conf);
+  void analyze(edm::Event const &e, edm::EventSetup const &c) override;
 
 private:
   std::string hitReadoutName_;
@@ -50,5 +46,3 @@ class HcalDigiAnalyzer : public edm::one::EDAnalyzer<>
 };
 
 #endif
-
-
diff --git a/SimCalorimetry/HcalSimProducers/src/HcalDigiProducer.cc b/SimCalorimetry/HcalSimProducers/src/HcalDigiProducer.cc
index 36f508cd4a16e..2c9d43b0ea326 100644
--- a/SimCalorimetry/HcalSimProducers/src/HcalDigiProducer.cc
+++ b/SimCalorimetry/HcalSimProducers/src/HcalDigiProducer.cc
@@ -1,89 +1,74 @@
-#include "SimCalorimetry/HcalSimProducers/interface/HcalDigiProducer.h"
-#include "FWCore/Framework/interface/ProducerBase.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/ProducerBase.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 #include "FWCore/Utilities/interface/StreamID.h"
+#include "SimCalorimetry/HcalSimProducers/interface/HcalDigiProducer.h"
 
-HcalDigiProducer::HcalDigiProducer(edm::ParameterSet const& pset, edm::ProducerBase& mixMod, edm::ConsumesCollector& iC) :
-  DigiAccumulatorMixMod(),
-  theDigitizer_(pset, iC) {
+HcalDigiProducer::HcalDigiProducer(edm::ParameterSet const &pset, edm::ProducerBase &mixMod, edm::ConsumesCollector &iC)
+    : DigiAccumulatorMixMod(), theDigitizer_(pset, iC) {
   mixMod.produces<HBHEDigiCollection>();
   mixMod.produces<HODigiCollection>();
   mixMod.produces<HFDigiCollection>();
   mixMod.produces<ZDCDigiCollection>();
   mixMod.produces<QIE10DigiCollection>("HFQIE10DigiCollection");
   mixMod.produces<QIE11DigiCollection>("HBHEQIE11DigiCollection");
-  if(pset.getParameter<bool>("debugCaloSamples")){
+  if (pset.getParameter<bool>("debugCaloSamples")) {
     mixMod.produces<CaloSamplesCollection>("HcalSamples");
   }
-  if(pset.getParameter<bool>("injectTestHits")){
+  if (pset.getParameter<bool>("injectTestHits")) {
     mixMod.produces<edm::PCaloHitContainer>("HcalHits");
   }
 }
 
+HcalDigiProducer::HcalDigiProducer(edm::ParameterSet const &pset, edm::ConsumesCollector &iC)
+    : DigiAccumulatorMixMod(), theDigitizer_(pset, iC) {}
 
-HcalDigiProducer::HcalDigiProducer(edm::ParameterSet const& pset, edm::ConsumesCollector& iC) :
-  DigiAccumulatorMixMod(),
-  theDigitizer_(pset, iC) {
-}
-
-
-void
-HcalDigiProducer::initializeEvent(edm::Event const& event, edm::EventSetup const& es) {
+void HcalDigiProducer::initializeEvent(edm::Event const &event, edm::EventSetup const &es) {
   edm::Service<edm::RandomNumberGenerator> rng;
   randomEngine_ = &rng->getEngine(event.streamID());
   theDigitizer_.initializeEvent(event, es);
 }
 
-void
-HcalDigiProducer::finalizeEvent(edm::Event& event, edm::EventSetup const& es) {
+void HcalDigiProducer::finalizeEvent(edm::Event &event, edm::EventSetup const &es) {
   theDigitizer_.finalizeEvent(event, es, randomEngine_);
-  randomEngine_ = nullptr; // to prevent access outside event
+  randomEngine_ = nullptr;  // to prevent access outside event
 }
 
-void
-HcalDigiProducer::accumulate(edm::Event const& event, edm::EventSetup const& es) {
+void HcalDigiProducer::accumulate(edm::Event const &event, edm::EventSetup const &es) {
   theDigitizer_.accumulate(event, es, randomEngine_);
 }
 
-void
-HcalDigiProducer::accumulate(PileUpEventPrincipal const& event, edm::EventSetup const& es, edm::StreamID const& streamID) {
+void HcalDigiProducer::accumulate(PileUpEventPrincipal const &event,
+                                  edm::EventSetup const &es,
+                                  edm::StreamID const &streamID) {
   theDigitizer_.accumulate(event, es, randomEngine_);
 }
 
-void
-HcalDigiProducer::beginRun(edm::Run const&, edm::EventSetup const& es) {}
+void HcalDigiProducer::beginRun(edm::Run const &, edm::EventSetup const &es) {}
 
-void
-HcalDigiProducer::endRun(edm::Run const&, edm::EventSetup const&) {}
+void HcalDigiProducer::endRun(edm::Run const &, edm::EventSetup const &) {}
 
-void
-HcalDigiProducer::setHBHENoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator) {
+void HcalDigiProducer::setHBHENoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator) {
   theDigitizer_.setHBHENoiseSignalGenerator(noiseGenerator);
 }
 
-void
-HcalDigiProducer::setHFNoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator) {
+void HcalDigiProducer::setHFNoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator) {
   theDigitizer_.setHFNoiseSignalGenerator(noiseGenerator);
 }
 
-void
-HcalDigiProducer::setHONoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator) {
+void HcalDigiProducer::setHONoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator) {
   theDigitizer_.setHONoiseSignalGenerator(noiseGenerator);
 }
 
-void
-HcalDigiProducer::setZDCNoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator) {
+void HcalDigiProducer::setZDCNoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator) {
   theDigitizer_.setZDCNoiseSignalGenerator(noiseGenerator);
 }
 
-void
-HcalDigiProducer::setQIE10NoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator) {
+void HcalDigiProducer::setQIE10NoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator) {
   theDigitizer_.setQIE10NoiseSignalGenerator(noiseGenerator);
 }
 
-void
-HcalDigiProducer::setQIE11NoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator) {
+void HcalDigiProducer::setQIE11NoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator) {
   theDigitizer_.setQIE11NoiseSignalGenerator(noiseGenerator);
 }
diff --git a/SimCalorimetry/HcalSimProducers/src/HcalDigiStatistics.h b/SimCalorimetry/HcalSimProducers/src/HcalDigiStatistics.h
index e45f850cf0e0c..f652db769c8fe 100644
--- a/SimCalorimetry/HcalSimProducers/src/HcalDigiStatistics.h
+++ b/SimCalorimetry/HcalSimProducers/src/HcalDigiStatistics.h
@@ -2,12 +2,11 @@
 #define HcalSimProducers_HcalDigiStatistics_h
 
 #include "CalibFormats/CaloObjects/interface/CaloSamples.h"
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloValidationStatistics.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloHitAnalyzer.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloValidationStatistics.h"
 #include <string>
 
-class HcalDigiStatistics
-{
+class HcalDigiStatistics {
 public:
   HcalDigiStatistics(std::string name,
                      int maxBin,
@@ -15,18 +14,16 @@ class HcalDigiStatistics
                      float expectedPedestal,
                      float binPrevToBinMax,
                      float binNextToBinMax,
-                     CaloHitAnalyzer & amplitudeAnalyzer)
-:  maxBin_(maxBin),
-   amplitudeThreshold_(amplitudeThreshold),
-   pedestal_(name+" pedestal", expectedPedestal, 0.),
-   binPrevToBinMax_(name+" binPrevToBinMax", binPrevToBinMax, 0.),
-   binNextToBinMax_(name+" binNextToBinMax", binNextToBinMax, 0.),
-   amplitudeAnalyzer_(amplitudeAnalyzer)
-{
-}
+                     CaloHitAnalyzer &amplitudeAnalyzer)
+      : maxBin_(maxBin),
+        amplitudeThreshold_(amplitudeThreshold),
+        pedestal_(name + " pedestal", expectedPedestal, 0.),
+        binPrevToBinMax_(name + " binPrevToBinMax", binPrevToBinMax, 0.),
+        binNextToBinMax_(name + " binNextToBinMax", binNextToBinMax, 0.),
+        amplitudeAnalyzer_(amplitudeAnalyzer) {}
 
-  template<class Digi>
-  void analyze(const Digi & digi);
+  template <class Digi>
+  void analyze(const Digi &digi);
 
 private:
   int maxBin_;
@@ -34,41 +31,29 @@ class HcalDigiStatistics
   CaloValidationStatistics pedestal_;
   CaloValidationStatistics binPrevToBinMax_;
   CaloValidationStatistics binNextToBinMax_;
-  CaloHitAnalyzer & amplitudeAnalyzer_;
+  CaloHitAnalyzer &amplitudeAnalyzer_;
 };
 
+template <class Digi>
+void HcalDigiStatistics::analyze(const Digi &digi) {
+  pedestal_.addEntry(digi[0].adc());
+  pedestal_.addEntry(digi[1].adc());
+
+  double pedestal_fC = 0.5 * (digi[0].nominal_fC() + digi[1].nominal_fC());
+
+  double maxAmplitude = digi[maxBin_].nominal_fC() - pedestal_fC;
 
-template<class Digi>
-void HcalDigiStatistics::analyze(const Digi & digi) {
-   pedestal_.addEntry(digi[0].adc());
-   pedestal_.addEntry(digi[1].adc());
-                                                                               
-                                                                               
-   double pedestal_fC = 0.5*(digi[0].nominal_fC() + digi[1].nominal_fC());
-                                                                               
-                                                                              
-  double maxAmplitude = digi[maxBin_].nominal_fC()   - pedestal_fC;
-                                                                              
-  if(maxAmplitude > amplitudeThreshold_) {
-                                                                              
-    double binPrevToBinMax = (digi[maxBin_-1].nominal_fC() - pedestal_fC)
-                           / maxAmplitude;
+  if (maxAmplitude > amplitudeThreshold_) {
+    double binPrevToBinMax = (digi[maxBin_ - 1].nominal_fC() - pedestal_fC) / maxAmplitude;
     binPrevToBinMax_.addEntry(binPrevToBinMax);
-                                                                              
-                                                                              
-    double binNextToBinMax = (digi[maxBin_+1].nominal_fC() - pedestal_fC)
-                           / maxAmplitude;
+
+    double binNextToBinMax = (digi[maxBin_ + 1].nominal_fC() - pedestal_fC) / maxAmplitude;
     binNextToBinMax_.addEntry(binNextToBinMax);
-                                                                              
-    double amplitude = digi[maxBin_].nominal_fC()
-                   + digi[maxBin_+1].nominal_fC()
-                   - 2*pedestal_fC;
-                                                                                
-                                                                                
+
+    double amplitude = digi[maxBin_].nominal_fC() + digi[maxBin_ + 1].nominal_fC() - 2 * pedestal_fC;
+
     amplitudeAnalyzer_.analyze(digi.id().rawId(), amplitude);
-                                                                                
   }
 }
 
 #endif
-
diff --git a/SimCalorimetry/HcalSimProducers/src/HcalDigitizer.cc b/SimCalorimetry/HcalSimProducers/src/HcalDigitizer.cc
index 6a18c55878500..1fe45aba5819d 100644
--- a/SimCalorimetry/HcalSimProducers/src/HcalDigitizer.cc
+++ b/SimCalorimetry/HcalSimProducers/src/HcalDigitizer.cc
@@ -1,120 +1,122 @@
-#include "SimCalorimetry/HcalSimProducers/interface/HcalDigitizer.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/HcalSimParameterMap.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/HcalElectronicsSim.h"
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloHitResponse.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/HcalAmplifier.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/HcalCoderFactory.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/HcalTimeSlewSim.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/HcalSiPMHitResponse.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/HPDIonFeedbackSim.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/HcalBaseSignalGenerator.h"
+#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
+#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
+#include "CondFormats/DataRecord/interface/HBHEDarkeningRecord.h"
+#include "CondFormats/DataRecord/interface/HcalTimeSlewRecord.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/Common/interface/Wrapper.h"
+#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
+#include "DataFormats/HcalDetId/interface/HcalTestNumbering.h"
+#include "DataFormats/HcalDetId/interface/HcalZDCDetId.h"
+#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
+#include "DataFormats/HcalDigi/interface/HcalQIENum.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "SimGeneral/MixingModule/interface/PileUpEventPrincipal.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "Geometry/CaloTopology/interface/HcalTopology.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloHitResponse.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h"
-#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
-#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
-#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HPDIonFeedbackSim.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HcalAmplifier.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HcalBaseSignalGenerator.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HcalCoderFactory.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HcalElectronicsSim.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HcalSiPMHitResponse.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HcalSimParameterMap.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HcalTimeSlewSim.h"
+#include "SimCalorimetry/HcalSimProducers/interface/HcalDigitizer.h"
 #include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
 #include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
-#include "DataFormats/HcalDetId/interface/HcalZDCDetId.h"
+#include "SimGeneral/MixingModule/interface/PileUpEventPrincipal.h"
 #include <boost/foreach.hpp>
-#include "Geometry/CaloTopology/interface/HcalTopology.h"
-#include "DataFormats/HcalDetId/interface/HcalTestNumbering.h"
-#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
-#include "DataFormats/HcalDigi/interface/HcalQIENum.h"
-#include "CondFormats/DataRecord/interface/HBHEDarkeningRecord.h"
-#include "CondFormats/DataRecord/interface/HcalTimeSlewRecord.h"
 
 //#define DebugLog
 
-HcalDigitizer::HcalDigitizer(const edm::ParameterSet& ps, edm::ConsumesCollector& iC) :
-  theGeometry(nullptr),
-  theRecNumber(nullptr),
-  theParameterMap(ps),
-  theShapes(),
-  theHBHEResponse(std::make_unique<CaloHitResponse>(&theParameterMap,&theShapes)),
-  theHBHESiPMResponse(std::make_unique<HcalSiPMHitResponse>(&theParameterMap, &theShapes, ps.getParameter<bool>("HcalPreMixStage1"), true)),
-  theHOResponse(std::make_unique<CaloHitResponse>(&theParameterMap,&theShapes)),   
-  theHOSiPMResponse(std::make_unique<HcalSiPMHitResponse>(&theParameterMap, &theShapes, ps.getParameter<bool>("HcalPreMixStage1"), false)),
-  theHFResponse(std::make_unique<CaloHitResponse>(&theParameterMap,&theShapes)),
-  theHFQIE10Response(std::make_unique<CaloHitResponse>(&theParameterMap,&theShapes)),
-  theZDCResponse(std::make_unique<CaloHitResponse>(&theParameterMap,&theShapes)),
-  theHBHEAmplifier(nullptr),
-  theHFAmplifier(nullptr),
-  theHOAmplifier(nullptr),
-  theZDCAmplifier(nullptr),
-  theHFQIE10Amplifier(nullptr),
-  theHBHEQIE11Amplifier(nullptr),
-  theIonFeedback(nullptr),
-  theCoderFactory(nullptr),
-  theHBHEElectronicsSim(nullptr),
-  theHFElectronicsSim(nullptr),
-  theHOElectronicsSim(nullptr),
-  theZDCElectronicsSim(nullptr),
-  theHFQIE10ElectronicsSim(nullptr),
-  theHBHEQIE11ElectronicsSim(nullptr),
-  theHBHEHitFilter(),
-  theHBHEQIE11HitFilter(),
-  theHFHitFilter(),
-  theHFQIE10HitFilter(),
-  theHOHitFilter(),
-  theHOSiPMHitFilter(),
-  theZDCHitFilter(),
-  theHBHEDigitizer(nullptr),
-  theHODigitizer(nullptr),
-  theHOSiPMDigitizer(nullptr),
-  theHFDigitizer(nullptr),
-  theZDCDigitizer(nullptr),
-  theHFQIE10Digitizer(nullptr),
-  theHBHEQIE11Digitizer(nullptr),
-  theRelabeller(nullptr),
-  isZDC(true),
-  isHCAL(true),
-  zdcgeo(true),
-  hbhegeo(true),
-  hogeo(true),
-  hfgeo(true),
-  doHFWindow_(ps.getParameter<bool>("doHFWindow")),
-  killHE_(ps.getParameter<bool>("killHE")),
-  debugCS_(ps.getParameter<bool>("debugCaloSamples")),
-  ignoreTime_(ps.getParameter<bool>("ignoreGeantTime")),
-  injectTestHits_(ps.getParameter<bool>("injectTestHits")),
-  hitsProducer_(ps.getParameter<std::string>("hitsProducer")),
-  theHOSiPMCode(ps.getParameter<edm::ParameterSet>("ho").getParameter<int>("siPMCode")),
-  deliveredLumi(0.),
-  agingFlagHB(ps.getParameter<bool>("HBDarkening")),
-  agingFlagHE(ps.getParameter<bool>("HEDarkening")),
-  m_HBDarkening(nullptr),
-  m_HEDarkening(nullptr),
-  m_HFRecalibration(nullptr),
-  injectedHitsEnergy_(ps.getParameter<std::vector<double>>("injectTestHitsEnergy")),
-  injectedHitsTime_(ps.getParameter<std::vector<double>>("injectTestHitsTime")),
-  injectedHitsCells_(ps.getParameter<std::vector<int>>("injectTestHitsCells"))
-{
-  iC.consumes<std::vector<PCaloHit> >(edm::InputTag(hitsProducer_, "ZDCHITS"));
-  iC.consumes<std::vector<PCaloHit> >(edm::InputTag(hitsProducer_, "HcalHits"));
+HcalDigitizer::HcalDigitizer(const edm::ParameterSet &ps, edm::ConsumesCollector &iC)
+    : theGeometry(nullptr),
+      theRecNumber(nullptr),
+      theParameterMap(ps),
+      theShapes(),
+      theHBHEResponse(std::make_unique<CaloHitResponse>(&theParameterMap, &theShapes)),
+      theHBHESiPMResponse(std::make_unique<HcalSiPMHitResponse>(
+          &theParameterMap, &theShapes, ps.getParameter<bool>("HcalPreMixStage1"), true)),
+      theHOResponse(std::make_unique<CaloHitResponse>(&theParameterMap, &theShapes)),
+      theHOSiPMResponse(std::make_unique<HcalSiPMHitResponse>(
+          &theParameterMap, &theShapes, ps.getParameter<bool>("HcalPreMixStage1"), false)),
+      theHFResponse(std::make_unique<CaloHitResponse>(&theParameterMap, &theShapes)),
+      theHFQIE10Response(std::make_unique<CaloHitResponse>(&theParameterMap, &theShapes)),
+      theZDCResponse(std::make_unique<CaloHitResponse>(&theParameterMap, &theShapes)),
+      theHBHEAmplifier(nullptr),
+      theHFAmplifier(nullptr),
+      theHOAmplifier(nullptr),
+      theZDCAmplifier(nullptr),
+      theHFQIE10Amplifier(nullptr),
+      theHBHEQIE11Amplifier(nullptr),
+      theIonFeedback(nullptr),
+      theCoderFactory(nullptr),
+      theHBHEElectronicsSim(nullptr),
+      theHFElectronicsSim(nullptr),
+      theHOElectronicsSim(nullptr),
+      theZDCElectronicsSim(nullptr),
+      theHFQIE10ElectronicsSim(nullptr),
+      theHBHEQIE11ElectronicsSim(nullptr),
+      theHBHEHitFilter(),
+      theHBHEQIE11HitFilter(),
+      theHFHitFilter(),
+      theHFQIE10HitFilter(),
+      theHOHitFilter(),
+      theHOSiPMHitFilter(),
+      theZDCHitFilter(),
+      theHBHEDigitizer(nullptr),
+      theHODigitizer(nullptr),
+      theHOSiPMDigitizer(nullptr),
+      theHFDigitizer(nullptr),
+      theZDCDigitizer(nullptr),
+      theHFQIE10Digitizer(nullptr),
+      theHBHEQIE11Digitizer(nullptr),
+      theRelabeller(nullptr),
+      isZDC(true),
+      isHCAL(true),
+      zdcgeo(true),
+      hbhegeo(true),
+      hogeo(true),
+      hfgeo(true),
+      doHFWindow_(ps.getParameter<bool>("doHFWindow")),
+      killHE_(ps.getParameter<bool>("killHE")),
+      debugCS_(ps.getParameter<bool>("debugCaloSamples")),
+      ignoreTime_(ps.getParameter<bool>("ignoreGeantTime")),
+      injectTestHits_(ps.getParameter<bool>("injectTestHits")),
+      hitsProducer_(ps.getParameter<std::string>("hitsProducer")),
+      theHOSiPMCode(ps.getParameter<edm::ParameterSet>("ho").getParameter<int>("siPMCode")),
+      deliveredLumi(0.),
+      agingFlagHB(ps.getParameter<bool>("HBDarkening")),
+      agingFlagHE(ps.getParameter<bool>("HEDarkening")),
+      m_HBDarkening(nullptr),
+      m_HEDarkening(nullptr),
+      m_HFRecalibration(nullptr),
+      injectedHitsEnergy_(ps.getParameter<std::vector<double>>("injectTestHitsEnergy")),
+      injectedHitsTime_(ps.getParameter<std::vector<double>>("injectTestHitsTime")),
+      injectedHitsCells_(ps.getParameter<std::vector<int>>("injectTestHitsCells")) {
+  iC.consumes<std::vector<PCaloHit>>(edm::InputTag(hitsProducer_, "ZDCHITS"));
+  iC.consumes<std::vector<PCaloHit>>(edm::InputTag(hitsProducer_, "HcalHits"));
 
   bool doNoise = ps.getParameter<bool>("doNoise");
- 
+
   bool PreMix1 = ps.getParameter<bool>("HcalPreMixStage1");  // special threshold/pedestal treatment
   bool PreMix2 = ps.getParameter<bool>("HcalPreMixStage2");  // special threshold/pedestal treatment
   bool doEmpty = ps.getParameter<bool>("doEmpty");
-  deliveredLumi     = ps.getParameter<double>("DelivLuminosity");
+  deliveredLumi = ps.getParameter<double>("DelivLuminosity");
   bool agingFlagHF = ps.getParameter<bool>("HFDarkening");
-  double minFCToDelay= ps.getParameter<double>("minFCToDelay");
-
-  if(PreMix1 && PreMix2) {
-     throw cms::Exception("Configuration")
-      << "HcalDigitizer cannot operate in PreMixing digitization and PreMixing\n"
-         "digi combination modes at the same time.  Please set one mode to False\n"
-         "in the configuration file.";
+  double minFCToDelay = ps.getParameter<double>("minFCToDelay");
+
+  if (PreMix1 && PreMix2) {
+    throw cms::Exception("Configuration") << "HcalDigitizer cannot operate in PreMixing digitization and "
+                                             "PreMixing\n"
+                                             "digi combination modes at the same time.  Please set one mode to "
+                                             "False\n"
+                                             "in the configuration file.";
   }
 
   // need to make copies, because they might get different noise generators
@@ -131,35 +133,42 @@ HcalDigitizer::HcalDigitizer(const edm::ParameterSet& ps, edm::ConsumesCollector
   theHFElectronicsSim = std::make_unique<HcalElectronicsSim>(theHFAmplifier.get(), theCoderFactory.get(), PreMix1);
   theHOElectronicsSim = std::make_unique<HcalElectronicsSim>(theHOAmplifier.get(), theCoderFactory.get(), PreMix1);
   theZDCElectronicsSim = std::make_unique<HcalElectronicsSim>(theZDCAmplifier.get(), theCoderFactory.get(), PreMix1);
-  theHFQIE10ElectronicsSim = std::make_unique<HcalElectronicsSim>(theHFQIE10Amplifier.get(), theCoderFactory.get(), PreMix1); //should this use a different coder factory?
-  theHBHEQIE11ElectronicsSim = std::make_unique<HcalElectronicsSim>(theHBHEQIE11Amplifier.get(), theCoderFactory.get(), PreMix1); //should this use a different coder factory?
+  theHFQIE10ElectronicsSim =
+      std::make_unique<HcalElectronicsSim>(theHFQIE10Amplifier.get(),
+                                           theCoderFactory.get(),
+                                           PreMix1);  // should this use a different coder factory?
+  theHBHEQIE11ElectronicsSim =
+      std::make_unique<HcalElectronicsSim>(theHBHEQIE11Amplifier.get(),
+                                           theCoderFactory.get(),
+                                           PreMix1);  // should this use a different coder factory?
 
   bool doHOHPD = (theHOSiPMCode != 1);
   bool doHOSiPM = (theHOSiPMCode != 0);
-  if(doHOHPD) {
-    theHOResponse = std::make_unique<CaloHitResponse>(&theParameterMap,&theShapes);
+  if (doHOHPD) {
+    theHOResponse = std::make_unique<CaloHitResponse>(&theParameterMap, &theShapes);
     theHOResponse->setHitFilter(&theHOHitFilter);
     theHODigitizer = std::make_unique<HODigitizer>(theHOResponse.get(), theHOElectronicsSim.get(), doEmpty);
   }
-  if(doHOSiPM) {
+  if (doHOSiPM) {
     theHOSiPMResponse->setHitFilter(&theHOSiPMHitFilter);
     theHOSiPMDigitizer = std::make_unique<HODigitizer>(theHOSiPMResponse.get(), theHOElectronicsSim.get(), doEmpty);
   }
-  
+
   theHBHEResponse->setHitFilter(&theHBHEHitFilter);
   theHBHESiPMResponse->setHitFilter(&theHBHEQIE11HitFilter);
-  
-  //QIE8 and QIE11 can coexist in HBHE
-  theHBHEQIE11Digitizer = std::make_unique<QIE11Digitizer>(theHBHESiPMResponse.get(), theHBHEQIE11ElectronicsSim.get(), doEmpty);
+
+  // QIE8 and QIE11 can coexist in HBHE
+  theHBHEQIE11Digitizer =
+      std::make_unique<QIE11Digitizer>(theHBHESiPMResponse.get(), theHBHEQIE11ElectronicsSim.get(), doEmpty);
   theHBHEDigitizer = std::make_unique<HBHEDigitizer>(theHBHEResponse.get(), theHBHEElectronicsSim.get(), doEmpty);
 
   bool doTimeSlew = ps.getParameter<bool>("doTimeSlew");
-  //initialize: they won't be called later if flag is set
+  // initialize: they won't be called later if flag is set
   hcalTimeSlew_delay_ = nullptr;
   theTimeSlewSim.reset(nullptr);
-  if(doTimeSlew) {
+  if (doTimeSlew) {
     // no time slewing for HF
-    theTimeSlewSim = std::make_unique<HcalTimeSlewSim>(&theParameterMap,minFCToDelay);
+    theTimeSlewSim = std::make_unique<HcalTimeSlewSim>(&theParameterMap, minFCToDelay);
     theHBHEAmplifier->setTimeSlewSim(theTimeSlewSim.get());
     theHBHEQIE11Amplifier->setTimeSlewSim(theTimeSlewSim.get());
     theHOAmplifier->setTimeSlewSim(theTimeSlewSim.get());
@@ -169,38 +178,47 @@ HcalDigitizer::HcalDigitizer(const edm::ParameterSet& ps, edm::ConsumesCollector
   theHFResponse->setHitFilter(&theHFHitFilter);
   theHFQIE10Response->setHitFilter(&theHFQIE10HitFilter);
   theZDCResponse->setHitFilter(&theZDCHitFilter);
-  
-  //QIE8 and QIE10 can coexist in HF
-  theHFQIE10Digitizer = std::make_unique<QIE10Digitizer>(theHFQIE10Response.get(), theHFQIE10ElectronicsSim.get(), doEmpty);
+
+  // QIE8 and QIE10 can coexist in HF
+  theHFQIE10Digitizer =
+      std::make_unique<QIE10Digitizer>(theHFQIE10Response.get(), theHFQIE10ElectronicsSim.get(), doEmpty);
   theHFDigitizer = std::make_unique<HFDigitizer>(theHFResponse.get(), theHFElectronicsSim.get(), doEmpty);
 
   theZDCDigitizer = std::make_unique<ZDCDigitizer>(theZDCResponse.get(), theZDCElectronicsSim.get(), doEmpty);
 
   testNumbering_ = ps.getParameter<bool>("TestNumbering");
-//  std::cout << "Flag to see if Hit Relabeller to be initiated " << testNumbering_ << std::endl;
-  if (testNumbering_) theRelabeller=std::make_unique<HcalHitRelabeller>(ps.getParameter<bool>("doNeutralDensityFilter"));
+  //  std::cout << "Flag to see if Hit Relabeller to be initiated " <<
+  //  testNumbering_ << std::endl;
+  if (testNumbering_)
+    theRelabeller = std::make_unique<HcalHitRelabeller>(ps.getParameter<bool>("doNeutralDensityFilter"));
 
-  if(ps.getParameter<bool>("doIonFeedback") && theHBHEResponse) {
-    theIonFeedback = std::make_unique<HPDIonFeedbackSim>(ps,&theShapes);
+  if (ps.getParameter<bool>("doIonFeedback") && theHBHEResponse) {
+    theIonFeedback = std::make_unique<HPDIonFeedbackSim>(ps, &theShapes);
     theHBHEResponse->setPECorrection(theIonFeedback.get());
-    if(ps.getParameter<bool>("doThermalNoise")) {
+    if (ps.getParameter<bool>("doThermalNoise")) {
       theHBHEAmplifier->setIonFeedbackSim(theIonFeedback.get());
     }
   }
 
-  //option to save CaloSamples as event product for debugging
-  if(debugCS_){
-    if(theHBHEDigitizer)      theHBHEDigitizer->setDebugCaloSamples(true);
-    if(theHBHEQIE11Digitizer) theHBHEQIE11Digitizer->setDebugCaloSamples(true);
-    if(theHODigitizer)        theHODigitizer->setDebugCaloSamples(true);
-    if(theHOSiPMDigitizer)    theHOSiPMDigitizer->setDebugCaloSamples(true);
-    if(theHFDigitizer)        theHFDigitizer->setDebugCaloSamples(true);
-    if(theHFQIE10Digitizer)   theHFQIE10Digitizer->setDebugCaloSamples(true);
+  // option to save CaloSamples as event product for debugging
+  if (debugCS_) {
+    if (theHBHEDigitizer)
+      theHBHEDigitizer->setDebugCaloSamples(true);
+    if (theHBHEQIE11Digitizer)
+      theHBHEQIE11Digitizer->setDebugCaloSamples(true);
+    if (theHODigitizer)
+      theHODigitizer->setDebugCaloSamples(true);
+    if (theHOSiPMDigitizer)
+      theHOSiPMDigitizer->setDebugCaloSamples(true);
+    if (theHFDigitizer)
+      theHFDigitizer->setDebugCaloSamples(true);
+    if (theHFQIE10Digitizer)
+      theHFQIE10Digitizer->setDebugCaloSamples(true);
     theZDCDigitizer->setDebugCaloSamples(true);
   }
 
-  //option to ignore Geant time distribution in SimHits, for debugging
-  if(ignoreTime_){
+  // option to ignore Geant time distribution in SimHits, for debugging
+  if (ignoreTime_) {
     theHBHEResponse->setIgnoreGeantTime(ignoreTime_);
     theHBHESiPMResponse->setIgnoreGeantTime(ignoreTime_);
     theHOResponse->setIgnoreGeantTime(ignoreTime_);
@@ -210,64 +228,68 @@ HcalDigitizer::HcalDigitizer(const edm::ParameterSet& ps, edm::ConsumesCollector
     theZDCResponse->setIgnoreGeantTime(ignoreTime_);
   }
 
-  if(agingFlagHF) m_HFRecalibration.reset(new HFRecalibration(ps.getParameter<edm::ParameterSet>("HFRecalParameterBlock")));
-}
-
-
-HcalDigitizer::~HcalDigitizer() {
+  if (agingFlagHF)
+    m_HFRecalibration.reset(new HFRecalibration(ps.getParameter<edm::ParameterSet>("HFRecalParameterBlock")));
 }
 
+HcalDigitizer::~HcalDigitizer() {}
 
-void HcalDigitizer::setHBHENoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator) {
+void HcalDigitizer::setHBHENoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator) {
   noiseGenerator->setParameterMap(&theParameterMap);
   noiseGenerator->setElectronicsSim(theHBHEElectronicsSim.get());
-  if (theHBHEDigitizer) theHBHEDigitizer->setNoiseSignalGenerator(noiseGenerator);
+  if (theHBHEDigitizer)
+    theHBHEDigitizer->setNoiseSignalGenerator(noiseGenerator);
   theHBHEAmplifier->setNoiseSignalGenerator(noiseGenerator);
 }
 
-void HcalDigitizer::setQIE11NoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator) {
+void HcalDigitizer::setQIE11NoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator) {
   noiseGenerator->setParameterMap(&theParameterMap);
   noiseGenerator->setElectronicsSim(theHBHEQIE11ElectronicsSim.get());
-  if(theHBHEQIE11Digitizer) theHBHEQIE11Digitizer->setNoiseSignalGenerator(noiseGenerator);
+  if (theHBHEQIE11Digitizer)
+    theHBHEQIE11Digitizer->setNoiseSignalGenerator(noiseGenerator);
   theHBHEQIE11Amplifier->setNoiseSignalGenerator(noiseGenerator);
 }
 
-void HcalDigitizer::setHFNoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator) {
+void HcalDigitizer::setHFNoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator) {
   noiseGenerator->setParameterMap(&theParameterMap);
   noiseGenerator->setElectronicsSim(theHFElectronicsSim.get());
-  if(theHFDigitizer) theHFDigitizer->setNoiseSignalGenerator(noiseGenerator);
+  if (theHFDigitizer)
+    theHFDigitizer->setNoiseSignalGenerator(noiseGenerator);
   theHFAmplifier->setNoiseSignalGenerator(noiseGenerator);
 }
 
-void HcalDigitizer::setQIE10NoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator) {
+void HcalDigitizer::setQIE10NoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator) {
   noiseGenerator->setParameterMap(&theParameterMap);
   noiseGenerator->setElectronicsSim(theHFQIE10ElectronicsSim.get());
-  if(theHFQIE10Digitizer) theHFQIE10Digitizer->setNoiseSignalGenerator(noiseGenerator);
+  if (theHFQIE10Digitizer)
+    theHFQIE10Digitizer->setNoiseSignalGenerator(noiseGenerator);
   theHFQIE10Amplifier->setNoiseSignalGenerator(noiseGenerator);
 }
 
-void HcalDigitizer::setHONoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator) {
+void HcalDigitizer::setHONoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator) {
   noiseGenerator->setParameterMap(&theParameterMap);
   noiseGenerator->setElectronicsSim(theHOElectronicsSim.get());
-  if(theHODigitizer) theHODigitizer->setNoiseSignalGenerator(noiseGenerator);
-  if(theHOSiPMDigitizer) theHOSiPMDigitizer->setNoiseSignalGenerator(noiseGenerator);
+  if (theHODigitizer)
+    theHODigitizer->setNoiseSignalGenerator(noiseGenerator);
+  if (theHOSiPMDigitizer)
+    theHOSiPMDigitizer->setNoiseSignalGenerator(noiseGenerator);
   theHOAmplifier->setNoiseSignalGenerator(noiseGenerator);
 }
 
-void HcalDigitizer::setZDCNoiseSignalGenerator(HcalBaseSignalGenerator * noiseGenerator) {
+void HcalDigitizer::setZDCNoiseSignalGenerator(HcalBaseSignalGenerator *noiseGenerator) {
   noiseGenerator->setParameterMap(&theParameterMap);
   noiseGenerator->setElectronicsSim(theZDCElectronicsSim.get());
   theZDCDigitizer->setNoiseSignalGenerator(noiseGenerator);
   theZDCAmplifier->setNoiseSignalGenerator(noiseGenerator);
 }
 
-void HcalDigitizer::initializeEvent(edm::Event const& e, edm::EventSetup const& eventSetup) {
+void HcalDigitizer::initializeEvent(edm::Event const &e, edm::EventSetup const &eventSetup) {
   setup(eventSetup);
 
   // get the appropriate gains, noises, & widths for this event
   edm::ESHandle<HcalDbService> conditions;
   eventSetup.get<HcalDbRecord>().get(conditions);
-  
+
   theShapes.setDbService(conditions.product());
 
   theHBHEAmplifier->setDbService(conditions.product());
@@ -276,177 +298,191 @@ void HcalDigitizer::initializeEvent(edm::Event const& e, edm::EventSetup const&
   theZDCAmplifier->setDbService(conditions.product());
   theHFQIE10Amplifier->setDbService(conditions.product());
   theHBHEQIE11Amplifier->setDbService(conditions.product());
-  
+
   theHFQIE10ElectronicsSim->setDbService(conditions.product());
   theHBHEQIE11ElectronicsSim->setDbService(conditions.product());
 
   theCoderFactory->setDbService(conditions.product());
   theParameterMap.setDbService(conditions.product());
 
-  //initialize hits
-  if(theHBHEDigitizer) theHBHEDigitizer->initializeHits();
-  if(theHBHEQIE11Digitizer) theHBHEQIE11Digitizer->initializeHits();
-  if(theHODigitizer) theHODigitizer->initializeHits();
-  if(theHOSiPMDigitizer) theHOSiPMDigitizer->initializeHits();
-  if(theHFQIE10Digitizer) theHFQIE10Digitizer->initializeHits();
-  if(theHFDigitizer) theHFDigitizer->initializeHits();
+  // initialize hits
+  if (theHBHEDigitizer)
+    theHBHEDigitizer->initializeHits();
+  if (theHBHEQIE11Digitizer)
+    theHBHEQIE11Digitizer->initializeHits();
+  if (theHODigitizer)
+    theHODigitizer->initializeHits();
+  if (theHOSiPMDigitizer)
+    theHOSiPMDigitizer->initializeHits();
+  if (theHFQIE10Digitizer)
+    theHFQIE10Digitizer->initializeHits();
+  if (theHFDigitizer)
+    theHFDigitizer->initializeHits();
   theZDCDigitizer->initializeHits();
-
 }
 
-void HcalDigitizer::accumulateCaloHits(edm::Handle<std::vector<PCaloHit> > const& hcalHandle, edm::Handle<std::vector<PCaloHit> > const& zdcHandle, int bunchCrossing, CLHEP::HepRandomEngine* engine, const HcalTopology *htopoP) {
-
+void HcalDigitizer::accumulateCaloHits(edm::Handle<std::vector<PCaloHit>> const &hcalHandle,
+                                       edm::Handle<std::vector<PCaloHit>> const &zdcHandle,
+                                       int bunchCrossing,
+                                       CLHEP::HepRandomEngine *engine,
+                                       const HcalTopology *htopoP) {
   // Step A: pass in inputs, and accumulate digis
-  if(isHCAL) {
+  if (isHCAL) {
     std::vector<PCaloHit> hcalHitsOrig = *hcalHandle.product();
-    if(injectTestHits_) hcalHitsOrig = injectedHits_;
+    if (injectTestHits_)
+      hcalHitsOrig = injectedHits_;
     std::vector<PCaloHit> hcalHits;
     hcalHits.reserve(hcalHitsOrig.size());
 
-    //evaluate darkening before relabeling
+    // evaluate darkening before relabeling
     if (testNumbering_) {
-      if(m_HBDarkening || m_HEDarkening || m_HFRecalibration){
+      if (m_HBDarkening || m_HEDarkening || m_HFRecalibration) {
         darkening(hcalHitsOrig);
       }
       // Relabel PCaloHits if necessary
       edm::LogInfo("HcalDigitizer") << "Calling Relabeller";
       theRelabeller->process(hcalHitsOrig);
     }
-    
-    //eliminate bad hits
-    for (unsigned int i=0; i< hcalHitsOrig.size(); i++) {
+
+    // eliminate bad hits
+    for (unsigned int i = 0; i < hcalHitsOrig.size(); i++) {
       DetId id(hcalHitsOrig[i].id());
       HcalDetId hid(id);
       if (!htopoP->validHcal(hid)) {
-        edm::LogError("HcalDigitizer") << "bad hcal id found in digitizer. Skipping " << id.rawId() << " " << hid << std::endl;
+        edm::LogError("HcalDigitizer") << "bad hcal id found in digitizer. Skipping " << id.rawId() << " " << hid
+                                       << std::endl;
         continue;
-      }
-      else if(hid.subdet()==HcalForward && !doHFWindow_ && hcalHitsOrig[i].depth()!=0){
-        //skip HF window hits unless desired
+      } else if (hid.subdet() == HcalForward && !doHFWindow_ && hcalHitsOrig[i].depth() != 0) {
+        // skip HF window hits unless desired
         continue;
-      }
-      else if( killHE_ && hid.subdet()==HcalEndcap ) {
+      } else if (killHE_ && hid.subdet() == HcalEndcap) {
         // remove HE hits if asked for (phase 2)
         continue;
-      }
-      else {
+      } else {
 #ifdef DebugLog
         std::cout << "HcalDigitizer format " << hid.oldFormat() << " for " << hid << std::endl;
 #endif
         DetId newid = DetId(hid.newForm());
 #ifdef DebugLog
-        std::cout << "Hit " << i << " out of " << hcalHits.size() << " " << std::hex << id.rawId() << " --> " << newid.rawId() << std::dec << " " << HcalDetId(newid.rawId()) << '\n';
+        std::cout << "Hit " << i << " out of " << hcalHits.size() << " " << std::hex << id.rawId() << " --> "
+                  << newid.rawId() << std::dec << " " << HcalDetId(newid.rawId()) << '\n';
 #endif
         hcalHitsOrig[i].setID(newid.rawId());
         hcalHits.push_back(hcalHitsOrig[i]);
       }
     }
 
-    if(hbhegeo) {
-      if(theHBHEDigitizer) theHBHEDigitizer->add(hcalHits, bunchCrossing, engine);
-      if(theHBHEQIE11Digitizer) theHBHEQIE11Digitizer->add(hcalHits, bunchCrossing, engine);
+    if (hbhegeo) {
+      if (theHBHEDigitizer)
+        theHBHEDigitizer->add(hcalHits, bunchCrossing, engine);
+      if (theHBHEQIE11Digitizer)
+        theHBHEQIE11Digitizer->add(hcalHits, bunchCrossing, engine);
     }
 
-    if(hogeo) {
-      if(theHODigitizer) theHODigitizer->add(hcalHits, bunchCrossing, engine);
-      if(theHOSiPMDigitizer) theHOSiPMDigitizer->add(hcalHits, bunchCrossing, engine);
+    if (hogeo) {
+      if (theHODigitizer)
+        theHODigitizer->add(hcalHits, bunchCrossing, engine);
+      if (theHOSiPMDigitizer)
+        theHOSiPMDigitizer->add(hcalHits, bunchCrossing, engine);
     }
 
-    if(hfgeo) {
-      if(theHFDigitizer) theHFDigitizer->add(hcalHits, bunchCrossing, engine);
-      if(theHFQIE10Digitizer) theHFQIE10Digitizer->add(hcalHits, bunchCrossing, engine);
-    } 
+    if (hfgeo) {
+      if (theHFDigitizer)
+        theHFDigitizer->add(hcalHits, bunchCrossing, engine);
+      if (theHFQIE10Digitizer)
+        theHFQIE10Digitizer->add(hcalHits, bunchCrossing, engine);
+    }
   } else {
     edm::LogInfo("HcalDigitizer") << "We don't have HCAL hit collection available ";
   }
 
-  if(isZDC) {
-    if(zdcgeo) {
+  if (isZDC) {
+    if (zdcgeo) {
       theZDCDigitizer->add(*zdcHandle.product(), bunchCrossing, engine);
-    } 
+    }
   } else {
     edm::LogInfo("HcalDigitizer") << "We don't have ZDC hit collection available ";
   }
 }
 
-void HcalDigitizer::accumulate(edm::Event const& e, edm::EventSetup const& eventSetup, CLHEP::HepRandomEngine* engine) {
+void HcalDigitizer::accumulate(edm::Event const &e, edm::EventSetup const &eventSetup, CLHEP::HepRandomEngine *engine) {
   // Step A: Get Inputs
   edm::InputTag zdcTag(hitsProducer_, "ZDCHITS");
-  edm::Handle<std::vector<PCaloHit> > zdcHandle;
+  edm::Handle<std::vector<PCaloHit>> zdcHandle;
   e.getByLabel(zdcTag, zdcHandle);
   isZDC = zdcHandle.isValid();
 
   edm::InputTag hcalTag(hitsProducer_, "HcalHits");
-  edm::Handle<std::vector<PCaloHit> > hcalHandle;
+  edm::Handle<std::vector<PCaloHit>> hcalHandle;
   e.getByLabel(hcalTag, hcalHandle);
   isHCAL = hcalHandle.isValid() or injectTestHits_;
 
   edm::ESHandle<HcalTopology> htopo;
   eventSetup.get<HcalRecNumberingRecord>().get(htopo);
-  const HcalTopology *htopoP=htopo.product();
+  const HcalTopology *htopoP = htopo.product();
 
   accumulateCaloHits(hcalHandle, zdcHandle, 0, engine, htopoP);
 }
 
-void HcalDigitizer::accumulate(PileUpEventPrincipal const& e, edm::EventSetup const& eventSetup, CLHEP::HepRandomEngine* engine) {
+void HcalDigitizer::accumulate(PileUpEventPrincipal const &e,
+                               edm::EventSetup const &eventSetup,
+                               CLHEP::HepRandomEngine *engine) {
   // Step A: Get Inputs
   edm::InputTag zdcTag(hitsProducer_, "ZDCHITS");
-  edm::Handle<std::vector<PCaloHit> > zdcHandle;
+  edm::Handle<std::vector<PCaloHit>> zdcHandle;
   e.getByLabel(zdcTag, zdcHandle);
   isZDC = zdcHandle.isValid();
 
   edm::InputTag hcalTag(hitsProducer_, "HcalHits");
-  edm::Handle<std::vector<PCaloHit> > hcalHandle;
+  edm::Handle<std::vector<PCaloHit>> hcalHandle;
   e.getByLabel(hcalTag, hcalHandle);
   isHCAL = hcalHandle.isValid();
 
   edm::ESHandle<HcalTopology> htopo;
   eventSetup.get<HcalRecNumberingRecord>().get(htopo);
-  const HcalTopology *htopoP=htopo.product();
+  const HcalTopology *htopoP = htopo.product();
 
   accumulateCaloHits(hcalHandle, zdcHandle, e.bunchCrossing(), engine, htopoP);
 }
 
-void HcalDigitizer::finalizeEvent(edm::Event& e, const edm::EventSetup& eventSetup, CLHEP::HepRandomEngine* engine) {
-
+void HcalDigitizer::finalizeEvent(edm::Event &e, const edm::EventSetup &eventSetup, CLHEP::HepRandomEngine *engine) {
   // Step B: Create empty output
   std::unique_ptr<HBHEDigiCollection> hbheResult(new HBHEDigiCollection());
   std::unique_ptr<HODigiCollection> hoResult(new HODigiCollection());
   std::unique_ptr<HFDigiCollection> hfResult(new HFDigiCollection());
   std::unique_ptr<ZDCDigiCollection> zdcResult(new ZDCDigiCollection());
-  std::unique_ptr<QIE10DigiCollection> hfQIE10Result(
-    new QIE10DigiCollection(
-      !theHFQIE10DetIds.empty() ? 
-      theParameterMap.simParameters(theHFQIE10DetIds[0]).readoutFrameSize() : 
-      QIE10DigiCollection::MAXSAMPLES
-    )
-  );
-  std::unique_ptr<QIE11DigiCollection> hbheQIE11Result(
-    new QIE11DigiCollection(
-      !theHBHEQIE11DetIds.empty() ? 
-      theHBHESiPMResponse.get()->getReadoutFrameSize(theHBHEQIE11DetIds[0]) :
-//      theParameterMap->simParameters(theHBHEQIE11DetIds[0]).readoutFrameSize() : 
-      QIE11DigiCollection::MAXSAMPLES
-    )
-  );
+  std::unique_ptr<QIE10DigiCollection> hfQIE10Result(new QIE10DigiCollection(
+      !theHFQIE10DetIds.empty() ? theParameterMap.simParameters(theHFQIE10DetIds[0]).readoutFrameSize()
+                                : QIE10DigiCollection::MAXSAMPLES));
+  std::unique_ptr<QIE11DigiCollection> hbheQIE11Result(new QIE11DigiCollection(
+      !theHBHEQIE11DetIds.empty() ? theHBHESiPMResponse.get()->getReadoutFrameSize(theHBHEQIE11DetIds[0]) :
+                                  //      theParameterMap->simParameters(theHBHEQIE11DetIds[0]).readoutFrameSize()
+          //      :
+          QIE11DigiCollection::MAXSAMPLES));
 
   // Step C: Invoke the algorithm, getting back outputs.
-  if(isHCAL&&hbhegeo){
-    if(theHBHEDigitizer)        theHBHEDigitizer->run(*hbheResult, engine);
-    if(theHBHEQIE11Digitizer)    theHBHEQIE11Digitizer->run(*hbheQIE11Result, engine);
+  if (isHCAL && hbhegeo) {
+    if (theHBHEDigitizer)
+      theHBHEDigitizer->run(*hbheResult, engine);
+    if (theHBHEQIE11Digitizer)
+      theHBHEQIE11Digitizer->run(*hbheQIE11Result, engine);
   }
-  if(isHCAL&&hogeo) {
-    if(theHODigitizer) theHODigitizer->run(*hoResult, engine);
-    if(theHOSiPMDigitizer) theHOSiPMDigitizer->run(*hoResult, engine);
+  if (isHCAL && hogeo) {
+    if (theHODigitizer)
+      theHODigitizer->run(*hoResult, engine);
+    if (theHOSiPMDigitizer)
+      theHOSiPMDigitizer->run(*hoResult, engine);
   }
-  if(isHCAL&&hfgeo) {
-    if(theHFDigitizer) theHFDigitizer->run(*hfResult, engine);
-    if(theHFQIE10Digitizer) theHFQIE10Digitizer->run(*hfQIE10Result, engine);
+  if (isHCAL && hfgeo) {
+    if (theHFDigitizer)
+      theHFDigitizer->run(*hfResult, engine);
+    if (theHFQIE10Digitizer)
+      theHFQIE10Digitizer->run(*hfQIE10Result, engine);
   }
-  if(isZDC&&zdcgeo) {
+  if (isZDC && zdcgeo) {
     theZDCDigitizer->run(*zdcResult, engine);
   }
-  
+
   edm::LogInfo("HcalDigitizer") << "HCAL HBHE digis : " << hbheResult->size();
   edm::LogInfo("HcalDigitizer") << "HCAL HO digis   : " << hoResult->size();
   edm::LogInfo("HcalDigitizer") << "HCAL HF digis   : " << hfResult->size();
@@ -472,43 +508,55 @@ void HcalDigitizer::finalizeEvent(edm::Event& e, const edm::EventSetup& eventSet
   e.put(std::move(hfQIE10Result), "HFQIE10DigiCollection");
   e.put(std::move(hbheQIE11Result), "HBHEQIE11DigiCollection");
 
-  if(debugCS_){
+  if (debugCS_) {
     std::unique_ptr<CaloSamplesCollection> csResult(new CaloSamplesCollection());
-    //smush together all the results
-    if(theHBHEDigitizer)      csResult->insert(csResult->end(),theHBHEDigitizer->getCaloSamples().begin(),theHBHEDigitizer->getCaloSamples().end());
-    if(theHBHEQIE11Digitizer) csResult->insert(csResult->end(),theHBHEQIE11Digitizer->getCaloSamples().begin(),theHBHEQIE11Digitizer->getCaloSamples().end());
-    if(theHODigitizer)        csResult->insert(csResult->end(),theHODigitizer->getCaloSamples().begin(),theHODigitizer->getCaloSamples().end());
-    if(theHOSiPMDigitizer)    csResult->insert(csResult->end(),theHOSiPMDigitizer->getCaloSamples().begin(),theHOSiPMDigitizer->getCaloSamples().end());
-    if(theHFDigitizer)        csResult->insert(csResult->end(),theHFDigitizer->getCaloSamples().begin(),theHFDigitizer->getCaloSamples().end());
-    if(theHFQIE10Digitizer)   csResult->insert(csResult->end(),theHFQIE10Digitizer->getCaloSamples().begin(),theHFQIE10Digitizer->getCaloSamples().end());
-    csResult->insert(csResult->end(),theZDCDigitizer->getCaloSamples().begin(),theZDCDigitizer->getCaloSamples().end());
-    e.put(std::move(csResult),"HcalSamples");
-  }
-
-  if(injectTestHits_){
+    // smush together all the results
+    if (theHBHEDigitizer)
+      csResult->insert(
+          csResult->end(), theHBHEDigitizer->getCaloSamples().begin(), theHBHEDigitizer->getCaloSamples().end());
+    if (theHBHEQIE11Digitizer)
+      csResult->insert(csResult->end(),
+                       theHBHEQIE11Digitizer->getCaloSamples().begin(),
+                       theHBHEQIE11Digitizer->getCaloSamples().end());
+    if (theHODigitizer)
+      csResult->insert(
+          csResult->end(), theHODigitizer->getCaloSamples().begin(), theHODigitizer->getCaloSamples().end());
+    if (theHOSiPMDigitizer)
+      csResult->insert(
+          csResult->end(), theHOSiPMDigitizer->getCaloSamples().begin(), theHOSiPMDigitizer->getCaloSamples().end());
+    if (theHFDigitizer)
+      csResult->insert(
+          csResult->end(), theHFDigitizer->getCaloSamples().begin(), theHFDigitizer->getCaloSamples().end());
+    if (theHFQIE10Digitizer)
+      csResult->insert(
+          csResult->end(), theHFQIE10Digitizer->getCaloSamples().begin(), theHFQIE10Digitizer->getCaloSamples().end());
+    csResult->insert(
+        csResult->end(), theZDCDigitizer->getCaloSamples().begin(), theZDCDigitizer->getCaloSamples().end());
+    e.put(std::move(csResult), "HcalSamples");
+  }
+
+  if (injectTestHits_) {
     std::unique_ptr<edm::PCaloHitContainer> pcResult(new edm::PCaloHitContainer());
-    pcResult->insert(pcResult->end(),injectedHits_.begin(),injectedHits_.end());
-    e.put(std::move(pcResult),"HcalHits");
+    pcResult->insert(pcResult->end(), injectedHits_.begin(), injectedHits_.end());
+    e.put(std::move(pcResult), "HcalHits");
   }
 
 #ifdef DebugLog
-  std::cout << std::endl << "========>  HcalDigitizer e.put " << std::endl <<  std::endl;
+  std::cout << std::endl << "========>  HcalDigitizer e.put " << std::endl << std::endl;
 #endif
-
 }
 
-
-void HcalDigitizer::setup(const edm::EventSetup & es) {
+void HcalDigitizer::setup(const edm::EventSetup &es) {
   checkGeometry(es);
 
   if (agingFlagHB) {
     edm::ESHandle<HBHEDarkening> hdark;
-    es.get<HBHEDarkeningRecord>().get("HB",hdark);
+    es.get<HBHEDarkeningRecord>().get("HB", hdark);
     m_HBDarkening = &*hdark;
   }
   if (agingFlagHE) {
     edm::ESHandle<HBHEDarkening> hdark;
-    es.get<HBHEDarkeningRecord>().get("HE",hdark);
+    es.get<HBHEDarkeningRecord>().get("HE", hdark);
     m_HEDarkening = &*hdark;
   }
 
@@ -519,26 +567,30 @@ void HcalDigitizer::setup(const edm::EventSetup & es) {
   theHBHEAmplifier->setTimeSlew(hcalTimeSlew_delay_);
   theHBHEQIE11Amplifier->setTimeSlew(hcalTimeSlew_delay_);
   theHOAmplifier->setTimeSlew(hcalTimeSlew_delay_);
-  theZDCAmplifier->setTimeSlew(hcalTimeSlew_delay_);  
+  theZDCAmplifier->setTimeSlew(hcalTimeSlew_delay_);
 }
 
-
-void HcalDigitizer::checkGeometry(const edm::EventSetup & eventSetup) {
+void HcalDigitizer::checkGeometry(const edm::EventSetup &eventSetup) {
   edm::ESHandle<CaloGeometry> geometry;
   eventSetup.get<CaloGeometryRecord>().get(geometry);
   theGeometry = &*geometry;
   edm::ESHandle<HcalDDDRecConstants> pHRNDC;
   eventSetup.get<HcalRecNumberingRecord>().get(pHRNDC);
-  theRecNumber= &*pHRNDC;
-
-  if(theHBHEResponse) theHBHEResponse->setGeometry(theGeometry);
-  if(theHBHESiPMResponse) theHBHESiPMResponse->setGeometry(theGeometry);
-  if(theHOResponse) theHOResponse->setGeometry(theGeometry);
-  if(theHOSiPMResponse) theHOSiPMResponse->setGeometry(theGeometry);
+  theRecNumber = &*pHRNDC;
+
+  if (theHBHEResponse)
+    theHBHEResponse->setGeometry(theGeometry);
+  if (theHBHESiPMResponse)
+    theHBHESiPMResponse->setGeometry(theGeometry);
+  if (theHOResponse)
+    theHOResponse->setGeometry(theGeometry);
+  if (theHOSiPMResponse)
+    theHOSiPMResponse->setGeometry(theGeometry);
   theHFResponse->setGeometry(theGeometry);
   theHFQIE10Response->setGeometry(theGeometry);
   theZDCResponse->setGeometry(theGeometry);
-  if(theRelabeller) theRelabeller->setGeometry(theRecNumber);
+  if (theRelabeller)
+    theRelabeller->setGeometry(theRecNumber);
 
   // See if it's been updated
   bool check1 = theGeometryWatcher_.check(eventSetup);
@@ -548,180 +600,197 @@ void HcalDigitizer::checkGeometry(const edm::EventSetup & eventSetup) {
   }
 }
 
-
-void HcalDigitizer::updateGeometry(const edm::EventSetup & eventSetup) {
-  const std::vector<DetId>& hbCells = theGeometry->getValidDetIds(DetId::Hcal, HcalBarrel);
-  const std::vector<DetId>& heCells = theGeometry->getValidDetIds(DetId::Hcal, HcalEndcap);
-  const std::vector<DetId>& hoCells = theGeometry->getValidDetIds(DetId::Hcal, HcalOuter);
-  const std::vector<DetId>& hfCells = theGeometry->getValidDetIds(DetId::Hcal, HcalForward);
-  const std::vector<DetId>& zdcCells = theGeometry->getValidDetIds(DetId::Calo, HcalZDCDetId::SubdetectorId);
-  //const std::vector<DetId>& hcalTrigCells = geometry->getValidDetIds(DetId::Hcal, HcalTriggerTower);
-  //const std::vector<DetId>& hcalCalib = geometry->getValidDetIds(DetId::Calo, HcalCastorDetId::SubdetectorId);
-//  std::cout<<"HcalDigitizer::CheckGeometry number of cells: "<<zdcCells.size()<<std::endl;
-  if(zdcCells.empty()) zdcgeo = false;
-  if(hbCells.empty() && heCells.empty()) hbhegeo = false;
-  if(hoCells.empty()) hogeo = false;
-  if(hfCells.empty()) hfgeo = false;
+void HcalDigitizer::updateGeometry(const edm::EventSetup &eventSetup) {
+  const std::vector<DetId> &hbCells = theGeometry->getValidDetIds(DetId::Hcal, HcalBarrel);
+  const std::vector<DetId> &heCells = theGeometry->getValidDetIds(DetId::Hcal, HcalEndcap);
+  const std::vector<DetId> &hoCells = theGeometry->getValidDetIds(DetId::Hcal, HcalOuter);
+  const std::vector<DetId> &hfCells = theGeometry->getValidDetIds(DetId::Hcal, HcalForward);
+  const std::vector<DetId> &zdcCells = theGeometry->getValidDetIds(DetId::Calo, HcalZDCDetId::SubdetectorId);
+  // const std::vector<DetId>& hcalTrigCells =
+  // geometry->getValidDetIds(DetId::Hcal, HcalTriggerTower); const
+  // std::vector<DetId>& hcalCalib = geometry->getValidDetIds(DetId::Calo,
+  // HcalCastorDetId::SubdetectorId);
+  //  std::cout<<"HcalDigitizer::CheckGeometry number of cells:
+  //  "<<zdcCells.size()<<std::endl;
+  if (zdcCells.empty())
+    zdcgeo = false;
+  if (hbCells.empty() && heCells.empty())
+    hbhegeo = false;
+  if (hoCells.empty())
+    hogeo = false;
+  if (hfCells.empty())
+    hfgeo = false;
   // combine HB & HE
 
   hbheCells = hbCells;
-  if( !killHE_) {
+  if (!killHE_) {
     hbheCells.insert(hbheCells.end(), heCells.begin(), heCells.end());
   }
-  //handle mixed QIE8/11 scenario in HBHE
-  buildHBHEQIECells(hbheCells,eventSetup);
-  if(theHBHESiPMResponse)
+  // handle mixed QIE8/11 scenario in HBHE
+  buildHBHEQIECells(hbheCells, eventSetup);
+  if (theHBHESiPMResponse)
     theHBHESiPMResponse->setDetIds(theHBHEQIE11DetIds);
-  
-  if(theHOSiPMDigitizer) {
+
+  if (theHOSiPMDigitizer) {
     buildHOSiPMCells(hoCells, eventSetup);
-    if(theHOSiPMResponse)
+    if (theHOSiPMResponse)
       theHOSiPMResponse->setDetIds(hoCells);
   }
-  
-  //handle mixed QIE8/10 scenario in HF
-  buildHFQIECells(hfCells,eventSetup);
-  
+
+  // handle mixed QIE8/10 scenario in HF
+  buildHFQIECells(hfCells, eventSetup);
+
   theZDCDigitizer->setDetIds(zdcCells);
 
-  //fill test hits collection if desired and empty
-  if(injectTestHits_ && injectedHits_.empty() && !injectedHitsCells_.empty() && !injectedHitsEnergy_.empty()){
-    //make list of specified cells if desired
+  // fill test hits collection if desired and empty
+  if (injectTestHits_ && injectedHits_.empty() && !injectedHitsCells_.empty() && !injectedHitsEnergy_.empty()) {
+    // make list of specified cells if desired
     std::vector<DetId> testCells;
-    if(injectedHitsCells_.size()>=4){
-      testCells.reserve(injectedHitsCells_.size()/4);
-      for(unsigned ic = 0; ic < injectedHitsCells_.size(); ic += 4){
-        if(ic+4 > injectedHitsCells_.size()) break;
-        testCells.push_back(HcalDetId((HcalSubdetector)injectedHitsCells_[ic],injectedHitsCells_[ic+1],
-                            injectedHitsCells_[ic+2],injectedHitsCells_[ic+3]));
+    if (injectedHitsCells_.size() >= 4) {
+      testCells.reserve(injectedHitsCells_.size() / 4);
+      for (unsigned ic = 0; ic < injectedHitsCells_.size(); ic += 4) {
+        if (ic + 4 > injectedHitsCells_.size())
+          break;
+        testCells.push_back(HcalDetId((HcalSubdetector)injectedHitsCells_[ic],
+                                      injectedHitsCells_[ic + 1],
+                                      injectedHitsCells_[ic + 2],
+                                      injectedHitsCells_[ic + 3]));
       }
-    }
-    else{
+    } else {
       int testSubdet = injectedHitsCells_[0];
-      if(testSubdet==HcalBarrel) testCells = hbCells;
-      else if(testSubdet==HcalEndcap) testCells = heCells;
-      else if(testSubdet==HcalForward) testCells = hfCells;
-      else if(testSubdet==HcalOuter) testCells = hoCells;
-      else throw cms::Exception("Configuration") << "Unknown subdet " << testSubdet << " for HCAL test hit injection";
+      if (testSubdet == HcalBarrel)
+        testCells = hbCells;
+      else if (testSubdet == HcalEndcap)
+        testCells = heCells;
+      else if (testSubdet == HcalForward)
+        testCells = hfCells;
+      else if (testSubdet == HcalOuter)
+        testCells = hoCells;
+      else
+        throw cms::Exception("Configuration") << "Unknown subdet " << testSubdet << " for HCAL test hit injection";
     }
-    bool useHitTimes = (injectedHitsTime_.size()==injectedHitsEnergy_.size());
-    injectedHits_.reserve(testCells.size()*injectedHitsEnergy_.size());
-    for(unsigned ih = 0; ih < injectedHitsEnergy_.size(); ++ih){
+    bool useHitTimes = (injectedHitsTime_.size() == injectedHitsEnergy_.size());
+    injectedHits_.reserve(testCells.size() * injectedHitsEnergy_.size());
+    for (unsigned ih = 0; ih < injectedHitsEnergy_.size(); ++ih) {
       double tmp = useHitTimes ? injectedHitsTime_[ih] : 0.;
-      for(auto& aCell: testCells){
-        injectedHits_.emplace_back(aCell,injectedHitsEnergy_[ih],tmp);
+      for (auto &aCell : testCells) {
+        injectedHits_.emplace_back(aCell, injectedHitsEnergy_[ih], tmp);
       }
     }
   }
 }
 
-void HcalDigitizer::buildHFQIECells(const std::vector<DetId>& allCells, const edm::EventSetup & eventSetup) {
-	//if results are already cached, no need to look again
-	if(!theHFQIE8DetIds.empty() || !theHFQIE10DetIds.empty()) return;
-	
-	//get the QIETypes
-	edm::ESHandle<HcalQIETypes> q;
-    eventSetup.get<HcalQIETypesRcd>().get(q);
-	edm::ESHandle<HcalTopology> htopo;
-    eventSetup.get<HcalRecNumberingRecord>().get(htopo);
-   
-    HcalQIETypes qieTypes(*q.product());
-    if (qieTypes.topo()==nullptr) {
-      qieTypes.setTopo(htopo.product());
-    }
-	
-	for(std::vector<DetId>::const_iterator detItr = allCells.begin(); detItr != allCells.end(); ++detItr) {
-      HcalQIENum qieType = HcalQIENum(qieTypes.getValues(*detItr)->getValue());
-      if(qieType == QIE8) {
-        theHFQIE8DetIds.push_back(*detItr);
-      } else if(qieType == QIE10) {
-        theHFQIE10DetIds.push_back(*detItr);
-      } else { //default is QIE8
-        theHFQIE8DetIds.push_back(*detItr);
-      }
+void HcalDigitizer::buildHFQIECells(const std::vector<DetId> &allCells, const edm::EventSetup &eventSetup) {
+  // if results are already cached, no need to look again
+  if (!theHFQIE8DetIds.empty() || !theHFQIE10DetIds.empty())
+    return;
+
+  // get the QIETypes
+  edm::ESHandle<HcalQIETypes> q;
+  eventSetup.get<HcalQIETypesRcd>().get(q);
+  edm::ESHandle<HcalTopology> htopo;
+  eventSetup.get<HcalRecNumberingRecord>().get(htopo);
+
+  HcalQIETypes qieTypes(*q.product());
+  if (qieTypes.topo() == nullptr) {
+    qieTypes.setTopo(htopo.product());
+  }
+
+  for (std::vector<DetId>::const_iterator detItr = allCells.begin(); detItr != allCells.end(); ++detItr) {
+    HcalQIENum qieType = HcalQIENum(qieTypes.getValues(*detItr)->getValue());
+    if (qieType == QIE8) {
+      theHFQIE8DetIds.push_back(*detItr);
+    } else if (qieType == QIE10) {
+      theHFQIE10DetIds.push_back(*detItr);
+    } else {  // default is QIE8
+      theHFQIE8DetIds.push_back(*detItr);
     }
-	
-	if(!theHFQIE8DetIds.empty()) theHFDigitizer->setDetIds(theHFQIE8DetIds);
-	else {
-          theHFDigitizer.reset();
-	}
-	
-	if(!theHFQIE10DetIds.empty()) theHFQIE10Digitizer->setDetIds(theHFQIE10DetIds);
-	else {
-          theHFQIE10Digitizer.reset();
-	}
+  }
+
+  if (!theHFQIE8DetIds.empty())
+    theHFDigitizer->setDetIds(theHFQIE8DetIds);
+  else {
+    theHFDigitizer.reset();
+  }
+
+  if (!theHFQIE10DetIds.empty())
+    theHFQIE10Digitizer->setDetIds(theHFQIE10DetIds);
+  else {
+    theHFQIE10Digitizer.reset();
+  }
 }
 
-void HcalDigitizer::buildHBHEQIECells(const std::vector<DetId>& allCells, const edm::EventSetup & eventSetup) {
-	//if results are already cached, no need to look again
-	if(!theHBHEQIE8DetIds.empty() || !theHBHEQIE11DetIds.empty()) return;
-	
-	//get the QIETypes
-	edm::ESHandle<HcalQIETypes> q;
-    eventSetup.get<HcalQIETypesRcd>().get(q);
-	edm::ESHandle<HcalTopology> htopo;
-    eventSetup.get<HcalRecNumberingRecord>().get(htopo);
-   
-    HcalQIETypes qieTypes(*q.product());
-    if (qieTypes.topo()==nullptr) {
-      qieTypes.setTopo(htopo.product());
-    }
-	
-	for(std::vector<DetId>::const_iterator detItr = allCells.begin(); detItr != allCells.end(); ++detItr) {
-      HcalQIENum qieType = HcalQIENum(qieTypes.getValues(*detItr)->getValue());
-      if(qieType == QIE8) {
-        theHBHEQIE8DetIds.push_back(*detItr);
-      }
-      else if(qieType == QIE11) {
-        theHBHEQIE11DetIds.push_back(*detItr);
-      }
-      else { //default is QIE8
-        theHBHEQIE8DetIds.push_back(*detItr);
-      }
+void HcalDigitizer::buildHBHEQIECells(const std::vector<DetId> &allCells, const edm::EventSetup &eventSetup) {
+  // if results are already cached, no need to look again
+  if (!theHBHEQIE8DetIds.empty() || !theHBHEQIE11DetIds.empty())
+    return;
+
+  // get the QIETypes
+  edm::ESHandle<HcalQIETypes> q;
+  eventSetup.get<HcalQIETypesRcd>().get(q);
+  edm::ESHandle<HcalTopology> htopo;
+  eventSetup.get<HcalRecNumberingRecord>().get(htopo);
+
+  HcalQIETypes qieTypes(*q.product());
+  if (qieTypes.topo() == nullptr) {
+    qieTypes.setTopo(htopo.product());
+  }
+
+  for (std::vector<DetId>::const_iterator detItr = allCells.begin(); detItr != allCells.end(); ++detItr) {
+    HcalQIENum qieType = HcalQIENum(qieTypes.getValues(*detItr)->getValue());
+    if (qieType == QIE8) {
+      theHBHEQIE8DetIds.push_back(*detItr);
+    } else if (qieType == QIE11) {
+      theHBHEQIE11DetIds.push_back(*detItr);
+    } else {  // default is QIE8
+      theHBHEQIE8DetIds.push_back(*detItr);
     }
-	
-	if(!theHBHEQIE8DetIds.empty()) theHBHEDigitizer->setDetIds(theHBHEQIE8DetIds);
-	else {
-          theHBHEDigitizer.reset();
-	}
-	
-	if(!theHBHEQIE11DetIds.empty()) theHBHEQIE11Digitizer->setDetIds(theHBHEQIE11DetIds);
-	else {
-          theHBHEQIE11Digitizer.reset();
-	}
-	
-	if(!theHBHEQIE8DetIds.empty() && !theHBHEQIE11DetIds.empty()){
-		theHBHEHitFilter.setDetIds(theHBHEQIE8DetIds);
-		theHBHEQIE11HitFilter.setDetIds(theHBHEQIE11DetIds);
-	}
+  }
+
+  if (!theHBHEQIE8DetIds.empty())
+    theHBHEDigitizer->setDetIds(theHBHEQIE8DetIds);
+  else {
+    theHBHEDigitizer.reset();
+  }
+
+  if (!theHBHEQIE11DetIds.empty())
+    theHBHEQIE11Digitizer->setDetIds(theHBHEQIE11DetIds);
+  else {
+    theHBHEQIE11Digitizer.reset();
+  }
+
+  if (!theHBHEQIE8DetIds.empty() && !theHBHEQIE11DetIds.empty()) {
+    theHBHEHitFilter.setDetIds(theHBHEQIE8DetIds);
+    theHBHEQIE11HitFilter.setDetIds(theHBHEQIE11DetIds);
+  }
 }
 
-void HcalDigitizer::buildHOSiPMCells(const std::vector<DetId>& allCells, const edm::EventSetup & eventSetup) {
+void HcalDigitizer::buildHOSiPMCells(const std::vector<DetId> &allCells, const edm::EventSetup &eventSetup) {
   // all HPD
 
-  if(theHOSiPMCode == 0) {
+  if (theHOSiPMCode == 0) {
     theHODigitizer->setDetIds(allCells);
-  } else if(theHOSiPMCode == 1) {
+  } else if (theHOSiPMCode == 1) {
     theHOSiPMDigitizer->setDetIds(allCells);
     // FIXME pick Zecotek or hamamatsu?
-  } else if(theHOSiPMCode == 2) {
+  } else if (theHOSiPMCode == 2) {
     std::vector<HcalDetId> zecotekDetIds, hamamatsuDetIds;
     edm::ESHandle<HcalMCParams> p;
     eventSetup.get<HcalMCParamsRcd>().get(p);
     edm::ESHandle<HcalTopology> htopo;
     eventSetup.get<HcalRecNumberingRecord>().get(htopo);
-   
+
     HcalMCParams mcParams(*p.product());
-    if (mcParams.topo()==nullptr) {
+    if (mcParams.topo() == nullptr) {
       mcParams.setTopo(htopo.product());
     }
 
-    for(std::vector<DetId>::const_iterator detItr = allCells.begin(); detItr != allCells.end(); ++detItr) {
+    for (std::vector<DetId>::const_iterator detItr = allCells.begin(); detItr != allCells.end(); ++detItr) {
       int shapeType = mcParams.getValues(*detItr)->signalShape();
-      if(shapeType == HcalShapes::ZECOTEK) {
+      if (shapeType == HcalShapes::ZECOTEK) {
         zecotekDetIds.emplace_back(*detItr);
         theHOSiPMDetIds.push_back(*detItr);
-      } else if(shapeType == HcalShapes::HAMAMATSU) {
+      } else if (shapeType == HcalShapes::HAMAMATSU) {
         hamamatsuDetIds.emplace_back(*detItr);
         theHOSiPMDetIds.push_back(*detItr);
       } else {
@@ -729,21 +798,23 @@ void HcalDigitizer::buildHOSiPMCells(const std::vector<DetId>& allCells, const e
       }
     }
 
-    if(!theHOHPDDetIds.empty()) theHODigitizer->setDetIds(theHOHPDDetIds);
+    if (!theHOHPDDetIds.empty())
+      theHODigitizer->setDetIds(theHOHPDDetIds);
     else {
       theHODigitizer.reset();
     }
-	
-    if(!theHOSiPMDetIds.empty()) theHOSiPMDigitizer->setDetIds(theHOSiPMDetIds);
+
+    if (!theHOSiPMDetIds.empty())
+      theHOSiPMDigitizer->setDetIds(theHOSiPMDetIds);
     else {
       theHOSiPMDigitizer.reset();
     }
-	
-	if(!theHOHPDDetIds.empty() && !theHOSiPMDetIds.empty()){
+
+    if (!theHOHPDDetIds.empty() && !theHOSiPMDetIds.empty()) {
       theHOSiPMHitFilter.setDetIds(theHOSiPMDetIds);
       theHOHitFilter.setDetIds(theHOHPDDetIds);
     }
-	
+
     theParameterMap.setHOZecotekDetIds(zecotekDetIds);
     theParameterMap.setHOHamamatsuDetIds(hamamatsuDetIds);
 
@@ -752,36 +823,31 @@ void HcalDigitizer::buildHOSiPMCells(const std::vector<DetId>& allCells, const e
   }
 }
 
-void HcalDigitizer::darkening(std::vector<PCaloHit>& hcalHits) {
-
-  for (unsigned int ii=0; ii<hcalHits.size(); ++ii) {
+void HcalDigitizer::darkening(std::vector<PCaloHit> &hcalHits) {
+  for (unsigned int ii = 0; ii < hcalHits.size(); ++ii) {
     uint32_t tmpId = hcalHits[ii].id();
     int det, z, depth, ieta, phi, lay;
-    HcalTestNumbering::unpackHcalIndex(tmpId,det,z,depth,ieta,phi,lay);
-	
+    HcalTestNumbering::unpackHcalIndex(tmpId, det, z, depth, ieta, phi, lay);
+
     bool darkened = false;
     float dweight = 1.;
-	
-    if(det==int(HcalBarrel) && m_HBDarkening){
-      //HB darkening
-      dweight = m_HBDarkening->degradation(deliveredLumi,ieta,lay);
+
+    if (det == int(HcalBarrel) && m_HBDarkening) {
+      // HB darkening
+      dweight = m_HBDarkening->degradation(deliveredLumi, ieta, lay);
       darkened = true;
-    }
-    else if(det==int(HcalEndcap) && m_HEDarkening){
-      //HE darkening
-      dweight = m_HEDarkening->degradation(deliveredLumi,ieta,lay);
+    } else if (det == int(HcalEndcap) && m_HEDarkening) {
+      // HE darkening
+      dweight = m_HEDarkening->degradation(deliveredLumi, ieta, lay);
       darkened = true;
-    }
-    else if(det==int(HcalForward) && m_HFRecalibration){
-      //HF darkening - approximate: invert recalibration factor
-      dweight = 1.0/m_HFRecalibration->getCorr(ieta,depth,deliveredLumi);
+    } else if (det == int(HcalForward) && m_HFRecalibration) {
+      // HF darkening - approximate: invert recalibration factor
+      dweight = 1.0 / m_HFRecalibration->getCorr(ieta, depth, deliveredLumi);
       darkened = true;
     }
-	
-    //reset hit energy
-    if(darkened) hcalHits[ii].setEnergy(hcalHits[ii].energy()*dweight);	
+
+    // reset hit energy
+    if (darkened)
+      hcalHits[ii].setEnergy(hcalHits[ii].energy() * dweight);
   }
-  
 }
-    
-
diff --git a/SimCalorimetry/HcalSimProducers/src/HcalHitAnalyzer.cc b/SimCalorimetry/HcalSimProducers/src/HcalHitAnalyzer.cc
index 640d1b966a900..94ba175495659 100644
--- a/SimCalorimetry/HcalSimProducers/src/HcalHitAnalyzer.cc
+++ b/SimCalorimetry/HcalSimProducers/src/HcalHitAnalyzer.cc
@@ -1,53 +1,49 @@
-#include "SimCalorimetry/HcalSimProducers/src/HcalHitAnalyzer.h"
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include<iostream>
-
-
-HcalHitAnalyzer::HcalHitAnalyzer(edm::ParameterSet const& conf) 
-: simParameterMap_(conf),
-  hbheFilter_(),
-  hoFilter_(),
-  hfFilter_(),
-  zdcFilter_(),
-  hbheAnalyzer_("HBHE", 1., &simParameterMap_, &hbheFilter_),
-  hoAnalyzer_("HO", 1., &simParameterMap_, &hoFilter_),
-  hfAnalyzer_("HF", 1., &simParameterMap_, &hfFilter_),
-  zdcAnalyzer_("ZDC", 1., &simParameterMap_, &zdcFilter_),
-  hbheRecHitCollectionTag_(conf.getParameter<edm::InputTag>("hbheRecHitCollectionTag")),
-  hoRecHitCollectionTag_(conf.getParameter<edm::InputTag>("hoRecHitCollectionTag")),
-  hfRecHitCollectionTag_(conf.getParameter<edm::InputTag>("hfRecHitCollectionTag"))
-{
-}
+#include "SimCalorimetry/HcalSimProducers/src/HcalHitAnalyzer.h"
+#include <iostream>
 
+HcalHitAnalyzer::HcalHitAnalyzer(edm::ParameterSet const &conf)
+    : simParameterMap_(conf),
+      hbheFilter_(),
+      hoFilter_(),
+      hfFilter_(),
+      zdcFilter_(),
+      hbheAnalyzer_("HBHE", 1., &simParameterMap_, &hbheFilter_),
+      hoAnalyzer_("HO", 1., &simParameterMap_, &hoFilter_),
+      hfAnalyzer_("HF", 1., &simParameterMap_, &hfFilter_),
+      zdcAnalyzer_("ZDC", 1., &simParameterMap_, &zdcFilter_),
+      hbheRecHitCollectionTag_(conf.getParameter<edm::InputTag>("hbheRecHitCollectionTag")),
+      hoRecHitCollectionTag_(conf.getParameter<edm::InputTag>("hoRecHitCollectionTag")),
+      hfRecHitCollectionTag_(conf.getParameter<edm::InputTag>("hfRecHitCollectionTag")) {}
 
 namespace HcalHitAnalyzerImpl {
-  template<class Collection>
-  void analyze(edm::Event const& e, CaloHitAnalyzer & analyzer, edm::InputTag& tag) {
+  template <class Collection>
+  void analyze(edm::Event const &e, CaloHitAnalyzer &analyzer, edm::InputTag &tag) {
     edm::Handle<Collection> recHits;
     e.getByLabel(tag, recHits);
-    for(unsigned i = 0 ; i < recHits->size(); ++i) {
+    for (unsigned i = 0; i < recHits->size(); ++i) {
       analyzer.analyze((*recHits)[i].id().rawId(), (*recHits)[i].energy());
     }
   }
-}
-
+}  // namespace HcalHitAnalyzerImpl
 
-void HcalHitAnalyzer::analyze(edm::Event const& e, edm::EventSetup const& c) {
-   // Step A: Get Inputs
-  edm::Handle<CrossingFrame<PCaloHit> > cf, zdccf;
-  e.getByLabel("mix", "g4SimHitsHcalHits",cf);
-  //e.getByLabel("mix", "ZDCHits", zdccf);
+void HcalHitAnalyzer::analyze(edm::Event const &e, edm::EventSetup const &c) {
+  // Step A: Get Inputs
+  edm::Handle<CrossingFrame<PCaloHit>> cf, zdccf;
+  e.getByLabel("mix", "g4SimHitsHcalHits", cf);
+  // e.getByLabel("mix", "ZDCHits", zdccf);
 
   // test access to SimHits for HcalHits and ZDC hits
-  std::unique_ptr<MixCollection<PCaloHit> > hits(new MixCollection<PCaloHit>(cf.product()));
-  //std::unique_ptr<MixCollection<PCaloHit> > zdcHits(new MixCollection<PCaloHit>(zdccf.product()));
-  hbheAnalyzer_.fillHits(*hits); 
-  //hoAnalyzer_.fillHits(*hits);
-  //hfAnalyzer_.fillHits(*hits);
-  //zdcAnalyzer_.fillHits(*hits);
+  std::unique_ptr<MixCollection<PCaloHit>> hits(new MixCollection<PCaloHit>(cf.product()));
+  // std::unique_ptr<MixCollection<PCaloHit> > zdcHits(new
+  // MixCollection<PCaloHit>(zdccf.product()));
+  hbheAnalyzer_.fillHits(*hits);
+  // hoAnalyzer_.fillHits(*hits);
+  // hfAnalyzer_.fillHits(*hits);
+  // zdcAnalyzer_.fillHits(*hits);
   HcalHitAnalyzerImpl::analyze<HBHERecHitCollection>(e, hbheAnalyzer_, hbheRecHitCollectionTag_);
   HcalHitAnalyzerImpl::analyze<HORecHitCollection>(e, hoAnalyzer_, hoRecHitCollectionTag_);
   HcalHitAnalyzerImpl::analyze<HFRecHitCollection>(e, hfAnalyzer_, hfRecHitCollectionTag_);
-  //HcalHitAnalyzerImpl::analyze<ZDCRecHitCollection>(e, zdcAnalyzer_);
+  // HcalHitAnalyzerImpl::analyze<ZDCRecHitCollection>(e, zdcAnalyzer_);
 }
diff --git a/SimCalorimetry/HcalSimProducers/src/HcalHitAnalyzer.h b/SimCalorimetry/HcalSimProducers/src/HcalHitAnalyzer.h
index 19129ecac2031..5c37f61732b5b 100644
--- a/SimCalorimetry/HcalSimProducers/src/HcalHitAnalyzer.h
+++ b/SimCalorimetry/HcalSimProducers/src/HcalHitAnalyzer.h
@@ -1,14 +1,14 @@
 #ifndef HcalSimProducers_HcalHitAnalyzer_h
 #define HcalSimProducers_HcalHitAnalyzer_h
 
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloHitAnalyzer.h"
-#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/HcalSimParameterMap.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloHitAnalyzer.h"
 #include "SimCalorimetry/HcalSimAlgos/interface/HcalHitFilter.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HcalSimParameterMap.h"
 #include "SimCalorimetry/HcalSimAlgos/interface/ZDCHitFilter.h"
 #include <string>
 
@@ -17,14 +17,10 @@
   \Author Rick Wilkinson, Caltech
 */
 
-
-class HcalHitAnalyzer : public edm::one::EDAnalyzer<>
-{
+class HcalHitAnalyzer : public edm::one::EDAnalyzer<> {
 public:
-
-  explicit HcalHitAnalyzer(edm::ParameterSet const& conf);
-  void analyze(edm::Event const& e, edm::EventSetup const& c) override;
-
+  explicit HcalHitAnalyzer(edm::ParameterSet const &conf);
+  void analyze(edm::Event const &e, edm::EventSetup const &c) override;
 
 private:
   HcalSimParameterMap simParameterMap_;
diff --git a/SimCalorimetry/HcalTestBeam/interface/HcalTBDigiProducer.h b/SimCalorimetry/HcalTestBeam/interface/HcalTBDigiProducer.h
index c55030dde7c16..58f8e40dd8632 100644
--- a/SimCalorimetry/HcalTestBeam/interface/HcalTBDigiProducer.h
+++ b/SimCalorimetry/HcalTestBeam/interface/HcalTBDigiProducer.h
@@ -1,32 +1,32 @@
 #ifndef SimCalorimetry_HcalTestBeam_HcalTBDigiProducer_h
 #define SimCalorimetry_HcalTestBeam_HcalTBDigiProducer_h
 
-#include "FWCore/Framework/interface/ProducerBase.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ProducerBase.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/HcalDigitizerTraits.h"
-#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h"
-#include "SimCalorimetry/HcalTestBeam/interface/HcalTBSimParameterMap.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/HcalShape.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/HcalElectronicsSim.h"
-#include "SimCalorimetry/HcalSimAlgos/interface/HcalHitFilter.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloHitResponse.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h"
 #include "SimCalorimetry/HcalSimAlgos/interface/HcalAmplifier.h"
 #include "SimCalorimetry/HcalSimAlgos/interface/HcalCoderFactory.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HcalDigitizerTraits.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HcalElectronicsSim.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HcalHitFilter.h"
+#include "SimCalorimetry/HcalSimAlgos/interface/HcalShape.h"
 #include "SimCalorimetry/HcalSimAlgos/interface/HcalTimeSlewSim.h"
+#include "SimCalorimetry/HcalTestBeam/interface/HcalTBSimParameterMap.h"
+#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 #include "SimGeneral/MixingModule/interface/DigiAccumulatorMixMod.h"
 
-#include<vector>
-#include<string>
+#include <string>
+#include <vector>
 
 class PEcalTBInfo;
 
 namespace edm {
   class StreamID;
   class ConsumesCollector;
-}
+}  // namespace edm
 
 namespace CLHEP {
   class HepRandomEngine;
@@ -34,67 +34,65 @@ namespace CLHEP {
 
 class HcalTBDigiProducer : public DigiAccumulatorMixMod {
 public:
-
-  explicit HcalTBDigiProducer(const edm::ParameterSet& ps, edm::ProducerBase& mixMod, edm::ConsumesCollector& iC);
+  explicit HcalTBDigiProducer(const edm::ParameterSet &ps, edm::ProducerBase &mixMod, edm::ConsumesCollector &iC);
   ~HcalTBDigiProducer() override;
 
-  void initializeEvent(edm::Event const& e, edm::EventSetup const& c) override;
-  void accumulate(edm::Event const& e, edm::EventSetup const& c) override ;
-  void accumulate(PileUpEventPrincipal const& e, edm::EventSetup const& c, edm::StreamID const&) override;
-  void finalizeEvent(edm::Event& e, edm::EventSetup const& c) override;
+  void initializeEvent(edm::Event const &e, edm::EventSetup const &c) override;
+  void accumulate(edm::Event const &e, edm::EventSetup const &c) override;
+  void accumulate(PileUpEventPrincipal const &e, edm::EventSetup const &c, edm::StreamID const &) override;
+  void finalizeEvent(edm::Event &e, edm::EventSetup const &c) override;
 
 private:
-  void accumulateCaloHits(edm::Handle<std::vector<PCaloHit> > const& hits, int bunchCrossing);
+  void accumulateCaloHits(edm::Handle<std::vector<PCaloHit>> const &hits, int bunchCrossing);
 
   /// fills the vectors for each subdetector
-  void sortHits(const edm::PCaloHitContainer & hits);
+  void sortHits(const edm::PCaloHitContainer &hits);
   /// make sure the digitizer has the correct list of all cells that
   /// exist in the geometry
-  void checkGeometry(const edm::EventSetup& eventSetup);
+  void checkGeometry(const edm::EventSetup &eventSetup);
   void updateGeometry();
 
-  void setPhaseShift(const DetId & detId);
+  void setPhaseShift(const DetId &detId);
 
-  const HcalTimeSlew* hcalTimeSlew_delay_;
+  const HcalTimeSlew *hcalTimeSlew_delay_;
 
 private:
-
   /** Reconstruction algorithm*/
   typedef CaloTDigitizer<HBHEDigitizerTraits> HBHEDigitizer;
-  typedef CaloTDigitizer<HODigitizerTraits>   HODigitizer;
+  typedef CaloTDigitizer<HODigitizerTraits> HODigitizer;
 
-  HcalTBSimParameterMap * theParameterMap;
-  CaloVShape * theHcalShape;
-  CaloVShape * theHcalIntegratedShape;
+  HcalTBSimParameterMap *theParameterMap;
+  CaloVShape *theHcalShape;
+  CaloVShape *theHcalIntegratedShape;
 
-  CaloHitResponse * theHBHEResponse;
-  CaloHitResponse * theHOResponse;
+  CaloHitResponse *theHBHEResponse;
+  CaloHitResponse *theHOResponse;
 
-  HcalAmplifier * theAmplifier;
-  HcalCoderFactory * theCoderFactory;
-  HcalElectronicsSim * theElectronicsSim;
+  HcalAmplifier *theAmplifier;
+  HcalCoderFactory *theCoderFactory;
+  HcalElectronicsSim *theElectronicsSim;
 
   HBHEHitFilter theHBHEHitFilter;
-  HOHitFilter   theHOHitFilter;
+  HOHitFilter theHOHitFilter;
+
+  HcalTimeSlewSim *theTimeSlewSim;
 
-  HcalTimeSlewSim * theTimeSlewSim;
+  HBHEDigitizer *theHBHEDigitizer;
+  HODigitizer *theHODigitizer;
 
-  HBHEDigitizer * theHBHEDigitizer;
-  HODigitizer   * theHODigitizer;
- 
-  const CaloGeometry * theGeometry;
-  std::vector<DetId>   hbheCells;
-  std::vector<DetId>   hoCells;
+  const CaloGeometry *theGeometry;
+  std::vector<DetId> hbheCells;
+  std::vector<DetId> hoCells;
 
   std::vector<PCaloHit> theHBHEHits, theHOHits;
 
   std::string ecalTBInfoLabel;
   double thisPhaseShift;
 
-  bool   doPhaseShift;
+  bool doPhaseShift;
   double tunePhaseShift;
 
-  CLHEP::HepRandomEngine* randomEngine_ = nullptr;
+  CLHEP::HepRandomEngine *randomEngine_ = nullptr;
 };
 
 #endif
diff --git a/SimCalorimetry/HcalTestBeam/interface/HcalTBSimParameterMap.h b/SimCalorimetry/HcalTestBeam/interface/HcalTBSimParameterMap.h
index 5181606090b44..41fd4eb600386 100644
--- a/SimCalorimetry/HcalTestBeam/interface/HcalTBSimParameterMap.h
+++ b/SimCalorimetry/HcalTestBeam/interface/HcalTBSimParameterMap.h
@@ -1,26 +1,25 @@
 #ifndef HcalTestBeam_HcalTBSimParameterMap_h
 #define HcalTestBeam_HcalTBSimParameterMap_h
 
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVSimParameterMap.h"
 #include "SimCalorimetry/HcalSimAlgos/interface/HcalSimParameters.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 class HcalTBSimParameterMap : public CaloVSimParameterMap {
-
 public:
   /// hardcoded default parameters
   HcalTBSimParameterMap();
   /// configurable parameters
-  HcalTBSimParameterMap(const edm::ParameterSet & p);
+  HcalTBSimParameterMap(const edm::ParameterSet &p);
 
   ~HcalTBSimParameterMap() override {}
 
-  const CaloSimParameters & simParameters(const DetId & id) const override;
+  const CaloSimParameters &simParameters(const DetId &id) const override;
 
   /// accessors
-  HcalSimParameters hbParameters() const {return theHBParameters;}
-  HcalSimParameters heParameters() const {return theHEParameters;}
-  HcalSimParameters hoParameters() const {return theHOParameters;}
+  HcalSimParameters hbParameters() const { return theHBParameters; }
+  HcalSimParameters heParameters() const { return theHEParameters; }
+  HcalSimParameters hoParameters() const { return theHOParameters; }
 
 private:
   HcalSimParameters theHBParameters;
@@ -28,6 +27,4 @@ class HcalTBSimParameterMap : public CaloVSimParameterMap {
   HcalSimParameters theHOParameters;
 };
 
-
 #endif
-
diff --git a/SimCalorimetry/HcalTestBeam/src/HcalTBDigiProducer.cc b/SimCalorimetry/HcalTestBeam/src/HcalTBDigiProducer.cc
index 0eaa2dfad5c5b..5297ed875e86c 100644
--- a/SimCalorimetry/HcalTestBeam/src/HcalTBDigiProducer.cc
+++ b/SimCalorimetry/HcalTestBeam/src/HcalTBDigiProducer.cc
@@ -1,72 +1,78 @@
-#include "SimCalorimetry/HcalTestBeam/interface/HcalTBDigiProducer.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 #include "FWCore/Utilities/interface/StreamID.h"
+#include "SimCalorimetry/HcalTestBeam/interface/HcalTBDigiProducer.h"
 
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h"
-#include "SimCalorimetry/CaloSimAlgos/interface/CaloShapeIntegrator.h"
+#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
+#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
-#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
-#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloShapeIntegrator.h"
+#include "SimCalorimetry/CaloSimAlgos/interface/CaloTDigitizer.h"
 #include "SimDataFormats/EcalTestBeam/interface/PEcalTBInfo.h"
 #include "SimGeneral/MixingModule/interface/PileUpEventPrincipal.h"
 
 #include "CalibCalorimetry/HcalAlgos/interface/HcalTimeSlew.h"
 
-HcalTBDigiProducer::HcalTBDigiProducer(const edm::ParameterSet& ps, edm::ProducerBase& mixMod, edm::ConsumesCollector& iC) :
-  theParameterMap(new HcalTBSimParameterMap(ps)), 
-  theHcalShape(new HcalShape()),
-  theHcalIntegratedShape(new CaloShapeIntegrator(theHcalShape)),
-  theHBHEResponse(new CaloHitResponse(theParameterMap, theHcalIntegratedShape)),
-  theHOResponse(new CaloHitResponse(theParameterMap, theHcalIntegratedShape)),
-  theAmplifier(nullptr), theCoderFactory(nullptr), theElectronicsSim(nullptr), 
-  theTimeSlewSim(nullptr), theHBHEDigitizer(nullptr), theHODigitizer(nullptr), 
-  theHBHEHits(), theHOHits(), thisPhaseShift(0) 
-{
+HcalTBDigiProducer::HcalTBDigiProducer(const edm::ParameterSet &ps,
+                                       edm::ProducerBase &mixMod,
+                                       edm::ConsumesCollector &iC)
+    : theParameterMap(new HcalTBSimParameterMap(ps)),
+      theHcalShape(new HcalShape()),
+      theHcalIntegratedShape(new CaloShapeIntegrator(theHcalShape)),
+      theHBHEResponse(new CaloHitResponse(theParameterMap, theHcalIntegratedShape)),
+      theHOResponse(new CaloHitResponse(theParameterMap, theHcalIntegratedShape)),
+      theAmplifier(nullptr),
+      theCoderFactory(nullptr),
+      theElectronicsSim(nullptr),
+      theTimeSlewSim(nullptr),
+      theHBHEDigitizer(nullptr),
+      theHODigitizer(nullptr),
+      theHBHEHits(),
+      theHOHits(),
+      thisPhaseShift(0) {
   std::string const instance("simHcalDigis");
   mixMod.produces<HBHEDigiCollection>(instance);
   mixMod.produces<HODigiCollection>(instance);
-  iC.consumes<std::vector<PCaloHit> >(edm::InputTag("g4SimHits", "HcalHits"));
+  iC.consumes<std::vector<PCaloHit>>(edm::InputTag("g4SimHits", "HcalHits"));
 
   DetId detId(DetId::Hcal, 1);
   bool syncPhase = (theParameterMap->simParameters(detId)).syncPhase();
-  doPhaseShift   = !syncPhase;
+  doPhaseShift = !syncPhase;
 
   theHBHEResponse->setHitFilter(&theHBHEHitFilter);
   theHOResponse->setHitFilter(&theHOHitFilter);
 
   bool doNoise = ps.getParameter<bool>("doNoise");
-  bool dummy1 = false; 
+  bool dummy1 = false;
   bool dummy2 = false;  // extra arguments for premixing
   theAmplifier = new HcalAmplifier(theParameterMap, doNoise, dummy1, dummy2);
   theCoderFactory = new HcalCoderFactory(HcalCoderFactory::DB);
   theElectronicsSim = new HcalElectronicsSim(theAmplifier, theCoderFactory, dummy1);
 
-  double minFCToDelay= ps.getParameter<double>("minFCToDelay");
+  double minFCToDelay = ps.getParameter<double>("minFCToDelay");
   bool doTimeSlew = ps.getParameter<bool>("doTimeSlew");
 
-  hcalTimeSlew_delay_ = nullptr;  
-  if(doTimeSlew) {
+  hcalTimeSlew_delay_ = nullptr;
+  if (doTimeSlew) {
     // no time slewing for HF
-    theTimeSlewSim = new HcalTimeSlewSim(theParameterMap,minFCToDelay);
+    theTimeSlewSim = new HcalTimeSlewSim(theParameterMap, minFCToDelay);
     theAmplifier->setTimeSlewSim(theTimeSlewSim);
   }
 
   theHBHEDigitizer = new HBHEDigitizer(theHBHEResponse, theElectronicsSim, doNoise);
   theHODigitizer = new HODigitizer(theHOResponse, theElectronicsSim, doNoise);
 
-  tunePhaseShift =  ps.getUntrackedParameter<double>("tunePhaseShiftTB", 1.);
-  ecalTBInfoLabel = ps.getUntrackedParameter<std::string>("EcalTBInfoLabel","SimEcalTBG4Object");
-  edm::LogInfo("HcalSim") << "HcalTBDigiProducer initialized with doNoise = "
-			  << doNoise << ", doTimeSlew = " << doTimeSlew
-			  << " and doPhaseShift = " << doPhaseShift
-			  << " tunePhasShift = " << tunePhaseShift;
+  tunePhaseShift = ps.getUntrackedParameter<double>("tunePhaseShiftTB", 1.);
+  ecalTBInfoLabel = ps.getUntrackedParameter<std::string>("EcalTBInfoLabel", "SimEcalTBG4Object");
+  edm::LogInfo("HcalSim") << "HcalTBDigiProducer initialized with doNoise = " << doNoise
+                          << ", doTimeSlew = " << doTimeSlew << " and doPhaseShift = " << doPhaseShift
+                          << " tunePhasShift = " << tunePhaseShift;
 
   if (doPhaseShift) {
     iC.consumes<PEcalTBInfo>(edm::InputTag(ecalTBInfoLabel, ""));
@@ -74,22 +80,31 @@ HcalTBDigiProducer::HcalTBDigiProducer(const edm::ParameterSet& ps, edm::Produce
 }
 
 HcalTBDigiProducer::~HcalTBDigiProducer() {
-
-  if (theHBHEDigitizer)       delete theHBHEDigitizer;
-  if (theHODigitizer)         delete theHODigitizer;
-  if (theParameterMap)        delete theParameterMap;
-  if (theHcalShape)           delete theHcalShape;
-  if (theHcalIntegratedShape) delete theHcalIntegratedShape;
-  if (theHBHEResponse)        delete theHBHEResponse;
-  if (theHOResponse)          delete theHOResponse;
-  if (theElectronicsSim)      delete theElectronicsSim;
-  if (theAmplifier)           delete theAmplifier;
-  if (theCoderFactory)        delete theCoderFactory;
-  if (theTimeSlewSim)         delete theTimeSlewSim;
+  if (theHBHEDigitizer)
+    delete theHBHEDigitizer;
+  if (theHODigitizer)
+    delete theHODigitizer;
+  if (theParameterMap)
+    delete theParameterMap;
+  if (theHcalShape)
+    delete theHcalShape;
+  if (theHcalIntegratedShape)
+    delete theHcalIntegratedShape;
+  if (theHBHEResponse)
+    delete theHBHEResponse;
+  if (theHOResponse)
+    delete theHOResponse;
+  if (theElectronicsSim)
+    delete theElectronicsSim;
+  if (theAmplifier)
+    delete theAmplifier;
+  if (theCoderFactory)
+    delete theCoderFactory;
+  if (theTimeSlewSim)
+    delete theTimeSlewSim;
 }
 
-
-void HcalTBDigiProducer::initializeEvent(edm::Event const& e, edm::EventSetup const& eventSetup) {
+void HcalTBDigiProducer::initializeEvent(edm::Event const &e, edm::EventSetup const &eventSetup) {
   // get the appropriate gains, noises, & widths for this event
   edm::ESHandle<HcalDbService> conditions;
   eventSetup.get<HcalDbRecord>().get(conditions);
@@ -106,9 +121,8 @@ void HcalTBDigiProducer::initializeEvent(edm::Event const& e, edm::EventSetup co
   theHBHEHits.clear();
   theHOHits.clear();
   if (doPhaseShift) {
-    
     edm::Handle<PEcalTBInfo> theEcalTBInfo;
-    e.getByLabel(ecalTBInfoLabel,theEcalTBInfo);
+    e.getByLabel(ecalTBInfoLabel, theEcalTBInfo);
     thisPhaseShift = theEcalTBInfo->phaseShift();
 
     DetId detIdHB(DetId::Hcal, 1);
@@ -127,11 +141,10 @@ void HcalTBDigiProducer::initializeEvent(edm::Event const& e, edm::EventSetup co
   theHODigitizer->initializeHits();
 }
 
-void HcalTBDigiProducer::accumulateCaloHits(edm::Handle<std::vector<PCaloHit> > const& hcalHandle, int bunchCrossing) {
-
+void HcalTBDigiProducer::accumulateCaloHits(edm::Handle<std::vector<PCaloHit>> const &hcalHandle, int bunchCrossing) {
   LogDebug("HcalSim") << "HcalTBDigiProducer::accumulate trying to get SimHit";
 
-  if(hcalHandle.isValid()) {
+  if (hcalHandle.isValid()) {
     std::vector<PCaloHit> hits = *hcalHandle.product();
     LogDebug("HcalSim") << "HcalTBDigiProducer::accumulate Hits corrected";
     theHBHEDigitizer->add(hits, bunchCrossing, randomEngine_);
@@ -139,27 +152,29 @@ void HcalTBDigiProducer::accumulateCaloHits(edm::Handle<std::vector<PCaloHit> >
   }
 }
 
-void HcalTBDigiProducer::accumulate(edm::Event const& e, edm::EventSetup const&) {
+void HcalTBDigiProducer::accumulate(edm::Event const &e, edm::EventSetup const &) {
   // Step A: Get Inputs, and accumulate digis
 
   edm::InputTag hcalTag("g4SimHits", "HcalHits");
-  edm::Handle<std::vector<PCaloHit> > hcalHandle;
+  edm::Handle<std::vector<PCaloHit>> hcalHandle;
   e.getByLabel(hcalTag, hcalHandle);
 
   accumulateCaloHits(hcalHandle, 0);
 }
 
-void HcalTBDigiProducer::accumulate(PileUpEventPrincipal const& e, edm::EventSetup const&, edm::StreamID const& streamID) {
+void HcalTBDigiProducer::accumulate(PileUpEventPrincipal const &e,
+                                    edm::EventSetup const &,
+                                    edm::StreamID const &streamID) {
   // Step A: Get Inputs, and accumulate digis
 
   edm::InputTag hcalTag("g4SimHits", "HcalHits");
-  edm::Handle<std::vector<PCaloHit> > hcalHandle;
+  edm::Handle<std::vector<PCaloHit>> hcalHandle;
   e.getByLabel(hcalTag, hcalHandle);
 
   accumulateCaloHits(hcalHandle, e.bunchCrossing());
 }
 
-void HcalTBDigiProducer::finalizeEvent(edm::Event& e, const edm::EventSetup& eventSetup) {
+void HcalTBDigiProducer::finalizeEvent(edm::Event &e, const edm::EventSetup &eventSetup) {
   // Step B: Create empty output
   std::unique_ptr<HBHEDigiCollection> hbheResult(new HBHEDigiCollection());
   std::unique_ptr<HODigiCollection> hoResult(new HODigiCollection());
@@ -175,17 +190,15 @@ void HcalTBDigiProducer::finalizeEvent(edm::Event& e, const edm::EventSetup& eve
   e.put(std::move(hbheResult), instance);
   e.put(std::move(hoResult), instance);
 
-  randomEngine_ = nullptr; // to prevent access outside event
+  randomEngine_ = nullptr;  // to prevent access outside event
 }
 
-void HcalTBDigiProducer::sortHits(const edm::PCaloHitContainer & hits) {
-
-  for (edm::PCaloHitContainer::const_iterator hitItr = hits.begin();
-       hitItr != hits.end(); ++hitItr) {
+void HcalTBDigiProducer::sortHits(const edm::PCaloHitContainer &hits) {
+  for (edm::PCaloHitContainer::const_iterator hitItr = hits.begin(); hitItr != hits.end(); ++hitItr) {
     HcalSubdetector subdet = HcalDetId(hitItr->id()).subdet();
-    if(subdet == HcalBarrel || subdet == HcalEndcap) {
+    if (subdet == HcalBarrel || subdet == HcalEndcap) {
       theHBHEHits.push_back(*hitItr);
-    } else if(subdet == HcalOuter) {
+    } else if (subdet == HcalOuter) {
       theHOHits.push_back(*hitItr);
     } else {
       edm::LogError("HcalSim") << "Bad HcalHit subdetector " << subdet;
@@ -193,23 +206,21 @@ void HcalTBDigiProducer::sortHits(const edm::PCaloHitContainer & hits) {
   }
 }
 
-void HcalTBDigiProducer::checkGeometry(const edm::EventSetup & eventSetup) {
-
+void HcalTBDigiProducer::checkGeometry(const edm::EventSetup &eventSetup) {
   // TODO find a way to avoid doing this every event
   edm::ESHandle<CaloGeometry> geometry;
   eventSetup.get<CaloGeometryRecord>().get(geometry);
- 
-  const CaloGeometry * pGeometry = &*geometry;
+
+  const CaloGeometry *pGeometry = &*geometry;
 
   // see if we need to update
-  if(pGeometry != theGeometry) {
+  if (pGeometry != theGeometry) {
     theGeometry = pGeometry;
     updateGeometry();
   }
 }
 
 void HcalTBDigiProducer::updateGeometry() {
-
   theHBHEResponse->setGeometry(theGeometry);
   theHOResponse->setGeometry(theGeometry);
 
@@ -224,9 +235,8 @@ void HcalTBDigiProducer::updateGeometry() {
   hoCells.clear();
   hoCells = theGeometry->getValidDetIds(DetId::Hcal, HcalOuter);
 
-  edm::LogInfo("HcalSim") << "HcalTBDigiProducer update Geometry with "
-			  << hbheCells.size() << " cells in HB/HE and "
-			  << hoCells.size() << " cells in HO";
+  edm::LogInfo("HcalSim") << "HcalTBDigiProducer update Geometry with " << hbheCells.size() << " cells in HB/HE and "
+                          << hoCells.size() << " cells in HO";
 
   theHBHEDigitizer->setDetIds(hbheCells);
   LogDebug("HcalSim") << "HcalTBDigiProducer: Set DetID's for HB/HE";
@@ -234,11 +244,10 @@ void HcalTBDigiProducer::updateGeometry() {
   LogDebug("HcalSim") << "HcalTBDigiProducer: Set DetID's for HO";
 }
 
-void HcalTBDigiProducer::setPhaseShift(const DetId & detId) {
-
-  const CaloSimParameters & parameters = theParameterMap->simParameters(detId);
-  if ( !parameters.syncPhase() ) {
-    int    myDet          = detId.subdetId();
+void HcalTBDigiProducer::setPhaseShift(const DetId &detId) {
+  const CaloSimParameters &parameters = theParameterMap->simParameters(detId);
+  if (!parameters.syncPhase()) {
+    int myDet = detId.subdetId();
     double passPhaseShift = thisPhaseShift + tunePhaseShift;
     if (myDet <= 2) {
       theHBHEResponse->setPhaseShift(passPhaseShift);
diff --git a/SimCalorimetry/HcalTestBeam/src/HcalTBSimParameterMap.cc b/SimCalorimetry/HcalTestBeam/src/HcalTBSimParameterMap.cc
index f086f6c0d3241..ddb248f804b6f 100644
--- a/SimCalorimetry/HcalTestBeam/src/HcalTBSimParameterMap.cc
+++ b/SimCalorimetry/HcalTestBeam/src/HcalTBSimParameterMap.cc
@@ -1,16 +1,12 @@
-#include "SimCalorimetry/HcalTestBeam/interface/HcalTBSimParameterMap.h"
 #include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
-  
+#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
+#include "SimCalorimetry/HcalTestBeam/interface/HcalTBSimParameterMap.h"
 
-HcalTBSimParameterMap::HcalTBSimParameterMap() :
-  theHBParameters(2000., 117, 5, 10, 5, 
-		  true, false, 1, std::vector<double>(16, 117.), 10.),
-  theHEParameters(2000., 178, 5, 10, 5, 
-		  true, false, 16, std::vector<double>(16, 178.), 10.),
-  theHOParameters(4000., 217, 5, 10, 5, 
-		  true, false, 1, std::vector<double>(16, 217.), 5.) {}
+HcalTBSimParameterMap::HcalTBSimParameterMap()
+    : theHBParameters(2000., 117, 5, 10, 5, true, false, 1, std::vector<double>(16, 117.), 10.),
+      theHEParameters(2000., 178, 5, 10, 5, true, false, 16, std::vector<double>(16, 178.), 10.),
+      theHOParameters(4000., 217, 5, 10, 5, true, false, 1, std::vector<double>(16, 217.), 5.) {}
 
 /*
   CaloSimParameters(double photomultiplierGain, double amplifierGain,
@@ -19,46 +15,48 @@ HcalTBSimParameterMap::HcalTBSimParameterMap() :
                  bool doPhotostatistics)
 */
 
-HcalTBSimParameterMap::HcalTBSimParameterMap(const edm::ParameterSet & p) :
-  theHBParameters(p.getUntrackedParameter<double>("photomultiplierGainTBHB",2000.),
-		  p.getUntrackedParameter<double>("samplingFactorTBHB",117),
-		  p.getUntrackedParameter<double>("timePhaseTBHB",5),
-		  p.getUntrackedParameter<int>("readoutFrameSizeTB",10),
-		  p.getUntrackedParameter<int>("binOfMaximumTBHB",5),
-		  p.getUntrackedParameter<bool>("doPhotostatisticsTB",true),
-		  p.getUntrackedParameter<bool>("syncPhaseTB",true),
-		  p.getUntrackedParameter<int>("firstRingTBHB",1), 
-          p.getUntrackedParameter<std::vector<double> >("samplingFactorsTBHB", std::vector<double>(16, 117.)),
-          p.getUntrackedParameter<double>("sipmTauTBHB",10.) ),
-  theHEParameters(p.getUntrackedParameter<double>("photomultiplierGainTBHE",2000.),
-		  p.getUntrackedParameter<double>("samplingFactorTBHE",178),
-		  p.getUntrackedParameter<double>("timePhaseTBHE",5),
-		  p.getUntrackedParameter<int>("readoutFrameSizeTB",10),
-		  p.getUntrackedParameter<int>("binOfMaximumTBHE",5),
-		  p.getUntrackedParameter<bool>("doPhotostatisticsTB",true),
-		  p.getUntrackedParameter<bool>("syncPhaseTB",true),
-		  p.getUntrackedParameter<int>("firstRingTBHE",16), 
-          p.getUntrackedParameter<std::vector<double> >("samplingFactorsTBHE", std::vector<double>(16, 178.)),
-          p.getUntrackedParameter<double>("sipmTauTBHE",10.) ),
-  theHOParameters(p.getUntrackedParameter<double>("photomultiplierGainTBHE",4000.),
-		  p.getUntrackedParameter<double>("samplingFactorTBHO",217),
-		  p.getUntrackedParameter<double>("timePhaseTBHO",5),
-		  p.getUntrackedParameter<int>("readoutFrameSizeTB",10),
-		  p.getUntrackedParameter<int>("binOfMaximumTBHO",5),
-		  p.getUntrackedParameter<bool>("doPhotostatisticsTB",true),
-		  p.getUntrackedParameter<bool>("syncPhaseTB",true),
-		  p.getUntrackedParameter<int>("firstRingTBHO",1), 
-          p.getUntrackedParameter<std::vector<double> >("samplingFactorsTBHO", std::vector<double>(16, 217.)),
-          p.getUntrackedParameter<double>("sipmTauTBHO",5.) ) {}
+HcalTBSimParameterMap::HcalTBSimParameterMap(const edm::ParameterSet &p)
+    : theHBParameters(
+          p.getUntrackedParameter<double>("photomultiplierGainTBHB", 2000.),
+          p.getUntrackedParameter<double>("samplingFactorTBHB", 117),
+          p.getUntrackedParameter<double>("timePhaseTBHB", 5),
+          p.getUntrackedParameter<int>("readoutFrameSizeTB", 10),
+          p.getUntrackedParameter<int>("binOfMaximumTBHB", 5),
+          p.getUntrackedParameter<bool>("doPhotostatisticsTB", true),
+          p.getUntrackedParameter<bool>("syncPhaseTB", true),
+          p.getUntrackedParameter<int>("firstRingTBHB", 1),
+          p.getUntrackedParameter<std::vector<double>>("samplingFactorsTBHB", std::vector<double>(16, 117.)),
+          p.getUntrackedParameter<double>("sipmTauTBHB", 10.)),
+      theHEParameters(
+          p.getUntrackedParameter<double>("photomultiplierGainTBHE", 2000.),
+          p.getUntrackedParameter<double>("samplingFactorTBHE", 178),
+          p.getUntrackedParameter<double>("timePhaseTBHE", 5),
+          p.getUntrackedParameter<int>("readoutFrameSizeTB", 10),
+          p.getUntrackedParameter<int>("binOfMaximumTBHE", 5),
+          p.getUntrackedParameter<bool>("doPhotostatisticsTB", true),
+          p.getUntrackedParameter<bool>("syncPhaseTB", true),
+          p.getUntrackedParameter<int>("firstRingTBHE", 16),
+          p.getUntrackedParameter<std::vector<double>>("samplingFactorsTBHE", std::vector<double>(16, 178.)),
+          p.getUntrackedParameter<double>("sipmTauTBHE", 10.)),
+      theHOParameters(
+          p.getUntrackedParameter<double>("photomultiplierGainTBHE", 4000.),
+          p.getUntrackedParameter<double>("samplingFactorTBHO", 217),
+          p.getUntrackedParameter<double>("timePhaseTBHO", 5),
+          p.getUntrackedParameter<int>("readoutFrameSizeTB", 10),
+          p.getUntrackedParameter<int>("binOfMaximumTBHO", 5),
+          p.getUntrackedParameter<bool>("doPhotostatisticsTB", true),
+          p.getUntrackedParameter<bool>("syncPhaseTB", true),
+          p.getUntrackedParameter<int>("firstRingTBHO", 1),
+          p.getUntrackedParameter<std::vector<double>>("samplingFactorsTBHO", std::vector<double>(16, 217.)),
+          p.getUntrackedParameter<double>("sipmTauTBHO", 5.)) {}
 
-const CaloSimParameters & HcalTBSimParameterMap::simParameters(const DetId & detId) const {
+const CaloSimParameters &HcalTBSimParameterMap::simParameters(const DetId &detId) const {
   HcalDetId hcalDetId(detId);
-  if(hcalDetId.subdet() == HcalBarrel) {
+  if (hcalDetId.subdet() == HcalBarrel) {
     return theHBParameters;
-  } else if(hcalDetId.subdet() == HcalEndcap) {
+  } else if (hcalDetId.subdet() == HcalEndcap) {
     return theHEParameters;
   } else {
     return theHOParameters;
   }
 }
-
diff --git a/SimCalorimetry/HcalTestBeam/src/module.cc b/SimCalorimetry/HcalTestBeam/src/module.cc
index b30a48dab8baf..3291338eddf5d 100644
--- a/SimCalorimetry/HcalTestBeam/src/module.cc
+++ b/SimCalorimetry/HcalTestBeam/src/module.cc
@@ -3,4 +3,3 @@
 #include "SimGeneral/MixingModule/interface/DigiAccumulatorMixModFactory.h"
 
 DEFINE_DIGI_ACCUMULATOR(HcalTBDigiProducer);
-
diff --git a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalRealisticZS.cc b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalRealisticZS.cc
index 4cc0cb8d68406..0ba59caacf852 100644
--- a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalRealisticZS.cc
+++ b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalRealisticZS.cc
@@ -1,109 +1,92 @@
-#include "HcalRealisticZS.h"
+#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
 #include "DataFormats/Common/interface/EDCollection.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
+#include "HcalRealisticZS.h"
 
 #include <iostream>
 
-HcalRealisticZS::HcalRealisticZS(edm::ParameterSet const& conf):
-  inputLabel_(conf.getParameter<std::string>("digiLabel")) {
-
-  bool markAndPass=conf.getParameter<bool>("markAndPass");
-  bool useInstanceLabels=conf.getParameter<bool>("useInstanceLabels");
+HcalRealisticZS::HcalRealisticZS(edm::ParameterSet const &conf)
+    : inputLabel_(conf.getParameter<std::string>("digiLabel")) {
+  bool markAndPass = conf.getParameter<bool>("markAndPass");
+  bool useInstanceLabels = conf.getParameter<bool>("useInstanceLabels");
 
   // register for data access
   tok_hbhe_ = consumes<HBHEDigiCollection>(edm::InputTag(inputLabel_));
   tok_ho_ = consumes<HODigiCollection>(edm::InputTag(inputLabel_));
   tok_hf_ = consumes<HFDigiCollection>(edm::InputTag(inputLabel_));
-  tok_hfQIE10_ = consumes<QIE10DigiCollection>(edm::InputTag(inputLabel_,
-							     useInstanceLabels ? "HFQIE10DigiCollection" : "" ));
-  tok_hbheQIE11_ = consumes<QIE11DigiCollection>(edm::InputTag(inputLabel_,
-							       useInstanceLabels ? "HBHEQIE11DigiCollection" : ""));
+  tok_hfQIE10_ =
+      consumes<QIE10DigiCollection>(edm::InputTag(inputLabel_, useInstanceLabels ? "HFQIE10DigiCollection" : ""));
+  tok_hbheQIE11_ =
+      consumes<QIE11DigiCollection>(edm::InputTag(inputLabel_, useInstanceLabels ? "HBHEQIE11DigiCollection" : ""));
 
+  std::vector<int> tmp = conf.getParameter<std::vector<int>>("HBregion");
 
-  std::vector<int> tmp = conf.getParameter<std::vector<int> >("HBregion");
+  if (tmp[0] < 0 || tmp[0] > 9 || tmp[1] < 0 || tmp[1] > 9 || tmp[0] > tmp[1]) {
+    edm::LogError("HcalZeroSuppression") << "ZS(HB) region error: " << tmp[0] << ":" << tmp[1];
+    tmp[0] = 0;
+    tmp[1] = 9;
+  }
+
+  std::pair<int, int> HBsearchTS(tmp[0], tmp[1]);
 
-  if(tmp[0]<0 || tmp[0]>9 || tmp[1]<0 || tmp[1]>9 || tmp[0]>tmp[1]) {
-    edm::LogError("HcalZeroSuppression") << "ZS(HB) region error: " 
-					 << tmp[0] << ":" <<tmp[1];
-    tmp[0]=0; tmp[1]=9;
+  tmp = conf.getParameter<std::vector<int>>("HEregion");
+  if (tmp[0] < 0 || tmp[0] > 9 || tmp[1] < 0 || tmp[1] > 9 || tmp[0] > tmp[1]) {
+    edm::LogError("HcalZeroSuppression") << "ZS(HE) region error: " << tmp[0] << ":" << tmp[1];
+    tmp[0] = 0;
+    tmp[1] = 9;
   }
+  std::pair<int, int> HEsearchTS(tmp[0], tmp[1]);
 
-  std::pair<int,int> HBsearchTS (tmp[0],tmp[1]);
-  
-  tmp = conf.getParameter<std::vector<int> >("HEregion");
-  if(tmp[0]<0 || tmp[0]>9 || tmp[1]<0 || tmp[1]>9 || tmp[0]>tmp[1]) {
-    edm::LogError("HcalZeroSuppression") << "ZS(HE) region error: " 
-					 << tmp[0] << ":" <<tmp[1];
-    tmp[0]=0; tmp[1]=9;
+  tmp = conf.getParameter<std::vector<int>>("HOregion");
+  if (tmp[0] < 0 || tmp[0] > 9 || tmp[1] < 0 || tmp[1] > 9 || tmp[0] > tmp[1]) {
+    edm::LogError("HcalZeroSuppression") << "ZS(HO) region error: " << tmp[0] << ":" << tmp[1];
+    tmp[0] = 0;
+    tmp[1] = 9;
   }
-  std::pair<int,int> HEsearchTS (tmp[0],tmp[1]);
-  
-  tmp = conf.getParameter<std::vector<int> >("HOregion");
-  if(tmp[0]<0 || tmp[0]>9 || tmp[1]<0 || tmp[1]>9 || tmp[0]>tmp[1]) {
-    edm::LogError("HcalZeroSuppression") << "ZS(HO) region error: " 
-					 << tmp[0] << ":" <<tmp[1];
-    tmp[0]=0; tmp[1]=9;
+  std::pair<int, int> HOsearchTS(tmp[0], tmp[1]);
+
+  tmp = conf.getParameter<std::vector<int>>("HFregion");
+  if (tmp[0] < 0 || tmp[0] > 9 || tmp[1] < 0 || tmp[1] > 9 || tmp[0] > tmp[1]) {
+    edm::LogError("HcalZeroSuppression") << "ZS(HF) region error: " << tmp[0] << ":" << tmp[1];
+    tmp[0] = 0;
+    tmp[1] = 9;
   }
-  std::pair<int,int> HOsearchTS (tmp[0],tmp[1]);
-  
-  tmp = conf.getParameter<std::vector<int> >("HFregion");
-  if(tmp[0]<0 || tmp[0]>9 || tmp[1]<0 || tmp[1]>9 || tmp[0]>tmp[1]) {
-    edm::LogError("HcalZeroSuppression") << "ZS(HF) region error: " 
-					 << tmp[0] << ":" <<tmp[1];
-    tmp[0]=0; tmp[1]=9;
+  std::pair<int, int> HFsearchTS(tmp[0], tmp[1]);
+
+  // this constructor will be called if useConfigZSvalues is set to 1 in
+  // HcalZeroSuppressionProducers/python/hcalDigisRealistic_cfi.py
+  // which means that channel-by-channel ZS thresholds from DB will NOT be used
+  if (conf.getParameter<int>("useConfigZSvalues")) {
+    algo_.reset(new HcalZSAlgoRealistic(markAndPass,
+                                        conf.getParameter<int>("HBlevel"),
+                                        conf.getParameter<int>("HElevel"),
+                                        conf.getParameter<int>("HOlevel"),
+                                        conf.getParameter<int>("HFlevel"),
+                                        HBsearchTS,
+                                        HEsearchTS,
+                                        HOsearchTS,
+                                        HFsearchTS));
+
+  } else {
+    algo_.reset(new HcalZSAlgoRealistic(markAndPass, HBsearchTS, HEsearchTS, HOsearchTS, HFsearchTS));
   }
-  std::pair<int,int> HFsearchTS (tmp[0],tmp[1]);
-      
-  
-    //this constructor will be called if useConfigZSvalues is set to 1 in
-    //HcalZeroSuppressionProducers/python/hcalDigisRealistic_cfi.py
-    //which means that channel-by-channel ZS thresholds from DB will NOT be used
-    if ( conf.getParameter<int>("useConfigZSvalues") ) {
-
-      algo_.reset(
-	 new HcalZSAlgoRealistic (markAndPass,
-				  conf.getParameter<int>("HBlevel"),
-				  conf.getParameter<int>("HElevel"),
-				  conf.getParameter<int>("HOlevel"),
-				  conf.getParameter<int>("HFlevel"), 
-				  HBsearchTS,
-				  HEsearchTS,
-				  HOsearchTS,
-				  HFsearchTS
-				  ));
-      
-    } else {
-
-      algo_.reset(
-	 new HcalZSAlgoRealistic(markAndPass,				  
-				 HBsearchTS,
-				 HEsearchTS,
-				 HOsearchTS,
-				 HFsearchTS));    
-    }
-
-    produces<HBHEDigiCollection>();
-    produces<HODigiCollection>();
-    produces<HFDigiCollection>();
-    produces<QIE10DigiCollection>("HFQIE10DigiCollection");
-    produces<QIE11DigiCollection>("HBHEQIE11DigiCollection");
-   
-}
-    
-HcalRealisticZS::~HcalRealisticZS() {
-  algo_->clearDbService();
+
+  produces<HBHEDigiCollection>();
+  produces<HODigiCollection>();
+  produces<HFDigiCollection>();
+  produces<QIE10DigiCollection>("HFQIE10DigiCollection");
+  produces<QIE11DigiCollection>("HBHEQIE11DigiCollection");
 }
-    
-void HcalRealisticZS::produce(edm::Event& e, const edm::EventSetup& eventSetup)
-{
- 
-  edm::Handle<HBHEDigiCollection> hbhe;    
-  edm::Handle<HODigiCollection> ho;    
+
+HcalRealisticZS::~HcalRealisticZS() { algo_->clearDbService(); }
+
+void HcalRealisticZS::produce(edm::Event &e, const edm::EventSetup &eventSetup) {
+  edm::Handle<HBHEDigiCollection> hbhe;
+  edm::Handle<HODigiCollection> ho;
   edm::Handle<HFDigiCollection> hf;
   edm::Handle<QIE10DigiCollection> hfQIE10;
   edm::Handle<QIE11DigiCollection> hbheQIE11;
@@ -112,50 +95,50 @@ void HcalRealisticZS::produce(edm::Event& e, const edm::EventSetup& eventSetup)
   eventSetup.get<HcalDbRecord>().get(conditions);
   algo_->setDbService(conditions.product());
 
-  e.getByToken(tok_hbhe_,hbhe);
-  
+  e.getByToken(tok_hbhe_, hbhe);
+
   // create empty output
   std::unique_ptr<HBHEDigiCollection> zs_hbhe(new HBHEDigiCollection);
-  
-  e.getByToken(tok_ho_,ho);
-  
+
+  e.getByToken(tok_ho_, ho);
+
   // create empty output
   std::unique_ptr<HODigiCollection> zs_ho(new HODigiCollection);
-  
-  e.getByToken(tok_hf_,hf);
-  
+
+  e.getByToken(tok_hf_, hf);
+
   // create empty output
   std::unique_ptr<HFDigiCollection> zs_hf(new HFDigiCollection);
-  
-  e.getByToken(tok_hfQIE10_,hfQIE10);
-  e.getByToken(tok_hbheQIE11_,hbheQIE11);
-  
+
+  e.getByToken(tok_hfQIE10_, hfQIE10);
+  e.getByToken(tok_hbheQIE11_, hbheQIE11);
+
   // create empty output
   std::unique_ptr<HBHEDigiCollection> zs_hbheUpgrade(new HBHEDigiCollection);
   std::unique_ptr<HFDigiCollection> zs_hfUpgrade(new HFDigiCollection);
   std::unique_ptr<QIE10DigiCollection> zs_hfQIE10(new QIE10DigiCollection(hfQIE10->samples()));
   std::unique_ptr<QIE11DigiCollection> zs_hbheQIE11(new QIE11DigiCollection(hbheQIE11->samples()));
-  
-  //run the algorithm
-  algo_->suppress(*(hbhe.product()),*zs_hbhe);
-  algo_->suppress(*(ho.product()),*zs_ho);
-  algo_->suppress(*(hf.product()),*zs_hf);
-  algo_->suppress(*(hfQIE10.product()),*zs_hfQIE10);
-  algo_->suppress(*(hbheQIE11.product()),*zs_hbheQIE11);
-
-  
-  edm::LogInfo("HcalZeroSuppression") << "Suppression (HBHE) input " << hbhe->size() << " digis, output " << zs_hbhe->size() << " digis" 
-				      <<  " (HO) input " << ho->size() << " digis, output " << zs_ho->size() << " digis"
-				      <<  " (HF) input " << hf->size() << " digis, output " << zs_hf->size() << " digis"
-				      <<  " (HFQIE10) input " << hfQIE10->size() << " digis, output " << zs_hfQIE10->size() << " digis"
-				      <<  " (HBHEQIE11) input " << hbheQIE11->size() << " digis, output " << zs_hbheQIE11->size() << " digis";
-  
-
-    // return result
-    e.put(std::move(zs_hbhe));
-    e.put(std::move(zs_ho));
-    e.put(std::move(zs_hf));
-    e.put(std::move(zs_hfQIE10),"HFQIE10DigiCollection");
-    e.put(std::move(zs_hbheQIE11),"HBHEQIE11DigiCollection");
 
+  // run the algorithm
+  algo_->suppress(*(hbhe.product()), *zs_hbhe);
+  algo_->suppress(*(ho.product()), *zs_ho);
+  algo_->suppress(*(hf.product()), *zs_hf);
+  algo_->suppress(*(hfQIE10.product()), *zs_hfQIE10);
+  algo_->suppress(*(hbheQIE11.product()), *zs_hbheQIE11);
+
+  edm::LogInfo("HcalZeroSuppression") << "Suppression (HBHE) input " << hbhe->size() << " digis, output "
+                                      << zs_hbhe->size() << " digis"
+                                      << " (HO) input " << ho->size() << " digis, output " << zs_ho->size() << " digis"
+                                      << " (HF) input " << hf->size() << " digis, output " << zs_hf->size() << " digis"
+                                      << " (HFQIE10) input " << hfQIE10->size() << " digis, output "
+                                      << zs_hfQIE10->size() << " digis"
+                                      << " (HBHEQIE11) input " << hbheQIE11->size() << " digis, output "
+                                      << zs_hbheQIE11->size() << " digis";
+
+  // return result
+  e.put(std::move(zs_hbhe));
+  e.put(std::move(zs_ho));
+  e.put(std::move(zs_hf));
+  e.put(std::move(zs_hfQIE10), "HFQIE10DigiCollection");
+  e.put(std::move(zs_hbheQIE11), "HBHEQIE11DigiCollection");
 }
diff --git a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalRealisticZS.h b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalRealisticZS.h
index d87389151527e..4aa2822ee121e 100644
--- a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalRealisticZS.h
+++ b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalRealisticZS.h
@@ -1,27 +1,28 @@
 #ifndef HCALSIMPLEREALISTICZS_H
 #define HCALSIMPLEREALISTICZS_H 1
 
-#include "FWCore/Framework/interface/stream/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "HcalZSAlgoRealistic.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
+#include "HcalZSAlgoRealistic.h"
 
 #include <string>
 
 /** \class HcalSimpleRealisticZS
-	
+
 \author J. Mans - Minnesota
 */
 class HcalRealisticZS : public edm::stream::EDProducer<> {
 public:
-  explicit HcalRealisticZS(const edm::ParameterSet& ps);
+  explicit HcalRealisticZS(const edm::ParameterSet &ps);
   ~HcalRealisticZS() override;
-  void produce(edm::Event& e, const edm::EventSetup& c) override;
+  void produce(edm::Event &e, const edm::EventSetup &c) override;
+
 private:
   std::unique_ptr<HcalZSAlgoRealistic> algo_;
   std::string inputLabel_;
diff --git a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalSimpleAmplitudeZS.cc b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalSimpleAmplitudeZS.cc
index 5e52c6c9d68bd..855b8b766e165 100644
--- a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalSimpleAmplitudeZS.cc
+++ b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalSimpleAmplitudeZS.cc
@@ -1,22 +1,20 @@
-#include "HcalSimpleAmplitudeZS.h"
+#include "CalibFormats/HcalObjects/interface/HcalCalibrations.h"
+#include "CalibFormats/HcalObjects/interface/HcalCoderDb.h"
+#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
+#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
 #include "DataFormats/Common/interface/EDCollection.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "CalibFormats/HcalObjects/interface/HcalCoderDb.h"
-#include "CalibFormats/HcalObjects/interface/HcalCalibrations.h"
-#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
-#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/Exception.h"
+#include "HcalSimpleAmplitudeZS.h"
 using namespace std;
 
 #include <iostream>
 
-HcalSimpleAmplitudeZS::HcalSimpleAmplitudeZS(edm::ParameterSet const& conf):
-  inputLabel_(conf.getParameter<std::string>("digiLabel"))
-{
-
+HcalSimpleAmplitudeZS::HcalSimpleAmplitudeZS(edm::ParameterSet const &conf)
+    : inputLabel_(conf.getParameter<std::string>("digiLabel")) {
   // register for data access
   tok_hbhe_ = consumes<HBHEDigiCollection>(edm::InputTag(inputLabel_));
   tok_ho_ = consumes<HODigiCollection>(edm::InputTag(inputLabel_));
@@ -24,99 +22,99 @@ HcalSimpleAmplitudeZS::HcalSimpleAmplitudeZS(edm::ParameterSet const& conf):
   tok_hfQIE10_ = consumes<QIE10DigiCollection>(edm::InputTag(inputLabel_, "HFQIE10DigiCollection"));
   tok_hbheQIE11_ = consumes<QIE11DigiCollection>(edm::InputTag(inputLabel_, "HBHEQIE11DigiCollection"));
 
-  const edm::ParameterSet& psHBHE=conf.getParameter<edm::ParameterSet>("hbhe");
-  bool markAndPass=psHBHE.getParameter<bool>("markAndPass");
-  hbhe_=std::unique_ptr<HcalZSAlgoEnergy>(new HcalZSAlgoEnergy(markAndPass,
-							     psHBHE.getParameter<int>("level"),
-							     psHBHE.getParameter<int>("firstSample"),
-							     psHBHE.getParameter<int>("samplesToAdd"),
-							     psHBHE.getParameter<bool>("twoSided")));
-  produces<HBHEDigiCollection>();  
-  hbheQIE11_=std::unique_ptr<HcalZSAlgoEnergy>(new HcalZSAlgoEnergy(markAndPass,	
-								  psHBHE.getParameter<int>("level"),
-								  psHBHE.getParameter<int>("firstSample"),
-								  psHBHE.getParameter<int>("samplesToAdd"),
-								  psHBHE.getParameter<bool>("twoSided")));
-  produces<QIE11DigiCollection>("HBHEQIE11DigiCollection");  
-  
-  const edm::ParameterSet& psHO=conf.getParameter<edm::ParameterSet>("ho");
-  markAndPass=psHO.getParameter<bool>("markAndPass");
-  ho_=std::unique_ptr<HcalZSAlgoEnergy>(new HcalZSAlgoEnergy(markAndPass,
-							   psHO.getParameter<int>("level"),
-							   psHO.getParameter<int>("firstSample"),
-							   psHO.getParameter<int>("samplesToAdd"),
-							   psHO.getParameter<bool>("twoSided")));
+  const edm::ParameterSet &psHBHE = conf.getParameter<edm::ParameterSet>("hbhe");
+  bool markAndPass = psHBHE.getParameter<bool>("markAndPass");
+  hbhe_ = std::unique_ptr<HcalZSAlgoEnergy>(new HcalZSAlgoEnergy(markAndPass,
+                                                                 psHBHE.getParameter<int>("level"),
+                                                                 psHBHE.getParameter<int>("firstSample"),
+                                                                 psHBHE.getParameter<int>("samplesToAdd"),
+                                                                 psHBHE.getParameter<bool>("twoSided")));
+  produces<HBHEDigiCollection>();
+  hbheQIE11_ = std::unique_ptr<HcalZSAlgoEnergy>(new HcalZSAlgoEnergy(markAndPass,
+                                                                      psHBHE.getParameter<int>("level"),
+                                                                      psHBHE.getParameter<int>("firstSample"),
+                                                                      psHBHE.getParameter<int>("samplesToAdd"),
+                                                                      psHBHE.getParameter<bool>("twoSided")));
+  produces<QIE11DigiCollection>("HBHEQIE11DigiCollection");
+
+  const edm::ParameterSet &psHO = conf.getParameter<edm::ParameterSet>("ho");
+  markAndPass = psHO.getParameter<bool>("markAndPass");
+  ho_ = std::unique_ptr<HcalZSAlgoEnergy>(new HcalZSAlgoEnergy(markAndPass,
+                                                               psHO.getParameter<int>("level"),
+                                                               psHO.getParameter<int>("firstSample"),
+                                                               psHO.getParameter<int>("samplesToAdd"),
+                                                               psHO.getParameter<bool>("twoSided")));
   produces<HODigiCollection>();
-  
-  const edm::ParameterSet& psHF=conf.getParameter<edm::ParameterSet>("hf");
-  markAndPass=psHF.getParameter<bool>("markAndPass");
-  hf_=std::unique_ptr<HcalZSAlgoEnergy>(new HcalZSAlgoEnergy(markAndPass,
-							   psHF.getParameter<int>("level"),
-							   psHF.getParameter<int>("firstSample"),
-							   psHF.getParameter<int>("samplesToAdd"),
-							   psHF.getParameter<bool>("twoSided")));
+
+  const edm::ParameterSet &psHF = conf.getParameter<edm::ParameterSet>("hf");
+  markAndPass = psHF.getParameter<bool>("markAndPass");
+  hf_ = std::unique_ptr<HcalZSAlgoEnergy>(new HcalZSAlgoEnergy(markAndPass,
+                                                               psHF.getParameter<int>("level"),
+                                                               psHF.getParameter<int>("firstSample"),
+                                                               psHF.getParameter<int>("samplesToAdd"),
+                                                               psHF.getParameter<bool>("twoSided")));
   produces<HFDigiCollection>();
-  hfQIE10_=std::unique_ptr<HcalZSAlgoEnergy>(new HcalZSAlgoEnergy(markAndPass,
-								  psHF.getParameter<int>("level"),
-								  psHF.getParameter<int>("firstSample"),
-								  psHF.getParameter<int>("samplesToAdd"),
-								  psHF.getParameter<bool>("twoSided")));
-  produces<QIE10DigiCollection>("HFQIE10DigiCollection");  
+  hfQIE10_ = std::unique_ptr<HcalZSAlgoEnergy>(new HcalZSAlgoEnergy(markAndPass,
+                                                                    psHF.getParameter<int>("level"),
+                                                                    psHF.getParameter<int>("firstSample"),
+                                                                    psHF.getParameter<int>("samplesToAdd"),
+                                                                    psHF.getParameter<bool>("twoSided")));
+  produces<QIE10DigiCollection>("HFQIE10DigiCollection");
 }
-    
-HcalSimpleAmplitudeZS::~HcalSimpleAmplitudeZS() {
-}
-    
-void HcalSimpleAmplitudeZS::produce(edm::Event& e, const edm::EventSetup& eventSetup)
-{
+
+HcalSimpleAmplitudeZS::~HcalSimpleAmplitudeZS() {}
+
+void HcalSimpleAmplitudeZS::produce(edm::Event &e, const edm::EventSetup &eventSetup) {
   // get conditions
   edm::ESHandle<HcalDbService> conditions;
   eventSetup.get<HcalDbRecord>().get(conditions);
-  
 
   {
     hbhe_->prepare(&(*conditions));
-    edm::Handle<HBHEDigiCollection> digi;    
-    e.getByToken(tok_hbhe_,digi);
-    
+    edm::Handle<HBHEDigiCollection> digi;
+    e.getByToken(tok_hbhe_, digi);
+
     // create empty output
     std::unique_ptr<HBHEDigiCollection> zs(new HBHEDigiCollection);
     // run the algorithm
-    hbhe_->suppress(*(digi.product()),*zs);
-    
-    edm::LogInfo("HcalZeroSuppression") << "Suppression (HBHE) input " << digi->size() << " digis, output " << zs->size() << " digis";
-    
+    hbhe_->suppress(*(digi.product()), *zs);
+
+    edm::LogInfo("HcalZeroSuppression") << "Suppression (HBHE) input " << digi->size() << " digis, output "
+                                        << zs->size() << " digis";
+
     // return result
     e.put(std::move(zs));
     hbhe_->done();
-  } 
+  }
   {
     ho_->prepare(&(*conditions));
     edm::Handle<HODigiCollection> digi;
-    e.getByToken(tok_ho_,digi);
-    
+    e.getByToken(tok_ho_, digi);
+
     // create empty output
     std::unique_ptr<HODigiCollection> zs(new HODigiCollection);
     // run the algorithm
-    ho_->suppress(*(digi.product()),*zs);
+    ho_->suppress(*(digi.product()), *zs);
 
-    edm::LogInfo("HcalZeroSuppression") << "Suppression (HO) input " << digi->size() << " digis, output " << zs->size() << " digis";
+    edm::LogInfo("HcalZeroSuppression") << "Suppression (HO) input " << digi->size() << " digis, output " << zs->size()
+                                        << " digis";
 
     // return result
     e.put(std::move(zs));
     ho_->done();
-  } 
+  }
   {
     hf_->prepare(&(*conditions));
     edm::Handle<HFDigiCollection> digi;
-    e.getByToken(tok_hf_,digi);
-    
+    e.getByToken(tok_hf_, digi);
+
     // create empty output
     std::unique_ptr<HFDigiCollection> zs(new HFDigiCollection);
     // run the algorithm
-    hf_->suppress(*(digi.product()),*zs);
+    hf_->suppress(*(digi.product()), *zs);
 
-    edm::LogInfo("HcalZeroSuppression") << "Suppression (HF) input " << digi->size() << " digis, output " << zs->size() << " digis";
+    edm::LogInfo("HcalZeroSuppression") << "Suppression (HF) input " << digi->size() << " digis, output " << zs->size()
+                                        << " digis";
 
     // return result
     e.put(std::move(zs));
@@ -125,14 +123,15 @@ void HcalSimpleAmplitudeZS::produce(edm::Event& e, const edm::EventSetup& eventS
   {
     hfQIE10_->prepare(&(*conditions));
     edm::Handle<QIE10DigiCollection> digi;
-    e.getByToken(tok_hfQIE10_,digi);
-    
+    e.getByToken(tok_hfQIE10_, digi);
+
     // create empty output
     std::unique_ptr<QIE10DigiCollection> zs(new QIE10DigiCollection(digi->samples()));
     // run the algorithm
-    hfQIE10_->suppress(*(digi.product()),*zs);
+    hfQIE10_->suppress(*(digi.product()), *zs);
 
-    edm::LogInfo("HcalZeroSuppression") << "Suppression (HFQIE10) input " << digi->size() << " digis, output " << zs->size() << " digis";
+    edm::LogInfo("HcalZeroSuppression") << "Suppression (HFQIE10) input " << digi->size() << " digis, output "
+                                        << zs->size() << " digis";
 
     // return result
     e.put(std::move(zs), "HFQIE10DigiCollection");
@@ -141,17 +140,18 @@ void HcalSimpleAmplitudeZS::produce(edm::Event& e, const edm::EventSetup& eventS
   {
     hbheQIE11_->prepare(&(*conditions));
     edm::Handle<QIE11DigiCollection> digi;
-    e.getByToken(tok_hbheQIE11_,digi);
-    
+    e.getByToken(tok_hbheQIE11_, digi);
+
     // create empty output
     std::unique_ptr<QIE11DigiCollection> zs(new QIE11DigiCollection(digi->samples()));
     // run the algorithm
-    hbheQIE11_->suppress(*(digi.product()),*zs);
+    hbheQIE11_->suppress(*(digi.product()), *zs);
 
-    edm::LogInfo("HcalZeroSuppression") << "Suppression (HBHEQIE11) input " << digi->size() << " digis, output " << zs->size() << " digis";
+    edm::LogInfo("HcalZeroSuppression") << "Suppression (HBHEQIE11) input " << digi->size() << " digis, output "
+                                        << zs->size() << " digis";
 
     // return result
-    e.put(std::move(zs), "HBHEQIE11DigiCollection");     
+    e.put(std::move(zs), "HBHEQIE11DigiCollection");
     hbheQIE11_->done();
   }
 }
diff --git a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalSimpleAmplitudeZS.h b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalSimpleAmplitudeZS.h
index b16267a92b75c..29555c420cbf9 100644
--- a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalSimpleAmplitudeZS.h
+++ b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalSimpleAmplitudeZS.h
@@ -1,9 +1,9 @@
 #ifndef HCALSIMPLEAMPLITUDEZS_H
 #define HCALSIMPLEAMPLITUDEZS_H 1
 
-#include "FWCore/Framework/interface/stream/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -14,16 +14,17 @@
 #include <string>
 
 /** \class HcalSimpleAmplitudeZS
-	
+
 \author J. Mans - Minnesota
 */
 class HcalSimpleAmplitudeZS : public edm::stream::EDProducer<> {
 public:
-  explicit HcalSimpleAmplitudeZS(const edm::ParameterSet& ps);
+  explicit HcalSimpleAmplitudeZS(const edm::ParameterSet &ps);
   ~HcalSimpleAmplitudeZS() override;
-  void produce(edm::Event& e, const edm::EventSetup& c) override;
+  void produce(edm::Event &e, const edm::EventSetup &c) override;
+
 private:
-  std::unique_ptr<HcalZSAlgoEnergy> hbhe_,ho_,hf_,hfQIE10_,hbheQIE11_;
+  std::unique_ptr<HcalZSAlgoEnergy> hbhe_, ho_, hf_, hfQIE10_, hbheQIE11_;
   std::string inputLabel_;
   edm::EDGetTokenT<HBHEDigiCollection> tok_hbhe_;
   edm::EDGetTokenT<HODigiCollection> tok_ho_;
diff --git a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZSAlgoEnergy.cc b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZSAlgoEnergy.cc
index 58ff890867256..bba07c3241675 100644
--- a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZSAlgoEnergy.cc
+++ b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZSAlgoEnergy.cc
@@ -1,75 +1,71 @@
-#include "HcalZSAlgoEnergy.h"
 #include "CondFormats/HcalObjects/interface/HcalPedestal.h"
-#include "CondFormats/HcalObjects/interface/HcalQIEShape.h"
 #include "CondFormats/HcalObjects/interface/HcalQIECoder.h"
+#include "CondFormats/HcalObjects/interface/HcalQIEShape.h"
+#include "HcalZSAlgoEnergy.h"
 #include <iostream>
 
-HcalZSAlgoEnergy::HcalZSAlgoEnergy(bool mp,int level, int start, int samples, bool twosided) : 
-  HcalZeroSuppressionAlgo(mp),
-  threshold_(level),
-  firstsample_(start),
-  samplecount_(samples),
-  twosided_(twosided)
-{
-}
+HcalZSAlgoEnergy::HcalZSAlgoEnergy(bool mp, int level, int start, int samples, bool twosided)
+    : HcalZeroSuppressionAlgo(mp), threshold_(level), firstsample_(start), samplecount_(samples), twosided_(twosided) {}
 
 namespace ZSEnergy_impl {
-  
-  template <class DIGI> 
-  bool keepMe(const HcalDbService& db, const DIGI& inp, int threshold, int firstSample, int samples, bool twosided) {
-    bool keepIt=false;
-    const HcalQIECoder* channelCoder = db.getHcalCoder (inp.id());
-    const HcalQIEShape* shape = db.getHcalShape (channelCoder);
+
+  template <class DIGI>
+  bool keepMe(const HcalDbService &db, const DIGI &inp, int threshold, int firstSample, int samples, bool twosided) {
+    bool keepIt = false;
+    const HcalQIECoder *channelCoder = db.getHcalCoder(inp.id());
+    const HcalQIEShape *shape = db.getHcalShape(channelCoder);
 
     // determine average pedestal for channel
-    float pedsum=0, pedave=0, offset=0, slope=0;
-    const HcalPedestal* ped=db.getPedestal(inp.id());
-    for (int j=0; j<4; j++) {
-      pedave+=ped->getValue(j)/4.0;
-      offset+=channelCoder->charge(*shape,0,j)/4.0;
-      slope+=channelCoder->charge(*shape,1,j)/4.0;
+    float pedsum = 0, pedave = 0, offset = 0, slope = 0;
+    const HcalPedestal *ped = db.getPedestal(inp.id());
+    for (int j = 0; j < 4; j++) {
+      pedave += ped->getValue(j) / 4.0;
+      offset += channelCoder->charge(*shape, 0, j) / 4.0;
+      slope += channelCoder->charge(*shape, 1, j) / 4.0;
     }
-    slope-=offset;
-    pedave-=offset;
-    pedave/=slope;
-      
-    int sum=0;
+    slope -= offset;
+    pedave -= offset;
+    pedave /= slope;
 
-    for (int j=0; j<samples && j+firstSample < (int)inp.size(); j++) {
-      sum+=inp[j+firstSample].adc();
-      pedsum+=pedave;
+    int sum = 0;
+
+    for (int j = 0; j < samples && j + firstSample < (int)inp.size(); j++) {
+      sum += inp[j + firstSample].adc();
+      pedsum += pedave;
     }
     //    int presum=sum;
-    sum-=(int)(pedsum);
+    sum -= (int)(pedsum);
 
-    if (sum>=threshold) keepIt=true;
-    else if (sum<=(-threshold) && twosided) keepIt=true;
+    if (sum >= threshold)
+      keepIt = true;
+    else if (sum <= (-threshold) && twosided)
+      keepIt = true;
     /*
-      else
-     std::cout << inp.id() << " " << sum << ":" << presum << " " << threshold 
-      << " " << pedsum << " " << pedave
-      << " " << offset << " " << slope 
-      << std::endl;
-    */
+    else
+   std::cout << inp.id() << " " << sum << ":" << presum << " " << threshold
+    << " " << pedsum << " " << pedave
+    << " " << offset << " " << slope
+    << std::endl;
+  */
     return keepIt;
   }
-}
+}  // namespace ZSEnergy_impl
 
-bool HcalZSAlgoEnergy::shouldKeep(const HBHEDataFrame& digi) const {
-  return ZSEnergy_impl::keepMe<HBHEDataFrame>(*db_,digi,threshold_,firstsample_,samplecount_,twosided_);
+bool HcalZSAlgoEnergy::shouldKeep(const HBHEDataFrame &digi) const {
+  return ZSEnergy_impl::keepMe<HBHEDataFrame>(*db_, digi, threshold_, firstsample_, samplecount_, twosided_);
 }
-bool HcalZSAlgoEnergy::shouldKeep(const HODataFrame& digi) const {
-  return ZSEnergy_impl::keepMe<HODataFrame>(*db_,digi,threshold_,firstsample_,samplecount_,twosided_);
+bool HcalZSAlgoEnergy::shouldKeep(const HODataFrame &digi) const {
+  return ZSEnergy_impl::keepMe<HODataFrame>(*db_, digi, threshold_, firstsample_, samplecount_, twosided_);
 }
-bool HcalZSAlgoEnergy::shouldKeep(const HFDataFrame& digi) const {
-  return ZSEnergy_impl::keepMe<HFDataFrame>(*db_,digi,threshold_,firstsample_,samplecount_,twosided_);
+bool HcalZSAlgoEnergy::shouldKeep(const HFDataFrame &digi) const {
+  return ZSEnergy_impl::keepMe<HFDataFrame>(*db_, digi, threshold_, firstsample_, samplecount_, twosided_);
 }
-bool HcalZSAlgoEnergy::shouldKeep(const QIE10DataFrame& digi) const {
-  return ZSEnergy_impl::keepMe<QIE10DataFrame>(*db_,digi,threshold_,firstsample_,samplecount_,twosided_);
+bool HcalZSAlgoEnergy::shouldKeep(const QIE10DataFrame &digi) const {
+  return ZSEnergy_impl::keepMe<QIE10DataFrame>(*db_, digi, threshold_, firstsample_, samplecount_, twosided_);
 }
-bool HcalZSAlgoEnergy::shouldKeep(const QIE11DataFrame& digi) const {
-  return ZSEnergy_impl::keepMe<QIE11DataFrame>(*db_,digi,threshold_,firstsample_,samplecount_,twosided_);
+bool HcalZSAlgoEnergy::shouldKeep(const QIE11DataFrame &digi) const {
+  return ZSEnergy_impl::keepMe<QIE11DataFrame>(*db_, digi, threshold_, firstsample_, samplecount_, twosided_);
 }
 
-void HcalZSAlgoEnergy::prepare(const HcalDbService* db) { db_=db; }
-void HcalZSAlgoEnergy::done() { db_=nullptr; }
+void HcalZSAlgoEnergy::prepare(const HcalDbService *db) { db_ = db; }
+void HcalZSAlgoEnergy::done() { db_ = nullptr; }
diff --git a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZSAlgoEnergy.h b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZSAlgoEnergy.h
index b68f0d160d4e0..6207e7cf03b6c 100644
--- a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZSAlgoEnergy.h
+++ b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZSAlgoEnergy.h
@@ -1,34 +1,37 @@
 #ifndef SIMCALORIMETRY_HCALZEROSUPPRESSIONALGOS_HCALZSALGOENERGY_H
 #define SIMCALORIMETRY_HCALZEROSUPPRESSIONALGOS_HCALZSALGOENERGY_H 1
 
-#include "HcalZeroSuppressionAlgo.h"
 #include "CalibFormats/HcalObjects/interface/HcalDbService.h"
+#include "HcalZeroSuppressionAlgo.h"
 
 /** \class HcalZSAlgoEnergy
-  *  
-  * Simple amplitude-based zero suppression algorithm.  For each digi, add
-  * up (samples) samples beginning with (start) sample.  Subtract the average
-  * pedestal, and compare with digital threshold (in ADC counts).  The algorithm
-  * can keep both positive and negative side fluctuations if "two sided" is enabled.
-  *
-  * \author J. Mans - Minnesota
-  */
+ *
+ * Simple amplitude-based zero suppression algorithm.  For each digi, add
+ * up (samples) samples beginning with (start) sample.  Subtract the average
+ * pedestal, and compare with digital threshold (in ADC counts).  The algorithm
+ * can keep both positive and negative side fluctuations if "two sided" is
+ * enabled.
+ *
+ * \author J. Mans - Minnesota
+ */
 class HcalZSAlgoEnergy : public HcalZeroSuppressionAlgo {
 public:
   HcalZSAlgoEnergy(bool markAndPass, int level, int start, int samples, bool twosided);
   ~HcalZSAlgoEnergy() override = default;
-  void prepare(const HcalDbService* db);
+  void prepare(const HcalDbService *db);
   void done();
+
 protected:
-  bool shouldKeep(const HBHEDataFrame& digi) const override;
-  bool shouldKeep(const HODataFrame& digi) const override;
-  bool shouldKeep(const HFDataFrame& digi) const override;
-  bool shouldKeep(const QIE10DataFrame& digi) const override;
-  bool shouldKeep(const QIE11DataFrame& digi) const override;
+  bool shouldKeep(const HBHEDataFrame &digi) const override;
+  bool shouldKeep(const HODataFrame &digi) const override;
+  bool shouldKeep(const HFDataFrame &digi) const override;
+  bool shouldKeep(const QIE10DataFrame &digi) const override;
+  bool shouldKeep(const QIE11DataFrame &digi) const override;
+
 private:
   int threshold_, firstsample_, samplecount_;
   bool twosided_;
-  const HcalDbService* db_;
+  const HcalDbService *db_;
 };
 
 #endif
diff --git a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZSAlgoRealistic.cc b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZSAlgoRealistic.cc
index 18add8eed24a5..892051aa132ee 100644
--- a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZSAlgoRealistic.cc
+++ b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZSAlgoRealistic.cc
@@ -1,116 +1,131 @@
 #include "HcalZSAlgoRealistic.h"
 #include <iostream>
 
-HcalZSAlgoRealistic::HcalZSAlgoRealistic(bool mp, int levelHB, int levelHE, int levelHO, int levelHF, std::pair<int,int> HBsearchTS, std::pair<int,int> HEsearchTS, std::pair<int,int> HOsearchTS, std::pair<int,int> HFsearchTS) : 
-  HcalZeroSuppressionAlgo(mp),
-  thresholdHB_(levelHB),
-  thresholdHE_(levelHE),
-  thresholdHO_(levelHO),
-  thresholdHF_(levelHF),
-  HBsearchTS_(HBsearchTS),
-  HEsearchTS_(HEsearchTS),
-  HOsearchTS_(HOsearchTS),
-  HFsearchTS_(HFsearchTS)
-{
+HcalZSAlgoRealistic::HcalZSAlgoRealistic(bool mp,
+                                         int levelHB,
+                                         int levelHE,
+                                         int levelHO,
+                                         int levelHF,
+                                         std::pair<int, int> HBsearchTS,
+                                         std::pair<int, int> HEsearchTS,
+                                         std::pair<int, int> HOsearchTS,
+                                         std::pair<int, int> HFsearchTS)
+    : HcalZeroSuppressionAlgo(mp),
+      thresholdHB_(levelHB),
+      thresholdHE_(levelHE),
+      thresholdHO_(levelHO),
+      thresholdHF_(levelHF),
+      HBsearchTS_(HBsearchTS),
+      HEsearchTS_(HEsearchTS),
+      HOsearchTS_(HOsearchTS),
+      HFsearchTS_(HFsearchTS) {
   usingDBvalues = false;
 }
 
-HcalZSAlgoRealistic::HcalZSAlgoRealistic(bool mp, std::pair<int,int> HBsearchTS, std::pair<int,int> HEsearchTS, std::pair<int,int> HOsearchTS, std::pair<int,int> HFsearchTS) : 
-  HcalZeroSuppressionAlgo(mp),
-  HBsearchTS_(HBsearchTS),
-  HEsearchTS_(HEsearchTS),
-  HOsearchTS_(HOsearchTS),
-  HFsearchTS_(HFsearchTS)
-{
+HcalZSAlgoRealistic::HcalZSAlgoRealistic(bool mp,
+                                         std::pair<int, int> HBsearchTS,
+                                         std::pair<int, int> HEsearchTS,
+                                         std::pair<int, int> HOsearchTS,
+                                         std::pair<int, int> HFsearchTS)
+    : HcalZeroSuppressionAlgo(mp),
+      HBsearchTS_(HBsearchTS),
+      HEsearchTS_(HEsearchTS),
+      HOsearchTS_(HOsearchTS),
+      HFsearchTS_(HFsearchTS) {
   thresholdHB_ = -1;
   thresholdHE_ = -1;
   thresholdHO_ = -1;
   thresholdHF_ = -1;
   usingDBvalues = true;
-
 }
-  
+
 template <class Digi>
-bool HcalZSAlgoRealistic::keepMe(const Digi& inp, int start, int finish, int threshold, uint32_t zsmask) const{
-  if ((usingDBvalues) && (threshold < 0) && (m_dbService != nullptr)){
+bool HcalZSAlgoRealistic::keepMe(const Digi &inp, int start, int finish, int threshold, uint32_t zsmask) const {
+  if ((usingDBvalues) && (threshold < 0) && (m_dbService != nullptr)) {
     threshold = (m_dbService->getHcalZSThreshold(inp.id()))->getValue();
   }
 
-  //determine the sum of 2 timeslices
+  // determine the sum of 2 timeslices
   for (int i = start; i < finish; i++) {
-    if ((zsmask&(1<<i)) !=0) continue;
-    if ((inp[i].adc()+inp[i+1].adc())>=threshold) return true;
+    if ((zsmask & (1 << i)) != 0)
+      continue;
+    if ((inp[i].adc() + inp[i + 1].adc()) >= threshold)
+      return true;
   }
   return false;
 }
 
-//zs mask not used for QIE10,11
+// zs mask not used for QIE10,11
 
-template<>
-bool HcalZSAlgoRealistic::keepMe<QIE10DataFrame>(const QIE10DataFrame& inp, int start, int finish, int threshold, uint32_t zsmask) const{
-  if ((usingDBvalues) && (threshold < 0) && (m_dbService != nullptr)){
+template <>
+bool HcalZSAlgoRealistic::keepMe<QIE10DataFrame>(
+    const QIE10DataFrame &inp, int start, int finish, int threshold, uint32_t zsmask) const {
+  if ((usingDBvalues) && (threshold < 0) && (m_dbService != nullptr)) {
     threshold = (m_dbService->getHcalZSThreshold(inp.id()))->getValue();
   }
-  
-  //determine the sum of 2 timeslices
+
+  // determine the sum of 2 timeslices
   for (int i = start; i < finish; i++) {
-    if ((inp[i].adc()+inp[i+1].adc())>=threshold) return true;
+    if ((inp[i].adc() + inp[i + 1].adc()) >= threshold)
+      return true;
   }
   return false;
 }
 
-template<>
-bool HcalZSAlgoRealistic::keepMe<QIE11DataFrame>(const QIE11DataFrame& inp, int start, int finish, int threshold, uint32_t zsmask) const{
-  if ((usingDBvalues) && (threshold < 0) && (m_dbService != nullptr)){
+template <>
+bool HcalZSAlgoRealistic::keepMe<QIE11DataFrame>(
+    const QIE11DataFrame &inp, int start, int finish, int threshold, uint32_t zsmask) const {
+  if ((usingDBvalues) && (threshold < 0) && (m_dbService != nullptr)) {
     threshold = (m_dbService->getHcalZSThreshold(inp.id()))->getValue();
   }
-  
-  //determine the sum of 2 timeslices
+
+  // determine the sum of 2 timeslices
   for (int i = start; i < finish; i++) {
-    if ((inp[i].adc()+inp[i+1].adc())>=threshold) return true;
+    if ((inp[i].adc() + inp[i + 1].adc()) >= threshold)
+      return true;
   }
   return false;
 }
 
-bool HcalZSAlgoRealistic::shouldKeep(const HBHEDataFrame& digi) const{
-  if (digi.id().subdet()==HcalBarrel) {
-    int start  = std::max(0,HBsearchTS_.first);
-    int finish = std::min(digi.size()-1,HBsearchTS_.second);
-    return keepMe(digi,start,finish,thresholdHB_,digi.zsCrossingMask());
+bool HcalZSAlgoRealistic::shouldKeep(const HBHEDataFrame &digi) const {
+  if (digi.id().subdet() == HcalBarrel) {
+    int start = std::max(0, HBsearchTS_.first);
+    int finish = std::min(digi.size() - 1, HBsearchTS_.second);
+    return keepMe(digi, start, finish, thresholdHB_, digi.zsCrossingMask());
   } else {
-    int start  = std::max(0,HEsearchTS_.first);
-    int finish = std::min(digi.size()-1,HEsearchTS_.second);
-    return keepMe(digi,start,finish,thresholdHE_,digi.zsCrossingMask());
+    int start = std::max(0, HEsearchTS_.first);
+    int finish = std::min(digi.size() - 1, HEsearchTS_.second);
+    return keepMe(digi, start, finish, thresholdHE_, digi.zsCrossingMask());
   }
-}  
+}
 
-bool HcalZSAlgoRealistic::shouldKeep(const HODataFrame& digi) const{
-  int start  = std::max(0,HOsearchTS_.first);
-  int finish = std::min(digi.size()-1,HOsearchTS_.second);
-  return keepMe(digi,start,finish,thresholdHO_,digi.zsCrossingMask());
+bool HcalZSAlgoRealistic::shouldKeep(const HODataFrame &digi) const {
+  int start = std::max(0, HOsearchTS_.first);
+  int finish = std::min(digi.size() - 1, HOsearchTS_.second);
+  return keepMe(digi, start, finish, thresholdHO_, digi.zsCrossingMask());
 }
 
-bool HcalZSAlgoRealistic::shouldKeep(const HFDataFrame& digi) const{
-  int start  = std::max(0,HFsearchTS_.first);
-  int finish = std::min(digi.size()-1,HFsearchTS_.second);
-  return keepMe(digi,start,finish,thresholdHF_,digi.zsCrossingMask());
+bool HcalZSAlgoRealistic::shouldKeep(const HFDataFrame &digi) const {
+  int start = std::max(0, HFsearchTS_.first);
+  int finish = std::min(digi.size() - 1, HFsearchTS_.second);
+  return keepMe(digi, start, finish, thresholdHF_, digi.zsCrossingMask());
 }
 
-bool HcalZSAlgoRealistic::shouldKeep(const QIE10DataFrame& digi) const{
-  int start  = std::max(0,HFsearchTS_.first);
-  int finish = std::min((int)digi.samples()-1,HFsearchTS_.second);
-  return keepMe(digi,start,finish,thresholdHF_,0);
+bool HcalZSAlgoRealistic::shouldKeep(const QIE10DataFrame &digi) const {
+  int start = std::max(0, HFsearchTS_.first);
+  int finish = std::min((int)digi.samples() - 1, HFsearchTS_.second);
+  return keepMe(digi, start, finish, thresholdHF_, 0);
 }
 
-bool HcalZSAlgoRealistic::shouldKeep(const QIE11DataFrame& digi) const{
+bool HcalZSAlgoRealistic::shouldKeep(const QIE11DataFrame &digi) const {
   HcalDetId hid(digi.id());
-  if (hid.subdet()==HcalBarrel) {
-    int start  = std::max(0,HBsearchTS_.first);
-    int finish = std::min(digi.samples()-1,HBsearchTS_.second);
-    return keepMe(digi,start,finish,thresholdHB_,0);
+  if (hid.subdet() == HcalBarrel) {
+    int start = std::max(0, HBsearchTS_.first);
+    int finish = std::min(digi.samples() - 1, HBsearchTS_.second);
+    return keepMe(digi, start, finish, thresholdHB_, 0);
   } else {
-    int start  = std::max(0,HEsearchTS_.first);
-    int finish = std::min(digi.samples()-1,HEsearchTS_.second);
-    return keepMe(digi,start,finish,thresholdHE_,0);
+    int start = std::max(0, HEsearchTS_.first);
+    int finish = std::min(digi.samples() - 1, HEsearchTS_.second);
+    return keepMe(digi, start, finish, thresholdHE_, 0);
   }
 }
diff --git a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZSAlgoRealistic.h b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZSAlgoRealistic.h
index 47c032d6e9ccc..984377b3db989 100644
--- a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZSAlgoRealistic.h
+++ b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZSAlgoRealistic.h
@@ -4,30 +4,47 @@
 #include "HcalZeroSuppressionAlgo.h"
 
 /** \class HcalZSAlgoRealistic
-  *  
-  * Simple amplitude-based zero suppression algorithm.  For each digi, add
-  * up consecutive 2 samples in a slice of 10 time samples, beginning with (start) 
-  * sample. If any of the sums are greater then the threshold, keep the event.
-  *
-  * \author S. Sengupta - Minnesota
-  */
+ *
+ * Simple amplitude-based zero suppression algorithm.  For each digi, add
+ * up consecutive 2 samples in a slice of 10 time samples, beginning with
+ * (start) sample. If any of the sums are greater then the threshold, keep the
+ * event.
+ *
+ * \author S. Sengupta - Minnesota
+ */
 class HcalZSAlgoRealistic : public HcalZeroSuppressionAlgo {
 public:
-  HcalZSAlgoRealistic(bool markAndPass, std::pair<int,int> HBsearchTS, std::pair<int,int> HEsearchTS, std::pair<int,int> HOsearchTS, std::pair<int,int> HFsearchTS);
-  HcalZSAlgoRealistic(bool markAndPass, int levelHB, int levelHE, int levelHO, int levelHF, std::pair<int,int> HBsearchTS, std::pair<int,int> HEsearchTS, std::pair<int,int> HOsearchTS, std::pair<int,int> HFsearchTS);
-  ~HcalZSAlgoRealistic() override = default; 
+  HcalZSAlgoRealistic(bool markAndPass,
+                      std::pair<int, int> HBsearchTS,
+                      std::pair<int, int> HEsearchTS,
+                      std::pair<int, int> HOsearchTS,
+                      std::pair<int, int> HFsearchTS);
+  HcalZSAlgoRealistic(bool markAndPass,
+                      int levelHB,
+                      int levelHE,
+                      int levelHO,
+                      int levelHF,
+                      std::pair<int, int> HBsearchTS,
+                      std::pair<int, int> HEsearchTS,
+                      std::pair<int, int> HOsearchTS,
+                      std::pair<int, int> HFsearchTS);
+  ~HcalZSAlgoRealistic() override = default;
+
 protected:
-  //these need to be overloads instead of templates to avoid linking issues when calling private member function templates
-  bool shouldKeep(const HBHEDataFrame& digi) const override;
-  bool shouldKeep(const HODataFrame& digi) const override;
-  bool shouldKeep(const HFDataFrame& digi) const override;
-  bool shouldKeep(const QIE10DataFrame& digi) const override;
-  bool shouldKeep(const QIE11DataFrame& digi) const override;
+  // these need to be overloads instead of templates to avoid linking issues
+  // when calling private member function templates
+  bool shouldKeep(const HBHEDataFrame &digi) const override;
+  bool shouldKeep(const HODataFrame &digi) const override;
+  bool shouldKeep(const HFDataFrame &digi) const override;
+  bool shouldKeep(const QIE10DataFrame &digi) const override;
+  bool shouldKeep(const QIE11DataFrame &digi) const override;
+
 private:
-  bool usingDBvalues; 
+  bool usingDBvalues;
   int thresholdHB_, thresholdHE_, thresholdHO_, thresholdHF_;
-  std::pair<int,int> HBsearchTS_,  HEsearchTS_, HOsearchTS_, HFsearchTS_;
-  template<class Digi> bool keepMe(const Digi& inp, int start, int finish, int threshold, uint32_t zsmask) const;
+  std::pair<int, int> HBsearchTS_, HEsearchTS_, HOsearchTS_, HFsearchTS_;
+  template <class Digi>
+  bool keepMe(const Digi &inp, int start, int finish, int threshold, uint32_t zsmask) const;
 };
 
 #endif
diff --git a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZeroSuppressionAlgo.cc b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZeroSuppressionAlgo.cc
index 63c0205384b11..a4a41afc986be 100644
--- a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZeroSuppressionAlgo.cc
+++ b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZeroSuppressionAlgo.cc
@@ -1,72 +1,69 @@
 #include "HcalZeroSuppressionAlgo.h"
 
-HcalZeroSuppressionAlgo::HcalZeroSuppressionAlgo(bool mp) : m_markAndPass(mp) {
-   m_dbService=nullptr;
-}
-
+HcalZeroSuppressionAlgo::HcalZeroSuppressionAlgo(bool mp) : m_markAndPass(mp) { m_dbService = nullptr; }
 
-void HcalZeroSuppressionAlgo::suppress(const HBHEDigiCollection& input, HBHEDigiCollection& output) {
+void HcalZeroSuppressionAlgo::suppress(const HBHEDigiCollection &input, HBHEDigiCollection &output) {
   HBHEDigiCollection::const_iterator i;
 
-  for (i=input.begin(); i!=input.end(); ++i) {
+  for (i = input.begin(); i != input.end(); ++i) {
     if (shouldKeep((*i))) {
       if (!m_markAndPass) {
-	output.push_back(*i);
+        output.push_back(*i);
       } else {
-	HBHEDataFrame df(*i);
-	df.setZSInfo(true,false);
-	output.push_back(df);
+        HBHEDataFrame df(*i);
+        df.setZSInfo(true, false);
+        output.push_back(df);
       }
     } else if (m_markAndPass) {
       HBHEDataFrame df(*i);
-      df.setZSInfo(true,true);
+      df.setZSInfo(true, true);
       output.push_back(df);
     }
   }
 }
 
-void HcalZeroSuppressionAlgo::suppress(const HFDigiCollection& input, HFDigiCollection& output) {
+void HcalZeroSuppressionAlgo::suppress(const HFDigiCollection &input, HFDigiCollection &output) {
   HFDigiCollection::const_iterator i;
 
-  for (i=input.begin(); i!=input.end(); ++i) {
+  for (i = input.begin(); i != input.end(); ++i) {
     if (shouldKeep((*i))) {
       if (!m_markAndPass) {
-	output.push_back(*i);
+        output.push_back(*i);
       } else {
-	HFDataFrame df(*i);
-	df.setZSInfo(true,false);
-	output.push_back(df);
+        HFDataFrame df(*i);
+        df.setZSInfo(true, false);
+        output.push_back(df);
       }
     } else if (m_markAndPass) {
       HFDataFrame df(*i);
-      df.setZSInfo(true,true);
+      df.setZSInfo(true, true);
       output.push_back(df);
     }
   }
 }
 
-void HcalZeroSuppressionAlgo::suppress(const HODigiCollection& input, HODigiCollection& output) {
+void HcalZeroSuppressionAlgo::suppress(const HODigiCollection &input, HODigiCollection &output) {
   HODigiCollection::const_iterator i;
 
-  for (i=input.begin(); i!=input.end(); ++i) {
+  for (i = input.begin(); i != input.end(); ++i) {
     if (shouldKeep((*i))) {
       if (!m_markAndPass) {
-	output.push_back(*i);
+        output.push_back(*i);
       } else {
-	HODataFrame df(*i);
-	df.setZSInfo(true,false);
-	output.push_back(df);
+        HODataFrame df(*i);
+        df.setZSInfo(true, false);
+        output.push_back(df);
       }
     } else if (m_markAndPass) {
       HODataFrame df(*i);
-      df.setZSInfo(true,true);
+      df.setZSInfo(true, true);
       output.push_back(df);
     }
   }
 }
 
-void HcalZeroSuppressionAlgo::suppress(const QIE10DigiCollection& input, QIE10DigiCollection& output) {
-  for (QIE10DigiCollection::const_iterator i=input.begin(); i!=input.end(); ++i) {
+void HcalZeroSuppressionAlgo::suppress(const QIE10DigiCollection &input, QIE10DigiCollection &output) {
+  for (QIE10DigiCollection::const_iterator i = input.begin(); i != input.end(); ++i) {
     QIE10DataFrame df(*i);
     if (shouldKeep(df)) {
       if (!m_markAndPass) {
@@ -75,16 +72,15 @@ void HcalZeroSuppressionAlgo::suppress(const QIE10DigiCollection& input, QIE10Di
         df.setZSInfo(false);
         output.push_back(df);
       }
-    } 
-    else if (m_markAndPass) {
+    } else if (m_markAndPass) {
       df.setZSInfo(true);
       output.push_back(df);
     }
   }
 }
 
-void HcalZeroSuppressionAlgo::suppress(const QIE11DigiCollection& input, QIE11DigiCollection& output) {
-  for (QIE11DigiCollection::const_iterator i=input.begin(); i!=input.end(); ++i) {
+void HcalZeroSuppressionAlgo::suppress(const QIE11DigiCollection &input, QIE11DigiCollection &output) {
+  for (QIE11DigiCollection::const_iterator i = input.begin(); i != input.end(); ++i) {
     QIE11DataFrame df(*i);
     if (shouldKeep(df)) {
       if (!m_markAndPass) {
@@ -93,8 +89,7 @@ void HcalZeroSuppressionAlgo::suppress(const QIE11DigiCollection& input, QIE11Di
         df.setZSInfo(false);
         output.push_back(df);
       }
-    }
-	else if (m_markAndPass) {
+    } else if (m_markAndPass) {
       df.setZSInfo(true);
       output.push_back(df);
     }
diff --git a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZeroSuppressionAlgo.h b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZeroSuppressionAlgo.h
index de5c78fb322d2..a0fe27d6ab45d 100644
--- a/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZeroSuppressionAlgo.h
+++ b/SimCalorimetry/HcalZeroSuppressionProducers/src/HcalZeroSuppressionAlgo.h
@@ -1,38 +1,38 @@
 #ifndef SimCalorimetry_HcalZeroSuppressionAlgos_HCALZEROSUPPESSIONALGO_H
 #define SimCalorimetry_HcalZeroSuppressionAlgos_HCALZEROSUPPESSIONALGO_H 1
 
-#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
-#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
 #include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
+#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
+#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 
 /** \class HcalZeroSuppessionAlgo
-  *  
-  * \author J. Mans - Minnesota
-  */
+ *
+ * \author J. Mans - Minnesota
+ */
 
 class HcalDbService;
 
 class HcalZeroSuppressionAlgo {
 public:
   virtual ~HcalZeroSuppressionAlgo() = default;
-  void suppress(const HBHEDigiCollection& input, HBHEDigiCollection& output);
-  void suppress(const HODigiCollection& input, HODigiCollection& output);
-  void suppress(const HFDigiCollection& input, HFDigiCollection& output);
-  void suppress(const QIE10DigiCollection& input, QIE10DigiCollection& output);
-  void suppress(const QIE11DigiCollection& input, QIE11DigiCollection& output);
-  virtual bool shouldKeep(const HBHEDataFrame& digi) const = 0;
-  virtual bool shouldKeep(const HODataFrame& digi) const = 0;
-  virtual bool shouldKeep(const HFDataFrame& digi) const = 0;
-  virtual bool shouldKeep(const QIE10DataFrame& digi) const = 0;
-  virtual bool shouldKeep(const QIE11DataFrame& digi) const = 0;
-  void setDbService(const HcalDbService* db) { m_dbService=db; }
-  void clearDbService() { m_dbService=nullptr; }
+  void suppress(const HBHEDigiCollection &input, HBHEDigiCollection &output);
+  void suppress(const HODigiCollection &input, HODigiCollection &output);
+  void suppress(const HFDigiCollection &input, HFDigiCollection &output);
+  void suppress(const QIE10DigiCollection &input, QIE10DigiCollection &output);
+  void suppress(const QIE11DigiCollection &input, QIE11DigiCollection &output);
+  virtual bool shouldKeep(const HBHEDataFrame &digi) const = 0;
+  virtual bool shouldKeep(const HODataFrame &digi) const = 0;
+  virtual bool shouldKeep(const HFDataFrame &digi) const = 0;
+  virtual bool shouldKeep(const QIE10DataFrame &digi) const = 0;
+  virtual bool shouldKeep(const QIE11DataFrame &digi) const = 0;
+  void setDbService(const HcalDbService *db) { m_dbService = db; }
+  void clearDbService() { m_dbService = nullptr; }
   //  template <class DIGI> bool keepMe(const DIGI& inp, int threshold);
 
 protected:
   HcalZeroSuppressionAlgo(bool markAndPass);
-  const HcalDbService* m_dbService;
-  
+  const HcalDbService *m_dbService;
+
 private:
   bool m_markAndPass;
 };
diff --git a/SimCalorimetry/HcalZeroSuppressionProducers/src/SealModule.cc b/SimCalorimetry/HcalZeroSuppressionProducers/src/SealModule.cc
index aa86be47d204c..4d691696616ba 100644
--- a/SimCalorimetry/HcalZeroSuppressionProducers/src/SealModule.cc
+++ b/SimCalorimetry/HcalZeroSuppressionProducers/src/SealModule.cc
@@ -1,8 +1,7 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "HcalSimpleAmplitudeZS.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "HcalRealisticZS.h"
-
+#include "HcalSimpleAmplitudeZS.h"
 
 DEFINE_FWK_MODULE(HcalSimpleAmplitudeZS);
 DEFINE_FWK_MODULE(HcalRealisticZS);
diff --git a/SimDataFormats/Associations/interface/MuonToTrackingParticleAssociator.h b/SimDataFormats/Associations/interface/MuonToTrackingParticleAssociator.h
index 650c06fe5c773..82ef9ebde652c 100644
--- a/SimDataFormats/Associations/interface/MuonToTrackingParticleAssociator.h
+++ b/SimDataFormats/Associations/interface/MuonToTrackingParticleAssociator.h
@@ -5,42 +5,44 @@
 #include "DataFormats/Common/interface/Ref.h"
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
-#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
-#include "SimDataFormats/Associations/interface/MuonTrackType.h"
 #include "SimDataFormats/Associations/interface/MuonToTrackingParticleAssociatorBaseImpl.h"
+#include "SimDataFormats/Associations/interface/MuonTrackType.h"
+#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 
 #include <memory>
 
 namespace reco {
-  class MuonToTrackingParticleAssociator  {
-    
+  class MuonToTrackingParticleAssociator {
   public:
-    
-    MuonToTrackingParticleAssociator () = default;
-    ~MuonToTrackingParticleAssociator () = default;
+    MuonToTrackingParticleAssociator() = default;
+    ~MuonToTrackingParticleAssociator() = default;
 #ifndef __GCCXML__
     MuonToTrackingParticleAssociator(std::unique_ptr<MuonToTrackingParticleAssociatorBaseImpl>);
 #endif
-    MuonToTrackingParticleAssociator(MuonToTrackingParticleAssociator&&) = default;
-    MuonToTrackingParticleAssociator& operator=(MuonToTrackingParticleAssociator&&) = default;
-    
-    void associateMuons(MuonToSimCollection & recoToSim, SimToMuonCollection & simToReco,
-                        const edm::RefToBaseVector<reco::Muon> & muons, MuonTrackType type,
-                        const edm::RefVector<TrackingParticleCollection>& tpColl) const {
+    MuonToTrackingParticleAssociator(MuonToTrackingParticleAssociator &&) = default;
+    MuonToTrackingParticleAssociator &operator=(MuonToTrackingParticleAssociator &&) = default;
+
+    void associateMuons(MuonToSimCollection &recoToSim,
+                        SimToMuonCollection &simToReco,
+                        const edm::RefToBaseVector<reco::Muon> &muons,
+                        MuonTrackType type,
+                        const edm::RefVector<TrackingParticleCollection> &tpColl) const {
       impl_->associateMuons(recoToSim, simToReco, muons, type, tpColl);
     }
-    void associateMuons(MuonToSimCollection & recoToSim, SimToMuonCollection & simToReco,
-                        const edm::Handle<edm::View<reco::Muon> > & muons, MuonTrackType type, 
-                        const edm::Handle<TrackingParticleCollection>& tpColl) const {
+    void associateMuons(MuonToSimCollection &recoToSim,
+                        SimToMuonCollection &simToReco,
+                        const edm::Handle<edm::View<reco::Muon>> &muons,
+                        MuonTrackType type,
+                        const edm::Handle<TrackingParticleCollection> &tpColl) const {
       impl_->associateMuons(recoToSim, simToReco, muons, type, tpColl);
     }
 
   private:
-    MuonToTrackingParticleAssociator( const MuonToTrackingParticleAssociator&) = delete;
-    MuonToTrackingParticleAssociator& operator=( const MuonToTrackingParticleAssociator&) = delete;
+    MuonToTrackingParticleAssociator(const MuonToTrackingParticleAssociator &) = delete;
+    MuonToTrackingParticleAssociator &operator=(const MuonToTrackingParticleAssociator &) = delete;
 
     std::unique_ptr<MuonToTrackingParticleAssociatorBaseImpl const> impl_;
   };
-}
+}  // namespace reco
 
 #endif
diff --git a/SimDataFormats/Associations/interface/MuonToTrackingParticleAssociatorBaseImpl.h b/SimDataFormats/Associations/interface/MuonToTrackingParticleAssociatorBaseImpl.h
index 0d06245b12e1b..92fb00c80624b 100644
--- a/SimDataFormats/Associations/interface/MuonToTrackingParticleAssociatorBaseImpl.h
+++ b/SimDataFormats/Associations/interface/MuonToTrackingParticleAssociatorBaseImpl.h
@@ -5,25 +5,27 @@
 #include "DataFormats/Common/interface/Ref.h"
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
-#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 #include "SimDataFormats/Associations/interface/MuonTrackType.h"
+#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 
 namespace reco {
-  class MuonToTrackingParticleAssociatorBaseImpl  {
-    
+  class MuonToTrackingParticleAssociatorBaseImpl {
   public:
-    
-    MuonToTrackingParticleAssociatorBaseImpl ();
+    MuonToTrackingParticleAssociatorBaseImpl();
     virtual ~MuonToTrackingParticleAssociatorBaseImpl();
-    
-    virtual void associateMuons(MuonToSimCollection & recoToSim, SimToMuonCollection & simToReco,
-                                const edm::RefToBaseVector<reco::Muon> & muons, MuonTrackType type,
-                                const edm::RefVector<TrackingParticleCollection>& tpColl) const  = 0;
-    
-    virtual void associateMuons(MuonToSimCollection & recoToSim, SimToMuonCollection & simToReco,
-                                const edm::Handle<edm::View<reco::Muon> > & muons, MuonTrackType type, 
-                                const edm::Handle<TrackingParticleCollection>& tpColl) const = 0;
+
+    virtual void associateMuons(MuonToSimCollection &recoToSim,
+                                SimToMuonCollection &simToReco,
+                                const edm::RefToBaseVector<reco::Muon> &muons,
+                                MuonTrackType type,
+                                const edm::RefVector<TrackingParticleCollection> &tpColl) const = 0;
+
+    virtual void associateMuons(MuonToSimCollection &recoToSim,
+                                SimToMuonCollection &simToReco,
+                                const edm::Handle<edm::View<reco::Muon>> &muons,
+                                MuonTrackType type,
+                                const edm::Handle<TrackingParticleCollection> &tpColl) const = 0;
   };
-}
+}  // namespace reco
 
 #endif
diff --git a/SimDataFormats/Associations/interface/MuonTrackType.h b/SimDataFormats/Associations/interface/MuonTrackType.h
index 7dec35cedfc0e..c562dcbf42cb2 100644
--- a/SimDataFormats/Associations/interface/MuonTrackType.h
+++ b/SimDataFormats/Associations/interface/MuonTrackType.h
@@ -4,8 +4,9 @@
 //
 // Package:     SimDataFormats/Associations
 // Class  :     MuonTrackType
-// 
-/**\enum MuonTrackType MuonTrackType.h "SimDataFormats/Associations/interface/MuonTrackType.h"
+//
+/**\enum MuonTrackType MuonTrackType.h
+ "SimDataFormats/Associations/interface/MuonTrackType.h"
 
  Description: Types of muon tracks used by MuonToSimAssociator
 
@@ -18,22 +19,24 @@
 //         Created:  Wed, 07 Jan 2015 21:03:32 GMT
 //
 
-#include <vector>
 #include "DataFormats/Common/interface/RefToBase.h"
-#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 #include "DataFormats/MuonReco/interface/Muon.h"
+#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
+#include <vector>
 
 namespace reco {
-    enum MuonTrackType { InnerTk, OuterTk, GlobalTk, Segments, GlbOrTrk };
-
-    struct RefToBaseSort { 
-      template<typename T> bool operator()(const edm::RefToBase<T> &r1, const edm::RefToBase<T> &r2) const { 
-        return (r1.id() == r2.id() ? r1.key() < r2.key() : r1.id() < r2.id()); 
-      }
-    };
-    typedef std::map<edm::RefToBase<reco::Muon>, std::vector<std::pair<TrackingParticleRef, double> >, RefToBaseSort> MuonToSimCollection;
-    typedef std::map<TrackingParticleRef, std::vector<std::pair<edm::RefToBase<reco::Muon>, double> > >               SimToMuonCollection;
-
-}
+  enum MuonTrackType { InnerTk, OuterTk, GlobalTk, Segments, GlbOrTrk };
+
+  struct RefToBaseSort {
+    template <typename T>
+    bool operator()(const edm::RefToBase<T> &r1, const edm::RefToBase<T> &r2) const {
+      return (r1.id() == r2.id() ? r1.key() < r2.key() : r1.id() < r2.id());
+    }
+  };
+  typedef std::map<edm::RefToBase<reco::Muon>, std::vector<std::pair<TrackingParticleRef, double>>, RefToBaseSort>
+      MuonToSimCollection;
+  typedef std::map<TrackingParticleRef, std::vector<std::pair<edm::RefToBase<reco::Muon>, double>>> SimToMuonCollection;
+
+}  // namespace reco
 
 #endif
diff --git a/SimDataFormats/Associations/interface/TrackToGenParticleAssociator.h b/SimDataFormats/Associations/interface/TrackToGenParticleAssociator.h
index e3fa8ee2f9638..15d1b6e7783db 100644
--- a/SimDataFormats/Associations/interface/TrackToGenParticleAssociator.h
+++ b/SimDataFormats/Associations/interface/TrackToGenParticleAssociator.h
@@ -7,75 +7,71 @@
  *  \author cerati, magni
  */
 
-#include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 #include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Track/interface/SimTrackContainer.h"
+#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
 #include "SimDataFormats/Associations/interface/TrackToGenParticleAssociatorBaseImpl.h"
 
 #include <memory>
 
-//Note that the Association Map is filled with -ch2 and not chi2 because it is ordered using std::greater:
-//the track with the lowest association chi2 will be the first in the output map.
+// Note that the Association Map is filled with -ch2 and not chi2 because it is
+// ordered using std::greater: the track with the lowest association chi2 will
+// be the first in the output map.
 
-namespace reco{
-  typedef edm::AssociationMap<edm::OneToManyWithQualityGeneric
-    <reco::GenParticleCollection, edm::View<reco::Track>, double> >
-    GenToRecoCollection;  
-  typedef edm::AssociationMap<edm::OneToManyWithQualityGeneric 
-    <edm::View<reco::Track>, reco::GenParticleCollection, double> >
-    RecoToGenCollection;
+namespace reco {
+  typedef edm::AssociationMap<
+      edm::OneToManyWithQualityGeneric<reco::GenParticleCollection, edm::View<reco::Track>, double>>
+      GenToRecoCollection;
+  typedef edm::AssociationMap<
+      edm::OneToManyWithQualityGeneric<edm::View<reco::Track>, reco::GenParticleCollection, double>>
+      RecoToGenCollection;
 
-  
-  class TrackToGenParticleAssociator  {
-    
+  class TrackToGenParticleAssociator {
   public:
     /// Constructor
     TrackToGenParticleAssociator() = default;
 #ifndef __GCCXML__
-    TrackToGenParticleAssociator( std::unique_ptr<reco::TrackToGenParticleAssociatorBaseImpl>);
+    TrackToGenParticleAssociator(std::unique_ptr<reco::TrackToGenParticleAssociatorBaseImpl>);
 #endif
     ~TrackToGenParticleAssociator() = default;
-    TrackToGenParticleAssociator(TrackToGenParticleAssociator&&) = default;
-    TrackToGenParticleAssociator& operator=(TrackToGenParticleAssociator&&) = default;
-    
+    TrackToGenParticleAssociator(TrackToGenParticleAssociator &&) = default;
+    TrackToGenParticleAssociator &operator=(TrackToGenParticleAssociator &&) = default;
+
     /// Association Sim To Reco with Collections (Gen Particle version)
-    reco::RecoToGenCollection associateRecoToGen(const edm::RefToBaseVector<reco::Track>& tracks,
-                                                 const edm::RefVector<reco::GenParticleCollection>& gens) const {
-      return m_impl->associateRecoToGen(tracks ,gens);
+    reco::RecoToGenCollection associateRecoToGen(const edm::RefToBaseVector<reco::Track> &tracks,
+                                                 const edm::RefVector<reco::GenParticleCollection> &gens) const {
+      return m_impl->associateRecoToGen(tracks, gens);
     }
     /// Association Sim To Reco with Collections (Gen Particle version)
-    reco::GenToRecoCollection associateGenToReco(const edm::RefToBaseVector<reco::Track>& tracks,
-                                                 const edm::RefVector<reco::GenParticleCollection>& gens) const {
-      return m_impl->associateGenToReco(tracks,gens);
+    reco::GenToRecoCollection associateGenToReco(const edm::RefToBaseVector<reco::Track> &tracks,
+                                                 const edm::RefVector<reco::GenParticleCollection> &gens) const {
+      return m_impl->associateGenToReco(tracks, gens);
     }
-    
+
     /// compare reco to sim the handle of reco::Track and GenParticle collections
-    reco::RecoToGenCollection associateRecoToGen(const edm::Handle<edm::View<reco::Track> >& tCH, 
-                                                 const edm::Handle<reco::GenParticleCollection>& tPCH) const {
+    reco::RecoToGenCollection associateRecoToGen(const edm::Handle<edm::View<reco::Track>> &tCH,
+                                                 const edm::Handle<reco::GenParticleCollection> &tPCH) const {
       return m_impl->associateRecoToGen(tCH, tPCH);
     }
-    
+
     /// compare reco to sim the handle of reco::Track and GenParticle collections
-    reco::GenToRecoCollection associateGenToReco(const edm::Handle<edm::View<reco::Track> >& tCH, 
-                                                 const edm::Handle<reco::GenParticleCollection>& tPCH) const {
-      return m_impl->associateGenToReco(tCH,tPCH);
+    reco::GenToRecoCollection associateGenToReco(const edm::Handle<edm::View<reco::Track>> &tCH,
+                                                 const edm::Handle<reco::GenParticleCollection> &tPCH) const {
+      return m_impl->associateGenToReco(tCH, tPCH);
     }
 
-    
   private:
-    TrackToGenParticleAssociator(const TrackToGenParticleAssociator&) = delete; // stop default
-    
-    const TrackToGenParticleAssociator& operator=(const TrackToGenParticleAssociator&) = delete; // stop default
-    
+    TrackToGenParticleAssociator(const TrackToGenParticleAssociator &) = delete;  // stop default
+
+    const TrackToGenParticleAssociator &operator=(const TrackToGenParticleAssociator &) = delete;  // stop default
+
     std::unique_ptr<TrackToGenParticleAssociatorBaseImpl> m_impl;
-    
-    
   };
-}
+}  // namespace reco
 
 #endif
diff --git a/SimDataFormats/Associations/interface/TrackToGenParticleAssociatorBaseImpl.h b/SimDataFormats/Associations/interface/TrackToGenParticleAssociatorBaseImpl.h
index b6f0ec53eae19..4ba3f48a7fe32 100644
--- a/SimDataFormats/Associations/interface/TrackToGenParticleAssociatorBaseImpl.h
+++ b/SimDataFormats/Associations/interface/TrackToGenParticleAssociatorBaseImpl.h
@@ -7,57 +7,54 @@
  *  \author cerati, magni
  */
 
-#include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 #include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Track/interface/SimTrackContainer.h"
+#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
 #include "SimDataFormats/Associations/interface/TrackToGenParticleAssociatorBaseImpl.h"
 
-namespace reco{
-  typedef edm::AssociationMap<edm::OneToManyWithQualityGeneric
-    <reco::GenParticleCollection, edm::View<reco::Track>, double> >
-    GenToRecoCollection;  
-  typedef edm::AssociationMap<edm::OneToManyWithQualityGeneric 
-    <edm::View<reco::Track>, reco::GenParticleCollection, double> >
-    RecoToGenCollection;    
-
-  
-  
-  class TrackToGenParticleAssociatorBaseImpl  {
-    
+namespace reco {
+  typedef edm::AssociationMap<
+      edm::OneToManyWithQualityGeneric<reco::GenParticleCollection, edm::View<reco::Track>, double>>
+      GenToRecoCollection;
+  typedef edm::AssociationMap<
+      edm::OneToManyWithQualityGeneric<edm::View<reco::Track>, reco::GenParticleCollection, double>>
+      RecoToGenCollection;
+
+  class TrackToGenParticleAssociatorBaseImpl {
   public:
     /// Constructor
     TrackToGenParticleAssociatorBaseImpl();
     virtual ~TrackToGenParticleAssociatorBaseImpl();
-    
+
     /// Association Sim To Reco with Collections (Gen Particle version)
-    virtual reco::RecoToGenCollection associateRecoToGen(const edm::RefToBaseVector<reco::Track>& tracks,
-                                                         const edm::RefVector<reco::GenParticleCollection>& gens) const = 0;
-    
+    virtual reco::RecoToGenCollection associateRecoToGen(
+        const edm::RefToBaseVector<reco::Track> &tracks,
+        const edm::RefVector<reco::GenParticleCollection> &gens) const = 0;
+
     /// Association Sim To Reco with Collections (Gen Particle version)
-    virtual reco::GenToRecoCollection associateGenToReco(const edm::RefToBaseVector<reco::Track>& tracks,
-                                                         const edm::RefVector<reco::GenParticleCollection>& gens) const =0;
-    
-    
+    virtual reco::GenToRecoCollection associateGenToReco(
+        const edm::RefToBaseVector<reco::Track> &tracks,
+        const edm::RefVector<reco::GenParticleCollection> &gens) const = 0;
+
     /// compare reco to sim the handle of reco::Track and GenParticle collections
-    virtual reco::RecoToGenCollection associateRecoToGen(const edm::Handle<edm::View<reco::Track> >& tCH, 
-                                                         const edm::Handle<reco::GenParticleCollection>& tPCH) const = 0;
-    
+    virtual reco::RecoToGenCollection associateRecoToGen(
+        const edm::Handle<edm::View<reco::Track>> &tCH, const edm::Handle<reco::GenParticleCollection> &tPCH) const = 0;
+
     /// compare reco to sim the handle of reco::Track and GenParticle collections
-    virtual reco::GenToRecoCollection associateGenToReco(const edm::Handle<edm::View<reco::Track> >& tCH, 
-                                                         const edm::Handle<reco::GenParticleCollection>& tPCH) const = 0;
-    
-    
+    virtual reco::GenToRecoCollection associateGenToReco(
+        const edm::Handle<edm::View<reco::Track>> &tCH, const edm::Handle<reco::GenParticleCollection> &tPCH) const = 0;
+
   private:
-    TrackToGenParticleAssociatorBaseImpl(const TrackToGenParticleAssociatorBaseImpl&) = delete; // stop default
-    
-    const TrackToGenParticleAssociatorBaseImpl& operator=(const TrackToGenParticleAssociatorBaseImpl&) = delete; // stop default
-    
+    TrackToGenParticleAssociatorBaseImpl(const TrackToGenParticleAssociatorBaseImpl &) = delete;  // stop default
+
+    const TrackToGenParticleAssociatorBaseImpl &operator=(const TrackToGenParticleAssociatorBaseImpl &) =
+        delete;  // stop default
   };
-}
+}  // namespace reco
 
 #endif
diff --git a/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h b/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h
index 4287d890812ce..98364a9c8190c 100644
--- a/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h
+++ b/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h
@@ -4,8 +4,9 @@
 //
 // Package:     SimDataFormats/Associations
 // Class  :     TrackToTrackingParticleAssociator
-// 
-/**\class TrackToTrackingParticleAssociator TrackToTrackingParticleAssociator.h "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
+//
+/**\class TrackToTrackingParticleAssociator TrackToTrackingParticleAssociator.h
+ "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
 
  Description: Interface for accessing a Track to TrackingParticle associator
 
@@ -24,8 +25,8 @@
 // user include files
 #include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
 
-#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
 #include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h"
+#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
 
 #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociatorBaseImpl.h"
 
@@ -33,87 +34,88 @@
 
 namespace reco {
 
-  typedef edm::AssociationMap<edm::OneToManyWithQualityGeneric
-    <TrackingParticleCollection, edm::View<TrajectorySeed>, double> >
-    SimToRecoCollectionSeed;  
-  typedef edm::AssociationMap<edm::OneToManyWithQualityGeneric 
-    <edm::View<TrajectorySeed>, TrackingParticleCollection, double> >
-    RecoToSimCollectionSeed;  
-  
-  typedef edm::AssociationMap<edm::OneToManyWithQualityGeneric
-    <TrackingParticleCollection, TrackCandidateCollection, double> >
-    SimToRecoCollectionTCandidate;  
-  typedef edm::AssociationMap<edm::OneToManyWithQualityGeneric 
-    <TrajectorySeedCollection, TrackCandidateCollection, double> >
-    RecoToSimCollectionTCandidate;  
-
-  class TrackToTrackingParticleAssociator
-  {
-    
+  typedef edm::AssociationMap<
+      edm::OneToManyWithQualityGeneric<TrackingParticleCollection, edm::View<TrajectorySeed>, double>>
+      SimToRecoCollectionSeed;
+  typedef edm::AssociationMap<
+      edm::OneToManyWithQualityGeneric<edm::View<TrajectorySeed>, TrackingParticleCollection, double>>
+      RecoToSimCollectionSeed;
+
+  typedef edm::AssociationMap<
+      edm::OneToManyWithQualityGeneric<TrackingParticleCollection, TrackCandidateCollection, double>>
+      SimToRecoCollectionTCandidate;
+  typedef edm::AssociationMap<
+      edm::OneToManyWithQualityGeneric<TrajectorySeedCollection, TrackCandidateCollection, double>>
+      RecoToSimCollectionTCandidate;
+
+  class TrackToTrackingParticleAssociator {
   public:
-
 #ifndef __GCCXML__
-    TrackToTrackingParticleAssociator( std::unique_ptr<reco::TrackToTrackingParticleAssociatorBaseImpl>);
+    TrackToTrackingParticleAssociator(std::unique_ptr<reco::TrackToTrackingParticleAssociatorBaseImpl>);
 #endif
     TrackToTrackingParticleAssociator() = default;
-    TrackToTrackingParticleAssociator(TrackToTrackingParticleAssociator&&) = default;
-    TrackToTrackingParticleAssociator& operator=(TrackToTrackingParticleAssociator&&) = default;
+    TrackToTrackingParticleAssociator(TrackToTrackingParticleAssociator &&) = default;
+    TrackToTrackingParticleAssociator &operator=(TrackToTrackingParticleAssociator &&) = default;
     ~TrackToTrackingParticleAssociator() = default;
-    
+
     // ---------- const member functions ---------------------
-    /// compare reco to sim the handle of reco::Track and TrackingParticle collections
-    reco::RecoToSimCollection associateRecoToSim(const edm::Handle<edm::View<reco::Track> >& tCH, 
-                                                 const edm::Handle<TrackingParticleCollection>& tPCH ) const {
-      return m_impl->associateRecoToSim(tCH,tPCH);
+    /// compare reco to sim the handle of reco::Track and TrackingParticle
+    /// collections
+    reco::RecoToSimCollection associateRecoToSim(const edm::Handle<edm::View<reco::Track>> &tCH,
+                                                 const edm::Handle<TrackingParticleCollection> &tPCH) const {
+      return m_impl->associateRecoToSim(tCH, tPCH);
     }
-    
-    /// compare reco to sim the handle of reco::Track and TrackingParticle collections
-    reco::SimToRecoCollection associateSimToReco(const edm::Handle<edm::View<reco::Track> >& tCH, 
-                                                 const edm::Handle<TrackingParticleCollection>& tPCH ) const {
-      return m_impl->associateSimToReco(tCH,tPCH);
+
+    /// compare reco to sim the handle of reco::Track and TrackingParticle
+    /// collections
+    reco::SimToRecoCollection associateSimToReco(const edm::Handle<edm::View<reco::Track>> &tCH,
+                                                 const edm::Handle<TrackingParticleCollection> &tPCH) const {
+      return m_impl->associateSimToReco(tCH, tPCH);
     }
 
     /// Association Reco To Sim with Collections
-    reco::RecoToSimCollection associateRecoToSim(const edm::RefToBaseVector<reco::Track> & tc,
-                                                 const edm::RefVector<TrackingParticleCollection>& tpc) const {
-      return m_impl->associateRecoToSim(tc,tpc);
+    reco::RecoToSimCollection associateRecoToSim(const edm::RefToBaseVector<reco::Track> &tc,
+                                                 const edm::RefVector<TrackingParticleCollection> &tpc) const {
+      return m_impl->associateRecoToSim(tc, tpc);
     }
 
     /// Association Sim To Reco with Collections
-    reco::SimToRecoCollection associateSimToReco(const edm::RefToBaseVector<reco::Track> & tc,
-                                                 const edm::RefVector<TrackingParticleCollection>& tpc ) const {
-      return m_impl->associateSimToReco(tc,tpc);
+    reco::SimToRecoCollection associateSimToReco(const edm::RefToBaseVector<reco::Track> &tc,
+                                                 const edm::RefVector<TrackingParticleCollection> &tpc) const {
+      return m_impl->associateSimToReco(tc, tpc);
     }
 
-    //TrajectorySeed
-    reco::RecoToSimCollectionSeed associateRecoToSim(const edm::Handle<edm::View<TrajectorySeed> >& ts, 
-                                                     const edm::Handle<TrackingParticleCollection>& tpc) const {
+    // TrajectorySeed
+    reco::RecoToSimCollectionSeed associateRecoToSim(const edm::Handle<edm::View<TrajectorySeed>> &ts,
+                                                     const edm::Handle<TrackingParticleCollection> &tpc) const {
       return m_impl->associateRecoToSim(ts, tpc);
     }
 
-    reco::SimToRecoCollectionSeed associateSimToReco(const edm::Handle<edm::View<TrajectorySeed> >& ts, 
-                                                     const edm::Handle<TrackingParticleCollection>& tpc) const {
-      return m_impl->associateSimToReco(ts,tpc);
+    reco::SimToRecoCollectionSeed associateSimToReco(const edm::Handle<edm::View<TrajectorySeed>> &ts,
+                                                     const edm::Handle<TrackingParticleCollection> &tpc) const {
+      return m_impl->associateSimToReco(ts, tpc);
     }
 
-    //TrackCandidate
-    reco::RecoToSimCollectionTCandidate associateRecoToSim(const edm::Handle<TrackCandidateCollection>& tc, 
-                                                           const edm::Handle<TrackingParticleCollection>& tpc) const {
-      return m_impl->associateRecoToSim(tc,tpc);
+    // TrackCandidate
+    reco::RecoToSimCollectionTCandidate associateRecoToSim(const edm::Handle<TrackCandidateCollection> &tc,
+                                                           const edm::Handle<TrackingParticleCollection> &tpc) const {
+      return m_impl->associateRecoToSim(tc, tpc);
     }
-  
-    reco::SimToRecoCollectionTCandidate associateSimToReco(const edm::Handle<TrackCandidateCollection>& tc, 
-                                                           const edm::Handle<TrackingParticleCollection>& tpc) const {
-      return m_impl->associateSimToReco(tc,tpc);
+
+    reco::SimToRecoCollectionTCandidate associateSimToReco(const edm::Handle<TrackCandidateCollection> &tc,
+                                                           const edm::Handle<TrackingParticleCollection> &tpc) const {
+      return m_impl->associateSimToReco(tc, tpc);
     }
+
   private:
-    TrackToTrackingParticleAssociator(const TrackToTrackingParticleAssociator&) = delete; // stop default
-    
-    const TrackToTrackingParticleAssociator& operator=(const TrackToTrackingParticleAssociator&) = delete; // stop default
-    
+    TrackToTrackingParticleAssociator(const TrackToTrackingParticleAssociator &) = delete;  // stop default
+
+    const TrackToTrackingParticleAssociator &operator=(const TrackToTrackingParticleAssociator &) =
+        delete;  // stop default
+
     // ---------- member data --------------------------------
     std::unique_ptr<TrackToTrackingParticleAssociatorBaseImpl> m_impl;
   };
-}
+}  // namespace reco
 
 #endif
diff --git a/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociatorBaseImpl.h b/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociatorBaseImpl.h
index bc29d03c7703a..d18662f12bab6 100644
--- a/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociatorBaseImpl.h
+++ b/SimDataFormats/Associations/interface/TrackToTrackingParticleAssociatorBaseImpl.h
@@ -2,7 +2,9 @@
 #define SimDataFormats_Associations_TrackToTrackingParticleAssociatorBaseImpl_h
 
 /** \class TrackToTrackingParticleAssociatorBaseImpl
- *  Base class for TrackToTrackingParticleAssociators. Methods take as input the handle of Track and TrackingPArticle collections and return an AssociationMap (oneToManyWithQuality)
+ *  Base class for TrackToTrackingParticleAssociators. Methods take as input the
+ * handle of Track and TrackingPArticle collections and return an AssociationMap
+ * (oneToManyWithQuality)
  *
  *  \author magni, cerati
  */
@@ -10,62 +12,62 @@
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
 
-#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
 #include "DataFormats/TrackCandidate/interface/TrackCandidateCollection.h"
+#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
+
+namespace reco {
+  typedef edm::AssociationMap<
+      edm::OneToManyWithQualityGeneric<TrackingParticleCollection, edm::View<TrajectorySeed>, double>>
+      SimToRecoCollectionSeed;
+  typedef edm::AssociationMap<
+      edm::OneToManyWithQualityGeneric<edm::View<TrajectorySeed>, TrackingParticleCollection, double>>
+      RecoToSimCollectionSeed;
 
-namespace reco{
-  typedef edm::AssociationMap<edm::OneToManyWithQualityGeneric
-    <TrackingParticleCollection, edm::View<TrajectorySeed>, double> >
-    SimToRecoCollectionSeed;  
-  typedef edm::AssociationMap<edm::OneToManyWithQualityGeneric 
-    <edm::View<TrajectorySeed>, TrackingParticleCollection, double> >
-    RecoToSimCollectionSeed;  
-  
-  typedef edm::AssociationMap<edm::OneToManyWithQualityGeneric
-    <TrackingParticleCollection, TrackCandidateCollection, double> >
-    SimToRecoCollectionTCandidate;  
-  typedef edm::AssociationMap<edm::OneToManyWithQualityGeneric 
-    <TrajectorySeedCollection, TrackCandidateCollection, double> >
-    RecoToSimCollectionTCandidate;  
-  
+  typedef edm::AssociationMap<
+      edm::OneToManyWithQualityGeneric<TrackingParticleCollection, TrackCandidateCollection, double>>
+      SimToRecoCollectionTCandidate;
+  typedef edm::AssociationMap<
+      edm::OneToManyWithQualityGeneric<TrajectorySeedCollection, TrackCandidateCollection, double>>
+      RecoToSimCollectionTCandidate;
 
   class TrackToTrackingParticleAssociatorBaseImpl {
   public:
     /// Constructor
-    TrackToTrackingParticleAssociatorBaseImpl() ;
+    TrackToTrackingParticleAssociatorBaseImpl();
     /// Destructor
     virtual ~TrackToTrackingParticleAssociatorBaseImpl();
-    
-    
-    /// compare reco to sim the handle of reco::Track and TrackingParticle collections
-    virtual reco::RecoToSimCollection associateRecoToSim(const edm::Handle<edm::View<reco::Track> >& tCH, 
-                                                         const edm::Handle<TrackingParticleCollection>& tPCH) const;
-    
-    /// compare reco to sim the handle of reco::Track and TrackingParticle collections
-    virtual reco::SimToRecoCollection associateSimToReco(const edm::Handle<edm::View<reco::Track> >& tCH, 
-                                                         const edm::Handle<TrackingParticleCollection>& tPCH) const;
-    
+
+    /// compare reco to sim the handle of reco::Track and TrackingParticle
+    /// collections
+    virtual reco::RecoToSimCollection associateRecoToSim(const edm::Handle<edm::View<reco::Track>> &tCH,
+                                                         const edm::Handle<TrackingParticleCollection> &tPCH) const;
+
+    /// compare reco to sim the handle of reco::Track and TrackingParticle
+    /// collections
+    virtual reco::SimToRecoCollection associateSimToReco(const edm::Handle<edm::View<reco::Track>> &tCH,
+                                                         const edm::Handle<TrackingParticleCollection> &tPCH) const;
+
     /// Association Reco To Sim with Collections
-    virtual  reco::RecoToSimCollection associateRecoToSim(const edm::RefToBaseVector<reco::Track> & tc,
-                                                          const edm::RefVector<TrackingParticleCollection>& tpc ) const = 0;
+    virtual reco::RecoToSimCollection associateRecoToSim(
+        const edm::RefToBaseVector<reco::Track> &tc, const edm::RefVector<TrackingParticleCollection> &tpc) const = 0;
     /// Association Sim To Reco with Collections
-    virtual  reco::SimToRecoCollection associateSimToReco(const edm::RefToBaseVector<reco::Track> & tc,
-                                                          const edm::RefVector<TrackingParticleCollection>& tpc) const = 0;
-    
-    //TrajectorySeed
-    virtual reco::RecoToSimCollectionSeed associateRecoToSim(const edm::Handle<edm::View<TrajectorySeed> >&, 
-                                                             const edm::Handle<TrackingParticleCollection>& ) const;
-    
-    virtual reco::SimToRecoCollectionSeed associateSimToReco(const edm::Handle<edm::View<TrajectorySeed> >&, 
-                                                             const edm::Handle<TrackingParticleCollection>&) const;
-    
-    //TrackCandidate
-    virtual reco::RecoToSimCollectionTCandidate associateRecoToSim(const edm::Handle<TrackCandidateCollection>&, 
-                                                                   const edm::Handle<TrackingParticleCollection>&) const ;
+    virtual reco::SimToRecoCollection associateSimToReco(
+        const edm::RefToBaseVector<reco::Track> &tc, const edm::RefVector<TrackingParticleCollection> &tpc) const = 0;
+
+    // TrajectorySeed
+    virtual reco::RecoToSimCollectionSeed associateRecoToSim(const edm::Handle<edm::View<TrajectorySeed>> &,
+                                                             const edm::Handle<TrackingParticleCollection> &) const;
+
+    virtual reco::SimToRecoCollectionSeed associateSimToReco(const edm::Handle<edm::View<TrajectorySeed>> &,
+                                                             const edm::Handle<TrackingParticleCollection> &) const;
+
+    // TrackCandidate
+    virtual reco::RecoToSimCollectionTCandidate associateRecoToSim(
+        const edm::Handle<TrackCandidateCollection> &, const edm::Handle<TrackingParticleCollection> &) const;
 
-    virtual reco::SimToRecoCollectionTCandidate associateSimToReco(const edm::Handle<TrackCandidateCollection>&, 
-                                                                   const edm::Handle<TrackingParticleCollection>&) const;
+    virtual reco::SimToRecoCollectionTCandidate associateSimToReco(
+        const edm::Handle<TrackCandidateCollection> &, const edm::Handle<TrackingParticleCollection> &) const;
   };
-}
+}  // namespace reco
 
 #endif
diff --git a/SimDataFormats/Associations/interface/VertexAssociation.h b/SimDataFormats/Associations/interface/VertexAssociation.h
index fe8114294ba73..b0cc9aa9c37b1 100644
--- a/SimDataFormats/Associations/interface/VertexAssociation.h
+++ b/SimDataFormats/Associations/interface/VertexAssociation.h
@@ -1,17 +1,19 @@
 #ifndef SimDataFormats_Associations_VertexAssociation_h
 #define SimDataFormats_Associations_VertexAssociation_h
 
+#include "DataFormats/Common/interface/AssociationMap.h"
+#include "DataFormats/Common/interface/OneToManyWithQualityGeneric.h"
+#include "DataFormats/Common/interface/View.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertex.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertexContainer.h"
-#include "DataFormats/Common/interface/OneToManyWithQualityGeneric.h"
-#include "DataFormats/Common/interface/AssociationMap.h"
-#include "DataFormats/Common/interface/View.h"
 
-namespace reco{
-    typedef edm::AssociationMap<edm::OneToManyWithQuality <TrackingVertexCollection, edm::View<reco::Vertex>, double> > VertexSimToRecoCollection;
-    typedef edm::AssociationMap<edm::OneToManyWithQuality <edm::View<reco::Vertex>, TrackingVertexCollection, double> > VertexRecoToSimCollection;
-}
+namespace reco {
+  typedef edm::AssociationMap<edm::OneToManyWithQuality<TrackingVertexCollection, edm::View<reco::Vertex>, double>>
+      VertexSimToRecoCollection;
+  typedef edm::AssociationMap<edm::OneToManyWithQuality<edm::View<reco::Vertex>, TrackingVertexCollection, double>>
+      VertexRecoToSimCollection;
+}  // namespace reco
 
 #endif
diff --git a/SimDataFormats/Associations/interface/VertexToTrackingVertexAssociator.h b/SimDataFormats/Associations/interface/VertexToTrackingVertexAssociator.h
index 13eadb060e14e..0db0ec2889de8 100644
--- a/SimDataFormats/Associations/interface/VertexToTrackingVertexAssociator.h
+++ b/SimDataFormats/Associations/interface/VertexToTrackingVertexAssociator.h
@@ -8,35 +8,38 @@
 namespace reco {
   class VertexToTrackingVertexAssociator {
   public:
-
 #ifndef __GCCXML__
-    VertexToTrackingVertexAssociator( std::unique_ptr<reco::VertexToTrackingVertexAssociatorBaseImpl>);
+    VertexToTrackingVertexAssociator(std::unique_ptr<reco::VertexToTrackingVertexAssociatorBaseImpl>);
 #endif
     VertexToTrackingVertexAssociator() = default;
-    VertexToTrackingVertexAssociator(VertexToTrackingVertexAssociator&&) = default;
-    VertexToTrackingVertexAssociator& operator=(VertexToTrackingVertexAssociator&&) = default;
+    VertexToTrackingVertexAssociator(VertexToTrackingVertexAssociator &&) = default;
+    VertexToTrackingVertexAssociator &operator=(VertexToTrackingVertexAssociator &&) = default;
     ~VertexToTrackingVertexAssociator() = default;
 
     // ---------- const member functions ---------------------
-    /// compare reco to sim the handle of reco::Vertex and TrackingVertex collections
-    reco::VertexRecoToSimCollection associateRecoToSim(const edm::Handle<edm::View<reco::Vertex> >& vCH, 
-                                                       const edm::Handle<TrackingVertexCollection>& tVCH ) const {
-      return m_impl->associateRecoToSim(vCH,tVCH);
+    /// compare reco to sim the handle of reco::Vertex and TrackingVertex
+    /// collections
+    reco::VertexRecoToSimCollection associateRecoToSim(const edm::Handle<edm::View<reco::Vertex>> &vCH,
+                                                       const edm::Handle<TrackingVertexCollection> &tVCH) const {
+      return m_impl->associateRecoToSim(vCH, tVCH);
     }
 
-    /// compare reco to sim the handle of reco::Vertex and TrackingVertex collections
-    reco::VertexSimToRecoCollection associateSimToReco(const edm::Handle<edm::View<reco::Vertex> >& vCH, 
-                                                       const edm::Handle<TrackingVertexCollection>& tVCH ) const {
-      return m_impl->associateSimToReco(vCH,tVCH);
+    /// compare reco to sim the handle of reco::Vertex and TrackingVertex
+    /// collections
+    reco::VertexSimToRecoCollection associateSimToReco(const edm::Handle<edm::View<reco::Vertex>> &vCH,
+                                                       const edm::Handle<TrackingVertexCollection> &tVCH) const {
+      return m_impl->associateSimToReco(vCH, tVCH);
     }
+
   private:
-    VertexToTrackingVertexAssociator(const VertexToTrackingVertexAssociator&) = delete; // stop default
-    
-    const VertexToTrackingVertexAssociator& operator=(const VertexToTrackingVertexAssociator&) = delete; // stop default
-    
+    VertexToTrackingVertexAssociator(const VertexToTrackingVertexAssociator &) = delete;  // stop default
+
+    const VertexToTrackingVertexAssociator &operator=(const VertexToTrackingVertexAssociator &) =
+        delete;  // stop default
+
     // ---------- member data --------------------------------
     std::unique_ptr<VertexToTrackingVertexAssociatorBaseImpl> m_impl;
   };
-}
+}  // namespace reco
 
 #endif
diff --git a/SimDataFormats/Associations/interface/VertexToTrackingVertexAssociatorBaseImpl.h b/SimDataFormats/Associations/interface/VertexToTrackingVertexAssociatorBaseImpl.h
index 064d8c0226112..264500f45a11a 100644
--- a/SimDataFormats/Associations/interface/VertexToTrackingVertexAssociatorBaseImpl.h
+++ b/SimDataFormats/Associations/interface/VertexToTrackingVertexAssociatorBaseImpl.h
@@ -8,19 +8,20 @@ namespace reco {
   class VertexToTrackingVertexAssociatorBaseImpl {
   public:
     /// Constructor
-    VertexToTrackingVertexAssociatorBaseImpl() ;
+    VertexToTrackingVertexAssociatorBaseImpl();
     /// Destructor
     virtual ~VertexToTrackingVertexAssociatorBaseImpl();
 
+    /// compare reco to sim the handle of reco::Vertex and TrackingVertex
+    /// collections
+    virtual reco::VertexRecoToSimCollection associateRecoToSim(
+        const edm::Handle<edm::View<reco::Vertex>> &vCH, const edm::Handle<TrackingVertexCollection> &tVCH) const = 0;
 
-    /// compare reco to sim the handle of reco::Vertex and TrackingVertex collections
-    virtual reco::VertexRecoToSimCollection associateRecoToSim(const edm::Handle<edm::View<reco::Vertex> >& vCH, 
-                                                               const edm::Handle<TrackingVertexCollection>& tVCH) const = 0;
-
-    /// compare reco to sim the handle of reco::Vertex and TrackingVertex collections
-    virtual reco::VertexSimToRecoCollection associateSimToReco(const edm::Handle<edm::View<reco::Vertex> >& vCH, 
-                                                               const edm::Handle<TrackingVertexCollection>& tVCH) const = 0;
+    /// compare reco to sim the handle of reco::Vertex and TrackingVertex
+    /// collections
+    virtual reco::VertexSimToRecoCollection associateSimToReco(
+        const edm::Handle<edm::View<reco::Vertex>> &vCH, const edm::Handle<TrackingVertexCollection> &tVCH) const = 0;
   };
-}
+}  // namespace reco
 
 #endif
diff --git a/SimDataFormats/Associations/src/MuonToTrackingParticleAssociator.cc b/SimDataFormats/Associations/src/MuonToTrackingParticleAssociator.cc
index 1d8d24e67366b..7c0e30ba4af47 100644
--- a/SimDataFormats/Associations/src/MuonToTrackingParticleAssociator.cc
+++ b/SimDataFormats/Associations/src/MuonToTrackingParticleAssociator.cc
@@ -2,7 +2,7 @@
 //
 // Package:     SimDataFormats/Associations
 // Class  :     MuonToTrackingParticleAssociator
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -15,11 +15,9 @@
 // user include files
 #include "SimDataFormats/Associations/interface/MuonToTrackingParticleAssociator.h"
 
-
 //
 // constructors and destructor
 //
-reco::MuonToTrackingParticleAssociator::MuonToTrackingParticleAssociator(std::unique_ptr<MuonToTrackingParticleAssociatorBaseImpl> iImpl):
-  impl_(std::move(iImpl))
-{
-}
+reco::MuonToTrackingParticleAssociator::MuonToTrackingParticleAssociator(
+    std::unique_ptr<MuonToTrackingParticleAssociatorBaseImpl> iImpl)
+    : impl_(std::move(iImpl)) {}
diff --git a/SimDataFormats/Associations/src/MuonToTrackingParticleAssociatorBaseImpl.cc b/SimDataFormats/Associations/src/MuonToTrackingParticleAssociatorBaseImpl.cc
index 57504931fb69e..f665ad3cbbdf1 100644
--- a/SimDataFormats/Associations/src/MuonToTrackingParticleAssociatorBaseImpl.cc
+++ b/SimDataFormats/Associations/src/MuonToTrackingParticleAssociatorBaseImpl.cc
@@ -2,7 +2,7 @@
 //
 // Package:     SimDataFormats/Associations
 // Class  :     MuonToTrackingParticleAssociatorBaseImpl
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -15,7 +15,6 @@
 // user include files
 #include "SimDataFormats/Associations/interface/MuonToTrackingParticleAssociatorBaseImpl.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -27,11 +26,6 @@
 //
 // constructors and destructor
 //
-reco::MuonToTrackingParticleAssociatorBaseImpl::MuonToTrackingParticleAssociatorBaseImpl()
-{
-}
-
-reco::MuonToTrackingParticleAssociatorBaseImpl::~MuonToTrackingParticleAssociatorBaseImpl()
-{
-}
+reco::MuonToTrackingParticleAssociatorBaseImpl::MuonToTrackingParticleAssociatorBaseImpl() {}
 
+reco::MuonToTrackingParticleAssociatorBaseImpl::~MuonToTrackingParticleAssociatorBaseImpl() {}
diff --git a/SimDataFormats/Associations/src/TrackToGenParticleAssociator.cc b/SimDataFormats/Associations/src/TrackToGenParticleAssociator.cc
index 09c8ad9030a11..45ea0818567fe 100644
--- a/SimDataFormats/Associations/src/TrackToGenParticleAssociator.cc
+++ b/SimDataFormats/Associations/src/TrackToGenParticleAssociator.cc
@@ -2,7 +2,7 @@
 //
 // Package:     SimDataFormats/Associations
 // Class  :     TrackToGenParticleAssociator
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -15,7 +15,6 @@
 // user include files
 #include "SimDataFormats/Associations/interface/TrackToGenParticleAssociator.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -27,6 +26,6 @@
 //
 // constructors and destructor
 //
-reco::TrackToGenParticleAssociator::TrackToGenParticleAssociator(std::unique_ptr<TrackToGenParticleAssociatorBaseImpl> impl): m_impl(std::move(impl))
-{
-}
+reco::TrackToGenParticleAssociator::TrackToGenParticleAssociator(
+    std::unique_ptr<TrackToGenParticleAssociatorBaseImpl> impl)
+    : m_impl(std::move(impl)) {}
diff --git a/SimDataFormats/Associations/src/TrackToGenParticleAssociatorBaseImpl.cc b/SimDataFormats/Associations/src/TrackToGenParticleAssociatorBaseImpl.cc
index f97403729127f..8ece0808b1283 100644
--- a/SimDataFormats/Associations/src/TrackToGenParticleAssociatorBaseImpl.cc
+++ b/SimDataFormats/Associations/src/TrackToGenParticleAssociatorBaseImpl.cc
@@ -2,7 +2,7 @@
 //
 // Package:     SimDataFormats/Associations
 // Class  :     TrackToGenParticleAssociatorBaseImpl
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -15,7 +15,6 @@
 // user include files
 #include "SimDataFormats/Associations/interface/TrackToGenParticleAssociatorBaseImpl.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -27,10 +26,6 @@
 //
 // constructors and destructor
 //
-reco::TrackToGenParticleAssociatorBaseImpl::TrackToGenParticleAssociatorBaseImpl()
-{
-}
+reco::TrackToGenParticleAssociatorBaseImpl::TrackToGenParticleAssociatorBaseImpl() {}
 
-reco::TrackToGenParticleAssociatorBaseImpl::~TrackToGenParticleAssociatorBaseImpl()
-{
-}
+reco::TrackToGenParticleAssociatorBaseImpl::~TrackToGenParticleAssociatorBaseImpl() {}
diff --git a/SimDataFormats/Associations/src/TrackToTrackingParticleAssociator.cc b/SimDataFormats/Associations/src/TrackToTrackingParticleAssociator.cc
index 29a7f0a02a8de..7cde2ec93420e 100644
--- a/SimDataFormats/Associations/src/TrackToTrackingParticleAssociator.cc
+++ b/SimDataFormats/Associations/src/TrackToTrackingParticleAssociator.cc
@@ -2,7 +2,7 @@
 //
 // Package:     SimDataFormats/Associations
 // Class  :     TrackToTrackingParticleAssociator
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -15,7 +15,6 @@
 // user include files
 #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
 
-reco::TrackToTrackingParticleAssociator::TrackToTrackingParticleAssociator(std::unique_ptr<reco::TrackToTrackingParticleAssociatorBaseImpl> iImpl):
-  m_impl{std::move(iImpl)}
-{
-}
+reco::TrackToTrackingParticleAssociator::TrackToTrackingParticleAssociator(
+    std::unique_ptr<reco::TrackToTrackingParticleAssociatorBaseImpl> iImpl)
+    : m_impl{std::move(iImpl)} {}
diff --git a/SimDataFormats/Associations/src/TrackToTrackingParticleAssociatorBaseImpl.cc b/SimDataFormats/Associations/src/TrackToTrackingParticleAssociatorBaseImpl.cc
index e2dee4adc9fa7..8b4a23a8d65a6 100644
--- a/SimDataFormats/Associations/src/TrackToTrackingParticleAssociatorBaseImpl.cc
+++ b/SimDataFormats/Associations/src/TrackToTrackingParticleAssociatorBaseImpl.cc
@@ -2,7 +2,7 @@
 //
 // Package:     SimDataFormats/Associations
 // Class  :     TrackToTrackingParticleAssociatorBaseImpl
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -15,7 +15,6 @@
 // user include files
 #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociatorBaseImpl.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -27,78 +26,63 @@
 //
 // constructors and destructor
 //
-reco::TrackToTrackingParticleAssociatorBaseImpl::TrackToTrackingParticleAssociatorBaseImpl()
-{
-}
+reco::TrackToTrackingParticleAssociatorBaseImpl::TrackToTrackingParticleAssociatorBaseImpl() {}
 
-reco::TrackToTrackingParticleAssociatorBaseImpl::~TrackToTrackingParticleAssociatorBaseImpl()
-{
-}
+reco::TrackToTrackingParticleAssociatorBaseImpl::~TrackToTrackingParticleAssociatorBaseImpl() {}
 
 //
 // const member functions
 //
-reco::RecoToSimCollection 
-reco::TrackToTrackingParticleAssociatorBaseImpl::associateRecoToSim(const edm::Handle<edm::View<reco::Track> >& tCH, 
-                                                                    const edm::Handle<TrackingParticleCollection>& tPCH) const 
-{
+reco::RecoToSimCollection reco::TrackToTrackingParticleAssociatorBaseImpl::associateRecoToSim(
+    const edm::Handle<edm::View<reco::Track>> &tCH, const edm::Handle<TrackingParticleCollection> &tPCH) const {
   edm::RefToBaseVector<reco::Track> tc;
-  for (unsigned int j=0; j<tCH->size();j++)
+  for (unsigned int j = 0; j < tCH->size(); j++)
     tc.push_back(tCH->refAt(j));
-  
+
   edm::RefVector<TrackingParticleCollection> tpc(tPCH.id());
-  for (unsigned int j=0; j<tPCH->size();j++)
-    tpc.push_back(edm::Ref<TrackingParticleCollection>(tPCH,j));
-  
-  return associateRecoToSim(tc,tpc);
+  for (unsigned int j = 0; j < tPCH->size(); j++)
+    tpc.push_back(edm::Ref<TrackingParticleCollection>(tPCH, j));
+
+  return associateRecoToSim(tc, tpc);
 }
-    
-/// compare reco to sim the handle of reco::Track and TrackingParticle collections
-reco::SimToRecoCollection 
-reco::TrackToTrackingParticleAssociatorBaseImpl::associateSimToReco(const edm::Handle<edm::View<reco::Track> >& tCH, 
-                                                                    const edm::Handle<TrackingParticleCollection>& tPCH) const 
-{
+
+/// compare reco to sim the handle of reco::Track and TrackingParticle
+/// collections
+reco::SimToRecoCollection reco::TrackToTrackingParticleAssociatorBaseImpl::associateSimToReco(
+    const edm::Handle<edm::View<reco::Track>> &tCH, const edm::Handle<TrackingParticleCollection> &tPCH) const {
   edm::RefToBaseVector<reco::Track> tc;
-  for (unsigned int j=0; j<tCH->size();j++)
+  for (unsigned int j = 0; j < tCH->size(); j++)
     tc.push_back(tCH->refAt(j));
-  
+
   edm::RefVector<TrackingParticleCollection> tpc(tPCH.id());
-  for (unsigned int j=0; j<tPCH->size();j++)
-    tpc.push_back(edm::Ref<TrackingParticleCollection>(tPCH,j));
-  
-  return associateSimToReco(tc,tpc);
-}  
-        
-//TrajectorySeed
-reco::RecoToSimCollectionSeed 
-reco::TrackToTrackingParticleAssociatorBaseImpl::associateRecoToSim(const edm::Handle<edm::View<TrajectorySeed> >&, 
-                                                                    const edm::Handle<TrackingParticleCollection>& ) const
-{
+  for (unsigned int j = 0; j < tPCH->size(); j++)
+    tpc.push_back(edm::Ref<TrackingParticleCollection>(tPCH, j));
+
+  return associateSimToReco(tc, tpc);
+}
+
+// TrajectorySeed
+reco::RecoToSimCollectionSeed reco::TrackToTrackingParticleAssociatorBaseImpl::associateRecoToSim(
+    const edm::Handle<edm::View<TrajectorySeed>> &, const edm::Handle<TrackingParticleCollection> &) const {
   reco::RecoToSimCollectionSeed empty;
   return empty;
 }
-    
-reco::SimToRecoCollectionSeed 
-reco::TrackToTrackingParticleAssociatorBaseImpl::associateSimToReco(const edm::Handle<edm::View<TrajectorySeed> >&, 
-                                                                    const edm::Handle<TrackingParticleCollection>&) const
-{
+
+reco::SimToRecoCollectionSeed reco::TrackToTrackingParticleAssociatorBaseImpl::associateSimToReco(
+    const edm::Handle<edm::View<TrajectorySeed>> &, const edm::Handle<TrackingParticleCollection> &) const {
   reco::SimToRecoCollectionSeed empty;
   return empty;
 }
-    
-    //TrackCandidate
-reco::RecoToSimCollectionTCandidate 
-reco::TrackToTrackingParticleAssociatorBaseImpl::associateRecoToSim(const edm::Handle<TrackCandidateCollection>&, 
-                                                                    const edm::Handle<TrackingParticleCollection>&) const
-{
+
+// TrackCandidate
+reco::RecoToSimCollectionTCandidate reco::TrackToTrackingParticleAssociatorBaseImpl::associateRecoToSim(
+    const edm::Handle<TrackCandidateCollection> &, const edm::Handle<TrackingParticleCollection> &) const {
   reco::RecoToSimCollectionTCandidate empty;
   return empty;
 }
-    
-reco::SimToRecoCollectionTCandidate 
-reco::TrackToTrackingParticleAssociatorBaseImpl::associateSimToReco(const edm::Handle<TrackCandidateCollection>&, 
-                                                                    const edm::Handle<TrackingParticleCollection>&) const
-{
+
+reco::SimToRecoCollectionTCandidate reco::TrackToTrackingParticleAssociatorBaseImpl::associateSimToReco(
+    const edm::Handle<TrackCandidateCollection> &, const edm::Handle<TrackingParticleCollection> &) const {
   reco::SimToRecoCollectionTCandidate empty;
   return empty;
 }
diff --git a/SimDataFormats/Associations/src/VertexToTrackingVertexAssociator.cc b/SimDataFormats/Associations/src/VertexToTrackingVertexAssociator.cc
index ab34317b91a24..a3c381f4075ab 100644
--- a/SimDataFormats/Associations/src/VertexToTrackingVertexAssociator.cc
+++ b/SimDataFormats/Associations/src/VertexToTrackingVertexAssociator.cc
@@ -1,5 +1,5 @@
 #include "SimDataFormats/Associations/interface/VertexToTrackingVertexAssociator.h"
 
-reco::VertexToTrackingVertexAssociator::VertexToTrackingVertexAssociator(std::unique_ptr<reco::VertexToTrackingVertexAssociatorBaseImpl> iImpl):
-  m_impl{std::move(iImpl)}
-{}
+reco::VertexToTrackingVertexAssociator::VertexToTrackingVertexAssociator(
+    std::unique_ptr<reco::VertexToTrackingVertexAssociatorBaseImpl> iImpl)
+    : m_impl{std::move(iImpl)} {}
diff --git a/SimDataFormats/Associations/src/classes.h b/SimDataFormats/Associations/src/classes.h
index b59437edd3a4e..509321977d5be 100644
--- a/SimDataFormats/Associations/src/classes.h
+++ b/SimDataFormats/Associations/src/classes.h
@@ -1,27 +1,27 @@
 #include "DataFormats/Common/interface/Wrapper.h"
 
-//Add includes for your classes here
-#include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
-#include "SimDataFormats/Associations/interface/TrackToGenParticleAssociator.h"
+// Add includes for your classes here
 #include "SimDataFormats/Associations/interface/MuonToTrackingParticleAssociator.h"
-#include "SimDataFormats/Associations/interface/VertexToTrackingVertexAssociator.h"
+#include "SimDataFormats/Associations/interface/TrackToGenParticleAssociator.h"
+#include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
 #include "SimDataFormats/Associations/interface/VertexAssociation.h"
+#include "SimDataFormats/Associations/interface/VertexToTrackingVertexAssociator.h"
 
 namespace SimDataFormats_Associations {
-   struct SimDataFormats_Associations {
-      //add 'dummy' Wrapper variable for each class type you put into the Event
-      edm::Wrapper<reco::TrackToTrackingParticleAssociator> dummy1;
-      edm::Wrapper<reco::TrackToGenParticleAssociator> dummy2;
-      edm::Wrapper<reco::MuonToTrackingParticleAssociator> dummy3;
+  struct SimDataFormats_Associations {
+    // add 'dummy' Wrapper variable for each class type you put into the Event
+    edm::Wrapper<reco::TrackToTrackingParticleAssociator> dummy1;
+    edm::Wrapper<reco::TrackToGenParticleAssociator> dummy2;
+    edm::Wrapper<reco::MuonToTrackingParticleAssociator> dummy3;
 
-      edm::Wrapper<reco::VertexToTrackingVertexAssociator> dummy4;
+    edm::Wrapper<reco::VertexToTrackingVertexAssociator> dummy4;
 
-     reco::VertexSimToRecoCollection vstrc;
-     reco::VertexSimToRecoCollection::const_iterator vstrci;
-     edm::Wrapper<reco::VertexSimToRecoCollection > wvstrc;
+    reco::VertexSimToRecoCollection vstrc;
+    reco::VertexSimToRecoCollection::const_iterator vstrci;
+    edm::Wrapper<reco::VertexSimToRecoCollection> wvstrc;
 
-     reco::VertexRecoToSimCollection vrtsc;
-     reco::VertexRecoToSimCollection::const_iterator  vrtsci;
-     edm::Wrapper<reco::VertexRecoToSimCollection > wvrtsci;
-   };
-}
+    reco::VertexRecoToSimCollection vrtsc;
+    reco::VertexRecoToSimCollection::const_iterator vrtsci;
+    edm::Wrapper<reco::VertexRecoToSimCollection> wvrtsci;
+  };
+}  // namespace SimDataFormats_Associations
diff --git a/SimDataFormats/CaloAnalysis/interface/CaloParticle.h b/SimDataFormats/CaloAnalysis/interface/CaloParticle.h
index 0b7e2bd20b14e..2549634143279 100644
--- a/SimDataFormats/CaloAnalysis/interface/CaloParticle.h
+++ b/SimDataFormats/CaloAnalysis/interface/CaloParticle.h
@@ -1,237 +1,207 @@
 #ifndef SimDataFormats_CaloParticle_h
 #define SimDataFormats_CaloParticle_h
 
-#include <vector>
-#include "SimDataFormats/Track/interface/SimTrack.h"
-#include "SimDataFormats/CaloHit/interface/PCaloHit.h"
+#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 #include "DataFormats/Math/interface/Point3D.h"
 #include "DataFormats/Math/interface/Vector3D.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
-#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "SimDataFormats/CaloAnalysis/interface/SimClusterFwd.h"
+#include "SimDataFormats/CaloHit/interface/PCaloHit.h"
+#include "SimDataFormats/Track/interface/SimTrack.h"
+#include <vector>
 
 class SimTrack;
 class EncodedEventId;
 
-class CaloParticle
-{
-    friend std::ostream& operator<< (std::ostream& s, CaloParticle const& tp);
-public:
-    typedef int Charge; ///< electric charge type
-    typedef math::XYZTLorentzVectorD LorentzVector; ///< Lorentz vector
-    typedef math::PtEtaPhiMLorentzVector PolarLorentzVector; ///< Lorentz vector
-    typedef math::XYZPointD Point; ///< point in the space
-    typedef math::XYZVectorD Vector; ///< point in the space
-
-    /// reference to reco::GenParticle
-    typedef reco::GenParticleRefVector::iterator   genp_iterator;
-    typedef std::vector<SimTrack>::const_iterator  g4t_iterator;
-    typedef SimClusterRefVector::iterator  sc_iterator;
-
-    CaloParticle();
-
-    CaloParticle( const SimTrack& simtrk );
-    CaloParticle( EncodedEventId eventID, uint32_t particleID ); // for PU
-
-    // destructor
-    ~CaloParticle();
-
-    /** @brief PDG ID.
-     *
-     * Returns the PDG ID of the first associated gen particle. If there are no gen particles associated
-     * then it returns type() from the first SimTrack. */
-    int pdgId() const {
-      if( genParticles_.empty() ) return g4Tracks_[0].type();
-      else return (*genParticles_.begin())->pdgId();
-    }
+class CaloParticle {
+  friend std::ostream &operator<<(std::ostream &s, CaloParticle const &tp);
 
-    /** @brief Signal source, crossing number.
-     *
-     * Note this is taken from the first SimTrack only, but there shouldn't be any SimTracks from different
-     * crossings in the CaloParticle. */
-    EncodedEventId eventId() const {
-      return event_;
-    }
-
-    uint64_t particleId() const {
-      return particleId_;
-    }
-
-    // Setters for G4 and reco::GenParticle
-    void addGenParticle( const reco::GenParticleRef& ref) { genParticles_.push_back( ref ); }
-    void addSimCluster( const SimClusterRef& ref) { simClusters_.push_back( ref ); }
-    void addG4Track( const SimTrack& t) { g4Tracks_.push_back(t); }
-    /// iterators
-    genp_iterator genParticle_begin() const { return genParticles_.begin(); }
-    genp_iterator genParticle_end()   const { return genParticles_.end(); }
-    g4t_iterator g4Track_begin() const { return g4Tracks_.begin(); } 
-    g4t_iterator g4Track_end()   const { return g4Tracks_.end(); }
-    sc_iterator simCluster_begin() const { return simClusters_.begin(); }
-    sc_iterator simCluster_end()   const { return simClusters_.end(); }
-
-    // Getters for Embd and Sim Tracks
-    const reco::GenParticleRefVector& genParticles() const { return genParticles_; }
-    const SimClusterRefVector& simClusters() const { return simClusters_; }
-    // Only for clusters from the signal vertex
-    const std::vector<SimTrack>& g4Tracks() const { return g4Tracks_; }
-
-    void clearSimClusters() { simClusters_.clear(); }
-
-    /// @brief Electric charge. Note this is taken from the first SimTrack only.
-    float charge() const { return g4Tracks_[0].charge(); }
-    /// Gives charge in unit of quark charge (should be 3 times "charge()")
-    int threeCharge() const { return lrintf(3.f*charge()); }
-
-    /// @brief Four-momentum Lorentz vector. Note this is taken from the first SimTrack only.
-    const math::XYZTLorentzVectorF& p4() const {
-      return theMomentum_;
-    }
-
-    /// @brief spatial momentum vector
-    math::XYZVectorF momentum() const {
-      return p4().Vect();
-    }
-
-    /// @brief Vector to boost to the particle centre of mass frame.
-    math::XYZVectorF boostToCM() const {
-      return p4().BoostToCM();
-    }
-
-    /// @brief Magnitude of momentum vector. Note this is taken from the first SimTrack only.
-    float p() const {
-      return p4().P();
-    }
+public:
+  typedef int Charge;                                       ///< electric charge type
+  typedef math::XYZTLorentzVectorD LorentzVector;           ///< Lorentz vector
+  typedef math::PtEtaPhiMLorentzVector PolarLorentzVector;  ///< Lorentz vector
+  typedef math::XYZPointD Point;                            ///< point in the space
+  typedef math::XYZVectorD Vector;                          ///< point in the space
+
+  /// reference to reco::GenParticle
+  typedef reco::GenParticleRefVector::iterator genp_iterator;
+  typedef std::vector<SimTrack>::const_iterator g4t_iterator;
+  typedef SimClusterRefVector::iterator sc_iterator;
+
+  CaloParticle();
+
+  CaloParticle(const SimTrack &simtrk);
+  CaloParticle(EncodedEventId eventID, uint32_t particleID);  // for PU
+
+  // destructor
+  ~CaloParticle();
+
+  /** @brief PDG ID.
+   *
+   * Returns the PDG ID of the first associated gen particle. If there are no
+   * gen particles associated then it returns type() from the first SimTrack. */
+  int pdgId() const {
+    if (genParticles_.empty())
+      return g4Tracks_[0].type();
+    else
+      return (*genParticles_.begin())->pdgId();
+  }
+
+  /** @brief Signal source, crossing number.
+   *
+   * Note this is taken from the first SimTrack only, but there shouldn't be any
+   * SimTracks from different crossings in the CaloParticle. */
+  EncodedEventId eventId() const { return event_; }
+
+  uint64_t particleId() const { return particleId_; }
+
+  // Setters for G4 and reco::GenParticle
+  void addGenParticle(const reco::GenParticleRef &ref) { genParticles_.push_back(ref); }
+  void addSimCluster(const SimClusterRef &ref) { simClusters_.push_back(ref); }
+  void addG4Track(const SimTrack &t) { g4Tracks_.push_back(t); }
+  /// iterators
+  genp_iterator genParticle_begin() const { return genParticles_.begin(); }
+  genp_iterator genParticle_end() const { return genParticles_.end(); }
+  g4t_iterator g4Track_begin() const { return g4Tracks_.begin(); }
+  g4t_iterator g4Track_end() const { return g4Tracks_.end(); }
+  sc_iterator simCluster_begin() const { return simClusters_.begin(); }
+  sc_iterator simCluster_end() const { return simClusters_.end(); }
+
+  // Getters for Embd and Sim Tracks
+  const reco::GenParticleRefVector &genParticles() const { return genParticles_; }
+  const SimClusterRefVector &simClusters() const { return simClusters_; }
+  // Only for clusters from the signal vertex
+  const std::vector<SimTrack> &g4Tracks() const { return g4Tracks_; }
+
+  void clearSimClusters() { simClusters_.clear(); }
+
+  /// @brief Electric charge. Note this is taken from the first SimTrack only.
+  float charge() const { return g4Tracks_[0].charge(); }
+  /// Gives charge in unit of quark charge (should be 3 times "charge()")
+  int threeCharge() const { return lrintf(3.f * charge()); }
+
+  /// @brief Four-momentum Lorentz vector. Note this is taken from the first
+  /// SimTrack only.
+  const math::XYZTLorentzVectorF &p4() const { return theMomentum_; }
+
+  /// @brief spatial momentum vector
+  math::XYZVectorF momentum() const { return p4().Vect(); }
+
+  /// @brief Vector to boost to the particle centre of mass frame.
+  math::XYZVectorF boostToCM() const { return p4().BoostToCM(); }
+
+  /// @brief Magnitude of momentum vector. Note this is taken from the first
+  /// SimTrack only.
+  float p() const { return p4().P(); }
+
+  /// @brief Energy. Note this is taken from the first SimTrack only.
+  float energy() const { return p4().E(); }
+
+  /// @brief Transverse energy. Note this is taken from the first SimTrack only.
+  float et() const { return p4().Et(); }
+
+  /// @brief Mass. Note this is taken from the first SimTrack only.
+  float mass() const { return p4().M(); }
+
+  /// @brief Mass squared. Note this is taken from the first SimTrack only.
+  float massSqr() const { return pow(mass(), 2); }
+
+  /// @brief Transverse mass. Note this is taken from the first SimTrack only.
+  float mt() const { return p4().Mt(); }
+
+  /// @brief Transverse mass squared. Note this is taken from the first SimTrack
+  /// only.
+  float mtSqr() const { return p4().Mt2(); }
+
+  /// @brief x coordinate of momentum vector. Note this is taken from the first
+  /// SimTrack only.
+  float px() const { return p4().Px(); }
+
+  /// @brief y coordinate of momentum vector. Note this is taken from the first
+  /// SimTrack only.
+  float py() const { return p4().Py(); }
 
-    /// @brief Energy. Note this is taken from the first SimTrack only.
-    float energy() const {
-      return p4().E();
-    }
+  /// @brief z coordinate of momentum vector. Note this is taken from the first
+  /// SimTrack only.
+  float pz() const { return p4().Pz(); }
 
-    /// @brief Transverse energy. Note this is taken from the first SimTrack only.
-    float et() const {
-      return p4().Et();
-    }
+  /// @brief Transverse momentum. Note this is taken from the first SimTrack
+  /// only.
+  float pt() const { return p4().Pt(); }
 
-    /// @brief Mass. Note this is taken from the first SimTrack only.
-    float mass() const {
-      return p4().M();
-    }
+  /// @brief Momentum azimuthal angle. Note this is taken from the first
+  /// SimTrack only.
+  float phi() const { return p4().Phi(); }
 
-    /// @brief Mass squared. Note this is taken from the first SimTrack only.
-    float massSqr() const {
-      return pow( mass(), 2 );
-    }
+  /// @brief Momentum polar angle. Note this is taken from the first SimTrack
+  /// only.
+  float theta() const { return p4().Theta(); }
+
+  /// @brief Momentum pseudorapidity. Note this is taken from the simtrack
+  /// before the calorimeter
+  float eta() const { return p4().Eta(); }
 
-    /// @brief Transverse mass. Note this is taken from the first SimTrack only.
-    float mt() const {
-      return p4().Mt();
-    }
+  /// @brief Rapidity. Note this is taken from the simtrack before the
+  /// calorimeter
+  float rapidity() const { return p4().Rapidity(); }
 
-    /// @brief Transverse mass squared. Note this is taken from the first SimTrack only.
-    float mtSqr() const {
-      return p4().Mt2();
-    }
-
-    /// @brief x coordinate of momentum vector. Note this is taken from the first SimTrack only.
-    float px() const {
-      return p4().Px();
-    }
-
-    /// @brief y coordinate of momentum vector. Note this is taken from the first SimTrack only.
-    float py() const {
-      return p4().Py();
-    }
+  /// @brief Same as rapidity().
+  float y() const { return rapidity(); }
 
-    /// @brief z coordinate of momentum vector. Note this is taken from the first SimTrack only.
-    float pz() const {
-      return p4().Pz();
-    }
+  /** @brief Status word.
+   *
+   * Returns status() from the first gen particle, or -99 if there are no gen
+   * particles attached. */
+  int status() const { return genParticles_.empty() ? -99 : (*genParticles_[0]).status(); }
 
-    /// @brief Transverse momentum. Note this is taken from the first SimTrack only.
-    float pt() const {
-      return p4().Pt();
-    }
+  static const unsigned int longLivedTag;  ///< long lived flag
 
-    /// @brief Momentum azimuthal angle. Note this is taken from the first SimTrack only.
-    float phi() const {
-      return p4().Phi();
-    }
+  /// is long lived?
+  bool longLived() const { return status() & longLivedTag; }
 
-    /// @brief Momentum polar angle. Note this is taken from the first SimTrack only.
-    float theta() const {
-      return p4().Theta();
-    }
+  /** @brief Gives the total number of SimHits, in the cluster */
+  int numberOfSimHits() const { return nsimhits_; }
 
-    /// @brief Momentum pseudorapidity. Note this is taken from the simtrack before the calorimeter
-    float eta() const {
-      return p4().Eta();
-    }
+  /** @brief Gives the total number of SimHits, in the cluster */
+  int numberOfRecHits() const { return hits_.size(); }
 
-    /// @brief Rapidity. Note this is taken from the simtrack before the calorimeter
-    float rapidity() const {
-      return p4().Rapidity();
-    }
+  /** @brief add rechit with fraction */
+  void addRecHitAndFraction(uint32_t hit, float fraction) {
+    hits_.emplace_back(hit);
+    fractions_.emplace_back(fraction);
+  }
 
-    /// @brief Same as rapidity().
-    float y() const {
-      return rapidity();
+  /** @brief Returns list of rechit IDs and fractions for this CaloParticle */
+  std::vector<std::pair<uint32_t, float>> hits_and_fractions() const {
+    std::vector<std::pair<uint32_t, float>> result;
+    for (size_t i = 0; i < hits_.size(); ++i) {
+      result.emplace_back(hits_[i], fractions_[i]);
     }
+    return result;
+  }
 
-    /** @brief Status word.
-     *
-     * Returns status() from the first gen particle, or -99 if there are no gen particles attached. */
-    int status() const {
-      return genParticles_.empty() ? -99 : (*genParticles_[0]).status();
-    }
+  /** @brief returns the accumulated sim energy in the cluster */
+  float simEnergy() const { return simhit_energy_; }
 
-    static const unsigned int longLivedTag; ///< long lived flag
+  /** @brief add simhit's energy to cluster */
+  void addSimHit(const PCaloHit &hit) { simhit_energy_ += hit.energy(); }
 
-    /// is long lived?
-    bool longLived() const { return status()&longLivedTag;}
+private:
+  uint64_t nsimhits_;
+  EncodedEventId event_;
 
-    /** @brief Gives the total number of SimHits, in the cluster */
-    int numberOfSimHits() const {return nsimhits_;}
-    
-    /** @brief Gives the total number of SimHits, in the cluster */
-    int numberOfRecHits() const {return hits_.size();}
+  uint32_t particleId_;
+  float simhit_energy_;
+  std::vector<uint32_t> hits_;
+  std::vector<float> fractions_;
 
-    /** @brief add rechit with fraction */
-    void addRecHitAndFraction(uint32_t hit, float fraction) {
-      hits_.emplace_back(hit);
-      fractions_.emplace_back(fraction);
-    }
+  math::XYZTLorentzVectorF theMomentum_;
 
-    /** @brief Returns list of rechit IDs and fractions for this CaloParticle */
-    std::vector<std::pair<uint32_t,float> > hits_and_fractions() const {
-      std::vector<std::pair<uint32_t,float> > result;
-      for(size_t i = 0; i < hits_.size(); ++i) { 
-        result.emplace_back(hits_[i],fractions_[i]);
-      }
-      return result;
-    }
-   
-    /** @brief returns the accumulated sim energy in the cluster */
-    float simEnergy() const { return simhit_energy_; }
+  /// references to G4 and reco::GenParticle tracks
+  std::vector<SimTrack> g4Tracks_;
+  reco::GenParticleRefVector genParticles_;
 
-    /** @brief add simhit's energy to cluster */
-    void addSimHit(const PCaloHit& hit) { simhit_energy_ += hit.energy(); }
-    
-private:
-    uint64_t nsimhits_;
-    EncodedEventId event_;
-    
-    uint32_t particleId_; 
-    float simhit_energy_;
-    std::vector<uint32_t> hits_;
-    std::vector<float> fractions_;
-    
-    math::XYZTLorentzVectorF theMomentum_;
-    
-    /// references to G4 and reco::GenParticle tracks
-    std::vector<SimTrack> g4Tracks_;
-    reco::GenParticleRefVector genParticles_;
-
-    SimClusterRefVector simClusters_;
+  SimClusterRefVector simClusters_;
 };
 
-#endif // SimDataFormats_CaloParticle_H
+#endif  // SimDataFormats_CaloParticle_H
diff --git a/SimDataFormats/CaloAnalysis/interface/CaloParticleFwd.h b/SimDataFormats/CaloAnalysis/interface/CaloParticleFwd.h
index 27f171aaeccf2..96f9dbaf7a767 100644
--- a/SimDataFormats/CaloAnalysis/interface/CaloParticleFwd.h
+++ b/SimDataFormats/CaloAnalysis/interface/CaloParticleFwd.h
@@ -1,9 +1,9 @@
 #ifndef CaloAnalysis_CaloParticleFwd_h
 #define CaloAnalysis_CaloParticleFwd_h
-#include <vector>
 #include "DataFormats/Common/interface/Ref.h"
-#include "DataFormats/Common/interface/RefVector.h"
 #include "DataFormats/Common/interface/RefProd.h"
+#include "DataFormats/Common/interface/RefVector.h"
+#include <vector>
 
 class CaloParticle;
 typedef std::vector<CaloParticle> CaloParticleCollection;
@@ -12,6 +12,6 @@ typedef edm::RefVector<CaloParticleCollection> CaloParticleRefVector;
 typedef edm::RefProd<CaloParticleCollection> CaloParticleRefProd;
 typedef edm::RefVector<CaloParticleCollection> CaloParticleContainer;
 
-std::ostream& operator<< (std::ostream& s, CaloParticle const & tp);
+std::ostream &operator<<(std::ostream &s, CaloParticle const &tp);
 
 #endif
diff --git a/SimDataFormats/CaloAnalysis/interface/SimCluster.h b/SimDataFormats/CaloAnalysis/interface/SimCluster.h
index 0232532b91fea..09433efb7a06d 100644
--- a/SimDataFormats/CaloAnalysis/interface/SimCluster.h
+++ b/SimDataFormats/CaloAnalysis/interface/SimCluster.h
@@ -1,13 +1,13 @@
 #ifndef SimDataFormats_SimCluster_h
 #define SimDataFormats_SimCluster_h
 
-#include <vector>
-#include "SimDataFormats/Track/interface/SimTrack.h"
-#include "SimDataFormats/CaloHit/interface/PCaloHit.h"
+#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 #include "DataFormats/Math/interface/Point3D.h"
 #include "DataFormats/Math/interface/Vector3D.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
-#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
+#include "SimDataFormats/CaloHit/interface/PCaloHit.h"
+#include "SimDataFormats/Track/interface/SimTrack.h"
+#include <vector>
 
 //
 // Forward declarations
@@ -17,231 +17,201 @@ class EncodedEventId;
 
 /** @brief Monte Carlo truth information used for tracking validation.
  *
- * Object with references to the original SimTrack and parent and daughter TrackingVertices.
- * Simulation with high (~100) pileup was taking too much memory so the class was slimmed down
- * and copies of the SimHits were removed.
+ * Object with references to the original SimTrack and parent and daughter
+ * TrackingVertices. Simulation with high (~100) pileup was taking too much
+ * memory so the class was slimmed down and copies of the SimHits were removed.
  *
- * @author original author unknown, re-engineering and slimming by Subir Sarkar (subir.sarkar@cern.ch),
- * some tweaking and documentation by Mark Grimes (mark.grimes@bristol.ac.uk).
+ * @author original author unknown, re-engineering and slimming by Subir Sarkar
+ * (subir.sarkar@cern.ch), some tweaking and documentation by Mark Grimes
+ * (mark.grimes@bristol.ac.uk).
  * @date original date unknown, re-engineering Jan-May 2013
  */
-class SimCluster
-{
-    friend std::ostream& operator<< (std::ostream& s, SimCluster const& tp);
-public:
-    typedef int Charge; ///< electric charge type
-    typedef math::XYZTLorentzVectorD LorentzVector; ///< Lorentz vector
-    typedef math::PtEtaPhiMLorentzVector PolarLorentzVector; ///< Lorentz vector
-    typedef math::XYZPointD Point; ///< point in the space
-    typedef math::XYZVectorD Vector; ///< point in the space
-
-    /// reference to reco::GenParticle
-    typedef reco::GenParticleRefVector::iterator   genp_iterator;
-    typedef std::vector<SimTrack>::const_iterator  g4t_iterator;
-
-    SimCluster();
-
-    SimCluster( const SimTrack& simtrk );
-    SimCluster( EncodedEventId eventID, uint32_t particleID ); // for PU
-
-    // destructor
-    ~SimCluster();
-
-    /** @brief PDG ID.
-     *
-     * Returns the PDG ID of the first associated gen particle. If there are no gen particles associated
-     * then it returns type() from the first SimTrack. */
-    int pdgId() const {
-      if( genParticles_.empty() ) return g4Tracks_[0].type();
-      else return (*genParticles_.begin())->pdgId();
-    }
-
-    /** @brief Signal source, crossing number.
-     *
-     * Note this is taken from the first SimTrack only, but there shouldn't be any SimTracks from different
-     * crossings in the SimCluster. */
-    EncodedEventId eventId() const {
-      return event_;
-    }
-
-    uint64_t particleId() const {
-      return particleId_;
-    }
-
-    // Setters for G4 and reco::GenParticle
-    void addGenParticle( const reco::GenParticleRef& ref) { genParticles_.push_back( ref ); }
-    void addG4Track( const SimTrack& t) { g4Tracks_.push_back(t); }
-    /// iterators
-    genp_iterator genParticle_begin() const { return genParticles_.begin(); }
-    genp_iterator genParticle_end()   const { return genParticles_.end(); }
-    g4t_iterator g4Track_begin() const { return g4Tracks_.begin(); } 
-    g4t_iterator g4Track_end()   const { return g4Tracks_.end(); }
-    
-    // Getters for Embd and Sim Tracks
-    const reco::GenParticleRefVector& genParticles() const { return genParticles_; }
-    // Only for clusters from the signal vertex
-    const std::vector<SimTrack>& g4Tracks() const { return g4Tracks_; }
-    
-    /// @brief Electric charge. Note this is taken from the first SimTrack only.
-    float charge() const { return g4Tracks_[0].charge(); }
-    /// Gives charge in unit of quark charge (should be 3 times "charge()")
-    int threeCharge() const { return lrintf(3.f*charge()); }
-
-    /// @brief Four-momentum Lorentz vector. Note this is taken from the first SimTrack only.
-    const math::XYZTLorentzVectorF& p4() const {
-      return theMomentum_;
-    }
-
-    /// @brief spatial momentum vector
-    math::XYZVectorF momentum() const {
-      return p4().Vect();
-    }
-
-    /// @brief Vector to boost to the particle centre of mass frame.
-    math::XYZVectorF boostToCM() const {
-      return p4().BoostToCM();
-    }
-
-    /// @brief Magnitude of momentum vector. Note this is taken from the first SimTrack only.
-    float p() const {
-      return p4().P();
-    }
-
-    /// @brief Energy. Note this is taken from the first SimTrack only.
-    float energy() const {
-      return p4().E();
-    }
+class SimCluster {
+  friend std::ostream &operator<<(std::ostream &s, SimCluster const &tp);
 
-    /// @brief Transverse energy. Note this is taken from the first SimTrack only.
-    float et() const {
-      return p4().Et();
-    }
+public:
+  typedef int Charge;                                       ///< electric charge type
+  typedef math::XYZTLorentzVectorD LorentzVector;           ///< Lorentz vector
+  typedef math::PtEtaPhiMLorentzVector PolarLorentzVector;  ///< Lorentz vector
+  typedef math::XYZPointD Point;                            ///< point in the space
+  typedef math::XYZVectorD Vector;                          ///< point in the space
+
+  /// reference to reco::GenParticle
+  typedef reco::GenParticleRefVector::iterator genp_iterator;
+  typedef std::vector<SimTrack>::const_iterator g4t_iterator;
+
+  SimCluster();
+
+  SimCluster(const SimTrack &simtrk);
+  SimCluster(EncodedEventId eventID, uint32_t particleID);  // for PU
+
+  // destructor
+  ~SimCluster();
+
+  /** @brief PDG ID.
+   *
+   * Returns the PDG ID of the first associated gen particle. If there are no
+   * gen particles associated then it returns type() from the first SimTrack. */
+  int pdgId() const {
+    if (genParticles_.empty())
+      return g4Tracks_[0].type();
+    else
+      return (*genParticles_.begin())->pdgId();
+  }
+
+  /** @brief Signal source, crossing number.
+   *
+   * Note this is taken from the first SimTrack only, but there shouldn't be any
+   * SimTracks from different crossings in the SimCluster. */
+  EncodedEventId eventId() const { return event_; }
 
-    /// @brief Mass. Note this is taken from the first SimTrack only.
-    float mass() const {
-      return p4().M();
-    }
+  uint64_t particleId() const { return particleId_; }
+
+  // Setters for G4 and reco::GenParticle
+  void addGenParticle(const reco::GenParticleRef &ref) { genParticles_.push_back(ref); }
+  void addG4Track(const SimTrack &t) { g4Tracks_.push_back(t); }
+  /// iterators
+  genp_iterator genParticle_begin() const { return genParticles_.begin(); }
+  genp_iterator genParticle_end() const { return genParticles_.end(); }
+  g4t_iterator g4Track_begin() const { return g4Tracks_.begin(); }
+  g4t_iterator g4Track_end() const { return g4Tracks_.end(); }
+
+  // Getters for Embd and Sim Tracks
+  const reco::GenParticleRefVector &genParticles() const { return genParticles_; }
+  // Only for clusters from the signal vertex
+  const std::vector<SimTrack> &g4Tracks() const { return g4Tracks_; }
+
+  /// @brief Electric charge. Note this is taken from the first SimTrack only.
+  float charge() const { return g4Tracks_[0].charge(); }
+  /// Gives charge in unit of quark charge (should be 3 times "charge()")
+  int threeCharge() const { return lrintf(3.f * charge()); }
+
+  /// @brief Four-momentum Lorentz vector. Note this is taken from the first
+  /// SimTrack only.
+  const math::XYZTLorentzVectorF &p4() const { return theMomentum_; }
+
+  /// @brief spatial momentum vector
+  math::XYZVectorF momentum() const { return p4().Vect(); }
+
+  /// @brief Vector to boost to the particle centre of mass frame.
+  math::XYZVectorF boostToCM() const { return p4().BoostToCM(); }
+
+  /// @brief Magnitude of momentum vector. Note this is taken from the first
+  /// SimTrack only.
+  float p() const { return p4().P(); }
+
+  /// @brief Energy. Note this is taken from the first SimTrack only.
+  float energy() const { return p4().E(); }
+
+  /// @brief Transverse energy. Note this is taken from the first SimTrack only.
+  float et() const { return p4().Et(); }
+
+  /// @brief Mass. Note this is taken from the first SimTrack only.
+  float mass() const { return p4().M(); }
+
+  /// @brief Mass squared. Note this is taken from the first SimTrack only.
+  float massSqr() const { return pow(mass(), 2); }
+
+  /// @brief Transverse mass. Note this is taken from the first SimTrack only.
+  float mt() const { return p4().Mt(); }
+
+  /// @brief Transverse mass squared. Note this is taken from the first SimTrack
+  /// only.
+  float mtSqr() const { return p4().Mt2(); }
+
+  /// @brief x coordinate of momentum vector. Note this is taken from the first
+  /// SimTrack only.
+  float px() const { return p4().Px(); }
+
+  /// @brief y coordinate of momentum vector. Note this is taken from the first
+  /// SimTrack only.
+  float py() const { return p4().Py(); }
+
+  /// @brief z coordinate of momentum vector. Note this is taken from the first
+  /// SimTrack only.
+  float pz() const { return p4().Pz(); }
+
+  /// @brief Transverse momentum. Note this is taken from the first SimTrack
+  /// only.
+  float pt() const { return p4().Pt(); }
 
-    /// @brief Mass squared. Note this is taken from the first SimTrack only.
-    float massSqr() const {
-      return pow( mass(), 2 );
-    }
+  /// @brief Momentum azimuthal angle. Note this is taken from the first
+  /// SimTrack only.
+  float phi() const { return p4().Phi(); }
 
-    /// @brief Transverse mass. Note this is taken from the first SimTrack only.
-    float mt() const {
-      return p4().Mt();
-    }
+  /// @brief Momentum polar angle. Note this is taken from the first SimTrack
+  /// only.
+  float theta() const { return p4().Theta(); }
+
+  /// @brief Momentum pseudorapidity. Note this is taken from the simtrack
+  /// before the calorimeter
+  float eta() const { return p4().Eta(); }
+
+  /// @brief Rapidity. Note this is taken from the simtrack before the
+  /// calorimeter
+  float rapidity() const { return p4().Rapidity(); }
+
+  /// @brief Same as rapidity().
+  float y() const { return rapidity(); }
 
-    /// @brief Transverse mass squared. Note this is taken from the first SimTrack only.
-    float mtSqr() const {
-      return p4().Mt2();
-    }
+  /** @brief Status word.
+   *
+   * Returns status() from the first gen particle, or -99 if there are no gen
+   * particles attached. */
+  int status() const { return genParticles_.empty() ? -99 : (*genParticles_[0]).status(); }
 
-    /// @brief x coordinate of momentum vector. Note this is taken from the first SimTrack only.
-    float px() const {
-      return p4().Px();
-    }
+  static const unsigned int longLivedTag;  ///< long lived flag
 
-    /// @brief y coordinate of momentum vector. Note this is taken from the first SimTrack only.
-    float py() const {
-      return p4().Py();
-    }
+  /// is long lived?
+  bool longLived() const { return status() & longLivedTag; }
 
-    /// @brief z coordinate of momentum vector. Note this is taken from the first SimTrack only.
-    float pz() const {
-      return p4().Pz();
-    }
+  /** @brief Gives the total number of SimHits, in the cluster */
+  int numberOfSimHits() const { return nsimhits_; }
 
-    /// @brief Transverse momentum. Note this is taken from the first SimTrack only.
-    float pt() const {
-      return p4().Pt();
-    }
+  /** @brief Gives the total number of SimHits, in the cluster */
+  int numberOfRecHits() const { return hits_.size(); }
 
-    /// @brief Momentum azimuthal angle. Note this is taken from the first SimTrack only.
-    float phi() const {
-      return p4().Phi();
-    }
+  /** @brief add rechit with fraction */
+  void addRecHitAndFraction(uint32_t hit, float fraction) {
+    hits_.emplace_back(hit);
+    fractions_.emplace_back(fraction);
+  }
 
-    /// @brief Momentum polar angle. Note this is taken from the first SimTrack only.
-    float theta() const {
-      return p4().Theta();
+  /** @brief Returns list of rechit IDs and fractions for this SimCluster */
+  std::vector<std::pair<uint32_t, float>> hits_and_fractions() const {
+    std::vector<std::pair<uint32_t, float>> result;
+    for (size_t i = 0; i < hits_.size(); ++i) {
+      result.emplace_back(hits_[i], fractions_[i]);
     }
+    return result;
+  }
 
-    /// @brief Momentum pseudorapidity. Note this is taken from the simtrack before the calorimeter
-    float eta() const {
-      return p4().Eta();
-    }
+  /** @brief clear the hits and fractions list */
+  void clearHitsAndFractions() {
+    std::vector<uint32_t>().swap(hits_);
+    std::vector<float>().swap(fractions_);
+  }
 
-    /// @brief Rapidity. Note this is taken from the simtrack before the calorimeter
-    float rapidity() const {
-      return p4().Rapidity();
-    }
-
-    /// @brief Same as rapidity().
-    float y() const {
-      return rapidity();
-    }
-
-    /** @brief Status word.
-     *
-     * Returns status() from the first gen particle, or -99 if there are no gen particles attached. */
-    int status() const {
-      return genParticles_.empty() ? -99 : (*genParticles_[0]).status();
-    }
-
-    static const unsigned int longLivedTag; ///< long lived flag
+  /** @brief returns the accumulated sim energy in the cluster */
+  float simEnergy() const { return simhit_energy_; }
 
-    /// is long lived?
-    bool longLived() const { return status()&longLivedTag;}
+  /** @brief add simhit's energy to cluster */
+  void addSimHit(const PCaloHit &hit) { simhit_energy_ += hit.energy(); }
 
-    /** @brief Gives the total number of SimHits, in the cluster */
-    int numberOfSimHits() const {return nsimhits_;}
-    
-    /** @brief Gives the total number of SimHits, in the cluster */
-    int numberOfRecHits() const {return hits_.size();}
-
-    /** @brief add rechit with fraction */
-    void addRecHitAndFraction(uint32_t hit, float fraction) {
-      hits_.emplace_back(hit);
-      fractions_.emplace_back(fraction);
-    }
+private:
+  uint64_t nsimhits_;
+  EncodedEventId event_;
 
-    /** @brief Returns list of rechit IDs and fractions for this SimCluster */
-    std::vector<std::pair<uint32_t,float> > hits_and_fractions() const {
-      std::vector<std::pair<uint32_t,float> > result;
-      for(size_t i = 0; i < hits_.size(); ++i) { 
-        result.emplace_back(hits_[i],fractions_[i]);
-      }
-      return result;
-    }
+  uint32_t particleId_;
+  float simhit_energy_;
+  std::vector<uint32_t> hits_;
+  std::vector<float> fractions_;
 
-    /** @brief clear the hits and fractions list */
-    void clearHitsAndFractions() {
-      std::vector<uint32_t>().swap(hits_);
-      std::vector<float>().swap(fractions_);
-    }
-   
-    /** @brief returns the accumulated sim energy in the cluster */
-    float simEnergy() const { return simhit_energy_; }
+  math::XYZTLorentzVectorF theMomentum_;
 
-    /** @brief add simhit's energy to cluster */
-    void addSimHit(const PCaloHit& hit) { simhit_energy_ += hit.energy(); }
-    
-private:
-    uint64_t nsimhits_;
-    EncodedEventId event_;
-    
-    uint32_t particleId_; 
-    float simhit_energy_;
-    std::vector<uint32_t> hits_;
-    std::vector<float> fractions_;
-    
-    math::XYZTLorentzVectorF theMomentum_;
-    
-    /// references to G4 and reco::GenParticle tracks
-    std::vector<SimTrack> g4Tracks_;
-    reco::GenParticleRefVector genParticles_;
-    
+  /// references to G4 and reco::GenParticle tracks
+  std::vector<SimTrack> g4Tracks_;
+  reco::GenParticleRefVector genParticles_;
 };
 
-#endif // SimDataFormats_SimCluster_H
+#endif  // SimDataFormats_SimCluster_H
diff --git a/SimDataFormats/CaloAnalysis/interface/SimClusterFwd.h b/SimDataFormats/CaloAnalysis/interface/SimClusterFwd.h
index 827baf9d8d6e2..71bd110fdaf62 100644
--- a/SimDataFormats/CaloAnalysis/interface/SimClusterFwd.h
+++ b/SimDataFormats/CaloAnalysis/interface/SimClusterFwd.h
@@ -1,9 +1,9 @@
 #ifndef CaloAnalysis_SimClusterFwd_h
 #define CaloAnalysis_SimClusterFwd_h
-#include <vector>
 #include "DataFormats/Common/interface/Ref.h"
-#include "DataFormats/Common/interface/RefVector.h"
 #include "DataFormats/Common/interface/RefProd.h"
+#include "DataFormats/Common/interface/RefVector.h"
+#include <vector>
 
 class SimCluster;
 typedef std::vector<SimCluster> SimClusterCollection;
@@ -12,6 +12,6 @@ typedef edm::RefVector<SimClusterCollection> SimClusterRefVector;
 typedef edm::RefProd<SimClusterCollection> SimClusterRefProd;
 typedef edm::RefVector<SimClusterCollection> SimClusterContainer;
 
-std::ostream& operator<< (std::ostream& s, SimCluster const & tp);
+std::ostream &operator<<(std::ostream &s, SimCluster const &tp);
 
 #endif
diff --git a/SimDataFormats/CaloAnalysis/src/CaloParticle.cc b/SimDataFormats/CaloAnalysis/src/CaloParticle.cc
index 727ca9e8e1352..ac05f22e7d02d 100644
--- a/SimDataFormats/CaloAnalysis/src/CaloParticle.cc
+++ b/SimDataFormats/CaloAnalysis/src/CaloParticle.cc
@@ -8,57 +8,45 @@
 
 const unsigned int CaloParticle::longLivedTag = 65536;
 
-CaloParticle::CaloParticle()
-{
+CaloParticle::CaloParticle() {
   // No operation
 }
 
-CaloParticle::CaloParticle( const SimTrack& simtrk )
-{
-  addG4Track( simtrk );
+CaloParticle::CaloParticle(const SimTrack &simtrk) {
+  addG4Track(simtrk);
   event_ = simtrk.eventId();
   particleId_ = simtrk.trackId();
-  theMomentum_.SetPxPyPzE(simtrk.momentum().px(),
-			  simtrk.momentum().py(),
-			  simtrk.momentum().pz(),
-			  simtrk.momentum().E());
+  theMomentum_.SetPxPyPzE(
+      simtrk.momentum().px(), simtrk.momentum().py(), simtrk.momentum().pz(), simtrk.momentum().E());
 }
 
-CaloParticle::CaloParticle( EncodedEventId eventID, uint32_t particleID )
-{
+CaloParticle::CaloParticle(EncodedEventId eventID, uint32_t particleID) {
   event_ = eventID;
   particleId_ = particleID;
 }
 
-CaloParticle::~CaloParticle()
-{
-}
+CaloParticle::~CaloParticle() {}
 
-std::ostream& operator<< (std::ostream& s, CaloParticle const & tp)
-{
-    s << "Calo Particle:" << std::endl;
-    s << "CP momentum, q, ID, & Event #: "
-    << tp.p4()                      << " " << tp.charge() << " "   << tp.pdgId() << " "
+std::ostream &operator<<(std::ostream &s, CaloParticle const &tp) {
+  s << "Calo Particle:" << std::endl;
+  s << "CP momentum, q, ID, & Event #: " << tp.p4() << " " << tp.charge() << " " << tp.pdgId() << " "
     << tp.eventId().bunchCrossing() << "." << tp.eventId().event() << std::endl;
 
-    for (CaloParticle::genp_iterator hepT = tp.genParticle_begin(); hepT !=  tp.genParticle_end(); ++hepT)
-    {
-        s << " HepMC Track Momentum " << (*hepT)->momentum().rho() << std::endl;
-    }
+  for (CaloParticle::genp_iterator hepT = tp.genParticle_begin(); hepT != tp.genParticle_end(); ++hepT) {
+    s << " HepMC Track Momentum " << (*hepT)->momentum().rho() << std::endl;
+  }
 
-    for (CaloParticle::g4t_iterator g4T = tp.g4Track_begin(); g4T !=  tp.g4Track_end(); ++g4T)
-    {
-        s << " Geant Track Momentum  " << g4T->momentum() << std::endl;
-        s << " Geant Track ID & type " << g4T->trackId() << " " << g4T->type() << std::endl;
-        if (g4T->type() !=  tp.pdgId())
-        {
-            s << " Mismatch b/t CaloParticle and Geant types" << std::endl;
-        }
-    }
-    s << "SimClusters in this CaloParticle: " << std::endl;
-    for( auto itr = tp.simClusters_.begin(); itr != tp.simClusters_.end(); ++itr ) {
-      s << **itr;
+  for (CaloParticle::g4t_iterator g4T = tp.g4Track_begin(); g4T != tp.g4Track_end(); ++g4T) {
+    s << " Geant Track Momentum  " << g4T->momentum() << std::endl;
+    s << " Geant Track ID & type " << g4T->trackId() << " " << g4T->type() << std::endl;
+    if (g4T->type() != tp.pdgId()) {
+      s << " Mismatch b/t CaloParticle and Geant types" << std::endl;
     }
-    s << std::endl;
-    return s;
+  }
+  s << "SimClusters in this CaloParticle: " << std::endl;
+  for (auto itr = tp.simClusters_.begin(); itr != tp.simClusters_.end(); ++itr) {
+    s << **itr;
+  }
+  s << std::endl;
+  return s;
 }
diff --git a/SimDataFormats/CaloAnalysis/src/SimCluster.cc b/SimDataFormats/CaloAnalysis/src/SimCluster.cc
index ea185965d79a2..d901cd1f29947 100644
--- a/SimDataFormats/CaloAnalysis/src/SimCluster.cc
+++ b/SimDataFormats/CaloAnalysis/src/SimCluster.cc
@@ -8,54 +8,42 @@
 
 const unsigned int SimCluster::longLivedTag = 65536;
 
-SimCluster::SimCluster()
-{
+SimCluster::SimCluster() {
   // No operation
 }
 
-SimCluster::SimCluster( const SimTrack& simtrk )
-{
-  addG4Track( simtrk );
+SimCluster::SimCluster(const SimTrack &simtrk) {
+  addG4Track(simtrk);
   event_ = simtrk.eventId();
   particleId_ = simtrk.trackId();
-  
-  theMomentum_.SetPxPyPzE(simtrk.momentum().px(),
-			  simtrk.momentum().py(),
-			  simtrk.momentum().pz(),
-			  simtrk.momentum().E());
+
+  theMomentum_.SetPxPyPzE(
+      simtrk.momentum().px(), simtrk.momentum().py(), simtrk.momentum().pz(), simtrk.momentum().E());
 }
 
-SimCluster::SimCluster( EncodedEventId eventID, uint32_t particleID )
-{
+SimCluster::SimCluster(EncodedEventId eventID, uint32_t particleID) {
   event_ = eventID;
   particleId_ = particleID;
 }
 
-SimCluster::~SimCluster()
-{
-}
+SimCluster::~SimCluster() {}
 
-std::ostream& operator<< (std::ostream& s, SimCluster const & tp)
-{
-    s << "CP momentum, q, ID, & Event #: "
-    << tp.p4()                      << " " << tp.charge() << " "   << tp.pdgId() << " "
+std::ostream &operator<<(std::ostream &s, SimCluster const &tp) {
+  s << "CP momentum, q, ID, & Event #: " << tp.p4() << " " << tp.charge() << " " << tp.pdgId() << " "
     << tp.eventId().bunchCrossing() << "." << tp.eventId().event() << std::endl;
 
-    for (SimCluster::genp_iterator hepT = tp.genParticle_begin(); hepT !=  tp.genParticle_end(); ++hepT)
-    {
-        s << " HepMC Track Momentum " << (*hepT)->momentum().rho() << std::endl;
-    }
+  for (SimCluster::genp_iterator hepT = tp.genParticle_begin(); hepT != tp.genParticle_end(); ++hepT) {
+    s << " HepMC Track Momentum " << (*hepT)->momentum().rho() << std::endl;
+  }
 
-    for (SimCluster::g4t_iterator g4T = tp.g4Track_begin(); g4T !=  tp.g4Track_end(); ++g4T)
-    {
-        s << " Geant Track Momentum  " << g4T->momentum() << std::endl;
-        s << " Geant Track ID & type " << g4T->trackId() << " " << g4T->type() << std::endl;
-        if (g4T->type() !=  tp.pdgId())
-        {
-            s << " Mismatch b/t SimCluster and Geant types" << std::endl;
-        }
+  for (SimCluster::g4t_iterator g4T = tp.g4Track_begin(); g4T != tp.g4Track_end(); ++g4T) {
+    s << " Geant Track Momentum  " << g4T->momentum() << std::endl;
+    s << " Geant Track ID & type " << g4T->trackId() << " " << g4T->type() << std::endl;
+    if (g4T->type() != tp.pdgId()) {
+      s << " Mismatch b/t SimCluster and Geant types" << std::endl;
     }
-    s << " # of cells = " << tp.hits_.size() 
-      << ", effective cells = " << std::accumulate(tp.fractions_.begin(),tp.fractions_.end(),0.f) << std::endl;
-    return s;
+  }
+  s << " # of cells = " << tp.hits_.size()
+    << ", effective cells = " << std::accumulate(tp.fractions_.begin(), tp.fractions_.end(), 0.f) << std::endl;
+  return s;
 }
diff --git a/SimDataFormats/CaloAnalysis/src/classes.h b/SimDataFormats/CaloAnalysis/src/classes.h
index 788dd9b5a6462..8522a977b5944 100644
--- a/SimDataFormats/CaloAnalysis/src/classes.h
+++ b/SimDataFormats/CaloAnalysis/src/classes.h
@@ -1,8 +1,7 @@
-#include "SimDataFormats/CaloAnalysis/interface/CaloParticleFwd.h"
 #include "SimDataFormats/CaloAnalysis/interface/CaloParticle.h"
-#include "SimDataFormats/CaloAnalysis/interface/SimClusterFwd.h"
+#include "SimDataFormats/CaloAnalysis/interface/CaloParticleFwd.h"
 #include "SimDataFormats/CaloAnalysis/interface/SimCluster.h"
-
+#include "SimDataFormats/CaloAnalysis/interface/SimClusterFwd.h"
 
 namespace SimDataFormats {
   namespace CaloAnalysis {
@@ -13,7 +12,7 @@ namespace SimDataFormats {
     SimClusterRef scr;
     SimClusterRefVector scrv;
     SimClusterRefProd scrp;
-    SimClusterContainer scc;    
+    SimClusterContainer scc;
 
     CaloParticle cp;
     CaloParticleCollection vcp;
@@ -23,5 +22,5 @@ namespace SimDataFormats {
     CaloParticleRefVector cprv;
     CaloParticleRefProd cprp;
     CaloParticleContainer cpc;
-  }
-}
+  }  // namespace CaloAnalysis
+}  // namespace SimDataFormats
diff --git a/SimDataFormats/CaloHit/interface/CaloHit.h b/SimDataFormats/CaloHit/interface/CaloHit.h
index 590db59597811..2a9268f4e1530 100644
--- a/SimDataFormats/CaloHit/interface/CaloHit.h
+++ b/SimDataFormats/CaloHit/interface/CaloHit.h
@@ -2,7 +2,7 @@
 #define SimDataFormats_CaloHit_H
 ///////////////////////////////////////////////////////////////////////////////
 // File: CaloHit.h
-// Hit class for QIE analysis 
+// Hit class for QIE analysis
 ///////////////////////////////////////////////////////////////////////////////
 
 #include <boost/cstdint.hpp>
@@ -10,48 +10,37 @@
 #include <cmath>
 
 class CaloHit {
-
 public:
-
-  CaloHit(int deti, int layi, double ei, double etai, double phii, double timi,
-	  uint32_t idi=0);
+  CaloHit(int deti, int layi, double ei, double etai, double phii, double timi, uint32_t idi = 0);
   CaloHit();
   CaloHit(const CaloHit&);
   virtual ~CaloHit();
 
-  int          det()    const {return deth;}
-  int          layer()  const {return layerh;}
-  double       e()      const {return eh;}
-  double       eta()    const {return etah;}
-  double       phi()    const {return phih;}
-  double       t()      const {return timeh;}
-  uint32_t     id()     const {return idh;}
-  void         setId(const uint32_t idi) {idh = idi;}
-
-  bool operator<( const CaloHit& hit) const;
- 
-private:
+  int det() const { return deth; }
+  int layer() const { return layerh; }
+  double e() const { return eh; }
+  double eta() const { return etah; }
+  double phi() const { return phih; }
+  double t() const { return timeh; }
+  uint32_t id() const { return idh; }
+  void setId(const uint32_t idi) { idh = idi; }
 
-  int          deth, layerh;
-  double       eh, etah, phih, timeh;
-  uint32_t     idh;
+  bool operator<(const CaloHit& hit) const;
 
+private:
+  int deth, layerh;
+  double eh, etah, phih, timeh;
+  uint32_t idh;
 };
 
 class CaloHitMore {
-
 public:
-
-  bool operator() (const CaloHit* a, const CaloHit* b) {
-    return (a->t() < b->t());
-  }
+  bool operator()(const CaloHit* a, const CaloHit* b) { return (a->t() < b->t()); }
 };
 
 class CaloHitIdMore {
-
 public:
-
-  bool operator() (const CaloHit* a, const CaloHit* b) {
+  bool operator()(const CaloHit* a, const CaloHit* b) {
     if (a->id() < b->id()) {
       return true;
     } else if (a->id() > b->id()) {
@@ -63,20 +52,14 @@ class CaloHitIdMore {
 };
 
 class CaloHitELess {
-
 public:
-
-  bool operator() (const CaloHit* a, const CaloHit* b) {
-    return (a->e() > b->e());
-  }
+  bool operator()(const CaloHit* a, const CaloHit* b) { return (a->e() > b->e()); }
 };
 
 class CaloHitEtLess {
-
 public:
-
-  bool operator() (const CaloHit* a, const CaloHit* b) {
-    return (a->e()/std::cosh(a->eta()) > b->e()/std::cosh(b->eta()));
+  bool operator()(const CaloHit* a, const CaloHit* b) {
+    return (a->e() / std::cosh(a->eta()) > b->e() / std::cosh(b->eta()));
   }
 };
 
diff --git a/SimDataFormats/CaloHit/interface/CastorShowerEvent.h b/SimDataFormats/CaloHit/interface/CastorShowerEvent.h
index e879480b95ee3..fb984a27ced73 100644
--- a/SimDataFormats/CaloHit/interface/CastorShowerEvent.h
+++ b/SimDataFormats/CaloHit/interface/CastorShowerEvent.h
@@ -11,58 +11,55 @@
 #include <vector>
 #include <string>
 
-  // class CastorShowerEvent {
-  class CastorShowerEvent : public TObject {
-  
-  public:
-  
-    /// point in the space
-    typedef math::XYZPoint Point;
+// class CastorShowerEvent {
+class CastorShowerEvent : public TObject {
+public:
+  /// point in the space
+  typedef math::XYZPoint Point;
 
-    CastorShowerEvent();
-    ~CastorShowerEvent() override;
-    void Clear(Option_t * option ="") override;
-    
-//  private:
-  
-    // Data members
-    unsigned int              nhit;
-    std::vector<unsigned int> detID;
-    std::vector<Point>        hitPosition;
-    std::vector<float>        nphotons;
-    std::vector<float>        time;
-    float                     primaryEnergy;
-    float                     primEta , primPhi;
-    float                     primX , primY , primZ;
-    
-    // Setters
-    void setNhit(unsigned int i)   { nhit = i; };
-    void setDetID(unsigned int id) { detID.push_back(id); };
-    void setHitPosition(const Point& p)   { hitPosition.push_back(p); };
-    void setNphotons(float np)     { nphotons.push_back(np); };
-    void setTime(float t)          { time.push_back(t); };
-    void setPrimE(float e)         { primaryEnergy = e; };
-    void setPrimEta(float eta)     { primEta = eta; };
-    void setPrimPhi(float phi)     { primPhi = phi; };
-    void setPrimX(float x)         { primX = x; };
-    void setPrimY(float y)         { primY = y; };
-    void setPrimZ(float z)         { primZ = z; };
-    
-    // Accessors
-    unsigned int getNhit()       { return nhit; };
-    unsigned int getDetID(int i) { return detID[i]; };
-    Point getHitPosition(int i)  { return hitPosition[i]; };
-    float getNphotons(int i)     { return nphotons[i]; };
-    float getTime(int i)         { return time[i]; };
-    float getPrimE()             { return primaryEnergy; };
-    float getPrimEta()           { return primEta; };
-    float getPrimPhi() const     { return primPhi; };
-    float getPrimX()             { return primX; };
-    float getPrimY()             { return primY; };
-    float getPrimZ()             { return primZ; };
-    
-    ClassDefOverride(CastorShowerEvent,2)
-    
-  };
+  CastorShowerEvent();
+  ~CastorShowerEvent() override;
+  void Clear(Option_t* option = "") override;
+
+  //  private:
+
+  // Data members
+  unsigned int nhit;
+  std::vector<unsigned int> detID;
+  std::vector<Point> hitPosition;
+  std::vector<float> nphotons;
+  std::vector<float> time;
+  float primaryEnergy;
+  float primEta, primPhi;
+  float primX, primY, primZ;
+
+  // Setters
+  void setNhit(unsigned int i) { nhit = i; };
+  void setDetID(unsigned int id) { detID.push_back(id); };
+  void setHitPosition(const Point& p) { hitPosition.push_back(p); };
+  void setNphotons(float np) { nphotons.push_back(np); };
+  void setTime(float t) { time.push_back(t); };
+  void setPrimE(float e) { primaryEnergy = e; };
+  void setPrimEta(float eta) { primEta = eta; };
+  void setPrimPhi(float phi) { primPhi = phi; };
+  void setPrimX(float x) { primX = x; };
+  void setPrimY(float y) { primY = y; };
+  void setPrimZ(float z) { primZ = z; };
+
+  // Accessors
+  unsigned int getNhit() { return nhit; };
+  unsigned int getDetID(int i) { return detID[i]; };
+  Point getHitPosition(int i) { return hitPosition[i]; };
+  float getNphotons(int i) { return nphotons[i]; };
+  float getTime(int i) { return time[i]; };
+  float getPrimE() { return primaryEnergy; };
+  float getPrimEta() { return primEta; };
+  float getPrimPhi() const { return primPhi; };
+  float getPrimX() { return primX; };
+  float getPrimY() { return primY; };
+  float getPrimZ() { return primZ; };
+
+  ClassDefOverride(CastorShowerEvent, 2)
+};
 
 #endif
diff --git a/SimDataFormats/CaloHit/interface/CastorShowerLibraryInfo.h b/SimDataFormats/CaloHit/interface/CastorShowerLibraryInfo.h
index 3418bd310d79c..7206a24874a02 100644
--- a/SimDataFormats/CaloHit/interface/CastorShowerLibraryInfo.h
+++ b/SimDataFormats/CaloHit/interface/CastorShowerLibraryInfo.h
@@ -9,47 +9,48 @@
 
 #include <vector>
 #include <string>
-class SLBin: public TObject {
-      public:
-             SLBin() {};
-             ~SLBin() override {};
-// Setters
-             void Clear(Option_t * option = "") override {NEvts=NBins=NEvtPerBin=0;Bins.clear();};
-             void setNEvts(unsigned int n)      {NEvts = n;};
-             void setNBins(unsigned int n)      {NBins = n;};
-             void setNEvtPerBin(unsigned int n) {NEvtPerBin=n;};
-             void setBin(double val)            {Bins.push_back(val);};
-             void setBin(const std::vector<double>& b) {Bins=b;};
-// getters
-             unsigned int getNEvts()            { return NEvts;};
-             unsigned int getNBins()            { return NBins;};
-             unsigned int getNEvtPerBin()       { return NEvtPerBin;};
-             double               getBin(int i) { return Bins.at(i);};
-             std::vector<double>& getBin()      { return Bins;};
-      private:
-             unsigned int        NEvts;
-             unsigned int        NBins;
-             unsigned int        NEvtPerBin;
-             std::vector<double> Bins;
-    ClassDefOverride(SLBin,2);
+class SLBin : public TObject {
+public:
+  SLBin(){};
+  ~SLBin() override{};
+  // Setters
+  void Clear(Option_t* option = "") override {
+    NEvts = NBins = NEvtPerBin = 0;
+    Bins.clear();
+  };
+  void setNEvts(unsigned int n) { NEvts = n; };
+  void setNBins(unsigned int n) { NBins = n; };
+  void setNEvtPerBin(unsigned int n) { NEvtPerBin = n; };
+  void setBin(double val) { Bins.push_back(val); };
+  void setBin(const std::vector<double>& b) { Bins = b; };
+  // getters
+  unsigned int getNEvts() { return NEvts; };
+  unsigned int getNBins() { return NBins; };
+  unsigned int getNEvtPerBin() { return NEvtPerBin; };
+  double getBin(int i) { return Bins.at(i); };
+  std::vector<double>& getBin() { return Bins; };
+
+private:
+  unsigned int NEvts;
+  unsigned int NBins;
+  unsigned int NEvtPerBin;
+  std::vector<double> Bins;
+  ClassDefOverride(SLBin, 2);
 };
 
 class CastorShowerLibraryInfo : public TObject {
-  
-  public:
-  
-    CastorShowerLibraryInfo();
-    ~CastorShowerLibraryInfo() override;
-
-    void Clear(Option_t * option = "") override;
-    
-    // Data members
-    SLBin Energy;
-    SLBin Eta;
-    SLBin Phi;
-
-    ClassDefOverride(CastorShowerLibraryInfo,2);
-    
-  };
+public:
+  CastorShowerLibraryInfo();
+  ~CastorShowerLibraryInfo() override;
+
+  void Clear(Option_t* option = "") override;
+
+  // Data members
+  SLBin Energy;
+  SLBin Eta;
+  SLBin Phi;
+
+  ClassDefOverride(CastorShowerLibraryInfo, 2);
+};
 
 #endif
diff --git a/SimDataFormats/CaloHit/interface/HFShowerLibraryEventInfo.h b/SimDataFormats/CaloHit/interface/HFShowerLibraryEventInfo.h
index 9afd1021d0293..bf04143c838c2 100644
--- a/SimDataFormats/CaloHit/interface/HFShowerLibraryEventInfo.h
+++ b/SimDataFormats/CaloHit/interface/HFShowerLibraryEventInfo.h
@@ -4,32 +4,32 @@
 #include <vector>
 
 class HFShowerLibraryEventInfo {
-
 public:
+  HFShowerLibraryEventInfo() {}
+  HFShowerLibraryEventInfo(int events,
+                           int bins,
+                           int eventsPerBin,
+                           float libraryVersion,
+                           float physListVersion,
+                           const std::vector<double> &en);
 
-  HFShowerLibraryEventInfo() { }
-  HFShowerLibraryEventInfo(int events, int bins, int eventsPerBin,
-			   float libraryVersion, float physListVersion, 
-			   const std::vector<double> &en);
-    
-  // total number of events 
-  int totalEvents()                const { return fEvents; }
-  // number of bins 
-  int numberOfBins()               const { return fBins; }
+  // total number of events
+  int totalEvents() const { return fEvents; }
+  // number of bins
+  int numberOfBins() const { return fBins; }
   // number of events per bin
-  int eventsPerBin()               const { return fEventsPerBin; }
+  int eventsPerBin() const { return fEventsPerBin; }
   // hf shower library version
-  float showerLibraryVersion()     const { return fHFShowerLibVers; }
+  float showerLibraryVersion() const { return fHFShowerLibVers; }
   // physics list version
-  float physListVersion()          const { return fPhyListVers; }
+  float physListVersion() const { return fPhyListVers; }
   // energy bins
   std::vector<double> energyBins() const { return fEnergies; }
-    
-private:
 
-  int                     fEvents, fBins, fEventsPerBin;
-  float                   fHFShowerLibVers, fPhyListVers;
-  std::vector<double>     fEnergies;
+private:
+  int fEvents, fBins, fEventsPerBin;
+  float fHFShowerLibVers, fPhyListVers;
+  std::vector<double> fEnergies;
 };
 typedef std::vector<HFShowerLibraryEventInfo> HFShowerLibraryEventInfoCollection;
 #endif
diff --git a/SimDataFormats/CaloHit/interface/HFShowerPhoton.h b/SimDataFormats/CaloHit/interface/HFShowerPhoton.h
index 9cfbe0b6f4f09..84b07dd204f42 100644
--- a/SimDataFormats/CaloHit/interface/HFShowerPhoton.h
+++ b/SimDataFormats/CaloHit/interface/HFShowerPhoton.h
@@ -11,30 +11,26 @@
 #include <vector>
 
 class HFShowerPhoton {
-
 public:
-
   /// point in the space
   typedef math::XYZPointF Point;
 
-  HFShowerPhoton(float x=0, float y=0, float z=0, float lambda=0, float t=0);
-  HFShowerPhoton(const Point &p, float time, float lambda);
+  HFShowerPhoton(float x = 0, float y = 0, float z = 0, float lambda = 0, float t = 0);
+  HFShowerPhoton(const Point& p, float time, float lambda);
   HFShowerPhoton(const HFShowerPhoton&);
   virtual ~HFShowerPhoton();
 
-  const Point & position() const {return position_;}
-  float         x()        const {return position_.X();}
-  float         y()        const {return position_.Y();}
-  float         z()        const {return position_.Z();}
-  float         lambda()   const {return lambda_;}
-  float         t()        const {return time_;}
- 
-private:
-
-  Point         position_;
-  float         lambda_;
-  float         time_;
+  const Point& position() const { return position_; }
+  float x() const { return position_.X(); }
+  float y() const { return position_.Y(); }
+  float z() const { return position_.Z(); }
+  float lambda() const { return lambda_; }
+  float t() const { return time_; }
 
+private:
+  Point position_;
+  float lambda_;
+  float time_;
 };
 
 typedef std::vector<HFShowerPhoton> HFShowerPhotonCollection;
diff --git a/SimDataFormats/CaloHit/interface/PCaloHit.h b/SimDataFormats/CaloHit/interface/PCaloHit.h
index e03d3c08c636a..e1184ce78aef6 100644
--- a/SimDataFormats/CaloHit/interface/PCaloHit.h
+++ b/SimDataFormats/CaloHit/interface/PCaloHit.h
@@ -5,33 +5,27 @@
 
 // Persistent Calorimeter hit
 
-class PCaloHit { 
+class PCaloHit {
+public:
+  PCaloHit(float e = 0., float t = 0., int i = 0, float emFraction = 1., uint16_t d = 0)
+      : myEnergy(e), myEMFraction(emFraction), myTime(t), myItra(i), myDepth(d) {}
 
-public: 
-
-  PCaloHit(float e = 0., float t = 0., int i = 0, float emFraction = 1.,
-	   uint16_t d = 0) : myEnergy(e), myEMFraction(emFraction), myTime(t),
-    myItra(i), myDepth(d) { }
-
-  PCaloHit(unsigned int id, float e = 0., float t = 0., int i = 0, 
-	   float emFraction = 1., uint16_t d = 0) : myEnergy (e), 
-    myEMFraction(emFraction), myTime (t), myItra (i), detId(id), myDepth(d) { }
+  PCaloHit(unsigned int id, float e = 0., float t = 0., int i = 0, float emFraction = 1., uint16_t d = 0)
+      : myEnergy(e), myEMFraction(emFraction), myTime(t), myItra(i), detId(id), myDepth(d) {}
   PCaloHit(float eEM, float eHad, float t, int i = 0, uint16_t d = 0);
-  PCaloHit(unsigned int id, float eEM, float eHad, float t, int i = 0, 
-	   uint16_t d = 0);
-  
+  PCaloHit(unsigned int id, float eEM, float eHad, float t, int i = 0, uint16_t d = 0);
+
   //Names
   static const char *name() { return "Hit"; }
 
-  const char * getName() const { return name (); }
+  const char *getName() const { return name(); }
 
   //Energy deposit of the Hit
-  double energy()    const { return myEnergy; }
-  double energyEM()  const { return myEMFraction*myEnergy; }
-  double energyHad() const { return (1.-myEMFraction)*myEnergy; }
+  double energy() const { return myEnergy; }
+  double energyEM() const { return myEMFraction * myEnergy; }
+  double energyHad() const { return (1. - myEMFraction) * myEnergy; }
   void setEnergy(double e) { myEnergy = e; }
 
-
   //Time of the deposit
   double time() const { return myTime; }
 
@@ -40,46 +34,45 @@ class PCaloHit {
 
   //DetId where the Hit is recorded
   void setID(unsigned int id) { detId = id; }
-  unsigned int  id() const { return detId; }
+  unsigned int id() const { return detId; }
 
-  //Encoded depth in the detector 
+  //Encoded depth in the detector
   //for ECAL: # radiation length, 30 == APD
   //for HCAL:
   void setDepth(uint16_t depth) { myDepth = depth; }
-  uint16_t depth() const { return myDepth; } 
+  uint16_t depth() const { return myDepth; }
 
   //Event Id (for signal/pileup discrimination)
 
   void setEventId(EncodedEventId e) { theEventId = e; }
-  EncodedEventId eventId() const {return theEventId;}
+  EncodedEventId eventId() const { return theEventId; }
 
   // new method used by the new transient CF
-  void setTime(float t) {myTime=t;}
+  void setTime(float t) { myTime = t; }
 
   //Comparisons
 
   bool operator<(const PCaloHit &d) const { return myEnergy < d.myEnergy; }
 
   //Same Hit (by value)
-  bool operator==(const PCaloHit &d) const 
-  { return (myEnergy == d.myEnergy && detId == d.detId); }
+  bool operator==(const PCaloHit &d) const { return (myEnergy == d.myEnergy && detId == d.detId); }
 
   static const int kEcalDepthIdMask = 0x3;
-  static const int kEcalDepthMask   = 0x1FFF;
+  static const int kEcalDepthMask = 0x1FFF;
   static const int kEcalDepthOffset = 3;
-  static const int kEcalDepthRefz   = 0X4;
+  static const int kEcalDepthRefz = 0X4;
 
-protected: 
+protected:
   float myEnergy;
-  float myEMFraction; 
-  float myTime; 
-  int   myItra; 
-  unsigned int detId; 
+  float myEMFraction;
+  float myTime;
+  int myItra;
+  unsigned int detId;
   uint16_t myDepth;
-  EncodedEventId  theEventId;
-}; 
+  EncodedEventId theEventId;
+};
 
-#include<iosfwd>
-std::ostream &operator<<(std::ostream &, const PCaloHit &); 
+#include <iosfwd>
+std::ostream &operator<<(std::ostream &, const PCaloHit &);
 
-#endif // _SimDataFormats_SimCaloHit_PCaloHit_h_
+#endif  // _SimDataFormats_SimCaloHit_PCaloHit_h_
diff --git a/SimDataFormats/CaloHit/interface/PCaloHitContainer.h b/SimDataFormats/CaloHit/interface/PCaloHitContainer.h
index 6dacb064a61e9..45216bb1630d7 100644
--- a/SimDataFormats/CaloHit/interface/PCaloHitContainer.h
+++ b/SimDataFormats/CaloHit/interface/PCaloHitContainer.h
@@ -5,8 +5,7 @@
 #include <vector>
 
 namespace edm {
-    typedef std::vector<PCaloHit> PCaloHitContainer;
-} // edm
+  typedef std::vector<PCaloHit> PCaloHitContainer;
+}  // namespace edm
 
 #endif
-
diff --git a/SimDataFormats/CaloHit/interface/PassiveHit.h b/SimDataFormats/CaloHit/interface/PassiveHit.h
index e2da615c5cc02..f21c80d414fc4 100644
--- a/SimDataFormats/CaloHit/interface/PassiveHit.h
+++ b/SimDataFormats/CaloHit/interface/PassiveHit.h
@@ -1,66 +1,64 @@
 #ifndef SimDataFormats_PassiveHit_H
 #define SimDataFormats_PassiveHit_H
 
-#include<string>
+#include <string>
 #include <vector>
 
 // Persistent Hit in passive material
 
-class PassiveHit { 
+class PassiveHit {
+public:
+  PassiveHit(std::string vname, unsigned int id, float e = 0, float etot = 0, float t = 0, int it = 0)
+      : vname_(vname), id_(id), energy_(e), etotal_(etot), time_(t), it_(it) {}
+  PassiveHit() : vname_(""), id_(0), energy_(0), etotal_(0), time_(0), it_(0) {}
 
-public: 
-
- PassiveHit(std::string vname, unsigned int id, float e=0, float etot=0, 
-	    float t=0, int it=0) : vname_(vname), id_(id), energy_(e), 
-    etotal_(etot), time_(t), it_(it) {}
- PassiveHit() : vname_(""), id_(0), energy_(0), etotal_(0), time_(0), it_(0) {}
-  
   //Names
   static const char *name() { return "PassiveHit"; }
 
-  const char * getName() const { return name (); }
+  const char *getName() const { return name(); }
 
   //Energy deposit of the Hit
-  double energy()    const { return energy_; }
+  double energy() const { return energy_; }
   void setEnergy(double e) { energy_ = e; }
   double energyTotal() const { return etotal_; }
   void setEnergyTotal(double e) { etotal_ = e; }
 
   //Time of the deposit
-  double time() const   { return time_; }
-  void setTime(float t) { time_ = t;}
+  double time() const { return time_; }
+  void setTime(float t) { time_ = t; }
 
   //Geant track number
-  int trackId() const     { return it_; }
+  int trackId() const { return it_; }
   void setTrackId(int it) { it_ = it; }
 
   //DetId where the Hit is recorded
-  void setID(std::string vname, unsigned int id) { vname_ = vname; id_ = id; }
-  std::string   vname() const { return vname_; }
-  unsigned int  id()    const { return id_; }
+  void setID(std::string vname, unsigned int id) {
+    vname_ = vname;
+    id_ = id;
+  }
+  std::string vname() const { return vname_; }
+  unsigned int id() const { return id_; }
 
   //Comparisons
   bool operator<(const PassiveHit &d) const { return energy_ < d.energy_; }
 
   //Same Hit (by value)
-  bool operator==(const PassiveHit &d) const 
-  { return (energy_ == d.energy_ && id_ == d.id_ && vname_ == d.vname_); }
-  
+  bool operator==(const PassiveHit &d) const { return (energy_ == d.energy_ && id_ == d.id_ && vname_ == d.vname_); }
 
-protected: 
-  std::string  vname_;
+protected:
+  std::string vname_;
   unsigned int id_;
-  float        energy_;
-  float        etotal_;
-  float        time_;
-  int          it_; 
-}; 
+  float energy_;
+  float etotal_;
+  float time_;
+  int it_;
+};
 
 namespace edm {
   typedef std::vector<PassiveHit> PassiveHitContainer;
-} // edm
+}  // namespace edm
 
-#include<iosfwd>
-std::ostream &operator<<(std::ostream &, const PassiveHit &); 
+#include <iosfwd>
+std::ostream &operator<<(std::ostream &, const PassiveHit &);
 
-#endif // _SimDataFormats_SimCaloHit_PassiveHit_h_
+#endif  // _SimDataFormats_SimCaloHit_PassiveHit_h_
diff --git a/SimDataFormats/CaloHit/src/CaloHit.cc b/SimDataFormats/CaloHit/src/CaloHit.cc
index 6a35aa07007ef..ba06b2c6a319d 100644
--- a/SimDataFormats/CaloHit/src/CaloHit.cc
+++ b/SimDataFormats/CaloHit/src/CaloHit.cc
@@ -6,34 +6,30 @@
 
 #include <iomanip>
 
-CaloHit::CaloHit(int deti, int layi, double ei, double etai, double fi, 
-		 double timi, uint32_t idi): deth(deti), layerh(layi), 
-					     eh(ei), etah(etai), phih(fi), 
-					     timeh(timi), idh(idi) {}
+CaloHit::CaloHit(int deti, int layi, double ei, double etai, double fi, double timi, uint32_t idi)
+    : deth(deti), layerh(layi), eh(ei), etah(etai), phih(fi), timeh(timi), idh(idi) {}
 
-CaloHit::CaloHit():  deth(0), layerh(0), eh(0), etah(0), phih(0), timeh(0),
-		     idh(0) {}
+CaloHit::CaloHit() : deth(0), layerh(0), eh(0), etah(0), phih(0), timeh(0), idh(0) {}
 
-CaloHit::CaloHit(const CaloHit &right) {
-  deth   = right.deth;
+CaloHit::CaloHit(const CaloHit& right) {
+  deth = right.deth;
   layerh = right.layerh;
-  eh     = right.eh;
-  etah   = right.etah;
-  phih   = right.phih;
-  timeh  = right.timeh;
-  idh    = right.idh;
+  eh = right.eh;
+  etah = right.etah;
+  phih = right.phih;
+  timeh = right.timeh;
+  idh = right.idh;
 }
 
 CaloHit::~CaloHit() {}
 
 bool CaloHit::operator<(const CaloHit& hit) const {
-  return (eh/cosh(etah) < hit.e()/cosh(hit.eta())) ? false : true ; 
+  return (eh / cosh(etah) < hit.e() / cosh(hit.eta())) ? false : true;
 }
 
 std::ostream& operator<<(std::ostream& os, const CaloHit& hit) {
-  os << "E "     << std::setw(6) << hit.e()   << " eta " << std::setw(6) 
-     << hit.eta() << " phi "  << std::setw(6) << hit.phi() << " t "   
-     << std::setw(6) << hit.t() << " layer " << hit.layer() << " det " 
-     << hit.det() << " id 0x" << std::hex << hit.id() << std::dec;
+  os << "E " << std::setw(6) << hit.e() << " eta " << std::setw(6) << hit.eta() << " phi " << std::setw(6) << hit.phi()
+     << " t " << std::setw(6) << hit.t() << " layer " << hit.layer() << " det " << hit.det() << " id 0x" << std::hex
+     << hit.id() << std::dec;
   return os;
 }
diff --git a/SimDataFormats/CaloHit/src/CastorShowerEvent.cc b/SimDataFormats/CaloHit/src/CastorShowerEvent.cc
index 7fc6115bc3266..96eb0915e6438 100644
--- a/SimDataFormats/CaloHit/src/CastorShowerEvent.cc
+++ b/SimDataFormats/CaloHit/src/CastorShowerEvent.cc
@@ -2,23 +2,22 @@
 #include <iostream>
 
 CastorShowerEvent::CastorShowerEvent() {
-   // Clear();
-   // std::cout << "\n    *** CastorShowerEvent object created ***    " << std::endl;
+  // Clear();
+  // std::cout << "\n    *** CastorShowerEvent object created ***    " << std::endl;
 }
 
 CastorShowerEvent::~CastorShowerEvent() {}
 
-    
-void CastorShowerEvent::Clear(Option_t * option) {
-   nhit = 0;
-   detID.clear();
-   hitPosition.clear();
-   nphotons.clear();
-   time.clear();
-   primaryEnergy = 0.;
-   primEta = 0.;
-   primPhi = 0.;
-   primX = 0.;
-   primY = 0.;
-   primZ = 0.;
+void CastorShowerEvent::Clear(Option_t* option) {
+  nhit = 0;
+  detID.clear();
+  hitPosition.clear();
+  nphotons.clear();
+  time.clear();
+  primaryEnergy = 0.;
+  primEta = 0.;
+  primPhi = 0.;
+  primX = 0.;
+  primY = 0.;
+  primZ = 0.;
 }
diff --git a/SimDataFormats/CaloHit/src/CastorShowerLibraryInfo.cc b/SimDataFormats/CaloHit/src/CastorShowerLibraryInfo.cc
index 91930dd593d13..71599104305ca 100644
--- a/SimDataFormats/CaloHit/src/CastorShowerLibraryInfo.cc
+++ b/SimDataFormats/CaloHit/src/CastorShowerLibraryInfo.cc
@@ -2,14 +2,14 @@
 #include <iostream>
 
 CastorShowerLibraryInfo::CastorShowerLibraryInfo() {
-   // Clear();
-   // std::cout << "\n    *** CastorShowerLibraryInfo object created ***    " << std::endl;
+  // Clear();
+  // std::cout << "\n    *** CastorShowerLibraryInfo object created ***    " << std::endl;
 }
 
 CastorShowerLibraryInfo::~CastorShowerLibraryInfo() {}
 
-void CastorShowerLibraryInfo::Clear(Option_t * option) {
-   Energy.Clear();
-   Eta.Clear();
-   Phi.Clear();
+void CastorShowerLibraryInfo::Clear(Option_t* option) {
+  Energy.Clear();
+  Eta.Clear();
+  Phi.Clear();
 }
diff --git a/SimDataFormats/CaloHit/src/HFShowerLibraryEventInfo.cc b/SimDataFormats/CaloHit/src/HFShowerLibraryEventInfo.cc
index 2a43cab09aec1..9b94fca702bbd 100644
--- a/SimDataFormats/CaloHit/src/HFShowerLibraryEventInfo.cc
+++ b/SimDataFormats/CaloHit/src/HFShowerLibraryEventInfo.cc
@@ -1,10 +1,10 @@
 #include "SimDataFormats/CaloHit/interface/HFShowerLibraryEventInfo.h"
 
-HFShowerLibraryEventInfo::HFShowerLibraryEventInfo(int events, int bins, 
-						   int eventsPerBin,
-						   float libraryVersion,
-						   float physListVersion, 
-						   const std::vector<double>& en) :
-  fEvents(events), fBins(bins), fEventsPerBin(eventsPerBin),
-  fHFShowerLibVers(libraryVersion), fPhyListVers(physListVersion), 
-  fEnergies(en) {}
+HFShowerLibraryEventInfo::HFShowerLibraryEventInfo(
+    int events, int bins, int eventsPerBin, float libraryVersion, float physListVersion, const std::vector<double>& en)
+    : fEvents(events),
+      fBins(bins),
+      fEventsPerBin(eventsPerBin),
+      fHFShowerLibVers(libraryVersion),
+      fPhyListVers(physListVersion),
+      fEnergies(en) {}
diff --git a/SimDataFormats/CaloHit/src/HFShowerPhoton.cc b/SimDataFormats/CaloHit/src/HFShowerPhoton.cc
index 0f0a64a7f5451..13887135db768 100644
--- a/SimDataFormats/CaloHit/src/HFShowerPhoton.cc
+++ b/SimDataFormats/CaloHit/src/HFShowerPhoton.cc
@@ -6,25 +6,21 @@
 
 #include <iomanip>
 
-HFShowerPhoton::HFShowerPhoton(float x, float y, float z, float lambda,
-			       float t): position_(Point(x,y,z)), 
-					 lambda_(lambda), time_(t) { }
+HFShowerPhoton::HFShowerPhoton(float x, float y, float z, float lambda, float t)
+    : position_(Point(x, y, z)), lambda_(lambda), time_(t) {}
 
-HFShowerPhoton::HFShowerPhoton(const Point &p, float t, 
-			       float lambda) : position_(p), lambda_(lambda), 
-					       time_(t) { }
+HFShowerPhoton::HFShowerPhoton(const Point& p, float t, float lambda) : position_(p), lambda_(lambda), time_(t) {}
 
-HFShowerPhoton::HFShowerPhoton(const HFShowerPhoton &right) {
+HFShowerPhoton::HFShowerPhoton(const HFShowerPhoton& right) {
   position_ = right.position_;
-  lambda_   = right.lambda_;
-  time_     = right.time_;
+  lambda_ = right.lambda_;
+  time_ = right.time_;
 }
 
 HFShowerPhoton::~HFShowerPhoton() {}
 
 std::ostream& operator<<(std::ostream& os, const HFShowerPhoton& it) {
-  os << "X "   << std::setw(6) << it.x() << " Y " << std::setw(6) 
-     << it.y() << " Z "  << std::setw(6) << it.z() << " t " << std::setw(6) 
-     << it.t() << " lambda " << it.lambda();
+  os << "X " << std::setw(6) << it.x() << " Y " << std::setw(6) << it.y() << " Z " << std::setw(6) << it.z() << " t "
+     << std::setw(6) << it.t() << " lambda " << it.lambda();
   return os;
 }
diff --git a/SimDataFormats/CaloHit/src/PCaloHit.cc b/SimDataFormats/CaloHit/src/PCaloHit.cc
index 5ba5c094a5c8b..bf2c76c9055c0 100644
--- a/SimDataFormats/CaloHit/src/PCaloHit.cc
+++ b/SimDataFormats/CaloHit/src/PCaloHit.cc
@@ -1,26 +1,22 @@
 #include "SimDataFormats/CaloHit/interface/PCaloHit.h"
-#include<iostream>
+#include <iostream>
 
-PCaloHit::PCaloHit(float eEM, float eHad, float t, int i, 
-		   uint16_t d) : myTime(t), myItra(i), myDepth(d) { 
+PCaloHit::PCaloHit(float eEM, float eHad, float t, int i, uint16_t d) : myTime(t), myItra(i), myDepth(d) {
   myEnergy = eEM + eHad;
-  myEMFraction = (myEnergy <= 0. ? 1. :eEM/myEnergy);
+  myEMFraction = (myEnergy <= 0. ? 1. : eEM / myEnergy);
 }
 
-PCaloHit::PCaloHit(unsigned int id, float eEM, float eHad, float t, int i, 
-		   uint16_t d) : myTime(t), myItra(i), detId(id), myDepth(d) {
+PCaloHit::PCaloHit(unsigned int id, float eEM, float eHad, float t, int i, uint16_t d)
+    : myTime(t), myItra(i), detId(id), myDepth(d) {
   myEnergy = eEM + eHad;
-  myEMFraction = (myEnergy <= 0. ? 1. :eEM/myEnergy);
+  myEMFraction = (myEnergy <= 0. ? 1. : eEM / myEnergy);
 }
 
-
-std::ostream & operator<<(std::ostream& o,const PCaloHit& hit)  {
-  o << "0x" <<std::hex << hit.id() << std::dec
-    << ": Energy (EM) " << hit.energyEM() << " GeV "
+std::ostream& operator<<(std::ostream& o, const PCaloHit& hit) {
+  o << "0x" << std::hex << hit.id() << std::dec << ": Energy (EM) " << hit.energyEM() << " GeV "
     << ": Energy (Had) " << hit.energyHad() << " GeV "
     << " Tof " << hit.time() << " ns "
-    << " Geant track #" << hit.geantTrackId()
-    << " Encoded depth " << hit.depth();
+    << " Geant track #" << hit.geantTrackId() << " Encoded depth " << hit.depth();
 
   return o;
 }
diff --git a/SimDataFormats/CaloHit/src/PassiveHit.cc b/SimDataFormats/CaloHit/src/PassiveHit.cc
index 7cb835f9b49d3..0ef729e57c71e 100644
--- a/SimDataFormats/CaloHit/src/PassiveHit.cc
+++ b/SimDataFormats/CaloHit/src/PassiveHit.cc
@@ -1,10 +1,10 @@
 #include "SimDataFormats/CaloHit/interface/PassiveHit.h"
-#include<iostream>
+#include <iostream>
 
-std::ostream & operator<<(std::ostream& o,const PassiveHit& hit)  {
-  o << hit.vname() << "  0x" <<std::hex << hit.id() << std::dec
-    << ": Energy " << hit.energy() << " GeV: " << hit.energyTotal()
-    << " GeV: Tof " << hit.time() << " ns: " << " Track # "  << hit.trackId();
+std::ostream& operator<<(std::ostream& o, const PassiveHit& hit) {
+  o << hit.vname() << "  0x" << std::hex << hit.id() << std::dec << ": Energy " << hit.energy()
+    << " GeV: " << hit.energyTotal() << " GeV: Tof " << hit.time() << " ns: "
+    << " Track # " << hit.trackId();
 
   return o;
 }
diff --git a/SimDataFormats/CaloHit/src/classes.h b/SimDataFormats/CaloHit/src/classes.h
index 5bc89a67f6168..7d47b4fcc3c00 100644
--- a/SimDataFormats/CaloHit/src/classes.h
+++ b/SimDataFormats/CaloHit/src/classes.h
@@ -6,4 +6,3 @@
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 #include "SimDataFormats/CaloHit/interface/PassiveHit.h"
 #include "DataFormats/Common/interface/Wrapper.h"
-
diff --git a/SimDataFormats/CaloTest/interface/HGCalTestNumbering.h b/SimDataFormats/CaloTest/interface/HGCalTestNumbering.h
index 5857041fde5b5..6e119755352e9 100644
--- a/SimDataFormats/CaloTest/interface/HGCalTestNumbering.h
+++ b/SimDataFormats/CaloTest/interface/HGCalTestNumbering.h
@@ -8,45 +8,39 @@
 #include <boost/cstdint.hpp>
 
 class HGCalTestNumbering {
-
 public:
-  static const int kHGCalCellSOffset      = 0;
-  static const int kHGCalCellSMask        = 0xFFFF;
-  static const int kHGCalSectorSOffset    = 16;
-  static const int kHGCalSectorSMask      = 0x7F;
+  static const int kHGCalCellSOffset = 0;
+  static const int kHGCalCellSMask = 0xFFFF;
+  static const int kHGCalSectorSOffset = 16;
+  static const int kHGCalSectorSMask = 0x7F;
   static const int kHGCalSubSectorSOffset = 23;
-  static const int kHGCalSubSectorSMask   = 0x1;
-  static const int kHGCalLayerSOffset     = 24;
-  static const int kHGCalLayerSMask       = 0x7F;
-  static const int kHGCalZsideSOffset     = 31;
-  static const int kHGCalZsideSMask       = 0x1;
+  static const int kHGCalSubSectorSMask = 0x1;
+  static const int kHGCalLayerSOffset = 24;
+  static const int kHGCalLayerSMask = 0x7F;
+  static const int kHGCalZsideSOffset = 31;
+  static const int kHGCalZsideSMask = 0x1;
 
-  static const int kHGCalCellHOffset      = 0;
-  static const int kHGCalCellHMask        = 0xFF;
-  static const int kHGCalCellTypHOffset   = 8;
-  static const int kHGCalCellTypHMask     = 0x1;
-  static const int kHGCalWaferHOffset     = 9;
-  static const int kHGCalWaferHMask       = 0x3FF;
-  static const int kHGCalLayerHOffset     = 19;
-  static const int kHGCalLayerHMask       = 0x7F;
-  static const int kHGCalZsideHOffset     = 26;
-  static const int kHGCalZsideHMask       = 0x1;
-  static const int kHGCalSubdetHOffset    = 27;
-  static const int kHGCalSubdetHMask      = 0x7;
+  static const int kHGCalCellHOffset = 0;
+  static const int kHGCalCellHMask = 0xFF;
+  static const int kHGCalCellTypHOffset = 8;
+  static const int kHGCalCellTypHMask = 0x1;
+  static const int kHGCalWaferHOffset = 9;
+  static const int kHGCalWaferHMask = 0x3FF;
+  static const int kHGCalLayerHOffset = 19;
+  static const int kHGCalLayerHMask = 0x7F;
+  static const int kHGCalZsideHOffset = 26;
+  static const int kHGCalZsideHMask = 0x1;
+  static const int kHGCalSubdetHOffset = 27;
+  static const int kHGCalSubdetHMask = 0x7;
   HGCalTestNumbering() {}
   virtual ~HGCalTestNumbering() {}
-  static uint32_t  packSquareIndex(int z, int lay, int sec, int subsec,
-				   int cell);
-  static uint32_t  packHexagonIndex(int subdet, int z, int lay, int wafer, 
-				    int celltyp, int cell);
-  static void      unpackSquareIndex(const uint32_t& idx, int& z, int& lay, 
-				     int& sec, int& subsec, int& cell);
-  static void      unpackHexagonIndex(const uint32_t& idx, int& subdet, int& z,
-				      int& lay, int& wafer, int& celltyp, 
-				      int& cell);
-  static bool      isValidSquare(int z, int lay, int sec, int subsec, int cell);
-  static bool      isValidHexagon(int subdet, int z, int lay, int wafer, 
-				  int celltyp, int cell);
+  static uint32_t packSquareIndex(int z, int lay, int sec, int subsec, int cell);
+  static uint32_t packHexagonIndex(int subdet, int z, int lay, int wafer, int celltyp, int cell);
+  static void unpackSquareIndex(const uint32_t& idx, int& z, int& lay, int& sec, int& subsec, int& cell);
+  static void unpackHexagonIndex(
+      const uint32_t& idx, int& subdet, int& z, int& lay, int& wafer, int& celltyp, int& cell);
+  static bool isValidSquare(int z, int lay, int sec, int subsec, int cell);
+  static bool isValidHexagon(int subdet, int z, int lay, int wafer, int celltyp, int cell);
 };
 
 #endif
diff --git a/SimDataFormats/CaloTest/interface/HcalTestHistoClass.h b/SimDataFormats/CaloTest/interface/HcalTestHistoClass.h
index 4d016ca464990..5be23555799c8 100644
--- a/SimDataFormats/CaloTest/interface/HcalTestHistoClass.h
+++ b/SimDataFormats/CaloTest/interface/HcalTestHistoClass.h
@@ -14,20 +14,24 @@
 #include <memory>
 
 class HcalTestHistoClass {
-
-public: 
-
-  HcalTestHistoClass(int i)     {}
+public:
+  HcalTestHistoClass(int i) {}
   explicit HcalTestHistoClass() {}
   virtual ~HcalTestHistoClass() {}
 
   void setCounters();
-  void fillLayers (double el[], double ho, double hbhe, double muxy[]);
-  void fillHits   (std::vector<CaloHit>&);
-  void fillQie    (int id, double esimtot, double eqietot, int nGroup,
-		   const std::vector<double>& longs,  const std::vector<double>& longq,
-		   int nTower, const std::vector<double>& latphi, 
-		   const std::vector<double>& latfs, const std::vector<double>& latfq);
+  void fillLayers(double el[], double ho, double hbhe, double muxy[]);
+  void fillHits(std::vector<CaloHit>&);
+  void fillQie(int id,
+               double esimtot,
+               double eqietot,
+               int nGroup,
+               const std::vector<double>& longs,
+               const std::vector<double>& longq,
+               int nTower,
+               const std::vector<double>& latphi,
+               const std::vector<double>& latfs,
+               const std::vector<double>& latfq);
 
   struct Layer {
     Layer() {}
@@ -37,8 +41,8 @@ class HcalTestHistoClass {
 
   struct Hit {
     Hit() {}
-    int   layer;
-    int   id;
+    int layer;
+    int id;
     float eta;
     float phi;
     float e;
@@ -50,25 +54,23 @@ class HcalTestHistoClass {
     QIE() {}
     float sim;
     float qie;
-    int   id;
+    int id;
     std::vector<float> lats, latq;
     std::vector<float> lngs, lngq;
-    std::vector<int>   tow;
+    std::vector<int> tow;
   };
 
 private:
-
-  const static int   nLayersMAX = 20;
-  int                nLayers;
+  const static int nLayersMAX = 20;
+  int nLayers;
   std::vector<Layer> layers;
-  float              eHO, eHBHE;
- 
-  int                nHits; 
-  std::vector<Hit>   hits;
+  float eHO, eHBHE;
 
-  int                nQIE, nTowerQIE, nGroupQIE;
-  std::vector<QIE>   qie;
+  int nHits;
+  std::vector<Hit> hits;
 
+  int nQIE, nTowerQIE, nGroupQIE;
+  std::vector<QIE> qie;
 };
 
 #endif
diff --git a/SimDataFormats/CaloTest/interface/ParticleFlux.h b/SimDataFormats/CaloTest/interface/ParticleFlux.h
index 0480bb11192c7..f0b58b6805d22 100644
--- a/SimDataFormats/CaloTest/interface/ParticleFlux.h
+++ b/SimDataFormats/CaloTest/interface/ParticleFlux.h
@@ -9,35 +9,31 @@
 #include "DataFormats/Math/interface/Vector3D.h"
 
 class ParticleFlux {
-
 public:
-
-  ParticleFlux(std::string name="", int id=0) : detName_(name), detId_(id) {}
+  ParticleFlux(std::string name = "", int id = 0) : detName_(name), detId_(id) {}
   virtual ~ParticleFlux() {}
 
   struct flux {
-    int                pdgId, vxType;
-    float              tof;
-    math::GlobalPoint  vertex, hitPoint;
+    int pdgId, vxType;
+    float tof;
+    math::GlobalPoint vertex, hitPoint;
     math::GlobalVector momentum;
-    flux(int id=0, int typ=0, float t=0) : pdgId(id), vxType(typ), tof(t) {}
+    flux(int id = 0, int typ = 0, float t = 0) : pdgId(id), vxType(typ), tof(t) {}
   };
 
-  std::string const&              getName() const {return detName_;}
-  int                             getId() const {return detId_;}
-  unsigned int                    getComponents() const {return fluxVector_.size();}
-  std::vector<ParticleFlux::flux> getFlux() const& {return fluxVector_;}
-  void                            setName(const std::string nm) {detName_ = nm;}
-  void                            setId(const int id) {detId_ = id;}
-  void                            addFlux(const ParticleFlux::flux f);
-  void                            clear();
+  std::string const& getName() const { return detName_; }
+  int getId() const { return detId_; }
+  unsigned int getComponents() const { return fluxVector_.size(); }
+  std::vector<ParticleFlux::flux> getFlux() const& { return fluxVector_; }
+  void setName(const std::string nm) { detName_ = nm; }
+  void setId(const int id) { detId_ = id; }
+  void addFlux(const ParticleFlux::flux f);
+  void clear();
 
 private:
-
-  std::string       detName_;
-  int               detId_;
+  std::string detName_;
+  int detId_;
   std::vector<flux> fluxVector_;
-
 };
 
 #endif
diff --git a/SimDataFormats/CaloTest/src/HGCalTestNumbering.cc b/SimDataFormats/CaloTest/src/HGCalTestNumbering.cc
index d3310f214aef6..b6fd2cb96ecab 100644
--- a/SimDataFormats/CaloTest/src/HGCalTestNumbering.cc
+++ b/SimDataFormats/CaloTest/src/HGCalTestNumbering.cc
@@ -3,76 +3,62 @@
 
 //#define EDM_ML_DEBUG
 
-uint32_t HGCalTestNumbering::packSquareIndex(int zp, int lay, int sec, 
-					     int subsec, int cell) {
-
-  if (!HGCalTestNumbering::isValidSquare(zp, lay, sec, subsec,lay)) {
+uint32_t HGCalTestNumbering::packSquareIndex(int zp, int lay, int sec, int subsec, int cell) {
+  if (!HGCalTestNumbering::isValidSquare(zp, lay, sec, subsec, lay)) {
     zp = lay = sec = subsec = cell = 0;
   }
 
-  uint32_t rawid=0;
-  rawid |= ((cell   & kHGCalCellSMask)        << kHGCalCellSOffset);
-  rawid |= ((sec    & kHGCalSectorSMask)      << kHGCalSectorSOffset);
-  if (subsec<0) subsec=0;
-  rawid |= ((subsec & kHGCalSubSectorSMask)   << kHGCalSubSectorSOffset);
-  rawid |= ((lay    & kHGCalLayerSMask)       << kHGCalLayerSOffset);
-  if (zp>0) rawid |= ((zp & kHGCalZsideSMask) << kHGCalZsideSOffset);
+  uint32_t rawid = 0;
+  rawid |= ((cell & kHGCalCellSMask) << kHGCalCellSOffset);
+  rawid |= ((sec & kHGCalSectorSMask) << kHGCalSectorSOffset);
+  if (subsec < 0)
+    subsec = 0;
+  rawid |= ((subsec & kHGCalSubSectorSMask) << kHGCalSubSectorSOffset);
+  rawid |= ((lay & kHGCalLayerSMask) << kHGCalLayerSOffset);
+  if (zp > 0)
+    rawid |= ((zp & kHGCalZsideSMask) << kHGCalZsideSOffset);
   return rawid;
 }
 
-uint32_t HGCalTestNumbering::packHexagonIndex(int subdet, int zp, int lay, 
-					      int wafer,  int celltyp, 
-					      int cell) {
-
-  if (!HGCalTestNumbering::isValidHexagon(subdet,zp,lay,wafer,celltyp,cell)) {
+uint32_t HGCalTestNumbering::packHexagonIndex(int subdet, int zp, int lay, int wafer, int celltyp, int cell) {
+  if (!HGCalTestNumbering::isValidHexagon(subdet, zp, lay, wafer, celltyp, cell)) {
     subdet = zp = lay = wafer = celltyp = cell = 0;
   }
-  
-  uint32_t rawid=0;
-  rawid |= ((cell   & kHGCalCellHMask)        << kHGCalCellHOffset);
-  rawid |= ((celltyp& kHGCalCellTypHMask)     << kHGCalCellTypHOffset);
-  rawid |= ((wafer  & kHGCalWaferHMask)       << kHGCalWaferHOffset);
-  rawid |= ((lay    & kHGCalLayerHMask)       << kHGCalLayerHOffset);
-  if (zp>0) rawid |= ((zp & kHGCalZsideHMask) << kHGCalZsideHOffset);
-  rawid |= ((subdet & kHGCalSubdetHMask)      << kHGCalSubdetHOffset);
+
+  uint32_t rawid = 0;
+  rawid |= ((cell & kHGCalCellHMask) << kHGCalCellHOffset);
+  rawid |= ((celltyp & kHGCalCellTypHMask) << kHGCalCellTypHOffset);
+  rawid |= ((wafer & kHGCalWaferHMask) << kHGCalWaferHOffset);
+  rawid |= ((lay & kHGCalLayerHMask) << kHGCalLayerHOffset);
+  if (zp > 0)
+    rawid |= ((zp & kHGCalZsideHMask) << kHGCalZsideHOffset);
+  rawid |= ((subdet & kHGCalSubdetHMask) << kHGCalSubdetHOffset);
   return rawid;
 }
 
-void HGCalTestNumbering::unpackSquareIndex(const uint32_t& idx, int& zp,
-					   int& lay, int& sec, int& subsec,
-					   int& cell) {
-
-  cell   = (idx>>kHGCalCellSOffset)&kHGCalCellSMask;
-  subsec = ((idx>>kHGCalSubSectorSOffset)&kHGCalSubSectorSMask ? 1 : -1);
-  sec    = (idx>>kHGCalSectorSOffset)&kHGCalSectorSMask;
-  lay    = (idx>>kHGCalLayerSOffset)&kHGCalLayerSMask;
-  zp     = ((idx>>kHGCalZsideSOffset) & kHGCalZsideSMask ? 1 : -1); 
+void HGCalTestNumbering::unpackSquareIndex(const uint32_t& idx, int& zp, int& lay, int& sec, int& subsec, int& cell) {
+  cell = (idx >> kHGCalCellSOffset) & kHGCalCellSMask;
+  subsec = ((idx >> kHGCalSubSectorSOffset) & kHGCalSubSectorSMask ? 1 : -1);
+  sec = (idx >> kHGCalSectorSOffset) & kHGCalSectorSMask;
+  lay = (idx >> kHGCalLayerSOffset) & kHGCalLayerSMask;
+  zp = ((idx >> kHGCalZsideSOffset) & kHGCalZsideSMask ? 1 : -1);
 }
 
-
-void HGCalTestNumbering::unpackHexagonIndex(const uint32_t& idx, int& subdet,
-					    int& zp, int& lay, int& wafer,
-					    int& celltyp, int& cell) {
-  cell   = (idx>>kHGCalCellHOffset)&kHGCalCellHMask;
-  celltyp= (idx>>kHGCalCellTypHOffset)&kHGCalCellTypHMask;
-  wafer  = (idx>>kHGCalWaferHOffset)&kHGCalWaferHMask;
-  lay    = (idx>>kHGCalLayerHOffset)&kHGCalLayerHMask;
-  zp     = ((idx>>kHGCalZsideHOffset) & kHGCalZsideHMask ? 1 : -1); 
-  subdet = (idx>>kHGCalSubdetHOffset)&kHGCalSubdetHMask;
+void HGCalTestNumbering::unpackHexagonIndex(
+    const uint32_t& idx, int& subdet, int& zp, int& lay, int& wafer, int& celltyp, int& cell) {
+  cell = (idx >> kHGCalCellHOffset) & kHGCalCellHMask;
+  celltyp = (idx >> kHGCalCellTypHOffset) & kHGCalCellTypHMask;
+  wafer = (idx >> kHGCalWaferHOffset) & kHGCalWaferHMask;
+  lay = (idx >> kHGCalLayerHOffset) & kHGCalLayerHMask;
+  zp = ((idx >> kHGCalZsideHOffset) & kHGCalZsideHMask ? 1 : -1);
+  subdet = (idx >> kHGCalSubdetHOffset) & kHGCalSubdetHMask;
 }
 
-bool HGCalTestNumbering::isValidSquare(int zp, int lay, int sec, int subsec,
-				       int cell) {
-
-  if (cell > kHGCalCellSMask || sec>kHGCalSectorSMask || 
-      subsec > kHGCalSubSectorSMask || lay>kHGCalLayerSMask ) {
+bool HGCalTestNumbering::isValidSquare(int zp, int lay, int sec, int subsec, int cell) {
+  if (cell > kHGCalCellSMask || sec > kHGCalSectorSMask || subsec > kHGCalSubSectorSMask || lay > kHGCalLayerSMask) {
 #ifdef EDM_ML_DEBUG
-    std::cout << "[HGCalTestNumbering] request for new id for layer=" << lay
-              << " zp=" << zp 
-              << " sector=" << sec 
-              << " subsec=" << subsec 
-              << " cell=" << cell 
-              << " has one or more fields out of bounds and will be reset" 
+    std::cout << "[HGCalTestNumbering] request for new id for layer=" << lay << " zp=" << zp << " sector=" << sec
+              << " subsec=" << subsec << " cell=" << cell << " has one or more fields out of bounds and will be reset"
               << std::endl;
 #endif
     return false;
@@ -80,21 +66,13 @@ bool HGCalTestNumbering::isValidSquare(int zp, int lay, int sec, int subsec,
   return true;
 }
 
-bool HGCalTestNumbering::isValidHexagon(int subdet, int zp, int lay, int wafer,
-					int celltyp, int cell) {
-
-  if (cell > kHGCalCellHMask || celltyp>kHGCalCellTypHMask || 
-      wafer > kHGCalWaferHMask || lay>kHGCalLayerSMask || 
+bool HGCalTestNumbering::isValidHexagon(int subdet, int zp, int lay, int wafer, int celltyp, int cell) {
+  if (cell > kHGCalCellHMask || celltyp > kHGCalCellTypHMask || wafer > kHGCalWaferHMask || lay > kHGCalLayerSMask ||
       subdet > kHGCalSubdetHMask) {
 #ifdef EDM_ML_DEBUG
-    std::cout << "[HGCalTestNumbering] request for new id for layer=" << lay
-              << " zp=" << zp 
-              << " wafer=" << wafer
-              << " celltyp=" << celltyp 
-              << " cell=" << cell 
-              << " for subdet=" << subdet 
-              << " has one or more fields out of bounds and will be reset" 
-              << std::endl;
+    std::cout << "[HGCalTestNumbering] request for new id for layer=" << lay << " zp=" << zp << " wafer=" << wafer
+              << " celltyp=" << celltyp << " cell=" << cell << " for subdet=" << subdet
+              << " has one or more fields out of bounds and will be reset" << std::endl;
 #endif
     return false;
   }
diff --git a/SimDataFormats/CaloTest/src/HcalTestHistoClass.cc b/SimDataFormats/CaloTest/src/HcalTestHistoClass.cc
index b70e4a9316a0e..0b96d3c17c463 100644
--- a/SimDataFormats/CaloTest/src/HcalTestHistoClass.cc
+++ b/SimDataFormats/CaloTest/src/HcalTestHistoClass.cc
@@ -10,23 +10,20 @@
 #include <iostream>
 #include <cmath>
 
-void HcalTestHistoClass::setCounters(){
-  nLayers   = 0;
-  nHits     = 0;
-  nQIE      = 0;
+void HcalTestHistoClass::setCounters() {
+  nLayers = 0;
+  nHits = 0;
+  nQIE = 0;
   nTowerQIE = 0;
   nGroupQIE = 0;
 }
 
-void HcalTestHistoClass::fillLayers(double* edepl, double edepHO,
-				    double edepHBHE, double* muxy) {
-
+void HcalTestHistoClass::fillLayers(double* edepl, double edepHO, double edepHBHE, double* muxy) {
   nLayers = 0;
   layers.resize(nLayersMAX);
   for (int i = 0; i < 20; i++) {
-    double ed  = 0.001*edepl[i];
-    LogDebug("HcalSim") << "HcalTestHistoClass:: fillLayer: nLayers, ed " << i 
-			<< " "  << ed;
+    double ed = 0.001 * edepl[i];
+    LogDebug("HcalSim") << "HcalTestHistoClass:: fillLayer: nLayers, ed " << i << " " << ed;
     if (nLayers < nLayersMAX) {
       layers[i].e = ed;
       layers[i].muDist = muxy[i];
@@ -34,63 +31,58 @@ void HcalTestHistoClass::fillLayers(double* edepl, double edepHO,
     }
   }
 
-  eHO   = edepHO;
+  eHO = edepHO;
   eHBHE = edepHBHE;
 }
 
 void HcalTestHistoClass::fillHits(std::vector<CaloHit>& hitcache) {
-
   int nHit = hitcache.size();
-  int hit  = 0;
+  int hit = 0;
   int i;
   std::vector<CaloHit>::iterator itr;
   std::vector<CaloHit*> lhits(nHit);
   for (i = 0, itr = hitcache.begin(); itr != hitcache.end(); i++, itr++) {
-    uint32_t unitID=itr->id();
-    int   subdet, zside, group, ieta, iphi, lay;
-    HcalTestNumbering::unpackHcalIndex(unitID, subdet, zside, group,
-				       ieta, iphi, lay);
+    uint32_t unitID = itr->id();
+    int subdet, zside, group, ieta, iphi, lay;
+    HcalTestNumbering::unpackHcalIndex(unitID, subdet, zside, group, ieta, iphi, lay);
     subdet = itr->det();
-    lay    = itr->layer();
-    group  = (subdet&15)<<20;
-    group += ((lay-1)&31)<<15;
-    group += (zside&1)<<14;
-    group += (ieta&127)<<7;
-    group += (iphi&127);
+    lay = itr->layer();
+    group = (subdet & 15) << 20;
+    group += ((lay - 1) & 31) << 15;
+    group += (zside & 1) << 14;
+    group += (ieta & 127) << 7;
+    group += (iphi & 127);
     itr->setId(group);
     lhits[i] = &hitcache[i];
-    LogDebug("HcalSim") << "HcalTestHistoClass::fillHits:Original " << i 
-			<< " " << hitcache[i];
-    LogDebug("HcalSim") << "HcalTestHistoClass::fillHits:Copied   " << i 
-			<< " " << *lhits[i];
+    LogDebug("HcalSim") << "HcalTestHistoClass::fillHits:Original " << i << " " << hitcache[i];
+    LogDebug("HcalSim") << "HcalTestHistoClass::fillHits:Copied   " << i << " " << *lhits[i];
   }
-  sort(lhits.begin(),lhits.end(),CaloHitIdMore());
+  sort(lhits.begin(), lhits.end(), CaloHitIdMore());
   std::vector<CaloHit*>::iterator k1, k2;
   for (i = 0, k1 = lhits.begin(); k1 != lhits.end(); i++, k1++)
-    LogDebug("HcalSim") << "HcalTestHistoClass::fillHits:Sorted " << i << " " 
-			<< **k1;
+    LogDebug("HcalSim") << "HcalTestHistoClass::fillHits:Sorted " << i << " " << **k1;
 
   hits.resize(lhits.size());
   for (i = 0, k1 = lhits.begin(); k1 != lhits.end(); i++, k1++) {
-    double       ehit  = (**k1).e();
-    double       jitter= (**k1).t();
-    unsigned int unitID= (**k1).id();
-    int          jump  = 0;
-    LogDebug("HcalSim") << "HcalTestHistoClass::fillHits:Start " << i 
-			<< " U/T/E 0x" << std::hex << unitID << std::dec << " "
-			<< jitter << " "  << ehit;
-    for (k2 = k1+1; k2 != lhits.end() && (jitter-(**k2).t())<1. &&
-	   (jitter-(**k2).t())>-1. && unitID==(**k2).id(); k2++) {
+    double ehit = (**k1).e();
+    double jitter = (**k1).t();
+    unsigned int unitID = (**k1).id();
+    int jump = 0;
+    LogDebug("HcalSim") << "HcalTestHistoClass::fillHits:Start " << i << " U/T/E 0x" << std::hex << unitID << std::dec
+                        << " " << jitter << " " << ehit;
+    for (k2 = k1 + 1;
+         k2 != lhits.end() && (jitter - (**k2).t()) < 1. && (jitter - (**k2).t()) > -1. && unitID == (**k2).id();
+         k2++) {
       ehit += (**k2).e();
       LogDebug("HcalSim") << " + " << (**k2).e();
       jump++;
     }
     LogDebug("HcalSim") << " = " << ehit << " in " << jump;
 
-    float eta   = itr->eta();
-    float phi   = itr->phi();
-    float t     = itr->t();
-    int lay     = ((unitID>>15)&31)+1;
+    float eta = itr->eta();
+    float phi = itr->phi();
+    float t = itr->t();
+    int lay = ((unitID >> 15) & 31) + 1;
 
     hits[nHits].layer = lay;
     hits[nHits].id = unitID;
@@ -102,72 +94,68 @@ void HcalTestHistoClass::fillHits(std::vector<CaloHit>& hitcache) {
     nHits++;
     hit++;
 
-    int subdet = (unitID>>20)&15;
-    int zside  = (unitID>>14)&1;
-    int ieta   = (unitID>>7)&127;
-    int iphi   = (unitID)&127;
-    LogDebug("HcalSim") << "HcalTestHistoClass::fillHits:Hit " << hit << " " 
-			<< i << " ID 0x" << std::hex << unitID << std::dec 
-			<< " " << subdet << " " << lay << " " << zside << " " 
-			<< ieta << " " << iphi << " Time " << jitter << " E " 
-			<< ehit;
-
-    i  += jump;
+    int subdet = (unitID >> 20) & 15;
+    int zside = (unitID >> 14) & 1;
+    int ieta = (unitID >> 7) & 127;
+    int iphi = (unitID)&127;
+    LogDebug("HcalSim") << "HcalTestHistoClass::fillHits:Hit " << hit << " " << i << " ID 0x" << std::hex << unitID
+                        << std::dec << " " << subdet << " " << lay << " " << zside << " " << ieta << " " << iphi
+                        << " Time " << jitter << " E " << ehit;
+
+    i += jump;
     k1 += jump;
   }
 
-  LogDebug("HcalSim") << "HcalTestHistoClass::fillHits called with " << nHit 
-		      << " hits" << " and writes out " << nHits << '(' << hit 
-		      << ") hits";
-
+  LogDebug("HcalSim") << "HcalTestHistoClass::fillHits called with " << nHit << " hits"
+                      << " and writes out " << nHits << '(' << hit << ") hits";
 }
 
-void HcalTestHistoClass::fillQie (int id, double esimtot, double eqietot, 
-				  int nGroup, const std::vector<double>& longs,
-				  const std::vector<double>& longq, int nTower,
-				  const std::vector<double>& latphi, 
-				  const std::vector<double>& latfs, 
-				  const std::vector<double>& latfq) {
-
+void HcalTestHistoClass::fillQie(int id,
+                                 double esimtot,
+                                 double eqietot,
+                                 int nGroup,
+                                 const std::vector<double>& longs,
+                                 const std::vector<double>& longq,
+                                 int nTower,
+                                 const std::vector<double>& latphi,
+                                 const std::vector<double>& latfs,
+                                 const std::vector<double>& latfq) {
   nGroupQIE = 0;
   nTowerQIE = 0;
-  
-  if (id>=0 && id<4) {
-    unsigned int qiesiz = (unsigned int)(id+1);
-    if (qie.size()<qiesiz) {
-      qie.resize(qiesiz);     
+
+  if (id >= 0 && id < 4) {
+    unsigned int qiesiz = (unsigned int)(id + 1);
+    if (qie.size() < qiesiz) {
+      qie.resize(qiesiz);
     }
 
-    qie[id].sim=esimtot;
-    qie[id].qie=eqietot;
+    qie[id].sim = esimtot;
+    qie[id].qie = eqietot;
     qie[id].id = id;
     nQIE++;
-    
+
     LogDebug("HcalSim") << "HcalTestHistoClass::fillQie: id, esimtot, eqietot"
-			<< " = " << id << " " << esimtot << " " << eqietot;
-    
-    for (int i=0; i<nGroup; i++) {
+                        << " = " << id << " " << esimtot << " " << eqietot;
+
+    for (int i = 0; i < nGroup; i++) {
       LogDebug("HcalSim") << "HcalTestHistoClass::fillQie: id, nGroupQIE, "
-			  << "longs, longq = " << id << " " << nGroupQIE 
-			  << " " << longs[i] << " " << longq[i];
+                          << "longs, longq = " << id << " " << nGroupQIE << " " << longs[i] << " " << longq[i];
       qie[id].lngs.push_back(longs[i]);
       qie[id].lngq.push_back(longq[i]);
       nGroupQIE++;
     }
 
-    for (int i=0; i<nTower; i++) {
+    for (int i = 0; i < nTower; i++) {
       int tow = (int)latphi[i];
       LogDebug("HcalSim") << "HcalTestHistoClass::fillQie: id, nTowerQIE, "
-			  << "tower, latfs, latfq = " << id << " " << nTowerQIE
-			  << " "  << tow << " " << latfs[i] << " " << latfq[i];
+                          << "tower, latfs, latfq = " << id << " " << nTowerQIE << " " << tow << " " << latfs[i] << " "
+                          << latfq[i];
       qie[id].lats.push_back(latfs[i]);
       qie[id].latq.push_back(latfq[i]);
       qie[id].tow.push_back(tow);
       nTowerQIE++;
     }
   }
-  LogDebug("HcalSim") << "HcalTestHistoClass::fillQie: Called with ID " << id
-		      << " nQIE " << nQIE << " nGroup " << nGroupQIE 
-		      << " nTower " << nTowerQIE;
+  LogDebug("HcalSim") << "HcalTestHistoClass::fillQie: Called with ID " << id << " nQIE " << nQIE << " nGroup "
+                      << nGroupQIE << " nTower " << nTowerQIE;
 }
-
diff --git a/SimDataFormats/CaloTest/src/ParticleFlux.cc b/SimDataFormats/CaloTest/src/ParticleFlux.cc
index 9031f9afe1f76..f246c00d54073 100644
--- a/SimDataFormats/CaloTest/src/ParticleFlux.cc
+++ b/SimDataFormats/CaloTest/src/ParticleFlux.cc
@@ -1,9 +1,5 @@
 #include "SimDataFormats/CaloTest/interface/ParticleFlux.h"
 
-void ParticleFlux::addFlux(ParticleFlux::flux f) {
-  fluxVector_.push_back(f);
-}
+void ParticleFlux::addFlux(ParticleFlux::flux f) { fluxVector_.push_back(f); }
 
-void ParticleFlux::clear() {
-  fluxVector_.clear();
-}
+void ParticleFlux::clear() { fluxVector_.clear(); }
diff --git a/SimDataFormats/CaloTest/src/classes.h b/SimDataFormats/CaloTest/src/classes.h
index 73e15ede6b1bd..df026110c4e16 100644
--- a/SimDataFormats/CaloTest/src/classes.h
+++ b/SimDataFormats/CaloTest/src/classes.h
@@ -1,4 +1,3 @@
 #include "SimDataFormats/CaloTest/interface/HcalTestHistoClass.h"
 #include "SimDataFormats/CaloTest/interface/ParticleFlux.h"
 #include "DataFormats/Common/interface/Wrapper.h"
-
diff --git a/SimDataFormats/CrossingFrame/interface/CrossingFrame.h b/SimDataFormats/CrossingFrame/interface/CrossingFrame.h
index 9174cdd7814c2..1c9f4a63f6795 100644
--- a/SimDataFormats/CrossingFrame/interface/CrossingFrame.h
+++ b/SimDataFormats/CrossingFrame/interface/CrossingFrame.h
@@ -34,78 +34,75 @@ class PCrossingFrame;
 #include <algorithm>
 #include <memory>
 
-
-template <class T> 
-class CrossingFrame 
-{ 
-
- public:
+template <class T>
+class CrossingFrame {
+public:
   // con- and destructors
 
-  CrossingFrame():  firstCrossing_(0), lastCrossing_(0), bunchSpace_(75),subdet_(""),maxNbSources_(0) {
-}
-  CrossingFrame(int minb, int maxb, int bunchsp, std::string subdet ,unsigned int maxNbSources);
+  CrossingFrame() : firstCrossing_(0), lastCrossing_(0), bunchSpace_(75), subdet_(""), maxNbSources_(0) {}
+  CrossingFrame(int minb, int maxb, int bunchsp, std::string subdet, unsigned int maxNbSources);
 
-  ~CrossingFrame() {;}
+  ~CrossingFrame() { ; }
 
   void swap(CrossingFrame& other);
 
   CrossingFrame& operator=(CrossingFrame const& rhs);
 
   //standard version
-  void addSignals(const std::vector<T> * vec,edm::EventID id);
+  void addSignals(const std::vector<T>* vec, edm::EventID id);
   // version for HepMCProduct
-  void addSignals(const T * vec,edm::EventID id);
- 
+  void addSignals(const T* vec, edm::EventID id);
+
   // standard version
   void addPileups(std::vector<T> const& vec);
   // version for HepMCProduct
   void addPileups(T const& product);
 
-  void setTof( );
+  void setTof();
 
   // we keep the shared pointer in the object that will be only destroyed at the end of the event (transient object!)
   // because of HepMCProduct, we need 2 versions...
-/*   void setPileupPtr(std::shared_ptr<edm::Wrapper<std::vector<T> > const> shPtr) {shPtrPileups_=shPtr;} */
-/*   void setPileupPtr(std::shared_ptr<edm::Wrapper<T> const> shPtr) {shPtrPileups2_=shPtr;} */
-  void setPileupPtr(std::shared_ptr<edm::Wrapper<std::vector<T> > const> shPtr) {shPtrPileups_.push_back( shPtr );}
-  void setPileupPtr(std::shared_ptr<edm::Wrapper<T> const> shPtr) {shPtrPileups2_.push_back( shPtr );}
+  /*   void setPileupPtr(std::shared_ptr<edm::Wrapper<std::vector<T> > const> shPtr) {shPtrPileups_=shPtr;} */
+  /*   void setPileupPtr(std::shared_ptr<edm::Wrapper<T> const> shPtr) {shPtrPileups2_=shPtr;} */
+  void setPileupPtr(std::shared_ptr<edm::Wrapper<std::vector<T> > const> shPtr) { shPtrPileups_.push_back(shPtr); }
+  void setPileupPtr(std::shared_ptr<edm::Wrapper<T> const> shPtr) { shPtrPileups2_.push_back(shPtr); }
   // used in the Step2 to set the PCrossingFrame
   void setPileupPtr(std::shared_ptr<edm::Wrapper<PCrossingFrame<T> > const> shPtr);
-  
-  void print(int level=0) const ;
 
-  void setBcrOffset() {
-    pileupOffsetsBcr_.push_back(pileups_.size());
-  }
+  void print(int level = 0) const;
 
-  void setSourceOffset(const unsigned int s) {
-    pileupOffsetsSource_[s].push_back(pileups_.size());
-  }
+  void setBcrOffset() { pileupOffsetsBcr_.push_back(pileups_.size()); }
+
+  void setSourceOffset(const unsigned int s) { pileupOffsetsSource_[s].push_back(pileups_.size()); }
 
   //getters
-  edm::EventID getEventID() const {return id_;}
-  std::pair<int,int> getBunchRange() const {return std::pair<int,int>(firstCrossing_,lastCrossing_);}
-  int getBunchSpace() const {return bunchSpace_;}
-  unsigned int getMaxNbSources() const {return maxNbSources_; }
-  std::string getSubDet() const { return subdet_;}
-  unsigned int getPileupFileNr() const {return pileupFileNr_;}
-  edm::EventID getIdFirstPileup() const {return idFirstPileup_;}
-  const std::vector<unsigned int>& getPileupOffsetsBcr() const {return pileupOffsetsBcr_;}
-  const std::vector< std::vector<unsigned int> >& getPileupOffsetsSource() const {return pileupOffsetsSource_;} //one per source
-  const std::vector<const T *>& getPileups() const {return pileups_;}
-  const std::vector<const T *>& getSignal() const {return signals_;}
-  
-  
-  void getSignal(typename std::vector<const T *>::const_iterator &first,typename std::vector<const T*>::const_iterator &last) const {
-    first=signals_.begin();
-    last=signals_.end();
+  edm::EventID getEventID() const { return id_; }
+  std::pair<int, int> getBunchRange() const { return std::pair<int, int>(firstCrossing_, lastCrossing_); }
+  int getBunchSpace() const { return bunchSpace_; }
+  unsigned int getMaxNbSources() const { return maxNbSources_; }
+  std::string getSubDet() const { return subdet_; }
+  unsigned int getPileupFileNr() const { return pileupFileNr_; }
+  edm::EventID getIdFirstPileup() const { return idFirstPileup_; }
+  const std::vector<unsigned int>& getPileupOffsetsBcr() const { return pileupOffsetsBcr_; }
+  const std::vector<std::vector<unsigned int> >& getPileupOffsetsSource() const {
+    return pileupOffsetsSource_;
+  }  //one per source
+  const std::vector<const T*>& getPileups() const { return pileups_; }
+  const std::vector<const T*>& getSignal() const { return signals_; }
+
+  void getSignal(typename std::vector<const T*>::const_iterator& first,
+                 typename std::vector<const T*>::const_iterator& last) const {
+    first = signals_.begin();
+    last = signals_.end();
   }
-  void getPileups(typename std::vector<const T*>::const_iterator &first, typename std::vector<const T*>::const_iterator &last) const;
-  unsigned int getNrSignals() const {return signals_.size();} 
-  unsigned int getNrPileups() const {return pileups_.size();} 
+  void getPileups(typename std::vector<const T*>::const_iterator& first,
+                  typename std::vector<const T*>::const_iterator& last) const;
+  unsigned int getNrSignals() const { return signals_.size(); }
+  unsigned int getNrPileups() const { return pileups_.size(); }
   unsigned int getNrPileups(int bcr) const {
-    return bcr==lastCrossing_ ? pileups_.size()-pileupOffsetsBcr_[lastCrossing_-firstCrossing_] :pileupOffsetsBcr_[bcr-firstCrossing_+1]- pileupOffsetsBcr_[bcr-firstCrossing_];} 
+    return bcr == lastCrossing_ ? pileups_.size() - pileupOffsetsBcr_[lastCrossing_ - firstCrossing_]
+                                : pileupOffsetsBcr_[bcr - firstCrossing_ + 1] - pileupOffsetsBcr_[bcr - firstCrossing_];
+  }
 
   // get pileup information in dependency from internal pointer
   int getBunchCrossing(unsigned int ip) const;
@@ -114,85 +111,85 @@ class CrossingFrame
 
   // get object in pileup when position in the vector is known (for DigiSimLink typically)
 
-  const T & getObject(unsigned int ip) const { 
+  const T& getObject(unsigned int ip) const {
     //ip is position in the MixCollection (i.e. signal + pileup)
-    if (ip>getNrSignals()+getNrPileups()) throw cms::Exception("BadIndex")<<"CrossingFrame::getObject called with an invalid index- index was "<<ip<<"!"; // ip >=0, since ip is unsigned
-    if (ip<getNrSignals()) {
+    if (ip > getNrSignals() + getNrPileups())
+      throw cms::Exception("BadIndex") << "CrossingFrame::getObject called with an invalid index- index was " << ip
+                                       << "!";  // ip >=0, since ip is unsigned
+    if (ip < getNrSignals()) {
       return *(signals_[ip]);
+    } else {
+      return *(pileups_[ip - getNrSignals()]);
     }
-    else  {
-      return *(pileups_[ip-getNrSignals()]);
-    }
-  }  
-
+  }
 
-  // setters needed for step2 when using mixed secondary source  
+  // setters needed for step2 when using mixed secondary source
   void setEventID(edm::EventID evId) { id_ = evId; }
-  void setPileups(const std::vector<const T *>& p) { pileups_ = p; } 
-  void setBunchSpace(int bSpace) { bunchSpace_ = bSpace; } 
-  void setMaxNbSources(unsigned int mNbS) { maxNbSources_ = mNbS; } 
-  void setSubDet(std::string det) { subdet_ = det; } 
-  void setPileupFileNr(unsigned int pFileNr) { pileupFileNr_ = pFileNr;} 
-  void setIdFirstPileup(edm::EventID idFP) {idFirstPileup_ = idFP;}
-  void setPileupOffsetsBcr(const std::vector<unsigned int>& pOffsetsBcr) { pileupOffsetsBcr_ = pOffsetsBcr;}  
-  void setPileupOffsetsSource(const std::vector< std::vector<unsigned int> >& pOffsetsS) { pileupOffsetsSource_ = pOffsetsS;}  //one per source
-  void setBunchRange(std::pair<int,int> bunchRange) { firstCrossing_ = bunchRange.first;
-  						      lastCrossing_ = bunchRange.second;} 
-  
- private: 					    
+  void setPileups(const std::vector<const T*>& p) { pileups_ = p; }
+  void setBunchSpace(int bSpace) { bunchSpace_ = bSpace; }
+  void setMaxNbSources(unsigned int mNbS) { maxNbSources_ = mNbS; }
+  void setSubDet(std::string det) { subdet_ = det; }
+  void setPileupFileNr(unsigned int pFileNr) { pileupFileNr_ = pFileNr; }
+  void setIdFirstPileup(edm::EventID idFP) { idFirstPileup_ = idFP; }
+  void setPileupOffsetsBcr(const std::vector<unsigned int>& pOffsetsBcr) { pileupOffsetsBcr_ = pOffsetsBcr; }
+  void setPileupOffsetsSource(const std::vector<std::vector<unsigned int> >& pOffsetsS) {
+    pileupOffsetsSource_ = pOffsetsS;
+  }  //one per source
+  void setBunchRange(std::pair<int, int> bunchRange) {
+    firstCrossing_ = bunchRange.first;
+    lastCrossing_ = bunchRange.second;
+  }
+
+private:
   // please update the swap() function below if any data members are added.
   // general information
   int firstCrossing_;
   int lastCrossing_;
-  int bunchSpace_;  //in nsec
+  int bunchSpace_;      //in nsec
   std::string subdet_;  // for PSimHits/PCaloHits
-  edm::EventID id_; // event id of the signal event
+  edm::EventID id_;     // event id of the signal event
 
   // for playback option
-  edm::EventID idFirstPileup_;   // EventId fof the first pileup event used for this signal event
-  unsigned int pileupFileNr_;    // ordinal number of the pileup file this event was in
+  edm::EventID idFirstPileup_;  // EventId fof the first pileup event used for this signal event
+  unsigned int pileupFileNr_;   // ordinal number of the pileup file this event was in
 
   unsigned int maxNbSources_;
 
   // signal
-  std::vector<const T * >  signals_; 
+  std::vector<const T*> signals_;
 
   //pileup
-  std::vector<const T *>  pileups_; 
-  std::vector< std::shared_ptr<edm::Wrapper<std::vector<T> > const> > shPtrPileups_; 
-  std::vector< std::shared_ptr<edm::Wrapper<T> const> > shPtrPileups2_;   // fore HepMCProduct
-/*   std::shared_ptr<edm::Wrapper<std::vector<T> > const> shPtrPileups_;  */
-/*   std::shared_ptr<edm::Wrapper<T> const> shPtrPileups2_;   // fore HepMCProduct */
+  std::vector<const T*> pileups_;
+  std::vector<std::shared_ptr<edm::Wrapper<std::vector<T> > const> > shPtrPileups_;
+  std::vector<std::shared_ptr<edm::Wrapper<T> const> > shPtrPileups2_;  // fore HepMCProduct
+  /*   std::shared_ptr<edm::Wrapper<std::vector<T> > const> shPtrPileups_;  */
+  /*   std::shared_ptr<edm::Wrapper<T> const> shPtrPileups2_;   // fore HepMCProduct */
   std::shared_ptr<edm::Wrapper<PCrossingFrame<T> > const> shPtrPileupsPCF_;
-//  std::shared_ptr<edm::Wrapper<PCrossingFrame<edm::HepMCProduct> const> shPtrPileupsHepMCProductPCF_;
-  
+  //  std::shared_ptr<edm::Wrapper<PCrossingFrame<edm::HepMCProduct> const> shPtrPileupsHepMCProductPCF_;
+
   // these are informations stored in order to be able to have information
   // as a function of the position of an object in the pileups_ vector
   std::vector<unsigned int> pileupOffsetsBcr_;
-  std::vector< std::vector<unsigned int> > pileupOffsetsSource_; //one per source
-  
+  std::vector<std::vector<unsigned int> > pileupOffsetsSource_;  //one per source
 };
 
 //==============================================================================
 //                              implementations
 //==============================================================================
 
-template <class T> 
-CrossingFrame<T>::CrossingFrame(int minb, int maxb, int bunchsp, std::string subdet ,unsigned int
-maxNbSources):firstCrossing_(minb), lastCrossing_(maxb),
-bunchSpace_(bunchsp),subdet_(subdet),maxNbSources_(maxNbSources) {
- pileupOffsetsSource_.resize(maxNbSources_);
- for (unsigned int i=0;i<maxNbSources_;++i)
-   pileupOffsetsSource_[i].reserve(-firstCrossing_+lastCrossing_+1);
+template <class T>
+CrossingFrame<T>::CrossingFrame(int minb, int maxb, int bunchsp, std::string subdet, unsigned int maxNbSources)
+    : firstCrossing_(minb), lastCrossing_(maxb), bunchSpace_(bunchsp), subdet_(subdet), maxNbSources_(maxNbSources) {
+  pileupOffsetsSource_.resize(maxNbSources_);
+  for (unsigned int i = 0; i < maxNbSources_; ++i)
+    pileupOffsetsSource_[i].reserve(-firstCrossing_ + lastCrossing_ + 1);
 
-//FIXME: should we force around 0 or so??
-  pileupOffsetsBcr_.reserve(-firstCrossing_+lastCrossing_+1);
+  //FIXME: should we force around 0 or so??
+  pileupOffsetsBcr_.reserve(-firstCrossing_ + lastCrossing_ + 1);
 }
 
 template <typename T>
-inline
-void
-CrossingFrame<T>::swap(CrossingFrame<T>& other) {
+inline void CrossingFrame<T>::swap(CrossingFrame<T>& other) {
   std::swap(firstCrossing_, other.firstCrossing_);
   std::swap(lastCrossing_, other.lastCrossing_);
   std::swap(bunchSpace_, other.bunchSpace_);
@@ -208,78 +205,77 @@ CrossingFrame<T>::swap(CrossingFrame<T>& other) {
   shPtrPileupsPCF_.swap(other.shPtrPileupsPCF_);
   pileupOffsetsBcr_.swap(other.pileupOffsetsBcr_);
   pileupOffsetsSource_.resize(maxNbSources_);
-  for (unsigned int i=0;i<pileupOffsetsSource_.size();++i) { 
+  for (unsigned int i = 0; i < pileupOffsetsSource_.size(); ++i) {
     pileupOffsetsSource_[i].swap(other.pileupOffsetsSource_[i]);
   }
 }
 
 template <typename T>
-inline
-CrossingFrame<T>&
-CrossingFrame<T>::operator=(CrossingFrame<T> const& rhs) {
+inline CrossingFrame<T>& CrossingFrame<T>::operator=(CrossingFrame<T> const& rhs) {
   CrossingFrame<T> temp(rhs);
   this->swap(temp);
   return *this;
 }
 
-
-template <class T>  
-void  CrossingFrame<T>::getPileups(typename std::vector<const T *>::const_iterator &first,typename std::vector<const T *>::const_iterator &last) const {
-  first=pileups_.begin();
-  last=pileups_.end();
+template <class T>
+void CrossingFrame<T>::getPileups(typename std::vector<const T*>::const_iterator& first,
+                                  typename std::vector<const T*>::const_iterator& last) const {
+  first = pileups_.begin();
+  last = pileups_.end();
 }
 
-template <class T> 
-void CrossingFrame<T>::print(int level) const {
-}
+template <class T>
+void CrossingFrame<T>::print(int level) const {}
 
-template <class T> 
-int  CrossingFrame<T>::getSourceType(unsigned int ip) const {
+template <class T>
+int CrossingFrame<T>::getSourceType(unsigned int ip) const {
   // ip is position in the pileup vector
   // decide to which source belongs object with index ip in the pileup vector
   // pileup=0, cosmics=1, beam halo+ =2, beam halo- =3 forward =4
-  unsigned int bcr= getBunchCrossing(ip)-firstCrossing_; //starts at 0
-  for (unsigned int i=0;i<pileupOffsetsSource_.size()-1;++i) {
-    if (ip>=(pileupOffsetsSource_[i])[bcr] && ip <(pileupOffsetsSource_[i+1])[bcr]) return i;
+  unsigned int bcr = getBunchCrossing(ip) - firstCrossing_;  //starts at 0
+  for (unsigned int i = 0; i < pileupOffsetsSource_.size() - 1; ++i) {
+    if (ip >= (pileupOffsetsSource_[i])[bcr] && ip < (pileupOffsetsSource_[i + 1])[bcr])
+      return i;
   }
-  return pileupOffsetsSource_.size()-1;
+  return pileupOffsetsSource_.size() - 1;
 }
 
-template <class T>   
+template <class T>
 int CrossingFrame<T>::getBunchCrossing(unsigned int ip) const {
   // return the bcr for a certain position in the pileup vector
-    for (unsigned int ii=1;ii<pileupOffsetsBcr_.size();ii++){
-      if (ip>=pileupOffsetsBcr_[ii-1] && ip<pileupOffsetsBcr_[ii]) return ii+firstCrossing_-1;
-    }
-    if (ip<pileups_.size()) return lastCrossing_;
-    else return 999;
+  for (unsigned int ii = 1; ii < pileupOffsetsBcr_.size(); ii++) {
+    if (ip >= pileupOffsetsBcr_[ii - 1] && ip < pileupOffsetsBcr_[ii])
+      return ii + firstCrossing_ - 1;
+  }
+  if (ip < pileups_.size())
+    return lastCrossing_;
+  else
+    return 999;
 }
 
 // Free swap function
 template <typename T>
-inline
-void
-swap(CrossingFrame<T>& lhs, CrossingFrame<T>& rhs) {
+inline void swap(CrossingFrame<T>& lhs, CrossingFrame<T>& rhs) {
   lhs.swap(rhs);
 }
 
-#include<iosfwd>
-#include<iostream>
+#include <iosfwd>
+#include <iostream>
 
 template <class T>
-std::ostream &operator<<(std::ostream& o, const CrossingFrame<T>& cf)
-{
-  std::pair<int,int> range=cf.getBunchRange();
-  o <<"\nCrossingFrame for subdet "<<cf.getEventID()<<",  bunchrange = "<<range.first<<","<<range.second
-    <<", bunchSpace "<<cf.getBunchSpace();
+std::ostream& operator<<(std::ostream& o, const CrossingFrame<T>& cf) {
+  std::pair<int, int> range = cf.getBunchRange();
+  o << "\nCrossingFrame for subdet " << cf.getEventID() << ",  bunchrange = " << range.first << "," << range.second
+    << ", bunchSpace " << cf.getBunchSpace();
 
   return o;
 }
 
 #include "SimDataFormats/CrossingFrame/interface/PCrossingFrame.h"
 template <class T>
-void CrossingFrame<T>::setPileupPtr(std::shared_ptr<edm::Wrapper<PCrossingFrame<T> > const> shPtr) {shPtrPileupsPCF_=shPtr;}
-
+void CrossingFrame<T>::setPileupPtr(std::shared_ptr<edm::Wrapper<PCrossingFrame<T> > const> shPtr) {
+  shPtrPileupsPCF_ = shPtr;
+}
 
 template <class T>
 void CrossingFrame<T>::addPileups(T const& product) {
@@ -289,30 +285,32 @@ void CrossingFrame<T>::addPileups(T const& product) {
 
 #ifndef __GCCXML__
 template <class T>
-void CrossingFrame<T>::addPileups(std::vector<T> const& product){
+void CrossingFrame<T>::addPileups(std::vector<T> const& product) {
   for (auto const& item : product) {
     pileups_.push_back(&item);
   }
 }
 #endif
 
-template <class T> 
-void CrossingFrame<T>::addSignals(const std::vector<T> * vec,edm::EventID id){
+template <class T>
+void CrossingFrame<T>::addSignals(const std::vector<T>* vec, edm::EventID id) {
   // valid (called) for all except HepMCProduct
-  id_=id;
-  for (unsigned int i=0;i<vec->size();++i) {
+  id_ = id;
+  for (unsigned int i = 0; i < vec->size(); ++i) {
     signals_.push_back(&((*vec)[i]));
   }
 }
 
-template <class T> 
-void CrossingFrame<T>::addSignals(const T * product,edm::EventID id){
+template <class T>
+void CrossingFrame<T>::addSignals(const T* product, edm::EventID id) {
   // valid (called) for all except HepMCProduct
-  id_=id;
+  id_ = id;
   signals_.push_back(product);
 }
 
 template <class T>
-void CrossingFrame<T>::setTof() {;}
+void CrossingFrame<T>::setTof() {
+  ;
+}
 
-#endif 
+#endif
diff --git a/SimDataFormats/CrossingFrame/interface/CrossingFramePlaybackInfoExtended.h b/SimDataFormats/CrossingFrame/interface/CrossingFramePlaybackInfoExtended.h
index e246f014cd024..432c3eaeedafd 100644
--- a/SimDataFormats/CrossingFrame/interface/CrossingFramePlaybackInfoExtended.h
+++ b/SimDataFormats/CrossingFrame/interface/CrossingFramePlaybackInfoExtended.h
@@ -13,7 +13,6 @@
  *
  ************************************************************/
 
-
 #include "DataFormats/Provenance/interface/EventID.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <vector>
@@ -21,10 +20,8 @@
 
 #include <iostream>
 
-class CrossingFramePlaybackInfoExtended 
-{ 
-
- public:
+class CrossingFramePlaybackInfoExtended {
+public:
   // con- and destructors
 
   CrossingFramePlaybackInfoExtended() {}
@@ -32,22 +29,22 @@ class CrossingFramePlaybackInfoExtended
 
   // no setters needed, as this class is just used for backward compatibility
   // getters
-  std::vector<edm::EventID> getStartEventId(const unsigned int s,const int bcr) const {return (idFirstPileup_[s])[bcr-minBunch_];}
-  
+  std::vector<edm::EventID> getStartEventId(const unsigned int s, const int bcr) const {
+    return (idFirstPileup_[s])[bcr - minBunch_];
+  }
+
   void getEventStartInfo(std::vector<std::vector<edm::EventID> > &ids, const unsigned int s) const {
-    ids=idFirstPileup_[s];
+    ids = idFirstPileup_[s];
   }
-  
- private:
 
+private:
   // we need the same info for each bunchcrossing
   unsigned int maxNbSources_;
-  
+
   std::vector<std::vector<std::vector<edm::EventID> > > idFirstPileup_;
- 
+
   int nBcrossings_;
   int minBunch_;
 };
 
-
-#endif 
+#endif
diff --git a/SimDataFormats/CrossingFrame/interface/CrossingFramePlaybackInfoNew.h b/SimDataFormats/CrossingFrame/interface/CrossingFramePlaybackInfoNew.h
index c11f13ec9c802..5cf5b1b164700 100644
--- a/SimDataFormats/CrossingFrame/interface/CrossingFramePlaybackInfoNew.h
+++ b/SimDataFormats/CrossingFrame/interface/CrossingFramePlaybackInfoNew.h
@@ -13,7 +13,6 @@
  *
  ************************************************************/
 
-
 #include "DataFormats/Common/interface/SecondaryEventIDAndFileInfo.h"
 #include "DataFormats/Provenance/interface/EventID.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -21,10 +20,8 @@
 #include <vector>
 #include <utility>
 
-class CrossingFramePlaybackInfoNew 
-{ 
-
- public:
+class CrossingFramePlaybackInfoNew {
+public:
   // con- and destructors
 
   CrossingFramePlaybackInfoNew() {}
@@ -40,7 +37,7 @@ class CrossingFramePlaybackInfoNew
     sizes_.swap(sizes);
     eventInfo_.swap(eventInfo);
   }
- 
+
   // getters
   std::vector<edm::SecondaryEventIDAndFileInfo>::const_iterator getEventId(size_t offset) const {
     std::vector<edm::SecondaryEventIDAndFileInfo>::const_iterator iter = eventInfo_.begin();
@@ -49,10 +46,10 @@ class CrossingFramePlaybackInfoNew
   }
 
   size_t getNumberOfEvents(int bunchIdx, size_t sourceNumber) const {
-     return sizes_[((bunchIdx - minBunch_) * maxNbSources_) + sourceNumber];
+    return sizes_[((bunchIdx - minBunch_) * maxNbSources_) + sourceNumber];
   }
 
- //private:
+  //private:
 
   // we need the same info for each bunchcrossing
   unsigned int maxNbSources_;
@@ -62,5 +59,4 @@ class CrossingFramePlaybackInfoNew
   int minBunch_;
 };
 
-
-#endif 
+#endif
diff --git a/SimDataFormats/CrossingFrame/interface/MixCollection.h b/SimDataFormats/CrossingFrame/interface/MixCollection.h
index 6a1bb911bfb7b..981c513e17040 100644
--- a/SimDataFormats/CrossingFrame/interface/MixCollection.h
+++ b/SimDataFormats/CrossingFrame/interface/MixCollection.h
@@ -7,53 +7,53 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
 
-template <class T> 
+template <class T>
 class MixCollection {
-
- private:
-
- public:
-  typedef std::pair<int,int> range;
+private:
+public:
+  typedef std::pair<int, int> range;
   MixCollection();
-  MixCollection(const CrossingFrame<T> *cf, 
-  		const range bunchRange =range(-999,999));
-  MixCollection(const std::vector<const CrossingFrame<T> *>& cfs, 
-		const range bunchRange =range(-999,999));
+  MixCollection(const CrossingFrame<T> *cf, const range bunchRange = range(-999, 999));
+  MixCollection(const std::vector<const CrossingFrame<T> *> &cfs, const range bunchRange = range(-999, 999));
 
-  range bunchrange() const {return bunchRange_;}
-  int size() const {return sizeSignal() + sizePileup();}
+  range bunchrange() const { return bunchRange_; }
+  int size() const { return sizeSignal() + sizePileup(); }
   int sizePileup() const;
   int sizeSignal() const;
   // false if at least one of the subdetectors was not found in registry
-  bool inRegistry() const {return inRegistry_;}
+  bool inRegistry() const { return inRegistry_; }
 
   // get object the index of which -in the whole collection- is known
-   const T & getObject(unsigned int ip) const { 
-     if (ip>=(unsigned int)size()) throw cms::Exception("BadIndex")<<"MixCollection::getObject called with an invalid index!"; // ip >= 0, since ip is unsigned
-     int n=ip;
-/*
+  const T &getObject(unsigned int ip) const {
+    if (ip >= (unsigned int)size())
+      throw cms::Exception("BadIndex")
+          << "MixCollection::getObject called with an invalid index!";  // ip >= 0, since ip is unsigned
+    int n = ip;
+    /*
 -    int iframe=0;
 -    for (unsigned int ii=0;ii<crossingFrames_.size();++ii) {
 -      iframe=ii;
 -      int s=crossingFrames_[iframe]->getNrSignals()+crossingFrames_[iframe]->getNrPileups();
 -      if (n<s) break;
 */
-    for (unsigned int iframe=0;iframe<crossingFrames_.size();++iframe) {
-      int s=crossingFrames_[iframe]->getNrSignals();
-      if (n<s) return crossingFrames_[iframe]->getObject(n);
-       n=n-s;
-     }
-/*
+    for (unsigned int iframe = 0; iframe < crossingFrames_.size(); ++iframe) {
+      int s = crossingFrames_[iframe]->getNrSignals();
+      if (n < s)
+        return crossingFrames_[iframe]->getObject(n);
+      n = n - s;
+    }
+    /*
     return crossingFrames_[iframe]->getObject(n);
 */
-    for (unsigned int iframe=0;iframe<crossingFrames_.size();++iframe) {
-      int s=crossingFrames_[iframe]->getNrSignals();
-      int p=crossingFrames_[iframe]->getNrPileups();
-      if (n<p) return crossingFrames_[iframe]->getObject(s+n);
-      n=n-p;
+    for (unsigned int iframe = 0; iframe < crossingFrames_.size(); ++iframe) {
+      int s = crossingFrames_[iframe]->getNrSignals();
+      int p = crossingFrames_[iframe]->getNrPileups();
+      if (n < p)
+        return crossingFrames_[iframe]->getObject(s + n);
+      n = n - p;
     }
-    throw cms::Exception("InternalError")<<"MixCollection::getObject reached impossible condition"; 
-   }
+    throw cms::Exception("InternalError") << "MixCollection::getObject reached impossible condition";
+  }
 
   class MixItr;
   friend class MixItr;
@@ -64,74 +64,77 @@ class MixCollection {
     struct end_tag {};
 
     /** constructors */
-    MixItr():first_(true), internalCtr_(0) {;}
-    MixItr(const MixCollection *shc, int nrDets, end_tag): internalCtr2_(0) {
-      for(int i=0; i<nrDets; ++i) {
-        const auto& cf = shc->crossingFrames_[i];
+    MixItr() : first_(true), internalCtr_(0) { ; }
+    MixItr(const MixCollection *shc, int nrDets, end_tag) : internalCtr2_(0) {
+      for (int i = 0; i < nrDets; ++i) {
+        const auto &cf = shc->crossingFrames_[i];
         internalCtr2_ += cf->getSignal().size() + cf->getPileups().size();
       }
     }
-       MixItr(const MixCollection *shc, int nrDets) :     
-       mixCol_(shc),nrDets_(nrDets),first_(true),iSignal_(0),iPileup_(0),internalCtr_(0) {;}
-
+    MixItr(const MixCollection *shc, int nrDets)
+        : mixCol_(shc), nrDets_(nrDets), first_(true), iSignal_(0), iPileup_(0), internalCtr_(0) {
+      ;
+    }
 
     /**Default destructor*/
-    virtual ~MixItr() {;}
+    virtual ~MixItr() { ; }
 
     /**operators*/
     // default version valid for HepMCProduct
-    const T* operator->() const { return *(pMixItr_.operator->()); }
-    const T& operator*() const {return *(pMixItr_.operator*()); }
-    const MixItr operator++ () {return next();}
-    const MixItr operator++ (int) {return next();}
-    bool operator!= (const MixItr& itr) { return internalCtr2_ != itr.internalCtr2_; }
+    const T *operator->() const { return *(pMixItr_.operator->()); }
+    const T &operator*() const { return *(pMixItr_.operator*()); }
+    const MixItr operator++() { return next(); }
+    const MixItr operator++(int) { return next(); }
+    bool operator!=(const MixItr &itr) { return internalCtr2_ != itr.internalCtr2_; }
 
     /**getters*/
     int bunch() const {
-      if (trigger_) return 0;
-      int bcr= myCF_->getBunchCrossing(internalCtr_);
+      if (trigger_)
+        return 0;
+      int bcr = myCF_->getBunchCrossing(internalCtr_);
       return bcr;
     }
 
-    bool getTrigger() const {return trigger_;}
+    bool getTrigger() const { return trigger_; }
 
-    int getSourceType() const {return (getTrigger() ? -1 : myCF_->getSourceType(internalCtr_));}
-    int getPileupEventNr() const {return (getTrigger() ? 0 : myCF_->getPileupEventNr(internalCtr_));}
+    int getSourceType() const { return (getTrigger() ? -1 : myCF_->getSourceType(internalCtr_)); }
+    int getPileupEventNr() const { return (getTrigger() ? 0 : myCF_->getPileupEventNr(internalCtr_)); }
 
   private:
-
     typename std::vector<const T *>::const_iterator pMixItr_;
     typename std::vector<const T *>::const_iterator pMixItrEnd_;
 
-    const CrossingFrame<T> *    myCF_;
+    const CrossingFrame<T> *myCF_;
     const MixCollection *mixCol_;
     int nrDets_;
     bool first_;
     int iSignal_, iPileup_;
     bool trigger_;
     unsigned int internalCtr_;  //this is the internal counter pointing into the vector of piled up objects
-    unsigned int internalCtr2_ = 0; // this is the internal counter for the number of iterated elements, needed for operator!=
-    
+    unsigned int internalCtr2_ =
+        0;  // this is the internal counter for the number of iterated elements, needed for operator!=
+
     const MixItr next();
-    void reset() {;}
-    bool getNewSignal(typename std::vector<const T *>::const_iterator &first,typename std::vector<const T *>::const_iterator &last);
+    void reset() { ; }
+    bool getNewSignal(typename std::vector<const T *>::const_iterator &first,
+                      typename std::vector<const T *>::const_iterator &last);
 
-    bool  getNewPileups(typename std::vector<const T *>::const_iterator &first,typename std::vector<const T *>::const_iterator &last) ;
+    bool getNewPileups(typename std::vector<const T *>::const_iterator &first,
+                       typename std::vector<const T *>::const_iterator &last);
   };
 
   typedef MixItr iterator;
   iterator begin() const;
   iterator end() const;
 
- private:
-  void init( const range bunchRange);
+private:
+  void init(const range bunchRange);
 
   range bunchRange_;
   bool inRegistry_;
   int nrDets_;
 
   std::vector<const CrossingFrame<T> *> crossingFrames_;
-
 };
 
 #include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
@@ -139,158 +142,167 @@ class MixCollection {
 // Exceptions
 //
 #include "FWCore/Utilities/interface/Exception.h"
-template <class T> 
-MixCollection<T>::MixCollection() : 
-  bunchRange_(0,0), inRegistry_(false), nrDets_(0)
-{
+template <class T>
+MixCollection<T>::MixCollection() : bunchRange_(0, 0), inRegistry_(false), nrDets_(0) {
   crossingFrames_.push_back(NULL);
 }
 
-template <class T> 
-MixCollection<T>::MixCollection(const CrossingFrame<T> *cf,const std::pair<int,int> bunchRange) : 
-  inRegistry_(false),nrDets_(0) 
-{
-  nrDets_=1;
-  inRegistry_=true;
+template <class T>
+MixCollection<T>::MixCollection(const CrossingFrame<T> *cf, const std::pair<int, int> bunchRange)
+    : inRegistry_(false), nrDets_(0) {
+  nrDets_ = 1;
+  inRegistry_ = true;
   if (cf) {
     crossingFrames_.push_back(cf);
     init(bunchRange);
-  }
-  else edm::LogWarning("MixCollectionInvalidCtr") <<"Could not construct MixCollection for "<<typeid(T).name() <<", pointer to CrossingFrame invalid!"<<std::endl;
-} 
+  } else
+    edm::LogWarning("MixCollectionInvalidCtr") << "Could not construct MixCollection for " << typeid(T).name()
+                                               << ", pointer to CrossingFrame invalid!" << std::endl;
+}
 
-template <class T> 
-MixCollection<T>::MixCollection(const std::vector<const CrossingFrame<T> *>& cfs, const std::pair<int,int> bunchRange) :  inRegistry_(false) , nrDets_(0)
-{
+template <class T>
+MixCollection<T>::MixCollection(const std::vector<const CrossingFrame<T> *> &cfs, const std::pair<int, int> bunchRange)
+    : inRegistry_(false), nrDets_(0) {
   // first, verify that all CrossingFrames have the same bunchrange
-  range bR=cfs[0]->getBunchRange();
-  for (unsigned int i=1;i<cfs.size();++i) {
-    if (bR!= cfs[i]->getBunchRange()) throw cms::Exception("Incompatible CrossingFrames")<<"You gave as input CrossingFrames with different bunchRanges!";
+  range bR = cfs[0]->getBunchRange();
+  for (unsigned int i = 1; i < cfs.size(); ++i) {
+    if (bR != cfs[i]->getBunchRange())
+      throw cms::Exception("Incompatible CrossingFrames")
+          << "You gave as input CrossingFrames with different bunchRanges!";
   }
 
   //set necessary variables
-  for (unsigned int i=0;i<cfs.size();++i) {
+  for (unsigned int i = 0; i < cfs.size(); ++i) {
     nrDets_++;
     crossingFrames_.push_back(cfs[i]);
-    inRegistry_=true;  // true if at least one is present
+    inRegistry_ = true;  // true if at least one is present
   }
 
   init(bunchRange);
 }
 
-template <class T> 
-void MixCollection<T>::init( const std::pair<int,int> bunchRange) {
-
-  bunchRange_=bunchRange;
+template <class T>
+void MixCollection<T>::init(const std::pair<int, int> bunchRange) {
+  bunchRange_ = bunchRange;
 
   //verify whether bunchrange is ok
   // in case of several crossingFrames, we have verified before that they have the same bunchrange
-  range defaultrange=crossingFrames_[0]->getBunchRange();
-  if (bunchRange_==range(-999,999)) bunchRange_=defaultrange;
-  else if (bunchRange_!=defaultrange ) {
-    int first=defaultrange.first;
+  range defaultrange = crossingFrames_[0]->getBunchRange();
+  if (bunchRange_ == range(-999, 999))
+    bunchRange_ = defaultrange;
+  else if (bunchRange_ != defaultrange) {
+    int first = defaultrange.first;
     int last = defaultrange.second;
-    if (bunchRange_.first<defaultrange.first || bunchRange_.second>defaultrange.second )  throw cms::Exception("BadRunRange")<<" You are asking for a runrange ("<<bunchRange_.first<<","<<bunchRange_.second<<"), outside of the existing runrange ("<<defaultrange.first<<", "<<defaultrange.second<<")\n";
-    bunchRange_=range(first,last);
+    if (bunchRange_.first < defaultrange.first || bunchRange_.second > defaultrange.second)
+      throw cms::Exception("BadRunRange")
+          << " You are asking for a runrange (" << bunchRange_.first << "," << bunchRange_.second
+          << "), outside of the existing runrange (" << defaultrange.first << ", " << defaultrange.second << ")\n";
+    bunchRange_ = range(first, last);
   }
 }
 
-template <class T>  int  MixCollection<T>::sizePileup() const {
+template <class T>
+int MixCollection<T>::sizePileup() const {
   // get size cumulated for all subdetectors
-  int s=0;
-  for (int i=0;i<nrDets_;++i) {
-    s+=crossingFrames_[i]->getNrPileups();
-  }  return s;
+  int s = 0;
+  for (int i = 0; i < nrDets_; ++i) {
+    s += crossingFrames_[i]->getNrPileups();
+  }
+  return s;
 }
 
-template <class T>  int  MixCollection<T>::sizeSignal() const {
-  int s=0;
-  for (int i=0;i<nrDets_;++i) {
-    s+=crossingFrames_[i]->getNrSignals();
+template <class T>
+int MixCollection<T>::sizeSignal() const {
+  int s = 0;
+  for (int i = 0; i < nrDets_; ++i) {
+    s += crossingFrames_[i]->getNrSignals();
   }
   return s;
 }
 
 template <class T>
-bool MixCollection<T>::MixItr::getNewSignal(typename std::vector<const T *>::const_iterator &first,typename std::vector<const T *>::const_iterator &last) {
+bool MixCollection<T>::MixItr::getNewSignal(typename std::vector<const T *>::const_iterator &first,
+                                            typename std::vector<const T *>::const_iterator &last) {
   // gets the next signal collection with non-zero size
 
-  while (iSignal_<nrDets_) {
-    mixCol_->crossingFrames_[iSignal_]->getSignal(first,last);
-    myCF_=mixCol_->crossingFrames_[iSignal_];
+  while (iSignal_ < nrDets_) {
+    mixCol_->crossingFrames_[iSignal_]->getSignal(first, last);
+    myCF_ = mixCol_->crossingFrames_[iSignal_];
     iSignal_++;
-    if (first != last) return true;
+    if (first != last)
+      return true;
   }
   return false;
 }
 
 template <class T>
-bool  MixCollection<T>::MixItr::getNewPileups(typename std::vector<const T*>::const_iterator &first,typename std::vector<const T *>::const_iterator &last) {
-
+bool MixCollection<T>::MixItr::getNewPileups(typename std::vector<const T *>::const_iterator &first,
+                                             typename std::vector<const T *>::const_iterator &last) {
   // gets the next pileup collection , changing subdet if necessary
-  while (iPileup_<nrDets_) {
-    mixCol_-> crossingFrames_[iPileup_]->getPileups(first,last);
-    int s=0;
-    for (typename std::vector<const T*>::const_iterator it=first;it!= last ;it++) {
+  while (iPileup_ < nrDets_) {
+    mixCol_->crossingFrames_[iPileup_]->getPileups(first, last);
+    int s = 0;
+    for (typename std::vector<const T *>::const_iterator it = first; it != last; it++) {
       s++;
     }
-    myCF_=mixCol_->crossingFrames_[iPileup_];
+    myCF_ = mixCol_->crossingFrames_[iPileup_];
     iPileup_++;
-    if (first!=last) return true;
+    if (first != last)
+      return true;
   }
   return false;
 }
 
 template <class T>
 const typename MixCollection<T>::MixItr MixCollection<T>::MixItr::next() {
-
   // initialisation
   if (first_) {
-    first_=false;
-    trigger_=true;
+    first_ = false;
+    trigger_ = true;
   } else {
     ++internalCtr2_;
-    if (!trigger_) internalCtr_++;
-    if (++pMixItr_!=pMixItrEnd_) return *this;
+    if (!trigger_)
+      internalCtr_++;
+    if (++pMixItr_ != pMixItrEnd_)
+      return *this;
   }
 
   // we have an end condition, look whether there are more collections
   bool ok;
   if (trigger_) {
-    ok=this->getNewSignal(pMixItr_,pMixItrEnd_);
-    if (ok) return *this;
-    trigger_=false;
-  } 
-  ok=this->getNewPileups(pMixItr_,pMixItrEnd_);
+    ok = this->getNewSignal(pMixItr_, pMixItrEnd_);
+    if (ok)
+      return *this;
+    trigger_ = false;
+  }
+  ok = this->getNewPileups(pMixItr_, pMixItrEnd_);
   if (ok) {
     // debug print start
     //    for (auto dbIt=pMixItr_;dbIt!=pMixItrEnd_;++dbIt)  printf("Found pointer %p\n",(*dbIt));fflush(stdout);
     // debug print end
-    internalCtr_=0;
+    internalCtr_ = 0;
   }
-  return *this; // with internalCtr2_ we can always return *this
+  return *this;  // with internalCtr2_ we can always return *this
 }
 
 template <class T>
 typename MixCollection<T>::MixItr MixCollection<T>::begin() const {
-  return MixItr(this,nrDets_)++;
+  return MixItr(this, nrDets_)++;
 }
 
 template <class T>
-typename  MixCollection<T>::MixItr MixCollection<T >::end() const {
-  return MixItr(this,nrDets_,typename MixItr::end_tag());
+typename MixCollection<T>::MixItr MixCollection<T>::end() const {
+  return MixItr(this, nrDets_, typename MixItr::end_tag());
 }
 
-#include<iosfwd>
-#include<iostream>
+#include <iosfwd>
+#include <iostream>
 template <class T>
-std::ostream &operator<<(std::ostream& o, const MixCollection<T>& col)
-{
-  o << "MixCollection with bunchRange: "<<(col.bunchrange()).first<< "," << (col.bunchrange()).second <<" size of signal: "<<col.sizeSignal() <<" ,size of pileup: "<<col.sizePileup();
-
+std::ostream &operator<<(std::ostream &o, const MixCollection<T> &col) {
+  o << "MixCollection with bunchRange: " << (col.bunchrange()).first << "," << (col.bunchrange()).second
+    << " size of signal: " << col.sizeSignal() << " ,size of pileup: " << col.sizePileup();
 
   return o;
 }
 
 #endif
-
diff --git a/SimDataFormats/CrossingFrame/interface/PCrossingFrame.h b/SimDataFormats/CrossingFrame/interface/PCrossingFrame.h
index 1d87bfdbf872b..e128483a5ece0 100644
--- a/SimDataFormats/CrossingFrame/interface/PCrossingFrame.h
+++ b/SimDataFormats/CrossingFrame/interface/PCrossingFrame.h
@@ -13,42 +13,41 @@
 
 #include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
 
-template <class T> 
-class PCrossingFrame
-{
-
-  public:	
-
-  PCrossingFrame(){}
+template <class T>
+class PCrossingFrame {
+public:
+  PCrossingFrame() {}
   PCrossingFrame(const CrossingFrame<T>& cf);
 
-  ~PCrossingFrame() {;}
-  
+  ~PCrossingFrame() { ; }
+
   void setAllExceptSignalFrom(const PCrossingFrame<T>& cf);
 
   // getters for data members of PCrossingFrame
-  edm::EventID getEventID() const {return Pid_;}
+  edm::EventID getEventID() const { return Pid_; }
   const std::vector<T>& getSignals() const { return PCFsignals_; }
   const std::vector<T>& getPileupRefs() const { return PCFpileups_; }
-  std::vector<const T *> getPileups() const {
-    std::vector<const T *> ret;
+  std::vector<const T*> getPileups() const {
+    std::vector<const T*> ret;
     ret.reserve(PCFpileups_.size());
-    for(const auto& p: PCFpileups_) ret.emplace_back(&p);
+    for (const auto& p : PCFpileups_)
+      ret.emplace_back(&p);
     return ret;
   }
-  int getBunchSpace() const {return PbunchSpace_;}
-  unsigned int getMaxNbSources() const {return PmaxNbSources_; }
-  std::string getSubDet() const { return PCFsubdet_;}
-  unsigned int getPileupFileNr() const {return PCFpileupFileNr_;}
-  edm::EventID getIdFirstPileup() const {return PCFidFirstPileup_;}
-  const std::vector<unsigned int>& getPileupOffsetsBcr() const {return PCFpileupOffsetsBcr_;}
-  const std::vector< std::vector<unsigned int> >& getPileupOffsetsSource() const {return PCFpileupOffsetsSource_;} //one per source
-  std::pair<int,int> getBunchRange() const {return std::pair<int,int>(firstPCrossing_,lastPCrossing_);}
-	
-
-  private:
+  int getBunchSpace() const { return PbunchSpace_; }
+  unsigned int getMaxNbSources() const { return PmaxNbSources_; }
+  std::string getSubDet() const { return PCFsubdet_; }
+  unsigned int getPileupFileNr() const { return PCFpileupFileNr_; }
+  edm::EventID getIdFirstPileup() const { return PCFidFirstPileup_; }
+  const std::vector<unsigned int>& getPileupOffsetsBcr() const { return PCFpileupOffsetsBcr_; }
+  const std::vector<std::vector<unsigned int> >& getPileupOffsetsSource() const {
+    return PCFpileupOffsetsSource_;
+  }  //one per source
+  std::pair<int, int> getBunchRange() const { return std::pair<int, int>(firstPCrossing_, lastPCrossing_); }
+
+private:
   unsigned int PmaxNbSources_;
-  int PbunchSpace_; 
+  int PbunchSpace_;
   edm::EventID Pid_;
   int firstPCrossing_;
   int lastPCrossing_;
@@ -58,54 +57,51 @@ class PCrossingFrame
   unsigned int PCFpileupFileNr_;
   edm::EventID PCFidFirstPileup_;
   std::vector<unsigned int> PCFpileupOffsetsBcr_;
-  std::vector< std::vector<unsigned int> > PCFpileupOffsetsSource_;
+  std::vector<std::vector<unsigned int> > PCFpileupOffsetsSource_;
 };
 
-
 template <class T>
-PCrossingFrame<T>::PCrossingFrame(const CrossingFrame<T>& cf)
-{
- //get data members from CrossingFrame
- PmaxNbSources_= cf.getMaxNbSources();
- PbunchSpace_ = cf.getBunchSpace();
- Pid_ = cf.getEventID();
- firstPCrossing_ = cf.getBunchRange().first;
- lastPCrossing_ = cf.getBunchRange().second;
-
- const auto& pileups = cf.getPileups();
- PCFpileups_.reserve(pileups.size());
- for(const auto& ptr: pileups) {
-   PCFpileups_.emplace_back(*ptr);
- }
- const auto& signal = cf.getSignal();
- PCFsignals_.reserve(signal.size());
- for(const auto& ptr: signal) {
-   PCFsignals_.emplace_back(*ptr);
- }
+PCrossingFrame<T>::PCrossingFrame(const CrossingFrame<T>& cf) {
+  //get data members from CrossingFrame
+  PmaxNbSources_ = cf.getMaxNbSources();
+  PbunchSpace_ = cf.getBunchSpace();
+  Pid_ = cf.getEventID();
+  firstPCrossing_ = cf.getBunchRange().first;
+  lastPCrossing_ = cf.getBunchRange().second;
+
+  const auto& pileups = cf.getPileups();
+  PCFpileups_.reserve(pileups.size());
+  for (const auto& ptr : pileups) {
+    PCFpileups_.emplace_back(*ptr);
+  }
+  const auto& signal = cf.getSignal();
+  PCFsignals_.reserve(signal.size());
+  for (const auto& ptr : signal) {
+    PCFsignals_.emplace_back(*ptr);
+  }
 
- PCFsubdet_ = cf.getSubDet();
- PCFpileupFileNr_ = cf.getPileupFileNr();
- PCFidFirstPileup_ = cf.getIdFirstPileup();
- PCFpileupOffsetsBcr_ = cf.getPileupOffsetsBcr();
- PCFpileupOffsetsSource_ = cf.getPileupOffsetsSource();
+  PCFsubdet_ = cf.getSubDet();
+  PCFpileupFileNr_ = cf.getPileupFileNr();
+  PCFidFirstPileup_ = cf.getIdFirstPileup();
+  PCFpileupOffsetsBcr_ = cf.getPileupOffsetsBcr();
+  PCFpileupOffsetsSource_ = cf.getPileupOffsetsSource();
 }
 
 template <typename T>
 void PCrossingFrame<T>::setAllExceptSignalFrom(const PCrossingFrame<T>& cf) {
   // TODO: reduce copy-paste
- PmaxNbSources_= cf.getMaxNbSources();
- PbunchSpace_ = cf.getBunchSpace();
- firstPCrossing_ = cf.getBunchRange().first;
- lastPCrossing_ = cf.getBunchRange().second;
-
- PCFpileups_ = cf.getPileupRefs();
-
- PCFsubdet_ = cf.getSubDet();
- PCFpileupFileNr_ = cf.getPileupFileNr();
- PCFidFirstPileup_ = cf.getIdFirstPileup();
- PCFpileupOffsetsBcr_ = cf.getPileupOffsetsBcr();
- PCFpileupOffsetsSource_ = cf.getPileupOffsetsSource();
+  PmaxNbSources_ = cf.getMaxNbSources();
+  PbunchSpace_ = cf.getBunchSpace();
+  firstPCrossing_ = cf.getBunchRange().first;
+  lastPCrossing_ = cf.getBunchRange().second;
+
+  PCFpileups_ = cf.getPileupRefs();
+
+  PCFsubdet_ = cf.getSubDet();
+  PCFpileupFileNr_ = cf.getPileupFileNr();
+  PCFidFirstPileup_ = cf.getIdFirstPileup();
+  PCFpileupOffsetsBcr_ = cf.getPileupOffsetsBcr();
+  PCFpileupOffsetsSource_ = cf.getPileupOffsetsSource();
 }
 
-
-#endif 
+#endif
diff --git a/SimDataFormats/CrossingFrame/src/CrossingFramePlaybackInfoNew.cc b/SimDataFormats/CrossingFrame/src/CrossingFramePlaybackInfoNew.cc
index 737c3ca24e889..81b446d0d260c 100644
--- a/SimDataFormats/CrossingFrame/src/CrossingFramePlaybackInfoNew.cc
+++ b/SimDataFormats/CrossingFrame/src/CrossingFramePlaybackInfoNew.cc
@@ -1,7 +1,9 @@
 #include "SimDataFormats/CrossingFrame/interface/CrossingFramePlaybackInfoNew.h"
 #include <utility>
 
-CrossingFramePlaybackInfoNew::CrossingFramePlaybackInfoNew(int minBunch, int maxBunch, unsigned int maxNbSources) :
-    maxNbSources_(maxNbSources), nBcrossings_(maxBunch-minBunch+1), sizes_(maxNbSources_*nBcrossings_, 0U), eventInfo_(), minBunch_(minBunch) { 
-}
-
+CrossingFramePlaybackInfoNew::CrossingFramePlaybackInfoNew(int minBunch, int maxBunch, unsigned int maxNbSources)
+    : maxNbSources_(maxNbSources),
+      nBcrossings_(maxBunch - minBunch + 1),
+      sizes_(maxNbSources_ * nBcrossings_, 0U),
+      eventInfo_(),
+      minBunch_(minBunch) {}
diff --git a/SimDataFormats/CrossingFrame/src/classes.h b/SimDataFormats/CrossingFrame/src/classes.h
index c21b68ab90715..bc8439955eebf 100644
--- a/SimDataFormats/CrossingFrame/src/classes.h
+++ b/SimDataFormats/CrossingFrame/src/classes.h
@@ -11,4 +11,3 @@
 
 #include <map>
 #include <string>
-
diff --git a/SimDataFormats/DigiSimLinks/interface/DTDigiSimLink.h b/SimDataFormats/DigiSimLinks/interface/DTDigiSimLink.h
index 3e33f3f890627..4c67337929e90 100644
--- a/SimDataFormats/DigiSimLinks/interface/DTDigiSimLink.h
+++ b/SimDataFormats/DigiSimLinks/interface/DTDigiSimLink.h
@@ -5,25 +5,24 @@
 #include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
 
 class DTDigiSimLink {
-
- public:
+public:
   typedef uint32_t ChannelType;
 
-  // Construct from the wire number and the digi number (this identifies 
+  // Construct from the wire number and the digi number (this identifies
   // uniquely multiple digis on the same wire), the TDC counts, the SimTrack Id and the EncodedEvent Id.
   explicit DTDigiSimLink(int wireNr, int digiNr, int nTDC, unsigned int trackId, EncodedEventId evId);
 
-  // Construct from the wire number and the digi number (this identifies 
+  // Construct from the wire number and the digi number (this identifies
   // uniquely multiple digis on the same wire), the time (ns), the SimTrack Id and the EncodedEvent Id.
   // time is converted in TDC counts (1 TDC = 25./32. ns)
   explicit DTDigiSimLink(int wireNr, int digiNr, double tdrift, unsigned int trackId, EncodedEventId evId);
 
   // Default constructor.
   DTDigiSimLink();
-  
+
   // The channel identifier and the digi number packed together
   ChannelType channel() const;
-  
+
   // Return wire number
   int wire() const;
 
@@ -37,36 +36,33 @@ class DTDigiSimLink {
   double time() const;
 
   // Return the SimTrack Id
-  unsigned int SimTrackId()  const;
+  unsigned int SimTrackId() const;
 
   // Return the Encoded Event Id
-  EncodedEventId eventId()  const;
+  EncodedEventId eventId() const;
 
   // Used to repack the channel number to an int
   struct ChannelPacking {
     uint16_t wi;
     uint16_t num;
   };
-  
+
 private:
   // The value of one TDC count in ns
   static const double reso;
 
- private:
-  uint16_t theWire;       // wire number
-  uint16_t theDigiNumber; // digi number on the wire
-  uint32_t theCounts;     // TDC count, up to 20 bits actually used
-  uint32_t theSimTrackId; // identifier of the SimTrack that produced the digi
+private:
+  uint16_t theWire;        // wire number
+  uint16_t theDigiNumber;  // digi number on the wire
+  uint32_t theCounts;      // TDC count, up to 20 bits actually used
+  uint32_t theSimTrackId;  // identifier of the SimTrack that produced the digi
   EncodedEventId theEventId;
 };
 
-#include<iostream>
-inline std::ostream & operator<<(std::ostream & o, const DTDigiSimLink& digisimlink) {
-  return o << "wire:"<<digisimlink.wire()
-	   << " digi:" << digisimlink.number()
-	   << " time:" << digisimlink.time()
-	   << " SimTrack:" << digisimlink.SimTrackId()
-	   << " eventId:" << digisimlink.eventId().rawId();
+#include <iostream>
+inline std::ostream& operator<<(std::ostream& o, const DTDigiSimLink& digisimlink) {
+  return o << "wire:" << digisimlink.wire() << " digi:" << digisimlink.number() << " time:" << digisimlink.time()
+           << " SimTrack:" << digisimlink.SimTrackId() << " eventId:" << digisimlink.eventId().rawId();
 }
 
 #endif
diff --git a/SimDataFormats/DigiSimLinks/src/DTDigiSimLink.cc b/SimDataFormats/DigiSimLinks/src/DTDigiSimLink.cc
index 620837f8f48e2..91f119cb1e7a7 100644
--- a/SimDataFormats/DigiSimLinks/src/DTDigiSimLink.cc
+++ b/SimDataFormats/DigiSimLinks/src/DTDigiSimLink.cc
@@ -1,31 +1,19 @@
 #include <SimDataFormats/DigiSimLinks/interface/DTDigiSimLink.h>
 
 using namespace std;
-const double DTDigiSimLink::reso =  25./32.; //ns
-
-DTDigiSimLink::DTDigiSimLink(int wireNr, int digiNr, int nTDC, unsigned int trackId, EncodedEventId evId):
-  theWire(wireNr),
-  theDigiNumber(digiNr),
-  theCounts(nTDC),
-  theSimTrackId(trackId),
-  theEventId(evId)
-{}
-
-DTDigiSimLink::DTDigiSimLink(int wireNr, int digiNr, double tdrift, unsigned int trackId, EncodedEventId evId):
-  theWire(wireNr),
-  theDigiNumber(digiNr),
-  theCounts(static_cast<int>(tdrift/reso)),
-  theSimTrackId(trackId),
-  theEventId(evId)
-{}
-
-DTDigiSimLink::DTDigiSimLink():
-  theWire(0),
-  theDigiNumber(0),
-  theCounts(0),
-  theSimTrackId(0),
-  theEventId(0)
-{}
+const double DTDigiSimLink::reso = 25. / 32.;  //ns
+
+DTDigiSimLink::DTDigiSimLink(int wireNr, int digiNr, int nTDC, unsigned int trackId, EncodedEventId evId)
+    : theWire(wireNr), theDigiNumber(digiNr), theCounts(nTDC), theSimTrackId(trackId), theEventId(evId) {}
+
+DTDigiSimLink::DTDigiSimLink(int wireNr, int digiNr, double tdrift, unsigned int trackId, EncodedEventId evId)
+    : theWire(wireNr),
+      theDigiNumber(digiNr),
+      theCounts(static_cast<int>(tdrift / reso)),
+      theSimTrackId(trackId),
+      theEventId(evId) {}
+
+DTDigiSimLink::DTDigiSimLink() : theWire(0), theDigiNumber(0), theCounts(0), theSimTrackId(0), theEventId(0) {}
 
 DTDigiSimLink::ChannelType DTDigiSimLink::channel() const {
   ChannelPacking result;
@@ -35,14 +23,14 @@ DTDigiSimLink::ChannelType DTDigiSimLink::channel() const {
   return *p_result;
 }
 
-int DTDigiSimLink::wire() const {return theWire;}
+int DTDigiSimLink::wire() const { return theWire; }
 
-int DTDigiSimLink::number() const {return theDigiNumber;}
+int DTDigiSimLink::number() const { return theDigiNumber; }
 
 uint32_t DTDigiSimLink::countsTDC() const { return theCounts; }
 
-double DTDigiSimLink::time() const { return theCounts*reso; }
+double DTDigiSimLink::time() const { return theCounts * reso; }
 
-unsigned int DTDigiSimLink::SimTrackId() const {return theSimTrackId;}
+unsigned int DTDigiSimLink::SimTrackId() const { return theSimTrackId; }
 
-EncodedEventId DTDigiSimLink::eventId() const {return theEventId;}
+EncodedEventId DTDigiSimLink::eventId() const { return theEventId; }
diff --git a/SimDataFormats/DigiSimLinks/src/classes.h b/SimDataFormats/DigiSimLinks/src/classes.h
index af1bfb3b1c141..91645deb2f87c 100644
--- a/SimDataFormats/DigiSimLinks/src/classes.h
+++ b/SimDataFormats/DigiSimLinks/src/classes.h
@@ -3,4 +3,3 @@
 #include <DataFormats/Common/interface/Wrapper.h>
 #include <vector>
 #include <map>
-
diff --git a/SimDataFormats/EcalTestBeam/interface/HodoscopeDetId.h b/SimDataFormats/EcalTestBeam/interface/HodoscopeDetId.h
old mode 100755
new mode 100644
index 7878bca3a7ea5..c8d00a94ee4bd
--- a/SimDataFormats/EcalTestBeam/interface/HodoscopeDetId.h
+++ b/SimDataFormats/EcalTestBeam/interface/HodoscopeDetId.h
@@ -17,31 +17,27 @@
 //                CaloGenericDetId for use of its denseIndex() fcn.
 //                Hence choose EBDetId to inherit from.
 
-class HodoscopeDetId : public EBDetId 
-{
-   public:
+class HodoscopeDetId : public EBDetId {
+public:
+  HodoscopeDetId();
+  HodoscopeDetId(uint32_t rawid);
+  HodoscopeDetId(int iPlane, int iFibr);
+  HodoscopeDetId(const DetId& id);
 
-      HodoscopeDetId();
-      HodoscopeDetId( uint32_t rawid ) ;
-      HodoscopeDetId( int iPlane, int iFibr ) ;
-      HodoscopeDetId( const DetId& id ) ;
+  int planeId() const;
 
-      int planeId() const ;
+  int fibrId() const;
 
-      int fibrId() const ;
+  static bool validDetId(int iPlane, int iFibr);
 
-      static bool validDetId( int iPlane , int iFibr ) ;
-
-      /// range constants
-
-      static const int MIN_PLANE =  0 ;
-      static const int MAX_PLANE =  3 ;
-      static const int MIN_FIBR  =  0 ;
-      static const int MAX_FIBR  = 63 ;
+  /// range constants
 
+  static const int MIN_PLANE = 0;
+  static const int MAX_PLANE = 3;
+  static const int MIN_FIBR = 0;
+  static const int MAX_FIBR = 63;
 };
 
-std::ostream& operator<<(std::ostream& s,const HodoscopeDetId& id);
-
+std::ostream& operator<<(std::ostream& s, const HodoscopeDetId& id);
 
 #endif
diff --git a/SimDataFormats/EcalTestBeam/interface/PEcalTBInfo.h b/SimDataFormats/EcalTestBeam/interface/PEcalTBInfo.h
index 0ed26626bd484..18076ca2283dc 100644
--- a/SimDataFormats/EcalTestBeam/interface/PEcalTBInfo.h
+++ b/SimDataFormats/EcalTestBeam/interface/PEcalTBInfo.h
@@ -4,7 +4,7 @@
 //
 // Package:     EcalTestBeam
 // Class  :     PEcalTBInfo
-// 
+//
 //
 //
 
@@ -16,26 +16,25 @@
 // user include files
 
 class PEcalTBInfo {
-
-  typedef std::vector<float>  FloatVector;
-  typedef std::vector<int>    IntVector;
+  typedef std::vector<float> FloatVector;
+  typedef std::vector<int> IntVector;
 
 public:
   PEcalTBInfo();
   virtual ~PEcalTBInfo();
 
   // ---------- const member functions ---------------------
-  int         nCrystal()    const {return nCrystal_; }
+  int nCrystal() const { return nCrystal_; }
 
-  double      etaBeam()     const {return etaBeam_; }
-  double      phiBeam()     const {return phiBeam_; }
-  double      dXbeam()      const {return dXbeam_; }
-  double      dYbeam()      const {return dYbeam_; }
+  double etaBeam() const { return etaBeam_; }
+  double phiBeam() const { return phiBeam_; }
+  double dXbeam() const { return dXbeam_; }
+  double dYbeam() const { return dYbeam_; }
 
-  double      evXbeam()     const {return evXbeam_; }
-  double      evYbeam()     const {return evYbeam_; }
+  double evXbeam() const { return evXbeam_; }
+  double evYbeam() const { return evYbeam_; }
 
-  double      phaseShift()  const {return phaseShift_;}
+  double phaseShift() const { return phaseShift_; }
 
   // ---------- static member functions --------------------
 
@@ -50,8 +49,8 @@ class PEcalTBInfo {
   void setPhaseShift(double phaseShift);
 
 private:
-  //  PEcalTBInfo(const PEcalTBInfo&); 
-  //  const PEcalTBInfo& operator=(const PEcalTBInfo&); 
+  //  PEcalTBInfo(const PEcalTBInfo&);
+  //  const PEcalTBInfo& operator=(const PEcalTBInfo&);
 
   // ---------- member data --------------------------------
 
@@ -59,16 +58,15 @@ class PEcalTBInfo {
 
   int nCrystal_;
 
-  double etaBeam_,phiBeam_;
-  double dXbeam_,dYbeam_;
+  double etaBeam_, phiBeam_;
+  double dXbeam_, dYbeam_;
 
   //event beam parameters
 
-  double evXbeam_,evYbeam_;
+  double evXbeam_, evYbeam_;
 
   // phase
   double phaseShift_;
 };
 
-
 #endif
diff --git a/SimDataFormats/EcalTestBeam/src/HodoscopeDetId.cc b/SimDataFormats/EcalTestBeam/src/HodoscopeDetId.cc
old mode 100755
new mode 100644
index 10db4cfd3cc6d..954aed296a4e4
--- a/SimDataFormats/EcalTestBeam/src/HodoscopeDetId.cc
+++ b/SimDataFormats/EcalTestBeam/src/HodoscopeDetId.cc
@@ -2,61 +2,30 @@
 #include "FWCore/Utilities/interface/Exception.h"
 
 #include <iostream>
-HodoscopeDetId::HodoscopeDetId() : 
-   EBDetId() 
-{
-}
+HodoscopeDetId::HodoscopeDetId() : EBDetId() {}
 
-HodoscopeDetId::HodoscopeDetId( uint32_t rawid ) : 
-   EBDetId( rawid ) 
-{
-}
+HodoscopeDetId::HodoscopeDetId(uint32_t rawid) : EBDetId(rawid) {}
 
-int 
-HodoscopeDetId::planeId() const 
-{
-   return ieta() ; 
-}
+int HodoscopeDetId::planeId() const { return ieta(); }
 
-int 
-HodoscopeDetId::fibrId() const 
-{ 
-   return iphi() ; 
-}
+int HodoscopeDetId::fibrId() const { return iphi(); }
 
-HodoscopeDetId::HodoscopeDetId( int iPlane ,
-				int iFibr    ) 
-   : EBDetId( iPlane, iFibr )
-{
-   if( !validDetId( iPlane, iFibr ) )
-   {
-      throw cms::Exception("InvalidDetId") 
-	 << "HodoscopeDetId:  Cannot create object.  Indices out of bounds.";
-   }
+HodoscopeDetId::HodoscopeDetId(int iPlane, int iFibr) : EBDetId(iPlane, iFibr) {
+  if (!validDetId(iPlane, iFibr)) {
+    throw cms::Exception("InvalidDetId") << "HodoscopeDetId:  Cannot create object.  Indices out of bounds.";
+  }
 }
-  
-HodoscopeDetId::HodoscopeDetId( const DetId& gen ) :
-   EBDetId( gen )
-{
-   if( !validDetId( planeId(), fibrId() ) )
-   {
-      throw cms::Exception("InvalidDetId") 
-	 << "HodoscopeDetId:  Cannot create object.  Indices out of bounds.";
-   }
+
+HodoscopeDetId::HodoscopeDetId(const DetId& gen) : EBDetId(gen) {
+  if (!validDetId(planeId(), fibrId())) {
+    throw cms::Exception("InvalidDetId") << "HodoscopeDetId:  Cannot create object.  Indices out of bounds.";
+  }
 }
 
-bool 
-HodoscopeDetId::validDetId( int iPlane ,
-			    int iFibr   ) 
-{
-   return !( iPlane < MIN_PLANE || 
-	     iPlane > MAX_PLANE ||
-	     iFibr  < MIN_FIBR  ||
-	     iFibr  > MAX_FIBR     ) ;
+bool HodoscopeDetId::validDetId(int iPlane, int iFibr) {
+  return !(iPlane < MIN_PLANE || iPlane > MAX_PLANE || iFibr < MIN_FIBR || iFibr > MAX_FIBR);
 }
 
-std::ostream& operator<<(std::ostream& s,const HodoscopeDetId& id) 
-{
-   return s << "(Plane " << id.planeId() << ", fiber " << id.fibrId() << ')';
+std::ostream& operator<<(std::ostream& s, const HodoscopeDetId& id) {
+  return s << "(Plane " << id.planeId() << ", fiber " << id.fibrId() << ')';
 }
-  
diff --git a/SimDataFormats/EcalTestBeam/src/PEcalTBInfo.cc b/SimDataFormats/EcalTestBeam/src/PEcalTBInfo.cc
index 6b37f6fbc8ff7..8e480faaff8dc 100644
--- a/SimDataFormats/EcalTestBeam/src/PEcalTBInfo.cc
+++ b/SimDataFormats/EcalTestBeam/src/PEcalTBInfo.cc
@@ -17,16 +17,13 @@
 //
 // constructors and destructor
 //
-PEcalTBInfo::PEcalTBInfo() {
-  clear();
-}
+PEcalTBInfo::PEcalTBInfo() { clear(); }
 
 // PEcalTBInfo::PEcalTBInfo(const PEcalTBInfo& rhs) {
 //    // do actual copying here;
 // }
 
-PEcalTBInfo::~PEcalTBInfo() {
-}
+PEcalTBInfo::~PEcalTBInfo() {}
 
 //
 // assignment operators
@@ -52,10 +49,8 @@ void PEcalTBInfo::clear() {
   evXbeam_ = evYbeam_ = 0.;
   phaseShift_ = 1.;
 }
-  
-void PEcalTBInfo::setCrystal(int nCrystal) {
-  nCrystal_ = nCrystal;
-}
+
+void PEcalTBInfo::setCrystal(int nCrystal) { nCrystal_ = nCrystal; }
 
 void PEcalTBInfo::setBeamDirection(double etaBeam, double phiBeam) {
   etaBeam_ = etaBeam;
@@ -72,6 +67,4 @@ void PEcalTBInfo::setBeamPosition(double evXbeam, double evYbeam) {
   evYbeam_ = evYbeam;
 }
 
-void PEcalTBInfo::setPhaseShift(double phaseShift) {
-  phaseShift_ = phaseShift;
-}
+void PEcalTBInfo::setPhaseShift(double phaseShift) { phaseShift_ = phaseShift; }
diff --git a/SimDataFormats/EcalTestBeam/src/classes.h b/SimDataFormats/EcalTestBeam/src/classes.h
index 26dbe977edb8e..5496b83e0653c 100644
--- a/SimDataFormats/EcalTestBeam/src/classes.h
+++ b/SimDataFormats/EcalTestBeam/src/classes.h
@@ -3,4 +3,3 @@
 
 #include "DataFormats/Common/interface/Wrapper.h"
 #include <vector>
-
diff --git a/SimDataFormats/EncodedEventId/interface/EncodedEventId.h b/SimDataFormats/EncodedEventId/interface/EncodedEventId.h
index 7ade53524b7d5..ff0083ba6be3c 100644
--- a/SimDataFormats/EncodedEventId/interface/EncodedEventId.h
+++ b/SimDataFormats/EncodedEventId/interface/EncodedEventId.h
@@ -2,44 +2,50 @@
 #define SimDataFormats_EncodedEventId_H 1
 
 #include <TMath.h>
-#include <boost/cstdint.hpp> //INCLUDECHECKER:SKIP
+#include <boost/cstdint.hpp>  //INCLUDECHECKER:SKIP
 #include <ostream>
 
 /** \class EncodedEventId
 
 */
 class EncodedEventId {
- public:
+public:
   /// Create an empty or null id (also for persistence)
   EncodedEventId();
   /// Create an id from a raw number
   explicit EncodedEventId(uint32_t id);
   /// Create an id, filling the bunch crossing and event infomrations
-  EncodedEventId(int bunchX, int event){
-    id_ = TMath::Abs(bunchX)<< bunchXStartBit_ |event ;
-    if (bunchX<0) id_=id_ | bunchNegMask_;
+  EncodedEventId(int bunchX, int event) {
+    id_ = TMath::Abs(bunchX) << bunchXStartBit_ | event;
+    if (bunchX < 0)
+      id_ = id_ | bunchNegMask_;
   }
 
   /// get the detector field from this detid
-  int bunchCrossing() const { int bcr= int((id_ >> bunchXStartBit_) & 0x7FFF); return id_ & bunchNegMask_ ? -bcr : bcr; }
+  int bunchCrossing() const {
+    int bcr = int((id_ >> bunchXStartBit_) & 0x7FFF);
+    return id_ & bunchNegMask_ ? -bcr : bcr;
+  }
   /// get the contents of the subdetector field (should be protected?)
   int event() const { return int(id_ & 0xFFFF); }
   uint32_t operator()() { return id_; }
   /// get the raw id
   uint32_t rawId() const { return id_; }
   /// equality
-  int operator==(const EncodedEventId& id) const { return id_==id.id_; }
+  int operator==(const EncodedEventId& id) const { return id_ == id.id_; }
   /// inequality
-  int operator!=(const EncodedEventId& id) const { return id_!=id.id_; }
+  int operator!=(const EncodedEventId& id) const { return id_ != id.id_; }
   /// comparison
-  int operator<(const EncodedEventId& id) const { return id_<id.id_; }
- private:
-  static const unsigned int bunchXStartBit_ =  16;
-  static const unsigned int eventStartBit_  =  0;
-  static const unsigned int bunchXMask_ =   0x10;
-  static const unsigned int bunchNegMask_ =  0x80000000;
-  static const unsigned int eventMask_  =   0x10;
- protected:
+  int operator<(const EncodedEventId& id) const { return id_ < id.id_; }
+
+private:
+  static const unsigned int bunchXStartBit_ = 16;
+  static const unsigned int eventStartBit_ = 0;
+  static const unsigned int bunchXMask_ = 0x10;
+  static const unsigned int bunchNegMask_ = 0x80000000;
+  static const unsigned int eventMask_ = 0x10;
+
+protected:
   uint32_t id_;
 };
 #endif
diff --git a/SimDataFormats/EncodedEventId/src/EncodedEventId.cc b/SimDataFormats/EncodedEventId/src/EncodedEventId.cc
index d2e29ea698731..85325ba987af3 100644
--- a/SimDataFormats/EncodedEventId/src/EncodedEventId.cc
+++ b/SimDataFormats/EncodedEventId/src/EncodedEventId.cc
@@ -1,4 +1,4 @@
 #include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
 
-EncodedEventId::EncodedEventId():id_(0) {}
-EncodedEventId::EncodedEventId(uint32_t id):id_(id){ }
+EncodedEventId::EncodedEventId() : id_(0) {}
+EncodedEventId::EncodedEventId(uint32_t id) : id_(id) {}
diff --git a/SimDataFormats/EncodedEventId/src/classes.h b/SimDataFormats/EncodedEventId/src/classes.h
index a9ee279e02be4..a5e04e2a13115 100644
--- a/SimDataFormats/EncodedEventId/src/classes.h
+++ b/SimDataFormats/EncodedEventId/src/classes.h
@@ -1,4 +1,3 @@
 #include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
-#include <boost/cstdint.hpp> 
+#include <boost/cstdint.hpp>
 #include <vector>
-
diff --git a/SimDataFormats/Forward/interface/LHCTransportLink.h b/SimDataFormats/Forward/interface/LHCTransportLink.h
index 56a3c00d88232..21187bfe8d9d2 100644
--- a/SimDataFormats/Forward/interface/LHCTransportLink.h
+++ b/SimDataFormats/Forward/interface/LHCTransportLink.h
@@ -13,38 +13,35 @@
  
 */
 //
-// Original Author: 
+// Original Author:
 //         Created:  Fri May 29 17:00:00 CEST 2009
 //
- 
+
 // system include files
 #include <iostream>
 
 // user include files
 
 class LHCTransportLink {
-
- public:
-  
+public:
   // ---------- Constructor and destructor -----------------
-  explicit LHCTransportLink(int & beforeHector, int & afterHector):beforeHector_(beforeHector),afterHector_(afterHector) { };
-  LHCTransportLink():beforeHector_(0),afterHector_(0) {}; 
-  
-  // ---------- Member functions --------------------------- 
-  
-  void fill(int & afterHector, int & beforeHector);
+  explicit LHCTransportLink(int& beforeHector, int& afterHector)
+      : beforeHector_(beforeHector), afterHector_(afterHector){};
+  LHCTransportLink() : beforeHector_(0), afterHector_(0){};
+
+  // ---------- Member functions ---------------------------
+
+  void fill(int& afterHector, int& beforeHector);
   int beforeHector() const;
   int afterHector() const;
   void clear();
-  
- private: 
-  
-  // ---------- Private Data members ----------------------- 
+
+private:
+  // ---------- Private Data members -----------------------
   int beforeHector_;
   int afterHector_;
-  
 };
 
-std::ostream & operator <<(std::ostream & o , const LHCTransportLink & t);
+std::ostream& operator<<(std::ostream& o, const LHCTransportLink& t);
 
 #endif
diff --git a/SimDataFormats/Forward/interface/TotemTestHistoClass.h b/SimDataFormats/Forward/interface/TotemTestHistoClass.h
index bf17306d991b8..6ae064789bd2b 100644
--- a/SimDataFormats/Forward/interface/TotemTestHistoClass.h
+++ b/SimDataFormats/Forward/interface/TotemTestHistoClass.h
@@ -14,29 +14,27 @@
  
 */
 //
-// Original Author: 
+// Original Author:
 //         Created:  Tue May 16 10:14:34 CEST 2006
 //
- 
+
 // system include files
 #include <vector>
 
 // user include files
 
 class TotemTestHistoClass {
-
 public:
-
   // ---------- Constructor and destructor -----------------
   explicit TotemTestHistoClass();
   virtual ~TotemTestHistoClass();
 
   struct Hit {
     Hit() {}
-    int   UID;
-    int   Ptype;
-    int   TID;
-    int   PID;
+    int UID;
+    int Ptype;
+    int TID;
+    int PID;
     float ELoss;
     float PABS;
     float x;
@@ -46,22 +44,30 @@ class TotemTestHistoClass {
     float vy;
     float vz;
   };
-	 
-  // ---------- Member functions --------------------------- 
-  int getEVT()      const {return evt;}
-  int getNHit()     const {return hits;}
-  std::vector<Hit> getHits() const {return hit;}
 
-  void setEVT(int v)      {evt=v;}
-  void fillHit(int uID, int pType, int tID, int pID, float eLoss, float pAbs,
-	       float vX, float vY, float vZ, float x, float y, float z);
+  // ---------- Member functions ---------------------------
+  int getEVT() const { return evt; }
+  int getNHit() const { return hits; }
+  std::vector<Hit> getHits() const { return hit; }
 
-private: 
-	 
-  // ---------- Private Data members ----------------------- 
-  int              evt, hits;
-  std::vector<Hit> hit;
+  void setEVT(int v) { evt = v; }
+  void fillHit(int uID,
+               int pType,
+               int tID,
+               int pID,
+               float eLoss,
+               float pAbs,
+               float vX,
+               float vY,
+               float vZ,
+               float x,
+               float y,
+               float z);
 
+private:
+  // ---------- Private Data members -----------------------
+  int evt, hits;
+  std::vector<Hit> hit;
 };
 
 #endif
diff --git a/SimDataFormats/Forward/src/LHCTransportLink.cc b/SimDataFormats/Forward/src/LHCTransportLink.cc
index 8f18694585986..586203edc7d54 100644
--- a/SimDataFormats/Forward/src/LHCTransportLink.cc
+++ b/SimDataFormats/Forward/src/LHCTransportLink.cc
@@ -1,28 +1,21 @@
 #include "SimDataFormats/Forward/interface/LHCTransportLink.h"
 #include <iomanip>
 
-void LHCTransportLink::fill(int & afterHector, int & beforeHector) {
+void LHCTransportLink::fill(int& afterHector, int& beforeHector) {
   afterHector_ = afterHector;
   beforeHector_ = beforeHector;
 }
 
-int LHCTransportLink::beforeHector() const {
-  return beforeHector_;
-}
+int LHCTransportLink::beforeHector() const { return beforeHector_; }
 
-int LHCTransportLink::afterHector() const {
-  return afterHector_;
-}
+int LHCTransportLink::afterHector() const { return afterHector_; }
 
-void LHCTransportLink::clear(){
+void LHCTransportLink::clear() {
   afterHector_ = 0;
   beforeHector_ = 0;
-} 
-
-std::ostream & operator <<(std::ostream & o , const LHCTransportLink & t){
+}
 
-  o << "before Hector " << t.beforeHector() << " after Hector " << t.afterHector(); 
+std::ostream& operator<<(std::ostream& o, const LHCTransportLink& t) {
+  o << "before Hector " << t.beforeHector() << " after Hector " << t.afterHector();
   return o;
-
 }
-
diff --git a/SimDataFormats/Forward/src/TotemTestHistoClass.cc b/SimDataFormats/Forward/src/TotemTestHistoClass.cc
index 238658ddc3d08..d8e68db419998 100644
--- a/SimDataFormats/Forward/src/TotemTestHistoClass.cc
+++ b/SimDataFormats/Forward/src/TotemTestHistoClass.cc
@@ -6,7 +6,7 @@
 // Implementation:
 //     <Notes on implementation>
 //
-// Original Author: 
+// Original Author:
 //         Created:  Tue May 16 10:14:34 CEST 2006
 //
 
@@ -26,27 +26,34 @@ TotemTestHistoClass::TotemTestHistoClass() : evt(0), hits(0) {}
 
 TotemTestHistoClass::~TotemTestHistoClass() {}
 
-void TotemTestHistoClass::fillHit(int uID, int pType, int tID, int pID, 
-				  float eLoss, float pAbs, float vX, float vY,
-				  float vZ, float x, float y, float z) {
-
+void TotemTestHistoClass::fillHit(int uID,
+                                  int pType,
+                                  int tID,
+                                  int pID,
+                                  float eLoss,
+                                  float pAbs,
+                                  float vX,
+                                  float vY,
+                                  float vZ,
+                                  float x,
+                                  float y,
+                                  float z) {
   TotemTestHistoClass::Hit h;
-  h.UID   = uID;
+  h.UID = uID;
   h.Ptype = pType;
-  h.TID   = tID;
-  h.PID   = pID;
+  h.TID = tID;
+  h.PID = pID;
   h.ELoss = eLoss;
-  h.PABS  = pAbs;
-  h.x     = x;
-  h.y     = y;
-  h.z     = z;
-  h.vx    = vX;
-  h.vy    = vY;
-  h.vz    = vZ;
+  h.PABS = pAbs;
+  h.x = x;
+  h.y = y;
+  h.z = z;
+  h.vx = vX;
+  h.vy = vY;
+  h.vz = vZ;
   hit.push_back(h);
   hits++;
-  LogDebug("ForwardSim") << "TotemTestHistoClass : Hit " << hits << " " << uID
-			 << ", " << pType << ", " << tID << ", " << pID << ", "
-			 << eLoss << ", " << pAbs << ", " << vX << ", " << vY
-			 << ", " << vZ << ", " << x << ", " << y << ", " << z;
+  LogDebug("ForwardSim") << "TotemTestHistoClass : Hit " << hits << " " << uID << ", " << pType << ", " << tID << ", "
+                         << pID << ", " << eLoss << ", " << pAbs << ", " << vX << ", " << vY << ", " << vZ << ", " << x
+                         << ", " << y << ", " << z;
 }
diff --git a/SimDataFormats/Forward/src/classes.h b/SimDataFormats/Forward/src/classes.h
index f4b62d5753b73..2ca8a174407df 100644
--- a/SimDataFormats/Forward/src/classes.h
+++ b/SimDataFormats/Forward/src/classes.h
@@ -3,4 +3,3 @@
 #include "SimDataFormats/Forward/interface/LHCTransportLinkContainer.h"
 #include "DataFormats/Common/interface/Wrapper.h"
 #include <vector>
-
diff --git a/SimDataFormats/HcalTestBeam/interface/HcalTB02HistoClass.h b/SimDataFormats/HcalTestBeam/interface/HcalTB02HistoClass.h
index e0774a527aae1..2bb2b2acc9787 100644
--- a/SimDataFormats/HcalTestBeam/interface/HcalTB02HistoClass.h
+++ b/SimDataFormats/HcalTestBeam/interface/HcalTB02HistoClass.h
@@ -12,102 +12,121 @@
  Usage: Used in 2002 Hcal Test Beam studies
 */
 //
-// Original Author:  
+// Original Author:
 //         Created:  Thu Sun 21 10:14:34 CEST 2006
 //
-  
+
 // system include files
- 
+
 // user include files
 
 class HcalTB02HistoClass {
-   
 public:
- 
   // ---------- Constructor and destructor -----------------
-  HcalTB02HistoClass() : Nprimaries(0), partID_(0), Einit(0), eta_(0), phi_(0),
-    Eentry(0), EhcalTot(0), Ehcal7x7(0), Ehcal5x5(0), EhcalTotN(0),
-    Ehcal7x7N(0), Ehcal5x5N(0), Nunit(0), Ntimesli(0), xEentry_(0),
-    xEhcalTot_(0), xEhcalTotN_(0), xEhcal7x7_(0), xEhcal5x5_(0), xEhcal3x3_(0),
-    xEhcal7x7N_(0), xEhcal5x5N_(0), xEhcal3x3N_(0), xNunit_(0) {;}
-  virtual ~HcalTB02HistoClass() {;}
+  HcalTB02HistoClass()
+      : Nprimaries(0),
+        partID_(0),
+        Einit(0),
+        eta_(0),
+        phi_(0),
+        Eentry(0),
+        EhcalTot(0),
+        Ehcal7x7(0),
+        Ehcal5x5(0),
+        EhcalTotN(0),
+        Ehcal7x7N(0),
+        Ehcal5x5N(0),
+        Nunit(0),
+        Ntimesli(0),
+        xEentry_(0),
+        xEhcalTot_(0),
+        xEhcalTotN_(0),
+        xEhcal7x7_(0),
+        xEhcal5x5_(0),
+        xEhcal3x3_(0),
+        xEhcal7x7N_(0),
+        xEhcal5x5N_(0),
+        xEhcal3x3N_(0),
+        xNunit_(0) {
+    ;
+  }
+  virtual ~HcalTB02HistoClass() { ; }
 
   // ---------- member functions ---------------------------
-  void set_partType(float v)  {partID_ = v;}
-  void set_Nprim(float v)     {Nprimaries = v;}
-  void set_Einit(float v)     {Einit = v;}
-  void set_eta(float v)       {eta_ = v;}
-  void set_phi(float v)       {phi_ = v;}
-  void set_Eentry(float v)    {Eentry = v;}
-  void set_ETot(float v)      {EhcalTot = v;}
-  void set_E5x5(float v)      {Ehcal5x5 = v;}
-  void set_E7x7(float v)      {Ehcal7x7 = v;}
-  void set_ETotN(float v)     {EhcalTotN = v;}
-  void set_E5x5N(float v)     {Ehcal5x5N = v;}
-  void set_E7x7N(float v)     {Ehcal7x7N = v;}
-  void set_NUnit(float v)     {Nunit = v;}
-  void set_Ntimesli(float v)  {Ntimesli = v;}
-  void set_xEentry(float v)   {xEentry_ = v;}
-  void set_xETot(float v)     {xEhcalTot_ = v;}
-  void set_xETotN(float v)    {xEhcalTotN_ = v;}
-  void set_xE5x5(float v)     {xEhcal5x5_ = v;}
-  void set_xE3x3(float v)     {xEhcal3x3_ = v;}
-  void set_xE5x5N(float v)    {xEhcal5x5N_ = v;}
-  void set_xE3x3N(float v)    {xEhcal3x3N_ = v;}
-  void set_xNUnit(float v)    {xNunit_ = v;}
+  void set_partType(float v) { partID_ = v; }
+  void set_Nprim(float v) { Nprimaries = v; }
+  void set_Einit(float v) { Einit = v; }
+  void set_eta(float v) { eta_ = v; }
+  void set_phi(float v) { phi_ = v; }
+  void set_Eentry(float v) { Eentry = v; }
+  void set_ETot(float v) { EhcalTot = v; }
+  void set_E5x5(float v) { Ehcal5x5 = v; }
+  void set_E7x7(float v) { Ehcal7x7 = v; }
+  void set_ETotN(float v) { EhcalTotN = v; }
+  void set_E5x5N(float v) { Ehcal5x5N = v; }
+  void set_E7x7N(float v) { Ehcal7x7N = v; }
+  void set_NUnit(float v) { Nunit = v; }
+  void set_Ntimesli(float v) { Ntimesli = v; }
+  void set_xEentry(float v) { xEentry_ = v; }
+  void set_xETot(float v) { xEhcalTot_ = v; }
+  void set_xETotN(float v) { xEhcalTotN_ = v; }
+  void set_xE5x5(float v) { xEhcal5x5_ = v; }
+  void set_xE3x3(float v) { xEhcal3x3_ = v; }
+  void set_xE5x5N(float v) { xEhcal5x5N_ = v; }
+  void set_xE3x3N(float v) { xEhcal3x3N_ = v; }
+  void set_xNUnit(float v) { xNunit_ = v; }
 
-  float nPrimaries()  const {return Nprimaries;}
-  float partID()      const {return partID_;}
-  float eInit()       const {return Einit;}
-  float eta()         const {return eta_;}
-  float phi()         const {return phi_;}
-  float eEntry()      const {return Eentry;}
-  float eHcalTot()    const {return EhcalTot;}
-  float eHcal7x7()    const {return Ehcal7x7;}
-  float eHcal5x5()    const {return Ehcal5x5;}
-  float eHcalTotN()   const {return EhcalTotN;}
-  float eHcal7x7N()   const {return Ehcal7x7N;}
-  float eHcal5x5N()   const {return Ehcal5x5N;}
-  float nUnit()       const {return Nunit;}
-  float nTimeSli()    const {return Ntimesli;}
-  float xEntry()      const {return xEentry_;}
-  float xEHcalTot()   const {return xEhcalTot_;}
-  float xEHcalTotN()  const {return xEhcalTotN_;}
-  float xEHcal7x7()   const {return xEhcal7x7_;}
-  float xEHcal5x5()   const {return xEhcal5x5_;}
-  float xEHcal3x3()   const {return xEhcal3x3_;}
-  float xEHcal7x7N()  const {return xEhcal7x7N_;}
-  float xEHcal5x5N()  const {return xEhcal5x5N_;}
-  float xEHcal3x3N()  const {return xEhcal3x3N_;}
-  float xNUnit()      const {return xNunit_;}
-                                                                              
-private:
+  float nPrimaries() const { return Nprimaries; }
+  float partID() const { return partID_; }
+  float eInit() const { return Einit; }
+  float eta() const { return eta_; }
+  float phi() const { return phi_; }
+  float eEntry() const { return Eentry; }
+  float eHcalTot() const { return EhcalTot; }
+  float eHcal7x7() const { return Ehcal7x7; }
+  float eHcal5x5() const { return Ehcal5x5; }
+  float eHcalTotN() const { return EhcalTotN; }
+  float eHcal7x7N() const { return Ehcal7x7N; }
+  float eHcal5x5N() const { return Ehcal5x5N; }
+  float nUnit() const { return Nunit; }
+  float nTimeSli() const { return Ntimesli; }
+  float xEntry() const { return xEentry_; }
+  float xEHcalTot() const { return xEhcalTot_; }
+  float xEHcalTotN() const { return xEhcalTotN_; }
+  float xEHcal7x7() const { return xEhcal7x7_; }
+  float xEHcal5x5() const { return xEhcal5x5_; }
+  float xEHcal3x3() const { return xEhcal3x3_; }
+  float xEHcal7x7N() const { return xEhcal7x7N_; }
+  float xEHcal5x5N() const { return xEhcal5x5N_; }
+  float xEHcal3x3N() const { return xEhcal3x3N_; }
+  float xNUnit() const { return xNunit_; }
 
+private:
   // ---------- Private Data members -----------------------
-  float         Nprimaries;
-  float         partID_;
-  float         Einit;
-  float         eta_;
-  float         phi_;
-  float         Eentry;
-  float         EhcalTot;
-  float         Ehcal7x7;
-  float         Ehcal5x5;
-  float         EhcalTotN;
-  float         Ehcal7x7N;
-  float         Ehcal5x5N;
-  float         Nunit;
-  float         Ntimesli;
-  float         xEentry_;
-  float         xEhcalTot_;
-  float         xEhcalTotN_;
-  float         xEhcal7x7_;
-  float         xEhcal5x5_;
-  float         xEhcal3x3_;
-  float         xEhcal7x7N_;
-  float         xEhcal5x5N_;
-  float         xEhcal3x3N_;
-  float         xNunit_;
+  float Nprimaries;
+  float partID_;
+  float Einit;
+  float eta_;
+  float phi_;
+  float Eentry;
+  float EhcalTot;
+  float Ehcal7x7;
+  float Ehcal5x5;
+  float EhcalTotN;
+  float Ehcal7x7N;
+  float Ehcal5x5N;
+  float Nunit;
+  float Ntimesli;
+  float xEentry_;
+  float xEhcalTot_;
+  float xEhcalTotN_;
+  float xEhcal7x7_;
+  float xEhcal5x5_;
+  float xEhcal3x3_;
+  float xEhcal7x7N_;
+  float xEhcal5x5N_;
+  float xEhcal3x3N_;
+  float xNunit_;
 };
- 
+
 #endif
diff --git a/SimDataFormats/HcalTestBeam/interface/HcalTestBeamNumbering.h b/SimDataFormats/HcalTestBeam/interface/HcalTestBeamNumbering.h
index 6ddecbd660848..63aba21a23dbc 100644
--- a/SimDataFormats/HcalTestBeam/interface/HcalTestBeamNumbering.h
+++ b/SimDataFormats/HcalTestBeam/interface/HcalTestBeamNumbering.h
@@ -8,27 +8,25 @@
 #include <boost/cstdint.hpp>
 
 class HcalTestBeamNumbering {
-
 public:
-  static const int kHcalBeamXValueOffset    = 0;
-  static const int kHcalBeamXValueMask      = 0x1FF;
-  static const int kHcalBeamXSignOffset     = 9;
-  static const int kHcalBeamXSignMask       = 0x1;
-  static const int kHcalBeamYValueOffset    = 10;
-  static const int kHcalBeamYValueMask      = 0x1FF;
-  static const int kHcalBeamYSignOffset     = 19;
-  static const int kHcalBeamYSignMask       = 0x1;
-  static const int kHcalBeamLayerOffset     = 21;
-  static const int kHcalBeamLayerMask       = 0x7F;
-  static const int kHcalBeamTypeOffset      = 28;
-  static const int kHcalBeamTypeMask        = 0xF;
+  static const int kHcalBeamXValueOffset = 0;
+  static const int kHcalBeamXValueMask = 0x1FF;
+  static const int kHcalBeamXSignOffset = 9;
+  static const int kHcalBeamXSignMask = 0x1;
+  static const int kHcalBeamYValueOffset = 10;
+  static const int kHcalBeamYValueMask = 0x1FF;
+  static const int kHcalBeamYSignOffset = 19;
+  static const int kHcalBeamYSignMask = 0x1;
+  static const int kHcalBeamLayerOffset = 21;
+  static const int kHcalBeamLayerMask = 0x7F;
+  static const int kHcalBeamTypeOffset = 28;
+  static const int kHcalBeamTypeMask = 0xF;
 
-  enum HcalTestBeamDetector { HcalTBEmpty=0, HcalTBScintillator=1, HcalTBWireChamber=2 };
+  enum HcalTestBeamDetector { HcalTBEmpty = 0, HcalTBScintillator = 1, HcalTBWireChamber = 2 };
 
   HcalTestBeamNumbering() {}
-  static uint32_t  packIndex(int det, int lay, int x, int y);
-  static void      unpackIndex(const uint32_t& idx, int& det, int& lay, 
-			       int& x, int& y);
+  static uint32_t packIndex(int det, int lay, int x, int y);
+  static void unpackIndex(const uint32_t& idx, int& det, int& lay, int& x, int& y);
 };
 
 #endif
diff --git a/SimDataFormats/HcalTestBeam/interface/PHcalTB04Info.h b/SimDataFormats/HcalTestBeam/interface/PHcalTB04Info.h
index aa95ef8d8fa3e..b3bf50f71146e 100644
--- a/SimDataFormats/HcalTestBeam/interface/PHcalTB04Info.h
+++ b/SimDataFormats/HcalTestBeam/interface/PHcalTB04Info.h
@@ -4,7 +4,7 @@
 //
 // Package:     HcalTestBeam
 // Class  :     PHcalTB04Info
-// 
+//
 /**\class PHcalTB04Info PHcalTB04Info.h SimDataFormats/HcalTestBeam/interface/PHcalTB04Info.h
 
  Description: Histogram handling class for analysis
@@ -31,9 +31,8 @@
 class HcalTB04Analysis;
 
 class PHcalTB04Info {
-
-  typedef std::vector<float>  FloatVector;
-  typedef std::vector<int>    IntVector;
+  typedef std::vector<float> FloatVector;
+  typedef std::vector<int> IntVector;
   friend class HcalTB04Analysis;
 
 public:
@@ -41,53 +40,53 @@ class PHcalTB04Info {
   virtual ~PHcalTB04Info();
 
   // ---------- const member functions ---------------------
-  int         primary()     const {return nPrimary;}
-  int         partID()      const {return idBeam;}
-  float       initE()       const {return eBeam;}
-  float       eta()         const {return etaBeam;}
-  float       phi()         const {return phiBeam;}
-  int         crystal()     const {return nCrystal;}
-  IntVector   idsEcal()     const {return idEcal;}
-  int         tower()       const {return nTower;}
-  IntVector   idsHcal()     const {return idHcal;}
-  float       simEtotal()   const {return simEtot;}
-  float       simEcE()      const {return simEEc;}
-  float       simHcE()      const {return simEHc;}
-  float       digEtotal()   const {return digEtot;}
-  float       digEcE()      const {return digEEc;}
-  float       digHcE()      const {return digEHc;}
-  FloatVector simEEcal()    const {return esime;}
-  FloatVector digEEcal()    const {return edige;}
-  FloatVector simEHcal()    const {return esimh;}
-  FloatVector digEHcal()    const {return edigh;}
-
-  int         nHit()        const {return hit;}
-  IntVector   detectorHit() const {return detHit;}
-  IntVector   etaIndexHit() const {return etaHit;}
-  IntVector   phiIndexHit() const {return phiHit;}
-  IntVector   layerHit()    const {return layHit;}
-  FloatVector energyHit()   const {return eHit;}
-  FloatVector timeHit()     const {return tHit;}
-
-  int         evNum()       const {return v1EvNum;}
-  int         vtxType()     const {return v1Type;}
-  int         vtxSec()      const {return v1Nsec;}
-  IntVector   vtxTrkID()    const {return v1secTrackID;}
-  IntVector   vtxPartID()   const {return v1secPartID;}
-  float       vtxPrimX()    const {return v1X;}
-  float       vtxPrimY()    const {return v1Y;}
-  float       vtxPrimZ()    const {return v1Z;}
-  float       vtxPrimR()    const {return v1R;}
-  float       vtxPrimU()    const {return v1U;}
-  float       vtxPrimV()    const {return v1V;}
-  float       vtxPrimW()    const {return v1W;}
-  float       vtxPrimPx()   const {return v1Px;}
-  float       vtxPrimPy()   const {return v1Py;}
-  float       vtxPrimPz()   const {return v1Pz;}
-  FloatVector vtxSecPx()    const {return v1secPx;}
-  FloatVector vtxSecPy()    const {return v1secPy;}
-  FloatVector vtxSecPz()    const {return v1secPz;}
-  FloatVector vtxSecEk()    const {return v1secEk;}
+  int primary() const { return nPrimary; }
+  int partID() const { return idBeam; }
+  float initE() const { return eBeam; }
+  float eta() const { return etaBeam; }
+  float phi() const { return phiBeam; }
+  int crystal() const { return nCrystal; }
+  IntVector idsEcal() const { return idEcal; }
+  int tower() const { return nTower; }
+  IntVector idsHcal() const { return idHcal; }
+  float simEtotal() const { return simEtot; }
+  float simEcE() const { return simEEc; }
+  float simHcE() const { return simEHc; }
+  float digEtotal() const { return digEtot; }
+  float digEcE() const { return digEEc; }
+  float digHcE() const { return digEHc; }
+  FloatVector simEEcal() const { return esime; }
+  FloatVector digEEcal() const { return edige; }
+  FloatVector simEHcal() const { return esimh; }
+  FloatVector digEHcal() const { return edigh; }
+
+  int nHit() const { return hit; }
+  IntVector detectorHit() const { return detHit; }
+  IntVector etaIndexHit() const { return etaHit; }
+  IntVector phiIndexHit() const { return phiHit; }
+  IntVector layerHit() const { return layHit; }
+  FloatVector energyHit() const { return eHit; }
+  FloatVector timeHit() const { return tHit; }
+
+  int evNum() const { return v1EvNum; }
+  int vtxType() const { return v1Type; }
+  int vtxSec() const { return v1Nsec; }
+  IntVector vtxTrkID() const { return v1secTrackID; }
+  IntVector vtxPartID() const { return v1secPartID; }
+  float vtxPrimX() const { return v1X; }
+  float vtxPrimY() const { return v1Y; }
+  float vtxPrimZ() const { return v1Z; }
+  float vtxPrimR() const { return v1R; }
+  float vtxPrimU() const { return v1U; }
+  float vtxPrimV() const { return v1V; }
+  float vtxPrimW() const { return v1W; }
+  float vtxPrimPx() const { return v1Px; }
+  float vtxPrimPy() const { return v1Py; }
+  float vtxPrimPz() const { return v1Pz; }
+  FloatVector vtxSecPx() const { return v1secPx; }
+  FloatVector vtxSecPy() const { return v1secPy; }
+  FloatVector vtxSecPz() const { return v1secPz; }
+  FloatVector vtxSecEk() const { return v1secEk; }
 
   // ---------- static member functions --------------------
 
@@ -95,58 +94,58 @@ class PHcalTB04Info {
   void clear();
   void setIDs(const std::vector<int>&, const std::vector<int>&);
   void setPrimary(int primary, int id, double energy, double eta, double phi);
-  void setEdep(double simtot, double sime, double simh, 
-	       double digtot, double dige, double digh);
+  void setEdep(double simtot, double sime, double simh, double digtot, double dige, double digh);
   void setEdepEcal(const std::vector<double>& esim, const std::vector<double>& edig);
   void setEdepHcal(const std::vector<double>& esim, const std::vector<double>& edig);
 
-  void setTrnsProf(const std::vector<double>& es1, const std::vector<double>& eq1, 
-		   const std::vector<double>& es2, const std::vector<double>& eq2);
+  void setTrnsProf(const std::vector<double>& es1,
+                   const std::vector<double>& eq1,
+                   const std::vector<double>& es2,
+                   const std::vector<double>& eq2);
   void setLongProf(const std::vector<double>& es, const std::vector<double>& eq);
   void saveHit(int det, int lay, int eta, int phi, double e, double t);
 
   //Vertex associated methods
-  void setVtxPrim(int evNum, int type, double x, double y, double z, double u,
-		  double v, double w, double px, double py, double pz); 
-  void setVtxSec(int id, int pdg, double px, double py, double pz, double ek); 
+  void setVtxPrim(
+      int evNum, int type, double x, double y, double z, double u, double v, double w, double px, double py, double pz);
+  void setVtxSec(int id, int pdg, double px, double py, double pz, double ek);
 
 private:
-  //  PHcalTB04Info(const PHcalTB04Info&); 
-  //  const PHcalTB04Info& operator=(const PHcalTB04Info&); 
+  //  PHcalTB04Info(const PHcalTB04Info&);
+  //  const PHcalTB04Info& operator=(const PHcalTB04Info&);
 
   // ---------- member data --------------------------------
 
   //Beam parameters
-  int          nPrimary, idBeam;
-  float        eBeam, etaBeam, phiBeam;
+  int nPrimary, idBeam;
+  float eBeam, etaBeam, phiBeam;
 
   //Deposited energies
-  float        simEtot, simEEc, simEHc;
-  float        digEtot, digEEc, digEHc;
-  FloatVector  esime, edige;
-  FloatVector  esimh, edigh;
-  FloatVector  latsimEta, latdigEta;
-  FloatVector  latsimPhi, latdigPhi;
-  FloatVector  longsim,   longdig;
+  float simEtot, simEEc, simEHc;
+  float digEtot, digEEc, digEHc;
+  FloatVector esime, edige;
+  FloatVector esimh, edigh;
+  FloatVector latsimEta, latdigEta;
+  FloatVector latsimPhi, latdigPhi;
+  FloatVector longsim, longdig;
 
   //Tower Members
-  int          nCrystal;
-  IntVector    idEcal;
-  int          nTower;
-  IntVector    idHcal;
+  int nCrystal;
+  IntVector idEcal;
+  int nTower;
+  IntVector idHcal;
 
   //Hit Members
-  int         hit;
-  IntVector   detHit, etaHit, phiHit, layHit;
+  int hit;
+  IntVector detHit, etaHit, phiHit, layHit;
   FloatVector eHit, tHit;
 
   //Vertex members
-  int          v1EvNum, v1Type, v1Nsec;
-  IntVector    v1secTrackID, v1secPartID;
-  float        v1X, v1Y, v1Z, v1R, v1U, v1V, v1W;
-  float        v1Px, v1Py, v1Pz;
-  FloatVector  v1secPx, v1secPy, v1secPz, v1secEk;
+  int v1EvNum, v1Type, v1Nsec;
+  IntVector v1secTrackID, v1secPartID;
+  float v1X, v1Y, v1Z, v1R, v1U, v1V, v1W;
+  float v1Px, v1Py, v1Pz;
+  FloatVector v1secPx, v1secPy, v1secPz, v1secEk;
 };
 
-
 #endif
diff --git a/SimDataFormats/HcalTestBeam/interface/PHcalTB06Info.h b/SimDataFormats/HcalTestBeam/interface/PHcalTB06Info.h
index 051afbf9f1eeb..6c4cf4376a979 100644
--- a/SimDataFormats/HcalTestBeam/interface/PHcalTB06Info.h
+++ b/SimDataFormats/HcalTestBeam/interface/PHcalTB06Info.h
@@ -4,7 +4,7 @@
 //
 // Package:     HcalTestBeam
 // Class  :     PHcalTB06Info
-// 
+//
 /**\class PHcalTB06Info PHcalTB06Info.h SimDataFormats/HcalTestBeam/interface/PHcalTB06Info.h
 
  Description: Histogram handling class for analysis
@@ -28,15 +28,14 @@
 // user include files
 
 class PHcalTB06Info {
-
 public:
   PHcalTB06Info();
   virtual ~PHcalTB06Info();
 
   struct Vtx {
-    Vtx(): trackID(0), partID(0), px(0), py(0), pz(0), eKin(0) {}
-    int   trackID;
-    int   partID;
+    Vtx() : trackID(0), partID(0), px(0), py(0), pz(0), eKin(0) {}
+    int trackID;
+    int partID;
     float px;
     float py;
     float pz;
@@ -44,58 +43,58 @@ class PHcalTB06Info {
   };
 
   struct Hit {
-    Hit(): id(0), eta(0), phi(0), e(0), t(0) {}
+    Hit() : id(0), eta(0), phi(0), e(0), t(0) {}
     unsigned int id;
-    float    eta;
-    float    phi;
-    float    e;
-    float    t;
+    float eta;
+    float phi;
+    float e;
+    float t;
   };
 
-  typedef std::vector<float>  FloatVector;
-  typedef std::vector<int>    IntVector;
-  typedef std::vector<Vtx>    VtxVector;
-  typedef std::vector<Hit>    HitVector;
+  typedef std::vector<float> FloatVector;
+  typedef std::vector<int> IntVector;
+  typedef std::vector<Vtx> VtxVector;
+  typedef std::vector<Hit> HitVector;
 
   // ---------- const member functions ---------------------
-  int          primary()                    const {return nPrimary;}
-  int          partID()                     const {return idBeam;}
-  float        initE()                      const {return eBeam;}
-  float        eta()                        const {return etaBeam;}
-  float        phi()                        const {return phiBeam;}
-  float        simEtotal()                  const {return simEtot;}
-  float        simEcE()                     const {return simEEc;}
-  float        simHcE()                     const {return simEHc;}
-
-  HitVector    simHits()                    const {return hits;}
-  Hit          simHit(unsigned int i)       const {return hits[i];}
-  unsigned int simHitID(unsigned int i)     const {return hits[i].id;}
-  float        simHitEta(unsigned int i)    const {return hits[i].eta;}
-  float        simHitPhi(unsigned int i)    const {return hits[i].phi;}
-  float        simHitE(unsigned int i)      const {return hits[i].e;}
-  float        simHitT(unsigned int i)      const {return hits[i].t;}
-
-  int          evNum()                      const {return v1EvNum;}
-  int          vtxType()                    const {return v1Type;}
-  float        vtxPrimX()                   const {return v1X;}
-  float        vtxPrimY()                   const {return v1Y;}
-  float        vtxPrimZ()                   const {return v1Z;}
-  float        vtxPrimR()                   const {return v1R;}
-  float        vtxPrimU()                   const {return v1U;}
-  float        vtxPrimV()                   const {return v1V;}
-  float        vtxPrimW()                   const {return v1W;}
-  float        vtxPrimPx()                  const {return v1Px;}
-  float        vtxPrimPy()                  const {return v1Py;}
-  float        vtxPrimPz()                  const {return v1Pz;}
-  int          vtxSec()                     const {return v1Nsec;}
-  VtxVector    vtxSecondaries()             const {return v1Sec;}
-  Vtx          vtxSecondary(unsigned int i) const {return v1Sec[i];}
-  int          vtxTrackID(unsigned int i)   const {return v1Sec[i].trackID;}
-  int          vtxPartID(unsigned int i)    const {return v1Sec[i].partID;}
-  float        vtxSecPx(unsigned int i)     const {return v1Sec[i].px;}
-  float        vtxSecPy(unsigned int i)     const {return v1Sec[i].py;}
-  float        vtxSecPz(unsigned int i)     const {return v1Sec[i].pz;}
-  float        vtxSecEKin(unsigned int i)   const {return v1Sec[i].eKin;}
+  int primary() const { return nPrimary; }
+  int partID() const { return idBeam; }
+  float initE() const { return eBeam; }
+  float eta() const { return etaBeam; }
+  float phi() const { return phiBeam; }
+  float simEtotal() const { return simEtot; }
+  float simEcE() const { return simEEc; }
+  float simHcE() const { return simEHc; }
+
+  HitVector simHits() const { return hits; }
+  Hit simHit(unsigned int i) const { return hits[i]; }
+  unsigned int simHitID(unsigned int i) const { return hits[i].id; }
+  float simHitEta(unsigned int i) const { return hits[i].eta; }
+  float simHitPhi(unsigned int i) const { return hits[i].phi; }
+  float simHitE(unsigned int i) const { return hits[i].e; }
+  float simHitT(unsigned int i) const { return hits[i].t; }
+
+  int evNum() const { return v1EvNum; }
+  int vtxType() const { return v1Type; }
+  float vtxPrimX() const { return v1X; }
+  float vtxPrimY() const { return v1Y; }
+  float vtxPrimZ() const { return v1Z; }
+  float vtxPrimR() const { return v1R; }
+  float vtxPrimU() const { return v1U; }
+  float vtxPrimV() const { return v1V; }
+  float vtxPrimW() const { return v1W; }
+  float vtxPrimPx() const { return v1Px; }
+  float vtxPrimPy() const { return v1Py; }
+  float vtxPrimPz() const { return v1Pz; }
+  int vtxSec() const { return v1Nsec; }
+  VtxVector vtxSecondaries() const { return v1Sec; }
+  Vtx vtxSecondary(unsigned int i) const { return v1Sec[i]; }
+  int vtxTrackID(unsigned int i) const { return v1Sec[i].trackID; }
+  int vtxPartID(unsigned int i) const { return v1Sec[i].partID; }
+  float vtxSecPx(unsigned int i) const { return v1Sec[i].px; }
+  float vtxSecPy(unsigned int i) const { return v1Sec[i].py; }
+  float vtxSecPz(unsigned int i) const { return v1Sec[i].pz; }
+  float vtxSecEKin(unsigned int i) const { return v1Sec[i].eKin; }
 
   // ---------- static member functions --------------------
 
@@ -106,34 +105,33 @@ class PHcalTB06Info {
   void saveHit(unsigned int det, double eta, double phi, double e, double t);
 
   //Vertex associated methods
-  void setVtxPrim(int evNum, int type, double x, double y, double z, double u,
-		  double v, double w, double px, double py, double pz); 
-  void setVtxSec(int id, int pdg, double px, double py, double pz, double ek); 
+  void setVtxPrim(
+      int evNum, int type, double x, double y, double z, double u, double v, double w, double px, double py, double pz);
+  void setVtxSec(int id, int pdg, double px, double py, double pz, double ek);
 
 private:
-  //  PHcalTB06Info(const PHcalTB06Info&); 
-  //  const PHcalTB06Info& operator=(const PHcalTB06Info&); 
+  //  PHcalTB06Info(const PHcalTB06Info&);
+  //  const PHcalTB06Info& operator=(const PHcalTB06Info&);
 
   // ---------- member data --------------------------------
 
   //Beam parameters
-  int          nPrimary, idBeam;
-  float        eBeam, etaBeam, phiBeam;
+  int nPrimary, idBeam;
+  float eBeam, etaBeam, phiBeam;
 
   //Deposited energies
-  float        simEtot, simEEc, simEHc;
-  float        digEtot, digEEc, digEHc;
+  float simEtot, simEEc, simEHc;
+  float digEtot, digEEc, digEHc;
 
   //Hit Members
-  int         hit;
-  HitVector   hits;
+  int hit;
+  HitVector hits;
 
   //Vertex members
-  int          v1EvNum, v1Type, v1Nsec;
-  float        v1X, v1Y, v1Z, v1R, v1U, v1V, v1W;
-  float        v1Px, v1Py, v1Pz;
-  VtxVector    v1Sec;
+  int v1EvNum, v1Type, v1Nsec;
+  float v1X, v1Y, v1Z, v1R, v1U, v1V, v1W;
+  float v1Px, v1Py, v1Pz;
+  VtxVector v1Sec;
 };
 
-
 #endif
diff --git a/SimDataFormats/HcalTestBeam/src/HcalTestBeamNumbering.cc b/SimDataFormats/HcalTestBeam/src/HcalTestBeamNumbering.cc
index a005200d99fe5..e09f949fc08c3 100644
--- a/SimDataFormats/HcalTestBeam/src/HcalTestBeamNumbering.cc
+++ b/SimDataFormats/HcalTestBeam/src/HcalTestBeamNumbering.cc
@@ -4,40 +4,42 @@
 //#define EDM_ML_DEBUG
 
 uint32_t HcalTestBeamNumbering::packIndex(int det, int lay, int x, int y) {
-
   int ix(0), ixx(x);
-  if (x < 0) { ix = 1; ixx =-x;}
+  if (x < 0) {
+    ix = 1;
+    ixx = -x;
+  }
   int iy(0), iyy(y);
-  if (y < 0) { iy = 1; iyy =-y;}
-  uint32_t idx = (det&kHcalBeamTypeMask)<<kHcalBeamTypeOffset;
-  idx         += (lay&kHcalBeamLayerMask)<<kHcalBeamLayerOffset;
-  idx         += (iy&kHcalBeamYSignMask)<<kHcalBeamYSignOffset;
-  idx         += (iyy&kHcalBeamYValueMask)<<kHcalBeamYValueOffset;
-  idx         += (ix&kHcalBeamXSignMask)<<kHcalBeamXSignOffset;
-  idx         += (ixx&kHcalBeamXValueMask)<<kHcalBeamXValueOffset;
+  if (y < 0) {
+    iy = 1;
+    iyy = -y;
+  }
+  uint32_t idx = (det & kHcalBeamTypeMask) << kHcalBeamTypeOffset;
+  idx += (lay & kHcalBeamLayerMask) << kHcalBeamLayerOffset;
+  idx += (iy & kHcalBeamYSignMask) << kHcalBeamYSignOffset;
+  idx += (iyy & kHcalBeamYValueMask) << kHcalBeamYValueOffset;
+  idx += (ix & kHcalBeamXSignMask) << kHcalBeamXSignOffset;
+  idx += (ixx & kHcalBeamXValueMask) << kHcalBeamXValueOffset;
 
 #ifdef EDM_ML_DEBUG
-  std::cout << "HcalTestBeamNumbering: Detector " << det << " Layer " << lay 
-	    << " x " << x << " " << ix << " " << ixx << " y " << y << " " 
-	    << iy << " " << iyy << " ID " << std::hex << idx << std::dec
-	    << std::endl;
+  std::cout << "HcalTestBeamNumbering: Detector " << det << " Layer " << lay << " x " << x << " " << ix << " " << ixx
+            << " y " << y << " " << iy << " " << iyy << " ID " << std::hex << idx << std::dec << std::endl;
 #endif
   return idx;
 }
 
-void HcalTestBeamNumbering::unpackIndex(const uint32_t& idx, int& det, int& lay,
-					int& x, int& y) {
-
-  det  = (idx>>kHcalBeamTypeOffset)&kHcalBeamTypeMask;
-  lay  = (idx>>kHcalBeamLayerOffset)&kHcalBeamLayerMask;
-  y    = (idx>>kHcalBeamYValueOffset)&kHcalBeamYValueMask; 
-  x    = (idx>>kHcalBeamXValueOffset)&kHcalBeamXValueMask;
-  if (((idx>>kHcalBeamYSignOffset)&kHcalBeamYSignMask) == 1) y = -y;
-  if (((idx>>kHcalBeamXSignOffset)&kHcalBeamXSignMask) == 1) x = -x;
+void HcalTestBeamNumbering::unpackIndex(const uint32_t& idx, int& det, int& lay, int& x, int& y) {
+  det = (idx >> kHcalBeamTypeOffset) & kHcalBeamTypeMask;
+  lay = (idx >> kHcalBeamLayerOffset) & kHcalBeamLayerMask;
+  y = (idx >> kHcalBeamYValueOffset) & kHcalBeamYValueMask;
+  x = (idx >> kHcalBeamXValueOffset) & kHcalBeamXValueMask;
+  if (((idx >> kHcalBeamYSignOffset) & kHcalBeamYSignMask) == 1)
+    y = -y;
+  if (((idx >> kHcalBeamXSignOffset) & kHcalBeamXSignMask) == 1)
+    x = -x;
 
 #ifdef EDM_ML_DEBUG
-  std::cout << "HcalTestBeamNumbering: ID " << std::hex << idx << std::dec
-	    << " Detector " << det << " Layer " << lay << " x " << x << " y " 
-	    << y << std::endl;
+  std::cout << "HcalTestBeamNumbering: ID " << std::hex << idx << std::dec << " Detector " << det << " Layer " << lay
+            << " x " << x << " y " << y << std::endl;
 #endif
 }
diff --git a/SimDataFormats/HcalTestBeam/src/PHcalTB04Info.cc b/SimDataFormats/HcalTestBeam/src/PHcalTB04Info.cc
index 96a7da448c456..a769522f5aa40 100644
--- a/SimDataFormats/HcalTestBeam/src/PHcalTB04Info.cc
+++ b/SimDataFormats/HcalTestBeam/src/PHcalTB04Info.cc
@@ -2,7 +2,7 @@
 //
 // Package:     HcalTestBeam
 // Class  :     PHcalTB04Info
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -16,8 +16,6 @@
 #include "SimDataFormats/HcalTestBeam/interface/PHcalTB04Info.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-
-
 //
 // constants, enums and typedefs
 //
@@ -29,16 +27,13 @@
 //
 // constructors and destructor
 //
-PHcalTB04Info::PHcalTB04Info() {
-  clear();
-}
+PHcalTB04Info::PHcalTB04Info() { clear(); }
 
 // PHcalTB04Info::PHcalTB04Info(const PHcalTB04Info& rhs) {
 //    // do actual copying here;
 // }
 
-PHcalTB04Info::~PHcalTB04Info() {
-}
+PHcalTB04Info::~PHcalTB04Info() {}
 
 //
 // assignment operators
@@ -56,7 +51,7 @@ PHcalTB04Info::~PHcalTB04Info() {
 //
 
 void PHcalTB04Info::clear() {
-  nPrimary =  idBeam =0;
+  nPrimary = idBeam = 0;
   eBeam = etaBeam = phiBeam = 0;
 
   simEtot = simEEc = simEHc = 0;
@@ -70,9 +65,8 @@ void PHcalTB04Info::clear() {
   v1X = v1Y = v1Z = v1U = v1V = v1W = 0;
   v1Px = v1Py = v1Pz = 0;
 }
-  
-void PHcalTB04Info::setIDs(const std::vector<int>& ide, const std::vector<int>& idh) {
 
+void PHcalTB04Info::setIDs(const std::vector<int>& ide, const std::vector<int>& idh) {
   nCrystal = ide.size();
   if (nCrystal > 0) {
     idEcal.reserve(nCrystal);
@@ -80,116 +74,115 @@ void PHcalTB04Info::setIDs(const std::vector<int>& ide, const std::vector<int>&
     edige.reserve(nCrystal);
   }
   LogDebug("SimHCalData") << "PHcalTB04Info:: Called with " << nCrystal << " crystals";
-  for (int i=0; i<nCrystal; i++) {
+  for (int i = 0; i < nCrystal; i++) {
     idEcal.push_back(ide[i]);
     LogDebug("SimHCalData") << "\tIndex for " << i << " =  0x" << std::hex << idEcal[i] << std::dec;
   }
 
-  nTower   = idh.size();
+  nTower = idh.size();
   if (nTower > 0) {
     idHcal.reserve(nTower);
     esimh.reserve(nTower);
     edigh.reserve(nTower);
   }
   LogDebug("SimHCalData") << "PHcalTB04Info:: Called with " << nTower << " HCal towers";
-  for (int i=0; i<nTower; i++) {
+  for (int i = 0; i < nTower; i++) {
     idHcal.push_back(idh[i]);
     LogDebug("SimHCalData") << "\tIndex for " << i << " =  0x" << std::hex << idHcal[i] << std::dec;
   }
-
 }
 
-void PHcalTB04Info::setPrimary(int primary, int id, double energy, double etav,
-			       double phiv) {
-
+void PHcalTB04Info::setPrimary(int primary, int id, double energy, double etav, double phiv) {
   nPrimary = primary;
-  idBeam   = id;
-  eBeam    = (float)(energy);
-  etaBeam  = (float)(etav);
-  phiBeam  = (float)(phiv);
-  LogDebug("SimHCalData") << "PHcalTB04Info::setPrimary: nPrimary " << nPrimary << " partID " << idBeam << " initE " << eBeam << " eta " << etaBeam << " phi " << phiBeam;
+  idBeam = id;
+  eBeam = (float)(energy);
+  etaBeam = (float)(etav);
+  phiBeam = (float)(phiv);
+  LogDebug("SimHCalData") << "PHcalTB04Info::setPrimary: nPrimary " << nPrimary << " partID " << idBeam << " initE "
+                          << eBeam << " eta " << etaBeam << " phi " << phiBeam;
 }
 
-void PHcalTB04Info::setEdep(double simtot, double sime, double simh, 
-			    double digtot, double dige, double digh) {
-
+void PHcalTB04Info::setEdep(double simtot, double sime, double simh, double digtot, double dige, double digh) {
   simEtot = (float)simtot;
-  simEEc  = (float)sime;
-  simEHc  = (float)simh;
+  simEEc = (float)sime;
+  simEHc = (float)simh;
   digEtot = (float)digtot;
-  digEEc  = (float)dige;
-  digEHc  = (float)digh;
+  digEEc = (float)dige;
+  digEHc = (float)digh;
 
-  LogDebug("SimHCalData") << "PHcalTB04Info::setEdep: simEtot " << simEtot << " simEEc " << simEEc << " simEHc " << simEHc << " digEtot " << digEtot  << " digEEc " << digEEc << " digEHc " << digEHc;
+  LogDebug("SimHCalData") << "PHcalTB04Info::setEdep: simEtot " << simEtot << " simEEc " << simEEc << " simEHc "
+                          << simEHc << " digEtot " << digEtot << " digEEc " << digEEc << " digEHc " << digEHc;
 }
 
-void PHcalTB04Info::setEdepEcal(const std::vector<double>& esim, 
-				const std::vector<double>& eqie) {
-
-  for (int i=0; i<nCrystal; i++) {
+void PHcalTB04Info::setEdepEcal(const std::vector<double>& esim, const std::vector<double>& eqie) {
+  for (int i = 0; i < nCrystal; i++) {
     float edep = 0;
-    if (i<int(esim.size())) esime.push_back(esim[i]);
-    else                    esime.push_back(edep);
-    if (i<int(eqie.size())) edige.push_back(eqie[i]);
-    else                    edige.push_back(edep);
+    if (i < int(esim.size()))
+      esime.push_back(esim[i]);
+    else
+      esime.push_back(edep);
+    if (i < int(eqie.size()))
+      edige.push_back(eqie[i]);
+    else
+      edige.push_back(edep);
 
     LogDebug("SimHCalData") << "PHcalTB04Info::setEdepEcal [" << i << "] Esim = " << esime[i] << " Edig = " << edige[i];
   }
 }
 
-void PHcalTB04Info::setEdepHcal(const std::vector<double>& esim, 
-				const std::vector<double>& eqie) {
-
-  for (int i=0; i<nTower; i++) {
+void PHcalTB04Info::setEdepHcal(const std::vector<double>& esim, const std::vector<double>& eqie) {
+  for (int i = 0; i < nTower; i++) {
     float edep = 0;
-    if (i<int(esim.size())) esimh.push_back(esim[i]);
-    else                    esimh.push_back(edep);
-    if (i<int(eqie.size())) edigh.push_back(eqie[i]);
-    else                    edigh.push_back(edep);
+    if (i < int(esim.size()))
+      esimh.push_back(esim[i]);
+    else
+      esimh.push_back(edep);
+    if (i < int(eqie.size()))
+      edigh.push_back(eqie[i]);
+    else
+      edigh.push_back(edep);
 
     LogDebug("SimHCalData") << "PHcalTB04Info::setEdepHcal [" << i << "] Esim = " << esimh[i] << " Edig = " << edigh[i];
   }
 }
 
-void PHcalTB04Info::setTrnsProf(const std::vector<double>& es1, 
-				const std::vector<double>& eq1, 
-				const std::vector<double>& es2,
-				const std::vector<double>& eq2) {
-
+void PHcalTB04Info::setTrnsProf(const std::vector<double>& es1,
+                                const std::vector<double>& eq1,
+                                const std::vector<double>& es2,
+                                const std::vector<double>& eq2) {
   int siz = (int)(es1.size());
   if (siz > 0) {
     latsimEta.reserve(siz);
     latdigEta.reserve(siz);
     latsimPhi.reserve(siz);
     latdigPhi.reserve(siz);
-    for (int i=0; i<siz; i++) {
+    for (int i = 0; i < siz; i++) {
       latsimEta.push_back((float)(es1[i]));
       latdigEta.push_back((float)(eq1[i]));
       latsimPhi.push_back((float)(es2[i]));
       latdigPhi.push_back((float)(eq2[i]));
-      LogDebug("SimHCalData") << "PHcalTB04Info::setTrnsProf [" << i << "] latsimEta = " << latsimEta[i] << " latdigEta = " << latdigEta[i] << " latsimPhi = " << latsimPhi[i] << " latdigPhi = " << latdigPhi[i];
+      LogDebug("SimHCalData") << "PHcalTB04Info::setTrnsProf [" << i << "] latsimEta = " << latsimEta[i]
+                              << " latdigEta = " << latdigEta[i] << " latsimPhi = " << latsimPhi[i]
+                              << " latdigPhi = " << latdigPhi[i];
     }
   }
 }
 
-void PHcalTB04Info::setLongProf(const std::vector<double>& es, 
-				const std::vector<double>& eq) {
-
+void PHcalTB04Info::setLongProf(const std::vector<double>& es, const std::vector<double>& eq) {
   int siz = (int)(es.size());
   if (siz > 0) {
     longsim.reserve(siz);
     longdig.reserve(siz);
-    for (int i=0; i<siz; i++) {
+    for (int i = 0; i < siz; i++) {
       longsim.push_back((float)(es[i]));
       longdig.push_back((float)(eq[i]));
-      LogDebug("SimHCalData") << "PHcalTB04Info::setLongProf [" << i << "] longsim = " << longsim[i] << " longdig = " << longdig[i];
+      LogDebug("SimHCalData") << "PHcalTB04Info::setLongProf [" << i << "] longsim = " << longsim[i]
+                              << " longdig = " << longdig[i];
     }
   }
 }
 
-void PHcalTB04Info::saveHit(int det, int lay, int eta, int phi, double e, 
-			    double t) {
-
+void PHcalTB04Info::saveHit(int det, int lay, int eta, int phi, double e, double t) {
   int nh = hit;
   hit++;
   detHit.push_back(det);
@@ -198,32 +191,31 @@ void PHcalTB04Info::saveHit(int det, int lay, int eta, int phi, double e,
   phiHit.push_back(phi);
   eHit.push_back((float)(e));
   tHit.push_back((float)(t));
-  LogDebug("SimHCalData") << "PHcalTB04Info::saveHit " << hit << " Det " << detHit[nh] << " layer " << layHit[nh] << " Eta " << etaHit[nh] << " Phi " << phiHit[nh] << " E " << eHit[nh] << " t " << tHit[nh];
+  LogDebug("SimHCalData") << "PHcalTB04Info::saveHit " << hit << " Det " << detHit[nh] << " layer " << layHit[nh]
+                          << " Eta " << etaHit[nh] << " Phi " << phiHit[nh] << " E " << eHit[nh] << " t " << tHit[nh];
 }
 
-void PHcalTB04Info::setVtxPrim(int evNum, int type, double x, double y, 
-			       double z, double u, double v, double w, 
-			       double px, double py, double pz) {
-
+void PHcalTB04Info::setVtxPrim(
+    int evNum, int type, double x, double y, double z, double u, double v, double w, double px, double py, double pz) {
   v1EvNum = evNum;
-  v1Type  = type;
-  double r= sqrt(x*x+y*y+z*z);
-  v1X     = (float)(x);
-  v1Y     = (float)(y);
-  v1Z     = (float)(z);
-  v1R     = (float)(r);
-  v1Px    = (float)(px);
-  v1Py    = (float)(py);
-  v1Pz    = (float)(pz);
-  v1U     = (float)(u);
-  v1V     = (float)(v);
-  v1W     = (float)(w);
-  LogDebug("SimHCalData") << "PHcalTB04Info::setVtxPrim: EvNum " << v1EvNum << " Type " << v1Type << " X/Y/Z/R " << v1X << "/" << v1Y << "/" << v1Z << "/" << v1R << " Px/Py/Pz " << v1Px << "/" << v1Py << "/" << v1Pz << " U/V/W " << v1U << "/" << v1V << "/" << v1W;
+  v1Type = type;
+  double r = sqrt(x * x + y * y + z * z);
+  v1X = (float)(x);
+  v1Y = (float)(y);
+  v1Z = (float)(z);
+  v1R = (float)(r);
+  v1Px = (float)(px);
+  v1Py = (float)(py);
+  v1Pz = (float)(pz);
+  v1U = (float)(u);
+  v1V = (float)(v);
+  v1W = (float)(w);
+  LogDebug("SimHCalData") << "PHcalTB04Info::setVtxPrim: EvNum " << v1EvNum << " Type " << v1Type << " X/Y/Z/R " << v1X
+                          << "/" << v1Y << "/" << v1Z << "/" << v1R << " Px/Py/Pz " << v1Px << "/" << v1Py << "/"
+                          << v1Pz << " U/V/W " << v1U << "/" << v1V << "/" << v1W;
 }
 
-void PHcalTB04Info::setVtxSec(int id, int pdg, double px, double py, double pz,
-			      double ek) {
-
+void PHcalTB04Info::setVtxSec(int id, int pdg, double px, double py, double pz, double ek) {
   int ns = v1Nsec;
   v1Nsec++;
   v1secTrackID.push_back(id);
@@ -231,6 +223,8 @@ void PHcalTB04Info::setVtxSec(int id, int pdg, double px, double py, double pz,
   v1secPx.push_back((float)(px));
   v1secPy.push_back((float)(py));
   v1secPz.push_back((float)(pz));
-  v1secEk.push_back((float)(ek));  
-  LogDebug("SimHCalData") << "PHcalTB04Info::setVtxSec " << v1Nsec << " ID " << v1secTrackID[ns] << " PDG Code " << v1secPartID[ns] << " Px/Py/Pz/Ek " << v1secPx[ns] << "/" << v1secPy[ns] << "/" << v1secPz[ns] << "/" << v1secEk[ns];
+  v1secEk.push_back((float)(ek));
+  LogDebug("SimHCalData") << "PHcalTB04Info::setVtxSec " << v1Nsec << " ID " << v1secTrackID[ns] << " PDG Code "
+                          << v1secPartID[ns] << " Px/Py/Pz/Ek " << v1secPx[ns] << "/" << v1secPy[ns] << "/"
+                          << v1secPz[ns] << "/" << v1secEk[ns];
 }
diff --git a/SimDataFormats/HcalTestBeam/src/PHcalTB06Info.cc b/SimDataFormats/HcalTestBeam/src/PHcalTB06Info.cc
index 445c1c0fb160b..c8d4a6f624f9a 100644
--- a/SimDataFormats/HcalTestBeam/src/PHcalTB06Info.cc
+++ b/SimDataFormats/HcalTestBeam/src/PHcalTB06Info.cc
@@ -2,7 +2,7 @@
 //
 // Package:     HcalTestBeam
 // Class  :     PHcalTB06Info
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -16,8 +16,6 @@
 #include "SimDataFormats/HcalTestBeam/interface/PHcalTB06Info.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-
-
 //
 // constants, enums and typedefs
 //
@@ -29,16 +27,13 @@
 //
 // constructors and destructor
 //
-PHcalTB06Info::PHcalTB06Info() {
-  clear();
-}
+PHcalTB06Info::PHcalTB06Info() { clear(); }
 
 // PHcalTB06Info::PHcalTB06Info(const PHcalTB06Info& rhs) {
 //    // do actual copying here;
 // }
 
-PHcalTB06Info::~PHcalTB06Info() {
-}
+PHcalTB06Info::~PHcalTB06Info() {}
 
 //
 // assignment operators
@@ -56,7 +51,7 @@ PHcalTB06Info::~PHcalTB06Info() {
 //
 
 void PHcalTB06Info::clear() {
-  nPrimary =  idBeam =0;
+  nPrimary = idBeam = 0;
   eBeam = etaBeam = phiBeam = 0;
 
   simEtot = simEEc = simEHc = 0;
@@ -70,87 +65,72 @@ void PHcalTB06Info::clear() {
   v1Sec.clear();
 }
 
-void PHcalTB06Info::setPrimary(int primary, int id, double energy, double etav,
-			       double phiv) {
-
+void PHcalTB06Info::setPrimary(int primary, int id, double energy, double etav, double phiv) {
   nPrimary = primary;
-  idBeam   = id;
-  eBeam    = (float)(energy);
-  etaBeam  = (float)(etav);
-  phiBeam  = (float)(phiv);
-  LogDebug("SimHCalData") << "PHcalTB06Info::setPrimary: nPrimary " << nPrimary
-			  << " partID " << idBeam << " initE " << eBeam 
-			  << " eta " << etaBeam << " phi " << phiBeam;
+  idBeam = id;
+  eBeam = (float)(energy);
+  etaBeam = (float)(etav);
+  phiBeam = (float)(phiv);
+  LogDebug("SimHCalData") << "PHcalTB06Info::setPrimary: nPrimary " << nPrimary << " partID " << idBeam << " initE "
+                          << eBeam << " eta " << etaBeam << " phi " << phiBeam;
 }
 
 void PHcalTB06Info::setEdep(double simtot, double sime, double simh) {
-
   simEtot = (float)simtot;
-  simEEc  = (float)sime;
-  simEHc  = (float)simh;
+  simEEc = (float)sime;
+  simEHc = (float)simh;
 
-  LogDebug("SimHCalData") << "PHcalTB06Info::setEdep: simEtot " << simEtot 
-			  << " simEEc " << simEEc << " simEHc " << simEHc;
+  LogDebug("SimHCalData") << "PHcalTB06Info::setEdep: simEtot " << simEtot << " simEEc " << simEEc << " simEHc "
+                          << simEHc;
 }
 
-void PHcalTB06Info::saveHit(unsigned int id, double eta, double phi, double e, 
-			    double t) {
-
+void PHcalTB06Info::saveHit(unsigned int id, double eta, double phi, double e, double t) {
   int nh = hit;
   hit++;
   PHcalTB06Info::Hit newHit;
-  newHit.id  = id;
+  newHit.id = id;
   newHit.eta = (float)(eta);
   newHit.phi = (float)(phi);
-  newHit.e   = (float)(e);
-  newHit.t   = (float)(t);
+  newHit.e = (float)(e);
+  newHit.t = (float)(t);
   hits.push_back(newHit);
-  LogDebug("SimHCalData") << "PHcalTB06Info::saveHit " << hit << " ID 0x" 
-			  << std::hex << hits[nh].id << std::dec << " Eta " 
-			  << hits[nh].eta << " Phi " << hits[nh].phi 
-			  << " E " << hits[nh].e << " t " << hits[nh].t;
+  LogDebug("SimHCalData") << "PHcalTB06Info::saveHit " << hit << " ID 0x" << std::hex << hits[nh].id << std::dec
+                          << " Eta " << hits[nh].eta << " Phi " << hits[nh].phi << " E " << hits[nh].e << " t "
+                          << hits[nh].t;
 }
 
-void PHcalTB06Info::setVtxPrim(int evNum, int type, double x, double y, 
-			       double z, double u, double v, double w, 
-			       double px, double py, double pz) {
-
+void PHcalTB06Info::setVtxPrim(
+    int evNum, int type, double x, double y, double z, double u, double v, double w, double px, double py, double pz) {
   v1EvNum = evNum;
-  v1Type  = type;
-  double r= sqrt(x*x+y*y+z*z);
-  v1X     = (float)(x);
-  v1Y     = (float)(y);
-  v1Z     = (float)(z);
-  v1R     = (float)(r);
-  v1Px    = (float)(px);
-  v1Py    = (float)(py);
-  v1Pz    = (float)(pz);
-  v1U     = (float)(u);
-  v1V     = (float)(v);
-  v1W     = (float)(w);
-  LogDebug("SimHCalData") << "PHcalTB06Info::setVtxPrim: EvNum " << v1EvNum 
-			  << " Type " << v1Type << " X/Y/Z/R " << v1X << "/" 
-			  << v1Y << "/" << v1Z << "/" << v1R << " Px/Py/Pz " 
-			  << v1Px << "/" << v1Py << "/" << v1Pz << " U/V/W "
-			  << v1U << "/" << v1V << "/" << v1W;
+  v1Type = type;
+  double r = sqrt(x * x + y * y + z * z);
+  v1X = (float)(x);
+  v1Y = (float)(y);
+  v1Z = (float)(z);
+  v1R = (float)(r);
+  v1Px = (float)(px);
+  v1Py = (float)(py);
+  v1Pz = (float)(pz);
+  v1U = (float)(u);
+  v1V = (float)(v);
+  v1W = (float)(w);
+  LogDebug("SimHCalData") << "PHcalTB06Info::setVtxPrim: EvNum " << v1EvNum << " Type " << v1Type << " X/Y/Z/R " << v1X
+                          << "/" << v1Y << "/" << v1Z << "/" << v1R << " Px/Py/Pz " << v1Px << "/" << v1Py << "/"
+                          << v1Pz << " U/V/W " << v1U << "/" << v1V << "/" << v1W;
 }
 
-void PHcalTB06Info::setVtxSec(int id, int pdg, double px, double py, double pz,
-			      double ek) {
-
+void PHcalTB06Info::setVtxSec(int id, int pdg, double px, double py, double pz, double ek) {
   int ns = v1Nsec;
   v1Nsec++;
   PHcalTB06Info::Vtx newVtx;
   newVtx.trackID = id;
-  newVtx.partID  = pdg;
-  newVtx.px      = (float)(px);
-  newVtx.py      = (float)(py);
-  newVtx.pz      = (float)(pz);
-  newVtx.eKin    = (float)(ek);
+  newVtx.partID = pdg;
+  newVtx.px = (float)(px);
+  newVtx.py = (float)(py);
+  newVtx.pz = (float)(pz);
+  newVtx.eKin = (float)(ek);
   v1Sec.push_back(newVtx);
-  LogDebug("SimHCalData") << "PHcalTB06Info::setVtxSec " << v1Nsec << " ID " 
-			  << v1Sec[ns].trackID << " PDG Code " 
-			  << v1Sec[ns].partID << " Px/Py/Pz/Ek " 
-			  << v1Sec[ns].px << "/" << v1Sec[ns].py << "/" 
-			  << v1Sec[ns].pz << "/" << v1Sec[ns].eKin;
+  LogDebug("SimHCalData") << "PHcalTB06Info::setVtxSec " << v1Nsec << " ID " << v1Sec[ns].trackID << " PDG Code "
+                          << v1Sec[ns].partID << " Px/Py/Pz/Ek " << v1Sec[ns].px << "/" << v1Sec[ns].py << "/"
+                          << v1Sec[ns].pz << "/" << v1Sec[ns].eKin;
 }
diff --git a/SimDataFormats/HcalTestBeam/src/classes.h b/SimDataFormats/HcalTestBeam/src/classes.h
index 6333763faa195..1e1f63b980234 100644
--- a/SimDataFormats/HcalTestBeam/src/classes.h
+++ b/SimDataFormats/HcalTestBeam/src/classes.h
@@ -3,4 +3,3 @@
 #include "SimDataFormats/HcalTestBeam/interface/HcalTB02HistoClass.h"
 #include "DataFormats/Common/interface/Wrapper.h"
 #include <vector>
-
diff --git a/SimDataFormats/HiGenData/interface/GenHIEvent.h b/SimDataFormats/HiGenData/interface/GenHIEvent.h
index 14c329c28b944..596d66c5afb35 100644
--- a/SimDataFormats/HiGenData/interface/GenHIEvent.h
+++ b/SimDataFormats/HiGenData/interface/GenHIEvent.h
@@ -5,89 +5,95 @@
 #include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
 
 namespace edm {
-   class GenHIEvent {
-   public:
+  class GenHIEvent {
+  public:
+    typedef std::vector<std::vector<reco::GenParticleRef> > SubEventCollection;
 
-      typedef std::vector<std::vector<reco::GenParticleRef> > SubEventCollection;
+    GenHIEvent()
+        : b_(-99),
+          npart_(-99),
+          ncoll_(-99),
+          nhard_(-99),
+          phi_(-99),
+          eccentricity_(-99),
+          nCharged_(-99),
+          nChargedMR_(-99),
+          meanPt_(-99),
+          meanPtMR_(-99),
+          EtMR_(-99),
+          nChargedPtCut_(-99),
+          nChargedPtCutMR_(-99) {
+      subevents_.reserve(0);
+      ;
+    }
 
-      GenHIEvent() :
-	 b_(-99),
-	 npart_(-99),
-	 ncoll_(-99),
-	 nhard_(-99),
-	 phi_(-99),
-	eccentricity_(-99),
-	 nCharged_(-99),
-	 nChargedMR_(-99),
-	 meanPt_(-99),
-	 meanPtMR_(-99),
-     EtMR_(-99),
-     nChargedPtCut_(-99),
-     nChargedPtCutMR_(-99)
-	    {
-	       subevents_.reserve(0);
-	       ;}
+    GenHIEvent(double b,
+               int npart,
+               int ncoll,
+               int nhard,
+               double phi,
+               double ecc = -99,
+               double nCharged = -99,
+               double nChargedMR = -99,
+               double meanPt = -99,
+               double meanPtMR = -99,
+               double EtMR = -99,
+               int nChargedPtCut = -99,
+               int nChargedPtCutMR = -99)
+        : b_(b),
+          npart_(npart),
+          ncoll_(ncoll),
+          nhard_(nhard),
+          phi_(phi),
+          eccentricity_(ecc),
+          nCharged_(nCharged),
+          nChargedMR_(nChargedMR),
+          meanPt_(meanPt),
+          meanPtMR_(meanPtMR),
+          EtMR_(EtMR),
+          nChargedPtCut_(nChargedPtCut),
+          nChargedPtCutMR_(nChargedPtCutMR) {
+      subevents_.reserve(0);
+      ;
+    }
 
-	GenHIEvent(double b, int npart, int ncoll, int nhard, double phi, double ecc = -99, double nCharged = -99,double nChargedMR=-99,double meanPt=-99,double meanPtMR=-99,double EtMR=-99,int nChargedPtCut=-99,int nChargedPtCutMR=-99) : 
-	  b_(b), 
-	  npart_(npart), 
-	  ncoll_(ncoll), 
-	  nhard_(nhard), 
-	  phi_(phi),
-	  eccentricity_(ecc),
-	  nCharged_(nCharged),
-	  nChargedMR_(nChargedMR),
-	  meanPt_(meanPt),
-	  meanPtMR_(meanPtMR),
-	  EtMR_(EtMR),
-	  nChargedPtCut_(nChargedPtCut),
-	  nChargedPtCutMR_(nChargedPtCutMR)
-	    {
-           subevents_.reserve(0);
-           ;}
+    virtual ~GenHIEvent() {}
 
+    double b() const { return b_; }
+    int Npart() const { return npart_; }
+    int Ncoll() const { return ncoll_; }
+    int Nhard() const { return nhard_; }
+    double evtPlane() const { return phi_; }
+    double eccentricity() const { return eccentricity_; }
+    int Ncharged() const { return nCharged_; }
+    int NchargedMR() const { return nChargedMR_; }
+    double MeanPt() const { return meanPt_; }
+    double MeanPtMR() const { return meanPtMR_; }
+    double EtMR() const { return EtMR_; }
+    int NchargedPtCut() const { return nChargedPtCut_; }
+    int NchargedPtCutMR() const { return nChargedPtCutMR_; }
+    void setGenParticles(const reco::GenParticleCollection*);
+    const std::vector<reco::GenParticleRef> getSubEvent(unsigned int sub_id) const;
 
+    int getNsubs() const { return subevents_.size(); }
 
+  private:
+    SubEventCollection subevents_;
+    int sel_;
 
-      virtual                    ~GenHIEvent() {}
-
-      double b() const {return b_;}
-      int Npart() const {return npart_;}
-      int Ncoll() const {return ncoll_;}
-      int Nhard() const {return nhard_;}
-      double evtPlane() const {return phi_;}
-      double eccentricity() const {return eccentricity_;}
-      int Ncharged() const {return nCharged_;}
-      int NchargedMR() const {return nChargedMR_;}
-      double MeanPt() const {return meanPt_;}
-      double MeanPtMR() const {return meanPtMR_;}
-      double EtMR() const {return EtMR_;}
-      int NchargedPtCut() const {return nChargedPtCut_;}
-      int NchargedPtCutMR() const {return nChargedPtCutMR_;}
-      void setGenParticles(const reco::GenParticleCollection*);
-      const std::vector<reco::GenParticleRef>    getSubEvent(unsigned int sub_id) const;
-
-      int           getNsubs() const {return subevents_.size();}
-
-   private:
-
-      SubEventCollection subevents_;
-      int sel_;
-
-      double b_;
-      int npart_;
-      int ncoll_;
-      int nhard_;
-      double phi_;
-      double eccentricity_;
-      int nCharged_;
-      int nChargedMR_;
-      double meanPt_;
-      double meanPtMR_;
-      double EtMR_;
-      int nChargedPtCut_;
-      int nChargedPtCutMR_;
-
-   };
-}
+    double b_;
+    int npart_;
+    int ncoll_;
+    int nhard_;
+    double phi_;
+    double eccentricity_;
+    int nCharged_;
+    int nChargedMR_;
+    double meanPt_;
+    double meanPtMR_;
+    double EtMR_;
+    int nChargedPtCut_;
+    int nChargedPtCutMR_;
+  };
+}  // namespace edm
 #endif
diff --git a/SimDataFormats/HiGenData/src/GenHIEvent.cc b/SimDataFormats/HiGenData/src/GenHIEvent.cc
index 5997ff0214fc2..bd46ca3d3eca5 100644
--- a/SimDataFormats/HiGenData/src/GenHIEvent.cc
+++ b/SimDataFormats/HiGenData/src/GenHIEvent.cc
@@ -4,29 +4,20 @@ using namespace edm;
 
 void GenHIEvent::setGenParticles(const reco::GenParticleCollection* input) {
   subevents_.reserve(nhard_);
-  for(int i = 0; i < nhard_; ++i){
+  for (int i = 0; i < nhard_; ++i) {
     std::vector<reco::GenParticleRef> refs;
     subevents_.push_back(refs);
   }
 
-  for(unsigned int i = 0; i < input->size(); ++i){
-    reco::GenParticleRef ref(input,i);
+  for (unsigned int i = 0; i < input->size(); ++i) {
+    reco::GenParticleRef ref(input, i);
     subevents_[ref->collisionId()].push_back(ref);
   }
 }
 
 const std::vector<reco::GenParticleRef> GenHIEvent::getSubEvent(unsigned int sub_id) const {
-
-  if(sub_id > subevents_.size()){ // sub_id >= 0, since sub_id is unsigned
+  if (sub_id > subevents_.size()) {  // sub_id >= 0, since sub_id is unsigned
   }
 
   return subevents_[sub_id];
 }
-
-
-
-
-
-
-
-
diff --git a/SimDataFormats/HiGenData/src/classes.h b/SimDataFormats/HiGenData/src/classes.h
index 52328dd42a26e..f3ac11c9fe10b 100644
--- a/SimDataFormats/HiGenData/src/classes.h
+++ b/SimDataFormats/HiGenData/src/classes.h
@@ -1,4 +1,2 @@
 #include "SimDataFormats/HiGenData/interface/GenHIEvent.h"
 #include "DataFormats/Common/interface/Wrapper.h"
-
-
diff --git a/SimDataFormats/JetMatching/interface/JetFlavour.h b/SimDataFormats/JetMatching/interface/JetFlavour.h
index cae9e80ef4d82..c2018de9b6f54 100644
--- a/SimDataFormats/JetMatching/interface/JetFlavour.h
+++ b/SimDataFormats/JetMatching/interface/JetFlavour.h
@@ -5,17 +5,15 @@
 #include "DataFormats/Math/interface/Point3D.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
 
-namespace reco
-{
-/**
+namespace reco {
+  /**
  * JetFlavour class is meant to be used when the genEvent is dropped.
  * It can store by value the matching information about flavour and parton kinematics
  * The flavour definition and the corresponding parton information should be configured
  * in the producer.
  * The typedefs are taken from reco::Particle
  * */
-class JetFlavour
-{
+  class JetFlavour {
   public:
     /// Lorentz vector
     typedef math::XYZTLorentzVector LorentzVector;
@@ -30,23 +28,23 @@ class JetFlavour
       Leptons() : electron(0), muon(0), tau(0) {}
     };
 
-    JetFlavour(void) { }
-    JetFlavour(const LorentzVector& lv, const Point &pt, int fl, const Leptons &le)
-    : m_partonMomentum(lv), m_partonVertex(pt), m_flavour(fl), m_leptons(le) {}
+    JetFlavour(void) {}
+    JetFlavour(const LorentzVector& lv, const Point& pt, int fl, const Leptons& le)
+        : m_partonMomentum(lv), m_partonVertex(pt), m_flavour(fl), m_leptons(le) {}
     JetFlavour(const LorentzVector& lv, const Point& pt, int fl)
-    : m_partonMomentum(lv), m_partonVertex(pt), m_flavour(fl) {}
+        : m_partonMomentum(lv), m_partonVertex(pt), m_flavour(fl) {}
+
+    const LorentzVector getLorentzVector() const { return m_partonMomentum; }
+    const Point getPartonVertex() const { return m_partonVertex; }
+    const int getFlavour() const { return m_flavour; }
+    const Leptons getLeptons() const { return m_leptons; }
 
-    const LorentzVector getLorentzVector() const {return m_partonMomentum;}
-    const Point         getPartonVertex()  const {return m_partonVertex;  }
-    const int           getFlavour()       const {return m_flavour;       } 
-    const Leptons       getLeptons()       const {return m_leptons;       }
-     
   private:
     LorentzVector m_partonMomentum;
-    Point         m_partonVertex;       // is it needed?
-    int           m_flavour;
-    Leptons       m_leptons;
-};
+    Point m_partonVertex;  // is it needed?
+    int m_flavour;
+    Leptons m_leptons;
+  };
 
-}
+}  // namespace reco
 #endif
diff --git a/SimDataFormats/JetMatching/interface/JetFlavourInfo.h b/SimDataFormats/JetMatching/interface/JetFlavourInfo.h
index 1065b195cbf8c..aca13b9c5200b 100644
--- a/SimDataFormats/JetMatching/interface/JetFlavourInfo.h
+++ b/SimDataFormats/JetMatching/interface/JetFlavourInfo.h
@@ -5,9 +5,8 @@
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
 
-namespace reco
-{
-/**\class JetFlavourInfo JetFlavourInfo.h SimDataFormats/JetMatching/interface/JetFlavourInfo.h
+namespace reco {
+  /**\class JetFlavourInfo JetFlavourInfo.h SimDataFormats/JetMatching/interface/JetFlavourInfo.h
  * \brief Class storing the jet flavour information
  *
  * JetFlavourInfo class stores the jet flavour information based on hadrons
@@ -16,38 +15,32 @@ namespace reco
  * flavours are defined in the JetFlavourClustering producer.
  */
 
-class JetFlavourInfo
-{
+  class JetFlavourInfo {
   public:
-    JetFlavourInfo(void) :
-      m_hadronFlavour(0),
-      m_partonFlavour(0) { }
-    JetFlavourInfo(const int hadronFlavour, const int partonFlavour) :
-      m_hadronFlavour(hadronFlavour),
-      m_partonFlavour(partonFlavour) { }
-    JetFlavourInfo(
-                   const GenParticleRefVector& bHadrons,
+    JetFlavourInfo(void) : m_hadronFlavour(0), m_partonFlavour(0) {}
+    JetFlavourInfo(const int hadronFlavour, const int partonFlavour)
+        : m_hadronFlavour(hadronFlavour), m_partonFlavour(partonFlavour) {}
+    JetFlavourInfo(const GenParticleRefVector& bHadrons,
                    const GenParticleRefVector& cHadrons,
                    const GenParticleRefVector& partons,
                    const GenParticleRefVector& leptons,
                    const int hadronFlavour,
-                   const int partonFlavour
-                  ) :
-      m_bHadrons(bHadrons),
-      m_cHadrons(cHadrons),
-      m_partons(partons),
-      m_leptons(leptons),
-      m_hadronFlavour(hadronFlavour),
-      m_partonFlavour(partonFlavour) { }
+                   const int partonFlavour)
+        : m_bHadrons(bHadrons),
+          m_cHadrons(cHadrons),
+          m_partons(partons),
+          m_leptons(leptons),
+          m_hadronFlavour(hadronFlavour),
+          m_partonFlavour(partonFlavour) {}
 
     /// Return a vector of GenParticleRef's to b hadrons clustered inside the jet
-    const GenParticleRefVector & getbHadrons() const { return m_bHadrons; }
+    const GenParticleRefVector& getbHadrons() const { return m_bHadrons; }
     /// Return a vector of GenParticleRef's to c hadrons clustered inside the jet
-    const GenParticleRefVector & getcHadrons() const { return m_cHadrons; }
+    const GenParticleRefVector& getcHadrons() const { return m_cHadrons; }
     /// Return a vector of GenParticleRef's to partons clustered inside the jet
-    const GenParticleRefVector & getPartons() const { return m_partons; }
+    const GenParticleRefVector& getPartons() const { return m_partons; }
     /// Return a vector of GenParticleRef's to leptons clustered inside the jet
-    const GenParticleRefVector & getLeptons() const { return m_leptons; }
+    const GenParticleRefVector& getLeptons() const { return m_leptons; }
     /// Return the hadron-based flavour
     const int getHadronFlavour() const { return m_hadronFlavour; }
     /// Return the parton-based flavour
@@ -65,7 +58,7 @@ class JetFlavourInfo
     GenParticleRefVector m_leptons;
     int m_hadronFlavour;
     int m_partonFlavour;
-};
+  };
 
-}
+}  // namespace reco
 #endif
diff --git a/SimDataFormats/JetMatching/interface/JetFlavourInfoMatching.h b/SimDataFormats/JetMatching/interface/JetFlavourInfoMatching.h
index 80a445387645c..3f3c9cd4a49d8 100644
--- a/SimDataFormats/JetMatching/interface/JetFlavourInfoMatching.h
+++ b/SimDataFormats/JetMatching/interface/JetFlavourInfoMatching.h
@@ -9,31 +9,28 @@
 
 namespace reco {
 
-typedef edm::AssociationVector<edm::RefToBaseProd<reco::Jet>,std::vector<reco::JetFlavourInfo> > JetFlavourInfoMatchingCollectionBase;
+  typedef edm::AssociationVector<edm::RefToBaseProd<reco::Jet>, std::vector<reco::JetFlavourInfo> >
+      JetFlavourInfoMatchingCollectionBase;
 
-class JetFlavourInfoMatchingCollection : public JetFlavourInfoMatchingCollectionBase {
-public:
-  JetFlavourInfoMatchingCollection() :
-    JetFlavourInfoMatchingCollectionBase()
-  { }
+  class JetFlavourInfoMatchingCollection : public JetFlavourInfoMatchingCollectionBase {
+  public:
+    JetFlavourInfoMatchingCollection() : JetFlavourInfoMatchingCollectionBase() {}
 
-  JetFlavourInfoMatchingCollection(const reco::CaloJetRefProd & ref) :
-    JetFlavourInfoMatchingCollectionBase(edm::RefToBaseProd<reco::Jet>(ref))
-  { }
+    JetFlavourInfoMatchingCollection(const reco::CaloJetRefProd &ref)
+        : JetFlavourInfoMatchingCollectionBase(edm::RefToBaseProd<reco::Jet>(ref)) {}
 
-  JetFlavourInfoMatchingCollection(const JetFlavourInfoMatchingCollectionBase &v) :
-    JetFlavourInfoMatchingCollectionBase(v)
-  { }
-};
+    JetFlavourInfoMatchingCollection(const JetFlavourInfoMatchingCollectionBase &v)
+        : JetFlavourInfoMatchingCollectionBase(v) {}
+  };
 
-typedef  JetFlavourInfoMatchingCollection::value_type       JetFlavourInfoMatching;
+  typedef JetFlavourInfoMatchingCollection::value_type JetFlavourInfoMatching;
 
-typedef  edm::Ref<JetFlavourInfoMatchingCollection>         JetFlavourInfoMatchingRef;
+  typedef edm::Ref<JetFlavourInfoMatchingCollection> JetFlavourInfoMatchingRef;
 
-typedef  edm::RefProd<JetFlavourInfoMatchingCollection>     JetFlavourInfoMatchingRefProd;
+  typedef edm::RefProd<JetFlavourInfoMatchingCollection> JetFlavourInfoMatchingRefProd;
 
-typedef  edm::RefVector<JetFlavourInfoMatchingCollection>   JetFlavourInfoMatchingRefVector;
+  typedef edm::RefVector<JetFlavourInfoMatchingCollection> JetFlavourInfoMatchingRefVector;
 
-}
+}  // namespace reco
 
-#endif // SimDataFormats_JetMatching_JetFlavourInfoMatching_h
+#endif  // SimDataFormats_JetMatching_JetFlavourInfoMatching_h
diff --git a/SimDataFormats/JetMatching/interface/JetFlavourMatching.h b/SimDataFormats/JetMatching/interface/JetFlavourMatching.h
index ad871059df10b..63e75fbef3850 100644
--- a/SimDataFormats/JetMatching/interface/JetFlavourMatching.h
+++ b/SimDataFormats/JetMatching/interface/JetFlavourMatching.h
@@ -9,31 +9,27 @@
 
 namespace reco {
 
-typedef edm::AssociationVector<edm::RefToBaseProd<reco::Jet>,std::vector<reco::JetFlavour> > JetFlavourMatchingCollectionBase;
+  typedef edm::AssociationVector<edm::RefToBaseProd<reco::Jet>, std::vector<reco::JetFlavour> >
+      JetFlavourMatchingCollectionBase;
 
-class JetFlavourMatchingCollection : public JetFlavourMatchingCollectionBase {
-public:
-  JetFlavourMatchingCollection() :
-    JetFlavourMatchingCollectionBase()
-  { }
- 
-  JetFlavourMatchingCollection(const reco::CaloJetRefProd & ref) :
-    JetFlavourMatchingCollectionBase(edm::RefToBaseProd<reco::Jet>(ref))
-  { }
+  class JetFlavourMatchingCollection : public JetFlavourMatchingCollectionBase {
+  public:
+    JetFlavourMatchingCollection() : JetFlavourMatchingCollectionBase() {}
 
-  JetFlavourMatchingCollection(const JetFlavourMatchingCollectionBase &v) :
-    JetFlavourMatchingCollectionBase(v)
-  { }
-};
+    JetFlavourMatchingCollection(const reco::CaloJetRefProd &ref)
+        : JetFlavourMatchingCollectionBase(edm::RefToBaseProd<reco::Jet>(ref)) {}
 
-typedef  JetFlavourMatchingCollection::value_type       JetFlavourMatching;
+    JetFlavourMatchingCollection(const JetFlavourMatchingCollectionBase &v) : JetFlavourMatchingCollectionBase(v) {}
+  };
 
-typedef  edm::Ref<JetFlavourMatchingCollection>         JetFlavourMatchingRef;
+  typedef JetFlavourMatchingCollection::value_type JetFlavourMatching;
 
-typedef  edm::RefProd<JetFlavourMatchingCollection>     JetFlavourMatchingRefProd;
+  typedef edm::Ref<JetFlavourMatchingCollection> JetFlavourMatchingRef;
 
-typedef  edm::RefVector<JetFlavourMatchingCollection>   JetFlavourMatchingRefVector; 
+  typedef edm::RefProd<JetFlavourMatchingCollection> JetFlavourMatchingRefProd;
 
-}
+  typedef edm::RefVector<JetFlavourMatchingCollection> JetFlavourMatchingRefVector;
 
-#endif // SimDataFormats_JetMatching_JetFlavourMatching_h
+}  // namespace reco
+
+#endif  // SimDataFormats_JetMatching_JetFlavourMatching_h
diff --git a/SimDataFormats/JetMatching/interface/JetMatchedPartons.h b/SimDataFormats/JetMatching/interface/JetMatchedPartons.h
index 762c634058224..0d5426c5e8b15 100644
--- a/SimDataFormats/JetMatching/interface/JetMatchedPartons.h
+++ b/SimDataFormats/JetMatching/interface/JetMatchedPartons.h
@@ -9,32 +9,27 @@
 
 namespace reco {
 
-typedef edm::AssociationVector<edm::RefToBaseProd<reco::Jet>,std::vector<reco::MatchedPartons> > JetMatchedPartonsCollectionBase;
+  typedef edm::AssociationVector<edm::RefToBaseProd<reco::Jet>, std::vector<reco::MatchedPartons> >
+      JetMatchedPartonsCollectionBase;
 
-class JetMatchedPartonsCollection : public JetMatchedPartonsCollectionBase {
-public:
-  JetMatchedPartonsCollection() :
-    JetMatchedPartonsCollectionBase()
-  { }
+  class JetMatchedPartonsCollection : public JetMatchedPartonsCollectionBase {
+  public:
+    JetMatchedPartonsCollection() : JetMatchedPartonsCollectionBase() {}
 
-  JetMatchedPartonsCollection(const reco::CaloJetRefProd & ref) :
-    JetMatchedPartonsCollectionBase(edm::RefToBaseProd<reco::Jet>(ref))
-  { }
+    JetMatchedPartonsCollection(const reco::CaloJetRefProd &ref)
+        : JetMatchedPartonsCollectionBase(edm::RefToBaseProd<reco::Jet>(ref)) {}
 
-  JetMatchedPartonsCollection(const JetMatchedPartonsCollectionBase &v) :
-    JetMatchedPartonsCollectionBase(v)
-  { }
-};
+    JetMatchedPartonsCollection(const JetMatchedPartonsCollectionBase &v) : JetMatchedPartonsCollectionBase(v) {}
+  };
 
-typedef  JetMatchedPartonsCollection::value_type       JetMatchedPartons;
+  typedef JetMatchedPartonsCollection::value_type JetMatchedPartons;
 
-typedef  edm::Ref<JetMatchedPartonsCollection>         JetMatchedPartonsRef;
+  typedef edm::Ref<JetMatchedPartonsCollection> JetMatchedPartonsRef;
 
-typedef  edm::RefProd<JetMatchedPartonsCollection>     JetMatchedPartonsRefProd;
+  typedef edm::RefProd<JetMatchedPartonsCollection> JetMatchedPartonsRefProd;
 
-typedef  edm::RefVector<JetMatchedPartonsCollection>   JetMatchedPartonsRefVector;
+  typedef edm::RefVector<JetMatchedPartonsCollection> JetMatchedPartonsRefVector;
 
-}
-
-#endif // SimDataFormats_JetMatching_JetMatchedPartons_h
+}  // namespace reco
 
+#endif  // SimDataFormats_JetMatching_JetMatchedPartons_h
diff --git a/SimDataFormats/JetMatching/interface/MatchedPartons.h b/SimDataFormats/JetMatching/interface/MatchedPartons.h
index d029ca835113c..2c8fcebe7f3b1 100644
--- a/SimDataFormats/JetMatching/interface/MatchedPartons.h
+++ b/SimDataFormats/JetMatching/interface/MatchedPartons.h
@@ -7,51 +7,36 @@
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
 
-namespace reco
-{
+namespace reco {
 
-class MatchedPartons
-{
+  class MatchedPartons {
   public:
-    
-    MatchedPartons() { }
-    MatchedPartons( 
-                    GenParticleRef hv,
-                    GenParticleRef n2,
-                    GenParticleRef n3,
-                    GenParticleRef pd,
-                    GenParticleRef ad 
-                  ) : 
-       m_heaviest(hv),
-       m_nearest2(n2),
-       m_nearest3(n3),
-       m_PhysDef(pd),
-       m_AlgoDef(ad) { }
+    MatchedPartons() {}
+    MatchedPartons(GenParticleRef hv, GenParticleRef n2, GenParticleRef n3, GenParticleRef pd, GenParticleRef ad)
+        : m_heaviest(hv), m_nearest2(n2), m_nearest3(n3), m_PhysDef(pd), m_AlgoDef(ad) {}
 
     //Return the ParticleRef for the heaviest flavour in the signal cone
-    const GenParticleRef heaviest() const {return m_heaviest;}
+    const GenParticleRef heaviest() const { return m_heaviest; }
 
     //Return the ParticleRef for the nearest parton (status=2)
-    const GenParticleRef & nearest_status2() const {return m_nearest2;}
+    const GenParticleRef& nearest_status2() const { return m_nearest2; }
 
     //Return the ParticleRef for the nearest parton (status=3)
-    const GenParticleRef & nearest_status3() const {return m_nearest3;}
-    
+    const GenParticleRef& nearest_status3() const { return m_nearest3; }
+
     //Return the ParticleRef for the Physics Definition parton
-    const GenParticleRef & physicsDefinitionParton() const {return m_PhysDef;}
+    const GenParticleRef& physicsDefinitionParton() const { return m_PhysDef; }
 
     //Return the ParticleRef for the Algorithmic Definition parton
-    const GenParticleRef & algoDefinitionParton() const {return m_AlgoDef;}
+    const GenParticleRef& algoDefinitionParton() const { return m_AlgoDef; }
 
   private:
-
     GenParticleRef m_heaviest;
     GenParticleRef m_nearest2;
     GenParticleRef m_nearest3;
     GenParticleRef m_PhysDef;
     GenParticleRef m_AlgoDef;
+  };
 
-};
-
-}
+}  // namespace reco
 #endif
diff --git a/SimDataFormats/JetMatching/src/classes.h b/SimDataFormats/JetMatching/src/classes.h
index 67565cf4ec19e..81a47ad97108e 100644
--- a/SimDataFormats/JetMatching/src/classes.h
+++ b/SimDataFormats/JetMatching/src/classes.h
@@ -8,4 +8,3 @@
 #include "SimDataFormats/JetMatching/interface/JetFlavourMatching.h"
 #include "SimDataFormats/JetMatching/interface/MatchedPartons.h"
 #include "SimDataFormats/JetMatching/interface/JetMatchedPartons.h"
-
diff --git a/SimDataFormats/PileupSummaryInfo/interface/PileupMixingContent.h b/SimDataFormats/PileupSummaryInfo/interface/PileupMixingContent.h
index a1c00f45cc8a7..b210f99f1c300 100644
--- a/SimDataFormats/PileupSummaryInfo/interface/PileupMixingContent.h
+++ b/SimDataFormats/PileupSummaryInfo/interface/PileupMixingContent.h
@@ -4,7 +4,7 @@
 //
 // Package:     PileupMixingContent
 // Class  :     PileupMixingContent
-// 
+//
 /**\class PileupMixingContent PileupMixingContent.h SimDataFormats/PileupMixingContent/interface/PileupMixingContent.h
 
 Description: contains information related to the details of the pileup simulation for a given event, filled by MixingModule
@@ -22,48 +22,38 @@ Usage: purely descriptive
 #include "DataFormats/Provenance/interface/EventID.h"
 
 class PileupMixingContent {
-
- public:
-
+public:
   PileupMixingContent(){};
 
-  PileupMixingContent( std::vector<int>& bunchCrossing,
-		       std::vector<int>& n_interactions, 
-		       std::vector<float>& True_interactions,
-		       std::vector<edm::EventID>& eventInfos,
-		       int bunchSpacing): 
-  eventInfos_(eventInfos),
-  bunchSpacing_(bunchSpacing)
- {
-
+  PileupMixingContent(std::vector<int>& bunchCrossing,
+                      std::vector<int>& n_interactions,
+                      std::vector<float>& True_interactions,
+                      std::vector<edm::EventID>& eventInfos,
+                      int bunchSpacing)
+      : eventInfos_(eventInfos), bunchSpacing_(bunchSpacing) {
     bunchCrossing_.reserve(bunchCrossing.size());
     n_interactions_.reserve(bunchCrossing.size());
     n_TrueInteractions_.reserve(bunchCrossing.size());
 
-    for(int inter=0; inter<(int)bunchCrossing.size(); ++inter) {
-        bunchCrossing_.push_back(bunchCrossing[inter]);
-	n_interactions_.push_back(n_interactions[inter]);
-	n_TrueInteractions_.push_back(True_interactions[inter]);
+    for (int inter = 0; inter < (int)bunchCrossing.size(); ++inter) {
+      bunchCrossing_.push_back(bunchCrossing[inter]);
+      n_interactions_.push_back(n_interactions[inter]);
+      n_TrueInteractions_.push_back(True_interactions[inter]);
     }
   };
 
-  PileupMixingContent( std::vector<int>& bunchCrossing,
-		       std::vector<int>& n_interactions)
- {
-
+  PileupMixingContent(std::vector<int>& bunchCrossing, std::vector<int>& n_interactions) {
     bunchCrossing_.reserve(bunchCrossing.size());
     n_interactions_.reserve(bunchCrossing.size());
 
-    for(int inter=0; inter<(int)bunchCrossing.size(); ++inter) {
-        bunchCrossing_.push_back(bunchCrossing[inter]);
-	n_interactions_.push_back(n_interactions[inter]);
-	n_TrueInteractions_.push_back(-1.);
+    for (int inter = 0; inter < (int)bunchCrossing.size(); ++inter) {
+      bunchCrossing_.push_back(bunchCrossing[inter]);
+      n_interactions_.push_back(n_interactions[inter]);
+      n_TrueInteractions_.push_back(-1.);
     }
   };
 
-
-
-  ~PileupMixingContent(){
+  ~PileupMixingContent() {
     bunchCrossing_.clear();
     n_interactions_.clear();
     n_TrueInteractions_.clear();
@@ -73,20 +63,17 @@ class PileupMixingContent {
   const std::vector<int>& getMix_Ninteractions() const { return n_interactions_; }
   const std::vector<float>& getMix_TrueInteractions() const { return n_TrueInteractions_; }
   const std::vector<int>& getMix_bunchCrossing() const { return bunchCrossing_; }
-  const int & getMix_bunchSpacing() const { return bunchSpacing_; }
-  const std::vector<edm::EventID> getMix_eventInfo() const {return eventInfos_;}
-
- private:
+  const int& getMix_bunchSpacing() const { return bunchSpacing_; }
+  const std::vector<edm::EventID> getMix_eventInfo() const { return eventInfos_; }
 
+private:
   // for "standard" pileup: we have MC Truth information for these
 
-
   std::vector<int> bunchCrossing_;
   std::vector<int> n_interactions_;
   std::vector<float> n_TrueInteractions_;
   std::vector<edm::EventID> eventInfos_;
   int bunchSpacing_;
-
 };
 
 #endif
diff --git a/SimDataFormats/PileupSummaryInfo/interface/PileupSummaryInfo.h b/SimDataFormats/PileupSummaryInfo/interface/PileupSummaryInfo.h
index 07182d0946627..ffdfae01dcfe5 100644
--- a/SimDataFormats/PileupSummaryInfo/interface/PileupSummaryInfo.h
+++ b/SimDataFormats/PileupSummaryInfo/interface/PileupSummaryInfo.h
@@ -4,7 +4,7 @@
 //
 // Package:     PileupSummaryInfo
 // Class  :     PileupSummaryInfo
-// 
+//
 /**\class PileupSummaryInfo PileupSummaryInfo.h SimDataFormats/PileupSummaryInfo/interface/PileupSummaryInfo.h
 
 Description: contains information related to the details of the pileup simulation for a given event
@@ -19,54 +19,49 @@ Usage: purely descriptive
 #include <vector>
 #include <string>
 
-
-
 class PileupSummaryInfo {
-
- public:
-
+public:
   PileupSummaryInfo(){};
- 
-  PileupSummaryInfo( const int num_PU_vertices,
-		     const std::vector<float>& zpositions,
-		     const std::vector<float>& times, // may be empty
-		     const std::vector<float>& sumpT_lowpT,
-		     const std::vector<float>& sumpT_highpT,
-		     const std::vector<int>& ntrks_lowpT,
-		     const std::vector<int>& ntrks_highpT );
-
-  PileupSummaryInfo( const int num_PU_vertices,
-		     const std::vector<float>& zpositions,
-		     const std::vector<float>& times, // may be empty
-		     const std::vector<float>& sumpT_lowpT,
-		     const std::vector<float>& sumpT_highpT,
-		     const std::vector<int>& ntrks_lowpT,
-		     const std::vector<int>& ntrks_highpT,
-		     int bunchCrossing);
-
-  PileupSummaryInfo( const int num_PU_vertices,
-		     const std::vector<float>& zpositions,
-		     const std::vector<float>& times, // may be empty
-		     const std::vector<float>& sumpT_lowpT,
-		     const std::vector<float>& sumpT_highpT,
-		     const std::vector<int>& ntrks_lowpT,
-		     const std::vector<int>& ntrks_highpT,
-		     const std::vector<edm::EventID>& eventInfo,
-		     const std::vector<float>& pT_hats,
-		     int bunchCrossing,
-		     float TrueNumInteractions,
-		     int bunchSpacing);
-
-  PileupSummaryInfo( const int num_PU_vertices,
-		     const std::vector<float>& instLumi,
-		     const std::vector<edm::EventID>& eventInfo );
 
+  PileupSummaryInfo(const int num_PU_vertices,
+                    const std::vector<float>& zpositions,
+                    const std::vector<float>& times,  // may be empty
+                    const std::vector<float>& sumpT_lowpT,
+                    const std::vector<float>& sumpT_highpT,
+                    const std::vector<int>& ntrks_lowpT,
+                    const std::vector<int>& ntrks_highpT);
+
+  PileupSummaryInfo(const int num_PU_vertices,
+                    const std::vector<float>& zpositions,
+                    const std::vector<float>& times,  // may be empty
+                    const std::vector<float>& sumpT_lowpT,
+                    const std::vector<float>& sumpT_highpT,
+                    const std::vector<int>& ntrks_lowpT,
+                    const std::vector<int>& ntrks_highpT,
+                    int bunchCrossing);
+
+  PileupSummaryInfo(const int num_PU_vertices,
+                    const std::vector<float>& zpositions,
+                    const std::vector<float>& times,  // may be empty
+                    const std::vector<float>& sumpT_lowpT,
+                    const std::vector<float>& sumpT_highpT,
+                    const std::vector<int>& ntrks_lowpT,
+                    const std::vector<int>& ntrks_highpT,
+                    const std::vector<edm::EventID>& eventInfo,
+                    const std::vector<float>& pT_hats,
+                    int bunchCrossing,
+                    float TrueNumInteractions,
+                    int bunchSpacing);
+
+  PileupSummaryInfo(const int num_PU_vertices,
+                    const std::vector<float>& instLumi,
+                    const std::vector<edm::EventID>& eventInfo);
 
   ~PileupSummaryInfo();
 
   const int getPU_NumInteractions() const { return num_PU_vertices_; }
   const std::vector<float>& getPU_zpositions() const { return zpositions_; }
-  bool  has_times() const { return !times_.empty(); }
+  bool has_times() const { return !times_.empty(); }
   const std::vector<float>& getPU_times() const { return times_; }
   const std::vector<float>& getPU_sumpT_lowpT() const { return sumpT_lowpT_; }
   const std::vector<float>& getPU_sumpT_highpT() const { return sumpT_highpT_; }
@@ -75,12 +70,11 @@ class PileupSummaryInfo {
   const std::vector<float>& getPU_instLumi() const { return instLumi_; }
   const std::vector<edm::EventID>& getPU_EventID() const { return eventInfo_; }
   const std::vector<float>& getPU_pT_hats() const { return pT_hats_; }
-  const int getBunchCrossing() const { return bunchCrossing_;}
-  const int getBunchSpacing() const { return bunchSpacing_;}
-  const float getTrueNumInteractions() const { return TrueNumInteractions_;}
-
- private:
+  const int getBunchCrossing() const { return bunchCrossing_; }
+  const int getBunchSpacing() const { return bunchSpacing_; }
+  const float getTrueNumInteractions() const { return TrueNumInteractions_; }
 
+private:
   // for "standard" pileup: we have MC Truth information for these
 
   int num_PU_vertices_;
@@ -96,12 +90,9 @@ class PileupSummaryInfo {
   int bunchSpacing_;
   float TrueNumInteractions_;
 
-
   // for DataMixer pileup, we only have raw information:
 
   std::vector<float> instLumi_;
-
-
 };
 
 #endif
diff --git a/SimDataFormats/PileupSummaryInfo/interface/PileupVertexContent.h b/SimDataFormats/PileupSummaryInfo/interface/PileupVertexContent.h
index 719374ba69004..239bf1f1d738c 100644
--- a/SimDataFormats/PileupSummaryInfo/interface/PileupVertexContent.h
+++ b/SimDataFormats/PileupSummaryInfo/interface/PileupVertexContent.h
@@ -4,7 +4,7 @@
 //
 // Package:     PileupVertexContent
 // Class  :     PileupVertexContent
-// 
+//
 /**\class PileupVertexContent PileupVertexContent.h SimDataFormats/PileupVertexContent/interface/PileupVertexContent.h
 
 Description: contains information related to the details of the pileup simulation for a given event, filled by Special "Digitizer" that has access to each pileup event
@@ -24,23 +24,15 @@ Usage: purely descriptive
 #include "DataFormats/Math/interface/LorentzVector.h"
 
 class PileupVertexContent {
-
- public:
-
+public:
   PileupVertexContent(){};
 
-  PileupVertexContent( const std::vector<float>& pT_hat,
-		       const std::vector<float>& z_Vtx,
-                       const std::vector<float>& t_Vtx):
-  pT_hats_(pT_hat),
-  z_Vtxs_(z_Vtx),
-  t_Vtxs_(t_Vtx)
- { };
-
-
+  PileupVertexContent(const std::vector<float>& pT_hat,
+                      const std::vector<float>& z_Vtx,
+                      const std::vector<float>& t_Vtx)
+      : pT_hats_(pT_hat), z_Vtxs_(z_Vtx), t_Vtxs_(t_Vtx){};
 
-
-  ~PileupVertexContent(){
+  ~PileupVertexContent() {
     pT_hats_.clear();
     z_Vtxs_.clear();
     t_Vtxs_.clear();
@@ -50,15 +42,12 @@ class PileupVertexContent {
   const std::vector<float>& getMix_z_Vtxs() const { return z_Vtxs_; }
   const std::vector<float>& getMix_t_Vtxs() const { return t_Vtxs_; }
 
- private:
-
+private:
   // for "standard" pileup: we have MC Truth information for these
 
-
   std::vector<float> pT_hats_;
   std::vector<float> z_Vtxs_;
-  std::vector<float> t_Vtxs_; // may be empty if time information is not available
-
+  std::vector<float> t_Vtxs_;  // may be empty if time information is not available
 };
 
 #endif
diff --git a/SimDataFormats/PileupSummaryInfo/src/PileupSummaryInfo.cc b/SimDataFormats/PileupSummaryInfo/src/PileupSummaryInfo.cc
index f8d4992423f82..4e9c6b8cd234d 100644
--- a/SimDataFormats/PileupSummaryInfo/src/PileupSummaryInfo.cc
+++ b/SimDataFormats/PileupSummaryInfo/src/PileupSummaryInfo.cc
@@ -2,90 +2,76 @@
 //
 // Package:     PileupSummaryInfo
 // Class  :     PileupSummaryInfo
-// 
+//
 // Implementation:
 //
 //
 // Original Author:  Mike Hildreth, Notre Dame
-//         Created:  
+//         Created:
 //
 
 #include "SimDataFormats/PileupSummaryInfo/interface/PileupSummaryInfo.h"
 
-PileupSummaryInfo::PileupSummaryInfo( const int num_PU_vertices,
-                    const std::vector<float>& zpositions, 
-                    const std::vector<float>& times, 
-                    const std::vector<float>& sumpT_lowpT,
-                    const std::vector<float>& sumpT_highpT,
-                    const std::vector<int>&   ntrks_lowpT,
-                    const std::vector<int>&   ntrks_highpT ) :
-    num_PU_vertices_(num_PU_vertices),
-    zpositions_(zpositions),
-    times_(times),
-    sumpT_lowpT_(sumpT_lowpT),
-    sumpT_highpT_(sumpT_highpT),
-    ntrks_lowpT_(ntrks_lowpT),
-    ntrks_highpT_(ntrks_highpT)
-{
-}
-
-PileupSummaryInfo::PileupSummaryInfo( const int num_PU_vertices,
-                     const std::vector<float>& zpositions, 
-                     const std::vector<float>& times, 
-                     const std::vector<float>& sumpT_lowpT,
-                     const std::vector<float>& sumpT_highpT,
-                     const std::vector<int>&   ntrks_lowpT,
-		     const std::vector<int>&   ntrks_highpT,
-		     int bunchCrossing) :
-    num_PU_vertices_(num_PU_vertices),
-    zpositions_(zpositions),
-    times_(times),
-    sumpT_lowpT_(sumpT_lowpT),
-    sumpT_highpT_(sumpT_highpT),
-    ntrks_lowpT_(ntrks_lowpT),
-    ntrks_highpT_(ntrks_highpT),
-    bunchCrossing_(bunchCrossing)
-{
-}
-
-
-PileupSummaryInfo::PileupSummaryInfo( const int num_PU_vertices,
-                     const std::vector<float>& zpositions, 
-                     const std::vector<float>& times, 
-                     const std::vector<float>& sumpT_lowpT,
-                     const std::vector<float>& sumpT_highpT,
-                     const std::vector<int>&   ntrks_lowpT,
-		     const std::vector<int>&   ntrks_highpT,
-		     const std::vector<edm::EventID>& eventInfo,
-                     const std::vector<float>& pThats, 
-		     int bunchCrossing,
-		     float TrueNumInteractions,
- 	             int bunchSpacing):
-  num_PU_vertices_(num_PU_vertices),
-  zpositions_(zpositions),
-  times_(times),
-  sumpT_lowpT_(sumpT_lowpT),
-  sumpT_highpT_(sumpT_highpT),
-  ntrks_lowpT_(ntrks_lowpT),
-  ntrks_highpT_(ntrks_highpT),
-  eventInfo_(eventInfo),
-  pT_hats_(pThats),
-  bunchCrossing_(bunchCrossing),
-  bunchSpacing_(bunchSpacing),
-  TrueNumInteractions_(TrueNumInteractions)
-{
-}
+PileupSummaryInfo::PileupSummaryInfo(const int num_PU_vertices,
+                                     const std::vector<float>& zpositions,
+                                     const std::vector<float>& times,
+                                     const std::vector<float>& sumpT_lowpT,
+                                     const std::vector<float>& sumpT_highpT,
+                                     const std::vector<int>& ntrks_lowpT,
+                                     const std::vector<int>& ntrks_highpT)
+    : num_PU_vertices_(num_PU_vertices),
+      zpositions_(zpositions),
+      times_(times),
+      sumpT_lowpT_(sumpT_lowpT),
+      sumpT_highpT_(sumpT_highpT),
+      ntrks_lowpT_(ntrks_lowpT),
+      ntrks_highpT_(ntrks_highpT) {}
 
+PileupSummaryInfo::PileupSummaryInfo(const int num_PU_vertices,
+                                     const std::vector<float>& zpositions,
+                                     const std::vector<float>& times,
+                                     const std::vector<float>& sumpT_lowpT,
+                                     const std::vector<float>& sumpT_highpT,
+                                     const std::vector<int>& ntrks_lowpT,
+                                     const std::vector<int>& ntrks_highpT,
+                                     int bunchCrossing)
+    : num_PU_vertices_(num_PU_vertices),
+      zpositions_(zpositions),
+      times_(times),
+      sumpT_lowpT_(sumpT_lowpT),
+      sumpT_highpT_(sumpT_highpT),
+      ntrks_lowpT_(ntrks_lowpT),
+      ntrks_highpT_(ntrks_highpT),
+      bunchCrossing_(bunchCrossing) {}
 
+PileupSummaryInfo::PileupSummaryInfo(const int num_PU_vertices,
+                                     const std::vector<float>& zpositions,
+                                     const std::vector<float>& times,
+                                     const std::vector<float>& sumpT_lowpT,
+                                     const std::vector<float>& sumpT_highpT,
+                                     const std::vector<int>& ntrks_lowpT,
+                                     const std::vector<int>& ntrks_highpT,
+                                     const std::vector<edm::EventID>& eventInfo,
+                                     const std::vector<float>& pThats,
+                                     int bunchCrossing,
+                                     float TrueNumInteractions,
+                                     int bunchSpacing)
+    : num_PU_vertices_(num_PU_vertices),
+      zpositions_(zpositions),
+      times_(times),
+      sumpT_lowpT_(sumpT_lowpT),
+      sumpT_highpT_(sumpT_highpT),
+      ntrks_lowpT_(ntrks_lowpT),
+      ntrks_highpT_(ntrks_highpT),
+      eventInfo_(eventInfo),
+      pT_hats_(pThats),
+      bunchCrossing_(bunchCrossing),
+      bunchSpacing_(bunchSpacing),
+      TrueNumInteractions_(TrueNumInteractions) {}
 
-PileupSummaryInfo::PileupSummaryInfo( const int num_PU_vertices,
-				      const std::vector<float>& instLumi,
-				      const std::vector<edm::EventID>& eventInfo) :
-    num_PU_vertices_(num_PU_vertices),
-    eventInfo_(eventInfo),
-    instLumi_(instLumi)
-{
-}
+PileupSummaryInfo::PileupSummaryInfo(const int num_PU_vertices,
+                                     const std::vector<float>& instLumi,
+                                     const std::vector<edm::EventID>& eventInfo)
+    : num_PU_vertices_(num_PU_vertices), eventInfo_(eventInfo), instLumi_(instLumi) {}
 
-PileupSummaryInfo::~PileupSummaryInfo(){
-}
+PileupSummaryInfo::~PileupSummaryInfo() {}
diff --git a/SimDataFormats/PileupSummaryInfo/src/classes.h b/SimDataFormats/PileupSummaryInfo/src/classes.h
index d340eea9b41d2..08a2b60cd8f80 100644
--- a/SimDataFormats/PileupSummaryInfo/src/classes.h
+++ b/SimDataFormats/PileupSummaryInfo/src/classes.h
@@ -3,6 +3,3 @@
 #include "SimDataFormats/PileupSummaryInfo/interface/PileupVertexContent.h"
 #include "DataFormats/Common/interface/Wrapper.h"
 #include <vector>
-
-
-
diff --git a/SimDataFormats/RPCDigiSimLink/interface/RPCDigiSimLink.h b/SimDataFormats/RPCDigiSimLink/interface/RPCDigiSimLink.h
index 5d4c87b98204f..4d00024cc95af 100644
--- a/SimDataFormats/RPCDigiSimLink/interface/RPCDigiSimLink.h
+++ b/SimDataFormats/RPCDigiSimLink/interface/RPCDigiSimLink.h
@@ -8,58 +8,58 @@
 #include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
 
 class RPCDigiSimLink {
- public:
-  RPCDigiSimLink(std::pair<unsigned int,int> digi,Local3DPoint entryPoint,
-		 LocalVector momentumAtEntry,float timeOfFlight,float energyLoss,
-		 int particleType,unsigned int detUnitId,unsigned int trackId,
-		 EncodedEventId eventId,unsigned short processType)
-    {
+public:
+  RPCDigiSimLink(std::pair<unsigned int, int> digi,
+                 Local3DPoint entryPoint,
+                 LocalVector momentumAtEntry,
+                 float timeOfFlight,
+                 float energyLoss,
+                 int particleType,
+                 unsigned int detUnitId,
+                 unsigned int trackId,
+                 EncodedEventId eventId,
+                 unsigned short processType) {
+    _entryPoint = entryPoint;
+    _momentumAtEntry = momentumAtEntry;
+    _timeOfFlight = timeOfFlight;
+    _energyLoss = energyLoss;
+    _particleType = particleType;
+    _detUnitId = detUnitId;
+    _trackId = trackId;
+    _eventId = eventId;
+    _processType = processType;
+    _digi = digi;
+  }
 
-      _entryPoint=entryPoint;
-      _momentumAtEntry=momentumAtEntry;
-      _timeOfFlight=timeOfFlight;
-      _energyLoss=energyLoss;
-      _particleType=particleType;
-      _detUnitId=detUnitId;
-      _trackId=trackId;
-      _eventId=eventId;
-      _processType=processType;
-      _digi = digi;
-    }
+  RPCDigiSimLink() { ; }
 
-  RPCDigiSimLink(){;}
-    
-  ~RPCDigiSimLink(){;}
+  ~RPCDigiSimLink() { ; }
 
-  unsigned int  getStrip()     const {return _digi.first;}
-  unsigned int  getBx()     const {return _digi.second;}
-  Local3DPoint   getEntryPoint() const{return _entryPoint;}
-  LocalVector    getMomentumAtEntry() const{return _momentumAtEntry;}
-  float          getTimeOfFlight() const{return _timeOfFlight;}
-  float          getEnergyLoss() const{return _energyLoss;}
-  int            getParticleType() const{return _particleType;}
-  unsigned int   getDetUnitId() const{return _detUnitId;}
-  unsigned int   getTrackId() const{return _trackId;}
-  EncodedEventId getEventId() const{return _eventId;}
-  unsigned short getProcessType() const{return _processType;}
+  unsigned int getStrip() const { return _digi.first; }
+  unsigned int getBx() const { return _digi.second; }
+  Local3DPoint getEntryPoint() const { return _entryPoint; }
+  LocalVector getMomentumAtEntry() const { return _momentumAtEntry; }
+  float getTimeOfFlight() const { return _timeOfFlight; }
+  float getEnergyLoss() const { return _energyLoss; }
+  int getParticleType() const { return _particleType; }
+  unsigned int getDetUnitId() const { return _detUnitId; }
+  unsigned int getTrackId() const { return _trackId; }
+  EncodedEventId getEventId() const { return _eventId; }
+  unsigned short getProcessType() const { return _processType; }
 
-  inline bool operator< ( const RPCDigiSimLink& other ) const { return getStrip() < other.getStrip(); }
+  inline bool operator<(const RPCDigiSimLink& other) const { return getStrip() < other.getStrip(); }
 
- private:
-  std::pair<unsigned int,int> _digi;
-  
-  Local3DPoint   _entryPoint;
-  LocalVector    _momentumAtEntry;
-  float          _timeOfFlight;
-  float          _energyLoss;
-  int            _particleType;
-  unsigned int   _detUnitId;
-  unsigned int   _trackId;
+private:
+  std::pair<unsigned int, int> _digi;
+
+  Local3DPoint _entryPoint;
+  LocalVector _momentumAtEntry;
+  float _timeOfFlight;
+  float _energyLoss;
+  int _particleType;
+  unsigned int _detUnitId;
+  unsigned int _trackId;
   EncodedEventId _eventId;
   unsigned short _processType;
-
 };
 #endif
-
-
-  
diff --git a/SimDataFormats/RPCDigiSimLink/src/classes.h b/SimDataFormats/RPCDigiSimLink/src/classes.h
index 265470f2d5714..b7245eef96314 100644
--- a/SimDataFormats/RPCDigiSimLink/src/classes.h
+++ b/SimDataFormats/RPCDigiSimLink/src/classes.h
@@ -9,10 +9,6 @@
 #include <vector>
 #include <map>
 
-
 #include "SimDataFormats/RPCDigiSimLink/interface/RPCDigiSimLink.h"
 
-
-#endif // RPCDIGISIMLINK_CLASSES_H
-
-
+#endif  // RPCDIGISIMLINK_CLASSES_H
diff --git a/SimDataFormats/RandomEngine/interface/RandomEngineState.h b/SimDataFormats/RandomEngine/interface/RandomEngineState.h
index 9a5dd82838a65..1b687e4239190 100644
--- a/SimDataFormats/RandomEngine/interface/RandomEngineState.h
+++ b/SimDataFormats/RandomEngine/interface/RandomEngineState.h
@@ -4,7 +4,7 @@
 //
 // Package:     RandomEngine
 // Class  :     RandomEngineState
-// 
+//
 /**\class RandomEngineState RandomEngineState.h SimDataFormats/RandomEngine/interface/RandomEngineState.h
 
  Description: Holds the state of a CLHEP random number engine
@@ -23,11 +23,8 @@ service.
 #include <string>
 #include <boost/cstdint.hpp>
 
-
 class RandomEngineState {
-
-  public:
-
+public:
   RandomEngineState();
 
   ~RandomEngineState();
@@ -50,8 +47,7 @@ class RandomEngineState {
 
   bool operator<(RandomEngineState const& rhs) const { return label_ < rhs.label_; }
 
-  private:
-
+private:
   std::string label_;
   std::vector<uint32_t> state_;
   std::vector<uint32_t> seed_;
diff --git a/SimDataFormats/RandomEngine/interface/RandomEngineStates.h b/SimDataFormats/RandomEngine/interface/RandomEngineStates.h
index 47a2ec66953d1..70020e9319ce3 100644
--- a/SimDataFormats/RandomEngine/interface/RandomEngineStates.h
+++ b/SimDataFormats/RandomEngine/interface/RandomEngineStates.h
@@ -11,7 +11,7 @@ Usage:  This should only be used by the Random Number Generator
 Service.
 
 \author W. David Dagenhart, created December 3, 2010
-*/ 
+*/
 
 #include <vector>
 #include <string>
@@ -22,17 +22,15 @@ namespace edm {
 
   class RandomEngineStates {
   public:
-
     RandomEngineStates();
     ~RandomEngineStates();
 
-    void getRandomEngineStates(std::vector<RandomEngineState> & states) const;
+    void getRandomEngineStates(std::vector<RandomEngineState>& states) const;
     void setRandomEngineStates(std::vector<RandomEngineState> const& states);
 
     bool isProductEqual(RandomEngineStates const& randomEngineStates) const;
 
   private:
-
     std::vector<std::string> moduleLabels_;
 
     std::vector<unsigned> seedLengths_;
@@ -41,5 +39,5 @@ namespace edm {
     std::vector<unsigned> stateLengths_;
     std::vector<unsigned> stateVectors_;
   };
-}
+}  // namespace edm
 #endif
diff --git a/SimDataFormats/RandomEngine/src/RandomEngineState.cc b/SimDataFormats/RandomEngine/src/RandomEngineState.cc
index ec91538c4fca8..7136de85aeafe 100644
--- a/SimDataFormats/RandomEngine/src/RandomEngineState.cc
+++ b/SimDataFormats/RandomEngine/src/RandomEngineState.cc
@@ -2,7 +2,7 @@
 //
 // Package:     RandomEngine
 // Class  :     RandomEngineState
-// 
+//
 // Implementation:
 //
 //
@@ -12,11 +12,6 @@
 
 #include "SimDataFormats/RandomEngine/interface/RandomEngineState.h"
 
+RandomEngineState::RandomEngineState() {}
 
-RandomEngineState::RandomEngineState()
-{
-}
-
-RandomEngineState::~RandomEngineState()
-{
-}
+RandomEngineState::~RandomEngineState() {}
diff --git a/SimDataFormats/RandomEngine/src/RandomEngineStates.cc b/SimDataFormats/RandomEngine/src/RandomEngineStates.cc
index 6b3b0743152d1..56a5926983574 100644
--- a/SimDataFormats/RandomEngine/src/RandomEngineStates.cc
+++ b/SimDataFormats/RandomEngine/src/RandomEngineStates.cc
@@ -7,41 +7,36 @@
 
 namespace edm {
 
-  RandomEngineStates::RandomEngineStates() {
-  }
-
-  RandomEngineStates::~RandomEngineStates() {
-  }
+  RandomEngineStates::RandomEngineStates() {}
 
-  void
-  RandomEngineStates::getRandomEngineStates(std::vector<RandomEngineState> & states) const {
+  RandomEngineStates::~RandomEngineStates() {}
 
+  void RandomEngineStates::getRandomEngineStates(std::vector<RandomEngineState>& states) const {
     // First check for data corruption so that the following code
     // does not encounter out of range errors.
     bool corrupt = false;
 
-    if (moduleLabels_.size() != seedLengths_.size()) corrupt = true;
-    if (moduleLabels_.size() != stateLengths_.size()) corrupt = true;
+    if (moduleLabels_.size() != seedLengths_.size())
+      corrupt = true;
+    if (moduleLabels_.size() != stateLengths_.size())
+      corrupt = true;
 
     unsigned int sum = 0U;
-    for (std::vector<unsigned>::const_iterator i = seedLengths_.begin(),
-	                                    iEnd = seedLengths_.end();
-         i != iEnd; ++i) {
+    for (std::vector<unsigned>::const_iterator i = seedLengths_.begin(), iEnd = seedLengths_.end(); i != iEnd; ++i) {
       sum += *i;
     }
-    if (sum != seedVectors_.size()) corrupt = true;
+    if (sum != seedVectors_.size())
+      corrupt = true;
 
     sum = 0U;
-    for (std::vector<unsigned>::const_iterator i = stateLengths_.begin(),
-	                                    iEnd = stateLengths_.end();
-         i != iEnd; ++i) {
+    for (std::vector<unsigned>::const_iterator i = stateLengths_.begin(), iEnd = stateLengths_.end(); i != iEnd; ++i) {
       sum += *i;
     }
-    if (sum != stateVectors_.size()) corrupt = true;
+    if (sum != stateVectors_.size())
+      corrupt = true;
 
     if (corrupt) {
-      throw edm::Exception(errors::EventCorruption)
-        << "RandomEngineStates data is corrupted.\n";
+      throw edm::Exception(errors::EventCorruption) << "RandomEngineStates data is corrupted.\n";
     }
 
     // Done with error checks.  Now do the work.
@@ -54,11 +49,9 @@ namespace edm {
     std::vector<unsigned>::const_iterator stateBegin = stateVectors_.begin();
     std::vector<unsigned>::const_iterator stateEnd = stateVectors_.begin();
 
-    for (std::vector<std::string>::const_iterator label = moduleLabels_.begin(),
-	                                       labelEnd = moduleLabels_.end();
+    for (std::vector<std::string>::const_iterator label = moduleLabels_.begin(), labelEnd = moduleLabels_.end();
          label != labelEnd;
          ++label, ++seedLength, ++stateLength) {
-
       seedBegin = seedEnd;
       seedEnd += *seedLength;
 
@@ -67,41 +60,35 @@ namespace edm {
 
       RandomEngineState randomEngineState;
       randomEngineState.setLabel(*label);
-      std::vector<RandomEngineState>::iterator state = 
-        std::lower_bound(states.begin(), states.end(), randomEngineState);
+      std::vector<RandomEngineState>::iterator state =
+          std::lower_bound(states.begin(), states.end(), randomEngineState);
 
       if (state != states.end() && *label == state->getLabel()) {
-        if (*seedLength != state->getSeed().size() ||
-            *stateLength != state->getState().size()) {
+        if (*seedLength != state->getSeed().size() || *stateLength != state->getState().size()) {
           throw edm::Exception(edm::errors::Configuration)
-            << "When attempting to replay processing with the RandomNumberGeneratorService,\n"
-            << "the engine type for each module must be the same in the replay configuration\n"
-            << "and the original configuration.  If this is not the problem, then the data\n"
-            << "is somehow corrupted or there is a bug because the vector in the data containing\n"
-            << "the seeds or engine state is the incorrect size for the type of random engine.\n";
+              << "When attempting to replay processing with the RandomNumberGeneratorService,\n"
+              << "the engine type for each module must be the same in the replay configuration\n"
+              << "and the original configuration.  If this is not the problem, then the data\n"
+              << "is somehow corrupted or there is a bug because the vector in the data containing\n"
+              << "the seeds or engine state is the incorrect size for the type of random engine.\n";
         }
 
         state->clearSeedVector();
         state->reserveSeedVector(*seedLength);
-        for (std::vector<unsigned int>::const_iterator i = seedBegin;
-             i != seedEnd; ++i) {
+        for (std::vector<unsigned int>::const_iterator i = seedBegin; i != seedEnd; ++i) {
           state->push_back_seedVector(*i);
         }
 
         state->clearStateVector();
         state->reserveStateVector(*stateLength);
-        for (std::vector<unsigned int>::const_iterator i = stateBegin;
-             i != stateEnd; ++i) {
+        for (std::vector<unsigned int>::const_iterator i = stateBegin; i != stateEnd; ++i) {
           state->push_back_stateVector(*i);
         }
       }
     }
   }
 
-
-  void
-  RandomEngineStates::setRandomEngineStates(std::vector<RandomEngineState> const& states) {
-
+  void RandomEngineStates::setRandomEngineStates(std::vector<RandomEngineState> const& states) {
     moduleLabels_.resize(states.size());
     seedLengths_.resize(states.size());
     seedVectors_.clear();
@@ -112,42 +99,32 @@ namespace edm {
     std::vector<unsigned>::iterator seedLength = seedLengths_.begin();
     std::vector<unsigned>::iterator stateLength = stateLengths_.begin();
 
-
-    for (std::vector<RandomEngineState>::const_iterator state = states.begin(),
-	                                                 iEnd = states.end();
-         state != iEnd; ++state, ++label, ++seedLength, ++stateLength) {
-
+    for (std::vector<RandomEngineState>::const_iterator state = states.begin(), iEnd = states.end(); state != iEnd;
+         ++state, ++label, ++seedLength, ++stateLength) {
       *label = state->getLabel();
 
       std::vector<uint32_t> const& seedVector = state->getSeed();
       *seedLength = seedVector.size();
 
-      for (std::vector<uint32_t>::const_iterator j = seedVector.begin(),
-                                              jEnd = seedVector.end();
-           j != jEnd; ++j) {
+      for (std::vector<uint32_t>::const_iterator j = seedVector.begin(), jEnd = seedVector.end(); j != jEnd; ++j) {
         seedVectors_.push_back(*j);
       }
 
       std::vector<uint32_t> const& stateVector = state->getState();
       *stateLength = stateVector.size();
 
-      for (std::vector<uint32_t>::const_iterator j = stateVector.begin(),
-                                              jEnd = stateVector.end();
-           j != jEnd; ++j) {
+      for (std::vector<uint32_t>::const_iterator j = stateVector.begin(), jEnd = stateVector.end(); j != jEnd; ++j) {
         stateVectors_.push_back(*j);
       }
     }
   }
 
-  bool
-  RandomEngineStates::isProductEqual(RandomEngineStates const& randomEngineStates) const {
-    if (moduleLabels_ == randomEngineStates.moduleLabels_ &&
-        seedLengths_ == randomEngineStates.seedLengths_ &&
-        seedVectors_ == randomEngineStates.seedVectors_ &&
-        stateLengths_ == randomEngineStates.stateLengths_ &&
+  bool RandomEngineStates::isProductEqual(RandomEngineStates const& randomEngineStates) const {
+    if (moduleLabels_ == randomEngineStates.moduleLabels_ && seedLengths_ == randomEngineStates.seedLengths_ &&
+        seedVectors_ == randomEngineStates.seedVectors_ && stateLengths_ == randomEngineStates.stateLengths_ &&
         stateVectors_ == randomEngineStates.stateVectors_) {
       return true;
     }
     return false;
   }
-}
+}  // namespace edm
diff --git a/SimDataFormats/SimHitMaker/interface/CaloSlaveSD.h b/SimDataFormats/SimHitMaker/interface/CaloSlaveSD.h
index 01832f75df57b..e89a3ceee7742 100644
--- a/SimDataFormats/SimHitMaker/interface/CaloSlaveSD.h
+++ b/SimDataFormats/SimHitMaker/interface/CaloSlaveSD.h
@@ -6,16 +6,15 @@
 #ifndef CaloSlaveSD_h
 #define CaloSlaveSD_h
 
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include <string>
 #include <vector>
 
 class CaloSlaveSD {
-
-public:    
+public:
   typedef std::vector<PCaloHit> Collection;
   typedef Collection::iterator iterator;
   typedef Collection::const_iterator const_iterator;
@@ -23,21 +22,21 @@ class CaloSlaveSD {
   CaloSlaveSD(std::string);
   virtual ~CaloSlaveSD();
   virtual void Initialize();
-  std::string name() const { return name_; } 
-  virtual bool processHits(uint32_t, double, double, double, int, uint16_t depth=0);
+  std::string name() const { return name_; }
+  virtual bool processHits(uint32_t, double, double, double, int, uint16_t depth = 0);
   virtual bool format();
-  Collection& hits()             { return hits_; }
-  std::string type()             { return "calo"; }
-  virtual const_iterator begin() { return hits_.begin();}
-  virtual const_iterator end()   { return hits_.end();}
+  Collection &hits() { return hits_; }
+  std::string type() { return "calo"; }
+  virtual const_iterator begin() { return hits_.begin(); }
+  virtual const_iterator end() { return hits_.end(); }
   virtual void Clean();
   virtual void ReserveMemory(unsigned int size);
 
-protected: 
-  Collection         hits_;
+protected:
+  Collection hits_;
 
 private:
-  std::string        name_;
+  std::string name_;
 };
 
-#endif // CaloSlaveSD_h
+#endif  // CaloSlaveSD_h
diff --git a/SimDataFormats/SimHitMaker/interface/TrackingSlaveSD.h b/SimDataFormats/SimHitMaker/interface/TrackingSlaveSD.h
index a2e86ad451266..3b3019215c63d 100644
--- a/SimDataFormats/SimHitMaker/interface/TrackingSlaveSD.h
+++ b/SimDataFormats/SimHitMaker/interface/TrackingSlaveSD.h
@@ -8,33 +8,28 @@
 #include <vector>
 class SimTrackManager;
 
-class TrackingSlaveSD
-{
-public:    
+class TrackingSlaveSD {
+public:
   typedef std::vector<PSimHit> Collection;
   typedef Collection::const_iterator const_iterator;
-    TrackingSlaveSD(std::string);
-    virtual ~TrackingSlaveSD();
-    virtual void Initialize();
-    //    virtual void renumbering(const SimTrackManager*); 
-    virtual bool processHits(const PSimHit&);
-    virtual bool format();
-    std::string name() const { return name_; } 
-    std::vector<PSimHit>& hits(){return hits_;}
-    std::string type(){return "tk";}
-    virtual const_iterator begin() { return hits_.begin();}
-    virtual const_iterator end()   { return hits_.end();}
+  TrackingSlaveSD(std::string);
+  virtual ~TrackingSlaveSD();
+  virtual void Initialize();
+  //    virtual void renumbering(const SimTrackManager*);
+  virtual bool processHits(const PSimHit &);
+  virtual bool format();
+  std::string name() const { return name_; }
+  std::vector<PSimHit> &hits() { return hits_; }
+  std::string type() { return "tk"; }
+  virtual const_iterator begin() { return hits_.begin(); }
+  virtual const_iterator end() { return hits_.end(); }
+
+protected:
+  std::vector<PSimHit> hits_;
+  void setTrackId(PSimHit &hit, unsigned int k);
 
-protected: 
-    std::vector<PSimHit> hits_;
-    void setTrackId(PSimHit & hit, unsigned int k);
 private:
-    std::string name_;
+  std::string name_;
 };
 
-#endif 
-
-
-
-
-
+#endif
diff --git a/SimDataFormats/SimHitMaker/src/CaloSlaveSD.cc b/SimDataFormats/SimHitMaker/src/CaloSlaveSD.cc
index 02941c9300218..e8bb371bbc75f 100644
--- a/SimDataFormats/SimHitMaker/src/CaloSlaveSD.cc
+++ b/SimDataFormats/SimHitMaker/src/CaloSlaveSD.cc
@@ -1,9 +1,9 @@
 ///////////////////////////////////////////////////////////////////////////////
 // File: CaloSlaveSD.cc
 // Date: 10.02
-// Description: Persistent component of Sensitive Detector class for 
+// Description: Persistent component of Sensitive Detector class for
 //              calorimeters
-// Modifications: 
+// Modifications:
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "SimDataFormats/SimHitMaker/interface/CaloSlaveSD.h"
@@ -11,44 +11,34 @@
 #include <iostream>
 
 CaloSlaveSD::CaloSlaveSD(std::string n) : name_(n) {
-
   LogDebug("HitBuildInfo") << "CaloSlaveSD Called with name " << n << "\n";
-
 }
 
 CaloSlaveSD::~CaloSlaveSD() {}
 
 void CaloSlaveSD::Initialize() {
-
-  LogDebug("HitBuildInfo") << " initialize CaloSlaveSD "<< name_ << "\n";
+  LogDebug("HitBuildInfo") << " initialize CaloSlaveSD " << name_ << "\n";
   hits_.clear();
 }
 
 bool CaloSlaveSD::format() {
-
-  LogDebug("HitBuildInfo") << " CaloSlaveSD " << name_ << "formatting " 
-			   << hits_.size() << " hits.";
+  LogDebug("HitBuildInfo") << " CaloSlaveSD " << name_ << "formatting " << hits_.size() << " hits.";
   return true;
 }
 
-bool CaloSlaveSD::processHits(uint32_t unitID, double eDepEM, double eDepHad, 
-			      double tSlice, int tkID, uint16_t depth) {
-  
-  PCaloHit aCal = PCaloHit (unitID, eDepEM, eDepHad, tSlice, tkID, depth);
-  LogDebug("HitBuildInfo") <<" Sent Hit " << aCal << " to ROU " << name_;
+bool CaloSlaveSD::processHits(uint32_t unitID, double eDepEM, double eDepHad, double tSlice, int tkID, uint16_t depth) {
+  PCaloHit aCal = PCaloHit(unitID, eDepEM, eDepHad, tSlice, tkID, depth);
+  LogDebug("HitBuildInfo") << " Sent Hit " << aCal << " to ROU " << name_;
   hits_.push_back(aCal);
   return true;
-} 
+}
 
 void CaloSlaveSD::Clean() {
-
   LogDebug("HitBuildIndo") << "CaloSlaveSD " << name_ << " cleaning the collection";
   Collection().swap(hits_);
-
 }
 
 void CaloSlaveSD::ReserveMemory(unsigned int size) {
-  
-  if ( hits_.capacity() < size ) hits_.reserve(size);
-
+  if (hits_.capacity() < size)
+    hits_.reserve(size);
 }
diff --git a/SimDataFormats/SimHitMaker/src/TrackingSlaveSD.cc b/SimDataFormats/SimHitMaker/src/TrackingSlaveSD.cc
index 04e8c2d891733..8f8c0a8204973 100644
--- a/SimDataFormats/SimHitMaker/src/TrackingSlaveSD.cc
+++ b/SimDataFormats/SimHitMaker/src/TrackingSlaveSD.cc
@@ -8,62 +8,52 @@
 using std::cout;
 using std::endl;
 
-TrackingSlaveSD::TrackingSlaveSD(std::string myName) : name_(myName){
-
- LogDebug("HitBuildInfo")<< " TrackingSlaveSD " << name_; 
-
+TrackingSlaveSD::TrackingSlaveSD(std::string myName) : name_(myName) {
+  LogDebug("HitBuildInfo") << " TrackingSlaveSD " << name_;
 }
 
-TrackingSlaveSD::~TrackingSlaveSD()
-{}
-
-void TrackingSlaveSD::Initialize(){
+TrackingSlaveSD::~TrackingSlaveSD() {}
 
+void TrackingSlaveSD::Initialize() {
+  LogDebug("HitBuildInfo") << " initialize TrackingSlaveSD " << name_;
 
-  LogDebug("HitBuildInfo")<< " initialize TrackingSlaveSD "<< name_;
-
-  hits_.clear(); 
+  hits_.clear();
 }
 /*
 void TrackingSlaveSD::renumbering(const SimTrackManager* tkManager){
   //
   // Now renumber the Hits
   //
-  edm::LogInfo("TrackRenumberingInfo")<< " TrackingSlaveSD "<<name()<<" renumbering " << hits_.size() <<" hits.";
+  edm::LogInfo("TrackRenumberingInfo")<< " TrackingSlaveSD "<<name()<<"
+renumbering " << hits_.size() <<" hits.";
   //
   // now I loop over PSimHits and change the id inside
   //
-  for(TrackingSlaveSD::Collection::const_iterator it = begin(); it!= end(); it++){
-    PSimHit& temp = const_cast<PSimHit&>(*it);
-    unsigned int nt = tkManager->g4ToSim(temp.trackId());
+  for(TrackingSlaveSD::Collection::const_iterator it = begin(); it!= end();
+it++){ PSimHit& temp = const_cast<PSimHit&>(*it); unsigned int nt =
+tkManager->g4ToSim(temp.trackId());
 
-    LogDebug("TrackRenumberingInfo")<<" Studying PSimHit " << temp 
-				    <<" Changing TrackID from " << temp.trackId()
-				    <<" with " << nt;
+    LogDebug("TrackRenumberingInfo")<<" Studying PSimHit " << temp
+                                    <<" Changing TrackID from " <<
+temp.trackId()
+                                    <<" with " << nt;
 
     setTrackId( temp, nt);
   }
 
 }
 */
-bool TrackingSlaveSD::format()
-{
-
-  LogDebug("HitBuildInfo")<< " TrackingSlaveSD " << name_<< " formatting " << hits_.size() << " hits.";
+bool TrackingSlaveSD::format() {
+  LogDebug("HitBuildInfo") << " TrackingSlaveSD " << name_ << " formatting " << hits_.size() << " hits.";
 
   return true;
 }
 
-bool TrackingSlaveSD::processHits(const PSimHit & ps)
-{
-
-  LogDebug("HitBuildInfo")<<" Sent Hit " << ps << " to ROU " << name_;
+bool TrackingSlaveSD::processHits(const PSimHit &ps) {
+  LogDebug("HitBuildInfo") << " Sent Hit " << ps << " to ROU " << name_;
 
   hits_.push_back(ps);
   return true;
-} 
-
-void TrackingSlaveSD::setTrackId(PSimHit & hit, unsigned int k)
-{ hit.theTrackId = k; }
-
+}
 
+void TrackingSlaveSD::setTrackId(PSimHit &hit, unsigned int k) { hit.theTrackId = k; }
diff --git a/SimDataFormats/Track/interface/CoreSimTrack.h b/SimDataFormats/Track/interface/CoreSimTrack.h
index 2e99bde45b893..bebd6ce35564d 100644
--- a/SimDataFormats/Track/interface/CoreSimTrack.h
+++ b/SimDataFormats/Track/interface/CoreSimTrack.h
@@ -1,47 +1,43 @@
 #ifndef CoreSimTrack_H
 #define CoreSimTrack_H
- 
+
 #include "DataFormats/Math/interface/Vector3D.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
 
 #include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
-  
-class CoreSimTrack 
-{ 
-public:
 
-    /// constructors
-    CoreSimTrack() : tId(0), thePID(0) {}
-    CoreSimTrack( int ipart, const math::XYZTLorentzVectorD& p ) :
-      tId(0), thePID(ipart), theMomentum(p) {}
+class CoreSimTrack {
+public:
+  /// constructors
+  CoreSimTrack() : tId(0), thePID(0) {}
+  CoreSimTrack(int ipart, const math::XYZTLorentzVectorD& p) : tId(0), thePID(ipart), theMomentum(p) {}
 
-    CoreSimTrack( int ipart, math::XYZVectorD& ip, double ie ) :
-      tId(0), thePID(ipart)
-    { theMomentum.SetXYZT( ip.x(), ip.y(), ip.z(), ie ) ; }
+  CoreSimTrack(int ipart, math::XYZVectorD& ip, double ie) : tId(0), thePID(ipart) {
+    theMomentum.SetXYZT(ip.x(), ip.y(), ip.z(), ie);
+  }
 
-    const math::XYZTLorentzVectorD& momentum() const { return theMomentum; }
+  const math::XYZTLorentzVectorD& momentum() const { return theMomentum; }
 
-    /// particle type (HEP PDT convension)
-    int type() const { return thePID;}
+  /// particle type (HEP PDT convension)
+  int type() const { return thePID; }
 
-    /// charge
-    float charge() const;
+  /// charge
+  float charge() const;
 
-    void setEventId(EncodedEventId e) {eId=e;}
-    EncodedEventId eventId() const {return eId;}
+  void setEventId(EncodedEventId e) { eId = e; }
+  EncodedEventId eventId() const { return eId; }
 
-    void setTrackId(unsigned int t) {tId=t;}
-    unsigned int trackId() const {return tId;}
+  void setTrackId(unsigned int t) { tId = t; }
+  unsigned int trackId() const { return tId; }
 
 private:
-
-    EncodedEventId eId;
-    unsigned int tId;
-    int thePID;
-    math::XYZTLorentzVectorD theMomentum ;
+  EncodedEventId eId;
+  unsigned int tId;
+  int thePID;
+  math::XYZTLorentzVectorD theMomentum;
 };
 
 #include <iosfwd>
-std::ostream & operator <<(std::ostream & o , const CoreSimTrack & t);
+std::ostream& operator<<(std::ostream& o, const CoreSimTrack& t);
 
-#endif 
+#endif
diff --git a/SimDataFormats/Track/interface/SimTrack.h b/SimDataFormats/Track/interface/SimTrack.h
index feb53d19b19cd..3cedee725b3ee 100644
--- a/SimDataFormats/Track/interface/SimTrack.h
+++ b/SimDataFormats/Track/interface/SimTrack.h
@@ -3,57 +3,56 @@
 
 #include "SimDataFormats/Track/interface/CoreSimTrack.h"
 
-class SimTrack : public CoreSimTrack
-{
-
+class SimTrack : public CoreSimTrack {
 public:
-
   typedef CoreSimTrack Core;
 
   /// constructor
   SimTrack();
-  SimTrack(int ipart, const math::XYZTLorentzVectorD& p) ;
+  SimTrack(int ipart, const math::XYZTLorentzVectorD& p);
 
   /// full constructor (pdg type, momentum, time,
   /// index of parent vertex in final vector
   /// index of corresponding gen part in final vector)
   SimTrack(int ipart, const math::XYZTLorentzVectorD& p, int iv, int ig);
 
-  SimTrack(int ipart, const math::XYZTLorentzVectorD& p, int iv, int ig, 
-	   const math::XYZVectorD& tkp, const math::XYZTLorentzVectorD& tkm);
+  SimTrack(int ipart,
+           const math::XYZTLorentzVectorD& p,
+           int iv,
+           int ig,
+           const math::XYZVectorD& tkp,
+           const math::XYZTLorentzVectorD& tkm);
 
   /// constructor from transient
   SimTrack(const CoreSimTrack& t, int iv, int ig);
 
   /// index of the vertex in the Event container (-1 if no vertex)
-  int vertIndex() const { return ivert;}
-  bool  noVertex() const { return ivert==-1;}
+  int vertIndex() const { return ivert; }
+  bool noVertex() const { return ivert == -1; }
 
   /// index of the corresponding Generator particle in the Event container (-1 if no Genpart)
-  int genpartIndex() const { return igenpart;}
-  bool  noGenpart() const { return igenpart==-1;}
+  int genpartIndex() const { return igenpart; }
+  bool noGenpart() const { return igenpart == -1; }
 
   const math::XYZVectorD& trackerSurfacePosition() const { return tkposition; }
 
   const math::XYZTLorentzVectorD& trackerSurfaceMomentum() const { return tkmomentum; }
-  
+
   inline void setTkPosition(const math::XYZVectorD& pos) { tkposition = pos; }
 
   inline void setTkMomentum(const math::XYZTLorentzVectorD& mom) { tkmomentum = mom; }
 
-  inline void setVertexIndex(const int v) { ivert=v;}
-
-private: 
-
-    int ivert;
-    int igenpart;
+  inline void setVertexIndex(const int v) { ivert = v; }
 
-    math::XYZVectorD tkposition ;
-    math::XYZTLorentzVectorD tkmomentum ;
+private:
+  int ivert;
+  int igenpart;
 
+  math::XYZVectorD tkposition;
+  math::XYZTLorentzVectorD tkmomentum;
 };
 
 #include <iosfwd>
-std::ostream & operator <<(std::ostream & o , const SimTrack& t);
+std::ostream& operator<<(std::ostream& o, const SimTrack& t);
 
 #endif
diff --git a/SimDataFormats/Track/src/CoreSimTrack.cc b/SimDataFormats/Track/src/CoreSimTrack.cc
index f24aac7a4cb2b..f685b90e4f5a9 100644
--- a/SimDataFormats/Track/src/CoreSimTrack.cc
+++ b/SimDataFormats/Track/src/CoreSimTrack.cc
@@ -1,64 +1,73 @@
 #include "SimDataFormats/Track/interface/CoreSimTrack.h"
 
-const float onethird = 1./3.;
-const float twothird = 2./3.;
-const float chg[109] = {
- -onethird,twothird,-onethird,twothird,-onethird,twothird,-onethird,twothird,0,0,
- -1,0,-1,0,-1,0,-1,0,0,0,
-  0,0, 0,1, 0,0, 0,0,0,0,
-  1,0, 1,2, 0,0, 1,2,0,0,
- -onethird,twothird,-onethird,twothird,-onethird,twothird,0,0,0,0,
- -1,0,-1,0,-1,0, 0,0,0,0,
- -onethird,twothird,-onethird,twothird,-onethird,twothird,0,0,0,0,
- -1,0,-1,0,-1,0, 1,1,0,0,
-  0,0, 0,0, 0,0, 0,0,0,0,
-  0,0, 0,0, 0,0, 0,0,0,0,
-  0,0, 0,0, 0,0, 0,0,0};
+const float onethird = 1. / 3.;
+const float twothird = 2. / 3.;
+const float chg[109] = {-onethird, twothird, -onethird, twothird, -onethird, twothird, -onethird, twothird, 0, 0,
+                        -1,        0,        -1,        0,        -1,        0,        -1,        0,        0, 0,
+                        0,         0,        0,         1,        0,         0,        0,         0,        0, 0,
+                        1,         0,        1,         2,        0,         0,        1,         2,        0, 0,
+                        -onethird, twothird, -onethird, twothird, -onethird, twothird, 0,         0,        0, 0,
+                        -1,        0,        -1,        0,        -1,        0,        0,         0,        0, 0,
+                        -onethird, twothird, -onethird, twothird, -onethird, twothird, 0,         0,        0, 0,
+                        -1,        0,        -1,        0,        -1,        0,        1,         1,        0, 0,
+                        0,         0,        0,         0,        0,         0,        0,         0,        0, 0,
+                        0,         0,        0,         0,        0,         0,        0,         0,        0, 0,
+                        0,         0,        0,         0,        0,         0,        0,         0,        0};
 
-float CoreSimTrack::charge() const { 
+float CoreSimTrack::charge() const {
   float hepchg = 0;
-  if(thePID != 0) {
+  if (thePID != 0) {
     int kqa = std::abs(thePID);
-    if(kqa < 10000000) {
+    if (kqa < 10000000) {
       //... direct translation
-      if(kqa<=100) {hepchg = chg[kqa-1];}
+      if (kqa <= 100) {
+        hepchg = chg[kqa - 1];
+      }
       //... deuteron or tritium
-      else if(kqa==100 || kqa==101) {hepchg = -1;}
+      else if (kqa == 100 || kqa == 101) {
+        hepchg = -1;
+      }
       //... alpha or He3
-      else if(kqa==102 || kqa==104) {hepchg = -2;}
-      else if(kqa%10 != 0) {
-	int kqx=kqa/1000000%10;
-	int kq3=kqa/1000%10;
-	int kq2=kqa/100%10;
-	int kq1=kqa/10%10;
-	int irt=kqa%10000;
-	if(kqx>0 && irt<100) {
-	  hepchg = chg[irt-1];
-	  if(kqa==5100061 || kqa==5100062) {hepchg = 2;}
-	} else if(kq3==0) {
-	  //   Construction from quark content for heavy meson, 
-	  //   diquark, baryon, mesons.
-	  hepchg = chg[kq2-1]-chg[kq1-1];
-	  //...Strange or beauty mesons.
-	  if((kq2==3) || (kq2==5)) {hepchg = chg[kq1-1]-chg[kq2-1];}
-	} else if(kq1 == 0) {
-	  //...Diquarks.
-	  hepchg = chg[kq3-1] + chg[kq2-1];
-	} else {
-	  //...Baryons
-	  hepchg = chg[kq3-1]+chg[kq2-1]+chg[kq1-1];
-	}
+      else if (kqa == 102 || kqa == 104) {
+        hepchg = -2;
+      } else if (kqa % 10 != 0) {
+        int kqx = kqa / 1000000 % 10;
+        int kq3 = kqa / 1000 % 10;
+        int kq2 = kqa / 100 % 10;
+        int kq1 = kqa / 10 % 10;
+        int irt = kqa % 10000;
+        if (kqx > 0 && irt < 100) {
+          hepchg = chg[irt - 1];
+          if (kqa == 5100061 || kqa == 5100062) {
+            hepchg = 2;
+          }
+        } else if (kq3 == 0) {
+          //   Construction from quark content for heavy meson,
+          //   diquark, baryon, mesons.
+          hepchg = chg[kq2 - 1] - chg[kq1 - 1];
+          //...Strange or beauty mesons.
+          if ((kq2 == 3) || (kq2 == 5)) {
+            hepchg = chg[kq1 - 1] - chg[kq2 - 1];
+          }
+        } else if (kq1 == 0) {
+          //...Diquarks.
+          hepchg = chg[kq3 - 1] + chg[kq2 - 1];
+        } else {
+          //...Baryons
+          hepchg = chg[kq3 - 1] + chg[kq2 - 1] + chg[kq1 - 1];
+        }
       }
       //... fix sign of charge
-      if(thePID<0) {hepchg = -hepchg;}
+      if (thePID < 0) {
+        hepchg = -hepchg;
+      }
     }
   }
   return hepchg;
 }
 
-std::ostream & operator <<(std::ostream & o , const CoreSimTrack& t) 
-{
-    o << t.type() << ", ";
-    o << t.momentum();
-    return o;
+std::ostream& operator<<(std::ostream& o, const CoreSimTrack& t) {
+  o << t.type() << ", ";
+  o << t.momentum();
+  return o;
 }
diff --git a/SimDataFormats/Track/src/SimTrack.cc b/SimDataFormats/Track/src/SimTrack.cc
index 584ff2308fbf1..0fe3d889c10cd 100644
--- a/SimDataFormats/Track/src/SimTrack.cc
+++ b/SimDataFormats/Track/src/SimTrack.cc
@@ -1,23 +1,22 @@
 #include "SimDataFormats/Track/interface/SimTrack.h"
 
 SimTrack::SimTrack() : ivert(-1), igenpart(-1) {}
- 
-SimTrack::SimTrack(int ipart, const math::XYZTLorentzVectorD& p) :
-    Core(ipart, p), ivert(-1), igenpart(-1) {}
- 
-SimTrack::SimTrack(int ipart, const math::XYZTLorentzVectorD& p, int iv, int ig) :
-    Core(ipart, p), ivert(iv), igenpart(ig) {}
 
-SimTrack::SimTrack(int ipart, const math::XYZTLorentzVectorD& p, int iv, int ig,
-		   const math::XYZVectorD&  tkp, const math::XYZTLorentzVectorD& tkm) :
-    Core(ipart, p), ivert(iv), igenpart(ig),tkposition(tkp),tkmomentum(tkm)  {}
- 
-SimTrack::SimTrack(const CoreSimTrack & t, int iv, int ig) :
-    Core(t), ivert(iv), igenpart(ig) {}
- 
-std::ostream & operator <<(std::ostream & o , const SimTrack & t) 
-{
-    return o << (SimTrack::Core)(t) << ", "
-	     << t.vertIndex() << ", "
-	     << t.genpartIndex();
+SimTrack::SimTrack(int ipart, const math::XYZTLorentzVectorD& p) : Core(ipart, p), ivert(-1), igenpart(-1) {}
+
+SimTrack::SimTrack(int ipart, const math::XYZTLorentzVectorD& p, int iv, int ig)
+    : Core(ipart, p), ivert(iv), igenpart(ig) {}
+
+SimTrack::SimTrack(int ipart,
+                   const math::XYZTLorentzVectorD& p,
+                   int iv,
+                   int ig,
+                   const math::XYZVectorD& tkp,
+                   const math::XYZTLorentzVectorD& tkm)
+    : Core(ipart, p), ivert(iv), igenpart(ig), tkposition(tkp), tkmomentum(tkm) {}
+
+SimTrack::SimTrack(const CoreSimTrack& t, int iv, int ig) : Core(t), ivert(iv), igenpart(ig) {}
+
+std::ostream& operator<<(std::ostream& o, const SimTrack& t) {
+  return o << (SimTrack::Core)(t) << ", " << t.vertIndex() << ", " << t.genpartIndex();
 }
diff --git a/SimDataFormats/Track/src/classes.h b/SimDataFormats/Track/src/classes.h
index 018c3043cca68..3c4798d038ae2 100644
--- a/SimDataFormats/Track/src/classes.h
+++ b/SimDataFormats/Track/src/classes.h
@@ -4,4 +4,3 @@
 #include "DataFormats/Common/interface/Wrapper.h"
 
 #include <vector>
- 
diff --git a/SimDataFormats/TrackerDigiSimLink/interface/PixelDigiSimLink.h b/SimDataFormats/TrackerDigiSimLink/interface/PixelDigiSimLink.h
index dcdd1e71e800c..5132ebd337560 100644
--- a/SimDataFormats/TrackerDigiSimLink/interface/PixelDigiSimLink.h
+++ b/SimDataFormats/TrackerDigiSimLink/interface/PixelDigiSimLink.h
@@ -7,45 +7,45 @@
 //typedef std::pair<unsigned int ,unsigned int > PixelDigiSimLink;
 class PixelDigiSimLink {
 public:
-  enum {LowTof, HighTof};
+  enum { LowTof, HighTof };
 
-  PixelDigiSimLink(unsigned int ch, unsigned int tkId, unsigned int counter, unsigned int tofBin, EncodedEventId e, float a ){
-    chan=ch;
-    simTkId=tkId;
+  PixelDigiSimLink(
+      unsigned int ch, unsigned int tkId, unsigned int counter, unsigned int tofBin, EncodedEventId e, float a) {
+    chan = ch;
+    simTkId = tkId;
     CFpos = tofBin == LowTof ? counter & 0x7FFFFFFF : (counter & 0x7FFFFFFF) | 0x80000000;
-    fract=a;
-    eId=e;
+    fract = a;
+    eId = e;
   };
-  PixelDigiSimLink(unsigned int ch, unsigned int tkId, EncodedEventId e, float a ){
-    chan=ch;
-    simTkId=tkId;
+  PixelDigiSimLink(unsigned int ch, unsigned int tkId, EncodedEventId e, float a) {
+    chan = ch;
+    simTkId = tkId;
     CFpos = 0;
-    fract=a;
-    eId=e;
+    fract = a;
+    eId = e;
   };
-  PixelDigiSimLink():eId(0){
-    chan=0;
-    simTkId=0;
+  PixelDigiSimLink() : eId(0) {
+    chan = 0;
+    simTkId = 0;
     CFpos = 0;
-    fract=0;
+    fract = 0;
   };
   ~PixelDigiSimLink(){};
-  unsigned int channel() const{return chan;};
-  unsigned int SimTrackId() const{return simTkId;};
-  unsigned int CFposition()  const {return CFpos & 0x7FFFFFFF;}
-  unsigned int TofBin()      const {return (CFpos & 0x80000000) == 0 ? LowTof : HighTof;}
-  EncodedEventId eventId() const{return eId;}
-  float fraction() const{return fract;};
+  unsigned int channel() const { return chan; };
+  unsigned int SimTrackId() const { return simTkId; };
+  unsigned int CFposition() const { return CFpos & 0x7FFFFFFF; }
+  unsigned int TofBin() const { return (CFpos & 0x80000000) == 0 ? LowTof : HighTof; }
+  EncodedEventId eventId() const { return eId; }
+  float fraction() const { return fract; };
 
+  inline bool operator<(const PixelDigiSimLink& other) const { return fraction() < other.fraction(); }
 
-  inline bool operator< ( const PixelDigiSimLink& other ) const { return fraction() < other.fraction(); }
-
- private:
+private:
   unsigned int chan;
   unsigned int simTkId;
-  uint32_t CFpos; // position of the PSimHit in the CrossingFrame vector
-             // for the subdetector collection; bit 31 set if from the HighTof collection
+  uint32_t CFpos;  // position of the PSimHit in the CrossingFrame vector
+                   // for the subdetector collection; bit 31 set if from the HighTof collection
   EncodedEventId eId;
   float fract;
-  };
-#endif 
+};
+#endif
diff --git a/SimDataFormats/TrackerDigiSimLink/interface/StripCompactDigiSimLinks.h b/SimDataFormats/TrackerDigiSimLink/interface/StripCompactDigiSimLinks.h
index 9f1ef9c88786a..60e9ae07d322b 100644
--- a/SimDataFormats/TrackerDigiSimLink/interface/StripCompactDigiSimLinks.h
+++ b/SimDataFormats/TrackerDigiSimLink/interface/StripCompactDigiSimLinks.h
@@ -8,83 +8,86 @@
 #include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
 
 class StripCompactDigiSimLinks {
-    public:
-        /// Empty constructor, for ROOT persistence
-        StripCompactDigiSimLinks() {}
-        ~StripCompactDigiSimLinks() {}
-
-        typedef std::pair<EncodedEventId,unsigned int> key_type;
-        struct HitRecord {
-            HitRecord() {}
-            HitRecord(uint32_t detid, uint16_t first, uint16_t size) : 
-                 detId(detid), firstStrip(first), nStrips(size) {}
-            uint32_t detId;
-            uint16_t firstStrip;
-            uint16_t nStrips;
-        };
-        typedef boost::sub_range<const std::vector<HitRecord> > Links;
-        typedef Links value_type;
-        
-        void swap(StripCompactDigiSimLinks &other) {
-            using std::swap;
-            swap(trackRecords_, other.trackRecords_);
-            swap(hitRecords_,   other.hitRecords_);
-        }
-       
-        Links getLinks(const key_type &key) const ;
-        Links operator[](const key_type &key) const { return getLinks(key); }
-        
-        class Filler {
-            public:
-                Filler() : storage_(), num_keys_(0), num_values_(0) {}
-
-                // out of line destructor to avoid code bloat
-                ~Filler() ;
-
-                void insert(const key_type  &key, const HitRecord &record);
-
-                typedef std::map<key_type, std::vector<HitRecord> >  Map;
-                const Map & storage() const { return storage_; }
-
-                unsigned int keySize()  const { return num_keys_;   }
-                unsigned int dataSize() const { return num_values_; }
-            private:
-                Map storage_;
-                unsigned int num_keys_;
-                unsigned int num_values_;
-        };
-        /// This is the real constructor you will use
-        StripCompactDigiSimLinks(const Filler &filler) ;
-
-        struct TrackRecord {
-            TrackRecord(){}
-            TrackRecord(key_type k, unsigned int offset) : key(k), start(offset) {}
-            key_type       key;
-            unsigned int   start;    // first index in HitRecord
-            //unsigned int   length;
-            inline bool operator< (const TrackRecord &other) const { return key <  other.key; }
-            inline bool operator< (const key_type &otherKey) const { return key <  otherKey;  }
-            inline bool operator==(const key_type &otherKey) const { return key == otherKey;  }
-        };
-
-        struct RevLink {
-            RevLink(const TrackRecord &track, const HitRecord &hit) : 
-                eventId(track.key.first), simTrackId(track.key.second), 
-                firstStrip(hit.firstStrip), lastStrip(hit.firstStrip+hit.nStrips-1) {}
-            EncodedEventId eventId;
-            unsigned int simTrackId;
-            uint16_t firstStrip;
-            uint16_t lastStrip;
-        };
-
-        /// Make the map in the reverse direction. SLOW! call it only once.
-        std::map<uint32_t, std::vector<RevLink> > makeReverseMap() const ;
-    private:
-        /// These MUST be sorted at the same time by key and by start
-        /// The rule is enforced by allowing to create this only through a Filler
-        std::vector<TrackRecord> trackRecords_; 
-
-        std::vector<HitRecord>   hitRecords_;
+public:
+  /// Empty constructor, for ROOT persistence
+  StripCompactDigiSimLinks() {}
+  ~StripCompactDigiSimLinks() {}
+
+  typedef std::pair<EncodedEventId, unsigned int> key_type;
+  struct HitRecord {
+    HitRecord() {}
+    HitRecord(uint32_t detid, uint16_t first, uint16_t size) : detId(detid), firstStrip(first), nStrips(size) {}
+    uint32_t detId;
+    uint16_t firstStrip;
+    uint16_t nStrips;
+  };
+  typedef boost::sub_range<const std::vector<HitRecord> > Links;
+  typedef Links value_type;
+
+  void swap(StripCompactDigiSimLinks &other) {
+    using std::swap;
+    swap(trackRecords_, other.trackRecords_);
+    swap(hitRecords_, other.hitRecords_);
+  }
+
+  Links getLinks(const key_type &key) const;
+  Links operator[](const key_type &key) const { return getLinks(key); }
+
+  class Filler {
+  public:
+    Filler() : storage_(), num_keys_(0), num_values_(0) {}
+
+    // out of line destructor to avoid code bloat
+    ~Filler();
+
+    void insert(const key_type &key, const HitRecord &record);
+
+    typedef std::map<key_type, std::vector<HitRecord> > Map;
+    const Map &storage() const { return storage_; }
+
+    unsigned int keySize() const { return num_keys_; }
+    unsigned int dataSize() const { return num_values_; }
+
+  private:
+    Map storage_;
+    unsigned int num_keys_;
+    unsigned int num_values_;
+  };
+  /// This is the real constructor you will use
+  StripCompactDigiSimLinks(const Filler &filler);
+
+  struct TrackRecord {
+    TrackRecord() {}
+    TrackRecord(key_type k, unsigned int offset) : key(k), start(offset) {}
+    key_type key;
+    unsigned int start;  // first index in HitRecord
+    //unsigned int   length;
+    inline bool operator<(const TrackRecord &other) const { return key < other.key; }
+    inline bool operator<(const key_type &otherKey) const { return key < otherKey; }
+    inline bool operator==(const key_type &otherKey) const { return key == otherKey; }
+  };
+
+  struct RevLink {
+    RevLink(const TrackRecord &track, const HitRecord &hit)
+        : eventId(track.key.first),
+          simTrackId(track.key.second),
+          firstStrip(hit.firstStrip),
+          lastStrip(hit.firstStrip + hit.nStrips - 1) {}
+    EncodedEventId eventId;
+    unsigned int simTrackId;
+    uint16_t firstStrip;
+    uint16_t lastStrip;
+  };
+
+  /// Make the map in the reverse direction. SLOW! call it only once.
+  std::map<uint32_t, std::vector<RevLink> > makeReverseMap() const;
+
+private:
+  /// These MUST be sorted at the same time by key and by start
+  /// The rule is enforced by allowing to create this only through a Filler
+  std::vector<TrackRecord> trackRecords_;
+
+  std::vector<HitRecord> hitRecords_;
 };
 
 inline void swap(StripCompactDigiSimLinks &a, StripCompactDigiSimLinks &b) { a.swap(b); }
diff --git a/SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h b/SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h
index 450b31c0cea38..1b8ac0670fc2a 100644
--- a/SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h
+++ b/SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h
@@ -5,40 +5,48 @@
 #include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
 
 class StripDigiSimLink {
- public:
-  enum {LowTof, HighTof};
-
-  StripDigiSimLink(unsigned int ch, unsigned int tkId, unsigned int counter, unsigned int tofBin, EncodedEventId e, float a ):
-    chan(ch),simTkId(tkId), CFpos(tofBin == LowTof ? counter & 0x7FFFFFFF : (counter & 0x7FFFFFFF) | 0x80000000), eId(e), fract(a) {;}
-
-  StripDigiSimLink(unsigned int ch, unsigned int tkId, unsigned int counter, EncodedEventId e, float a ):
-    chan(ch),simTkId(tkId), CFpos(counter & 0x7FFFFFFF), eId(e), fract(a) {;}
-
-  StripDigiSimLink(unsigned int ch, unsigned int tkId, EncodedEventId e, float a ):
-    chan(ch),simTkId(tkId), CFpos(0), eId(e), fract(a) {;}
-
-    StripDigiSimLink():chan(0),simTkId(0),CFpos(0),eId(0), fract(0) {;}
-
-  ~StripDigiSimLink(){;}
-
-  unsigned int   channel()     const {return chan;}
-  unsigned int   SimTrackId()  const {return simTkId;}
-  unsigned int   CFposition()  const {return CFpos & 0x7FFFFFFF;}
-  unsigned int   TofBin()      const {return (CFpos & 0x80000000) == 0 ? LowTof : HighTof;}
-  EncodedEventId eventId()     const {return eId;}
-  float          fraction()    const {return fract;}
-
-  inline bool operator< ( const StripDigiSimLink& other ) const { return channel() < other.channel(); }
-
- private:
+public:
+  enum { LowTof, HighTof };
+
+  StripDigiSimLink(
+      unsigned int ch, unsigned int tkId, unsigned int counter, unsigned int tofBin, EncodedEventId e, float a)
+      : chan(ch),
+        simTkId(tkId),
+        CFpos(tofBin == LowTof ? counter & 0x7FFFFFFF : (counter & 0x7FFFFFFF) | 0x80000000),
+        eId(e),
+        fract(a) {
+    ;
+  }
+
+  StripDigiSimLink(unsigned int ch, unsigned int tkId, unsigned int counter, EncodedEventId e, float a)
+      : chan(ch), simTkId(tkId), CFpos(counter & 0x7FFFFFFF), eId(e), fract(a) {
+    ;
+  }
+
+  StripDigiSimLink(unsigned int ch, unsigned int tkId, EncodedEventId e, float a)
+      : chan(ch), simTkId(tkId), CFpos(0), eId(e), fract(a) {
+    ;
+  }
+
+  StripDigiSimLink() : chan(0), simTkId(0), CFpos(0), eId(0), fract(0) { ; }
+
+  ~StripDigiSimLink() { ; }
+
+  unsigned int channel() const { return chan; }
+  unsigned int SimTrackId() const { return simTkId; }
+  unsigned int CFposition() const { return CFpos & 0x7FFFFFFF; }
+  unsigned int TofBin() const { return (CFpos & 0x80000000) == 0 ? LowTof : HighTof; }
+  EncodedEventId eventId() const { return eId; }
+  float fraction() const { return fract; }
+
+  inline bool operator<(const StripDigiSimLink& other) const { return channel() < other.channel(); }
+
+private:
   unsigned int chan;
   unsigned int simTkId;
-  uint32_t CFpos; // position of the PSimHit in the CrossingFrame vector
-             // for the subdetector collection; bit 31 set if from the HighTof collection
+  uint32_t CFpos;  // position of the PSimHit in the CrossingFrame vector
+                   // for the subdetector collection; bit 31 set if from the HighTof collection
   EncodedEventId eId;
-  float    fract;
+  float fract;
 };
 #endif
-
-
-  
diff --git a/SimDataFormats/TrackerDigiSimLink/src/StripCompactDigiSimLinks.cc b/SimDataFormats/TrackerDigiSimLink/src/StripCompactDigiSimLinks.cc
index e69cb768a13cb..4fd63fd5e8a2a 100644
--- a/SimDataFormats/TrackerDigiSimLink/src/StripCompactDigiSimLinks.cc
+++ b/SimDataFormats/TrackerDigiSimLink/src/StripCompactDigiSimLinks.cc
@@ -2,61 +2,52 @@
 
 #include <algorithm>
 
-
-StripCompactDigiSimLinks::Links 
-StripCompactDigiSimLinks::getLinks(const StripCompactDigiSimLinks::key_type &key) const 
-{
-    std::vector<TrackRecord>::const_iterator last  = trackRecords_.end();
-    std::vector<TrackRecord>::const_iterator match = std::lower_bound(trackRecords_.begin(), last, key);
-    if ((match != last) && (*match == key)) {
-        // std::vector<TrackRecord>::const_iterator next = match+1;
-        unsigned int end = (match+1 == last ? hitRecords_.size() : (match+1)->start);
-        return Links(hitRecords_.begin()+match->start, hitRecords_.begin()+end);
-    } else {
-        return Links(hitRecords_.end(), hitRecords_.end());
-    }
+StripCompactDigiSimLinks::Links StripCompactDigiSimLinks::getLinks(const StripCompactDigiSimLinks::key_type &key) const {
+  std::vector<TrackRecord>::const_iterator last = trackRecords_.end();
+  std::vector<TrackRecord>::const_iterator match = std::lower_bound(trackRecords_.begin(), last, key);
+  if ((match != last) && (*match == key)) {
+    // std::vector<TrackRecord>::const_iterator next = match+1;
+    unsigned int end = (match + 1 == last ? hitRecords_.size() : (match + 1)->start);
+    return Links(hitRecords_.begin() + match->start, hitRecords_.begin() + end);
+  } else {
+    return Links(hitRecords_.end(), hitRecords_.end());
+  }
 }
 
-StripCompactDigiSimLinks::StripCompactDigiSimLinks(const StripCompactDigiSimLinks::Filler &filler) 
-{
-    trackRecords_.reserve(filler.keySize());
-    hitRecords_.reserve(filler.dataSize());
-    for(auto const& pair : filler.storage() ) {
-        trackRecords_.push_back(TrackRecord(pair.first, hitRecords_.size()));
-        hitRecords_.insert(hitRecords_.end(), pair.second.begin(), pair.second.end());
-    }
+StripCompactDigiSimLinks::StripCompactDigiSimLinks(const StripCompactDigiSimLinks::Filler &filler) {
+  trackRecords_.reserve(filler.keySize());
+  hitRecords_.reserve(filler.dataSize());
+  for (auto const &pair : filler.storage()) {
+    trackRecords_.push_back(TrackRecord(pair.first, hitRecords_.size()));
+    hitRecords_.insert(hitRecords_.end(), pair.second.begin(), pair.second.end());
+  }
 }
 
-StripCompactDigiSimLinks::Filler::~Filler() {
+StripCompactDigiSimLinks::Filler::~Filler() {}
+
+void StripCompactDigiSimLinks::Filler::insert(const StripCompactDigiSimLinks::key_type &key,
+                                              const StripCompactDigiSimLinks::HitRecord &record) {
+  Filler::Map::iterator it = storage_.find(key);
+  if (it == storage_.end()) {
+    storage_.insert(std::make_pair(key, std::vector<HitRecord>(1, record)));
+    num_keys_++;
+    num_values_++;
+  } else {
+    it->second.push_back(record);
+    num_values_++;
+  }
 }
 
-void
-StripCompactDigiSimLinks::Filler::insert(const StripCompactDigiSimLinks::key_type &key, const StripCompactDigiSimLinks::HitRecord &record) 
-{
-    Filler::Map::iterator it = storage_.find(key);
-    if (it == storage_.end()) {
-        storage_.insert(std::make_pair(key, std::vector<HitRecord>(1,record)));
-        num_keys_++; 
-        num_values_++;
-    } else {
-        it->second.push_back(record);
-        num_values_++;
+std::map<uint32_t, std::vector<StripCompactDigiSimLinks::RevLink> > StripCompactDigiSimLinks::makeReverseMap() const {
+  std::map<uint32_t, std::vector<StripCompactDigiSimLinks::RevLink> > ret;
+  typedef std::vector<TrackRecord>::const_iterator trk_it;
+  typedef std::vector<HitRecord>::const_iterator hit_it;
+  hit_it hstart = hitRecords_.begin(), ith = hstart;
+  for (trk_it itt = trackRecords_.begin(), endt = trackRecords_.end(); itt != endt; ++itt) {
+    hit_it edh = (itt + 1 != endt ? hstart + (itt + 1)->start : hitRecords_.end());
+    for (; ith < edh; ++ith) {
+      ret[ith->detId].push_back(RevLink(*itt, *ith));
     }
+  }
+  return ret;
 }
-
-std::map<uint32_t, std::vector<StripCompactDigiSimLinks::RevLink> > 
-StripCompactDigiSimLinks::makeReverseMap() const
-{
-    std::map<uint32_t, std::vector<StripCompactDigiSimLinks::RevLink> > ret;
-    typedef std::vector<TrackRecord>::const_iterator trk_it;
-    typedef std::vector<HitRecord>::const_iterator   hit_it;
-    hit_it hstart = hitRecords_.begin(), ith = hstart;
-    for (trk_it itt = trackRecords_.begin(), endt = trackRecords_.end(); itt != endt; ++itt) {
-        hit_it edh = (itt+1 != endt ? hstart + (itt+1)->start : hitRecords_.end());
-        for (; ith < edh; ++ith) {
-            ret[ith->detId].push_back(RevLink(*itt, *ith));
-        }
-    }
-    return ret;
-}
-
diff --git a/SimDataFormats/TrackerDigiSimLink/src/classes.h b/SimDataFormats/TrackerDigiSimLink/src/classes.h
index f05db11b87b72..42b101455d196 100644
--- a/SimDataFormats/TrackerDigiSimLink/src/classes.h
+++ b/SimDataFormats/TrackerDigiSimLink/src/classes.h
@@ -9,6 +9,4 @@
 #include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h"
 #include "SimDataFormats/TrackerDigiSimLink/interface/StripCompactDigiSimLinks.h"
 
-
-#endif // TRACKERDIGISIMLINK_CLASSES_H
-
+#endif  // TRACKERDIGISIMLINK_CLASSES_H
diff --git a/SimDataFormats/TrackingHit/interface/PSimHit.h b/SimDataFormats/TrackingHit/interface/PSimHit.h
index 7f5eabad7a4e6..a5994e8ceb05f 100644
--- a/SimDataFormats/TrackingHit/interface/PSimHit.h
+++ b/SimDataFormats/TrackingHit/interface/PSimHit.h
@@ -5,7 +5,7 @@
 #include "DataFormats/GeometryVector/interface/LocalVector.h"
 #include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
 
-class TrackingSlaveSD; // for friend declaration only
+class TrackingSlaveSD;  // for friend declaration only
 
 /** 
  * Persistent-capable SimHit.
@@ -14,65 +14,69 @@ class TrackingSlaveSD; // for friend declaration only
 
 class PSimHit {
 public:
-
   PSimHit() : theDetUnitId(0) {}
 
-  PSimHit( const Local3DPoint& entry, const Local3DPoint& exit, 
-	   float pabs, float tof, float eloss, int particleType,
-	   unsigned int detId, unsigned int trackId,
-	   float theta, float phi, unsigned short processType=0) :
-  theEntryPoint( entry), 
-  theSegment(exit-entry),
-  thePabs(pabs), 
-  theEnergyLoss(eloss),
-  theThetaAtEntry(theta), thePhiAtEntry(phi),
-  theTof(tof), 
-  theParticleType(particleType), theProcessType(processType),
-  theDetUnitId( detId), theTrackId( trackId) 
-{}
-
-  /// Entry point in the local Det frame 
-  Local3DPoint entryPoint()    const {return theEntryPoint;}
-
-  /// Exit point in the local Det frame 
-  Local3DPoint exitPoint()     const {return theEntryPoint + theSegment;}
+  PSimHit(const Local3DPoint& entry,
+          const Local3DPoint& exit,
+          float pabs,
+          float tof,
+          float eloss,
+          int particleType,
+          unsigned int detId,
+          unsigned int trackId,
+          float theta,
+          float phi,
+          unsigned short processType = 0)
+      : theEntryPoint(entry),
+        theSegment(exit - entry),
+        thePabs(pabs),
+        theEnergyLoss(eloss),
+        theThetaAtEntry(theta),
+        thePhiAtEntry(phi),
+        theTof(tof),
+        theParticleType(particleType),
+        theProcessType(processType),
+        theDetUnitId(detId),
+        theTrackId(trackId) {}
+
+  /// Entry point in the local Det frame
+  Local3DPoint entryPoint() const { return theEntryPoint; }
+
+  /// Exit point in the local Det frame
+  Local3DPoint exitPoint() const { return theEntryPoint + theSegment; }
 
   /** Local position in the Det frame.
    *  Normally it is on the detection surface, but this is not
    *  checked. It is computed as the middle point between entry and exit.
    */
-  Local3DPoint localPosition() const {return theEntryPoint + 0.5*theSegment;}
+  Local3DPoint localPosition() const { return theEntryPoint + 0.5 * theSegment; }
 
   /// The momentum of the track that produced the hit, at entry point.
-  LocalVector momentumAtEntry() const {
-    return LocalVector( thetaAtEntry(), phiAtEntry(), pabs());
-  }
+  LocalVector momentumAtEntry() const { return LocalVector(thetaAtEntry(), phiAtEntry(), pabs()); }
 
   /// Obsolete. Same as momentumAtEntry().unit(), for backward compatibility.
-  LocalVector  localDirection()  const {
-    return LocalVector( thetaAtEntry(), phiAtEntry(), 1.f);
-  }
+  LocalVector localDirection() const { return LocalVector(thetaAtEntry(), phiAtEntry(), 1.f); }
 
   /// fast and more accurate access to momentumAtEntry().theta()
-  Geom::Theta<float> thetaAtEntry() const { return Geom::Theta<float>(theThetaAtEntry);}
+  Geom::Theta<float> thetaAtEntry() const { return Geom::Theta<float>(theThetaAtEntry); }
 
   /// fast and more accurate access to momentumAtEntry().phi()
-  Geom::Phi<float>   phiAtEntry()   const { return Geom::Phi<float>(thePhiAtEntry);}
+  Geom::Phi<float> phiAtEntry() const { return Geom::Phi<float>(thePhiAtEntry); }
 
   /// fast and more accurate access to momentumAtEntry().mag()
-  float        pabs()         const {return thePabs;}
+  float pabs() const { return thePabs; }
 
   /** Time of flight in nanoseconds from the primary interaction
    *  to the entry point. Always positive in a PSimHit,
    *  but may become negative in a SimHit due to bunch assignment.
    */
-  float        timeOfFlight() const {return tof();}
+  float timeOfFlight() const { return tof(); }
 
   /// deprecated name for timeOfFlight()
-  float        tof()          const {return theTof;}
+  float tof() const { return theTof; }
 
   /// The energy deposit in the PSimHit, in ???.
-  float        energyLoss()   const {return theEnergyLoss;}
+  float energyLoss() const { return theEnergyLoss; }
 
   /** The particle type of the track that produced this hit,
    *  in standard PDG code. 
@@ -82,7 +86,7 @@ class PSimHit {
    *  by a secondary track (e.g. a delta ray) originating from the 
    *  trackId() and not existing as a separate SimTrack.
    */
-  int          particleType() const {return theParticleType;}
+  int particleType() const { return theParticleType; }
 
   /** The DetUnit identifier, to be interpreted in the context of the
    *  detector system that produced the hit. E.g. in the Tracker
@@ -90,7 +94,7 @@ class PSimHit {
    *  Currently the context is not deducible from the PSimHit and
    *  must be known when the PSimHit is created/accessed.
    */
-  unsigned int          detUnitId()    const {return theDetUnitId;}
+  unsigned int detUnitId() const { return theDetUnitId; }
 
   /** The SimTrack ID of the "mother" track. This may be the actual
    *  charged track that produced the hit, or a "mother" of this
@@ -99,11 +103,9 @@ class PSimHit {
    *  This ID must be interpreted in the context of the SimEvent
    *  to which the PSimHit belongs.
    */
-  unsigned int trackId()      const {return theTrackId;}
-
-
-  EncodedEventId eventId()      const {return theEventId;}
+  unsigned int trackId() const { return theTrackId; }
 
+  EncodedEventId eventId() const { return theEventId; }
 
   void setEventId(EncodedEventId e) { theEventId = e; }
 
@@ -115,34 +117,32 @@ class PSimHit {
    *  value with special significance is zero (for "undefined"), so zero should
    *  not be the ID of any process.
    */
-  unsigned short processType() const {return theProcessType;}
-
+  unsigned short processType() const { return theProcessType; }
 
-  void setTof(float tof) {theTof=tof;}
+  void setTof(float tof) { theTof = tof; }
 
 protected:
-  
   // properties
-  Local3DPoint    theEntryPoint;    // position at entry
-  Local3DVector   theSegment;       // exitPos - entryPos
-  float           thePabs;          // momentum
-  float           theEnergyLoss;    // Energy loss
-  float           theThetaAtEntry;
-  float           thePhiAtEntry;
-
-  float           theTof;           // Time Of Flight 
-  int             theParticleType;
-  unsigned short  theProcessType;   // ID of the process which created the track
-                                    // which created the PSimHit
+  Local3DPoint theEntryPoint;  // position at entry
+  Local3DVector theSegment;    // exitPos - entryPos
+  float thePabs;               // momentum
+  float theEnergyLoss;         // Energy loss
+  float theThetaAtEntry;
+  float thePhiAtEntry;
+
+  float theTof;  // Time Of Flight
+  int theParticleType;
+  unsigned short theProcessType;  // ID of the process which created the track
+                                  // which created the PSimHit
 
   // association
-  unsigned int    theDetUnitId;
-  unsigned int    theTrackId;
-  EncodedEventId  theEventId;
+  unsigned int theDetUnitId;
+  unsigned int theTrackId;
+  EncodedEventId theEventId;
 
   friend class TrackingSlaveSD;
 };
 
-std::ostream & operator<<(std::ostream & o, const PSimHit & hit); 
+std::ostream& operator<<(std::ostream& o, const PSimHit& hit);
 
-#endif // PSimHit_H
+#endif  // PSimHit_H
diff --git a/SimDataFormats/TrackingHit/interface/PSimHitContainer.h b/SimDataFormats/TrackingHit/interface/PSimHitContainer.h
index 2a391cee022fd..1ba4a29aadc08 100644
--- a/SimDataFormats/TrackingHit/interface/PSimHitContainer.h
+++ b/SimDataFormats/TrackingHit/interface/PSimHitContainer.h
@@ -5,20 +5,18 @@
 #include "DataFormats/Common/interface/Ref.h"
 #include "DataFormats/Common/interface/RefProd.h"
 #include <vector>
-#include "DataFormats/Common/interface/RefToBase.h" 
+#include "DataFormats/Common/interface/RefToBase.h"
 
 namespace edm {
-      typedef std::vector<PSimHit> PSimHitContainer;
-} // edm
+  typedef std::vector<PSimHit> PSimHitContainer;
+}  // namespace edm
 
-typedef edm::Ref<edm::PSimHitContainer> TrackPSimHitRef;         
+typedef edm::Ref<edm::PSimHitContainer> TrackPSimHitRef;
 typedef edm::RefProd<edm::PSimHitContainer> TrackPSimHitRefProd;
 
-
 typedef std::vector<edm::RefToBase<PSimHit> > TrackPSimHitRefToBaseVector;
 typedef edm::RefToBase<PSimHit> TrackPSimHitRefToBase;
 typedef std::vector<edm::RefToBase<PSimHit> > TrackPSimHitRefToBaseVector;
 typedef edm::reftobase::Holder<PSimHit, TrackPSimHitRef> TrackPSimHitRefToBaseHolder;
 
-#endif 
-
+#endif
diff --git a/SimDataFormats/TrackingHit/interface/UpdatablePSimHit.h b/SimDataFormats/TrackingHit/interface/UpdatablePSimHit.h
index 917dba756e648..6c0dfead3e5d5 100644
--- a/SimDataFormats/TrackingHit/interface/UpdatablePSimHit.h
+++ b/SimDataFormats/TrackingHit/interface/UpdatablePSimHit.h
@@ -9,30 +9,31 @@
 
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 
-class UpdatablePSimHit : public PSimHit 
-{
+class UpdatablePSimHit : public PSimHit {
 public:
-    UpdatablePSimHit() : PSimHit() {}
-    UpdatablePSimHit(const Local3DPoint & entry, const Local3DPoint & exit, 
-		     float pabs, float tof, float eloss, int particleType,
-		     unsigned int detId, unsigned int trackId, float theta, 
-		     float phi, unsigned short processType=0) 
-	: PSimHit(entry, exit, pabs, tof, eloss, particleType,
-		  detId, trackId, theta, phi,processType) {}
-    ~UpdatablePSimHit(){};  
-    void updateExitPoint(const Local3DPoint & exit)
-    { theSegment=exit-theEntryPoint; }
-    void setExitPoint(const Local3DPoint& exit) 
-    { updateExitPoint(exit); }
-    void setEntryPoint(const Local3DPoint& entry)
-    {
-	theSegment = theSegment+theEntryPoint-entry;
-	theEntryPoint = entry;
-    }
-    void addEnergyLoss(float eloss) { theEnergyLoss += eloss; }
-    void setEnergyLoss(float eloss) { theEnergyLoss = eloss; }
-    void setTrackId(unsigned int k) { theTrackId = k; }
+  UpdatablePSimHit() : PSimHit() {}
+  UpdatablePSimHit(const Local3DPoint& entry,
+                   const Local3DPoint& exit,
+                   float pabs,
+                   float tof,
+                   float eloss,
+                   int particleType,
+                   unsigned int detId,
+                   unsigned int trackId,
+                   float theta,
+                   float phi,
+                   unsigned short processType = 0)
+      : PSimHit(entry, exit, pabs, tof, eloss, particleType, detId, trackId, theta, phi, processType) {}
+  ~UpdatablePSimHit(){};
+  void updateExitPoint(const Local3DPoint& exit) { theSegment = exit - theEntryPoint; }
+  void setExitPoint(const Local3DPoint& exit) { updateExitPoint(exit); }
+  void setEntryPoint(const Local3DPoint& entry) {
+    theSegment = theSegment + theEntryPoint - entry;
+    theEntryPoint = entry;
+  }
+  void addEnergyLoss(float eloss) { theEnergyLoss += eloss; }
+  void setEnergyLoss(float eloss) { theEnergyLoss = eloss; }
+  void setTrackId(unsigned int k) { theTrackId = k; }
 };
 
 #endif
-
diff --git a/SimDataFormats/TrackingHit/src/PSimHit.cc b/SimDataFormats/TrackingHit/src/PSimHit.cc
index 31cc1d57e0a98..24315d8ab30bb 100644
--- a/SimDataFormats/TrackingHit/src/PSimHit.cc
+++ b/SimDataFormats/TrackingHit/src/PSimHit.cc
@@ -1,6 +1,6 @@
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include <ostream>
 
-std::ostream & operator<<(std::ostream & o, const PSimHit & hit) 
-{ return o << hit.detUnitId() << " " << hit.entryPoint() << " " << hit.tof(); }
-
+std::ostream& operator<<(std::ostream& o, const PSimHit& hit) {
+  return o << hit.detUnitId() << " " << hit.entryPoint() << " " << hit.tof();
+}
diff --git a/SimDataFormats/TrackingHit/src/classes.h b/SimDataFormats/TrackingHit/src/classes.h
index 0b98232ae26a5..591d75adf22f0 100644
--- a/SimDataFormats/TrackingHit/src/classes.h
+++ b/SimDataFormats/TrackingHit/src/classes.h
@@ -1,4 +1,3 @@
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include "DataFormats/Common/interface/Wrapper.h"
-
diff --git a/SimDataFormats/ValidationFormats/interface/MaterialAccountingDetector.h b/SimDataFormats/ValidationFormats/interface/MaterialAccountingDetector.h
index 07c6112da1566..c40978b6849f0 100644
--- a/SimDataFormats/ValidationFormats/interface/MaterialAccountingDetector.h
+++ b/SimDataFormats/ValidationFormats/interface/MaterialAccountingDetector.h
@@ -17,54 +17,42 @@ class MaterialAccountingDetector {
   friend class TrackingMaterialAnalyser;
 
 public:
-  MaterialAccountingDetector( void ) :
-    m_position         (),
-    m_curvilinearIn    ( 0. ),
-    m_curvilinearOut   ( 0. ),
-    m_cosThetaIn       ( 0. ),
-    m_cosThetaOut      ( 0. ),
-    m_accounting       ()
-  { }
-  
-  void clear( void ) {
-    m_position         = GlobalPoint(),
-    m_curvilinearIn    = 0.;
-    m_curvilinearOut   = 0.;
-    m_cosThetaIn       = 0.;
-    m_cosThetaOut      = 0.;
+  MaterialAccountingDetector(void)
+      : m_position(), m_curvilinearIn(0.), m_curvilinearOut(0.), m_cosThetaIn(0.), m_cosThetaOut(0.), m_accounting() {}
+
+  void clear(void) {
+    m_position = GlobalPoint(), m_curvilinearIn = 0.;
+    m_curvilinearOut = 0.;
+    m_cosThetaIn = 0.;
+    m_cosThetaOut = 0.;
     m_accounting.clear();
   }
 
-  const GlobalPoint & position() const {
-    return m_position;
-  }
+  const GlobalPoint& position() const { return m_position; }
 
-  const MaterialAccountingStep & material() const {
-    return m_accounting;
-  }
+  const MaterialAccountingStep& material() const { return m_accounting; }
 
   // step holds the length and material infos for a step
   // begin and end are the curviliniear coordinates
-  void account( const MaterialAccountingStep & step, double begin, double end )
-  {
+  void account(const MaterialAccountingStep& step, double begin, double end) {
     if (end <= m_curvilinearIn)
       // step before detector
       m_accounting += m_cosThetaIn * step;
     else if (begin >= m_curvilinearOut)
       // step after detector
-       m_accounting += m_cosThetaOut * step;
+      m_accounting += m_cosThetaOut * step;
     else
       // step inside detector
-      m_accounting += (m_cosThetaIn + m_cosThetaOut ) / 2. * step;
+      m_accounting += (m_cosThetaIn + m_cosThetaOut) / 2. * step;
   }
-  
-private:  
-  GlobalPoint m_position;                       // roughly the center of the detector
-  double m_curvilinearIn;                       // beginning of detector coordinate along the track 
-  double m_curvilinearOut;                      // end of detector coordinate along the track 
+
+private:
+  GlobalPoint m_position;   // roughly the center of the detector
+  double m_curvilinearIn;   // beginning of detector coordinate along the track
+  double m_curvilinearOut;  // end of detector coordinate along the track
   double m_cosThetaIn;
   double m_cosThetaOut;
   MaterialAccountingStep m_accounting;
 };
 
-#endif // MaterialAccountingDetector_h
+#endif  // MaterialAccountingDetector_h
diff --git a/SimDataFormats/ValidationFormats/interface/MaterialAccountingStep.h b/SimDataFormats/ValidationFormats/interface/MaterialAccountingStep.h
index 40ccb8290483c..dafaa88557eea 100644
--- a/SimDataFormats/ValidationFormats/interface/MaterialAccountingStep.h
+++ b/SimDataFormats/ValidationFormats/interface/MaterialAccountingStep.h
@@ -8,31 +8,20 @@
 // TODO split segment info (in, out) into separate child class
 class MaterialAccountingStep {
 public:
-  MaterialAccountingStep( void ) :
-    m_length(0.),
-    m_radiationLengths(0.),
-    m_energyLoss(0.),
-    m_in(),
-    m_out() 
-  { }
-
-  MaterialAccountingStep( double position, double radlen, double loss, const GlobalPoint & in, const GlobalPoint & out ) :
-    m_length( position ),
-    m_radiationLengths( radlen ),
-    m_energyLoss( loss ),
-    m_in( in ),
-    m_out( out )
-  { }
- 
-  void clear( void ) {
-    m_length           = 0.;
+  MaterialAccountingStep(void) : m_length(0.), m_radiationLengths(0.), m_energyLoss(0.), m_in(), m_out() {}
+
+  MaterialAccountingStep(double position, double radlen, double loss, const GlobalPoint& in, const GlobalPoint& out)
+      : m_length(position), m_radiationLengths(radlen), m_energyLoss(loss), m_in(in), m_out(out) {}
+
+  void clear(void) {
+    m_length = 0.;
     m_radiationLengths = 0.;
-    m_energyLoss       = 0.;
-    m_in               = GlobalPoint();
-    m_out              = GlobalPoint();
+    m_energyLoss = 0.;
+    m_in = GlobalPoint();
+    m_out = GlobalPoint();
   }
 
-private:  
+private:
   double m_length;
   double m_radiationLengths;
   double m_energyLoss;
@@ -40,64 +29,46 @@ class MaterialAccountingStep {
   GlobalPoint m_out;
 
 public:
-  double length(void) const {
-    return m_length;
-  }
-  
-  double radiationLengths(void) const {
-    return m_radiationLengths;
-  }
-  
-  double energyLoss(void) const {
-    return m_energyLoss;
-  }
+  double length(void) const { return m_length; }
+
+  double radiationLengths(void) const { return m_radiationLengths; }
+
+  double energyLoss(void) const { return m_energyLoss; }
+
+  const GlobalPoint& in(void)const { return m_in; }
+
+  const GlobalPoint& out(void) const { return m_out; }
 
-  const GlobalPoint & in(void) const {
-    return m_in;
-  }
-  
-  const GlobalPoint & out(void) const {
-    return m_out;
-  }
-  
   /// split the step (0..1) in (0..f) + (f..1) using linear interpolation
-  std::pair<MaterialAccountingStep, MaterialAccountingStep> split( double fraction ) const {
+  std::pair<MaterialAccountingStep, MaterialAccountingStep> split(double fraction) const {
     // no check is done to ensure that 0 <= f <= 1 !
-    GlobalPoint limit(
-        m_in.x() * fraction + m_out.x()  * (1. - fraction),
-        m_in.y() * fraction + m_out.y()  * (1. - fraction),
-        m_in.z() * fraction + m_out.z()  * (1. - fraction)
-    );
-
-    MaterialAccountingStep part1( fraction * m_length,
-                                  fraction * m_radiationLengths,
-                                  fraction * m_energyLoss,
-                                  m_in,
-                                  limit );
-
-    MaterialAccountingStep part2( (1 - fraction) * m_length,
-                                  (1 - fraction) * m_radiationLengths,
-                                  (1 - fraction) * m_energyLoss,
-                                  limit,
-                                  m_out );
-    return std::make_pair( part1, part2 );
+    GlobalPoint limit(m_in.x() * fraction + m_out.x() * (1. - fraction),
+                      m_in.y() * fraction + m_out.y() * (1. - fraction),
+                      m_in.z() * fraction + m_out.z() * (1. - fraction));
+
+    MaterialAccountingStep part1(
+        fraction * m_length, fraction * m_radiationLengths, fraction * m_energyLoss, m_in, limit);
+
+    MaterialAccountingStep part2(
+        (1 - fraction) * m_length, (1 - fraction) * m_radiationLengths, (1 - fraction) * m_energyLoss, limit, m_out);
+    return std::make_pair(part1, part2);
   }
-    
+
   /// assignement operator
-  MaterialAccountingStep & operator=( const MaterialAccountingStep & step ) {
-    m_length           = step.m_length;
+  MaterialAccountingStep& operator=(const MaterialAccountingStep& step) {
+    m_length = step.m_length;
     m_radiationLengths = step.m_radiationLengths;
-    m_energyLoss       = step.m_energyLoss;
-    m_in               = step.m_in;
-    m_out              = step.m_out;
+    m_energyLoss = step.m_energyLoss;
+    m_in = step.m_in;
+    m_out = step.m_out;
     return *this;
   }
-  
+
   /// add a step
-  MaterialAccountingStep & operator+=( const MaterialAccountingStep & step ) {
-    m_length           += step.m_length;
+  MaterialAccountingStep& operator+=(const MaterialAccountingStep& step) {
+    m_length += step.m_length;
     m_radiationLengths += step.m_radiationLengths;
-    m_energyLoss       += step.m_energyLoss;
+    m_energyLoss += step.m_energyLoss;
 
     // assume that perp2 is 0 only for uninitialized steps
     if ((m_in.perp2() == 0.0) or (step.m_in.perp2() < m_in.perp2()))
@@ -105,15 +76,15 @@ class MaterialAccountingStep {
 
     if ((m_out.perp2() == 0.0) or (step.m_out.perp2() > m_out.perp2()))
       m_out = step.m_out;
-    
+
     return *this;
   }
-  
+
   /// subtract a step
-  MaterialAccountingStep & operator-=( const MaterialAccountingStep & step ) {
-    m_length           -= step.m_length;
+  MaterialAccountingStep& operator-=(const MaterialAccountingStep& step) {
+    m_length -= step.m_length;
     m_radiationLengths -= step.m_radiationLengths;
-    m_energyLoss       -= step.m_energyLoss;
+    m_energyLoss -= step.m_energyLoss;
 
     // can anything more sensible be done for m_in and/or m_out ?
     if ((step.m_in.perp2() <= m_in.perp2()) and (step.m_out.perp2() >= m_in.perp2()))
@@ -121,75 +92,69 @@ class MaterialAccountingStep {
 
     if ((step.m_out.perp2() >= m_out.perp2()) and (step.m_in.perp2() <= m_out.perp2()))
       m_out = step.m_in;
-      
+
     return *this;
   }
-  
+
   /// multiply two steps, usefull to implement (co)variance
-  MaterialAccountingStep & operator*=( const MaterialAccountingStep & step ) {
-    m_length           *= step.m_length;
+  MaterialAccountingStep& operator*=(const MaterialAccountingStep& step) {
+    m_length *= step.m_length;
     m_radiationLengths *= step.m_radiationLengths;
-    m_energyLoss       *= step.m_energyLoss;
+    m_energyLoss *= step.m_energyLoss;
     return *this;
   }
-  
+
   /// multiply by a scalar
-  MaterialAccountingStep & operator*=( double x ) {
-    m_length           *= x;
+  MaterialAccountingStep& operator*=(double x) {
+    m_length *= x;
     m_radiationLengths *= x;
-    m_energyLoss       *= x;
+    m_energyLoss *= x;
     return *this;
   }
-  
+
   /// divide by a scalar
-  MaterialAccountingStep & operator/=( double x ) {
-    m_length           /= x;
+  MaterialAccountingStep& operator/=(double x) {
+    m_length /= x;
     m_radiationLengths /= x;
-    m_energyLoss       /= x;
+    m_energyLoss /= x;
     return *this;
   }
 };
 
-inline 
-MaterialAccountingStep operator+( const MaterialAccountingStep & x, const MaterialAccountingStep & y ) {
+inline MaterialAccountingStep operator+(const MaterialAccountingStep& x, const MaterialAccountingStep& y) {
   MaterialAccountingStep step(x);
   step += y;
   return step;
 }
 
-inline 
-MaterialAccountingStep operator-( const MaterialAccountingStep & x, const MaterialAccountingStep & y ) {
+inline MaterialAccountingStep operator-(const MaterialAccountingStep& x, const MaterialAccountingStep& y) {
   MaterialAccountingStep step(x);
   step -= y;
   return step;
 }
 
-inline 
-MaterialAccountingStep operator*( const MaterialAccountingStep & x, const MaterialAccountingStep & y ) {
+inline MaterialAccountingStep operator*(const MaterialAccountingStep& x, const MaterialAccountingStep& y) {
   MaterialAccountingStep step(x);
   step *= y;
   return step;
 }
 
-inline 
-MaterialAccountingStep operator*( const MaterialAccountingStep & x, double y ) {
+inline MaterialAccountingStep operator*(const MaterialAccountingStep& x, double y) {
   MaterialAccountingStep step(x);
   step *= y;
   return step;
 }
 
-inline 
-MaterialAccountingStep operator*( double y, const MaterialAccountingStep & x ) {
+inline MaterialAccountingStep operator*(double y, const MaterialAccountingStep& x) {
   MaterialAccountingStep step(x);
   step *= y;
   return step;
 }
 
-inline 
-MaterialAccountingStep operator/( const MaterialAccountingStep & x, double y ) {
+inline MaterialAccountingStep operator/(const MaterialAccountingStep& x, double y) {
   MaterialAccountingStep step(x);
   step /= y;
   return step;
 }
 
-#endif // MaterialAccountingStep_h
+#endif  // MaterialAccountingStep_h
diff --git a/SimDataFormats/ValidationFormats/interface/MaterialAccountingTrack.h b/SimDataFormats/ValidationFormats/interface/MaterialAccountingTrack.h
index 58b7b27d82ba2..ac16bb42948d8 100644
--- a/SimDataFormats/ValidationFormats/interface/MaterialAccountingTrack.h
+++ b/SimDataFormats/ValidationFormats/interface/MaterialAccountingTrack.h
@@ -12,15 +12,9 @@ class MaterialAccountingTrack {
 private:
   // this values are optimized to avoid resizing
   enum { kSteps = 600, kDetectors = 30 };
-  
+
 public:
-  MaterialAccountingTrack(void) : 
-    m_total(),
-    m_current_volume(nullptr),
-    m_detector(),
-    m_steps(), 
-    m_detectors()
-  {
+  MaterialAccountingTrack(void) : m_total(), m_current_volume(nullptr), m_detector(), m_steps(), m_detectors() {
     m_steps.reserve(kSteps);
     m_detectors.reserve(kDetectors);
   }
@@ -30,46 +24,36 @@ class MaterialAccountingTrack {
     m_current_volume = nullptr;
     m_steps.clear();
     m_steps.reserve(kSteps);
-    m_steps.push_back( m_total );
+    m_steps.push_back(m_total);
     m_detector.clear();
     m_detectors.clear();
     m_detectors.reserve(kDetectors);
   }
- 
-  void step( const MaterialAccountingStep & step ) {
+
+  void step(const MaterialAccountingStep& step) {
     m_total += step;
-    m_steps.push_back( step );
+    m_steps.push_back(step);
   }
 
-  void enterDetector( const G4VPhysicalVolume* volume, const GlobalPoint& position, double cosTheta );
-  void leaveDetector( const G4VPhysicalVolume* volume, double cosTheta );
+  void enterDetector(const G4VPhysicalVolume* volume, const GlobalPoint& position, double cosTheta);
+  void leaveDetector(const G4VPhysicalVolume* volume, double cosTheta);
 
-  const MaterialAccountingStep& summary() const {
-    return m_total;
-  }
+  const MaterialAccountingStep& summary() const { return m_total; }
 
-  const std::vector<MaterialAccountingDetector> & detectors() const {
-    return m_detectors;
-  }
+  const std::vector<MaterialAccountingDetector>& detectors() const { return m_detectors; }
 
-  std::vector<MaterialAccountingDetector> & detectors() {
-    return m_detectors;
-  }
+  std::vector<MaterialAccountingDetector>& detectors() { return m_detectors; }
 
-  const std::vector<MaterialAccountingStep> & steps() const {
-    return m_steps;
-  }
-  
-  std::vector<MaterialAccountingStep> & steps() {
-    return m_steps;
-  }
+  const std::vector<MaterialAccountingStep>& steps() const { return m_steps; }
+
+  std::vector<MaterialAccountingStep>& steps() { return m_steps; }
 
 private:
-  MaterialAccountingStep                    m_total;            // cache position along track (length and material)
-  const G4VPhysicalVolume *                 m_current_volume;   // keep track of current G4 volume
-  MaterialAccountingDetector                m_detector;         // keep track of current detector
-  std::vector<MaterialAccountingStep>       m_steps;
-  std::vector<MaterialAccountingDetector>   m_detectors;
+  MaterialAccountingStep m_total;             // cache position along track (length and material)
+  const G4VPhysicalVolume* m_current_volume;  // keep track of current G4 volume
+  MaterialAccountingDetector m_detector;      // keep track of current detector
+  std::vector<MaterialAccountingStep> m_steps;
+  std::vector<MaterialAccountingDetector> m_detectors;
 };
 
-#endif // MaterialAccountingTrack_h
+#endif  // MaterialAccountingTrack_h
diff --git a/SimDataFormats/ValidationFormats/interface/PHGCalValidInfo.h b/SimDataFormats/ValidationFormats/interface/PHGCalValidInfo.h
index 15d938b70225e..e3cd6f2a52068 100644
--- a/SimDataFormats/ValidationFormats/interface/PHGCalValidInfo.h
+++ b/SimDataFormats/ValidationFormats/interface/PHGCalValidInfo.h
@@ -10,43 +10,41 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 class PHGCalValidInfo {
-
 public:
-
   PHGCalValidInfo() : edepEETot(0.0), edepHEFTot(0.0), edepHEBTot(0.0) {}
   virtual ~PHGCalValidInfo() {}
 
-  float		            eeTotEdep()   const {return edepEETot;}
-  float		            hefTotEdep()  const {return edepHEFTot;}
-  float		            hebTotEdep()  const {return edepHEBTot;}
-
-  std::vector<float>        eehgcEdep()   const {return hgcEEedep;}
-  std::vector<float>        hefhgcEdep()  const {return hgcHEFedep;}
-  std::vector<float>        hebhgcEdep()  const {return hgcHEBedep;}
-  std::vector<unsigned int> hitDets()     const {return hgcHitDets;}
-  std::vector<unsigned int> hitIndex()    const {return hgcHitIndex;}
-  std::vector<float>        hitvtxX()     const {return hgcHitVtxX;} 
-  std::vector<float>        hitvtxY()     const {return hgcHitVtxY;} 
-  std::vector<float>        hitvtxZ()     const {return hgcHitVtxZ;} 
-
-  void fillhgcHits(const std::vector<unsigned int> & hitdets,
-		   const std::vector<unsigned int> & hitindex,
-		   const std::vector<double> & hitvtxX, 
-		   const std::vector<double> & hitvtxY, 
-		   const std::vector<double> & hitvtxZ);
-
-  void fillhgcLayers(const double edepEE, const double edepHEF, 
-		     const double edepHEB, const std::vector<double> & eedep, 
-		     const std::vector<double> & hefdep,
-		     const std::vector<double> & hebdep);
+  float eeTotEdep() const { return edepEETot; }
+  float hefTotEdep() const { return edepHEFTot; }
+  float hebTotEdep() const { return edepHEBTot; }
+
+  std::vector<float> eehgcEdep() const { return hgcEEedep; }
+  std::vector<float> hefhgcEdep() const { return hgcHEFedep; }
+  std::vector<float> hebhgcEdep() const { return hgcHEBedep; }
+  std::vector<unsigned int> hitDets() const { return hgcHitDets; }
+  std::vector<unsigned int> hitIndex() const { return hgcHitIndex; }
+  std::vector<float> hitvtxX() const { return hgcHitVtxX; }
+  std::vector<float> hitvtxY() const { return hgcHitVtxY; }
+  std::vector<float> hitvtxZ() const { return hgcHitVtxZ; }
+
+  void fillhgcHits(const std::vector<unsigned int>& hitdets,
+                   const std::vector<unsigned int>& hitindex,
+                   const std::vector<double>& hitvtxX,
+                   const std::vector<double>& hitvtxY,
+                   const std::vector<double>& hitvtxZ);
+
+  void fillhgcLayers(const double edepEE,
+                     const double edepHEF,
+                     const double edepHEB,
+                     const std::vector<double>& eedep,
+                     const std::vector<double>& hefdep,
+                     const std::vector<double>& hebdep);
 
 private:
-
-  float		            edepEETot, edepHEFTot, edepHEBTot;
-  std::vector<float>        hgcEEedep, hgcHEFedep, hgcHEBedep;
-  std::vector<float>        hgcHitVtxX, hgcHitVtxY, hgcHitVtxZ;
+  float edepEETot, edepHEFTot, edepHEBTot;
+  std::vector<float> hgcEEedep, hgcHEFedep, hgcHEBedep;
+  std::vector<float> hgcHitVtxX, hgcHitVtxY, hgcHitVtxZ;
   std::vector<unsigned int> hgcHitDets, hgcHitIndex;
-
 };
 
 #endif
diff --git a/SimDataFormats/ValidationFormats/interface/PValidationFormats.h b/SimDataFormats/ValidationFormats/interface/PValidationFormats.h
index cd50d7ef54c2a..3c7857baf9e77 100644
--- a/SimDataFormats/ValidationFormats/interface/PValidationFormats.h
+++ b/SimDataFormats/ValidationFormats/interface/PValidationFormats.h
@@ -17,35 +17,39 @@
 #include <vector>
 #include <memory>
 
-class PGlobalSimHit
-{
-
- public:
-
-  PGlobalSimHit(): nRawGenPart(0), nG4Vtx(0), nG4Trk(0),  
-    nECalHits(0), nPreShHits(0), nHCalHits(0), nPxlFwdHits(0),
-    nPxlBrlHits(0), nSiFwdHits(0), nSiBrlHits(0),
-    nMuonDtHits(0), nMuonCscHits(0), nMuonRpcFwdHits(0),
-    nMuonRpcBrlHits(0) {}
-  virtual ~PGlobalSimHit(){}
-
-  struct Vtx
-  {
-    Vtx(): x(0), y(0), z(0) {}
+class PGlobalSimHit {
+public:
+  PGlobalSimHit()
+      : nRawGenPart(0),
+        nG4Vtx(0),
+        nG4Trk(0),
+        nECalHits(0),
+        nPreShHits(0),
+        nHCalHits(0),
+        nPxlFwdHits(0),
+        nPxlBrlHits(0),
+        nSiFwdHits(0),
+        nSiBrlHits(0),
+        nMuonDtHits(0),
+        nMuonCscHits(0),
+        nMuonRpcFwdHits(0),
+        nMuonRpcBrlHits(0) {}
+  virtual ~PGlobalSimHit() {}
+
+  struct Vtx {
+    Vtx() : x(0), y(0), z(0) {}
     float x;
     float y;
     float z;
   };
 
-  struct Trk
-  {
+  struct Trk {
     Trk() : pt(0), e(0) {}
     float pt;
     float e;
   };
 
-  struct CalHit
-  {
+  struct CalHit {
     CalHit() : e(0), tof(0), phi(0), eta(0) {}
     float e;
     float tof;
@@ -53,8 +57,7 @@ class PGlobalSimHit
     float eta;
   };
 
-  struct FwdHit
-  {
+  struct FwdHit {
     FwdHit() : tof(0), z(0), phi(0), eta(0) {}
     float tof;
     float z;
@@ -62,8 +65,7 @@ class PGlobalSimHit
     float eta;
   };
 
-  struct BrlHit
-  {
+  struct BrlHit {
     BrlHit() : tof(0), r(0), phi(0), eta(0) {}
     float tof;
     float r;
@@ -79,74 +81,94 @@ class PGlobalSimHit
 
   // put functions
   void putRawGenPart(int n);
-  void putG4Vtx(const std::vector<float>& x, const std::vector<float>& y, 
-		 const std::vector<float>& z);
+  void putG4Vtx(const std::vector<float>& x, const std::vector<float>& y, const std::vector<float>& z);
   void putG4Trk(const std::vector<float>& pt, const std::vector<float>& e);
-  void putECalHits(const std::vector<float>& e, const std::vector<float>& tof,
-		    const std::vector<float>& phi, const std::vector<float>& eta);
-  void putPreShHits(const std::vector<float>& e, const std::vector<float>& tof,
-		     const std::vector<float>& phi, const std::vector<float>& eta);
-  void putHCalHits(const std::vector<float>& e, const std::vector<float>& tof,
-		    const std::vector<float>& phi, const std::vector<float>& eta);
-  void putPxlFwdHits(const std::vector<float>& tof, const std::vector<float>& z,
-		       const std::vector<float>& phi, const std::vector<float>& eta);
-  void putPxlBrlHits(const std::vector<float>& tof, const std::vector<float>& r,
-		      const std::vector<float>& phi, const std::vector<float>& eta);
-  void putSiFwdHits(const std::vector<float>& tof, const std::vector<float>& z,
-		      const std::vector<float>& phi, const std::vector<float>& eta);
-  void putSiBrlHits(const std::vector<float>& tof, const std::vector<float>& r,
-		     const std::vector<float>& phi, const std::vector<float>& eta);
-  void putMuonCscHits(const std::vector<float>& tof, const std::vector<float>& z,
-		       const std::vector<float>& phi, const std::vector<float>& eta);
-  void putMuonDtHits(const std::vector<float>& tof, const std::vector<float>& r,
-		      const std::vector<float>& phi, const std::vector<float>& eta);
-  void putMuonRpcFwdHits(const std::vector<float>& tof, const std::vector<float>& z,
-			   const std::vector<float>& phi, const std::vector<float>& eta);
-  void putMuonRpcBrlHits(const std::vector<float>& tof, const std::vector<float>& r,
-			  const std::vector<float>& phi, const std::vector<float>& eta);  
-
-  int getnRawGenPart() const {return nRawGenPart;}
-  int getnG4Vtx() const {return nG4Vtx;}
-  VtxVector getG4Vtx() const {return G4Vtx;}
-  int getnG4Trk() const {return nG4Trk;}
-  TrkVector getG4Trk() const {return G4Trk;}
-  int getnECalHits() const {return nECalHits;}
-  CalVector getECalHits() const {return ECalHits;}
-  int getnPreShHits() const {return nPreShHits;}
-  CalVector getPreShHits() const {return PreShHits;}
-  int getnHCalHits() const {return nHCalHits;}
-  CalVector getHCalHits() const {return HCalHits;}
-  int getnPxlFwdHits() const {return nPxlFwdHits;}
-  FwdVector getPxlFwdHits() const {return PxlFwdHits;}
-  int getnPxlBrlHits() const {return nPxlBrlHits;}
-  BrlVector getPxlBrlHits() const {return PxlBrlHits;}
-  int getnSiFwdHits() const {return nSiFwdHits;}
-  FwdVector getSiFwdHits() const {return SiFwdHits;}
-  int getnSiBrlHits() const {return nSiBrlHits;}
-  BrlVector getSiBrlHits() const {return SiBrlHits;}  
-  int getnMuonDtHits() const {return nMuonDtHits;}
-  BrlVector getMuonDtHits() const {return MuonDtHits;}
-  int getnMuonCscHits() const {return nMuonCscHits;}
-  FwdVector getMuonCscHits() const {return MuonCscHits;}
-  int getnMuonRpcFwdHits() const {return nMuonRpcFwdHits;}
-  FwdVector getMuonRpcFwdHits() const {return MuonRpcFwdHits;}
-  int getnMuonRpcBrlHits() const {return nMuonRpcBrlHits;}
-  BrlVector getMuonRpcBrlHits() const {return MuonRpcBrlHits;}  
-
- private:
+  void putECalHits(const std::vector<float>& e,
+                   const std::vector<float>& tof,
+                   const std::vector<float>& phi,
+                   const std::vector<float>& eta);
+  void putPreShHits(const std::vector<float>& e,
+                    const std::vector<float>& tof,
+                    const std::vector<float>& phi,
+                    const std::vector<float>& eta);
+  void putHCalHits(const std::vector<float>& e,
+                   const std::vector<float>& tof,
+                   const std::vector<float>& phi,
+                   const std::vector<float>& eta);
+  void putPxlFwdHits(const std::vector<float>& tof,
+                     const std::vector<float>& z,
+                     const std::vector<float>& phi,
+                     const std::vector<float>& eta);
+  void putPxlBrlHits(const std::vector<float>& tof,
+                     const std::vector<float>& r,
+                     const std::vector<float>& phi,
+                     const std::vector<float>& eta);
+  void putSiFwdHits(const std::vector<float>& tof,
+                    const std::vector<float>& z,
+                    const std::vector<float>& phi,
+                    const std::vector<float>& eta);
+  void putSiBrlHits(const std::vector<float>& tof,
+                    const std::vector<float>& r,
+                    const std::vector<float>& phi,
+                    const std::vector<float>& eta);
+  void putMuonCscHits(const std::vector<float>& tof,
+                      const std::vector<float>& z,
+                      const std::vector<float>& phi,
+                      const std::vector<float>& eta);
+  void putMuonDtHits(const std::vector<float>& tof,
+                     const std::vector<float>& r,
+                     const std::vector<float>& phi,
+                     const std::vector<float>& eta);
+  void putMuonRpcFwdHits(const std::vector<float>& tof,
+                         const std::vector<float>& z,
+                         const std::vector<float>& phi,
+                         const std::vector<float>& eta);
+  void putMuonRpcBrlHits(const std::vector<float>& tof,
+                         const std::vector<float>& r,
+                         const std::vector<float>& phi,
+                         const std::vector<float>& eta);
+
+  int getnRawGenPart() const { return nRawGenPart; }
+  int getnG4Vtx() const { return nG4Vtx; }
+  VtxVector getG4Vtx() const { return G4Vtx; }
+  int getnG4Trk() const { return nG4Trk; }
+  TrkVector getG4Trk() const { return G4Trk; }
+  int getnECalHits() const { return nECalHits; }
+  CalVector getECalHits() const { return ECalHits; }
+  int getnPreShHits() const { return nPreShHits; }
+  CalVector getPreShHits() const { return PreShHits; }
+  int getnHCalHits() const { return nHCalHits; }
+  CalVector getHCalHits() const { return HCalHits; }
+  int getnPxlFwdHits() const { return nPxlFwdHits; }
+  FwdVector getPxlFwdHits() const { return PxlFwdHits; }
+  int getnPxlBrlHits() const { return nPxlBrlHits; }
+  BrlVector getPxlBrlHits() const { return PxlBrlHits; }
+  int getnSiFwdHits() const { return nSiFwdHits; }
+  FwdVector getSiFwdHits() const { return SiFwdHits; }
+  int getnSiBrlHits() const { return nSiBrlHits; }
+  BrlVector getSiBrlHits() const { return SiBrlHits; }
+  int getnMuonDtHits() const { return nMuonDtHits; }
+  BrlVector getMuonDtHits() const { return MuonDtHits; }
+  int getnMuonCscHits() const { return nMuonCscHits; }
+  FwdVector getMuonCscHits() const { return MuonCscHits; }
+  int getnMuonRpcFwdHits() const { return nMuonRpcFwdHits; }
+  FwdVector getMuonRpcFwdHits() const { return MuonRpcFwdHits; }
+  int getnMuonRpcBrlHits() const { return nMuonRpcBrlHits; }
+  BrlVector getMuonRpcBrlHits() const { return MuonRpcBrlHits; }
 
+private:
   // G4MC info
   int nRawGenPart;
   int nG4Vtx;
-  VtxVector G4Vtx; 
-  int nG4Trk; 
-  TrkVector G4Trk; 
+  VtxVector G4Vtx;
+  int nG4Trk;
+  TrkVector G4Trk;
 
   // ECal info
   int nECalHits;
-  CalVector ECalHits; 
+  CalVector ECalHits;
   int nPreShHits;
-  CalVector PreShHits; 
+  CalVector PreShHits;
 
   // HCal info
   int nHCalHits;
@@ -154,13 +176,13 @@ class PGlobalSimHit
 
   // Tracker info
   int nPxlFwdHits;
-  FwdVector PxlFwdHits; 
+  FwdVector PxlFwdHits;
   int nPxlBrlHits;
   BrlVector PxlBrlHits;
   int nSiFwdHits;
-  FwdVector SiFwdHits; 
+  FwdVector SiFwdHits;
   int nSiBrlHits;
-  BrlVector SiBrlHits;  
+  BrlVector SiBrlHits;
 
   // Muon info
   int nMuonDtHits;
@@ -168,13 +190,13 @@ class PGlobalSimHit
   int nMuonCscHits;
   FwdVector MuonCscHits;
   int nMuonRpcFwdHits;
-  FwdVector MuonRpcFwdHits;  
+  FwdVector MuonRpcFwdHits;
   int nMuonRpcBrlHits;
   BrlVector MuonRpcBrlHits;
 
-}; // end class declaration
+};  // end class declaration
 
-#endif // endif PGlobalHit_h
+#endif  // endif PGlobalHit_h
 
 ///////////////////////////////////////////////////////////////////////////////
 // PGlobalDigi
@@ -183,64 +205,88 @@ class PGlobalSimHit
 #ifndef PGlobalDigi_h
 #define PGlobalDigi_h
 
-class PGlobalDigi
-{
- public:
-
-  PGlobalDigi(): nEBCalDigis(0), nEECalDigis(0), nESCalDigis(0),
-    nHBCalDigis(0), nHECalDigis(0), nHOCalDigis(0), nHFCalDigis(0),
-    nTIBL1Digis(0), nTIBL2Digis(0), nTIBL3Digis(0), nTIBL4Digis(0),
-    nTOBL1Digis(0), nTOBL2Digis(0), nTOBL3Digis(0), nTOBL4Digis(0),
-    nTIDW1Digis(0), nTIDW2Digis(0), nTIDW3Digis(0),
-    nTECW1Digis(0), nTECW2Digis(0), nTECW3Digis(0), nTECW4Digis(0), 
-    nTECW5Digis(0), nTECW6Digis(0), nTECW7Digis(0), nTECW8Digis(0),
-    nBRL1Digis(0), nBRL2Digis(0), nBRL3Digis(0), 
-    nFWD1pDigis(0), nFWD1nDigis(0), nFWD2pDigis(0), nFWD2nDigis(0),
-    nMB1Digis(0), nMB2Digis(0), nMB3Digis(0), nMB4Digis(0),
-    nCSCstripDigis(0), nCSCwireDigis(0) {}
-  virtual ~PGlobalDigi(){}
+class PGlobalDigi {
+public:
+  PGlobalDigi()
+      : nEBCalDigis(0),
+        nEECalDigis(0),
+        nESCalDigis(0),
+        nHBCalDigis(0),
+        nHECalDigis(0),
+        nHOCalDigis(0),
+        nHFCalDigis(0),
+        nTIBL1Digis(0),
+        nTIBL2Digis(0),
+        nTIBL3Digis(0),
+        nTIBL4Digis(0),
+        nTOBL1Digis(0),
+        nTOBL2Digis(0),
+        nTOBL3Digis(0),
+        nTOBL4Digis(0),
+        nTIDW1Digis(0),
+        nTIDW2Digis(0),
+        nTIDW3Digis(0),
+        nTECW1Digis(0),
+        nTECW2Digis(0),
+        nTECW3Digis(0),
+        nTECW4Digis(0),
+        nTECW5Digis(0),
+        nTECW6Digis(0),
+        nTECW7Digis(0),
+        nTECW8Digis(0),
+        nBRL1Digis(0),
+        nBRL2Digis(0),
+        nBRL3Digis(0),
+        nFWD1pDigis(0),
+        nFWD1nDigis(0),
+        nFWD2pDigis(0),
+        nFWD2nDigis(0),
+        nMB1Digis(0),
+        nMB2Digis(0),
+        nMB3Digis(0),
+        nMB4Digis(0),
+        nCSCstripDigis(0),
+        nCSCwireDigis(0) {}
+  virtual ~PGlobalDigi() {}
 
   ////////////
   // ECal Info
   ////////////
-  struct ECalDigi
-  {
-    ECalDigi(): maxPos(0), AEE(0), SHE(0) {}
+  struct ECalDigi {
+    ECalDigi() : maxPos(0), AEE(0), SHE(0) {}
     int maxPos;
-    double AEE; //maximum analog equivalent energy
-    float SHE; //simhit energy sum
+    double AEE;  //maximum analog equivalent energy
+    float SHE;   //simhit energy sum
   };
   typedef std::vector<ECalDigi> ECalDigiVector;
-  struct ESCalDigi
-  {
-    ESCalDigi(): ADC0(0), ADC1(0), ADC2(0), SHE(0) {}
-    float ADC0, ADC1, ADC2; //ADC counts
-    float SHE; //sum simhit energy    
+  struct ESCalDigi {
+    ESCalDigi() : ADC0(0), ADC1(0), ADC2(0), SHE(0) {}
+    float ADC0, ADC1, ADC2;  //ADC counts
+    float SHE;               //sum simhit energy
   };
   typedef std::vector<ESCalDigi> ESCalDigiVector;
   //put functions
-  void putEBCalDigis(const std::vector<int>& maxpos,
-		     const std::vector<double>& aee, const std::vector<float>& she);
-  void putEECalDigis(const std::vector<int>& maxpos,
-		     const std::vector<double>& aee, const std::vector<float>& she);
-  void putESCalDigis(const std::vector<float>& adc0, const std::vector<float>& adc1,
-		     const std::vector<float>& adc2, const std::vector<float>& she);
+  void putEBCalDigis(const std::vector<int>& maxpos, const std::vector<double>& aee, const std::vector<float>& she);
+  void putEECalDigis(const std::vector<int>& maxpos, const std::vector<double>& aee, const std::vector<float>& she);
+  void putESCalDigis(const std::vector<float>& adc0,
+                     const std::vector<float>& adc1,
+                     const std::vector<float>& adc2,
+                     const std::vector<float>& she);
   //get functions
-  int getnEBCalDigis() const {return nEBCalDigis;}  
-  int getnEECalDigis() const {return nEECalDigis;}
-  int getnESCalDigis() const {return nESCalDigis;}  
-  ECalDigiVector getEBCalDigis() const {return EBCalDigis;}  
-  ECalDigiVector getEECalDigis() const {return EECalDigis;}
-  ESCalDigiVector getESCalDigis() const {return ESCalDigis;}  
+  int getnEBCalDigis() const { return nEBCalDigis; }
+  int getnEECalDigis() const { return nEECalDigis; }
+  int getnESCalDigis() const { return nESCalDigis; }
+  ECalDigiVector getEBCalDigis() const { return EBCalDigis; }
+  ECalDigiVector getEECalDigis() const { return EECalDigis; }
+  ESCalDigiVector getESCalDigis() const { return ESCalDigis; }
 
   ////////////
   // HCal Info
   ////////////
-  struct HCalDigi
-  {
-    HCalDigi(): AEE(0), SHE(0) {}
-    float AEE; //sum analog equivalent energy in fC
-    float SHE; //simhit energy sum
+  struct HCalDigi {
+    HCalDigi() : AEE(0), SHE(0) {}
+    float AEE;  //sum analog equivalent energy in fC
+    float SHE;  //simhit energy sum
   };
   typedef std::vector<HCalDigi> HCalDigiVector;
   //put functions
@@ -249,14 +295,14 @@ class PGlobalDigi
   void putHOCalDigis(const std::vector<float>& aee, const std::vector<float>& she);
   void putHFCalDigis(const std::vector<float>& aee, const std::vector<float>& she);
   //get functions
-  int getnHBCalDigis() const {return nHBCalDigis;}  
-  int getnHECalDigis() const {return nHECalDigis;}  
-  int getnHOCalDigis() const {return nHOCalDigis;}  
-  int getnHFCalDigis() const {return nHFCalDigis;}  
-  HCalDigiVector getHBCalDigis() const {return HBCalDigis;}  
-  HCalDigiVector getHECalDigis() const {return HECalDigis;}  
-  HCalDigiVector getHOCalDigis() const {return HOCalDigis;}  
-  HCalDigiVector getHFCalDigis() const {return HFCalDigis;}  
+  int getnHBCalDigis() const { return nHBCalDigis; }
+  int getnHECalDigis() const { return nHECalDigis; }
+  int getnHOCalDigis() const { return nHOCalDigis; }
+  int getnHFCalDigis() const { return nHFCalDigis; }
+  HCalDigiVector getHBCalDigis() const { return HBCalDigis; }
+  HCalDigiVector getHECalDigis() const { return HECalDigis; }
+  HCalDigiVector getHOCalDigis() const { return HOCalDigis; }
+  HCalDigiVector getHFCalDigis() const { return HFCalDigis; }
 
   ////////////////////////
   // Silicon Tracker info
@@ -265,11 +311,10 @@ class PGlobalDigi
   ///////////////
   // SiStrip info
   ///////////////
-  struct SiStripDigi
-  {
-    SiStripDigi(): ADC(0), STRIP(0) {}
-    float ADC; //adc value
-    int STRIP; //strip number
+  struct SiStripDigi {
+    SiStripDigi() : ADC(0), STRIP(0) {}
+    float ADC;  //adc value
+    int STRIP;  //strip number
   };
   typedef std::vector<SiStripDigi> SiStripDigiVector;
   //put functions
@@ -293,86 +338,78 @@ class PGlobalDigi
   void putTECW7Digis(const std::vector<float>& adc, const std::vector<int>& strip);
   void putTECW8Digis(const std::vector<float>& adc, const std::vector<int>& strip);
   //get functions
-  int getnTIBL1Digis() const {return nTIBL1Digis;}  
-  int getnTIBL2Digis() const {return nTIBL2Digis;}  
-  int getnTIBL3Digis() const {return nTIBL3Digis;}  
-  int getnTIBL4Digis() const {return nTIBL4Digis;}  
-  int getnTOBL1Digis() const {return nTOBL1Digis;}  
-  int getnTOBL2Digis() const {return nTOBL2Digis;}  
-  int getnTOBL3Digis() const {return nTOBL3Digis;}  
-  int getnTOBL4Digis() const {return nTOBL4Digis;}
-  int getnTIDW1Digis() const {return nTIDW1Digis;}
-  int getnTIDW2Digis() const {return nTIDW2Digis;}
-  int getnTIDW3Digis() const {return nTIDW3Digis;} 
-  int getnTECW1Digis() const {return nTECW1Digis;}
-  int getnTECW2Digis() const {return nTECW2Digis;}
-  int getnTECW3Digis() const {return nTECW3Digis;}
-  int getnTECW4Digis() const {return nTECW4Digis;}
-  int getnTECW5Digis() const {return nTECW5Digis;}
-  int getnTECW6Digis() const {return nTECW6Digis;}
-  int getnTECW7Digis() const {return nTECW7Digis;}
-  int getnTECW8Digis() const {return nTECW8Digis;} 
-  SiStripDigiVector getTIBL1Digis() const {return TIBL1Digis;}  
-  SiStripDigiVector getTIBL2Digis() const {return TIBL2Digis;}  
-  SiStripDigiVector getTIBL3Digis() const {return TIBL3Digis;}  
-  SiStripDigiVector getTIBL4Digis() const {return TIBL4Digis;}
-  SiStripDigiVector getTOBL1Digis() const {return TOBL1Digis;}  
-  SiStripDigiVector getTOBL2Digis() const {return TOBL2Digis;}  
-  SiStripDigiVector getTOBL3Digis() const {return TOBL3Digis;}  
-  SiStripDigiVector getTOBL4Digis() const {return TOBL4Digis;}   
-  SiStripDigiVector getTIDW1Digis() const {return TIDW1Digis;}
-  SiStripDigiVector getTIDW2Digis() const {return TIDW2Digis;}
-  SiStripDigiVector getTIDW3Digis() const {return TIDW3Digis;} 
-  SiStripDigiVector getTECW1Digis() const {return TECW1Digis;}
-  SiStripDigiVector getTECW2Digis() const {return TECW2Digis;}
-  SiStripDigiVector getTECW3Digis() const {return TECW3Digis;}
-  SiStripDigiVector getTECW4Digis() const {return TECW4Digis;}
-  SiStripDigiVector getTECW5Digis() const {return TECW5Digis;}
-  SiStripDigiVector getTECW6Digis() const {return TECW6Digis;}
-  SiStripDigiVector getTECW7Digis() const {return TECW7Digis;}
-  SiStripDigiVector getTECW8Digis() const {return TECW8Digis;}
+  int getnTIBL1Digis() const { return nTIBL1Digis; }
+  int getnTIBL2Digis() const { return nTIBL2Digis; }
+  int getnTIBL3Digis() const { return nTIBL3Digis; }
+  int getnTIBL4Digis() const { return nTIBL4Digis; }
+  int getnTOBL1Digis() const { return nTOBL1Digis; }
+  int getnTOBL2Digis() const { return nTOBL2Digis; }
+  int getnTOBL3Digis() const { return nTOBL3Digis; }
+  int getnTOBL4Digis() const { return nTOBL4Digis; }
+  int getnTIDW1Digis() const { return nTIDW1Digis; }
+  int getnTIDW2Digis() const { return nTIDW2Digis; }
+  int getnTIDW3Digis() const { return nTIDW3Digis; }
+  int getnTECW1Digis() const { return nTECW1Digis; }
+  int getnTECW2Digis() const { return nTECW2Digis; }
+  int getnTECW3Digis() const { return nTECW3Digis; }
+  int getnTECW4Digis() const { return nTECW4Digis; }
+  int getnTECW5Digis() const { return nTECW5Digis; }
+  int getnTECW6Digis() const { return nTECW6Digis; }
+  int getnTECW7Digis() const { return nTECW7Digis; }
+  int getnTECW8Digis() const { return nTECW8Digis; }
+  SiStripDigiVector getTIBL1Digis() const { return TIBL1Digis; }
+  SiStripDigiVector getTIBL2Digis() const { return TIBL2Digis; }
+  SiStripDigiVector getTIBL3Digis() const { return TIBL3Digis; }
+  SiStripDigiVector getTIBL4Digis() const { return TIBL4Digis; }
+  SiStripDigiVector getTOBL1Digis() const { return TOBL1Digis; }
+  SiStripDigiVector getTOBL2Digis() const { return TOBL2Digis; }
+  SiStripDigiVector getTOBL3Digis() const { return TOBL3Digis; }
+  SiStripDigiVector getTOBL4Digis() const { return TOBL4Digis; }
+  SiStripDigiVector getTIDW1Digis() const { return TIDW1Digis; }
+  SiStripDigiVector getTIDW2Digis() const { return TIDW2Digis; }
+  SiStripDigiVector getTIDW3Digis() const { return TIDW3Digis; }
+  SiStripDigiVector getTECW1Digis() const { return TECW1Digis; }
+  SiStripDigiVector getTECW2Digis() const { return TECW2Digis; }
+  SiStripDigiVector getTECW3Digis() const { return TECW3Digis; }
+  SiStripDigiVector getTECW4Digis() const { return TECW4Digis; }
+  SiStripDigiVector getTECW5Digis() const { return TECW5Digis; }
+  SiStripDigiVector getTECW6Digis() const { return TECW6Digis; }
+  SiStripDigiVector getTECW7Digis() const { return TECW7Digis; }
+  SiStripDigiVector getTECW8Digis() const { return TECW8Digis; }
 
   ///////////////
   // SiPixel info
   ///////////////
-  struct SiPixelDigi
-  {
-    SiPixelDigi(): ADC(0), ROW(0), COLUMN(0) {}
-    float ADC; //adc value
-    int ROW; //row number
-    int COLUMN; //column number
+  struct SiPixelDigi {
+    SiPixelDigi() : ADC(0), ROW(0), COLUMN(0) {}
+    float ADC;   //adc value
+    int ROW;     //row number
+    int COLUMN;  //column number
   };
   typedef std::vector<SiPixelDigi> SiPixelDigiVector;
   //put functions
-  void putBRL1Digis(const std::vector<float>& adc, const std::vector<int>& row,
-		    const std::vector<int>& column);
-  void putBRL2Digis(const std::vector<float>& adc, const std::vector<int>& row,
-		    const std::vector<int>& column);
-  void putBRL3Digis(const std::vector<float>& adc, const std::vector<int>& row,
-		    const std::vector<int>& column);
-  void putFWD1pDigis(const std::vector<float>& adc, const std::vector<int>& row,
-		    const std::vector<int>& column);
-  void putFWD1nDigis(const std::vector<float>& adc, const std::vector<int>& row,
-		    const std::vector<int>& column);
-  void putFWD2pDigis(const std::vector<float>& adc, const std::vector<int>& row,
-		    const std::vector<int>& column);
-  void putFWD2nDigis(const std::vector<float>& adc, const std::vector<int>& row,
-		    const std::vector<int>& column);
+  void putBRL1Digis(const std::vector<float>& adc, const std::vector<int>& row, const std::vector<int>& column);
+  void putBRL2Digis(const std::vector<float>& adc, const std::vector<int>& row, const std::vector<int>& column);
+  void putBRL3Digis(const std::vector<float>& adc, const std::vector<int>& row, const std::vector<int>& column);
+  void putFWD1pDigis(const std::vector<float>& adc, const std::vector<int>& row, const std::vector<int>& column);
+  void putFWD1nDigis(const std::vector<float>& adc, const std::vector<int>& row, const std::vector<int>& column);
+  void putFWD2pDigis(const std::vector<float>& adc, const std::vector<int>& row, const std::vector<int>& column);
+  void putFWD2nDigis(const std::vector<float>& adc, const std::vector<int>& row, const std::vector<int>& column);
   //get functions
-  int getnBRL1Digis() const {return nBRL1Digis;}  
-  int getnBRL2Digis() const {return nBRL2Digis;}  
-  int getnBRL3Digis() const {return nBRL3Digis;}
-  int getnFWD1pDigis() const {return nFWD1pDigis;}  
-  int getnFWD1nDigis() const {return nFWD1nDigis;}    
-  int getnFWD2pDigis() const {return nFWD2pDigis;}  
-  int getnFWD2nDigis() const {return nFWD2nDigis;}  
-  SiPixelDigiVector getBRL1Digis() const {return BRL1Digis;}  
-  SiPixelDigiVector getBRL2Digis() const {return BRL2Digis;}  
-  SiPixelDigiVector getBRL3Digis() const {return BRL3Digis;}  
-  SiPixelDigiVector getFWD1pDigis() const {return FWD1pDigis;}
-  SiPixelDigiVector getFWD1nDigis() const {return FWD1nDigis;} 
-  SiPixelDigiVector getFWD2pDigis() const {return FWD2pDigis;}
-  SiPixelDigiVector getFWD2nDigis() const {return FWD2nDigis;} 
+  int getnBRL1Digis() const { return nBRL1Digis; }
+  int getnBRL2Digis() const { return nBRL2Digis; }
+  int getnBRL3Digis() const { return nBRL3Digis; }
+  int getnFWD1pDigis() const { return nFWD1pDigis; }
+  int getnFWD1nDigis() const { return nFWD1nDigis; }
+  int getnFWD2pDigis() const { return nFWD2pDigis; }
+  int getnFWD2nDigis() const { return nFWD2nDigis; }
+  SiPixelDigiVector getBRL1Digis() const { return BRL1Digis; }
+  SiPixelDigiVector getBRL2Digis() const { return BRL2Digis; }
+  SiPixelDigiVector getBRL3Digis() const { return BRL3Digis; }
+  SiPixelDigiVector getFWD1pDigis() const { return FWD1pDigis; }
+  SiPixelDigiVector getFWD1nDigis() const { return FWD1nDigis; }
+  SiPixelDigiVector getFWD2pDigis() const { return FWD2pDigis; }
+  SiPixelDigiVector getFWD2nDigis() const { return FWD2nDigis; }
 
   ////////////
   // Muon info
@@ -380,66 +417,58 @@ class PGlobalDigi
 
   //////////
   // DT Info
-  ////////// 
-  struct DTDigi
-  {
-    DTDigi(): SLAYER(0), TIME(0), LAYER(0) {}
-    int SLAYER; //superlayer number
-    float TIME; //time of hit
-    int LAYER; //layer number
+  //////////
+  struct DTDigi {
+    DTDigi() : SLAYER(0), TIME(0), LAYER(0) {}
+    int SLAYER;  //superlayer number
+    float TIME;  //time of hit
+    int LAYER;   //layer number
   };
   typedef std::vector<DTDigi> DTDigiVector;
   //put functions
-  void putMB1Digis(const std::vector<int>& slayer, const std::vector<float>& time, 
-		   const std::vector<int>& layer);
-  void putMB2Digis(const std::vector<int>& slayer, const std::vector<float>& time, 
-		   const std::vector<int>& layer);
-  void putMB3Digis(const std::vector<int>& slayer, const std::vector<float>& time, 
-		   const std::vector<int>& layer);
-  void putMB4Digis(const std::vector<int>& slayer, const std::vector<float>& time, 
-		   const std::vector<int>& layer);
+  void putMB1Digis(const std::vector<int>& slayer, const std::vector<float>& time, const std::vector<int>& layer);
+  void putMB2Digis(const std::vector<int>& slayer, const std::vector<float>& time, const std::vector<int>& layer);
+  void putMB3Digis(const std::vector<int>& slayer, const std::vector<float>& time, const std::vector<int>& layer);
+  void putMB4Digis(const std::vector<int>& slayer, const std::vector<float>& time, const std::vector<int>& layer);
   //get functions
-  int getnMB1Digis() const {return nMB1Digis;}  
-  int getnMB2Digis() const {return nMB2Digis;}  
-  int getnMB3Digis() const {return nMB3Digis;}  
-  int getnMB4Digis() const {return nMB4Digis;}  
-  DTDigiVector getMB1Digis() const {return MB1Digis;}  
-  DTDigiVector getMB2Digis() const {return MB2Digis;}  
-  DTDigiVector getMB3Digis() const {return MB3Digis;}  
-  DTDigiVector getMB4Digis() const {return MB4Digis;}  
+  int getnMB1Digis() const { return nMB1Digis; }
+  int getnMB2Digis() const { return nMB2Digis; }
+  int getnMB3Digis() const { return nMB3Digis; }
+  int getnMB4Digis() const { return nMB4Digis; }
+  DTDigiVector getMB1Digis() const { return MB1Digis; }
+  DTDigiVector getMB2Digis() const { return MB2Digis; }
+  DTDigiVector getMB3Digis() const { return MB3Digis; }
+  DTDigiVector getMB4Digis() const { return MB4Digis; }
 
   /////////////////
   // CSC Strip info
   /////////////////
-  struct CSCstripDigi
-  {
-    CSCstripDigi(): ADC(0) {}
-    float ADC; //ped subtracted amplitude
+  struct CSCstripDigi {
+    CSCstripDigi() : ADC(0) {}
+    float ADC;  //ped subtracted amplitude
   };
   typedef std::vector<CSCstripDigi> CSCstripDigiVector;
   //put functions
   void putCSCstripDigis(const std::vector<float>& adc);
   //get functions
-  int getnCSCstripDigis() const {return nCSCstripDigis;}  
-  CSCstripDigiVector getCSCstripDigis() const {return CSCstripDigis;}  
+  int getnCSCstripDigis() const { return nCSCstripDigis; }
+  CSCstripDigiVector getCSCstripDigis() const { return CSCstripDigis; }
 
   /////////////////
   // CSC Wire info
   /////////////////
-  struct CSCwireDigi
-  {
-    CSCwireDigi(): TIME(0) {}
-    float TIME; //time
+  struct CSCwireDigi {
+    CSCwireDigi() : TIME(0) {}
+    float TIME;  //time
   };
   typedef std::vector<CSCwireDigi> CSCwireDigiVector;
   //put functions
   void putCSCwireDigis(const std::vector<float>& time);
   //get functions
-  int getnCSCwireDigis() const {return nCSCwireDigis;}  
-  CSCwireDigiVector getCSCwireDigis() const {return CSCwireDigis;} 
-
- private:
+  int getnCSCwireDigis() const { return nCSCwireDigis; }
+  CSCwireDigiVector getCSCwireDigis() const { return CSCwireDigis; }
 
+private:
   ////////////
   // ECal info
   ////////////
@@ -469,28 +498,28 @@ class PGlobalDigi
   //////////////
   //SiStrip info
   //////////////
-  int nTIBL1Digis;  
+  int nTIBL1Digis;
   SiStripDigiVector TIBL1Digis;
-  int nTIBL2Digis;  
+  int nTIBL2Digis;
   SiStripDigiVector TIBL2Digis;
-  int nTIBL3Digis; 
+  int nTIBL3Digis;
   SiStripDigiVector TIBL3Digis;
-  int nTIBL4Digis;  
+  int nTIBL4Digis;
   SiStripDigiVector TIBL4Digis;
   int nTOBL1Digis;
   SiStripDigiVector TOBL1Digis;
-  int nTOBL2Digis;  
+  int nTOBL2Digis;
   SiStripDigiVector TOBL2Digis;
-  int nTOBL3Digis;  
+  int nTOBL3Digis;
   SiStripDigiVector TOBL3Digis;
-  int nTOBL4Digis; 
+  int nTOBL4Digis;
   SiStripDigiVector TOBL4Digis;
-  int nTIDW1Digis;   
+  int nTIDW1Digis;
   SiStripDigiVector TIDW1Digis;
   int nTIDW2Digis;
   SiStripDigiVector TIDW2Digis;
   int nTIDW3Digis;
-  SiStripDigiVector TIDW3Digis; 
+  SiStripDigiVector TIDW3Digis;
   int nTECW1Digis;
   SiStripDigiVector TECW1Digis;
   int nTECW2Digis;
@@ -513,18 +542,18 @@ class PGlobalDigi
   //////////////
   int nBRL1Digis;
   SiPixelDigiVector BRL1Digis;
-  int nBRL2Digis;  
-  SiPixelDigiVector BRL2Digis; 
-  int nBRL3Digis; 
-  SiPixelDigiVector BRL3Digis; 
-  int nFWD1pDigis; 
+  int nBRL2Digis;
+  SiPixelDigiVector BRL2Digis;
+  int nBRL3Digis;
+  SiPixelDigiVector BRL3Digis;
+  int nFWD1pDigis;
   SiPixelDigiVector FWD1pDigis;
   int nFWD1nDigis;
-  SiPixelDigiVector FWD1nDigis; 
+  SiPixelDigiVector FWD1nDigis;
   int nFWD2pDigis;
   SiPixelDigiVector FWD2pDigis;
   int nFWD2nDigis;
-  SiPixelDigiVector FWD2nDigis; 
+  SiPixelDigiVector FWD2nDigis;
 
   ////////////
   // Muon info
@@ -532,15 +561,15 @@ class PGlobalDigi
 
   //////////
   // DT Info
-  ////////// 
+  //////////
   int nMB1Digis;
-  DTDigiVector MB1Digis; 
+  DTDigiVector MB1Digis;
   int nMB2Digis;
-  DTDigiVector MB2Digis; 
+  DTDigiVector MB2Digis;
   int nMB3Digis;
-  DTDigiVector MB3Digis; 
-  int nMB4Digis; 
-  DTDigiVector MB4Digis; 
+  DTDigiVector MB3Digis;
+  int nMB4Digis;
+  DTDigiVector MB4Digis;
 
   /////////////////
   // CSC Strip info
@@ -553,10 +582,10 @@ class PGlobalDigi
   ////////////////
   int nCSCwireDigis;
   CSCwireDigiVector CSCwireDigis;
- 
-}; // end class declaration
 
-#endif //PGlobalDigiHit_h
+};  // end class declaration
+
+#endif  //PGlobalDigiHit_h
 
 ///////////////////////////////////////////////////////////////////////////////
 // PGlobalRecHit
@@ -565,30 +594,54 @@ class PGlobalDigi
 #ifndef PGlobalRecHit_h
 #define PGlobalRecHit_h
 
-class PGlobalRecHit
-{
- public:
-
-  PGlobalRecHit(): nEBCalRecHits(0), nEECalRecHits(0), nESCalRecHits(0),
-    nHBCalRecHits(0), nHECalRecHits(0), nHOCalRecHits(0), nHFCalRecHits(0),
-    nTIBL1RecHits(0), nTIBL2RecHits(0), nTIBL3RecHits(0), nTIBL4RecHits(0),
-    nTOBL1RecHits(0), nTOBL2RecHits(0), nTOBL3RecHits(0), nTOBL4RecHits(0),
-    nTIDW1RecHits(0), nTIDW2RecHits(0), nTIDW3RecHits(0),
-    nTECW1RecHits(0), nTECW2RecHits(0), nTECW3RecHits(0), nTECW4RecHits(0), 
-    nTECW5RecHits(0), nTECW6RecHits(0), nTECW7RecHits(0), nTECW8RecHits(0),
-    nBRL1RecHits(0), nBRL2RecHits(0), nBRL3RecHits(0), 
-    nFWD1pRecHits(0), nFWD1nRecHits(0), nFWD2pRecHits(0), nFWD2nRecHits(0),
-    nDTRecHits(0), nCSCRecHits(0), nRPCRecHits(0) {}
-  virtual ~PGlobalRecHit(){}
+class PGlobalRecHit {
+public:
+  PGlobalRecHit()
+      : nEBCalRecHits(0),
+        nEECalRecHits(0),
+        nESCalRecHits(0),
+        nHBCalRecHits(0),
+        nHECalRecHits(0),
+        nHOCalRecHits(0),
+        nHFCalRecHits(0),
+        nTIBL1RecHits(0),
+        nTIBL2RecHits(0),
+        nTIBL3RecHits(0),
+        nTIBL4RecHits(0),
+        nTOBL1RecHits(0),
+        nTOBL2RecHits(0),
+        nTOBL3RecHits(0),
+        nTOBL4RecHits(0),
+        nTIDW1RecHits(0),
+        nTIDW2RecHits(0),
+        nTIDW3RecHits(0),
+        nTECW1RecHits(0),
+        nTECW2RecHits(0),
+        nTECW3RecHits(0),
+        nTECW4RecHits(0),
+        nTECW5RecHits(0),
+        nTECW6RecHits(0),
+        nTECW7RecHits(0),
+        nTECW8RecHits(0),
+        nBRL1RecHits(0),
+        nBRL2RecHits(0),
+        nBRL3RecHits(0),
+        nFWD1pRecHits(0),
+        nFWD1nRecHits(0),
+        nFWD2pRecHits(0),
+        nFWD2nRecHits(0),
+        nDTRecHits(0),
+        nCSCRecHits(0),
+        nRPCRecHits(0) {}
+  virtual ~PGlobalRecHit() {}
 
   ////////////
   // ECal Info
   ////////////
-  struct ECalRecHit
-  {
-    ECalRecHit(): RE(0), SHE(0) {}
-    float RE; //reconstructed energy
-    float SHE; //simhit energy
+  struct ECalRecHit {
+    ECalRecHit() : RE(0), SHE(0) {}
+    float RE;   //reconstructed energy
+    float SHE;  //simhit energy
   };
   typedef std::vector<ECalRecHit> ECalRecHitVector;
   //put functions
@@ -596,42 +649,37 @@ class PGlobalRecHit
   void putEECalRecHits(const std::vector<float>& re, const std::vector<float>& she);
   void putESCalRecHits(const std::vector<float>& re, const std::vector<float>& she);
   //get functions
-  int getnEBCalRecHits() const {return nEBCalRecHits;}  
-  int getnEECalRecHits() const {return nEECalRecHits;}
-  int getnESCalRecHits() const {return nESCalRecHits;}  
-  ECalRecHitVector getEBCalRecHits() const {return EBCalRecHits;}  
-  ECalRecHitVector getEECalRecHits() const {return EECalRecHits;}
-  ECalRecHitVector getESCalRecHits() const {return ESCalRecHits;}  
+  int getnEBCalRecHits() const { return nEBCalRecHits; }
+  int getnEECalRecHits() const { return nEECalRecHits; }
+  int getnESCalRecHits() const { return nESCalRecHits; }
+  ECalRecHitVector getEBCalRecHits() const { return EBCalRecHits; }
+  ECalRecHitVector getEECalRecHits() const { return EECalRecHits; }
+  ECalRecHitVector getESCalRecHits() const { return ESCalRecHits; }
 
   ////////////
   // HCal Info
   ////////////
-  struct HCalRecHit
-  {
-    HCalRecHit(): REC(0), R(0), SHE(0) {}
-    float REC; // reconstructed energy
-    float R;   // distance in cone 
-    float SHE; // simhit energy
+  struct HCalRecHit {
+    HCalRecHit() : REC(0), R(0), SHE(0) {}
+    float REC;  // reconstructed energy
+    float R;    // distance in cone
+    float SHE;  // simhit energy
   };
   typedef std::vector<HCalRecHit> HCalRecHitVector;
   //put functions
-  void putHBCalRecHits(const std::vector<float>& rec, const std::vector<float>& r, 
-		       const std::vector<float>& she);
-  void putHECalRecHits(const std::vector<float>& rec, const std::vector<float>& r, 
-		       const std::vector<float>& she);
-  void putHOCalRecHits(const std::vector<float>& rec, const std::vector<float>& r, 
-		       const std::vector<float>& she);
-  void putHFCalRecHits(const std::vector<float>& rec, const std::vector<float>& r, 
-		       const std::vector<float>& she);
+  void putHBCalRecHits(const std::vector<float>& rec, const std::vector<float>& r, const std::vector<float>& she);
+  void putHECalRecHits(const std::vector<float>& rec, const std::vector<float>& r, const std::vector<float>& she);
+  void putHOCalRecHits(const std::vector<float>& rec, const std::vector<float>& r, const std::vector<float>& she);
+  void putHFCalRecHits(const std::vector<float>& rec, const std::vector<float>& r, const std::vector<float>& she);
   //get functions
-  int getnHBCalRecHits() const {return nHBCalRecHits;}  
-  int getnHECalRecHits() const {return nHECalRecHits;}  
-  int getnHOCalRecHits() const {return nHOCalRecHits;}  
-  int getnHFCalRecHits() const {return nHFCalRecHits;}  
-  HCalRecHitVector getHBCalRecHits() const {return HBCalRecHits;}  
-  HCalRecHitVector getHECalRecHits() const {return HECalRecHits;}  
-  HCalRecHitVector getHOCalRecHits() const {return HOCalRecHits;}  
-  HCalRecHitVector getHFCalRecHits() const {return HFCalRecHits;}  
+  int getnHBCalRecHits() const { return nHBCalRecHits; }
+  int getnHECalRecHits() const { return nHECalRecHits; }
+  int getnHOCalRecHits() const { return nHOCalRecHits; }
+  int getnHFCalRecHits() const { return nHFCalRecHits; }
+  HCalRecHitVector getHBCalRecHits() const { return HBCalRecHits; }
+  HCalRecHitVector getHECalRecHits() const { return HECalRecHits; }
+  HCalRecHitVector getHOCalRecHits() const { return HOCalRecHits; }
+  HCalRecHitVector getHFCalRecHits() const { return HFCalRecHits; }
 
   ////////////////////////
   // Silicon Tracker info
@@ -640,136 +688,186 @@ class PGlobalRecHit
   ///////////////
   // SiStrip info
   ///////////////
-  struct SiStripRecHit
-  {
-    SiStripRecHit(): RX(0), RY(0), SX(0), SY(0) {}
-    float RX; //reconstructed x
-    float RY; //reconstructed y
-    float SX; //simulated x
-    float SY; //simulated y
+  struct SiStripRecHit {
+    SiStripRecHit() : RX(0), RY(0), SX(0), SY(0) {}
+    float RX;  //reconstructed x
+    float RY;  //reconstructed y
+    float SX;  //simulated x
+    float SY;  //simulated y
   };
   typedef std::vector<SiStripRecHit> SiStripRecHitVector;
   //put functions
-  void putTIBL1RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putTIBL2RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putTIBL3RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putTIBL4RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putTOBL1RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putTOBL2RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putTOBL3RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putTOBL4RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putTIDW1RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putTIDW2RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putTIDW3RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putTECW1RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putTECW2RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putTECW3RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putTECW4RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putTECW5RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putTECW6RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putTECW7RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putTECW8RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
+  void putTIBL1RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putTIBL2RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putTIBL3RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putTIBL4RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putTOBL1RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putTOBL2RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putTOBL3RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putTOBL4RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putTIDW1RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putTIDW2RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putTIDW3RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putTECW1RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putTECW2RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putTECW3RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putTECW4RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putTECW5RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putTECW6RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putTECW7RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putTECW8RecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
   //get functions
-  int getnTIBL1RecHits() const {return nTIBL1RecHits;}  
-  int getnTIBL2RecHits() const {return nTIBL2RecHits;}  
-  int getnTIBL3RecHits() const {return nTIBL3RecHits;}  
-  int getnTIBL4RecHits() const {return nTIBL4RecHits;}  
-  int getnTOBL1RecHits() const {return nTOBL1RecHits;}  
-  int getnTOBL2RecHits() const {return nTOBL2RecHits;}  
-  int getnTOBL3RecHits() const {return nTOBL3RecHits;}  
-  int getnTOBL4RecHits() const {return nTOBL4RecHits;}
-  int getnTIDW1RecHits() const {return nTIDW1RecHits;}
-  int getnTIDW2RecHits() const {return nTIDW2RecHits;}
-  int getnTIDW3RecHits() const {return nTIDW3RecHits;} 
-  int getnTECW1RecHits() const {return nTECW1RecHits;}
-  int getnTECW2RecHits() const {return nTECW2RecHits;}
-  int getnTECW3RecHits() const {return nTECW3RecHits;}
-  int getnTECW4RecHits() const {return nTECW4RecHits;}
-  int getnTECW5RecHits() const {return nTECW5RecHits;}
-  int getnTECW6RecHits() const {return nTECW6RecHits;}
-  int getnTECW7RecHits() const {return nTECW7RecHits;}
-  int getnTECW8RecHits() const {return nTECW8RecHits;} 
-  SiStripRecHitVector getTIBL1RecHits() const {return TIBL1RecHits;}  
-  SiStripRecHitVector getTIBL2RecHits() const {return TIBL2RecHits;}  
-  SiStripRecHitVector getTIBL3RecHits() const {return TIBL3RecHits;}  
-  SiStripRecHitVector getTIBL4RecHits() const {return TIBL4RecHits;}
-  SiStripRecHitVector getTOBL1RecHits() const {return TOBL1RecHits;}  
-  SiStripRecHitVector getTOBL2RecHits() const {return TOBL2RecHits;}  
-  SiStripRecHitVector getTOBL3RecHits() const {return TOBL3RecHits;}  
-  SiStripRecHitVector getTOBL4RecHits() const {return TOBL4RecHits;}   
-  SiStripRecHitVector getTIDW1RecHits() const {return TIDW1RecHits;}
-  SiStripRecHitVector getTIDW2RecHits() const {return TIDW2RecHits;}
-  SiStripRecHitVector getTIDW3RecHits() const {return TIDW3RecHits;} 
-  SiStripRecHitVector getTECW1RecHits() const {return TECW1RecHits;}
-  SiStripRecHitVector getTECW2RecHits() const {return TECW2RecHits;}
-  SiStripRecHitVector getTECW3RecHits() const {return TECW3RecHits;}
-  SiStripRecHitVector getTECW4RecHits() const {return TECW4RecHits;}
-  SiStripRecHitVector getTECW5RecHits() const {return TECW5RecHits;}
-  SiStripRecHitVector getTECW6RecHits() const {return TECW6RecHits;}
-  SiStripRecHitVector getTECW7RecHits() const {return TECW7RecHits;}
-  SiStripRecHitVector getTECW8RecHits() const {return TECW8RecHits;}
+  int getnTIBL1RecHits() const { return nTIBL1RecHits; }
+  int getnTIBL2RecHits() const { return nTIBL2RecHits; }
+  int getnTIBL3RecHits() const { return nTIBL3RecHits; }
+  int getnTIBL4RecHits() const { return nTIBL4RecHits; }
+  int getnTOBL1RecHits() const { return nTOBL1RecHits; }
+  int getnTOBL2RecHits() const { return nTOBL2RecHits; }
+  int getnTOBL3RecHits() const { return nTOBL3RecHits; }
+  int getnTOBL4RecHits() const { return nTOBL4RecHits; }
+  int getnTIDW1RecHits() const { return nTIDW1RecHits; }
+  int getnTIDW2RecHits() const { return nTIDW2RecHits; }
+  int getnTIDW3RecHits() const { return nTIDW3RecHits; }
+  int getnTECW1RecHits() const { return nTECW1RecHits; }
+  int getnTECW2RecHits() const { return nTECW2RecHits; }
+  int getnTECW3RecHits() const { return nTECW3RecHits; }
+  int getnTECW4RecHits() const { return nTECW4RecHits; }
+  int getnTECW5RecHits() const { return nTECW5RecHits; }
+  int getnTECW6RecHits() const { return nTECW6RecHits; }
+  int getnTECW7RecHits() const { return nTECW7RecHits; }
+  int getnTECW8RecHits() const { return nTECW8RecHits; }
+  SiStripRecHitVector getTIBL1RecHits() const { return TIBL1RecHits; }
+  SiStripRecHitVector getTIBL2RecHits() const { return TIBL2RecHits; }
+  SiStripRecHitVector getTIBL3RecHits() const { return TIBL3RecHits; }
+  SiStripRecHitVector getTIBL4RecHits() const { return TIBL4RecHits; }
+  SiStripRecHitVector getTOBL1RecHits() const { return TOBL1RecHits; }
+  SiStripRecHitVector getTOBL2RecHits() const { return TOBL2RecHits; }
+  SiStripRecHitVector getTOBL3RecHits() const { return TOBL3RecHits; }
+  SiStripRecHitVector getTOBL4RecHits() const { return TOBL4RecHits; }
+  SiStripRecHitVector getTIDW1RecHits() const { return TIDW1RecHits; }
+  SiStripRecHitVector getTIDW2RecHits() const { return TIDW2RecHits; }
+  SiStripRecHitVector getTIDW3RecHits() const { return TIDW3RecHits; }
+  SiStripRecHitVector getTECW1RecHits() const { return TECW1RecHits; }
+  SiStripRecHitVector getTECW2RecHits() const { return TECW2RecHits; }
+  SiStripRecHitVector getTECW3RecHits() const { return TECW3RecHits; }
+  SiStripRecHitVector getTECW4RecHits() const { return TECW4RecHits; }
+  SiStripRecHitVector getTECW5RecHits() const { return TECW5RecHits; }
+  SiStripRecHitVector getTECW6RecHits() const { return TECW6RecHits; }
+  SiStripRecHitVector getTECW7RecHits() const { return TECW7RecHits; }
+  SiStripRecHitVector getTECW8RecHits() const { return TECW8RecHits; }
 
   ///////////////
   // SiPixel info
   ///////////////
-  struct SiPixelRecHit
-  {
-    SiPixelRecHit(): RX(0), RY(0), SX(0), SY(0) {}
-    float RX; //reconstructed x
-    float RY; //reconstructed y
-    float SX; //simulated x
-    float SY; //simulated y
+  struct SiPixelRecHit {
+    SiPixelRecHit() : RX(0), RY(0), SX(0), SY(0) {}
+    float RX;  //reconstructed x
+    float RY;  //reconstructed y
+    float SX;  //simulated x
+    float SY;  //simulated y
   };
   typedef std::vector<SiPixelRecHit> SiPixelRecHitVector;
   //put functions
-  void putBRL1RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putBRL2RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putBRL3RecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putFWD1pRecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putFWD1nRecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putFWD2pRecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
-  void putFWD2nRecHits(const std::vector<float>& rx, const std::vector<float>& ry,
-		       const std::vector<float>& sx, const std::vector<float>& sy);
+  void putBRL1RecHits(const std::vector<float>& rx,
+                      const std::vector<float>& ry,
+                      const std::vector<float>& sx,
+                      const std::vector<float>& sy);
+  void putBRL2RecHits(const std::vector<float>& rx,
+                      const std::vector<float>& ry,
+                      const std::vector<float>& sx,
+                      const std::vector<float>& sy);
+  void putBRL3RecHits(const std::vector<float>& rx,
+                      const std::vector<float>& ry,
+                      const std::vector<float>& sx,
+                      const std::vector<float>& sy);
+  void putFWD1pRecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putFWD1nRecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putFWD2pRecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
+  void putFWD2nRecHits(const std::vector<float>& rx,
+                       const std::vector<float>& ry,
+                       const std::vector<float>& sx,
+                       const std::vector<float>& sy);
   //get functions
-  int getnBRL1RecHits() const {return nBRL1RecHits;}  
-  int getnBRL2RecHits() const {return nBRL2RecHits;}  
-  int getnBRL3RecHits() const {return nBRL3RecHits;}
-  int getnFWD1pRecHits() const {return nFWD1pRecHits;}  
-  int getnFWD1nRecHits() const {return nFWD1nRecHits;}    
-  int getnFWD2pRecHits() const {return nFWD2pRecHits;}  
-  int getnFWD2nRecHits() const {return nFWD2nRecHits;}  
-  SiPixelRecHitVector getBRL1RecHits() const {return BRL1RecHits;}  
-  SiPixelRecHitVector getBRL2RecHits() const {return BRL2RecHits;}  
-  SiPixelRecHitVector getBRL3RecHits() const {return BRL3RecHits;}  
-  SiPixelRecHitVector getFWD1pRecHits() const {return FWD1pRecHits;}
-  SiPixelRecHitVector getFWD1nRecHits() const {return FWD1nRecHits;} 
-  SiPixelRecHitVector getFWD2pRecHits() const {return FWD2pRecHits;}
-  SiPixelRecHitVector getFWD2nRecHits() const {return FWD2nRecHits;} 
+  int getnBRL1RecHits() const { return nBRL1RecHits; }
+  int getnBRL2RecHits() const { return nBRL2RecHits; }
+  int getnBRL3RecHits() const { return nBRL3RecHits; }
+  int getnFWD1pRecHits() const { return nFWD1pRecHits; }
+  int getnFWD1nRecHits() const { return nFWD1nRecHits; }
+  int getnFWD2pRecHits() const { return nFWD2pRecHits; }
+  int getnFWD2nRecHits() const { return nFWD2nRecHits; }
+  SiPixelRecHitVector getBRL1RecHits() const { return BRL1RecHits; }
+  SiPixelRecHitVector getBRL2RecHits() const { return BRL2RecHits; }
+  SiPixelRecHitVector getBRL3RecHits() const { return BRL3RecHits; }
+  SiPixelRecHitVector getFWD1pRecHits() const { return FWD1pRecHits; }
+  SiPixelRecHitVector getFWD1nRecHits() const { return FWD1nRecHits; }
+  SiPixelRecHitVector getFWD2pRecHits() const { return FWD2pRecHits; }
+  SiPixelRecHitVector getFWD2nRecHits() const { return FWD2nRecHits; }
 
   ////////////
   // Muon info
@@ -777,56 +875,53 @@ class PGlobalRecHit
 
   //////////
   // DT Info
-  ////////// 
-  struct DTRecHit
-  {
-    DTRecHit(): RHD(0), SHD(0) {}
-    float RHD; //distance of rechit from wire
-    float SHD; //distance of simhit from wire
+  //////////
+  struct DTRecHit {
+    DTRecHit() : RHD(0), SHD(0) {}
+    float RHD;  //distance of rechit from wire
+    float SHD;  //distance of simhit from wire
   };
   typedef std::vector<DTRecHit> DTRecHitVector;
   //put functions
   void putDTRecHits(const std::vector<float>& rhd, const std::vector<float>& shd);
   //get functions
-  int getnDTRecHits() const {return nDTRecHits;}  
-  DTRecHitVector getDTRecHits() const {return DTRecHits;}  
+  int getnDTRecHits() const { return nDTRecHits; }
+  DTRecHitVector getDTRecHits() const { return DTRecHits; }
 
   /////////////////
   // CSC info
   /////////////////
-  struct CSCRecHit
-  {
-    CSCRecHit(): RHPHI(0), RHPERP(0), SHPHI(0) {}
-    float RHPHI; //reconstructed hit phi
-    float RHPERP; //reconstructed hit perp
-    float SHPHI; //simulated hit phi
+  struct CSCRecHit {
+    CSCRecHit() : RHPHI(0), RHPERP(0), SHPHI(0) {}
+    float RHPHI;   //reconstructed hit phi
+    float RHPERP;  //reconstructed hit perp
+    float SHPHI;   //simulated hit phi
   };
   typedef std::vector<CSCRecHit> CSCRecHitVector;
   //put functions
-  void putCSCRecHits(const std::vector<float>& rhphi, const std::vector<float>& rhperp, 
-		     const std::vector<float>& shphi);
+  void putCSCRecHits(const std::vector<float>& rhphi,
+                     const std::vector<float>& rhperp,
+                     const std::vector<float>& shphi);
   //get functions
-  int getnCSCRecHits() const {return nCSCRecHits;}  
-  CSCRecHitVector getCSCRecHits() const {return CSCRecHits;}  
+  int getnCSCRecHits() const { return nCSCRecHits; }
+  CSCRecHitVector getCSCRecHits() const { return CSCRecHits; }
 
   /////////////////
   // RPC info
   /////////////////
-  struct RPCRecHit
-  {
-    RPCRecHit(): RHX(0), SHX(0) {}
-    float RHX; //reconstructed hit x
-    float SHX; //simulated hit x
+  struct RPCRecHit {
+    RPCRecHit() : RHX(0), SHX(0) {}
+    float RHX;  //reconstructed hit x
+    float SHX;  //simulated hit x
   };
   typedef std::vector<RPCRecHit> RPCRecHitVector;
   //put functions
   void putRPCRecHits(const std::vector<float>& rhx, const std::vector<float>& shx);
   //get functions
-  int getnRPCRecHits() const {return nRPCRecHits;}  
-  RPCRecHitVector getRPCRecHits() const {return RPCRecHits;} 
-
- private:
+  int getnRPCRecHits() const { return nRPCRecHits; }
+  RPCRecHitVector getRPCRecHits() const { return RPCRecHits; }
 
+private:
   ////////////
   // ECal info
   ////////////
@@ -856,28 +951,28 @@ class PGlobalRecHit
   //////////////
   //SiStrip info
   //////////////
-  int nTIBL1RecHits;  
+  int nTIBL1RecHits;
   SiStripRecHitVector TIBL1RecHits;
-  int nTIBL2RecHits;  
+  int nTIBL2RecHits;
   SiStripRecHitVector TIBL2RecHits;
-  int nTIBL3RecHits; 
+  int nTIBL3RecHits;
   SiStripRecHitVector TIBL3RecHits;
-  int nTIBL4RecHits;  
+  int nTIBL4RecHits;
   SiStripRecHitVector TIBL4RecHits;
   int nTOBL1RecHits;
   SiStripRecHitVector TOBL1RecHits;
-  int nTOBL2RecHits;  
+  int nTOBL2RecHits;
   SiStripRecHitVector TOBL2RecHits;
-  int nTOBL3RecHits;  
+  int nTOBL3RecHits;
   SiStripRecHitVector TOBL3RecHits;
-  int nTOBL4RecHits; 
+  int nTOBL4RecHits;
   SiStripRecHitVector TOBL4RecHits;
-  int nTIDW1RecHits;   
+  int nTIDW1RecHits;
   SiStripRecHitVector TIDW1RecHits;
   int nTIDW2RecHits;
   SiStripRecHitVector TIDW2RecHits;
   int nTIDW3RecHits;
-  SiStripRecHitVector TIDW3RecHits; 
+  SiStripRecHitVector TIDW3RecHits;
   int nTECW1RecHits;
   SiStripRecHitVector TECW1RecHits;
   int nTECW2RecHits;
@@ -900,18 +995,18 @@ class PGlobalRecHit
   //////////////
   int nBRL1RecHits;
   SiPixelRecHitVector BRL1RecHits;
-  int nBRL2RecHits;  
-  SiPixelRecHitVector BRL2RecHits; 
-  int nBRL3RecHits; 
-  SiPixelRecHitVector BRL3RecHits; 
-  int nFWD1pRecHits; 
+  int nBRL2RecHits;
+  SiPixelRecHitVector BRL2RecHits;
+  int nBRL3RecHits;
+  SiPixelRecHitVector BRL3RecHits;
+  int nFWD1pRecHits;
   SiPixelRecHitVector FWD1pRecHits;
   int nFWD1nRecHits;
-  SiPixelRecHitVector FWD1nRecHits; 
+  SiPixelRecHitVector FWD1nRecHits;
   int nFWD2pRecHits;
   SiPixelRecHitVector FWD2pRecHits;
   int nFWD2nRecHits;
-  SiPixelRecHitVector FWD2nRecHits; 
+  SiPixelRecHitVector FWD2nRecHits;
 
   ////////////
   // Muon info
@@ -919,9 +1014,9 @@ class PGlobalRecHit
 
   //////////
   // DT Info
-  ////////// 
+  //////////
   int nDTRecHits;
-  DTRecHitVector DTRecHits; 
+  DTRecHitVector DTRecHits;
 
   /////////////////
   // CSC info
@@ -934,17 +1029,17 @@ class PGlobalRecHit
   ////////////////
   int nRPCRecHits;
   RPCRecHitVector RPCRecHits;
- 
-}; // end class declaration
 
-#endif //PGlobalRecHitHit_h
+};  // end class declaration
+
+#endif  //PGlobalRecHitHit_h
 
 ///////////////////////////////////////////////////////////////////////////////
 // PEcalValidInfo
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef  PEcalValidInfo_H
-#define  PEcalValidInfo_H
+#ifndef PEcalValidInfo_H
+#define PEcalValidInfo_H
 
 /*----------------------------------------------------------
 Class Description:
@@ -963,195 +1058,193 @@ Date:  Dec, 2005
 #include <vector>
 #include "DataFormats/Math/interface/LorentzVector.h"
 
-class EcalTestAnalysis; 
+class EcalTestAnalysis;
 
-class PEcalValidInfo 
-{
-   friend  class   EcalTestAnalysis;
-   friend  class   PreshowerTestAnalysis;
-   friend  class   SimHitSingleTest;
-   friend  class   EcalSimHitsValidProducer;
-   typedef  std::vector<float>   FloatVector;
+class PEcalValidInfo {
+  friend class EcalTestAnalysis;
+  friend class PreshowerTestAnalysis;
+  friend class SimHitSingleTest;
+  friend class EcalSimHitsValidProducer;
+  typedef std::vector<float> FloatVector;
 
 public:
-   PEcalValidInfo()
-  :ee1(0.0),ee4(0.0),ee9(0.0),ee16(0.0),ee25(0.0),
-   eb1(0.0),eb4(0.0),eb9(0.0),eb16(0.0),eb25(0.0),
-   totalEInEE(0.0), totalEInEB(0.0), totalEInES(0.0),
-   totalHits(0), nHitsInEE(0),nHitsInEB(0),nHitsInES(0),nHitsIn1ES(0),nHitsIn2ES(0) 
-{
-
- }
-
-
-   ~PEcalValidInfo() {} 
-
-   // Get functions.
-   float  ee1x1() const { return ee1; }
-   float  ee2x2() const { return ee4; }
-   float  ee3x3() const { return ee9; }
-   float  ee4x4() const { return ee16;}
-   float  ee5x5() const { return ee25;}
-
-   float  eb1x1() const { return eb1; }
-   float  eb2x2() const { return eb4; }
-   float  eb3x3() const { return eb9; }
-   float  eb4x4() const { return eb16;}
-   float  eb5x5() const { return eb25;}
-
-   float  eInEE()  const { return totalEInEE; }
-   float  eInEB()  const { return totalEInEB; }
-   float  eInES()  const { return totalEInES; }
-
-   float  eInEEzp()  const { return totalEInEEzp; }
-   float  eInEEzm()  const { return totalEInEEzm; }
-
-   float  eInESzp()  const { return totalEInESzp; }
-   float  eInESzm()  const { return totalEInESzm; }
-
-   int    hitsInEcal() const { return totalHits; }
-   int    hitsInEE()   const { return nHitsInEE; }
-   int    hitsInEB()   const { return nHitsInEB; }
-   int    hitsInES()   const { return nHitsInES; }
-   int    hitsIn1ES()  const { return nHitsIn1ES;}
-   int    hitsIn2ES()  const { return nHitsIn2ES;}
-  
-   int    hitsIn1ESzp()  const { return nHitsIn1ESzp;}
-   int    hitsIn1ESzm()  const { return nHitsIn1ESzm;}
-   int    hitsIn2ESzp()  const { return nHitsIn2ESzp;}
-   int    hitsIn2ESzm()  const { return nHitsIn2ESzm;}       
-
-   int    crystalInEB()   const { return nCrystalInEB;}
-   int    crystalInEEzp() const { return nCrystalInEEzp; }
-   int    crystalInEEzm() const { return nCrystalInEEzm; }
-
-   FloatVector  bX0() const { return eBX0; }
-   FloatVector  eX0() const { return eEX0; }
-
-
-   FloatVector  eIn1ES() const { return eOf1ES; }
-   FloatVector  eIn2ES() const { return eOf2ES; }
-   FloatVector  zOfInES()  const { return zOfES;  }
-
-   FloatVector  eIn1ESzp() const { return eOf1ESzp; }
-   FloatVector  eIn1ESzm() const { return eOf1ESzm; }
- 
-   FloatVector  eIn2ESzp() const { return eOf2ESzp; }
-   FloatVector  eIn2ESzm() const { return eOf2ESzm; }
-
-   FloatVector  phiOfEEHits() const { return phiOfEECaloG4Hit; }
-   FloatVector  etaOfEEHits() const { return etaOfEECaloG4Hit; }
-   FloatVector  tOfEEHits()   const { return tOfEECaloG4Hit;   }
-   FloatVector  eOfEEHits()   const { return eOfEECaloG4Hit;   }
-   FloatVector  eOfEEPlusHits()    const { return eOfEEPlusCaloG4Hit;   }
-   FloatVector  eOfEEMinusHits()   const { return eOfEEMinusCaloG4Hit;   }
-
-
-   FloatVector  phiOfEBHits() const { return phiOfEBCaloG4Hit; }
-   FloatVector  etaOfEBHits() const { return etaOfEBCaloG4Hit; }
-   FloatVector  tOfEBHits()   const { return tOfEBCaloG4Hit;   }
-   FloatVector  eOfEBHits()   const { return eOfEBCaloG4Hit;   }
-
-   FloatVector  phiOfiESHits() const { return phiOfESCaloG4Hit; }
-   FloatVector  etaOfESHits() const { return etaOfESCaloG4Hit; }
-   FloatVector  tOfESHits()   const { return tOfESCaloG4Hit;   }
-   FloatVector  eOfESHits()   const { return eOfESCaloG4Hit;   }
-
-   math::XYZTLorentzVector momentum() const { return theMomentum; }
-   math::XYZTLorentzVector vertex() const  { return theVertex; }
-   
-   int pId()  const { return thePID; }   
+  PEcalValidInfo()
+      : ee1(0.0),
+        ee4(0.0),
+        ee9(0.0),
+        ee16(0.0),
+        ee25(0.0),
+        eb1(0.0),
+        eb4(0.0),
+        eb9(0.0),
+        eb16(0.0),
+        eb25(0.0),
+        totalEInEE(0.0),
+        totalEInEB(0.0),
+        totalEInES(0.0),
+        totalHits(0),
+        nHitsInEE(0),
+        nHitsInEB(0),
+        nHitsInES(0),
+        nHitsIn1ES(0),
+        nHitsIn2ES(0) {}
+
+  ~PEcalValidInfo() {}
+
+  // Get functions.
+  float ee1x1() const { return ee1; }
+  float ee2x2() const { return ee4; }
+  float ee3x3() const { return ee9; }
+  float ee4x4() const { return ee16; }
+  float ee5x5() const { return ee25; }
+
+  float eb1x1() const { return eb1; }
+  float eb2x2() const { return eb4; }
+  float eb3x3() const { return eb9; }
+  float eb4x4() const { return eb16; }
+  float eb5x5() const { return eb25; }
+
+  float eInEE() const { return totalEInEE; }
+  float eInEB() const { return totalEInEB; }
+  float eInES() const { return totalEInES; }
+
+  float eInEEzp() const { return totalEInEEzp; }
+  float eInEEzm() const { return totalEInEEzm; }
+
+  float eInESzp() const { return totalEInESzp; }
+  float eInESzm() const { return totalEInESzm; }
+
+  int hitsInEcal() const { return totalHits; }
+  int hitsInEE() const { return nHitsInEE; }
+  int hitsInEB() const { return nHitsInEB; }
+  int hitsInES() const { return nHitsInES; }
+  int hitsIn1ES() const { return nHitsIn1ES; }
+  int hitsIn2ES() const { return nHitsIn2ES; }
+
+  int hitsIn1ESzp() const { return nHitsIn1ESzp; }
+  int hitsIn1ESzm() const { return nHitsIn1ESzm; }
+  int hitsIn2ESzp() const { return nHitsIn2ESzp; }
+  int hitsIn2ESzm() const { return nHitsIn2ESzm; }
+
+  int crystalInEB() const { return nCrystalInEB; }
+  int crystalInEEzp() const { return nCrystalInEEzp; }
+  int crystalInEEzm() const { return nCrystalInEEzm; }
+
+  FloatVector bX0() const { return eBX0; }
+  FloatVector eX0() const { return eEX0; }
+
+  FloatVector eIn1ES() const { return eOf1ES; }
+  FloatVector eIn2ES() const { return eOf2ES; }
+  FloatVector zOfInES() const { return zOfES; }
+
+  FloatVector eIn1ESzp() const { return eOf1ESzp; }
+  FloatVector eIn1ESzm() const { return eOf1ESzm; }
+
+  FloatVector eIn2ESzp() const { return eOf2ESzp; }
+  FloatVector eIn2ESzm() const { return eOf2ESzm; }
+
+  FloatVector phiOfEEHits() const { return phiOfEECaloG4Hit; }
+  FloatVector etaOfEEHits() const { return etaOfEECaloG4Hit; }
+  FloatVector tOfEEHits() const { return tOfEECaloG4Hit; }
+  FloatVector eOfEEHits() const { return eOfEECaloG4Hit; }
+  FloatVector eOfEEPlusHits() const { return eOfEEPlusCaloG4Hit; }
+  FloatVector eOfEEMinusHits() const { return eOfEEMinusCaloG4Hit; }
+
+  FloatVector phiOfEBHits() const { return phiOfEBCaloG4Hit; }
+  FloatVector etaOfEBHits() const { return etaOfEBCaloG4Hit; }
+  FloatVector tOfEBHits() const { return tOfEBCaloG4Hit; }
+  FloatVector eOfEBHits() const { return eOfEBCaloG4Hit; }
+
+  FloatVector phiOfiESHits() const { return phiOfESCaloG4Hit; }
+  FloatVector etaOfESHits() const { return etaOfESCaloG4Hit; }
+  FloatVector tOfESHits() const { return tOfESCaloG4Hit; }
+  FloatVector eOfESHits() const { return eOfESCaloG4Hit; }
+
+  math::XYZTLorentzVector momentum() const { return theMomentum; }
+  math::XYZTLorentzVector vertex() const { return theVertex; }
+
+  int pId() const { return thePID; }
 
 private:
- 
-   float  ee1;       //Energy deposition in cluser1x1
-   float  ee4;       //Energy deposition in cluser2x2
-   float  ee9;       //Energy deposition in cluser3x3
-   float  ee16;      //Energy deposition in cluser4x4
-   float  ee25;      //Energy deposition in cluser5x5
-
-   float  eb1;       //Energy deposition in cluser1x1
-   float  eb4;       //Energy deposition in cluser2x2
-   float  eb9;       //Energy deposition in cluser3x3
-   float  eb16;      //Energy deposition in cluser4x4
-   float  eb25;      //Energy deposition in cluser5x5
-
-
- 
-   float  totalEInEE;       //The Total Energy deposited in EE;
-   float  totalEInEB;       //The Total Energy deposited in EB;
-   float  totalEInES;       //The Total Energy deposited in ES;
- 
-   float  totalEInEEzp;
-   float  totalEInEEzm;
-   float  totalEInESzp;
-   float  totalEInESzm;
-
-
-
-   int totalHits;          //Total number of Hits.
-   int nHitsInEE;          //Total number of Hits in EE.
-   int nHitsInEB;          //Total number of Hits in EB.
-   int nHitsInES;          //Total number of Hits in ES.
-   int nHitsIn1ES;         //Total number of Hits in 1st Layer of ES;
-   int nHitsIn2ES;         //Total number of Hits in 2nd Layer of ES;
-
-   int nHitsIn1ESzp;
-   int nHitsIn1ESzm;
-   int nHitsIn2ESzp;
-   int nHitsIn2ESzm;       
-
-   int nCrystalInEB;
-   int nCrystalInEEzp;
-   int nCrystalInEEzm;
-
-
-   FloatVector eBX0;       // longitudinal Energy deposition In EB.
-   FloatVector eEX0;       // longitudinal Energy deposition In EE.
-
-   FloatVector  eOf1ES;    // Energy deposition of Hits in 1st layer of ES;
-   FloatVector  eOf2ES;    // Energy deposition of Hits in 2nd layer of ES;              
-   FloatVector  zOfES;
-
-
-   FloatVector  eOf1ESzp;
-   FloatVector  eOf1ESzm;
-   FloatVector  eOf2ESzp;
-   FloatVector  eOf2ESzm;
-
-   FloatVector  phiOfEECaloG4Hit;    // Phi of Hits.
-   FloatVector  etaOfEECaloG4Hit;    // Eta of Hits.
-   FloatVector  tOfEECaloG4Hit;      // Tof of Hits.
-   FloatVector  eOfEECaloG4Hit;      // Energy depostion of Hits.
-   FloatVector  eOfEEPlusCaloG4Hit;       // Energy depostion of Hits.
-   FloatVector  eOfEEMinusCaloG4Hit;      // Energy depostion of Hits.
-
-   FloatVector  phiOfESCaloG4Hit;    // Phi of Hits.
-   FloatVector  etaOfESCaloG4Hit;    // Eta of Hits.
-   FloatVector  tOfESCaloG4Hit;      // Tof of Hits.
-   FloatVector  eOfESCaloG4Hit;      // Energy depostion of Hits.
-
-   FloatVector  phiOfEBCaloG4Hit;    // Phi of Hits.
-   FloatVector  etaOfEBCaloG4Hit;    // Eta of Hits.
-   FloatVector  tOfEBCaloG4Hit;      // Tof of Hits.
-   FloatVector  eOfEBCaloG4Hit;      // Energy depostion of Hits.
-
-
-
-   int thePID;                      // add more ??
-   math::XYZTLorentzVector theMomentum;  
-   math::XYZTLorentzVector theVertex;
+  float ee1;   //Energy deposition in cluser1x1
+  float ee4;   //Energy deposition in cluser2x2
+  float ee9;   //Energy deposition in cluser3x3
+  float ee16;  //Energy deposition in cluser4x4
+  float ee25;  //Energy deposition in cluser5x5
+
+  float eb1;   //Energy deposition in cluser1x1
+  float eb4;   //Energy deposition in cluser2x2
+  float eb9;   //Energy deposition in cluser3x3
+  float eb16;  //Energy deposition in cluser4x4
+  float eb25;  //Energy deposition in cluser5x5
+
+  float totalEInEE;  //The Total Energy deposited in EE;
+  float totalEInEB;  //The Total Energy deposited in EB;
+  float totalEInES;  //The Total Energy deposited in ES;
+
+  float totalEInEEzp;
+  float totalEInEEzm;
+  float totalEInESzp;
+  float totalEInESzm;
+
+  int totalHits;   //Total number of Hits.
+  int nHitsInEE;   //Total number of Hits in EE.
+  int nHitsInEB;   //Total number of Hits in EB.
+  int nHitsInES;   //Total number of Hits in ES.
+  int nHitsIn1ES;  //Total number of Hits in 1st Layer of ES;
+  int nHitsIn2ES;  //Total number of Hits in 2nd Layer of ES;
+
+  int nHitsIn1ESzp;
+  int nHitsIn1ESzm;
+  int nHitsIn2ESzp;
+  int nHitsIn2ESzm;
+
+  int nCrystalInEB;
+  int nCrystalInEEzp;
+  int nCrystalInEEzm;
+
+  FloatVector eBX0;  // longitudinal Energy deposition In EB.
+  FloatVector eEX0;  // longitudinal Energy deposition In EE.
+
+  FloatVector eOf1ES;  // Energy deposition of Hits in 1st layer of ES;
+  FloatVector eOf2ES;  // Energy deposition of Hits in 2nd layer of ES;
+  FloatVector zOfES;
+
+  FloatVector eOf1ESzp;
+  FloatVector eOf1ESzm;
+  FloatVector eOf2ESzp;
+  FloatVector eOf2ESzm;
+
+  FloatVector phiOfEECaloG4Hit;     // Phi of Hits.
+  FloatVector etaOfEECaloG4Hit;     // Eta of Hits.
+  FloatVector tOfEECaloG4Hit;       // Tof of Hits.
+  FloatVector eOfEECaloG4Hit;       // Energy depostion of Hits.
+  FloatVector eOfEEPlusCaloG4Hit;   // Energy depostion of Hits.
+  FloatVector eOfEEMinusCaloG4Hit;  // Energy depostion of Hits.
+
+  FloatVector phiOfESCaloG4Hit;  // Phi of Hits.
+  FloatVector etaOfESCaloG4Hit;  // Eta of Hits.
+  FloatVector tOfESCaloG4Hit;    // Tof of Hits.
+  FloatVector eOfESCaloG4Hit;    // Energy depostion of Hits.
+
+  FloatVector phiOfEBCaloG4Hit;  // Phi of Hits.
+  FloatVector etaOfEBCaloG4Hit;  // Eta of Hits.
+  FloatVector tOfEBCaloG4Hit;    // Tof of Hits.
+  FloatVector eOfEBCaloG4Hit;    // Energy depostion of Hits.
+
+  int thePID;  // add more ??
+  math::XYZTLorentzVector theMomentum;
+  math::XYZTLorentzVector theVertex;
 };
 
-
-#endif // endif PECal
+#endif  // endif PECal
 
 ///////////////////////////////////////////////////////////////////////////////
 // PHcalValidInfoJets
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef  PHcalValidInfoJets_H
-#define  PHcalValidInfoJets_H
+#ifndef PHcalValidInfoJets_H
+#define PHcalValidInfoJets_H
 
 #include <string>
 #include <vector>
@@ -1160,59 +1253,61 @@ class PEcalValidInfo
 class SimG4HcalValidation;
 
 class PHcalValidInfoJets {
-
   friend class SimG4HcalValidation;
 
 public:
-       
-  PHcalValidInfoJets(): nJetHit(0), nJet(0), ecalJet(0.), hcalJet(0.),
-			hoJet(0.), etotJet(0.), detaJet(0.), dphiJet(0.),
-			drJet(0.), dijetM(0.) {}
+  PHcalValidInfoJets()
+      : nJetHit(0),
+        nJet(0),
+        ecalJet(0.),
+        hcalJet(0.),
+        hoJet(0.),
+        etotJet(0.),
+        detaJet(0.),
+        dphiJet(0.),
+        drJet(0.),
+        dijetM(0.) {}
   virtual ~PHcalValidInfoJets() {}
 
   // acceess
 
-  std::vector<float> jethite() const {return jetHite;}
-  std::vector<float> jethitr() const {return jetHitr;}
-  std::vector<float> jethitt() const {return jetHitt;}
-  int                njethit() const {return nJetHit;}
+  std::vector<float> jethite() const { return jetHite; }
+  std::vector<float> jethitr() const { return jetHitr; }
+  std::vector<float> jethitt() const { return jetHitt; }
+  int njethit() const { return nJetHit; }
 
-  std::vector<float> jete()    const {return jetE;}
-  std::vector<float> jeteta()  const {return jetEta;}
-  std::vector<float> jetphi()  const {return jetPhi;}
-  int                njet()    const {return nJet;} 
+  std::vector<float> jete() const { return jetE; }
+  std::vector<float> jeteta() const { return jetEta; }
+  std::vector<float> jetphi() const { return jetPhi; }
+  int njet() const { return nJet; }
 
-  float              ecaljet() const {return ecalJet;}
-  float              hcaljet() const {return hcalJet;}
-  float                hojet() const {return   hoJet;}
-  float              etotjet() const {return etotJet;}
+  float ecaljet() const { return ecalJet; }
+  float hcaljet() const { return hcalJet; }
+  float hojet() const { return hoJet; }
+  float etotjet() const { return etotJet; }
 
-  float              detajet() const {return detaJet;}
-  float              dphijet() const {return dphiJet;}
-  float                drjet() const {return   drJet;}
-  float               dijetm() const {return  dijetM;}
+  float detajet() const { return detaJet; }
+  float dphijet() const { return dphiJet; }
+  float drjet() const { return drJet; }
+  float dijetm() const { return dijetM; }
 
   // fill
-  void fillTProfileJet      (double e, double r, double t);
-  void fillEcollectJet      (double ee, double he, double hoe, double etot);
-  void fillEtaPhiProfileJet (double eta0, double phi0, double eta,
-                             double phi, double dist);
-  void fillJets             (const std::vector<double>& enj, const std::vector<double>& etaj,
-			     const std::vector<double>& phij);
-  void fillDiJets           (double mass);
+  void fillTProfileJet(double e, double r, double t);
+  void fillEcollectJet(double ee, double he, double hoe, double etot);
+  void fillEtaPhiProfileJet(double eta0, double phi0, double eta, double phi, double dist);
+  void fillJets(const std::vector<double>& enj, const std::vector<double>& etaj, const std::vector<double>& phij);
+  void fillDiJets(double mass);
 
 private:
-
-  int                 nJetHit, nJet;
-  float               ecalJet, hcalJet, hoJet, etotJet;
-  float               detaJet, dphiJet, drJet, dijetM;
-  std::vector<float>  jetHite;
-  std::vector<float>  jetHitr;
-  std::vector<float>  jetHitt;
-  std::vector<float>  jetE;
-  std::vector<float>  jetEta;
-  std::vector<float>  jetPhi;
-
+  int nJetHit, nJet;
+  float ecalJet, hcalJet, hoJet, etotJet;
+  float detaJet, dphiJet, drJet, dijetM;
+  std::vector<float> jetHite;
+  std::vector<float> jetHitr;
+  std::vector<float> jetHitt;
+  std::vector<float> jetE;
+  std::vector<float> jetEta;
+  std::vector<float> jetPhi;
 };
 
 #endif
@@ -1221,8 +1316,8 @@ class PHcalValidInfoJets {
 // PHcalValidInfoLayer
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef  PHcalValidInfoLayer_H
-#define  PHcalValidInfoLayer_H
+#ifndef PHcalValidInfoLayer_H
+#define PHcalValidInfoLayer_H
 
 #include <string>
 #include <vector>
@@ -1231,60 +1326,53 @@ class PHcalValidInfoJets {
 class SimG4HcalValidation;
 
 class PHcalValidInfoLayer {
-
   friend class SimG4HcalValidation;
 
 public:
-       
-  PHcalValidInfoLayer(): hitN(0), eHO(0.0),eHBHE(0.0),eEBEE(0.0),elongHF(0.0),
-			 eshortHF(0.0), eEcalHF(0.0), eHcalHF(0.0) {}
+  PHcalValidInfoLayer()
+      : hitN(0), eHO(0.0), eHBHE(0.0), eEBEE(0.0), elongHF(0.0), eshortHF(0.0), eEcalHF(0.0), eHcalHF(0.0) {}
   virtual ~PHcalValidInfoLayer() {}
 
   // access
-  int                    nHit()   const {return hitN;}
-
-  float                   eho()   const {return eHO;}    
-  float                 ehbhe()   const {return eHBHE;}    
-  float                 eebee()   const {return eEBEE;}    
-  float               elonghf()   const {return elongHF;}    
-  float              eshorthf()   const {return eshortHF;}    
-  float               eecalhf()   const {return eEcalHF;}    
-  float               ehcalhf()   const {return eHcalHF;}    
-
-  std::vector<float>   elayer()   const {return eLayer;}
-  std::vector<float>   edepth()   const {return eDepth;}
-
-  std::vector<float>   etaHit()   const {return hitEta;} 
-  std::vector<float>   phiHit()   const {return hitPhi;} 
-  std::vector<float>     eHit()   const {return hitE;} 
-  std::vector<float>     tHit()   const {return hitTime;} 
-  std::vector<float> layerHit()   const {return hitLayer;} 
-  std::vector<float>    idHit()   const {return hitId;} 
+  int nHit() const { return hitN; }
+
+  float eho() const { return eHO; }
+  float ehbhe() const { return eHBHE; }
+  float eebee() const { return eEBEE; }
+  float elonghf() const { return elongHF; }
+  float eshorthf() const { return eshortHF; }
+  float eecalhf() const { return eEcalHF; }
+  float ehcalhf() const { return eHcalHF; }
+
+  std::vector<float> elayer() const { return eLayer; }
+  std::vector<float> edepth() const { return eDepth; }
+
+  std::vector<float> etaHit() const { return hitEta; }
+  std::vector<float> phiHit() const { return hitPhi; }
+  std::vector<float> eHit() const { return hitE; }
+  std::vector<float> tHit() const { return hitTime; }
+  std::vector<float> layerHit() const { return hitLayer; }
+  std::vector<float> idHit() const { return hitId; }
 
   // filling
-  void fillLayers (double el[], double ed[], double ho, double hbhe,
-		   double ebee);
-  void fillHF     (double fibl, double fibs, double enec, double enhc);
-  void fillHits   (int Nhits, int lay, int unitID, double eta, double phi, 
-		   double ehit, double t); 
+  void fillLayers(double el[], double ed[], double ho, double hbhe, double ebee);
+  void fillHF(double fibl, double fibs, double enec, double enhc);
+  void fillHits(int Nhits, int lay, int unitID, double eta, double phi, double ehit, double t);
   //  void clear();
 
-
 private:
-
-  int                hitN;
-  float              eHO, eHBHE, eEBEE;
-  float              elongHF, eshortHF, eEcalHF, eHcalHF;
+  int hitN;
+  float eHO, eHBHE, eEBEE;
+  float elongHF, eshortHF, eEcalHF, eHcalHF;
   std::vector<float> eLayer;
   std::vector<float> eDepth;
   // SimHits parameters
-  std::vector<float> hitLayer; // float for int
-  std::vector<float> hitId;    // float for int
+  std::vector<float> hitLayer;  // float for int
+  std::vector<float> hitId;     // float for int
   std::vector<float> hitEta;
   std::vector<float> hitPhi;
   std::vector<float> hitE;
   std::vector<float> hitTime;
-
 };
 
 #endif
@@ -1293,8 +1381,8 @@ class PHcalValidInfoLayer {
 // PHcalValidInfoNxN
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef  PHcalValidInfoNxN_H
-#define  PHcalValidInfoNxN_H
+#ifndef PHcalValidInfoNxN_H
+#define PHcalValidInfoNxN_H
 
 #include <string>
 #include <vector>
@@ -1302,48 +1390,42 @@ class PHcalValidInfoLayer {
 
 class SimG4HcalValidation;
 
-
 class PHcalValidInfoNxN {
-
   friend class SimG4HcalValidation;
 
 public:
-       
-  PHcalValidInfoNxN(): nNxN(0), ecalNxNr(0), hcalNxNr(0.), hoNxNr(0.), 
-    etotNxNr(0.), ecalNxN(0.), hcalNxN(0.), hoNxN(0.), etotNxN(0.) {}
+  PHcalValidInfoNxN()
+      : nNxN(0), ecalNxNr(0), hcalNxNr(0.), hoNxNr(0.), etotNxNr(0.), ecalNxN(0.), hcalNxN(0.), hoNxN(0.), etotNxN(0.) {}
   virtual ~PHcalValidInfoNxN() {}
 
   // access
-  std::vector<float> idnxn() const {return idNxN;}
-  std::vector<float>  enxn() const {return  eNxN;}
-  std::vector<float>  tnxn() const {return  tNxN;}
-  int                 nnxn() const {return  nNxN;}
-  
-  float           ecalnxnr() const {return ecalNxNr;}
-  float           hcalnxnr() const {return hcalNxNr;}
-  float             honxnr() const {return   hoNxNr;}
-  float           etotnxnr() const {return etotNxNr;}
-
-  float           ecalnxn () const {return ecalNxN ;}
-  float           hcalnxn () const {return hcalNxN ;}
-  float             honxn () const {return   hoNxN ;}
-  float           etotnxn () const {return etotNxN ;}
-  
+  std::vector<float> idnxn() const { return idNxN; }
+  std::vector<float> enxn() const { return eNxN; }
+  std::vector<float> tnxn() const { return tNxN; }
+  int nnxn() const { return nNxN; }
+
+  float ecalnxnr() const { return ecalNxNr; }
+  float hcalnxnr() const { return hcalNxNr; }
+  float honxnr() const { return hoNxNr; }
+  float etotnxnr() const { return etotNxNr; }
+
+  float ecalnxn() const { return ecalNxN; }
+  float hcalnxn() const { return hcalNxN; }
+  float honxn() const { return hoNxN; }
+  float etotnxn() const { return etotNxN; }
 
   // fill
-  void fillHvsE        (double ee, double he, double hoe, double etot);
-  void fillEcollectNxN (double een, double hen, double hoen, double etotn);
-  void fillTProfileNxN (double e, int i, double t);
+  void fillHvsE(double ee, double he, double hoe, double etot);
+  void fillEcollectNxN(double een, double hen, double hoen, double etotn);
+  void fillTProfileNxN(double e, int i, double t);
 
 private:
-
-  int                nNxN;
-  float              ecalNxNr, hcalNxNr, hoNxNr, etotNxNr;
-  float              ecalNxN,  hcalNxN,  hoNxN,  etotNxN;
-  std::vector<float> idNxN; // float for int
+  int nNxN;
+  float ecalNxNr, hcalNxNr, hoNxNr, etotNxNr;
+  float ecalNxN, hcalNxN, hoNxN, etotNxN;
+  std::vector<float> idNxN;  // float for int
   std::vector<float> eNxN;
   std::vector<float> tNxN;
-
 };
 
 #endif
@@ -1361,24 +1443,19 @@ class PHcalValidInfoNxN {
 /// Class PMuonSimHit defines structure of simulated hits data in CSC,DT,RPC
 /// for validation. It also includes vertex and track info.
 
-class PMuonSimHit
-{
- public:
-
-  PMuonSimHit(): nRawGenPart(0), nG4Vtx(0), nG4Trk(0), 
-                 nCSCHits(0), nDTHits(0), nRPCHits(0) {}
-  virtual ~PMuonSimHit(){}
+class PMuonSimHit {
+public:
+  PMuonSimHit() : nRawGenPart(0), nG4Vtx(0), nG4Trk(0), nCSCHits(0), nDTHits(0), nRPCHits(0) {}
+  virtual ~PMuonSimHit() {}
 
-  struct Vtx
-  {
-    Vtx(): x(0), y(0), z(0) {}
+  struct Vtx {
+    Vtx() : x(0), y(0), z(0) {}
     float x;
     float y;
     float z;
   };
 
-  struct Trk
-  {
+  struct Trk {
     Trk() : pt(0), e(0), eta(0), phi(0) {}
     float pt;
     float e;
@@ -1386,22 +1463,35 @@ class PMuonSimHit
     float phi;
   };
 
-
-  struct CSC
-  {
-    CSC() :
-         _cscId(0), 
-         _detUnitId(0),   _trackId(0),     _processType(0), 
-         _particleType(0),_pabs(0),
-         _globposz(0),    _globposphi(0),  _globposeta(0), 
-	 _locposx(0),     _locposy(0),     _locposz(0), 
-	 _locdirx(0),     _locdiry(0),     _locdirz(0), 
-         _locdirtheta(0), _locdirphi(0),
-	 _exitpointx(0),  _exitpointy(0),  _exitpointz(0),
-	 _entrypointx(0), _entrypointy(0), _entrypointz(0), 
-         _enloss(0),      _tof(0) {}
- 
-    int   _cscId;
+  struct CSC {
+    CSC()
+        : _cscId(0),
+          _detUnitId(0),
+          _trackId(0),
+          _processType(0),
+          _particleType(0),
+          _pabs(0),
+          _globposz(0),
+          _globposphi(0),
+          _globposeta(0),
+          _locposx(0),
+          _locposy(0),
+          _locposz(0),
+          _locdirx(0),
+          _locdiry(0),
+          _locdirz(0),
+          _locdirtheta(0),
+          _locdirphi(0),
+          _exitpointx(0),
+          _exitpointy(0),
+          _exitpointz(0),
+          _entrypointx(0),
+          _entrypointy(0),
+          _entrypointz(0),
+          _enloss(0),
+          _tof(0) {}
+
+    int _cscId;
     unsigned int _detUnitId;
     float _trackId;
     float _processType;
@@ -1428,18 +1518,32 @@ class PMuonSimHit
     float _tof;
   };
 
-  struct DT
-  {
-    DT() : 
-         _detUnitId(0),   _trackId(0),     _processType(0), 
-         _particleType(0),_pabs(0), 
-         _globposz(0),    _globposphi(0),  _globposeta(0),
-	 _locposx(0),     _locposy(0),     _locposz(0), 
-	 _locdirx(0),     _locdiry(0),     _locdirz(0), 
-         _locdirtheta(0), _locdirphi(0),
-	 _exitpointx(0),  _exitpointy(0),  _exitpointz(0),
-	 _entrypointx(0), _entrypointy(0), _entrypointz(0), 
-         _enloss(0),      _tof(0) {}
+  struct DT {
+    DT()
+        : _detUnitId(0),
+          _trackId(0),
+          _processType(0),
+          _particleType(0),
+          _pabs(0),
+          _globposz(0),
+          _globposphi(0),
+          _globposeta(0),
+          _locposx(0),
+          _locposy(0),
+          _locposz(0),
+          _locdirx(0),
+          _locdiry(0),
+          _locdirz(0),
+          _locdirtheta(0),
+          _locdirphi(0),
+          _exitpointx(0),
+          _exitpointy(0),
+          _exitpointz(0),
+          _entrypointx(0),
+          _entrypointy(0),
+          _entrypointz(0),
+          _enloss(0),
+          _tof(0) {}
 
     unsigned int _detUnitId;
     float _trackId;
@@ -1467,18 +1571,32 @@ class PMuonSimHit
     float _tof;
   };
 
-  struct RPC
-  {
-    RPC() : 
-         _detUnitId(0),   _trackId(0),     _processType(0), 
-         _particleType(0),_pabs(0), 
-         _globposz(0),    _globposphi(0),  _globposeta(0),
-	 _locposx(0),     _locposy(0),     _locposz(0), 
-	 _locdirx(0),     _locdiry(0),     _locdirz(0), 
-         _locdirtheta(0), _locdirphi(0),
-	 _exitpointx(0),  _exitpointy(0),  _exitpointz(0),
-	 _entrypointx(0), _entrypointy(0), _entrypointz(0), 
-         _enloss(0),      _tof(0) {}
+  struct RPC {
+    RPC()
+        : _detUnitId(0),
+          _trackId(0),
+          _processType(0),
+          _particleType(0),
+          _pabs(0),
+          _globposz(0),
+          _globposphi(0),
+          _globposeta(0),
+          _locposx(0),
+          _locposy(0),
+          _locposz(0),
+          _locdirx(0),
+          _locdiry(0),
+          _locdirz(0),
+          _locdirtheta(0),
+          _locdirphi(0),
+          _exitpointx(0),
+          _exitpointy(0),
+          _exitpointz(0),
+          _entrypointx(0),
+          _entrypointy(0),
+          _entrypointz(0),
+          _enloss(0),
+          _tof(0) {}
 
     unsigned int _detUnitId;
     float _trackId;
@@ -1510,137 +1628,132 @@ class PMuonSimHit
   typedef std::vector<Trk> TrkVector;
 
   typedef std::vector<CSC> CSCVector;
-  typedef std::vector<DT>  DTVector;
-  typedef std::vector<RPC>  RPCVector;
+  typedef std::vector<DT> DTVector;
+  typedef std::vector<RPC> RPCVector;
 
   /// put functions
 
   void putRawGenPart(int n);
 
-  void putG4Vtx(const std::vector<float>& x,   const std::vector<float>& y,
-                const std::vector<float>& z);
-  void putG4Trk(const std::vector<float>& pt,  const std::vector<float>& e,
-                const std::vector<float>& eta, const std::vector<float>& phi);  
-
-  void putCSCHits(
-               const std::vector<int>&  _cscId,
-               const std::vector<unsigned int>& _detUnitId,
-	       const std::vector<float>& _trackId , 
-               const std::vector<float>& _processType,
-	       const std::vector<float>& _particleType, 
-               const std::vector<float>& _pabs,
-	       const std::vector<float>& _globposz, 
-               const std::vector<float>& _globposphi, 
-               const std::vector<float>& _globposeta,
-	       const std::vector<float>& _locposx, 
-               const std::vector<float>& _locposy, 
-               const std::vector<float>& _locposz,
-	       const std::vector<float>& _locdirx, 
-               const std::vector<float>& _locdiry, 
-               const std::vector<float>& _locdirz,
-	       const std::vector<float>& _locdirtheta, 
-               const std::vector<float>& _locdirphi, 
-	       const std::vector<float>& _exitpointx, 
-               const std::vector<float>& _exitpointy, 
-               const std::vector<float>& _exitpointz,
-	       const std::vector<float>& _entrypointx, 
-               const std::vector<float>& _entrypointy, 
-               const std::vector<float>& _entrypointz,
-	       const std::vector<float>& _enloss, 
-               const std::vector<float>& _tof);   
-
-  void putDTHits(
-               const std::vector<unsigned int>& _detUnitId,
-	       const std::vector<float>& _trackId , 
-               const std::vector<float>& _processType,
-	       const std::vector<float>& _particleType, 
-               const std::vector<float>& _pabs,
-	       const std::vector<float>& _globposz, 
-               const std::vector<float>& _globposphi, 
-               const std::vector<float>& _globposeta,
-	       const std::vector<float>& _locposx, 
-               const std::vector<float>& _locposy, 
-               const std::vector<float>& _locposz,
-	       const std::vector<float>& _locdirx, 
-               const std::vector<float>& _locdiry, 
-               const std::vector<float>& _locdirz,
-	       const std::vector<float>& _locdirtheta, 
-               const std::vector<float>& _locdirphi, 
-	       const std::vector<float>& _exitpointx, 
-               const std::vector<float>& _exitpointy, 
-               const std::vector<float>& _exitpointz,
-	       const std::vector<float>& _entrypointx, 
-               const std::vector<float>& _entrypointy, 
-               const std::vector<float>& _entrypointz,
-	       const std::vector<float>& _enloss, 
-               const std::vector<float>& _tof); 
-
-  void putRPCHits(
-               const std::vector<unsigned int>& _detUnitId,
-	       const std::vector<float>& _trackId , 
-               const std::vector<float>& _processType,
-	       const std::vector<float>& _particleType, 
-               const std::vector<float>& _pabs,
-	       const std::vector<float>& _globposz, 
-               const std::vector<float>& _globposphi, 
-               const std::vector<float>& _globposeta,
-	       const std::vector<float>& _locposx, 
-               const std::vector<float>& _locposy, 
-               const std::vector<float>& _locposz,
-	       const std::vector<float>& _locdirx, 
-               const std::vector<float>& _locdiry, 
-               const std::vector<float>& _locdirz,
-	       const std::vector<float>& _locdirtheta, 
-               const std::vector<float>& _locdirphi, 
-	       const std::vector<float>& _exitpointx, 
-               const std::vector<float>& _exitpointy, 
-               const std::vector<float>& _exitpointz,
-	       const std::vector<float>& _entrypointx, 
-               const std::vector<float>& _entrypointy, 
-               const std::vector<float>& _entrypointz,
-	       const std::vector<float>& _enloss, 
-               const std::vector<float>& _tof); 
+  void putG4Vtx(const std::vector<float>& x, const std::vector<float>& y, const std::vector<float>& z);
+  void putG4Trk(const std::vector<float>& pt,
+                const std::vector<float>& e,
+                const std::vector<float>& eta,
+                const std::vector<float>& phi);
+
+  void putCSCHits(const std::vector<int>& _cscId,
+                  const std::vector<unsigned int>& _detUnitId,
+                  const std::vector<float>& _trackId,
+                  const std::vector<float>& _processType,
+                  const std::vector<float>& _particleType,
+                  const std::vector<float>& _pabs,
+                  const std::vector<float>& _globposz,
+                  const std::vector<float>& _globposphi,
+                  const std::vector<float>& _globposeta,
+                  const std::vector<float>& _locposx,
+                  const std::vector<float>& _locposy,
+                  const std::vector<float>& _locposz,
+                  const std::vector<float>& _locdirx,
+                  const std::vector<float>& _locdiry,
+                  const std::vector<float>& _locdirz,
+                  const std::vector<float>& _locdirtheta,
+                  const std::vector<float>& _locdirphi,
+                  const std::vector<float>& _exitpointx,
+                  const std::vector<float>& _exitpointy,
+                  const std::vector<float>& _exitpointz,
+                  const std::vector<float>& _entrypointx,
+                  const std::vector<float>& _entrypointy,
+                  const std::vector<float>& _entrypointz,
+                  const std::vector<float>& _enloss,
+                  const std::vector<float>& _tof);
+
+  void putDTHits(const std::vector<unsigned int>& _detUnitId,
+                 const std::vector<float>& _trackId,
+                 const std::vector<float>& _processType,
+                 const std::vector<float>& _particleType,
+                 const std::vector<float>& _pabs,
+                 const std::vector<float>& _globposz,
+                 const std::vector<float>& _globposphi,
+                 const std::vector<float>& _globposeta,
+                 const std::vector<float>& _locposx,
+                 const std::vector<float>& _locposy,
+                 const std::vector<float>& _locposz,
+                 const std::vector<float>& _locdirx,
+                 const std::vector<float>& _locdiry,
+                 const std::vector<float>& _locdirz,
+                 const std::vector<float>& _locdirtheta,
+                 const std::vector<float>& _locdirphi,
+                 const std::vector<float>& _exitpointx,
+                 const std::vector<float>& _exitpointy,
+                 const std::vector<float>& _exitpointz,
+                 const std::vector<float>& _entrypointx,
+                 const std::vector<float>& _entrypointy,
+                 const std::vector<float>& _entrypointz,
+                 const std::vector<float>& _enloss,
+                 const std::vector<float>& _tof);
+
+  void putRPCHits(const std::vector<unsigned int>& _detUnitId,
+                  const std::vector<float>& _trackId,
+                  const std::vector<float>& _processType,
+                  const std::vector<float>& _particleType,
+                  const std::vector<float>& _pabs,
+                  const std::vector<float>& _globposz,
+                  const std::vector<float>& _globposphi,
+                  const std::vector<float>& _globposeta,
+                  const std::vector<float>& _locposx,
+                  const std::vector<float>& _locposy,
+                  const std::vector<float>& _locposz,
+                  const std::vector<float>& _locdirx,
+                  const std::vector<float>& _locdiry,
+                  const std::vector<float>& _locdirz,
+                  const std::vector<float>& _locdirtheta,
+                  const std::vector<float>& _locdirphi,
+                  const std::vector<float>& _exitpointx,
+                  const std::vector<float>& _exitpointy,
+                  const std::vector<float>& _exitpointz,
+                  const std::vector<float>& _entrypointx,
+                  const std::vector<float>& _entrypointy,
+                  const std::vector<float>& _entrypointz,
+                  const std::vector<float>& _enloss,
+                  const std::vector<float>& _tof);
 
   /// get functions
 
-  int getnRawGenPart() {return nRawGenPart;}
-  int getnG4Vtx() {return nG4Vtx;}
-  int getnG4Trk() {return nG4Trk;}
+  int getnRawGenPart() { return nRawGenPart; }
+  int getnG4Vtx() { return nG4Vtx; }
+  int getnG4Trk() { return nG4Trk; }
 
-  VtxVector getG4Vtx() {return G4Vtx;}
-  TrkVector getG4Trk() {return G4Trk;}
+  VtxVector getG4Vtx() { return G4Vtx; }
+  TrkVector getG4Trk() { return G4Trk; }
 
-  int getnCSCHits() {return nCSCHits;}
-  CSCVector getCSCHits() {return CSCHits;}
+  int getnCSCHits() { return nCSCHits; }
+  CSCVector getCSCHits() { return CSCHits; }
 
-  int getnDTHits() {return nDTHits;}
-  DTVector getDTHits() {return DTHits;}
+  int getnDTHits() { return nDTHits; }
+  DTVector getDTHits() { return DTHits; }
 
-  int getnRPCHits() {return nRPCHits;}
-  RPCVector getRPCHits() {return RPCHits;}
+  int getnRPCHits() { return nRPCHits; }
+  RPCVector getRPCHits() { return RPCHits; }
 
- 
 private:
-
   /// G4MC info
 
   int nRawGenPart;
   int nG4Vtx;
-  VtxVector G4Vtx; 
-  int nG4Trk; 
+  VtxVector G4Vtx;
+  int nG4Trk;
   TrkVector G4Trk;
- 
+
   /// Hit info
 
   int nCSCHits;
-  CSCVector CSCHits; 
+  CSCVector CSCHits;
 
   int nDTHits;
-  DTVector DTHits; 
+  DTVector DTHits;
 
   int nRPCHits;
-  RPCVector RPCHits; 
-
+  RPCVector RPCHits;
 };
 
 #endif
@@ -1655,24 +1768,19 @@ class PMuonSimHit
 #include <vector>
 #include <memory>
 
-class PTrackerSimHit
-{
-
- public:
-
-  PTrackerSimHit(): nRawGenPart(0), nG4Vtx(0), nG4Trk(0), nHits(0) {}
-  virtual ~PTrackerSimHit(){}
+class PTrackerSimHit {
+public:
+  PTrackerSimHit() : nRawGenPart(0), nG4Vtx(0), nG4Trk(0), nHits(0) {}
+  virtual ~PTrackerSimHit() {}
 
-  struct Vtx
-  {
-    Vtx(): x(0), y(0), z(0) {}
+  struct Vtx {
+    Vtx() : x(0), y(0), z(0) {}
     float x;
     float y;
     float z;
   };
 
-  struct Trk
-  {
+  struct Trk {
     Trk() : pt(0), e(0), eta(0), phi(0) {}
     float pt;
     float e;
@@ -1680,16 +1788,31 @@ class PTrackerSimHit
     float phi;
   };
 
-
-  struct Hit
-  {
-    Hit() : _sysID(0), _detUnitId(0), _trackId(0), _processType(0), 
-            _particleType(0), _pabs(0), 
-	    _lpx(0), _lpy(0), _lpz(0), 
-	    _ldx(0), _ldy(0), _ldz(0), _ldtheta(0), _ldphi(0),
-	    _exx(0), _exy(0), _exz(0),
-	    _enx(0), _eny(0), _enz(0), _eloss(0), _tof(0) {}
-    int   _sysID; 
+  struct Hit {
+    Hit()
+        : _sysID(0),
+          _detUnitId(0),
+          _trackId(0),
+          _processType(0),
+          _particleType(0),
+          _pabs(0),
+          _lpx(0),
+          _lpy(0),
+          _lpz(0),
+          _ldx(0),
+          _ldy(0),
+          _ldz(0),
+          _ldtheta(0),
+          _ldphi(0),
+          _exx(0),
+          _exy(0),
+          _exz(0),
+          _enx(0),
+          _eny(0),
+          _enz(0),
+          _eloss(0),
+          _tof(0) {}
+    int _sysID;
     float _detUnitId;
     float _trackId;
     float _processType;
@@ -1713,49 +1836,62 @@ class PTrackerSimHit
     float _tof;
   };
 
-
   typedef std::vector<Vtx> VtxVector;
   typedef std::vector<Trk> TrkVector;
   typedef std::vector<Hit> HitVector;
 
   // put functions
   void putRawGenPart(int n);
-  void putG4Vtx(const std::vector<float> &x, const std::vector<float> &y, const std::vector<float> &z);
-  void putG4Trk(const std::vector<float> &pt, const std::vector<float> &e, const std::vector<float> &eta, const std::vector<float> &phi);  
-  void putHits(const std::vector<int> &_sysID, const std::vector<float> &_detUnitId,
-	       const std::vector<float>&_trackId , const std::vector<float>&_processType,
-	       const std::vector<float>&_particleType, const std::vector<float> &_pabs,
-	       const std::vector<float>&_lpx, const std::vector<float>&_lpy, const std::vector<float>&_lpz,
-	       const std::vector<float>&_ldx, const std::vector<float>&_ldy, const std::vector<float>&_ldz,
-	       const std::vector<float>&_ldtheta, const std::vector<float>&_ldphi, 
-	       const std::vector<float>&_exx, const std::vector<float>&_exy, const std::vector<float>&_exz,
-	       const std::vector<float>&_enx, const std::vector<float>&_eny, const std::vector<float>&_enz,
-	       const std::vector<float>&_eloss, const std::vector<float>&_tof);   
+  void putG4Vtx(const std::vector<float>& x, const std::vector<float>& y, const std::vector<float>& z);
+  void putG4Trk(const std::vector<float>& pt,
+                const std::vector<float>& e,
+                const std::vector<float>& eta,
+                const std::vector<float>& phi);
+  void putHits(const std::vector<int>& _sysID,
+               const std::vector<float>& _detUnitId,
+               const std::vector<float>& _trackId,
+               const std::vector<float>& _processType,
+               const std::vector<float>& _particleType,
+               const std::vector<float>& _pabs,
+               const std::vector<float>& _lpx,
+               const std::vector<float>& _lpy,
+               const std::vector<float>& _lpz,
+               const std::vector<float>& _ldx,
+               const std::vector<float>& _ldy,
+               const std::vector<float>& _ldz,
+               const std::vector<float>& _ldtheta,
+               const std::vector<float>& _ldphi,
+               const std::vector<float>& _exx,
+               const std::vector<float>& _exy,
+               const std::vector<float>& _exz,
+               const std::vector<float>& _enx,
+               const std::vector<float>& _eny,
+               const std::vector<float>& _enz,
+               const std::vector<float>& _eloss,
+               const std::vector<float>& _tof);
 
   // get functions
-  int getnRawGenPart() {return nRawGenPart;}
-  int getnG4Vtx() {return nG4Vtx;}
-  VtxVector getG4Vtx() {return G4Vtx;}
-  int getnG4Trk() {return nG4Trk;}
-  TrkVector getG4Trk() {return G4Trk;}
-  int getnHits() {return nHits;}
-  HitVector getHits() {return Hits;}
-
- private:
+  int getnRawGenPart() { return nRawGenPart; }
+  int getnG4Vtx() { return nG4Vtx; }
+  VtxVector getG4Vtx() { return G4Vtx; }
+  int getnG4Trk() { return nG4Trk; }
+  TrkVector getG4Trk() { return G4Trk; }
+  int getnHits() { return nHits; }
+  HitVector getHits() { return Hits; }
 
+private:
   // G4MC info
   int nRawGenPart;
   int nG4Vtx;
-  VtxVector G4Vtx; 
-  int nG4Trk; 
-  TrkVector G4Trk; 
+  VtxVector G4Vtx;
+  int nG4Trk;
+  TrkVector G4Trk;
   // Tracker info
   int nHits;
-  HitVector Hits; 
-
+  HitVector Hits;
 
-}; // end class declaration
+};  // end class declaration
 
 #endif
 
-#endif // endif PValidationFormats_h
+#endif  // endif PValidationFormats_h
diff --git a/SimDataFormats/ValidationFormats/src/MaterialAccountingTrack.cc b/SimDataFormats/ValidationFormats/src/MaterialAccountingTrack.cc
index 2c1ac2eed4b9c..711008e69d016 100644
--- a/SimDataFormats/ValidationFormats/src/MaterialAccountingTrack.cc
+++ b/SimDataFormats/ValidationFormats/src/MaterialAccountingTrack.cc
@@ -4,37 +4,43 @@
 #include "G4VPhysicalVolume.hh"
 #include "SimDataFormats/ValidationFormats/interface/MaterialAccountingTrack.h"
 
-void MaterialAccountingTrack::enterDetector( const G4VPhysicalVolume* volume, const GlobalPoint& position, double cosTheta ) {
+void MaterialAccountingTrack::enterDetector(const G4VPhysicalVolume* volume,
+                                            const GlobalPoint& position,
+                                            double cosTheta) {
   if (m_current_volume != nullptr) {
     // error: entering a volume while inside an other (or the same) one !
     if (m_current_volume != volume)
-      std::cerr << "MaterialAccountingTrack::leaveDetector(...): ERROR: entering volume (" << volume << ") while inside volume (" << m_current_volume << ")" << std::endl;
+      std::cerr << "MaterialAccountingTrack::leaveDetector(...): ERROR: entering volume (" << volume
+                << ") while inside volume (" << m_current_volume << ")" << std::endl;
     else
-      std::cerr << "MaterialAccountingTrack::leaveDetector(...): ERROR: entering volume (" << volume << ") twice" << std::endl;
+      std::cerr << "MaterialAccountingTrack::leaveDetector(...): ERROR: entering volume (" << volume << ") twice"
+                << std::endl;
     m_detector.clear();
     return;
-  } 
+  }
 
-  m_current_volume            = volume;
-  m_detector.m_position       = position;
-  m_detector.m_curvilinearIn  = m_total.length();
-  m_detector.m_cosThetaIn     = cosTheta;
+  m_current_volume = volume;
+  m_detector.m_position = position;
+  m_detector.m_curvilinearIn = m_total.length();
+  m_detector.m_cosThetaIn = cosTheta;
 }
 
-void MaterialAccountingTrack::leaveDetector( const G4VPhysicalVolume* volume, double cosTheta ) {
+void MaterialAccountingTrack::leaveDetector(const G4VPhysicalVolume* volume, double cosTheta) {
   if (m_current_volume != volume) {
     // error: leaving the wrong (or no) volume !
     if (m_current_volume)
-      std::cerr << "MaterialAccountingTrack::leaveDetector(...): ERROR: leaving volume (" << volume << ") while inside volume (" << m_current_volume << ")" << std::endl;
+      std::cerr << "MaterialAccountingTrack::leaveDetector(...): ERROR: leaving volume (" << volume
+                << ") while inside volume (" << m_current_volume << ")" << std::endl;
     else
-      std::cerr << "MaterialAccountingTrack::leaveDetector(...): ERROR: leaving volume (" << volume << ") while not inside any volume" << std::endl;
+      std::cerr << "MaterialAccountingTrack::leaveDetector(...): ERROR: leaving volume (" << volume
+                << ") while not inside any volume" << std::endl;
     m_detector.clear();
     return;
-  } 
+  }
 
   m_current_volume = nullptr;
   m_detector.m_curvilinearOut = m_total.length();
-  m_detector.m_cosThetaOut    = cosTheta;
-  m_detectors.push_back( m_detector );
+  m_detector.m_cosThetaOut = cosTheta;
+  m_detectors.push_back(m_detector);
   m_detector.clear();
 }
diff --git a/SimDataFormats/ValidationFormats/src/PHGCalValidInfo.cc b/SimDataFormats/ValidationFormats/src/PHGCalValidInfo.cc
index 9164921bd7a4d..d9804a411f3c7 100644
--- a/SimDataFormats/ValidationFormats/src/PHGCalValidInfo.cc
+++ b/SimDataFormats/ValidationFormats/src/PHGCalValidInfo.cc
@@ -4,42 +4,42 @@
 //// PHGCalValidInfo
 ///////////////////////////////////////////////////////////////////////////////
 
-void PHGCalValidInfo::fillhgcHits(const std::vector<unsigned int> & hitdets,
-				  const std::vector<unsigned int> & hitindex,
-				  const std::vector<double> & hitvtxX, 
-				  const std::vector<double> & hitvtxY, 
-				  const std::vector<double> & hitvtxZ) { 
-  for (unsigned int i=0; i<hitvtxX.size(); i++) {
+void PHGCalValidInfo::fillhgcHits(const std::vector<unsigned int>& hitdets,
+                                  const std::vector<unsigned int>& hitindex,
+                                  const std::vector<double>& hitvtxX,
+                                  const std::vector<double>& hitvtxY,
+                                  const std::vector<double>& hitvtxZ) {
+  for (unsigned int i = 0; i < hitvtxX.size(); i++) {
     hgcHitVtxX.push_back((float)hitvtxX.at(i));
-    hgcHitVtxY.push_back((float)hitvtxY.at(i)); 
+    hgcHitVtxY.push_back((float)hitvtxY.at(i));
     hgcHitVtxZ.push_back((float)hitvtxZ.at(i));
     hgcHitDets.push_back(hitdets.at(i));
     hgcHitIndex.push_back(hitindex.at(i));
   }
 }
 
-void PHGCalValidInfo::fillhgcLayers(const double edepEE, const double edepHEF, 
-				    const double edepHEB,
-				    const std::vector<double> & eedep, 
-				    const std::vector<double> & hefdep,
-				    const std::vector<double> & hebdep) {
-  edepEETot  = (float)edepEE;
+void PHGCalValidInfo::fillhgcLayers(const double edepEE,
+                                    const double edepHEF,
+                                    const double edepHEB,
+                                    const std::vector<double>& eedep,
+                                    const std::vector<double>& hefdep,
+                                    const std::vector<double>& hebdep) {
+  edepEETot = (float)edepEE;
   edepHEFTot = (float)edepHEF;
   edepHEBTot = (float)edepHEB;
 
-  for (unsigned int i=0; i<eedep.size(); i++) {
-    double en = 0.001*eedep[i]; //GeV
+  for (unsigned int i = 0; i < eedep.size(); i++) {
+    double en = 0.001 * eedep[i];  //GeV
     hgcEEedep.push_back((float)en);
   }
 
-  for (unsigned int i=0; i<hefdep.size(); i++) {
-    double en = 0.001*hefdep[i]; //GeV
+  for (unsigned int i = 0; i < hefdep.size(); i++) {
+    double en = 0.001 * hefdep[i];  //GeV
     hgcHEFedep.push_back((float)en);
   }
 
-  for (unsigned int i=0; i<hebdep.size(); i++) {
-    double en = 0.001*hebdep[i]; //GeV
+  for (unsigned int i = 0; i < hebdep.size(); i++) {
+    double en = 0.001 * hebdep[i];  //GeV
     hgcHEBedep.push_back((float)en);
   }
-	
 }
diff --git a/SimDataFormats/ValidationFormats/src/PValidationFormats.cc b/SimDataFormats/ValidationFormats/src/PValidationFormats.cc
index 848af96fc0245..4632dcc3e9f4a 100644
--- a/SimDataFormats/ValidationFormats/src/PValidationFormats.cc
+++ b/SimDataFormats/ValidationFormats/src/PValidationFormats.cc
@@ -12,15 +12,12 @@
 // PGlobalSimHit
 ///////////////////////////////////////////////////////////////////////////////
 
-void PGlobalSimHit::putRawGenPart(int n)
-{
+void PGlobalSimHit::putRawGenPart(int n) {
   nRawGenPart = n;
   return;
 }
 
-void PGlobalSimHit::putG4Vtx( const std::vector<float> &x, const std::vector<float> &y, 
-	       const std::vector<float> &z)
-{
+void PGlobalSimHit::putG4Vtx(const std::vector<float>& x, const std::vector<float>& y, const std::vector<float>& z) {
   nG4Vtx = x.size();
   G4Vtx.resize(nG4Vtx);
   for (int i = 0; i < nG4Vtx; ++i) {
@@ -32,8 +29,7 @@ void PGlobalSimHit::putG4Vtx( const std::vector<float> &x, const std::vector<flo
   return;
 }
 
-void PGlobalSimHit::putG4Trk(const std::vector<float> &pt, const std::vector<float> &e)
-{
+void PGlobalSimHit::putG4Trk(const std::vector<float>& pt, const std::vector<float>& e) {
   nG4Trk = pt.size();
   G4Trk.resize(nG4Trk);
   for (int i = 0; i < nG4Trk; ++i) {
@@ -44,10 +40,10 @@ void PGlobalSimHit::putG4Trk(const std::vector<float> &pt, const std::vector<flo
   return;
 }
 
-void PGlobalSimHit::putECalHits(const std::vector<float> &e, const std::vector<float> &tof,
-				 const std::vector<float> &phi, 
-				 const std::vector<float> &eta)
-{
+void PGlobalSimHit::putECalHits(const std::vector<float>& e,
+                                const std::vector<float>& tof,
+                                const std::vector<float>& phi,
+                                const std::vector<float>& eta) {
   nECalHits = e.size();
   ECalHits.resize(nECalHits);
   for (int i = 0; i < nECalHits; ++i) {
@@ -60,10 +56,10 @@ void PGlobalSimHit::putECalHits(const std::vector<float> &e, const std::vector<f
   return;
 }
 
-void PGlobalSimHit::putPreShHits(const std::vector<float>& e, const std::vector<float>& tof,
-				  const std::vector<float>& phi, 
-				  const std::vector<float>& eta)
-{
+void PGlobalSimHit::putPreShHits(const std::vector<float>& e,
+                                 const std::vector<float>& tof,
+                                 const std::vector<float>& phi,
+                                 const std::vector<float>& eta) {
   nPreShHits = e.size();
   PreShHits.resize(nPreShHits);
   for (int i = 0; i < nPreShHits; ++i) {
@@ -76,10 +72,10 @@ void PGlobalSimHit::putPreShHits(const std::vector<float>& e, const std::vector<
   return;
 }
 
-void PGlobalSimHit::putHCalHits(const std::vector<float>& e, const std::vector<float>& tof,
-				 const std::vector<float>& phi, 
-				 const std::vector<float>& eta)
-{
+void PGlobalSimHit::putHCalHits(const std::vector<float>& e,
+                                const std::vector<float>& tof,
+                                const std::vector<float>& phi,
+                                const std::vector<float>& eta) {
   nHCalHits = e.size();
   HCalHits.resize(nHCalHits);
   for (int i = 0; i < nHCalHits; ++i) {
@@ -92,11 +88,10 @@ void PGlobalSimHit::putHCalHits(const std::vector<float>& e, const std::vector<f
   return;
 }
 
-void PGlobalSimHit::putPxlFwdHits(const std::vector<float>& tof, 
-				   const std::vector<float>& z,
-				   const std::vector<float>& phi, 
-				   const std::vector<float>& eta)
-{
+void PGlobalSimHit::putPxlFwdHits(const std::vector<float>& tof,
+                                  const std::vector<float>& z,
+                                  const std::vector<float>& phi,
+                                  const std::vector<float>& eta) {
   nPxlFwdHits = tof.size();
   PxlFwdHits.resize(nPxlFwdHits);
   for (int i = 0; i < nPxlFwdHits; ++i) {
@@ -109,12 +104,11 @@ void PGlobalSimHit::putPxlFwdHits(const std::vector<float>& tof,
   return;
 }
 
-void PGlobalSimHit::putPxlBrlHits(const std::vector<float>& tof, 
-				   const std::vector<float>& r,
-				   const std::vector<float>& phi, 
-				   const std::vector<float>& eta)
-{
-  nPxlBrlHits = tof.size(); 
+void PGlobalSimHit::putPxlBrlHits(const std::vector<float>& tof,
+                                  const std::vector<float>& r,
+                                  const std::vector<float>& phi,
+                                  const std::vector<float>& eta) {
+  nPxlBrlHits = tof.size();
   PxlBrlHits.resize(nPxlBrlHits);
   for (int i = 0; i < nPxlBrlHits; ++i) {
     PxlBrlHits[i].tof = tof[i];
@@ -126,11 +120,10 @@ void PGlobalSimHit::putPxlBrlHits(const std::vector<float>& tof,
   return;
 }
 
-void PGlobalSimHit::putSiFwdHits(const std::vector<float>& tof, 
-				  const std::vector<float>& z,
-				  const std::vector<float>& phi, 
-				  const std::vector<float>& eta)
-{
+void PGlobalSimHit::putSiFwdHits(const std::vector<float>& tof,
+                                 const std::vector<float>& z,
+                                 const std::vector<float>& phi,
+                                 const std::vector<float>& eta) {
   nSiFwdHits = tof.size();
   SiFwdHits.resize(nSiFwdHits);
   for (int i = 0; i < nSiFwdHits; ++i) {
@@ -143,10 +136,10 @@ void PGlobalSimHit::putSiFwdHits(const std::vector<float>& tof,
   return;
 }
 
-void PGlobalSimHit::putSiBrlHits(const std::vector<float>& tof, const std::vector<float>& r,
-				  const std::vector<float>& phi, 
-				  const std::vector<float>& eta)
-{
+void PGlobalSimHit::putSiBrlHits(const std::vector<float>& tof,
+                                 const std::vector<float>& r,
+                                 const std::vector<float>& phi,
+                                 const std::vector<float>& eta) {
   nSiBrlHits = tof.size();
   SiBrlHits.resize(nSiBrlHits);
   for (int i = 0; i < nSiBrlHits; ++i) {
@@ -159,11 +152,10 @@ void PGlobalSimHit::putSiBrlHits(const std::vector<float>& tof, const std::vecto
   return;
 }
 
-void PGlobalSimHit::putMuonCscHits(const std::vector<float>& tof, 
-				    const std::vector<float>& z,
-				    const std::vector<float>& phi, 
-				    const std::vector<float>& eta)
-{
+void PGlobalSimHit::putMuonCscHits(const std::vector<float>& tof,
+                                   const std::vector<float>& z,
+                                   const std::vector<float>& phi,
+                                   const std::vector<float>& eta) {
   nMuonCscHits = tof.size();
   MuonCscHits.resize(nMuonCscHits);
   for (int i = 0; i < nMuonCscHits; ++i) {
@@ -176,11 +168,10 @@ void PGlobalSimHit::putMuonCscHits(const std::vector<float>& tof,
   return;
 }
 
-void PGlobalSimHit::putMuonDtHits(const std::vector<float>& tof, 
-				   const std::vector<float>& r,
-				   const std::vector<float>& phi, 
-				   const std::vector<float>& eta)
-{
+void PGlobalSimHit::putMuonDtHits(const std::vector<float>& tof,
+                                  const std::vector<float>& r,
+                                  const std::vector<float>& phi,
+                                  const std::vector<float>& eta) {
   nMuonDtHits = tof.size();
   MuonDtHits.resize(nMuonDtHits);
   for (int i = 0; i < nMuonDtHits; ++i) {
@@ -193,11 +184,10 @@ void PGlobalSimHit::putMuonDtHits(const std::vector<float>& tof,
   return;
 }
 
-void PGlobalSimHit::putMuonRpcFwdHits(const std::vector<float>& tof, 
-				       const std::vector<float>& z,
-				       const std::vector<float>& phi, 
-				       const std::vector<float>& eta)
-{
+void PGlobalSimHit::putMuonRpcFwdHits(const std::vector<float>& tof,
+                                      const std::vector<float>& z,
+                                      const std::vector<float>& phi,
+                                      const std::vector<float>& eta) {
   nMuonRpcFwdHits = tof.size();
   MuonRpcFwdHits.resize(nMuonRpcFwdHits);
   for (int i = 0; i < nMuonRpcFwdHits; ++i) {
@@ -210,11 +200,10 @@ void PGlobalSimHit::putMuonRpcFwdHits(const std::vector<float>& tof,
   return;
 }
 
-void PGlobalSimHit::putMuonRpcBrlHits(const std::vector<float>& tof, 
-				       const std::vector<float>& r,
-				       const std::vector<float>& phi, 
-				       const std::vector<float>& eta)
-{
+void PGlobalSimHit::putMuonRpcBrlHits(const std::vector<float>& tof,
+                                      const std::vector<float>& r,
+                                      const std::vector<float>& phi,
+                                      const std::vector<float>& eta) {
   nMuonRpcBrlHits = tof.size();
   MuonRpcBrlHits.resize(nMuonRpcBrlHits);
   for (int i = 0; i < nMuonRpcBrlHits; ++i) {
@@ -232,9 +221,8 @@ void PGlobalSimHit::putMuonRpcBrlHits(const std::vector<float>& tof,
 ///////////////////////////////////////////////////////////////////////////////
 
 void PGlobalDigi::putEBCalDigis(const std::vector<int>& maxpos,
-				const std::vector<double>& aee,
-				const std::vector<float>& she)
-{
+                                const std::vector<double>& aee,
+                                const std::vector<float>& she) {
   nEBCalDigis = maxpos.size();
   EBCalDigis.resize(nEBCalDigis);
   for (int i = 0; i < nEBCalDigis; ++i) {
@@ -247,9 +235,8 @@ void PGlobalDigi::putEBCalDigis(const std::vector<int>& maxpos,
 }
 
 void PGlobalDigi::putEECalDigis(const std::vector<int>& maxpos,
-				const std::vector<double>& aee,
-				const std::vector<float>& she)
-{
+                                const std::vector<double>& aee,
+                                const std::vector<float>& she) {
   nEECalDigis = maxpos.size();
   EECalDigis.resize(nEECalDigis);
   for (int i = 0; i < nEECalDigis; ++i) {
@@ -262,10 +249,9 @@ void PGlobalDigi::putEECalDigis(const std::vector<int>& maxpos,
 }
 
 void PGlobalDigi::putESCalDigis(const std::vector<float>& adc0,
-				const std::vector<float>& adc1,
-				const std::vector<float>& adc2,
-				const std::vector<float>& she)
-{
+                                const std::vector<float>& adc1,
+                                const std::vector<float>& adc2,
+                                const std::vector<float>& she) {
   nESCalDigis = adc0.size();
   ESCalDigis.resize(nESCalDigis);
   for (int i = 0; i < nESCalDigis; ++i) {
@@ -278,9 +264,7 @@ void PGlobalDigi::putESCalDigis(const std::vector<float>& adc0,
   return;
 }
 
-void PGlobalDigi::putHBCalDigis(const std::vector<float>& aee,
-				const std::vector<float>& she)
-{
+void PGlobalDigi::putHBCalDigis(const std::vector<float>& aee, const std::vector<float>& she) {
   nHBCalDigis = aee.size();
   HBCalDigis.resize(nHBCalDigis);
   for (int i = 0; i < nHBCalDigis; ++i) {
@@ -291,9 +275,7 @@ void PGlobalDigi::putHBCalDigis(const std::vector<float>& aee,
   return;
 }
 
-void PGlobalDigi::putHECalDigis(const std::vector<float>& aee,
-				const std::vector<float>& she)
-{
+void PGlobalDigi::putHECalDigis(const std::vector<float>& aee, const std::vector<float>& she) {
   nHECalDigis = aee.size();
   HECalDigis.resize(nHECalDigis);
   for (int i = 0; i < nHECalDigis; ++i) {
@@ -304,9 +286,7 @@ void PGlobalDigi::putHECalDigis(const std::vector<float>& aee,
   return;
 }
 
-void PGlobalDigi::putHOCalDigis(const std::vector<float>& aee,
-				const std::vector<float>& she)
-{
+void PGlobalDigi::putHOCalDigis(const std::vector<float>& aee, const std::vector<float>& she) {
   nHOCalDigis = aee.size();
   HOCalDigis.resize(nHOCalDigis);
   for (int i = 0; i < nHOCalDigis; ++i) {
@@ -317,9 +297,7 @@ void PGlobalDigi::putHOCalDigis(const std::vector<float>& aee,
   return;
 }
 
-void PGlobalDigi::putHFCalDigis(const std::vector<float>& aee,
-				const std::vector<float>& she)
-{
+void PGlobalDigi::putHFCalDigis(const std::vector<float>& aee, const std::vector<float>& she) {
   nHFCalDigis = aee.size();
   HFCalDigis.resize(nHFCalDigis);
   for (int i = 0; i < nHFCalDigis; ++i) {
@@ -330,9 +308,7 @@ void PGlobalDigi::putHFCalDigis(const std::vector<float>& aee,
   return;
 }
 
-void PGlobalDigi::putTIBL1Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTIBL1Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTIBL1Digis = adc.size();
   TIBL1Digis.resize(nTIBL1Digis);
   for (int i = 0; i < nTIBL1Digis; ++i) {
@@ -343,9 +319,7 @@ void PGlobalDigi::putTIBL1Digis(const std::vector<float>& adc,
   return;
 }
 
-void PGlobalDigi::putTIBL2Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTIBL2Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTIBL2Digis = adc.size();
   TIBL2Digis.resize(nTIBL2Digis);
   for (int i = 0; i < nTIBL2Digis; ++i) {
@@ -356,9 +330,7 @@ void PGlobalDigi::putTIBL2Digis(const std::vector<float>& adc,
   return;
 }
 
-void PGlobalDigi::putTIBL3Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTIBL3Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTIBL3Digis = adc.size();
   TIBL3Digis.resize(nTIBL3Digis);
   for (int i = 0; i < nTIBL3Digis; ++i) {
@@ -369,9 +341,7 @@ void PGlobalDigi::putTIBL3Digis(const std::vector<float>& adc,
   return;
 }
 
-void PGlobalDigi::putTIBL4Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTIBL4Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTIBL4Digis = adc.size();
   TIBL4Digis.resize(nTIBL4Digis);
   for (int i = 0; i < nTIBL4Digis; ++i) {
@@ -382,9 +352,7 @@ void PGlobalDigi::putTIBL4Digis(const std::vector<float>& adc,
   return;
 }
 
-void PGlobalDigi::putTOBL1Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTOBL1Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTOBL1Digis = adc.size();
   TOBL1Digis.resize(nTOBL1Digis);
   for (int i = 0; i < nTOBL1Digis; ++i) {
@@ -395,9 +363,7 @@ void PGlobalDigi::putTOBL1Digis(const std::vector<float>& adc,
   return;
 }
 
-void PGlobalDigi::putTOBL2Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTOBL2Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTOBL2Digis = adc.size();
   TOBL2Digis.resize(nTOBL2Digis);
   for (int i = 0; i < nTOBL2Digis; ++i) {
@@ -408,9 +374,7 @@ void PGlobalDigi::putTOBL2Digis(const std::vector<float>& adc,
   return;
 }
 
-void PGlobalDigi::putTOBL3Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTOBL3Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTOBL3Digis = adc.size();
   TOBL3Digis.resize(nTOBL3Digis);
   for (int i = 0; i < nTOBL3Digis; ++i) {
@@ -421,9 +385,7 @@ void PGlobalDigi::putTOBL3Digis(const std::vector<float>& adc,
   return;
 }
 
-void PGlobalDigi::putTOBL4Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTOBL4Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTOBL4Digis = adc.size();
   TOBL4Digis.resize(nTOBL4Digis);
   for (int i = 0; i < nTOBL4Digis; ++i) {
@@ -434,9 +396,7 @@ void PGlobalDigi::putTOBL4Digis(const std::vector<float>& adc,
   return;
 }
 
-void PGlobalDigi::putTIDW1Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTIDW1Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTIDW1Digis = adc.size();
   TIDW1Digis.resize(nTIDW1Digis);
   for (int i = 0; i < nTIDW1Digis; ++i) {
@@ -447,9 +407,7 @@ void PGlobalDigi::putTIDW1Digis(const std::vector<float>& adc,
   return;
 }
 
-void PGlobalDigi::putTIDW2Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTIDW2Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTIDW2Digis = adc.size();
   TIDW2Digis.resize(nTIDW2Digis);
   for (int i = 0; i < nTIDW2Digis; ++i) {
@@ -460,9 +418,7 @@ void PGlobalDigi::putTIDW2Digis(const std::vector<float>& adc,
   return;
 }
 
-void PGlobalDigi::putTIDW3Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTIDW3Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTIDW3Digis = adc.size();
   TIDW3Digis.resize(nTIDW3Digis);
   for (int i = 0; i < nTIDW3Digis; ++i) {
@@ -473,9 +429,7 @@ void PGlobalDigi::putTIDW3Digis(const std::vector<float>& adc,
   return;
 }
 
-void PGlobalDigi::putTECW1Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTECW1Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTECW1Digis = adc.size();
   TECW1Digis.resize(nTECW1Digis);
   for (int i = 0; i < nTECW1Digis; ++i) {
@@ -486,9 +440,7 @@ void PGlobalDigi::putTECW1Digis(const std::vector<float>& adc,
   return;
 }
 
-void PGlobalDigi::putTECW2Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTECW2Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTECW2Digis = adc.size();
   TECW2Digis.resize(nTECW2Digis);
   for (int i = 0; i < nTECW2Digis; ++i) {
@@ -499,9 +451,7 @@ void PGlobalDigi::putTECW2Digis(const std::vector<float>& adc,
   return;
 }
 
-void PGlobalDigi::putTECW3Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTECW3Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTECW3Digis = adc.size();
   TECW3Digis.resize(nTECW3Digis);
   for (int i = 0; i < nTECW3Digis; ++i) {
@@ -512,9 +462,7 @@ void PGlobalDigi::putTECW3Digis(const std::vector<float>& adc,
   return;
 }
 
-void PGlobalDigi::putTECW4Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTECW4Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTECW4Digis = adc.size();
   TECW4Digis.resize(nTECW4Digis);
   for (int i = 0; i < nTECW4Digis; ++i) {
@@ -525,9 +473,7 @@ void PGlobalDigi::putTECW4Digis(const std::vector<float>& adc,
   return;
 }
 
-void PGlobalDigi::putTECW5Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTECW5Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTECW5Digis = adc.size();
   TECW5Digis.resize(nTECW5Digis);
   for (int i = 0; i < nTECW5Digis; ++i) {
@@ -538,9 +484,7 @@ void PGlobalDigi::putTECW5Digis(const std::vector<float>& adc,
   return;
 }
 
-void PGlobalDigi::putTECW6Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTECW6Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTECW6Digis = adc.size();
   TECW6Digis.resize(nTECW6Digis);
   for (int i = 0; i < nTECW6Digis; ++i) {
@@ -551,9 +495,7 @@ void PGlobalDigi::putTECW6Digis(const std::vector<float>& adc,
   return;
 }
 
-void PGlobalDigi::putTECW7Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTECW7Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTECW7Digis = adc.size();
   TECW7Digis.resize(nTECW7Digis);
   for (int i = 0; i < nTECW7Digis; ++i) {
@@ -564,9 +506,7 @@ void PGlobalDigi::putTECW7Digis(const std::vector<float>& adc,
   return;
 }
 
-void PGlobalDigi::putTECW8Digis(const std::vector<float>& adc,
-			        const std::vector<int>& strip)
-{
+void PGlobalDigi::putTECW8Digis(const std::vector<float>& adc, const std::vector<int>& strip) {
   nTECW8Digis = adc.size();
   TECW8Digis.resize(nTECW8Digis);
   for (int i = 0; i < nTECW8Digis; ++i) {
@@ -578,9 +518,8 @@ void PGlobalDigi::putTECW8Digis(const std::vector<float>& adc,
 }
 
 void PGlobalDigi::putBRL1Digis(const std::vector<float>& adc,
-			       const std::vector<int>& row,
-			       const std::vector<int>& column)
-{
+                               const std::vector<int>& row,
+                               const std::vector<int>& column) {
   nBRL1Digis = adc.size();
   BRL1Digis.resize(nBRL1Digis);
   for (int i = 0; i < nBRL1Digis; ++i) {
@@ -593,9 +532,8 @@ void PGlobalDigi::putBRL1Digis(const std::vector<float>& adc,
 }
 
 void PGlobalDigi::putBRL2Digis(const std::vector<float>& adc,
-			       const std::vector<int>& row,
-			       const std::vector<int>& column)
-{
+                               const std::vector<int>& row,
+                               const std::vector<int>& column) {
   nBRL2Digis = adc.size();
   BRL2Digis.resize(nBRL2Digis);
   for (int i = 0; i < nBRL2Digis; ++i) {
@@ -608,9 +546,8 @@ void PGlobalDigi::putBRL2Digis(const std::vector<float>& adc,
 }
 
 void PGlobalDigi::putBRL3Digis(const std::vector<float>& adc,
-			       const std::vector<int>& row,
-			       const std::vector<int>& column)
-{
+                               const std::vector<int>& row,
+                               const std::vector<int>& column) {
   nBRL3Digis = adc.size();
   BRL3Digis.resize(nBRL3Digis);
   for (int i = 0; i < nBRL3Digis; ++i) {
@@ -623,9 +560,8 @@ void PGlobalDigi::putBRL3Digis(const std::vector<float>& adc,
 }
 
 void PGlobalDigi::putFWD1pDigis(const std::vector<float>& adc,
-				const std::vector<int>& row,
-				const std::vector<int>& column)
-{
+                                const std::vector<int>& row,
+                                const std::vector<int>& column) {
   nFWD1pDigis = adc.size();
   FWD1pDigis.resize(nFWD1pDigis);
   for (int i = 0; i < nFWD1pDigis; ++i) {
@@ -638,9 +574,8 @@ void PGlobalDigi::putFWD1pDigis(const std::vector<float>& adc,
 }
 
 void PGlobalDigi::putFWD1nDigis(const std::vector<float>& adc,
-				const std::vector<int>& row,
-				const std::vector<int>& column)
-{
+                                const std::vector<int>& row,
+                                const std::vector<int>& column) {
   nFWD1nDigis = adc.size();
   FWD1nDigis.resize(nFWD1nDigis);
   for (int i = 0; i < nFWD1nDigis; ++i) {
@@ -653,9 +588,8 @@ void PGlobalDigi::putFWD1nDigis(const std::vector<float>& adc,
 }
 
 void PGlobalDigi::putFWD2pDigis(const std::vector<float>& adc,
-				const std::vector<int>& row,
-				const std::vector<int>& column)
-{
+                                const std::vector<int>& row,
+                                const std::vector<int>& column) {
   nFWD2pDigis = adc.size();
   FWD2pDigis.resize(nFWD2pDigis);
   for (int i = 0; i < nFWD2pDigis; ++i) {
@@ -668,9 +602,8 @@ void PGlobalDigi::putFWD2pDigis(const std::vector<float>& adc,
 }
 
 void PGlobalDigi::putFWD2nDigis(const std::vector<float>& adc,
-				const std::vector<int>& row,
-				const std::vector<int>& column)
-{
+                                const std::vector<int>& row,
+                                const std::vector<int>& column) {
   nFWD2nDigis = adc.size();
   FWD2nDigis.resize(nFWD2nDigis);
   for (int i = 0; i < nFWD2nDigis; ++i) {
@@ -683,9 +616,8 @@ void PGlobalDigi::putFWD2nDigis(const std::vector<float>& adc,
 }
 
 void PGlobalDigi::putMB1Digis(const std::vector<int>& slayer,
-			      const std::vector<float>& time,
-			      const std::vector<int>& layer)
-{
+                              const std::vector<float>& time,
+                              const std::vector<int>& layer) {
   nMB1Digis = slayer.size();
   MB1Digis.resize(nMB1Digis);
   for (int i = 0; i < nMB1Digis; ++i) {
@@ -698,9 +630,8 @@ void PGlobalDigi::putMB1Digis(const std::vector<int>& slayer,
 }
 
 void PGlobalDigi::putMB2Digis(const std::vector<int>& slayer,
-			      const std::vector<float>& time,
-			      const std::vector<int>& layer)
-{
+                              const std::vector<float>& time,
+                              const std::vector<int>& layer) {
   nMB2Digis = slayer.size();
   MB2Digis.resize(nMB2Digis);
   for (int i = 0; i < nMB2Digis; ++i) {
@@ -713,9 +644,8 @@ void PGlobalDigi::putMB2Digis(const std::vector<int>& slayer,
 }
 
 void PGlobalDigi::putMB3Digis(const std::vector<int>& slayer,
-			      const std::vector<float>& time,
-			      const std::vector<int>& layer)
-{
+                              const std::vector<float>& time,
+                              const std::vector<int>& layer) {
   nMB3Digis = slayer.size();
   MB3Digis.resize(nMB3Digis);
   for (int i = 0; i < nMB3Digis; ++i) {
@@ -728,9 +658,8 @@ void PGlobalDigi::putMB3Digis(const std::vector<int>& slayer,
 }
 
 void PGlobalDigi::putMB4Digis(const std::vector<int>& slayer,
-			      const std::vector<float>& time,
-			      const std::vector<int>& layer)
-{
+                              const std::vector<float>& time,
+                              const std::vector<int>& layer) {
   nMB4Digis = slayer.size();
   MB4Digis.resize(nMB4Digis);
   for (int i = 0; i < nMB4Digis; ++i) {
@@ -742,8 +671,7 @@ void PGlobalDigi::putMB4Digis(const std::vector<int>& slayer,
   return;
 }
 
-void PGlobalDigi::putCSCstripDigis(const std::vector<float>& adc)
-{
+void PGlobalDigi::putCSCstripDigis(const std::vector<float>& adc) {
   nCSCstripDigis = adc.size();
   CSCstripDigis.resize(nCSCstripDigis);
   for (int i = 0; i < nCSCstripDigis; ++i) {
@@ -753,8 +681,7 @@ void PGlobalDigi::putCSCstripDigis(const std::vector<float>& adc)
   return;
 }
 
-void PGlobalDigi::putCSCwireDigis(const std::vector<float>& time)
-{
+void PGlobalDigi::putCSCwireDigis(const std::vector<float>& time) {
   nCSCwireDigis = time.size();
   CSCwireDigis.resize(nCSCwireDigis);
   for (int i = 0; i < nCSCwireDigis; ++i) {
@@ -768,9 +695,7 @@ void PGlobalDigi::putCSCwireDigis(const std::vector<float>& time)
 // PGlobalRecHit
 ///////////////////////////////////////////////////////////////////////////////
 
-void PGlobalRecHit::putEBCalRecHits(const std::vector<float>& re,
-				    const std::vector<float>& she)
-{
+void PGlobalRecHit::putEBCalRecHits(const std::vector<float>& re, const std::vector<float>& she) {
   nEBCalRecHits = re.size();
   EBCalRecHits.resize(nEBCalRecHits);
   for (int i = 0; i < nEBCalRecHits; ++i) {
@@ -781,9 +706,7 @@ void PGlobalRecHit::putEBCalRecHits(const std::vector<float>& re,
   return;
 }
 
-void PGlobalRecHit::putEECalRecHits(const std::vector<float>& re,
-				    const std::vector<float>& she)
-{
+void PGlobalRecHit::putEECalRecHits(const std::vector<float>& re, const std::vector<float>& she) {
   nEECalRecHits = re.size();
   EECalRecHits.resize(nEECalRecHits);
   for (int i = 0; i < nEECalRecHits; ++i) {
@@ -794,9 +717,7 @@ void PGlobalRecHit::putEECalRecHits(const std::vector<float>& re,
   return;
 }
 
-void PGlobalRecHit::putESCalRecHits(const std::vector<float>& re,
-				    const std::vector<float>& she)
-{
+void PGlobalRecHit::putESCalRecHits(const std::vector<float>& re, const std::vector<float>& she) {
   nESCalRecHits = re.size();
   ESCalRecHits.resize(nESCalRecHits);
   for (int i = 0; i < nESCalRecHits; ++i) {
@@ -808,9 +729,8 @@ void PGlobalRecHit::putESCalRecHits(const std::vector<float>& re,
 }
 
 void PGlobalRecHit::putHBCalRecHits(const std::vector<float>& rec,
-				    const std::vector<float>& r,
-				    const std::vector<float>& she)
-{
+                                    const std::vector<float>& r,
+                                    const std::vector<float>& she) {
   nHBCalRecHits = rec.size();
   HBCalRecHits.resize(nHBCalRecHits);
   for (int i = 0; i < nHBCalRecHits; ++i) {
@@ -823,9 +743,8 @@ void PGlobalRecHit::putHBCalRecHits(const std::vector<float>& rec,
 }
 
 void PGlobalRecHit::putHECalRecHits(const std::vector<float>& rec,
-				    const std::vector<float>& r,
-				    const std::vector<float>& she)
-{
+                                    const std::vector<float>& r,
+                                    const std::vector<float>& she) {
   nHECalRecHits = rec.size();
   HECalRecHits.resize(nHECalRecHits);
   for (int i = 0; i < nHECalRecHits; ++i) {
@@ -838,9 +757,8 @@ void PGlobalRecHit::putHECalRecHits(const std::vector<float>& rec,
 }
 
 void PGlobalRecHit::putHOCalRecHits(const std::vector<float>& rec,
-				    const std::vector<float>& r,
-				    const std::vector<float>& she)
-{
+                                    const std::vector<float>& r,
+                                    const std::vector<float>& she) {
   nHOCalRecHits = rec.size();
   HOCalRecHits.resize(nHOCalRecHits);
   for (int i = 0; i < nHOCalRecHits; ++i) {
@@ -853,9 +771,8 @@ void PGlobalRecHit::putHOCalRecHits(const std::vector<float>& rec,
 }
 
 void PGlobalRecHit::putHFCalRecHits(const std::vector<float>& rec,
-				    const std::vector<float>& r,
-				    const std::vector<float>& she)
-{
+                                    const std::vector<float>& r,
+                                    const std::vector<float>& she) {
   nHFCalRecHits = rec.size();
   HFCalRecHits.resize(nHFCalRecHits);
   for (int i = 0; i < nHFCalRecHits; ++i) {
@@ -867,334 +784,314 @@ void PGlobalRecHit::putHFCalRecHits(const std::vector<float>& rec,
   return;
 }
 
-void PGlobalRecHit::putTIBL1RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTIBL1RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTIBL1RecHits = rx.size();
   TIBL1RecHits.resize(nTIBL1RecHits);
   for (int i = 0; i < nTIBL1RecHits; ++i) {
     TIBL1RecHits[i].RX = rx[i];
     TIBL1RecHits[i].RY = ry[i];
     TIBL1RecHits[i].SX = sx[i];
-    TIBL1RecHits[i].SY = sy[i];    
+    TIBL1RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putTIBL2RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTIBL2RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTIBL2RecHits = rx.size();
   TIBL2RecHits.resize(nTIBL2RecHits);
   for (int i = 0; i < nTIBL2RecHits; ++i) {
     TIBL2RecHits[i].RX = rx[i];
     TIBL2RecHits[i].RY = ry[i];
     TIBL2RecHits[i].SX = sx[i];
-    TIBL2RecHits[i].SY = sy[i];    
+    TIBL2RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putTIBL3RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTIBL3RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTIBL3RecHits = rx.size();
   TIBL3RecHits.resize(nTIBL3RecHits);
   for (int i = 0; i < nTIBL3RecHits; ++i) {
     TIBL3RecHits[i].RX = rx[i];
     TIBL3RecHits[i].RY = ry[i];
     TIBL3RecHits[i].SX = sx[i];
-    TIBL3RecHits[i].SY = sy[i];    
+    TIBL3RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putTIBL4RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTIBL4RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTIBL4RecHits = rx.size();
   TIBL4RecHits.resize(nTIBL4RecHits);
   for (int i = 0; i < nTIBL4RecHits; ++i) {
     TIBL4RecHits[i].RX = rx[i];
     TIBL4RecHits[i].RY = ry[i];
     TIBL4RecHits[i].SX = sx[i];
-    TIBL4RecHits[i].SY = sy[i];    
+    TIBL4RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putTOBL1RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTOBL1RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTOBL1RecHits = rx.size();
   TOBL1RecHits.resize(nTOBL1RecHits);
   for (int i = 0; i < nTOBL1RecHits; ++i) {
     TOBL1RecHits[i].RX = rx[i];
     TOBL1RecHits[i].RY = ry[i];
     TOBL1RecHits[i].SX = sx[i];
-    TOBL1RecHits[i].SY = sy[i];    
+    TOBL1RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putTOBL2RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTOBL2RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTOBL2RecHits = rx.size();
   TOBL2RecHits.resize(nTOBL2RecHits);
   for (int i = 0; i < nTOBL2RecHits; ++i) {
     TOBL2RecHits[i].RX = rx[i];
     TOBL2RecHits[i].RY = ry[i];
     TOBL2RecHits[i].SX = sx[i];
-    TOBL2RecHits[i].SY = sy[i];    
+    TOBL2RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putTOBL3RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTOBL3RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTOBL3RecHits = rx.size();
   TOBL3RecHits.resize(nTOBL3RecHits);
   for (int i = 0; i < nTOBL3RecHits; ++i) {
     TOBL3RecHits[i].RX = rx[i];
     TOBL3RecHits[i].RY = ry[i];
     TOBL3RecHits[i].SX = sx[i];
-    TOBL3RecHits[i].SY = sy[i];    
+    TOBL3RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putTOBL4RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTOBL4RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTOBL4RecHits = rx.size();
   TOBL4RecHits.resize(nTOBL4RecHits);
   for (int i = 0; i < nTOBL4RecHits; ++i) {
     TOBL4RecHits[i].RX = rx[i];
     TOBL4RecHits[i].RY = ry[i];
     TOBL4RecHits[i].SX = sx[i];
-    TOBL4RecHits[i].SY = sy[i];    
+    TOBL4RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putTIDW1RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTIDW1RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTIDW1RecHits = rx.size();
   TIDW1RecHits.resize(nTIDW1RecHits);
   for (int i = 0; i < nTIDW1RecHits; ++i) {
     TIDW1RecHits[i].RX = rx[i];
     TIDW1RecHits[i].RY = ry[i];
     TIDW1RecHits[i].SX = sx[i];
-    TIDW1RecHits[i].SY = sy[i];    
+    TIDW1RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putTIDW2RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTIDW2RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTIDW2RecHits = rx.size();
   TIDW2RecHits.resize(nTIDW2RecHits);
   for (int i = 0; i < nTIDW2RecHits; ++i) {
     TIDW2RecHits[i].RX = rx[i];
     TIDW2RecHits[i].RY = ry[i];
     TIDW2RecHits[i].SX = sx[i];
-    TIDW2RecHits[i].SY = sy[i];    
+    TIDW2RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putTIDW3RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTIDW3RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTIDW3RecHits = rx.size();
   TIDW3RecHits.resize(nTIDW3RecHits);
   for (int i = 0; i < nTIDW3RecHits; ++i) {
     TIDW3RecHits[i].RX = rx[i];
     TIDW3RecHits[i].RY = ry[i];
     TIDW3RecHits[i].SX = sx[i];
-    TIDW3RecHits[i].SY = sy[i];    
+    TIDW3RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putTECW1RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTECW1RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTECW1RecHits = rx.size();
   TECW1RecHits.resize(nTECW1RecHits);
   for (int i = 0; i < nTECW1RecHits; ++i) {
     TECW1RecHits[i].RX = rx[i];
     TECW1RecHits[i].RY = ry[i];
     TECW1RecHits[i].SX = sx[i];
-    TECW1RecHits[i].SY = sy[i];    
+    TECW1RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putTECW2RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTECW2RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTECW2RecHits = rx.size();
   TECW2RecHits.resize(nTECW2RecHits);
   for (int i = 0; i < nTECW2RecHits; ++i) {
     TECW2RecHits[i].RX = rx[i];
     TECW2RecHits[i].RY = ry[i];
     TECW2RecHits[i].SX = sx[i];
-    TECW2RecHits[i].SY = sy[i];    
+    TECW2RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putTECW3RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTECW3RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTECW3RecHits = rx.size();
   TECW3RecHits.resize(nTECW3RecHits);
   for (int i = 0; i < nTECW3RecHits; ++i) {
     TECW3RecHits[i].RX = rx[i];
     TECW3RecHits[i].RY = ry[i];
     TECW3RecHits[i].SX = sx[i];
-    TECW3RecHits[i].SY = sy[i];    
+    TECW3RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putTECW4RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTECW4RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTECW4RecHits = rx.size();
   TECW4RecHits.resize(nTECW4RecHits);
   for (int i = 0; i < nTECW4RecHits; ++i) {
     TECW4RecHits[i].RX = rx[i];
     TECW4RecHits[i].RY = ry[i];
     TECW4RecHits[i].SX = sx[i];
-    TECW4RecHits[i].SY = sy[i];    
+    TECW4RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putTECW5RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTECW5RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTECW5RecHits = rx.size();
   TECW5RecHits.resize(nTECW5RecHits);
   for (int i = 0; i < nTECW5RecHits; ++i) {
     TECW5RecHits[i].RX = rx[i];
     TECW5RecHits[i].RY = ry[i];
     TECW5RecHits[i].SX = sx[i];
-    TECW5RecHits[i].SY = sy[i];    
+    TECW5RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putTECW6RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTECW6RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTECW6RecHits = rx.size();
   TECW6RecHits.resize(nTECW6RecHits);
   for (int i = 0; i < nTECW6RecHits; ++i) {
     TECW6RecHits[i].RX = rx[i];
     TECW6RecHits[i].RY = ry[i];
     TECW6RecHits[i].SX = sx[i];
-    TECW6RecHits[i].SY = sy[i];    
+    TECW6RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putTECW7RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTECW7RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTECW7RecHits = rx.size();
   TECW7RecHits.resize(nTECW7RecHits);
   for (int i = 0; i < nTECW7RecHits; ++i) {
     TECW7RecHits[i].RX = rx[i];
     TECW7RecHits[i].RY = ry[i];
     TECW7RecHits[i].SX = sx[i];
-    TECW7RecHits[i].SY = sy[i];    
+    TECW7RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putTECW8RecHits(const std::vector<float>& rx, 
-				    const std::vector<float>& ry,
-				    const std::vector<float>& sx, 
-				    const std::vector<float>& sy)
-{
+void PGlobalRecHit::putTECW8RecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nTECW8RecHits = rx.size();
   TECW8RecHits.resize(nTECW8RecHits);
   for (int i = 0; i < nTECW8RecHits; ++i) {
     TECW8RecHits[i].RX = rx[i];
     TECW8RecHits[i].RY = ry[i];
     TECW8RecHits[i].SX = sx[i];
-    TECW8RecHits[i].SY = sy[i];    
+    TECW8RecHits[i].SY = sy[i];
   }
 
   return;
 }
 
-void PGlobalRecHit::putBRL1RecHits(const std::vector<float>& rx, 
-				   const std::vector<float>& ry,
-				   const std::vector<float>& sx, 
-				   const std::vector<float>& sy)
-{
+void PGlobalRecHit::putBRL1RecHits(const std::vector<float>& rx,
+                                   const std::vector<float>& ry,
+                                   const std::vector<float>& sx,
+                                   const std::vector<float>& sy) {
   nBRL1RecHits = rx.size();
   BRL1RecHits.resize(nBRL1RecHits);
   for (int i = 0; i < nBRL1RecHits; ++i) {
@@ -1207,11 +1104,10 @@ void PGlobalRecHit::putBRL1RecHits(const std::vector<float>& rx,
   return;
 }
 
-void PGlobalRecHit::putBRL2RecHits(const std::vector<float>& rx, 
-				   const std::vector<float>& ry,
-				   const std::vector<float>& sx, 
-				   const std::vector<float>& sy)
-{
+void PGlobalRecHit::putBRL2RecHits(const std::vector<float>& rx,
+                                   const std::vector<float>& ry,
+                                   const std::vector<float>& sx,
+                                   const std::vector<float>& sy) {
   nBRL2RecHits = rx.size();
   BRL2RecHits.resize(nBRL2RecHits);
   for (int i = 0; i < nBRL2RecHits; ++i) {
@@ -1224,11 +1120,10 @@ void PGlobalRecHit::putBRL2RecHits(const std::vector<float>& rx,
   return;
 }
 
-void PGlobalRecHit::putBRL3RecHits(const std::vector<float>& rx, 
-				   const std::vector<float>& ry,
-				   const std::vector<float>& sx, 
-				   const std::vector<float>& sy)
-{
+void PGlobalRecHit::putBRL3RecHits(const std::vector<float>& rx,
+                                   const std::vector<float>& ry,
+                                   const std::vector<float>& sx,
+                                   const std::vector<float>& sy) {
   nBRL3RecHits = rx.size();
   BRL3RecHits.resize(nBRL3RecHits);
   for (int i = 0; i < nBRL3RecHits; ++i) {
@@ -1241,11 +1136,10 @@ void PGlobalRecHit::putBRL3RecHits(const std::vector<float>& rx,
   return;
 }
 
-void PGlobalRecHit::putFWD1pRecHits(const std::vector<float>& rx, 
-				   const std::vector<float>& ry,
-				   const std::vector<float>& sx, 
-				   const std::vector<float>& sy)
-{
+void PGlobalRecHit::putFWD1pRecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nFWD1pRecHits = rx.size();
   FWD1pRecHits.resize(nFWD1pRecHits);
   for (int i = 0; i < nFWD1pRecHits; ++i) {
@@ -1258,11 +1152,10 @@ void PGlobalRecHit::putFWD1pRecHits(const std::vector<float>& rx,
   return;
 }
 
-void PGlobalRecHit::putFWD1nRecHits(const std::vector<float>& rx, 
-				   const std::vector<float>& ry,
-				   const std::vector<float>& sx, 
-				   const std::vector<float>& sy)
-{
+void PGlobalRecHit::putFWD1nRecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nFWD1nRecHits = rx.size();
   FWD1nRecHits.resize(nFWD1nRecHits);
   for (int i = 0; i < nFWD1nRecHits; ++i) {
@@ -1275,11 +1168,10 @@ void PGlobalRecHit::putFWD1nRecHits(const std::vector<float>& rx,
   return;
 }
 
-void PGlobalRecHit::putFWD2pRecHits(const std::vector<float>& rx, 
-				   const std::vector<float>& ry,
-				   const std::vector<float>& sx, 
-				   const std::vector<float>& sy)
-{
+void PGlobalRecHit::putFWD2pRecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nFWD2pRecHits = rx.size();
   FWD2pRecHits.resize(nFWD2pRecHits);
   for (int i = 0; i < nFWD2pRecHits; ++i) {
@@ -1292,11 +1184,10 @@ void PGlobalRecHit::putFWD2pRecHits(const std::vector<float>& rx,
   return;
 }
 
-void PGlobalRecHit::putFWD2nRecHits(const std::vector<float>& rx, 
-				   const std::vector<float>& ry,
-				   const std::vector<float>& sx, 
-				   const std::vector<float>& sy)
-{
+void PGlobalRecHit::putFWD2nRecHits(const std::vector<float>& rx,
+                                    const std::vector<float>& ry,
+                                    const std::vector<float>& sx,
+                                    const std::vector<float>& sy) {
   nFWD2nRecHits = rx.size();
   FWD2nRecHits.resize(nFWD2nRecHits);
   for (int i = 0; i < nFWD2nRecHits; ++i) {
@@ -1309,9 +1200,7 @@ void PGlobalRecHit::putFWD2nRecHits(const std::vector<float>& rx,
   return;
 }
 
-void PGlobalRecHit::putDTRecHits(const std::vector<float>& rhd, 
-				 const std::vector<float>& shd)
-{
+void PGlobalRecHit::putDTRecHits(const std::vector<float>& rhd, const std::vector<float>& shd) {
   nDTRecHits = rhd.size();
   DTRecHits.resize(nDTRecHits);
   for (int i = 0; i < nDTRecHits; ++i) {
@@ -1322,10 +1211,9 @@ void PGlobalRecHit::putDTRecHits(const std::vector<float>& rhd,
   return;
 }
 
-void PGlobalRecHit::putCSCRecHits(const std::vector<float>& rhphi, 
-				  const std::vector<float>& rhperp, 
-				  const std::vector<float>& shphi)
-{
+void PGlobalRecHit::putCSCRecHits(const std::vector<float>& rhphi,
+                                  const std::vector<float>& rhperp,
+                                  const std::vector<float>& shphi) {
   nCSCRecHits = rhphi.size();
   CSCRecHits.resize(nCSCRecHits);
   for (int i = 0; i < nCSCRecHits; ++i) {
@@ -1337,9 +1225,7 @@ void PGlobalRecHit::putCSCRecHits(const std::vector<float>& rhphi,
   return;
 }
 
-void PGlobalRecHit::putRPCRecHits(const std::vector<float>& rhx, 
-				  const std::vector<float>& shx)
-{
+void PGlobalRecHit::putRPCRecHits(const std::vector<float>& rhx, const std::vector<float>& shx) {
   nRPCRecHits = rhx.size();
   RPCRecHits.resize(nRPCRecHits);
   for (int i = 0; i < nRPCRecHits; ++i) {
@@ -1354,37 +1240,33 @@ void PGlobalRecHit::putRPCRecHits(const std::vector<float>& rhx,
 // PHcalValidInfoJets
 ///////////////////////////////////////////////////////////////////////////////
 
-void PHcalValidInfoJets::fillTProfileJet(double e, double r,  double t) {
+void PHcalValidInfoJets::fillTProfileJet(double e, double r, double t) {
   jetHite.push_back((float)e);
   jetHitr.push_back((float)r);
   jetHitt.push_back((float)t);
   nJetHit++;
 
   //  std::cout << " fillTProfileJet - nJetHit = " << nJetHit << std::endl;
-  
 }
 
-void PHcalValidInfoJets::fillEcollectJet(double ee, double he, 
-					 double hoe, double etot) {
+void PHcalValidInfoJets::fillEcollectJet(double ee, double he, double hoe, double etot) {
   // hardest jet properties
 
   ecalJet = (float)ee;
   hcalJet = (float)he;
-    hoJet = (float)hoe;
+  hoJet = (float)hoe;
   etotJet = (float)etot;
 }
 
-void PHcalValidInfoJets::fillEtaPhiProfileJet(double eta0, double phi0, 
-					      double eta,  double phi,
-					      double dist) {
-  detaJet = (float)(eta-eta0);
-  dphiJet = (float)(phi-phi0);
-    drJet = (float)dist;
+void PHcalValidInfoJets::fillEtaPhiProfileJet(double eta0, double phi0, double eta, double phi, double dist) {
+  detaJet = (float)(eta - eta0);
+  dphiJet = (float)(phi - phi0);
+  drJet = (float)dist;
 }
 
 void PHcalValidInfoJets::fillJets(const std::vector<double>& en,
-				  const std::vector<double>& eta,
-				  const std::vector<double>& phi) {
+                                  const std::vector<double>& eta,
+                                  const std::vector<double>& phi) {
   nJet = en.size();
   for (int i = 0; i < nJet; i++) {
     jetE.push_back((float)en[i]);
@@ -1393,44 +1275,36 @@ void PHcalValidInfoJets::fillJets(const std::vector<double>& en,
   }
 
   //  std::cout << " fillJets - nJet = " << nJet << std::endl;
-
 }
 
-void PHcalValidInfoJets::fillDiJets(double mass) {
-  dijetM = (float)mass;
-}
+void PHcalValidInfoJets::fillDiJets(double mass) { dijetM = (float)mass; }
 
 ///////////////////////////////////////////////////////////////////////////////
 // PHcalValidInfoLayer
 ///////////////////////////////////////////////////////////////////////////////
 
-void PHcalValidInfoLayer::fillLayers(double el[], double ed[], double ho,
-				     double hbhe, double ebee) {
-
+void PHcalValidInfoLayer::fillLayers(double el[], double ed[], double ho, double hbhe, double ebee) {
   for (int i = 0; i < 20; i++) {
-    double en  = 0.001*el[i]; // GeV
+    double en = 0.001 * el[i];  // GeV
     eLayer.push_back((float)en);
   }
   for (int i = 0; i < 4; i++) {
-    double en  = 0.001*ed[i]; // GeV
+    double en = 0.001 * ed[i];  // GeV
     eDepth.push_back((float)en);
   }
-  eHO   = (float)ho;
-  eHBHE = (float)hbhe; // MeV
+  eHO = (float)ho;
+  eHBHE = (float)hbhe;  // MeV
   eEBEE = (float)ebee;
 }
 
-void PHcalValidInfoLayer::fillHF(double fibl, double fibs, double enec,
-				 double enhc) {
-  elongHF  = (float)fibl;
+void PHcalValidInfoLayer::fillHF(double fibl, double fibs, double enec, double enhc) {
+  elongHF = (float)fibl;
   eshortHF = (float)fibs;
-  eEcalHF  = (float)enec;
-  eHcalHF  = (float)enhc;
+  eEcalHF = (float)enec;
+  eHcalHF = (float)enhc;
 }
 
-void PHcalValidInfoLayer::fillHits(int nHits, int lay, int unitID, double eta,
-				   double phi, double ehit, double t){
-
+void PHcalValidInfoLayer::fillHits(int nHits, int lay, int unitID, double eta, double phi, double ehit, double t) {
   hitLayer.push_back((float)lay);
   hitId.push_back((float)unitID);
   hitEta.push_back((float)eta);
@@ -1440,52 +1314,45 @@ void PHcalValidInfoLayer::fillHits(int nHits, int lay, int unitID, double eta,
   hitN++;
 
   //  std::cout << " fillHits: nHits,hitN = " << nHits << "," << hitN << std::endl;
-
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // PHcalValidInfoNxN
 ///////////////////////////////////////////////////////////////////////////////
 
-void PHcalValidInfoNxN::fillHvsE(double ee, double he, double hoe, 
-				 double etot) {
+void PHcalValidInfoNxN::fillHvsE(double ee, double he, double hoe, double etot) {
   ecalNxNr = (float)ee;
   hcalNxNr = (float)he;
-  hoNxNr   = (float)hoe;
+  hoNxNr = (float)hoe;
   etotNxNr = (float)etot;
 }
 
-void PHcalValidInfoNxN::fillEcollectNxN(double een, double hen, double hoen,
-					double etotn) {
+void PHcalValidInfoNxN::fillEcollectNxN(double een, double hen, double hoen, double etotn) {
   ecalNxN = (float)een;
   hcalNxN = (float)hen;
-  hoNxN   = (float)hoen;
+  hoNxN = (float)hoen;
   etotNxN = (float)etotn;
 }
 
-void PHcalValidInfoNxN::fillTProfileNxN (double e, int i, double t) {  
+void PHcalValidInfoNxN::fillTProfileNxN(double e, int i, double t) {
   idNxN.push_back((float)i);
   eNxN.push_back((float)e);
   tNxN.push_back((float)t);
   nNxN++;
 
   //  std::cout << " fillTProfileNxN - nNxN = " << nNxN << std::endl;
-
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // PMuonSimHit
 ///////////////////////////////////////////////////////////////////////////////
 
-void PMuonSimHit::putRawGenPart(int n)
-{
+void PMuonSimHit::putRawGenPart(int n) {
   nRawGenPart = n;
   return;
 }
 
-void PMuonSimHit::putG4Vtx(const std::vector<float>& x, const std::vector<float>& y, 
-	                   const std::vector<float>& z)
-{
+void PMuonSimHit::putG4Vtx(const std::vector<float>& x, const std::vector<float>& y, const std::vector<float>& z) {
   nG4Vtx = x.size();
   G4Vtx.resize(nG4Vtx);
   for (int i = 0; i < nG4Vtx; ++i) {
@@ -1496,208 +1363,204 @@ void PMuonSimHit::putG4Vtx(const std::vector<float>& x, const std::vector<float>
   return;
 }
 
-void PMuonSimHit::putG4Trk(const std::vector<float>& pt,  const std::vector<float>& e,
-		           const std::vector<float>& eta, const std::vector<float>& phi)
-{
+void PMuonSimHit::putG4Trk(const std::vector<float>& pt,
+                           const std::vector<float>& e,
+                           const std::vector<float>& eta,
+                           const std::vector<float>& phi) {
   nG4Trk = pt.size();
   G4Trk.resize(nG4Trk);
   for (int i = 0; i < nG4Trk; ++i) {
-    G4Trk[i].pt  = pt[i];
-    G4Trk[i].e   = e[i];
+    G4Trk[i].pt = pt[i];
+    G4Trk[i].e = e[i];
     G4Trk[i].eta = eta[i];
     G4Trk[i].phi = phi[i];
   }
   return;
 }
 
-void PMuonSimHit::putCSCHits (
-                              const std::vector<int>&   _cscId,
-                              const std::vector<unsigned int>& _detUnitId,
-                              const std::vector<float>& _trackId , 
-                              const std::vector<float>& _processType,
-                              const std::vector<float>& _particleType, 
-                              const std::vector<float>& _pabs,
-                              const std::vector<float>& _globposz,
-                              const std::vector<float>& _globposphi,
-                              const std::vector<float>& _globposeta,
-                              const std::vector<float>& _locposx, 
-                              const std::vector<float>& _locposy, 
-                              const std::vector<float>& _locposz,
-                              const std::vector<float>& _locdirx, 
-                              const std::vector<float>& _locdiry, 
-                              const std::vector<float>& _locdirz,
-                              const std::vector<float>& _locdirtheta, 
-                              const std::vector<float>& _locdirphi, 
-                              const std::vector<float>& _exitpointx, 
-                              const std::vector<float>& _exitpointy, 
-                              const std::vector<float>& _exitpointz,
-                              const std::vector<float>& _entrypointx, 
-                              const std::vector<float>& _entrypointy, 
-                              const std::vector<float>& _entrypointz,
-                              const std::vector<float>& _enloss, 
-                              const std::vector<float>& _tof)   
+void PMuonSimHit::putCSCHits(const std::vector<int>& _cscId,
+                             const std::vector<unsigned int>& _detUnitId,
+                             const std::vector<float>& _trackId,
+                             const std::vector<float>& _processType,
+                             const std::vector<float>& _particleType,
+                             const std::vector<float>& _pabs,
+                             const std::vector<float>& _globposz,
+                             const std::vector<float>& _globposphi,
+                             const std::vector<float>& _globposeta,
+                             const std::vector<float>& _locposx,
+                             const std::vector<float>& _locposy,
+                             const std::vector<float>& _locposz,
+                             const std::vector<float>& _locdirx,
+                             const std::vector<float>& _locdiry,
+                             const std::vector<float>& _locdirz,
+                             const std::vector<float>& _locdirtheta,
+                             const std::vector<float>& _locdirphi,
+                             const std::vector<float>& _exitpointx,
+                             const std::vector<float>& _exitpointy,
+                             const std::vector<float>& _exitpointz,
+                             const std::vector<float>& _entrypointx,
+                             const std::vector<float>& _entrypointy,
+                             const std::vector<float>& _entrypointz,
+                             const std::vector<float>& _enloss,
+                             const std::vector<float>& _tof)
 
 {
   nCSCHits = _tof.size();
   CSCHits.resize(nCSCHits);
   for (int i = 0; i < nCSCHits; ++i) {
-    CSCHits[i]._cscId           = _cscId[i];
-    CSCHits[i]._detUnitId       = _detUnitId[i];
-    CSCHits[i]._trackId         = _trackId[i];
-    CSCHits[i]._processType     = _processType[i];
-    CSCHits[i]._particleType    = _particleType[i];
-    CSCHits[i]._pabs            = _pabs[i];
-    CSCHits[i]._globposz        = _globposz[i];
-    CSCHits[i]._globposphi      = _globposphi[i];
-    CSCHits[i]._globposeta      = _globposeta[i];
-    CSCHits[i]._locposx         = _locposx[i];
-    CSCHits[i]._locposy         = _locposy[i];
-    CSCHits[i]._locposz         = _locposz[i];
-    CSCHits[i]._locdirx         = _locdirx[i];
-    CSCHits[i]._locdiry         = _locdiry[i];
-    CSCHits[i]._locdirz         = _locdirz[i];
-    CSCHits[i]._locdirtheta     = _locdirtheta[i];
-    CSCHits[i]._locdirphi       = _locdirphi[i];
-    CSCHits[i]._exitpointx      = _exitpointx[i];
-    CSCHits[i]._exitpointy      = _exitpointy[i];
-    CSCHits[i]._exitpointz      = _exitpointz[i];
-    CSCHits[i]._entrypointx     = _entrypointx[i];
-    CSCHits[i]._entrypointy     = _entrypointy[i];
-    CSCHits[i]._entrypointz     = _entrypointz[i];
-    CSCHits[i]._enloss          = _enloss[i];
-    CSCHits[i]._tof             = _tof[i];
-  }
-  return;
-}
-
-void PMuonSimHit::putDTHits  (const std::vector<unsigned int>& _detUnitId,
-                              const std::vector<float>& _trackId , 
-                              const std::vector<float>& _processType,
-                              const std::vector<float>& _particleType, 
-                              const std::vector<float>& _pabs,
-                              const std::vector<float>& _globposz,
-                              const std::vector<float>& _globposphi,
-                              const std::vector<float>& _globposeta,
-                              const std::vector<float>& _locposx, 
-                              const std::vector<float>& _locposy, 
-                              const std::vector<float>& _locposz,
-                              const std::vector<float>& _locdirx, 
-                              const std::vector<float>& _locdiry, 
-                              const std::vector<float>& _locdirz,
-                              const std::vector<float>& _locdirtheta, 
-                              const std::vector<float>& _locdirphi, 
-                              const std::vector<float>& _exitpointx, 
-                              const std::vector<float>& _exitpointy, 
-                              const std::vector<float>& _exitpointz,
-                              const std::vector<float>& _entrypointx, 
-                              const std::vector<float>& _entrypointy, 
-                              const std::vector<float>& _entrypointz,
-                              const std::vector<float>& _enloss, 
-                              const std::vector<float>& _tof)   
+    CSCHits[i]._cscId = _cscId[i];
+    CSCHits[i]._detUnitId = _detUnitId[i];
+    CSCHits[i]._trackId = _trackId[i];
+    CSCHits[i]._processType = _processType[i];
+    CSCHits[i]._particleType = _particleType[i];
+    CSCHits[i]._pabs = _pabs[i];
+    CSCHits[i]._globposz = _globposz[i];
+    CSCHits[i]._globposphi = _globposphi[i];
+    CSCHits[i]._globposeta = _globposeta[i];
+    CSCHits[i]._locposx = _locposx[i];
+    CSCHits[i]._locposy = _locposy[i];
+    CSCHits[i]._locposz = _locposz[i];
+    CSCHits[i]._locdirx = _locdirx[i];
+    CSCHits[i]._locdiry = _locdiry[i];
+    CSCHits[i]._locdirz = _locdirz[i];
+    CSCHits[i]._locdirtheta = _locdirtheta[i];
+    CSCHits[i]._locdirphi = _locdirphi[i];
+    CSCHits[i]._exitpointx = _exitpointx[i];
+    CSCHits[i]._exitpointy = _exitpointy[i];
+    CSCHits[i]._exitpointz = _exitpointz[i];
+    CSCHits[i]._entrypointx = _entrypointx[i];
+    CSCHits[i]._entrypointy = _entrypointy[i];
+    CSCHits[i]._entrypointz = _entrypointz[i];
+    CSCHits[i]._enloss = _enloss[i];
+    CSCHits[i]._tof = _tof[i];
+  }
+  return;
+}
+
+void PMuonSimHit::putDTHits(const std::vector<unsigned int>& _detUnitId,
+                            const std::vector<float>& _trackId,
+                            const std::vector<float>& _processType,
+                            const std::vector<float>& _particleType,
+                            const std::vector<float>& _pabs,
+                            const std::vector<float>& _globposz,
+                            const std::vector<float>& _globposphi,
+                            const std::vector<float>& _globposeta,
+                            const std::vector<float>& _locposx,
+                            const std::vector<float>& _locposy,
+                            const std::vector<float>& _locposz,
+                            const std::vector<float>& _locdirx,
+                            const std::vector<float>& _locdiry,
+                            const std::vector<float>& _locdirz,
+                            const std::vector<float>& _locdirtheta,
+                            const std::vector<float>& _locdirphi,
+                            const std::vector<float>& _exitpointx,
+                            const std::vector<float>& _exitpointy,
+                            const std::vector<float>& _exitpointz,
+                            const std::vector<float>& _entrypointx,
+                            const std::vector<float>& _entrypointy,
+                            const std::vector<float>& _entrypointz,
+                            const std::vector<float>& _enloss,
+                            const std::vector<float>& _tof)
 
 {
   nDTHits = _tof.size();
   DTHits.resize(nDTHits);
   for (int i = 0; i < nDTHits; ++i) {
-    DTHits[i]._detUnitId       = _detUnitId[i];
-    DTHits[i]._trackId         = _trackId[i];
-    DTHits[i]._processType     = _processType[i];
-    DTHits[i]._particleType    = _particleType[i];
-    DTHits[i]._pabs            = _pabs[i];
-    DTHits[i]._globposz        = _globposz[i];
-    DTHits[i]._globposphi      = _globposphi[i];
-    DTHits[i]._globposeta      = _globposeta[i];
-    DTHits[i]._locposx         = _locposx[i];
-    DTHits[i]._locposy         = _locposy[i];
-    DTHits[i]._locposz         = _locposz[i];
-    DTHits[i]._locdirx         = _locdirx[i];
-    DTHits[i]._locdiry         = _locdiry[i];
-    DTHits[i]._locdirz         = _locdirz[i];
-    DTHits[i]._locdirtheta     = _locdirtheta[i];
-    DTHits[i]._locdirphi       = _locdirphi[i];
-    DTHits[i]._exitpointx      = _exitpointx[i];
-    DTHits[i]._exitpointy      = _exitpointy[i];
-    DTHits[i]._exitpointz      = _exitpointz[i];
-    DTHits[i]._entrypointx     = _entrypointx[i];
-    DTHits[i]._entrypointy     = _entrypointy[i];
-    DTHits[i]._entrypointz     = _entrypointz[i];
-    DTHits[i]._enloss          = _enloss[i];
-    DTHits[i]._tof             = _tof[i];
-  }
-  return;
-}
-
-void PMuonSimHit::putRPCHits (const std::vector<unsigned int>& _detUnitId,
-                              const std::vector<float>& _trackId , 
-                              const std::vector<float>& _processType,
-                              const std::vector<float>& _particleType, 
-                              const std::vector<float>& _pabs,
-                              const std::vector<float>& _globposz,
-                              const std::vector<float>& _globposphi,
-                              const std::vector<float>& _globposeta,
-                              const std::vector<float>& _locposx, 
-                              const std::vector<float>& _locposy, 
-                              const std::vector<float>& _locposz,
-                              const std::vector<float>& _locdirx, 
-                              const std::vector<float>& _locdiry, 
-                              const std::vector<float>& _locdirz,
-                              const std::vector<float>& _locdirtheta, 
-                              const std::vector<float>& _locdirphi, 
-                              const std::vector<float>& _exitpointx, 
-                              const std::vector<float>& _exitpointy, 
-                              const std::vector<float>& _exitpointz,
-                              const std::vector<float>& _entrypointx, 
-                              const std::vector<float>& _entrypointy, 
-                              const std::vector<float>& _entrypointz,
-                              const std::vector<float>& _enloss, 
-                              const std::vector<float>& _tof)   
+    DTHits[i]._detUnitId = _detUnitId[i];
+    DTHits[i]._trackId = _trackId[i];
+    DTHits[i]._processType = _processType[i];
+    DTHits[i]._particleType = _particleType[i];
+    DTHits[i]._pabs = _pabs[i];
+    DTHits[i]._globposz = _globposz[i];
+    DTHits[i]._globposphi = _globposphi[i];
+    DTHits[i]._globposeta = _globposeta[i];
+    DTHits[i]._locposx = _locposx[i];
+    DTHits[i]._locposy = _locposy[i];
+    DTHits[i]._locposz = _locposz[i];
+    DTHits[i]._locdirx = _locdirx[i];
+    DTHits[i]._locdiry = _locdiry[i];
+    DTHits[i]._locdirz = _locdirz[i];
+    DTHits[i]._locdirtheta = _locdirtheta[i];
+    DTHits[i]._locdirphi = _locdirphi[i];
+    DTHits[i]._exitpointx = _exitpointx[i];
+    DTHits[i]._exitpointy = _exitpointy[i];
+    DTHits[i]._exitpointz = _exitpointz[i];
+    DTHits[i]._entrypointx = _entrypointx[i];
+    DTHits[i]._entrypointy = _entrypointy[i];
+    DTHits[i]._entrypointz = _entrypointz[i];
+    DTHits[i]._enloss = _enloss[i];
+    DTHits[i]._tof = _tof[i];
+  }
+  return;
+}
+
+void PMuonSimHit::putRPCHits(const std::vector<unsigned int>& _detUnitId,
+                             const std::vector<float>& _trackId,
+                             const std::vector<float>& _processType,
+                             const std::vector<float>& _particleType,
+                             const std::vector<float>& _pabs,
+                             const std::vector<float>& _globposz,
+                             const std::vector<float>& _globposphi,
+                             const std::vector<float>& _globposeta,
+                             const std::vector<float>& _locposx,
+                             const std::vector<float>& _locposy,
+                             const std::vector<float>& _locposz,
+                             const std::vector<float>& _locdirx,
+                             const std::vector<float>& _locdiry,
+                             const std::vector<float>& _locdirz,
+                             const std::vector<float>& _locdirtheta,
+                             const std::vector<float>& _locdirphi,
+                             const std::vector<float>& _exitpointx,
+                             const std::vector<float>& _exitpointy,
+                             const std::vector<float>& _exitpointz,
+                             const std::vector<float>& _entrypointx,
+                             const std::vector<float>& _entrypointy,
+                             const std::vector<float>& _entrypointz,
+                             const std::vector<float>& _enloss,
+                             const std::vector<float>& _tof)
 
 {
   nRPCHits = _tof.size();
   RPCHits.resize(nRPCHits);
   for (int i = 0; i < nRPCHits; ++i) {
-    RPCHits[i]._detUnitId       = _detUnitId[i];
-    RPCHits[i]._trackId         = _trackId[i];
-    RPCHits[i]._processType     = _processType[i];
-    RPCHits[i]._particleType    = _particleType[i];
-    RPCHits[i]._pabs            = _pabs[i];
-    RPCHits[i]._globposz        = _globposz[i];
-    RPCHits[i]._globposphi      = _globposphi[i];
-    RPCHits[i]._globposeta      = _globposeta[i];
-    RPCHits[i]._locposx         = _locposx[i];
-    RPCHits[i]._locposy         = _locposy[i];
-    RPCHits[i]._locposz         = _locposz[i];
-    RPCHits[i]._locdirx         = _locdirx[i];
-    RPCHits[i]._locdiry         = _locdiry[i];
-    RPCHits[i]._locdirz         = _locdirz[i];
-    RPCHits[i]._locdirtheta     = _locdirtheta[i];
-    RPCHits[i]._locdirphi       = _locdirphi[i];
-    RPCHits[i]._exitpointx      = _exitpointx[i];
-    RPCHits[i]._exitpointy      = _exitpointy[i];
-    RPCHits[i]._exitpointz      = _exitpointz[i];
-    RPCHits[i]._entrypointx     = _entrypointx[i];
-    RPCHits[i]._entrypointy     = _entrypointy[i];
-    RPCHits[i]._entrypointz     = _entrypointz[i];
-    RPCHits[i]._enloss          = _enloss[i];
-    RPCHits[i]._tof             = _tof[i];
+    RPCHits[i]._detUnitId = _detUnitId[i];
+    RPCHits[i]._trackId = _trackId[i];
+    RPCHits[i]._processType = _processType[i];
+    RPCHits[i]._particleType = _particleType[i];
+    RPCHits[i]._pabs = _pabs[i];
+    RPCHits[i]._globposz = _globposz[i];
+    RPCHits[i]._globposphi = _globposphi[i];
+    RPCHits[i]._globposeta = _globposeta[i];
+    RPCHits[i]._locposx = _locposx[i];
+    RPCHits[i]._locposy = _locposy[i];
+    RPCHits[i]._locposz = _locposz[i];
+    RPCHits[i]._locdirx = _locdirx[i];
+    RPCHits[i]._locdiry = _locdiry[i];
+    RPCHits[i]._locdirz = _locdirz[i];
+    RPCHits[i]._locdirtheta = _locdirtheta[i];
+    RPCHits[i]._locdirphi = _locdirphi[i];
+    RPCHits[i]._exitpointx = _exitpointx[i];
+    RPCHits[i]._exitpointy = _exitpointy[i];
+    RPCHits[i]._exitpointz = _exitpointz[i];
+    RPCHits[i]._entrypointx = _entrypointx[i];
+    RPCHits[i]._entrypointy = _entrypointy[i];
+    RPCHits[i]._entrypointz = _entrypointz[i];
+    RPCHits[i]._enloss = _enloss[i];
+    RPCHits[i]._tof = _tof[i];
   }
   return;
-
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // PTrackerSimHit
 ///////////////////////////////////////////////////////////////////////////////
 
-void PTrackerSimHit::putRawGenPart(int n)
-{
+void PTrackerSimHit::putRawGenPart(int n) {
   nRawGenPart = n;
   return;
 }
 
-void PTrackerSimHit::putG4Vtx(const std::vector<float>& x, const std::vector<float>& y, 
-	       const std::vector<float>& z)
-{
+void PTrackerSimHit::putG4Vtx(const std::vector<float>& x, const std::vector<float>& y, const std::vector<float>& z) {
   nG4Vtx = x.size();
   G4Vtx.resize(nG4Vtx);
   for (int i = 0; i < nG4Vtx; ++i) {
@@ -1709,9 +1572,10 @@ void PTrackerSimHit::putG4Vtx(const std::vector<float>& x, const std::vector<flo
   return;
 }
 
-void PTrackerSimHit::putG4Trk(const std::vector<float>& pt, const std::vector<float>& e,
-		              const std::vector<float>& eta, const std::vector<float>& phi)
-{
+void PTrackerSimHit::putG4Trk(const std::vector<float>& pt,
+                              const std::vector<float>& e,
+                              const std::vector<float>& eta,
+                              const std::vector<float>& phi) {
   nG4Trk = pt.size();
   G4Trk.resize(nG4Trk);
   for (int i = 0; i < nG4Trk; ++i) {
@@ -1724,16 +1588,28 @@ void PTrackerSimHit::putG4Trk(const std::vector<float>& pt, const std::vector<fl
   return;
 }
 
-
-void PTrackerSimHit::putHits (const std::vector<int>& _sysID, const std::vector<float>& _detUnitId,
-	       const std::vector<float>&_trackId , const std::vector<float>&_processType,
-	       const std::vector<float>&_particleType, const std::vector<float>& _pabs,
-	       const std::vector<float>&_lpx, const std::vector<float>&_lpy, const std::vector<float>&_lpz,
-	       const std::vector<float>&_ldx, const std::vector<float>&_ldy, const std::vector<float>&_ldz,
-	       const std::vector<float>&_ldtheta, const std::vector<float>&_ldphi, 
-	       const std::vector<float>&_exx, const std::vector<float>&_exy, const std::vector<float>&_exz,
-	       const std::vector<float>&_enx, const std::vector<float>&_eny, const std::vector<float>&_enz,
-	       const std::vector<float>&_eloss, const std::vector<float>&_tof)   
+void PTrackerSimHit::putHits(const std::vector<int>& _sysID,
+                             const std::vector<float>& _detUnitId,
+                             const std::vector<float>& _trackId,
+                             const std::vector<float>& _processType,
+                             const std::vector<float>& _particleType,
+                             const std::vector<float>& _pabs,
+                             const std::vector<float>& _lpx,
+                             const std::vector<float>& _lpy,
+                             const std::vector<float>& _lpz,
+                             const std::vector<float>& _ldx,
+                             const std::vector<float>& _ldy,
+                             const std::vector<float>& _ldz,
+                             const std::vector<float>& _ldtheta,
+                             const std::vector<float>& _ldphi,
+                             const std::vector<float>& _exx,
+                             const std::vector<float>& _exy,
+                             const std::vector<float>& _exz,
+                             const std::vector<float>& _enx,
+                             const std::vector<float>& _eny,
+                             const std::vector<float>& _enz,
+                             const std::vector<float>& _eloss,
+                             const std::vector<float>& _tof)
 
 {
   nHits = _tof.size();
diff --git a/SimDataFormats/ValidationFormats/src/classes.h b/SimDataFormats/ValidationFormats/src/classes.h
index 6ceba516539c2..1e4564527d5d5 100644
--- a/SimDataFormats/ValidationFormats/src/classes.h
+++ b/SimDataFormats/ValidationFormats/src/classes.h
@@ -7,4 +7,3 @@
 #include "SimDataFormats/ValidationFormats/interface/MaterialAccountingDetector.h"
 #include "SimDataFormats/ValidationFormats/interface/MaterialAccountingTrack.h"
 #include "SimDataFormats/ValidationFormats/interface/PHGCalValidInfo.h"
-
diff --git a/SimDataFormats/Vertex/interface/CoreSimVertex.h b/SimDataFormats/Vertex/interface/CoreSimVertex.h
index 44db7993f94c4..df20678480590 100644
--- a/SimDataFormats/Vertex/interface/CoreSimVertex.h
+++ b/SimDataFormats/Vertex/interface/CoreSimVertex.h
@@ -4,41 +4,34 @@
 #include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
 #include "DataFormats/Math/interface/Vector3D.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
- 
+
 #include <cmath>
- 
+
 /**  a generic Simulated Vertex
  */
-class CoreSimVertex 
-{ 
+class CoreSimVertex {
 public:
   /// constructors
-  CoreSimVertex(){}
-  
-  CoreSimVertex( const math::XYZVectorD & v, float tof){ 
-    theVertex.SetXYZT( v.x(), v.y(), v.z(), tof) ;
-  }
-    
-  CoreSimVertex( const math::XYZTLorentzVectorD& v ){ 
-    theVertex.SetXYZT( v.x(), v.y(), v.z(), v.t() ) ; 
-  }
-  
+  CoreSimVertex() {}
+
+  CoreSimVertex(const math::XYZVectorD& v, float tof) { theVertex.SetXYZT(v.x(), v.y(), v.z(), tof); }
+
+  CoreSimVertex(const math::XYZTLorentzVectorD& v) { theVertex.SetXYZT(v.x(), v.y(), v.z(), v.t()); }
+
   const math::XYZTLorentzVectorD& position() const { return theVertex; }
-    
-  void setEventId(EncodedEventId e) {eId=e;}
-  
-  EncodedEventId eventId() const {return eId;}
-  
-  void setTof(float tof){
-    theVertex.SetXYZT(theVertex.x(),theVertex.y(),theVertex.z(),tof);
-  }
-    
- private:
+
+  void setEventId(EncodedEventId e) { eId = e; }
+
+  EncodedEventId eventId() const { return eId; }
+
+  void setTof(float tof) { theVertex.SetXYZT(theVertex.x(), theVertex.y(), theVertex.z(), tof); }
+
+private:
   EncodedEventId eId;
   math::XYZTLorentzVectorD theVertex;
 };
 
 #include <iosfwd>
-std::ostream & operator <<(std::ostream & o , const CoreSimVertex & v);
+std::ostream& operator<<(std::ostream& o, const CoreSimVertex& v);
 
-#endif 
+#endif
diff --git a/SimDataFormats/Vertex/interface/SimVertex.h b/SimDataFormats/Vertex/interface/SimVertex.h
index 4a1237734c81a..73489a5f77206 100644
--- a/SimDataFormats/Vertex/interface/SimVertex.h
+++ b/SimDataFormats/Vertex/interface/SimVertex.h
@@ -2,51 +2,46 @@
 #define SimVertex_H
 
 #include "SimDataFormats/Vertex/interface/CoreSimVertex.h"
-class SimVertex : public CoreSimVertex
-{
-
- public:
-  
+class SimVertex : public CoreSimVertex {
+public:
   typedef CoreSimVertex Core;
   /// constructor
   SimVertex();
 
   /// constructor from transient
-  SimVertex(const CoreSimVertex & t, int it);
+  SimVertex(const CoreSimVertex& t, int it);
 
-  SimVertex( const math::XYZVectorD& v, float tof ) ;
+  SimVertex(const math::XYZVectorD& v, float tof);
 
   /// full constructor (position, time, index of parent in final vector)
-  SimVertex( const math::XYZVectorD& v, float tof, int it ) ;
+  SimVertex(const math::XYZVectorD& v, float tof, int it);
 
   /// constructor from transient
-  SimVertex(const CoreSimVertex & t, int it, unsigned int vId );
+  SimVertex(const CoreSimVertex& t, int it, unsigned int vId);
 
-  SimVertex( const math::XYZVectorD& v, float tof, unsigned int vId ) ;
+  SimVertex(const math::XYZVectorD& v, float tof, unsigned int vId);
 
   /// full constructor (position, time, index of parent in final vector)
-  SimVertex( const math::XYZVectorD& v, float tof, int it, unsigned int vId ) ;
-
+  SimVertex(const math::XYZVectorD& v, float tof, int it, unsigned int vId);
 
   /// G4 TrackId of the parent in the Event SimTrack container (-1 if no parent)
   /// BE CAREFUL this is not a vector index
-  int parentIndex() const { return  itrack; }
-  bool noParent() const { return  itrack==-1; }
+  int parentIndex() const { return itrack; }
+  bool noParent() const { return itrack == -1; }
 
-  void setVertexId(unsigned int n) {vtxId = n;}
-  unsigned int vertexId() const { return  vtxId; }  
+  void setVertexId(unsigned int n) { vtxId = n; }
+  unsigned int vertexId() const { return vtxId; }
 
-  void setProcessType(unsigned int ty) {procType = ty;}
-  unsigned int processType() const { return procType; }  
+  void setProcessType(unsigned int ty) { procType = ty; }
+  unsigned int processType() const { return procType; }
 
-private: 
+private:
   int itrack;
-  unsigned int vtxId; 
+  unsigned int vtxId;
   unsigned int procType;
 };
 
 #include <iosfwd>
-std::ostream & operator <<(std::ostream & o , const SimVertex& v);
- 
+std::ostream& operator<<(std::ostream& o, const SimVertex& v);
 
 #endif
diff --git a/SimDataFormats/Vertex/interface/SimVertexContainer.h b/SimDataFormats/Vertex/interface/SimVertexContainer.h
index 5f52a9ca60867..a2847534e3d0e 100644
--- a/SimDataFormats/Vertex/interface/SimVertexContainer.h
+++ b/SimDataFormats/Vertex/interface/SimVertexContainer.h
@@ -7,15 +7,13 @@
 #include "DataFormats/Common/interface/RefVector.h"
 
 #include <vector>
- 
-namespace edm 
-{
+
+namespace edm {
   typedef std::vector<SimVertex> SimVertexContainer;
-  typedef edm::Ref<std::vector<SimVertex> > SimVertexRef ;
+  typedef edm::Ref<std::vector<SimVertex> > SimVertexRef;
   typedef edm::RefProd<std::vector<SimVertex> > SimVertexRefProd;
   typedef edm::RefVector<std::vector<SimVertex> > SimVertexRefVector;
 
-} 
- 
+}  // namespace edm
 
 #endif
diff --git a/SimDataFormats/Vertex/src/CoreSimVertex.cc b/SimDataFormats/Vertex/src/CoreSimVertex.cc
index e76c42ca10c3d..c74fcfba4bb10 100644
--- a/SimDataFormats/Vertex/src/CoreSimVertex.cc
+++ b/SimDataFormats/Vertex/src/CoreSimVertex.cc
@@ -1,7 +1,6 @@
 #include "SimDataFormats/Vertex/interface/CoreSimVertex.h"
- 
-std::ostream & operator <<(std::ostream & o , const CoreSimVertex & v) 
-{
-    o << v.position();
-    return o;
+
+std::ostream& operator<<(std::ostream& o, const CoreSimVertex& v) {
+  o << v.position();
+  return o;
 }
diff --git a/SimDataFormats/Vertex/src/SimVertex.cc b/SimDataFormats/Vertex/src/SimVertex.cc
index 5c33539e77f25..0814cb297b60a 100644
--- a/SimDataFormats/Vertex/src/SimVertex.cc
+++ b/SimDataFormats/Vertex/src/SimVertex.cc
@@ -1,24 +1,21 @@
 #include "SimDataFormats/Vertex/interface/SimVertex.h"
 
 SimVertex::SimVertex() : itrack(-1), vtxId(0), procType(0) {}
- 
-SimVertex::SimVertex(const math::XYZVectorD& v, float tof) :
-  Core(v,tof), itrack(-1), vtxId(0), procType(0) {}
-
-SimVertex::SimVertex(const math::XYZVectorD& v, float tof, int it) :
-    Core(v,tof), itrack(it), vtxId(0), procType(0) {}
-
-SimVertex::SimVertex(const CoreSimVertex & v, int it) :
-    Core(v), itrack(it), vtxId(0), procType(0) {}
-
-SimVertex::SimVertex(const math::XYZVectorD& v, float tof, unsigned int vId) :
-    Core(v,tof), itrack(-1), vtxId(vId), procType(0) {}
- 
-SimVertex::SimVertex(const math::XYZVectorD& v, float tof, int it, unsigned int vId) :
-    Core(v,tof), itrack(it), vtxId(vId), procType(0) {}
- 
-SimVertex::SimVertex(const CoreSimVertex & v, int it, unsigned int vId) :
-    Core(v), itrack(it), vtxId(vId), procType(0) {}
- 
-std::ostream & operator <<(std::ostream & o , const SimVertex & v) 
-{ return o << (SimVertex::Core)(v) << ", " <<  v.parentIndex() <<", "<<v.vertexId(); }
+
+SimVertex::SimVertex(const math::XYZVectorD& v, float tof) : Core(v, tof), itrack(-1), vtxId(0), procType(0) {}
+
+SimVertex::SimVertex(const math::XYZVectorD& v, float tof, int it) : Core(v, tof), itrack(it), vtxId(0), procType(0) {}
+
+SimVertex::SimVertex(const CoreSimVertex& v, int it) : Core(v), itrack(it), vtxId(0), procType(0) {}
+
+SimVertex::SimVertex(const math::XYZVectorD& v, float tof, unsigned int vId)
+    : Core(v, tof), itrack(-1), vtxId(vId), procType(0) {}
+
+SimVertex::SimVertex(const math::XYZVectorD& v, float tof, int it, unsigned int vId)
+    : Core(v, tof), itrack(it), vtxId(vId), procType(0) {}
+
+SimVertex::SimVertex(const CoreSimVertex& v, int it, unsigned int vId) : Core(v), itrack(it), vtxId(vId), procType(0) {}
+
+std::ostream& operator<<(std::ostream& o, const SimVertex& v) {
+  return o << (SimVertex::Core)(v) << ", " << v.parentIndex() << ", " << v.vertexId();
+}
diff --git a/SimDataFormats/Vertex/src/classes.h b/SimDataFormats/Vertex/src/classes.h
index 7ba2637825aae..f0f3f7b3f9051 100644
--- a/SimDataFormats/Vertex/src/classes.h
+++ b/SimDataFormats/Vertex/src/classes.h
@@ -4,4 +4,3 @@
 #include "DataFormats/Common/interface/Wrapper.h"
 
 #include <vector>
- 
diff --git a/SimG4CMS/Calo/interface/CaloSD.h b/SimG4CMS/Calo/interface/CaloSD.h
index 97072b10b8eb7..a38e021b46490 100644
--- a/SimG4CMS/Calo/interface/CaloSD.h
+++ b/SimG4CMS/Calo/interface/CaloSD.h
@@ -27,6 +27,7 @@
 
 #include <vector>
 #include <map>
+#include <memory>
 
 class G4Step;
 class G4HCofThisEvent;
@@ -64,6 +65,7 @@ class CaloSD : public SensitiveCaloDetector,
 
   void clearHits() override;
   void fillHits(edm::PCaloHitContainer&, const std::string&) override;
+  void reset() override;
 
 protected:
   virtual double getEnergyDeposit(const G4Step* step);
@@ -163,10 +165,7 @@ class CaloSD : public SensitiveCaloDetector,
 
   std::map<CaloHitID, CaloG4Hit*> hitMap;
   std::map<int, TrackWithHistory*> tkMap;
-
-  std::vector<CaloG4Hit*> reusehit;
-  std::vector<CaloG4Hit*> hitvec;
-  std::vector<unsigned int> selIndex;
+  std::vector<std::unique_ptr<CaloG4Hit>> reusehit;
 };
 
 #endif  // SimG4CMS_CaloSD_h
diff --git a/SimG4CMS/Calo/src/CaloSD.cc b/SimG4CMS/Calo/src/CaloSD.cc
index 2ca3ae1767a0e..a31864c46c05c 100644
--- a/SimG4CMS/Calo/src/CaloSD.cc
+++ b/SimG4CMS/Calo/src/CaloSD.cc
@@ -20,7 +20,6 @@
 #include "G4SystemOfUnits.hh"
 #include "G4PhysicalConstants.hh"
 
-#include <iostream>
 #include <fstream>
 
 //#define EDM_ML_DEBUG
@@ -103,7 +102,7 @@ CaloSD::CaloSD(const std::string& name,
                               << "        Time Slice Unit " << timeSlice << " Ignore TrackID Flag " << ignoreTrackID;
 }
 
-CaloSD::~CaloSD() { delete theHC; }
+CaloSD::~CaloSD() { }
 
 G4bool CaloSD::ProcessHits(G4Step* aStep, G4TouchableHistory*) {
   NaNTrap(aStep);
@@ -260,6 +259,7 @@ void CaloSD::Initialize(G4HCofThisEvent* HCE) {
   if (hcID < 0) {
     hcID = G4SDManager::GetSDMpointer()->GetCollectionID(collectionName[0]);
   }
+  //theHC ownership is transfered here to HCE
   HCE->AddHitsCollection(hcID, theHC);
 }
 
@@ -360,10 +360,10 @@ CaloG4Hit* CaloSD::createNewHit(const G4Step* aStep) {
 
   CaloG4Hit* aHit;
   if (!reusehit.empty()) {
-    aHit = reusehit[0];
+    aHit = reusehit.back().release();
     aHit->setEM(0.f);
     aHit->setHadr(0.f);
-    reusehit.erase(reusehit.begin());
+    reusehit.pop_back();
   } else {
     aHit = new CaloG4Hit;
   }
@@ -544,15 +544,12 @@ void CaloSD::update(const ::EndOfEvent*) {
                               << " E0mean= " << ee << " Zglob= " << zglob << " Zloc= " << zloc << " ";
 
   tkMap.erase(tkMap.begin(), tkMap.end());
+  std::vector<std::unique_ptr<CaloG4Hit>>().swap(reusehit);
+  if (useMap) hitMap.erase (hitMap.begin(), hitMap.end());
 }
 
 void CaloSD::clearHits() {
-  if (useMap)
-    hitMap.erase(hitMap.begin(), hitMap.end());
-  for (unsigned int i = 0; i < reusehit.size(); ++i)
-    delete reusehit[i];
-  std::vector<CaloG4Hit*>().swap(reusehit);
-  cleanIndex = 0;
+  cleanIndex  = 0;
   previousID.reset();
   primIDSaved = -99;
 #ifdef EDM_ML_DEBUG
@@ -562,6 +559,12 @@ void CaloSD::clearHits() {
   slave.get()->Initialize();
 }
 
+void CaloSD::reset() {
+  if(fpCaloG4HitAllocator) {
+    fpCaloG4HitAllocator->ResetStorage();
+  }
+}
+
 void CaloSD::initRun() {}
 
 void CaloSD::initEvent(const BeginOfEvent*) {}
@@ -699,13 +702,13 @@ void CaloSD::cleanHitCollection() {
 #ifdef EDM_ML_DEBUG
   edm::LogVerbatim("CaloSim") << "CaloSD: collection before merging, size = " << theHC->entries();
 #endif
-
-  selIndex.reserve(theHC->entries() - cleanIndex);
-  if (reusehit.empty())
-    reusehit.reserve(theHC->entries() - cleanIndex);
+  if (reusehit.empty()) 
+    reusehit.reserve(theHC->entries() - cleanIndex); 
 
   // if no map used, merge before hits to have the save situation as a map
-  if (!useMap) {
+  if ( !useMap ) {
+    std::vector<CaloG4Hit*> hitvec;
+
     hitvec.swap(*theCollection);
     sort((hitvec.begin() + cleanIndex), hitvec.end(), CaloG4HitLess());
 #ifdef EDM_ML_DEBUG
@@ -714,18 +717,17 @@ void CaloSD::cleanHitCollection() {
     for (unsigned int i = 0; i < hitvec.size(); ++i)
       edm::LogVerbatim("CaloSim") << i << " " << *hitvec[i];
 #endif
-    unsigned int i, j;
     CaloG4HitEqual equal;
-    for (i = cleanIndex; i < hitvec.size(); ++i) {
-      selIndex.push_back(i - cleanIndex);
+    for (unsigned int i= cleanIndex; i < hitvec.size(); ++i) {
       int jump = 0;
-      for (j = i + 1; j < hitvec.size() && equal(hitvec[i], hitvec[j]); ++j) {
+      for (unsigned int j = i + 1; j < hitvec.size() && equal(hitvec[i], hitvec[j]); ++j) {
         ++jump;
         // merge j to i
         (*hitvec[i]).addEnergyDeposit(*hitvec[j]);
         (*hitvec[j]).setEM(0.);
         (*hitvec[j]).setHadr(0.);
-        reusehit.push_back(hitvec[j]);
+        reusehit.emplace_back(hitvec[j]);
+        hitvec[j] = nullptr;
       }
       i += jump;
     }
@@ -734,19 +736,17 @@ void CaloSD::cleanHitCollection() {
     for (unsigned int i = 0; i < hitvec.size(); ++i)
       edm::LogVerbatim("CaloSim") << i << " " << *hitvec[i];
 #endif
-    for (unsigned int i = cleanIndex; i < cleanIndex + selIndex.size(); ++i) {
-      hitvec[i] = hitvec[selIndex[i - cleanIndex] + cleanIndex];
-    }
-    hitvec.resize(cleanIndex + selIndex.size());
+    //move all nullptr to end of list and then remove them
+    hitvec.erase(std::stable_partition(hitvec.begin()+cleanIndex, 
+                                       hitvec.end(), [](CaloG4Hit* p) { return p!= nullptr;}),
+                 hitvec.end());
 #ifdef EDM_ML_DEBUG
     edm::LogVerbatim("CaloSim") << "CaloSD::cleanHitCollection: remove the merged hits in buffer,"
                                 << " new size = " << hitvec.size();
-    for (unsigned int i = 0; i < hitvec.size(); ++i)
+    for (unsigned int i = 0; i < hitvec.size(); ++i) 
       edm::LogVerbatim("CaloSim") << i << " " << *hitvec[i];
 #endif
     hitvec.swap(*theCollection);
-    std::vector<CaloG4Hit*>().swap(hitvec);
-    selIndex.clear();
     totalHits = theHC->entries();
   }
 
@@ -757,8 +757,7 @@ void CaloSD::cleanHitCollection() {
 #endif
 
   int addhit = 0;
-  selIndex.reserve(theCollection->size() - cleanIndex);
-  for (unsigned int i = cleanIndex; i < theCollection->size(); ++i) {
+  for (unsigned int i = cleanIndex; i < theCollection->size(); ++i) {   
     CaloG4Hit* aHit((*theCollection)[i]);
 
     // selection
@@ -773,11 +772,10 @@ void CaloSD::cleanHitCollection() {
 #endif
 
       // create the list of hits to be reused
-
-      reusehit.push_back((*theCollection)[i]);
+      
+      reusehit.emplace_back((*theCollection)[i]);
+      (*theCollection)[i] = nullptr;
       ++addhit;
-    } else {
-      selIndex.push_back(i - cleanIndex);
     }
   }
 
@@ -794,13 +792,11 @@ void CaloSD::cleanHitCollection() {
       }
     }
   }
-  for (unsigned int j = 0; j < selIndex.size(); ++j) {
-    (*theCollection)[cleanIndex + j] = (*theCollection)[cleanIndex + selIndex[j]];
-  }
-
-  theCollection->resize(cleanIndex + selIndex.size());
-  std::vector<unsigned int>().swap(selIndex);
 
+  //move all nullptr to end of list and then remove them
+  theCollection->erase(std::stable_partition(theCollection->begin()+cleanIndex,
+                                             theCollection->end(), [](CaloG4Hit* p) { return p!= nullptr;}),
+                       theCollection->end());
 #ifdef EDM_ML_DEBUG
   edm::LogVerbatim("CaloSim") << "CaloSD: hit collection after selection, size = " << theHC->entries();
   theHC->PrintAllHits();
diff --git a/SimG4CMS/Calo/src/HGCalNumberingScheme.cc b/SimG4CMS/Calo/src/HGCalNumberingScheme.cc
index 4e551af879cdf..5694a27d8040b 100644
--- a/SimG4CMS/Calo/src/HGCalNumberingScheme.cc
+++ b/SimG4CMS/Calo/src/HGCalNumberingScheme.cc
@@ -27,6 +27,13 @@ uint32_t HGCalNumberingScheme::getUnitID(int layer, int module, int cell, int iz
   // module is the copy number of the wafer as placed in the layer
   uint32_t index(0);
   wt = 1.0;
+#ifdef EDM_ML_DEBUG
+  edm::LogVerbatim("HGCSim") 
+    << "HGCalNumberingScheme:: input Layer " << layer << " Module " << module
+    << " Cell " << cell << " iz " << iz << " Position " << pos << " Mode "
+    << mode_ << ":" << HGCalGeometryMode::Hexagon8Full << ":"
+    << HGCalGeometryMode::Hexagon8 << ":" << HGCalGeometryMode::Trapezoid;
+#endif
   if ((mode_ == HGCalGeometryMode::Hexagon8Full) || (mode_ == HGCalGeometryMode::Hexagon8)) {
     int cellU(0), cellV(0), waferType(-1), waferU(0), waferV(0);
     if (cell >= 0) {
@@ -46,8 +53,9 @@ uint32_t HGCalNumberingScheme::getUnitID(int layer, int module, int cell, int iz
     if (waferType >= 0) {
       index = HGCSiliconDetId(det_, iz, waferType, layer, waferU, waferV, cellU, cellV).rawId();
 #ifdef EDM_ML_DEBUG
-      edm::LogVerbatim("HGCSim") << "OK WaferType " << waferType << " Wafer " << waferU << ":" << waferV << " Cell "
-                                 << cellU << ":" << cellV;
+      edm::LogVerbatim("HGCSim")
+	<< "OK WaferType " << waferType << " Wafer " << waferU << ":" << waferV 
+	<< " Cell " << cellU << ":" << cellV;
     } else {
       edm::LogVerbatim("HGCSim") << "Bad WaferType " << waferType;
 #endif
@@ -57,19 +65,24 @@ uint32_t HGCalNumberingScheme::getUnitID(int layer, int module, int cell, int iz
     if (id[2] >= 0) {
       index = HGCScintillatorDetId(id[2], layer, iz * id[0], id[1]).rawId();
 #ifdef EDM_ML_DEBUG
-      edm::LogVerbatim("HGCSim") << "Radius/Phi " << id[0] << ":" << id[1] << " Type " << id[2] << " Layer|iz " << layer
-                                 << ":" << iz << " " << HGCScintillatorDetId(index);
+      edm::LogVerbatim("HGCSim") 
+	<< "Radius/Phi " << id[0] << ":" << id[1] << " Type " << id[2] 
+	<< " Layer|iz " << layer << ":" << iz << " " 
+	<< HGCScintillatorDetId(index);
     } else {
-      edm::LogVerbatim("HGCSim") << "Radius/Phi " << id[0] << ":" << id[1] << " Type " << id[2] << " Layer|iz " << layer
-                                 << ":" << iz;
+      edm::LogVerbatim("HGCSim") 
+	<< "Radius/Phi " << id[0] << ":" << id[1] << " Type " << id[2] 
+	<< " Layer|iz " << layer << ":" << iz << " ERROR";
 #endif
     }
   }
 #ifdef EDM_ML_DEBUG
-  edm::LogVerbatim("HGCSim") << "HGCalNumberingScheme::i/p " << det_ << ":" << layer << ":" << module << ":" << cell
-                             << ":" << iz << ":" << pos.x() << ":" << pos.y() << ":" << pos.z() << " ID " << std::hex
-                             << index << std::dec << " wt " << wt;
+  edm::LogVerbatim("HGCSim") 
+    << "HGCalNumberingScheme::i/p " << det_ << ":" << layer << ":" << module 
+    << ":" << cell << ":" << iz << ":" << pos.x() << ":" << pos.y() << ":" 
+    << pos.z() << " ID " << std::hex << index << std::dec << " wt " << wt;
   checkPosition(index, pos);
+  }
 #endif
   return index;
 }
@@ -106,24 +119,26 @@ void HGCalNumberingScheme::checkPosition(uint32_t index, const G4ThreeVector& po
     bool match = (std::abs(r1 - r2) < drMax) && (std::abs(z1 - z2) < dzMax);
     bool inok = ((r2 >= rrange.first) && (r2 <= rrange.second) && (z2 >= zrange.first) && (z2 <= zrange.second));
     bool outok = ((r1 >= rrange.first) && (r1 <= rrange.second) && (z1 >= zrange.first) && (z1 <= zrange.second));
-    std::string ck = (((r1 < rrange.first - 10.0) || (r1 > rrange.second + 10.0) || (z1 < zrange.first - 5.0) ||
-                       (z1 > zrange.second + 5.0))
-                          ? "***** ERROR *****"
-                          : "");
+    std::string ck = (((r1 < rrange.first - 10.0) || (r1 > rrange.second +10.0) ||
+		       (z1 < zrange.first - 5.0) || (z1 > zrange.second + 5.0)) ?
+		      "***** ERROR *****" : "");
     if (!(match && inok && outok)) {
-      edm::LogVerbatim("HGCSim") << "HGCalNumberingScheme::Detector " << det_ << " Layer " << lay << " R " << r2 << ":"
-                                 << r1 << ":" << rrange.first << ":" << rrange.second << " Z " << z2 << ":" << z1 << ":"
-                                 << zrange.first << ":" << zrange.second << " Match " << match << ":" << inok << ":"
-                                 << outok << " " << ck;
-      edm::LogVerbatim("HGCSim") << "Original " << pos.x() << ":" << pos.y() << " return " << xy.first << ":"
-                                 << xy.second;
+      edm::LogVerbatim("HGCSim") 
+	<< "HGCalNumberingScheme::Detector " << det_ << " Layer " << lay << " R "
+	<< r2 << ":" << r1 << ":" << rrange.first << ":" << rrange.second << " Z "
+	<< z2 << ":" << z1 << ":" << zrange.first << ":" << zrange.second 
+	<< " Match " << match << ":" << inok << ":" << outok << " " << ck;
+      edm::LogVerbatim("HGCSim") 
+	<< "Original " << pos.x() << ":" << pos.y() << " return " << xy.first 
+	<< ":"  << xy.second;
       if (DetId(index).det() == DetId::HGCalHSi) {
         double wt = 0, xx = ((pos.z() > 0) ? pos.x() : -pos.x());
         int waferU, waferV, cellU, cellV, waferType;
         hgcons_.waferFromPosition(xx, pos.y(), lay, waferU, waferV, cellU, cellV, waferType, wt, true);
         xy = hgcons_.locateCell(lay, waferU, waferV, cellU, cellV, false, true, true);
-        edm::LogVerbatim("HGCSim") << "HGCalNumberingScheme " << HGCSiliconDetId(index) << " position " << xy.first
-                                   << ":" << xy.second;
+        edm::LogVerbatim("HGCSim") 
+	  << "HGCalNumberingScheme " << HGCSiliconDetId(index) << " position " 
+	  << xy.first << ":" << xy.second;
       }
     }
   }
diff --git a/SimG4CMS/Calo/test/python/calostep_cfg.py b/SimG4CMS/Calo/test/python/calostep_cfg.py
index 0d7ce38495c90..46d8c778cdc12 100644
--- a/SimG4CMS/Calo/test/python/calostep_cfg.py
+++ b/SimG4CMS/Calo/test/python/calostep_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("Sim",eras.Run2_2018)
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+process = cms.Process("Sim",Run2_2018)
 
 process.load("SimG4CMS.Calo.PythiaMinBias_cfi")
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
diff --git a/SimG4CMS/Calo/test/python/minbias_cfg.py b/SimG4CMS/Calo/test/python/minbias_cfg.py
index 366ed31eb8e3e..b5eec7c3ae55c 100644
--- a/SimG4CMS/Calo/test/python/minbias_cfg.py
+++ b/SimG4CMS/Calo/test/python/minbias_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("Sim",eras.Run2_2018)
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+process = cms.Process("Sim",Run2_2018)
 
 process.load("SimG4CMS.Calo.PythiaMinBias_cfi")
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
diff --git a/SimG4CMS/Calo/test/python/runHGC4_cfg.py b/SimG4CMS/Calo/test/python/runHGC4_cfg.py
index d71bebb99667a..4ced3a9f43236 100644
--- a/SimG4CMS/Calo/test/python/runHGC4_cfg.py
+++ b/SimG4CMS/Calo/test/python/runHGC4_cfg.py
@@ -19,7 +19,7 @@
 if hasattr(process,'MessageLogger'):
     process.MessageLogger.categories.append('HGCalGeom')
     process.MessageLogger.categories.append('HGCSim')
-    process.MessageLogger.categories.append('SimG4CoreGeometry')
+#   process.MessageLogger.categories.append('SimG4CoreGeometry')
 
 process.load("IOMC.RandomEngine.IOMC_cff")
 process.RandomNumberGeneratorService.generator.initialSeed = 456789
@@ -40,8 +40,10 @@
 process.generator = cms.EDProducer("FlatRandomEGunProducer",
     PGunParameters = cms.PSet(
         PartID = cms.vint32(13),
-        MinEta = cms.double(2.95),
-        MaxEta = cms.double(3.01),
+#       MinEta = cms.double(2.95),
+#       MaxEta = cms.double(3.01),
+        MinEta = cms.double(1.69),
+        MaxEta = cms.double(2.32),
         MinPhi = cms.double(-3.1415926),
         MaxPhi = cms.double(-1.5707963),
         MinE   = cms.double(100.00),
diff --git a/SimG4CMS/CherenkovAnalysis/interface/DreamSD.h b/SimG4CMS/CherenkovAnalysis/interface/DreamSD.h
index d2ec1ccbd798c..aef870a1579a4 100644
--- a/SimG4CMS/CherenkovAnalysis/interface/DreamSD.h
+++ b/SimG4CMS/CherenkovAnalysis/interface/DreamSD.h
@@ -1,68 +1,65 @@
 #ifndef SimG4CMS_DreamSD_h
 #define SimG4CMS_DreamSD_h
 
-#include "SimG4CMS/Calo/interface/CaloSD.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimG4CMS/Calo/interface/CaloSD.h"
 
 #include "G4PhysicsOrderedFreeVector.hh"
 
 #include <map>
 
-const int MAXPHOTONS = 500; // Maximum number of photons we can store
+const int MAXPHOTONS = 500;  // Maximum number of photons we can store
 
 class G4LogicalVolume;
 
 class DreamSD : public CaloSD {
-
-public:    
-
-  DreamSD(const std::string&, const DDCompactView &, const SensitiveDetectorCatalog &,
-	  edm::ParameterSet const &, const SimTrackManager*);
+public:
+  DreamSD(const std::string &,
+          const DDCompactView &,
+          const SensitiveDetectorCatalog &,
+          edm::ParameterSet const &,
+          const SimTrackManager *);
   ~DreamSD() override {}
 
-  uint32_t setDetUnitId(const G4Step*) override;
+  uint32_t setDetUnitId(const G4Step *) override;
 
 protected:
+  double getEnergyDeposit(const G4Step *) override;
+  void initRun() override;
 
-  double getEnergyDeposit(const G4Step* ) override;
-  void   initRun() override;
-
-private:    
-
-  typedef std::pair<double,double> Doubles;
-  typedef std::map<G4LogicalVolume*,Doubles> DimensionMap;
+private:
+  typedef std::pair<double, double> Doubles;
+  typedef std::map<G4LogicalVolume *, Doubles> DimensionMap;
 
-  void           initMap(const std::string&, const DDCompactView &);
-  double         curve_LY(const G4Step*, int); 
-  double         crystalLength(G4LogicalVolume*) const;
-  double         crystalWidth(G4LogicalVolume*) const;
+  void initMap(const std::string &, const DDCompactView &);
+  double curve_LY(const G4Step *, int);
+  double crystalLength(G4LogicalVolume *) const;
+  double crystalWidth(G4LogicalVolume *) const;
 
   /// Returns the total energy due to Cherenkov radiation
-  double         cherenkovDeposit_(const G4Step* aStep );
+  double cherenkovDeposit_(const G4Step *aStep);
   /// Returns average number of photons created by track
   double getAverageNumberOfPhotons_(const double charge,
-				    const double beta,
-				    const G4Material* aMaterial,
-				    const G4MaterialPropertyVector* rIndex );
+                                    const double beta,
+                                    const G4Material *aMaterial,
+                                    const G4MaterialPropertyVector *rIndex);
   /// Returns energy deposit for a given photon
-  double getPhotonEnergyDeposit_( const G4ParticleMomentum& p, 
-				  const G4ThreeVector& x,
-				  const G4Step* aStep );
+  double getPhotonEnergyDeposit_(const G4ParticleMomentum &p, const G4ThreeVector &x, const G4Step *aStep);
   /// Sets material properties at run-time...
-  bool setPbWO2MaterialProperties_(G4Material* aMaterial );
+  bool setPbWO2MaterialProperties_(G4Material *aMaterial);
 
-  bool         useBirk, doCherenkov_, readBothSide_;
-  double       birk1, birk2, birk3;
-  double       slopeLY;
-  DimensionMap xtalLMap; // Store length and width
+  bool useBirk, doCherenkov_, readBothSide_;
+  double birk1, birk2, birk3;
+  double slopeLY;
+  DimensionMap xtalLMap;  // Store length and width
 
-  int          side;
+  int side;
 
   /// Table of Cherenkov angle integrals vs photon momentum
   std::unique_ptr<G4PhysicsOrderedFreeVector> chAngleIntegrals_;
-  G4MaterialPropertiesTable* materialPropertiesTable;
+  G4MaterialPropertiesTable *materialPropertiesTable;
 
   int nphotons_;
 };
 
-#endif // DreamSD_h
+#endif  // DreamSD_h
diff --git a/SimG4CMS/CherenkovAnalysis/interface/PMTResponse.h b/SimG4CMS/CherenkovAnalysis/interface/PMTResponse.h
index 79d31df829763..52692499cada5 100644
--- a/SimG4CMS/CherenkovAnalysis/interface/PMTResponse.h
+++ b/SimG4CMS/CherenkovAnalysis/interface/PMTResponse.h
@@ -2,17 +2,14 @@
 #define SimG4CMS_PMTResponse_h
 ///
 ///  \class PMTResponse
-///  
+///
 ///   Encodes the PMT response function
 ///
 
 class PMTResponse {
-
-public:    
-
+public:
   /// Return efficiency for given photon wavelength (in nm)
-  static double getEfficiency( const double& waveLengthNm );
-
+  static double getEfficiency(const double &waveLengthNm);
 };
 
-#endif // DreamSD_h
+#endif  // DreamSD_h
diff --git a/SimG4CMS/CherenkovAnalysis/plugins/module.cc b/SimG4CMS/CherenkovAnalysis/plugins/module.cc
index 09dc5be1c4a08..74cde00646645 100644
--- a/SimG4CMS/CherenkovAnalysis/plugins/module.cc
+++ b/SimG4CMS/CherenkovAnalysis/plugins/module.cc
@@ -1,7 +1,6 @@
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "SimG4CMS/CherenkovAnalysis/interface/DreamSD.h"
 #include "SimG4Core/SensitiveDetector/interface/SensitiveDetectorPluginFactory.h"
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-
 
 typedef DreamSD DreamSensitiveDetector;
 DEFINE_SENSITIVEDETECTOR(DreamSensitiveDetector);
diff --git a/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc b/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc
index 76c2938914209..da93f54f38acc 100644
--- a/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc
+++ b/SimG4CMS/CherenkovAnalysis/src/DreamSD.cc
@@ -1,17 +1,17 @@
 
-#include "SimG4Core/Notification/interface/TrackInformation.h"
 #include "DetectorDescription/Core/interface/DDFilter.h"
 #include "DetectorDescription/Core/interface/DDFilteredView.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/interface/DDSplit.h"
 #include "DetectorDescription/Core/interface/DDValue.h"
+#include "SimG4Core/Notification/interface/TrackInformation.h"
 
-#include "G4LogicalVolumeStore.hh"
 #include "G4LogicalVolume.hh"
+#include "G4LogicalVolumeStore.hh"
+#include "G4Poisson.hh"
 #include "G4Step.hh"
 #include "G4Track.hh"
 #include "G4VProcess.hh"
-#include "G4Poisson.hh"
 
 // Histogramming
 #include "FWCore/ServiceRegistry/interface/Service.h"
@@ -20,55 +20,51 @@
 #include "SimG4CMS/CherenkovAnalysis/interface/DreamSD.h"
 #include "SimG4CMS/CherenkovAnalysis/interface/PMTResponse.h"
 
-#include "G4SystemOfUnits.hh"
 #include "G4PhysicalConstants.hh"
+#include "G4SystemOfUnits.hh"
 
 //________________________________________________________________________________________
-DreamSD::DreamSD(const std::string& name, const DDCompactView & cpv,
-                 const SensitiveDetectorCatalog & clg,
-                 edm::ParameterSet const & p, const SimTrackManager* manager) : 
-  CaloSD(name, cpv, clg, p, manager) {
-
+DreamSD::DreamSD(const std::string &name,
+                 const DDCompactView &cpv,
+                 const SensitiveDetectorCatalog &clg,
+                 edm::ParameterSet const &p,
+                 const SimTrackManager *manager)
+    : CaloSD(name, cpv, clg, p, manager) {
   edm::ParameterSet m_EC = p.getParameter<edm::ParameterSet>("ECalSD");
-  useBirk= m_EC.getParameter<bool>("UseBirkLaw");
+  useBirk = m_EC.getParameter<bool>("UseBirkLaw");
   doCherenkov_ = m_EC.getParameter<bool>("doCherenkov");
-  birk1  = m_EC.getParameter<double>("BirkC1")*(g/(MeV*cm2));
-  birk2  = m_EC.getParameter<double>("BirkC2");
-  birk3  = m_EC.getParameter<double>("BirkC3");
-  slopeLY= m_EC.getParameter<double>("SlopeLightYield");
+  birk1 = m_EC.getParameter<double>("BirkC1") * (g / (MeV * cm2));
+  birk2 = m_EC.getParameter<double>("BirkC2");
+  birk3 = m_EC.getParameter<double>("BirkC3");
+  slopeLY = m_EC.getParameter<double>("SlopeLightYield");
   readBothSide_ = m_EC.getUntrackedParameter<bool>("ReadBothSide", false);
 
   chAngleIntegrals_.reset(nullptr);
-  
-  edm::LogInfo("EcalSim")  << "Constructing a DreamSD  with name " << GetName() << "\n"
-                           << "DreamSD:: Use of Birks law is set to      " 
-                           << useBirk << "  with three constants kB = "
-                           << birk1 << ", C1 = " << birk2 << ", C2 = " 
-                           << birk3 << "\n"
-                           << "          Slope for Light yield is set to "
-                           << slopeLY << "\n"
-                           << "          Parameterization of Cherenkov is set to " 
-                           << doCherenkov_ << " and readout both sides is "
-                           << readBothSide_;
-
-  initMap(name,cpv);
 
+  edm::LogInfo("EcalSim") << "Constructing a DreamSD  with name " << GetName() << "\n"
+                          << "DreamSD:: Use of Birks law is set to      " << useBirk
+                          << "  with three constants kB = " << birk1 << ", C1 = " << birk2 << ", C2 = " << birk3 << "\n"
+                          << "          Slope for Light yield is set to " << slopeLY << "\n"
+                          << "          Parameterization of Cherenkov is set to " << doCherenkov_
+                          << " and readout both sides is " << readBothSide_;
+
+  initMap(name, cpv);
 }
 
 //________________________________________________________________________________________
-double DreamSD::getEnergyDeposit(const G4Step* aStep) {
-
+double DreamSD::getEnergyDeposit(const G4Step *aStep) {
   // take into account light collection curve for crystals
   double weight = curve_LY(aStep, side);
-  if (useBirk)   weight *= getAttenuation(aStep, birk1, birk2, birk3);
+  if (useBirk)
+    weight *= getAttenuation(aStep, birk1, birk2, birk3);
   double edep = aStep->GetTotalEnergyDeposit() * weight;
 
   // Get Cerenkov contribution
-  if ( doCherenkov_ ) { edep += cherenkovDeposit_( aStep ); }
-  LogDebug("EcalSim") << "DreamSD:: " << aStep->GetPreStepPoint()->GetPhysicalVolume()->GetName() 
-                      << " Side " << side
-                      <<" Light Collection Efficiency " << weight 
-                      << " Weighted Energy Deposit " << edep/MeV 
+  if (doCherenkov_) {
+    edep += cherenkovDeposit_(aStep);
+  }
+  LogDebug("EcalSim") << "DreamSD:: " << aStep->GetPreStepPoint()->GetPhysicalVolume()->GetName() << " Side " << side
+                      << " Light Collection Efficiency " << weight << " Weighted Energy Deposit " << edep / MeV
                       << " MeV";
 
   return edep;
@@ -76,16 +72,15 @@ double DreamSD::getEnergyDeposit(const G4Step* aStep) {
 
 //________________________________________________________________________________________
 void DreamSD::initRun() {
-
   // Get the material and set properties if needed
   DimensionMap::const_iterator ite = xtalLMap.begin();
-  const G4LogicalVolume* lv = (ite->first);
-  G4Material* material = lv->GetMaterial();
-  edm::LogInfo("EcalSim") << "DreamSD::initRun: Initializes for material " 
-                          << material->GetName() << " in " << lv->GetName();
+  const G4LogicalVolume *lv = (ite->first);
+  G4Material *material = lv->GetMaterial();
+  edm::LogInfo("EcalSim") << "DreamSD::initRun: Initializes for material " << material->GetName() << " in "
+                          << lv->GetName();
   materialPropertiesTable = material->GetMaterialPropertiesTable();
-  if ( !materialPropertiesTable ) {
-    if ( !setPbWO2MaterialProperties_( material ) ) {
+  if (!materialPropertiesTable) {
+    if (!setPbWO2MaterialProperties_(material)) {
       edm::LogWarning("EcalSim") << "Couldn't retrieve material properties table\n"
                                  << " Material = " << material->GetName();
     }
@@ -93,160 +88,147 @@ void DreamSD::initRun() {
   }
 }
 
-
 //________________________________________________________________________________________
-uint32_t DreamSD::setDetUnitId(const G4Step * aStep) { 
-  const G4VTouchable* touch = aStep->GetPreStepPoint()->GetTouchable();
-  uint32_t id = (touch->GetReplicaNumber(1))*10 + (touch->GetReplicaNumber(0));
+uint32_t DreamSD::setDetUnitId(const G4Step *aStep) {
+  const G4VTouchable *touch = aStep->GetPreStepPoint()->GetTouchable();
+  uint32_t id = (touch->GetReplicaNumber(1)) * 10 + (touch->GetReplicaNumber(0));
   side = readBothSide_ ? -1 : 1;
-  if(side < 0) { ++id; }
+  if (side < 0) {
+    ++id;
+  }
   LogDebug("EcalSim") << "DreamSD:: ID " << id;
   return id;
 }
 
-
 //________________________________________________________________________________________
-void DreamSD::initMap(const std::string& sd, const DDCompactView & cpv) {
-
+void DreamSD::initMap(const std::string &sd, const DDCompactView &cpv) {
   G4String attribute = "ReadOutName";
-  DDSpecificsMatchesValueFilter filter{DDValue(attribute,sd,0)};
-  DDFilteredView fv(cpv,filter);
+  DDSpecificsMatchesValueFilter filter{DDValue(attribute, sd, 0)};
+  DDFilteredView fv(cpv, filter);
   fv.firstChild();
 
-  const G4LogicalVolumeStore * lvs = G4LogicalVolumeStore::GetInstance();
+  const G4LogicalVolumeStore *lvs = G4LogicalVolumeStore::GetInstance();
   std::vector<G4LogicalVolume *>::const_iterator lvcite;
-  bool dodet=true;
+  bool dodet = true;
   while (dodet) {
-    const DDSolid & sol  = fv.logicalPart().solid();
+    const DDSolid &sol = fv.logicalPart().solid();
     std::vector<double> paras(sol.parameters());
     G4String name = sol.name().name();
-    G4LogicalVolume* lv=nullptr;
-    for (lvcite = lvs->begin(); lvcite != lvs->end(); lvcite++) 
+    G4LogicalVolume *lv = nullptr;
+    for (lvcite = lvs->begin(); lvcite != lvs->end(); lvcite++)
       if ((*lvcite)->GetName() == name) {
         lv = (*lvcite);
         break;
       }
-    LogDebug("EcalSim") << "DreamSD::initMap (for " << sd << "): Solid " 
-                        << name        << " Shape " << sol.shape() <<" Parameter 0 = "
-                        << paras[0] << " Logical Volume " << lv;
+    LogDebug("EcalSim") << "DreamSD::initMap (for " << sd << "): Solid " << name << " Shape " << sol.shape()
+                        << " Parameter 0 = " << paras[0] << " Logical Volume " << lv;
     double length = 0, width = 0;
     // Set length to be the largest size, width the smallest
-    std::sort( paras.begin(), paras.end() );
-    length = 2.0*paras.back();
-    width  = 2.0*paras.front();
-    xtalLMap.insert( std::pair<G4LogicalVolume*,Doubles>(lv,Doubles(length,width)) );
+    std::sort(paras.begin(), paras.end());
+    length = 2.0 * paras.back();
+    width = 2.0 * paras.front();
+    xtalLMap.insert(std::pair<G4LogicalVolume *, Doubles>(lv, Doubles(length, width)));
     dodet = fv.next();
   }
-  LogDebug("EcalSim") << "DreamSD: Length Table for " << attribute << " = " 
-                      << sd << ":";   
+  LogDebug("EcalSim") << "DreamSD: Length Table for " << attribute << " = " << sd << ":";
   DimensionMap::const_iterator ite = xtalLMap.begin();
-  int i=0;
+  int i = 0;
   for (; ite != xtalLMap.end(); ite++, i++) {
     G4String name = "Unknown";
-    if (ite->first != nullptr) name = (ite->first)->GetName();
-    LogDebug("EcalSim") << " " << i << " " << ite->first << " " << name 
-                        << " L = " << ite->second.first
+    if (ite->first != nullptr)
+      name = (ite->first)->GetName();
+    LogDebug("EcalSim") << " " << i << " " << ite->first << " " << name << " L = " << ite->second.first
                         << " W = " << ite->second.second;
   }
 }
 
 //________________________________________________________________________________________
-double DreamSD::curve_LY(const G4Step* aStep, int flag) {
-
+double DreamSD::curve_LY(const G4Step *aStep, int flag) {
   auto const stepPoint = aStep->GetPreStepPoint();
-  auto const lv        = stepPoint->GetTouchable()->GetVolume(0)->GetLogicalVolume();
-  G4String         nameVolume= lv->GetName();
+  auto const lv = stepPoint->GetTouchable()->GetVolume(0)->GetLogicalVolume();
+  G4String nameVolume = lv->GetName();
 
   double weight = 1.;
-  G4ThreeVector  localPoint = setToLocal(stepPoint->GetPosition(),
-                                         stepPoint->GetTouchable());
+  G4ThreeVector localPoint = setToLocal(stepPoint->GetPosition(), stepPoint->GetTouchable());
   double crlength = crystalLength(lv);
-  double localz   = localPoint.x();
-  double dapd = 0.5 * crlength - flag*localz; // Distance from closest APD
-  if (dapd >= -0.1 || dapd <= crlength+0.1) {
+  double localz = localPoint.x();
+  double dapd = 0.5 * crlength - flag * localz;  // Distance from closest APD
+  if (dapd >= -0.1 || dapd <= crlength + 0.1) {
     if (dapd <= 100.)
       weight = 1.0 + slopeLY - dapd * 0.01 * slopeLY;
   } else {
     edm::LogWarning("EcalSim") << "DreamSD: light coll curve : wrong distance "
-                               << "to APD " << dapd << " crlength = " 
-                               << crlength << " crystal name = " << nameVolume 
-                               << " z of localPoint = " << localz
-                               << " take weight = " << weight;
+                               << "to APD " << dapd << " crlength = " << crlength << " crystal name = " << nameVolume
+                               << " z of localPoint = " << localz << " take weight = " << weight;
   }
-  LogDebug("EcalSim") << "DreamSD, light coll curve : " << dapd 
-                      << " crlength = " << crlength
-                      << " crystal name = " << nameVolume 
-                      << " z of localPoint = " << localz
+  LogDebug("EcalSim") << "DreamSD, light coll curve : " << dapd << " crlength = " << crlength
+                      << " crystal name = " << nameVolume << " z of localPoint = " << localz
                       << " take weight = " << weight;
   return weight;
 }
 
 //________________________________________________________________________________________
-double DreamSD::crystalLength(G4LogicalVolume* lv) const {
-
-  double length= -1.;
+double DreamSD::crystalLength(G4LogicalVolume *lv) const {
+  double length = -1.;
   DimensionMap::const_iterator ite = xtalLMap.find(lv);
-  if (ite != xtalLMap.end()) length = ite->second.first;
+  if (ite != xtalLMap.end())
+    length = ite->second.first;
   return length;
-
 }
 
 //________________________________________________________________________________________
-double DreamSD::crystalWidth(G4LogicalVolume* lv) const {
-
-  double width= -1.;
+double DreamSD::crystalWidth(G4LogicalVolume *lv) const {
+  double width = -1.;
   DimensionMap::const_iterator ite = xtalLMap.find(lv);
-  if (ite != xtalLMap.end()) width = ite->second.second;
+  if (ite != xtalLMap.end())
+    width = ite->second.second;
   return width;
-
 }
 
-
 //________________________________________________________________________________________
 // Calculate total cherenkov deposit
 // Inspired by Geant4's Cherenkov implementation
-double DreamSD::cherenkovDeposit_(const G4Step* aStep ) {
-
+double DreamSD::cherenkovDeposit_(const G4Step *aStep) {
   double cherenkovEnergy = 0;
-  if (!materialPropertiesTable) return cherenkovEnergy;
-  G4Material* material = aStep->GetTrack()->GetMaterial();
+  if (!materialPropertiesTable)
+    return cherenkovEnergy;
+  G4Material *material = aStep->GetTrack()->GetMaterial();
 
   // Retrieve refractive index
-  G4MaterialPropertyVector* Rindex = materialPropertiesTable->GetProperty("RINDEX"); 
-  if ( Rindex == nullptr ) {
+  G4MaterialPropertyVector *Rindex = materialPropertiesTable->GetProperty("RINDEX");
+  if (Rindex == nullptr) {
     edm::LogWarning("EcalSim") << "Couldn't retrieve refractive index";
     return cherenkovEnergy;
   }
 
   // V.Ivanchenko - temporary close log output for 9.5
   // Material refraction properties
-  int Rlength = Rindex->GetVectorLength() - 1; 
+  int Rlength = Rindex->GetVectorLength() - 1;
   double Pmin = Rindex->Energy(0);
   double Pmax = Rindex->Energy(Rlength);
-  LogDebug("EcalSim") << "Material properties: " << "\n"
-                      << "  Pmin = " << Pmin
-                      << "  Pmax = " << Pmax;
-  
+  LogDebug("EcalSim") << "Material properties: "
+                      << "\n"
+                      << "  Pmin = " << Pmin << "  Pmax = " << Pmax;
+
   // Get particle properties
-  const G4StepPoint* pPreStepPoint  = aStep->GetPreStepPoint();
-  const G4StepPoint* pPostStepPoint = aStep->GetPostStepPoint();
-  const G4ThreeVector& x0 = pPreStepPoint->GetPosition();
+  const G4StepPoint *pPreStepPoint = aStep->GetPreStepPoint();
+  const G4StepPoint *pPostStepPoint = aStep->GetPostStepPoint();
+  const G4ThreeVector &x0 = pPreStepPoint->GetPosition();
   G4ThreeVector p0 = aStep->GetDeltaPosition().unit();
-  const G4DynamicParticle* aParticle = aStep->GetTrack()->GetDynamicParticle();
+  const G4DynamicParticle *aParticle = aStep->GetTrack()->GetDynamicParticle();
   const double charge = aParticle->GetDefinition()->GetPDGCharge();
   // beta is averaged over step
-  double beta = 0.5*( pPreStepPoint->GetBeta() + pPostStepPoint->GetBeta() );
-  double BetaInverse = 1.0/beta;
+  double beta = 0.5 * (pPreStepPoint->GetBeta() + pPostStepPoint->GetBeta());
+  double BetaInverse = 1.0 / beta;
 
-  LogDebug("EcalSim") << "Particle properties: " << "\n"
-                      << "  charge = " << charge
-                      << "  beta   = " << beta;
+  LogDebug("EcalSim") << "Particle properties: "
+                      << "\n"
+                      << "  charge = " << charge << "  beta   = " << beta;
 
   // Now get number of photons generated in this step
-  double meanNumberOfPhotons = getAverageNumberOfPhotons_( charge, beta, material, Rindex );
-  if ( meanNumberOfPhotons <= 0.0 ) { // Don't do anything
-    LogDebug("EcalSim") << "Mean number of photons is zero: " << meanNumberOfPhotons
-                        << ", stopping here";
+  double meanNumberOfPhotons = getAverageNumberOfPhotons_(charge, beta, material, Rindex);
+  if (meanNumberOfPhotons <= 0.0) {  // Don't do anything
+    LogDebug("EcalSim") << "Mean number of photons is zero: " << meanNumberOfPhotons << ", stopping here";
     return cherenkovEnergy;
   }
 
@@ -254,116 +236,114 @@ double DreamSD::cherenkovDeposit_(const G4Step* aStep ) {
   meanNumberOfPhotons *= aStep->GetStepLength();
 
   // Now get a poisson distribution
-  int numPhotons = static_cast<int>( G4Poisson(meanNumberOfPhotons) );
-  //edm::LogVerbatim("EcalSim") << "Number of photons = " << numPhotons;
-  if ( numPhotons <= 0 ) {
-    LogDebug("EcalSim") << "Poission number of photons is zero: " << numPhotons
-                      << ", stopping here";
+  int numPhotons = static_cast<int>(G4Poisson(meanNumberOfPhotons));
+  // edm::LogVerbatim("EcalSim") << "Number of photons = " << numPhotons;
+  if (numPhotons <= 0) {
+    LogDebug("EcalSim") << "Poission number of photons is zero: " << numPhotons << ", stopping here";
     return cherenkovEnergy;
   }
 
   // Material refraction properties
   double dp = Pmax - Pmin;
-  double maxCos = BetaInverse / (*Rindex)[Rlength]; 
+  double maxCos = BetaInverse / (*Rindex)[Rlength];
   double maxSin2 = (1.0 - maxCos) * (1.0 + maxCos);
 
   // Finally: get contribution of each photon
-  for ( int iPhoton = 0; iPhoton<numPhotons; ++iPhoton ) {
-
+  for (int iPhoton = 0; iPhoton < numPhotons; ++iPhoton) {
     // Determine photon momentum
     double randomNumber;
-    double sampledMomentum, sampledRI; 
+    double sampledMomentum, sampledRI;
     double cosTheta, sin2Theta;
 
     // sample a momentum (not sure why this is needed!)
     do {
-      randomNumber = G4UniformRand();        
-      sampledMomentum = Pmin + randomNumber * dp; 
+      randomNumber = G4UniformRand();
+      sampledMomentum = Pmin + randomNumber * dp;
       sampledRI = Rindex->Value(sampledMomentum);
-      cosTheta = BetaInverse / sampledRI;  
-      
-      sin2Theta = (1.0 - cosTheta)*(1.0 + cosTheta);
-      randomNumber = G4UniformRand();        
-      
-    } while (randomNumber*maxSin2 > sin2Theta);
-
-    // Generate random position of photon on cone surface 
-    // defined by Theta 
+      cosTheta = BetaInverse / sampledRI;
+
+      sin2Theta = (1.0 - cosTheta) * (1.0 + cosTheta);
+      randomNumber = G4UniformRand();
+
+    } while (randomNumber * maxSin2 > sin2Theta);
+
+    // Generate random position of photon on cone surface
+    // defined by Theta
     randomNumber = G4UniformRand();
 
-    double phi =  twopi*randomNumber;
+    double phi = twopi * randomNumber;
     double sinPhi = sin(phi);
     double cosPhi = cos(phi);
 
-    // Create photon momentum direction vector 
-    // The momentum direction is still w.r.t. the coordinate system where the primary
-    // particle direction is aligned with the z axis  
-    double sinTheta = sqrt(sin2Theta); 
-    double px = sinTheta*cosPhi;
-    double py = sinTheta*sinPhi;
+    // Create photon momentum direction vector
+    // The momentum direction is still w.r.t. the coordinate system where the
+    // primary particle direction is aligned with the z axis
+    double sinTheta = sqrt(sin2Theta);
+    double px = sinTheta * cosPhi;
+    double py = sinTheta * sinPhi;
     double pz = cosTheta;
     G4ThreeVector photonDirection(px, py, pz);
 
-    // Rotate momentum direction back to global (crystal) reference system 
+    // Rotate momentum direction back to global (crystal) reference system
     photonDirection.rotateUz(p0);
 
     // Create photon position and momentum
     randomNumber = G4UniformRand();
     G4ThreeVector photonPosition = x0 + randomNumber * aStep->GetDeltaPosition();
-    G4ThreeVector photonMomentum = sampledMomentum*photonDirection;
+    G4ThreeVector photonMomentum = sampledMomentum * photonDirection;
 
     // Collect energy on APD
-    cherenkovEnergy += getPhotonEnergyDeposit_( photonMomentum, photonPosition, aStep );
+    cherenkovEnergy += getPhotonEnergyDeposit_(photonMomentum, photonPosition, aStep);
   }
   return cherenkovEnergy;
 }
 
-
 //________________________________________________________________________________________
-// Returns number of photons produced per GEANT-unit (millimeter) in the current medium. 
-// From G4Cerenkov.cc
-double DreamSD::getAverageNumberOfPhotons_( const double charge,
-                                            const double beta,
-                                            const G4Material* aMaterial,
-                                            const G4MaterialPropertyVector* Rindex )
-{
-  const double rFact = 369.81/(eV * cm);
+// Returns number of photons produced per GEANT-unit (millimeter) in the current
+// medium. From G4Cerenkov.cc
+double DreamSD::getAverageNumberOfPhotons_(const double charge,
+                                           const double beta,
+                                           const G4Material *aMaterial,
+                                           const G4MaterialPropertyVector *Rindex) {
+  const double rFact = 369.81 / (eV * cm);
 
-  if( beta <= 0.0 ) return 0.0;
+  if (beta <= 0.0)
+    return 0.0;
 
-  double BetaInverse = 1./beta;
+  double BetaInverse = 1. / beta;
 
   // Vectors used in computation of Cerenkov Angle Integral:
   //         - Refraction Indices for the current material
   //        - new G4PhysicsOrderedFreeVector allocated to hold CAI's
- 
-  // Min and Max photon momenta 
-  int Rlength = Rindex->GetVectorLength() - 1; 
+
+  // Min and Max photon momenta
+  int Rlength = Rindex->GetVectorLength() - 1;
   double Pmin = Rindex->Energy(0);
   double Pmax = Rindex->Energy(Rlength);
 
-  // Min and Max Refraction Indices 
-  double nMin = (*Rindex)[0];        
+  // Min and Max Refraction Indices
+  double nMin = (*Rindex)[0];
   double nMax = (*Rindex)[Rlength];
 
-  // Max Cerenkov Angle Integral 
+  // Max Cerenkov Angle Integral
   double CAImax = chAngleIntegrals_.get()->GetMaxValue();
 
   double dp = 0., ge = 0., CAImin = 0.;
 
-  // If n(Pmax) < 1/Beta -- no photons generated 
-  if ( nMax < BetaInverse) { } 
+  // If n(Pmax) < 1/Beta -- no photons generated
+  if (nMax < BetaInverse) {
+  }
 
-  // otherwise if n(Pmin) >= 1/Beta -- photons generated  
+  // otherwise if n(Pmin) >= 1/Beta -- photons generated
   else if (nMin > BetaInverse) {
-    dp = Pmax - Pmin;        
-    ge = CAImax; 
-  } 
+    dp = Pmax - Pmin;
+    ge = CAImax;
+  }
   // If n(Pmin) < 1/Beta, and n(Pmax) >= 1/Beta, then
   // we need to find a P such that the value of n(P) == 1/Beta.
   // Interpolation is performed by the GetPhotonEnergy() and
   // GetProperty() methods of the G4MaterialPropertiesTable and
-  // the GetValue() method of G4PhysicsVector.  
+  // the GetValue() method of G4PhysicsVector.
   else {
     Pmin = Rindex->Value(BetaInverse);
     dp = Pmax - Pmin;
@@ -371,55 +351,69 @@ double DreamSD::getAverageNumberOfPhotons_( const double charge,
     // ==> being phased out
     double CAImin = chAngleIntegrals_->Value(Pmin);
     ge = CAImax - CAImin;
-    
   }
 
-  // Calculate number of photons 
-  double numPhotons = rFact * charge/eplus * charge/eplus *
-    (dp - ge * BetaInverse*BetaInverse);
+  // Calculate number of photons
+  double numPhotons = rFact * charge / eplus * charge / eplus * (dp - ge * BetaInverse * BetaInverse);
 
-  LogDebug("EcalSim") << "@SUB=getAverageNumberOfPhotons" 
+  LogDebug("EcalSim") << "@SUB=getAverageNumberOfPhotons"
                       << "CAImin = " << CAImin << "\n"
                       << "CAImax = " << CAImax << "\n"
                       << "dp = " << dp << ", ge = " << ge << "\n"
                       << "numPhotons = " << numPhotons;
 
-
-  
   return numPhotons;
-
 }
 
-
 //________________________________________________________________________________________
 // Set lead tungstate material properties on the fly.
 // Values from Ts42 detector construction
-bool DreamSD::setPbWO2MaterialProperties_( G4Material* aMaterial ) {
-
+bool DreamSD::setPbWO2MaterialProperties_(G4Material *aMaterial) {
   std::string pbWO2Name("E_PbWO4");
-  if ( pbWO2Name != aMaterial->GetName() ) { // Wrong material!
+  if (pbWO2Name != aMaterial->GetName()) {  // Wrong material!
     edm::LogWarning("EcalSim") << "This is not the right material: "
-                               << "expecting " << pbWO2Name 
-                               << ", got " << aMaterial->GetName();
+                               << "expecting " << pbWO2Name << ", got " << aMaterial->GetName();
     return false;
   }
 
-  G4MaterialPropertiesTable* table = new G4MaterialPropertiesTable();
+  G4MaterialPropertiesTable *table = new G4MaterialPropertiesTable();
 
   // Refractive index as a function of photon momentum
   // FIXME: Should somehow put that in the configuration
   const int nEntries = 14;
-  double PhotonEnergy[nEntries] = { 1.7712*eV,  1.8368*eV,  1.90745*eV, 1.98375*eV, 2.0664*eV, 
-                                    2.15625*eV, 2.25426*eV, 2.3616*eV,  2.47968*eV, 2.61019*eV, 
-                                    2.75521*eV, 2.91728*eV, 3.09961*eV, 3.30625*eV };
-  double RefractiveIndex[nEntries] = { 2.17728, 2.18025, 2.18357, 2.18753, 2.19285, 
-                                       2.19813, 2.20441, 2.21337, 2.22328, 2.23619, 
-                                       2.25203, 2.27381, 2.30282, 2.34666 };
-  
-  table->AddProperty( "RINDEX", PhotonEnergy, RefractiveIndex, nEntries );
-  aMaterial->SetMaterialPropertiesTable(table); // FIXME: could this leak? What does G4 do?
-
-  // Calculate Cherenkov angle integrals: 
+  double PhotonEnergy[nEntries] = {1.7712 * eV,
+                                   1.8368 * eV,
+                                   1.90745 * eV,
+                                   1.98375 * eV,
+                                   2.0664 * eV,
+                                   2.15625 * eV,
+                                   2.25426 * eV,
+                                   2.3616 * eV,
+                                   2.47968 * eV,
+                                   2.61019 * eV,
+                                   2.75521 * eV,
+                                   2.91728 * eV,
+                                   3.09961 * eV,
+                                   3.30625 * eV};
+  double RefractiveIndex[nEntries] = {2.17728,
+                                      2.18025,
+                                      2.18357,
+                                      2.18753,
+                                      2.19285,
+                                      2.19813,
+                                      2.20441,
+                                      2.21337,
+                                      2.22328,
+                                      2.23619,
+                                      2.25203,
+                                      2.27381,
+                                      2.30282,
+                                      2.34666};
+
+  table->AddProperty("RINDEX", PhotonEnergy, RefractiveIndex, nEntries);
+  aMaterial->SetMaterialPropertiesTable(table);  // FIXME: could this leak? What does G4 do?
+
+  // Calculate Cherenkov angle integrals:
   // This is an ad-hoc solution (we hold it in the class, not in the material)
   chAngleIntegrals_.reset(new G4PhysicsOrderedFreeVector());
 
@@ -428,73 +422,64 @@ bool DreamSD::setPbWO2MaterialProperties_( G4Material* aMaterial ) {
   double currentPM = PhotonEnergy[index];
   double currentCAI = 0.0;
   chAngleIntegrals_.get()->InsertValues(currentPM, currentCAI);
-  double prevPM  = currentPM;
+  double prevPM = currentPM;
   double prevCAI = currentCAI;
-  double prevRI  = currentRI;
-  while ( ++index < nEntries ) {
+  double prevRI = currentRI;
+  while (++index < nEntries) {
     currentRI = RefractiveIndex[index];
     currentPM = PhotonEnergy[index];
-    currentCAI = 0.5*(1.0/(prevRI*prevRI) + 1.0/(currentRI*currentRI));
+    currentCAI = 0.5 * (1.0 / (prevRI * prevRI) + 1.0 / (currentRI * currentRI));
     currentCAI = prevCAI + (currentPM - prevPM) * currentCAI;
 
     chAngleIntegrals_.get()->InsertValues(currentPM, currentCAI);
 
-    prevPM  = currentPM;
+    prevPM = currentPM;
     prevCAI = currentCAI;
-    prevRI  = currentRI;
+    prevRI = currentRI;
   }
 
   LogDebug("EcalSim") << "Material properties set for " << aMaterial->GetName();
 
   return true;
-
 }
 
-
 //________________________________________________________________________________________
 // Calculate energy deposit of a photon on APD
 // - simple tracing to APD position (straight line);
 // - configurable reflection probability if not straight to APD;
 // - APD response function
-double DreamSD::getPhotonEnergyDeposit_( const G4ThreeVector& p, 
-                                         const G4ThreeVector& x,
-                                         const G4Step* aStep )
-{
-
+double DreamSD::getPhotonEnergyDeposit_(const G4ThreeVector &p, const G4ThreeVector &x, const G4Step *aStep) {
   double energy = 0;
 
   // Crystal dimensions
-  
-  //edm::LogVerbatim("EcalSim") << p << x;
+
+  // edm::LogVerbatim("EcalSim") << p << x;
 
   // 1. Check if this photon goes straight to the APD:
   //    - assume that APD is at x=xtalLength/2.0
   //    - extrapolate from x=x0 to x=xtalLength/2.0 using momentum in x-y
-  
-  G4StepPoint*     stepPoint = aStep->GetPreStepPoint();
-  G4LogicalVolume* lv        = stepPoint->GetTouchable()->GetVolume(0)->GetLogicalVolume();
-  G4String         nameVolume= lv->GetName();
+
+  G4StepPoint *stepPoint = aStep->GetPreStepPoint();
+  G4LogicalVolume *lv = stepPoint->GetTouchable()->GetVolume(0)->GetLogicalVolume();
+  G4String nameVolume = lv->GetName();
 
   double crlength = crystalLength(lv);
-  double crwidth  = crystalWidth(lv);
-  double dapd = 0.5 * crlength - x.x(); // Distance from closest APD
-  double y = p.y()/p.x()*dapd;
+  double crwidth = crystalWidth(lv);
+  double dapd = 0.5 * crlength - x.x();  // Distance from closest APD
+  double y = p.y() / p.x() * dapd;
 
-  LogDebug("EcalSim") << "Distance to APD: " << dapd
-                      << " - y at APD: " << y;
+  LogDebug("EcalSim") << "Distance to APD: " << dapd << " - y at APD: " << y;
 
   // Not straight: compute probability
-  if ( std::abs(y)>crwidth*0.5 ) {
-    
+  if (std::abs(y) > crwidth * 0.5) {
   }
 
   // 2. Retrieve efficiency for this wavelength (in nm, from MeV)
-  double waveLength = p.mag()*1.239e8;
-  
-  energy = p.mag()*PMTResponse::getEfficiency(waveLength);
+  double waveLength = p.mag() * 1.239e8;
+
+  energy = p.mag() * PMTResponse::getEfficiency(waveLength);
 
   LogDebug("EcalSim") << "Wavelength: " << waveLength << " - Energy: " << energy;
 
   return energy;
-
 }
diff --git a/SimG4CMS/CherenkovAnalysis/src/PMTResponse.cc b/SimG4CMS/CherenkovAnalysis/src/PMTResponse.cc
index 2a58074920136..7ea459ed615c9 100644
--- a/SimG4CMS/CherenkovAnalysis/src/PMTResponse.cc
+++ b/SimG4CMS/CherenkovAnalysis/src/PMTResponse.cc
@@ -3,15 +3,14 @@
 #include <cmath>
 
 //________________________________________________________________________________________
-double PMTResponse::getEfficiency( const double& waveLengthNm ) {
-
+double PMTResponse::getEfficiency(const double &waveLengthNm) {
   // Overall range
-  if ( waveLengthNm<300. || waveLengthNm>850 ) return 0.;
+  if (waveLengthNm < 300. || waveLengthNm > 850)
+    return 0.;
 
   // Parameterisation
-  if ( waveLengthNm<500. )
-    return std::exp(+waveLengthNm/144.3 - 5.0752);
+  if (waveLengthNm < 500.)
+    return std::exp(+waveLengthNm / 144.3 - 5.0752);
   else
-    return std::exp(-waveLengthNm/290.7 + 0.1105);
-  
+    return std::exp(-waveLengthNm / 290.7 + 0.1105);
 }
diff --git a/SimG4CMS/CherenkovAnalysis/test/CherenkovAnalysis.cpp b/SimG4CMS/CherenkovAnalysis/test/CherenkovAnalysis.cpp
index ab09c3859746a..373e90eb25d77 100644
--- a/SimG4CMS/CherenkovAnalysis/test/CherenkovAnalysis.cpp
+++ b/SimG4CMS/CherenkovAnalysis/test/CherenkovAnalysis.cpp
@@ -2,8 +2,9 @@
 //
 // Package:    CherenkovAnalysis
 // Class:      CherenkovAnalysis
-// 
-/**\class CherenkovAnalysis CherenkovAnalysis.cpp SimG4CMS/CherenkovAnalysis/test/CherenkovAnalysis.cpp
+//
+/**\class CherenkovAnalysis CherenkovAnalysis.cpp
+SimG4CMS/CherenkovAnalysis/test/CherenkovAnalysis.cpp
 
 Description: <one line class summary>
 
@@ -16,13 +17,12 @@ Description: <one line class summary>
 //
 //
 
-
 // system include files
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "FWCore/Framework/interface/Event.h"
@@ -34,75 +34,65 @@ Description: <one line class summary>
 #include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include <TH1F.h>
 
 class CherenkovAnalysis : public edm::EDAnalyzer {
 public:
-  explicit CherenkovAnalysis(const edm::ParameterSet&);
+  explicit CherenkovAnalysis(const edm::ParameterSet &);
   ~CherenkovAnalysis() override {}
 
-
 private:
   edm::EDGetTokenT<edm::PCaloHitContainer> tok_calo_;
-  TH1F* hEnergy_;
+  TH1F *hEnergy_;
   double maxEnergy_;
   int nBinsEnergy_;
 
-  TH1F* hTimeStructure_;
+  TH1F *hTimeStructure_;
 
   void beginJob() override {}
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
   void endJob() override {}
-
 };
 
-
 //__________________________________________________________________________________________________
-CherenkovAnalysis::CherenkovAnalysis(const edm::ParameterSet& iConfig) :
-  maxEnergy_( iConfig.getParameter<double>("maxEnergy")),
-  nBinsEnergy_( iConfig.getParameter<unsigned>("nBinsEnergy"))
-{
-  tok_calo_ = consumes<edm::PCaloHitContainer>( iConfig.getParameter<edm::InputTag>("caloHitSource") );
+CherenkovAnalysis::CherenkovAnalysis(const edm::ParameterSet &iConfig)
+    : maxEnergy_(iConfig.getParameter<double>("maxEnergy")),
+      nBinsEnergy_(iConfig.getParameter<unsigned>("nBinsEnergy")) {
+  tok_calo_ = consumes<edm::PCaloHitContainer>(iConfig.getParameter<edm::InputTag>("caloHitSource"));
 
   // Book histograms
   edm::Service<TFileService> tfile;
 
-  if ( !tfile.isAvailable() )
+  if (!tfile.isAvailable())
     throw cms::Exception("BadConfig") << "TFileService unavailable: "
                                       << "please add it to config file";
 
-  hEnergy_ = tfile->make<TH1F>("hEnergy","Total energy deposit [GeV]",
-                               nBinsEnergy_,0,maxEnergy_);
-  hTimeStructure_ = tfile->make<TH1F>("hTimeStructure","Time structure [ns]",
-                                      100,0,0.3);
-
+  hEnergy_ = tfile->make<TH1F>("hEnergy", "Total energy deposit [GeV]", nBinsEnergy_, 0, maxEnergy_);
+  hTimeStructure_ = tfile->make<TH1F>("hTimeStructure", "Time structure [ns]", 100, 0, 0.3);
 }
 
-
 //__________________________________________________________________________________________________
-void
-CherenkovAnalysis::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void CherenkovAnalysis::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   edm::Handle<edm::PCaloHitContainer> pCaloHits;
-  iEvent.getByToken( tok_calo_, pCaloHits );
+  iEvent.getByToken(tok_calo_, pCaloHits);
 
   double totalEnergy = 0;
 
   // Loop on all hits and calculate total energy loss
-  edm::PCaloHitContainer::const_iterator it    = pCaloHits.product()->begin();
+  edm::PCaloHitContainer::const_iterator it = pCaloHits.product()->begin();
   edm::PCaloHitContainer::const_iterator itend = pCaloHits.product()->end();
-  for ( ; it != itend; ++it ) {
+  for (; it != itend; ++it) {
     totalEnergy += (*it).energy();
-    hTimeStructure_->Fill( (*it).time(), (*it).energy() ); // Time weighted by energy...
-//     edm::LogInfo("CherenkovAnalysis") << "Time = " << (*it).time() << std::endl;
+    hTimeStructure_->Fill((*it).time(),
+                          (*it).energy());  // Time weighted by energy...
+    //     edm::LogInfo("CherenkovAnalysis") << "Time = " << (*it).time() <<
+    //     std::endl;
   }
-  
-  edm::LogInfo("CherenkovAnalysis") << "Total energy = " << totalEnergy;
-  hEnergy_->Fill( totalEnergy );
 
+  edm::LogInfo("CherenkovAnalysis") << "Total energy = " << totalEnergy;
+  hEnergy_->Fill(totalEnergy);
 }
 
-
 DEFINE_FWK_MODULE(CherenkovAnalysis);
diff --git a/SimG4CMS/CherenkovAnalysis/test/XtalDedxAnalysis.cpp b/SimG4CMS/CherenkovAnalysis/test/XtalDedxAnalysis.cpp
index 63a0e96efc9e4..10fc9d4fd2b66 100644
--- a/SimG4CMS/CherenkovAnalysis/test/XtalDedxAnalysis.cpp
+++ b/SimG4CMS/CherenkovAnalysis/test/XtalDedxAnalysis.cpp
@@ -5,22 +5,22 @@
 #include <vector>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
 #include "FWCore/Utilities/interface/Exception.h"
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
@@ -33,43 +33,37 @@
 #include <TH1I.h>
 
 class XtalDedxAnalysis : public edm::EDAnalyzer {
-
 public:
-  explicit XtalDedxAnalysis(const edm::ParameterSet&);
+  explicit XtalDedxAnalysis(const edm::ParameterSet &);
   ~XtalDedxAnalysis() override {}
 
 protected:
-
   void beginJob() override {}
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
   void endJob() override {}
 
-  void analyzeHits (std::vector<PCaloHit>&, 
-		    edm::Handle<edm::SimTrackContainer>& , 
-		    edm::Handle<edm::SimVertexContainer>&);
+  void analyzeHits(std::vector<PCaloHit> &,
+                   edm::Handle<edm::SimTrackContainer> &,
+                   edm::Handle<edm::SimVertexContainer> &);
 
 private:
-  edm::InputTag  caloHitSource_;
-  std::string    simTkLabel_;
+  edm::InputTag caloHitSource_;
+  std::string simTkLabel_;
 
   edm::EDGetTokenT<edm::PCaloHitContainer> tok_calo_;
   edm::EDGetTokenT<edm::SimTrackContainer> tok_tk_;
   edm::EDGetTokenT<edm::SimVertexContainer> tok_vtx_;
 
-  TH1F           *meNHit_[4], *meE1T0_[4], *meE9T0_[4], *meE1T1_[4], *meE9T1_[4];
-  TH1I           *mType_;
-
+  TH1F *meNHit_[4], *meE1T0_[4], *meE9T0_[4], *meE1T1_[4], *meE9T1_[4];
+  TH1I *mType_;
 };
 
-XtalDedxAnalysis::XtalDedxAnalysis(const edm::ParameterSet& ps) {
-
-  caloHitSource_   = ps.getParameter<edm::InputTag>("caloHitSource");
-  simTkLabel_      = ps.getUntrackedParameter<std::string>("moduleLabelTk","g4SimHits");
+XtalDedxAnalysis::XtalDedxAnalysis(const edm::ParameterSet &ps) {
+  caloHitSource_ = ps.getParameter<edm::InputTag>("caloHitSource");
+  simTkLabel_ = ps.getUntrackedParameter<std::string>("moduleLabelTk", "g4SimHits");
   double energyMax = ps.getParameter<double>("EnergyMax");
-  edm::LogInfo("XtalDedxAnalysis") << "XtalDedxAnalysis::Source "
-				    << caloHitSource_ << " Track Label "
-				    << simTkLabel_ << " Energy Max "
-				    << energyMax;
+  edm::LogInfo("XtalDedxAnalysis") << "XtalDedxAnalysis::Source " << caloHitSource_ << " Track Label " << simTkLabel_
+                                   << " Energy Max " << energyMax;
 
   // register for data access
   tok_calo_ = consumes<edm::PCaloHitContainer>(caloHitSource_);
@@ -79,118 +73,114 @@ XtalDedxAnalysis::XtalDedxAnalysis(const edm::ParameterSet& ps) {
   // Book histograms
   edm::Service<TFileService> tfile;
 
-  if ( !tfile.isAvailable() )
+  if (!tfile.isAvailable())
     throw cms::Exception("BadConfig") << "TFileService unavailable: "
                                       << "please add it to config file";
-  //Histograms for Hits
+  // Histograms for Hits
   std::string types[4] = {"total", "by dE/dx", "by delta-ray", "by bremms"};
   char name[20], title[80];
-  for (int i=0; i<4; i++) {
-    sprintf (name,  "Hits%d", i);
-    sprintf (title, "Number of hits (%s)", types[i].c_str());
-    meNHit_[i]= tfile->make<TH1F>(name, title, 5000, 0., 5000.);
+  for (int i = 0; i < 4; i++) {
+    sprintf(name, "Hits%d", i);
+    sprintf(title, "Number of hits (%s)", types[i].c_str());
+    meNHit_[i] = tfile->make<TH1F>(name, title, 5000, 0., 5000.);
     meNHit_[i]->GetXaxis()->SetTitle(title);
     meNHit_[i]->GetYaxis()->SetTitle("Events");
-    sprintf (name,  "E1T0%d", i);
-    sprintf (title, "E1 (Loss %s) in GeV", types[i].c_str());
+    sprintf(name, "E1T0%d", i);
+    sprintf(title, "E1 (Loss %s) in GeV", types[i].c_str());
     meE1T0_[i] = tfile->make<TH1F>(name, title, 5000, 0, energyMax);
     meE1T0_[i]->GetXaxis()->SetTitle(title);
     meE1T0_[i]->GetYaxis()->SetTitle("Events");
-    sprintf (name,  "E9T0%d", i);
-    sprintf (title, "E9 (Loss %s) in GeV", types[i].c_str());
+    sprintf(name, "E9T0%d", i);
+    sprintf(title, "E9 (Loss %s) in GeV", types[i].c_str());
     meE9T0_[i] = tfile->make<TH1F>(name, title, 5000, 0, energyMax);
     meE9T0_[i]->GetXaxis()->SetTitle(title);
     meE9T0_[i]->GetYaxis()->SetTitle("Events");
-    sprintf (name,  "E1T1%d", i);
-    sprintf (title, "E1 (Loss %s with t < 400 ns) in GeV", types[i].c_str());
+    sprintf(name, "E1T1%d", i);
+    sprintf(title, "E1 (Loss %s with t < 400 ns) in GeV", types[i].c_str());
     meE1T1_[i] = tfile->make<TH1F>(name, title, 5000, 0, energyMax);
     meE1T1_[i]->GetXaxis()->SetTitle(title);
     meE1T1_[i]->GetYaxis()->SetTitle("Events");
-    sprintf (name,  "E9T1%d", i);
-    sprintf (title, "E9 (Loss %s with t < 400 ns) in GeV", types[i].c_str());
-    meE9T1_[i]= tfile->make<TH1F>(name, title, 5000, 0, energyMax);
+    sprintf(name, "E9T1%d", i);
+    sprintf(title, "E9 (Loss %s with t < 400 ns) in GeV", types[i].c_str());
+    meE9T1_[i] = tfile->make<TH1F>(name, title, 5000, 0, energyMax);
     meE9T1_[i]->GetXaxis()->SetTitle(title);
     meE9T1_[i]->GetYaxis()->SetTitle("Events");
   }
-  sprintf (name,  "PDGType");
-  sprintf (title, "PDG ID of first level secondary");
+  sprintf(name, "PDGType");
+  sprintf(title, "PDG ID of first level secondary");
   mType_ = tfile->make<TH1I>(name, title, 5000, -2500, 2500);
   mType_->GetXaxis()->SetTitle(title);
   mType_->GetYaxis()->SetTitle("Tracks");
 }
 
-void XtalDedxAnalysis::analyze(const edm::Event& e, const edm::EventSetup& ) {
-
-  LogDebug("XtalDedxAnalysis") << "Run = " << e.id().run() << " Event = "
-				<< e.id().event();
+void XtalDedxAnalysis::analyze(const edm::Event &e, const edm::EventSetup &) {
+  LogDebug("XtalDedxAnalysis") << "Run = " << e.id().run() << " Event = " << e.id().event();
 
-  std::vector<PCaloHit>               caloHits;
+  std::vector<PCaloHit> caloHits;
   edm::Handle<edm::PCaloHitContainer> pCaloHits;
   e.getByToken(tok_calo_, pCaloHits);
 
   std::vector<SimTrack> theSimTracks;
   edm::Handle<edm::SimTrackContainer> simTk;
-  e.getByToken(tok_tk_,simTk);
+  e.getByToken(tok_tk_, simTk);
 
   std::vector<SimVertex> theSimVertex;
   edm::Handle<edm::SimVertexContainer> simVtx;
-  e.getByToken(tok_vtx_,simVtx);
+  e.getByToken(tok_vtx_, simVtx);
 
   if (pCaloHits.isValid()) {
-    caloHits.insert(caloHits.end(),pCaloHits->begin(),pCaloHits->end());
-    LogDebug("XtalDedxAnalysis") << "HcalValidation: Hit buffer "
-				  << caloHits.size();
-    analyzeHits (caloHits, simTk, simVtx);
+    caloHits.insert(caloHits.end(), pCaloHits->begin(), pCaloHits->end());
+    LogDebug("XtalDedxAnalysis") << "HcalValidation: Hit buffer " << caloHits.size();
+    analyzeHits(caloHits, simTk, simVtx);
   }
 }
 
-void XtalDedxAnalysis::analyzeHits (std::vector<PCaloHit>& hits,
-				    edm::Handle<edm::SimTrackContainer>& SimTk,
-				    edm::Handle<edm::SimVertexContainer>& SimVtx) {
-
+void XtalDedxAnalysis::analyzeHits(std::vector<PCaloHit> &hits,
+                                   edm::Handle<edm::SimTrackContainer> &SimTk,
+                                   edm::Handle<edm::SimVertexContainer> &SimVtx) {
   edm::SimTrackContainer::const_iterator simTrkItr;
   int nHit = hits.size();
   double e10[4], e90[4], e11[4], e91[4], hit[4];
-  for (int i=0; i<4; i++)
+  for (int i = 0; i < 4; i++)
     e10[i] = e90[i] = e11[i] = e91[i] = hit[i] = 0;
-  for (int i=0; i<nHit; i++) {
-    double energy    = hits[i].energy();
-    double time      = hits[i].time();
+  for (int i = 0; i < nHit; i++) {
+    double energy = hits[i].energy();
+    double time = hits[i].time();
     unsigned int id_ = hits[i].id();
-    int    trackID   = hits[i].geantTrackId();
-    int    type      = 1;
-    for (simTrkItr = SimTk->begin(); simTrkItr!= SimTk->end(); simTrkItr++) {
+    int trackID = hits[i].geantTrackId();
+    int type = 1;
+    for (simTrkItr = SimTk->begin(); simTrkItr != SimTk->end(); simTrkItr++) {
       if (trackID == (int)(simTrkItr->trackId())) {
-	int thePID = simTrkItr->type();
-	if      (thePID == 11) type = 2;
-	else if (thePID != -13 && thePID != 13) type = 3;
-	break;
+        int thePID = simTrkItr->type();
+        if (thePID == 11)
+          type = 2;
+        else if (thePID != -13 && thePID != 13)
+          type = 3;
+        break;
       }
     }
     hit[0]++;
     hit[type]++;
-    e90[0]    += energy;
+    e90[0] += energy;
     e90[type] += energy;
     if (time < 400) {
-      e91[0]    += energy;
+      e91[0] += energy;
       e91[type] += energy;
     }
     if (id_ == 22) {
-      e10[0]    += energy;
+      e10[0] += energy;
       e10[type] += energy;
       if (time < 400) {
-	e11[0]    += energy;
-	e11[type] += energy;
+        e11[0] += energy;
+        e11[type] += energy;
       }
     }
-    LogDebug("XtalDedxAnalysis") << "Hit[" << i << "] ID " << id_ << " E " 
-				 << energy << " time " << time << " track "
-				 << trackID << " type " << type;
+    LogDebug("XtalDedxAnalysis") << "Hit[" << i << "] ID " << id_ << " E " << energy << " time " << time << " track "
+                                 << trackID << " type " << type;
   }
-  for (int i=0; i<4; i++) {
-    LogDebug("XtalDedxAnalysis") << "Type(" << i << ") Hit " << hit[i] 
-				 << " E10 " << e10[i] << " E11 " << e11[i]
-				 << " E90 " << e90[i] << " E91 " << e91[i];
+  for (int i = 0; i < 4; i++) {
+    LogDebug("XtalDedxAnalysis") << "Type(" << i << ") Hit " << hit[i] << " E10 " << e10[i] << " E11 " << e11[i]
+                                 << " E90 " << e90[i] << " E91 " << e91[i];
     meNHit_[i]->Fill(hit[i]);
     meE1T0_[i]->Fill(e10[i]);
     meE9T0_[i]->Fill(e90[i]);
@@ -199,34 +189,38 @@ void XtalDedxAnalysis::analyzeHits (std::vector<PCaloHit>& hits,
   }
 
   // Type of the secondary (coming directly from a generator level track)
-  int nvtx=0, ntrk=0, k1=0;
+  int nvtx = 0, ntrk = 0, k1 = 0;
   edm::SimVertexContainer::const_iterator simVtxItr;
-  for (simTrkItr=SimTk->begin(); simTrkItr !=SimTk->end(); simTrkItr++) ntrk++;
-  for (simVtxItr=SimVtx->begin(); simVtxItr!=SimVtx->end();simVtxItr++) nvtx++;
-  LogDebug("XtalDedxAnalysis") << ntrk << " tracks and " << nvtx <<" vertices";
-  for (simTrkItr=SimTk->begin(); simTrkItr != SimTk->end(); simTrkItr++,++k1) {
-    LogDebug("XtalDedxAnalysis") << "Track " << k1 << " PDGId " << simTrkItr->type() << " Vertex ID " << simTrkItr->vertIndex() << " Generator " << simTrkItr->noGenpart();
-    if (simTrkItr->noGenpart()) { // This is a secondary
+  for (simTrkItr = SimTk->begin(); simTrkItr != SimTk->end(); simTrkItr++)
+    ntrk++;
+  for (simVtxItr = SimVtx->begin(); simVtxItr != SimVtx->end(); simVtxItr++)
+    nvtx++;
+  LogDebug("XtalDedxAnalysis") << ntrk << " tracks and " << nvtx << " vertices";
+  for (simTrkItr = SimTk->begin(); simTrkItr != SimTk->end(); simTrkItr++, ++k1) {
+    LogDebug("XtalDedxAnalysis") << "Track " << k1 << " PDGId " << simTrkItr->type() << " Vertex ID "
+                                 << simTrkItr->vertIndex() << " Generator " << simTrkItr->noGenpart();
+    if (simTrkItr->noGenpart()) {              // This is a secondary
       int vertIndex = simTrkItr->vertIndex();  // Vertex index of origin
-      if (vertIndex >= 0 && vertIndex  < nvtx) {
-	simVtxItr= SimVtx->begin();
-	for (int iv=0; iv<vertIndex; iv++) simVtxItr++;
-	int parent = simVtxItr->parentIndex(), k2 = 0;
-	for (edm::SimTrackContainer::const_iterator trkItr = SimTk->begin();
-	     trkItr != SimTk->end(); trkItr++, ++k2) {
-	  LogDebug("XtalDedxAnalysis") << "Track " << k2 << " ID " << trkItr->trackId() << " (" << parent << ")  Generator " << trkItr->noGenpart();
-	  if ((int)trkItr->trackId() == parent) { // Parent track
-	    if (!trkItr->noGenpart()) { // Generator level
-	      LogDebug("XtalDedxAnalysis") << "Track found with ID " << simTrkItr->type();
-	      mType_->Fill(simTrkItr->type());
-	    }
-	    break;
-	  }
-	}
+      if (vertIndex >= 0 && vertIndex < nvtx) {
+        simVtxItr = SimVtx->begin();
+        for (int iv = 0; iv < vertIndex; iv++)
+          simVtxItr++;
+        int parent = simVtxItr->parentIndex(), k2 = 0;
+        for (edm::SimTrackContainer::const_iterator trkItr = SimTk->begin(); trkItr != SimTk->end(); trkItr++, ++k2) {
+          LogDebug("XtalDedxAnalysis") << "Track " << k2 << " ID " << trkItr->trackId() << " (" << parent
+                                       << ")  Generator " << trkItr->noGenpart();
+          if ((int)trkItr->trackId() == parent) {  // Parent track
+            if (!trkItr->noGenpart()) {            // Generator level
+              LogDebug("XtalDedxAnalysis") << "Track found with ID " << simTrkItr->type();
+              mType_->Fill(simTrkItr->type());
+            }
+            break;
+          }
+        }
       }
     }
   }
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(XtalDedxAnalysis);
diff --git a/SimG4CMS/EcalTestBeam/interface/EcalTBH4BeamSD.h b/SimG4CMS/EcalTestBeam/interface/EcalTBH4BeamSD.h
old mode 100755
new mode 100644
index 83f5205a458c9..9386ade4f5dbd
--- a/SimG4CMS/EcalTestBeam/interface/EcalTBH4BeamSD.h
+++ b/SimG4CMS/EcalTestBeam/interface/EcalTBH4BeamSD.h
@@ -7,8 +7,8 @@
 // Use in your sensitive detector builder:
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "SimG4CMS/Calo/interface/CaloSD.h"
 #include "Geometry/EcalCommonData/interface/EcalNumberingScheme.h"
+#include "SimG4CMS/Calo/interface/CaloSD.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
@@ -18,27 +18,26 @@
 class EcalBaseNumber;
 
 class EcalTBH4BeamSD : public CaloSD {
-
-public:    
-
-  EcalTBH4BeamSD(const std::string&, const DDCompactView &, const SensitiveDetectorCatalog &,
-		 edm::ParameterSet const &, const SimTrackManager*);
+public:
+  EcalTBH4BeamSD(const std::string &,
+                 const DDCompactView &,
+                 const SensitiveDetectorCatalog &,
+                 edm::ParameterSet const &,
+                 const SimTrackManager *);
   ~EcalTBH4BeamSD() override;
-  uint32_t setDetUnitId(const G4Step* step) override;
-  void setNumberingScheme(EcalNumberingScheme* scheme);
-
- protected:
-  double getEnergyDeposit(const G4Step*) override;
+  uint32_t setDetUnitId(const G4Step *step) override;
+  void setNumberingScheme(EcalNumberingScheme *scheme);
 
-private:    
+protected:
+  double getEnergyDeposit(const G4Step *) override;
 
-  void                 getBaseNumber(const G4Step* aStep); 
+private:
+  void getBaseNumber(const G4Step *aStep);
   EcalNumberingScheme *numberingScheme;
-  bool                 useWeight;
-  bool                 useBirk;
-  double               birk1, birk2, birk3;
-  EcalBaseNumber       theBaseNumber;
-
+  bool useWeight;
+  bool useBirk;
+  double birk1, birk2, birk3;
+  EcalBaseNumber theBaseNumber;
 };
 
-#endif // EcalTBH4BeamSD_h
+#endif  // EcalTBH4BeamSD_h
diff --git a/SimG4CMS/EcalTestBeam/interface/EcalTBH4Trigger.h b/SimG4CMS/EcalTestBeam/interface/EcalTBH4Trigger.h
index 03bc7f7b11ab2..e923a8b87370d 100644
--- a/SimG4CMS/EcalTestBeam/interface/EcalTBH4Trigger.h
+++ b/SimG4CMS/EcalTestBeam/interface/EcalTBH4Trigger.h
@@ -4,10 +4,12 @@
 //
 // Package:     HelpfulWatchers
 // Class  :     EcalTBH4Trigger
-// 
-/**\class EcalTBH4Trigger EcalTBH4Trigger.h SimG4Core/HelpfulWatchers/interface/EcalTBH4Trigger.h
+//
+/**\class EcalTBH4Trigger EcalTBH4Trigger.h
+ SimG4Core/HelpfulWatchers/interface/EcalTBH4Trigger.h
 
- Description: Simulates ECALTBH4 trigger an throw exception in case of non triggering event
+ Description: Simulates ECALTBH4 trigger an throw exception in case of non
+ triggering event
 
  Usage:
     <usage>
@@ -20,8 +22,8 @@
 
 // user include files
 #include "SimG4Core/Notification/interface/Observer.h"
-#include "SimG4Core/Watcher/interface/SimWatcher.h"
 #include "SimG4Core/Notification/interface/SimG4Exception.h"
+#include "SimG4Core/Watcher/interface/SimWatcher.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -42,144 +44,136 @@ class EndOfRun;
 class EndOfEvent;
 class EndOfTrack;
 
-#define OBSERVES(type) public Observer<const type*>
-#define UPDATEH4(type) void update(const type*) { }
-class EcalTBH4Trigger : public SimWatcher, 
-			//OBSERVES(DDDWorld),
-			//OBSERVES(BeginOfJob),
-			//OBSERVES(BeginOfRun),
-			OBSERVES(BeginOfEvent),
-			//OBSERVES(BeginOfTrack),
-			OBSERVES(G4Step),
-			//OBSERVES(EndOfRun),
-			OBSERVES(EndOfEvent)
-     //,
-     //OBSERVES(EndOfTrack)
+#define OBSERVES(type) \
+public                 \
+  Observer<const type *>
+#define UPDATEH4(type) \
+  void update(const type *) {}
+class EcalTBH4Trigger : public SimWatcher,
+                        // OBSERVES(DDDWorld),
+                        // OBSERVES(BeginOfJob),
+                        // OBSERVES(BeginOfRun),
+                        OBSERVES(BeginOfEvent),
+                        // OBSERVES(BeginOfTrack),
+                        OBSERVES(G4Step),
+                        // OBSERVES(EndOfRun),
+                        OBSERVES(EndOfEvent)
+//,
+// OBSERVES(EndOfTrack)
 {
+public:
+  EcalTBH4Trigger(const edm::ParameterSet &pSet)
+      : m_verbose(pSet.getUntrackedParameter<bool>("verbose", false)),
+        nTriggeredEvents_(0),
+        trigEvents_(pSet.getUntrackedParameter<int>("trigEvents", -1)) {}
+  // virtual ~EcalTBH4Trigger();
 
- public:
-  EcalTBH4Trigger(const edm::ParameterSet& pSet) : 
-    m_verbose(pSet.getUntrackedParameter<bool>("verbose",false)), nTriggeredEvents_(0), trigEvents_(pSet.getUntrackedParameter<int>("trigEvents",-1)) {
-  }
-  //virtual ~EcalTBH4Trigger();
-  
   // ---------- const member functions ---------------------
 
   // ---------- static member functions --------------------
-  
+
   // ---------- member functions ---------------------------
   //  UPDATEH4(DDDWorld)
-  //UPDATEH4(BeginOfJob)
-  //UPDATEH4(BeginOfRun)
-    //  UPDATEH4(BeginOfEvent)
-  void update(const BeginOfEvent* anEvent) override 
-    {
-      //      std::cout <<"++ signal BeginOfEvent " ;
-      //      m_enteringTBH4BeamLine=false;
-      //      m_exitingTBH4BeamLine=false;
-      //      m_passedTrigger=false;
-      m_passedTrg1=false;
-      m_passedTrg3=false;
-      m_passedTrg4=false;
-      m_passedTrg5=false;
-      m_passedTrg6=false;
-    } 
+  // UPDATEH4(BeginOfJob)
+  // UPDATEH4(BeginOfRun)
+  //  UPDATEH4(BeginOfEvent)
+  void update(const BeginOfEvent *anEvent) override {
+    //      std::cout <<"++ signal BeginOfEvent " ;
+    //      m_enteringTBH4BeamLine=false;
+    //      m_exitingTBH4BeamLine=false;
+    //      m_passedTrigger=false;
+    m_passedTrg1 = false;
+    m_passedTrg3 = false;
+    m_passedTrg4 = false;
+    m_passedTrg5 = false;
+    m_passedTrg6 = false;
+  }
 
   //  UPDATEH4(BeginOfTrack)
-  void update(const G4Step* iStep) override 
-    { 
-      if (trigEvents_ >= 0 && nTriggeredEvents_ >= trigEvents_)
-	throw SimG4Exception("Number of needed trigger events reached in ECALTBH4");
-
-      const G4StepPoint* pre = iStep->GetPreStepPoint(); 
-      const G4StepPoint* post = iStep->GetPostStepPoint(); 
-      if(m_verbose) {
-	std::cout <<"++ signal G4Step" ;
-	const G4VTouchable* touch = iStep->GetPreStepPoint()->GetTouchable();
-	//Get name and copy numbers
-	if (touch->GetHistoryDepth() > 0) {
-	  for (int ii = 0; ii <= touch->GetHistoryDepth() ; ii++) {
-	    std::cout << "EcalTBH4::Level " << ii
-		      << ": " << touch->GetVolume(ii)->GetName() << "["
-		      << touch->GetReplicaNumber(ii) << "]";
-	  }
-	}
-	std::cout <<std::endl; 
-	const G4Track* theTrack = iStep->GetTrack();
-	const G4ThreeVector& pos = post->GetPosition();
-	std::cout << "( "<<pos.x()<<","<<pos.y()<<","<<pos.z()<<") ";
-	std::cout << " released energy (MeV) " 
-		  <<  iStep->GetTotalEnergyDeposit()/CLHEP::MeV  ;
-	if (theTrack)
-	  {
-	    const G4ThreeVector mom = theTrack->GetMomentum();
-	    std::cout << " track length (cm) " << theTrack->GetTrackLength()/CLHEP::cm
-		      << " particle type " << theTrack->GetDefinition()->GetParticleName()
-		      << " momentum " << "( "<<mom.x()<<","<<mom.y()<<","<<mom.z()<<") ";
-	    if (theTrack->GetCreatorProcess()) {
-	      std::cout << " created by " 
-			<< theTrack->GetCreatorProcess()->GetProcessName();
-	    }
-	  }
-	if(post->GetPhysicalVolume()) {
-	  std::cout << " " << pre->GetPhysicalVolume()->GetName() 
-		    << "->" << post->GetPhysicalVolume()->GetName();
-	}
-	std::cout <<std::endl; 
+  void update(const G4Step *iStep) override {
+    if (trigEvents_ >= 0 && nTriggeredEvents_ >= trigEvents_)
+      throw SimG4Exception("Number of needed trigger events reached in ECALTBH4");
+
+    const G4StepPoint *pre = iStep->GetPreStepPoint();
+    const G4StepPoint *post = iStep->GetPostStepPoint();
+    if (m_verbose) {
+      std::cout << "++ signal G4Step";
+      const G4VTouchable *touch = iStep->GetPreStepPoint()->GetTouchable();
+      // Get name and copy numbers
+      if (touch->GetHistoryDepth() > 0) {
+        for (int ii = 0; ii <= touch->GetHistoryDepth(); ii++) {
+          std::cout << "EcalTBH4::Level " << ii << ": " << touch->GetVolume(ii)->GetName() << "["
+                    << touch->GetReplicaNumber(ii) << "]";
+        }
+      }
+      std::cout << std::endl;
+      const G4Track *theTrack = iStep->GetTrack();
+      const G4ThreeVector &pos = post->GetPosition();
+      std::cout << "( " << pos.x() << "," << pos.y() << "," << pos.z() << ") ";
+      std::cout << " released energy (MeV) " << iStep->GetTotalEnergyDeposit() / CLHEP::MeV;
+      if (theTrack) {
+        const G4ThreeVector mom = theTrack->GetMomentum();
+        std::cout << " track length (cm) " << theTrack->GetTrackLength() / CLHEP::cm << " particle type "
+                  << theTrack->GetDefinition()->GetParticleName() << " momentum "
+                  << "( " << mom.x() << "," << mom.y() << "," << mom.z() << ") ";
+        if (theTrack->GetCreatorProcess()) {
+          std::cout << " created by " << theTrack->GetCreatorProcess()->GetProcessName();
+        }
       }
-      
-      if (post && post->GetPhysicalVolume())
-	{
-	  
-	  if (!m_passedTrg1 && post->GetPhysicalVolume()->GetName() == "TRG1")
-	    m_passedTrg1 = true;
-	  if (!m_passedTrg3 && post->GetPhysicalVolume()->GetName() == "TRG3")
-	    m_passedTrg3 = true;
-	  if (!m_passedTrg4 && post->GetPhysicalVolume()->GetName() == "TRG4")
-	    m_passedTrg4 = true;
-	  if (!m_passedTrg5 && post->GetPhysicalVolume()->GetName() == "TRG5")
-	    m_passedTrg5 = true;
-	  if (!m_passedTrg6 && post->GetPhysicalVolume()->GetName() == "TRG6")
-	    m_passedTrg6 = true;
-	  if (post->GetPhysicalVolume()->GetName() == "CMSSE") //Exiting TBH4BeamLine
-	    if (! (m_passedTrg1 && m_passedTrg6) ) // Trigger defined as Trg4 && Trg6
-	      throw SimG4Exception("Event is not triggered by ECALTBH4");
+      if (post->GetPhysicalVolume()) {
+        std::cout << " " << pre->GetPhysicalVolume()->GetName() << "->" << post->GetPhysicalVolume()->GetName();
       }
-    
-/*     if (!m_enteringTBH4BeamLine && ( post->GetPhysicalVolume()->GetName() ==  */
-
-}
-//UPDATEH4(G4Step)
-//UPDATEH4(EndOfRun)
-//UPDATEH4(EndOfEvent)
-  void update(const EndOfEvent* anEvent) override 
-    {
-      //      std::cout <<"++ signal BeginOfEvent " ;
-      //      m_enteringTBH4BeamLine=false;
-      //      m_exitingTBH4BeamLine=false;
-      //      m_passedTrigger=false;
-      nTriggeredEvents_++;
-    } 
-//UPDATEH4(EndOfTrack)
-
-   private:
-     //EcalTBH4Trigger(const EcalTBH4Trigger&); // stop default
-
-     //const EcalTBH4Trigger& operator=(const EcalTBH4Trigger&); // stop default
-
-     // ---------- member data --------------------------------
- bool m_verbose;
-// bool m_enteringTBH4BeamLine; 
-// bool m_exitingTBH4BeamLine; 
- bool m_passedTrg1;
- bool m_passedTrg3;
- bool m_passedTrg4;
- bool m_passedTrg5;
- bool m_passedTrg6;
- int nTriggeredEvents_;
- int trigEvents_;
- // bool m_passedTrigger; 
+      std::cout << std::endl;
+    }
+
+    if (post && post->GetPhysicalVolume()) {
+      if (!m_passedTrg1 && post->GetPhysicalVolume()->GetName() == "TRG1")
+        m_passedTrg1 = true;
+      if (!m_passedTrg3 && post->GetPhysicalVolume()->GetName() == "TRG3")
+        m_passedTrg3 = true;
+      if (!m_passedTrg4 && post->GetPhysicalVolume()->GetName() == "TRG4")
+        m_passedTrg4 = true;
+      if (!m_passedTrg5 && post->GetPhysicalVolume()->GetName() == "TRG5")
+        m_passedTrg5 = true;
+      if (!m_passedTrg6 && post->GetPhysicalVolume()->GetName() == "TRG6")
+        m_passedTrg6 = true;
+      if (post->GetPhysicalVolume()->GetName() == "CMSSE")  // Exiting TBH4BeamLine
+        if (!(m_passedTrg1 && m_passedTrg6))                // Trigger defined as Trg4 && Trg6
+          throw SimG4Exception("Event is not triggered by ECALTBH4");
+    }
+
+    /*     if (!m_enteringTBH4BeamLine && ( post->GetPhysicalVolume()->GetName()
+     * ==  */
+  }
+  // UPDATEH4(G4Step)
+  // UPDATEH4(EndOfRun)
+  // UPDATEH4(EndOfEvent)
+  void update(const EndOfEvent *anEvent) override {
+    //      std::cout <<"++ signal BeginOfEvent " ;
+    //      m_enteringTBH4BeamLine=false;
+    //      m_exitingTBH4BeamLine=false;
+    //      m_passedTrigger=false;
+    nTriggeredEvents_++;
+  }
+  // UPDATEH4(EndOfTrack)
+
+private:
+  // EcalTBH4Trigger(const EcalTBH4Trigger&); // stop default
+
+  // const EcalTBH4Trigger& operator=(const EcalTBH4Trigger&); // stop default
+
+  // ---------- member data --------------------------------
+  bool m_verbose;
+  // bool m_enteringTBH4BeamLine;
+  // bool m_exitingTBH4BeamLine;
+  bool m_passedTrg1;
+  bool m_passedTrg3;
+  bool m_passedTrg4;
+  bool m_passedTrg5;
+  bool m_passedTrg6;
+  int nTriggeredEvents_;
+  int trigEvents_;
+  // bool m_passedTrigger;
 };
 
-
 #endif
diff --git a/SimG4CMS/EcalTestBeam/interface/EcalTBMCInfoProducer.h b/SimG4CMS/EcalTestBeam/interface/EcalTBMCInfoProducer.h
index df79f85777aec..78bcb48d35211 100644
--- a/SimG4CMS/EcalTestBeam/interface/EcalTBMCInfoProducer.h
+++ b/SimG4CMS/EcalTestBeam/interface/EcalTBMCInfoProducer.h
@@ -4,37 +4,34 @@
  * \file EcalTBMCInfoProducer.h
  *
  *
-*/
-#include "FWCore/Framework/interface/stream/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
+ */
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
-#include "SimDataFormats/EcalTestBeam/interface/PEcalTBInfo.h"
 #include "Geometry/EcalTestBeam/interface/EcalTBCrystalMap.h"
+#include "SimDataFormats/EcalTestBeam/interface/PEcalTBInfo.h"
+#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 
 #include "Math/GenVector/Rotation3D.h"
 
-class EcalTBMCInfoProducer: public edm::stream::EDProducer<>
-{  
+class EcalTBMCInfoProducer : public edm::stream::EDProducer<> {
 public:
-  
   /// Constructor
-  explicit EcalTBMCInfoProducer(const edm::ParameterSet& ps);
-  
+  explicit EcalTBMCInfoProducer(const edm::ParameterSet &ps);
+
   /// Destructor
   ~EcalTBMCInfoProducer() override;
-  
+
   /// Produce digis out of raw data
-  void produce(edm::Event & event, const edm::EventSetup& eventSetup) override;
-  
-private:
+  void produce(edm::Event &event, const edm::EventSetup &eventSetup) override;
 
+private:
   double beamEta;
   double beamPhi;
   double beamTheta;
@@ -47,9 +44,9 @@ class EcalTBMCInfoProducer: public edm::stream::EDProducer<>
   double partXhodo;
   double partYhodo;
 
-  EcalTBCrystalMap * theTestMap;
+  EcalTBCrystalMap *theTestMap;
 
-  ROOT::Math::Rotation3D * fromCMStoTB;
+  ROOT::Math::Rotation3D *fromCMStoTB;
 
   edm::EDGetTokenT<edm::HepMCProduct> GenVtxToken;
 };
diff --git a/SimG4CMS/EcalTestBeam/interface/FakeTBEventHeaderProducer.h b/SimG4CMS/EcalTestBeam/interface/FakeTBEventHeaderProducer.h
index 388a55ee8f960..b274860afb4a9 100644
--- a/SimG4CMS/EcalTestBeam/interface/FakeTBEventHeaderProducer.h
+++ b/SimG4CMS/EcalTestBeam/interface/FakeTBEventHeaderProducer.h
@@ -5,41 +5,36 @@
  *
  *
  * Mimic the event header information
- * for the test beam simulation 
+ * for the test beam simulation
  *
  */
 
-
-#include "FWCore/Framework/interface/stream/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
+#include "Geometry/EcalTestBeam/interface/EcalTBHodoscopeGeometry.h"
 #include "SimDataFormats/EcalTestBeam/interface/PEcalTBInfo.h"
 #include "TBDataFormats/EcalTBObjects/interface/EcalTBEventHeader.h"
-#include "Geometry/EcalTestBeam/interface/EcalTBHodoscopeGeometry.h"
 
-class FakeTBEventHeaderProducer: public edm::stream::EDProducer <>
-{  
+class FakeTBEventHeaderProducer : public edm::stream::EDProducer<> {
 public:
-  
   /// Constructor
-  explicit FakeTBEventHeaderProducer(const edm::ParameterSet& ps);
-  
+  explicit FakeTBEventHeaderProducer(const edm::ParameterSet &ps);
+
   /// Destructor
   ~FakeTBEventHeaderProducer() override;
-  
+
   /// Produce digis out of raw data
-  void produce(edm::Event & event, const edm::EventSetup& eventSetup) override;
-  
-private:
+  void produce(edm::Event &event, const edm::EventSetup &eventSetup) override;
 
+private:
   edm::EDGetTokenT<PEcalTBInfo> ecalTBInfo_;
-
 };
 
 #endif
diff --git a/SimG4CMS/EcalTestBeam/interface/FakeTBHodoscopeRawInfoProducer.h b/SimG4CMS/EcalTestBeam/interface/FakeTBHodoscopeRawInfoProducer.h
index d97fbdd6b08b9..99a92d9c4bff0 100644
--- a/SimG4CMS/EcalTestBeam/interface/FakeTBHodoscopeRawInfoProducer.h
+++ b/SimG4CMS/EcalTestBeam/interface/FakeTBHodoscopeRawInfoProducer.h
@@ -4,45 +4,40 @@
  * \file FakeTBHodoscopeRawInfoProducer.h
  *
  *
- * Mimic the hodoscope raw information using 
- * the generated vertex of the test beam simulation 
+ * Mimic the hodoscope raw information using
+ * the generated vertex of the test beam simulation
  *
  */
 
-
-#include "FWCore/Framework/interface/stream/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
+#include "Geometry/EcalTestBeam/interface/EcalTBHodoscopeGeometry.h"
 #include "SimDataFormats/EcalTestBeam/interface/PEcalTBInfo.h"
 #include "TBDataFormats/EcalTBObjects/interface/EcalTBHodoscopePlaneRawHits.h"
 #include "TBDataFormats/EcalTBObjects/interface/EcalTBHodoscopeRawInfo.h"
-#include "Geometry/EcalTestBeam/interface/EcalTBHodoscopeGeometry.h"
 
-class FakeTBHodoscopeRawInfoProducer: public edm::stream::EDProducer<>
-{
+class FakeTBHodoscopeRawInfoProducer : public edm::stream::EDProducer<> {
 public:
-  
   /// Constructor
-  explicit FakeTBHodoscopeRawInfoProducer(const edm::ParameterSet& ps);
-  
+  explicit FakeTBHodoscopeRawInfoProducer(const edm::ParameterSet &ps);
+
   /// Destructor
   ~FakeTBHodoscopeRawInfoProducer() override;
-  
+
   /// Produce digis out of raw data
-  void produce(edm::Event & event, const edm::EventSetup& eventSetup) override;
-  
-private:
+  void produce(edm::Event &event, const edm::EventSetup &eventSetup) override;
 
-  EcalTBHodoscopeGeometry * theTBHodoGeom_;
+private:
+  EcalTBHodoscopeGeometry *theTBHodoGeom_;
 
   edm::EDGetTokenT<PEcalTBInfo> ecalTBInfo_;
-
 };
 
 #endif
diff --git a/SimG4CMS/EcalTestBeam/interface/TBHodoActiveVolumeRawInfoProducer.h b/SimG4CMS/EcalTestBeam/interface/TBHodoActiveVolumeRawInfoProducer.h
index 70a726f18a7f6..ac8b9b68ab852 100644
--- a/SimG4CMS/EcalTestBeam/interface/TBHodoActiveVolumeRawInfoProducer.h
+++ b/SimG4CMS/EcalTestBeam/interface/TBHodoActiveVolumeRawInfoProducer.h
@@ -6,43 +6,39 @@
  *
  */
 
-#include "FWCore/Framework/interface/stream/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "SimDataFormats/EcalTestBeam/interface/PEcalTBInfo.h"
-#include "TBDataFormats/EcalTBObjects/interface/EcalTBHodoscopePlaneRawHits.h"
-#include "TBDataFormats/EcalTBObjects/interface/EcalTBHodoscopeRawInfo.h"
 #include "Geometry/EcalTestBeam/interface/EcalTBHodoscopeGeometry.h"
-#include "SimDataFormats/EcalTestBeam/interface/HodoscopeDetId.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
+#include "SimDataFormats/EcalTestBeam/interface/HodoscopeDetId.h"
+#include "SimDataFormats/EcalTestBeam/interface/PEcalTBInfo.h"
+#include "TBDataFormats/EcalTBObjects/interface/EcalTBHodoscopePlaneRawHits.h"
+#include "TBDataFormats/EcalTBObjects/interface/EcalTBHodoscopeRawInfo.h"
 
-class TBHodoActiveVolumeRawInfoProducer: public edm::stream::EDProducer<>
-{
-
+class TBHodoActiveVolumeRawInfoProducer : public edm::stream::EDProducer<> {
 public:
-  
   /// Constructor
-  explicit TBHodoActiveVolumeRawInfoProducer(const edm::ParameterSet& ps);
-  
+  explicit TBHodoActiveVolumeRawInfoProducer(const edm::ParameterSet &ps);
+
   /// Destructor
   ~TBHodoActiveVolumeRawInfoProducer() override;
-  
+
   /// Produce digis out of raw data
-  void produce(edm::Event & event, const edm::EventSetup& eventSetup) override;
-  
-private:
+  void produce(edm::Event &event, const edm::EventSetup &eventSetup) override;
 
+private:
   double myThreshold;
 
   edm::EDGetTokenT<edm::PCaloHitContainer> m_EcalToken;
-  EcalTBHodoscopeGeometry * theTBHodoGeom_;
+  EcalTBHodoscopeGeometry *theTBHodoGeom_;
 };
 
 #endif
diff --git a/SimG4CMS/EcalTestBeam/plugins/EcalTBMCInfoProducer.cc b/SimG4CMS/EcalTestBeam/plugins/EcalTBMCInfoProducer.cc
index 63fc68b9f60be..d7e007ec0e8fc 100644
--- a/SimG4CMS/EcalTestBeam/plugins/EcalTBMCInfoProducer.cc
+++ b/SimG4CMS/EcalTestBeam/plugins/EcalTBMCInfoProducer.cc
@@ -2,63 +2,60 @@
  * \file EcalTBMCInfoProducer.cc
  *
  *
-*/
+ */
 
-#include "SimG4CMS/EcalTestBeam/interface/EcalTBMCInfoProducer.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 #include "CLHEP/Random/RandFlat.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/Exception.h"
+#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
+#include "SimG4CMS/EcalTestBeam/interface/EcalTBMCInfoProducer.h"
 
 #include "DataFormats/Math/interface/Point3D.h"
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <vector>
 
 using namespace std;
 using namespace cms;
 
-EcalTBMCInfoProducer::EcalTBMCInfoProducer(const edm::ParameterSet& ps) {
-
+EcalTBMCInfoProducer::EcalTBMCInfoProducer(const edm::ParameterSet &ps) {
   produces<PEcalTBInfo>();
 
   edm::FileInPath CrystalMapFile = ps.getParameter<edm::FileInPath>("CrystalMapFile");
-  GenVtxToken = consumes<edm::HepMCProduct>(edm::InputTag("moduleLabelVtx","source"));
+  GenVtxToken = consumes<edm::HepMCProduct>(edm::InputTag("moduleLabelVtx", "source"));
   double fMinEta = ps.getParameter<double>("MinEta");
   double fMaxEta = ps.getParameter<double>("MaxEta");
   double fMinPhi = ps.getParameter<double>("MinPhi");
   double fMaxPhi = ps.getParameter<double>("MaxPhi");
-  beamEta = (fMaxEta+fMinEta)/2.;
-  beamPhi = (fMaxPhi+fMinPhi)/2.;
-  beamTheta = 2.0*atan(exp(-beamEta));
+  beamEta = (fMaxEta + fMinEta) / 2.;
+  beamPhi = (fMaxPhi + fMinPhi) / 2.;
+  beamTheta = 2.0 * atan(exp(-beamEta));
   beamXoff = ps.getParameter<double>("BeamMeanX");
   beamYoff = ps.getParameter<double>("BeamMeanX");
-   
+
   string fullMapName = CrystalMapFile.fullPath();
   theTestMap = new EcalTBCrystalMap(fullMapName);
   crysNumber = 0;
 
   double deltaEta = 999.;
   double deltaPhi = 999.;
-  for ( int cryIndex = 1; cryIndex <= EcalTBCrystalMap::NCRYSTAL; ++cryIndex) {
+  for (int cryIndex = 1; cryIndex <= EcalTBCrystalMap::NCRYSTAL; ++cryIndex) {
     double eta = 0;
     double phi = 0.;
     theTestMap->findCrystalAngles(cryIndex, eta, phi);
-    if ( fabs(beamEta - eta) < deltaEta && fabs(beamPhi - phi) < deltaPhi ) {
+    if (fabs(beamEta - eta) < deltaEta && fabs(beamPhi - phi) < deltaPhi) {
       deltaEta = fabs(beamEta - eta);
       deltaPhi = fabs(beamPhi - phi);
       crysNumber = cryIndex;
-    }
-    else if (fabs(beamEta - eta)<deltaEta && fabs(beamPhi - phi)>deltaPhi ) {
-      if ( fabs(beamPhi - phi) < 0.017 ) {
+    } else if (fabs(beamEta - eta) < deltaEta && fabs(beamPhi - phi) > deltaPhi) {
+      if (fabs(beamPhi - phi) < 0.017) {
         deltaEta = fabs(beamEta - eta);
         deltaPhi = fabs(beamPhi - phi);
         crysNumber = cryIndex;
       }
-    }
-    else if (fabs(beamEta - eta)>deltaEta && fabs(beamPhi - phi)<deltaPhi ) {
-      if ( fabs(beamEta - eta) < 0.017 ) {
+    } else if (fabs(beamEta - eta) > deltaEta && fabs(beamPhi - phi) < deltaPhi) {
+      if (fabs(beamEta - eta) < 0.017) {
         deltaEta = fabs(beamEta - eta);
         deltaPhi = fabs(beamPhi - phi);
         crysNumber = cryIndex;
@@ -76,38 +73,35 @@ EcalTBMCInfoProducer::EcalTBMCInfoProducer(const edm::ParameterSet& ps) {
 
   // rotation matrix to move from the CMS reference frame to the test beam one
 
-  double xx = -cos(beamTheta)*cos(beamPhi);
-  double xy = -cos(beamTheta)*sin(beamPhi);
+  double xx = -cos(beamTheta) * cos(beamPhi);
+  double xy = -cos(beamTheta) * sin(beamPhi);
   double xz = sin(beamTheta);
-  
+
   double yx = sin(beamPhi);
   double yy = -cos(beamPhi);
   double yz = 0.;
-  
-  double zx = sin(beamTheta)*cos(beamPhi);
-  double zy = sin(beamTheta)*sin(beamPhi);
+
+  double zx = sin(beamTheta) * cos(beamPhi);
+  double zy = sin(beamTheta) * sin(beamPhi);
   double zz = cos(beamTheta);
 
   fromCMStoTB = new ROOT::Math::Rotation3D(xx, xy, xz, yx, yy, yz, zx, zy, zz);
 
   // random number
   edm::Service<edm::RandomNumberGenerator> rng;
-  if ( ! rng.isAvailable()) {
-     throw cms::Exception("Configuration")
-       << "EcalTBMCInfoProducer requires the RandomNumberGeneratorService\n"
-          "which is not present in the configuration file.  You must add the service\n"
-          "in the configuration file or remove the modules that require it.";
-   }
-}
- 
-EcalTBMCInfoProducer::~EcalTBMCInfoProducer() {
-  delete theTestMap;
+  if (!rng.isAvailable()) {
+    throw cms::Exception("Configuration") << "EcalTBMCInfoProducer requires the RandomNumberGeneratorService\n"
+                                             "which is not present in the configuration file.  You must add the "
+                                             "service\n"
+                                             "in the configuration file or remove the modules that require it.";
+  }
 }
 
-void EcalTBMCInfoProducer::produce(edm::Event & event, const edm::EventSetup& eventSetup)
-{
+EcalTBMCInfoProducer::~EcalTBMCInfoProducer() { delete theTestMap; }
+
+void EcalTBMCInfoProducer::produce(edm::Event &event, const edm::EventSetup &eventSetup) {
   edm::Service<edm::RandomNumberGenerator> rng;
-  CLHEP::HepRandomEngine* engine = &rng->getEngine(event.streamID());
+  CLHEP::HepRandomEngine *engine = &rng->getEngine(event.streamID());
 
   unique_ptr<PEcalTBInfo> product(new PEcalTBInfo());
 
@@ -124,25 +118,19 @@ void EcalTBMCInfoProducer::produce(edm::Event & event, const edm::EventSetup& ev
   partXhodo = partYhodo = 0.;
 
   edm::Handle<edm::HepMCProduct> GenEvt;
-  event.getByToken(GenVtxToken,GenEvt);
+  event.getByToken(GenVtxToken, GenEvt);
 
-  const HepMC::GenEvent* Evt = GenEvt->GetEvent() ;
+  const HepMC::GenEvent *Evt = GenEvt->GetEvent();
   HepMC::GenEvent::vertex_const_iterator Vtx = Evt->vertices_begin();
 
-  math::XYZPoint eventCMSVertex((*Vtx)->position().x(),
-                                (*Vtx)->position().y(),
-                                (*Vtx)->position().z());
-  
-  LogDebug("EcalTBInfo") << "Generated vertex position = " 
-                         << eventCMSVertex.x() << " " 
-                         << eventCMSVertex.y() << " " 
+  math::XYZPoint eventCMSVertex((*Vtx)->position().x(), (*Vtx)->position().y(), (*Vtx)->position().z());
+
+  LogDebug("EcalTBInfo") << "Generated vertex position = " << eventCMSVertex.x() << " " << eventCMSVertex.y() << " "
                          << eventCMSVertex.z();
 
-  math::XYZPoint eventTBVertex = (*fromCMStoTB)*eventCMSVertex;
+  math::XYZPoint eventTBVertex = (*fromCMStoTB) * eventCMSVertex;
 
-  LogDebug("EcalTBInfo") << "Rotated vertex position   = "
-                         << eventTBVertex.x() << " " 
-                         << eventTBVertex.y() << " " 
+  LogDebug("EcalTBInfo") << "Rotated vertex position   = " << eventTBVertex.x() << " " << eventTBVertex.y() << " "
                          << eventTBVertex.z();
 
   partXhodo = eventTBVertex.x();
diff --git a/SimG4CMS/EcalTestBeam/plugins/FakeTBEventHeaderProducer.cc b/SimG4CMS/EcalTestBeam/plugins/FakeTBEventHeaderProducer.cc
index b09c9ce0bfe54..e7b2738440573 100644
--- a/SimG4CMS/EcalTestBeam/plugins/FakeTBEventHeaderProducer.cc
+++ b/SimG4CMS/EcalTestBeam/plugins/FakeTBEventHeaderProducer.cc
@@ -4,50 +4,47 @@
  *
  */
 
-#include "SimG4CMS/EcalTestBeam/interface/FakeTBEventHeaderProducer.h"
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
+#include "SimG4CMS/EcalTestBeam/interface/FakeTBEventHeaderProducer.h"
 
 using namespace cms;
 using namespace std;
 
-FakeTBEventHeaderProducer::FakeTBEventHeaderProducer(const edm::ParameterSet& ps) {
-  ecalTBInfo_ = consumes<PEcalTBInfo>(edm::InputTag("EcalTBInfoLabel","SimEcalTBG4Object"));
+FakeTBEventHeaderProducer::FakeTBEventHeaderProducer(const edm::ParameterSet &ps) {
+  ecalTBInfo_ = consumes<PEcalTBInfo>(edm::InputTag("EcalTBInfoLabel", "SimEcalTBG4Object"));
   produces<EcalTBEventHeader>();
 }
- 
-FakeTBEventHeaderProducer::~FakeTBEventHeaderProducer() 
-{
-}
 
-void FakeTBEventHeaderProducer::produce(edm::Event & event, const edm::EventSetup& eventSetup)
-{
+FakeTBEventHeaderProducer::~FakeTBEventHeaderProducer() {}
+
+void FakeTBEventHeaderProducer::produce(edm::Event &event, const edm::EventSetup &eventSetup) {
   unique_ptr<EcalTBEventHeader> product(new EcalTBEventHeader());
 
   // get the vertex information from the event
 
-  const PEcalTBInfo* theEcalTBInfo = nullptr;
+  const PEcalTBInfo *theEcalTBInfo = nullptr;
   edm::Handle<PEcalTBInfo> EcalTBInfo;
-  event.getByToken(ecalTBInfo_,EcalTBInfo);
-  if (EcalTBInfo.isValid()){
-    theEcalTBInfo = EcalTBInfo.product(); 
+  event.getByToken(ecalTBInfo_, EcalTBInfo);
+  if (EcalTBInfo.isValid()) {
+    theEcalTBInfo = EcalTBInfo.product();
   } else {
     edm::LogError("FakeTBEventHeaderProducer") << "Error! can't get the product PEcalTBInfo";
   }
-  
-  if (!theEcalTBInfo)
-    { return; }
-  
+
+  if (!theEcalTBInfo) {
+    return;
+  }
+
   // 64 bits event ID in CMSSW converted to EcalTBEventHeader ID
   int evtid = (int)event.id().event();
   product->setEventNumber(evtid);
   product->setRunNumber(event.id().run());
   product->setBurstNumber(1);
   product->setTriggerMask(0x1);
-  product->setCrystalInBeam(EBDetId(1,theEcalTBInfo->nCrystal(),EBDetId::SMCRYSTALMODE));
-  
-//   LogDebug("FakeTBHeader") << (*product);
-//   LogDebug("FakeTBHeader") << (*product).eventType();
-//   LogDebug("FakeTBHeader") << (*product).crystalInBeam();
+  product->setCrystalInBeam(EBDetId(1, theEcalTBInfo->nCrystal(), EBDetId::SMCRYSTALMODE));
+
+  //   LogDebug("FakeTBHeader") << (*product);
+  //   LogDebug("FakeTBHeader") << (*product).eventType();
+  //   LogDebug("FakeTBHeader") << (*product).crystalInBeam();
   event.put(std::move(product));
-  
 }
diff --git a/SimG4CMS/EcalTestBeam/plugins/FakeTBHodoscopeRawInfoProducer.cc b/SimG4CMS/EcalTestBeam/plugins/FakeTBHodoscopeRawInfoProducer.cc
index 4360baacdbf57..45a1169c65695 100644
--- a/SimG4CMS/EcalTestBeam/plugins/FakeTBHodoscopeRawInfoProducer.cc
+++ b/SimG4CMS/EcalTestBeam/plugins/FakeTBHodoscopeRawInfoProducer.cc
@@ -9,61 +9,53 @@
 using namespace cms;
 using namespace std;
 
-FakeTBHodoscopeRawInfoProducer::FakeTBHodoscopeRawInfoProducer(const edm::ParameterSet& ps) {
-  
-  ecalTBInfo_ = consumes<PEcalTBInfo>(edm::InputTag("EcalTBInfoLabel","SimEcalTBG4Object"));
+FakeTBHodoscopeRawInfoProducer::FakeTBHodoscopeRawInfoProducer(const edm::ParameterSet &ps) {
+  ecalTBInfo_ = consumes<PEcalTBInfo>(edm::InputTag("EcalTBInfoLabel", "SimEcalTBG4Object"));
   produces<EcalTBHodoscopeRawInfo>();
 
   theTBHodoGeom_ = new EcalTBHodoscopeGeometry();
 }
 
-FakeTBHodoscopeRawInfoProducer::~FakeTBHodoscopeRawInfoProducer() {
+FakeTBHodoscopeRawInfoProducer::~FakeTBHodoscopeRawInfoProducer() { delete theTBHodoGeom_; }
 
-  delete theTBHodoGeom_;
-
-}
-
-void FakeTBHodoscopeRawInfoProducer::produce(edm::Event & event, const edm::EventSetup& eventSetup)
-{
+void FakeTBHodoscopeRawInfoProducer::produce(edm::Event &event, const edm::EventSetup &eventSetup) {
   unique_ptr<EcalTBHodoscopeRawInfo> product(new EcalTBHodoscopeRawInfo());
 
   // get the vertex information from the event
 
   edm::Handle<PEcalTBInfo> theEcalTBInfo;
-  event.getByToken(ecalTBInfo_,theEcalTBInfo);
+  event.getByToken(ecalTBInfo_, theEcalTBInfo);
 
   double partXhodo = theEcalTBInfo->evXbeam();
   double partYhodo = theEcalTBInfo->evYbeam();
 
-  LogDebug("EcalTBHodo") << "TB frame vertex (X,Y) for hodoscope simulation: \n" 
+  LogDebug("EcalTBHodo") << "TB frame vertex (X,Y) for hodoscope simulation: \n"
                          << "x = " << partXhodo << " y = " << partYhodo;
-  
-  // for each hodoscope plane determine the fibre number corresponding 
+
+  // for each hodoscope plane determine the fibre number corresponding
   // to the event vertex coordinates in the TB reference frame
   // plane 0/2 = x plane 1/3 = y
-  
+
   int nPlanes = (int)theTBHodoGeom_->getNPlanes();
   product->setPlanes(nPlanes);
-  
-  for ( int iPlane = 0 ; iPlane < nPlanes ; ++iPlane) {
-    
+
+  for (int iPlane = 0; iPlane < nPlanes; ++iPlane) {
     float theCoord = (float)partXhodo;
-    if (iPlane == 1 || iPlane == 3) theCoord = (float)partYhodo;
-    
+    if (iPlane == 1 || iPlane == 3)
+      theCoord = (float)partYhodo;
+
     vector<int> firedChannels = theTBHodoGeom_->getFiredFibresInPlane(theCoord, iPlane);
     unsigned int nChannels = firedChannels.size();
-    
+
     EcalTBHodoscopePlaneRawHits planeHit(nChannels);
-    for ( unsigned int i = 0 ; i < nChannels ; ++i ) {
+    for (unsigned int i = 0; i < nChannels; ++i) {
       planeHit.addHit(firedChannels[i]);
     }
-    
+
     product->setPlane((unsigned int)iPlane, planeHit);
-    
   }
 
   LogDebug("EcalTBHodo") << (*product);
-  
+
   event.put(std::move(product));
-  
 }
diff --git a/SimG4CMS/EcalTestBeam/plugins/SealModule.cc b/SimG4CMS/EcalTestBeam/plugins/SealModule.cc
index beca3f66690c2..3fa8d846abd61 100644
--- a/SimG4CMS/EcalTestBeam/plugins/SealModule.cc
+++ b/SimG4CMS/EcalTestBeam/plugins/SealModule.cc
@@ -1,25 +1,23 @@
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "SimG4CMS/EcalTestBeam/interface/EcalTBH4BeamSD.h"
 #include "SimG4CMS/EcalTestBeam/interface/EcalTBH4Trigger.h"
 #include "SimG4Core/SensitiveDetector/interface/SensitiveDetectorPluginFactory.h"
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
 
-
- 
 #include "SimG4CMS/EcalTestBeam/interface/EcalTBMCInfoProducer.h"
-DEFINE_FWK_MODULE (EcalTBMCInfoProducer) ;
+DEFINE_FWK_MODULE(EcalTBMCInfoProducer);
 
 #include "SimG4CMS/EcalTestBeam/interface/FakeTBHodoscopeRawInfoProducer.h"
-DEFINE_FWK_MODULE (FakeTBHodoscopeRawInfoProducer) ;
+DEFINE_FWK_MODULE(FakeTBHodoscopeRawInfoProducer);
 
 #include "SimG4CMS/EcalTestBeam/interface/TBHodoActiveVolumeRawInfoProducer.h"
-DEFINE_FWK_MODULE (TBHodoActiveVolumeRawInfoProducer) ;
+DEFINE_FWK_MODULE(TBHodoActiveVolumeRawInfoProducer);
 
 #include "SimG4CMS/EcalTestBeam/interface/FakeTBEventHeaderProducer.h"
-DEFINE_FWK_MODULE (FakeTBEventHeaderProducer) ;
+DEFINE_FWK_MODULE(FakeTBEventHeaderProducer);
 
 typedef EcalTBH4BeamSD EcalTBH4BeamDetector;
 DEFINE_SENSITIVEDETECTOR(EcalTBH4BeamDetector);
 
-DEFINE_SIMWATCHER (EcalTBH4Trigger);
+DEFINE_SIMWATCHER(EcalTBH4Trigger);
diff --git a/SimG4CMS/EcalTestBeam/plugins/TBHodoActiveVolumeRawInfoProducer.cc b/SimG4CMS/EcalTestBeam/plugins/TBHodoActiveVolumeRawInfoProducer.cc
index ff76f195e7646..b6b768a4a6768 100644
--- a/SimG4CMS/EcalTestBeam/plugins/TBHodoActiveVolumeRawInfoProducer.cc
+++ b/SimG4CMS/EcalTestBeam/plugins/TBHodoActiveVolumeRawInfoProducer.cc
@@ -11,9 +11,8 @@
 using namespace cms;
 using namespace std;
 
-TBHodoActiveVolumeRawInfoProducer::TBHodoActiveVolumeRawInfoProducer(const edm::ParameterSet& ps) {
-
-  m_EcalToken = consumes<edm::PCaloHitContainer>(edm::InputTag("g4SimHits","EcalTBH4BeamHits"));
+TBHodoActiveVolumeRawInfoProducer::TBHodoActiveVolumeRawInfoProducer(const edm::ParameterSet &ps) {
+  m_EcalToken = consumes<edm::PCaloHitContainer>(edm::InputTag("g4SimHits", "EcalTBH4BeamHits"));
   produces<EcalTBHodoscopeRawInfo>();
 
   theTBHodoGeom_ = new EcalTBHodoscopeGeometry();
@@ -21,67 +20,66 @@ TBHodoActiveVolumeRawInfoProducer::TBHodoActiveVolumeRawInfoProducer(const edm::
   myThreshold = 0.05E-3;
 }
 
-TBHodoActiveVolumeRawInfoProducer::~TBHodoActiveVolumeRawInfoProducer() {   
-  delete theTBHodoGeom_; 
-}
+TBHodoActiveVolumeRawInfoProducer::~TBHodoActiveVolumeRawInfoProducer() { delete theTBHodoGeom_; }
 
-void TBHodoActiveVolumeRawInfoProducer::produce(edm::Event & event, const edm::EventSetup& eventSetup)
-{
+void TBHodoActiveVolumeRawInfoProducer::produce(edm::Event &event, const edm::EventSetup &eventSetup) {
   unique_ptr<EcalTBHodoscopeRawInfo> product(new EcalTBHodoscopeRawInfo());
 
   // caloHit container
   edm::Handle<edm::PCaloHitContainer> pCaloHit;
-  const edm::PCaloHitContainer* caloHits = nullptr;
-  event.getByToken(m_EcalToken, pCaloHit); 
-  if (pCaloHit.isValid()){ 
-    caloHits = pCaloHit.product();                 
-    LogDebug("EcalTBHodo") << "total # caloHits: " << caloHits->size() ;
+  const edm::PCaloHitContainer *caloHits = nullptr;
+  event.getByToken(m_EcalToken, pCaloHit);
+  if (pCaloHit.isValid()) {
+    caloHits = pCaloHit.product();
+    LogDebug("EcalTBHodo") << "total # caloHits: " << caloHits->size();
   } else {
-    edm::LogError("EcalTBHodo") << "Error! can't get the caloHitContainer " ;
-  }  
-  if (!caloHits){ return; }
+    edm::LogError("EcalTBHodo") << "Error! can't get the caloHitContainer ";
+  }
+  if (!caloHits) {
+    return;
+  }
 
   // detid - energy_sum map
-  std::map<unsigned int, double> energyMap;  
+  std::map<unsigned int, double> energyMap;
 
-  for(auto&& aHit : *caloHits) {
+  for (auto &&aHit : *caloHits) {
     double thisHitEne = aHit.energy();
 
-    std::map<unsigned int,double>::iterator itmap = energyMap.find(aHit.id());
-    if ( itmap == energyMap.end() )
-      energyMap.insert(pair<unsigned int, double>( aHit.id(), thisHitEne));  
-    else{
+    std::map<unsigned int, double>::iterator itmap = energyMap.find(aHit.id());
+    if (itmap == energyMap.end())
+      energyMap.insert(pair<unsigned int, double>(aHit.id(), thisHitEne));
+    else {
       (*itmap).second += thisHitEne;
     }
   }
-  
+
   // planes and fibers
-  int nPlanes=theTBHodoGeom_->getNPlanes();
-  int nFibers=theTBHodoGeom_->getNFibres();
+  int nPlanes = theTBHodoGeom_->getNPlanes();
+  int nFibers = theTBHodoGeom_->getNFibres();
   product->setPlanes(nPlanes);
 
   bool firedChannels[4][64];
-  for (int iPlane = 0 ; iPlane < nPlanes ; ++iPlane) {
-    for (int iFiber = 0; iFiber < nFibers ; ++iFiber) { 
+  for (int iPlane = 0; iPlane < nPlanes; ++iPlane) {
+    for (int iFiber = 0; iFiber < nFibers; ++iFiber) {
       firedChannels[iPlane][iFiber] = 0.;
     }
   }
-  for(std::map<unsigned int,double>::const_iterator itmap=energyMap.begin();itmap!=energyMap.end();++itmap) {
-    if ( (*itmap).second > myThreshold ){
-      HodoscopeDetId myHodoDetId = HodoscopeDetId((*itmap).first);   
+  for (std::map<unsigned int, double>::const_iterator itmap = energyMap.begin(); itmap != energyMap.end(); ++itmap) {
+    if ((*itmap).second > myThreshold) {
+      HodoscopeDetId myHodoDetId = HodoscopeDetId((*itmap).first);
       firedChannels[myHodoDetId.planeId()][myHodoDetId.fibrId()] = true;
     }
   }
-  for (int iPlane = 0 ; iPlane < nPlanes ; ++iPlane) {
+  for (int iPlane = 0; iPlane < nPlanes; ++iPlane) {
     EcalTBHodoscopePlaneRawHits planeHit(nFibers);
-    
-    for (int iFiber = 0; iFiber < nFibers ; ++iFiber) {
-      planeHit.setHit(iFiber,firedChannels[iPlane][iFiber]);
+
+    for (int iFiber = 0; iFiber < nFibers; ++iFiber) {
+      planeHit.setHit(iFiber, firedChannels[iPlane][iFiber]);
     }
     product->setPlane((unsigned int)iPlane, planeHit);
   }
-  
+
   LogDebug("EcalTBHodo") << (*product);
-  
+
   event.put(std::move(product));
 }
diff --git a/SimG4CMS/EcalTestBeam/src/EcalTBH4BeamSD.cc b/SimG4CMS/EcalTestBeam/src/EcalTBH4BeamSD.cc
old mode 100755
new mode 100644
index 9c98b16e3a869..5cf029af791c3
--- a/SimG4CMS/EcalTestBeam/src/EcalTBH4BeamSD.cc
+++ b/SimG4CMS/EcalTestBeam/src/EcalTBH4BeamSD.cc
@@ -2,14 +2,14 @@
 // File: EcalTBH4BeamSD.cc
 // Description: Sensitive Detector class for electromagnetic calorimeters
 ///////////////////////////////////////////////////////////////////////////////
-#include "SimG4CMS/EcalTestBeam/interface/EcalTBH4BeamSD.h"
-#include "Geometry/EcalTestBeam/interface/EcalHodoscopeNumberingScheme.h"
-#include "Geometry/EcalCommonData/interface/EcalBaseNumber.h"
 #include "DetectorDescription/Core/interface/DDFilter.h"
 #include "DetectorDescription/Core/interface/DDFilteredView.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/interface/DDSplit.h"
 #include "DetectorDescription/Core/interface/DDValue.h"
+#include "Geometry/EcalCommonData/interface/EcalBaseNumber.h"
+#include "Geometry/EcalTestBeam/interface/EcalHodoscopeNumberingScheme.h"
+#include "SimG4CMS/EcalTestBeam/interface/EcalTBH4BeamSD.h"
 
 #include "Geometry/EcalCommonData/interface/EcalBaseNumber.h"
 
@@ -19,78 +19,76 @@
 
 #include "G4SystemOfUnits.hh"
 
-EcalTBH4BeamSD::EcalTBH4BeamSD(const std::string& name, const DDCompactView & cpv,
-			       const SensitiveDetectorCatalog & clg,
-			       edm::ParameterSet const & p, 
-			       const SimTrackManager* manager) : 
-  CaloSD(name, cpv, clg, p, manager), numberingScheme(nullptr) {
-  
+EcalTBH4BeamSD::EcalTBH4BeamSD(const std::string &name,
+                               const DDCompactView &cpv,
+                               const SensitiveDetectorCatalog &clg,
+                               edm::ParameterSet const &p,
+                               const SimTrackManager *manager)
+    : CaloSD(name, cpv, clg, p, manager), numberingScheme(nullptr) {
   edm::ParameterSet m_EcalTBH4BeamSD = p.getParameter<edm::ParameterSet>("EcalTBH4BeamSD");
-  useBirk= m_EcalTBH4BeamSD.getParameter<bool>("UseBirkLaw");
-  birk1  = m_EcalTBH4BeamSD.getParameter<double>("BirkC1")*(g/(MeV*cm2));
-  birk2  = m_EcalTBH4BeamSD.getParameter<double>("BirkC2");
-  birk3  = m_EcalTBH4BeamSD.getParameter<double>("BirkC3");
+  useBirk = m_EcalTBH4BeamSD.getParameter<bool>("UseBirkLaw");
+  birk1 = m_EcalTBH4BeamSD.getParameter<double>("BirkC1") * (g / (MeV * cm2));
+  birk2 = m_EcalTBH4BeamSD.getParameter<double>("BirkC2");
+  birk3 = m_EcalTBH4BeamSD.getParameter<double>("BirkC3");
 
-  EcalNumberingScheme* scheme=nullptr;
-  if     (name == "EcalTBH4BeamHits") { 
-    scheme = dynamic_cast<EcalNumberingScheme*>(new EcalHodoscopeNumberingScheme());
-  } 
-  else {edm::LogWarning("EcalTBSim") << "EcalTBH4BeamSD: ReadoutName not supported\n";}
+  EcalNumberingScheme *scheme = nullptr;
+  if (name == "EcalTBH4BeamHits") {
+    scheme = dynamic_cast<EcalNumberingScheme *>(new EcalHodoscopeNumberingScheme());
+  } else {
+    edm::LogWarning("EcalTBSim") << "EcalTBH4BeamSD: ReadoutName not supported\n";
+  }
 
-  if (scheme)  setNumberingScheme(scheme);
-  edm::LogInfo("EcalTBSim") << "Constructing a EcalTBH4BeamSD  with name " 
-			    << GetName();
-  edm::LogInfo("EcalTBSim") << "EcalTBH4BeamSD:: Use of Birks law is set to  " 
-			    << useBirk << "        with three constants kB = "
-			    << birk1 << ", C1 = " << birk2 << ", C2 = " 
-			    << birk3;
+  if (scheme)
+    setNumberingScheme(scheme);
+  edm::LogInfo("EcalTBSim") << "Constructing a EcalTBH4BeamSD  with name " << GetName();
+  edm::LogInfo("EcalTBSim") << "EcalTBH4BeamSD:: Use of Birks law is set to  " << useBirk
+                            << "        with three constants kB = " << birk1 << ", C1 = " << birk2
+                            << ", C2 = " << birk3;
 }
 
 EcalTBH4BeamSD::~EcalTBH4BeamSD() {
-  if (numberingScheme) delete numberingScheme;
+  if (numberingScheme)
+    delete numberingScheme;
 }
 
-double EcalTBH4BeamSD::getEnergyDeposit(const G4Step * aStep) {
-  
+double EcalTBH4BeamSD::getEnergyDeposit(const G4Step *aStep) {
   // take into account light collection curve for crystals
   double weight = 1.;
-  if (useBirk)   weight *= getAttenuation(aStep, birk1, birk2, birk3);
-  double edep   = aStep->GetTotalEnergyDeposit() * weight;
-  LogDebug("EcalTBSim") << "EcalTBH4BeamSD:: " 
-			<< aStep->GetPreStepPoint()->GetPhysicalVolume()->GetName()
-			<<" Light Collection Efficiency " << weight 
-			<< " Weighted Energy Deposit " << edep/MeV << " MeV";
+  if (useBirk)
+    weight *= getAttenuation(aStep, birk1, birk2, birk3);
+  double edep = aStep->GetTotalEnergyDeposit() * weight;
+  LogDebug("EcalTBSim") << "EcalTBH4BeamSD:: " << aStep->GetPreStepPoint()->GetPhysicalVolume()->GetName()
+                        << " Light Collection Efficiency " << weight << " Weighted Energy Deposit " << edep / MeV
+                        << " MeV";
   return edep;
 }
 
-uint32_t EcalTBH4BeamSD::setDetUnitId(const G4Step * aStep) { 
+uint32_t EcalTBH4BeamSD::setDetUnitId(const G4Step *aStep) {
   getBaseNumber(aStep);
   return (numberingScheme == nullptr ? 0 : numberingScheme->getUnitID(theBaseNumber));
 }
 
-void EcalTBH4BeamSD::setNumberingScheme(EcalNumberingScheme* scheme) {
+void EcalTBH4BeamSD::setNumberingScheme(EcalNumberingScheme *scheme) {
   if (scheme != nullptr) {
-    edm::LogInfo("EcalTBSim") << "EcalTBH4BeamSD: updates numbering scheme for " 
-			    << GetName() << "\n";
-    if (numberingScheme) delete numberingScheme;
+    edm::LogInfo("EcalTBSim") << "EcalTBH4BeamSD: updates numbering scheme for " << GetName() << "\n";
+    if (numberingScheme)
+      delete numberingScheme;
     numberingScheme = scheme;
   }
 }
 
-
-void EcalTBH4BeamSD::getBaseNumber(const G4Step* aStep) {
-
+void EcalTBH4BeamSD::getBaseNumber(const G4Step *aStep) {
   theBaseNumber.reset();
-  const G4VTouchable* touch = aStep->GetPreStepPoint()->GetTouchable();
-  int theSize = touch->GetHistoryDepth()+1;
-  if ( theBaseNumber.getCapacity() < theSize ) theBaseNumber.setSize(theSize);
-  //Get name and copy numbers
-  if ( theSize > 1 ) {
-    for (int ii = 0; ii < theSize ; ii++) {
-      theBaseNumber.addLevel(touch->GetVolume(ii)->GetName(),touch->GetReplicaNumber(ii));
-      LogDebug("EcalTBSim") << "EcalTBH4BeamSD::getBaseNumber(): Adding level " << ii 
-                            << ": " << touch->GetVolume(ii)->GetName() << "["
-                            << touch->GetReplicaNumber(ii) << "]";
+  const G4VTouchable *touch = aStep->GetPreStepPoint()->GetTouchable();
+  int theSize = touch->GetHistoryDepth() + 1;
+  if (theBaseNumber.getCapacity() < theSize)
+    theBaseNumber.setSize(theSize);
+  // Get name and copy numbers
+  if (theSize > 1) {
+    for (int ii = 0; ii < theSize; ii++) {
+      theBaseNumber.addLevel(touch->GetVolume(ii)->GetName(), touch->GetReplicaNumber(ii));
+      LogDebug("EcalTBSim") << "EcalTBH4BeamSD::getBaseNumber(): Adding level " << ii << ": "
+                            << touch->GetVolume(ii)->GetName() << "[" << touch->GetReplicaNumber(ii) << "]";
     }
   }
 }
diff --git a/SimG4CMS/EcalTestBeam/test/testFromCMStoTB.cpp b/SimG4CMS/EcalTestBeam/test/testFromCMStoTB.cpp
index abbf3e3365d67..4cdc39cacc398 100644
--- a/SimG4CMS/EcalTestBeam/test/testFromCMStoTB.cpp
+++ b/SimG4CMS/EcalTestBeam/test/testFromCMStoTB.cpp
@@ -1,68 +1,60 @@
+#include "CLHEP/Random/RandFlat.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "DataFormats/Math/interface/Point3D.h"
 #include "Math/GenVector/Rotation3D.h"
 #include "Math/GenVector/RotationX.h"
 #include "Math/GenVector/RotationY.h"
 #include "Math/GenVector/RotationZ.h"
-#include "CLHEP/Random/RandFlat.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
- 
 
-#include <vector>
 #include <cmath>
+#include <vector>
 
 using namespace std;
 
-void computeRotation(double & myTheta, double & myPhi, ROOT::Math::Rotation3D & CMStoTB, ROOT::Math::Rotation3D & TBtoCMS) {
-
+void computeRotation(double &myTheta, double &myPhi, ROOT::Math::Rotation3D &CMStoTB, ROOT::Math::Rotation3D &TBtoCMS) {
   // rotation matrix to move from the CMS reference frame to the test beam one
-  
-  ROOT::Math::Rotation3D * fromCMStoTB = new ROOT::Math::Rotation3D();
+
+  ROOT::Math::Rotation3D *fromCMStoTB = new ROOT::Math::Rotation3D();
 
   // rotation matrix to move from the test beam reference frame to the CMS one
 
-  ROOT::Math::Rotation3D * fromTBtoCMS = new ROOT::Math::Rotation3D();
+  ROOT::Math::Rotation3D *fromTBtoCMS = new ROOT::Math::Rotation3D();
 
-  double angle1 = 90.*deg - myPhi;
-  ROOT::Math::RotationZ * r1 = new ROOT::Math::RotationZ(angle1);
+  double angle1 = 90. * deg - myPhi;
+  ROOT::Math::RotationZ *r1 = new ROOT::Math::RotationZ(angle1);
   double angle2 = myTheta;
-  ROOT::Math::RotationX * r2 = new ROOT::Math::RotationX(angle2);
-  double angle3 = 90.*deg;
-  ROOT::Math::RotationZ * r3 = new ROOT::Math::RotationZ(angle3);
+  ROOT::Math::RotationX *r2 = new ROOT::Math::RotationX(angle2);
+  double angle3 = 90. * deg;
+  ROOT::Math::RotationZ *r3 = new ROOT::Math::RotationZ(angle3);
   (*fromCMStoTB) *= (*r3);
   (*fromCMStoTB) *= (*r2);
   (*fromCMStoTB) *= (*r1);
-  
-  cout 
-    << "Rotation matrix from CMS to test beam frame = " << (*fromCMStoTB)
-    << "built from: \n" 
-    << " the rotation of " << angle1 << " around Z " << (*r1) << "\n"
-    << " the rotation of " << angle2 << " around X " << (*r2) << "\n"
-    << " the rotation of " << angle3 << " around Z " << (*r3) << std::endl;
-
-  double angle11 = - 90.*deg + myPhi;
-  ROOT::Math::RotationZ * r11 = new ROOT::Math::RotationZ(angle11);
+
+  cout << "Rotation matrix from CMS to test beam frame = " << (*fromCMStoTB) << "built from: \n"
+       << " the rotation of " << angle1 << " around Z " << (*r1) << "\n"
+       << " the rotation of " << angle2 << " around X " << (*r2) << "\n"
+       << " the rotation of " << angle3 << " around Z " << (*r3) << std::endl;
+
+  double angle11 = -90. * deg + myPhi;
+  ROOT::Math::RotationZ *r11 = new ROOT::Math::RotationZ(angle11);
   double angle12 = -myTheta;
-  ROOT::Math::RotationX * r12 = new ROOT::Math::RotationX(angle12);
-  double angle13 = -90.*deg;
-  ROOT::Math::RotationZ * r13 = new ROOT::Math::RotationZ(angle13);
+  ROOT::Math::RotationX *r12 = new ROOT::Math::RotationX(angle12);
+  double angle13 = -90. * deg;
+  ROOT::Math::RotationZ *r13 = new ROOT::Math::RotationZ(angle13);
 
   (*fromTBtoCMS) *= (*r11);
   (*fromTBtoCMS) *= (*r12);
   (*fromTBtoCMS) *= (*r13);
-  
-  cout 
-    << "Rotation matrix from test beam to CMS frame = " << (*fromTBtoCMS)
-    << "built from: \n" 
-    << " the rotation of " << angle13 << " around Z " << (*r13) << "\n"
-    << " the rotation of " << angle12 << " around X " << (*r12) << "\n"
-    << " the rotation of " << angle11 << " around Z " << (*r11) << std::endl;
-
-  ROOT::Math::Rotation3D test = (*fromCMStoTB)*(*fromTBtoCMS);
-  
-  cout 
-    << "Product of the two rotations: " << test << endl;
-  
-  
+
+  cout << "Rotation matrix from test beam to CMS frame = " << (*fromTBtoCMS) << "built from: \n"
+       << " the rotation of " << angle13 << " around Z " << (*r13) << "\n"
+       << " the rotation of " << angle12 << " around X " << (*r12) << "\n"
+       << " the rotation of " << angle11 << " around Z " << (*r11) << std::endl;
+
+  ROOT::Math::Rotation3D test = (*fromCMStoTB) * (*fromTBtoCMS);
+
+  cout << "Product of the two rotations: " << test << endl;
+
   CMStoTB = (*fromCMStoTB);
   TBtoCMS = (*fromTBtoCMS);
 
@@ -71,146 +63,132 @@ void computeRotation(double & myTheta, double & myPhi, ROOT::Math::Rotation3D &
   delete r1;
   delete r2;
   delete r3;
-
 }
 
-void checkTotalRotation(double & myTheta, double & myPhi) {
-
+void checkTotalRotation(double &myTheta, double &myPhi) {
   // rotation matrix to move from the CMS reference frame to the test beam one
-  
-  double xx = -cos(myTheta)*cos(myPhi);
-  double xy = -cos(myTheta)*sin(myPhi);
+
+  double xx = -cos(myTheta) * cos(myPhi);
+  double xy = -cos(myTheta) * sin(myPhi);
   double xz = sin(myTheta);
-  
+
   double yx = sin(myPhi);
   double yy = -cos(myPhi);
   double yz = 0.;
-  
-  double zx = sin(myTheta)*cos(myPhi);
-  double zy = sin(myTheta)*sin(myPhi);
+
+  double zx = sin(myTheta) * cos(myPhi);
+  double zy = sin(myTheta) * sin(myPhi);
   double zz = cos(myTheta);
 
-  ROOT::Math::Rotation3D * fromCMStoTB = new ROOT::Math::Rotation3D(xx, xy, xz, yx, yy, yz, zx, zy, zz);
+  ROOT::Math::Rotation3D *fromCMStoTB = new ROOT::Math::Rotation3D(xx, xy, xz, yx, yy, yz, zx, zy, zz);
 
   cout << "Total rotation matrix from CMS to test beam frame = " << (*fromCMStoTB) << endl;
 
   // rotation matrix to move from the test beam reference frame to the CMS one
 
-  xx = -cos(myTheta)*cos(myPhi);
+  xx = -cos(myTheta) * cos(myPhi);
   xy = sin(myPhi);
-  xz = sin(myTheta)*cos(myPhi);
+  xz = sin(myTheta) * cos(myPhi);
 
-  yx = -cos(myTheta)*sin(myPhi);
+  yx = -cos(myTheta) * sin(myPhi);
   yy = -cos(myPhi);
-  yz = sin(myTheta)*sin(myPhi);
-  
+  yz = sin(myTheta) * sin(myPhi);
+
   zx = sin(myTheta);
   zy = 0.;
   zz = cos(myTheta);
 
-  ROOT::Math::Rotation3D * fromTBtoCMS = new ROOT::Math::Rotation3D(xx, xy, xz, yx, yy, yz, zx, zy, zz);
+  ROOT::Math::Rotation3D *fromTBtoCMS = new ROOT::Math::Rotation3D(xx, xy, xz, yx, yy, yz, zx, zy, zz);
 
   cout << "Total rotation matrix from test beam to CMS frame = " << (*fromTBtoCMS) << endl;
 
-  ROOT::Math::Rotation3D test = (*fromCMStoTB)*(*fromTBtoCMS);
-  
-  cout 
-    << "Product of the two rotations: " << test << endl;
+  ROOT::Math::Rotation3D test = (*fromCMStoTB) * (*fromTBtoCMS);
 
+  cout << "Product of the two rotations: " << test << endl;
 }
 
 int main() {
-
   // (eta,phi) for a crystal
 
   double myMod = 1.;
   double myEta = 0.971226;
-  double myTheta = 2.0*atan(exp(-myEta));
+  double myTheta = 2.0 * atan(exp(-myEta));
   double myPhi = 0.115052;
-  
+
   cout << "\n===========================================\n" << endl;
   cout << "Input theta = " << myTheta << " phi = " << myPhi << endl;
   cout << "\n===========================================\n" << endl;
-  
-  ROOT::Math::Rotation3D * CMStoTB = new ROOT::Math::Rotation3D();
-  ROOT::Math::Rotation3D * TBtoCMS = new ROOT::Math::Rotation3D();
+
+  ROOT::Math::Rotation3D *CMStoTB = new ROOT::Math::Rotation3D();
+  ROOT::Math::Rotation3D *TBtoCMS = new ROOT::Math::Rotation3D();
 
   checkTotalRotation(myTheta, myPhi);
 
-  computeRotation(myTheta, myPhi, (*CMStoTB), (*TBtoCMS) );
+  computeRotation(myTheta, myPhi, (*CMStoTB), (*TBtoCMS));
   cout << "\n===========================================\n" << endl;
 
-  double xx = 0.; double yy = 0. ; double zz = 0.;
+  double xx = 0.;
+  double yy = 0.;
+  double zz = 0.;
   math::XYZPoint test(xx, yy, zz);
   double newTheta = myTheta;
   double newPhi = myPhi;
 
+  for (int ieta = -1; ieta <= 1; ++ieta) {
+    for (int iphi = -1; iphi <= 1; ++iphi) {
+      newTheta = myTheta + (double)ieta;
+      newPhi = myPhi + (double)iphi;
 
-  for ( int ieta = -1; ieta <= 1; ++ieta ) {
-    for ( int iphi = -1; iphi <= 1; ++iphi ) {
-      
-      newTheta = myTheta+(double)ieta;
-      newPhi = myPhi+(double)iphi;
+      xx = myMod * sin(newTheta) * cos(newPhi);
+      yy = myMod * sin(newTheta) * sin(newPhi);
+      zz = myMod * cos(newTheta);
+      test.SetCoordinates(xx, yy, zz);
 
-      xx = myMod*sin(newTheta)*cos(newPhi);
-      yy = myMod*sin(newTheta)*sin(newPhi);
-      zz = myMod*cos(newTheta);
-      test.SetCoordinates(xx,yy,zz);
-  
       cout << "\n ieta = " << ieta << " iphi = " << iphi << endl;
       cout << "\n From CMS to TB \n" << endl;
-      cout << "Input vector  = " << test 
-           << " corresponding to theta = " 
-           << newTheta << " phi = " << newPhi << endl;
-      
-      math::XYZPoint testrot = (*CMStoTB)*test;
-  
-      cout << "Output vector = " << testrot 
-           << " corresponding to theta = " 
-           << testrot.theta() << " phi = " << testrot.phi() << endl; 
-      
+      cout << "Input vector  = " << test << " corresponding to theta = " << newTheta << " phi = " << newPhi << endl;
+
+      math::XYZPoint testrot = (*CMStoTB) * test;
+
+      cout << "Output vector = " << testrot << " corresponding to theta = " << testrot.theta()
+           << " phi = " << testrot.phi() << endl;
+
       cout << "\n From TB to CMS \n" << endl;
-      
-      math::XYZPoint thistest = (*TBtoCMS)*testrot;
-      
-      cout << "Output vector = " << thistest 
-           << " corresponding to theta = " 
-           << thistest.theta() << " phi = " << thistest.phi() << endl; 
+
+      math::XYZPoint thistest = (*TBtoCMS) * testrot;
+
+      cout << "Output vector = " << thistest << " corresponding to theta = " << thistest.theta()
+           << " phi = " << thistest.phi() << endl;
       cout << "\n===========================================\n" << endl;
-  
     }
   }
 
   cout << "\n===========================================\n" << endl;
 
-  for ( int ix = -1; ix <= 1; ++ix ) {
-    for ( int iy = -1; iy <= 1; ++iy ) {
-
+  for (int ix = -1; ix <= 1; ++ix) {
+    for (int iy = -1; iy <= 1; ++iy) {
       xx = (double)ix * 0.01;
       yy = (double)iy * 0.01;
       zz = 1.;
-      test.SetCoordinates(xx,yy,zz);
+      test.SetCoordinates(xx, yy, zz);
 
       cout << "\n ix = " << ix << " iy = " << iy << endl;
       cout << "\n From TB to CMS \n" << endl;
       cout << "Input vector  = " << test << endl;
-      
-      math::XYZPoint testrot = (*TBtoCMS)*test;
-  
-      cout << "Output vector = " << testrot 
-           << " corresponding to theta = " 
-           << testrot.theta() << " phi = " << testrot.phi() << endl; 
-      
+
+      math::XYZPoint testrot = (*TBtoCMS) * test;
+
+      cout << "Output vector = " << testrot << " corresponding to theta = " << testrot.theta()
+           << " phi = " << testrot.phi() << endl;
+
       cout << "\n From CMS to TB \n" << endl;
-      
-      math::XYZPoint thistest = (*CMStoTB)*testrot;
-      
+
+      math::XYZPoint thistest = (*CMStoTB) * testrot;
+
       cout << "Output vector = " << thistest << endl;
       cout << "\n===========================================\n" << endl;
-  
     }
   }
 
   return 0;
-
 }
diff --git a/SimG4CMS/FP420/interface/FP420G4Hit.h b/SimG4CMS/FP420/interface/FP420G4Hit.h
index 08947c896a72e..b782137b9f506 100644
--- a/SimG4CMS/FP420/interface/FP420G4Hit.h
+++ b/SimG4CMS/FP420/interface/FP420G4Hit.h
@@ -1,10 +1,10 @@
 ///////////////////////////////////////////////////////////////////////////////
 // File: FP420G4Hit.h
-// Date: 02.2006 
-// 
+// Date: 02.2006
+//
 // Package:     FP420
 // Class  :     FP420G4Hit
-// 
+//
 ///////////////////////////////////////////////////////////////////////////////
 #ifndef FP420G4Hit_h
 #define FP420G4Hit_h
@@ -17,125 +17,115 @@
 //#include "G4StepPoint.hh"
 
 class FP420G4Hit : public G4VHit {
-  
 public:
-  
   FP420G4Hit();
   ~FP420G4Hit() override;
-  FP420G4Hit(const FP420G4Hit &right);
-  const FP420G4Hit& operator=(const FP420G4Hit &right);
-  int operator==(const FP420G4Hit &){return 0;}
-  
-  void         Draw() override{}
-  void         Print() override;
-  
+  FP420G4Hit(const FP420G4Hit& right);
+  const FP420G4Hit& operator=(const FP420G4Hit& right);
+  int operator==(const FP420G4Hit&) { return 0; }
+
+  void Draw() override {}
+  void Print() override;
+
 public:
-  
-  G4ThreeVector   getEntry() const;
-  void         setEntry(const G4ThreeVector& xyz);
-  
-  G4ThreeVector    getEntryLocalP() const;
-  void         setEntryLocalP(const G4ThreeVector& xyz1);
-
-  G4ThreeVector    getExitLocalP() const;
-  void         setExitLocalP(const G4ThreeVector& xyz1);
-
-  double       getEM() const;
-  void         setEM (double e);
-  
-  double       getHadr() const;
-  void         setHadr (double e);
-  
-  double       getIncidentEnergy() const;
-  void         setIncidentEnergy (double e);
-  
+  G4ThreeVector getEntry() const;
+  void setEntry(const G4ThreeVector& xyz);
+
+  G4ThreeVector getEntryLocalP() const;
+  void setEntryLocalP(const G4ThreeVector& xyz1);
+
+  G4ThreeVector getExitLocalP() const;
+  void setExitLocalP(const G4ThreeVector& xyz1);
+
+  double getEM() const;
+  void setEM(double e);
+
+  double getHadr() const;
+  void setHadr(double e);
+
+  double getIncidentEnergy() const;
+  void setIncidentEnergy(double e);
+
   //G4int          getTrackID() const;
-  unsigned int               getTrackID() const;
-  void         setTrackID (int i);
-  
+  unsigned int getTrackID() const;
+  void setTrackID(int i);
+
   unsigned int getUnitID() const;
-  void         setUnitID (unsigned int i);
-  
-  double       getTimeSlice() const;     
-  void         setTimeSlice(double d);
-  int          getTimeSliceID() const;     
-  
-  void         addEnergyDeposit(double em, double hd);
-  void         addEnergyDeposit(const FP420G4Hit& aHit);
-  
-  double       getEnergyDeposit() const;
-  
+  void setUnitID(unsigned int i);
+
+  double getTimeSlice() const;
+  void setTimeSlice(double d);
+  int getTimeSliceID() const;
+
+  void addEnergyDeposit(double em, double hd);
+  void addEnergyDeposit(const FP420G4Hit& aHit);
+
+  double getEnergyDeposit() const;
+
   float getPabs() const;
   float getTof() const;
   float getEnergyLoss() const;
   int getParticleType() const;
 
- void setPabs(float e)      ;
-  void setTof(float e)  ;
-  void addEnergyLoss(float e) ;
-  void setEnergyLoss(float e) ;
-  void setParticleType(short i) ;
-
-  float getThetaAtEntry() const;   
-    float getPhiAtEntry() const;
+  void setPabs(float e);
+  void setTof(float e);
+  void addEnergyLoss(float e);
+  void setEnergyLoss(float e);
+  void setParticleType(short i);
 
-    void setThetaAtEntry(float t);
-    void setPhiAtEntry(float f) ;
+  float getThetaAtEntry() const;
+  float getPhiAtEntry() const;
 
-    float getX() const;
-    void setX(float t);
-    float getY() const;
-    float getZ() const;
-    void setY(float t);
-    void setZ(float t);
+  void setThetaAtEntry(float t);
+  void setPhiAtEntry(float f);
 
+  float getX() const;
+  void setX(float t);
+  float getY() const;
+  float getZ() const;
+  void setY(float t);
+  void setZ(float t);
 
-    int getParentId() const;
-    float getVx() const;
-    float getVy() const;
-    float getVz() const;
-
-    void setParentId(int p);
-    void setVx(float p);
-    void setVy(float p);
-    void setVz(float p);
+  int getParentId() const;
+  float getVx() const;
+  float getVy() const;
+  float getVz() const;
 
+  void setParentId(int p);
+  void setVx(float p);
+  void setVy(float p);
+  void setVz(float p);
 
 private:
-  
-    G4ThreeVector entry;             //Entry point
-    G4ThreeVector entrylp;    //Entry  local point
-    G4ThreeVector exitlp;    //Exit  local point
-  double       elem;              //EnergyDeposit of EM particles
-  double       hadr;              //EnergyDeposit of HD particles
-  double       theIncidentEnergy; //Energy of the primary particle
-  G4int          theTrackID;        //Identification number of the primary
-                                  //particle
-  double       theTimeSlice;      //Time Slice Identification
-
-  int theUnitID;         //FP420 Unit Number
+  G4ThreeVector entry;       //Entry point
+  G4ThreeVector entrylp;     //Entry  local point
+  G4ThreeVector exitlp;      //Exit  local point
+  double elem;               //EnergyDeposit of EM particles
+  double hadr;               //EnergyDeposit of HD particles
+  double theIncidentEnergy;  //Energy of the primary particle
+  G4int theTrackID;          //Identification number of the primary
+                             //particle
+  double theTimeSlice;       //Time Slice Identification
+
+  int theUnitID;  //FP420 Unit Number
 
   float theX;
   float theY;
   float theZ;
-  float thePabs  ;
-    float theTof ;
-    float theEnergyLoss   ;
-    int theParticleType ;
-
-
-  float theThetaAtEntry ;
-    float thePhiAtEntry    ;
-
-    int theParentId;
-    float theVx;
-    float theVy;
-    float theVz;
-
-
+  float thePabs;
+  float theTof;
+  float theEnergyLoss;
+  int theParticleType;
+
+  float theThetaAtEntry;
+  float thePhiAtEntry;
+
+  int theParentId;
+  float theVx;
+  float theVy;
+  float theVz;
 };
 
 std::ostream& operator<<(std::ostream&, const FP420G4Hit&);
 
 #endif
-
diff --git a/SimG4CMS/FP420/interface/FP420G4HitCollection.h b/SimG4CMS/FP420/interface/FP420G4HitCollection.h
index 10cbf03a012cf..4d19f931d1046 100644
--- a/SimG4CMS/FP420/interface/FP420G4HitCollection.h
+++ b/SimG4CMS/FP420/interface/FP420G4HitCollection.h
@@ -15,4 +15,3 @@
 typedef G4THitsCollection<FP420G4Hit> FP420G4HitCollection;
 
 #endif
-
diff --git a/SimG4CMS/FP420/interface/FP420HitsObject.h b/SimG4CMS/FP420/interface/FP420HitsObject.h
index 0e2b5ab945ec0..f16e1a88c1458 100644
--- a/SimG4CMS/FP420/interface/FP420HitsObject.h
+++ b/SimG4CMS/FP420/interface/FP420HitsObject.h
@@ -3,16 +3,15 @@
 
 #include "SimDataFormats/SimHitMaker/interface/TrackingSlaveSD.h"
 
-class FP420HitsObject{
- public:
-  FP420HitsObject(std::string, TrackingSlaveSD::Collection &);
-  std::string name(){return _name;}
-  TrackingSlaveSD::Collection& hits(){return _hits;}
- private:
+class FP420HitsObject {
+public:
+  FP420HitsObject(std::string, TrackingSlaveSD::Collection&);
+  std::string name() { return _name; }
+  TrackingSlaveSD::Collection& hits() { return _hits; }
+
+private:
   TrackingSlaveSD::Collection& _hits;
   std::string _name;
-
 };
 
-
 #endif
diff --git a/SimG4CMS/FP420/interface/FP420NumberingScheme.h b/SimG4CMS/FP420/interface/FP420NumberingScheme.h
index 2a3b9513e20f4..b7fbdaff3af8f 100644
--- a/SimG4CMS/FP420/interface/FP420NumberingScheme.h
+++ b/SimG4CMS/FP420/interface/FP420NumberingScheme.h
@@ -14,117 +14,121 @@ class G4Step;
 class G4String;
 
 class FP420NumberingScheme {
-  
- public:
+public:
   FP420NumberingScheme();
   virtual ~FP420NumberingScheme();
-  
+
   virtual unsigned int getUnitID(const G4Step* aStep) const;
-  
+
   // Utilities to get detector levels during a step
-  virtual int  detectorLevel(const G4Step*) const;
+  virtual int detectorLevel(const G4Step*) const;
   virtual void detectorLevel(const G4Step*, int&, int*, G4String*) const;
-  
+
   //protected:
-  
+
   static unsigned int packFP420Index(int det, int zside, int station, int superplane);
-  
-  static void unpackFP420Index(const unsigned int& idx, int& det, int& zside, int& station,int& superplane);
-  
+
+  static void unpackFP420Index(const unsigned int& idx, int& det, int& zside, int& station, int& superplane);
 
   //  private:
   //
   ////////////  static UserVerbosity cout;
-  // int sn0, pn0, rn0;   
-  
-  static unsigned packMYIndex(int rn0, int pn0, int sn0, 
-		       int det, int zside, int sector,int zmodule) {
-    int zScale=(rn0-1); // rn0=3 - current --> for update  rn0=7
-    int sScale = zScale*(pn0-1);//pn0=6
-    int dScale = sScale*(sn0-1);//sn0=3
-    
-    unsigned int intindex = dScale*(det - 1)+sScale*(sector - 1)+zScale*(zmodule - 1)+zside;
+  // int sn0, pn0, rn0;
+
+  static unsigned packMYIndex(int rn0, int pn0, int sn0, int det, int zside, int sector, int zmodule) {
+    int zScale = (rn0 - 1);           // rn0=3 - current --> for update  rn0=7
+    int sScale = zScale * (pn0 - 1);  //pn0=6
+    int dScale = sScale * (sn0 - 1);  //sn0=3
+
+    unsigned int intindex = dScale * (det - 1) + sScale * (sector - 1) + zScale * (zmodule - 1) + zside;
     //
     return intindex;
   }
-  
-  static void unpackMYIndex(const int& idx,    
-		     int rn0, int pn0, int sn0,
-		     int& det, int& zside, int& sector,int& zmodule) {
-    int zScale=(rn0-1), sScale = (rn0-1)*(pn0-1), dScale = (rn0-1)*(pn0-1)*(sn0-1);
-    
-    det = (idx-1)/dScale + 1;
-    sector = (idx-1- dScale*(det - 1))/sScale + 1;
-    zmodule = (idx-1- dScale*(det - 1)- sScale*(sector - 1) )/ zScale + 1;
-    zside = idx - dScale*(det - 1) - sScale*(sector - 1) - zScale*(zmodule - 1);
+
+  static void unpackMYIndex(const int& idx, int rn0, int pn0, int sn0, int& det, int& zside, int& sector, int& zmodule) {
+    int zScale = (rn0 - 1), sScale = (rn0 - 1) * (pn0 - 1), dScale = (rn0 - 1) * (pn0 - 1) * (sn0 - 1);
+
+    det = (idx - 1) / dScale + 1;
+    sector = (idx - 1 - dScale * (det - 1)) / sScale + 1;
+    zmodule = (idx - 1 - dScale * (det - 1) - sScale * (sector - 1)) / zScale + 1;
+    zside = idx - dScale * (det - 1) - sScale * (sector - 1) - zScale * (zmodule - 1);
   }
-  
-  static int unpackLayerIndex(int rn0, int zside){
+
+  static int unpackLayerIndex(int rn0, int zside) {
     // 1,2
     int layerIndex = 1, b;
-    float a = (zside+1)/2.;
+    float a = (zside + 1) / 2.;
     b = (int)a;
-    if(a-b != 0.) layerIndex = 2;
+    if (a - b != 0.)
+      layerIndex = 2;
     //
-    if(zside>(rn0-1) || zside<1) layerIndex = 0; 
+    if (zside > (rn0 - 1) || zside < 1)
+      layerIndex = 0;
     return layerIndex;
   }
-  
-  static int unpackCopyIndex(int rn0, int zside){
+
+  static int unpackCopyIndex(int rn0, int zside) {
     // 1,2,3
     int copyIndex = 0;
-    if(zside>(rn0-1) || zside<1) {
-    }
-    else {
+    if (zside > (rn0 - 1) || zside < 1) {
+    } else {
       int layerIndex = 1, b;
-      float a = (zside+1)/2.;
+      float a = (zside + 1) / 2.;
       b = (int)a;
-      if(a-b != 0.) layerIndex = 2;
-      if(layerIndex==2) copyIndex = zside/2;
-      if(layerIndex==1) copyIndex = (zside+1)/2;
+      if (a - b != 0.)
+        layerIndex = 2;
+      if (layerIndex == 2)
+        copyIndex = zside / 2;
+      if (layerIndex == 1)
+        copyIndex = (zside + 1) / 2;
     }
-    
+
     return copyIndex;
   }
-  
-  static int unpackOrientation(int rn0, int zside){
+
+  static int unpackOrientation(int rn0, int zside) {
     // Front: Orientation= 1; Back: Orientation= 2
     int Orientation = 2;
-    if(zside>(rn0-1) || zside<1) Orientation = 0; 
-    if(zside==1 || zside==2) Orientation = 1; 
+    if (zside > (rn0 - 1) || zside < 1)
+      Orientation = 0;
+    if (zside == 1 || zside == 2)
+      Orientation = 1;
     //
     return Orientation;
   }
-  
-  static int realzside(int rn0, int zsideinorder){
+
+  static int realzside(int rn0, int zsideinorder) {
     // zsideinorder:1 2 3 4 5 6
-    //sensorsold    1 0 0 2 0 0 
+    //sensorsold    1 0 0 2 0 0
     //sensorsnew    1 0 5 2 4 0 ???
-    //sensorsnew    1 3 0 2 0 6 
+    //sensorsnew    1 3 0 2 0 6
     //zside         1 3 5 2 4 6  over layers 1 and 2
-    int  zside,zsidereal;
-    if(zsideinorder<0) {zside = 0;}
-    else if(zsideinorder<4) {zside = 2*zsideinorder-1;}
-    else if(zsideinorder<7) {zside = 2*zsideinorder-6;}
-    else{zside = 0;}
-    zsidereal=zside;
+    int zside, zsidereal;
+    if (zsideinorder < 0) {
+      zside = 0;
+    } else if (zsideinorder < 4) {
+      zside = 2 * zsideinorder - 1;
+    } else if (zsideinorder < 7) {
+      zside = 2 * zsideinorder - 6;
+    } else {
+      zside = 0;
+    }
+    zsidereal = zside;
     //
     //old:
-    if(rn0==3){
-      if(zside>2) zsidereal=0;
+    if (rn0 == 3) {
+      if (zside > 2)
+        zsidereal = 0;
     }
     //new:
-    if(rn0==7){
+    if (rn0 == 7) {
       //    if(zside==3 || zside==6) zsidereal=0; // ????
-      if(zside==4 || zside==5) zsidereal=0;
+      if (zside == 4 || zside == 5)
+        zsidereal = 0;
     }
     //
     return zsidereal;
   }
-  
-  
-  
 };
 
-
 #endif
diff --git a/SimG4CMS/FP420/interface/FP420SD.h b/SimG4CMS/FP420/interface/FP420SD.h
index 75a70c4639746..b1ebc9c09e8cc 100644
--- a/SimG4CMS/FP420/interface/FP420SD.h
+++ b/SimG4CMS/FP420/interface/FP420SD.h
@@ -18,14 +18,14 @@
 #include "SimG4CMS/FP420/interface/FP420G4Hit.h"
 #include "SimG4CMS/FP420/interface/FP420G4HitCollection.h"
 #include "SimG4CMS/FP420/interface/FP420NumberingScheme.h"
-  
+
 #include "G4Step.hh"
 #include "G4StepPoint.hh"
 #include "G4Track.hh"
 #include "G4VPhysicalVolume.hh"
 
 #include <string>
- 
+
 class TrackingSlaveSD;
 //AZ:
 class FrameRotation;
@@ -36,26 +36,26 @@ class UpdatablePSimHit;
 class G4ProcessTypeEnumerator;
 class G4TrackToParticleID;
 
-
 //-------------------------------------------------------------------
 
 class FP420SD : public SensitiveTkDetector,
-                public Observer<const BeginOfRun *>,
+                public Observer<const BeginOfRun*>,
                 public Observer<const BeginOfEvent*>,
                 public Observer<const EndOfEvent*> {
-
 public:
-  
-  FP420SD(const std::string&, const DDCompactView &, const SensitiveDetectorCatalog &,
-  	  edm::ParameterSet const &, const SimTrackManager* );
+  FP420SD(const std::string&,
+          const DDCompactView&,
+          const SensitiveDetectorCatalog&,
+          edm::ParameterSet const&,
+          const SimTrackManager*);
 
   ~FP420SD() override;
-  
-  bool ProcessHits(G4Step *,G4TouchableHistory *) override;
-  uint32_t  setDetUnitId(const G4Step*) override;
 
-  void Initialize(G4HCofThisEvent * HCE) override;
-  void EndOfEvent(G4HCofThisEvent * eventHC) override;
+  bool ProcessHits(G4Step*, G4TouchableHistory*) override;
+  uint32_t setDetUnitId(const G4Step*) override;
+
+  void Initialize(G4HCofThisEvent* HCE) override;
+  void EndOfEvent(G4HCofThisEvent* eventHC) override;
   void clear() override;
   void DrawAll() override;
   void PrintAll() override;
@@ -63,85 +63,78 @@ class FP420SD : public SensitiveTkDetector,
   virtual double getEnergyDeposit(G4Step* step);
   void fillHits(edm::PSimHitContainer&, const std::string&) override;
   void clearHits() override;
-  
- private:
-  void           update(const BeginOfRun *) override;
-  void           update(const BeginOfEvent *) override;
-  void           update(const ::EndOfEvent *) override;
-  
+
+private:
+  void update(const BeginOfRun*) override;
+  void update(const BeginOfEvent*) override;
+  void update(const ::EndOfEvent*) override;
+
   G4ThreeVector SetToLocal(const G4ThreeVector& global);
   G4ThreeVector SetToLocalExit(const G4ThreeVector& globalPoint);
-  void          GetStepInfo(G4Step* aStep);
-  G4bool        HitExists();
-  void          CreateNewHit();
-  void          UpdateHit();
-  void          StoreHit(FP420G4Hit*);
-  void          ResetForNewPrimary();
-  void          Summarize();
-    
- private:
-  
+  void GetStepInfo(G4Step* aStep);
+  G4bool HitExists();
+  void CreateNewHit();
+  void UpdateHit();
+  void StoreHit(FP420G4Hit*);
+  void ResetForNewPrimary();
+  void Summarize();
+
+private:
   //AZ:
   TrackingSlaveSD* slave;
-  FP420NumberingScheme * numberingScheme;
-  
+  FP420NumberingScheme* numberingScheme;
+
   G4ThreeVector entrancePoint, exitPoint;
-  G4ThreeVector theEntryPoint ;
-  G4ThreeVector theExitPoint  ;
-
-  float                incidentEnergy;
-  
-  G4int                    hcID;
-  FP420G4HitCollection*       theHC; 
-  const SimTrackManager*      theManager;
- 
-  G4int                    tsID; 
-  FP420G4Hit*               currentHit;
-  G4Track*                 theTrack;
-  G4VPhysicalVolume*         currentPV;
+  G4ThreeVector theEntryPoint;
+  G4ThreeVector theExitPoint;
+
+  float incidentEnergy;
+
+  G4int hcID;
+  FP420G4HitCollection* theHC;
+  const SimTrackManager* theManager;
+
+  G4int tsID;
+  FP420G4Hit* currentHit;
+  G4Track* theTrack;
+  G4VPhysicalVolume* currentPV;
   // unsigned int         unitID, previousUnitID;
-  uint32_t             unitID, previousUnitID;
-  G4int                tSliceID; 
-  unsigned int                primaryID, primID  ; 
-  
-  G4double             tSlice;
-  
-  G4StepPoint*         preStepPoint; 
-  G4StepPoint*         postStepPoint; 
-  float                edeposit;
-  
-  G4ThreeVector        hitPoint;
-  G4ThreeVector        hitPointExit;
-  G4ThreeVector        hitPointLocal;
-  G4ThreeVector        hitPointLocalExit;
+  uint32_t unitID, previousUnitID;
+  G4int tSliceID;
+  unsigned int primaryID, primID;
+
+  G4double tSlice;
+
+  G4StepPoint* preStepPoint;
+  G4StepPoint* postStepPoint;
+  float edeposit;
+
+  G4ThreeVector hitPoint;
+  G4ThreeVector hitPointExit;
+  G4ThreeVector hitPointLocal;
+  G4ThreeVector hitPointLocalExit;
   float Pabs;
   float Tof;
-  float Eloss;	
-  short ParticleType; 
-  
+  float Eloss;
+  short ParticleType;
+
   float ThetaAtEntry;
   float PhiAtEntry;
-  
+
   int ParentId;
-  float Vx,Vy,Vz;
-  float X,Y,Z;
-  
-  
+  float Vx, Vy, Vz;
+  float X, Y, Z;
+
   //
   // Hist
   //
   int eventno;
-  
- protected:
-  
-  float                edepositEM, edepositHAD;
+
+protected:
+  float edepositEM, edepositHAD;
   G4int emPDG;
   G4int epPDG;
   G4int gammaPDG;
 };
 
-#endif // FP420SD_h
-
-
-
-
+#endif  // FP420SD_h
diff --git a/SimG4CMS/FP420/interface/FP420Test.h b/SimG4CMS/FP420/interface/FP420Test.h
index a428231ae4dc0..5defc1f9b52d4 100644
--- a/SimG4CMS/FP420/interface/FP420Test.h
+++ b/SimG4CMS/FP420/interface/FP420Test.h
@@ -2,7 +2,7 @@
 #define FP420Test_H
 
 // system include files
-#include<vector>
+#include <vector>
 #include <iostream>
 #include <memory>
 #include <string>
@@ -33,7 +33,7 @@
 #include "G4VTouchable.hh"
 #include <map>
 #include <cmath>
-#include <CLHEP/Random/Randomize.h> 
+#include <CLHEP/Random/Randomize.h>
 
 // ----------------------------------------------------------------
 // Includes needed for Root ntupling
@@ -51,40 +51,35 @@
 #include "TMath.h"
 #include "TF1.h"
 
-
 #include <TObjArray.h>
 #include <TObjString.h>
 #include <TNamed.h>
 
-
 class Fp420AnalysisHistManager : public TNamed {
-        public:
-
-                Fp420AnalysisHistManager(const TString& managername);
-                ~Fp420AnalysisHistManager() override;
-
-                TH1F* GetHisto(Int_t Number);
-                TH1F* GetHisto(const TObjString& histname);
-
-                TH2F* GetHisto2(Int_t Number);
-                TH2F* GetHisto2(const TObjString& histname);
-
-                void WriteToFile(const TString& fOutputFile,const TString& fRecreateFile);
+public:
+  Fp420AnalysisHistManager(const TString& managername);
+  ~Fp420AnalysisHistManager() override;
 
-        private:
+  TH1F* GetHisto(Int_t Number);
+  TH1F* GetHisto(const TObjString& histname);
 
-                void BookHistos();
-                void StoreWeights();
-                void HistInit(const char* name, const char* title, Int_t nbinsx, Axis_t xlow, Axis_t xup);
-                void HistInit(const char* name, const char* title, Int_t nbinsx, Axis_t xlow, Axis_t xup, Int_t nbinsy, Axis_t ylow, Axis_t yup);
+  TH2F* GetHisto2(Int_t Number);
+  TH2F* GetHisto2(const TObjString& histname);
 
-                const char* fTypeTitle;
-                TObjArray* fHistArray;
-                TObjArray* fHistNamesArray;
+  void WriteToFile(const TString& fOutputFile, const TString& fRecreateFile);
 
+private:
+  void BookHistos();
+  void StoreWeights();
+  void HistInit(const char* name, const char* title, Int_t nbinsx, Axis_t xlow, Axis_t xup);
+  void HistInit(
+      const char* name, const char* title, Int_t nbinsx, Axis_t xlow, Axis_t xup, Int_t nbinsy, Axis_t ylow, Axis_t yup);
+
+  const char* fTypeTitle;
+  TObjArray* fHistArray;
+  TObjArray* fHistNamesArray;
 };
 
-
 class FP420NumberingScheme;
 
 class BeginOfJob;
@@ -154,36 +149,33 @@ class ObserveStep : private Observer<const G4Step *>
     void update(const G4Step * step);
 };
 */
-		    //class FP420Test: public SimProducer,
+//class FP420Test: public SimProducer,
 class FP420Test : public SimWatcher,
-  public Observer<const BeginOfJob *>, 
-  public Observer<const BeginOfRun *>,
-  public Observer<const EndOfRun *>,
-  public Observer<const BeginOfEvent *>,
-  public Observer<const BeginOfTrack *>,
-  public Observer<const G4Step *>,
-  public Observer<const EndOfTrack *>,
-  public Observer<const EndOfEvent *>
-{
+                  public Observer<const BeginOfJob*>,
+                  public Observer<const BeginOfRun*>,
+                  public Observer<const EndOfRun*>,
+                  public Observer<const BeginOfEvent*>,
+                  public Observer<const BeginOfTrack*>,
+                  public Observer<const G4Step*>,
+                  public Observer<const EndOfTrack*>,
+                  public Observer<const EndOfEvent*> {
 public:
-  FP420Test(const edm::ParameterSet &p);
+  FP420Test(const edm::ParameterSet& p);
   ~FP420Test() override;
   //MyActions();
   //MyActions();
 private:
-
   // observer classes
-  void update(const BeginOfJob * run) override;
-  void update(const BeginOfRun * run) override;
-  void update(const EndOfRun * run) override;
-  void update(const BeginOfEvent * evt) override;
-  void update(const BeginOfTrack * trk) override;
-  void update(const G4Step * step) override;
-  void update(const EndOfTrack * trk) override;
-  void update(const EndOfEvent * evt) override;
+  void update(const BeginOfJob* run) override;
+  void update(const BeginOfRun* run) override;
+  void update(const EndOfRun* run) override;
+  void update(const BeginOfEvent* evt) override;
+  void update(const BeginOfTrack* trk) override;
+  void update(const G4Step* step) override;
+  void update(const EndOfTrack* trk) override;
+  void update(const EndOfEvent* evt) override;
 
 private:
-
   //UHB_Analysis* UserNtuples;
 
   int iev;
@@ -191,59 +183,46 @@ class FP420Test : public SimWatcher,
   G4double entot0, tracklength0;
 
 private:
-// Utilities to get detector levels during a step
-
-  int      detLevels(const G4VTouchable*) const;
-  G4String  detName(const G4VTouchable*, int, int) const;
-  void     detectorLevel(const G4VTouchable*, int&, int*, G4String*) const;
-
-
- double rinCalo, zinCalo;
- int    lastTrackID;
- int verbosity;
-
- // SumEnerDeposit - all deposited energy on all steps ;  SumStepl - length in steel !!!
- G4double      SumEnerDeposit, SumStepl, SumStepc;
- // numofpart - # particles produced along primary track
- int          numofpart;
- // last point of the primary track
- G4ThreeVector  lastpo;
-
-
- // z:
- double z1, z2, z3, z4, zD2, zD3; 
- int sn0, dn0, pn0, rn0;
- int rn00;
- double	ZSiDet, z420;
- double	ZGapLDet, ZBoundDet, ZSiStep, ZSiPlane, zinibeg;
- double	 zBlade, gapBlade;
+  // Utilities to get detector levels during a step
+
+  int detLevels(const G4VTouchable*) const;
+  G4String detName(const G4VTouchable*, int, int) const;
+  void detectorLevel(const G4VTouchable*, int&, int*, G4String*) const;
+
+  double rinCalo, zinCalo;
+  int lastTrackID;
+  int verbosity;
+
+  // SumEnerDeposit - all deposited energy on all steps ;  SumStepl - length in steel !!!
+  G4double SumEnerDeposit, SumStepl, SumStepc;
+  // numofpart - # particles produced along primary track
+  int numofpart;
+  // last point of the primary track
+  G4ThreeVector lastpo;
+
+  // z:
+  double z1, z2, z3, z4, zD2, zD3;
+  int sn0, dn0, pn0, rn0;
+  int rn00;
+  double ZSiDet, z420;
+  double ZGapLDet, ZBoundDet, ZSiStep, ZSiPlane, zinibeg;
+  double zBlade, gapBlade;
 
 private:
-
   Float_t fp420eventarray[1];
   TNtuple* fp420eventntuple;
   TFile fp420OutputFile;
   int whichevent;
 
   Fp420AnalysisHistManager* TheHistManager;  //Histogram Manager of the analysis
-  std::string fDataLabel;             // Data type label
-  std::string fOutputFile;            // The output file name
-  std::string fRecreateFile;          // Recreate the file flag, default="RECREATE"
+  std::string fDataLabel;                    // Data type label
+  std::string fOutputFile;                   // The output file name
+  std::string fRecreateFile;                 // Recreate the file flag, default="RECREATE"
 
   //  //  //  //  //  //  TObjString fHistType;
-//   TString fDataLabel;             // Data type label
-//   TString fOutputFile;            // The output file name
-//   TString fRecreateFile;          // Recreate the file flag, default="RECREATE"
-
+  //   TString fDataLabel;             // Data type label
+  //   TString fOutputFile;            // The output file name
+  //   TString fRecreateFile;          // Recreate the file flag, default="RECREATE"
 };
 
 #endif
-
-
-
-
-
-
-
-
-
diff --git a/SimG4CMS/FP420/plugins/FP420SD.cc b/SimG4CMS/FP420/plugins/FP420SD.cc
index bff78486c8d23..4fca73817bb4d 100644
--- a/SimG4CMS/FP420/plugins/FP420SD.cc
+++ b/SimG4CMS/FP420/plugins/FP420SD.cc
@@ -2,9 +2,9 @@
 // File: FP420SD.cc
 // Date: 02.2006
 // Description: Sensitive Detector class for FP420
-// Modifications: 
+// Modifications:
 ///////////////////////////////////////////////////////////////////////////////
- 
+
 #include "SimG4Core/SensitiveDetector/interface/FrameRotation.h"
 #include "SimG4Core/Notification/interface/TrackInformation.h"
 #include "SimG4Core/Notification/interface/G4TrackToParticleID.h"
@@ -41,230 +41,218 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-
 //#define debug
 //-------------------------------------------------------------------
-FP420SD::FP420SD(const std::string& name, const DDCompactView & cpv,
-		 const SensitiveDetectorCatalog & clg,
-		 edm::ParameterSet const & p, const SimTrackManager* manager) :
-  SensitiveTkDetector(name, cpv, clg, p), numberingScheme(nullptr), 
-  hcID(-1), theHC(nullptr), theManager(manager), currentHit(nullptr), theTrack(nullptr), 
-  currentPV(nullptr), unitID(0),  previousUnitID(0), preStepPoint(nullptr), 
-  postStepPoint(nullptr), eventno(0){
-    
-    //Parameters
-      edm::ParameterSet m_p = p.getParameter<edm::ParameterSet>("FP420SD");
-       int verbn = m_p.getUntrackedParameter<int>("Verbosity");
-    //int verbn = 1;
-    
-    SetVerboseLevel(verbn);
-    
-    slave  = new TrackingSlaveSD(name);
-        
-    if      (name == "FP420SI") {
-      if (verbn > 0) {
-	edm::LogInfo("FP420Sim") << "name = FP420SI and  new FP420NumberingSchem";
-      }
-      numberingScheme = new FP420NumberingScheme() ;
-    } else {
-      edm::LogWarning("FP420Sim") << "FP420SD: ReadoutName not supported\n";
+FP420SD::FP420SD(const std::string& name,
+                 const DDCompactView& cpv,
+                 const SensitiveDetectorCatalog& clg,
+                 edm::ParameterSet const& p,
+                 const SimTrackManager* manager)
+    : SensitiveTkDetector(name, cpv, clg, p),
+      numberingScheme(nullptr),
+      hcID(-1),
+      theHC(nullptr),
+      theManager(manager),
+      currentHit(nullptr),
+      theTrack(nullptr),
+      currentPV(nullptr),
+      unitID(0),
+      previousUnitID(0),
+      preStepPoint(nullptr),
+      postStepPoint(nullptr),
+      eventno(0) {
+  //Parameters
+  edm::ParameterSet m_p = p.getParameter<edm::ParameterSet>("FP420SD");
+  int verbn = m_p.getUntrackedParameter<int>("Verbosity");
+  //int verbn = 1;
+
+  SetVerboseLevel(verbn);
+
+  slave = new TrackingSlaveSD(name);
+
+  if (name == "FP420SI") {
+    if (verbn > 0) {
+      edm::LogInfo("FP420Sim") << "name = FP420SI and  new FP420NumberingSchem";
     }
+    numberingScheme = new FP420NumberingScheme();
+  } else {
+    edm::LogWarning("FP420Sim") << "FP420SD: ReadoutName not supported\n";
+  }
 }
 
-FP420SD::~FP420SD() { 
-  delete slave; 
+FP420SD::~FP420SD() {
+  delete slave;
   delete numberingScheme;
 }
 
-double FP420SD::getEnergyDeposit(G4Step* aStep) {
-  return aStep->GetTotalEnergyDeposit();
-}
+double FP420SD::getEnergyDeposit(G4Step* aStep) { return aStep->GetTotalEnergyDeposit(); }
 
-void FP420SD::Initialize(G4HCofThisEvent * HCE) { 
+void FP420SD::Initialize(G4HCofThisEvent* HCE) {
 #ifdef debug
-    LogDebug("FP420Sim") << "FP420SD : Initialize called for " << name << std::endl;
+  LogDebug("FP420Sim") << "FP420SD : Initialize called for " << name << std::endl;
 #endif
 
-    theHC = new FP420G4HitCollection(GetName(), collectionName[0]);
-  if (hcID<0) 
+  theHC = new FP420G4HitCollection(GetName(), collectionName[0]);
+  if (hcID < 0)
     hcID = G4SDManager::GetSDMpointer()->GetCollectionID(collectionName[0]);
   HCE->AddHitsCollection(hcID, theHC);
 
-  tsID   = -2;
+  tsID = -2;
   //  primID = -2;
   primID = 0;
 
   ////    slave->Initialize();
 }
 
-
-bool FP420SD::ProcessHits(G4Step * aStep, G4TouchableHistory * ) {
-
+bool FP420SD::ProcessHits(G4Step* aStep, G4TouchableHistory*) {
   if (aStep == nullptr) {
     return true;
   } else {
     GetStepInfo(aStep);
-  //   LogDebug("FP420Sim") << edeposit <<std::endl;
+    //   LogDebug("FP420Sim") << edeposit <<std::endl;
 
     //AZ
 #ifdef debug
-  LogDebug("FP420Sim") << "FP420SD :  number of hits = " << theHC->entries() << std::endl;
+    LogDebug("FP420Sim") << "FP420SD :  number of hits = " << theHC->entries() << std::endl;
 #endif
 
-    if (HitExists() == false && edeposit>0. &&  theHC->entries()< 200 ){ 
+    if (HitExists() == false && edeposit > 0. && theHC->entries() < 200) {
       CreateNewHit();
-    return true;
+      return true;
     }
   }
-    return true;
-} 
+  return true;
+}
 
 void FP420SD::GetStepInfo(G4Step* aStep) {
-  
-  preStepPoint = aStep->GetPreStepPoint(); 
-  postStepPoint= aStep->GetPostStepPoint(); 
-  theTrack     = aStep->GetTrack();   
-  hitPoint     = preStepPoint->GetPosition();	
-  currentPV    = preStepPoint->GetPhysicalVolume();
-  hitPointExit = postStepPoint->GetPosition();	
+  preStepPoint = aStep->GetPreStepPoint();
+  postStepPoint = aStep->GetPostStepPoint();
+  theTrack = aStep->GetTrack();
+  hitPoint = preStepPoint->GetPosition();
+  currentPV = preStepPoint->GetPhysicalVolume();
+  hitPointExit = postStepPoint->GetPosition();
 
   hitPointLocal = preStepPoint->GetTouchable()->GetHistory()->GetTopTransform().TransformPoint(hitPoint);
   hitPointLocalExit = preStepPoint->GetTouchable()->GetHistory()->GetTopTransform().TransformPoint(hitPointExit);
 
-
   G4int particleCode = theTrack->GetDefinition()->GetPDGEncoding();
-  if (particleCode == emPDG ||
-      particleCode == epPDG ||
-      particleCode == gammaPDG ) {
-    edepositEM  = getEnergyDeposit(aStep); edepositHAD = 0.;
+  if (particleCode == emPDG || particleCode == epPDG || particleCode == gammaPDG) {
+    edepositEM = getEnergyDeposit(aStep);
+    edepositHAD = 0.;
   } else {
-    edepositEM  = 0.; edepositHAD = getEnergyDeposit(aStep);
+    edepositEM = 0.;
+    edepositHAD = getEnergyDeposit(aStep);
   }
   edeposit = aStep->GetTotalEnergyDeposit();
-  tSlice    = (postStepPoint->GetGlobalTime() )/nanosecond;
-  tSliceID  = (int) tSlice;
-  unitID    = setDetUnitId(aStep);
+  tSlice = (postStepPoint->GetGlobalTime()) / nanosecond;
+  tSliceID = (int)tSlice;
+  unitID = setDetUnitId(aStep);
 #ifdef debug
-  LogDebug("FP420Sim") << "unitID=" << unitID <<std::endl;
+  LogDebug("FP420Sim") << "unitID=" << unitID << std::endl;
 #endif
-  primaryID    = theTrack->GetTrackID();
+  primaryID = theTrack->GetTrackID();
   //  Position     = hitPoint;
-  Pabs         = aStep->GetPreStepPoint()->GetMomentum().mag()/GeV;
+  Pabs = aStep->GetPreStepPoint()->GetMomentum().mag() / GeV;
   //Tof          = 1400. + aStep->GetPostStepPoint()->GetGlobalTime()/nanosecond;
-  Tof          = aStep->GetPostStepPoint()->GetGlobalTime()/nanosecond;
-  Eloss        = aStep->GetTotalEnergyDeposit()/GeV;
-  ParticleType = theTrack->GetDefinition()->GetPDGEncoding();      
-  ThetaAtEntry = aStep->GetPreStepPoint()->GetPosition().theta()/deg;
-  PhiAtEntry   = aStep->GetPreStepPoint()->GetPosition().phi()/deg;
+  Tof = aStep->GetPostStepPoint()->GetGlobalTime() / nanosecond;
+  Eloss = aStep->GetTotalEnergyDeposit() / GeV;
+  ParticleType = theTrack->GetDefinition()->GetPDGEncoding();
+  ThetaAtEntry = aStep->GetPreStepPoint()->GetPosition().theta() / deg;
+  PhiAtEntry = aStep->GetPreStepPoint()->GetPosition().phi() / deg;
 
   ParentId = theTrack->GetParentID();
   Vx = theTrack->GetVertexPosition().x();
   Vy = theTrack->GetVertexPosition().y();
   Vz = theTrack->GetVertexPosition().z();
-  X  = hitPoint.x();
-  Y  = hitPoint.y();
-  Z  = hitPoint.z();
+  X = hitPoint.x();
+  Y = hitPoint.y();
+  Z = hitPoint.z();
 }
 
-uint32_t FP420SD::setDetUnitId(const G4Step * aStep) { 
-
+uint32_t FP420SD::setDetUnitId(const G4Step* aStep) {
   return (numberingScheme == nullptr ? 0 : numberingScheme->getUnitID(aStep));
 }
 
 G4bool FP420SD::HitExists() {
-  if (primaryID<1) {
-    edm::LogWarning("FP420Sim") << "***** FP420SD error: primaryID = " 
-				  << primaryID
-				  << " maybe detector name changed";
+  if (primaryID < 1) {
+    edm::LogWarning("FP420Sim") << "***** FP420SD error: primaryID = " << primaryID << " maybe detector name changed";
   }
 
-  // Update if in the same detector, time-slice and for same track   
+  // Update if in the same detector, time-slice and for same track
   //  if (primaryID == primID && tSliceID == tsID && unitID==previousUnitID) {
-  if (tSliceID == tsID && unitID==previousUnitID) {
-  //AZ:
+  if (tSliceID == tsID && unitID == previousUnitID) {
+    //AZ:
     UpdateHit();
     return true;
   }
   // Reset entry point for new primary
   if (primaryID != primID)
     ResetForNewPrimary();
-   
+
   //look in the HitContainer whether a hit with the same primID, unitID,
   //tSliceID already exists:
-   
+
   G4bool found = false;
 
   //    LogDebug("FP420Sim") << "FP420SD: HCollection=  " << theHC->entries()    <<std::endl;
-  
-  for (int j=0; j<theHC->entries()&&!found; j++) {
+
+  for (int j = 0; j < theHC->entries() && !found; j++) {
     FP420G4Hit* aPreviousHit = (*theHC)[j];
-    if (aPreviousHit->getTrackID()     == primaryID &&
-	aPreviousHit->getTimeSliceID() == tSliceID  &&
-	aPreviousHit->getUnitID()      == unitID       ) {
-  //AZ:
+    if (aPreviousHit->getTrackID() == primaryID && aPreviousHit->getTimeSliceID() == tSliceID &&
+        aPreviousHit->getUnitID() == unitID) {
+      //AZ:
       currentHit = aPreviousHit;
-      found      = true;
+      found = true;
     }
-  }          
+  }
 
   if (found) {
-  //AZ:
+    //AZ:
     UpdateHit();
     return true;
   } else {
     return false;
-  }    
+  }
 }
 
-
 void FP420SD::ResetForNewPrimary() {
-  
-  entrancePoint  = SetToLocal(hitPoint);
-  exitPoint      = SetToLocalExit(hitPointExit);
+  entrancePoint = SetToLocal(hitPoint);
+  exitPoint = SetToLocalExit(hitPointExit);
   incidentEnergy = preStepPoint->GetKineticEnergy();
-
 }
 
-
-void FP420SD::StoreHit(FP420G4Hit* hit){
-
+void FP420SD::StoreHit(FP420G4Hit* hit) {
   //  if (primID<0) return;
-  if (hit == nullptr ) {
+  if (hit == nullptr) {
     edm::LogWarning("FP420Sim") << "FP420SD: hit to be stored is NULL !!";
     return;
   }
 
-  theHC->insert( hit );
+  theHC->insert(hit);
 }
 
-
 void FP420SD::CreateNewHit() {
-
 #ifdef debug
   //       << " MVid = " << currentPV->GetMother()->GetCopyNo()
   LogDebug("FP420Sim") << "FP420SD CreateNewHit for"
-       << " PV "     << currentPV->GetName()
-       << " PVid = " << currentPV->GetCopyNo()
-       << " Unit "   << unitID <<std::endl;
-  LogDebug("FP420Sim") << " primary "    << primaryID
-       << " time slice " << tSliceID 
-       << " For Track  " << theTrack->GetTrackID()
-       << " which is a " << theTrack->GetDefinition()->GetParticleName();
-	   
-  if (theTrack->GetTrackID()==1) {
-    LogDebug("FP420Sim") << " of energy "     << theTrack->GetTotalEnergy();
+                       << " PV " << currentPV->GetName() << " PVid = " << currentPV->GetCopyNo() << " Unit " << unitID
+                       << std::endl;
+  LogDebug("FP420Sim") << " primary " << primaryID << " time slice " << tSliceID << " For Track  "
+                       << theTrack->GetTrackID() << " which is a " << theTrack->GetDefinition()->GetParticleName();
+
+  if (theTrack->GetTrackID() == 1) {
+    LogDebug("FP420Sim") << " of energy " << theTrack->GetTotalEnergy();
   } else {
     LogDebug("FP420Sim") << " daughter of part. " << theTrack->GetParentID();
   }
 
-  LogDebug("FP420Sim")  << " and created by " ;
-  if (theTrack->GetCreatorProcess()!=NULL)
-    LogDebug("FP420Sim") << theTrack->GetCreatorProcess()->GetProcessName() ;
-  else 
+  LogDebug("FP420Sim") << " and created by ";
+  if (theTrack->GetCreatorProcess() != NULL)
+    LogDebug("FP420Sim") << theTrack->GetCreatorProcess()->GetProcessName();
+  else
     LogDebug("FP420Sim") << "NO process";
   LogDebug("FP420Sim") << std::endl;
-#endif          
-    
+#endif
 
   currentHit = new FP420G4Hit;
   currentHit->setTrackID(primaryID);
@@ -279,7 +267,7 @@ void FP420SD::CreateNewHit() {
   currentHit->setThetaAtEntry(ThetaAtEntry);
   currentHit->setPhiAtEntry(PhiAtEntry);
 
-// currentHit->setEntry(entrancePoint);
+  // currentHit->setEntry(entrancePoint);
   currentHit->setEntry(hitPoint);
 
   currentHit->setEntryLocalP(hitPointLocal);
@@ -296,109 +284,97 @@ void FP420SD::CreateNewHit() {
   //AZ:12.10.2007
   //  UpdateHit();
   // buffer for next steps:
-  tsID           = tSliceID;
-  primID         = primaryID;
+  tsID = tSliceID;
+  primID = primaryID;
   previousUnitID = unitID;
-  
+
   StoreHit(currentHit);
-}	 
- 
+}
 
 void FP420SD::UpdateHit() {
   //
   if (Eloss > 0.) {
-  currentHit->addEnergyDeposit(edepositEM,edepositHAD);
+    currentHit->addEnergyDeposit(edepositEM, edepositHAD);
 
 #ifdef debug
-    LogDebug("FP420Sim") << "updateHit: add eloss " << Eloss <<std::endl;
-    LogDebug("FP420Sim") << "CurrentHit=" << currentHit
-         << ", PostStepPoint=" << postStepPoint->GetPosition() << std::endl;
+    LogDebug("FP420Sim") << "updateHit: add eloss " << Eloss << std::endl;
+    LogDebug("FP420Sim") << "CurrentHit=" << currentHit << ", PostStepPoint=" << postStepPoint->GetPosition()
+                         << std::endl;
 #endif
     //AZ
     //   currentHit->setEnergyLoss(Eloss);
-        currentHit->addEnergyLoss(Eloss);
-  }  
-
-
+    currentHit->addEnergyLoss(Eloss);
+  }
 
   // buffer for next steps:
-  tsID           = tSliceID;
-  primID         = primaryID;
+  tsID = tSliceID;
+  primID = primaryID;
   previousUnitID = unitID;
 }
 
-
-G4ThreeVector FP420SD::SetToLocal(const G4ThreeVector& global){
-
-  const G4VTouchable* touch= preStepPoint->GetTouchable();
+G4ThreeVector FP420SD::SetToLocal(const G4ThreeVector& global) {
+  const G4VTouchable* touch = preStepPoint->GetTouchable();
   theEntryPoint = touch->GetHistory()->GetTopTransform().TransformPoint(global);
-  return theEntryPoint;  
+  return theEntryPoint;
 }
-     
-
-G4ThreeVector FP420SD::SetToLocalExit(const G4ThreeVector& globalPoint){
 
-  const G4VTouchable* touch= postStepPoint->GetTouchable();
+G4ThreeVector FP420SD::SetToLocalExit(const G4ThreeVector& globalPoint) {
+  const G4VTouchable* touch = postStepPoint->GetTouchable();
   theExitPoint = touch->GetHistory()->GetTopTransform().TransformPoint(globalPoint);
-  return theExitPoint;  
+  return theExitPoint;
 }
-     
 
-void FP420SD::EndOfEvent(G4HCofThisEvent* ) {
-  
+void FP420SD::EndOfEvent(G4HCofThisEvent*) {
   // here we loop over transient hits and make them persistent
-  
+
   //  if(theHC->entries() > 100){
   //    LogDebug("FP420Sim") << "FP420SD: warning!!! Number of hits exceed 100 and =" << theHC->entries() << "\n";
   //  }
   //  for (int j=0; j<theHC->entries() && j<100; j++) {
-  int nhitsHPS240=0;
-  int nhitsFP420=0;
-  for (int j=0; j<theHC->entries(); j++) {
+  int nhitsHPS240 = 0;
+  int nhitsFP420 = 0;
+  for (int j = 0; j < theHC->entries(); j++) {
     FP420G4Hit* aHit = (*theHC)[j];
-    if((fabs(aHit->getTof())> 780. && fabs(aHit->getTof())< 840.)) ++nhitsHPS240;
-    if((fabs(aHit->getTof())>1380. && fabs(aHit->getTof())<1450.)) ++nhitsFP420;
+    if ((fabs(aHit->getTof()) > 780. && fabs(aHit->getTof()) < 840.))
+      ++nhitsHPS240;
+    if ((fabs(aHit->getTof()) > 1380. && fabs(aHit->getTof()) < 1450.))
+      ++nhitsFP420;
     //    if(fabs(aHit->getTof()) < 1700.) {
-    if((fabs(aHit->getTof())>780. && fabs(aHit->getTof())<840. && nhitsHPS240<200.) || ( fabs(aHit->getTof())>1380. && fabs(aHit->getTof())<1450. && nhitsFP420<200.)) {
-      
-      
+    if ((fabs(aHit->getTof()) > 780. && fabs(aHit->getTof()) < 840. && nhitsHPS240 < 200.) ||
+        (fabs(aHit->getTof()) > 1380. && fabs(aHit->getTof()) < 1450. && nhitsFP420 < 200.)) {
 #ifdef ddebug
       //    LogDebug("FP420SD") << " FP420Hit " << j << " " << *aHit << std::endl;
-      LogDebug("FP420Sim") << "hit number" << j << "unit ID = "<<aHit->getUnitID()<< "\n";
-      LogDebug("FP420Sim") << "entry z " << aHit->getEntry().z()<< "\n";
-      LogDebug("FP420Sim") << "entr theta " << aHit->getThetaAtEntry()<< "\n";
+      LogDebug("FP420Sim") << "hit number" << j << "unit ID = " << aHit->getUnitID() << "\n";
+      LogDebug("FP420Sim") << "entry z " << aHit->getEntry().z() << "\n";
+      LogDebug("FP420Sim") << "entr theta " << aHit->getThetaAtEntry() << "\n";
 #endif
-      
+
       //    Local3DPoint locExitPoint(0,0,0);
       //  Local3DPoint locEntryPoint(aHit->getEntry().x(),
       //	 aHit->getEntry().y(),
       //	 aHit->getEntry().z());
-      Local3DPoint locExitPoint(aHit->getExitLocalP().x(),
-				aHit->getExitLocalP().y(),
-				aHit->getExitLocalP().z());
-      Local3DPoint locEntryPoint(aHit->getEntryLocalP().x(),
-				 aHit->getEntryLocalP().y(),
-				 aHit->getEntryLocalP().z());
+      Local3DPoint locExitPoint(aHit->getExitLocalP().x(), aHit->getExitLocalP().y(), aHit->getExitLocalP().z());
+      Local3DPoint locEntryPoint(aHit->getEntryLocalP().x(), aHit->getEntryLocalP().y(), aHit->getEntryLocalP().z());
       // implicit conversion (slicing) to PSimHit!!!
-      slave->processHits(PSimHit(locEntryPoint,locExitPoint,//entryPoint(), exitPoint()  Local3DPoint
-				 aHit->getPabs(),// pabs()  float
-				 aHit->getTof(), // tof() float
-				 aHit->getEnergyLoss(), // energyLoss() float
-				 aHit->getParticleType(),// particleType()   int
-				 aHit->getUnitID(), // detUnitId() unsigned int 
-				 aHit->getTrackID(),// trackId() unsigned int 
-				 aHit->getThetaAtEntry(),//  thetaAtEntry()   float
-				 aHit->getPhiAtEntry())); //  phiAtEntry()   float  
-      
-      //PSimHit( const Local3DPoint& entry, const Local3DPoint& exit, 
+      slave->processHits(PSimHit(locEntryPoint,
+                                 locExitPoint,             //entryPoint(), exitPoint()  Local3DPoint
+                                 aHit->getPabs(),          // pabs()  float
+                                 aHit->getTof(),           // tof() float
+                                 aHit->getEnergyLoss(),    // energyLoss() float
+                                 aHit->getParticleType(),  // particleType()   int
+                                 aHit->getUnitID(),        // detUnitId() unsigned int
+                                 aHit->getTrackID(),       // trackId() unsigned int
+                                 aHit->getThetaAtEntry(),  //  thetaAtEntry()   float
+                                 aHit->getPhiAtEntry()));  //  phiAtEntry()   float
+
+      //PSimHit( const Local3DPoint& entry, const Local3DPoint& exit,
       //	   float pabs, float tof, float eloss, int particleType,
       //	   unsigned int detId, unsigned int trackId,
       //	   float theta, float phi, unsigned short processType=0) :
-	
-      //  LocalVector direction = hit.exitPoint() - hit.entryPoint(); 
+
+      //  LocalVector direction = hit.exitPoint() - hit.entryPoint();
       //hit.energyLoss
-      
-      
+
       /*      
 	      aHit->getEM(),               -
 	      aHit->getHadr(),             -
@@ -415,30 +391,22 @@ void FP420SD::EndOfEvent(G4HCofThisEvent* ) {
 	      aHit->getVy(),  -
 	      aHit->getVz()));  -
       */
-    }//if Tof<1600. if nhits<100
-  } // for loop on hits
-  
-  Summarize();
-}
+    }  //if Tof<1600. if nhits<100
+  }    // for loop on hits
 
-
-void FP420SD::Summarize() {
+  Summarize();
 }
 
+void FP420SD::Summarize() {}
 
-void FP420SD::clear() {
-} 
-
-
-void FP420SD::DrawAll() {
-} 
+void FP420SD::clear() {}
 
+void FP420SD::DrawAll() {}
 
 void FP420SD::PrintAll() {
   LogDebug("FP420Sim") << "FP420SD: Collection " << theHC->GetName() << "\n";
   theHC->PrintAllHits();
-} 
-
+}
 
 //void FP420SD::SetNumberingScheme(FP420NumberingScheme* scheme){
 //
@@ -449,31 +417,28 @@ void FP420SD::PrintAll() {
 //}
 
 void FP420SD::fillHits(edm::PSimHitContainer& cc, const std::string& hname) {
-  if (slave->name() == hname) { cc=slave->hits(); }
+  if (slave->name() == hname) {
+    cc = slave->hits();
+  }
 }
 
-void FP420SD::update (const BeginOfEvent * i) {
-  LogDebug("ForwardSim") << " Dispatched BeginOfEvent for " << GetName()
-                       << " !" ;
-   clearHits();
-   eventno = (*i)()->GetEventID();
+void FP420SD::update(const BeginOfEvent* i) {
+  LogDebug("ForwardSim") << " Dispatched BeginOfEvent for " << GetName() << " !";
+  clearHits();
+  eventno = (*i)()->GetEventID();
 }
 
-void FP420SD::update(const BeginOfRun *) {
-
-  G4ParticleTable * theParticleTable = G4ParticleTable::GetParticleTable();
+void FP420SD::update(const BeginOfRun*) {
+  G4ParticleTable* theParticleTable = G4ParticleTable::GetParticleTable();
   G4String particleName;
-  emPDG = theParticleTable->FindParticle(particleName="e-")->GetPDGEncoding();
-  epPDG = theParticleTable->FindParticle(particleName="e+")->GetPDGEncoding();
-  gammaPDG = theParticleTable->FindParticle(particleName="gamma")->GetPDGEncoding();
-
+  emPDG = theParticleTable->FindParticle(particleName = "e-")->GetPDGEncoding();
+  epPDG = theParticleTable->FindParticle(particleName = "e+")->GetPDGEncoding();
+  gammaPDG = theParticleTable->FindParticle(particleName = "gamma")->GetPDGEncoding();
 }
 
-void FP420SD::update (const ::EndOfEvent*) {
-}
+void FP420SD::update(const ::EndOfEvent*) {}
 
-void FP420SD::clearHits(){
+void FP420SD::clearHits() {
   //AZ:
-    slave->Initialize();
+  slave->Initialize();
 }
-
diff --git a/SimG4CMS/FP420/plugins/FP420Test.cc b/SimG4CMS/FP420/plugins/FP420Test.cc
index 68dd17f8dfa01..3c4379dfad5ba 100644
--- a/SimG4CMS/FP420/plugins/FP420Test.cc
+++ b/SimG4CMS/FP420/plugins/FP420Test.cc
@@ -5,13 +5,13 @@
 #include <iostream>
 #include <iomanip>
 #include <cmath>
-#include<vector>
+#include <vector>
 //
 #include "SimG4Core/Notification/interface/BeginOfEvent.h"
 #include "SimG4Core/Notification/interface/EndOfEvent.h"
 #include "SimG4Core/Notification/interface/TrackWithHistory.h"
 #include "SimG4Core/Notification/interface/TrackInformation.h"
- 
+
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -33,7 +33,6 @@
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
 
-
 //================================================================
 // Root stuff
 
@@ -47,23 +46,21 @@ using namespace std;
 
 //UserVerbosity FP420Test::std::cout("FP420Test","info","FP420Test");
 
-enum ntfp420_elements {
-  ntfp420_evt
-};
+enum ntfp420_elements { ntfp420_evt };
 //================================================================
-FP420Test::FP420Test(const edm::ParameterSet &p){
+FP420Test::FP420Test(const edm::ParameterSet& p) {
   //constructor
   edm::ParameterSet m_Anal = p.getParameter<edm::ParameterSet>("FP420Test");
-    verbosity    = m_Anal.getParameter<int>("Verbosity");
+  verbosity = m_Anal.getParameter<int>("Verbosity");
   //verbosity    = 1;
 
-    fDataLabel  = m_Anal.getParameter<std::string>("FDataLabel");
-    fOutputFile = m_Anal.getParameter<std::string>("FOutputFile");
-    fRecreateFile = m_Anal.getParameter<std::string>("FRecreateFile");
-   
+  fDataLabel = m_Anal.getParameter<std::string>("FDataLabel");
+  fOutputFile = m_Anal.getParameter<std::string>("FOutputFile");
+  fRecreateFile = m_Anal.getParameter<std::string>("FRecreateFile");
+
   if (verbosity > 0) {
-   std::cout<<"============================================================================"<<std::endl;
-   std::cout << "FP420Testconstructor :: Initialized as observer"<< std::endl;
+    std::cout << "============================================================================" << std::endl;
+    std::cout << "FP420Testconstructor :: Initialized as observer" << std::endl;
   }
   // Initialization:
 
@@ -71,40 +68,40 @@ FP420Test::FP420Test(const edm::ParameterSet &p){
   sn0 = 3;
   rn00 = 7;
 
-  z420          = 420000.0; // mm
-  zD2           = 4000.0;  // mm
-  zD3           = 8000.0;  // mm
+  z420 = 420000.0;  // mm
+  zD2 = 4000.0;     // mm
+  zD3 = 8000.0;     // mm
   //
   zBlade = 5.00;
   gapBlade = 1.6;
   double gapSupplane = 1.6;
-  ZSiPlane=2*zBlade+gapBlade+gapSupplane;
-  
+  ZSiPlane = 2 * zBlade + gapBlade + gapSupplane;
+
   double ZKapton = 0.1;
-  ZSiStep=ZSiPlane+ZKapton;
-  
+  ZSiStep = ZSiPlane + ZKapton;
+
   double ZBoundDet = 0.020;
   double ZSiElectr = 0.250;
   double ZCeramDet = 0.500;
   //
   ZSiDet = 0.250;
-  ZGapLDet= zBlade/2-(ZSiDet+ZSiElectr+ZBoundDet+ZCeramDet/2);
+  ZGapLDet = zBlade / 2 - (ZSiDet + ZSiElectr + ZBoundDet + ZCeramDet / 2);
   //
-  //  ZSiStation = 5*(2*(5.+1.6)+0.1)+2*6.+1.0 =  79.5  
-  double ZSiStation = (pn0-1)*(2*(zBlade+gapBlade)+ZKapton)+2*6.+0.0;   // =  78.5  
+  //  ZSiStation = 5*(2*(5.+1.6)+0.1)+2*6.+1.0 =  79.5
+  double ZSiStation = (pn0 - 1) * (2 * (zBlade + gapBlade) + ZKapton) + 2 * 6. + 0.0;  // =  78.5
   // 11.=e1, 12.=e2 in zzzrectangle.xml
-  double eee1=11.;
-  double eee2=12.;
-  
-  zinibeg = (eee1-eee2)/2.;
-  
-  z1 = zinibeg + (ZSiStation+10.)/2 + z420; // z1 - right after 1st Station
-  z2 = z1+zD2;                       //z2 - right after middle Station
-  z3 = z1+zD3;                       //z3 - right after last   Station
-  z4 = z1+2*zD3;
+  double eee1 = 11.;
+  double eee2 = 12.;
+
+  zinibeg = (eee1 - eee2) / 2.;
+
+  z1 = zinibeg + (ZSiStation + 10.) / 2 + z420;  // z1 - right after 1st Station
+  z2 = z1 + zD2;                                 //z2 - right after middle Station
+  z3 = z1 + zD3;                                 //z3 - right after last   Station
+  z4 = z1 + 2 * zD3;
   //==================================
 
- fp420eventntuple = new TNtuple("NTfp420event","NTfp420event","evt");
+  fp420eventntuple = new TNtuple("NTfp420event", "NTfp420event", "evt");
 
   whichevent = 0;
 
@@ -112,17 +109,17 @@ FP420Test::FP420Test(const edm::ParameterSet &p){
   //       fOutputFile     = "TheAnlysis.root";
   //       fRecreateFile   = "RECREATE";
 
-        TheHistManager = new Fp420AnalysisHistManager(fDataLabel);
+  TheHistManager = new Fp420AnalysisHistManager(fDataLabel);
 
   if (verbosity > 0) {
-   std::cout << "FP420Test constructor :: Initialized Fp420AnalysisHistManager"<< std::endl;
+    std::cout << "FP420Test constructor :: Initialized Fp420AnalysisHistManager" << std::endl;
   }
 }
 
 FP420Test::~FP420Test() {
   //  delete UserNtuples;
 
-  TFile fp420OutputFile("newntfp420.root","RECREATE");
+  TFile fp420OutputFile("newntfp420.root", "RECREATE");
   std::cout << "FP420 output root file has been created";
   fp420eventntuple->Write();
   std::cout << ", written";
@@ -131,10 +128,10 @@ FP420Test::~FP420Test() {
   delete fp420eventntuple;
   std::cout << ", and deleted" << std::endl;
 
-        //------->while end
+  //------->while end
 
-        // Write histograms to file
-        TheHistManager->WriteToFile(fOutputFile,fRecreateFile);
+  // Write histograms to file
+  TheHistManager->WriteToFile(fOutputFile, fRecreateFile);
   if (verbosity > 0) {
     std::cout << std::endl << "FP420Test Destructor  -------->  End of FP420Test : " << std::endl;
   }
@@ -144,175 +141,157 @@ FP420Test::~FP420Test() {
 // Histoes:
 //-----------------------------------------------------------------------------
 
-Fp420AnalysisHistManager::Fp420AnalysisHistManager(const TString& managername)
-{
-        // The Constructor
-
-        fTypeTitle=managername;
-        fHistArray = new TObjArray();      // Array to store histos
-        fHistNamesArray = new TObjArray(); // Array to store histos's names
+Fp420AnalysisHistManager::Fp420AnalysisHistManager(const TString& managername) {
+  // The Constructor
 
-	TH1::AddDirectory(kFALSE);
-        BookHistos();
+  fTypeTitle = managername;
+  fHistArray = new TObjArray();       // Array to store histos
+  fHistNamesArray = new TObjArray();  // Array to store histos's names
 
-        fHistArray->Compress();            // Removes empty space
-        fHistNamesArray->Compress();
+  TH1::AddDirectory(kFALSE);
+  BookHistos();
 
-//      StoreWeights();                    // Store the weights
+  fHistArray->Compress();  // Removes empty space
+  fHistNamesArray->Compress();
 
+  //      StoreWeights();                    // Store the weights
 }
 //-----------------------------------------------------------------------------
 
-Fp420AnalysisHistManager::~Fp420AnalysisHistManager()
-{
-        // The Destructor
+Fp420AnalysisHistManager::~Fp420AnalysisHistManager() {
+  // The Destructor
 
-        if(fHistArray){
-                fHistArray->Delete();
-                delete fHistArray;
-        }
+  if (fHistArray) {
+    fHistArray->Delete();
+    delete fHistArray;
+  }
 
-        if(fHistNamesArray){
-                fHistNamesArray->Delete();
-                delete fHistNamesArray;
-        }
+  if (fHistNamesArray) {
+    fHistNamesArray->Delete();
+    delete fHistNamesArray;
+  }
 }
 //-----------------------------------------------------------------------------
 
-void Fp420AnalysisHistManager::BookHistos()
-{
+void Fp420AnalysisHistManager::BookHistos() {
   // at Start: (mm)
-    HistInit("PrimaryEta", "Primary Eta",   100,   9., 12. );
-    HistInit("PrimaryPhigrad", "Primary Phigrad",   100,   0.,360. );
-    HistInit("PrimaryTh", "Primary Th",   100,   0.,180. );
-    HistInit("PrimaryLastpoZ", "Primary Lastpo Z",   100, -200.,430000. );
-    HistInit("PrimaryLastpoX", "Primary Lastpo X Z<z4",   100, -30., 30. );
-    HistInit("PrimaryLastpoY", "Primary Lastpo Y Z<z4",   100, -30., 30. );
-    HistInit("XLastpoNumofpart", "Primary Lastpo X n>10",   100, -30., 30. );
-    HistInit("YLastpoNumofpart", "Primary Lastpo Y n>10",   100, -30., 30. );
-    HistInit("VtxX", "Vtx X",   100, -50., 50. );
-    HistInit("VtxY", "Vtx Y",   100, -50., 50. );
-    HistInit("VtxZ", "Vtx Z",   100, -200.,430000. );
-        // Book the histograms and add them to the array
-    HistInit("SumEDep", "This is sum Energy deposited",   100,   -1,   199.);
-    HistInit("TrackL", "This is TrackL",   100,   0.,   12000.);
-    HistInit("zHits", "z Hits all events",                100, 400000.,430000. );
-    HistInit("zHitsnoMI", "z Hits no MI",                 100, 400000.,430000. );
-    HistInit("zHitsTrLoLe", "z Hits TrLength bigger 8300",100, 400000.,430000. );
-    HistInit("NumberOfHits", "NumberOfHits",100, 0.,300. );
+  HistInit("PrimaryEta", "Primary Eta", 100, 9., 12.);
+  HistInit("PrimaryPhigrad", "Primary Phigrad", 100, 0., 360.);
+  HistInit("PrimaryTh", "Primary Th", 100, 0., 180.);
+  HistInit("PrimaryLastpoZ", "Primary Lastpo Z", 100, -200., 430000.);
+  HistInit("PrimaryLastpoX", "Primary Lastpo X Z<z4", 100, -30., 30.);
+  HistInit("PrimaryLastpoY", "Primary Lastpo Y Z<z4", 100, -30., 30.);
+  HistInit("XLastpoNumofpart", "Primary Lastpo X n>10", 100, -30., 30.);
+  HistInit("YLastpoNumofpart", "Primary Lastpo Y n>10", 100, -30., 30.);
+  HistInit("VtxX", "Vtx X", 100, -50., 50.);
+  HistInit("VtxY", "Vtx Y", 100, -50., 50.);
+  HistInit("VtxZ", "Vtx Z", 100, -200., 430000.);
+  // Book the histograms and add them to the array
+  HistInit("SumEDep", "This is sum Energy deposited", 100, -1, 199.);
+  HistInit("TrackL", "This is TrackL", 100, 0., 12000.);
+  HistInit("zHits", "z Hits all events", 100, 400000., 430000.);
+  HistInit("zHitsnoMI", "z Hits no MI", 100, 400000., 430000.);
+  HistInit("zHitsTrLoLe", "z Hits TrLength bigger 8300", 100, 400000., 430000.);
+  HistInit("NumberOfHits", "NumberOfHits", 100, 0., 300.);
 }
 
 //-----------------------------------------------------------------------------
 
-void Fp420AnalysisHistManager::WriteToFile(const TString& fOutputFile,const TString& fRecreateFile)
-{
+void Fp420AnalysisHistManager::WriteToFile(const TString& fOutputFile, const TString& fRecreateFile) {
+  //Write to file = fOutputFile
 
-        //Write to file = fOutputFile
+  std::cout << "================================================================" << std::endl;
+  std::cout << " Write this Analysis to File " << fOutputFile << std::endl;
+  std::cout << "================================================================" << std::endl;
 
-        std::cout <<"================================================================"<<std::endl;
-        std::cout <<" Write this Analysis to File "<<fOutputFile<<std::endl;
-        std::cout <<"================================================================"<<std::endl;
+  TFile* file = new TFile(fOutputFile, fRecreateFile);
 
-        TFile* file = new TFile(fOutputFile, fRecreateFile);
-
-        fHistArray->Write();
-        file->Close();
+  fHistArray->Write();
+  file->Close();
 }
 //-----------------------------------------------------------------------------
 
-void Fp420AnalysisHistManager::HistInit(const char* name, const char* title, Int_t nbinsx, Axis_t xlow, Axis_t xup)
-{
-        // Add histograms and histograms names to the array
-
-        char* newtitle = new char[strlen(title)+strlen(fTypeTitle)+5];
-        strcpy(newtitle,title);
-        strcat(newtitle," (");
-        strcat(newtitle,fTypeTitle);
-        strcat(newtitle,") ");
-        fHistArray->AddLast((new TH1F(name, newtitle, nbinsx, xlow, xup)));
-        fHistNamesArray->AddLast(new TObjString(name));
+void Fp420AnalysisHistManager::HistInit(const char* name, const char* title, Int_t nbinsx, Axis_t xlow, Axis_t xup) {
+  // Add histograms and histograms names to the array
 
+  char* newtitle = new char[strlen(title) + strlen(fTypeTitle) + 5];
+  strcpy(newtitle, title);
+  strcat(newtitle, " (");
+  strcat(newtitle, fTypeTitle);
+  strcat(newtitle, ") ");
+  fHistArray->AddLast((new TH1F(name, newtitle, nbinsx, xlow, xup)));
+  fHistNamesArray->AddLast(new TObjString(name));
 }
 //-----------------------------------------------------------------------------
 
-void Fp420AnalysisHistManager::HistInit(const char* name, const char* title, Int_t nbinsx, Axis_t xlow, Axis_t xup, Int_t nbinsy, Axis_t ylow, Axis_t yup)
-{
-        // Add histograms and histograms names to the array
-
-        char* newtitle = new char[strlen(title)+strlen(fTypeTitle)+5];
-        strcpy(newtitle,title);
-        strcat(newtitle," (");
-        strcat(newtitle,fTypeTitle);
-        strcat(newtitle,") ");
-        fHistArray->AddLast((new TH2F(name, newtitle, nbinsx, xlow, xup, nbinsy, ylow, yup)));
-        fHistNamesArray->AddLast(new TObjString(name));
-
+void Fp420AnalysisHistManager::HistInit(
+    const char* name, const char* title, Int_t nbinsx, Axis_t xlow, Axis_t xup, Int_t nbinsy, Axis_t ylow, Axis_t yup) {
+  // Add histograms and histograms names to the array
+
+  char* newtitle = new char[strlen(title) + strlen(fTypeTitle) + 5];
+  strcpy(newtitle, title);
+  strcat(newtitle, " (");
+  strcat(newtitle, fTypeTitle);
+  strcat(newtitle, ") ");
+  fHistArray->AddLast((new TH2F(name, newtitle, nbinsx, xlow, xup, nbinsy, ylow, yup)));
+  fHistNamesArray->AddLast(new TObjString(name));
 }
 //-----------------------------------------------------------------------------
 
-TH1F* Fp420AnalysisHistManager::GetHisto(Int_t Number)
-{
-        // Get a histogram from the array with index = Number
+TH1F* Fp420AnalysisHistManager::GetHisto(Int_t Number) {
+  // Get a histogram from the array with index = Number
 
-        if (Number <= fHistArray->GetLast()  && fHistArray->At(Number) != (TObject*)nullptr){
+  if (Number <= fHistArray->GetLast() && fHistArray->At(Number) != (TObject*)nullptr) {
+    return (TH1F*)(fHistArray->At(Number));
 
-                return (TH1F*)(fHistArray->At(Number));
-
-        }else{
-
-                std::cout << "!!!!!!!!!!!!!!!!!!GetHisto!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl;
-                std::cout << " WARNING ERROR - HIST ID INCORRECT (TOO HIGH) - " << Number << std::endl;
-                std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl;
+  } else {
+    std::cout << "!!!!!!!!!!!!!!!!!!GetHisto!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl;
+    std::cout << " WARNING ERROR - HIST ID INCORRECT (TOO HIGH) - " << Number << std::endl;
+    std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl;
 
-                return (TH1F*)(fHistArray->At(0));
-        }
+    return (TH1F*)(fHistArray->At(0));
+  }
 }
 //-----------------------------------------------------------------------------
 
-TH2F* Fp420AnalysisHistManager::GetHisto2(Int_t Number)
-{
-        // Get a histogram from the array with index = Number
-
-        if (Number <= fHistArray->GetLast()  && fHistArray->At(Number) != (TObject*)nullptr){
+TH2F* Fp420AnalysisHistManager::GetHisto2(Int_t Number) {
+  // Get a histogram from the array with index = Number
 
-                return (TH2F*)(fHistArray->At(Number));
+  if (Number <= fHistArray->GetLast() && fHistArray->At(Number) != (TObject*)nullptr) {
+    return (TH2F*)(fHistArray->At(Number));
 
-        }else{
-
-                std::cout << "!!!!!!!!!!!!!!!!GetHisto2!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl;
-                std::cout << " WARNING ERROR - HIST ID INCORRECT (TOO HIGH) - " << Number << std::endl;
-                std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl;
+  } else {
+    std::cout << "!!!!!!!!!!!!!!!!GetHisto2!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl;
+    std::cout << " WARNING ERROR - HIST ID INCORRECT (TOO HIGH) - " << Number << std::endl;
+    std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl;
 
-                return (TH2F*)(fHistArray->At(0));
-        }
+    return (TH2F*)(fHistArray->At(0));
+  }
 }
 //-----------------------------------------------------------------------------
 
-TH1F* Fp420AnalysisHistManager::GetHisto(const TObjString& histname)
-{
-        // Get a histogram from the array with name = histname
+TH1F* Fp420AnalysisHistManager::GetHisto(const TObjString& histname) {
+  // Get a histogram from the array with name = histname
 
-        Int_t index = fHistNamesArray->IndexOf(&histname);
-        return GetHisto(index);
+  Int_t index = fHistNamesArray->IndexOf(&histname);
+  return GetHisto(index);
 }
 //-----------------------------------------------------------------------------
 
-TH2F* Fp420AnalysisHistManager::GetHisto2(const TObjString& histname)
-{
-        // Get a histogram from the array with name = histname
+TH2F* Fp420AnalysisHistManager::GetHisto2(const TObjString& histname) {
+  // Get a histogram from the array with name = histname
 
-        Int_t index = fHistNamesArray->IndexOf(&histname);
-        return GetHisto2(index);
+  Int_t index = fHistNamesArray->IndexOf(&histname);
+  return GetHisto2(index);
 }
 //-----------------------------------------------------------------------------
 
-void Fp420AnalysisHistManager::StoreWeights()
-{
-        // Add structure to each histogram to store the weights
+void Fp420AnalysisHistManager::StoreWeights() {
+  // Add structure to each histogram to store the weights
 
-        for(int i = 0; i < fHistArray->GetEntries(); i++){
-                ((TH1F*)(fHistArray->At(i)))->Sumw2();
-        }
+  for (int i = 0; i < fHistArray->GetEntries(); i++) {
+    ((TH1F*)(fHistArray->At(i)))->Sumw2();
+  }
 }
 
 // Histoes end :
@@ -322,226 +301,225 @@ void Fp420AnalysisHistManager::StoreWeights()
 // using several observers
 
 //==================================================================== per JOB
-void FP420Test::update(const BeginOfJob * job) {
+void FP420Test::update(const BeginOfJob* job) {
   //job
-  std::cout<<"FP420Test:beggining of job"<<std::endl;;
+  std::cout << "FP420Test:beggining of job" << std::endl;
+  ;
 }
 
-
 //==================================================================== per RUN
-void FP420Test::update(const BeginOfRun * run) {
+void FP420Test::update(const BeginOfRun* run) {
   //run
 
- std::cout << std::endl << "FP420Test:: Begining of Run"<< std::endl; 
+  std::cout << std::endl << "FP420Test:: Begining of Run" << std::endl;
 }
 
-void FP420Test::update(const EndOfRun * run) {;}
+void FP420Test::update(const EndOfRun* run) { ; }
 
 //=================================================================== per EVENT
-void FP420Test::update(const BeginOfEvent * evt) {
+void FP420Test::update(const BeginOfEvent* evt) {
   iev = (*evt)()->GetEventID();
   if (verbosity > 0) {
-    std::cout <<"FP420Test:update Event number = " << iev << std::endl;
+    std::cout << "FP420Test:update Event number = " << iev << std::endl;
   }
   whichevent++;
 }
 
 //=================================================================== per Track
-void FP420Test::update(const BeginOfTrack * trk) {
+void FP420Test::update(const BeginOfTrack* trk) {
   itrk = (*trk)()->GetTrackID();
   if (verbosity > 1) {
-    std::cout <<"FP420Test:update BeginOfTrack number = " << itrk << std::endl;
+    std::cout << "FP420Test:update BeginOfTrack number = " << itrk << std::endl;
   }
-  if(itrk == 1) {
-     SumEnerDeposit = 0.;
-     numofpart = 0;
-     SumStepl = 0.;
-     SumStepc = 0.;
-     tracklength0 = 0.;
+  if (itrk == 1) {
+    SumEnerDeposit = 0.;
+    numofpart = 0;
+    SumStepl = 0.;
+    SumStepc = 0.;
+    tracklength0 = 0.;
   }
 }
 
 //=================================================================== per EndOfTrack
-void FP420Test::update(const EndOfTrack * trk) {
+void FP420Test::update(const EndOfTrack* trk) {
   itrk = (*trk)()->GetTrackID();
   if (verbosity > 1) {
-    std::cout <<"FP420Test:update EndOfTrack number = " << itrk << std::endl;
+    std::cout << "FP420Test:update EndOfTrack number = " << itrk << std::endl;
   }
-  if(itrk == 1) {
-  G4double tracklength  = (*trk)()->GetTrackLength();    // Accumulated track length
-
-       TheHistManager->GetHisto("SumEDep")->Fill(SumEnerDeposit);
-       TheHistManager->GetHisto("TrackL")->Fill(tracklength);
-
-      // direction !!!
-  G4ThreeVector   vert_mom  = (*trk)()->GetVertexMomentumDirection();
-  G4ThreeVector   vert_pos  = (*trk)()->GetVertexPosition(); // vertex ,where this track was created
-  
-//    float eta = 0.5 * log( (1.+vert_mom.z()) / (1.-vert_mom.z()) );
-//    float phi = atan2(vert_mom.y(),vert_mom.x());
-//    if (phi < 0.) phi += twopi;
-//    float phigrad = phi*180./pi;
-
-//      float XV = vert_pos.x(); // mm
-//      float YV = vert_pos.y(); // mm
-      //UserNtuples->fillg543(phigrad,1.);
-      //UserNtuples->fillp203(phigrad,SumStepl,1.);
-      //UserNtuples->fillg544(XV,1.);
-      //UserNtuples->fillp201(XV,SumStepl,1.);
-      //UserNtuples->fillg545(YV,1.);
-      //UserNtuples->fillp202(YV,SumStepl,1.);
+  if (itrk == 1) {
+    G4double tracklength = (*trk)()->GetTrackLength();  // Accumulated track length
+
+    TheHistManager->GetHisto("SumEDep")->Fill(SumEnerDeposit);
+    TheHistManager->GetHisto("TrackL")->Fill(tracklength);
+
+    // direction !!!
+    G4ThreeVector vert_mom = (*trk)()->GetVertexMomentumDirection();
+    G4ThreeVector vert_pos = (*trk)()->GetVertexPosition();  // vertex ,where this track was created
+
+    //    float eta = 0.5 * log( (1.+vert_mom.z()) / (1.-vert_mom.z()) );
+    //    float phi = atan2(vert_mom.y(),vert_mom.x());
+    //    if (phi < 0.) phi += twopi;
+    //    float phigrad = phi*180./pi;
+
+    //      float XV = vert_pos.x(); // mm
+    //      float YV = vert_pos.y(); // mm
+    //UserNtuples->fillg543(phigrad,1.);
+    //UserNtuples->fillp203(phigrad,SumStepl,1.);
+    //UserNtuples->fillg544(XV,1.);
+    //UserNtuples->fillp201(XV,SumStepl,1.);
+    //UserNtuples->fillg545(YV,1.);
+    //UserNtuples->fillp202(YV,SumStepl,1.);
 
     //UserNtuples->fillg524(eta,1.);
-  
-      //UserNtuples->fillg534(SumStepl,1.);
-      //UserNtuples->fillg535(eta,SumStepl);
-      //UserNtuples->fillp207(eta,SumStepl,1.);
-      //UserNtuples->filld217(eta,SumStepl,1.);
-      //UserNtuples->filld220(phigrad,SumStepl,1.);
-      //UserNtuples->filld221(XV,SumStepl,1.);
-      //UserNtuples->filld222(YV,SumStepl,1.);
-      //UserNtuples->fillg537(SumStepc,1.);
-      //UserNtuples->fillg84(SumStepl,1.);
-
-// MI = (multiple interactions):
-       if(tracklength < z4) {
-//        //UserNtuples->fillp208(eta,tracklength,1.);
-        //UserNtuples->filld218(eta,tracklength,1.);
-        //UserNtuples->fillg538(SumStepc,1.);
-	//UserNtuples->fillg85(SumStepl,1.);
-       }
-
-        // last step information
-        const G4Step* aStep = (*trk)()->GetStep();
-        //   G4int csn = (*trk)()->GetCurrentStepNumber();
-        //   G4double sl = (*trk)()->GetStepLength();
-         // preStep
-         G4StepPoint*      preStepPoint = aStep->GetPreStepPoint(); 
-         lastpo   = preStepPoint->GetPosition();	
-
-	 // Analysis:
-	 if(lastpo.z()<z1 && lastpo.perp()< 100.) {
-             //UserNtuples->fillg525(eta,1.);
-             //UserNtuples->fillg546(XV,1.);
-             //UserNtuples->fillg551(YV,1.);
-             //UserNtuples->fillg556(phigrad,1.);
-         }
-	 if((lastpo.z()>z1 && lastpo.z()<z2) && lastpo.perp()< 100.) {
-             //UserNtuples->fillg526(eta,1.);
-             //UserNtuples->fillg547(XV,1.);
-             //UserNtuples->fillg552(YV,1.);
-             //UserNtuples->fillg557(phigrad,1.);
-         }
-	 if(lastpo.z()<z2 && lastpo.perp()< 100.) {
-             //UserNtuples->fillg527(eta,1.);
-             //UserNtuples->fillg548(XV,1.);
-             //UserNtuples->fillg553(YV,1.);
-              //UserNtuples->fillg558(phigrad,1.);
-         //UserNtuples->fillg521(lastpo.x(),1.);
-         //UserNtuples->fillg522(lastpo.y(),1.);
-         //UserNtuples->fillg523(lastpo.z(),1.);
-        }
-	 if(lastpo.z()<z3 && lastpo.perp()< 100.) {
-             //UserNtuples->fillg528(eta,1.);
-             //UserNtuples->fillg549(XV,1.);
-             //UserNtuples->fillg554(YV,1.);
-             //UserNtuples->fillg559(phigrad,1.);
-         }
-	 if(lastpo.z()<z4 && lastpo.perp()< 100.) {
-             //UserNtuples->fillg529(eta,1.);
-             //UserNtuples->fillg550(XV,1.);
-             //UserNtuples->fillg555(YV,1.);
-             //UserNtuples->fillg560(phigrad,1.);
-         //UserNtuples->fillg531(lastpo.x(),1.);
-         //UserNtuples->fillg532(lastpo.y(),1.);
-         //UserNtuples->fillg533(lastpo.z(),1.);
-         }
+
+    //UserNtuples->fillg534(SumStepl,1.);
+    //UserNtuples->fillg535(eta,SumStepl);
+    //UserNtuples->fillp207(eta,SumStepl,1.);
+    //UserNtuples->filld217(eta,SumStepl,1.);
+    //UserNtuples->filld220(phigrad,SumStepl,1.);
+    //UserNtuples->filld221(XV,SumStepl,1.);
+    //UserNtuples->filld222(YV,SumStepl,1.);
+    //UserNtuples->fillg537(SumStepc,1.);
+    //UserNtuples->fillg84(SumStepl,1.);
+
+    // MI = (multiple interactions):
+    if (tracklength < z4) {
+      //        //UserNtuples->fillp208(eta,tracklength,1.);
+      //UserNtuples->filld218(eta,tracklength,1.);
+      //UserNtuples->fillg538(SumStepc,1.);
+      //UserNtuples->fillg85(SumStepl,1.);
+    }
+
+    // last step information
+    const G4Step* aStep = (*trk)()->GetStep();
+    //   G4int csn = (*trk)()->GetCurrentStepNumber();
+    //   G4double sl = (*trk)()->GetStepLength();
+    // preStep
+    G4StepPoint* preStepPoint = aStep->GetPreStepPoint();
+    lastpo = preStepPoint->GetPosition();
+
+    // Analysis:
+    if (lastpo.z() < z1 && lastpo.perp() < 100.) {
+      //UserNtuples->fillg525(eta,1.);
+      //UserNtuples->fillg546(XV,1.);
+      //UserNtuples->fillg551(YV,1.);
+      //UserNtuples->fillg556(phigrad,1.);
+    }
+    if ((lastpo.z() > z1 && lastpo.z() < z2) && lastpo.perp() < 100.) {
+      //UserNtuples->fillg526(eta,1.);
+      //UserNtuples->fillg547(XV,1.);
+      //UserNtuples->fillg552(YV,1.);
+      //UserNtuples->fillg557(phigrad,1.);
+    }
+    if (lastpo.z() < z2 && lastpo.perp() < 100.) {
+      //UserNtuples->fillg527(eta,1.);
+      //UserNtuples->fillg548(XV,1.);
+      //UserNtuples->fillg553(YV,1.);
+      //UserNtuples->fillg558(phigrad,1.);
+      //UserNtuples->fillg521(lastpo.x(),1.);
+      //UserNtuples->fillg522(lastpo.y(),1.);
+      //UserNtuples->fillg523(lastpo.z(),1.);
+    }
+    if (lastpo.z() < z3 && lastpo.perp() < 100.) {
+      //UserNtuples->fillg528(eta,1.);
+      //UserNtuples->fillg549(XV,1.);
+      //UserNtuples->fillg554(YV,1.);
+      //UserNtuples->fillg559(phigrad,1.);
+    }
+    if (lastpo.z() < z4 && lastpo.perp() < 100.) {
+      //UserNtuples->fillg529(eta,1.);
+      //UserNtuples->fillg550(XV,1.);
+      //UserNtuples->fillg555(YV,1.);
+      //UserNtuples->fillg560(phigrad,1.);
+      //UserNtuples->fillg531(lastpo.x(),1.);
+      //UserNtuples->fillg532(lastpo.y(),1.);
+      //UserNtuples->fillg533(lastpo.z(),1.);
+    }
   }
 }
 
 // ====================================================
 
 //=================================================================== each STEP
-void FP420Test::update(const G4Step * aStep) {
-// ==========================================================================
-  
+void FP420Test::update(const G4Step* aStep) {
+  // ==========================================================================
+
   if (verbosity > 2) {
-    G4int stepnumber  = aStep->GetTrack()->GetCurrentStepNumber();
-    std::cout <<"FP420Test:update Step number = " << stepnumber << std::endl;
+    G4int stepnumber = aStep->GetTrack()->GetCurrentStepNumber();
+    std::cout << "FP420Test:update Step number = " << stepnumber << std::endl;
   }
   // track on aStep:                                                                                         !
-  G4Track*     theTrack     = aStep->GetTrack();   
-  TrackInformation* trkInfo = dynamic_cast<TrackInformation*> (theTrack->GetUserInformation());
-   if (trkInfo == nullptr) {
-     std::cout << "FP420Test on aStep: No trk info !!!! abort " << std::endl;
-   } 
-  G4int         id             = theTrack->GetTrackID();
-  G4String       particleType   = theTrack->GetDefinition()->GetParticleName();   //   !!!
-  G4int         parentID       = theTrack->GetParentID();   //   !!!
-  G4TrackStatus   trackstatus    = theTrack->GetTrackStatus();   //   !!!
-  G4double       tracklength    = theTrack->GetTrackLength();    // Accumulated track length
-  G4ThreeVector   trackmom       = theTrack->GetMomentum();
-  G4double       entot          = theTrack->GetTotalEnergy();   //   !!! deposited on step
-  G4int         curstepnumber  = theTrack->GetCurrentStepNumber();
+  G4Track* theTrack = aStep->GetTrack();
+  TrackInformation* trkInfo = dynamic_cast<TrackInformation*>(theTrack->GetUserInformation());
+  if (trkInfo == nullptr) {
+    std::cout << "FP420Test on aStep: No trk info !!!! abort " << std::endl;
+  }
+  G4int id = theTrack->GetTrackID();
+  G4String particleType = theTrack->GetDefinition()->GetParticleName();  //   !!!
+  G4int parentID = theTrack->GetParentID();                              //   !!!
+  G4TrackStatus trackstatus = theTrack->GetTrackStatus();                //   !!!
+  G4double tracklength = theTrack->GetTrackLength();                     // Accumulated track length
+  G4ThreeVector trackmom = theTrack->GetMomentum();
+  G4double entot = theTrack->GetTotalEnergy();  //   !!! deposited on step
+  G4int curstepnumber = theTrack->GetCurrentStepNumber();
   // const G4ThreeVector&   vert_pos       = theTrack->GetVertexPosition(); // vertex ,where this track was created
   // const G4ThreeVector&   vert_mom       = theTrack->GetVertexMomentumDirection();
-  
-//   double costheta =vert_mom.z()/sqrt(vert_mom.x()*vert_mom.x()+vert_mom.y()*vert_mom.y()+vert_mom.z()*vert_mom.z());
-//   double theta = acos(min(max(costheta,double(-1.)),double(1.)));
-//  float eta = -log(tan(theta/2));
-//   double phi = -1000.;
-//   if (vert_mom.x() != 0) phi = atan2(vert_mom.y(),vert_mom.x()); 
-//   if (phi < 0.) phi += twopi;
-//   double phigrad = phi*360./twopi;  
 
-//G4double       trackvel       = theTrack->GetVelocity();
+  //   double costheta =vert_mom.z()/sqrt(vert_mom.x()*vert_mom.x()+vert_mom.y()*vert_mom.y()+vert_mom.z()*vert_mom.z());
+  //   double theta = acos(min(max(costheta,double(-1.)),double(1.)));
+  //  float eta = -log(tan(theta/2));
+  //   double phi = -1000.;
+  //   if (vert_mom.x() != 0) phi = atan2(vert_mom.y(),vert_mom.x());
+  //   if (phi < 0.) phi += twopi;
+  //   double phigrad = phi*360./twopi;
 
-//std::cout << " trackstatus= " << trackstatus << " entot= " << entot  << std::endl;
+  //G4double       trackvel       = theTrack->GetVelocity();
 
+  //std::cout << " trackstatus= " << trackstatus << " entot= " << entot  << std::endl;
 
   // step points:                                                                                         !
-  G4double        stepl         = aStep->GetStepLength();
-  G4double        EnerDeposit   = aStep->GetTotalEnergyDeposit();
+  G4double stepl = aStep->GetStepLength();
+  G4double EnerDeposit = aStep->GetTotalEnergyDeposit();
   // pointers:                                                                                         !
-//G4VPhysicalVolume*  physvol       = theTrack->GetVolume();
-//G4VPhysicalVolume*  nextphysvol   = theTrack->GetNextVolume();
-//G4Material*       materialtr     = theTrack->GetMaterial();
-//G4Material*       nextmaterialtr = theTrack->GetNextMaterial();
+  //G4VPhysicalVolume*  physvol       = theTrack->GetVolume();
+  //G4VPhysicalVolume*  nextphysvol   = theTrack->GetNextVolume();
+  //G4Material*       materialtr     = theTrack->GetMaterial();
+  //G4Material*       nextmaterialtr = theTrack->GetNextMaterial();
 
   // preStep
-  G4StepPoint*      preStepPoint = aStep->GetPreStepPoint(); 
-  const G4ThreeVector&     preposition   = preStepPoint->GetPosition();	
-  G4ThreeVector     prelocalpoint = theTrack->GetTouchable()->GetHistory()->
-                                           GetTopTransform().TransformPoint(preposition);
-  G4VPhysicalVolume* currentPV     = preStepPoint->GetPhysicalVolume();
-  const G4String&         prename       = currentPV->GetName();
-
-  const G4VTouchable*  pre_touch    = preStepPoint->GetTouchable();
-  int          pre_levels   = detLevels(pre_touch);
-
-  G4String name1[20]; int copyno1[20];
-  for(int i=0; i<20; ++i) {
-    name1[i]   = "";
+  G4StepPoint* preStepPoint = aStep->GetPreStepPoint();
+  const G4ThreeVector& preposition = preStepPoint->GetPosition();
+  G4ThreeVector prelocalpoint = theTrack->GetTouchable()->GetHistory()->GetTopTransform().TransformPoint(preposition);
+  G4VPhysicalVolume* currentPV = preStepPoint->GetPhysicalVolume();
+  const G4String& prename = currentPV->GetName();
+
+  const G4VTouchable* pre_touch = preStepPoint->GetTouchable();
+  int pre_levels = detLevels(pre_touch);
+
+  G4String name1[20];
+  int copyno1[20];
+  for (int i = 0; i < 20; ++i) {
+    name1[i] = "";
     copyno1[i] = 0;
   }
   if (pre_levels > 0) {
     detectorLevel(pre_touch, pre_levels, copyno1, name1);
   }
 
-//  G4LogicalVolume*   lv            = currentPV->GetLogicalVolume();
-//  G4Material*       mat           = lv->GetMaterial();
-//  std::string prenameVolume;
-//  prenameVolume.assign(prename,0,20);
+  //  G4LogicalVolume*   lv            = currentPV->GetLogicalVolume();
+  //  G4Material*       mat           = lv->GetMaterial();
+  //  std::string prenameVolume;
+  //  prenameVolume.assign(prename,0,20);
 
-//   G4double         prebeta          = preStepPoint->GetBeta();
-//   G4double         precharge        = preStepPoint->GetCharge();
-//  G4double          prerad           = mat->GetRadlen();
+  //   G4double         prebeta          = preStepPoint->GetBeta();
+  //   G4double         precharge        = preStepPoint->GetCharge();
+  //  G4double          prerad           = mat->GetRadlen();
 
-//  std::cout << " EneryDeposited = " << EnerDeposit << std::endl;
-//  std::cout << " prevolume = "      << prename << std::endl;
-////  std::cout << " posvolume = "      << aStep->GetPostStepPoint()->GetPhysicalVolume()->GetName() << std::endl;
-//  std::cout << " preposition = "    << preposition << std::endl; 
-     /*
+  //  std::cout << " EneryDeposited = " << EnerDeposit << std::endl;
+  //  std::cout << " prevolume = "      << prename << std::endl;
+  ////  std::cout << " posvolume = "      << aStep->GetPostStepPoint()->GetPhysicalVolume()->GetName() << std::endl;
+  //  std::cout << " preposition = "    << preposition << std::endl;
+  /*
   // postStep
   G4StepPoint*      postStepPoint  = aStep->GetPostStepPoint();   
   G4ThreeVector     posposition    = postStepPoint->GetPosition();	
@@ -568,272 +546,237 @@ void FP420Test::update(const G4Step * aStep) {
 
 */
 
-//      //
-//      //
-
-      // 24.01.2006:
-// tr     :   id    parentID   trackstatus   tracklength   curstepnumber  entot  vert_pos  
-// st     :   stepl EnerDeposit 
-// prestep:   preposition   prevolume = SBSTm SIDETL SIDETR       name= SISTATION  copy= 1,2,3    name= SIPLANE  copy= 1..5..10
-
-// gen_track:
-//  id=1    parentID=1   trackstatus=0,2   tracklength(accumulated)  curstepnumber   entot  vert_pos 
- if ( id == 1 ) {
-
-         // on 1-st step:
-         if (curstepnumber == 1 ) {
-           entot0 = entot;
-           //UserNtuples->fillg519(entot0,1.);
-
-         }
-
-      // on every step:
-
-	 // for Copper:
-	 if(prename == "SBST" ) {
-           SumStepc += stepl;
-	   // =========
-         }
-	 // for ststeel:
-//	 if(prename == "SBSTs") {
-	 if(prename == "SBSTs" ) {
-           SumStepl += stepl;
-	   // =========
-	 }
-	   // =========
-	   // =========
-
-	 // exclude last track point if it is in SD (MI was started their)
-  if (trackstatus != 2 ) {
-	 // for SD:   Si Det.:   SISTATION:SIPLANE:(SIDETL+BOUNDDET        +SIDETR + CERAMDET)
-    if(prename == "SIDETL" || prename == "SIDETR" ) {
-	   if(prename == "SIDETL") {
-	     //UserNtuples->fillg569(EnerDeposit,1.);
-	   }
-	   if(prename == "SIDETR") {
-	     //UserNtuples->fillg570(EnerDeposit,1.);
-	   }
-
-//	   double numbcont = 10.*(copyno1[2]-1)+copyno1[3];
-
-	   // =========
-//	   double   xx    = preposition.x();
-//	   double   yy    = preposition.y();
-//	   double   zz    = preposition.z();
-	   // =========
-	     //UserNtuples->fillg580(theta,1.);
-	     //UserNtuples->fillg07(phigrad,1.);
-//	     double xPrimAtZhit = vert_pos.x() + (zz-vert_pos.z())*tan(theta)*cos(phi);
-//	     double yPrimAtZhit = vert_pos.y() + (zz-vert_pos.z())*tan(theta)*sin(phi);
-	   // =========
-//	   double  dx = xPrimAtZhit - xx;
-//	   double  dy = yPrimAtZhit - yy;
-	   // =========
-
-//	   //UserNtuples->fillp212(numbcont,dx,1.);
-//	   //UserNtuples->fillp213(numbcont,dy,1.);
-	   // =========
-
-	   // last step of current SD Volume:
-       G4String posname = aStep->GetPostStepPoint()->GetPhysicalVolume()->GetName();
-       if((prename == "SIDETL" && posname != "SIDETL") || (prename == "SIDETR" && posname != "SIDETR")) {
-     	   if(name1[2] == "SISTATION" ) {
-             //UserNtuples->fillg539(copyno1[2],1.);
-           }
-     	   if(name1[3] == "SIPLANE" ) {
-             //UserNtuples->fillg540(copyno1[3],1.);
-           }
-
-	   if(prename == "SIDETL") {
-	     //UserNtuples->fillg541(EnerDeposit,1.);
-	     //UserNtuples->fillg561(numbcont,1.);
-	     if(copyno1[2]<2) {
-		 //UserNtuples->fillg571(dx,1.);
-	     }
-	     else if(copyno1[2]<3) {
-	       //UserNtuples->fillg563(dx,1.);
-	       if(copyno1[3]<2) {
-	       }
-	       else if(copyno1[3]<3) {
-		 //UserNtuples->fillg572(dx,1.);
-	       }
-	       else if(copyno1[3]<4) {
-		 //UserNtuples->fillg573(dx,1.);
-	       }
-	       else if(copyno1[3]<5) {
-		 //UserNtuples->fillg574(dx,1.);
-	       }
-	       else if(copyno1[3]<6) {
-		 //UserNtuples->fillg575(dx,1.);
-	       }
-	       else if(copyno1[3]<7) {
-		 //UserNtuples->fillg576(dx,1.);
-	       }
-	       else if(copyno1[3]<8) {
-		 //UserNtuples->fillg577(dx,1.);
-	       }
-	       else if(copyno1[3]<9) {
-		 //UserNtuples->fillg578(dx,1.);
-	       }
-	       else if(copyno1[3]<10) {
-		 //UserNtuples->fillg579(dx,1.);
-	       }
-	     }
-	     else if(copyno1[2]<4) {
-	       //UserNtuples->fillg565(dx,1.);
-	     }
-	     else if(copyno1[2]<5) {
-	       //UserNtuples->fillg567(dx,1.);
-	     }
-	   }
-	   if(prename == "SIDETR") {
-	     //UserNtuples->fillg542(EnerDeposit,1.);
-	     //UserNtuples->fillg562(numbcont,1.);
-	     if(copyno1[2]<2) {
-		 //UserNtuples->fillg581(dy,1.);
-	     }
-	     else if(copyno1[2]<3) {
-	       //UserNtuples->fillg564(dy,1.);
-	       if(copyno1[3]<2) {
-	       }
-	       else if(copyno1[3]<3) {
-		 //UserNtuples->fillg582(dy,1.);
-	       }
-	       else if(copyno1[3]<4) {
-		 //UserNtuples->fillg583(dy,1.);
-	       }
-	       else if(copyno1[3]<5) {
-		 //UserNtuples->fillg584(dy,1.);
-	       }
-	       else if(copyno1[3]<6) {
-		 //UserNtuples->fillg585(dy,1.);
-	       }
-	       else if(copyno1[3]<7) {
-		 //UserNtuples->fillg586(dy,1.);
-	       }
-	       else if(copyno1[3]<8) {
-		 //UserNtuples->fillg587(dy,1.);
-	       }
-	       else if(copyno1[3]<9) {
-		 //UserNtuples->fillg588(dy,1.);
-	       }
-	       else if(copyno1[3]<10) {
-		 //UserNtuples->fillg589(dy,1.);
-	       }
-	     }
-	     else if(copyno1[2]<4) {
-	       //UserNtuples->fillg566(dy,1.);
-	     }
-	     else if(copyno1[2]<5) {
-	       //UserNtuples->fillg568(dy,1.);
-	     }
-	   }
-
-       }
+  //      //
+  //      //
+
+  // 24.01.2006:
+  // tr     :   id    parentID   trackstatus   tracklength   curstepnumber  entot  vert_pos
+  // st     :   stepl EnerDeposit
+  // prestep:   preposition   prevolume = SBSTm SIDETL SIDETR       name= SISTATION  copy= 1,2,3    name= SIPLANE  copy= 1..5..10
+
+  // gen_track:
+  //  id=1    parentID=1   trackstatus=0,2   tracklength(accumulated)  curstepnumber   entot  vert_pos
+  if (id == 1) {
+    // on 1-st step:
+    if (curstepnumber == 1) {
+      entot0 = entot;
+      //UserNtuples->fillg519(entot0,1.);
     }
-    // end of prenames SIDETL // SIDETR
-  }
-  // end of trackstatus != 2
-
-
-      // deposition of energy on steps along primary track
-      //UserNtuples->fillg500(EnerDeposit,1.);
-      // collect sum deposited energy on all steps along primary track
-      SumEnerDeposit += EnerDeposit;
-      // position of step for primary track:
-      //UserNtuples->fillg501(preposition.x(),1.);
-      //UserNtuples->fillg502(preposition.y(),1.);
-      //UserNtuples->fillg503(preposition.z(),1.);
-      //UserNtuples->fillg504(preposition.x(),EnerDeposit);
-      //UserNtuples->fillg505(preposition.y(),EnerDeposit);
-      //UserNtuples->fillg506(preposition.z(),EnerDeposit);
-      // 2D step coordinates weighted by energy deposited on step
-//      //UserNtuples->fillp201(preposition.x(),preposition.y(),EnerDeposit);
-//      //UserNtuples->fillp202(preposition.x(),preposition.z(),EnerDeposit);
-//      //UserNtuples->fillp203(preposition.y(),preposition.z(),EnerDeposit);
-      //UserNtuples->filld204(preposition.x(),preposition.y(),EnerDeposit);
-      //UserNtuples->filld205(preposition.x(),preposition.z(),EnerDeposit);
-      //UserNtuples->filld206(preposition.y(),preposition.z(),EnerDeposit);
-      //UserNtuples->filld223(preposition.y(),preposition.z(),EnerDeposit);
-      // last step of primary track
-     if (trackstatus == 2 ) {
-      // primary track length 
-       //      //UserNtuples->fillg508(tracklength,1.);
-          tracklength0 = tracklength;
-      // how many steps primary track consist 
+
+    // on every step:
+
+    // for Copper:
+    if (prename == "SBST") {
+      SumStepc += stepl;
+      // =========
+    }
+    // for ststeel:
+    //	 if(prename == "SBSTs") {
+    if (prename == "SBSTs") {
+      SumStepl += stepl;
+      // =========
+    }
+    // =========
+    // =========
+
+    // exclude last track point if it is in SD (MI was started their)
+    if (trackstatus != 2) {
+      // for SD:   Si Det.:   SISTATION:SIPLANE:(SIDETL+BOUNDDET        +SIDETR + CERAMDET)
+      if (prename == "SIDETL" || prename == "SIDETR") {
+        if (prename == "SIDETL") {
+          //UserNtuples->fillg569(EnerDeposit,1.);
+        }
+        if (prename == "SIDETR") {
+          //UserNtuples->fillg570(EnerDeposit,1.);
+        }
+
+        //	   double numbcont = 10.*(copyno1[2]-1)+copyno1[3];
+
+        // =========
+        //	   double   xx    = preposition.x();
+        //	   double   yy    = preposition.y();
+        //	   double   zz    = preposition.z();
+        // =========
+        //UserNtuples->fillg580(theta,1.);
+        //UserNtuples->fillg07(phigrad,1.);
+        //	     double xPrimAtZhit = vert_pos.x() + (zz-vert_pos.z())*tan(theta)*cos(phi);
+        //	     double yPrimAtZhit = vert_pos.y() + (zz-vert_pos.z())*tan(theta)*sin(phi);
+        // =========
+        //	   double  dx = xPrimAtZhit - xx;
+        //	   double  dy = yPrimAtZhit - yy;
+        // =========
+
+        //	   //UserNtuples->fillp212(numbcont,dx,1.);
+        //	   //UserNtuples->fillp213(numbcont,dy,1.);
+        // =========
+
+        // last step of current SD Volume:
+        G4String posname = aStep->GetPostStepPoint()->GetPhysicalVolume()->GetName();
+        if ((prename == "SIDETL" && posname != "SIDETL") || (prename == "SIDETR" && posname != "SIDETR")) {
+          if (name1[2] == "SISTATION") {
+            //UserNtuples->fillg539(copyno1[2],1.);
+          }
+          if (name1[3] == "SIPLANE") {
+            //UserNtuples->fillg540(copyno1[3],1.);
+          }
+
+          if (prename == "SIDETL") {
+            //UserNtuples->fillg541(EnerDeposit,1.);
+            //UserNtuples->fillg561(numbcont,1.);
+            if (copyno1[2] < 2) {
+              //UserNtuples->fillg571(dx,1.);
+            } else if (copyno1[2] < 3) {
+              //UserNtuples->fillg563(dx,1.);
+              if (copyno1[3] < 2) {
+              } else if (copyno1[3] < 3) {
+                //UserNtuples->fillg572(dx,1.);
+              } else if (copyno1[3] < 4) {
+                //UserNtuples->fillg573(dx,1.);
+              } else if (copyno1[3] < 5) {
+                //UserNtuples->fillg574(dx,1.);
+              } else if (copyno1[3] < 6) {
+                //UserNtuples->fillg575(dx,1.);
+              } else if (copyno1[3] < 7) {
+                //UserNtuples->fillg576(dx,1.);
+              } else if (copyno1[3] < 8) {
+                //UserNtuples->fillg577(dx,1.);
+              } else if (copyno1[3] < 9) {
+                //UserNtuples->fillg578(dx,1.);
+              } else if (copyno1[3] < 10) {
+                //UserNtuples->fillg579(dx,1.);
+              }
+            } else if (copyno1[2] < 4) {
+              //UserNtuples->fillg565(dx,1.);
+            } else if (copyno1[2] < 5) {
+              //UserNtuples->fillg567(dx,1.);
+            }
+          }
+          if (prename == "SIDETR") {
+            //UserNtuples->fillg542(EnerDeposit,1.);
+            //UserNtuples->fillg562(numbcont,1.);
+            if (copyno1[2] < 2) {
+              //UserNtuples->fillg581(dy,1.);
+            } else if (copyno1[2] < 3) {
+              //UserNtuples->fillg564(dy,1.);
+              if (copyno1[3] < 2) {
+              } else if (copyno1[3] < 3) {
+                //UserNtuples->fillg582(dy,1.);
+              } else if (copyno1[3] < 4) {
+                //UserNtuples->fillg583(dy,1.);
+              } else if (copyno1[3] < 5) {
+                //UserNtuples->fillg584(dy,1.);
+              } else if (copyno1[3] < 6) {
+                //UserNtuples->fillg585(dy,1.);
+              } else if (copyno1[3] < 7) {
+                //UserNtuples->fillg586(dy,1.);
+              } else if (copyno1[3] < 8) {
+                //UserNtuples->fillg587(dy,1.);
+              } else if (copyno1[3] < 9) {
+                //UserNtuples->fillg588(dy,1.);
+              } else if (copyno1[3] < 10) {
+                //UserNtuples->fillg589(dy,1.);
+              }
+            } else if (copyno1[2] < 4) {
+              //UserNtuples->fillg566(dy,1.);
+            } else if (copyno1[2] < 5) {
+              //UserNtuples->fillg568(dy,1.);
+            }
+          }
+        }
+      }
+      // end of prenames SIDETL // SIDETR
+    }
+    // end of trackstatus != 2
+
+    // deposition of energy on steps along primary track
+    //UserNtuples->fillg500(EnerDeposit,1.);
+    // collect sum deposited energy on all steps along primary track
+    SumEnerDeposit += EnerDeposit;
+    // position of step for primary track:
+    //UserNtuples->fillg501(preposition.x(),1.);
+    //UserNtuples->fillg502(preposition.y(),1.);
+    //UserNtuples->fillg503(preposition.z(),1.);
+    //UserNtuples->fillg504(preposition.x(),EnerDeposit);
+    //UserNtuples->fillg505(preposition.y(),EnerDeposit);
+    //UserNtuples->fillg506(preposition.z(),EnerDeposit);
+    // 2D step coordinates weighted by energy deposited on step
+    //      //UserNtuples->fillp201(preposition.x(),preposition.y(),EnerDeposit);
+    //      //UserNtuples->fillp202(preposition.x(),preposition.z(),EnerDeposit);
+    //      //UserNtuples->fillp203(preposition.y(),preposition.z(),EnerDeposit);
+    //UserNtuples->filld204(preposition.x(),preposition.y(),EnerDeposit);
+    //UserNtuples->filld205(preposition.x(),preposition.z(),EnerDeposit);
+    //UserNtuples->filld206(preposition.y(),preposition.z(),EnerDeposit);
+    //UserNtuples->filld223(preposition.y(),preposition.z(),EnerDeposit);
+    // last step of primary track
+    if (trackstatus == 2) {
+      // primary track length
+      //      //UserNtuples->fillg508(tracklength,1.);
+      tracklength0 = tracklength;
+      // how many steps primary track consist
       //UserNtuples->fillg509(curstepnumber,1.);
       // tot. energy of primary track at the end of trajectory(before disappeare)
       //UserNtuples->fillg510((entot0-entot),1.);
       //UserNtuples->fillg520((entot0-entot),1.);
-     }
- }
- // end of primary track !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-
-    if (parentID == 1 && curstepnumber == 1) {
-      // particles deposit their energy along primary track
-      numofpart += 1;
-      // energy of radiated particle
-      //UserNtuples->fillg511(entot,1.);
-      // coordinates  of radiated particle
-      //UserNtuples->fillg512(vert_pos.x(),1.);
-      //UserNtuples->fillg513(vert_pos.y(),1.);
-      //UserNtuples->fillg514(vert_pos.z(),1.);
-      //UserNtuples->fillg515(vert_pos.x(),entot);
-      //UserNtuples->fillg516(vert_pos.y(),entot);
-      //UserNtuples->fillg517(vert_pos.z(),entot);
-
-      //UserNtuples->filld214(vert_pos.x(),vert_pos.y(),1.);
-      //UserNtuples->filld215(vert_pos.x(),vert_pos.z(),1.);
-      //UserNtuples->filld216(vert_pos.y(),vert_pos.z(),1.);
-      //UserNtuples->filld219(vert_pos.y(),vert_pos.z(),1.);
-      //UserNtuples->filld224(vert_pos.y(),vert_pos.z(),1.);
-	 if(prename == "SBST" ) {
-           //UserNtuples->filld225(vert_pos.y(),vert_pos.z(),1.);
-         }
-	 if(prename == "SBSTs" ) {
-	   //UserNtuples->filld226(vert_pos.y(),vert_pos.z(),1.);
-	 }
     }
-
-
+  }
+  // end of primary track !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+  if (parentID == 1 && curstepnumber == 1) {
+    // particles deposit their energy along primary track
+    numofpart += 1;
+    // energy of radiated particle
+    //UserNtuples->fillg511(entot,1.);
+    // coordinates  of radiated particle
+    //UserNtuples->fillg512(vert_pos.x(),1.);
+    //UserNtuples->fillg513(vert_pos.y(),1.);
+    //UserNtuples->fillg514(vert_pos.z(),1.);
+    //UserNtuples->fillg515(vert_pos.x(),entot);
+    //UserNtuples->fillg516(vert_pos.y(),entot);
+    //UserNtuples->fillg517(vert_pos.z(),entot);
+
+    //UserNtuples->filld214(vert_pos.x(),vert_pos.y(),1.);
+    //UserNtuples->filld215(vert_pos.x(),vert_pos.z(),1.);
+    //UserNtuples->filld216(vert_pos.y(),vert_pos.z(),1.);
+    //UserNtuples->filld219(vert_pos.y(),vert_pos.z(),1.);
+    //UserNtuples->filld224(vert_pos.y(),vert_pos.z(),1.);
+    if (prename == "SBST") {
+      //UserNtuples->filld225(vert_pos.y(),vert_pos.z(),1.);
+    }
+    if (prename == "SBSTs") {
+      //UserNtuples->filld226(vert_pos.y(),vert_pos.z(),1.);
+    }
+  }
 
   // ==========================================================================
-
 }
 // ==========================================================================
 // ==========================================================================
 int FP420Test::detLevels(const G4VTouchable* touch) const {
-
   //Return number of levels
-  if (touch) 
-    return ((touch->GetHistoryDepth())+1);
+  if (touch)
+    return ((touch->GetHistoryDepth()) + 1);
   else
     return 0;
 }
 // ==========================================================================
 
-G4String FP420Test::detName(const G4VTouchable* touch, int level,
-                                    int currentlevel) const {
-
+G4String FP420Test::detName(const G4VTouchable* touch, int level, int currentlevel) const {
   //Go down to current level
   if (level > 0 && level >= currentlevel) {
-    int ii = level - currentlevel; 
+    int ii = level - currentlevel;
     return touch->GetVolume(ii)->GetName();
   } else {
     return "NotFound";
   }
 }
 
-void FP420Test::detectorLevel(const G4VTouchable* touch, int& level,
-                                      int* copyno, G4String* name) const {
-
+void FP420Test::detectorLevel(const G4VTouchable* touch, int& level, int* copyno, G4String* name) const {
   //Get name and copy numbers
   if (level > 0) {
     for (int ii = 0; ii < level; ii++) {
-      int i      = level - ii - 1;
+      int i = level - ii - 1;
       G4VPhysicalVolume* pv = touch->GetVolume(i);
-      if (pv != nullptr) 
+      if (pv != nullptr)
         name[ii] = pv->GetName();
       else
         name[ii] = "Unknown";
@@ -844,43 +787,42 @@ void FP420Test::detectorLevel(const G4VTouchable* touch, int& level,
 // ==========================================================================
 
 //===================================================================   End Of Event
-void FP420Test::update(const EndOfEvent * evt) {
+void FP420Test::update(const EndOfEvent* evt) {
   // ==========================================================================
-  
+
   if (verbosity > 1) {
-  iev = (*evt)()->GetEventID();
-    std::cout <<"FP420Test:update EndOfEvent = " << iev << std::endl;
+    iev = (*evt)()->GetEventID();
+    std::cout << "FP420Test:update EndOfEvent = " << iev << std::endl;
   }
   // Fill-in ntuple
   fp420eventarray[ntfp420_evt] = (float)whichevent;
 
   //
   int trackID = 0;
-  G4PrimaryParticle* thePrim=nullptr;
-
+  G4PrimaryParticle* thePrim = nullptr;
 
   // prim.vertex:
   G4int nvertex = (*evt)()->GetNumberOfPrimaryVertex();
-  if (nvertex !=1) 
-    std::cout << "FP420Test: My warning: NumberOfPrimaryVertex != 1  -->  = " << nvertex <<  std::endl;
+  if (nvertex != 1)
+    std::cout << "FP420Test: My warning: NumberOfPrimaryVertex != 1  -->  = " << nvertex << std::endl;
 
-  for (int i = 0 ; i<nvertex; i++) {
+  for (int i = 0; i < nvertex; i++) {
     G4PrimaryVertex* avertex = (*evt)()->GetPrimaryVertex(i);
     if (avertex == nullptr)
-      std::cout << "FP420Test  End Of Event ERR: pointer to vertex = 0"
-      << std::endl;
+      std::cout << "FP420Test  End Of Event ERR: pointer to vertex = 0" << std::endl;
     G4int npart = avertex->GetNumberOfParticle();
-    if (npart !=1)
-      std::cout << "FP420Test: My warning: NumberOfPrimaryPart != 1  -->  = " << npart <<  std::endl;
-    if (npart ==0)
+    if (npart != 1)
+      std::cout << "FP420Test: My warning: NumberOfPrimaryPart != 1  -->  = " << npart << std::endl;
+    if (npart == 0)
       std::cout << "FP420Test End Of Event ERR: no NumberOfParticle" << std::endl;
 
-  // find just primary track:                                                             track pointer: thePrim
-    if (thePrim==nullptr) thePrim=avertex->GetPrimary(trackID);
+    // find just primary track:                                                             track pointer: thePrim
+    if (thePrim == nullptr)
+      thePrim = avertex->GetPrimary(trackID);
 
-    if (thePrim!=nullptr) {
+    if (thePrim != nullptr) {
       // primary vertex:
-      G4double vx=0.,vy=0.,vz=0.;
+      G4double vx = 0., vy = 0., vz = 0.;
       vx = avertex->GetX0();
       vy = avertex->GetY0();
       vz = avertex->GetZ0();
@@ -894,552 +836,548 @@ void FP420Test::update(const EndOfEvent * evt) {
   }
   // prim.vertex loop end
 
-//=========================== thePrim != 0 ================================================================================
-    if (thePrim != nullptr) {
-//      inline G4ParticleDefinition * GetG4code() const
-//      inline G4PrimaryParticle * GetNext() const
-//      inline G4PrimaryParticle * GetDaughter() const
-
-// prim.vertex
-      //int ivert = 0 ;
-      //G4PrimaryVertex* avertex = (*evt)()->GetPrimaryVertex(ivert);
-      //G4double vx=0.,vy=0.,vz=0.;
-      //vx = avertex->GetX0();
-      //vy = avertex->GetY0();
-      //vz = avertex->GetZ0();
+  //=========================== thePrim != 0 ================================================================================
+  if (thePrim != nullptr) {
+    //      inline G4ParticleDefinition * GetG4code() const
+    //      inline G4PrimaryParticle * GetNext() const
+    //      inline G4PrimaryParticle * GetDaughter() const
 
-  //
-      // number of secondary particles deposited their energy along primary track
-           //UserNtuples->fillg518(numofpart,1.);
-         if(lastpo.z()<z4 && lastpo.perp()< 100.) {
-           //UserNtuples->fillg536(numofpart,1.);
-	 }
-  //
+    // prim.vertex
+    //int ivert = 0 ;
+    //G4PrimaryVertex* avertex = (*evt)()->GetPrimaryVertex(ivert);
+    //G4double vx=0.,vy=0.,vz=0.;
+    //vx = avertex->GetX0();
+    //vy = avertex->GetY0();
+    //vz = avertex->GetZ0();
+
+    //
+    // number of secondary particles deposited their energy along primary track
+    //UserNtuples->fillg518(numofpart,1.);
+    if (lastpo.z() < z4 && lastpo.perp() < 100.) {
+      //UserNtuples->fillg536(numofpart,1.);
+    }
+    //
 
-      // direction !!!
-      G4ThreeVector   mom  = thePrim->GetMomentum();
-  
-    double phi = atan2(mom.y(),mom.x());
-    if (phi < 0.) phi += twopi;
-    double phigrad = phi*180./pi;
-
-      double th     = mom.theta();
-      double eta = -log(tan(th/2));
-// works OK:
-//      double  costheta =mom.z()/sqrt(mom.x()*mom.x()+mom.y()*mom.y()+mom.z()*mom.z());
-      //      double theta = acos(min(max(costheta,double(-1.)),double(1.)));
-
-      //UserNtuples->fillh04(eta);
-      //UserNtuples->fillh05(phigrad);
-      //UserNtuples->fillh06(th);
-
-      //UserNtuples->fillg13(lastpo.x(),1.);
-      //UserNtuples->fillg14(lastpo.y(),1.);
-      //UserNtuples->fillg15(lastpo.z(),1.);
-
-	 TheHistManager->GetHisto("PrimaryEta")->Fill(eta);
-	 TheHistManager->GetHisto("PrimaryPhigrad")->Fill(phigrad);
-	 TheHistManager->GetHisto("PrimaryTh")->Fill(th*180./pi);
-
-	 TheHistManager->GetHisto("PrimaryLastpoZ")->Fill(lastpo.z());
-	 if(lastpo.z() <  z4  ) {
-	   TheHistManager->GetHisto("PrimaryLastpoX")->Fill(lastpo.x());
-	   TheHistManager->GetHisto("PrimaryLastpoY")->Fill(lastpo.y());
-	 }
-	 if(numofpart >  4  ) {
-	   TheHistManager->GetHisto("XLastpoNumofpart")->Fill(lastpo.x());
-	   TheHistManager->GetHisto("YLastpoNumofpart")->Fill(lastpo.y());
-	 }
+    // direction !!!
+    G4ThreeVector mom = thePrim->GetMomentum();
 
-  // ==========================================================================
+    double phi = atan2(mom.y(), mom.x());
+    if (phi < 0.)
+      phi += twopi;
+    double phigrad = phi * 180. / pi;
 
-  // hit map for FP420
-  // ==================================
+    double th = mom.theta();
+    double eta = -log(tan(th / 2));
+    // works OK:
+    //      double  costheta =mom.z()/sqrt(mom.x()*mom.x()+mom.y()*mom.y()+mom.z()*mom.z());
+    //      double theta = acos(min(max(costheta,double(-1.)),double(1.)));
 
-  map<int,float,less<int> > themap;
-  map<int,float,less<int> > themap1;
+    //UserNtuples->fillh04(eta);
+    //UserNtuples->fillh05(phigrad);
+    //UserNtuples->fillh06(th);
 
-  map<int,float,less<int> > themapxy;
-  map<int,float,less<int> > themapz;
-  // access to the G4 hit collections:  -----> this work OK:
+    //UserNtuples->fillg13(lastpo.x(),1.);
+    //UserNtuples->fillg14(lastpo.y(),1.);
+    //UserNtuples->fillg15(lastpo.z(),1.);
 
-//  edm::LogInfo("FP420Test") << "1";
-  G4HCofThisEvent* allHC = (*evt)()->GetHCofThisEvent();
-//  edm::LogInfo("FP420Test") << "2";
+    TheHistManager->GetHisto("PrimaryEta")->Fill(eta);
+    TheHistManager->GetHisto("PrimaryPhigrad")->Fill(phigrad);
+    TheHistManager->GetHisto("PrimaryTh")->Fill(th * 180. / pi);
+
+    TheHistManager->GetHisto("PrimaryLastpoZ")->Fill(lastpo.z());
+    if (lastpo.z() < z4) {
+      TheHistManager->GetHisto("PrimaryLastpoX")->Fill(lastpo.x());
+      TheHistManager->GetHisto("PrimaryLastpoY")->Fill(lastpo.y());
+    }
+    if (numofpart > 4) {
+      TheHistManager->GetHisto("XLastpoNumofpart")->Fill(lastpo.x());
+      TheHistManager->GetHisto("YLastpoNumofpart")->Fill(lastpo.y());
+    }
+
+    // ==========================================================================
+
+    // hit map for FP420
+    // ==================================
+
+    map<int, float, less<int> > themap;
+    map<int, float, less<int> > themap1;
+
+    map<int, float, less<int> > themapxy;
+    map<int, float, less<int> > themapz;
+    // access to the G4 hit collections:  -----> this work OK:
+
+    //  edm::LogInfo("FP420Test") << "1";
+    G4HCofThisEvent* allHC = (*evt)()->GetHCofThisEvent();
+    //  edm::LogInfo("FP420Test") << "2";
     if (verbosity > 0) {
-      std::cout << "FP420Test:  accessed all HC" << std::endl;;
+      std::cout << "FP420Test:  accessed all HC" << std::endl;
+      ;
     }
-  int CAFIid = G4SDManager::GetSDMpointer()->GetCollectionID("FP420SI");
- // edm::LogInfo("FP420Test") << "3";
- // std::cout << " CAFIid = " << CAFIid << std::endl;;
+    int CAFIid = G4SDManager::GetSDMpointer()->GetCollectionID("FP420SI");
+    // edm::LogInfo("FP420Test") << "3";
+    // std::cout << " CAFIid = " << CAFIid << std::endl;;
 
-  FP420G4HitCollection* theCAFI = (FP420G4HitCollection*) allHC->GetHC(CAFIid);
-  //  CaloG4HitCollection* theCAFI = (CaloG4HitCollection*) allHC->GetHC(CAFIid);
+    FP420G4HitCollection* theCAFI = (FP420G4HitCollection*)allHC->GetHC(CAFIid);
+    //  CaloG4HitCollection* theCAFI = (CaloG4HitCollection*) allHC->GetHC(CAFIid);
     if (verbosity > 0) {
       //std::cout << "FP420Test: theCAFI = " << theCAFI << std::endl;
       std::cout << "FP420Test: theCAFI->entries = " << theCAFI->entries() << std::endl;
     }
- // edm::LogInfo("FP420Test") << "theCAFI->entries="<< theCAFI->entries();
+    // edm::LogInfo("FP420Test") << "theCAFI->entries="<< theCAFI->entries();
     TheHistManager->GetHisto("NumberOfHits")->Fill(theCAFI->entries());
 
-  // access to the G4 hit collections ----> variant 2: give 0 hits
-//  FP420G4HitCollection *   theCAFI;
-//  theCAFI = new FP420G4HitCollection();
-  // ==========================================================================
-  //   Silicon Hit collection start
+    // access to the G4 hit collections ----> variant 2: give 0 hits
+    //  FP420G4HitCollection *   theCAFI;
+    //  theCAFI = new FP420G4HitCollection();
+    // ==========================================================================
+    //   Silicon Hit collection start
     //0) if particle goes into flat beam pipe below detector:
-  int varia ;   // = 0 -all; =1 - MI; =2 - noMI
+    int varia;  // = 0 -all; =1 - MI; =2 - noMI
     //                      Select MI or noMI over all 3 stations
     // 1)MI:
-  //     if particle goes through window into detector:
-  // lastpoint of track in lateral dir. outside the detector and inside in z
-  // lastpoint of track in lateral dir. outside the detector and inside in z
-  // for all except zzzmarta.xml
-//    if(  lastpo.z()<z4  ||  abs(lastpo.x())> 5. || lastpo.y()< 10.2 || lastpo.y()>30.2   ) {
-// for zzzmarta.xml
+    //     if particle goes through window into detector:
+    // lastpoint of track in lateral dir. outside the detector and inside in z
+    // lastpoint of track in lateral dir. outside the detector and inside in z
+    // for all except zzzmarta.xml
+    //    if(  lastpo.z()<z4  ||  abs(lastpo.x())> 5. || lastpo.y()< 10.2 || lastpo.y()>30.2   ) {
+    // for zzzmarta.xml
     //   if(  lastpo.z()<z4  ||  abs(lastpo.x())> 10. || lastpo.y()< 3.2 || lastpo.y()>43.2   ) {
-    if(  lastpo.z()< z4) {
-//  if(  lastpo.z()<z4 && lastpo.perp()< 100. ) {
-//  if(lastpo.z()<z4  || lastpo.perp()> 45.) {
-    //UserNtuples->fillg66(theCAFI->entries(),1.);
-    varia = 1;
-  }
-  else{
-    // 2)   no MI start in detector:
-    //UserNtuples->fillg31(numofpart,1.);
-    //UserNtuples->fillg67(theCAFI->entries(),1.);
-    varia = 2;
-  }   // no MI end:
-
-   for (int j=0; j<theCAFI->entries(); j++) {
-    FP420G4Hit* aHit = (*theCAFI)[j];
-    G4ThreeVector hitPoint = aHit->getEntry();
-    double   zz    = hitPoint.z();
-    TheHistManager->GetHisto("zHits")->Fill(zz);
-    if(tracklength0>8300.) TheHistManager->GetHisto("zHitsTrLoLe")->Fill(zz);
-   }
-   // varia = 0;
-   //     if( varia == 0) {
-   if( varia == 2) {
-
-// .............
-// number of hits < 50
-//    if(theCAFI->entries() <50) {
-//    if(theCAFI->entries() > 0) {
-//    if(theCAFI->entries() > -1) {
-// .............
-      int nhit11 = 0, nhit12 = 0, nhit13 = 0 ;
-   double  totallosenergy= 0.;
-   for (int j=0; j<theCAFI->entries(); j++) {
-    FP420G4Hit* aHit = (*theCAFI)[j];
-
-    G4ThreeVector hitEntryLocalPoint = aHit->getEntryLocalP();
-    G4ThreeVector hitExitLocalPoint = aHit->getExitLocalP();
-    G4ThreeVector hitPoint = aHit->getEntry();
-//    double  elmenergy =  aHit->getEM();
-//    double  hadrenergy =  aHit->getHadr();
-//    double incidentEnergyHit  = aHit->getIncidentEnergy();
-    int trackIDhit  = aHit->getTrackID();
-    unsigned int unitID = aHit->getUnitID();
-//    double   timeslice = aHit->getTimeSlice();     
-//    int     timesliceID = aHit->getTimeSliceID();     
-//    double  depenergy = aHit->getEnergyDeposit();
-//    float   pabs = aHit->getPabs();
-//    float   tof = aHit->getTof();
-    double  losenergy = aHit->getEnergyLoss();
-//    int   particletype = aHit->getParticleType();
-//    float thetaEntry = aHit->getThetaAtEntry();   
-//    float phiEntry = aHit->getPhiAtEntry();
-//    float xEntry = aHit->getX();
-//    float yEntry = aHit->getY();
-//    float zEntry = aHit->getZ();
-//    int  parentID = aHit->getParentId();
-//    float vxget = aHit->getVx();
-//    float vyget = aHit->getVy();
-//    float vzget = aHit->getVz();
-
-//    double th_hit    = hitPoint.theta();
-//    double eta_hit = -log(tan(th_hit/2));
-//    double phi_hit   = hitPoint.phi();
-//    if (phi_hit < 0.) phi_hit += twopi;
-//    double phigrad_hit = phi_hit*180./pi;
-    //UserNtuples->fillg60(eta_hit,losenergy);
-    //UserNtuples->fillg61(eta_hit,1.);
-    //UserNtuples->fillg62(phigrad_hit,losenergy);
-    //UserNtuples->fillg63(phigrad_hit,1.);
-
-//    double   xx    = hitPoint.x();
-//    double   yy    = hitPoint.y();
-    double   zz    = hitPoint.z();
-
-    TheHistManager->GetHisto("zHitsnoMI")->Fill(zz);
-
-    if (verbosity > 2) {
-      std::cout << "FP420Test:zHits = " << zz << std::endl;
+    if (lastpo.z() < z4) {
+      //  if(  lastpo.z()<z4 && lastpo.perp()< 100. ) {
+      //  if(lastpo.z()<z4  || lastpo.perp()> 45.) {
+      //UserNtuples->fillg66(theCAFI->entries(),1.);
+      varia = 1;
+    } else {
+      // 2)   no MI start in detector:
+      //UserNtuples->fillg31(numofpart,1.);
+      //UserNtuples->fillg67(theCAFI->entries(),1.);
+      varia = 2;
+    }  // no MI end:
+
+    for (int j = 0; j < theCAFI->entries(); j++) {
+      FP420G4Hit* aHit = (*theCAFI)[j];
+      G4ThreeVector hitPoint = aHit->getEntry();
+      double zz = hitPoint.z();
+      TheHistManager->GetHisto("zHits")->Fill(zz);
+      if (tracklength0 > 8300.)
+        TheHistManager->GetHisto("zHitsTrLoLe")->Fill(zz);
     }
-//	 double   rr    = hitPoint.perp();
-    /*
+    // varia = 0;
+    //     if( varia == 0) {
+    if (varia == 2) {
+      // .............
+      // number of hits < 50
+      //    if(theCAFI->entries() <50) {
+      //    if(theCAFI->entries() > 0) {
+      //    if(theCAFI->entries() > -1) {
+      // .............
+      int nhit11 = 0, nhit12 = 0, nhit13 = 0;
+      double totallosenergy = 0.;
+      for (int j = 0; j < theCAFI->entries(); j++) {
+        FP420G4Hit* aHit = (*theCAFI)[j];
+
+        G4ThreeVector hitEntryLocalPoint = aHit->getEntryLocalP();
+        G4ThreeVector hitExitLocalPoint = aHit->getExitLocalP();
+        G4ThreeVector hitPoint = aHit->getEntry();
+        //    double  elmenergy =  aHit->getEM();
+        //    double  hadrenergy =  aHit->getHadr();
+        //    double incidentEnergyHit  = aHit->getIncidentEnergy();
+        int trackIDhit = aHit->getTrackID();
+        unsigned int unitID = aHit->getUnitID();
+        //    double   timeslice = aHit->getTimeSlice();
+        //    int     timesliceID = aHit->getTimeSliceID();
+        //    double  depenergy = aHit->getEnergyDeposit();
+        //    float   pabs = aHit->getPabs();
+        //    float   tof = aHit->getTof();
+        double losenergy = aHit->getEnergyLoss();
+        //    int   particletype = aHit->getParticleType();
+        //    float thetaEntry = aHit->getThetaAtEntry();
+        //    float phiEntry = aHit->getPhiAtEntry();
+        //    float xEntry = aHit->getX();
+        //    float yEntry = aHit->getY();
+        //    float zEntry = aHit->getZ();
+        //    int  parentID = aHit->getParentId();
+        //    float vxget = aHit->getVx();
+        //    float vyget = aHit->getVy();
+        //    float vzget = aHit->getVz();
+
+        //    double th_hit    = hitPoint.theta();
+        //    double eta_hit = -log(tan(th_hit/2));
+        //    double phi_hit   = hitPoint.phi();
+        //    if (phi_hit < 0.) phi_hit += twopi;
+        //    double phigrad_hit = phi_hit*180./pi;
+        //UserNtuples->fillg60(eta_hit,losenergy);
+        //UserNtuples->fillg61(eta_hit,1.);
+        //UserNtuples->fillg62(phigrad_hit,losenergy);
+        //UserNtuples->fillg63(phigrad_hit,1.);
+
+        //    double   xx    = hitPoint.x();
+        //    double   yy    = hitPoint.y();
+        double zz = hitPoint.z();
+
+        TheHistManager->GetHisto("zHitsnoMI")->Fill(zz);
+
+        if (verbosity > 2) {
+          std::cout << "FP420Test:zHits = " << zz << std::endl;
+        }
+        //	 double   rr    = hitPoint.perp();
+        /*
       if(aHit->getTrackID() == 1) {
 	  emu += aHit->getEnergyDeposit();} else {
 	  erest += aHit->getEnergyDeposit();}
     */
 
-    //collect lost in Si en.of hits in every plane and put it into themap[]     
-	     //UserNtuples->fillg30(losenergy,1.);
-    themap[unitID] += losenergy;
-	totallosenergy += losenergy;
-
-    int det, zside, sector, zmodule;
-//    CaloNumberingPacker::unpackCastorIndex(unitID, det, zside, sector, zmodule);
-    FP420NumberingScheme::unpackFP420Index(unitID, det, zside, sector, zmodule);
-    int justlayer = FP420NumberingScheme::unpackLayerIndex(rn00, zside);// 1,2
-    if(justlayer<1||justlayer>2) {
-      std::cout << "FP420Test:WRONG  justlayer= " << justlayer << std::endl; 
-    }
-    // zside=1,2 ; zmodule=1,10 ; sector=1,3
-    //UserNtuples->fillg44(float(sector),1.);
-    //UserNtuples->fillg45(float(zmodule),1.);
-    //UserNtuples->fillg46(float(zside),1.);
-    //      int sScale = 20;
-    // intindex is a continues numbering of FP420
-    //int zScale = 2; unsigned int intindex = sScale*(sector - 1)+zScale*(zmodule - 1)+zside; //intindex=1-30:X,Y,X,Y,X,Y...
-    // int zScale = 10;   unsigned int intindex = sScale*(sector - 1)+zScale*(zside - 1)+zmodule; //intindex=1-30:XXXXXXXXXX,YYYYYYYYYY,...
-    //UserNtuples->fillg40(float(intindex),1.);
-    //UserNtuples->fillg48(float(intindex),losenergy);
-    //
-    //=======================================
-    //   G4ThreeVector middle = (hitExitLocalPoint+hitEntryLocalPoint)/2.;
-    G4ThreeVector middle = (hitExitLocalPoint-hitEntryLocalPoint)/2.;
-    themapz[unitID]  = hitPoint.z()+fabs(middle.z());
-    if (verbosity > 2) {
-      std::cout << "1111111111111111111111111111111111111111111111111111111111111111111111111 " << std::endl;
-      std::cout << "FP420Test: det, zside, sector, zmodule = " << det << zside << sector << zmodule << std::endl;
-      std::cout << "FP420Test: justlayer = " << justlayer << std::endl;
-      std::cout << "FP420Test: hitExitLocalPoint = " << hitExitLocalPoint << std::endl;
-      std::cout << "FP420Test: hitEntryLocalPoint = " << hitEntryLocalPoint << std::endl;
-      std::cout << "FP420Test:  middle= " << middle << std::endl;
-      std::cout << "FP420Test:  hitPoint.z()-419000.= " << hitPoint.z()-419000. << std::endl;
-      
-      std::cout << "FP420Test:zHits-419000. = " << themapz[unitID]-419000. << std::endl;
-    }
-    //=======================================
-    // Y
-    if(zside==1) {
-	     //UserNtuples->fillg24(losenergy,1.);
-	     if(losenergy > 0.00003) {
-	       themap1[unitID] += 1.;
-	     }
-	   }
-//X
-	   if(zside==2){
-	     //UserNtuples->fillg25(losenergy,1.);
-	     if(losenergy > 0.00005) {
-	       themap1[unitID] += 1.;
-	     }
-	   }
-//	   }
-//
-	   if(sector==1) {
-	     nhit11 += 1;
-	     //UserNtuples->fillg33(rr,1.);
-	     //UserNtuples->fillg11(yy,1.);
-	   }
-	   if(sector==2) {
-	     nhit12 += 1;
-	     //UserNtuples->fillg34(rr,1.);
-	     //UserNtuples->fillg86(yy,1.);
-	   }
- 	   if(sector==3) {
-	     nhit13 += 1;
-	     //UserNtuples->fillg35(rr,1.);
-	     //UserNtuples->fillg87(yy,1.);
-	   }
-    //UserNtuples->fillg10(xx,1.);
-    //UserNtuples->fillg12(zz,1.);
-    //UserNtuples->fillg32(rr,1.);
-	   
-
-
-
-
-
-
-    // =========
-//    double xPrimAtZhit = vx + (zz-vz)*tan(th)*cos(phi);
-//    double yPrimAtZhit = vy + (zz-vz)*tan(th)*sin(phi);
-
-//       double  dx = xPrimAtZhit - xx;
-//       double  dy = yPrimAtZhit - yy;
-
-    //                      Select SD hits
-//    if(rr<120.) {
-    //                      Select MI or noMI over all 3 stations
-    if(lastpo.z()<z4  && lastpo.perp()< 120.) {
-    // MIonly:
-      //UserNtuples->fillg16(lastpo.z(),1.);
-      //UserNtuples->fillg18(zz,1.);
-    //                                                                     Station I
-      if( zz < z2){
-	//UserNtuples->fillg54(dx,1.);
-	//UserNtuples->fillg55(dy,1.);
-      }
-    //                                                                     Station II
-      if( zz < z3 && zz > z2){
-	//UserNtuples->fillg50(dx,1.);
-	//UserNtuples->fillg51(dy,1.);
-      }
-    //                                                                     Station III
-      if( zz < z4 && zz > z3){
-	//UserNtuples->fillg64(dx,1.);
-	//UserNtuples->fillg65(dy,1.);
-	//UserNtuples->filld209(xx,yy,1.);
+        //collect lost in Si en.of hits in every plane and put it into themap[]
+        //UserNtuples->fillg30(losenergy,1.);
+        themap[unitID] += losenergy;
+        totallosenergy += losenergy;
+
+        int det, zside, sector, zmodule;
+        //    CaloNumberingPacker::unpackCastorIndex(unitID, det, zside, sector, zmodule);
+        FP420NumberingScheme::unpackFP420Index(unitID, det, zside, sector, zmodule);
+        int justlayer = FP420NumberingScheme::unpackLayerIndex(rn00, zside);  // 1,2
+        if (justlayer < 1 || justlayer > 2) {
+          std::cout << "FP420Test:WRONG  justlayer= " << justlayer << std::endl;
+        }
+        // zside=1,2 ; zmodule=1,10 ; sector=1,3
+        //UserNtuples->fillg44(float(sector),1.);
+        //UserNtuples->fillg45(float(zmodule),1.);
+        //UserNtuples->fillg46(float(zside),1.);
+        //      int sScale = 20;
+        // intindex is a continues numbering of FP420
+        //int zScale = 2; unsigned int intindex = sScale*(sector - 1)+zScale*(zmodule - 1)+zside; //intindex=1-30:X,Y,X,Y,X,Y...
+        // int zScale = 10;   unsigned int intindex = sScale*(sector - 1)+zScale*(zside - 1)+zmodule; //intindex=1-30:XXXXXXXXXX,YYYYYYYYYY,...
+        //UserNtuples->fillg40(float(intindex),1.);
+        //UserNtuples->fillg48(float(intindex),losenergy);
+        //
+        //=======================================
+        //   G4ThreeVector middle = (hitExitLocalPoint+hitEntryLocalPoint)/2.;
+        G4ThreeVector middle = (hitExitLocalPoint - hitEntryLocalPoint) / 2.;
+        themapz[unitID] = hitPoint.z() + fabs(middle.z());
+        if (verbosity > 2) {
+          std::cout << "1111111111111111111111111111111111111111111111111111111111111111111111111 " << std::endl;
+          std::cout << "FP420Test: det, zside, sector, zmodule = " << det << zside << sector << zmodule << std::endl;
+          std::cout << "FP420Test: justlayer = " << justlayer << std::endl;
+          std::cout << "FP420Test: hitExitLocalPoint = " << hitExitLocalPoint << std::endl;
+          std::cout << "FP420Test: hitEntryLocalPoint = " << hitEntryLocalPoint << std::endl;
+          std::cout << "FP420Test:  middle= " << middle << std::endl;
+          std::cout << "FP420Test:  hitPoint.z()-419000.= " << hitPoint.z() - 419000. << std::endl;
+
+          std::cout << "FP420Test:zHits-419000. = " << themapz[unitID] - 419000. << std::endl;
+        }
+        //=======================================
+        // Y
+        if (zside == 1) {
+          //UserNtuples->fillg24(losenergy,1.);
+          if (losenergy > 0.00003) {
+            themap1[unitID] += 1.;
+          }
+        }
+        //X
+        if (zside == 2) {
+          //UserNtuples->fillg25(losenergy,1.);
+          if (losenergy > 0.00005) {
+            themap1[unitID] += 1.;
+          }
+        }
+        //	   }
+        //
+        if (sector == 1) {
+          nhit11 += 1;
+          //UserNtuples->fillg33(rr,1.);
+          //UserNtuples->fillg11(yy,1.);
+        }
+        if (sector == 2) {
+          nhit12 += 1;
+          //UserNtuples->fillg34(rr,1.);
+          //UserNtuples->fillg86(yy,1.);
+        }
+        if (sector == 3) {
+          nhit13 += 1;
+          //UserNtuples->fillg35(rr,1.);
+          //UserNtuples->fillg87(yy,1.);
+        }
+        //UserNtuples->fillg10(xx,1.);
+        //UserNtuples->fillg12(zz,1.);
+        //UserNtuples->fillg32(rr,1.);
+
+        // =========
+        //    double xPrimAtZhit = vx + (zz-vz)*tan(th)*cos(phi);
+        //    double yPrimAtZhit = vy + (zz-vz)*tan(th)*sin(phi);
+
+        //       double  dx = xPrimAtZhit - xx;
+        //       double  dy = yPrimAtZhit - yy;
+
+        //                      Select SD hits
+        //    if(rr<120.) {
+        //                      Select MI or noMI over all 3 stations
+        if (lastpo.z() < z4 && lastpo.perp() < 120.) {
+          // MIonly:
+          //UserNtuples->fillg16(lastpo.z(),1.);
+          //UserNtuples->fillg18(zz,1.);
+          //                                                                     Station I
+          if (zz < z2) {
+            //UserNtuples->fillg54(dx,1.);
+            //UserNtuples->fillg55(dy,1.);
+          }
+          //                                                                     Station II
+          if (zz < z3 && zz > z2) {
+            //UserNtuples->fillg50(dx,1.);
+            //UserNtuples->fillg51(dy,1.);
+          }
+          //                                                                     Station III
+          if (zz < z4 && zz > z3) {
+            //UserNtuples->fillg64(dx,1.);
+            //UserNtuples->fillg65(dy,1.);
+            //UserNtuples->filld209(xx,yy,1.);
+          }
+        } else {
+          // no MIonly:
+          //UserNtuples->fillg17(lastpo.z(),1.);
+          //UserNtuples->fillg19(zz,1.);
+          //UserNtuples->fillg74(incidentEnergyHit,1.);
+          //UserNtuples->fillg75(float(trackIDhit),1.);
+          //                                                                     Station I
+          if (zz < z2) {
+            //UserNtuples->fillg56(dx,1.);
+            //UserNtuples->fillg57(dy,1.);
+            //UserNtuples->fillg20(numofpart,1.);
+            //UserNtuples->fillg21(SumEnerDeposit,1.);
+            if (zside == 1) {
+              //UserNtuples->fillg26(losenergy,1.);
+            }
+            if (zside == 2) {
+              //UserNtuples->fillg76(losenergy,1.);
+            }
+            if (trackIDhit == 1) {
+              //UserNtuples->fillg70(dx,1.);
+              //UserNtuples->fillg71(incidentEnergyHit,1.);
+              //UserNtuples->fillg79(losenergy,1.);
+            } else {
+              //UserNtuples->fillg82(dx,1.);
+            }
+          }
+          //                                                                     Station II
+          if (zz < z3 && zz > z2) {
+            //UserNtuples->fillg52(dx,1.);
+            //UserNtuples->fillg53(dy,1.);
+            //UserNtuples->fillg22(numofpart,1.);
+            //UserNtuples->fillg23(SumEnerDeposit,1.);
+            //UserNtuples->fillg80(incidentEnergyHit,1.);
+            //UserNtuples->fillg81(float(trackIDhit),1.);
+            if (zside == 1) {
+              //UserNtuples->fillg27(losenergy,1.);
+            }
+            if (zside == 2) {
+              //UserNtuples->fillg77(losenergy,1.);
+            }
+            if (trackIDhit == 1) {
+              //UserNtuples->fillg72(dx,1.);
+              //UserNtuples->fillg73(incidentEnergyHit,1.);
+            } else {
+              //UserNtuples->fillg83(dx,1.);
+            }
+          }
+          //                                                                     Station III
+          if (zz < z4 && zz > z3) {
+            //UserNtuples->fillg68(dx,1.);
+            //UserNtuples->fillg69(dy,1.);
+            //UserNtuples->filld210(xx,yy,1.);
+            //UserNtuples->fillg22(numofpart,1.);
+            //UserNtuples->fillg23(SumEnerDeposit,1.);
+            if (zside == 1) {
+              //UserNtuples->fillg28(losenergy,1.);
+            }
+            if (zside == 2) {
+              //UserNtuples->fillg78(losenergy,1.);
+            }
+          }
+        }  // MIonly or noMIonly ENDED
+           //    }
+
+        //     !!!!!!!!!!!!!
+
+      }  // for loop on all hits ENDED  ENDED  ENDED  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+      //     !!!!!!!!!!!!!
+
+      //======================================================================================================SUMHIT
+      //UserNtuples->fillg29(totallosenergy,1.);
+      //UserNtuples->fillg36(nhit11,1.);
+      //UserNtuples->fillg37(nhit12,1.);
+      //UserNtuples->fillg38(nhit13,1.);
+      //======================================================================================================SUMHIT
+      //   int rn00=3;//test only with 2 sensors in superlayer, not 4
+      //	  int rn00=rn0;//always
+      if (verbosity > 2) {
+        std::cout << "22222222222222222222222222222222222222222222222222222222222222222222222222 " << std::endl;
       }
-    }
-    else{
-      // no MIonly:
-      //UserNtuples->fillg17(lastpo.z(),1.);
-      //UserNtuples->fillg19(zz,1.);
-      //UserNtuples->fillg74(incidentEnergyHit,1.);
-      //UserNtuples->fillg75(float(trackIDhit),1.);
-    //                                                                     Station I
-      if( zz < z2){
-	//UserNtuples->fillg56(dx,1.);
-	//UserNtuples->fillg57(dy,1.);
-	//UserNtuples->fillg20(numofpart,1.);
-	//UserNtuples->fillg21(SumEnerDeposit,1.);
-	if(zside==1) {
-	  //UserNtuples->fillg26(losenergy,1.);
-	}
-	if(zside==2){
-	  //UserNtuples->fillg76(losenergy,1.);
-	}
-	if(trackIDhit == 1){
-	  //UserNtuples->fillg70(dx,1.);
-	  //UserNtuples->fillg71(incidentEnergyHit,1.);
-	  //UserNtuples->fillg79(losenergy,1.);
-	}
-	else{
-	  //UserNtuples->fillg82(dx,1.);
-	}
+      int det = 1;
+      int allplacesforsensors = 7;
+      for (int sector = 1; sector < sn0; sector++) {
+        for (int zmodule = 1; zmodule < pn0; zmodule++) {
+          for (int zsideinorder = 1; zsideinorder < allplacesforsensors; zsideinorder++) {
+            int zside = FP420NumberingScheme::realzside(rn00, zsideinorder);  //1,3,5,2,4,6
+            if (verbosity > 2) {
+              std::cout << "FP420Test:  sector= " << sector << " zmodule= " << zmodule
+                        << " zsideinorder= " << zsideinorder << " zside= " << zside << std::endl;
+            }
+            if (zside != 0) {
+              int justlayer = FP420NumberingScheme::unpackLayerIndex(rn00, zside);  // 1,2
+              if (justlayer < 1 || justlayer > 2) {
+                std::cout << "FP420Test:WRONG  justlayer= " << justlayer << std::endl;
+              }
+              int copyinlayer = FP420NumberingScheme::unpackCopyIndex(rn00, zside);  // 1,2,3
+              if (copyinlayer < 1 || copyinlayer > 3) {
+                std::cout << "FP420Test:WRONG  copyinlayer= " << copyinlayer << std::endl;
+              }
+              int orientation = FP420NumberingScheme::unpackOrientation(rn00, zside);  // Front: = 1; Back: = 2
+              if (orientation < 1 || orientation > 2) {
+                std::cout << "FP420Test:WRONG  orientation= " << orientation << std::endl;
+              }
+
+              // iu is a continues numbering of planes(!)  over two arm FP420 set up
+              int detfixed =
+                  1;  // use this treatment for each set up arm, hence no sense to do it defferently for +FP420 and -FP420;
+              //                                                                    and  ...[ii] massives have prepared in such a way
+              unsigned int ii =
+                  FP420NumberingScheme::packMYIndex(rn00, pn0, sn0, detfixed, justlayer, sector, zmodule) - 1;
+              // ii = 0-19   --> 20 items
+              if (verbosity > 2) {
+                std::cout << "FP420Test:  justlayer = " << justlayer << " copyinlayer = " << copyinlayer
+                          << " orientation = " << orientation << " ii= " << ii << std::endl;
+              }
+              double zdiststat = 0.;
+              if (sn0 < 4) {
+                if (sector == 2)
+                  zdiststat = zD3;
+              } else {
+                if (sector == 2)
+                  zdiststat = zD2;
+                if (sector == 3)
+                  zdiststat = zD3;
+              }
+              double kplane = -(pn0 - 1) / 2 - 0.5 + (zmodule - 1);  //-3.5 +0...5 = -3.5,-2.5,-1.5,+2.5,+1.5
+              double zcurrent = zinibeg + z420 + (ZSiStep - ZSiPlane) / 2 + kplane * ZSiStep + zdiststat;
+              //double zcurrent = zinibeg +(ZSiStep-ZSiPlane)/2  + kplane*ZSiStep + (sector-1)*zUnit;
+              if (verbosity > 2) {
+                std::cout << "FP420Test:  Leftzcurrent-419000. = " << zcurrent - 419000. << std::endl;
+                std::cout << "FP420Test:  ZGapLDet = " << ZGapLDet << std::endl;
+              }
+              if (justlayer == 1) {
+                if (orientation == 1)
+                  zcurrent += (ZGapLDet + ZSiDet / 2);
+                if (orientation == 2)
+                  zcurrent += zBlade - (ZGapLDet + ZSiDet / 2);
+              }
+              if (justlayer == 2) {
+                if (orientation == 1)
+                  zcurrent += (ZGapLDet + ZSiDet / 2) + zBlade + gapBlade;
+                if (orientation == 2)
+                  zcurrent += 2 * zBlade + gapBlade - (ZGapLDet + ZSiDet / 2);
+              }
+              //   .
+              //
+              if (det == 2)
+                zcurrent = -zcurrent;
+              //
+              if (verbosity > 2) {
+                std::cout << "FP420Test:  zcurrent-419000. = " << zcurrent - 419000. << std::endl;
+              }
+              //================================== end of for loops in continuius number iu:
+            }  //if(zside!=0
+          }    // for superlayer
+        }      // for zmodule
+      }        // for sector
+
+      if (verbosity > 2) {
+        std::cout << "----------------------------------------------------------------------------- " << std::endl;
       }
-    //                                                                     Station II
-      if( zz < z3 && zz > z2){
-	//UserNtuples->fillg52(dx,1.);
-	//UserNtuples->fillg53(dy,1.);
-	//UserNtuples->fillg22(numofpart,1.);
-	//UserNtuples->fillg23(SumEnerDeposit,1.);
-	//UserNtuples->fillg80(incidentEnergyHit,1.);
-	//UserNtuples->fillg81(float(trackIDhit),1.);
-	if(zside==1) {
-	  //UserNtuples->fillg27(losenergy,1.);
-	}
-	if(zside==2){
-	  //UserNtuples->fillg77(losenergy,1.);
-	}
-	if(trackIDhit == 1){
-	  //UserNtuples->fillg72(dx,1.);
-	  //UserNtuples->fillg73(incidentEnergyHit,1.);
-	}
-	else{
-	  //UserNtuples->fillg83(dx,1.);
-	}
+
+      //======================================================================================================CHECK
+      if (totallosenergy == 0.0) {
+        std::cout << "FP420Test:     number of hits = " << theCAFI->entries() << std::endl;
+        for (int j = 0; j < theCAFI->entries(); j++) {
+          FP420G4Hit* aHit = (*theCAFI)[j];
+          double losenergy = aHit->getEnergyLoss();
+          std::cout << " j hits = " << j << "losenergy = " << losenergy << std::endl;
+        }
       }
-    //                                                                     Station III
-      if( zz < z4 && zz > z3){
-	//UserNtuples->fillg68(dx,1.);
-	//UserNtuples->fillg69(dy,1.);
-	//UserNtuples->filld210(xx,yy,1.);
-	//UserNtuples->fillg22(numofpart,1.);
-	//UserNtuples->fillg23(SumEnerDeposit,1.);
-	if(zside==1) {
-	  //UserNtuples->fillg28(losenergy,1.);
-	}
-	if(zside==2){
-	  //UserNtuples->fillg78(losenergy,1.);
-	}
+      //======================================================================================================CHECK
+
+      //====================================================================================================== HIT  START
+
+      //   FIBRE Hit collected analysis
+      double totalEnergy = 0.;
+      int nhitsX = 0, nhitsY = 0, nsumhit = 0;
+      for (int sector = 1; sector < 4; sector++) {
+        int nhitsecX = 0, nhitsecY = 0;
+        for (int zmodule = 1; zmodule < 11; zmodule++) {
+          for (int zside = 1; zside < 3; zside++) {
+            int det = 1;
+            //      int nhit = 0;
+            //	int sScale = 20;
+            int index = FP420NumberingScheme::packFP420Index(det, zside, sector, zmodule);
+            double theTotalEnergy = themap[index];
+            //   X planes
+            if (zside < 2) {
+              //UserNtuples->fillg47(theTotalEnergy,1.);
+              if (theTotalEnergy > 0.00003) {
+                nhitsX += 1;
+                //	    nhitsecX += themap1[index];
+                //	    nhit=1;
+              }
+            }
+            //   Y planes
+            else {
+              //UserNtuples->fillg49(theTotalEnergy,1.);
+              if (theTotalEnergy > 0.00005) {
+                nhitsY += 1;
+                //	    nhitsecY += themap1[index];
+                //	    nhit=1;
+              }
+            }
+            // intindex is a continues numbering of FP420
+            //        int zScale=2;  unsigned int intindex = sScale*(sector - 1)+zScale*(zmodule - 1)+zside;
+            // int zScale=10;       unsigned int intindex = sScale*(sector - 1)+zScale*(zside - 1)+zmodule;
+            //UserNtuples->fillg41(float(intindex),theTotalEnergy);
+            //UserNtuples->fillg42(float(intindex),1.);
+            //UserNtuples->fillp208(float(intindex),float(nhit),1.);
+            //UserNtuples->fillp211(float(intindex),float(themap1[index]),1.);
+            totalEnergy += themap[index];
+          }  // for
+        }    // for
+        //UserNtuples->fillg39(nhitsecY,1.);
+        if (nhitsecX > 10 || nhitsecY > 10) {
+          nsumhit += 1;
+          //UserNtuples->fillp213(float(sector),float(1.),1.);
+        } else {  //UserNtuples->fillp213(float(sector),float(0.),1.);
+        }
+      }  // for
+      //====================================================================================================== HIT  END
+
+      //====================================================================================================== HIT  ALL
+      //UserNtuples->fillg43(totalEnergy,1.);
+      //UserNtuples->fillg58(nhitsX,1.);
+      //UserNtuples->fillg59(nhitsY,1.);
+      //  if( nsumhit !=0 ) { //UserNtuples->fillp212(vy,float(1.),1.);
+      if (nsumhit >= 2) {  //UserNtuples->fillp212(vy,float(1.),1.);
+      } else {             //UserNtuples->fillp212(vy,float(0.),1.);
       }
-    } // MIonly or noMIonly ENDED
-//    }
-
-   //     !!!!!!!!!!!!!
-
-   }  // for loop on all hits ENDED  ENDED  ENDED  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-   //     !!!!!!!!!!!!!
-   
-   //======================================================================================================SUMHIT
-   //UserNtuples->fillg29(totallosenergy,1.);
-   //UserNtuples->fillg36(nhit11,1.);
-   //UserNtuples->fillg37(nhit12,1.);
-   //UserNtuples->fillg38(nhit13,1.);
-   //======================================================================================================SUMHIT
-   //   int rn00=3;//test only with 2 sensors in superlayer, not 4
-    //	  int rn00=rn0;//always
-   if (verbosity > 2) {
-     std::cout << "22222222222222222222222222222222222222222222222222222222222222222222222222 " << std::endl;
-   } 
-  int det = 1;
-   int allplacesforsensors=7;
-   for (int sector=1; sector < sn0; sector++) {
-     for (int zmodule=1; zmodule<pn0; zmodule++) {
-       for (int zsideinorder=1; zsideinorder<allplacesforsensors; zsideinorder++) {
-	 int zside = FP420NumberingScheme::realzside(rn00, zsideinorder);//1,3,5,2,4,6
-	 if (verbosity > 2) {
-	   std::cout << "FP420Test:  sector= " << sector << " zmodule= " << zmodule << " zsideinorder= " << zsideinorder << " zside= " << zside << std::endl; 
-	 }	 
-	 if(zside != 0) {
-	   int justlayer = FP420NumberingScheme::unpackLayerIndex(rn00, zside);// 1,2
-	   if(justlayer<1||justlayer>2) {
-	     std::cout << "FP420Test:WRONG  justlayer= " << justlayer << std::endl; 
-	   }
-	   int copyinlayer = FP420NumberingScheme::unpackCopyIndex(rn00, zside);// 1,2,3
-	   if(copyinlayer<1||copyinlayer>3) {
-	     std::cout << "FP420Test:WRONG  copyinlayer= " << copyinlayer << std::endl; 
-	   }
-	   int orientation = FP420NumberingScheme::unpackOrientation(rn00, zside);// Front: = 1; Back: = 2
-	   if(orientation<1||orientation>2) {
-	     std::cout << "FP420Test:WRONG  orientation= " << orientation << std::endl; 
-	   }
-	   
-	   // iu is a continues numbering of planes(!)  over two arm FP420 set up
-	   int detfixed=1;// use this treatment for each set up arm, hence no sense to do it defferently for +FP420 and -FP420;
-	   //                                                                    and  ...[ii] massives have prepared in such a way
-	   unsigned int ii=FP420NumberingScheme::packMYIndex(rn00,pn0,sn0,detfixed,justlayer,sector,zmodule)-1;
-	   // ii = 0-19   --> 20 items
-	   if (verbosity > 2) {
-	     std::cout << "FP420Test:  justlayer = " << justlayer << " copyinlayer = " << copyinlayer << " orientation = " << orientation << " ii= " << ii << std::endl; 
-	   }	   
-	   double zdiststat = 0.;
-	   if(sn0<4) {
-	     if(sector==2) zdiststat = zD3;
-	   }
-	   else {
-	     if(sector==2) zdiststat = zD2;
-	     if(sector==3) zdiststat = zD3;
-	   }
-	   double kplane = -(pn0-1)/2 - 0.5  +  (zmodule-1); //-3.5 +0...5 = -3.5,-2.5,-1.5,+2.5,+1.5
-	   double zcurrent = zinibeg + z420 + (ZSiStep-ZSiPlane)/2  + kplane*ZSiStep + zdiststat;  
-	   //double zcurrent = zinibeg +(ZSiStep-ZSiPlane)/2  + kplane*ZSiStep + (sector-1)*zUnit;  
-	   if (verbosity > 2) {
-	     std::cout << "FP420Test:  Leftzcurrent-419000. = " << zcurrent-419000. << std::endl; 
-	     std::cout << "FP420Test:  ZGapLDet = " << ZGapLDet << std::endl; 
-	   }	   
-	   if(justlayer==1){
-	     if(orientation==1) zcurrent += (ZGapLDet+ZSiDet/2);
-	     if(orientation==2) zcurrent += zBlade-(ZGapLDet+ZSiDet/2);
-	   }
-	   if(justlayer==2){
-	     if(orientation==1) zcurrent += (ZGapLDet+ZSiDet/2)+zBlade+gapBlade;
-	     if(orientation==2) zcurrent += 2*zBlade+gapBlade-(ZGapLDet+ZSiDet/2);
-	   }
-	   //   .
-	   //
-	   if(det == 2) zcurrent = -zcurrent;
-	   //
-	   if (verbosity > 2) {
-	     std::cout << "FP420Test:  zcurrent-419000. = " << zcurrent-419000. << std::endl; 
-	   }
-	   //================================== end of for loops in continuius number iu:
-	 }//if(zside!=0
-       }   // for superlayer
-     }   // for zmodule
-   }   // for sector
-   
-
-   if (verbosity > 2) {
-     std::cout << "----------------------------------------------------------------------------- " << std::endl;
-   }   
-   
-
-
-//======================================================================================================CHECK
-  if(totallosenergy == 0.0) {
-    std::cout << "FP420Test:     number of hits = " << theCAFI->entries()   << std::endl;
-    for (int j=0; j<theCAFI->entries(); j++) {
-      FP420G4Hit* aHit = (*theCAFI)[j];
-      double  losenergy = aHit->getEnergyLoss();
-      std::cout << " j hits = " << j   << "losenergy = " << losenergy << std::endl;
-    }
-  }
-//======================================================================================================CHECK
-  
-
-
-//====================================================================================================== HIT  START
-
-  //   FIBRE Hit collected analysis
-  double totalEnergy = 0.;
-  int nhitsX = 0, nhitsY = 0, nsumhit = 0 ;
-  for (int sector=1; sector<4; sector++) {
-    int nhitsecX = 0, nhitsecY = 0;
-    for (int zmodule=1; zmodule<11; zmodule++) {
-      for (int zside=1; zside<3; zside++) {
-	int det= 1;
-//      int nhit = 0;
-//	int sScale = 20;
-	int index = FP420NumberingScheme::packFP420Index(det, zside, sector, zmodule);
-	double   theTotalEnergy = themap[index];
-	//   X planes
-	if(zside<2){ 
-	  //UserNtuples->fillg47(theTotalEnergy,1.); 
-	  if(theTotalEnergy > 0.00003) {
-	    nhitsX += 1;
-//	    nhitsecX += themap1[index];
-//	    nhit=1;
-	  }
-	}
-	//   Y planes
-	else {
-	  //UserNtuples->fillg49(theTotalEnergy,1.);
-	  if(theTotalEnergy > 0.00005) {
-	    nhitsY += 1;
-//	    nhitsecY += themap1[index];
-//	    nhit=1;
-	  }
-	}
-        // intindex is a continues numbering of FP420
-//        int zScale=2;  unsigned int intindex = sScale*(sector - 1)+zScale*(zmodule - 1)+zside;
-        // int zScale=10;       unsigned int intindex = sScale*(sector - 1)+zScale*(zside - 1)+zmodule;
-	//UserNtuples->fillg41(float(intindex),theTotalEnergy);
-	//UserNtuples->fillg42(float(intindex),1.);
-	//UserNtuples->fillp208(float(intindex),float(nhit),1.);
-	//UserNtuples->fillp211(float(intindex),float(themap1[index]),1.);
-	totalEnergy += themap[index];
-      } // for
-    } // for
-          //UserNtuples->fillg39(nhitsecY,1.); 
-          if(nhitsecX > 10 || nhitsecY > 10) {
-	    nsumhit +=1;
-	    //UserNtuples->fillp213(float(sector),float(1.),1.);
-	  }
-	  else{ //UserNtuples->fillp213(float(sector),float(0.),1.);
-	  }
-  } // for
-//====================================================================================================== HIT  END
-
-//====================================================================================================== HIT  ALL
-  //UserNtuples->fillg43(totalEnergy,1.);
-  //UserNtuples->fillg58(nhitsX,1.); 
-  //UserNtuples->fillg59(nhitsY,1.); 
-  //  if( nsumhit !=0 ) { //UserNtuples->fillp212(vy,float(1.),1.);
-  if( nsumhit >=2 ) { //UserNtuples->fillp212(vy,float(1.),1.);
-  }
-  else{   //UserNtuples->fillp212(vy,float(0.),1.);
-  }
 
-//====================================================================================================== HIT  ALL
+      //====================================================================================================== HIT  ALL
 
-//====================================================================================================== number of hits
-// .............
-//    } // number of hits < 50
-// .............
-    }   // MI or no MI or all  - end
+      //====================================================================================================== number of hits
+      // .............
+      //    } // number of hits < 50
+      // .............
+    }  // MI or no MI or all  - end
 
-    }                                                // primary end
-//=========================== thePrim != 0  end   ===
+  }  // primary end
+     //=========================== thePrim != 0  end   ===
   // ==========================================================================
   if (verbosity > 0) {
-   std::cout << "FP420Test:  END OF Event " << (*evt)()->GetEventID() << std::endl;
+    std::cout << "FP420Test:  END OF Event " << (*evt)()->GetEventID() << std::endl;
   }
 }
 
diff --git a/SimG4CMS/FP420/plugins/module.cc b/SimG4CMS/FP420/plugins/module.cc
old mode 100755
new mode 100644
index b732e5e085e0d..1aa5ad04d6f53
--- a/SimG4CMS/FP420/plugins/module.cc
+++ b/SimG4CMS/FP420/plugins/module.cc
@@ -4,10 +4,7 @@
 #include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 //#include "FWCore/Framework/interface/MakerMacros.h"
-  
 
 typedef FP420SD FP420SensitiveDetector;
 DEFINE_SENSITIVEDETECTOR(FP420SensitiveDetector);
-DEFINE_SIMWATCHER (FP420Test); //=
-
-
+DEFINE_SIMWATCHER(FP420Test);  //=
diff --git a/SimG4CMS/FP420/src/FP420G4Hit.cc b/SimG4CMS/FP420/src/FP420G4Hit.cc
index 8bc0945233531..7f3ec0871d1a3 100644
--- a/SimG4CMS/FP420/src/FP420G4Hit.cc
+++ b/SimG4CMS/FP420/src/FP420G4Hit.cc
@@ -6,26 +6,25 @@
 #include "SimG4CMS/FP420/interface/FP420G4Hit.h"
 #include <iostream>
 
-FP420G4Hit::FP420G4Hit():entry(0) {
-
+FP420G4Hit::FP420G4Hit() : entry(0) {
   entrylp(0);
   exitlp(0);
-  elem     = 0.;
-  hadr     = 0.;
+  elem = 0.;
+  hadr = 0.;
   theIncidentEnergy = 0.;
   theTimeSlice = 0.;
   theTrackID = -1;
-  theUnitID  =  0;
-  thePabs =0.;
-  theTof=0. ;
-  theEnergyLoss=0.   ;
-  theParticleType=0 ;
-  theUnitID=0;
-  theTrackID=-1;
-  theThetaAtEntry=-10000. ;
-  thePhiAtEntry=-10000. ;
-  theParentId=0;
-  
+  theUnitID = 0;
+  thePabs = 0.;
+  theTof = 0.;
+  theEnergyLoss = 0.;
+  theParticleType = 0;
+  theUnitID = 0;
+  theTrackID = -1;
+  theThetaAtEntry = -10000.;
+  thePhiAtEntry = -10000.;
+  theParentId = 0;
+
   theX = 0.;
   theY = 0.;
   theZ = 0.;
@@ -34,158 +33,145 @@ FP420G4Hit::FP420G4Hit():entry(0) {
   theVz = 0.;
 }
 
+FP420G4Hit::~FP420G4Hit() {}
+
+FP420G4Hit::FP420G4Hit(const FP420G4Hit& right) {
+  theUnitID = right.theUnitID;
+
+  theTrackID = right.theTrackID;
+  theTof = right.theTof;
+  theEnergyLoss = right.theEnergyLoss;
+  theParticleType = right.theParticleType;
+  thePabs = right.thePabs;
+  elem = right.elem;
+  hadr = right.hadr;
+  theIncidentEnergy = right.theIncidentEnergy;
+  theTimeSlice = right.theTimeSlice;
+  entry = right.entry;
+  entrylp = right.entrylp;
+  exitlp = right.exitlp;
+  theThetaAtEntry = right.theThetaAtEntry;
+  thePhiAtEntry = right.thePhiAtEntry;
+  theParentId = right.theParentId;
 
-FP420G4Hit::~FP420G4Hit(){}
-
-
-FP420G4Hit::FP420G4Hit(const FP420G4Hit &right) {
-  theUnitID         = right.theUnitID;
-  
-  theTrackID        = right.theTrackID;
-  theTof            = right.theTof ;
-  theEnergyLoss      = right.theEnergyLoss   ;
-  theParticleType    = right.theParticleType ;
-  thePabs            = right.thePabs;
-  elem               = right.elem;
-  hadr               = right.hadr;
-  theIncidentEnergy  = right.theIncidentEnergy;
-  theTimeSlice       = right.theTimeSlice;
-  entry              = right.entry;
-  entrylp            = right.entrylp;
-  exitlp             = right.exitlp;
-  theThetaAtEntry    = right.theThetaAtEntry;
-  thePhiAtEntry      = right.thePhiAtEntry;
-  theParentId        = right.theParentId;
-  
   theX = right.theX;
   theY = right.theY;
   theZ = right.theZ;
-  
+
   theVx = right.theVx;
   theVy = right.theVy;
   theVz = right.theVz;
-  
-  
 }
 
+const FP420G4Hit& FP420G4Hit::operator=(const FP420G4Hit& right) {
+  theUnitID = right.theUnitID;
+
+  theTrackID = right.theTrackID;
+  theTof = right.theTof;
+  theEnergyLoss = right.theEnergyLoss;
+  theParticleType = right.theParticleType;
+  thePabs = right.thePabs;
+  elem = right.elem;
+  hadr = right.hadr;
+  theIncidentEnergy = right.theIncidentEnergy;
+  theTimeSlice = right.theTimeSlice;
+  entry = right.entry;
+  entrylp = right.entrylp;
+  exitlp = right.exitlp;
+  theThetaAtEntry = right.theThetaAtEntry;
+  thePhiAtEntry = right.thePhiAtEntry;
+  theParentId = right.theParentId;
 
-const FP420G4Hit& FP420G4Hit::operator=(const FP420G4Hit &right) {
-  theUnitID         = right.theUnitID;
-  
-  theTrackID        = right.theTrackID;
-  theTof            = right.theTof ;
-  theEnergyLoss      = right.theEnergyLoss   ;
-  theParticleType    = right.theParticleType ;
-  thePabs            = right.thePabs;
-  elem               = right.elem;
-  hadr               = right.hadr;
-  theIncidentEnergy  = right.theIncidentEnergy;
-  theTimeSlice       = right.theTimeSlice;
-  entry              = right.entry;
-  entrylp            = right.entrylp;
-  exitlp             = right.exitlp;
-  theThetaAtEntry    = right.theThetaAtEntry;
-  thePhiAtEntry      = right.thePhiAtEntry;
-  theParentId        = right.theParentId;
-  
   theX = right.theX;
   theY = right.theY;
   theZ = right.theZ;
-  
+
   theVx = right.theVx;
   theVy = right.theVy;
   theVz = right.theVz;
-  
-  
+
   return *this;
 }
 
-
 void FP420G4Hit::addEnergyDeposit(const FP420G4Hit& aHit) {
-
   elem += aHit.getEM();
   hadr += aHit.getHadr();
 }
 
+void FP420G4Hit::Print() { std::cout << (*this); }
 
-void FP420G4Hit::Print() {
-  std::cout << (*this);
-}
-
-G4ThreeVector   FP420G4Hit::getEntry() const           {return entry;}
-void         FP420G4Hit::setEntry(const G4ThreeVector& xyz)   { entry    = xyz; }
-
-G4ThreeVector    FP420G4Hit::getEntryLocalP() const           {return entrylp;}
-void         FP420G4Hit::setEntryLocalP(const G4ThreeVector& xyz1)   { entrylp    = xyz1; }
-
-G4ThreeVector     FP420G4Hit::getExitLocalP() const           {return exitlp;}
-void         FP420G4Hit::setExitLocalP(const G4ThreeVector& xyz1)   { exitlp    = xyz1; }
+G4ThreeVector FP420G4Hit::getEntry() const { return entry; }
+void FP420G4Hit::setEntry(const G4ThreeVector& xyz) { entry = xyz; }
 
-double       FP420G4Hit::getEM() const              {return elem; }
-void         FP420G4Hit::setEM (double e)           { elem     = e; }
-      
-double       FP420G4Hit::getHadr() const            {return hadr; }
-void         FP420G4Hit::setHadr (double e)         { hadr     = e; }
-      
-double       FP420G4Hit::getIncidentEnergy() const  {return theIncidentEnergy; }
-void         FP420G4Hit::setIncidentEnergy (double e){theIncidentEnergy  = e; }
+G4ThreeVector FP420G4Hit::getEntryLocalP() const { return entrylp; }
+void FP420G4Hit::setEntryLocalP(const G4ThreeVector& xyz1) { entrylp = xyz1; }
 
-unsigned int  FP420G4Hit::getTrackID() const         {return theTrackID; }
-void         FP420G4Hit::setTrackID (int i)         { theTrackID = i; }
+G4ThreeVector FP420G4Hit::getExitLocalP() const { return exitlp; }
+void FP420G4Hit::setExitLocalP(const G4ThreeVector& xyz1) { exitlp = xyz1; }
 
-unsigned int FP420G4Hit::getUnitID() const          {return theUnitID; }
-void         FP420G4Hit::setUnitID (unsigned int i) { theUnitID = i; }
+double FP420G4Hit::getEM() const { return elem; }
+void FP420G4Hit::setEM(double e) { elem = e; }
 
-double       FP420G4Hit::getTimeSlice() const       {return theTimeSlice; }
-void         FP420G4Hit::setTimeSlice (double d)    { theTimeSlice = d; }
-int          FP420G4Hit::getTimeSliceID() const     {return (int)theTimeSlice;}
+double FP420G4Hit::getHadr() const { return hadr; }
+void FP420G4Hit::setHadr(double e) { hadr = e; }
 
-void         FP420G4Hit::addEnergyDeposit(double em, double hd)
-                                                   {elem  += em ; hadr += hd;}
+double FP420G4Hit::getIncidentEnergy() const { return theIncidentEnergy; }
+void FP420G4Hit::setIncidentEnergy(double e) { theIncidentEnergy = e; }
 
-double       FP420G4Hit::getEnergyDeposit() const   {return elem+hadr;}
+unsigned int FP420G4Hit::getTrackID() const { return theTrackID; }
+void FP420G4Hit::setTrackID(int i) { theTrackID = i; }
 
-float FP420G4Hit::getPabs() const {return thePabs;}
-float FP420G4Hit::getTof() const {return theTof;}
-float FP420G4Hit::getEnergyLoss() const {return theEnergyLoss;}
-int FP420G4Hit::getParticleType() const {return theParticleType;}
+unsigned int FP420G4Hit::getUnitID() const { return theUnitID; }
+void FP420G4Hit::setUnitID(unsigned int i) { theUnitID = i; }
 
-void FP420G4Hit::setPabs(float e) {thePabs = e;}
-void FP420G4Hit::setTof(float e) {theTof = e;}
-void FP420G4Hit::addEnergyLoss(float e) {theEnergyLoss += e;}
-void FP420G4Hit::setEnergyLoss(float e) {theEnergyLoss = e;}
-void FP420G4Hit::setParticleType(short i) {theParticleType = i;}
+double FP420G4Hit::getTimeSlice() const { return theTimeSlice; }
+void FP420G4Hit::setTimeSlice(double d) { theTimeSlice = d; }
+int FP420G4Hit::getTimeSliceID() const { return (int)theTimeSlice; }
 
-float FP420G4Hit::getThetaAtEntry() const {return theThetaAtEntry;}   
-float FP420G4Hit::getPhiAtEntry() const{ return thePhiAtEntry;}
+void FP420G4Hit::addEnergyDeposit(double em, double hd) {
+  elem += em;
+  hadr += hd;
+}
 
-void FP420G4Hit::setThetaAtEntry(float t){theThetaAtEntry = t;}
-void FP420G4Hit::setPhiAtEntry(float f) {thePhiAtEntry = f ;}
+double FP420G4Hit::getEnergyDeposit() const { return elem + hadr; }
 
-float FP420G4Hit::getX() const{ return theX;}
-void FP420G4Hit::setX(float t){theX = t;}
+float FP420G4Hit::getPabs() const { return thePabs; }
+float FP420G4Hit::getTof() const { return theTof; }
+float FP420G4Hit::getEnergyLoss() const { return theEnergyLoss; }
+int FP420G4Hit::getParticleType() const { return theParticleType; }
 
-float FP420G4Hit::getY() const{ return theY;}
-void FP420G4Hit::setY(float t){theY = t;}
+void FP420G4Hit::setPabs(float e) { thePabs = e; }
+void FP420G4Hit::setTof(float e) { theTof = e; }
+void FP420G4Hit::addEnergyLoss(float e) { theEnergyLoss += e; }
+void FP420G4Hit::setEnergyLoss(float e) { theEnergyLoss = e; }
+void FP420G4Hit::setParticleType(short i) { theParticleType = i; }
 
-float FP420G4Hit::getZ() const{ return theZ;}
-void FP420G4Hit::setZ(float t){theZ = t;}
+float FP420G4Hit::getThetaAtEntry() const { return theThetaAtEntry; }
+float FP420G4Hit::getPhiAtEntry() const { return thePhiAtEntry; }
 
-int FP420G4Hit::getParentId() const {return theParentId;}
-void FP420G4Hit::setParentId(int p){theParentId = p;}
+void FP420G4Hit::setThetaAtEntry(float t) { theThetaAtEntry = t; }
+void FP420G4Hit::setPhiAtEntry(float f) { thePhiAtEntry = f; }
 
-float FP420G4Hit::getVx() const{ return theVx;}
-void FP420G4Hit::setVx(float t){theVx = t;}
+float FP420G4Hit::getX() const { return theX; }
+void FP420G4Hit::setX(float t) { theX = t; }
 
-float FP420G4Hit::getVy() const{ return theVy;}
-void FP420G4Hit::setVy(float t){theVy = t;}
+float FP420G4Hit::getY() const { return theY; }
+void FP420G4Hit::setY(float t) { theY = t; }
 
-float FP420G4Hit::getVz() const{ return theVz;}
-void FP420G4Hit::setVz(float t){theVz = t;}
+float FP420G4Hit::getZ() const { return theZ; }
+void FP420G4Hit::setZ(float t) { theZ = t; }
 
+int FP420G4Hit::getParentId() const { return theParentId; }
+void FP420G4Hit::setParentId(int p) { theParentId = p; }
 
+float FP420G4Hit::getVx() const { return theVx; }
+void FP420G4Hit::setVx(float t) { theVx = t; }
 
+float FP420G4Hit::getVy() const { return theVy; }
+void FP420G4Hit::setVy(float t) { theVy = t; }
 
+float FP420G4Hit::getVz() const { return theVz; }
+void FP420G4Hit::setVz(float t) { theVz = t; }
 
 std::ostream& operator<<(std::ostream& os, const FP420G4Hit& hit) {
   os << " Data of this FP420G4Hit are:" << std::endl
@@ -210,13 +196,9 @@ std::ostream& operator<<(std::ostream& os, const FP420G4Hit& hit) {
      << " VtxZ = " << hit.getVz() << std::endl
      << " parentID = " << hit.getParentId() << std::endl
      << " Pabs = " << hit.getPabs() << std::endl
-     << " Energy of primary particle (ID = " << hit.getTrackID()
-     << ") = " << hit.getIncidentEnergy() << " (MeV)"<<std::endl
-     << " Entry point in FP420 unit number " << hit.getUnitID()
-     << " is: " << hit.getEntry() << " (mm)" << std::endl;
-  os << "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-     << std::endl;
+     << " Energy of primary particle (ID = " << hit.getTrackID() << ") = " << hit.getIncidentEnergy() << " (MeV)"
+     << std::endl
+     << " Entry point in FP420 unit number " << hit.getUnitID() << " is: " << hit.getEntry() << " (mm)" << std::endl;
+  os << "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" << std::endl;
   return os;
 }
-
-
diff --git a/SimG4CMS/FP420/src/FP420HitsObject.cc b/SimG4CMS/FP420/src/FP420HitsObject.cc
index 252b94e938336..14ed2ce9f81b0 100644
--- a/SimG4CMS/FP420/src/FP420HitsObject.cc
+++ b/SimG4CMS/FP420/src/FP420HitsObject.cc
@@ -1,4 +1,3 @@
 #include "SimG4CMS/FP420/interface/FP420HitsObject.h"
 
-FP420HitsObject::FP420HitsObject(std::string n, TrackingSlaveSD::Collection& h): _hits(h), _name(n)
-{}
+FP420HitsObject::FP420HitsObject(std::string n, TrackingSlaveSD::Collection& h) : _hits(h), _name(n) {}
diff --git a/SimG4CMS/FP420/src/FP420NumberingScheme.cc b/SimG4CMS/FP420/src/FP420NumberingScheme.cc
index 43ed85a9acbf1..c151b23f69b60 100644
--- a/SimG4CMS/FP420/src/FP420NumberingScheme.cc
+++ b/SimG4CMS/FP420/src/FP420NumberingScheme.cc
@@ -14,61 +14,54 @@
 //UserVerbosity FP420NumberingScheme::cout("FP420NumberingScheme","silent","FP420NumberingScheme");
 
 FP420NumberingScheme::FP420NumberingScheme() {
-//  sn0=3, pn0=6, rn0=7;   
+  //  sn0=3, pn0=6, rn0=7;
 }
 
 FP420NumberingScheme::~FP420NumberingScheme() {
   //  std::cout << " Deleting FP420NumberingScheme" << std::endl;
 }
 
-                                                                                
 int FP420NumberingScheme::detectorLevel(const G4Step* aStep) const {
-                                                                                
   //Find number of levels
   const G4VTouchable* touch = aStep->GetPreStepPoint()->GetTouchable();
   int level = 0;
-  if (touch) level = ((touch->GetHistoryDepth())+1);
+  if (touch)
+    level = ((touch->GetHistoryDepth()) + 1);
   return level;
 }
-                                                                                
-void FP420NumberingScheme::detectorLevel(const G4Step* aStep, int& level,
-                                        int* copyno, G4String* name) const {
-                                                                                
+
+void FP420NumberingScheme::detectorLevel(const G4Step* aStep, int& level, int* copyno, G4String* name) const {
   //Get name and copy numbers
   if (level > 0) {
     const G4VTouchable* touch = aStep->GetPreStepPoint()->GetTouchable();
     for (int ii = 0; ii < level; ii++) {
-      int i      = level - ii - 1;
-      name[ii]   = touch->GetVolume(i)->GetName();
+      int i = level - ii - 1;
+      name[ii] = touch->GetVolume(i)->GetName();
       copyno[ii] = touch->GetReplicaNumber(i);
     }
   }
 }
-                                                                                
-
-
 
 unsigned int FP420NumberingScheme::getUnitID(const G4Step* aStep) const {
-  
-  unsigned intindex=0;
+  unsigned intindex = 0;
   int level = detectorLevel(aStep);
-  
+
   // std::cout << "FP420NumberingScheme number of levels= " << level << std::endl;
-  
+
   //  unsigned int intIndex = 0;
   if (level > 0) {
-    int*      copyno = new int[level];
-    G4String* name   = new G4String[level];
+    int* copyno = new int[level];
+    G4String* name = new G4String[level];
     detectorLevel(aStep, level, copyno, name);
-    
+
     //    int det   = static_cast<int>(FP420);;
-    
-    int det = 1; 
-    int stationgen  = 0;
-    int zside   = 0;
-    int station  = 0;
+
+    int det = 1;
+    int stationgen = 0;
+    int zside = 0;
+    int station = 0;
     int plane = 0;
-    for (int ich=0; ich  <  level; ich++) {
+    for (int ich = 0; ich < level; ich++) {
       /*
       // old set up configuration with equidistant stations 
       if(name[ich] == "FP420Ex") {
@@ -84,36 +77,36 @@ unsigned int FP420NumberingScheme::getUnitID(const G4Step* aStep) const {
       }
       */
       // new and old set up configurations are possible:
-      if(name[ich] == "FP420E") {
-	det   = copyno[ich];
-      } else if(name[ich] == "HPS240E") {
-	det   = copyno[ich] + 2 ;
-      } else if(name[ich] == "FP420Ex1" || name[ich] == "HPS240Ex1") {
-	stationgen   = 1;
-	//    } else if(name[ich] == "FP420Ex2") {
-	//	stationgen   = 2;
-      } else if(name[ich] == "FP420Ex3" || name[ich] == "HPS240Ex3") {
-	stationgen   = 2;// was =3
-      } else if(name[ich] == "SISTATION" || name[ich] == "HPS240SISTATION") {
-	station   = stationgen;
-      } else if(name[ich] == "SIPLANE" || name[ich] == "HPS240SIPLANE") {
-	plane   = copyno[ich];
-	// SIDETL (or R) can be ether X or Y type in next schemes of readout
-	//        !!! (=...) zside
-	//
-	//      1                  2     <---copyno
-	//   Front(=2) Empty(=4) Back(=6)     <--SIDETR OR SENSOR2
-	//      1         2              <---copyno
-	//   Front(=1) Back(=3) Empty(=5)     <--SIDETL OR SENSOR1
-	//
-      } else if(name[ich] == "SENSOR2" || name[ich] == "HPS240SENSOR2") {
-	//    } else if(name[ich] == "SIDETR") {
-	//	zside   = 4 * copyno[ich] - 2 ;//= 2   6 (copyno=1,2)
-	zside   = 3 * copyno[ich];//= 3   6 (copyno=1,2)
-      } else if(name[ich] == "SENSOR1" || name[ich] == "HPS240SENSOR1") {
-	//     } else if(name[ich] == "SIDETL") {
-	//	zside   = 2 * copyno[ich] - 1 ;//= 1   3 (copyno=1,2)
-	zside   = copyno[ich];//= 1   2 (copyno=1,2)
+      if (name[ich] == "FP420E") {
+        det = copyno[ich];
+      } else if (name[ich] == "HPS240E") {
+        det = copyno[ich] + 2;
+      } else if (name[ich] == "FP420Ex1" || name[ich] == "HPS240Ex1") {
+        stationgen = 1;
+        //    } else if(name[ich] == "FP420Ex2") {
+        //	stationgen   = 2;
+      } else if (name[ich] == "FP420Ex3" || name[ich] == "HPS240Ex3") {
+        stationgen = 2;  // was =3
+      } else if (name[ich] == "SISTATION" || name[ich] == "HPS240SISTATION") {
+        station = stationgen;
+      } else if (name[ich] == "SIPLANE" || name[ich] == "HPS240SIPLANE") {
+        plane = copyno[ich];
+        // SIDETL (or R) can be ether X or Y type in next schemes of readout
+        //        !!! (=...) zside
+        //
+        //      1                  2     <---copyno
+        //   Front(=2) Empty(=4) Back(=6)     <--SIDETR OR SENSOR2
+        //      1         2              <---copyno
+        //   Front(=1) Back(=3) Empty(=5)     <--SIDETL OR SENSOR1
+        //
+      } else if (name[ich] == "SENSOR2" || name[ich] == "HPS240SENSOR2") {
+        //    } else if(name[ich] == "SIDETR") {
+        //	zside   = 4 * copyno[ich] - 2 ;//= 2   6 (copyno=1,2)
+        zside = 3 * copyno[ich];  //= 3   6 (copyno=1,2)
+      } else if (name[ich] == "SENSOR1" || name[ich] == "HPS240SENSOR1") {
+        //     } else if(name[ich] == "SIDETL") {
+        //	zside   = 2 * copyno[ich] - 1 ;//= 1   3 (copyno=1,2)
+        zside = copyno[ich];  //= 1   2 (copyno=1,2)
       }
       //
       //  std::cout << "FP420NumberingScheme  " << "ich=" << ich  << "copyno" << copyno[ich] << "name="  << name[ich] << std::endl;
@@ -122,13 +115,13 @@ unsigned int FP420NumberingScheme::getUnitID(const G4Step* aStep) const {
     // det = 1 for +FP420 ,  = 2 for -FP420  / (det-1) = 0,1
     // det = 3 for +HPS240 , = 4 for -HPS240 / (det-1) = 2,3
     // 0 is as default for every below:
-    // Z index 
+    // Z index
     // station number 1 - 8   (in reality just 2 ones)
     // superplane(superlayer) number  1 - 16 (in reality just 5 ones)
-    
+
     // intindex = myPacker.packEcalIndex (det, zside, station, plane);// see examples
     // intindex = myPacker.packCastorIndex (det, zside, station, plane);// see examples
-    intindex = packFP420Index (det, zside, station, plane);
+    intindex = packFP420Index(det, zside, station, plane);
     /*
     //
     std::cout << "FP420NumberingScheme det=" << det << " zside=" << zside << " station=" <<station  << " plane=" << plane << std::endl;
@@ -138,54 +131,46 @@ unsigned int FP420NumberingScheme::getUnitID(const G4Step* aStep) const {
     std::cout << " packed index = intindex" << intindex << std::endl;
     }
     //    
-    */   
-    
-    
+    */
+
     delete[] copyno;
     delete[] name;
   }
-  
+
   return intindex;
-  
 }
 
-unsigned FP420NumberingScheme::packFP420Index(int det, int zside, int station,int plane){
-  //  
-  unsigned int idx = ((det-1)&3)<<19;   //bit 19-20 (det-1):0- 3 = 4-->2**2 = 4  -> 4-1  ->((det-1)&3)  2 bit: 0-1
+unsigned FP420NumberingScheme::packFP420Index(int det, int zside, int station, int plane) {
+  //
+  unsigned int idx = ((det - 1) & 3) << 19;  //bit 19-20 (det-1):0- 3 = 4-->2**2 = 4  -> 4-1  ->((det-1)&3)  2 bit: 0-1
   // unsigned int idx = ((det-1)&1)<<20;//bit 20-20 (det-1):0- 1 = 2-->2**1 = 2  -> 2-1  ->((det-1)&1)  1 bit: 0
-  idx += (zside&7)<<7;                 //bits  7- 9   zside:0- 7 = 8-->2**3 = 8  -> 8-1  ->  (zside&7)  3 bits:0-2
+  idx += (zside & 7) << 7;  //bits  7- 9   zside:0- 7 = 8-->2**3 = 8  -> 8-1  ->  (zside&7)  3 bits:0-2
   //  idx += (zside&3)<<7;             //bits  7- 8   zside:0- 3 = 4-->2**2 = 4  -> 4-1  ->  (zside&3)  2 bits:0-1
-  idx += (station&7)<<4;               //bits  4- 6 station:0- 7 = 8-->2**3 = 8  -> 8-1  ->(station&7)  3 bits:0-2
-  idx += (plane&15);                   //bits  0- 3   plane:0-15 =16-->2**4 =16  ->16-1  -> (plane&15)  4 bits:0-3
-  
-  //  
-  
+  idx += (station & 7) << 4;  //bits  4- 6 station:0- 7 = 8-->2**3 = 8  -> 8-1  ->(station&7)  3 bits:0-2
+  idx += (plane & 15);        //bits  0- 3   plane:0-15 =16-->2**4 =16  ->16-1  -> (plane&15)  4 bits:0-3
+
+  //
+
   //  std::cout << "FP420 packing: det " << det  << " zside  " << zside << " station " << station  << " plane " <<  plane << " idx " << idx <<  std::endl;
   //  int newdet, newzside, newstation,newplane;
   //  unpackFP420Index(idx, newdet, newzside, newstation,newplane);
-  
+
   //
-  
+
   return idx;
 }
 
-
-
-void FP420NumberingScheme::unpackFP420Index(const unsigned int& idx, int& det,
-                                        int& zside, int& station,
-                                        int& plane) {
-  det  = (idx>>19)&3;
+void FP420NumberingScheme::unpackFP420Index(const unsigned int& idx, int& det, int& zside, int& station, int& plane) {
+  det = (idx >> 19) & 3;
   //det  = (idx>>20)&1;
   det += 1;
-  zside   = (idx>>7)&7;
+  zside = (idx >> 7) & 7;
   //  zside   = (idx>>7)&3;
-  station = (idx>>4)&7;
-  plane   =  idx&15;
-  //                                                                                
-  
+  station = (idx >> 4) & 7;
+  plane = idx & 15;
+  //
+
   //  std::cout  << " FP420unpacking: idx=" << idx << " zside  " << zside << " station " << station  << " plane " <<  plane << std::endl;
 
   //
 }
-
-
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct2XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct2XML_cfi.py
new file mode 100644
index 0000000000000..cb6168b6b6f20
--- /dev/null
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct2XML_cfi.py
@@ -0,0 +1,21 @@
+import FWCore.ParameterSet.Config as cms
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
+                               'Geometry/CMSCommonData/data/rotations.xml',
+                               'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+                               'Geometry/HGCalCommonData/data/TB181/cms.xml',
+                               'Geometry/HGCalCommonData/data/TB181/Oct182/hgcal.xml',
+                               'Geometry/HGCalCommonData/data/TB181/Oct182/hgcalEE.xml',
+                               'Geometry/HGCalCommonData/data/TB181/Oct182/hgcalHE.xml',
+                               'Geometry/HGCalCommonData/data/TB181/Oct182/ahcal.xml',
+                               'Geometry/HGCalCommonData/data/TB181/Oct182/hgcalBeam.xml',
+                               'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+                               'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalsense.xml',
+                               'Geometry/HGCalCommonData/data/TB181/hgcProdCuts.xml',
+                               'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml'
+                               ),
+    rootNodeName = cms.string('cms:OCMS')
+)
+
+
diff --git a/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct3XML_cfi.py b/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct3XML_cfi.py
new file mode 100644
index 0000000000000..cdbd1e8dedc48
--- /dev/null
+++ b/SimG4CMS/HGCalTestBeam/python/HGCalTB181Oct3XML_cfi.py
@@ -0,0 +1,21 @@
+import FWCore.ParameterSet.Config as cms
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
+                               'Geometry/CMSCommonData/data/rotations.xml',
+                               'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+                               'Geometry/HGCalCommonData/data/TB181/cms.xml',
+                               'Geometry/HGCalCommonData/data/TB181/Oct183/hgcal.xml',
+                               'Geometry/HGCalCommonData/data/TB181/Oct183/hgcalEE.xml',
+                               'Geometry/HGCalCommonData/data/TB181/Oct183/hgcalHE.xml',
+                               'Geometry/HGCalCommonData/data/TB181/Oct183/ahcal.xml',
+                               'Geometry/HGCalCommonData/data/TB181/Oct183/hgcalBeam.xml',
+                               'Geometry/HGCalCommonData/data/hgcalwafer/v7/hgcalwafer.xml',
+                               'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalsense.xml',
+                               'Geometry/HGCalCommonData/data/TB181/hgcProdCuts.xml',
+                               'Geometry/HGCalCommonData/data/TB181/Oct181/hgcalCons.xml'
+                               ),
+    rootNodeName = cms.string('cms:OCMS')
+)
+
+
diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1_cfg.py
similarity index 100%
rename from SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct_cfg.py
rename to SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1_cfg.py
diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct2_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct2_cfg.py
new file mode 100644
index 0000000000000..b982747a76b69
--- /dev/null
+++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct2_cfg.py
@@ -0,0 +1,99 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process('SIM')
+
+# import of standard configurations
+process.load("FWCore.MessageService.MessageLogger_cfi")
+process.load('Configuration.StandardSequences.Services_cff')
+process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi')
+process.load('Configuration.EventContent.EventContent_cff')
+process.load('SimGeneral.MixingModule.mixNoPU_cfi')
+process.load('SimG4CMS.HGCalTestBeam.HGCalTB181Oct2XML_cfi')
+process.load('Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi')
+process.load('Geometry.HGCalCommonData.hgcalParametersInitialization_cfi')
+process.load('Configuration.StandardSequences.MagneticField_0T_cff')
+process.load('Configuration.StandardSequences.Generator_cff')
+process.load('IOMC.EventVertexGenerators.VtxSmearedFlat_cfi')
+process.load('GeneratorInterface.Core.genFilterSummary_cff')
+process.load('Configuration.StandardSequences.SimIdeal_cff')
+process.load('Configuration.StandardSequences.EndOfProcess_cff')
+process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
+process.load('SimG4CMS.HGCalTestBeam.HGCalTBCheckGunPosition_cfi')
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(10)
+)
+
+if 'MessageLogger' in process.__dict__:
+    process.MessageLogger.categories.append('HGCalGeom')
+    process.MessageLogger.categories.append('SimG4CoreGeometry')
+    process.MessageLogger.categories.append('HGCSim')
+    process.MessageLogger.categories.append('HcalSim')
+    process.MessageLogger.categories.append('HcalTB06BeamSD')
+
+# Input source
+process.source = cms.Source("EmptySource")
+
+process.options = cms.untracked.PSet(
+)
+
+# Production Info
+process.configurationMetadata = cms.untracked.PSet(
+    annotation = cms.untracked.string('SingleMuonE200_cfi nevts:10'),
+    name = cms.untracked.string('Applications'),
+    version = cms.untracked.string('$Revision: 1.19 $')
+)
+
+# Additional output definition
+process.TFileService = cms.Service("TFileService",
+                                   fileName = cms.string('TBGenSim.root')
+                                   )
+
+# Other statements
+process.genstepfilter.triggerConditions=cms.vstring("generation_step")
+from Configuration.AlCa.GlobalTag import GlobalTag
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '')
+
+process.generator = cms.EDProducer("FlatRandomEThetaGunProducer",
+    AddAntiParticle = cms.bool(False),
+    PGunParameters = cms.PSet(
+        MinE = cms.double(99.99),
+        MaxE = cms.double(100.01),
+        MinTheta = cms.double(0.0),
+        MaxTheta = cms.double(0.0),
+        MinPhi = cms.double(-3.14159265359),
+        MaxPhi = cms.double(3.14159265359),
+        PartID = cms.vint32(11)
+    ),
+    Verbosity = cms.untracked.int32(0),
+    firstRun = cms.untracked.uint32(1),
+    psethack = cms.string('single muon E 100')
+)
+process.VtxSmeared.MinZ = -800.0
+process.VtxSmeared.MaxZ = -800.0
+process.VtxSmeared.MinX = -7.5
+process.VtxSmeared.MaxX =  7.5
+process.VtxSmeared.MinY = -7.5
+process.VtxSmeared.MaxY =  7.5
+process.g4SimHits.HGCSD.RejectMouseBite = True
+process.g4SimHits.HGCSD.RotatedWafer    = True
+
+# Path and EndPath definitions
+process.generation_step = cms.Path(process.pgen)
+process.gunfilter_step  = cms.Path(process.HGCalTBCheckGunPostion)
+process.simulation_step = cms.Path(process.psim)
+process.genfiltersummary_step = cms.EndPath(process.genFilterSummary)
+process.endjob_step = cms.EndPath(process.endOfProcess)
+
+# Schedule definition
+process.schedule = cms.Schedule(process.generation_step,
+				process.genfiltersummary_step,
+				process.simulation_step,
+				process.gunfilter_step,
+				process.endjob_step,
+				)
+# filter all path with the production filter sequence
+for path in process.paths:
+	getattr(process,path)._seq = process.generator * getattr(process,path)._seq
+
+
diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct3_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct3_cfg.py
new file mode 100644
index 0000000000000..ad3610decc73c
--- /dev/null
+++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct3_cfg.py
@@ -0,0 +1,99 @@
+import FWCore.ParameterSet.Config as cms
+
+process = cms.Process('SIM')
+
+# import of standard configurations
+process.load("FWCore.MessageService.MessageLogger_cfi")
+process.load('Configuration.StandardSequences.Services_cff')
+process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi')
+process.load('Configuration.EventContent.EventContent_cff')
+process.load('SimGeneral.MixingModule.mixNoPU_cfi')
+process.load('SimG4CMS.HGCalTestBeam.HGCalTB181Oct3XML_cfi')
+process.load('Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi')
+process.load('Geometry.HGCalCommonData.hgcalParametersInitialization_cfi')
+process.load('Configuration.StandardSequences.MagneticField_0T_cff')
+process.load('Configuration.StandardSequences.Generator_cff')
+process.load('IOMC.EventVertexGenerators.VtxSmearedFlat_cfi')
+process.load('GeneratorInterface.Core.genFilterSummary_cff')
+process.load('Configuration.StandardSequences.SimIdeal_cff')
+process.load('Configuration.StandardSequences.EndOfProcess_cff')
+process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
+process.load('SimG4CMS.HGCalTestBeam.HGCalTBCheckGunPosition_cfi')
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(10)
+)
+
+if 'MessageLogger' in process.__dict__:
+    process.MessageLogger.categories.append('HGCalGeom')
+    process.MessageLogger.categories.append('SimG4CoreGeometry')
+    process.MessageLogger.categories.append('HGCSim')
+    process.MessageLogger.categories.append('HcalSim')
+    process.MessageLogger.categories.append('HcalTB06BeamSD')
+
+# Input source
+process.source = cms.Source("EmptySource")
+
+process.options = cms.untracked.PSet(
+)
+
+# Production Info
+process.configurationMetadata = cms.untracked.PSet(
+    annotation = cms.untracked.string('SingleMuonE200_cfi nevts:10'),
+    name = cms.untracked.string('Applications'),
+    version = cms.untracked.string('$Revision: 1.19 $')
+)
+
+# Additional output definition
+process.TFileService = cms.Service("TFileService",
+                                   fileName = cms.string('TBGenSim.root')
+                                   )
+
+# Other statements
+process.genstepfilter.triggerConditions=cms.vstring("generation_step")
+from Configuration.AlCa.GlobalTag import GlobalTag
+process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '')
+
+process.generator = cms.EDProducer("FlatRandomEThetaGunProducer",
+    AddAntiParticle = cms.bool(False),
+    PGunParameters = cms.PSet(
+        MinE = cms.double(99.99),
+        MaxE = cms.double(100.01),
+        MinTheta = cms.double(0.0),
+        MaxTheta = cms.double(0.0),
+        MinPhi = cms.double(-3.14159265359),
+        MaxPhi = cms.double(3.14159265359),
+        PartID = cms.vint32(11)
+    ),
+    Verbosity = cms.untracked.int32(0),
+    firstRun = cms.untracked.uint32(1),
+    psethack = cms.string('single muon E 100')
+)
+process.VtxSmeared.MinZ = -800.0
+process.VtxSmeared.MaxZ = -800.0
+process.VtxSmeared.MinX = -7.5
+process.VtxSmeared.MaxX =  7.5
+process.VtxSmeared.MinY = -7.5
+process.VtxSmeared.MaxY =  7.5
+process.g4SimHits.HGCSD.RejectMouseBite = True
+process.g4SimHits.HGCSD.RotatedWafer    = True
+
+# Path and EndPath definitions
+process.generation_step = cms.Path(process.pgen)
+process.gunfilter_step  = cms.Path(process.HGCalTBCheckGunPostion)
+process.simulation_step = cms.Path(process.psim)
+process.genfiltersummary_step = cms.EndPath(process.genFilterSummary)
+process.endjob_step = cms.EndPath(process.endOfProcess)
+
+# Schedule definition
+process.schedule = cms.Schedule(process.generation_step,
+				process.genfiltersummary_step,
+				process.simulation_step,
+				process.gunfilter_step,
+				process.endjob_step,
+				)
+# filter all path with the production filter sequence
+for path in process.paths:
+	getattr(process,path)._seq = process.generator * getattr(process,path)._seq 
+
+
diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBGenSimCERNMB_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBGenSimCERNMB_cfg.py
index 057be620eda00..491c910312a2c 100644
--- a/SimG4CMS/HGCalTestBeam/test/HGCalTBGenSimCERNMB_cfg.py
+++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBGenSimCERNMB_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('SIM',eras.Phase2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('SIM',Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/SimG4CMS/Muon/interface/MuonEndcapFrameRotation.h b/SimG4CMS/Muon/interface/MuonEndcapFrameRotation.h
index 9f067514084d9..d463d8db066c3 100644
--- a/SimG4CMS/Muon/interface/MuonEndcapFrameRotation.h
+++ b/SimG4CMS/Muon/interface/MuonEndcapFrameRotation.h
@@ -16,11 +16,11 @@
 #include "G4Step.hh"
 
 class MuonEndcapFrameRotation : public MuonFrameRotation {
- public:
-  ~MuonEndcapFrameRotation() override {};
-  Local3DPoint transformPoint(const Local3DPoint &,const G4Step *) const override;
- private:
-};
+public:
+  ~MuonEndcapFrameRotation() override{};
+  Local3DPoint transformPoint(const Local3DPoint &, const G4Step *) const override;
 
+private:
+};
 
 #endif
diff --git a/SimG4CMS/Muon/interface/MuonFrameRotation.h b/SimG4CMS/Muon/interface/MuonFrameRotation.h
index 5a9d1f7131ccd..bac89037725ff 100644
--- a/SimG4CMS/Muon/interface/MuonFrameRotation.h
+++ b/SimG4CMS/Muon/interface/MuonFrameRotation.h
@@ -15,11 +15,10 @@
 class G4Step;
 
 class MuonFrameRotation {
- public:
-  MuonFrameRotation() {};
-  virtual ~MuonFrameRotation() {};
-  virtual Local3DPoint transformPoint(const Local3DPoint &,const G4Step *) const;
-
+public:
+  MuonFrameRotation(){};
+  virtual ~MuonFrameRotation(){};
+  virtual Local3DPoint transformPoint(const Local3DPoint &, const G4Step *) const;
 };
 
 #endif
diff --git a/SimG4CMS/Muon/interface/MuonG4Numbering.h b/SimG4CMS/Muon/interface/MuonG4Numbering.h
index 837e8ebf7e055..352ea597e3df6 100644
--- a/SimG4CMS/Muon/interface/MuonG4Numbering.h
+++ b/SimG4CMS/Muon/interface/MuonG4Numbering.h
@@ -24,16 +24,14 @@ class DDCompactView;
 class MuonDDDConstants;
 
 class MuonG4Numbering {
- public:
-
+public:
   MuonG4Numbering(const DDCompactView& cpv);
   MuonG4Numbering(const MuonDDDConstants& muonConstants);
   ~MuonG4Numbering(){};
-  
+
   MuonBaseNumber PhysicalVolumeToBaseNumber(const G4Step* aStep);
-  
- private:
 
+private:
   const int getCopyNoLevel(const int);
   const int getCopyNoSuperNo(const int);
   const int getCopyNoBaseNo(const int);
@@ -43,7 +41,6 @@ class MuonG4Numbering {
   int theSuperPart;
   int theBasePart;
   int theStartCopyNo;
-
 };
 
 #endif
diff --git a/SimG4CMS/Muon/interface/MuonGEMFrameRotation.h b/SimG4CMS/Muon/interface/MuonGEMFrameRotation.h
index 9f8d53b2542ce..8d3026b5c43b2 100644
--- a/SimG4CMS/Muon/interface/MuonGEMFrameRotation.h
+++ b/SimG4CMS/Muon/interface/MuonGEMFrameRotation.h
@@ -18,16 +18,14 @@ class MuonDDDConstants;
 class G4Step;
 
 class MuonGEMFrameRotation : public MuonFrameRotation {
-
 public:
-  MuonGEMFrameRotation( const MuonDDDConstants& muonConstants );
+  MuonGEMFrameRotation(const MuonDDDConstants& muonConstants);
   ~MuonGEMFrameRotation() override;
-  Local3DPoint transformPoint(const Local3DPoint &, const G4Step *) const override;
+  Local3DPoint transformPoint(const Local3DPoint&, const G4Step*) const override;
 
 private:
   MuonG4Numbering* g4numbering;
-  int              theSectorLevel;
+  int theSectorLevel;
 };
 
-
 #endif
diff --git a/SimG4CMS/Muon/interface/MuonME0FrameRotation.h b/SimG4CMS/Muon/interface/MuonME0FrameRotation.h
index 02eb6070e4000..07f3b031b8692 100644
--- a/SimG4CMS/Muon/interface/MuonME0FrameRotation.h
+++ b/SimG4CMS/Muon/interface/MuonME0FrameRotation.h
@@ -20,16 +20,14 @@
 class MuonDDDConstants;
 
 class MuonME0FrameRotation : public MuonFrameRotation {
-
 public:
-  MuonME0FrameRotation( const MuonDDDConstants& muonConstants );
+  MuonME0FrameRotation(const MuonDDDConstants& muonConstants);
   ~MuonME0FrameRotation() override;
-  Local3DPoint transformPoint(const Local3DPoint &, const G4Step *) const override;
+  Local3DPoint transformPoint(const Local3DPoint&, const G4Step*) const override;
 
 private:
   MuonG4Numbering* g4numbering;
-  int              theSectorLevel;
+  int theSectorLevel;
 };
 
-
 #endif
diff --git a/SimG4CMS/Muon/interface/MuonRPCFrameRotation.h b/SimG4CMS/Muon/interface/MuonRPCFrameRotation.h
index 920119d89997e..fa7df185bd218 100644
--- a/SimG4CMS/Muon/interface/MuonRPCFrameRotation.h
+++ b/SimG4CMS/Muon/interface/MuonRPCFrameRotation.h
@@ -19,14 +19,14 @@ class MuonG4Numbering;
 class MuonDDDConstants;
 
 class MuonRPCFrameRotation : public MuonFrameRotation {
- public:
-  MuonRPCFrameRotation( const MuonDDDConstants& constants );
+public:
+  MuonRPCFrameRotation(const MuonDDDConstants& constants);
   ~MuonRPCFrameRotation() override;
-  Local3DPoint transformPoint(const Local3DPoint &, const G4Step *) const override;
- private:
+  Local3DPoint transformPoint(const Local3DPoint&, const G4Step*) const override;
+
+private:
   MuonG4Numbering* g4numbering;
   int theRegion;
 };
 
-
 #endif
diff --git a/SimG4CMS/Muon/interface/MuonSensitiveDetector.h b/SimG4CMS/Muon/interface/MuonSensitiveDetector.h
index 2cca52e1e7199..d38d399c73c88 100644
--- a/SimG4CMS/Muon/interface/MuonSensitiveDetector.h
+++ b/SimG4CMS/Muon/interface/MuonSensitiveDetector.h
@@ -33,33 +33,28 @@ class G4Step;
 class G4ProcessTypeEnumerator;
 class SimTrackManager;
 
-class MuonSensitiveDetector : 
-public SensitiveTkDetector,
-public Observer<const BeginOfEvent*>
-{
-public:    
-  explicit MuonSensitiveDetector(const std::string&, const DDCompactView &,
-				 const SensitiveDetectorCatalog &, edm::ParameterSet const &,
-				 const SimTrackManager*);
+class MuonSensitiveDetector : public SensitiveTkDetector, public Observer<const BeginOfEvent*> {
+public:
+  explicit MuonSensitiveDetector(const std::string&,
+                                 const DDCompactView&,
+                                 const SensitiveDetectorCatalog&,
+                                 edm::ParameterSet const&,
+                                 const SimTrackManager*);
   ~MuonSensitiveDetector() override;
-  G4bool ProcessHits(G4Step *,G4TouchableHistory *) override;
-  uint32_t setDetUnitId(const G4Step *) override;
+  G4bool ProcessHits(G4Step*, G4TouchableHistory*) override;
+  uint32_t setDetUnitId(const G4Step*) override;
   void EndOfEvent(G4HCofThisEvent*) override;
 
   void fillHits(edm::PSimHitContainer&, const std::string&) override;
   void clearHits() override;
 
-  const MuonSlaveSD* GetSlaveMuon() const {
-    return slaveMuon; }
+  const MuonSlaveSD* GetSlaveMuon() const { return slaveMuon; }
 
 protected:
+  void update(const BeginOfEvent*) override;
 
-  void update(const BeginOfEvent *) override;
-  
 private:
-
-  inline Local3DPoint cmsUnits(const Local3DPoint& v)
-  { return Local3DPoint(v.x()*0.1, v.y()*0.1, v.z()*0.1); }
+  inline Local3DPoint cmsUnits(const Local3DPoint& v) { return Local3DPoint(v.x() * 0.1, v.y() * 0.1, v.z() * 0.1); }
 
   MuonSlaveSD* slaveMuon;
   MuonSimHitNumberingScheme* numbering;
@@ -67,35 +62,35 @@ public Observer<const BeginOfEvent*>
   MuonFrameRotation* theRotation;
   MuonG4Numbering* g4numbering;
 
-  bool newHit(const G4Step *);
-  void createHit(const G4Step *);
-  void updateHit(const G4Step *);
+  bool newHit(const G4Step*);
+  void createHit(const G4Step*);
+  void updateHit(const G4Step*);
   void saveHit();
-  
+
   /**
    * Transform from local coordinates of a volume to local coordinates of a parent volume
    * one or more levels up the volume hierarchy: e.g. levelsUp = 1 for immediate parent.
    * This is done by moving from local_1 -> global -> local_2.
    */
-  Local3DPoint InitialStepPositionVsParent(const G4Step * currentStep, G4int levelsUp);
-  Local3DPoint FinalStepPositionVsParent(const G4Step * currentStep, G4int levelsUp);
+  Local3DPoint InitialStepPositionVsParent(const G4Step* currentStep, G4int levelsUp);
+  Local3DPoint FinalStepPositionVsParent(const G4Step* currentStep, G4int levelsUp);
 
   const G4VPhysicalVolume* thePV;
   UpdatablePSimHit* theHit;
   uint32_t theDetUnitId;
   uint32_t newDetUnitId;
   int theTrackID;
- 
+
   bool printHits;
   SimHitPrinter* thePrinter;
 
   //--- SimTracks cuts
   float ePersistentCutGeV;
-  bool  allMuonsPersistent;
+  bool allMuonsPersistent;
 
   G4ProcessTypeEnumerator* theG4ProcessTypeEnumerator;
 
   const SimTrackManager* theManager;
 };
 
-#endif // MuonSensitiveDetector_h
+#endif  // MuonSensitiveDetector_h
diff --git a/SimG4CMS/Muon/interface/MuonSlaveSD.h b/SimG4CMS/Muon/interface/MuonSlaveSD.h
index d8bbf0507262c..e6c4ecc02594c 100644
--- a/SimG4CMS/Muon/interface/MuonSlaveSD.h
+++ b/SimG4CMS/Muon/interface/MuonSlaveSD.h
@@ -23,57 +23,54 @@ class EventAction;
 class MuonSubDetector;
 class SimTrackManager;
 
-class MuonSlaveSD : 
-public TrackingSlaveSD
-{
-public: 
+class MuonSlaveSD : public TrackingSlaveSD {
+public:
   typedef std::vector<PSimHit> Collection;
   typedef Collection::const_iterator const_iterator;
-  MuonSlaveSD(MuonSubDetector*,const SimTrackManager*);
+  MuonSlaveSD(MuonSubDetector*, const SimTrackManager*);
   ~MuonSlaveSD() override;
   virtual void clearHits();
   bool format() override;
-  const_iterator begin() override { return hits_.begin();}
-  const_iterator end() override   { return hits_.end();}
+  const_iterator begin() override { return hits_.begin(); }
+  const_iterator end() override { return hits_.end(); }
 
-protected: 
-  Collection 	     hits_;
+protected:
+  Collection hits_;
 
 private:
   MuonSubDetector* detector;
 
   const SimTrackManager* m_trackManager;
-
 };
 
 class FormatBarrelHits {
- public:
-  bool operator() (const PSimHit & a, const PSimHit & b);
-  int sortId (const PSimHit & a)  const;
+public:
+  bool operator()(const PSimHit& a, const PSimHit& b);
+  int sortId(const PSimHit& a) const;
 };
 
 class FormatEndcapHits {
- public:
-  bool operator() (const PSimHit & a, const PSimHit & b);
-  int sortId (const PSimHit & a)  const;
+public:
+  bool operator()(const PSimHit& a, const PSimHit& b);
+  int sortId(const PSimHit& a) const;
 };
 
 class FormatRpcHits {
- public:
-  bool operator() (const PSimHit & a, const PSimHit & b);
-  int sortId (const PSimHit & a)  const;
+public:
+  bool operator()(const PSimHit& a, const PSimHit& b);
+  int sortId(const PSimHit& a) const;
 };
 
 class FormatGemHits {
- public:
-  bool operator() (const PSimHit & a, const PSimHit & b);
-  int sortId (const PSimHit & a)  const;
+public:
+  bool operator()(const PSimHit& a, const PSimHit& b);
+  int sortId(const PSimHit& a) const;
 };
 
 class FormatMe0Hits {
- public:
-  bool operator() (const PSimHit & a, const PSimHit & b);
-  int sortId (const PSimHit & a)  const;
+public:
+  bool operator()(const PSimHit& a, const PSimHit& b);
+  int sortId(const PSimHit& a) const;
 };
 
-#endif // MuonSlaveSD_h
+#endif  // MuonSlaveSD_h
diff --git a/SimG4CMS/Muon/interface/SimHitPrinter.h b/SimG4CMS/Muon/interface/SimHitPrinter.h
index e4ff8361f2391..ae7f4757cdc8f 100644
--- a/SimG4CMS/Muon/interface/SimHitPrinter.h
+++ b/SimG4CMS/Muon/interface/SimHitPrinter.h
@@ -17,26 +17,26 @@
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
 
-#include<fstream>
+#include <fstream>
 #include <atomic>
 
 class SimHitPrinter {
 public:
   SimHitPrinter(std::string);
   ~SimHitPrinter();
-  
+
   void startNewSimHit(std::string);
   void startNewEvent(int);
-  
+
   void printId(int) const;
   void printTrack(int) const;
   void printPabs(float) const;
   void printEloss(float) const;
-  void printLocal(LocalPoint,LocalPoint) const;
+  void printLocal(LocalPoint, LocalPoint) const;
   void printGlobal(GlobalPoint) const;
+
 private:
   static std::atomic<std::ofstream*> theFile;
 };
 
 #endif
-
diff --git a/SimG4CMS/Muon/src/MuonEndcapFrameRotation.cc b/SimG4CMS/Muon/src/MuonEndcapFrameRotation.cc
index 08acbf9d867af..0352930f86ba5 100644
--- a/SimG4CMS/Muon/src/MuonEndcapFrameRotation.cc
+++ b/SimG4CMS/Muon/src/MuonEndcapFrameRotation.cc
@@ -5,13 +5,11 @@
 #include "G4StepPoint.hh"
 #include "G4TouchableHistory.hh"
 
-Local3DPoint MuonEndcapFrameRotation::transformPoint(const Local3DPoint& point,const G4Step* step) const {
-      
-  const G4StepPoint * preStepPoint = step->GetPreStepPoint();
-  const G4TouchableHistory * theTouchable = (const G4TouchableHistory *)preStepPoint->GetTouchable();
-  const G4ThreeVector& trans=theTouchable->GetTranslation();
-  
-  return (trans.z()<0) 
-    ? Local3DPoint(-point.x(),-point.z(),-point.y())
-    : Local3DPoint(point.x(),point.z(),-point.y());
-} 
+Local3DPoint MuonEndcapFrameRotation::transformPoint(const Local3DPoint& point, const G4Step* step) const {
+  const G4StepPoint* preStepPoint = step->GetPreStepPoint();
+  const G4TouchableHistory* theTouchable = (const G4TouchableHistory*)preStepPoint->GetTouchable();
+  const G4ThreeVector& trans = theTouchable->GetTranslation();
+
+  return (trans.z() < 0) ? Local3DPoint(-point.x(), -point.z(), -point.y())
+                         : Local3DPoint(point.x(), point.z(), -point.y());
+}
diff --git a/SimG4CMS/Muon/src/MuonFrameRotation.cc b/SimG4CMS/Muon/src/MuonFrameRotation.cc
index dd12d2b8f6824..1323fe52bbb13 100644
--- a/SimG4CMS/Muon/src/MuonFrameRotation.cc
+++ b/SimG4CMS/Muon/src/MuonFrameRotation.cc
@@ -1,6 +1,4 @@
 #include "SimG4CMS/Muon/interface/MuonFrameRotation.h"
 #include "G4Step.hh"
 
-Local3DPoint MuonFrameRotation::transformPoint(const Local3DPoint& point,const G4Step*) const {
-  return point;
-} 
+Local3DPoint MuonFrameRotation::transformPoint(const Local3DPoint& point, const G4Step*) const { return point; }
diff --git a/SimG4CMS/Muon/src/MuonG4Numbering.cc b/SimG4CMS/Muon/src/MuonG4Numbering.cc
index caef112c07b94..977518067b2ad 100644
--- a/SimG4CMS/Muon/src/MuonG4Numbering.cc
+++ b/SimG4CMS/Muon/src/MuonG4Numbering.cc
@@ -11,66 +11,55 @@
 
 //#define LOCAL_DEBUG
 
-MuonG4Numbering::MuonG4Numbering(const DDCompactView& cpv):
-  MuonG4Numbering(MuonDDDConstants(cpv)) {}
+MuonG4Numbering::MuonG4Numbering(const DDCompactView& cpv) : MuonG4Numbering(MuonDDDConstants(cpv)) {}
 
-MuonG4Numbering::MuonG4Numbering(const MuonDDDConstants& muonConstants){
-  theLevelPart=muonConstants.getValue("level");
-  theSuperPart=muonConstants.getValue("super");
-  theBasePart=muonConstants.getValue("base");
-  theStartCopyNo=muonConstants.getValue("xml_starts_with_copyno");
+MuonG4Numbering::MuonG4Numbering(const MuonDDDConstants& muonConstants) {
+  theLevelPart = muonConstants.getValue("level");
+  theSuperPart = muonConstants.getValue("super");
+  theBasePart = muonConstants.getValue("base");
+  theStartCopyNo = muonConstants.getValue("xml_starts_with_copyno");
 
   // some consistency checks
 
-  if (theBasePart!=1) {
-    std::cout << "MuonDDDNumbering finds unusual base constant:"
-	 <<theBasePart<<std::endl;
+  if (theBasePart != 1) {
+    std::cout << "MuonDDDNumbering finds unusual base constant:" << theBasePart << std::endl;
   }
-  if (theSuperPart<100) {
-    std::cout << "MuonDDDNumbering finds unusual super constant:"
-	 <<theSuperPart<<std::endl;
+  if (theSuperPart < 100) {
+    std::cout << "MuonDDDNumbering finds unusual super constant:" << theSuperPart << std::endl;
   }
-  if (theLevelPart<10*theSuperPart) {
-    std::cout << "MuonDDDNumbering finds unusual level constant:"
-	 <<theLevelPart<<std::endl;
+  if (theLevelPart < 10 * theSuperPart) {
+    std::cout << "MuonDDDNumbering finds unusual level constant:" << theLevelPart << std::endl;
   }
-  if ((theStartCopyNo!=0)&&(theStartCopyNo!=1)) {
-    std::cout << "MuonDDDNumbering finds unusual start value for copy numbers:"
-	 <<theStartCopyNo<<std::endl;
+  if ((theStartCopyNo != 0) && (theStartCopyNo != 1)) {
+    std::cout << "MuonDDDNumbering finds unusual start value for copy numbers:" << theStartCopyNo << std::endl;
   }
 
 #ifdef LOCAL_DEBUG
-  std::cout << "StartCopyNo = "<<theStartCopyNo<<std::endl;
-  std::cout << "MuonG4Numbering configured with"<<std::endl;
-  std::cout << "Level = "<<theLevelPart<<" ";
-  std::cout << "Super = "<<theSuperPart<<" ";
-  std::cout << "Base = "<<theBasePart<<" ";
-  std::cout << "StartCopyNo = "<<theStartCopyNo<<std::endl;
+  std::cout << "StartCopyNo = " << theStartCopyNo << std::endl;
+  std::cout << "MuonG4Numbering configured with" << std::endl;
+  std::cout << "Level = " << theLevelPart << " ";
+  std::cout << "Super = " << theSuperPart << " ";
+  std::cout << "Base = " << theBasePart << " ";
+  std::cout << "StartCopyNo = " << theStartCopyNo << std::endl;
 #endif
 }
 
-MuonBaseNumber MuonG4Numbering::PhysicalVolumeToBaseNumber(const G4Step* aStep)
-{
-
+MuonBaseNumber MuonG4Numbering::PhysicalVolumeToBaseNumber(const G4Step* aStep) {
   MuonBaseNumber num;
   const G4VTouchable* touch = aStep->GetPreStepPoint()->GetTouchable();
 
-  for( int ii = 0; ii < touch->GetHistoryDepth(); ii++ ){
+  for (int ii = 0; ii < touch->GetHistoryDepth(); ii++) {
     G4VPhysicalVolume* vol = touch->GetVolume(ii);
-    int copyno=vol->GetCopyNo();
+    int copyno = vol->GetCopyNo();
 #ifdef LOCAL_DEBUG
-    std::cout << "MuonG4Numbering: " << vol->GetName() << " " << copyno 
-	      << std::endl << "Split " << copyNoRelevant(copyno) << ":" 
-	      << theLevelPart << ":" << theSuperPart << " ";
+    std::cout << "MuonG4Numbering: " << vol->GetName() << " " << copyno << std::endl
+              << "Split " << copyNoRelevant(copyno) << ":" << theLevelPart << ":" << theSuperPart << " ";
 #endif
     if (copyNoRelevant(copyno)) {
-      num.addBase(getCopyNoLevel(copyno),
-		  getCopyNoSuperNo(copyno),
-		  getCopyNoBaseNo(copyno)-theStartCopyNo);
+      num.addBase(getCopyNoLevel(copyno), getCopyNoSuperNo(copyno), getCopyNoBaseNo(copyno) - theStartCopyNo);
 #ifdef LOCAL_DEBUG
-      std::cout << " NoLevel " << getCopyNoLevel(copyno) << " Super " 
-		<< getCopyNoSuperNo(copyno) << " Base " 
-		<< getCopyNoBaseNo(copyno) << " Start " << theStartCopyNo;
+      std::cout << " NoLevel " << getCopyNoLevel(copyno) << " Super " << getCopyNoSuperNo(copyno) << " Base "
+                << getCopyNoBaseNo(copyno) << " Start " << theStartCopyNo;
 #endif
     }
 #ifdef LOCAL_DEBUG
@@ -81,19 +70,10 @@ MuonBaseNumber MuonG4Numbering::PhysicalVolumeToBaseNumber(const G4Step* aStep)
   return num;
 }
 
-const int MuonG4Numbering::getCopyNoLevel(const int copyno){
-  return copyno/theLevelPart;
-}
-
-const int MuonG4Numbering::getCopyNoSuperNo(const int copyno){
-  return (copyno%theLevelPart)/theSuperPart;
-}
+const int MuonG4Numbering::getCopyNoLevel(const int copyno) { return copyno / theLevelPart; }
 
-const int MuonG4Numbering::getCopyNoBaseNo(const int copyno){
-  return copyno%theSuperPart;
-}
+const int MuonG4Numbering::getCopyNoSuperNo(const int copyno) { return (copyno % theLevelPart) / theSuperPart; }
 
-const bool MuonG4Numbering::copyNoRelevant(const int copyno){
-  return (copyno/theLevelPart)>0;
-}
+const int MuonG4Numbering::getCopyNoBaseNo(const int copyno) { return copyno % theSuperPart; }
 
+const bool MuonG4Numbering::copyNoRelevant(const int copyno) { return (copyno / theLevelPart) > 0; }
diff --git a/SimG4CMS/Muon/src/MuonGEMFrameRotation.cc b/SimG4CMS/Muon/src/MuonGEMFrameRotation.cc
index 4a02da9f5d548..fb6228c64deeb 100644
--- a/SimG4CMS/Muon/src/MuonGEMFrameRotation.cc
+++ b/SimG4CMS/Muon/src/MuonGEMFrameRotation.cc
@@ -4,18 +4,16 @@
 
 #include "G4Step.hh"
 
-MuonGEMFrameRotation::MuonGEMFrameRotation(const MuonDDDConstants& muonConstants) 
-  : MuonFrameRotation::MuonFrameRotation() {
-  g4numbering     = new MuonG4Numbering(muonConstants);
-  int theLevelPart= muonConstants.getValue("level");
-  theSectorLevel  = muonConstants.getValue("mg_sector")/theLevelPart;
+MuonGEMFrameRotation::MuonGEMFrameRotation(const MuonDDDConstants& muonConstants)
+    : MuonFrameRotation::MuonFrameRotation() {
+  g4numbering = new MuonG4Numbering(muonConstants);
+  int theLevelPart = muonConstants.getValue("level");
+  theSectorLevel = muonConstants.getValue("mg_sector") / theLevelPart;
 }
 
-MuonGEMFrameRotation::~MuonGEMFrameRotation() {
-  delete g4numbering;
-}
+MuonGEMFrameRotation::~MuonGEMFrameRotation() { delete g4numbering; }
 
-Local3DPoint MuonGEMFrameRotation::transformPoint(const Local3DPoint & point,const G4Step *) const {
+Local3DPoint MuonGEMFrameRotation::transformPoint(const Local3DPoint& point, const G4Step*) const {
   //---VI: theSectorLevel and g4numbering are not used
-  return Local3DPoint(point.x(),point.z(),-point.y());
+  return Local3DPoint(point.x(), point.z(), -point.y());
 }
diff --git a/SimG4CMS/Muon/src/MuonME0FrameRotation.cc b/SimG4CMS/Muon/src/MuonME0FrameRotation.cc
index 23c1877f27eef..458eb31fd3c56 100644
--- a/SimG4CMS/Muon/src/MuonME0FrameRotation.cc
+++ b/SimG4CMS/Muon/src/MuonME0FrameRotation.cc
@@ -5,21 +5,17 @@
 
 #include "G4Step.hh"
 
-MuonME0FrameRotation::MuonME0FrameRotation(const MuonDDDConstants& muonConstants) 
-  : MuonFrameRotation::MuonFrameRotation() {
-  g4numbering     = new MuonG4Numbering(muonConstants);
-  int theLevelPart= muonConstants.getValue("level");
-  theSectorLevel  = muonConstants.getValue("mg_sector")/theLevelPart;
-  edm::LogVerbatim("MuonME0FrameRotation")
-    <<"MuonME0FrameRotation: theSectorLevel " << theSectorLevel;
+MuonME0FrameRotation::MuonME0FrameRotation(const MuonDDDConstants& muonConstants)
+    : MuonFrameRotation::MuonFrameRotation() {
+  g4numbering = new MuonG4Numbering(muonConstants);
+  int theLevelPart = muonConstants.getValue("level");
+  theSectorLevel = muonConstants.getValue("mg_sector") / theLevelPart;
+  edm::LogVerbatim("MuonME0FrameRotation") << "MuonME0FrameRotation: theSectorLevel " << theSectorLevel;
 }
 
-MuonME0FrameRotation::~MuonME0FrameRotation() {
-  delete g4numbering;
-}
+MuonME0FrameRotation::~MuonME0FrameRotation() { delete g4numbering; }
 
-Local3DPoint 
-MuonME0FrameRotation::transformPoint(const Local3DPoint& point,const G4Step *) const {
+Local3DPoint MuonME0FrameRotation::transformPoint(const Local3DPoint& point, const G4Step*) const {
   //---VI: sector level and g4numbering are not used
-  return Local3DPoint(point.x(),point.z(),-point.y());
+  return Local3DPoint(point.x(), point.z(), -point.y());
 }
diff --git a/SimG4CMS/Muon/src/MuonRPCFrameRotation.cc b/SimG4CMS/Muon/src/MuonRPCFrameRotation.cc
index 78617654e8122..03db49c9d2cb3 100644
--- a/SimG4CMS/Muon/src/MuonRPCFrameRotation.cc
+++ b/SimG4CMS/Muon/src/MuonRPCFrameRotation.cc
@@ -5,22 +5,18 @@
 
 #include "G4Step.hh"
 
-MuonRPCFrameRotation::MuonRPCFrameRotation(const MuonDDDConstants& muonConstants) : 
-MuonFrameRotation::MuonFrameRotation() {
+MuonRPCFrameRotation::MuonRPCFrameRotation(const MuonDDDConstants& muonConstants)
+    : MuonFrameRotation::MuonFrameRotation() {
   g4numbering = new MuonG4Numbering(muonConstants);
-  int theLevelPart=muonConstants.getValue("level");
-  theRegion=muonConstants.getValue("mr_region")/theLevelPart;
+  int theLevelPart = muonConstants.getValue("level");
+  theRegion = muonConstants.getValue("mr_region") / theLevelPart;
 }
 
-MuonRPCFrameRotation::~MuonRPCFrameRotation(){
-  delete g4numbering;
-}
+MuonRPCFrameRotation::~MuonRPCFrameRotation() { delete g4numbering; }
 
-Local3DPoint 
-MuonRPCFrameRotation::transformPoint(const Local3DPoint& point,const G4Step* aStep) const {
+Local3DPoint MuonRPCFrameRotation::transformPoint(const Local3DPoint& point, const G4Step* aStep) const {
   //check if endcap
   MuonBaseNumber num = g4numbering->PhysicalVolumeToBaseNumber(aStep);
-  bool endcap_muon = (num.getSuperNo(theRegion)!=1);
-  return (endcap_muon) ? Local3DPoint(point.x(),point.z(),-point.y())
-    : Local3DPoint(point.x(),point.y(),point.z());
+  bool endcap_muon = (num.getSuperNo(theRegion) != 1);
+  return (endcap_muon) ? Local3DPoint(point.x(), point.z(), -point.y()) : Local3DPoint(point.x(), point.y(), point.z());
 }
diff --git a/SimG4CMS/Muon/src/MuonSensitiveDetector.cc b/SimG4CMS/Muon/src/MuonSensitiveDetector.cc
index be13939212e40..65162514f1f51 100644
--- a/SimG4CMS/Muon/src/MuonSensitiveDetector.cc
+++ b/SimG4CMS/Muon/src/MuonSensitiveDetector.cc
@@ -32,61 +32,63 @@
 
 //#define DebugLog
 
-MuonSensitiveDetector::MuonSensitiveDetector(const std::string& name, 
-					     const DDCompactView & cpv,
-					     const SensitiveDetectorCatalog & clg,
-					     edm::ParameterSet const & p,
-					     const SimTrackManager* manager) 
-  : SensitiveTkDetector(name, cpv, clg, p),
-    thePV(nullptr), theHit(nullptr), theDetUnitId(0), newDetUnitId(0), 
-    theTrackID(0), theManager(manager)
-{
+MuonSensitiveDetector::MuonSensitiveDetector(const std::string& name,
+                                             const DDCompactView& cpv,
+                                             const SensitiveDetectorCatalog& clg,
+                                             edm::ParameterSet const& p,
+                                             const SimTrackManager* manager)
+    : SensitiveTkDetector(name, cpv, clg, p),
+      thePV(nullptr),
+      theHit(nullptr),
+      theDetUnitId(0),
+      newDetUnitId(0),
+      theTrackID(0),
+      theManager(manager) {
   edm::ParameterSet m_MuonSD = p.getParameter<edm::ParameterSet>("MuonSD");
-  ePersistentCutGeV = m_MuonSD.getParameter<double>("EnergyThresholdForPersistency")/CLHEP::GeV;//Default 1. GeV
+  ePersistentCutGeV = m_MuonSD.getParameter<double>("EnergyThresholdForPersistency") / CLHEP::GeV;  //Default 1. GeV
   allMuonsPersistent = m_MuonSD.getParameter<bool>("AllMuonsPersistent");
-  printHits  = m_MuonSD.getParameter<bool>("PrintHits");
-  
+  printHits = m_MuonSD.getParameter<bool>("PrintHits");
+
   //
   // Here simply create 1 MuonSlaveSD for the moment
-  //  
-  LogDebug("MuonSimDebug") << "create MuonSubDetector "<<name;
+  //
+  LogDebug("MuonSimDebug") << "create MuonSubDetector " << name;
   detector = new MuonSubDetector(name);
 
   //The constants take time to calculate and are needed by many helpers
   MuonDDDConstants constants(cpv);
   G4String sdet = "unknown";
   if (detector->isEndcap()) {
-    theRotation=new MuonEndcapFrameRotation();
+    theRotation = new MuonEndcapFrameRotation();
     sdet = "Endcap";
   } else if (detector->isRPC()) {
-    theRotation=new MuonRPCFrameRotation( constants );
+    theRotation = new MuonRPCFrameRotation(constants);
     sdet = "RPC";
   } else if (detector->isGEM()) {
-    theRotation=new MuonGEMFrameRotation( constants );
+    theRotation = new MuonGEMFrameRotation(constants);
     sdet = "GEM";
   } else if (detector->isME0()) {
-    theRotation=new MuonME0FrameRotation( constants );
+    theRotation = new MuonME0FrameRotation(constants);
     sdet = "ME0";
   } else {
     theRotation = new MuonFrameRotation();
   }
-  slaveMuon  = new MuonSlaveSD(detector,theManager);
-  numbering  = new MuonSimHitNumberingScheme(detector, constants);
+  slaveMuon = new MuonSlaveSD(detector, theManager);
+  numbering = new MuonSimHitNumberingScheme(detector, constants);
   g4numbering = new MuonG4Numbering(constants);
-  
+
   if (printHits) {
     thePrinter = new SimHitPrinter("HitPositionOSCAR.dat");
   }
 
-  edm::LogVerbatim("MuonSensitiveDetector") 
-    << " of type " << sdet << " <" << GetName() 
-    << "> EnergyThresholdForPersistency(GeV) " << ePersistentCutGeV/CLHEP::GeV 
-    << " allMuonsPersistent: " << allMuonsPersistent;
-    
+  edm::LogVerbatim("MuonSensitiveDetector")
+      << " of type " << sdet << " <" << GetName() << "> EnergyThresholdForPersistency(GeV) "
+      << ePersistentCutGeV / CLHEP::GeV << " allMuonsPersistent: " << allMuonsPersistent;
+
   theG4ProcessTypeEnumerator = new G4ProcessTypeEnumerator;
 }
 
-MuonSensitiveDetector::~MuonSensitiveDetector() { 
+MuonSensitiveDetector::~MuonSensitiveDetector() {
   delete g4numbering;
   delete numbering;
   delete slaveMuon;
@@ -95,7 +97,7 @@ MuonSensitiveDetector::~MuonSensitiveDetector() {
   delete theG4ProcessTypeEnumerator;
 }
 
-void MuonSensitiveDetector::update(const BeginOfEvent * i){
+void MuonSensitiveDetector::update(const BeginOfEvent* i) {
   clearHits();
   //----- Initialize variables to check if two steps belong to same hit
   thePV = nullptr;
@@ -103,31 +105,27 @@ void MuonSensitiveDetector::update(const BeginOfEvent * i){
   theTrackID = 0;
 }
 
-void MuonSensitiveDetector::clearHits()
-{
+void MuonSensitiveDetector::clearHits() {
   LogDebug("MuonSimDebug") << "MuonSensitiveDetector::clearHits";
   slaveMuon->Initialize();
 }
 
-bool MuonSensitiveDetector::ProcessHits(G4Step * aStep, G4TouchableHistory * ROhist)
-{
-  LogDebug("MuonSimDebug") <<" MuonSensitiveDetector::ProcessHits "
-			   <<InitialStepPosition(aStep,WorldCoordinates);
+bool MuonSensitiveDetector::ProcessHits(G4Step* aStep, G4TouchableHistory* ROhist) {
+  LogDebug("MuonSimDebug") << " MuonSensitiveDetector::ProcessHits " << InitialStepPosition(aStep, WorldCoordinates);
 
-  if (aStep->GetTotalEnergyDeposit()>0.){
+  if (aStep->GetTotalEnergyDeposit() > 0.) {
     newDetUnitId = setDetUnitId(aStep);
 
     // do not count neutrals that are killed by User Limits MinEKine
     //---VI: this is incorrect, neutral particle, like neutron may have local
     //       energy deposit, which potentially may make a hit
-    if( aStep->GetTrack()->GetDynamicParticle()->GetCharge() != 0 ){
-  
+    if (aStep->GetTrack()->GetDynamicParticle()->GetCharge() != 0) {
       if (newHit(aStep)) {
-	saveHit();
-	createHit(aStep);
+        saveHit();
+        createHit(aStep);
       } else {
-	updateHit(aStep);
-      } 
+        updateHit(aStep);
+      }
     } else {
       thePV = aStep->GetPreStepPoint()->GetPhysicalVolume();
       theTrackID = aStep->GetTrack()->GetTrackID();
@@ -137,66 +135,61 @@ bool MuonSensitiveDetector::ProcessHits(G4Step * aStep, G4TouchableHistory * ROh
   return true;
 }
 
-uint32_t MuonSensitiveDetector::setDetUnitId(const G4Step * aStep)
-{ 
+uint32_t MuonSensitiveDetector::setDetUnitId(const G4Step* aStep) {
   MuonBaseNumber num = g4numbering->PhysicalVolumeToBaseNumber(aStep);
 
 #ifdef DebugLog
-  std::stringstream MuonBaseNumber; 
-  MuonBaseNumber << "MuonNumbering :: number of levels = "<<num.getLevels()<<std::endl;
-  MuonBaseNumber << "Level \t SuperNo \t BaseNo"<<std::endl;
-  for (int level=1;level<=num.getLevels();level++) {
-    MuonBaseNumber << level << " \t " << num.getSuperNo(level)
-	      << " \t " << num.getBaseNo(level) << std::endl;
+  std::stringstream MuonBaseNumber;
+  MuonBaseNumber << "MuonNumbering :: number of levels = " << num.getLevels() << std::endl;
+  MuonBaseNumber << "Level \t SuperNo \t BaseNo" << std::endl;
+  for (int level = 1; level <= num.getLevels(); level++) {
+    MuonBaseNumber << level << " \t " << num.getSuperNo(level) << " \t " << num.getBaseNo(level) << std::endl;
   }
   std::string MuonBaseNumbr = MuonBaseNumber.str();
 
-  LogDebug("MuonSimDebug") <<"MuonSensitiveDetector::setDetUnitId :: "<<MuonBaseNumbr;
-  LogDebug("MuonSimDebug") <<"MuonSensitiveDetector::setDetUnitId :: MuonDetUnitId = "
-			   <<(numbering->baseNumberToUnitNumber(num));
+  LogDebug("MuonSimDebug") << "MuonSensitiveDetector::setDetUnitId :: " << MuonBaseNumbr;
+  LogDebug("MuonSimDebug") << "MuonSensitiveDetector::setDetUnitId :: MuonDetUnitId = "
+                           << (numbering->baseNumberToUnitNumber(num));
 #endif
   return numbering->baseNumberToUnitNumber(num);
 }
 
-bool MuonSensitiveDetector::newHit(const G4Step * aStep){
-
-  return (!theHit || (aStep->GetTrack()->GetTrackID() != theTrackID) 
-	  || (aStep->GetPreStepPoint()->GetPhysicalVolume() != thePV)
-	  || newDetUnitId != theDetUnitId);
+bool MuonSensitiveDetector::newHit(const G4Step* aStep) {
+  return (!theHit || (aStep->GetTrack()->GetTrackID() != theTrackID) ||
+          (aStep->GetPreStepPoint()->GetPhysicalVolume() != thePV) || newDetUnitId != theDetUnitId);
 }
 
-void MuonSensitiveDetector::createHit(const G4Step * aStep){
-
+void MuonSensitiveDetector::createHit(const G4Step* aStep) {
   Local3DPoint theEntryPoint;
   Local3DPoint theExitPoint;
 
   if (detector->isBarrel()) {
     // 1 levels up
-    theEntryPoint = cmsUnits(theRotation->transformPoint(InitialStepPositionVsParent(aStep,1),aStep));
-    theExitPoint  = cmsUnits(theRotation->transformPoint(FinalStepPositionVsParent(aStep,1),aStep));
+    theEntryPoint = cmsUnits(theRotation->transformPoint(InitialStepPositionVsParent(aStep, 1), aStep));
+    theExitPoint = cmsUnits(theRotation->transformPoint(FinalStepPositionVsParent(aStep, 1), aStep));
   } else if (detector->isEndcap()) {
     // save local z at current level
-    theEntryPoint = theRotation->transformPoint(InitialStepPosition(aStep,LocalCoordinates),aStep);
-    theExitPoint  = theRotation->transformPoint(FinalStepPosition(aStep,LocalCoordinates),aStep);
-    float zentry  = theEntryPoint.z();
-    float zexit   = theExitPoint.z();
+    theEntryPoint = theRotation->transformPoint(InitialStepPosition(aStep, LocalCoordinates), aStep);
+    theExitPoint = theRotation->transformPoint(FinalStepPosition(aStep, LocalCoordinates), aStep);
+    float zentry = theEntryPoint.z();
+    float zexit = theExitPoint.z();
     // 4 levels up
-    Local3DPoint tempEntry = theRotation->transformPoint(InitialStepPositionVsParent(aStep,4),aStep);
-    Local3DPoint tempExit  = theRotation->transformPoint(FinalStepPositionVsParent(aStep,4),aStep);
+    Local3DPoint tempEntry = theRotation->transformPoint(InitialStepPositionVsParent(aStep, 4), aStep);
+    Local3DPoint tempExit = theRotation->transformPoint(FinalStepPositionVsParent(aStep, 4), aStep);
     // reset local z from z wrt deep-parent volume to z wrt low-level volume
-    theEntryPoint = cmsUnits(Local3DPoint( tempEntry.x(), tempEntry.y(), zentry ));
-    theExitPoint  = cmsUnits(Local3DPoint( tempExit.x(),  tempExit.y(),  zexit ));
+    theEntryPoint = cmsUnits(Local3DPoint(tempEntry.x(), tempEntry.y(), zentry));
+    theExitPoint = cmsUnits(Local3DPoint(tempExit.x(), tempExit.y(), zexit));
   } else {
-    theEntryPoint = cmsUnits(theRotation->transformPoint(InitialStepPosition(aStep,LocalCoordinates),aStep));
-    theExitPoint  = cmsUnits(theRotation->transformPoint(FinalStepPosition(aStep,LocalCoordinates),aStep)); 
+    theEntryPoint = cmsUnits(theRotation->transformPoint(InitialStepPosition(aStep, LocalCoordinates), aStep));
+    theExitPoint = cmsUnits(theRotation->transformPoint(FinalStepPosition(aStep, LocalCoordinates), aStep));
   }
 
-  const G4Track* theTrack = aStep->GetTrack(); 
+  const G4Track* theTrack = aStep->GetTrack();
   const G4StepPoint* preStepPoint = aStep->GetPreStepPoint();
 
-  float thePabs       = preStepPoint->GetMomentum().mag()/CLHEP::GeV;
-  float theTof        = preStepPoint->GetGlobalTime()/CLHEP::nanosecond;
-  float theEnergyLoss = aStep->GetTotalEnergyDeposit()/CLHEP::GeV;
+  float thePabs = preStepPoint->GetMomentum().mag() / CLHEP::GeV;
+  float theTof = preStepPoint->GetGlobalTime() / CLHEP::nanosecond;
+  float theEnergyLoss = aStep->GetTotalEnergyDeposit() / CLHEP::GeV;
   int theParticleType = G4TrackToParticleID::particleID(theTrack);
 
   theDetUnitId = newDetUnitId;
@@ -204,97 +197,102 @@ void MuonSensitiveDetector::createHit(const G4Step * aStep){
   theTrackID = theTrack->GetTrackID();
 
   // convert momentum direction it to local frame
-  const G4ThreeVector& gmd  = preStepPoint->GetMomentumDirection();
-  G4ThreeVector lmd = static_cast<const G4TouchableHistory *>(preStepPoint->GetTouchable())->GetHistory()
-      ->GetTopTransform().TransformAxis(gmd);
+  const G4ThreeVector& gmd = preStepPoint->GetMomentumDirection();
+  G4ThreeVector lmd = static_cast<const G4TouchableHistory*>(preStepPoint->GetTouchable())
+                          ->GetHistory()
+                          ->GetTopTransform()
+                          .TransformAxis(gmd);
   Local3DPoint lnmd = ConvertToLocal3DPoint(lmd);
   lnmd = theRotation->transformPoint(lnmd, aStep);
   float theThetaAtEntry = lnmd.theta();
   float thePhiAtEntry = lnmd.phi();
 
-  theHit = new UpdatablePSimHit(theEntryPoint,theExitPoint,thePabs,theTof,
-				theEnergyLoss,theParticleType,theDetUnitId,
-				theTrackID,theThetaAtEntry,thePhiAtEntry,
-				theG4ProcessTypeEnumerator->processId(theTrack->GetCreatorProcess()));
+  theHit = new UpdatablePSimHit(theEntryPoint,
+                                theExitPoint,
+                                thePabs,
+                                theTof,
+                                theEnergyLoss,
+                                theParticleType,
+                                theDetUnitId,
+                                theTrackID,
+                                theThetaAtEntry,
+                                thePhiAtEntry,
+                                theG4ProcessTypeEnumerator->processId(theTrack->GetCreatorProcess()));
 
   // Make track persistent
   int thePID = std::abs(theTrack->GetDefinition()->GetPDGEncoding());
   //---VI - in parameters cut in energy is declared but applied to momentum
-  if(thePabs > ePersistentCutGeV || ( thePID == 13 && allMuonsPersistent ) ){
+  if (thePabs > ePersistentCutGeV || (thePID == 13 && allMuonsPersistent)) {
     TrackInformation* info = cmsTrackInformation(theTrack);
     info->storeTrack(true);
   }
 
 #ifdef DebugLog
-  edm::LogVerbatim("MuonSimDebug") <<"=== NEW Muon hit for "<< GetName() 
-				   << " Edep(GeV)= " << theEnergyLoss
-				   <<" " <<thePV->GetLogicalVolume()->GetName();
+  edm::LogVerbatim("MuonSimDebug") << "=== NEW Muon hit for " << GetName() << " Edep(GeV)= " << theEnergyLoss << " "
+                                   << thePV->GetLogicalVolume()->GetName();
   const G4VProcess* p = aStep->GetPostStepPoint()->GetProcessDefinedStep();
   const G4VProcess* p2 = preStepPoint->GetProcessDefinedStep();
   G4String sss = "";
-  if (p) sss += " POST PROCESS: " + p->GetProcessName();
-  if (p2)sss += ";  PRE  PROCESS: " + p2->GetProcessName();
-  if("" != sss) edm::LogVerbatim("MuonSimDebug") << sss;
-  edm::LogVerbatim("MuonSimDebug") << " theta= " << theThetaAtEntry
-				   << " phi= " << thePhiAtEntry
-				   << " Pabs(GeV/c)  " << thePabs
-				   << " Eloss(GeV)= " << theEnergyLoss
-				   << " Tof(ns)=  " << theTof
-				   << " trackID= " << theTrackID
-				   << " detID= " << theDetUnitId
-				   << "\n Local:  entry " << theEntryPoint 
-				   << " exit " << theExitPoint
-				   << " delta " << (theExitPoint-theEntryPoint)
-				   << "\n Global: entry " << preStepPoint->GetPosition() 
-				   << " exit " << aStep->GetPostStepPoint()->GetPosition();
+  if (p)
+    sss += " POST PROCESS: " + p->GetProcessName();
+  if (p2)
+    sss += ";  PRE  PROCESS: " + p2->GetProcessName();
+  if ("" != sss)
+    edm::LogVerbatim("MuonSimDebug") << sss;
+  edm::LogVerbatim("MuonSimDebug") << " theta= " << theThetaAtEntry << " phi= " << thePhiAtEntry << " Pabs(GeV/c)  "
+                                   << thePabs << " Eloss(GeV)= " << theEnergyLoss << " Tof(ns)=  " << theTof
+                                   << " trackID= " << theTrackID << " detID= " << theDetUnitId << "\n Local:  entry "
+                                   << theEntryPoint << " exit " << theExitPoint << " delta "
+                                   << (theExitPoint - theEntryPoint) << "\n Global: entry "
+                                   << preStepPoint->GetPosition() << " exit "
+                                   << aStep->GetPostStepPoint()->GetPosition();
 #endif
 }
 
-void MuonSensitiveDetector::updateHit(const G4Step * aStep){
-
+void MuonSensitiveDetector::updateHit(const G4Step* aStep) {
   Local3DPoint theExitPoint;
 
   if (detector->isBarrel()) {
-    theExitPoint = cmsUnits(theRotation->transformPoint(FinalStepPositionVsParent(aStep,1),aStep));  
+    theExitPoint = cmsUnits(theRotation->transformPoint(FinalStepPositionVsParent(aStep, 1), aStep));
   } else if (detector->isEndcap()) {
     // save local z at current level
-    theExitPoint = theRotation->transformPoint(FinalStepPosition(aStep,LocalCoordinates),aStep);
-    float zexit  = theExitPoint.z();
-    Local3DPoint tempExitPoint = theRotation->transformPoint(FinalStepPositionVsParent(aStep,4),aStep);
-    theExitPoint = cmsUnits(Local3DPoint( tempExitPoint.x(), tempExitPoint.y(), zexit));
+    theExitPoint = theRotation->transformPoint(FinalStepPosition(aStep, LocalCoordinates), aStep);
+    float zexit = theExitPoint.z();
+    Local3DPoint tempExitPoint = theRotation->transformPoint(FinalStepPositionVsParent(aStep, 4), aStep);
+    theExitPoint = cmsUnits(Local3DPoint(tempExitPoint.x(), tempExitPoint.y(), zexit));
   } else {
-    theExitPoint = cmsUnits(theRotation->transformPoint(FinalStepPosition(aStep,LocalCoordinates),aStep)); 
+    theExitPoint = cmsUnits(theRotation->transformPoint(FinalStepPosition(aStep, LocalCoordinates), aStep));
   }
 
-  float theEnergyLoss = aStep->GetTotalEnergyDeposit()/CLHEP::GeV;  
+  float theEnergyLoss = aStep->GetTotalEnergyDeposit() / CLHEP::GeV;
 
   theHit->updateExitPoint(theExitPoint);
   theHit->addEnergyLoss(theEnergyLoss);
 
 #ifdef DebugLog
-  edm::LogVerbatim("MuonSimDebug") <<"=== NEW Update muon hit for "<< GetName() 
-				   << " Edep(GeV)= " << theEnergyLoss
-				   <<" " <<thePV->GetLogicalVolume()->GetName();
+  edm::LogVerbatim("MuonSimDebug") << "=== NEW Update muon hit for " << GetName() << " Edep(GeV)= " << theEnergyLoss
+                                   << " " << thePV->GetLogicalVolume()->GetName();
   const G4VProcess* p = aStep->GetPostStepPoint()->GetProcessDefinedStep();
   const G4VProcess* p2 = preStepPoint->GetProcessDefinedStep();
   G4String sss = "";
-  if (p) sss += " POST PROCESS: " + p->GetProcessName();
-  if (p2)sss += ";  PRE  PROCESS: " + p2->GetProcessName();
-  if("" != sss) edm::LogVerbatim("MuonSimDebug") << sss;
-  edm::LogVerbatim("MuonSimDebug") << " delEloss(GeV)= " << theEnergyLoss
-				   << " Tof(ns)=  " << theTof
-				   << " trackID= " << theTrackID
-				   << " detID= " << theDetUnitId
-				   << " exit " << theExitPoint;
+  if (p)
+    sss += " POST PROCESS: " + p->GetProcessName();
+  if (p2)
+    sss += ";  PRE  PROCESS: " + p2->GetProcessName();
+  if ("" != sss)
+    edm::LogVerbatim("MuonSimDebug") << sss;
+  edm::LogVerbatim("MuonSimDebug") << " delEloss(GeV)= " << theEnergyLoss << " Tof(ns)=  " << theTof
+                                   << " trackID= " << theTrackID << " detID= " << theDetUnitId << " exit "
+                                   << theExitPoint;
 #endif
 }
 
-void MuonSensitiveDetector::saveHit(){
+void MuonSensitiveDetector::saveHit() {
   if (theHit) {
     if (printHits) {
       thePrinter->startNewSimHit(detector->name());
       thePrinter->printId(theHit->detUnitId());
-      thePrinter->printLocal(theHit->entryPoint(),theHit->exitPoint());
+      thePrinter->printLocal(theHit->entryPoint(), theHit->exitPoint());
     }
     // hit is included into hit collection
     slaveMuon->processHits(*theHit);
@@ -303,42 +301,37 @@ void MuonSensitiveDetector::saveHit(){
   }
 }
 
-void MuonSensitiveDetector::EndOfEvent(G4HCofThisEvent*)
-{
-  saveHit();
-}
+void MuonSensitiveDetector::EndOfEvent(G4HCofThisEvent*) { saveHit(); }
 
-void MuonSensitiveDetector::fillHits(edm::PSimHitContainer& cc, const std::string& hname){
-  if (slaveMuon->name() == hname) { cc=slaveMuon->hits(); }
+void MuonSensitiveDetector::fillHits(edm::PSimHitContainer& cc, const std::string& hname) {
+  if (slaveMuon->name() == hname) {
+    cc = slaveMuon->hits();
+  }
 }
 
-Local3DPoint MuonSensitiveDetector::InitialStepPositionVsParent(const G4Step * currentStep, G4int levelsUp) {
-  
-  const G4StepPoint * preStepPoint = currentStep->GetPreStepPoint();
+Local3DPoint MuonSensitiveDetector::InitialStepPositionVsParent(const G4Step* currentStep, G4int levelsUp) {
+  const G4StepPoint* preStepPoint = currentStep->GetPreStepPoint();
   const G4ThreeVector& globalCoordinates = preStepPoint->GetPosition();
-  
-  const G4TouchableHistory * theTouchable=(const G4TouchableHistory *)
-    (preStepPoint->GetTouchable());
+
+  const G4TouchableHistory* theTouchable = (const G4TouchableHistory*)(preStepPoint->GetTouchable());
 
   G4int depth = theTouchable->GetHistory()->GetDepth();
-  G4ThreeVector localCoordinates = theTouchable->GetHistory()
-    ->GetTransform(depth-levelsUp).TransformPoint(globalCoordinates);
-  
-  return ConvertToLocal3DPoint(localCoordinates); 
+  G4ThreeVector localCoordinates =
+      theTouchable->GetHistory()->GetTransform(depth - levelsUp).TransformPoint(globalCoordinates);
+
+  return ConvertToLocal3DPoint(localCoordinates);
 }
- 
+
 Local3DPoint MuonSensitiveDetector::FinalStepPositionVsParent(const G4Step* currentStep, G4int levelsUp) {
-  
-  const G4StepPoint * postStepPoint = currentStep->GetPostStepPoint();
-  const G4StepPoint * preStepPoint  = currentStep->GetPreStepPoint();
+  const G4StepPoint* postStepPoint = currentStep->GetPostStepPoint();
+  const G4StepPoint* preStepPoint = currentStep->GetPreStepPoint();
   const G4ThreeVector& globalCoordinates = postStepPoint->GetPosition();
-    
-  const G4TouchableHistory * theTouchable = (const G4TouchableHistory *)
-    (preStepPoint->GetTouchable());
+
+  const G4TouchableHistory* theTouchable = (const G4TouchableHistory*)(preStepPoint->GetTouchable());
 
   G4int depth = theTouchable->GetHistory()->GetDepth();
-  G4ThreeVector localCoordinates = theTouchable->GetHistory()
-    ->GetTransform(depth-levelsUp).TransformPoint(globalCoordinates);
+  G4ThreeVector localCoordinates =
+      theTouchable->GetHistory()->GetTransform(depth - levelsUp).TransformPoint(globalCoordinates);
 
-  return ConvertToLocal3DPoint(localCoordinates); 
+  return ConvertToLocal3DPoint(localCoordinates);
 }
diff --git a/SimG4CMS/Muon/src/MuonSlaveSD.cc b/SimG4CMS/Muon/src/MuonSlaveSD.cc
index f4cdf4d285eb9..4f8ee37d2a8bd 100644
--- a/SimG4CMS/Muon/src/MuonSlaveSD.cc
+++ b/SimG4CMS/Muon/src/MuonSlaveSD.cc
@@ -6,86 +6,51 @@
 
 #include <iostream>
 
-
-MuonSlaveSD::MuonSlaveSD(MuonSubDetector* d,
-			 const SimTrackManager* manager): 
-  TrackingSlaveSD(d->name() ), m_trackManager(manager)
-{
-  detector=d;
+MuonSlaveSD::MuonSlaveSD(MuonSubDetector* d, const SimTrackManager* manager)
+    : TrackingSlaveSD(d->name()), m_trackManager(manager) {
+  detector = d;
 }
 
-MuonSlaveSD::~MuonSlaveSD() { 
-}
+MuonSlaveSD::~MuonSlaveSD() {}
 
-void MuonSlaveSD::clearHits()
-{
-  LogDebug("MuonSimDebug") << " MuonSlaveSD::clearHits "<< detector->name() << std::endl;
+void MuonSlaveSD::clearHits() {
+  LogDebug("MuonSimDebug") << " MuonSlaveSD::clearHits " << detector->name() << std::endl;
   hits_.clear();
 }
 
-bool MuonSlaveSD::format()
-{
-  LogDebug("MuonSimDebug") << " MuonSlaveSD "<<detector->name()<<" formatting " << hits_.size() <<" hits."<< std::endl;
+bool MuonSlaveSD::format() {
+  LogDebug("MuonSimDebug") << " MuonSlaveSD " << detector->name() << " formatting " << hits_.size() << " hits."
+                           << std::endl;
   if (detector->isBarrel()) {
-    sort(hits_.begin(),hits_.end(), FormatBarrelHits());
+    sort(hits_.begin(), hits_.end(), FormatBarrelHits());
   } else if (detector->isEndcap()) {
-    sort(hits_.begin(),hits_.end(), FormatEndcapHits());
+    sort(hits_.begin(), hits_.end(), FormatEndcapHits());
   } else if (detector->isRPC()) {
-    sort(hits_.begin(),hits_.end(), FormatRpcHits());
+    sort(hits_.begin(), hits_.end(), FormatRpcHits());
   } else if (detector->isGEM()) {
-    sort(hits_.begin(),hits_.end(), FormatGemHits());
+    sort(hits_.begin(), hits_.end(), FormatGemHits());
   } else if (detector->isME0()) {
-    sort(hits_.begin(),hits_.end(), FormatMe0Hits());
-  } 
+    sort(hits_.begin(), hits_.end(), FormatMe0Hits());
+  }
   return true;
 }
 
-bool FormatBarrelHits::operator() (const PSimHit & a, const PSimHit & b)
-{
-  return (sortId(a)<sortId(b));
-}
+bool FormatBarrelHits::operator()(const PSimHit& a, const PSimHit& b) { return (sortId(a) < sortId(b)); }
 
-int FormatBarrelHits::sortId(const PSimHit & a)  const 
-{
-  return a.detUnitId();
-}
+int FormatBarrelHits::sortId(const PSimHit& a) const { return a.detUnitId(); }
 
-bool FormatEndcapHits::operator() (const PSimHit & a, const PSimHit & b)
-{
-  return (sortId(a)<sortId(b));
-}
+bool FormatEndcapHits::operator()(const PSimHit& a, const PSimHit& b) { return (sortId(a) < sortId(b)); }
 
-int FormatEndcapHits::sortId(const PSimHit & a)  const 
-{
-  return a.detUnitId();
-}
+int FormatEndcapHits::sortId(const PSimHit& a) const { return a.detUnitId(); }
 
-bool FormatRpcHits::operator() (const PSimHit & a, const PSimHit & b)
-{
-  return (sortId(a)<sortId(b));
-}
+bool FormatRpcHits::operator()(const PSimHit& a, const PSimHit& b) { return (sortId(a) < sortId(b)); }
 
-int FormatRpcHits::sortId(const PSimHit & a)  const 
-{
-  return a.detUnitId();
-}
+int FormatRpcHits::sortId(const PSimHit& a) const { return a.detUnitId(); }
 
-bool FormatGemHits::operator() (const PSimHit & a, const PSimHit & b)
-{
-  return (sortId(a)<sortId(b));
-}
+bool FormatGemHits::operator()(const PSimHit& a, const PSimHit& b) { return (sortId(a) < sortId(b)); }
 
-int FormatGemHits::sortId(const PSimHit & a)  const 
-{
-  return a.detUnitId();
-}
+int FormatGemHits::sortId(const PSimHit& a) const { return a.detUnitId(); }
 
-bool FormatMe0Hits::operator() (const PSimHit & a, const PSimHit & b)
-{
-  return (sortId(a)<sortId(b));
-}
+bool FormatMe0Hits::operator()(const PSimHit& a, const PSimHit& b) { return (sortId(a) < sortId(b)); }
 
-int FormatMe0Hits::sortId(const PSimHit & a)  const 
-{
-  return a.detUnitId();
-}
+int FormatMe0Hits::sortId(const PSimHit& a) const { return a.detUnitId(); }
diff --git a/SimG4CMS/Muon/src/SimHitPrinter.cc b/SimG4CMS/Muon/src/SimHitPrinter.cc
index 4d7c7887732d3..b2e7f3c538701 100644
--- a/SimG4CMS/Muon/src/SimHitPrinter.cc
+++ b/SimG4CMS/Muon/src/SimHitPrinter.cc
@@ -1,104 +1,101 @@
 #include "SimG4CMS/Muon/interface/SimHitPrinter.h"
 
-#include<iomanip>
-#include<iostream>
+#include <iomanip>
+#include <iostream>
 #include <memory>
 #include <mutex>
 
-std::atomic<std::ofstream *> SimHitPrinter::theFile(nullptr);
+std::atomic<std::ofstream*> SimHitPrinter::theFile(nullptr);
 
 namespace {
   std::mutex fileMutex;
 }
 
-SimHitPrinter::SimHitPrinter(std::string filename){
-  if (theFile) return;
+SimHitPrinter::SimHitPrinter(std::string filename) {
+  if (theFile)
+    return;
   const char* theName = filename.c_str();
   auto f = std::make_unique<std::ofstream>(theName, std::ios::out);
 
   std::ofstream* previous = nullptr;
-  if(theFile.compare_exchange_strong(previous,f.get()) ) {
+  if (theFile.compare_exchange_strong(previous, f.get())) {
     //this thread was the first one to try to set the value
     f.release();
   }
 }
 
-SimHitPrinter::~SimHitPrinter(){
+SimHitPrinter::~SimHitPrinter() {
   //  theFile->close();
 }
 
-void SimHitPrinter::startNewSimHit(std::string s){
+void SimHitPrinter::startNewSimHit(std::string s) {
   std::cout.width(10);
-  std::cout.setf(std::ios::right,std::ios::adjustfield);
-  std::cout.setf(std::ios::scientific,std::ios::floatfield);
+  std::cout.setf(std::ios::right, std::ios::adjustfield);
+  std::cout.setf(std::ios::scientific, std::ios::floatfield);
   std::cout.precision(6);
-  std::cout << "SimHit in "<<s<<std::endl;
+  std::cout << "SimHit in " << s << std::endl;
 
   std::lock_guard<std::mutex> guard{fileMutex};
   (*theFile).width(10);
-  (*theFile).setf(std::ios::right,std::ios::adjustfield);
-  (*theFile).setf(std::ios::scientific|std::ios::uppercase|std::ios::showpos,std::ios::floatfield);
+  (*theFile).setf(std::ios::right, std::ios::adjustfield);
+  (*theFile).setf(std::ios::scientific | std::ios::uppercase | std::ios::showpos, std::ios::floatfield);
   (*theFile).precision(5);
-  (*theFile) << "SimHit in "<<s;
+  (*theFile) << "SimHit in " << s;
 }
 
-void SimHitPrinter::startNewEvent(int num){
+void SimHitPrinter::startNewEvent(int num) {
   std::lock_guard<std::mutex> guard{fileMutex};
-  (*theFile) << "Event "<<num<<std::endl;
+  (*theFile) << "Event " << num << std::endl;
 }
 
-void SimHitPrinter::printId(int id) const{
-  std::cout << " Id: "<<id<<std::endl;
+void SimHitPrinter::printId(int id) const {
+  std::cout << " Id: " << id << std::endl;
   std::lock_guard<std::mutex> guard{fileMutex};
   (*theFile) << " id ";
   (*theFile).width(10);
-  (*theFile).setf(std::ios::right,std::ios::adjustfield);
-  (*theFile) <<id;
+  (*theFile).setf(std::ios::right, std::ios::adjustfield);
+  (*theFile) << id;
 }
 
-void SimHitPrinter::printTrack(int id) const{
-  std::cout << " Track: "<<id<<std::endl;
+void SimHitPrinter::printTrack(int id) const {
+  std::cout << " Track: " << id << std::endl;
   std::lock_guard<std::mutex> guard{fileMutex};
   (*theFile) << " trk ";
   (*theFile).width(10);
-  (*theFile).setf(std::ios::right,std::ios::adjustfield);
+  (*theFile).setf(std::ios::right, std::ios::adjustfield);
   (*theFile) << id;
 }
 
-void SimHitPrinter::printPabs(float pabs) const{
-  std::cout << " Pabs: "<<pabs<<std::endl;
+void SimHitPrinter::printPabs(float pabs) const {
+  std::cout << " Pabs: " << pabs << std::endl;
   std::lock_guard<std::mutex> guard{fileMutex};
-  (*theFile) << " p "<<pabs;
+  (*theFile) << " p " << pabs;
 }
 
-void SimHitPrinter::printEloss(float eloss) const{
-  std::cout << " Eloss: "<<eloss<<std::endl;
+void SimHitPrinter::printEloss(float eloss) const {
+  std::cout << " Eloss: " << eloss << std::endl;
   std::lock_guard<std::mutex> guard{fileMutex};
-  (*theFile) << " e "<<eloss;
+  (*theFile) << " e " << eloss;
 }
 
-void SimHitPrinter::printLocal(LocalPoint localen,LocalPoint localex) const{
-  std::cout << " Local(en/ex): "<<localen.x()<<" "<< localen.y()<<" "
-       <<localen.z()<<" / "<<localex.x()<<" "<< localex.y()<<" "
-       <<localex.z()<<std::endl;
+void SimHitPrinter::printLocal(LocalPoint localen, LocalPoint localex) const {
+  std::cout << " Local(en/ex): " << localen.x() << " " << localen.y() << " " << localen.z() << " / " << localex.x()
+            << " " << localex.y() << " " << localex.z() << std::endl;
   std::lock_guard<std::mutex> guard{fileMutex};
   (*theFile).width(10);
-  (*theFile).setf(std::ios::right,std::ios::adjustfield);
+  (*theFile).setf(std::ios::right, std::ios::adjustfield);
   (*theFile).setf(std::ios::floatfield);
   (*theFile).precision(6);
-  (*theFile) << " en/ex "<<localen.x()<<" "<< localen.y()<<" "
-       <<localen.z()<<" / "<<localex.x()<<" "<< localex.y()<<" "
-       <<localex.z();
+  (*theFile) << " en/ex " << localen.x() << " " << localen.y() << " " << localen.z() << " / " << localex.x() << " "
+             << localex.y() << " " << localex.z();
 }
 
 void SimHitPrinter::printGlobal(GlobalPoint global) const {
-  std::cout << " Global(en): "<<global.x()<<" "<< global.y()<<" "
-	     <<global.z()<<std::endl;
+  std::cout << " Global(en): " << global.x() << " " << global.y() << " " << global.z() << std::endl;
   std::lock_guard<std::mutex> guard{fileMutex};
   (*theFile).width(10);
-  (*theFile).setf(std::ios::right,std::ios::adjustfield);
+  (*theFile).setf(std::ios::right, std::ios::adjustfield);
   (*theFile).setf(std::ios::floatfield);
   (*theFile).precision(6);
-  (*theFile) << " gl "<<global.x()<<" "<< global.y()<<" "
-	     <<global.z()<<std::endl;
+  (*theFile) << " gl " << global.x() << " " << global.y() << " " << global.z() << std::endl;
 }
diff --git a/SimG4CMS/Muon/src/module.cc b/SimG4CMS/Muon/src/module.cc
index a57b97a1e5788..74d7fb315a5a5 100644
--- a/SimG4CMS/Muon/src/module.cc
+++ b/SimG4CMS/Muon/src/module.cc
@@ -1,6 +1,5 @@
 #include "SimG4CMS/Muon/interface/MuonSensitiveDetector.h"
 #include "SimG4Core/SensitiveDetector/interface/SensitiveDetectorPluginFactory.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
-  
 
 DEFINE_SENSITIVEDETECTOR(MuonSensitiveDetector);
diff --git a/SimG4CMS/Tracker/interface/TkAccumulatingSensitiveDetector.h b/SimG4CMS/Tracker/interface/TkAccumulatingSensitiveDetector.h
index 052d100acb07d..6c94fddb0efe5 100644
--- a/SimG4CMS/Tracker/interface/TkAccumulatingSensitiveDetector.h
+++ b/SimG4CMS/Tracker/interface/TkAccumulatingSensitiveDetector.h
@@ -64,7 +64,7 @@ public Observer<const BeginOfJob*>
     std::unique_ptr<TrackingSlaveSD> slaveHighTof;
     std::unique_ptr<FrameRotation>   theRotation;
     std::unique_ptr<const G4ProcessTypeEnumerator> theG4ProcTypeEnumerator;
-    std::unique_ptr<TrackerG4SimHitNumberingScheme> theNumberingScheme;
+    TrackerG4SimHitNumberingScheme* theNumberingScheme; //does not own
     bool allowZeroEnergyLoss;
     bool printHits;
     bool neverAccumulate;
diff --git a/SimG4CMS/Tracker/src/TkAccumulatingSensitiveDetector.cc b/SimG4CMS/Tracker/src/TkAccumulatingSensitiveDetector.cc
index 1f92847c8bc52..3c7c34b0d0021 100644
--- a/SimG4CMS/Tracker/src/TkAccumulatingSensitiveDetector.cc
+++ b/SimG4CMS/Tracker/src/TkAccumulatingSensitiveDetector.cc
@@ -93,7 +93,7 @@ TkAccumulatingSensitiveDetector::TkAccumulatingSensitiveDetector(const std::stri
   setNames(temp);  
 
   theG4ProcTypeEnumerator.reset(new G4ProcessTypeEnumerator);
-  theNumberingScheme.reset(nullptr);
+  theNumberingScheme = nullptr;
 }
 
 TkAccumulatingSensitiveDetector::~TkAccumulatingSensitiveDetector() 
@@ -126,7 +126,7 @@ bool TkAccumulatingSensitiveDetector::ProcessHits(G4Step * aStep, G4TouchableHis
 
 uint32_t TkAccumulatingSensitiveDetector::setDetUnitId(const G4Step * step)
 { 
-  return theNumberingScheme.get()->g4ToNumberingScheme(step->GetPreStepPoint()->GetTouchable());
+  return theNumberingScheme->g4ToNumberingScheme(step->GetPreStepPoint()->GetTouchable());
 }
 
 void TkAccumulatingSensitiveDetector::update(const BeginOfTrack *bot){
@@ -369,7 +369,7 @@ void TkAccumulatingSensitiveDetector::update(const BeginOfJob * i)
     edm::ESTransientHandle<DDCompactView> pView;
     es->get<IdealGeometryRecord>().get(pView);
 
-    theNumberingScheme.reset(&(numberingScheme(*pView,*pDD)));
+    theNumberingScheme = &(numberingScheme(*pView,*pDD));
 }
 
 void TkAccumulatingSensitiveDetector::clearHits()
diff --git a/SimG4Core/Application/interface/RunManager.h b/SimG4Core/Application/interface/RunManager.h
index e40229d5d4efd..4e9e26485375b 100644
--- a/SimG4Core/Application/interface/RunManager.h
+++ b/SimG4Core/Application/interface/RunManager.h
@@ -139,7 +139,6 @@ class RunManager
   std::vector<std::string> m_G4Commands;
   edm::ParameterSet m_p;
 
-  AttachSD * m_attach;
   std::vector<SensitiveTkDetector*> m_sensTkDets;
   std::vector<SensitiveCaloDetector*> m_sensCaloDets;
 
diff --git a/SimG4Core/Application/interface/RunManagerMTWorker.h b/SimG4Core/Application/interface/RunManagerMTWorker.h
index 79f032c3d2b4d..161617f215f2a 100644
--- a/SimG4Core/Application/interface/RunManagerMTWorker.h
+++ b/SimG4Core/Application/interface/RunManagerMTWorker.h
@@ -8,6 +8,7 @@
 #include "SimDataFormats/Forward/interface/LHCTransportLinkContainer.h"
 
 #include <memory>
+#include <tbb/concurrent_vector.h>
 
 namespace edm {
   class ParameterSet;
@@ -43,12 +44,13 @@ class RunManagerMTWorker {
 
   void endRun();
 
-  void produce(const edm::Event& inpevt, const edm::EventSetup& es, RunManagerMT& runManagerMaster);
+  std::unique_ptr<G4SimEvent> 
+    produce(const edm::Event& inpevt, const edm::EventSetup& es, RunManagerMT& runManagerMaster);
 
   void abortEvent();
   void abortRun(bool softAbort=false);
 
-  inline G4SimEvent * simEvent() { return m_simEvent.get(); }
+  inline G4SimEvent * simEvent() { return m_simEvent; }
 
   void Connect(RunAction*);
   void Connect(EventAction*);
@@ -91,9 +93,10 @@ class RunManagerMTWorker {
   edm::ParameterSet m_p;
 
   struct TLSData;
-  static thread_local TLSData *m_tls;
+  static thread_local TLSData* m_tls;
+  static void resetTLS();
 
-  std::unique_ptr<G4SimEvent> m_simEvent;
+  G4SimEvent* m_simEvent;
   std::unique_ptr<CMSSteppingVerbose> m_sVerbose;
 };
 
diff --git a/SimG4Core/Application/plugins/OscarMTProducer.cc b/SimG4Core/Application/plugins/OscarMTProducer.cc
index 007b07cf4bf73..e396e83407c42 100644
--- a/SimG4Core/Application/plugins/OscarMTProducer.cc
+++ b/SimG4Core/Application/plugins/OscarMTProducer.cc
@@ -172,12 +172,11 @@ void OscarMTProducer::produce(edm::Event & e, const edm::EventSetup & es)
     << "Produce event " << e.id() << " stream " << e.streamID() 
     << " rand= " << G4UniformRand();
 
-  std::vector<SensitiveTkDetector*>& sTk =
-    m_runManagerWorker->sensTkDetectors();
-  std::vector<SensitiveCaloDetector*>& sCalo =
-    m_runManagerWorker->sensCaloDetectors();
+  auto& sTk = m_runManagerWorker->sensTkDetectors();
+  auto& sCalo = m_runManagerWorker->sensCaloDetectors();
 
-  try { m_runManagerWorker->produce(e, es, globalCache()->runManagerMaster()); }
+  std::unique_ptr<G4SimEvent> evt;
+  try { evt=m_runManagerWorker->produce(e, es, globalCache()->runManagerMaster()); }
   catch ( const SimG4Exception& simg4ex ) {
        
     edm::LogWarning("SimG4CoreApplication") << "SimG4Exception caght! " 
@@ -193,7 +192,6 @@ void OscarMTProducer::produce(edm::Event & e, const edm::EventSetup & es)
     p1(new edm::SimTrackContainer);
   std::unique_ptr<edm::SimVertexContainer>
     p2(new edm::SimVertexContainer);
-  G4SimEvent * evt = m_runManagerWorker->simEvent();
   evt->load(*p1);
   evt->load(*p2);   
 
diff --git a/SimG4Core/Application/plugins/OscarProducer.cc b/SimG4Core/Application/plugins/OscarProducer.cc
index 6ed7cad2e587a..3591e5e75ccc8 100644
--- a/SimG4Core/Application/plugins/OscarProducer.cc
+++ b/SimG4Core/Application/plugins/OscarProducer.cc
@@ -157,9 +157,9 @@ void OscarProducer::produce(edm::Event & e, const edm::EventSetup & es)
 {
   StaticRandomEngineSetUnset random(e.streamID());
 
-  std::vector<SensitiveTkDetector*>& sTk = 
+  auto& sTk = 
     m_runManager->sensTkDetectors();
-  std::vector<SensitiveCaloDetector*>& sCalo =
+  auto& sCalo =
     m_runManager->sensCaloDetectors();
 
   try { m_runManager->produce(e, es); }
diff --git a/SimG4Core/Application/src/RunManager.cc b/SimG4Core/Application/src/RunManager.cc
index b69a756f32c7d..75f40f95e3e3d 100644
--- a/SimG4Core/Application/src/RunManager.cc
+++ b/SimG4Core/Application/src/RunManager.cc
@@ -148,7 +148,6 @@ RunManager::RunManager(edm::ParameterSet const & p, edm::ConsumesCollector&& iC)
 
   m_physicsList.reset(nullptr);
   m_prodCuts.reset(nullptr);
-  m_attach = nullptr;
 
   m_check = p.getUntrackedParameter<bool>("CheckOverlap",false);
   m_WriteFile = p.getUntrackedParameter<std::string>("FileNameGDML","");
@@ -237,15 +236,16 @@ void RunManager::initG4(const edm::EventSetup & es)
   // we need the track manager now
   m_trackManager = std::unique_ptr<SimTrackManager>(new SimTrackManager);
 
-  // attach sensitive detector
-  m_attach = new AttachSD;
+  {
+    // attach sensitive detector
   
-  std::pair< std::vector<SensitiveTkDetector*>,
-    std::vector<SensitiveCaloDetector*> > sensDets = 
-    m_attach->create((*pDD),catalog_,m_p,m_trackManager.get(),m_registry);
+    AttachSD attach;
+    auto sensDets = 
+      attach.create((*pDD),catalog_,m_p,m_trackManager.get(),m_registry);
       
-  m_sensTkDets.swap(sensDets.first);
-  m_sensCaloDets.swap(sensDets.second);
+    m_sensTkDets.swap(sensDets.first);
+    m_sensCaloDets.swap(sensDets.second);
+  }
      
   edm::LogInfo("SimG4CoreApplication") 
     << " RunManager: Sensitive Detector "
diff --git a/SimG4Core/Application/src/RunManagerMTWorker.cc b/SimG4Core/Application/src/RunManagerMTWorker.cc
index 5db9dd47ce403..189cecd33062d 100644
--- a/SimG4Core/Application/src/RunManagerMTWorker.cc
+++ b/SimG4Core/Application/src/RunManagerMTWorker.cc
@@ -17,6 +17,7 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Concurrency/interface/FunctorTask.h"
 
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "SimG4Core/Notification/interface/G4SimEvent.h"
@@ -104,9 +105,14 @@ namespace {
       }
     }
   }
+
+  std::atomic<int> active_tlsdata{0};
+  std::atomic<bool> tls_shutdown_timeout{false};
+  std::atomic<int> n_tls_shutdown_task{0};
 }
 
 struct RunManagerMTWorker::TLSData {
+  std::unique_ptr<G4RunManagerKernel> kernel; //must be deleted last
   std::unique_ptr<CustomUIsession> UIsession;
   std::unique_ptr<RunAction> userRunAction;
   std::unique_ptr<SimRunInterface> runInterface;
@@ -116,15 +122,30 @@ struct RunManagerMTWorker::TLSData {
   std::vector<SensitiveCaloDetector*> sensCaloDets;
   std::vector<std::shared_ptr<SimWatcher> > watchers;
   std::vector<std::shared_ptr<SimProducer> > producers;
-  std::unique_ptr<G4Run> currentRun;
+  //G4Run can only be deleted if there is a G4RunManager
+  // on the thread where the G4Run is being deleted,
+  // else it causes a segmentation fault
+  G4Run* currentRun = nullptr;
   std::unique_ptr<G4Event> currentEvent;
-  std::unique_ptr<G4RunManagerKernel> kernel;
   edm::RunNumber_t currentRunNumber = 0;
   bool threadInitialized = false;
   bool runTerminated = false;
+
+  TLSData() {
+    ++active_tlsdata;
+  }
+
+  ~TLSData() {
+    --active_tlsdata;
+  }
 };
 
-thread_local RunManagerMTWorker::TLSData *RunManagerMTWorker::m_tls = nullptr;
+//This can not be a smart pointer since we must delete some of the members
+// before leaving main() else we get a segmentation fault caused by accessing
+// other 'singletons' after those singletons have been deleted. Instead we
+// atempt to delete all TLS at RunManagerMTWorker destructor. If that fails for
+// some reason, it is better to leak than cause a crash.
+thread_local RunManagerMTWorker::TLSData* RunManagerMTWorker::m_tls{nullptr};
 
 RunManagerMTWorker::RunManagerMTWorker(const edm::ParameterSet& iConfig, edm::ConsumesCollector&& iC):
   m_generator(iConfig.getParameter<edm::ParameterSet>("Generator")),
@@ -140,10 +161,10 @@ RunManagerMTWorker::RunManagerMTWorker(const edm::ParameterSet& iConfig, edm::Co
   m_pTrackingAction(iConfig.getParameter<edm::ParameterSet>("TrackingAction")),
   m_pSteppingAction(iConfig.getParameter<edm::ParameterSet>("SteppingAction")),
   m_pCustomUIsession(iConfig.getUntrackedParameter<edm::ParameterSet>("CustomUIsession")),
-  m_p(iConfig)
+  m_p(iConfig),
+  m_simEvent(nullptr),
+  m_sVerbose(nullptr)
 {
-  m_simEvent.reset(nullptr);
-  m_sVerbose.reset(nullptr);
   std::vector<edm::ParameterSet> watchers = 
     iConfig.getParameter<std::vector<edm::ParameterSet> >("Watchers");
   m_hasWatchers = (watchers.empty()) ? false : true;
@@ -152,6 +173,43 @@ RunManagerMTWorker::RunManagerMTWorker(const edm::ParameterSet& iConfig, edm::Co
 
 RunManagerMTWorker::~RunManagerMTWorker() {
   if(m_tls && !m_tls->runTerminated) { terminateRun(); }
+
+  ++n_tls_shutdown_task;
+  resetTLS();
+
+  {
+    //make sure all tasks are done before continuing
+    timespec s;
+    s.tv_sec=0;
+    s.tv_nsec=10000;
+    while(n_tls_shutdown_task != 0) { nanosleep(&s,nullptr); }
+  }
+}
+
+void RunManagerMTWorker::resetTLS() {
+  delete m_tls;
+  m_tls=nullptr;
+
+  if(active_tlsdata != 0 and not tls_shutdown_timeout) {
+    ++n_tls_shutdown_task;
+    //need to run tasks on each thread which has set the tls
+    auto task = edm::make_functor_task(tbb::task::allocate_root(), [] () {
+        resetTLS();
+      });
+    tbb::task::enqueue(*task);
+    timespec s;
+    s.tv_sec=0;
+    s.tv_nsec=10000;
+    //we do not want this thread to be used for a new task since it
+    // has already cleared its structures. In order to fill all TBB
+    // threads we wait for all TLSes to clear
+    int count = 0;
+    while(active_tlsdata.load() != 0 and ++count < 1000) { nanosleep(&s,nullptr);}
+    if(count >= 1000) {
+      tls_shutdown_timeout=true;
+    }
+  }
+  --n_tls_shutdown_task;
 }
 
 void RunManagerMTWorker::endRun() {
@@ -160,7 +218,8 @@ void RunManagerMTWorker::endRun() {
 
 void RunManagerMTWorker::initializeTLS() {
   if(m_tls) { return; }
-  m_tls = new TLSData;
+  
+  m_tls = new TLSData() ;
   m_tls->registry.reset(new SimActivityRegistry());
 
   edm::Service<SimActivityRegistry> otherRegistry;
@@ -245,8 +304,7 @@ void RunManagerMTWorker::initializeThread(RunManagerMT& runManagerMaster, const
 
   // attach sensitive detector
   AttachSD attach;
-  std::pair< std::vector<SensitiveTkDetector*>,
-    std::vector<SensitiveCaloDetector*> > sensDets =
+  auto  sensDets =
     attach.create(*pDD, runManagerMaster.catalog(), m_p,
                   m_tls->trackManager.get(),
                   *(m_tls->registry.get()));
@@ -377,19 +435,19 @@ std::vector<std::shared_ptr<SimProducer> > RunManagerMTWorker::producers() {
 }
 
 void RunManagerMTWorker::initializeRun() {
-  m_tls->currentRun.reset(new G4Run());
+  m_tls->currentRun = new G4Run();
   G4StateManager::GetStateManager()->SetNewState(G4State_GeomClosed);
-  if (m_tls->userRunAction) { m_tls->userRunAction->BeginOfRunAction(m_tls->currentRun.get()); }
+  if (m_tls->userRunAction) { m_tls->userRunAction->BeginOfRunAction(m_tls->currentRun); }
 }
 
 void RunManagerMTWorker::terminateRun() {
   if(!m_tls || m_tls->runTerminated) { return; }
   if(m_tls->userRunAction) {
-    m_tls->userRunAction->EndOfRunAction(m_tls->currentRun.get());
+    m_tls->userRunAction->EndOfRunAction(m_tls->currentRun);
     m_tls->userRunAction.reset();
   }
   m_tls->currentEvent.reset();
-  m_simEvent.reset();
+  m_simEvent=nullptr;
 
   if(m_tls->kernel) {
     m_tls->kernel->RunTermination();
@@ -398,8 +456,9 @@ void RunManagerMTWorker::terminateRun() {
   m_tls->runTerminated = true;
 }
 
-void RunManagerMTWorker::produce(const edm::Event& inpevt, const edm::EventSetup& es, 
-                                 RunManagerMT& runManagerMaster) {
+std::unique_ptr<G4SimEvent>
+RunManagerMTWorker::produce(const edm::Event& inpevt, const edm::EventSetup& es, 
+                            RunManagerMT& runManagerMaster) {
   // The initialization and begin/end run is a bit convoluted due to
   // - Geant4 deals per-thread
   // - OscarMTProducer deals per-stream
@@ -429,7 +488,8 @@ void RunManagerMTWorker::produce(const edm::Event& inpevt, const edm::EventSetup
 
   m_tls->currentEvent.reset(generateEvent(inpevt));
 
-  m_simEvent.reset(new G4SimEvent());
+  auto simEvent =std::make_unique<G4SimEvent>();
+  m_simEvent = simEvent.get();
   m_simEvent->hepEvent(m_generator.genEvent());
   m_simEvent->weight(m_generator.eventWeight());
   if (m_generator.genVertex() != nullptr ) {
@@ -470,6 +530,16 @@ void RunManagerMTWorker::produce(const edm::Event& inpevt, const edm::EventSetup
     edm::LogVerbatim("SimG4CoreApplication")
       << " RunManagerMTWorker::produce: ended Event " << inpevt.id().event(); 
   } 
+
+  //remove memory only needed during event processing
+  m_tls->currentEvent.reset();
+
+  for(auto& sd: m_tls->sensCaloDets ) {
+    sd->reset();
+  }
+
+  m_simEvent=nullptr;
+  return simEvent;
 }
 
 void RunManagerMTWorker::abortEvent() {
@@ -490,13 +560,13 @@ void RunManagerMTWorker::abortEvent() {
 
 void RunManagerMTWorker::abortRun(bool softAbort) {
   if (!softAbort) { abortEvent(); }
-  m_tls->currentRun.reset();
+  m_tls->currentRun = nullptr;
   terminateRun();
 }
 
 G4Event * RunManagerMTWorker::generateEvent(const edm::Event& inpevt) {
   m_tls->currentEvent.reset();
-  m_simEvent.reset();
+  m_simEvent=nullptr;
 
   // 64 bits event ID in CMSSW converted into Geant4 event ID
   G4int evtid = (G4int)inpevt.id().event();
diff --git a/SimG4Core/CheckSecondary/interface/CheckSecondary.h b/SimG4Core/CheckSecondary/interface/CheckSecondary.h
index c1a191401ac54..e3b091305b1d1 100644
--- a/SimG4Core/CheckSecondary/interface/CheckSecondary.h
+++ b/SimG4Core/CheckSecondary/interface/CheckSecondary.h
@@ -1,19 +1,19 @@
 #ifndef SimG4Core_CheckSecondary_CheckSecondary_H
 #define SimG4Core_CheckSecondary_CheckSecondary_H
 
-#include "SimG4Core/Watcher/interface/SimWatcher.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "SimG4Core/Notification/interface/Observer.h"
 #include "SimG4Core/Physics/interface/G4ProcessTypeEnumerator.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
+#include "SimG4Core/Watcher/interface/SimWatcher.h"
 
 #include "TFile.h"
 #include "TTree.h"
 
 #include <iostream>
 #include <memory>
-#include <vector>
 #include <string>
+#include <vector>
 
 class G4Step;
 class BeginOfEvent;
@@ -23,37 +23,36 @@ class TreatSecondary;
 class ProcessTypeEnumerator;
 
 class CheckSecondary : public SimWatcher,
-		       public Observer<const BeginOfEvent *>, 
+                       public Observer<const BeginOfEvent *>,
                        public Observer<const BeginOfTrack *>,
-		       public Observer<const EndOfEvent *>, 
-		       public Observer<const G4Step *> {
-
+                       public Observer<const EndOfEvent *>,
+                       public Observer<const G4Step *> {
 public:
   CheckSecondary(const edm::ParameterSet &p);
   ~CheckSecondary() override;
 
 private:
-  CheckSecondary(const CheckSecondary&) = delete; // stop default
-  const CheckSecondary& operator=(const CheckSecondary&) = delete;
+  CheckSecondary(const CheckSecondary &) = delete;  // stop default
+  const CheckSecondary &operator=(const CheckSecondary &) = delete;
 
   // observer classes
-  TTree * bookTree(std::string);
+  TTree *bookTree(std::string);
   void endTree();
-  void update(const BeginOfEvent * evt) override;
-  void update(const BeginOfTrack * trk) override;
-  void update(const G4Step * step) override;
-  void update(const EndOfEvent * evt) override;
+  void update(const BeginOfEvent *evt) override;
+  void update(const BeginOfTrack *trk) override;
+  void update(const G4Step *step) override;
+  void update(const EndOfEvent *evt) override;
 
 private:
-  TreatSecondary                       *treatSecondary;
-  G4ProcessTypeEnumerator              *typeEnumerator;
-  bool                                 saveToTree, storeIt;
-  int                                  nHad;
-  std::vector<int>                     *nsec, *procids;
-  std::vector<double>                  *px, *py, *pz, *mass, *deltae;
-  std::vector<std::string>             *procs;
-  TFile                                *file;
-  TTree                                *tree;
+  TreatSecondary *treatSecondary;
+  G4ProcessTypeEnumerator *typeEnumerator;
+  bool saveToTree, storeIt;
+  int nHad;
+  std::vector<int> *nsec, *procids;
+  std::vector<double> *px, *py, *pz, *mass, *deltae;
+  std::vector<std::string> *procs;
+  TFile *file;
+  TTree *tree;
 };
 
 #endif
diff --git a/SimG4Core/CheckSecondary/interface/StoreSecondary.h b/SimG4Core/CheckSecondary/interface/StoreSecondary.h
index 38ad0208dbe2b..8288b63b11aa2 100644
--- a/SimG4Core/CheckSecondary/interface/StoreSecondary.h
+++ b/SimG4Core/CheckSecondary/interface/StoreSecondary.h
@@ -1,15 +1,15 @@
 #ifndef SimG4Core_CheckSecondary_StoreSecondary_H
 #define SimG4Core_CheckSecondary_StoreSecondary_H
 
-#include "SimG4Core/Watcher/interface/SimProducer.h"
-#include "SimG4Core/Notification/interface/Observer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "SimG4Core/Notification/interface/Observer.h"
+#include "SimG4Core/Watcher/interface/SimProducer.h"
 
 #include <iostream>
 #include <memory>
-#include <vector>
 #include <string>
+#include <vector>
 
 class G4Step;
 class BeginOfEvent;
@@ -17,33 +17,32 @@ class BeginOfTrack;
 class TreatSecondary;
 
 class StoreSecondary : public SimProducer,
-		       public Observer<const BeginOfEvent *>, 
+                       public Observer<const BeginOfEvent *>,
                        public Observer<const BeginOfTrack *>,
-		       public Observer<const G4Step *> {
-
+                       public Observer<const G4Step *> {
 public:
   StoreSecondary(const edm::ParameterSet &p);
   ~StoreSecondary() override;
 
-  void produce(edm::Event&, const edm::EventSetup&) override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
 private:
-  StoreSecondary(const StoreSecondary&) = delete; // stop default
-  const StoreSecondary& operator=(const StoreSecondary&) = delete;
+  StoreSecondary(const StoreSecondary &) = delete;  // stop default
+  const StoreSecondary &operator=(const StoreSecondary &) = delete;
 
   // observer classes
-  void update(const BeginOfEvent * evt) override;
-  void update(const BeginOfTrack * trk) override;
-  void update(const G4Step * step) override;
+  void update(const BeginOfEvent *evt) override;
+  void update(const BeginOfTrack *trk) override;
+  void update(const G4Step *step) override;
 
 private:
-  int                  verbosity, killAfter;
-  int                  nHad;
-  bool                 storeIt;
+  int verbosity, killAfter;
+  int nHad;
+  bool storeIt;
   std::vector<math::XYZTLorentzVector> secondaries;
-  std::vector<int>                     nsecs;
-  std::vector<std::string>             procs;
-  TreatSecondary*                      treatSecondary;
+  std::vector<int> nsecs;
+  std::vector<std::string> procs;
+  TreatSecondary *treatSecondary;
 };
 
 #endif
diff --git a/SimG4Core/CheckSecondary/interface/TreatSecondary.h b/SimG4Core/CheckSecondary/interface/TreatSecondary.h
index f8370c53d4d35..321c41ef5de25 100644
--- a/SimG4Core/CheckSecondary/interface/TreatSecondary.h
+++ b/SimG4Core/CheckSecondary/interface/TreatSecondary.h
@@ -1,40 +1,36 @@
 #ifndef SimG4Core_CheckSecondary_TreatSecondary_H
 #define SimG4Core_CheckSecondary_TreatSecondary_H
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include <iostream>
 #include <memory>
-#include <vector>
 #include <string>
+#include <vector>
 
 class G4Step;
 class G4Track;
 class G4ProcessTypeEnumerator;
 
 class TreatSecondary {
-
 public:
   TreatSecondary(const edm::ParameterSet &p);
   virtual ~TreatSecondary();
 
-  void initTrack(const G4Track* trk);
-  std::vector<math::XYZTLorentzVector> tracks(const G4Step * step, 
-					      std::string & procName, 
-					      int & procID, bool & intr,
-					      double & deltaE,
-					      std::vector<int> & charges);
+  void initTrack(const G4Track *trk);
+  std::vector<math::XYZTLorentzVector> tracks(
+      const G4Step *step, std::string &procName, int &procID, bool &intr, double &deltaE, std::vector<int> &charges);
 
 private:
-  TreatSecondary(const TreatSecondary&) = delete; // stop default
-  const TreatSecondary& operator=(const TreatSecondary&) = delete;
+  TreatSecondary(const TreatSecondary &) = delete;  // stop default
+  const TreatSecondary &operator=(const TreatSecondary &) = delete;
 
 private:
-  int                                  verbosity, minSec, killAfter;
-  double                               minDeltaE, eTrack;
-  G4ProcessTypeEnumerator              *typeEnumerator;
-  int                                  step, nHad, nsecL;
+  int verbosity, minSec, killAfter;
+  double minDeltaE, eTrack;
+  G4ProcessTypeEnumerator *typeEnumerator;
+  int step, nHad, nsecL;
 };
 
 #endif
diff --git a/SimG4Core/CheckSecondary/src/CheckSecondary.cc b/SimG4Core/CheckSecondary/src/CheckSecondary.cc
index f0581999953d3..e36aa858caf6e 100644
--- a/SimG4Core/CheckSecondary/src/CheckSecondary.cc
+++ b/SimG4Core/CheckSecondary/src/CheckSecondary.cc
@@ -6,106 +6,116 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 
 #include "SimG4Core/Notification/interface/BeginOfEvent.h"
-#include "SimG4Core/Notification/interface/EndOfEvent.h"
 #include "SimG4Core/Notification/interface/BeginOfTrack.h"
+#include "SimG4Core/Notification/interface/EndOfEvent.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
+#include "CLHEP/Units/GlobalPhysicalConstants.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "G4HCofThisEvent.hh"
 #include "G4Step.hh"
 #include "G4Track.hh"
 #include "G4VProcess.hh"
-#include "G4HCofThisEvent.hh"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
-#include "CLHEP/Units/GlobalPhysicalConstants.h"
 
 #include <cmath>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
-CheckSecondary::CheckSecondary(const edm::ParameterSet &p): treatSecondary(nullptr),
-							    typeEnumerator(nullptr),
-							    nsec(nullptr),procids(nullptr),
-							    px(nullptr),py(nullptr),pz(nullptr),
-							    mass(nullptr),deltae(nullptr),
-							    procs(nullptr),file(nullptr),
-							    tree(nullptr) {
-
+CheckSecondary::CheckSecondary(const edm::ParameterSet &p)
+    : treatSecondary(nullptr),
+      typeEnumerator(nullptr),
+      nsec(nullptr),
+      procids(nullptr),
+      px(nullptr),
+      py(nullptr),
+      pz(nullptr),
+      mass(nullptr),
+      deltae(nullptr),
+      procs(nullptr),
+      file(nullptr),
+      tree(nullptr) {
   edm::ParameterSet m_p = p.getParameter<edm::ParameterSet>("CheckSecondary");
   std::string saveFile = m_p.getUntrackedParameter<std::string>("SaveInFile", "None");
   treatSecondary = new TreatSecondary(m_p);
   typeEnumerator = new G4ProcessTypeEnumerator();
 
-  nsec               = new std::vector<int>();
-  px                 = new std::vector<double>();
-  py                 = new std::vector<double>();
-  pz                 = new std::vector<double>();
-  mass               = new std::vector<double>();
-  deltae             = new std::vector<double>();
-  procids            = new std::vector<int>();
-  procs              = new std::vector<std::string>();
+  nsec = new std::vector<int>();
+  px = new std::vector<double>();
+  py = new std::vector<double>();
+  pz = new std::vector<double>();
+  mass = new std::vector<double>();
+  deltae = new std::vector<double>();
+  procids = new std::vector<int>();
+  procs = new std::vector<std::string>();
 
   if (saveFile != "None") {
     saveToTree = true;
-    tree = bookTree (saveFile);
+    tree = bookTree(saveFile);
     edm::LogInfo("CheckSecondary") << "Instantiate CheckSecondary with first"
-				   << " hadronic interaction information"
-				   << " to be saved in file " << saveFile;
+                                   << " hadronic interaction information"
+                                   << " to be saved in file " << saveFile;
   } else {
     saveToTree = false;
     edm::LogInfo("CheckSecondary") << "Instantiate CheckSecondary with first"
-				   << " hadronic interaction information"
-				   << " not saved";
+                                   << " hadronic interaction information"
+                                   << " not saved";
   }
-} 
-   
-CheckSecondary::~CheckSecondary() {
-  if (saveToTree)     endTree();
-  if (nsec)           delete nsec;
-  if (px)             delete px;
-  if (py)             delete py;
-  if (pz)             delete pz;
-  if (mass)           delete mass;
-  if (deltae)         delete deltae;
-  if (procs)          delete procs;
-  if (procids)        delete procids;
-  if (typeEnumerator) delete typeEnumerator;
-  if (treatSecondary) delete treatSecondary;
 }
 
-TTree* CheckSecondary::bookTree(std::string fileName) {
+CheckSecondary::~CheckSecondary() {
+  if (saveToTree)
+    endTree();
+  if (nsec)
+    delete nsec;
+  if (px)
+    delete px;
+  if (py)
+    delete py;
+  if (pz)
+    delete pz;
+  if (mass)
+    delete mass;
+  if (deltae)
+    delete deltae;
+  if (procs)
+    delete procs;
+  if (procids)
+    delete procids;
+  if (typeEnumerator)
+    delete typeEnumerator;
+  if (treatSecondary)
+    delete treatSecondary;
+}
 
-  file = new TFile (fileName.c_str(), "RECREATE");
+TTree *CheckSecondary::bookTree(std::string fileName) {
+  file = new TFile(fileName.c_str(), "RECREATE");
   file->cd();
 
-  TTree * t1 = new TTree("T1", "Secondary Particle Information");
-  t1->Branch("SecondaryPx",       "std::vector<double>",      &px);
-  t1->Branch("SecondaryPy",       "std::vector<double>",      &py);
-  t1->Branch("SecondaryPz",       "std::vector<double>",      &pz);
-  t1->Branch("SecondaryMass",     "std::vector<double>",      &mass);
-  t1->Branch("NumberSecondaries", "std::vector<int>",         &nsec);
-  t1->Branch("DeltaEinInteract",  "std::vector<double>",      &deltae);
-  t1->Branch("ProcessID",         "std::vector<int>",         &procids);
-  t1->Branch("ProcessNames",      "std::vector<std::string>", &procs);
+  TTree *t1 = new TTree("T1", "Secondary Particle Information");
+  t1->Branch("SecondaryPx", "std::vector<double>", &px);
+  t1->Branch("SecondaryPy", "std::vector<double>", &py);
+  t1->Branch("SecondaryPz", "std::vector<double>", &pz);
+  t1->Branch("SecondaryMass", "std::vector<double>", &mass);
+  t1->Branch("NumberSecondaries", "std::vector<int>", &nsec);
+  t1->Branch("DeltaEinInteract", "std::vector<double>", &deltae);
+  t1->Branch("ProcessID", "std::vector<int>", &procids);
+  t1->Branch("ProcessNames", "std::vector<std::string>", &procs);
   return t1;
 }
 
 void CheckSecondary::endTree() {
-
-  edm::LogInfo("CheckSecondary") << "Save the Secondary Tree " 
-				 << tree->GetName() << " (" << tree
-				 << ") in file " << file->GetName() << " ("
-				 << file << ")";
+  edm::LogInfo("CheckSecondary") << "Save the Secondary Tree " << tree->GetName() << " (" << tree << ") in file "
+                                 << file->GetName() << " (" << file << ")";
   file->cd();
   tree->Write();
   file->Close();
   delete file;
 }
 
-void CheckSecondary::update(const BeginOfEvent * evt) {
-
+void CheckSecondary::update(const BeginOfEvent *evt) {
   int iev = (*evt)()->GetEventID();
-  LogDebug("CheckSecondary") << "CheckSecondary::=====> Begin of event = " 
-			     << iev;
+  LogDebug("CheckSecondary") << "CheckSecondary::=====> Begin of event = " << iev;
 
   (*nsec).clear();
   (*procs).clear();
@@ -117,75 +127,65 @@ void CheckSecondary::update(const BeginOfEvent * evt) {
   (*mass).clear();
 }
 
-void CheckSecondary::update(const BeginOfTrack * trk) {
-
-  const G4Track * thTk = (*trk)();
+void CheckSecondary::update(const BeginOfTrack *trk) {
+  const G4Track *thTk = (*trk)();
   treatSecondary->initTrack(thTk);
-  if (thTk->GetParentID() <= 0) storeIt = true;
-  else                          storeIt = false;
-  nHad  = 0;
-  LogDebug("CheckSecondary") << "CheckSecondary:: Track " << thTk->GetTrackID()
-			     << " Parent " << thTk->GetParentID() << " Flag "
-			     << storeIt;
+  if (thTk->GetParentID() <= 0)
+    storeIt = true;
+  else
+    storeIt = false;
+  nHad = 0;
+  LogDebug("CheckSecondary") << "CheckSecondary:: Track " << thTk->GetTrackID() << " Parent " << thTk->GetParentID()
+                             << " Flag " << storeIt;
 }
 
-void CheckSecondary::update(const G4Step * aStep) {
-
-  std::string      name;
-  int              procID;
-  bool             hadrInt;
-  double           deltaE;
+void CheckSecondary::update(const G4Step *aStep) {
+  std::string name;
+  int procID;
+  bool hadrInt;
+  double deltaE;
   std::vector<int> charge;
-  std::vector<math::XYZTLorentzVector> tracks = treatSecondary->tracks(aStep,
-								       name,
-								       procID,
-								       hadrInt,
-								       deltaE,
-								       charge);
+  std::vector<math::XYZTLorentzVector> tracks = treatSecondary->tracks(aStep, name, procID, hadrInt, deltaE, charge);
   if (storeIt && hadrInt) {
     double pInit = (aStep->GetPreStepPoint()->GetMomentum()).mag();
-    double pEnd  = (aStep->GetPostStepPoint()->GetMomentum()).mag();
+    double pEnd = (aStep->GetPostStepPoint()->GetMomentum()).mag();
     nHad++;
-    int  sec = (int)(tracks.size());
-    LogDebug("CheckSecondary") << "CheckSecondary:: Hadronic Interaction "
-			       << nHad << " of type " << name << " ID "
-			       << procID << " with " << sec << " secondaries "
-			       << " and Momentum (MeV/c) at start " << pInit
-			       << " and at end " << pEnd;
+    int sec = (int)(tracks.size());
+    LogDebug("CheckSecondary") << "CheckSecondary:: Hadronic Interaction " << nHad << " of type " << name << " ID "
+                               << procID << " with " << sec << " secondaries "
+                               << " and Momentum (MeV/c) at start " << pInit << " and at end " << pEnd;
     (*nsec).push_back(sec);
     (*procs).push_back(name);
     (*procids).push_back(procID);
     (*deltae).push_back(deltaE);
     if (nHad == 1) {
-      for (int i=0; i<sec; i++) {
-	double m = tracks[i].M();
-	if (charge[i]<0) m = -m;
-	(*px).push_back(tracks[i].Px());
-	(*py).push_back(tracks[i].Py());
-	(*pz).push_back(tracks[i].Pz());
-	(*mass).push_back(m);
+      for (int i = 0; i < sec; i++) {
+        double m = tracks[i].M();
+        if (charge[i] < 0)
+          m = -m;
+        (*px).push_back(tracks[i].Px());
+        (*py).push_back(tracks[i].Py());
+        (*pz).push_back(tracks[i].Pz());
+        (*mass).push_back(m);
       }
     }
   }
 }
 
-void CheckSecondary::update(const EndOfEvent * evt) {
-
-  LogDebug("CheckSecondary") << "CheckSecondary::EndofEvent =====> Event " 
-			     << (*evt)()->GetEventID() << " with "
-			     << (*nsec).size() << " hadronic collisions with"
-			     << " secondaries produced in each step";
-  for (unsigned int i= 0; i < (*nsec).size(); i++) 
-    LogDebug("CheckSecondary") << " " << (*nsec)[i] << " from " << (*procs)[i]
-			       << " ID " << (*procids)[i] << " (" 
-			       << typeEnumerator->processG4Name((*procids)[i])
-			       << ") deltaE = " << (*deltae)[i] << " MeV";
+void CheckSecondary::update(const EndOfEvent *evt) {
+  LogDebug("CheckSecondary") << "CheckSecondary::EndofEvent =====> Event " << (*evt)()->GetEventID() << " with "
+                             << (*nsec).size() << " hadronic collisions with"
+                             << " secondaries produced in each step";
+  for (unsigned int i = 0; i < (*nsec).size(); i++)
+    LogDebug("CheckSecondary") << " " << (*nsec)[i] << " from " << (*procs)[i] << " ID " << (*procids)[i] << " ("
+                               << typeEnumerator->processG4Name((*procids)[i]) << ") deltaE = " << (*deltae)[i]
+                               << " MeV";
   LogDebug("CheckSecondary") << "And " << (*mass).size() << " secondaries "
-			     << "produced in the first interactions";
-  for (unsigned int i= 0; i < (*mass).size(); i++) 
-    LogDebug("CheckSecondary") << "Secondary " << i << " (" << (*px)[i] << ", "
-			       << (*py)[i] << ", " << (*pz)[i] << ", " 
-			       << (*mass)[i] << ")";
+                             << "produced in the first interactions";
+  for (unsigned int i = 0; i < (*mass).size(); i++)
+    LogDebug("CheckSecondary") << "Secondary " << i << " (" << (*px)[i] << ", " << (*py)[i] << ", " << (*pz)[i] << ", "
+                               << (*mass)[i] << ")";
 
-  if (saveToTree) tree->Fill();
+  if (saveToTree)
+    tree->Fill();
 }
diff --git a/SimG4Core/CheckSecondary/src/StoreSecondary.cc b/SimG4Core/CheckSecondary/src/StoreSecondary.cc
index 80407a415ea1f..82f0fdfc67305 100644
--- a/SimG4Core/CheckSecondary/src/StoreSecondary.cc
+++ b/SimG4Core/CheckSecondary/src/StoreSecondary.cc
@@ -9,84 +9,74 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
+#include "CLHEP/Units/GlobalPhysicalConstants.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "G4HCofThisEvent.hh"
 #include "G4Step.hh"
 #include "G4Track.hh"
-#include "G4HCofThisEvent.hh"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
-#include "CLHEP/Units/GlobalPhysicalConstants.h"
 
 #include <cmath>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
 StoreSecondary::StoreSecondary(const edm::ParameterSet &p) {
-
   edm::ParameterSet m_p = p.getParameter<edm::ParameterSet>("StoreSecondary");
-  treatSecondary    = new TreatSecondary (m_p);
+  treatSecondary = new TreatSecondary(m_p);
 
-  produces<std::vector<math::XYZTLorentzVector> >("SecondaryMomenta");
-  produces<std::vector<int> >("SecondaryParticles");
+  produces<std::vector<math::XYZTLorentzVector>>("SecondaryMomenta");
+  produces<std::vector<int>>("SecondaryParticles");
 
   edm::LogInfo("CheckSecondary") << "Instantiate StoreSecondary to store "
-				 << "secondaries after 1st hadronic inelastic"
-				 << " interaction";
-} 
-   
-StoreSecondary::~StoreSecondary() {
-  delete treatSecondary;
+                                 << "secondaries after 1st hadronic inelastic"
+                                 << " interaction";
 }
 
-void StoreSecondary::produce(edm::Event& e, const edm::EventSetup&) {
+StoreSecondary::~StoreSecondary() { delete treatSecondary; }
 
-  std::unique_ptr<std::vector<math::XYZTLorentzVector> > secMom(new std::vector<math::XYZTLorentzVector>);
+void StoreSecondary::produce(edm::Event &e, const edm::EventSetup &) {
+  std::unique_ptr<std::vector<math::XYZTLorentzVector>> secMom(new std::vector<math::XYZTLorentzVector>);
   *secMom = secondaries;
   e.put(std::move(secMom), "SecondaryMomenta");
 
-  std::unique_ptr<std::vector<int> > secNumber(new std::vector<int>);
+  std::unique_ptr<std::vector<int>> secNumber(new std::vector<int>);
   *secNumber = nsecs;
   e.put(std::move(secNumber), "SecondaryParticles");
 
-  LogDebug("CheckSecondary") << "StoreSecondary:: Event " << e.id() << " with "
-			     << nsecs.size() << " hadronic collisions with "
-			     << "secondaries produced in each step";
-  for (unsigned int i= 0; i < nsecs.size(); i++) {
+  LogDebug("CheckSecondary") << "StoreSecondary:: Event " << e.id() << " with " << nsecs.size()
+                             << " hadronic collisions with "
+                             << "secondaries produced in each step";
+  for (unsigned int i = 0; i < nsecs.size(); i++) {
     LogDebug("CheckSecondary") << " " << nsecs[i] << " from " << procs[i];
   }
   LogDebug("CheckSecondary") << " and " << secondaries.size() << " secondaries"
-			     << " produced in the first interactions:";
-  for (unsigned int i= 0; i < secondaries.size(); i++) 
+                             << " produced in the first interactions:";
+  for (unsigned int i = 0; i < secondaries.size(); i++)
     LogDebug("CheckSecondary") << "Secondary " << i << " " << secondaries[i];
 }
 
 void StoreSecondary::update(const BeginOfEvent *) {
-
   nsecs.clear();
   procs.clear();
   secondaries.clear();
 }
 
-void StoreSecondary::update(const BeginOfTrack * trk) {
-
-  const G4Track * thTk = (*trk)();
+void StoreSecondary::update(const BeginOfTrack *trk) {
+  const G4Track *thTk = (*trk)();
   treatSecondary->initTrack(thTk);
-  if (nsecs.empty() && thTk->GetParentID() <= 0) storeIt = true;
-  else                                               storeIt = false;
-  nHad  = 0;
+  if (nsecs.empty() && thTk->GetParentID() <= 0)
+    storeIt = true;
+  else
+    storeIt = false;
+  nHad = 0;
 }
 
-void StoreSecondary::update(const G4Step * aStep) {
-
-  std::string      name;
-  int              procID;
-  bool             hadrInt;
-  double           deltaE;
+void StoreSecondary::update(const G4Step *aStep) {
+  std::string name;
+  int procID;
+  bool hadrInt;
+  double deltaE;
   std::vector<int> charge;
-  std::vector<math::XYZTLorentzVector> tracks = treatSecondary->tracks(aStep,
-								       name,
-								       procID,
-								       hadrInt,
-								       deltaE,
-								       charge);
+  std::vector<math::XYZTLorentzVector> tracks = treatSecondary->tracks(aStep, name, procID, hadrInt, deltaE, charge);
   if (hadrInt) {
     ++nHad;
     if (storeIt) {
@@ -94,8 +84,8 @@ void StoreSecondary::update(const G4Step * aStep) {
       nsecs.push_back(sec);
       procs.push_back(name);
       if (nHad == 1) {
-	for (int i=0; i<sec; i++) 
-	  secondaries.push_back(tracks[i]);
+        for (int i = 0; i < sec; i++)
+          secondaries.push_back(tracks[i]);
       }
     }
   }
diff --git a/SimG4Core/CheckSecondary/src/TreatSecondary.cc b/SimG4Core/CheckSecondary/src/TreatSecondary.cc
index 88a95a33a6965..3c34274b36ce6 100644
--- a/SimG4Core/CheckSecondary/src/TreatSecondary.cc
+++ b/SimG4Core/CheckSecondary/src/TreatSecondary.cc
@@ -3,136 +3,111 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
+#include "CLHEP/Units/GlobalPhysicalConstants.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "G4HCofThisEvent.hh"
 #include "G4Step.hh"
 #include "G4Track.hh"
 #include "G4VProcess.hh"
-#include "G4HCofThisEvent.hh"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
-#include "CLHEP/Units/GlobalPhysicalConstants.h"
 
 #include <cmath>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
-TreatSecondary::TreatSecondary(const edm::ParameterSet &p): typeEnumerator(nullptr) {
+TreatSecondary::TreatSecondary(const edm::ParameterSet &p) : typeEnumerator(nullptr) {
+  verbosity = p.getUntrackedParameter<int>("Verbosity", 0);
+  killAfter = p.getUntrackedParameter<int>("KillAfter", -1);
+  minDeltaE = p.getUntrackedParameter<double>("MinimumDeltaE", 10.0) * MeV;
 
-  verbosity     = p.getUntrackedParameter<int>("Verbosity",0);
-  killAfter     = p.getUntrackedParameter<int>("KillAfter", -1);
-  minDeltaE     = p.getUntrackedParameter<double>("MinimumDeltaE", 10.0)*MeV;
-  
   edm::LogInfo("CheckSecondary") << "Instantiate CheckSecondary with Flag"
-				 << " for Killing track after "<< killAfter 
-				 << " hadronic interactions\nDefine inelastic"
-				 << " if > 1 seondary or change in KE > "
-				 << minDeltaE << " MeV\n";
+                                 << " for Killing track after " << killAfter
+                                 << " hadronic interactions\nDefine inelastic"
+                                 << " if > 1 seondary or change in KE > " << minDeltaE << " MeV\n";
 
   typeEnumerator = new G4ProcessTypeEnumerator();
-} 
-   
-TreatSecondary::~TreatSecondary() {
-  if (typeEnumerator) delete typeEnumerator;
 }
 
-void TreatSecondary::initTrack(const G4Track * thTk) {
-
-  step   = 0;
-  nsecL  = 0;
-  nHad   = 0;
-  eTrack = thTk->GetKineticEnergy()/MeV;
-  LogDebug("CheckSecondary") << "TreatSecondary::initTrack:Track: " 
-			     << thTk->GetTrackID() << " Type: " 
-			     << thTk->GetDefinition()->GetParticleName() 
-			     << " KE "    << thTk->GetKineticEnergy()/GeV 
-			     << " GeV p " << thTk->GetMomentum().mag()/GeV
-			     << " GeV daughter of particle " 
-			     << thTk->GetParentID();
+TreatSecondary::~TreatSecondary() {
+  if (typeEnumerator)
+    delete typeEnumerator;
 }
 
-std::vector<math::XYZTLorentzVector> TreatSecondary::tracks(const G4Step*aStep,
-							    std::string & name,
-							    int & procid,
-                                                            bool & hadrInt,
-							    double & deltaE,
-							    std::vector<int> & charges) {
+void TreatSecondary::initTrack(const G4Track *thTk) {
+  step = 0;
+  nsecL = 0;
+  nHad = 0;
+  eTrack = thTk->GetKineticEnergy() / MeV;
+  LogDebug("CheckSecondary") << "TreatSecondary::initTrack:Track: " << thTk->GetTrackID()
+                             << " Type: " << thTk->GetDefinition()->GetParticleName() << " KE "
+                             << thTk->GetKineticEnergy() / GeV << " GeV p " << thTk->GetMomentum().mag() / GeV
+                             << " GeV daughter of particle " << thTk->GetParentID();
+}
 
+std::vector<math::XYZTLorentzVector> TreatSecondary::tracks(
+    const G4Step *aStep, std::string &name, int &procid, bool &hadrInt, double &deltaE, std::vector<int> &charges) {
   step++;
-  procid  = -1;
-  name    = "Unknown";
+  procid = -1;
+  name = "Unknown";
   hadrInt = false;
-  deltaE  = 0;
+  deltaE = 0;
   std::vector<math::XYZTLorentzVector> secondaries;
   charges.clear();
 
   if (aStep != nullptr) {
-    const G4TrackVector* tkV  = aStep->GetSecondary();
-    G4Track* thTk = aStep->GetTrack();
-    const G4StepPoint* preStepPoint  = aStep->GetPreStepPoint();
-    const G4StepPoint* postStepPoint = aStep->GetPostStepPoint();
-    double eTrackNew = thTk->GetKineticEnergy()/MeV;
-    deltaE = eTrack-eTrackNew;
+    const G4TrackVector *tkV = aStep->GetSecondary();
+    G4Track *thTk = aStep->GetTrack();
+    const G4StepPoint *preStepPoint = aStep->GetPreStepPoint();
+    const G4StepPoint *postStepPoint = aStep->GetPostStepPoint();
+    double eTrackNew = thTk->GetKineticEnergy() / MeV;
+    deltaE = eTrack - eTrackNew;
     eTrack = eTrackNew;
     if (tkV != nullptr && postStepPoint != nullptr) {
       int nsc = (*tkV).size();
-      const G4VProcess*  proc = postStepPoint->GetProcessDefinedStep(); 
+      const G4VProcess *proc = postStepPoint->GetProcessDefinedStep();
       if (proc != nullptr) {
-	G4ProcessType type = proc->GetProcessType();
-	procid = typeEnumerator->processIdLong(proc);
-	name = proc->GetProcessName();
-	int sec = nsc - nsecL;
-	LogDebug("CheckSecondary") << sec << " secondaries in step " 
-				   << thTk->GetCurrentStepNumber() 
-				   << " of track "  << thTk->GetTrackID() 
-				   << " from " << name << " of type " 
-				   << type << " ID " << procid << " (" 
-				   << typeEnumerator->processG4Name(procid) 
-				   << ")"; 
+        G4ProcessType type = proc->GetProcessType();
+        procid = typeEnumerator->processIdLong(proc);
+        name = proc->GetProcessName();
+        int sec = nsc - nsecL;
+        LogDebug("CheckSecondary") << sec << " secondaries in step " << thTk->GetCurrentStepNumber() << " of track "
+                                   << thTk->GetTrackID() << " from " << name << " of type " << type << " ID " << procid
+                                   << " (" << typeEnumerator->processG4Name(procid) << ")";
 
-	// hadronic interaction
-        if(procid >= 121 && procid <= 151) {
-	  LogDebug("CheckSecondary") << "Hadronic Interaction " << nHad
-				     << " of Type " << procid << " with "
-				     << sec << " secondaries from process "
-				     << proc->GetProcessName() << " Delta E "
-				     << deltaE << " Flag " << hadrInt;
-	  math::XYZTLorentzVector secondary;
-	  for (int i=nsecL; i<nsc; ++i) {
-	    G4Track*      tk = (*tkV)[i];
-	    G4ThreeVector pp = tk->GetMomentum();
-	    double        ee = tk->GetTotalEnergy();
-	    secondary = math::XYZTLorentzVector(pp.x(),pp.y(),pp.z(),ee);
-	    secondaries.push_back(secondary);
-	    int           charge = (int)(tk->GetDefinition()->GetPDGCharge());
-	    charges.push_back(charge);
-	  }
-	  if (verbosity > 0) {
-	    for (int i=nsecL; i<nsc; i++) {
-	      G4Track* tk = (*tkV)[i];
-	      LogDebug("CheckSecondary") << "Secondary: " << sec << " ID " 
-					 << tk->GetTrackID() << " Status " 
-					 << tk->GetTrackStatus() << " Particle " 
-					 << tk->GetDefinition()->GetParticleName()
-					 << " Position "  << tk->GetPosition()
-					 << " KE " << tk->GetKineticEnergy() 
-					 << " Time " << tk->GetGlobalTime();
-	    }
-	  }
-	}
-	nsecL = nsc;
+        // hadronic interaction
+        if (procid >= 121 && procid <= 151) {
+          LogDebug("CheckSecondary") << "Hadronic Interaction " << nHad << " of Type " << procid << " with " << sec
+                                     << " secondaries from process " << proc->GetProcessName() << " Delta E " << deltaE
+                                     << " Flag " << hadrInt;
+          math::XYZTLorentzVector secondary;
+          for (int i = nsecL; i < nsc; ++i) {
+            G4Track *tk = (*tkV)[i];
+            G4ThreeVector pp = tk->GetMomentum();
+            double ee = tk->GetTotalEnergy();
+            secondary = math::XYZTLorentzVector(pp.x(), pp.y(), pp.z(), ee);
+            secondaries.push_back(secondary);
+            int charge = (int)(tk->GetDefinition()->GetPDGCharge());
+            charges.push_back(charge);
+          }
+          if (verbosity > 0) {
+            for (int i = nsecL; i < nsc; i++) {
+              G4Track *tk = (*tkV)[i];
+              LogDebug("CheckSecondary") << "Secondary: " << sec << " ID " << tk->GetTrackID() << " Status "
+                                         << tk->GetTrackStatus() << " Particle "
+                                         << tk->GetDefinition()->GetParticleName() << " Position " << tk->GetPosition()
+                                         << " KE " << tk->GetKineticEnergy() << " Time " << tk->GetGlobalTime();
+            }
+          }
+        }
+        nsecL = nsc;
       }
     }
     if (verbosity > 1) {
-      LogDebug("CheckSecondary") << "Track: " << thTk->GetTrackID() 
-				 << " Status " << thTk->GetTrackStatus()
-				 << " Particle " 
-				 << thTk->GetDefinition()->GetParticleName()
-				 << " at " << preStepPoint->GetPosition()
-				 << " Step: " << step << " KE " 
-				 << thTk->GetKineticEnergy()/GeV << " GeV; p " 
-				 << thTk->GetMomentum().mag()/GeV 
-				 << " GeV/c; Step Length "
-				 << aStep->GetStepLength()<< " Energy Deposit "
-				 << aStep->GetTotalEnergyDeposit()/MeV
-				 << " MeV; Interaction " << hadrInt;
+      LogDebug("CheckSecondary") << "Track: " << thTk->GetTrackID() << " Status " << thTk->GetTrackStatus()
+                                 << " Particle " << thTk->GetDefinition()->GetParticleName() << " at "
+                                 << preStepPoint->GetPosition() << " Step: " << step << " KE "
+                                 << thTk->GetKineticEnergy() / GeV << " GeV; p " << thTk->GetMomentum().mag() / GeV
+                                 << " GeV/c; Step Length " << aStep->GetStepLength() << " Energy Deposit "
+                                 << aStep->GetTotalEnergyDeposit() / MeV << " MeV; Interaction " << hadrInt;
     }
   }
   return secondaries;
diff --git a/SimG4Core/CheckSecondary/src/module.cc b/SimG4Core/CheckSecondary/src/module.cc
index d4259b49922d3..01995a91d928e 100644
--- a/SimG4Core/CheckSecondary/src/module.cc
+++ b/SimG4Core/CheckSecondary/src/module.cc
@@ -1,8 +1,7 @@
-#include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "SimG4Core/CheckSecondary/interface/CheckSecondary.h"
 #include "SimG4Core/CheckSecondary/interface/StoreSecondary.h"
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-
+#include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
 
-DEFINE_SIMWATCHER (CheckSecondary);
-DEFINE_SIMWATCHER (StoreSecondary);
+DEFINE_SIMWATCHER(CheckSecondary);
+DEFINE_SIMWATCHER(StoreSecondary);
diff --git a/SimG4Core/CountProcesses/interface/CountProcessesAction.h b/SimG4Core/CountProcesses/interface/CountProcessesAction.h
index 685d1ad3842ea..612e4af914d97 100644
--- a/SimG4Core/CountProcesses/interface/CountProcessesAction.h
+++ b/SimG4Core/CountProcesses/interface/CountProcessesAction.h
@@ -1,19 +1,18 @@
 #ifndef SimG4Core_CountProcessesAction_H
 #define SimG4Core_CountProcessesAction_H
 
-#include "SimG4Core/Watcher/interface/SimWatcher.h"
-#include "SimG4Core/Notification/interface/Observer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-   
+#include "SimG4Core/Notification/interface/Observer.h"
+#include "SimG4Core/Watcher/interface/SimWatcher.h"
+
 #include "G4ParticleDefinition.hh"
 
-#include <string>
 #include <map>
+#include <string>
 
-typedef std::map 
-<std::pair<std::string,std::string>, int, std::less< std::pair<std::string,std::string> > > mpssi;
-typedef std::pair<std::string,std::string> pss;
-typedef std::map<std::string,int,std::less<std::string> > psi;
+typedef std::map<std::pair<std::string, std::string>, int, std::less<std::pair<std::string, std::string>>> mpssi;
+typedef std::pair<std::string, std::string> pss;
+typedef std::map<std::string, int, std::less<std::string>> psi;
 
 class BeginOfRun;
 class EndOfRun;
@@ -21,29 +20,29 @@ class BeginOfTrack;
 class G4Step;
 
 class CountProcessesAction : public SimWatcher,
-			     public Observer<const BeginOfRun *>, 
-			     public Observer<const EndOfRun *>,  
-			     public Observer<const BeginOfTrack *>, 
-			     public Observer<const G4Step *> 
-{
+                             public Observer<const BeginOfRun *>,
+                             public Observer<const EndOfRun *>,
+                             public Observer<const BeginOfTrack *>,
+                             public Observer<const G4Step *> {
 public:
-    CountProcessesAction(edm::ParameterSet const & p);
-    ~CountProcessesAction() override;
-    void update(const BeginOfRun * run) override;
-    void update(const BeginOfTrack * trk) override;
-    void update(const EndOfRun * track) override;
-    void update(const G4Step * track) override;
-    //---- Dump list of processes for each particle. 
-    // printNsteps = 1 print in how many step the process was called, 
-    // print only those processes with this number <> 0
-    void DumpProcessList(bool printNsteps, std::ostream& out = std::cout);
-    void DumpCreatorProcessList(bool printNsteps, std::ostream& out = std::cout);
-    void DumpParticleList(std::ostream& out = std::cout);
+  CountProcessesAction(edm::ParameterSet const &p);
+  ~CountProcessesAction() override;
+  void update(const BeginOfRun *run) override;
+  void update(const BeginOfTrack *trk) override;
+  void update(const EndOfRun *track) override;
+  void update(const G4Step *track) override;
+  //---- Dump list of processes for each particle.
+  // printNsteps = 1 print in how many step the process was called,
+  // print only those processes with this number <> 0
+  void DumpProcessList(bool printNsteps, std::ostream &out = std::cout);
+  void DumpCreatorProcessList(bool printNsteps, std::ostream &out = std::cout);
+  void DumpParticleList(std::ostream &out = std::cout);
+
 private:
-    bool fDEBUG;
-    mpssi theProcessList;
-    mpssi theCreatorProcessList;
-    psi theParticleList;
+  bool fDEBUG;
+  mpssi theProcessList;
+  mpssi theCreatorProcessList;
+  psi theParticleList;
 };
 
 #endif
diff --git a/SimG4Core/CountProcesses/src/CountProcessesAction.cc b/SimG4Core/CountProcesses/src/CountProcessesAction.cc
index 589a3fe8ef69c..960ab2bcd1f10 100644
--- a/SimG4Core/CountProcesses/src/CountProcessesAction.cc
+++ b/SimG4Core/CountProcesses/src/CountProcessesAction.cc
@@ -1,123 +1,110 @@
 #include "SimG4Core/CountProcesses/interface/CountProcessesAction.h"
 
 #include "SimG4Core/Notification/interface/BeginOfRun.h"
-#include "SimG4Core/Notification/interface/EndOfRun.h"
 #include "SimG4Core/Notification/interface/BeginOfTrack.h"
+#include "SimG4Core/Notification/interface/EndOfRun.h"
 
-#include "G4Track.hh"
-#include "G4Run.hh"
 #include "G4Event.hh"
-#include "G4Step.hh"
-#include "G4ProcessManager.hh"
 #include "G4ParticleTable.hh"
+#include "G4ProcessManager.hh"
+#include "G4Run.hh"
+#include "G4Step.hh"
+#include "G4Track.hh"
 
-CountProcessesAction::CountProcessesAction(edm::ParameterSet const & p)
-    : fDEBUG(p.getUntrackedParameter<bool>("DEBUG",false))
-{}
+CountProcessesAction::CountProcessesAction(edm::ParameterSet const &p)
+    : fDEBUG(p.getUntrackedParameter<bool>("DEBUG", false)) {}
 
 CountProcessesAction::~CountProcessesAction() {}
 
-void CountProcessesAction::update(const BeginOfRun * run)
-{
-    G4ParticleTable * partTable = G4ParticleTable::GetParticleTable();
-    int siz = partTable->size();
-    for (int ii= 0; ii < siz; ii++)
-    {
-	G4ParticleDefinition * particle = partTable->GetParticle(ii);
-	std::string particleName = particle->GetParticleName();
-	if (fDEBUG)
-	    std::cout << ii << " PCA " << particleName<< " " << particle->GetPDGStable() 
-		      << " " << particle->IsShortLived() << std::endl;
-	theParticleList[particleName] = 0;
+void CountProcessesAction::update(const BeginOfRun *run) {
+  G4ParticleTable *partTable = G4ParticleTable::GetParticleTable();
+  int siz = partTable->size();
+  for (int ii = 0; ii < siz; ii++) {
+    G4ParticleDefinition *particle = partTable->GetParticle(ii);
+    std::string particleName = particle->GetParticleName();
+    if (fDEBUG)
+      std::cout << ii << " PCA " << particleName << " " << particle->GetPDGStable() << " " << particle->IsShortLived()
+                << std::endl;
+    theParticleList[particleName] = 0;
 
-	//--- All processes of this particle 
-	G4ProcessManager * pmanager = particle->GetProcessManager();
-	G4ProcessVector * pvect = pmanager->GetProcessList();
-	int sizproc = pvect->size();
-	for (int jj = 0; jj < sizproc; jj++) 
-	{
-	    std::string processName = (*pvect)[jj]->GetProcessName();
-	    if (fDEBUG)
-		std::cout << jj << " PCR " << processName<< std::endl;
-	    theProcessList[pss(particleName,processName)] = 0;
-	}
+    //--- All processes of this particle
+    G4ProcessManager *pmanager = particle->GetProcessManager();
+    G4ProcessVector *pvect = pmanager->GetProcessList();
+    int sizproc = pvect->size();
+    for (int jj = 0; jj < sizproc; jj++) {
+      std::string processName = (*pvect)[jj]->GetProcessName();
+      if (fDEBUG)
+        std::cout << jj << " PCR " << processName << std::endl;
+      theProcessList[pss(particleName, processName)] = 0;
     }
-    DumpProcessList(false);
+  }
+  DumpProcessList(false);
 }
 
-void CountProcessesAction::update(const BeginOfTrack * trk)
-{
-    //----- Fill counter of particles
-    const G4Track * aTrack = (*trk)();
-    std::string particleName = aTrack->GetDefinition()->GetParticleName();
-    theParticleList[particleName]++;
+void CountProcessesAction::update(const BeginOfTrack *trk) {
+  //----- Fill counter of particles
+  const G4Track *aTrack = (*trk)();
+  std::string particleName = aTrack->GetDefinition()->GetParticleName();
+  theParticleList[particleName]++;
 
-    //----- Fill counter of Creator Processes
-    const G4VProcess * proc = aTrack->GetCreatorProcess();
-    std::string processName;
-    if (proc != nullptr) processName = proc->GetProcessName();
-    else processName = "Primary";
-    pss parproc(particleName,processName);
-    mpssi::iterator ite = theCreatorProcessList.find(parproc);
-    if (ite == theCreatorProcessList.end()) theCreatorProcessList[ parproc ] = 1;
-    else (*ite).second = (*ite).second +1; 
-    if (fDEBUG) 
-	std::cout << " creator " << particleName << " " << processName 
-		  << theCreatorProcessList.size() << std::endl;
+  //----- Fill counter of Creator Processes
+  const G4VProcess *proc = aTrack->GetCreatorProcess();
+  std::string processName;
+  if (proc != nullptr)
+    processName = proc->GetProcessName();
+  else
+    processName = "Primary";
+  pss parproc(particleName, processName);
+  mpssi::iterator ite = theCreatorProcessList.find(parproc);
+  if (ite == theCreatorProcessList.end())
+    theCreatorProcessList[parproc] = 1;
+  else
+    (*ite).second = (*ite).second + 1;
+  if (fDEBUG)
+    std::cout << " creator " << particleName << " " << processName << theCreatorProcessList.size() << std::endl;
 }
 
-void CountProcessesAction::update(const G4Step* aStep )
-{
-    std::string processName;
-    if(aStep->GetPostStepPoint()->GetProcessDefinedStep() != nullptr)
-	processName = aStep->GetPostStepPoint()->GetProcessDefinedStep()->GetProcessName();
-    else processName = "User Limit";
-    std::string particleName = aStep->GetTrack()->GetDefinition()->GetParticleName();
-    theProcessList[pss(particleName,processName)] = theProcessList[pss(particleName,processName)] + 1;
+void CountProcessesAction::update(const G4Step *aStep) {
+  std::string processName;
+  if (aStep->GetPostStepPoint()->GetProcessDefinedStep() != nullptr)
+    processName = aStep->GetPostStepPoint()->GetProcessDefinedStep()->GetProcessName();
+  else
+    processName = "User Limit";
+  std::string particleName = aStep->GetTrack()->GetDefinition()->GetParticleName();
+  theProcessList[pss(particleName, processName)] = theProcessList[pss(particleName, processName)] + 1;
 }
 
-void CountProcessesAction::update(const EndOfRun * run)
-{
-    DumpProcessList(true);
-    DumpCreatorProcessList(true);
-    DumpParticleList();
+void CountProcessesAction::update(const EndOfRun *run) {
+  DumpProcessList(true);
+  DumpCreatorProcessList(true);
+  DumpParticleList();
 }
 
-void CountProcessesAction::DumpProcessList(bool printNsteps, std::ostream& out)
-{    
-    mpssi::iterator ite;
-    for (ite = theProcessList.begin(); ite != theProcessList.end(); ite++) 
-    {
-	if (!printNsteps) 
-	    out << "PROC_LIST " << (*ite).first.first << " : " 
-		<< (*ite) .first.second << std::endl; 
-	else if ((*ite).second != 0)
-	    out << "PROC_COUNT " << (*ite).first.first << " : " 
-		<< (*ite) .first.second << " = " << (*ite).second << std::endl; 
-    }
+void CountProcessesAction::DumpProcessList(bool printNsteps, std::ostream &out) {
+  mpssi::iterator ite;
+  for (ite = theProcessList.begin(); ite != theProcessList.end(); ite++) {
+    if (!printNsteps)
+      out << "PROC_LIST " << (*ite).first.first << " : " << (*ite).first.second << std::endl;
+    else if ((*ite).second != 0)
+      out << "PROC_COUNT " << (*ite).first.first << " : " << (*ite).first.second << " = " << (*ite).second << std::endl;
+  }
 }
 
-void CountProcessesAction::DumpCreatorProcessList(bool printNsteps, std::ostream& out)
-{    
-    mpssi::iterator ite;
-    for (ite = theCreatorProcessList.begin(); ite != theCreatorProcessList.end(); ite++) 
-    {
-	if (!printNsteps) 
-	    out << "PROC-CREATOR_LIST " << (*ite).first.first << " : " 
-		<<(*ite) .first.second << std::endl; 
-	else if ((*ite).second != 0) 
-	    out << "PROC_CREATOR_COUNT " << (*ite).first.first << " : " 
-		<<(*ite) .first.second << " = " << (*ite).second << std::endl; 
-    }
+void CountProcessesAction::DumpCreatorProcessList(bool printNsteps, std::ostream &out) {
+  mpssi::iterator ite;
+  for (ite = theCreatorProcessList.begin(); ite != theCreatorProcessList.end(); ite++) {
+    if (!printNsteps)
+      out << "PROC-CREATOR_LIST " << (*ite).first.first << " : " << (*ite).first.second << std::endl;
+    else if ((*ite).second != 0)
+      out << "PROC_CREATOR_COUNT " << (*ite).first.first << " : " << (*ite).first.second << " = " << (*ite).second
+          << std::endl;
+  }
 }
 
-void CountProcessesAction::DumpParticleList(std::ostream& out)
-{    
-    psi::iterator ite;
-    for (ite = theParticleList.begin(); ite != theParticleList.end(); ite++) 
-    {
-	if ((*ite).second != 0) 
-	    out << "PART_LIST: " << (*ite).first << " = " << (*ite).second << std::endl; 
-    }
+void CountProcessesAction::DumpParticleList(std::ostream &out) {
+  psi::iterator ite;
+  for (ite = theParticleList.begin(); ite != theParticleList.end(); ite++) {
+    if ((*ite).second != 0)
+      out << "PART_LIST: " << (*ite).first << " = " << (*ite).second << std::endl;
+  }
 }
-
diff --git a/SimG4Core/CountProcesses/src/module.cc b/SimG4Core/CountProcesses/src/module.cc
index 8610bba3b4250..fa4e42a60a82a 100644
--- a/SimG4Core/CountProcesses/src/module.cc
+++ b/SimG4Core/CountProcesses/src/module.cc
@@ -1,6 +1,5 @@
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "SimG4Core/CountProcesses/interface/CountProcessesAction.h"
 #include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-   
 
 DEFINE_SIMWATCHER(CountProcessesAction);
diff --git a/SimG4Core/CustomPhysics/interface/CMSDarkPairProduction.h b/SimG4Core/CustomPhysics/interface/CMSDarkPairProduction.h
index d551f1194d418..2bc2a398aa1d0 100644
--- a/SimG4Core/CustomPhysics/interface/CMSDarkPairProduction.h
+++ b/SimG4Core/CustomPhysics/interface/CMSDarkPairProduction.h
@@ -2,7 +2,7 @@
 // File name:     CMSDarkPairProduction
 //
 // Author:        Dustin Stolp (dostolp@ucdavis.edu)
-//                Sushil S. Chauhan (schauhan@cern.ch)  
+//                Sushil S. Chauhan (schauhan@cern.ch)
 // Creation date: 01.22.2015
 // -------------------------------------------------------------------
 //
@@ -16,25 +16,22 @@
 #include "G4NistManager.hh"
 #include "G4VEmModel.hh"
 
-class CMSDarkPairProduction : public G4PairProductionRelModel
-{
+class CMSDarkPairProduction : public G4PairProductionRelModel {
 public:
   CMSDarkPairProduction(const G4ParticleDefinition* p = nullptr,
-		        G4double df = 1.0,
+                        G4double df = 1.0,
                         const G4String& nam = "BetheHeitlerLPM");
 
   ~CMSDarkPairProduction() override;
 
-  G4double ComputeCrossSectionPerAtom(
-                      const G4ParticleDefinition*,
-                      G4double kinEnergy,
-                      G4double Z,
-                      G4double A=0.,
-                      G4double cut=0.,
-                      G4double emax=DBL_MAX) override;
+  G4double ComputeCrossSectionPerAtom(const G4ParticleDefinition*,
+                                      G4double kinEnergy,
+                                      G4double Z,
+                                      G4double A = 0.,
+                                      G4double cut = 0.,
+                                      G4double emax = DBL_MAX) override;
 
 private:
-
   G4double dark_factor;
 };
 #endif
diff --git a/SimG4Core/CustomPhysics/interface/CMSDarkPairProductionProcess.h b/SimG4Core/CustomPhysics/interface/CMSDarkPairProductionProcess.h
index c7f1cca917e62..11a60ee743406 100644
--- a/SimG4Core/CustomPhysics/interface/CMSDarkPairProductionProcess.h
+++ b/SimG4Core/CustomPhysics/interface/CMSDarkPairProductionProcess.h
@@ -1,8 +1,8 @@
-//--------------------------------------------------------   
+//--------------------------------------------------------
 // File name:     CMSDarkPairProductionProcess
-// 
+//
 //  Author:        Dustin Stolp (dostolp@ucdavis.edu)
-//                 Sushil S. Chauhan (schauhan@cern.ch)  
+//                 Sushil S. Chauhan (schauhan@cern.ch)
 // --------------------------------------------------------
 #ifndef SimG4Core_CustomPhysics_CMSDarkPairProductionProcess_h
 #define SimG4Core_CustomPhysics_CMSDarkPairProductionProcess_h
@@ -12,7 +12,6 @@
 #include "G4VEmProcess.hh"
 #include "G4Gamma.hh"
 
-
 class G4ParticleDefinition;
 class G4VEmModel;
 class G4MaterialCutsCouple;
@@ -22,32 +21,26 @@ class CMSDarkPairProductionProcess : public G4VEmProcess
 
 {
 public:  // with description
-
   CMSDarkPairProductionProcess(G4double df = 1E0,
-  		      const G4String& processName ="conv",
-		      G4ProcessType type = fElectromagnetic);
+                               const G4String& processName = "conv",
+                               G4ProcessType type = fElectromagnetic);
 
   ~CMSDarkPairProductionProcess() override;
 
   // true for Gamma only.
   G4bool IsApplicable(const G4ParticleDefinition&) override;
 
-  G4double MinPrimaryEnergy(const G4ParticleDefinition*,
-				    const G4Material*) override;
+  G4double MinPrimaryEnergy(const G4ParticleDefinition*, const G4Material*) override;
 
   // Print few lines of informations about the process: validity range,
   void PrintInfo() override;
 
 protected:
-
   void InitialiseProcess(const G4ParticleDefinition*) override;
 
 private:
-  G4bool  isInitialised;
+  G4bool isInitialised;
   G4double darkFactor;
-
 };
 
-  
 #endif
- 
diff --git a/SimG4Core/CustomPhysics/interface/CMSExoticaPhysics.h b/SimG4Core/CustomPhysics/interface/CMSExoticaPhysics.h
index 81eef63a611f1..c2e50acd34cd0 100644
--- a/SimG4Core/CustomPhysics/interface/CMSExoticaPhysics.h
+++ b/SimG4Core/CustomPhysics/interface/CMSExoticaPhysics.h
@@ -1,20 +1,19 @@
 #ifndef SimG4Core_CustomPhysics_CMSExoticaPhysics_H
 #define SimG4Core_CustomPhysics_CMSExoticaPhysics_H
- 
-// 
+
+//
 //
 // Author: V.Ivantchenko  7 May 2018
-//     
-// Description: general interface to exotic particle physics 
+//
+// Description: general interface to exotic particle physics
 //
 
 #include "SimG4Core/Physics/interface/PhysicsList.h"
- 
-class CMSExoticaPhysics{
 
+class CMSExoticaPhysics {
 public:
-  CMSExoticaPhysics(PhysicsList* phys, const edm::ParameterSet & p);
+  CMSExoticaPhysics(PhysicsList* phys, const edm::ParameterSet& p);
   ~CMSExoticaPhysics() = default;
 };
- 
+
 #endif
diff --git a/SimG4Core/CustomPhysics/interface/CustomPDGParser.h b/SimG4Core/CustomPhysics/interface/CustomPDGParser.h
index 57eae05f8e0b7..3c30f5fb31b91 100644
--- a/SimG4Core/CustomPhysics/interface/CustomPDGParser.h
+++ b/SimG4Core/CustomPhysics/interface/CustomPDGParser.h
@@ -1,27 +1,25 @@
 #ifndef SimG4Core_CustomPhysics_CustomPDGParser_h
-#define SimG4Core_CustomPhysics_CustomPDGParser_h 
+#define SimG4Core_CustomPhysics_CustomPDGParser_h
 
 #include <vector>
 
-class CustomPDGParser
-{
+class CustomPDGParser {
 public:
- static bool s_isRHadron(int pdg);
- static bool s_isstopHadron(int pdg);
- static bool s_issbottomHadron(int pdg) ;
- static bool s_isSLepton(int pdg);
- static bool s_isRBaryon(int pdg);
- static bool s_isRMeson(int pdg);
- static bool s_isMesonino(int pdg);
- static bool s_isSbaryon(int pdg);
- static bool s_isRGlueball(int pdg);
- static bool s_isDphoton(int pdg);
- static bool s_isChargino(int pdg);
- static double s_charge(int pdg);
- static double s_spin(int pdg);
- static std::vector<int> s_containedQuarks(int pdg);
- static int s_containedQuarksCode(int pdg);
-
+  static bool s_isRHadron(int pdg);
+  static bool s_isstopHadron(int pdg);
+  static bool s_issbottomHadron(int pdg);
+  static bool s_isSLepton(int pdg);
+  static bool s_isRBaryon(int pdg);
+  static bool s_isRMeson(int pdg);
+  static bool s_isMesonino(int pdg);
+  static bool s_isSbaryon(int pdg);
+  static bool s_isRGlueball(int pdg);
+  static bool s_isDphoton(int pdg);
+  static bool s_isChargino(int pdg);
+  static double s_charge(int pdg);
+  static double s_spin(int pdg);
+  static std::vector<int> s_containedQuarks(int pdg);
+  static int s_containedQuarksCode(int pdg);
 };
 
 #endif
diff --git a/SimG4Core/CustomPhysics/interface/CustomParticle.h b/SimG4Core/CustomPhysics/interface/CustomParticle.h
index 0fed54144fb87..44ea141745585 100644
--- a/SimG4Core/CustomPhysics/interface/CustomParticle.h
+++ b/SimG4Core/CustomPhysics/interface/CustomParticle.h
@@ -8,34 +8,41 @@
 // ###                          CustomParticle                        ###
 // ######################################################################
 
-class CustomParticle : public G4ParticleDefinition
-{
- public:
-   CustomParticle(
-       const G4String&     aName,        G4double            mass,
-       G4double            width,        G4double            charge,   
-       G4int               iSpin,        G4int               iParity,    
-       G4int               iConjugation, G4int               iIsospin,   
-       G4int               iIsospin3,    G4int               gParity,
-       const G4String&     pType,        G4int               lepton,      
-       G4int               baryon,       G4int               encoding,
-       G4bool              stable,       G4double            lifetime,
-       G4DecayTable        *decaytable
-   );
- private:
-   G4ParticleDefinition* m_cloud;
-   G4ParticleDefinition* m_spec;
- public:
-   void SetCloud(G4ParticleDefinition* theCloud);
-   void SetSpectator(G4ParticleDefinition* theSpectator);
-   G4ParticleDefinition* GetCloud();
-   G4ParticleDefinition* GetSpectator();
-   ~CustomParticle() override {}
+class CustomParticle : public G4ParticleDefinition {
+public:
+  CustomParticle(const G4String& aName,
+                 G4double mass,
+                 G4double width,
+                 G4double charge,
+                 G4int iSpin,
+                 G4int iParity,
+                 G4int iConjugation,
+                 G4int iIsospin,
+                 G4int iIsospin3,
+                 G4int gParity,
+                 const G4String& pType,
+                 G4int lepton,
+                 G4int baryon,
+                 G4int encoding,
+                 G4bool stable,
+                 G4double lifetime,
+                 G4DecayTable* decaytable);
+
+private:
+  G4ParticleDefinition* m_cloud;
+  G4ParticleDefinition* m_spec;
+
+public:
+  void SetCloud(G4ParticleDefinition* theCloud);
+  void SetSpectator(G4ParticleDefinition* theSpectator);
+  G4ParticleDefinition* GetCloud();
+  G4ParticleDefinition* GetSpectator();
+  ~CustomParticle() override {}
 };
 
-inline void CustomParticle::SetCloud(G4ParticleDefinition* theCloud){ m_cloud = theCloud; }
-inline G4ParticleDefinition* CustomParticle::GetCloud(){ return m_cloud; }
-inline void CustomParticle::SetSpectator(G4ParticleDefinition* theSpectator){ m_spec = theSpectator; }
-inline G4ParticleDefinition* CustomParticle::GetSpectator(){ return m_spec; }
+inline void CustomParticle::SetCloud(G4ParticleDefinition* theCloud) { m_cloud = theCloud; }
+inline G4ParticleDefinition* CustomParticle::GetCloud() { return m_cloud; }
+inline void CustomParticle::SetSpectator(G4ParticleDefinition* theSpectator) { m_spec = theSpectator; }
+inline G4ParticleDefinition* CustomParticle::GetSpectator() { return m_spec; }
 
 #endif
diff --git a/SimG4Core/CustomPhysics/interface/CustomParticleFactory.h b/SimG4Core/CustomPhysics/interface/CustomParticleFactory.h
index 2caf76b3b561e..cfe56da4c27ad 100644
--- a/SimG4Core/CustomPhysics/interface/CustomParticleFactory.h
+++ b/SimG4Core/CustomPhysics/interface/CustomParticleFactory.h
@@ -10,29 +10,25 @@ class G4DecayTable;
 class G4ParticleDefinition;
 
 class CustomParticleFactory {
-
 public:
-
   explicit CustomParticleFactory();
   ~CustomParticleFactory();
 
-  void loadCustomParticles(const std::string & filePath);
-  const std::vector<G4ParticleDefinition *>& GetCustomParticles();
+  void loadCustomParticles(const std::string &filePath);
+  const std::vector<G4ParticleDefinition *> &GetCustomParticles();
 
 private:
-
-  void addCustomParticle(int pdgCode, double mass, const std::string & name );
+  void addCustomParticle(int pdgCode, double mass, const std::string &name);
   void getMassTable(std::ifstream *configFile);
-  G4DecayTable* getDecayTable(std::ifstream *configFile, int pdgId);
-  G4DecayTable* getAntiDecayTable(int pdgId, G4DecayTable *theDecayTable);
-  std::string ToLower(std::string str);  
+  G4DecayTable *getDecayTable(std::ifstream *configFile, int pdgId);
+  G4DecayTable *getAntiDecayTable(int pdgId, G4DecayTable *theDecayTable);
+  std::string ToLower(std::string str);
 
   static bool loaded;
   static std::vector<G4ParticleDefinition *> m_particles;
 #ifdef G4MULTITHREADED
   static G4Mutex customParticleFactoryMutex;
 #endif
-  
 };
 
 #endif
diff --git a/SimG4Core/CustomPhysics/interface/CustomPhysics.h b/SimG4Core/CustomPhysics/interface/CustomPhysics.h
index 64902ffde0d03..f68c6d6a7dd6e 100644
--- a/SimG4Core/CustomPhysics/interface/CustomPhysics.h
+++ b/SimG4Core/CustomPhysics/interface/CustomPhysics.h
@@ -1,13 +1,12 @@
 #ifndef SimG4Core_CustomPhysics_CustomPhysics_H
 #define SimG4Core_CustomPhysics_CustomPhysics_H
- 
+
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
- 
-class CustomPhysics : public PhysicsList
-{
+
+class CustomPhysics : public PhysicsList {
 public:
-    CustomPhysics(const edm::ParameterSet & p);
+  CustomPhysics(const edm::ParameterSet& p);
 };
- 
+
 #endif
diff --git a/SimG4Core/CustomPhysics/interface/CustomPhysicsList.h b/SimG4Core/CustomPhysics/interface/CustomPhysicsList.h
index c367d1dd699e8..4010da80e4feb 100644
--- a/SimG4Core/CustomPhysics/interface/CustomPhysicsList.h
+++ b/SimG4Core/CustomPhysics/interface/CustomPhysicsList.h
@@ -1,7 +1,7 @@
 #ifndef SimG4Core_CustomPhysics_CustomPhysicsList_H
 #define SimG4Core_CustomPhysics_CustomPhysicsList_H
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h" 
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "G4VPhysicsConstructor.hh"
 
 #include <string>
@@ -9,18 +9,15 @@
 class G4ProcessHelper;
 class CustomParticleFactory;
 
-class CustomPhysicsList : public G4VPhysicsConstructor 
-{
+class CustomPhysicsList : public G4VPhysicsConstructor {
 public:
-  CustomPhysicsList(const std::string& name, const edm::ParameterSet & p, 
-		    bool useuni = false);
+  CustomPhysicsList(const std::string& name, const edm::ParameterSet& p, bool useuni = false);
   ~CustomPhysicsList() override;
 
   void ConstructParticle() override;
   void ConstructProcess() override;
 
 private:
-
   static G4ThreadLocal std::unique_ptr<G4ProcessHelper> myHelper;
   std::unique_ptr<CustomParticleFactory> fParticleFactory;
 
@@ -32,5 +29,5 @@ class CustomPhysicsList : public G4VPhysicsConstructor
   std::string processDefFilePath;
   double dfactor;
 };
- 
+
 #endif
diff --git a/SimG4Core/CustomPhysics/interface/CustomPhysicsListSS.h b/SimG4Core/CustomPhysics/interface/CustomPhysicsListSS.h
index 730bf6244e49e..09e0b13e4d6e8 100644
--- a/SimG4Core/CustomPhysics/interface/CustomPhysicsListSS.h
+++ b/SimG4Core/CustomPhysics/interface/CustomPhysicsListSS.h
@@ -1,7 +1,7 @@
 #ifndef SimG4Core_CustomPhysics_CustomPhysicsListSS_H
 #define SimG4Core_CustomPhysics_CustomPhysicsListSS_H
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h" 
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "G4VPhysicsConstructor.hh"
 #include <string>
 
@@ -9,18 +9,15 @@ class G4ProcessHelper;
 class G4Decay;
 class CustomParticleFactory;
 
-class CustomPhysicsListSS : public G4VPhysicsConstructor 
-{
+class CustomPhysicsListSS : public G4VPhysicsConstructor {
 public:
-  CustomPhysicsListSS(const std::string& name, const edm::ParameterSet & p,
-		      bool useuni = false);
+  CustomPhysicsListSS(const std::string& name, const edm::ParameterSet& p, bool useuni = false);
   ~CustomPhysicsListSS() override;
 
   void ConstructParticle() override;
   void ConstructProcess() override;
 
 private:
-
   static G4ThreadLocal std::unique_ptr<G4Decay> fDecayProcess;
   static G4ThreadLocal std::unique_ptr<G4ProcessHelper> myHelper;
 
@@ -34,5 +31,5 @@ class CustomPhysicsListSS : public G4VPhysicsConstructor
   std::string processDefFilePath;
   double dfactor;
 };
- 
+
 #endif
diff --git a/SimG4Core/CustomPhysics/interface/Decay3Body.h b/SimG4Core/CustomPhysics/interface/Decay3Body.h
index c43c68c3ae10a..8f547ac004d73 100644
--- a/SimG4Core/CustomPhysics/interface/Decay3Body.h
+++ b/SimG4Core/CustomPhysics/interface/Decay3Body.h
@@ -4,17 +4,17 @@
 #include "G4LorentzVector.hh"
 
 class Decay3Body {
-  public:
-    Decay3Body();
-    ~Decay3Body();
+public:
+  Decay3Body();
+  ~Decay3Body();
 
-    void doDecay(const G4LorentzVector & mother,
-                       G4LorentzVector & daughter1,
-                       G4LorentzVector & daughter2,
-                       G4LorentzVector & daughter3);
+  void doDecay(const G4LorentzVector& mother,
+               G4LorentzVector& daughter1,
+               G4LorentzVector& daughter2,
+               G4LorentzVector& daughter3);
 
-  private:
-    inline double sqr(double a);
+private:
+  inline double sqr(double a);
 };
 
 #endif
diff --git a/SimG4Core/CustomPhysics/interface/DummyChargeFlipProcess.h b/SimG4Core/CustomPhysics/interface/DummyChargeFlipProcess.h
index 213dd7dcca9e8..ce949c08578dd 100644
--- a/SimG4Core/CustomPhysics/interface/DummyChargeFlipProcess.h
+++ b/SimG4Core/CustomPhysics/interface/DummyChargeFlipProcess.h
@@ -1,6 +1,6 @@
 #ifndef SimG4Core_CustomPhysics_DummyChargeFlipProcess_h
 #define SimG4Core_CustomPhysics_DummyChargeFlipProcess_h 1
- 
+
 #include "globals.hh"
 #include "G4HadronicProcess.hh"
 #include "G4CrossSectionDataStore.hh"
@@ -14,28 +14,21 @@
 
 #include <iostream>
 
-class DummyChargeFlipProcess : public G4HadronicProcess
-{
+class DummyChargeFlipProcess : public G4HadronicProcess {
 public:
+  DummyChargeFlipProcess(const G4String& processName = "Dummy");
 
-   DummyChargeFlipProcess(const G4String& processName = "Dummy");
-
-   ~DummyChargeFlipProcess() override;
- 
-   G4VParticleChange* PostStepDoIt(const G4Track& aTrack, const G4Step& aStep) override;
+  ~DummyChargeFlipProcess() override;
 
+  G4VParticleChange* PostStepDoIt(const G4Track& aTrack, const G4Step& aStep) override;
 
-   G4bool IsApplicable(const G4ParticleDefinition& aParticleType) override;
+  G4bool IsApplicable(const G4ParticleDefinition& aParticleType) override;
 
-   void BuildPhysicsTable(const G4ParticleDefinition& aParticleType) override;
+  void BuildPhysicsTable(const G4ParticleDefinition& aParticleType) override;
 
-   void DumpPhysicsTable(const G4ParticleDefinition& aParticleType);
+  void DumpPhysicsTable(const G4ParticleDefinition& aParticleType);
 
 private:
-
-   G4double GetMicroscopicCrossSection(const G4DynamicParticle* aParticle,
-                                       const G4Element* anElement,
-				       G4double aTemp);
-
+  G4double GetMicroscopicCrossSection(const G4DynamicParticle* aParticle, const G4Element* anElement, G4double aTemp);
 };
 #endif
diff --git a/SimG4Core/CustomPhysics/interface/FullModelHadronicProcess.h b/SimG4Core/CustomPhysics/interface/FullModelHadronicProcess.h
index 476b8f4319065..437b24eca6bdb 100644
--- a/SimG4Core/CustomPhysics/interface/FullModelHadronicProcess.h
+++ b/SimG4Core/CustomPhysics/interface/FullModelHadronicProcess.h
@@ -13,61 +13,53 @@
 
 class G4ProcessHelper;
 
-class FullModelHadronicProcess : public G4VDiscreteProcess
-{
+class FullModelHadronicProcess : public G4VDiscreteProcess {
 public:
-  
-  FullModelHadronicProcess(G4ProcessHelper * aHelper, 
-			   const G4String& processName = "FullModelHadronicProcess");
-    
+  FullModelHadronicProcess(G4ProcessHelper *aHelper, const G4String &processName = "FullModelHadronicProcess");
+
   ~FullModelHadronicProcess() override;
 
-  
-  G4bool IsApplicable(const G4ParticleDefinition& aP) override;
-  
+  G4bool IsApplicable(const G4ParticleDefinition &aP) override;
+
   G4VParticleChange *PostStepDoIt(const G4Track &aTrack, const G4Step &aStep) override;
 
 protected:
-  
   const G4ParticleDefinition *theParticle;
   G4ParticleDefinition *newParticle;
-  
+
   G4ParticleChange theParticleChange;
-  
-private:    
-  
-  virtual G4double GetMicroscopicCrossSection( const G4DynamicParticle *aParticle, 
-					       const G4Element *anElement, 
-					       G4double aTemp );
-
-  G4double GetMeanFreePath(const G4Track& aTrack, G4double, G4ForceCondition*) override;
-  
-  void CalculateMomenta( G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-			 G4int &vecLen,
-			 const G4HadProjectile *originalIncident,
-			 const G4DynamicParticle *originalTarget,
-			 G4ReactionProduct &modifiedOriginal,
-			 G4Nucleus &targetNucleus,
-			 G4ReactionProduct &currentParticle,
-			 G4ReactionProduct &targetParticle,
-			 G4bool &incidentHasChanged,
-			 G4bool &targetHasChanged,
-			 G4bool quasiElastic );
-
-  G4bool MarkLeadingStrangeParticle(
-				    const G4ReactionProduct &currentParticle,
-				    const G4ReactionProduct &targetParticle,
-				    G4ReactionProduct &leadParticle );
-    
-  void Rotate(G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec, G4int &vecLen);
-
-  const G4DynamicParticle* FindRhadron(G4ParticleChange*);
-
-  G4ProcessHelper* theHelper;
+
+private:
+  virtual G4double GetMicroscopicCrossSection(const G4DynamicParticle *aParticle,
+                                              const G4Element *anElement,
+                                              G4double aTemp);
+
+  G4double GetMeanFreePath(const G4Track &aTrack, G4double, G4ForceCondition *) override;
+
+  void CalculateMomenta(G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+                        G4int &vecLen,
+                        const G4HadProjectile *originalIncident,
+                        const G4DynamicParticle *originalTarget,
+                        G4ReactionProduct &modifiedOriginal,
+                        G4Nucleus &targetNucleus,
+                        G4ReactionProduct &currentParticle,
+                        G4ReactionProduct &targetParticle,
+                        G4bool &incidentHasChanged,
+                        G4bool &targetHasChanged,
+                        G4bool quasiElastic);
+
+  G4bool MarkLeadingStrangeParticle(const G4ReactionProduct &currentParticle,
+                                    const G4ReactionProduct &targetParticle,
+                                    G4ReactionProduct &leadParticle);
+
+  void Rotate(G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec, G4int &vecLen);
+
+  const G4DynamicParticle *FindRhadron(G4ParticleChange *);
+
+  G4ProcessHelper *theHelper;
   G4bool toyModel;
   G4double cache;
   G4ThreeVector what;
 };
 
 #endif
- 
diff --git a/SimG4Core/CustomPhysics/interface/FullModelReactionDynamics.h b/SimG4Core/CustomPhysics/interface/FullModelReactionDynamics.h
index 60eaf68b17e46..b94512fcdc228 100644
--- a/SimG4Core/CustomPhysics/interface/FullModelReactionDynamics.h
+++ b/SimG4Core/CustomPhysics/interface/FullModelReactionDynamics.h
@@ -1,13 +1,13 @@
 
- //
- // Hadronic Process: Reaction Dynamics
- // original by H.P. Wellisch
- // Modified by J.L.Chuma 19-Nov-96
- // Modified by J.L.Chuma 27-Mar-97
- // Modified by J.L.Chuma 30-Apr-97
- // Modified by J.L.Chuma 06-Aug-97  to include the original incident particle
- //                                  before Fermi motion and evaporation effects
- 
+//
+// Hadronic Process: Reaction Dynamics
+// original by H.P. Wellisch
+// Modified by J.L.Chuma 19-Nov-96
+// Modified by J.L.Chuma 27-Mar-97
+// Modified by J.L.Chuma 30-Apr-97
+// Modified by J.L.Chuma 06-Aug-97  to include the original incident particle
+//                                  before Fermi motion and evaporation effects
+
 #ifndef SimG4Core_CustomPhysics_FullModelReactionDynamics_h
 #define SimG4Core_CustomPhysics_FullModelReactionDynamics_h 1
 
@@ -18,140 +18,127 @@
 #include "G4FastVector.hh"
 #include "G4HadProjectile.hh"
 
-enum{ MYGHADLISTSIZE=256};
-
- class FullModelReactionDynamics 
- {
- public:
-    
-    FullModelReactionDynamics() {}
-    
-    virtual ~FullModelReactionDynamics() {}
-    
-    virtual G4double FindInelasticity()
-    { return 0.0; }
-    
-    virtual G4double FindTimeDelay()
-    { return 0.0; }
-    
-    G4bool GenerateXandPt(                   // derived from GENXPT
-     G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-     G4int &vecLen,
-     G4ReactionProduct &modifiedOriginal, // Fermi motion & evap. effect included
-     const G4HadProjectile *originalIncident,
-     G4ReactionProduct &currentParticle,
-     G4ReactionProduct &targetParticle,
-     const G4Nucleus &targetNucleus,
-     G4bool &incidentHasChanged, 
-     G4bool &targetHasChanged,
-     G4bool leadFlag,
-     G4ReactionProduct &leadingStrangeParticle );
-    
-    void SuppressChargedPions(
-     G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-     G4int &vecLen,
-     const G4ReactionProduct &modifiedOriginal,
-     G4ReactionProduct &currentParticle,
-     G4ReactionProduct &targetParticle,
-     const G4Nucleus &targetNucleus,
-     G4bool &incidentHasChanged,
-     G4bool &targetHasChanged );
-      
-    G4bool TwoCluster(                       // derived from TWOCLU
-     G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-     G4int &vecLen,
-     G4ReactionProduct &modifiedOriginal, // Fermi motion & evap. effect included
-     const G4HadProjectile *originalIncident,
-     G4ReactionProduct &currentParticle,
-     G4ReactionProduct &targetParticle,
-     const G4Nucleus &targetNucleus,
-     G4bool &incidentHasChanged, 
-     G4bool &targetHasChanged,
-     G4bool leadFlag,
-     G4ReactionProduct &leadingStrangeParticle );
-    
-    void TwoBody(                         // derived from TWOB
-     G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-     G4int &vecLen,
-     G4ReactionProduct &modifiedOriginal,
-     const G4DynamicParticle *originalTarget,
-     G4ReactionProduct &currentParticle,
-     G4ReactionProduct &targetParticle,
-     const G4Nucleus &targetNucleus,
-     G4bool &targetHasChanged );
-    
-    G4int Factorial( G4int n );
-    
-    G4double GenerateNBodyEvent(                // derived from PHASP
-     const G4double totalEnergy,
-     const G4bool constantCrossSection,
-     G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-     G4int &vecLen );
-    
-    void ProduceStrangeParticlePairs(
-     G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-     G4int &vecLen,
-     const G4ReactionProduct &modifiedOriginal,
-     const G4DynamicParticle *originalTarget, 
-     G4ReactionProduct &currentParticle,
-     G4ReactionProduct &targetParticle,
-     G4bool &incidentHasChanged,
-     G4bool &targetHasChanged );
-    
-    void NuclearReaction(                     // derived from NUCREC
-     G4FastVector<G4ReactionProduct,4> &vec,
-     G4int &vecLen,
-     const G4HadProjectile *originalIncident,
-     const G4Nucleus &aNucleus,
-     const G4double theAtomicMass,
-     const G4double *massVec );
-    
- private:
-    
-    void Rotate(
-     const G4double numberofFinalStateNucleons,
-     const G4ThreeVector &temp,
-     const G4ReactionProduct &modifiedOriginal, // Fermi motion & evap. effect included
-     const G4HadProjectile *originalIncident,
-     const G4Nucleus &targetNucleus,
-     G4ReactionProduct &currentParticle,
-     G4ReactionProduct &targetParticle,
-     G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-     G4int &vecLen );
-    
-    void Defs1(
-     const G4ReactionProduct &modifiedOriginal,
-     G4ReactionProduct &currentParticle,
-     G4ReactionProduct &targetParticle,
-     G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-     G4int &vecLen );
-    
-    void AddBlackTrackParticles(
-     const G4double epnb,
-     const G4int npnb,
-     const G4double edta,
-     const G4int ndta,
-     const G4double sprob,
-     const G4double kineticMinimum,
-     const G4double kineticFactor,
-     const G4ReactionProduct &modifiedOriginal,
-     G4double spall,
-     const G4Nucleus &aNucleus,
-     G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-     G4int &vecLen );
-    
-    void MomentumCheck(
-     const G4ReactionProduct &modifiedOriginal,
-     G4ReactionProduct &currentParticle,
-     G4ReactionProduct &targetParticle,
-     G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-     G4int &vecLen );
-    
-    G4double normal();
-    
-    G4int Poisson( G4double x );
-   
- };
- 
+enum { MYGHADLISTSIZE = 256 };
+
+class FullModelReactionDynamics {
+public:
+  FullModelReactionDynamics() {}
+
+  virtual ~FullModelReactionDynamics() {}
+
+  virtual G4double FindInelasticity() { return 0.0; }
+
+  virtual G4double FindTimeDelay() { return 0.0; }
+
+  G4bool GenerateXandPt(  // derived from GENXPT
+      G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+      G4int &vecLen,
+      G4ReactionProduct &modifiedOriginal,  // Fermi motion & evap. effect included
+      const G4HadProjectile *originalIncident,
+      G4ReactionProduct &currentParticle,
+      G4ReactionProduct &targetParticle,
+      const G4Nucleus &targetNucleus,
+      G4bool &incidentHasChanged,
+      G4bool &targetHasChanged,
+      G4bool leadFlag,
+      G4ReactionProduct &leadingStrangeParticle);
+
+  void SuppressChargedPions(G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+                            G4int &vecLen,
+                            const G4ReactionProduct &modifiedOriginal,
+                            G4ReactionProduct &currentParticle,
+                            G4ReactionProduct &targetParticle,
+                            const G4Nucleus &targetNucleus,
+                            G4bool &incidentHasChanged,
+                            G4bool &targetHasChanged);
+
+  G4bool TwoCluster(  // derived from TWOCLU
+      G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+      G4int &vecLen,
+      G4ReactionProduct &modifiedOriginal,  // Fermi motion & evap. effect included
+      const G4HadProjectile *originalIncident,
+      G4ReactionProduct &currentParticle,
+      G4ReactionProduct &targetParticle,
+      const G4Nucleus &targetNucleus,
+      G4bool &incidentHasChanged,
+      G4bool &targetHasChanged,
+      G4bool leadFlag,
+      G4ReactionProduct &leadingStrangeParticle);
+
+  void TwoBody(  // derived from TWOB
+      G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+      G4int &vecLen,
+      G4ReactionProduct &modifiedOriginal,
+      const G4DynamicParticle *originalTarget,
+      G4ReactionProduct &currentParticle,
+      G4ReactionProduct &targetParticle,
+      const G4Nucleus &targetNucleus,
+      G4bool &targetHasChanged);
+
+  G4int Factorial(G4int n);
+
+  G4double GenerateNBodyEvent(  // derived from PHASP
+      const G4double totalEnergy,
+      const G4bool constantCrossSection,
+      G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+      G4int &vecLen);
+
+  void ProduceStrangeParticlePairs(G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+                                   G4int &vecLen,
+                                   const G4ReactionProduct &modifiedOriginal,
+                                   const G4DynamicParticle *originalTarget,
+                                   G4ReactionProduct &currentParticle,
+                                   G4ReactionProduct &targetParticle,
+                                   G4bool &incidentHasChanged,
+                                   G4bool &targetHasChanged);
+
+  void NuclearReaction(  // derived from NUCREC
+      G4FastVector<G4ReactionProduct, 4> &vec,
+      G4int &vecLen,
+      const G4HadProjectile *originalIncident,
+      const G4Nucleus &aNucleus,
+      const G4double theAtomicMass,
+      const G4double *massVec);
+
+private:
+  void Rotate(const G4double numberofFinalStateNucleons,
+              const G4ThreeVector &temp,
+              const G4ReactionProduct &modifiedOriginal,  // Fermi motion & evap. effect included
+              const G4HadProjectile *originalIncident,
+              const G4Nucleus &targetNucleus,
+              G4ReactionProduct &currentParticle,
+              G4ReactionProduct &targetParticle,
+              G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+              G4int &vecLen);
+
+  void Defs1(const G4ReactionProduct &modifiedOriginal,
+             G4ReactionProduct &currentParticle,
+             G4ReactionProduct &targetParticle,
+             G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+             G4int &vecLen);
+
+  void AddBlackTrackParticles(const G4double epnb,
+                              const G4int npnb,
+                              const G4double edta,
+                              const G4int ndta,
+                              const G4double sprob,
+                              const G4double kineticMinimum,
+                              const G4double kineticFactor,
+                              const G4ReactionProduct &modifiedOriginal,
+                              G4double spall,
+                              const G4Nucleus &aNucleus,
+                              G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+                              G4int &vecLen);
+
+  void MomentumCheck(const G4ReactionProduct &modifiedOriginal,
+                     G4ReactionProduct &currentParticle,
+                     G4ReactionProduct &targetParticle,
+                     G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+                     G4int &vecLen);
+
+  G4double normal();
+
+  G4int Poisson(G4double x);
+};
+
 #endif
- 
diff --git a/SimG4Core/CustomPhysics/interface/G4ProcessHelper.h b/SimG4Core/CustomPhysics/interface/G4ProcessHelper.h
index a5f55ff3d06d7..35bf58438b547 100644
--- a/SimG4Core/CustomPhysics/interface/G4ProcessHelper.h
+++ b/SimG4Core/CustomPhysics/interface/G4ProcessHelper.h
@@ -1,21 +1,21 @@
 #ifndef SimG4Core_CustomPhysics_G4ProcessHelper_H
 #define SimG4Core_CustomPhysics_G4ProcessHelper_H
 
-#include"globals.hh"
-#include"G4ParticleDefinition.hh"
-#include"G4DynamicParticle.hh"
-#include"G4Element.hh"
-#include"G4Track.hh"
+#include "globals.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4DynamicParticle.hh"
+#include "G4Element.hh"
+#include "G4Track.hh"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include<vector>
-#include<map>
+#include <vector>
+#include <map>
 
 //Typedefs just made to make life easier :-)
 typedef std::vector<G4int> ReactionProduct;
-typedef std::vector<ReactionProduct > ReactionProductList;
-typedef std::map<G4int , ReactionProductList> ReactionMap;
+typedef std::vector<ReactionProduct> ReactionProductList;
+typedef std::map<G4int, ReactionProductList> ReactionMap;
 
 class G4ParticleTable;
 class CustomParticleFactory;
@@ -24,25 +24,21 @@ class TProfile;
 class TH1D;
 
 class G4ProcessHelper {
-
 public:
-
-  G4ProcessHelper(const edm::ParameterSet & p, CustomParticleFactory* ptr);
+  G4ProcessHelper(const edm::ParameterSet& p, CustomParticleFactory* ptr);
 
   ~G4ProcessHelper();
- 
+
   G4bool ApplicabilityTester(const G4ParticleDefinition& aPart);
 
-  G4double GetInclusiveCrossSection(const G4DynamicParticle *aParticle,
-				    const G4Element *anElement);
+  G4double GetInclusiveCrossSection(const G4DynamicParticle* aParticle, const G4Element* anElement);
 
   //Make sure the element is known (for n/p-decision)
-  ReactionProduct GetFinalState(const G4Track& aTrack,G4ParticleDefinition*& aTarget);
+  ReactionProduct GetFinalState(const G4Track& aTrack, G4ParticleDefinition*& aTarget);
 
 private:
-
   G4ProcessHelper(const G4ProcessHelper&) = delete;
-  G4ProcessHelper& operator= (const G4ProcessHelper&) = delete;
+  G4ProcessHelper& operator=(const G4ProcessHelper&) = delete;
 
   G4double Regge(const double boost);
   G4double Pom(const double boost);
@@ -56,26 +52,24 @@ class G4ProcessHelper {
   G4ParticleDefinition* theNeutron;
   G4ParticleDefinition* theRmesoncloud;
   G4ParticleDefinition* theRbaryoncloud;
-  
+
   ReactionMap* theReactionMap;
 
-  G4double PhaseSpace(const ReactionProduct& aReaction,const G4DynamicParticle* aDynamicParticle);
-  
-  G4double ReactionProductMass(const ReactionProduct& aReaction,const G4DynamicParticle* aDynamicParticle);
+  G4double PhaseSpace(const ReactionProduct& aReaction, const G4DynamicParticle* aDynamicParticle);
+
+  G4double ReactionProductMass(const ReactionProduct& aReaction, const G4DynamicParticle* aDynamicParticle);
 
   G4bool ReactionGivesBaryon(const ReactionProduct& aReaction);
 
-  G4bool ReactionIsPossible(const ReactionProduct& aReaction,const G4DynamicParticle* aDynamicParticle);
+  G4bool ReactionIsPossible(const ReactionProduct& aReaction, const G4DynamicParticle* aDynamicParticle);
 
-  void ReadAndParse(const G4String& str,
-		    std::vector<G4String>& tokens,
-		    const G4String& delimiters = " ");
+  void ReadAndParse(const G4String& str, std::vector<G4String>& tokens, const G4String& delimiters = " ");
 
   //Map of applicable particles
-  std::map<const G4ParticleDefinition*,G4bool> known_particles;
+  std::map<const G4ParticleDefinition*, G4bool> known_particles;
 
   //Map for physics parameters, name to value
-  std::map<G4String,G4double> parameters;
+  std::map<G4String, G4double> parameters;
 
   //The parameters themselves
   bool resonant;
@@ -87,7 +81,6 @@ class G4ProcessHelper {
   double hadronlifetime;
   double mixing;
 
-
   //Proton-scattering processes
   ReactionMap pReactionMap;
 
@@ -102,6 +95,5 @@ class G4ProcessHelper {
   TH1D* h_sqrts;
   TProfile* h_q_p;
   TProfile* h_q_gamma;
-
 };
 #endif
diff --git a/SimG4Core/CustomPhysics/interface/HadronicProcessHelper.h b/SimG4Core/CustomPhysics/interface/HadronicProcessHelper.h
index 72efc18a1c7ee..c00be1aab8ca9 100644
--- a/SimG4Core/CustomPhysics/interface/HadronicProcessHelper.h
+++ b/SimG4Core/CustomPhysics/interface/HadronicProcessHelper.h
@@ -1,70 +1,67 @@
 #ifndef SimG4Core_CustomPhysics_HadronicProcessHelper_H
 #define SimG4Core_CustomPhysics_HadronicProcessHelper_H
 
-#include"globals.hh"
-#include"G4ParticleDefinition.hh"
-#include"G4DynamicParticle.hh"
-#include"G4Element.hh"
-#include"G4Track.hh"
-
-#include<vector>
-#include<map>
+#include "globals.hh"
+#include "G4ParticleDefinition.hh"
+#include "G4DynamicParticle.hh"
+#include "G4Element.hh"
+#include "G4Track.hh"
+
+#include <vector>
+#include <map>
 #include <string>
 
 class G4ParticleTable;
 
 class HadronicProcessHelper {
-
 public:
-
-//Typedefs just made to make life easier :-) 
+  //Typedefs just made to make life easier :-)
   typedef std::vector<G4int> ReactionProduct;
-  typedef std::vector<ReactionProduct > ReactionProductList;
-  typedef std::map<G4int , ReactionProductList> ReactionMap;
+  typedef std::vector<ReactionProduct> ReactionProductList;
+  typedef std::map<G4int, ReactionProductList> ReactionMap;
+
+  HadronicProcessHelper(const std::string& fileName);
 
-  HadronicProcessHelper(const std::string & fileName);
-  
   HadronicProcessHelper(const HadronicProcessHelper&);
-  
-  HadronicProcessHelper& operator= (const HadronicProcessHelper&);
 
-  HadronicProcessHelper* instance() {return this;};
+  HadronicProcessHelper& operator=(const HadronicProcessHelper&);
+
+  HadronicProcessHelper* instance() { return this; };
 
   G4bool applicabilityTester(const G4ParticleDefinition& particle);
 
-  G4double inclusiveCrossSection(const G4DynamicParticle *particle,
-				    const G4Element *element);
+  G4double inclusiveCrossSection(const G4DynamicParticle* particle, const G4Element* element);
 
   //Make sure the element is known (for n/p-decision)
-  ReactionProduct finalState(const G4Track& track,G4ParticleDefinition*& target)
-  {
-   return finalState(track.GetDynamicParticle(),track.GetMaterial(),  target);
+  ReactionProduct finalState(const G4Track& track, G4ParticleDefinition*& target) {
+    return finalState(track.GetDynamicParticle(), track.GetMaterial(), target);
   }
-  ReactionProduct finalState(const G4DynamicParticle *  particle, const G4Material* material, G4ParticleDefinition*& target);
-
+  ReactionProduct finalState(const G4DynamicParticle* particle,
+                             const G4Material* material,
+                             G4ParticleDefinition*& target);
 
 private:
-
   G4ParticleDefinition* m_proton;
   G4ParticleDefinition* m_neutron;
 
-//  ReactionMap* m_reactionMap;
+  //  ReactionMap* m_reactionMap;
 
-  G4double m_phaseSpace(const ReactionProduct& aReaction,const G4DynamicParticle* aDynamicParticle,
-		        G4ParticleDefinition* target);
-  
-  G4double m_reactionProductMass(const ReactionProduct& aReaction,const G4DynamicParticle* aDynamicParticle,
-		        G4ParticleDefinition* target);
+  G4double m_phaseSpace(const ReactionProduct& aReaction,
+                        const G4DynamicParticle* aDynamicParticle,
+                        G4ParticleDefinition* target);
 
-  G4bool m_reactionIsPossible(const ReactionProduct& aReaction,const G4DynamicParticle* aDynamicParticle,
-		        G4ParticleDefinition* target);
+  G4double m_reactionProductMass(const ReactionProduct& aReaction,
+                                 const G4DynamicParticle* aDynamicParticle,
+                                 G4ParticleDefinition* target);
 
-  void m_readAndParse(const G4String& str,
-		    std::vector<G4String>& tokens,
-		    const G4String& delimiters = " ");
+  G4bool m_reactionIsPossible(const ReactionProduct& aReaction,
+                              const G4DynamicParticle* aDynamicParticle,
+                              G4ParticleDefinition* target);
+
+  void m_readAndParse(const G4String& str, std::vector<G4String>& tokens, const G4String& delimiters = " ");
 
   //Map of applicable particles
-  std::map<const G4ParticleDefinition*,G4bool> m_knownParticles;
+  std::map<const G4ParticleDefinition*, G4bool> m_knownParticles;
 
   //Proton-scattering processes
   ReactionMap m_protonReactionMap;
@@ -74,11 +71,10 @@ class HadronicProcessHelper {
 
   G4ParticleTable* m_particleTable;
 
-////Debug stuff
+  ////Debug stuff
   G4double m_checkFraction;
   G4int m_n22;
   G4int m_n23;
-
 };
 
 #endif
diff --git a/SimG4Core/CustomPhysics/interface/RHStopDump.h b/SimG4Core/CustomPhysics/interface/RHStopDump.h
index 1637c8a3630ac..9c11f8a77ae42 100644
--- a/SimG4Core/CustomPhysics/interface/RHStopDump.h
+++ b/SimG4Core/CustomPhysics/interface/RHStopDump.h
@@ -1,5 +1,5 @@
 #ifndef SimG4Core_CustomPhysics_RHStopDump_H
-#define SimG4Core_CustomPhysics_RHStopDump_H 
+#define SimG4Core_CustomPhysics_RHStopDump_H
 //
 // Dump stopping points from the Event into ASCII file
 // F.Ratnikov, Apr. 8, 2010
@@ -10,11 +10,12 @@
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 class RHStopDump : public edm::one::EDAnalyzer<edm::one::SharedResources> {
- public:
+public:
   explicit RHStopDump(const edm::ParameterSet&);
-  ~RHStopDump() override {};
+  ~RHStopDump() override{};
   void analyze(const edm::Event&, const edm::EventSetup&) override;
- private:
+
+private:
   std::ofstream mStream;
   std::string mProducer;
 };
diff --git a/SimG4Core/CustomPhysics/interface/RHStopTracer.h b/SimG4Core/CustomPhysics/interface/RHStopTracer.h
index e7af953c03841..ed87e6c66f2e8 100644
--- a/SimG4Core/CustomPhysics/interface/RHStopTracer.h
+++ b/SimG4Core/CustomPhysics/interface/RHStopTracer.h
@@ -15,25 +15,25 @@ class EndOfTrack;
 class G4Step;
 class G4ParticleDefinition;
 
-class RHStopTracer :  public SimProducer,
-		      public Observer<const BeginOfRun *>, 
-		      public Observer<const BeginOfEvent *>, 
-		      public Observer<const BeginOfTrack *>,
-		      public Observer<const EndOfTrack *>
-{
- public:
-  RHStopTracer(edm::ParameterSet const & p);
+class RHStopTracer : public SimProducer,
+                     public Observer<const BeginOfRun *>,
+                     public Observer<const BeginOfEvent *>,
+                     public Observer<const BeginOfTrack *>,
+                     public Observer<const EndOfTrack *> {
+public:
+  RHStopTracer(edm::ParameterSet const &p);
   ~RHStopTracer() override;
   void update(const BeginOfRun *) override;
   void update(const BeginOfEvent *) override;
   void update(const BeginOfTrack *) override;
   void update(const EndOfTrack *) override;
-  void produce(edm::Event&, const edm::EventSetup&) override;
- private:
+  void produce(edm::Event &, const edm::EventSetup &) override;
+
+private:
   struct StopPoint {
-    StopPoint (const std::string& fName, double fX, double fY, double fZ, double fT, int fId, double fMass, double fCharge) 
-    : name(fName), x(fX), y(fY), z(fZ), t(fT), id(fId), mass(fMass), charge(fCharge) 
-    {}
+    StopPoint(
+        const std::string &fName, double fX, double fY, double fZ, double fT, int fId, double fMass, double fCharge)
+        : name(fName), x(fX), y(fY), z(fZ), t(fT), id(fId), mass(fMass), charge(fCharge) {}
     std::string name;
     double x;
     double y;
@@ -50,7 +50,7 @@ class RHStopTracer :  public SimProducer,
   int otherPdgId;
   std::string mTraceParticleName;
   std::regex rePartName;
-  std::vector <StopPoint> mStopPoints;
+  std::vector<StopPoint> mStopPoints;
 };
 
 #endif
diff --git a/SimG4Core/CustomPhysics/plugins/RHStopDump.cc b/SimG4Core/CustomPhysics/plugins/RHStopDump.cc
index 40287545ad289..f711bd9a73066 100644
--- a/SimG4Core/CustomPhysics/plugins/RHStopDump.cc
+++ b/SimG4Core/CustomPhysics/plugins/RHStopDump.cc
@@ -4,38 +4,35 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-RHStopDump::RHStopDump(edm::ParameterSet const & parameters) 
-  : mStream (parameters.getParameter<std::string>("stoppedFile").c_str()),
-    mProducer (parameters.getUntrackedParameter<std::string>("producer", "g4SimHits"))
-{}
+RHStopDump::RHStopDump(edm::ParameterSet const& parameters)
+    : mStream(parameters.getParameter<std::string>("stoppedFile").c_str()),
+      mProducer(parameters.getUntrackedParameter<std::string>("producer", "g4SimHits")) {}
 
- void RHStopDump::analyze(const edm::Event& fEvent, const edm::EventSetup&) {
-   edm::Handle<std::vector<std::string> > names;
-   fEvent.getByLabel (mProducer, "StoppedParticlesName", names);
-   edm::Handle<std::vector<float> > xs;
-   fEvent.getByLabel (mProducer, "StoppedParticlesX", xs);
-   edm::Handle<std::vector<float> > ys;
-   fEvent.getByLabel (mProducer, "StoppedParticlesY", ys);
-   edm::Handle<std::vector<float> > zs;
-   fEvent.getByLabel (mProducer, "StoppedParticlesZ", zs);
-   edm::Handle<std::vector<float> > ts;
-   fEvent.getByLabel (mProducer, "StoppedParticlesTime", ts);
-   edm::Handle<std::vector<int> > ids;
-   fEvent.getByLabel (mProducer, "StoppedParticlesPdgId", ids);
-   edm::Handle<std::vector<float> > masses;
-   fEvent.getByLabel (mProducer, "StoppedParticlesMass", masses);
-   edm::Handle<std::vector<float> > charges;
-   fEvent.getByLabel (mProducer, "StoppedParticlesCharge", charges);
+void RHStopDump::analyze(const edm::Event& fEvent, const edm::EventSetup&) {
+  edm::Handle<std::vector<std::string> > names;
+  fEvent.getByLabel(mProducer, "StoppedParticlesName", names);
+  edm::Handle<std::vector<float> > xs;
+  fEvent.getByLabel(mProducer, "StoppedParticlesX", xs);
+  edm::Handle<std::vector<float> > ys;
+  fEvent.getByLabel(mProducer, "StoppedParticlesY", ys);
+  edm::Handle<std::vector<float> > zs;
+  fEvent.getByLabel(mProducer, "StoppedParticlesZ", zs);
+  edm::Handle<std::vector<float> > ts;
+  fEvent.getByLabel(mProducer, "StoppedParticlesTime", ts);
+  edm::Handle<std::vector<int> > ids;
+  fEvent.getByLabel(mProducer, "StoppedParticlesPdgId", ids);
+  edm::Handle<std::vector<float> > masses;
+  fEvent.getByLabel(mProducer, "StoppedParticlesMass", masses);
+  edm::Handle<std::vector<float> > charges;
+  fEvent.getByLabel(mProducer, "StoppedParticlesCharge", charges);
 
-   if (names->size() != xs->size() || xs->size() != ys->size() || ys->size() != zs->size()) {
-     edm::LogError ("RHStopDump") << "mismatch array sizes name/x/y/z:"
-				  << names->size() << '/' << xs->size() << '/' << ys->size() << '/' << zs->size()
-				  << std::endl;
-   }
-   else {
-     for (size_t i = 0; i < names->size(); ++i) {
-       mStream << (*names)[i] << ' ' << (*xs)[i] << ' ' << (*ys)[i] << ' ' << (*zs)[i] << ' ' << (*ts)[i] << std::endl;
-       mStream << (*ids)[i] << ' ' << (*masses)[i] << ' ' << (*charges)[i] << std::endl;
-     }
-   }
- }
+  if (names->size() != xs->size() || xs->size() != ys->size() || ys->size() != zs->size()) {
+    edm::LogError("RHStopDump") << "mismatch array sizes name/x/y/z:" << names->size() << '/' << xs->size() << '/'
+                                << ys->size() << '/' << zs->size() << std::endl;
+  } else {
+    for (size_t i = 0; i < names->size(); ++i) {
+      mStream << (*names)[i] << ' ' << (*xs)[i] << ' ' << (*ys)[i] << ' ' << (*zs)[i] << ' ' << (*ts)[i] << std::endl;
+      mStream << (*ids)[i] << ' ' << (*masses)[i] << ' ' << (*charges)[i] << std::endl;
+    }
+  }
+}
diff --git a/SimG4Core/CustomPhysics/plugins/RHStopTracer.cc b/SimG4Core/CustomPhysics/plugins/RHStopTracer.cc
index 091d234a39669..c945a99def2fe 100644
--- a/SimG4Core/CustomPhysics/plugins/RHStopTracer.cc
+++ b/SimG4Core/CustomPhysics/plugins/RHStopTracer.cc
@@ -9,7 +9,7 @@
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-  
+
 #include "G4Track.hh"
 #include "G4Run.hh"
 #include "G4Event.hh"
@@ -17,97 +17,87 @@
 #include "G4ParticleTable.hh"
 #include "G4ParticleDefinition.hh"
 
-RHStopTracer::RHStopTracer(edm::ParameterSet const & p) {
+RHStopTracer::RHStopTracer(edm::ParameterSet const& p) {
   edm::ParameterSet parameters = p.getParameter<edm::ParameterSet>("RHStopTracer");
   mStopRegular = parameters.getUntrackedParameter<bool>("stopRegularParticles", false);
-  mTraceEnergy = parameters.getUntrackedParameter<double>("traceEnergy", 1.e20); 
+  mTraceEnergy = parameters.getUntrackedParameter<double>("traceEnergy", 1.e20);
   mTraceParticleName = parameters.getParameter<std::string>("traceParticle");
-  minPdgId = parameters.getUntrackedParameter<int>("minPdgId", 1000000); 
-  maxPdgId = parameters.getUntrackedParameter<int>("maxPdgId", 2000000); 
-  otherPdgId = parameters.getUntrackedParameter<int>("otherPdgId", 17); 
-  produces< std::vector<std::string> >("StoppedParticlesName");
-  produces< std::vector<float> >("StoppedParticlesX");
-  produces< std::vector<float> >("StoppedParticlesY");
-  produces< std::vector<float> >("StoppedParticlesZ");
-  produces< std::vector<float> >("StoppedParticlesTime");
-  produces< std::vector<int> >("StoppedParticlesPdgId");
-  produces< std::vector<float> >("StoppedParticlesMass");
-  produces< std::vector<float> >("StoppedParticlesCharge");
+  minPdgId = parameters.getUntrackedParameter<int>("minPdgId", 1000000);
+  maxPdgId = parameters.getUntrackedParameter<int>("maxPdgId", 2000000);
+  otherPdgId = parameters.getUntrackedParameter<int>("otherPdgId", 17);
+  produces<std::vector<std::string> >("StoppedParticlesName");
+  produces<std::vector<float> >("StoppedParticlesX");
+  produces<std::vector<float> >("StoppedParticlesY");
+  produces<std::vector<float> >("StoppedParticlesZ");
+  produces<std::vector<float> >("StoppedParticlesTime");
+  produces<std::vector<int> >("StoppedParticlesPdgId");
+  produces<std::vector<float> >("StoppedParticlesMass");
+  produces<std::vector<float> >("StoppedParticlesCharge");
 
   mTraceEnergy *= CLHEP::GeV;
   rePartName = mTraceParticleName;
 
-  edm::LogInfo("SimG4CoreCustomPhysics")
-    << "RHStopTracer::RHStopTracer " << mTraceParticleName 
-    << " Eth(GeV)= " << mTraceEnergy;
-
+  edm::LogInfo("SimG4CoreCustomPhysics") << "RHStopTracer::RHStopTracer " << mTraceParticleName
+                                         << " Eth(GeV)= " << mTraceEnergy;
 }
 
-RHStopTracer::~RHStopTracer() {
-}
+RHStopTracer::~RHStopTracer() {}
 
-void RHStopTracer::update (const BeginOfRun * fRun) {
-  LogDebug("SimG4CoreCustomPhysics")
-    << "RHStopTracer::update-> begin of the run " << (*fRun)()->GetRunID(); 
+void RHStopTracer::update(const BeginOfRun* fRun) {
+  LogDebug("SimG4CoreCustomPhysics") << "RHStopTracer::update-> begin of the run " << (*fRun)()->GetRunID();
 }
 
-void RHStopTracer::update (const BeginOfEvent * fEvent) {
-  LogDebug("SimG4CoreCustomPhysics")
-    << "RHStopTracer::update-> begin of the event " << (*fEvent)()->GetEventID(); 
+void RHStopTracer::update(const BeginOfEvent* fEvent) {
+  LogDebug("SimG4CoreCustomPhysics") << "RHStopTracer::update-> begin of the event " << (*fEvent)()->GetEventID();
 }
 
-void RHStopTracer::update (const BeginOfTrack * fTrack) {
+void RHStopTracer::update(const BeginOfTrack* fTrack) {
   const G4Track* track = (*fTrack)();
   const G4ParticleDefinition* part = track->GetDefinition();
   const std::string& stringPartName = part->GetParticleName();
   bool matched = false;
   int pdgid = std::abs(part->GetPDGEncoding());
-  if( (pdgid>minPdgId && pdgid<maxPdgId) || pdgid==otherPdgId )
-     matched = std::regex_match(stringPartName,rePartName);
-  if( matched ||  track->GetKineticEnergy() > mTraceEnergy) {
-    LogDebug("SimG4CoreCustomPhysics")
-      << "RHStopTracer::update-> new track: ID/Name/pdgId/mass/charge/Parent: " 
-      << track->GetTrackID() << '/' << part->GetParticleName() << '/' 
-      << part->GetPDGEncoding() << '/'
-      << part->GetPDGMass()/GeV <<" GeV/" << part->GetPDGCharge() << '/'
-      << track->GetParentID()
-      << " Position: " << track->GetPosition() << ' ' 
-      << " R/phi: " << track->GetPosition().perp() << '/' << track->GetPosition().phi()
-      << "   4vec " << track->GetMomentum();
-  } else if (mStopRegular) { // kill regular particles
+  if ((pdgid > minPdgId && pdgid < maxPdgId) || pdgid == otherPdgId)
+    matched = std::regex_match(stringPartName, rePartName);
+  if (matched || track->GetKineticEnergy() > mTraceEnergy) {
+    LogDebug("SimG4CoreCustomPhysics") << "RHStopTracer::update-> new track: ID/Name/pdgId/mass/charge/Parent: "
+                                       << track->GetTrackID() << '/' << part->GetParticleName() << '/'
+                                       << part->GetPDGEncoding() << '/' << part->GetPDGMass() / GeV << " GeV/"
+                                       << part->GetPDGCharge() << '/' << track->GetParentID()
+                                       << " Position: " << track->GetPosition() << ' '
+                                       << " R/phi: " << track->GetPosition().perp() << '/' << track->GetPosition().phi()
+                                       << "   4vec " << track->GetMomentum();
+  } else if (mStopRegular) {  // kill regular particles
     const_cast<G4Track*>(track)->SetTrackStatus(fStopAndKill);
   }
 }
 
-void RHStopTracer::update (const EndOfTrack * fTrack) {
+void RHStopTracer::update(const EndOfTrack* fTrack) {
   const G4Track* track = (*fTrack)();
   const G4ParticleDefinition* part = track->GetDefinition();
   const std::string& stringPartName = part->GetParticleName();
   bool matched = false;
   int pdgid = std::abs(part->GetPDGEncoding());
-  if( (pdgid>minPdgId && pdgid<maxPdgId) || pdgid==otherPdgId )
-     matched = std::regex_match(stringPartName,rePartName);
-  if( matched ||  track->GetKineticEnergy() > mTraceEnergy) {
-    LogDebug("SimG4CoreCustomPhysics")
-      << "RHStopTracer::update-> stop track: ID/Name/pdgId/mass/charge/Parent: " 
-      << track->GetTrackID() << '/' << part->GetParticleName() << '/' 
-      << part->GetPDGEncoding() << '/'
-      << part->GetPDGMass()/GeV <<" GeV/" << part->GetPDGCharge() << '/'
-      << track->GetParentID()
-      << " Position: " << track->GetPosition() << ' ' 
-      << " R/phi: " << track->GetPosition().perp() << '/' << track->GetPosition().phi()
-      << "   4vec " << track->GetMomentum();
-    if (track->GetMomentum().mag () < 0.001) {
-      LogDebug("SimG4CoreCustomPhysics") <<
-	"RHStopTracer:: track has stopped, so making StopPoint";
-      mStopPoints.push_back (StopPoint (track->GetDefinition()->GetParticleName(),
-					track->GetPosition().x(),
-					track->GetPosition().y(),
-					track->GetPosition().z(),
-					track->GetGlobalTime(),
-					track->GetDefinition()->GetPDGEncoding(),
-                                        track->GetDefinition()->GetPDGMass()/GeV,
-                                        track->GetDefinition()->GetPDGCharge() ));
+  if ((pdgid > minPdgId && pdgid < maxPdgId) || pdgid == otherPdgId)
+    matched = std::regex_match(stringPartName, rePartName);
+  if (matched || track->GetKineticEnergy() > mTraceEnergy) {
+    LogDebug("SimG4CoreCustomPhysics") << "RHStopTracer::update-> stop track: ID/Name/pdgId/mass/charge/Parent: "
+                                       << track->GetTrackID() << '/' << part->GetParticleName() << '/'
+                                       << part->GetPDGEncoding() << '/' << part->GetPDGMass() / GeV << " GeV/"
+                                       << part->GetPDGCharge() << '/' << track->GetParentID()
+                                       << " Position: " << track->GetPosition() << ' '
+                                       << " R/phi: " << track->GetPosition().perp() << '/' << track->GetPosition().phi()
+                                       << "   4vec " << track->GetMomentum();
+    if (track->GetMomentum().mag() < 0.001) {
+      LogDebug("SimG4CoreCustomPhysics") << "RHStopTracer:: track has stopped, so making StopPoint";
+      mStopPoints.push_back(StopPoint(track->GetDefinition()->GetParticleName(),
+                                      track->GetPosition().x(),
+                                      track->GetPosition().y(),
+                                      track->GetPosition().z(),
+                                      track->GetGlobalTime(),
+                                      track->GetDefinition()->GetPDGEncoding(),
+                                      track->GetDefinition()->GetPDGMass() / GeV,
+                                      track->GetDefinition()->GetPDGCharge()));
     }
   }
 }
@@ -115,33 +105,33 @@ void RHStopTracer::update (const EndOfTrack * fTrack) {
 void RHStopTracer::produce(edm::Event& fEvent, const edm::EventSetup&) {
   LogDebug("SimG4CoreCustomPhysics") << "RHStopTracer::produce->";
 
-   std::unique_ptr<std::vector<std::string> > names(new std::vector<std::string>); 
-   std::unique_ptr<std::vector<float> > xs(new std::vector<float>);
-   std::unique_ptr<std::vector<float> > ys(new std::vector<float>);
-   std::unique_ptr<std::vector<float> > zs(new std::vector<float>);
-   std::unique_ptr<std::vector<float> > ts(new std::vector<float>);
-   std::unique_ptr<std::vector<int> > ids(new std::vector<int>);
-   std::unique_ptr<std::vector<float> > masses(new std::vector<float>);
-   std::unique_ptr<std::vector<float> > charges(new std::vector<float>);
+  std::unique_ptr<std::vector<std::string> > names(new std::vector<std::string>);
+  std::unique_ptr<std::vector<float> > xs(new std::vector<float>);
+  std::unique_ptr<std::vector<float> > ys(new std::vector<float>);
+  std::unique_ptr<std::vector<float> > zs(new std::vector<float>);
+  std::unique_ptr<std::vector<float> > ts(new std::vector<float>);
+  std::unique_ptr<std::vector<int> > ids(new std::vector<int>);
+  std::unique_ptr<std::vector<float> > masses(new std::vector<float>);
+  std::unique_ptr<std::vector<float> > charges(new std::vector<float>);
 
-   std::vector <StopPoint>::const_iterator stopPoint = mStopPoints.begin ();
-   for (;  stopPoint != mStopPoints.end(); ++stopPoint) {
-     names->push_back (stopPoint->name);
-     xs->push_back (stopPoint->x);
-     ys->push_back (stopPoint->y);
-     zs->push_back (stopPoint->z);
-     ts->push_back (stopPoint->t);
-     ids->push_back (stopPoint->id);
-     masses->push_back (stopPoint->mass);
-     charges->push_back (stopPoint->charge);
-   }
-   fEvent.put(std::move(names), "StoppedParticlesName");
-   fEvent.put(std::move(xs), "StoppedParticlesX");
-   fEvent.put(std::move(ys), "StoppedParticlesY");
-   fEvent.put(std::move(zs), "StoppedParticlesZ");
-   fEvent.put(std::move(ts), "StoppedParticlesTime");
-   fEvent.put(std::move(ids), "StoppedParticlesPdgId");
-   fEvent.put(std::move(masses), "StoppedParticlesMass");
-   fEvent.put(std::move(charges), "StoppedParticlesCharge");
-   mStopPoints.clear ();
+  std::vector<StopPoint>::const_iterator stopPoint = mStopPoints.begin();
+  for (; stopPoint != mStopPoints.end(); ++stopPoint) {
+    names->push_back(stopPoint->name);
+    xs->push_back(stopPoint->x);
+    ys->push_back(stopPoint->y);
+    zs->push_back(stopPoint->z);
+    ts->push_back(stopPoint->t);
+    ids->push_back(stopPoint->id);
+    masses->push_back(stopPoint->mass);
+    charges->push_back(stopPoint->charge);
+  }
+  fEvent.put(std::move(names), "StoppedParticlesName");
+  fEvent.put(std::move(xs), "StoppedParticlesX");
+  fEvent.put(std::move(ys), "StoppedParticlesY");
+  fEvent.put(std::move(zs), "StoppedParticlesZ");
+  fEvent.put(std::move(ts), "StoppedParticlesTime");
+  fEvent.put(std::move(ids), "StoppedParticlesPdgId");
+  fEvent.put(std::move(masses), "StoppedParticlesMass");
+  fEvent.put(std::move(charges), "StoppedParticlesCharge");
+  mStopPoints.clear();
 }
diff --git a/SimG4Core/CustomPhysics/plugins/module.cc b/SimG4Core/CustomPhysics/plugins/module.cc
index d27dd925e7401..10196f8a9faac 100644
--- a/SimG4Core/CustomPhysics/plugins/module.cc
+++ b/SimG4Core/CustomPhysics/plugins/module.cc
@@ -9,6 +9,5 @@
 #include "SimG4Core/CustomPhysics/interface/RHStopTracer.h"
 
 DEFINE_PHYSICSLIST(CustomPhysics);
-DEFINE_FWK_MODULE(RHStopDump) ;
+DEFINE_FWK_MODULE(RHStopDump);
 DEFINE_SIMWATCHER(RHStopTracer);
-
diff --git a/SimG4Core/CustomPhysics/src/CMSDarkPairProduction.cc b/SimG4Core/CustomPhysics/src/CMSDarkPairProduction.cc
index 455dd2abd5cbd..a3661b29d71b3 100644
--- a/SimG4Core/CustomPhysics/src/CMSDarkPairProduction.cc
+++ b/SimG4Core/CustomPhysics/src/CMSDarkPairProduction.cc
@@ -1,6 +1,6 @@
 //
 // Authors of this file:        Dustin Stolp (dostolp@ucdavis.edu)
-//                              Sushil S. Chauhan (schauhan@cern.ch) 
+//                              Sushil S. Chauhan (schauhan@cern.ch)
 // Creation date: 01.22.2015
 //
 // -------------------------------------------------------------------
@@ -12,14 +12,12 @@
 
 using namespace std;
 
-CMSDarkPairProduction::CMSDarkPairProduction(const G4ParticleDefinition* p,G4double df,
-   const G4String& nam) : G4PairProductionRelModel(p,nam), dark_factor(df) {}
+CMSDarkPairProduction::CMSDarkPairProduction(const G4ParticleDefinition* p, G4double df, const G4String& nam)
+    : G4PairProductionRelModel(p, nam), dark_factor(df) {}
 
-CMSDarkPairProduction::~CMSDarkPairProduction(){}
+CMSDarkPairProduction::~CMSDarkPairProduction() {}
 
-G4double CMSDarkPairProduction::ComputeCrossSectionPerAtom(const G4ParticleDefinition* p,
-         G4double e, G4double Z, G4double e1, G4double e2, G4double e3)
-{
-  return dark_factor
-    *G4PairProductionRelModel::ComputeCrossSectionPerAtom(p, e, Z, e1, e2, e3);
+G4double CMSDarkPairProduction::ComputeCrossSectionPerAtom(
+    const G4ParticleDefinition* p, G4double e, G4double Z, G4double e1, G4double e2, G4double e3) {
+  return dark_factor * G4PairProductionRelModel::ComputeCrossSectionPerAtom(p, e, Z, e1, e2, e3);
 }
diff --git a/SimG4Core/CustomPhysics/src/CMSDarkPairProductionProcess.cc b/SimG4Core/CustomPhysics/src/CMSDarkPairProductionProcess.cc
index b186ee80225b8..883db9885a7b1 100644
--- a/SimG4Core/CustomPhysics/src/CMSDarkPairProductionProcess.cc
+++ b/SimG4Core/CustomPhysics/src/CMSDarkPairProductionProcess.cc
@@ -1,7 +1,7 @@
 //
 // ********************************************************************
 // Authors of this file: Dustin Stolp (dostolp@ucdavis.edu)
-//                       Sushil S. Chauhan (schauhan@cern.ch)   
+//                       Sushil S. Chauhan (schauhan@cern.ch)
 //
 // -----------------------------------------------------------------------------
 
@@ -14,13 +14,9 @@
 
 using namespace std;
 
-CMSDarkPairProductionProcess::CMSDarkPairProductionProcess(
-  G4double df,
-  const G4String& processName,  
-  G4ProcessType type):G4VEmProcess (processName, type),
-		      isInitialised(false), darkFactor(df)
-{ 
-  SetMinKinEnergy(2.0*electron_mass_c2);
+CMSDarkPairProductionProcess::CMSDarkPairProductionProcess(G4double df, const G4String& processName, G4ProcessType type)
+    : G4VEmProcess(processName, type), isInitialised(false), darkFactor(df) {
+  SetMinKinEnergy(2.0 * electron_mass_c2);
   SetProcessSubType(fGammaConversion);
   SetStartFromNullFlag(true);
   SetBuildTableFlag(true);
@@ -28,35 +24,22 @@ CMSDarkPairProductionProcess::CMSDarkPairProductionProcess(
   SetLambdaBinning(220);
 }
 
- 
-CMSDarkPairProductionProcess::~CMSDarkPairProductionProcess()
-{}
+CMSDarkPairProductionProcess::~CMSDarkPairProductionProcess() {}
 
-
-G4bool CMSDarkPairProductionProcess::IsApplicable(const G4ParticleDefinition& p)
-{
-  return (p.GetParticleType()=="darkpho");
+G4bool CMSDarkPairProductionProcess::IsApplicable(const G4ParticleDefinition& p) {
+  return (p.GetParticleType() == "darkpho");
 }
 
-
-void CMSDarkPairProductionProcess::InitialiseProcess(const G4ParticleDefinition* p)
-{
-  if(!isInitialised) {
+void CMSDarkPairProductionProcess::InitialiseProcess(const G4ParticleDefinition* p) {
+  if (!isInitialised) {
     isInitialised = true;
-    
-       AddEmModel(0, new CMSDarkPairProduction(p,darkFactor));
 
+    AddEmModel(0, new CMSDarkPairProduction(p, darkFactor));
   }
 }
 
-
-G4double CMSDarkPairProductionProcess::MinPrimaryEnergy(const G4ParticleDefinition*,
-					     const G4Material*)
-{
-  return 2*electron_mass_c2;
+G4double CMSDarkPairProductionProcess::MinPrimaryEnergy(const G4ParticleDefinition*, const G4Material*) {
+  return 2 * electron_mass_c2;
 }
 
-
-void CMSDarkPairProductionProcess::PrintInfo()
-{}         
-
+void CMSDarkPairProductionProcess::PrintInfo() {}
diff --git a/SimG4Core/CustomPhysics/src/CMSExoticaPhysics.cc b/SimG4Core/CustomPhysics/src/CMSExoticaPhysics.cc
index dbcf7108d6d53..e8811564ff71b 100644
--- a/SimG4Core/CustomPhysics/src/CMSExoticaPhysics.cc
+++ b/SimG4Core/CustomPhysics/src/CMSExoticaPhysics.cc
@@ -2,14 +2,13 @@
 #include "SimG4Core/CustomPhysics/interface/CustomPhysicsList.h"
 #include "SimG4Core/CustomPhysics/interface/CustomPhysicsListSS.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
- 
-CMSExoticaPhysics::CMSExoticaPhysics(PhysicsList* phys, const edm::ParameterSet & p) {
 
-  bool ssPhys  = p.getUntrackedParameter<bool>("ExoticaPhysicsSS",false);
-                 
-  if(ssPhys) {
-    phys->RegisterPhysics(new CustomPhysicsListSS("custom",p,true));
+CMSExoticaPhysics::CMSExoticaPhysics(PhysicsList* phys, const edm::ParameterSet& p) {
+  bool ssPhys = p.getUntrackedParameter<bool>("ExoticaPhysicsSS", false);
+
+  if (ssPhys) {
+    phys->RegisterPhysics(new CustomPhysicsListSS("custom", p, true));
   } else {
-    phys->RegisterPhysics(new CustomPhysicsList("custom",p,true));    
+    phys->RegisterPhysics(new CustomPhysicsList("custom", p, true));
   }
 }
diff --git a/SimG4Core/CustomPhysics/src/CustomPDGParser.cc b/SimG4Core/CustomPhysics/src/CustomPDGParser.cc
index 8cfa808528d3b..6126e50725a52 100644
--- a/SimG4Core/CustomPhysics/src/CustomPDGParser.cc
+++ b/SimG4Core/CustomPhysics/src/CustomPDGParser.cc
@@ -7,184 +7,165 @@
 
 }*/
 
-bool CustomPDGParser::s_isRHadron(int pdg) 
-{
- int pdgAbs=abs(pdg);
- return ( (pdgAbs % 100000 / 10000 == 9) ||  (pdgAbs % 10000 / 1000 == 9) || s_isRGlueball(pdg) );
+bool CustomPDGParser::s_isRHadron(int pdg) {
+  int pdgAbs = abs(pdg);
+  return ((pdgAbs % 100000 / 10000 == 9) || (pdgAbs % 10000 / 1000 == 9) || s_isRGlueball(pdg));
 }
 
-bool CustomPDGParser::s_isstopHadron(int pdg) 
-{
- int pdgAbs=abs(pdg);
- return ( (pdgAbs % 10000 / 1000 == 6) ||  (pdgAbs % 1000 / 100 == 6)  );
+bool CustomPDGParser::s_isstopHadron(int pdg) {
+  int pdgAbs = abs(pdg);
+  return ((pdgAbs % 10000 / 1000 == 6) || (pdgAbs % 1000 / 100 == 6));
 }
 
-bool CustomPDGParser::s_issbottomHadron(int pdg) 
-{
- int pdgAbs=abs(pdg);
- return ( (pdgAbs % 10000 / 1000 == 5) ||  (pdgAbs % 10000 / 100 == 5)  );
+bool CustomPDGParser::s_issbottomHadron(int pdg) {
+  int pdgAbs = abs(pdg);
+  return ((pdgAbs % 10000 / 1000 == 5) || (pdgAbs % 10000 / 100 == 5));
 }
 
-bool CustomPDGParser::s_isSLepton(int pdg)
-{
- int pdgAbs=abs(pdg);
- return (pdgAbs / 100 % 10000 == 0 && pdgAbs / 10 % 10 == 1);
+bool CustomPDGParser::s_isSLepton(int pdg) {
+  int pdgAbs = abs(pdg);
+  return (pdgAbs / 100 % 10000 == 0 && pdgAbs / 10 % 10 == 1);
 }
 
-bool CustomPDGParser::s_isRBaryon(int pdg)
-{
- int pdgAbs=abs(pdg);
- return  (pdgAbs % 100000 / 10000 == 9);
-
+bool CustomPDGParser::s_isRBaryon(int pdg) {
+  int pdgAbs = abs(pdg);
+  return (pdgAbs % 100000 / 10000 == 9);
 }
 
-bool CustomPDGParser::s_isRGlueball(int pdg)
-{
- int pdgAbs=abs(pdg);
- return  (pdgAbs % 100000 / 10 == 99);
-
+bool CustomPDGParser::s_isRGlueball(int pdg) {
+  int pdgAbs = abs(pdg);
+  return (pdgAbs % 100000 / 10 == 99);
 }
 
-bool CustomPDGParser::s_isDphoton(int pdg)
-{                      
- int pdgAbs=abs(pdg);  
- return  (pdgAbs == 1072000);
-                       
+bool CustomPDGParser::s_isDphoton(int pdg) {
+  int pdgAbs = abs(pdg);
+  return (pdgAbs == 1072000);
 }
 
-bool CustomPDGParser::s_isRMeson(int pdg)
-{
- int pdgAbs=abs(pdg);
- return (pdgAbs % 10000 / 1000 == 9);
-
+bool CustomPDGParser::s_isRMeson(int pdg) {
+  int pdgAbs = abs(pdg);
+  return (pdgAbs % 10000 / 1000 == 9);
 }
 
-bool CustomPDGParser::s_isMesonino(int pdg)
-{
- int pdgAbs=abs(pdg);
- return ((pdgAbs % 10000 / 100 == 6 ) || (pdgAbs % 10000 / 100 == 5));
-
-
+bool CustomPDGParser::s_isMesonino(int pdg) {
+  int pdgAbs = abs(pdg);
+  return ((pdgAbs % 10000 / 100 == 6) || (pdgAbs % 10000 / 100 == 5));
 }
 
-bool CustomPDGParser::s_isSbaryon(int pdg)
-{
- int pdgAbs=abs(pdg);
- return ((pdgAbs % 10000 / 1000 == 6) || (pdgAbs % 10000 / 1000 == 5));
-
+bool CustomPDGParser::s_isSbaryon(int pdg) {
+  int pdgAbs = abs(pdg);
+  return ((pdgAbs % 10000 / 1000 == 6) || (pdgAbs % 10000 / 1000 == 5));
 }
 
-bool CustomPDGParser::s_isChargino( int pdg )
-{
+bool CustomPDGParser::s_isChargino(int pdg) {
   int pdgAbs = abs(pdg);
-  return (pdgAbs == 1000024);  
+  return (pdgAbs == 1000024);
 }
 
-
-double CustomPDGParser::s_charge(int pdg)
-{
-      float charge=0,sign=1;
-      int pdgAbs=abs(pdg);
-      if(pdg < 0 ) sign=-1;
-
-      if(s_isSLepton(pdg))     //Sleptons
-        {
-	  if(pdgAbs %2 == 0) 
-	      return 0;
-           else
-      	      return -sign;
-	}
-
-      if(s_isDphoton(pdg)){                                                                                                                           
-          return charge;
-      }
-      if (s_isChargino(pdg)) {
-	return sign;
-      } 
-      if(s_isRMeson(pdg))
-      {
-        std::vector<int> quarks = s_containedQuarks(pdg);
-        if((quarks[1] % 2 == 0 && quarks[0] % 2 == 1)||(quarks[1] % 2 == 1 && quarks[0] % 2 == 0 )) charge=1;
-        charge*=sign;       
-       return charge;
-      }
-
-      if(s_isRBaryon(pdg))
-      {
-       int baryon = s_containedQuarksCode(pdg);
-       for(int q=1; q< 1000; q*=10)
-       {
-        if(baryon / q % 2 == 0) charge+=2; else charge -=1; 
-       }
-        charge/=3;
-	charge*=sign;
-	return charge;
-      }
-
-      if(s_isMesonino(pdg))
-	{
-	  int quark = s_containedQuarks(pdg)[0];
-	  int squark = abs(pdg/100%10);
-	  if (squark % 2 == 0 && quark % 2 == 1) charge = 1;
-	  if (squark % 2 == 1 && quark % 2 == 0) charge = 1;
-	  charge *= sign;
-	  if(s_issbottomHadron(pdg)) charge*=-1;
-	  return charge;
-	}
-
-      if(s_isSbaryon(pdg))
-	{
-	  int baryon = s_containedQuarksCode(pdg)+100*(abs(pdg/1000%10));//Adding the squark back on
-	  for(int q=1; q< 1000; q*=10)
-	    {
-	      if(baryon / q % 2 == 0) charge+=2; else charge -=1; 
-	    }
-	  charge/=3;
-	  charge*=sign;
-	  if(s_issbottomHadron(pdg)) charge*=-1;
-	  return charge;
-	}
-
-return 0; 
+double CustomPDGParser::s_charge(int pdg) {
+  float charge = 0, sign = 1;
+  int pdgAbs = abs(pdg);
+  if (pdg < 0)
+    sign = -1;
+
+  if (s_isSLepton(pdg))  //Sleptons
+  {
+    if (pdgAbs % 2 == 0)
+      return 0;
+    else
+      return -sign;
+  }
+
+  if (s_isDphoton(pdg)) {
+    return charge;
+  }
+  if (s_isChargino(pdg)) {
+    return sign;
+  }
+  if (s_isRMeson(pdg)) {
+    std::vector<int> quarks = s_containedQuarks(pdg);
+    if ((quarks[1] % 2 == 0 && quarks[0] % 2 == 1) || (quarks[1] % 2 == 1 && quarks[0] % 2 == 0))
+      charge = 1;
+    charge *= sign;
+    return charge;
+  }
+
+  if (s_isRBaryon(pdg)) {
+    int baryon = s_containedQuarksCode(pdg);
+    for (int q = 1; q < 1000; q *= 10) {
+      if (baryon / q % 2 == 0)
+        charge += 2;
+      else
+        charge -= 1;
+    }
+    charge /= 3;
+    charge *= sign;
+    return charge;
+  }
+
+  if (s_isMesonino(pdg)) {
+    int quark = s_containedQuarks(pdg)[0];
+    int squark = abs(pdg / 100 % 10);
+    if (squark % 2 == 0 && quark % 2 == 1)
+      charge = 1;
+    if (squark % 2 == 1 && quark % 2 == 0)
+      charge = 1;
+    charge *= sign;
+    if (s_issbottomHadron(pdg))
+      charge *= -1;
+    return charge;
+  }
+
+  if (s_isSbaryon(pdg)) {
+    int baryon = s_containedQuarksCode(pdg) + 100 * (abs(pdg / 1000 % 10));  //Adding the squark back on
+    for (int q = 1; q < 1000; q *= 10) {
+      if (baryon / q % 2 == 0)
+        charge += 2;
+      else
+        charge -= 1;
+    }
+    charge /= 3;
+    charge *= sign;
+    if (s_issbottomHadron(pdg))
+      charge *= -1;
+    return charge;
+  }
+
+  return 0;
 }
 
-double CustomPDGParser::s_spin(int pdg)
-{
-  // The PDG numbering is described in the Review of Particle Physics: 
+double CustomPDGParser::s_spin(int pdg) {
+  // The PDG numbering is described in the Review of Particle Physics:
   // "3. In composite quark systems (diquarks, mesons, and baryons) ...
-  // the rightmost digit nJ = 2J + 1 gives the system's spin."  
-  // Since this does not apply to SUSY / exotic particles, 
-  // if the spin is important for the simulation 
-  // it should be hard-coded based on PDG ID in this function.  
- int pdgAbs=abs(pdg);
- return pdgAbs % 10;    
+  // the rightmost digit nJ = 2J + 1 gives the system's spin."
+  // Since this does not apply to SUSY / exotic particles,
+  // if the spin is important for the simulation
+  // it should be hard-coded based on PDG ID in this function.
+  int pdgAbs = abs(pdg);
+  return pdgAbs % 10;
 }
 
- std::vector<int> CustomPDGParser::s_containedQuarks(int pdg)
-{
- std::vector<int> quarks;
- for(int i=s_containedQuarksCode(pdg); i > 0; i /= 10)
- {
+std::vector<int> CustomPDGParser::s_containedQuarks(int pdg) {
+  std::vector<int> quarks;
+  for (int i = s_containedQuarksCode(pdg); i > 0; i /= 10) {
     quarks.push_back(i % 10);
- }
- return quarks; 
+  }
+  return quarks;
 }
 
- int CustomPDGParser::s_containedQuarksCode(int pdg)
-{
- int pdgAbs=abs(pdg);
- if(s_isRBaryon(pdg))
-   return pdgAbs / 10 % 1000;
-
- if(s_isRMeson(pdg))
-   return pdgAbs / 10 % 100;
+int CustomPDGParser::s_containedQuarksCode(int pdg) {
+  int pdgAbs = abs(pdg);
+  if (s_isRBaryon(pdg))
+    return pdgAbs / 10 % 1000;
 
- if(s_isMesonino(pdg))
-   return pdgAbs / 10 % 1000 % 10;
+  if (s_isRMeson(pdg))
+    return pdgAbs / 10 % 100;
 
- if(s_isSbaryon(pdg))
-   return pdgAbs / 10 % 1000 % 100;
+  if (s_isMesonino(pdg))
+    return pdgAbs / 10 % 1000 % 10;
 
+  if (s_isSbaryon(pdg))
+    return pdgAbs / 10 % 1000 % 100;
 
-return 0;
+  return 0;
 }
diff --git a/SimG4Core/CustomPhysics/src/CustomParticle.cc b/SimG4Core/CustomPhysics/src/CustomParticle.cc
index 9bdccc72f9241..1adbf8327f2b3 100644
--- a/SimG4Core/CustomPhysics/src/CustomParticle.cc
+++ b/SimG4Core/CustomPhysics/src/CustomParticle.cc
@@ -4,17 +4,37 @@
 // ###                           CustomParticle                       ###
 // ######################################################################
 
-CustomParticle::CustomParticle(
-       const G4String&     aName,        G4double            mass,
-       G4double            width,        G4double            charge,   
-       G4int               iSpin,        G4int               iParity,    
-       G4int               iConjugation, G4int               iIsospin,   
-       G4int               iIsospin3,    G4int               gParity,
-       const G4String&     pType,        G4int               lepton,      
-       G4int               baryon,       G4int               encoding,
-       G4bool              stable,       G4double            lifetime,
-       G4DecayTable        *decaytable )
- : G4ParticleDefinition( aName,mass,width,charge,iSpin,iParity,
-              iConjugation,iIsospin,iIsospin3,gParity,pType,
-              lepton,baryon,encoding,stable,lifetime,decaytable )
-{}
+CustomParticle::CustomParticle(const G4String& aName,
+                               G4double mass,
+                               G4double width,
+                               G4double charge,
+                               G4int iSpin,
+                               G4int iParity,
+                               G4int iConjugation,
+                               G4int iIsospin,
+                               G4int iIsospin3,
+                               G4int gParity,
+                               const G4String& pType,
+                               G4int lepton,
+                               G4int baryon,
+                               G4int encoding,
+                               G4bool stable,
+                               G4double lifetime,
+                               G4DecayTable* decaytable)
+    : G4ParticleDefinition(aName,
+                           mass,
+                           width,
+                           charge,
+                           iSpin,
+                           iParity,
+                           iConjugation,
+                           iIsospin,
+                           iIsospin3,
+                           gParity,
+                           pType,
+                           lepton,
+                           baryon,
+                           encoding,
+                           stable,
+                           lifetime,
+                           decaytable) {}
diff --git a/SimG4Core/CustomPhysics/src/CustomParticleFactory.cc b/SimG4Core/CustomPhysics/src/CustomParticleFactory.cc
index affaede56d7ba..de51a1bf84e66 100644
--- a/SimG4Core/CustomPhysics/src/CustomParticleFactory.cc
+++ b/SimG4Core/CustomPhysics/src/CustomParticleFactory.cc
@@ -23,123 +23,129 @@ std::vector<G4ParticleDefinition *> CustomParticleFactory::m_particles;
 G4Mutex CustomParticleFactory::customParticleFactoryMutex = G4MUTEX_INITIALIZER;
 #endif
 
-CustomParticleFactory::CustomParticleFactory()
-{}
+CustomParticleFactory::CustomParticleFactory() {}
 
-CustomParticleFactory::~CustomParticleFactory()
-{}
+CustomParticleFactory::~CustomParticleFactory() {}
 
-void CustomParticleFactory::loadCustomParticles(const std::string & filePath){
-
-  if(loaded) { return; }
+void CustomParticleFactory::loadCustomParticles(const std::string &filePath) {
+  if (loaded) {
+    return;
+  }
 #ifdef G4MULTITHREADED
   G4MUTEXLOCK(&customParticleFactoryMutex);
-  if(loaded) { return; } 
+  if (loaded) {
+    return;
+  }
 #endif
 
   // loading once
-  loaded = true; 
+  loaded = true;
   std::ifstream configFile(filePath.c_str());
 
   std::string line;
-  edm::LogInfo("SimG4CoreCustomPhysics") 
-    <<"CustomParticleFactory: Reading Custom Particle and G4DecayTable from \n" 
-    << filePath; 
-  // This should be compatible IMO to SLHA 
-  G4ParticleTable* theParticleTable = G4ParticleTable::GetParticleTable();
-  while(getline(configFile, line)){
-    line.erase(0, line.find_first_not_of(" \t"));            // Remove leading whitespace.
-    if (line.length()==0 || line.at(0) == '#') { continue; } // Skip blank lines and comments.  
+  edm::LogInfo("SimG4CoreCustomPhysics") << "CustomParticleFactory: Reading Custom Particle and G4DecayTable from \n"
+                                         << filePath;
+  // This should be compatible IMO to SLHA
+  G4ParticleTable *theParticleTable = G4ParticleTable::GetParticleTable();
+  while (getline(configFile, line)) {
+    line.erase(0, line.find_first_not_of(" \t"));  // Remove leading whitespace.
+    if (line.length() == 0 || line.at(0) == '#') {
+      continue;
+    }  // Skip blank lines and comments.
     // The mass table begins with a line containing "BLOCK MASS"
-    if (ToLower(line).find("block") < line.npos &&        
-	ToLower(line).find("mass")  < line.npos) {
-      edm::LogInfo("SimG4CoreCustomPhysics") <<"CustomParticleFactory: Retrieving mass table."; 
+    if (ToLower(line).find("block") < line.npos && ToLower(line).find("mass") < line.npos) {
+      edm::LogInfo("SimG4CoreCustomPhysics") << "CustomParticleFactory: Retrieving mass table.";
       getMassTable(&configFile);
     }
-    if(line.find("DECAY")<line.npos) {
+    if (line.find("DECAY") < line.npos) {
       int pdgId;
-      double width; 
+      double width;
       std::string tmpString;
       std::stringstream lineStream(line);
-      lineStream >> tmpString >> pdgId >> width; 
+      lineStream >> tmpString >> pdgId >> width;
       // assume SLHA format, e.g.: DECAY  1000021  5.50675438E+00   # gluino decays
-      edm::LogInfo("SimG4CoreCustomPhysics") 
-	<<"CustomParticleFactory: entry to G4DecayTable: pdgID, width " 
-	<< pdgId << ",  " << width; 
+      edm::LogInfo("SimG4CoreCustomPhysics")
+          << "CustomParticleFactory: entry to G4DecayTable: pdgID, width " << pdgId << ",  " << width;
       G4ParticleDefinition *aParticle = theParticleTable->FindParticle(pdgId);
-      if (!aParticle || width == 0.0) { continue; }    
-      G4DecayTable* aDecayTable = getDecayTable(&configFile, pdgId);      
-      aParticle->SetDecayTable(aDecayTable); 
+      if (!aParticle || width == 0.0) {
+        continue;
+      }
+      G4DecayTable *aDecayTable = getDecayTable(&configFile, pdgId);
+      aParticle->SetDecayTable(aDecayTable);
       aParticle->SetPDGStable(false);
-      aParticle->SetPDGLifeTime(1.0/(width*CLHEP::GeV)*6.582122e-22*CLHEP::MeV*CLHEP::s);      
+      aParticle->SetPDGLifeTime(1.0 / (width * CLHEP::GeV) * 6.582122e-22 * CLHEP::MeV * CLHEP::s);
       G4ParticleDefinition *aAntiParticle = theParticleTable->FindAntiParticle(pdgId);
-      if(aAntiParticle && aAntiParticle->GetPDGEncoding() != pdgId){	
-	aAntiParticle->SetDecayTable(getAntiDecayTable(pdgId,aDecayTable)); 
-	aAntiParticle->SetPDGStable(false);
-	aAntiParticle->SetPDGLifeTime(1.0/(width*CLHEP::GeV)*6.582122e-22*CLHEP::MeV*CLHEP::s);
+      if (aAntiParticle && aAntiParticle->GetPDGEncoding() != pdgId) {
+        aAntiParticle->SetDecayTable(getAntiDecayTable(pdgId, aDecayTable));
+        aAntiParticle->SetPDGStable(false);
+        aAntiParticle->SetPDGLifeTime(1.0 / (width * CLHEP::GeV) * 6.582122e-22 * CLHEP::MeV * CLHEP::s);
       }
     }
   }
 #ifdef G4MULTITHREADED
-  G4MUTEXUNLOCK(&customParticleFactoryMutex); 
+  G4MUTEXUNLOCK(&customParticleFactoryMutex);
 #endif
 }
 
-void CustomParticleFactory::addCustomParticle(int pdgCode, double mass, 
-                                              const std::string & name){
-  
-  if(std::abs(pdgCode)%100 <14 && std::abs(pdgCode)/1000000 == 0){
-    edm::LogError("CustomParticleFactory::addCustomParticle") 
-      << "Pdg code too low " << pdgCode << " "<<std::abs(pdgCode)/1000000; 
+void CustomParticleFactory::addCustomParticle(int pdgCode, double mass, const std::string &name) {
+  if (std::abs(pdgCode) % 100 < 14 && std::abs(pdgCode) / 1000000 == 0) {
+    edm::LogError("CustomParticleFactory::addCustomParticle")
+        << "Pdg code too low " << pdgCode << " " << std::abs(pdgCode) / 1000000;
     return;
   }
-    
+
   /////////////////////// Check!!!!!!!!!!!!!
-  G4String pType="custom";
-  G4String pSubType="";
+  G4String pType = "custom";
+  G4String pSubType = "";
   G4double spectatormass = 0.0;
-  G4ParticleDefinition* spectator = nullptr; 
+  G4ParticleDefinition *spectator = nullptr;
   //////////////////////
-  if(CustomPDGParser::s_isRHadron(pdgCode)) { pType = "rhadron"; }
-  if(CustomPDGParser::s_isSLepton(pdgCode)) { pType = "sLepton"; }
-  if(CustomPDGParser::s_isMesonino(pdgCode)){ pType = "mesonino"; }
-  if(CustomPDGParser::s_isSbaryon(pdgCode)) { pType = "sbaryon"; }
- 
-  double massGeV = mass*CLHEP::GeV;
-  double width   = 0.0;
-  double charge  = CLHEP::eplus* CustomPDGParser::s_charge(pdgCode);
-  if (name.compare(0,4,"~HIP") == 0)
-    {
-      if ((name.compare(0,7,"~HIPbar") == 0))  {
-	std::string str = name.substr(7); 
-	charge=CLHEP::eplus*atoi(str.c_str())/3.;
-      } else {
-	std::string str = name.substr(4); 
-	charge=-CLHEP::eplus*atoi(str.c_str())/3.;  
-      }
+  if (CustomPDGParser::s_isRHadron(pdgCode)) {
+    pType = "rhadron";
+  }
+  if (CustomPDGParser::s_isSLepton(pdgCode)) {
+    pType = "sLepton";
+  }
+  if (CustomPDGParser::s_isMesonino(pdgCode)) {
+    pType = "mesonino";
+  }
+  if (CustomPDGParser::s_isSbaryon(pdgCode)) {
+    pType = "sbaryon";
+  }
+
+  double massGeV = mass * CLHEP::GeV;
+  double width = 0.0;
+  double charge = CLHEP::eplus * CustomPDGParser::s_charge(pdgCode);
+  if (name.compare(0, 4, "~HIP") == 0) {
+    if ((name.compare(0, 7, "~HIPbar") == 0)) {
+      std::string str = name.substr(7);
+      charge = CLHEP::eplus * atoi(str.c_str()) / 3.;
+    } else {
+      std::string str = name.substr(4);
+      charge = -CLHEP::eplus * atoi(str.c_str()) / 3.;
     }
-  if (name.compare(0,9,"anti_~HIP") == 0)
-    {
-      if ((name.compare(0,12,"anti_~HIPbar") == 0))  {
-	std::string str = name.substr (12); 
-	charge=-CLHEP::eplus*atoi(str.c_str())/3.;
-      } else {
-	std::string str = name.substr (9); 
-	charge=CLHEP::eplus*atoi(str.c_str())/3.;  
-      }
+  }
+  if (name.compare(0, 9, "anti_~HIP") == 0) {
+    if ((name.compare(0, 12, "anti_~HIPbar") == 0)) {
+      std::string str = name.substr(12);
+      charge = -CLHEP::eplus * atoi(str.c_str()) / 3.;
+    } else {
+      std::string str = name.substr(9);
+      charge = CLHEP::eplus * atoi(str.c_str()) / 3.;
     }
-  int spin =  (int)CustomPDGParser::s_spin(pdgCode)-1;
+  }
+  int spin = (int)CustomPDGParser::s_spin(pdgCode) - 1;
   int parity = +1;
   int conjugation = 0;
   int isospin = 0;
   int isospinZ = 0;
   int gParity = 0;
   int lepton = 0;  //FIXME:
-  int baryon = 1;  //FIXME: 
+  int baryon = 1;  //FIXME:
   bool stable = true;
   double lifetime = -1;
 
-  if(CustomPDGParser::s_isDphoton(pdgCode)){
+  if (CustomPDGParser::s_isDphoton(pdgCode)) {
     pType = "darkpho";
     spin = 2;
     parity = -1;
@@ -148,276 +154,264 @@ void CustomParticleFactory::addCustomParticle(int pdgCode, double mass,
     isospinZ = 0;
     gParity = 0;
     lepton = 0;
-    baryon =0;
+    baryon = 0;
     stable = true;
     lifetime = -1;
-  }    
- 
+  }
+
   G4DecayTable *decaytable = nullptr;
-  G4ParticleTable* theParticleTable = G4ParticleTable::GetParticleTable();
-
-  CustomParticle *particle  = new CustomParticle(name, massGeV, width, charge, spin, 
-						 parity, conjugation, isospin, isospinZ,
-						 gParity, pType, lepton, baryon, pdgCode,
-						 stable, lifetime, decaytable);
- 
-  if(pType == "rhadron" && name!="~g"){  
-    G4String cloudname = name+"cloud";
-    G4String cloudtype = pType+"cloud";
+  G4ParticleTable *theParticleTable = G4ParticleTable::GetParticleTable();
+
+  CustomParticle *particle = new CustomParticle(name,
+                                                massGeV,
+                                                width,
+                                                charge,
+                                                spin,
+                                                parity,
+                                                conjugation,
+                                                isospin,
+                                                isospinZ,
+                                                gParity,
+                                                pType,
+                                                lepton,
+                                                baryon,
+                                                pdgCode,
+                                                stable,
+                                                lifetime,
+                                                decaytable);
+
+  if (pType == "rhadron" && name != "~g") {
+    G4String cloudname = name + "cloud";
+    G4String cloudtype = pType + "cloud";
     spectator = theParticleTable->FindParticle(1000021);
     spectatormass = spectator->GetPDGMass();
     G4double cloudmass = massGeV - spectatormass;
-    CustomParticle *tmpParticle  = new CustomParticle(
-						      cloudname,  cloudmass,     0.0,  0, 
-						      0,              +1,        0,          
-						      0,               0,        0,             
-						      cloudtype,       0,       +1,    0,
-						      true,           -1.0,    nullptr );
+    CustomParticle *tmpParticle =
+        new CustomParticle(cloudname, cloudmass, 0.0, 0, 0, +1, 0, 0, 0, 0, cloudtype, 0, +1, 0, true, -1.0, nullptr);
     particle->SetCloud(tmpParticle);
     particle->SetSpectator(spectator);
-    
+
     edm::LogInfo("SimG4CoreCustomPhysics")
-      <<"CustomParticleFactory: " <<name<<" being assigned spectator"
-      << spectator->GetParticleName() << " and cloud " <<cloudname << "\n" 
-      <<"                        Masses: "<<mass<<" Gev, "
-      <<spectatormass/CLHEP::GeV<<" GeV and "<<cloudmass/CLHEP::GeV<<" GeV."; 
-  } else if(pType == "mesonino" || pType == "sbaryon") {
-    int sign=1;
-    if(pdgCode < 0 ) sign=-1;
-
-    G4String cloudname = name+"cloud";
-    G4String cloudtype = pType+"cloud";
-    if(CustomPDGParser::s_isstopHadron(pdgCode)) {
-      spectator = theParticleTable->FindParticle(1000006*sign);
-    }
-    else { 
+        << "CustomParticleFactory: " << name << " being assigned spectator" << spectator->GetParticleName()
+        << " and cloud " << cloudname << "\n"
+        << "                        Masses: " << mass << " Gev, " << spectatormass / CLHEP::GeV << " GeV and "
+        << cloudmass / CLHEP::GeV << " GeV.";
+  } else if (pType == "mesonino" || pType == "sbaryon") {
+    int sign = 1;
+    if (pdgCode < 0)
+      sign = -1;
+
+    G4String cloudname = name + "cloud";
+    G4String cloudtype = pType + "cloud";
+    if (CustomPDGParser::s_isstopHadron(pdgCode)) {
+      spectator = theParticleTable->FindParticle(1000006 * sign);
+    } else {
       if (CustomPDGParser::s_issbottomHadron(pdgCode)) {
-	spectator = theParticleTable->FindParticle(1000005*sign);
+        spectator = theParticleTable->FindParticle(1000005 * sign);
       } else {
         spectator = nullptr;
-        edm::LogError("SimG4CoreCustomPhysics")<< "CustomParticleFactory: Cannot find spectator parton";
+        edm::LogError("SimG4CoreCustomPhysics") << "CustomParticleFactory: Cannot find spectator parton";
       }
     }
-    if(spectator) { spectatormass = spectator->GetPDGMass(); }
+    if (spectator) {
+      spectatormass = spectator->GetPDGMass();
+    }
     G4double cloudmass = massGeV - spectatormass;
-    CustomParticle *tmpParticle  = new CustomParticle(
-                                                      cloudname, cloudmass,    0.0,  0 ,
-                                                      0,              +1,      0,
-                                                      0,               0,      0,
-                                                      cloudtype,       0,     +1,     0,
-                                                      true,           -1.0,   nullptr);
+    CustomParticle *tmpParticle =
+        new CustomParticle(cloudname, cloudmass, 0.0, 0, 0, +1, 0, 0, 0, 0, cloudtype, 0, +1, 0, true, -1.0, nullptr);
     particle->SetCloud(tmpParticle);
     particle->SetSpectator(spectator);
 
-    if(spectator) edm::LogVerbatim("SimG4CoreCustomPhysics")
-      <<"CustomParticleFactory: " <<name<<" being assigned spectator"
-      << spectator->GetParticleName() << " and cloud " <<cloudname << "\n" 
-      <<"                        Masses: "<<mass<<" Gev, "
-      <<spectatormass/CLHEP::GeV<<" GeV and "<<cloudmass/CLHEP::GeV<<" GeV."; 
-  }
-  else{
+    if (spectator)
+      edm::LogVerbatim("SimG4CoreCustomPhysics")
+          << "CustomParticleFactory: " << name << " being assigned spectator" << spectator->GetParticleName()
+          << " and cloud " << cloudname << "\n"
+          << "                        Masses: " << mass << " Gev, " << spectatormass / CLHEP::GeV << " GeV and "
+          << cloudmass / CLHEP::GeV << " GeV.";
+  } else {
     particle->SetCloud(nullptr);
     particle->SetSpectator(nullptr);
-  } 
+  }
   m_particles.push_back(particle);
 }
 
-void  CustomParticleFactory::getMassTable(std::ifstream *configFile) {
-
+void CustomParticleFactory::getMassTable(std::ifstream *configFile) {
   int pdgId;
   double mass;
   std::string name, tmp;
   std::string line;
-  G4ParticleTable* theParticleTable = G4ParticleTable::GetParticleTable();
+  G4ParticleTable *theParticleTable = G4ParticleTable::GetParticleTable();
 
-  // This should be compatible IMO to SLHA 
-  while (getline(*configFile,line)) {
-    line.erase(0, line.find_first_not_of(" \t"));         // remove leading whitespace
-    if (line.length()==0 || line.at(0) == '#') continue;  // skip blank lines and comments
+  // This should be compatible IMO to SLHA
+  while (getline(*configFile, line)) {
+    line.erase(0, line.find_first_not_of(" \t"));  // remove leading whitespace
+    if (line.length() == 0 || line.at(0) == '#')
+      continue;  // skip blank lines and comments
     if (ToLower(line).find("block") < line.npos) {
-      edm::LogInfo("SimG4CoreCustomPhysics") 
-	<<"CustomParticleFactory: Finished the Mass Table "; 
+      edm::LogInfo("SimG4CoreCustomPhysics") << "CustomParticleFactory: Finished the Mass Table ";
       break;
     }
     std::stringstream sstr(line);
-    sstr >> pdgId >> mass >> tmp >> name;  // Assume SLHA format, e.g.: 1000001 5.68441109E+02 # ~d_L 
+    sstr >> pdgId >> mass >> tmp >> name;  // Assume SLHA format, e.g.: 1000001 5.68441109E+02 # ~d_L
 
     mass = std::max(mass, 0.0);
-    if(theParticleTable->FindParticle(pdgId)) { continue; }
+    if (theParticleTable->FindParticle(pdgId)) {
+      continue;
+    }
 
-    edm::LogInfo("SimG4CoreCustomPhysics") 
-      <<"CustomParticleFactory: Calling addCustomParticle for pdgId: " << pdgId 
-      << ", mass " << mass << " GeV  " <<  name 
-      << ", isRHadron: " << CustomPDGParser::s_isRHadron(pdgId)    
-      << ", isstopHadron: " << CustomPDGParser::s_isstopHadron(pdgId); 
+    edm::LogInfo("SimG4CoreCustomPhysics")
+        << "CustomParticleFactory: Calling addCustomParticle for pdgId: " << pdgId << ", mass " << mass << " GeV  "
+        << name << ", isRHadron: " << CustomPDGParser::s_isRHadron(pdgId)
+        << ", isstopHadron: " << CustomPDGParser::s_isstopHadron(pdgId);
     addCustomParticle(pdgId, mass, name);
 
     ////Find SM particle partner and check for the antiparticle.
-    int pdgIdPartner = pdgId%100;
+    int pdgIdPartner = pdgId % 100;
     G4ParticleDefinition *aParticle = theParticleTable->FindParticle(pdgIdPartner);
     //Add antiparticles for SUSY particles only, not for rHadrons.
-    if(aParticle) {
-      edm::LogInfo("SimG4CoreCustomPhysics") 
-	<<"CustomParticleFactory: Found partner particle for " << " pdgId= " << pdgId
-	<< ", pdgIdPartner= " << pdgIdPartner << " " << aParticle->GetParticleName();
+    if (aParticle) {
+      edm::LogInfo("SimG4CoreCustomPhysics")
+          << "CustomParticleFactory: Found partner particle for "
+          << " pdgId= " << pdgId << ", pdgIdPartner= " << pdgIdPartner << " " << aParticle->GetParticleName();
     }
-    
-    if (aParticle && 
-	!CustomPDGParser::s_isRHadron(pdgId)    && 
-	!CustomPDGParser::s_isstopHadron(pdgId) && 
-	pdgId!=1000006 && 
-	pdgId!=-1000006  && 
-	pdgId!=25 && 
-	pdgId!=35 && 
-	pdgId!=36 && 
-	pdgId!=37){ 
-      int sign = aParticle->GetAntiPDGEncoding()/pdgIdPartner;   
-      edm::LogInfo("SimG4CoreCustomPhysics") 
-	<<"CustomParticleFactory: For " << aParticle->GetParticleName()
-	<<" pdg= " << pdgIdPartner 
-	<< ", GetAntiPDGEncoding() " << aParticle->GetAntiPDGEncoding() 
-	<< " sign= " << sign;
-
-      if(std::abs(sign)!=1) {
-	edm::LogInfo("SimG4CoreCustomPhysics")
-	  <<"CustomParticleFactory: sign= "<<sign<<" a: "
-	  <<aParticle->GetAntiPDGEncoding()<<" b: "<<pdgIdPartner; 
-	aParticle->DumpTable();
-      }
-      if(sign==-1 && pdgId!=25 && pdgId!=35 && pdgId!=36 && pdgId!=37 && pdgId!=1000039){
-	tmp = "anti_"+name;
-	if(!theParticleTable->FindParticle(-pdgId)) {
-	  edm::LogInfo("SimG4CoreCustomPhysics") 
-	    <<"CustomParticleFactory: Calling addCustomParticle for antiparticle with pdgId: " 
-	    << -pdgId << ", mass " << mass << " GeV, name " << tmp; 
-	  addCustomParticle(-pdgId, mass, tmp);
-	  theParticleTable->FindParticle(pdgId)->SetAntiPDGEncoding(-pdgId);
-	}
+
+    if (aParticle && !CustomPDGParser::s_isRHadron(pdgId) && !CustomPDGParser::s_isstopHadron(pdgId) &&
+        pdgId != 1000006 && pdgId != -1000006 && pdgId != 25 && pdgId != 35 && pdgId != 36 && pdgId != 37) {
+      int sign = aParticle->GetAntiPDGEncoding() / pdgIdPartner;
+      edm::LogInfo("SimG4CoreCustomPhysics")
+          << "CustomParticleFactory: For " << aParticle->GetParticleName() << " pdg= " << pdgIdPartner
+          << ", GetAntiPDGEncoding() " << aParticle->GetAntiPDGEncoding() << " sign= " << sign;
+
+      if (std::abs(sign) != 1) {
+        edm::LogInfo("SimG4CoreCustomPhysics") << "CustomParticleFactory: sign= " << sign
+                                               << " a: " << aParticle->GetAntiPDGEncoding() << " b: " << pdgIdPartner;
+        aParticle->DumpTable();
       }
-      else theParticleTable->FindParticle(pdgId)->SetAntiPDGEncoding(pdgId);      
+      if (sign == -1 && pdgId != 25 && pdgId != 35 && pdgId != 36 && pdgId != 37 && pdgId != 1000039) {
+        tmp = "anti_" + name;
+        if (!theParticleTable->FindParticle(-pdgId)) {
+          edm::LogInfo("SimG4CoreCustomPhysics")
+              << "CustomParticleFactory: Calling addCustomParticle for antiparticle with pdgId: " << -pdgId << ", mass "
+              << mass << " GeV, name " << tmp;
+          addCustomParticle(-pdgId, mass, tmp);
+          theParticleTable->FindParticle(pdgId)->SetAntiPDGEncoding(-pdgId);
+        }
+      } else
+        theParticleTable->FindParticle(pdgId)->SetAntiPDGEncoding(pdgId);
     }
-    
-    if(pdgId==1000039) theParticleTable->FindParticle(pdgId)->SetAntiPDGEncoding(pdgId); // gravitino     
-    if(pdgId==1000024 || pdgId==1000037 || pdgId==37) {   
-      tmp = "anti_"+name;
-      if(!theParticleTable->FindParticle(-pdgId)) {
-	edm::LogInfo("SimG4CoreCustomPhysics") 
-	  <<"CustomParticleFactory: Calling addCustomParticle for antiparticle (2) with pdgId: " 
-	  << -pdgId << ", mass " << mass << " GeV, name " << tmp; 
-	addCustomParticle(-pdgId, mass, tmp);
-	theParticleTable->FindParticle(pdgId)->SetAntiPDGEncoding(-pdgId);
+
+    if (pdgId == 1000039)
+      theParticleTable->FindParticle(pdgId)->SetAntiPDGEncoding(pdgId);  // gravitino
+    if (pdgId == 1000024 || pdgId == 1000037 || pdgId == 37) {
+      tmp = "anti_" + name;
+      if (!theParticleTable->FindParticle(-pdgId)) {
+        edm::LogInfo("SimG4CoreCustomPhysics")
+            << "CustomParticleFactory: Calling addCustomParticle for antiparticle (2) with pdgId: " << -pdgId
+            << ", mass " << mass << " GeV, name " << tmp;
+        addCustomParticle(-pdgId, mass, tmp);
+        theParticleTable->FindParticle(pdgId)->SetAntiPDGEncoding(-pdgId);
       }
     }
   }
 }
 
-G4DecayTable*  CustomParticleFactory::getDecayTable(std::ifstream *configFile, int pdgId) {
-
+G4DecayTable *CustomParticleFactory::getDecayTable(std::ifstream *configFile, int pdgId) {
   double br;
   int nDaughters;
   int pdg[4] = {0};
   std::string line;
 
-  G4ParticleTable* theParticleTable = G4ParticleTable::GetParticleTable();
+  G4ParticleTable *theParticleTable = G4ParticleTable::GetParticleTable();
 
   std::string parentName = theParticleTable->FindParticle(pdgId)->GetParticleName();
-  G4DecayTable *decaytable= new G4DecayTable();
-
-  while(getline(*configFile,line)) {
-    
-    line.erase(0, line.find_first_not_of(" \t"));         // remove leading whitespace
-    if (line.length()==0) continue;                       // skip blank lines 
-    if (line.at(0) == '#' && 
-	ToLower(line).find("br")  < line.npos &&
-	ToLower(line).find("nda") < line.npos) continue;  // skip a comment of the form:  # BR  NDA  ID1  ID2
-    if (line.at(0) == '#' || ToLower(line).find("block") < line.npos) {   
-      edm::LogInfo("SimG4CoreCustomPhysics") <<"CustomParticleFactory: Finished the Decay Table "; 
+  G4DecayTable *decaytable = new G4DecayTable();
+
+  while (getline(*configFile, line)) {
+    line.erase(0, line.find_first_not_of(" \t"));  // remove leading whitespace
+    if (line.length() == 0)
+      continue;  // skip blank lines
+    if (line.at(0) == '#' && ToLower(line).find("br") < line.npos && ToLower(line).find("nda") < line.npos)
+      continue;  // skip a comment of the form:  # BR  NDA  ID1  ID2
+    if (line.at(0) == '#' || ToLower(line).find("block") < line.npos) {
+      edm::LogInfo("SimG4CoreCustomPhysics") << "CustomParticleFactory: Finished the Decay Table ";
       break;
     }
 
-    std::stringstream sstr(line);  
+    std::stringstream sstr(line);
     sstr >> br >> nDaughters;  // assume SLHA format, e.g.:  1.49435135E-01  2  -15  16  # BR(H+ -> tau+ nu_tau)
-    LogDebug("SimG4CoreCustomPhysics") 
-      <<"CustomParticleFactory: Branching Ratio: " << br << ", Number of Daughters: " << nDaughters; 
+    LogDebug("SimG4CoreCustomPhysics") << "CustomParticleFactory: Branching Ratio: " << br
+                                       << ", Number of Daughters: " << nDaughters;
     if (nDaughters > 4) {
-      edm::LogError("SimG4CoreCustomPhysics") 
-	<<"CustomParticleFactory: Number of daughters is too large (max = 4): " << nDaughters 
-	<< " for pdgId: " << pdgId; 
-      break; 
+      edm::LogError("SimG4CoreCustomPhysics")
+          << "CustomParticleFactory: Number of daughters is too large (max = 4): " << nDaughters
+          << " for pdgId: " << pdgId;
+      break;
     }
     if (br <= 0.0) {
-      edm::LogError("SimG4CoreCustomPhysics") 
-	<<"CustomParticleFactory: Branching ratio is " << br  
-	<< " for pdgId: " << pdgId; 
-      break; 
+      edm::LogError("SimG4CoreCustomPhysics")
+          << "CustomParticleFactory: Branching ratio is " << br << " for pdgId: " << pdgId;
+      break;
     }
     std::string name[4] = {""};
-    for(int i=0; i<nDaughters; ++i) {
+    for (int i = 0; i < nDaughters; ++i) {
       sstr >> pdg[i];
-      LogDebug("SimG4CoreCustomPhysics") <<"CustomParticleFactory: Daughter ID " << pdg[i]; 
-      const G4ParticleDefinition* part = theParticleTable->FindParticle(pdg[i]);
+      LogDebug("SimG4CoreCustomPhysics") << "CustomParticleFactory: Daughter ID " << pdg[i];
+      const G4ParticleDefinition *part = theParticleTable->FindParticle(pdg[i]);
       if (!part) {
-	edm::LogWarning("SimG4CoreCustomPhysics")
-	  <<"CustomParticleFactory: particle with PDG code"<<pdg[i] <<" not found!"; 
-	continue;
+        edm::LogWarning("SimG4CoreCustomPhysics")
+            << "CustomParticleFactory: particle with PDG code" << pdg[i] << " not found!";
+        continue;
       }
       name[i] = part->GetParticleName();
     }
     ////Set the G4 decay
-    G4PhaseSpaceDecayChannel *aDecayChannel = new G4PhaseSpaceDecayChannel(parentName, br, nDaughters,
-									   name[0],name[1],name[2],name[3]);
-    decaytable->Insert(aDecayChannel);  
-    edm::LogInfo("SimG4CoreCustomPhysics") <<"CustomParticleFactory: inserted decay channel "
-					   <<" for pdgID= " << pdgId << "  " << parentName
-					   <<" BR= " << br << " Daughters: " << name[0] 
-					   <<"  " << name[1]<< "  " << name[2]<< "  " << name[3]; 
+    G4PhaseSpaceDecayChannel *aDecayChannel =
+        new G4PhaseSpaceDecayChannel(parentName, br, nDaughters, name[0], name[1], name[2], name[3]);
+    decaytable->Insert(aDecayChannel);
+    edm::LogInfo("SimG4CoreCustomPhysics")
+        << "CustomParticleFactory: inserted decay channel "
+        << " for pdgID= " << pdgId << "  " << parentName << " BR= " << br << " Daughters: " << name[0] << "  "
+        << name[1] << "  " << name[2] << "  " << name[3];
   }
   return decaytable;
 }
 
-G4DecayTable*  CustomParticleFactory::getAntiDecayTable(int pdgId,  G4DecayTable *theDecayTable) {
-
+G4DecayTable *CustomParticleFactory::getAntiDecayTable(int pdgId, G4DecayTable *theDecayTable) {
   std::string name[4] = {""};
-  G4ParticleTable* theParticleTable = G4ParticleTable::GetParticleTable();
+  G4ParticleTable *theParticleTable = G4ParticleTable::GetParticleTable();
 
   std::string parentName = theParticleTable->FindParticle(-pdgId)->GetParticleName();
-  G4DecayTable *decaytable= new G4DecayTable();
+  G4DecayTable *decaytable = new G4DecayTable();
 
-  for(int i=0;i<theDecayTable->entries(); ++i){
-    G4VDecayChannel *theDecayChannel = theDecayTable->GetDecayChannel(i); 
+  for (int i = 0; i < theDecayTable->entries(); ++i) {
+    G4VDecayChannel *theDecayChannel = theDecayTable->GetDecayChannel(i);
     int nd = std::min(4, theDecayChannel->GetNumberOfDaughters());
-    for(int j=0; j<nd; ++j){
+    for (int j = 0; j < nd; ++j) {
       int id = theDecayChannel->GetDaughter(j)->GetAntiPDGEncoding();
-      const G4ParticleDefinition* part = theParticleTable->FindParticle(id);
+      const G4ParticleDefinition *part = theParticleTable->FindParticle(id);
       if (!part) {
-	edm::LogWarning("SimG4CoreCustomPhysics")
-	  <<"CustomParticleFactory: antiparticle with PDG code"<<id <<" not found!"; 
-	continue;
+        edm::LogWarning("SimG4CoreCustomPhysics")
+            << "CustomParticleFactory: antiparticle with PDG code" << id << " not found!";
+        continue;
       }
       name[j] = part->GetParticleName();
     }
-    G4PhaseSpaceDecayChannel *aDecayChannel = 
-      new G4PhaseSpaceDecayChannel(parentName, 
-				   theDecayChannel->GetBR(), nd,
-				   name[0],name[1],name[2],name[3]);  
+    G4PhaseSpaceDecayChannel *aDecayChannel =
+        new G4PhaseSpaceDecayChannel(parentName, theDecayChannel->GetBR(), nd, name[0], name[1], name[2], name[3]);
     decaytable->Insert(aDecayChannel);
-    edm::LogInfo("SimG4CoreCustomPhysics") <<"CustomParticleFactory: inserted decay channel "
-					   <<" for pdgID= " << -pdgId << "  " << parentName
-					   <<" BR= " << theDecayChannel->GetBR() 
-					   << " Daughters: " << name[0] 
-					   <<"  " << name[1]<< "  " << name[2]<< "  " << name[3]; 
+    edm::LogInfo("SimG4CoreCustomPhysics")
+        << "CustomParticleFactory: inserted decay channel "
+        << " for pdgID= " << -pdgId << "  " << parentName << " BR= " << theDecayChannel->GetBR()
+        << " Daughters: " << name[0] << "  " << name[1] << "  " << name[2] << "  " << name[3];
   }
   return decaytable;
 }
 
 std::string CustomParticleFactory::ToLower(std::string str) {
   std::locale loc;
-  for (std::string::size_type i=0; i<str.length(); ++i)
-    str.at(i) = std::tolower(str.at(i),loc);
-  return str; 	
+  for (std::string::size_type i = 0; i < str.length(); ++i)
+    str.at(i) = std::tolower(str.at(i), loc);
+  return str;
 }
 
-const std::vector<G4ParticleDefinition *>& CustomParticleFactory::GetCustomParticles()
-{
-  return m_particles;
-}
+const std::vector<G4ParticleDefinition *> &CustomParticleFactory::GetCustomParticles() { return m_particles; }
diff --git a/SimG4Core/CustomPhysics/src/CustomPhysics.cc b/SimG4Core/CustomPhysics/src/CustomPhysics.cc
index 5ffc8f414d029..6d03ab6dacd96 100644
--- a/SimG4Core/CustomPhysics/src/CustomPhysics.cc
+++ b/SimG4Core/CustomPhysics/src/CustomPhysics.cc
@@ -8,26 +8,24 @@
 #include "G4EmExtraPhysics.hh"
 #include "G4IonPhysics.hh"
 #include "G4StoppingPhysics.hh"
-#include "G4HadronElasticPhysics.hh" 
+#include "G4HadronElasticPhysics.hh"
 #include "G4NeutronTrackingCut.hh"
 
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsFTFP_BERT.hh"
 #include "G4SystemOfUnits.hh"
- 
-CustomPhysics::CustomPhysics(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
 
+CustomPhysics::CustomPhysics(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
 
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool tracking= p.getParameter<bool>("TrackingCut");
-  bool ssPhys  = p.getUntrackedParameter<bool>("ExoticaPhysicsSS",false);
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*ns;
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool tracking = p.getParameter<bool>("TrackingCut");
+  bool ssPhys = p.getUntrackedParameter<bool>("ExoticaPhysicsSS", false);
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "FTFP_BERT_EMM for regular particles \n"
-			      << "CustomPhysicsList " << ssPhys << " for exotics; "
-                              << " tracking cut " << tracking << "  t(ns)= " << timeLimit/ns;
+                              << "FTFP_BERT_EMM for regular particles \n"
+                              << "CustomPhysicsList " << ssPhys << " for exotics; "
+                              << " tracking cut " << tracking << "  t(ns)= " << timeLimit / ns;
   // EM Physics
   RegisterPhysics(new CMSEmStandardPhysicsLPM(ver));
 
@@ -38,7 +36,7 @@ CustomPhysics::CustomPhysics(const edm::ParameterSet & p)
   RegisterPhysics(new G4DecayPhysics(ver));
 
   // Hadron Elastic scattering
-  RegisterPhysics(new G4HadronElasticPhysics(ver)); 
+  RegisterPhysics(new G4HadronElasticPhysics(ver));
 
   // Hadron Physics
   RegisterPhysics(new G4HadronPhysicsFTFP_BERT(ver));
@@ -51,15 +49,15 @@ CustomPhysics::CustomPhysics(const edm::ParameterSet & p)
 
   // Neutron tracking cut
   if (tracking) {
-    G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+    G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
     ncut->SetTimeLimit(timeLimit);
     RegisterPhysics(ncut);
   }
 
   // Custom Physics
-  if(ssPhys) {
-    RegisterPhysics(new CustomPhysicsListSS("custom",p));
+  if (ssPhys) {
+    RegisterPhysics(new CustomPhysicsListSS("custom", p));
   } else {
-    RegisterPhysics(new CustomPhysicsList("custom",p));    
+    RegisterPhysics(new CustomPhysicsList("custom", p));
   }
 }
diff --git a/SimG4Core/CustomPhysics/src/CustomPhysicsList.cc b/SimG4Core/CustomPhysics/src/CustomPhysicsList.cc
index fb1b1b1a4d3eb..876512f1f2baa 100644
--- a/SimG4Core/CustomPhysics/src/CustomPhysicsList.cc
+++ b/SimG4Core/CustomPhysics/src/CustomPhysicsList.cc
@@ -20,12 +20,10 @@ using namespace CLHEP;
 
 G4ThreadLocal std::unique_ptr<G4ProcessHelper> CustomPhysicsList::myHelper;
 
-CustomPhysicsList::CustomPhysicsList(const std::string& name, 
-				     const edm::ParameterSet & p, bool apinew)  
-  :  G4VPhysicsConstructor(name) 
-{  
+CustomPhysicsList::CustomPhysicsList(const std::string& name, const edm::ParameterSet& p, bool apinew)
+    : G4VPhysicsConstructor(name) {
   myConfig = p;
-  if(apinew) {
+  if (apinew) {
     dfactor = p.getParameter<double>("DarkMPFactor");
     fHadronicInteraction = p.getParameter<bool>("RhadronPhysics");
   } else {
@@ -38,53 +36,49 @@ CustomPhysicsList::CustomPhysicsList(const std::string& name,
   fParticleFactory.reset(new CustomParticleFactory());
   myHelper.reset(nullptr);
 
-  edm::LogVerbatim("SimG4CoreCustomPhysics") 
-    << "CustomPhysicsList: Path for custom particle definition file: \n"
-    <<particleDefFilePath << "\n" << "      dark_factor= " << dfactor;
+  edm::LogVerbatim("SimG4CoreCustomPhysics") << "CustomPhysicsList: Path for custom particle definition file: \n"
+                                             << particleDefFilePath << "\n"
+                                             << "      dark_factor= " << dfactor;
 }
 
-CustomPhysicsList::~CustomPhysicsList() {
-}
- 
-void CustomPhysicsList::ConstructParticle(){
-  edm::LogVerbatim("SimG4CoreCustomPhysics") 
-    << "===== CustomPhysicsList::ConstructParticle ";
+CustomPhysicsList::~CustomPhysicsList() {}
+
+void CustomPhysicsList::ConstructParticle() {
+  edm::LogVerbatim("SimG4CoreCustomPhysics") << "===== CustomPhysicsList::ConstructParticle ";
   fParticleFactory.get()->loadCustomParticles(particleDefFilePath);
 }
- 
+
 void CustomPhysicsList::ConstructProcess() {
-  
-  edm::LogVerbatim("SimG4CoreCustomPhysics") 
-    <<"CustomPhysicsList: adding CustomPhysics processes "
-    << "for the list of particles";
+  edm::LogVerbatim("SimG4CoreCustomPhysics") << "CustomPhysicsList: adding CustomPhysics processes "
+                                             << "for the list of particles";
 
   G4PhysicsListHelper* ph = G4PhysicsListHelper::GetPhysicsListHelper();
 
-  for(auto particle : fParticleFactory.get()->GetCustomParticles()) {
+  for (auto particle : fParticleFactory.get()->GetCustomParticles()) {
     CustomParticle* cp = dynamic_cast<CustomParticle*>(particle);
-    if(cp) {
+    if (cp) {
       G4ProcessManager* pmanager = particle->GetProcessManager();
-      edm::LogVerbatim("SimG4CoreCustomPhysics") 
-	<<"CustomPhysicsList: " << particle->GetParticleName()
-	<<"  PDGcode= " << particle->GetPDGEncoding()
-	<< "  Mass= " << particle->GetPDGMass()/GeV  <<" GeV.";
-      if(pmanager) {
-	if(particle->GetPDGCharge() != 0.0) {
-	  ph->RegisterProcess(new G4hMultipleScattering, particle);
-	  ph->RegisterProcess(new G4hIonisation, particle);
-	}
-	if(cp->GetCloud() && fHadronicInteraction && 
-	   CustomPDGParser::s_isRHadron(particle->GetPDGEncoding())) {
-	  edm::LogVerbatim("SimG4CoreCustomPhysics") 
-	    <<"CustomPhysicsList: " << particle->GetParticleName()
-	    <<" CloudMass= " <<cp->GetCloud()->GetPDGMass()/GeV
-	    <<" GeV; SpectatorMass= " << cp->GetSpectator()->GetPDGMass()/GeV<<" GeV.";
-       
-          if(!myHelper.get()) { myHelper.reset(new G4ProcessHelper(myConfig, fParticleFactory.get())); }
-	  pmanager->AddDiscreteProcess(new FullModelHadronicProcess(myHelper.get()));
-	}
-        if(particle->GetParticleType()=="darkpho"){
-          CMSDarkPairProductionProcess * darkGamma = new CMSDarkPairProductionProcess(dfactor);
+      edm::LogVerbatim("SimG4CoreCustomPhysics")
+          << "CustomPhysicsList: " << particle->GetParticleName() << "  PDGcode= " << particle->GetPDGEncoding()
+          << "  Mass= " << particle->GetPDGMass() / GeV << " GeV.";
+      if (pmanager) {
+        if (particle->GetPDGCharge() != 0.0) {
+          ph->RegisterProcess(new G4hMultipleScattering, particle);
+          ph->RegisterProcess(new G4hIonisation, particle);
+        }
+        if (cp->GetCloud() && fHadronicInteraction && CustomPDGParser::s_isRHadron(particle->GetPDGEncoding())) {
+          edm::LogVerbatim("SimG4CoreCustomPhysics")
+              << "CustomPhysicsList: " << particle->GetParticleName()
+              << " CloudMass= " << cp->GetCloud()->GetPDGMass() / GeV
+              << " GeV; SpectatorMass= " << cp->GetSpectator()->GetPDGMass() / GeV << " GeV.";
+
+          if (!myHelper.get()) {
+            myHelper.reset(new G4ProcessHelper(myConfig, fParticleFactory.get()));
+          }
+          pmanager->AddDiscreteProcess(new FullModelHadronicProcess(myHelper.get()));
+        }
+        if (particle->GetParticleType() == "darkpho") {
+          CMSDarkPairProductionProcess* darkGamma = new CMSDarkPairProductionProcess(dfactor);
           pmanager->AddDiscreteProcess(darkGamma);
         }
       }
diff --git a/SimG4Core/CustomPhysics/src/CustomPhysicsListSS.cc b/SimG4Core/CustomPhysics/src/CustomPhysicsListSS.cc
index 5532a2ccf2eca..84fe8853a2825 100644
--- a/SimG4Core/CustomPhysics/src/CustomPhysicsListSS.cc
+++ b/SimG4Core/CustomPhysics/src/CustomPhysicsListSS.cc
@@ -22,13 +22,11 @@ using namespace CLHEP;
 
 G4ThreadLocal std::unique_ptr<G4Decay> CustomPhysicsListSS::fDecayProcess;
 G4ThreadLocal std::unique_ptr<G4ProcessHelper> CustomPhysicsListSS::myHelper;
- 
-CustomPhysicsListSS::CustomPhysicsListSS(const std::string& name,
-					 const edm::ParameterSet & p, bool apinew)  
-  :  G4VPhysicsConstructor(name) 
-{  
+
+CustomPhysicsListSS::CustomPhysicsListSS(const std::string& name, const edm::ParameterSet& p, bool apinew)
+    : G4VPhysicsConstructor(name) {
   myConfig = p;
-  if(apinew) {
+  if (apinew) {
     dfactor = p.getParameter<double>("DarkMPFactor");
     fHadronicInteraction = p.getParameter<bool>("RhadronPhysics");
   } else {
@@ -42,57 +40,51 @@ CustomPhysicsListSS::CustomPhysicsListSS(const std::string& name,
   fDecayProcess.reset(nullptr);
   myHelper.reset(nullptr);
 
-  edm::LogVerbatim("SimG4CoreCustomPhysics")
-    <<"CustomPhysicsListSS: Path for custom particle definition file: \n" 
-    <<particleDefFilePath;
+  edm::LogVerbatim("SimG4CoreCustomPhysics") << "CustomPhysicsListSS: Path for custom particle definition file: \n"
+                                             << particleDefFilePath;
 }
 
-CustomPhysicsListSS::~CustomPhysicsListSS() {
-}
- 
-void CustomPhysicsListSS::ConstructParticle(){
-  edm::LogVerbatim("SimG4CoreCustomPhysicsSS") 
-    << "===== CustomPhysicsList::ConstructParticle ";
+CustomPhysicsListSS::~CustomPhysicsListSS() {}
+
+void CustomPhysicsListSS::ConstructParticle() {
+  edm::LogVerbatim("SimG4CoreCustomPhysicsSS") << "===== CustomPhysicsList::ConstructParticle ";
   fParticleFactory.get()->loadCustomParticles(particleDefFilePath);
 }
- 
-void CustomPhysicsListSS::ConstructProcess() {
 
-  edm::LogVerbatim("SimG4CoreCustomPhysicsSS") 
-    <<"CustomPhysicsListSS: adding CustomPhysics processes";
+void CustomPhysicsListSS::ConstructProcess() {
+  edm::LogVerbatim("SimG4CoreCustomPhysicsSS") << "CustomPhysicsListSS: adding CustomPhysics processes";
 
   fDecayProcess.reset(new G4Decay());
   G4PhysicsListHelper* ph = G4PhysicsListHelper::GetPhysicsListHelper();
 
-  for(auto particle : fParticleFactory.get()->GetCustomParticles()) {
-
+  for (auto particle : fParticleFactory.get()->GetCustomParticles()) {
     CustomParticle* cp = dynamic_cast<CustomParticle*>(particle);
-    if(cp) {
+    if (cp) {
       G4ProcessManager* pmanager = particle->GetProcessManager();
-      edm::LogVerbatim("SimG4CoreCustomPhysics") 
-	<<"CustomPhysicsListSS: " << particle->GetParticleName()
-	<<" PDGcode= " << particle->GetPDGEncoding()
-	<< " Mass= " << particle->GetPDGMass()/GeV  <<" GeV.";
-      if(pmanager) {
-	if(particle->GetPDGCharge() != 0.0) {
-	  ph->RegisterProcess(new G4hMultipleScattering, particle);
-	  ph->RegisterProcess(new G4hIonisation, particle);
-	}
-	if(fDecayProcess.get()->IsApplicable(*particle)) {
-	  ph->RegisterProcess(fDecayProcess.get(), particle);
-	}
-	if(cp->GetCloud() && fHadronicInteraction &&
-	   CustomPDGParser::s_isRHadron(particle->GetPDGEncoding())) {
-	  edm::LogVerbatim("SimG4CoreCustomPhysics") 
-	    <<"CustomPhysicsListSS: " << particle->GetParticleName()
-	    <<" CloudMass= " <<cp->GetCloud()->GetPDGMass()/GeV
-	    <<" GeV; SpectatorMass= " << cp->GetSpectator()->GetPDGMass()/GeV <<" GeV.";
-       
-	  if(!myHelper.get()) { myHelper.reset(new G4ProcessHelper(myConfig, fParticleFactory.get())); }
-	  pmanager->AddDiscreteProcess(new FullModelHadronicProcess(myHelper.get()));
-	}
-        if(particle->GetParticleType()=="darkpho"){
-          CMSDarkPairProductionProcess * darkGamma = new CMSDarkPairProductionProcess(dfactor);
+      edm::LogVerbatim("SimG4CoreCustomPhysics")
+          << "CustomPhysicsListSS: " << particle->GetParticleName() << " PDGcode= " << particle->GetPDGEncoding()
+          << " Mass= " << particle->GetPDGMass() / GeV << " GeV.";
+      if (pmanager) {
+        if (particle->GetPDGCharge() != 0.0) {
+          ph->RegisterProcess(new G4hMultipleScattering, particle);
+          ph->RegisterProcess(new G4hIonisation, particle);
+        }
+        if (fDecayProcess.get()->IsApplicable(*particle)) {
+          ph->RegisterProcess(fDecayProcess.get(), particle);
+        }
+        if (cp->GetCloud() && fHadronicInteraction && CustomPDGParser::s_isRHadron(particle->GetPDGEncoding())) {
+          edm::LogVerbatim("SimG4CoreCustomPhysics")
+              << "CustomPhysicsListSS: " << particle->GetParticleName()
+              << " CloudMass= " << cp->GetCloud()->GetPDGMass() / GeV
+              << " GeV; SpectatorMass= " << cp->GetSpectator()->GetPDGMass() / GeV << " GeV.";
+
+          if (!myHelper.get()) {
+            myHelper.reset(new G4ProcessHelper(myConfig, fParticleFactory.get()));
+          }
+          pmanager->AddDiscreteProcess(new FullModelHadronicProcess(myHelper.get()));
+        }
+        if (particle->GetParticleType() == "darkpho") {
+          CMSDarkPairProductionProcess* darkGamma = new CMSDarkPairProductionProcess(dfactor);
           pmanager->AddDiscreteProcess(darkGamma);
         }
       }
diff --git a/SimG4Core/CustomPhysics/src/Decay3Body.cc b/SimG4Core/CustomPhysics/src/Decay3Body.cc
index f3db58c0e892b..a8521b2baad45 100644
--- a/SimG4Core/CustomPhysics/src/Decay3Body.cc
+++ b/SimG4Core/CustomPhysics/src/Decay3Body.cc
@@ -8,127 +8,124 @@
 #include "Math/GenVector/Rotation3D.h"
 #include "Math/GenVector/EulerAngles.h"
 #include "Math/GenVector/Boost.h"
-#include <vector> 
+#include <vector>
 #include <cmath>
 
 #include "Randomize.hh"
 
-Decay3Body::Decay3Body() {
-}
-
-Decay3Body::~Decay3Body() {
-}
+Decay3Body::Decay3Body() {}
 
+Decay3Body::~Decay3Body() {}
 
-void Decay3Body::doDecay(const G4LorentzVector & mother,
-                               G4LorentzVector & daughter1,
-                               G4LorentzVector & daughter2,
-                               G4LorentzVector & daughter3) {
-
+void Decay3Body::doDecay(const G4LorentzVector& mother,
+                         G4LorentzVector& daughter1,
+                         G4LorentzVector& daughter2,
+                         G4LorentzVector& daughter3) {
   double m0 = mother.m();
   double m1 = daughter1.m();
   double m2 = daughter2.m();
   double m3 = daughter3.m();
-  double sumM2 = m0*m0 + m1*m1 + m2*m2 + m3*m3;
+  double sumM2 = m0 * m0 + m1 * m1 + m2 * m2 + m3 * m3;
   double tolerance = 1.0e-9;
 
-  math::XYZTLorentzVectorD mmm(mother.px(),mother.py(),mother.pz(),mother.e());
+  math::XYZTLorentzVectorD mmm(mother.px(), mother.py(), mother.pz(), mother.e());
 
-  if (m0 < m1+m2+m3) {
-	std::cout << "Error: Daughters too heavy!" << std::endl;
-    std::cout << "M: " << m0/GeV <<
-       " < m1+m2+m3: " << m1/GeV + m2/GeV + m3/GeV << std::endl;
+  if (m0 < m1 + m2 + m3) {
+    std::cout << "Error: Daughters too heavy!" << std::endl;
+    std::cout << "M: " << m0 / GeV << " < m1+m2+m3: " << m1 / GeV + m2 / GeV + m3 / GeV << std::endl;
     return;
   } else {
-    double m2_12max = sqr(m0-m3);
-    double m2_12min = sqr(m1+m2);
-    double m2_23max = sqr(m0-m1);
-    double m2_23min = sqr(m2+m3);
+    double m2_12max = sqr(m0 - m3);
+    double m2_12min = sqr(m1 + m2);
+    double m2_23max = sqr(m0 - m1);
+    double m2_23min = sqr(m2 + m3);
 
-    double x1,x2;
+    double x1, x2;
     double m2_12 = 0.0;
     double m2_23 = 0.0;
-    double E2_12,E3_12;
-	double m2_23max_12,m2_23min_12;
+    double E2_12, E3_12;
+    double m2_23max_12, m2_23min_12;
 
     do {
-// Pick values for m2_12 and m2_23 uniformly:
+      // Pick values for m2_12 and m2_23 uniformly:
       x1 = G4UniformRand();
-      m2_12 = m2_12min + x1*(m2_12max-m2_12min);
+      m2_12 = m2_12min + x1 * (m2_12max - m2_12min);
       x2 = G4UniformRand();
-      m2_23 = m2_23min + x2*(m2_23max-m2_23min);
-
-// From the allowed range of m2_23 (given m2_12), determine if the point is valid:
-// (formulae taken from PDG booklet 2004 kinematics, page 305, Eqs. 38.22a+b)
-      E2_12 = (m2_12 - m1*m1 + m2*m2)/(2.0*sqrt(m2_12));
-      E3_12 = (m0*m0 - m2_12 - m3*m3)/(2.0*sqrt(m2_12));
-      m2_23max_12 = sqr(E2_12+E3_12)-sqr(sqrt(sqr(E2_12)-m2*m2)-sqrt(sqr(E3_12)-m3*m3));
-      m2_23min_12 = sqr(E2_12+E3_12)-sqr(sqrt(sqr(E2_12)-m2*m2)+sqrt(sqr(E3_12)-m3*m3));
+      m2_23 = m2_23min + x2 * (m2_23max - m2_23min);
+
+      // From the allowed range of m2_23 (given m2_12), determine if the point is valid:
+      // (formulae taken from PDG booklet 2004 kinematics, page 305, Eqs. 38.22a+b)
+      E2_12 = (m2_12 - m1 * m1 + m2 * m2) / (2.0 * sqrt(m2_12));
+      E3_12 = (m0 * m0 - m2_12 - m3 * m3) / (2.0 * sqrt(m2_12));
+      m2_23max_12 = sqr(E2_12 + E3_12) - sqr(sqrt(sqr(E2_12) - m2 * m2) - sqrt(sqr(E3_12) - m3 * m3));
+      m2_23min_12 = sqr(E2_12 + E3_12) - sqr(sqrt(sqr(E2_12) - m2 * m2) + sqrt(sqr(E3_12) - m3 * m3));
     } while ((m2_23 > m2_23max_12) || (m2_23 < m2_23min_12));
 
-// Determine the value of the third invariant mass squared:
+    // Determine the value of the third invariant mass squared:
     double m2_13 = sumM2 - m2_12 - m2_23;
 
-// Calculate the energy and size of the momentum of the three daughters:  
-    double e1 = (m0*m0 + m1*m1 - m2_23)/(2.0*m0);
-    double e2 = (m0*m0 + m2*m2 - m2_13)/(2.0*m0);
-    double e3 = (m0*m0 + m3*m3 - m2_12)/(2.0*m0);
-    double p1 = sqrt(e1*e1 - m1*m1);
-    double p2 = sqrt(e2*e2 - m2*m2);
-    double p3 = sqrt(e3*e3 - m3*m3);
-
-// Calculate cosine of the relative angles between the three daughters:
-    double cos12 = (m1*m1 + m2*m2 + 2.0*e1*e2 - m2_12)/(2.0*p1*p2);
-    double cos13 = (m1*m1 + m3*m3 + 2.0*e1*e3 - m2_13)/(2.0*p1*p3);
-    double cos23 = (m2*m2 + m3*m3 + 2.0*e2*e3 - m2_23)/(2.0*p2*p3);
-    if (fabs(cos12) > 1.0) std::cout << "Error: Undefined angle12!" << std::endl;
-    if (fabs(cos13) > 1.0) std::cout << "Error: Undefined angle13!" << std::endl;
-    if (fabs(cos23) > 1.0) std::cout << "Error: Undefined angle23!" << std::endl;
-
-// Find the four vectors of the particles in a chosen (i.e. simple) frame:
-    double xi    = 2.0 * pi * G4UniformRand();
-    math::XYZVectorD q1(0.0,0.0,p1);
-    math::XYZVectorD q2( sin(acos(cos12))*cos(xi)*p2, sin(acos(cos12))*sin(xi)*p2,cos12*p2);
-    math::XYZVectorD q3(-sin(acos(cos13))*cos(xi)*p3,-sin(acos(cos13))*sin(xi)*p3,cos13*p3);
-
-// Rotate all three daughters momentum with the angles theta and phi:
+    // Calculate the energy and size of the momentum of the three daughters:
+    double e1 = (m0 * m0 + m1 * m1 - m2_23) / (2.0 * m0);
+    double e2 = (m0 * m0 + m2 * m2 - m2_13) / (2.0 * m0);
+    double e3 = (m0 * m0 + m3 * m3 - m2_12) / (2.0 * m0);
+    double p1 = sqrt(e1 * e1 - m1 * m1);
+    double p2 = sqrt(e2 * e2 - m2 * m2);
+    double p3 = sqrt(e3 * e3 - m3 * m3);
+
+    // Calculate cosine of the relative angles between the three daughters:
+    double cos12 = (m1 * m1 + m2 * m2 + 2.0 * e1 * e2 - m2_12) / (2.0 * p1 * p2);
+    double cos13 = (m1 * m1 + m3 * m3 + 2.0 * e1 * e3 - m2_13) / (2.0 * p1 * p3);
+    double cos23 = (m2 * m2 + m3 * m3 + 2.0 * e2 * e3 - m2_23) / (2.0 * p2 * p3);
+    if (fabs(cos12) > 1.0)
+      std::cout << "Error: Undefined angle12!" << std::endl;
+    if (fabs(cos13) > 1.0)
+      std::cout << "Error: Undefined angle13!" << std::endl;
+    if (fabs(cos23) > 1.0)
+      std::cout << "Error: Undefined angle23!" << std::endl;
+
+    // Find the four vectors of the particles in a chosen (i.e. simple) frame:
+    double xi = 2.0 * pi * G4UniformRand();
+    math::XYZVectorD q1(0.0, 0.0, p1);
+    math::XYZVectorD q2(sin(acos(cos12)) * cos(xi) * p2, sin(acos(cos12)) * sin(xi) * p2, cos12 * p2);
+    math::XYZVectorD q3(-sin(acos(cos13)) * cos(xi) * p3, -sin(acos(cos13)) * sin(xi) * p3, cos13 * p3);
+
+    // Rotate all three daughters momentum with the angles theta and phi:
     double theta = acos(2.0 * G4UniformRand() - 1.0);
-    double phi   = 2.0 * pi * G4UniformRand();
-    double psi   = 2.0 * pi * G4UniformRand();
-    
-    ROOT::Math::EulerAngles ang(phi,theta,psi);
+    double phi = 2.0 * pi * G4UniformRand();
+    double psi = 2.0 * pi * G4UniformRand();
+
+    ROOT::Math::EulerAngles ang(phi, theta, psi);
     ROOT::Math::Rotation3D rot(ang);
 
-    math::XYZVectorD q1rot = rot*q1;
-    math::XYZVectorD q2rot = rot*q2;
-    math::XYZVectorD q3rot = rot*q3;
+    math::XYZVectorD q1rot = rot * q1;
+    math::XYZVectorD q2rot = rot * q2;
+    math::XYZVectorD q3rot = rot * q3;
 
-    math::XYZTLorentzVectorD daughter1_orig(q1rot.X(),q1rot.Y(),q1rot.Z(),e1);
-    math::XYZTLorentzVectorD daughter2_orig(q2rot.X(),q2rot.Y(),q2rot.Z(),e2);
-    math::XYZTLorentzVectorD daughter3_orig(q3rot.X(),q3rot.Y(),q3rot.Z(),e3);
+    math::XYZTLorentzVectorD daughter1_orig(q1rot.X(), q1rot.Y(), q1rot.Z(), e1);
+    math::XYZTLorentzVectorD daughter2_orig(q2rot.X(), q2rot.Y(), q2rot.Z(), e2);
+    math::XYZTLorentzVectorD daughter3_orig(q3rot.X(), q3rot.Y(), q3rot.Z(), e3);
 
     ROOT::Math::Boost cmboost(mmm.BoostToCM());
 
     // Check of total angle and momentum:
-    if (acos(cos12)+acos(cos13)+acos(cos23)-2.0*pi > tolerance)
-      std::cout << "Error: Total angle not 2pi! " <<
-	acos(cos12)+acos(cos13)+acos(cos23)-2.0*pi << std::endl;
-    if (fabs(daughter1_orig.px()+daughter2_orig.px()+daughter3_orig.px())/GeV > tolerance)
-      std::cout << "Error: Total 3B Px not conserved! " << 
-	(daughter1_orig.px()+daughter2_orig.px()+daughter3_orig.px())/GeV << std::endl;
-    if (fabs(daughter1_orig.py()+daughter2_orig.py()+daughter3_orig.py())/GeV > tolerance)
-      std::cout << "Error: Total 3B Py not conserved! " << 
-	(daughter1_orig.py()+daughter2_orig.py()+daughter3_orig.py())/GeV << std::endl;
-    if (fabs(daughter1_orig.pz()+daughter2_orig.pz()+daughter3_orig.pz())/GeV > tolerance)
-      std::cout << "Error: Total 3B Pz not conserved! " << 
-	(daughter1.pz()+daughter2.pz()+daughter3.pz())/GeV << std::endl;
-    
+    if (acos(cos12) + acos(cos13) + acos(cos23) - 2.0 * pi > tolerance)
+      std::cout << "Error: Total angle not 2pi! " << acos(cos12) + acos(cos13) + acos(cos23) - 2.0 * pi << std::endl;
+    if (fabs(daughter1_orig.px() + daughter2_orig.px() + daughter3_orig.px()) / GeV > tolerance)
+      std::cout << "Error: Total 3B Px not conserved! "
+                << (daughter1_orig.px() + daughter2_orig.px() + daughter3_orig.px()) / GeV << std::endl;
+    if (fabs(daughter1_orig.py() + daughter2_orig.py() + daughter3_orig.py()) / GeV > tolerance)
+      std::cout << "Error: Total 3B Py not conserved! "
+                << (daughter1_orig.py() + daughter2_orig.py() + daughter3_orig.py()) / GeV << std::endl;
+    if (fabs(daughter1_orig.pz() + daughter2_orig.pz() + daughter3_orig.pz()) / GeV > tolerance)
+      std::cout << "Error: Total 3B Pz not conserved! " << (daughter1.pz() + daughter2.pz() + daughter3.pz()) / GeV
+                << std::endl;
+
     // Boost the daughters back to the frame of the mother:
 
     math::XYZTLorentzVectorD temp1(cmboost(daughter1_orig));
     math::XYZTLorentzVectorD temp2(cmboost(daughter2_orig));
     math::XYZTLorentzVectorD temp3(cmboost(daughter3_orig));
-    
+
     daughter1.setPx(temp1.Px());
     daughter1.setPy(temp1.Py());
     daughter1.setPz(temp1.Pz());
@@ -148,8 +145,4 @@ void Decay3Body::doDecay(const G4LorentzVector & mother,
   }
 }
 
-
-double Decay3Body::sqr(double a) {
-  return a*a;
-}
-
+double Decay3Body::sqr(double a) { return a * a; }
diff --git a/SimG4Core/CustomPhysics/src/DummyChargeFlipProcess.cc b/SimG4Core/CustomPhysics/src/DummyChargeFlipProcess.cc
index 29b46e4a519b1..13d746dbecb85 100644
--- a/SimG4Core/CustomPhysics/src/DummyChargeFlipProcess.cc
+++ b/SimG4Core/CustomPhysics/src/DummyChargeFlipProcess.cc
@@ -6,65 +6,41 @@
 
 using namespace CLHEP;
 
-DummyChargeFlipProcess::
-DummyChargeFlipProcess(const G4String& processName) : 
-      G4HadronicProcess(processName)
-{
+DummyChargeFlipProcess::DummyChargeFlipProcess(const G4String& processName) : G4HadronicProcess(processName) {
   AddDataSet(new G4HadronElasticDataSet);
 }
 
-DummyChargeFlipProcess::~DummyChargeFlipProcess()
-{
-}
- 
-
-void DummyChargeFlipProcess::
-BuildPhysicsTable(const G4ParticleDefinition& aParticleType)
-{
-   if (!G4HadronicProcess::GetCrossSectionDataStore()) {
-      return;
-   }
-   G4HadronicProcess::GetCrossSectionDataStore()->BuildPhysicsTable(aParticleType);
-}
-
+DummyChargeFlipProcess::~DummyChargeFlipProcess() {}
 
-G4double DummyChargeFlipProcess::
-GetMicroscopicCrossSection(
-      const G4DynamicParticle* /*aParticle*/, const G4Element* element, G4double /*aTemp*/)
-{
-
-   return 30*millibarn*element->GetN(); 
+void DummyChargeFlipProcess::BuildPhysicsTable(const G4ParticleDefinition& aParticleType) {
+  if (!G4HadronicProcess::GetCrossSectionDataStore()) {
+    return;
+  }
+  G4HadronicProcess::GetCrossSectionDataStore()->BuildPhysicsTable(aParticleType);
 }
 
+G4double DummyChargeFlipProcess::GetMicroscopicCrossSection(const G4DynamicParticle* /*aParticle*/,
+                                                            const G4Element* element,
+                                                            G4double /*aTemp*/) {
+  return 30 * millibarn * element->GetN();
+}
 
-G4bool
-DummyChargeFlipProcess::
-IsApplicable(const G4ParticleDefinition& aParticleType)
-{
-   if(aParticleType.GetParticleType()  == "rhadron")
+G4bool DummyChargeFlipProcess::IsApplicable(const G4ParticleDefinition& aParticleType) {
+  if (aParticleType.GetParticleType() == "rhadron")
     return true;
   else
     return false;
 }
 
+void DummyChargeFlipProcess::DumpPhysicsTable(const G4ParticleDefinition& /*aParticleType*/) {}
 
-void 
-DummyChargeFlipProcess::
-DumpPhysicsTable(const G4ParticleDefinition& /*aParticleType*/)
-{
-
-}
-
-
-G4VParticleChange *DummyChargeFlipProcess::PostStepDoIt(
-  const G4Track &aTrack, const G4Step &/*aStep*/)
-{
-  G4ParticleChange * pc = new G4ParticleChange();
+G4VParticleChange* DummyChargeFlipProcess::PostStepDoIt(const G4Track& aTrack, const G4Step& /*aStep*/) {
+  G4ParticleChange* pc = new G4ParticleChange();
   pc->Initialize(aTrack);
   const G4DynamicParticle* aParticle = aTrack.GetDynamicParticle();
   //G4ParticleDefinition* aParticleDef = aParticle->GetDefinition();
 
-  G4double   ParentEnergy  = aParticle->GetTotalEnergy();
+  G4double ParentEnergy = aParticle->GetTotalEnergy();
   const G4ThreeVector& ParentDirection(aParticle->GetMomentumDirection());
 
   G4double energyDeposit = 0.0;
@@ -79,21 +55,18 @@ G4VParticleChange *DummyChargeFlipProcess::PostStepDoIt(
   // create a new track object
   G4ParticleTable* particleTable = G4ParticleTable::GetParticleTable();
   float randomParticle = G4UniformRand();
-  G4ParticleDefinition * newType;
-  if(randomParticle < 0.333)
-    newType=particleTable->FindParticle(1009213);
-  else if(randomParticle > 0.667)
-    newType=particleTable->FindParticle(-1009213);
+  G4ParticleDefinition* newType;
+  if (randomParticle < 0.333)
+    newType = particleTable->FindParticle(1009213);
+  else if (randomParticle > 0.667)
+    newType = particleTable->FindParticle(-1009213);
   else
-    newType=particleTable->FindParticle(1009113);
-     
+    newType = particleTable->FindParticle(1009113);
+
   G4cout << "RHADRON: New charge = " << newType->GetPDGCharge() << G4endl;
-       
-  G4DynamicParticle * newP =  new G4DynamicParticle(newType,ParentDirection,ParentEnergy);
-  G4Track* secondary = new G4Track( newP ,
-				    finalGlobalTime ,
-				    aTrack.GetPosition()
-				    );
+
+  G4DynamicParticle* newP = new G4DynamicParticle(newType, ParentDirection, ParentEnergy);
+  G4Track* secondary = new G4Track(newP, finalGlobalTime, aTrack.GetPosition());
   // switch on good for tracking flag
   secondary->SetGoodForTrackingFlag();
   secondary->SetTouchableHandle(thand);
@@ -101,12 +74,11 @@ G4VParticleChange *DummyChargeFlipProcess::PostStepDoIt(
   pc->AddSecondary(secondary);
 
   // Kill the parent particle
-  pc->ProposeTrackStatus( fStopAndKill ) ;
-  pc->ProposeLocalEnergyDeposit(energyDeposit); 
-  pc->ProposeGlobalTime( finalGlobalTime );
+  pc->ProposeTrackStatus(fStopAndKill);
+  pc->ProposeLocalEnergyDeposit(energyDeposit);
+  pc->ProposeGlobalTime(finalGlobalTime);
   // Clear NumberOfInteractionLengthLeft
   ClearNumberOfInteractionLengthLeft();
 
   return pc;
 }
-
diff --git a/SimG4Core/CustomPhysics/src/FullModelHadronicProcess.cc b/SimG4Core/CustomPhysics/src/FullModelHadronicProcess.cc
index adf64f8c2e239..1b59f3679afc1 100644
--- a/SimG4Core/CustomPhysics/src/FullModelHadronicProcess.cc
+++ b/SimG4Core/CustomPhysics/src/FullModelHadronicProcess.cc
@@ -10,56 +10,46 @@
 
 using namespace CLHEP;
 
-FullModelHadronicProcess::FullModelHadronicProcess(G4ProcessHelper * aHelper, 
-						   const G4String& processName) :
-  G4VDiscreteProcess(processName), theHelper(aHelper)
-{}
+FullModelHadronicProcess::FullModelHadronicProcess(G4ProcessHelper* aHelper, const G4String& processName)
+    : G4VDiscreteProcess(processName), theHelper(aHelper) {}
 
-FullModelHadronicProcess::~FullModelHadronicProcess()
-{}
-  
-G4bool FullModelHadronicProcess::IsApplicable(const G4ParticleDefinition& aP)
-{
-  return theHelper->ApplicabilityTester(aP);  
+FullModelHadronicProcess::~FullModelHadronicProcess() {}
+
+G4bool FullModelHadronicProcess::IsApplicable(const G4ParticleDefinition& aP) {
+  return theHelper->ApplicabilityTester(aP);
 }
 
-G4double FullModelHadronicProcess::GetMicroscopicCrossSection(const G4DynamicParticle *aParticle,
-							      const G4Element *anElement,
-							      G4double aTemp)
-{
+G4double FullModelHadronicProcess::GetMicroscopicCrossSection(const G4DynamicParticle* aParticle,
+                                                              const G4Element* anElement,
+                                                              G4double aTemp) {
   //Get the cross section for this particle/element combination from the ProcessHelper
-  G4double InclXsec = theHelper->GetInclusiveCrossSection(aParticle,anElement);
+  G4double InclXsec = theHelper->GetInclusiveCrossSection(aParticle, anElement);
   //  G4cout<<"Returned cross section from helper was: "<<InclXsec/millibarn<<" millibarn"<<G4endl;
   return InclXsec;
 }
 
-G4double FullModelHadronicProcess::GetMeanFreePath(const G4Track& aTrack, G4double, 
-						   G4ForceCondition*)
-{
-  G4Material *aMaterial = aTrack.GetMaterial();
-  const G4DynamicParticle *aParticle = aTrack.GetDynamicParticle();
+G4double FullModelHadronicProcess::GetMeanFreePath(const G4Track& aTrack, G4double, G4ForceCondition*) {
+  G4Material* aMaterial = aTrack.GetMaterial();
+  const G4DynamicParticle* aParticle = aTrack.GetDynamicParticle();
   G4double sigma = 0.0;
 
   G4int nElements = aMaterial->GetNumberOfElements();
-  
-  const G4double *theAtomicNumDensityVector =
-    aMaterial->GetAtomicNumDensityVector();
+
+  const G4double* theAtomicNumDensityVector = aMaterial->GetAtomicNumDensityVector();
   G4double aTemp = aMaterial->GetTemperature();
-  
-  for( G4int i=0; i<nElements; ++i )
-    {
-      G4double xSection =
-	GetMicroscopicCrossSection( aParticle, (*aMaterial->GetElementVector())[i], aTemp);
-      sigma += theAtomicNumDensityVector[i] * xSection;
-    }
+
+  for (G4int i = 0; i < nElements; ++i) {
+    G4double xSection = GetMicroscopicCrossSection(aParticle, (*aMaterial->GetElementVector())[i], aTemp);
+    sigma += theAtomicNumDensityVector[i] * xSection;
+  }
   G4double res = DBL_MAX;
-  if(sigma > 0.0) { res = 1./sigma; }
+  if (sigma > 0.0) {
+    res = 1. / sigma;
+  }
   return res;
 }
 
-G4VParticleChange* FullModelHadronicProcess::PostStepDoIt(const G4Track& aTrack,
-							  const G4Step&  aStep)
-{
+G4VParticleChange* FullModelHadronicProcess::PostStepDoIt(const G4Track& aTrack, const G4Step& aStep) {
   //  G4cout<<"**** Entering FullModelHadronicProcess::PostStepDoIt       ******"<<G4endl;
   const G4TouchableHandle& thisTouchable(aTrack.GetTouchableHandle());
 
@@ -75,9 +65,9 @@ G4VParticleChange* FullModelHadronicProcess::PostStepDoIt(const G4Track& aTrack,
   G4bool IncidentSurvives = false;
   G4bool TargetSurvives = false;
   G4Nucleus targetNucleus(aTrack.GetMaterial());
-  G4ParticleDefinition* outgoingRhadron=nullptr;
-  G4ParticleDefinition* outgoingCloud=nullptr;
-  G4ParticleDefinition* outgoingTarget=nullptr;
+  G4ParticleDefinition* outgoingRhadron = nullptr;
+  G4ParticleDefinition* outgoingCloud = nullptr;
+  G4ParticleDefinition* outgoingTarget = nullptr;
 
   G4ThreeVector p_0 = IncidentRhadron->GetMomentum();
   G4double e_kin_0 = IncidentRhadron->GetKineticEnergy();
@@ -92,28 +82,25 @@ G4VParticleChange* FullModelHadronicProcess::PostStepDoIt(const G4Track& aTrack,
   */
   cloudParticle->SetDefinition(CustomIncident->GetCloud());
 
-  if(cloudParticle->GetDefinition() == nullptr) 
-     {
-      G4cout << "FullModelHadronicProcess::PostStepDoIt  Definition of particle cloud not available!!" << G4endl;
-     }
+  if (cloudParticle->GetDefinition() == nullptr) {
+    G4cout << "FullModelHadronicProcess::PostStepDoIt  Definition of particle cloud not available!!" << G4endl;
+  }
   /*
   G4cout<<"Incoming particle was "<<IncidentRhadron->GetDefinition()->GetParticleName()
   <<". Corresponding cloud is "<<cloudParticle->GetDefinition()->GetParticleName()<<G4endl;
   G4cout<<"Kinetic energy was: "<<IncidentRhadron->GetKineticEnergy()/GeV<<" GeV"<<G4endl;
   */
-  double scale=cloudParticle->GetDefinition()->GetPDGMass()
-    /IncidentRhadron->GetDefinition()->GetPDGMass();
+  double scale = cloudParticle->GetDefinition()->GetPDGMass() / IncidentRhadron->GetDefinition()->GetPDGMass();
   //  G4cout<<"Mass ratio: "<<scale<<G4endl;
-  G4LorentzVector cloudMomentum(IncidentRhadron->GetMomentum()*scale,
-				cloudParticle->GetDefinition()->GetPDGMass());
-  G4LorentzVector gluinoMomentum(IncidentRhadron->GetMomentum()*(1.-scale),
-				 CustomIncident->GetSpectator()->GetPDGMass()); 
+  G4LorentzVector cloudMomentum(IncidentRhadron->GetMomentum() * scale, cloudParticle->GetDefinition()->GetPDGMass());
+  G4LorentzVector gluinoMomentum(IncidentRhadron->GetMomentum() * (1. - scale),
+                                 CustomIncident->GetSpectator()->GetPDGMass());
 
   //These two for getting CMS transforms later (histogramming purposes...)
   G4LorentzVector FullRhadron4Momentum = IncidentRhadron->Get4Momentum();
   const G4LorentzVector& Cloud4Momentum = cloudMomentum;
 
-  cloudParticle->Set4Momentum(cloudMomentum);         	
+  cloudParticle->Set4Momentum(cloudMomentum);
 
   G4DynamicParticle* OrgPart = cloudParticle;
 
@@ -131,59 +118,60 @@ G4VParticleChange* FullModelHadronicProcess::PostStepDoIt(const G4Track& aTrack,
   G4double ek = OrgPart->GetKineticEnergy();
   G4double amas = OrgPart->GetDefinition()->GetPDGMass();
   G4ThreeVector dir = (OrgPart->GetMomentum()).unit();
-  G4double tkin = targetNucleus.Cinema( ek );
+  G4double tkin = targetNucleus.Cinema(ek);
   ek += tkin;
-  
+
   // calculate black track energies
-  tkin = targetNucleus.EvaporationEffects( ek );  
-  ek -= tkin; 
+  tkin = targetNucleus.EvaporationEffects(ek);
+  ek -= tkin;
 
-  if(ek+gluinoMomentum.e()-gluinoMomentum.m()<=0.1*MeV||ek<=0.) {
+  if (ek + gluinoMomentum.e() - gluinoMomentum.m() <= 0.1 * MeV || ek <= 0.) {
     //Very rare event...
-    G4cout<<"Kinetic energy is sick"<<G4endl;
-    G4cout<<"Full R-hadron: "<<(ek+gluinoMomentum.e()-gluinoMomentum.m())/MeV<<" MeV" <<G4endl;
-    G4cout<<"Quark system: "<<ek/MeV<<" MeV"<<G4endl;
-    aParticleChange.ProposeTrackStatus( fStopButAlive ); // AR_NEWCODE_IMPORT
+    G4cout << "Kinetic energy is sick" << G4endl;
+    G4cout << "Full R-hadron: " << (ek + gluinoMomentum.e() - gluinoMomentum.m()) / MeV << " MeV" << G4endl;
+    G4cout << "Quark system: " << ek / MeV << " MeV" << G4endl;
+    aParticleChange.ProposeTrackStatus(fStopButAlive);  // AR_NEWCODE_IMPORT
     return &aParticleChange;
   }
-  OrgPart->SetKineticEnergy( ek );
-  G4double p = std::sqrt(ek*(ek + 2*amas));
+  OrgPart->SetKineticEnergy(ek);
+  G4double p = std::sqrt(ek * (ek + 2 * amas));
   OrgPart->SetMomentum(dir * p);
 
-  //Get the final state particles  
-  G4ParticleDefinition* aTarget; 
-  ReactionProduct rp = theHelper->GetFinalState(aTrack,aTarget);
+  //Get the final state particles
+  G4ParticleDefinition* aTarget;
+  ReactionProduct rp = theHelper->GetFinalState(aTrack, aTarget);
   G4bool force2to2 = false;
-  //  G4cout<<"Trying to get final state..."<<G4endl; 
-  while(rp.size()!=2 && force2to2){
-    rp = theHelper->GetFinalState(aTrack,aTarget);
+  //  G4cout<<"Trying to get final state..."<<G4endl;
+  while (rp.size() != 2 && force2to2) {
+    rp = theHelper->GetFinalState(aTrack, aTarget);
   }
   G4int NumberOfSecondaries = rp.size();
   //  G4cout<<"Multiplicity of selected final state: "<<rp.size()<<G4endl;
 
   //Getting CMS transforms. Boosting is done at histogram filling
-  G4LorentzVector Target4Momentum(0.,0.,0.,aTarget->GetPDGMass());
+  G4LorentzVector Target4Momentum(0., 0., 0., aTarget->GetPDGMass());
 
   G4LorentzVector psum_full = FullRhadron4Momentum + Target4Momentum;
   G4LorentzVector psum_cloud = Cloud4Momentum + Target4Momentum;
-  G4ThreeVector trafo_full_cms = (-1)*psum_full.boostVector();
-  G4ThreeVector trafo_cloud_cms = (-1)*psum_cloud.boostVector();
+  G4ThreeVector trafo_full_cms = (-1) * psum_full.boostVector();
+  G4ThreeVector trafo_cloud_cms = (-1) * psum_cloud.boostVector();
 
   // OK Let's make some particles :-)
   // We're not using them for anything yet, I know, but let's make sure the machinery is there
-  for(ReactionProduct::iterator it  = rp.begin();
-      it != rp.end(); ++it) {
+  for (ReactionProduct::iterator it = rp.begin(); it != rp.end(); ++it) {
     G4ParticleDefinition* tempDef = theParticleTable->FindParticle(*it);
     CustomParticle* tempCust = dynamic_cast<CustomParticle*>(tempDef);
-    if (tempDef==aTarget) TargetSurvives = true;
+    if (tempDef == aTarget)
+      TargetSurvives = true;
 
     //      if (tempDef->GetParticleType()=="rhadron")
-    if (tempCust!=nullptr) {
-      outgoingRhadron = tempDef; 
+    if (tempCust != nullptr) {
+      outgoingRhadron = tempDef;
       //Setting outgoing cloud definition
-      outgoingCloud=tempCust->GetCloud();
-      if(outgoingCloud == nullptr) {
-	G4cout << "FullModelHadronicProcess::PostStepDoIt  Definition of outgoing particle cloud not available!" << G4endl;
+      outgoingCloud = tempCust->GetCloud();
+      if (outgoingCloud == nullptr) {
+        G4cout << "FullModelHadronicProcess::PostStepDoIt  Definition of outgoing particle cloud not available!"
+               << G4endl;
       }
       /*
 	G4cout<<"Outgoing Rhadron is: "<<outgoingRhadron->GetParticleName()<<G4endl;
@@ -191,16 +179,19 @@ G4VParticleChange* FullModelHadronicProcess::PostStepDoIt(const G4Track& aTrack,
       */
     }
 
-    if (tempDef==G4Proton::Proton()||tempDef==G4Neutron::Neutron()) outgoingTarget = tempDef;
-    if (tempCust==nullptr&&rp.size()==2) outgoingTarget = tempDef;
-    if (tempDef->GetPDGEncoding()==theIncidentPDG) {
+    if (tempDef == G4Proton::Proton() || tempDef == G4Neutron::Neutron())
+      outgoingTarget = tempDef;
+    if (tempCust == nullptr && rp.size() == 2)
+      outgoingTarget = tempDef;
+    if (tempDef->GetPDGEncoding() == theIncidentPDG) {
       IncidentSurvives = true;
     } else {
       theParticleDefinitions.push_back(tempDef);
     }
   }
 
-  if (outgoingTarget==nullptr) outgoingTarget = theParticleTable->FindParticle(rp[1]);
+  if (outgoingTarget == nullptr)
+    outgoingTarget = theParticleTable->FindParticle(rp[1]);
 
   // A little debug information
   /*
@@ -214,31 +205,32 @@ G4VParticleChange* FullModelHadronicProcess::PostStepDoIt(const G4Track& aTrack,
   */
   // If the incident particle survives it is not a "secondary", although
   // it would probably be easier to fStopAndKill the track every time.
-  if(IncidentSurvives) NumberOfSecondaries--;
+  if (IncidentSurvives)
+    NumberOfSecondaries--;
   aParticleChange.SetNumberOfSecondaries(NumberOfSecondaries);
 
   // ADAPTED FROM G4LEPionMinusInelastic::ApplyYourself
   // It is bloody ugly, but such is the way of cut 'n' paste
 
   // Set up the incident
-  // This is where rotation to z-axis is done 
+  // This is where rotation to z-axis is done
   const G4HadProjectile* originalIncident = new G4HadProjectile(*OrgPart);
 
-  //Maybe I need to calculate trafo from R-hadron... Bollocks! Labframe does not move. CMS does.  
+  //Maybe I need to calculate trafo from R-hadron... Bollocks! Labframe does not move. CMS does.
   G4HadProjectile* org2 = new G4HadProjectile(*OrgPart);
   G4LorentzRotation trans = org2->GetTrafoToLab();
   delete org2;
-  
+
   // create the target particle
-  
-  G4DynamicParticle *originalTarget = new G4DynamicParticle;
+
+  G4DynamicParticle* originalTarget = new G4DynamicParticle;
   originalTarget->SetDefinition(aTarget);
-  
+
   G4ReactionProduct targetParticle(aTarget);
-  
-  G4ReactionProduct currentParticle(const_cast<G4ParticleDefinition *>(originalIncident->GetDefinition() ) );
-  currentParticle.SetMomentum( originalIncident->Get4Momentum().vect() );
-  currentParticle.SetKineticEnergy( originalIncident->GetKineticEnergy() );
+
+  G4ReactionProduct currentParticle(const_cast<G4ParticleDefinition*>(originalIncident->GetDefinition()));
+  currentParticle.SetMomentum(originalIncident->Get4Momentum().vect());
+  currentParticle.SetKineticEnergy(originalIncident->GetKineticEnergy());
 
   /*
   G4cout<<"After creation:"<<G4endl;
@@ -248,38 +240,42 @@ G4VParticleChange* FullModelHadronicProcess::PostStepDoIt(const G4Track& aTrack,
   */
 
   G4ReactionProduct modifiedOriginal = currentParticle;
-  
-  currentParticle.SetSide( 1 ); // incident always goes in forward hemisphere
-  targetParticle.SetSide( -1 );  // target always goes in backward hemisphere
+
+  currentParticle.SetSide(1);  // incident always goes in forward hemisphere
+  targetParticle.SetSide(-1);  // target always goes in backward hemisphere
   G4bool incidentHasChanged = false;
-  if (!IncidentSurvives) incidentHasChanged = true; //I wonder if I am supposed to do this...
+  if (!IncidentSurvives)
+    incidentHasChanged = true;  //I wonder if I am supposed to do this...
   G4bool targetHasChanged = false;
-  if (!TargetSurvives) targetHasChanged = true; //Ditto here
+  if (!TargetSurvives)
+    targetHasChanged = true;  //Ditto here
   G4bool quasiElastic = false;
-  if (rp.size()==2) quasiElastic = true; //Oh well...
-  G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> vec;  // vec will contain the secondary particles
+  if (rp.size() == 2)
+    quasiElastic = true;                                //Oh well...
+  G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> vec;  // vec will contain the secondary particles
   G4int vecLen = 0;
-  vec.Initialize( 0 );
-  
+  vec.Initialize(0);
+
   // I hope my understanding of "secondary" is correct here
   // I think that it entails only what is not a surviving incident of target
-  
-  for (G4int i = 0; i!=NumberOfSecondaries;i++){
-    if(theParticleDefinitions[i]!=aTarget 
-       && theParticleDefinitions[i]!=originalIncident->GetDefinition()
-       && theParticleDefinitions[i]!=outgoingRhadron
-       && theParticleDefinitions[i]!=outgoingTarget)
-      { 
-	G4ReactionProduct* pa = new G4ReactionProduct;
-	pa->SetDefinition( theParticleDefinitions[i] );
-	(G4UniformRand() < 0.5) ? pa->SetSide( -1 ) : pa->SetSide( 1 );
-	vec.SetElement( vecLen++, pa );
-      }
+
+  for (G4int i = 0; i != NumberOfSecondaries; i++) {
+    if (theParticleDefinitions[i] != aTarget && theParticleDefinitions[i] != originalIncident->GetDefinition() &&
+        theParticleDefinitions[i] != outgoingRhadron && theParticleDefinitions[i] != outgoingTarget) {
+      G4ReactionProduct* pa = new G4ReactionProduct;
+      pa->SetDefinition(theParticleDefinitions[i]);
+      (G4UniformRand() < 0.5) ? pa->SetSide(-1) : pa->SetSide(1);
+      vec.SetElement(vecLen++, pa);
+    }
   }
 
-  if (incidentHasChanged) currentParticle.SetDefinitionAndUpdateE( outgoingCloud );
-  if (incidentHasChanged) modifiedOriginal.SetDefinition( outgoingCloud );//Is this correct? It solves the "free energy" checking in ReactionDynamics
-  if (targetHasChanged) targetParticle.SetDefinitionAndUpdateE( outgoingTarget );
+  if (incidentHasChanged)
+    currentParticle.SetDefinitionAndUpdateE(outgoingCloud);
+  if (incidentHasChanged)
+    modifiedOriginal.SetDefinition(
+        outgoingCloud);  //Is this correct? It solves the "free energy" checking in ReactionDynamics
+  if (targetHasChanged)
+    targetParticle.SetDefinitionAndUpdateE(outgoingTarget);
 
   //  G4cout<<"Calling CalculateMomenta... "<<G4endl;
   /*
@@ -288,10 +284,17 @@ G4VParticleChange* FullModelHadronicProcess::PostStepDoIt(const G4Track& aTrack,
   G4cout<<"May be killed?: "<<currentParticle.GetMayBeKilled()<<G4endl;
   */
 
-  CalculateMomenta( vec, vecLen,
-		    originalIncident, originalTarget, modifiedOriginal,
-		    targetNucleus, currentParticle, targetParticle,
-		    incidentHasChanged, targetHasChanged, quasiElastic );
+  CalculateMomenta(vec,
+                   vecLen,
+                   originalIncident,
+                   originalTarget,
+                   modifiedOriginal,
+                   targetNucleus,
+                   currentParticle,
+                   targetParticle,
+                   incidentHasChanged,
+                   targetHasChanged,
+                   quasiElastic);
 
   //  G4cout <<"Cloud loss: "<<(e_temp-currentParticle.GetKineticEnergy())/GeV<<" GeV"<<G4endl;
 
@@ -322,9 +325,9 @@ G4VParticleChange* FullModelHadronicProcess::PostStepDoIt(const G4Track& aTrack,
   */
   // G4cout<<"Done!"<<G4endl;
 
-  aParticleChange.SetNumberOfSecondaries(vecLen+NumberOfSecondaries);
-  G4double e_kin=0;
-  G4LorentzVector cloud_p4_new; //Cloud 4-momentum in lab after collision
+  aParticleChange.SetNumberOfSecondaries(vecLen + NumberOfSecondaries);
+  G4double e_kin = 0;
+  G4LorentzVector cloud_p4_new;  //Cloud 4-momentum in lab after collision
   //  n++;
   //  G4cout << n << G4endl;
   /*
@@ -336,285 +339,270 @@ G4VParticleChange* FullModelHadronicProcess::PostStepDoIt(const G4Track& aTrack,
     //    n=0;
   }
   */
-  cloud_p4_new.setVectM(currentParticle.GetMomentum(),currentParticle.GetMass());
+  cloud_p4_new.setVectM(currentParticle.GetMomentum(), currentParticle.GetMass());
   cloud_p4_new *= trans;
 
-  G4LorentzVector cloud_p4_old_full = Cloud4Momentum; //quark system in CMS BEFORE collision
+  G4LorentzVector cloud_p4_old_full = Cloud4Momentum;  //quark system in CMS BEFORE collision
   cloud_p4_old_full.boost(trafo_full_cms);
-  G4LorentzVector cloud_p4_old_cloud = Cloud4Momentum; //quark system in cloud CMS BEFORE collision
+  G4LorentzVector cloud_p4_old_cloud = Cloud4Momentum;  //quark system in cloud CMS BEFORE collision
   cloud_p4_old_cloud.boost(trafo_cloud_cms);
-  G4LorentzVector cloud_p4_full = cloud_p4_new; //quark system in CMS AFTER collision
+  G4LorentzVector cloud_p4_full = cloud_p4_new;  //quark system in CMS AFTER collision
   cloud_p4_full.boost(trafo_full_cms);
-  G4LorentzVector cloud_p4_cloud = cloud_p4_new; //quark system in cloud CMS AFTER collision
+  G4LorentzVector cloud_p4_cloud = cloud_p4_new;  //quark system in cloud CMS AFTER collision
   cloud_p4_cloud.boost(trafo_cloud_cms);
 
-  G4LorentzVector p_g_cms = gluinoMomentum; //gluino in CMS BEFORE collision
+  G4LorentzVector p_g_cms = gluinoMomentum;  //gluino in CMS BEFORE collision
   p_g_cms.boost(trafo_full_cms);
 
   double e = cloud_p4_new.e() + gluinoMomentum.e();
-  if(outgoingRhadron) e += outgoingRhadron->GetPDGMass();
-  G4LorentzVector p4_new( cloud_p4_new.v() + gluinoMomentum.v(), e );
+  if (outgoingRhadron)
+    e += outgoingRhadron->GetPDGMass();
+  G4LorentzVector p4_new(cloud_p4_new.v() + gluinoMomentum.v(), e);
   //  G4cout<<"P4-diff: "<<(p4_new-cloud_p4_new-gluinoMomentum)/GeV<<", magnitude: "
   // <<(p4_new-cloud_p4_new-gluinoMomentum).m()/MeV<<" MeV" <<G4endl;
 
   G4ThreeVector p_new = p4_new.vect();
 
-  aParticleChange.ProposeLocalEnergyDeposit((p4_new-cloud_p4_new-gluinoMomentum).m());
+  aParticleChange.ProposeLocalEnergyDeposit((p4_new - cloud_p4_new - gluinoMomentum).m());
 
-  if( incidentHasChanged )
-    {
-      G4DynamicParticle* p0 = new G4DynamicParticle;
-      p0->SetDefinition( outgoingRhadron );
-      p0->SetMomentum( p_new ); 
-
-      // May need to run SetDefinitionAndUpdateE here...
-      G4Track* Track0 = new G4Track(p0,
-				    aTrack.GetGlobalTime(),
-				    aPosition);
-      Track0->SetTouchableHandle(thisTouchable);
-      aParticleChange.AddSecondary(Track0);
-      /*
+  if (incidentHasChanged) {
+    G4DynamicParticle* p0 = new G4DynamicParticle;
+    p0->SetDefinition(outgoingRhadron);
+    p0->SetMomentum(p_new);
+
+    // May need to run SetDefinitionAndUpdateE here...
+    G4Track* Track0 = new G4Track(p0, aTrack.GetGlobalTime(), aPosition);
+    Track0->SetTouchableHandle(thisTouchable);
+    aParticleChange.AddSecondary(Track0);
+    /*
       G4cout<<"Adding a particle "<<p0->GetDefinition()->GetParticleName()<<G4endl;
       G4cout<<"with momentum: "<<p0->GetMomentum()/GeV<<" GeV"<<G4endl;
       G4cout<<"and kinetic energy: "<<p0->GetKineticEnergy()/GeV<<" GeV"<<G4endl;
       */
-      if(p0->GetKineticEnergy()>e_kin_0) {
-	G4cout<<"ALAAAAARM!!! (incident changed from "
-	      <<IncidentRhadron->GetDefinition()->GetParticleName()
-	      <<" to "<<p0->GetDefinition()->GetParticleName()<<")"<<G4endl;
-	G4cout<<"Energy loss: "<<(e_kin_0-p0->GetKineticEnergy())/GeV
-	      <<" GeV (should be positive)"<<G4endl;
-	//Turns out problem is only in 2 -> 3 (Won't fix 2 -> 2 energy deposition)
-	if(rp.size()!=3) G4cout<<"DOUBLE ALAAAAARM!!!"<<G4endl;
-      } /*else {
+    if (p0->GetKineticEnergy() > e_kin_0) {
+      G4cout << "ALAAAAARM!!! (incident changed from " << IncidentRhadron->GetDefinition()->GetParticleName() << " to "
+             << p0->GetDefinition()->GetParticleName() << ")" << G4endl;
+      G4cout << "Energy loss: " << (e_kin_0 - p0->GetKineticEnergy()) / GeV << " GeV (should be positive)" << G4endl;
+      //Turns out problem is only in 2 -> 3 (Won't fix 2 -> 2 energy deposition)
+      if (rp.size() != 3)
+        G4cout << "DOUBLE ALAAAAARM!!!" << G4endl;
+    } /*else {
 	G4cout<<"NO ALAAAAARM!!!"<<G4endl;
 	}*/
-      if(std::abs(p0->GetKineticEnergy()-e_kin_0)>100*GeV) {
-	G4cout<<"Diff. too big"<<G4endl;
-      }
-      aParticleChange.ProposeTrackStatus( fStopAndKill );
+    if (std::abs(p0->GetKineticEnergy() - e_kin_0) > 100 * GeV) {
+      G4cout << "Diff. too big" << G4endl;
     }
-  else
-    {
-      G4double p = p_new.mag();
-      if( p > DBL_MIN )
-	aParticleChange.ProposeMomentumDirection( p_new.x()/p, p_new.y()/p, p_new.z()/p );
-      else
-	aParticleChange.ProposeMomentumDirection( 1.0, 0.0, 0.0 );
-    }
-  
+    aParticleChange.ProposeTrackStatus(fStopAndKill);
+  } else {
+    G4double p = p_new.mag();
+    if (p > DBL_MIN)
+      aParticleChange.ProposeMomentumDirection(p_new.x() / p, p_new.y() / p, p_new.z() / p);
+    else
+      aParticleChange.ProposeMomentumDirection(1.0, 0.0, 0.0);
+  }
+
   //    return G4VDiscreteProcess::PostStepDoIt( aTrack, aStep);
-  if( targetParticle.GetMass() > 0.0 )  // targetParticle can be eliminated in TwoBody
-    {
-      G4DynamicParticle *p1 = new G4DynamicParticle;
-      p1->SetDefinition( targetParticle.GetDefinition() );
-      //G4cout<<"Target secondary: "<<targetParticle.GetDefinition()->GetParticleName()<<G4endl;
-      G4ThreeVector momentum = targetParticle.GetMomentum();
-      momentum = momentum.rotate(cache,what);
-      p1->SetMomentum( momentum );
-      p1->SetMomentum( (trans*p1->Get4Momentum()).vect());
-      G4Track* Track1 = new G4Track(p1,
-				    aTrack.GetGlobalTime(),
-				    aPosition);
-      Track1->SetTouchableHandle(thisTouchable); 
-      aParticleChange.AddSecondary(Track1);
-    }
-  G4DynamicParticle *pa;
+  if (targetParticle.GetMass() > 0.0)  // targetParticle can be eliminated in TwoBody
+  {
+    G4DynamicParticle* p1 = new G4DynamicParticle;
+    p1->SetDefinition(targetParticle.GetDefinition());
+    //G4cout<<"Target secondary: "<<targetParticle.GetDefinition()->GetParticleName()<<G4endl;
+    G4ThreeVector momentum = targetParticle.GetMomentum();
+    momentum = momentum.rotate(cache, what);
+    p1->SetMomentum(momentum);
+    p1->SetMomentum((trans * p1->Get4Momentum()).vect());
+    G4Track* Track1 = new G4Track(p1, aTrack.GetGlobalTime(), aPosition);
+    Track1->SetTouchableHandle(thisTouchable);
+    aParticleChange.AddSecondary(Track1);
+  }
+  G4DynamicParticle* pa;
   /*
     G4cout<<"vecLen: "<<vecLen<<G4endl;
     G4cout<<"#sec's: "<<aParticleChange.GetNumberOfSecondaries()<<G4endl;
   */
-  
-  for(int i=0; i<vecLen; ++i )
-    {
-      pa = new G4DynamicParticle();
-      pa->SetDefinition( vec[i]->GetDefinition() );
-      pa->SetMomentum( vec[i]->GetMomentum() );
-      pa->Set4Momentum(trans*(pa->Get4Momentum()));
-      G4ThreeVector pvec = pa->GetMomentum();
-      G4Track* Trackn = new G4Track(pa,
-				    aTrack.GetGlobalTime(),
-				    aPosition);
-      Trackn->SetTouchableHandle(thisTouchable);
-      aParticleChange.AddSecondary(Trackn);
 
-      delete vec[i];
-    } 
+  for (int i = 0; i < vecLen; ++i) {
+    pa = new G4DynamicParticle();
+    pa->SetDefinition(vec[i]->GetDefinition());
+    pa->SetMomentum(vec[i]->GetMomentum());
+    pa->Set4Momentum(trans * (pa->Get4Momentum()));
+    G4ThreeVector pvec = pa->GetMomentum();
+    G4Track* Trackn = new G4Track(pa, aTrack.GetGlobalTime(), aPosition);
+    Trackn->SetTouchableHandle(thisTouchable);
+    aParticleChange.AddSecondary(Trackn);
+
+    delete vec[i];
+  }
 
-  // Histogram filling  
+  // Histogram filling
   const G4DynamicParticle* theRhadron = FindRhadron(&aParticleChange);
-  
-  if (theRhadron!=nullptr||IncidentSurvives) {      
+
+  if (theRhadron != nullptr || IncidentSurvives) {
     double E_new;
-    if(IncidentSurvives) {
+    if (IncidentSurvives) {
       E_new = e_kin;
     } else {
       E_new = theRhadron->GetKineticEnergy();
-      if(CustomPDGParser::s_isRMeson(theRhadron->GetDefinition()->GetPDGEncoding())
-	 !=CustomPDGParser::s_isRMeson(theIncidentPDG)
-	 ||
-	 CustomPDGParser::s_isMesonino(theRhadron->GetDefinition()->GetPDGEncoding())
-	 !=CustomPDGParser::s_isMesonino(theIncidentPDG)
-	 ) {
-	G4cout<<"Rm: "<<CustomPDGParser::s_isRMeson(theRhadron->GetDefinition()->GetPDGEncoding())
-	      <<" vs: "<<CustomPDGParser::s_isRMeson(theIncidentPDG)<<G4endl;
-	G4cout<<"Sm: "<<CustomPDGParser::s_isMesonino(theRhadron->GetDefinition()->GetPDGEncoding())
-	      <<" vs: "<<CustomPDGParser::s_isMesonino(theIncidentPDG)<<G4endl;
-
+      if (CustomPDGParser::s_isRMeson(theRhadron->GetDefinition()->GetPDGEncoding()) !=
+              CustomPDGParser::s_isRMeson(theIncidentPDG) ||
+          CustomPDGParser::s_isMesonino(theRhadron->GetDefinition()->GetPDGEncoding()) !=
+              CustomPDGParser::s_isMesonino(theIncidentPDG)) {
+        G4cout << "Rm: " << CustomPDGParser::s_isRMeson(theRhadron->GetDefinition()->GetPDGEncoding())
+               << " vs: " << CustomPDGParser::s_isRMeson(theIncidentPDG) << G4endl;
+        G4cout << "Sm: " << CustomPDGParser::s_isMesonino(theRhadron->GetDefinition()->GetPDGEncoding())
+               << " vs: " << CustomPDGParser::s_isMesonino(theIncidentPDG) << G4endl;
       }
     }
-      
+
     //Calculating relevant scattering angles.
-    G4LorentzVector p4_old_full = FullRhadron4Momentum; //R-hadron in CMS BEFORE collision
+    G4LorentzVector p4_old_full = FullRhadron4Momentum;  //R-hadron in CMS BEFORE collision
     p4_old_full.boost(trafo_full_cms);
-    G4LorentzVector p4_old_cloud = FullRhadron4Momentum; //R-hadron in cloud CMS BEFORE collision
+    G4LorentzVector p4_old_cloud = FullRhadron4Momentum;  //R-hadron in cloud CMS BEFORE collision
     p4_old_cloud.boost(trafo_cloud_cms);
-    G4LorentzVector p4_full = p4_new; //R-hadron in CMS AFTER collision
+    G4LorentzVector p4_full = p4_new;  //R-hadron in CMS AFTER collision
     //      G4cout<<p4_full.v()/GeV<<G4endl;
-    p4_full=p4_full.boost(trafo_full_cms);
+    p4_full = p4_full.boost(trafo_full_cms);
     // G4cout<<p4_full.m()<<" / "<<(cloud_p4_new+gluinoMomentum).boost(trafo_full_cms).m()<<G4endl;
-    G4LorentzVector p4_cloud = p4_new; //R-hadron in cloud CMS AFTER collision
+    G4LorentzVector p4_cloud = p4_new;  //R-hadron in cloud CMS AFTER collision
     p4_cloud.boost(trafo_cloud_cms);
 
-    G4double AbsDeltaE = E_0-E_new;
+    G4double AbsDeltaE = E_0 - E_new;
     //      G4cout <<"Energy loss: "<<AbsDeltaE/GeV<<G4endl;
-    if (AbsDeltaE > 10*GeV) {
-      G4cout<<"Energy loss larger than 10 GeV..."<<G4endl;
-      G4cout<<"E_0: "<<E_0/GeV<<" GeV"<<G4endl;
-      G4cout<<"E_new: "<<E_new/GeV<<" GeV"<<G4endl;
-      G4cout<<"Gamma: "<<IncidentRhadron->GetTotalEnergy()/IncidentRhadron->GetDefinition()->GetPDGMass()<<G4endl;
-      G4cout<<"x: "<<aPosition.x()/cm<<" cm"<<G4endl;
+    if (AbsDeltaE > 10 * GeV) {
+      G4cout << "Energy loss larger than 10 GeV..." << G4endl;
+      G4cout << "E_0: " << E_0 / GeV << " GeV" << G4endl;
+      G4cout << "E_new: " << E_new / GeV << " GeV" << G4endl;
+      G4cout << "Gamma: " << IncidentRhadron->GetTotalEnergy() / IncidentRhadron->GetDefinition()->GetPDGMass()
+             << G4endl;
+      G4cout << "x: " << aPosition.x() / cm << " cm" << G4endl;
     }
-  } 
+  }
   delete originalIncident;
   delete originalTarget;
   //  aParticleChange.DumpInfo();
   //  G4cout << "Exiting FullModelHadronicProcess::PostStepDoIt"<<G4endl;
 
-  //clear interaction length      
+  //clear interaction length
   ClearNumberOfInteractionLengthLeft();
 
-  return &aParticleChange;  
+  return &aParticleChange;
 }
 
-
 void FullModelHadronicProcess::CalculateMomenta(
-     G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-     G4int &vecLen,
-     const G4HadProjectile *originalIncident,   // the original incident particle
-     const G4DynamicParticle *originalTarget,
-     G4ReactionProduct &modifiedOriginal,   // Fermi motion and evap. effects included
-     G4Nucleus &targetNucleus,
-     G4ReactionProduct &currentParticle,
-     G4ReactionProduct &targetParticle,
-     G4bool &incidentHasChanged,
-     G4bool &targetHasChanged,
-     G4bool quasiElastic )
-{
+    G4FastVector<G4ReactionProduct, MYGHADLISTSIZE>& vec,
+    G4int& vecLen,
+    const G4HadProjectile* originalIncident,  // the original incident particle
+    const G4DynamicParticle* originalTarget,
+    G4ReactionProduct& modifiedOriginal,  // Fermi motion and evap. effects included
+    G4Nucleus& targetNucleus,
+    G4ReactionProduct& currentParticle,
+    G4ReactionProduct& targetParticle,
+    G4bool& incidentHasChanged,
+    G4bool& targetHasChanged,
+    G4bool quasiElastic) {
   FullModelReactionDynamics theReactionDynamics;
 
   cache = 0;
   what = originalIncident->Get4Momentum().vect();
 
-  if( quasiElastic )
-    {
-      //      G4cout<<"We are calling TwoBody..."<<G4endl;
-      theReactionDynamics.TwoBody( vec, vecLen,
-                                   modifiedOriginal, originalTarget,
-                                   currentParticle, targetParticle,
-                                   targetNucleus, targetHasChanged );
+  if (quasiElastic) {
+    //      G4cout<<"We are calling TwoBody..."<<G4endl;
+    theReactionDynamics.TwoBody(
+        vec, vecLen, modifiedOriginal, originalTarget, currentParticle, targetParticle, targetNucleus, targetHasChanged);
 
-      return;
-    }
+    return;
+  }
 
   //If ProduceStrangeParticlePairs is commented out, let's cut this one as well
   G4ReactionProduct leadingStrangeParticle;
-  G4bool leadFlag = MarkLeadingStrangeParticle( currentParticle,
-						targetParticle,
-						leadingStrangeParticle );
+  G4bool leadFlag = MarkLeadingStrangeParticle(currentParticle, targetParticle, leadingStrangeParticle);
 
   //
   // Note: the number of secondaries can be reduced in GenerateXandPt and TwoCluster
   //
   G4bool finishedGenXPt = false;
   G4bool annihilation = false;
-  if( originalIncident->GetDefinition()->GetPDGEncoding() < 0 &&
-      currentParticle.GetMass() == 0.0 && targetParticle.GetMass() == 0.0 )
-    {
-      // original was an anti-particle and annihilation has taken place
-      annihilation = true;
-      G4double ekcor = 1.0;
-      G4double ek = originalIncident->GetKineticEnergy();
-      G4double ekOrg = ek;
-
-      const G4double tarmas = originalTarget->GetDefinition()->GetPDGMass();
-      if( ek > 1.0*GeV )ekcor = 1./(ek/GeV);
-      const G4double atomicWeight = G4double(targetNucleus.GetN_asInt());
-      ek = 2*tarmas + ek*(1.+ekcor/atomicWeight);
-
-      G4double tkin = targetNucleus.Cinema( ek );
-      //ek += tkin;
-      ekOrg += tkin;
-      modifiedOriginal.SetKineticEnergy( ekOrg );
-    }
+  if (originalIncident->GetDefinition()->GetPDGEncoding() < 0 && currentParticle.GetMass() == 0.0 &&
+      targetParticle.GetMass() == 0.0) {
+    // original was an anti-particle and annihilation has taken place
+    annihilation = true;
+    G4double ekcor = 1.0;
+    G4double ek = originalIncident->GetKineticEnergy();
+    G4double ekOrg = ek;
+
+    const G4double tarmas = originalTarget->GetDefinition()->GetPDGMass();
+    if (ek > 1.0 * GeV)
+      ekcor = 1. / (ek / GeV);
+    const G4double atomicWeight = G4double(targetNucleus.GetN_asInt());
+    ek = 2 * tarmas + ek * (1. + ekcor / atomicWeight);
+
+    G4double tkin = targetNucleus.Cinema(ek);
+    //ek += tkin;
+    ekOrg += tkin;
+    modifiedOriginal.SetKineticEnergy(ekOrg);
+  }
 
-  const G4double twsup[] = { 1.0, 0.7, 0.5, 0.3, 0.2, 0.1 };
+  const G4double twsup[] = {1.0, 0.7, 0.5, 0.3, 0.2, 0.1};
   G4double rand1 = G4UniformRand();
   G4double rand2 = G4UniformRand();
-  if( (annihilation || (vecLen >= 6) || (modifiedOriginal.GetKineticEnergy()/GeV >= 1.0)) && 
-      (((originalIncident->GetDefinition() == G4KaonPlus::KaonPlus()) || 
-         (originalIncident->GetDefinition() == G4KaonMinus::KaonMinus()) || 
-         (originalIncident->GetDefinition() == G4KaonZeroLong::KaonZeroLong()) || 
-         (originalIncident->GetDefinition() == G4KaonZeroShort::KaonZeroShort())) && 
+  if ((annihilation || (vecLen >= 6) || (modifiedOriginal.GetKineticEnergy() / GeV >= 1.0)) &&
+      (((originalIncident->GetDefinition() == G4KaonPlus::KaonPlus()) ||
+        (originalIncident->GetDefinition() == G4KaonMinus::KaonMinus()) ||
+        (originalIncident->GetDefinition() == G4KaonZeroLong::KaonZeroLong()) ||
+        (originalIncident->GetDefinition() == G4KaonZeroShort::KaonZeroShort())) &&
        ((rand1 < 0.5) || (rand2 > twsup[vecLen]))))
-    finishedGenXPt =
-      theReactionDynamics.GenerateXandPt( vec, vecLen,
-					  modifiedOriginal, originalIncident,
-					  currentParticle, targetParticle,
-					  targetNucleus, incidentHasChanged,
-					  targetHasChanged, leadFlag,
-					  leadingStrangeParticle );
-  if( finishedGenXPt )
-    {
-      Rotate(vec, vecLen);
-      return;
-    }
+    finishedGenXPt = theReactionDynamics.GenerateXandPt(vec,
+                                                        vecLen,
+                                                        modifiedOriginal,
+                                                        originalIncident,
+                                                        currentParticle,
+                                                        targetParticle,
+                                                        targetNucleus,
+                                                        incidentHasChanged,
+                                                        targetHasChanged,
+                                                        leadFlag,
+                                                        leadingStrangeParticle);
+  if (finishedGenXPt) {
+    Rotate(vec, vecLen);
+    return;
+  }
 
   G4bool finishedTwoClu = false;
-  if( modifiedOriginal.GetTotalMomentum()/MeV < 1.0 )
-    {
-
-      for(G4int i=0; i<vecLen; i++) delete vec[i];
-      vecLen = 0;
-    }
-  else
-    {
-
-      theReactionDynamics.SuppressChargedPions( vec, vecLen,
-						modifiedOriginal, currentParticle,
-                                                targetParticle, targetNucleus,
-                                                incidentHasChanged, targetHasChanged );
-
-      try
-	{
-	  finishedTwoClu = theReactionDynamics.TwoCluster( vec, vecLen,
-							   modifiedOriginal, originalIncident,
-							   currentParticle, targetParticle,
-							   targetNucleus, incidentHasChanged,
-							   targetHasChanged, leadFlag,
-							   leadingStrangeParticle );
-	}
-      catch(G4HadReentrentException &aC)
-	{
-	  aC.Report(G4cout);
-	  throw G4HadReentrentException(__FILE__, __LINE__, "Failing to calculate momenta");
-	}
-    }
-  if( finishedTwoClu )
-    {
-      Rotate(vec, vecLen);
-      return;
+  if (modifiedOriginal.GetTotalMomentum() / MeV < 1.0) {
+    for (G4int i = 0; i < vecLen; i++)
+      delete vec[i];
+    vecLen = 0;
+  } else {
+    theReactionDynamics.SuppressChargedPions(vec,
+                                             vecLen,
+                                             modifiedOriginal,
+                                             currentParticle,
+                                             targetParticle,
+                                             targetNucleus,
+                                             incidentHasChanged,
+                                             targetHasChanged);
+
+    try {
+      finishedTwoClu = theReactionDynamics.TwoCluster(vec,
+                                                      vecLen,
+                                                      modifiedOriginal,
+                                                      originalIncident,
+                                                      currentParticle,
+                                                      targetParticle,
+                                                      targetNucleus,
+                                                      incidentHasChanged,
+                                                      targetHasChanged,
+                                                      leadFlag,
+                                                      leadingStrangeParticle);
+    } catch (G4HadReentrentException& aC) {
+      aC.Report(G4cout);
+      throw G4HadReentrentException(__FILE__, __LINE__, "Failing to calculate momenta");
     }
+  }
+  if (finishedTwoClu) {
+    Rotate(vec, vecLen);
+    return;
+  }
 
   //
   // PNBlackTrackEnergy is the kinetic energy available for
@@ -627,68 +615,60 @@ void FullModelHadronicProcess::CalculateMomenta(
   //     or for deuteron/triton/alpha black track particles
   // For diffraction scattering on heavy nuclei use elastic routines instead
 
-  theReactionDynamics.TwoBody( vec, vecLen,
-			       modifiedOriginal, originalTarget,
-			       currentParticle, targetParticle,
-			       targetNucleus, targetHasChanged );
+  theReactionDynamics.TwoBody(
+      vec, vecLen, modifiedOriginal, originalTarget, currentParticle, targetParticle, targetNucleus, targetHasChanged);
 }
 
-G4bool FullModelHadronicProcess::MarkLeadingStrangeParticle(
-       const G4ReactionProduct &currentParticle,
-       const G4ReactionProduct &targetParticle,
-       G4ReactionProduct &leadParticle )
-{
+G4bool FullModelHadronicProcess::MarkLeadingStrangeParticle(const G4ReactionProduct& currentParticle,
+                                                            const G4ReactionProduct& targetParticle,
+                                                            G4ReactionProduct& leadParticle) {
   // the following was in GenerateXandPt and TwoCluster
   // add a parameter to the GenerateXandPt function telling it about the strange particle
   //
   // assumes that the original particle was a strange particle
   //
   G4bool lead = false;
-  if( (currentParticle.GetMass() >= G4KaonPlus::KaonPlus()->GetPDGMass()) &&
+  if ((currentParticle.GetMass() >= G4KaonPlus::KaonPlus()->GetPDGMass()) &&
       (currentParticle.GetDefinition() != G4Proton::Proton()) &&
-      (currentParticle.GetDefinition() != G4Neutron::Neutron()) )
-    {
-      lead = true;
-      leadParticle = currentParticle;              //  set lead to the incident particle
-    }
-  else if( (targetParticle.GetMass() >= G4KaonPlus::KaonPlus()->GetPDGMass()) &&
-	   (targetParticle.GetDefinition() != G4Proton::Proton()) &&
-	   (targetParticle.GetDefinition() != G4Neutron::Neutron()) )
-    {
-      lead = true;
-      leadParticle = targetParticle;              //   set lead to the target particle
-    }
+      (currentParticle.GetDefinition() != G4Neutron::Neutron())) {
+    lead = true;
+    leadParticle = currentParticle;  //  set lead to the incident particle
+  } else if ((targetParticle.GetMass() >= G4KaonPlus::KaonPlus()->GetPDGMass()) &&
+             (targetParticle.GetDefinition() != G4Proton::Proton()) &&
+             (targetParticle.GetDefinition() != G4Neutron::Neutron())) {
+    lead = true;
+    leadParticle = targetParticle;  //   set lead to the target particle
+  }
   return lead;
 }
 
-void FullModelHadronicProcess::Rotate(G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec, 
-				      G4int &vecLen)
-{
-  G4double rotation = 2.*pi*G4UniformRand();
+void FullModelHadronicProcess::Rotate(G4FastVector<G4ReactionProduct, MYGHADLISTSIZE>& vec, G4int& vecLen) {
+  G4double rotation = 2. * pi * G4UniformRand();
   cache = rotation;
   G4int i;
-  for( i=0; i<vecLen; ++i )
-    {
-      G4ThreeVector momentum = vec[i]->GetMomentum();
-      momentum = momentum.rotate(rotation, what);
-      vec[i]->SetMomentum(momentum);
-    }
-}      
+  for (i = 0; i < vecLen; ++i) {
+    G4ThreeVector momentum = vec[i]->GetMomentum();
+    momentum = momentum.rotate(rotation, what);
+    vec[i]->SetMomentum(momentum);
+  }
+}
 
-const G4DynamicParticle* FullModelHadronicProcess::FindRhadron(G4ParticleChange* aParticleChange)
-{
+const G4DynamicParticle* FullModelHadronicProcess::FindRhadron(G4ParticleChange* aParticleChange) {
   G4int nsec = aParticleChange->GetNumberOfSecondaries();
-  if (nsec==0) return nullptr;
+  if (nsec == 0)
+    return nullptr;
   int i = 0;
   G4bool found = false;
-  while (i!=nsec && !found){
+  while (i != nsec && !found) {
     //    G4cout<<"Checking "<<aParticleChange->GetSecondary(i)->GetDynamicParticle()->GetDefinition()->GetParticleName()<<G4endl;
     //    if (aParticleChange->GetSecondary(i)->GetDynamicParticle()->GetDefinition()->GetParticleType()=="rhadron") found = true;
-    if (dynamic_cast<CustomParticle*>(aParticleChange->GetSecondary(i)->GetDynamicParticle()->GetDefinition())!=nullptr) found = true;
+    if (dynamic_cast<CustomParticle*>(aParticleChange->GetSecondary(i)->GetDynamicParticle()->GetDefinition()) !=
+        nullptr)
+      found = true;
     i++;
   }
   i--;
-  if(found) return aParticleChange->GetSecondary(i)->GetDynamicParticle();
+  if (found)
+    return aParticleChange->GetSecondary(i)->GetDynamicParticle();
   return nullptr;
 }
-
diff --git a/SimG4Core/CustomPhysics/src/FullModelReactionDynamics.cc b/SimG4Core/CustomPhysics/src/FullModelReactionDynamics.cc
index d7e8c222d399b..d145c051c2c01 100644
--- a/SimG4Core/CustomPhysics/src/FullModelReactionDynamics.cc
+++ b/SimG4Core/CustomPhysics/src/FullModelReactionDynamics.cc
@@ -22,32 +22,32 @@
 //
 //
 //
- // Hadronic Process: Reaction Dynamics
- // original by H.P. Wellisch
- // modified by J.L. Chuma, TRIUMF, 19-Nov-1996
- // Last modified: 27-Mar-1997
- // modified by H.P. Wellisch, 24-Apr-97
- // H.P. Wellisch, 25.Apr-97: Side of current and target particle taken into account
- // H.P. Wellisch, 29.Apr-97: Bug fix in NuclearReaction. (pseudo1 was without energy)
- // J.L. Chuma, 30-Apr-97:  Changed return value for GenerateXandPt.  It seems possible
- //                         that GenerateXandPt could eliminate some secondaries, but
- //                         still finish its calculations, thus we would not want to
- //                         then use TwoCluster to again calculate the momenta if vecLen
- //                         was less than 6.
- // J.L. Chuma, 10-Jun-97:  Modified NuclearReaction.  Was not creating ReactionProduct's
- //                         with the new operator, thus they would be meaningless when
- //                         going out of scope.
- // J.L. Chuma, 20-Jun-97:  Modified GenerateXandPt and TwoCluster to fix units problems
- // J.L. Chuma, 23-Jun-97:  Modified ProduceStrangeParticlePairs to fix units problems
- // J.L. Chuma, 26-Jun-97:  Modified ProduceStrangeParticlePairs to fix array indices
- //                         which were sometimes going out of bounds
- // J.L. Chuma, 04-Jul-97:  Many minor modifications to GenerateXandPt and TwoCluster
- // J.L. Chuma, 06-Aug-97:  Added original incident particle, before Fermi motion and
- //                         evaporation effects are included, needed for self absorption
- //                         and corrections for single particle spectra (shower particles)
- // logging stopped 1997
- // J. Allison, 17-Jun-99:  Replaced a min function to get correct behaviour on DEC.
- 
+// Hadronic Process: Reaction Dynamics
+// original by H.P. Wellisch
+// modified by J.L. Chuma, TRIUMF, 19-Nov-1996
+// Last modified: 27-Mar-1997
+// modified by H.P. Wellisch, 24-Apr-97
+// H.P. Wellisch, 25.Apr-97: Side of current and target particle taken into account
+// H.P. Wellisch, 29.Apr-97: Bug fix in NuclearReaction. (pseudo1 was without energy)
+// J.L. Chuma, 30-Apr-97:  Changed return value for GenerateXandPt.  It seems possible
+//                         that GenerateXandPt could eliminate some secondaries, but
+//                         still finish its calculations, thus we would not want to
+//                         then use TwoCluster to again calculate the momenta if vecLen
+//                         was less than 6.
+// J.L. Chuma, 10-Jun-97:  Modified NuclearReaction.  Was not creating ReactionProduct's
+//                         with the new operator, thus they would be meaningless when
+//                         going out of scope.
+// J.L. Chuma, 20-Jun-97:  Modified GenerateXandPt and TwoCluster to fix units problems
+// J.L. Chuma, 23-Jun-97:  Modified ProduceStrangeParticlePairs to fix units problems
+// J.L. Chuma, 26-Jun-97:  Modified ProduceStrangeParticlePairs to fix array indices
+//                         which were sometimes going out of bounds
+// J.L. Chuma, 04-Jul-97:  Many minor modifications to GenerateXandPt and TwoCluster
+// J.L. Chuma, 06-Aug-97:  Added original incident particle, before Fermi motion and
+//                         evaporation effects are included, needed for self absorption
+//                         and corrections for single particle spectra (shower particles)
+// logging stopped 1997
+// J. Allison, 17-Jun-99:  Replaced a min function to get correct behaviour on DEC.
+
 #include "SimG4Core/CustomPhysics/interface/FullModelReactionDynamics.h"
 #include "G4AntiProton.hh"
 #include "G4AntiNeutron.hh"
@@ -59,2189 +59,2086 @@
 
 using namespace CLHEP;
 
- G4bool FullModelReactionDynamics::GenerateXandPt(
-   G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-   G4int &vecLen,
-   G4ReactionProduct &modifiedOriginal,   // Fermi motion & evap. effects included
-   const G4HadProjectile *originalIncident,   // the original incident particle
-   G4ReactionProduct &currentParticle,
-   G4ReactionProduct &targetParticle,
-   const G4Nucleus &targetNucleus,
-   G4bool &incidentHasChanged,
-   G4bool &targetHasChanged,
-   G4bool leadFlag,
-   G4ReactionProduct &leadingStrangeParticle )
-  {
-    // 
-    // derived from original FORTRAN code GENXPT by H. Fesefeldt (11-Oct-1987)
-    //
-    //  Generation of X- and PT- values for incident, target, and all secondary particles 
-    //  A simple single variable description E D3S/DP3= F(Q) with
-    //  Q^2 = (M*X)^2 + PT^2 is used. Final state kinematic is produced
-    //  by an FF-type iterative cascade method
-    //
-    //  internal units are GeV
-    //
+G4bool FullModelReactionDynamics::GenerateXandPt(
+    G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+    G4int &vecLen,
+    G4ReactionProduct &modifiedOriginal,      // Fermi motion & evap. effects included
+    const G4HadProjectile *originalIncident,  // the original incident particle
+    G4ReactionProduct &currentParticle,
+    G4ReactionProduct &targetParticle,
+    const G4Nucleus &targetNucleus,
+    G4bool &incidentHasChanged,
+    G4bool &targetHasChanged,
+    G4bool leadFlag,
+    G4ReactionProduct &leadingStrangeParticle) {
+  //
+  // derived from original FORTRAN code GENXPT by H. Fesefeldt (11-Oct-1987)
+  //
+  //  Generation of X- and PT- values for incident, target, and all secondary particles
+  //  A simple single variable description E D3S/DP3= F(Q) with
+  //  Q^2 = (M*X)^2 + PT^2 is used. Final state kinematic is produced
+  //  by an FF-type iterative cascade method
+  //
+  //  internal units are GeV
+  //
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+
+  // Protection in case no secondary has been created; cascades down to two-body.
+  if (vecLen == 0)
+    return false;
+
+  G4ParticleDefinition *aPiMinus = G4PionMinus::PionMinus();
+  // G4ParticleDefinition *anAntiProton = G4AntiProton::AntiProton();
+  // G4ParticleDefinition *anAntiNeutron = G4AntiNeutron::AntiNeutron();
+  G4ParticleDefinition *aProton = G4Proton::Proton();
+  G4ParticleDefinition *aNeutron = G4Neutron::Neutron();
+  G4ParticleDefinition *aPiPlus = G4PionPlus::PionPlus();
+  G4ParticleDefinition *aPiZero = G4PionZero::PionZero();
+  G4ParticleDefinition *aKaonPlus = G4KaonPlus::KaonPlus();
+  G4ParticleDefinition *aKaonMinus = G4KaonMinus::KaonMinus();
+  G4ParticleDefinition *aKaonZeroS = G4KaonZeroShort::KaonZeroShort();
+  G4ParticleDefinition *aKaonZeroL = G4KaonZeroLong::KaonZeroLong();
+
+  G4int i, l;
+  //    G4double forVeryForward = 0.;
+  G4bool veryForward = false;
+
+  const G4double ekOriginal = modifiedOriginal.GetKineticEnergy() / GeV;
+  const G4double etOriginal = modifiedOriginal.GetTotalEnergy() / GeV;
+  const G4double mOriginal = modifiedOriginal.GetMass() / GeV;
+  const G4double pOriginal = modifiedOriginal.GetMomentum().mag() / GeV;
+  G4double targetMass = targetParticle.GetDefinition()->GetPDGMass() / GeV;
+  G4double centerofmassEnergy =
+      std::sqrt(mOriginal * mOriginal + targetMass * targetMass + 2.0 * targetMass * etOriginal);  // GeV
+  G4double currentMass = currentParticle.GetMass() / GeV;
+  targetMass = targetParticle.GetMass() / GeV;
+  //
+  //  randomize the order of the secondary particles
+  //  note that the current and target particles are not affected
+  //
+  for (i = 0; i < vecLen; ++i) {
+    G4int itemp = G4int(G4UniformRand() * vecLen);
+    G4ReactionProduct pTemp = *vec[itemp];
+    *vec[itemp] = *vec[i];
+    *vec[i] = pTemp;
     // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    
-    // Protection in case no secondary has been created; cascades down to two-body.
-    if(vecLen == 0) return false;
-
-    G4ParticleDefinition *aPiMinus = G4PionMinus::PionMinus();
-    // G4ParticleDefinition *anAntiProton = G4AntiProton::AntiProton();
-    // G4ParticleDefinition *anAntiNeutron = G4AntiNeutron::AntiNeutron();
-    G4ParticleDefinition *aProton = G4Proton::Proton();
-    G4ParticleDefinition *aNeutron = G4Neutron::Neutron();
-    G4ParticleDefinition *aPiPlus = G4PionPlus::PionPlus();
-    G4ParticleDefinition *aPiZero = G4PionZero::PionZero();
-    G4ParticleDefinition *aKaonPlus = G4KaonPlus::KaonPlus();
-    G4ParticleDefinition *aKaonMinus = G4KaonMinus::KaonMinus();
-    G4ParticleDefinition *aKaonZeroS = G4KaonZeroShort::KaonZeroShort();
-    G4ParticleDefinition *aKaonZeroL = G4KaonZeroLong::KaonZeroLong();
-
-    G4int i, l;
-    //    G4double forVeryForward = 0.;
-    G4bool veryForward = false;
-    
-    const G4double ekOriginal = modifiedOriginal.GetKineticEnergy()/GeV;
-    const G4double etOriginal = modifiedOriginal.GetTotalEnergy()/GeV;
-    const G4double mOriginal = modifiedOriginal.GetMass()/GeV;
-    const G4double pOriginal = modifiedOriginal.GetMomentum().mag()/GeV;
-    G4double targetMass = targetParticle.GetDefinition()->GetPDGMass()/GeV;
-    G4double centerofmassEnergy = std::sqrt( mOriginal*mOriginal +
-                                        targetMass*targetMass +
-                                        2.0*targetMass*etOriginal );  // GeV
-    G4double currentMass = currentParticle.GetMass()/GeV;
-    targetMass = targetParticle.GetMass()/GeV;
-    //
-    //  randomize the order of the secondary particles
-    //  note that the current and target particles are not affected
-    //
-    for( i=0; i<vecLen; ++i )
-    {
-      G4int itemp = G4int( G4UniformRand()*vecLen );
-      G4ReactionProduct pTemp = *vec[itemp];
-      *vec[itemp] = *vec[i];
-      *vec[i] = pTemp;
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    }
+  }
 
-    if( currentMass == 0.0 && targetMass == 0.0 )       // annihilation
-    {
-      // no kinetic energy in target .....
-      G4double ek = currentParticle.GetKineticEnergy();
-      G4ThreeVector m = currentParticle.GetMomentum();
-      currentParticle = *vec[0];
-      targetParticle = *vec[1];
-      for( i=0; i<(vecLen-2); ++i )*vec[i] = *vec[i+2];
-      G4ReactionProduct *temp = vec[vecLen-1];
-      delete temp;
-      temp = vec[vecLen-2];
-      delete temp;
-      vecLen -= 2;
-      currentMass = currentParticle.GetMass()/GeV;
-      targetMass = targetParticle.GetMass()/GeV;
-      incidentHasChanged = true;
-      targetHasChanged = true;
-      currentParticle.SetKineticEnergy( ek );
-      currentParticle.SetMomentum( m );
-      veryForward = true;
-    }
-    const G4double atomicWeight = targetNucleus.GetN_asInt();
-    const G4double atomicNumber = targetNucleus.GetZ_asInt();
-    const G4double protonMass = aProton->GetPDGMass()/MeV;
-    if( (originalIncident->GetDefinition() == aKaonMinus ||
-         originalIncident->GetDefinition() == aKaonZeroL ||
-         originalIncident->GetDefinition() == aKaonZeroS ||
-         originalIncident->GetDefinition() == aKaonPlus) &&
-        G4UniformRand() >= 0.7 )
-    {
-      G4ReactionProduct temp = currentParticle;
-      currentParticle = targetParticle;
-      targetParticle = temp;
-      incidentHasChanged = true;
-      targetHasChanged = true;
-      currentMass = currentParticle.GetMass()/GeV;
-      targetMass = targetParticle.GetMass()/GeV;
-    }
-    const G4double afc = std::min( 0.75,
-                              0.312+0.200*std::log(std::log(centerofmassEnergy*centerofmassEnergy))+
-                              std::pow(centerofmassEnergy*centerofmassEnergy,1.5)/6000.0 );
+  if (currentMass == 0.0 && targetMass == 0.0)  // annihilation
+  {
+    // no kinetic energy in target .....
+    G4double ek = currentParticle.GetKineticEnergy();
+    G4ThreeVector m = currentParticle.GetMomentum();
+    currentParticle = *vec[0];
+    targetParticle = *vec[1];
+    for (i = 0; i < (vecLen - 2); ++i)
+      *vec[i] = *vec[i + 2];
+    G4ReactionProduct *temp = vec[vecLen - 1];
+    delete temp;
+    temp = vec[vecLen - 2];
+    delete temp;
+    vecLen -= 2;
+    currentMass = currentParticle.GetMass() / GeV;
+    targetMass = targetParticle.GetMass() / GeV;
+    incidentHasChanged = true;
+    targetHasChanged = true;
+    currentParticle.SetKineticEnergy(ek);
+    currentParticle.SetMomentum(m);
+    veryForward = true;
+  }
+  const G4double atomicWeight = targetNucleus.GetN_asInt();
+  const G4double atomicNumber = targetNucleus.GetZ_asInt();
+  const G4double protonMass = aProton->GetPDGMass() / MeV;
+  if ((originalIncident->GetDefinition() == aKaonMinus || originalIncident->GetDefinition() == aKaonZeroL ||
+       originalIncident->GetDefinition() == aKaonZeroS || originalIncident->GetDefinition() == aKaonPlus) &&
+      G4UniformRand() >= 0.7) {
+    G4ReactionProduct temp = currentParticle;
+    currentParticle = targetParticle;
+    targetParticle = temp;
+    incidentHasChanged = true;
+    targetHasChanged = true;
+    currentMass = currentParticle.GetMass() / GeV;
+    targetMass = targetParticle.GetMass() / GeV;
+  }
+  const G4double afc = std::min(0.75,
+                                0.312 + 0.200 * std::log(std::log(centerofmassEnergy * centerofmassEnergy)) +
+                                    std::pow(centerofmassEnergy * centerofmassEnergy, 1.5) / 6000.0);
 
-    // PROBLEMET ER HER!!!
-    
-    G4double freeEnergy = centerofmassEnergy-currentMass-targetMass;
+  // PROBLEMET ER HER!!!
 
-    if(freeEnergy<0) 
-      {
-	G4cout<<"Free energy < 0!"<<G4endl;
-	G4cout<<"E_CMS = "<<centerofmassEnergy<<" GeV"<<G4endl;
-	G4cout<<"m_curr = "<<currentMass<<" GeV"<<G4endl;
-	G4cout<<"m_orig = "<<mOriginal<<" GeV"<<G4endl;
-	G4cout<<"m_targ = "<<targetMass<<" GeV"<<G4endl;
-	G4cout<<"E_free = "<<freeEnergy<<" GeV"<<G4endl;
-      }
+  G4double freeEnergy = centerofmassEnergy - currentMass - targetMass;
 
-    G4double forwardEnergy = freeEnergy/2.;
-    G4int forwardCount = 1;            // number of particles in forward hemisphere
-    
-    G4double backwardEnergy = freeEnergy/2.;
-    G4int backwardCount = 1;           // number of particles in backward hemisphere
-    if(veryForward)
-    {
-      if(currentParticle.GetSide()==-1)
-      {
-        forwardEnergy += currentMass;
-	forwardCount --;
-	backwardEnergy -= currentMass;
-	backwardCount ++;
-      }
-      if(targetParticle.GetSide()!=-1)
-      {
-        backwardEnergy += targetMass;
-	backwardCount --;
-	forwardEnergy -= targetMass;
-	forwardCount ++;
-      }
+  if (freeEnergy < 0) {
+    G4cout << "Free energy < 0!" << G4endl;
+    G4cout << "E_CMS = " << centerofmassEnergy << " GeV" << G4endl;
+    G4cout << "m_curr = " << currentMass << " GeV" << G4endl;
+    G4cout << "m_orig = " << mOriginal << " GeV" << G4endl;
+    G4cout << "m_targ = " << targetMass << " GeV" << G4endl;
+    G4cout << "E_free = " << freeEnergy << " GeV" << G4endl;
+  }
+
+  G4double forwardEnergy = freeEnergy / 2.;
+  G4int forwardCount = 1;  // number of particles in forward hemisphere
+
+  G4double backwardEnergy = freeEnergy / 2.;
+  G4int backwardCount = 1;  // number of particles in backward hemisphere
+  if (veryForward) {
+    if (currentParticle.GetSide() == -1) {
+      forwardEnergy += currentMass;
+      forwardCount--;
+      backwardEnergy -= currentMass;
+      backwardCount++;
+    }
+    if (targetParticle.GetSide() != -1) {
+      backwardEnergy += targetMass;
+      backwardCount--;
+      forwardEnergy -= targetMass;
+      forwardCount++;
     }
-    for( i=0; i<vecLen; ++i )
-    {
-      if( vec[i]->GetSide() == -1 )
-      {
-        ++backwardCount;
-        backwardEnergy -= vec[i]->GetMass()/GeV;
-      } else {
-        ++forwardCount;
-        forwardEnergy -= vec[i]->GetMass()/GeV;
-      }
+  }
+  for (i = 0; i < vecLen; ++i) {
+    if (vec[i]->GetSide() == -1) {
+      ++backwardCount;
+      backwardEnergy -= vec[i]->GetMass() / GeV;
+    } else {
+      ++forwardCount;
+      forwardEnergy -= vec[i]->GetMass() / GeV;
     }
-    //
-    //  add particles from intranuclear cascade
-    //  nuclearExcitationCount = number of new secondaries produced by nuclear excitation
-    //  extraCount = number of nucleons within these new secondaries
-    //
-    G4double xtarg;
-    if( centerofmassEnergy < (2.0+G4UniformRand()) )
-      xtarg = afc * (std::pow(atomicWeight,0.33)-1.0) * (2.0*backwardCount+vecLen+2)/2.0;
-    else
-      xtarg = afc * (std::pow(atomicWeight,0.33)-1.0) * (2.0*backwardCount);
-    if( xtarg <= 0.0 )xtarg = 0.01;
-    G4int nuclearExcitationCount = Poisson( xtarg );
-    if(atomicWeight<1.0001) nuclearExcitationCount = 0;
-    G4int extraNucleonCount = 0;
-    G4double extraNucleonMass = 0.0;
-    if( nuclearExcitationCount > 0 )
-    {
-      const G4double nucsup[] = { 1.00, 0.7, 0.5, 0.4, 0.35, 0.3 };
-      const G4double psup[] = { 3., 6., 20., 50., 100., 1000. };
-      G4int momentumBin = 0;
-      while( (momentumBin < 6) &&
-             (modifiedOriginal.GetTotalMomentum()/GeV > psup[momentumBin]) )
-        ++momentumBin;
-      momentumBin = std::min( 5, momentumBin );
-      //
-      //  NOTE: in GENXPT, these new particles were given negative codes
-      //        here I use  NewlyAdded = true  instead
-      //
-      for( i=0; i<nuclearExcitationCount; ++i )
-      {
-        G4ReactionProduct * pVec = new G4ReactionProduct();
-        if( G4UniformRand() < nucsup[momentumBin] )
-        {
-          if( G4UniformRand() > 1.0-atomicNumber/atomicWeight )
-            pVec->SetDefinition( aProton );
-          else
-            pVec->SetDefinition( aNeutron );
-          pVec->SetSide( -2 );                // -2 means backside nucleon
-          ++extraNucleonCount;
-          backwardEnergy += pVec->GetMass()/GeV;
-          extraNucleonMass += pVec->GetMass()/GeV;
-        }
+  }
+  //
+  //  add particles from intranuclear cascade
+  //  nuclearExcitationCount = number of new secondaries produced by nuclear excitation
+  //  extraCount = number of nucleons within these new secondaries
+  //
+  G4double xtarg;
+  if (centerofmassEnergy < (2.0 + G4UniformRand()))
+    xtarg = afc * (std::pow(atomicWeight, 0.33) - 1.0) * (2.0 * backwardCount + vecLen + 2) / 2.0;
+  else
+    xtarg = afc * (std::pow(atomicWeight, 0.33) - 1.0) * (2.0 * backwardCount);
+  if (xtarg <= 0.0)
+    xtarg = 0.01;
+  G4int nuclearExcitationCount = Poisson(xtarg);
+  if (atomicWeight < 1.0001)
+    nuclearExcitationCount = 0;
+  G4int extraNucleonCount = 0;
+  G4double extraNucleonMass = 0.0;
+  if (nuclearExcitationCount > 0) {
+    const G4double nucsup[] = {1.00, 0.7, 0.5, 0.4, 0.35, 0.3};
+    const G4double psup[] = {3., 6., 20., 50., 100., 1000.};
+    G4int momentumBin = 0;
+    while ((momentumBin < 6) && (modifiedOriginal.GetTotalMomentum() / GeV > psup[momentumBin]))
+      ++momentumBin;
+    momentumBin = std::min(5, momentumBin);
+    //
+    //  NOTE: in GENXPT, these new particles were given negative codes
+    //        here I use  NewlyAdded = true  instead
+    //
+    for (i = 0; i < nuclearExcitationCount; ++i) {
+      G4ReactionProduct *pVec = new G4ReactionProduct();
+      if (G4UniformRand() < nucsup[momentumBin]) {
+        if (G4UniformRand() > 1.0 - atomicNumber / atomicWeight)
+          pVec->SetDefinition(aProton);
         else
-        {
-          G4double ran = G4UniformRand();
-          if( ran < 0.3181 )
-            pVec->SetDefinition( aPiPlus );
-          else if( ran < 0.6819 )
-            pVec->SetDefinition( aPiZero );
-          else
-            pVec->SetDefinition( aPiMinus );
-          pVec->SetSide( -1 );                // backside particle, but not a nucleon
-        }
-        pVec->SetNewlyAdded( true );                // true is the same as IPA(i)<0
-        vec.SetElement( vecLen++, pVec );    
-        // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-        backwardEnergy -= pVec->GetMass()/GeV;
-        ++backwardCount;
+          pVec->SetDefinition(aNeutron);
+        pVec->SetSide(-2);  // -2 means backside nucleon
+        ++extraNucleonCount;
+        backwardEnergy += pVec->GetMass() / GeV;
+        extraNucleonMass += pVec->GetMass() / GeV;
+      } else {
+        G4double ran = G4UniformRand();
+        if (ran < 0.3181)
+          pVec->SetDefinition(aPiPlus);
+        else if (ran < 0.6819)
+          pVec->SetDefinition(aPiZero);
+        else
+          pVec->SetDefinition(aPiMinus);
+        pVec->SetSide(-1);  // backside particle, but not a nucleon
       }
-    }
-    //
-    //  assume conservation of kinetic energy in forward & backward hemispheres
-    //
-    G4int is, iskip;
-    while( forwardEnergy <= 0.0 )  // must eliminate a particle from the forward side
-    {
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-      iskip = G4int(G4UniformRand()*forwardCount) + 1; // 1 <= iskip <= forwardCount
-      is = 0;
-      G4int forwardParticlesLeft = 0;
-      for( i=(vecLen-1); i>=0; --i )
-      {
-        if( vec[i]->GetSide() == 1 && vec[i]->GetMayBeKilled())
-        {
-          forwardParticlesLeft = 1;  
-          if( ++is == iskip )
-          { 
-            forwardEnergy += vec[i]->GetMass()/GeV;
-            for( G4int j=i; j<(vecLen-1); j++ )*vec[j] = *vec[j+1];    // shift up
-            --forwardCount;
-            G4ReactionProduct *temp = vec[vecLen-1];
-            delete temp;
-            if( --vecLen == 0 )return false;  // all the secondaries have been eliminated
-            break;  // --+
-          }         //   |
-        }           //   |
-      }             // break goes down to here
+      pVec->SetNewlyAdded(true);  // true is the same as IPA(i)<0
+      vec.SetElement(vecLen++, pVec);
       // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-      if( forwardParticlesLeft == 0 )
-      {
-        forwardEnergy += currentParticle.GetMass()/GeV;
-        currentParticle.SetDefinitionAndUpdateE( targetParticle.GetDefinition() );
-        targetParticle.SetDefinitionAndUpdateE( vec[0]->GetDefinition() );
-        // above two lines modified 20-oct-97: were just simple equalities
-        --forwardCount;
-        for( G4int j=0; j<(vecLen-1); ++j )*vec[j] = *vec[j+1];
-        G4ReactionProduct *temp = vec[vecLen-1];
-        delete temp;
-        if( --vecLen == 0 )return false;  // all the secondaries have been eliminated
-        break;
-      }
+      backwardEnergy -= pVec->GetMass() / GeV;
+      ++backwardCount;
     }
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    while( backwardEnergy <= 0.0 )  // must eliminate a particle from the backward side
-    {
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-      iskip = G4int(G4UniformRand()*backwardCount) + 1; // 1 <= iskip <= backwardCount
-      is = 0;
-      G4int backwardParticlesLeft = 0;
-      for( i=(vecLen-1); i>=0; --i )
-      {
-        if( vec[i]->GetSide() < 0 && vec[i]->GetMayBeKilled())
-	{
-          backwardParticlesLeft = 1;
-          if( ++is == iskip )        // eliminate the i'th particle
-          {
-            if( vec[i]->GetSide() == -2 )
-            {
-              --extraNucleonCount;
-              extraNucleonMass -= vec[i]->GetMass()/GeV;
-              backwardEnergy -= vec[i]->GetTotalEnergy()/GeV;
-            }
-            backwardEnergy += vec[i]->GetTotalEnergy()/GeV;
-            for( G4int j=i; j<(vecLen-1); ++j )*vec[j] = *vec[j+1];   // shift up
-            --backwardCount;
-            G4ReactionProduct *temp = vec[vecLen-1];
-            delete temp;
-            if( --vecLen == 0 )return false;  // all the secondaries have been eliminated
-            break;
+  }
+  //
+  //  assume conservation of kinetic energy in forward & backward hemispheres
+  //
+  G4int is, iskip;
+  while (forwardEnergy <= 0.0)  // must eliminate a particle from the forward side
+  {
+    // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+    iskip = G4int(G4UniformRand() * forwardCount) + 1;  // 1 <= iskip <= forwardCount
+    is = 0;
+    G4int forwardParticlesLeft = 0;
+    for (i = (vecLen - 1); i >= 0; --i) {
+      if (vec[i]->GetSide() == 1 && vec[i]->GetMayBeKilled()) {
+        forwardParticlesLeft = 1;
+        if (++is == iskip) {
+          forwardEnergy += vec[i]->GetMass() / GeV;
+          for (G4int j = i; j < (vecLen - 1); j++)
+            *vec[j] = *vec[j + 1];  // shift up
+          --forwardCount;
+          G4ReactionProduct *temp = vec[vecLen - 1];
+          delete temp;
+          if (--vecLen == 0)
+            return false;  // all the secondaries have been eliminated
+          break;           // --+
+        }                  //   |
+      }                    //   |
+    }                      // break goes down to here
+    // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+    if (forwardParticlesLeft == 0) {
+      forwardEnergy += currentParticle.GetMass() / GeV;
+      currentParticle.SetDefinitionAndUpdateE(targetParticle.GetDefinition());
+      targetParticle.SetDefinitionAndUpdateE(vec[0]->GetDefinition());
+      // above two lines modified 20-oct-97: were just simple equalities
+      --forwardCount;
+      for (G4int j = 0; j < (vecLen - 1); ++j)
+        *vec[j] = *vec[j + 1];
+      G4ReactionProduct *temp = vec[vecLen - 1];
+      delete temp;
+      if (--vecLen == 0)
+        return false;  // all the secondaries have been eliminated
+      break;
+    }
+  }
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  while (backwardEnergy <= 0.0)  // must eliminate a particle from the backward side
+  {
+    // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+    iskip = G4int(G4UniformRand() * backwardCount) + 1;  // 1 <= iskip <= backwardCount
+    is = 0;
+    G4int backwardParticlesLeft = 0;
+    for (i = (vecLen - 1); i >= 0; --i) {
+      if (vec[i]->GetSide() < 0 && vec[i]->GetMayBeKilled()) {
+        backwardParticlesLeft = 1;
+        if (++is == iskip)  // eliminate the i'th particle
+        {
+          if (vec[i]->GetSide() == -2) {
+            --extraNucleonCount;
+            extraNucleonMass -= vec[i]->GetMass() / GeV;
+            backwardEnergy -= vec[i]->GetTotalEnergy() / GeV;
           }
+          backwardEnergy += vec[i]->GetTotalEnergy() / GeV;
+          for (G4int j = i; j < (vecLen - 1); ++j)
+            *vec[j] = *vec[j + 1];  // shift up
+          --backwardCount;
+          G4ReactionProduct *temp = vec[vecLen - 1];
+          delete temp;
+          if (--vecLen == 0)
+            return false;  // all the secondaries have been eliminated
+          break;
         }
       }
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-      if( backwardParticlesLeft == 0 )
-      {
-	backwardEnergy += targetParticle.GetMass()/GeV;
-        targetParticle = *vec[0];
-        --backwardCount;
-        for( G4int j=0; j<(vecLen-1); ++j )*vec[j] = *vec[j+1];
-        G4ReactionProduct *temp = vec[vecLen-1];
-        delete temp;
-        if( --vecLen == 0 )return false;  // all the secondaries have been eliminated
-        break;
-      }
     }
     // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    //
-    //  define initial state vectors for Lorentz transformations
-    //  the pseudoParticles have non-standard masses, hence the "pseudo"
-    //
-    G4ReactionProduct pseudoParticle[10];
-    for( i=0; i<10; ++i )pseudoParticle[i].SetZero();
-    
-    pseudoParticle[0].SetMass( mOriginal*GeV );
-    pseudoParticle[0].SetMomentum( 0.0, 0.0, pOriginal*GeV );
-    pseudoParticle[0].SetTotalEnergy(
-     std::sqrt( pOriginal*pOriginal + mOriginal*mOriginal )*GeV );
-    
-    pseudoParticle[1].SetMass( protonMass*MeV );        // this could be targetMass
-    pseudoParticle[1].SetTotalEnergy( protonMass*MeV );
-    
-    pseudoParticle[3].SetMass( protonMass*(1+extraNucleonCount)*MeV );
-    pseudoParticle[3].SetTotalEnergy( protonMass*(1+extraNucleonCount)*MeV );
-    
-    pseudoParticle[8].SetMomentum( 1.0*GeV, 0.0, 0.0 );
-    
-    pseudoParticle[2] = pseudoParticle[0] + pseudoParticle[1];
-    pseudoParticle[3] = pseudoParticle[3] + pseudoParticle[0];
-    
-    pseudoParticle[0].Lorentz( pseudoParticle[0], pseudoParticle[2] );
-    pseudoParticle[1].Lorentz( pseudoParticle[1], pseudoParticle[2] );
-    
-    G4double dndl[20];
-    //
-    //  main loop for 4-momentum generation
-    //  see Pitha-report (Aachen) for a detailed description of the method
-    //
-    G4double aspar, pt, et, x, pp, pp1, rthnve, phinve, rmb, wgt;
-    G4int    innerCounter, outerCounter;
-    G4bool   eliminateThisParticle, resetEnergies, constantCrossSection;
-    
-    G4double forwardKinetic = 0.0, backwardKinetic = 0.0;
-    //
-    // process the secondary particles in reverse order
-    // the incident particle is Done after the secondaries
-    // nucleons, including the target, in the backward hemisphere are also Done later
-    //
-    G4double binl[20] = {0.,0.1,0.2,0.3,0.4,0.5,0.6,0.7,0.8,0.9,1.0,1.11,1.25,
-                         1.43,1.67,2.0,2.5,3.33,5.00,10.00};
-    G4int backwardNucleonCount = 0;       // number of nucleons in backward hemisphere
-    G4double totalEnergy, kineticEnergy, vecMass;
+    if (backwardParticlesLeft == 0) {
+      backwardEnergy += targetParticle.GetMass() / GeV;
+      targetParticle = *vec[0];
+      --backwardCount;
+      for (G4int j = 0; j < (vecLen - 1); ++j)
+        *vec[j] = *vec[j + 1];
+      G4ReactionProduct *temp = vec[vecLen - 1];
+      delete temp;
+      if (--vecLen == 0)
+        return false;  // all the secondaries have been eliminated
+      break;
+    }
+  }
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  //
+  //  define initial state vectors for Lorentz transformations
+  //  the pseudoParticles have non-standard masses, hence the "pseudo"
+  //
+  G4ReactionProduct pseudoParticle[10];
+  for (i = 0; i < 10; ++i)
+    pseudoParticle[i].SetZero();
 
-    for( i=(vecLen-1); i>=0; --i )
-    {
-      G4double phi = G4UniformRand()*twopi;
-      if( vec[i]->GetNewlyAdded() )           // added from intranuclear cascade
-      {
-        if( vec[i]->GetSide() == -2 )         //  is a nucleon
-        {
-          if( backwardNucleonCount < 18 )
-          {
-            if( vec[i]->GetDefinition() == G4PionMinus::PionMinus() ||
-                vec[i]->GetDefinition() == G4PionPlus::PionPlus() ||
-                vec[i]->GetDefinition() == G4PionZero::PionZero() )
-            {
-              for(G4int i=0; i<vecLen; i++) delete vec[i];
-   	      vecLen = 0;
-              throw G4HadReentrentException(__FILE__, __LINE__,
-	      "FullModelReactionDynamics::GenerateXandPt : a pion has been counted as a backward nucleon");
-            }
-            vec[i]->SetSide( -3 );
-            ++backwardNucleonCount;
-            continue;
+  pseudoParticle[0].SetMass(mOriginal * GeV);
+  pseudoParticle[0].SetMomentum(0.0, 0.0, pOriginal * GeV);
+  pseudoParticle[0].SetTotalEnergy(std::sqrt(pOriginal * pOriginal + mOriginal * mOriginal) * GeV);
+
+  pseudoParticle[1].SetMass(protonMass * MeV);  // this could be targetMass
+  pseudoParticle[1].SetTotalEnergy(protonMass * MeV);
+
+  pseudoParticle[3].SetMass(protonMass * (1 + extraNucleonCount) * MeV);
+  pseudoParticle[3].SetTotalEnergy(protonMass * (1 + extraNucleonCount) * MeV);
+
+  pseudoParticle[8].SetMomentum(1.0 * GeV, 0.0, 0.0);
+
+  pseudoParticle[2] = pseudoParticle[0] + pseudoParticle[1];
+  pseudoParticle[3] = pseudoParticle[3] + pseudoParticle[0];
+
+  pseudoParticle[0].Lorentz(pseudoParticle[0], pseudoParticle[2]);
+  pseudoParticle[1].Lorentz(pseudoParticle[1], pseudoParticle[2]);
+
+  G4double dndl[20];
+  //
+  //  main loop for 4-momentum generation
+  //  see Pitha-report (Aachen) for a detailed description of the method
+  //
+  G4double aspar, pt, et, x, pp, pp1, rthnve, phinve, rmb, wgt;
+  G4int innerCounter, outerCounter;
+  G4bool eliminateThisParticle, resetEnergies, constantCrossSection;
+
+  G4double forwardKinetic = 0.0, backwardKinetic = 0.0;
+  //
+  // process the secondary particles in reverse order
+  // the incident particle is Done after the secondaries
+  // nucleons, including the target, in the backward hemisphere are also Done later
+  //
+  G4double binl[20] = {0.,  0.1,  0.2,  0.3,  0.4,  0.5, 0.6, 0.7,  0.8,  0.9,
+                       1.0, 1.11, 1.25, 1.43, 1.67, 2.0, 2.5, 3.33, 5.00, 10.00};
+  G4int backwardNucleonCount = 0;  // number of nucleons in backward hemisphere
+  G4double totalEnergy, kineticEnergy, vecMass;
+
+  for (i = (vecLen - 1); i >= 0; --i) {
+    G4double phi = G4UniformRand() * twopi;
+    if (vec[i]->GetNewlyAdded())  // added from intranuclear cascade
+    {
+      if (vec[i]->GetSide() == -2)  //  is a nucleon
+      {
+        if (backwardNucleonCount < 18) {
+          if (vec[i]->GetDefinition() == G4PionMinus::PionMinus() ||
+              vec[i]->GetDefinition() == G4PionPlus::PionPlus() || vec[i]->GetDefinition() == G4PionZero::PionZero()) {
+            for (G4int i = 0; i < vecLen; i++)
+              delete vec[i];
+            vecLen = 0;
+            throw G4HadReentrentException(
+                __FILE__,
+                __LINE__,
+                "FullModelReactionDynamics::GenerateXandPt : a pion has been counted as a backward nucleon");
           }
+          vec[i]->SetSide(-3);
+          ++backwardNucleonCount;
+          continue;
         }
       }
-      //
-      //  set pt and phi values, they are changed somewhat in the iteration loop
-      //  set mass parameter for lambda fragmentation model
-      //
-      vecMass = vec[i]->GetMass()/GeV;
-      G4double ran = -std::log(1.0-G4UniformRand())/3.5;
-      if( vec[i]->GetSide() == -2 )   // backward nucleon
-      {
-        if( vec[i]->GetDefinition() == aKaonMinus ||
-            vec[i]->GetDefinition() == aKaonZeroL ||
-            vec[i]->GetDefinition() == aKaonZeroS ||
-            vec[i]->GetDefinition() == aKaonPlus ||
-            vec[i]->GetDefinition() == aPiMinus ||
-            vec[i]->GetDefinition() == aPiZero ||
-            vec[i]->GetDefinition() == aPiPlus )
-        {
-          aspar = 0.75;
-          pt = std::sqrt( std::pow( ran, 1.7 ) );
-        } else {                          // vec[i] must be a proton, neutron,
-          aspar = 0.20;                   //  lambda, sigma, xsi, or ion
-          pt = std::sqrt( std::pow( ran, 1.2 ) );
-        }
-      } else {                          // not a backward nucleon
-        if( vec[i]->GetDefinition() == aPiMinus ||
-            vec[i]->GetDefinition() == aPiZero ||
-            vec[i]->GetDefinition() == aPiPlus )
-        {
-          aspar = 0.75;
-          pt = std::sqrt( std::pow( ran, 1.7 ) );
-        } else if( vec[i]->GetDefinition() == aKaonMinus ||
-                   vec[i]->GetDefinition() == aKaonZeroL ||
-                   vec[i]->GetDefinition() == aKaonZeroS ||
-                   vec[i]->GetDefinition() == aKaonPlus )
-        {
-          aspar = 0.70;
-          pt = std::sqrt( std::pow( ran, 1.7 ) );
-        } else {                        // vec[i] must be a proton, neutron, 
-          aspar = 0.65;                 //  lambda, sigma, xsi, or ion
-          pt = std::sqrt( std::pow( ran, 1.5 ) );
-        }
+    }
+    //
+    //  set pt and phi values, they are changed somewhat in the iteration loop
+    //  set mass parameter for lambda fragmentation model
+    //
+    vecMass = vec[i]->GetMass() / GeV;
+    G4double ran = -std::log(1.0 - G4UniformRand()) / 3.5;
+    if (vec[i]->GetSide() == -2)  // backward nucleon
+    {
+      if (vec[i]->GetDefinition() == aKaonMinus || vec[i]->GetDefinition() == aKaonZeroL ||
+          vec[i]->GetDefinition() == aKaonZeroS || vec[i]->GetDefinition() == aKaonPlus ||
+          vec[i]->GetDefinition() == aPiMinus || vec[i]->GetDefinition() == aPiZero ||
+          vec[i]->GetDefinition() == aPiPlus) {
+        aspar = 0.75;
+        pt = std::sqrt(std::pow(ran, 1.7));
+      } else {         // vec[i] must be a proton, neutron,
+        aspar = 0.20;  //  lambda, sigma, xsi, or ion
+        pt = std::sqrt(std::pow(ran, 1.2));
+      }
+    } else {  // not a backward nucleon
+      if (vec[i]->GetDefinition() == aPiMinus || vec[i]->GetDefinition() == aPiZero ||
+          vec[i]->GetDefinition() == aPiPlus) {
+        aspar = 0.75;
+        pt = std::sqrt(std::pow(ran, 1.7));
+      } else if (vec[i]->GetDefinition() == aKaonMinus || vec[i]->GetDefinition() == aKaonZeroL ||
+                 vec[i]->GetDefinition() == aKaonZeroS || vec[i]->GetDefinition() == aKaonPlus) {
+        aspar = 0.70;
+        pt = std::sqrt(std::pow(ran, 1.7));
+      } else {         // vec[i] must be a proton, neutron,
+        aspar = 0.65;  //  lambda, sigma, xsi, or ion
+        pt = std::sqrt(std::pow(ran, 1.5));
+      }
+    }
+    pt = std::max(0.001, pt);
+    vec[i]->SetMomentum(pt * std::cos(phi) * GeV, pt * std::sin(phi) * GeV);
+    for (G4int j = 0; j < 20; ++j)
+      binl[j] = j / (19. * pt);
+    if (vec[i]->GetSide() > 0)
+      et = pseudoParticle[0].GetTotalEnergy() / GeV;
+    else
+      et = pseudoParticle[1].GetTotalEnergy() / GeV;
+    dndl[0] = 0.0;
+    //
+    //   start of outer iteration loop
+    //
+    outerCounter = 0;
+    eliminateThisParticle = true;
+    resetEnergies = true;
+    while (++outerCounter < 3) {
+      for (l = 1; l < 20; ++l) {
+        x = (binl[l] + binl[l - 1]) / 2.;
+        pt = std::max(0.001, pt);
+        if (x > 1.0 / pt)
+          dndl[l] += dndl[l - 1];  //  changed from just  =  on 02 April 98
+        else
+          dndl[l] = et * aspar / std::sqrt(std::pow((1. + aspar * x * aspar * x), 3)) * (binl[l] - binl[l - 1]) /
+                        std::sqrt(pt * x * et * pt * x * et + pt * pt + vecMass * vecMass) +
+                    dndl[l - 1];
       }
-      pt = std::max( 0.001, pt );
-      vec[i]->SetMomentum( pt*std::cos(phi)*GeV, pt*std::sin(phi)*GeV );
-      for( G4int j=0; j<20; ++j )binl[j] = j/(19.*pt);
-      if( vec[i]->GetSide() > 0 )
-        et = pseudoParticle[0].GetTotalEnergy()/GeV;
-      else
-        et = pseudoParticle[1].GetTotalEnergy()/GeV;
-      dndl[0] = 0.0;
+      innerCounter = 0;
+      vec[i]->SetMomentum(pt * std::cos(phi) * GeV, pt * std::sin(phi) * GeV);
       //
-      //   start of outer iteration loop
+      //   start of inner iteration loop
       //
-      outerCounter = 0;
-      eliminateThisParticle = true;
-      resetEnergies = true;
-      while( ++outerCounter < 3 )
-      {
-        for( l=1; l<20; ++l )
-        {
-          x = (binl[l]+binl[l-1])/2.;
-          pt = std::max( 0.001, pt );
-          if( x > 1.0/pt )
-            dndl[l] += dndl[l-1];   //  changed from just  =  on 02 April 98
-          else
-            dndl[l] = et * aspar/std::sqrt( std::pow((1.+aspar*x*aspar*x),3) )
-              * (binl[l]-binl[l-1]) / std::sqrt( pt*x*et*pt*x*et + pt*pt + vecMass*vecMass )
-              + dndl[l-1];
-        }
-        innerCounter = 0;
-        vec[i]->SetMomentum( pt*std::cos(phi)*GeV, pt*std::sin(phi)*GeV );
-        //
-        //   start of inner iteration loop
-        //
-        while( ++innerCounter < 7 )
-        {
-          ran = G4UniformRand()*dndl[19];
-          l = 1;
-          while( ( ran >= dndl[l] ) && ( l < 20 ) )l++;
-          l = std::min( 19, l );
-          x = std::min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );
-          if( vec[i]->GetSide() < 0 )x *= -1.;
-          vec[i]->SetMomentum( x*et*GeV );              // set the z-momentum
-          totalEnergy = std::sqrt( x*et*x*et + pt*pt + vecMass*vecMass );
-          vec[i]->SetTotalEnergy( totalEnergy*GeV );
-          kineticEnergy = vec[i]->GetKineticEnergy()/GeV;
-          if( vec[i]->GetSide() > 0 )                            // forward side
+      while (++innerCounter < 7) {
+        ran = G4UniformRand() * dndl[19];
+        l = 1;
+        while ((ran >= dndl[l]) && (l < 20))
+          l++;
+        l = std::min(19, l);
+        x = std::min(1.0, pt * (binl[l - 1] + G4UniformRand() * (binl[l] - binl[l - 1]) / 2.));
+        if (vec[i]->GetSide() < 0)
+          x *= -1.;
+        vec[i]->SetMomentum(x * et * GeV);  // set the z-momentum
+        totalEnergy = std::sqrt(x * et * x * et + pt * pt + vecMass * vecMass);
+        vec[i]->SetTotalEnergy(totalEnergy * GeV);
+        kineticEnergy = vec[i]->GetKineticEnergy() / GeV;
+        if (vec[i]->GetSide() > 0)  // forward side
+        {
+          if ((forwardKinetic + kineticEnergy) < 0.95 * forwardEnergy) {
+            pseudoParticle[4] = pseudoParticle[4] + (*vec[i]);
+            forwardKinetic += kineticEnergy;
+            pseudoParticle[6] = pseudoParticle[4] + pseudoParticle[5];
+            pseudoParticle[6].SetMomentum(0.0);  // set the z-momentum
+            phi = pseudoParticle[6].Angle(pseudoParticle[8]);
+            if (pseudoParticle[6].GetMomentum().y() / MeV < 0.0)
+              phi = twopi - phi;
+            phi += pi + normal() * pi / 12.0;
+            if (phi > twopi)
+              phi -= twopi;
+            if (phi < 0.0)
+              phi = twopi - phi;
+            outerCounter = 2;               // leave outer loop
+            eliminateThisParticle = false;  // don't eliminate this particle
+            resetEnergies = false;
+            break;  // leave inner loop
+          }
+          if (innerCounter > 5)
+            break;                        // leave inner loop
+          if (backwardEnergy >= vecMass)  // switch sides
           {
-            if( (forwardKinetic+kineticEnergy) < 0.95*forwardEnergy )
-            {
-              pseudoParticle[4] = pseudoParticle[4] + (*vec[i]);
-              forwardKinetic += kineticEnergy;
-              pseudoParticle[6] = pseudoParticle[4] + pseudoParticle[5];
-              pseudoParticle[6].SetMomentum( 0.0 );           // set the z-momentum
-              phi = pseudoParticle[6].Angle( pseudoParticle[8] );
-              if( pseudoParticle[6].GetMomentum().y()/MeV < 0.0 )phi = twopi - phi;
-              phi += pi + normal()*pi/12.0;
-              if( phi > twopi )phi -= twopi;
-              if( phi < 0.0 )phi = twopi - phi;
-              outerCounter = 2;                     // leave outer loop
-              eliminateThisParticle = false;        // don't eliminate this particle
-              resetEnergies = false;
-              break;                                // leave inner loop
-            }
-            if( innerCounter > 5 )break;           // leave inner loop
-            if( backwardEnergy >= vecMass )  // switch sides
-            {
-              vec[i]->SetSide( -1 );
-              forwardEnergy += vecMass;
-              backwardEnergy -= vecMass;
-              ++backwardCount;
-            }
-          } else {                                                 // backward side
-           G4double xxx = 0.95+0.05*extraNucleonCount/20.0;
-           if( (backwardKinetic+kineticEnergy) < xxx*backwardEnergy )
-            {
-              pseudoParticle[5] = pseudoParticle[5] + (*vec[i]);
-              backwardKinetic += kineticEnergy;
-              pseudoParticle[6] = pseudoParticle[4] + pseudoParticle[5];
-              pseudoParticle[6].SetMomentum( 0.0 );           // set the z-momentum
-              phi = pseudoParticle[6].Angle( pseudoParticle[8] );
-              if( pseudoParticle[6].GetMomentum().y()/MeV < 0.0 )phi = twopi - phi;
-              phi += pi + normal() * pi / 12.0;
-              if( phi > twopi )phi -= twopi;
-              if( phi < 0.0 )phi = twopi - phi;
-              outerCounter = 2;                    // leave outer loop
-              eliminateThisParticle = false;       // don't eliminate this particle
-              resetEnergies = false;
-              break;                               // leave inner loop
-            }
-            if( innerCounter > 5 )break;           // leave inner loop
-            if( forwardEnergy >= vecMass )  // switch sides
-            {
-              vec[i]->SetSide( 1 );
-              forwardEnergy -= vecMass;
-              backwardEnergy += vecMass;
-              backwardCount--;
-            }
+            vec[i]->SetSide(-1);
+            forwardEnergy += vecMass;
+            backwardEnergy -= vecMass;
+            ++backwardCount;
           }
-          G4ThreeVector momentum = vec[i]->GetMomentum();
-          vec[i]->SetMomentum( momentum.x() * 0.9, momentum.y() * 0.9 );
-          pt *= 0.9;
-          dndl[19] *= 0.9;
-        }                       // closes inner loop
-        if( resetEnergies )
-        {
-          //   if we get to here, the inner loop has been Done 6 Times
-          //   reset the kinetic energies of previously Done particles, if they are lighter
-          //    than protons and in the forward hemisphere
-          //   then continue with outer loop
-          //
-          forwardKinetic = 0.0;
-          backwardKinetic = 0.0;
-          pseudoParticle[4].SetZero();
-          pseudoParticle[5].SetZero();
-          for( l=i+1; l<vecLen; ++l )
+        } else {  // backward side
+          G4double xxx = 0.95 + 0.05 * extraNucleonCount / 20.0;
+          if ((backwardKinetic + kineticEnergy) < xxx * backwardEnergy) {
+            pseudoParticle[5] = pseudoParticle[5] + (*vec[i]);
+            backwardKinetic += kineticEnergy;
+            pseudoParticle[6] = pseudoParticle[4] + pseudoParticle[5];
+            pseudoParticle[6].SetMomentum(0.0);  // set the z-momentum
+            phi = pseudoParticle[6].Angle(pseudoParticle[8]);
+            if (pseudoParticle[6].GetMomentum().y() / MeV < 0.0)
+              phi = twopi - phi;
+            phi += pi + normal() * pi / 12.0;
+            if (phi > twopi)
+              phi -= twopi;
+            if (phi < 0.0)
+              phi = twopi - phi;
+            outerCounter = 2;               // leave outer loop
+            eliminateThisParticle = false;  // don't eliminate this particle
+            resetEnergies = false;
+            break;  // leave inner loop
+          }
+          if (innerCounter > 5)
+            break;                       // leave inner loop
+          if (forwardEnergy >= vecMass)  // switch sides
           {
-            if( vec[l]->GetSide() > 0 ||
-                vec[l]->GetDefinition() == aKaonMinus ||
-                vec[l]->GetDefinition() == aKaonZeroL ||
-                vec[l]->GetDefinition() == aKaonZeroS ||
-                vec[l]->GetDefinition() == aKaonPlus ||
-                vec[l]->GetDefinition() == aPiMinus ||
-                vec[l]->GetDefinition() == aPiZero ||
-                vec[l]->GetDefinition() == aPiPlus )
-            {
-              G4double tempMass = vec[l]->GetMass()/MeV;
-              totalEnergy = 0.95*vec[l]->GetTotalEnergy()/MeV + 0.05*tempMass;
-              totalEnergy = std::max( tempMass, totalEnergy );
-              vec[l]->SetTotalEnergy( totalEnergy*MeV );
-              pp = std::sqrt( std::abs( totalEnergy*totalEnergy - tempMass*tempMass ) );
-              pp1 = vec[l]->GetMomentum().mag()/MeV;
-              if( pp1 < 1.0e-6*GeV )
-              {
-                G4double rthnve = pi*G4UniformRand();
-                G4double phinve = twopi*G4UniformRand();
-                G4double srth = std::sin(rthnve);
-                vec[l]->SetMomentum( pp*srth*std::cos(phinve)*MeV,
-                                     pp*srth*std::sin(phinve)*MeV,
-                                     pp*std::cos(rthnve)*MeV ) ;
-              } else {
-                vec[l]->SetMomentum( vec[l]->GetMomentum() * (pp/pp1) );
-              }
-              G4double px = vec[l]->GetMomentum().x()/MeV;
-              G4double py = vec[l]->GetMomentum().y()/MeV;
-              pt = std::max( 1.0, std::sqrt( px*px + py*py ) )/GeV;
-              if( vec[l]->GetSide() > 0 )
-              {
-                forwardKinetic += vec[l]->GetKineticEnergy()/GeV;
-                pseudoParticle[4] = pseudoParticle[4] + (*vec[l]);
-              } else {
-                backwardKinetic += vec[l]->GetKineticEnergy()/GeV;
-                pseudoParticle[5] = pseudoParticle[5] + (*vec[l]);
-              }
-            }
+            vec[i]->SetSide(1);
+            forwardEnergy -= vecMass;
+            backwardEnergy += vecMass;
+            backwardCount--;
           }
         }
-      }    // closes outer loop
-              
-      if( eliminateThisParticle && vec[i]->GetMayBeKilled())  // not enough energy, eliminate this particle
-      {
-        if( vec[i]->GetSide() > 0 )
-        {
-          --forwardCount;
-          forwardEnergy += vecMass;
-        } else {
-          if( vec[i]->GetSide() == -2 )
-          {
-            --extraNucleonCount;
-            extraNucleonMass -= vecMass;
-            backwardEnergy -= vecMass;
+        G4ThreeVector momentum = vec[i]->GetMomentum();
+        vec[i]->SetMomentum(momentum.x() * 0.9, momentum.y() * 0.9);
+        pt *= 0.9;
+        dndl[19] *= 0.9;
+      }  // closes inner loop
+      if (resetEnergies) {
+        //   if we get to here, the inner loop has been Done 6 Times
+        //   reset the kinetic energies of previously Done particles, if they are lighter
+        //    than protons and in the forward hemisphere
+        //   then continue with outer loop
+        //
+        forwardKinetic = 0.0;
+        backwardKinetic = 0.0;
+        pseudoParticle[4].SetZero();
+        pseudoParticle[5].SetZero();
+        for (l = i + 1; l < vecLen; ++l) {
+          if (vec[l]->GetSide() > 0 || vec[l]->GetDefinition() == aKaonMinus || vec[l]->GetDefinition() == aKaonZeroL ||
+              vec[l]->GetDefinition() == aKaonZeroS || vec[l]->GetDefinition() == aKaonPlus ||
+              vec[l]->GetDefinition() == aPiMinus || vec[l]->GetDefinition() == aPiZero ||
+              vec[l]->GetDefinition() == aPiPlus) {
+            G4double tempMass = vec[l]->GetMass() / MeV;
+            totalEnergy = 0.95 * vec[l]->GetTotalEnergy() / MeV + 0.05 * tempMass;
+            totalEnergy = std::max(tempMass, totalEnergy);
+            vec[l]->SetTotalEnergy(totalEnergy * MeV);
+            pp = std::sqrt(std::abs(totalEnergy * totalEnergy - tempMass * tempMass));
+            pp1 = vec[l]->GetMomentum().mag() / MeV;
+            if (pp1 < 1.0e-6 * GeV) {
+              G4double rthnve = pi * G4UniformRand();
+              G4double phinve = twopi * G4UniformRand();
+              G4double srth = std::sin(rthnve);
+              vec[l]->SetMomentum(
+                  pp * srth * std::cos(phinve) * MeV, pp * srth * std::sin(phinve) * MeV, pp * std::cos(rthnve) * MeV);
+            } else {
+              vec[l]->SetMomentum(vec[l]->GetMomentum() * (pp / pp1));
+            }
+            G4double px = vec[l]->GetMomentum().x() / MeV;
+            G4double py = vec[l]->GetMomentum().y() / MeV;
+            pt = std::max(1.0, std::sqrt(px * px + py * py)) / GeV;
+            if (vec[l]->GetSide() > 0) {
+              forwardKinetic += vec[l]->GetKineticEnergy() / GeV;
+              pseudoParticle[4] = pseudoParticle[4] + (*vec[l]);
+            } else {
+              backwardKinetic += vec[l]->GetKineticEnergy() / GeV;
+              pseudoParticle[5] = pseudoParticle[5] + (*vec[l]);
+            }
           }
-          --backwardCount;
-          backwardEnergy += vecMass;
         }
-        for( G4int j=i; j<(vecLen-1); ++j )*vec[j] = *vec[j+1];    // shift up
-        G4ReactionProduct *temp = vec[vecLen-1];
-        delete temp;
-        // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-        if( --vecLen == 0 )return false;  // all the secondaries have been eliminated
-        pseudoParticle[6] = pseudoParticle[4] + pseudoParticle[5];
-        pseudoParticle[6].SetMomentum( 0.0 );                 // set z-momentum
       }
-    }   // closes main for loop
+    }  // closes outer loop
 
-    //
-    //  for the incident particle:  it was placed in the forward hemisphere
-    //   set pt and phi values, they are changed somewhat in the iteration loop
-    //   set mass parameter for lambda fragmentation model
-    //
-    G4double phi = G4UniformRand()*twopi;
-    G4double ran = -std::log(1.0-G4UniformRand());
-    if( currentParticle.GetDefinition() == aPiMinus ||
-        currentParticle.GetDefinition() == aPiZero ||
-        currentParticle.GetDefinition() == aPiPlus )
-    {
-      aspar = 0.60;
-      pt = std::sqrt( std::pow( ran/6.0, 1.7 ) );
-    } else if( currentParticle.GetDefinition() == aKaonMinus ||
-               currentParticle.GetDefinition() == aKaonZeroL ||
-               currentParticle.GetDefinition() == aKaonZeroS ||
-               currentParticle.GetDefinition() == aKaonPlus )
-    {
-      aspar = 0.50;
-      pt = std::sqrt( std::pow( ran/5.0, 1.4 ) );
-    } else {
-      aspar = 0.40;
-      pt = std::sqrt( std::pow( ran/4.0, 1.2 ) );
-    }
-    for( G4int j=0; j<20; ++j )binl[j] = j/(19.*pt);
-    currentParticle.SetMomentum( pt*std::cos(phi)*GeV, pt*std::sin(phi)*GeV );
-    et = pseudoParticle[0].GetTotalEnergy()/GeV;
-    dndl[0] = 0.0;
-    vecMass = currentParticle.GetMass()/GeV;
-    for( l=1; l<20; ++l )
-    {
-      x = (binl[l]+binl[l-1])/2.;
-      if( x > 1.0/pt )
-        dndl[l] += dndl[l-1];   //  changed from just  =   on 02 April 98
-      else
-        dndl[l] = aspar/std::sqrt( std::pow((1.+sqr(aspar*x)),3) ) *
-          (binl[l]-binl[l-1]) * et / std::sqrt( pt*x*et*pt*x*et + pt*pt + vecMass*vecMass ) +
-          dndl[l-1];
-    }
-    ran = G4UniformRand()*dndl[19];
-    l = 1;
-    while( (ran>dndl[l]) && (l<20) )l++;
-    l = std::min( 19, l );
-    x = std::min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );   
-    currentParticle.SetMomentum( x*et*GeV );                 // set the z-momentum
-    if( forwardEnergy < forwardKinetic )
-      totalEnergy = vecMass + 0.04*std::fabs(normal());
-    else
-      totalEnergy = vecMass + forwardEnergy - forwardKinetic;
-    currentParticle.SetTotalEnergy( totalEnergy*GeV );
-    pp = std::sqrt( std::abs( totalEnergy*totalEnergy - vecMass*vecMass ) )*GeV;
-    pp1 = currentParticle.GetMomentum().mag()/MeV;
-    if( pp1 < 1.0e-6*GeV )
-    {
-      G4double rthnve = pi*G4UniformRand();
-      G4double phinve = twopi*G4UniformRand();
-      G4double srth = std::sin(rthnve);
-      currentParticle.SetMomentum( pp*srth*std::cos(phinve)*MeV,
-                                   pp*srth*std::sin(phinve)*MeV,
-                                   pp*std::cos(rthnve)*MeV );
-    } else {
-      currentParticle.SetMomentum( currentParticle.GetMomentum() * (pp/pp1) );
-    }
-    pseudoParticle[4] = pseudoParticle[4] + currentParticle;
-    //
-    // this finishes the current particle
-    // now for the target particle
-    //
-    if( backwardNucleonCount < 18 )
+    if (eliminateThisParticle && vec[i]->GetMayBeKilled())  // not enough energy, eliminate this particle
     {
-      targetParticle.SetSide( -3 );
-      ++backwardNucleonCount;
+      if (vec[i]->GetSide() > 0) {
+        --forwardCount;
+        forwardEnergy += vecMass;
+      } else {
+        if (vec[i]->GetSide() == -2) {
+          --extraNucleonCount;
+          extraNucleonMass -= vecMass;
+          backwardEnergy -= vecMass;
+        }
+        --backwardCount;
+        backwardEnergy += vecMass;
+      }
+      for (G4int j = i; j < (vecLen - 1); ++j)
+        *vec[j] = *vec[j + 1];  // shift up
+      G4ReactionProduct *temp = vec[vecLen - 1];
+      delete temp;
+      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+      if (--vecLen == 0)
+        return false;  // all the secondaries have been eliminated
+      pseudoParticle[6] = pseudoParticle[4] + pseudoParticle[5];
+      pseudoParticle[6].SetMomentum(0.0);  // set z-momentum
     }
+  }  // closes main for loop
+
+  //
+  //  for the incident particle:  it was placed in the forward hemisphere
+  //   set pt and phi values, they are changed somewhat in the iteration loop
+  //   set mass parameter for lambda fragmentation model
+  //
+  G4double phi = G4UniformRand() * twopi;
+  G4double ran = -std::log(1.0 - G4UniformRand());
+  if (currentParticle.GetDefinition() == aPiMinus || currentParticle.GetDefinition() == aPiZero ||
+      currentParticle.GetDefinition() == aPiPlus) {
+    aspar = 0.60;
+    pt = std::sqrt(std::pow(ran / 6.0, 1.7));
+  } else if (currentParticle.GetDefinition() == aKaonMinus || currentParticle.GetDefinition() == aKaonZeroL ||
+             currentParticle.GetDefinition() == aKaonZeroS || currentParticle.GetDefinition() == aKaonPlus) {
+    aspar = 0.50;
+    pt = std::sqrt(std::pow(ran / 5.0, 1.4));
+  } else {
+    aspar = 0.40;
+    pt = std::sqrt(std::pow(ran / 4.0, 1.2));
+  }
+  for (G4int j = 0; j < 20; ++j)
+    binl[j] = j / (19. * pt);
+  currentParticle.SetMomentum(pt * std::cos(phi) * GeV, pt * std::sin(phi) * GeV);
+  et = pseudoParticle[0].GetTotalEnergy() / GeV;
+  dndl[0] = 0.0;
+  vecMass = currentParticle.GetMass() / GeV;
+  for (l = 1; l < 20; ++l) {
+    x = (binl[l] + binl[l - 1]) / 2.;
+    if (x > 1.0 / pt)
+      dndl[l] += dndl[l - 1];  //  changed from just  =   on 02 April 98
     else
-    {
-      //  set pt and phi values, they are changed somewhat in the iteration loop
-      //  set mass parameter for lambda fragmentation model
-      //
-      vecMass = targetParticle.GetMass()/GeV;
-      ran = -std::log(1.0-G4UniformRand());
-      aspar = 0.40;
-      pt = std::max( 0.001, std::sqrt( std::pow( ran/4.0, 1.2 ) ) );
-      targetParticle.SetMomentum( pt*std::cos(phi)*GeV, pt*std::sin(phi)*GeV );
-      for( G4int j=0; j<20; ++j )binl[j] = (j-1.)/(19.*pt);
-      et = pseudoParticle[1].GetTotalEnergy()/GeV;
-      dndl[0] = 0.0;
-      outerCounter = 0;
-      resetEnergies = true;
-      while( ++outerCounter < 3 )     // start of outer iteration loop
-      {
-        for( l=1; l<20; ++l )
+      dndl[l] = aspar / std::sqrt(std::pow((1. + sqr(aspar * x)), 3)) * (binl[l] - binl[l - 1]) * et /
+                    std::sqrt(pt * x * et * pt * x * et + pt * pt + vecMass * vecMass) +
+                dndl[l - 1];
+  }
+  ran = G4UniformRand() * dndl[19];
+  l = 1;
+  while ((ran > dndl[l]) && (l < 20))
+    l++;
+  l = std::min(19, l);
+  x = std::min(1.0, pt * (binl[l - 1] + G4UniformRand() * (binl[l] - binl[l - 1]) / 2.));
+  currentParticle.SetMomentum(x * et * GeV);  // set the z-momentum
+  if (forwardEnergy < forwardKinetic)
+    totalEnergy = vecMass + 0.04 * std::fabs(normal());
+  else
+    totalEnergy = vecMass + forwardEnergy - forwardKinetic;
+  currentParticle.SetTotalEnergy(totalEnergy * GeV);
+  pp = std::sqrt(std::abs(totalEnergy * totalEnergy - vecMass * vecMass)) * GeV;
+  pp1 = currentParticle.GetMomentum().mag() / MeV;
+  if (pp1 < 1.0e-6 * GeV) {
+    G4double rthnve = pi * G4UniformRand();
+    G4double phinve = twopi * G4UniformRand();
+    G4double srth = std::sin(rthnve);
+    currentParticle.SetMomentum(
+        pp * srth * std::cos(phinve) * MeV, pp * srth * std::sin(phinve) * MeV, pp * std::cos(rthnve) * MeV);
+  } else {
+    currentParticle.SetMomentum(currentParticle.GetMomentum() * (pp / pp1));
+  }
+  pseudoParticle[4] = pseudoParticle[4] + currentParticle;
+  //
+  // this finishes the current particle
+  // now for the target particle
+  //
+  if (backwardNucleonCount < 18) {
+    targetParticle.SetSide(-3);
+    ++backwardNucleonCount;
+  } else {
+    //  set pt and phi values, they are changed somewhat in the iteration loop
+    //  set mass parameter for lambda fragmentation model
+    //
+    vecMass = targetParticle.GetMass() / GeV;
+    ran = -std::log(1.0 - G4UniformRand());
+    aspar = 0.40;
+    pt = std::max(0.001, std::sqrt(std::pow(ran / 4.0, 1.2)));
+    targetParticle.SetMomentum(pt * std::cos(phi) * GeV, pt * std::sin(phi) * GeV);
+    for (G4int j = 0; j < 20; ++j)
+      binl[j] = (j - 1.) / (19. * pt);
+    et = pseudoParticle[1].GetTotalEnergy() / GeV;
+    dndl[0] = 0.0;
+    outerCounter = 0;
+    resetEnergies = true;
+    while (++outerCounter < 3)  // start of outer iteration loop
+    {
+      for (l = 1; l < 20; ++l) {
+        x = (binl[l] + binl[l - 1]) / 2.;
+        if (x > 1.0 / pt)
+          dndl[l] += dndl[l - 1];  // changed from just  =  on 02 April 98
+        else
+          dndl[l] = aspar / std::sqrt(std::pow((1. + aspar * x * aspar * x), 3)) * (binl[l] - binl[l - 1]) * et /
+                        std::sqrt(pt * x * et * pt * x * et + pt * pt + vecMass * vecMass) +
+                    dndl[l - 1];
+      }
+      innerCounter = 0;
+      while (++innerCounter < 7)  // start of inner iteration loop
+      {
+        l = 1;
+        ran = G4UniformRand() * dndl[19];
+        while ((ran >= dndl[l]) && (l < 20))
+          l++;
+        l = std::min(19, l);
+        x = std::min(1.0, pt * (binl[l - 1] + G4UniformRand() * (binl[l] - binl[l - 1]) / 2.));
+        if (targetParticle.GetSide() < 0)
+          x *= -1.;
+        targetParticle.SetMomentum(x * et * GeV);  // set the z-momentum
+        totalEnergy = std::sqrt(x * et * x * et + pt * pt + vecMass * vecMass);
+        targetParticle.SetTotalEnergy(totalEnergy * GeV);
+        if (targetParticle.GetSide() < 0) {
+          G4double xxx = 0.95 + 0.05 * extraNucleonCount / 20.0;
+          if ((backwardKinetic + totalEnergy - vecMass) < xxx * backwardEnergy) {
+            pseudoParticle[5] = pseudoParticle[5] + targetParticle;
+            backwardKinetic += totalEnergy - vecMass;
+            pseudoParticle[6] = pseudoParticle[4] + pseudoParticle[5];
+            pseudoParticle[6].SetMomentum(0.0);  // set z-momentum
+            outerCounter = 2;                    // leave outer loop
+            resetEnergies = false;
+            break;  // leave inner loop
+          }
+          if (innerCounter > 5)
+            break;                       // leave inner loop
+          if (forwardEnergy >= vecMass)  // switch sides
+          {
+            targetParticle.SetSide(1);
+            forwardEnergy -= vecMass;
+            backwardEnergy += vecMass;
+            --backwardCount;
+          }
+          G4ThreeVector momentum = targetParticle.GetMomentum();
+          targetParticle.SetMomentum(momentum.x() * 0.9, momentum.y() * 0.9);
+          pt *= 0.9;
+          dndl[19] *= 0.9;
+        } else  // target has gone to forward side
         {
-          x = (binl[l]+binl[l-1])/2.;
-          if( x > 1.0/pt )
-            dndl[l] += dndl[l-1];   // changed from just  =  on 02 April 98
+          if (forwardEnergy < forwardKinetic)
+            totalEnergy = vecMass + 0.04 * std::fabs(normal());
           else
-            dndl[l] = aspar/std::sqrt( std::pow((1.+aspar*x*aspar*x),3) ) *
-              (binl[l]-binl[l-1])*et / std::sqrt( pt*x*et*pt*x*et+pt*pt+vecMass*vecMass ) +
-              dndl[l-1];
+            totalEnergy = vecMass + forwardEnergy - forwardKinetic;
+          targetParticle.SetTotalEnergy(totalEnergy * GeV);
+          pp = std::sqrt(std::abs(totalEnergy * totalEnergy - vecMass * vecMass)) * GeV;
+          pp1 = targetParticle.GetMomentum().mag() / MeV;
+          if (pp1 < 1.0e-6 * GeV) {
+            G4double rthnve = pi * G4UniformRand();
+            G4double phinve = twopi * G4UniformRand();
+            G4double srth = std::sin(rthnve);
+            targetParticle.SetMomentum(
+                pp * srth * std::cos(phinve) * MeV, pp * srth * std::sin(phinve) * MeV, pp * std::cos(rthnve) * MeV);
+          } else
+            targetParticle.SetMomentum(targetParticle.GetMomentum() * (pp / pp1));
+
+          pseudoParticle[4] = pseudoParticle[4] + targetParticle;
+          outerCounter = 2;  // leave outer loop
+          //eliminateThisParticle = false;       // don't eliminate this particle
+          resetEnergies = false;
+          break;  // leave inner loop
         }
-        innerCounter = 0;
-        while( ++innerCounter < 7 )    // start of inner iteration loop
-        {
-          l = 1;
-          ran = G4UniformRand()*dndl[19];
-          while( ( ran >= dndl[l] ) && ( l < 20 ) )l++;
-          l = std::min( 19, l );
-          x = std::min( 1.0, pt*(binl[l-1] + G4UniformRand()*(binl[l]-binl[l-1])/2.) );
-          if( targetParticle.GetSide() < 0 )x *= -1.;
-          targetParticle.SetMomentum( x*et*GeV );                // set the z-momentum
-          totalEnergy = std::sqrt( x*et*x*et + pt*pt + vecMass*vecMass );
-          targetParticle.SetTotalEnergy( totalEnergy*GeV );
-          if( targetParticle.GetSide() < 0 )
-          {
-            G4double xxx = 0.95+0.05*extraNucleonCount/20.0;
-            if( (backwardKinetic+totalEnergy-vecMass) < xxx*backwardEnergy )
-            {
-              pseudoParticle[5] = pseudoParticle[5] + targetParticle;
-              backwardKinetic += totalEnergy - vecMass;
-              pseudoParticle[6] = pseudoParticle[4] + pseudoParticle[5];
-              pseudoParticle[6].SetMomentum( 0.0 );                      // set z-momentum
-              outerCounter = 2;                    // leave outer loop
-              resetEnergies = false;
-              break;                               // leave inner loop
-            }
-            if( innerCounter > 5 )break;           // leave inner loop
-            if( forwardEnergy >= vecMass )  // switch sides
-            {
-              targetParticle.SetSide( 1 );
-              forwardEnergy -= vecMass;
-              backwardEnergy += vecMass;
-              --backwardCount;
-            }
-            G4ThreeVector momentum = targetParticle.GetMomentum();
-            targetParticle.SetMomentum( momentum.x() * 0.9, momentum.y() * 0.9 );
-            pt *= 0.9;
-            dndl[19] *= 0.9;
-          }
-          else                    // target has gone to forward side
-          {
-            if( forwardEnergy < forwardKinetic )
-              totalEnergy = vecMass + 0.04*std::fabs(normal());
-            else
-              totalEnergy = vecMass + forwardEnergy - forwardKinetic;
-            targetParticle.SetTotalEnergy( totalEnergy*GeV );
-            pp = std::sqrt( std::abs( totalEnergy*totalEnergy - vecMass*vecMass ) )*GeV;
-            pp1 = targetParticle.GetMomentum().mag()/MeV;
-            if( pp1 < 1.0e-6*GeV )
-            {
-              G4double rthnve = pi*G4UniformRand();
-              G4double phinve = twopi*G4UniformRand();
+      }  // closes inner loop
+      if (resetEnergies) {
+        //   if we get to here, the inner loop has been Done 6 Times
+        //   reset the kinetic energies of previously Done particles, if they are lighter
+        //    than protons and in the forward hemisphere
+        //   then continue with outer loop
+
+        forwardKinetic = backwardKinetic = 0.0;
+        pseudoParticle[4].SetZero();
+        pseudoParticle[5].SetZero();
+        for (l = 0; l < vecLen; ++l)  // changed from l=1  on 02 April 98
+        {
+          if (vec[l]->GetSide() > 0 || vec[l]->GetDefinition() == aKaonMinus || vec[l]->GetDefinition() == aKaonZeroL ||
+              vec[l]->GetDefinition() == aKaonZeroS || vec[l]->GetDefinition() == aKaonPlus ||
+              vec[l]->GetDefinition() == aPiMinus || vec[l]->GetDefinition() == aPiZero ||
+              vec[l]->GetDefinition() == aPiPlus) {
+            G4double tempMass = vec[l]->GetMass() / GeV;
+            totalEnergy = std::max(tempMass, 0.95 * vec[l]->GetTotalEnergy() / GeV + 0.05 * tempMass);
+            vec[l]->SetTotalEnergy(totalEnergy * GeV);
+            pp = std::sqrt(std::abs(totalEnergy * totalEnergy - tempMass * tempMass)) * GeV;
+            pp1 = vec[l]->GetMomentum().mag() / MeV;
+            if (pp1 < 1.0e-6 * GeV) {
+              G4double rthnve = pi * G4UniformRand();
+              G4double phinve = twopi * G4UniformRand();
               G4double srth = std::sin(rthnve);
-              targetParticle.SetMomentum( pp*srth*std::cos(phinve)*MeV,
-                                          pp*srth*std::sin(phinve)*MeV,
-                                          pp*std::cos(rthnve)*MeV );
-            }
-            else
-              targetParticle.SetMomentum( targetParticle.GetMomentum() * (pp/pp1) );
+              vec[l]->SetMomentum(
+                  pp * srth * std::cos(phinve) * MeV, pp * srth * std::sin(phinve) * MeV, pp * std::cos(rthnve) * MeV);
+            } else
+              vec[l]->SetMomentum(vec[l]->GetMomentum() * (pp / pp1));
 
-            pseudoParticle[4] = pseudoParticle[4] + targetParticle;
-            outerCounter = 2;                    // leave outer loop
-            //eliminateThisParticle = false;       // don't eliminate this particle
-            resetEnergies = false;
-            break;                               // leave inner loop
-          }
-        }    // closes inner loop
-        if( resetEnergies )
-        {
-          //   if we get to here, the inner loop has been Done 6 Times
-          //   reset the kinetic energies of previously Done particles, if they are lighter
-          //    than protons and in the forward hemisphere
-          //   then continue with outer loop
-          
-          forwardKinetic = backwardKinetic = 0.0;
-          pseudoParticle[4].SetZero();
-          pseudoParticle[5].SetZero();
-          for( l=0; l<vecLen; ++l ) // changed from l=1  on 02 April 98
-          {
-            if( vec[l]->GetSide() > 0 ||
-                vec[l]->GetDefinition() == aKaonMinus ||
-                vec[l]->GetDefinition() == aKaonZeroL ||
-                vec[l]->GetDefinition() == aKaonZeroS ||
-                vec[l]->GetDefinition() == aKaonPlus ||
-                vec[l]->GetDefinition() == aPiMinus ||
-                vec[l]->GetDefinition() == aPiZero ||
-                vec[l]->GetDefinition() == aPiPlus )
-            {
-              G4double tempMass = vec[l]->GetMass()/GeV;
-              totalEnergy =
-                std::max( tempMass, 0.95*vec[l]->GetTotalEnergy()/GeV + 0.05*tempMass );
-              vec[l]->SetTotalEnergy( totalEnergy*GeV );
-              pp = std::sqrt( std::abs( totalEnergy*totalEnergy - tempMass*tempMass ) )*GeV;
-              pp1 = vec[l]->GetMomentum().mag()/MeV;
-              if( pp1 < 1.0e-6*GeV )
-              {
-                G4double rthnve = pi*G4UniformRand();
-                G4double phinve = twopi*G4UniformRand();
-                G4double srth = std::sin(rthnve);
-                vec[l]->SetMomentum( pp*srth*std::cos(phinve)*MeV,
-                                     pp*srth*std::sin(phinve)*MeV,
-                                     pp*std::cos(rthnve)*MeV );
-              }
-              else
-                vec[l]->SetMomentum( vec[l]->GetMomentum() * (pp/pp1) );
-
-              pt = std::max( 0.001*GeV, std::sqrt( sqr(vec[l]->GetMomentum().x()/MeV) +
-                                         sqr(vec[l]->GetMomentum().y()/MeV) ) )/GeV;
-              if( vec[l]->GetSide() > 0)
-              {
-                forwardKinetic += vec[l]->GetKineticEnergy()/GeV;
-                pseudoParticle[4] = pseudoParticle[4] + (*vec[l]);
-              } else {
-                backwardKinetic += vec[l]->GetKineticEnergy()/GeV;
-                pseudoParticle[5] = pseudoParticle[5] + (*vec[l]);
-              }
+            pt = std::max(0.001 * GeV,
+                          std::sqrt(sqr(vec[l]->GetMomentum().x() / MeV) + sqr(vec[l]->GetMomentum().y() / MeV))) /
+                 GeV;
+            if (vec[l]->GetSide() > 0) {
+              forwardKinetic += vec[l]->GetKineticEnergy() / GeV;
+              pseudoParticle[4] = pseudoParticle[4] + (*vec[l]);
+            } else {
+              backwardKinetic += vec[l]->GetKineticEnergy() / GeV;
+              pseudoParticle[5] = pseudoParticle[5] + (*vec[l]);
             }
           }
         }
-      }    // closes outer loop
+      }
+    }  // closes outer loop
+  }
+  //
+  //  this finishes the target particle
+  // backward nucleons produced with a cluster model
+  //
+  pseudoParticle[6].Lorentz(pseudoParticle[3], pseudoParticle[2]);
+  pseudoParticle[6] = pseudoParticle[6] - pseudoParticle[4];
+  pseudoParticle[6] = pseudoParticle[6] - pseudoParticle[5];
+  if (backwardNucleonCount == 1)  // target particle is the only backward nucleon
+  {
+    G4double ekin = std::min(backwardEnergy - backwardKinetic, centerofmassEnergy / 2.0 - protonMass / GeV);
+    if (ekin < 0.04)
+      ekin = 0.04 * std::fabs(normal());
+    vecMass = targetParticle.GetMass() / GeV;
+    totalEnergy = ekin + vecMass;
+    targetParticle.SetTotalEnergy(totalEnergy * GeV);
+    pp = std::sqrt(std::abs(totalEnergy * totalEnergy - vecMass * vecMass)) * GeV;
+    pp1 = pseudoParticle[6].GetMomentum().mag() / MeV;
+    if (pp1 < 1.0e-6 * GeV) {
+      rthnve = pi * G4UniformRand();
+      phinve = twopi * G4UniformRand();
+      G4double srth = std::sin(rthnve);
+      targetParticle.SetMomentum(
+          pp * srth * std::cos(phinve) * MeV, pp * srth * std::sin(phinve) * MeV, pp * std::cos(rthnve) * MeV);
+    } else {
+      targetParticle.SetMomentum(pseudoParticle[6].GetMomentum() * (pp / pp1));
     }
-    //
-    //  this finishes the target particle
-    // backward nucleons produced with a cluster model
-    //
-    pseudoParticle[6].Lorentz( pseudoParticle[3], pseudoParticle[2] );
-    pseudoParticle[6] = pseudoParticle[6] - pseudoParticle[4];
-    pseudoParticle[6] = pseudoParticle[6] - pseudoParticle[5];
-    if( backwardNucleonCount == 1 )  // target particle is the only backward nucleon
-    {
-      G4double ekin =
-        std::min( backwardEnergy-backwardKinetic, centerofmassEnergy/2.0-protonMass/GeV );
-      if( ekin < 0.04 )ekin = 0.04 * std::fabs( normal() );
-      vecMass = targetParticle.GetMass()/GeV;
-      totalEnergy = ekin+vecMass;
-      targetParticle.SetTotalEnergy( totalEnergy*GeV );
-      pp = std::sqrt( std::abs( totalEnergy*totalEnergy - vecMass*vecMass ) )*GeV;
-      pp1 = pseudoParticle[6].GetMomentum().mag()/MeV;
-      if( pp1 < 1.0e-6*GeV )
-      { 
-        rthnve = pi*G4UniformRand();
-        phinve = twopi*G4UniformRand();
-        G4double srth = std::sin(rthnve);
-        targetParticle.SetMomentum( pp*srth*std::cos(phinve)*MeV,
-                                    pp*srth*std::sin(phinve)*MeV,
-                                    pp*std::cos(rthnve)*MeV );
-      } else {
-        targetParticle.SetMomentum( pseudoParticle[6].GetMomentum() * (pp/pp1) );
+    pseudoParticle[5] = pseudoParticle[5] + targetParticle;
+  } else  // more than one backward nucleon
+  {
+    const G4double cpar[] = {0.6, 0.6, 0.35, 0.15, 0.10};
+    const G4double gpar[] = {2.6, 2.6, 1.80, 1.30, 1.20};
+    // Replaced the following min function to get correct behaviour on DEC.
+    G4int tempCount = std::max(1, std::min(5, backwardNucleonCount)) - 1;
+    //cout << "backwardNucleonCount " << backwardNucleonCount << G4endl;
+    //cout << "tempCount " << tempCount << G4endl;
+    G4double rmb0 = 0.0;
+    if (targetParticle.GetSide() == -3)
+      rmb0 += targetParticle.GetMass() / GeV;
+    for (i = 0; i < vecLen; ++i) {
+      if (vec[i]->GetSide() == -3)
+        rmb0 += vec[i]->GetMass() / GeV;
+    }
+    rmb = rmb0 + std::pow(-std::log(1.0 - G4UniformRand()), cpar[tempCount]) / gpar[tempCount];
+    totalEnergy = pseudoParticle[6].GetTotalEnergy() / GeV;
+    vecMass = std::min(rmb, totalEnergy);
+    pseudoParticle[6].SetMass(vecMass * GeV);
+    pp = std::sqrt(std::abs(totalEnergy * totalEnergy - vecMass * vecMass)) * GeV;
+    pp1 = pseudoParticle[6].GetMomentum().mag() / MeV;
+    if (pp1 < 1.0e-6 * GeV) {
+      rthnve = pi * G4UniformRand();
+      phinve = twopi * G4UniformRand();
+      G4double srth = std::sin(rthnve);
+      pseudoParticle[6].SetMomentum(
+          -pp * srth * std::cos(phinve) * MeV, -pp * srth * std::sin(phinve) * MeV, -pp * std::cos(rthnve) * MeV);
+    } else
+      pseudoParticle[6].SetMomentum(pseudoParticle[6].GetMomentum() * (-pp / pp1));
+
+    G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> tempV;  // tempV contains the backward nucleons
+    tempV.Initialize(backwardNucleonCount);
+    G4int tempLen = 0;
+    if (targetParticle.GetSide() == -3)
+      tempV.SetElement(tempLen++, &targetParticle);
+    for (i = 0; i < vecLen; ++i) {
+      if (vec[i]->GetSide() == -3)
+        tempV.SetElement(tempLen++, vec[i]);
+    }
+    if (tempLen != backwardNucleonCount) {
+      G4cerr << "tempLen is not the same as backwardNucleonCount" << G4endl;
+      G4cerr << "tempLen = " << tempLen;
+      G4cerr << ", backwardNucleonCount = " << backwardNucleonCount << G4endl;
+      G4cerr << "targetParticle side = " << targetParticle.GetSide() << G4endl;
+      G4cerr << "currentParticle side = " << currentParticle.GetSide() << G4endl;
+      for (i = 0; i < vecLen; ++i)
+        G4cerr << "particle #" << i << " side = " << vec[i]->GetSide() << G4endl;
+      exit(EXIT_FAILURE);
+    }
+    constantCrossSection = true;
+    // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+    if (tempLen >= 2) {
+      GenerateNBodyEvent(pseudoParticle[6].GetMass(), constantCrossSection, tempV, tempLen);
+      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+      if (targetParticle.GetSide() == -3) {
+        targetParticle.Lorentz(targetParticle, pseudoParticle[6]);
+        // tempV contains the real stuff
+        pseudoParticle[5] = pseudoParticle[5] + targetParticle;
+      }
+      for (i = 0; i < vecLen; ++i) {
+        if (vec[i]->GetSide() == -3) {
+          vec[i]->Lorentz(*vec[i], pseudoParticle[6]);
+          pseudoParticle[5] = pseudoParticle[5] + (*vec[i]);
+        }
       }
-      pseudoParticle[5] = pseudoParticle[5] + targetParticle;
+      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
     }
-    else  // more than one backward nucleon
-    {
-      const G4double cpar[] = { 0.6, 0.6, 0.35, 0.15, 0.10 };
-      const G4double gpar[] = { 2.6, 2.6, 1.80, 1.30, 1.20 };
-      // Replaced the following min function to get correct behaviour on DEC.
-      G4int tempCount = std::max(1,std::min( 5, backwardNucleonCount )) - 1;
-      //cout << "backwardNucleonCount " << backwardNucleonCount << G4endl;
-      //cout << "tempCount " << tempCount << G4endl;
-      G4double rmb0 = 0.0;
-      if( targetParticle.GetSide() == -3 )
-        rmb0 += targetParticle.GetMass()/GeV;
-      for( i=0; i<vecLen; ++i )
-      {
-        if( vec[i]->GetSide() == -3 )rmb0 += vec[i]->GetMass()/GeV;
+  }
+  //
+  //  Lorentz transformation in lab system
+  //
+  if (vecLen == 0)
+    return false;  // all the secondaries have been eliminated
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+
+  G4int numberofFinalStateNucleons = 0;
+  if (currentParticle.GetDefinition() == aProton || currentParticle.GetDefinition() == aNeutron ||
+      currentParticle.GetDefinition() == G4SigmaMinus::SigmaMinus() ||
+      currentParticle.GetDefinition() == G4SigmaPlus::SigmaPlus() ||
+      currentParticle.GetDefinition() == G4SigmaZero::SigmaZero() ||
+      currentParticle.GetDefinition() == G4XiZero::XiZero() ||
+      currentParticle.GetDefinition() == G4XiMinus::XiMinus() ||
+      currentParticle.GetDefinition() == G4OmegaMinus::OmegaMinus() ||
+      currentParticle.GetDefinition() == G4Lambda::Lambda())
+    ++numberofFinalStateNucleons;
+  currentParticle.Lorentz(currentParticle, pseudoParticle[1]);
+
+  if (targetParticle.GetDefinition() == aProton || targetParticle.GetDefinition() == aNeutron ||
+      targetParticle.GetDefinition() == G4Lambda::Lambda() || targetParticle.GetDefinition() == G4XiZero::XiZero() ||
+      targetParticle.GetDefinition() == G4XiMinus::XiMinus() ||
+      targetParticle.GetDefinition() == G4OmegaMinus::OmegaMinus() ||
+      targetParticle.GetDefinition() == G4SigmaZero::SigmaZero() ||
+      targetParticle.GetDefinition() == G4SigmaPlus::SigmaPlus() ||
+      targetParticle.GetDefinition() == G4SigmaMinus::SigmaMinus())
+    ++numberofFinalStateNucleons;
+  if (targetParticle.GetDefinition() == G4AntiProton::AntiProton())
+    --numberofFinalStateNucleons;
+  if (targetParticle.GetDefinition() == G4AntiNeutron::AntiNeutron())
+    --numberofFinalStateNucleons;
+  if (targetParticle.GetDefinition() == G4AntiSigmaMinus::AntiSigmaMinus())
+    --numberofFinalStateNucleons;
+  if (targetParticle.GetDefinition() == G4AntiSigmaPlus::AntiSigmaPlus())
+    --numberofFinalStateNucleons;
+  if (targetParticle.GetDefinition() == G4AntiSigmaZero::AntiSigmaZero())
+    --numberofFinalStateNucleons;
+  if (targetParticle.GetDefinition() == G4AntiXiZero::AntiXiZero())
+    --numberofFinalStateNucleons;
+  if (targetParticle.GetDefinition() == G4AntiXiMinus::AntiXiMinus())
+    --numberofFinalStateNucleons;
+  if (targetParticle.GetDefinition() == G4AntiOmegaMinus::AntiOmegaMinus())
+    --numberofFinalStateNucleons;
+  if (targetParticle.GetDefinition() == G4AntiLambda::AntiLambda())
+    --numberofFinalStateNucleons;
+  targetParticle.Lorentz(targetParticle, pseudoParticle[1]);
+
+  for (i = 0; i < vecLen; ++i) {
+    if (vec[i]->GetDefinition() == aProton || vec[i]->GetDefinition() == aNeutron ||
+        vec[i]->GetDefinition() == G4Lambda::Lambda() || vec[i]->GetDefinition() == G4XiZero::XiZero() ||
+        vec[i]->GetDefinition() == G4XiMinus::XiMinus() || vec[i]->GetDefinition() == G4OmegaMinus::OmegaMinus() ||
+        vec[i]->GetDefinition() == G4SigmaPlus::SigmaPlus() || vec[i]->GetDefinition() == G4SigmaZero::SigmaZero() ||
+        vec[i]->GetDefinition() == G4SigmaMinus::SigmaMinus())
+      ++numberofFinalStateNucleons;
+    if (vec[i]->GetDefinition() == G4AntiProton::AntiProton())
+      --numberofFinalStateNucleons;
+    if (vec[i]->GetDefinition() == G4AntiNeutron::AntiNeutron())
+      --numberofFinalStateNucleons;
+    if (vec[i]->GetDefinition() == G4AntiSigmaMinus::AntiSigmaMinus())
+      --numberofFinalStateNucleons;
+    if (vec[i]->GetDefinition() == G4AntiSigmaPlus::AntiSigmaPlus())
+      --numberofFinalStateNucleons;
+    if (vec[i]->GetDefinition() == G4AntiSigmaZero::AntiSigmaZero())
+      --numberofFinalStateNucleons;
+    if (vec[i]->GetDefinition() == G4AntiLambda::AntiLambda())
+      --numberofFinalStateNucleons;
+    if (vec[i]->GetDefinition() == G4AntiXiZero::AntiXiZero())
+      --numberofFinalStateNucleons;
+    if (vec[i]->GetDefinition() == G4AntiXiMinus::AntiXiMinus())
+      --numberofFinalStateNucleons;
+    if (vec[i]->GetDefinition() == G4AntiOmegaMinus::AntiOmegaMinus())
+      --numberofFinalStateNucleons;
+    vec[i]->Lorentz(*vec[i], pseudoParticle[1]);
+  }
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  if (veryForward)
+    numberofFinalStateNucleons++;
+  numberofFinalStateNucleons = std::max(1, numberofFinalStateNucleons);
+  //
+  // leadFlag will be true
+  //  iff original particle is at least as heavy as K+ and not a proton or neutron AND
+  //   if
+  //    incident particle is at least as heavy as K+ and it is not a proton or neutron
+  //     leadFlag is set to the incident particle
+  //   or
+  //    target particle is at least as heavy as K+ and it is not a proton or neutron
+  //     leadFlag is set to the target particle
+  //
+  G4bool leadingStrangeParticleHasChanged = true;
+  if (leadFlag) {
+    if (currentParticle.GetDefinition() == leadingStrangeParticle.GetDefinition())
+      leadingStrangeParticleHasChanged = false;
+    if (leadingStrangeParticleHasChanged && (targetParticle.GetDefinition() == leadingStrangeParticle.GetDefinition()))
+      leadingStrangeParticleHasChanged = false;
+    if (leadingStrangeParticleHasChanged) {
+      for (i = 0; i < vecLen; i++) {
+        if (vec[i]->GetDefinition() == leadingStrangeParticle.GetDefinition()) {
+          leadingStrangeParticleHasChanged = false;
+          break;
+        }
       }
-      rmb = rmb0 + std::pow(-std::log(1.0-G4UniformRand()),cpar[tempCount]) / gpar[tempCount];
-      totalEnergy = pseudoParticle[6].GetTotalEnergy()/GeV;
-      vecMass = std::min( rmb, totalEnergy );
-      pseudoParticle[6].SetMass( vecMass*GeV );
-      pp = std::sqrt( std::abs( totalEnergy*totalEnergy - vecMass*vecMass ) )*GeV;
-      pp1 = pseudoParticle[6].GetMomentum().mag()/MeV;
-      if( pp1 < 1.0e-6*GeV )
-      {
-        rthnve = pi * G4UniformRand();
-        phinve = twopi * G4UniformRand();
-        G4double srth = std::sin(rthnve);
-        pseudoParticle[6].SetMomentum( -pp*srth*std::cos(phinve)*MeV,
-                                       -pp*srth*std::sin(phinve)*MeV,
-                                       -pp*std::cos(rthnve)*MeV );
-      }
-      else
-        pseudoParticle[6].SetMomentum( pseudoParticle[6].GetMomentum() * (-pp/pp1) );
-      
-      G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> tempV;  // tempV contains the backward nucleons
-      tempV.Initialize( backwardNucleonCount );
-      G4int tempLen = 0;
-      if( targetParticle.GetSide() == -3 )tempV.SetElement( tempLen++, &targetParticle );
-      for( i=0; i<vecLen; ++i )
-      {
-        if( vec[i]->GetSide() == -3 )tempV.SetElement( tempLen++, vec[i] );
-      }
-      if( tempLen != backwardNucleonCount )
-      {
-        G4cerr << "tempLen is not the same as backwardNucleonCount" << G4endl;
-        G4cerr << "tempLen = " << tempLen;
-        G4cerr << ", backwardNucleonCount = " << backwardNucleonCount << G4endl;
-        G4cerr << "targetParticle side = " << targetParticle.GetSide() << G4endl;
-        G4cerr << "currentParticle side = " << currentParticle.GetSide() << G4endl;
-        for( i=0; i<vecLen; ++i )
-          G4cerr << "particle #" << i << " side = " << vec[i]->GetSide() << G4endl;
-        exit( EXIT_FAILURE );
-      }
-      constantCrossSection = true;
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-      if( tempLen >= 2 )
-      {
-        GenerateNBodyEvent(
-         pseudoParticle[6].GetMass(), constantCrossSection, tempV, tempLen );
-         // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-        if( targetParticle.GetSide() == -3 )
-        {
-          targetParticle.Lorentz( targetParticle, pseudoParticle[6] );
-          // tempV contains the real stuff
-          pseudoParticle[5] = pseudoParticle[5] + targetParticle;
-        }
-        for( i=0; i<vecLen; ++i )
-        {
-          if( vec[i]->GetSide() == -3 )
-          {
-            vec[i]->Lorentz( *vec[i], pseudoParticle[6] );
-            pseudoParticle[5] = pseudoParticle[5] + (*vec[i]);
-          }
-        }
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-      }
-    }
-    //
-    //  Lorentz transformation in lab system
-    //
-    if( vecLen == 0 )return false;  // all the secondaries have been eliminated
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    
-    G4int numberofFinalStateNucleons = 0;
-    if( currentParticle.GetDefinition() ==aProton ||
-        currentParticle.GetDefinition() == aNeutron ||
-	currentParticle.GetDefinition() == G4SigmaMinus::SigmaMinus()||
-	currentParticle.GetDefinition() == G4SigmaPlus::SigmaPlus()||
-	currentParticle.GetDefinition() == G4SigmaZero::SigmaZero()||
-	currentParticle.GetDefinition() == G4XiZero::XiZero()||
-	currentParticle.GetDefinition() == G4XiMinus::XiMinus()||
-	currentParticle.GetDefinition() == G4OmegaMinus::OmegaMinus()||
-	currentParticle.GetDefinition() == G4Lambda::Lambda()) ++numberofFinalStateNucleons;
-    currentParticle.Lorentz( currentParticle, pseudoParticle[1] );
-    
-    if( targetParticle.GetDefinition() ==aProton ||
-        targetParticle.GetDefinition() == aNeutron ||
-        targetParticle.GetDefinition() == G4Lambda::Lambda() ||
-	targetParticle.GetDefinition() == G4XiZero::XiZero()||
-	targetParticle.GetDefinition() == G4XiMinus::XiMinus()||
-	targetParticle.GetDefinition() == G4OmegaMinus::OmegaMinus()||
-	targetParticle.GetDefinition() == G4SigmaZero::SigmaZero()||
-	targetParticle.GetDefinition() == G4SigmaPlus::SigmaPlus()||
-	targetParticle.GetDefinition() == G4SigmaMinus::SigmaMinus()) ++numberofFinalStateNucleons;
-    if( targetParticle.GetDefinition() ==G4AntiProton::AntiProton()) --numberofFinalStateNucleons;
-    if( targetParticle.GetDefinition() ==G4AntiNeutron::AntiNeutron()) --numberofFinalStateNucleons;
-    if( targetParticle.GetDefinition() ==G4AntiSigmaMinus::AntiSigmaMinus()) --numberofFinalStateNucleons;
-    if( targetParticle.GetDefinition() ==G4AntiSigmaPlus::AntiSigmaPlus()) --numberofFinalStateNucleons;
-    if( targetParticle.GetDefinition() ==G4AntiSigmaZero::AntiSigmaZero()) --numberofFinalStateNucleons;
-    if( targetParticle.GetDefinition() ==G4AntiXiZero::AntiXiZero()) --numberofFinalStateNucleons;
-    if( targetParticle.GetDefinition() ==G4AntiXiMinus::AntiXiMinus()) --numberofFinalStateNucleons;
-    if( targetParticle.GetDefinition() ==G4AntiOmegaMinus::AntiOmegaMinus()) --numberofFinalStateNucleons;
-    if( targetParticle.GetDefinition() ==G4AntiLambda::AntiLambda()) --numberofFinalStateNucleons;
-    targetParticle.Lorentz( targetParticle, pseudoParticle[1] );
-    
-    for( i=0; i<vecLen; ++i )
-    {
-      if( vec[i]->GetDefinition() ==aProton ||
-          vec[i]->GetDefinition() == aNeutron ||
-          vec[i]->GetDefinition() == G4Lambda::Lambda() ||
-          vec[i]->GetDefinition() == G4XiZero::XiZero() ||
-          vec[i]->GetDefinition() == G4XiMinus::XiMinus() ||
-          vec[i]->GetDefinition() == G4OmegaMinus::OmegaMinus() ||
-	  vec[i]->GetDefinition() == G4SigmaPlus::SigmaPlus()||
-	  vec[i]->GetDefinition() == G4SigmaZero::SigmaZero()||
-	  vec[i]->GetDefinition() == G4SigmaMinus::SigmaMinus()) ++numberofFinalStateNucleons;
-      if( vec[i]->GetDefinition() ==G4AntiProton::AntiProton()) --numberofFinalStateNucleons;
-      if( vec[i]->GetDefinition() ==G4AntiNeutron::AntiNeutron()) --numberofFinalStateNucleons;
-      if( vec[i]->GetDefinition() ==G4AntiSigmaMinus::AntiSigmaMinus()) --numberofFinalStateNucleons;
-      if( vec[i]->GetDefinition() ==G4AntiSigmaPlus::AntiSigmaPlus()) --numberofFinalStateNucleons;
-      if( vec[i]->GetDefinition() ==G4AntiSigmaZero::AntiSigmaZero()) --numberofFinalStateNucleons;
-      if( vec[i]->GetDefinition() ==G4AntiLambda::AntiLambda()) --numberofFinalStateNucleons;
-      if( vec[i]->GetDefinition() ==G4AntiXiZero::AntiXiZero()) --numberofFinalStateNucleons;
-      if( vec[i]->GetDefinition() ==G4AntiXiMinus::AntiXiMinus()) --numberofFinalStateNucleons;
-      if( vec[i]->GetDefinition() ==G4AntiOmegaMinus::AntiOmegaMinus()) --numberofFinalStateNucleons;
-     vec[i]->Lorentz( *vec[i], pseudoParticle[1] );
     }
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    if(veryForward) numberofFinalStateNucleons++;
-    numberofFinalStateNucleons = std::max( 1, numberofFinalStateNucleons );
-    //
-    // leadFlag will be true
-    //  iff original particle is at least as heavy as K+ and not a proton or neutron AND
-    //   if
-    //    incident particle is at least as heavy as K+ and it is not a proton or neutron
-    //     leadFlag is set to the incident particle
-    //   or
-    //    target particle is at least as heavy as K+ and it is not a proton or neutron
-    //     leadFlag is set to the target particle
-    //
-    G4bool leadingStrangeParticleHasChanged = true;
-    if( leadFlag )
-    {
-      if( currentParticle.GetDefinition() == leadingStrangeParticle.GetDefinition() )
-        leadingStrangeParticleHasChanged = false;
-      if( leadingStrangeParticleHasChanged &&
-          ( targetParticle.GetDefinition() == leadingStrangeParticle.GetDefinition() ) )
-        leadingStrangeParticleHasChanged = false;
-      if( leadingStrangeParticleHasChanged )
-      {
-        for( i=0; i<vecLen; i++ )
-        {
-          if( vec[i]->GetDefinition() == leadingStrangeParticle.GetDefinition() )
-          {
-            leadingStrangeParticleHasChanged = false;
-            break;
-          }
-        }
-      }
-      if( leadingStrangeParticleHasChanged )
-      {
-        G4bool leadTest = 
+    if (leadingStrangeParticleHasChanged) {
+      G4bool leadTest =
           (leadingStrangeParticle.GetDefinition() == aKaonMinus ||
            leadingStrangeParticle.GetDefinition() == aKaonZeroL ||
            leadingStrangeParticle.GetDefinition() == aKaonZeroS ||
-           leadingStrangeParticle.GetDefinition() == aKaonPlus ||
-           leadingStrangeParticle.GetDefinition() == aPiMinus ||
-           leadingStrangeParticle.GetDefinition() == aPiZero ||
-           leadingStrangeParticle.GetDefinition() == aPiPlus);
-        G4bool targetTest = false;
-
-        // following modified by JLC 22-Oct-97
-          
-        if( (leadTest&&targetTest) || !(leadTest||targetTest) ) // both true or both false
-        {
-          targetParticle.SetDefinitionAndUpdateE( leadingStrangeParticle.GetDefinition() );
-          targetHasChanged = true;
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-        }
-        else
-        {
-          currentParticle.SetDefinitionAndUpdateE( leadingStrangeParticle.GetDefinition() );
-          incidentHasChanged = false;
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-        }
-      }
-    }   // end of if( leadFlag )
-    
-    pseudoParticle[3].SetMomentum( 0.0, 0.0, pOriginal*GeV );
-    pseudoParticle[3].SetMass( mOriginal*GeV );
-    pseudoParticle[3].SetTotalEnergy(
-     std::sqrt( pOriginal*pOriginal + mOriginal*mOriginal )*GeV );
-    
-    const G4ParticleDefinition * aOrgDef = modifiedOriginal.GetDefinition();
-    G4int diff = 0;
-    if(aOrgDef == G4Proton::Proton() || aOrgDef == G4Neutron::Neutron() )  diff = 1;
-    if(numberofFinalStateNucleons == 1) diff = 0;
-    pseudoParticle[4].SetMomentum( 0.0, 0.0, 0.0 );
-    pseudoParticle[4].SetMass( protonMass*(numberofFinalStateNucleons-diff)*MeV );
-    pseudoParticle[4].SetTotalEnergy( protonMass*(numberofFinalStateNucleons-diff)*MeV );
-    
-    G4double theoreticalKinetic =
-      pseudoParticle[3].GetTotalEnergy()/MeV +
-      pseudoParticle[4].GetTotalEnergy()/MeV -
-      currentParticle.GetMass()/MeV -
-      targetParticle.GetMass()/MeV;
-    
-    G4double simulatedKinetic =
-      currentParticle.GetKineticEnergy()/MeV + targetParticle.GetKineticEnergy()/MeV;
-    
-    pseudoParticle[5] = pseudoParticle[3] + pseudoParticle[4];
-    pseudoParticle[3].Lorentz( pseudoParticle[3], pseudoParticle[5] );
-    pseudoParticle[4].Lorentz( pseudoParticle[4], pseudoParticle[5] );
-    
-    pseudoParticle[7].SetZero();
-    pseudoParticle[7] = pseudoParticle[7] + currentParticle;
-    pseudoParticle[7] = pseudoParticle[7] + targetParticle;
-
-    for( i=0; i<vecLen; ++i )
-    {
-      pseudoParticle[7] = pseudoParticle[7] + *vec[i];
-      simulatedKinetic += vec[i]->GetKineticEnergy()/MeV;
-      theoreticalKinetic -= vec[i]->GetMass()/MeV;
-    }
-    if( vecLen <= 16 && vecLen > 0 )
-    {
-      // must create a new set of ReactionProducts here because GenerateNBody will
-      // modify the momenta for the particles, and we don't want to do this
-      //
-      G4ReactionProduct tempR[130];
-      tempR[0] = currentParticle;
-      tempR[1] = targetParticle;
-      for( i=0; i<vecLen; ++i )tempR[i+2] = *vec[i];
-      G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> tempV;
-      tempV.Initialize( vecLen+2 );
-      G4int tempLen = 0;
-      for( i=0; i<vecLen+2; ++i )tempV.SetElement( tempLen++, &tempR[i] );
-      constantCrossSection = true;
-
-      wgt = GenerateNBodyEvent( pseudoParticle[3].GetTotalEnergy()/MeV+
-                                pseudoParticle[4].GetTotalEnergy()/MeV,
-       constantCrossSection, tempV, tempLen );
-      if(wgt>-.5)
-      {
-        theoreticalKinetic = 0.0;
-        for( i=0; i<tempLen; ++i )
-        {
-          pseudoParticle[6].Lorentz( *tempV[i], pseudoParticle[4] );
-          theoreticalKinetic += pseudoParticle[6].GetKineticEnergy()/MeV;
-        }
-      }
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    }
-    //
-    //  Make sure, that the kinetic energies are correct
-    //
-    if( simulatedKinetic != 0.0 )
-    {
-      wgt = (theoreticalKinetic)/simulatedKinetic;
-      theoreticalKinetic = currentParticle.GetKineticEnergy()/MeV * wgt;
-      simulatedKinetic = theoreticalKinetic;
-      currentParticle.SetKineticEnergy( theoreticalKinetic*MeV );
-      pp = currentParticle.GetTotalMomentum()/MeV;
-      pp1 = currentParticle.GetMomentum().mag()/MeV;
-      if( pp1 < 1.0e-6*GeV )
-      {
-        rthnve = pi*G4UniformRand();
-        phinve = twopi*G4UniformRand();
-        currentParticle.SetMomentum( pp*std::sin(rthnve)*std::cos(phinve)*MeV,
-                                     pp*std::sin(rthnve)*std::sin(phinve)*MeV,
-                                     pp*std::cos(rthnve)*MeV );
-      }
-      else
-      {
-        currentParticle.SetMomentum( currentParticle.GetMomentum() * (pp/pp1) );
-      }
-      theoreticalKinetic = targetParticle.GetKineticEnergy()/MeV * wgt;
-      targetParticle.SetKineticEnergy( theoreticalKinetic*MeV );
-      simulatedKinetic += theoreticalKinetic;
-      pp = targetParticle.GetTotalMomentum()/MeV;
-      pp1 = targetParticle.GetMomentum().mag()/MeV;
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-      if( pp1 < 1.0e-6*GeV )
+           leadingStrangeParticle.GetDefinition() == aKaonPlus || leadingStrangeParticle.GetDefinition() == aPiMinus ||
+           leadingStrangeParticle.GetDefinition() == aPiZero || leadingStrangeParticle.GetDefinition() == aPiPlus);
+      G4bool targetTest = false;
+
+      // following modified by JLC 22-Oct-97
+
+      if ((leadTest && targetTest) || !(leadTest || targetTest))  // both true or both false
       {
-        rthnve = pi*G4UniformRand();
-        phinve = twopi*G4UniformRand();
-        targetParticle.SetMomentum( pp*std::sin(rthnve)*std::cos(phinve)*MeV,
-                                    pp*std::sin(rthnve)*std::sin(phinve)*MeV,
-                                    pp*std::cos(rthnve)*MeV );
+        targetParticle.SetDefinitionAndUpdateE(leadingStrangeParticle.GetDefinition());
+        targetHasChanged = true;
+        // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
       } else {
-        targetParticle.SetMomentum( targetParticle.GetMomentum() * (pp/pp1) );
+        currentParticle.SetDefinitionAndUpdateE(leadingStrangeParticle.GetDefinition());
+        incidentHasChanged = false;
+        // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
       }
-      for( i=0; i<vecLen; ++i )
-      {
-        theoreticalKinetic = vec[i]->GetKineticEnergy()/MeV * wgt;
-        simulatedKinetic += theoreticalKinetic;
-        vec[i]->SetKineticEnergy( theoreticalKinetic*MeV );
-        pp = vec[i]->GetTotalMomentum()/MeV;
-        pp1 = vec[i]->GetMomentum().mag()/MeV;
-        if( pp1 < 1.0e-6*GeV )
-        {
-          rthnve = pi*G4UniformRand();
-          phinve = twopi*G4UniformRand();
-          vec[i]->SetMomentum( pp*std::sin(rthnve)*std::cos(phinve)*MeV,
-                               pp*std::sin(rthnve)*std::sin(phinve)*MeV,
-                               pp*std::cos(rthnve)*MeV );
-        }
-        else
-          vec[i]->SetMomentum( vec[i]->GetMomentum() * (pp/pp1) );
+    }
+  }  // end of if( leadFlag )
+
+  pseudoParticle[3].SetMomentum(0.0, 0.0, pOriginal * GeV);
+  pseudoParticle[3].SetMass(mOriginal * GeV);
+  pseudoParticle[3].SetTotalEnergy(std::sqrt(pOriginal * pOriginal + mOriginal * mOriginal) * GeV);
+
+  const G4ParticleDefinition *aOrgDef = modifiedOriginal.GetDefinition();
+  G4int diff = 0;
+  if (aOrgDef == G4Proton::Proton() || aOrgDef == G4Neutron::Neutron())
+    diff = 1;
+  if (numberofFinalStateNucleons == 1)
+    diff = 0;
+  pseudoParticle[4].SetMomentum(0.0, 0.0, 0.0);
+  pseudoParticle[4].SetMass(protonMass * (numberofFinalStateNucleons - diff) * MeV);
+  pseudoParticle[4].SetTotalEnergy(protonMass * (numberofFinalStateNucleons - diff) * MeV);
+
+  G4double theoreticalKinetic = pseudoParticle[3].GetTotalEnergy() / MeV + pseudoParticle[4].GetTotalEnergy() / MeV -
+                                currentParticle.GetMass() / MeV - targetParticle.GetMass() / MeV;
+
+  G4double simulatedKinetic = currentParticle.GetKineticEnergy() / MeV + targetParticle.GetKineticEnergy() / MeV;
+
+  pseudoParticle[5] = pseudoParticle[3] + pseudoParticle[4];
+  pseudoParticle[3].Lorentz(pseudoParticle[3], pseudoParticle[5]);
+  pseudoParticle[4].Lorentz(pseudoParticle[4], pseudoParticle[5]);
+
+  pseudoParticle[7].SetZero();
+  pseudoParticle[7] = pseudoParticle[7] + currentParticle;
+  pseudoParticle[7] = pseudoParticle[7] + targetParticle;
+
+  for (i = 0; i < vecLen; ++i) {
+    pseudoParticle[7] = pseudoParticle[7] + *vec[i];
+    simulatedKinetic += vec[i]->GetKineticEnergy() / MeV;
+    theoreticalKinetic -= vec[i]->GetMass() / MeV;
+  }
+  if (vecLen <= 16 && vecLen > 0) {
+    // must create a new set of ReactionProducts here because GenerateNBody will
+    // modify the momenta for the particles, and we don't want to do this
+    //
+    G4ReactionProduct tempR[130];
+    tempR[0] = currentParticle;
+    tempR[1] = targetParticle;
+    for (i = 0; i < vecLen; ++i)
+      tempR[i + 2] = *vec[i];
+    G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> tempV;
+    tempV.Initialize(vecLen + 2);
+    G4int tempLen = 0;
+    for (i = 0; i < vecLen + 2; ++i)
+      tempV.SetElement(tempLen++, &tempR[i]);
+    constantCrossSection = true;
+
+    wgt = GenerateNBodyEvent(pseudoParticle[3].GetTotalEnergy() / MeV + pseudoParticle[4].GetTotalEnergy() / MeV,
+                             constantCrossSection,
+                             tempV,
+                             tempLen);
+    if (wgt > -.5) {
+      theoreticalKinetic = 0.0;
+      for (i = 0; i < tempLen; ++i) {
+        pseudoParticle[6].Lorentz(*tempV[i], pseudoParticle[4]);
+        theoreticalKinetic += pseudoParticle[6].GetKineticEnergy() / MeV;
       }
     }
     // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    Rotate( numberofFinalStateNucleons, pseudoParticle[3].GetMomentum(),
-            modifiedOriginal, originalIncident, targetNucleus,
-            currentParticle, targetParticle, vec, vecLen );
+  }
+  //
+  //  Make sure, that the kinetic energies are correct
+  //
+  if (simulatedKinetic != 0.0) {
+    wgt = (theoreticalKinetic) / simulatedKinetic;
+    theoreticalKinetic = currentParticle.GetKineticEnergy() / MeV * wgt;
+    simulatedKinetic = theoreticalKinetic;
+    currentParticle.SetKineticEnergy(theoreticalKinetic * MeV);
+    pp = currentParticle.GetTotalMomentum() / MeV;
+    pp1 = currentParticle.GetMomentum().mag() / MeV;
+    if (pp1 < 1.0e-6 * GeV) {
+      rthnve = pi * G4UniformRand();
+      phinve = twopi * G4UniformRand();
+      currentParticle.SetMomentum(pp * std::sin(rthnve) * std::cos(phinve) * MeV,
+                                  pp * std::sin(rthnve) * std::sin(phinve) * MeV,
+                                  pp * std::cos(rthnve) * MeV);
+    } else {
+      currentParticle.SetMomentum(currentParticle.GetMomentum() * (pp / pp1));
+    }
+    theoreticalKinetic = targetParticle.GetKineticEnergy() / MeV * wgt;
+    targetParticle.SetKineticEnergy(theoreticalKinetic * MeV);
+    simulatedKinetic += theoreticalKinetic;
+    pp = targetParticle.GetTotalMomentum() / MeV;
+    pp1 = targetParticle.GetMomentum().mag() / MeV;
     // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+    if (pp1 < 1.0e-6 * GeV) {
+      rthnve = pi * G4UniformRand();
+      phinve = twopi * G4UniformRand();
+      targetParticle.SetMomentum(pp * std::sin(rthnve) * std::cos(phinve) * MeV,
+                                 pp * std::sin(rthnve) * std::sin(phinve) * MeV,
+                                 pp * std::cos(rthnve) * MeV);
+    } else {
+      targetParticle.SetMomentum(targetParticle.GetMomentum() * (pp / pp1));
+    }
+    for (i = 0; i < vecLen; ++i) {
+      theoreticalKinetic = vec[i]->GetKineticEnergy() / MeV * wgt;
+      simulatedKinetic += theoreticalKinetic;
+      vec[i]->SetKineticEnergy(theoreticalKinetic * MeV);
+      pp = vec[i]->GetTotalMomentum() / MeV;
+      pp1 = vec[i]->GetMomentum().mag() / MeV;
+      if (pp1 < 1.0e-6 * GeV) {
+        rthnve = pi * G4UniformRand();
+        phinve = twopi * G4UniformRand();
+        vec[i]->SetMomentum(pp * std::sin(rthnve) * std::cos(phinve) * MeV,
+                            pp * std::sin(rthnve) * std::sin(phinve) * MeV,
+                            pp * std::cos(rthnve) * MeV);
+      } else
+        vec[i]->SetMomentum(vec[i]->GetMomentum() * (pp / pp1));
+    }
+  }
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  Rotate(numberofFinalStateNucleons,
+         pseudoParticle[3].GetMomentum(),
+         modifiedOriginal,
+         originalIncident,
+         targetNucleus,
+         currentParticle,
+         targetParticle,
+         vec,
+         vecLen);
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  //
+  // add black track particles
+  // the total number of particles produced is restricted to 198
+  // this may have influence on very high energies
+  //
+  if (atomicWeight >= 1.5) {
+    // npnb is number of proton/neutron black track particles
+    // ndta is the number of deuterons, tritons, and alphas produced
+    // epnb is the kinetic energy available for proton/neutron black track particles
+    // edta is the kinetic energy available for deuteron/triton/alpha particles
     //
-    // add black track particles
-    // the total number of particles produced is restricted to 198
-    // this may have influence on very high energies
-    //
-    if( atomicWeight >= 1.5 )
-    {
-      // npnb is number of proton/neutron black track particles
-      // ndta is the number of deuterons, tritons, and alphas produced
-      // epnb is the kinetic energy available for proton/neutron black track particles
-      // edta is the kinetic energy available for deuteron/triton/alpha particles
-      //
-      G4double epnb, edta;
-      G4int npnb = 0;
-      G4int ndta = 0;
-      
-      epnb = targetNucleus.GetPNBlackTrackEnergy();            // was enp1 in fortran code
-      edta = targetNucleus.GetDTABlackTrackEnergy();           // was enp3 in fortran code
-      const G4double pnCutOff = 0.001;
-      const G4double dtaCutOff = 0.001;
-      const G4double kineticMinimum = 1.e-6;
-      const G4double kineticFactor = -0.010;
-      G4double sprob = 0.0; // sprob = probability of self-absorption in heavy molecules
-      const G4double ekIncident = originalIncident->GetKineticEnergy()/GeV;
-      if( ekIncident >= 5.0 )sprob = std::min( 1.0, 0.6*std::log(ekIncident-4.0) );
-      if( epnb >= pnCutOff )
-      {
-        npnb = Poisson((1.5+1.25*numberofFinalStateNucleons)*epnb/(epnb+edta));
-        if( numberofFinalStateNucleons + npnb > atomicWeight )
-          npnb = G4int(atomicWeight+0.00001 - numberofFinalStateNucleons);
-        npnb = std::min( npnb, 127-vecLen );
-      }
-      if( edta >= dtaCutOff )
-      {
-        ndta = Poisson( (1.5+1.25*numberofFinalStateNucleons)*edta/(epnb+edta) );
-        ndta = std::min( ndta, 127-vecLen );
-      }
-      G4double spall = numberofFinalStateNucleons;
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+    G4double epnb, edta;
+    G4int npnb = 0;
+    G4int ndta = 0;
 
-      AddBlackTrackParticles( epnb, npnb, edta, ndta, sprob, kineticMinimum, kineticFactor,
-                             modifiedOriginal, spall, targetNucleus,
-                              vec, vecLen );
+    epnb = targetNucleus.GetPNBlackTrackEnergy();   // was enp1 in fortran code
+    edta = targetNucleus.GetDTABlackTrackEnergy();  // was enp3 in fortran code
+    const G4double pnCutOff = 0.001;
+    const G4double dtaCutOff = 0.001;
+    const G4double kineticMinimum = 1.e-6;
+    const G4double kineticFactor = -0.010;
+    G4double sprob = 0.0;  // sprob = probability of self-absorption in heavy molecules
+    const G4double ekIncident = originalIncident->GetKineticEnergy() / GeV;
+    if (ekIncident >= 5.0)
+      sprob = std::min(1.0, 0.6 * std::log(ekIncident - 4.0));
+    if (epnb >= pnCutOff) {
+      npnb = Poisson((1.5 + 1.25 * numberofFinalStateNucleons) * epnb / (epnb + edta));
+      if (numberofFinalStateNucleons + npnb > atomicWeight)
+        npnb = G4int(atomicWeight + 0.00001 - numberofFinalStateNucleons);
+      npnb = std::min(npnb, 127 - vecLen);
+    }
+    if (edta >= dtaCutOff) {
+      ndta = Poisson((1.5 + 1.25 * numberofFinalStateNucleons) * edta / (epnb + edta));
+      ndta = std::min(ndta, 127 - vecLen);
+    }
+    G4double spall = numberofFinalStateNucleons;
+    // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+
+    AddBlackTrackParticles(epnb,
+                           npnb,
+                           edta,
+                           ndta,
+                           sprob,
+                           kineticMinimum,
+                           kineticFactor,
+                           modifiedOriginal,
+                           spall,
+                           targetNucleus,
+                           vec,
+                           vecLen);
 
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    }
-    //
-    //  calculate time delay for nuclear reactions
-    //
-    if( (atomicWeight >= 1.5) && (atomicWeight <= 230.0) && (ekOriginal <= 0.2) )
-      currentParticle.SetTOF( 1.0-500.0*std::exp(-ekOriginal/0.04)*std::log(G4UniformRand()) );
-    else
-      currentParticle.SetTOF( 1.0 );
-    return true;
     // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
   }
- 
- void FullModelReactionDynamics::SuppressChargedPions(
-   G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-   G4int &vecLen,
-   const G4ReactionProduct &modifiedOriginal,
-   G4ReactionProduct &currentParticle,
-   G4ReactionProduct &targetParticle,
-   const G4Nucleus &targetNucleus,
-   G4bool &incidentHasChanged,
-   G4bool &targetHasChanged )
-  {
-    // this code was originally in the fortran code TWOCLU
-    //
-    // suppress charged pions, for various reasons
-    //
-    const G4double atomicWeight = targetNucleus.GetN_asInt();
-    const G4double atomicNumber = targetNucleus.GetZ_asInt();
-    const G4double pOriginal = modifiedOriginal.GetTotalMomentum()/GeV;
-    
-    // G4ParticleDefinition *aGamma = G4Gamma::Gamma();
-    G4ParticleDefinition *aProton = G4Proton::Proton();
-    G4ParticleDefinition *anAntiProton = G4AntiProton::AntiProton();
-    G4ParticleDefinition *aNeutron = G4Neutron::Neutron();
-    G4ParticleDefinition *anAntiNeutron = G4AntiNeutron::AntiNeutron();
-    G4ParticleDefinition *aPiMinus = G4PionMinus::PionMinus();
-    G4ParticleDefinition *aPiPlus = G4PionPlus::PionPlus();
-    
-    const G4bool antiTest =
-      modifiedOriginal.GetDefinition() != anAntiProton &&
-      modifiedOriginal.GetDefinition() != anAntiNeutron;
-    if( antiTest && (
-       // currentParticle.GetDefinition() == aGamma ||
-          currentParticle.GetDefinition() == aPiPlus ||
-          currentParticle.GetDefinition() == aPiMinus ) &&
-        ( G4UniformRand() <= (10.0-pOriginal)/6.0 ) &&
-        ( G4UniformRand() <= atomicWeight/300.0 ) )
-    {
-      if( G4UniformRand() > atomicNumber/atomicWeight )
-        currentParticle.SetDefinitionAndUpdateE( aNeutron );
+  //
+  //  calculate time delay for nuclear reactions
+  //
+  if ((atomicWeight >= 1.5) && (atomicWeight <= 230.0) && (ekOriginal <= 0.2))
+    currentParticle.SetTOF(1.0 - 500.0 * std::exp(-ekOriginal / 0.04) * std::log(G4UniformRand()));
+  else
+    currentParticle.SetTOF(1.0);
+  return true;
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+}
+
+void FullModelReactionDynamics::SuppressChargedPions(G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+                                                     G4int &vecLen,
+                                                     const G4ReactionProduct &modifiedOriginal,
+                                                     G4ReactionProduct &currentParticle,
+                                                     G4ReactionProduct &targetParticle,
+                                                     const G4Nucleus &targetNucleus,
+                                                     G4bool &incidentHasChanged,
+                                                     G4bool &targetHasChanged) {
+  // this code was originally in the fortran code TWOCLU
+  //
+  // suppress charged pions, for various reasons
+  //
+  const G4double atomicWeight = targetNucleus.GetN_asInt();
+  const G4double atomicNumber = targetNucleus.GetZ_asInt();
+  const G4double pOriginal = modifiedOriginal.GetTotalMomentum() / GeV;
+
+  // G4ParticleDefinition *aGamma = G4Gamma::Gamma();
+  G4ParticleDefinition *aProton = G4Proton::Proton();
+  G4ParticleDefinition *anAntiProton = G4AntiProton::AntiProton();
+  G4ParticleDefinition *aNeutron = G4Neutron::Neutron();
+  G4ParticleDefinition *anAntiNeutron = G4AntiNeutron::AntiNeutron();
+  G4ParticleDefinition *aPiMinus = G4PionMinus::PionMinus();
+  G4ParticleDefinition *aPiPlus = G4PionPlus::PionPlus();
+
+  const G4bool antiTest =
+      modifiedOriginal.GetDefinition() != anAntiProton && modifiedOriginal.GetDefinition() != anAntiNeutron;
+  if (antiTest &&
+      (
+          // currentParticle.GetDefinition() == aGamma ||
+          currentParticle.GetDefinition() == aPiPlus || currentParticle.GetDefinition() == aPiMinus) &&
+      (G4UniformRand() <= (10.0 - pOriginal) / 6.0) && (G4UniformRand() <= atomicWeight / 300.0)) {
+    if (G4UniformRand() > atomicNumber / atomicWeight)
+      currentParticle.SetDefinitionAndUpdateE(aNeutron);
+    else
+      currentParticle.SetDefinitionAndUpdateE(aProton);
+    incidentHasChanged = true;
+  }
+  for (G4int i = 0; i < vecLen; ++i) {
+    if (antiTest &&
+        (
+            // vec[i]->GetDefinition() == aGamma ||
+            vec[i]->GetDefinition() == aPiPlus || vec[i]->GetDefinition() == aPiMinus) &&
+        (G4UniformRand() <= (10.0 - pOriginal) / 6.0) && (G4UniformRand() <= atomicWeight / 300.0)) {
+      if (G4UniformRand() > atomicNumber / atomicWeight)
+        vec[i]->SetDefinitionAndUpdateE(aNeutron);
       else
-        currentParticle.SetDefinitionAndUpdateE( aProton );
-      incidentHasChanged = true;
-    }
-    for( G4int i=0; i<vecLen; ++i )
-    {
-      if( antiTest && (
-         // vec[i]->GetDefinition() == aGamma ||
-            vec[i]->GetDefinition() == aPiPlus ||
-            vec[i]->GetDefinition() == aPiMinus ) &&
-          ( G4UniformRand() <= (10.0-pOriginal)/6.0 ) &&
-          ( G4UniformRand() <= atomicWeight/300.0 ) )
-      {
-        if( G4UniformRand() > atomicNumber/atomicWeight )
-          vec[i]->SetDefinitionAndUpdateE( aNeutron );
-        else
-          vec[i]->SetDefinitionAndUpdateE( aProton );
+        vec[i]->SetDefinitionAndUpdateE(aProton);
       // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-      }
     }
-    // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
   }
- 
- G4bool FullModelReactionDynamics::TwoCluster(
-   G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-   G4int &vecLen,
-   G4ReactionProduct &modifiedOriginal, // Fermi motion & evap. effects included
-   const G4HadProjectile *originalIncident, // the original incident particle
-   G4ReactionProduct &currentParticle,
-   G4ReactionProduct &targetParticle,
-   const G4Nucleus &targetNucleus,
-   G4bool &incidentHasChanged,
-   G4bool &targetHasChanged,
-   G4bool leadFlag,
-   G4ReactionProduct &leadingStrangeParticle )
-  {
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    // derived from original FORTRAN code TWOCLU by H. Fesefeldt (11-Oct-1987)
-    //
-    //  Generation of X- and PT- values for incident, target, and all secondary particles 
-    //  
-    //  A simple two cluster model is used.
-    //  This should be sufficient for low energy interactions.
-    //
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+}
 
-    // + debugging
-    // raise(SIGSEGV);
-    // - debugging
-
-    G4int i;
-    G4ParticleDefinition *aPiMinus = G4PionMinus::PionMinus();
-    G4ParticleDefinition *aProton = G4Proton::Proton();
-    G4ParticleDefinition *aNeutron = G4Neutron::Neutron();
-    G4ParticleDefinition *aPiPlus = G4PionPlus::PionPlus();
-    G4ParticleDefinition *aPiZero = G4PionZero::PionZero();
-    G4ParticleDefinition *aSigmaMinus = G4SigmaMinus::SigmaMinus();
-    const G4double protonMass = aProton->GetPDGMass()/MeV;
-    const G4double ekOriginal = modifiedOriginal.GetKineticEnergy()/GeV;
-    const G4double etOriginal = modifiedOriginal.GetTotalEnergy()/GeV;
-    const G4double mOriginal = modifiedOriginal.GetMass()/GeV;
-    const G4double pOriginal = modifiedOriginal.GetMomentum().mag()/GeV;
-    G4double targetMass = targetParticle.GetDefinition()->GetPDGMass()/GeV;
-    G4double centerofmassEnergy = std::sqrt( mOriginal*mOriginal +
-                                        targetMass*targetMass +
-                                        2.0*targetMass*etOriginal );  // GeV
-    G4double currentMass = currentParticle.GetMass()/GeV;
-    targetMass = targetParticle.GetMass()/GeV;
-
-    if( currentMass == 0.0 && targetMass == 0.0 )
-    {
-      G4double ek = currentParticle.GetKineticEnergy();
-      G4ThreeVector m = currentParticle.GetMomentum();
-      currentParticle = *vec[0];
-      targetParticle = *vec[1];
-      for( i=0; i<(vecLen-2); ++i )*vec[i] = *vec[i+2];
-      if(vecLen<2) 
-      {
-        for(G4int i=0; i<vecLen; i++) delete vec[i];
-	vecLen = 0;
-        throw G4HadReentrentException(__FILE__, __LINE__,
-	"FullModelReactionDynamics::TwoCluster: Negative number of particles");
-      }
-      delete vec[vecLen-1];
-      delete vec[vecLen-2];
-      vecLen -= 2;
-      incidentHasChanged = true;
-      targetHasChanged = true;
-      currentParticle.SetKineticEnergy( ek );
-      currentParticle.SetMomentum( m );
-    }
-    const G4double atomicWeight = targetNucleus.GetN_asInt();
-    const G4double atomicNumber = targetNucleus.GetZ_asInt();
-    //
-    // particles have been distributed in forward and backward hemispheres
-    // in center of mass system of the hadron nucleon interaction
-    //
-    // incident is always in forward hemisphere
-    G4int forwardCount = 1;            // number of particles in forward hemisphere
-    currentParticle.SetSide( 1 );
-    G4double forwardMass = currentParticle.GetMass()/GeV;
-    G4double cMass = forwardMass;
-    
-    // target is always in backward hemisphere
-    G4int backwardCount = 1;           // number of particles in backward hemisphere
-    G4int backwardNucleonCount = 1;    // number of nucleons in backward hemisphere
-    targetParticle.SetSide( -1 );
-    G4double backwardMass = targetParticle.GetMass()/GeV;
-    G4double bMass = backwardMass;
-    
-    for( i=0; i<vecLen; ++i )
-    {
-      if( vec[i]->GetSide() < 0 )vec[i]->SetSide( -1 ); // added by JLC, 2Jul97
-      // to take care of the case where vec has been preprocessed by GenerateXandPt
-      // and some of them have been set to -2 or -3
-      if( vec[i]->GetSide() == -1 )
-      {
-        ++backwardCount;
-        backwardMass += vec[i]->GetMass()/GeV;
-      }
-      else
-      {
-        ++forwardCount;
-        forwardMass += vec[i]->GetMass()/GeV;
-      }
+G4bool FullModelReactionDynamics::TwoCluster(
+    G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+    G4int &vecLen,
+    G4ReactionProduct &modifiedOriginal,      // Fermi motion & evap. effects included
+    const G4HadProjectile *originalIncident,  // the original incident particle
+    G4ReactionProduct &currentParticle,
+    G4ReactionProduct &targetParticle,
+    const G4Nucleus &targetNucleus,
+    G4bool &incidentHasChanged,
+    G4bool &targetHasChanged,
+    G4bool leadFlag,
+    G4ReactionProduct &leadingStrangeParticle) {
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  // derived from original FORTRAN code TWOCLU by H. Fesefeldt (11-Oct-1987)
+  //
+  //  Generation of X- and PT- values for incident, target, and all secondary particles
+  //
+  //  A simple two cluster model is used.
+  //  This should be sufficient for low energy interactions.
+  //
+
+  // + debugging
+  // raise(SIGSEGV);
+  // - debugging
+
+  G4int i;
+  G4ParticleDefinition *aPiMinus = G4PionMinus::PionMinus();
+  G4ParticleDefinition *aProton = G4Proton::Proton();
+  G4ParticleDefinition *aNeutron = G4Neutron::Neutron();
+  G4ParticleDefinition *aPiPlus = G4PionPlus::PionPlus();
+  G4ParticleDefinition *aPiZero = G4PionZero::PionZero();
+  G4ParticleDefinition *aSigmaMinus = G4SigmaMinus::SigmaMinus();
+  const G4double protonMass = aProton->GetPDGMass() / MeV;
+  const G4double ekOriginal = modifiedOriginal.GetKineticEnergy() / GeV;
+  const G4double etOriginal = modifiedOriginal.GetTotalEnergy() / GeV;
+  const G4double mOriginal = modifiedOriginal.GetMass() / GeV;
+  const G4double pOriginal = modifiedOriginal.GetMomentum().mag() / GeV;
+  G4double targetMass = targetParticle.GetDefinition()->GetPDGMass() / GeV;
+  G4double centerofmassEnergy =
+      std::sqrt(mOriginal * mOriginal + targetMass * targetMass + 2.0 * targetMass * etOriginal);  // GeV
+  G4double currentMass = currentParticle.GetMass() / GeV;
+  targetMass = targetParticle.GetMass() / GeV;
+
+  if (currentMass == 0.0 && targetMass == 0.0) {
+    G4double ek = currentParticle.GetKineticEnergy();
+    G4ThreeVector m = currentParticle.GetMomentum();
+    currentParticle = *vec[0];
+    targetParticle = *vec[1];
+    for (i = 0; i < (vecLen - 2); ++i)
+      *vec[i] = *vec[i + 2];
+    if (vecLen < 2) {
+      for (G4int i = 0; i < vecLen; i++)
+        delete vec[i];
+      vecLen = 0;
+      throw G4HadReentrentException(
+          __FILE__, __LINE__, "FullModelReactionDynamics::TwoCluster: Negative number of particles");
+    }
+    delete vec[vecLen - 1];
+    delete vec[vecLen - 2];
+    vecLen -= 2;
+    incidentHasChanged = true;
+    targetHasChanged = true;
+    currentParticle.SetKineticEnergy(ek);
+    currentParticle.SetMomentum(m);
+  }
+  const G4double atomicWeight = targetNucleus.GetN_asInt();
+  const G4double atomicNumber = targetNucleus.GetZ_asInt();
+  //
+  // particles have been distributed in forward and backward hemispheres
+  // in center of mass system of the hadron nucleon interaction
+  //
+  // incident is always in forward hemisphere
+  G4int forwardCount = 1;  // number of particles in forward hemisphere
+  currentParticle.SetSide(1);
+  G4double forwardMass = currentParticle.GetMass() / GeV;
+  G4double cMass = forwardMass;
+
+  // target is always in backward hemisphere
+  G4int backwardCount = 1;         // number of particles in backward hemisphere
+  G4int backwardNucleonCount = 1;  // number of nucleons in backward hemisphere
+  targetParticle.SetSide(-1);
+  G4double backwardMass = targetParticle.GetMass() / GeV;
+  G4double bMass = backwardMass;
+
+  for (i = 0; i < vecLen; ++i) {
+    if (vec[i]->GetSide() < 0)
+      vec[i]->SetSide(-1);  // added by JLC, 2Jul97
+    // to take care of the case where vec has been preprocessed by GenerateXandPt
+    // and some of them have been set to -2 or -3
+    if (vec[i]->GetSide() == -1) {
+      ++backwardCount;
+      backwardMass += vec[i]->GetMass() / GeV;
+    } else {
+      ++forwardCount;
+      forwardMass += vec[i]->GetMass() / GeV;
     }
-    //
-    // nucleons and some pions from intranuclear cascade
-    //
-    G4double term1 = std::log(centerofmassEnergy*centerofmassEnergy);
-    if(term1 < 0) term1 = 0.0001; // making sure xtarg<0;
-    const G4double afc = 0.312 + 0.2 * std::log(term1);
-    G4double xtarg;
-    if( centerofmassEnergy < 2.0+G4UniformRand() )        // added +2 below, JLC 4Jul97
-      xtarg = afc * (std::pow(atomicWeight,0.33)-1.0) * (2*backwardCount+vecLen+2)/2.0;
-    else
-      xtarg = afc * (std::pow(atomicWeight,0.33)-1.0) * (2*backwardCount);
-    if( xtarg <= 0.0 )xtarg = 0.01;
-    G4int nuclearExcitationCount = Poisson( xtarg );
-    if(atomicWeight<1.0001) nuclearExcitationCount = 0;
-    G4int extraNucleonCount = 0;
-    G4double extraMass = 0.0;
-    G4double extraNucleonMass = 0.0;
-    if( nuclearExcitationCount > 0 )
-    {
-      G4int momentumBin = std::min( 4, G4int(pOriginal/3.0) );     
-      const G4double nucsup[] = { 1.0, 0.8, 0.6, 0.5, 0.4 };
-      //
-      //  NOTE: in TWOCLU, these new particles were given negative codes
-      //        here we use  NewlyAdded = true  instead
-      //
-      for( i=0; i<nuclearExcitationCount; ++i )
-      {
-        G4ReactionProduct* pVec = new G4ReactionProduct();
-        if( G4UniformRand() < nucsup[momentumBin] )  // add proton or neutron
-        {
-          if( G4UniformRand() > 1.0-atomicNumber/atomicWeight )
-            // HPW: looks like a gheisha bug 
-            pVec->SetDefinition( aProton );
-          else
-            pVec->SetDefinition( aNeutron );
-          ++backwardNucleonCount;
-          ++extraNucleonCount;
-          extraNucleonMass += pVec->GetMass()/GeV;
-        }
+  }
+  //
+  // nucleons and some pions from intranuclear cascade
+  //
+  G4double term1 = std::log(centerofmassEnergy * centerofmassEnergy);
+  if (term1 < 0)
+    term1 = 0.0001;  // making sure xtarg<0;
+  const G4double afc = 0.312 + 0.2 * std::log(term1);
+  G4double xtarg;
+  if (centerofmassEnergy < 2.0 + G4UniformRand())  // added +2 below, JLC 4Jul97
+    xtarg = afc * (std::pow(atomicWeight, 0.33) - 1.0) * (2 * backwardCount + vecLen + 2) / 2.0;
+  else
+    xtarg = afc * (std::pow(atomicWeight, 0.33) - 1.0) * (2 * backwardCount);
+  if (xtarg <= 0.0)
+    xtarg = 0.01;
+  G4int nuclearExcitationCount = Poisson(xtarg);
+  if (atomicWeight < 1.0001)
+    nuclearExcitationCount = 0;
+  G4int extraNucleonCount = 0;
+  G4double extraMass = 0.0;
+  G4double extraNucleonMass = 0.0;
+  if (nuclearExcitationCount > 0) {
+    G4int momentumBin = std::min(4, G4int(pOriginal / 3.0));
+    const G4double nucsup[] = {1.0, 0.8, 0.6, 0.5, 0.4};
+    //
+    //  NOTE: in TWOCLU, these new particles were given negative codes
+    //        here we use  NewlyAdded = true  instead
+    //
+    for (i = 0; i < nuclearExcitationCount; ++i) {
+      G4ReactionProduct *pVec = new G4ReactionProduct();
+      if (G4UniformRand() < nucsup[momentumBin])  // add proton or neutron
+      {
+        if (G4UniformRand() > 1.0 - atomicNumber / atomicWeight)
+          // HPW: looks like a gheisha bug
+          pVec->SetDefinition(aProton);
         else
-        {                                       // add a pion
-          G4double ran = G4UniformRand();
-          if( ran < 0.3181 )
-            pVec->SetDefinition( aPiPlus );
-          else if( ran < 0.6819 )
-            pVec->SetDefinition( aPiZero );
-          else
-            pVec->SetDefinition( aPiMinus );
-        }
-        pVec->SetSide( -2 );    // backside particle
-        extraMass += pVec->GetMass()/GeV;
-        pVec->SetNewlyAdded( true );
-        vec.SetElement( vecLen++, pVec );
-        // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+          pVec->SetDefinition(aNeutron);
+        ++backwardNucleonCount;
+        ++extraNucleonCount;
+        extraNucleonMass += pVec->GetMass() / GeV;
+      } else {  // add a pion
+        G4double ran = G4UniformRand();
+        if (ran < 0.3181)
+          pVec->SetDefinition(aPiPlus);
+        else if (ran < 0.6819)
+          pVec->SetDefinition(aPiZero);
+        else
+          pVec->SetDefinition(aPiMinus);
       }
+      pVec->SetSide(-2);  // backside particle
+      extraMass += pVec->GetMass() / GeV;
+      pVec->SetNewlyAdded(true);
+      vec.SetElement(vecLen++, pVec);
+      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
     }
+  }
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  G4double forwardEnergy = (centerofmassEnergy - cMass - bMass) / 2.0 + cMass - forwardMass;
+  G4double backwardEnergy = (centerofmassEnergy - cMass - bMass) / 2.0 + bMass - backwardMass;
+  G4double eAvailable = centerofmassEnergy - (forwardMass + backwardMass);
+  G4bool secondaryDeleted;
+  G4double pMass;
+  while (eAvailable <= 0.0)  // must eliminate a particle
+  {
+    secondaryDeleted = false;
+    for (i = (vecLen - 1); i >= 0; --i) {
+      if (vec[i]->GetSide() == 1 && vec[i]->GetMayBeKilled()) {
+        pMass = vec[i]->GetMass() / GeV;
+        for (G4int j = i; j < (vecLen - 1); ++j)
+          *vec[j] = *vec[j + 1];  // shift up
+        --forwardCount;
+        forwardEnergy += pMass;
+        forwardMass -= pMass;
+        secondaryDeleted = true;
+        break;
+      } else if (vec[i]->GetSide() == -1 && vec[i]->GetMayBeKilled()) {
+        pMass = vec[i]->GetMass() / GeV;
+        for (G4int j = i; j < (vecLen - 1); ++j)
+          *vec[j] = *vec[j + 1];  // shift up
+        --backwardCount;
+        backwardEnergy += pMass;
+        backwardMass -= pMass;
+        secondaryDeleted = true;
+        break;
+      }
+    }  // breaks go down to here
+    if (secondaryDeleted) {
+      G4ReactionProduct *temp = vec[vecLen - 1];
+      delete temp;
+      --vecLen;
       // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    G4double forwardEnergy = (centerofmassEnergy-cMass-bMass)/2.0 +cMass - forwardMass;
-    G4double backwardEnergy = (centerofmassEnergy-cMass-bMass)/2.0 +bMass - backwardMass;
-    G4double eAvailable = centerofmassEnergy - (forwardMass+backwardMass);
-    G4bool secondaryDeleted;
-    G4double pMass;
-    while( eAvailable <= 0.0 )   // must eliminate a particle
-    {
-      secondaryDeleted = false;
-      for( i=(vecLen-1); i>=0; --i )
-      {
-        if( vec[i]->GetSide() == 1 && vec[i]->GetMayBeKilled())
-        {
-          pMass = vec[i]->GetMass()/GeV;
-          for( G4int j=i; j<(vecLen-1); ++j )*vec[j] = *vec[j+1];     // shift up
-          --forwardCount;
-          forwardEnergy += pMass;
-          forwardMass -= pMass;
-          secondaryDeleted = true;
-          break;
-        }
-        else if( vec[i]->GetSide() == -1 && vec[i]->GetMayBeKilled())
-        {
-          pMass = vec[i]->GetMass()/GeV;
-          for( G4int j=i; j<(vecLen-1); ++j )*vec[j] = *vec[j+1];    // shift up
-          --backwardCount;
-          backwardEnergy += pMass;
-          backwardMass -= pMass;
-          secondaryDeleted = true;
-          break;
-        }
-      }           // breaks go down to here
-      if( secondaryDeleted )
-      {      
-        G4ReactionProduct *temp = vec[vecLen-1];
+    } else {
+      if (vecLen == 0) {
+        return false;  // all secondaries have been eliminated
+      }
+      if (targetParticle.GetSide() == -1) {
+        pMass = targetParticle.GetMass() / GeV;
+        targetParticle = *vec[0];
+        for (G4int j = 0; j < (vecLen - 1); ++j)
+          *vec[j] = *vec[j + 1];  // shift up
+        --backwardCount;
+        backwardEnergy += pMass;
+        backwardMass -= pMass;
+        secondaryDeleted = true;
+      } else if (targetParticle.GetSide() == 1) {
+        pMass = targetParticle.GetMass() / GeV;
+        targetParticle = *vec[0];
+        for (G4int j = 0; j < (vecLen - 1); ++j)
+          *vec[j] = *vec[j + 1];  // shift up
+        --forwardCount;
+        forwardEnergy += pMass;
+        forwardMass -= pMass;
+        secondaryDeleted = true;
+      }
+      if (secondaryDeleted) {
+        G4ReactionProduct *temp = vec[vecLen - 1];
         delete temp;
         --vecLen;
         // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-      }
-      else
-      {
-        if( vecLen == 0 )
-	{
-	  return false;  // all secondaries have been eliminated
-	}
-        if( targetParticle.GetSide() == -1 )
-        {
-          pMass = targetParticle.GetMass()/GeV;
-          targetParticle = *vec[0];
-          for( G4int j=0; j<(vecLen-1); ++j )*vec[j] = *vec[j+1];    // shift up
+      } else {
+        if (currentParticle.GetSide() == -1) {
+          pMass = currentParticle.GetMass() / GeV;
+          currentParticle = *vec[0];
+          for (G4int j = 0; j < (vecLen - 1); ++j)
+            *vec[j] = *vec[j + 1];  // shift up
           --backwardCount;
           backwardEnergy += pMass;
           backwardMass -= pMass;
           secondaryDeleted = true;
-        }
-        else if( targetParticle.GetSide() == 1 )
-        {
-          pMass = targetParticle.GetMass()/GeV;
-          targetParticle = *vec[0];
-          for( G4int j=0; j<(vecLen-1); ++j )*vec[j] = *vec[j+1];    // shift up
-          --forwardCount;
+        } else if (currentParticle.GetSide() == 1) {
+          pMass = currentParticle.GetMass() / GeV;
+          currentParticle = *vec[0];
+          for (G4int j = 0; j < (vecLen - 1); ++j)
+            *vec[j] = *vec[j + 1];  // shift up
+          --forwardCount;           //This line can cause infinite loop
           forwardEnergy += pMass;
           forwardMass -= pMass;
           secondaryDeleted = true;
         }
-        if( secondaryDeleted )
-        {
-          G4ReactionProduct *temp = vec[vecLen-1];
+        if (secondaryDeleted) {
+          G4ReactionProduct *temp = vec[vecLen - 1];
           delete temp;
           --vecLen;
           // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-        }
-        else
-        {
-          if( currentParticle.GetSide() == -1 )
-          {
-            pMass = currentParticle.GetMass()/GeV;
-            currentParticle = *vec[0];
-            for( G4int j=0; j<(vecLen-1); ++j )*vec[j] = *vec[j+1];    // shift up
-            --backwardCount;
-            backwardEnergy += pMass;
-            backwardMass -= pMass;
-            secondaryDeleted = true;
-          }
-          else if( currentParticle.GetSide() == 1 )
-          {
-            pMass = currentParticle.GetMass()/GeV;
-            currentParticle = *vec[0];
-            for( G4int j=0; j<(vecLen-1); ++j )*vec[j] = *vec[j+1];    // shift up
-            --forwardCount;//This line can cause infinite loop
-            forwardEnergy += pMass;
-            forwardMass -= pMass;
-            secondaryDeleted = true;
-          }
-          if( secondaryDeleted )
-          {
-            G4ReactionProduct *temp = vec[vecLen-1];
-            delete temp;
-            --vecLen;
-            // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-          }
-          else break;
-        }
+        } else
+          break;
       }
-      eAvailable = centerofmassEnergy - (forwardMass+backwardMass);
     }
-    //
-    // This is the start of the TwoCluster function
-    //  Choose masses for the 3 clusters:
-    //   forward cluster
-    //   backward meson cluster
-    //   backward nucleon cluster
-    //
-    G4double rmc = 0.0, rmd = 0.0; // rme = 0.0;
-    const G4double cpar[] = { 0.6, 0.6, 0.35, 0.15, 0.10 };
-    const G4double gpar[] = { 2.6, 2.6, 1.8, 1.30, 1.20 };
-    
-    if( forwardCount == 0) return false;
+    eAvailable = centerofmassEnergy - (forwardMass + backwardMass);
+  }
+  //
+  // This is the start of the TwoCluster function
+  //  Choose masses for the 3 clusters:
+  //   forward cluster
+  //   backward meson cluster
+  //   backward nucleon cluster
+  //
+  G4double rmc = 0.0, rmd = 0.0;  // rme = 0.0;
+  const G4double cpar[] = {0.6, 0.6, 0.35, 0.15, 0.10};
+  const G4double gpar[] = {2.6, 2.6, 1.8, 1.30, 1.20};
 
-    if( forwardCount == 1 )rmc = forwardMass;
-    else
-    {
-      G4int ntc = std::max(1, std::min(5,forwardCount))-1; // check if offset by 1 @@
-      rmc = forwardMass + std::pow(-std::log(1.0-G4UniformRand()),cpar[ntc])/gpar[ntc];
-    }
-    if( backwardCount == 1 )rmd = backwardMass;
-    else
-    {
-      G4int ntc = std::max(1, std::min(5,backwardCount))-1; // check, if offfset by 1 @@
-      rmd = backwardMass + std::pow(-std::log(1.0-G4UniformRand()),cpar[ntc])/gpar[ntc];
+  if (forwardCount == 0)
+    return false;
+
+  if (forwardCount == 1)
+    rmc = forwardMass;
+  else {
+    G4int ntc = std::max(1, std::min(5, forwardCount)) - 1;  // check if offset by 1 @@
+    rmc = forwardMass + std::pow(-std::log(1.0 - G4UniformRand()), cpar[ntc]) / gpar[ntc];
+  }
+  if (backwardCount == 1)
+    rmd = backwardMass;
+  else {
+    G4int ntc = std::max(1, std::min(5, backwardCount)) - 1;  // check, if offfset by 1 @@
+    rmd = backwardMass + std::pow(-std::log(1.0 - G4UniformRand()), cpar[ntc]) / gpar[ntc];
+  }
+  while (rmc + rmd > centerofmassEnergy) {
+    if ((rmc <= forwardMass) && (rmd <= backwardMass)) {
+      G4double temp = 0.999 * centerofmassEnergy / (rmc + rmd);
+      rmc *= temp;
+      rmd *= temp;
+    } else {
+      rmc = 0.1 * forwardMass + 0.9 * rmc;
+      rmd = 0.1 * backwardMass + 0.9 * rmd;
     }
-    while( rmc+rmd > centerofmassEnergy )
-    {
-      if( (rmc <= forwardMass) && (rmd <= backwardMass) )
-      {
-        G4double temp = 0.999*centerofmassEnergy/(rmc+rmd);
-        rmc *= temp;
-        rmd *= temp;
-      }
-      else
-      {
-        rmc = 0.1*forwardMass + 0.9*rmc;
-        rmd = 0.1*backwardMass + 0.9*rmd;
+  }
+  //
+  //  Set beam, target of first interaction in centre of mass system
+  //
+  G4ReactionProduct pseudoParticle[8];
+  for (i = 0; i < 8; ++i)
+    pseudoParticle[i].SetZero();
+
+  pseudoParticle[1].SetMass(mOriginal * GeV);
+  pseudoParticle[1].SetTotalEnergy(etOriginal * GeV);
+  pseudoParticle[1].SetMomentum(0.0, 0.0, pOriginal * GeV);
+
+  pseudoParticle[2].SetMass(protonMass * MeV);
+  pseudoParticle[2].SetTotalEnergy(protonMass * MeV);
+  pseudoParticle[2].SetMomentum(0.0, 0.0, 0.0);
+  //
+  //  transform into centre of mass system
+  //
+  pseudoParticle[0] = pseudoParticle[1] + pseudoParticle[2];
+  pseudoParticle[1].Lorentz(pseudoParticle[1], pseudoParticle[0]);
+  pseudoParticle[2].Lorentz(pseudoParticle[2], pseudoParticle[0]);
+
+  const G4double pfMin = 0.0001;
+  G4double pf = (centerofmassEnergy * centerofmassEnergy + rmd * rmd - rmc * rmc);
+  pf *= pf;
+  pf -= 4 * centerofmassEnergy * centerofmassEnergy * rmd * rmd;
+  pf = std::sqrt(std::max(pf, pfMin)) / (2.0 * centerofmassEnergy);
+  //
+  //  set final state masses and energies in centre of mass system
+  //
+  pseudoParticle[3].SetMass(rmc * GeV);
+  pseudoParticle[3].SetTotalEnergy(std::sqrt(pf * pf + rmc * rmc) * GeV);
+
+  pseudoParticle[4].SetMass(rmd * GeV);
+  pseudoParticle[4].SetTotalEnergy(std::sqrt(pf * pf + rmd * rmd) * GeV);
+  //
+  // set |T| and |TMIN|
+  //
+  const G4double bMin = 0.01;
+  const G4double b1 = 4.0;
+  const G4double b2 = 1.6;
+  G4double t = std::log(1.0 - G4UniformRand()) / std::max(bMin, b1 + b2 * std::log(pOriginal));
+  G4double t1 = pseudoParticle[1].GetTotalEnergy() / GeV - pseudoParticle[3].GetTotalEnergy() / GeV;
+  G4double pin = pseudoParticle[1].GetMomentum().mag() / GeV;
+  G4double tacmin = t1 * t1 - (pin - pf) * (pin - pf);
+  //
+  // calculate (std::sin(teta/2.)^2 and std::cos(teta), set azimuth angle phi
+  //
+  const G4double smallValue = 1.0e-10;
+  G4double dumnve = 4.0 * pin * pf;
+  if (dumnve == 0.0)
+    dumnve = smallValue;
+  G4double ctet = std::max(-1.0, std::min(1.0, 1.0 + 2.0 * (t - tacmin) / dumnve));
+  dumnve = std::max(0.0, 1.0 - ctet * ctet);
+  G4double stet = std::sqrt(dumnve);
+  G4double phi = G4UniformRand() * twopi;
+  //
+  // calculate final state momenta in centre of mass system
+  //
+  pseudoParticle[3].SetMomentum(pf * stet * std::sin(phi) * GeV, pf * stet * std::cos(phi) * GeV, pf * ctet * GeV);
+  pseudoParticle[4].SetMomentum(pseudoParticle[3].GetMomentum() * (-1.0));
+  //
+  // simulate backward nucleon cluster in lab. system and transform in cms
+  //
+  G4double pp, pp1, rthnve, phinve;
+  if (nuclearExcitationCount > 0) {
+    const G4double ga = 1.2;
+    G4double ekit1 = 0.04;
+    G4double ekit2 = 0.6;
+    if (ekOriginal <= 5.0) {
+      ekit1 *= ekOriginal * ekOriginal / 25.0;
+      ekit2 *= ekOriginal * ekOriginal / 25.0;
+    }
+    const G4double a = (1.0 - ga) / (std::pow(ekit2, (1.0 - ga)) - std::pow(ekit1, (1.0 - ga)));
+    for (i = 0; i < vecLen; ++i) {
+      if (vec[i]->GetSide() == -2) {
+        G4double kineticE =
+            std::pow((G4UniformRand() * (1.0 - ga) / a + std::pow(ekit1, (1.0 - ga))), (1.0 / (1.0 - ga)));
+        vec[i]->SetKineticEnergy(kineticE * GeV);
+        G4double vMass = vec[i]->GetMass() / MeV;
+        G4double totalE = kineticE + vMass;
+        pp = std::sqrt(std::abs(totalE * totalE - vMass * vMass));
+        G4double cost = std::min(1.0, std::max(-1.0, std::log(2.23 * G4UniformRand() + 0.383) / 0.96));
+        G4double sint = std::sqrt(std::max(0.0, (1.0 - cost * cost)));
+        phi = twopi * G4UniformRand();
+        vec[i]->SetMomentum(pp * sint * std::sin(phi) * MeV, pp * sint * std::cos(phi) * MeV, pp * cost * MeV);
+        vec[i]->Lorentz(*vec[i], pseudoParticle[0]);
       }
     }
-    //
-    //  Set beam, target of first interaction in centre of mass system
-    //
-    G4ReactionProduct pseudoParticle[8];
-    for( i=0; i<8; ++i )pseudoParticle[i].SetZero();
-    
-    pseudoParticle[1].SetMass( mOriginal*GeV );
-    pseudoParticle[1].SetTotalEnergy( etOriginal*GeV );
-    pseudoParticle[1].SetMomentum( 0.0, 0.0, pOriginal*GeV );
-    
-    pseudoParticle[2].SetMass( protonMass*MeV );
-    pseudoParticle[2].SetTotalEnergy( protonMass*MeV );
-    pseudoParticle[2].SetMomentum( 0.0, 0.0, 0.0 );
-    //
-    //  transform into centre of mass system
-    //
-    pseudoParticle[0] = pseudoParticle[1] + pseudoParticle[2];
-    pseudoParticle[1].Lorentz( pseudoParticle[1], pseudoParticle[0] );
-    pseudoParticle[2].Lorentz( pseudoParticle[2], pseudoParticle[0] );
-    
-    const G4double pfMin = 0.0001;
-    G4double pf = (centerofmassEnergy*centerofmassEnergy+rmd*rmd-rmc*rmc);
-    pf *= pf;
-    pf -= 4*centerofmassEnergy*centerofmassEnergy*rmd*rmd;
-    pf = std::sqrt( std::max(pf,pfMin) )/(2.0*centerofmassEnergy);
-    //
-    //  set final state masses and energies in centre of mass system
-    //
-    pseudoParticle[3].SetMass( rmc*GeV );
-    pseudoParticle[3].SetTotalEnergy( std::sqrt(pf*pf+rmc*rmc)*GeV );
-    
-    pseudoParticle[4].SetMass( rmd*GeV );
-    pseudoParticle[4].SetTotalEnergy( std::sqrt(pf*pf+rmd*rmd)*GeV );
-    //
-    // set |T| and |TMIN|
-    //
-    const G4double bMin = 0.01;
-    const G4double b1 = 4.0;
-    const G4double b2 = 1.6;
-    G4double t = std::log( 1.0-G4UniformRand() ) / std::max( bMin, b1+b2*std::log(pOriginal) );
-    G4double t1 =
-      pseudoParticle[1].GetTotalEnergy()/GeV - pseudoParticle[3].GetTotalEnergy()/GeV;
-    G4double pin = pseudoParticle[1].GetMomentum().mag()/GeV;
-    G4double tacmin = t1*t1 - (pin-pf)*(pin-pf);
-    //
-    // calculate (std::sin(teta/2.)^2 and std::cos(teta), set azimuth angle phi
-    //
-    const G4double smallValue = 1.0e-10;
-    G4double dumnve = 4.0*pin*pf;
-    if( dumnve == 0.0 )dumnve = smallValue;
-    G4double ctet = std::max( -1.0, std::min( 1.0, 1.0+2.0*(t-tacmin)/dumnve ) );
-    dumnve = std::max( 0.0, 1.0-ctet*ctet );
-    G4double stet = std::sqrt(dumnve);
-    G4double phi = G4UniformRand() * twopi;
-    //
-    // calculate final state momenta in centre of mass system
-    //
-    pseudoParticle[3].SetMomentum( pf*stet*std::sin(phi)*GeV,
-                                   pf*stet*std::cos(phi)*GeV,
-                                   pf*ctet*GeV );
-    pseudoParticle[4].SetMomentum( pseudoParticle[3].GetMomentum() * (-1.0) );
-    //
-    // simulate backward nucleon cluster in lab. system and transform in cms
-    //
-    G4double pp, pp1, rthnve, phinve;
-    if( nuclearExcitationCount > 0 )
-    {
-      const G4double ga = 1.2;
-      G4double ekit1 = 0.04;
-      G4double ekit2 = 0.6;
-      if( ekOriginal <= 5.0 )
-      {
-        ekit1 *= ekOriginal*ekOriginal/25.0;
-        ekit2 *= ekOriginal*ekOriginal/25.0;
-      }
-      const G4double a = (1.0-ga)/(std::pow(ekit2,(1.0-ga)) - std::pow(ekit1,(1.0-ga)));
-      for( i=0; i<vecLen; ++i )
-      {
-        if( vec[i]->GetSide() == -2 )
-        {
-          G4double kineticE =
-            std::pow( (G4UniformRand()*(1.0-ga)/a+std::pow(ekit1,(1.0-ga))), (1.0/(1.0-ga)) );
-          vec[i]->SetKineticEnergy( kineticE*GeV );
-          G4double vMass = vec[i]->GetMass()/MeV;
-          G4double totalE = kineticE + vMass;
-          pp = std::sqrt( std::abs(totalE*totalE-vMass*vMass) );
-          G4double cost = std::min( 1.0, std::max( -1.0, std::log(2.23*G4UniformRand()+0.383)/0.96 ) );
-          G4double sint = std::sqrt( std::max( 0.0, (1.0-cost*cost) ) );
-          phi = twopi*G4UniformRand();
-          vec[i]->SetMomentum( pp*sint*std::sin(phi)*MeV,
-                               pp*sint*std::cos(phi)*MeV,
-                               pp*cost*MeV );
-          vec[i]->Lorentz( *vec[i], pseudoParticle[0] );
+    // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  }
+  //
+  // fragmentation of forward cluster and backward meson cluster
+  //
+  currentParticle.SetMomentum(pseudoParticle[3].GetMomentum());
+  currentParticle.SetTotalEnergy(pseudoParticle[3].GetTotalEnergy());
+
+  targetParticle.SetMomentum(pseudoParticle[4].GetMomentum());
+  targetParticle.SetTotalEnergy(pseudoParticle[4].GetTotalEnergy());
+
+  pseudoParticle[5].SetMomentum(pseudoParticle[3].GetMomentum() * (-1.0));
+  pseudoParticle[5].SetMass(pseudoParticle[3].GetMass());
+  pseudoParticle[5].SetTotalEnergy(pseudoParticle[3].GetTotalEnergy());
+
+  pseudoParticle[6].SetMomentum(pseudoParticle[4].GetMomentum() * (-1.0));
+  pseudoParticle[6].SetMass(pseudoParticle[4].GetMass());
+  pseudoParticle[6].SetTotalEnergy(pseudoParticle[4].GetTotalEnergy());
+
+  G4double wgt;
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  if (forwardCount > 1)  // tempV will contain the forward particles
+  {
+    G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> tempV;
+    tempV.Initialize(forwardCount);
+    G4bool constantCrossSection = true;
+    G4int tempLen = 0;
+    if (currentParticle.GetSide() == 1)
+      tempV.SetElement(tempLen++, &currentParticle);
+    if (targetParticle.GetSide() == 1)
+      tempV.SetElement(tempLen++, &targetParticle);
+    for (i = 0; i < vecLen; ++i) {
+      if (vec[i]->GetSide() == 1) {
+        if (tempLen < 18)
+          tempV.SetElement(tempLen++, vec[i]);
+        else {
+          vec[i]->SetSide(-1);
+          continue;
         }
       }
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
     }
-    //
-    // fragmentation of forward cluster and backward meson cluster
-    //
-    currentParticle.SetMomentum( pseudoParticle[3].GetMomentum() );
-    currentParticle.SetTotalEnergy( pseudoParticle[3].GetTotalEnergy() );
-    
-    targetParticle.SetMomentum( pseudoParticle[4].GetMomentum() );
-    targetParticle.SetTotalEnergy( pseudoParticle[4].GetTotalEnergy() );
-    
-    pseudoParticle[5].SetMomentum( pseudoParticle[3].GetMomentum() * (-1.0) );
-    pseudoParticle[5].SetMass( pseudoParticle[3].GetMass() );
-    pseudoParticle[5].SetTotalEnergy( pseudoParticle[3].GetTotalEnergy() );
-    
-    pseudoParticle[6].SetMomentum( pseudoParticle[4].GetMomentum() * (-1.0) );
-    pseudoParticle[6].SetMass( pseudoParticle[4].GetMass() );
-    pseudoParticle[6].SetTotalEnergy( pseudoParticle[4].GetTotalEnergy() );
-    
-    G4double wgt;
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    if( forwardCount > 1 )     // tempV will contain the forward particles
-    {
-      G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> tempV;
-      tempV.Initialize( forwardCount );
-      G4bool constantCrossSection = true;
-      G4int tempLen = 0;
-      if( currentParticle.GetSide() == 1 )
-        tempV.SetElement( tempLen++, &currentParticle );
-      if( targetParticle.GetSide() == 1 )
-        tempV.SetElement( tempLen++, &targetParticle );
-      for( i=0; i<vecLen; ++i )
-      {
-        if( vec[i]->GetSide() == 1 )
-        {
-          if( tempLen < 18 )
-            tempV.SetElement( tempLen++, vec[i] );
-          else
-          {
-            vec[i]->SetSide( -1 );
-            continue;
-          }
-        }
-      }
-      if( tempLen >= 2 )
-      {
-        GenerateNBodyEvent( pseudoParticle[3].GetMass()/MeV,
-                                  constantCrossSection, tempV, tempLen );
-        if( currentParticle.GetSide() == 1 )
-          currentParticle.Lorentz( currentParticle, pseudoParticle[5] );
-        if( targetParticle.GetSide() == 1 )
-          targetParticle.Lorentz( targetParticle, pseudoParticle[5] );
-        for( i=0; i<vecLen; ++i )
-        {
-          if( vec[i]->GetSide() == 1 )vec[i]->Lorentz( *vec[i], pseudoParticle[5] );
-        }
+    if (tempLen >= 2) {
+      GenerateNBodyEvent(pseudoParticle[3].GetMass() / MeV, constantCrossSection, tempV, tempLen);
+      if (currentParticle.GetSide() == 1)
+        currentParticle.Lorentz(currentParticle, pseudoParticle[5]);
+      if (targetParticle.GetSide() == 1)
+        targetParticle.Lorentz(targetParticle, pseudoParticle[5]);
+      for (i = 0; i < vecLen; ++i) {
+        if (vec[i]->GetSide() == 1)
+          vec[i]->Lorentz(*vec[i], pseudoParticle[5]);
       }
     }
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    if( backwardCount > 1 )   //  tempV will contain the backward particles,
-    {                         //  but not those created from the intranuclear cascade
-      G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> tempV;
-      tempV.Initialize( backwardCount );
-      G4bool constantCrossSection = true;
-      G4int tempLen = 0;
-      if( currentParticle.GetSide() == -1 )
-        tempV.SetElement( tempLen++, &currentParticle );
-      if( targetParticle.GetSide() == -1 )
-        tempV.SetElement( tempLen++, &targetParticle );
-      for( i=0; i<vecLen; ++i )
-      {
-        if( vec[i]->GetSide() == -1 )
-        {
-          if( tempLen < 18 )
-            tempV.SetElement( tempLen++, vec[i] );
-          else
-          {
-            vec[i]->SetSide( -2 );
-            vec[i]->SetKineticEnergy( 0.0 );
-            vec[i]->SetMomentum( 0.0, 0.0, 0.0 );
-            continue;
-          }
-        }
-      }
-      if( tempLen >= 2 )
-      {
-        GenerateNBodyEvent( pseudoParticle[4].GetMass()/MeV,
-                                  constantCrossSection, tempV, tempLen );
-        if( currentParticle.GetSide() == -1 )
-          currentParticle.Lorentz( currentParticle, pseudoParticle[6] );
-        if( targetParticle.GetSide() == -1 )
-          targetParticle.Lorentz( targetParticle, pseudoParticle[6] );
-        for( i=0; i<vecLen; ++i )
-        {
-          if( vec[i]->GetSide() == -1 )vec[i]->Lorentz( *vec[i], pseudoParticle[6] );
+  }
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  if (backwardCount > 1)  //  tempV will contain the backward particles,
+  {                       //  but not those created from the intranuclear cascade
+    G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> tempV;
+    tempV.Initialize(backwardCount);
+    G4bool constantCrossSection = true;
+    G4int tempLen = 0;
+    if (currentParticle.GetSide() == -1)
+      tempV.SetElement(tempLen++, &currentParticle);
+    if (targetParticle.GetSide() == -1)
+      tempV.SetElement(tempLen++, &targetParticle);
+    for (i = 0; i < vecLen; ++i) {
+      if (vec[i]->GetSide() == -1) {
+        if (tempLen < 18)
+          tempV.SetElement(tempLen++, vec[i]);
+        else {
+          vec[i]->SetSide(-2);
+          vec[i]->SetKineticEnergy(0.0);
+          vec[i]->SetMomentum(0.0, 0.0, 0.0);
+          continue;
         }
       }
     }
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    //
-    // Lorentz transformation in lab system
-    //
-    G4int numberofFinalStateNucleons = 0;
-    if( currentParticle.GetDefinition() ==aProton ||
-        currentParticle.GetDefinition() == aNeutron ||
-	currentParticle.GetDefinition() == aSigmaMinus||
-	currentParticle.GetDefinition() == G4SigmaPlus::SigmaPlus()||
-	currentParticle.GetDefinition() == G4SigmaZero::SigmaZero()||
-	currentParticle.GetDefinition() == G4XiZero::XiZero()||
-	currentParticle.GetDefinition() == G4XiMinus::XiMinus()||
-	currentParticle.GetDefinition() == G4OmegaMinus::OmegaMinus()||
-	currentParticle.GetDefinition() == G4Lambda::Lambda()) ++numberofFinalStateNucleons;
-    currentParticle.Lorentz( currentParticle, pseudoParticle[2] );
-    if( targetParticle.GetDefinition() ==aProton ||
-        targetParticle.GetDefinition() == aNeutron ||
-        targetParticle.GetDefinition() == G4Lambda::Lambda() ||
-	targetParticle.GetDefinition() == G4XiZero::XiZero()||
-	targetParticle.GetDefinition() == G4XiMinus::XiMinus()||
-	targetParticle.GetDefinition() == G4OmegaMinus::OmegaMinus()||
-	targetParticle.GetDefinition() == G4SigmaZero::SigmaZero()||
-	targetParticle.GetDefinition() == G4SigmaPlus::SigmaPlus()||
-	targetParticle.GetDefinition() == aSigmaMinus) ++numberofFinalStateNucleons;
-    if( targetParticle.GetDefinition() ==G4AntiProton::AntiProton()) --numberofFinalStateNucleons;
-    if( targetParticle.GetDefinition() ==G4AntiNeutron::AntiNeutron()) --numberofFinalStateNucleons;
-    if( targetParticle.GetDefinition() ==G4AntiSigmaMinus::AntiSigmaMinus()) --numberofFinalStateNucleons;
-    if( targetParticle.GetDefinition() ==G4AntiSigmaPlus::AntiSigmaPlus()) --numberofFinalStateNucleons;
-    if( targetParticle.GetDefinition() ==G4AntiSigmaZero::AntiSigmaZero()) --numberofFinalStateNucleons;
-    if( targetParticle.GetDefinition() ==G4AntiXiZero::AntiXiZero()) --numberofFinalStateNucleons;
-    if( targetParticle.GetDefinition() ==G4AntiXiMinus::AntiXiMinus()) --numberofFinalStateNucleons;
-    if( targetParticle.GetDefinition() ==G4AntiOmegaMinus::AntiOmegaMinus()) --numberofFinalStateNucleons;
-    if( targetParticle.GetDefinition() ==G4AntiLambda::AntiLambda()) --numberofFinalStateNucleons;
-    targetParticle.Lorentz( targetParticle, pseudoParticle[2] );
-    for( i=0; i<vecLen; ++i )
-    {
-      if( vec[i]->GetDefinition() ==aProton ||
-          vec[i]->GetDefinition() == aNeutron ||
-          vec[i]->GetDefinition() == G4Lambda::Lambda() ||
-          vec[i]->GetDefinition() == G4XiZero::XiZero() ||
-          vec[i]->GetDefinition() == G4XiMinus::XiMinus() ||
-          vec[i]->GetDefinition() == G4OmegaMinus::OmegaMinus() ||
-	  vec[i]->GetDefinition() == G4SigmaPlus::SigmaPlus()||
-	  vec[i]->GetDefinition() == G4SigmaZero::SigmaZero()||
-	  vec[i]->GetDefinition() == aSigmaMinus) ++numberofFinalStateNucleons;
-      if( vec[i]->GetDefinition() ==G4AntiProton::AntiProton()) --numberofFinalStateNucleons;
-      if( vec[i]->GetDefinition() ==G4AntiNeutron::AntiNeutron()) --numberofFinalStateNucleons;
-      if( vec[i]->GetDefinition() ==G4AntiSigmaMinus::AntiSigmaMinus()) --numberofFinalStateNucleons;
-      if( vec[i]->GetDefinition() ==G4AntiSigmaPlus::AntiSigmaPlus()) --numberofFinalStateNucleons;
-      if( vec[i]->GetDefinition() ==G4AntiSigmaZero::AntiSigmaZero()) --numberofFinalStateNucleons;
-      if( vec[i]->GetDefinition() ==G4AntiLambda::AntiLambda()) --numberofFinalStateNucleons;
-      if( vec[i]->GetDefinition() ==G4AntiXiZero::AntiXiZero()) --numberofFinalStateNucleons;
-      if( vec[i]->GetDefinition() ==G4AntiXiMinus::AntiXiMinus()) --numberofFinalStateNucleons;
-      if( vec[i]->GetDefinition() ==G4AntiOmegaMinus::AntiOmegaMinus()) --numberofFinalStateNucleons;
-      vec[i]->Lorentz( *vec[i], pseudoParticle[2] );
-    }
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    numberofFinalStateNucleons = std::max( 1, numberofFinalStateNucleons );
-    //
-    // sometimes the leading strange particle is lost, set it back
-    //
-    G4bool dum = true;
-    if( leadFlag )
-    {
-      // leadFlag will be true
-      //  iff original particle is at least as heavy as K+ and not a proton or neutron AND
-      //   if
-      //    incident particle is at least as heavy as K+ and it is not a proton or neutron
-      //     leadFlag is set to the incident particle
-      //   or
-      //    target particle is at least as heavy as K+ and it is not a proton or neutron
-      //     leadFlag is set to the target particle
-      //
-      if( currentParticle.GetDefinition() == leadingStrangeParticle.GetDefinition() )
-        dum = false;
-      else if( targetParticle.GetDefinition() == leadingStrangeParticle.GetDefinition() )
-        dum = false;
-      else
-      {
-        for( i=0; i<vecLen; ++i )
-        {
-          if( vec[i]->GetDefinition() == leadingStrangeParticle.GetDefinition() )
-          {
-            dum = false;
-            break;
-          }
-        }
-      }
-      if( dum )
-      {
-        G4double leadMass = leadingStrangeParticle.GetMass()/MeV;
-        G4double ekin;
-        if( ((leadMass <  protonMass) && (targetParticle.GetMass()/MeV <  protonMass)) ||
-            ((leadMass >= protonMass) && (targetParticle.GetMass()/MeV >= protonMass)) )
-        {
-          ekin = targetParticle.GetKineticEnergy()/GeV;
-          pp1 = targetParticle.GetMomentum().mag()/MeV; // old momentum
-          targetParticle.SetDefinition( leadingStrangeParticle.GetDefinition() );
-          targetParticle.SetKineticEnergy( ekin*GeV );
-          pp = targetParticle.GetTotalMomentum()/MeV;   // new momentum
-          if( pp1 < 1.0e-3 )
-          {
-            rthnve = pi*G4UniformRand();
-            phinve = twopi*G4UniformRand();
-            targetParticle.SetMomentum( pp*std::sin(rthnve)*std::cos(phinve)*MeV,
-                                        pp*std::sin(rthnve)*std::sin(phinve)*MeV,
-                                        pp*std::cos(rthnve)*MeV );
-          }
-          else
-            targetParticle.SetMomentum( targetParticle.GetMomentum() * (pp/pp1) );
-          
-          targetHasChanged = true;
-        }
-        else
-        {
-          ekin = currentParticle.GetKineticEnergy()/GeV;
-          pp1 = currentParticle.GetMomentum().mag()/MeV;
-          currentParticle.SetDefinition( leadingStrangeParticle.GetDefinition() );
-          currentParticle.SetKineticEnergy( ekin*GeV );
-          pp = currentParticle.GetTotalMomentum()/MeV;
-          if( pp1 < 1.0e-3 )
-          {
-            rthnve = pi*G4UniformRand();
-            phinve = twopi*G4UniformRand();
-            currentParticle.SetMomentum( pp*std::sin(rthnve)*std::cos(phinve)*MeV,
-                                         pp*std::sin(rthnve)*std::sin(phinve)*MeV,
-                                         pp*std::cos(rthnve)*MeV );
-          }
-          else
-            currentParticle.SetMomentum( currentParticle.GetMomentum() * (pp/pp1) );
-          
-          incidentHasChanged = true;
-        }
+    if (tempLen >= 2) {
+      GenerateNBodyEvent(pseudoParticle[4].GetMass() / MeV, constantCrossSection, tempV, tempLen);
+      if (currentParticle.GetSide() == -1)
+        currentParticle.Lorentz(currentParticle, pseudoParticle[6]);
+      if (targetParticle.GetSide() == -1)
+        targetParticle.Lorentz(targetParticle, pseudoParticle[6]);
+      for (i = 0; i < vecLen; ++i) {
+        if (vec[i]->GetSide() == -1)
+          vec[i]->Lorentz(*vec[i], pseudoParticle[6]);
       }
-    }    // end of if( leadFlag )
-    //
-    //  for various reasons, the energy balance is not sufficient,
-    //  check that,  energy balance, angle of final system, etc.
+    }
+  }
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  //
+  // Lorentz transformation in lab system
+  //
+  G4int numberofFinalStateNucleons = 0;
+  if (currentParticle.GetDefinition() == aProton || currentParticle.GetDefinition() == aNeutron ||
+      currentParticle.GetDefinition() == aSigmaMinus || currentParticle.GetDefinition() == G4SigmaPlus::SigmaPlus() ||
+      currentParticle.GetDefinition() == G4SigmaZero::SigmaZero() ||
+      currentParticle.GetDefinition() == G4XiZero::XiZero() ||
+      currentParticle.GetDefinition() == G4XiMinus::XiMinus() ||
+      currentParticle.GetDefinition() == G4OmegaMinus::OmegaMinus() ||
+      currentParticle.GetDefinition() == G4Lambda::Lambda())
+    ++numberofFinalStateNucleons;
+  currentParticle.Lorentz(currentParticle, pseudoParticle[2]);
+  if (targetParticle.GetDefinition() == aProton || targetParticle.GetDefinition() == aNeutron ||
+      targetParticle.GetDefinition() == G4Lambda::Lambda() || targetParticle.GetDefinition() == G4XiZero::XiZero() ||
+      targetParticle.GetDefinition() == G4XiMinus::XiMinus() ||
+      targetParticle.GetDefinition() == G4OmegaMinus::OmegaMinus() ||
+      targetParticle.GetDefinition() == G4SigmaZero::SigmaZero() ||
+      targetParticle.GetDefinition() == G4SigmaPlus::SigmaPlus() || targetParticle.GetDefinition() == aSigmaMinus)
+    ++numberofFinalStateNucleons;
+  if (targetParticle.GetDefinition() == G4AntiProton::AntiProton())
+    --numberofFinalStateNucleons;
+  if (targetParticle.GetDefinition() == G4AntiNeutron::AntiNeutron())
+    --numberofFinalStateNucleons;
+  if (targetParticle.GetDefinition() == G4AntiSigmaMinus::AntiSigmaMinus())
+    --numberofFinalStateNucleons;
+  if (targetParticle.GetDefinition() == G4AntiSigmaPlus::AntiSigmaPlus())
+    --numberofFinalStateNucleons;
+  if (targetParticle.GetDefinition() == G4AntiSigmaZero::AntiSigmaZero())
+    --numberofFinalStateNucleons;
+  if (targetParticle.GetDefinition() == G4AntiXiZero::AntiXiZero())
+    --numberofFinalStateNucleons;
+  if (targetParticle.GetDefinition() == G4AntiXiMinus::AntiXiMinus())
+    --numberofFinalStateNucleons;
+  if (targetParticle.GetDefinition() == G4AntiOmegaMinus::AntiOmegaMinus())
+    --numberofFinalStateNucleons;
+  if (targetParticle.GetDefinition() == G4AntiLambda::AntiLambda())
+    --numberofFinalStateNucleons;
+  targetParticle.Lorentz(targetParticle, pseudoParticle[2]);
+  for (i = 0; i < vecLen; ++i) {
+    if (vec[i]->GetDefinition() == aProton || vec[i]->GetDefinition() == aNeutron ||
+        vec[i]->GetDefinition() == G4Lambda::Lambda() || vec[i]->GetDefinition() == G4XiZero::XiZero() ||
+        vec[i]->GetDefinition() == G4XiMinus::XiMinus() || vec[i]->GetDefinition() == G4OmegaMinus::OmegaMinus() ||
+        vec[i]->GetDefinition() == G4SigmaPlus::SigmaPlus() || vec[i]->GetDefinition() == G4SigmaZero::SigmaZero() ||
+        vec[i]->GetDefinition() == aSigmaMinus)
+      ++numberofFinalStateNucleons;
+    if (vec[i]->GetDefinition() == G4AntiProton::AntiProton())
+      --numberofFinalStateNucleons;
+    if (vec[i]->GetDefinition() == G4AntiNeutron::AntiNeutron())
+      --numberofFinalStateNucleons;
+    if (vec[i]->GetDefinition() == G4AntiSigmaMinus::AntiSigmaMinus())
+      --numberofFinalStateNucleons;
+    if (vec[i]->GetDefinition() == G4AntiSigmaPlus::AntiSigmaPlus())
+      --numberofFinalStateNucleons;
+    if (vec[i]->GetDefinition() == G4AntiSigmaZero::AntiSigmaZero())
+      --numberofFinalStateNucleons;
+    if (vec[i]->GetDefinition() == G4AntiLambda::AntiLambda())
+      --numberofFinalStateNucleons;
+    if (vec[i]->GetDefinition() == G4AntiXiZero::AntiXiZero())
+      --numberofFinalStateNucleons;
+    if (vec[i]->GetDefinition() == G4AntiXiMinus::AntiXiMinus())
+      --numberofFinalStateNucleons;
+    if (vec[i]->GetDefinition() == G4AntiOmegaMinus::AntiOmegaMinus())
+      --numberofFinalStateNucleons;
+    vec[i]->Lorentz(*vec[i], pseudoParticle[2]);
+  }
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  numberofFinalStateNucleons = std::max(1, numberofFinalStateNucleons);
+  //
+  // sometimes the leading strange particle is lost, set it back
+  //
+  G4bool dum = true;
+  if (leadFlag) {
+    // leadFlag will be true
+    //  iff original particle is at least as heavy as K+ and not a proton or neutron AND
+    //   if
+    //    incident particle is at least as heavy as K+ and it is not a proton or neutron
+    //     leadFlag is set to the incident particle
+    //   or
+    //    target particle is at least as heavy as K+ and it is not a proton or neutron
+    //     leadFlag is set to the target particle
     //
-    pseudoParticle[4].SetMass( mOriginal*GeV );
-    pseudoParticle[4].SetTotalEnergy( etOriginal*GeV );
-    pseudoParticle[4].SetMomentum( 0.0, 0.0, pOriginal*GeV );
-    
-    const G4ParticleDefinition * aOrgDef = modifiedOriginal.GetDefinition();
-    G4int diff = 0;
-    if(aOrgDef == G4Proton::Proton() || aOrgDef == G4Neutron::Neutron() )  diff = 1;
-    if(numberofFinalStateNucleons == 1) diff = 0;
-    pseudoParticle[5].SetMomentum( 0.0, 0.0, 0.0 );
-    pseudoParticle[5].SetMass( protonMass*(numberofFinalStateNucleons-diff)*MeV );
-    pseudoParticle[5].SetTotalEnergy( protonMass*(numberofFinalStateNucleons-diff)*MeV );
-    
-//    G4double ekin0 = pseudoParticle[4].GetKineticEnergy()/GeV;
-    G4double theoreticalKinetic =
-      pseudoParticle[4].GetTotalEnergy()/GeV + pseudoParticle[5].GetTotalEnergy()/GeV;
-    
-    pseudoParticle[6] = pseudoParticle[4] + pseudoParticle[5];
-    pseudoParticle[4].Lorentz( pseudoParticle[4], pseudoParticle[6] );
-    pseudoParticle[5].Lorentz( pseudoParticle[5], pseudoParticle[6] );
-     
-    if( vecLen < 16 )
-    {
-      G4ReactionProduct tempR[130];
-      //G4ReactionProduct *tempR = new G4ReactionProduct [vecLen+2];
-      tempR[0] = currentParticle;
-      tempR[1] = targetParticle;
-      for( i=0; i<vecLen; ++i )tempR[i+2] = *vec[i];
-
-      G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> tempV;
-      tempV.Initialize( vecLen+2 );
-      G4bool constantCrossSection = true;
-      G4int tempLen = 0;
-      for( i=0; i<vecLen+2; ++i )tempV.SetElement( tempLen++, &tempR[i] );
-
-      if( tempLen >= 2 )
-      {
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-        GenerateNBodyEvent(
-         pseudoParticle[4].GetTotalEnergy()/MeV+pseudoParticle[5].GetTotalEnergy()/MeV,
-         constantCrossSection, tempV, tempLen );
-        theoreticalKinetic = 0.0;
-        for( i=0; i<vecLen+2; ++i )
-        {
-          pseudoParticle[7].SetMomentum( tempV[i]->GetMomentum() );
-          pseudoParticle[7].SetMass( tempV[i]->GetMass() );
-          pseudoParticle[7].SetTotalEnergy( tempV[i]->GetTotalEnergy() );
-          pseudoParticle[7].Lorentz( pseudoParticle[7], pseudoParticle[5] );
-          theoreticalKinetic += pseudoParticle[7].GetKineticEnergy()/GeV;
+    if (currentParticle.GetDefinition() == leadingStrangeParticle.GetDefinition())
+      dum = false;
+    else if (targetParticle.GetDefinition() == leadingStrangeParticle.GetDefinition())
+      dum = false;
+    else {
+      for (i = 0; i < vecLen; ++i) {
+        if (vec[i]->GetDefinition() == leadingStrangeParticle.GetDefinition()) {
+          dum = false;
+          break;
         }
       }
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-      //delete [] tempR;
-    }
-    else
-    {
-      theoreticalKinetic -=
-        ( currentParticle.GetMass()/GeV + targetParticle.GetMass()/GeV );
-      for( i=0; i<vecLen; ++i )theoreticalKinetic -= vec[i]->GetMass()/GeV;
     }
-    G4double simulatedKinetic =
-      currentParticle.GetKineticEnergy()/GeV + targetParticle.GetKineticEnergy()/GeV;
-    for( i=0; i<vecLen; ++i )simulatedKinetic += vec[i]->GetKineticEnergy()/GeV;
-    //
-    // make sure that kinetic energies are correct
-    // the backward nucleon cluster is not produced within proper kinematics!!!
-    //
-    
-    if( simulatedKinetic != 0.0 )
-    {
-      wgt = (theoreticalKinetic)/simulatedKinetic;
-      currentParticle.SetKineticEnergy( wgt*currentParticle.GetKineticEnergy() );
-      pp = currentParticle.GetTotalMomentum()/MeV;
-      pp1 = currentParticle.GetMomentum().mag()/MeV;
-      if( pp1 < 0.001*MeV )
-      {
-        rthnve = pi * G4UniformRand();
-        phinve = twopi * G4UniformRand();
-        currentParticle.SetMomentum( pp*std::sin(rthnve)*std::cos(phinve)*MeV,
-                                     pp*std::sin(rthnve)*std::sin(phinve)*MeV,
-                                     pp*std::cos(rthnve)*MeV );
-      }
-      else
-        currentParticle.SetMomentum( currentParticle.GetMomentum() * (pp/pp1) );
-      
-      targetParticle.SetKineticEnergy( wgt*targetParticle.GetKineticEnergy() );
-      pp = targetParticle.GetTotalMomentum()/MeV;
-      pp1 = targetParticle.GetMomentum().mag()/MeV;
-      if( pp1 < 0.001*MeV )
-      {
-        rthnve = pi * G4UniformRand();
-        phinve = twopi * G4UniformRand();
-        targetParticle.SetMomentum( pp*std::sin(rthnve)*std::cos(phinve)*MeV,
-                                    pp*std::sin(rthnve)*std::sin(phinve)*MeV,
-                                    pp*std::cos(rthnve)*MeV );
-      }
-      else
-        targetParticle.SetMomentum( targetParticle.GetMomentum() * (pp/pp1) );
-      
-      for( i=0; i<vecLen; ++i )
-      {
-        vec[i]->SetKineticEnergy( wgt*vec[i]->GetKineticEnergy() );
-        pp = vec[i]->GetTotalMomentum()/MeV;
-        pp1 = vec[i]->GetMomentum().mag()/MeV;
-        if( pp1 < 0.001 )
-        {
+    if (dum) {
+      G4double leadMass = leadingStrangeParticle.GetMass() / MeV;
+      G4double ekin;
+      if (((leadMass < protonMass) && (targetParticle.GetMass() / MeV < protonMass)) ||
+          ((leadMass >= protonMass) && (targetParticle.GetMass() / MeV >= protonMass))) {
+        ekin = targetParticle.GetKineticEnergy() / GeV;
+        pp1 = targetParticle.GetMomentum().mag() / MeV;  // old momentum
+        targetParticle.SetDefinition(leadingStrangeParticle.GetDefinition());
+        targetParticle.SetKineticEnergy(ekin * GeV);
+        pp = targetParticle.GetTotalMomentum() / MeV;  // new momentum
+        if (pp1 < 1.0e-3) {
           rthnve = pi * G4UniformRand();
           phinve = twopi * G4UniformRand();
-          vec[i]->SetMomentum( pp*std::sin(rthnve)*std::cos(phinve)*MeV,
-                               pp*std::sin(rthnve)*std::sin(phinve)*MeV,
-                               pp*std::cos(rthnve)*MeV );
-        }
-        else
-          vec[i]->SetMomentum( vec[i]->GetMomentum() * (pp/pp1) );
+          targetParticle.SetMomentum(pp * std::sin(rthnve) * std::cos(phinve) * MeV,
+                                     pp * std::sin(rthnve) * std::sin(phinve) * MeV,
+                                     pp * std::cos(rthnve) * MeV);
+        } else
+          targetParticle.SetMomentum(targetParticle.GetMomentum() * (pp / pp1));
+
+        targetHasChanged = true;
+      } else {
+        ekin = currentParticle.GetKineticEnergy() / GeV;
+        pp1 = currentParticle.GetMomentum().mag() / MeV;
+        currentParticle.SetDefinition(leadingStrangeParticle.GetDefinition());
+        currentParticle.SetKineticEnergy(ekin * GeV);
+        pp = currentParticle.GetTotalMomentum() / MeV;
+        if (pp1 < 1.0e-3) {
+          rthnve = pi * G4UniformRand();
+          phinve = twopi * G4UniformRand();
+          currentParticle.SetMomentum(pp * std::sin(rthnve) * std::cos(phinve) * MeV,
+                                      pp * std::sin(rthnve) * std::sin(phinve) * MeV,
+                                      pp * std::cos(rthnve) * MeV);
+        } else
+          currentParticle.SetMomentum(currentParticle.GetMomentum() * (pp / pp1));
+
+        incidentHasChanged = true;
       }
     }
+  }  // end of if( leadFlag )
+  //
+  //  for various reasons, the energy balance is not sufficient,
+  //  check that,  energy balance, angle of final system, etc.
+  //
+  pseudoParticle[4].SetMass(mOriginal * GeV);
+  pseudoParticle[4].SetTotalEnergy(etOriginal * GeV);
+  pseudoParticle[4].SetMomentum(0.0, 0.0, pOriginal * GeV);
+
+  const G4ParticleDefinition *aOrgDef = modifiedOriginal.GetDefinition();
+  G4int diff = 0;
+  if (aOrgDef == G4Proton::Proton() || aOrgDef == G4Neutron::Neutron())
+    diff = 1;
+  if (numberofFinalStateNucleons == 1)
+    diff = 0;
+  pseudoParticle[5].SetMomentum(0.0, 0.0, 0.0);
+  pseudoParticle[5].SetMass(protonMass * (numberofFinalStateNucleons - diff) * MeV);
+  pseudoParticle[5].SetTotalEnergy(protonMass * (numberofFinalStateNucleons - diff) * MeV);
+
+  //    G4double ekin0 = pseudoParticle[4].GetKineticEnergy()/GeV;
+  G4double theoreticalKinetic = pseudoParticle[4].GetTotalEnergy() / GeV + pseudoParticle[5].GetTotalEnergy() / GeV;
+
+  pseudoParticle[6] = pseudoParticle[4] + pseudoParticle[5];
+  pseudoParticle[4].Lorentz(pseudoParticle[4], pseudoParticle[6]);
+  pseudoParticle[5].Lorentz(pseudoParticle[5], pseudoParticle[6]);
+
+  if (vecLen < 16) {
+    G4ReactionProduct tempR[130];
+    //G4ReactionProduct *tempR = new G4ReactionProduct [vecLen+2];
+    tempR[0] = currentParticle;
+    tempR[1] = targetParticle;
+    for (i = 0; i < vecLen; ++i)
+      tempR[i + 2] = *vec[i];
+
+    G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> tempV;
+    tempV.Initialize(vecLen + 2);
+    G4bool constantCrossSection = true;
+    G4int tempLen = 0;
+    for (i = 0; i < vecLen + 2; ++i)
+      tempV.SetElement(tempLen++, &tempR[i]);
+
+    if (tempLen >= 2) {
       // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    Rotate( numberofFinalStateNucleons, pseudoParticle[4].GetMomentum(),
-            modifiedOriginal, originalIncident, targetNucleus,
-            currentParticle, targetParticle, vec, vecLen );
-    //
-    //  add black track particles
-    //  the total number of particles produced is restricted to 198
-    //  this may have influence on very high energies
-    //
-    if( atomicWeight >= 1.5 )
-    {
-      // npnb is number of proton/neutron black track particles
-      // ndta is the number of deuterons, tritons, and alphas produced
-      // epnb is the kinetic energy available for proton/neutron black track particles
-      // edta is the kinetic energy available for deuteron/triton/alpha particles
-      //
-      G4double epnb, edta;
-      G4int npnb = 0;
-      G4int ndta = 0;
-      
-      epnb = targetNucleus.GetPNBlackTrackEnergy();            // was enp1 in fortran code
-      edta = targetNucleus.GetDTABlackTrackEnergy();           // was enp3 in fortran code
-      const G4double pnCutOff = 0.001;     // GeV
-      const G4double dtaCutOff = 0.001;    // GeV
-      const G4double kineticMinimum = 1.e-6;
-      const G4double kineticFactor = -0.005;
-      
-      G4double sprob = 0.0; // sprob = probability of self-absorption in heavy molecules
-      const G4double ekIncident = originalIncident->GetKineticEnergy()/GeV;
-      if( ekIncident >= 5.0 )sprob = std::min( 1.0, 0.6*std::log(ekIncident-4.0) );
-      
-      if( epnb >= pnCutOff )
-      {
-        npnb = Poisson((1.5+1.25*numberofFinalStateNucleons)*epnb/(epnb+edta));
-        if( numberofFinalStateNucleons + npnb > atomicWeight )
-          npnb = G4int(atomicWeight - numberofFinalStateNucleons);
-        npnb = std::min( npnb, 127-vecLen );
-      }
-      if( edta >= dtaCutOff )
-      {
-        ndta = Poisson( (1.5+1.25*numberofFinalStateNucleons)*edta/(epnb+edta) );
-        ndta = std::min( ndta, 127-vecLen );
+      GenerateNBodyEvent(pseudoParticle[4].GetTotalEnergy() / MeV + pseudoParticle[5].GetTotalEnergy() / MeV,
+                         constantCrossSection,
+                         tempV,
+                         tempLen);
+      theoreticalKinetic = 0.0;
+      for (i = 0; i < vecLen + 2; ++i) {
+        pseudoParticle[7].SetMomentum(tempV[i]->GetMomentum());
+        pseudoParticle[7].SetMass(tempV[i]->GetMass());
+        pseudoParticle[7].SetTotalEnergy(tempV[i]->GetTotalEnergy());
+        pseudoParticle[7].Lorentz(pseudoParticle[7], pseudoParticle[5]);
+        theoreticalKinetic += pseudoParticle[7].GetKineticEnergy() / GeV;
       }
-      G4double spall = numberofFinalStateNucleons;
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+    }
+    // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+    //delete [] tempR;
+  } else {
+    theoreticalKinetic -= (currentParticle.GetMass() / GeV + targetParticle.GetMass() / GeV);
+    for (i = 0; i < vecLen; ++i)
+      theoreticalKinetic -= vec[i]->GetMass() / GeV;
+  }
+  G4double simulatedKinetic = currentParticle.GetKineticEnergy() / GeV + targetParticle.GetKineticEnergy() / GeV;
+  for (i = 0; i < vecLen; ++i)
+    simulatedKinetic += vec[i]->GetKineticEnergy() / GeV;
+  //
+  // make sure that kinetic energies are correct
+  // the backward nucleon cluster is not produced within proper kinematics!!!
+  //
 
-      AddBlackTrackParticles( epnb, npnb, edta, ndta, sprob, kineticMinimum, kineticFactor,
-                              modifiedOriginal, spall, targetNucleus,
-                              vec, vecLen );
+  if (simulatedKinetic != 0.0) {
+    wgt = (theoreticalKinetic) / simulatedKinetic;
+    currentParticle.SetKineticEnergy(wgt * currentParticle.GetKineticEnergy());
+    pp = currentParticle.GetTotalMomentum() / MeV;
+    pp1 = currentParticle.GetMomentum().mag() / MeV;
+    if (pp1 < 0.001 * MeV) {
+      rthnve = pi * G4UniformRand();
+      phinve = twopi * G4UniformRand();
+      currentParticle.SetMomentum(pp * std::sin(rthnve) * std::cos(phinve) * MeV,
+                                  pp * std::sin(rthnve) * std::sin(phinve) * MeV,
+                                  pp * std::cos(rthnve) * MeV);
+    } else
+      currentParticle.SetMomentum(currentParticle.GetMomentum() * (pp / pp1));
 
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+    targetParticle.SetKineticEnergy(wgt * targetParticle.GetKineticEnergy());
+    pp = targetParticle.GetTotalMomentum() / MeV;
+    pp1 = targetParticle.GetMomentum().mag() / MeV;
+    if (pp1 < 0.001 * MeV) {
+      rthnve = pi * G4UniformRand();
+      phinve = twopi * G4UniformRand();
+      targetParticle.SetMomentum(pp * std::sin(rthnve) * std::cos(phinve) * MeV,
+                                 pp * std::sin(rthnve) * std::sin(phinve) * MeV,
+                                 pp * std::cos(rthnve) * MeV);
+    } else
+      targetParticle.SetMomentum(targetParticle.GetMomentum() * (pp / pp1));
+
+    for (i = 0; i < vecLen; ++i) {
+      vec[i]->SetKineticEnergy(wgt * vec[i]->GetKineticEnergy());
+      pp = vec[i]->GetTotalMomentum() / MeV;
+      pp1 = vec[i]->GetMomentum().mag() / MeV;
+      if (pp1 < 0.001) {
+        rthnve = pi * G4UniformRand();
+        phinve = twopi * G4UniformRand();
+        vec[i]->SetMomentum(pp * std::sin(rthnve) * std::cos(phinve) * MeV,
+                            pp * std::sin(rthnve) * std::sin(phinve) * MeV,
+                            pp * std::cos(rthnve) * MeV);
+      } else
+        vec[i]->SetMomentum(vec[i]->GetMomentum() * (pp / pp1));
     }
-    //if( centerofmassEnergy <= (4.0+G4UniformRand()) )
-    //  MomentumCheck( modifiedOriginal, currentParticle, targetParticle, vec, vecLen );
-    //
-    //  calculate time delay for nuclear reactions
-    //
-    if( (atomicWeight >= 1.5) && (atomicWeight <= 230.0) && (ekOriginal <= 0.2) )
-      currentParticle.SetTOF( 1.0-500.0*std::exp(-ekOriginal/0.04)*std::log(G4UniformRand()) );
-    else
-      currentParticle.SetTOF( 1.0 );
-    
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    return true;
-  }
- 
- void FullModelReactionDynamics::TwoBody(
-  G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-  G4int &vecLen,
-  G4ReactionProduct &modifiedOriginal,
-  const G4DynamicParticle */*originalTarget*/,
-  G4ReactionProduct &currentParticle,
-  G4ReactionProduct &targetParticle,
-  const G4Nucleus &targetNucleus,
-  G4bool &/* targetHasChanged*/ )
-  {
-    //    G4cout<<"TwoBody called"<<G4endl;
-    // 
-    // derived from original FORTRAN code TWOB by H. Fesefeldt (15-Sep-1987)
-    //
-    // Generation of momenta for elastic and quasi-elastic 2 body reactions
-    //
-    // The simple formula ds/d|t| = s0* std::exp(-b*|t|) is used.
-    // The b values are parametrizations from experimental data.
-    // Not available values are taken from those of similar reactions.
+  }
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  Rotate(numberofFinalStateNucleons,
+         pseudoParticle[4].GetMomentum(),
+         modifiedOriginal,
+         originalIncident,
+         targetNucleus,
+         currentParticle,
+         targetParticle,
+         vec,
+         vecLen);
+  //
+  //  add black track particles
+  //  the total number of particles produced is restricted to 198
+  //  this may have influence on very high energies
+  //
+  if (atomicWeight >= 1.5) {
+    // npnb is number of proton/neutron black track particles
+    // ndta is the number of deuterons, tritons, and alphas produced
+    // epnb is the kinetic energy available for proton/neutron black track particles
+    // edta is the kinetic energy available for deuteron/triton/alpha particles
     //
-    G4ParticleDefinition *aPiMinus = G4PionMinus::PionMinus();
-    G4ParticleDefinition *aPiPlus = G4PionPlus::PionPlus();
-    G4ParticleDefinition *aPiZero = G4PionZero::PionZero();
-    G4ParticleDefinition *aKaonPlus = G4KaonPlus::KaonPlus();
-    G4ParticleDefinition *aKaonMinus = G4KaonMinus::KaonMinus();
-    G4ParticleDefinition *aKaonZeroS = G4KaonZeroShort::KaonZeroShort();
-    G4ParticleDefinition *aKaonZeroL = G4KaonZeroLong::KaonZeroLong();
-    
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);    
-    static const G4double expxu =  82.;           // upper bound for arg. of exp
-    static const G4double expxl = -expxu;         // lower bound for arg. of exp
-    
-    const G4double ekOriginal = modifiedOriginal.GetKineticEnergy()/GeV;
-    const G4double pOriginal = modifiedOriginal.GetMomentum().mag()/GeV;
-    G4double currentMass = currentParticle.GetMass()/GeV;
-    G4double targetMass = targetParticle.GetMass()/GeV;
-    const G4double atomicWeight = targetNucleus.GetN_asInt();
-    //    G4cout<<"Atomic weight is found to be: "<<atomicWeight<<G4endl;
-    G4double etCurrent = currentParticle.GetTotalEnergy()/GeV;
-    G4double pCurrent = currentParticle.GetTotalMomentum()/GeV;
-
-    G4double cmEnergy = std::sqrt( currentMass*currentMass +
-                              targetMass*targetMass +
-                              2.0*targetMass*etCurrent );  // in GeV
-
-    //if( (pOriginal < 0.1) ||
-    //    (centerofmassEnergy < 0.01) ) // 2-body scattering not possible
-    // Continue with original particle, but spend the nuclear evaporation energy
-    //  targetParticle.SetMass( 0.0 );  // flag that the target doesn't exist
-    //else                           // Two-body scattering is possible
-
-    if( (pCurrent < 0.1) || (cmEnergy < 0.01) ) // 2-body scattering not possible
-    {
-      targetParticle.SetMass( 0.0 );  // flag that the target particle doesn't exist
+    G4double epnb, edta;
+    G4int npnb = 0;
+    G4int ndta = 0;
+
+    epnb = targetNucleus.GetPNBlackTrackEnergy();   // was enp1 in fortran code
+    edta = targetNucleus.GetDTABlackTrackEnergy();  // was enp3 in fortran code
+    const G4double pnCutOff = 0.001;                // GeV
+    const G4double dtaCutOff = 0.001;               // GeV
+    const G4double kineticMinimum = 1.e-6;
+    const G4double kineticFactor = -0.005;
+
+    G4double sprob = 0.0;  // sprob = probability of self-absorption in heavy molecules
+    const G4double ekIncident = originalIncident->GetKineticEnergy() / GeV;
+    if (ekIncident >= 5.0)
+      sprob = std::min(1.0, 0.6 * std::log(ekIncident - 4.0));
+
+    if (epnb >= pnCutOff) {
+      npnb = Poisson((1.5 + 1.25 * numberofFinalStateNucleons) * epnb / (epnb + edta));
+      if (numberofFinalStateNucleons + npnb > atomicWeight)
+        npnb = G4int(atomicWeight - numberofFinalStateNucleons);
+      npnb = std::min(npnb, 127 - vecLen);
     }
-    else
-    {
-// moved this if-block to a later stage, i.e. to the assignment of the scattering angle
-// @@@@@ double-check.
-//      if( targetParticle.GetDefinition() == aKaonMinus ||
-//          targetParticle.GetDefinition() == aKaonZeroL ||
-//          targetParticle.GetDefinition() == aKaonZeroS ||
-//          targetParticle.GetDefinition() == aKaonPlus ||
-//          targetParticle.GetDefinition() == aPiMinus ||
-//          targetParticle.GetDefinition() == aPiZero ||
-//          targetParticle.GetDefinition() == aPiPlus )
-//      {
-//        if( G4UniformRand() < 0.5 )
-//          targetParticle.SetDefinitionAndUpdateE( aNeutron );
-//        else
-//          targetParticle.SetDefinitionAndUpdateE( aProton );
-//        targetHasChanged = true;
-//        targetMass = targetParticle.GetMass()/GeV;
-//      }
-      //
-      // Set masses and momenta for final state particles
-      //
-      /*
+    if (edta >= dtaCutOff) {
+      ndta = Poisson((1.5 + 1.25 * numberofFinalStateNucleons) * edta / (epnb + edta));
+      ndta = std::min(ndta, 127 - vecLen);
+    }
+    G4double spall = numberofFinalStateNucleons;
+    // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+
+    AddBlackTrackParticles(epnb,
+                           npnb,
+                           edta,
+                           ndta,
+                           sprob,
+                           kineticMinimum,
+                           kineticFactor,
+                           modifiedOriginal,
+                           spall,
+                           targetNucleus,
+                           vec,
+                           vecLen);
+
+    // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  }
+  //if( centerofmassEnergy <= (4.0+G4UniformRand()) )
+  //  MomentumCheck( modifiedOriginal, currentParticle, targetParticle, vec, vecLen );
+  //
+  //  calculate time delay for nuclear reactions
+  //
+  if ((atomicWeight >= 1.5) && (atomicWeight <= 230.0) && (ekOriginal <= 0.2))
+    currentParticle.SetTOF(1.0 - 500.0 * std::exp(-ekOriginal / 0.04) * std::log(G4UniformRand()));
+  else
+    currentParticle.SetTOF(1.0);
+
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  return true;
+}
+
+void FullModelReactionDynamics::TwoBody(G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+                                        G4int &vecLen,
+                                        G4ReactionProduct &modifiedOriginal,
+                                        const G4DynamicParticle * /*originalTarget*/,
+                                        G4ReactionProduct &currentParticle,
+                                        G4ReactionProduct &targetParticle,
+                                        const G4Nucleus &targetNucleus,
+                                        G4bool & /* targetHasChanged*/) {
+  //    G4cout<<"TwoBody called"<<G4endl;
+  //
+  // derived from original FORTRAN code TWOB by H. Fesefeldt (15-Sep-1987)
+  //
+  // Generation of momenta for elastic and quasi-elastic 2 body reactions
+  //
+  // The simple formula ds/d|t| = s0* std::exp(-b*|t|) is used.
+  // The b values are parametrizations from experimental data.
+  // Not available values are taken from those of similar reactions.
+  //
+  G4ParticleDefinition *aPiMinus = G4PionMinus::PionMinus();
+  G4ParticleDefinition *aPiPlus = G4PionPlus::PionPlus();
+  G4ParticleDefinition *aPiZero = G4PionZero::PionZero();
+  G4ParticleDefinition *aKaonPlus = G4KaonPlus::KaonPlus();
+  G4ParticleDefinition *aKaonMinus = G4KaonMinus::KaonMinus();
+  G4ParticleDefinition *aKaonZeroS = G4KaonZeroShort::KaonZeroShort();
+  G4ParticleDefinition *aKaonZeroL = G4KaonZeroLong::KaonZeroLong();
+
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  static const G4double expxu = 82.;     // upper bound for arg. of exp
+  static const G4double expxl = -expxu;  // lower bound for arg. of exp
+
+  const G4double ekOriginal = modifiedOriginal.GetKineticEnergy() / GeV;
+  const G4double pOriginal = modifiedOriginal.GetMomentum().mag() / GeV;
+  G4double currentMass = currentParticle.GetMass() / GeV;
+  G4double targetMass = targetParticle.GetMass() / GeV;
+  const G4double atomicWeight = targetNucleus.GetN_asInt();
+  //    G4cout<<"Atomic weight is found to be: "<<atomicWeight<<G4endl;
+  G4double etCurrent = currentParticle.GetTotalEnergy() / GeV;
+  G4double pCurrent = currentParticle.GetTotalMomentum() / GeV;
+
+  G4double cmEnergy =
+      std::sqrt(currentMass * currentMass + targetMass * targetMass + 2.0 * targetMass * etCurrent);  // in GeV
+
+  //if( (pOriginal < 0.1) ||
+  //    (centerofmassEnergy < 0.01) ) // 2-body scattering not possible
+  // Continue with original particle, but spend the nuclear evaporation energy
+  //  targetParticle.SetMass( 0.0 );  // flag that the target doesn't exist
+  //else                           // Two-body scattering is possible
+
+  if ((pCurrent < 0.1) || (cmEnergy < 0.01))  // 2-body scattering not possible
+  {
+    targetParticle.SetMass(0.0);  // flag that the target particle doesn't exist
+  } else {
+    // moved this if-block to a later stage, i.e. to the assignment of the scattering angle
+    // @@@@@ double-check.
+    //      if( targetParticle.GetDefinition() == aKaonMinus ||
+    //          targetParticle.GetDefinition() == aKaonZeroL ||
+    //          targetParticle.GetDefinition() == aKaonZeroS ||
+    //          targetParticle.GetDefinition() == aKaonPlus ||
+    //          targetParticle.GetDefinition() == aPiMinus ||
+    //          targetParticle.GetDefinition() == aPiZero ||
+    //          targetParticle.GetDefinition() == aPiPlus )
+    //      {
+    //        if( G4UniformRand() < 0.5 )
+    //          targetParticle.SetDefinitionAndUpdateE( aNeutron );
+    //        else
+    //          targetParticle.SetDefinitionAndUpdateE( aProton );
+    //        targetHasChanged = true;
+    //        targetMass = targetParticle.GetMass()/GeV;
+    //      }
+    //
+    // Set masses and momenta for final state particles
+    //
+    /*
       G4cout<<"Check 0"<<G4endl;
       G4cout<<"target E_kin: "<<targetParticle.GetKineticEnergy()/GeV<<G4endl;
       G4cout<<"target mass: "<<targetParticle.GetMass()/GeV<<G4endl;
@@ -2250,92 +2147,83 @@ using namespace CLHEP;
       G4cout<<"current mass: "<<currentParticle.GetMass()/GeV<<G4endl;
       G4cout<<currentParticle.GetDefinition()->GetParticleName()<<G4endl;
       */
-      G4double pf = cmEnergy*cmEnergy + targetMass*targetMass - currentMass*currentMass;
-      pf = pf*pf - 4*cmEnergy*cmEnergy*targetMass*targetMass;
-      //      G4cout << "pf: " << pf<< G4endl;
-      
-      if( pf <= 0.)// 0.001 )
-      {
-        for(G4int i=0; i<vecLen; i++) delete vec[i];
-        vecLen = 0;
-	throw G4HadronicException(__FILE__, __LINE__, "FullModelReactionDynamics::TwoBody: pf is too small ");
-      }
-      
-      pf = std::sqrt( pf ) / ( 2.0*cmEnergy );
-      //
-      // Set beam and target in centre of mass system
-      //
-      G4ReactionProduct pseudoParticle[3];
-      pseudoParticle[0].SetMass( currentMass*GeV );
-      pseudoParticle[0].SetTotalEnergy( etCurrent*GeV );
-      pseudoParticle[0].SetMomentum( 0.0, 0.0, pCurrent*GeV );
-      
-      pseudoParticle[1].SetMomentum( 0.0, 0.0, 0.0 );
-      pseudoParticle[1].SetMass( targetMass*GeV );
-      pseudoParticle[1].SetKineticEnergy( 0.0 );
-      //
-      // Transform into centre of mass system
-      //
-      pseudoParticle[2] = pseudoParticle[0] + pseudoParticle[1];
-      pseudoParticle[0].Lorentz( pseudoParticle[0], pseudoParticle[2] );
-      pseudoParticle[1].Lorentz( pseudoParticle[1], pseudoParticle[2] );
-      //
-      // Set final state masses and energies in centre of mass system
-      //
-      currentParticle.SetTotalEnergy( std::sqrt(pf*pf+currentMass*currentMass)*GeV );
-      targetParticle.SetTotalEnergy( std::sqrt(pf*pf+targetMass*targetMass)*GeV );
-      //
-      // Set |t| and |tmin|
-      //
-      const G4double cb = 0.01;
-      const G4double b1 = 4.225;
-      const G4double b2 = 1.795;
-      //
-      // Calculate slope b for elastic scattering on proton/neutron
-      //
-      G4double b = std::max( cb, b1+b2*std::log(pOriginal) );     
-      //      G4double b = std::max( cb, b1+b2*std::log(ptemp) );     
-      G4double btrang = b * 4.0 * pf * pseudoParticle[0].GetMomentum().mag()/GeV;
-      
-      G4double exindt = -1.0;
-      exindt += std::exp(std::max(-btrang,expxl));
-      //
-      // Calculate sqr(std::sin(teta/2.) and std::cos(teta), set azimuth angle phi
-      //
-      G4double ctet = 1.0 + 2*std::log( 1.0+G4UniformRand()*exindt ) / btrang;
-      if( std::fabs(ctet) > 1.0 )ctet > 0.0 ? ctet = 1.0 : ctet = -1.0;
-      G4double stet = std::sqrt( (1.0-ctet)*(1.0+ctet) );
-      G4double phi = twopi * G4UniformRand();
-      //
-      // Calculate final state momenta in centre of mass system
-      //
-      if(
-	targetParticle.GetDefinition() == aKaonMinus ||
-	targetParticle.GetDefinition() == aKaonZeroL ||
-	targetParticle.GetDefinition() == aKaonZeroS ||
-	targetParticle.GetDefinition() == aKaonPlus ||
-	targetParticle.GetDefinition() == aPiMinus ||
-	targetParticle.GetDefinition() == aPiZero ||
-	targetParticle.GetDefinition() == aPiPlus )
-      {
-        currentParticle.SetMomentum( -pf*stet*std::sin(phi)*GeV,
-                                     -pf*stet*std::cos(phi)*GeV,
-                                     -pf*ctet*GeV );
-      }
-      else
-      {
-        currentParticle.SetMomentum( pf*stet*std::sin(phi)*GeV,
-                                     pf*stet*std::cos(phi)*GeV,
-                                     pf*ctet*GeV );
-      }
-      targetParticle.SetMomentum( currentParticle.GetMomentum() * (-1.0) );
-      //
-      // Transform into lab system
-      //
-      currentParticle.Lorentz( currentParticle, pseudoParticle[1] );
-      targetParticle.Lorentz( targetParticle, pseudoParticle[1] );
+    G4double pf = cmEnergy * cmEnergy + targetMass * targetMass - currentMass * currentMass;
+    pf = pf * pf - 4 * cmEnergy * cmEnergy * targetMass * targetMass;
+    //      G4cout << "pf: " << pf<< G4endl;
 
-      /*
+    if (pf <= 0.)  // 0.001 )
+    {
+      for (G4int i = 0; i < vecLen; i++)
+        delete vec[i];
+      vecLen = 0;
+      throw G4HadronicException(__FILE__, __LINE__, "FullModelReactionDynamics::TwoBody: pf is too small ");
+    }
+
+    pf = std::sqrt(pf) / (2.0 * cmEnergy);
+    //
+    // Set beam and target in centre of mass system
+    //
+    G4ReactionProduct pseudoParticle[3];
+    pseudoParticle[0].SetMass(currentMass * GeV);
+    pseudoParticle[0].SetTotalEnergy(etCurrent * GeV);
+    pseudoParticle[0].SetMomentum(0.0, 0.0, pCurrent * GeV);
+
+    pseudoParticle[1].SetMomentum(0.0, 0.0, 0.0);
+    pseudoParticle[1].SetMass(targetMass * GeV);
+    pseudoParticle[1].SetKineticEnergy(0.0);
+    //
+    // Transform into centre of mass system
+    //
+    pseudoParticle[2] = pseudoParticle[0] + pseudoParticle[1];
+    pseudoParticle[0].Lorentz(pseudoParticle[0], pseudoParticle[2]);
+    pseudoParticle[1].Lorentz(pseudoParticle[1], pseudoParticle[2]);
+    //
+    // Set final state masses and energies in centre of mass system
+    //
+    currentParticle.SetTotalEnergy(std::sqrt(pf * pf + currentMass * currentMass) * GeV);
+    targetParticle.SetTotalEnergy(std::sqrt(pf * pf + targetMass * targetMass) * GeV);
+    //
+    // Set |t| and |tmin|
+    //
+    const G4double cb = 0.01;
+    const G4double b1 = 4.225;
+    const G4double b2 = 1.795;
+    //
+    // Calculate slope b for elastic scattering on proton/neutron
+    //
+    G4double b = std::max(cb, b1 + b2 * std::log(pOriginal));
+    //      G4double b = std::max( cb, b1+b2*std::log(ptemp) );
+    G4double btrang = b * 4.0 * pf * pseudoParticle[0].GetMomentum().mag() / GeV;
+
+    G4double exindt = -1.0;
+    exindt += std::exp(std::max(-btrang, expxl));
+    //
+    // Calculate sqr(std::sin(teta/2.) and std::cos(teta), set azimuth angle phi
+    //
+    G4double ctet = 1.0 + 2 * std::log(1.0 + G4UniformRand() * exindt) / btrang;
+    if (std::fabs(ctet) > 1.0)
+      ctet > 0.0 ? ctet = 1.0 : ctet = -1.0;
+    G4double stet = std::sqrt((1.0 - ctet) * (1.0 + ctet));
+    G4double phi = twopi * G4UniformRand();
+    //
+    // Calculate final state momenta in centre of mass system
+    //
+    if (targetParticle.GetDefinition() == aKaonMinus || targetParticle.GetDefinition() == aKaonZeroL ||
+        targetParticle.GetDefinition() == aKaonZeroS || targetParticle.GetDefinition() == aKaonPlus ||
+        targetParticle.GetDefinition() == aPiMinus || targetParticle.GetDefinition() == aPiZero ||
+        targetParticle.GetDefinition() == aPiPlus) {
+      currentParticle.SetMomentum(-pf * stet * std::sin(phi) * GeV, -pf * stet * std::cos(phi) * GeV, -pf * ctet * GeV);
+    } else {
+      currentParticle.SetMomentum(pf * stet * std::sin(phi) * GeV, pf * stet * std::cos(phi) * GeV, pf * ctet * GeV);
+    }
+    targetParticle.SetMomentum(currentParticle.GetMomentum() * (-1.0));
+    //
+    // Transform into lab system
+    //
+    currentParticle.Lorentz(currentParticle, pseudoParticle[1]);
+    targetParticle.Lorentz(targetParticle, pseudoParticle[1]);
+
+    /*
       G4cout<<"Check 1"<<G4endl;
       G4cout<<"target E_kin: "<<targetParticle.GetKineticEnergy()<<G4endl;
       G4cout<<"target mass: "<<targetParticle.GetMass()<<G4endl;
@@ -2343,76 +2231,72 @@ using namespace CLHEP;
       G4cout<<"current mass: "<<currentParticle.GetMass()<<G4endl;
       */
 
-      Defs1( modifiedOriginal, currentParticle, targetParticle, vec, vecLen );
-      
-      G4double pp, pp1, ekin;
-      if( atomicWeight >= 1.5 )
-      {
-        const G4double cfa = 0.025*((atomicWeight-1.)/120.)*std::exp(-(atomicWeight-1.)/120.);
-        pp1 = currentParticle.GetMomentum().mag()/MeV;
-        if( pp1 >= 1.0 )
-        {
-          ekin = currentParticle.GetKineticEnergy()/MeV - cfa*(1.0+0.5*normal())*GeV;
-          ekin = std::max( 0.0001*GeV, ekin );
-          currentParticle.SetKineticEnergy( ekin*MeV );
-          pp = currentParticle.GetTotalMomentum()/MeV;
-          currentParticle.SetMomentum( currentParticle.GetMomentum() * (pp/pp1) );
-        }
-        pp1 = targetParticle.GetMomentum().mag()/MeV;
-        if( pp1 >= 1.0 )
-        {
-          ekin = targetParticle.GetKineticEnergy()/MeV - cfa*(1.0+normal()/2.)*GeV;
-          ekin = std::max( 0.0001*GeV, ekin );
-          targetParticle.SetKineticEnergy( ekin*MeV );
-          pp = targetParticle.GetTotalMomentum()/MeV;
-          targetParticle.SetMomentum( targetParticle.GetMomentum() * (pp/pp1) );
-        }
+    Defs1(modifiedOriginal, currentParticle, targetParticle, vec, vecLen);
+
+    G4double pp, pp1, ekin;
+    if (atomicWeight >= 1.5) {
+      const G4double cfa = 0.025 * ((atomicWeight - 1.) / 120.) * std::exp(-(atomicWeight - 1.) / 120.);
+      pp1 = currentParticle.GetMomentum().mag() / MeV;
+      if (pp1 >= 1.0) {
+        ekin = currentParticle.GetKineticEnergy() / MeV - cfa * (1.0 + 0.5 * normal()) * GeV;
+        ekin = std::max(0.0001 * GeV, ekin);
+        currentParticle.SetKineticEnergy(ekin * MeV);
+        pp = currentParticle.GetTotalMomentum() / MeV;
+        currentParticle.SetMomentum(currentParticle.GetMomentum() * (pp / pp1));
+      }
+      pp1 = targetParticle.GetMomentum().mag() / MeV;
+      if (pp1 >= 1.0) {
+        ekin = targetParticle.GetKineticEnergy() / MeV - cfa * (1.0 + normal() / 2.) * GeV;
+        ekin = std::max(0.0001 * GeV, ekin);
+        targetParticle.SetKineticEnergy(ekin * MeV);
+        pp = targetParticle.GetTotalMomentum() / MeV;
+        targetParticle.SetMomentum(targetParticle.GetMomentum() * (pp / pp1));
       }
     }
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    if( atomicWeight >= 1.5 )
-    {
-      // Add black track particles
-      //  the procedure is somewhat different than in TwoCluster and GenerateXandPt.
-      //  The reason is that we have to also simulate the nuclear reactions
-      //  at low energies like a(h,p)b, a(h,p p)b, a(h,n)b etc.
-      //
-      // npnb is number of proton/neutron black track particles
-      // ndta is the number of deuterons, tritons, and alphas produced
-      // epnb is the kinetic energy available for proton/neutron black track particles
-      // edta is the kinetic energy available for deuteron/triton/alpha particles
-      //
-      G4double epnb, edta;
-      G4int npnb=0, ndta=0;
-      
-      epnb = targetNucleus.GetPNBlackTrackEnergy();            // was enp1 in fortran code
-      edta = targetNucleus.GetDTABlackTrackEnergy();           // was enp3 in fortran code
-      const G4double pnCutOff = 0.0001;       // GeV
-      const G4double dtaCutOff = 0.0001;      // GeV
-      const G4double kineticMinimum = 0.0001;
-      const G4double kineticFactor = -0.010;
-      G4double sprob = 0.0; // sprob = probability of self-absorption in heavy molecules
-      if( epnb >= pnCutOff )
-      {
-        npnb = Poisson( epnb/0.02 );
-	/*
+  }
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  if (atomicWeight >= 1.5) {
+    // Add black track particles
+    //  the procedure is somewhat different than in TwoCluster and GenerateXandPt.
+    //  The reason is that we have to also simulate the nuclear reactions
+    //  at low energies like a(h,p)b, a(h,p p)b, a(h,n)b etc.
+    //
+    // npnb is number of proton/neutron black track particles
+    // ndta is the number of deuterons, tritons, and alphas produced
+    // epnb is the kinetic energy available for proton/neutron black track particles
+    // edta is the kinetic energy available for deuteron/triton/alpha particles
+    //
+    G4double epnb, edta;
+    G4int npnb = 0, ndta = 0;
+
+    epnb = targetNucleus.GetPNBlackTrackEnergy();   // was enp1 in fortran code
+    edta = targetNucleus.GetDTABlackTrackEnergy();  // was enp3 in fortran code
+    const G4double pnCutOff = 0.0001;               // GeV
+    const G4double dtaCutOff = 0.0001;              // GeV
+    const G4double kineticMinimum = 0.0001;
+    const G4double kineticFactor = -0.010;
+    G4double sprob = 0.0;  // sprob = probability of self-absorption in heavy molecules
+    if (epnb >= pnCutOff) {
+      npnb = Poisson(epnb / 0.02);
+      /*
 	G4cout<<"A couple of Poisson numbers:"<<G4endl;
 	for (int n=0;n!=10;n++) G4cout<<Poisson(epnb/0.02)<<", ";
 	G4cout<<G4endl;
 	*/
-        if( npnb > atomicWeight )npnb = G4int(atomicWeight);
-        if( (epnb > pnCutOff) && (npnb <= 0) )npnb = 1;
-        npnb = std::min( npnb, 127-vecLen );
-      }
-      if( edta >= dtaCutOff )
-      {
-        ndta = G4int(2.0 * std::log(atomicWeight));
-        ndta = std::min( ndta, 127-vecLen );
-      }
-      G4double spall = 0.0;
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+      if (npnb > atomicWeight)
+        npnb = G4int(atomicWeight);
+      if ((epnb > pnCutOff) && (npnb <= 0))
+        npnb = 1;
+      npnb = std::min(npnb, 127 - vecLen);
+    }
+    if (edta >= dtaCutOff) {
+      ndta = G4int(2.0 * std::log(atomicWeight));
+      ndta = std::min(ndta, 127 - vecLen);
+    }
+    G4double spall = 0.0;
+    // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
 
-      /*
+    /*
       G4cout<<"Check 2"<<G4endl;
       G4cout<<"target E_kin: "<<targetParticle.GetKineticEnergy()<<G4endl;
       G4cout<<"target mass: "<<targetParticle.GetMass()<<G4endl;
@@ -2428,1449 +2312,1340 @@ using namespace CLHEP;
       G4cout<<"------------------------------------------------------------------------"<<G4endl;
       */
 
-      AddBlackTrackParticles( epnb, npnb, edta, ndta, sprob, kineticMinimum, kineticFactor,
-			      modifiedOriginal, spall, targetNucleus,
-                              vec, vecLen );
+    AddBlackTrackParticles(epnb,
+                           npnb,
+                           edta,
+                           ndta,
+                           sprob,
+                           kineticMinimum,
+                           kineticFactor,
+                           modifiedOriginal,
+                           spall,
+                           targetNucleus,
+                           vec,
+                           vecLen);
 
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    }
-    //
-    //  calculate time delay for nuclear reactions
-    //
-    if( (atomicWeight >= 1.5) && (atomicWeight <= 230.0) && (ekOriginal <= 0.2) )
-      currentParticle.SetTOF( 1.0-500.0*std::exp(-ekOriginal/0.04)*std::log(G4UniformRand()) );
-    else
-      currentParticle.SetTOF( 1.0 );
-    return;
+    // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  }
+  //
+  //  calculate time delay for nuclear reactions
+  //
+  if ((atomicWeight >= 1.5) && (atomicWeight <= 230.0) && (ekOriginal <= 0.2))
+    currentParticle.SetTOF(1.0 - 500.0 * std::exp(-ekOriginal / 0.04) * std::log(G4UniformRand()));
+  else
+    currentParticle.SetTOF(1.0);
+  return;
+}
+
+G4double FullModelReactionDynamics::GenerateNBodyEvent(const G4double totalEnergy,  // MeV
+                                                       const G4bool constantCrossSection,
+                                                       G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+                                                       G4int &vecLen) {
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  // derived from original FORTRAN code PHASP by H. Fesefeldt (02-Dec-1986)
+  // Returns the weight of the event
+  //
+  G4int i;
+  const G4double expxu = 82.;     // upper bound for arg. of exp
+  const G4double expxl = -expxu;  // lower bound for arg. of exp
+  if (vecLen < 2) {
+    G4cerr << "*** Error in FullModelReactionDynamics::GenerateNBodyEvent" << G4endl;
+    G4cerr << "    number of particles < 2" << G4endl;
+    G4cerr << "totalEnergy = " << totalEnergy << "MeV, vecLen = " << vecLen << G4endl;
+    return -1.0;
   }
- 
- G4double FullModelReactionDynamics::GenerateNBodyEvent(
-  const G4double totalEnergy,                // MeV
-  const G4bool constantCrossSection,
-  G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-  G4int &vecLen )
+  G4double mass[18];    // mass of each particle
+  G4double energy[18];  // total energy of each particle
+  G4double pcm[3][18];  // pcm is an array with 3 rows and vecLen columns
+  G4double totalMass = 0.0;
+  G4double extraMass = 0;
+  G4double sm[18];
+
+  for (i = 0; i < vecLen; ++i) {
+    mass[i] = vec[i]->GetMass() / GeV;
+    if (vec[i]->GetSide() == -2)
+      extraMass += vec[i]->GetMass() / GeV;
+    vec[i]->SetMomentum(0.0, 0.0, 0.0);
+    pcm[0][i] = 0.0;      // x-momentum of i-th particle
+    pcm[1][i] = 0.0;      // y-momentum of i-th particle
+    pcm[2][i] = 0.0;      // z-momentum of i-th particle
+    energy[i] = mass[i];  // total energy of i-th particle
+    totalMass += mass[i];
+    sm[i] = totalMass;
+  }
+  G4double totalE = totalEnergy / GeV;
+  if (totalMass > totalE) {
+    return -1.0;
+  }
+  G4double kineticEnergy = totalE - totalMass;
+  G4double emm[18];
+  //G4double *emm = new G4double [vecLen];
+  emm[0] = mass[0];
+  emm[vecLen - 1] = totalE;
+  if (vecLen > 2)  // the random numbers are sorted
   {
-    // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    // derived from original FORTRAN code PHASP by H. Fesefeldt (02-Dec-1986)
-    // Returns the weight of the event
-    //
-    G4int i;
-    const G4double expxu =  82.;           // upper bound for arg. of exp
-    const G4double expxl = -expxu;         // lower bound for arg. of exp
-    if( vecLen < 2 )
-    {
-      G4cerr << "*** Error in FullModelReactionDynamics::GenerateNBodyEvent" << G4endl;
-      G4cerr << "    number of particles < 2" << G4endl;
-      G4cerr << "totalEnergy = " << totalEnergy << "MeV, vecLen = " << vecLen << G4endl;
-      return -1.0;
-    }
-    G4double mass[18];    // mass of each particle
-    G4double energy[18];  // total energy of each particle
-    G4double pcm[3][18];           // pcm is an array with 3 rows and vecLen columns    
-    G4double totalMass = 0.0;
-    G4double extraMass = 0;
-    G4double sm[18];
-    
-    for( i=0; i<vecLen; ++i )
-    {
-      mass[i] = vec[i]->GetMass()/GeV;
-      if(vec[i]->GetSide() == -2) extraMass+=vec[i]->GetMass()/GeV;
-      vec[i]->SetMomentum( 0.0, 0.0, 0.0 );
-      pcm[0][i] = 0.0;      // x-momentum of i-th particle
-      pcm[1][i] = 0.0;      // y-momentum of i-th particle
-      pcm[2][i] = 0.0;      // z-momentum of i-th particle
-      energy[i] = mass[i];  // total energy of i-th particle
-      totalMass += mass[i];
-      sm[i] = totalMass;
-    }
-    G4double totalE = totalEnergy/GeV;
-    if( totalMass > totalE )
-    {
-      return -1.0;
-    }
-    G4double kineticEnergy = totalE - totalMass;
-    G4double emm[18];
-    //G4double *emm = new G4double [vecLen];
-    emm[0] = mass[0];
-    emm[vecLen-1] = totalE;
-    if( vecLen > 2 )          // the random numbers are sorted
-    {
-      G4double ran[18];
-      for( i=0; i<vecLen; ++i )ran[i] = G4UniformRand();
-      for( i=0; i<vecLen-2; ++i )
-      {
-        for( G4int j=vecLen-2; j>i; --j )
-        {
-          if( ran[i] > ran[j] )
-          {
-            G4double temp = ran[i];
-            ran[i] = ran[j];
-            ran[j] = temp;
-          }
+    G4double ran[18];
+    for (i = 0; i < vecLen; ++i)
+      ran[i] = G4UniformRand();
+    for (i = 0; i < vecLen - 2; ++i) {
+      for (G4int j = vecLen - 2; j > i; --j) {
+        if (ran[i] > ran[j]) {
+          G4double temp = ran[i];
+          ran[i] = ran[j];
+          ran[j] = temp;
         }
       }
-      for( i=1; i<vecLen-1; ++i )emm[i] = ran[i-1]*kineticEnergy + sm[i];
     }
-    //   Weight is the sum of logarithms of terms instead of the product of terms
-    G4bool lzero = true;    
-    G4double wtmax = 0.0;
-    if( constantCrossSection )     // this is KGENEV=1 in PHASP
-    {
-      G4double emmax = kineticEnergy + mass[0];
-      G4double emmin = 0.0;
-      for( i=1; i<vecLen; ++i )
-      {
-        emmin += mass[i-1];
-        emmax += mass[i];
-        G4double wtfc = 0.0;
-        if( emmax*emmax > 0.0 )
-        {
-          G4double arg = emmax*emmax
-            + (emmin*emmin-mass[i]*mass[i])*(emmin*emmin-mass[i]*mass[i])/(emmax*emmax)
-            - 2.0*(emmin*emmin+mass[i]*mass[i]);
-          if( arg > 0.0 )wtfc = 0.5*std::sqrt( arg );
-        }
-        if( wtfc == 0.0 )
-        {
-          lzero = false;
-          break;
-        }
-        wtmax += std::log( wtfc );
+    for (i = 1; i < vecLen - 1; ++i)
+      emm[i] = ran[i - 1] * kineticEnergy + sm[i];
+  }
+  //   Weight is the sum of logarithms of terms instead of the product of terms
+  G4bool lzero = true;
+  G4double wtmax = 0.0;
+  if (constantCrossSection)  // this is KGENEV=1 in PHASP
+  {
+    G4double emmax = kineticEnergy + mass[0];
+    G4double emmin = 0.0;
+    for (i = 1; i < vecLen; ++i) {
+      emmin += mass[i - 1];
+      emmax += mass[i];
+      G4double wtfc = 0.0;
+      if (emmax * emmax > 0.0) {
+        G4double arg = emmax * emmax +
+                       (emmin * emmin - mass[i] * mass[i]) * (emmin * emmin - mass[i] * mass[i]) / (emmax * emmax) -
+                       2.0 * (emmin * emmin + mass[i] * mass[i]);
+        if (arg > 0.0)
+          wtfc = 0.5 * std::sqrt(arg);
+      }
+      if (wtfc == 0.0) {
+        lzero = false;
+        break;
       }
-      if( lzero )
-        wtmax = -wtmax;
-      else
-        wtmax = expxu;
+      wtmax += std::log(wtfc);
     }
+    if (lzero)
+      wtmax = -wtmax;
     else
-    {
-      //   ffq(n) = pi*(2*pi)^(n-2)/(n-2)!
-      const G4double ffq[18] = { 0., 3.141592, 19.73921, 62.01255, 129.8788, 204.0131,
-                                 256.3704, 268.4705, 240.9780, 189.2637,
-                                 132.1308,  83.0202,  47.4210,  24.8295,
-                                 12.0006,   5.3858,   2.2560,   0.8859 };
-      wtmax = std::log( std::pow( kineticEnergy, vecLen-2 ) * ffq[vecLen-1] / totalE );
-    }
-    lzero = true;
-    G4double pd[50];
-    //G4double *pd = new G4double [vecLen-1];
-    for( i=0; i<vecLen-1; ++i )
-    {
-      pd[i] = 0.0;
-      if( emm[i+1]*emm[i+1] > 0.0 )
-      {
-        G4double arg = emm[i+1]*emm[i+1]
-          + (emm[i]*emm[i]-mass[i+1]*mass[i+1])*(emm[i]*emm[i]-mass[i+1]*mass[i+1])
-            /(emm[i+1]*emm[i+1])
-          - 2.0*(emm[i]*emm[i]+mass[i+1]*mass[i+1]);
-        if( arg > 0.0 )pd[i] = 0.5*std::sqrt( arg );
-      }
-      if( pd[i] <= 0.0 )    //  changed from  ==  on 02 April 98
-        lzero = false;
-      else
-        wtmax += std::log( pd[i] );
-    }
-    G4double weight = 0.0;           // weight is returned by GenerateNBodyEvent
-    if( lzero )weight = std::exp( std::max(std::min(wtmax,expxu),expxl) );
-    
-    G4double bang, cb, sb, s0, s1, s2, c, s, esys, a, b, gama, beta;
-    pcm[0][0] = 0.0;
-    pcm[1][0] = pd[0];
-    pcm[2][0] = 0.0;
-    for( i=1; i<vecLen; ++i )
-    {
-      pcm[0][i] = 0.0;
-      pcm[1][i] = -pd[i-1];
-      pcm[2][i] = 0.0;
-      bang = twopi*G4UniformRand();
-      cb = std::cos(bang);
-      sb = std::sin(bang);
-      c = 2.0*G4UniformRand() - 1.0;
-      s = std::sqrt( std::fabs( 1.0-c*c ) );
-      if( i < vecLen-1 )
-      {
-        esys = std::sqrt(pd[i]*pd[i] + emm[i]*emm[i]);
-        beta = pd[i]/esys;
-        gama = esys/emm[i];
-        for( G4int j=0; j<=i; ++j )
-        {
-          s0 = pcm[0][j];
-          s1 = pcm[1][j];
-          s2 = pcm[2][j];
-          energy[j] = std::sqrt( s0*s0 + s1*s1 + s2*s2 + mass[j]*mass[j] );
-          a = s0*c - s1*s;                           //  rotation
-          pcm[1][j] = s0*s + s1*c;
-          b = pcm[2][j];
-          pcm[0][j] = a*cb - b*sb;
-          pcm[2][j] = a*sb + b*cb;
-          pcm[1][j] = gama*(pcm[1][j] + beta*energy[j]);
-        }
+      wtmax = expxu;
+  } else {
+    //   ffq(n) = pi*(2*pi)^(n-2)/(n-2)!
+    const G4double ffq[18] = {0.,
+                              3.141592,
+                              19.73921,
+                              62.01255,
+                              129.8788,
+                              204.0131,
+                              256.3704,
+                              268.4705,
+                              240.9780,
+                              189.2637,
+                              132.1308,
+                              83.0202,
+                              47.4210,
+                              24.8295,
+                              12.0006,
+                              5.3858,
+                              2.2560,
+                              0.8859};
+    wtmax = std::log(std::pow(kineticEnergy, vecLen - 2) * ffq[vecLen - 1] / totalE);
+  }
+  lzero = true;
+  G4double pd[50];
+  //G4double *pd = new G4double [vecLen-1];
+  for (i = 0; i < vecLen - 1; ++i) {
+    pd[i] = 0.0;
+    if (emm[i + 1] * emm[i + 1] > 0.0) {
+      G4double arg = emm[i + 1] * emm[i + 1] +
+                     (emm[i] * emm[i] - mass[i + 1] * mass[i + 1]) * (emm[i] * emm[i] - mass[i + 1] * mass[i + 1]) /
+                         (emm[i + 1] * emm[i + 1]) -
+                     2.0 * (emm[i] * emm[i] + mass[i + 1] * mass[i + 1]);
+      if (arg > 0.0)
+        pd[i] = 0.5 * std::sqrt(arg);
+    }
+    if (pd[i] <= 0.0)  //  changed from  ==  on 02 April 98
+      lzero = false;
+    else
+      wtmax += std::log(pd[i]);
+  }
+  G4double weight = 0.0;  // weight is returned by GenerateNBodyEvent
+  if (lzero)
+    weight = std::exp(std::max(std::min(wtmax, expxu), expxl));
+
+  G4double bang, cb, sb, s0, s1, s2, c, s, esys, a, b, gama, beta;
+  pcm[0][0] = 0.0;
+  pcm[1][0] = pd[0];
+  pcm[2][0] = 0.0;
+  for (i = 1; i < vecLen; ++i) {
+    pcm[0][i] = 0.0;
+    pcm[1][i] = -pd[i - 1];
+    pcm[2][i] = 0.0;
+    bang = twopi * G4UniformRand();
+    cb = std::cos(bang);
+    sb = std::sin(bang);
+    c = 2.0 * G4UniformRand() - 1.0;
+    s = std::sqrt(std::fabs(1.0 - c * c));
+    if (i < vecLen - 1) {
+      esys = std::sqrt(pd[i] * pd[i] + emm[i] * emm[i]);
+      beta = pd[i] / esys;
+      gama = esys / emm[i];
+      for (G4int j = 0; j <= i; ++j) {
+        s0 = pcm[0][j];
+        s1 = pcm[1][j];
+        s2 = pcm[2][j];
+        energy[j] = std::sqrt(s0 * s0 + s1 * s1 + s2 * s2 + mass[j] * mass[j]);
+        a = s0 * c - s1 * s;  //  rotation
+        pcm[1][j] = s0 * s + s1 * c;
+        b = pcm[2][j];
+        pcm[0][j] = a * cb - b * sb;
+        pcm[2][j] = a * sb + b * cb;
+        pcm[1][j] = gama * (pcm[1][j] + beta * energy[j]);
       }
-      else
-      {
-        for( G4int j=0; j<=i; ++j )
-        {
-          s0 = pcm[0][j];
-          s1 = pcm[1][j];
-          s2 = pcm[2][j];
-          energy[j] = std::sqrt( s0*s0 + s1*s1 + s2*s2 + mass[j]*mass[j] );
-          a = s0*c - s1*s;                           //  rotation
-          pcm[1][j] = s0*s + s1*c;
-          b = pcm[2][j];
-          pcm[0][j] = a*cb - b*sb;
-          pcm[2][j] = a*sb + b*cb;
-        }
+    } else {
+      for (G4int j = 0; j <= i; ++j) {
+        s0 = pcm[0][j];
+        s1 = pcm[1][j];
+        s2 = pcm[2][j];
+        energy[j] = std::sqrt(s0 * s0 + s1 * s1 + s2 * s2 + mass[j] * mass[j]);
+        a = s0 * c - s1 * s;  //  rotation
+        pcm[1][j] = s0 * s + s1 * c;
+        b = pcm[2][j];
+        pcm[0][j] = a * cb - b * sb;
+        pcm[2][j] = a * sb + b * cb;
       }
     }
-    for( i=0; i<vecLen; ++i )
-    {
-      vec[i]->SetMomentum( pcm[0][i]*GeV, pcm[1][i]*GeV, pcm[2][i]*GeV );
-      vec[i]->SetTotalEnergy( energy[i]*GeV );
-    }
-    // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
-    return weight;
-  }
- 
- G4double
-   FullModelReactionDynamics::normal()
-   {
-     G4double ran = -6.0;
-     for( G4int i=0; i<12; ++i )ran += G4UniformRand();
-     return ran;
-   }
- 
- G4int
-   FullModelReactionDynamics::Poisson( G4double x )  // generation of poisson distribution
-   {
-     G4int iran;
-     G4double ran;
-     
-     if( x > 9.9 )    // use normal distribution with sigma^2 = <x>
-       iran = static_cast<G4int>(std::max( 0.0, x+normal()*std::sqrt(x) ) );
-     else {
-      G4int mm = G4int(5.0*x);
-      if( mm <= 0 )   // for very small x try iran=1,2,3
-      {
-        G4double p1 = x*std::exp(-x);
-        G4double p2 = x*p1/2.0;
-        G4double p3 = x*p2/3.0;
-        ran = G4UniformRand();
-        if( ran < p3 )
-          iran = 3;
-        else if( ran < p2 )   // this is original Geisha, it should be ran < p2+p3
-          iran = 2;
-        else if( ran < p1 )   // should be ran < p1+p2+p3
-          iran = 1;
-        else
-          iran = 0;
-      }
+  }
+  for (i = 0; i < vecLen; ++i) {
+    vec[i]->SetMomentum(pcm[0][i] * GeV, pcm[1][i] * GeV, pcm[2][i] * GeV);
+    vec[i]->SetTotalEnergy(energy[i] * GeV);
+  }
+  // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+  return weight;
+}
+
+G4double FullModelReactionDynamics::normal() {
+  G4double ran = -6.0;
+  for (G4int i = 0; i < 12; ++i)
+    ran += G4UniformRand();
+  return ran;
+}
+
+G4int FullModelReactionDynamics::Poisson(G4double x)  // generation of poisson distribution
+{
+  G4int iran;
+  G4double ran;
+
+  if (x > 9.9)  // use normal distribution with sigma^2 = <x>
+    iran = static_cast<G4int>(std::max(0.0, x + normal() * std::sqrt(x)));
+  else {
+    G4int mm = G4int(5.0 * x);
+    if (mm <= 0)  // for very small x try iran=1,2,3
+    {
+      G4double p1 = x * std::exp(-x);
+      G4double p2 = x * p1 / 2.0;
+      G4double p3 = x * p2 / 3.0;
+      ran = G4UniformRand();
+      if (ran < p3)
+        iran = 3;
+      else if (ran < p2)  // this is original Geisha, it should be ran < p2+p3
+        iran = 2;
+      else if (ran < p1)  // should be ran < p1+p2+p3
+        iran = 1;
       else
-      {
         iran = 0;
-        G4double r = std::exp(-x);
-        ran = G4UniformRand();
-        if( ran > r )
-        {
-          G4double rrr;
-          G4double rr = r;
-          for( G4int i=1; i<=mm; ++i )
-          {
-            iran++;
-            if( i > 5 )   // Stirling's formula for large numbers
-              rrr = std::exp(i*std::log(x)-(i+0.5)*std::log((G4double)i)+i-0.9189385);
-            else
-              rrr = std::pow(x,i)/Factorial(i);
-            rr += r*rrr;
-            if( ran <= rr )break;
-          }
+    } else {
+      iran = 0;
+      G4double r = std::exp(-x);
+      ran = G4UniformRand();
+      if (ran > r) {
+        G4double rrr;
+        G4double rr = r;
+        for (G4int i = 1; i <= mm; ++i) {
+          iran++;
+          if (i > 5)  // Stirling's formula for large numbers
+            rrr = std::exp(i * std::log(x) - (i + 0.5) * std::log((G4double)i) + i - 0.9189385);
+          else
+            rrr = std::pow(x, i) / Factorial(i);
+          rr += r * rrr;
+          if (ran <= rr)
+            break;
         }
       }
     }
-    return iran;
-  }
- 
- G4int
-   FullModelReactionDynamics::Factorial( G4int n )
-   {   // calculates factorial( n ) = n*(n-1)*(n-2)*...*1
-     G4int m = std::min(n,10);
-     G4int result = 1;
-     if( m <= 1 )return result;
-     for( G4int i=2; i<=m; ++i )result *= i;
-     return result;
-   }
- 
- void FullModelReactionDynamics::Defs1(
-   const G4ReactionProduct &modifiedOriginal,
-   G4ReactionProduct &currentParticle,
-   G4ReactionProduct &targetParticle,
-   G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-   G4int &vecLen )
-  {
-    const G4double pjx = modifiedOriginal.GetMomentum().x()/MeV;
-    const G4double pjy = modifiedOriginal.GetMomentum().y()/MeV;
-    const G4double pjz = modifiedOriginal.GetMomentum().z()/MeV;
-    const G4double p = modifiedOriginal.GetMomentum().mag()/MeV;
-    if( pjx*pjx+pjy*pjy > 0.0 )
-    {
-      G4double cost, sint, ph, cosp, sinp, pix, piy, piz;
-      cost = pjz/p;
-      sint = 0.5 * ( std::sqrt(std::abs((1.0-cost)*(1.0+cost))) + std::sqrt(pjx*pjx+pjy*pjy)/p );
-      if( pjy < 0.0 )
-        ph = 3*halfpi;
-      else
-        ph = halfpi;
-      if( std::abs( pjx ) > 0.001*MeV )ph = std::atan2(pjy,pjx);
-      cosp = std::cos(ph);
-      sinp = std::sin(ph);
-      pix = currentParticle.GetMomentum().x()/MeV;
-      piy = currentParticle.GetMomentum().y()/MeV;
-      piz = currentParticle.GetMomentum().z()/MeV;
-      currentParticle.SetMomentum( cost*cosp*pix*MeV - sinp*piy+sint*cosp*piz*MeV,
-                                   cost*sinp*pix*MeV + cosp*piy+sint*sinp*piz*MeV,
-                                   -sint*pix*MeV     + cost*piz*MeV );
-      pix = targetParticle.GetMomentum().x()/MeV;
-      piy = targetParticle.GetMomentum().y()/MeV;
-      piz = targetParticle.GetMomentum().z()/MeV;
-      targetParticle.SetMomentum( cost*cosp*pix*MeV - sinp*piy+sint*cosp*piz*MeV,
-                                  cost*sinp*pix*MeV + cosp*piy+sint*sinp*piz*MeV,
-                                  -sint*pix*MeV     + cost*piz*MeV );
-      for( G4int i=0; i<vecLen; ++i )
-      {
-        pix = vec[i]->GetMomentum().x()/MeV;
-        piy = vec[i]->GetMomentum().y()/MeV;
-        piz = vec[i]->GetMomentum().z()/MeV;
-        vec[i]->SetMomentum( cost*cosp*pix*MeV - sinp*piy+sint*cosp*piz*MeV,
-                             cost*sinp*pix*MeV + cosp*piy+sint*sinp*piz*MeV,
-                             -sint*pix*MeV     + cost*piz*MeV );
-      }
-    }
+  }
+  return iran;
+}
+
+G4int FullModelReactionDynamics::Factorial(G4int n) {  // calculates factorial( n ) = n*(n-1)*(n-2)*...*1
+  G4int m = std::min(n, 10);
+  G4int result = 1;
+  if (m <= 1)
+    return result;
+  for (G4int i = 2; i <= m; ++i)
+    result *= i;
+  return result;
+}
+
+void FullModelReactionDynamics::Defs1(const G4ReactionProduct &modifiedOriginal,
+                                      G4ReactionProduct &currentParticle,
+                                      G4ReactionProduct &targetParticle,
+                                      G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+                                      G4int &vecLen) {
+  const G4double pjx = modifiedOriginal.GetMomentum().x() / MeV;
+  const G4double pjy = modifiedOriginal.GetMomentum().y() / MeV;
+  const G4double pjz = modifiedOriginal.GetMomentum().z() / MeV;
+  const G4double p = modifiedOriginal.GetMomentum().mag() / MeV;
+  if (pjx * pjx + pjy * pjy > 0.0) {
+    G4double cost, sint, ph, cosp, sinp, pix, piy, piz;
+    cost = pjz / p;
+    sint = 0.5 * (std::sqrt(std::abs((1.0 - cost) * (1.0 + cost))) + std::sqrt(pjx * pjx + pjy * pjy) / p);
+    if (pjy < 0.0)
+      ph = 3 * halfpi;
     else
-    {
-      if( pjz < 0.0 )
-      {
-        currentParticle.SetMomentum( -currentParticle.GetMomentum().z() );
-        targetParticle.SetMomentum( -targetParticle.GetMomentum().z() );
-        for( G4int i=0; i<vecLen; ++i )
-          vec[i]->SetMomentum( -vec[i]->GetMomentum().z() );
-      }
+      ph = halfpi;
+    if (std::abs(pjx) > 0.001 * MeV)
+      ph = std::atan2(pjy, pjx);
+    cosp = std::cos(ph);
+    sinp = std::sin(ph);
+    pix = currentParticle.GetMomentum().x() / MeV;
+    piy = currentParticle.GetMomentum().y() / MeV;
+    piz = currentParticle.GetMomentum().z() / MeV;
+    currentParticle.SetMomentum(cost * cosp * pix * MeV - sinp * piy + sint * cosp * piz * MeV,
+                                cost * sinp * pix * MeV + cosp * piy + sint * sinp * piz * MeV,
+                                -sint * pix * MeV + cost * piz * MeV);
+    pix = targetParticle.GetMomentum().x() / MeV;
+    piy = targetParticle.GetMomentum().y() / MeV;
+    piz = targetParticle.GetMomentum().z() / MeV;
+    targetParticle.SetMomentum(cost * cosp * pix * MeV - sinp * piy + sint * cosp * piz * MeV,
+                               cost * sinp * pix * MeV + cosp * piy + sint * sinp * piz * MeV,
+                               -sint * pix * MeV + cost * piz * MeV);
+    for (G4int i = 0; i < vecLen; ++i) {
+      pix = vec[i]->GetMomentum().x() / MeV;
+      piy = vec[i]->GetMomentum().y() / MeV;
+      piz = vec[i]->GetMomentum().z() / MeV;
+      vec[i]->SetMomentum(cost * cosp * pix * MeV - sinp * piy + sint * cosp * piz * MeV,
+                          cost * sinp * pix * MeV + cosp * piy + sint * sinp * piz * MeV,
+                          -sint * pix * MeV + cost * piz * MeV);
+    }
+  } else {
+    if (pjz < 0.0) {
+      currentParticle.SetMomentum(-currentParticle.GetMomentum().z());
+      targetParticle.SetMomentum(-targetParticle.GetMomentum().z());
+      for (G4int i = 0; i < vecLen; ++i)
+        vec[i]->SetMomentum(-vec[i]->GetMomentum().z());
     }
   }
- 
- void FullModelReactionDynamics::Rotate(
-  const G4double numberofFinalStateNucleons,
-  const G4ThreeVector &temp,
-  const G4ReactionProduct &modifiedOriginal, // Fermi motion & evap. effect included
-  const G4HadProjectile *originalIncident, // original incident particle
-  const G4Nucleus &targetNucleus,
-  G4ReactionProduct &currentParticle,
-  G4ReactionProduct &targetParticle,
-  G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-  G4int &vecLen )
+}
+
+void FullModelReactionDynamics::Rotate(
+    const G4double numberofFinalStateNucleons,
+    const G4ThreeVector &temp,
+    const G4ReactionProduct &modifiedOriginal,  // Fermi motion & evap. effect included
+    const G4HadProjectile *originalIncident,    // original incident particle
+    const G4Nucleus &targetNucleus,
+    G4ReactionProduct &currentParticle,
+    G4ReactionProduct &targetParticle,
+    G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+    G4int &vecLen) {
+  // derived from original FORTRAN code in GENXPT and TWOCLU by H. Fesefeldt
+  //
+  //   Rotate in direction of z-axis, this does disturb in some way our
+  //    inclusive distributions, but it is necessary for momentum conservation
+  //
+  const G4double atomicWeight = targetNucleus.GetN_asInt();
+  const G4double logWeight = std::log(atomicWeight);
+
+  G4ParticleDefinition *aPiMinus = G4PionMinus::PionMinus();
+  G4ParticleDefinition *aPiPlus = G4PionPlus::PionPlus();
+  G4ParticleDefinition *aPiZero = G4PionZero::PionZero();
+
+  G4int i;
+  G4ThreeVector pseudoParticle[4];
+  for (i = 0; i < 4; ++i)
+    pseudoParticle[i].set(0, 0, 0);
+  pseudoParticle[0] = currentParticle.GetMomentum() + targetParticle.GetMomentum();
+  for (i = 0; i < vecLen; ++i)
+    pseudoParticle[0] = pseudoParticle[0] + (vec[i]->GetMomentum());
+  //
+  //  Some smearing in transverse direction from Fermi motion
+  //
+  G4float pp, pp1;
+  G4double alekw, p, rthnve, phinve;
+  G4double r1, r2, a1, ran1, ran2, xxh, exh, pxTemp, pyTemp, pzTemp;
+
+  r1 = twopi * G4UniformRand();
+  r2 = G4UniformRand();
+  a1 = std::sqrt(-2.0 * std::log(r2));
+  ran1 = a1 * std::sin(r1) * 0.020 * numberofFinalStateNucleons * GeV;
+  ran2 = a1 * std::cos(r1) * 0.020 * numberofFinalStateNucleons * GeV;
+  G4ThreeVector fermi(ran1, ran2, 0);
+
+  pseudoParticle[0] = pseudoParticle[0] + fermi;  // all particles + fermi
+  pseudoParticle[2] = temp;                       // original in cms system
+  pseudoParticle[3] = pseudoParticle[0];
+
+  pseudoParticle[1] = pseudoParticle[2].cross(pseudoParticle[3]);
+  G4double rotation = 2. * pi * G4UniformRand();
+  pseudoParticle[1] = pseudoParticle[1].rotate(rotation, pseudoParticle[3]);
+  pseudoParticle[2] = pseudoParticle[3].cross(pseudoParticle[1]);
+  for (G4int ii = 1; ii <= 3; ii++) {
+    p = pseudoParticle[ii].mag();
+    if (p == 0.0)
+      pseudoParticle[ii] = G4ThreeVector(0.0, 0.0, 0.0);
+    else
+      pseudoParticle[ii] = pseudoParticle[ii] * (1. / p);
+  }
+
+  pxTemp = pseudoParticle[1].dot(currentParticle.GetMomentum());
+  pyTemp = pseudoParticle[2].dot(currentParticle.GetMomentum());
+  pzTemp = pseudoParticle[3].dot(currentParticle.GetMomentum());
+  currentParticle.SetMomentum(pxTemp, pyTemp, pzTemp);
+
+  pxTemp = pseudoParticle[1].dot(targetParticle.GetMomentum());
+  pyTemp = pseudoParticle[2].dot(targetParticle.GetMomentum());
+  pzTemp = pseudoParticle[3].dot(targetParticle.GetMomentum());
+  targetParticle.SetMomentum(pxTemp, pyTemp, pzTemp);
+
+  for (i = 0; i < vecLen; ++i) {
+    pxTemp = pseudoParticle[1].dot(vec[i]->GetMomentum());
+    pyTemp = pseudoParticle[2].dot(vec[i]->GetMomentum());
+    pzTemp = pseudoParticle[3].dot(vec[i]->GetMomentum());
+    vec[i]->SetMomentum(pxTemp, pyTemp, pzTemp);
+  }
+  //
+  //  Rotate in direction of primary particle, subtract binding energies
+  //   and make some further corrections if required
+  //
+  Defs1(modifiedOriginal, currentParticle, targetParticle, vec, vecLen);
+  G4double ekin;
+  G4double dekin = 0.0;
+  G4double ek1 = 0.0;
+  G4int npions = 0;
+  if (atomicWeight >= 1.5)  // self-absorption in heavy molecules
   {
-    // derived from original FORTRAN code in GENXPT and TWOCLU by H. Fesefeldt
-    //
-    //   Rotate in direction of z-axis, this does disturb in some way our
-    //    inclusive distributions, but it is necessary for momentum conservation
-    //
-    const G4double atomicWeight = targetNucleus.GetN_asInt();
-    const G4double logWeight = std::log(atomicWeight);
-    
-    G4ParticleDefinition *aPiMinus = G4PionMinus::PionMinus();
-    G4ParticleDefinition *aPiPlus = G4PionPlus::PionPlus();
-    G4ParticleDefinition *aPiZero = G4PionZero::PionZero();
-    
-    G4int i;
-    G4ThreeVector pseudoParticle[4];
-    for( i=0; i<4; ++i )pseudoParticle[i].set(0,0,0);
-    pseudoParticle[0] = currentParticle.GetMomentum()
-                        + targetParticle.GetMomentum();
-    for( i=0; i<vecLen; ++i )
-      pseudoParticle[0] = pseudoParticle[0] + (vec[i]->GetMomentum());
+    // corrections for single particle spectra (shower particles)
     //
-    //  Some smearing in transverse direction from Fermi motion
-    //
-    G4float pp, pp1;
-    G4double alekw, p, rthnve, phinve;
-    G4double r1, r2, a1, ran1, ran2, xxh, exh, pxTemp, pyTemp, pzTemp;
-    
-    r1 = twopi*G4UniformRand();
-    r2 = G4UniformRand();
-    a1 = std::sqrt(-2.0*std::log(r2));
-    ran1 = a1*std::sin(r1)*0.020*numberofFinalStateNucleons*GeV;
-    ran2 = a1*std::cos(r1)*0.020*numberofFinalStateNucleons*GeV;
-    G4ThreeVector fermi(ran1, ran2, 0);
-
-    pseudoParticle[0] = pseudoParticle[0]+fermi; // all particles + fermi
-    pseudoParticle[2] = temp; // original in cms system
-    pseudoParticle[3] = pseudoParticle[0];
-    
-    pseudoParticle[1] = pseudoParticle[2].cross(pseudoParticle[3]);
-    G4double rotation = 2.*pi*G4UniformRand();
-    pseudoParticle[1] = pseudoParticle[1].rotate(rotation, pseudoParticle[3]);
-    pseudoParticle[2] = pseudoParticle[3].cross(pseudoParticle[1]);    
-    for(G4int ii=1; ii<=3; ii++)
-    { 
-      p = pseudoParticle[ii].mag();
-      if( p == 0.0 )
-        pseudoParticle[ii]= G4ThreeVector( 0.0, 0.0, 0.0 );
-      else
-        pseudoParticle[ii]= pseudoParticle[ii] * (1./p);
-    }
-    
-    pxTemp = pseudoParticle[1].dot(currentParticle.GetMomentum());
-    pyTemp = pseudoParticle[2].dot(currentParticle.GetMomentum());
-    pzTemp = pseudoParticle[3].dot(currentParticle.GetMomentum());
-    currentParticle.SetMomentum( pxTemp, pyTemp, pzTemp );
-    
-    pxTemp = pseudoParticle[1].dot(targetParticle.GetMomentum());
-    pyTemp = pseudoParticle[2].dot(targetParticle.GetMomentum());
-    pzTemp = pseudoParticle[3].dot(targetParticle.GetMomentum());
-    targetParticle.SetMomentum( pxTemp, pyTemp, pzTemp );
-    
-    for( i=0; i<vecLen; ++i )
+    const G4double alem[] = {1.40, 2.30, 2.70, 3.00, 3.40, 4.60, 7.00};
+    const G4double val0[] = {0.00, 0.40, 0.48, 0.51, 0.54, 0.60, 0.65};
+    alekw = std::log(originalIncident->GetKineticEnergy() / GeV);
+    exh = 1.0;
+    if (alekw > alem[0])  //   get energy bin
     {
-      pxTemp = pseudoParticle[1].dot(vec[i]->GetMomentum());
-      pyTemp = pseudoParticle[2].dot(vec[i]->GetMomentum());
-      pzTemp = pseudoParticle[3].dot(vec[i]->GetMomentum());
-      vec[i]->SetMomentum( pxTemp, pyTemp, pzTemp );
-    }
-    //
-    //  Rotate in direction of primary particle, subtract binding energies
-    //   and make some further corrections if required
-    //
-    Defs1( modifiedOriginal, currentParticle, targetParticle, vec, vecLen );
-    G4double ekin;
-    G4double dekin = 0.0;
-    G4double ek1 = 0.0;
-    G4int npions = 0;
-    if( atomicWeight >= 1.5 )            // self-absorption in heavy molecules
-    {
-      // corrections for single particle spectra (shower particles)
-      //
-      const G4double alem[] = { 1.40, 2.30, 2.70, 3.00, 3.40, 4.60, 7.00 };
-      const G4double val0[] = { 0.00, 0.40, 0.48, 0.51, 0.54, 0.60, 0.65 };
-      alekw = std::log( originalIncident->GetKineticEnergy()/GeV );
-      exh = 1.0;
-      if( alekw > alem[0] )   //   get energy bin
-      {
-        exh = val0[6];
-        for( G4int j=1; j<7; ++j )
+      exh = val0[6];
+      for (G4int j = 1; j < 7; ++j) {
+        if (alekw < alem[j])  // use linear interpolation/extrapolation
         {
-          if( alekw < alem[j] ) // use linear interpolation/extrapolation
-          {
-            G4double rcnve = (val0[j] - val0[j-1]) / (alem[j] - alem[j-1]);
-            exh = rcnve * alekw + val0[j-1] - rcnve * alem[j-1];
-            break;
-          }
+          G4double rcnve = (val0[j] - val0[j - 1]) / (alem[j] - alem[j - 1]);
+          exh = rcnve * alekw + val0[j - 1] - rcnve * alem[j - 1];
+          break;
         }
-        exh = 1.0 - exh;
-      }
-      const G4double cfa = 0.025*((atomicWeight-1.)/120.)*std::exp(-(atomicWeight-1.)/120.);
-      ekin = currentParticle.GetKineticEnergy()/GeV - cfa*(1+normal()/2.0);
-      ekin = std::max( 1.0e-6, ekin );
-      xxh = 1.0;
-      dekin += ekin*(1.0-xxh);
-      ekin *= xxh;
-      currentParticle.SetKineticEnergy( ekin*GeV );
-      pp = currentParticle.GetTotalMomentum()/MeV;
-      pp1 = currentParticle.GetMomentum().mag()/MeV;
-      if( pp1 < 0.001*MeV )
-      {
-        rthnve = pi*G4UniformRand();
-        phinve = twopi*G4UniformRand();
-        currentParticle.SetMomentum( pp*std::sin(rthnve)*std::cos(phinve)*MeV,
-                                     pp*std::sin(rthnve)*std::sin(phinve)*MeV,
-                                     pp*std::cos(rthnve)*MeV );
       }
-      else
-        currentParticle.SetMomentum( currentParticle.GetMomentum() * (pp/pp1) );
-      ekin = targetParticle.GetKineticEnergy()/GeV - cfa*(1+normal()/2.0);
-      ekin = std::max( 1.0e-6, ekin );
+      exh = 1.0 - exh;
+    }
+    const G4double cfa = 0.025 * ((atomicWeight - 1.) / 120.) * std::exp(-(atomicWeight - 1.) / 120.);
+    ekin = currentParticle.GetKineticEnergy() / GeV - cfa * (1 + normal() / 2.0);
+    ekin = std::max(1.0e-6, ekin);
+    xxh = 1.0;
+    dekin += ekin * (1.0 - xxh);
+    ekin *= xxh;
+    currentParticle.SetKineticEnergy(ekin * GeV);
+    pp = currentParticle.GetTotalMomentum() / MeV;
+    pp1 = currentParticle.GetMomentum().mag() / MeV;
+    if (pp1 < 0.001 * MeV) {
+      rthnve = pi * G4UniformRand();
+      phinve = twopi * G4UniformRand();
+      currentParticle.SetMomentum(pp * std::sin(rthnve) * std::cos(phinve) * MeV,
+                                  pp * std::sin(rthnve) * std::sin(phinve) * MeV,
+                                  pp * std::cos(rthnve) * MeV);
+    } else
+      currentParticle.SetMomentum(currentParticle.GetMomentum() * (pp / pp1));
+    ekin = targetParticle.GetKineticEnergy() / GeV - cfa * (1 + normal() / 2.0);
+    ekin = std::max(1.0e-6, ekin);
+    xxh = 1.0;
+    if (((modifiedOriginal.GetDefinition() == aPiPlus) || (modifiedOriginal.GetDefinition() == aPiMinus)) &&
+        (targetParticle.GetDefinition() == aPiZero) && (G4UniformRand() < logWeight))
+      xxh = exh;
+    dekin += ekin * (1.0 - xxh);
+    ekin *= xxh;
+    if ((targetParticle.GetDefinition() == aPiPlus) || (targetParticle.GetDefinition() == aPiZero) ||
+        (targetParticle.GetDefinition() == aPiMinus)) {
+      ++npions;
+      ek1 += ekin;
+    }
+    targetParticle.SetKineticEnergy(ekin * GeV);
+    pp = targetParticle.GetTotalMomentum() / MeV;
+    pp1 = targetParticle.GetMomentum().mag() / MeV;
+    if (pp1 < 0.001 * MeV) {
+      rthnve = pi * G4UniformRand();
+      phinve = twopi * G4UniformRand();
+      targetParticle.SetMomentum(pp * std::sin(rthnve) * std::cos(phinve) * MeV,
+                                 pp * std::sin(rthnve) * std::sin(phinve) * MeV,
+                                 pp * std::cos(rthnve) * MeV);
+    } else
+      targetParticle.SetMomentum(targetParticle.GetMomentum() * (pp / pp1));
+    for (i = 0; i < vecLen; ++i) {
+      ekin = vec[i]->GetKineticEnergy() / GeV - cfa * (1 + normal() / 2.0);
+      ekin = std::max(1.0e-6, ekin);
       xxh = 1.0;
-      if( ( (modifiedOriginal.GetDefinition() == aPiPlus) ||
-            (modifiedOriginal.GetDefinition() == aPiMinus) ) &&
-          (targetParticle.GetDefinition() == aPiZero) &&
-          (G4UniformRand() < logWeight) )xxh = exh;
-      dekin += ekin*(1.0-xxh);
+      if (((modifiedOriginal.GetDefinition() == aPiPlus) || (modifiedOriginal.GetDefinition() == aPiMinus)) &&
+          (vec[i]->GetDefinition() == aPiZero) && (G4UniformRand() < logWeight))
+        xxh = exh;
+      dekin += ekin * (1.0 - xxh);
       ekin *= xxh;
-      if( (targetParticle.GetDefinition() == aPiPlus) ||
-          (targetParticle.GetDefinition() == aPiZero) ||
-          (targetParticle.GetDefinition() == aPiMinus) )
-      {
+      if ((vec[i]->GetDefinition() == aPiPlus) || (vec[i]->GetDefinition() == aPiZero) ||
+          (vec[i]->GetDefinition() == aPiMinus)) {
         ++npions;
         ek1 += ekin;
       }
-      targetParticle.SetKineticEnergy( ekin*GeV );
-      pp = targetParticle.GetTotalMomentum()/MeV;
-      pp1 = targetParticle.GetMomentum().mag()/MeV;
-      if( pp1 < 0.001*MeV )
-      {
-        rthnve = pi*G4UniformRand();
-        phinve = twopi*G4UniformRand();
-        targetParticle.SetMomentum( pp*std::sin(rthnve)*std::cos(phinve)*MeV,
-                                    pp*std::sin(rthnve)*std::sin(phinve)*MeV,
-                                    pp*std::cos(rthnve)*MeV );
-      }
-      else
-        targetParticle.SetMomentum( targetParticle.GetMomentum() * (pp/pp1) );
-      for( i=0; i<vecLen; ++i )
-      {
-        ekin = vec[i]->GetKineticEnergy()/GeV - cfa*(1+normal()/2.0);
-        ekin = std::max( 1.0e-6, ekin );
-        xxh = 1.0;
-        if( ( (modifiedOriginal.GetDefinition() == aPiPlus) ||
-              (modifiedOriginal.GetDefinition() == aPiMinus) ) &&
-            (vec[i]->GetDefinition() == aPiZero) &&
-            (G4UniformRand() < logWeight) )xxh = exh;
-        dekin += ekin*(1.0-xxh);
-        ekin *= xxh;
-        if( (vec[i]->GetDefinition() == aPiPlus) ||
-            (vec[i]->GetDefinition() == aPiZero) ||
-            (vec[i]->GetDefinition() == aPiMinus) )
-        {
-          ++npions;
-          ek1 += ekin;
-        }
-        vec[i]->SetKineticEnergy( ekin*GeV );
-        pp = vec[i]->GetTotalMomentum()/MeV;
-        pp1 = vec[i]->GetMomentum().mag()/MeV;
-        if( pp1 < 0.001*MeV )
-        {
-          rthnve = pi*G4UniformRand();
-          phinve = twopi*G4UniformRand();
-          vec[i]->SetMomentum( pp*std::sin(rthnve)*std::cos(phinve)*MeV,
-                               pp*std::sin(rthnve)*std::sin(phinve)*MeV,
-                               pp*std::cos(rthnve)*MeV );
-        }
-        else
-          vec[i]->SetMomentum( vec[i]->GetMomentum() * (pp/pp1) );
-      }
+      vec[i]->SetKineticEnergy(ekin * GeV);
+      pp = vec[i]->GetTotalMomentum() / MeV;
+      pp1 = vec[i]->GetMomentum().mag() / MeV;
+      if (pp1 < 0.001 * MeV) {
+        rthnve = pi * G4UniformRand();
+        phinve = twopi * G4UniformRand();
+        vec[i]->SetMomentum(pp * std::sin(rthnve) * std::cos(phinve) * MeV,
+                            pp * std::sin(rthnve) * std::sin(phinve) * MeV,
+                            pp * std::cos(rthnve) * MeV);
+      } else
+        vec[i]->SetMomentum(vec[i]->GetMomentum() * (pp / pp1));
     }
-    if( (ek1 != 0.0) && (npions > 0) )
-    {
-      dekin = 1.0 + dekin/ek1;
-      //
-      //  first do the incident particle
-      //
-      if( (currentParticle.GetDefinition() == aPiPlus) ||
-          (currentParticle.GetDefinition() == aPiZero) ||
-          (currentParticle.GetDefinition() == aPiMinus) )
-      {
-        currentParticle.SetKineticEnergy(
-         std::max( 0.001*MeV, dekin*currentParticle.GetKineticEnergy() ) );
-        pp = currentParticle.GetTotalMomentum()/MeV;
-        pp1 = currentParticle.GetMomentum().mag()/MeV;
-        if( pp1 < 0.001 )
-        {
-          rthnve = pi*G4UniformRand();
-          phinve = twopi*G4UniformRand();
-          currentParticle.SetMomentum( pp*std::sin(rthnve)*std::cos(phinve)*MeV,
-                                       pp*std::sin(rthnve)*std::sin(phinve)*MeV,
-                                       pp*std::cos(rthnve)*MeV );
-        }
-        else
-          currentParticle.SetMomentum( currentParticle.GetMomentum() * (pp/pp1) );
-      }
-      for( i=0; i<vecLen; ++i )
-      {
-        if( (vec[i]->GetDefinition() == aPiPlus) ||
-            (vec[i]->GetDefinition() == aPiZero) ||
-            (vec[i]->GetDefinition() == aPiMinus) )
-        {
-          vec[i]->SetKineticEnergy( std::max( 0.001*MeV, dekin*vec[i]->GetKineticEnergy() ) );
-          pp = vec[i]->GetTotalMomentum()/MeV;
-          pp1 = vec[i]->GetMomentum().mag()/MeV;
-          if( pp1 < 0.001 )
-          {
-            rthnve = pi*G4UniformRand();
-            phinve = twopi*G4UniformRand();
-            vec[i]->SetMomentum( pp*std::sin(rthnve)*std::cos(phinve)*MeV,
-                                 pp*std::sin(rthnve)*std::sin(phinve)*MeV,
-                                 pp*std::cos(rthnve)*MeV );
-          }
-          else
-            vec[i]->SetMomentum( vec[i]->GetMomentum() * (pp/pp1) );
-        }
+  }
+  if ((ek1 != 0.0) && (npions > 0)) {
+    dekin = 1.0 + dekin / ek1;
+    //
+    //  first do the incident particle
+    //
+    if ((currentParticle.GetDefinition() == aPiPlus) || (currentParticle.GetDefinition() == aPiZero) ||
+        (currentParticle.GetDefinition() == aPiMinus)) {
+      currentParticle.SetKineticEnergy(std::max(0.001 * MeV, dekin * currentParticle.GetKineticEnergy()));
+      pp = currentParticle.GetTotalMomentum() / MeV;
+      pp1 = currentParticle.GetMomentum().mag() / MeV;
+      if (pp1 < 0.001) {
+        rthnve = pi * G4UniformRand();
+        phinve = twopi * G4UniformRand();
+        currentParticle.SetMomentum(pp * std::sin(rthnve) * std::cos(phinve) * MeV,
+                                    pp * std::sin(rthnve) * std::sin(phinve) * MeV,
+                                    pp * std::cos(rthnve) * MeV);
+      } else
+        currentParticle.SetMomentum(currentParticle.GetMomentum() * (pp / pp1));
+    }
+    for (i = 0; i < vecLen; ++i) {
+      if ((vec[i]->GetDefinition() == aPiPlus) || (vec[i]->GetDefinition() == aPiZero) ||
+          (vec[i]->GetDefinition() == aPiMinus)) {
+        vec[i]->SetKineticEnergy(std::max(0.001 * MeV, dekin * vec[i]->GetKineticEnergy()));
+        pp = vec[i]->GetTotalMomentum() / MeV;
+        pp1 = vec[i]->GetMomentum().mag() / MeV;
+        if (pp1 < 0.001) {
+          rthnve = pi * G4UniformRand();
+          phinve = twopi * G4UniformRand();
+          vec[i]->SetMomentum(pp * std::sin(rthnve) * std::cos(phinve) * MeV,
+                              pp * std::sin(rthnve) * std::sin(phinve) * MeV,
+                              pp * std::cos(rthnve) * MeV);
+        } else
+          vec[i]->SetMomentum(vec[i]->GetMomentum() * (pp / pp1));
       }
     }
   }
- 
- void FullModelReactionDynamics::AddBlackTrackParticles(
-   const G4double epnb,            // GeV
-   const G4int npnb,
-   const G4double edta,            // GeV
-   const G4int ndta,
-   const G4double sprob,
-   const G4double kineticMinimum,  // GeV
-   const G4double kineticFactor,   // GeV
-   const G4ReactionProduct &modifiedOriginal,
-   G4double spall,
-   const G4Nucleus &targetNucleus,
-   G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-   G4int &vecLen )
+}
+
+void FullModelReactionDynamics::AddBlackTrackParticles(const G4double epnb,  // GeV
+                                                       const G4int npnb,
+                                                       const G4double edta,  // GeV
+                                                       const G4int ndta,
+                                                       const G4double sprob,
+                                                       const G4double kineticMinimum,  // GeV
+                                                       const G4double kineticFactor,   // GeV
+                                                       const G4ReactionProduct &modifiedOriginal,
+                                                       G4double spall,
+                                                       const G4Nucleus &targetNucleus,
+                                                       G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+                                                       G4int &vecLen) {
+  // derived from original FORTRAN code in GENXPT and TWOCLU by H. Fesefeldt
+  //
+  // npnb is number of proton/neutron black track particles
+  // ndta is the number of deuterons, tritons, and alphas produced
+  // epnb is the kinetic energy available for proton/neutron black track particles
+  // edta is the kinetic energy available for deuteron/triton/alpha particles
+  //
+
+  G4ParticleDefinition *aProton = G4Proton::Proton();
+  G4ParticleDefinition *aNeutron = G4Neutron::Neutron();
+  G4ParticleDefinition *aDeuteron = G4Deuteron::Deuteron();
+  G4ParticleDefinition *aTriton = G4Triton::Triton();
+  G4ParticleDefinition *anAlpha = G4Alpha::Alpha();
+
+  const G4double ekOriginal = modifiedOriginal.GetKineticEnergy() / MeV;
+  G4double atomicWeight = targetNucleus.GetN_asInt();
+  G4double atomicNumber = targetNucleus.GetZ_asInt();
+
+  const G4double ika1 = 3.6;
+  const G4double ika2 = 35.56;
+  const G4double ika3 = 6.45;
+  const G4double sp1 = 1.066;
+
+  G4int i;
+  G4double pp;
+  // G4double totalQ = 0;
+  G4double kinCreated = 0;
+  G4double cfa = 0.025 * ((atomicWeight - 1.0) / 120.0) * std::exp(-(atomicWeight - 1.0) / 120.0);
+  if (npnb > 0)  // first add protons and neutrons
   {
-    // derived from original FORTRAN code in GENXPT and TWOCLU by H. Fesefeldt
-    //
-    // npnb is number of proton/neutron black track particles
-    // ndta is the number of deuterons, tritons, and alphas produced
-    // epnb is the kinetic energy available for proton/neutron black track particles
-    // edta is the kinetic energy available for deuteron/triton/alpha particles
-    //
-    
-    G4ParticleDefinition *aProton = G4Proton::Proton();
-    G4ParticleDefinition *aNeutron = G4Neutron::Neutron();
-    G4ParticleDefinition *aDeuteron = G4Deuteron::Deuteron();
-    G4ParticleDefinition *aTriton = G4Triton::Triton();
-    G4ParticleDefinition *anAlpha = G4Alpha::Alpha();
-    
-    const G4double ekOriginal = modifiedOriginal.GetKineticEnergy()/MeV;
-    G4double atomicWeight = targetNucleus.GetN_asInt();
-    G4double atomicNumber = targetNucleus.GetZ_asInt();
-    
-    const G4double ika1 = 3.6;
-    const G4double ika2 = 35.56;
-    const G4double ika3 = 6.45;
-    const G4double sp1 = 1.066;
-    
-    G4int i;
-    G4double pp;
-    // G4double totalQ = 0;
-    G4double kinCreated = 0;
-    G4double cfa = 0.025*((atomicWeight-1.0)/120.0) * std::exp(-(atomicWeight-1.0)/120.0);
-    if( npnb > 0)  // first add protons and neutrons
-    {
-      G4double backwardKinetic = 0.0;
-      G4int local_npnb = npnb;
-      for( i=0; i<npnb; ++i ) if( G4UniformRand() < sprob ) local_npnb--;
-      G4double ekin = epnb/local_npnb;
-      
-      for( i=0; i<local_npnb; ++i )
-      {
-        G4ReactionProduct * p1 = new G4ReactionProduct();
-        if( backwardKinetic > epnb )
-        {
-          delete p1;
-          break;    
-        }
-        G4double ran = G4UniformRand();
-        G4double kinetic = -ekin*std::log(ran) - cfa*(1.0+0.5*normal());
-        if( kinetic < 0.0 )kinetic = -0.010*std::log(ran);
-        backwardKinetic += kinetic;
-        if( backwardKinetic > epnb )
-          kinetic = std::max( kineticMinimum, epnb-(backwardKinetic-kinetic) );
-        if( G4UniformRand() > (1.0-atomicNumber/atomicWeight) )
-          p1->SetDefinition( aProton );
-        else
-          p1->SetDefinition( aNeutron );
-        vec.SetElement( vecLen, p1 );
-        ++spall;
-        G4double cost = G4UniformRand() * 2.0 - 1.0;
-        G4double sint = std::sqrt(std::fabs(1.0-cost*cost));
-        G4double phi = twopi * G4UniformRand();
-        vec[vecLen]->SetNewlyAdded( true );
-        vec[vecLen]->SetKineticEnergy( kinetic*GeV );
-	kinCreated+=kinetic;
-        pp = vec[vecLen]->GetTotalMomentum()/MeV;
-        vec[vecLen]->SetMomentum( pp*sint*std::sin(phi)*MeV,
-                                    pp*sint*std::cos(phi)*MeV,
-                                    pp*cost*MeV );
-	vecLen++;
-	// DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+    G4double backwardKinetic = 0.0;
+    G4int local_npnb = npnb;
+    for (i = 0; i < npnb; ++i)
+      if (G4UniformRand() < sprob)
+        local_npnb--;
+    G4double ekin = epnb / local_npnb;
+
+    for (i = 0; i < local_npnb; ++i) {
+      G4ReactionProduct *p1 = new G4ReactionProduct();
+      if (backwardKinetic > epnb) {
+        delete p1;
+        break;
       }
-      if( (atomicWeight >= 10.0) && (ekOriginal <= 2.0*GeV) )
-      {
-        G4double ekw = ekOriginal/GeV;
-        G4int ika, kk = 0;
-        if( ekw > 1.0 )ekw *= ekw;
-        ekw = std::max( 0.1, ekw );
-        ika = G4int(ika1*std::exp((atomicNumber*atomicNumber/atomicWeight-ika2)/ika3)/ekw);
-        if( ika > 0 )
-        {
-          for( i=(vecLen-1); i>=0; --i )
-          {
-            if( (vec[i]->GetDefinition() == aProton) && vec[i]->GetNewlyAdded() )
-            {
-              vec[i]->SetDefinitionAndUpdateE( aNeutron );  // modified 22-Oct-97
-              if( ++kk > ika )break;
-            }
+      G4double ran = G4UniformRand();
+      G4double kinetic = -ekin * std::log(ran) - cfa * (1.0 + 0.5 * normal());
+      if (kinetic < 0.0)
+        kinetic = -0.010 * std::log(ran);
+      backwardKinetic += kinetic;
+      if (backwardKinetic > epnb)
+        kinetic = std::max(kineticMinimum, epnb - (backwardKinetic - kinetic));
+      if (G4UniformRand() > (1.0 - atomicNumber / atomicWeight))
+        p1->SetDefinition(aProton);
+      else
+        p1->SetDefinition(aNeutron);
+      vec.SetElement(vecLen, p1);
+      ++spall;
+      G4double cost = G4UniformRand() * 2.0 - 1.0;
+      G4double sint = std::sqrt(std::fabs(1.0 - cost * cost));
+      G4double phi = twopi * G4UniformRand();
+      vec[vecLen]->SetNewlyAdded(true);
+      vec[vecLen]->SetKineticEnergy(kinetic * GeV);
+      kinCreated += kinetic;
+      pp = vec[vecLen]->GetTotalMomentum() / MeV;
+      vec[vecLen]->SetMomentum(pp * sint * std::sin(phi) * MeV, pp * sint * std::cos(phi) * MeV, pp * cost * MeV);
+      vecLen++;
+      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+    }
+    if ((atomicWeight >= 10.0) && (ekOriginal <= 2.0 * GeV)) {
+      G4double ekw = ekOriginal / GeV;
+      G4int ika, kk = 0;
+      if (ekw > 1.0)
+        ekw *= ekw;
+      ekw = std::max(0.1, ekw);
+      ika = G4int(ika1 * std::exp((atomicNumber * atomicNumber / atomicWeight - ika2) / ika3) / ekw);
+      if (ika > 0) {
+        for (i = (vecLen - 1); i >= 0; --i) {
+          if ((vec[i]->GetDefinition() == aProton) && vec[i]->GetNewlyAdded()) {
+            vec[i]->SetDefinitionAndUpdateE(aNeutron);  // modified 22-Oct-97
+            if (++kk > ika)
+              break;
           }
         }
       }
     }
-    if( ndta > 0 )    //  now, try to add deuterons, tritons and alphas
-    {
-      G4double backwardKinetic = 0.0;
-      G4int local_ndta=ndta;
-      for( i=0; i<ndta; ++i )if( G4UniformRand() < sprob )local_ndta--;
-      G4double ekin = edta/local_ndta;
+  }
+  if (ndta > 0)  //  now, try to add deuterons, tritons and alphas
+  {
+    G4double backwardKinetic = 0.0;
+    G4int local_ndta = ndta;
+    for (i = 0; i < ndta; ++i)
+      if (G4UniformRand() < sprob)
+        local_ndta--;
+    G4double ekin = edta / local_ndta;
 
-      for( i=0; i<local_ndta; ++i )
-      {
-        G4ReactionProduct *p2 = new G4ReactionProduct();
-        if( backwardKinetic > edta )
-        {
-          delete p2;
-          break;
-        }
-        G4double ran = G4UniformRand();
-        G4double kinetic = -ekin*std::log(ran)-cfa*(1.+0.5*normal());
-        if( kinetic < 0.0 )kinetic = kineticFactor*std::log(ran);
-        backwardKinetic += kinetic;
-        if( backwardKinetic > edta )kinetic = edta-(backwardKinetic-kinetic);
-        if( kinetic < 0.0 )kinetic = kineticMinimum;
-        G4double cost = 2.0*G4UniformRand() - 1.0;
-        G4double sint = std::sqrt(std::max(0.0,(1.0-cost*cost)));
-        G4double phi = twopi*G4UniformRand();
-        ran = G4UniformRand();
-        if( ran <= 0.60 )
-          p2->SetDefinition( aDeuteron );
-        else if( ran <= 0.90 )
-          p2->SetDefinition( aTriton );
-        else
-          p2->SetDefinition( anAlpha );
-        spall += p2->GetMass()/GeV * sp1;
-        if( spall > atomicWeight )
-	{
-	  delete p2;
-	  break;
-	}
-        vec.SetElement( vecLen, p2 );
-        vec[vecLen]->SetNewlyAdded( true );
-        vec[vecLen]->SetKineticEnergy( kinetic*GeV );
-	kinCreated+=kinetic;
-        pp = vec[vecLen]->GetTotalMomentum()/MeV;
-        vec[vecLen++]->SetMomentum( pp*sint*std::sin(phi)*MeV,
-                                    pp*sint*std::cos(phi)*MeV,
-                                    pp*cost*MeV );
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+    for (i = 0; i < local_ndta; ++i) {
+      G4ReactionProduct *p2 = new G4ReactionProduct();
+      if (backwardKinetic > edta) {
+        delete p2;
+        break;
       }
+      G4double ran = G4UniformRand();
+      G4double kinetic = -ekin * std::log(ran) - cfa * (1. + 0.5 * normal());
+      if (kinetic < 0.0)
+        kinetic = kineticFactor * std::log(ran);
+      backwardKinetic += kinetic;
+      if (backwardKinetic > edta)
+        kinetic = edta - (backwardKinetic - kinetic);
+      if (kinetic < 0.0)
+        kinetic = kineticMinimum;
+      G4double cost = 2.0 * G4UniformRand() - 1.0;
+      G4double sint = std::sqrt(std::max(0.0, (1.0 - cost * cost)));
+      G4double phi = twopi * G4UniformRand();
+      ran = G4UniformRand();
+      if (ran <= 0.60)
+        p2->SetDefinition(aDeuteron);
+      else if (ran <= 0.90)
+        p2->SetDefinition(aTriton);
+      else
+        p2->SetDefinition(anAlpha);
+      spall += p2->GetMass() / GeV * sp1;
+      if (spall > atomicWeight) {
+        delete p2;
+        break;
+      }
+      vec.SetElement(vecLen, p2);
+      vec[vecLen]->SetNewlyAdded(true);
+      vec[vecLen]->SetKineticEnergy(kinetic * GeV);
+      kinCreated += kinetic;
+      pp = vec[vecLen]->GetTotalMomentum() / MeV;
+      vec[vecLen++]->SetMomentum(pp * sint * std::sin(phi) * MeV, pp * sint * std::cos(phi) * MeV, pp * cost * MeV);
+      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
     }
-    // G4double delta = epnb+edta - kinCreated;
   }
- 
- void FullModelReactionDynamics::MomentumCheck(
-   const G4ReactionProduct &modifiedOriginal,
-   G4ReactionProduct &currentParticle,
-   G4ReactionProduct &targetParticle,
-   G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-   G4int &vecLen )
-  {
-    const G4double pOriginal = modifiedOriginal.GetTotalMomentum()/MeV;
-    G4double testMomentum = currentParticle.GetMomentum().mag()/MeV;
-    G4double pMass;
-    if( testMomentum >= pOriginal )
-    {
-      pMass = currentParticle.GetMass()/MeV;
-      currentParticle.SetTotalEnergy(
-       std::sqrt( pMass*pMass + pOriginal*pOriginal )*MeV );
-      currentParticle.SetMomentum(
-       currentParticle.GetMomentum() * (pOriginal/testMomentum) );
-    }
-    testMomentum = targetParticle.GetMomentum().mag()/MeV;
-    if( testMomentum >= pOriginal )
-    {
-      pMass = targetParticle.GetMass()/MeV;
-      targetParticle.SetTotalEnergy(
-       std::sqrt( pMass*pMass + pOriginal*pOriginal )*MeV );
-      targetParticle.SetMomentum(
-       targetParticle.GetMomentum() * (pOriginal/testMomentum) );
-    }
-    for( G4int i=0; i<vecLen; ++i )
-    {
-      testMomentum = vec[i]->GetMomentum().mag()/MeV;
-      if( testMomentum >= pOriginal )
-      {
-        pMass = vec[i]->GetMass()/MeV;
-        vec[i]->SetTotalEnergy(
-         std::sqrt( pMass*pMass + pOriginal*pOriginal )*MeV );
-        vec[i]->SetMomentum( vec[i]->GetMomentum() * (pOriginal/testMomentum) );
-      }
+  // G4double delta = epnb+edta - kinCreated;
+}
+
+void FullModelReactionDynamics::MomentumCheck(const G4ReactionProduct &modifiedOriginal,
+                                              G4ReactionProduct &currentParticle,
+                                              G4ReactionProduct &targetParticle,
+                                              G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+                                              G4int &vecLen) {
+  const G4double pOriginal = modifiedOriginal.GetTotalMomentum() / MeV;
+  G4double testMomentum = currentParticle.GetMomentum().mag() / MeV;
+  G4double pMass;
+  if (testMomentum >= pOriginal) {
+    pMass = currentParticle.GetMass() / MeV;
+    currentParticle.SetTotalEnergy(std::sqrt(pMass * pMass + pOriginal * pOriginal) * MeV);
+    currentParticle.SetMomentum(currentParticle.GetMomentum() * (pOriginal / testMomentum));
+  }
+  testMomentum = targetParticle.GetMomentum().mag() / MeV;
+  if (testMomentum >= pOriginal) {
+    pMass = targetParticle.GetMass() / MeV;
+    targetParticle.SetTotalEnergy(std::sqrt(pMass * pMass + pOriginal * pOriginal) * MeV);
+    targetParticle.SetMomentum(targetParticle.GetMomentum() * (pOriginal / testMomentum));
+  }
+  for (G4int i = 0; i < vecLen; ++i) {
+    testMomentum = vec[i]->GetMomentum().mag() / MeV;
+    if (testMomentum >= pOriginal) {
+      pMass = vec[i]->GetMass() / MeV;
+      vec[i]->SetTotalEnergy(std::sqrt(pMass * pMass + pOriginal * pOriginal) * MeV);
+      vec[i]->SetMomentum(vec[i]->GetMomentum() * (pOriginal / testMomentum));
     }
   }
+}
 
- void FullModelReactionDynamics::ProduceStrangeParticlePairs(
-   G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> &vec,
-   G4int &vecLen,
-   const G4ReactionProduct &modifiedOriginal,
-   const G4DynamicParticle *originalTarget, 
-   G4ReactionProduct &currentParticle,
-   G4ReactionProduct &targetParticle,
-   G4bool &incidentHasChanged,
-   G4bool &targetHasChanged )
+void FullModelReactionDynamics::ProduceStrangeParticlePairs(G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> &vec,
+                                                            G4int &vecLen,
+                                                            const G4ReactionProduct &modifiedOriginal,
+                                                            const G4DynamicParticle *originalTarget,
+                                                            G4ReactionProduct &currentParticle,
+                                                            G4ReactionProduct &targetParticle,
+                                                            G4bool &incidentHasChanged,
+                                                            G4bool &targetHasChanged) {
+  // derived from original FORTRAN code STPAIR by H. Fesefeldt (16-Dec-1987)
+  //
+  // Choose charge combinations K+ K-, K+ K0B, K0 K0B, K0 K-,
+  //                            K+ Y0, K0 Y+,  K0 Y-
+  // For antibaryon induced reactions half of the cross sections KB YB
+  // pairs are produced.  Charge is not conserved, no experimental data available
+  // for exclusive reactions, therefore some average behaviour assumed.
+  // The ratio L/SIGMA is taken as 3:1 (from experimental low energy)
+  //
+  if (vecLen == 0)
+    return;
+  //
+  // the following protects against annihilation processes
+  //
+  if (currentParticle.GetMass() == 0.0 || targetParticle.GetMass() == 0.0)
+    return;
+
+  const G4double etOriginal = modifiedOriginal.GetTotalEnergy() / GeV;
+  const G4double mOriginal = modifiedOriginal.GetDefinition()->GetPDGMass() / GeV;
+  G4double targetMass = originalTarget->GetDefinition()->GetPDGMass() / GeV;
+  G4double centerofmassEnergy =
+      std::sqrt(mOriginal * mOriginal + targetMass * targetMass + 2.0 * targetMass * etOriginal);  // GeV
+  G4double currentMass = currentParticle.GetMass() / GeV;
+  G4double availableEnergy = centerofmassEnergy - (targetMass + currentMass);
+  if (availableEnergy <= 1.0)
+    return;
+
+  G4ParticleDefinition *aProton = G4Proton::Proton();
+  G4ParticleDefinition *anAntiProton = G4AntiProton::AntiProton();
+  G4ParticleDefinition *aNeutron = G4Neutron::Neutron();
+  G4ParticleDefinition *anAntiNeutron = G4AntiNeutron::AntiNeutron();
+  G4ParticleDefinition *aSigmaMinus = G4SigmaMinus::SigmaMinus();
+  G4ParticleDefinition *aSigmaPlus = G4SigmaPlus::SigmaPlus();
+  G4ParticleDefinition *aSigmaZero = G4SigmaZero::SigmaZero();
+  G4ParticleDefinition *anAntiSigmaMinus = G4AntiSigmaMinus::AntiSigmaMinus();
+  G4ParticleDefinition *anAntiSigmaPlus = G4AntiSigmaPlus::AntiSigmaPlus();
+  G4ParticleDefinition *anAntiSigmaZero = G4AntiSigmaZero::AntiSigmaZero();
+  G4ParticleDefinition *aKaonMinus = G4KaonMinus::KaonMinus();
+  G4ParticleDefinition *aKaonPlus = G4KaonPlus::KaonPlus();
+  G4ParticleDefinition *aKaonZL = G4KaonZeroLong::KaonZeroLong();
+  G4ParticleDefinition *aKaonZS = G4KaonZeroShort::KaonZeroShort();
+  G4ParticleDefinition *aLambda = G4Lambda::Lambda();
+  G4ParticleDefinition *anAntiLambda = G4AntiLambda::AntiLambda();
+
+  const G4double protonMass = aProton->GetPDGMass() / GeV;
+  const G4double sigmaMinusMass = aSigmaMinus->GetPDGMass() / GeV;
+  //
+  // determine the center of mass energy bin
+  //
+  const G4double avrs[] = {3., 4., 5., 6., 7., 8., 9., 10., 20., 30., 40., 50.};
+
+  G4int ibin, i3, i4;
+  G4double avk, avy, avn, ran;
+  G4int i = 1;
+  while ((i < 12) && (centerofmassEnergy > avrs[i]))
+    ++i;
+  if (i == 12)
+    ibin = 11;
+  else
+    ibin = i;
+  //
+  // the fortran code chooses a random replacement of produced kaons
+  //  but does not take into account charge conservation
+  //
+  if (vecLen == 1)  // we know that vecLen > 0
   {
-    // derived from original FORTRAN code STPAIR by H. Fesefeldt (16-Dec-1987)
-    //
-    // Choose charge combinations K+ K-, K+ K0B, K0 K0B, K0 K-,
-    //                            K+ Y0, K0 Y+,  K0 Y-
-    // For antibaryon induced reactions half of the cross sections KB YB
-    // pairs are produced.  Charge is not conserved, no experimental data available
-    // for exclusive reactions, therefore some average behaviour assumed.
-    // The ratio L/SIGMA is taken as 3:1 (from experimental low energy)
-    //
-    if( vecLen == 0 )return;
-    //
-    // the following protects against annihilation processes
-    //
-    if( currentParticle.GetMass() == 0.0 || targetParticle.GetMass() == 0.0 )return;
-    
-    const G4double etOriginal = modifiedOriginal.GetTotalEnergy()/GeV;
-    const G4double mOriginal = modifiedOriginal.GetDefinition()->GetPDGMass()/GeV;
-    G4double targetMass = originalTarget->GetDefinition()->GetPDGMass()/GeV;
-    G4double centerofmassEnergy = std::sqrt( mOriginal*mOriginal +
-                                        targetMass*targetMass +
-                                        2.0*targetMass*etOriginal );  // GeV
-    G4double currentMass = currentParticle.GetMass()/GeV;
-    G4double availableEnergy = centerofmassEnergy-(targetMass+currentMass);
-    if( availableEnergy <= 1.0 )return;
-    
-    G4ParticleDefinition *aProton = G4Proton::Proton();
-    G4ParticleDefinition *anAntiProton = G4AntiProton::AntiProton();
-    G4ParticleDefinition *aNeutron = G4Neutron::Neutron();
-    G4ParticleDefinition *anAntiNeutron = G4AntiNeutron::AntiNeutron();
-    G4ParticleDefinition *aSigmaMinus = G4SigmaMinus::SigmaMinus();
-    G4ParticleDefinition *aSigmaPlus = G4SigmaPlus::SigmaPlus();
-    G4ParticleDefinition *aSigmaZero = G4SigmaZero::SigmaZero();
-    G4ParticleDefinition *anAntiSigmaMinus = G4AntiSigmaMinus::AntiSigmaMinus();
-    G4ParticleDefinition *anAntiSigmaPlus = G4AntiSigmaPlus::AntiSigmaPlus();
-    G4ParticleDefinition *anAntiSigmaZero = G4AntiSigmaZero::AntiSigmaZero();
-    G4ParticleDefinition *aKaonMinus = G4KaonMinus::KaonMinus();
-    G4ParticleDefinition *aKaonPlus = G4KaonPlus::KaonPlus();
-    G4ParticleDefinition *aKaonZL = G4KaonZeroLong::KaonZeroLong();
-    G4ParticleDefinition *aKaonZS = G4KaonZeroShort::KaonZeroShort();
-    G4ParticleDefinition *aLambda = G4Lambda::Lambda();
-    G4ParticleDefinition *anAntiLambda = G4AntiLambda::AntiLambda();
-    
-    const G4double protonMass = aProton->GetPDGMass()/GeV;
-    const G4double sigmaMinusMass = aSigmaMinus->GetPDGMass()/GeV;
-    //
-    // determine the center of mass energy bin
-    //
-    const G4double avrs[] = {3.,4.,5.,6.,7.,8.,9.,10.,20.,30.,40.,50.};
-
-    G4int ibin, i3, i4;
-    G4double avk, avy, avn, ran;
-    G4int i = 1;
-    while( (i<12) && (centerofmassEnergy>avrs[i]) )++i;
-    if( i == 12 )
-      ibin = 11;
-    else
-      ibin = i;
-    //
-    // the fortran code chooses a random replacement of produced kaons
-    //  but does not take into account charge conservation 
-    //
-    if( vecLen == 1 )  // we know that vecLen > 0
-    {
-      i3 = 0;
-      i4 = 1;   // note that we will be adding a new secondary particle in this case only
-    }
-    else               // otherwise  0 <= i3,i4 < vecLen
-    {
-      G4double ran = G4UniformRand();
-      while( ran == 1.0 )ran = G4UniformRand();
-      i4 = i3 = G4int( vecLen*ran );
-      while( i3 == i4 )
-      {
+    i3 = 0;
+    i4 = 1;  // note that we will be adding a new secondary particle in this case only
+  } else     // otherwise  0 <= i3,i4 < vecLen
+  {
+    G4double ran = G4UniformRand();
+    while (ran == 1.0)
+      ran = G4UniformRand();
+    i4 = i3 = G4int(vecLen * ran);
+    while (i3 == i4) {
+      ran = G4UniformRand();
+      while (ran == 1.0)
         ran = G4UniformRand();
-        while( ran == 1.0 )ran = G4UniformRand();
-        i4 = G4int( vecLen*ran );
+      i4 = G4int(vecLen * ran);
+    }
+  }
+  //
+  // use linear interpolation or extrapolation by y=centerofmassEnergy*x+b
+  //
+  const G4double avkkb[] = {0.0015, 0.005, 0.012, 0.0285, 0.0525, 0.075, 0.0975, 0.123, 0.28, 0.398, 0.495, 0.573};
+  const G4double avky[] = {0.005, 0.03, 0.064, 0.095, 0.115, 0.13, 0.145, 0.155, 0.20, 0.205, 0.210, 0.212};
+  const G4double avnnb[] = {0.00001, 0.0001, 0.0006, 0.0025, 0.01, 0.02, 0.04, 0.05, 0.12, 0.15, 0.18, 0.20};
+
+  avk = (std::log(avkkb[ibin]) - std::log(avkkb[ibin - 1])) * (centerofmassEnergy - avrs[ibin - 1]) /
+            (avrs[ibin] - avrs[ibin - 1]) +
+        std::log(avkkb[ibin - 1]);
+  avk = std::exp(avk);
+
+  avy = (std::log(avky[ibin]) - std::log(avky[ibin - 1])) * (centerofmassEnergy - avrs[ibin - 1]) /
+            (avrs[ibin] - avrs[ibin - 1]) +
+        std::log(avky[ibin - 1]);
+  avy = std::exp(avy);
+
+  avn = (std::log(avnnb[ibin]) - std::log(avnnb[ibin - 1])) * (centerofmassEnergy - avrs[ibin - 1]) /
+            (avrs[ibin] - avrs[ibin - 1]) +
+        std::log(avnnb[ibin - 1]);
+  avn = std::exp(avn);
+
+  if (avk + avy + avn <= 0.0)
+    return;
+
+  if (currentMass < protonMass)
+    avy /= 2.0;
+  if (targetMass < protonMass)
+    avy = 0.0;
+  avy += avk + avn;
+  avk += avn;
+  ran = G4UniformRand();
+  if (ran < avn) {
+    if (availableEnergy < 2.0)
+      return;
+    if (vecLen == 1)  // add a new secondary
+    {
+      G4ReactionProduct *p1 = new G4ReactionProduct;
+      if (G4UniformRand() < 0.5) {
+        vec[0]->SetDefinition(aNeutron);
+        p1->SetDefinition(anAntiNeutron);
+        (G4UniformRand() < 0.5) ? p1->SetSide(-1) : p1->SetSide(1);
+        vec[0]->SetMayBeKilled(false);
+        p1->SetMayBeKilled(false);
+      } else {
+        vec[0]->SetDefinition(aProton);
+        p1->SetDefinition(anAntiProton);
+        (G4UniformRand() < 0.5) ? p1->SetSide(-1) : p1->SetSide(1);
+        vec[0]->SetMayBeKilled(false);
+        p1->SetMayBeKilled(false);
+      }
+      vec.SetElement(vecLen++, p1);
+      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+    } else {  // replace two secondaries
+      if (G4UniformRand() < 0.5) {
+        vec[i3]->SetDefinition(aNeutron);
+        vec[i4]->SetDefinition(anAntiNeutron);
+        vec[i3]->SetMayBeKilled(false);
+        vec[i4]->SetMayBeKilled(false);
+      } else {
+        vec[i3]->SetDefinition(aProton);
+        vec[i4]->SetDefinition(anAntiProton);
+        vec[i3]->SetMayBeKilled(false);
+        vec[i4]->SetMayBeKilled(false);
       }
     }
-    //
-    // use linear interpolation or extrapolation by y=centerofmassEnergy*x+b
-    //
-    const G4double avkkb[] = { 0.0015, 0.005, 0.012, 0.0285, 0.0525, 0.075,
-                               0.0975, 0.123, 0.28,  0.398,  0.495,  0.573 };
-    const G4double avky[] = { 0.005, 0.03,  0.064, 0.095, 0.115, 0.13,
-                              0.145, 0.155, 0.20,  0.205, 0.210, 0.212 };
-    const G4double avnnb[] = { 0.00001, 0.0001, 0.0006, 0.0025, 0.01, 0.02,
-                               0.04,    0.05,   0.12,   0.15,   0.18, 0.20 };
-    
-    avk = (std::log(avkkb[ibin])-std::log(avkkb[ibin-1]))*(centerofmassEnergy-avrs[ibin-1])
-      /(avrs[ibin]-avrs[ibin-1]) + std::log(avkkb[ibin-1]);
-    avk = std::exp(avk);
-    
-    avy = (std::log(avky[ibin])-std::log(avky[ibin-1]))*(centerofmassEnergy-avrs[ibin-1])
-      /(avrs[ibin]-avrs[ibin-1]) + std::log(avky[ibin-1]);
-    avy = std::exp(avy);
-    
-    avn = (std::log(avnnb[ibin])-std::log(avnnb[ibin-1]))*(centerofmassEnergy-avrs[ibin-1])
-      /(avrs[ibin]-avrs[ibin-1]) + std::log(avnnb[ibin-1]);
-    avn = std::exp(avn);
-    
-    if( avk+avy+avn <= 0.0 )return;
-    
-    if( currentMass < protonMass )avy /= 2.0;
-    if( targetMass < protonMass )avy = 0.0;
-    avy += avk+avn;
-    avk += avn;
+  } else if (ran < avk) {
+    if (availableEnergy < 1.0)
+      return;
+
+    const G4double kkb[] = {0.2500, 0.3750, 0.5000, 0.5625, 0.6250, 0.6875, 0.7500, 0.8750, 1.000};
+    const G4int ipakkb1[] = {10, 10, 10, 11, 11, 12, 12, 11, 12};
+    const G4int ipakkb2[] = {13, 11, 12, 11, 12, 11, 12, 13, 13};
     ran = G4UniformRand();
-    if(  ran < avn )
+    i = 0;
+    while ((i < 9) && (ran >= kkb[i]))
+      ++i;
+    if (i == 9)
+      return;
+    //
+    // ipakkb[] = { 10,13, 10,11, 10,12, 11,11, 11,12, 12,11, 12,12, 11,13, 12,13 };
+    // charge       +  -   +  0   +  0   0  0   0  0   0  0   0  0   0  -   0  -
+    //
+    switch (ipakkb1[i]) {
+      case 10:
+        vec[i3]->SetDefinition(aKaonPlus);
+        vec[i3]->SetMayBeKilled(false);
+        break;
+      case 11:
+        vec[i3]->SetDefinition(aKaonZS);
+        vec[i3]->SetMayBeKilled(false);
+        break;
+      case 12:
+        vec[i3]->SetDefinition(aKaonZL);
+        vec[i3]->SetMayBeKilled(false);
+        break;
+    }
+    if (vecLen == 1)  // add a secondary
     {
-      if( availableEnergy < 2.0 )return;
-      if( vecLen == 1 )                              // add a new secondary
-      {
-        G4ReactionProduct *p1 = new G4ReactionProduct;
-        if( G4UniformRand() < 0.5 )
-        {
-          vec[0]->SetDefinition( aNeutron );
-          p1->SetDefinition( anAntiNeutron );
-          (G4UniformRand() < 0.5) ? p1->SetSide( -1 ) : p1->SetSide( 1 );
-	  vec[0]->SetMayBeKilled(false);
-	  p1->SetMayBeKilled(false);
-        }
-        else
-        {
-          vec[0]->SetDefinition( aProton );
-          p1->SetDefinition( anAntiProton );
-          (G4UniformRand() < 0.5) ? p1->SetSide( -1 ) : p1->SetSide( 1 );
-	  vec[0]->SetMayBeKilled(false);
-	  p1->SetMayBeKilled(false);
-        }
-        vec.SetElement( vecLen++, p1 );
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+      G4ReactionProduct *p1 = new G4ReactionProduct;
+      switch (ipakkb2[i]) {
+        case 11:
+          p1->SetDefinition(aKaonZS);
+          p1->SetMayBeKilled(false);
+          break;
+        case 12:
+          p1->SetDefinition(aKaonZL);
+          p1->SetMayBeKilled(false);
+          break;
+        case 13:
+          p1->SetDefinition(aKaonMinus);
+          p1->SetMayBeKilled(false);
+          break;
       }
-      else
-      {                                             // replace two secondaries
-        if( G4UniformRand() < 0.5 )
-        {
-          vec[i3]->SetDefinition( aNeutron );
-          vec[i4]->SetDefinition( anAntiNeutron );
-	  vec[i3]->SetMayBeKilled(false);
-	  vec[i4]->SetMayBeKilled(false);
-        }
-        else
-        {
-          vec[i3]->SetDefinition( aProton );
-          vec[i4]->SetDefinition( anAntiProton );
-	  vec[i3]->SetMayBeKilled(false);
-	  vec[i4]->SetMayBeKilled(false);
-        }
+      (G4UniformRand() < 0.5) ? p1->SetSide(-1) : p1->SetSide(1);
+      vec.SetElement(vecLen++, p1);
+      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+    } else  // replace
+    {
+      switch (ipakkb2[i]) {
+        case 11:
+          vec[i4]->SetDefinition(aKaonZS);
+          vec[i4]->SetMayBeKilled(false);
+          break;
+        case 12:
+          vec[i4]->SetDefinition(aKaonZL);
+          vec[i4]->SetMayBeKilled(false);
+          break;
+        case 13:
+          vec[i4]->SetDefinition(aKaonMinus);
+          vec[i4]->SetMayBeKilled(false);
+          break;
       }
     }
-    else if( ran < avk )
-    {
-      if( availableEnergy < 1.0 )return;
-      
-      const G4double kkb[] = { 0.2500, 0.3750, 0.5000, 0.5625, 0.6250,
-                               0.6875, 0.7500, 0.8750, 1.000 };
-      const G4int ipakkb1[] = { 10, 10, 10, 11, 11, 12, 12, 11, 12 };
-      const G4int ipakkb2[] = { 13, 11, 12, 11, 12, 11, 12, 13, 13 };
-      ran = G4UniformRand();
-      i = 0;
-      while( (i<9) && (ran>=kkb[i]) )++i;
-      if( i == 9 )return;
-      //
-      // ipakkb[] = { 10,13, 10,11, 10,12, 11,11, 11,12, 12,11, 12,12, 11,13, 12,13 };
-      // charge       +  -   +  0   +  0   0  0   0  0   0  0   0  0   0  -   0  -
+  } else if (ran < avy) {
+    if (availableEnergy < 1.6)
+      return;
+
+    const G4double ky[] = {0.200, 0.300, 0.400, 0.550, 0.625, 0.700, 0.800, 0.850, 0.900, 0.950, 0.975, 1.000};
+    const G4int ipaky1[] = {18, 18, 18, 20, 20, 20, 21, 21, 21, 22, 22, 22};
+    const G4int ipaky2[] = {10, 11, 12, 10, 11, 12, 10, 11, 12, 10, 11, 12};
+    const G4int ipakyb1[] = {19, 19, 19, 23, 23, 23, 24, 24, 24, 25, 25, 25};
+    const G4int ipakyb2[] = {13, 12, 11, 13, 12, 11, 13, 12, 11, 13, 12, 11};
+    ran = G4UniformRand();
+    i = 0;
+    while ((i < 12) && (ran > ky[i]))
+      ++i;
+    if (i == 12)
+      return;
+    if ((currentMass < protonMass) || (G4UniformRand() < 0.5)) {
+      // ipaky[] = { 18,10, 18,11, 18,12, 20,10, 20,11, 20,12,
+      //             0  +   0  0   0  0   +  +   +  0   +  0
       //
-      switch( ipakkb1[i] )
-      {
-       case 10:
-         vec[i3]->SetDefinition( aKaonPlus );
-	 vec[i3]->SetMayBeKilled(false);
-         break;
-       case 11:
-         vec[i3]->SetDefinition( aKaonZS );
-	 vec[i3]->SetMayBeKilled(false);
-         break;
-       case 12:
-         vec[i3]->SetDefinition( aKaonZL );
-	 vec[i3]->SetMayBeKilled(false);
-         break;
-      }
-      if( vecLen == 1 )                          // add a secondary
-      {
-        G4ReactionProduct *p1 = new G4ReactionProduct;
-        switch( ipakkb2[i] )
-        {
-         case 11:
-           p1->SetDefinition( aKaonZS );
-	   p1->SetMayBeKilled(false);
-           break;
-         case 12:
-           p1->SetDefinition( aKaonZL );
-	   p1->SetMayBeKilled(false);
-           break;
-         case 13:
-           p1->SetDefinition( aKaonMinus );
-	   p1->SetMayBeKilled(false);
-           break;
-        }
-        (G4UniformRand() < 0.5) ? p1->SetSide( -1 ) : p1->SetSide( 1 );
-        vec.SetElement( vecLen++, p1 );
-      // DEBUGGING --> DumpFrames::DumpFrame(vec, vecLen);
+      //             21,10, 21,11, 21,12, 22,10, 22,11, 22,12 }
+      //             0  +   0  0   0  0   -  +   -  0   -  0
+      switch (ipaky1[i]) {
+        case 18:
+          targetParticle.SetDefinition(aLambda);
+          break;
+        case 20:
+          targetParticle.SetDefinition(aSigmaPlus);
+          break;
+        case 21:
+          targetParticle.SetDefinition(aSigmaZero);
+          break;
+        case 22:
+          targetParticle.SetDefinition(aSigmaMinus);
+          break;
       }
-      else                                        // replace
-      {
-        switch( ipakkb2[i] )
-        {
-         case 11:
-           vec[i4]->SetDefinition( aKaonZS );
-	   vec[i4]->SetMayBeKilled(false);
-           break;
-         case 12:
-           vec[i4]->SetDefinition( aKaonZL );
-	   vec[i4]->SetMayBeKilled(false);
-           break;
-         case 13:
-           vec[i4]->SetDefinition( aKaonMinus );
-	   vec[i4]->SetMayBeKilled(false);
-           break;
-        }
+      targetHasChanged = true;
+      switch (ipaky2[i]) {
+        case 10:
+          vec[i3]->SetDefinition(aKaonPlus);
+          vec[i3]->SetMayBeKilled(false);
+          break;
+        case 11:
+          vec[i3]->SetDefinition(aKaonZS);
+          vec[i3]->SetMayBeKilled(false);
+          break;
+        case 12:
+          vec[i3]->SetDefinition(aKaonZL);
+          vec[i3]->SetMayBeKilled(false);
+          break;
       }
-    }
-    else if( ran < avy )
+    } else  // (currentMass >= protonMass) && (G4UniformRand() >= 0.5)
     {
-      if( availableEnergy < 1.6 )return;
-      
-      const G4double ky[] = { 0.200, 0.300, 0.400, 0.550, 0.625, 0.700,
-                              0.800, 0.850, 0.900, 0.950, 0.975, 1.000 };
-      const G4int ipaky1[] = { 18, 18, 18, 20, 20, 20, 21, 21, 21, 22, 22, 22 };
-      const G4int ipaky2[] = { 10, 11, 12, 10, 11, 12, 10, 11, 12, 10, 11, 12 };
-      const G4int ipakyb1[] = { 19, 19, 19, 23, 23, 23, 24, 24, 24, 25, 25, 25 };
-      const G4int ipakyb2[] = { 13, 12, 11, 13, 12, 11, 13, 12, 11, 13, 12, 11 };
-      ran = G4UniformRand();
-      i = 0;
-      while( (i<12) && (ran>ky[i]) )++i;
-      if( i == 12 )return;
-      if( (currentMass<protonMass) || (G4UniformRand()<0.5) )
-      {
-        // ipaky[] = { 18,10, 18,11, 18,12, 20,10, 20,11, 20,12,
-        //             0  +   0  0   0  0   +  +   +  0   +  0
-        //
-        //             21,10, 21,11, 21,12, 22,10, 22,11, 22,12 }
-        //             0  +   0  0   0  0   -  +   -  0   -  0
-        switch( ipaky1[i] )
-        {
-         case 18:
-           targetParticle.SetDefinition( aLambda );
-           break;
-         case 20:
-           targetParticle.SetDefinition( aSigmaPlus );
-           break;
-         case 21:
-           targetParticle.SetDefinition( aSigmaZero );
-           break;
-         case 22:
-           targetParticle.SetDefinition( aSigmaMinus );
-           break;
+      if ((currentParticle.GetDefinition() == anAntiProton) || (currentParticle.GetDefinition() == anAntiNeutron) ||
+          (currentParticle.GetDefinition() == anAntiLambda) || (currentMass > sigmaMinusMass)) {
+        switch (ipakyb1[i]) {
+          case 19:
+            currentParticle.SetDefinitionAndUpdateE(anAntiLambda);
+            break;
+          case 23:
+            currentParticle.SetDefinitionAndUpdateE(anAntiSigmaPlus);
+            break;
+          case 24:
+            currentParticle.SetDefinitionAndUpdateE(anAntiSigmaZero);
+            break;
+          case 25:
+            currentParticle.SetDefinitionAndUpdateE(anAntiSigmaMinus);
+            break;
         }
-        targetHasChanged = true;
-        switch( ipaky2[i] )
-        {
-         case 10:
-           vec[i3]->SetDefinition( aKaonPlus ); 
-	   vec[i3]->SetMayBeKilled(false);
-           break;
-         case 11:
-           vec[i3]->SetDefinition( aKaonZS );
-	   vec[i3]->SetMayBeKilled(false);
-           break;
-         case 12:
-           vec[i3]->SetDefinition( aKaonZL );
-	   vec[i3]->SetMayBeKilled(false);
-           break;
+        incidentHasChanged = true;
+        switch (ipakyb2[i]) {
+          case 11:
+            vec[i3]->SetDefinition(aKaonZS);
+            vec[i3]->SetMayBeKilled(false);
+            break;
+          case 12:
+            vec[i3]->SetDefinition(aKaonZL);
+            vec[i3]->SetMayBeKilled(false);
+            break;
+          case 13:
+            vec[i3]->SetDefinition(aKaonMinus);
+            vec[i3]->SetMayBeKilled(false);
+            break;
         }
-      }
-      else  // (currentMass >= protonMass) && (G4UniformRand() >= 0.5)
-      {
-        if( (currentParticle.GetDefinition() == anAntiProton) ||
-            (currentParticle.GetDefinition() == anAntiNeutron) ||
-            (currentParticle.GetDefinition() == anAntiLambda) ||
-            (currentMass > sigmaMinusMass) )
-        {
-          switch( ipakyb1[i] )
-          {
-           case 19:
-             currentParticle.SetDefinitionAndUpdateE( anAntiLambda );
-             break;
-           case 23:
-             currentParticle.SetDefinitionAndUpdateE( anAntiSigmaPlus );
-             break;
-           case 24:
-             currentParticle.SetDefinitionAndUpdateE( anAntiSigmaZero );
-             break;
-           case 25:
-             currentParticle.SetDefinitionAndUpdateE( anAntiSigmaMinus );
-             break;
-          }
-          incidentHasChanged = true;
-          switch( ipakyb2[i] )
-          {
-           case 11:
-             vec[i3]->SetDefinition( aKaonZS ); 
-	     vec[i3]->SetMayBeKilled(false);
-             break;
-           case 12:
-             vec[i3]->SetDefinition( aKaonZL );
-	     vec[i3]->SetMayBeKilled(false);
-             break;
-           case 13:
-             vec[i3]->SetDefinition( aKaonMinus );
-	     vec[i3]->SetMayBeKilled(false);
-             break;
-          }
+      } else {
+        switch (ipaky1[i]) {
+          case 18:
+            currentParticle.SetDefinitionAndUpdateE(aLambda);
+            break;
+          case 20:
+            currentParticle.SetDefinitionAndUpdateE(aSigmaPlus);
+            break;
+          case 21:
+            currentParticle.SetDefinitionAndUpdateE(aSigmaZero);
+            break;
+          case 22:
+            currentParticle.SetDefinitionAndUpdateE(aSigmaMinus);
+            break;
         }
-        else
-        {
-          switch( ipaky1[i] )
-          {
-           case 18:
-             currentParticle.SetDefinitionAndUpdateE( aLambda );
-             break;
-           case 20:
-             currentParticle.SetDefinitionAndUpdateE( aSigmaPlus );
-             break;
-           case 21:
-             currentParticle.SetDefinitionAndUpdateE( aSigmaZero );
-             break;
-           case 22:
-             currentParticle.SetDefinitionAndUpdateE( aSigmaMinus );
-             break;
-          }
-          incidentHasChanged = true;
-          switch( ipaky2[i] )
-          {
-           case 10:
-             vec[i3]->SetDefinition( aKaonPlus ); 
-	     vec[i3]->SetMayBeKilled(false);
-             break;
-           case 11:
-             vec[i3]->SetDefinition( aKaonZS );
-	     vec[i3]->SetMayBeKilled(false);
-             break;
-           case 12:
-             vec[i3]->SetDefinition( aKaonZL );
-	     vec[i3]->SetMayBeKilled(false);
-             break;
-          }
+        incidentHasChanged = true;
+        switch (ipaky2[i]) {
+          case 10:
+            vec[i3]->SetDefinition(aKaonPlus);
+            vec[i3]->SetMayBeKilled(false);
+            break;
+          case 11:
+            vec[i3]->SetDefinition(aKaonZS);
+            vec[i3]->SetMayBeKilled(false);
+            break;
+          case 12:
+            vec[i3]->SetDefinition(aKaonZL);
+            vec[i3]->SetMayBeKilled(false);
+            break;
         }
       }
     }
-    else return;
-    //
-    //  check the available energy
-    //   if there is not enough energy for kkb/ky pair production
-    //   then reduce the number of secondary particles 
-    //  NOTE:
-    //        the number of secondaries may have been changed
-    //        the incident and/or target particles may have changed
-    //        charge conservation is ignored (as well as strangness conservation)
-    //
-    currentMass = currentParticle.GetMass()/GeV;
-    targetMass = targetParticle.GetMass()/GeV;
-    
-    G4double energyCheck = centerofmassEnergy-(currentMass+targetMass);
-    for( i=0; i<vecLen; ++i )
-    {
-      energyCheck -= vec[i]->GetMass()/GeV;
-      if( energyCheck < 0.0 )      // chop off the secondary List
-      {
-        vecLen = std::max( 0, --i ); // looks like a memory leak @@@@@@@@@@@@
-	G4int j;
-	for(j=i; j<vecLen; j++) delete vec[j];
-        break;
-      }
-    }
+  } else
     return;
-  }
+  //
+  //  check the available energy
+  //   if there is not enough energy for kkb/ky pair production
+  //   then reduce the number of secondary particles
+  //  NOTE:
+  //        the number of secondaries may have been changed
+  //        the incident and/or target particles may have changed
+  //        charge conservation is ignored (as well as strangness conservation)
+  //
+  currentMass = currentParticle.GetMass() / GeV;
+  targetMass = targetParticle.GetMass() / GeV;
 
- void
-  FullModelReactionDynamics::NuclearReaction(
-   G4FastVector<G4ReactionProduct,4> &vec,
-   G4int &vecLen,
-   const G4HadProjectile *originalIncident,
-   const G4Nucleus &targetNucleus,
-   const G4double theAtomicMass,
-   const G4double *mass )
-  {
-    // derived from original FORTRAN code NUCREC by H. Fesefeldt (12-Feb-1987)
-    //
-    // Nuclear reaction kinematics at low energies
-    //
-    G4ParticleDefinition *aGamma = G4Gamma::Gamma();
-    G4ParticleDefinition *aProton = G4Proton::Proton();
-    G4ParticleDefinition *aNeutron = G4Neutron::Neutron();
-    G4ParticleDefinition *aDeuteron = G4Deuteron::Deuteron();
-    G4ParticleDefinition *aTriton = G4Triton::Triton();
-    G4ParticleDefinition *anAlpha = G4Alpha::Alpha();
-    
-    const G4double aProtonMass = aProton->GetPDGMass()/MeV;
-    const G4double aNeutronMass = aNeutron->GetPDGMass()/MeV;
-    const G4double aDeuteronMass = aDeuteron->GetPDGMass()/MeV;
-    const G4double aTritonMass = aTriton->GetPDGMass()/MeV;
-    const G4double anAlphaMass = anAlpha->GetPDGMass()/MeV;
-
-    G4ReactionProduct currentParticle;
-    currentParticle = *originalIncident;
-    //
-    // Set beam particle, take kinetic energy of current particle as the
-    // fundamental quantity.  Due to the difficult kinematic, all masses have to
-    // be assigned the best measured values
-    //
-    G4double p = currentParticle.GetTotalMomentum();
-    G4double pp = currentParticle.GetMomentum().mag();
-    if( pp <= 0.001*MeV )
+  G4double energyCheck = centerofmassEnergy - (currentMass + targetMass);
+  for (i = 0; i < vecLen; ++i) {
+    energyCheck -= vec[i]->GetMass() / GeV;
+    if (energyCheck < 0.0)  // chop off the secondary List
     {
-      G4double phinve = twopi*G4UniformRand();
-      G4double rthnve = std::acos( std::max( -1.0, std::min( 1.0, -1.0 + 2.0*G4UniformRand() ) ) );
-      currentParticle.SetMomentum( p*std::sin(rthnve)*std::cos(phinve),
-                                   p*std::sin(rthnve)*std::sin(phinve),
-                                   p*std::cos(rthnve) );
+      vecLen = std::max(0, --i);  // looks like a memory leak @@@@@@@@@@@@
+      G4int j;
+      for (j = i; j < vecLen; j++)
+        delete vec[j];
+      break;
     }
-    else
-      currentParticle.SetMomentum( currentParticle.GetMomentum() * (p/pp) );
-    //
-    // calculate Q-value of reactions
-    //
-    G4double currentKinetic = currentParticle.GetKineticEnergy()/MeV;
-    G4double currentMass = currentParticle.GetDefinition()->GetPDGMass()/MeV;
-    G4double qv = currentKinetic + theAtomicMass + currentMass;
-    
-    G4double qval[9];
-    qval[0] = qv - mass[0];
-    qval[1] = qv - mass[1] - aNeutronMass;
-    qval[2] = qv - mass[2] - aProtonMass;
-    qval[3] = qv - mass[3] - aDeuteronMass;
-    qval[4] = qv - mass[4] - aTritonMass;
-    qval[5] = qv - mass[5] - anAlphaMass;
-    qval[6] = qv - mass[6] - aNeutronMass - aNeutronMass;
-    qval[7] = qv - mass[7] - aNeutronMass - aProtonMass;
-    qval[8] = qv - mass[8] - aProtonMass  - aProtonMass;
-    
-    if( currentParticle.GetDefinition() == aNeutron )
-    {
-      const G4double A = targetNucleus.GetN_asInt();    // atomic weight
-      if( G4UniformRand() > ((A-1.0)/230.0)*((A-1.0)/230.0) )
-        qval[0] = 0.0;
-      if( G4UniformRand() >= currentKinetic/7.9254*A )
-        qval[2] = qval[3] = qval[4] = qval[5] = qval[8] = 0.0;
-    }
-    else
+  }
+  return;
+}
+
+void FullModelReactionDynamics::NuclearReaction(G4FastVector<G4ReactionProduct, 4> &vec,
+                                                G4int &vecLen,
+                                                const G4HadProjectile *originalIncident,
+                                                const G4Nucleus &targetNucleus,
+                                                const G4double theAtomicMass,
+                                                const G4double *mass) {
+  // derived from original FORTRAN code NUCREC by H. Fesefeldt (12-Feb-1987)
+  //
+  // Nuclear reaction kinematics at low energies
+  //
+  G4ParticleDefinition *aGamma = G4Gamma::Gamma();
+  G4ParticleDefinition *aProton = G4Proton::Proton();
+  G4ParticleDefinition *aNeutron = G4Neutron::Neutron();
+  G4ParticleDefinition *aDeuteron = G4Deuteron::Deuteron();
+  G4ParticleDefinition *aTriton = G4Triton::Triton();
+  G4ParticleDefinition *anAlpha = G4Alpha::Alpha();
+
+  const G4double aProtonMass = aProton->GetPDGMass() / MeV;
+  const G4double aNeutronMass = aNeutron->GetPDGMass() / MeV;
+  const G4double aDeuteronMass = aDeuteron->GetPDGMass() / MeV;
+  const G4double aTritonMass = aTriton->GetPDGMass() / MeV;
+  const G4double anAlphaMass = anAlpha->GetPDGMass() / MeV;
+
+  G4ReactionProduct currentParticle;
+  currentParticle = *originalIncident;
+  //
+  // Set beam particle, take kinetic energy of current particle as the
+  // fundamental quantity.  Due to the difficult kinematic, all masses have to
+  // be assigned the best measured values
+  //
+  G4double p = currentParticle.GetTotalMomentum();
+  G4double pp = currentParticle.GetMomentum().mag();
+  if (pp <= 0.001 * MeV) {
+    G4double phinve = twopi * G4UniformRand();
+    G4double rthnve = std::acos(std::max(-1.0, std::min(1.0, -1.0 + 2.0 * G4UniformRand())));
+    currentParticle.SetMomentum(
+        p * std::sin(rthnve) * std::cos(phinve), p * std::sin(rthnve) * std::sin(phinve), p * std::cos(rthnve));
+  } else
+    currentParticle.SetMomentum(currentParticle.GetMomentum() * (p / pp));
+  //
+  // calculate Q-value of reactions
+  //
+  G4double currentKinetic = currentParticle.GetKineticEnergy() / MeV;
+  G4double currentMass = currentParticle.GetDefinition()->GetPDGMass() / MeV;
+  G4double qv = currentKinetic + theAtomicMass + currentMass;
+
+  G4double qval[9];
+  qval[0] = qv - mass[0];
+  qval[1] = qv - mass[1] - aNeutronMass;
+  qval[2] = qv - mass[2] - aProtonMass;
+  qval[3] = qv - mass[3] - aDeuteronMass;
+  qval[4] = qv - mass[4] - aTritonMass;
+  qval[5] = qv - mass[5] - anAlphaMass;
+  qval[6] = qv - mass[6] - aNeutronMass - aNeutronMass;
+  qval[7] = qv - mass[7] - aNeutronMass - aProtonMass;
+  qval[8] = qv - mass[8] - aProtonMass - aProtonMass;
+
+  if (currentParticle.GetDefinition() == aNeutron) {
+    const G4double A = targetNucleus.GetN_asInt();  // atomic weight
+    if (G4UniformRand() > ((A - 1.0) / 230.0) * ((A - 1.0) / 230.0))
       qval[0] = 0.0;
-    
-    G4int i;
-    qv = 0.0;
-    for( i=0; i<9; ++i )
-    {
-      if( mass[i] < 500.0*MeV )qval[i] = 0.0;
-      if( qval[i] < 0.0 )qval[i] = 0.0;
-      qv += qval[i];
-    }
-    G4double qv1 = 0.0;
-    G4double ran = G4UniformRand();
-    G4int index;
-    for( index=0; index<9; ++index )
-    {
-      if( qval[index] > 0.0 )
-      {
-        qv1 += qval[index]/qv;
-        if( ran <= qv1 )break;
-      }
-    }
-    if( index == 9 )  // loop continued to the end
-    {
-      throw G4HadronicException(__FILE__, __LINE__,
-           "FullModelReactionDynamics::NuclearReaction: inelastic reaction kinematically not possible");
-    }
-    G4double ke = currentParticle.GetKineticEnergy()/GeV;
-    G4int nt = 2;
-    if( (index>=6) || (G4UniformRand()<std::min(0.5,ke*10.0)) )nt = 3;
-    
-    G4ReactionProduct **v = new G4ReactionProduct * [3];
-    v[0] =  new G4ReactionProduct;
-    v[1] =  new G4ReactionProduct;
-    v[2] =  new G4ReactionProduct;
-    
-    v[0]->SetMass( mass[index]*MeV );
-    switch( index )
-    {
-     case 0:
-       v[1]->SetDefinition( aGamma );
-       v[2]->SetDefinition( aGamma );
-       break;
-     case 1:
-       v[1]->SetDefinition( aNeutron );
-       v[2]->SetDefinition( aGamma );
-       break;
-     case 2:
-       v[1]->SetDefinition( aProton );
-       v[2]->SetDefinition( aGamma );
-       break;
-     case 3:
-       v[1]->SetDefinition( aDeuteron );
-       v[2]->SetDefinition( aGamma );
-       break;
-     case 4:
-       v[1]->SetDefinition( aTriton );
-       v[2]->SetDefinition( aGamma );
-       break;
-     case 5:
-       v[1]->SetDefinition( anAlpha );
-       v[2]->SetDefinition( aGamma );
-       break;
-     case 6:
-       v[1]->SetDefinition( aNeutron );
-       v[2]->SetDefinition( aNeutron );
-       break;
-     case 7:
-       v[1]->SetDefinition( aNeutron );
-       v[2]->SetDefinition( aProton );
-       break;
-     case 8:
-       v[1]->SetDefinition( aProton );
-       v[2]->SetDefinition( aProton );
-       break;
-    }
-    //
-    // calculate centre of mass energy
-    //
-    G4ReactionProduct pseudo1;
-    pseudo1.SetMass( theAtomicMass*MeV );
-    pseudo1.SetTotalEnergy( theAtomicMass*MeV );
-    G4ReactionProduct pseudo2 = currentParticle + pseudo1;
-    pseudo2.SetMomentum( pseudo2.GetMomentum() * (-1.0) );
-    //
-    // use phase space routine in centre of mass system
-    //
-    G4FastVector<G4ReactionProduct,MYGHADLISTSIZE> tempV;
-    tempV.Initialize( nt );
-    G4int tempLen = 0;
-    tempV.SetElement( tempLen++, v[0] );
-    tempV.SetElement( tempLen++, v[1] );
-    if( nt == 3 )tempV.SetElement( tempLen++, v[2] );
-    G4bool constantCrossSection = true;
-    GenerateNBodyEvent( pseudo2.GetMass()/MeV, constantCrossSection, tempV, tempLen );
-    v[0]->Lorentz( *v[0], pseudo2 );
-    v[1]->Lorentz( *v[1], pseudo2 );
-    if( nt == 3 )v[2]->Lorentz( *v[2], pseudo2 );
-    
-    G4bool particleIsDefined = false;
-    if( v[0]->GetMass()/MeV - aProtonMass < 0.1 )
-    {
-      v[0]->SetDefinition( aProton );
-      particleIsDefined = true;
-    }
-    else if( v[0]->GetMass()/MeV - aNeutronMass < 0.1 )
-    {
-      v[0]->SetDefinition( aNeutron );
-      particleIsDefined = true;
-    }
-    else if( v[0]->GetMass()/MeV - aDeuteronMass < 0.1 )
-    {
-      v[0]->SetDefinition( aDeuteron );
-      particleIsDefined = true;
-    }
-    else if( v[0]->GetMass()/MeV - aTritonMass < 0.1 )
-    {
-      v[0]->SetDefinition( aTriton );
-      particleIsDefined = true;
-    }
-    else if( v[0]->GetMass()/MeV - anAlphaMass < 0.1 )
-    {
-      v[0]->SetDefinition( anAlpha );
-      particleIsDefined = true;
-    }
-    currentParticle.SetKineticEnergy(
-     std::max( 0.001, currentParticle.GetKineticEnergy()/MeV ) );
-    p = currentParticle.GetTotalMomentum();
-    pp = currentParticle.GetMomentum().mag();
-    if( pp <= 0.001*MeV )
-    {
-      G4double phinve = twopi*G4UniformRand();
-      G4double rthnve = std::acos( std::max( -1.0, std::min( 1.0, -1.0 + 2.0*G4UniformRand() ) ) );
-      currentParticle.SetMomentum( p*std::sin(rthnve)*std::cos(phinve),
-                                   p*std::sin(rthnve)*std::sin(phinve),
-                                   p*std::cos(rthnve) );
-    }
-    else
-      currentParticle.SetMomentum( currentParticle.GetMomentum() * (p/pp) );
-    
-    if( particleIsDefined )
-    {
-      v[0]->SetKineticEnergy(
-       std::max( 0.001, 0.5*G4UniformRand()*v[0]->GetKineticEnergy()/MeV ) );
-      p = v[0]->GetTotalMomentum();
-      pp = v[0]->GetMomentum().mag();
-      if( pp <= 0.001*MeV )
-      {
-        G4double phinve = twopi*G4UniformRand();
-        G4double rthnve = std::acos( std::max(-1.0,std::min(1.0,-1.0+2.0*G4UniformRand())) );
-        v[0]->SetMomentum( p*std::sin(rthnve)*std::cos(phinve),
-                          p*std::sin(rthnve)*std::sin(phinve),
-                          p*std::cos(rthnve) );
-      }
-      else
-        v[0]->SetMomentum( v[0]->GetMomentum() * (p/pp) );
-    }
-    if( (v[1]->GetDefinition() == aDeuteron) ||
-        (v[1]->GetDefinition() == aTriton)   ||
-        (v[1]->GetDefinition() == anAlpha) ) 
-      v[1]->SetKineticEnergy(
-       std::max( 0.001, 0.5*G4UniformRand()*v[1]->GetKineticEnergy()/MeV ) );
-    else
-      v[1]->SetKineticEnergy( std::max( 0.001, v[1]->GetKineticEnergy()/MeV ) );
-    
-    p = v[1]->GetTotalMomentum();
-    pp = v[1]->GetMomentum().mag();
-    if( pp <= 0.001*MeV )
-    {
-      G4double phinve = twopi*G4UniformRand();
-      G4double rthnve = std::acos( std::max(-1.0,std::min(1.0,-1.0+2.0*G4UniformRand())) );
-      v[1]->SetMomentum( p*std::sin(rthnve)*std::cos(phinve),
-                        p*std::sin(rthnve)*std::sin(phinve),
-                        p*std::cos(rthnve) );
-    }
-    else
-      v[1]->SetMomentum( v[1]->GetMomentum() * (p/pp) );
-    
-    if( nt == 3 )
-    {
-      if( (v[2]->GetDefinition() == aDeuteron) ||
-          (v[2]->GetDefinition() == aTriton)   ||
-          (v[2]->GetDefinition() == anAlpha) ) 
-        v[2]->SetKineticEnergy(
-         std::max( 0.001, 0.5*G4UniformRand()*v[2]->GetKineticEnergy()/MeV ) );
-      else
-        v[2]->SetKineticEnergy( std::max( 0.001, v[2]->GetKineticEnergy()/MeV ) );
-      
-      p = v[2]->GetTotalMomentum();
-      pp = v[2]->GetMomentum().mag();
-      if( pp <= 0.001*MeV )
-      {
-        G4double phinve = twopi*G4UniformRand();
-        G4double rthnve = std::acos( std::max(-1.0,std::min(1.0,-1.0+2.0*G4UniformRand())) );
-        v[2]->SetMomentum( p*std::sin(rthnve)*std::cos(phinve),
-                          p*std::sin(rthnve)*std::sin(phinve),
-                          p*std::cos(rthnve) );
-      }
-      else
-        v[2]->SetMomentum( v[2]->GetMomentum() * (p/pp) );
-    }
-    G4int del;
-    for(del=0; del<vecLen; del++) delete vec[del];
-    vecLen = 0;
-    if( particleIsDefined )
-    {
-      vec.SetElement( vecLen++, v[0] );
-    }
-    else
-    {
-      delete v[0];
-    }
-    vec.SetElement( vecLen++, v[1] );
-    if( nt == 3 )
-    {
-      vec.SetElement( vecLen++, v[2] );
+    if (G4UniformRand() >= currentKinetic / 7.9254 * A)
+      qval[2] = qval[3] = qval[4] = qval[5] = qval[8] = 0.0;
+  } else
+    qval[0] = 0.0;
+
+  G4int i;
+  qv = 0.0;
+  for (i = 0; i < 9; ++i) {
+    if (mass[i] < 500.0 * MeV)
+      qval[i] = 0.0;
+    if (qval[i] < 0.0)
+      qval[i] = 0.0;
+    qv += qval[i];
+  }
+  G4double qv1 = 0.0;
+  G4double ran = G4UniformRand();
+  G4int index;
+  for (index = 0; index < 9; ++index) {
+    if (qval[index] > 0.0) {
+      qv1 += qval[index] / qv;
+      if (ran <= qv1)
+        break;
     }
+  }
+  if (index == 9)  // loop continued to the end
+  {
+    throw G4HadronicException(
+        __FILE__,
+        __LINE__,
+        "FullModelReactionDynamics::NuclearReaction: inelastic reaction kinematically not possible");
+  }
+  G4double ke = currentParticle.GetKineticEnergy() / GeV;
+  G4int nt = 2;
+  if ((index >= 6) || (G4UniformRand() < std::min(0.5, ke * 10.0)))
+    nt = 3;
+
+  G4ReactionProduct **v = new G4ReactionProduct *[3];
+  v[0] = new G4ReactionProduct;
+  v[1] = new G4ReactionProduct;
+  v[2] = new G4ReactionProduct;
+
+  v[0]->SetMass(mass[index] * MeV);
+  switch (index) {
+    case 0:
+      v[1]->SetDefinition(aGamma);
+      v[2]->SetDefinition(aGamma);
+      break;
+    case 1:
+      v[1]->SetDefinition(aNeutron);
+      v[2]->SetDefinition(aGamma);
+      break;
+    case 2:
+      v[1]->SetDefinition(aProton);
+      v[2]->SetDefinition(aGamma);
+      break;
+    case 3:
+      v[1]->SetDefinition(aDeuteron);
+      v[2]->SetDefinition(aGamma);
+      break;
+    case 4:
+      v[1]->SetDefinition(aTriton);
+      v[2]->SetDefinition(aGamma);
+      break;
+    case 5:
+      v[1]->SetDefinition(anAlpha);
+      v[2]->SetDefinition(aGamma);
+      break;
+    case 6:
+      v[1]->SetDefinition(aNeutron);
+      v[2]->SetDefinition(aNeutron);
+      break;
+    case 7:
+      v[1]->SetDefinition(aNeutron);
+      v[2]->SetDefinition(aProton);
+      break;
+    case 8:
+      v[1]->SetDefinition(aProton);
+      v[2]->SetDefinition(aProton);
+      break;
+  }
+  //
+  // calculate centre of mass energy
+  //
+  G4ReactionProduct pseudo1;
+  pseudo1.SetMass(theAtomicMass * MeV);
+  pseudo1.SetTotalEnergy(theAtomicMass * MeV);
+  G4ReactionProduct pseudo2 = currentParticle + pseudo1;
+  pseudo2.SetMomentum(pseudo2.GetMomentum() * (-1.0));
+  //
+  // use phase space routine in centre of mass system
+  //
+  G4FastVector<G4ReactionProduct, MYGHADLISTSIZE> tempV;
+  tempV.Initialize(nt);
+  G4int tempLen = 0;
+  tempV.SetElement(tempLen++, v[0]);
+  tempV.SetElement(tempLen++, v[1]);
+  if (nt == 3)
+    tempV.SetElement(tempLen++, v[2]);
+  G4bool constantCrossSection = true;
+  GenerateNBodyEvent(pseudo2.GetMass() / MeV, constantCrossSection, tempV, tempLen);
+  v[0]->Lorentz(*v[0], pseudo2);
+  v[1]->Lorentz(*v[1], pseudo2);
+  if (nt == 3)
+    v[2]->Lorentz(*v[2], pseudo2);
+
+  G4bool particleIsDefined = false;
+  if (v[0]->GetMass() / MeV - aProtonMass < 0.1) {
+    v[0]->SetDefinition(aProton);
+    particleIsDefined = true;
+  } else if (v[0]->GetMass() / MeV - aNeutronMass < 0.1) {
+    v[0]->SetDefinition(aNeutron);
+    particleIsDefined = true;
+  } else if (v[0]->GetMass() / MeV - aDeuteronMass < 0.1) {
+    v[0]->SetDefinition(aDeuteron);
+    particleIsDefined = true;
+  } else if (v[0]->GetMass() / MeV - aTritonMass < 0.1) {
+    v[0]->SetDefinition(aTriton);
+    particleIsDefined = true;
+  } else if (v[0]->GetMass() / MeV - anAlphaMass < 0.1) {
+    v[0]->SetDefinition(anAlpha);
+    particleIsDefined = true;
+  }
+  currentParticle.SetKineticEnergy(std::max(0.001, currentParticle.GetKineticEnergy() / MeV));
+  p = currentParticle.GetTotalMomentum();
+  pp = currentParticle.GetMomentum().mag();
+  if (pp <= 0.001 * MeV) {
+    G4double phinve = twopi * G4UniformRand();
+    G4double rthnve = std::acos(std::max(-1.0, std::min(1.0, -1.0 + 2.0 * G4UniformRand())));
+    currentParticle.SetMomentum(
+        p * std::sin(rthnve) * std::cos(phinve), p * std::sin(rthnve) * std::sin(phinve), p * std::cos(rthnve));
+  } else
+    currentParticle.SetMomentum(currentParticle.GetMomentum() * (p / pp));
+
+  if (particleIsDefined) {
+    v[0]->SetKineticEnergy(std::max(0.001, 0.5 * G4UniformRand() * v[0]->GetKineticEnergy() / MeV));
+    p = v[0]->GetTotalMomentum();
+    pp = v[0]->GetMomentum().mag();
+    if (pp <= 0.001 * MeV) {
+      G4double phinve = twopi * G4UniformRand();
+      G4double rthnve = std::acos(std::max(-1.0, std::min(1.0, -1.0 + 2.0 * G4UniformRand())));
+      v[0]->SetMomentum(
+          p * std::sin(rthnve) * std::cos(phinve), p * std::sin(rthnve) * std::sin(phinve), p * std::cos(rthnve));
+    } else
+      v[0]->SetMomentum(v[0]->GetMomentum() * (p / pp));
+  }
+  if ((v[1]->GetDefinition() == aDeuteron) || (v[1]->GetDefinition() == aTriton) || (v[1]->GetDefinition() == anAlpha))
+    v[1]->SetKineticEnergy(std::max(0.001, 0.5 * G4UniformRand() * v[1]->GetKineticEnergy() / MeV));
+  else
+    v[1]->SetKineticEnergy(std::max(0.001, v[1]->GetKineticEnergy() / MeV));
+
+  p = v[1]->GetTotalMomentum();
+  pp = v[1]->GetMomentum().mag();
+  if (pp <= 0.001 * MeV) {
+    G4double phinve = twopi * G4UniformRand();
+    G4double rthnve = std::acos(std::max(-1.0, std::min(1.0, -1.0 + 2.0 * G4UniformRand())));
+    v[1]->SetMomentum(
+        p * std::sin(rthnve) * std::cos(phinve), p * std::sin(rthnve) * std::sin(phinve), p * std::cos(rthnve));
+  } else
+    v[1]->SetMomentum(v[1]->GetMomentum() * (p / pp));
+
+  if (nt == 3) {
+    if ((v[2]->GetDefinition() == aDeuteron) || (v[2]->GetDefinition() == aTriton) ||
+        (v[2]->GetDefinition() == anAlpha))
+      v[2]->SetKineticEnergy(std::max(0.001, 0.5 * G4UniformRand() * v[2]->GetKineticEnergy() / MeV));
     else
-    {
-      delete v[2];
-    }
-    delete [] v;
-    return;
+      v[2]->SetKineticEnergy(std::max(0.001, v[2]->GetKineticEnergy() / MeV));
+
+    p = v[2]->GetTotalMomentum();
+    pp = v[2]->GetMomentum().mag();
+    if (pp <= 0.001 * MeV) {
+      G4double phinve = twopi * G4UniformRand();
+      G4double rthnve = std::acos(std::max(-1.0, std::min(1.0, -1.0 + 2.0 * G4UniformRand())));
+      v[2]->SetMomentum(
+          p * std::sin(rthnve) * std::cos(phinve), p * std::sin(rthnve) * std::sin(phinve), p * std::cos(rthnve));
+    } else
+      v[2]->SetMomentum(v[2]->GetMomentum() * (p / pp));
   }
- 
- /* end of file */
- 
+  G4int del;
+  for (del = 0; del < vecLen; del++)
+    delete vec[del];
+  vecLen = 0;
+  if (particleIsDefined) {
+    vec.SetElement(vecLen++, v[0]);
+  } else {
+    delete v[0];
+  }
+  vec.SetElement(vecLen++, v[1]);
+  if (nt == 3) {
+    vec.SetElement(vecLen++, v[2]);
+  } else {
+    delete v[2];
+  }
+  delete[] v;
+  return;
+}
+
+/* end of file */
diff --git a/SimG4Core/CustomPhysics/src/G4ProcessHelper.cc b/SimG4Core/CustomPhysics/src/G4ProcessHelper.cc
index 38036f125ba14..663cfdcd69811 100644
--- a/SimG4Core/CustomPhysics/src/G4ProcessHelper.cc
+++ b/SimG4Core/CustomPhysics/src/G4ProcessHelper.cc
@@ -7,191 +7,184 @@
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include"G4ParticleTable.hh" 
+#include "G4ParticleTable.hh"
 #include "Randomize.hh"
 
-#include<iostream>
-#include<fstream>
+#include <iostream>
+#include <fstream>
 #include <string>
 
 using namespace CLHEP;
 
-G4ProcessHelper::G4ProcessHelper(const edm::ParameterSet & p, 
-                                 CustomParticleFactory* ptr) {
+G4ProcessHelper::G4ProcessHelper(const edm::ParameterSet& p, CustomParticleFactory* ptr) {
   fParticleFactory = ptr;
 
   particleTable = G4ParticleTable::GetParticleTable();
 
   theProton = particleTable->FindParticle("proton");
   theNeutron = particleTable->FindParticle("neutron");
-  
+
   G4String line;
 
   edm::FileInPath fp = p.getParameter<edm::FileInPath>("processesDef");
   std::string processDefFilePath = fp.fullPath();
-  std::ifstream process_stream (processDefFilePath.c_str());
+  std::ifstream process_stream(processDefFilePath.c_str());
 
   resonant = p.getParameter<bool>("resonant");
-  ek_0 = p.getParameter<double>("resonanceEnergy")*GeV;
-  gamma = p.getParameter<double>("gamma")*GeV;
-  amplitude = p.getParameter<double>("amplitude")*millibarn;
+  ek_0 = p.getParameter<double>("resonanceEnergy") * GeV;
+  gamma = p.getParameter<double>("gamma") * GeV;
+  amplitude = p.getParameter<double>("amplitude") * millibarn;
   suppressionfactor = p.getParameter<double>("reggeSuppression");
   hadronlifetime = p.getParameter<double>("hadronLifeTime");
   reggemodel = p.getParameter<bool>("reggeModel");
   mixing = p.getParameter<double>("mixing");
-  
-  edm::LogInfo("SimG4CoreCustomPhysics")
-    <<"ProcessHelper: Read in physics parameters:"
-    <<"\n Resonant = "<< resonant 
-    <<"\n ResonanceEnergy = "<<ek_0/GeV<<" GeV"
-    <<"\n Gamma = "<<gamma/GeV<<" GeV"
-    <<"\n Amplitude = "<<amplitude/millibarn<<" millibarn"
-    <<"ReggeSuppression = "<<100*suppressionfactor<<" %"
-    <<"HadronLifeTime = "<<hadronlifetime<<" s"
-    <<"ReggeModel = "<< reggemodel 
-    <<"Mixing = "<< mixing*100 <<" %";
+
+  edm::LogInfo("SimG4CoreCustomPhysics") << "ProcessHelper: Read in physics parameters:"
+                                         << "\n Resonant = " << resonant << "\n ResonanceEnergy = " << ek_0 / GeV
+                                         << " GeV"
+                                         << "\n Gamma = " << gamma / GeV << " GeV"
+                                         << "\n Amplitude = " << amplitude / millibarn << " millibarn"
+                                         << "ReggeSuppression = " << 100 * suppressionfactor << " %"
+                                         << "HadronLifeTime = " << hadronlifetime << " s"
+                                         << "ReggeModel = " << reggemodel << "Mixing = " << mixing * 100 << " %";
 
   checkfraction = 0;
   n_22 = 0;
   n_23 = 0;
 
-  while(getline(process_stream,line)){
+  while (getline(process_stream, line)) {
     std::vector<G4String> tokens;
     //Getting a line
-    ReadAndParse(line,tokens,"#");
+    ReadAndParse(line, tokens, "#");
     //Important info
     G4String incident = tokens[0];
-    
+
     G4ParticleDefinition* incidentDef = particleTable->FindParticle(incident);
     //particleTable->DumpTable();
     G4int incidentPDG = incidentDef->GetPDGEncoding();
-    known_particles[incidentDef]=true;
+    known_particles[incidentDef] = true;
 
     G4String target = tokens[1];
-    edm::LogInfo("SimG4CoreCustomPhysics")
-      <<"ProcessHelper: Incident "<<incident
-      <<"; Target "<<target;
-    
+    edm::LogInfo("SimG4CoreCustomPhysics") << "ProcessHelper: Incident " << incident << "; Target " << target;
+
     // Making a ReactionProduct
     ReactionProduct prod;
-    for (size_t i = 2; i != tokens.size();i++){
+    for (size_t i = 2; i != tokens.size(); i++) {
       G4String part = tokens[i];
-      if (particleTable->contains(part))
-	{
-	  prod.push_back(particleTable->FindParticle(part)->GetPDGEncoding());
-	} else {
-	  G4Exception("G4ProcessHelper", "UnkownParticle", FatalException,
-		      "Initialization: The reaction product list contained an unknown particle");
-	}
-    }
-    if (target == "proton")
-      {
-	pReactionMap[incidentPDG].push_back(prod);
-      } else if (target == "neutron") {
-	nReactionMap[incidentPDG].push_back(prod);
+      if (particleTable->contains(part)) {
+        prod.push_back(particleTable->FindParticle(part)->GetPDGEncoding());
       } else {
-	G4Exception("G4ProcessHelper", "IllegalTarget", FatalException,
-		    "Initialization: The reaction product list contained an illegal target particle");
+        G4Exception("G4ProcessHelper",
+                    "UnkownParticle",
+                    FatalException,
+                    "Initialization: The reaction product list contained an unknown particle");
       }
-   }
+    }
+    if (target == "proton") {
+      pReactionMap[incidentPDG].push_back(prod);
+    } else if (target == "neutron") {
+      nReactionMap[incidentPDG].push_back(prod);
+    } else {
+      G4Exception("G4ProcessHelper",
+                  "IllegalTarget",
+                  FatalException,
+                  "Initialization: The reaction product list contained an illegal target particle");
+    }
+  }
 
   process_stream.close();
 
-  for(auto part : fParticleFactory->GetCustomParticles()) {
+  for (auto part : fParticleFactory->GetCustomParticles()) {
     CustomParticle* particle = dynamic_cast<CustomParticle*>(part);
-    if(particle) {
-      edm::LogInfo("SimG4CoreCustomPhysics")
-	<<"ProcessHelper: Lifetime of "<<part->GetParticleName()<<" set to "
-	<<particle->GetPDGLifeTime()/s<<" s;"
-	<<" isStable: "<<particle->GetPDGStable();
+    if (particle) {
+      edm::LogInfo("SimG4CoreCustomPhysics") << "ProcessHelper: Lifetime of " << part->GetParticleName() << " set to "
+                                             << particle->GetPDGLifeTime() / s << " s;"
+                                             << " isStable: " << particle->GetPDGStable();
     }
   }
 }
 
-G4ProcessHelper::~G4ProcessHelper(){
-}
+G4ProcessHelper::~G4ProcessHelper() {}
 
-G4bool G4ProcessHelper::ApplicabilityTester(const G4ParticleDefinition& aPart){
-  const G4ParticleDefinition* aP = &aPart; 
-  if (known_particles[aP]) return true;
+G4bool G4ProcessHelper::ApplicabilityTester(const G4ParticleDefinition& aPart) {
+  const G4ParticleDefinition* aP = &aPart;
+  if (known_particles[aP])
+    return true;
   return false;
 }
 
-G4double G4ProcessHelper::GetInclusiveCrossSection(const G4DynamicParticle *aParticle,
-						   const G4Element *anElement){
-
+G4double G4ProcessHelper::GetInclusiveCrossSection(const G4DynamicParticle* aParticle, const G4Element* anElement) {
   //We really do need a dedicated class to handle the cross sections. They might not always be constant
 
-
   //Disassemble the PDG-code
 
   G4int thePDGCode = aParticle->GetDefinition()->GetPDGEncoding();
-  double boost = (aParticle->GetKineticEnergy()+aParticle->GetMass())/aParticle->GetMass();
+  double boost = (aParticle->GetKineticEnergy() + aParticle->GetMass()) / aParticle->GetMass();
   //  G4cout<<"thePDGCode: "<<thePDGCode<<G4endl;
   G4double theXsec = 0;
   G4String name = aParticle->GetDefinition()->GetParticleName();
-  if(!reggemodel)
-  {
-  //Flat cross section
-  if(CustomPDGParser::s_isRGlueball(thePDGCode)) {
-    theXsec = 24 * millibarn;
-  } else {
-    std::vector<G4int> nq=CustomPDGParser::s_containedQuarks(thePDGCode);
-    //    edm::LogInfo("SimG4CoreCustomPhysics")<<"Number of quarks: "<<nq.size()<<G4endl;
-    for (std::vector<G4int>::iterator it = nq.begin();
-	 it != nq.end();
-	 it++)
-      {
-	//	  edm::LogInfo("SimG4CoreCustomPhysics")<<"Quarkvector: "<<*it<<G4endl;
-	if (*it == 1 || *it == 2) theXsec += 12 * millibarn;
-	if (*it == 3) theXsec += 6 * millibarn;
+  if (!reggemodel) {
+    //Flat cross section
+    if (CustomPDGParser::s_isRGlueball(thePDGCode)) {
+      theXsec = 24 * millibarn;
+    } else {
+      std::vector<G4int> nq = CustomPDGParser::s_containedQuarks(thePDGCode);
+      //    edm::LogInfo("SimG4CoreCustomPhysics")<<"Number of quarks: "<<nq.size()<<G4endl;
+      for (std::vector<G4int>::iterator it = nq.begin(); it != nq.end(); it++) {
+        //	  edm::LogInfo("SimG4CoreCustomPhysics")<<"Quarkvector: "<<*it<<G4endl;
+        if (*it == 1 || *it == 2)
+          theXsec += 12 * millibarn;
+        if (*it == 3)
+          theXsec += 6 * millibarn;
       }
-   }
-  } 
-  else 
-  {  //reggemodel
+    }
+  } else {  //reggemodel
     double R = Regge(boost);
     double P = Pom(boost);
-    if(thePDGCode>0)
-      {
-	if(CustomPDGParser::s_isMesonino(thePDGCode)) theXsec=(P+R)*millibarn;
-	if(CustomPDGParser::s_isSbaryon(thePDGCode)) theXsec=2*P*millibarn;
-	if(CustomPDGParser::s_isRMeson(thePDGCode)||CustomPDGParser::s_isRGlueball(thePDGCode)) theXsec=(R+2*P)*millibarn;
-	if(CustomPDGParser::s_isRBaryon(thePDGCode)) theXsec=3*P*millibarn;
-      }
-    else
-      {
-	if(CustomPDGParser::s_isMesonino(thePDGCode)) theXsec=P*millibarn;
-	if(CustomPDGParser::s_isSbaryon(thePDGCode)) theXsec=(2*(P+R)+30/sqrt(boost))*millibarn;
-	if(CustomPDGParser::s_isRMeson(thePDGCode)||CustomPDGParser::s_isRGlueball(thePDGCode)) theXsec=(R+2*P)*millibarn;
-	if(CustomPDGParser::s_isRBaryon(thePDGCode)) theXsec=3*P*millibarn;
-      }
+    if (thePDGCode > 0) {
+      if (CustomPDGParser::s_isMesonino(thePDGCode))
+        theXsec = (P + R) * millibarn;
+      if (CustomPDGParser::s_isSbaryon(thePDGCode))
+        theXsec = 2 * P * millibarn;
+      if (CustomPDGParser::s_isRMeson(thePDGCode) || CustomPDGParser::s_isRGlueball(thePDGCode))
+        theXsec = (R + 2 * P) * millibarn;
+      if (CustomPDGParser::s_isRBaryon(thePDGCode))
+        theXsec = 3 * P * millibarn;
+    } else {
+      if (CustomPDGParser::s_isMesonino(thePDGCode))
+        theXsec = P * millibarn;
+      if (CustomPDGParser::s_isSbaryon(thePDGCode))
+        theXsec = (2 * (P + R) + 30 / sqrt(boost)) * millibarn;
+      if (CustomPDGParser::s_isRMeson(thePDGCode) || CustomPDGParser::s_isRGlueball(thePDGCode))
+        theXsec = (R + 2 * P) * millibarn;
+      if (CustomPDGParser::s_isRBaryon(thePDGCode))
+        theXsec = 3 * P * millibarn;
+    }
   }
   //Adding resonance
-  if(resonant)
-    {
-      double e_0 = ek_0 + aParticle->GetDefinition()->GetPDGMass(); //Now total energy
-
-      e_0 = sqrt(aParticle->GetDefinition()->GetPDGMass()*aParticle->GetDefinition()->GetPDGMass()
-		 + theProton->GetPDGMass()*theProton->GetPDGMass()
-		 + 2.*e_0*theProton->GetPDGMass());
-      //      edm::LogInfo("SimG4CoreCustomPhysics")<<e_0/GeV<<G4endl;
-      //      edm::LogInfo("SimG4CoreCustomPhysics")<<ek_0/GeV<<" "<<aParticle->GetDefinition()->GetPDGMass()/GeV<<" "<<theProton->GetPDGMass()/GeV<<G4endl;
-      double sqrts=sqrt(aParticle->GetDefinition()->GetPDGMass()*aParticle->GetDefinition()->GetPDGMass()
-			+ theProton->GetPDGMass()*theProton->GetPDGMass() + 2*aParticle->GetTotalEnergy()*theProton->GetPDGMass());
-
-      double res_result = amplitude*(gamma*gamma/4.)/((sqrts-e_0)*(sqrts-e_0)+(gamma*gamma/4.));//Non-relativistic Breit Wigner
-
-      theXsec += res_result;
-      //      if(fabs(aParticle->GetKineticEnergy()/GeV-200)<10)  std::cout<<sqrts/GeV<<" "<<theXsec/millibarn<<std::endl;
-    }
+  if (resonant) {
+    double e_0 = ek_0 + aParticle->GetDefinition()->GetPDGMass();  //Now total energy
+
+    e_0 = sqrt(aParticle->GetDefinition()->GetPDGMass() * aParticle->GetDefinition()->GetPDGMass() +
+               theProton->GetPDGMass() * theProton->GetPDGMass() + 2. * e_0 * theProton->GetPDGMass());
+    //      edm::LogInfo("SimG4CoreCustomPhysics")<<e_0/GeV<<G4endl;
+    //      edm::LogInfo("SimG4CoreCustomPhysics")<<ek_0/GeV<<" "<<aParticle->GetDefinition()->GetPDGMass()/GeV<<" "<<theProton->GetPDGMass()/GeV<<G4endl;
+    double sqrts = sqrt(aParticle->GetDefinition()->GetPDGMass() * aParticle->GetDefinition()->GetPDGMass() +
+                        theProton->GetPDGMass() * theProton->GetPDGMass() +
+                        2 * aParticle->GetTotalEnergy() * theProton->GetPDGMass());
+
+    double res_result = amplitude * (gamma * gamma / 4.) /
+                        ((sqrts - e_0) * (sqrts - e_0) + (gamma * gamma / 4.));  //Non-relativistic Breit Wigner
+
+    theXsec += res_result;
+    //      if(fabs(aParticle->GetKineticEnergy()/GeV-200)<10)  std::cout<<sqrts/GeV<<" "<<theXsec/millibarn<<std::endl;
+  }
 
   //  std::cout<<"Xsec/nucleon: "<<theXsec/millibarn<<"millibarn, Total Xsec: "<<theXsec * anElement->GetN()/millibarn<<" millibarn"<<std::endl;
-  return theXsec * pow(anElement->GetN(),0.7)*1.25;// * 0.523598775598299;
+  return theXsec * pow(anElement->GetN(), 0.7) * 1.25;  // * 0.523598775598299;
 }
 
-ReactionProduct G4ProcessHelper::GetFinalState(const G4Track& aTrack, G4ParticleDefinition*& aTarget){
-
+ReactionProduct G4ProcessHelper::GetFinalState(const G4Track& aTrack, G4ParticleDefinition*& aTarget) {
   const G4DynamicParticle* aDynamicParticle = aTrack.GetDynamicParticle();
 
   //-----------------------------------------------
@@ -200,57 +193,45 @@ ReactionProduct G4ProcessHelper::GetFinalState(const G4Track& aTrack, G4Particle
   //-----------------------------------------------
 
   G4Material* aMaterial = aTrack.GetMaterial();
-  const G4ElementVector* theElementVector = aMaterial->GetElementVector() ;
+  const G4ElementVector* theElementVector = aMaterial->GetElementVector();
   const G4double* NbOfAtomsPerVolume = aMaterial->GetVecNbOfAtomsPerVolume();
 
-  G4double NumberOfProtons=0;
-  G4double NumberOfNucleons=0;
+  G4double NumberOfProtons = 0;
+  G4double NumberOfNucleons = 0;
 
-  for ( size_t elm=0 ; elm < aMaterial->GetNumberOfElements() ; elm++ )
-    {
-      //Summing number of protons per unit volume
-      NumberOfProtons += NbOfAtomsPerVolume[elm]*(*theElementVector)[elm]->GetZ();
-      //Summing nucleons (not neutrons)
-      NumberOfNucleons += NbOfAtomsPerVolume[elm]*(*theElementVector)[elm]->GetN();
-    }
+  for (size_t elm = 0; elm < aMaterial->GetNumberOfElements(); elm++) {
+    //Summing number of protons per unit volume
+    NumberOfProtons += NbOfAtomsPerVolume[elm] * (*theElementVector)[elm]->GetZ();
+    //Summing nucleons (not neutrons)
+    NumberOfNucleons += NbOfAtomsPerVolume[elm] * (*theElementVector)[elm]->GetN();
+  }
 
-  if(G4UniformRand()<NumberOfProtons/NumberOfNucleons)
-    {
-      theReactionMap = &pReactionMap;
-      theTarget = theProton;
-    } else {
-      theReactionMap = &nReactionMap;
-      theTarget = theNeutron;
-    }
+  if (G4UniformRand() < NumberOfProtons / NumberOfNucleons) {
+    theReactionMap = &pReactionMap;
+    theTarget = theProton;
+  } else {
+    theReactionMap = &nReactionMap;
+    theTarget = theNeutron;
+  }
   aTarget = theTarget;
 
   G4int theIncidentPDG = aDynamicParticle->GetDefinition()->GetPDGEncoding();
 
-  if(reggemodel
-     &&CustomPDGParser::s_isMesonino(theIncidentPDG)
-     && G4UniformRand()*mixing>0.5
-     &&aDynamicParticle->GetDefinition()->GetPDGCharge()==0.
-     ) 
-    {
-      //      G4cout<<"Oscillating..."<<G4endl;
-      theIncidentPDG *= -1;
-    }
+  if (reggemodel && CustomPDGParser::s_isMesonino(theIncidentPDG) && G4UniformRand() * mixing > 0.5 &&
+      aDynamicParticle->GetDefinition()->GetPDGCharge() == 0.) {
+    //      G4cout<<"Oscillating..."<<G4endl;
+    theIncidentPDG *= -1;
+  }
 
+  bool baryonise = false;
 
-  bool baryonise=false;
-  
-  if(reggemodel
-     && G4UniformRand()>0.9
-     &&(
-	(CustomPDGParser::s_isMesonino(theIncidentPDG)&&theIncidentPDG>0)
-	||
-	CustomPDGParser::s_isRMeson(theIncidentPDG)
-	)
-     )  
-    baryonise=true;
+  if (reggemodel && G4UniformRand() > 0.9 &&
+      ((CustomPDGParser::s_isMesonino(theIncidentPDG) && theIncidentPDG > 0) ||
+       CustomPDGParser::s_isRMeson(theIncidentPDG)))
+    baryonise = true;
 
   //Making a pointer directly to the ReactionProductList we are looking at. Makes life easier :-)
-  ReactionProductList*  aReactionProductList = &((*theReactionMap)[theIncidentPDG]);
+  ReactionProductList* aReactionProductList = &((*theReactionMap)[theIncidentPDG]);
 
   //-----------------------------------------------
   // Count processes
@@ -258,38 +239,29 @@ ReactionProduct G4ProcessHelper::GetFinalState(const G4Track& aTrack, G4Particle
   // compute number of 2 -> 2 and 2 -> 3 processes
   //-----------------------------------------------
 
-  G4int N22 = 0; //Number of 2 -> 2 processes
-  G4int N23 = 0; //Number of 2 -> 3 processes. Couldn't think of more informative names
-  
+  G4int N22 = 0;  //Number of 2 -> 2 processes
+  G4int N23 = 0;  //Number of 2 -> 3 processes. Couldn't think of more informative names
+
   //This is the list to be populated
   ReactionProductList theReactionProductList;
   std::vector<bool> theChargeChangeList;
 
-  for (ReactionProductList::iterator prod_it = aReactionProductList->begin();
-       prod_it != aReactionProductList->end();
-       prod_it++){
+  for (ReactionProductList::iterator prod_it = aReactionProductList->begin(); prod_it != aReactionProductList->end();
+       prod_it++) {
     G4int secondaries = prod_it->size();
     // If the reaction is not possible we will not consider it
-    if(ReactionIsPossible(*prod_it,aDynamicParticle)
-       && (!reggemodel ||
-	  (baryonise&&ReactionGivesBaryon(*prod_it)) 
-	  ||
-	   (!baryonise&&!ReactionGivesBaryon(*prod_it))
-	  ||
-	  (CustomPDGParser::s_isSbaryon(theIncidentPDG))
-	  ||
-	  (CustomPDGParser::s_isRBaryon(theIncidentPDG))
-	  )
-       )
-      {
+    if (ReactionIsPossible(*prod_it, aDynamicParticle) &&
+        (!reggemodel || (baryonise && ReactionGivesBaryon(*prod_it)) ||
+         (!baryonise && !ReactionGivesBaryon(*prod_it)) || (CustomPDGParser::s_isSbaryon(theIncidentPDG)) ||
+         (CustomPDGParser::s_isRBaryon(theIncidentPDG)))) {
       // The reaction is possible. Let's store and count it
       theReactionProductList.push_back(*prod_it);
-      if (secondaries == 2){
-	N22++;
-      } else if (secondaries ==3) {
-	N23++;
+      if (secondaries == 2) {
+        N22++;
+      } else if (secondaries == 3) {
+        N23++;
       } else {
-	G4cerr << "ReactionProduct has unsupported number of secondaries: "<<secondaries<<G4endl;
+        G4cerr << "ReactionProduct has unsupported number of secondaries: " << secondaries << G4endl;
       }
     } /*else {
       edm::LogInfo("SimG4CoreCustomPhysics")<<"There was an impossible process"<<G4endl;
@@ -297,36 +269,38 @@ ReactionProduct G4ProcessHelper::GetFinalState(const G4Track& aTrack, G4Particle
   }
   //  edm::LogInfo("SimG4CoreCustomPhysics")<<"The size of the ReactionProductList is: "<<theReactionProductList.size()<<G4endl;
 
-  if (theReactionProductList.empty()) G4Exception("G4ProcessHelper", "NoProcessPossible", FatalException,
-						    "GetFinalState: No process could be selected from the given list.");
+  if (theReactionProductList.empty())
+    G4Exception("G4ProcessHelper",
+                "NoProcessPossible",
+                FatalException,
+                "GetFinalState: No process could be selected from the given list.");
 
   // For the Regge model no phase space considerations. We pick a process at random
-  if(reggemodel)
-    {
-      int n_rps = theReactionProductList.size();
-      int select = (int)( G4UniformRand()*n_rps);
-      //      G4cout<<"Possible: "<<n_rps<<", chosen: "<<select<<G4endl;
-      return theReactionProductList[select];
-    }
+  if (reggemodel) {
+    int n_rps = theReactionProductList.size();
+    int select = (int)(G4UniformRand() * n_rps);
+    //      G4cout<<"Possible: "<<n_rps<<", chosen: "<<select<<G4endl;
+    return theReactionProductList[select];
+  }
 
   // Fill a probability map. Remember total probability
   // 2->2 is 0.15*1/n_22 2->3 uses phase space
   G4double p22 = 0.15;
-  G4double p23 = 1-p22; // :-)
+  G4double p23 = 1 - p22;  // :-)
 
   std::vector<G4double> Probabilities;
   std::vector<G4bool> TwotoThreeFlag;
-  
+
   G4double CumulatedProbability = 0;
 
   // To each ReactionProduct we assign a cumulated probability and a flag
   // discerning between 2 -> 2 and 2 -> 3
-  for (unsigned int i = 0; i != theReactionProductList.size(); i++){
+  for (unsigned int i = 0; i != theReactionProductList.size(); i++) {
     if (theReactionProductList[i].size() == 2) {
-      CumulatedProbability += p22/N22;
+      CumulatedProbability += p22 / N22;
       TwotoThreeFlag.push_back(false);
     } else {
-      CumulatedProbability += p23/N23;
+      CumulatedProbability += p23 / N23;
       TwotoThreeFlag.push_back(true);
     }
     Probabilities.push_back(CumulatedProbability);
@@ -335,13 +309,10 @@ ReactionProduct G4ProcessHelper::GetFinalState(const G4Track& aTrack, G4Particle
 
   //Renormalising probabilities
   //  edm::LogInfo("SimG4CoreCustomPhysics")<<"Probs: ";
-  for (std::vector<G4double>::iterator it = Probabilities.begin();
-       it != Probabilities.end();
-       it++)
-    {
-      *it /= CumulatedProbability;
-      //      edm::LogInfo("SimG4CoreCustomPhysics")<<*it<<" ";
-    }
+  for (std::vector<G4double>::iterator it = Probabilities.begin(); it != Probabilities.end(); it++) {
+    *it /= CumulatedProbability;
+    //      edm::LogInfo("SimG4CoreCustomPhysics")<<*it<<" ";
+  }
   //  edm::LogInfo("SimG4CoreCustomPhysics")<<G4endl;
 
   // Choosing ReactionProduct
@@ -350,61 +321,65 @@ ReactionProduct G4ProcessHelper::GetFinalState(const G4Track& aTrack, G4Particle
   G4int tries = 0;
   //  ReactionProductList::iterator prod_it;
 
-  //Keep looping over the list until we have a choice, or until we have tried 100 times  
+  //Keep looping over the list until we have a choice, or until we have tried 100 times
   unsigned int i;
-  while(!selected && tries < 100){
-    i=0;
+  while (!selected && tries < 100) {
+    i = 0;
     G4double dice = G4UniformRand();
     // edm::LogInfo("SimG4CoreCustomPhysics")<<"What's the dice?"<<dice<<G4endl;
-    while(dice>Probabilities[i] && i<theReactionProductList.size()){
+    while (dice > Probabilities[i] && i < theReactionProductList.size()) {
       //      edm::LogInfo("SimG4CoreCustomPhysics")<<"i: "<<i<<G4endl;
       i++;
     }
 
     //    edm::LogInfo("SimG4CoreCustomPhysics")<<"Chosen i: "<<i<<G4endl;
 
-    if(!TwotoThreeFlag[i]) {
+    if (!TwotoThreeFlag[i]) {
       // 2 -> 2 processes are chosen immediately
       selected = true;
     } else {
       // 2 -> 3 processes require a phase space lookup
-      if (PhaseSpace(theReactionProductList[i],aDynamicParticle)>G4UniformRand()) selected = true;
+      if (PhaseSpace(theReactionProductList[i], aDynamicParticle) > G4UniformRand())
+        selected = true;
       //selected = true;
     }
     //    double suppressionfactor=0.5;
-    if(selected&&particleTable->FindParticle(theReactionProductList[i][0])->GetPDGCharge()!=aDynamicParticle->GetDefinition()->GetPDGCharge())
-      {
-	/*
+    if (selected && particleTable->FindParticle(theReactionProductList[i][0])->GetPDGCharge() !=
+                        aDynamicParticle->GetDefinition()->GetPDGCharge()) {
+      /*
 	edm::LogInfo("SimG4CoreCustomPhysics")<<"Incoming particle "<<aDynamicParticle->GetDefinition()->GetParticleName()
 	      <<" has charge "<<aDynamicParticle->GetDefinition()->GetPDGCharge()<<G4endl;
 	edm::LogInfo("SimG4CoreCustomPhysics")<<"Suggested particle "<<particleTable->FindParticle(theReactionProductList[i][0])->GetParticleName()
 	      <<" has charge "<<particleTable->FindParticle(theReactionProductList[i][0])->GetPDGCharge()<<G4endl;
 	*/
-	if(G4UniformRand()<suppressionfactor) selected = false;
-      }
+      if (G4UniformRand() < suppressionfactor)
+        selected = false;
+    }
     tries++;
     //    edm::LogInfo("SimG4CoreCustomPhysics")<<"Tries: "<<tries<<G4endl;
   }
-  if(tries>=100) G4cerr<<"Could not select process!!!!"<<G4endl;
+  if (tries >= 100)
+    G4cerr << "Could not select process!!!!" << G4endl;
 
   //  edm::LogInfo("SimG4CoreCustomPhysics")<<"So far so good"<<G4endl;
   //  edm::LogInfo("SimG4CoreCustomPhysics")<<"Sec's: "<<theReactionProductList[i].size()<<G4endl;
-  
+
   //Updating checkfraction:
-  if (theReactionProductList[i].size()==2) {
+  if (theReactionProductList[i].size() == 2) {
     n_22++;
   } else {
     n_23++;
   }
 
-  checkfraction = (1.0*n_22)/(n_22+n_23);
+  checkfraction = (1.0 * n_22) / (n_22 + n_23);
   //  edm::LogInfo("SimG4CoreCustomPhysics")<<"n_22: "<<n_22<<" n_23: "<<n_23<<" Checkfraction: "<<checkfraction<<G4endl;
   //  edm::LogInfo("SimG4CoreCustomPhysics") <<"Biig number: "<<n_22+n_23<<G4endl;
   //Return the chosen ReactionProduct
   return theReactionProductList[i];
 }
 
-G4double G4ProcessHelper::ReactionProductMass(const ReactionProduct& aReaction,const G4DynamicParticle* aDynamicParticle){
+G4double G4ProcessHelper::ReactionProductMass(const ReactionProduct& aReaction,
+                                              const G4DynamicParticle* aDynamicParticle) {
   // Incident energy:
   G4double E_incident = aDynamicParticle->GetTotalEnergy();
   //edm::LogInfo("SimG4CoreCustomPhysics")<<"Total energy: "<<E_incident<<" Kinetic: "<<aDynamicParticle->GetKineticEnergy()<<G4endl;
@@ -412,11 +387,11 @@ G4double G4ProcessHelper::ReactionProductMass(const ReactionProduct& aReaction,c
   G4double m_1 = aDynamicParticle->GetDefinition()->GetPDGMass();
   G4double m_2 = theTarget->GetPDGMass();
   //edm::LogInfo("SimG4CoreCustomPhysics")<<"M_R: "<<m_1/GeV<<" GeV, M_np: "<<m_2/GeV<<" GeV"<<G4endl;
-  G4double sqrts = sqrt(m_1*m_1 + m_2*(m_2 + 2 * E_incident));
+  G4double sqrts = sqrt(m_1 * m_1 + m_2 * (m_2 + 2 * E_incident));
   //edm::LogInfo("SimG4CoreCustomPhysics")<<"sqrt(s) = "<<sqrts/GeV<<" GeV"<<G4endl;
   // Sum of rest masses after reaction:
   G4double M_after = 0;
-  for (ReactionProduct::const_iterator r_it = aReaction.begin(); r_it !=aReaction.end(); r_it++){
+  for (ReactionProduct::const_iterator r_it = aReaction.begin(); r_it != aReaction.end(); r_it++) {
     //edm::LogInfo("SimG4CoreCustomPhysics")<<"Mass contrib: "<<(particleTable->FindParticle(*r_it)->GetPDGMass())/MeV<<" MeV"<<G4endl;
     M_after += particleTable->FindParticle(*r_it)->GetPDGMass();
   }
@@ -424,62 +399,59 @@ G4double G4ProcessHelper::ReactionProductMass(const ReactionProduct& aReaction,c
   return sqrts - M_after;
 }
 
-G4bool G4ProcessHelper::ReactionIsPossible(const ReactionProduct& aReaction,const G4DynamicParticle* aDynamicParticle){
-  if (ReactionProductMass(aReaction,aDynamicParticle)>0) return true;
+G4bool G4ProcessHelper::ReactionIsPossible(const ReactionProduct& aReaction,
+                                           const G4DynamicParticle* aDynamicParticle) {
+  if (ReactionProductMass(aReaction, aDynamicParticle) > 0)
+    return true;
   return false;
 }
 
-G4bool G4ProcessHelper::ReactionGivesBaryon(const ReactionProduct& aReaction){
-  for (ReactionProduct::const_iterator it = aReaction.begin();it!=aReaction.end();it++)
-    if(CustomPDGParser::s_isSbaryon(*it)||CustomPDGParser::s_isRBaryon(*it)) return true;
+G4bool G4ProcessHelper::ReactionGivesBaryon(const ReactionProduct& aReaction) {
+  for (ReactionProduct::const_iterator it = aReaction.begin(); it != aReaction.end(); it++)
+    if (CustomPDGParser::s_isSbaryon(*it) || CustomPDGParser::s_isRBaryon(*it))
+      return true;
   return false;
 }
 
-G4double G4ProcessHelper::PhaseSpace(const ReactionProduct& aReaction,const G4DynamicParticle* aDynamicParticle){
-  G4double qValue = ReactionProductMass(aReaction,aDynamicParticle);
-  G4double phi = sqrt(1+qValue/(2*0.139*GeV))*pow(qValue/(1.1*GeV),3./2.);
-  return (phi/(1+phi));
+G4double G4ProcessHelper::PhaseSpace(const ReactionProduct& aReaction, const G4DynamicParticle* aDynamicParticle) {
+  G4double qValue = ReactionProductMass(aReaction, aDynamicParticle);
+  G4double phi = sqrt(1 + qValue / (2 * 0.139 * GeV)) * pow(qValue / (1.1 * GeV), 3. / 2.);
+  return (phi / (1 + phi));
 }
 
-void G4ProcessHelper::ReadAndParse(const G4String& str,
-				   std::vector<G4String>& tokens,
-				   const G4String& delimiters)
-{
+void G4ProcessHelper::ReadAndParse(const G4String& str, std::vector<G4String>& tokens, const G4String& delimiters) {
   // Skip delimiters at beginning.
   G4String::size_type lastPos = str.find_first_not_of(delimiters, 0);
   // Find first "non-delimiter".
-  G4String::size_type pos     = str.find_first_of(delimiters, lastPos);
-  
-  while (G4String::npos != pos || G4String::npos != lastPos)
-    {
-      //Skipping leading / trailing whitespaces
-      G4String temp = str.substr(lastPos, pos - lastPos);
-      while(temp.c_str()[0] == ' ') temp.erase(0,1);
-      while(temp[temp.size()-1] == ' ') temp.erase(temp.size()-1,1);
-      // Found a token, add it to the vector.
-      tokens.push_back(temp);
-      // Skip delimiters.  Note the "not_of"
-      lastPos = str.find_first_not_of(delimiters, pos);
-      // Find next "non-delimiter"
-      pos = str.find_first_of(delimiters, lastPos);
-    }
+  G4String::size_type pos = str.find_first_of(delimiters, lastPos);
+
+  while (G4String::npos != pos || G4String::npos != lastPos) {
+    //Skipping leading / trailing whitespaces
+    G4String temp = str.substr(lastPos, pos - lastPos);
+    while (temp.c_str()[0] == ' ')
+      temp.erase(0, 1);
+    while (temp[temp.size() - 1] == ' ')
+      temp.erase(temp.size() - 1, 1);
+    // Found a token, add it to the vector.
+    tokens.push_back(temp);
+    // Skip delimiters.  Note the "not_of"
+    lastPos = str.find_first_not_of(delimiters, pos);
+    // Find next "non-delimiter"
+    pos = str.find_first_of(delimiters, lastPos);
+  }
 }
 
-double G4ProcessHelper::Regge(const double boost)
-{
-  double a=2.165635078566177;
-  double b=0.1467453738547229;
-  double c=-0.9607903711871166;
-  return 1.5*exp(a+b/boost+c*log(boost));
+double G4ProcessHelper::Regge(const double boost) {
+  double a = 2.165635078566177;
+  double b = 0.1467453738547229;
+  double c = -0.9607903711871166;
+  return 1.5 * exp(a + b / boost + c * log(boost));
 }
 
-
-double G4ProcessHelper::Pom(const double boost)
-{
-  double a=4.138224000651535;
-  double b=1.50377557581421;
-  double c=-0.05449742257808247;
-  double d=0.0008221235048211401;
-  return a + b*sqrt(boost) + c*boost + d*pow(boost,1.5);
+double G4ProcessHelper::Pom(const double boost) {
+  double a = 4.138224000651535;
+  double b = 1.50377557581421;
+  double c = -0.05449742257808247;
+  double d = 0.0008221235048211401;
+  return a + b * sqrt(boost) + c * boost + d * pow(boost, 1.5);
 }
-
diff --git a/SimG4Core/CustomPhysics/src/HadronicProcessHelper.cc b/SimG4Core/CustomPhysics/src/HadronicProcessHelper.cc
index bf948d5ccd36e..43dd4ee24a542 100644
--- a/SimG4Core/CustomPhysics/src/HadronicProcessHelper.cc
+++ b/SimG4Core/CustomPhysics/src/HadronicProcessHelper.cc
@@ -1,5 +1,5 @@
 #include "Randomize.hh"
-#include "G4ParticleTable.hh" 
+#include "G4ParticleTable.hh"
 
 #include <iostream>
 #include <fstream>
@@ -13,53 +13,54 @@
 
 using namespace CLHEP;
 
-HadronicProcessHelper::HadronicProcessHelper(const std::string & fileName){
-
+HadronicProcessHelper::HadronicProcessHelper(const std::string& fileName) {
   m_particleTable = G4ParticleTable::GetParticleTable();
   m_proton = m_particleTable->FindParticle("proton");
   m_neutron = m_particleTable->FindParticle("neutron");
 
   G4String line;
 
-  std::ifstream processListStream (fileName.c_str());
+  std::ifstream processListStream(fileName.c_str());
 
-  while(getline(processListStream,line)){
+  while (getline(processListStream, line)) {
     std::vector<G4String> tokens;
 
     //Getting a line
-    m_readAndParse(line,tokens,"#");
-    
+    m_readAndParse(line, tokens, "#");
+
     //Important info
     G4String incident = tokens[0];
     G4ParticleDefinition* incidentDef = m_particleTable->FindParticle(incident);
     G4int incidentPDG = incidentDef->GetPDGEncoding();
-    m_knownParticles[incidentDef]=true;
+    m_knownParticles[incidentDef] = true;
     //    G4cout<<"Incident: "<<incident<<G4endl;
     G4String target = tokens[1];
     //    G4cout<<"Target: "<<target<<G4endl;
-    
+
     // Making a ReactionProduct
     ReactionProduct prod;
-    for (size_t i = 2; i != tokens.size();i++){
+    for (size_t i = 2; i != tokens.size(); i++) {
       G4String part = tokens[i];
-      if (m_particleTable->contains(part))
-	{
-	  prod.push_back(m_particleTable->FindParticle(part)->GetPDGEncoding());
-	} else {
-	  G4Exception("HadronicProcessHelper", "UnkownParticle", FatalException,
-		      "Initialization: The reaction product list contained an unknown particle");
-	}
-    }
-    if (target == "proton")
-      {
-	m_protonReactionMap[incidentPDG].push_back(prod);
-      } else if (target == "neutron") {
-	m_neutronReactionMap[incidentPDG].push_back(prod);
+      if (m_particleTable->contains(part)) {
+        prod.push_back(m_particleTable->FindParticle(part)->GetPDGEncoding());
       } else {
-	G4Exception("HadronicProcessHelper", "IllegalTarget", FatalException,
-		    "Initialization: The reaction product list contained an illegal target particle");
+        G4Exception("HadronicProcessHelper",
+                    "UnkownParticle",
+                    FatalException,
+                    "Initialization: The reaction product list contained an unknown particle");
       }
-   }
+    }
+    if (target == "proton") {
+      m_protonReactionMap[incidentPDG].push_back(prod);
+    } else if (target == "neutron") {
+      m_neutronReactionMap[incidentPDG].push_back(prod);
+    } else {
+      G4Exception("HadronicProcessHelper",
+                  "IllegalTarget",
+                  FatalException,
+                  "Initialization: The reaction product list contained an illegal target particle");
+    }
+  }
 
   processListStream.close();
 
@@ -68,46 +69,44 @@ HadronicProcessHelper::HadronicProcessHelper(const std::string & fileName){
   m_n23 = 0;
 }
 
-G4bool HadronicProcessHelper::applicabilityTester(const G4ParticleDefinition& aPart){
-  const G4ParticleDefinition* aP = &aPart; 
-  if (m_knownParticles[aP]) return true;
+G4bool HadronicProcessHelper::applicabilityTester(const G4ParticleDefinition& aPart) {
+  const G4ParticleDefinition* aP = &aPart;
+  if (m_knownParticles[aP])
+    return true;
   return false;
 }
 
-G4double HadronicProcessHelper::inclusiveCrossSection(const G4DynamicParticle *particle,
-						   const G4Element *element){
-
+G4double HadronicProcessHelper::inclusiveCrossSection(const G4DynamicParticle* particle, const G4Element* element) {
   //We really do need a dedicated class to handle the cross sections. They might not always be constant
 
   G4int pdgCode = particle->GetDefinition()->GetPDGEncoding();
 
   //24mb for gluino-balls
-  if(CustomPDGParser::s_isRGlueball(pdgCode)) return 24 * millibarn * element->GetN();
-  
+  if (CustomPDGParser::s_isRGlueball(pdgCode))
+    return 24 * millibarn * element->GetN();
+
   //get quark vector
-  std::vector<G4int> quarks=CustomPDGParser::s_containedQuarks(pdgCode);
-  
+  std::vector<G4int> quarks = CustomPDGParser::s_containedQuarks(pdgCode);
+
   G4double totalNucleonCrossSection = 0;
 
-  for (std::vector<G4int>::iterator it = quarks.begin();
-       it != quarks.end();
-       it++)
-    {
-      // 12mb for each 'up' or 'down'
-      if (*it == 1 || *it == 2) totalNucleonCrossSection += 12 * millibarn;
-      //  6mb for each 'strange'
-      if (*it == 3) totalNucleonCrossSection += 6 * millibarn;
-    }
-  
+  for (std::vector<G4int>::iterator it = quarks.begin(); it != quarks.end(); it++) {
+    // 12mb for each 'up' or 'down'
+    if (*it == 1 || *it == 2)
+      totalNucleonCrossSection += 12 * millibarn;
+    //  6mb for each 'strange'
+    if (*it == 3)
+      totalNucleonCrossSection += 6 * millibarn;
+  }
+
   //Convert to xsec per nucleus
   //  return totalNucleonCrossSection * element->GetN();
-  return totalNucleonCrossSection * pow(element->GetN(),0.7)*1.25;// * 0.523598775598299;
+  return totalNucleonCrossSection * pow(element->GetN(), 0.7) * 1.25;  // * 0.523598775598299;
 }
 
-HadronicProcessHelper::ReactionProduct HadronicProcessHelper::finalState(const G4DynamicParticle* incidentDynamicParticle,
-   const G4Material *material, G4ParticleDefinition*& target){
-
-//  const G4DynamicParticle* incidentDynamicParticle = track.GetDynamicParticle();
+HadronicProcessHelper::ReactionProduct HadronicProcessHelper::finalState(
+    const G4DynamicParticle* incidentDynamicParticle, const G4Material* material, G4ParticleDefinition*& target) {
+  //  const G4DynamicParticle* incidentDynamicParticle = track.GetDynamicParticle();
 
   //-----------------------------------------------
   // Choose n / p as target
@@ -115,35 +114,33 @@ HadronicProcessHelper::ReactionProduct HadronicProcessHelper::finalState(const G
   //-----------------------------------------------
   ReactionMap* m_reactionMap;
   //G4Material* material = track.GetMaterial();
-  const G4ElementVector* elementVector = material->GetElementVector() ;
+  const G4ElementVector* elementVector = material->GetElementVector();
   const G4double* numberOfAtomsPerVolume = material->GetVecNbOfAtomsPerVolume();
 
-  G4double numberOfProtons=0;
-  G4double numberOfNucleons=0;
+  G4double numberOfProtons = 0;
+  G4double numberOfNucleons = 0;
+
+  //Loop on elements
+  for (size_t elm = 0; elm < material->GetNumberOfElements(); elm++) {
+    //Summing number of protons per unit volume
+    numberOfProtons += numberOfAtomsPerVolume[elm] * (*elementVector)[elm]->GetZ();
+    //Summing nucleons (not neutrons)
+    numberOfNucleons += numberOfAtomsPerVolume[elm] * (*elementVector)[elm]->GetN();
+  }
 
-  //Loop on elements 
-  for ( size_t elm=0 ; elm < material->GetNumberOfElements() ; elm++ )
-    {
-      //Summing number of protons per unit volume
-      numberOfProtons += numberOfAtomsPerVolume[elm]*(*elementVector)[elm]->GetZ();
-      //Summing nucleons (not neutrons)
-      numberOfNucleons += numberOfAtomsPerVolume[elm]*(*elementVector)[elm]->GetN();
-    }
-  
   //random decision of the target
-  if(G4UniformRand()<numberOfProtons/numberOfNucleons)
-    { //target is a proton
-      m_reactionMap = &m_protonReactionMap;
-      target = m_proton;
-    } else { //target is a neutron
-      m_reactionMap = &m_neutronReactionMap;
-      target = m_neutron;
-    }
-  
+  if (G4UniformRand() < numberOfProtons / numberOfNucleons) {  //target is a proton
+    m_reactionMap = &m_protonReactionMap;
+    target = m_proton;
+  } else {  //target is a neutron
+    m_reactionMap = &m_neutronReactionMap;
+    target = m_neutron;
+  }
+
   const G4int incidentPDG = incidentDynamicParticle->GetDefinition()->GetPDGEncoding();
 
   //Making a pointer directly to the ReactionProductList we are looking at. Makes life easier :-)
-  ReactionProductList*  reactionProductList = &((*m_reactionMap)[incidentPDG]);
+  ReactionProductList* reactionProductList = &((*m_reactionMap)[incidentPDG]);
 
   //-----------------------------------------------
   // Count processes
@@ -151,26 +148,25 @@ HadronicProcessHelper::ReactionProduct HadronicProcessHelper::finalState(const G
   // compute number of 2 -> 2 and 2 -> 3 processes
   //-----------------------------------------------
 
-  G4int good22 = 0; //Number of 2 -> 2 processes that are possible
-  G4int good23 = 0; //Number of 2 -> 3 processes that are possible
-  
+  G4int good22 = 0;  //Number of 2 -> 2 processes that are possible
+  G4int good23 = 0;  //Number of 2 -> 3 processes that are possible
+
   //This is the list to be populated
   ReactionProductList goodReactionProductList;
 
-  for (ReactionProductList::iterator prod_it = reactionProductList->begin();
-       prod_it != reactionProductList->end();
-       prod_it++){
+  for (ReactionProductList::iterator prod_it = reactionProductList->begin(); prod_it != reactionProductList->end();
+       prod_it++) {
     G4int secondaries = prod_it->size();
     // If the reaction is not possible we will not consider it
-    if(m_reactionIsPossible(*prod_it,incidentDynamicParticle,target)){
+    if (m_reactionIsPossible(*prod_it, incidentDynamicParticle, target)) {
       // The reaction is possible. Let's store and count it
       goodReactionProductList.push_back(*prod_it);
-      if (secondaries == 2){
-	good22++;
-      } else if (secondaries ==3) {
-	good23++;
+      if (secondaries == 2) {
+        good22++;
+      } else if (secondaries == 3) {
+        good23++;
       } else {
-	G4cerr << "ReactionProduct has unsupported number of secondaries: "<<secondaries<<G4endl;
+        G4cerr << "ReactionProduct has unsupported number of secondaries: " << secondaries << G4endl;
       }
     } /*else {
       G4cout<<"There was an impossible process"<<G4endl;
@@ -178,90 +174,93 @@ HadronicProcessHelper::ReactionProduct HadronicProcessHelper::finalState(const G
   }
   //  G4cout<<"The size of the ReactionProductList is: "<<theReactionProductList.size()<<G4endl;
 
-  if (goodReactionProductList.empty()) G4Exception("HadronicProcessHelper", "NoProcessPossible", FatalException,
-						    "GetFinalState: No process could be selected from the given list.");
+  if (goodReactionProductList.empty())
+    G4Exception("HadronicProcessHelper",
+                "NoProcessPossible",
+                FatalException,
+                "GetFinalState: No process could be selected from the given list.");
   // Fill a probability map. Remember total probability
   // 2->2 is 0.15*1/n_22 2->3 uses phase space
   G4double prob22 = 0.15;
-  G4double prob23 = 1-prob22; // :-)
+  G4double prob23 = 1 - prob22;  // :-)
 
   std::vector<G4double> probabilities;
   std::vector<G4bool> twoToThreeFlag;
-  
+
   G4double cumulatedProbability = 0;
 
   // To each ReactionProduct we assign a cumulated probability and a flag
   // discerning between 2 -> 2 and 2 -> 3
   size_t numberOfReactions = goodReactionProductList.size();
-  for (size_t i = 0; i != numberOfReactions; i++){
+  for (size_t i = 0; i != numberOfReactions; i++) {
     if (goodReactionProductList[i].size() == 2) {
-      cumulatedProbability += prob22/good22;
+      cumulatedProbability += prob22 / good22;
       twoToThreeFlag.push_back(false);
     } else {
-      cumulatedProbability += prob23/good23;
+      cumulatedProbability += prob23 / good23;
       twoToThreeFlag.push_back(true);
     }
     probabilities.push_back(cumulatedProbability);
   }
 
   //Normalising probabilities to 1
-  for (std::vector<G4double>::iterator it = probabilities.begin();
-       it != probabilities.end();
-       it++)
-    {
-      *it /= cumulatedProbability;
-    }
+  for (std::vector<G4double>::iterator it = probabilities.begin(); it != probabilities.end(); it++) {
+    *it /= cumulatedProbability;
+  }
 
   // Choosing ReactionProduct
   G4bool selected = false;
   G4int tries = 0;
   //  ReactionProductList::iterator prod_it;
 
-  //Keep looping over the list until we have a choice, or until we have tried 100 times  
+  //Keep looping over the list until we have a choice, or until we have tried 100 times
   size_t i;
-  while(!selected && tries < 100){
-    i=0;
+  while (!selected && tries < 100) {
+    i = 0;
     G4double dice = G4UniformRand();
     //select the process using the dice
-    while(dice>probabilities[i] && i<numberOfReactions)  i++;
+    while (dice > probabilities[i] && i < numberOfReactions)
+      i++;
 
-    if(twoToThreeFlag[i]) {
+    if (twoToThreeFlag[i]) {
       // 2 -> 3 processes require a phase space lookup
-      if (m_phaseSpace(goodReactionProductList[i],incidentDynamicParticle,target)>G4UniformRand()) selected = true;
+      if (m_phaseSpace(goodReactionProductList[i], incidentDynamicParticle, target) > G4UniformRand())
+        selected = true;
     } else {
       // 2 -> 2 processes are chosen immediately
       selected = true;
     }
     tries++;
   }
-  if(tries>=100) G4cerr<<"Could not select process!!!!"<<G4endl;
+  if (tries >= 100)
+    G4cerr << "Could not select process!!!!" << G4endl;
 
-  
   //Debugging stuff
   //Updating checkfraction:
-  if (goodReactionProductList[i].size()==2) {
+  if (goodReactionProductList[i].size() == 2) {
     m_n22++;
   } else {
     m_n23++;
   }
-  m_checkFraction = (1.0*m_n22)/(m_n22+m_n23);
-  
+  m_checkFraction = (1.0 * m_n22) / (m_n22 + m_n23);
+
   //return the selected productList
   return goodReactionProductList[i];
 }
 
 G4double HadronicProcessHelper::m_reactionProductMass(const ReactionProduct& reactionProd,
-  const G4DynamicParticle* incidentDynamicParticle,G4ParticleDefinition* target){
+                                                      const G4DynamicParticle* incidentDynamicParticle,
+                                                      G4ParticleDefinition* target) {
   // Incident energy:
   G4double incidentEnergy = incidentDynamicParticle->GetTotalEnergy();
   G4double m_1 = incidentDynamicParticle->GetDefinition()->GetPDGMass();
   G4double m_2 = target->GetPDGMass();
   //square root of "s"
-  G4double sqrtS = sqrt(m_1*m_1 + m_2*(m_2 + 2 * incidentEnergy));
+  G4double sqrtS = sqrt(m_1 * m_1 + m_2 * (m_2 + 2 * incidentEnergy));
   // Sum of rest masses after reaction:
   G4double productsMass = 0;
   //Loop on reaction producs
-  for (ReactionProduct::const_iterator r_it = reactionProd.begin(); r_it !=reactionProd.end(); r_it++){
+  for (ReactionProduct::const_iterator r_it = reactionProd.begin(); r_it != reactionProd.end(); r_it++) {
     //Sum the masses of the products
     productsMass += m_particleTable->FindParticle(*r_it)->GetPDGMass();
   }
@@ -270,38 +269,41 @@ G4double HadronicProcessHelper::m_reactionProductMass(const ReactionProduct& rea
 }
 
 G4bool HadronicProcessHelper::m_reactionIsPossible(const ReactionProduct& aReaction,
-     const G4DynamicParticle* aDynamicParticle,G4ParticleDefinition* target){
-  if (m_reactionProductMass(aReaction,aDynamicParticle,target)>0) return true;
+                                                   const G4DynamicParticle* aDynamicParticle,
+                                                   G4ParticleDefinition* target) {
+  if (m_reactionProductMass(aReaction, aDynamicParticle, target) > 0)
+    return true;
   return false;
 }
 
 G4double HadronicProcessHelper::m_phaseSpace(const ReactionProduct& aReaction,
-     const G4DynamicParticle* aDynamicParticle,G4ParticleDefinition* target){
-  G4double qValue = m_reactionProductMass(aReaction,aDynamicParticle,target);
-  G4double phi = sqrt(1+qValue/(2*0.139*GeV))*pow(qValue/(1.1*GeV),3./2.);
-  return (phi/(1+phi));
+                                             const G4DynamicParticle* aDynamicParticle,
+                                             G4ParticleDefinition* target) {
+  G4double qValue = m_reactionProductMass(aReaction, aDynamicParticle, target);
+  G4double phi = sqrt(1 + qValue / (2 * 0.139 * GeV)) * pow(qValue / (1.1 * GeV), 3. / 2.);
+  return (phi / (1 + phi));
 }
 
 void HadronicProcessHelper::m_readAndParse(const G4String& str,
-				   std::vector<G4String>& tokens,
-				   const G4String& delimiters)
-{
+                                           std::vector<G4String>& tokens,
+                                           const G4String& delimiters) {
   // Skip delimiters at beginning.
   G4String::size_type lastPos = str.find_first_not_of(delimiters, 0);
   // Find first "non-delimiter".
-  G4String::size_type pos     = str.find_first_of(delimiters, lastPos);
-  
-  while (G4String::npos != pos || G4String::npos != lastPos)
-    {
-      //Skipping leading / trailing whitespaces
-      G4String temp = str.substr(lastPos, pos - lastPos);
-      while(temp.c_str()[0] == ' ') temp.erase(0,1);
-      while(temp[temp.size()-1] == ' ') temp.erase(temp.size()-1,1);
-      // Found a token, add it to the vector.
-      tokens.push_back(temp);
-      // Skip delimiters.  Note the "not_of"
-      lastPos = str.find_first_not_of(delimiters, pos);
-      // Find next "non-delimiter"
-      pos = str.find_first_of(delimiters, lastPos);
-    }
+  G4String::size_type pos = str.find_first_of(delimiters, lastPos);
+
+  while (G4String::npos != pos || G4String::npos != lastPos) {
+    //Skipping leading / trailing whitespaces
+    G4String temp = str.substr(lastPos, pos - lastPos);
+    while (temp.c_str()[0] == ' ')
+      temp.erase(0, 1);
+    while (temp[temp.size() - 1] == ' ')
+      temp.erase(temp.size() - 1, 1);
+    // Found a token, add it to the vector.
+    tokens.push_back(temp);
+    // Skip delimiters.  Note the "not_of"
+    lastPos = str.find_first_not_of(delimiters, pos);
+    // Find next "non-delimiter"
+    pos = str.find_first_of(delimiters, lastPos);
+  }
 }
diff --git a/SimG4Core/GFlash/interface/GFlash.h b/SimG4Core/GFlash/interface/GFlash.h
index 2e74abf47b580..4dd35fc1f06d4 100644
--- a/SimG4Core/GFlash/interface/GFlash.h
+++ b/SimG4Core/GFlash/interface/GFlash.h
@@ -3,22 +3,19 @@
 // Joanna Weng 08.2005
 // modifed by Soon Yung Jun, Dongwook Jang
 
-#include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
- 
+#include "SimG4Core/Physics/interface/PhysicsList.h"
+
 class GflashHistogram;
 
-class GFlash : public PhysicsList
-{
+class GFlash : public PhysicsList {
 public:
-  GFlash(const edm::ParameterSet & p);
+  GFlash(const edm::ParameterSet &p);
   ~GFlash() override;
 
 private:
-  GflashHistogram* theHisto;
+  GflashHistogram *theHisto;
   edm::ParameterSet thePar;
-
 };
 
 #endif
-
diff --git a/SimG4Core/GFlash/interface/GflashEMShowerModel.h b/SimG4Core/GFlash/interface/GflashEMShowerModel.h
index 3b3f7a1c984f6..19cdc0016004c 100644
--- a/SimG4Core/GFlash/interface/GflashEMShowerModel.h
+++ b/SimG4Core/GFlash/interface/GflashEMShowerModel.h
@@ -15,44 +15,39 @@
 #ifndef GflashEMShowerModel_h
 #define GflashEMShowerModel_h
 
-#include "G4VFastSimulationModel.hh"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "G4VFastSimulationModel.hh"
 
-#include "G4TouchableHandle.hh"
 #include "G4Navigator.hh"
 #include "G4Step.hh"
+#include "G4TouchableHandle.hh"
 
 class GflashEMShowerProfile;
 class G4Region;
 
 class GflashEMShowerModel : public G4VFastSimulationModel {
+public:
+  GflashEMShowerModel(const G4String &name, G4Envelope *env, const edm::ParameterSet &parSet);
+  ~GflashEMShowerModel() override;
 
- public:
-  
-  GflashEMShowerModel (const G4String& name, G4Envelope* env, 
-		       const edm::ParameterSet& parSet);
-  ~GflashEMShowerModel () override;  
-
-  G4bool ModelTrigger(const G4FastTrack &) override; 
-  G4bool IsApplicable(const G4ParticleDefinition&) override;
-  void DoIt(const G4FastTrack&, G4FastStep&) override;
+  G4bool ModelTrigger(const G4FastTrack &) override;
+  G4bool IsApplicable(const G4ParticleDefinition &) override;
+  void DoIt(const G4FastTrack &, G4FastStep &) override;
 
 private:
-  G4bool excludeDetectorRegion(const G4FastTrack& fastTrack);
-  void makeHits(const G4FastTrack& fastTrack);
-  void updateGflashStep(const G4ThreeVector& position, G4double time);
+  G4bool excludeDetectorRegion(const G4FastTrack &fastTrack);
+  void makeHits(const G4FastTrack &fastTrack);
+  void updateGflashStep(const G4ThreeVector &position, G4double time);
 
 private:
-
   edm::ParameterSet theParSet;
 
   GflashEMShowerProfile *theProfile;
 
-  const G4Region* theRegion;
+  const G4Region *theRegion;
 
   G4Step *theGflashStep;
   G4Navigator *theGflashNavigator;
-  G4TouchableHandle  theGflashTouchableHandle;
-
+  G4TouchableHandle theGflashTouchableHandle;
 };
 #endif
diff --git a/SimG4Core/GFlash/interface/GflashG4Watcher.h b/SimG4Core/GFlash/interface/GflashG4Watcher.h
index 759d0a3ca9d71..d4037a5d0999e 100644
--- a/SimG4Core/GFlash/interface/GflashG4Watcher.h
+++ b/SimG4Core/GFlash/interface/GflashG4Watcher.h
@@ -1,14 +1,14 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "SimG4Core/Watcher/interface/SimWatcher.h"
 #include "SimG4Core/Notification/interface/Observer.h"
+#include "SimG4Core/Watcher/interface/SimWatcher.h"
 
+#include "G4ThreeVector.hh"
+#include "globals.hh"
 #include <TFile.h>
-#include <TTree.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TProfile.h>
-#include "globals.hh"
-#include "G4ThreeVector.hh"
+#include <TTree.h>
 #include <string>
 
 //
@@ -19,28 +19,25 @@ class BeginOfEvent;
 class EndOfEvent;
 class G4Step;
 
-
 class GflashG4Watcher : public SimWatcher,
-  public Observer<const BeginOfEvent*>,
-  public Observer<const EndOfEvent*>,
-  public Observer<const G4Step*> {
-
- public:
-  GflashG4Watcher(const edm::ParameterSet& p);
+                        public Observer<const BeginOfEvent *>,
+                        public Observer<const EndOfEvent *>,
+                        public Observer<const G4Step *> {
+public:
+  GflashG4Watcher(const edm::ParameterSet &p);
   ~GflashG4Watcher() override;
-  
- private:
 
-  G4bool        inc_flag;
-  G4double      inc_energy;
-  G4double      out_energy;
+private:
+  G4bool inc_flag;
+  G4double inc_energy;
+  G4double out_energy;
   G4ThreeVector inc_vertex;
   G4ThreeVector inc_direction;
   G4ThreeVector inc_position;
 
-  void update(const BeginOfEvent* ) override;
-  void update(const EndOfEvent* ) override;
-  void update(const G4Step* ) override;
+  void update(const BeginOfEvent *) override;
+  void update(const EndOfEvent *) override;
+  void update(const G4Step *) override;
 
   // histograms for GflashG4Watcher
 
@@ -48,27 +45,25 @@ class GflashG4Watcher : public SimWatcher,
   double recoEnergyScaleEB_;
   double recoEnergyScaleEE_;
 
-  TFile*    histFile_;
-
-  TH1F*     em_incE;
-  TH1F*     em_vtx_rho;
-  TH1F*     em_vtx_z;
-
-  TH1F*     eb_ssp_rho;
-  TH1F*     eb_hit_long;
-  TH1F*     eb_hit_lat;
-  TH2F*     eb_hit_rz;
-  TH1F*     eb_hit_long_sd;
-  TH1F*     eb_hit_lat_sd;
-  TH2F*     eb_hit_rz_sd;
-
-  TH1F*     ee_ssp_z;
-  TH1F*     ee_hit_long;
-  TH1F*     ee_hit_lat;
-  TH2F*     ee_hit_rz;
-  TH1F*     ee_hit_long_sd;
-  TH1F*     ee_hit_lat_sd;
-  TH2F*     ee_hit_rz_sd;
-
+  TFile *histFile_;
+
+  TH1F *em_incE;
+  TH1F *em_vtx_rho;
+  TH1F *em_vtx_z;
+
+  TH1F *eb_ssp_rho;
+  TH1F *eb_hit_long;
+  TH1F *eb_hit_lat;
+  TH2F *eb_hit_rz;
+  TH1F *eb_hit_long_sd;
+  TH1F *eb_hit_lat_sd;
+  TH2F *eb_hit_rz_sd;
+
+  TH1F *ee_ssp_z;
+  TH1F *ee_hit_long;
+  TH1F *ee_hit_lat;
+  TH2F *ee_hit_rz;
+  TH1F *ee_hit_long_sd;
+  TH1F *ee_hit_lat_sd;
+  TH2F *ee_hit_rz_sd;
 };
-
diff --git a/SimG4Core/GFlash/interface/GflashHadronShowerModel.h b/SimG4Core/GFlash/interface/GflashHadronShowerModel.h
index a22f85cc4011a..f3f187d381f7e 100644
--- a/SimG4Core/GFlash/interface/GflashHadronShowerModel.h
+++ b/SimG4Core/GFlash/interface/GflashHadronShowerModel.h
@@ -4,9 +4,9 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "G4VFastSimulationModel.hh"
 
-#include "G4TouchableHandle.hh"
 #include "G4Navigator.hh"
 #include "G4Step.hh"
+#include "G4TouchableHandle.hh"
 
 class GflashHadronShowerProfile;
 class GflashPiKShowerProfile;
@@ -16,31 +16,29 @@ class GflashProtonShowerProfile;
 class GflashAntiProtonShowerProfile;
 class GflashHistogram;
 
-class GflashHadronShowerModel : public G4VFastSimulationModel 
-{
+class GflashHadronShowerModel : public G4VFastSimulationModel {
 public:
   //-------------------------
   // Constructor, destructor
   //-------------------------
-  GflashHadronShowerModel (G4String modelName, G4Region* envelope, const edm::ParameterSet& parSet);
-  ~GflashHadronShowerModel () override;
+  GflashHadronShowerModel(G4String modelName, G4Region *envelope, const edm::ParameterSet &parSet);
+  ~GflashHadronShowerModel() override;
 
   //------------------------------------------------------------------------
   // Virtual methods that should be implemented for this hadron shower model
   //------------------------------------------------------------------------
 
-  G4bool IsApplicable(const G4ParticleDefinition&) override;
+  G4bool IsApplicable(const G4ParticleDefinition &) override;
   G4bool ModelTrigger(const G4FastTrack &) override;
-  void DoIt(const G4FastTrack&, G4FastStep&) override;
+  void DoIt(const G4FastTrack &, G4FastStep &) override;
 
 private:
-  G4bool isFirstInelasticInteraction(const G4FastTrack& fastTrack);
-  G4bool excludeDetectorRegion(const G4FastTrack& fastTrack);
-  void makeHits(const G4FastTrack& fastTrack);
-  void updateGflashStep(const G4ThreeVector& position, G4double time);
-
-private:  
+  G4bool isFirstInelasticInteraction(const G4FastTrack &fastTrack);
+  G4bool excludeDetectorRegion(const G4FastTrack &fastTrack);
+  void makeHits(const G4FastTrack &fastTrack);
+  void updateGflashStep(const G4ThreeVector &position, G4double time);
 
+private:
   G4bool theWatcherOn;
   edm::ParameterSet theParSet;
   GflashHadronShowerProfile *theProfile;
@@ -52,11 +50,10 @@ class GflashHadronShowerModel : public G4VFastSimulationModel
 
   G4Step *theGflashStep;
   G4Navigator *theGflashNavigator;
-  G4TouchableHandle  theGflashTouchableHandle;
-
-  //debugging histograms
-  GflashHistogram* theHisto;
+  G4TouchableHandle theGflashTouchableHandle;
 
+  // debugging histograms
+  GflashHistogram *theHisto;
 };
 
 #endif
diff --git a/SimG4Core/GFlash/interface/GflashHadronWrapperProcess.h b/SimG4Core/GFlash/interface/GflashHadronWrapperProcess.h
index 19ecdced3c746..2c6456f209273 100644
--- a/SimG4Core/GFlash/interface/GflashHadronWrapperProcess.h
+++ b/SimG4Core/GFlash/interface/GflashHadronWrapperProcess.h
@@ -12,28 +12,26 @@ class G4ProcessVector;
 class G4VProcess;
 
 class GflashHadronWrapperProcess : public G4WrapperProcess {
-  
 public:
+  GflashHadronWrapperProcess(G4String processName);
+  //  GflashHadronWrapperProcess();
+
+  ~GflashHadronWrapperProcess() override;
 
-  GflashHadronWrapperProcess(G4String processName);	
-  //  GflashHadronWrapperProcess();	
-  
-  ~GflashHadronWrapperProcess() override;	
-  
   // Override PostStepDoIt  method
-  G4VParticleChange* PostStepDoIt(const G4Track& track, const G4Step& step) override;
+  G4VParticleChange *PostStepDoIt(const G4Track &track, const G4Step &step) override;
 
   G4String GetName() { return theProcessName; };
 
-  void Print(const G4Step& astep);
+  void Print(const G4Step &astep);
 
 private:
   G4String theProcessName;
 
-  G4VParticleChange* particleChange;
-  G4ProcessManager*  pmanager;
-  G4ProcessVector*   fProcessVector;
-  G4VProcess*        fProcess;
+  G4VParticleChange *particleChange;
+  G4ProcessManager *pmanager;
+  G4ProcessVector *fProcessVector;
+  G4VProcess *fProcess;
 };
 
 #endif
diff --git a/SimG4Core/GFlash/interface/ParametrisedPhysics.h b/SimG4Core/GFlash/interface/ParametrisedPhysics.h
index 8ca17a4fc95f0..1ab336402212e 100644
--- a/SimG4Core/GFlash/interface/ParametrisedPhysics.h
+++ b/SimG4Core/GFlash/interface/ParametrisedPhysics.h
@@ -1,27 +1,26 @@
 #ifndef SimG4Core_GFlash_ParametrisedPhysics_H
 #define SimG4Core_GFlash_ParametrisedPhysics_H
 
-#include "G4VPhysicsConstructor.hh"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "G4FastSimulationManagerProcess.hh"
+#include "G4VPhysicsConstructor.hh"
 #include "SimG4Core/GFlash/interface/GflashEMShowerModel.h"
 #include "SimG4Core/GFlash/interface/GflashHadronShowerModel.h"
-#include "G4FastSimulationManagerProcess.hh"
 
 // Joanna Weng 08.2005
 // Physics process for Gflash parameterisation
 // modified by Soon Yung Jun, Dongwook Jang
 
-class ParametrisedPhysics : public G4VPhysicsConstructor
-{
- public:
-  ParametrisedPhysics(std::string name, const edm::ParameterSet & p);
+class ParametrisedPhysics : public G4VPhysicsConstructor {
+public:
+  ParametrisedPhysics(std::string name, const edm::ParameterSet &p);
   ~ParametrisedPhysics() override;
-	
- protected:
+
+protected:
   void ConstructParticle() override;
   void ConstructProcess() override;
 
- private:
+private:
   edm::ParameterSet theParSet;
   struct ThreadPrivate {
     GflashEMShowerModel *theEMShowerModel;
@@ -29,8 +28,7 @@ class ParametrisedPhysics : public G4VPhysicsConstructor
     GflashHadronShowerModel *theHadronShowerModel;
     G4FastSimulationManagerProcess *theFastSimulationManagerProcess;
   };
-  static G4ThreadLocal ThreadPrivate* tpdata;    
+  static G4ThreadLocal ThreadPrivate *tpdata;
 };
 
 #endif
-
diff --git a/SimG4Core/GFlash/plugins/GFlash.cc b/SimG4Core/GFlash/plugins/GFlash.cc
index 697016b72ea2b..bf3befa576355 100644
--- a/SimG4Core/GFlash/plugins/GFlash.cc
+++ b/SimG4Core/GFlash/plugins/GFlash.cc
@@ -1,72 +1,66 @@
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "SimG4Core/GFlash/interface/GFlash.h"
 #include "SimG4Core/GFlash/interface/ParametrisedPhysics.h"
 #include "SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics95msc93.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "G4DecayPhysics.hh"
 #include "G4EmExtraPhysics.hh"
+#include "G4HadronElasticPhysics.hh"
+#include "G4HadronPhysicsQGSP_FTFP_BERT.hh"
 #include "G4IonPhysics.hh"
-#include "G4StoppingPhysics.hh"
-#include "G4HadronElasticPhysics.hh" 
 #include "G4NeutronTrackingCut.hh"
-#include "G4HadronPhysicsQGSP_FTFP_BERT.hh"
+#include "G4StoppingPhysics.hh"
 
 #include "G4DataQuestionaire.hh"
 #include "SimGeneral/GFlash/interface/GflashHistogram.h"
 
 #include <string>
 
-GFlash::GFlash(const edm::ParameterSet & p) 
-  : PhysicsList(p), 
-    thePar(p.getParameter<edm::ParameterSet>("GFlash")) {
-
+GFlash::GFlash(const edm::ParameterSet &p) : PhysicsList(p), thePar(p.getParameter<edm::ParameterSet>("GFlash")) {
   G4DataQuestionaire it(photon);
 
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
   std::string region = p.getParameter<std::string>("Region");
 
   edm::LogInfo("PhysicsList") << "You are using the obsolete simulation engine: "
-			      << " GFlash with Flags for EM Physics "
-                              << emPhys << ", for Hadronic Physics "
-			      << hadPhys
-                              << " and tracking cut " << tracking
-                              << " with special region " << region;
+                              << " GFlash with Flags for EM Physics " << emPhys << ", for Hadronic Physics " << hadPhys
+                              << " and tracking cut " << tracking << " with special region " << region;
 
-  RegisterPhysics(new ParametrisedPhysics("parametrised",thePar)); 
+  RegisterPhysics(new ParametrisedPhysics("parametrised", thePar));
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new CMSEmStandardPhysics95msc93("EM standard msc93",ver,region));
+    RegisterPhysics(new CMSEmStandardPhysics95msc93("EM standard msc93", ver, region));
 
     // Synchroton Radiation & GN Physics
-    RegisterPhysics( new G4EmExtraPhysics(ver));
+    RegisterPhysics(new G4EmExtraPhysics(ver));
   }
 
   // Decays
-  RegisterPhysics( new G4DecayPhysics(ver) );
+  RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysics(ver));
+    RegisterPhysics(new G4HadronElasticPhysics(ver));
 
     // Hadron Physics
-    RegisterPhysics( new G4HadronPhysicsQGSP_FTFP_BERT(ver));   
+    RegisterPhysics(new G4HadronPhysicsQGSP_FTFP_BERT(ver));
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      RegisterPhysics( new G4NeutronTrackingCut(ver));
+      RegisterPhysics(new G4NeutronTrackingCut(ver));
     }
   }
   // singleton histogram object
-  if(thePar.getParameter<bool>("GflashHistogram")) {
+  if (thePar.getParameter<bool>("GflashHistogram")) {
     theHisto = GflashHistogram::instance();
     theHisto->setStoreFlag(true);
     theHisto->bookHistogram(thePar.getParameter<std::string>("GflashHistogramName"));
@@ -74,17 +68,14 @@ GFlash::GFlash(const edm::ParameterSet & p)
 }
 
 GFlash::~GFlash() {
-
-  if(thePar.getParameter<bool>("GflashHistogram")) {
-    if(theHisto) delete theHisto;
+  if (thePar.getParameter<bool>("GflashHistogram")) {
+    if (theHisto)
+      delete theHisto;
   }
-
 }
 
-//define this as a plug-in
+// define this as a plug-in
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "SimG4Core/Physics/interface/PhysicsListFactory.h"
 
-
 DEFINE_PHYSICSLIST(GFlash);
-
diff --git a/SimG4Core/GFlash/plugins/GflashG4Watcher.cc b/SimG4Core/GFlash/plugins/GflashG4Watcher.cc
index 892d020af6a8d..4df1e498e497f 100644
--- a/SimG4Core/GFlash/plugins/GflashG4Watcher.cc
+++ b/SimG4Core/GFlash/plugins/GflashG4Watcher.cc
@@ -1,10 +1,10 @@
-#include "G4Step.hh"
 #include "G4Electron.hh"
 #include "G4Positron.hh"
-#include "G4VProcess.hh"
-#include "G4SDManager.hh"
 #include "G4PrimaryParticle.hh"
 #include "G4PrimaryVertex.hh"
+#include "G4SDManager.hh"
+#include "G4Step.hh"
+#include "G4VProcess.hh"
 
 #include "SimG4CMS/Calo/interface/CaloG4HitCollection.h"
 #include "SimG4Core/Notification/interface/BeginOfEvent.h"
@@ -18,84 +18,125 @@ using namespace CLHEP;
 
 // constructors and destructor
 //
-GflashG4Watcher::GflashG4Watcher(const edm::ParameterSet& p) {
-
+GflashG4Watcher::GflashG4Watcher(const edm::ParameterSet &p) {
   edm::ParameterSet myP = p.getParameter<edm::ParameterSet>("GflashG4Watcher");
   histFileName_ = myP.getParameter<std::string>("histFileName");
   recoEnergyScaleEB_ = myP.getParameter<double>("recoEnergyScaleEB");
   recoEnergyScaleEE_ = myP.getParameter<double>("recoEnergyScaleEE");
 
-
-  histFile_ = new TFile(histFileName_.c_str(),"RECREATE");
+  histFile_ = new TFile(histFileName_.c_str(), "RECREATE");
 
   TH1::AddDirectory(kTRUE);
 
-
-  em_incE        = new TH1F("em_incE","Incoming energy at Ecal;E (GeV);Number of Events",500,0.0,500.0);
-  em_vtx_rho     = new TH1F("em_vtx_rho","vertex position;#rho (cm);Number of Events",100,0.0,10.0);
-  em_vtx_z       = new TH1F("em_vtx_z","vertex position;z (cm);Number of Events",100,-10.0,10.0);
-
-  eb_ssp_rho     = new TH1F("eb_ssp_rho","Shower starting position;#rho (cm);Number of Events",200,0.0,200.0);
-  eb_hit_long    = new TH1F("eb_hit_long","longitudinal hit position;shower depth (cm);Number of energy weighted hits",400,0.0,200.0);
-  eb_hit_lat     = new TH1F("eb_hit_lat","lateral hit position;arm (cm);Number of energy weighted hits",100,0.0,5.0);
-  eb_hit_rz      = new TH2F("eb_hit_rz","hit position along the shower direction;shower depth (cm);arm (cm)",400,0.0,200.0,100,0.0,5.0);
-  eb_hit_long_sd = new TH1F("eb_hit_long_sd","longitudinal hit position in Sensitive Detector;shower depth (cm);Number of energy weighted hits",400,0.0,200.0);
-  eb_hit_lat_sd  = new TH1F("eb_hit_lat_sd","lateral hit position in Sensitive Detector;arm (cm);Number of energy weighted hits",100,0.0,5.0);
-  eb_hit_rz_sd   = new TH2F("eb_hit_rz_sd","hit position along the shower direction in Sensitive Detector;shower depth (cm);arm (cm)",400,0.0,200.0,100,0.0,5.0);
-
-  ee_ssp_z       = new TH1F("ee_ssp_z","Shower starting position;z (cm);Number of Events",800,-400.0,400.0);
-  ee_hit_long    = new TH1F("ee_hit_long","longitudinal hit position;shower depth (cm);Number of energy weighted hits",800,0.0,400.0);
-  ee_hit_lat     = new TH1F("ee_hit_lat","lateral hit position;arm (cm);Number of energy weighted hits",100,0.0,5.0);
-  ee_hit_rz      = new TH2F("ee_hit_rz","hit position along the shower direction;shower depth (cm);arm (cm)",800,0.0,400.0,100,0.0,5.0);
-  ee_hit_long_sd = new TH1F("ee_hit_long_sd","longitudinal hit position in Sensitive Detector;shower depth (cm);Number of energy weighted hits",800,0.0,400.0);
-  ee_hit_lat_sd  = new TH1F("ee_hit_lat_sd","lateral hit position in Sensitive Detector;arm (cm);Number of energy weighted hits",100,0.0,5.0);
-  ee_hit_rz_sd   = new TH2F("ee_hit_rz_sd","hit position along the shower direction in Sensitive Detector;shower depth (cm);arm (cm)",800,0.0,400.0,100,0.0,5.0);
-
+  em_incE = new TH1F("em_incE", "Incoming energy at Ecal;E (GeV);Number of Events", 500, 0.0, 500.0);
+  em_vtx_rho = new TH1F("em_vtx_rho", "vertex position;#rho (cm);Number of Events", 100, 0.0, 10.0);
+  em_vtx_z = new TH1F("em_vtx_z", "vertex position;z (cm);Number of Events", 100, -10.0, 10.0);
+
+  eb_ssp_rho = new TH1F("eb_ssp_rho", "Shower starting position;#rho (cm);Number of Events", 200, 0.0, 200.0);
+  eb_hit_long = new TH1F("eb_hit_long",
+                         "longitudinal hit position;shower depth (cm);Number "
+                         "of energy weighted hits",
+                         400,
+                         0.0,
+                         200.0);
+  eb_hit_lat = new TH1F("eb_hit_lat", "lateral hit position;arm (cm);Number of energy weighted hits", 100, 0.0, 5.0);
+  eb_hit_rz = new TH2F(
+      "eb_hit_rz", "hit position along the shower direction;shower depth (cm);arm (cm)", 400, 0.0, 200.0, 100, 0.0, 5.0);
+  eb_hit_long_sd = new TH1F("eb_hit_long_sd",
+                            "longitudinal hit position in Sensitive Detector;shower depth "
+                            "(cm);Number of energy weighted hits",
+                            400,
+                            0.0,
+                            200.0);
+  eb_hit_lat_sd = new TH1F("eb_hit_lat_sd",
+                           "lateral hit position in Sensitive Detector;arm "
+                           "(cm);Number of energy weighted hits",
+                           100,
+                           0.0,
+                           5.0);
+  eb_hit_rz_sd = new TH2F("eb_hit_rz_sd",
+                          "hit position along the shower direction in "
+                          "Sensitive Detector;shower depth (cm);arm (cm)",
+                          400,
+                          0.0,
+                          200.0,
+                          100,
+                          0.0,
+                          5.0);
+
+  ee_ssp_z = new TH1F("ee_ssp_z", "Shower starting position;z (cm);Number of Events", 800, -400.0, 400.0);
+  ee_hit_long = new TH1F("ee_hit_long",
+                         "longitudinal hit position;shower depth (cm);Number "
+                         "of energy weighted hits",
+                         800,
+                         0.0,
+                         400.0);
+  ee_hit_lat = new TH1F("ee_hit_lat", "lateral hit position;arm (cm);Number of energy weighted hits", 100, 0.0, 5.0);
+  ee_hit_rz = new TH2F(
+      "ee_hit_rz", "hit position along the shower direction;shower depth (cm);arm (cm)", 800, 0.0, 400.0, 100, 0.0, 5.0);
+  ee_hit_long_sd = new TH1F("ee_hit_long_sd",
+                            "longitudinal hit position in Sensitive Detector;shower depth "
+                            "(cm);Number of energy weighted hits",
+                            800,
+                            0.0,
+                            400.0);
+  ee_hit_lat_sd = new TH1F("ee_hit_lat_sd",
+                           "lateral hit position in Sensitive Detector;arm "
+                           "(cm);Number of energy weighted hits",
+                           100,
+                           0.0,
+                           5.0);
+  ee_hit_rz_sd = new TH2F("ee_hit_rz_sd",
+                          "hit position along the shower direction in "
+                          "Sensitive Detector;shower depth (cm);arm (cm)",
+                          800,
+                          0.0,
+                          400.0,
+                          100,
+                          0.0,
+                          5.0);
 }
 
-
 GflashG4Watcher::~GflashG4Watcher() {
   histFile_->cd();
   histFile_->Write();
   histFile_->Close();
 }
 
-
-void GflashG4Watcher::update(const BeginOfEvent* g4Event){
-
+void GflashG4Watcher::update(const BeginOfEvent *g4Event) {
   inc_flag = false;
 
-  const G4Event* evt = (*g4Event)();
+  const G4Event *evt = (*g4Event)();
   inc_vertex = evt->GetPrimaryVertex(0)->GetPosition();
   inc_position = inc_vertex;
   inc_direction = evt->GetPrimaryVertex(0)->GetPrimary(0)->GetMomentum().unit();
   inc_energy = evt->GetPrimaryVertex(0)->GetPrimary(0)->GetMomentum().mag();
   out_energy = 0;
 
-  em_incE->Fill(inc_energy/GeV);
-  em_vtx_rho->Fill(inc_vertex.rho()/cm);
-  em_vtx_z->Fill(inc_vertex.z()/cm);
-
-  if(std::abs(inc_direction.eta()) < 1.5) eb_ssp_rho->Fill(inc_position.rho()/cm);
-  else ee_ssp_z->Fill(inc_position.z()/cm);
+  em_incE->Fill(inc_energy / GeV);
+  em_vtx_rho->Fill(inc_vertex.rho() / cm);
+  em_vtx_z->Fill(inc_vertex.z() / cm);
 
+  if (std::abs(inc_direction.eta()) < 1.5)
+    eb_ssp_rho->Fill(inc_position.rho() / cm);
+  else
+    ee_ssp_z->Fill(inc_position.z() / cm);
 }
 
+void GflashG4Watcher::update(const EndOfEvent *g4Event) {}
 
-void GflashG4Watcher::update(const EndOfEvent* g4Event){ }
-
-
-void GflashG4Watcher::update(const G4Step* aStep){
-
-  if(aStep == nullptr) return;
+void GflashG4Watcher::update(const G4Step *aStep) {
+  if (aStep == nullptr)
+    return;
 
   double hitEnergy = aStep->GetTotalEnergyDeposit();
 
-  if(hitEnergy < 1.0e-6) return;
+  if (hitEnergy < 1.0e-6)
+    return;
 
   bool inEB = std::abs(inc_direction.eta()) < 1.5;
 
-  out_energy += hitEnergy; // to check outgoing energy
+  out_energy += hitEnergy;  // to check outgoing energy
 
   // This is to calculate shower depth and arm of hits from the shower direction
   G4ThreeVector hitPosition = aStep->GetPreStepPoint()->GetPosition();
@@ -104,39 +145,33 @@ void GflashG4Watcher::update(const G4Step* aStep){
   double diff_z = std::abs(diff.mag() * std::cos(angle));
   double diff_r = std::abs(diff.mag() * std::sin(angle));
 
-  G4VSensitiveDetector* aSensitive = aStep->GetPreStepPoint()->GetSensitiveDetector();
+  G4VSensitiveDetector *aSensitive = aStep->GetPreStepPoint()->GetSensitiveDetector();
 
-  if(inEB){ // showers in barrel crystals
+  if (inEB) {  // showers in barrel crystals
     hitEnergy *= recoEnergyScaleEB_;
-    eb_hit_long->Fill(diff_z/cm,hitEnergy/GeV);
-    eb_hit_lat->Fill(diff_r/cm,hitEnergy/GeV);
-    eb_hit_rz->Fill(diff_z/cm,diff_r/cm,hitEnergy/GeV);
-    if(aSensitive){
-      eb_hit_long_sd->Fill(diff_z/cm,hitEnergy/GeV);
-      eb_hit_lat_sd->Fill(diff_r/cm,hitEnergy/GeV);
-      eb_hit_rz_sd->Fill(diff_z/cm,diff_r/cm,hitEnergy/GeV);
+    eb_hit_long->Fill(diff_z / cm, hitEnergy / GeV);
+    eb_hit_lat->Fill(diff_r / cm, hitEnergy / GeV);
+    eb_hit_rz->Fill(diff_z / cm, diff_r / cm, hitEnergy / GeV);
+    if (aSensitive) {
+      eb_hit_long_sd->Fill(diff_z / cm, hitEnergy / GeV);
+      eb_hit_lat_sd->Fill(diff_r / cm, hitEnergy / GeV);
+      eb_hit_rz_sd->Fill(diff_z / cm, diff_r / cm, hitEnergy / GeV);
     }
-  }
-  else{ // showers in endcap crystals
+  } else {  // showers in endcap crystals
     hitEnergy *= recoEnergyScaleEE_;
-    ee_hit_long->Fill(diff_z/cm,hitEnergy/GeV);
-    ee_hit_lat->Fill(diff_r/cm,hitEnergy/GeV);
-    ee_hit_rz->Fill(diff_z/cm,diff_r/cm,hitEnergy/GeV);
-    if(aSensitive){
-      ee_hit_long_sd->Fill(diff_z/cm,hitEnergy/GeV);
-      ee_hit_lat_sd->Fill(diff_r/cm,hitEnergy/GeV);
-      ee_hit_rz_sd->Fill(diff_z/cm,diff_r/cm,hitEnergy/GeV);
+    ee_hit_long->Fill(diff_z / cm, hitEnergy / GeV);
+    ee_hit_lat->Fill(diff_r / cm, hitEnergy / GeV);
+    ee_hit_rz->Fill(diff_z / cm, diff_r / cm, hitEnergy / GeV);
+    if (aSensitive) {
+      ee_hit_long_sd->Fill(diff_z / cm, hitEnergy / GeV);
+      ee_hit_lat_sd->Fill(diff_r / cm, hitEnergy / GeV);
+      ee_hit_rz_sd->Fill(diff_z / cm, diff_r / cm, hitEnergy / GeV);
     }
   }
-
-
 }
 
-
-//define this as a plug-in
-#include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
+// define this as a plug-in
 #include "FWCore/PluginManager/interface/ModuleDef.h"
-
+#include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
 
 DEFINE_SIMWATCHER(GflashG4Watcher);
-
diff --git a/SimG4Core/GFlash/src/GflashEMShowerModel.cc b/SimG4Core/GFlash/src/GflashEMShowerModel.cc
index 08a0ff7941caa..a89a5a7bbfa59 100644
--- a/SimG4Core/GFlash/src/GflashEMShowerModel.cc
+++ b/SimG4Core/GFlash/src/GflashEMShowerModel.cc
@@ -1,5 +1,5 @@
 //
-// initial setup : E.Barberio & Joanna Weng 
+// initial setup : E.Barberio & Joanna Weng
 // big changes : Soon Jun & Dongwook Jang
 //
 #include "SimG4Core/Application/interface/SteppingAction.h"
@@ -9,130 +9,131 @@
 #include "SimGeneral/GFlash/interface/GflashHit.h"
 
 #include "G4Electron.hh"
-#include "G4Positron.hh"
-#include "G4VProcess.hh"
-#include "G4VPhysicalVolume.hh" 
-#include "G4LogicalVolume.hh"
-#include "G4TransportationManager.hh"
 #include "G4EventManager.hh"
 #include "G4FastSimulationManager.hh"
+#include "G4LogicalVolume.hh"
+#include "G4Positron.hh"
 #include "G4TouchableHandle.hh"
+#include "G4TransportationManager.hh"
+#include "G4VPhysicalVolume.hh"
+#include "G4VProcess.hh"
 #include "G4VSensitiveDetector.hh"
 
 using namespace CLHEP;
 
-GflashEMShowerModel::GflashEMShowerModel(const G4String& modelName, 
-					 G4Envelope* envelope, 
-					 const edm::ParameterSet& parSet)
-  : G4VFastSimulationModel(modelName, envelope), theParSet(parSet) {
-
+GflashEMShowerModel::GflashEMShowerModel(const G4String &modelName,
+                                         G4Envelope *envelope,
+                                         const edm::ParameterSet &parSet)
+    : G4VFastSimulationModel(modelName, envelope), theParSet(parSet) {
   theProfile = new GflashEMShowerProfile(parSet);
-  theRegion  = const_cast<const G4Region*>(envelope); 
+  theRegion = const_cast<const G4Region *>(envelope);
 
   theGflashStep = new G4Step();
   theGflashTouchableHandle = new G4TouchableHistory();
   theGflashNavigator = new G4Navigator();
-
 }
 
 // -----------------------------------------------------------------------------------
 
 GflashEMShowerModel::~GflashEMShowerModel() {
-
   delete theProfile;
   delete theGflashStep;
 }
 
-G4bool GflashEMShowerModel::IsApplicable(const G4ParticleDefinition& particleType) { 
-
-  return ( &particleType == G4Electron::ElectronDefinition() ||
-	   &particleType == G4Positron::PositronDefinition() ); 
-
+G4bool GflashEMShowerModel::IsApplicable(const G4ParticleDefinition &particleType) {
+  return (&particleType == G4Electron::ElectronDefinition() || &particleType == G4Positron::PositronDefinition());
 }
 
 // -----------------------------------------------------------------------------------
-G4bool GflashEMShowerModel::ModelTrigger(const G4FastTrack & fastTrack ) {
-
+G4bool GflashEMShowerModel::ModelTrigger(const G4FastTrack &fastTrack) {
   // Mininum energy cutoff to parameterize
-  if(fastTrack.GetPrimaryTrack()->GetKineticEnergy() < GeV) { return false; }
-  if(excludeDetectorRegion(fastTrack)) { return false; }
+  if (fastTrack.GetPrimaryTrack()->GetKineticEnergy() < GeV) {
+    return false;
+  }
+  if (excludeDetectorRegion(fastTrack)) {
+    return false;
+  }
 
-  // This will be changed accordingly when the way 
+  // This will be changed accordingly when the way
   // dealing with CaloRegion changes later.
-  G4VPhysicalVolume* pCurrentVolume = (fastTrack.GetPrimaryTrack()->GetTouchable())->GetVolume();
-  if( pCurrentVolume == nullptr) { return false; }
+  G4VPhysicalVolume *pCurrentVolume = (fastTrack.GetPrimaryTrack()->GetTouchable())->GetVolume();
+  if (pCurrentVolume == nullptr) {
+    return false;
+  }
 
-  G4LogicalVolume* lv = pCurrentVolume->GetLogicalVolume();
-  if(lv->GetRegion() != theRegion) { return false; }
+  G4LogicalVolume *lv = pCurrentVolume->GetLogicalVolume();
+  if (lv->GetRegion() != theRegion) {
+    return false;
+  }
   return true;
 }
 
 // -----------------------------------------------------------------------------------
-void GflashEMShowerModel::DoIt(const G4FastTrack& fastTrack, G4FastStep& fastStep) {
-
+void GflashEMShowerModel::DoIt(const G4FastTrack &fastTrack, G4FastStep &fastStep) {
   // Kill the parameterised particle:
   fastStep.KillPrimaryTrack();
   fastStep.ProposePrimaryTrackPathLength(0.0);
 
-  //input variables for GflashEMShowerProfile with showerType = 1,5 (shower starts inside crystals)
-  G4double energy = fastTrack.GetPrimaryTrack()->GetKineticEnergy()/GeV;
+  // input variables for GflashEMShowerProfile with showerType = 1,5 (shower
+  // starts inside crystals)
+  G4double energy = fastTrack.GetPrimaryTrack()->GetKineticEnergy() / GeV;
   G4double globalTime = fastTrack.GetPrimaryTrack()->GetStep()->GetPostStepPoint()->GetGlobalTime();
   G4double charge = fastTrack.GetPrimaryTrack()->GetStep()->GetPreStepPoint()->GetCharge();
   G4ThreeVector position = fastTrack.GetPrimaryTrack()->GetPosition() / cm;
-  G4ThreeVector momentum = fastTrack.GetPrimaryTrack()->GetMomentum()/GeV;
+  G4ThreeVector momentum = fastTrack.GetPrimaryTrack()->GetMomentum() / GeV;
   G4int showerType = Gflash::findShowerType(position);
 
   // Do actual parameterization. The result of parameterization is gflashHitList
-  theProfile->initialize(showerType,energy,globalTime,charge,position,momentum);
+  theProfile->initialize(showerType, energy, globalTime, charge, position, momentum);
   theProfile->parameterization();
 
-  //make hits
+  // make hits
   makeHits(fastTrack);
 }
 
-void GflashEMShowerModel::makeHits(const G4FastTrack& fastTrack) {
-
-  std::vector<GflashHit>& gflashHitList = theProfile->getGflashHitList();
+void GflashEMShowerModel::makeHits(const G4FastTrack &fastTrack) {
+  std::vector<GflashHit> &gflashHitList = theProfile->getGflashHitList();
 
-  theGflashStep->SetTrack(const_cast<G4Track*>(fastTrack.GetPrimaryTrack()));
+  theGflashStep->SetTrack(const_cast<G4Track *>(fastTrack.GetPrimaryTrack()));
 
-  theGflashStep->GetPostStepPoint()->SetProcessDefinedStep(const_cast<G4VProcess*>
-    (fastTrack.GetPrimaryTrack()->GetStep()->GetPostStepPoint()->GetProcessDefinedStep()));
-  theGflashNavigator->SetWorldVolume(G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume());
+  theGflashStep->GetPostStepPoint()->SetProcessDefinedStep(
+      const_cast<G4VProcess *>(fastTrack.GetPrimaryTrack()->GetStep()->GetPostStepPoint()->GetProcessDefinedStep()));
+  theGflashNavigator->SetWorldVolume(
+      G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume());
 
-  std::vector<GflashHit>::const_iterator spotIter    = gflashHitList.begin();
+  std::vector<GflashHit>::const_iterator spotIter = gflashHitList.begin();
   std::vector<GflashHit>::const_iterator spotIterEnd = gflashHitList.end();
 
-  for( ; spotIter != spotIterEnd; spotIter++){
+  for (; spotIter != spotIterEnd; spotIter++) {
+    // put touchable for each hit so that touchable history keeps track of each
+    // step.
+    theGflashNavigator->LocateGlobalPointAndUpdateTouchableHandle(
+        spotIter->getPosition(), G4ThreeVector(0, 0, 0), theGflashTouchableHandle, false);
+    updateGflashStep(spotIter->getPosition(), spotIter->getTime());
 
-      //put touchable for each hit so that touchable history keeps track of each step.
-      theGflashNavigator->LocateGlobalPointAndUpdateTouchableHandle(spotIter->getPosition(),G4ThreeVector(0,0,0),
-								    theGflashTouchableHandle, false);
-      updateGflashStep(spotIter->getPosition(),spotIter->getTime());
+    // Send G4Step information to Hit/Digi if the volume is sensitive
+    // Copied from G4SteppingManager.cc
 
-      // Send G4Step information to Hit/Digi if the volume is sensitive
-      // Copied from G4SteppingManager.cc
-    
-      G4VPhysicalVolume* aCurrentVolume = theGflashStep->GetPreStepPoint()->GetPhysicalVolume();
-      if( aCurrentVolume == nullptr ) continue;
+    G4VPhysicalVolume *aCurrentVolume = theGflashStep->GetPreStepPoint()->GetPhysicalVolume();
+    if (aCurrentVolume == nullptr)
+      continue;
 
-      G4LogicalVolume* lv = aCurrentVolume->GetLogicalVolume();
-      if(lv->GetRegion() != theRegion) continue;
+    G4LogicalVolume *lv = aCurrentVolume->GetLogicalVolume();
+    if (lv->GetRegion() != theRegion)
+      continue;
 
-      theGflashStep->GetPreStepPoint()->SetSensitiveDetector(aCurrentVolume->GetLogicalVolume()->GetSensitiveDetector());
-      G4VSensitiveDetector* aSensitive = theGflashStep->GetPreStepPoint()->GetSensitiveDetector();
-      
-      if( aSensitive == nullptr ) continue;
+    theGflashStep->GetPreStepPoint()->SetSensitiveDetector(aCurrentVolume->GetLogicalVolume()->GetSensitiveDetector());
+    G4VSensitiveDetector *aSensitive = theGflashStep->GetPreStepPoint()->GetSensitiveDetector();
 
-      theGflashStep->SetTotalEnergyDeposit(spotIter->getEnergy());
-      aSensitive->Hit(theGflashStep);
-  }
+    if (aSensitive == nullptr)
+      continue;
 
+    theGflashStep->SetTotalEnergyDeposit(spotIter->getEnergy());
+    aSensitive->Hit(theGflashStep);
+  }
 }
 
-void GflashEMShowerModel::updateGflashStep(const G4ThreeVector& spotPosition, 
-					   G4double timeGlobal)
-{
+void GflashEMShowerModel::updateGflashStep(const G4ThreeVector &spotPosition, G4double timeGlobal) {
   theGflashStep->GetPostStepPoint()->SetGlobalTime(timeGlobal);
   theGflashStep->GetPreStepPoint()->SetPosition(spotPosition);
   theGflashStep->GetPostStepPoint()->SetPosition(spotPosition);
@@ -140,14 +141,15 @@ void GflashEMShowerModel::updateGflashStep(const G4ThreeVector& spotPosition,
 }
 
 // -----------------------------------------------------------------------------------
-G4bool GflashEMShowerModel::excludeDetectorRegion(const G4FastTrack& fastTrack) {
-
-  G4bool isExcluded=false;
-
-  //exclude regions where geometry are complicated
-  //+- one supermodule around the EB/EE boundary: 1.479 +- 0.0174*5 
-  G4double eta =   fastTrack.GetPrimaryTrack()->GetPosition().pseudoRapidity() ;
-  if(std::fabs(eta) > 1.392 && std::fabs(eta) < 1.566) { return true; }
+G4bool GflashEMShowerModel::excludeDetectorRegion(const G4FastTrack &fastTrack) {
+  G4bool isExcluded = false;
+
+  // exclude regions where geometry are complicated
+  //+- one supermodule around the EB/EE boundary: 1.479 +- 0.0174*5
+  G4double eta = fastTrack.GetPrimaryTrack()->GetPosition().pseudoRapidity();
+  if (std::fabs(eta) > 1.392 && std::fabs(eta) < 1.566) {
+    return true;
+  }
 
   return isExcluded;
 }
@@ -169,7 +171,8 @@ G4int GflashEMShowerModel::findShowerType(const G4FastTrack& fastTrack)
   // showerType =  6 : ssp after  EFRY before HE
   // showerType =  7 : ssp inside HE
 
-  G4TouchableHistory* touch = (G4TouchableHistory*)(fastTrack.GetPrimaryTrack()->GetTouchable());
+  G4TouchableHistory* touch =
+(G4TouchableHistory*)(fastTrack.GetPrimaryTrack()->GetTouchable());
   G4LogicalVolume* lv = touch->GetVolume()->GetLogicalVolume();
 
   std::size_t pos1  = lv->GetName().find("EBRY");
@@ -187,13 +190,14 @@ G4int GflashEMShowerModel::findShowerType(const G4FastTrack& fastTrack)
 
     G4double posRho = position.getRho();
 
-    if(pos1 != std::string::npos || pos11 != std::string::npos || pos12 != std::string::npos ) {
-      showerType = 1;
+    if(pos1 != std::string::npos || pos11 != std::string::npos || pos12 !=
+std::string::npos ) { showerType = 1;
     }
     else {
       if(kCalor == Gflash::kESPM) {
         showerType = 2;
-        if( posRho < Gflash::Rmin[Gflash::kESPM]+ Gflash::ROffCrystalEB ) showerType = 0;
+        if( posRho < Gflash::Rmin[Gflash::kESPM]+ Gflash::ROffCrystalEB )
+showerType = 0;
       }
       else showerType = 3;
     }
@@ -207,7 +211,8 @@ G4int GflashEMShowerModel::findShowerType(const G4FastTrack& fastTrack)
     else {
       if(kCalor == Gflash::kENCA) {
         showerType = 6;
-        if(fabs(position.getZ()) < Gflash::Zmin[Gflash::kENCA] + Gflash::ZOffCrystalEE) showerType = 4;
+        if(fabs(position.getZ()) < Gflash::Zmin[Gflash::kENCA] +
+Gflash::ZOffCrystalEE) showerType = 4;
       }
       else showerType = 7;
     }
diff --git a/SimG4Core/GFlash/src/GflashHadronShowerModel.cc b/SimG4Core/GFlash/src/GflashHadronShowerModel.cc
index 3ce7120f94746..e9101ddd354e2 100644
--- a/SimG4Core/GFlash/src/GflashHadronShowerModel.cc
+++ b/SimG4Core/GFlash/src/GflashHadronShowerModel.cc
@@ -1,40 +1,41 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "SimG4Core/GFlash/interface/GflashHadronShowerModel.h"
 #include "SimG4Core/Application/interface/SteppingAction.h"
+#include "SimG4Core/GFlash/interface/GflashHadronShowerModel.h"
 
-#include "SimGeneral/GFlash/interface/GflashHadronShowerProfile.h"
-#include "SimGeneral/GFlash/interface/GflashPiKShowerProfile.h"
-#include "SimGeneral/GFlash/interface/GflashKaonPlusShowerProfile.h"
-#include "SimGeneral/GFlash/interface/GflashKaonMinusShowerProfile.h"
-#include "SimGeneral/GFlash/interface/GflashProtonShowerProfile.h"
 #include "SimGeneral/GFlash/interface/GflashAntiProtonShowerProfile.h"
-#include "SimGeneral/GFlash/interface/GflashNameSpace.h"
+#include "SimGeneral/GFlash/interface/GflashHadronShowerProfile.h"
 #include "SimGeneral/GFlash/interface/GflashHistogram.h"
 #include "SimGeneral/GFlash/interface/GflashHit.h"
+#include "SimGeneral/GFlash/interface/GflashKaonMinusShowerProfile.h"
+#include "SimGeneral/GFlash/interface/GflashKaonPlusShowerProfile.h"
+#include "SimGeneral/GFlash/interface/GflashNameSpace.h"
+#include "SimGeneral/GFlash/interface/GflashPiKShowerProfile.h"
+#include "SimGeneral/GFlash/interface/GflashProtonShowerProfile.h"
 
+#include "G4EventManager.hh"
 #include "G4FastSimulationManager.hh"
-#include "G4TransportationManager.hh"
 #include "G4TouchableHandle.hh"
-#include "G4VSensitiveDetector.hh"
+#include "G4TransportationManager.hh"
 #include "G4VPhysicalVolume.hh"
-#include "G4EventManager.hh"
+#include "G4VSensitiveDetector.hh"
 
-#include "G4PionMinus.hh"
-#include "G4PionPlus.hh"
+#include "G4AntiProton.hh"
 #include "G4KaonMinus.hh"
 #include "G4KaonPlus.hh"
+#include "G4PionMinus.hh"
+#include "G4PionPlus.hh"
 #include "G4Proton.hh"
-#include "G4AntiProton.hh"
 #include "G4VProcess.hh"
 
 #include <vector>
 
 using namespace CLHEP;
 
-GflashHadronShowerModel::GflashHadronShowerModel(G4String modelName, G4Region* envelope, const edm::ParameterSet& parSet)
-  : G4VFastSimulationModel(modelName, envelope), theParSet(parSet)
-{
+GflashHadronShowerModel::GflashHadronShowerModel(G4String modelName,
+                                                 G4Region *envelope,
+                                                 const edm::ParameterSet &parSet)
+    : G4VFastSimulationModel(modelName, envelope), theParSet(parSet) {
   theWatcherOn = parSet.getParameter<bool>("watcherOn");
 
   theProfile = new GflashHadronShowerProfile(parSet);
@@ -48,250 +49,246 @@ GflashHadronShowerModel::GflashHadronShowerModel(G4String modelName, G4Region* e
   theGflashStep = new G4Step();
   theGflashTouchableHandle = new G4TouchableHistory();
   theGflashNavigator = new G4Navigator();
-
 }
 
-GflashHadronShowerModel::~GflashHadronShowerModel()
-{
-  if(theProfile) delete theProfile;
-  if(theGflashStep) delete theGflashStep;
+GflashHadronShowerModel::~GflashHadronShowerModel() {
+  if (theProfile)
+    delete theProfile;
+  if (theGflashStep)
+    delete theGflashStep;
 }
 
-G4bool GflashHadronShowerModel::IsApplicable(const G4ParticleDefinition& particleType)
-{
-  return 
-    &particleType == G4PionMinus::PionMinusDefinition() ||
-    &particleType == G4PionPlus::PionPlusDefinition() ||
-    &particleType == G4KaonMinus::KaonMinusDefinition() ||
-    &particleType == G4KaonPlus::KaonPlusDefinition() ||
-    &particleType == G4AntiProton::AntiProtonDefinition() ||
-    &particleType == G4Proton::ProtonDefinition() ;
+G4bool GflashHadronShowerModel::IsApplicable(const G4ParticleDefinition &particleType) {
+  return &particleType == G4PionMinus::PionMinusDefinition() || &particleType == G4PionPlus::PionPlusDefinition() ||
+         &particleType == G4KaonMinus::KaonMinusDefinition() || &particleType == G4KaonPlus::KaonPlusDefinition() ||
+         &particleType == G4AntiProton::AntiProtonDefinition() || &particleType == G4Proton::ProtonDefinition();
 }
 
-G4bool GflashHadronShowerModel::ModelTrigger(const G4FastTrack& fastTrack)
-{
+G4bool GflashHadronShowerModel::ModelTrigger(const G4FastTrack &fastTrack) {
   // ModelTrigger returns false for Gflash Hadronic Shower Model if it is not
-  // tested from the corresponding wrapper process, GflashHadronWrapperProcess. 
+  // tested from the corresponding wrapper process, GflashHadronWrapperProcess.
   // Temporarily the track status is set to fPostponeToNextEvent at the wrapper
-  // process before ModelTrigger is really tested for the second time through 
-  // PostStepGPIL of enviaged parameterization processes.  The better 
+  // process before ModelTrigger is really tested for the second time through
+  // PostStepGPIL of enviaged parameterization processes.  The better
   // implmentation may be using via G4VUserTrackInformation of each track, which
   // requires to modify a geant source code of stepping (G4SteppingManager2)
 
   G4bool trigger = false;
 
   // mininum energy cutoff to parameterize
-  if (fastTrack.GetPrimaryTrack()->GetKineticEnergy()/GeV < Gflash::energyCutOff) return trigger;
-
-  // check whether this is called from the normal GPIL or the wrapper process GPIL
-  if(fastTrack.GetPrimaryTrack()->GetTrackStatus() == fPostponeToNextEvent ) {
+  if (fastTrack.GetPrimaryTrack()->GetKineticEnergy() / GeV < Gflash::energyCutOff)
+    return trigger;
 
+  // check whether this is called from the normal GPIL or the wrapper process
+  // GPIL
+  if (fastTrack.GetPrimaryTrack()->GetTrackStatus() == fPostponeToNextEvent) {
     // Shower pameterization start at the first inelastic interaction point
-    G4bool isInelastic  = isFirstInelasticInteraction(fastTrack);
-    
+    G4bool isInelastic = isFirstInelasticInteraction(fastTrack);
+
     // Other conditions
-    if(isInelastic) {
+    if (isInelastic) {
       trigger = (!excludeDetectorRegion(fastTrack));
     }
   }
 
   return trigger;
-
 }
 
-void GflashHadronShowerModel::DoIt(const G4FastTrack& fastTrack, G4FastStep& fastStep)
-{
+void GflashHadronShowerModel::DoIt(const G4FastTrack &fastTrack, G4FastStep &fastStep) {
   // kill the particle
   fastStep.KillPrimaryTrack();
   fastStep.ProposePrimaryTrackPathLength(0.0);
 
   // parameterize energy depostion by the particle type
-  G4ParticleDefinition* particleType = fastTrack.GetPrimaryTrack()->GetDefinition();
-  
-  theProfile = thePiKProfile;
-  if(particleType == G4KaonMinus::KaonMinusDefinition()) theProfile = theKaonMinusProfile;
-  else if(particleType == G4KaonPlus::KaonPlusDefinition()) theProfile = theKaonPlusProfile;
-  else if(particleType == G4AntiProton::AntiProtonDefinition()) theProfile = theAntiProtonProfile;
-  else if(particleType == G4Proton::ProtonDefinition()) theProfile = theProtonProfile;
+  G4ParticleDefinition *particleType = fastTrack.GetPrimaryTrack()->GetDefinition();
 
-  //input variables for GflashHadronShowerProfile
-  G4double energy = fastTrack.GetPrimaryTrack()->GetKineticEnergy()/GeV;
+  theProfile = thePiKProfile;
+  if (particleType == G4KaonMinus::KaonMinusDefinition())
+    theProfile = theKaonMinusProfile;
+  else if (particleType == G4KaonPlus::KaonPlusDefinition())
+    theProfile = theKaonPlusProfile;
+  else if (particleType == G4AntiProton::AntiProtonDefinition())
+    theProfile = theAntiProtonProfile;
+  else if (particleType == G4Proton::ProtonDefinition())
+    theProfile = theProtonProfile;
+
+  // input variables for GflashHadronShowerProfile
+  G4double energy = fastTrack.GetPrimaryTrack()->GetKineticEnergy() / GeV;
   G4double globalTime = fastTrack.GetPrimaryTrack()->GetStep()->GetPostStepPoint()->GetGlobalTime();
   G4double charge = fastTrack.GetPrimaryTrack()->GetStep()->GetPreStepPoint()->GetCharge();
-  G4ThreeVector position = fastTrack.GetPrimaryTrack()->GetPosition()/cm;
-  G4ThreeVector momentum = fastTrack.GetPrimaryTrack()->GetMomentum()/GeV;
+  G4ThreeVector position = fastTrack.GetPrimaryTrack()->GetPosition() / cm;
+  G4ThreeVector momentum = fastTrack.GetPrimaryTrack()->GetMomentum() / GeV;
   G4int showerType = Gflash::findShowerType(position);
 
-  theProfile->initialize(showerType,energy,globalTime,charge,position,momentum);
+  theProfile->initialize(showerType, energy, globalTime, charge, position, momentum);
   theProfile->loadParameters();
   theProfile->hadronicParameterization();
 
   // make hits
   makeHits(fastTrack);
-
 }
 
-void GflashHadronShowerModel::makeHits(const G4FastTrack& fastTrack) {
-
-  std::vector<GflashHit>& gflashHitList = theProfile->getGflashHitList();
+void GflashHadronShowerModel::makeHits(const G4FastTrack &fastTrack) {
+  std::vector<GflashHit> &gflashHitList = theProfile->getGflashHitList();
 
-  theGflashStep->SetTrack(const_cast<G4Track*>(fastTrack.GetPrimaryTrack()));
-  theGflashStep->GetPostStepPoint()->SetProcessDefinedStep(const_cast<G4VProcess*>
-    (fastTrack.GetPrimaryTrack()->GetStep()->GetPostStepPoint()->GetProcessDefinedStep()));
-  theGflashNavigator->SetWorldVolume(G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume());
+  theGflashStep->SetTrack(const_cast<G4Track *>(fastTrack.GetPrimaryTrack()));
+  theGflashStep->GetPostStepPoint()->SetProcessDefinedStep(
+      const_cast<G4VProcess *>(fastTrack.GetPrimaryTrack()->GetStep()->GetPostStepPoint()->GetProcessDefinedStep()));
+  theGflashNavigator->SetWorldVolume(
+      G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume());
 
-  std::vector<GflashHit>::const_iterator spotIter    = gflashHitList.begin();
+  std::vector<GflashHit>::const_iterator spotIter = gflashHitList.begin();
   std::vector<GflashHit>::const_iterator spotIterEnd = gflashHitList.end();
 
-  for( ; spotIter != spotIterEnd; spotIter++){
-
-    theGflashNavigator->LocateGlobalPointAndUpdateTouchableHandle(spotIter->getPosition(),G4ThreeVector(0,0,0),
-								  theGflashTouchableHandle, false);
-    updateGflashStep(spotIter->getPosition(),spotIter->getTime());
+  for (; spotIter != spotIterEnd; spotIter++) {
+    theGflashNavigator->LocateGlobalPointAndUpdateTouchableHandle(
+        spotIter->getPosition(), G4ThreeVector(0, 0, 0), theGflashTouchableHandle, false);
+    updateGflashStep(spotIter->getPosition(), spotIter->getTime());
 
     // if there is a watcher defined in a job and the flag is turned on
-    if(theWatcherOn) {
+    if (theWatcherOn) {
       theGflashStep->SetTotalEnergyDeposit(spotIter->getEnergy());
-      SteppingAction* userSteppingAction = (SteppingAction*) G4EventManager::GetEventManager()->GetUserSteppingAction();
+      SteppingAction *userSteppingAction = (SteppingAction *)G4EventManager::GetEventManager()->GetUserSteppingAction();
       userSteppingAction->m_g4StepSignal(theGflashStep);
     }
 
-    G4VPhysicalVolume* aCurrentVolume = theGflashStep->GetPreStepPoint()->GetPhysicalVolume();
-    if( aCurrentVolume == nullptr ) continue;
+    G4VPhysicalVolume *aCurrentVolume = theGflashStep->GetPreStepPoint()->GetPhysicalVolume();
+    if (aCurrentVolume == nullptr)
+      continue;
+
+    G4LogicalVolume *lv = aCurrentVolume->GetLogicalVolume();
+    if (lv->GetRegion()->GetName() != "CaloRegion")
+      continue;
 
-    G4LogicalVolume* lv = aCurrentVolume->GetLogicalVolume();
-    if(lv->GetRegion()->GetName() != "CaloRegion") continue;
-	  
     theGflashStep->GetPreStepPoint()->SetSensitiveDetector(aCurrentVolume->GetLogicalVolume()->GetSensitiveDetector());
-    G4VSensitiveDetector* aSensitive = theGflashStep->GetPreStepPoint()->GetSensitiveDetector();
+    G4VSensitiveDetector *aSensitive = theGflashStep->GetPreStepPoint()->GetSensitiveDetector();
+
+    if (aSensitive == nullptr)
+      continue;
 
-    if( aSensitive == nullptr ) continue;
-    
     G4String nameCalor = aCurrentVolume->GetName();
-    nameCalor.assign(nameCalor,0,2);
-    G4double samplingWeight = 1.0; 
-    if(nameCalor == "HB" ) {
+    nameCalor.assign(nameCalor, 0, 2);
+    G4double samplingWeight = 1.0;
+    if (nameCalor == "HB") {
       samplingWeight = Gflash::scaleSensitiveHB;
-    }
-    else if(nameCalor=="HE" || nameCalor == "HT") {
+    } else if (nameCalor == "HE" || nameCalor == "HT") {
       samplingWeight = Gflash::scaleSensitiveHE;
     }
-    theGflashStep->SetTotalEnergyDeposit(spotIter->getEnergy()*samplingWeight);
+    theGflashStep->SetTotalEnergyDeposit(spotIter->getEnergy() * samplingWeight);
 
     aSensitive->Hit(theGflashStep);
-
   }
 }
 
-void GflashHadronShowerModel::updateGflashStep(const G4ThreeVector& spotPosition, G4double timeGlobal)
-{
+void GflashHadronShowerModel::updateGflashStep(const G4ThreeVector &spotPosition, G4double timeGlobal) {
   theGflashStep->GetPostStepPoint()->SetGlobalTime(timeGlobal);
   theGflashStep->GetPreStepPoint()->SetPosition(spotPosition);
   theGflashStep->GetPostStepPoint()->SetPosition(spotPosition);
   theGflashStep->GetPreStepPoint()->SetTouchableHandle(theGflashTouchableHandle);
 }
 
-G4bool GflashHadronShowerModel::isFirstInelasticInteraction(const G4FastTrack& fastTrack)
-{
-  G4bool isFirst=false;
-
-  G4StepPoint* preStep = fastTrack.GetPrimaryTrack()->GetStep()->GetPreStepPoint();
-  G4StepPoint* postStep = fastTrack.GetPrimaryTrack()->GetStep()->GetPostStepPoint();
+G4bool GflashHadronShowerModel::isFirstInelasticInteraction(const G4FastTrack &fastTrack) {
+  G4bool isFirst = false;
 
-  G4String procName = postStep->GetProcessDefinedStep()->GetProcessName();  
-  G4ParticleDefinition* particleType = fastTrack.GetPrimaryTrack()->GetDefinition();
+  G4StepPoint *preStep = fastTrack.GetPrimaryTrack()->GetStep()->GetPreStepPoint();
+  G4StepPoint *postStep = fastTrack.GetPrimaryTrack()->GetStep()->GetPostStepPoint();
 
-  //@@@ this part is still temporary and the cut for the variable ratio should be optimized later
+  G4String procName = postStep->GetProcessDefinedStep()->GetProcessName();
+  G4ParticleDefinition *particleType = fastTrack.GetPrimaryTrack()->GetDefinition();
 
-  if((particleType == G4PionPlus::PionPlusDefinition() && procName == "WrappedPionPlusInelastic") || 
-     (particleType == G4PionMinus::PionMinusDefinition() && procName == "WrappedPionMinusInelastic") ||
-     (particleType == G4KaonPlus::KaonPlusDefinition() && procName == "WrappedKaonPlusInelastic") ||
-     (particleType == G4KaonMinus::KaonMinusDefinition() && procName == "WrappedKaonMinusInelastic") ||
-     (particleType == G4AntiProton::AntiProtonDefinition() && procName == "WrappedAntiProtonInelastic") ||
-     (particleType == G4Proton::ProtonDefinition() && procName == "WrappedProtonInelastic")) {
+  //@@@ this part is still temporary and the cut for the variable ratio should
+  // be optimized later
 
-    //skip to the second interaction if the first inelastic is a quasi-elastic like interaction
+  if ((particleType == G4PionPlus::PionPlusDefinition() && procName == "WrappedPionPlusInelastic") ||
+      (particleType == G4PionMinus::PionMinusDefinition() && procName == "WrappedPionMinusInelastic") ||
+      (particleType == G4KaonPlus::KaonPlusDefinition() && procName == "WrappedKaonPlusInelastic") ||
+      (particleType == G4KaonMinus::KaonMinusDefinition() && procName == "WrappedKaonMinusInelastic") ||
+      (particleType == G4AntiProton::AntiProtonDefinition() && procName == "WrappedAntiProtonInelastic") ||
+      (particleType == G4Proton::ProtonDefinition() && procName == "WrappedProtonInelastic")) {
+    // skip to the second interaction if the first inelastic is a quasi-elastic
+    // like interaction
     //@@@ the cut may be optimized later
 
-    const G4TrackVector* fSecondaryVector = fastTrack.GetPrimaryTrack()->GetStep()->GetSecondary();
+    const G4TrackVector *fSecondaryVector = fastTrack.GetPrimaryTrack()->GetStep()->GetSecondary();
     G4double leadingEnergy = 0.0;
 
-    //loop over 'all' secondaries including those produced by continuous processes.
-    //@@@may require an additional condition only for hadron interaction with the process name,
-    //but it will not change the result anyway
+    // loop over 'all' secondaries including those produced by continuous
+    // processes.
+    //@@@may require an additional condition only for hadron interaction with
+    // the process name, but it will not change the result anyway
 
-    for (unsigned int isec = 0 ; isec < fSecondaryVector->size() ; isec++) {
-      G4Track* fSecondaryTrack = (*fSecondaryVector)[isec];
+    for (unsigned int isec = 0; isec < fSecondaryVector->size(); isec++) {
+      G4Track *fSecondaryTrack = (*fSecondaryVector)[isec];
       G4double secondaryEnergy = fSecondaryTrack->GetKineticEnergy();
 
-      if(secondaryEnergy > leadingEnergy ) {
+      if (secondaryEnergy > leadingEnergy) {
         leadingEnergy = secondaryEnergy;
       }
     }
 
-    if((preStep->GetTotalEnergy()!=0) && 
-       (leadingEnergy/preStep->GetTotalEnergy() < Gflash::QuasiElasticLike)) isFirst = true;
+    if ((preStep->GetTotalEnergy() != 0) && (leadingEnergy / preStep->GetTotalEnergy() < Gflash::QuasiElasticLike))
+      isFirst = true;
 
-    //Fill debugging histograms and check information on secondaries -
-    //remove after final implimentation
+    // Fill debugging histograms and check information on secondaries -
+    // remove after final implimentation
 
-    if(theHisto->getStoreFlag()) {
-      theHisto->preStepPosition->Fill(preStep->GetPosition().getRho()/cm);
-      theHisto->postStepPosition->Fill(postStep->GetPosition().getRho()/cm);
-      theHisto->deltaStep->Fill((postStep->GetPosition() - preStep->GetPosition()).getRho()/cm);
-      theHisto->kineticEnergy->Fill(fastTrack.GetPrimaryTrack()->GetKineticEnergy()/GeV);
-      theHisto->energyLoss->Fill(fabs(fastTrack.GetPrimaryTrack()->GetStep()->GetDeltaEnergy()/GeV));
-      theHisto->energyRatio->Fill(leadingEnergy/preStep->GetTotalEnergy());
+    if (theHisto->getStoreFlag()) {
+      theHisto->preStepPosition->Fill(preStep->GetPosition().getRho() / cm);
+      theHisto->postStepPosition->Fill(postStep->GetPosition().getRho() / cm);
+      theHisto->deltaStep->Fill((postStep->GetPosition() - preStep->GetPosition()).getRho() / cm);
+      theHisto->kineticEnergy->Fill(fastTrack.GetPrimaryTrack()->GetKineticEnergy() / GeV);
+      theHisto->energyLoss->Fill(fabs(fastTrack.GetPrimaryTrack()->GetStep()->GetDeltaEnergy() / GeV));
+      theHisto->energyRatio->Fill(leadingEnergy / preStep->GetTotalEnergy());
     }
-
- }
+  }
   return isFirst;
-} 
+}
 
-G4bool GflashHadronShowerModel::excludeDetectorRegion(const G4FastTrack& fastTrack)
-{
-  G4bool isExcluded=false;
+G4bool GflashHadronShowerModel::excludeDetectorRegion(const G4FastTrack &fastTrack) {
+  G4bool isExcluded = false;
   int verbosity = theParSet.getUntrackedParameter<int>("Verbosity");
-  
-  //exclude regions where geometry are complicated
+
+  // exclude regions where geometry are complicated
   //+- one supermodule around the EB/EE boundary: 1.479 +- 0.0174*5
-  G4double eta =   fastTrack.GetPrimaryTrack()->GetPosition().pseudoRapidity() ;
-  if(std::fabs(eta) > 1.392 && std::fabs(eta) < 1.566) {
-    if(verbosity>0) {
-       edm::LogInfo("SimGeneralGFlash") << "GflashHadronShowerModel: excluding region of eta = " << eta;
+  G4double eta = fastTrack.GetPrimaryTrack()->GetPosition().pseudoRapidity();
+  if (std::fabs(eta) > 1.392 && std::fabs(eta) < 1.566) {
+    if (verbosity > 0) {
+      edm::LogInfo("SimGeneralGFlash") << "GflashHadronShowerModel: excluding region of eta = " << eta;
     }
-    return true;  
-  }
-  else {
-    G4StepPoint* postStep = fastTrack.GetPrimaryTrack()->GetStep()->GetPostStepPoint();
+    return true;
+  } else {
+    G4StepPoint *postStep = fastTrack.GetPrimaryTrack()->GetStep()->GetPostStepPoint();
 
-    Gflash::CalorimeterNumber kCalor = Gflash::getCalorimeterNumber(postStep->GetPosition()/cm);
+    Gflash::CalorimeterNumber kCalor = Gflash::getCalorimeterNumber(postStep->GetPosition() / cm);
     G4double distOut = 9999.0;
 
-    //exclude the region where the shower starting point is inside the preshower
-    if( std::fabs(eta) > Gflash::EtaMin[Gflash::kENCA] &&
-        std::fabs((postStep->GetPosition()).getZ()/cm) < Gflash::Zmin[Gflash::kENCA]) {
+    // exclude the region where the shower starting point is inside the
+    // preshower
+    if (std::fabs(eta) > Gflash::EtaMin[Gflash::kENCA] &&
+        std::fabs((postStep->GetPosition()).getZ() / cm) < Gflash::Zmin[Gflash::kENCA]) {
       return true;
     }
 
     //<---the shower starting point is always inside envelopes
-    //@@@exclude the region where the shower starting point is too close to the end of
-    //the hadronic envelopes (may need to be optimized further!)
-    //@@@if we extend parameterization including Magnet/HO, we need to change this strategy
-    if(kCalor == Gflash::kHB) {
-      distOut =  Gflash::Rmax[Gflash::kHB] - postStep->GetPosition().getRho()/cm;
-      if (distOut < Gflash::MinDistanceToOut ) isExcluded = true;
-    }
-    else if(kCalor == Gflash::kHE) {
-      distOut =  Gflash::Zmax[Gflash::kHE] - std::fabs(postStep->GetPosition().getZ()/cm);
-      if (distOut < Gflash::MinDistanceToOut ) isExcluded = true;
+    //@@@exclude the region where the shower starting point is too close to the
+    // end of the hadronic envelopes (may need to be optimized further!)
+    //@@@if we extend parameterization including Magnet/HO, we need to change
+    // this strategy
+    if (kCalor == Gflash::kHB) {
+      distOut = Gflash::Rmax[Gflash::kHB] - postStep->GetPosition().getRho() / cm;
+      if (distOut < Gflash::MinDistanceToOut)
+        isExcluded = true;
+    } else if (kCalor == Gflash::kHE) {
+      distOut = Gflash::Zmax[Gflash::kHE] - std::fabs(postStep->GetPosition().getZ() / cm);
+      if (distOut < Gflash::MinDistanceToOut)
+        isExcluded = true;
     }
 
     //@@@remove this print statement later
-    if(isExcluded && verbosity > 0) {
-      std::cout << "GflashHadronShowerModel: skipping kCalor = " << kCalor << 
-	" DistanceToOut " << distOut << " from (" <<  (postStep->GetPosition()).getRho()/cm << 
-	":" << (postStep->GetPosition()).getZ()/cm << ") of KE = " << fastTrack.GetPrimaryTrack()->GetKineticEnergy()/GeV << std::endl;
+    if (isExcluded && verbosity > 0) {
+      std::cout << "GflashHadronShowerModel: skipping kCalor = " << kCalor << " DistanceToOut " << distOut << " from ("
+                << (postStep->GetPosition()).getRho() / cm << ":" << (postStep->GetPosition()).getZ() / cm
+                << ") of KE = " << fastTrack.GetPrimaryTrack()->GetKineticEnergy() / GeV << std::endl;
     }
   }
 
diff --git a/SimG4Core/GFlash/src/GflashHadronWrapperProcess.cc b/SimG4Core/GFlash/src/GflashHadronWrapperProcess.cc
index 050e2e74cbf8a..495cb6fccffaa 100644
--- a/SimG4Core/GFlash/src/GflashHadronWrapperProcess.cc
+++ b/SimG4Core/GFlash/src/GflashHadronWrapperProcess.cc
@@ -3,85 +3,81 @@
 //
 #include "SimG4Core/GFlash/interface/GflashHadronWrapperProcess.h"
 
-#include "G4Track.hh"
-#include "G4VParticleChange.hh"
+#include "G4GPILSelection.hh"
 #include "G4ProcessManager.hh"
 #include "G4ProcessVector.hh"
+#include "G4Track.hh"
+#include "G4VParticleChange.hh"
 #include "G4VProcess.hh"
-#include "G4GPILSelection.hh"
 
 using namespace CLHEP;
 
-GflashHadronWrapperProcess::GflashHadronWrapperProcess(G4String processName) :
-  particleChange(nullptr), 
-  pmanager(nullptr), 
-  fProcessVector(nullptr),
-  fProcess(nullptr) 
-{
+GflashHadronWrapperProcess::GflashHadronWrapperProcess(G4String processName)
+    : particleChange(nullptr), pmanager(nullptr), fProcessVector(nullptr), fProcess(nullptr) {
   theProcessName = processName;
 }
 
-GflashHadronWrapperProcess::~GflashHadronWrapperProcess() {
-}
+GflashHadronWrapperProcess::~GflashHadronWrapperProcess() {}
 
-G4VParticleChange* GflashHadronWrapperProcess::PostStepDoIt(const G4Track& track, const G4Step& step)
-{
+G4VParticleChange *GflashHadronWrapperProcess::PostStepDoIt(const G4Track &track, const G4Step &step) {
   // process PostStepDoIt for the original process
 
   particleChange = pRegProcess->PostStepDoIt(track, step);
 
-  // specific actions of the wrapper process 
+  // specific actions of the wrapper process
 
-  // update step/track information after PostStep of the original process is done
-  // these steps will be repeated again without additional conflicts even if the 
-  // parameterized physics process doesn't take over the original process
+  // update step/track information after PostStep of the original process is
+  // done these steps will be repeated again without additional conflicts even
+  // if the parameterized physics process doesn't take over the original process
 
-  particleChange->UpdateStepForPostStep(const_cast<G4Step *> (&step));
+  particleChange->UpdateStepForPostStep(const_cast<G4Step *>(&step));
 
   // we may not want to update G4Track during this wrapper process if
   // G4Track accessors are not used in the G4VFastSimulationModel model
   //  (const_cast<G4Step *> (&step))->UpdateTrack();
 
   // update safety after each invocation of PostStepDoIts
-  // G4double safety = std::max(endpointSafety - (endpointSafOrigin - fPostStepPoint->GetPosition()).mag(),0.);
+  // G4double safety = std::max(endpointSafety - (endpointSafOrigin -
+  // fPostStepPoint->GetPosition()).mag(),0.);
   // step.GetPostStepPoint()->SetSafety(safety);
 
-  // the secondaries from the original process are also created at the wrapper 
-  // process, but they must be deleted whether the parameterized physics is  
-  // an 'ExclusivelyForced' process or not.  Normally the secondaries will be 
+  // the secondaries from the original process are also created at the wrapper
+  // process, but they must be deleted whether the parameterized physics is
+  // an 'ExclusivelyForced' process or not.  Normally the secondaries will be
   // created after this wrapper process in G4SteppingManager::InvokePSDIP
 
   // store the secondaries from ParticleChange to SecondaryList
-	
-  G4TrackVector* fSecondary = (const_cast<G4Step *> (&step))->GetfSecondary();
+
+  G4TrackVector *fSecondary = (const_cast<G4Step *>(&step))->GetfSecondary();
   G4int nSecondarySave = fSecondary->size();
 
   G4int num2ndaries = particleChange->GetNumberOfSecondaries();
-  G4Track* tempSecondaryTrack;
+  G4Track *tempSecondaryTrack;
 
-  for(G4int DSecLoop=0 ; DSecLoop< num2ndaries; DSecLoop++){
+  for (G4int DSecLoop = 0; DSecLoop < num2ndaries; DSecLoop++) {
     tempSecondaryTrack = particleChange->GetSecondary(DSecLoop);
-    
+
     // Set the process pointer which created this track
-    tempSecondaryTrack->SetCreatorProcess( pRegProcess );
+    tempSecondaryTrack->SetCreatorProcess(pRegProcess);
 
-    //add secondaries from this wrapper process to the existing list
-    fSecondary->push_back( tempSecondaryTrack );
+    // add secondaries from this wrapper process to the existing list
+    fSecondary->push_back(tempSecondaryTrack);
 
-  } //end of loop on secondary
+  }  // end of loop on secondary
 
   // Now we can still impose conditions on the secondaries from ModelTrigger,
-  // such as the number of secondaries produced by the original process as well as
-  // those by other continuous processes - for the hadronic inelastic interaction, 
-  // it is always true that particleChange->GetNumberOfSecondaries() > 0
+  // such as the number of secondaries produced by the original process as well
+  // as those by other continuous processes - for the hadronic inelastic
+  // interaction, it is always true that
+  // particleChange->GetNumberOfSecondaries() > 0
 
-  // at this stage, updated step information after all processes involved 
+  // at this stage, updated step information after all processes involved
   // should be available
 
   //  Print(step);
 
   // call ModelTrigger for the second time - the primary loop of PostStepGPIL
-  // is inside G4SteppingManager::DefinePhysicalStepLength().    
+  // is inside G4SteppingManager::DefinePhysicalStepLength().
 
   pmanager = track.GetDefinition()->GetProcessManager();
 
@@ -99,88 +95,88 @@ G4VParticleChange* GflashHadronWrapperProcess::PostStepDoIt(const G4Track& track
 
   const G4TrackStatus keepStatus = track.GetTrackStatus();
 
-  (const_cast<G4Track *> (&track))->SetTrackStatus(fPostponeToNextEvent);
-  
-  for(G4int ipm = 0 ; ipm < fProcessVector->entries() ; ipm++) {
-    fProcess = (*fProcessVector)(ipm);  
+  (const_cast<G4Track *>(&track))->SetTrackStatus(fPostponeToNextEvent);
+
+  for (G4int ipm = 0; ipm < fProcessVector->entries(); ipm++) {
+    fProcess = (*fProcessVector)(ipm);
 
-    if ( fProcess->GetProcessType() == fParameterisation ) {
+    if (fProcess->GetProcessType() == fParameterisation) {
       // test ModelTrigger via PostStepGPIL
 
-      testGPIL = fProcess->PostStepGPIL(track,fStepLength,&fForceCondition );
+      testGPIL = fProcess->PostStepGPIL(track, fStepLength, &fForceCondition);
 
-      // if G4FastSimulationModel:: ModelTrigger is true, then the parameterized 
-      // physics process takes over the current process 
-      
-      if( fForceCondition == ExclusivelyForced) {     
+      // if G4FastSimulationModel:: ModelTrigger is true, then the parameterized
+      // physics process takes over the current process
 
-	// clean up memory for changing the process - counter clean up for
-	// the secondaries created by new G4Track in G4HadronicProcess::FillTotalResult 
-	G4int nsec = particleChange->GetNumberOfSecondaries();
-	for(G4int DSecLoop=0 ; DSecLoop< nsec ; DSecLoop++){
-	  G4Track* tempSecondaryTrack = particleChange->GetSecondary(DSecLoop);
-	  delete tempSecondaryTrack;
-	} 
-	particleChange->Clear();
+      if (fForceCondition == ExclusivelyForced) {
+        // clean up memory for changing the process - counter clean up for
+        // the secondaries created by new G4Track in
+        // G4HadronicProcess::FillTotalResult
+        G4int nsec = particleChange->GetNumberOfSecondaries();
+        for (G4int DSecLoop = 0; DSecLoop < nsec; DSecLoop++) {
+          G4Track *tempSecondaryTrack = particleChange->GetSecondary(DSecLoop);
+          delete tempSecondaryTrack;
+        }
+        particleChange->Clear();
 
-	// updating G4Step between PostStepGPIL and PostStepDoIt for the parameterized 
-        // process may not be necessary, but do it anyway
+        // updating G4Step between PostStepGPIL and PostStepDoIt for the
+        // parameterized process may not be necessary, but do it anyway
 
-	(const_cast<G4Step *> (&step))->SetStepLength(testGPIL);
-        (const_cast<G4Track *> (&track))->SetStepLength(testGPIL);
+        (const_cast<G4Step *>(&step))->SetStepLength(testGPIL);
+        (const_cast<G4Track *>(&track))->SetStepLength(testGPIL);
 
-	step.GetPostStepPoint()->SetStepStatus(fExclusivelyForcedProc);;
-	step.GetPostStepPoint()->SetProcessDefinedStep(fProcess);
+        step.GetPostStepPoint()->SetStepStatus(fExclusivelyForcedProc);
+        ;
+        step.GetPostStepPoint()->SetProcessDefinedStep(fProcess);
         step.GetPostStepPoint()->SetSafety(0.0);
 
-	// invoke PostStepDoIt: equivalent steps for G4SteppingManager::InvokePSDIP 
-        particleChange = fProcess->PostStepDoIt(track,step);
+        // invoke PostStepDoIt: equivalent steps for
+        // G4SteppingManager::InvokePSDIP
+        particleChange = fProcess->PostStepDoIt(track, step);
 
-	// update PostStepPoint of Step according to ParticleChange
-	particleChange->UpdateStepForPostStep(const_cast<G4Step *> (&step));
+        // update PostStepPoint of Step according to ParticleChange
+        particleChange->UpdateStepForPostStep(const_cast<G4Step *>(&step));
 
-	// update G4Track according to ParticleChange after each PostStepDoIt
-        (const_cast<G4Step *> (&step))->UpdateTrack();
+        // update G4Track according to ParticleChange after each PostStepDoIt
+        (const_cast<G4Step *>(&step))->UpdateTrack();
 
-	// update safety after each invocation of PostStepDoIts - acutally this
-	// is not necessary for the parameterized physics process, but do it anyway
+        // update safety after each invocation of PostStepDoIts - acutally this
+        // is not necessary for the parameterized physics process, but do it
+        // anyway
         step.GetPostStepPoint()->SetSafety(0.0);
-	
-	// additional nullification 
-	(const_cast<G4Track *> (&track))->SetTrackStatus( particleChange->GetTrackStatus() );
-      }
-      else {
-	//restore TrackStatus if fForceCondition !=  ExclusivelyForced
-	(const_cast<G4Track *> (&track))->SetTrackStatus(keepStatus);
+
+        // additional nullification
+        (const_cast<G4Track *>(&track))->SetTrackStatus(particleChange->GetTrackStatus());
+      } else {
+        // restore TrackStatus if fForceCondition !=  ExclusivelyForced
+        (const_cast<G4Track *>(&track))->SetTrackStatus(keepStatus);
       }
       // assume that there is one and only one parameterized physics
       break;
     }
   }
 
-  // remove secondaries of this wrapper process that were added to the secondary list
-  // since they will be added in the normal stepping procedure after this->PostStepDoIt 
-  // in G4SteppingManager::InvokePSDIP
+  // remove secondaries of this wrapper process that were added to the secondary
+  // list since they will be added in the normal stepping procedure after
+  // this->PostStepDoIt in G4SteppingManager::InvokePSDIP
 
-  //move the iterator to the (nSecondarySave+1)th element in the secondary list
+  // move the iterator to the (nSecondarySave+1)th element in the secondary list
   G4TrackVector::iterator itv = fSecondary->begin();
   itv += nSecondarySave;
 
-  //delete next num2ndaries tracks from the secondary list
-  fSecondary->erase(itv,itv+num2ndaries);
+  // delete next num2ndaries tracks from the secondary list
+  fSecondary->erase(itv, itv + num2ndaries);
 
-  //end of specific actions of this wrapper process
+  // end of specific actions of this wrapper process
 
   return particleChange;
 }
 
-void GflashHadronWrapperProcess::Print(const G4Step& step) {
-
-  std::cout << " GflashHadronWrapperProcess ProcessName, PreStepPosition, preStepPoint KE, PostStepPoint KE, DeltaEnergy Nsec \n " 
-         << step.GetPostStepPoint()->GetProcessDefinedStep()->GetProcessName() << " " 
-         << step.GetPostStepPoint()->GetPosition() << " "  
-         << step.GetPreStepPoint()->GetKineticEnergy()/GeV  << " "  
-         << step.GetPostStepPoint()->GetKineticEnergy()/GeV  << " " 
-         << step.GetDeltaEnergy()/GeV << " "
-         << particleChange->GetNumberOfSecondaries() << std::endl;
+void GflashHadronWrapperProcess::Print(const G4Step &step) {
+  std::cout << " GflashHadronWrapperProcess ProcessName, PreStepPosition, "
+               "preStepPoint KE, PostStepPoint KE, DeltaEnergy Nsec \n "
+            << step.GetPostStepPoint()->GetProcessDefinedStep()->GetProcessName() << " "
+            << step.GetPostStepPoint()->GetPosition() << " " << step.GetPreStepPoint()->GetKineticEnergy() / GeV << " "
+            << step.GetPostStepPoint()->GetKineticEnergy() / GeV << " " << step.GetDeltaEnergy() / GeV << " "
+            << particleChange->GetNumberOfSecondaries() << std::endl;
 }
diff --git a/SimG4Core/GFlash/src/ParametrisedPhysics.cc b/SimG4Core/GFlash/src/ParametrisedPhysics.cc
index 1cf43a49ed128..655c51bec7da3 100644
--- a/SimG4Core/GFlash/src/ParametrisedPhysics.cc
+++ b/SimG4Core/GFlash/src/ParametrisedPhysics.cc
@@ -4,23 +4,22 @@
 #include "G4Electron.hh"
 #include "G4ProcessManager.hh"
 
-#include "G4LeptonConstructor.hh"
-#include "G4MesonConstructor.hh"
 #include "G4BaryonConstructor.hh"
-#include "G4ShortLivedConstructor.hh"
 #include "G4IonConstructor.hh"
+#include "G4LeptonConstructor.hh"
+#include "G4MesonConstructor.hh"
 #include "G4RegionStore.hh"
+#include "G4ShortLivedConstructor.hh"
 
 using namespace CLHEP;
 
-G4ThreadLocal ParametrisedPhysics::ThreadPrivate* ParametrisedPhysics::tpdata = nullptr;
+G4ThreadLocal ParametrisedPhysics::ThreadPrivate *ParametrisedPhysics::tpdata = nullptr;
 
-ParametrisedPhysics::ParametrisedPhysics(std::string name, const edm::ParameterSet & p) :
-  G4VPhysicsConstructor(name), theParSet(p) 
-{}
+ParametrisedPhysics::ParametrisedPhysics(std::string name, const edm::ParameterSet &p)
+    : G4VPhysicsConstructor(name), theParSet(p) {}
 
 ParametrisedPhysics::~ParametrisedPhysics() {
-  if(nullptr != tpdata) {
+  if (nullptr != tpdata) {
     delete tpdata->theEMShowerModel;
     delete tpdata->theHadShowerModel;
     delete tpdata->theHadronShowerModel;
@@ -29,78 +28,71 @@ ParametrisedPhysics::~ParametrisedPhysics() {
   }
 }
 
-void ParametrisedPhysics::ConstructParticle() 
-{
-    G4LeptonConstructor pLeptonConstructor;
-    pLeptonConstructor.ConstructParticle();
+void ParametrisedPhysics::ConstructParticle() {
+  G4LeptonConstructor pLeptonConstructor;
+  pLeptonConstructor.ConstructParticle();
+
+  G4MesonConstructor pMesonConstructor;
+  pMesonConstructor.ConstructParticle();
 
-    G4MesonConstructor pMesonConstructor;
-    pMesonConstructor.ConstructParticle();
+  G4BaryonConstructor pBaryonConstructor;
+  pBaryonConstructor.ConstructParticle();
 
-    G4BaryonConstructor pBaryonConstructor;
-    pBaryonConstructor.ConstructParticle();
+  G4ShortLivedConstructor pShortLivedConstructor;
+  pShortLivedConstructor.ConstructParticle();
 
-    G4ShortLivedConstructor pShortLivedConstructor;
-    pShortLivedConstructor.ConstructParticle();  
-    
-    G4IonConstructor pConstructor;
-    pConstructor.ConstructParticle();  
+  G4IonConstructor pConstructor;
+  pConstructor.ConstructParticle();
 }
 
 void ParametrisedPhysics::ConstructProcess() {
-
   tpdata = new ThreadPrivate;
   tpdata->theEMShowerModel = nullptr;
   tpdata->theHadShowerModel = nullptr;
   tpdata->theHadronShowerModel = nullptr;
   tpdata->theFastSimulationManagerProcess = nullptr;
 
-  bool gem  = theParSet.getParameter<bool>("GflashEcal");
+  bool gem = theParSet.getParameter<bool>("GflashEcal");
   bool ghad = theParSet.getParameter<bool>("GflashHcal");
   G4cout << "GFlash Construct: " << gem << "  " << ghad << G4endl;
 
-  if(gem || ghad) {
-    tpdata->theFastSimulationManagerProcess =
-      new G4FastSimulationManagerProcess();
+  if (gem || ghad) {
+    tpdata->theFastSimulationManagerProcess = new G4FastSimulationManagerProcess();
 
-    G4ParticleTable* table = G4ParticleTable::GetParticleTable();
+    G4ParticleTable *table = G4ParticleTable::GetParticleTable();
     EmParticleList emList;
-    for(const auto& particleName : emList.PartNames()) {
-      G4ParticleDefinition* particle = table->FindParticle(particleName);
-      G4ProcessManager * pmanager = particle->GetProcessManager();
-      const G4String& pname = particle->GetParticleName();
-      if(pname == "e-" || pname == "e+") {
-	pmanager->AddDiscreteProcess(tpdata->theFastSimulationManagerProcess);
+    for (const auto &particleName : emList.PartNames()) {
+      G4ParticleDefinition *particle = table->FindParticle(particleName);
+      G4ProcessManager *pmanager = particle->GetProcessManager();
+      const G4String &pname = particle->GetParticleName();
+      if (pname == "e-" || pname == "e+") {
+        pmanager->AddDiscreteProcess(tpdata->theFastSimulationManagerProcess);
       }
     }
 
-    if(gem) {
-      G4Region* aRegion = G4RegionStore::GetInstance()->GetRegion("EcalRegion");
+    if (gem) {
+      G4Region *aRegion = G4RegionStore::GetInstance()->GetRegion("EcalRegion");
 
-      if(!aRegion){
-	G4cout << "EcalRegion is not defined !!!" << G4endl;
-	G4cout << "This means that GFlash will not be turned on." << G4endl;
-	
-      } else {
+      if (!aRegion) {
+        G4cout << "EcalRegion is not defined !!!" << G4endl;
+        G4cout << "This means that GFlash will not be turned on." << G4endl;
 
-	//Electromagnetic Shower Model for ECAL
-	tpdata->theEMShowerModel = 
-	  new GflashEMShowerModel("GflashEMShowerModel",aRegion,theParSet);
-	G4cout << "GFlash is defined for EcalRegion" << G4endl;
-      }    
-    }
-    if(ghad) {
-      G4Region* aRegion = G4RegionStore::GetInstance()->GetRegion("HcalRegion");
-      if(!aRegion) {
-	G4cout << "HcalRegion is not defined !!!" << G4endl;
-	G4cout << "This means that GFlash will not be turned on." << G4endl;
-	
       } else {
+        // Electromagnetic Shower Model for ECAL
+        tpdata->theEMShowerModel = new GflashEMShowerModel("GflashEMShowerModel", aRegion, theParSet);
+        G4cout << "GFlash is defined for EcalRegion" << G4endl;
+      }
+    }
+    if (ghad) {
+      G4Region *aRegion = G4RegionStore::GetInstance()->GetRegion("HcalRegion");
+      if (!aRegion) {
+        G4cout << "HcalRegion is not defined !!!" << G4endl;
+        G4cout << "This means that GFlash will not be turned on." << G4endl;
 
-	//Electromagnetic Shower Model for HCAL
-	tpdata->theHadShowerModel = 
-	  new GflashEMShowerModel("GflashHadShowerModel",aRegion,theParSet);
-	G4cout << "GFlash is defined for HcalRegion" << G4endl;    
+      } else {
+        // Electromagnetic Shower Model for HCAL
+        tpdata->theHadShowerModel = new GflashEMShowerModel("GflashHadShowerModel", aRegion, theParSet);
+        G4cout << "GFlash is defined for HcalRegion" << G4endl;
       }
     }
   }
diff --git a/SimG4Core/Generators/interface/Generator.h b/SimG4Core/Generators/interface/Generator.h
index 43cdca0d29d08..ef2e083c8297d 100644
--- a/SimG4Core/Generators/interface/Generator.h
+++ b/SimG4Core/Generators/interface/Generator.h
@@ -1,8 +1,8 @@
 #ifndef SimG4Core_Generator_H
 #define SimG4Core_Generator_H
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "SimG4Core/Generators/interface/HepMCParticle.h"
 #include "SimG4Core/Notification/interface/GenParticleInfo.h"
@@ -11,42 +11,40 @@
 #include "HepMC/GenParticle.h"
 
 #include <vector>
-    
+
 class G4Event;
 class G4PrimaryParticle;
 class LumiMonitorFilter;
 
-class Generator
-{
+class Generator {
 public:
-  Generator(const edm::ParameterSet & p);
+  Generator(const edm::ParameterSet &p);
   virtual ~Generator();
 
-  void setGenEvent( const HepMC::GenEvent* inpevt ) 
-    { evt_ = (HepMC::GenEvent*)inpevt; return ; }
-  void HepMC2G4(const HepMC::GenEvent * g,G4Event * e);
-  void nonBeamEvent2G4(const HepMC::GenEvent * g,G4Event * e);
-  virtual const HepMC::GenEvent*  genEvent() const { return evt_; }
-  virtual const math::XYZTLorentzVector* genVertex() const { return vtx_; }
+  void setGenEvent(const HepMC::GenEvent *inpevt) {
+    evt_ = (HepMC::GenEvent *)inpevt;
+    return;
+  }
+  void HepMC2G4(const HepMC::GenEvent *g, G4Event *e);
+  void nonBeamEvent2G4(const HepMC::GenEvent *g, G4Event *e);
+  virtual const HepMC::GenEvent *genEvent() const { return evt_; }
+  virtual const math::XYZTLorentzVector *genVertex() const { return vtx_; }
   virtual const double eventWeight() const { return weight_; }
 
 private:
-
-  bool particlePassesPrimaryCuts(const G4ThreeVector& p) const;
+  bool particlePassesPrimaryCuts(const G4ThreeVector &p) const;
   bool isExotic(int pdgcode) const;
   bool isExoticNonDetectable(int pdgcode) const;
   bool IsInTheFilterList(int pdgcode) const;
-  void particleAssignDaughters(G4PrimaryParticle * p, HepMC::GenParticle * hp, 
-			       double length);
-  void setGenId(G4PrimaryParticle* p, int id) const 
-  { p->SetUserInformation(new GenParticleInfo(id));}
+  void particleAssignDaughters(G4PrimaryParticle *p, HepMC::GenParticle *hp, double length);
+  void setGenId(G4PrimaryParticle *p, int id) const { p->SetUserInformation(new GenParticleInfo(id)); }
 
 private:
-  bool   fPCuts;
-  bool   fPtransCut;
-  bool   fEtaCuts;
-  bool   fPhiCuts;
-  bool   fFiductialCuts;
+  bool fPCuts;
+  bool fPtransCut;
+  bool fEtaCuts;
+  bool fPhiCuts;
+  bool fFiductialCuts;
   double theMinPhiCut;
   double theMaxPhiCut;
   double theMinEtaCut;
@@ -55,14 +53,14 @@ class Generator
   double theMinPtCut2;
   double theMaxPCut;
   double theDecRCut2;
-  double theEtaCutForHector; 
+  double theEtaCutForHector;
   double theDecLenCut;
   int verbose;
-  LumiMonitorFilter* fLumiFilter; 
-  HepMC::GenEvent*  evt_;
-  math::XYZTLorentzVector* vtx_;
-  double weight_;    
-  double Z_lmin,Z_lmax,Z_hector;
+  LumiMonitorFilter *fLumiFilter;
+  HepMC::GenEvent *evt_;
+  math::XYZTLorentzVector *vtx_;
+  double weight_;
+  double Z_lmin, Z_lmax, Z_hector;
   std::vector<int> pdgFilter;
   bool pdgFilterSel;
   bool fPDGFilter;
diff --git a/SimG4Core/Generators/interface/HepMCParticle.h b/SimG4Core/Generators/interface/HepMCParticle.h
index db1031343817c..4c54be72c6c6c 100644
--- a/SimG4Core/Generators/interface/HepMCParticle.h
+++ b/SimG4Core/Generators/interface/HepMCParticle.h
@@ -3,24 +3,25 @@
 
 #include "G4PrimaryParticle.hh"
 
-class HepMCParticle 
-{
+class HepMCParticle {
 public:
-    HepMCParticle();
-    HepMCParticle(G4PrimaryParticle * pp, int status); 
-    ~HepMCParticle();
-    const HepMCParticle & operator=(const HepMCParticle &right);
-    int operator==(const HepMCParticle &right) const;
-    int operator!=(const HepMCParticle &right) const;
+  HepMCParticle();
+  HepMCParticle(G4PrimaryParticle *pp, int status);
+  ~HepMCParticle();
+  const HepMCParticle &operator=(const HepMCParticle &right);
+  int operator==(const HepMCParticle &right) const;
+  int operator!=(const HepMCParticle &right) const;
+
 private:
-    G4PrimaryParticle * theParticle;
-    /// status code of the entry
-    /// set to 0 after generating links of G4PrimaryParticle object
-    int status_code;
+  G4PrimaryParticle *theParticle;
+  /// status code of the entry
+  /// set to 0 after generating links of G4PrimaryParticle object
+  int status_code;
+
 public:
-    G4PrimaryParticle * getTheParticle();
-    void done();
-    const int getStatus();
+  G4PrimaryParticle *getTheParticle();
+  void done();
+  const int getStatus();
 };
 
 #endif
diff --git a/SimG4Core/Generators/interface/LumiMonitorFilter.h b/SimG4Core/Generators/interface/LumiMonitorFilter.h
index 187df5eb08d20..04def01a6a9f5 100644
--- a/SimG4Core/Generators/interface/LumiMonitorFilter.h
+++ b/SimG4Core/Generators/interface/LumiMonitorFilter.h
@@ -3,17 +3,15 @@
 
 #include "HepMC/GenParticle.h"
 
-class LumiMonitorFilter
-{
+class LumiMonitorFilter {
 public:
   LumiMonitorFilter();
   virtual ~LumiMonitorFilter();
 
-  void Describe() const; 
-  bool isGoodForLumiMonitor(const HepMC::GenParticle*) const;
+  void Describe() const;
+  bool isGoodForLumiMonitor(const HepMC::GenParticle *) const;
 
 private:
-
 };
 
 #endif
diff --git a/SimG4Core/Generators/src/Generator.cc b/SimG4Core/Generators/src/Generator.cc
index 357092ce07a92..fd67a7819bfcc 100644
--- a/SimG4Core/Generators/src/Generator.cc
+++ b/SimG4Core/Generators/src/Generator.cc
@@ -11,278 +11,255 @@
 #include "G4Event.hh"
 
 #include "G4HEPEvtParticle.hh"
+#include "G4Log.hh"
 #include "G4ParticleDefinition.hh"
-#include "G4UnitsTable.hh"
-#include "G4SystemOfUnits.hh"
 #include "G4PhysicalConstants.hh"
-#include "G4Log.hh"
+#include "G4SystemOfUnits.hh"
+#include "G4UnitsTable.hh"
 
 #include <sstream>
 
 using namespace edm;
 
-Generator::Generator(const ParameterSet & p) : 
-  fPCuts(p.getParameter<bool>("ApplyPCuts")),
-  fPtransCut(p.getParameter<bool>("ApplyPtransCut")),
-  fEtaCuts(p.getParameter<bool>("ApplyEtaCuts")), 
-  fPhiCuts(p.getParameter<bool>("ApplyPhiCuts")),
-  theMinPhiCut(p.getParameter<double>("MinPhiCut")), // in radians (CMS standard)
-  theMaxPhiCut(p.getParameter<double>("MaxPhiCut")),
-  theMinEtaCut(p.getParameter<double>("MinEtaCut")),
-  theMaxEtaCut(p.getParameter<double>("MaxEtaCut")),
-  theMinPCut(p.getParameter<double>("MinPCut")),    // in GeV (CMS standard)
-  theMaxPCut(p.getParameter<double>("MaxPCut")),   
-  theEtaCutForHector(p.getParameter<double>("EtaCutForHector")),
-  verbose(p.getUntrackedParameter<int>("Verbosity",0)),
-  fLumiFilter(nullptr),
-  evt_(nullptr),
-  vtx_(nullptr),
-  weight_(0),
-  Z_lmin(0),
-  Z_lmax(0),
-  Z_hector(0),
-  pdgFilterSel(false), 
-  fPDGFilter(false)
-{
+Generator::Generator(const ParameterSet &p)
+    : fPCuts(p.getParameter<bool>("ApplyPCuts")),
+      fPtransCut(p.getParameter<bool>("ApplyPtransCut")),
+      fEtaCuts(p.getParameter<bool>("ApplyEtaCuts")),
+      fPhiCuts(p.getParameter<bool>("ApplyPhiCuts")),
+      theMinPhiCut(p.getParameter<double>("MinPhiCut")),  // in radians (CMS standard)
+      theMaxPhiCut(p.getParameter<double>("MaxPhiCut")),
+      theMinEtaCut(p.getParameter<double>("MinEtaCut")),
+      theMaxEtaCut(p.getParameter<double>("MaxEtaCut")),
+      theMinPCut(p.getParameter<double>("MinPCut")),  // in GeV (CMS standard)
+      theMaxPCut(p.getParameter<double>("MaxPCut")),
+      theEtaCutForHector(p.getParameter<double>("EtaCutForHector")),
+      verbose(p.getUntrackedParameter<int>("Verbosity", 0)),
+      fLumiFilter(nullptr),
+      evt_(nullptr),
+      vtx_(nullptr),
+      weight_(0),
+      Z_lmin(0),
+      Z_lmax(0),
+      Z_hector(0),
+      pdgFilterSel(false),
+      fPDGFilter(false) {
   bool lumi = p.getParameter<bool>("ApplyLumiMonitorCuts");
-  if(lumi) { fLumiFilter = new LumiMonitorFilter(); }
+  if (lumi) {
+    fLumiFilter = new LumiMonitorFilter();
+  }
 
-  double theRDecLenCut = p.getParameter<double>("RDecLenCut")*cm;
-  theDecRCut2 = theRDecLenCut*theRDecLenCut;
+  double theRDecLenCut = p.getParameter<double>("RDecLenCut") * cm;
+  theDecRCut2 = theRDecLenCut * theRDecLenCut;
 
-  theMinPtCut2 = theMinPCut*theMinPCut;
+  theMinPtCut2 = theMinPCut * theMinPCut;
 
-  double theDecLenCut = p.getParameter<double>("LDecLenCut")*cm;
+  double theDecLenCut = p.getParameter<double>("LDecLenCut") * cm;
 
   fFiductialCuts = (fPCuts || fPtransCut || fEtaCuts || fPhiCuts);
 
   pdgFilter.resize(0);
-  if ( p.exists("PDGselection") ) {
-    pdgFilterSel = (p.getParameter<edm::ParameterSet>("PDGselection")).
-      getParameter<bool>("PDGfilterSel");
-    pdgFilter = (p.getParameter<edm::ParameterSet>("PDGselection")).
-      getParameter<std::vector< int > >("PDGfilter");
-    if(!pdgFilter.empty()) { 
-      fPDGFilter = true; 
+  if (p.exists("PDGselection")) {
+    pdgFilterSel = (p.getParameter<edm::ParameterSet>("PDGselection")).getParameter<bool>("PDGfilterSel");
+    pdgFilter = (p.getParameter<edm::ParameterSet>("PDGselection")).getParameter<std::vector<int>>("PDGfilter");
+    if (!pdgFilter.empty()) {
+      fPDGFilter = true;
       std::stringstream ss;
       ss << "SimG4Core/Generator: ";
       if (pdgFilterSel) {
-	ss << " Selecting only PDG ID = ";
+        ss << " Selecting only PDG ID = ";
       } else {
-	ss << " Filtering out PDG ID = ";
+        ss << " Filtering out PDG ID = ";
       }
-      for ( unsigned int ii = 0; ii < pdgFilter.size(); ++ii) {
-	ss << pdgFilter[ii] << "  ";
+      for (unsigned int ii = 0; ii < pdgFilter.size(); ++ii) {
+        ss << pdgFilter[ii] << "  ";
       }
       edm::LogVerbatim("SimG4CoreGenerator") << ss.str();
     }
   }
 
-  if(fEtaCuts){
-    Z_lmax = theRDecLenCut*((1 - exp(-2*theMaxEtaCut) )/( 2*exp(-theMaxEtaCut)));
-    Z_lmin = theRDecLenCut*((1 - exp(-2*theMinEtaCut) )/( 2*exp(-theMinEtaCut)));
+  if (fEtaCuts) {
+    Z_lmax = theRDecLenCut * ((1 - exp(-2 * theMaxEtaCut)) / (2 * exp(-theMaxEtaCut)));
+    Z_lmin = theRDecLenCut * ((1 - exp(-2 * theMinEtaCut)) / (2 * exp(-theMinEtaCut)));
   }
 
-  Z_hector = theRDecLenCut*((1 - exp(-2*theEtaCutForHector)) 
-			    / ( 2*exp(-theEtaCutForHector) ) );
-
-  edm::LogVerbatim("SimG4CoreGenerator") 
-    << "SimG4Core/Generator: Rdecaycut= " << theRDecLenCut/cm 
-    << " cm;  Zdecaycut= " << theDecLenCut/cm 
-    << "Z_min= " << Z_lmin/cm << " cm; Z_max= " << Z_lmax 
-    << " cm;  Z_hector = " << Z_hector << " cm\n"
-    << "                     ApplyCuts: " << fFiductialCuts
-    << "  PCuts: " << fPCuts << "  PtransCut: " << fPtransCut
-    << "  EtaCut: " << fEtaCuts 
-    << "  PhiCut: " << fPhiCuts
-    << "  LumiMonitorCut: " << lumi;
-  if(lumi) { fLumiFilter->Describe(); }
-}
-
-Generator::~Generator() 
-{
-  delete fLumiFilter;
+  Z_hector = theRDecLenCut * ((1 - exp(-2 * theEtaCutForHector)) / (2 * exp(-theEtaCutForHector)));
+
+  edm::LogVerbatim("SimG4CoreGenerator") << "SimG4Core/Generator: Rdecaycut= " << theRDecLenCut / cm
+                                         << " cm;  Zdecaycut= " << theDecLenCut / cm << "Z_min= " << Z_lmin / cm
+                                         << " cm; Z_max= " << Z_lmax << " cm;  Z_hector = " << Z_hector << " cm\n"
+                                         << "                     ApplyCuts: " << fFiductialCuts
+                                         << "  PCuts: " << fPCuts << "  PtransCut: " << fPtransCut
+                                         << "  EtaCut: " << fEtaCuts << "  PhiCut: " << fPhiCuts
+                                         << "  LumiMonitorCut: " << lumi;
+  if (lumi) {
+    fLumiFilter->Describe();
+  }
 }
 
-void Generator::HepMC2G4(const HepMC::GenEvent * evt_orig, G4Event * g4evt)
-{
+Generator::~Generator() { delete fLumiFilter; }
 
-  HepMC::GenEvent *evt=new HepMC::GenEvent(*evt_orig);
+void Generator::HepMC2G4(const HepMC::GenEvent *evt_orig, G4Event *g4evt) {
+  HepMC::GenEvent *evt = new HepMC::GenEvent(*evt_orig);
 
-  if ( *(evt->vertices_begin()) == nullptr ) {
+  if (*(evt->vertices_begin()) == nullptr) {
     std::stringstream ss;
-    ss << "SimG4Core/Generator: in event " << g4evt->GetEventID()
-       << " Corrupted Event - GenEvent with no vertex \n"; 
+    ss << "SimG4Core/Generator: in event " << g4evt->GetEventID() << " Corrupted Event - GenEvent with no vertex \n";
     throw SimG4Exception(ss.str());
-  }  
-  
-  if (!evt->weights().empty()) {
-
-    weight_ = evt->weights()[0] ;
-    for (unsigned int iw=1; iw<evt->weights().size(); ++iw) {
+  }
 
+  if (!evt->weights().empty()) {
+    weight_ = evt->weights()[0];
+    for (unsigned int iw = 1; iw < evt->weights().size(); ++iw) {
       // terminate if the vector of weights contains a zero-weight
-      if ( evt->weights()[iw] <= 0 ) break;
-      weight_ *= evt->weights()[iw] ;
-    }     
+      if (evt->weights()[iw] <= 0)
+        break;
+      weight_ *= evt->weights()[iw];
+    }
+  }
+
+  if (vtx_ != nullptr) {
+    delete vtx_;
   }
-  
-  if (vtx_ != nullptr) { delete vtx_; }
   vtx_ = new math::XYZTLorentzVector((*(evt->vertices_begin()))->position().x(),
                                      (*(evt->vertices_begin()))->position().y(),
                                      (*(evt->vertices_begin()))->position().z(),
                                      (*(evt->vertices_begin()))->position().t());
 
-  edm::LogVerbatim("SimG4CoreGenerator") 
-    << "Generator: primary Vertex = (" 
-    << vtx_->x() << ", " << vtx_->y() << ", " << vtx_->z() << ")";
-    
-  unsigned int ng4vtx = 0;
+  edm::LogVerbatim("SimG4CoreGenerator") << "Generator: primary Vertex = (" << vtx_->x() << ", " << vtx_->y() << ", "
+                                         << vtx_->z() << ")";
 
-  for(HepMC::GenEvent::vertex_const_iterator vitr= evt->vertices_begin();
-      vitr != evt->vertices_end(); ++vitr ) { 
+  unsigned int ng4vtx = 0;
 
+  for (HepMC::GenEvent::vertex_const_iterator vitr = evt->vertices_begin(); vitr != evt->vertices_end(); ++vitr) {
     // loop for vertex, is it a real vertex?
-    // Set qvtx to true for any particles that should be propagated by GEANT, i.e.,
-    // status 1 particles or
-    // status 2 particles that decay outside the beampipe.   
-    G4bool qvtx=false;
+    // Set qvtx to true for any particles that should be propagated by GEANT,
+    // i.e., status 1 particles or status 2 particles that decay outside the
+    // beampipe.
+    G4bool qvtx = false;
     HepMC::GenVertex::particle_iterator pitr;
-    for (pitr= (*vitr)->particles_begin(HepMC::children);
-         pitr != (*vitr)->particles_end(HepMC::children); ++pitr) {
-
+    for (pitr = (*vitr)->particles_begin(HepMC::children); pitr != (*vitr)->particles_end(HepMC::children); ++pitr) {
       // For purposes of this function, the status is defined as follows:
       // 1:  particles are not decayed by generator
-      // 2:  particles are decayed by generator but need to be propagated by GEANT
-      // 3:  particles are decayed by generator but do not need to be propagated by GEANT
+      // 2:  particles are decayed by generator but need to be propagated by
+      // GEANT 3:  particles are decayed by generator but do not need to be
+      // propagated by GEANT
       int status = (*pitr)->status();
       int pdg = (*pitr)->pdg_id();
       if (status > 3 && isExotic(pdg) && (!(isExoticNonDetectable(pdg)))) {
         // In Pythia 8, there are many status codes besides 1, 2, 3.
-        // By setting the status to 2 for exotic particles, they will be checked:
-        // if its decay vertex is outside the beampipe, it will be propagated by GEANT.
-	// Some Standard Model particles, e.g., K0, cannot be propagated by GEANT, 
-	// so do not change their status code.  
+        // By setting the status to 2 for exotic particles, they will be
+        // checked: if its decay vertex is outside the beampipe, it will be
+        // propagated by GEANT. Some Standard Model particles, e.g., K0, cannot
+        // be propagated by GEANT, so do not change their status code.
         status = 2;
       }
 
       // Particles which are not decayed by generator
       if (status == 1) {
-
-	// filter out unwanted particles and vertices
-	if(fPDGFilter && !pdgFilterSel && IsInTheFilterList(pdg)) { 
-	  continue;
-	}
+        // filter out unwanted particles and vertices
+        if (fPDGFilter && !pdgFilterSel && IsInTheFilterList(pdg)) {
+          continue;
+        }
 
         qvtx = true;
-        if (verbose > 2) LogDebug("SimG4CoreGenerator") 
-	  << "GenVertex barcode = " << (*vitr)->barcode() 
-	  << " selected for GenParticle barcode = " << (*pitr)->barcode();
+        if (verbose > 2)
+          LogDebug("SimG4CoreGenerator") << "GenVertex barcode = " << (*vitr)->barcode()
+                                         << " selected for GenParticle barcode = " << (*pitr)->barcode();
         break;
-      }  
-      // The selection is made considering if the partcile with status = 2 
-      // have the end_vertex with a radius greater than the radius of beampipe 
+      }
+      // The selection is made considering if the partcile with status = 2
+      // have the end_vertex with a radius greater than the radius of beampipe
       // cylinder (no requirement on the Z of the vertex is applyed).
       else if (status == 2) {
-        if ( (*pitr)->end_vertex() != nullptr  ) { 
+        if ((*pitr)->end_vertex() != nullptr) {
           double xx = (*pitr)->end_vertex()->position().x();
           double yy = (*pitr)->end_vertex()->position().y();
-          double r_dd = xx*xx+yy*yy;
+          double r_dd = xx * xx + yy * yy;
           if (r_dd > theDecRCut2) {
             qvtx = true;
-            if (verbose > 2) LogDebug("SimG4CoreGenerator") 
-	      << "GenVertex barcode = " << (*vitr)->barcode() 
-	      << " selected for GenParticle barcode = " 
-	      << (*pitr)->barcode() << " radius = " << std::sqrt(r_dd);
+            if (verbose > 2)
+              LogDebug("SimG4CoreGenerator")
+                  << "GenVertex barcode = " << (*vitr)->barcode()
+                  << " selected for GenParticle barcode = " << (*pitr)->barcode() << " radius = " << std::sqrt(r_dd);
             break;
           }
         } else {
-	  // particles with status 2 without end_vertex are 
-	  // equivalent to stable
-	  qvtx = true;
-	  break;
-	}
+          // particles with status 2 without end_vertex are
+          // equivalent to stable
+          qvtx = true;
+          break;
+        }
       }
     }
 
     // if this vertex is inside fiductial volume inside the beam pipe
-    // and has no long-lived secondary the vertex is not saved 
+    // and has no long-lived secondary the vertex is not saved
     if (!qvtx) {
       continue;
     }
-    
-    double x1 = (*vitr)->position().x()*mm;
-    double y1 = (*vitr)->position().y()*mm;
-    double z1 = (*vitr)->position().z()*mm;
-    double t1 = (*vitr)->position().t()*mm/c_light;
 
-    G4PrimaryVertex* g4vtx = new G4PrimaryVertex(x1, y1, z1, t1);
+    double x1 = (*vitr)->position().x() * mm;
+    double y1 = (*vitr)->position().y() * mm;
+    double z1 = (*vitr)->position().z() * mm;
+    double t1 = (*vitr)->position().t() * mm / c_light;
 
-    for (pitr= (*vitr)->particles_begin(HepMC::children);
-         pitr != (*vitr)->particles_end(HepMC::children); ++pitr){
+    G4PrimaryVertex *g4vtx = new G4PrimaryVertex(x1, y1, z1, t1);
 
+    for (pitr = (*vitr)->particles_begin(HepMC::children); pitr != (*vitr)->particles_end(HepMC::children); ++pitr) {
       int status = (*pitr)->status();
       int pdg = (*pitr)->pdg_id();
       bool hasDecayVertex = (nullptr != (*pitr)->end_vertex()) ? true : false;
 
-      // Filter on allowed particle species if required      
-      if (fPDGFilter) { 
-	bool isInTheList = IsInTheFilterList(pdg);
-	if((!pdgFilterSel && isInTheList) || (pdgFilterSel && !isInTheList)) { 
-	  edm::LogVerbatim("SimG4CoreGenerator") 
-	    << " Skiped GenParticle barcode= " << (*pitr)->barcode() 
-	    << " PDGid= " << pdg
-	    << " status= " << status 
-	    << " isExotic: " << isExotic(pdg)
-	    << " isExoticNotDet: " << isExoticNonDetectable(pdg)
-	    << " isInTheList: " << isInTheList
-	    << " hasDecayVertex: " << hasDecayVertex;
+      // Filter on allowed particle species if required
+      if (fPDGFilter) {
+        bool isInTheList = IsInTheFilterList(pdg);
+        if ((!pdgFilterSel && isInTheList) || (pdgFilterSel && !isInTheList)) {
+          edm::LogVerbatim("SimG4CoreGenerator")
+              << " Skiped GenParticle barcode= " << (*pitr)->barcode() << " PDGid= " << pdg << " status= " << status
+              << " isExotic: " << isExotic(pdg) << " isExoticNotDet: " << isExoticNonDetectable(pdg)
+              << " isInTheList: " << isInTheList << " hasDecayVertex: " << hasDecayVertex;
           continue;
         }
       }
 
-      edm::LogVerbatim("SimG4CoreGenerator") 
-	<< "Generator: pdg= " << pdg
-	<< " status= " << status 
-	<< " hasPreDefinedDecay: " << hasDecayVertex
-	<< " isExotic: " << isExotic(pdg)
-	<< " isExoticNotDet: " << isExoticNonDetectable(pdg)
-	<< " isInTheList: " << IsInTheFilterList(pdg)
-	<< "\n         (x,y,z,t): (" << x1 << ","<< y1 << "," << z1 << "," << t1 << ")"; 
+      edm::LogVerbatim("SimG4CoreGenerator")
+          << "Generator: pdg= " << pdg << " status= " << status << " hasPreDefinedDecay: " << hasDecayVertex
+          << " isExotic: " << isExotic(pdg) << " isExoticNotDet: " << isExoticNonDetectable(pdg)
+          << " isInTheList: " << IsInTheFilterList(pdg) << "\n         (x,y,z,t): (" << x1 << "," << y1 << "," << z1
+          << "," << t1 << ")";
 
-      if (status > 3 && isExotic(pdg) && (!(isExoticNonDetectable(pdg))) ) {
-	status = hasDecayVertex ? 2 : 1;
-      } 
+      if (status > 3 && isExotic(pdg) && (!(isExoticNonDetectable(pdg)))) {
+        status = hasDecayVertex ? 2 : 1;
+      }
 
       // this particle has predefined decay but has no vertex
-      if (2 == status && !hasDecayVertex) { 
-	edm::LogWarning("SimG4CoreGenerator: in event ") 
-	  << g4evt->GetEventID()
-	  << " a particle " 
-	  << " pdgid= " << pdg
-	  << " has status=2 but has no decay vertex, so will be fully tracked by Geant4";
-	status = 1; 
+      if (2 == status && !hasDecayVertex) {
+        edm::LogWarning("SimG4CoreGenerator: in event ") << g4evt->GetEventID() << " a particle "
+                                                         << " pdgid= " << pdg
+                                                         << " has status=2 but has no decay vertex, so will be fully "
+                                                            "tracked by Geant4";
+        status = 1;
       }
 
       double x2 = x1;
       double y2 = y1;
       double z2 = z1;
       double decay_length = 0.0;
-      if(2 == status) {
-	x2 = (*pitr)->end_vertex()->position().x();
-	y2 = (*pitr)->end_vertex()->position().y();
-	z2 = (*pitr)->end_vertex()->position().z();
-	decay_length = std::sqrt((x2-x1)*(x2-x1)+(y2-y1)*(y2-y1)+(z2-z1)*(z2-z1));
-      } 
+      if (2 == status) {
+        x2 = (*pitr)->end_vertex()->position().x();
+        y2 = (*pitr)->end_vertex()->position().y();
+        z2 = (*pitr)->end_vertex()->position().z();
+        decay_length = std::sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1) + (z2 - z1) * (z2 - z1));
+      }
 
       bool toBeAdded = (fFiductialCuts) ? false : true;
 
       double px = (*pitr)->momentum().px();
       double py = (*pitr)->momentum().py();
       double pz = (*pitr)->momentum().pz();
-      double ptot = std::sqrt(px*px + py*py + pz*pz);
+      double ptot = std::sqrt(px * px + py * py + pz * pz);
       math::XYZTLorentzVector p(px, py, pz, (*pitr)->momentum().e());
-      
+
       double ximpact = x1;
       double yimpact = y1;
       double zimpact = z1;
@@ -290,318 +267,293 @@ void Generator::HepMC2G4(const HepMC::GenEvent * evt_orig, G4Event * g4evt)
       // protection against numerical problems for extremely low momenta
       // compute impact point at transition to Hector
       const double minTan = 1.e-20;
-      if(std::abs(z1) < Z_hector && std::abs(pz) >= minTan*ptot) {
-        if(pz > 0.0) { zimpact =  Z_hector; }
-	else         { zimpact = -Z_hector; }
-        double del = (zimpact - z1)/pz;
-        ximpact += del*px;
-        yimpact += del*py;
+      if (std::abs(z1) < Z_hector && std::abs(pz) >= minTan * ptot) {
+        if (pz > 0.0) {
+          zimpact = Z_hector;
+        } else {
+          zimpact = -Z_hector;
+        }
+        double del = (zimpact - z1) / pz;
+        ximpact += del * px;
+        yimpact += del * py;
       }
-      double rimpact2 = ximpact*ximpact + yimpact*yimpact;
-      
-      if (verbose > 2) LogDebug("SimG4CoreGenerator") 
-	<< "Processing GenParticle barcode= " << (*pitr)->barcode() 
-	<< " pdg= " << pdg
-	<< " status= " << (*pitr)->status() 
-	<< " st= " << status 
-	<< " rimpact(cm)= " << std::sqrt(rimpact2)/cm
-	<< " zimpact(cm)= " << zimpact/cm
-	<< " ptot(GeV)= " << ptot
-	<< " pz(GeV)= " << pz;
-
-      // Particles of status 1 trasnported along the beam pipe for forward 
-      // detectors (HECTOR) always pass to Geant4 without cuts 
-      if( 1 == status &&
-	  std::abs(zimpact) >= Z_hector && rimpact2 <= theDecRCut2) {
+      double rimpact2 = ximpact * ximpact + yimpact * yimpact;
+
+      if (verbose > 2)
+        LogDebug("SimG4CoreGenerator") << "Processing GenParticle barcode= " << (*pitr)->barcode() << " pdg= " << pdg
+                                       << " status= " << (*pitr)->status() << " st= " << status
+                                       << " rimpact(cm)= " << std::sqrt(rimpact2) / cm
+                                       << " zimpact(cm)= " << zimpact / cm << " ptot(GeV)= " << ptot
+                                       << " pz(GeV)= " << pz;
+
+      // Particles of status 1 trasnported along the beam pipe for forward
+      // detectors (HECTOR) always pass to Geant4 without cuts
+      if (1 == status && std::abs(zimpact) >= Z_hector && rimpact2 <= theDecRCut2) {
         toBeAdded = true;
-        if ( verbose > 2 ) LogDebug("SimG4CoreGenerator") 
-	  << "GenParticle barcode = " << (*pitr)->barcode() 
-	  << " passed case 3";
+        if (verbose > 2)
+          LogDebug("SimG4CoreGenerator") << "GenParticle barcode = " << (*pitr)->barcode() << " passed case 3";
       } else {
-
-	// Standard case: particles not decayed by the generator
-	if(1 == status &&
-           (std::abs(zimpact) < Z_hector || rimpact2 > theDecRCut2)) {
-
-	  // Ptot cut for all particles
-	  if (fPCuts && (ptot < theMinPCut || ptot > theMaxPCut)) {
+        // Standard case: particles not decayed by the generator
+        if (1 == status && (std::abs(zimpact) < Z_hector || rimpact2 > theDecRCut2)) {
+          // Ptot cut for all particles
+          if (fPCuts && (ptot < theMinPCut || ptot > theMaxPCut)) {
+            continue;
+          }
+          // phi cut is applied mainly for particle gun
+          if (fPhiCuts) {
+            double phi = p.phi();
+            if (phi < theMinPhiCut || phi > theMaxPhiCut) {
+              continue;
+            }
+          }
+          // eta cut is applied if position of the decay
+          // is within vacuum chamber and limited in Z
+          if (fEtaCuts) {
+            // eta cut
+            double xi = x1;
+            double yi = y1;
+            double zi = z1;
+
+            // can be propagated along Z
+            if (std::abs(pz) >= minTan * ptot) {
+              if ((zi >= Z_lmax) & (pz < 0.0)) {
+                zi = Z_lmax;
+              } else if ((zi <= Z_lmin) & (pz > 0.0)) {
+                zi = Z_lmin;
+              } else {
+                if (pz > 0) {
+                  zi = Z_lmax;
+                } else {
+                  zi = Z_lmin;
+                }
+              }
+              double del = (zi - z1) / pz;
+              xi += del * px;
+              yi += del * py;
+            }
+            // check eta cut
+            if ((zi >= Z_lmin) & (zi <= Z_lmax) & (xi * xi + yi * yi < theDecRCut2)) {
+              continue;
+            }
+          }
+          if (fLumiFilter && !fLumiFilter->isGoodForLumiMonitor(*pitr)) {
             continue;
-	  }
-	  // phi cut is applied mainly for particle gun
-	  if (fPhiCuts) {
-	    double phi = p.phi();
-	    if(phi < theMinPhiCut || phi  > theMaxPhiCut) {
-	      continue;
-	    }
-	  }
-	  // eta cut is applied if position of the decay
-	  // is within vacuum chamber and limited in Z
-	  if(fEtaCuts) {
-
-	    // eta cut
-	    double xi = x1;
-	    double yi = y1;
-	    double zi = z1;
-
-	    // can be propagated along Z
-	    if(std::abs(pz) >= minTan*ptot) {
-	      if((zi >= Z_lmax) & (pz < 0.0)) {
-		zi = Z_lmax;
-	      } else if((zi <= Z_lmin) & (pz > 0.0)) {
-		zi = Z_lmin;
-	      } else {
-		if(pz > 0) { zi = Z_lmax; }
-		else { zi = Z_lmin; }
-	      }
-	      double del = (zi - z1)/pz;
-	      xi += del*px;
-	      yi += del*py;
-	    }
-	    // check eta cut
-	    if((zi >= Z_lmin) & (zi <= Z_lmax) 
-	       & (xi*xi + yi*yi < theDecRCut2)) {
-	      continue;
-	    }
-	  }
-	  if(fLumiFilter && !fLumiFilter->isGoodForLumiMonitor(*pitr)) 
-	    { continue; }
-	  toBeAdded = true;
-	  if ( verbose > 2 ) LogDebug("SimG4CoreGenerator") 
-	    << "GenParticle barcode = " << (*pitr)->barcode() 
-	    << " passed case 1";
-
-	  // Decay chain outside the fiducial cylinder defined by theRDecLenCut
-	  // are used for Geant4 tracking with predefined decay channel
-	  // In the case of decay in vacuum particle is not tracked by Geant4
-	} else if(2 == status &&
-		  x2*x2 + y2*y2 >= theDecRCut2 && std::abs(z2) < Z_hector) {
-
-	  toBeAdded = true;
-	  if ( verbose > 2 ) LogDebug("SimG4CoreGenerator") 
-	    << "GenParticle barcode = " << (*pitr)->barcode() 
-	    << " passed case 2" 
-	    << " decay_length(cm)= " << decay_length/cm;
-	}
+          }
+          toBeAdded = true;
+          if (verbose > 2)
+            LogDebug("SimG4CoreGenerator") << "GenParticle barcode = " << (*pitr)->barcode() << " passed case 1";
+
+          // Decay chain outside the fiducial cylinder defined by theRDecLenCut
+          // are used for Geant4 tracking with predefined decay channel
+          // In the case of decay in vacuum particle is not tracked by Geant4
+        } else if (2 == status && x2 * x2 + y2 * y2 >= theDecRCut2 && std::abs(z2) < Z_hector) {
+          toBeAdded = true;
+          if (verbose > 2)
+            LogDebug("SimG4CoreGenerator") << "GenParticle barcode = " << (*pitr)->barcode() << " passed case 2"
+                                           << " decay_length(cm)= " << decay_length / cm;
+        }
       }
-      if(toBeAdded){
-        G4PrimaryParticle* g4prim= 
-          new G4PrimaryParticle(pdg, px*GeV, py*GeV, pz*GeV);
-        
-        if ( g4prim->GetG4code() != nullptr ){ 
-          g4prim->SetMass( g4prim->GetG4code()->GetPDGMass() );
+      if (toBeAdded) {
+        G4PrimaryParticle *g4prim = new G4PrimaryParticle(pdg, px * GeV, py * GeV, pz * GeV);
+
+        if (g4prim->GetG4code() != nullptr) {
+          g4prim->SetMass(g4prim->GetG4code()->GetPDGMass());
           double charge = g4prim->GetG4code()->GetPDGCharge();
 
-	  // apply Pt cut
-	  if (fPtransCut && 
-	      0.0 != charge && px*px + py*py < theMinPtCut2) {
+          // apply Pt cut
+          if (fPtransCut && 0.0 != charge && px * px + py * py < theMinPtCut2) {
             delete g4prim;
             continue;
-	  }
+          }
           g4prim->SetCharge(charge);
         }
 
-	// V.I. do not use SetWeight but the same code
-        // value of the code compute inside TrackWithHistory        
-        //g4prim->SetWeight( 10000*(*vpitr)->barcode() ) ;
-        setGenId( g4prim, (*pitr)->barcode() );
+        // V.I. do not use SetWeight but the same code
+        // value of the code compute inside TrackWithHistory
+        // g4prim->SetWeight( 10000*(*vpitr)->barcode() ) ;
+        setGenId(g4prim, (*pitr)->barcode());
 
         if (2 == status) {
-          particleAssignDaughters(g4prim,
-				  (HepMC::GenParticle *) *pitr, decay_length);
-	}
-        if ( verbose > 1 ) g4prim->Print();
+          particleAssignDaughters(g4prim, (HepMC::GenParticle *)*pitr, decay_length);
+        }
+        if (verbose > 1)
+          g4prim->Print();
         g4vtx->SetPrimary(g4prim);
-	edm::LogVerbatim("SimG4CoreGenerator") 
-	  << "Generator: new particle pdg= " << pdg << " Ptot(GeV/c)= " << ptot
-	  << " Pt= " << std::sqrt(px*px + py*py);
+        edm::LogVerbatim("SimG4CoreGenerator") << "Generator: new particle pdg= " << pdg << " Ptot(GeV/c)= " << ptot
+                                               << " Pt= " << std::sqrt(px * px + py * py);
       }
     }
 
-    if ( verbose > 1 ) g4vtx->Print();
+    if (verbose > 1)
+      g4vtx->Print();
     g4evt->AddPrimaryVertex(g4vtx);
     ++ng4vtx;
   }
-  
-  // Add a protection for completely empty events (produced by LHCTransport): 
+
+  // Add a protection for completely empty events (produced by LHCTransport):
   // add a dummy vertex with no particle attached to it
-  if ( ng4vtx == 0 ) {
-    G4PrimaryVertex* g4vtx = new G4PrimaryVertex(0.0, 0.0, 0.0, 0.0);
-    if ( verbose > 1 ) g4vtx->Print();
+  if (ng4vtx == 0) {
+    G4PrimaryVertex *g4vtx = new G4PrimaryVertex(0.0, 0.0, 0.0, 0.0);
+    if (verbose > 1)
+      g4vtx->Print();
     g4evt->AddPrimaryVertex(g4vtx);
   }
 
   delete evt;
 }
 
-void Generator::particleAssignDaughters( G4PrimaryParticle* g4p, 
-					 HepMC::GenParticle* vp, 
-					 double decaylength)
-{
-  if ( verbose > 1 ) {
-    LogDebug("SimG4CoreGenerator") 
-      << "Special case of long decay length \n" 
-      << "Assign daughters with to mother with decaylength=" 
-      << decaylength/cm << " cm";
+void Generator::particleAssignDaughters(G4PrimaryParticle *g4p, HepMC::GenParticle *vp, double decaylength) {
+  if (verbose > 1) {
+    LogDebug("SimG4CoreGenerator") << "Special case of long decay length \n"
+                                   << "Assign daughters with to mother with decaylength=" << decaylength / cm << " cm";
   }
-  math::XYZTLorentzVector p(vp->momentum().px(), vp->momentum().py(), 
-			    vp->momentum().pz(), vp->momentum().e());
+  math::XYZTLorentzVector p(vp->momentum().px(), vp->momentum().py(), vp->momentum().pz(), vp->momentum().e());
 
   // defined preassigned decay time
-  double proper_time = decaylength/(p.Beta()*p.Gamma()*c_light);
-  g4p->SetProperTime(proper_time); 
-
-  if( verbose > 2 ) {
-    LogDebug("SimG4CoreGenerator") <<" px= "<< p.px()
-				   <<" py= "<< p.py()
-				   <<" pz= "<< p.pz()
-				   <<" e= " <<  p.e()
-				   <<" beta= "<< p.Beta()
-				   <<" gamma= " << p.Gamma()
-				   <<" Proper time= " <<proper_time/ns <<" ns";
+  double proper_time = decaylength / (p.Beta() * p.Gamma() * c_light);
+  g4p->SetProperTime(proper_time);
+
+  if (verbose > 2) {
+    LogDebug("SimG4CoreGenerator") << " px= " << p.px() << " py= " << p.py() << " pz= " << p.pz() << " e= " << p.e()
+                                   << " beta= " << p.Beta() << " gamma= " << p.Gamma()
+                                   << " Proper time= " << proper_time / ns << " ns";
   }
 
-  // the particle will decay after the same length if it 
+  // the particle will decay after the same length if it
   // has not interacted before
   double x1 = vp->end_vertex()->position().x();
   double y1 = vp->end_vertex()->position().y();
   double z1 = vp->end_vertex()->position().z();
 
-  for (HepMC::GenVertex::particle_iterator 
-         vpdec= vp->end_vertex()->particles_begin(HepMC::children);
-       vpdec != vp->end_vertex()->particles_end(HepMC::children); ++vpdec) {
-    
-    //transform decay products such that in the rest frame of mother
-    math::XYZTLorentzVector pdec((*vpdec)->momentum().px(),
-                                 (*vpdec)->momentum().py(),
-                                 (*vpdec)->momentum().pz(),
-                                 (*vpdec)->momentum().e());
+  for (HepMC::GenVertex::particle_iterator vpdec = vp->end_vertex()->particles_begin(HepMC::children);
+       vpdec != vp->end_vertex()->particles_end(HepMC::children);
+       ++vpdec) {
+    // transform decay products such that in the rest frame of mother
+    math::XYZTLorentzVector pdec(
+        (*vpdec)->momentum().px(), (*vpdec)->momentum().py(), (*vpdec)->momentum().pz(), (*vpdec)->momentum().e());
 
     // children should only be taken into account once
-    G4PrimaryParticle * g4daught= 
-      new G4PrimaryParticle((*vpdec)->pdg_id(), pdec.x()*GeV, 
-			    pdec.y()*GeV, pdec.z()*GeV);
-
-    if ( g4daught->GetG4code() != nullptr )
-      { 
-        g4daught->SetMass( g4daught->GetG4code()->GetPDGMass() ) ;
-        g4daught->SetCharge( g4daught->GetG4code()->GetPDGCharge() ) ;  
-      }
+    G4PrimaryParticle *g4daught =
+        new G4PrimaryParticle((*vpdec)->pdg_id(), pdec.x() * GeV, pdec.y() * GeV, pdec.z() * GeV);
+
+    if (g4daught->GetG4code() != nullptr) {
+      g4daught->SetMass(g4daught->GetG4code()->GetPDGMass());
+      g4daught->SetCharge(g4daught->GetG4code()->GetPDGCharge());
+    }
 
     // V.I. do not use SetWeight but the same code
-    // value of the code compute inside TrackWithHistory        
-    setGenId( g4daught, (*vpdec)->barcode() );
-
-    if ( verbose > 2 ) LogDebug("SimG4CoreGenerator") 
-      <<"Assigning a "<< (*vpdec)->pdg_id()
-      <<" as daughter of a " << vp->pdg_id();
-    if ( (*vpdec)->status() == 2 && (*vpdec)->end_vertex() != nullptr) 
-      {
-        double x2 = (*vpdec)->end_vertex()->position().x();
-        double y2 = (*vpdec)->end_vertex()->position().y();
-        double z2 = (*vpdec)->end_vertex()->position().z();
-        double dd = std::sqrt((x1-x2)*(x1-x2)+(y1-y2)*(y1-y2)+(z1-z2)*(z1-z2));
-        particleAssignDaughters(g4daught,*vpdec,dd);
-      }
-    (*vpdec)->set_status(1000+(*vpdec)->status()); 
+    // value of the code compute inside TrackWithHistory
+    setGenId(g4daught, (*vpdec)->barcode());
+
+    if (verbose > 2)
+      LogDebug("SimG4CoreGenerator") << "Assigning a " << (*vpdec)->pdg_id() << " as daughter of a " << vp->pdg_id();
+    if ((*vpdec)->status() == 2 && (*vpdec)->end_vertex() != nullptr) {
+      double x2 = (*vpdec)->end_vertex()->position().x();
+      double y2 = (*vpdec)->end_vertex()->position().y();
+      double z2 = (*vpdec)->end_vertex()->position().z();
+      double dd = std::sqrt((x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2) + (z1 - z2) * (z1 - z2));
+      particleAssignDaughters(g4daught, *vpdec, dd);
+    }
+    (*vpdec)->set_status(1000 + (*vpdec)->status());
     g4p->SetDaughter(g4daught);
 
-    if ( verbose > 1 ) g4daught->Print();
+    if (verbose > 1)
+      g4daught->Print();
   }
 }
 
 // Used for non-beam particles
-bool Generator::particlePassesPrimaryCuts(const G4ThreeVector& p) const 
-{
+bool Generator::particlePassesPrimaryCuts(const G4ThreeVector &p) const {
   bool flag = true;
   double ptot = p.mag();
-  if (fPCuts && (ptot < theMinPCut*GeV || ptot > theMaxPCut*GeV)) {
+  if (fPCuts && (ptot < theMinPCut * GeV || ptot > theMaxPCut * GeV)) {
     flag = false;
-  } 
+  }
   if (fEtaCuts && flag) {
     double pz = p.z();
-    if(ptot < pz + 1.e-10) { 
+    if (ptot < pz + 1.e-10) {
       flag = false;
 
     } else {
-      double eta = 0.5*G4Log((ptot + pz)/(ptot - pz));
-      if(eta < theMinEtaCut || eta > theMaxEtaCut) {
-	flag = false;
+      double eta = 0.5 * G4Log((ptot + pz) / (ptot - pz));
+      if (eta < theMinEtaCut || eta > theMaxEtaCut) {
+        flag = false;
       }
     }
   }
   if (fPhiCuts && flag) {
     double phi = p.phi();
-    if(phi < theMinPhiCut || phi > theMaxPhiCut) {
+    if (phi < theMinPhiCut || phi > theMaxPhiCut) {
       flag = false;
     }
   }
-  
-  if ( verbose > 2 ) LogDebug("SimG4CoreGenerator") 
-    << "Generator ptot(GeV)= " << ptot/GeV << " eta= " << p.eta() 
-    << "  phi= " << p.phi() << " Flag= " << flag;
+
+  if (verbose > 2)
+    LogDebug("SimG4CoreGenerator") << "Generator ptot(GeV)= " << ptot / GeV << " eta= " << p.eta()
+                                   << "  phi= " << p.phi() << " Flag= " << flag;
 
   return flag;
 }
 
-bool Generator::isExotic(int pdgcode) const
-{
-  int pdgid = std::abs(pdgcode);  
-  return ((pdgid >= 1000000 && pdgid <  4000000) || // SUSY, R-hadron, and technicolor particles
-	  pdgid == 17 || // 4th generation lepton 
-	  pdgid == 34 || // W-prime
-	  pdgid == 37)   // charged Higgs
-    ? true : false;
+bool Generator::isExotic(int pdgcode) const {
+  int pdgid = std::abs(pdgcode);
+  return ((pdgid >= 1000000 && pdgid < 4000000) ||  // SUSY, R-hadron, and technicolor particles
+          pdgid == 17 ||                            // 4th generation lepton
+          pdgid == 34 ||                            // W-prime
+          pdgid == 37)                              // charged Higgs
+             ? true
+             : false;
 }
 
-bool Generator::isExoticNonDetectable(int pdgcode) const
-{
-  int pdgid = std::abs(pdgcode);  
+bool Generator::isExoticNonDetectable(int pdgcode) const {
+  int pdgid = std::abs(pdgcode);
   HepPDT::ParticleID pid(pdgcode);
   int charge = pid.threeCharge();
-  return ((charge==0) && (pdgid >= 1000000 && pdgid <  1000040)) // SUSY 
-    ? true : false;
+  return ((charge == 0) && (pdgid >= 1000000 && pdgid < 1000040))  // SUSY
+             ? true
+             : false;
 }
 
-bool Generator::IsInTheFilterList(int pdgcode) const
-{
+bool Generator::IsInTheFilterList(int pdgcode) const {
   int pdgid = std::abs(pdgcode);
-  for(auto & pdg : pdgFilter) { if(std::abs(pdg) == pdgid) { return true; } }
+  for (auto &pdg : pdgFilter) {
+    if (std::abs(pdg) == pdgid) {
+      return true;
+    }
+  }
   return false;
 }
 
-void Generator::nonBeamEvent2G4(const HepMC::GenEvent * evt, G4Event * g4evt) 
-{
-  int i = 0; 
-  for(HepMC::GenEvent::particle_const_iterator it = evt->particles_begin(); 
-      it != evt->particles_end(); ++it ) {
+void Generator::nonBeamEvent2G4(const HepMC::GenEvent *evt, G4Event *g4evt) {
+  int i = 0;
+  for (HepMC::GenEvent::particle_const_iterator it = evt->particles_begin(); it != evt->particles_end(); ++it) {
     ++i;
-    HepMC::GenParticle * gp = (*it);	
+    HepMC::GenParticle *gp = (*it);
     int g_status = gp->status();
-    // storing only particle with status == 1 	
+    // storing only particle with status == 1
     if (g_status == 1) {
-      int g_id = gp->pdg_id();	    
-      G4PrimaryParticle * g4p = 
-	new G4PrimaryParticle(g_id,gp->momentum().px()*GeV,
-			      gp->momentum().py()*GeV,
-			      gp->momentum().pz()*GeV);
-      if (g4p->GetG4code() != nullptr) { 
-	g4p->SetMass(g4p->GetG4code()->GetPDGMass());
-	g4p->SetCharge(g4p->GetG4code()->GetPDGCharge());
+      int g_id = gp->pdg_id();
+      G4PrimaryParticle *g4p =
+          new G4PrimaryParticle(g_id, gp->momentum().px() * GeV, gp->momentum().py() * GeV, gp->momentum().pz() * GeV);
+      if (g4p->GetG4code() != nullptr) {
+        g4p->SetMass(g4p->GetG4code()->GetPDGMass());
+        g4p->SetCharge(g4p->GetG4code()->GetPDGCharge());
       }
-      setGenId(g4p,i);
+      setGenId(g4p, i);
       if (particlePassesPrimaryCuts(g4p->GetMomentum())) {
-	G4PrimaryVertex * v = 
-	  new G4PrimaryVertex(gp->production_vertex()->position().x()*mm,
-			      gp->production_vertex()->position().y()*mm,
-			      gp->production_vertex()->position().z()*mm,
-			      gp->production_vertex()->position().t()*mm/c_light);
-	v->SetPrimary(g4p);
-	g4evt->AddPrimaryVertex(v);
-	if(verbose > 0) { v->Print(); }
+        G4PrimaryVertex *v = new G4PrimaryVertex(gp->production_vertex()->position().x() * mm,
+                                                 gp->production_vertex()->position().y() * mm,
+                                                 gp->production_vertex()->position().z() * mm,
+                                                 gp->production_vertex()->position().t() * mm / c_light);
+        v->SetPrimary(g4p);
+        g4evt->AddPrimaryVertex(v);
+        if (verbose > 0) {
+          v->Print();
+        }
 
       } else {
-	delete g4p;
+        delete g4p;
       }
     }
-  } // end loop on HepMC particles
+  }  // end loop on HepMC particles
 }
diff --git a/SimG4Core/Generators/src/HepMCParticle.cc b/SimG4Core/Generators/src/HepMCParticle.cc
index 7a0f0728a12b1..24e6b7f023f74 100644
--- a/SimG4Core/Generators/src/HepMCParticle.cc
+++ b/SimG4Core/Generators/src/HepMCParticle.cc
@@ -2,17 +2,15 @@
 
 HepMCParticle::HepMCParticle() {}
 
-HepMCParticle::HepMCParticle(G4PrimaryParticle* pp, int status) : 
-    theParticle(pp),status_code(status) {}
+HepMCParticle::HepMCParticle(G4PrimaryParticle *pp, int status) : theParticle(pp), status_code(status) {}
 
 HepMCParticle::~HepMCParticle() {}
 
-const HepMCParticle & HepMCParticle::operator=(const HepMCParticle &right)
-{ return *this; }
+const HepMCParticle &HepMCParticle::operator=(const HepMCParticle &right) { return *this; }
 
 int HepMCParticle::operator==(const HepMCParticle &right) const { return false; }
-int HepMCParticle::operator!=(const HepMCParticle &right) const { return true;}
+int HepMCParticle::operator!=(const HepMCParticle &right) const { return true; }
 
-G4PrimaryParticle * HepMCParticle::getTheParticle() { return theParticle; }
-void HepMCParticle::done() { status_code= -1; }
-const int HepMCParticle::getStatus() { return status_code;}
+G4PrimaryParticle *HepMCParticle::getTheParticle() { return theParticle; }
+void HepMCParticle::done() { status_code = -1; }
+const int HepMCParticle::getStatus() { return status_code; }
diff --git a/SimG4Core/Generators/src/LumiMonitorFilter.cc b/SimG4Core/Generators/src/LumiMonitorFilter.cc
index 68a614a870cae..978abbcf19c9d 100644
--- a/SimG4Core/Generators/src/LumiMonitorFilter.cc
+++ b/SimG4Core/Generators/src/LumiMonitorFilter.cc
@@ -3,22 +3,13 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 using namespace edm;
-//using std::cout;
-//using std::endl;
+// using std::cout;
+// using std::endl;
 
-LumiMonitorFilter::LumiMonitorFilter() 
-{} 
+LumiMonitorFilter::LumiMonitorFilter() {}
 
-LumiMonitorFilter::~LumiMonitorFilter() 
-{}
+LumiMonitorFilter::~LumiMonitorFilter() {}
 
-void LumiMonitorFilter::Describe() const
-{
-  edm::LogInfo("LumiMonitorFilter") 
-    << " is active ";
-}
+void LumiMonitorFilter::Describe() const { edm::LogInfo("LumiMonitorFilter") << " is active "; }
 
-bool LumiMonitorFilter::isGoodForLumiMonitor(const HepMC::GenParticle*) const
-{
-  return true;
-}
+bool LumiMonitorFilter::isGoodForLumiMonitor(const HepMC::GenParticle *) const { return true; }
diff --git a/SimG4Core/Geometry/interface/DDDWorld.h b/SimG4Core/Geometry/interface/DDDWorld.h
index bf5fbe9d62864..60ff24ab53d46 100644
--- a/SimG4Core/Geometry/interface/DDDWorld.h
+++ b/SimG4Core/Geometry/interface/DDDWorld.h
@@ -1,21 +1,19 @@
 #ifndef SimG4Core_DDDWorld_h
 #define SimG4Core_DDDWorld_h
 
-#include "SimG4Core/Geometry/interface/DDGeometryReturnType.h"
 #include "G4VPhysicalVolume.hh"
+#include "SimG4Core/Geometry/interface/DDGeometryReturnType.h"
 
 class DDG4Builder;
-class DDCompactView;    
+class DDCompactView;
 
 class DDDWorld {
-
 public:
-  DDDWorld(const DDCompactView*, G4LogicalVolumeToDDLogicalPartMap &,
-	   SensitiveDetectorCatalog &, bool check=false);
+  DDDWorld(const DDCompactView *, G4LogicalVolumeToDDLogicalPartMap &, SensitiveDetectorCatalog &, bool check = false);
   ~DDDWorld();
-  static void SetAsWorld(G4VPhysicalVolume * pv);
-  static void WorkerSetAsWorld(G4VPhysicalVolume * pv);
-  const G4VPhysicalVolume * GetWorldVolume() const { return m_world; }
+  static void SetAsWorld(G4VPhysicalVolume *pv);
+  static void WorkerSetAsWorld(G4VPhysicalVolume *pv);
+  const G4VPhysicalVolume *GetWorldVolume() const { return m_world; }
 
   // In order to share the world volume with the worker threads, we
   // need a non-const pointer. Thread-safety is handled inside Geant4
@@ -24,7 +22,7 @@ class DDDWorld {
   G4VPhysicalVolume *GetWorldVolumeForWorker() const { return m_world; }
 
 private:
-  G4VPhysicalVolume * m_world;
+  G4VPhysicalVolume *m_world;
 };
 
 #endif
diff --git a/SimG4Core/Geometry/interface/DDG4Builder.h b/SimG4Core/Geometry/interface/DDG4Builder.h
index ead0611198341..80dc313be70fa 100644
--- a/SimG4Core/Geometry/interface/DDG4Builder.h
+++ b/SimG4Core/Geometry/interface/DDG4Builder.h
@@ -9,9 +9,9 @@
 #include "DetectorDescription/Core/interface/DDSolid.h"
 
 #include <map>
-#include <vector>
 #include <string>
- 
+#include <vector>
+
 class DDG4SolidConverter;
 class G4LogicalVolume;
 class G4VPhysicalVolume;
@@ -20,31 +20,30 @@ class G4VSolid;
 class DDCompactView;
 
 class DDG4Builder {
-
 public:
-  DDG4Builder(const DDCompactView*, bool check=false);  
-  ~DDG4Builder(); 
+  DDG4Builder(const DDCompactView *, bool check = false);
+  ~DDG4Builder();
   DDGeometryReturnType BuildGeometry();
-  static DDG4DispContainer * theVectorOfDDG4Dispatchables();
+  static DDG4DispContainer *theVectorOfDDG4Dispatchables();
 
-protected:    
-  G4VSolid * convertSolid(const DDSolid & dSolid);    
-  G4LogicalVolume * convertLV(const DDLogicalPart & dLogical);  
-  G4Material * convertMaterial(const DDMaterial & dMaterial);
-  int getInt(const std::string & s, const DDLogicalPart & dLogical);
-  double getDouble(const std::string & s, const DDLogicalPart & dLogical);
+protected:
+  G4VSolid *convertSolid(const DDSolid &dSolid);
+  G4LogicalVolume *convertLV(const DDLogicalPart &dLogical);
+  G4Material *convertMaterial(const DDMaterial &dMaterial);
+  int getInt(const std::string &s, const DDLogicalPart &dLogical);
+  double getDouble(const std::string &s, const DDLogicalPart &dLogical);
 
 protected:
-  DDG4SolidConverter*                      solidConverter_;
-  std::map<DDMaterial,G4Material*>         mats_;
-  std::map<DDSolid,G4VSolid*>              sols_;    
-  std::map<DDLogicalPart,G4LogicalVolume*> logs_;
+  DDG4SolidConverter *solidConverter_;
+  std::map<DDMaterial, G4Material *> mats_;
+  std::map<DDSolid, G4VSolid *> sols_;
+  std::map<DDLogicalPart, G4LogicalVolume *> logs_;
 
 private:
-  const DDCompactView*              compactView;
-  static DDG4DispContainer*         theVectorOfDDG4Dispatchables_;
+  const DDCompactView *compactView;
+  static DDG4DispContainer *theVectorOfDDG4Dispatchables_;
   G4LogicalVolumeToDDLogicalPartMap map_;
-  bool                              check_;
+  bool check_;
 };
 
 #endif
diff --git a/SimG4Core/Geometry/interface/DDG4SensitiveConverter.h b/SimG4Core/Geometry/interface/DDG4SensitiveConverter.h
index b8d945bda5d1f..3b430f967102c 100644
--- a/SimG4Core/Geometry/interface/DDG4SensitiveConverter.h
+++ b/SimG4Core/Geometry/interface/DDG4SensitiveConverter.h
@@ -1,20 +1,19 @@
 #ifndef SimG4Core_DDG4SensitiveConverter_h
 #define SimG4Core_DDG4SensitiveConverter_h
 
+#include "DetectorDescription/Core/interface/DDLogicalPart.h"
 #include "SimG4Core/Geometry/interface/SensitiveDetectorCatalog.h"
 #include "SimG4Core/Notification/interface/DDG4DispContainer.h"
-#include "DetectorDescription/Core/interface/DDLogicalPart.h"
 
 #include <iostream>
-#include <vector>
 #include <string>
+#include <vector>
 
 class DDG4SensitiveConverter {
-
-public:    
+public:
   DDG4SensitiveConverter();
   virtual ~DDG4SensitiveConverter();
-  SensitiveDetectorCatalog upDate(const DDG4DispContainer & ddg4s);
+  SensitiveDetectorCatalog upDate(const DDG4DispContainer &ddg4s);
 
 private:
   std::string getString(const std::string &, const DDLogicalPart *);
diff --git a/SimG4Core/Geometry/interface/DDG4SolidConverter.h b/SimG4Core/Geometry/interface/DDG4SolidConverter.h
index 2ce349627008b..37ca16ce59092 100644
--- a/SimG4Core/Geometry/interface/DDG4SolidConverter.h
+++ b/SimG4Core/Geometry/interface/DDG4SolidConverter.h
@@ -11,43 +11,42 @@
 class G4VSolid;
 class DDSolid;
 
-class DDG4SolidConverter
-{
+class DDG4SolidConverter {
 public:
-    DDG4SolidConverter();
-    ~DDG4SolidConverter();
-    typedef G4VSolid * (*FNPTR) (const DDSolid &); // pointer to function
-    G4VSolid * convert(const DDSolid &);  
-
-private:  
-    /* foreach supported solid add a static conversion routine ,
-       register this method in the convDispatch_-map */    
-    static G4VSolid * box(const DDSolid &);
-    static G4VSolid * tubs(const DDSolid &);
-    static G4VSolid * cuttubs(const DDSolid &);
-    static G4VSolid * trap(const DDSolid &);
-    static G4VSolid * cons(const DDSolid &);
-    static G4VSolid * unionsolid(const DDSolid &);
-    static G4VSolid * subtraction(const DDSolid &);
-    static G4VSolid * intersection(const DDSolid &);
-    static G4VSolid * shapeless(const DDSolid &);
-    static G4VSolid * polycone_rz(const DDSolid &);
-    static G4VSolid * polycone_rrz(const DDSolid &);
-    static G4VSolid * polyhedra_rz(const DDSolid &);
-    static G4VSolid * polyhedra_rrz(const DDSolid &);
-    static G4VSolid * extrudedpolygon(const DDSolid &);
-    static G4VSolid * pseudotrap(const DDSolid & s);
-    static G4VSolid * torus(const DDSolid &);
-    static G4VSolid * trunctubs(const DDSolid &);
-    static G4VSolid * sphere(const DDSolid &);
-    static G4VSolid * ellipticaltube(const DDSolid &);
-    static const std::vector<double>* par_;
-    std::map<DDSolidShape,FNPTR> convDispatch_;
-
-    static G4RotationMatrix* rot;
-
-    friend class testTruncTubs;
-    friend class testPseudoTrap;
+  DDG4SolidConverter();
+  ~DDG4SolidConverter();
+  typedef G4VSolid *(*FNPTR)(const DDSolid &);  // pointer to function
+  G4VSolid *convert(const DDSolid &);
+
+private:
+  /* foreach supported solid add a static conversion routine ,
+     register this method in the convDispatch_-map */
+  static G4VSolid *box(const DDSolid &);
+  static G4VSolid *tubs(const DDSolid &);
+  static G4VSolid *cuttubs(const DDSolid &);
+  static G4VSolid *trap(const DDSolid &);
+  static G4VSolid *cons(const DDSolid &);
+  static G4VSolid *unionsolid(const DDSolid &);
+  static G4VSolid *subtraction(const DDSolid &);
+  static G4VSolid *intersection(const DDSolid &);
+  static G4VSolid *shapeless(const DDSolid &);
+  static G4VSolid *polycone_rz(const DDSolid &);
+  static G4VSolid *polycone_rrz(const DDSolid &);
+  static G4VSolid *polyhedra_rz(const DDSolid &);
+  static G4VSolid *polyhedra_rrz(const DDSolid &);
+  static G4VSolid *extrudedpolygon(const DDSolid &);
+  static G4VSolid *pseudotrap(const DDSolid &s);
+  static G4VSolid *torus(const DDSolid &);
+  static G4VSolid *trunctubs(const DDSolid &);
+  static G4VSolid *sphere(const DDSolid &);
+  static G4VSolid *ellipticaltube(const DDSolid &);
+  static const std::vector<double> *par_;
+  std::map<DDSolidShape, FNPTR> convDispatch_;
+
+  static G4RotationMatrix *rot;
+
+  friend class testTruncTubs;
+  friend class testPseudoTrap;
 };
 
 #endif
diff --git a/SimG4Core/Geometry/interface/DDGeometryReturnType.h b/SimG4Core/Geometry/interface/DDGeometryReturnType.h
index ef31b7b034cae..f1c9f6cedf5ea 100644
--- a/SimG4Core/Geometry/interface/DDGeometryReturnType.h
+++ b/SimG4Core/Geometry/interface/DDGeometryReturnType.h
@@ -7,22 +7,20 @@
 #include "G4LogicalVolume.hh"
 
 class DDGeometryReturnType {
-
 public:
-  DDGeometryReturnType(G4LogicalVolume* log,
-		       const G4LogicalVolumeToDDLogicalPartMap& map,
-		       const SensitiveDetectorCatalog& catalog);
+  DDGeometryReturnType(G4LogicalVolume *log,
+                       const G4LogicalVolumeToDDLogicalPartMap &map,
+                       const SensitiveDetectorCatalog &catalog);
   ~DDGeometryReturnType();
 
-  G4LogicalVolume*                  logicalVolume() const {return log_;}
-  G4LogicalVolumeToDDLogicalPartMap lvToDDLPMap()   const {return map_;}
-  SensitiveDetectorCatalog          sdCatalog()     const {return catalog_;}
+  G4LogicalVolume *logicalVolume() const { return log_; }
+  G4LogicalVolumeToDDLogicalPartMap lvToDDLPMap() const { return map_; }
+  SensitiveDetectorCatalog sdCatalog() const { return catalog_; }
 
 private:
-  G4LogicalVolume*                  log_;
+  G4LogicalVolume *log_;
   G4LogicalVolumeToDDLogicalPartMap map_;
-  SensitiveDetectorCatalog          catalog_;
-
+  SensitiveDetectorCatalog catalog_;
 };
- 
+
 #endif
diff --git a/SimG4Core/Geometry/interface/G4CheckOverlap.h b/SimG4Core/Geometry/interface/G4CheckOverlap.h
index 9c162f886d786..ee214fac43163 100644
--- a/SimG4Core/Geometry/interface/G4CheckOverlap.h
+++ b/SimG4Core/Geometry/interface/G4CheckOverlap.h
@@ -4,12 +4,9 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 class G4CheckOverlap {
-
 public:
-
-  G4CheckOverlap(edm::ParameterSet const & p);
+  G4CheckOverlap(edm::ParameterSet const &p);
   ~G4CheckOverlap();
-
 };
 
 #endif
diff --git a/SimG4Core/Geometry/interface/G4LogicalVolumeToDDLogicalPartMap.h b/SimG4Core/Geometry/interface/G4LogicalVolumeToDDLogicalPartMap.h
index 6cf72924ac706..4f23d2f2a495b 100644
--- a/SimG4Core/Geometry/interface/G4LogicalVolumeToDDLogicalPartMap.h
+++ b/SimG4Core/Geometry/interface/G4LogicalVolumeToDDLogicalPartMap.h
@@ -1,11 +1,11 @@
 #ifndef SimG4Core_G4LogicaVolumeToDDLogicalPartMap_H
 #define SimG4Core_G4LogicaVolumeToDDLogicalPartMap_H
 
-#include "DetectorDescription/Core/interface/DDMapper.h"
 #include "DetectorDescription/Core/interface/DDLogicalPart.h"
+#include "DetectorDescription/Core/interface/DDMapper.h"
 
 #include "G4LogicalVolume.hh"
 
-typedef DDMapper<G4LogicalVolume*,DDLogicalPart> G4LogicalVolumeToDDLogicalPartMap;
+typedef DDMapper<G4LogicalVolume *, DDLogicalPart> G4LogicalVolumeToDDLogicalPartMap;
 
 #endif
diff --git a/SimG4Core/Geometry/interface/SensitiveDetectorCatalog.h b/SimG4Core/Geometry/interface/SensitiveDetectorCatalog.h
index 1a5b760a5c8a8..be2e260858c54 100644
--- a/SimG4Core/Geometry/interface/SensitiveDetectorCatalog.h
+++ b/SimG4Core/Geometry/interface/SensitiveDetectorCatalog.h
@@ -1,25 +1,24 @@
 #ifndef SimG4Core_SensitiveDetectorCatalog_h
 #define SimG4Core_SensitiveDetectorCatalog_h
- 
-#include <vector>
+
 #include <map>
 #include <string>
+#include <vector>
 
 class SensitiveDetectorCatalog {
-
 public:
-  typedef std::map<std::string,std::vector<std::string> > MapType;
-  void insert(const std::string &, const std::string&, const std::string&);
-  const std::vector<std::string>& logicalNames(const std::string & readoutName) const;
-  std::vector<std::string> logicalNamesFromClassName(const std::string & className) const;
-  const std::vector<std::string>& readoutNames(const std::string & className) const;
+  typedef std::map<std::string, std::vector<std::string>> MapType;
+  void insert(const std::string &, const std::string &, const std::string &);
+  const std::vector<std::string> &logicalNames(const std::string &readoutName) const;
+  std::vector<std::string> logicalNamesFromClassName(const std::string &className) const;
+  const std::vector<std::string> &readoutNames(const std::string &className) const;
   std::vector<std::string> readoutNames() const;
-  std::string className(const std::string & readoutName) const;
+  std::string className(const std::string &readoutName) const;
   std::vector<std::string> classNames() const;
 
 private:
   MapType theClassNameMap;
   MapType theROUNameMap;
 };
- 
+
 #endif
diff --git a/SimG4Core/Geometry/src/DDDWorld.cc b/SimG4Core/Geometry/src/DDDWorld.cc
index ed1769f39921d..61d167e0d3ce7 100644
--- a/SimG4Core/Geometry/src/DDDWorld.cc
+++ b/SimG4Core/Geometry/src/DDDWorld.cc
@@ -4,47 +4,47 @@
 #include "DetectorDescription/Core/interface/DDCompactView.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "G4RunManagerKernel.hh"
 #include "G4PVPlacement.hh"
+#include "G4RunManagerKernel.hh"
 #include "G4TransportationManager.hh"
- 
-using namespace edm;
 
-DDDWorld::DDDWorld(const DDCompactView* cpv, 
-		   G4LogicalVolumeToDDLogicalPartMap & map,
-		   SensitiveDetectorCatalog & catalog,
-		   bool check) {
+using namespace edm;
 
+DDDWorld::DDDWorld(const DDCompactView *cpv,
+                   G4LogicalVolumeToDDLogicalPartMap &map,
+                   SensitiveDetectorCatalog &catalog,
+                   bool check) {
   std::unique_ptr<DDG4Builder> theBuilder(new DDG4Builder(cpv, check));
 
   DDGeometryReturnType ret = theBuilder->BuildGeometry();
-  G4LogicalVolume *    world = ret.logicalVolume();
+  G4LogicalVolume *world = ret.logicalVolume();
 
-  m_world = new G4PVPlacement(nullptr,G4ThreeVector(),world,"DDDWorld",nullptr,false,0);
+  m_world = new G4PVPlacement(nullptr, G4ThreeVector(), world, "DDDWorld", nullptr, false, 0);
   SetAsWorld(m_world);
-  map     = ret.lvToDDLPMap();
+  map = ret.lvToDDLPMap();
   catalog = ret.sdCatalog();
 }
 
 DDDWorld::~DDDWorld() {}
 
-void DDDWorld::SetAsWorld(G4VPhysicalVolume * pv) {
-  G4RunManagerKernel * kernel = G4RunManagerKernel::GetRunManagerKernel();
-  if(kernel) kernel->DefineWorldVolume(pv);
-  else edm::LogError("SimG4CoreGeometry") << "No G4RunManagerKernel?";
+void DDDWorld::SetAsWorld(G4VPhysicalVolume *pv) {
+  G4RunManagerKernel *kernel = G4RunManagerKernel::GetRunManagerKernel();
+  if (kernel)
+    kernel->DefineWorldVolume(pv);
+  else
+    edm::LogError("SimG4CoreGeometry") << "No G4RunManagerKernel?";
   edm::LogInfo("SimG4CoreGeometry") << " World volume defined ";
 }
 
-void DDDWorld::WorkerSetAsWorld(G4VPhysicalVolume * pv) {
-  G4RunManagerKernel * kernel = G4RunManagerKernel::GetRunManagerKernel();
-  if(kernel) {
+void DDDWorld::WorkerSetAsWorld(G4VPhysicalVolume *pv) {
+  G4RunManagerKernel *kernel = G4RunManagerKernel::GetRunManagerKernel();
+  if (kernel) {
     kernel->WorkerDefineWorldVolume(pv);
     // The following does not get done in WorkerDefineWorldVolume()
     // because we don't use G4MTRunManager
-    G4TransportationManager* transM = G4TransportationManager::GetTransportationManager();
+    G4TransportationManager *transM = G4TransportationManager::GetTransportationManager();
     transM->SetWorldForTracking(pv);
-  }
-  else edm::LogError("SimG4CoreGeometry") << "No G4RunManagerKernel?";
+  } else
+    edm::LogError("SimG4CoreGeometry") << "No G4RunManagerKernel?";
   edm::LogInfo("SimG4CoreGeometry") << " World volume defined (for worker) ";
 }
-
diff --git a/SimG4Core/Geometry/src/DDG4Builder.cc b/SimG4Core/Geometry/src/DDG4Builder.cc
index 31cfde76f4a9f..32a4156076a16 100644
--- a/SimG4Core/Geometry/src/DDG4Builder.cc
+++ b/SimG4Core/Geometry/src/DDG4Builder.cc
@@ -2,188 +2,193 @@
 
 #include "FWCore/Utilities/interface/Exception.h"
 
+#include "DetectorDescription/Core/interface/DDCompactView.h"
 #include "SimG4Core/Geometry/interface/DDG4Builder.h"
-#include "SimG4Core/Geometry/interface/DDG4SolidConverter.h"
 #include "SimG4Core/Geometry/interface/DDG4SensitiveConverter.h"
-#include "DetectorDescription/Core/interface/DDCompactView.h"
+#include "SimG4Core/Geometry/interface/DDG4SolidConverter.h"
 
-#include "G4VSolid.hh"
 #include "G4Box.hh"
-#include "G4Tubs.hh"
 #include "G4Cons.hh"
-#include "G4Trap.hh"
-#include "G4Material.hh"
 #include "G4LogicalVolume.hh"
-#include "G4VPhysicalVolume.hh"
+#include "G4Material.hh"
 #include "G4PVPlacement.hh"
 #include "G4ReflectionFactory.hh"
+#include "G4Trap.hh"
+#include "G4Tubs.hh"
+#include "G4VPhysicalVolume.hh"
+#include "G4VSolid.hh"
 
-#include "G4UnitsTable.hh"
 #include "G4SystemOfUnits.hh"
+#include "G4UnitsTable.hh"
 
 #include <sstream>
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-DDG4DispContainer * DDG4Builder::theVectorOfDDG4Dispatchables_ = nullptr;
+DDG4DispContainer *DDG4Builder::theVectorOfDDG4Dispatchables_ = nullptr;
 
-DDG4DispContainer * DDG4Builder::theVectorOfDDG4Dispatchables() { 
-  return theVectorOfDDG4Dispatchables_; 
-}
+DDG4DispContainer *DDG4Builder::theVectorOfDDG4Dispatchables() { return theVectorOfDDG4Dispatchables_; }
 
-DDG4Builder::DDG4Builder(const DDCompactView* cpv, bool check) : 
-  solidConverter_(new DDG4SolidConverter), compactView(cpv), check_(check) { 
-  theVectorOfDDG4Dispatchables_ = new DDG4DispContainer(); 
+DDG4Builder::DDG4Builder(const DDCompactView *cpv, bool check)
+    : solidConverter_(new DDG4SolidConverter), compactView(cpv), check_(check) {
+  theVectorOfDDG4Dispatchables_ = new DDG4DispContainer();
 }
 
-DDG4Builder::~DDG4Builder() { 
-  delete solidConverter_; 
-}
+DDG4Builder::~DDG4Builder() { delete solidConverter_; }
 
-G4LogicalVolume * DDG4Builder::convertLV(const DDLogicalPart & part) {
+G4LogicalVolume *DDG4Builder::convertLV(const DDLogicalPart &part) {
   LogDebug("SimG4CoreGeometry") << "DDG4Builder::convertLV(): DDLogicalPart = " << part << "\n";
-  G4LogicalVolume * result = logs_[part];
+  G4LogicalVolume *result = logs_[part];
   if (!result) {
-    G4VSolid * g4s   = convertSolid(part.solid());
-    G4Material * g4m = convertMaterial(part.material());
-    result = new G4LogicalVolume(g4s,g4m,part.name().name());
-    map_.insert(result,part);
-    DDG4Dispatchable * disp = new DDG4Dispatchable(&part,result);	
+    G4VSolid *g4s = convertSolid(part.solid());
+    G4Material *g4m = convertMaterial(part.material());
+    result = new G4LogicalVolume(g4s, g4m, part.name().name());
+    map_.insert(result, part);
+    DDG4Dispatchable *disp = new DDG4Dispatchable(&part, result);
     theVectorOfDDG4Dispatchables_->push_back(disp);
     LogDebug("SimG4CoreGeometry") << "DDG4Builder::convertLV(): new G4LogicalVolume " << part.name().name()
-				  << "\nDDG4Builder: newEvent: dd=" << part.ddname() << " g4=" << result->GetName() << "\n";
-    logs_[part] = result;  // DDD -> GEANT4  
+                                  << "\nDDG4Builder: newEvent: dd=" << part.ddname() << " g4=" << result->GetName()
+                                  << "\n";
+    logs_[part] = result;  // DDD -> GEANT4
   }
   return result;
 }
 
-G4VSolid * DDG4Builder::convertSolid(const DDSolid & solid) {
-  G4VSolid * result = sols_[solid];
-  if (!result) { 
-    result = solidConverter_->convert(solid); sols_[solid] = result; 
+G4VSolid *DDG4Builder::convertSolid(const DDSolid &solid) {
+  G4VSolid *result = sols_[solid];
+  if (!result) {
+    result = solidConverter_->convert(solid);
+    sols_[solid] = result;
   }
   return result;
 }
 
-G4Material * DDG4Builder::convertMaterial(const DDMaterial & material) {
+G4Material *DDG4Builder::convertMaterial(const DDMaterial &material) {
   LogDebug("SimG4CoreGeometry") << "DDDetConstr::ConvertMaterial: material=" << material << "\n";
-  G4Material * result = nullptr;
+  G4Material *result = nullptr;
   if (material) {
     // only if it's a valid DDD-material
     if ((result = mats_[material])) {
-      LogDebug("SimG4CoreGeometry") << "  is already converted" << "\n"; 
-      return result; }
+      LogDebug("SimG4CoreGeometry") << "  is already converted"
+                                    << "\n";
+      return result;
+    }
   } else {
     // only if it's NOT a valid DDD-material
-    edm::LogError("SimG4CoreGeometry") << "DDG4Builder::  material " << material.toString() << " is not valid (in the DDD sense!)";
-    throw cms::Exception("SimG4CoreGeometry", " material is not valid from the Detector Description: " + material.toString()); 
-  }    
+    edm::LogError("SimG4CoreGeometry") << "DDG4Builder::  material " << material.toString()
+                                       << " is not valid (in the DDD sense!)";
+    throw cms::Exception("SimG4CoreGeometry",
+                         " material is not valid from the Detector Description: " + material.toString());
+  }
   int c = 0;
   if ((c = material.noOfConstituents())) {
     // it's a composite material
     LogDebug("SimG4CoreGeometry") << "  creating a G4-composite material. c=" << c
-				  << " d=" << material.density()/g*mole  << "\n";
-    result = new G4Material(material.name().name(),material.density(),c);
-    for (int i=0 ; i<c; ++i) {
+                                  << " d=" << material.density() / g * mole << "\n";
+    result = new G4Material(material.name().name(), material.density(), c);
+    for (int i = 0; i < c; ++i) {
       // recursive building of constituents
       LogDebug("SimG4CoreGeometry") << "  adding the composite=" << material.name()
-				    << " fm=" << material.constituent(i).second << "\n";
-      result->AddMaterial
-	(convertMaterial(material.constituent(i).first),
-	 material.constituent(i).second);// fractionmass
+                                    << " fm=" << material.constituent(i).second << "\n";
+      result->AddMaterial(convertMaterial(material.constituent(i).first),
+                          material.constituent(i).second);  // fractionmass
     }
   } else {
     // it's an elementary material
     LogDebug("SimG4CoreGeometry") << "  building an elementary material"
-				  << " z=" << material.z()
-				  << " a=" << material.a()/g*mole
-				  << " d=" << material.density()/g*cm3  << "\n";
-    result = new G4Material
-      (material.name().name(),material.z(),material.a(),material.density());
+                                  << " z=" << material.z() << " a=" << material.a() / g * mole
+                                  << " d=" << material.density() / g * cm3 << "\n";
+    result = new G4Material(material.name().name(), material.z(), material.a(), material.density());
   }
   mats_[material] = result;
   return result;
-} 
+}
 
 DDGeometryReturnType DDG4Builder::BuildGeometry() {
-  G4ReflectionFactory * refFact = G4ReflectionFactory::Instance();
-  refFact->SetScalePrecision(100.*refFact->GetScalePrecision());
+  G4ReflectionFactory *refFact = G4ReflectionFactory::Instance();
+  refFact->SetScalePrecision(100. * refFact->GetScalePrecision());
 
   using Graph = DDCompactView::Graph;
-  const auto & gra = compactView->graph();
+  const auto &gra = compactView->graph();
   using adjl_iterator = Graph::const_adj_iterator;
   adjl_iterator git = gra.begin();
-  adjl_iterator gend = gra.end();    
+  adjl_iterator gend = gra.end();
 
-  Graph::index_type i=0;
+  Graph::index_type i = 0;
   for (; git != gend; ++git) {
-    const DDLogicalPart & ddLP = gra.nodeData(git);
-    if ( !(ddLP.isDefined().second) ) {
-      edm::LogError("SimG4CoreGeometry") << "DDG4Builder::BuildGeometry() has encountered an undefined DDLogicalPart named " << ddLP.toString();
-      throw cms::Exception("SimG4CoreGeometry", " DDG4Builder::BuildGeometry() has encountered an undefined DDLogicalPart named " + ddLP.toString());
+    const DDLogicalPart &ddLP = gra.nodeData(git);
+    if (!(ddLP.isDefined().second)) {
+      edm::LogError("SimG4CoreGeometry") << "DDG4Builder::BuildGeometry() has encountered an undefined "
+                                            "DDLogicalPart named "
+                                         << ddLP.toString();
+      throw cms::Exception("SimG4CoreGeometry",
+                           " DDG4Builder::BuildGeometry() has encountered an "
+                           "undefined DDLogicalPart named " +
+                               ddLP.toString());
     }
-    G4LogicalVolume * g4LV = convertLV(ddLP);
-    ++i;	
+    G4LogicalVolume *g4LV = convertLV(ddLP);
+    ++i;
     if (!git->empty()) {
-      // ask for children of ddLP  
-      Graph::edge_list::const_iterator cit  = git->begin();
+      // ask for children of ddLP
+      Graph::edge_list::const_iterator cit = git->begin();
       Graph::edge_list::const_iterator cend = git->end();
       for (; cit != cend; ++cit) {
-	// fetch specific data
-	const DDLogicalPart & ddcurLP = gra.nodeData(cit->first);
-	if ( !ddcurLP.isDefined().second ) {
-	  std::string err = " DDG4Builder::BuildGeometry() in processing \"children\" has ";
-	  err += "encountered an undefined DDLogicalPart named " + ddcurLP.toString()
-	    + " is a child of " + ddLP.toString();
-	  edm::LogError("SimG4CoreGeometry") << err;
-	  throw cms::Exception("SimG4CoreGeometry", err) ;
-	}
-	int offset = getInt("CopyNoOffset",ddcurLP);
-	int tag = getInt("CopyNoTag",ddcurLP);				
-	DDRotationMatrix rm(gra.edgeData(cit->second)->rot());
-	DD3Vector x, y, z;
-	rm.GetComponents(x, y, z);
-	if ((x.Cross(y)).Dot(z)<0)
-	  edm::LogInfo("SimG4CoreGeometry") << ">>Reflection encountered: " 
-					    << gra.edgeData(cit->second)->ddrot()  
-					    << ">>Placement d=" << gra.nodeData(cit->first).ddname() 
-					    << " m=" << ddLP.ddname() << " cp=" << gra.edgeData(cit->second)->copyno()
-					    << " r=" << gra.edgeData(cit->second)->ddrot().ddname();     
-	G4ThreeVector tempTran(gra.edgeData(cit->second)->trans().X(), gra.edgeData(cit->second)->trans().Y(), gra.edgeData(cit->second)->trans().Z());
-	G4Translate3D transl = tempTran;
-	CLHEP::HepRep3x3 temp( x.X(), x.Y(), x.Z(), y.X(), y.Y(), y.Z(), z.X(), z.Y(), z.Z() ); //matrix representation
-	CLHEP::HepRotation hr ( temp );
-	    
-	// G3 convention of defining rot-matrices ...
-	G4Transform3D trfrm  = transl * G4Rotate3D(hr.inverse());//.inverse();
-
-	refFact->Place(trfrm, // transformation containing a possible reflection
-		       gra.nodeData(cit->first).name().name(),
-		       convertLV(gra.nodeData(cit->first)), 		// daugther
-		       g4LV, 				 		// mother
-		       false,                 		 		// 'ONLY'
-		       gra.edgeData(cit->second)->copyno()+offset+tag, 	// copy number
-		       check_);
-      } // iterate over children
-    } // if (children)
-  } // iterate over graph nodes  
-    
-  // Looking for in the G4ReflectionFactory secretly created reflected G4LogicalVolumes
-  std::map<DDLogicalPart, G4LogicalVolume*>::const_iterator  ddg4_it = logs_.begin();
+        // fetch specific data
+        const DDLogicalPart &ddcurLP = gra.nodeData(cit->first);
+        if (!ddcurLP.isDefined().second) {
+          std::string err = " DDG4Builder::BuildGeometry() in processing \"children\" has ";
+          err += "encountered an undefined DDLogicalPart named " + ddcurLP.toString() + " is a child of " +
+                 ddLP.toString();
+          edm::LogError("SimG4CoreGeometry") << err;
+          throw cms::Exception("SimG4CoreGeometry", err);
+        }
+        int offset = getInt("CopyNoOffset", ddcurLP);
+        int tag = getInt("CopyNoTag", ddcurLP);
+        DDRotationMatrix rm(gra.edgeData(cit->second)->rot());
+        DD3Vector x, y, z;
+        rm.GetComponents(x, y, z);
+        if ((x.Cross(y)).Dot(z) < 0)
+          edm::LogInfo("SimG4CoreGeometry")
+              << ">>Reflection encountered: " << gra.edgeData(cit->second)->ddrot()
+              << ">>Placement d=" << gra.nodeData(cit->first).ddname() << " m=" << ddLP.ddname()
+              << " cp=" << gra.edgeData(cit->second)->copyno() << " r=" << gra.edgeData(cit->second)->ddrot().ddname();
+        G4ThreeVector tempTran(gra.edgeData(cit->second)->trans().X(),
+                               gra.edgeData(cit->second)->trans().Y(),
+                               gra.edgeData(cit->second)->trans().Z());
+        G4Translate3D transl = tempTran;
+        CLHEP::HepRep3x3 temp(x.X(), x.Y(), x.Z(), y.X(), y.Y(), y.Z(), z.X(), z.Y(), z.Z());  // matrix representation
+        CLHEP::HepRotation hr(temp);
+
+        // G3 convention of defining rot-matrices ...
+        G4Transform3D trfrm = transl * G4Rotate3D(hr.inverse());  //.inverse();
+
+        refFact->Place(trfrm,  // transformation containing a possible reflection
+                       gra.nodeData(cit->first).name().name(),
+                       convertLV(gra.nodeData(cit->first)),                 // daugther
+                       g4LV,                                                // mother
+                       false,                                               // 'ONLY'
+                       gra.edgeData(cit->second)->copyno() + offset + tag,  // copy number
+                       check_);
+      }  // iterate over children
+    }    // if (children)
+  }      // iterate over graph nodes
+
+  // Looking for in the G4ReflectionFactory secretly created reflected
+  // G4LogicalVolumes
+  std::map<DDLogicalPart, G4LogicalVolume *>::const_iterator ddg4_it = logs_.begin();
   for (; ddg4_it != logs_.end(); ++ddg4_it) {
-    G4LogicalVolume * reflLogicalVolume = refFact->GetReflectedLV(ddg4_it->second);
+    G4LogicalVolume *reflLogicalVolume = refFact->GetReflectedLV(ddg4_it->second);
     if (reflLogicalVolume) {
       DDLogicalPart ddlv = ddg4_it->first;
-      map_.insert(reflLogicalVolume,ddlv);
-      DDG4Dispatchable * disp = new DDG4Dispatchable(&(ddg4_it->first),reflLogicalVolume);
+      map_.insert(reflLogicalVolume, ddlv);
+      DDG4Dispatchable *disp = new DDG4Dispatchable(&(ddg4_it->first), reflLogicalVolume);
       theVectorOfDDG4Dispatchables_->push_back(disp);
-      edm::LogInfo("SimG4CoreGeometry")<< "DDG4Builder: newEvent: dd=" 
-				       << ddlv.ddname() << " g4=" 
-				       << reflLogicalVolume->GetName();
-    }  
+      edm::LogInfo("SimG4CoreGeometry") << "DDG4Builder: newEvent: dd=" << ddlv.ddname()
+                                        << " g4=" << reflLogicalVolume->GetName();
+    }
   }
-      
-  G4LogicalVolume * world = logs_[compactView->root()];
+
+  G4LogicalVolume *world = logs_[compactView->root()];
 
   //
   //  needed for building sensitive detectors
@@ -191,50 +196,56 @@ DDGeometryReturnType DDG4Builder::BuildGeometry() {
   DDG4SensitiveConverter conv_;
   SensitiveDetectorCatalog catalog = conv_.upDate(*theVectorOfDDG4Dispatchables_);
 
-  return DDGeometryReturnType(world,map_,catalog);    
+  return DDGeometryReturnType(world, map_, catalog);
 }
 
-int DDG4Builder::getInt(const std::string & ss, const DDLogicalPart & part)
-{
+int DDG4Builder::getInt(const std::string &ss, const DDLogicalPart &part) {
   DDValue val(ss);
   std::vector<const DDsvalues_type *> result = part.specifics();
   bool foundIt = false;
   for (auto stype : result) {
-    foundIt = DDfetch(stype,val);
-    if (foundIt) break;
-  }    
-  if (foundIt) { 
+    foundIt = DDfetch(stype, val);
+    if (foundIt)
+      break;
+  }
+  if (foundIt) {
     std::vector<double> temp = val.doubles();
     if (temp.size() != 1) {
       edm::LogError("SimG4CoreGeometry") << " DDG4Builder - ERROR: I need only 1 " << ss;
-      throw cms::Exception("SimG4CoreGeometry", " DDG4Builder::getInt() Problem with Region tags - one and only one allowed: " + ss);
-    }      
+      throw cms::Exception("SimG4CoreGeometry",
+                           " DDG4Builder::getInt() Problem with Region tags - "
+                           "one and only one allowed: " +
+                               ss);
+    }
     return int(temp[0]);
-  }
-  else return 0;
+  } else
+    return 0;
 }
 
-double DDG4Builder::getDouble(const std::string & ss, 
-			      const DDLogicalPart & part) {
+double DDG4Builder::getDouble(const std::string &ss, const DDLogicalPart &part) {
   DDValue val(ss);
   std::vector<const DDsvalues_type *> result = part.specifics();
   bool foundIt = false;
   for (auto stype : result) {
-    foundIt = DDfetch(stype,val);
-    if (foundIt) break;
-  }    
-  if (foundIt) { 
+    foundIt = DDfetch(stype, val);
+    if (foundIt)
+      break;
+  }
+  if (foundIt) {
     std::vector<std::string> temp = val.strings();
     if (temp.size() != 1) {
       edm::LogError("SimG4CoreGeometry") << " DDG4Builder - ERROR: I need only 1 " << ss;
-      throw cms::Exception("SimG4CoreGeometry", " DDG4Builder::getDouble() Problem with Region tags - one and only one allowed: " + ss);
+      throw cms::Exception("SimG4CoreGeometry",
+                           " DDG4Builder::getDouble() Problem with Region tags "
+                           "- one and only one allowed: " +
+                               ss);
     }
     double v;
     std::string unit;
     std::istringstream is(temp[0]);
     is >> v >> unit;
-    v  = v*G4UnitDefinition::GetValueOf(unit.substr(1,unit.size()));
+    v = v * G4UnitDefinition::GetValueOf(unit.substr(1, unit.size()));
     return v;
-  }
-  else return 0;
+  } else
+    return 0;
 }
diff --git a/SimG4Core/Geometry/src/DDG4SensitiveConverter.cc b/SimG4Core/Geometry/src/DDG4SensitiveConverter.cc
index 3807a6e6938ee..f4c7cc9c788fa 100644
--- a/SimG4Core/Geometry/src/DDG4SensitiveConverter.cc
+++ b/SimG4Core/Geometry/src/DDG4SensitiveConverter.cc
@@ -1,7 +1,7 @@
 #include "SimG4Core/Geometry/interface/DDG4SensitiveConverter.h"
 
-#include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
 #include "G4LogicalVolume.hh"
 
@@ -9,46 +9,47 @@ DDG4SensitiveConverter::DDG4SensitiveConverter() {}
 
 DDG4SensitiveConverter::~DDG4SensitiveConverter() {}
 
-SensitiveDetectorCatalog DDG4SensitiveConverter::upDate(const DDG4DispContainer & ddg4s) {
-
-  LogDebug("SimG4CoreGeometry") <<" DDG4SensitiveConverter::upDate() starts" ;
+SensitiveDetectorCatalog DDG4SensitiveConverter::upDate(const DDG4DispContainer &ddg4s) {
+  LogDebug("SimG4CoreGeometry") << " DDG4SensitiveConverter::upDate() starts";
   SensitiveDetectorCatalog catalog;
 
-  for (auto ddg4 : ddg4s)  {
-    const DDLogicalPart * part   = (ddg4->getDDLogicalPart());
-    G4LogicalVolume *     result = (ddg4->getG4LogicalVolume());
-  
-    std::string sClassName = getString("SensitiveDetector",part);
-    std::string sROUName   = getString("ReadOutName",part);
-    std::string fff        = result->GetName();
+  for (auto ddg4 : ddg4s) {
+    const DDLogicalPart *part = (ddg4->getDDLogicalPart());
+    G4LogicalVolume *result = (ddg4->getG4LogicalVolume());
+
+    std::string sClassName = getString("SensitiveDetector", part);
+    std::string sROUName = getString("ReadOutName", part);
+    std::string fff = result->GetName();
     if (sClassName != "NotFound") {
-      LogDebug("SimG4CoreGeometry") << " DDG4SensitiveConverter: Sensitive " << fff
-				    << " Class Name " << sClassName << " ROU Name " << sROUName;
+      LogDebug("SimG4CoreGeometry") << " DDG4SensitiveConverter: Sensitive " << fff << " Class Name " << sClassName
+                                    << " ROU Name " << sROUName;
       fff = result->GetName();
-      catalog.insert(sClassName,sROUName,fff);
+      catalog.insert(sClassName, sROUName, fff);
     }
   }
   return catalog;
 }
 
-std::string DDG4SensitiveConverter::getString(const std::string & ss, 
-					      const DDLogicalPart * part) {
+std::string DDG4SensitiveConverter::getString(const std::string &ss, const DDLogicalPart *part) {
   std::vector<std::string> temp;
   DDValue val(ss);
   std::vector<const DDsvalues_type *> result = part->specifics();
   bool foundIt = false;
   for (auto stype : result) {
-    foundIt = DDfetch(stype,val);
-    if (foundIt) break;
-  }    
-  if (foundIt) { 
-    temp = val.strings(); 
+    foundIt = DDfetch(stype, val);
+    if (foundIt)
+      break;
+  }
+  if (foundIt) {
+    temp = val.strings();
     if (temp.size() != 1) {
-      edm::LogError("SimG4CoreGeometry") << "DDG4SensitiveConverter - ERROR: I need 1 " << ss << " tags" ;
-      throw cms::Exception("SimG4CoreGeometry", " DDG4SensitiveConverter::getString Problem with Region tags - one and only one allowed: " + ss);
+      edm::LogError("SimG4CoreGeometry") << "DDG4SensitiveConverter - ERROR: I need 1 " << ss << " tags";
+      throw cms::Exception("SimG4CoreGeometry",
+                           " DDG4SensitiveConverter::getString Problem with "
+                           "Region tags - one and only one allowed: " +
+                               ss);
     }
-    return temp[0]; 
+    return temp[0];
   }
   return "NotFound";
 }
-
diff --git a/SimG4Core/Geometry/src/DDG4SolidConverter.cc b/SimG4Core/Geometry/src/DDG4SolidConverter.cc
index 73b086d70cac0..c182cee15cad2 100644
--- a/SimG4Core/Geometry/src/DDG4SolidConverter.cc
+++ b/SimG4Core/Geometry/src/DDG4SolidConverter.cc
@@ -1,5 +1,5 @@
-#include "SimG4Core/Geometry/interface/DDG4SolidConverter.h"
 #include "G4VSolid.hh"
+#include "SimG4Core/Geometry/interface/DDG4SolidConverter.h"
 
 #include "DetectorDescription/Core/interface/DDSolid.h"
 
@@ -7,228 +7,238 @@
 #include "FWCore/Utilities/interface/Exception.h"
 #include "G4SystemOfUnits.hh"
 
-const std::vector<double> * DDG4SolidConverter::par_ = nullptr; 
-G4RotationMatrix* DDG4SolidConverter::rot = nullptr;
+const std::vector<double> *DDG4SolidConverter::par_ = nullptr;
+G4RotationMatrix *DDG4SolidConverter::rot = nullptr;
 
 DDG4SolidConverter::DDG4SolidConverter() {
-  // could also be done 'dynamically' from outside 
+  // could also be done 'dynamically' from outside
   // would then need to have a 'register' method ...
-  convDispatch_[DDSolidShape::ddbox]            = DDG4SolidConverter::box; 
-  convDispatch_[DDSolidShape::ddtubs]           = DDG4SolidConverter::tubs;
-  convDispatch_[DDSolidShape::ddcuttubs]        = DDG4SolidConverter::cuttubs;
-  convDispatch_[DDSolidShape::ddtrap]           = DDG4SolidConverter::trap;
-  convDispatch_[DDSolidShape::ddcons]           = DDG4SolidConverter::cons;
-  convDispatch_[DDSolidShape::ddpolycone_rrz]   = DDG4SolidConverter::polycone_rrz;
-  convDispatch_[DDSolidShape::ddpolycone_rz]    = DDG4SolidConverter::polycone_rz;
-  convDispatch_[DDSolidShape::ddpolyhedra_rrz]  = DDG4SolidConverter::polyhedra_rrz;
-  convDispatch_[DDSolidShape::ddpolyhedra_rz]   = DDG4SolidConverter::polyhedra_rz;
-  convDispatch_[DDSolidShape::ddextrudedpolygon]= DDG4SolidConverter::extrudedpolygon;
-  convDispatch_[DDSolidShape::ddtorus]          = DDG4SolidConverter::torus;   
-  convDispatch_[DDSolidShape::ddunion]          = DDG4SolidConverter::unionsolid;
-  convDispatch_[DDSolidShape::ddintersection]   = DDG4SolidConverter::intersection;
-  convDispatch_[DDSolidShape::ddsubtraction]    = DDG4SolidConverter::subtraction;
-  convDispatch_[DDSolidShape::ddpseudotrap]     = DDG4SolidConverter::pseudotrap;
-  convDispatch_[DDSolidShape::ddtrunctubs]      = DDG4SolidConverter::trunctubs;
-  convDispatch_[DDSolidShape::ddsphere]         = DDG4SolidConverter::sphere;   
-  convDispatch_[DDSolidShape::ddellipticaltube] = DDG4SolidConverter::ellipticaltube;   
+  convDispatch_[DDSolidShape::ddbox] = DDG4SolidConverter::box;
+  convDispatch_[DDSolidShape::ddtubs] = DDG4SolidConverter::tubs;
+  convDispatch_[DDSolidShape::ddcuttubs] = DDG4SolidConverter::cuttubs;
+  convDispatch_[DDSolidShape::ddtrap] = DDG4SolidConverter::trap;
+  convDispatch_[DDSolidShape::ddcons] = DDG4SolidConverter::cons;
+  convDispatch_[DDSolidShape::ddpolycone_rrz] = DDG4SolidConverter::polycone_rrz;
+  convDispatch_[DDSolidShape::ddpolycone_rz] = DDG4SolidConverter::polycone_rz;
+  convDispatch_[DDSolidShape::ddpolyhedra_rrz] = DDG4SolidConverter::polyhedra_rrz;
+  convDispatch_[DDSolidShape::ddpolyhedra_rz] = DDG4SolidConverter::polyhedra_rz;
+  convDispatch_[DDSolidShape::ddextrudedpolygon] = DDG4SolidConverter::extrudedpolygon;
+  convDispatch_[DDSolidShape::ddtorus] = DDG4SolidConverter::torus;
+  convDispatch_[DDSolidShape::ddunion] = DDG4SolidConverter::unionsolid;
+  convDispatch_[DDSolidShape::ddintersection] = DDG4SolidConverter::intersection;
+  convDispatch_[DDSolidShape::ddsubtraction] = DDG4SolidConverter::subtraction;
+  convDispatch_[DDSolidShape::ddpseudotrap] = DDG4SolidConverter::pseudotrap;
+  convDispatch_[DDSolidShape::ddtrunctubs] = DDG4SolidConverter::trunctubs;
+  convDispatch_[DDSolidShape::ddsphere] = DDG4SolidConverter::sphere;
+  convDispatch_[DDSolidShape::ddellipticaltube] = DDG4SolidConverter::ellipticaltube;
 }
 
 DDG4SolidConverter::~DDG4SolidConverter() {}
 
-G4VSolid * DDG4SolidConverter::convert(const DDSolid & solid) {
-  if ( !solid ) {
-    edm::LogError("SimG4CoreGeometry") <<" DDG4SolidConverter::convert(..) found an undefined DDSolid " << solid.toString();
-    throw cms::Exception("SimG4CoreGeometry", "DDG4SolidConverter::convert(..) found an undefined DDSolid " + solid.toString());
+G4VSolid *DDG4SolidConverter::convert(const DDSolid &solid) {
+  if (!solid) {
+    edm::LogError("SimG4CoreGeometry") << " DDG4SolidConverter::convert(..) found an undefined DDSolid "
+                                       << solid.toString();
+    throw cms::Exception("SimG4CoreGeometry",
+                         "DDG4SolidConverter::convert(..) found an undefined DDSolid " + solid.toString());
   }
-  G4VSolid * result = nullptr;
+  G4VSolid *result = nullptr;
   par_ = &(solid.parameters());
-  std::map<DDSolidShape,FNPTR>::iterator it = convDispatch_.find(solid.shape());
+  std::map<DDSolidShape, FNPTR>::iterator it = convDispatch_.find(solid.shape());
   if (it != convDispatch_.end()) {
     result = it->second(solid);
   } else {
-    throw cms::Exception("DetectorDescriptionFault") 
-      <<  "DDG4SolidConverter::convert: conversion failed for s=" << solid
-      << "\n solid.shape()=" << DDSolidShapesName::name(solid.shape())
-      << std::endl;
+    throw cms::Exception("DetectorDescriptionFault")
+        << "DDG4SolidConverter::convert: conversion failed for s=" << solid
+        << "\n solid.shape()=" << DDSolidShapesName::name(solid.shape()) << std::endl;
   }
   return result;
 }
 
-
 #include "G4Box.hh"
-G4VSolid * DDG4SolidConverter::box(const DDSolid & solid) {
+G4VSolid *DDG4SolidConverter::box(const DDSolid &solid) {
   LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: box = " << solid;
-  return new G4Box(solid.name().name(), (*par_)[0],(*par_)[1],(*par_)[2]);
+  return new G4Box(solid.name().name(), (*par_)[0], (*par_)[1], (*par_)[2]);
 }
 
-
 #include "G4Tubs.hh"
-G4VSolid * DDG4SolidConverter::tubs(const DDSolid & solid) {
-  LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: tubs = " << solid;  
-  return new G4Tubs(solid.name().name(), (*par_)[1], // rmin
-		    (*par_)[2], // rmax
-		    (*par_)[0], // dzHalf
-		    (*par_)[3], // phiStart
-		    (*par_)[4]);// deltaPhi
+G4VSolid *DDG4SolidConverter::tubs(const DDSolid &solid) {
+  LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: tubs = " << solid;
+  return new G4Tubs(solid.name().name(),
+                    (*par_)[1],   // rmin
+                    (*par_)[2],   // rmax
+                    (*par_)[0],   // dzHalf
+                    (*par_)[3],   // phiStart
+                    (*par_)[4]);  // deltaPhi
 }
 
 #include "G4CutTubs.hh"
-G4VSolid * DDG4SolidConverter::cuttubs(const DDSolid & solid) {
-  LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: tubs = " << solid;  
-  return new G4CutTubs(solid.name().name(), (*par_)[1], // rmin
-		       (*par_)[2], // rmax
-		       (*par_)[0], // dzHalf
-		       (*par_)[3], // phiStart
-		       (*par_)[4], // deltaPhi
-		       G4ThreeVector((*par_)[5],(*par_)[6],(*par_)[7]),
-		       G4ThreeVector((*par_)[8],(*par_)[9],(*par_)[10]));
+G4VSolid *DDG4SolidConverter::cuttubs(const DDSolid &solid) {
+  LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: tubs = " << solid;
+  return new G4CutTubs(solid.name().name(),
+                       (*par_)[1],  // rmin
+                       (*par_)[2],  // rmax
+                       (*par_)[0],  // dzHalf
+                       (*par_)[3],  // phiStart
+                       (*par_)[4],  // deltaPhi
+                       G4ThreeVector((*par_)[5], (*par_)[6], (*par_)[7]),
+                       G4ThreeVector((*par_)[8], (*par_)[9], (*par_)[10]));
 }
 
-
 #include "G4Trap.hh"
-G4VSolid * DDG4SolidConverter::trap(const DDSolid & solid) {
+G4VSolid *DDG4SolidConverter::trap(const DDSolid &solid) {
   LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: trap = " << solid;
-  return new G4Trap(solid.name().name(), (*par_)[0],  // pDz
-		    (*par_)[1],  // theta
-		    (*par_)[2],  // phi
-		    (*par_)[3],  // y1
-		    (*par_)[4],  // x1
-		    (*par_)[5],  // x2
-		    (*par_)[6],  // alpha1
-		    (*par_)[7],  // y2
-		    (*par_)[8],  // x3
-		    (*par_)[9],  // x4
-		    (*par_)[10]);// alpha2
+  return new G4Trap(solid.name().name(),
+                    (*par_)[0],    // pDz
+                    (*par_)[1],    // theta
+                    (*par_)[2],    // phi
+                    (*par_)[3],    // y1
+                    (*par_)[4],    // x1
+                    (*par_)[5],    // x2
+                    (*par_)[6],    // alpha1
+                    (*par_)[7],    // y2
+                    (*par_)[8],    // x3
+                    (*par_)[9],    // x4
+                    (*par_)[10]);  // alpha2
 }
 
-
 #include "G4Cons.hh"
-G4VSolid * DDG4SolidConverter::cons(const DDSolid & solid) {
-  LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: cons = " << solid;  
-  return new G4Cons(solid.name().name(), (*par_)[1],  // rmin -z
-		    (*par_)[2],  // rmax -z
-		    (*par_)[3],  // rmin +z
-		    (*par_)[4],  // rmax +z
-		    (*par_)[0],  // zHalf
-		    (*par_)[5],  // phistart
-		    (*par_)[6]); // deltaphi
+G4VSolid *DDG4SolidConverter::cons(const DDSolid &solid) {
+  LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: cons = " << solid;
+  return new G4Cons(solid.name().name(),
+                    (*par_)[1],   // rmin -z
+                    (*par_)[2],   // rmax -z
+                    (*par_)[3],   // rmin +z
+                    (*par_)[4],   // rmax +z
+                    (*par_)[0],   // zHalf
+                    (*par_)[5],   // phistart
+                    (*par_)[6]);  // deltaphi
 }
 
-	    
 #include "G4Polycone.hh"
-G4VSolid * DDG4SolidConverter::polycone_rz(const DDSolid & solid) {
-  LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: pcon_rz = " << solid;  
+G4VSolid *DDG4SolidConverter::polycone_rz(const DDSolid &solid) {
+  LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: pcon_rz = " << solid;
   std::vector<double> r;
   std::vector<double> z;
-  std::vector<double>::const_iterator i = (*par_).begin()+2;
-  int count=0;
-  for(; i!=(*par_).end(); ++i) {
-    LogDebug("SimG4CoreGeometry") << " z=" << *i/CLHEP::cm;
-    z.push_back(*i); ++i;
-    LogDebug("SimG4CoreGeometry") << " r=" << *i/CLHEP::cm;
+  std::vector<double>::const_iterator i = (*par_).begin() + 2;
+  int count = 0;
+  for (; i != (*par_).end(); ++i) {
+    LogDebug("SimG4CoreGeometry") << " z=" << *i / CLHEP::cm;
+    z.push_back(*i);
+    ++i;
+    LogDebug("SimG4CoreGeometry") << " r=" << *i / CLHEP::cm;
     r.push_back(*i);
     count++;
   }
-  LogDebug("SimG4CoreGeometry") << "sp=" << (*par_)[0]/CLHEP::deg << " ep=" 
-				<< (*par_)[1]/CLHEP::deg;
+  LogDebug("SimG4CoreGeometry") << "sp=" << (*par_)[0] / CLHEP::deg << " ep=" << (*par_)[1] / CLHEP::deg;
   /*
-   std::cout << "### Polycone_RZ: " << "sp=" << (*par_)[0]/CLHEP::deg 
-   << " ep=" << (*par_)[1]/CLHEP::deg 
+   std::cout << "### Polycone_RZ: " << "sp=" << (*par_)[0]/CLHEP::deg
+   << " ep=" << (*par_)[1]/CLHEP::deg
    << " N= " << count << std::endl;
-   for(int i=0; i<count; ++i) { 
+   for(int i=0; i<count; ++i) {
    std::cout << " R= " << r[i] << " Z= " << z[i] << std::endl;
    }
   */
-  return new G4Polycone(solid.name().name(), (*par_)[0], (*par_)[1], // start,delta-phi
-			count, // numRZ
-			&(r[0]),
-			&(z[0]));
+  return new G4Polycone(solid.name().name(),
+                        (*par_)[0],
+                        (*par_)[1],  // start,delta-phi
+                        count,       // numRZ
+                        &(r[0]),
+                        &(z[0]));
 }
 
-
-G4VSolid * DDG4SolidConverter::polycone_rrz(const DDSolid & solid) {
+G4VSolid *DDG4SolidConverter::polycone_rrz(const DDSolid &solid) {
   LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: pcon_rrz = " << solid;
   std::vector<double> z_p;
   std::vector<double> rmin_p;
   std::vector<double> rmax_p;
-  std::vector<double>::const_iterator i = par_->begin()+2;
+  std::vector<double>::const_iterator i = par_->begin() + 2;
   int count = 0;
-  for (; i!=par_->end(); ++i) {
-    LogDebug("SimG4CoreGeometry") << "z=" << *i/CLHEP::cm;
-    z_p.push_back(*i); ++i;
-    LogDebug("SimG4CoreGeometry") << "rmin=" << *i/CLHEP::cm;
-    rmin_p.push_back(*i); ++i;
-    LogDebug("SimG4CoreGeometry") << "rmax=" << *i/CLHEP::cm;
-    rmax_p.push_back(*i); 
+  for (; i != par_->end(); ++i) {
+    LogDebug("SimG4CoreGeometry") << "z=" << *i / CLHEP::cm;
+    z_p.push_back(*i);
+    ++i;
+    LogDebug("SimG4CoreGeometry") << "rmin=" << *i / CLHEP::cm;
+    rmin_p.push_back(*i);
+    ++i;
+    LogDebug("SimG4CoreGeometry") << "rmax=" << *i / CLHEP::cm;
+    rmax_p.push_back(*i);
     count++;
   }
-  LogDebug("SimG4CoreGeometry") << "sp=" << (*par_)[0]/CLHEP::deg << " ep=" 
-				<< (*par_)[1]/CLHEP::deg;
+  LogDebug("SimG4CoreGeometry") << "sp=" << (*par_)[0] / CLHEP::deg << " ep=" << (*par_)[1] / CLHEP::deg;
   /*
-    std::cout << "### Polycone_RRZ: " << "sp=" << (*par_)[0]/CLHEP::deg 
-	      << " ep=" << (*par_)[1]/CLHEP::deg 
-	      << " N= " << count << std::endl;
-    for(int i=0; i<count; ++i) { 
-      std::cout << " R1= " << rmin_p[i] << " R1= " << rmax_p[i] << " Z= " << z_p[i] << std::endl;
+    std::cout << "### Polycone_RRZ: " << "sp=" << (*par_)[0]/CLHEP::deg
+              << " ep=" << (*par_)[1]/CLHEP::deg
+              << " N= " << count << std::endl;
+    for(int i=0; i<count; ++i) {
+      std::cout << " R1= " << rmin_p[i] << " R1= " << rmax_p[i] << " Z= " <<
+    z_p[i] << std::endl;
     }
   */
-  return new G4Polycone(solid.name().name(), (*par_)[0], (*par_)[1], // start,delta-phi
-                        count, // sections
-			&(z_p[0]),
-			&(rmin_p[0]),
-			&(rmax_p[0]));
-  
+  return new G4Polycone(solid.name().name(),
+                        (*par_)[0],
+                        (*par_)[1],  // start,delta-phi
+                        count,       // sections
+                        &(z_p[0]),
+                        &(rmin_p[0]),
+                        &(rmax_p[0]));
 }
 
-
 #include "G4Polyhedra.hh"
-G4VSolid * DDG4SolidConverter::polyhedra_rz(const DDSolid & solid) {
-  LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: phed_rz = " << solid;  
+G4VSolid *DDG4SolidConverter::polyhedra_rz(const DDSolid &solid) {
+  LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: phed_rz = " << solid;
   std::vector<double> r;
   std::vector<double> z;
-  std::vector<double>::const_iterator i = par_->begin()+3;
-  int count=0;
-    
-  for(; i!=par_->end(); ++i) {
-    z.push_back(*i); ++i;
+  std::vector<double>::const_iterator i = par_->begin() + 3;
+  int count = 0;
+
+  for (; i != par_->end(); ++i) {
+    z.push_back(*i);
+    ++i;
     r.push_back(*i);
     count++;
   }
-      
-  return new G4Polyhedra(solid.name().name(), (*par_)[1], (*par_)[2], int((*par_)[0]),// start,delta-phi;sides
-			 count, // numRZ
-			 &(r[0]),
-			 &(z[0]));
-}
 
+  return new G4Polyhedra(solid.name().name(),
+                         (*par_)[1],
+                         (*par_)[2],
+                         int((*par_)[0]),  // start,delta-phi;sides
+                         count,            // numRZ
+                         &(r[0]),
+                         &(z[0]));
+}
 
-G4VSolid * DDG4SolidConverter::polyhedra_rrz(const DDSolid & solid) {
+G4VSolid *DDG4SolidConverter::polyhedra_rrz(const DDSolid &solid) {
   LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: phed_rrz = " << solid;
   std::vector<double> z_p;
   std::vector<double> rmin_p;
   std::vector<double> rmax_p;
-  std::vector<double>::const_iterator i = par_->begin()+3;
+  std::vector<double>::const_iterator i = par_->begin() + 3;
   int count = 0;
-  for (; i!=par_->end(); ++i) {
-    LogDebug("SimG4CoreGeometry") << "z=" << *i/CLHEP::cm;
-    z_p.push_back(*i); ++i;
-    LogDebug("SimG4CoreGeometry") << "rmin=" << *i/CLHEP::cm;
-    rmin_p.push_back(*i); ++i;
-    LogDebug("SimG4CoreGeometry") << "rmax=" << *i/CLHEP::cm;
-    rmax_p.push_back(*i); 
+  for (; i != par_->end(); ++i) {
+    LogDebug("SimG4CoreGeometry") << "z=" << *i / CLHEP::cm;
+    z_p.push_back(*i);
+    ++i;
+    LogDebug("SimG4CoreGeometry") << "rmin=" << *i / CLHEP::cm;
+    rmin_p.push_back(*i);
+    ++i;
+    LogDebug("SimG4CoreGeometry") << "rmax=" << *i / CLHEP::cm;
+    rmax_p.push_back(*i);
     count++;
   }
-  LogDebug("SimG4CoreGeometry") << "sp=" << (*par_)[0]/CLHEP::deg << " ep=" 
-				<< (*par_)[1]/CLHEP::deg;
-  return new G4Polyhedra(solid.name().name(), (*par_)[1], (*par_)[2], int((*par_)[0]), // start,delta-phi,sides
-			 count, // sections
-			 &(z_p[0]),
-			 &(rmin_p[0]),
-			 &(rmax_p[0]));  
+  LogDebug("SimG4CoreGeometry") << "sp=" << (*par_)[0] / CLHEP::deg << " ep=" << (*par_)[1] / CLHEP::deg;
+  return new G4Polyhedra(solid.name().name(),
+                         (*par_)[1],
+                         (*par_)[2],
+                         int((*par_)[0]),  // start,delta-phi,sides
+                         count,            // sections
+                         &(z_p[0]),
+                         &(rmin_p[0]),
+                         &(rmax_p[0]));
 }
 
 #include "G4ExtrudedSolid.hh"
-G4VSolid * DDG4SolidConverter::extrudedpolygon(const DDSolid & solid) {
+G4VSolid *DDG4SolidConverter::extrudedpolygon(const DDSolid &solid) {
   LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: extr_pgon = " << solid;
   std::vector<double> x = static_cast<DDExtrudedPolygon>(solid).xVec();
   std::vector<double> y = static_cast<DDExtrudedPolygon>(solid).yVec();
@@ -239,275 +249,258 @@ G4VSolid * DDG4SolidConverter::extrudedpolygon(const DDSolid & solid) {
 
   std::vector<G4TwoVector> polygon;
   std::vector<G4ExtrudedSolid::ZSection> zsections;
-  for( unsigned int it = 0; it < x.size(); ++it )
-    polygon.emplace_back( x[it], y[it] );
-  for( unsigned int it = 0; it < z.size(); ++it )
-    zsections.emplace_back( z[it], G4TwoVector(zx[it], zy[it]), zs[it] );
-  return new G4ExtrudedSolid( solid.name().name(), polygon, zsections );
+  for (unsigned int it = 0; it < x.size(); ++it)
+    polygon.emplace_back(x[it], y[it]);
+  for (unsigned int it = 0; it < z.size(); ++it)
+    zsections.emplace_back(z[it], G4TwoVector(zx[it], zy[it]), zs[it]);
+  return new G4ExtrudedSolid(solid.name().name(), polygon, zsections);
 }
 
 #include "G4Torus.hh"
-G4VSolid * DDG4SolidConverter::torus(const DDSolid & solid) {
-  LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: torus = " << solid; 
-  return new G4Torus(solid.name().name(), (*par_)[0], // rmin
-		     (*par_)[1], // rmax
-		     (*par_)[2], // Rtor
-		     (*par_)[3], // phiStart
-		     (*par_)[4]);// deltaPhi
+G4VSolid *DDG4SolidConverter::torus(const DDSolid &solid) {
+  LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: torus = " << solid;
+  return new G4Torus(solid.name().name(),
+                     (*par_)[0],   // rmin
+                     (*par_)[1],   // rmax
+                     (*par_)[2],   // Rtor
+                     (*par_)[3],   // phiStart
+                     (*par_)[4]);  // deltaPhi
 }
 
 #include "G4UnionSolid.hh"
-G4VSolid * DDG4SolidConverter::unionsolid(const DDSolid & solid) {
+G4VSolid *DDG4SolidConverter::unionsolid(const DDSolid &solid) {
   LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: unionsolid = " << solid.name();
-  G4UnionSolid * us = nullptr;
+  G4UnionSolid *us = nullptr;
   DDBooleanSolid bs(solid);
   if (bs) {
     LogDebug("SimG4CoreGeometry") << "SolidA=" << bs.solidA();
-    G4VSolid * sa = DDG4SolidConverter().convert(bs.solidA());
+    G4VSolid *sa = DDG4SolidConverter().convert(bs.solidA());
     LogDebug("SimG4CoreGeometry") << "SolidB=" << bs.solidB();
-    G4VSolid * sb = DDG4SolidConverter().convert(bs.solidB());
+    G4VSolid *sb = DDG4SolidConverter().convert(bs.solidB());
     LogDebug("SimG4CoreGeometry") << " name:" << solid.name() << " t=" << bs.translation() << std::flush;
     LogDebug("SimG4CoreGeometry") << " " << bs.rotation().rotation().Inverse() << std::flush;
     std::vector<double> tdbl(9);
     bs.rotation().rotation().Inverse().GetComponents(tdbl.begin(), tdbl.end());
     CLHEP::HepRep3x3 temprep(tdbl[0], tdbl[1], tdbl[2], tdbl[3], tdbl[4], tdbl[5], tdbl[6], tdbl[7], tdbl[8]);
-    CLHEP::Hep3Vector temphvec(bs.translation().X(), bs.translation().Y(), bs.translation().Z()); 
-    us = new G4UnionSolid(solid.name().name(),
-			  sa,
-			  sb,
-			  new CLHEP::HepRotation(temprep),
-			  temphvec);
-    
-  } // else?
-  return us;	   
+    CLHEP::Hep3Vector temphvec(bs.translation().X(), bs.translation().Y(), bs.translation().Z());
+    us = new G4UnionSolid(solid.name().name(), sa, sb, new CLHEP::HepRotation(temprep), temphvec);
+
+  }  // else?
+  return us;
 }
 
 #include "G4SubtractionSolid.hh"
 #include <sstream>
-G4VSolid * DDG4SolidConverter::subtraction(const DDSolid & solid) {
+G4VSolid *DDG4SolidConverter::subtraction(const DDSolid &solid) {
   LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: subtraction = " << solid;
-  G4SubtractionSolid * us = nullptr;
+  G4SubtractionSolid *us = nullptr;
   DDBooleanSolid bs(solid);
   if (bs) {
-    G4VSolid * sa = DDG4SolidConverter().convert(bs.solidA());
-    G4VSolid * sb = DDG4SolidConverter().convert(bs.solidB());
+    G4VSolid *sa = DDG4SolidConverter().convert(bs.solidA());
+    G4VSolid *sb = DDG4SolidConverter().convert(bs.solidB());
     LogDebug("SimG4CoreGeometry") << " name:" << solid.name() << " t=" << bs.translation() << std::flush;
     LogDebug("SimG4CoreGeometry") << " " << bs.rotation().rotation().Inverse() << std::flush;
     std::vector<double> tdbl(9);
     bs.rotation().rotation().Inverse().GetComponents(tdbl.begin(), tdbl.end());
     CLHEP::HepRep3x3 temprep(tdbl[0], tdbl[1], tdbl[2], tdbl[3], tdbl[4], tdbl[5], tdbl[6], tdbl[7], tdbl[8]);
-    CLHEP::Hep3Vector temphvec(bs.translation().X(), bs.translation().Y(), bs.translation().Z()); 
-    us = new G4SubtractionSolid(solid.name().name(),
-				sa,
-				sb,
-				new CLHEP::HepRotation(temprep),
-				temphvec);
+    CLHEP::Hep3Vector temphvec(bs.translation().X(), bs.translation().Y(), bs.translation().Z());
+    us = new G4SubtractionSolid(solid.name().name(), sa, sb, new CLHEP::HepRotation(temprep), temphvec);
   }
-  return us;	   
+  return us;
 }
 
 #include "G4IntersectionSolid.hh"
-G4VSolid * DDG4SolidConverter::intersection(const DDSolid & solid) {
+G4VSolid *DDG4SolidConverter::intersection(const DDSolid &solid) {
   LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: intersection = " << solid;
-  G4IntersectionSolid * us = nullptr;
+  G4IntersectionSolid *us = nullptr;
   DDBooleanSolid bs(solid);
   if (bs) {
-    G4VSolid * sa = DDG4SolidConverter().convert(bs.solidA());
-    G4VSolid * sb = DDG4SolidConverter().convert(bs.solidB());
+    G4VSolid *sa = DDG4SolidConverter().convert(bs.solidA());
+    G4VSolid *sb = DDG4SolidConverter().convert(bs.solidB());
     LogDebug("SimG4CoreGeometry") << " name:" << solid.name() << " t=" << bs.translation() << std::flush;
     LogDebug("SimG4CoreGeometry") << " " << bs.rotation().rotation().Inverse() << std::flush;
     std::vector<double> tdbl(9);
     bs.rotation().rotation().Inverse().GetComponents(tdbl.begin(), tdbl.end());
     CLHEP::HepRep3x3 temprep(tdbl[0], tdbl[1], tdbl[2], tdbl[3], tdbl[4], tdbl[5], tdbl[6], tdbl[7], tdbl[8]);
-    CLHEP::Hep3Vector temphvec(bs.translation().X(), bs.translation().Y(), bs.translation().Z()); 
-    us = new G4IntersectionSolid(solid.name().name(),
-				 sa,
-				 sb,
-				 new CLHEP::HepRotation(temprep),
-				 temphvec);
+    CLHEP::Hep3Vector temphvec(bs.translation().X(), bs.translation().Y(), bs.translation().Z());
+    us = new G4IntersectionSolid(solid.name().name(), sa, sb, new CLHEP::HepRotation(temprep), temphvec);
   }
-  return us;	   
+  return us;
 }
 
 #include "G4Trd.hh"
-G4VSolid * DDG4SolidConverter::pseudotrap(const DDSolid & solid) {
-  if(nullptr == rot) {
+G4VSolid *DDG4SolidConverter::pseudotrap(const DDSolid &solid) {
+  if (nullptr == rot) {
     rot = new G4RotationMatrix;
-    rot->rotateX(90.*deg);
-  }    
+    rot->rotateX(90. * deg);
+  }
 
   LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: pseudoTrap = " << solid;
-  G4Trd * trap = nullptr;
-  G4Tubs * tubs = nullptr;
-  G4VSolid * result = nullptr;
-  DDPseudoTrap pt(solid); // pt...PseudoTrap
+  G4Trd *trap = nullptr;
+  G4Tubs *tubs = nullptr;
+  G4VSolid *result = nullptr;
+  DDPseudoTrap pt(solid);  // pt...PseudoTrap
   double r = pt.radius();
   bool atMinusZ = pt.atMinusZ();
   double x = 0;
   double h = 0;
-  bool intersec = false; // union or intersection solid
+  bool intersec = false;  // union or intersection solid
   if (pt.atMinusZ()) {
-    x = pt.x1(); // tubs radius
-  } 
-  else {
-    x = pt.x2(); // tubs radius
+    x = pt.x1();  // tubs radius
+  } else {
+    x = pt.x2();  // tubs radius
   }
-  double openingAngle = 2.*asin(x/std::abs(r));
-  //trap = new G4Trd(solid.name().name(), 
-  double displacement=0;
-  double startPhi=0;
+  double openingAngle = 2. * asin(x / std::abs(r));
+  // trap = new G4Trd(solid.name().name(),
+  double displacement = 0;
+  double startPhi = 0;
   /* calculate the displacement of the tubs w.r.t. to the trap,
      determine the opening angle of the tubs */
-  double delta = sqrt(r*r-x*x);
+  double delta = sqrt(r * r - x * x);
   if (r < 0 && std::abs(r) >= x) {
-    intersec = true; // intersection solid
-    h = pt.y1() < pt.y2() ? pt.y2() : pt.y1(); // tubs half height
-    h += h/20.; // enlarge a bit - for subtraction solid
+    intersec = true;                            // intersection solid
+    h = pt.y1() < pt.y2() ? pt.y2() : pt.y1();  // tubs half height
+    h += h / 20.;                               // enlarge a bit - for subtraction solid
     if (atMinusZ) {
-      displacement = - pt.halfZ() - delta; 
-      startPhi = 270.*deg - openingAngle/2.;
-    }
-    else {
-      displacement =   pt.halfZ() + delta;
-      startPhi = 90.*deg - openingAngle/2.;
+      displacement = -pt.halfZ() - delta;
+      startPhi = 270. * deg - openingAngle / 2.;
+    } else {
+      displacement = pt.halfZ() + delta;
+      startPhi = 90. * deg - openingAngle / 2.;
     }
-  }
-  else if ( r > 0 && std::abs(r) >= x )
-    {
-      if (atMinusZ) {
-        displacement = - pt.halfZ() + delta;
-	startPhi = 90.*deg - openingAngle/2.;
-	h = pt.y1();
-      }
-      else {
-        displacement =   pt.halfZ() - delta; 
-	startPhi = 270.*deg - openingAngle/2.;
-	h = pt.y2();
-      }    
+  } else if (r > 0 && std::abs(r) >= x) {
+    if (atMinusZ) {
+      displacement = -pt.halfZ() + delta;
+      startPhi = 90. * deg - openingAngle / 2.;
+      h = pt.y1();
+    } else {
+      displacement = pt.halfZ() - delta;
+      startPhi = 270. * deg - openingAngle / 2.;
+      h = pt.y2();
     }
-  else {
+  } else {
     throw cms::Exception("DetectorDescriptionFault", "Check parameters of the PseudoTrap! name=" + pt.name().name());
-   }
-  G4ThreeVector displ(0.,0.,displacement); // displacement of the tubs w.r.t. trap
-  LogDebug("SimG4CoreGeometry") << "DDSolidConverter::pseudotrap(): displacement=" << displacement 
-				<< " openingAngle=" << openingAngle/deg << " x=" << x << " h=" << h;
-    
-  // Now create two solids (trd & tubs), and a boolean solid out of them 
-  std::string name=pt.name().name();
+  }
+  G4ThreeVector displ(0., 0.,
+                      displacement);  // displacement of the tubs w.r.t. trap
+  LogDebug("SimG4CoreGeometry") << "DDSolidConverter::pseudotrap(): displacement=" << displacement
+                                << " openingAngle=" << openingAngle / deg << " x=" << x << " h=" << h;
+
+  // Now create two solids (trd & tubs), and a boolean solid out of them
+  std::string name = pt.name().name();
   trap = new G4Trd(name, pt.x1(), pt.x2(), pt.y1(), pt.y2(), pt.halfZ());
-  tubs = new G4Tubs(name, 
-		    0., // rMin
-		    std::abs(r), // rMax
-		    h, // half height
-		    startPhi, // start angle
-		    openingAngle);
+  tubs = new G4Tubs(name,
+                    0.,           // rMin
+                    std::abs(r),  // rMax
+                    h,            // half height
+                    startPhi,     // start angle
+                    openingAngle);
   if (intersec) {
     result = new G4SubtractionSolid(name, trap, tubs, rot, displ);
-  }
-  else {
-    G4VSolid * tubicCap = new G4SubtractionSolid(name, 
-						 tubs, 
-						 new G4Box(name, 1.1*x, sqrt(r*r-x*x), 1.1*h),  
-						 nullptr, 
-						 G4ThreeVector());
+  } else {
+    G4VSolid *tubicCap = new G4SubtractionSolid(
+        name, tubs, new G4Box(name, 1.1 * x, sqrt(r * r - x * x), 1.1 * h), nullptr, G4ThreeVector());
     result = new G4UnionSolid(name, trap, tubicCap, rot, displ);
-  }			 	   
+  }
   return result;
 }
 
-G4VSolid * DDG4SolidConverter::trunctubs(const DDSolid & solid) {
+G4VSolid *DDG4SolidConverter::trunctubs(const DDSolid &solid) {
   // truncated tube-section: a boolean subtraction solid:
-  //                         from a tube-section a box is subtracted according to the  
-  //                         given parameters
-  LogDebug("SimG4CoreGeometry") << "MantisConverter: solidshape=" << DDSolidShapesName::name(solid.shape()) << " " << solid;
+  //                         from a tube-section a box is subtracted according
+  //                         to the given parameters
+  LogDebug("SimG4CoreGeometry") << "MantisConverter: solidshape=" << DDSolidShapesName::name(solid.shape()) << " "
+                                << solid;
   LogDebug("SimG4CoreGeometry") << "before";
   DDTruncTubs tt(solid);
   LogDebug("SimG4CoreGeometry") << "after";
-  double rIn(tt.rIn()), rOut(tt.rOut()), zHalf(tt.zHalf()),
-    startPhi(tt.startPhi()), deltaPhi(tt.deltaPhi()), 
-    cutAtStart(tt.cutAtStart()), cutAtDelta(tt.cutAtDelta());
+  double rIn(tt.rIn()), rOut(tt.rOut()), zHalf(tt.zHalf()), startPhi(tt.startPhi()), deltaPhi(tt.deltaPhi()),
+      cutAtStart(tt.cutAtStart()), cutAtDelta(tt.cutAtDelta());
   bool cutInside(bool(tt.cutInside()));
-  std::string name=tt.name().name();
+  std::string name = tt.name().name();
 
   // check the parameters
-  if (rIn <= 0 || rOut <=0 || cutAtStart <=0 || cutAtDelta <= 0) {
-    throw cms::Exception("DetectorDescriptionFault", "TruncTubs " + std::string(tt.name().fullname()) + ": 0 <= rIn,cutAtStart,rOut,cutAtDelta,rOut violated!");
+  if (rIn <= 0 || rOut <= 0 || cutAtStart <= 0 || cutAtDelta <= 0) {
+    throw cms::Exception(
+        "DetectorDescriptionFault",
+        "TruncTubs " + std::string(tt.name().fullname()) + ": 0 <= rIn,cutAtStart,rOut,cutAtDelta,rOut violated!");
   }
   if (rIn >= rOut) {
-    throw cms::Exception("DetectorDescriptionFault", "TruncTubs " + std::string(tt.name().fullname()) + ": rIn<rOut violated!");
+    throw cms::Exception("DetectorDescriptionFault",
+                         "TruncTubs " + std::string(tt.name().fullname()) + ": rIn<rOut violated!");
   }
   if (startPhi != 0.) {
-    throw cms::Exception("DetectorDescriptionFault", "TruncTubs " + std::string(tt.name().fullname()) + ": startPhi != 0 not supported!");
+    throw cms::Exception("DetectorDescriptionFault",
+                         "TruncTubs " + std::string(tt.name().fullname()) + ": startPhi != 0 not supported!");
   }
-  
-  startPhi=0.;
+
+  startPhi = 0.;
   double r(cutAtStart), R(cutAtDelta);
-  G4VSolid * result(nullptr);
-  G4VSolid * tubs = new G4Tubs(name,rIn,rOut,zHalf,startPhi,deltaPhi);
-  LogDebug("SimG4CoreGeometry") << "G4Tubs: " << rIn/CLHEP::cm << ' ' << rOut/CLHEP::cm << ' ' << zHalf/CLHEP::cm << ' ' << startPhi/CLHEP::deg << ' ' << deltaPhi/CLHEP::deg;
+  G4VSolid *result(nullptr);
+  G4VSolid *tubs = new G4Tubs(name, rIn, rOut, zHalf, startPhi, deltaPhi);
+  LogDebug("SimG4CoreGeometry") << "G4Tubs: " << rIn / CLHEP::cm << ' ' << rOut / CLHEP::cm << ' ' << zHalf / CLHEP::cm
+                                << ' ' << startPhi / CLHEP::deg << ' ' << deltaPhi / CLHEP::deg;
   LogDebug("SimG4CoreGeometry") << solid;
-  // length & hight of the box 
-  double boxX(30.*rOut), boxY(20.*rOut); // exaggerate dimensions - does not matter, it's subtracted!
-   
+  // length & hight of the box
+  double boxX(30. * rOut),
+      boxY(20. * rOut);  // exaggerate dimensions - does not matter, it's subtracted!
+
   // width of the box > width of the tubs
-  double boxZ(1.1*zHalf);
-   
+  double boxZ(1.1 * zHalf);
+
   // angle of the box w.r.t. tubs
-  double cath = r-R*cos(deltaPhi);
-  double hypo = sqrt(r*r+R*R-2.*r*R*cos(deltaPhi));
-  double cos_alpha = cath/hypo;
+  double cath = r - R * cos(deltaPhi);
+  double hypo = sqrt(r * r + R * R - 2. * r * R * cos(deltaPhi));
+  double cos_alpha = cath / hypo;
 
   double alpha = -acos(cos_alpha);
-  LogDebug("SimG4CoreGeometry") << "cath=" << cath/CLHEP::cm;
-  LogDebug("SimG4CoreGeometry") << "hypo=" << hypo/CLHEP::cm;
-  LogDebug("SimG4CoreGeometry") << "al=" << acos(cath/hypo)/CLHEP::deg;
-  LogDebug("SimG4CoreGeometry") << "deltaPhi=" << deltaPhi/CLHEP::deg << "\n"
-				<< "r=" << r/CLHEP::cm << "\n"
-				<<  "R=" << R/CLHEP::cm;
-
-  LogDebug("SimG4CoreGeometry") << "alpha=" << alpha/CLHEP::deg;
-    
+  LogDebug("SimG4CoreGeometry") << "cath=" << cath / CLHEP::cm;
+  LogDebug("SimG4CoreGeometry") << "hypo=" << hypo / CLHEP::cm;
+  LogDebug("SimG4CoreGeometry") << "al=" << acos(cath / hypo) / CLHEP::deg;
+  LogDebug("SimG4CoreGeometry") << "deltaPhi=" << deltaPhi / CLHEP::deg << "\n"
+                                << "r=" << r / CLHEP::cm << "\n"
+                                << "R=" << R / CLHEP::cm;
+
+  LogDebug("SimG4CoreGeometry") << "alpha=" << alpha / CLHEP::deg;
+
   // rotationmatrix of box w.r.t. tubs
-  G4RotationMatrix * rot = new G4RotationMatrix;
+  G4RotationMatrix *rot = new G4RotationMatrix;
   rot->rotateZ(-alpha);
   LogDebug("SimG4CoreGeometry") << (*rot);
 
   // center point of the box
   double xBox;
   if (!cutInside) {
-    xBox = r+boxY/sin(std::abs(alpha));
+    xBox = r + boxY / sin(std::abs(alpha));
   } else {
-    xBox = -(boxY/sin(std::abs(alpha))-r);
+    xBox = -(boxY / sin(std::abs(alpha)) - r);
   }
 
-  G4ThreeVector trans(xBox,0.,0.);
+  G4ThreeVector trans(xBox, 0., 0.);
   LogDebug("SimG4CoreGeometry") << "trans=" << trans;
 
-  G4VSolid * box = new G4Box(name,boxX,boxY,boxZ);
-  result = new G4SubtractionSolid(name,tubs,box,rot,trans);
-      
-  return result;
+  G4VSolid *box = new G4Box(name, boxX, boxY, boxZ);
+  result = new G4SubtractionSolid(name, tubs, box, rot, trans);
 
+  return result;
 }
 
 #include "G4Sphere.hh"
-G4VSolid * DDG4SolidConverter::sphere(const DDSolid & solid) {
+G4VSolid *DDG4SolidConverter::sphere(const DDSolid &solid) {
   LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: sphere = " << solid;
   DDSphere sp(solid);
-  return new G4Sphere(solid.name().name(), sp.innerRadius(),
-		      sp.outerRadius(),
-		      sp.startPhi(),
-		      sp.deltaPhi(),
-		      sp.startTheta(),
-		      sp.deltaTheta());
+  return new G4Sphere(solid.name().name(),
+                      sp.innerRadius(),
+                      sp.outerRadius(),
+                      sp.startPhi(),
+                      sp.deltaPhi(),
+                      sp.startTheta(),
+                      sp.deltaTheta());
 }
 
 #include "G4EllipticalTube.hh"
-G4VSolid * DDG4SolidConverter::ellipticaltube(const DDSolid & solid) {
+G4VSolid *DDG4SolidConverter::ellipticaltube(const DDSolid &solid) {
   LogDebug("SimG4CoreGeometry") << "DDG4SolidConverter: ellipticaltube = " << solid;
   DDEllipticalTube sp(solid);
-  return new G4EllipticalTube(solid.name().name(),
-			      sp.xSemiAxis(),
-			      sp.ySemiAxis(),
-			      sp.zHeight());
+  return new G4EllipticalTube(solid.name().name(), sp.xSemiAxis(), sp.ySemiAxis(), sp.zHeight());
 }
diff --git a/SimG4Core/Geometry/src/DDGeometryReturnType.cc b/SimG4Core/Geometry/src/DDGeometryReturnType.cc
index fd20ac5543c93..0406048f97548 100644
--- a/SimG4Core/Geometry/src/DDGeometryReturnType.cc
+++ b/SimG4Core/Geometry/src/DDGeometryReturnType.cc
@@ -1,8 +1,8 @@
 #include "SimG4Core/Geometry/interface/DDGeometryReturnType.h"
 
-DDGeometryReturnType::DDGeometryReturnType(G4LogicalVolume* log,
-					   const G4LogicalVolumeToDDLogicalPartMap& map,
-					   const SensitiveDetectorCatalog& catalog) :
-  log_(log), map_(map), catalog_(catalog) {}
+DDGeometryReturnType::DDGeometryReturnType(G4LogicalVolume *log,
+                                           const G4LogicalVolumeToDDLogicalPartMap &map,
+                                           const SensitiveDetectorCatalog &catalog)
+    : log_(log), map_(map), catalog_(catalog) {}
 
-DDGeometryReturnType:: ~DDGeometryReturnType() {}
+DDGeometryReturnType::~DDGeometryReturnType() {}
diff --git a/SimG4Core/Geometry/src/G4CheckOverlap.cc b/SimG4Core/Geometry/src/G4CheckOverlap.cc
index 5ca18037e506e..fa61bb486295d 100644
--- a/SimG4Core/Geometry/src/G4CheckOverlap.cc
+++ b/SimG4Core/Geometry/src/G4CheckOverlap.cc
@@ -2,27 +2,24 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "G4RegionStore.hh"
-#include "G4Region.hh"
+#include "G4GDMLParser.hh"
+#include "G4GeomTestVolume.hh"
+#include "G4LogicalVolume.hh"
 #include "G4LogicalVolumeStore.hh"
 #include "G4PhysicalVolumeStore.hh"
+#include "G4Region.hh"
+#include "G4RegionStore.hh"
+#include "G4SystemOfUnits.hh"
 #include "G4VPhysicalVolume.hh"
-#include "G4LogicalVolume.hh"
-#include "G4GeomTestVolume.hh"
 #include "globals.hh"
-#include "G4SystemOfUnits.hh"
-#include "G4GDMLParser.hh"
 
 #include <string>
 
 G4CheckOverlap::G4CheckOverlap(const edm::ParameterSet &p) {
-
-  std::vector<std::string> nodeNames 
-    = p.getParameter<std::vector<std::string> >("NodeNames");
+  std::vector<std::string> nodeNames = p.getParameter<std::vector<std::string>>("NodeNames");
   std::string PVname = p.getParameter<std::string>("PVname");
   std::string LVname = p.getParameter<std::string>("LVname");
-  double tolerance 
-    = p.getUntrackedParameter<double>("Tolerance", 0.0)*CLHEP::mm;
+  double tolerance = p.getUntrackedParameter<double>("Tolerance", 0.0) * CLHEP::mm;
   int nPoints = p.getUntrackedParameter<int>("Resolution", 10000);
   bool verbose = p.getUntrackedParameter<bool>("Verbose", true);
   bool regionFlag = p.getUntrackedParameter<bool>("RegionFlag", true);
@@ -31,131 +28,121 @@ G4CheckOverlap::G4CheckOverlap(const edm::ParameterSet &p) {
   int level = p.getUntrackedParameter<int>("Level", 0);
   int depth = p.getUntrackedParameter<int>("Depth", -1);
 
-  const G4RegionStore* regStore =  G4RegionStore::GetInstance();
+  const G4RegionStore *regStore = G4RegionStore::GetInstance();
 
-  G4LogicalVolume* lv;
-  const G4PhysicalVolumeStore * pvs = G4PhysicalVolumeStore::GetInstance();
-  const G4LogicalVolumeStore * lvs = G4LogicalVolumeStore::GetInstance();
+  G4LogicalVolume *lv;
+  const G4PhysicalVolumeStore *pvs = G4PhysicalVolumeStore::GetInstance();
+  const G4LogicalVolumeStore *lvs = G4LogicalVolumeStore::GetInstance();
   unsigned int numPV = pvs->size();
   unsigned int numLV = lvs->size();
   unsigned int nn = nodeNames.size();
 
   std::vector<G4String> savedgdml;
 
-  G4cout << "G4OverlapCheck is initialised with " 
-	 << nodeNames.size() << " nodes; " << " nPoints= " << nPoints
-	 << "; tolerance= " << tolerance/mm << " mm; verbose: " 
-	 << verbose << "\n"
-	 << "               RegionFlag: " << regionFlag
-	 << "  PVname: " << PVname << "  LVname: " << LVname << "\n"
-	 << "               Nlv= " << numLV << "   Npv= " << numPV << G4endl;
+  G4cout << "G4OverlapCheck is initialised with " << nodeNames.size() << " nodes; "
+         << " nPoints= " << nPoints << "; tolerance= " << tolerance / mm << " mm; verbose: " << verbose << "\n"
+         << "               RegionFlag: " << regionFlag << "  PVname: " << PVname << "  LVname: " << LVname << "\n"
+         << "               Nlv= " << numLV << "   Npv= " << numPV << G4endl;
 
-  if(0 < nn) { 
-    for (unsigned int ii=0; ii<nn; ++ii) {
-      if("" == nodeNames[ii] || "world" == nodeNames[ii] || "World" == nodeNames[ii] ) { 
-	nodeNames[ii] = "DDDWorld"; 
-	G4cout << "### Check overlaps for DDDWorld " << G4endl; 
-	G4VPhysicalVolume* pv = pvs->GetVolume("DDDWorld");
-	G4GeomTestVolume test(pv, tolerance, nPoints, verbose);
-	test.SetErrorsThreshold(nPrints);
-	test.TestRecursiveOverlap(level, depth);
-      } else if(regionFlag) {
+  if (0 < nn) {
+    for (unsigned int ii = 0; ii < nn; ++ii) {
+      if (nodeNames[ii].empty() || "world" == nodeNames[ii] || "World" == nodeNames[ii]) {
+        nodeNames[ii] = "DDDWorld";
+        G4cout << "### Check overlaps for DDDWorld " << G4endl;
+        G4VPhysicalVolume *pv = pvs->GetVolume("DDDWorld");
+        G4GeomTestVolume test(pv, tolerance, nPoints, verbose);
+        test.SetErrorsThreshold(nPrints);
+        test.TestRecursiveOverlap(level, depth);
+      } else if (regionFlag) {
         G4cout << "---------------------------------------------------------------" << G4endl;
-	G4cout << "### Check overlaps for G4Region Node[" << ii << "] : " << nodeNames[ii] 
-	       << G4endl; 
-        G4Region* reg = regStore->GetRegion((G4String)nodeNames[ii]);
-        if(!reg) {
-	  G4cout << "### NO G4Region found - EXIT" << G4endl;
-          return; 
-	}
-	std::vector<G4LogicalVolume*>::iterator rootLVItr
-	  = reg->GetRootLogicalVolumeIterator();
-	unsigned int numRootLV = reg->GetNumberOfRootVolumes();
-	G4cout << "      " << numRootLV << " Root Logical Volumes in this region" << G4endl; 
+        G4cout << "### Check overlaps for G4Region Node[" << ii << "] : " << nodeNames[ii] << G4endl;
+        G4Region *reg = regStore->GetRegion((G4String)nodeNames[ii]);
+        if (!reg) {
+          G4cout << "### NO G4Region found - EXIT" << G4endl;
+          return;
+        }
+        std::vector<G4LogicalVolume *>::iterator rootLVItr = reg->GetRootLogicalVolumeIterator();
+        unsigned int numRootLV = reg->GetNumberOfRootVolumes();
+        G4cout << "      " << numRootLV << " Root Logical Volumes in this region" << G4endl;
 
-	for(unsigned int iLV=0; iLV < numRootLV; ++iLV, ++rootLVItr ) {
-	  // Cover each root logical volume in this region
-	  lv = *rootLVItr;
-	  G4cout << "### Check overlaps for G4LogicalVolume " << lv->GetName() << G4endl; 
-          for(unsigned int i=0; i<numPV; ++i) {
-            if(((*pvs)[i])->GetLogicalVolume() == lv) {
+        for (unsigned int iLV = 0; iLV < numRootLV; ++iLV, ++rootLVItr) {
+          // Cover each root logical volume in this region
+          lv = *rootLVItr;
+          G4cout << "### Check overlaps for G4LogicalVolume " << lv->GetName() << G4endl;
+          for (unsigned int i = 0; i < numPV; ++i) {
+            if (((*pvs)[i])->GetLogicalVolume() == lv) {
               G4String pvname = ((*pvs)[i])->GetName();
               G4bool isNew = true;
-              for(unsigned int k=0; k<savedgdml.size(); ++k) {
-		if(pvname == savedgdml[k]) {
-		  isNew = false;
-		  break;
-		}
-	      }
-              if(!isNew) { 
-		G4cout << "### Check overlaps for PhysVolume  " << pvname
-		       << " is skipted because was already done" << G4endl;
-		continue; 
-	      }
+              for (unsigned int k = 0; k < savedgdml.size(); ++k) {
+                if (pvname == savedgdml[k]) {
+                  isNew = false;
+                  break;
+                }
+              }
+              if (!isNew) {
+                G4cout << "### Check overlaps for PhysVolume  " << pvname << " is skipted because was already done"
+                       << G4endl;
+                continue;
+              }
               savedgdml.push_back(pvname);
-	      G4cout << "### Check overlaps for PhysVolume  " << pvname
-		     << G4endl;
-	      // gdml dump only for 1 volume
-              if(gdmlFlag) {
-		G4GDMLParser gdml;
-		gdml.Write(pvname+".gdml", (*pvs)[i], true);
-	      }
-	      G4GeomTestVolume test(((*pvs)[i]), tolerance, nPoints, verbose);
-	      test.SetErrorsThreshold(nPrints);
-	      test.TestRecursiveOverlap(level, depth);
-	    }
-	  }
-	}
+              G4cout << "### Check overlaps for PhysVolume  " << pvname << G4endl;
+              // gdml dump only for 1 volume
+              if (gdmlFlag) {
+                G4GDMLParser gdml;
+                gdml.Write(pvname + ".gdml", (*pvs)[i], true);
+              }
+              G4GeomTestVolume test(((*pvs)[i]), tolerance, nPoints, verbose);
+              test.SetErrorsThreshold(nPrints);
+              test.TestRecursiveOverlap(level, depth);
+            }
+          }
+        }
 
       } else {
-	G4cout << "### Check overlaps for PhysVolume Node[" << ii << "] : " << nodeNames[ii] 
-	       << G4endl; 
-	G4VPhysicalVolume* pv = pvs->GetVolume((G4String)nodeNames[ii]);
-	G4GeomTestVolume test(pv, tolerance, nPoints, verbose);
-	test.SetErrorsThreshold(nPrints);
-	test.TestRecursiveOverlap(level, depth);
+        G4cout << "### Check overlaps for PhysVolume Node[" << ii << "] : " << nodeNames[ii] << G4endl;
+        G4VPhysicalVolume *pv = pvs->GetVolume((G4String)nodeNames[ii]);
+        G4GeomTestVolume test(pv, tolerance, nPoints, verbose);
+        test.SetErrorsThreshold(nPrints);
+        test.TestRecursiveOverlap(level, depth);
       }
     }
   }
-  if("" != PVname) {
+  if (!PVname.empty()) {
     G4cout << "----------- List of PhysVolumes by name -----------------" << G4endl;
-    for (unsigned int i=0; i<numPV; ++i) {
-      if(PVname == ((*pvs)[i])->GetName()) {
-	G4cout << " ##### PhysVolume " << PVname << " [" << ((*pvs)[i])->GetCopyNo() 
-	       << "]  LV: " <<  ((*pvs)[i])->GetLogicalVolume()->GetName() 
-	       << " Mother LV: " <<  ((*pvs)[i])->GetMotherLogical()->GetName()
-	       << " Region: " << ((*pvs)[i])->GetLogicalVolume()->GetRegion()->GetName() 
-	       << G4endl;
-	G4cout << "       Translation: " << ((*pvs)[i])->GetObjectTranslation() << G4endl;
-	G4cout << "       Rotation:    " << ((*pvs)[i])->GetObjectRotationValue() << G4endl;
-	if(gdmlFlag) {
-	  G4GDMLParser gdml;
-	  gdml.Write(PVname+".gdml", (*pvs)[i], true);
-	}
+    for (unsigned int i = 0; i < numPV; ++i) {
+      if (PVname == ((*pvs)[i])->GetName()) {
+        G4cout << " ##### PhysVolume " << PVname << " [" << ((*pvs)[i])->GetCopyNo()
+               << "]  LV: " << ((*pvs)[i])->GetLogicalVolume()->GetName()
+               << " Mother LV: " << ((*pvs)[i])->GetMotherLogical()->GetName()
+               << " Region: " << ((*pvs)[i])->GetLogicalVolume()->GetRegion()->GetName() << G4endl;
+        G4cout << "       Translation: " << ((*pvs)[i])->GetObjectTranslation() << G4endl;
+        G4cout << "       Rotation:    " << ((*pvs)[i])->GetObjectRotationValue() << G4endl;
+        if (gdmlFlag) {
+          G4GDMLParser gdml;
+          gdml.Write(PVname + ".gdml", (*pvs)[i], true);
+        }
       }
     }
   }
-  if("" != LVname) {
+  if (!LVname.empty()) {
     G4cout << "---------- List of Logical Volumes by name ------------------" << G4endl;
-    for (unsigned int i=0; i<numLV; ++i) {
-      if(LVname == ((*lvs)[i])->GetName()) {
-	G4int np = ((*lvs)[i])->GetNoDaughters();
-	G4cout << " ##### LogVolume " << LVname << "  " << np << " daughters" 
-	       << " Region: " << ((*lvs)[i])->GetRegion()->GetName() 
-	       << G4endl;
-	G4cout << *(((*lvs)[i])->GetSolid()) << G4endl;
-	for (G4int j=0; j<np; ++j) {
-	  G4VPhysicalVolume* pv = ((*lvs)[i])->GetDaughter(j);
-	  if(pv) {
-	    G4cout << "   PV: " << pv->GetName() << " [" << pv->GetCopyNo() << "]"
-		   << " type: " << pv->VolumeType() << "  multiplicity: " 
-		   << pv->GetMultiplicity() << " LV: " 
-		   << pv->GetLogicalVolume()->GetName() << G4endl;
-	    G4cout << "       Translation: " << pv->GetObjectTranslation() << G4endl;
-	    G4cout << "       Rotation:    " << pv->GetObjectRotationValue() << G4endl;
+    for (unsigned int i = 0; i < numLV; ++i) {
+      if (LVname == ((*lvs)[i])->GetName()) {
+        G4int np = ((*lvs)[i])->GetNoDaughters();
+        G4cout << " ##### LogVolume " << LVname << "  " << np << " daughters"
+               << " Region: " << ((*lvs)[i])->GetRegion()->GetName() << G4endl;
+        G4cout << *(((*lvs)[i])->GetSolid()) << G4endl;
+        for (G4int j = 0; j < np; ++j) {
+          G4VPhysicalVolume *pv = ((*lvs)[i])->GetDaughter(j);
+          if (pv) {
+            G4cout << "   PV: " << pv->GetName() << " [" << pv->GetCopyNo() << "]"
+                   << " type: " << pv->VolumeType() << "  multiplicity: " << pv->GetMultiplicity()
+                   << " LV: " << pv->GetLogicalVolume()->GetName() << G4endl;
+            G4cout << "       Translation: " << pv->GetObjectTranslation() << G4endl;
+            G4cout << "       Rotation:    " << pv->GetObjectRotationValue() << G4endl;
             G4cout << *(pv->GetLogicalVolume()->GetSolid()) << G4endl;
-	  }
-	}
+          }
+        }
       }
     }
   }
@@ -163,4 +150,3 @@ G4CheckOverlap::G4CheckOverlap(const edm::ParameterSet &p) {
 }
 
 G4CheckOverlap::~G4CheckOverlap() {}
-  
diff --git a/SimG4Core/Geometry/src/SensitiveDetectorCatalog.cc b/SimG4Core/Geometry/src/SensitiveDetectorCatalog.cc
index 0172eb5666f7b..3f20772ba146b 100644
--- a/SimG4Core/Geometry/src/SensitiveDetectorCatalog.cc
+++ b/SimG4Core/Geometry/src/SensitiveDetectorCatalog.cc
@@ -1,67 +1,59 @@
-#include "SimG4Core/Geometry/interface/SensitiveDetectorCatalog.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimG4Core/Geometry/interface/SensitiveDetectorCatalog.h"
 
 #define DEBUG
 
 #include <iostream>
 
-void SensitiveDetectorCatalog::insert(const std::string& cN, const std::string& rN,
-                                      const std::string& lvN) {
+void SensitiveDetectorCatalog::insert(const std::string &cN, const std::string &rN, const std::string &lvN) {
   theClassNameMap[cN].push_back(rN);
   theROUNameMap[rN].push_back(lvN);
 #ifdef DEBUG
-  LogDebug("SimG4CoreGeometry") << "SenstiveDetectorCatalog: insert (" << cN
-				<< "," << rN << "," << lvN << ")\n"
-				<< "                         has     "
-				<< readoutNames().size() << " ROUs "
-				<< readoutNames().front() << "\n"
-				<< "                         has     "
-				<< classNames().size() << " classes "
-				<< classNames().front();
+  LogDebug("SimG4CoreGeometry") << "SenstiveDetectorCatalog: insert (" << cN << "," << rN << "," << lvN << ")\n"
+                                << "                         has     " << readoutNames().size() << " ROUs "
+                                << readoutNames().front() << "\n"
+                                << "                         has     " << classNames().size() << " classes "
+                                << classNames().front();
 #endif
 }
 
 std::vector<std::string> SensitiveDetectorCatalog::readoutNames() const {
   std::vector<std::string> temp;
-  for (MapType::const_iterator it = theROUNameMap.begin();
-       it != theROUNameMap.end(); it++)
+  for (MapType::const_iterator it = theROUNameMap.begin(); it != theROUNameMap.end(); it++)
     temp.push_back(it->first);
   return temp;
 }
 
-const std::vector<std::string>& SensitiveDetectorCatalog::readoutNames(const std::string & className) const {
+const std::vector<std::string> &SensitiveDetectorCatalog::readoutNames(const std::string &className) const {
   return theClassNameMap.at(className);
 }
 
-const std::vector<std::string>& SensitiveDetectorCatalog::logicalNames(const std::string & readoutName) const {
+const std::vector<std::string> &SensitiveDetectorCatalog::logicalNames(const std::string &readoutName) const {
   return theROUNameMap.at(readoutName);
 }
 
-std::vector<std::string> SensitiveDetectorCatalog::logicalNamesFromClassName(const std::string & className) const {
+std::vector<std::string> SensitiveDetectorCatalog::logicalNamesFromClassName(const std::string &className) const {
   std::vector<std::string> temp;
-  const std::vector<std::string>& rous = theClassNameMap.at(className);
-  for (std::vector<std::string>::const_iterator it = rous.begin(); 
-       it!= rous.end(); it++)
+  const std::vector<std::string> &rous = theClassNameMap.at(className);
+  for (std::vector<std::string>::const_iterator it = rous.begin(); it != rous.end(); it++)
     temp.push_back(*it);
   return temp;
 }
 
-std::string SensitiveDetectorCatalog::className(const std::string & readoutName) const {
-  for (MapType::const_iterator it = theClassNameMap.begin();  
-       it != theClassNameMap.end(); it++)  {
+std::string SensitiveDetectorCatalog::className(const std::string &readoutName) const {
+  for (MapType::const_iterator it = theClassNameMap.begin(); it != theClassNameMap.end(); it++) {
     std::vector<std::string> temp = (*it).second;
-    for (std::vector<std::string>::const_iterator it2 = temp.begin();
-	 it2!=temp.end(); it2++) {
-      if (*it2 == readoutName ) return (*it).first;
+    for (std::vector<std::string>::const_iterator it2 = temp.begin(); it2 != temp.end(); it2++) {
+      if (*it2 == readoutName)
+        return (*it).first;
     }
-  } 
+  }
   return "NotFound";
 }
 
 std::vector<std::string> SensitiveDetectorCatalog::classNames() const {
   std::vector<std::string> temp;
-  for (MapType::const_iterator it = theClassNameMap.begin();  
-       it != theClassNameMap.end(); it++)
+  for (MapType::const_iterator it = theClassNameMap.begin(); it != theClassNameMap.end(); it++)
     temp.push_back(it->first);
   return temp;
 }
diff --git a/SimG4Core/Geometry/test/Box_.cpp b/SimG4Core/Geometry/test/Box_.cpp
index fac016e07c745..a5e9fddcc96bf 100644
--- a/SimG4Core/Geometry/test/Box_.cpp
+++ b/SimG4Core/Geometry/test/Box_.cpp
@@ -1,53 +1,49 @@
-#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
-#include "cppunit/extensions/HelperMacros.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/interface/DDSolidShapes.h"
 #include "DetectorDescription/Core/src/Box.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
+#include "cppunit/extensions/HelperMacros.h"
 #include <G4Box.hh>
 #include <cmath>
-#include <string>
 #include <limits>
+#include <string>
 
 using namespace std;
 
-class testBox : public CppUnit::TestFixture
-{
-  CPPUNIT_TEST_SUITE( testBox );
-  CPPUNIT_TEST( matched_g4_and_dd );
-  
+class testBox : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testBox);
+  CPPUNIT_TEST(matched_g4_and_dd);
+
   CPPUNIT_TEST_SUITE_END();
-  
+
 public:
-  
-  void matched_g4_and_dd( void );
+  void matched_g4_and_dd(void);
 };
 
-void
-testBox::matched_g4_and_dd( void )
-{
-  double xHalfLength( 2.*cm );
-  double yHalfLength( 2.*cm );
-  double zHalfLength( 2.*cm );
-  string name( "fred1" );
-
-  G4Box g4( name, xHalfLength, yHalfLength, zHalfLength );
-  DDI::Box dd( xHalfLength, yHalfLength, zHalfLength );
-  DDBox dds = DDSolidFactory::box( name, xHalfLength, yHalfLength, zHalfLength );
+void testBox::matched_g4_and_dd(void) {
+  double xHalfLength(2. * cm);
+  double yHalfLength(2. * cm);
+  double zHalfLength(2. * cm);
+  string name("fred1");
+
+  G4Box g4(name, xHalfLength, yHalfLength, zHalfLength);
+  DDI::Box dd(xHalfLength, yHalfLength, zHalfLength);
+  DDBox dds = DDSolidFactory::box(name, xHalfLength, yHalfLength, zHalfLength);
   cout << endl;
-  dd.stream( cout );
+  dd.stream(cout);
   cout << endl;
 
-  double g4v = g4.GetCubicVolume()/cm3;
-  double ddv = dd.volume()/cm3;
-  double ddsv = dds.volume()/cm3;
+  double g4v = g4.GetCubicVolume() / cm3;
+  double ddv = dd.volume() / cm3;
+  double ddsv = dds.volume() / cm3;
 
-  cout << "\tg4 volume = " << g4.GetCubicVolume()/cm3 <<" cm3" << endl;
-  cout << "\tdd volume = " << dd.volume()/cm3 << " cm3"<<  endl;
+  cout << "\tg4 volume = " << g4.GetCubicVolume() / cm3 << " cm3" << endl;
+  cout << "\tdd volume = " << dd.volume() / cm3 << " cm3" << endl;
   cout << "\tDD Information: " << dds << " vol= " << dds.volume() << endl;
-  
-  CPPUNIT_ASSERT( abs(g4v - ddv) < numeric_limits<float>::epsilon());
-  CPPUNIT_ASSERT( abs(g4v - ddsv) < numeric_limits<float>::epsilon());
+
+  CPPUNIT_ASSERT(abs(g4v - ddv) < numeric_limits<float>::epsilon());
+  CPPUNIT_ASSERT(abs(g4v - ddsv) < numeric_limits<float>::epsilon());
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION( testBox );
+CPPUNIT_TEST_SUITE_REGISTRATION(testBox);
diff --git a/SimG4Core/Geometry/test/Cons_.cpp b/SimG4Core/Geometry/test/Cons_.cpp
index f23f205720f52..f4d128e37ed85 100644
--- a/SimG4Core/Geometry/test/Cons_.cpp
+++ b/SimG4Core/Geometry/test/Cons_.cpp
@@ -1,57 +1,53 @@
-#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
-#include "cppunit/extensions/HelperMacros.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/interface/DDSolidShapes.h"
 #include "DetectorDescription/Core/src/Cons.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
+#include "cppunit/extensions/HelperMacros.h"
 #include <G4Cons.hh>
 #include <cmath>
-#include <string>
 #include <limits>
+#include <string>
 
 using namespace std;
 
-class testCons : public CppUnit::TestFixture
-{
-  CPPUNIT_TEST_SUITE( testCons );
-  CPPUNIT_TEST( matched_g4_and_dd );
-  
+class testCons : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testCons);
+  CPPUNIT_TEST(matched_g4_and_dd);
+
   CPPUNIT_TEST_SUITE_END();
-  
+
 public:
-  
-  void matched_g4_and_dd( void );
+  void matched_g4_and_dd(void);
 };
 
-void
-testCons::matched_g4_and_dd( void )
-{
-  double rIn1 = 10.*cm;
-  double rOut1 = 15.*cm;
-  double rIn2 = 20.*cm;
-  double rOut2 = 25.*cm;
-  double zhalf = 20.*cm;
-  double startPhi = 0.*deg;
-  double deltaPhi = 90.*deg;
-  string name( "fred1" );
-
-  G4Cons g4( name, rIn1, rOut1, rIn2, rOut2, zhalf, startPhi, deltaPhi );
-  DDI::Cons dd( zhalf, rIn1, rOut1, rIn2, rOut2, startPhi, deltaPhi );
-  DDCons dds = DDSolidFactory::cons( name, zhalf, rIn1, rOut1, rIn2, rOut2, startPhi, deltaPhi );
+void testCons::matched_g4_and_dd(void) {
+  double rIn1 = 10. * cm;
+  double rOut1 = 15. * cm;
+  double rIn2 = 20. * cm;
+  double rOut2 = 25. * cm;
+  double zhalf = 20. * cm;
+  double startPhi = 0. * deg;
+  double deltaPhi = 90. * deg;
+  string name("fred1");
+
+  G4Cons g4(name, rIn1, rOut1, rIn2, rOut2, zhalf, startPhi, deltaPhi);
+  DDI::Cons dd(zhalf, rIn1, rOut1, rIn2, rOut2, startPhi, deltaPhi);
+  DDCons dds = DDSolidFactory::cons(name, zhalf, rIn1, rOut1, rIn2, rOut2, startPhi, deltaPhi);
   cout << endl;
   dd.stream(cout);
   cout << endl;
 
-  double g4v = g4.GetCubicVolume()/cm3;
-  double ddv = dd.volume()/cm3;
-  double ddsv = dds.volume()/cm3;
-  
-  cout << "\tg4 volume = " << g4v <<" cm3" << endl;
-  cout << "\tdd volume = " << ddv << " cm3" <<  endl;
+  double g4v = g4.GetCubicVolume() / cm3;
+  double ddv = dd.volume() / cm3;
+  double ddsv = dds.volume() / cm3;
+
+  cout << "\tg4 volume = " << g4v << " cm3" << endl;
+  cout << "\tdd volume = " << ddv << " cm3" << endl;
   cout << "\tDD Information: " << dds << " vol=" << ddsv << " cm3" << endl;
 
-  CPPUNIT_ASSERT( abs(g4v - ddv) < numeric_limits<float>::epsilon());
-  CPPUNIT_ASSERT( abs(g4v - ddsv) < numeric_limits<float>::epsilon());
+  CPPUNIT_ASSERT(abs(g4v - ddv) < numeric_limits<float>::epsilon());
+  CPPUNIT_ASSERT(abs(g4v - ddsv) < numeric_limits<float>::epsilon());
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION( testCons );
+CPPUNIT_TEST_SUITE_REGISTRATION(testCons);
diff --git a/SimG4Core/Geometry/test/CutTubs_.cpp b/SimG4Core/Geometry/test/CutTubs_.cpp
index bb44abf332688..eff3f8ab83bb8 100644
--- a/SimG4Core/Geometry/test/CutTubs_.cpp
+++ b/SimG4Core/Geometry/test/CutTubs_.cpp
@@ -1,61 +1,70 @@
-#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
-#include "cppunit/extensions/HelperMacros.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/interface/DDSolidShapes.h"
 #include "DetectorDescription/Core/src/CutTubs.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
+#include "cppunit/extensions/HelperMacros.h"
 #include <G4CutTubs.hh>
 #include <cmath>
-#include <string>
 #include <limits>
+#include <string>
 
 using namespace std;
 
-class testCutTubs : public CppUnit::TestFixture
-{
-  CPPUNIT_TEST_SUITE( testCutTubs );
-  CPPUNIT_TEST( matched_g4_and_dd );
-  
+class testCutTubs : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testCutTubs);
+  CPPUNIT_TEST(matched_g4_and_dd);
+
   CPPUNIT_TEST_SUITE_END();
-  
+
 public:
-  
-  void matched_g4_and_dd( void );
+  void matched_g4_and_dd(void);
 };
 
-void
-testCutTubs::matched_g4_and_dd( void )
-{
-  double rIn = 10.*cm;
-  double rOut = 15.*cm;
-  double zhalf = 20.*cm;
-  double startPhi = 0.*deg;
-  double deltaPhi = 90.*deg;
-  string name( "fred1" );
-
-  array<double, 3> lowNorm = {{ 0, -0.7, -0.71 }};
-  array<double, 3> highNorm = {{ 0.7, 0, 0.71 }};
-  
-  G4CutTubs g4( name, rIn, rOut, zhalf, startPhi, deltaPhi,
-		G4ThreeVector( lowNorm[0], lowNorm[1], lowNorm[2]),
-		G4ThreeVector( highNorm[0], highNorm[1], highNorm[2]));
-  DDI::CutTubs dd( zhalf, rIn, rOut, startPhi, deltaPhi,
-		   lowNorm[0], lowNorm[1], lowNorm[2],
-		   highNorm[0], highNorm[1], highNorm[2] );
-  DDCutTubs dds = DDSolidFactory::cuttubs( name, zhalf, rIn, rOut, startPhi, deltaPhi,
-					   lowNorm[0], lowNorm[1], lowNorm[2],
-					   highNorm[0], highNorm[1], highNorm[2] );
+void testCutTubs::matched_g4_and_dd(void) {
+  double rIn = 10. * cm;
+  double rOut = 15. * cm;
+  double zhalf = 20. * cm;
+  double startPhi = 0. * deg;
+  double deltaPhi = 90. * deg;
+  string name("fred1");
+
+  array<double, 3> lowNorm = {{0, -0.7, -0.71}};
+  array<double, 3> highNorm = {{0.7, 0, 0.71}};
+
+  G4CutTubs g4(name,
+               rIn,
+               rOut,
+               zhalf,
+               startPhi,
+               deltaPhi,
+               G4ThreeVector(lowNorm[0], lowNorm[1], lowNorm[2]),
+               G4ThreeVector(highNorm[0], highNorm[1], highNorm[2]));
+  DDI::CutTubs dd(
+      zhalf, rIn, rOut, startPhi, deltaPhi, lowNorm[0], lowNorm[1], lowNorm[2], highNorm[0], highNorm[1], highNorm[2]);
+  DDCutTubs dds = DDSolidFactory::cuttubs(name,
+                                          zhalf,
+                                          rIn,
+                                          rOut,
+                                          startPhi,
+                                          deltaPhi,
+                                          lowNorm[0],
+                                          lowNorm[1],
+                                          lowNorm[2],
+                                          highNorm[0],
+                                          highNorm[1],
+                                          highNorm[2]);
   cout << endl;
-  dd.stream( cout );
+  dd.stream(cout);
   cout << endl;
-  
-  double g4v = g4.GetCubicVolume()/cm3;
-  double ddv = dd.volume()/cm3;
-  double ddsv = dds.volume()/cm3;
-  
-  cout << "\tg4 volume = " << g4v <<" cm3" << endl;
-  cout << "\tdd volume = " << ddv << " cm3" <<  endl;
+
+  double g4v = g4.GetCubicVolume() / cm3;
+  double ddv = dd.volume() / cm3;
+  double ddsv = dds.volume() / cm3;
+
+  cout << "\tg4 volume = " << g4v << " cm3" << endl;
+  cout << "\tdd volume = " << ddv << " cm3" << endl;
   cout << "\tDD Information: " << dds << " vol=" << ddsv << " cm3" << endl;
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION( testCutTubs );
+CPPUNIT_TEST_SUITE_REGISTRATION(testCutTubs);
diff --git a/SimG4Core/Geometry/test/EllipticalTube_.cpp b/SimG4Core/Geometry/test/EllipticalTube_.cpp
index 0c22b4ed2bbc9..8681d2c6b8365 100644
--- a/SimG4Core/Geometry/test/EllipticalTube_.cpp
+++ b/SimG4Core/Geometry/test/EllipticalTube_.cpp
@@ -1,53 +1,49 @@
-#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
-#include "cppunit/extensions/HelperMacros.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/interface/DDSolidShapes.h"
 #include "DetectorDescription/Core/src/EllipticalTube.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
+#include "cppunit/extensions/HelperMacros.h"
 #include <G4EllipticalTube.hh>
 #include <cmath>
-#include <string>
 #include <limits>
+#include <string>
 
 using namespace std;
 
-class testEllipticalTube : public CppUnit::TestFixture
-{
-  CPPUNIT_TEST_SUITE( testEllipticalTube );
-  CPPUNIT_TEST( matched_g4_and_dd );
-  
+class testEllipticalTube : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testEllipticalTube);
+  CPPUNIT_TEST(matched_g4_and_dd);
+
   CPPUNIT_TEST_SUITE_END();
-  
+
 public:
-  
-  void matched_g4_and_dd( void );
+  void matched_g4_and_dd(void);
 };
 
-void
-testEllipticalTube::matched_g4_and_dd( void )
-{
-  double xSemiAxis = 3.0*cm;
-  double ySemiAxis = 2.0*cm;
-  double zHeight = 5.0*cm;
-  string name( "fred1" );
-
-  G4EllipticalTube g4( name, xSemiAxis, ySemiAxis, zHeight );
-  DDI::EllipticalTube dd(    xSemiAxis, ySemiAxis, zHeight );
-  DDEllipticalTube dds = DDSolidFactory::ellipticalTube( name, xSemiAxis, ySemiAxis, zHeight );
+void testEllipticalTube::matched_g4_and_dd(void) {
+  double xSemiAxis = 3.0 * cm;
+  double ySemiAxis = 2.0 * cm;
+  double zHeight = 5.0 * cm;
+  string name("fred1");
+
+  G4EllipticalTube g4(name, xSemiAxis, ySemiAxis, zHeight);
+  DDI::EllipticalTube dd(xSemiAxis, ySemiAxis, zHeight);
+  DDEllipticalTube dds = DDSolidFactory::ellipticalTube(name, xSemiAxis, ySemiAxis, zHeight);
   cout << endl;
-  dd.stream( cout );
+  dd.stream(cout);
   cout << endl;
 
-  double g4v = g4.GetCubicVolume()/cm3;
-  double ddv = dd.volume()/cm3;
-  double ddsv = dds.volume()/cm3;
-  
-  cout << "\tg4 volume = " << g4v <<" cm3" << endl;
-  cout << "\tdd volume = " << ddv << " cm3" <<  endl;
+  double g4v = g4.GetCubicVolume() / cm3;
+  double ddv = dd.volume() / cm3;
+  double ddsv = dds.volume() / cm3;
+
+  cout << "\tg4 volume = " << g4v << " cm3" << endl;
+  cout << "\tdd volume = " << ddv << " cm3" << endl;
   cout << "\tDD Information: " << dds << " vol=" << ddsv << " cm3" << endl;
-  
-  CPPUNIT_ASSERT( abs(g4v - ddv) < numeric_limits<float>::epsilon());
-  CPPUNIT_ASSERT( abs(g4v - ddsv) < numeric_limits<float>::epsilon());
+
+  CPPUNIT_ASSERT(abs(g4v - ddv) < numeric_limits<float>::epsilon());
+  CPPUNIT_ASSERT(abs(g4v - ddsv) < numeric_limits<float>::epsilon());
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION( testEllipticalTube );
+CPPUNIT_TEST_SUITE_REGISTRATION(testEllipticalTube);
diff --git a/SimG4Core/Geometry/test/ExtrudedPolygon_.cpp b/SimG4Core/Geometry/test/ExtrudedPolygon_.cpp
index f4efa4946e5d8..beda7e7557798 100644
--- a/SimG4Core/Geometry/test/ExtrudedPolygon_.cpp
+++ b/SimG4Core/Geometry/test/ExtrudedPolygon_.cpp
@@ -1,56 +1,52 @@
-#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
-#include "cppunit/extensions/HelperMacros.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/interface/DDSolidShapes.h"
 #include "DetectorDescription/Core/src/ExtrudedPolygon.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
+#include "cppunit/extensions/HelperMacros.h"
 #include <G4ExtrudedSolid.hh>
 #include <cmath>
-#include <string>
 #include <limits>
+#include <string>
 
 using namespace std;
 
-class testExtrudedPgon : public CppUnit::TestFixture
-{
-  CPPUNIT_TEST_SUITE( testExtrudedPgon );
-  CPPUNIT_TEST( matched_g4_and_dd );
-  
+class testExtrudedPgon : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testExtrudedPgon);
+  CPPUNIT_TEST(matched_g4_and_dd);
+
   CPPUNIT_TEST_SUITE_END();
-  
+
 public:
-  
-  void matched_g4_and_dd( void );
+  void matched_g4_and_dd(void);
 };
 
-void
-testExtrudedPgon::matched_g4_and_dd( void )
-{
-  vector<double> x = { -300, -300, 300, 300, 150, 150, -150, -150 };
-  vector<double> y = { -300, 300, 300, -300, -300, 150, 150, -300 };
-  vector<double> z = { -600, -150, 100, 600 };
-  vector<double> zx = { 0, 0, 0, 0 };
-  vector<double> zy = { 300, -300, 0, 300 }; 
-  vector<double> zscale = { 8, 10, 6, 12 };
-  string name( "fred1" );
+void testExtrudedPgon::matched_g4_and_dd(void) {
+  vector<double> x = {-300, -300, 300, 300, 150, 150, -150, -150};
+  vector<double> y = {-300, 300, 300, -300, -300, 150, 150, -300};
+  vector<double> z = {-600, -150, 100, 600};
+  vector<double> zx = {0, 0, 0, 0};
+  vector<double> zy = {300, -300, 0, 300};
+  vector<double> zscale = {8, 10, 6, 12};
+  string name("fred1");
 
   vector<G4TwoVector> polygon;
   vector<G4ExtrudedSolid::ZSection> zsections;
-  for( unsigned int it = 0; it < x.size(); ++it )
-    polygon.emplace_back( x[it], y[it] );
-  for( unsigned int it = 0; it < z.size(); ++it )
-    zsections.emplace_back( z[it], G4TwoVector(zx[it], zy[it]), zscale[it] );
-  G4ExtrudedSolid g4( name, polygon, zsections );
-  DDI::ExtrudedPolygon dd( x, y, z, zx, zy, zscale );
-  DDExtrudedPolygon dds = DDSolidFactory::extrudedpolygon( name,  x, y, z, zx, zy, zscale );
+  for (unsigned int it = 0; it < x.size(); ++it)
+    polygon.emplace_back(x[it], y[it]);
+  for (unsigned int it = 0; it < z.size(); ++it)
+    zsections.emplace_back(z[it], G4TwoVector(zx[it], zy[it]), zscale[it]);
+  G4ExtrudedSolid g4(name, polygon, zsections);
+  DDI::ExtrudedPolygon dd(x, y, z, zx, zy, zscale);
+  DDExtrudedPolygon dds = DDSolidFactory::extrudedpolygon(name, x, y, z, zx, zy, zscale);
 
   dd.stream(cout);
   cout << endl;
-  cout << "\tg4 volume = " << g4.GetCubicVolume()/cm3 <<" cm3" << endl;
-  cout << "\tdd volume = " << dd.volume()/cm3 << " cm3"<<  endl;
+  cout << "\tg4 volume = " << g4.GetCubicVolume() / cm3 << " cm3" << endl;
+  cout << "\tdd volume = " << dd.volume() / cm3 << " cm3" << endl;
   cout << "\tDD Information: " << dds << " vol= " << dds.volume() << endl;
-  
+
   // FIXME: dd voulme is not implemented yet!
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION( testExtrudedPgon );
+CPPUNIT_TEST_SUITE_REGISTRATION(testExtrudedPgon);
diff --git a/SimG4Core/Geometry/test/Polycone_.cpp b/SimG4Core/Geometry/test/Polycone_.cpp
index bb06984cd713a..85d5e89e7580c 100644
--- a/SimG4Core/Geometry/test/Polycone_.cpp
+++ b/SimG4Core/Geometry/test/Polycone_.cpp
@@ -1,58 +1,54 @@
-#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
-#include "cppunit/extensions/HelperMacros.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/interface/DDSolidShapes.h"
 #include "DetectorDescription/Core/src/Polycone.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
+#include "cppunit/extensions/HelperMacros.h"
 #include <G4Polycone.hh>
 #include <cmath>
-#include <string>
 #include <limits>
+#include <string>
 
 using namespace std;
 
-class testPolycone : public CppUnit::TestFixture
-{
-  CPPUNIT_TEST_SUITE( testPolycone );
-  CPPUNIT_TEST( matched_g4_and_dd );
-  
+class testPolycone : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testPolycone);
+  CPPUNIT_TEST(matched_g4_and_dd);
+
   CPPUNIT_TEST_SUITE_END();
-  
+
 public:
-  
-  void matched_g4_and_dd( void );
+  void matched_g4_and_dd(void);
 };
 
-void
-testPolycone::matched_g4_and_dd( void )
-{
-  double phiStart = 45.*deg;
-  double phiTotal = 325.*deg;
-  double inner[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-  vector<double> rInner( inner, inner + sizeof( inner ) / sizeof( double ));
-  double outer[] = { 0, 10, 10, 5, 5, 10, 10, 2, 2 };
-  vector<double> rOuter( outer, outer + sizeof( outer ) / sizeof( double ));
-  double pl[] = { 5, 7, 9, 11, 25, 27, 29, 31, 35 };
-  vector<double> z( pl, pl + sizeof( pl ) / sizeof( double ));
-  string name( "fred1" );
-
-  G4Polycone g4( name, phiStart, phiTotal, z.size(), &z[0], &rInner[0], &rOuter[0] );
-  DDI::Polycone dd( phiStart, phiTotal, z, rInner, rOuter );
-  DDPolycone dds = DDSolidFactory::polycone( name, phiStart, phiTotal, z, rInner, rOuter );
+void testPolycone::matched_g4_and_dd(void) {
+  double phiStart = 45. * deg;
+  double phiTotal = 325. * deg;
+  double inner[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
+  vector<double> rInner(inner, inner + sizeof(inner) / sizeof(double));
+  double outer[] = {0, 10, 10, 5, 5, 10, 10, 2, 2};
+  vector<double> rOuter(outer, outer + sizeof(outer) / sizeof(double));
+  double pl[] = {5, 7, 9, 11, 25, 27, 29, 31, 35};
+  vector<double> z(pl, pl + sizeof(pl) / sizeof(double));
+  string name("fred1");
+
+  G4Polycone g4(name, phiStart, phiTotal, z.size(), &z[0], &rInner[0], &rOuter[0]);
+  DDI::Polycone dd(phiStart, phiTotal, z, rInner, rOuter);
+  DDPolycone dds = DDSolidFactory::polycone(name, phiStart, phiTotal, z, rInner, rOuter);
   cout << endl;
   dd.stream(cout);
   cout << endl;
 
-  double g4v = g4.GetCubicVolume()/cm3;
-  double ddv = dd.volume()/cm3;
-  double ddsv = dds.volume()/cm3;
+  double g4v = g4.GetCubicVolume() / cm3;
+  double ddv = dd.volume() / cm3;
+  double ddsv = dds.volume() / cm3;
 
-  cout << "\tg4 volume = " << g4v <<" cm3" << endl;
-  cout << "\tdd volume = " << ddv << " cm3"<<  endl;
+  cout << "\tg4 volume = " << g4v << " cm3" << endl;
+  cout << "\tdd volume = " << ddv << " cm3" << endl;
   cout << "\tDD Information: " << dds << " vol= " << ddsv << " cm3" << endl;
 
-  CPPUNIT_ASSERT( abs(g4v - ddv) < numeric_limits<float>::epsilon());
-  CPPUNIT_ASSERT( abs(g4v - ddsv) < numeric_limits<float>::epsilon());
+  CPPUNIT_ASSERT(abs(g4v - ddv) < numeric_limits<float>::epsilon());
+  CPPUNIT_ASSERT(abs(g4v - ddsv) < numeric_limits<float>::epsilon());
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION( testPolycone );
+CPPUNIT_TEST_SUITE_REGISTRATION(testPolycone);
diff --git a/SimG4Core/Geometry/test/Polyhedra_.cpp b/SimG4Core/Geometry/test/Polyhedra_.cpp
index 99cddfdbc3303..6f684336f9b65 100644
--- a/SimG4Core/Geometry/test/Polyhedra_.cpp
+++ b/SimG4Core/Geometry/test/Polyhedra_.cpp
@@ -1,55 +1,51 @@
-#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
-#include "cppunit/extensions/HelperMacros.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/interface/DDSolidShapes.h"
 #include "DetectorDescription/Core/src/Polyhedra.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
+#include "cppunit/extensions/HelperMacros.h"
 #include <G4Polyhedra.hh>
 #include <cmath>
-#include <string>
 #include <limits>
+#include <string>
 
 using namespace std;
 
-class testPolyhedra : public CppUnit::TestFixture
-{
-  CPPUNIT_TEST_SUITE( testPolyhedra );
-  CPPUNIT_TEST( matched_g4_and_dd );
-  
+class testPolyhedra : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testPolyhedra);
+  CPPUNIT_TEST(matched_g4_and_dd);
+
   CPPUNIT_TEST_SUITE_END();
-  
+
 public:
-  
-  void matched_g4_and_dd( void );
+  void matched_g4_and_dd(void);
 };
 
-void
-testPolyhedra::matched_g4_and_dd( void )
-{
+void testPolyhedra::matched_g4_and_dd(void) {
   int sides = 3;
-  double phiStart = 45.*deg;
-  double phiTotal = 325.*deg;
-  double inner[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-  vector<double> rInner( inner, inner + sizeof( inner ) / sizeof( double ));
-  double outer[] = { 0, 10, 10, 5, 5, 10, 10, 2, 2 };
-  vector<double> rOuter( outer, outer + sizeof( outer ) / sizeof( double ));
-  double pl[] = { 5, 7, 9, 11, 25, 27, 29, 31, 35 };
-  vector<double> z( pl, pl + sizeof( pl ) / sizeof( double ));
-  string name( "fred1" );
-
-  G4Polyhedra g4( name, phiStart, phiTotal, sides, z.size(), &z[0], &rInner[0], &rOuter[0] );
-  DDI::Polyhedra dd( sides, phiStart, phiTotal, z, rInner, rOuter );
-  DDPolyhedra dds = DDSolidFactory::polyhedra( name, sides, phiStart, phiTotal, z, rInner, rOuter );
+  double phiStart = 45. * deg;
+  double phiTotal = 325. * deg;
+  double inner[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
+  vector<double> rInner(inner, inner + sizeof(inner) / sizeof(double));
+  double outer[] = {0, 10, 10, 5, 5, 10, 10, 2, 2};
+  vector<double> rOuter(outer, outer + sizeof(outer) / sizeof(double));
+  double pl[] = {5, 7, 9, 11, 25, 27, 29, 31, 35};
+  vector<double> z(pl, pl + sizeof(pl) / sizeof(double));
+  string name("fred1");
+
+  G4Polyhedra g4(name, phiStart, phiTotal, sides, z.size(), &z[0], &rInner[0], &rOuter[0]);
+  DDI::Polyhedra dd(sides, phiStart, phiTotal, z, rInner, rOuter);
+  DDPolyhedra dds = DDSolidFactory::polyhedra(name, sides, phiStart, phiTotal, z, rInner, rOuter);
   cout << endl;
-  dd.stream( cout );
+  dd.stream(cout);
   cout << endl;
 
-  double g4v = g4.GetCubicVolume()/cm3;
-  double ddv = dd.volume()/cm3;
-  double ddsv = dds.volume()/cm3;
-  
-  cout << "\tg4 volume = " << g4v <<" cm3" << endl;
-  cout << "\tdd volume = " << ddv << " cm3" <<  endl;
+  double g4v = g4.GetCubicVolume() / cm3;
+  double ddv = dd.volume() / cm3;
+  double ddsv = dds.volume() / cm3;
+
+  cout << "\tg4 volume = " << g4v << " cm3" << endl;
+  cout << "\tdd volume = " << ddv << " cm3" << endl;
   cout << "\tDD Information: " << dds << " vol=" << ddsv << " cm3" << endl;
 
   // FIXME: volumes do not match!
@@ -57,4 +53,4 @@ testPolyhedra::matched_g4_and_dd( void )
   // CPPUNIT_ASSERT( abs( g4v - ddsv ) < numeric_limits<float>::epsilon());
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION( testPolyhedra );
+CPPUNIT_TEST_SUITE_REGISTRATION(testPolyhedra);
diff --git a/SimG4Core/Geometry/test/PseudoTrap_.cpp b/SimG4Core/Geometry/test/PseudoTrap_.cpp
index 43df51c604987..6392261dc4e15 100644
--- a/SimG4Core/Geometry/test/PseudoTrap_.cpp
+++ b/SimG4Core/Geometry/test/PseudoTrap_.cpp
@@ -1,61 +1,57 @@
-#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
-#include "cppunit/extensions/HelperMacros.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/interface/DDSolidShapes.h"
 #include "DetectorDescription/Core/src/PseudoTrap.h"
 #include "SimG4Core/Geometry/interface/DDG4SolidConverter.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
+#include "cppunit/extensions/HelperMacros.h"
 #include <G4VSolid.hh>
 #include <cmath>
-#include <string>
 #include <limits>
+#include <string>
 
 using namespace std;
 
-class testPseudoTrap : public CppUnit::TestFixture
-{
-  CPPUNIT_TEST_SUITE( testPseudoTrap );
-  CPPUNIT_TEST( matched_g4_and_dd );
-  
+class testPseudoTrap : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testPseudoTrap);
+  CPPUNIT_TEST(matched_g4_and_dd);
+
   CPPUNIT_TEST_SUITE_END();
-  
+
 public:
-  
-  void matched_g4_and_dd( void );
+  void matched_g4_and_dd(void);
 };
 
-void
-testPseudoTrap::matched_g4_and_dd( void )
-{
-  double pDx1 = 0.293734*m; /**< Half-length along x at the surface positioned at -dz */
-  double pDx2 = 1.86356*m;  /**<  Half-length along x at the surface positioned at +dz */
-  double pDy1 = 0.3000*m;   /**<  Half-length along y at the surface positioned at -dz */
-  double pDy2 = 0.3000*m;   /**<  Half-length along y at the surface positioned at +dz */
-  double pDz = 2.92934*m;   /**< Half of the height of the pseudo trapezoid along z */
-  double radius = -1.1350*m;/**< radius of the cut-out (negative sign) or rounding (pos. sign) */
-  bool atMinusZ = true;     /**< if true, the cut-out or rounding is applied at -dz, else at +dz */
-  string name( "fred1" );
-  
-  DDI::PseudoTrap dd( pDx1, pDx2, pDy1, pDy2, pDz, radius, atMinusZ );
-  DDPseudoTrap dds = DDSolidFactory::pseudoTrap( name, pDx1, pDx2, pDy1, pDy2, pDz, radius, atMinusZ );
-  G4VSolid *g4 = DDG4SolidConverter::pseudotrap( dds );
+void testPseudoTrap::matched_g4_and_dd(void) {
+  double pDx1 = 0.293734 * m;  /**< Half-length along x at the surface positioned at -dz */
+  double pDx2 = 1.86356 * m;   /**<  Half-length along x at the surface positioned at +dz */
+  double pDy1 = 0.3000 * m;    /**<  Half-length along y at the surface positioned at -dz */
+  double pDy2 = 0.3000 * m;    /**<  Half-length along y at the surface positioned at +dz */
+  double pDz = 2.92934 * m;    /**< Half of the height of the pseudo trapezoid along z */
+  double radius = -1.1350 * m; /**< radius of the cut-out (negative sign) or rounding (pos. sign) */
+  bool atMinusZ = true;        /**< if true, the cut-out or rounding is applied at -dz,
+                           else at +dz */
+  string name("fred1");
+
+  DDI::PseudoTrap dd(pDx1, pDx2, pDy1, pDy2, pDz, radius, atMinusZ);
+  DDPseudoTrap dds = DDSolidFactory::pseudoTrap(name, pDx1, pDx2, pDy1, pDy2, pDz, radius, atMinusZ);
+  G4VSolid *g4 = DDG4SolidConverter::pseudotrap(dds);
   cout << endl;
-  dd.stream( cout );
+  dd.stream(cout);
   cout << endl;
 
-  double g4v = g4->GetCubicVolume()/cm3;
-  double ddv = dd.volume()/cm3;
-  double ddsv = dds.volume()/cm3;
-  
-  cout << "\tg4 volume = " << g4v <<" cm3" << endl;
-  cout << "\tdd volume = " << ddv << " cm3" <<  endl;
+  double g4v = g4->GetCubicVolume() / cm3;
+  double ddv = dd.volume() / cm3;
+  double ddsv = dds.volume() / cm3;
+
+  cout << "\tg4 volume = " << g4v << " cm3" << endl;
+  cout << "\tdd volume = " << ddv << " cm3" << endl;
   cout << "\tDD Information: " << dds << " vol=" << ddsv << " cm3" << endl;
 
-  if( ddv > 0.0 )
-  {
-    CPPUNIT_ASSERT( abs(g4v - ddv) < numeric_limits<float>::epsilon());
-    CPPUNIT_ASSERT( abs(g4v - ddsv) < numeric_limits<float>::epsilon());
+  if (ddv > 0.0) {
+    CPPUNIT_ASSERT(abs(g4v - ddv) < numeric_limits<float>::epsilon());
+    CPPUNIT_ASSERT(abs(g4v - ddsv) < numeric_limits<float>::epsilon());
   }
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION( testPseudoTrap );
+CPPUNIT_TEST_SUITE_REGISTRATION(testPseudoTrap);
diff --git a/SimG4Core/Geometry/test/Sphere_.cpp b/SimG4Core/Geometry/test/Sphere_.cpp
index 7ab0add2fea9a..4f3c07682ddcf 100644
--- a/SimG4Core/Geometry/test/Sphere_.cpp
+++ b/SimG4Core/Geometry/test/Sphere_.cpp
@@ -1,56 +1,52 @@
-#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
-#include "cppunit/extensions/HelperMacros.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/interface/DDSolidShapes.h"
 #include "DetectorDescription/Core/src/Sphere.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
+#include "cppunit/extensions/HelperMacros.h"
 #include <G4Sphere.hh>
 #include <cmath>
-#include <string>
 #include <limits>
+#include <string>
 
 using namespace std;
 
-class testSphere : public CppUnit::TestFixture
-{
-  CPPUNIT_TEST_SUITE( testSphere );
-  CPPUNIT_TEST( matched_g4_and_dd );
-  
+class testSphere : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testSphere);
+  CPPUNIT_TEST(matched_g4_and_dd);
+
   CPPUNIT_TEST_SUITE_END();
-  
+
 public:
-  
-  void matched_g4_and_dd( void );
+  void matched_g4_and_dd(void);
 };
 
-void
-testSphere::matched_g4_and_dd( void )
-{
-  double innerRadius = 10.*cm;
-  double outerRadius = 15.*cm;
-  double startPhi = 0.*deg;
-  double deltaPhi = 90.*deg;
-  double startTheta = 0.*deg;
-  double deltaTheta = 180.*deg;
-  string name( "fred1" );
-
-  G4Sphere g4( name, innerRadius, outerRadius, startPhi, deltaPhi, startTheta, deltaTheta );
-  DDI::Sphere dd( innerRadius, outerRadius, startPhi, deltaPhi, startTheta, deltaTheta );
-  DDSphere dds = DDSolidFactory::sphere( name, innerRadius, outerRadius, startPhi, deltaPhi, startTheta, deltaTheta );
+void testSphere::matched_g4_and_dd(void) {
+  double innerRadius = 10. * cm;
+  double outerRadius = 15. * cm;
+  double startPhi = 0. * deg;
+  double deltaPhi = 90. * deg;
+  double startTheta = 0. * deg;
+  double deltaTheta = 180. * deg;
+  string name("fred1");
+
+  G4Sphere g4(name, innerRadius, outerRadius, startPhi, deltaPhi, startTheta, deltaTheta);
+  DDI::Sphere dd(innerRadius, outerRadius, startPhi, deltaPhi, startTheta, deltaTheta);
+  DDSphere dds = DDSolidFactory::sphere(name, innerRadius, outerRadius, startPhi, deltaPhi, startTheta, deltaTheta);
   cout << endl;
-  dd.stream( cout );
+  dd.stream(cout);
   cout << endl;
-  
-  double g4v = g4.GetCubicVolume()/cm3;
-  double ddv = dd.volume()/cm3;
-  double ddsv = dds.volume()/cm3;
-  
-  cout << "\tg4 volume = " << g4v <<" cm3" << endl;
-  cout << "\tdd volume = " << ddv << " cm3" <<  endl;
+
+  double g4v = g4.GetCubicVolume() / cm3;
+  double ddv = dd.volume() / cm3;
+  double ddsv = dds.volume() / cm3;
+
+  cout << "\tg4 volume = " << g4v << " cm3" << endl;
+  cout << "\tdd volume = " << ddv << " cm3" << endl;
   cout << "\tDD Information: " << dds << " vol=" << ddsv << " cm3" << endl;
-  
-  CPPUNIT_ASSERT( abs(g4v - ddv) < numeric_limits<float>::epsilon());
-  CPPUNIT_ASSERT( abs(g4v - ddsv) < numeric_limits<float>::epsilon());
+
+  CPPUNIT_ASSERT(abs(g4v - ddv) < numeric_limits<float>::epsilon());
+  CPPUNIT_ASSERT(abs(g4v - ddsv) < numeric_limits<float>::epsilon());
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION( testSphere );
+CPPUNIT_TEST_SUITE_REGISTRATION(testSphere);
diff --git a/SimG4Core/Geometry/test/Torus_.cpp b/SimG4Core/Geometry/test/Torus_.cpp
index 23f33761f7cf2..34db5e2c8e20c 100644
--- a/SimG4Core/Geometry/test/Torus_.cpp
+++ b/SimG4Core/Geometry/test/Torus_.cpp
@@ -1,55 +1,51 @@
-#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
-#include "cppunit/extensions/HelperMacros.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/interface/DDSolidShapes.h"
 #include "DetectorDescription/Core/src/Torus.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
+#include "cppunit/extensions/HelperMacros.h"
 #include <G4Torus.hh>
 #include <cmath>
-#include <string>
 #include <limits>
+#include <string>
 
 using namespace std;
 
-class testTorus : public CppUnit::TestFixture
-{
-  CPPUNIT_TEST_SUITE( testTorus );
-  CPPUNIT_TEST( matched_g4_and_dd );
-  
+class testTorus : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testTorus);
+  CPPUNIT_TEST(matched_g4_and_dd);
+
   CPPUNIT_TEST_SUITE_END();
-  
+
 public:
-  
-  void matched_g4_and_dd( void );
+  void matched_g4_and_dd(void);
 };
 
-void
-testTorus::matched_g4_and_dd( void )
-{
-  double rMin = 10.*cm;
-  double rMax = 15.*cm;
-  double radius = 100.*cm;
-  double sPhi = 0.*deg;
-  double dPhi = 90.*deg;
-  string name( "fred1" );
-
-  G4Torus g4( name, rMin, rMax, radius, sPhi, dPhi );
-  DDI::Torus dd( rMin, rMax, radius, sPhi, dPhi );
-  DDTorus dds = DDSolidFactory::torus( name, rMin, rMax, radius, sPhi, dPhi );
+void testTorus::matched_g4_and_dd(void) {
+  double rMin = 10. * cm;
+  double rMax = 15. * cm;
+  double radius = 100. * cm;
+  double sPhi = 0. * deg;
+  double dPhi = 90. * deg;
+  string name("fred1");
+
+  G4Torus g4(name, rMin, rMax, radius, sPhi, dPhi);
+  DDI::Torus dd(rMin, rMax, radius, sPhi, dPhi);
+  DDTorus dds = DDSolidFactory::torus(name, rMin, rMax, radius, sPhi, dPhi);
   cout << endl;
   dd.stream(cout);
   cout << endl;
 
-  double g4v = g4.GetCubicVolume()/cm3;
-  double ddv = dd.volume()/cm3;
-  double ddsv = dds.volume()/cm3;
+  double g4v = g4.GetCubicVolume() / cm3;
+  double ddv = dd.volume() / cm3;
+  double ddsv = dds.volume() / cm3;
 
-  cout << "\tg4 volume = " << g4v <<" cm3" << endl;
-  cout << "\tdd volume = " << ddv << " cm3"<<  endl;
+  cout << "\tg4 volume = " << g4v << " cm3" << endl;
+  cout << "\tdd volume = " << ddv << " cm3" << endl;
   cout << "\tDD Information: " << dds << " vol= " << ddsv << " cm3" << endl;
 
-  CPPUNIT_ASSERT( abs(g4v - ddv) < numeric_limits<float>::epsilon());
-  CPPUNIT_ASSERT( abs(g4v - ddsv) < numeric_limits<float>::epsilon());
+  CPPUNIT_ASSERT(abs(g4v - ddv) < numeric_limits<float>::epsilon());
+  CPPUNIT_ASSERT(abs(g4v - ddsv) < numeric_limits<float>::epsilon());
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION( testTorus );
+CPPUNIT_TEST_SUITE_REGISTRATION(testTorus);
diff --git a/SimG4Core/Geometry/test/Trap_.cpp b/SimG4Core/Geometry/test/Trap_.cpp
index 0c4ffd639993b..99c676f7589f4 100644
--- a/SimG4Core/Geometry/test/Trap_.cpp
+++ b/SimG4Core/Geometry/test/Trap_.cpp
@@ -1,61 +1,59 @@
-#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
-#include "cppunit/extensions/HelperMacros.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/interface/DDSolidShapes.h"
 #include "DetectorDescription/Core/src/Trap.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
+#include "cppunit/extensions/HelperMacros.h"
 #include <G4Trap.hh>
 #include <cmath>
-#include <string>
 #include <limits>
+#include <string>
 
 using namespace std;
 
-class testTrap : public CppUnit::TestFixture
-{
-  CPPUNIT_TEST_SUITE( testTrap );
-  CPPUNIT_TEST( matched_g4_and_dd );
-  
+class testTrap : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testTrap);
+  CPPUNIT_TEST(matched_g4_and_dd);
+
   CPPUNIT_TEST_SUITE_END();
-  
+
 public:
-  
-  void matched_g4_and_dd( void );
+  void matched_g4_and_dd(void);
 };
 
-void
-testTrap::matched_g4_and_dd( void )
-{
-  double dz = 60.*cm;
-  double pTheta = 0.*deg;
-  double pPhi = 0.*deg;
-  double pDy1 = 30.*cm;
-  double pDx1 = 30.*cm;
-  double pDx2 = 30.*cm;
-  double pAlp1 = 0.*deg;
-  double pDy2 = 15.*cm;
-  double pDx3 = 10.*cm;
-  double pDx4 = 10.*cm;
-  double pAlp2 = 0.*deg;
-  string name( "fred1" );
-  // <Trapezoid name="E8CD" dz="17.35*cm" alp1="0*deg" bl1="10.5446*cm" tl1="10.5446*cm" h1="500*mum" alp2="0*deg" bl2="0.1*mum" tl2="0.1*mum" h2="500*mum" phi="180*deg" theta="16.90296*deg" />
-  G4Trap g4( name, dz, pTheta, pPhi, pDy1, pDx1, pDx2, pAlp1, pDy2, pDx3, pDx4, pAlp2 );
-  DDI::Trap dd(    dz, pTheta, pPhi, pDy1, pDx1, pDx2, pAlp1, pDy2, pDx3, pDx4, pAlp2 );
-  DDTrap dds = DDSolidFactory::trap( name, dz, pTheta, pPhi, pDy1, pDx1, pDx2, pAlp1, pDy2, pDx3, pDx4, pAlp2 );
+void testTrap::matched_g4_and_dd(void) {
+  double dz = 60. * cm;
+  double pTheta = 0. * deg;
+  double pPhi = 0. * deg;
+  double pDy1 = 30. * cm;
+  double pDx1 = 30. * cm;
+  double pDx2 = 30. * cm;
+  double pAlp1 = 0. * deg;
+  double pDy2 = 15. * cm;
+  double pDx3 = 10. * cm;
+  double pDx4 = 10. * cm;
+  double pAlp2 = 0. * deg;
+  string name("fred1");
+  // <Trapezoid name="E8CD" dz="17.35*cm" alp1="0*deg" bl1="10.5446*cm"
+  // tl1="10.5446*cm" h1="500*mum" alp2="0*deg" bl2="0.1*mum" tl2="0.1*mum"
+  // h2="500*mum" phi="180*deg" theta="16.90296*deg" />
+  G4Trap g4(name, dz, pTheta, pPhi, pDy1, pDx1, pDx2, pAlp1, pDy2, pDx3, pDx4, pAlp2);
+  DDI::Trap dd(dz, pTheta, pPhi, pDy1, pDx1, pDx2, pAlp1, pDy2, pDx3, pDx4, pAlp2);
+  DDTrap dds = DDSolidFactory::trap(name, dz, pTheta, pPhi, pDy1, pDx1, pDx2, pAlp1, pDy2, pDx3, pDx4, pAlp2);
   cout << endl;
-  dd.stream( cout );
+  dd.stream(cout);
   cout << endl;
 
-  double g4v = g4.GetCubicVolume()/cm3;
-  double ddv = dd.volume()/cm3;
-  double ddsv = dds.volume()/cm3;
-  
-  cout << "\tg4 volume = " << g4v <<" cm3" << endl;
-  cout << "\tdd volume = " << ddv << " cm3" <<  endl;
+  double g4v = g4.GetCubicVolume() / cm3;
+  double ddv = dd.volume() / cm3;
+  double ddsv = dds.volume() / cm3;
+
+  cout << "\tg4 volume = " << g4v << " cm3" << endl;
+  cout << "\tdd volume = " << ddv << " cm3" << endl;
   cout << "\tDD Information: " << dds << " vol=" << ddsv << " cm3" << endl;
-  
-  CPPUNIT_ASSERT( abs(g4v - ddv) < numeric_limits<float>::epsilon());
-  CPPUNIT_ASSERT( abs(g4v - ddsv) < numeric_limits<float>::epsilon());
+
+  CPPUNIT_ASSERT(abs(g4v - ddv) < numeric_limits<float>::epsilon());
+  CPPUNIT_ASSERT(abs(g4v - ddsv) < numeric_limits<float>::epsilon());
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION( testTrap );
+CPPUNIT_TEST_SUITE_REGISTRATION(testTrap);
diff --git a/SimG4Core/Geometry/test/TruncTubs_.cpp b/SimG4Core/Geometry/test/TruncTubs_.cpp
index 4cdfc0575d9a0..9f96a0f0e4252 100644
--- a/SimG4Core/Geometry/test/TruncTubs_.cpp
+++ b/SimG4Core/Geometry/test/TruncTubs_.cpp
@@ -1,62 +1,58 @@
-#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
-#include "cppunit/extensions/HelperMacros.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/interface/DDSolidShapes.h"
 #include "DetectorDescription/Core/src/TruncTubs.h"
 #include "SimG4Core/Geometry/interface/DDG4SolidConverter.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
+#include "cppunit/extensions/HelperMacros.h"
 #include <G4VSolid.hh>
 #include <cmath>
-#include <string>
 #include <limits>
+#include <string>
 
 using namespace std;
 
-class testTruncTubs : public CppUnit::TestFixture
-{
-  CPPUNIT_TEST_SUITE( testTruncTubs );
-  CPPUNIT_TEST( matched_g4_and_dd );
-  
+class testTruncTubs : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testTruncTubs);
+  CPPUNIT_TEST(matched_g4_and_dd);
+
   CPPUNIT_TEST_SUITE_END();
-  
+
 public:
-  
-  void matched_g4_and_dd( void );
+  void matched_g4_and_dd(void);
 };
 
-void
-testTruncTubs::matched_g4_and_dd( void )
-{
-  double zHalf = 50.0*cm;
-  double rIn = 20.0*cm;
-  double rOut = 40.0*cm;
-  double startPhi = 0.0*deg;
-  double deltaPhi = 90.0*deg;
-  double cutAtStart = 25.0*cm;
-  double cutAtDelta = 35.0*cm;
+void testTruncTubs::matched_g4_and_dd(void) {
+  double zHalf = 50.0 * cm;
+  double rIn = 20.0 * cm;
+  double rOut = 40.0 * cm;
+  double startPhi = 0.0 * deg;
+  double deltaPhi = 90.0 * deg;
+  double cutAtStart = 25.0 * cm;
+  double cutAtDelta = 35.0 * cm;
   bool cutInside = true;
-  string name( "fred1" );
+  string name("fred1");
 
-  DDI::TruncTubs dd( zHalf, rIn, rOut, startPhi, deltaPhi, cutAtStart, cutAtDelta, cutInside );
-  DDTruncTubs dds = DDSolidFactory::truncTubs( name, zHalf, rIn, rOut, startPhi, deltaPhi, cutAtStart, cutAtDelta, cutInside );
-  G4VSolid *g4 = DDG4SolidConverter::trunctubs( dds );
+  DDI::TruncTubs dd(zHalf, rIn, rOut, startPhi, deltaPhi, cutAtStart, cutAtDelta, cutInside);
+  DDTruncTubs dds =
+      DDSolidFactory::truncTubs(name, zHalf, rIn, rOut, startPhi, deltaPhi, cutAtStart, cutAtDelta, cutInside);
+  G4VSolid *g4 = DDG4SolidConverter::trunctubs(dds);
   cout << endl;
-  dd.stream( cout );
+  dd.stream(cout);
   cout << endl;
 
-  double g4v = g4->GetCubicVolume()/cm3;
-  double ddv = dd.volume()/cm3;
-  double ddsv = dds.volume()/cm3;
-  
-  cout << "\tg4 volume = " << g4v <<" cm3" << endl;
-  cout << "\tdd volume = " << ddv << " cm3" <<  endl;
+  double g4v = g4->GetCubicVolume() / cm3;
+  double ddv = dd.volume() / cm3;
+  double ddsv = dds.volume() / cm3;
+
+  cout << "\tg4 volume = " << g4v << " cm3" << endl;
+  cout << "\tdd volume = " << ddv << " cm3" << endl;
   cout << "\tDD Information: " << dds << " vol=" << ddsv << " cm3" << endl;
 
-  if( ddv > 0 )
-  {
-    CPPUNIT_ASSERT( abs(g4v - ddv) < numeric_limits<float>::epsilon());
-    CPPUNIT_ASSERT( abs(g4v - ddsv) < numeric_limits<float>::epsilon());
+  if (ddv > 0) {
+    CPPUNIT_ASSERT(abs(g4v - ddv) < numeric_limits<float>::epsilon());
+    CPPUNIT_ASSERT(abs(g4v - ddsv) < numeric_limits<float>::epsilon());
   }
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION( testTruncTubs );
+CPPUNIT_TEST_SUITE_REGISTRATION(testTruncTubs);
diff --git a/SimG4Core/Geometry/test/Tubs_.cpp b/SimG4Core/Geometry/test/Tubs_.cpp
index 960e934e47f93..84be40d26bf2f 100644
--- a/SimG4Core/Geometry/test/Tubs_.cpp
+++ b/SimG4Core/Geometry/test/Tubs_.cpp
@@ -1,55 +1,51 @@
-#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
-#include "cppunit/extensions/HelperMacros.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "DetectorDescription/Core/interface/DDSolid.h"
 #include "DetectorDescription/Core/interface/DDSolidShapes.h"
 #include "DetectorDescription/Core/src/Tubs.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "Utilities/Testing/interface/CppUnit_testdriver.icpp"
+#include "cppunit/extensions/HelperMacros.h"
 #include <G4Tubs.hh>
 #include <cmath>
-#include <string>
 #include <limits>
+#include <string>
 
 using namespace std;
 
-class testTubs : public CppUnit::TestFixture
-{
-  CPPUNIT_TEST_SUITE( testTubs );
-  CPPUNIT_TEST( matched_g4_and_dd );
-  
+class testTubs : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testTubs);
+  CPPUNIT_TEST(matched_g4_and_dd);
+
   CPPUNIT_TEST_SUITE_END();
-  
+
 public:
-  
-  void matched_g4_and_dd( void );
+  void matched_g4_and_dd(void);
 };
 
-void
-testTubs::matched_g4_and_dd( void )
-{
-  double rIn = 10.*cm;
-  double rOut = 15.*cm;
-  double zhalf = 20.*cm;
-  double startPhi = 0.*deg;
-  double deltaPhi = 90.*deg;
-  string name( "fred1" );
-
-  G4Tubs g4( name, rIn, rOut, zhalf, startPhi, deltaPhi );
-  DDI::Tubs dd( zhalf, rIn, rOut, startPhi, deltaPhi );
-  DDTubs dds = DDSolidFactory::tubs( name, zhalf, rIn, rOut, startPhi, deltaPhi );
+void testTubs::matched_g4_and_dd(void) {
+  double rIn = 10. * cm;
+  double rOut = 15. * cm;
+  double zhalf = 20. * cm;
+  double startPhi = 0. * deg;
+  double deltaPhi = 90. * deg;
+  string name("fred1");
+
+  G4Tubs g4(name, rIn, rOut, zhalf, startPhi, deltaPhi);
+  DDI::Tubs dd(zhalf, rIn, rOut, startPhi, deltaPhi);
+  DDTubs dds = DDSolidFactory::tubs(name, zhalf, rIn, rOut, startPhi, deltaPhi);
   cout << endl;
-  dd.stream( cout );
+  dd.stream(cout);
   cout << endl;
-  
-  double g4v = g4.GetCubicVolume()/cm3;
-  double ddv = dd.volume()/cm3;
-  double ddsv = dds.volume()/cm3;
-  
-  cout << "\tg4 volume = " << g4v <<" cm3" << endl;
-  cout << "\tdd volume = " << ddv << " cm3" <<  endl;
+
+  double g4v = g4.GetCubicVolume() / cm3;
+  double ddv = dd.volume() / cm3;
+  double ddsv = dds.volume() / cm3;
+
+  cout << "\tg4 volume = " << g4v << " cm3" << endl;
+  cout << "\tdd volume = " << ddv << " cm3" << endl;
   cout << "\tDD Information: " << dds << " vol=" << ddsv << " cm3" << endl;
 
-  CPPUNIT_ASSERT( abs(g4v - ddv) < numeric_limits<float>::epsilon());
-  CPPUNIT_ASSERT( abs(g4v - ddsv) < numeric_limits<float>::epsilon());
+  CPPUNIT_ASSERT(abs(g4v - ddv) < numeric_limits<float>::epsilon());
+  CPPUNIT_ASSERT(abs(g4v - ddsv) < numeric_limits<float>::epsilon());
 }
 
-CPPUNIT_TEST_SUITE_REGISTRATION( testTubs );
+CPPUNIT_TEST_SUITE_REGISTRATION(testTubs);
diff --git a/SimG4Core/Geometry/test/testVolumes.cpp b/SimG4Core/Geometry/test/testVolumes.cpp
index 34e9a1d6ed0bd..a9f5fbf766383 100644
--- a/SimG4Core/Geometry/test/testVolumes.cpp
+++ b/SimG4Core/Geometry/test/testVolumes.cpp
@@ -3,6 +3,7 @@
 
 #include <DetectorDescription/Core/src/Box.h>
 #include <DetectorDescription/Core/src/Cons.h>
+#include <DetectorDescription/Core/src/CutTubs.h>
 #include <DetectorDescription/Core/src/EllipticalTube.h>
 #include <DetectorDescription/Core/src/ExtrudedPolygon.h>
 #include <DetectorDescription/Core/src/Polycone.h>
@@ -11,14 +12,15 @@
 #include <DetectorDescription/Core/src/Torus.h>
 #include <DetectorDescription/Core/src/Trap.h>
 #include <DetectorDescription/Core/src/Tubs.h>
-#include <DetectorDescription/Core/src/CutTubs.h>
 
-#include <DataFormats/GeometryVector/interface/Pi.h>
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <DataFormats/GeometryVector/interface/Pi.h>
 #include <G4Box.hh>
 #include <G4Cons.hh>
+#include <G4CutTubs.hh>
 #include <G4Ellipsoid.hh>
 #include <G4EllipticalTube.hh>
+#include <G4ExtrudedSolid.hh>
 #include <G4Orb.hh>
 #include <G4Para.hh>
 #include <G4Polycone.hh>
@@ -28,8 +30,6 @@
 #include <G4Trap.hh>
 #include <G4Trd.hh>
 #include <G4Tubs.hh>
-#include <G4CutTubs.hh>
-#include <G4ExtrudedSolid.hh>
 #include <string>
 
 //
@@ -38,57 +38,52 @@
 // http://geant4.web.cern.ch/geant4/UserDocumentation/UsersGuides/ForApplicationDeveloper/html/ch04.html#sect.Geom.Solids
 //
 //
-// This test verifies convertion of the DDD solids to Geant4 Constructed Solid Geometry (CSG) Solids
+// This test verifies convertion of the DDD solids to Geant4 Constructed Solid
+// Geometry (CSG) Solids
 //
 
 //
 // 1. Box:
 //
-// G4Box(const G4String& pName,                         
+// G4Box(const G4String& pName,
 //       G4double  pX,
 //       G4double  pY,
 //       G4double  pZ)
-void
-doBox( const std::string& name, double xHalfLength, double yHalfLength, 
-       double zHalfLength )
-{
-  G4Box g4( name, xHalfLength, yHalfLength, zHalfLength );
-  DDI::Box dd( xHalfLength, yHalfLength, zHalfLength );
-  DDBox dds = DDSolidFactory::box( name, xHalfLength, yHalfLength, zHalfLength );
+void doBox(const std::string &name, double xHalfLength, double yHalfLength, double zHalfLength) {
+  G4Box g4(name, xHalfLength, yHalfLength, zHalfLength);
+  DDI::Box dd(xHalfLength, yHalfLength, zHalfLength);
+  DDBox dds = DDSolidFactory::box(name, xHalfLength, yHalfLength, zHalfLength);
   dd.stream(std::cout);
   std::cout << std::endl;
-  std::cout << "\tg4 volume = " << g4.GetCubicVolume()/cm3 <<" cm3" << std::endl;
-  std::cout << "\tdd volume = " << dd.volume()/cm3 << " cm3"<<  std::endl;
+  std::cout << "\tg4 volume = " << g4.GetCubicVolume() / cm3 << " cm3" << std::endl;
+  std::cout << "\tdd volume = " << dd.volume() / cm3 << " cm3" << std::endl;
   std::cout << "\tDD Information: " << dds << " vol= " << dds.volume() << std::endl;
 }
 
 //
 // 2. Cylindrical Section or Tube:
 //
-// G4Tubs(const G4String& pName,                        
+// G4Tubs(const G4String& pName,
 //        G4double  pRMin,
 //        G4double  pRMax,
 //        G4double  pDz,
 //        G4double  pSPhi,
 //        G4double  pDPhi)
-void
-doTubs( const std::string& name, double rIn, double rOut, 
-	double zhalf, double startPhi, double deltaPhi )
-{
-  G4Tubs g4( name, rIn, rOut, zhalf, startPhi, deltaPhi );
-  DDI::Tubs dd( zhalf, rIn, rOut, startPhi, deltaPhi );
-  DDTubs dds = DDSolidFactory::tubs( name, zhalf, rIn, rOut, startPhi, deltaPhi );
+void doTubs(const std::string &name, double rIn, double rOut, double zhalf, double startPhi, double deltaPhi) {
+  G4Tubs g4(name, rIn, rOut, zhalf, startPhi, deltaPhi);
+  DDI::Tubs dd(zhalf, rIn, rOut, startPhi, deltaPhi);
+  DDTubs dds = DDSolidFactory::tubs(name, zhalf, rIn, rOut, startPhi, deltaPhi);
   dd.stream(std::cout);
   std::cout << std::endl;
-  std::cout << "\tg4 volume = " << g4.GetCubicVolume()/cm3 <<" cm3" << std::endl;
-  std::cout << "\tdd volume = " << dd.volume()/cm3 << " cm3"<<  std::endl;
+  std::cout << "\tg4 volume = " << g4.GetCubicVolume() / cm3 << " cm3" << std::endl;
+  std::cout << "\tdd volume = " << dd.volume() / cm3 << " cm3" << std::endl;
   std::cout << "\tDD Information: " << dds << " vol= " << dds.volume() << std::endl;
 }
 
 //
 // 3. Cone or Conical section:
 //
-// G4Cons(const G4String& pName,                        
+// G4Cons(const G4String& pName,
 //        G4double  pRmin1,
 //        G4double  pRmax1,
 //        G4double  pRmin2,
@@ -96,138 +91,142 @@ doTubs( const std::string& name, double rIn, double rOut,
 //        G4double  pDz,
 //        G4double  pSPhi,
 //        G4double  pDPhi)
-void
-doCons( const std::string& name,
-	double rIn1, double rOut1,
-	double rIn2, double rOut2,
-	double zhalf, double startPhi, double deltaPhi )
-{
-  G4Cons g4( name, rIn1, rOut1, rIn2, rOut2, zhalf, startPhi, deltaPhi );
-  DDI::Cons dd( zhalf, rIn1, rOut1, rIn2, rOut2, startPhi, deltaPhi );
-  DDCons dds = DDSolidFactory::cons( name, zhalf, rIn1, rOut1, rIn2, rOut2, startPhi, deltaPhi );
+void doCons(const std::string &name,
+            double rIn1,
+            double rOut1,
+            double rIn2,
+            double rOut2,
+            double zhalf,
+            double startPhi,
+            double deltaPhi) {
+  G4Cons g4(name, rIn1, rOut1, rIn2, rOut2, zhalf, startPhi, deltaPhi);
+  DDI::Cons dd(zhalf, rIn1, rOut1, rIn2, rOut2, startPhi, deltaPhi);
+  DDCons dds = DDSolidFactory::cons(name, zhalf, rIn1, rOut1, rIn2, rOut2, startPhi, deltaPhi);
   dd.stream(std::cout);
   std::cout << std::endl;
-  std::cout << "\tg4 volume = " << g4.GetCubicVolume()/cm3 <<" cm3" << std::endl;
-  std::cout << "\tdd volume = " << dd.volume()/cm3 << " cm3"<<  std::endl;
+  std::cout << "\tg4 volume = " << g4.GetCubicVolume() / cm3 << " cm3" << std::endl;
+  std::cout << "\tdd volume = " << dd.volume() / cm3 << " cm3" << std::endl;
   std::cout << "\tDD Information: " << dds << " vol= " << dds.volume() << std::endl;
 }
 
 //
 // 5. Trapezoid:
 //
-// G4Trd(const G4String& pName,                            
+// G4Trd(const G4String& pName,
 //       G4double  dx1,
 //       G4double  dx2,
 //       G4double  dy1,
 //       G4double  dy2,
 //       G4double  dz)
-void
-doTrd( const std::string& name, double dx1, double dx2, 
-       double dy1, double dy2, double dz )
-{
-  G4Trd g4( name, dx1, dx2, dy1, dy2, dz );
+void doTrd(const std::string &name, double dx1, double dx2, double dy1, double dy2, double dz) {
+  G4Trd g4(name, dx1, dx2, dy1, dy2, dz);
   /////////////////////////////////////////
   // DDD does not have direct implementation of Trd.
   // Use generic trapezoid instead.
-  DDI::Trap dd( dz,  0.0 /* pTheta */, 0.0 /* pPhi */,
-		dy1, dx1, dx1, 0.0 /* pAlp1 */,
-		dy2, dx2, dx2, 0.0 /* pAlp2 */);
-  DDTrap dds = DDSolidFactory::trap( name, dz, 0.0 /* pTheta */, 0.0 /* pPhi */,
-				     dy1, dx1, dx1, 0.0 /* pAlp1 */,
-				     dy2, dx2, dx2, 0.0 /* pAlp2 */);
-  dd.stream( std::cout );
+  DDI::Trap dd(dz, 0.0 /* pTheta */, 0.0 /* pPhi */, dy1, dx1, dx1, 0.0 /* pAlp1 */, dy2, dx2, dx2, 0.0 /* pAlp2 */);
+  DDTrap dds = DDSolidFactory::trap(
+      name, dz, 0.0 /* pTheta */, 0.0 /* pPhi */, dy1, dx1, dx1, 0.0 /* pAlp1 */, dy2, dx2, dx2, 0.0 /* pAlp2 */);
+  dd.stream(std::cout);
   std::cout << std::endl;
-  std::cout << "\tg4 volume = " << g4.GetCubicVolume()/cm3 <<" cm3" << std::endl;
-  std::cout << "\tdd volume = " << dd.volume()/cm3 << " cm3"<<  std::endl;
+  std::cout << "\tg4 volume = " << g4.GetCubicVolume() / cm3 << " cm3" << std::endl;
+  std::cout << "\tdd volume = " << dd.volume() / cm3 << " cm3" << std::endl;
   std::cout << "\tDD Information: " << dds << " vol= " << dds.volume() << std::endl;
 }
 
 //
 // 6. Generic Trapezoid:
 //
-// G4Trap(const G4String& pName,                        
+// G4Trap(const G4String& pName,
 //        G4double   pZ,
 //        G4double   pY,
 //        G4double   pX,
 //        G4double   pLTX)
 //
-// G4Trap(const G4String& pName,                         
+// G4Trap(const G4String& pName,
 //        G4double   pDz,   G4double   pTheta,
 //        G4double   pPhi,  G4double   pDy1,
 //        G4double   pDx1,  G4double   pDx2,
 //        G4double   pAlp1, G4double   pDy2,
 //        G4double   pDx3,  G4double   pDx4,
 //        G4double   pAlp2)
-void
-doTrap( const std::string& name, double dz, double pTheta, double pPhi,
-	double pDy1, double pDx1, double pDx2, double pAlp1,
-	double pDy2, double pDx3, double pDx4, double pAlp2 )
-{
-  G4Trap g4( name, dz, pTheta, pPhi, pDy1, pDx1, pDx2, pAlp1, pDy2, pDx3, pDx4, pAlp2 );
-  
+void doTrap(const std::string &name,
+            double dz,
+            double pTheta,
+            double pPhi,
+            double pDy1,
+            double pDx1,
+            double pDx2,
+            double pAlp1,
+            double pDy2,
+            double pDx3,
+            double pDx4,
+            double pAlp2) {
+  G4Trap g4(name, dz, pTheta, pPhi, pDy1, pDx1, pDx2, pAlp1, pDy2, pDx3, pDx4, pAlp2);
+
   // Note, the order of parameters is different:
-  DDI::Trap dd( dz, pTheta, pPhi, pDy2, pDx3, pDx4, pAlp1, pDy1, pDx1, pDx2, pAlp2 );
-  DDTrap dds = DDSolidFactory::trap( name, dz, pTheta, pPhi, pDy2, pDx3, pDx4, pAlp1, pDy1, pDx1, pDx2, pAlp2 );
-  dd.stream( std::cout );
+  DDI::Trap dd(dz, pTheta, pPhi, pDy2, pDx3, pDx4, pAlp1, pDy1, pDx1, pDx2, pAlp2);
+  DDTrap dds = DDSolidFactory::trap(name, dz, pTheta, pPhi, pDy2, pDx3, pDx4, pAlp1, pDy1, pDx1, pDx2, pAlp2);
+  dd.stream(std::cout);
   std::cout << std::endl;
-  std::cout << "\tg4 volume = " << g4.GetCubicVolume()/cm3 <<" cm3" << std::endl;
-  std::cout << "\tdd volume = " << dd.volume()/cm3 << " cm3"<<  std::endl;
+  std::cout << "\tg4 volume = " << g4.GetCubicVolume() / cm3 << " cm3" << std::endl;
+  std::cout << "\tdd volume = " << dd.volume() / cm3 << " cm3" << std::endl;
   std::cout << "\tDD Information: " << dds << " vol= " << dds.volume() << std::endl;
 }
 
 //
 // 7. Sphere or Spherical Shell Section:
 //
-// G4Sphere(const G4String& pName,                      
+// G4Sphere(const G4String& pName,
 // 	    G4double   pRmin,
 // 	    G4double   pRmax,
 // 	    G4double   pSPhi,
 // 	    G4double   pDPhi,
 // 	    G4double   pSTheta,
 // 	    G4double   pDTheta )
-void
-doSphere( const std::string& name, double innerRadius, double outerRadius, 
-	  double startPhi, double deltaPhi, double startTheta, double deltaTheta )
-{  
-  G4Sphere g4(name,innerRadius, outerRadius, startPhi, deltaPhi, startTheta, deltaTheta);
+void doSphere(const std::string &name,
+              double innerRadius,
+              double outerRadius,
+              double startPhi,
+              double deltaPhi,
+              double startTheta,
+              double deltaTheta) {
+  G4Sphere g4(name, innerRadius, outerRadius, startPhi, deltaPhi, startTheta, deltaTheta);
   DDI::Sphere dd(innerRadius, outerRadius, startPhi, deltaPhi, startTheta, deltaTheta);
   DDSphere dds = DDSolidFactory::sphere(name, innerRadius, outerRadius, startPhi, deltaPhi, startTheta, deltaTheta);
   dd.stream(std::cout);
   std::cout << std::endl;
-  std::cout << "\tg4 volume = " << g4.GetCubicVolume()/cm3 <<" cm3" << std::endl;
-  std::cout << "\tdd volume = " << dd.volume()/cm3 << " cm3"<<  std::endl;
+  std::cout << "\tg4 volume = " << g4.GetCubicVolume() / cm3 << " cm3" << std::endl;
+  std::cout << "\tdd volume = " << dd.volume() / cm3 << " cm3" << std::endl;
   std::cout << "\tDD Information: " << dds << " vol= " << dds.volume() << std::endl;
 }
 
 //
 // 9. Torus:
 //
-// G4Torus(const G4String& pName,                       
+// G4Torus(const G4String& pName,
 // 	   G4double   pRmin,
 // 	   G4double   pRmax,
 // 	   G4double   pRtor,
 // 	   G4double   pSPhi,
 // 	   G4double   pDPhi)
-void
-doTorus( const std::string& name, double rMin, double rMax, double radius, double sPhi, double dPhi )
-{  
-  G4Torus g4( name, rMin, rMax, radius, sPhi, dPhi );
-  DDI::Torus dd( rMin, rMax, radius, sPhi, dPhi );
-  DDTorus dds = DDSolidFactory::torus( name, rMin, rMax, radius, sPhi, dPhi );
+void doTorus(const std::string &name, double rMin, double rMax, double radius, double sPhi, double dPhi) {
+  G4Torus g4(name, rMin, rMax, radius, sPhi, dPhi);
+  DDI::Torus dd(rMin, rMax, radius, sPhi, dPhi);
+  DDTorus dds = DDSolidFactory::torus(name, rMin, rMax, radius, sPhi, dPhi);
   dd.stream(std::cout);
   std::cout << std::endl;
-  std::cout << "\tg4 volume = " << g4.GetCubicVolume()/cm3 <<" cm3" << std::endl;
-  std::cout << "\tdd volume = " << dd.volume()/cm3 << " cm3"<<  std::endl;
+  std::cout << "\tg4 volume = " << g4.GetCubicVolume() / cm3 << " cm3" << std::endl;
+  std::cout << "\tdd volume = " << dd.volume() / cm3 << " cm3" << std::endl;
   std::cout << "\tDD Information: " << dds << " vol= " << dds.volume() << std::endl;
 }
 
 // Specific CSG Solids
 //
 
-// 
+//
 // 10. Polycons:
 //
-// G4Polycone(const G4String& pName,                    
+// G4Polycone(const G4String& pName,
 // 	   G4double   phiStart,
 // 	   G4double   phiTotal,
 // 	   G4int      numZPlanes,
@@ -235,53 +234,52 @@ doTorus( const std::string& name, double rMin, double rMax, double radius, doubl
 // 	   const G4double   rInner[],
 // 	   const G4double   rOuter[])
 //
-// G4Polycone(const G4String& pName,                      
+// G4Polycone(const G4String& pName,
 // 	   G4double   phiStart,
 // 	   G4double   phiTotal,
 // 	   G4int      numRZ,
 // 	   const G4double  r[],
 // 	   const G4double  z[])
-void
-doPolycone1( const std::string& name, double phiStart, double phiTotal,
-	     const std::vector<double> & z,
-	     const std::vector<double> & rInner,
-	     const std::vector<double> & rOuter )
-{  
-  G4Polycone g4( name, phiStart, phiTotal, z.size(), &z[0], &rInner[0], &rOuter[0] );
-  DDI::Polycone dd( phiStart, phiTotal, z, rInner, rOuter );
-  DDPolycone dds = DDSolidFactory::polycone( name, phiStart, phiTotal, z, rInner, rOuter );
+void doPolycone1(const std::string &name,
+                 double phiStart,
+                 double phiTotal,
+                 const std::vector<double> &z,
+                 const std::vector<double> &rInner,
+                 const std::vector<double> &rOuter) {
+  G4Polycone g4(name, phiStart, phiTotal, z.size(), &z[0], &rInner[0], &rOuter[0]);
+  DDI::Polycone dd(phiStart, phiTotal, z, rInner, rOuter);
+  DDPolycone dds = DDSolidFactory::polycone(name, phiStart, phiTotal, z, rInner, rOuter);
   dd.stream(std::cout);
   std::cout << std::endl;
-  std::cout << "\tg4 volume = " << g4.GetCubicVolume()/cm3 <<" cm3" << std::endl;
-  std::cout << "\tdd volume = " << dd.volume()/cm3 << " cm3"<<  std::endl;
+  std::cout << "\tg4 volume = " << g4.GetCubicVolume() / cm3 << " cm3" << std::endl;
+  std::cout << "\tdd volume = " << dd.volume() / cm3 << " cm3" << std::endl;
   std::cout << "\tDD Information: " << dds << " vol= " << dds.volume() << std::endl;
 }
 
-void
-doPolycone2( const std::string& name, double phiStart, double phiTotal,
-	     const std::vector<double> & z,
-	     const std::vector<double> & r )
-{  
-  std::cout << "### doPolycone_RZ: " << "phi1=" << phiStart/deg 
-  	    << " phi2=" << phiTotal/deg 
-  	    << " N= " << z.size() << std::endl;
-  for(size_t i=0; i<z.size(); ++i) { 
+void doPolycone2(const std::string &name,
+                 double phiStart,
+                 double phiTotal,
+                 const std::vector<double> &z,
+                 const std::vector<double> &r) {
+  std::cout << "### doPolycone_RZ: "
+            << "phi1=" << phiStart / deg << " phi2=" << phiTotal / deg << " N= " << z.size() << std::endl;
+  for (size_t i = 0; i < z.size(); ++i) {
     std::cout << " R= " << r[i] << " Z= " << z[i] << std::endl;
   }
-  G4Polycone g4( name, phiStart, phiTotal, z.size(), &r[0], &z[0] );
-  DDI::Polycone dd( phiStart, phiTotal, z, r );
-  DDPolycone dds = DDSolidFactory::polycone( name, phiStart, phiTotal, z, r );
+  G4Polycone g4(name, phiStart, phiTotal, z.size(), &r[0], &z[0]);
+  DDI::Polycone dd(phiStart, phiTotal, z, r);
+  DDPolycone dds = DDSolidFactory::polycone(name, phiStart, phiTotal, z, r);
   dd.stream(std::cout);
   std::cout << std::endl;
-  std::cout << "\tg4 volume = " << g4.GetCubicVolume()/cm3 <<" cm3" << std::endl;
-  std::cout << "\tdd volume = " << dd.volume()/cm3 << " cm3"<<  std::endl;
+  std::cout << "\tg4 volume = " << g4.GetCubicVolume() / cm3 << " cm3" << std::endl;
+  std::cout << "\tdd volume = " << dd.volume() / cm3 << " cm3" << std::endl;
   std::cout << "\tDD Information: " << dds << " vol= " << dds.volume() << std::endl;
 }
 
 //
 // 11. Polyhedra (PGON):
 //
-// G4Polyhedra(const G4String& pName,                   
+// G4Polyhedra(const G4String& pName,
 // 	    G4double  phiStart,
 // 	    G4double  phiTotal,
 // 	    G4int     numSide,
@@ -297,55 +295,55 @@ doPolycone2( const std::string& name, double phiStart, double phiTotal,
 // 	    G4int     numRZ,
 // 	    const G4double  r[],
 // 	    const G4double  z[] )
-void
-doPolyhedra1( const std::string& name, int sides, double phiStart, double phiTotal,
-	      const std::vector<double> & z,
-	      const std::vector<double> & rInner,
-	      const std::vector<double> & rOuter )
-{  
-  G4Polyhedra g4( name, phiStart, phiTotal, sides, z.size(), &z[0], &rInner[0], &rOuter[0] );
-  DDI::Polyhedra dd( sides, phiStart, phiTotal, z, rInner, rOuter );
-  DDPolyhedra dds = DDSolidFactory::polyhedra( name, sides, phiStart, phiTotal, z, rInner, rOuter );
+void doPolyhedra1(const std::string &name,
+                  int sides,
+                  double phiStart,
+                  double phiTotal,
+                  const std::vector<double> &z,
+                  const std::vector<double> &rInner,
+                  const std::vector<double> &rOuter) {
+  G4Polyhedra g4(name, phiStart, phiTotal, sides, z.size(), &z[0], &rInner[0], &rOuter[0]);
+  DDI::Polyhedra dd(sides, phiStart, phiTotal, z, rInner, rOuter);
+  DDPolyhedra dds = DDSolidFactory::polyhedra(name, sides, phiStart, phiTotal, z, rInner, rOuter);
   dd.stream(std::cout);
   std::cout << std::endl;
-  std::cout << "\tg4 volume = " << g4.GetCubicVolume()/cm3 <<" cm3" << std::endl;
-  std::cout << "\tdd volume = " << dd.volume()/cm3 << " cm3"<<  std::endl;
+  std::cout << "\tg4 volume = " << g4.GetCubicVolume() / cm3 << " cm3" << std::endl;
+  std::cout << "\tdd volume = " << dd.volume() / cm3 << " cm3" << std::endl;
   std::cout << "\tDD Information: " << dds << " vol= " << dds.volume() << std::endl;
 }
 
-void
-doPolyhedra2( const std::string& name, int sides, double phiStart, double phiTotal,
-	      const std::vector<double> & z,
-	      const std::vector<double> & r )
-{  
-  G4Polyhedra g4( name, phiStart, phiTotal, sides, z.size(), &r[0], &z[0] );
-  DDI::Polyhedra dd( sides, phiStart, phiTotal, z, r );
-  DDPolyhedra dds = DDSolidFactory::polyhedra( name, sides, phiStart, phiTotal, z, r );
+void doPolyhedra2(const std::string &name,
+                  int sides,
+                  double phiStart,
+                  double phiTotal,
+                  const std::vector<double> &z,
+                  const std::vector<double> &r) {
+  G4Polyhedra g4(name, phiStart, phiTotal, sides, z.size(), &r[0], &z[0]);
+  DDI::Polyhedra dd(sides, phiStart, phiTotal, z, r);
+  DDPolyhedra dds = DDSolidFactory::polyhedra(name, sides, phiStart, phiTotal, z, r);
   dd.stream(std::cout);
   std::cout << std::endl;
-  std::cout << "\tg4 volume = " << g4.GetCubicVolume()/cm3 <<" cm3" << std::endl;
-  std::cout << "\tdd volume = " << dd.volume()/cm3 << " cm3"<<  std::endl;
+  std::cout << "\tg4 volume = " << g4.GetCubicVolume() / cm3 << " cm3" << std::endl;
+  std::cout << "\tdd volume = " << dd.volume() / cm3 << " cm3" << std::endl;
   std::cout << "\tDD Information: " << dds << " vol= " << dds.volume() << std::endl;
 }
 
 //
 // 12. Tube with an elliptical cross section:
 //
-// G4EllipticalTube(const G4String& pName,                   
+// G4EllipticalTube(const G4String& pName,
 // 		 G4double  Dx,
 // 		 G4double  Dy,
 // 		 G4double  Dz)
-void
-doEllipticalTube( const std::string& name, double xSemiaxis, double ySemiAxis, double zHeight )
-{  
-  G4EllipticalTube g4t( name, xSemiaxis, ySemiAxis, zHeight );
-  DDI::EllipticalTube ddt( xSemiaxis, ySemiAxis, zHeight );
-  DDEllipticalTube ddet = DDSolidFactory::ellipticalTube( name, xSemiaxis, ySemiAxis, zHeight );
-  ddt.stream( std::cout );
+void doEllipticalTube(const std::string &name, double xSemiaxis, double ySemiAxis, double zHeight) {
+  G4EllipticalTube g4t(name, xSemiaxis, ySemiAxis, zHeight);
+  DDI::EllipticalTube ddt(xSemiaxis, ySemiAxis, zHeight);
+  DDEllipticalTube ddet = DDSolidFactory::ellipticalTube(name, xSemiaxis, ySemiAxis, zHeight);
+  ddt.stream(std::cout);
   std::cout << std::endl;
-  std::cout << "\tg4 volume = " << g4t.GetCubicVolume() / cm3 <<" cm3" << std::endl;
-  std::cout << "\tdd volume = " << ddt.volume() / cm3 << " cm3"<<  std::endl;
-  std::cout << "\tcalc volume = " << 2 * zHeight * Geom::pi() * ySemiAxis*xSemiaxis / cm3 << " cm3 " <<std::endl;
+  std::cout << "\tg4 volume = " << g4t.GetCubicVolume() / cm3 << " cm3" << std::endl;
+  std::cout << "\tdd volume = " << ddt.volume() / cm3 << " cm3" << std::endl;
+  std::cout << "\tcalc volume = " << 2 * zHeight * Geom::pi() * ySemiAxis * xSemiaxis / cm3 << " cm3 " << std::endl;
   std::cout << "\tDD Information: ";
   std::cout << ddet << " vol= " << ddet.volume() << std::endl;
 }
@@ -353,7 +351,7 @@ doEllipticalTube( const std::string& name, double xSemiaxis, double ySemiAxis, d
 //
 // 14. Cone with Elliptical Cross Section:
 //
-// G4EllipticalCone(const G4String& pName,              
+// G4EllipticalCone(const G4String& pName,
 // 		 G4double  pxSemiAxis,
 // 		 G4double  pySemiAxis,
 // 		 G4double  zMax,
@@ -362,7 +360,7 @@ doEllipticalTube( const std::string& name, double xSemiaxis, double ySemiAxis, d
 //
 // 15. Paraboloid, a solid with parabolic profile:
 //
-// G4Paraboloid(const G4String& pName,                   
+// G4Paraboloid(const G4String& pName,
 // 	     G4double  Dz,
 // 	     G4double  R1,
 // 	     G4double  R2)
@@ -370,7 +368,7 @@ doEllipticalTube( const std::string& name, double xSemiaxis, double ySemiAxis, d
 //
 // 16. Tube with Hyperbolic Profile:
 //
-// G4Hype(const G4String& pName,                        
+// G4Hype(const G4String& pName,
 //        G4double  innerRadius,
 //        G4double  outerRadius,
 //        G4double  innerStereo,
@@ -380,7 +378,7 @@ doEllipticalTube( const std::string& name, double xSemiaxis, double ySemiAxis, d
 //
 // 17. Tetrahedra:
 //
-// G4Tet(const G4String& pName,                         
+// G4Tet(const G4String& pName,
 //       G4ThreeVector  anchor,
 //       G4ThreeVector  p2,
 //       G4ThreeVector  p3,
@@ -403,7 +401,7 @@ doEllipticalTube( const std::string& name, double xSemiaxis, double ySemiAxis, d
 //
 // 19. Box Twisted:
 //
-// G4TwistedBox(const G4String& pName,                  
+// G4TwistedBox(const G4String& pName,
 // 	     G4double  twistedangle,
 // 	     G4double  pDx,
 // 	     G4double  pDy,
@@ -412,30 +410,30 @@ doEllipticalTube( const std::string& name, double xSemiaxis, double ySemiAxis, d
 //
 // 20. Trapezoid Twisted along One Axis:
 //
-// G4TwistedTrap(const G4String& pName,                 
+// G4TwistedTrap(const G4String& pName,
 // 	      G4double  twistedangle,
-// 	      G4double  pDxx1, 
+// 	      G4double  pDxx1,
 // 	      G4double  pDxx2,
-// 	      G4double  pDy, 
+// 	      G4double  pDy,
 // 	      G4double   pDz)
-//  
+//
 // G4TwistedTrap(const G4String& pName,
 // 	      G4double  twistedangle,
 // 	      G4double  pDz,
-// 	      G4double  pTheta, 
+// 	      G4double  pTheta,
 // 	      G4double  pPhi,
-// 	      G4double  pDy1, 
+// 	      G4double  pDy1,
 // 	      G4double  pDx1,
-// 	      G4double  pDx2, 
+// 	      G4double  pDx2,
 // 	      G4double  pDy2,
-// 	      G4double  pDx3, 
+// 	      G4double  pDx3,
 // 	      G4double  pDx4,
 // 	      G4double  pAlph)
 
 //
 // 21. Twisted Trapezoid with x and y dimensions varying along z:
 //
-// G4TwistedTrd(const G4String& pName,                  
+// G4TwistedTrd(const G4String& pName,
 // 	     G4double  pDx1,
 // 	     G4double  pDx2,
 // 	     G4double  pDy1,
@@ -446,14 +444,14 @@ doEllipticalTube( const std::string& name, double xSemiaxis, double ySemiAxis, d
 //
 // 22. Generic trapezoid with optionally collapsing vertices:
 //
-// G4GenericTrap(const G4String& pName,                  
+// G4GenericTrap(const G4String& pName,
 // 	      G4double  pDz,
 // 	      const std::vector<G4TwoVector>& vertices)
 
 //
-// 23. Tube Section Twisted along Its Axis: 
-// 
-// G4TwistedTubs(const G4String& pName,                 
+// 23. Tube Section Twisted along Its Axis:
+//
+// G4TwistedTubs(const G4String& pName,
 // 	      G4double  twistedangle,
 // 	      G4double  endinnerrad,
 // 	      G4double  endouterrad,
@@ -463,7 +461,7 @@ doEllipticalTube( const std::string& name, double xSemiaxis, double ySemiAxis, d
 //
 // 24. Cylindrical Cut Section or Cut Tube:
 //
-// G4CutTubs(const G4String& pName,                        
+// G4CutTubs(const G4String& pName,
 //           G4double  pRMin,
 //           G4double  pRMax,
 //           G4double  pDz,
@@ -471,24 +469,40 @@ doEllipticalTube( const std::string& name, double xSemiaxis, double ySemiAxis, d
 //           G4double  pDPhi,
 //           G4ThreeVector pLowNorm,
 //           G4ThreeVector pHighNorm)
-void
-doCutTubs( const std::string& name, double rIn, double rOut, 
-	   double zhalf, double startPhi, double deltaPhi,
-	   std::array<double, 3> lowNorm, std::array<double, 3> highNorm )
-{
-  G4CutTubs g4( name, rIn, rOut, zhalf, startPhi, deltaPhi,
-		G4ThreeVector( lowNorm[0], lowNorm[1], lowNorm[2]),
-		G4ThreeVector( highNorm[0], highNorm[1], highNorm[2]));
-  DDI::CutTubs dd( zhalf, rIn, rOut, startPhi, deltaPhi,
-		   lowNorm[0], lowNorm[1], lowNorm[2],
-		   highNorm[0], highNorm[1], highNorm[2] );
-  DDCutTubs dds = DDSolidFactory::cuttubs( name, zhalf, rIn, rOut, startPhi, deltaPhi,
-					   lowNorm[0], lowNorm[1], lowNorm[2],
-					   highNorm[0], highNorm[1], highNorm[2] );
+void doCutTubs(const std::string &name,
+               double rIn,
+               double rOut,
+               double zhalf,
+               double startPhi,
+               double deltaPhi,
+               std::array<double, 3> lowNorm,
+               std::array<double, 3> highNorm) {
+  G4CutTubs g4(name,
+               rIn,
+               rOut,
+               zhalf,
+               startPhi,
+               deltaPhi,
+               G4ThreeVector(lowNorm[0], lowNorm[1], lowNorm[2]),
+               G4ThreeVector(highNorm[0], highNorm[1], highNorm[2]));
+  DDI::CutTubs dd(
+      zhalf, rIn, rOut, startPhi, deltaPhi, lowNorm[0], lowNorm[1], lowNorm[2], highNorm[0], highNorm[1], highNorm[2]);
+  DDCutTubs dds = DDSolidFactory::cuttubs(name,
+                                          zhalf,
+                                          rIn,
+                                          rOut,
+                                          startPhi,
+                                          deltaPhi,
+                                          lowNorm[0],
+                                          lowNorm[1],
+                                          lowNorm[2],
+                                          highNorm[0],
+                                          highNorm[1],
+                                          highNorm[2]);
   dd.stream(std::cout);
   std::cout << std::endl;
-  std::cout << "\tg4 volume = " << g4.GetCubicVolume()/cm3 <<" cm3" << std::endl;
-  std::cout << "\tdd volume = " << dd.volume()/cm3 << " cm3"<<  std::endl;
+  std::cout << "\tg4 volume = " << g4.GetCubicVolume() / cm3 << " cm3" << std::endl;
+  std::cout << "\tdd volume = " << dd.volume() / cm3 << " cm3" << std::endl;
   std::cout << "\tDD Information: " << dds << " vol= " << dds.volume() << std::endl;
 }
 
@@ -503,251 +517,254 @@ doCutTubs( const std::string& name, double rIn, double rOut,
 //                    std::vector<G4TwoVector> polygon,
 //                    std::vector<ZSection> zsections)
 //
-void
-doExtrudedPgon( const std::string& name, const std::vector<double> x,
-		const std::vector<double> y, const std::vector<double> z,
-		const std::vector<double> zx, const std::vector<double> zy,
-		const std::vector<double> zscale )
-{
+void doExtrudedPgon(const std::string &name,
+                    const std::vector<double> x,
+                    const std::vector<double> y,
+                    const std::vector<double> z,
+                    const std::vector<double> zx,
+                    const std::vector<double> zy,
+                    const std::vector<double> zscale) {
   std::vector<G4TwoVector> polygon;
   std::vector<G4ExtrudedSolid::ZSection> zsections;
-  for( unsigned int it = 0; it < x.size(); ++it )
-    polygon.emplace_back( x[it], y[it] );
-  for( unsigned int it = 0; it < z.size(); ++it )
-    zsections.emplace_back( z[it], G4TwoVector(zx[it], zy[it]), zscale[it] );
-  G4ExtrudedSolid g4( name, polygon, zsections );
-  DDI::ExtrudedPolygon dd( x, y, z, zx, zy, zscale );
-  DDExtrudedPolygon dds = DDSolidFactory::extrudedpolygon( name,  x, y, z, zx, zy, zscale );
+  for (unsigned int it = 0; it < x.size(); ++it)
+    polygon.emplace_back(x[it], y[it]);
+  for (unsigned int it = 0; it < z.size(); ++it)
+    zsections.emplace_back(z[it], G4TwoVector(zx[it], zy[it]), zscale[it]);
+  G4ExtrudedSolid g4(name, polygon, zsections);
+  DDI::ExtrudedPolygon dd(x, y, z, zx, zy, zscale);
+  DDExtrudedPolygon dds = DDSolidFactory::extrudedpolygon(name, x, y, z, zx, zy, zscale);
 
   dd.stream(std::cout);
   std::cout << std::endl;
-  std::cout << "\tg4 volume = " << g4.GetCubicVolume()/cm3 <<" cm3" << std::endl;
-  std::cout << "\tdd volume = " << dd.volume()/cm3 << " cm3"<<  std::endl;
+  std::cout << "\tg4 volume = " << g4.GetCubicVolume() / cm3 << " cm3" << std::endl;
+  std::cout << "\tdd volume = " << dd.volume() / cm3 << " cm3" << std::endl;
   std::cout << "\tDD Information: " << dds << " vol= " << dds.volume() << std::endl;
 }
 
-int
-main( int argc, char *argv[] )
-{
-  double xSemiaxis(2.*cm);
-  double ySemiAxis(2.*cm);
-  double zHeight(2.*cm);
+int main(int argc, char *argv[]) {
+  double xSemiaxis(2. * cm);
+  double ySemiAxis(2. * cm);
+  double zHeight(2. * cm);
   std::string name("fred1");
 
-//
-// 1. Box:
-//
+  //
+  // 1. Box:
+  //
   std::cout << "\n\nBox tests\n" << std::endl;
-  doBox( name, xSemiaxis, ySemiAxis, zHeight );
+  doBox(name, xSemiaxis, ySemiAxis, zHeight);
   std::cout << std::endl;
-  
-//
-// 2. Cylindrical Section or Tube:
-//
+
+  //
+  // 2. Cylindrical Section or Tube:
+  //
   std::cout << "\n\nTub tests\n" << std::endl;
-  double rIn = 10.*cm;
-  double rOut = 15.*cm;
-  double zhalf = 20.*cm;
-  double startPhi = 0.*deg;
-  double deltaPhi = 90.*deg;
-  doTubs( name, rIn, rOut, zhalf, startPhi, deltaPhi );
+  double rIn = 10. * cm;
+  double rOut = 15. * cm;
+  double zhalf = 20. * cm;
+  double startPhi = 0. * deg;
+  double deltaPhi = 90. * deg;
+  doTubs(name, rIn, rOut, zhalf, startPhi, deltaPhi);
   std::cout << std::endl;
 
-//
-// 3. Cone or Conical section:
-//
+  //
+  // 3. Cone or Conical section:
+  //
   std::cout << "\n\nCons tests\n" << std::endl;
-  double rIn2 = 20.*cm;
-  double rOut2 = 25.*cm;
-  doCons( name, rIn, rOut, rIn2, rOut2, zhalf, startPhi, deltaPhi );
+  double rIn2 = 20. * cm;
+  double rOut2 = 25. * cm;
+  doCons(name, rIn, rOut, rIn2, rOut2, zhalf, startPhi, deltaPhi);
   std::cout << std::endl;
 
-//
-// 5. Trapezoid:
-//
+  //
+  // 5. Trapezoid:
+  //
   std::cout << "\n\nTrapezoid tests\n" << std::endl;
-  double dx1 = 10.*cm;
-  double dx2 = 30.*cm;
-  double dy1 = 15.*cm;
-  double dy2 = 30.*cm;
-  double dz = 60.*cm;
-  doTrd( name, dx1, dx2, dy1, dy2, dz );
+  double dx1 = 10. * cm;
+  double dx2 = 30. * cm;
+  double dy1 = 15. * cm;
+  double dy2 = 30. * cm;
+  double dz = 60. * cm;
+  doTrd(name, dx1, dx2, dy1, dy2, dz);
   std::cout << std::endl;
 
-//
-// 6. Generic Trapezoid:
-//
+  //
+  // 6. Generic Trapezoid:
+  //
   std::cout << "\n\nGeneric Trapezoid tests\n" << std::endl;
-  double pTheta = 0.*deg;
-  double pPhi = 0.*deg;
-  double pDy1 = 30.*cm;
-  double pDx1 = 30.*cm;
-  double pDx2 = 30.*cm;
-  double pAlp1 = 0.*deg;
-  double pDy2 = 15.*cm;
-  double pDx3 = 10.*cm;
-  double pDx4 = 10.*cm;
-  double pAlp2 = 0.*deg;
-  doTrap( name, dz, pTheta, pPhi, pDy1, pDx1, pDx2, pAlp1, pDy2, pDx3, pDx4, pAlp2 );
+  double pTheta = 0. * deg;
+  double pPhi = 0. * deg;
+  double pDy1 = 30. * cm;
+  double pDx1 = 30. * cm;
+  double pDx2 = 30. * cm;
+  double pAlp1 = 0. * deg;
+  double pDy2 = 15. * cm;
+  double pDx3 = 10. * cm;
+  double pDx4 = 10. * cm;
+  double pAlp2 = 0. * deg;
+  doTrap(name, dz, pTheta, pPhi, pDy1, pDx1, pDx2, pAlp1, pDy2, pDx3, pDx4, pAlp2);
   std::cout << std::endl;
 
-//
-// 7. Sphere or Spherical Shell Section:
-//
+  //
+  // 7. Sphere or Spherical Shell Section:
+  //
   std::cout << "\n\nSphere tests\n" << std::endl;
   std::cout << "This next should be the same as a 2cm ball: " << std::endl;
-  doSphere("fred1", 0.0*cm, 2.0*cm, 0.*deg, 360.*deg, 0., 180.*deg);
-  std::cout << "Manual computation gives: " 
-	    << 4./3. * Geom::pi() * 2.0*cm * 2.0*cm *2.0*cm / cm3
-	    <<std::endl;
+  doSphere("fred1", 0.0 * cm, 2.0 * cm, 0. * deg, 360. * deg, 0., 180. * deg);
+  std::cout << "Manual computation gives: " << 4. / 3. * Geom::pi() * 2.0 * cm * 2.0 * cm * 2.0 * cm / cm3 << std::endl;
   std::cout << "If you mess up phi and theta you get: " << std::endl;
-  doSphere("fred1", 0.0*cm, 2.0*cm, 0.*deg, 180.*deg, 0., 360.*deg);
+  doSphere("fred1", 0.0 * cm, 2.0 * cm, 0. * deg, 180. * deg, 0., 360. * deg);
   std::cout << "\n1 cm thick shell: " << std::endl;
-  doSphere("fred1", 2.0*cm, 3.0*cm, 0.*deg, 360.*deg, 0., 180.*deg);
+  doSphere("fred1", 2.0 * cm, 3.0 * cm, 0. * deg, 360. * deg, 0., 180. * deg);
   std::cout << "Manual computation gives: "
-	    << 4./3. * Geom::pi() * 3.0*cm * 3.0*cm *3.0*cm / cm3 - 4./3. * Geom::pi() * 2.0*cm * 2.0*cm *2.0*cm / cm3
-	    <<std::endl;
+            << 4. / 3. * Geom::pi() * 3.0 * cm * 3.0 * cm * 3.0 * cm / cm3 -
+                   4. / 3. * Geom::pi() * 2.0 * cm * 2.0 * cm * 2.0 * cm / cm3
+            << std::endl;
   std::cout << "\nHALF of the above 1 cm thick shell: " << std::endl;
-  doSphere("fred1", 2.0*cm, 3.0*cm, 0.*deg, 180.*deg, 0., 180.*deg);
+  doSphere("fred1", 2.0 * cm, 3.0 * cm, 0. * deg, 180. * deg, 0., 180. * deg);
   std::cout << "Manual computation gives: "
-	    << (4./3. * Geom::pi() * 3.0*cm * 3.0*cm *3.0*cm / cm3 - 4./3. * Geom::pi() * 2.0*cm * 2.0*cm *2.0*cm / cm3) / 2.
-	    <<std::endl;
+            << (4. / 3. * Geom::pi() * 3.0 * cm * 3.0 * cm * 3.0 * cm / cm3 -
+                4. / 3. * Geom::pi() * 2.0 * cm * 2.0 * cm * 2.0 * cm / cm3) /
+                   2.
+            << std::endl;
   std::cout << "\n30 degree span in theta; full phi \"top\" hemisphere" << std::endl;
-  doSphere("fred1", 2.0*cm, 3.0*cm, 0.*deg, 360.*deg, 10.*deg, 30.*deg);
-  std::cout << "\n30 degree span in theta; full phi \"bottom\" hemisphere; mirror of above, so should be same." << std::endl;
-  doSphere("fred1", 2.0*cm, 3.0*cm, 0.*deg, 360.*deg, 140.*deg, 30.*deg);
-  std::cout << "\n30 degree span in theta; full phi around equator (should be bigger than above)" << std::endl;
-  doSphere("fred1", 2.0*cm, 3.0*cm, 0.*deg, 360.*deg, 75.*deg, 30.*deg);
-
-//
-// 9. Torus:
-//
+  doSphere("fred1", 2.0 * cm, 3.0 * cm, 0. * deg, 360. * deg, 10. * deg, 30. * deg);
+  std::cout << "\n30 degree span in theta; full phi \"bottom\" hemisphere; "
+               "mirror of above, so should be same."
+            << std::endl;
+  doSphere("fred1", 2.0 * cm, 3.0 * cm, 0. * deg, 360. * deg, 140. * deg, 30. * deg);
+  std::cout << "\n30 degree span in theta; full phi around equator (should be "
+               "bigger than above)"
+            << std::endl;
+  doSphere("fred1", 2.0 * cm, 3.0 * cm, 0. * deg, 360. * deg, 75. * deg, 30. * deg);
+
+  //
+  // 9. Torus:
+  //
   std::cout << "\n\nTorus tests\n" << std::endl;
-  double radius = 200.*cm;
-  doTorus( name, rIn, rOut, radius, startPhi, deltaPhi );
+  double radius = 200. * cm;
+  doTorus(name, rIn, rOut, radius, startPhi, deltaPhi);
   std::cout << std::endl;
 
-// 
-// 10. Polycons:
-//
+  //
+  // 10. Polycons:
+  //
   std::cout << "\n\nPolycons tests\n" << std::endl;
-  double phiStart = 45.*deg;
-  double phiTotal = 325.*deg;
-  double inner[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-  std::vector<double> rInner( inner, inner + sizeof( inner ) / sizeof( double ));
-  double outer[] = { 0, 10, 10, 5, 5, 10, 10, 2, 2 };
-  std::vector<double> rOuter( outer, outer + sizeof( outer ) / sizeof( double ));
-  double pl[] = { 5, 7, 9, 11, 25, 27, 29, 31, 35 };
-  std::vector<double> z( pl, pl + sizeof( pl ) / sizeof( double ));
-  doPolycone1( name, phiStart, phiTotal, z, rInner, rOuter );
+  double phiStart = 45. * deg;
+  double phiTotal = 325. * deg;
+  double inner[] = {0, 0, 0, 0, 0, 0, 0, 0, 0};
+  std::vector<double> rInner(inner, inner + sizeof(inner) / sizeof(double));
+  double outer[] = {0, 10, 10, 5, 5, 10, 10, 2, 2};
+  std::vector<double> rOuter(outer, outer + sizeof(outer) / sizeof(double));
+  double pl[] = {5, 7, 9, 11, 25, 27, 29, 31, 35};
+  std::vector<double> z(pl, pl + sizeof(pl) / sizeof(double));
+  doPolycone1(name, phiStart, phiTotal, z, rInner, rOuter);
   std::cout << std::endl;
 
-  doPolycone2( name, phiStart, phiTotal, z, rOuter);
+  doPolycone2(name, phiStart, phiTotal, z, rOuter);
   std::cout << std::endl;
 
-//
-// 11. Polyhedra (PGON):
-//
+  //
+  // 11. Polyhedra (PGON):
+  //
   std::cout << "\n\nPolyhedra tests\n" << std::endl;
   int sides = 3;
-  doPolyhedra1( name, sides, phiStart, phiTotal, z, rInner, rOuter );
+  doPolyhedra1(name, sides, phiStart, phiTotal, z, rInner, rOuter);
   std::cout << std::endl;
 
-  doPolyhedra2( name, sides, phiStart, phiTotal, z, rOuter );
+  doPolyhedra2(name, sides, phiStart, phiTotal, z, rOuter);
   std::cout << std::endl;
 
-//
-// 12. Tube with an elliptical cross section:
-//  
-  
+  //
+  // 12. Tube with an elliptical cross section:
+  //
+
   std::cout << "\n\nElliptical Tube tests\n" << std::endl;
   doEllipticalTube(name, xSemiaxis, ySemiAxis, zHeight);
   std::cout << std::endl;
-  ySemiAxis = 3.*cm;
+  ySemiAxis = 3. * cm;
   doEllipticalTube(name, xSemiaxis, ySemiAxis, zHeight);
   std::cout << std::endl;
-  xSemiaxis = 3.* cm;
-  ySemiAxis = 2.* cm;
-  zHeight = 10.* cm;
+  xSemiaxis = 3. * cm;
+  ySemiAxis = 2. * cm;
+  zHeight = 10. * cm;
   doEllipticalTube(name, xSemiaxis, ySemiAxis, zHeight);
   std::cout << std::endl;
-  xSemiaxis = 300.* cm;
-  ySemiAxis = 400.* cm;
+  xSemiaxis = 300. * cm;
+  ySemiAxis = 400. * cm;
   zHeight = 3000. * cm;
   doEllipticalTube(name, xSemiaxis, ySemiAxis, zHeight);
 
-//
-// 14. Cone with Elliptical Cross Section:
-//
+  //
+  // 14. Cone with Elliptical Cross Section:
+  //
 
-//
-// 15. Paraboloid, a solid with parabolic profile:
-//
+  //
+  // 15. Paraboloid, a solid with parabolic profile:
+  //
 
-//
-// 16. Tube with Hyperbolic Profile:
-//
-  
-//
-// 17. Tetrahedra:
-//
+  //
+  // 16. Tube with Hyperbolic Profile:
+  //
 
-//
-// 18. Extruded Polygon:
-//
+  //
+  // 17. Tetrahedra:
+  //
 
-//
-// 19. Box Twisted:
-//
+  //
+  // 18. Extruded Polygon:
+  //
 
-//
-// 20. Trapezoid Twisted along One Axis:
-//
+  //
+  // 19. Box Twisted:
+  //
 
-//
-// 21. Twisted Trapezoid with x and y dimensions varying along z:
-//
+  //
+  // 20. Trapezoid Twisted along One Axis:
+  //
 
-//
-// 22. Generic trapezoid with optionally collapsing vertices:
-//
+  //
+  // 21. Twisted Trapezoid with x and y dimensions varying along z:
+  //
 
-//
-// 23. Tube Section Twisted along Its Axis: 
-//   
+  //
+  // 22. Generic trapezoid with optionally collapsing vertices:
+  //
 
-//
-// 24. Cylindrical Cut Section or Cut Tube:
-//
+  //
+  // 23. Tube Section Twisted along Its Axis:
+  //
+
+  //
+  // 24. Cylindrical Cut Section or Cut Tube:
+  //
   std::cout << "\n\nCutTub tests\n" << std::endl;
   std::array<double, 3> lowNorm = {{0, -0.7, -0.71}};
-  std::array<double, 3> highNorm = {{ 0.7, 0, 0.71 }};
-  
-  doCutTubs( name, rIn, rOut, zhalf, startPhi, deltaPhi, lowNorm, highNorm );
+  std::array<double, 3> highNorm = {{0.7, 0, 0.71}};
+
+  doCutTubs(name, rIn, rOut, zhalf, startPhi, deltaPhi, lowNorm, highNorm);
   std::cout << std::endl;
 
-//
-// 25. Extruded Polygon:
-//
-// The extrusion of an arbitrary polygon (extruded solid)
-// with fixed outline in the defined Z sections can be defined as follows
-// (in a general way, or as special construct with two Z sections):
-//
-//    G4ExtrudedSolid(const G4String& pName,
-//                    std::vector<G4TwoVector> polygon,
-//                    std::vector<ZSection> zsections)
-//
+  //
+  // 25. Extruded Polygon:
+  //
+  // The extrusion of an arbitrary polygon (extruded solid)
+  // with fixed outline in the defined Z sections can be defined as follows
+  // (in a general way, or as special construct with two Z sections):
+  //
+  //    G4ExtrudedSolid(const G4String& pName,
+  //                    std::vector<G4TwoVector> polygon,
+  //                    std::vector<ZSection> zsections)
+  //
   std::cout << "\n\nExtruded Polygon tests\n" << std::endl;
-  std::vector<double> x = { -300, -300, 300, 300, 150, 150, -150, -150 };
-  std::vector<double> y = { -300, 300, 300, -300, -300, 150, 150, -300 };
-  std::vector<double> epz = { -600, -150, 100, 600 };
-  std::vector<double> zx = { 0, 0, 0, 0 };
-  std::vector<double> zy = { 300, -300, 0, 300 }; 
-  std::vector<double> zscale = { 8, 10, 6, 12 };
-  
-  doExtrudedPgon( name, x, y, epz, zx, zy, zscale );
+  std::vector<double> x = {-300, -300, 300, 300, 150, 150, -150, -150};
+  std::vector<double> y = {-300, 300, 300, -300, -300, 150, 150, -300};
+  std::vector<double> epz = {-600, -150, 100, 600};
+  std::vector<double> zx = {0, 0, 0, 0};
+  std::vector<double> zy = {300, -300, 0, 300};
+  std::vector<double> zscale = {8, 10, 6, 12};
+
+  doExtrudedPgon(name, x, y, epz, zx, zy, zscale);
   std::cout << std::endl;
-  
+
   return EXIT_SUCCESS;
 }
-
diff --git a/SimG4Core/GeometryProducer/interface/GeometryProducer.h b/SimG4Core/GeometryProducer/interface/GeometryProducer.h
index 25058a399778d..cd309b22645d0 100644
--- a/SimG4Core/GeometryProducer/interface/GeometryProducer.h
+++ b/SimG4Core/GeometryProducer/interface/GeometryProducer.h
@@ -1,23 +1,25 @@
 #ifndef SimG4Core_GeometryProducer_H
 #define SimG4Core_GeometryProducer_H
 
-#include "FWCore/Framework/interface/one/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/Run.h"
+#include "FWCore/Framework/interface/one/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "SimG4Core/Notification/interface/SimActivityRegistry.h"
 #include "SimG4Core/SensitiveDetector/interface/AttachSD.h"
+#include "SimG4Core/SensitiveDetector/interface/SensitiveCaloDetector.h"
 #include "SimG4Core/SensitiveDetector/interface/SensitiveDetector.h"
 #include "SimG4Core/SensitiveDetector/interface/SensitiveTkDetector.h"
-#include "SimG4Core/SensitiveDetector/interface/SensitiveCaloDetector.h"
 
 #include <memory>
 
-namespace sim { class FieldBuilder; }
+namespace sim {
+  class FieldBuilder;
+}
 
 class SimWatcher;
 class SimProducer;
@@ -25,41 +27,38 @@ class DDDWorld;
 class G4RunManagerKernel;
 class SimTrackManager;
 
-class GeometryProducer : public edm::one::EDProducer<edm::one::SharedResources, edm::one::WatchRuns>
-{
+class GeometryProducer : public edm::one::EDProducer<edm::one::SharedResources, edm::one::WatchRuns> {
 public:
-    typedef std::vector<std::shared_ptr<SimProducer> > Producers;
+  typedef std::vector<std::shared_ptr<SimProducer>> Producers;
 
-    explicit GeometryProducer(edm::ParameterSet const & p);
-    ~GeometryProducer() override;
-    void beginRun(const edm::Run & r,const edm::EventSetup& c) override;
-    void endRun(const edm::Run & r,const edm::EventSetup& c) override;
-    void produce(edm::Event & e, const edm::EventSetup & c) override;
-    void beginLuminosityBlock(edm::LuminosityBlock&, edm::EventSetup const&);
-   
-    std::vector<std::shared_ptr<SimProducer> > producers() const
-    { return m_producers; }
-    std::vector<SensitiveTkDetector*>& sensTkDetectors() { return m_sensTkDets; }
-    std::vector<SensitiveCaloDetector*>& sensCaloDetectors() { return m_sensCaloDets; }
+  explicit GeometryProducer(edm::ParameterSet const &p);
+  ~GeometryProducer() override;
+  void beginRun(const edm::Run &r, const edm::EventSetup &c) override;
+  void endRun(const edm::Run &r, const edm::EventSetup &c) override;
+  void produce(edm::Event &e, const edm::EventSetup &c) override;
+  void beginLuminosityBlock(edm::LuminosityBlock &, edm::EventSetup const &);
 
-private:
+  std::vector<std::shared_ptr<SimProducer>> producers() const { return m_producers; }
+  std::vector<SensitiveTkDetector *> &sensTkDetectors() { return m_sensTkDets; }
+  std::vector<SensitiveCaloDetector *> &sensCaloDetectors() { return m_sensCaloDets; }
 
-    void updateMagneticField( edm::EventSetup const& es );
+private:
+  void updateMagneticField(edm::EventSetup const &es);
 
-    G4RunManagerKernel * m_kernel;
-    bool m_pUseMagneticField;
-    edm::ParameterSet m_pField;
-    bool m_pUseSensitiveDetectors;
-    SimActivityRegistry m_registry;
-    std::vector<std::shared_ptr<SimWatcher> > m_watchers;
-    std::vector<std::shared_ptr<SimProducer> > m_producers;
-    std::unique_ptr<sim::FieldBuilder> m_fieldBuilder;
-    std::unique_ptr<SimTrackManager> m_trackManager;
-    AttachSD * m_attach;
-    std::vector<SensitiveTkDetector*> m_sensTkDets;
-    std::vector<SensitiveCaloDetector*> m_sensCaloDets;
-    edm::ParameterSet m_p;
-    bool m_firstRun;
+  G4RunManagerKernel *m_kernel;
+  bool m_pUseMagneticField;
+  edm::ParameterSet m_pField;
+  bool m_pUseSensitiveDetectors;
+  SimActivityRegistry m_registry;
+  std::vector<std::shared_ptr<SimWatcher>> m_watchers;
+  std::vector<std::shared_ptr<SimProducer>> m_producers;
+  std::unique_ptr<sim::FieldBuilder> m_fieldBuilder;
+  std::unique_ptr<SimTrackManager> m_trackManager;
+  AttachSD *m_attach;
+  std::vector<SensitiveTkDetector *> m_sensTkDets;
+  std::vector<SensitiveCaloDetector *> m_sensCaloDets;
+  edm::ParameterSet m_p;
+  bool m_firstRun;
 };
 
 #endif
diff --git a/SimG4Core/GeometryProducer/src/GeometryProducer.cc b/SimG4Core/GeometryProducer/src/GeometryProducer.cc
index 11a21f89b1c77..304ea41d314cf 100644
--- a/SimG4Core/GeometryProducer/src/GeometryProducer.cc
+++ b/SimG4Core/GeometryProducer/src/GeometryProducer.cc
@@ -7,15 +7,15 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-#include "SimG4Core/Watcher/interface/SimProducer.h"
-#include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
 #include "SimG4Core/Geometry/interface/DDDWorld.h"
 #include "SimG4Core/Geometry/interface/G4LogicalVolumeToDDLogicalPartMap.h"
 #include "SimG4Core/Geometry/interface/SensitiveDetectorCatalog.h"
-#include "SimG4Core/MagneticField/interface/FieldBuilder.h"
 #include "SimG4Core/MagneticField/interface/CMSFieldManager.h"
 #include "SimG4Core/MagneticField/interface/Field.h"
+#include "SimG4Core/MagneticField/interface/FieldBuilder.h"
 #include "SimG4Core/Notification/interface/SimTrackManager.h"
+#include "SimG4Core/Watcher/interface/SimProducer.h"
+#include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
 
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
@@ -29,132 +29,125 @@
 
 #include <iostream>
 
-static
-void createWatchers(const edm::ParameterSet& iP, SimActivityRegistry& iReg,
-		    std::vector<std::shared_ptr<SimWatcher> >& oWatchers,
-		    std::vector<std::shared_ptr<SimProducer> >& oProds)
-{
-    using namespace std;
-    using namespace edm;
-    std::vector<ParameterSet> watchers;
-    try { watchers = iP.getParameter<vector<ParameterSet> >("Watchers"); } 
-    catch(edm::Exception const&) {}
-  
-    for(std::vector<ParameterSet>::iterator itWatcher = watchers.begin();
-	itWatcher != watchers.end(); ++itWatcher) 
-    {
-	std::unique_ptr<SimWatcherMakerBase> 
-	    maker(SimWatcherFactory::get()->create(itWatcher->getParameter<std::string> ("type")));
-	if(maker.get()==nullptr) { 
-	  throw cms::Exception("SimG4CoreGeometryProducer", 
-			       " createWatchers: Unable to find the requested Watcher"); 
-	}
-    
-	std::shared_ptr<SimWatcher> watcherTemp;
-	std::shared_ptr<SimProducer> producerTemp;
-	maker->make(*itWatcher,iReg,watcherTemp,producerTemp);
-	oWatchers.push_back(watcherTemp);
-	if(producerTemp) oProds.push_back(producerTemp);
+static void createWatchers(const edm::ParameterSet &iP,
+                           SimActivityRegistry &iReg,
+                           std::vector<std::shared_ptr<SimWatcher>> &oWatchers,
+                           std::vector<std::shared_ptr<SimProducer>> &oProds) {
+  using namespace std;
+  using namespace edm;
+  std::vector<ParameterSet> watchers;
+  try {
+    watchers = iP.getParameter<vector<ParameterSet>>("Watchers");
+  } catch (edm::Exception const &) {
+  }
+
+  for (std::vector<ParameterSet>::iterator itWatcher = watchers.begin(); itWatcher != watchers.end(); ++itWatcher) {
+    std::unique_ptr<SimWatcherMakerBase> maker(
+        SimWatcherFactory::get()->create(itWatcher->getParameter<std::string>("type")));
+    if (maker.get() == nullptr) {
+      throw cms::Exception("SimG4CoreGeometryProducer", " createWatchers: Unable to find the requested Watcher");
     }
+
+    std::shared_ptr<SimWatcher> watcherTemp;
+    std::shared_ptr<SimProducer> producerTemp;
+    maker->make(*itWatcher, iReg, watcherTemp, producerTemp);
+    oWatchers.push_back(watcherTemp);
+    if (producerTemp)
+      oProds.push_back(producerTemp);
+  }
 }
 
-GeometryProducer::GeometryProducer(edm::ParameterSet const & p) :
-    m_kernel(nullptr), 
-    m_pUseMagneticField(p.getParameter<bool>("UseMagneticField")),
-    m_pField(p.getParameter<edm::ParameterSet>("MagneticField")), 
-    m_pUseSensitiveDetectors(p.getParameter<bool>("UseSensitiveDetectors")),
-    m_attach(nullptr), m_p(p), m_firstRun ( true )
-{
-    //Look for an outside SimActivityRegistry
-    //this is used by the visualization code
-    edm::Service<SimActivityRegistry> otherRegistry;
-    if (otherRegistry) m_registry.connect(*otherRegistry);
-    createWatchers(m_p, m_registry, m_watchers, m_producers);
-    produces<int>();
+GeometryProducer::GeometryProducer(edm::ParameterSet const &p)
+    : m_kernel(nullptr),
+      m_pUseMagneticField(p.getParameter<bool>("UseMagneticField")),
+      m_pField(p.getParameter<edm::ParameterSet>("MagneticField")),
+      m_pUseSensitiveDetectors(p.getParameter<bool>("UseSensitiveDetectors")),
+      m_attach(nullptr),
+      m_p(p),
+      m_firstRun(true) {
+  // Look for an outside SimActivityRegistry
+  // this is used by the visualization code
+  edm::Service<SimActivityRegistry> otherRegistry;
+  if (otherRegistry)
+    m_registry.connect(*otherRegistry);
+  createWatchers(m_p, m_registry, m_watchers, m_producers);
+  produces<int>();
 }
 
-GeometryProducer::~GeometryProducer() 
-{ 
+GeometryProducer::~GeometryProducer() {
   delete m_attach;
-  delete m_kernel; 
+  delete m_kernel;
 }
 
-void GeometryProducer::updateMagneticField( edm::EventSetup const& es) {
-    if (m_pUseMagneticField)
-    {
-       // setup the magnetic field
-       edm::ESHandle<MagneticField> pMF;
-       es.get<IdealMagneticFieldRecord>().get(pMF);
-       const GlobalPoint g(0.,0.,0.);
-       edm::LogInfo("GeometryProducer") << "B-field(T) at (0,0,0)(cm): " << pMF->inTesla(g);
-
-       sim::FieldBuilder fieldBuilder(pMF.product(), m_pField);
-       CMSFieldManager* fieldManager = new CMSFieldManager();
-       G4TransportationManager * tM = G4TransportationManager::GetTransportationManager();
-       tM->SetFieldManager(fieldManager);
-       fieldBuilder.build( fieldManager, tM->GetPropagatorInField());
-       edm::LogInfo("GeometryProducer") << "Magentic field is built";
-    }
+void GeometryProducer::updateMagneticField(edm::EventSetup const &es) {
+  if (m_pUseMagneticField) {
+    // setup the magnetic field
+    edm::ESHandle<MagneticField> pMF;
+    es.get<IdealMagneticFieldRecord>().get(pMF);
+    const GlobalPoint g(0., 0., 0.);
+    edm::LogInfo("GeometryProducer") << "B-field(T) at (0,0,0)(cm): " << pMF->inTesla(g);
+
+    sim::FieldBuilder fieldBuilder(pMF.product(), m_pField);
+    CMSFieldManager *fieldManager = new CMSFieldManager();
+    G4TransportationManager *tM = G4TransportationManager::GetTransportationManager();
+    tM->SetFieldManager(fieldManager);
+    fieldBuilder.build(fieldManager, tM->GetPropagatorInField());
+    edm::LogInfo("GeometryProducer") << "Magentic field is built";
+  }
 }
- 
-void GeometryProducer::beginLuminosityBlock(edm::LuminosityBlock&, edm::EventSetup const&) 
-{
+
+void GeometryProducer::beginLuminosityBlock(edm::LuminosityBlock &, edm::EventSetup const &) {
   // mag field cannot be change in new lumi section - this is commented out
   //     updateMagneticField( es );
 }
 
-void GeometryProducer::beginRun(const edm::Run &, const edm::EventSetup&)
-{}
+void GeometryProducer::beginRun(const edm::Run &, const edm::EventSetup &) {}
+
+void GeometryProducer::endRun(const edm::Run &, const edm::EventSetup &) {}
 
-void GeometryProducer::endRun(const edm::Run &,const edm::EventSetup&)
-{}
+void GeometryProducer::produce(edm::Event &e, const edm::EventSetup &es) {
+  if (!m_firstRun)
+    return;
+  m_firstRun = false;
 
-void GeometryProducer::produce(edm::Event & e, const edm::EventSetup & es)
-{
-    if ( !m_firstRun ) return;
-    m_firstRun = false;
+  edm::LogInfo("GeometryProducer") << "Producing G4 Geom";
 
-    edm::LogInfo("GeometryProducer") << "Producing G4 Geom";   
+  m_kernel = G4RunManagerKernel::GetRunManagerKernel();
+  if (m_kernel == nullptr)
+    m_kernel = new G4RunManagerKernel();
+  edm::LogInfo("GeometryProducer") << " GeometryProducer initializing ";
+  // DDDWorld: get the DDCV from the ES and use it to build the World
+  edm::ESTransientHandle<DDCompactView> pDD;
+  es.get<IdealGeometryRecord>().get(pDD);
 
-    m_kernel = G4RunManagerKernel::GetRunManagerKernel();   
-    if (m_kernel==nullptr) m_kernel = new G4RunManagerKernel();
-    edm::LogInfo("GeometryProducer") << " GeometryProducer initializing ";
-    // DDDWorld: get the DDCV from the ES and use it to build the World
-    edm::ESTransientHandle<DDCompactView> pDD;
-    es.get<IdealGeometryRecord>().get(pDD);
-   
-    G4LogicalVolumeToDDLogicalPartMap map_;
-    SensitiveDetectorCatalog catalog_;
-    const DDDWorld * world = new DDDWorld(&(*pDD), map_, catalog_, false);
-    m_registry.dddWorldSignal_(world);
+  G4LogicalVolumeToDDLogicalPartMap map_;
+  SensitiveDetectorCatalog catalog_;
+  const DDDWorld *world = new DDDWorld(&(*pDD), map_, catalog_, false);
+  m_registry.dddWorldSignal_(world);
 
-    updateMagneticField( es );
+  updateMagneticField(es);
 
-    if (m_pUseSensitiveDetectors)
+  if (m_pUseSensitiveDetectors) {
+    edm::LogInfo("GeometryProducer") << " instantiating sensitive detectors ";
+    // instantiate and attach the sensitive detectors
+    m_trackManager = std::unique_ptr<SimTrackManager>(new SimTrackManager);
+    if (m_attach == nullptr)
+      m_attach = new AttachSD;
     {
-       edm::LogInfo("GeometryProducer") << " instantiating sensitive detectors ";
-       // instantiate and attach the sensitive detectors
-       m_trackManager = std::unique_ptr<SimTrackManager>(new SimTrackManager);
-       if (m_attach==nullptr) m_attach = new AttachSD;
-       {
-           std::pair< std::vector<SensitiveTkDetector*>,
-               std::vector<SensitiveCaloDetector*> > 
-             sensDets = m_attach->create((*pDD),catalog_,m_p,m_trackManager.get(),m_registry);
-          
-           m_sensTkDets.swap(sensDets.first);
-           m_sensCaloDets.swap(sensDets.second);
-       }
-
-       edm::LogInfo("GeometryProducer") << " Sensitive Detector building finished; found " 
-					<< m_sensTkDets.size()
-					<< " Tk type Producers, and " << m_sensCaloDets.size() 
-					<< " Calo type producers ";
-    }
+      std::pair<std::vector<SensitiveTkDetector *>, std::vector<SensitiveCaloDetector *>> sensDets =
+          m_attach->create((*pDD), catalog_, m_p, m_trackManager.get(), m_registry);
 
-    for(Producers::iterator itProd = m_producers.begin();itProd != m_producers.end();
-           ++itProd) { 
-        (*itProd)->produce(e,es); 
+      m_sensTkDets.swap(sensDets.first);
+      m_sensCaloDets.swap(sensDets.second);
     }
+
+    edm::LogInfo("GeometryProducer") << " Sensitive Detector building finished; found " << m_sensTkDets.size()
+                                     << " Tk type Producers, and " << m_sensCaloDets.size() << " Calo type producers ";
+  }
+
+  for (Producers::iterator itProd = m_producers.begin(); itProd != m_producers.end(); ++itProd) {
+    (*itProd)->produce(e, es);
+  }
 }
 
 DEFINE_FWK_MODULE(GeometryProducer);
diff --git a/SimG4Core/HelpfulWatchers/interface/MonopoleSteppingAction.h b/SimG4Core/HelpfulWatchers/interface/MonopoleSteppingAction.h
index 44d3a8527726f..869f8efd35bfd 100644
--- a/SimG4Core/HelpfulWatchers/interface/MonopoleSteppingAction.h
+++ b/SimG4Core/HelpfulWatchers/interface/MonopoleSteppingAction.h
@@ -1,9 +1,9 @@
 #ifndef SimG4Core_HelpfulWatchers_MonopoleSteppingAction_H
 #define SimG4Core_HelpfulWatchers_MonopoleSteppingAction_H
 
-#include "SimG4Core/Watcher/interface/SimWatcher.h"
-#include "SimG4Core/Notification/interface/Observer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "SimG4Core/Notification/interface/Observer.h"
+#include "SimG4Core/Watcher/interface/SimWatcher.h"
 
 #include "G4Step.hh"
 #include <vector>
@@ -18,19 +18,19 @@ class MonopoleSteppingAction : public SimWatcher,
                                public Observer<const BeginOfTrack *>,
                                public Observer<const G4Step *> {
 public:
-  MonopoleSteppingAction(edm::ParameterSet const & p);
+  MonopoleSteppingAction(edm::ParameterSet const &p);
   ~MonopoleSteppingAction() override;
-  void update(const BeginOfJob*) override;
-  void update(const BeginOfRun*) override;
-  void update(const BeginOfTrack*) override;
-  void update(const G4Step*) override;
+  void update(const BeginOfJob *) override;
+  void update(const BeginOfRun *) override;
+  void update(const BeginOfTrack *) override;
+  void update(const G4Step *) override;
 
 private:
-  bool             mode, actOnTrack;
+  bool mode, actOnTrack;
   std::vector<int> pdgCode;
-  double           eStart, pxStart, pyStart, pzStart;
-  double           dirxStart, diryStart, dirzStart;
-  double           cMevToJ, cMeVToKgMByS, cInMByS, magCharge, bZ;
+  double eStart, pxStart, pyStart, pzStart;
+  double dirxStart, diryStart, dirzStart;
+  double cMevToJ, cMeVToKgMByS, cInMByS, magCharge, bZ;
 };
 
 #endif
diff --git a/SimG4Core/HelpfulWatchers/src/BeginOfTrackCounter.cc b/SimG4Core/HelpfulWatchers/src/BeginOfTrackCounter.cc
index 1b7cfab2f99b3..65da24a308baa 100644
--- a/SimG4Core/HelpfulWatchers/src/BeginOfTrackCounter.cc
+++ b/SimG4Core/HelpfulWatchers/src/BeginOfTrackCounter.cc
@@ -2,11 +2,11 @@
 //
 // Package:     HelpfulWatchers
 // Class  :     BeginOfTrackCounter
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
-// Original Author:  
+// Original Author:
 //         Created:  Tue Nov 29 12:26:42 EST 2005
 //
 
@@ -29,27 +29,19 @@ using namespace simwatcher;
 //
 // constructors and destructor
 //
-BeginOfTrackCounter::BeginOfTrackCounter(const edm::ParameterSet& iPSet) :
-   m_count(0),
-   m_label(iPSet.getUntrackedParameter<std::string>("instanceLabel","nBeginOfTracks"))
-{
-   produces<int>(m_label);
+BeginOfTrackCounter::BeginOfTrackCounter(const edm::ParameterSet &iPSet)
+    : m_count(0), m_label(iPSet.getUntrackedParameter<std::string>("instanceLabel", "nBeginOfTracks")) {
+  produces<int>(m_label);
 }
 
-
 //
 // member functions
 //
 
-void
-BeginOfTrackCounter::produce(edm::Event& e, const edm::EventSetup&)
-{
-   std::unique_ptr<int> product(new int(m_count));
-   e.put(std::move(product),m_label);
-   m_count = 0;
+void BeginOfTrackCounter::produce(edm::Event &e, const edm::EventSetup &) {
+  std::unique_ptr<int> product(new int(m_count));
+  e.put(std::move(product), m_label);
+  m_count = 0;
 }
 
-void
-BeginOfTrackCounter::update(const BeginOfTrack*){
-   ++m_count;
-}
+void BeginOfTrackCounter::update(const BeginOfTrack *) { ++m_count; }
diff --git a/SimG4Core/HelpfulWatchers/src/BeginOfTrackCounter.h b/SimG4Core/HelpfulWatchers/src/BeginOfTrackCounter.h
index f87f224ded447..b15ac54fbc380 100644
--- a/SimG4Core/HelpfulWatchers/src/BeginOfTrackCounter.h
+++ b/SimG4Core/HelpfulWatchers/src/BeginOfTrackCounter.h
@@ -4,10 +4,12 @@
 //
 // Package:     HelpfulWatchers
 // Class  :     BeginOfTrackCounter
-// 
-/**\class BeginOfTrackCounter BeginOfTrackCounter.h SimG4Core/HelpfulWatchers/interface/BeginOfTrackCounter.h
+//
+/**\class BeginOfTrackCounter BeginOfTrackCounter.h
+ SimG4Core/HelpfulWatchers/interface/BeginOfTrackCounter.h
 
- Description: Counts the number of BeginOfTrack signals and puts that value into the Event
+ Description: Counts the number of BeginOfTrack signals and puts that value into
+ the Event
 
  Usage:
     The module takes one optional parameter "instanceLabel" which is used to
@@ -15,7 +17,7 @@
 
 */
 //
-// Original Author:  
+// Original Author:
 //         Created:  Tue Nov 29 12:26:39 EST 2005
 //
 
@@ -23,40 +25,37 @@
 #include <string>
 
 // user include files
-#include "SimG4Core/Watcher/interface/SimProducer.h"
-#include "SimG4Core/Notification/interface/Observer.h"
 #include "SimG4Core/Notification/interface/BeginOfTrack.h"
+#include "SimG4Core/Notification/interface/Observer.h"
+#include "SimG4Core/Watcher/interface/SimProducer.h"
 
 // forward declarations
 namespace edm {
-   class ParameterSet;
+  class ParameterSet;
 }
 
 namespace simwatcher {
-   class BeginOfTrackCounter : public SimProducer,
-      public Observer<const BeginOfTrack*>
-{
+  class BeginOfTrackCounter : public SimProducer, public Observer<const BeginOfTrack *> {
+  public:
+    BeginOfTrackCounter(const edm::ParameterSet &);
 
-   public:
-      BeginOfTrackCounter(const edm::ParameterSet&);
- 
-      // ---------- const member functions ---------------------
+    // ---------- const member functions ---------------------
 
-      // ---------- static member functions --------------------
+    // ---------- static member functions --------------------
 
-      // ---------- member functions ---------------------------
-      void produce(edm::Event&, const edm::EventSetup&) override;
+    // ---------- member functions ---------------------------
+    void produce(edm::Event &, const edm::EventSetup &) override;
 
-   private:
-      BeginOfTrackCounter(const BeginOfTrackCounter&) = delete; // stop default
+  private:
+    BeginOfTrackCounter(const BeginOfTrackCounter &) = delete;  // stop default
 
-      const BeginOfTrackCounter& operator=(const BeginOfTrackCounter&) = delete; // stop default
+    const BeginOfTrackCounter &operator=(const BeginOfTrackCounter &) = delete;  // stop default
 
-      void update(const BeginOfTrack*) override;
-      // ---------- member data --------------------------------
-      int m_count;
-      std::string m_label;
-};
+    void update(const BeginOfTrack *) override;
+    // ---------- member data --------------------------------
+    int m_count;
+    std::string m_label;
+  };
 
-}
+}  // namespace simwatcher
 #endif
diff --git a/SimG4Core/HelpfulWatchers/src/G4StepStatistics.h b/SimG4Core/HelpfulWatchers/src/G4StepStatistics.h
index acf4cb03a152f..b9e913c4907dd 100644
--- a/SimG4Core/HelpfulWatchers/src/G4StepStatistics.h
+++ b/SimG4Core/HelpfulWatchers/src/G4StepStatistics.h
@@ -4,7 +4,7 @@
 //
 // Package:     HelpfulWatchers
 // Class  :     SimTracer
-// 
+//
 /**\class SimTracer SimTracer.h SimG4Core/HelpfulWatchers/interface/SimTracer.h
 
  Description: Prints a message for each Oscar signal
@@ -14,7 +14,7 @@
 
 */
 //
-// Original Author:  
+// Original Author:
 //         Created:  Tue Nov 22 16:41:33 EST 2005
 //
 
@@ -22,22 +22,22 @@
 #include <iostream>
 
 // user include files
-#include "SimG4Core/Notification/interface/Observer.h"
-#include "SimG4Core/Watcher/interface/SimWatcher.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "G4ParticleDefinition.hh"
 #include "G4Step.hh"
 #include "G4VProcess.hh"
-#include "G4ParticleDefinition.hh"
-#include <map>
-#include <FWCore/ServiceRegistry/interface/Service.h>
+#include "SimG4Core/Notification/interface/Observer.h"
+#include "SimG4Core/Watcher/interface/SimWatcher.h"
 #include <CommonTools/UtilAlgos/interface/TFileService.h>
+#include <FWCore/ServiceRegistry/interface/Service.h>
+#include <map>
 
+#include <TClonesArray.h>
+#include <TFile.h>
 #include <TROOT.h>
+#include <TString.h>
 #include <TTree.h>
-#include <TFile.h>
 #include <TVector.h>
-#include <TString.h>
-#include <TClonesArray.h>
 //#include<TObjString.h>
 
 // forward declarations
@@ -52,187 +52,180 @@ class EndOfRun;
 class EndOfEvent;
 class EndOfTrack;
 
-//Define a class StepID
+// Define a class StepID
 class StepID {
-
- private:
-  //G4 Region
+private:
+  // G4 Region
   G4String theG4RegionName;
-  //G4 Physical Process
+  // G4 Physical Process
   G4String theG4ProcessName;
-  //Particle PDG ID
+  // Particle PDG ID
   G4int theParticlePDGID;
-  
- public:
-  //Constructor using G4Step
-  StepID(const G4Step* theG4Step)
-    :
-    theG4RegionName("UNDEFINED"),
-    theG4ProcessName("UNDEFINED"),
-    theParticlePDGID(theG4Step->GetTrack()->GetDefinition()->GetPDGEncoding())
-    {
-      std::cout<<"Start"<<std::endl;
-      if (theG4Step->GetPreStepPoint()->GetPhysicalVolume()) {
-	  theG4RegionName = theG4Step->GetPreStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetRegion()->GetName();
-	}
-      std::cout<<"Physical Volume"<<std::endl;
-      if (theG4Step->GetPreStepPoint()->GetProcessDefinedStep()){
-	  theG4ProcessName = theG4Step->GetPreStepPoint()->GetProcessDefinedStep()->GetProcessName();
-	}
-      std::cout<<"Process Name"<<std::endl;
-    }
 
-  //Getters
-  G4String GetRegionName () const { return theG4RegionName; }
-  G4String GetProcessName () const { return theG4ProcessName; }
-  G4int GetParticlePDGID () const { return theParticlePDGID; }
+public:
+  // Constructor using G4Step
+  StepID(const G4Step *theG4Step)
+      : theG4RegionName("UNDEFINED"),
+        theG4ProcessName("UNDEFINED"),
+        theParticlePDGID(theG4Step->GetTrack()->GetDefinition()->GetPDGEncoding()) {
+    std::cout << "Start" << std::endl;
+    if (theG4Step->GetPreStepPoint()->GetPhysicalVolume()) {
+      theG4RegionName = theG4Step->GetPreStepPoint()->GetPhysicalVolume()->GetLogicalVolume()->GetRegion()->GetName();
+    }
+    std::cout << "Physical Volume" << std::endl;
+    if (theG4Step->GetPreStepPoint()->GetProcessDefinedStep()) {
+      theG4ProcessName = theG4Step->GetPreStepPoint()->GetProcessDefinedStep()->GetProcessName();
+    }
+    std::cout << "Process Name" << std::endl;
+  }
 
-  //Comparison Operators (necessary in order to use StepID as a key in a map)
-  bool operator==(const StepID& id) const{
-    return ( strcmp(theG4RegionName,id.GetRegionName())==0 && strcmp(theG4ProcessName,id.GetProcessName())==0 && theParticlePDGID==id.GetParticlePDGID() ) ? true : false;
+  // Getters
+  G4String GetRegionName() const { return theG4RegionName; }
+  G4String GetProcessName() const { return theG4ProcessName; }
+  G4int GetParticlePDGID() const { return theParticlePDGID; }
+
+  // Comparison Operators (necessary in order to use StepID as a key in a map)
+  bool operator==(const StepID &id) const {
+    return (strcmp(theG4RegionName, id.GetRegionName()) == 0 && strcmp(theG4ProcessName, id.GetProcessName()) == 0 &&
+            theParticlePDGID == id.GetParticlePDGID())
+               ? true
+               : false;
   }
-  
-  bool operator<(const StepID& id) const
-    {
-      if (theParticlePDGID != id.GetParticlePDGID()){
-	return (theParticlePDGID > id.GetParticlePDGID());
-      }
-      else if (strcmp(theG4RegionName,id.GetRegionName())!=0){
-	return strcmp(theG4RegionName,id.GetRegionName())>0 ? true : false;
-      }
-      else if (strcmp(theG4ProcessName,id.GetProcessName())!=0){
-	return strcmp(theG4ProcessName,id.GetProcessName())>0 ? true : false;
-      }
-      else {//The case in which they are all equal!
-	return false;
-      }
+
+  bool operator<(const StepID &id) const {
+    if (theParticlePDGID != id.GetParticlePDGID()) {
+      return (theParticlePDGID > id.GetParticlePDGID());
+    } else if (strcmp(theG4RegionName, id.GetRegionName()) != 0) {
+      return strcmp(theG4RegionName, id.GetRegionName()) > 0 ? true : false;
+    } else if (strcmp(theG4ProcessName, id.GetProcessName()) != 0) {
+      return strcmp(theG4ProcessName, id.GetProcessName()) > 0 ? true : false;
+    } else {  // The case in which they are all equal!
+      return false;
     }
+  }
 
-  bool operator>(const StepID& id) const
-    {
-      if(theParticlePDGID != id.GetParticlePDGID()){
-        return (theParticlePDGID < id.GetParticlePDGID());
-      }
-      else if(strcmp(theG4RegionName,id.GetRegionName())!=0){
-        return strcmp(theG4RegionName,id.GetRegionName())<0 ? true : false;
-      }
-      else if (strcmp(theG4ProcessName,id.GetProcessName())!=0){
-        return strcmp(theG4ProcessName,id.GetProcessName())<0 ? true : false;
-      }
-      else {//The case in which they are all equal!
-	return false;
-      }
+  bool operator>(const StepID &id) const {
+    if (theParticlePDGID != id.GetParticlePDGID()) {
+      return (theParticlePDGID < id.GetParticlePDGID());
+    } else if (strcmp(theG4RegionName, id.GetRegionName()) != 0) {
+      return strcmp(theG4RegionName, id.GetRegionName()) < 0 ? true : false;
+    } else if (strcmp(theG4ProcessName, id.GetProcessName()) != 0) {
+      return strcmp(theG4ProcessName, id.GetProcessName()) < 0 ? true : false;
+    } else {  // The case in which they are all equal!
+      return false;
     }
+  }
 };
 
-#define OBSERVES(type) public Observer<const type*>
-#define UPDATE(type) void update(const type*) override { std::cout <<"++ signal " #type<<std::endl; }
-class G4StepStatistics : public SimWatcher, 
-OBSERVES(DDDWorld),
-OBSERVES(BeginOfJob),
-OBSERVES(BeginOfRun),
-OBSERVES(BeginOfEvent),
-OBSERVES(BeginOfTrack),
-OBSERVES(G4Step),
-OBSERVES(EndOfRun),
-OBSERVES(EndOfEvent),
-OBSERVES(EndOfTrack)
-{
-   public:
-   G4StepStatistics(const edm::ParameterSet& pSet) : 
-     m_verbose(pSet.getUntrackedParameter<bool>("verbose",false)),
-     Event(0)
-     {
-       //Adding TFile Service output
-       G4StepTree = fs->make<TTree>("G4StepTree","G4Step Tree ");
-       G4StepTree->Branch("Event",&Event,"Event/I");
-       G4StepTree->Branch("PDGID",&PDGID,"PDGID[100000]/I");
-       Region = new TClonesArray("TObjString",100000);
-       G4StepTree->Branch("Region",&Region);
-       Process = new TClonesArray("TObjString",100000);
-       G4StepTree->Branch("Process",&Process);
-       G4StepTree->Branch("G4StepFreq",&G4StepFreq,"G4StepFreq[100000]/I");
-     }
-UPDATE(DDDWorld)
-UPDATE(BeginOfJob)
-UPDATE(BeginOfRun)
+#define OBSERVES(type) \
+public                 \
+  Observer<const type *>
+#define UPDATE(type) \
+  void update(const type *) override { std::cout << "++ signal " #type << std::endl; }
+class G4StepStatistics : public SimWatcher,
+                         OBSERVES(DDDWorld),
+                         OBSERVES(BeginOfJob),
+                         OBSERVES(BeginOfRun),
+                         OBSERVES(BeginOfEvent),
+                         OBSERVES(BeginOfTrack),
+                         OBSERVES(G4Step),
+                         OBSERVES(EndOfRun),
+                         OBSERVES(EndOfEvent),
+                         OBSERVES(EndOfTrack) {
+public:
+  G4StepStatistics(const edm::ParameterSet &pSet)
+      : m_verbose(pSet.getUntrackedParameter<bool>("verbose", false)), Event(0) {
+    // Adding TFile Service output
+    G4StepTree = fs->make<TTree>("G4StepTree", "G4Step Tree ");
+    G4StepTree->Branch("Event", &Event, "Event/I");
+    G4StepTree->Branch("PDGID", &PDGID, "PDGID[100000]/I");
+    Region = new TClonesArray("TObjString", 100000);
+    G4StepTree->Branch("Region", &Region);
+    Process = new TClonesArray("TObjString", 100000);
+    G4StepTree->Branch("Process", &Process);
+    G4StepTree->Branch("G4StepFreq", &G4StepFreq, "G4StepFreq[100000]/I");
+  }
+  UPDATE(DDDWorld)
+  UPDATE(BeginOfJob)
+  UPDATE(BeginOfRun)
   //    void update(const BeginOfRun* iRun) {
-  //std::cout <<"++ signal BeginOfRun " <<std::endl;
+  // std::cout <<"++ signal BeginOfRun " <<std::endl;
   //}
-UPDATE(BeginOfEvent)
-UPDATE(BeginOfTrack)
-   void update(const G4Step* iStep) override { 
-   std::cout <<"++ signal G4Step " ;
-   //Dump the relevant information from the G4 step in the object mysteptest
-   StepID mysteptest(iStep);
-   //Add the StepID to the map, or increment if it already exists:
-   if ( G4StatsMap.find(mysteptest) == G4StatsMap.end() )
-     {
-       //Allocating new memory for a pointer to associate with the key mysteptest
-       //in our map. Initializing it to 1,will be incremented working on the value of the pointer.
-       unsigned int* MyValue = new unsigned int(1);
-       //Inserting the new key,value pair
-       G4StatsMap.insert(std::make_pair(mysteptest, MyValue));
-     }
-   else
-     {
-       //Incrementing the value of the pointer by 1
-       *G4StatsMap[mysteptest] = *G4StatsMap[mysteptest] + 1;
-        }
-   
-   //If the verbose flag is set, then dump the information
-   if (m_verbose) {
-     std::cout << " StepID RegionName: "<< mysteptest.GetRegionName();
-     std::cout << " StepID ProcessName: "<< mysteptest.GetProcessName();
-     std::cout << " StepID ParticlePDGID: "<< mysteptest.GetParticlePDGID();
-   }
-   std::cout<<std::endl;
-}
-//UPDATE(G4Step)
-UPDATE(EndOfRun)
+  UPDATE(BeginOfEvent)
+  UPDATE(BeginOfTrack)
+  void update(const G4Step *iStep) override {
+    std::cout << "++ signal G4Step ";
+    // Dump the relevant information from the G4 step in the object mysteptest
+    StepID mysteptest(iStep);
+    // Add the StepID to the map, or increment if it already exists:
+    if (G4StatsMap.find(mysteptest) == G4StatsMap.end()) {
+      // Allocating new memory for a pointer to associate with the key
+      // mysteptest in our map. Initializing it to 1,will be incremented working
+      // on the value of the pointer.
+      unsigned int *MyValue = new unsigned int(1);
+      // Inserting the new key,value pair
+      G4StatsMap.insert(std::make_pair(mysteptest, MyValue));
+    } else {
+      // Incrementing the value of the pointer by 1
+      *G4StatsMap[mysteptest] = *G4StatsMap[mysteptest] + 1;
+    }
+
+    // If the verbose flag is set, then dump the information
+    if (m_verbose) {
+      std::cout << " StepID RegionName: " << mysteptest.GetRegionName();
+      std::cout << " StepID ProcessName: " << mysteptest.GetProcessName();
+      std::cout << " StepID ParticlePDGID: " << mysteptest.GetParticlePDGID();
+    }
+    std::cout << std::endl;
+  }
+  // UPDATE(G4Step)
+  UPDATE(EndOfRun)
   //  void update(const EndOfRun* iRun) {
-  //std::cout <<"++ signal EndOfRun " <<std::endl;
+  // std::cout <<"++ signal EndOfRun " <<std::endl;
   //}
-  
-  //UPDATE(EndOfEvent)
-  void update(const EndOfEvent* iRun) override {
-  std::cout <<"++ signal EndOfEvent " <<std::endl;
-  Event++;
-  
-  //Dumping the map in the log if verbose is chosen:
-  if(m_verbose) {
-    std::cout <<" G4StatsMap size is: "<<G4StatsMap.size()<<std::endl;
-  }
-  int index(0);
-  for (std::map<const StepID,unsigned int*>::const_iterator step = G4StatsMap.begin(); step != G4StatsMap.end(); ++step, ++index){
-    if(m_verbose) {
-      std::cout <<" G4StatsMap step is: "<<step->first.GetRegionName()<<" "<<step->first.GetProcessName()<<" "<<step->first.GetParticlePDGID();//<<" "<<step->first.GetTrackID() ;
-      std::cout <<" Number of such steps: "<< *step->second <<std::endl;
+
+  // UPDATE(EndOfEvent)
+  void update(const EndOfEvent *iRun) override {
+    std::cout << "++ signal EndOfEvent " << std::endl;
+    Event++;
+
+    // Dumping the map in the log if verbose is chosen:
+    if (m_verbose) {
+      std::cout << " G4StatsMap size is: " << G4StatsMap.size() << std::endl;
     }
-    //Rolling the map into 5 "arrays", containing the StepID information and the G4Step statistics
-    PDGID[index]=step->first.GetParticlePDGID();
-    new ((*Region)[index]) TObjString (step->first.GetRegionName());
-    new ((*Process)[index]) TObjString (step->first.GetProcessName());
-    G4StepFreq[index]=*step->second;
+    int index(0);
+    for (std::map<const StepID, unsigned int *>::const_iterator step = G4StatsMap.begin(); step != G4StatsMap.end();
+         ++step, ++index) {
+      if (m_verbose) {
+        std::cout << " G4StatsMap step is: " << step->first.GetRegionName() << " " << step->first.GetProcessName()
+                  << " " << step->first.GetParticlePDGID();  //<<" "<<step->first.GetTrackID() ;
+        std::cout << " Number of such steps: " << *step->second << std::endl;
+      }
+      // Rolling the map into 5 "arrays", containing the StepID information and
+      // the G4Step statistics
+      PDGID[index] = step->first.GetParticlePDGID();
+      new ((*Region)[index]) TObjString(step->first.GetRegionName());
+      new ((*Process)[index]) TObjString(step->first.GetProcessName());
+      G4StepFreq[index] = *step->second;
+    }
+
+    G4StepTree->Fill();
   }
-  
-  G4StepTree->Fill();
-}
-UPDATE(EndOfTrack)
-
-  private:
- 
- bool m_verbose;
- 
-//Adding the G4StatsMap to keep track of statistics in terms of step information... 
- std::map<const StepID,unsigned int*> G4StatsMap;
- edm::Service<TFileService> fs;
- TTree* G4StepTree;
- unsigned int Event;
- Int_t PDGID[100000];
- TClonesArray* Region;
- TClonesArray* Process;
- Int_t G4StepFreq[100000];
+  UPDATE(EndOfTrack)
+
+private:
+  bool m_verbose;
+
+  // Adding the G4StatsMap to keep track of statistics in terms of step
+  // information...
+  std::map<const StepID, unsigned int *> G4StatsMap;
+  edm::Service<TFileService> fs;
+  TTree *G4StepTree;
+  unsigned int Event;
+  Int_t PDGID[100000];
+  TClonesArray *Region;
+  TClonesArray *Process;
+  Int_t G4StepFreq[100000];
 };
 
 #endif
diff --git a/SimG4Core/HelpfulWatchers/src/MonopoleSteppingAction.cc b/SimG4Core/HelpfulWatchers/src/MonopoleSteppingAction.cc
index 4dbd08365619c..f7a5d07d512df 100644
--- a/SimG4Core/HelpfulWatchers/src/MonopoleSteppingAction.cc
+++ b/SimG4Core/HelpfulWatchers/src/MonopoleSteppingAction.cc
@@ -12,142 +12,122 @@
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 
-#include "G4Track.hh"
-#include "G4Run.hh"
 #include "G4Event.hh"
 #include "G4ParticleTable.hh"
+#include "G4Run.hh"
+#include "G4Track.hh"
 
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 
-MonopoleSteppingAction::MonopoleSteppingAction(edm::ParameterSet const & p) :
-  actOnTrack (false), bZ(0) {
-  mode = p.getUntrackedParameter<bool>("ChangeFromFirstStep",true);
+MonopoleSteppingAction::MonopoleSteppingAction(edm::ParameterSet const &p) : actOnTrack(false), bZ(0) {
+  mode = p.getUntrackedParameter<bool>("ChangeFromFirstStep", true);
   edm::LogInfo("SimG4CoreWatcher") << "MonopoleSeppingAction set mode for"
-				   << " start at first step to " << mode;
+                                   << " start at first step to " << mode;
 }
 
 MonopoleSteppingAction::~MonopoleSteppingAction() {}
 
-void MonopoleSteppingAction::update(const BeginOfJob* job) {
-
-  const edm::EventSetup* iSetup = (*job)();
+void MonopoleSteppingAction::update(const BeginOfJob *job) {
+  const edm::EventSetup *iSetup = (*job)();
   edm::ESHandle<MagneticField> bFieldH;
   iSetup->get<IdealMagneticFieldRecord>().get(bFieldH);
   const MagneticField *bField = bFieldH.product();
-  const GlobalPoint p(0,0,0);
+  const GlobalPoint p(0, 0, 0);
   bZ = (bField->inTesla(p)).z();
-  edm::LogInfo("SimG4CoreWatcher") << "Magnetic Field (X): " 
-				   << (bField->inTesla(p)).x() << " Y: "
-				   << (bField->inTesla(p)).y() << " Z: "
-				   << bZ;
+  edm::LogInfo("SimG4CoreWatcher") << "Magnetic Field (X): " << (bField->inTesla(p)).x()
+                                   << " Y: " << (bField->inTesla(p)).y() << " Z: " << bZ;
 }
 
-void MonopoleSteppingAction::update(const BeginOfRun* ) {
-
-  G4ParticleTable * partTable = G4ParticleTable::GetParticleTable();
-  magCharge = CLHEP::e_SI/CLHEP::fine_structure_const * 0.5;
-  for (int ii= 0; ii < partTable->size(); ii++) {
-    G4ParticleDefinition * particle = partTable->GetParticle(ii);
-    std::string particleName = (particle->GetParticleName()).substr(0,8);
-    if (strcmp(particleName.c_str(),"Monopole") == 0) {
-      magCharge = CLHEP::e_SI*((Monopole*)(particle))->MagneticCharge();
+void MonopoleSteppingAction::update(const BeginOfRun *) {
+  G4ParticleTable *partTable = G4ParticleTable::GetParticleTable();
+  magCharge = CLHEP::e_SI / CLHEP::fine_structure_const * 0.5;
+  for (int ii = 0; ii < partTable->size(); ii++) {
+    G4ParticleDefinition *particle = partTable->GetParticle(ii);
+    std::string particleName = (particle->GetParticleName()).substr(0, 8);
+    if (strcmp(particleName.c_str(), "Monopole") == 0) {
+      magCharge = CLHEP::e_SI * ((Monopole *)(particle))->MagneticCharge();
       pdgCode.push_back(particle->GetPDGEncoding());
     }
   }
-  edm::LogInfo("SimG4CoreWatcher") << "MonopoleSeppingAction Finds "
-				   << pdgCode.size() << " candidates";
-  for (unsigned int ii=0; ii<pdgCode.size(); ++ii) {
-    edm::LogInfo("SimG4CoreWatcher") << "PDG Code[" << ii << "] = "
-				     << pdgCode[ii];
+  edm::LogInfo("SimG4CoreWatcher") << "MonopoleSeppingAction Finds " << pdgCode.size() << " candidates";
+  for (unsigned int ii = 0; ii < pdgCode.size(); ++ii) {
+    edm::LogInfo("SimG4CoreWatcher") << "PDG Code[" << ii << "] = " << pdgCode[ii];
   }
-  cMevToJ   = CLHEP::e_SI/CLHEP::eV;
-  cMeVToKgMByS = CLHEP::e_SI*CLHEP::meter/(CLHEP::eV*CLHEP::c_light*CLHEP::second);
-  cInMByS   = CLHEP::c_light*CLHEP::second/CLHEP::meter;
-  edm::LogInfo("SimG4CoreWatcher") << "MonopoleSeppingAction Constants:" 
-				   << " MevToJoules  = " << cMevToJ 
-				   << ", MevToKgm/s  = " << cMeVToKgMByS
-				   << ", c in m/s    = " << cInMByS 
-				   << ", mag. charge = " << magCharge;
+  cMevToJ = CLHEP::e_SI / CLHEP::eV;
+  cMeVToKgMByS = CLHEP::e_SI * CLHEP::meter / (CLHEP::eV * CLHEP::c_light * CLHEP::second);
+  cInMByS = CLHEP::c_light * CLHEP::second / CLHEP::meter;
+  edm::LogInfo("SimG4CoreWatcher") << "MonopoleSeppingAction Constants:"
+                                   << " MevToJoules  = " << cMevToJ << ", MevToKgm/s  = " << cMeVToKgMByS
+                                   << ", c in m/s    = " << cInMByS << ", mag. charge = " << magCharge;
 }
 
-void MonopoleSteppingAction::update(const BeginOfTrack * trk) {
-
+void MonopoleSteppingAction::update(const BeginOfTrack *trk) {
   actOnTrack = false;
   if (!pdgCode.empty()) {
-    const G4Track * aTrack = (*trk)();
+    const G4Track *aTrack = (*trk)();
     int code = aTrack->GetDefinition()->GetPDGEncoding();
-    if (std::count(pdgCode.begin(),pdgCode.end(),code) > 0) {
+    if (std::count(pdgCode.begin(), pdgCode.end(), code) > 0) {
       actOnTrack = true;
-      eStart     = aTrack->GetTotalEnergy();
-      pxStart    = aTrack->GetMomentum().x();
-      pyStart    = aTrack->GetMomentum().y();
-      pzStart    = aTrack->GetMomentum().z();
-      dirxStart  = aTrack->GetMomentumDirection().x();
-      diryStart  = aTrack->GetMomentumDirection().y();
-      dirzStart  = aTrack->GetMomentumDirection().z();
-      LogDebug("SimG4CoreWatcher") << "MonopoleSeppingAction Track " 
-				   << code << " Flag " << actOnTrack
-				   << " (px,py,pz,E) = (" << pxStart/GeV
-				   << ", " << pyStart/GeV << ", "
-				   <<pzStart/GeV <<", " <<eStart/GeV <<")";
+      eStart = aTrack->GetTotalEnergy();
+      pxStart = aTrack->GetMomentum().x();
+      pyStart = aTrack->GetMomentum().y();
+      pzStart = aTrack->GetMomentum().z();
+      dirxStart = aTrack->GetMomentumDirection().x();
+      diryStart = aTrack->GetMomentumDirection().y();
+      dirzStart = aTrack->GetMomentumDirection().z();
+      LogDebug("SimG4CoreWatcher") << "MonopoleSeppingAction Track " << code << " Flag " << actOnTrack
+                                   << " (px,py,pz,E) = (" << pxStart / GeV << ", " << pyStart / GeV << ", "
+                                   << pzStart / GeV << ", " << eStart / GeV << ")";
     }
   }
 }
 
-void MonopoleSteppingAction::update(const G4Step* aStep) {
-
+void MonopoleSteppingAction::update(const G4Step *aStep) {
   if (actOnTrack) {
     double eT, pT, pZ, tStep;
-    G4Track* aTrack = aStep->GetTrack();
-    G4ThreeVector initialPosition(0,0,0);
+    G4Track *aTrack = aStep->GetTrack();
+    G4ThreeVector initialPosition(0, 0, 0);
     if (mode) {
       tStep = aTrack->GetGlobalTime();
-      eT    = eStart*std::sqrt(dirxStart*dirxStart+diryStart*diryStart);
-      pT    = std::sqrt(pxStart*pxStart+pyStart*pyStart);
-      pZ    = pzStart;
+      eT = eStart * std::sqrt(dirxStart * dirxStart + diryStart * diryStart);
+      pT = std::sqrt(pxStart * pxStart + pyStart * pyStart);
+      pZ = pzStart;
     } else {
-      const G4ThreeVector& dirStep = aTrack->GetMomentumDirection();
-      double        lStep   = aTrack->GetStepLength();
-      double        xStep   = aTrack->GetPosition().x()-lStep*dirStep.x();
-      double        yStep   = aTrack->GetPosition().y()-lStep*dirStep.y();
-      double        zStep   = aTrack->GetPosition().z()-lStep*dirStep.z();
-      double        vStep   = aTrack->GetVelocity();
-      initialPosition       = G4ThreeVector(xStep,yStep,zStep);
-      tStep                 = (vStep > 0. ? (lStep/vStep) : 0.);
-      double        eStep   = aTrack->GetTotalEnergy();
-      eT                    = eStep*dirStep.perp();
-      pT                    = aTrack->GetMomentum().perp();
-      pZ                    = aTrack->GetMomentum().z();
+      const G4ThreeVector &dirStep = aTrack->GetMomentumDirection();
+      double lStep = aTrack->GetStepLength();
+      double xStep = aTrack->GetPosition().x() - lStep * dirStep.x();
+      double yStep = aTrack->GetPosition().y() - lStep * dirStep.y();
+      double zStep = aTrack->GetPosition().z() - lStep * dirStep.z();
+      double vStep = aTrack->GetVelocity();
+      initialPosition = G4ThreeVector(xStep, yStep, zStep);
+      tStep = (vStep > 0. ? (lStep / vStep) : 0.);
+      double eStep = aTrack->GetTotalEnergy();
+      eT = eStep * dirStep.perp();
+      pT = aTrack->GetMomentum().perp();
+      pZ = aTrack->GetMomentum().z();
     }
-    LogDebug("SimG4CoreWatcher") << "MonopoleSeppingAction: tStep " <<tStep
-				 << " eT " << eT << " pT " << pT << " pZ " 
-				 << pZ;
-    double eT1 = eT*cMevToJ;
-    double pT1 = pT*cMeVToKgMByS;
-    double pZ1 = pZ*cMeVToKgMByS;
-    double ts1 = tStep/CLHEP::second;
-    double eT2 = (eT1 > 0. ? (1./eT1) : 0.);
-    double fac0 = magCharge*bZ*cInMByS;
-    double fac2 = pZ1*cInMByS*eT2;
-    double fac1 = fac0*cInMByS*ts1*eT2 + fac2;
-    double fact1 = (eT1/fac0)*(std::sqrt(1+fac1*fac1)-std::sqrt(1+fac2*fac2));
-    double fact2 = (pT1/(magCharge*bZ)*(asinh(fac1)-asinh(fac2)));
-    LogDebug("SimG4CoreWatcher") << "MonopoleSeppingAction: Factor eT = "
-				 << eT << " " << eT1 << " " << eT2
-				 << ", pT = " << pT << " " << pT1
-				 << ", pZ = " << pZ << " " << pZ1
-				 << ", time = " << tStep << " " << ts1
-				 << ", Factors " << fac0 << " " << fac1 
-				 << " " << fac2 << ", Final ones " 
-				 << fact1 << " " << fact2;
-    G4ThreeVector ez(0,0,1), et(std::sqrt(0.5),std::sqrt(0.5),0);
-    G4ThreeVector displacement = (fact1*ez + fact2*et)*CLHEP::m;
-    
-    LogDebug("SimG4CoreWatcher") << "MonopoleSeppingAction: Initial " 
-				 << initialPosition << " Displacement "
-				 << displacement << " Final "
-				 << (initialPosition+displacement);
-    aTrack->SetPosition(initialPosition+displacement);
+    LogDebug("SimG4CoreWatcher") << "MonopoleSeppingAction: tStep " << tStep << " eT " << eT << " pT " << pT << " pZ "
+                                 << pZ;
+    double eT1 = eT * cMevToJ;
+    double pT1 = pT * cMeVToKgMByS;
+    double pZ1 = pZ * cMeVToKgMByS;
+    double ts1 = tStep / CLHEP::second;
+    double eT2 = (eT1 > 0. ? (1. / eT1) : 0.);
+    double fac0 = magCharge * bZ * cInMByS;
+    double fac2 = pZ1 * cInMByS * eT2;
+    double fac1 = fac0 * cInMByS * ts1 * eT2 + fac2;
+    double fact1 = (eT1 / fac0) * (std::sqrt(1 + fac1 * fac1) - std::sqrt(1 + fac2 * fac2));
+    double fact2 = (pT1 / (magCharge * bZ) * (asinh(fac1) - asinh(fac2)));
+    LogDebug("SimG4CoreWatcher") << "MonopoleSeppingAction: Factor eT = " << eT << " " << eT1 << " " << eT2
+                                 << ", pT = " << pT << " " << pT1 << ", pZ = " << pZ << " " << pZ1
+                                 << ", time = " << tStep << " " << ts1 << ", Factors " << fac0 << " " << fac1 << " "
+                                 << fac2 << ", Final ones " << fact1 << " " << fact2;
+    G4ThreeVector ez(0, 0, 1), et(std::sqrt(0.5), std::sqrt(0.5), 0);
+    G4ThreeVector displacement = (fact1 * ez + fact2 * et) * CLHEP::m;
+
+    LogDebug("SimG4CoreWatcher") << "MonopoleSeppingAction: Initial " << initialPosition << " Displacement "
+                                 << displacement << " Final " << (initialPosition + displacement);
+    aTrack->SetPosition(initialPosition + displacement);
   }
 }
diff --git a/SimG4Core/HelpfulWatchers/src/SimTracer.h b/SimG4Core/HelpfulWatchers/src/SimTracer.h
index 8a2cbcd0774de..cdc90f8d7e405 100644
--- a/SimG4Core/HelpfulWatchers/src/SimTracer.h
+++ b/SimG4Core/HelpfulWatchers/src/SimTracer.h
@@ -4,7 +4,7 @@
 //
 // Package:     HelpfulWatchers
 // Class  :     SimTracer
-// 
+//
 /**\class SimTracer SimTracer.h SimG4Core/HelpfulWatchers/interface/SimTracer.h
 
  Description: Prints a message for each Oscar signal
@@ -14,7 +14,7 @@
 
 */
 //
-// Original Author:  
+// Original Author:
 //         Created:  Tue Nov 22 16:41:33 EST 2005
 //
 
@@ -22,10 +22,10 @@
 #include <iostream>
 
 // user include files
-#include "SimG4Core/Notification/interface/Observer.h"
-#include "SimG4Core/Watcher/interface/SimWatcher.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "G4Step.hh"
+#include "SimG4Core/Notification/interface/Observer.h"
+#include "SimG4Core/Watcher/interface/SimWatcher.h"
 
 // forward declarations
 class DDDWorld;
@@ -39,61 +39,59 @@ class EndOfRun;
 class EndOfEvent;
 class EndOfTrack;
 
-#define OBSERVES(type) public Observer<const type*>
-#define UPDATE(type) void update(const type*) override { std::cout <<"++ signal " #type<<std::endl; }
-class SimTracer : public SimWatcher, 
-OBSERVES(DDDWorld),
-OBSERVES(BeginOfJob),
-OBSERVES(BeginOfRun),
-OBSERVES(BeginOfEvent),
-OBSERVES(BeginOfTrack),
-OBSERVES(G4Step),
-OBSERVES(EndOfRun),
-OBSERVES(EndOfEvent),
-OBSERVES(EndOfTrack)
-{
-
-   public:
-   SimTracer(const edm::ParameterSet& pSet) : 
-   m_verbose(pSet.getUntrackedParameter<bool>("verbose",false)) {
-   }
-     //virtual ~SimTracer();
-
-      // ---------- const member functions ---------------------
-
-      // ---------- static member functions --------------------
-
-      // ---------- member functions ---------------------------
-UPDATE(DDDWorld)
-UPDATE(BeginOfJob)
-UPDATE(BeginOfRun)
-UPDATE(BeginOfEvent)
-UPDATE(BeginOfTrack)
-   void update(const G4Step* iStep) override { 
-   std::cout <<"++ signal G4Step " ;
-   if(m_verbose) {
-      const G4StepPoint* post = iStep->GetPostStepPoint();
-      const G4ThreeVector& pos = post->GetPosition();
-      std::cout << "( "<<pos.x()<<","<<pos.y()<<","<<pos.z()<<") ";
-      if(post->GetPhysicalVolume()) {
-	 std::cout << post->GetPhysicalVolume()->GetName();
+#define OBSERVES(type) \
+public                 \
+  Observer<const type *>
+#define UPDATE(type) \
+  void update(const type *) override { std::cout << "++ signal " #type << std::endl; }
+class SimTracer : public SimWatcher,
+                  OBSERVES(DDDWorld),
+                  OBSERVES(BeginOfJob),
+                  OBSERVES(BeginOfRun),
+                  OBSERVES(BeginOfEvent),
+                  OBSERVES(BeginOfTrack),
+                  OBSERVES(G4Step),
+                  OBSERVES(EndOfRun),
+                  OBSERVES(EndOfEvent),
+                  OBSERVES(EndOfTrack) {
+public:
+  SimTracer(const edm::ParameterSet &pSet) : m_verbose(pSet.getUntrackedParameter<bool>("verbose", false)) {}
+  // virtual ~SimTracer();
+
+  // ---------- const member functions ---------------------
+
+  // ---------- static member functions --------------------
+
+  // ---------- member functions ---------------------------
+  UPDATE(DDDWorld)
+  UPDATE(BeginOfJob)
+  UPDATE(BeginOfRun)
+  UPDATE(BeginOfEvent)
+  UPDATE(BeginOfTrack)
+  void update(const G4Step *iStep) override {
+    std::cout << "++ signal G4Step ";
+    if (m_verbose) {
+      const G4StepPoint *post = iStep->GetPostStepPoint();
+      const G4ThreeVector &pos = post->GetPosition();
+      std::cout << "( " << pos.x() << "," << pos.y() << "," << pos.z() << ") ";
+      if (post->GetPhysicalVolume()) {
+        std::cout << post->GetPhysicalVolume()->GetName();
       }
-   }
-   std::cout <<std::endl; 
-}
-//UPDATE(G4Step)
-UPDATE(EndOfRun)
-UPDATE(EndOfEvent)
-UPDATE(EndOfTrack)
+    }
+    std::cout << std::endl;
+  }
+  // UPDATE(G4Step)
+  UPDATE(EndOfRun)
+  UPDATE(EndOfEvent)
+  UPDATE(EndOfTrack)
 
-   private:
-     //SimTracer(const SimTracer&); // stop default
+private:
+  // SimTracer(const SimTracer&); // stop default
 
-     //const SimTracer& operator=(const SimTracer&); // stop default
+  // const SimTracer& operator=(const SimTracer&); // stop default
 
-     // ---------- member data --------------------------------
-     bool m_verbose;
+  // ---------- member data --------------------------------
+  bool m_verbose;
 };
 
-
 #endif
diff --git a/SimG4Core/HelpfulWatchers/src/module.cc b/SimG4Core/HelpfulWatchers/src/module.cc
index 4901ab5caf411..da95f91b59a4d 100644
--- a/SimG4Core/HelpfulWatchers/src/module.cc
+++ b/SimG4Core/HelpfulWatchers/src/module.cc
@@ -1,19 +1,19 @@
-#include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
-#include "SimG4Core/HelpfulWatchers/src/SimTracer.h"
 #include "SimG4Core/HelpfulWatchers/src/BeginOfTrackCounter.h"
-//Adding a Watcher to collect G4step statistics:
-#include "SimG4Core/HelpfulWatchers/src/G4StepStatistics.h"
+#include "SimG4Core/HelpfulWatchers/src/SimTracer.h"
+#include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
+// Adding a Watcher to collect G4step statistics:
 #include "SimG4Core/HelpfulWatchers/interface/MonopoleSteppingAction.h"
+#include "SimG4Core/HelpfulWatchers/src/G4StepStatistics.h"
 
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 
 using namespace simwatcher;
 
-DEFINE_SIMWATCHER (SimTracer);
-DEFINE_SIMWATCHER (BeginOfTrackCounter);
+DEFINE_SIMWATCHER(SimTracer);
+DEFINE_SIMWATCHER(BeginOfTrackCounter);
 
-//Adding a Watcher to collect G4step statistics:
-DEFINE_SIMWATCHER (G4StepStatistics);
+// Adding a Watcher to collect G4step statistics:
+DEFINE_SIMWATCHER(G4StepStatistics);
 
-//Adding a Watcher to take care of steps of a monopole:
-DEFINE_SIMWATCHER (MonopoleSteppingAction);
+// Adding a Watcher to take care of steps of a monopole:
+DEFINE_SIMWATCHER(MonopoleSteppingAction);
diff --git a/SimG4Core/KillSecondaries/interface/KillSecondariesRunAction.h b/SimG4Core/KillSecondaries/interface/KillSecondariesRunAction.h
index 5ed93dcd276dd..72d194e3b3321 100644
--- a/SimG4Core/KillSecondaries/interface/KillSecondariesRunAction.h
+++ b/SimG4Core/KillSecondaries/interface/KillSecondariesRunAction.h
@@ -1,21 +1,17 @@
 #ifndef SimG4Core_KillSecondariesRunAction_H
 #define SimG4Core_KillSecondariesRunAction_H
 
-#include "SimG4Core/Watcher/interface/SimWatcher.h"
-#include "SimG4Core/Notification/interface/Observer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-   
+#include "SimG4Core/Notification/interface/Observer.h"
+#include "SimG4Core/Watcher/interface/SimWatcher.h"
+
 class BeginOfRun;
 
-class KillSecondariesRunAction : public SimWatcher,
-				 public Observer<const BeginOfRun *> 
-{
+class KillSecondariesRunAction : public SimWatcher, public Observer<const BeginOfRun *> {
 public:
-    KillSecondariesRunAction(edm::ParameterSet const & p);
-    ~KillSecondariesRunAction() override;
-    void update(const BeginOfRun * run) override;
+  KillSecondariesRunAction(edm::ParameterSet const &p);
+  ~KillSecondariesRunAction() override;
+  void update(const BeginOfRun *run) override;
 };
 
 #endif
-
-
diff --git a/SimG4Core/KillSecondaries/interface/KillSecondariesStackingAction.h b/SimG4Core/KillSecondaries/interface/KillSecondariesStackingAction.h
index d23d94a415825..4cac0e8a27c16 100644
--- a/SimG4Core/KillSecondaries/interface/KillSecondariesStackingAction.h
+++ b/SimG4Core/KillSecondaries/interface/KillSecondariesStackingAction.h
@@ -5,109 +5,11 @@
 
 class G4Track;
 
-class KillSecondariesStackingAction : public G4UserStackingAction 
-{
+class KillSecondariesStackingAction : public G4UserStackingAction {
 public:
-    KillSecondariesStackingAction() {}
-    ~KillSecondariesStackingAction() override {}	
-    G4ClassificationOfNewTrack ClassifyNewTrack(const G4Track *) override;
+  KillSecondariesStackingAction() {}
+  ~KillSecondariesStackingAction() override {}
+  G4ClassificationOfNewTrack ClassifyNewTrack(const G4Track *) override;
 };
 
-#endif 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#endif
diff --git a/SimG4Core/KillSecondaries/interface/KillSecondariesTrackAction.h b/SimG4Core/KillSecondaries/interface/KillSecondariesTrackAction.h
index 641c20dec2b1c..27fcd3883d02c 100644
--- a/SimG4Core/KillSecondaries/interface/KillSecondariesTrackAction.h
+++ b/SimG4Core/KillSecondaries/interface/KillSecondariesTrackAction.h
@@ -1,25 +1,21 @@
 #ifndef SimG4Core_KillSecondariesTrackAction_H
 #define SimG4Core_KillSecondariesTrackAction_H
 
-#include "SimG4Core/Watcher/interface/SimWatcher.h"
-#include "SimG4Core/Notification/interface/Observer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-   
-class BeginOfTrack;
+#include "SimG4Core/Notification/interface/Observer.h"
+#include "SimG4Core/Watcher/interface/SimWatcher.h"
 
-class KillSecondariesTrackAction : public SimWatcher,
-  public Observer<const BeginOfTrack *> {
+class BeginOfTrack;
 
+class KillSecondariesTrackAction : public SimWatcher, public Observer<const BeginOfTrack *> {
 public:
-  KillSecondariesTrackAction(edm::ParameterSet const & p);
+  KillSecondariesTrackAction(edm::ParameterSet const &p);
   ~KillSecondariesTrackAction() override;
-  void update(const BeginOfTrack * trk) override;
+  void update(const BeginOfTrack *trk) override;
 
 private:
-  bool   killHeavy;
+  bool killHeavy;
   double kmaxIon, kmaxNeutron, kmaxProton;
 };
 
 #endif
-
-
diff --git a/SimG4Core/KillSecondaries/src/KillSecondariesRunAction.cc b/SimG4Core/KillSecondaries/src/KillSecondariesRunAction.cc
index 096107d999476..05626e5e0aaf1 100644
--- a/SimG4Core/KillSecondaries/src/KillSecondariesRunAction.cc
+++ b/SimG4Core/KillSecondaries/src/KillSecondariesRunAction.cc
@@ -6,15 +6,11 @@
 #include "G4Run.hh"
 #include "G4RunManagerKernel.hh"
 
-KillSecondariesRunAction::KillSecondariesRunAction(edm::ParameterSet const & p)
-    {}
+KillSecondariesRunAction::KillSecondariesRunAction(edm::ParameterSet const &p) {}
 
 KillSecondariesRunAction::~KillSecondariesRunAction() {}
- 
-void KillSecondariesRunAction::update(const BeginOfRun * r)
-{ 
-    std::cout << " Using KillSecondariesStackingAction!!! " << std::endl;
-    G4RunManagerKernel::GetRunManagerKernel()->GetEventManager()->
-	SetUserAction(new KillSecondariesStackingAction);
-}
 
+void KillSecondariesRunAction::update(const BeginOfRun *r) {
+  std::cout << " Using KillSecondariesStackingAction!!! " << std::endl;
+  G4RunManagerKernel::GetRunManagerKernel()->GetEventManager()->SetUserAction(new KillSecondariesStackingAction);
+}
diff --git a/SimG4Core/KillSecondaries/src/KillSecondariesStackingAction.cc b/SimG4Core/KillSecondaries/src/KillSecondariesStackingAction.cc
index 994fb2e5106d9..8df4084ab67f3 100644
--- a/SimG4Core/KillSecondaries/src/KillSecondariesStackingAction.cc
+++ b/SimG4Core/KillSecondaries/src/KillSecondariesStackingAction.cc
@@ -4,121 +4,14 @@
 
 #include "G4Track.hh"
 
-G4ClassificationOfNewTrack KillSecondariesStackingAction::ClassifyNewTrack(const G4Track * aTrack) {
-
+G4ClassificationOfNewTrack KillSecondariesStackingAction::ClassifyNewTrack(const G4Track *aTrack) {
   NewTrackAction newTA;
-  if (aTrack->GetCreatorProcess()==nullptr || aTrack->GetParentID()==0) {
+  if (aTrack->GetCreatorProcess() == nullptr || aTrack->GetParentID() == 0) {
     newTA.primary(aTrack);
     return fUrgent;
   } else {
-    const G4Track * mother = CurrentG4Track::track();
+    const G4Track *mother = CurrentG4Track::track();
     newTA.secondary(aTrack, *mother, 0);
     return fKill;
   }
-
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SimG4Core/KillSecondaries/src/KillSecondariesTrackAction.cc b/SimG4Core/KillSecondaries/src/KillSecondariesTrackAction.cc
index 256c78396c0ca..87fa095a8cb22 100644
--- a/SimG4Core/KillSecondaries/src/KillSecondariesTrackAction.cc
+++ b/SimG4Core/KillSecondaries/src/KillSecondariesTrackAction.cc
@@ -9,42 +9,35 @@
 
 using namespace CLHEP;
 
-KillSecondariesTrackAction::KillSecondariesTrackAction(edm::ParameterSet const & p) {
-
-  killHeavy      = p.getParameter<bool>("KillHeavy");
-  kmaxIon        = p.getParameter<double>("IonThreshold")*MeV;
-  kmaxProton     = p.getParameter<double>("ProtonThreshold")*MeV;
-  kmaxNeutron    = p.getParameter<double>("NeutronThreshold")*MeV;
+KillSecondariesTrackAction::KillSecondariesTrackAction(edm::ParameterSet const &p) {
+  killHeavy = p.getParameter<bool>("KillHeavy");
+  kmaxIon = p.getParameter<double>("IonThreshold") * MeV;
+  kmaxProton = p.getParameter<double>("ProtonThreshold") * MeV;
+  kmaxNeutron = p.getParameter<double>("NeutronThreshold") * MeV;
 
   edm::LogInfo("KillSecondaries") << "KillSecondariesTrackAction:: Killing"
-				  << " Flag " << killHeavy << " protons below "
-				  << kmaxProton << " MeV, neutrons below "
-				  << kmaxNeutron << " MeV and ions below " 
-				  << kmaxIon << " MeV\n";
+                                  << " Flag " << killHeavy << " protons below " << kmaxProton << " MeV, neutrons below "
+                                  << kmaxNeutron << " MeV and ions below " << kmaxIon << " MeV\n";
 }
 
 KillSecondariesTrackAction::~KillSecondariesTrackAction() {}
- 
-void KillSecondariesTrackAction::update(const BeginOfTrack * trk) {
 
+void KillSecondariesTrackAction::update(const BeginOfTrack *trk) {
   if (killHeavy) {
-    G4Track* theTrack = (G4Track*)((*trk)());
-    TrackInformation * trkInfo = (TrackInformation *)(theTrack->GetUserInformation());
+    G4Track *theTrack = (G4Track *)((*trk)());
+    TrackInformation *trkInfo = (TrackInformation *)(theTrack->GetUserInformation());
     if (trkInfo) {
       int pdg = theTrack->GetDefinition()->GetPDGEncoding();
-      if (!(trkInfo->isPrimary())) { // Only secondary particles
-	double ke = theTrack->GetKineticEnergy()/MeV;
-	if ((((pdg/1000000000 == 1 && ((pdg/10000)%100) > 0 &&
-	      ((pdg/10)%100) > 0)) && (ke<kmaxIon)) ||
-	    ((pdg == 2212) && (ke < kmaxProton)) ||
-	    ((pdg == 2112) && (ke < kmaxNeutron))) {
-	  theTrack->SetTrackStatus(fStopAndKill);
-	  edm::LogInfo("KillSecondaries") << "Kill Track " << theTrack->GetTrackID()
-					  << " Type " << theTrack->GetDefinition()->GetParticleName()	
-					  << " Kinetic Energy " << ke <<" MeV";
-	}
+      if (!(trkInfo->isPrimary())) {  // Only secondary particles
+        double ke = theTrack->GetKineticEnergy() / MeV;
+        if ((((pdg / 1000000000 == 1 && ((pdg / 10000) % 100) > 0 && ((pdg / 10) % 100) > 0)) && (ke < kmaxIon)) ||
+            ((pdg == 2212) && (ke < kmaxProton)) || ((pdg == 2112) && (ke < kmaxNeutron))) {
+          theTrack->SetTrackStatus(fStopAndKill);
+          edm::LogInfo("KillSecondaries")
+              << "Kill Track " << theTrack->GetTrackID() << " Type " << theTrack->GetDefinition()->GetParticleName()
+              << " Kinetic Energy " << ke << " MeV";
+        }
       }
     }
   }
 }
-
diff --git a/SimG4Core/KillSecondaries/src/module.cc b/SimG4Core/KillSecondaries/src/module.cc
index a7f373968f363..c850877013ea3 100644
--- a/SimG4Core/KillSecondaries/src/module.cc
+++ b/SimG4Core/KillSecondaries/src/module.cc
@@ -1,8 +1,7 @@
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "SimG4Core/KillSecondaries/interface/KillSecondariesRunAction.h"
 #include "SimG4Core/KillSecondaries/interface/KillSecondariesTrackAction.h"
 #include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-    
 
 DEFINE_SIMWATCHER(KillSecondariesRunAction);
 DEFINE_SIMWATCHER(KillSecondariesTrackAction);
diff --git a/SimG4Core/MagneticField/interface/CMSFieldManager.h b/SimG4Core/MagneticField/interface/CMSFieldManager.h
index 5cfa149c2320b..d8d11c3af39d3 100644
--- a/SimG4Core/MagneticField/interface/CMSFieldManager.h
+++ b/SimG4Core/MagneticField/interface/CMSFieldManager.h
@@ -2,8 +2,8 @@
 #define SimG4Core_MagneticField_CMSFieldManager_H
 
 /*
-   Created:  13 January 2017, V. Ivanchenko 
-   This class implements smart magnetic field manager 
+   Created:  13 January 2017, V. Ivanchenko
+   This class implements smart magnetic field manager
 */
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -17,44 +17,47 @@ class G4PropagatorInField;
 class G4MagIntegratorStepper;
 class G4Region;
 
-namespace sim { class Field; }
+namespace sim {
+  class Field;
+}
 
-class CMSFieldManager : public G4FieldManager
-{
+class CMSFieldManager : public G4FieldManager {
 public:
-
   explicit CMSFieldManager();
 
   ~CMSFieldManager() override;
 
-  void ConfigureForTrack(const G4Track*) override; 
+  void ConfigureForTrack(const G4Track *) override;
 
-  void InitialiseForVolume(const edm::ParameterSet&, sim::Field*, 
-                           G4ChordFinder* cfDefault, G4ChordFinder* cfMonopole,  
-                           const std::string& vol, const std::string& fieldType, 
-                           const std::string& stepperName, 
-			   double delta, G4PropagatorInField*);
+  void InitialiseForVolume(const edm::ParameterSet &,
+                           sim::Field *,
+                           G4ChordFinder *cfDefault,
+                           G4ChordFinder *cfMonopole,
+                           const std::string &vol,
+                           const std::string &fieldType,
+                           const std::string &stepperName,
+                           double delta,
+                           G4PropagatorInField *);
 
   void SetMonopoleTracking(G4bool);
 
 private:
-
-  bool isInsideVacuum(const G4Track*);
+  bool isInsideVacuum(const G4Track *);
   void setDefaultChordFinder();
   void setChordFinderForVacuum();
 
-  CMSFieldManager(const CMSFieldManager&) = delete;
-  CMSFieldManager& operator=(const CMSFieldManager&) = delete;
+  CMSFieldManager(const CMSFieldManager &) = delete;
+  CMSFieldManager &operator=(const CMSFieldManager &) = delete;
 
   std::unique_ptr<sim::Field> theField;
 
-  G4ChordFinder* m_currChordFinder;
-  G4ChordFinder* m_chordFinder;
-  G4ChordFinder* m_chordFinderMonopole;
+  G4ChordFinder *m_currChordFinder;
+  G4ChordFinder *m_chordFinder;
+  G4ChordFinder *m_chordFinderMonopole;
 
-  G4PropagatorInField* m_propagator;
+  G4PropagatorInField *m_propagator;
 
-  std::vector<const G4Region*> m_regions;
+  std::vector<const G4Region *> m_regions;
 
   double m_dChord;
   double m_dOneStep;
diff --git a/SimG4Core/MagneticField/interface/Field.h b/SimG4Core/MagneticField/interface/Field.h
index a35c308f95732..c36ea56033f7e 100644
--- a/SimG4Core/MagneticField/interface/Field.h
+++ b/SimG4Core/MagneticField/interface/Field.h
@@ -6,19 +6,18 @@
 class MagneticField;
 
 namespace sim {
-   class Field : public G4MagneticField
-   {
-      public:
-	 Field(const MagneticField * f, double d);
-	 ~Field() override;
-	 void GetFieldValue(const G4double p[4], G4double b[3]) const override;
+  class Field : public G4MagneticField {
+  public:
+    Field(const MagneticField *f, double d);
+    ~Field() override;
+    void GetFieldValue(const G4double p[4], G4double b[3]) const override;
 
-      private:
-	 const MagneticField* theCMSMagneticField;
-         double theDelta;
+  private:
+    const MagneticField *theCMSMagneticField;
+    double theDelta;
 
-         mutable double oldx[3];
-         mutable double oldb[3];
-   };
-};
+    mutable double oldx[3];
+    mutable double oldb[3];
+  };
+};  // namespace sim
 #endif
diff --git a/SimG4Core/MagneticField/interface/FieldBuilder.h b/SimG4Core/MagneticField/interface/FieldBuilder.h
index ceac93a565cf1..1ac756833b0a8 100644
--- a/SimG4Core/MagneticField/interface/FieldBuilder.h
+++ b/SimG4Core/MagneticField/interface/FieldBuilder.h
@@ -13,28 +13,25 @@ class G4LogicalVolume;
 namespace sim {
   class Field;
   class FieldBuilder {
-
   public:
-
-    FieldBuilder(const MagneticField*, const edm::ParameterSet&);
+    FieldBuilder(const MagneticField *, const edm::ParameterSet &);
 
     ~FieldBuilder();
 
-    void build(CMSFieldManager* fM, G4PropagatorInField* fP);
+    void build(CMSFieldManager *fM, G4PropagatorInField *fP);
 
-    void configureForVolume( const std::string& volName, 
-			     edm::ParameterSet& volPSet,
-			     CMSFieldManager * fM,
-			     G4PropagatorInField * fP);
+    void configureForVolume(const std::string &volName,
+                            edm::ParameterSet &volPSet,
+                            CMSFieldManager *fM,
+                            G4PropagatorInField *fP);
 
   private:
-
-    Field* theField;
+    Field *theField;
     G4Mag_UsualEqRhs *theFieldEquation;
-    G4LogicalVolume  *theTopVolume;	 
+    G4LogicalVolume *theTopVolume;
     edm::ParameterSet thePSet;
     double theDelta;
   };
-};
+};  // namespace sim
 
 #endif
diff --git a/SimG4Core/MagneticField/interface/FieldStepper.h b/SimG4Core/MagneticField/interface/FieldStepper.h
index b397c9ef6edf4..4853719b91a47 100644
--- a/SimG4Core/MagneticField/interface/FieldStepper.h
+++ b/SimG4Core/MagneticField/interface/FieldStepper.h
@@ -5,23 +5,21 @@
 
 class G4Mag_UsualEqRhs;
 
-class FieldStepper : public G4MagIntegratorStepper
-{
+class FieldStepper : public G4MagIntegratorStepper {
 public:
-  explicit FieldStepper(G4Mag_UsualEqRhs * eq, double del, const std::string& name);
+  explicit FieldStepper(G4Mag_UsualEqRhs *eq, double del, const std::string &name);
   ~FieldStepper() override;
 
   // Geant4 virtual methods
-  void Stepper(const G4double y[], const G4double dydx[], G4double h,
-	       G4double yout[], G4double yerr[]) override;
+  void Stepper(const G4double y[], const G4double dydx[], G4double h, G4double yout[], G4double yerr[]) override;
   G4double DistChord() const override;
   G4int IntegratorOrder() const override;
 
 private:
-  void selectStepper(const std::string&);
+  void selectStepper(const std::string &);
 
-  G4MagIntegratorStepper * theStepper;
-  G4Mag_UsualEqRhs * theEquation;  
+  G4MagIntegratorStepper *theStepper;
+  G4Mag_UsualEqRhs *theEquation;
   double theDelta;
 };
 
diff --git a/SimG4Core/MagneticField/interface/LocalFieldManager.h b/SimG4Core/MagneticField/interface/LocalFieldManager.h
index 99c7bf79039e5..973904d0ead47 100644
--- a/SimG4Core/MagneticField/interface/LocalFieldManager.h
+++ b/SimG4Core/MagneticField/interface/LocalFieldManager.h
@@ -5,28 +5,30 @@
 
 namespace sim {
 
-   class LocalFieldManager : public G4FieldManager
-   {
-      public:
-         // ctor & dtor
-	 LocalFieldManager() : G4FieldManager() {}
-	 ~LocalFieldManager() override {}
-         LocalFieldManager(G4Field* commonField,
-                           G4FieldManager* priFM,
-			   G4FieldManager* altFM);
-         void ConfigureForTrack(const G4Track* trk) override;
-	 void SetVerbosity(bool flag) { fVerbosity=flag; return; }
-      protected:
-         //
-         const G4FieldManager* CopyValuesAndChordFinder(G4FieldManager* fm);
-         void  print(const G4Track* trk);
-      private:
-         G4FieldManager* fPrimaryFM;
-         G4FieldManager* fAlternativeFM;
-         G4FieldManager* fCurrentFM;
-	 bool            fVerbosity ;
-   };
+  class LocalFieldManager : public G4FieldManager {
+  public:
+    // ctor & dtor
+    LocalFieldManager() : G4FieldManager() {}
+    ~LocalFieldManager() override {}
+    LocalFieldManager(G4Field *commonField, G4FieldManager *priFM, G4FieldManager *altFM);
+    void ConfigureForTrack(const G4Track *trk) override;
+    void SetVerbosity(bool flag) {
+      fVerbosity = flag;
+      return;
+    }
 
-}
+  protected:
+    //
+    const G4FieldManager *CopyValuesAndChordFinder(G4FieldManager *fm);
+    void print(const G4Track *trk);
+
+  private:
+    G4FieldManager *fPrimaryFM;
+    G4FieldManager *fAlternativeFM;
+    G4FieldManager *fCurrentFM;
+    bool fVerbosity;
+  };
+
+}  // namespace sim
 
 #endif
diff --git a/SimG4Core/MagneticField/interface/MonopoleEquation.h b/SimG4Core/MagneticField/interface/MonopoleEquation.h
index 43739af577af2..00d17e56a04c9 100644
--- a/SimG4Core/MagneticField/interface/MonopoleEquation.h
+++ b/SimG4Core/MagneticField/interface/MonopoleEquation.h
@@ -1,20 +1,20 @@
 //
 // =======================================================================
 //
-// class G4MonopoleEquation 
+// class G4MonopoleEquation
 //
-// Created:  30 April 2010, S. Burdin, B. Bozsogi 
+// Created:  30 April 2010, S. Burdin, B. Bozsogi
 //                       G4MonopoleEquation class for
 //                       Geant4 extended example "monopole"
 //
 // Adopted for CMSSW by V.Ivanchenko 30 April 2018
-// from Geant4 global tag geant4-10-04-ref-03                   
+// from Geant4 global tag geant4-10-04-ref-03
 //
 // =======================================================================
 //
 // Class description:
 //
-// This is the right-hand side of equation of motion in a 
+// This is the right-hand side of equation of motion in a
 // magnetic field only for magnetic monopoles.
 //
 // -------------------------------------------------------------------
@@ -25,30 +25,23 @@
 #include "G4EquationOfMotion.hh"
 #include "G4MagneticField.hh"
 
-class MonopoleEquation : public G4EquationOfMotion
-{
+class MonopoleEquation : public G4EquationOfMotion {
 public:  // with description
-
-  MonopoleEquation(G4MagneticField *emField );
+  MonopoleEquation(G4MagneticField *emField);
 
   ~MonopoleEquation() override;
 
-  void  SetChargeMomentumMass( G4ChargeState particleChargeState,
-                               G4double      momentum, 
-                               G4double      mass) override;
+  void SetChargeMomentumMass(G4ChargeState particleChargeState, G4double momentum, G4double mass) override;
   // magnetic charge in e+ units
-                                 
-  void EvaluateRhsGivenB(const G4double y[],
-                         const G4double Field[],
-                         G4double dydx[] ) const override;
-  // Given the value of the electromagnetic field, this function 
+
+  void EvaluateRhsGivenB(const G4double y[], const G4double Field[], G4double dydx[]) const override;
+  // Given the value of the electromagnetic field, this function
   // calculates the value of the derivative dydx.
 
 private:
-
-  G4double  fMagCharge ;
-  G4double  fElCharge;
-  G4double  fMassCof;
+  G4double fMagCharge;
+  G4double fElCharge;
+  G4double fMassCof;
 };
 
 #endif
diff --git a/SimG4Core/MagneticField/src/CMSFieldManager.cc b/SimG4Core/MagneticField/src/CMSFieldManager.cc
index 4b603ebac6a91..9895e2d236bdc 100644
--- a/SimG4Core/MagneticField/src/CMSFieldManager.cc
+++ b/SimG4Core/MagneticField/src/CMSFieldManager.cc
@@ -2,74 +2,86 @@
 #include "SimG4Core/MagneticField/interface/CMSFieldManager.h"
 #include "SimG4Core/MagneticField/interface/Field.h"
 
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "G4ChordFinder.hh"
-#include "G4Track.hh"
+#include "G4MagIntegratorStepper.hh"
+#include "G4PropagatorInField.hh"
 #include "G4Region.hh"
 #include "G4RegionStore.hh"
-#include "G4PropagatorInField.hh"
-#include "G4MagIntegratorStepper.hh"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "G4Track.hh"
 
-CMSFieldManager::CMSFieldManager() 
-  : G4FieldManager(), m_currChordFinder(nullptr), m_chordFinder(nullptr),
-    m_chordFinderMonopole(nullptr), m_propagator(nullptr), m_dChord(0.001), 
-    m_dOneStep(0.001), m_dIntersection(0.0001), m_stepMax(1000000.), 
-    m_energyThreshold(0.0), m_dChordSimple(0.1), m_dOneStepSimple(0.1), 
-    m_dIntersectionSimple(0.01), m_stepMaxSimple(1000.), m_cfVacuum(false)
-{}
-
-CMSFieldManager::~CMSFieldManager()
-{
-  if(m_chordFinder != m_currChordFinder) { delete m_chordFinder; }
-  if(m_chordFinderMonopole != m_currChordFinder) { delete m_chordFinderMonopole; }
+CMSFieldManager::CMSFieldManager()
+    : G4FieldManager(),
+      m_currChordFinder(nullptr),
+      m_chordFinder(nullptr),
+      m_chordFinderMonopole(nullptr),
+      m_propagator(nullptr),
+      m_dChord(0.001),
+      m_dOneStep(0.001),
+      m_dIntersection(0.0001),
+      m_stepMax(1000000.),
+      m_energyThreshold(0.0),
+      m_dChordSimple(0.1),
+      m_dOneStepSimple(0.1),
+      m_dIntersectionSimple(0.01),
+      m_stepMaxSimple(1000.),
+      m_cfVacuum(false) {}
+
+CMSFieldManager::~CMSFieldManager() {
+  if (m_chordFinder != m_currChordFinder) {
+    delete m_chordFinder;
+  }
+  if (m_chordFinderMonopole != m_currChordFinder) {
+    delete m_chordFinderMonopole;
+  }
 }
 
-void CMSFieldManager::InitialiseForVolume(const edm::ParameterSet& p, sim::Field* field,
-					  G4ChordFinder* cf, G4ChordFinder* cfmon, 
-                                          const std::string& vol, const std::string& type, 
-                                          const std::string& stepper, 
+void CMSFieldManager::InitialiseForVolume(const edm::ParameterSet &p,
+                                          sim::Field *field,
+                                          G4ChordFinder *cf,
+                                          G4ChordFinder *cfmon,
+                                          const std::string &vol,
+                                          const std::string &type,
+                                          const std::string &stepper,
                                           double delta,
-					  G4PropagatorInField* pf)
-{
-  double minstep = p.getParameter<double>("MinStep")*CLHEP::mm;
-  double minEpsStep = 
-    p.getUntrackedParameter<double>("MinimumEpsilonStep",0.00001)*CLHEP::mm;
-  double maxEpsStep = 
-    p.getUntrackedParameter<double>("MaximumEpsilonStep",0.01)*CLHEP::mm;
-  int maxLC = (int)p.getUntrackedParameter<double>("MaximumLoopCounts",1000.);
-
-  //double 
-  m_dChord = p.getParameter<double>("DeltaChord")*CLHEP::mm;
-  m_dOneStep = p.getParameter<double>("DeltaOneStep")*CLHEP::mm;
-  m_dIntersection = p.getParameter<double>("DeltaIntersection")*CLHEP::mm;
-  m_stepMax = p.getParameter<double>("MaxStep")*CLHEP::cm;
-
-  m_energyThreshold = p.getParameter<double>("EnergyThSimple")*CLHEP::GeV;
-
-  //double 
-  m_dChordSimple = p.getParameter<double>("DeltaChordSimple")*CLHEP::mm;
-  m_dOneStepSimple = p.getParameter<double>("DeltaOneStepSimple")*CLHEP::mm;
-  m_dIntersectionSimple = p.getParameter<double>("DeltaIntersectionSimple")*CLHEP::mm;
-  m_stepMaxSimple = p.getParameter<double>("MaxStepSimple")*CLHEP::cm;
-
-  edm::LogVerbatim("SimG4CoreApplication") 
-    << " New CMSFieldManager: LogicalVolume:      <" << vol << ">\n"
-    << "               Stepper:                   <" << stepper << ">\n" 
-    << "               Field type                 <" << type<< ">\n"
-    << "               Field const delta           " << delta << " mm\n"
-    << "               MaximumLoopCounts           " << maxLC<< "\n"
-    << "               MinimumEpsilonStep          " << minEpsStep<< "\n"
-    << "               MaximumEpsilonStep          " << maxEpsStep<< "\n"
-    << "               MinStep                     " << minstep<< " mm\n"
-    << "               MaxStep                     " << m_stepMax/CLHEP::cm<< " cm\n"
-    << "               DeltaChord                  " << m_dChord<< " mm\n"
-    << "               DeltaOneStep                " << m_dOneStep<< " mm\n"
-    << "               DeltaIntersection           " << m_dIntersection<< " mm\n"
-    << "               EnergyThreshold             " << m_energyThreshold<< " MeV\n"
-    << "               DeltaChordSimple            " << m_dChordSimple<< " mm\n"
-    << "               DeltaOneStepSimple          " << m_dOneStepSimple<< " mm\n"
-    << "               DeltaIntersectionSimple     " << m_dIntersectionSimple<< " mm\n"
-    << "               MaxStepInVacuum             " << m_stepMaxSimple/CLHEP::cm<< " cm";
+                                          G4PropagatorInField *pf) {
+  double minstep = p.getParameter<double>("MinStep") * CLHEP::mm;
+  double minEpsStep = p.getUntrackedParameter<double>("MinimumEpsilonStep", 0.00001) * CLHEP::mm;
+  double maxEpsStep = p.getUntrackedParameter<double>("MaximumEpsilonStep", 0.01) * CLHEP::mm;
+  int maxLC = (int)p.getUntrackedParameter<double>("MaximumLoopCounts", 1000.);
+
+  // double
+  m_dChord = p.getParameter<double>("DeltaChord") * CLHEP::mm;
+  m_dOneStep = p.getParameter<double>("DeltaOneStep") * CLHEP::mm;
+  m_dIntersection = p.getParameter<double>("DeltaIntersection") * CLHEP::mm;
+  m_stepMax = p.getParameter<double>("MaxStep") * CLHEP::cm;
+
+  m_energyThreshold = p.getParameter<double>("EnergyThSimple") * CLHEP::GeV;
+
+  // double
+  m_dChordSimple = p.getParameter<double>("DeltaChordSimple") * CLHEP::mm;
+  m_dOneStepSimple = p.getParameter<double>("DeltaOneStepSimple") * CLHEP::mm;
+  m_dIntersectionSimple = p.getParameter<double>("DeltaIntersectionSimple") * CLHEP::mm;
+  m_stepMaxSimple = p.getParameter<double>("MaxStepSimple") * CLHEP::cm;
+
+  edm::LogVerbatim("SimG4CoreApplication")
+      << " New CMSFieldManager: LogicalVolume:      <" << vol << ">\n"
+      << "               Stepper:                   <" << stepper << ">\n"
+      << "               Field type                 <" << type << ">\n"
+      << "               Field const delta           " << delta << " mm\n"
+      << "               MaximumLoopCounts           " << maxLC << "\n"
+      << "               MinimumEpsilonStep          " << minEpsStep << "\n"
+      << "               MaximumEpsilonStep          " << maxEpsStep << "\n"
+      << "               MinStep                     " << minstep << " mm\n"
+      << "               MaxStep                     " << m_stepMax / CLHEP::cm << " cm\n"
+      << "               DeltaChord                  " << m_dChord << " mm\n"
+      << "               DeltaOneStep                " << m_dOneStep << " mm\n"
+      << "               DeltaIntersection           " << m_dIntersection << " mm\n"
+      << "               EnergyThreshold             " << m_energyThreshold << " MeV\n"
+      << "               DeltaChordSimple            " << m_dChordSimple << " mm\n"
+      << "               DeltaOneStepSimple          " << m_dOneStepSimple << " mm\n"
+      << "               DeltaIntersectionSimple     " << m_dIntersectionSimple << " mm\n"
+      << "               MaxStepInVacuum             " << m_stepMaxSimple / CLHEP::cm << " cm";
 
   // initialisation of chord finders
   m_chordFinder = cf;
@@ -94,64 +106,64 @@ void CMSFieldManager::InitialiseForVolume(const edm::ParameterSet& p, sim::Field
   SetMonopoleTracking(false);
 
   // define regions
-  std::vector<std::string> rnames = p.getParameter<std::vector<std::string> >("VacRegions");
-  if(!rnames.empty()) {
+  std::vector<std::string> rnames = p.getParameter<std::vector<std::string>>("VacRegions");
+  if (!rnames.empty()) {
     std::stringstream ss;
-    std::vector<G4Region*> *rs = G4RegionStore::GetInstance();
-    for (auto & regnam : rnames) {
-      for (auto & reg : *rs) { 
-	if(regnam == reg->GetName()) {
+    std::vector<G4Region *> *rs = G4RegionStore::GetInstance();
+    for (auto &regnam : rnames) {
+      for (auto &reg : *rs) {
+        if (regnam == reg->GetName()) {
           m_regions.push_back(reg);
-	  ss << "  " << regnam; 
-	} 
+          ss << "  " << regnam;
+        }
       }
     }
-    edm::LogVerbatim("SimG4CoreApplication") << "Simple field integration in G4Regions:\n"
-					     << ss.str() << "\n";
+    edm::LogVerbatim("SimG4CoreApplication") << "Simple field integration in G4Regions:\n" << ss.str() << "\n";
   }
 }
 
-void CMSFieldManager::ConfigureForTrack(const G4Track* track)
-{
+void CMSFieldManager::ConfigureForTrack(const G4Track *track) {
   // run time parameters per track
-  if((track->GetKineticEnergy() <= m_energyThreshold && track->GetParentID() > 0) 
-     || isInsideVacuum(track)) {
-    if(!m_cfVacuum) { setChordFinderForVacuum(); } 
+  if ((track->GetKineticEnergy() <= m_energyThreshold && track->GetParentID() > 0) || isInsideVacuum(track)) {
+    if (!m_cfVacuum) {
+      setChordFinderForVacuum();
+    }
 
-  } else if(m_cfVacuum) {
+  } else if (m_cfVacuum) {
     // restore defaults
-    setDefaultChordFinder(); 
+    setDefaultChordFinder();
   }
-} 
+}
 
-void CMSFieldManager::SetMonopoleTracking(G4bool flag)
-{
-  if(flag) {
-    if(m_currChordFinder != m_chordFinderMonopole) { 
-      if(m_cfVacuum) { setDefaultChordFinder(); }
+void CMSFieldManager::SetMonopoleTracking(G4bool flag) {
+  if (flag) {
+    if (m_currChordFinder != m_chordFinderMonopole) {
+      if (m_cfVacuum) {
+        setDefaultChordFinder();
+      }
       m_currChordFinder = m_chordFinderMonopole;
       SetChordFinder(m_currChordFinder);
     }
-  } else { 
+  } else {
     setDefaultChordFinder();
   }
   SetFieldChangesEnergy(flag);
   m_currChordFinder->ResetStepEstimate();
 }
 
-bool CMSFieldManager::isInsideVacuum(const G4Track* track)
-{
-  if(!m_regions.empty()) {
-    const G4Region* reg = track->GetVolume()->GetLogicalVolume()->GetRegion();
-    for (auto & areg : m_regions) {
-      if(reg == areg) { return true; }
-    }    
+bool CMSFieldManager::isInsideVacuum(const G4Track *track) {
+  if (!m_regions.empty()) {
+    const G4Region *reg = track->GetVolume()->GetLogicalVolume()->GetRegion();
+    for (auto &areg : m_regions) {
+      if (reg == areg) {
+        return true;
+      }
+    }
   }
   return false;
 }
 
-void CMSFieldManager::setDefaultChordFinder()
-{
+void CMSFieldManager::setDefaultChordFinder() {
   m_currChordFinder = m_chordFinder;
   m_currChordFinder->SetDeltaChord(m_dChord);
   SetChordFinder(m_currChordFinder);
@@ -161,8 +173,7 @@ void CMSFieldManager::setDefaultChordFinder()
   m_cfVacuum = false;
 }
 
-void CMSFieldManager::setChordFinderForVacuum()
-{
+void CMSFieldManager::setChordFinderForVacuum() {
   m_currChordFinder->SetDeltaChord(m_dChordSimple);
   SetDeltaOneStep(m_dOneStepSimple);
   SetDeltaIntersection(m_dIntersectionSimple);
diff --git a/SimG4Core/MagneticField/src/Field.cc b/SimG4Core/MagneticField/src/Field.cc
index 7d0eda5917ea4..606e320170ce8 100644
--- a/SimG4Core/MagneticField/src/Field.cc
+++ b/SimG4Core/MagneticField/src/Field.cc
@@ -1,5 +1,5 @@
-#include "SimG4Core/MagneticField/interface/Field.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
+#include "SimG4Core/MagneticField/interface/Field.h"
 
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 #include "G4Mag_UsualEqRhs.hh"
@@ -8,10 +8,8 @@
 
 using namespace sim;
 
-Field::Field(const MagneticField * f, double d) 
-  : G4MagneticField(), theCMSMagneticField(f), theDelta(d)
-{
-  for(int i=0; i<3; ++i) {
+Field::Field(const MagneticField *f, double d) : G4MagneticField(), theCMSMagneticField(f), theDelta(d) {
+  for (int i = 0; i < 3; ++i) {
     oldx[i] = 1.0e12;
     oldb[i] = 0.0;
   }
@@ -19,27 +17,23 @@ Field::Field(const MagneticField * f, double d)
 
 Field::~Field() {}
 
-void Field::GetFieldValue(const G4double xyz[4], G4double bfield[3]) const 
-{ 
-  if (std::abs(oldx[0]-xyz[0])>theDelta ||
-      std::abs(oldx[1]-xyz[1])>theDelta ||
-      std::abs(oldx[2]-xyz[2])>theDelta) 
-    {
-      static const float lunit = (float)(1.0/CLHEP::cm);
-      GlobalPoint ggg((float)(xyz[0])*lunit,(float)(xyz[1])*lunit,(float)(xyz[2])*lunit);
-      GlobalVector v = theCMSMagneticField->inTesla(ggg);
-      
-      static const float btesla = (float)CLHEP::tesla;
-      oldb[0] = (G4double)(v.x()*btesla);
-      oldb[1] = (G4double)(v.y()*btesla);
-      oldb[2] = (G4double)(v.z()*btesla);
-      oldx[0] = xyz[0];
-      oldx[1] = xyz[1];
-      oldx[2] = xyz[2];
-    }
-
-  bfield[0] = oldb[0]; 
-  bfield[1] = oldb[1]; 
+void Field::GetFieldValue(const G4double xyz[4], G4double bfield[3]) const {
+  if (std::abs(oldx[0] - xyz[0]) > theDelta || std::abs(oldx[1] - xyz[1]) > theDelta ||
+      std::abs(oldx[2] - xyz[2]) > theDelta) {
+    static const float lunit = (float)(1.0 / CLHEP::cm);
+    GlobalPoint ggg((float)(xyz[0]) * lunit, (float)(xyz[1]) * lunit, (float)(xyz[2]) * lunit);
+    GlobalVector v = theCMSMagneticField->inTesla(ggg);
+
+    static const float btesla = (float)CLHEP::tesla;
+    oldb[0] = (G4double)(v.x() * btesla);
+    oldb[1] = (G4double)(v.y() * btesla);
+    oldb[2] = (G4double)(v.z() * btesla);
+    oldx[0] = xyz[0];
+    oldx[1] = xyz[1];
+    oldx[2] = xyz[2];
+  }
+
+  bfield[0] = oldb[0];
+  bfield[1] = oldb[1];
   bfield[2] = oldb[2];
 }
-
diff --git a/SimG4Core/MagneticField/src/FieldBuilder.cc b/SimG4Core/MagneticField/src/FieldBuilder.cc
index 7cd24bd9b7f65..57d05fe5e1c70 100644
--- a/SimG4Core/MagneticField/src/FieldBuilder.cc
+++ b/SimG4Core/MagneticField/src/FieldBuilder.cc
@@ -4,73 +4,64 @@
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "SimG4Core/MagneticField/interface/FieldBuilder.h"
 #include "SimG4Core/MagneticField/interface/CMSFieldManager.h"
 #include "SimG4Core/MagneticField/interface/Field.h"
+#include "SimG4Core/MagneticField/interface/FieldBuilder.h"
 #include "SimG4Core/MagneticField/interface/FieldStepper.h"
 #include "SimG4Core/MagneticField/interface/MonopoleEquation.h"
 
-#include "G4Mag_UsualEqRhs.hh"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "G4ChordFinder.hh"
 #include "G4ClassicalRK4.hh"
-#include "G4PropagatorInField.hh"
 #include "G4FieldManager.hh"
-#include "G4ChordFinder.hh"
 #include "G4LogicalVolumeStore.hh"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "G4Mag_UsualEqRhs.hh"
+#include "G4PropagatorInField.hh"
 
 using namespace sim;
 
-FieldBuilder::FieldBuilder(const MagneticField * f, const edm::ParameterSet & p) 
-  : theTopVolume(nullptr),thePSet(p) 
-{
-  theDelta = p.getParameter<double>("delta")*CLHEP::mm;
+FieldBuilder::FieldBuilder(const MagneticField *f, const edm::ParameterSet &p) : theTopVolume(nullptr), thePSet(p) {
+  theDelta = p.getParameter<double>("delta") * CLHEP::mm;
   theField = new Field(f, theDelta);
   theFieldEquation = new G4Mag_UsualEqRhs(theField);
 }
 
-FieldBuilder::~FieldBuilder()
-{} 
+FieldBuilder::~FieldBuilder() {}
+
+void FieldBuilder::build(CMSFieldManager *fM, G4PropagatorInField *fP) {
+  edm::ParameterSet thePSetForGMFM = thePSet.getParameter<edm::ParameterSet>("ConfGlobalMFM");
+  std::string volName = thePSetForGMFM.getParameter<std::string>("Volume");
+  edm::ParameterSet volPSet = thePSetForGMFM.getParameter<edm::ParameterSet>(volName);
 
-void FieldBuilder::build( CMSFieldManager* fM, G4PropagatorInField* fP) 
-{    
-  edm::ParameterSet thePSetForGMFM =
-    thePSet.getParameter<edm::ParameterSet>("ConfGlobalMFM");
-  std::string volName = thePSetForGMFM.getParameter< std::string >("Volume");  
-  edm::ParameterSet volPSet =
-    thePSetForGMFM.getParameter< edm::ParameterSet >( volName );
-    
-  configureForVolume( volName, volPSet, fM, fP);
+  configureForVolume(volName, volPSet, fM, fP);
 
-  edm::LogVerbatim("SimG4CoreMagneticField") 
-    << " FieldBuilder::build: Global magnetic field is used";
+  edm::LogVerbatim("SimG4CoreMagneticField") << " FieldBuilder::build: Global magnetic field is used";
 }
 
-void FieldBuilder::configureForVolume( const std::string& volName,
-                                       edm::ParameterSet& volPSet,
-				       CMSFieldManager * fM,
-				       G4PropagatorInField * fP) 
-{
-  G4LogicalVolumeStore* theStore = G4LogicalVolumeStore::GetInstance();
+void FieldBuilder::configureForVolume(const std::string &volName,
+                                      edm::ParameterSet &volPSet,
+                                      CMSFieldManager *fM,
+                                      G4PropagatorInField *fP) {
+  G4LogicalVolumeStore *theStore = G4LogicalVolumeStore::GetInstance();
   for (auto vol : *theStore) {
-    if ( (std::string)vol->GetName() == volName ) {
+    if ((std::string)vol->GetName() == volName) {
       theTopVolume = vol;
       break;
     }
   }
 
   std::string fieldType = volPSet.getParameter<std::string>("Type");
-  std::string stepper   = volPSet.getParameter<std::string>("Stepper");
+  std::string stepper = volPSet.getParameter<std::string>("Stepper");
 
   edm::ParameterSet stpPSet = volPSet.getParameter<edm::ParameterSet>("StepperParam");
-  double minStep = stpPSet.getParameter<double>("MinStep")*CLHEP::mm;
+  double minStep = stpPSet.getParameter<double>("MinStep") * CLHEP::mm;
 
-  FieldStepper* dStepper = new FieldStepper(theFieldEquation, theDelta, stepper);
-  G4ChordFinder* cf = new G4ChordFinder(theField,minStep,dStepper);
+  FieldStepper *dStepper = new FieldStepper(theFieldEquation, theDelta, stepper);
+  G4ChordFinder *cf = new G4ChordFinder(theField, minStep, dStepper);
 
-  MonopoleEquation* monopoleEquation = new MonopoleEquation(theField);
-  G4MagIntegratorStepper* mStepper = new G4ClassicalRK4(monopoleEquation,8);
-  G4ChordFinder* cfmon = new G4ChordFinder(theField, minStep, mStepper);
+  MonopoleEquation *monopoleEquation = new MonopoleEquation(theField);
+  G4MagIntegratorStepper *mStepper = new G4ClassicalRK4(monopoleEquation, 8);
+  G4ChordFinder *cfmon = new G4ChordFinder(theField, minStep, mStepper);
 
-  fM->InitialiseForVolume(stpPSet, theField, cf, cfmon, volName, 
-                          fieldType, stepper, theDelta, fP);
+  fM->InitialiseForVolume(stpPSet, theField, cf, cfmon, volName, fieldType, stepper, theDelta, fP);
 }
diff --git a/SimG4Core/MagneticField/src/FieldStepper.cc b/SimG4Core/MagneticField/src/FieldStepper.cc
index ead8ef405468d..87636d50c66ca 100644
--- a/SimG4Core/MagneticField/src/FieldStepper.cc
+++ b/SimG4Core/MagneticField/src/FieldStepper.cc
@@ -1,67 +1,67 @@
-#include "SimG4Core/MagneticField/interface/FieldStepper.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimG4Core/MagneticField/interface/FieldStepper.h"
 
-#include "G4Mag_UsualEqRhs.hh"
-#include "G4ClassicalRK4.hh"
-#include "G4SimpleRunge.hh"
-#include "G4SimpleHeum.hh"
+#include "G4BogackiShampine45.hh"
 #include "G4CashKarpRKF45.hh"
+#include "G4ClassicalRK4.hh"
 #include "G4DormandPrince745.hh"
-#include "G4BogackiShampine45.hh"
-#include "G4TsitourasRK45.hh"
-#include "G4ImplicitEuler.hh"
 #include "G4HelixExplicitEuler.hh"
+#include "G4HelixHeum.hh"
 #include "G4HelixImplicitEuler.hh"
 #include "G4HelixSimpleRunge.hh"
-#include "G4HelixHeum.hh"
+#include "G4ImplicitEuler.hh"
+#include "G4Mag_UsualEqRhs.hh"
 #include "G4NystromRK4.hh"
+#include "G4SimpleHeum.hh"
+#include "G4SimpleRunge.hh"
+#include "G4TsitourasRK45.hh"
 
-FieldStepper::FieldStepper(G4Mag_UsualEqRhs * eq, double del, const std::string& nam) 
-  : G4MagIntegratorStepper(eq, 6), theEquation(eq), theDelta(del) 
-{
+FieldStepper::FieldStepper(G4Mag_UsualEqRhs *eq, double del, const std::string &nam)
+    : G4MagIntegratorStepper(eq, 6), theEquation(eq), theDelta(del) {
   selectStepper(nam);
 }
 
-FieldStepper::~FieldStepper() 
-{}
+FieldStepper::~FieldStepper() {}
 
-void FieldStepper::Stepper(const G4double y[], const G4double dydx[], G4double h,
-			   G4double yout[], G4double yerr[])
-{ 
-  theStepper->Stepper(y,dydx,h,yout,yerr); 
+void FieldStepper::Stepper(const G4double y[], const G4double dydx[], G4double h, G4double yout[], G4double yerr[]) {
+  theStepper->Stepper(y, dydx, h, yout, yerr);
 }
 
-G4double FieldStepper::DistChord() const 
-{ 
-  return theStepper->DistChord(); 
-}
+G4double FieldStepper::DistChord() const { return theStepper->DistChord(); }
 
-G4int FieldStepper::IntegratorOrder() const
-{ 
-  return theStepper->IntegratorOrder(); 
-}
+G4int FieldStepper::IntegratorOrder() const { return theStepper->IntegratorOrder(); }
 
-void FieldStepper::selectStepper(const std::string & ss)
-{    
-  if      (ss == "G4ClassicalRK4")       theStepper = new G4ClassicalRK4(theEquation);
-  else if (ss == "G4NystromRK4")         theStepper = new G4NystromRK4(theEquation, theDelta);
-  else if (ss == "G4SimpleRunge")        theStepper = new G4SimpleRunge(theEquation);
-  else if (ss == "G4SimpleHeum")         theStepper = new G4SimpleHeum(theEquation);
-  else if (ss == "G4CashKarpRKF45")      theStepper = new G4CashKarpRKF45(theEquation);
-  else if (ss == "G4DormandPrince745")   theStepper = new G4DormandPrince745(theEquation);
-  else if (ss == "G4BogackiShampine45")  theStepper = new G4BogackiShampine45(theEquation);
-  else if (ss == "G4TsitourasRK45")      theStepper = new G4TsitourasRK45(theEquation);
-  else if (ss == "G4ImplicitEuler")      theStepper = new G4ImplicitEuler(theEquation);
-  else if (ss == "G4HelixExplicitEuler") theStepper = new G4HelixExplicitEuler(theEquation);
-  else if (ss == "G4HelixImplicitEuler") theStepper = new G4HelixImplicitEuler(theEquation);
-  else if (ss == "G4HelixSimpleRunge")   theStepper = new G4HelixSimpleRunge(theEquation);
-  else if (ss == "G4HelixHeum")          theStepper = new G4HelixHeum(theEquation);
-  else
-    {
-      edm::LogWarning("SimG4CoreMagneticField") 
+void FieldStepper::selectStepper(const std::string &ss) {
+  if (ss == "G4ClassicalRK4")
+    theStepper = new G4ClassicalRK4(theEquation);
+  else if (ss == "G4NystromRK4")
+    theStepper = new G4NystromRK4(theEquation, theDelta);
+  else if (ss == "G4SimpleRunge")
+    theStepper = new G4SimpleRunge(theEquation);
+  else if (ss == "G4SimpleHeum")
+    theStepper = new G4SimpleHeum(theEquation);
+  else if (ss == "G4CashKarpRKF45")
+    theStepper = new G4CashKarpRKF45(theEquation);
+  else if (ss == "G4DormandPrince745")
+    theStepper = new G4DormandPrince745(theEquation);
+  else if (ss == "G4BogackiShampine45")
+    theStepper = new G4BogackiShampine45(theEquation);
+  else if (ss == "G4TsitourasRK45")
+    theStepper = new G4TsitourasRK45(theEquation);
+  else if (ss == "G4ImplicitEuler")
+    theStepper = new G4ImplicitEuler(theEquation);
+  else if (ss == "G4HelixExplicitEuler")
+    theStepper = new G4HelixExplicitEuler(theEquation);
+  else if (ss == "G4HelixImplicitEuler")
+    theStepper = new G4HelixImplicitEuler(theEquation);
+  else if (ss == "G4HelixSimpleRunge")
+    theStepper = new G4HelixSimpleRunge(theEquation);
+  else if (ss == "G4HelixHeum")
+    theStepper = new G4HelixHeum(theEquation);
+  else {
+    edm::LogWarning("SimG4CoreMagneticField")
         << " FieldStepper <" << ss << "> is not known, defaulting to G4ClassicalRK4 ";
-      theStepper = new G4ClassicalRK4(theEquation);
-    }
-  edm::LogVerbatim("SimG4CoreMagneticField") 
-    << "### FieldStepper: <" << ss << ">";
+    theStepper = new G4ClassicalRK4(theEquation);
+  }
+  edm::LogVerbatim("SimG4CoreMagneticField") << "### FieldStepper: <" << ss << ">";
 }
diff --git a/SimG4Core/MagneticField/src/LocalFieldManager.cc b/SimG4Core/MagneticField/src/LocalFieldManager.cc
index 58dd54a9ee9c6..6985391d3683c 100644
--- a/SimG4Core/MagneticField/src/LocalFieldManager.cc
+++ b/SimG4Core/MagneticField/src/LocalFieldManager.cc
@@ -1,6 +1,6 @@
 
-#include "SimG4Core/MagneticField/interface/LocalFieldManager.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimG4Core/MagneticField/interface/LocalFieldManager.h"
 
 #include "G4ChordFinder.hh"
 #include "G4Track.hh"
@@ -11,67 +11,54 @@
 
 using namespace sim;
 
-LocalFieldManager::LocalFieldManager(G4Field* commonField,
-                                     G4FieldManager* priFM,
-			             G4FieldManager* altFM)
-   : G4FieldManager(commonField,nullptr,false),
-     fPrimaryFM(priFM), fAlternativeFM(altFM),
-     fCurrentFM(nullptr),
-     fVerbosity(false)
-{
-   this->CopyValuesAndChordFinder(priFM);
-   fCurrentFM = priFM ;
+LocalFieldManager::LocalFieldManager(G4Field *commonField, G4FieldManager *priFM, G4FieldManager *altFM)
+    : G4FieldManager(commonField, nullptr, false),
+      fPrimaryFM(priFM),
+      fAlternativeFM(altFM),
+      fCurrentFM(nullptr),
+      fVerbosity(false) {
+  this->CopyValuesAndChordFinder(priFM);
+  fCurrentFM = priFM;
 }
 
-void LocalFieldManager::ConfigureForTrack(const G4Track* trk)
-{
+void LocalFieldManager::ConfigureForTrack(const G4Track *trk) {
+  int PID = trk->GetDynamicParticle()->GetDefinition()->GetPDGEncoding();
 
-   int PID = trk->GetDynamicParticle()->GetDefinition()->GetPDGEncoding();
-   
-   if ( std::abs(PID)!=13 ) // maybe also high energy pions ?... what else ?
-   {
-      if ( fCurrentFM != fAlternativeFM )
-      {
-         this->CopyValuesAndChordFinder(fAlternativeFM);
-	 fCurrentFM = fAlternativeFM;
-         if ( fVerbosity) print(trk);
-      }
-   }
-   else
-   {
-      if ( fCurrentFM != fPrimaryFM )
-      {
-         this->CopyValuesAndChordFinder(fPrimaryFM);
-	 fCurrentFM = fPrimaryFM;
-         if ( fVerbosity) print(trk);
-      }
-   }
+  if (std::abs(PID) != 13)  // maybe also high energy pions ?... what else ?
+  {
+    if (fCurrentFM != fAlternativeFM) {
+      this->CopyValuesAndChordFinder(fAlternativeFM);
+      fCurrentFM = fAlternativeFM;
+      if (fVerbosity)
+        print(trk);
+    }
+  } else {
+    if (fCurrentFM != fPrimaryFM) {
+      this->CopyValuesAndChordFinder(fPrimaryFM);
+      fCurrentFM = fPrimaryFM;
+      if (fVerbosity)
+        print(trk);
+    }
+  }
 }
 
-const G4FieldManager* LocalFieldManager::CopyValuesAndChordFinder(G4FieldManager * fm)
-{
-
-    SetDeltaIntersection(fm->GetDeltaIntersection());
-    SetDeltaOneStep(fm->GetDeltaOneStep());
-    G4ChordFinder* cf = fm->GetChordFinder();
-    cf->SetDeltaChord(cf->GetDeltaChord());
-    SetChordFinder(cf);
-    
-    return fm;
+const G4FieldManager *LocalFieldManager::CopyValuesAndChordFinder(G4FieldManager *fm) {
+  SetDeltaIntersection(fm->GetDeltaIntersection());
+  SetDeltaOneStep(fm->GetDeltaOneStep());
+  G4ChordFinder *cf = fm->GetChordFinder();
+  cf->SetDeltaChord(cf->GetDeltaChord());
+  SetChordFinder(cf);
 
+  return fm;
 }
 
-void LocalFieldManager::print(const G4Track* trk)
-{
-  std::string ss = (fCurrentFM==fAlternativeFM) 
-    ? "Alternative field manager with"
-    : "Global field manager with";
+void LocalFieldManager::print(const G4Track *trk) {
+  std::string ss = (fCurrentFM == fAlternativeFM) ? "Alternative field manager with" : "Global field manager with";
 
-  edm::LogVerbatim("SimG4CoreMagneticField") 
-    << ss << " DeltaIntersection= " << G4FieldManager::GetDeltaIntersection()
-    << ", DeltaOneStep= " << G4FieldManager::GetDeltaOneStep()
-    << ", DeltaChord= " << G4FieldManager::GetChordFinder()->GetDeltaChord()
-    << " for " << trk->GetDynamicParticle()->GetDefinition()->GetPDGEncoding()
-    << " with " << trk->GetKineticEnergy()/CLHEP::GeV << " GeV in "
-    << trk->GetVolume()->GetName();
+  edm::LogVerbatim("SimG4CoreMagneticField")
+      << ss << " DeltaIntersection= " << G4FieldManager::GetDeltaIntersection()
+      << ", DeltaOneStep= " << G4FieldManager::GetDeltaOneStep()
+      << ", DeltaChord= " << G4FieldManager::GetChordFinder()->GetDeltaChord() << " for "
+      << trk->GetDynamicParticle()->GetDefinition()->GetPDGEncoding() << " with "
+      << trk->GetKineticEnergy() / CLHEP::GeV << " GeV in " << trk->GetVolume()->GetName();
 }
diff --git a/SimG4Core/MagneticField/src/MonopoleEquation.cc b/SimG4Core/MagneticField/src/MonopoleEquation.cc
index b02fc5aa25b92..15a2ec74ab08c 100644
--- a/SimG4Core/MagneticField/src/MonopoleEquation.cc
+++ b/SimG4Core/MagneticField/src/MonopoleEquation.cc
@@ -1,9 +1,9 @@
 //
 // =======================================================================
 //
-// class G4MonopoleEquation 
+// class G4MonopoleEquation
 //
-// Created:  30 April 2010, S. Burdin, B. Bozsogi 
+// Created:  30 April 2010, S. Burdin, B. Bozsogi
 //                       G4MonopoleEquation class for
 //                       Geant4 extended example "monopole"
 //
@@ -12,85 +12,73 @@
 // =======================================================================
 //
 
-#include "SimG4Core/MagneticField/interface/MonopoleEquation.h"
-#include "globals.hh"
 #include "CLHEP/Units/PhysicalConstants.h"
 #include "CLHEP/Units/SystemOfUnits.h"
+#include "SimG4Core/MagneticField/interface/MonopoleEquation.h"
+#include "globals.hh"
 #include <iomanip>
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-MonopoleEquation::MonopoleEquation(G4MagneticField *emField )
-      : G4EquationOfMotion( emField ) 
-{}
+MonopoleEquation::MonopoleEquation(G4MagneticField *emField) : G4EquationOfMotion(emField) {}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-MonopoleEquation::~MonopoleEquation()
-{}
+MonopoleEquation::~MonopoleEquation() {}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-void  
-MonopoleEquation::SetChargeMomentumMass( G4ChargeState particleChargeState, 
-                                         G4double, 
-                                         G4double particleMass)
-{
-  G4double particleMagneticCharge= particleChargeState.MagneticCharge(); 
-  G4double particleElectricCharge= particleChargeState.GetCharge(); 
+void MonopoleEquation::SetChargeMomentumMass(G4ChargeState particleChargeState, G4double, G4double particleMass) {
+  G4double particleMagneticCharge = particleChargeState.MagneticCharge();
+  G4double particleElectricCharge = particleChargeState.GetCharge();
+
+  fElCharge = CLHEP::eplus * particleElectricCharge * CLHEP::c_light;
 
-  fElCharge = CLHEP::eplus*particleElectricCharge*CLHEP::c_light;
-   
-  fMagCharge = CLHEP::eplus*particleMagneticCharge*CLHEP::c_light;
+  fMagCharge = CLHEP::eplus * particleMagneticCharge * CLHEP::c_light;
 
   // G4cout << " MonopoleEquation: ElectricCharge=" << particleElectricCharge
   //           << "; MagneticCharge=" << particleMagneticCharge
   //           << G4endl;
- 
-  fMassCof = particleMass*particleMass ; 
+
+  fMassCof = particleMass * particleMass;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-void
-MonopoleEquation::EvaluateRhsGivenB(const G4double y[],
-                                    const G4double Field[],
-                                    G4double dydx[] ) const
-{
+void MonopoleEquation::EvaluateRhsGivenB(const G4double y[], const G4double Field[], G4double dydx[]) const {
   // Components of y:
-  //    0-2 dr/ds, 
-  //    3-5 dp/ds - momentum derivatives 
+  //    0-2 dr/ds,
+  //    3-5 dp/ds - momentum derivatives
+
+  G4double pSquared = y[3] * y[3] + y[4] * y[4] + y[5] * y[5];
 
-  G4double pSquared = y[3]*y[3] + y[4]*y[4] + y[5]*y[5] ;
+  G4double Energy = std::sqrt(pSquared + fMassCof);
 
-  G4double Energy   = std::sqrt( pSquared + fMassCof );
-   
-  G4double pModuleInverse  = 1.0/std::sqrt(pSquared);
+  G4double pModuleInverse = 1.0 / std::sqrt(pSquared);
 
   G4double inverse_velocity = Energy * pModuleInverse / CLHEP::c_light;
 
-  G4double cofEl     = fElCharge * pModuleInverse ;
-  G4double cofMag = fMagCharge * Energy * pModuleInverse; 
+  G4double cofEl = fElCharge * pModuleInverse;
+  G4double cofMag = fMagCharge * Energy * pModuleInverse;
 
+  dydx[0] = y[3] * pModuleInverse;
+  dydx[1] = y[4] * pModuleInverse;
+  dydx[2] = y[5] * pModuleInverse;
 
-  dydx[0] = y[3]*pModuleInverse ;                         
-  dydx[1] = y[4]*pModuleInverse ;                         
-  dydx[2] = y[5]*pModuleInverse ;                    
-     
-  // G4double magCharge = twopi * hbar_Planck / (eplus * mu0);    
+  // G4double magCharge = twopi * hbar_Planck / (eplus * mu0);
   // magnetic charge in SI units A*m convention
-  //  see http://en.wikipedia.org/wiki/Magnetic_monopole   
-  //   G4cout  << "Magnetic charge:  " << magCharge << G4endl;   
+  //  see http://en.wikipedia.org/wiki/Magnetic_monopole
+  //   G4cout  << "Magnetic charge:  " << magCharge << G4endl;
   // dp/ds = dp/dt * dt/ds = dp/dt / v = Force / velocity
-  // dydx[3] = fMagCharge * Field[0]  * inverse_velocity  * c_light;    
+  // dydx[3] = fMagCharge * Field[0]  * inverse_velocity  * c_light;
   // multiplied by c_light to convert to MeV/mm
-  //     dydx[4] = fMagCharge * Field[1]  * inverse_velocity  * c_light; 
-  //     dydx[5] = fMagCharge * Field[2]  * inverse_velocity  * c_light; 
-      
-  dydx[3] = cofMag * Field[0] + cofEl * (y[4]*Field[2] - y[5]*Field[1]);   
-  dydx[4] = cofMag * Field[1] + cofEl * (y[5]*Field[0] - y[3]*Field[2]); 
-  dydx[5] = cofMag * Field[2] + cofEl * (y[3]*Field[1] - y[4]*Field[0]); 
-   
+  //     dydx[4] = fMagCharge * Field[1]  * inverse_velocity  * c_light;
+  //     dydx[5] = fMagCharge * Field[2]  * inverse_velocity  * c_light;
+
+  dydx[3] = cofMag * Field[0] + cofEl * (y[4] * Field[2] - y[5] * Field[1]);
+  dydx[4] = cofMag * Field[1] + cofEl * (y[5] * Field[0] - y[3] * Field[2]);
+  dydx[5] = cofMag * Field[2] + cofEl * (y[3] * Field[1] - y[4] * Field[0]);
+
   //        G4cout << std::setprecision(5)<< "E=" << Energy
   //               << "; p="<< 1/pModuleInverse
   //               << "; mC="<< magCharge
@@ -102,8 +90,8 @@ MonopoleEquation::EvaluateRhsGivenB(const G4double y[],
   //               <<"; dydx[5]=" << dydx[5]
   //               << G4endl;
 
-  dydx[6] = 0.;//not used
-   
+  dydx[6] = 0.;  // not used
+
   // Lab Time of flight
   dydx[7] = inverse_velocity;
   return;
diff --git a/SimG4Core/MagneticField/test/FieldStepWatcher.cc b/SimG4Core/MagneticField/test/FieldStepWatcher.cc
index 8d888ee798527..7a8c1029ad1af 100644
--- a/SimG4Core/MagneticField/test/FieldStepWatcher.cc
+++ b/SimG4Core/MagneticField/test/FieldStepWatcher.cc
@@ -9,12 +9,11 @@
 #include "G4VPhysicalVolume.hh"
 
 FieldStepWatcher::FieldStepWatcher(const edm::ParameterSet &p) {
-  level   = p.getUntrackedParameter<int>("DepthLevel", 2);
+  level = p.getUntrackedParameter<int>("DepthLevel", 2);
   outFile = p.getUntrackedParameter<std::string>("OutputFile", "field.root");
 
   edm::LogInfo("FieldStepWatcher") << "FieldStepWatcher initialised to monitor"
-				   << " level " << level << " with o/p on " 
-				   << outFile;
+                                   << " level " << level << " with o/p on " << outFile;
   dbe_ = edm::Service<DQMStore>().operator->();
   if (dbe_) {
     dbe_->setVerbose(0);
@@ -22,142 +21,130 @@ FieldStepWatcher::FieldStepWatcher(const edm::ParameterSet &p) {
 }
 
 FieldStepWatcher::~FieldStepWatcher() {
-  if (dbe_ && !outFile.empty()) dbe_->save(outFile);
+  if (dbe_ && !outFile.empty())
+    dbe_->save(outFile);
 }
 
-
-void FieldStepWatcher::update(const BeginOfRun * ) {
-  G4VPhysicalVolume * pv = G4TransportationManager::GetTransportationManager()
-    ->GetNavigatorForTracking()->GetWorldVolume();
+void FieldStepWatcher::update(const BeginOfRun *) {
+  G4VPhysicalVolume *pv =
+      G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume();
   findTouch(pv, 0);
   lvnames.push_back("Not Found");
 
-  edm::LogInfo("FieldStepWatcher") << "FieldStepWatcher: Finds " 
-				   << lvnames.size() << " different volumes"
-				   << " at level " << level;
+  edm::LogInfo("FieldStepWatcher") << "FieldStepWatcher: Finds " << lvnames.size() << " different volumes"
+                                   << " at level " << level;
   unsigned num = lvnames.size();
   steps.push_back(0);
-  for (unsigned int i=0; i<num; i++) {
-    edm::LogInfo("FieldStepWatcher") << "FieldStepWatcher: lvnames[" << i 
-				     << "] = " << lvnames[i];
+  for (unsigned int i = 0; i < num; i++) {
+    edm::LogInfo("FieldStepWatcher") << "FieldStepWatcher: lvnames[" << i << "] = " << lvnames[i];
     steps.push_back(0);
   }
 
   if (dbe_) {
     char titl[60], name[20];
-    for (unsigned int i=0; i<=lvnames.size(); i++) {
+    for (unsigned int i = 0; i <= lvnames.size(); i++) {
       std::string lvname = "All";
-      if (i != 0) lvname = lvnames[i-1];
-      sprintf (name, "Step%d", i);
-      sprintf (titl, "Step Length in Volume %s", lvname.c_str());
-      MonitorElement* m1 = dbe_->book1D(name, titl, 5000, 0., 10000.);
+      if (i != 0)
+        lvname = lvnames[i - 1];
+      sprintf(name, "Step%d", i);
+      sprintf(titl, "Step Length in Volume %s", lvname.c_str());
+      MonitorElement *m1 = dbe_->book1D(name, titl, 5000, 0., 10000.);
       meStep.push_back(m1);
-      sprintf (name, "Call%d", i);
-      sprintf (titl, "Number of steps in Volume %s", lvname.c_str());
-      MonitorElement* m2 = dbe_->book1D(name, titl, 50000, 0., 5000000.);
+      sprintf(name, "Call%d", i);
+      sprintf(titl, "Number of steps in Volume %s", lvname.c_str());
+      MonitorElement *m2 = dbe_->book1D(name, titl, 50000, 0., 5000000.);
       meCall.push_back(m2);
-      sprintf (name, "StepE%d", i);
-      sprintf (titl, "Step Length for Electrons in Volume %s", 
-	       lvname.c_str());
+      sprintf(name, "StepE%d", i);
+      sprintf(titl, "Step Length for Electrons in Volume %s", lvname.c_str());
       m1 = dbe_->book1D(name, titl, 5000, 0., 10000.);
       meStepE.push_back(m1);
-      sprintf (name, "StepG%d", i);
-      sprintf (titl, "Step Length for Photons in Volume %s", 
-	       lvname.c_str());
+      sprintf(name, "StepG%d", i);
+      sprintf(titl, "Step Length for Photons in Volume %s", lvname.c_str());
       m1 = dbe_->book1D(name, titl, 5000, 0., 10000.);
       meStepG.push_back(m1);
-      sprintf (name, "StepMu%d", i);
-      sprintf (titl, "Step Length for Muons in Volume %s", 
-	       lvname.c_str());
+      sprintf(name, "StepMu%d", i);
+      sprintf(titl, "Step Length for Muons in Volume %s", lvname.c_str());
       m1 = dbe_->book1D(name, titl, 5000, 0., 10000.);
       meStepMu.push_back(m1);
-      sprintf (name, "StepNu%d", i);
-      sprintf (titl, "Step Length for Neutrinos in Volume %s", 
-	       lvname.c_str());
+      sprintf(name, "StepNu%d", i);
+      sprintf(titl, "Step Length for Neutrinos in Volume %s", lvname.c_str());
       m1 = dbe_->book1D(name, titl, 5000, 0., 10000.);
       meStepNu.push_back(m1);
-      sprintf (name, "StepCH%d", i);
-      sprintf (titl, "Step Length for Charged Hadrons in Volume %s", 
-	       lvname.c_str());
+      sprintf(name, "StepCH%d", i);
+      sprintf(titl, "Step Length for Charged Hadrons in Volume %s", lvname.c_str());
       m1 = dbe_->book1D(name, titl, 5000, 0., 10000.);
       meStepCH.push_back(m1);
-      sprintf (name, "StepNH%d", i);
-      sprintf (titl, "Step Length for Neutral Hadrons in Volume %s", 
-	       lvname.c_str());
+      sprintf(name, "StepNH%d", i);
+      sprintf(titl, "Step Length for Neutral Hadrons in Volume %s", lvname.c_str());
       m1 = dbe_->book1D(name, titl, 5000, 0., 10000.);
       meStepNH.push_back(m1);
-      sprintf (name, "StepC%d", i);
-      sprintf (titl, "Step Length for Charged Particles in Volume %s",
-               lvname.c_str());
+      sprintf(name, "StepC%d", i);
+      sprintf(titl, "Step Length for Charged Particles in Volume %s", lvname.c_str());
       m1 = dbe_->book1D(name, titl, 5000, 0., 10000.);
       meStepC.push_back(m1);
-      sprintf (name, "StepN%d", i);
-      sprintf (titl, "Step Length for Neutral Particles in Volume %s",
-               lvname.c_str());
+      sprintf(name, "StepN%d", i);
+      sprintf(titl, "Step Length for Neutral Particles in Volume %s", lvname.c_str());
       m1 = dbe_->book1D(name, titl, 5000, 0., 10000.);
       meStepN.push_back(m1);
     }
   }
 }
 
-
-void FieldStepWatcher::update(const BeginOfEvent * ) {
-  for (unsigned int i=0; i<steps.size(); i++) steps[i]=0;
+void FieldStepWatcher::update(const BeginOfEvent *) {
+  for (unsigned int i = 0; i < steps.size(); i++)
+    steps[i] = 0;
 }
 
-void FieldStepWatcher::update(const EndOfEvent * ) {
+void FieldStepWatcher::update(const EndOfEvent *) {
   if (dbe_) {
-    for (unsigned int i=0; i<steps.size(); i++) meCall[i]->Fill(steps[i]);
+    for (unsigned int i = 0; i < steps.size(); i++)
+      meCall[i]->Fill(steps[i]);
   }
 }
 
-void FieldStepWatcher::update(const G4Step * aStep) {
-
+void FieldStepWatcher::update(const G4Step *aStep) {
   if (aStep) {
-    G4StepPoint*        preStepPoint = aStep->GetPreStepPoint();
-    const G4VTouchable* pre_touch    = preStepPoint->GetTouchable();
-    int                 pre_level    = ((pre_touch->GetHistoryDepth())+1);
-    std::string         name         = "Not Found";
+    G4StepPoint *preStepPoint = aStep->GetPreStepPoint();
+    const G4VTouchable *pre_touch = preStepPoint->GetTouchable();
+    int pre_level = ((pre_touch->GetHistoryDepth()) + 1);
+    std::string name = "Not Found";
     if (pre_level > 0 && pre_level >= level) {
       int ii = pre_level - level;
-      name   = pre_touch->GetVolume(ii)->GetName();
+      name = pre_touch->GetVolume(ii)->GetName();
     }
-    int    indx   = findName(name);
+    int indx = findName(name);
     double charge = aStep->GetTrack()->GetDefinition()->GetPDGCharge();
-    int    code   = aStep->GetTrack()->GetDefinition()->GetPDGEncoding();
-    LogDebug("FieldStepWatcher") << "FieldStepWatcher:: Step at Level " 
-				 << pre_level << " with " << name << " at"
-				 << " level " << level << " corresponding"
-				 << " to index " << indx << " due to "
-				 << "particle " << code << " of charge " 
-				 << charge;
+    int code = aStep->GetTrack()->GetDefinition()->GetPDGEncoding();
+    LogDebug("FieldStepWatcher") << "FieldStepWatcher:: Step at Level " << pre_level << " with " << name << " at"
+                                 << " level " << level << " corresponding"
+                                 << " to index " << indx << " due to "
+                                 << "particle " << code << " of charge " << charge;
     steps[0]++;
     if (indx >= 0) {
-      int i = indx+1;
-      steps[indx+1]++;
+      int i = indx + 1;
+      steps[indx + 1]++;
       if (dbe_) {
-	meStep[0]->Fill(aStep->GetStepLength());
-	meStep[i]->Fill(aStep->GetStepLength());
-	if (code == 11 || code == -11) {
-	  meStepE[0]->Fill(aStep->GetStepLength());
-	  meStepE[i]->Fill(aStep->GetStepLength());
-	} else if (code == 22) {
-	  meStepG[0]->Fill(aStep->GetStepLength());
-	  meStepG[i]->Fill(aStep->GetStepLength());
-	} else if (code == 13 || code == -13) {
-	  meStepMu[0]->Fill(aStep->GetStepLength());
-	  meStepMu[i]->Fill(aStep->GetStepLength());
-	} else if (code == 12 || code == -12 || code == 14 || code == -14 ||
-		   code == 16 || code == -16) {
-	  meStepNu[0]->Fill(aStep->GetStepLength());
-	  meStepNu[i]->Fill(aStep->GetStepLength());
-	} else if (charge == 0) {
-	  meStepNH[0]->Fill(aStep->GetStepLength());
-	  meStepNH[i]->Fill(aStep->GetStepLength());
-	} else {
-	  meStepCH[0]->Fill(aStep->GetStepLength());
-	  meStepCH[i]->Fill(aStep->GetStepLength());
-	}
+        meStep[0]->Fill(aStep->GetStepLength());
+        meStep[i]->Fill(aStep->GetStepLength());
+        if (code == 11 || code == -11) {
+          meStepE[0]->Fill(aStep->GetStepLength());
+          meStepE[i]->Fill(aStep->GetStepLength());
+        } else if (code == 22) {
+          meStepG[0]->Fill(aStep->GetStepLength());
+          meStepG[i]->Fill(aStep->GetStepLength());
+        } else if (code == 13 || code == -13) {
+          meStepMu[0]->Fill(aStep->GetStepLength());
+          meStepMu[i]->Fill(aStep->GetStepLength());
+        } else if (code == 12 || code == -12 || code == 14 || code == -14 || code == 16 || code == -16) {
+          meStepNu[0]->Fill(aStep->GetStepLength());
+          meStepNu[i]->Fill(aStep->GetStepLength());
+        } else if (charge == 0) {
+          meStepNH[0]->Fill(aStep->GetStepLength());
+          meStepNH[i]->Fill(aStep->GetStepLength());
+        } else {
+          meStepCH[0]->Fill(aStep->GetStepLength());
+          meStepCH[i]->Fill(aStep->GetStepLength());
+        }
         if (charge == 0) {
           meStepN[0]->Fill(aStep->GetStepLength());
           meStepN[i]->Fill(aStep->GetStepLength());
@@ -170,37 +157,39 @@ void FieldStepWatcher::update(const G4Step * aStep) {
   }
 }
 
-void FieldStepWatcher::findTouch(G4VPhysicalVolume * pv, int leafDepth) { 
-
-  if (leafDepth == 0) fHistory.SetFirstEntry(pv);
-  else fHistory.NewLevel(pv, kNormal, pv->GetCopyNo());
-
-  G4LogicalVolume * lv = pv->GetLogicalVolume();
-  LogDebug("FieldStepWatcher") << "FieldStepWatcher::find Touch " 
-			       << lv->GetName() << " at level " << leafDepth;
-  if (leafDepth == level-1) {
-    const std::string& lvname = lv->GetName();
-    if (findName(lvname) < 0) lvnames.push_back(lvname);
-  } else if (leafDepth < level-1) {
+void FieldStepWatcher::findTouch(G4VPhysicalVolume *pv, int leafDepth) {
+  if (leafDepth == 0)
+    fHistory.SetFirstEntry(pv);
+  else
+    fHistory.NewLevel(pv, kNormal, pv->GetCopyNo());
+
+  G4LogicalVolume *lv = pv->GetLogicalVolume();
+  LogDebug("FieldStepWatcher") << "FieldStepWatcher::find Touch " << lv->GetName() << " at level " << leafDepth;
+  if (leafDepth == level - 1) {
+    const std::string &lvname = lv->GetName();
+    if (findName(lvname) < 0)
+      lvnames.push_back(lvname);
+  } else if (leafDepth < level - 1) {
     int noDaughters = lv->GetNoDaughters();
-    while ((noDaughters--)>0) {
-      G4VPhysicalVolume * pvD = lv->GetDaughter(noDaughters);
-      if (!pvD->IsReplicated()) findTouch(pvD, leafDepth+1);
+    while ((noDaughters--) > 0) {
+      G4VPhysicalVolume *pvD = lv->GetDaughter(noDaughters);
+      if (!pvD->IsReplicated())
+        findTouch(pvD, leafDepth + 1);
     }
   }
-  if (leafDepth > 0) fHistory.BackLevel();
+  if (leafDepth > 0)
+    fHistory.BackLevel();
 }
 
-int FieldStepWatcher::findName(std::string name) { 
-
-  for (unsigned int i=0; i<lvnames.size(); i++) 
-    if (name == lvnames[i]) return i;
+int FieldStepWatcher::findName(std::string name) {
+  for (unsigned int i = 0; i < lvnames.size(); i++)
+    if (name == lvnames[i])
+      return i;
   return -1;
 }
 
-//define this as a plug-in
-#include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
+// define this as a plug-in
 #include "FWCore/PluginManager/interface/ModuleDef.h"
-
+#include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
 
 DEFINE_SIMWATCHER(FieldStepWatcher);
diff --git a/SimG4Core/MagneticField/test/FieldStepWatcher.h b/SimG4Core/MagneticField/test/FieldStepWatcher.h
index 25aa38318f3f5..83f048c7b1788 100644
--- a/SimG4Core/MagneticField/test/FieldStepWatcher.h
+++ b/SimG4Core/MagneticField/test/FieldStepWatcher.h
@@ -1,9 +1,9 @@
 #ifndef SimG4Core_FieldStepWatcher_H
 #define SimG4Core_FieldStepWatcher_H
 
-#include "SimG4Core/Watcher/interface/SimWatcher.h"
-#include "SimG4Core/Notification/interface/Observer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "SimG4Core/Notification/interface/Observer.h"
+#include "SimG4Core/Watcher/interface/SimWatcher.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
@@ -12,9 +12,9 @@
 #include "G4NavigationHistory.hh"
 
 #include <iostream>
-#include <vector>
 #include <map>
 #include <string>
+#include <vector>
 
 class BeginOfRun;
 class BeginOfEvent;
@@ -26,28 +26,29 @@ class FieldStepWatcher : public SimWatcher,
                          public Observer<const BeginOfEvent *>,
                          public Observer<const EndOfEvent *>,
                          public Observer<const G4Step *> {
-
 public:
-  FieldStepWatcher(edm::ParameterSet const & p);
+  FieldStepWatcher(edm::ParameterSet const &p);
   ~FieldStepWatcher() override;
+
 private:
-  void update(const BeginOfRun * ) override;
-  void update(const BeginOfEvent * ) override;
-  void update(const EndOfEvent * ) override;
-  void update(const G4Step * ) override;
-  void findTouch(G4VPhysicalVolume * , int );
-  int  findName(std::string);
+  void update(const BeginOfRun *) override;
+  void update(const BeginOfEvent *) override;
+  void update(const EndOfEvent *) override;
+  void update(const G4Step *) override;
+  void findTouch(G4VPhysicalVolume *, int);
+  int findName(std::string);
+
 private:
-  int                          level;
-  std::string                  outFile;
+  int level;
+  std::string outFile;
 
-  std::vector<std::string>     lvnames;
-  std::vector<int>             steps;
-  G4NavigationHistory          fHistory;
+  std::vector<std::string> lvnames;
+  std::vector<int> steps;
+  G4NavigationHistory fHistory;
 
-  DQMStore                     *dbe_;
-  std::vector<MonitorElement*> meStep, meCall, meStepCH, meStepNH, meStepC;
-  std::vector<MonitorElement*> meStepE, meStepG, meStepMu, meStepNu, meStepN;
+  DQMStore *dbe_;
+  std::vector<MonitorElement *> meStep, meCall, meStepCH, meStepNH, meStepC;
+  std::vector<MonitorElement *> meStepE, meStepG, meStepMu, meStepNu, meStepN;
 };
 
 #endif
diff --git a/SimG4Core/Notification/interface/BeginOfEvent.h b/SimG4Core/Notification/interface/BeginOfEvent.h
index c161cc5dbddfb..ee0b65e3026fa 100644
--- a/SimG4Core/Notification/interface/BeginOfEvent.h
+++ b/SimG4Core/Notification/interface/BeginOfEvent.h
@@ -3,13 +3,13 @@
 
 #include "G4Event.hh"
 
-class BeginOfEvent
-{
+class BeginOfEvent {
 public:
-    BeginOfEvent(const G4Event * tEvent) : anEvent(tEvent) {}
-    const G4Event * operator()() const { return anEvent; }
+  BeginOfEvent(const G4Event* tEvent) : anEvent(tEvent) {}
+  const G4Event* operator()() const { return anEvent; }
+
 private:
-    const G4Event * anEvent;
+  const G4Event* anEvent;
 };
 
 #endif
diff --git a/SimG4Core/Notification/interface/BeginOfJob.h b/SimG4Core/Notification/interface/BeginOfJob.h
index a4346815bf2ab..abb475afa9610 100644
--- a/SimG4Core/Notification/interface/BeginOfJob.h
+++ b/SimG4Core/Notification/interface/BeginOfJob.h
@@ -5,11 +5,11 @@ namespace edm {
   class EventSetup;
 }
 
-class BeginOfJob
-{
+class BeginOfJob {
 public:
   BeginOfJob(const edm::EventSetup* tJob) : anJob(tJob) {}
-  const edm::EventSetup * operator()() const { return anJob; }
+  const edm::EventSetup* operator()() const { return anJob; }
+
 private:
   const edm::EventSetup* anJob;
 };
diff --git a/SimG4Core/Notification/interface/BeginOfRun.h b/SimG4Core/Notification/interface/BeginOfRun.h
index fcfba26c856db..b9d1e916026af 100644
--- a/SimG4Core/Notification/interface/BeginOfRun.h
+++ b/SimG4Core/Notification/interface/BeginOfRun.h
@@ -3,13 +3,13 @@
 
 #include "G4Run.hh"
 
-class BeginOfRun
-{
+class BeginOfRun {
 public:
-    BeginOfRun(const G4Run * tRun) : aRun(tRun) {}
-    const G4Run * operator()() const { return aRun; }
+  BeginOfRun(const G4Run* tRun) : aRun(tRun) {}
+  const G4Run* operator()() const { return aRun; }
+
 private:
-    const G4Run * aRun;
+  const G4Run* aRun;
 };
 
 #endif
diff --git a/SimG4Core/Notification/interface/BeginOfTrack.h b/SimG4Core/Notification/interface/BeginOfTrack.h
index 55d97d7b6c810..8d04a18abe5ae 100644
--- a/SimG4Core/Notification/interface/BeginOfTrack.h
+++ b/SimG4Core/Notification/interface/BeginOfTrack.h
@@ -3,13 +3,13 @@
 
 #include "G4Track.hh"
 
-class BeginOfTrack
-{
+class BeginOfTrack {
 public:
-    BeginOfTrack(const G4Track * tTrack) : aTrack(tTrack) {}
-    const G4Track * operator()() const { return aTrack; }
+  BeginOfTrack(const G4Track* tTrack) : aTrack(tTrack) {}
+  const G4Track* operator()() const { return aTrack; }
+
 private:
-    const G4Track * aTrack;
+  const G4Track* aTrack;
 };
 
 #endif
diff --git a/SimG4Core/Notification/interface/CMSSteppingVerbose.h b/SimG4Core/Notification/interface/CMSSteppingVerbose.h
index f1b4c5791940d..245fab4ce1d91 100644
--- a/SimG4Core/Notification/interface/CMSSteppingVerbose.h
+++ b/SimG4Core/Notification/interface/CMSSteppingVerbose.h
@@ -7,13 +7,13 @@
 //                    verbosity class in order to keep necessary
 //                    verbosity options when G4VERBOSE flag is disabled.
 //                    The goal is to provide easy way to print
-//                    per event, per track, per step. 
+//                    per event, per track, per step.
 //
 // V.Ivanchenko 10.06.2016
 //
 //---------------------------------------------------------------
 
-#include "globals.hh"   
+#include "globals.hh"
 #include <vector>
 
 class G4Event;
@@ -22,25 +22,19 @@ class G4Step;
 class G4SteppingManager;
 class G4SteppingVerbose;
 
-class CMSSteppingVerbose 
-{
-public:  
-
-  explicit CMSSteppingVerbose(G4int verb, G4double ekin,
-			      std::vector<G4int>& evtNum,
-			      std::vector<G4int>& primV,
-			      std::vector<G4int>& trNum);
+class CMSSteppingVerbose {
+public:
+  explicit CMSSteppingVerbose(
+      G4int verb, G4double ekin, std::vector<G4int>& evtNum, std::vector<G4int>& primV, std::vector<G4int>& trNum);
   ~CMSSteppingVerbose();
 
   void BeginOfEvent(const G4Event*);
   void TrackStarted(const G4Track*, bool isKilled);
   void TrackEnded(const G4Track*) const;
   void StackFilled(const G4Track*, bool isKilled) const;
-  void NextStep(const G4Step*, const G4SteppingManager* ptr, 
-		bool isKilled) const;
+  void NextStep(const G4Step*, const G4SteppingManager* ptr, bool isKilled) const;
 
 private:
-
   G4bool m_PrintEvent;
   G4bool m_PrintTrack;
   G4bool m_smInitialized;
diff --git a/SimG4Core/Notification/interface/CurrentG4Track.h b/SimG4Core/Notification/interface/CurrentG4Track.h
index 00e3bd135a754..2043b3503ffaa 100644
--- a/SimG4Core/Notification/interface/CurrentG4Track.h
+++ b/SimG4Core/Notification/interface/CurrentG4Track.h
@@ -11,13 +11,13 @@
  *  this class will be removed.
  */
 
-class CurrentG4Track 
-{
+class CurrentG4Track {
 public:
-    static const G4Track * track();
-    static void setTrack(const G4Track *);
+  static const G4Track *track();
+  static void setTrack(const G4Track *);
+
 private:
-    static thread_local const G4Track * m_track;
+  static thread_local const G4Track *m_track;
 };
 
 #endif
diff --git a/SimG4Core/Notification/interface/DDG4DispContainer.h b/SimG4Core/Notification/interface/DDG4DispContainer.h
index 9a250bc5df67e..66b07e690dcb2 100644
--- a/SimG4Core/Notification/interface/DDG4DispContainer.h
+++ b/SimG4Core/Notification/interface/DDG4DispContainer.h
@@ -1,7 +1,7 @@
 #ifndef SimG4Core_DDG4DispContainer_H
 #define SimG4Core_DDG4DispContainer_H
 
-#include "SimG4Core/Notification/interface/DDG4Dispatchable.h"              
+#include "SimG4Core/Notification/interface/DDG4Dispatchable.h"
 
 #include <vector>
 
diff --git a/SimG4Core/Notification/interface/DDG4Dispatchable.h b/SimG4Core/Notification/interface/DDG4Dispatchable.h
index 6cc17ec8dfaac..886f711c59dcb 100644
--- a/SimG4Core/Notification/interface/DDG4Dispatchable.h
+++ b/SimG4Core/Notification/interface/DDG4Dispatchable.h
@@ -5,18 +5,15 @@
 
 #include "G4LogicalVolume.hh"
 
-class DDG4Dispatchable
-{
+class DDG4Dispatchable {
 public:
-    DDG4Dispatchable(const DDLogicalPart * ddL, G4LogicalVolume * g4L) 
-	: ddLogical(ddL), g4Logical(g4L) {}
-    const DDLogicalPart * getDDLogicalPart() const { return ddLogical; }
-    G4LogicalVolume * getG4LogicalVolume() const{ return g4Logical; } 
+  DDG4Dispatchable(const DDLogicalPart* ddL, G4LogicalVolume* g4L) : ddLogical(ddL), g4Logical(g4L) {}
+  const DDLogicalPart* getDDLogicalPart() const { return ddLogical; }
+  G4LogicalVolume* getG4LogicalVolume() const { return g4Logical; }
+
 private:
-    const DDLogicalPart * ddLogical;
-    G4LogicalVolume * g4Logical;
+  const DDLogicalPart* ddLogical;
+  G4LogicalVolume* g4Logical;
 };
 
 #endif
-
-
diff --git a/SimG4Core/Notification/interface/EndOfEvent.h b/SimG4Core/Notification/interface/EndOfEvent.h
index cbce70e316051..333c3057b948c 100644
--- a/SimG4Core/Notification/interface/EndOfEvent.h
+++ b/SimG4Core/Notification/interface/EndOfEvent.h
@@ -3,13 +3,13 @@
 
 #include "G4Event.hh"
 
-class EndOfEvent
-{
+class EndOfEvent {
 public:
-    EndOfEvent(const G4Event * tEvent) : anEvent(tEvent) {}
-    const G4Event * operator()() const { return anEvent; }
+  EndOfEvent(const G4Event* tEvent) : anEvent(tEvent) {}
+  const G4Event* operator()() const { return anEvent; }
+
 private:
-    const G4Event * anEvent;
+  const G4Event* anEvent;
 };
 
 #endif
diff --git a/SimG4Core/Notification/interface/EndOfRun.h b/SimG4Core/Notification/interface/EndOfRun.h
index d7a0dd129b1d9..efa34698892ce 100644
--- a/SimG4Core/Notification/interface/EndOfRun.h
+++ b/SimG4Core/Notification/interface/EndOfRun.h
@@ -3,13 +3,13 @@
 
 #include "G4Run.hh"
 
-class EndOfRun
-{
+class EndOfRun {
 public:
-    EndOfRun(const G4Run * tRun) : aRun(tRun) {}
-    const G4Run * operator()() const { return aRun; }
+  EndOfRun(const G4Run* tRun) : aRun(tRun) {}
+  const G4Run* operator()() const { return aRun; }
+
 private:
-    const G4Run * aRun;
+  const G4Run* aRun;
 };
 
 #endif
diff --git a/SimG4Core/Notification/interface/EndOfTrack.h b/SimG4Core/Notification/interface/EndOfTrack.h
index 57148dd4c4a9b..24c02e8803bd0 100644
--- a/SimG4Core/Notification/interface/EndOfTrack.h
+++ b/SimG4Core/Notification/interface/EndOfTrack.h
@@ -3,13 +3,13 @@
 
 #include "G4Track.hh"
 
-class EndOfTrack
-{
+class EndOfTrack {
 public:
-    EndOfTrack(const G4Track * tTrack) : aTrack(tTrack) {}
-    const G4Track * operator()() const { return aTrack; }
+  EndOfTrack(const G4Track* tTrack) : aTrack(tTrack) {}
+  const G4Track* operator()() const { return aTrack; }
+
 private:
-    const G4Track * aTrack;
+  const G4Track* aTrack;
 };
 
 #endif
diff --git a/SimG4Core/Notification/interface/G4SimEvent.h b/SimG4Core/Notification/interface/G4SimEvent.h
index a59d4c3b8c232..1e77300288df7 100644
--- a/SimG4Core/Notification/interface/G4SimEvent.h
+++ b/SimG4Core/Notification/interface/G4SimEvent.h
@@ -11,38 +11,38 @@
 
 #include <vector>
 
-class G4SimEvent
-{
+class G4SimEvent {
 public:
-    G4SimEvent();
-    virtual ~G4SimEvent();
-    void load(edm::SimTrackContainer & c) const;
-    void load(edm::SimVertexContainer & c)  const;
-    unsigned int nTracks() const { return g4tracks.size(); }
-    unsigned int nVertices() const { return g4vertices.size(); }
-    unsigned int nGenParts() const { return hepMCEvent->particles_size(); }
-    void hepEvent(const HepMC::GenEvent * r) { hepMCEvent = r; }
-    const HepMC::GenEvent * hepEvent() const { return hepMCEvent; }
-    void weight(float w) { weight_ = w; }
-    float weight() const { return weight_; }
-    void collisionPoint( const math::XYZTLorentzVectorD& v ) { collisionPoint_ = v ; }
-    const math::XYZTLorentzVectorD& collisionPoint() const { return collisionPoint_; }
-    void nparam(int n) { nparam_ = n; }
-    const int nparam() const { return nparam_; }
-    void param(const std::vector<float>& p) { param_ = p; }
-    const std::vector<float> & param() const { return param_; }
-    void add(G4SimTrack * t) { g4tracks.push_back(t); }
-    void add(G4SimVertex * v) { g4vertices.push_back(v); }
-    const G4SimTrack & g4track(int i) const { return *g4tracks[i-1]; }
-    const G4SimVertex & g4vertex(int i) const { return *g4vertices[i-1]; }
+  G4SimEvent();
+  virtual ~G4SimEvent();
+  void load(edm::SimTrackContainer& c) const;
+  void load(edm::SimVertexContainer& c) const;
+  unsigned int nTracks() const { return g4tracks.size(); }
+  unsigned int nVertices() const { return g4vertices.size(); }
+  unsigned int nGenParts() const { return hepMCEvent->particles_size(); }
+  void hepEvent(const HepMC::GenEvent* r) { hepMCEvent = r; }
+  const HepMC::GenEvent* hepEvent() const { return hepMCEvent; }
+  void weight(float w) { weight_ = w; }
+  float weight() const { return weight_; }
+  void collisionPoint(const math::XYZTLorentzVectorD& v) { collisionPoint_ = v; }
+  const math::XYZTLorentzVectorD& collisionPoint() const { return collisionPoint_; }
+  void nparam(int n) { nparam_ = n; }
+  const int nparam() const { return nparam_; }
+  void param(const std::vector<float>& p) { param_ = p; }
+  const std::vector<float>& param() const { return param_; }
+  void add(G4SimTrack* t) { g4tracks.push_back(t); }
+  void add(G4SimVertex* v) { g4vertices.push_back(v); }
+  const G4SimTrack& g4track(int i) const { return *g4tracks[i - 1]; }
+  const G4SimVertex& g4vertex(int i) const { return *g4vertices[i - 1]; }
+
 protected:
-    const HepMC::GenEvent * hepMCEvent;  
-    float weight_;
-    math::XYZTLorentzVectorD collisionPoint_;
-    int nparam_;
-    std::vector<float> param_;
-    std::vector<G4SimTrack *> g4tracks;
-    std::vector<G4SimVertex *> g4vertices;
+  const HepMC::GenEvent* hepMCEvent;
+  float weight_;
+  math::XYZTLorentzVectorD collisionPoint_;
+  int nparam_;
+  std::vector<float> param_;
+  std::vector<G4SimTrack*> g4tracks;
+  std::vector<G4SimVertex*> g4vertices;
 };
 
 #endif
diff --git a/SimG4Core/Notification/interface/G4SimTrack.h b/SimG4Core/Notification/interface/G4SimTrack.h
index 966a5f4ad2f34..7de9040681a70 100644
--- a/SimG4Core/Notification/interface/G4SimTrack.h
+++ b/SimG4Core/Notification/interface/G4SimTrack.h
@@ -3,53 +3,79 @@
 
 #include "DataFormats/Math/interface/Vector3D.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
-#include <vector> 
+#include <vector>
 #include <cmath>
 
-class G4SimTrack
-{
+class G4SimTrack {
 public:
   G4SimTrack() {}
-  
-  G4SimTrack(int iid, int ipart, const math::XYZVectorD & ip, double ie)
-    : id_(iid), ipart_(ipart), ip_(ip), ie_(ie),ivert_(-1),igenpart_(-1), parentID_(-1),
-      parentMomentum_(math::XYZVectorD(0.,0.,0.)),tkSurfacePosition_(math::XYZVectorD(0.,0.,0.)),
-      tkSurfaceMomentum_(math::XYZTLorentzVectorD(0.,0.,0.,0.)){} 
-  
-  G4SimTrack(int iid, int ipart, const math::XYZVectorD& ip, double ie,
-	     int iv,  int ig, const math::XYZVectorD& ipmom) 
-    : id_(iid),ipart_(ipart),ip_(ip),ie_(ie),ivert_(iv),igenpart_(ig),parentMomentum_(ipmom),
-      tkSurfacePosition_(math::XYZVectorD(0.,0.,0.)),tkSurfaceMomentum_(math::XYZTLorentzVectorD(0.,0.,0.,0.)) {}
-
-  G4SimTrack(int iid, int ipart, const math::XYZVectorD& ip, double ie,
-	     int iv,  int ig, const math::XYZVectorD& ipmom, 
-	     const math::XYZVectorD & tkpos, const math::XYZTLorentzVectorD & tkmom) 
-    : id_(iid),ipart_(ipart),ip_(ip),ie_(ie),ivert_(iv),igenpart_(ig),parentMomentum_(ipmom),
-      tkSurfacePosition_(tkpos),tkSurfaceMomentum_(tkmom) {}
+
+  G4SimTrack(int iid, int ipart, const math::XYZVectorD& ip, double ie)
+      : id_(iid),
+        ipart_(ipart),
+        ip_(ip),
+        ie_(ie),
+        ivert_(-1),
+        igenpart_(-1),
+        parentID_(-1),
+        parentMomentum_(math::XYZVectorD(0., 0., 0.)),
+        tkSurfacePosition_(math::XYZVectorD(0., 0., 0.)),
+        tkSurfaceMomentum_(math::XYZTLorentzVectorD(0., 0., 0., 0.)) {}
+
+  G4SimTrack(int iid, int ipart, const math::XYZVectorD& ip, double ie, int iv, int ig, const math::XYZVectorD& ipmom)
+      : id_(iid),
+        ipart_(ipart),
+        ip_(ip),
+        ie_(ie),
+        ivert_(iv),
+        igenpart_(ig),
+        parentMomentum_(ipmom),
+        tkSurfacePosition_(math::XYZVectorD(0., 0., 0.)),
+        tkSurfaceMomentum_(math::XYZTLorentzVectorD(0., 0., 0., 0.)) {}
+
+  G4SimTrack(int iid,
+             int ipart,
+             const math::XYZVectorD& ip,
+             double ie,
+             int iv,
+             int ig,
+             const math::XYZVectorD& ipmom,
+             const math::XYZVectorD& tkpos,
+             const math::XYZTLorentzVectorD& tkmom)
+      : id_(iid),
+        ipart_(ipart),
+        ip_(ip),
+        ie_(ie),
+        ivert_(iv),
+        igenpart_(ig),
+        parentMomentum_(ipmom),
+        tkSurfacePosition_(tkpos),
+        tkSurfaceMomentum_(tkmom) {}
 
   ~G4SimTrack() {}
 
   int id() const { return id_; }
   int part() const { return ipart_; }
-  const math::XYZVectorD & momentum() const { return ip_; }
+  const math::XYZVectorD& momentum() const { return ip_; }
   double energy() const { return ie_; }
   int ivert() const { return ivert_; }
   int igenpart() const { return igenpart_; }
   // parent momentum at interaction
-  const math::XYZVectorD & parentMomentum() const { return parentMomentum_; } 
+  const math::XYZVectorD& parentMomentum() const { return parentMomentum_; }
   // Information at level of tracker surface
-  const math::XYZVectorD & trackerSurfacePosition() const {return tkSurfacePosition_;}
-  const math::XYZTLorentzVectorD & trackerSurfaceMomentum() const {return tkSurfaceMomentum_;}
+  const math::XYZVectorD& trackerSurfacePosition() const { return tkSurfacePosition_; }
+  const math::XYZTLorentzVectorD& trackerSurfaceMomentum() const { return tkSurfaceMomentum_; }
   // parent track ID (only stored if parent momentum at interaction
   // is stored, else = -1)
   int parentID() const { return parentID_; }
+
 private:
   int id_;
   int ipart_;
   math::XYZVectorD ip_;
   double ie_;
-  int ivert_; 
-  int igenpart_; 
+  int ivert_;
+  int igenpart_;
   int parentID_;
   math::XYZVectorD parentMomentum_;
   math::XYZVectorD tkSurfacePosition_;
diff --git a/SimG4Core/Notification/interface/G4SimVertex.h b/SimG4Core/Notification/interface/G4SimVertex.h
index cb60ae55ffed5..f49f8cf28bbe3 100644
--- a/SimG4Core/Notification/interface/G4SimVertex.h
+++ b/SimG4Core/Notification/interface/G4SimVertex.h
@@ -3,25 +3,25 @@
 
 #include "DataFormats/Math/interface/Vector3D.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
-#include <vector> 
+#include <vector>
 #include <cmath>
 
-class G4SimVertex
-{
+class G4SimVertex {
 public:
-    G4SimVertex() {}
-    G4SimVertex(const math::XYZVectorD & ip, double it, int iv, unsigned int typ=0) : 
-      ilv_(ip),itime_(it),itrack_(iv),procType_(typ) {}
-    /// index of the parent (-1 if no parent)
-    const math::XYZVectorD & vertexPosition() const { return  ilv_; }
-    double vertexGlobalTime() const     { return  itime_; }
-    int parentIndex() const	      { return  itrack_; }
-    unsigned int processType() const    { return  procType_; }
+  G4SimVertex() {}
+  G4SimVertex(const math::XYZVectorD& ip, double it, int iv, unsigned int typ = 0)
+      : ilv_(ip), itime_(it), itrack_(iv), procType_(typ) {}
+  /// index of the parent (-1 if no parent)
+  const math::XYZVectorD& vertexPosition() const { return ilv_; }
+  double vertexGlobalTime() const { return itime_; }
+  int parentIndex() const { return itrack_; }
+  unsigned int processType() const { return procType_; }
+
 private:
-    math::XYZVectorD ilv_;
-    double itime_;
-    int itrack_;
-    unsigned int procType_;
+  math::XYZVectorD ilv_;
+  double itime_;
+  int itrack_;
+  unsigned int procType_;
 };
 
 #endif
diff --git a/SimG4Core/Notification/interface/G4TrackToParticleID.h b/SimG4Core/Notification/interface/G4TrackToParticleID.h
index 541c6b05394f4..4b7105f3c91f4 100644
--- a/SimG4Core/Notification/interface/G4TrackToParticleID.h
+++ b/SimG4Core/Notification/interface/G4TrackToParticleID.h
@@ -3,11 +3,10 @@
 
 class G4Track;
 
-class G4TrackToParticleID
-{
+class G4TrackToParticleID {
 public:
   // CMS convention (different from ordinary PDG code)
-  static int  particleID(const G4Track *);
+  static int particleID(const G4Track *);
 
   static bool isGammaElectronPositron(int pdgCode);
   static bool isGammaElectronPositron(const G4Track *);
@@ -18,7 +17,7 @@ class G4TrackToParticleID
   // pi+-, p, pbar, n, nbar, KL, K+-, light ion and anti-ion, generic ion
   static bool isStableHadron(int pdgCode);
 
-  // pi+-, p, pbar, n, nbar, KL, K+-, light ions and anti-ions 
+  // pi+-, p, pbar, n, nbar, KL, K+-, light ions and anti-ions
   static bool isStableHadronIon(const G4Track *);
 };
 
diff --git a/SimG4Core/Notification/interface/GenParticleInfo.h b/SimG4Core/Notification/interface/GenParticleInfo.h
index d32d0399b1356..8da448f26a90c 100644
--- a/SimG4Core/Notification/interface/GenParticleInfo.h
+++ b/SimG4Core/Notification/interface/GenParticleInfo.h
@@ -3,14 +3,14 @@
 
 #include "G4VUserPrimaryParticleInformation.hh"
 
-class GenParticleInfo : public G4VUserPrimaryParticleInformation 
-{
+class GenParticleInfo : public G4VUserPrimaryParticleInformation {
 public:
-    explicit GenParticleInfo(int id) : id_(id) {}
-    int id() const { return id_; }
-    void Print() const override {}
+  explicit GenParticleInfo(int id) : id_(id) {}
+  int id() const { return id_; }
+  void Print() const override {}
+
 private:
-    int id_;
+  int id_;
 };
 
 #endif
diff --git a/SimG4Core/Notification/interface/GenParticleInfoExtractor.h b/SimG4Core/Notification/interface/GenParticleInfoExtractor.h
index 54b5c2fc6ad26..ffe95f44fa102 100644
--- a/SimG4Core/Notification/interface/GenParticleInfoExtractor.h
+++ b/SimG4Core/Notification/interface/GenParticleInfoExtractor.h
@@ -5,10 +5,9 @@
 
 class G4PrimaryParticle;
 
-class GenParticleInfoExtractor 
-{
+class GenParticleInfoExtractor {
 public:
-    const GenParticleInfo& operator()(const G4PrimaryParticle * p) const;
+  const GenParticleInfo& operator()(const G4PrimaryParticle* p) const;
 };
 
 #endif
diff --git a/SimG4Core/Notification/interface/NewTrackAction.h b/SimG4Core/Notification/interface/NewTrackAction.h
index 04b664d57fa0e..b1fe4823f374a 100644
--- a/SimG4Core/Notification/interface/NewTrackAction.h
+++ b/SimG4Core/Notification/interface/NewTrackAction.h
@@ -12,17 +12,16 @@ class TrackInformation;
  */
 
 class NewTrackAction {
-
 public:
   NewTrackAction();
-  void primary(const G4Track * aSecondary) const;
-  void primary(G4Track * aSecondary) const;
-  void secondary(const G4Track * aSecondary,const G4Track & mother, int) const;
-  void secondary(G4Track * aSecondary,const G4Track & mother, int) const;
+  void primary(const G4Track* aSecondary) const;
+  void primary(G4Track* aSecondary) const;
+  void secondary(const G4Track* aSecondary, const G4Track& mother, int) const;
+  void secondary(G4Track* aSecondary, const G4Track& mother, int) const;
+
 private:
-  void addUserInfoToPrimary(G4Track * aTrack) const;
-  void addUserInfoToSecondary(G4Track * aTrack, 
-			      const TrackInformation & motherInfo, int) const;
+  void addUserInfoToPrimary(G4Track* aTrack) const;
+  void addUserInfoToSecondary(G4Track* aTrack, const TrackInformation& motherInfo, int) const;
 };
 
 #endif
diff --git a/SimG4Core/Notification/interface/Observer.h b/SimG4Core/Notification/interface/Observer.h
index 757302c7c4237..6ba4380078440 100644
--- a/SimG4Core/Notification/interface/Observer.h
+++ b/SimG4Core/Notification/interface/Observer.h
@@ -4,7 +4,7 @@
 //
 // Package:     Notification
 // Class  :     Observer
-// 
+//
 /**\class Observer Observer.h SimG4Core/Notification/interface/Observer.h
 
 Description: Adapts the COBRA signal handling for use in the OscarProducer
@@ -19,25 +19,23 @@ the signal the class must override the 'void update(T)' method (e.g., void updat
 //
 //
 
-
-template<class T>
-class Observer
-{
+template <class T>
+class Observer {
 public:
-    Observer() {}
-    virtual ~Observer() {}
+  Observer() {}
+  virtual ~Observer() {}
 
-    /** This method is what is called when the signal is actually sent.  The signal is not sent
+  /** This method is what is called when the signal is actually sent.  The signal is not sent
        directly to 'update' because if we did
        1) If the user did not declare 'update' to be 'public' then we get a compilation failure 
        2) we would not have a 'hook' to allow the 'pre' and 'post' functions to be called
        */
-    void slotForUpdate(T iT) {
-       update(iT);
-    }
+  void slotForUpdate(T iT) { update(iT); }
+
 protected:
-    ///This routine will be called when the appropriate signal arrives
-    virtual void update(T)  = 0;
+  ///This routine will be called when the appropriate signal arrives
+  virtual void update(T) = 0;
+
 private:
 };
 
diff --git a/SimG4Core/Notification/interface/Signaler.h b/SimG4Core/Notification/interface/Signaler.h
index d24e588c66c36..035d48f1b3695 100644
--- a/SimG4Core/Notification/interface/Signaler.h
+++ b/SimG4Core/Notification/interface/Signaler.h
@@ -4,7 +4,7 @@
 //
 // Package:     Notification
 // Class  :     Signaler
-// 
+//
 /**\class Signaler Signaler.h SimG4Core/Notification/interface/Signaler.h
 
  Description: Manages a particular signal of the SimActivityRegistry
@@ -19,7 +19,7 @@
     attached.
 */
 //
-// Original Author:  
+// Original Author:
 //         Created:  Sat Dec  1 10:17:20 EST 2007
 //
 
@@ -32,50 +32,40 @@
 // forward declarations
 
 namespace sim_act {
-   template <typename T>
-   class Signaler : public Observer<const T*>
-   {
-	 
-      public:
-	 typedef Observer<const T*>* slot_type; 
-	 Signaler() {}
-	 ~Signaler() override {}
-	 
-	 // ---------- const member functions ---------------------
-	 void operator()(const T* iSignal) const {
-	    typedef typename std::vector<Observer<const T*>* >::const_iterator iterator; 
-	    for( iterator it = observers_.begin();
-		it != observers_.end();
-		++it) {
-	       (*it)->slotForUpdate(iSignal);
-	    }
-	 }
-
-	 // ---------- static member functions --------------------
-	 
-	 // ---------- member functions ---------------------------
-
-	 ///does not take ownership of memory
-	 void connect(Observer<const T*>* iObs) {
-	    observers_.push_back(iObs);
-	 }
-
-	 ///does not take ownership of memory
-	 void connect(Observer<const T*>& iObs) {
-	    observers_.push_back(&iObs);
-	 }
-
-      private:
-	 Signaler(const Signaler&) = delete; // stop default
-	 
-	 const Signaler& operator=(const Signaler&) = delete; // stop default
-	 
-	 void update(const T* iData) override {
-	    this->operator()(iData);
-	 }
-	 // ---------- member data --------------------------------
-	 std::vector<Observer<const T*>* > observers_;
-   };
-   
-}
+  template <typename T>
+  class Signaler : public Observer<const T*> {
+  public:
+    typedef Observer<const T*>* slot_type;
+    Signaler() {}
+    ~Signaler() override {}
+
+    // ---------- const member functions ---------------------
+    void operator()(const T* iSignal) const {
+      typedef typename std::vector<Observer<const T*>*>::const_iterator iterator;
+      for (iterator it = observers_.begin(); it != observers_.end(); ++it) {
+        (*it)->slotForUpdate(iSignal);
+      }
+    }
+
+    // ---------- static member functions --------------------
+
+    // ---------- member functions ---------------------------
+
+    ///does not take ownership of memory
+    void connect(Observer<const T*>* iObs) { observers_.push_back(iObs); }
+
+    ///does not take ownership of memory
+    void connect(Observer<const T*>& iObs) { observers_.push_back(&iObs); }
+
+  private:
+    Signaler(const Signaler&) = delete;  // stop default
+
+    const Signaler& operator=(const Signaler&) = delete;  // stop default
+
+    void update(const T* iData) override { this->operator()(iData); }
+    // ---------- member data --------------------------------
+    std::vector<Observer<const T*>*> observers_;
+  };
+
+}  // namespace sim_act
 #endif
diff --git a/SimG4Core/Notification/interface/SimActivityRegistry.h b/SimG4Core/Notification/interface/SimActivityRegistry.h
index 0ab301610ef79..00fd75a598fbd 100644
--- a/SimG4Core/Notification/interface/SimActivityRegistry.h
+++ b/SimG4Core/Notification/interface/SimActivityRegistry.h
@@ -4,7 +4,7 @@
 //
 // Package:     Notification
 // Class  :     SimActivityRegistry
-// 
+//
 /**\class SimActivityRegistry SimActivityRegistry.h SimG4Core/Notification/interface/SimActivityRegistry.h
 
  Description: Holds the various signals emitted in the simulation framework
@@ -25,7 +25,6 @@
 // user include files
 #include "SimG4Core/Notification/interface/Signaler.h"
 
-
 // forward declarations
 class BeginOfJob;
 class BeginOfRun;
@@ -38,89 +37,68 @@ class EndOfTrack;
 class DDDWorld;
 class G4Step;
 
-#define SAR_CONNECT_METHOD(signal) void connect(Observer<const signal*>* iObject) { watch ## signal (iObject); }
-
-class SimActivityRegistry
-{
-
-   public:
-      SimActivityRegistry() {}
-      //virtual ~SimActivityRegistry();
-
-      typedef sim_act::Signaler<BeginOfJob> BeginOfJobSignal;
-      BeginOfJobSignal beginOfJobSignal_;
-      void watchBeginOfJob(const BeginOfJobSignal::slot_type& iSlot){
-         beginOfJobSignal_.connect(iSlot);
-      }
-      SAR_CONNECT_METHOD(BeginOfJob)
-
-      typedef sim_act::Signaler<DDDWorld> DDDWorldSignal;
-      DDDWorldSignal dddWorldSignal_;
-      void watchDDDWorld(const DDDWorldSignal::slot_type& iSlot){
-         dddWorldSignal_.connect(iSlot);
-      }
-      SAR_CONNECT_METHOD(DDDWorld)
-
-      typedef sim_act::Signaler<BeginOfRun> BeginOfRunSignal;
-      BeginOfRunSignal beginOfRunSignal_;
-      void watchBeginOfRun(const BeginOfRunSignal::slot_type& iSlot){
-         beginOfRunSignal_.connect(iSlot);
-      }
-      SAR_CONNECT_METHOD(BeginOfRun)
-
-      typedef sim_act::Signaler<BeginOfEvent> BeginOfEventSignal;
-      BeginOfEventSignal beginOfEventSignal_;
-      void watchBeginOfEvent(const BeginOfEventSignal::slot_type& iSlot){
-         beginOfEventSignal_.connect(iSlot);
-      }
-      SAR_CONNECT_METHOD(BeginOfEvent)
-
-      typedef sim_act::Signaler<BeginOfTrack> BeginOfTrackSignal;
-      BeginOfTrackSignal beginOfTrackSignal_;
-      void watchBeginOfTrack(const BeginOfTrackSignal::slot_type& iSlot){
-         beginOfTrackSignal_.connect(iSlot);
-      }
-      SAR_CONNECT_METHOD(BeginOfTrack)
-      
-      typedef sim_act::Signaler<G4Step> G4StepSignal;
-      G4StepSignal g4StepSignal_;
-      void watchG4Step(const G4StepSignal::slot_type& iSlot){
-         g4StepSignal_.connect(iSlot);
-      }
-      SAR_CONNECT_METHOD(G4Step)
-         
-      typedef sim_act::Signaler<EndOfRun> EndOfRunSignal;
-      EndOfRunSignal endOfRunSignal_;
-      void watchEndOfRun(const EndOfRunSignal::slot_type& iSlot){
-         endOfRunSignal_.connect(iSlot);
-      }
-      SAR_CONNECT_METHOD(EndOfRun)
-         
-      typedef sim_act::Signaler<EndOfEvent> EndOfEventSignal;
-      EndOfEventSignal endOfEventSignal_;
-      void watchEndOfEvent(const EndOfEventSignal::slot_type& iSlot){
-         endOfEventSignal_.connect(iSlot);
-      }
-      SAR_CONNECT_METHOD(EndOfEvent)
-         
-      typedef sim_act::Signaler<EndOfTrack> EndOfTrackSignal;
-      EndOfTrackSignal endOfTrackSignal_;
-      void watchEndOfTrack(const EndOfTrackSignal::slot_type& iSlot){
-         endOfTrackSignal_.connect(iSlot);
-      }
-      SAR_CONNECT_METHOD(EndOfTrack)
-         
-      ///forwards our signals to slots connected to iOther
-      void connect(SimActivityRegistry& iOther);
-      
-   private:
-      SimActivityRegistry(const SimActivityRegistry&) = delete; // stop default
-
-      const SimActivityRegistry& operator=(const SimActivityRegistry&) = delete; // stop default
-
-      // ---------- member data --------------------------------
+#define SAR_CONNECT_METHOD(signal) \
+  void connect(Observer<const signal*>* iObject) { watch##signal(iObject); }
 
-};
+class SimActivityRegistry {
+public:
+  SimActivityRegistry() {}
+  //virtual ~SimActivityRegistry();
+
+  typedef sim_act::Signaler<BeginOfJob> BeginOfJobSignal;
+  BeginOfJobSignal beginOfJobSignal_;
+  void watchBeginOfJob(const BeginOfJobSignal::slot_type& iSlot) { beginOfJobSignal_.connect(iSlot); }
+  SAR_CONNECT_METHOD(BeginOfJob)
+
+  typedef sim_act::Signaler<DDDWorld> DDDWorldSignal;
+  DDDWorldSignal dddWorldSignal_;
+  void watchDDDWorld(const DDDWorldSignal::slot_type& iSlot) { dddWorldSignal_.connect(iSlot); }
+  SAR_CONNECT_METHOD(DDDWorld)
+
+  typedef sim_act::Signaler<BeginOfRun> BeginOfRunSignal;
+  BeginOfRunSignal beginOfRunSignal_;
+  void watchBeginOfRun(const BeginOfRunSignal::slot_type& iSlot) { beginOfRunSignal_.connect(iSlot); }
+  SAR_CONNECT_METHOD(BeginOfRun)
+
+  typedef sim_act::Signaler<BeginOfEvent> BeginOfEventSignal;
+  BeginOfEventSignal beginOfEventSignal_;
+  void watchBeginOfEvent(const BeginOfEventSignal::slot_type& iSlot) { beginOfEventSignal_.connect(iSlot); }
+  SAR_CONNECT_METHOD(BeginOfEvent)
+
+  typedef sim_act::Signaler<BeginOfTrack> BeginOfTrackSignal;
+  BeginOfTrackSignal beginOfTrackSignal_;
+  void watchBeginOfTrack(const BeginOfTrackSignal::slot_type& iSlot) { beginOfTrackSignal_.connect(iSlot); }
+  SAR_CONNECT_METHOD(BeginOfTrack)
 
+  typedef sim_act::Signaler<G4Step> G4StepSignal;
+  G4StepSignal g4StepSignal_;
+  void watchG4Step(const G4StepSignal::slot_type& iSlot) { g4StepSignal_.connect(iSlot); }
+  SAR_CONNECT_METHOD(G4Step)
+
+  typedef sim_act::Signaler<EndOfRun> EndOfRunSignal;
+  EndOfRunSignal endOfRunSignal_;
+  void watchEndOfRun(const EndOfRunSignal::slot_type& iSlot) { endOfRunSignal_.connect(iSlot); }
+  SAR_CONNECT_METHOD(EndOfRun)
+
+  typedef sim_act::Signaler<EndOfEvent> EndOfEventSignal;
+  EndOfEventSignal endOfEventSignal_;
+  void watchEndOfEvent(const EndOfEventSignal::slot_type& iSlot) { endOfEventSignal_.connect(iSlot); }
+  SAR_CONNECT_METHOD(EndOfEvent)
+
+  typedef sim_act::Signaler<EndOfTrack> EndOfTrackSignal;
+  EndOfTrackSignal endOfTrackSignal_;
+  void watchEndOfTrack(const EndOfTrackSignal::slot_type& iSlot) { endOfTrackSignal_.connect(iSlot); }
+  SAR_CONNECT_METHOD(EndOfTrack)
+
+  ///forwards our signals to slots connected to iOther
+  void connect(SimActivityRegistry& iOther);
+
+private:
+  SimActivityRegistry(const SimActivityRegistry&) = delete;  // stop default
+
+  const SimActivityRegistry& operator=(const SimActivityRegistry&) = delete;  // stop default
+
+  // ---------- member data --------------------------------
+};
 
 #endif
diff --git a/SimG4Core/Notification/interface/SimActivityRegistryEnroller.h b/SimG4Core/Notification/interface/SimActivityRegistryEnroller.h
index 9dae53f68a6a7..548d49ff68f2d 100644
--- a/SimG4Core/Notification/interface/SimActivityRegistryEnroller.h
+++ b/SimG4Core/Notification/interface/SimActivityRegistryEnroller.h
@@ -4,7 +4,7 @@
 //
 // Package:     Notification
 // Class  :     SimActivityRegistryEnroller
-// 
+//
 /**\class SimActivityRegistryEnroller SimActivityRegistryEnroller.h SimG4Core/Notification/interface/SimActivityRegistryEnroller.h
 
  Description: Based on what classes an object inherts, enrolls that object with the proper signal
@@ -35,65 +35,61 @@
 // forward declarations
 namespace enroller_helper {
   template <class T>
-    struct Enrollment {
-      static void enroll(SimActivityRegistry& iReg, Observer<const T*>* iObs){
-	iReg.connect(iObs);
-      }
-      static void enroll(SimActivityRegistry&, void*) {}
-    };
-   
+  struct Enrollment {
+    static void enroll(SimActivityRegistry& iReg, Observer<const T*>* iObs) { iReg.connect(iObs); }
+    static void enroll(SimActivityRegistry&, void*) {}
+  };
+
   //this class is used to terminate our recursion
   template <class T>
-    struct LastEnrollerHelper {
-      static void enroll(SimActivityRegistry&, T*) {
-      }
-    };
-
-  template< class T, class TVector>
-    struct EnrollerHelper  {
-      typedef typename boost::mpl::pop_back<TVector>::type RemainingVector;
-      static void enroll(SimActivityRegistry& iReg, T* iT) {
-	//Try to enroll the object if it inherits from the class at the 
-	// end of TVector
-	Enrollment< typename boost::mpl::deref< typename boost::mpl::prior< typename boost::mpl::end< TVector >::type >::type >::type >::enroll(iReg, iT );
-	
-	//If TVector is not at its end, call EnrollerHelper with a vector
-	// that had our last type 'popped off' the end
-	typedef typename boost::mpl::eval_if<boost::mpl::empty<TVector>,
-	  boost::mpl::identity<LastEnrollerHelper<T> >,
-	  boost::mpl::identity<EnrollerHelper<T, typename boost::mpl::pop_back< TVector >::type > >
-	  >::type NextEnroller;
-	NextEnroller::enroll(iReg,iT);
-      }
-    };
-  
-}
-
-class SimActivityRegistryEnroller
-{
-  
- public:
+  struct LastEnrollerHelper {
+    static void enroll(SimActivityRegistry&, T*) {}
+  };
+
+  template <class T, class TVector>
+  struct EnrollerHelper {
+    typedef typename boost::mpl::pop_back<TVector>::type RemainingVector;
+    static void enroll(SimActivityRegistry& iReg, T* iT) {
+      //Try to enroll the object if it inherits from the class at the
+      // end of TVector
+      Enrollment<typename boost::mpl::deref<
+          typename boost::mpl::prior<typename boost::mpl::end<TVector>::type>::type>::type>::enroll(iReg, iT);
+
+      //If TVector is not at its end, call EnrollerHelper with a vector
+      // that had our last type 'popped off' the end
+      typedef typename boost::mpl::eval_if<
+          boost::mpl::empty<TVector>,
+          boost::mpl::identity<LastEnrollerHelper<T> >,
+          boost::mpl::identity<EnrollerHelper<T, typename boost::mpl::pop_back<TVector>::type> > >::type NextEnroller;
+      NextEnroller::enroll(iReg, iT);
+    }
+  };
+
+}  // namespace enroller_helper
+
+class SimActivityRegistryEnroller {
+public:
   SimActivityRegistryEnroller() {}
-      //virtual ~SimActivityRegistryEnroller();
-      typedef boost::mpl::vector<BeginOfJob,DDDWorld,BeginOfRun,BeginOfEvent,BeginOfTrack,BeginOfStep,G4Step,EndOfTrack,EndOfEvent,EndOfRun> Signals;
-   
-      // ---------- const member functions ---------------------
+  //virtual ~SimActivityRegistryEnroller();
+  typedef boost::mpl::
+      vector<BeginOfJob, DDDWorld, BeginOfRun, BeginOfEvent, BeginOfTrack, BeginOfStep, G4Step, EndOfTrack, EndOfEvent, EndOfRun>
+          Signals;
 
-      // ---------- static member functions --------------------
-      template<class T>
-      static void enroll(SimActivityRegistry& iReg, T* iObj){
-         enroller_helper::EnrollerHelper<T,Signals>::enroll(iReg,iObj);
-      }
-      // ---------- member functions ---------------------------
+  // ---------- const member functions ---------------------
 
-   private:
-      SimActivityRegistryEnroller(const SimActivityRegistryEnroller&) = delete; // stop default
+  // ---------- static member functions --------------------
+  template <class T>
+  static void enroll(SimActivityRegistry& iReg, T* iObj) {
+    enroller_helper::EnrollerHelper<T, Signals>::enroll(iReg, iObj);
+  }
+  // ---------- member functions ---------------------------
 
-      const SimActivityRegistryEnroller& operator=(const SimActivityRegistryEnroller&) = delete; // stop default
+private:
+  SimActivityRegistryEnroller(const SimActivityRegistryEnroller&) = delete;  // stop default
 
-      // ---------- member data --------------------------------
+  const SimActivityRegistryEnroller& operator=(const SimActivityRegistryEnroller&) = delete;  // stop default
 
+  // ---------- member data --------------------------------
 };
 
-
 #endif
diff --git a/SimG4Core/Notification/interface/SimG4Exception.h b/SimG4Core/Notification/interface/SimG4Exception.h
index bc37844a9cc2e..938430c4760bf 100644
--- a/SimG4Core/Notification/interface/SimG4Exception.h
+++ b/SimG4Core/Notification/interface/SimG4Exception.h
@@ -10,14 +10,14 @@
  *  this class.
  */
 
-class SimG4Exception : public std::exception 
-{
+class SimG4Exception : public std::exception {
 public:
-    SimG4Exception(const std::string & message) : error_(message) {}
-    ~SimG4Exception() throw() override {}
-    const char * what () const throw() override { return error_.c_str(); }
+  SimG4Exception(const std::string& message) : error_(message) {}
+  ~SimG4Exception() throw() override {}
+  const char* what() const throw() override { return error_.c_str(); }
+
 private:
-    std::string error_;    
+  std::string error_;
 };
 
 #endif
diff --git a/SimG4Core/Notification/interface/SimTrackManager.h b/SimG4Core/Notification/interface/SimTrackManager.h
index dcf550eac6d1f..7df75d4b73cb7 100644
--- a/SimG4Core/Notification/interface/SimTrackManager.h
+++ b/SimG4Core/Notification/interface/SimTrackManager.h
@@ -4,7 +4,7 @@
 //
 // Package:     Notification
 // Class  :     SimTrackManager
-// 
+//
 /**\class SimTrackManager SimTrackManager.h SimG4Core/Notification/interface/SimTrackManager.h
 
  Description: Holds tracking information used by the sensitive detectors
@@ -14,7 +14,7 @@
 
 */
 //
-// Original Author:  
+// Original Author:
 //         Created:  Fri Nov 25 17:36:41 EST 2005
 //
 
@@ -24,7 +24,7 @@
 
 // user include files
 #include "SimG4Core/Notification/interface/TrackWithHistory.h"
-#include "SimG4Core/Notification/interface/TrackContainer.h" 
+#include "SimG4Core/Notification/interface/TrackContainer.h"
 
 #include "SimDataFormats/Forward/interface/LHCTransportLinkContainer.h"
 
@@ -32,123 +32,112 @@
 
 class G4SimEvent;
 
-class SimTrackManager
-{
-  
+class SimTrackManager {
 public:
-  
-  class StrictWeakOrdering{
+  class StrictWeakOrdering {
   public:
-    bool operator() ( TrackWithHistory * & p,const unsigned int& i) const 
-    {return p->trackID() < i;}
+    bool operator()(TrackWithHistory*& p, const unsigned int& i) const { return p->trackID() < i; }
   };
   //      enum SpecialNumbers {InvalidID = 65535};
   /// this map contains association between vertex number and position
-  typedef std::pair<int,math::XYZVectorD> MapVertexPosition;
-  typedef std::vector<std::pair<int,math::XYZVectorD> > MapVertexPositionVector;
-  typedef std::map<int,MapVertexPositionVector> MotherParticleToVertexMap;
+  typedef std::pair<int, math::XYZVectorD> MapVertexPosition;
+  typedef std::vector<std::pair<int, math::XYZVectorD> > MapVertexPositionVector;
+  typedef std::map<int, MapVertexPositionVector> MotherParticleToVertexMap;
   typedef MotherParticleToVertexMap VertexMap;
-  
+
   SimTrackManager(bool iCollapsePrimaryVertices = false);
   virtual ~SimTrackManager();
-  
+
   // ---------- const member functions ---------------------
-  const TrackContainer * trackContainer() const { 
-    return m_trksForThisEvent; 
-  }
-  
-  
+  const TrackContainer* trackContainer() const { return m_trksForThisEvent; }
+
   // ---------- member functions ---------------------------
-  void storeTracks(G4SimEvent * simEvent);
-  
+  void storeTracks(G4SimEvent* simEvent);
+
   void reset();
   void deleteTracks();
   void cleanTkCaloStateInfoMap();
-  
+
   void cleanTracksWithHistory();
 
   void addTrack(TrackWithHistory* iTrack, bool inHistory, bool withAncestor) {
-    std::pair<int, int> thePair(iTrack->trackID(),iTrack->parentID());
+    std::pair<int, int> thePair(iTrack->trackID(), iTrack->parentID());
     idsave.push_back(thePair);
-    if (inHistory) { m_trksForThisEvent->push_back(iTrack); }
-    if (withAncestor) { 
-      std::pair<int,int> thisPair(iTrack->trackID(),0); 
-      ancestorList.push_back(thisPair); 
+    if (inHistory) {
+      m_trksForThisEvent->push_back(iTrack);
     }
-  }
-  
-  void addTkCaloStateInfo(uint32_t t,
-			  const std::pair<math::XYZVectorD,math::XYZTLorentzVectorD>& p)
-  {
-    std::map<uint32_t,std::pair<math::XYZVectorD,math::XYZTLorentzVectorD> >::const_iterator it = 
-      mapTkCaloStateInfo.find(t);
-    
-    if (it ==  mapTkCaloStateInfo.end()) {
-      mapTkCaloStateInfo.insert(std::pair<uint32_t,std::pair<math::XYZVectorD,math::XYZTLorentzVectorD> >(t,p));
+    if (withAncestor) {
+      std::pair<int, int> thisPair(iTrack->trackID(), 0);
+      ancestorList.push_back(thisPair);
     }
   }
-  void setCollapsePrimaryVertices(bool iSet) {
-    m_collapsePrimaryVertices=iSet;
+
+  void addTkCaloStateInfo(uint32_t t, const std::pair<math::XYZVectorD, math::XYZTLorentzVectorD>& p) {
+    std::map<uint32_t, std::pair<math::XYZVectorD, math::XYZTLorentzVectorD> >::const_iterator it =
+        mapTkCaloStateInfo.find(t);
+
+    if (it == mapTkCaloStateInfo.end()) {
+      mapTkCaloStateInfo.insert(std::pair<uint32_t, std::pair<math::XYZVectorD, math::XYZTLorentzVectorD> >(t, p));
+    }
   }
-  int giveMotherNeeded(int i) const { 
+  void setCollapsePrimaryVertices(bool iSet) { m_collapsePrimaryVertices = iSet; }
+  int giveMotherNeeded(int i) const {
     int theResult = 0;
-    for (unsigned int itr=0; itr<idsave.size(); itr++) { 
-      if ((idsave[itr]).first == i) { theResult = (idsave[itr]).second; break; } 
+    for (unsigned int itr = 0; itr < idsave.size(); itr++) {
+      if ((idsave[itr]).first == i) {
+        theResult = (idsave[itr]).second;
+        break;
+      }
     }
-    return theResult ; 
+    return theResult;
   }
   bool trackExists(unsigned int i) const {
     bool flag = false;
-    for (unsigned int itr=0; itr<(*m_trksForThisEvent).size(); ++itr) {
+    for (unsigned int itr = 0; itr < (*m_trksForThisEvent).size(); ++itr) {
       if ((*m_trksForThisEvent)[itr]->trackID() == i) {
-	flag = true; break;
+        flag = true;
+        break;
       }
     }
     return flag;
   }
-  void setLHCTransportLink( const edm::LHCTransportLinkContainer * thisLHCTlink ) { 
-    theLHCTlink = thisLHCTlink; 
-  }
+  void setLHCTransportLink(const edm::LHCTransportLinkContainer* thisLHCTlink) { theLHCTlink = thisLHCTlink; }
 
 private:
   // stop default
-  SimTrackManager(const SimTrackManager&) = delete;   
-  const SimTrackManager& operator=(const SimTrackManager&) = delete; 
-  
-  void saveTrackAndItsBranch(TrackWithHistory *);
-  int  getOrCreateVertex(TrackWithHistory *,int,G4SimEvent * simEvent);
+  SimTrackManager(const SimTrackManager&) = delete;
+  const SimTrackManager& operator=(const SimTrackManager&) = delete;
+
+  void saveTrackAndItsBranch(TrackWithHistory*);
+  int getOrCreateVertex(TrackWithHistory*, int, G4SimEvent* simEvent);
   void cleanVertexMap();
-  void reallyStoreTracks(G4SimEvent * simEvent);
+  void reallyStoreTracks(G4SimEvent* simEvent);
   void fillMotherList();
-  int  idSavedTrack (int) const;
+  int idSavedTrack(int) const;
 
   // to restore the pre-LHC Transport GenParticle id link to a SimTrack
   void resetGenID();
 
   // ---------- member data --------------------------------
-  TrackContainer * m_trksForThisEvent;
+  TrackContainer* m_trksForThisEvent;
   bool m_SaveSimTracks;
   MotherParticleToVertexMap m_vertexMap;
   int m_nVertices;
   bool m_collapsePrimaryVertices;
-  std::map<uint32_t,std::pair<math::XYZVectorD,math::XYZTLorentzVectorD > > mapTkCaloStateInfo;
-  std::vector< std::pair<int, int> > idsave;
+  std::map<uint32_t, std::pair<math::XYZVectorD, math::XYZTLorentzVectorD> > mapTkCaloStateInfo;
+  std::vector<std::pair<int, int> > idsave;
 
-  std::vector<std::pair<int, int> > ancestorList; 
+  std::vector<std::pair<int, int> > ancestorList;
 
   unsigned int lastTrack;
   unsigned int lastHist;
 
-  const edm::LHCTransportLinkContainer * theLHCTlink;
-
+  const edm::LHCTransportLinkContainer* theLHCTlink;
 };
 
-
-class trkIDLess
-{
+class trkIDLess {
 public:
-  bool operator()(TrackWithHistory * trk1, TrackWithHistory * trk2) const
-  { return (trk1->trackID() < trk2->trackID()); }
+  bool operator()(TrackWithHistory* trk1, TrackWithHistory* trk2) const { return (trk1->trackID() < trk2->trackID()); }
 };
 
 #endif
diff --git a/SimG4Core/Notification/interface/TrackContainer.h b/SimG4Core/Notification/interface/TrackContainer.h
index eed3dfb019f38..0981d2cb380d2 100644
--- a/SimG4Core/Notification/interface/TrackContainer.h
+++ b/SimG4Core/Notification/interface/TrackContainer.h
@@ -1,11 +1,10 @@
 #ifndef SimG4Core_TrackContainer_H
 #define SimG4Core_TrackContainer_H
 
-#include "SimG4Core/Notification/interface/TrackWithHistory.h"              
+#include "SimG4Core/Notification/interface/TrackWithHistory.h"
 
 #include <vector>
 
 typedef std::vector<TrackWithHistory *> TrackContainer;
 
 #endif
-
diff --git a/SimG4Core/Notification/interface/TrackInformation.h b/SimG4Core/Notification/interface/TrackInformation.h
index 5aa44613016f3..756b6c257ac21 100644
--- a/SimG4Core/Notification/interface/TrackInformation.h
+++ b/SimG4Core/Notification/interface/TrackInformation.h
@@ -1,103 +1,124 @@
 #ifndef SimG4Core_TrackInformation_H
-#define SimG4Core_TrackInformation_H 
+#define SimG4Core_TrackInformation_H
 
 #include "G4VUserTrackInformation.hh"
 
 #include "G4Allocator.hh"
 
 class TrackInformation : public G4VUserTrackInformation {
-
 public:
   ~TrackInformation() override {}
-  inline void * operator new(size_t);
-  inline void   operator delete(void * TrackInformation);
+  inline void *operator new(size_t);
+  inline void operator delete(void *TrackInformation);
 
-  bool storeTrack() const 	{ return storeTrack_; }
+  bool storeTrack() const { return storeTrack_; }
   /// can only be set to true, cannot be reset to false!
-  void storeTrack(bool v)    
-  { if (v) storeTrack_ = v; if (v == true) putInHistory(); }
+  void storeTrack(bool v) {
+    if (v)
+      storeTrack_ = v;
+    if (v == true)
+      putInHistory();
+  }
 
-  bool isPrimary() const 	{ return isPrimary_; }
-  void isPrimary(bool v) 	{ isPrimary_ = v; }
+  bool isPrimary() const { return isPrimary_; }
+  void isPrimary(bool v) { isPrimary_ = v; }
 
-  bool hasHits() const 	{ return hasHits_; }
-  void hasHits(bool v) 	{ hasHits_ = v; }
+  bool hasHits() const { return hasHits_; }
+  void hasHits(bool v) { hasHits_ = v; }
 
   bool isGeneratedSecondary() const { return isGeneratedSecondary_; }
   void isGeneratedSecondary(bool v) { isGeneratedSecondary_ = v; }
 
   bool isInHistory() const { return isInHistory_; }
-  void putInHistory()      { isInHistory_= true; }
+  void putInHistory() { isInHistory_ = true; }
 
   bool isAncestor() const { return flagAncestor_; }
-  void setAncestor()      { flagAncestor_ = true; }
+  void setAncestor() { flagAncestor_ = true; }
 
   // Calo section
-  int getIDonCaloSurface() const 	   { return idOnCaloSurface_; }
+  int getIDonCaloSurface() const { return idOnCaloSurface_; }
   void setIDonCaloSurface(int id, int ical, int last, int pdgID, double p) {
-    idOnCaloSurface_ = id; idCaloVolume_ = ical; idLastVolume_ = last; 
-    caloSurfaceParticlePID_ = pdgID; caloSurfaceParticleP_= p;}
-  int    getIDCaloVolume() const           { return idCaloVolume_; }
-  int    getIDLastVolume() const           { return idLastVolume_; }
-  bool   caloIDChecked() const 	           { return caloIDChecked_; }
-  void   setCaloIDChecked(bool f)          { caloIDChecked_ = f; }
-  int    caloSurfaceParticlePID() const    { return caloSurfaceParticlePID_; }
-  void   setCaloSurfaceParticlePID(int id) { caloSurfaceParticlePID_ = id; }
-  double caloSurfaceParticleP() const      { return caloSurfaceParticleP_; }
-  void   setCaloSurfaceParticleP(double p) { caloSurfaceParticleP_ = p; }
+    idOnCaloSurface_ = id;
+    idCaloVolume_ = ical;
+    idLastVolume_ = last;
+    caloSurfaceParticlePID_ = pdgID;
+    caloSurfaceParticleP_ = p;
+  }
+  int getIDCaloVolume() const { return idCaloVolume_; }
+  int getIDLastVolume() const { return idLastVolume_; }
+  bool caloIDChecked() const { return caloIDChecked_; }
+  void setCaloIDChecked(bool f) { caloIDChecked_ = f; }
+  int caloSurfaceParticlePID() const { return caloSurfaceParticlePID_; }
+  void setCaloSurfaceParticlePID(int id) { caloSurfaceParticlePID_ = id; }
+  double caloSurfaceParticleP() const { return caloSurfaceParticleP_; }
+  void setCaloSurfaceParticleP(double p) { caloSurfaceParticleP_ = p; }
 
   // Generator information
-  int    genParticlePID() const            { return genParticlePID_; }
-  void   setGenParticlePID(int id)         { genParticlePID_ = id; }
-  double genParticleP() const              { return genParticleP_; }
-  void   setGenParticleP(double p)         { genParticleP_ = p; }
+  int genParticlePID() const { return genParticlePID_; }
+  void setGenParticlePID(int id) { genParticlePID_ = id; }
+  double genParticleP() const { return genParticleP_; }
+  void setGenParticleP(double p) { genParticleP_ = p; }
 
   // remember the PID of particle entering the CASTOR detector. This is needed
   // in order to scale the hadronic response
   bool hasCastorHit() const { return hasCastorHit_; }
-  void setCastorHitPID(const int pid) { hasCastorHit_=true; castorHitPID_ = pid; }
+  void setCastorHitPID(const int pid) {
+    hasCastorHit_ = true;
+    castorHitPID_ = pid;
+  }
   int getCastorHitPID() const { return castorHitPID_; }
 
   void Print() const override;
+
 private:
-  bool   storeTrack_;    
-  bool   isPrimary_;
-  bool   hasHits_;
-  bool   isGeneratedSecondary_;
-  bool   isInHistory_;
-  bool   flagAncestor_;
-  int    idOnCaloSurface_;
-  int    idCaloVolume_;
-  int    idLastVolume_;
-  bool   caloIDChecked_;
-  int    genParticlePID_, caloSurfaceParticlePID_;
+  bool storeTrack_;
+  bool isPrimary_;
+  bool hasHits_;
+  bool isGeneratedSecondary_;
+  bool isInHistory_;
+  bool flagAncestor_;
+  int idOnCaloSurface_;
+  int idCaloVolume_;
+  int idLastVolume_;
+  bool caloIDChecked_;
+  int genParticlePID_, caloSurfaceParticlePID_;
   double genParticleP_, caloSurfaceParticleP_;
 
   bool hasCastorHit_;
   int castorHitPID_;
 
   // Restrict construction to friends
-  TrackInformation() :G4VUserTrackInformation(),storeTrack_(false),isPrimary_(false),
-    hasHits_(false),isGeneratedSecondary_(false),isInHistory_(false),
-    flagAncestor_(false),idOnCaloSurface_(0),idCaloVolume_(-1),
-    idLastVolume_(-1),caloIDChecked_(false), genParticlePID_(-1),
-    caloSurfaceParticlePID_(0), genParticleP_(0), caloSurfaceParticleP_(0),
-    hasCastorHit_(false), castorHitPID_(0) {}
-    friend class NewTrackAction;
+  TrackInformation()
+      : G4VUserTrackInformation(),
+        storeTrack_(false),
+        isPrimary_(false),
+        hasHits_(false),
+        isGeneratedSecondary_(false),
+        isInHistory_(false),
+        flagAncestor_(false),
+        idOnCaloSurface_(0),
+        idCaloVolume_(-1),
+        idLastVolume_(-1),
+        caloIDChecked_(false),
+        genParticlePID_(-1),
+        caloSurfaceParticlePID_(0),
+        genParticleP_(0),
+        caloSurfaceParticleP_(0),
+        hasCastorHit_(false),
+        castorHitPID_(0) {}
+  friend class NewTrackAction;
 };
 
 extern G4ThreadLocal G4Allocator<TrackInformation> *fpTrackInformationAllocator;
 
-inline void * TrackInformation::operator new(size_t)
-{
-  if (!fpTrackInformationAllocator) fpTrackInformationAllocator = 
-    new G4Allocator<TrackInformation>;
-  return (void*)fpTrackInformationAllocator->MallocSingle();
+inline void *TrackInformation::operator new(size_t) {
+  if (!fpTrackInformationAllocator)
+    fpTrackInformationAllocator = new G4Allocator<TrackInformation>;
+  return (void *)fpTrackInformationAllocator->MallocSingle();
 }
 
-inline void TrackInformation::operator delete(void * trkInfo)
-{  
-  fpTrackInformationAllocator->FreeSingle((TrackInformation*) trkInfo); 
+inline void TrackInformation::operator delete(void *trkInfo) {
+  fpTrackInformationAllocator->FreeSingle((TrackInformation *)trkInfo);
 }
 
 #endif
diff --git a/SimG4Core/Notification/interface/TrackInformationExtractor.h b/SimG4Core/Notification/interface/TrackInformationExtractor.h
index b77c7ba4d5766..ccd18fcd00a59 100644
--- a/SimG4Core/Notification/interface/TrackInformationExtractor.h
+++ b/SimG4Core/Notification/interface/TrackInformationExtractor.h
@@ -17,24 +17,24 @@ class G4Track;
  *  (in some cases it may even create the TrackInformation on-the-fly).
  */
 
-class TrackInformationExtractor 
-{
+class TrackInformationExtractor {
 public:
-    /** for a const G4Track pointer/reference a const TrackInformation&
+  /** for a const G4Track pointer/reference a const TrackInformation&
      *  is returned.
      */
-    const TrackInformation & operator()(const G4Track & gtk) const;
-    const TrackInformation & operator()(const G4Track * gtk) const { return operator()(*gtk); }
-    /** for a non-const G4Track pointer/reference the TrackInformation&
+  const TrackInformation& operator()(const G4Track& gtk) const;
+  const TrackInformation& operator()(const G4Track* gtk) const { return operator()(*gtk); }
+  /** for a non-const G4Track pointer/reference the TrackInformation&
      *  is also non-const.
      */
-    TrackInformation & operator()(G4Track & gtk) const;
-    TrackInformation & operator()(G4Track * gtk) const { return operator()(*gtk); }
+  TrackInformation& operator()(G4Track& gtk) const;
+  TrackInformation& operator()(G4Track* gtk) const { return operator()(*gtk); }
+
 private:
-    void missing(const G4Track & gtk) const 
-    { throw SimG4Exception("TrackInformationExtractor: G4Track has no TrackInformation"); }    
-    void wrongType() const
-    { throw SimG4Exception("User information in G4Track is not of TrackInformation type"); } 
+  void missing(const G4Track& gtk) const {
+    throw SimG4Exception("TrackInformationExtractor: G4Track has no TrackInformation");
+  }
+  void wrongType() const { throw SimG4Exception("User information in G4Track is not of TrackInformation type"); }
 };
 
 #endif
diff --git a/SimG4Core/Notification/interface/TrackWithHistory.h b/SimG4Core/Notification/interface/TrackWithHistory.h
index 872095f0bbee0..70709cc9f3c30 100644
--- a/SimG4Core/Notification/interface/TrackWithHistory.h
+++ b/SimG4Core/Notification/interface/TrackWithHistory.h
@@ -1,5 +1,5 @@
 #ifndef SimG4Core_TrackWithHistory_H
-#define SimG4Core_TrackWithHistory_H 
+#define SimG4Core_TrackWithHistory_H
 
 #include "G4Track.hh"
 #include "DataFormats/Math/interface/Vector3D.h"
@@ -13,71 +13,70 @@ class G4TrackToParticleID;
  *  a G4Track
  */
 
-class TrackWithHistory 
-{
+class TrackWithHistory {
 public:
-    /** The constructor is called at PreUserTrackingAction time, 
+  /** The constructor is called at PreUserTrackingAction time, 
      *  when some of the information is not available yet.
      */
-    TrackWithHistory(const G4Track * g4track);
-    ~TrackWithHistory() {}
+  TrackWithHistory(const G4Track *g4track);
+  ~TrackWithHistory() {}
 
-    inline void * operator new(size_t);
-    inline void   operator delete(void * TrackWithHistory);
+  inline void *operator new(size_t);
+  inline void operator delete(void *TrackWithHistory);
 
-    void save()					    { saved_ = true; }
-    unsigned int trackID() const                    { return trackID_; }
-    int particleID() const                          { return particleID_; }
-    int parentID() const                            { return parentID_; }
-    int genParticleID() const                       { return genParticleID_; }
-    const math::XYZVectorD & momentum() const       { return momentum_; }
-    double totalEnergy() const                      { return totalEnergy_; }
-    const math::XYZVectorD & vertexPosition() const { return vertexPosition_; }
-    double globalTime() const                       { return globalTime_; }
-    double localTime() const                        { return localTime_; }
-    double properTime() const                       { return properTime_; }
-    const G4VProcess * creatorProcess() const       { return creatorProcess_; }
-    double weight() const                           { return weight_; }
-    void setTrackID(int i)  			            { trackID_ = i; }
-    void setParentID(int i)			                { parentID_ = i; }
-    void setGenParticleID(int i)                    { genParticleID_ = i; }
-    bool storeTrack() const                         { return storeTrack_; }
-    bool saved() const                              { return saved_; }
-    /** Internal consistency check (optional).
+  void save() { saved_ = true; }
+  unsigned int trackID() const { return trackID_; }
+  int particleID() const { return particleID_; }
+  int parentID() const { return parentID_; }
+  int genParticleID() const { return genParticleID_; }
+  const math::XYZVectorD &momentum() const { return momentum_; }
+  double totalEnergy() const { return totalEnergy_; }
+  const math::XYZVectorD &vertexPosition() const { return vertexPosition_; }
+  double globalTime() const { return globalTime_; }
+  double localTime() const { return localTime_; }
+  double properTime() const { return properTime_; }
+  const G4VProcess *creatorProcess() const { return creatorProcess_; }
+  double weight() const { return weight_; }
+  void setTrackID(int i) { trackID_ = i; }
+  void setParentID(int i) { parentID_ = i; }
+  void setGenParticleID(int i) { genParticleID_ = i; }
+  bool storeTrack() const { return storeTrack_; }
+  bool saved() const { return saved_; }
+  /** Internal consistency check (optional).
      *  Method called at PostUserTrackingAction time, to check
      *  if the information is consistent with that provided
      *  to the constructor.
      */
-    void checkAtEnd(const G4Track *);
+  void checkAtEnd(const G4Track *);
+
 private:
-    unsigned int trackID_;
-    int particleID_;
-    int parentID_;
-    int genParticleID_;
-    math::XYZVectorD momentum_;
-    double totalEnergy_;
-    math::XYZVectorD vertexPosition_;
-    double globalTime_;
-    double localTime_;
-    double properTime_;
-    const G4VProcess * creatorProcess_;
-    double weight_;
-    bool storeTrack_;
-    bool saved_;
-    int extractGenID(const G4Track * gt) const;
+  unsigned int trackID_;
+  int particleID_;
+  int parentID_;
+  int genParticleID_;
+  math::XYZVectorD momentum_;
+  double totalEnergy_;
+  math::XYZVectorD vertexPosition_;
+  double globalTime_;
+  double localTime_;
+  double properTime_;
+  const G4VProcess *creatorProcess_;
+  double weight_;
+  bool storeTrack_;
+  bool saved_;
+  int extractGenID(const G4Track *gt) const;
 };
 
 extern G4ThreadLocal G4Allocator<TrackWithHistory> *fpTrackWithHistoryAllocator;
 
-inline void * TrackWithHistory::operator new(size_t) {
-  if (!fpTrackWithHistoryAllocator) fpTrackWithHistoryAllocator = 
-    new G4Allocator<TrackWithHistory>;
-  return (void*)fpTrackWithHistoryAllocator->MallocSingle();
+inline void *TrackWithHistory::operator new(size_t) {
+  if (!fpTrackWithHistoryAllocator)
+    fpTrackWithHistoryAllocator = new G4Allocator<TrackWithHistory>;
+  return (void *)fpTrackWithHistoryAllocator->MallocSingle();
 }
 
-inline void TrackWithHistory::operator delete(void * aTwH) {  
-  fpTrackWithHistoryAllocator->FreeSingle((TrackWithHistory*) aTwH); 
+inline void TrackWithHistory::operator delete(void *aTwH) {
+  fpTrackWithHistoryAllocator->FreeSingle((TrackWithHistory *)aTwH);
 }
 
-
 #endif
diff --git a/SimG4Core/Notification/src/CMSSteppingVerbose.cc b/SimG4Core/Notification/src/CMSSteppingVerbose.cc
index 1d8906bda6aa2..9982e66589f35 100644
--- a/SimG4Core/Notification/src/CMSSteppingVerbose.cc
+++ b/SimG4Core/Notification/src/CMSSteppingVerbose.cc
@@ -11,14 +11,16 @@
 #include "G4VProcess.hh"
 #include "G4SystemOfUnits.hh"
 
-CMSSteppingVerbose::CMSSteppingVerbose(G4int verb, G4double ekin,
-				       std::vector<G4int>& evtNum,
-				       std::vector<G4int>& primV,
-				       std::vector<G4int>& trNum)
-  : m_PrintEvent(false),m_PrintTrack(false),m_smInitialized(false),m_verbose(verb),
-    m_EventNumbers(evtNum),m_PrimaryVertex(primV),m_TrackNumbers(trNum),
-    m_EkinThreshold(ekin)
-{
+CMSSteppingVerbose::CMSSteppingVerbose(
+    G4int verb, G4double ekin, std::vector<G4int>& evtNum, std::vector<G4int>& primV, std::vector<G4int>& trNum)
+    : m_PrintEvent(false),
+      m_PrintTrack(false),
+      m_smInitialized(false),
+      m_verbose(verb),
+      m_EventNumbers(evtNum),
+      m_PrimaryVertex(primV),
+      m_TrackNumbers(trNum),
+      m_EkinThreshold(ekin) {
   m_nEvents = m_EventNumbers.size();
   m_nVertex = m_PrimaryVertex.size();
   m_nTracks = m_TrackNumbers.size();
@@ -27,142 +29,146 @@ CMSSteppingVerbose::CMSSteppingVerbose(G4int verb, G4double ekin,
   m_g4SteppingVerbose->SetSilent(1);
 }
 
-CMSSteppingVerbose::~CMSSteppingVerbose()
-{}
+CMSSteppingVerbose::~CMSSteppingVerbose() {}
 
-void CMSSteppingVerbose::BeginOfEvent(const G4Event* evt)
-{
+void CMSSteppingVerbose::BeginOfEvent(const G4Event* evt) {
   m_PrintEvent = false;
-  if(0 >= m_verbose) { return; }
-  if(m_nEvents == 0) { m_PrintEvent = true; }
-  else {
-    for(G4int i=0; i<m_nEvents; ++i) {
-
+  if (0 >= m_verbose) {
+    return;
+  }
+  if (m_nEvents == 0) {
+    m_PrintEvent = true;
+  } else {
+    for (G4int i = 0; i < m_nEvents; ++i) {
       // check event number
-      if(evt->GetEventID() == m_EventNumbers[i]) {
-
-	// check number of vertex
-        if(m_nVertex == m_nEvents && 
-	   evt->GetNumberOfPrimaryVertex() != m_PrimaryVertex[i]) {
-	  continue;
-	}
-	m_PrintEvent = true;
-	break;
+      if (evt->GetEventID() == m_EventNumbers[i]) {
+        // check number of vertex
+        if (m_nVertex == m_nEvents && evt->GetNumberOfPrimaryVertex() != m_PrimaryVertex[i]) {
+          continue;
+        }
+        m_PrintEvent = true;
+        break;
       }
     }
   }
-  if(!m_PrintEvent) { return; }
-  G4cout << "========== Event #" << evt->GetEventID() << "   "
-	 << evt->GetNumberOfPrimaryVertex() << " primary vertexes ======" 
-	 << G4endl;
+  if (!m_PrintEvent) {
+    return;
+  }
+  G4cout << "========== Event #" << evt->GetEventID() << "   " << evt->GetNumberOfPrimaryVertex()
+         << " primary vertexes ======" << G4endl;
   G4cout << G4endl;
 }
 
-void CMSSteppingVerbose::TrackStarted(const G4Track* track, bool isKilled)
-{
+void CMSSteppingVerbose::TrackStarted(const G4Track* track, bool isKilled) {
   m_PrintTrack = false;
-  if(!m_PrintEvent) { return; }
+  if (!m_PrintEvent) {
+    return;
+  }
 
-  if(!m_smInitialized) { 
-    G4SteppingManager* stepman = 
-      G4EventManager::GetEventManager()->GetTrackingManager()->GetSteppingManager();
+  if (!m_smInitialized) {
+    G4SteppingManager* stepman = G4EventManager::GetEventManager()->GetTrackingManager()->GetSteppingManager();
     m_g4SteppingVerbose->SetManager(stepman);
-    stepman->SetVerboseLevel(m_verbose); 
+    stepman->SetVerboseLevel(m_verbose);
     m_smInitialized = true;
   }
 
-  if(m_nTracks == 0) { 
-    if(track->GetKineticEnergy() >= m_EkinThreshold) { m_PrintTrack = true; }
-     
+  if (m_nTracks == 0) {
+    if (track->GetKineticEnergy() >= m_EkinThreshold) {
+      m_PrintTrack = true;
+    }
+
   } else {
-    for(G4int i=0; i<m_nTracks; ++i) {
-      if(track->GetTrackID() == m_TrackNumbers[i]) {
-	m_PrintTrack = true;
-	break;
+    for (G4int i = 0; i < m_nTracks; ++i) {
+      if (track->GetTrackID() == m_TrackNumbers[i]) {
+        m_PrintTrack = true;
+        break;
       }
     }
   }
-  if(!m_PrintTrack) { return; }
+  if (!m_PrintTrack) {
+    return;
+  }
 
-  G4cout << "*********************************************************************************************************" << G4endl;
+  G4cout << "*********************************************************************************************************"
+         << G4endl;
   const G4ParticleDefinition* pd = track->GetDefinition();
   G4cout << "* G4Track Information:   Particle = ";
-  if(pd) { G4cout << pd->GetParticleName(); }
-  G4cout << ",   Track ID = " << track->GetTrackID() 
-	 << ",   Parent ID = " << track->GetParentID() << G4endl;
-  G4cout << "*********************************************************************************************************" << G4endl;
-
-  G4cout << std::setw( 5) << "Step#"      << " "
-	 << std::setw( 8) << "X(cm)"      << " "
-	 << std::setw( 8) << "Y(cm)"      << " "  
-	 << std::setw( 8) << "Z(cm)"      << " "
-	 << std::setw( 9) << "KinE(GeV)"  << " "
-	 << std::setw( 8) << "dE(MeV)"    << " "  
-	 << std::setw( 8) << "Step(mm)"   << " "  
-	 << std::setw( 9) << "TrackL(cm)"  << " "
-	 << std::setw(30) << "PhysVolume" << " "
-	 << std::setw( 8) << "ProcName"   << G4endl;	     
+  if (pd) {
+    G4cout << pd->GetParticleName();
+  }
+  G4cout << ",   Track ID = " << track->GetTrackID() << ",   Parent ID = " << track->GetParentID() << G4endl;
+  G4cout << "*********************************************************************************************************"
+         << G4endl;
+
+  G4cout << std::setw(5) << "Step#"
+         << " " << std::setw(8) << "X(cm)"
+         << " " << std::setw(8) << "Y(cm)"
+         << " " << std::setw(8) << "Z(cm)"
+         << " " << std::setw(9) << "KinE(GeV)"
+         << " " << std::setw(8) << "dE(MeV)"
+         << " " << std::setw(8) << "Step(mm)"
+         << " " << std::setw(9) << "TrackL(cm)"
+         << " " << std::setw(30) << "PhysVolume"
+         << " " << std::setw(8) << "ProcName" << G4endl;
 
   G4int prec = G4cout.precision(4);
 
-  G4cout << std::setw( 5) << track->GetCurrentStepNumber() << " "
-	 << std::setw( 8) << track->GetPosition().x()/CLHEP::cm << " "
-	 << std::setw( 8) << track->GetPosition().y()/CLHEP::cm << " "
-	 << std::setw( 8) << track->GetPosition().z()/CLHEP::cm << " "
-	 << std::setw( 9) << track->GetKineticEnergy()/CLHEP::GeV << " "
-	 << std::setw( 8) << "         "
-	 << std::setw( 8) << "         "
-	 << std::setw( 9) << "          ";
-  if( track->GetVolume() != nullptr ) { 
+  G4cout << std::setw(5) << track->GetCurrentStepNumber() << " " << std::setw(8) << track->GetPosition().x() / CLHEP::cm
+         << " " << std::setw(8) << track->GetPosition().y() / CLHEP::cm << " " << std::setw(8)
+         << track->GetPosition().z() / CLHEP::cm << " " << std::setw(9) << track->GetKineticEnergy() / CLHEP::GeV << " "
+         << std::setw(8) << "         " << std::setw(8) << "         " << std::setw(9) << "          ";
+  if (track->GetVolume() != nullptr) {
     G4cout << std::setw(30) << track->GetVolume()->GetName() << " ";
-  } 
-  if(isKilled) { G4cout << "isKilled"; }
+  }
+  if (isKilled) {
+    G4cout << "isKilled";
+  }
   G4cout << G4endl;
   G4cout.precision(prec);
 }
 
-void CMSSteppingVerbose::TrackEnded(const G4Track* track) const
-{
-  if(!m_PrintTrack || 1 == m_verbose) { return; }
+void CMSSteppingVerbose::TrackEnded(const G4Track* track) const {
+  if (!m_PrintTrack || 1 == m_verbose) {
+    return;
+  }
 }
 
-void CMSSteppingVerbose::StackFilled(const G4Track* track, bool isKilled) const
-{
-  if(2 >= m_verbose || !m_PrintTrack || 
-     track->GetKineticEnergy() <  m_EkinThreshold ) { return; }
+void CMSSteppingVerbose::StackFilled(const G4Track* track, bool isKilled) const {
+  if (2 >= m_verbose || !m_PrintTrack || track->GetKineticEnergy() < m_EkinThreshold) {
+    return;
+  }
   G4int prec = G4cout.precision(4);
 
-  G4cout << std::setw(10) << track->GetTrackID() << " "
-	 << std::setw( 8) << track->GetPosition().x()/CLHEP::cm << " "
-	 << std::setw( 8) << track->GetPosition().y()/CLHEP::cm << " "
-	 << std::setw( 8) << track->GetPosition().z()/CLHEP::cm << " "
-	 << std::setw( 9) << track->GetKineticEnergy()/CLHEP::GeV << " ";
-  if( track->GetVolume() != nullptr ) { 
+  G4cout << std::setw(10) << track->GetTrackID() << " " << std::setw(8) << track->GetPosition().x() / CLHEP::cm << " "
+         << std::setw(8) << track->GetPosition().y() / CLHEP::cm << " " << std::setw(8)
+         << track->GetPosition().z() / CLHEP::cm << " " << std::setw(9) << track->GetKineticEnergy() / CLHEP::GeV
+         << " ";
+  if (track->GetVolume() != nullptr) {
     G4cout << std::setw(24) << track->GetVolume()->GetName() << " ";
-  } 
-  if(isKilled) { G4cout << "isKilled"; }
+  }
+  if (isKilled) {
+    G4cout << "isKilled";
+  }
   G4cout << G4endl;
-  G4cout.precision(prec);  
+  G4cout.precision(prec);
 }
 
-void CMSSteppingVerbose::NextStep(const G4Step* step, 
-				  const G4SteppingManager* sManager,
-				  bool isKilled) const
-{
-  if(!m_PrintTrack) { return; }
+void CMSSteppingVerbose::NextStep(const G4Step* step, const G4SteppingManager* sManager, bool isKilled) const {
+  if (!m_PrintTrack) {
+    return;
+  }
 
   G4int prec;
   const G4Track* track = step->GetTrack();
   const G4StepPoint* preStep = step->GetPreStepPoint();
   const G4StepPoint* postStep = step->GetPostStepPoint();
-  
-  if(3 <= m_verbose) {
 
+  if (3 <= m_verbose) {
     m_g4SteppingVerbose->SetSilent(0);
     m_g4SteppingVerbose->DPSLStarted();
     m_g4SteppingVerbose->DPSLAlongStep();
     m_g4SteppingVerbose->DPSLPostStep();
-    if(4 <= m_verbose) {
+    if (4 <= m_verbose) {
       m_g4SteppingVerbose->AlongStepDoItAllDone();
       m_g4SteppingVerbose->PostStepDoItAllDone();
     }
@@ -173,150 +179,115 @@ void CMSSteppingVerbose::NextStep(const G4Step* step,
     G4cout << G4endl;
     G4cout << "    ++G4Step Information " << G4endl;
     G4cout << "      Address of G4Track    : " << track << G4endl;
-    G4cout << "      Step Length (mm)      : " << track->GetStepLength() 
-	   << G4endl;
-    G4cout << "      Energy Deposit (MeV)  : " << step->GetTotalEnergyDeposit() 
-	   << G4endl;
-
-    G4cout << "   -------------------------------------------------------" 
-	   << "-------------------------------" <<  G4endl;
-    G4cout << "  StepPoint Information  " << std::setw(30) << "PreStep" 
-	   << std::setw(30) << "PostStep" << G4endl;
-    G4cout << "   -------------------------------------------------------" 
-	   << "-------------------------------" <<  G4endl;
-    G4cout << "      Position - x (cm)   : " 
-	   << std::setw(30) << preStep->GetPosition().x()/CLHEP::cm 
-	   << std::setw(30) << postStep->GetPosition().x()/CLHEP::cm << G4endl;
-    G4cout << "      Position - y (cm)   : " 
-	   << std::setw(30) << preStep->GetPosition().y()/CLHEP::cm 
-	   << std::setw(30) << postStep->GetPosition().y()/CLHEP::cm << G4endl;
-    G4cout << "      Position - z (cm)   : " 
-	   << std::setw(30) << preStep->GetPosition().z()/CLHEP::cm 
-	   << std::setw(30) << postStep->GetPosition().z()/CLHEP::cm << G4endl;
-    G4cout << "      Global Time (ns)    : " 
-	   << std::setw(30) << preStep->GetGlobalTime()/CLHEP::ns
-	   << std::setw(30) << postStep->GetGlobalTime()/CLHEP::ns << G4endl;
-    G4cout << "      Local Time (ns)     : " 
-	   << std::setw(30) << preStep->GetLocalTime()/CLHEP::ns 
-	   << std::setw(30) << postStep->GetLocalTime()/CLHEP::ns << G4endl;
-    G4cout << "      Proper Time (ns)    : " 
-	   << std::setw(30) << preStep->GetProperTime()/CLHEP::ns
-	   << std::setw(30) << postStep->GetProperTime()/CLHEP::ns << G4endl;
-    G4cout << "      Momentum Direct - x : " 
-	   << std::setw(30) << preStep->GetMomentumDirection().x()
-	   << std::setw(30) << postStep->GetMomentumDirection().x() 
-	   << G4endl;
-    G4cout << "      Momentum Direct - y : " 
-	   << std::setw(30) << preStep->GetMomentumDirection().y()
-	   << std::setw(30) << postStep->GetMomentumDirection().y() 
-	   << G4endl;
-    G4cout << "      Momentum Direct - z : " 
-	   << std::setw(30) << preStep->GetMomentumDirection().z()
-	   << std::setw(30) << postStep->GetMomentumDirection().z() 
-	   << G4endl;
-    G4cout << "      Momentum - x (GeV/c): " 
-	   << std::setw(30) << preStep->GetMomentum().x()/CLHEP::GeV
-	   << std::setw(30) << postStep->GetMomentum().x()/CLHEP::GeV << G4endl;
-    G4cout << "      Momentum - y (GeV/c): " 
-	   << std::setw(30) << preStep->GetMomentum().y()/CLHEP::GeV
-	   << std::setw(30) << postStep->GetMomentum().y()/CLHEP::GeV << G4endl;
-    G4cout << "      Momentum - z (GeV/c): " 
-	   << std::setw(30) << preStep->GetMomentum().z()/CLHEP::GeV
-	   << std::setw(30) << postStep->GetMomentum().z()/CLHEP::GeV << G4endl;
-    G4cout << "      Total Energy (GeV)  : " 
-	   << std::setw(30) << preStep->GetTotalEnergy()/CLHEP::GeV
-	   << std::setw(30) << postStep->GetTotalEnergy()/CLHEP::GeV << G4endl;
-    G4cout << "      Kinetic Energy (GeV): " 
-	   << std::setw(30) << preStep->GetKineticEnergy()/CLHEP::GeV
-	   << std::setw(30) << postStep->GetKineticEnergy()/CLHEP::GeV << G4endl;
-    G4cout << "      Velocity (mm/ns)    : " 
-	   << std::setw(30) << preStep->GetVelocity()
-	   << std::setw(30) << postStep->GetVelocity() << G4endl;
-    G4cout << "      Volume Name         : "
-	   << std::setw(30) << preStep->GetPhysicalVolume()->GetName();
-    G4String volName = (postStep->GetPhysicalVolume()) ?
-      postStep->GetPhysicalVolume()->GetName() : "OutOfWorld";
-      
+    G4cout << "      Step Length (mm)      : " << track->GetStepLength() << G4endl;
+    G4cout << "      Energy Deposit (MeV)  : " << step->GetTotalEnergyDeposit() << G4endl;
+
+    G4cout << "   -------------------------------------------------------"
+           << "-------------------------------" << G4endl;
+    G4cout << "  StepPoint Information  " << std::setw(30) << "PreStep" << std::setw(30) << "PostStep" << G4endl;
+    G4cout << "   -------------------------------------------------------"
+           << "-------------------------------" << G4endl;
+    G4cout << "      Position - x (cm)   : " << std::setw(30) << preStep->GetPosition().x() / CLHEP::cm << std::setw(30)
+           << postStep->GetPosition().x() / CLHEP::cm << G4endl;
+    G4cout << "      Position - y (cm)   : " << std::setw(30) << preStep->GetPosition().y() / CLHEP::cm << std::setw(30)
+           << postStep->GetPosition().y() / CLHEP::cm << G4endl;
+    G4cout << "      Position - z (cm)   : " << std::setw(30) << preStep->GetPosition().z() / CLHEP::cm << std::setw(30)
+           << postStep->GetPosition().z() / CLHEP::cm << G4endl;
+    G4cout << "      Global Time (ns)    : " << std::setw(30) << preStep->GetGlobalTime() / CLHEP::ns << std::setw(30)
+           << postStep->GetGlobalTime() / CLHEP::ns << G4endl;
+    G4cout << "      Local Time (ns)     : " << std::setw(30) << preStep->GetLocalTime() / CLHEP::ns << std::setw(30)
+           << postStep->GetLocalTime() / CLHEP::ns << G4endl;
+    G4cout << "      Proper Time (ns)    : " << std::setw(30) << preStep->GetProperTime() / CLHEP::ns << std::setw(30)
+           << postStep->GetProperTime() / CLHEP::ns << G4endl;
+    G4cout << "      Momentum Direct - x : " << std::setw(30) << preStep->GetMomentumDirection().x() << std::setw(30)
+           << postStep->GetMomentumDirection().x() << G4endl;
+    G4cout << "      Momentum Direct - y : " << std::setw(30) << preStep->GetMomentumDirection().y() << std::setw(30)
+           << postStep->GetMomentumDirection().y() << G4endl;
+    G4cout << "      Momentum Direct - z : " << std::setw(30) << preStep->GetMomentumDirection().z() << std::setw(30)
+           << postStep->GetMomentumDirection().z() << G4endl;
+    G4cout << "      Momentum - x (GeV/c): " << std::setw(30) << preStep->GetMomentum().x() / CLHEP::GeV
+           << std::setw(30) << postStep->GetMomentum().x() / CLHEP::GeV << G4endl;
+    G4cout << "      Momentum - y (GeV/c): " << std::setw(30) << preStep->GetMomentum().y() / CLHEP::GeV
+           << std::setw(30) << postStep->GetMomentum().y() / CLHEP::GeV << G4endl;
+    G4cout << "      Momentum - z (GeV/c): " << std::setw(30) << preStep->GetMomentum().z() / CLHEP::GeV
+           << std::setw(30) << postStep->GetMomentum().z() / CLHEP::GeV << G4endl;
+    G4cout << "      Total Energy (GeV)  : " << std::setw(30) << preStep->GetTotalEnergy() / CLHEP::GeV << std::setw(30)
+           << postStep->GetTotalEnergy() / CLHEP::GeV << G4endl;
+    G4cout << "      Kinetic Energy (GeV): " << std::setw(30) << preStep->GetKineticEnergy() / CLHEP::GeV
+           << std::setw(30) << postStep->GetKineticEnergy() / CLHEP::GeV << G4endl;
+    G4cout << "      Velocity (mm/ns)    : " << std::setw(30) << preStep->GetVelocity() << std::setw(30)
+           << postStep->GetVelocity() << G4endl;
+    G4cout << "      Volume Name         : " << std::setw(30) << preStep->GetPhysicalVolume()->GetName();
+    G4String volName = (postStep->GetPhysicalVolume()) ? postStep->GetPhysicalVolume()->GetName() : "OutOfWorld";
+
     G4cout << std::setw(30) << volName << G4endl;
-    G4cout << "      Safety (mm)         : " 
-	   << std::setw(30) << preStep->GetSafety()
-	   << std::setw(30) << postStep->GetSafety() << G4endl;
-    G4cout << "      Polarization - x    : " 
-	   << std::setw(30) << preStep->GetPolarization().x()
-	   << std::setw(30) << postStep->GetPolarization().x() 
-	   << G4endl;
-    G4cout << "      Polarization - y    : " 
-	   << std::setw(30) << preStep->GetPolarization().y()
-	   << std::setw(30) << postStep->GetPolarization().y() 
-	   << G4endl;
-    G4cout << "      Polarization - Z    : " 
-	   << std::setw(30) << preStep->GetPolarization().z()
-	   << std::setw(30) << postStep->GetPolarization().z() 
-	   << G4endl;
-    G4cout << "      Weight              : " 
-	   << std::setw(30) << preStep->GetWeight()
-	   << std::setw(30) << postStep->GetWeight() << G4endl;
-    G4cout << "      Step Status         : " ;
-    G4StepStatus  tStepStatus = preStep->GetStepStatus();
-    if( tStepStatus == fGeomBoundary ){
+    G4cout << "      Safety (mm)         : " << std::setw(30) << preStep->GetSafety() << std::setw(30)
+           << postStep->GetSafety() << G4endl;
+    G4cout << "      Polarization - x    : " << std::setw(30) << preStep->GetPolarization().x() << std::setw(30)
+           << postStep->GetPolarization().x() << G4endl;
+    G4cout << "      Polarization - y    : " << std::setw(30) << preStep->GetPolarization().y() << std::setw(30)
+           << postStep->GetPolarization().y() << G4endl;
+    G4cout << "      Polarization - Z    : " << std::setw(30) << preStep->GetPolarization().z() << std::setw(30)
+           << postStep->GetPolarization().z() << G4endl;
+    G4cout << "      Weight              : " << std::setw(30) << preStep->GetWeight() << std::setw(30)
+           << postStep->GetWeight() << G4endl;
+    G4cout << "      Step Status         : ";
+    G4StepStatus tStepStatus = preStep->GetStepStatus();
+    if (tStepStatus == fGeomBoundary) {
       G4cout << std::setw(30) << "Geom Limit";
-    } else if ( tStepStatus == fAlongStepDoItProc ){
+    } else if (tStepStatus == fAlongStepDoItProc) {
       G4cout << std::setw(30) << "AlongStep Proc.";
-    } else if ( tStepStatus == fPostStepDoItProc ){
+    } else if (tStepStatus == fPostStepDoItProc) {
       G4cout << std::setw(30) << "PostStep Proc";
-    } else if ( tStepStatus == fAtRestDoItProc ){
+    } else if (tStepStatus == fAtRestDoItProc) {
       G4cout << std::setw(30) << "AtRest Proc";
-    } else if ( tStepStatus == fUndefined ){
+    } else if (tStepStatus == fUndefined) {
       G4cout << std::setw(30) << "Undefined";
     }
 
     tStepStatus = postStep->GetStepStatus();
-    if( tStepStatus == fGeomBoundary ){
+    if (tStepStatus == fGeomBoundary) {
       G4cout << std::setw(30) << "Geom Limit";
-    } else if ( tStepStatus == fAlongStepDoItProc ){
+    } else if (tStepStatus == fAlongStepDoItProc) {
       G4cout << std::setw(30) << "AlongStep Proc.";
-    } else if ( tStepStatus == fPostStepDoItProc ){
+    } else if (tStepStatus == fPostStepDoItProc) {
       G4cout << std::setw(30) << "PostStep Proc";
-    } else if ( tStepStatus == fAtRestDoItProc ){
+    } else if (tStepStatus == fAtRestDoItProc) {
       G4cout << std::setw(30) << "AtRest Proc";
-    } else if ( tStepStatus == fUndefined ){
+    } else if (tStepStatus == fUndefined) {
       G4cout << std::setw(30) << "Undefined";
     }
 
     G4cout << G4endl;
-    G4cout << "      Process defined Step: " ;
-    if( preStep->GetProcessDefinedStep() == nullptr ){
+    G4cout << "      Process defined Step: ";
+    if (preStep->GetProcessDefinedStep() == nullptr) {
       G4cout << std::setw(30) << "Undefined";
     } else {
-      G4cout << std::setw(30) 
-	     << preStep->GetProcessDefinedStep()->GetProcessName();
+      G4cout << std::setw(30) << preStep->GetProcessDefinedStep()->GetProcessName();
     }
-    if( postStep->GetProcessDefinedStep() == nullptr){
+    if (postStep->GetProcessDefinedStep() == nullptr) {
       G4cout << std::setw(30) << "Undefined";
     } else {
-      G4cout << std::setw(30) 
-	     << postStep->GetProcessDefinedStep()->GetProcessName(); 
+      G4cout << std::setw(30) << postStep->GetProcessDefinedStep()->GetProcessName();
     }
     G4cout.precision(prec);
 
     G4cout << G4endl;
-    G4cout << "   -------------------------------------------------------" 
-	   << "-------------------------------" << G4endl;
+    G4cout << "   -------------------------------------------------------"
+           << "-------------------------------" << G4endl;
   }
 
   // geometry information
-  if(4 <= m_verbose) {
+  if (4 <= m_verbose) {
     const G4VTouchable* tch1 = preStep->GetTouchable();
     const G4VTouchable* tch2 = postStep->GetTouchable();
 
     G4double x = postStep->GetPosition().x();
     G4double y = postStep->GetPosition().y();
-    G4cout << "Touchable depth pre= " << tch1->GetHistoryDepth() 
-	   << " post= " << tch2->GetHistoryDepth() 
-	   << " trans1= " << tch1->GetTranslation(tch1->GetHistoryDepth())
-	   << " trans2= " << tch2->GetTranslation(tch2->GetHistoryDepth())
-	   << " r= " << std::sqrt(x*x + y*y)
-	   << G4endl;
+    G4cout << "Touchable depth pre= " << tch1->GetHistoryDepth() << " post= " << tch2->GetHistoryDepth()
+           << " trans1= " << tch1->GetTranslation(tch1->GetHistoryDepth())
+           << " trans2= " << tch2->GetTranslation(tch2->GetHistoryDepth()) << " r= " << std::sqrt(x * x + y * y)
+           << G4endl;
     const G4VPhysicalVolume* pv1 = preStep->GetPhysicalVolume();
     const G4VPhysicalVolume* pv2 = postStep->GetPhysicalVolume();
     G4cout << "PreStepVolume: " << pv1->GetName() << G4endl;
@@ -324,88 +295,84 @@ void CMSSteppingVerbose::NextStep(const G4Step* step,
     G4cout << "       Rotation:    " << pv1->GetObjectRotationValue() << G4endl;
     const G4VSolid* sv1 = pv1->GetLogicalVolume()->GetSolid();
     sv1->StreamInfo(G4cout);
-    G4cout << G4endl; 
-    if(pv2) {
-      G4cout << "PostStepVolume: " << pv2->GetName() << G4endl; 
+    G4cout << G4endl;
+    if (pv2) {
+      G4cout << "PostStepVolume: " << pv2->GetName() << G4endl;
       G4cout << "       Translation: " << pv2->GetObjectTranslation() << G4endl;
       G4cout << "       Rotation:    " << pv2->GetObjectRotationValue() << G4endl;
       const G4VSolid* sv2 = pv2->GetLogicalVolume()->GetSolid();
       sv2->StreamInfo(G4cout);
     }
-    G4cout << G4endl; 
-  
-    if(5 <= m_verbose) {
+    G4cout << G4endl;
+
+    if (5 <= m_verbose) {
       G4cout << "##### Geometry Depth Analysis" << G4endl;
-      for(G4int k=1; k<tch1->GetHistoryDepth(); ++k) {
-	const G4VPhysicalVolume* pv = tch1->GetVolume(k);
-	if(pv) {
-	  const G4VSolid* sol = pv->GetLogicalVolume()->GetSolid();
-	  G4cout << " Depth # " << k << "  PhysVolume " << pv->GetName() << G4endl; 
-	  G4cout << "       Translation: " << pv->GetObjectTranslation() << G4endl;
-	  G4cout << "       Rotation:    " << pv->GetObjectRotationValue() << G4endl;
-	  sol->StreamInfo(G4cout);
-	}
+      for (G4int k = 1; k < tch1->GetHistoryDepth(); ++k) {
+        const G4VPhysicalVolume* pv = tch1->GetVolume(k);
+        if (pv) {
+          const G4VSolid* sol = pv->GetLogicalVolume()->GetSolid();
+          G4cout << " Depth # " << k << "  PhysVolume " << pv->GetName() << G4endl;
+          G4cout << "       Translation: " << pv->GetObjectTranslation() << G4endl;
+          G4cout << "       Rotation:    " << pv->GetObjectRotationValue() << G4endl;
+          sol->StreamInfo(G4cout);
+        }
       }
     }
-    G4cout << G4endl; 
+    G4cout << G4endl;
   }
 
   // verbose == 1
   prec = G4cout.precision(4);
-  G4cout << std::setw( 5) << track->GetCurrentStepNumber() << " "
-	 << std::setw( 8) << track->GetPosition().x()/CLHEP::cm << " "
-	 << std::setw( 8) << track->GetPosition().y()/CLHEP::cm << " "
-	 << std::setw( 8) << track->GetPosition().z()/CLHEP::cm << " "
-	 << std::setw( 9) << track->GetKineticEnergy()/CLHEP::GeV << " ";
+  G4cout << std::setw(5) << track->GetCurrentStepNumber() << " " << std::setw(8) << track->GetPosition().x() / CLHEP::cm
+         << " " << std::setw(8) << track->GetPosition().y() / CLHEP::cm << " " << std::setw(8)
+         << track->GetPosition().z() / CLHEP::cm << " " << std::setw(9) << track->GetKineticEnergy() / CLHEP::GeV
+         << " ";
   G4cout.precision(prec);
   prec = G4cout.precision(3);
-  G4cout << std::setw( 8) << step->GetTotalEnergyDeposit()/CLHEP::MeV << " "
-	 << std::setw( 8) << step->GetStepLength()/CLHEP::mm << " "
-	 << std::setw( 9) << track->GetTrackLength()/CLHEP::cm << " ";
+  G4cout << std::setw(8) << step->GetTotalEnergyDeposit() / CLHEP::MeV << " " << std::setw(8)
+         << step->GetStepLength() / CLHEP::mm << " " << std::setw(9) << track->GetTrackLength() / CLHEP::cm << " ";
 
   G4bool endTracking = false;
-  if( track->GetNextVolume() != nullptr ) { 
+  if (track->GetNextVolume() != nullptr) {
     G4cout << std::setw(30) << track->GetVolume()->GetName() << " ";
   } else {
-    G4cout << std::setw(30) << "OutOfWorld" << " "; 
+    G4cout << std::setw(30) << "OutOfWorld"
+           << " ";
     endTracking = true;
   }
-  if(isKilled) { 
-    G4cout << "isKilled"; 
+  if (isKilled) {
+    G4cout << "isKilled";
     endTracking = true;
-  } else if(postStep->GetProcessDefinedStep() != nullptr){
+  } else if (postStep->GetProcessDefinedStep() != nullptr) {
     G4cout << postStep->GetProcessDefinedStep()->GetProcessName();
-  } 
+  }
   G4cout << G4endl;
   G4cout.precision(prec);
 
-  if(1 >= m_verbose) { return; }
+  if (1 >= m_verbose) {
+    return;
+  }
   // verbose > 1
-  if(!endTracking && fStopAndKill != track->GetTrackStatus()) { return; }
+  if (!endTracking && fStopAndKill != track->GetTrackStatus()) {
+    return;
+  }
 
   prec = G4cout.precision(4);
   const G4TrackVector* tv = step->GetSecondary();
   G4int nt = tv->size();
-  if(nt > 0) {
-    G4cout << "    ++List of " << nt << " secondaries generated; " 
-	   << " Ekin > " << m_EkinThreshold << " MeV are shown:" << G4endl;
+  if (nt > 0) {
+    G4cout << "    ++List of " << nt << " secondaries generated; "
+           << " Ekin > " << m_EkinThreshold << " MeV are shown:" << G4endl;
   }
-  for(G4int i=0; i<nt; ++i) {
-    if((*tv)[i]->GetKineticEnergy() < m_EkinThreshold) { continue; } 
-    G4cout << "      ("
-	   << std::setw( 9)
-	   << (*tv)[i]->GetPosition().x()/CLHEP::cm << " "
-	   << std::setw( 9)
-	   << (*tv)[i]->GetPosition().y()/CLHEP::cm << " "
-	   << std::setw( 9)
-	   << (*tv)[i]->GetPosition().z()/CLHEP::cm << ") cm, "
-	   << std::setw( 9)
-	   << (*tv)[i]->GetKineticEnergy()/CLHEP::GeV << " GeV, "
-	   << std::setw( 9)
-	   << (*tv)[i]->GetGlobalTime()/CLHEP::ns << " ns, "
-	   << std::setw(18)
-	   << (*tv)[i]->GetDefinition()->GetParticleName() << G4endl;
+  for (G4int i = 0; i < nt; ++i) {
+    if ((*tv)[i]->GetKineticEnergy() < m_EkinThreshold) {
+      continue;
+    }
+    G4cout << "      (" << std::setw(9) << (*tv)[i]->GetPosition().x() / CLHEP::cm << " " << std::setw(9)
+           << (*tv)[i]->GetPosition().y() / CLHEP::cm << " " << std::setw(9) << (*tv)[i]->GetPosition().z() / CLHEP::cm
+           << ") cm, " << std::setw(9) << (*tv)[i]->GetKineticEnergy() / CLHEP::GeV << " GeV, " << std::setw(9)
+           << (*tv)[i]->GetGlobalTime() / CLHEP::ns << " ns, " << std::setw(18)
+           << (*tv)[i]->GetDefinition()->GetParticleName() << G4endl;
   }
   G4cout.precision(prec);
 }
-
diff --git a/SimG4Core/Notification/src/CurrentG4Track.cc b/SimG4Core/Notification/src/CurrentG4Track.cc
index 29495fd262584..fa7cb646e1ace 100644
--- a/SimG4Core/Notification/src/CurrentG4Track.cc
+++ b/SimG4Core/Notification/src/CurrentG4Track.cc
@@ -1,14 +1,7 @@
 #include "SimG4Core/Notification/interface/CurrentG4Track.h"
 
-thread_local const G4Track * CurrentG4Track::m_track = nullptr;
+thread_local const G4Track* CurrentG4Track::m_track = nullptr;
 
-void CurrentG4Track::setTrack(const G4Track * t)
-{
-  m_track = t;
-}
-
-const G4Track * CurrentG4Track::track()
-{
-  return m_track;
-}
+void CurrentG4Track::setTrack(const G4Track* t) { m_track = t; }
 
+const G4Track* CurrentG4Track::track() { return m_track; }
diff --git a/SimG4Core/Notification/src/G4SimEvent.cc b/SimG4Core/Notification/src/G4SimEvent.cc
index a39f3f94df709..b8106bb6a8270 100644
--- a/SimG4Core/Notification/src/G4SimEvent.cc
+++ b/SimG4Core/Notification/src/G4SimEvent.cc
@@ -3,93 +3,80 @@
 
 #include "G4SystemOfUnits.hh"
 
-class IdSort{
+class IdSort {
 public:
-  bool operator()(const SimTrack& a, const SimTrack& b) {
-    return a.trackId() < b.trackId();
-  }
+  bool operator()(const SimTrack& a, const SimTrack& b) { return a.trackId() < b.trackId(); }
 };
 
-G4SimEvent::G4SimEvent() : hepMCEvent(nullptr),
-                           weight_(0),
-                           collisionPoint_(math::XYZTLorentzVectorD(0.,0.,0.,0.)),
-			   nparam_(0),param_(0) {}
+G4SimEvent::G4SimEvent()
+    : hepMCEvent(nullptr),
+      weight_(0),
+      collisionPoint_(math::XYZTLorentzVectorD(0., 0., 0., 0.)),
+      nparam_(0),
+      param_(0) {}
 
-G4SimEvent::~G4SimEvent() 
-{
-   // per suggestion by Chris Jones, it's faster 
-   // that delete back() and pop_back() 
-   //
-   unsigned int i = 0 ;
-   
-   for ( i=0; i<g4tracks.size(); i++ )
-   {
-      delete g4tracks[i] ;
-      g4tracks[i] = nullptr ;
-   }
-   g4tracks.clear() ;
-   
-   for ( i=0; i<g4vertices.size(); i++ )
-   {
-      delete g4vertices[i] ;
-      g4vertices[i] = nullptr ;
-   }
-   g4vertices.clear();
-}
+G4SimEvent::~G4SimEvent() {
+  // per suggestion by Chris Jones, it's faster
+  // that delete back() and pop_back()
+  //
+  unsigned int i = 0;
+
+  for (i = 0; i < g4tracks.size(); i++) {
+    delete g4tracks[i];
+    g4tracks[i] = nullptr;
+  }
+  g4tracks.clear();
 
-void G4SimEvent::load(edm::SimTrackContainer & c) const
-{
-    for (unsigned int i=0; i<g4tracks.size(); i++)
-    {
-	G4SimTrack * trk    = g4tracks[i];
-	int ip              = trk->part();
-	math::XYZTLorentzVectorD p( trk->momentum().x()/GeV,
-	                            trk->momentum().y()/GeV,
-                                    trk->momentum().z()/GeV,
-			            trk->energy()/GeV ) ;
-	int iv              = trk->ivert();
-	int ig              = trk->igenpart();
-	int id              = trk->id();
-	math::XYZVectorD tkpos( trk->trackerSurfacePosition().x()/cm,
-	                        trk->trackerSurfacePosition().y()/cm,
-			        trk->trackerSurfacePosition().z()/cm ) ;
-	math::XYZTLorentzVectorD tkmom( trk->trackerSurfaceMomentum().x()/GeV,
-	                                trk->trackerSurfaceMomentum().y()/GeV,
-	                                trk->trackerSurfaceMomentum().z()/GeV,
-				        trk->trackerSurfaceMomentum().e()/GeV ) ;
-	// ip = particle ID as PDG
-	// pp = 4-momentum
-	// iv = corresponding G4SimVertex index
-	// ig = corresponding GenParticle index
-	SimTrack t = SimTrack(ip,p,iv,ig,tkpos,tkmom);
-	t.setTrackId(id);
-	t.setEventId(EncodedEventId(0));
-	c.push_back(t);
-    }
-    std::stable_sort(c.begin(),c.end(),IdSort());
-    
+  for (i = 0; i < g4vertices.size(); i++) {
+    delete g4vertices[i];
+    g4vertices[i] = nullptr;
+  }
+  g4vertices.clear();
 }
 
-void G4SimEvent::load(edm::SimVertexContainer & c) const
-{
-    for (unsigned int i=0; i<g4vertices.size(); i++)
-    {
-	G4SimVertex * vtx   = g4vertices[i];
-	//
-	// starting 1_1_0_pre3, SimVertex stores in cm !!!
-	// 
-	math::XYZVectorD v3( vtx->vertexPosition().x()/cm, 
-	                     vtx->vertexPosition().y()/cm,
-			     vtx->vertexPosition().z()/cm ) ;
-	float t             = vtx->vertexGlobalTime()/second;
-	int iv              = vtx->parentIndex();
-	// vv = position
-	// t  = global time
-	// iv = index of the parent in the SimEvent SimTrack container (-1 if no parent)
-	SimVertex v = SimVertex(v3,t,iv,i);
-        v.setProcessType(vtx->processType());
-	v.setEventId(EncodedEventId(0));
-	c.push_back(v);
-    }
+void G4SimEvent::load(edm::SimTrackContainer& c) const {
+  for (unsigned int i = 0; i < g4tracks.size(); i++) {
+    G4SimTrack* trk = g4tracks[i];
+    int ip = trk->part();
+    math::XYZTLorentzVectorD p(
+        trk->momentum().x() / GeV, trk->momentum().y() / GeV, trk->momentum().z() / GeV, trk->energy() / GeV);
+    int iv = trk->ivert();
+    int ig = trk->igenpart();
+    int id = trk->id();
+    math::XYZVectorD tkpos(trk->trackerSurfacePosition().x() / cm,
+                           trk->trackerSurfacePosition().y() / cm,
+                           trk->trackerSurfacePosition().z() / cm);
+    math::XYZTLorentzVectorD tkmom(trk->trackerSurfaceMomentum().x() / GeV,
+                                   trk->trackerSurfaceMomentum().y() / GeV,
+                                   trk->trackerSurfaceMomentum().z() / GeV,
+                                   trk->trackerSurfaceMomentum().e() / GeV);
+    // ip = particle ID as PDG
+    // pp = 4-momentum
+    // iv = corresponding G4SimVertex index
+    // ig = corresponding GenParticle index
+    SimTrack t = SimTrack(ip, p, iv, ig, tkpos, tkmom);
+    t.setTrackId(id);
+    t.setEventId(EncodedEventId(0));
+    c.push_back(t);
+  }
+  std::stable_sort(c.begin(), c.end(), IdSort());
 }
 
+void G4SimEvent::load(edm::SimVertexContainer& c) const {
+  for (unsigned int i = 0; i < g4vertices.size(); i++) {
+    G4SimVertex* vtx = g4vertices[i];
+    //
+    // starting 1_1_0_pre3, SimVertex stores in cm !!!
+    //
+    math::XYZVectorD v3(vtx->vertexPosition().x() / cm, vtx->vertexPosition().y() / cm, vtx->vertexPosition().z() / cm);
+    float t = vtx->vertexGlobalTime() / second;
+    int iv = vtx->parentIndex();
+    // vv = position
+    // t  = global time
+    // iv = index of the parent in the SimEvent SimTrack container (-1 if no parent)
+    SimVertex v = SimVertex(v3, t, iv, i);
+    v.setProcessType(vtx->processType());
+    v.setEventId(EncodedEventId(0));
+    c.push_back(v);
+  }
+}
diff --git a/SimG4Core/Notification/src/G4TrackToParticleID.cc b/SimG4Core/Notification/src/G4TrackToParticleID.cc
index 28c66c52a611c..953cdf84d4317 100644
--- a/SimG4Core/Notification/src/G4TrackToParticleID.cc
+++ b/SimG4Core/Notification/src/G4TrackToParticleID.cc
@@ -4,55 +4,42 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-int G4TrackToParticleID::particleID(const G4Track * g4trk)
-{
-    int particleID_ = g4trk->GetDefinition()->GetPDGEncoding();
-    if (0 == particleID_) {
-      edm::LogWarning("SimG4CoreNotification") 
-	<< "G4TrackToParticleID: unknown code 0 for track Id = " << g4trk->GetTrackID();
-      particleID_ = -99;
-    }
-    return particleID_;
+int G4TrackToParticleID::particleID(const G4Track* g4trk) {
+  int particleID_ = g4trk->GetDefinition()->GetPDGEncoding();
+  if (0 == particleID_) {
+    edm::LogWarning("SimG4CoreNotification")
+        << "G4TrackToParticleID: unknown code 0 for track Id = " << g4trk->GetTrackID();
+    particleID_ = -99;
+  }
+  return particleID_;
 }
 
-bool G4TrackToParticleID::isGammaElectronPositron(int pdgCode)
-{
+bool G4TrackToParticleID::isGammaElectronPositron(int pdgCode) {
   int pdg = std::abs(pdgCode);
   return (pdg == 11 || pdg == 22);
 }
 
-bool G4TrackToParticleID::isGammaElectronPositron(const G4Track * g4trk)
-{
+bool G4TrackToParticleID::isGammaElectronPositron(const G4Track* g4trk) {
   int pdg = std::abs(g4trk->GetDefinition()->GetPDGEncoding());
   return (pdg == 11 || pdg == 22);
 }
 
-bool G4TrackToParticleID::isMuon(int pdgCode)
-{
-  return (std::abs(pdgCode) == 13);
-}
+bool G4TrackToParticleID::isMuon(int pdgCode) { return (std::abs(pdgCode) == 13); }
 
-bool G4TrackToParticleID::isMuon(const G4Track * g4trk)
-{
+bool G4TrackToParticleID::isMuon(const G4Track* g4trk) {
   return (std::abs(g4trk->GetDefinition()->GetPDGEncoding()) == 13);
 }
 
-bool G4TrackToParticleID::isStableHadron(int pdgCode)
-{
-  // pi+-, p, pbar, n, nbar, KL, K+-, light ions and anti-ions 
+bool G4TrackToParticleID::isStableHadron(int pdgCode) {
+  // pi+-, p, pbar, n, nbar, KL, K+-, light ions and anti-ions
   int pdg = std::abs(pdgCode);
-  return (pdg == 211 || pdg == 2212 || pdg == 2112 || pdg == 130 || pdg == 321
-	  || pdg == 1000010020 || pdg == 1000010030 
-	  || pdg == 1000020030 || pdg == 1000020040);
+  return (pdg == 211 || pdg == 2212 || pdg == 2112 || pdg == 130 || pdg == 321 || pdg == 1000010020 ||
+          pdg == 1000010030 || pdg == 1000020030 || pdg == 1000020040);
 }
 
-bool G4TrackToParticleID::isStableHadronIon(const G4Track * g4trk)
-{
+bool G4TrackToParticleID::isStableHadronIon(const G4Track* g4trk) {
   // pi+-, p, pbar, n, nbar, KL, K+-, light ion and anti-ion, generic ion
   int pdg = std::abs(g4trk->GetDefinition()->GetPDGEncoding());
-  return (pdg == 211 || pdg == 2212 || pdg == 2112 || pdg == 130 || pdg == 321
-	  || pdg == 1000010020 || pdg == 1000010030 
-	  || pdg == 1000020030 || pdg == 1000020040
-	  || g4trk->GetDefinition()->IsGeneralIon());
+  return (pdg == 211 || pdg == 2212 || pdg == 2112 || pdg == 130 || pdg == 321 || pdg == 1000010020 ||
+          pdg == 1000010030 || pdg == 1000020030 || pdg == 1000020040 || g4trk->GetDefinition()->IsGeneralIon());
 }
-
diff --git a/SimG4Core/Notification/src/GenParticleInfoExtractor.cc b/SimG4Core/Notification/src/GenParticleInfoExtractor.cc
index d5f7d01b4d4a3..094cc4c02e656 100644
--- a/SimG4Core/Notification/src/GenParticleInfoExtractor.cc
+++ b/SimG4Core/Notification/src/GenParticleInfoExtractor.cc
@@ -3,14 +3,12 @@
 
 #include "G4PrimaryParticle.hh"
 
-const GenParticleInfo & 
-GenParticleInfoExtractor::operator()(const G4PrimaryParticle * p) const
-{
-    G4VUserPrimaryParticleInformation * up = p->GetUserInformation();
-    if (up == nullptr) throw SimG4Exception
-       ("GenParticleInfoExtractor: G4PrimaryParticle has no user information");
-    GenParticleInfo * gpi = dynamic_cast<GenParticleInfo *>(up);
-    if (gpi == nullptr) throw SimG4Exception
-       ("User information in G4PrimaryParticle is not of GenParticleInfo type");
-    return * gpi;
+const GenParticleInfo &GenParticleInfoExtractor::operator()(const G4PrimaryParticle *p) const {
+  G4VUserPrimaryParticleInformation *up = p->GetUserInformation();
+  if (up == nullptr)
+    throw SimG4Exception("GenParticleInfoExtractor: G4PrimaryParticle has no user information");
+  GenParticleInfo *gpi = dynamic_cast<GenParticleInfo *>(up);
+  if (gpi == nullptr)
+    throw SimG4Exception("User information in G4PrimaryParticle is not of GenParticleInfo type");
+  return *gpi;
 }
diff --git a/SimG4Core/Notification/src/NewTrackAction.cc b/SimG4Core/Notification/src/NewTrackAction.cc
index 1a224179750a0..e46d95828b373 100644
--- a/SimG4Core/Notification/src/NewTrackAction.cc
+++ b/SimG4Core/Notification/src/NewTrackAction.cc
@@ -11,49 +11,45 @@
 
 NewTrackAction::NewTrackAction() {}
 
-void NewTrackAction::primary(const G4Track * aTrack) const {
-  primary(const_cast<G4Track *>(aTrack)); 
-}
+void NewTrackAction::primary(const G4Track *aTrack) const { primary(const_cast<G4Track *>(aTrack)); }
 
-void NewTrackAction::primary(G4Track * aTrack) const {
-  addUserInfoToPrimary(aTrack);
-}
+void NewTrackAction::primary(G4Track *aTrack) const { addUserInfoToPrimary(aTrack); }
 
-void NewTrackAction::secondary(const G4Track * aSecondary,const G4Track & mother, int flag) const {
-  secondary(const_cast<G4Track *>(aSecondary),mother,flag); 
+void NewTrackAction::secondary(const G4Track *aSecondary, const G4Track &mother, int flag) const {
+  secondary(const_cast<G4Track *>(aSecondary), mother, flag);
 }
 
-void NewTrackAction::secondary(G4Track * aSecondary,const G4Track & mother, int flag) const {
-  if (aSecondary->GetParentID() != mother.GetTrackID()) 
+void NewTrackAction::secondary(G4Track *aSecondary, const G4Track &mother, int flag) const {
+  if (aSecondary->GetParentID() != mother.GetTrackID())
     throw SimG4Exception("NewTrackAction: secondary parent ID does not match mother id");
   TrackInformationExtractor extractor;
-  const TrackInformation & motherInfo(extractor(mother));
-  addUserInfoToSecondary(aSecondary,motherInfo,flag);
+  const TrackInformation &motherInfo(extractor(mother));
+  addUserInfoToSecondary(aSecondary, motherInfo, flag);
 #ifdef DebugLog
-  LogDebug("SimTrackManager") << "NewTrackAction: Add track " << aSecondary->GetTrackID() << " from mother " << mother.GetTrackID();
+  LogDebug("SimTrackManager") << "NewTrackAction: Add track " << aSecondary->GetTrackID() << " from mother "
+                              << mother.GetTrackID();
 #endif
 }
 
-void NewTrackAction::addUserInfoToPrimary(G4Track * aTrack) const {
-  TrackInformation * trkInfo = new TrackInformation();
+void NewTrackAction::addUserInfoToPrimary(G4Track *aTrack) const {
+  TrackInformation *trkInfo = new TrackInformation();
   trkInfo->isPrimary(true);
   trkInfo->storeTrack(true);
   trkInfo->putInHistory();
   trkInfo->setGenParticlePID(aTrack->GetDefinition()->GetPDGEncoding());
   trkInfo->setGenParticleP(aTrack->GetMomentum().mag());
-  aTrack->SetUserInformation(trkInfo);  
+  aTrack->SetUserInformation(trkInfo);
 }
 
-void NewTrackAction::addUserInfoToSecondary(G4Track * aTrack,const TrackInformation & motherInfo, int flag) const {
-
+void NewTrackAction::addUserInfoToSecondary(G4Track *aTrack, const TrackInformation &motherInfo, int flag) const {
   // ralf.ulrich@kit.edu: it is more efficient to use the constructor to copy all data and modify later only when needed
 
-  TrackInformation * trkInfo = new TrackInformation();
-//  LogDebug("SimG4CoreApplication") << "NewTrackAction called for "
-//				   << aTrack->GetTrackID()
-//				   << " mother " << motherInfo.isPrimary()
-//				   << " flag " << flag;
-  
+  TrackInformation *trkInfo = new TrackInformation();
+  //  LogDebug("SimG4CoreApplication") << "NewTrackAction called for "
+  //				   << aTrack->GetTrackID()
+  //				   << " mother " << motherInfo.isPrimary()
+  //				   << " flag " << flag;
+
   // Take care of cascade decays
   if (flag == 1) {
     trkInfo->isPrimary(true);
@@ -69,22 +65,22 @@ void NewTrackAction::addUserInfoToSecondary(G4Track * aTrack,const TrackInformat
     trkInfo->storeTrack(true);
     trkInfo->putInHistory();
     trkInfo->setIDonCaloSurface(aTrack->GetTrackID(),
-				motherInfo.getIDCaloVolume(),
-				motherInfo.getIDLastVolume(),
-				aTrack->GetDefinition()->GetPDGEncoding(),
-				aTrack->GetMomentum().mag());
+                                motherInfo.getIDCaloVolume(),
+                                motherInfo.getIDLastVolume(),
+                                aTrack->GetDefinition()->GetPDGEncoding(),
+                                aTrack->GetMomentum().mag());
   } else {
     // transfer calo ID from mother (to be checked in TrackingAction)
     trkInfo->setIDonCaloSurface(motherInfo.getIDonCaloSurface(),
-				motherInfo.getIDCaloVolume(),
-				motherInfo.getIDLastVolume(),
-				motherInfo.caloSurfaceParticlePID(),
-				motherInfo.caloSurfaceParticleP());
+                                motherInfo.getIDCaloVolume(),
+                                motherInfo.getIDLastVolume(),
+                                motherInfo.caloSurfaceParticlePID(),
+                                motherInfo.caloSurfaceParticleP());
   }
-  
+
   if (motherInfo.hasCastorHit()) {
     trkInfo->setCastorHitPID(motherInfo.getCastorHitPID());
   }
 
-  aTrack->SetUserInformation(trkInfo);  
+  aTrack->SetUserInformation(trkInfo);
 }
diff --git a/SimG4Core/Notification/src/SimActivityRegistry.cc b/SimG4Core/Notification/src/SimActivityRegistry.cc
index 4e2c42eb6617a..29aa99e8816c8 100644
--- a/SimG4Core/Notification/src/SimActivityRegistry.cc
+++ b/SimG4Core/Notification/src/SimActivityRegistry.cc
@@ -2,7 +2,7 @@
 //
 // Package:     Notification
 // Class  :     SimActivityRegistry
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
@@ -15,7 +15,6 @@
 // user include files
 #include "SimG4Core/Notification/interface/SimActivityRegistry.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -55,19 +54,17 @@
 //
 // member functions
 //
-void
-SimActivityRegistry::connect(SimActivityRegistry& iOther)
-{
-   beginOfJobSignal_.connect(iOther.beginOfJobSignal_);
-   dddWorldSignal_.connect(iOther.dddWorldSignal_);
-   beginOfRunSignal_.connect(iOther.beginOfRunSignal_);
-   beginOfEventSignal_.connect(iOther.beginOfEventSignal_);
-   beginOfTrackSignal_.connect(iOther.beginOfTrackSignal_);
-   g4StepSignal_.connect(iOther.g4StepSignal_);
+void SimActivityRegistry::connect(SimActivityRegistry& iOther) {
+  beginOfJobSignal_.connect(iOther.beginOfJobSignal_);
+  dddWorldSignal_.connect(iOther.dddWorldSignal_);
+  beginOfRunSignal_.connect(iOther.beginOfRunSignal_);
+  beginOfEventSignal_.connect(iOther.beginOfEventSignal_);
+  beginOfTrackSignal_.connect(iOther.beginOfTrackSignal_);
+  g4StepSignal_.connect(iOther.g4StepSignal_);
 
-   endOfRunSignal_.connect(iOther.endOfRunSignal_);
-   endOfEventSignal_.connect(iOther.endOfEventSignal_);
-   endOfTrackSignal_.connect(iOther.endOfTrackSignal_);
+  endOfRunSignal_.connect(iOther.endOfRunSignal_);
+  endOfEventSignal_.connect(iOther.endOfEventSignal_);
+  endOfTrackSignal_.connect(iOther.endOfTrackSignal_);
 }
 //
 // const member functions
diff --git a/SimG4Core/Notification/src/SimTrackManager.cc b/SimG4Core/Notification/src/SimTrackManager.cc
index deb357e0d7748..d23ca80cd98d9 100644
--- a/SimG4Core/Notification/src/SimTrackManager.cc
+++ b/SimG4Core/Notification/src/SimTrackManager.cc
@@ -2,11 +2,11 @@
 //
 // Package:     Application
 // Class  :     SimTrackManager
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
-// Original Author:  
+// Original Author:
 //         Created:  Fri Nov 25 17:44:19 EST 2005
 //
 
@@ -25,41 +25,41 @@
 
 //#define DebugLog
 
-SimTrackManager::SimTrackManager(bool iCollapsePrimaryVertices) :
-  m_trksForThisEvent(nullptr),m_nVertices(0),
-  m_collapsePrimaryVertices(iCollapsePrimaryVertices),
-  lastTrack(0),lastHist(0),theLHCTlink(nullptr){}
-
-
-SimTrackManager::~SimTrackManager()
-{
-  if ( m_trksForThisEvent != nullptr ) deleteTracks() ;
+SimTrackManager::SimTrackManager(bool iCollapsePrimaryVertices)
+    : m_trksForThisEvent(nullptr),
+      m_nVertices(0),
+      m_collapsePrimaryVertices(iCollapsePrimaryVertices),
+      lastTrack(0),
+      lastHist(0),
+      theLHCTlink(nullptr) {}
+
+SimTrackManager::~SimTrackManager() {
+  if (m_trksForThisEvent != nullptr)
+    deleteTracks();
 }
 
 //
 // member functions
 //
-void SimTrackManager::reset()
-{
-  if (m_trksForThisEvent==nullptr) { m_trksForThisEvent = new TrackContainer(); }
-  else
-    {
-      for (unsigned int i = 0; i < m_trksForThisEvent->size(); i++) {
-        delete (*m_trksForThisEvent)[i];
-      }
-      delete m_trksForThisEvent;
-      m_trksForThisEvent = new TrackContainer();
+void SimTrackManager::reset() {
+  if (m_trksForThisEvent == nullptr) {
+    m_trksForThisEvent = new TrackContainer();
+  } else {
+    for (unsigned int i = 0; i < m_trksForThisEvent->size(); i++) {
+      delete (*m_trksForThisEvent)[i];
     }
+    delete m_trksForThisEvent;
+    m_trksForThisEvent = new TrackContainer();
+  }
   cleanVertexMap();
   cleanTkCaloStateInfoMap();
-  std::vector<std::pair <int, int> >().swap(idsave);
+  std::vector<std::pair<int, int> >().swap(idsave);
   ancestorList.clear();
-  lastTrack=0;
-  lastHist=0;
+  lastTrack = 0;
+  lastHist = 0;
 }
 
-void SimTrackManager::deleteTracks()
-{
+void SimTrackManager::deleteTracks() {
   for (unsigned int i = 0; i < m_trksForThisEvent->size(); i++) {
     delete (*m_trksForThisEvent)[i];
   }
@@ -68,43 +68,37 @@ void SimTrackManager::deleteTracks()
 }
 
 /// this saves a track and all its parents looping over the non ordered vector
-void SimTrackManager::saveTrackAndItsBranch(TrackWithHistory * trkWHist)
-{
+void SimTrackManager::saveTrackAndItsBranch(TrackWithHistory* trkWHist) {
   using namespace std;
-  TrackWithHistory * trkH = trkWHist;
-  if (trkH == nullptr)
-    {
-      edm::LogError("SimTrackManager") 
-	<< " SimTrackManager::saveTrackAndItsBranch got 0 pointer ";
-      throw cms::Exception("SimTrackManager::saveTrackAndItsBranch")
-	<< " cannot handle hits for tracking";
-    }
+  TrackWithHistory* trkH = trkWHist;
+  if (trkH == nullptr) {
+    edm::LogError("SimTrackManager") << " SimTrackManager::saveTrackAndItsBranch got 0 pointer ";
+    throw cms::Exception("SimTrackManager::saveTrackAndItsBranch") << " cannot handle hits for tracking";
+  }
   trkH->save();
   unsigned int parent = trkH->parentID();
-  
-  TrackContainer::const_iterator tk_itr = 
-    std::lower_bound((*m_trksForThisEvent).begin(),(*m_trksForThisEvent).end(),
-		     parent,SimTrackManager::StrictWeakOrdering());
 
-  TrackWithHistory * tempTk = *tk_itr;
+  TrackContainer::const_iterator tk_itr = std::lower_bound(
+      (*m_trksForThisEvent).begin(), (*m_trksForThisEvent).end(), parent, SimTrackManager::StrictWeakOrdering());
 
-  if (tk_itr!=m_trksForThisEvent->end() && (*tk_itr)->trackID()==parent) { 
-    saveTrackAndItsBranch(tempTk); 
+  TrackWithHistory* tempTk = *tk_itr;
+
+  if (tk_itr != m_trksForThisEvent->end() && (*tk_itr)->trackID() == parent) {
+    saveTrackAndItsBranch(tempTk);
   }
 }
 
-void SimTrackManager::storeTracks(G4SimEvent* simEvent)
-{
+void SimTrackManager::storeTracks(G4SimEvent* simEvent) {
   cleanTracksWithHistory();
 
   // fill the map with the final mother-daughter relationship
   idsave.swap(ancestorList);
-  stable_sort(idsave.begin(),idsave.end());
+  stable_sort(idsave.begin(), idsave.end());
 
-  std::vector<std::pair<int,int> >().swap(ancestorList);
+  std::vector<std::pair<int, int> >().swap(ancestorList);
 
   // to get a backward compatible order
-  stable_sort(m_trksForThisEvent->begin(),m_trksForThisEvent->end(),trkIDLess());
+  stable_sort(m_trksForThisEvent->begin(), m_trksForThisEvent->end(), trkIDLess());
 
   // to reset the GenParticle ID of a SimTrack to its pre-LHCTransport value
   resetGenID();
@@ -112,157 +106,160 @@ void SimTrackManager::storeTracks(G4SimEvent* simEvent)
   reallyStoreTracks(simEvent);
 }
 
-void SimTrackManager::reallyStoreTracks(G4SimEvent * simEvent)
-{
+void SimTrackManager::reallyStoreTracks(G4SimEvent* simEvent) {
   // loop over the (now ordered) vector and really save the tracks
 #ifdef DebugLog
-  LogDebug("SimTrackManager")  
-    << "Inside the reallyStoreTracks method object to be stored = " 
-    << m_trksForThisEvent->size();
-#endif 
- 
-  for (unsigned int it = 0; it < m_trksForThisEvent->size(); it++)
-    {
-      TrackWithHistory * trkH = (*m_trksForThisEvent)[it];
-      // at this stage there is one vertex per track, 
-      // so the vertex id of track N is also N
-      int ivertex = -1;
-      int ig;
-      
-      math::XYZVectorD pm(0.,0.,0.);
-      unsigned int iParentID = trkH->parentID();
-      for(unsigned int iit = 0; iit < m_trksForThisEvent->size(); ++iit)
-        {
-          if((*m_trksForThisEvent)[iit]->trackID()==iParentID){
-            pm = (*m_trksForThisEvent)[iit]->momentum();
-            break;
-          }
-        }
-      ig = trkH->genParticleID();
-      ivertex = getOrCreateVertex(trkH,iParentID,simEvent);
-      std::map<uint32_t,std::pair<math::XYZVectorD,math::XYZTLorentzVectorD> >::const_iterator cit = 
-	mapTkCaloStateInfo.find(trkH->trackID());
-      std::pair<math::XYZVectorD,math::XYZTLorentzVectorD> tcinfo;
-      if (cit !=  mapTkCaloStateInfo.end()){
-        tcinfo = cit->second;
+  LogDebug("SimTrackManager") << "Inside the reallyStoreTracks method object to be stored = "
+                              << m_trksForThisEvent->size();
+#endif
+
+  for (unsigned int it = 0; it < m_trksForThisEvent->size(); it++) {
+    TrackWithHistory* trkH = (*m_trksForThisEvent)[it];
+    // at this stage there is one vertex per track,
+    // so the vertex id of track N is also N
+    int ivertex = -1;
+    int ig;
+
+    math::XYZVectorD pm(0., 0., 0.);
+    unsigned int iParentID = trkH->parentID();
+    for (unsigned int iit = 0; iit < m_trksForThisEvent->size(); ++iit) {
+      if ((*m_trksForThisEvent)[iit]->trackID() == iParentID) {
+        pm = (*m_trksForThisEvent)[iit]->momentum();
+        break;
       }
-      simEvent->add(new G4SimTrack(trkH->trackID(),trkH->particleID(),
-                                   trkH->momentum(),trkH->totalEnergy(),
-				   ivertex,ig,pm,tcinfo.first,tcinfo.second));
     }
+    ig = trkH->genParticleID();
+    ivertex = getOrCreateVertex(trkH, iParentID, simEvent);
+    std::map<uint32_t, std::pair<math::XYZVectorD, math::XYZTLorentzVectorD> >::const_iterator cit =
+        mapTkCaloStateInfo.find(trkH->trackID());
+    std::pair<math::XYZVectorD, math::XYZTLorentzVectorD> tcinfo;
+    if (cit != mapTkCaloStateInfo.end()) {
+      tcinfo = cit->second;
+    }
+    simEvent->add(new G4SimTrack(trkH->trackID(),
+                                 trkH->particleID(),
+                                 trkH->momentum(),
+                                 trkH->totalEnergy(),
+                                 ivertex,
+                                 ig,
+                                 pm,
+                                 tcinfo.first,
+                                 tcinfo.second));
+  }
 }
 
-int SimTrackManager::getOrCreateVertex(TrackWithHistory * trkH, int iParentID,
-                                       G4SimEvent * simEvent)
-{  
+int SimTrackManager::getOrCreateVertex(TrackWithHistory* trkH, int iParentID, G4SimEvent* simEvent) {
   int parent = iParentID;
   int check = -1;
-  
-  for( std::vector<TrackWithHistory*>::const_iterator it = (*m_trksForThisEvent).begin(); 
-       it!= (*m_trksForThisEvent).end();it++)
-    {
-      if ((*it)->trackID() == uint32_t(parent)) {
-	check = 0;
-	break;
-      }
+
+  for (std::vector<TrackWithHistory*>::const_iterator it = (*m_trksForThisEvent).begin();
+       it != (*m_trksForThisEvent).end();
+       it++) {
+    if ((*it)->trackID() == uint32_t(parent)) {
+      check = 0;
+      break;
     }
-  
-  if(check==-1) { parent = -1; }
-  
+  }
+
+  if (check == -1) {
+    parent = -1;
+  }
+
   VertexMap::const_iterator iterator = m_vertexMap.find(parent);
   if (iterator != m_vertexMap.end()) {
-
     // loop over saved vertices
-    for(unsigned int k=0; k<m_vertexMap[parent].size(); k++){
-      if(sqrt((trkH->vertexPosition()-(((m_vertexMap[parent])[k]).second)).Mag2())<0.001)
-	{ return (((m_vertexMap[parent])[k]).first); }
+    for (unsigned int k = 0; k < m_vertexMap[parent].size(); k++) {
+      if (sqrt((trkH->vertexPosition() - (((m_vertexMap[parent])[k]).second)).Mag2()) < 0.001) {
+        return (((m_vertexMap[parent])[k]).first);
+      }
     }
   }
 
   unsigned int ptype = 0;
   const G4VProcess* pr = trkH->creatorProcess();
-  if(pr) { ptype = pr->GetProcessSubType(); }
-  simEvent->add(new G4SimVertex(trkH->vertexPosition(),trkH->globalTime(),parent,ptype));
-  m_vertexMap[parent].push_back(MapVertexPosition(m_nVertices,trkH->vertexPosition()));
+  if (pr) {
+    ptype = pr->GetProcessSubType();
+  }
+  simEvent->add(new G4SimVertex(trkH->vertexPosition(), trkH->globalTime(), parent, ptype));
+  m_vertexMap[parent].push_back(MapVertexPosition(m_nVertices, trkH->vertexPosition()));
   m_nVertices++;
-  return (m_nVertices-1);
-  
+  return (m_nVertices - 1);
 }
 
-void SimTrackManager::cleanVertexMap() 
-{ 
+void SimTrackManager::cleanVertexMap() {
   m_vertexMap.clear();
   MotherParticleToVertexMap().swap(m_vertexMap);
-  m_nVertices=0; 
+  m_nVertices = 0;
 }
 
-void SimTrackManager::cleanTkCaloStateInfoMap() 
-{ 
+void SimTrackManager::cleanTkCaloStateInfoMap() {
   mapTkCaloStateInfo.clear();
-  std::map<uint32_t,std::pair<math::XYZVectorD,math::XYZTLorentzVectorD > >().swap(mapTkCaloStateInfo);
+  std::map<uint32_t, std::pair<math::XYZVectorD, math::XYZTLorentzVectorD> >().swap(mapTkCaloStateInfo);
 }
 
-int SimTrackManager::idSavedTrack (int id) const
-{
+int SimTrackManager::idSavedTrack(int id) const {
   int idMother = id;
-  if(id > 0) {
+  if (id > 0) {
     unsigned int n = idsave.size();
-    if(0 < n) {
+    if (0 < n) {
       int jmax = n - 1;
       int j, id1;
-      
+
       // first loop forward
       bool notFound = true;
-      for(j=0; j<=jmax; ++j) {
-	if((idsave[j]).first == idMother) {
-	  id1 = (idsave[j]).second;
-	  if(0 == id1 || id1 == idMother) { return id1; }
-	  jmax = j - 1; 
-	  idMother = id1;
-	  notFound = false;
-	  break;
-	}
-      } 
-      if(notFound) { return 0; }
-
-      // recursive loop 
-      do {
+      for (j = 0; j <= jmax; ++j) {
+        if ((idsave[j]).first == idMother) {
+          id1 = (idsave[j]).second;
+          if (0 == id1 || id1 == idMother) {
+            return id1;
+          }
+          jmax = j - 1;
+          idMother = id1;
+          notFound = false;
+          break;
+        }
+      }
+      if (notFound) {
+        return 0;
+      }
 
-	notFound = true;
-	// search ID scan backward
-        for(j=jmax; j>=0; --j) {
-          if((idsave[j]).first == idMother) {
-	    id1 = (idsave[j]).second;
-	    if(0 == id1 || id1 == idMother) { return id1; }
-	    jmax = j - 1; 
-	    idMother = id1;
-	    notFound = false;
-	    break;
-	  }
-	}
-	if(notFound) {
-	  // ID not in the list of saved track - look into ancestors
-	  jmax = ancestorList.size()-1;
-	  for(j=jmax; j>=0; --j) {
-	    if((ancestorList[j]).first == idMother) {
-	      idMother = (ancestorList[j]).second;
-	      return idMother;
-	    }
-	  } 
-	  return 0; 
-	}
+      // recursive loop
+      do {
+        notFound = true;
+        // search ID scan backward
+        for (j = jmax; j >= 0; --j) {
+          if ((idsave[j]).first == idMother) {
+            id1 = (idsave[j]).second;
+            if (0 == id1 || id1 == idMother) {
+              return id1;
+            }
+            jmax = j - 1;
+            idMother = id1;
+            notFound = false;
+            break;
+          }
+        }
+        if (notFound) {
+          // ID not in the list of saved track - look into ancestors
+          jmax = ancestorList.size() - 1;
+          for (j = jmax; j >= 0; --j) {
+            if ((ancestorList[j]).first == idMother) {
+              idMother = (ancestorList[j]).second;
+              return idMother;
+            }
+          }
+          return 0;
+        }
       } while (!notFound);
     }
   }
   return idMother;
 }
 
-void SimTrackManager::fillMotherList() 
-{
-  if ( !ancestorList.empty() && lastHist > ancestorList.size() ) {
+void SimTrackManager::fillMotherList() {
+  if (!ancestorList.empty() && lastHist > ancestorList.size()) {
     lastHist = ancestorList.size();
-    edm::LogError("SimTrackManager") 
-      << " SimTrackManager::fillMotherList track index corrupted";
+    edm::LogError("SimTrackManager") << " SimTrackManager::fillMotherList track index corrupted";
   }
   /*
   std::cout << "### SimTrackManager::fillMotherList: "
@@ -273,8 +270,7 @@ void SimTrackManager::fillMotherList()
 	       << " Mother ID = " << (idsave[i]).second << std::endl;
   }
   */
-  for (unsigned int n = lastHist; n < ancestorList.size(); n++) { 
-    
+  for (unsigned int n = lastHist; n < ancestorList.size(); n++) {
     int theMotherId = idSavedTrack((ancestorList[n]).first);
     ancestorList[n].second = theMotherId;
     /*
@@ -282,119 +278,109 @@ void SimTrackManager::fillMotherList()
 	       << " Mother ID = " << (ancestorList[n]).second << std::endl;
     */
 #ifdef DebugLog
-    LogDebug("SimTrackManager")  << "Track ID = " << (ancestorList[n]).first 
-				 << " Mother ID = " << (ancestorList[n]).second;
-#endif    
+    LogDebug("SimTrackManager") << "Track ID = " << (ancestorList[n]).first
+                                << " Mother ID = " << (ancestorList[n]).second;
+#endif
   }
 
   lastHist = ancestorList.size();
 
   idsave.clear();
-
 }
 
-void SimTrackManager::cleanTracksWithHistory(){
-
-  if ((*m_trksForThisEvent).empty() && idsave.empty()) { return; }
+void SimTrackManager::cleanTracksWithHistory() {
+  if ((*m_trksForThisEvent).empty() && idsave.empty()) {
+    return;
+  }
 
 #ifdef DebugLog
-  LogDebug("SimTrackManager") 
-    << "SimTrackManager::cleanTracksWithHistory has " 
-    << idsave.size() 
-    << " mother-daughter relationships stored with lastTrack = " << lastTrack;
+  LogDebug("SimTrackManager") << "SimTrackManager::cleanTracksWithHistory has " << idsave.size()
+                              << " mother-daughter relationships stored with lastTrack = " << lastTrack;
 #endif
 
-  if ( lastTrack > 0 && lastTrack >= (*m_trksForThisEvent).size() ) {
+  if (lastTrack > 0 && lastTrack >= (*m_trksForThisEvent).size()) {
     lastTrack = 0;
-    edm::LogError("SimTrackManager") 
-      << " SimTrackManager::cleanTracksWithHistory track index corrupted";
+    edm::LogError("SimTrackManager") << " SimTrackManager::cleanTracksWithHistory track index corrupted";
   }
-  
-  stable_sort(m_trksForThisEvent->begin()+lastTrack,m_trksForThisEvent->end(),trkIDLess());
-  
-  stable_sort(idsave.begin(),idsave.end());
- 
+
+  stable_sort(m_trksForThisEvent->begin() + lastTrack, m_trksForThisEvent->end(), trkIDLess());
+
+  stable_sort(idsave.begin(), idsave.end());
+
 #ifdef DebugLog
-  LogDebug("SimTrackManager")  
-    << " SimTrackManager::cleanTracksWithHistory knows " << m_trksForThisEvent->size()
-    << " tracks with history before branching";
-  for (unsigned int it =0;  it <(*m_trksForThisEvent).size(); it++) {
-    LogDebug("SimTrackManager")   
-      << " 1 - Track in position " << it << " G4 track number "
-      << (*m_trksForThisEvent)[it]->trackID()
-      << " mother " << (*m_trksForThisEvent)[it]->parentID()
-      << " status " << (*m_trksForThisEvent)[it]->saved();
+  LogDebug("SimTrackManager") << " SimTrackManager::cleanTracksWithHistory knows " << m_trksForThisEvent->size()
+                              << " tracks with history before branching";
+  for (unsigned int it = 0; it < (*m_trksForThisEvent).size(); it++) {
+    LogDebug("SimTrackManager") << " 1 - Track in position " << it << " G4 track number "
+                                << (*m_trksForThisEvent)[it]->trackID() << " mother "
+                                << (*m_trksForThisEvent)[it]->parentID() << " status "
+                                << (*m_trksForThisEvent)[it]->saved();
   }
-#endif  
+#endif
 
-  for (unsigned int it = lastTrack; it < m_trksForThisEvent->size(); it++)
-    {
-      TrackWithHistory * t = (*m_trksForThisEvent)[it];
-      if (t->saved()) { saveTrackAndItsBranch(t); }
+  for (unsigned int it = lastTrack; it < m_trksForThisEvent->size(); it++) {
+    TrackWithHistory* t = (*m_trksForThisEvent)[it];
+    if (t->saved()) {
+      saveTrackAndItsBranch(t);
     }
+  }
   unsigned int num = lastTrack;
-  for (unsigned int it = lastTrack; it < m_trksForThisEvent->size(); it++)
-    {
-      TrackWithHistory * t = (*m_trksForThisEvent)[it];
-      int g4ID = t->trackID();
-      if (t->saved() == true)
-        {
-          if (it>num) (*m_trksForThisEvent)[num] = t;
-          num++;
-	  for (unsigned int itr=0; itr<idsave.size(); itr++) { 
-	    if ((idsave[itr]).first == g4ID) { 
-	      (idsave[itr]).second = g4ID; 
-	      break; 
-	    } 
-	  }
-        }
-      else 
-        {	
-          delete t;
+  for (unsigned int it = lastTrack; it < m_trksForThisEvent->size(); it++) {
+    TrackWithHistory* t = (*m_trksForThisEvent)[it];
+    int g4ID = t->trackID();
+    if (t->saved() == true) {
+      if (it > num)
+        (*m_trksForThisEvent)[num] = t;
+      num++;
+      for (unsigned int itr = 0; itr < idsave.size(); itr++) {
+        if ((idsave[itr]).first == g4ID) {
+          (idsave[itr]).second = g4ID;
+          break;
         }
+      }
+    } else {
+      delete t;
     }
-  
+  }
+
   (*m_trksForThisEvent).resize(num);
 
 #ifdef DebugLog
-  LogDebug("SimTrackManager")  
-    << " AFTER CLEANING, I GET " << (*m_trksForThisEvent).size()
-    << " tracks to be saved persistently";
-  for (unsigned int it = 0;  it < (*m_trksForThisEvent).size(); it++) {
-    LogDebug("SimTrackManager")   
-      << " Track in position " << it
-      << " G4 track number " << (*m_trksForThisEvent)[it]->trackID()
-      << " mother " << (*m_trksForThisEvent)[it]->parentID()
-      << " Status " << (*m_trksForThisEvent)[it]->saved() 
-      << " id " << (*m_trksForThisEvent)[it]->particleID()
-      << " E(MeV)= " <<  (*m_trksForThisEvent)[it]->totalEnergy();
+  LogDebug("SimTrackManager") << " AFTER CLEANING, I GET " << (*m_trksForThisEvent).size()
+                              << " tracks to be saved persistently";
+  for (unsigned int it = 0; it < (*m_trksForThisEvent).size(); it++) {
+    LogDebug("SimTrackManager") << " Track in position " << it << " G4 track number "
+                                << (*m_trksForThisEvent)[it]->trackID() << " mother "
+                                << (*m_trksForThisEvent)[it]->parentID() << " Status "
+                                << (*m_trksForThisEvent)[it]->saved() << " id "
+                                << (*m_trksForThisEvent)[it]->particleID()
+                                << " E(MeV)= " << (*m_trksForThisEvent)[it]->totalEnergy();
   }
-#endif  
+#endif
 
   fillMotherList();
 
   lastTrack = (*m_trksForThisEvent).size();
 }
 
-void SimTrackManager::resetGenID() 
-{
-  if ( theLHCTlink == nullptr ) return;
-
-  for  (unsigned int it = 0; it < m_trksForThisEvent->size(); it++)
-    {
-      TrackWithHistory * trkH = (*m_trksForThisEvent)[it];
-      int genParticleID_ = trkH->genParticleID();
-      if ( genParticleID_ == -1 ) { continue; }
-      else {
-        for ( unsigned int itrlink = 0; itrlink < (*theLHCTlink).size(); itrlink++ ) {
-          if ( (*theLHCTlink)[itrlink].afterHector() == genParticleID_ ) {
-            trkH->setGenParticleID( (*theLHCTlink)[itrlink].beforeHector() );
-            continue;
-          }
+void SimTrackManager::resetGenID() {
+  if (theLHCTlink == nullptr)
+    return;
+
+  for (unsigned int it = 0; it < m_trksForThisEvent->size(); it++) {
+    TrackWithHistory* trkH = (*m_trksForThisEvent)[it];
+    int genParticleID_ = trkH->genParticleID();
+    if (genParticleID_ == -1) {
+      continue;
+    } else {
+      for (unsigned int itrlink = 0; itrlink < (*theLHCTlink).size(); itrlink++) {
+        if ((*theLHCTlink)[itrlink].afterHector() == genParticleID_) {
+          trkH->setGenParticleID((*theLHCTlink)[itrlink].beforeHector());
+          continue;
         }
       }
     }
+  }
 
   theLHCTlink = nullptr;
-
 }
diff --git a/SimG4Core/Notification/src/TrackInformation.cc b/SimG4Core/Notification/src/TrackInformation.cc
index 12c46aba4a044..f17e947ad5442 100644
--- a/SimG4Core/Notification/src/TrackInformation.cc
+++ b/SimG4Core/Notification/src/TrackInformation.cc
@@ -7,13 +7,12 @@ G4ThreadLocal G4Allocator<TrackInformation> *fpTrackInformationAllocator = nullp
 
 void TrackInformation::Print() const {
   LogDebug("TrackInformation") << " TrackInformation : storeTrack = " << storeTrack_ << "\n"
-			       << "                    hasHits = "    << hasHits_ << "\n"
-			       << "                    isPrimary = "  << isPrimary_ << "\n"
-			       << "                    isGeneratedSecondary = "  << isGeneratedSecondary_ << "\n"
-			       << "                    isInHistory = "  << isInHistory_ << "\n"
-			       << "                    idOnCaloSurface = "  << getIDonCaloSurface() << "\n"
-			       << "                    caloIDChecked = "  << caloIDChecked() << "\n"
-			       << "                    idCaloVolume = " << idCaloVolume_ << "\n"
-			       << "                    idLastVolume = " << idLastVolume_;
+                               << "                    hasHits = " << hasHits_ << "\n"
+                               << "                    isPrimary = " << isPrimary_ << "\n"
+                               << "                    isGeneratedSecondary = " << isGeneratedSecondary_ << "\n"
+                               << "                    isInHistory = " << isInHistory_ << "\n"
+                               << "                    idOnCaloSurface = " << getIDonCaloSurface() << "\n"
+                               << "                    caloIDChecked = " << caloIDChecked() << "\n"
+                               << "                    idCaloVolume = " << idCaloVolume_ << "\n"
+                               << "                    idLastVolume = " << idLastVolume_;
 }
-
diff --git a/SimG4Core/Notification/src/TrackInformationExtractor.cc b/SimG4Core/Notification/src/TrackInformationExtractor.cc
index 9c86f9a825d3f..84984899c577a 100644
--- a/SimG4Core/Notification/src/TrackInformationExtractor.cc
+++ b/SimG4Core/Notification/src/TrackInformationExtractor.cc
@@ -2,23 +2,22 @@
 
 #include "G4Track.hh"
 
-const TrackInformation & 
-TrackInformationExtractor::operator()(const G4Track & gtk) const
-{
-    G4VUserTrackInformation * gui = gtk.GetUserInformation();
-    if (gui == nullptr) missing(gtk);
-    const TrackInformation * tkInfo = dynamic_cast<const TrackInformation *>(gui);
-    if (tkInfo == nullptr) wrongType();
-    return * tkInfo;
+const TrackInformation &TrackInformationExtractor::operator()(const G4Track &gtk) const {
+  G4VUserTrackInformation *gui = gtk.GetUserInformation();
+  if (gui == nullptr)
+    missing(gtk);
+  const TrackInformation *tkInfo = dynamic_cast<const TrackInformation *>(gui);
+  if (tkInfo == nullptr)
+    wrongType();
+  return *tkInfo;
 }
 
-TrackInformation & 
-TrackInformationExtractor::operator()(G4Track & gtk) const
-{
-    G4VUserTrackInformation * gui = gtk.GetUserInformation();
-    if (gui == nullptr) missing(gtk);
-    TrackInformation * tkInfo = dynamic_cast<TrackInformation *>(gui);
-    if (tkInfo == nullptr) wrongType();
-    return * tkInfo;
+TrackInformation &TrackInformationExtractor::operator()(G4Track &gtk) const {
+  G4VUserTrackInformation *gui = gtk.GetUserInformation();
+  if (gui == nullptr)
+    missing(gtk);
+  TrackInformation *tkInfo = dynamic_cast<TrackInformation *>(gui);
+  if (tkInfo == nullptr)
+    wrongType();
+  return *tkInfo;
 }
-
diff --git a/SimG4Core/Notification/src/TrackWithHistory.cc b/SimG4Core/Notification/src/TrackWithHistory.cc
index a5616a9e2a51f..d1cafdf02a477 100644
--- a/SimG4Core/Notification/src/TrackWithHistory.cc
+++ b/SimG4Core/Notification/src/TrackWithHistory.cc
@@ -10,69 +10,78 @@
 
 #include <iostream>
 
-G4ThreadLocal G4Allocator<TrackWithHistory> *fpTrackWithHistoryAllocator = nullptr;
+G4ThreadLocal G4Allocator<TrackWithHistory>* fpTrackWithHistoryAllocator = nullptr;
 
 //#define DEBUG
 
-TrackWithHistory::TrackWithHistory(const G4Track * g4trk) : 
-  trackID_(0),particleID_(0),parentID_(0),momentum_(math::XYZVectorD(0.,0.,0.)),
-  totalEnergy_(0),vertexPosition_(math::XYZVectorD(0.,0.,0.)),globalTime_(0),
-  localTime_(0),properTime_(0),creatorProcess_(nullptr),weight_(0),
-  storeTrack_(false),saved_(false) {
-  
-  if (g4trk!=nullptr) {
+TrackWithHistory::TrackWithHistory(const G4Track* g4trk)
+    : trackID_(0),
+      particleID_(0),
+      parentID_(0),
+      momentum_(math::XYZVectorD(0., 0., 0.)),
+      totalEnergy_(0),
+      vertexPosition_(math::XYZVectorD(0., 0., 0.)),
+      globalTime_(0),
+      localTime_(0),
+      properTime_(0),
+      creatorProcess_(nullptr),
+      weight_(0),
+      storeTrack_(false),
+      saved_(false) {
+  if (g4trk != nullptr) {
     TrackInformationExtractor extractor;
     trackID_ = g4trk->GetTrackID();
     particleID_ = G4TrackToParticleID::particleID(g4trk);
     parentID_ = g4trk->GetParentID();
-    momentum_ = math::XYZVectorD(g4trk->GetMomentum().x(),g4trk->GetMomentum().y(),g4trk->GetMomentum().z());
+    momentum_ = math::XYZVectorD(g4trk->GetMomentum().x(), g4trk->GetMomentum().y(), g4trk->GetMomentum().z());
     totalEnergy_ = g4trk->GetTotalEnergy();
-    vertexPosition_ = math::XYZVectorD(g4trk->GetPosition().x(),g4trk->GetPosition().y(),g4trk->GetPosition().z());
-    globalTime_  = g4trk->GetGlobalTime();
-    localTime_  = g4trk->GetLocalTime();
-    properTime_  = g4trk->GetProperTime();
+    vertexPosition_ = math::XYZVectorD(g4trk->GetPosition().x(), g4trk->GetPosition().y(), g4trk->GetPosition().z());
+    globalTime_ = g4trk->GetGlobalTime();
+    localTime_ = g4trk->GetLocalTime();
+    properTime_ = g4trk->GetProperTime();
     creatorProcess_ = g4trk->GetCreatorProcess();
     storeTrack_ = extractor(g4trk).storeTrack();
     saved_ = false;
-    genParticleID_ = extractGenID( g4trk);
+    genParticleID_ = extractGenID(g4trk);
     // V.I. weight is computed in the same way as before
     // without usage of G4Track::GetWeight()
-    weight_ = 10000*genParticleID_;
-#ifdef DEBUG	
-    LogDebug("TrackInformation") << " TrackWithHistory : created history for " << trackID_
-				 << " with mother " << parentID_;
+    weight_ = 10000 * genParticleID_;
+#ifdef DEBUG
+    LogDebug("TrackInformation") << " TrackWithHistory : created history for " << trackID_ << " with mother "
+                                 << parentID_;
 #endif
   }
 }
 
-void TrackWithHistory::checkAtEnd(const G4Track * gt) {
-
-  math::XYZVectorD vposdir(gt->GetVertexPosition().x(),gt->GetVertexPosition().y(),gt->GetVertexPosition().z());
-  math::XYZVectorD vmomdir(gt->GetVertexMomentumDirection().x(),gt->GetVertexMomentumDirection().y(),gt->GetVertexMomentumDirection().z());
+void TrackWithHistory::checkAtEnd(const G4Track* gt) {
+  math::XYZVectorD vposdir(gt->GetVertexPosition().x(), gt->GetVertexPosition().y(), gt->GetVertexPosition().z());
+  math::XYZVectorD vmomdir(
+      gt->GetVertexMomentumDirection().x(), gt->GetVertexMomentumDirection().y(), gt->GetVertexMomentumDirection().z());
   bool ok = true;
   double epsilon = 1.e-6;
-  double eps2 = epsilon*epsilon;
-  if ((vertexPosition_-vposdir).Mag2() > eps2)  {
-    edm::LogWarning("TrackInformation") << "TrackWithHistory vertex position check failed" 
-					<< "\nAt construction: " << vertexPosition_
-					<< "\nAt end:          " << vposdir;
+  double eps2 = epsilon * epsilon;
+  if ((vertexPosition_ - vposdir).Mag2() > eps2) {
+    edm::LogWarning("TrackInformation") << "TrackWithHistory vertex position check failed"
+                                        << "\nAt construction: " << vertexPosition_ << "\nAt end:          " << vposdir;
     ok = false;
   }
   math::XYZVectorD dirDiff = momentum_.Unit() - vmomdir;
-  if (dirDiff.Mag2() > eps2 &&  momentum_.Unit().R() > eps2) {
+  if (dirDiff.Mag2() > eps2 && momentum_.Unit().R() > eps2) {
     edm::LogWarning("TrackInformation") << "TrackWithHistory momentum direction check failed"
-					<< "\nAt construction: " << momentum_.Unit() 
-					<< "\nAt end:          " << vmomdir;
+                                        << "\nAt construction: " << momentum_.Unit()
+                                        << "\nAt end:          " << vmomdir;
     ok = false;
   }
-  if (!ok) throw SimG4Exception("TrackWithHistory::checkAtEnd failed");
+  if (!ok)
+    throw SimG4Exception("TrackWithHistory::checkAtEnd failed");
 }
 
 int TrackWithHistory::extractGenID(const G4Track* gt) const {
-  void * vgprimary = gt->GetDynamicParticle()->GetPrimaryParticle();
-  if (vgprimary == nullptr) return -1;
+  void* vgprimary = gt->GetDynamicParticle()->GetPrimaryParticle();
+  if (vgprimary == nullptr)
+    return -1;
   // replace old-style cast with appropriate new-style cast...
-  G4PrimaryParticle* gprimary = (G4PrimaryParticle*) vgprimary;
+  G4PrimaryParticle* gprimary = (G4PrimaryParticle*)vgprimary;
   GenParticleInfoExtractor ext;
   return ext(gprimary).id();
 }
diff --git a/SimG4Core/Notification/test/simactivityregistry_t.cppunit.cpp b/SimG4Core/Notification/test/simactivityregistry_t.cppunit.cpp
index 397d2b794e556..c785d4ec801d3 100644
--- a/SimG4Core/Notification/test/simactivityregistry_t.cppunit.cpp
+++ b/SimG4Core/Notification/test/simactivityregistry_t.cppunit.cpp
@@ -13,153 +13,147 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
-class testSimActivityRegistry: public CppUnit::TestFixture
-{
-   CPPUNIT_TEST_SUITE(testSimActivityRegistry);
-   
-   CPPUNIT_TEST(signalTest);
-   CPPUNIT_TEST(signalForwardingTest);
-   CPPUNIT_TEST(enrollerTest);
-   
-   CPPUNIT_TEST_SUITE_END();
+class testSimActivityRegistry : public CppUnit::TestFixture {
+  CPPUNIT_TEST_SUITE(testSimActivityRegistry);
+
+  CPPUNIT_TEST(signalTest);
+  CPPUNIT_TEST(signalForwardingTest);
+  CPPUNIT_TEST(enrollerTest);
+
+  CPPUNIT_TEST_SUITE_END();
+
 public:
-      void setUp() override{}
-   void tearDown() override{}
-   
-   void signalTest();
-   void signalForwardingTest();
-   void enrollerTest();
+  void setUp() override {}
+  void tearDown() override {}
+
+  void signalTest();
+  void signalForwardingTest();
+  void enrollerTest();
 };
 
 ///registration of the test so that the runner can find it
 CPPUNIT_TEST_SUITE_REGISTRATION(testSimActivityRegistry);
 
 namespace {
-   template<class T> struct MyObserver : public Observer<const T*> {
-      mutable bool saw_;
-      MyObserver() : saw_(false) {}     
-      void update(const T*) override {
-         saw_=true;
-      }
-   };
+  template <class T>
+  struct MyObserver : public Observer<const T*> {
+    mutable bool saw_;
+    MyObserver() : saw_(false) {}
+    void update(const T*) override { saw_ = true; }
+  };
+}  // namespace
+
+#define TEST(signal, SIGNAL)           \
+  MyObserver<SIGNAL> watch##SIGNAL;    \
+  registry.connect(&watch##SIGNAL);    \
+  const SIGNAL* p##SIGNAL = 0;         \
+  registry.signal##Signal_(p##SIGNAL); \
+  CPPUNIT_ASSERT(watch##SIGNAL.saw_);
+
+void testSimActivityRegistry::signalTest() {
+  SimActivityRegistry registry;
+
+  for (int i = 0; i < 1000; i++) {
+    TEST(beginOfRun, BeginOfRun);
+    TEST(beginOfJob, BeginOfJob);
+    TEST(beginOfEvent, BeginOfEvent);
+    TEST(beginOfTrack, BeginOfTrack);
+    TEST(dddWorld, DDDWorld);
+    TEST(g4Step, G4Step);
+
+    TEST(endOfRun, EndOfRun);
+    TEST(endOfEvent, EndOfEvent);
+    TEST(endOfTrack, EndOfTrack);
+  }
 }
 
-#define TEST(signal, SIGNAL)    MyObserver<SIGNAL> watch ## SIGNAL; \
-registry.connect(&watch ## SIGNAL);\
-const SIGNAL* p ## SIGNAL=0; \
-registry. signal ## Signal_(p ## SIGNAL); \
-CPPUNIT_ASSERT(watch ## SIGNAL .saw_);
-
-void
-testSimActivityRegistry::signalTest()
-{
-   SimActivityRegistry registry;
-
-   for(int i=0; i<1000; i++) {
-   TEST(beginOfRun,BeginOfRun);
-   TEST(beginOfJob,BeginOfJob);
-   TEST(beginOfEvent,BeginOfEvent);
-   TEST(beginOfTrack,BeginOfTrack);
-   TEST(dddWorld,DDDWorld);
-   TEST(g4Step,G4Step);
-
-   TEST(endOfRun,EndOfRun);
-   TEST(endOfEvent,EndOfEvent);
-   TEST(endOfTrack,EndOfTrack);   
-   }
-}
-
-#define TESTF(signal, SIGNAL)    MyObserver<SIGNAL> watch ## SIGNAL; \
-registry2.connect(&watch ## SIGNAL);\
-const SIGNAL* p ## SIGNAL=0; \
-registry. signal ## Signal_(p ## SIGNAL); \
-CPPUNIT_ASSERT(watch ## SIGNAL .saw_);
-
-void
-testSimActivityRegistry::signalForwardingTest()
-{
-   SimActivityRegistry registry;
-   SimActivityRegistry registry2;
-   registry.connect(registry2);
-
-   for(int i=0; i<1000; i++) {
-   TESTF(beginOfRun,BeginOfRun);
-   TESTF(beginOfJob,BeginOfJob);
-   TESTF(beginOfEvent,BeginOfEvent);
-   TESTF(beginOfTrack,BeginOfTrack);
-   TESTF(dddWorld,DDDWorld);
-   TESTF(g4Step,G4Step);
-
-   TESTF(endOfRun,EndOfRun);
-   TESTF(endOfEvent,EndOfEvent);
-   TESTF(endOfTrack,EndOfTrack);   
-   }
+#define TESTF(signal, SIGNAL)          \
+  MyObserver<SIGNAL> watch##SIGNAL;    \
+  registry2.connect(&watch##SIGNAL);   \
+  const SIGNAL* p##SIGNAL = 0;         \
+  registry.signal##Signal_(p##SIGNAL); \
+  CPPUNIT_ASSERT(watch##SIGNAL.saw_);
+
+void testSimActivityRegistry::signalForwardingTest() {
+  SimActivityRegistry registry;
+  SimActivityRegistry registry2;
+  registry.connect(registry2);
+
+  for (int i = 0; i < 1000; i++) {
+    TESTF(beginOfRun, BeginOfRun);
+    TESTF(beginOfJob, BeginOfJob);
+    TESTF(beginOfEvent, BeginOfEvent);
+    TESTF(beginOfTrack, BeginOfTrack);
+    TESTF(dddWorld, DDDWorld);
+    TESTF(g4Step, G4Step);
+
+    TESTF(endOfRun, EndOfRun);
+    TESTF(endOfEvent, EndOfEvent);
+    TESTF(endOfTrack, EndOfTrack);
+  }
 }
 
 namespace {
-   
-   template<class T> struct Counting : public Observer<const T*> {
-      int& count_;
-      Counting(int& iCount) : count_(iCount) {}     
-      void update(const T*) override {
-         ++count_;
-      }
-   };
-   struct NoSignal { };
-   
-   struct OneSignal : public Counting<BeginOfEvent> { 
-      OneSignal(int& iCount):Counting<BeginOfEvent>(iCount) {} 
-   };
-   
-   struct TwoSignals : public Counting<BeginOfEvent>, public Counting<EndOfEvent> {
-      TwoSignals(int& iCount):Counting<BeginOfEvent>(iCount),Counting<EndOfEvent>(iCount) {} 
-   };
-
-}
 
-#define TESTREG(signal, SIGNAL)    int count ## SIGNAL = 0; \
-Counting<SIGNAL> watch ## SIGNAL (count ## SIGNAL ); \
-enroller.enroll(registry, &watch ## SIGNAL);\
-const SIGNAL* p ## SIGNAL=0; \
-registry. signal ## Signal_(p ## SIGNAL); \
-CPPUNIT_ASSERT(1==watch ## SIGNAL .count_);
-
-void
-testSimActivityRegistry::enrollerTest()
-{
-   SimActivityRegistry registry;
-
-   NoSignal noSignal;
-   SimActivityRegistryEnroller enroller;
-   enroller.enroll(registry, &noSignal);
-   
-   int int1Signal=0;
-   OneSignal oneSignal(int1Signal);
-   enroller.enroll(registry, &oneSignal);
-
-   int int2Signals=0;
-   TwoSignals twoSignals(int2Signals);
-   enroller.enroll(registry, &twoSignals);
-
-   const BeginOfEvent* pBegin=nullptr;
-   registry.beginOfEventSignal_(pBegin);
-   
-   const EndOfEvent* pEnd=nullptr;
-   registry.endOfEventSignal_(pEnd);
-   
-   CPPUNIT_ASSERT(1==int1Signal);
-   CPPUNIT_ASSERT(2==int2Signals);
-
-   TESTREG(beginOfRun,BeginOfRun);
-   TESTREG(beginOfJob,BeginOfJob);
-   TESTREG(beginOfEvent,BeginOfEvent);
-   TESTREG(beginOfTrack,BeginOfTrack);
-   TESTREG(dddWorld,DDDWorld);
-   TESTREG(g4Step,G4Step);
-   
-   TESTREG(endOfRun,EndOfRun);
-   TESTREG(endOfEvent,EndOfEvent);
-   TESTREG(endOfTrack,EndOfTrack);   
-   
+  template <class T>
+  struct Counting : public Observer<const T*> {
+    int& count_;
+    Counting(int& iCount) : count_(iCount) {}
+    void update(const T*) override { ++count_; }
+  };
+  struct NoSignal {};
+
+  struct OneSignal : public Counting<BeginOfEvent> {
+    OneSignal(int& iCount) : Counting<BeginOfEvent>(iCount) {}
+  };
+
+  struct TwoSignals : public Counting<BeginOfEvent>, public Counting<EndOfEvent> {
+    TwoSignals(int& iCount) : Counting<BeginOfEvent>(iCount), Counting<EndOfEvent>(iCount) {}
+  };
+
+}  // namespace
+
+#define TESTREG(signal, SIGNAL)                  \
+  int count##SIGNAL = 0;                         \
+  Counting<SIGNAL> watch##SIGNAL(count##SIGNAL); \
+  enroller.enroll(registry, &watch##SIGNAL);     \
+  const SIGNAL* p##SIGNAL = 0;                   \
+  registry.signal##Signal_(p##SIGNAL);           \
+  CPPUNIT_ASSERT(1 == watch##SIGNAL.count_);
+
+void testSimActivityRegistry::enrollerTest() {
+  SimActivityRegistry registry;
+
+  NoSignal noSignal;
+  SimActivityRegistryEnroller enroller;
+  enroller.enroll(registry, &noSignal);
+
+  int int1Signal = 0;
+  OneSignal oneSignal(int1Signal);
+  enroller.enroll(registry, &oneSignal);
+
+  int int2Signals = 0;
+  TwoSignals twoSignals(int2Signals);
+  enroller.enroll(registry, &twoSignals);
+
+  const BeginOfEvent* pBegin = nullptr;
+  registry.beginOfEventSignal_(pBegin);
+
+  const EndOfEvent* pEnd = nullptr;
+  registry.endOfEventSignal_(pEnd);
+
+  CPPUNIT_ASSERT(1 == int1Signal);
+  CPPUNIT_ASSERT(2 == int2Signals);
+
+  TESTREG(beginOfRun, BeginOfRun);
+  TESTREG(beginOfJob, BeginOfJob);
+  TESTREG(beginOfEvent, BeginOfEvent);
+  TESTREG(beginOfTrack, BeginOfTrack);
+  TESTREG(dddWorld, DDDWorld);
+  TESTREG(g4Step, G4Step);
+
+  TESTREG(endOfRun, EndOfRun);
+  TESTREG(endOfEvent, EndOfEvent);
+  TESTREG(endOfTrack, EndOfTrack);
 }
 #include <Utilities/Testing/interface/CppUnit_testdriver.icpp>
diff --git a/SimG4Core/Physics/interface/DDG4ProductionCuts.h b/SimG4Core/Physics/interface/DDG4ProductionCuts.h
index 5fc13cd2c4407..9edf630c780b2 100644
--- a/SimG4Core/Physics/interface/DDG4ProductionCuts.h
+++ b/SimG4Core/Physics/interface/DDG4ProductionCuts.h
@@ -12,27 +12,27 @@ class G4Region;
 class G4LogicalVolume;
 class G4ProductionCuts;
 
-class DDG4ProductionCuts  {
-
+class DDG4ProductionCuts {
 public:
-  DDG4ProductionCuts(const G4LogicalVolumeToDDLogicalPartMap&, int,
-		     const edm::ParameterSet & p);
+  DDG4ProductionCuts(const G4LogicalVolumeToDDLogicalPartMap&, int, const edm::ParameterSet& p);
   ~DDG4ProductionCuts();
   void update();
-  void SetVerbosity( int verb ) { m_Verbosity = verb; return ; }
+  void SetVerbosity(int verb) {
+    m_Verbosity = verb;
+    return;
+  }
 
 private:
-
   void initialize();
-  void setProdCuts(const DDLogicalPart lpart, G4LogicalVolume * lvolume);
-  G4Region * getRegion(const std::string & region);
-  G4ProductionCuts * getProductionCuts(G4Region * region);
+  void setProdCuts(const DDLogicalPart lpart, G4LogicalVolume* lvolume);
+  G4Region* getRegion(const std::string& region);
+  G4ProductionCuts* getProductionCuts(G4Region* region);
 
   G4LogicalVolumeToDDLogicalPartMap map_;
-  std::string                       m_KeywordRegion;    
-  int                               m_Verbosity;
-  bool                              m_protonCut;
-  G4LogicalVolumeToDDLogicalPartMap::Vector vec_;    
+  std::string m_KeywordRegion;
+  int m_Verbosity;
+  bool m_protonCut;
+  G4LogicalVolumeToDDLogicalPartMap::Vector vec_;
 };
 
 #endif
diff --git a/SimG4Core/Physics/interface/G4ProcessTypeEnumerator.h b/SimG4Core/Physics/interface/G4ProcessTypeEnumerator.h
index e3e827f889ec2..daff62d11815d 100644
--- a/SimG4Core/Physics/interface/G4ProcessTypeEnumerator.h
+++ b/SimG4Core/Physics/interface/G4ProcessTypeEnumerator.h
@@ -4,25 +4,15 @@
 #include "G4VProcess.hh"
 
 class G4ProcessTypeEnumerator {
-
 public:
-
   G4ProcessTypeEnumerator();
   ~G4ProcessTypeEnumerator();
 
-  inline unsigned int processId(const G4VProcess* p) const
-    {
-      return (p) ? p->GetProcessSubType() : 0;
-    }
-  inline int processIdLong(const G4VProcess* p) const
-    {
-      return (p) ? p->GetProcessSubType() : 0;
-    }
+  inline unsigned int processId(const G4VProcess* p) const { return (p) ? p->GetProcessSubType() : 0; }
+  inline int processIdLong(const G4VProcess* p) const { return (p) ? p->GetProcessSubType() : 0; }
 
   std::string processG4Name(int) const;
 
   int processId(const std::string& name) const;
-
 };
-#endif 
-
+#endif
diff --git a/SimG4Core/Physics/interface/Monopole.h b/SimG4Core/Physics/interface/Monopole.h
index 58be8387664c3..ed55f5d7193c1 100644
--- a/SimG4Core/Physics/interface/Monopole.h
+++ b/SimG4Core/Physics/interface/Monopole.h
@@ -10,16 +10,16 @@
 // ######################################################################
 
 class Monopole : public G4ParticleDefinition {
+public:
+  Monopole(const G4String& name = "Monopole",
+           G4int pdgEncoding = 0,
+           G4double mass_ = 100. * CLHEP::GeV,
+           G4int magCharge_ = 1,
+           G4int elCharge_ = 0);
 
-public: 
-  
-  Monopole (const G4String& name="Monopole", G4int pdgEncoding= 0, 
-            G4double mass_=100.*CLHEP::GeV, G4int magCharge_=1, G4int elCharge_ =0);
-
-  G4double MagneticCharge() const {return magCharge;};
+  G4double MagneticCharge() const { return magCharge; };
 
 private:
-
   ~Monopole() override;
 
   G4double magCharge;
diff --git a/SimG4Core/Physics/interface/PhysicsList.h b/SimG4Core/Physics/interface/PhysicsList.h
index 5da71ea743f9c..11b830deb3cdd 100644
--- a/SimG4Core/Physics/interface/PhysicsList.h
+++ b/SimG4Core/Physics/interface/PhysicsList.h
@@ -5,12 +5,10 @@
 #include "G4VModularPhysicsList.hh"
 
 class PhysicsList : public G4VModularPhysicsList {
-
 public:
-  PhysicsList(const edm::ParameterSet & p);
+  PhysicsList(const edm::ParameterSet& p);
   ~PhysicsList() override;
   void SetCuts() override;
-
 };
 
 #endif
diff --git a/SimG4Core/Physics/interface/PhysicsListFactory.h b/SimG4Core/Physics/interface/PhysicsListFactory.h
index 81e4444805e78..4ddb558a06dcc 100644
--- a/SimG4Core/Physics/interface/PhysicsListFactory.h
+++ b/SimG4Core/Physics/interface/PhysicsListFactory.h
@@ -6,10 +6,10 @@
 
 #include "FWCore/PluginManager/interface/PluginFactory.h"
 
-typedef edmplugin::PluginFactory<PhysicsListMakerBase *() > PhysicsListFactory;
+typedef edmplugin::PluginFactory<PhysicsListMakerBase *()> PhysicsListFactory;
 //NOTE: the prefix "SimG4Core/Physics/" is there for 'backwards compatability
 // and should eventually be removed (which will require changes to config files)
 #define DEFINE_PHYSICSLIST(type) \
-  DEFINE_EDM_PLUGIN(PhysicsListFactory, PhysicsListMaker<type>,"SimG4Core/Physics/" #type)
+  DEFINE_EDM_PLUGIN(PhysicsListFactory, PhysicsListMaker<type>, "SimG4Core/Physics/" #type)
 
 #endif
diff --git a/SimG4Core/Physics/interface/PhysicsListMaker.h b/SimG4Core/Physics/interface/PhysicsListMaker.h
index 699554c73127d..a1876dc17dd18 100644
--- a/SimG4Core/Physics/interface/PhysicsListMaker.h
+++ b/SimG4Core/Physics/interface/PhysicsListMaker.h
@@ -4,7 +4,7 @@
 //
 // Package:     Physics
 // Class  :     PhysicsListMaker
-// 
+//
 /**\class PhysicsListMaker PhysicsListMaker.h SimG4Core/Physics/interface/PhysicsListMaker.h
 
  Description: <one line class summary>
@@ -14,7 +14,7 @@
 
 */
 //
-// Original Author:  
+// Original Author:
 //         Created:  Tue Nov 22 13:03:44 EST 2005
 //
 
@@ -27,26 +27,22 @@
 
 // forward declarations
 
-template<class T>
-class PhysicsListMaker : public PhysicsListMakerBase
-{
- public:
-  PhysicsListMaker(){}
+template <class T>
+class PhysicsListMaker : public PhysicsListMakerBase {
+public:
+  PhysicsListMaker() {}
 
   // ---------- const member functions ---------------------
-  std::unique_ptr<PhysicsList> make(const edm::ParameterSet& p,
-				    SimActivityRegistry& reg) const override
-    {
-      std::unique_ptr<T> returnValue(new T(p));
-      SimActivityRegistryEnroller::enroll(reg, returnValue.get());
-	
-      return returnValue;
-    }
- private:
+  std::unique_ptr<PhysicsList> make(const edm::ParameterSet& p, SimActivityRegistry& reg) const override {
+    std::unique_ptr<T> returnValue(new T(p));
+    SimActivityRegistryEnroller::enroll(reg, returnValue.get());
+
+    return returnValue;
+  }
 
+private:
   PhysicsListMaker(const PhysicsListMaker&) = delete;
-  const PhysicsListMaker& operator=(const PhysicsListMaker&) = delete; 
+  const PhysicsListMaker& operator=(const PhysicsListMaker&) = delete;
 };
 
-
 #endif
diff --git a/SimG4Core/Physics/interface/PhysicsListMakerBase.h b/SimG4Core/Physics/interface/PhysicsListMakerBase.h
index f8bcd2909ef0d..554efeff9baf0 100644
--- a/SimG4Core/Physics/interface/PhysicsListMakerBase.h
+++ b/SimG4Core/Physics/interface/PhysicsListMakerBase.h
@@ -4,7 +4,7 @@
 //
 // Package:     Physics
 // Class  :     PhysicsListMakerBase
-// 
+//
 /**\class PhysicsListMakerBase PhysicsListMakerBase.h SimG4Core/Physics/interface/PhysicsListMakerBase.h
 
  Description: Base class for the 'maker' which creates PhysicsLists
@@ -27,22 +27,20 @@
 
 // forward declarations
 class SimActivityRegistry;
-namespace edm{
+namespace edm {
   class ParameterSet;
 }
 
-class PhysicsListMakerBase
-{
- public:
+class PhysicsListMakerBase {
+public:
   PhysicsListMakerBase() {}
   virtual ~PhysicsListMakerBase() {}
 
-  virtual std::unique_ptr<PhysicsList> make(const edm::ParameterSet&,
-					    SimActivityRegistry&) const = 0;
+  virtual std::unique_ptr<PhysicsList> make(const edm::ParameterSet&, SimActivityRegistry&) const = 0;
 
- private:
+private:
   PhysicsListMakerBase(const PhysicsListMakerBase&) = delete;
-  const PhysicsListMakerBase& operator=(const PhysicsListMakerBase&) = delete; 
+  const PhysicsListMakerBase& operator=(const PhysicsListMakerBase&) = delete;
 };
 
 #endif
diff --git a/SimG4Core/Physics/src/DDG4ProductionCuts.cc b/SimG4Core/Physics/src/DDG4ProductionCuts.cc
index a6bec198697e8..30247dd655b9a 100644
--- a/SimG4Core/Physics/src/DDG4ProductionCuts.cc
+++ b/SimG4Core/Physics/src/DDG4ProductionCuts.cc
@@ -8,24 +8,24 @@
 
 #include <algorithm>
 
-DDG4ProductionCuts::DDG4ProductionCuts(const G4LogicalVolumeToDDLogicalPartMap& map, int verb, 
-                                       const edm::ParameterSet & p) 
-  : map_(map), m_Verbosity(verb) {
-  m_KeywordRegion =  "CMSCutsRegion";
-  m_protonCut = p.getUntrackedParameter<bool>("CutsOnProton",true);  
+DDG4ProductionCuts::DDG4ProductionCuts(const G4LogicalVolumeToDDLogicalPartMap& map,
+                                       int verb,
+                                       const edm::ParameterSet& p)
+    : map_(map), m_Verbosity(verb) {
+  m_KeywordRegion = "CMSCutsRegion";
+  m_protonCut = p.getUntrackedParameter<bool>("CutsOnProton", true);
   initialize();
 }
 
-DDG4ProductionCuts::~DDG4ProductionCuts(){
-}
+DDG4ProductionCuts::~DDG4ProductionCuts() {}
 
 /** helper function to compare parts through their name instead of comparing them
     by their pointers. 
     It's guaranteed to produce the same order in subsequent application runs,
     while pointers usually can't guarantee this
 */
-bool dd_is_greater(const std::pair<G4LogicalVolume*, DDLogicalPart> & p1,
-                   const std::pair<G4LogicalVolume*, DDLogicalPart> & p2) {
+bool dd_is_greater(const std::pair<G4LogicalVolume*, DDLogicalPart>& p1,
+                   const std::pair<G4LogicalVolume*, DDLogicalPart>& p2) {
   bool result = false;
   if (p1.second.name().ns() > p2.second.name().ns()) {
     result = true;
@@ -36,77 +36,67 @@ bool dd_is_greater(const std::pair<G4LogicalVolume*, DDLogicalPart> & p1,
     }
     if (p1.second.name().name() == p2.second.name().name()) {
       if (p1.first->GetName() > p2.first->GetName()) {
-	result = true;
+        result = true;
       }
     }
   }
   return result;
-}		   
+}
 
 void DDG4ProductionCuts::update() {
   //
   // Loop over all DDLP and provide the cuts for each region
   //
-  for (G4LogicalVolumeToDDLogicalPartMap::Vector::iterator tit = vec_.begin();
-       tit != vec_.end(); tit++){
-    setProdCuts((*tit).second,(*tit).first);
+  for (G4LogicalVolumeToDDLogicalPartMap::Vector::iterator tit = vec_.begin(); tit != vec_.end(); tit++) {
+    setProdCuts((*tit).second, (*tit).first);
   }
 }
 
-
 void DDG4ProductionCuts::initialize() {
-
   vec_ = map_.all(m_KeywordRegion);
   // sort all root volumes - to get the same sequence at every run of the application.
-  // (otherwise, the sequence will depend on the pointer (memory address) of the 
+  // (otherwise, the sequence will depend on the pointer (memory address) of the
   // involved objects, because 'new' does no guarantee that you allways get a
   // higher (or lower) address when allocating an object of the same type ...
-  sort(vec_.begin(),vec_.end(),&dd_is_greater);
-  if ( m_Verbosity > 0 ) {
-    LogDebug("Physics") <<" DDG4ProductionCuts (New) : starting\n"
-			<<" DDG4ProductionCuts : Got "<<vec_.size()
-			<<" region roots.\n"
-			<<" DDG4ProductionCuts : List of all roots:";
-    for ( size_t jj=0; jj<vec_.size(); ++jj)
-      LogDebug("Physics") << "   DDG4ProductionCuts : root=" 
-			  << vec_[jj].second.name();
+  sort(vec_.begin(), vec_.end(), &dd_is_greater);
+  if (m_Verbosity > 0) {
+    LogDebug("Physics") << " DDG4ProductionCuts (New) : starting\n"
+                        << " DDG4ProductionCuts : Got " << vec_.size() << " region roots.\n"
+                        << " DDG4ProductionCuts : List of all roots:";
+    for (size_t jj = 0; jj < vec_.size(); ++jj)
+      LogDebug("Physics") << "   DDG4ProductionCuts : root=" << vec_[jj].second.name();
   }
 
   // Now generate all the regions
-  for (G4LogicalVolumeToDDLogicalPartMap::Vector::iterator tit = vec_.begin();
-       tit != vec_.end(); tit++) {
+  for (G4LogicalVolumeToDDLogicalPartMap::Vector::iterator tit = vec_.begin(); tit != vec_.end(); tit++) {
+    std::string regionName;
+    unsigned int num = map_.toString(m_KeywordRegion, (*tit).second, regionName);
 
-    std::string  regionName;
-    unsigned int num= map_.toString(m_KeywordRegion,(*tit).second,regionName);
-  
     if (num != 1) {
       throw cms::Exception("SimG4CorePhysics", " DDG4ProductionCuts::initialize: Problem with Region tags.");
     }
-    G4Region * region = getRegion(regionName);
+    G4Region* region = getRegion(regionName);
     region->AddRootLogicalVolume((*tit).first);
-  
-    if ( m_Verbosity > 0 )
-      LogDebug("Physics") << " MakeRegions: added " <<((*tit).first)->GetName()
-			  << " to region " << region->GetName();
+
+    if (m_Verbosity > 0)
+      LogDebug("Physics") << " MakeRegions: added " << ((*tit).first)->GetName() << " to region " << region->GetName();
   }
 }
 
+void DDG4ProductionCuts::setProdCuts(const DDLogicalPart lpart, G4LogicalVolume* lvol) {
+  if (m_Verbosity > 0)
+    LogDebug("Physics") << " DDG4ProductionCuts: inside setProdCuts";
+
+  G4Region* region = nullptr;
+
+  std::string regionName;
+  unsigned int num = map_.toString(m_KeywordRegion, lpart, regionName);
 
-void DDG4ProductionCuts::setProdCuts(const DDLogicalPart lpart, 
-				     G4LogicalVolume* lvol ) {  
-  
-  if ( m_Verbosity > 0 ) 
-    LogDebug("Physics") <<" DDG4ProductionCuts: inside setProdCuts";
-  
-  G4Region * region = nullptr;
-  
-  std::string  regionName;
-  unsigned int num= map_.toString(m_KeywordRegion,lpart,regionName);
-  
   if (num != 1) {
     throw cms::Exception("SimG4CorePhysics", " DDG4ProductionCuts::setProdCuts: Problem with Region tags.");
   }
-  if ( m_Verbosity > 0 ) LogDebug("Physics") << "Using region " << regionName;
+  if (m_Verbosity > 0)
+    LogDebug("Physics") << "Using region " << regionName;
 
   region = getRegion(regionName);
 
@@ -118,48 +108,52 @@ void DDG4ProductionCuts::setProdCuts(const DDLogicalPart lpart,
   double electroncut;
   double positroncut;
   double protoncut = 0.0;
-  int temp =  map_.toDouble("ProdCutsForGamma",lpart,gammacut);
-  if (temp != 1){
-    throw cms::Exception("SimG4CorePhysics", " DDG4ProductionCuts::setProdCuts: Problem with Region tags - no/more than one ProdCutsForGamma.");
+  int temp = map_.toDouble("ProdCutsForGamma", lpart, gammacut);
+  if (temp != 1) {
+    throw cms::Exception(
+        "SimG4CorePhysics",
+        " DDG4ProductionCuts::setProdCuts: Problem with Region tags - no/more than one ProdCutsForGamma.");
   }
-  temp =  map_.toDouble("ProdCutsForElectrons",lpart,electroncut);
-  if (temp != 1){
-    throw cms::Exception("SimG4CorePhysics", " DDG4ProductionCuts::setProdCuts: Problem with Region tags - no/more than one ProdCutsForElectrons.");
+  temp = map_.toDouble("ProdCutsForElectrons", lpart, electroncut);
+  if (temp != 1) {
+    throw cms::Exception(
+        "SimG4CorePhysics",
+        " DDG4ProductionCuts::setProdCuts: Problem with Region tags - no/more than one ProdCutsForElectrons.");
   }
-  temp =  map_.toDouble("ProdCutsForPositrons",lpart,positroncut);
+  temp = map_.toDouble("ProdCutsForPositrons", lpart, positroncut);
   if (temp != 1) {
-    throw cms::Exception("SimG4CorePhysics", " DDG4ProductionCuts::setProdCuts: Problem with Region tags - no/more than one ProdCutsForPositrons.");
+    throw cms::Exception(
+        "SimG4CorePhysics",
+        " DDG4ProductionCuts::setProdCuts: Problem with Region tags - no/more than one ProdCutsForPositrons.");
   }
   //
   // For the moment I assume all of the three are set
   //
-  G4ProductionCuts * prodCuts = getProductionCuts(region);
-  prodCuts->SetProductionCut( gammacut, idxG4GammaCut );
-  prodCuts->SetProductionCut( electroncut, idxG4ElectronCut );
-  prodCuts->SetProductionCut( positroncut, idxG4PositronCut );
+  G4ProductionCuts* prodCuts = getProductionCuts(region);
+  prodCuts->SetProductionCut(gammacut, idxG4GammaCut);
+  prodCuts->SetProductionCut(electroncut, idxG4ElectronCut);
+  prodCuts->SetProductionCut(positroncut, idxG4PositronCut);
   // For recoil use the same cut as for e-
-  if(m_protonCut) { protoncut = electroncut; }
-  prodCuts->SetProductionCut( protoncut, idxG4ProtonCut );
-  if ( m_Verbosity > 0 ) {
-    LogDebug("Physics") << "DDG4ProductionCuts : Setting cuts for " 
-			<< regionName << "\n    Electrons: " << electroncut
-			<< "\n    Positrons: " << positroncut
-			<< "\n    Gamma    : " << gammacut;
+  if (m_protonCut) {
+    protoncut = electroncut;
+  }
+  prodCuts->SetProductionCut(protoncut, idxG4ProtonCut);
+  if (m_Verbosity > 0) {
+    LogDebug("Physics") << "DDG4ProductionCuts : Setting cuts for " << regionName << "\n    Electrons: " << electroncut
+                        << "\n    Positrons: " << positroncut << "\n    Gamma    : " << gammacut;
   }
 }
 
-G4Region * DDG4ProductionCuts::getRegion(const std::string & regName) {
-  G4Region * reg =  G4RegionStore::GetInstance()->FindOrCreateRegion (regName);
+G4Region* DDG4ProductionCuts::getRegion(const std::string& regName) {
+  G4Region* reg = G4RegionStore::GetInstance()->FindOrCreateRegion(regName);
   return reg;
 }
 
-G4ProductionCuts * DDG4ProductionCuts::getProductionCuts( G4Region* reg ) {
-
-  G4ProductionCuts * prodCuts = reg->GetProductionCuts();
-  if( !prodCuts ) {
+G4ProductionCuts* DDG4ProductionCuts::getProductionCuts(G4Region* reg) {
+  G4ProductionCuts* prodCuts = reg->GetProductionCuts();
+  if (!prodCuts) {
     prodCuts = new G4ProductionCuts();
     reg->SetProductionCuts(prodCuts);
   }
   return prodCuts;
 }
-
diff --git a/SimG4Core/Physics/src/G4ProcessTypeEnumerator.cc b/SimG4Core/Physics/src/G4ProcessTypeEnumerator.cc
index c33825a553fa2..2426c4221209a 100644
--- a/SimG4Core/Physics/src/G4ProcessTypeEnumerator.cc
+++ b/SimG4Core/Physics/src/G4ProcessTypeEnumerator.cc
@@ -1,80 +1,61 @@
 #include "SimG4Core/Physics/interface/G4ProcessTypeEnumerator.h"
 
 static const int nprocesses = 49;
-static const std::string g4processes[nprocesses] = { "Primary", 
-  "Transportation",  "CoupleTrans",  "CoulombScat",  "Ionisation",  "Brems",
-  "PairProdCharged",  "Annih",  "AnnihToMuMu",  "AnnihToHad",  "NuclearStopp",
-  "Msc",  "Rayleigh",  "PhotoElectric",  "Compton",  "Conv",
-  "ConvToMuMu",  "Cerenkov",  "Scintillation",  "SynchRad",  "TransRad",
-  "OpAbsorp",  "OpBoundary",  "OpRayleigh",  "OpWLS",  "OpMieHG",
-  "DNAElastic",  "DNAExcit",  "DNAIonisation",  "DNAVibExcit",  "DNAAttachment",
-  "DNAChargeDec",  "DNAChargeInc",  "HadElastic",  "HadInelastic",  "HadCapture",
-  "HadFission",  "HadAtRest",  "HadCEX",  "Decay",  "DecayWSpin",
-  "DecayPiWSpin",  "DecayRadio",  "DecayUnKnown",  "DecayExt", "GFlash", "StepLimiter",
-  "UsrSpecCuts", "NeutronKiller"}; 
-static const int g4subtype[nprocesses] = { 
-  0,   // Primary generator
-  91,  // Transportation
-  92,  // CoupleTrans
-  1,   // CoulombScat
-  2,   // Ionisation
-  3,   // Brems
-  4,   // PairProdCharged
-  5,   // Annih
-  6,   // AnnihToMuMu
-  7,   // AnnihToHad
-  8,   // NuclearStopp
-  10,  // Msc
-  11,  //
-  12,  // PhotoElectric
-  13,  // Compton
-  14,  // Conv
-  15,  // ConvToMuMu
-  21,  
-  22,  
-  23,  
-  24,
-  31,  
-  32,  
-  33,  
-  34,  
-  35,  
-  51,  
-  52,  
-  53,  
-  54,  
-  55,
-  56,  
-  57,  
-  111, // HadElastic 
-  121, // HadInelastic
-  131, // HadCapture 
-  141, // HadFission
-  151, // HadAtRest 
-  161,  
-  201, // Decay 
-  202, // DecayWSpin
-  203, // DecayPiWSpin
-  210, // DecayRadio
-  211, // DecayUnKnown
-  231, // DecayExt
-  301, // GFlash
-  401, // StepLimiter
-  402,
-  403  // NeutronKiller
-}; 
+static const std::string g4processes[nprocesses] = {
+    "Primary",         "Transportation", "CoupleTrans",  "CoulombScat", "Ionisation",    "Brems",
+    "PairProdCharged", "Annih",          "AnnihToMuMu",  "AnnihToHad",  "NuclearStopp",  "Msc",
+    "Rayleigh",        "PhotoElectric",  "Compton",      "Conv",        "ConvToMuMu",    "Cerenkov",
+    "Scintillation",   "SynchRad",       "TransRad",     "OpAbsorp",    "OpBoundary",    "OpRayleigh",
+    "OpWLS",           "OpMieHG",        "DNAElastic",   "DNAExcit",    "DNAIonisation", "DNAVibExcit",
+    "DNAAttachment",   "DNAChargeDec",   "DNAChargeInc", "HadElastic",  "HadInelastic",  "HadCapture",
+    "HadFission",      "HadAtRest",      "HadCEX",       "Decay",       "DecayWSpin",    "DecayPiWSpin",
+    "DecayRadio",      "DecayUnKnown",   "DecayExt",     "GFlash",      "StepLimiter",   "UsrSpecCuts",
+    "NeutronKiller"};
+static const int g4subtype[nprocesses] = {
+    0,   // Primary generator
+    91,  // Transportation
+    92,  // CoupleTrans
+    1,   // CoulombScat
+    2,   // Ionisation
+    3,   // Brems
+    4,   // PairProdCharged
+    5,   // Annih
+    6,   // AnnihToMuMu
+    7,   // AnnihToHad
+    8,   // NuclearStopp
+    10,  // Msc
+    11,  //
+    12,  // PhotoElectric
+    13,  // Compton
+    14,  // Conv
+    15,  // ConvToMuMu
+    21,  22, 23, 24, 31, 32, 33, 34, 35, 51, 52, 53, 54, 55, 56, 57,
+    111,  // HadElastic
+    121,  // HadInelastic
+    131,  // HadCapture
+    141,  // HadFission
+    151,  // HadAtRest
+    161,
+    201,  // Decay
+    202,  // DecayWSpin
+    203,  // DecayPiWSpin
+    210,  // DecayRadio
+    211,  // DecayUnKnown
+    231,  // DecayExt
+    301,  // GFlash
+    401,  // StepLimiter
+    402,
+    403  // NeutronKiller
+};
 
-G4ProcessTypeEnumerator::G4ProcessTypeEnumerator()
-{}
+G4ProcessTypeEnumerator::G4ProcessTypeEnumerator() {}
 
-G4ProcessTypeEnumerator::~G4ProcessTypeEnumerator()
-{}
+G4ProcessTypeEnumerator::~G4ProcessTypeEnumerator() {}
 
-std::string G4ProcessTypeEnumerator::processG4Name(int idx) const
-{
+std::string G4ProcessTypeEnumerator::processG4Name(int idx) const {
   std::string res = "";
-  for(int i=0; i<nprocesses; ++i) {
-    if(idx == g4subtype[i]) {
+  for (int i = 0; i < nprocesses; ++i) {
+    if (idx == g4subtype[i]) {
       res = g4processes[i];
       break;
     }
@@ -82,11 +63,10 @@ std::string G4ProcessTypeEnumerator::processG4Name(int idx) const
   return res;
 }
 
-int G4ProcessTypeEnumerator::processId(const std::string& name) const
-{
+int G4ProcessTypeEnumerator::processId(const std::string& name) const {
   int idx = 0;
-  for(int i=0; i<nprocesses; ++i) {
-    if(name == g4processes[i]) {
+  for (int i = 0; i < nprocesses; ++i) {
+    if (name == g4processes[i]) {
       idx = g4subtype[i];
       break;
     }
diff --git a/SimG4Core/Physics/src/Monopole.cc b/SimG4Core/Physics/src/Monopole.cc
index cec13eed53d2f..9af72cfcd0739 100644
--- a/SimG4Core/Physics/src/Monopole.cc
+++ b/SimG4Core/Physics/src/Monopole.cc
@@ -3,18 +3,14 @@
 #include "G4ParticleTable.hh"
 #include "CLHEP/Units/PhysicalConstants.h"
 
-Monopole::Monopole(const G4String& aName, G4int pdgEncoding, G4double mass,
-                   G4int mCharge, G4int eCharge) : G4ParticleDefinition(aName, 
-                   mass,  0.0, CLHEP::eplus*eCharge, 0, 0, 0, 
-		   0, 0, 0, "boson", 0, 0, pdgEncoding, true, -1.0, nullptr) {
+Monopole::Monopole(const G4String& aName, G4int pdgEncoding, G4double mass, G4int mCharge, G4int eCharge)
+    : G4ParticleDefinition(
+          aName, mass, 0.0, CLHEP::eplus * eCharge, 0, 0, 0, 0, 0, 0, "boson", 0, 0, pdgEncoding, true, -1.0, nullptr) {
+  magCharge = CLHEP::eplus * G4double(mCharge) * 0.5 / CLHEP::fine_structure_const;
 
-  magCharge = CLHEP::eplus*G4double(mCharge)*0.5/CLHEP::fine_structure_const;
-
-  edm::LogInfo("Monopole") << "Monopole is created: m(GeV)= " 
-			     << GetPDGMass()/CLHEP::GeV 
-			     << " Qel= " << GetPDGCharge()/CLHEP::eplus
-			     << " Qmag= " << magCharge/CLHEP::eplus
-			     << " PDG encoding = " << pdgEncoding;
+  edm::LogInfo("Monopole") << "Monopole is created: m(GeV)= " << GetPDGMass() / CLHEP::GeV
+                           << " Qel= " << GetPDGCharge() / CLHEP::eplus << " Qmag= " << magCharge / CLHEP::eplus
+                           << " PDG encoding = " << pdgEncoding;
 }
 
 Monopole::~Monopole() {}
diff --git a/SimG4Core/Physics/src/PhysicsList.cc b/SimG4Core/Physics/src/PhysicsList.cc
index 1081654f55417..46fa56f8e0602 100644
--- a/SimG4Core/Physics/src/PhysicsList.cc
+++ b/SimG4Core/Physics/src/PhysicsList.cc
@@ -1,11 +1,7 @@
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 
-PhysicsList::PhysicsList(const edm::ParameterSet &) {
-}
- 
-PhysicsList::~PhysicsList() {
-}
+PhysicsList::PhysicsList(const edm::ParameterSet &) {}
 
-void PhysicsList::SetCuts() { 
-}
+PhysicsList::~PhysicsList() {}
 
+void PhysicsList::SetCuts() {}
diff --git a/SimG4Core/Physics/src/PhysicsListFactory.cc b/SimG4Core/Physics/src/PhysicsListFactory.cc
index b56f10648fa2c..4877a1a09171e 100644
--- a/SimG4Core/Physics/src/PhysicsListFactory.cc
+++ b/SimG4Core/Physics/src/PhysicsListFactory.cc
@@ -1,3 +1,3 @@
 #include "SimG4Core/Physics/interface/PhysicsListFactory.h"
 
-EDM_REGISTER_PLUGINFACTORY(PhysicsListFactory,"CMS Simulation PhysicsListFactory");
+EDM_REGISTER_PLUGINFACTORY(PhysicsListFactory, "CMS Simulation PhysicsListFactory");
diff --git a/SimG4Core/PhysicsLists/interface/CMSEmNoDeltaRay.h b/SimG4Core/PhysicsLists/interface/CMSEmNoDeltaRay.h
index 5013fa261275c..0d95942f6342b 100644
--- a/SimG4Core/PhysicsLists/interface/CMSEmNoDeltaRay.h
+++ b/SimG4Core/PhysicsLists/interface/CMSEmNoDeltaRay.h
@@ -7,8 +7,7 @@
 #include <string>
 
 class CMSEmNoDeltaRay : public G4VPhysicsConstructor {
-
-public: 
+public:
   CMSEmNoDeltaRay(const G4String& name, G4int ver, const std::string& reg);
   ~CMSEmNoDeltaRay() override;
 
@@ -16,14 +15,8 @@ class CMSEmNoDeltaRay : public G4VPhysicsConstructor {
   void ConstructProcess() override;
 
 private:
-  G4int               verbose;
-  std::string         region;
+  G4int verbose;
+  std::string region;
 };
 
 #endif
-
-
-
-
-
-
diff --git a/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics.h b/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics.h
index 9dcff3931057a..2c268d6368fbd 100644
--- a/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics.h
+++ b/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics.h
@@ -5,8 +5,7 @@
 #include "globals.hh"
 
 class CMSEmStandardPhysics : public G4VPhysicsConstructor {
-
-public: 
+public:
   CMSEmStandardPhysics(G4int ver);
   ~CMSEmStandardPhysics() override;
 
@@ -14,13 +13,7 @@ class CMSEmStandardPhysics : public G4VPhysicsConstructor {
   void ConstructProcess() override;
 
 private:
-  G4int               verbose;
+  G4int verbose;
 };
 
 #endif
-
-
-
-
-
-
diff --git a/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics95.h b/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics95.h
index 339b7c42465c1..e99443d5e5a3d 100644
--- a/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics95.h
+++ b/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics95.h
@@ -7,8 +7,7 @@
 #include <string>
 
 class CMSEmStandardPhysics95 : public G4VPhysicsConstructor {
-
-public: 
+public:
   CMSEmStandardPhysics95(const G4String& name, G4int ver, const std::string& reg);
   ~CMSEmStandardPhysics95() override;
 
@@ -16,14 +15,8 @@ class CMSEmStandardPhysics95 : public G4VPhysicsConstructor {
   void ConstructProcess() override;
 
 private:
-  G4int               verbose;
-  std::string         region;
+  G4int verbose;
+  std::string region;
 };
 
 #endif
-
-
-
-
-
-
diff --git a/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics95msc93.h b/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics95msc93.h
index 14b711863c2c9..6d5eab01ad0c5 100644
--- a/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics95msc93.h
+++ b/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysics95msc93.h
@@ -7,8 +7,7 @@
 #include <string>
 
 class CMSEmStandardPhysics95msc93 : public G4VPhysicsConstructor {
-
-public: 
+public:
   CMSEmStandardPhysics95msc93(const G4String& name, G4int ver, const std::string& reg);
   ~CMSEmStandardPhysics95msc93() override;
 
@@ -16,14 +15,8 @@ class CMSEmStandardPhysics95msc93 : public G4VPhysicsConstructor {
   void ConstructProcess() override;
 
 private:
-  G4int               verbose;
-  std::string         region;
+  G4int verbose;
+  std::string region;
 };
 
 #endif
-
-
-
-
-
-
diff --git a/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsLPM.h b/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsLPM.h
index 3727ece2b7c9d..31b8466dcf193 100644
--- a/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsLPM.h
+++ b/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsLPM.h
@@ -6,8 +6,7 @@
 #include "globals.hh"
 
 class CMSEmStandardPhysicsLPM : public G4VPhysicsConstructor {
-
-public: 
+public:
   CMSEmStandardPhysicsLPM(G4int ver);
   ~CMSEmStandardPhysicsLPM() override;
 
@@ -15,13 +14,7 @@ class CMSEmStandardPhysicsLPM : public G4VPhysicsConstructor {
   void ConstructProcess() override;
 
 private:
-  G4int               verbose;
+  G4int verbose;
 };
 
 #endif
-
-
-
-
-
-
diff --git a/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsXS.h b/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsXS.h
index ffa75285c61c1..d0a9b520d81a2 100644
--- a/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsXS.h
+++ b/SimG4Core/PhysicsLists/interface/CMSEmStandardPhysicsXS.h
@@ -5,8 +5,7 @@
 #include "globals.hh"
 
 class CMSEmStandardPhysicsXS : public G4VPhysicsConstructor {
-
-public: 
+public:
   CMSEmStandardPhysicsXS(G4int ver);
   ~CMSEmStandardPhysicsXS() override;
 
@@ -14,13 +13,7 @@ class CMSEmStandardPhysicsXS : public G4VPhysicsConstructor {
   void ConstructProcess() override;
 
 private:
-  G4int               verbose;
+  G4int verbose;
 };
 
 #endif
-
-
-
-
-
-
diff --git a/SimG4Core/PhysicsLists/interface/CMSFTFPNeutronBuilder.hh b/SimG4Core/PhysicsLists/interface/CMSFTFPNeutronBuilder.hh
index b88fbc2e31f29..87e447a23a2ed 100644
--- a/SimG4Core/PhysicsLists/interface/CMSFTFPNeutronBuilder.hh
+++ b/SimG4Core/PhysicsLists/interface/CMSFTFPNeutronBuilder.hh
@@ -18,34 +18,32 @@
 #include "G4ExcitedStringDecay.hh"
 #include "G4QuasiElasticChannel.hh"
 
-class CMSFTFPNeutronBuilder : public G4VNeutronBuilder
-{
-  public: 
-    CMSFTFPNeutronBuilder(G4bool quasiElastic=false);
-    ~CMSFTFPNeutronBuilder() override;
-
-  public: 
-    void Build(G4HadronElasticProcess * aP) override;
-    void Build(G4HadronFissionProcess * aP) override;
-    void Build(G4HadronCaptureProcess * aP) override;
-    void Build(G4NeutronInelasticProcess * aP) override;
-    
-    void SetMinEnergy(G4double aM) override {theMin = aM;}
-    void SetMaxEnergy(G4double aM) override {theMax = aM;}
-
-  private:
-    G4TheoFSGenerator * theModel;
-    G4PreCompoundModel * thePreEquilib;
-    G4GeneratorPrecompoundInterface * theCascade;
-    G4FTFModel * theStringModel;
-    G4ExcitedStringDecay * theStringDecay;
-    G4QuasiElasticChannel * theQuasiElastic;
-
-    G4double theMin;
-    G4double theMax;
+class CMSFTFPNeutronBuilder : public G4VNeutronBuilder {
+public:
+  CMSFTFPNeutronBuilder(G4bool quasiElastic = false);
+  ~CMSFTFPNeutronBuilder() override;
+
+public:
+  void Build(G4HadronElasticProcess* aP) override;
+  void Build(G4HadronFissionProcess* aP) override;
+  void Build(G4HadronCaptureProcess* aP) override;
+  void Build(G4NeutronInelasticProcess* aP) override;
+
+  void SetMinEnergy(G4double aM) override { theMin = aM; }
+  void SetMaxEnergy(G4double aM) override { theMax = aM; }
+
+private:
+  G4TheoFSGenerator* theModel;
+  G4PreCompoundModel* thePreEquilib;
+  G4GeneratorPrecompoundInterface* theCascade;
+  G4FTFModel* theStringModel;
+  G4ExcitedStringDecay* theStringDecay;
+  G4QuasiElasticChannel* theQuasiElastic;
+
+  G4double theMin;
+  G4double theMax;
 };
 
 // 2002 by J.P. Wellisch
 
 #endif
-
diff --git a/SimG4Core/PhysicsLists/interface/CMSFTFPPiKBuilder.hh b/SimG4Core/PhysicsLists/interface/CMSFTFPPiKBuilder.hh
index 49f7b39066542..73b07edec8082 100644
--- a/SimG4Core/PhysicsLists/interface/CMSFTFPPiKBuilder.hh
+++ b/SimG4Core/PhysicsLists/interface/CMSFTFPPiKBuilder.hh
@@ -20,39 +20,36 @@
 
 #include "G4PiNuclearCrossSection.hh"
 
-class CMSFTFPPiKBuilder : public G4VPiKBuilder
-{
-  public: 
-    CMSFTFPPiKBuilder(G4bool quasiElastic=false);
-    ~CMSFTFPPiKBuilder() override;
-
-  public: 
-    void Build(G4HadronElasticProcess * aP) override;
-    void Build(G4PionPlusInelasticProcess * aP) override;
-    void Build(G4PionMinusInelasticProcess * aP) override;
-    void Build(G4KaonPlusInelasticProcess * aP) override;
-    void Build(G4KaonMinusInelasticProcess * aP) override;
-    void Build(G4KaonZeroLInelasticProcess * aP) override;
-    void Build(G4KaonZeroSInelasticProcess * aP) override;
-    
-    void SetMinEnergy(G4double aM) override {theMin = aM;}
-    void SetMaxEnergy(G4double aM) override {theMax = aM;}
-
-  private:
-    G4TheoFSGenerator * theModel;
-    G4PreCompoundModel * thePreEquilib;
-    G4GeneratorPrecompoundInterface * theCascade;
-    G4FTFModel * theStringModel;
-    G4ExcitedStringDecay * theStringDecay;
-    G4QuasiElasticChannel * theQuasiElastic;
-
-    G4PiNuclearCrossSection* thePiData;
-    G4double theMin;
-    G4double theMax;
-
+class CMSFTFPPiKBuilder : public G4VPiKBuilder {
+public:
+  CMSFTFPPiKBuilder(G4bool quasiElastic = false);
+  ~CMSFTFPPiKBuilder() override;
+
+public:
+  void Build(G4HadronElasticProcess* aP) override;
+  void Build(G4PionPlusInelasticProcess* aP) override;
+  void Build(G4PionMinusInelasticProcess* aP) override;
+  void Build(G4KaonPlusInelasticProcess* aP) override;
+  void Build(G4KaonMinusInelasticProcess* aP) override;
+  void Build(G4KaonZeroLInelasticProcess* aP) override;
+  void Build(G4KaonZeroSInelasticProcess* aP) override;
+
+  void SetMinEnergy(G4double aM) override { theMin = aM; }
+  void SetMaxEnergy(G4double aM) override { theMax = aM; }
+
+private:
+  G4TheoFSGenerator* theModel;
+  G4PreCompoundModel* thePreEquilib;
+  G4GeneratorPrecompoundInterface* theCascade;
+  G4FTFModel* theStringModel;
+  G4ExcitedStringDecay* theStringDecay;
+  G4QuasiElasticChannel* theQuasiElastic;
+
+  G4PiNuclearCrossSection* thePiData;
+  G4double theMin;
+  G4double theMax;
 };
 
 // 2002 by J.P. Wellisch
 
 #endif
-
diff --git a/SimG4Core/PhysicsLists/interface/CMSFTFPProtonBuilder.hh b/SimG4Core/PhysicsLists/interface/CMSFTFPProtonBuilder.hh
index 38c360d849d2c..d04cbb79b7f3c 100644
--- a/SimG4Core/PhysicsLists/interface/CMSFTFPProtonBuilder.hh
+++ b/SimG4Core/PhysicsLists/interface/CMSFTFPProtonBuilder.hh
@@ -1,5 +1,5 @@
 #ifndef SimG4Core_PhysicsLists_CMSFTFPProtonBuilder_h
-#define SimG4Core_PhysicsLists_CMSFTFPProtonBuilder_h 
+#define SimG4Core_PhysicsLists_CMSFTFPProtonBuilder_h
 
 #include "globals.hh"
 
@@ -18,33 +18,30 @@
 #include "G4ExcitedStringDecay.hh"
 #include "G4QuasiElasticChannel.hh"
 
-class CMSFTFPProtonBuilder : public G4VProtonBuilder
-{
-  public: 
-    CMSFTFPProtonBuilder(G4bool quasiElastic=false);
-    ~CMSFTFPProtonBuilder() override;
-
-  public: 
-    void Build(G4HadronElasticProcess * aP) override;
-    void Build(G4ProtonInelasticProcess * aP) override;
-    
-    void SetMinEnergy(G4double aM) override {theMin = aM;}
-    void SetMaxEnergy(G4double aM) override {theMax = aM;}
-
-  private:
-    G4TheoFSGenerator * theModel;
-    G4PreCompoundModel * thePreEquilib;
-    G4GeneratorPrecompoundInterface * theCascade;
-    G4FTFModel * theStringModel;
-    G4ExcitedStringDecay * theStringDecay;
-    G4QuasiElasticChannel * theQuasiElastic;
-
-    G4double theMin;
-    G4double theMax;
+class CMSFTFPProtonBuilder : public G4VProtonBuilder {
+public:
+  CMSFTFPProtonBuilder(G4bool quasiElastic = false);
+  ~CMSFTFPProtonBuilder() override;
 
+public:
+  void Build(G4HadronElasticProcess* aP) override;
+  void Build(G4ProtonInelasticProcess* aP) override;
+
+  void SetMinEnergy(G4double aM) override { theMin = aM; }
+  void SetMaxEnergy(G4double aM) override { theMax = aM; }
+
+private:
+  G4TheoFSGenerator* theModel;
+  G4PreCompoundModel* thePreEquilib;
+  G4GeneratorPrecompoundInterface* theCascade;
+  G4FTFModel* theStringModel;
+  G4ExcitedStringDecay* theStringDecay;
+  G4QuasiElasticChannel* theQuasiElastic;
+
+  G4double theMin;
+  G4double theMax;
 };
 
 // 2002 by J.P. Wellisch
 
 #endif
-
diff --git a/SimG4Core/PhysicsLists/interface/CMSHadronPhysicsFTFP_BERT.h b/SimG4Core/PhysicsLists/interface/CMSHadronPhysicsFTFP_BERT.h
index caddf1a9b0c1f..64f9f18c14506 100644
--- a/SimG4Core/PhysicsLists/interface/CMSHadronPhysicsFTFP_BERT.h
+++ b/SimG4Core/PhysicsLists/interface/CMSHadronPhysicsFTFP_BERT.h
@@ -21,46 +21,45 @@
 class G4ComponentGGHadronNucleusXsc;
 class G4VCrossSectionDataSet;
 
-class CMSHadronPhysicsFTFP_BERT : public G4VPhysicsConstructor
-{
-  public: 
-    explicit CMSHadronPhysicsFTFP_BERT(G4int verbose =1);
-    ~CMSHadronPhysicsFTFP_BERT() override;
+class CMSHadronPhysicsFTFP_BERT : public G4VPhysicsConstructor {
+public:
+  explicit CMSHadronPhysicsFTFP_BERT(G4int verbose = 1);
+  ~CMSHadronPhysicsFTFP_BERT() override;
 
-    void ConstructParticle() override;
-    //This will call in order:
-    // DumpBanner (for master)
-    // CreateModels
-    // ExtraConfiguation
-    void ConstructProcess() override;
+  void ConstructParticle() override;
+  //This will call in order:
+  // DumpBanner (for master)
+  // CreateModels
+  // ExtraConfiguation
+  void ConstructProcess() override;
 
-    void TerminateWorker() override;
-  protected:
-    G4bool QuasiElastic;
-    //This calls the specific ones for the different particles in order
-    virtual void CreateModels();
-    virtual void Neutron();
-    virtual void Proton();
-    virtual void Pion();
-    virtual void Kaon();
-    virtual void Others();
-    virtual void DumpBanner();
-    //This contains extra configurataion specific to this PL
-    virtual void ExtraConfiguration();
+  void TerminateWorker() override;
 
-    G4double minFTFP_pion;
-    G4double maxBERT_pion;
-    G4double minFTFP_kaon;
-    G4double maxBERT_kaon;
-    G4double minFTFP_proton;
-    G4double maxBERT_proton;
-    G4double minFTFP_neutron;
-    G4double maxBERT_neutron;
+protected:
+  G4bool QuasiElastic;
+  //This calls the specific ones for the different particles in order
+  virtual void CreateModels();
+  virtual void Neutron();
+  virtual void Proton();
+  virtual void Pion();
+  virtual void Kaon();
+  virtual void Others();
+  virtual void DumpBanner();
+  //This contains extra configurataion specific to this PL
+  virtual void ExtraConfiguration();
 
-    //Thread-private data write them here to delete them
-    G4VectorCache<G4VCrossSectionDataSet*> xs_ds;
-    G4Cache<G4ComponentGGHadronNucleusXsc*> xs_k;
+  G4double minFTFP_pion;
+  G4double maxBERT_pion;
+  G4double minFTFP_kaon;
+  G4double maxBERT_kaon;
+  G4double minFTFP_proton;
+  G4double maxBERT_proton;
+  G4double minFTFP_neutron;
+  G4double maxBERT_neutron;
+
+  //Thread-private data write them here to delete them
+  G4VectorCache<G4VCrossSectionDataSet*> xs_ds;
+  G4Cache<G4ComponentGGHadronNucleusXsc*> xs_k;
 };
 
 #endif
-
diff --git a/SimG4Core/PhysicsLists/interface/CMSHadronPhysicsFTFP_BERT_ATL.h b/SimG4Core/PhysicsLists/interface/CMSHadronPhysicsFTFP_BERT_ATL.h
index c0ea2254769f4..385d50dd89c3b 100644
--- a/SimG4Core/PhysicsLists/interface/CMSHadronPhysicsFTFP_BERT_ATL.h
+++ b/SimG4Core/PhysicsLists/interface/CMSHadronPhysicsFTFP_BERT_ATL.h
@@ -36,44 +36,42 @@
 
 class G4ComponentGGHadronNucleusXsc;
 
-class CMSHadronPhysicsFTFP_BERT_ATL : public G4VPhysicsConstructor
-{
-  public:
-    CMSHadronPhysicsFTFP_BERT_ATL(G4int verbose =1);
-    ~CMSHadronPhysicsFTFP_BERT_ATL() override;
-
-    void ConstructParticle() override;
-    void ConstructProcess() override;
-
-  private:
-    void CreateModels();
-    G4bool QuasiElastic;
-
-    // Simplify handling of TLS data, encapsulate everyhing in a structure
-    struct ThreadPrivate { 
-      G4NeutronBuilder * theNeutrons;
-      G4BertiniNeutronBuilder * theBertiniNeutron;
-      G4FTFPNeutronBuilder * theFTFPNeutron;
- 
-      G4PiKBuilder * thePiK;
-      G4BertiniPiKBuilder * theBertiniPiK;
-      G4FTFPPiKBuilder * theFTFPPiK;
-    
-      G4ProtonBuilder * thePro;
-      G4BertiniProtonBuilder * theBertiniPro;
-      G4FTFPProtonBuilder * theFTFPPro;    
-    
-      G4HyperonFTFPBuilder * theHyperon;
-    
-      G4AntiBarionBuilder * theAntiBaryon;
-      G4FTFPAntiBarionBuilder * theFTFPAntiBaryon;
-
-      G4ComponentGGHadronNucleusXsc * xsKaon;
-      G4VCrossSectionDataSet * xsNeutronInelasticXS;
-      G4VCrossSectionDataSet * xsNeutronCaptureXS;
-    };
-    static G4ThreadLocal ThreadPrivate* tpdata;
+class CMSHadronPhysicsFTFP_BERT_ATL : public G4VPhysicsConstructor {
+public:
+  CMSHadronPhysicsFTFP_BERT_ATL(G4int verbose = 1);
+  ~CMSHadronPhysicsFTFP_BERT_ATL() override;
+
+  void ConstructParticle() override;
+  void ConstructProcess() override;
+
+private:
+  void CreateModels();
+  G4bool QuasiElastic;
+
+  // Simplify handling of TLS data, encapsulate everyhing in a structure
+  struct ThreadPrivate {
+    G4NeutronBuilder* theNeutrons;
+    G4BertiniNeutronBuilder* theBertiniNeutron;
+    G4FTFPNeutronBuilder* theFTFPNeutron;
+
+    G4PiKBuilder* thePiK;
+    G4BertiniPiKBuilder* theBertiniPiK;
+    G4FTFPPiKBuilder* theFTFPPiK;
+
+    G4ProtonBuilder* thePro;
+    G4BertiniProtonBuilder* theBertiniPro;
+    G4FTFPProtonBuilder* theFTFPPro;
+
+    G4HyperonFTFPBuilder* theHyperon;
+
+    G4AntiBarionBuilder* theAntiBaryon;
+    G4FTFPAntiBarionBuilder* theFTFPAntiBaryon;
+
+    G4ComponentGGHadronNucleusXsc* xsKaon;
+    G4VCrossSectionDataSet* xsNeutronInelasticXS;
+    G4VCrossSectionDataSet* xsNeutronCaptureXS;
+  };
+  static G4ThreadLocal ThreadPrivate* tpdata;
 };
 
 #endif
-
diff --git a/SimG4Core/PhysicsLists/interface/CMSMonopolePhysics.h b/SimG4Core/PhysicsLists/interface/CMSMonopolePhysics.h
index ff9cac7fbe3bc..a3ae5c777667d 100644
--- a/SimG4Core/PhysicsLists/interface/CMSMonopolePhysics.h
+++ b/SimG4Core/PhysicsLists/interface/CMSMonopolePhysics.h
@@ -16,22 +16,20 @@ namespace sim {
 }
 
 class CMSMonopolePhysics : public G4VPhysicsConstructor {
-
-public: 
-  CMSMonopolePhysics(const HepPDT::ParticleDataTable * table_, const edm::ParameterSet & p);
+public:
+  CMSMonopolePhysics(const HepPDT::ParticleDataTable* table_, const edm::ParameterSet& p);
   ~CMSMonopolePhysics() override;
 
   void ConstructParticle() override;
   void ConstructProcess() override;
 
 private:
-
-  G4int                    verbose, magCharge;
-  G4bool                   deltaRay, multiSc, transport;
+  G4int verbose, magCharge;
+  G4bool deltaRay, multiSc, transport;
   std::vector<std::string> names;
-  std::vector<double>      masses;
-  std::vector<int>         elCharges, pdgEncodings;
-  std::vector<Monopole*>   monopoles;
+  std::vector<double> masses;
+  std::vector<int> elCharges, pdgEncodings;
+  std::vector<Monopole*> monopoles;
 };
 
 #endif
diff --git a/SimG4Core/PhysicsLists/interface/CMSThermalNeutrons.h b/SimG4Core/PhysicsLists/interface/CMSThermalNeutrons.h
index 7db5e973bf6a3..c03a582548b1f 100644
--- a/SimG4Core/PhysicsLists/interface/CMSThermalNeutrons.h
+++ b/SimG4Core/PhysicsLists/interface/CMSThermalNeutrons.h
@@ -5,21 +5,14 @@
 #include "globals.hh"
 
 class CMSThermalNeutrons : public G4VHadronPhysics {
-
-public: 
+public:
   CMSThermalNeutrons(G4int ver);
   ~CMSThermalNeutrons() override;
 
   void ConstructProcess() override;
 
 private:
-  G4int               verbose;
+  G4int verbose;
 };
 
 #endif
-
-
-
-
-
-
diff --git a/SimG4Core/PhysicsLists/interface/CMSmplIonisation.h b/SimG4Core/PhysicsLists/interface/CMSmplIonisation.h
index 002fb0cb1d13b..6928fac004a60 100644
--- a/SimG4Core/PhysicsLists/interface/CMSmplIonisation.h
+++ b/SimG4Core/PhysicsLists/interface/CMSmplIonisation.h
@@ -14,8 +14,8 @@
 //
 // This class manages the ionisation process for a magnetic monopole
 // it inherites from G4VContinuousDiscreteProcess via G4VEnergyLossProcess.
-// Magnetic charge of the monopole should be defined in the constructor of 
-// the process, unless it is assumed that it is classic Dirac monopole with 
+// Magnetic charge of the monopole should be defined in the constructor of
+// the process, unless it is assumed that it is classic Dirac monopole with
 // the charge 67.5*eplus. The name of the particle should be "monopole".
 //
 
@@ -32,20 +32,15 @@
 class G4Material;
 class G4VEmFluctuationModel;
 
-class CMSmplIonisation : public G4VEnergyLossProcess
-{
-
+class CMSmplIonisation : public G4VEnergyLossProcess {
 public:
-
-  explicit CMSmplIonisation(G4double mCharge = 0.0, 
-                           const G4String& name = "mplIoni");
+  explicit CMSmplIonisation(G4double mCharge = 0.0, const G4String& name = "mplIoni");
 
   ~CMSmplIonisation() override;
 
   G4bool IsApplicable(const G4ParticleDefinition& p) override;
 
-  G4double MinPrimaryEnergy(const G4ParticleDefinition* p,
-                                    const G4Material*, G4double cut) final;
+  G4double MinPrimaryEnergy(const G4ParticleDefinition* p, const G4Material*, G4double cut) final;
 
   // Print out of the class parameters
   void PrintInfo() override;
@@ -54,14 +49,11 @@ class CMSmplIonisation : public G4VEnergyLossProcess
   void ProcessDescription(std::ostream&) const override;
 
 protected:
-
-  void InitialiseEnergyLossProcess(const G4ParticleDefinition*,
-                                   const G4ParticleDefinition*) override;
+  void InitialiseEnergyLossProcess(const G4ParticleDefinition*, const G4ParticleDefinition*) override;
 
 private:
-
-  G4double    magneticCharge;
-  G4bool      isInitialised;
+  G4double magneticCharge;
+  G4bool isInitialised;
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/SimG4Core/PhysicsLists/interface/CMSmplIonisationWithDeltaModel.h b/SimG4Core/PhysicsLists/interface/CMSmplIonisationWithDeltaModel.h
index 7d3ac690117a8..565437f923f1d 100644
--- a/SimG4Core/PhysicsLists/interface/CMSmplIonisationWithDeltaModel.h
+++ b/SimG4Core/PhysicsLists/interface/CMSmplIonisationWithDeltaModel.h
@@ -26,73 +26,58 @@
 
 class G4ParticleChangeForLoss;
 
-class CMSmplIonisationWithDeltaModel : public G4VEmModel, public G4VEmFluctuationModel
-{
-
+class CMSmplIonisationWithDeltaModel : public G4VEmModel, public G4VEmFluctuationModel {
 public:
-
-  explicit CMSmplIonisationWithDeltaModel(G4double mCharge, 
-                                const G4String& nam = "mplIonisationWithDelta");
+  explicit CMSmplIonisationWithDeltaModel(G4double mCharge, const G4String& nam = "mplIonisationWithDelta");
 
   ~CMSmplIonisationWithDeltaModel() override;
 
-  void Initialise(const G4ParticleDefinition*, 
-                          const G4DataVector&) override;
+  void Initialise(const G4ParticleDefinition*, const G4DataVector&) override;
 
   G4double ComputeDEDXPerVolume(const G4Material*,
-                                        const G4ParticleDefinition*,
-                                        G4double kineticEnergy,
-                                        G4double cutEnergy) override;
-
-  virtual G4double ComputeCrossSectionPerElectron(
-                                 const G4ParticleDefinition*,
-                                 G4double kineticEnergy,
-                                 G4double cutEnergy,
-                                 G4double maxEnergy);
-
-  G4double ComputeCrossSectionPerAtom(
-                                 const G4ParticleDefinition*,
-                                 G4double kineticEnergy,
-                                 G4double Z, G4double A,
-                                 G4double cutEnergy,
-                                 G4double maxEnergy) override;
+                                const G4ParticleDefinition*,
+                                G4double kineticEnergy,
+                                G4double cutEnergy) override;
+
+  virtual G4double ComputeCrossSectionPerElectron(const G4ParticleDefinition*,
+                                                  G4double kineticEnergy,
+                                                  G4double cutEnergy,
+                                                  G4double maxEnergy);
+
+  G4double ComputeCrossSectionPerAtom(const G4ParticleDefinition*,
+                                      G4double kineticEnergy,
+                                      G4double Z,
+                                      G4double A,
+                                      G4double cutEnergy,
+                                      G4double maxEnergy) override;
 
   void SampleSecondaries(std::vector<G4DynamicParticle*>*,
-                                 const G4MaterialCutsCouple*,
-                                 const G4DynamicParticle*,
-                                 G4double tmin,
-                                 G4double maxEnergy) override;
-
+                         const G4MaterialCutsCouple*,
+                         const G4DynamicParticle*,
+                         G4double tmin,
+                         G4double maxEnergy) override;
 
   G4double SampleFluctuations(const G4MaterialCutsCouple*,
-                                      const G4DynamicParticle*,
-                                      G4double tmax,
-                                      G4double length,
-                                      G4double meanLoss) override;
-
-  G4double Dispersion(const G4Material*,
                               const G4DynamicParticle*,
                               G4double tmax,
-                              G4double length) override;
+                              G4double length,
+                              G4double meanLoss) override;
 
-  G4double MinEnergyCut(const G4ParticleDefinition*,
-                                const G4MaterialCutsCouple* couple) override;
+  G4double Dispersion(const G4Material*, const G4DynamicParticle*, G4double tmax, G4double length) override;
+
+  G4double MinEnergyCut(const G4ParticleDefinition*, const G4MaterialCutsCouple* couple) override;
 
   void SetParticle(const G4ParticleDefinition* p);
 
 protected:
-
-  G4double MaxSecondaryEnergy(const G4ParticleDefinition*,
-                                      G4double kinEnergy) override;
+  G4double MaxSecondaryEnergy(const G4ParticleDefinition*, G4double kinEnergy) override;
 
 private:
-
-  G4double ComputeDEDXAhlen(const G4Material* material, G4double bg2, 
-                            G4double cut);
+  G4double ComputeDEDXAhlen(const G4Material* material, G4double bg2, G4double cut);
 
   const G4ParticleDefinition* monopole;
-  G4ParticleDefinition*       theElectron;
-  G4ParticleChangeForLoss*    fParticleChange;
+  G4ParticleDefinition* theElectron;
+  G4ParticleChangeForLoss* fParticleChange;
 
   G4double mass;
   G4double magCharge;
@@ -103,7 +88,7 @@ class CMSmplIonisationWithDeltaModel : public G4VEmModel, public G4VEmFluctuatio
   G4double bg2lim;
   G4double chargeSquare;
   G4double dedxlim;
-  G4int    nmpl;
+  G4int nmpl;
   G4double pi_hbarc2_over_mc2;
 
   static std::vector<G4double>* dedx0;
diff --git a/SimG4Core/PhysicsLists/interface/DummyEMPhysics.h b/SimG4Core/PhysicsLists/interface/DummyEMPhysics.h
index 5537ae7c785d5..8c6fadd00b570 100644
--- a/SimG4Core/PhysicsLists/interface/DummyEMPhysics.h
+++ b/SimG4Core/PhysicsLists/interface/DummyEMPhysics.h
@@ -1,12 +1,11 @@
 #ifndef SimG4Core_PhysicsLists_DummyEMPhysics_h
 #define SimG4Core_PhysicsLists_DummyEMPhysics_h
 
-// Physics List equivalent to GeantV 
+// Physics List equivalent to GeantV
 
 #include "G4VPhysicsConstructor.hh"
 
 class DummyEMPhysics : public G4VPhysicsConstructor {
-
 public:
   DummyEMPhysics(G4int verb);
   ~DummyEMPhysics() override = default;
@@ -14,9 +13,7 @@ class DummyEMPhysics : public G4VPhysicsConstructor {
   void ConstructProcess() override;
 
 private:
-
   G4int verbose;
 };
 
 #endif
-
diff --git a/SimG4Core/PhysicsLists/interface/EmParticleList.h b/SimG4Core/PhysicsLists/interface/EmParticleList.h
index df23dadacefbb..5ba73f08f2b1d 100644
--- a/SimG4Core/PhysicsLists/interface/EmParticleList.h
+++ b/SimG4Core/PhysicsLists/interface/EmParticleList.h
@@ -2,15 +2,13 @@
 #define SimG4Core_PhysicsList_EmParticleList_h 1
 
 // V.Ivanchenko 6 March 2017
-// List of Geant4 basic particle names used in SIM step 
+// List of Geant4 basic particle names used in SIM step
 
 #include "globals.hh"
 #include <vector>
 
 class EmParticleList {
-
 public:
-
   explicit EmParticleList();
 
   ~EmParticleList();
@@ -18,9 +16,7 @@ class EmParticleList {
   const std::vector<G4String>& PartNames() const;
 
 private:
-  std::vector<G4String>  pNames; 
-  
+  std::vector<G4String> pNames;
 };
 
 #endif
-
diff --git a/SimG4Core/PhysicsLists/interface/HadronPhysicsCMS.h b/SimG4Core/PhysicsLists/interface/HadronPhysicsCMS.h
index 5706632d9f81d..cea571050d01b 100644
--- a/SimG4Core/PhysicsLists/interface/HadronPhysicsCMS.h
+++ b/SimG4Core/PhysicsLists/interface/HadronPhysicsCMS.h
@@ -24,50 +24,45 @@
 #include "G4FTFPNeutronBuilder.hh"
 #include "G4QGSPNeutronBuilder.hh"
 
-#include "G4FTFBinaryNeutronBuilder.hh"  
+#include "G4FTFBinaryNeutronBuilder.hh"
 #include "G4FTFBinaryPiKBuilder.hh"
 #include "G4FTFBinaryProtonBuilder.hh"
 
 class HadronPhysicsCMS : public G4VPhysicsConstructor {
-
 public:
-
-  HadronPhysicsCMS(const G4String& name ="QGSP", G4bool quasiElastic=true);
+  HadronPhysicsCMS(const G4String& name = "QGSP", G4bool quasiElastic = true);
   ~HadronPhysicsCMS() override;
 
   void ConstructParticle() override;
   void ConstructProcess() override;
 
 private:
-
   void CreateModels();
 
-  G4NeutronBuilder          * theNeutrons;
-  G4BertiniNeutronBuilder   * theBertiniNeutron;
-  G4BinaryNeutronBuilder    * theBinaryNeutron;
-  G4FTFPNeutronBuilder      * theFTFPNeutron;
-  G4QGSPNeutronBuilder      * theQGSPNeutron;
-    
-  G4PiKBuilder              * thePiK;
-  G4BertiniPiKBuilder       * theBertiniPiK;
-  G4BinaryPiKBuilder        * theBinaryPiK;
-  G4FTFPPiKBuilder          * theFTFPPiK;
-  G4QGSPPiKBuilder          * theQGSPPiK;
-    
-  G4ProtonBuilder           * thePro;
-  G4BertiniProtonBuilder    * theBertiniPro;
-  G4BinaryProtonBuilder     * theBinaryPro;
-  G4FTFPProtonBuilder       * theFTFPPro;
-  G4QGSPProtonBuilder       * theQGSPPro;    
-    
-
-  G4FTFBinaryNeutronBuilder * theFTFNeutron;
-  G4FTFBinaryPiKBuilder     * theFTFPiK;
-  G4FTFBinaryProtonBuilder  * theFTFPro;
-
-  G4String                    modelName;
-  G4bool                      QuasiElastic;
+  G4NeutronBuilder* theNeutrons;
+  G4BertiniNeutronBuilder* theBertiniNeutron;
+  G4BinaryNeutronBuilder* theBinaryNeutron;
+  G4FTFPNeutronBuilder* theFTFPNeutron;
+  G4QGSPNeutronBuilder* theQGSPNeutron;
+
+  G4PiKBuilder* thePiK;
+  G4BertiniPiKBuilder* theBertiniPiK;
+  G4BinaryPiKBuilder* theBinaryPiK;
+  G4FTFPPiKBuilder* theFTFPPiK;
+  G4QGSPPiKBuilder* theQGSPPiK;
+
+  G4ProtonBuilder* thePro;
+  G4BertiniProtonBuilder* theBertiniPro;
+  G4BinaryProtonBuilder* theBinaryPro;
+  G4FTFPProtonBuilder* theFTFPPro;
+  G4QGSPProtonBuilder* theQGSPPro;
+
+  G4FTFBinaryNeutronBuilder* theFTFNeutron;
+  G4FTFBinaryPiKBuilder* theFTFPiK;
+  G4FTFBinaryProtonBuilder* theFTFPro;
+
+  G4String modelName;
+  G4bool QuasiElastic;
 };
 
 #endif
-
diff --git a/SimG4Core/PhysicsLists/interface/HadronPhysicsQGSPCMS_FTFP_BERT.h b/SimG4Core/PhysicsLists/interface/HadronPhysicsQGSPCMS_FTFP_BERT.h
index 098d9ddd5caf5..343be5514db5e 100644
--- a/SimG4Core/PhysicsLists/interface/HadronPhysicsQGSPCMS_FTFP_BERT.h
+++ b/SimG4Core/PhysicsLists/interface/HadronPhysicsQGSPCMS_FTFP_BERT.h
@@ -25,41 +25,39 @@
 #include "G4AntiBarionBuilder.hh"
 #include "G4FTFPAntiBarionBuilder.hh"
 
-class HadronPhysicsQGSPCMS_FTFP_BERT : public G4VPhysicsConstructor
-{
-  public:
-    HadronPhysicsQGSPCMS_FTFP_BERT(G4int verbose);
-    ~HadronPhysicsQGSPCMS_FTFP_BERT() override;
-
-    void ConstructParticle() override;
-    void ConstructProcess() override;
-
-  private:
-    void CreateModels();
-
-    struct ThreadPrivate {
-      G4NeutronBuilder * theNeutrons;
-      G4FTFPNeutronBuilder * theFTFPNeutron;
-      G4QGSPNeutronBuilder * theQGSPNeutron;
-      G4BertiniNeutronBuilder * theBertiniNeutron;
-    
-      G4PiKBuilder * thePiK;
-      G4FTFPPiKBuilder * theFTFPPiK;
-      G4QGSPPiKBuilder * theQGSPPiK;
-      G4BertiniPiKBuilder * theBertiniPiK;
-    
-      G4ProtonBuilder * thePro;
-      G4FTFPProtonBuilder * theFTFPPro;
-      G4QGSPProtonBuilder * theQGSPPro; 
-      G4BertiniProtonBuilder * theBertiniPro;
-    
-      G4HyperonFTFPBuilder *theHyperon;
-
-      G4AntiBarionBuilder     *theAntiBaryon;
-      G4FTFPAntiBarionBuilder *theFTFPAntiBaryon;
-    };
-    static G4ThreadLocal ThreadPrivate* tpdata;    
+class HadronPhysicsQGSPCMS_FTFP_BERT : public G4VPhysicsConstructor {
+public:
+  HadronPhysicsQGSPCMS_FTFP_BERT(G4int verbose);
+  ~HadronPhysicsQGSPCMS_FTFP_BERT() override;
+
+  void ConstructParticle() override;
+  void ConstructProcess() override;
+
+private:
+  void CreateModels();
+
+  struct ThreadPrivate {
+    G4NeutronBuilder *theNeutrons;
+    G4FTFPNeutronBuilder *theFTFPNeutron;
+    G4QGSPNeutronBuilder *theQGSPNeutron;
+    G4BertiniNeutronBuilder *theBertiniNeutron;
+
+    G4PiKBuilder *thePiK;
+    G4FTFPPiKBuilder *theFTFPPiK;
+    G4QGSPPiKBuilder *theQGSPPiK;
+    G4BertiniPiKBuilder *theBertiniPiK;
+
+    G4ProtonBuilder *thePro;
+    G4FTFPProtonBuilder *theFTFPPro;
+    G4QGSPProtonBuilder *theQGSPPro;
+    G4BertiniProtonBuilder *theBertiniPro;
+
+    G4HyperonFTFPBuilder *theHyperon;
+
+    G4AntiBarionBuilder *theAntiBaryon;
+    G4FTFPAntiBarionBuilder *theFTFPAntiBaryon;
+  };
+  static G4ThreadLocal ThreadPrivate *tpdata;
 };
 
 #endif
-
diff --git a/SimG4Core/PhysicsLists/interface/MonopoleTransportation.h b/SimG4Core/PhysicsLists/interface/MonopoleTransportation.h
index 29d91154c8b63..9b249380c62b0 100644
--- a/SimG4Core/PhysicsLists/interface/MonopoleTransportation.h
+++ b/SimG4Core/PhysicsLists/interface/MonopoleTransportation.h
@@ -3,23 +3,23 @@
 //
 // Class MonopoleTransportation
 //
-// Created:  3 May 2010, J. Apostolakis, B. Bozsogi 
+// Created:  3 May 2010, J. Apostolakis, B. Bozsogi
 //                       G4MonopoleTransportation class for
 //                       Geant4 extended example "monopole"
 //
 // Adopted for CMSSW by V.Ivanchenko 30 April 2018
-// from Geant4 global tag geant4-10-04-ref-03                   
+// from Geant4 global tag geant4-10-04-ref-03
 //
 // =======================================================================
-// 
+//
 // Class description:
 //
-// G4MonopoleTransportation is a process responsible for the transportation of 
-// magnetic monopoles, i.e. the geometrical propagation encountering the 
+// G4MonopoleTransportation is a process responsible for the transportation of
+// magnetic monopoles, i.e. the geometrical propagation encountering the
 // geometrical sub-volumes of the detectors.
 // It is also tasked with part of updating the "safety".
 // For monopoles, uses a different equation of motion and ignores energy
-// conservation. 
+// conservation.
 //
 
 #ifndef SimG4Core_PhysicsLists_MonopoleTransportation_h
@@ -38,112 +38,97 @@
 
 #include <memory>
 
-class G4SafetyHelper; 
+class G4SafetyHelper;
 class Monopole;
 class CMSFieldManager;
 
-class MonopoleTransportation : public G4VProcess 
-{
-public: 
-
-  MonopoleTransportation(const Monopole* p, G4int verbosityLevel= 1);
-  ~MonopoleTransportation() override; 
-
-  G4double AlongStepGetPhysicalInteractionLength(
-                             const G4Track& track,
-                                   G4double  previousStepSize,
-                                   G4double  currentMinimumStep, 
-                                   G4double& currentSafety,
-                                   G4GPILSelection* selection
-							 ) override;
-
-  G4VParticleChange* AlongStepDoIt(
-                             const G4Track& track,
-                             const G4Step& stepData
-					   ) override;
-
-  G4VParticleChange* PostStepDoIt(
-                             const G4Track& track,
-                             const G4Step&  stepData
-					  ) override;
+class MonopoleTransportation : public G4VProcess {
+public:
+  MonopoleTransportation(const Monopole* p, G4int verbosityLevel = 1);
+  ~MonopoleTransportation() override;
+
+  G4double AlongStepGetPhysicalInteractionLength(const G4Track& track,
+                                                 G4double previousStepSize,
+                                                 G4double currentMinimumStep,
+                                                 G4double& currentSafety,
+                                                 G4GPILSelection* selection) override;
+
+  G4VParticleChange* AlongStepDoIt(const G4Track& track, const G4Step& stepData) override;
+
+  G4VParticleChange* PostStepDoIt(const G4Track& track, const G4Step& stepData) override;
   // Responsible for the relocation.
 
-  G4double PostStepGetPhysicalInteractionLength(
-                             const G4Track& ,
-                             G4double   previousStepSize,
-                             G4ForceCondition* pForceCond
-							) override;
-  // Forces the PostStepDoIt action to be called, 
+  G4double PostStepGetPhysicalInteractionLength(const G4Track&,
+                                                G4double previousStepSize,
+                                                G4ForceCondition* pForceCond) override;
+  // Forces the PostStepDoIt action to be called,
   // but does not limit the step.
 
   G4PropagatorInField* GetPropagatorInField();
-  void SetPropagatorInField( G4PropagatorInField* pFieldPropagator);
+  void SetPropagatorInField(G4PropagatorInField* pFieldPropagator);
   // Access/set the assistant class that Propagate in a Field.
 
-  inline G4double GetThresholdWarningEnergy() const; 
-  inline G4double GetThresholdImportantEnergy() const; 
-  inline G4int GetThresholdTrials() const; 
+  inline G4double GetThresholdWarningEnergy() const;
+  inline G4double GetThresholdImportantEnergy() const;
+  inline G4int GetThresholdTrials() const;
 
-  inline void SetThresholdWarningEnergy( G4double newEnWarn ); 
-  inline void SetThresholdImportantEnergy( G4double newEnImp ); 
-  inline void SetThresholdTrials(G4int newMaxTrials ); 
+  inline void SetThresholdWarningEnergy(G4double newEnWarn);
+  inline void SetThresholdImportantEnergy(G4double newEnImp);
+  inline void SetThresholdTrials(G4int newMaxTrials);
 
-  // Get/Set parameters for killing loopers: 
-  //   Above 'important' energy a 'looping' particle in field will 
+  // Get/Set parameters for killing loopers:
+  //   Above 'important' energy a 'looping' particle in field will
   //   *NOT* be abandoned, except after fThresholdTrials attempts.
   // Below Warning energy, no verbosity for looping particles is issued
 
-  inline G4double GetMaxEnergyKilled() const; 
+  inline G4double GetMaxEnergyKilled() const;
   inline G4double GetSumEnergyKilled() const;
-  void ResetKilledStatistics( G4int report = 1);      
+  void ResetKilledStatistics(G4int report = 1);
   // Statistics for tracks killed (currently due to looping in field)
 
-  inline void EnableShortStepOptimisation(G4bool optimise=true); 
+  inline void EnableShortStepOptimisation(G4bool optimise = true);
   // Whether short steps < safety will avoid to call Navigator (if field=0)
 
-  G4double AtRestGetPhysicalInteractionLength(const G4Track&,
-                                              G4ForceCondition*) override;
+  G4double AtRestGetPhysicalInteractionLength(const G4Track&, G4ForceCondition*) override;
 
   G4VParticleChange* AtRestDoIt(const G4Track&, const G4Step&) override;
   // No operation in  AtRestDoIt.
 
   void StartTracking(G4Track* aTrack) override;
-  // Reset state for new (potentially resumed) track 
+  // Reset state for new (potentially resumed) track
 
 protected:
-
-  G4bool               DoesGlobalFieldExist();
+  G4bool DoesGlobalFieldExist();
   // Checks whether a field exists for the "global" field manager.
 
 private:
-
   const Monopole* fParticleDef;
-  
-  CMSFieldManager*     fieldMgrCMS;
-    
-  G4Navigator*         fLinearNavigator;
+
+  CMSFieldManager* fieldMgrCMS;
+
+  G4Navigator* fLinearNavigator;
   G4PropagatorInField* fFieldPropagator;
   // The Propagators used to transport the particle
 
-  G4ThreeVector        fTransportEndPosition;
-  G4ThreeVector        fTransportEndMomentumDir;
-  G4double             fTransportEndKineticEnergy;
-  G4ThreeVector        fTransportEndSpin;
-  G4bool               fMomentumChanged;
+  G4ThreeVector fTransportEndPosition;
+  G4ThreeVector fTransportEndMomentumDir;
+  G4double fTransportEndKineticEnergy;
+  G4ThreeVector fTransportEndSpin;
+  G4bool fMomentumChanged;
 
-  G4bool               fEndGlobalTimeComputed; 
-  G4double             fCandidateEndGlobalTime;
+  G4bool fEndGlobalTimeComputed;
+  G4double fCandidateEndGlobalTime;
   // The particle's state after this Step, Store for DoIt
 
-  G4bool               fParticleIsLooping;
+  G4bool fParticleIsLooping;
 
-  G4TouchableHandle    fCurrentTouchableHandle;
+  G4TouchableHandle fCurrentTouchableHandle;
 
   G4bool fGeometryLimitedStep;
   // Flag to determine whether a boundary was reached.
 
-  G4ThreeVector  fPreviousSftOrigin;
-  G4double       fPreviousSafety; 
+  G4ThreeVector fPreviousSftOrigin;
+  G4double fPreviousSafety;
   // Remember last safety origin & value.
 
   G4ParticleChangeForTransport fParticleChange;
@@ -151,96 +136,66 @@ class MonopoleTransportation : public G4VProcess
 
   G4double endpointDistance;
 
-  // Thresholds for looping particles: 
-  // 
-  G4double fThreshold_Warning_Energy;     //  Warn above this energy
-  G4double fThreshold_Important_Energy;   //  Hesitate above this
-  G4int    fThresholdTrials;              //    for this no of trials
-  // Above 'important' energy a 'looping' particle in field will 
+  // Thresholds for looping particles:
+  //
+  G4double fThreshold_Warning_Energy;    //  Warn above this energy
+  G4double fThreshold_Important_Energy;  //  Hesitate above this
+  G4int fThresholdTrials;                //    for this no of trials
+  // Above 'important' energy a 'looping' particle in field will
   //   *NOT* be abandoned, except after fThresholdTrials attempts.
 
   // Counter for steps in which particle reports 'looping',
-  //   if it is above 'Important' Energy 
-  G4int    fNoLooperTrials; 
+  //   if it is above 'Important' Energy
+  G4int fNoLooperTrials;
   // Statistics for tracks abandoned
   G4double fSumEnergyKilled;
   G4double fMaxEnergyKilled;
 
   // Whether to avoid calling G4Navigator for short step ( < safety)
   //   If using it, the safety estimate for endpoint will likely be smaller.
-  G4bool   fShortStepOptimisation; 
+  G4bool fShortStepOptimisation;
 
   G4SafetyHelper* fpSafetyHelper;  // To pass it the safety value obtained
-
 };
 
-inline void
-MonopoleTransportation::SetPropagatorInField( G4PropagatorInField* pFieldPropagator)
-{
-  fFieldPropagator= pFieldPropagator;
+inline void MonopoleTransportation::SetPropagatorInField(G4PropagatorInField* pFieldPropagator) {
+  fFieldPropagator = pFieldPropagator;
 }
 
-inline G4PropagatorInField* MonopoleTransportation::GetPropagatorInField()
-{
-  return fFieldPropagator;
-}
+inline G4PropagatorInField* MonopoleTransportation::GetPropagatorInField() { return fFieldPropagator; }
 
-inline G4bool MonopoleTransportation::DoesGlobalFieldExist()
-{
-  G4TransportationManager* transportMgr = 
-    G4TransportationManager::GetTransportationManager();
+inline G4bool MonopoleTransportation::DoesGlobalFieldExist() {
+  G4TransportationManager* transportMgr = G4TransportationManager::GetTransportationManager();
   return transportMgr->GetFieldManager()->DoesFieldExist();
 }
 
-inline G4double MonopoleTransportation::GetThresholdWarningEnergy() const
-{
-  return fThreshold_Warning_Energy;
-}
- 
-inline G4double MonopoleTransportation::GetThresholdImportantEnergy() const
-{ 
-  return fThreshold_Important_Energy;
-} 
-
-inline G4int MonopoleTransportation::GetThresholdTrials() const
-{
-  return fThresholdTrials;
-}
+inline G4double MonopoleTransportation::GetThresholdWarningEnergy() const { return fThreshold_Warning_Energy; }
 
-inline void MonopoleTransportation::SetThresholdWarningEnergy( G4double newEnWarn )
-{
-  fThreshold_Warning_Energy= newEnWarn;
-}
+inline G4double MonopoleTransportation::GetThresholdImportantEnergy() const { return fThreshold_Important_Energy; }
 
-inline void MonopoleTransportation::SetThresholdImportantEnergy( G4double newEnImp )
-{
-  fThreshold_Important_Energy = newEnImp; 
+inline G4int MonopoleTransportation::GetThresholdTrials() const { return fThresholdTrials; }
+
+inline void MonopoleTransportation::SetThresholdWarningEnergy(G4double newEnWarn) {
+  fThreshold_Warning_Energy = newEnWarn;
 }
 
-inline void MonopoleTransportation::SetThresholdTrials(G4int newMaxTrials )
-{
-  fThresholdTrials = newMaxTrials; 
+inline void MonopoleTransportation::SetThresholdImportantEnergy(G4double newEnImp) {
+  fThreshold_Important_Energy = newEnImp;
 }
 
-// Get parameters for killing loopers: 
-//   Above 'important' energy a 'looping' particle in field will 
+inline void MonopoleTransportation::SetThresholdTrials(G4int newMaxTrials) { fThresholdTrials = newMaxTrials; }
+
+// Get parameters for killing loopers:
+//   Above 'important' energy a 'looping' particle in field will
 //   *NOT* be abandoned, except after fThresholdTrials attempts.
 // Below Warning energy, no verbosity for looping particles is issued
 
-inline G4double MonopoleTransportation::GetMaxEnergyKilled() const
-{
-  return fMaxEnergyKilled; 
-}
+inline G4double MonopoleTransportation::GetMaxEnergyKilled() const { return fMaxEnergyKilled; }
 
-inline G4double MonopoleTransportation::GetSumEnergyKilled() const
-{
-  return fSumEnergyKilled;
-}
+inline G4double MonopoleTransportation::GetSumEnergyKilled() const { return fSumEnergyKilled; }
 
-inline void 
-MonopoleTransportation::EnableShortStepOptimisation(G4bool optimiseShortStep)
-{ 
-  fShortStepOptimisation=optimiseShortStep;
+inline void MonopoleTransportation::EnableShortStepOptimisation(G4bool optimiseShortStep) {
+  fShortStepOptimisation = optimiseShortStep;
 }
 
-#endif  
+#endif
diff --git a/SimG4Core/PhysicsLists/interface/UrbanMscModel93.h b/SimG4Core/PhysicsLists/interface/UrbanMscModel93.h
index 699cebe992bbb..e84f6688ccc48 100644
--- a/SimG4Core/PhysicsLists/interface/UrbanMscModel93.h
+++ b/SimG4Core/PhysicsLists/interface/UrbanMscModel93.h
@@ -1,39 +1,39 @@
 // -------------------------------------------------------------------
 //
 //
-// GEANT4 Class header file 
+// GEANT4 Class header file
 //
 //
 // File name: UrbanMscModel93
 //
-// Original author:    Laszlo Urban, 
+// Original author:    Laszlo Urban,
 //
 //    V.Ivanchenko have copied from G4UrbanMscModel93 class
-//                 of Geant4 global tag geant4-09-06-ref-07 
+//                 of Geant4 global tag geant4-09-06-ref-07
 //                 and have adopted to CMSSW
 //
-// Creation date: 21.08.2013 
+// Creation date: 21.08.2013
 //
 // Class Description:
 //
 // Implementation of the model of multiple scattering based on
-// H.W.Lewis Phys Rev 78 (1950) 526 
+// H.W.Lewis Phys Rev 78 (1950) 526
 // L.Urban CERN-OPEN-2006-077, Dec. 2006
 // V.N.Ivanchenko et al., J.Phys: Conf. Ser. 219 (2010) 032045
 
 // -------------------------------------------------------------------
-// In its present form the model can be  used for simulation 
+// In its present form the model can be  used for simulation
 //   of the e-/e+, muon and charged hadron multiple scattering
-// 
-// This code was copied from Geant4 at the moment when it was removed 
+//
+// This code was copied from Geant4 at the moment when it was removed
 // from Geant4 completly (together with G4UrbanMscModel91, 95, 96).
 // Since that time Geant4 supports the unique class G4UrbanMscModel.
 // It was shown in Geant4 internal validations that this last class
 // provides more accurate simulation for various thin target tests.
-// This main Geant4 model does is not provide exactly the same results 
+// This main Geant4 model does is not provide exactly the same results
 // for CMS calorimeters run1 versus run2. To keep calorimeter response
 // unchanged, CMS private version of the Urban model was created. It is
-// basically the the same model used for run1 but it includes several 
+// basically the the same model used for run1 but it includes several
 // technical fixed introduced after run1. There fixes do not change
 // results but allow to avoid numerical problems for very small steps
 // and to improve a bit of the CPU performance.
@@ -56,11 +56,8 @@ class G4LossTableManager;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-class UrbanMscModel93 : public G4VMscModel
-{
-
+class UrbanMscModel93 : public G4VMscModel {
 public:
-
   UrbanMscModel93(const G4String& nam = "UrbanMsc93");
 
   ~UrbanMscModel93() override;
@@ -70,26 +67,23 @@ class UrbanMscModel93 : public G4VMscModel
   void StartTracking(G4Track*) override;
 
   G4double ComputeCrossSectionPerAtom(const G4ParticleDefinition* particle,
-				      G4double KineticEnergy,
-				      G4double AtomicNumber,
-				      G4double AtomicWeight=0., 
-				      G4double cut =0.,
-				      G4double emax=DBL_MAX) override;
+                                      G4double KineticEnergy,
+                                      G4double AtomicNumber,
+                                      G4double AtomicWeight = 0.,
+                                      G4double cut = 0.,
+                                      G4double emax = DBL_MAX) override;
 
   G4ThreeVector& SampleScattering(const G4ThreeVector&, G4double safety) override;
 
-  G4double ComputeTruePathLengthLimit(const G4Track& track,
-				      G4double& currentMinimalStep) override;
+  G4double ComputeTruePathLengthLimit(const G4Track& track, G4double& currentMinimalStep) override;
 
   G4double ComputeGeomPathLength(G4double truePathLength) override;
 
   G4double ComputeTrueStepLength(G4double geomStepLength) override;
 
-  inline G4double ComputeTheta0(G4double truePathLength,
-				G4double KineticEnergy);
+  inline G4double ComputeTheta0(G4double truePathLength, G4double KineticEnergy);
 
 private:
-
   G4double SampleCosineTheta(G4double trueStepLength, G4double KineticEnergy);
 
   G4double SampleDisplacement();
@@ -103,18 +97,18 @@ class UrbanMscModel93 : public G4VMscModel
   inline G4double SimpleScattering(G4double xmeanth, G4double x2meanth);
 
   //  hide assignment operator
-  UrbanMscModel93 & operator=(const  UrbanMscModel93 &right) = delete;
-  UrbanMscModel93(const  UrbanMscModel93&) = delete;
+  UrbanMscModel93& operator=(const UrbanMscModel93& right) = delete;
+  UrbanMscModel93(const UrbanMscModel93&) = delete;
 
   const G4ParticleDefinition* particle;
-  G4ParticleChangeForMSC*     fParticleChange;
+  G4ParticleChangeForMSC* fParticleChange;
 
   const G4MaterialCutsCouple* couple;
-  G4LossTableManager*         theManager;
+  G4LossTableManager* theManager;
 
   G4double mass;
-  G4double charge,ChargeSquare;
-  G4double masslimite,lambdalimit,fr;
+  G4double charge, ChargeSquare;
+  G4double masslimite, lambdalimit, fr;
 
   G4double taubig;
   G4double tausmall;
@@ -137,107 +131,98 @@ class UrbanMscModel93 : public G4VMscModel
   G4double lambdaeff;
   G4double tPathLength;
   G4double zPathLength;
-  G4double par1,par2,par3;
+  G4double par1, par2, par3;
 
   G4double stepmin;
 
   G4double currentKinEnergy;
-  G4double currentRange; 
+  G4double currentRange;
   G4double rangeinit;
   G4double currentRadLength;
 
   G4double numlim, xsi, ea, eaa;
 
-  G4double theta0max,rellossmax;
+  G4double theta0max, rellossmax;
   G4double third;
 
-  G4int    currentMaterialIndex;
+  G4int currentMaterialIndex;
 
   G4double y;
   G4double Zold;
-  G4double Zeff,Z2,Z23,lnZ;
-  G4double coeffth1,coeffth2;
-  G4double coeffc1,coeffc2;
-  G4double scr1ini,scr2ini,scr1,scr2;
-
-  G4bool   firstStep;
-  G4bool   inside;
-  G4bool   insideskin;
+  G4double Zeff, Z2, Z23, lnZ;
+  G4double coeffth1, coeffth2;
+  G4double coeffc1, coeffc2;
+  G4double scr1ini, scr2ini, scr1, scr2;
+
+  G4bool firstStep;
+  G4bool inside;
+  G4bool insideskin;
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-inline
-void UrbanMscModel93::SetParticle(const G4ParticleDefinition* p)
-{
+inline void UrbanMscModel93::SetParticle(const G4ParticleDefinition* p) {
   if (p != particle) {
     particle = p;
     mass = p->GetPDGMass();
-    charge = p->GetPDGCharge()/CLHEP::eplus;
-    ChargeSquare = charge*charge;
+    charge = p->GetPDGCharge() / CLHEP::eplus;
+    ChargeSquare = charge * charge;
   }
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-inline
-void UrbanMscModel93::UpdateCache()                                   
-{
+inline void UrbanMscModel93::UpdateCache() {
   lnZ = G4Log(Zeff);
   //new correction in theta0 formula
-  coeffth1 = (1.-8.7780e-2/Zeff)*(0.87+0.03*lnZ);                   
-  coeffth2 = (4.0780e-2+1.7315e-4*Zeff)*(0.87+0.03*lnZ);              
+  coeffth1 = (1. - 8.7780e-2 / Zeff) * (0.87 + 0.03 * lnZ);
+  coeffth2 = (4.0780e-2 + 1.7315e-4 * Zeff) * (0.87 + 0.03 * lnZ);
   // tail parameters
-  G4double lnZ1 = G4Log(Zeff+1.);
-  coeffc1  = 2.943-0.197*lnZ1;                  
-  coeffc2  = 0.0987-0.0143*lnZ1;                              
+  G4double lnZ1 = G4Log(Zeff + 1.);
+  coeffc1 = 2.943 - 0.197 * lnZ1;
+  coeffc2 = 0.0987 - 0.0143 * lnZ1;
   // for single scattering
-  Z2   = Zeff*Zeff;
-  Z23  = G4Exp(2.*lnZ/3.);
-  scr1 = scr1ini*Z23;
-  scr2 = scr2ini*Z2*ChargeSquare;
-                                              
+  Z2 = Zeff * Zeff;
+  Z23 = G4Exp(2. * lnZ / 3.);
+  scr1 = scr1ini * Z23;
+  scr2 = scr2ini * Z2 * ChargeSquare;
+
   Zold = Zeff;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-inline
-G4double UrbanMscModel93::ComputeTheta0(G4double trueStepLength,
-					G4double KineticEnergy)
-{
+inline G4double UrbanMscModel93::ComputeTheta0(G4double trueStepLength, G4double KineticEnergy) {
   // for all particles take the width of the central part
   //  from a  parametrization similar to the Highland formula
   // ( Highland formula: Particle Physics Booklet, July 2002, eq. 26.10)
-  static const G4double c_highland = 13.6*CLHEP::MeV;
-  G4double invbetacp = sqrt((currentKinEnergy+mass)*(KineticEnergy+mass)/
-			    (currentKinEnergy*(currentKinEnergy+2.*mass)*
-			     KineticEnergy*(KineticEnergy+2.*mass)));
-  y = trueStepLength/currentRadLength;
-  G4double theta0 = c_highland*std::abs(charge)*sqrt(y)*invbetacp;
+  static const G4double c_highland = 13.6 * CLHEP::MeV;
+  G4double invbetacp =
+      sqrt((currentKinEnergy + mass) * (KineticEnergy + mass) /
+           (currentKinEnergy * (currentKinEnergy + 2. * mass) * KineticEnergy * (KineticEnergy + 2. * mass)));
+  y = trueStepLength / currentRadLength;
+  G4double theta0 = c_highland * std::abs(charge) * sqrt(y) * invbetacp;
   // correction factor from e- scattering data
-  theta0 *= (coeffth1+coeffth2*G4Log(y));             
+  theta0 *= (coeffth1 + coeffth2 * G4Log(y));
 
   return theta0;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-inline
-G4double UrbanMscModel93::SimpleScattering(G4double xmeanth, G4double x2meanth)
-{
+inline G4double UrbanMscModel93::SimpleScattering(G4double xmeanth, G4double x2meanth) {
   // 'large angle scattering'
   // 2 model functions with correct xmean and x2mean
-  G4double a = (2.*xmeanth+9.*x2meanth-3.)/(2.*xmeanth-3.*x2meanth+1.);
-  G4double prob = (a+2.)*xmeanth/a;
+  G4double a = (2. * xmeanth + 9. * x2meanth - 3.) / (2. * xmeanth - 3. * x2meanth + 1.);
+  G4double prob = (a + 2.) * xmeanth / a;
 
   // sampling
   G4double cth = 1.;
-  if(G4UniformRand() < prob) {
-    cth = -1.+2.*G4Exp(G4Log(G4UniformRand())/(a+1.));
+  if (G4UniformRand() < prob) {
+    cth = -1. + 2. * G4Exp(G4Log(G4UniformRand()) / (a + 1.));
   } else {
-    cth = -1.+2.*G4UniformRand();
+    cth = -1. + 2. * G4UniformRand();
   }
   return cth;
 }
@@ -245,4 +230,3 @@ G4double UrbanMscModel93::SimpleScattering(G4double xmeanth, G4double x2meanth)
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 #endif
-
diff --git a/SimG4Core/PhysicsLists/plugins/DummyPhysics.cc b/SimG4Core/PhysicsLists/plugins/DummyPhysics.cc
index 81e1aa061a3ab..ce9ccffc53787 100644
--- a/SimG4Core/PhysicsLists/plugins/DummyPhysics.cc
+++ b/SimG4Core/PhysicsLists/plugins/DummyPhysics.cc
@@ -4,16 +4,12 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "G4DecayPhysics.hh"
 
-DummyPhysics::DummyPhysics(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
+DummyPhysics::DummyPhysics(const edm::ParameterSet& p) : PhysicsList(p) {
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
   if (emPhys) {
     RegisterPhysics(new DummyEMPhysics(ver));
   }
   RegisterPhysics(new G4DecayPhysics(ver));
-  edm::LogInfo("PhysicsList") << "DummyPhysics constructed with EM Physics "
-			      << emPhys << " and Decay";
+  edm::LogInfo("PhysicsList") << "DummyPhysics constructed with EM Physics " << emPhys << " and Decay";
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/DummyPhysics.h b/SimG4Core/PhysicsLists/plugins/DummyPhysics.h
index 25dc1754a89a6..6d422173629db 100644
--- a/SimG4Core/PhysicsLists/plugins/DummyPhysics.h
+++ b/SimG4Core/PhysicsLists/plugins/DummyPhysics.h
@@ -5,10 +5,9 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 class DummyPhysics : public PhysicsList {
-
 public:
   DummyPhysics(const edm::ParameterSet &);
   ~DummyPhysics() override = default;
 };
- 
+
 #endif
diff --git a/SimG4Core/PhysicsLists/plugins/FTFCMS_BIC.cc b/SimG4Core/PhysicsLists/plugins/FTFCMS_BIC.cc
index a052287a74f26..2956be8a6d657 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFCMS_BIC.cc
+++ b/SimG4Core/PhysicsLists/plugins/FTFCMS_BIC.cc
@@ -13,23 +13,20 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsFTF_BIC.hh"
 
-FTFCMS_BIC::FTFCMS_BIC(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+FTFCMS_BIC::FTFCMS_BIC(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "FTF_BIC with Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking;
+                              << "FTF_BIC with Flags for EM Physics " << emPhys << ", for Hadronic Physics " << hadPhys
+                              << " and tracking cut " << tracking;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new G4EmStandardPhysics(ver));
+    RegisterPhysics(new G4EmStandardPhysics(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -37,27 +34,26 @@ FTFCMS_BIC::FTFCMS_BIC(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysics(ver));
+    RegisterPhysics(new G4HadronElasticPhysics(ver));
 
     // Hadron Physics
-    RegisterPhysics( new G4HadronPhysicsFTF_BIC(ver));
+    RegisterPhysics(new G4HadronPhysicsFTF_BIC(ver));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      RegisterPhysics( new G4NeutronTrackingCut(ver));
+      RegisterPhysics(new G4NeutronTrackingCut(ver));
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFCMS_BIC.h b/SimG4Core/PhysicsLists/plugins/FTFCMS_BIC.h
index 0498cee5184bb..3af0f8d491dc5 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFCMS_BIC.h
+++ b/SimG4Core/PhysicsLists/plugins/FTFCMS_BIC.h
@@ -4,13 +4,9 @@
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class FTFCMS_BIC: public PhysicsList {
-
+class FTFCMS_BIC : public PhysicsList {
 public:
-  FTFCMS_BIC(const edm::ParameterSet & p);
+  FTFCMS_BIC(const edm::ParameterSet& p);
 };
 
 #endif
-
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT.cc
index 068dd2847332d..71c6f3a16f5bc 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT.cc
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT.cc
@@ -13,25 +13,21 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsFTFP_BERT.hh"
 
-FTFPCMS_BERT::FTFPCMS_BERT(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+FTFPCMS_BERT::FTFPCMS_BERT(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*CLHEP::ns;
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "FTFP_BERT \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking
-			      << "   t(ns)= " << timeLimit/CLHEP::ns;
+                              << "FTFP_BERT \n Flags for EM Physics " << emPhys << ", for Hadronic Physics " << hadPhys
+                              << " and tracking cut " << tracking << "   t(ns)= " << timeLimit / CLHEP::ns;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new G4EmStandardPhysics(ver));
+    RegisterPhysics(new G4EmStandardPhysics(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -39,29 +35,28 @@ FTFPCMS_BERT::FTFPCMS_BERT(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysics(ver));
+    RegisterPhysics(new G4HadronElasticPhysics(ver));
 
     // Hadron Physics
-    RegisterPhysics(  new G4HadronPhysicsFTFP_BERT(ver));
+    RegisterPhysics(new G4HadronPhysicsFTFP_BERT(ver));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+      G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
       ncut->SetTimeLimit(timeLimit);
       RegisterPhysics(ncut);
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT.h b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT.h
index 1be0645a2903e..97e6ea2391638 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT.h
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT.h
@@ -4,13 +4,9 @@
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class FTFPCMS_BERT: public PhysicsList {
-
+class FTFPCMS_BERT : public PhysicsList {
 public:
-  FTFPCMS_BERT(const edm::ParameterSet & p);
+  FTFPCMS_BERT(const edm::ParameterSet& p);
 };
 
 #endif
-
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_ATL_EMM.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_ATL_EMM.cc
index 841f26d16570d..43165ecba0d11 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_ATL_EMM.cc
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_ATL_EMM.cc
@@ -13,25 +13,21 @@
 
 #include "G4DataQuestionaire.hh"
 
-FTFPCMS_BERT_ATL_EMM::FTFPCMS_BERT_ATL_EMM(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+FTFPCMS_BERT_ATL_EMM::FTFPCMS_BERT_ATL_EMM(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*CLHEP::ns;
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "FTFP_BERT_ATL_EMM \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking
-			      << "   t(ns)= " << timeLimit/CLHEP::ns;
+                              << "FTFP_BERT_ATL_EMM \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking << "   t(ns)= " << timeLimit / CLHEP::ns;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new CMSEmStandardPhysicsLPM(ver));
+    RegisterPhysics(new CMSEmStandardPhysicsLPM(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -39,29 +35,28 @@ FTFPCMS_BERT_ATL_EMM::FTFPCMS_BERT_ATL_EMM(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysics(ver));
+    RegisterPhysics(new G4HadronElasticPhysics(ver));
 
     // Hadron Physics
-    RegisterPhysics(  new CMSHadronPhysicsFTFP_BERT_ATL(ver));
+    RegisterPhysics(new CMSHadronPhysicsFTFP_BERT_ATL(ver));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+      G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
       ncut->SetTimeLimit(timeLimit);
       RegisterPhysics(ncut);
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_ATL_EMM.h b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_ATL_EMM.h
index 8bd289ecf7382..0c60a432d5787 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_ATL_EMM.h
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_ATL_EMM.h
@@ -4,13 +4,9 @@
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class FTFPCMS_BERT_ATL_EMM: public PhysicsList {
-
+class FTFPCMS_BERT_ATL_EMM : public PhysicsList {
 public:
-  FTFPCMS_BERT_ATL_EMM(const edm::ParameterSet & p);
+  FTFPCMS_BERT_ATL_EMM(const edm::ParameterSet& p);
 };
 
 #endif
-
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EML.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EML.cc
index ee1518d0f852b..532074d4abb62 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EML.cc
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EML.cc
@@ -13,25 +13,21 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsFTFP_BERT.hh"
 
-FTFPCMS_BERT_EML::FTFPCMS_BERT_EML(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+FTFPCMS_BERT_EML::FTFPCMS_BERT_EML(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*CLHEP::ns;
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "FTFP_BERT_EML: \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking
-			      << "   t(ns)= " << timeLimit/CLHEP::ns;
+                              << "FTFP_BERT_EML: \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking << "   t(ns)= " << timeLimit / CLHEP::ns;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new CMSEmStandardPhysics(ver));
+    RegisterPhysics(new CMSEmStandardPhysics(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -39,29 +35,28 @@ FTFPCMS_BERT_EML::FTFPCMS_BERT_EML(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysics(ver));
+    RegisterPhysics(new G4HadronElasticPhysics(ver));
 
     // Hadron Physics
-    RegisterPhysics(  new G4HadronPhysicsFTFP_BERT(ver));
+    RegisterPhysics(new G4HadronPhysicsFTFP_BERT(ver));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+      G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
       ncut->SetTimeLimit(timeLimit);
       RegisterPhysics(ncut);
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EML.h b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EML.h
index 373f1bf7ef71b..d25e1a36628f0 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EML.h
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EML.h
@@ -4,13 +4,9 @@
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class FTFPCMS_BERT_EML: public PhysicsList {
-
+class FTFPCMS_BERT_EML : public PhysicsList {
 public:
-  FTFPCMS_BERT_EML(const edm::ParameterSet & p);
+  FTFPCMS_BERT_EML(const edm::ParameterSet& p);
 };
 
 #endif
-
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMM.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMM.cc
index cf9676a493012..ab036a177cbd5 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMM.cc
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMM.cc
@@ -13,25 +13,21 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsFTFP_BERT.hh"
 
-FTFPCMS_BERT_EMM::FTFPCMS_BERT_EMM(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+FTFPCMS_BERT_EMM::FTFPCMS_BERT_EMM(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*CLHEP::ns;
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "FTFP_BERT_EMM \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking
-			      << "   t(ns)= " << timeLimit/CLHEP::ns;
+                              << "FTFP_BERT_EMM \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking << "   t(ns)= " << timeLimit / CLHEP::ns;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new CMSEmStandardPhysicsLPM(ver));
+    RegisterPhysics(new CMSEmStandardPhysicsLPM(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -39,29 +35,28 @@ FTFPCMS_BERT_EMM::FTFPCMS_BERT_EMM(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysics(ver));
+    RegisterPhysics(new G4HadronElasticPhysics(ver));
 
     // Hadron Physics
-    RegisterPhysics(  new G4HadronPhysicsFTFP_BERT(ver));
+    RegisterPhysics(new G4HadronPhysicsFTFP_BERT(ver));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+      G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
       ncut->SetTimeLimit(timeLimit);
       RegisterPhysics(ncut);
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMM.h b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMM.h
index a262aecb0c154..e03364bc05bc7 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMM.h
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMM.h
@@ -4,13 +4,9 @@
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class FTFPCMS_BERT_EMM: public PhysicsList {
-
+class FTFPCMS_BERT_EMM : public PhysicsList {
 public:
-  FTFPCMS_BERT_EMM(const edm::ParameterSet & p);
+  FTFPCMS_BERT_EMM(const edm::ParameterSet& p);
 };
 
 #endif
-
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMM_TRK.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMM_TRK.cc
index b9ff31416349a..84d67b91df751 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMM_TRK.cc
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMM_TRK.cc
@@ -13,25 +13,21 @@
 
 #include "G4DataQuestionaire.hh"
 
-FTFPCMS_BERT_EMM_TRK::FTFPCMS_BERT_EMM_TRK(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+FTFPCMS_BERT_EMM_TRK::FTFPCMS_BERT_EMM_TRK(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*CLHEP::ns;
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "FTFP_BERT_EMM_TRK \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking
-			      << "   t(ns)= " << timeLimit/CLHEP::ns;
+                              << "FTFP_BERT_EMM_TRK \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking << "   t(ns)= " << timeLimit / CLHEP::ns;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new CMSEmStandardPhysicsLPM(ver));
+    RegisterPhysics(new CMSEmStandardPhysicsLPM(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -39,29 +35,28 @@ FTFPCMS_BERT_EMM_TRK::FTFPCMS_BERT_EMM_TRK(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysics(ver));
+    RegisterPhysics(new G4HadronElasticPhysics(ver));
 
     // Hadron Physics
-    RegisterPhysics(  new CMSHadronPhysicsFTFP_BERT(ver));
+    RegisterPhysics(new CMSHadronPhysicsFTFP_BERT(ver));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+      G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
       ncut->SetTimeLimit(timeLimit);
       RegisterPhysics(ncut);
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMM_TRK.h b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMM_TRK.h
index 7ba0313f11af9..1dc3e824a349c 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMM_TRK.h
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMM_TRK.h
@@ -4,13 +4,9 @@
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class FTFPCMS_BERT_EMM_TRK: public PhysicsList {
-
+class FTFPCMS_BERT_EMM_TRK : public PhysicsList {
 public:
-  FTFPCMS_BERT_EMM_TRK(const edm::ParameterSet & p);
+  FTFPCMS_BERT_EMM_TRK(const edm::ParameterSet& p);
 };
 
 #endif
-
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMN.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMN.cc
index 5fbbf6dd873b4..e909231c80837 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMN.cc
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMN.cc
@@ -13,25 +13,21 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsFTFP_BERT.hh"
 
-FTFPCMS_BERT_EMN::FTFPCMS_BERT_EMN(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+FTFPCMS_BERT_EMN::FTFPCMS_BERT_EMN(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*CLHEP::ns;
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "FTFP_BERT_EMN \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking
-			      << "   t(ns)= " << timeLimit/CLHEP::ns;
+                              << "FTFP_BERT_EMN \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking << "   t(ns)= " << timeLimit / CLHEP::ns;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new CMSEmStandardPhysicsXS(ver));
+    RegisterPhysics(new CMSEmStandardPhysicsXS(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -39,29 +35,28 @@ FTFPCMS_BERT_EMN::FTFPCMS_BERT_EMN(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysics(ver));
+    RegisterPhysics(new G4HadronElasticPhysics(ver));
 
     // Hadron Physics
-    RegisterPhysics(  new G4HadronPhysicsFTFP_BERT(ver));
+    RegisterPhysics(new G4HadronPhysicsFTFP_BERT(ver));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+      G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
       ncut->SetTimeLimit(timeLimit);
       RegisterPhysics(ncut);
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMN.h b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMN.h
index d1d411f5d155a..837ec768e166e 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMN.h
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMN.h
@@ -4,13 +4,9 @@
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class FTFPCMS_BERT_EMN: public PhysicsList {
-
+class FTFPCMS_BERT_EMN : public PhysicsList {
 public:
-  FTFPCMS_BERT_EMN(const edm::ParameterSet & p);
+  FTFPCMS_BERT_EMN(const edm::ParameterSet& p);
 };
 
 #endif
-
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMV.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMV.cc
index c39b6134cb8da..0c98c1c7d2895 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMV.cc
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMV.cc
@@ -13,23 +13,20 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsFTFP_BERT.hh"
 
-FTFPCMS_BERT_EMV::FTFPCMS_BERT_EMV(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+FTFPCMS_BERT_EMV::FTFPCMS_BERT_EMV(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "FTFP_BERT_EMV \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking;
+                              << "FTFP_BERT_EMV \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new G4EmStandardPhysics_option1(ver));
+    RegisterPhysics(new G4EmStandardPhysics_option1(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -37,27 +34,26 @@ FTFPCMS_BERT_EMV::FTFPCMS_BERT_EMV(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysics(ver));
+    RegisterPhysics(new G4HadronElasticPhysics(ver));
 
     // Hadron Physics
-    RegisterPhysics(  new G4HadronPhysicsFTFP_BERT(ver));
+    RegisterPhysics(new G4HadronPhysicsFTFP_BERT(ver));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      RegisterPhysics( new G4NeutronTrackingCut(ver));
+      RegisterPhysics(new G4NeutronTrackingCut(ver));
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMV.h b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMV.h
index af71ac4cfaf7f..6fbc2b0acf909 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMV.h
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMV.h
@@ -4,13 +4,9 @@
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class FTFPCMS_BERT_EMV: public PhysicsList {
-
+class FTFPCMS_BERT_EMV : public PhysicsList {
 public:
-  FTFPCMS_BERT_EMV(const edm::ParameterSet & p);
+  FTFPCMS_BERT_EMV(const edm::ParameterSet& p);
 };
 
 #endif
-
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMY.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMY.cc
index b8025c8f1b31c..14678804eafbe 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMY.cc
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMY.cc
@@ -13,23 +13,20 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsFTFP_BERT.hh"
 
-FTFPCMS_BERT_EMY::FTFPCMS_BERT_EMY(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+FTFPCMS_BERT_EMY::FTFPCMS_BERT_EMY(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "FTFP_BERT_EMY \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking;
+                              << "FTFP_BERT_EMY \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new G4EmStandardPhysics_option3(ver));
+    RegisterPhysics(new G4EmStandardPhysics_option3(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -37,27 +34,26 @@ FTFPCMS_BERT_EMY::FTFPCMS_BERT_EMY(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysics(ver));
+    RegisterPhysics(new G4HadronElasticPhysics(ver));
 
     // Hadron Physics
-    RegisterPhysics(  new G4HadronPhysicsFTFP_BERT(ver));
+    RegisterPhysics(new G4HadronPhysicsFTFP_BERT(ver));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      RegisterPhysics( new G4NeutronTrackingCut(ver));
+      RegisterPhysics(new G4NeutronTrackingCut(ver));
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMY.h b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMY.h
index fc3e540602546..a0a0464ccb414 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMY.h
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMY.h
@@ -1,23 +1,19 @@
 #ifndef SimG4Core_PhysicsLists_FTFPCMS_BERT_EMY_H
 #define SimG4Core_PhysicsLists_FTFPCMS_BERT_EMY_H
 
-// FTFP_BERT_EMY is a standard Geant4 Physics List FTFP_BERT with Option3 
-//               EM Physics configuration: forced more steps of e+- near 
-//               geometry boundary. This configuration may be used for R&D of 
+// FTFP_BERT_EMY is a standard Geant4 Physics List FTFP_BERT with Option3
+//               EM Physics configuration: forced more steps of e+- near
+//               geometry boundary. This configuration may be used for R&D of
 //               tracker and HGCal detector performnace. The similation
-//               is expected to be approximately two times slower then 
+//               is expected to be approximately two times slower then
 //               with the CMS production Physics List
 
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class FTFPCMS_BERT_EMY: public PhysicsList {
-
+class FTFPCMS_BERT_EMY : public PhysicsList {
 public:
-  FTFPCMS_BERT_EMY(const edm::ParameterSet & p);
+  FTFPCMS_BERT_EMY(const edm::ParameterSet& p);
 };
 
 #endif
-
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMZ.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMZ.cc
index 394eab1c1e872..7826e8157ef70 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMZ.cc
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMZ.cc
@@ -13,21 +13,17 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsFTFP_BERT.hh"
 
-FTFPCMS_BERT_EMZ::FTFPCMS_BERT_EMZ(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+FTFPCMS_BERT_EMZ::FTFPCMS_BERT_EMZ(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*CLHEP::ns;
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "FTFP_BERT_EMZ \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking
-			      << "   t(ns)= " << timeLimit/CLHEP::ns;
+                              << "FTFP_BERT_EMZ \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking << "   t(ns)= " << timeLimit / CLHEP::ns;
 
   if (emPhys) {
     // EM Physics
@@ -39,29 +35,28 @@ FTFPCMS_BERT_EMZ::FTFPCMS_BERT_EMZ(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysics(ver));
+    RegisterPhysics(new G4HadronElasticPhysics(ver));
 
     // Hadron Physics
-    RegisterPhysics(  new G4HadronPhysicsFTFP_BERT(ver));
+    RegisterPhysics(new G4HadronPhysicsFTFP_BERT(ver));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+      G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
       ncut->SetTimeLimit(timeLimit);
       RegisterPhysics(ncut);
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMZ.h b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMZ.h
index 733ca8b02a680..6e7d5fb942d20 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMZ.h
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_EMZ.h
@@ -3,19 +3,18 @@
 
 // FTFP_BERT_EMZ is a standard Geant4 Physics List FTFP_BERT with Option4
 //               EM Physics configuration: used GS multiple scattering model
-//               for e+- below 100 MeV. Very precised simulation for thin  
-//               layers. This configuration may be used for R&D of 
+//               for e+- below 100 MeV. Very precised simulation for thin
+//               layers. This configuration may be used for R&D of
 //               tracker and HGCal detector performnace. The similation
-//               is expected to be approximately two times slower then 
+//               is expected to be approximately two times slower then
 //               with the CMS production Physics List
 
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class FTFPCMS_BERT_EMZ: public PhysicsList {
-
+class FTFPCMS_BERT_EMZ : public PhysicsList {
 public:
-  FTFPCMS_BERT_EMZ(const edm::ParameterSet & p);
+  FTFPCMS_BERT_EMZ(const edm::ParameterSet& p);
 };
 
 #endif
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EML.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EML.cc
index b3bf3d071b8fb..49f271852ff81 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EML.cc
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EML.cc
@@ -15,27 +15,23 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsFTFP_BERT_HP.hh"
 
-FTFPCMS_BERT_HP_EML::FTFPCMS_BERT_HP_EML(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+FTFPCMS_BERT_HP_EML::FTFPCMS_BERT_HP_EML(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
   bool thermal = p.getUntrackedParameter<bool>("ThermalNeutrons");
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*CLHEP::ns;
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "FTFP_BERT_HP_EML \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking
-			      << "   t(ns)= " << timeLimit/CLHEP::ns
-			      << " ThermalNeutrons: " << thermal;
+                              << "FTFP_BERT_HP_EML \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking << "   t(ns)= " << timeLimit / CLHEP::ns
+                              << " ThermalNeutrons: " << thermal;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new CMSEmStandardPhysicsXS(ver));
+    RegisterPhysics(new CMSEmStandardPhysicsXS(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -43,32 +39,31 @@ FTFPCMS_BERT_HP_EML::FTFPCMS_BERT_HP_EML(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysicsHP(ver));
+    RegisterPhysics(new G4HadronElasticPhysicsHP(ver));
 
     // Hadron Physics
-    RegisterPhysics(  new G4HadronPhysicsFTFP_BERT_HP(ver));
+    RegisterPhysics(new G4HadronPhysicsFTFP_BERT_HP(ver));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+      G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
       ncut->SetTimeLimit(timeLimit);
       RegisterPhysics(ncut);
     }
-    if(thermal) {
+    if (thermal) {
       RegisterPhysics(new CMSThermalNeutrons(ver));
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EML.h b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EML.h
index fee723b02adf1..11b9afd3f5bd4 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EML.h
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EML.h
@@ -4,13 +4,9 @@
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class FTFPCMS_BERT_HP_EML: public PhysicsList {
-
+class FTFPCMS_BERT_HP_EML : public PhysicsList {
 public:
-  FTFPCMS_BERT_HP_EML(const edm::ParameterSet & p);
+  FTFPCMS_BERT_HP_EML(const edm::ParameterSet& p);
 };
 
 #endif
-
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EMM.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EMM.cc
index 3533be4c8e2ec..33a864dc79150 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EMM.cc
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EMM.cc
@@ -15,27 +15,23 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsFTFP_BERT_HP.hh"
 
-FTFPCMS_BERT_HP_EMM::FTFPCMS_BERT_HP_EMM(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+FTFPCMS_BERT_HP_EMM::FTFPCMS_BERT_HP_EMM(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
   bool thermal = p.getUntrackedParameter<bool>("ThermalNeutrons");
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*CLHEP::ns;
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "FTFP_BERT_HP_EMM \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking
-			      << "   t(ns)= " << timeLimit/CLHEP::ns
-			      << " ThermalNeutrons: " << thermal;
+                              << "FTFP_BERT_HP_EMM \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking << "   t(ns)= " << timeLimit / CLHEP::ns
+                              << " ThermalNeutrons: " << thermal;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new CMSEmStandardPhysicsLPM(ver));
+    RegisterPhysics(new CMSEmStandardPhysicsLPM(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -43,32 +39,31 @@ FTFPCMS_BERT_HP_EMM::FTFPCMS_BERT_HP_EMM(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysicsHP(ver));
+    RegisterPhysics(new G4HadronElasticPhysicsHP(ver));
 
     // Hadron Physics
-    RegisterPhysics(  new G4HadronPhysicsFTFP_BERT_HP(ver));
+    RegisterPhysics(new G4HadronPhysicsFTFP_BERT_HP(ver));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+      G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
       ncut->SetTimeLimit(timeLimit);
       RegisterPhysics(ncut);
     }
-    if(thermal) {
+    if (thermal) {
       RegisterPhysics(new CMSThermalNeutrons(ver));
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EMM.h b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EMM.h
index 1ea261cf4dad1..fcb1cfd562411 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EMM.h
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_HP_EMM.h
@@ -4,13 +4,9 @@
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class FTFPCMS_BERT_HP_EMM: public PhysicsList {
-
+class FTFPCMS_BERT_HP_EMM : public PhysicsList {
 public:
-  FTFPCMS_BERT_HP_EMM(const edm::ParameterSet & p);
+  FTFPCMS_BERT_HP_EMM(const edm::ParameterSet& p);
 };
 
 #endif
-
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_XS_EML.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_XS_EML.cc
index 7164ab2734015..f10c0d3a4b312 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_XS_EML.cc
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_XS_EML.cc
@@ -15,27 +15,23 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsFTFP_BERT.hh"
 
-FTFPCMS_BERT_XS_EML::FTFPCMS_BERT_XS_EML(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+FTFPCMS_BERT_XS_EML::FTFPCMS_BERT_XS_EML(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
   bool thermal = p.getUntrackedParameter<bool>("ThermalNeutrons");
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*CLHEP::ns;
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "FTFP_BERT_XS_EML \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking
-			      << "   t(ns)= " << timeLimit/CLHEP::ns
-			      << " ThermalNeutrons: " << thermal;
+                              << "FTFP_BERT_XS_EML \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking << "   t(ns)= " << timeLimit / CLHEP::ns
+                              << " ThermalNeutrons: " << thermal;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new CMSEmStandardPhysicsXS(ver));
+    RegisterPhysics(new CMSEmStandardPhysicsXS(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -43,32 +39,31 @@ FTFPCMS_BERT_XS_EML::FTFPCMS_BERT_XS_EML(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysicsXS(ver));
+    RegisterPhysics(new G4HadronElasticPhysicsXS(ver));
 
     // Hadron Physics
-    RegisterPhysics(  new G4HadronPhysicsFTFP_BERT(ver));
+    RegisterPhysics(new G4HadronPhysicsFTFP_BERT(ver));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+      G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
       ncut->SetTimeLimit(timeLimit);
       RegisterPhysics(ncut);
     }
-    if(thermal) {
+    if (thermal) {
       RegisterPhysics(new CMSThermalNeutrons(ver));
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_XS_EML.h b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_XS_EML.h
index b37d699a544e8..e4e1c7fad5d1b 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_XS_EML.h
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_BERT_XS_EML.h
@@ -4,13 +4,9 @@
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class FTFPCMS_BERT_XS_EML: public PhysicsList {
-
+class FTFPCMS_BERT_XS_EML : public PhysicsList {
 public:
-  FTFPCMS_BERT_XS_EML(const edm::ParameterSet & p);
+  FTFPCMS_BERT_XS_EML(const edm::ParameterSet& p);
 };
 
 #endif
-
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_EMM.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_EMM.cc
index cc50301a6466c..3a17821417387 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_EMM.cc
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_EMM.cc
@@ -13,25 +13,21 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsINCLXX.hh"
 
-FTFPCMS_INCLXX_EMM::FTFPCMS_INCLXX_EMM(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+FTFPCMS_INCLXX_EMM::FTFPCMS_INCLXX_EMM(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*CLHEP::ns;
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "FTFP_INCLXX_EMM \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking
-			      << "   t(ns)= " << timeLimit/CLHEP::ns;
+                              << "FTFP_INCLXX_EMM \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking << "   t(ns)= " << timeLimit / CLHEP::ns;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new CMSEmStandardPhysicsLPM(ver));
+    RegisterPhysics(new CMSEmStandardPhysicsLPM(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -39,29 +35,28 @@ FTFPCMS_INCLXX_EMM::FTFPCMS_INCLXX_EMM(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysics(ver));
+    RegisterPhysics(new G4HadronElasticPhysics(ver));
 
     // Hadron Physics
-    RegisterPhysics( new G4HadronPhysicsINCLXX(ver,true,false,true));
+    RegisterPhysics(new G4HadronPhysicsINCLXX(ver, true, false, true));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonINCLXXPhysics(ver));
+    RegisterPhysics(new G4IonINCLXXPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+      G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
       ncut->SetTimeLimit(timeLimit);
       RegisterPhysics(ncut);
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_EMM.h b/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_EMM.h
index ede625721130d..5ce2d94ef7d9e 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_EMM.h
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_EMM.h
@@ -4,13 +4,9 @@
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class FTFPCMS_INCLXX_EMM: public PhysicsList {
-
+class FTFPCMS_INCLXX_EMM : public PhysicsList {
 public:
-  FTFPCMS_INCLXX_EMM(const edm::ParameterSet & p);
+  FTFPCMS_INCLXX_EMM(const edm::ParameterSet& p);
 };
 
 #endif
-
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_HP_EMM.cc b/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_HP_EMM.cc
index 85471b5b30a1f..87e2aeeda6efb 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_HP_EMM.cc
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_HP_EMM.cc
@@ -15,27 +15,23 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsINCLXX.hh"
 
-FTFPCMS_INCLXX_HP_EMM::FTFPCMS_INCLXX_HP_EMM(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+FTFPCMS_INCLXX_HP_EMM::FTFPCMS_INCLXX_HP_EMM(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
   bool thermal = p.getUntrackedParameter<bool>("ThermalNeutrons");
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*CLHEP::ns;
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "FTFP_INCLXX_HP_EMM \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking
-			      << "   t(ns)= " << timeLimit/CLHEP::ns
-			      << " ThermalNeutrons: " << thermal;
+                              << "FTFP_INCLXX_HP_EMM \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking << "   t(ns)= " << timeLimit / CLHEP::ns
+                              << " ThermalNeutrons: " << thermal;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new CMSEmStandardPhysicsLPM(ver));
+    RegisterPhysics(new CMSEmStandardPhysicsLPM(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -43,32 +39,31 @@ FTFPCMS_INCLXX_HP_EMM::FTFPCMS_INCLXX_HP_EMM(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysicsHP(ver));
+    RegisterPhysics(new G4HadronElasticPhysicsHP(ver));
 
     // Hadron Physics
-    RegisterPhysics( new G4HadronPhysicsINCLXX(ver,true,true,true));
+    RegisterPhysics(new G4HadronPhysicsINCLXX(ver, true, true, true));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonINCLXXPhysics(ver));
+    RegisterPhysics(new G4IonINCLXXPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+      G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
       ncut->SetTimeLimit(timeLimit);
       RegisterPhysics(ncut);
     }
-    if(thermal) {
+    if (thermal) {
       RegisterPhysics(new CMSThermalNeutrons(ver));
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_HP_EMM.h b/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_HP_EMM.h
index fa4367c268bbb..6ea5328db5d18 100644
--- a/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_HP_EMM.h
+++ b/SimG4Core/PhysicsLists/plugins/FTFPCMS_INCLXX_HP_EMM.h
@@ -4,13 +4,9 @@
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class FTFPCMS_INCLXX_HP_EMM: public PhysicsList {
-
+class FTFPCMS_INCLXX_HP_EMM : public PhysicsList {
 public:
-  FTFPCMS_INCLXX_HP_EMM(const edm::ParameterSet & p);
+  FTFPCMS_INCLXX_HP_EMM(const edm::ParameterSet& p);
 };
 
 #endif
-
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/QBBCCMS.cc b/SimG4Core/PhysicsLists/plugins/QBBCCMS.cc
index e11ef5ad6a6f5..19777a80c6ca2 100644
--- a/SimG4Core/PhysicsLists/plugins/QBBCCMS.cc
+++ b/SimG4Core/PhysicsLists/plugins/QBBCCMS.cc
@@ -13,24 +13,20 @@
 #include "G4IonPhysics.hh"
 #include "G4NeutronTrackingCut.hh"
 
-QBBCCMS::QBBCCMS(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+QBBCCMS::QBBCCMS(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "QBBC \n Flags for EM Physics "
-			      << emPhys << " and for Hadronic Physics "
-			      << hadPhys 
-			      << " and tracking cut " << tracking;
+                              << "QBBC \n Flags for EM Physics " << emPhys << " and for Hadronic Physics " << hadPhys
+                              << " and tracking cut " << tracking;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new G4EmStandardPhysics(ver));
+    RegisterPhysics(new G4EmStandardPhysics(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -47,7 +43,7 @@ QBBCCMS::QBBCCMS(const edm::ParameterSet & p)
     RegisterPhysics(new G4HadronElasticPhysicsXS(ver));
 
     // Hadron Physics
-    RegisterPhysics( new G4HadronInelasticQBBC(ver));
+    RegisterPhysics(new G4HadronInelasticQBBC(ver));
 
     // Stopping Physics
     RegisterPhysics(new G4StoppingPhysics(ver));
@@ -57,8 +53,7 @@ QBBCCMS::QBBCCMS(const edm::ParameterSet & p)
 
     // Neutron tracking cut
     if (tracking) {
-      RegisterPhysics( new G4NeutronTrackingCut(ver));
+      RegisterPhysics(new G4NeutronTrackingCut(ver));
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/QBBCCMS.h b/SimG4Core/PhysicsLists/plugins/QBBCCMS.h
index ad76ecae9427b..848c42b2e4bdc 100644
--- a/SimG4Core/PhysicsLists/plugins/QBBCCMS.h
+++ b/SimG4Core/PhysicsLists/plugins/QBBCCMS.h
@@ -4,11 +4,9 @@
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class QBBCCMS: public PhysicsList {
-
+class QBBCCMS : public PhysicsList {
 public:
-  QBBCCMS(const edm::ParameterSet & p);
+  QBBCCMS(const edm::ParameterSet& p);
 };
 
 #endif
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT.cc b/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT.cc
index da0027177733e..642bda5d1c059 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT.cc
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT.cc
@@ -13,23 +13,20 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsQGSP_BERT.hh"
 
-QGSPCMS_BERT::QGSPCMS_BERT(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+QGSPCMS_BERT::QGSPCMS_BERT(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "QGSP_BERT \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking;
+                              << "QGSP_BERT \n Flags for EM Physics " << emPhys << ", for Hadronic Physics " << hadPhys
+                              << " and tracking cut " << tracking;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new G4EmStandardPhysics(ver));
+    RegisterPhysics(new G4EmStandardPhysics(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -37,27 +34,26 @@ QGSPCMS_BERT::QGSPCMS_BERT(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysics(ver));
+    RegisterPhysics(new G4HadronElasticPhysics(ver));
 
     // Hadron Physics
-    RegisterPhysics(  new G4HadronPhysicsQGSP_BERT(ver));
+    RegisterPhysics(new G4HadronPhysicsQGSP_BERT(ver));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      RegisterPhysics( new G4NeutronTrackingCut(ver));
+      RegisterPhysics(new G4NeutronTrackingCut(ver));
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT.h b/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT.h
index c95cb3dee2ab4..00ce1ab9c4904 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT.h
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT.h
@@ -1,15 +1,12 @@
 #ifndef SimG4Core_PhysicsLists_QGSPCMS_BERT_H
 #define SimG4Core_PhysicsLists_QGSPCMS_BERT_H
- 
+
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
- 
-class QGSPCMS_BERT: public PhysicsList {
 
+class QGSPCMS_BERT : public PhysicsList {
 public:
-  QGSPCMS_BERT(const edm::ParameterSet & p);
+  QGSPCMS_BERT(const edm::ParameterSet& p);
 };
 
 #endif
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_EML.cc b/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_EML.cc
index 3cdef697e9300..34ead79e24ba1 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_EML.cc
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_EML.cc
@@ -13,23 +13,20 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsQGSP_BERT.hh"
 
-QGSPCMS_BERT_EML::QGSPCMS_BERT_EML(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+QGSPCMS_BERT_EML::QGSPCMS_BERT_EML(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "QGSP_BERT_EMY with Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking;
+                              << "QGSP_BERT_EMY with Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new CMSEmStandardPhysics(ver));
+    RegisterPhysics(new CMSEmStandardPhysics(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -37,27 +34,26 @@ QGSPCMS_BERT_EML::QGSPCMS_BERT_EML(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysics(ver));
+    RegisterPhysics(new G4HadronElasticPhysics(ver));
 
     // Hadron Physics
-    RegisterPhysics(  new G4HadronPhysicsQGSP_BERT(ver));
+    RegisterPhysics(new G4HadronPhysicsQGSP_BERT(ver));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      RegisterPhysics( new G4NeutronTrackingCut(ver));
+      RegisterPhysics(new G4NeutronTrackingCut(ver));
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_EML.h b/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_EML.h
index 07bf959583b82..894834957f29c 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_EML.h
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_EML.h
@@ -1,15 +1,12 @@
 #ifndef SimG4Core_PhysicsLists_QGSPCMS_BERT_EML_H
 #define SimG4Core_PhysicsLists_QGSPCMS_BERT_EML_H
- 
+
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
- 
-class QGSPCMS_BERT_EML: public PhysicsList {
 
+class QGSPCMS_BERT_EML : public PhysicsList {
 public:
-  QGSPCMS_BERT_EML(const edm::ParameterSet & p);
+  QGSPCMS_BERT_EML(const edm::ParameterSet& p);
 };
 
 #endif
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_EMV.cc b/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_EMV.cc
index 85778b221d0fe..e4f9884e7eac0 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_EMV.cc
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_EMV.cc
@@ -13,23 +13,20 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsQGSP_BERT.hh"
 
-QGSPCMS_BERT_EMV::QGSPCMS_BERT_EMV(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+QGSPCMS_BERT_EMV::QGSPCMS_BERT_EMV(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "QGSP_BERT_EMV \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking;
+                              << "QGSP_BERT_EMV \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new G4EmStandardPhysics_option1(ver));
+    RegisterPhysics(new G4EmStandardPhysics_option1(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -37,27 +34,26 @@ QGSPCMS_BERT_EMV::QGSPCMS_BERT_EMV(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysics(ver));
+    RegisterPhysics(new G4HadronElasticPhysics(ver));
 
     // Hadron Physics
-    RegisterPhysics(  new G4HadronPhysicsQGSP_BERT(ver));
+    RegisterPhysics(new G4HadronPhysicsQGSP_BERT(ver));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      RegisterPhysics( new G4NeutronTrackingCut(ver));
+      RegisterPhysics(new G4NeutronTrackingCut(ver));
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_EMV.h b/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_EMV.h
index bf207c005772c..6576573f536ef 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_EMV.h
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_EMV.h
@@ -1,15 +1,12 @@
 #ifndef SimG4Core_PhysicsLists_QGSPCMS_BERT_EMV_H
 #define SimG4Core_PhysicsLists_QGSPCMS_BERT_EMV_H
- 
+
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
- 
-class QGSPCMS_BERT_EMV: public PhysicsList {
 
+class QGSPCMS_BERT_EMV : public PhysicsList {
 public:
-  QGSPCMS_BERT_EMV(const edm::ParameterSet & p);
+  QGSPCMS_BERT_EMV(const edm::ParameterSet& p);
 };
 
 #endif
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_HP_EML.cc b/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_HP_EML.cc
index 94ca1db8b3d30..9664f47741ec8 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_HP_EML.cc
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_HP_EML.cc
@@ -13,23 +13,20 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsQGSP_BERT_HP.hh"
 
-QGSPCMS_BERT_HP_EML::QGSPCMS_BERT_HP_EML(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+QGSPCMS_BERT_HP_EML::QGSPCMS_BERT_HP_EML(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "QGSP_BERT_HP_EML \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking;
+                              << "QGSP_BERT_HP_EML \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new CMSEmStandardPhysics(ver));
+    RegisterPhysics(new CMSEmStandardPhysics(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -37,27 +34,26 @@ QGSPCMS_BERT_HP_EML::QGSPCMS_BERT_HP_EML(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysicsHP(ver));
+    RegisterPhysics(new G4HadronElasticPhysicsHP(ver));
 
     // Hadron Physics
-    RegisterPhysics(  new G4HadronPhysicsQGSP_BERT_HP(ver));
+    RegisterPhysics(new G4HadronPhysicsQGSP_BERT_HP(ver));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      RegisterPhysics( new G4NeutronTrackingCut(ver));
+      RegisterPhysics(new G4NeutronTrackingCut(ver));
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_HP_EML.h b/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_HP_EML.h
index db9dfff016981..cffdbd63cf0d5 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_HP_EML.h
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_BERT_HP_EML.h
@@ -4,11 +4,9 @@
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class QGSPCMS_BERT_HP_EML: public PhysicsList {
-
+class QGSPCMS_BERT_HP_EML : public PhysicsList {
 public:
-  QGSPCMS_BERT_HP_EML(const edm::ParameterSet & p);
+  QGSPCMS_BERT_HP_EML(const edm::ParameterSet& p);
 };
 
 #endif
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT.cc b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT.cc
index 7a2f033c2510c..fddc6b31d210c 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT.cc
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT.cc
@@ -13,25 +13,21 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsQGSP_FTFP_BERT.hh"
 
-QGSPCMS_FTFP_BERT::QGSPCMS_FTFP_BERT(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+QGSPCMS_FTFP_BERT::QGSPCMS_FTFP_BERT(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*CLHEP::ns;
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "QGSP_FTFP_BERT \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking
-			      << "   t(ns)= " << timeLimit/CLHEP::ns;
+                              << "QGSP_FTFP_BERT \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking << "   t(ns)= " << timeLimit / CLHEP::ns;
 
   if (emPhys) {
     // EM Physics
-    RegisterPhysics( new G4EmStandardPhysics(ver));
+    RegisterPhysics(new G4EmStandardPhysics(ver));
 
     // Synchroton Radiation & GN Physics
     G4EmExtraPhysics* gn = new G4EmExtraPhysics(ver);
@@ -39,29 +35,28 @@ QGSPCMS_FTFP_BERT::QGSPCMS_FTFP_BERT(const edm::ParameterSet & p)
   }
 
   // Decays
-  this->RegisterPhysics( new G4DecayPhysics(ver) );
+  this->RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
 
     // Hadron Elastic scattering
-    RegisterPhysics( new G4HadronElasticPhysics(ver));
+    RegisterPhysics(new G4HadronElasticPhysics(ver));
 
     // Hadron Physics
-    RegisterPhysics(  new G4HadronPhysicsQGSP_FTFP_BERT(ver));
+    RegisterPhysics(new G4HadronPhysicsQGSP_FTFP_BERT(ver));
 
     // Stopping Physics
-    RegisterPhysics( new G4StoppingPhysics(ver));
+    RegisterPhysics(new G4StoppingPhysics(ver));
 
     // Ion Physics
-    RegisterPhysics( new G4IonPhysics(ver));
+    RegisterPhysics(new G4IonPhysics(ver));
 
     // Neutron tracking cut
     if (tracking) {
-      G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+      G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
       ncut->SetTimeLimit(timeLimit);
       RegisterPhysics(ncut);
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT.h b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT.h
index e7525aeaa5832..e4bbf3ed7f6c6 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT.h
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT.h
@@ -1,15 +1,12 @@
 #ifndef SimG4Core_PhysicsLists_QGSPCMS_FTFP_BERT_H
 #define SimG4Core_PhysicsLists_QGSPCMS_FTFP_BERT_H
- 
+
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
- 
-class QGSPCMS_FTFP_BERT: public PhysicsList {
 
+class QGSPCMS_FTFP_BERT : public PhysicsList {
 public:
-  QGSPCMS_FTFP_BERT(const edm::ParameterSet & p);
+  QGSPCMS_FTFP_BERT(const edm::ParameterSet& p);
 };
 
 #endif
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EML.cc b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EML.cc
index 074ceb5115260..25c9db07b4578 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EML.cc
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EML.cc
@@ -13,21 +13,17 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsQGSP_FTFP_BERT.hh"
 
-QGSPCMS_FTFP_BERT_EML::QGSPCMS_FTFP_BERT_EML(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+QGSPCMS_FTFP_BERT_EML::QGSPCMS_FTFP_BERT_EML(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*CLHEP::ns;
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "QGSP_FTFP_BERT_EML \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking
-			      << "   t(ns)= " << timeLimit/CLHEP::ns;
+                              << "QGSP_FTFP_BERT_EML \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking << "   t(ns)= " << timeLimit / CLHEP::ns;
 
   if (emPhys) {
     // EM Physics
@@ -39,7 +35,7 @@ QGSPCMS_FTFP_BERT_EML::QGSPCMS_FTFP_BERT_EML(const edm::ParameterSet & p)
   }
 
   // Decays
-  RegisterPhysics(new G4DecayPhysics(ver) );
+  RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
@@ -58,10 +54,9 @@ QGSPCMS_FTFP_BERT_EML::QGSPCMS_FTFP_BERT_EML(const edm::ParameterSet & p)
 
     // Neutron tracking cut
     if (tracking) {
-      G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+      G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
       ncut->SetTimeLimit(timeLimit);
       RegisterPhysics(ncut);
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EML.h b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EML.h
index bae2dee921294..54a8ef5a18928 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EML.h
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EML.h
@@ -1,15 +1,12 @@
 #ifndef SimG4Core_PhysicsLists_QGSPCMS_FTFP_BERT_EML_H
 #define SimG4Core_PhysicsLists_QGSPCMS_FTFP_BERT_EML_H
- 
+
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
- 
-class QGSPCMS_FTFP_BERT_EML: public PhysicsList {
 
+class QGSPCMS_FTFP_BERT_EML : public PhysicsList {
 public:
-  QGSPCMS_FTFP_BERT_EML(const edm::ParameterSet & p);
+  QGSPCMS_FTFP_BERT_EML(const edm::ParameterSet& p);
 };
 
 #endif
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMM.cc b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMM.cc
index bd0329ef4862f..4b967a77de83e 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMM.cc
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMM.cc
@@ -13,21 +13,17 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsQGSP_FTFP_BERT.hh"
 
-QGSPCMS_FTFP_BERT_EMM::QGSPCMS_FTFP_BERT_EMM(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+QGSPCMS_FTFP_BERT_EMM::QGSPCMS_FTFP_BERT_EMM(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*CLHEP::ns;
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "QGSP_FTFP_BERT_EMM \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking
-			      << "   t(ns)= " << timeLimit/CLHEP::ns;
+                              << "QGSP_FTFP_BERT_EMM \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking << "   t(ns)= " << timeLimit / CLHEP::ns;
 
   if (emPhys) {
     // EM Physics
@@ -39,7 +35,7 @@ QGSPCMS_FTFP_BERT_EMM::QGSPCMS_FTFP_BERT_EMM(const edm::ParameterSet & p)
   }
 
   // Decays
-  RegisterPhysics(new G4DecayPhysics(ver) );
+  RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
@@ -58,10 +54,9 @@ QGSPCMS_FTFP_BERT_EMM::QGSPCMS_FTFP_BERT_EMM(const edm::ParameterSet & p)
 
     // Neutron tracking cut
     if (tracking) {
-      G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+      G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
       ncut->SetTimeLimit(timeLimit);
       RegisterPhysics(ncut);
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMM.h b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMM.h
index ed1c27d448197..401ac88fae528 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMM.h
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMM.h
@@ -1,15 +1,12 @@
 #ifndef SimG4Core_PhysicsLists_QGSPCMS_FTFP_BERT_EMM_H
 #define SimG4Core_PhysicsLists_QGSPCMS_FTFP_BERT_EMM_H
- 
+
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
- 
-class QGSPCMS_FTFP_BERT_EMM: public PhysicsList {
 
+class QGSPCMS_FTFP_BERT_EMM : public PhysicsList {
 public:
-  QGSPCMS_FTFP_BERT_EMM(const edm::ParameterSet & p);
+  QGSPCMS_FTFP_BERT_EMM(const edm::ParameterSet& p);
 };
 
 #endif
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMN.cc b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMN.cc
index 648328039f0c8..343a24ba773ce 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMN.cc
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMN.cc
@@ -13,21 +13,17 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsQGSP_FTFP_BERT.hh"
 
-QGSPCMS_FTFP_BERT_EMN::QGSPCMS_FTFP_BERT_EMN(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+QGSPCMS_FTFP_BERT_EMN::QGSPCMS_FTFP_BERT_EMN(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*CLHEP::ns;
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "QGSP_FTFP_BERT_EMN \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking
-			      << "   t(ns)= " << timeLimit/CLHEP::ns;
+                              << "QGSP_FTFP_BERT_EMN \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking << "   t(ns)= " << timeLimit / CLHEP::ns;
 
   if (emPhys) {
     // EM Physics
@@ -39,7 +35,7 @@ QGSPCMS_FTFP_BERT_EMN::QGSPCMS_FTFP_BERT_EMN(const edm::ParameterSet & p)
   }
 
   // Decays
-  RegisterPhysics(new G4DecayPhysics(ver) );
+  RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
@@ -58,10 +54,9 @@ QGSPCMS_FTFP_BERT_EMN::QGSPCMS_FTFP_BERT_EMN(const edm::ParameterSet & p)
 
     // Neutron tracking cut
     if (tracking) {
-      G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+      G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
       ncut->SetTimeLimit(timeLimit);
       RegisterPhysics(ncut);
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMN.h b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMN.h
index e8c18f35383ad..87e2040c1e018 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMN.h
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMN.h
@@ -1,15 +1,12 @@
 #ifndef SimG4Core_PhysicsLists_QGSPCMS_FTFP_BERT_EMN_H
 #define SimG4Core_PhysicsLists_QGSPCMS_FTFP_BERT_EMN_H
- 
+
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
- 
-class QGSPCMS_FTFP_BERT_EMN: public PhysicsList {
 
+class QGSPCMS_FTFP_BERT_EMN : public PhysicsList {
 public:
-  QGSPCMS_FTFP_BERT_EMN(const edm::ParameterSet & p);
+  QGSPCMS_FTFP_BERT_EMN(const edm::ParameterSet& p);
 };
 
 #endif
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMY.cc b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMY.cc
index f3982d3eb8e51..4fb71410278bf 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMY.cc
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMY.cc
@@ -13,21 +13,17 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsQGSP_FTFP_BERT.hh"
 
-QGSPCMS_FTFP_BERT_EMY::QGSPCMS_FTFP_BERT_EMY(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+QGSPCMS_FTFP_BERT_EMY::QGSPCMS_FTFP_BERT_EMY(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*CLHEP::ns;
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "QGSP_FTFP_BERT_EMY \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking
-			      << "   t(ns)= " << timeLimit/CLHEP::ns;
+                              << "QGSP_FTFP_BERT_EMY \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking << "   t(ns)= " << timeLimit / CLHEP::ns;
 
   if (emPhys) {
     // EM Physics
@@ -39,7 +35,7 @@ QGSPCMS_FTFP_BERT_EMY::QGSPCMS_FTFP_BERT_EMY(const edm::ParameterSet & p)
   }
 
   // Decays
-  RegisterPhysics(new G4DecayPhysics(ver) );
+  RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
@@ -58,10 +54,9 @@ QGSPCMS_FTFP_BERT_EMY::QGSPCMS_FTFP_BERT_EMY(const edm::ParameterSet & p)
 
     // Neutron tracking cut
     if (tracking) {
-      G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+      G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
       ncut->SetTimeLimit(timeLimit);
       RegisterPhysics(ncut);
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMY.h b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMY.h
index e674cac48219b..4093e349438b5 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMY.h
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMY.h
@@ -1,23 +1,19 @@
 #ifndef SimG4Core_PhysicsLists_QGSPCMS_FTFP_BERT_EMY_H
 #define SimG4Core_PhysicsLists_QGSPCMS_FTFP_BERT_EMY_H 1
 
-// QGSP_FTFP_BERT_EMY  is a standard Geant4 Physics List QGSP_FTFP_BERT 
-//                     with Option3 EM Physics configuration: forced more steps 
+// QGSP_FTFP_BERT_EMY  is a standard Geant4 Physics List QGSP_FTFP_BERT
+//                     with Option3 EM Physics configuration: forced more steps
 //                     of e+- near geometry boundary. This configuration may be
-//                     used for R&D of tracker and HGCal detector performnace. 
+//                     used for R&D of tracker and HGCal detector performnace.
 //                     The similation is expected to be approximately two times
 //                     slower then with the CMS production Physics List
 
- 
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
- 
-class QGSPCMS_FTFP_BERT_EMY: public PhysicsList {
 
+class QGSPCMS_FTFP_BERT_EMY : public PhysicsList {
 public:
-  QGSPCMS_FTFP_BERT_EMY(const edm::ParameterSet & p);
+  QGSPCMS_FTFP_BERT_EMY(const edm::ParameterSet& p);
 };
 
 #endif
-
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMZ.cc b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMZ.cc
index e33627853d448..d7e68494a179d 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMZ.cc
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMZ.cc
@@ -13,21 +13,17 @@
 #include "G4DataQuestionaire.hh"
 #include "G4HadronPhysicsQGSP_FTFP_BERT.hh"
 
-QGSPCMS_FTFP_BERT_EMZ::QGSPCMS_FTFP_BERT_EMZ(const edm::ParameterSet & p) 
-  : PhysicsList(p) {
-
+QGSPCMS_FTFP_BERT_EMZ::QGSPCMS_FTFP_BERT_EMZ(const edm::ParameterSet& p) : PhysicsList(p) {
   G4DataQuestionaire it(photon);
-  
-  int  ver     = p.getUntrackedParameter<int>("Verbosity",0);
-  bool emPhys  = p.getUntrackedParameter<bool>("EMPhysics",true);
-  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics",true);
-  bool tracking= p.getParameter<bool>("TrackingCut");
-  double timeLimit = p.getParameter<double>("MaxTrackTime")*CLHEP::ns;
+
+  int ver = p.getUntrackedParameter<int>("Verbosity", 0);
+  bool emPhys = p.getUntrackedParameter<bool>("EMPhysics", true);
+  bool hadPhys = p.getUntrackedParameter<bool>("HadPhysics", true);
+  bool tracking = p.getParameter<bool>("TrackingCut");
+  double timeLimit = p.getParameter<double>("MaxTrackTime") * CLHEP::ns;
   edm::LogInfo("PhysicsList") << "You are using the simulation engine: "
-			      << "QGSP_FTFP_BERT_EMZ \n Flags for EM Physics "
-			      << emPhys << ", for Hadronic Physics "
-			      << hadPhys << " and tracking cut " << tracking
-			      << "   t(ns)= " << timeLimit/CLHEP::ns;
+                              << "QGSP_FTFP_BERT_EMZ \n Flags for EM Physics " << emPhys << ", for Hadronic Physics "
+                              << hadPhys << " and tracking cut " << tracking << "   t(ns)= " << timeLimit / CLHEP::ns;
 
   if (emPhys) {
     // EM Physics
@@ -39,7 +35,7 @@ QGSPCMS_FTFP_BERT_EMZ::QGSPCMS_FTFP_BERT_EMZ(const edm::ParameterSet & p)
   }
 
   // Decays
-  RegisterPhysics(new G4DecayPhysics(ver) );
+  RegisterPhysics(new G4DecayPhysics(ver));
 
   if (hadPhys) {
     G4HadronicProcessStore::Instance()->SetVerbose(ver);
@@ -58,10 +54,9 @@ QGSPCMS_FTFP_BERT_EMZ::QGSPCMS_FTFP_BERT_EMZ(const edm::ParameterSet & p)
 
     // Neutron tracking cut
     if (tracking) {
-      G4NeutronTrackingCut* ncut= new G4NeutronTrackingCut(ver);
+      G4NeutronTrackingCut* ncut = new G4NeutronTrackingCut(ver);
       ncut->SetTimeLimit(timeLimit);
       RegisterPhysics(ncut);
     }
   }
 }
-
diff --git a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMZ.h b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMZ.h
index 60a01b1f5448b..4ad377f5333a6 100644
--- a/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMZ.h
+++ b/SimG4Core/PhysicsLists/plugins/QGSPCMS_FTFP_BERT_EMZ.h
@@ -2,22 +2,19 @@
 #define SimG4Core_PhysicsLists_QGSPCMS_FTFP_BERT_EMZ_H 1
 
 // QGSP_FTFP_BERT_EMZ is a standard Geant4 Physics List FTFP_BERT with Option4
-//                    EM Physics configuration: used GS multiple scattering 
-//                    model for e+- below 100 MeV. Very precised simulation 
-//                    for thin layers. This configuration may be used for R&D 
+//                    EM Physics configuration: used GS multiple scattering
+//                    model for e+- below 100 MeV. Very precised simulation
+//                    for thin layers. This configuration may be used for R&D
 //                    of tracker and HGCal detector performnace. The similation
-//                    is expected to be approximately two times slower then 
+//                    is expected to be approximately two times slower then
 //                    with the CMS production Physics List
- 
+
 #include "SimG4Core/Physics/interface/PhysicsList.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
- 
-class QGSPCMS_FTFP_BERT_EMZ: public PhysicsList {
 
+class QGSPCMS_FTFP_BERT_EMZ : public PhysicsList {
 public:
-  QGSPCMS_FTFP_BERT_EMZ(const edm::ParameterSet & p);
+  QGSPCMS_FTFP_BERT_EMZ(const edm::ParameterSet& p);
 };
 
 #endif
-
-
diff --git a/SimG4Core/PhysicsLists/src/CMSEmNoDeltaRay.cc b/SimG4Core/PhysicsLists/src/CMSEmNoDeltaRay.cc
index f7a219915b3ba..ac99098202bff 100644
--- a/SimG4Core/PhysicsLists/src/CMSEmNoDeltaRay.cc
+++ b/SimG4Core/PhysicsLists/src/CMSEmNoDeltaRay.cc
@@ -66,8 +66,8 @@
 #include "G4BuilderType.hh"
 #include "G4SystemOfUnits.hh"
 
-CMSEmNoDeltaRay::CMSEmNoDeltaRay(const G4String& name, G4int ver, const std::string& reg):
-  G4VPhysicsConstructor(name), verbose(ver), region(reg) {
+CMSEmNoDeltaRay::CMSEmNoDeltaRay(const G4String& name, G4int ver, const std::string& reg)
+    : G4VPhysicsConstructor(name), verbose(ver), region(reg) {
   G4EmParameters* param = G4EmParameters::Instance();
   param->SetDefaults();
   param->SetVerbose(verbose);
@@ -135,104 +135,72 @@ void CMSEmNoDeltaRay::ConstructProcess() {
 
   G4ParticleTable* table = G4ParticleTable::GetParticleTable();
   EmParticleList emList;
-  for(const auto& particleName : emList.PartNames()) {
+  for (const auto& particleName : emList.PartNames()) {
     G4ParticleDefinition* particle = table->FindParticle(particleName);
     G4ProcessManager* pmanager = particle->GetProcessManager();
-    if(verbose > 1)
-      G4cout << "### " << GetPhysicsName() << " instantiates for " 
-	     << particleName << " at " << particle << G4endl;
+    if (verbose > 1)
+      G4cout << "### " << GetPhysicsName() << " instantiates for " << particleName << " at " << particle << G4endl;
 
     if (particleName == "gamma") {
-
       pmanager->AddDiscreteProcess(new G4PhotoElectricEffect);
       pmanager->AddDiscreteProcess(new G4ComptonScattering);
       pmanager->AddDiscreteProcess(new G4GammaConversion);
 
     } else if (particleName == "e-") {
-
       G4eMultipleScattering* msc = new G4eMultipleScattering;
       msc->SetStepLimitType(fMinimal);
       if (reg != nullptr) {
-	G4UrbanMscModel* msc_el  = new G4UrbanMscModel();
-	msc_el->SetRangeFactor(0.04);
-	msc->AddEmModel(0,msc_el,reg);
+        G4UrbanMscModel* msc_el = new G4UrbanMscModel();
+        msc_el->SetRangeFactor(0.04);
+        msc->AddEmModel(0, msc_el, reg);
       }
-      pmanager->AddProcess(msc,                   -1, 1, 1);
-      pmanager->AddProcess(new G4hhIonisation,    -1, 2, 2);
-      pmanager->AddProcess(new G4eBremsstrahlung, -1,-3, 3);
+      pmanager->AddProcess(msc, -1, 1, 1);
+      pmanager->AddProcess(new G4hhIonisation, -1, 2, 2);
+      pmanager->AddProcess(new G4eBremsstrahlung, -1, -3, 3);
 
     } else if (particleName == "e+") {
-
       //      G4eIonisation* eioni = new G4eIonisation();
       //      eioni->SetStepFunction(0.8, 1.0*mm);
       G4eMultipleScattering* msc = new G4eMultipleScattering;
       msc->SetStepLimitType(fMinimal);
       if (reg != nullptr) {
-	G4UrbanMscModel* msc_pos  = new G4UrbanMscModel();
-	msc_pos->SetRangeFactor(0.04);
-	msc->AddEmModel(0,msc_pos,reg);
+        G4UrbanMscModel* msc_pos = new G4UrbanMscModel();
+        msc_pos->SetRangeFactor(0.04);
+        msc->AddEmModel(0, msc_pos, reg);
       }
-      pmanager->AddProcess(msc,                     -1, 1, 1);
-      pmanager->AddProcess(new G4hhIonisation,      -1, 2, 2);
-      pmanager->AddProcess(new G4eBremsstrahlung,   -1,-3, 3);
-      pmanager->AddProcess(new G4eplusAnnihilation,  0,-1, 4);
-
-    } else if (particleName == "mu+" ||
-               particleName == "mu-"    ) {
+      pmanager->AddProcess(msc, -1, 1, 1);
+      pmanager->AddProcess(new G4hhIonisation, -1, 2, 2);
+      pmanager->AddProcess(new G4eBremsstrahlung, -1, -3, 3);
+      pmanager->AddProcess(new G4eplusAnnihilation, 0, -1, 4);
 
+    } else if (particleName == "mu+" || particleName == "mu-") {
       pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
-      pmanager->AddProcess(new G4hhIonisation,        -1, 2, 2);
-      pmanager->AddProcess(new G4MuBremsstrahlung,    -1,-3, 3);
-      pmanager->AddProcess(new G4MuPairProduction,    -1,-4, 4);
-
-    } else if (particleName == "alpha" ||
-               particleName == "He3" ||
-               particleName == "GenericIon") {
+      pmanager->AddProcess(new G4hhIonisation, -1, 2, 2);
+      pmanager->AddProcess(new G4MuBremsstrahlung, -1, -3, 3);
+      pmanager->AddProcess(new G4MuPairProduction, -1, -4, 4);
 
+    } else if (particleName == "alpha" || particleName == "He3" || particleName == "GenericIon") {
       pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
-      pmanager->AddProcess(new G4hhIonisation,        -1, 2, 2);
-
-    } else if (particleName == "pi+" ||
-	       particleName == "kaon+" ||
-	       particleName == "kaon-" ||
-	       particleName == "proton" ||
-	       particleName == "pi-" ) {
+      pmanager->AddProcess(new G4hhIonisation, -1, 2, 2);
 
+    } else if (particleName == "pi+" || particleName == "kaon+" || particleName == "kaon-" ||
+               particleName == "proton" || particleName == "pi-") {
       pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
-      pmanager->AddProcess(new G4hhIonisation,        -1, 2, 2);
-      pmanager->AddProcess(new G4hBremsstrahlung(),   -1,-3, 3);
-      pmanager->AddProcess(new G4hPairProduction(),   -1,-4, 4);
-
-    } else if (particleName == "B+" ||
-	       particleName == "B-" ||
-	       particleName == "D+" ||
-	       particleName == "D-" ||
-	       particleName == "Ds+" ||
-	       particleName == "Ds-" ||
-               particleName == "anti_lambda_c+" ||
-               particleName == "anti_omega-" ||
-               particleName == "anti_proton" ||
-               particleName == "anti_sigma_c+" ||
-               particleName == "anti_sigma_c++" ||
-               particleName == "anti_sigma+" ||
-               particleName == "anti_sigma-" ||
-               particleName == "anti_xi_c+" ||
-               particleName == "anti_xi-" ||
-               particleName == "deuteron" ||
-	       particleName == "lambda_c+" ||
-               particleName == "omega-" ||
-               particleName == "sigma_c+" ||
-               particleName == "sigma_c++" ||
-               particleName == "sigma+" ||
-               particleName == "sigma-" ||
-               particleName == "tau+" ||
-               particleName == "tau-" ||
-               particleName == "triton" ||
-               particleName == "xi_c+" ||
-               particleName == "xi-" ) {
-
+      pmanager->AddProcess(new G4hhIonisation, -1, 2, 2);
+      pmanager->AddProcess(new G4hBremsstrahlung(), -1, -3, 3);
+      pmanager->AddProcess(new G4hPairProduction(), -1, -4, 4);
+
+    } else if (particleName == "B+" || particleName == "B-" || particleName == "D+" || particleName == "D-" ||
+               particleName == "Ds+" || particleName == "Ds-" || particleName == "anti_lambda_c+" ||
+               particleName == "anti_omega-" || particleName == "anti_proton" || particleName == "anti_sigma_c+" ||
+               particleName == "anti_sigma_c++" || particleName == "anti_sigma+" || particleName == "anti_sigma-" ||
+               particleName == "anti_xi_c+" || particleName == "anti_xi-" || particleName == "deuteron" ||
+               particleName == "lambda_c+" || particleName == "omega-" || particleName == "sigma_c+" ||
+               particleName == "sigma_c++" || particleName == "sigma+" || particleName == "sigma-" ||
+               particleName == "tau+" || particleName == "tau-" || particleName == "triton" ||
+               particleName == "xi_c+" || particleName == "xi-") {
       pmanager->AddProcess(new G4hMultipleScattering, -1, 1, 1);
-      pmanager->AddProcess(new G4hhIonisation,        -1, 2, 2);
+      pmanager->AddProcess(new G4hhIonisation, -1, 2, 2);
     }
   }
 }
diff --git a/SimG4Core/PhysicsLists/src/CMSEmStandardPhysics.cc b/SimG4Core/PhysicsLists/src/CMSEmStandardPhysics.cc
index afd8eddff3f44..e4b1cd8f98292 100644
--- a/SimG4Core/PhysicsLists/src/CMSEmStandardPhysics.cc
+++ b/SimG4Core/PhysicsLists/src/CMSEmStandardPhysics.cc
@@ -72,13 +72,12 @@
 
 #include "G4SystemOfUnits.hh"
 
-CMSEmStandardPhysics::CMSEmStandardPhysics(G4int ver) :
-  G4VPhysicsConstructor("CMSEmStandard_eml"), verbose(ver) {
+CMSEmStandardPhysics::CMSEmStandardPhysics(G4int ver) : G4VPhysicsConstructor("CMSEmStandard_eml"), verbose(ver) {
   G4EmParameters* param = G4EmParameters::Instance();
   param->SetDefaults();
   param->SetVerbose(verbose);
   param->SetApplyCuts(true);
-  param->SetStepFunction(0.8, 1*CLHEP::mm);
+  param->SetStepFunction(0.8, 1 * CLHEP::mm);
   param->SetMscRangeFactor(0.2);
   param->SetMscStepLimitType(fMinimal);
   SetPhysicsType(bElectromagnetic);
@@ -133,8 +132,7 @@ void CMSEmStandardPhysics::ConstructParticle() {
 }
 
 void CMSEmStandardPhysics::ConstructProcess() {
-
-  if(verbose > 0) {
+  if (verbose > 0) {
     G4cout << "### " << GetPhysicsName() << " Construct Processes " << G4endl;
   }
 
@@ -156,9 +154,9 @@ void CMSEmStandardPhysics::ConstructProcess() {
 
   // muon & hadron multiple scattering
   G4MuMultipleScattering* mumsc = nullptr;
-  G4hMultipleScattering*  pimsc = nullptr;
-  G4hMultipleScattering*  kmsc = nullptr;
-  G4hMultipleScattering*  hmsc = nullptr;
+  G4hMultipleScattering* pimsc = nullptr;
+  G4hMultipleScattering* kmsc = nullptr;
+  G4hMultipleScattering* hmsc = nullptr;
 
   // muon and hadron single scattering
   G4CoulombScattering* muss = nullptr;
@@ -166,21 +164,19 @@ void CMSEmStandardPhysics::ConstructProcess() {
   G4CoulombScattering* kss = nullptr;
 
   // high energy limit for e+- scattering models and bremsstrahlung
-  G4double highEnergyLimit = 100*MeV;
+  G4double highEnergyLimit = 100 * MeV;
 
   G4ParticleTable* table = G4ParticleTable::GetParticleTable();
   EmParticleList emList;
-  for(const auto& particleName : emList.PartNames()) {
+  for (const auto& particleName : emList.PartNames()) {
     G4ParticleDefinition* particle = table->FindParticle(particleName);
 
     if (particleName == "gamma") {
-
       ph->RegisterProcess(new G4PhotoElectricEffect(), particle);
       ph->RegisterProcess(new G4ComptonScattering(), particle);
       ph->RegisterProcess(new G4GammaConversion(), particle);
 
     } else if (particleName == "e-") {
-
       G4eIonisation* eioni = new G4eIonisation();
 
       G4eMultipleScattering* msc = new G4eMultipleScattering;
@@ -191,9 +187,9 @@ void CMSEmStandardPhysics::ConstructProcess() {
       msc->SetEmModel(msc1);
       msc->SetEmModel(msc2);
 
-      G4eCoulombScatteringModel* ssm = new G4eCoulombScatteringModel(); 
+      G4eCoulombScatteringModel* ssm = new G4eCoulombScatteringModel();
       G4CoulombScattering* ss = new G4CoulombScattering();
-      ss->SetEmModel(ssm); 
+      ss->SetEmModel(ssm);
       ss->SetMinKinEnergy(highEnergyLimit);
       ssm->SetLowEnergyLimit(highEnergyLimit);
       ssm->SetActivationLowEnergyLimit(highEnergyLimit);
@@ -204,7 +200,6 @@ void CMSEmStandardPhysics::ConstructProcess() {
       ph->RegisterProcess(ss, particle);
 
     } else if (particleName == "e+") {
-
       G4eIonisation* eioni = new G4eIonisation();
 
       G4eMultipleScattering* msc = new G4eMultipleScattering;
@@ -215,9 +210,9 @@ void CMSEmStandardPhysics::ConstructProcess() {
       msc->SetEmModel(msc1);
       msc->SetEmModel(msc2);
 
-      G4eCoulombScatteringModel* ssm = new G4eCoulombScatteringModel(); 
+      G4eCoulombScatteringModel* ssm = new G4eCoulombScatteringModel();
       G4CoulombScattering* ss = new G4CoulombScattering();
-      ss->SetEmModel(ssm); 
+      ss->SetEmModel(ssm);
       ss->SetMinKinEnergy(highEnergyLimit);
       ssm->SetLowEnergyLimit(highEnergyLimit);
       ssm->SetActivationLowEnergyLimit(highEnergyLimit);
@@ -228,14 +223,12 @@ void CMSEmStandardPhysics::ConstructProcess() {
       ph->RegisterProcess(new G4eplusAnnihilation(), particle);
       ph->RegisterProcess(ss, particle);
 
-    } else if (particleName == "mu+" ||
-               particleName == "mu-" ) {
-
-      if(nullptr == mub) {
-	mub = new G4MuBremsstrahlung();
-	mup = new G4MuPairProduction();
-	mumsc = new G4MuMultipleScattering();
-	mumsc->SetEmModel(new G4WentzelVIModel());
+    } else if (particleName == "mu+" || particleName == "mu-") {
+      if (nullptr == mub) {
+        mub = new G4MuBremsstrahlung();
+        mup = new G4MuPairProduction();
+        mumsc = new G4MuMultipleScattering();
+        mumsc->SetEmModel(new G4WentzelVIModel());
         muss = new G4CoulombScattering();
       }
       ph->RegisterProcess(mumsc, particle);
@@ -244,28 +237,23 @@ void CMSEmStandardPhysics::ConstructProcess() {
       ph->RegisterProcess(mup, particle);
       ph->RegisterProcess(muss, particle);
 
-    } else if (particleName == "alpha" || 
-	       particleName == "He3" ) {
-
+    } else if (particleName == "alpha" || particleName == "He3") {
       ph->RegisterProcess(new G4hMultipleScattering(), particle);
       ph->RegisterProcess(new G4ionIonisation(), particle);
 
     } else if (particleName == "GenericIon") {
-
-      if(nullptr == hmsc) {
-	hmsc = new G4hMultipleScattering("ionmsc");
+      if (nullptr == hmsc) {
+        hmsc = new G4hMultipleScattering("ionmsc");
       }
       ph->RegisterProcess(hmsc, particle);
       ph->RegisterProcess(new G4ionIonisation(), particle);
 
-    } else if (particleName == "pi+" || 
-	       particleName == "pi-" ) {
-
-      if(nullptr == pib) {
-	pib = new G4hBremsstrahlung();
-	pip = new G4hPairProduction();
-	pimsc = new G4hMultipleScattering();
-	pimsc->SetEmModel(new G4WentzelVIModel());
+    } else if (particleName == "pi+" || particleName == "pi-") {
+      if (nullptr == pib) {
+        pib = new G4hBremsstrahlung();
+        pip = new G4hPairProduction();
+        pimsc = new G4hMultipleScattering();
+        pimsc->SetEmModel(new G4WentzelVIModel());
         piss = new G4CoulombScattering();
       }
       ph->RegisterProcess(pimsc, particle);
@@ -274,14 +262,12 @@ void CMSEmStandardPhysics::ConstructProcess() {
       ph->RegisterProcess(pip, particle);
       ph->RegisterProcess(piss, particle);
 
-    } else if (particleName == "kaon+" ||
-               particleName == "kaon-" ) {
-
-      if(nullptr == kb) {
-	kb = new G4hBremsstrahlung();
+    } else if (particleName == "kaon+" || particleName == "kaon-") {
+      if (nullptr == kb) {
+        kb = new G4hBremsstrahlung();
         kp = new G4hPairProduction();
-	kmsc = new G4hMultipleScattering();
-	kmsc->SetEmModel(new G4WentzelVIModel());
+        kmsc = new G4hMultipleScattering();
+        kmsc->SetEmModel(new G4WentzelVIModel());
         kss = new G4CoulombScattering();
       }
       ph->RegisterProcess(kmsc, particle);
@@ -290,12 +276,10 @@ void CMSEmStandardPhysics::ConstructProcess() {
       ph->RegisterProcess(kp, particle);
       ph->RegisterProcess(kss, particle);
 
-    } else if (particleName == "proton" ||
-	       particleName == "anti_proton") {
-
-      if(nullptr == pb) {
-	pb = new G4hBremsstrahlung();
-	pp = new G4hPairProduction();
+    } else if (particleName == "proton" || particleName == "anti_proton") {
+      if (nullptr == pb) {
+        pb = new G4hBremsstrahlung();
+        pp = new G4hPairProduction();
       }
       G4hMultipleScattering* pmsc = new G4hMultipleScattering();
       pmsc->SetEmModel(new G4WentzelVIModel());
@@ -307,39 +291,18 @@ void CMSEmStandardPhysics::ConstructProcess() {
       ph->RegisterProcess(pp, particle);
       ph->RegisterProcess(pss, particle);
 
-    } else if (particleName == "B+" ||
-	       particleName == "B-" ||
-	       particleName == "D+" ||
-	       particleName == "D-" ||
-	       particleName == "Ds+" ||
-	       particleName == "Ds-" ||
-               particleName == "anti_He3" ||
-               particleName == "anti_alpha" ||
-               particleName == "anti_deuteron" ||
-               particleName == "anti_lambda_c+" ||
-               particleName == "anti_omega-" ||
-               particleName == "anti_sigma_c+" ||
-               particleName == "anti_sigma_c++" ||
-               particleName == "anti_sigma+" ||
-               particleName == "anti_sigma-" ||
-               particleName == "anti_triton" ||
-               particleName == "anti_xi_c+" ||
-               particleName == "anti_xi-" ||
-               particleName == "deuteron" ||
-	       particleName == "lambda_c+" ||
-               particleName == "omega-" ||
-               particleName == "sigma_c+" ||
-               particleName == "sigma_c++" ||
-               particleName == "sigma+" ||
-               particleName == "sigma-" ||
-               particleName == "tau+" ||
-               particleName == "tau-" ||
-               particleName == "triton" ||
-               particleName == "xi_c+" ||
-               particleName == "xi-" ) {
-
-      if(nullptr == hmsc) {
-	hmsc = new G4hMultipleScattering("ionmsc");
+    } else if (particleName == "B+" || particleName == "B-" || particleName == "D+" || particleName == "D-" ||
+               particleName == "Ds+" || particleName == "Ds-" || particleName == "anti_He3" ||
+               particleName == "anti_alpha" || particleName == "anti_deuteron" || particleName == "anti_lambda_c+" ||
+               particleName == "anti_omega-" || particleName == "anti_sigma_c+" || particleName == "anti_sigma_c++" ||
+               particleName == "anti_sigma+" || particleName == "anti_sigma-" || particleName == "anti_triton" ||
+               particleName == "anti_xi_c+" || particleName == "anti_xi-" || particleName == "deuteron" ||
+               particleName == "lambda_c+" || particleName == "omega-" || particleName == "sigma_c+" ||
+               particleName == "sigma_c++" || particleName == "sigma+" || particleName == "sigma-" ||
+               particleName == "tau+" || particleName == "tau-" || particleName == "triton" ||
+               particleName == "xi_c+" || particleName == "xi-") {
+      if (nullptr == hmsc) {
+        hmsc = new G4hMultipleScattering("ionmsc");
       }
       ph->RegisterProcess(hmsc, particle);
       ph->RegisterProcess(new G4hIonisation(), particle);
diff --git a/SimG4Core/PhysicsLists/src/CMSEmStandardPhysics95.cc b/SimG4Core/PhysicsLists/src/CMSEmStandardPhysics95.cc
index 459f70c721fb4..f6ba23ac21238 100644
--- a/SimG4Core/PhysicsLists/src/CMSEmStandardPhysics95.cc
+++ b/SimG4Core/PhysicsLists/src/CMSEmStandardPhysics95.cc
@@ -70,14 +70,13 @@
 
 #include "G4SystemOfUnits.hh"
 
-CMSEmStandardPhysics95::CMSEmStandardPhysics95(const G4String& name, G4int ver, 
-					       const std::string& reg):
-  G4VPhysicsConstructor(name), verbose(ver), region(reg) {
+CMSEmStandardPhysics95::CMSEmStandardPhysics95(const G4String& name, G4int ver, const std::string& reg)
+    : G4VPhysicsConstructor(name), verbose(ver), region(reg) {
   G4EmParameters* param = G4EmParameters::Instance();
   param->SetDefaults();
   param->SetVerbose(verbose);
   param->SetApplyCuts(true);
-  param->SetStepFunction(0.8, 1*CLHEP::mm);
+  param->SetStepFunction(0.8, 1 * CLHEP::mm);
   param->SetMscRangeFactor(0.2);
   param->SetMscStepLimitType(fMinimal);
   SetPhysicsType(bElectromagnetic);
@@ -131,8 +130,7 @@ void CMSEmStandardPhysics95::ConstructParticle() {
   G4GenericIon::GenericIonDefinition();
 }
 
-void CMSEmStandardPhysics95::ConstructProcess() 
-{
+void CMSEmStandardPhysics95::ConstructProcess() {
   // This EM builder takes default models of Geant4 EMV.
   // Multiple scattering by Urban for all particles
 
@@ -150,28 +148,25 @@ void CMSEmStandardPhysics95::ConstructProcess()
 
   // muon & hadron multiple scattering
   G4MuMultipleScattering* mumsc = nullptr;
-  G4hMultipleScattering*  pimsc = nullptr;
-  G4hMultipleScattering*  kmsc = nullptr;
-  G4hMultipleScattering*  pmsc = nullptr;
-  G4hMultipleScattering*  hmsc = nullptr;
+  G4hMultipleScattering* pimsc = nullptr;
+  G4hMultipleScattering* kmsc = nullptr;
+  G4hMultipleScattering* pmsc = nullptr;
+  G4hMultipleScattering* hmsc = nullptr;
 
   // Add standard EM Processes
   G4ParticleTable* table = G4ParticleTable::GetParticleTable();
   EmParticleList emList;
-  for(const auto& particleName : emList.PartNames()) {
+  for (const auto& particleName : emList.PartNames()) {
     G4ParticleDefinition* particle = table->FindParticle(particleName);
-    if(verbose > 1)
-      G4cout << "### " << GetPhysicsName() << " instantiates for " 
-	     << particleName << G4endl;
+    if (verbose > 1)
+      G4cout << "### " << GetPhysicsName() << " instantiates for " << particleName << G4endl;
 
     if (particleName == "gamma") {
-
       ph->RegisterProcess(new G4PhotoElectricEffect(), particle);
       ph->RegisterProcess(new G4ComptonScattering(), particle);
       ph->RegisterProcess(new G4GammaConversion(), particle);
 
     } else if (particleName == "e-") {
-
       G4eIonisation* eioni = new G4eIonisation();
       G4eMultipleScattering* msc = new G4eMultipleScattering();
       G4eBremsstrahlung* ebrem = new G4eBremsstrahlung();
@@ -181,7 +176,6 @@ void CMSEmStandardPhysics95::ConstructProcess()
       ph->RegisterProcess(ebrem, particle);
 
     } else if (particleName == "e+") {
-
       G4eIonisation* eioni = new G4eIonisation();
       G4eMultipleScattering* msc = new G4eMultipleScattering();
       G4eBremsstrahlung* ebrem = new G4eBremsstrahlung();
@@ -191,65 +185,54 @@ void CMSEmStandardPhysics95::ConstructProcess()
       ph->RegisterProcess(ebrem, particle);
       ph->RegisterProcess(new G4eplusAnnihilation(), particle);
 
-    } else if (particleName == "mu+" ||
-               particleName == "mu-" ) {
-
-      if(nullptr == mub) {
-	mub = new G4MuBremsstrahlung();
-	mup = new G4MuPairProduction();
-	mumsc = new G4MuMultipleScattering();
+    } else if (particleName == "mu+" || particleName == "mu-") {
+      if (nullptr == mub) {
+        mub = new G4MuBremsstrahlung();
+        mup = new G4MuPairProduction();
+        mumsc = new G4MuMultipleScattering();
       }
       ph->RegisterProcess(mumsc, particle);
       ph->RegisterProcess(new G4MuIonisation(), particle);
       ph->RegisterProcess(mub, particle);
       ph->RegisterProcess(mup, particle);
 
-    } else if (particleName == "alpha" || 
-	       particleName == "He3" ) {
-
+    } else if (particleName == "alpha" || particleName == "He3") {
       ph->RegisterProcess(new G4hMultipleScattering(), particle);
       ph->RegisterProcess(new G4ionIonisation(), particle);
 
     } else if (particleName == "GenericIon") {
-
-      if(nullptr == hmsc) {
-	hmsc = new G4hMultipleScattering("ionmsc");
+      if (nullptr == hmsc) {
+        hmsc = new G4hMultipleScattering("ionmsc");
       }
       ph->RegisterProcess(hmsc, particle);
       ph->RegisterProcess(new G4ionIonisation(), particle);
 
-    } else if (particleName == "pi+" || 
-	       particleName == "pi-" ) {
-
-      if(nullptr == pib) {
-	pib = new G4hBremsstrahlung();
-	pip = new G4hPairProduction();
-	pimsc = new G4hMultipleScattering();
+    } else if (particleName == "pi+" || particleName == "pi-") {
+      if (nullptr == pib) {
+        pib = new G4hBremsstrahlung();
+        pip = new G4hPairProduction();
+        pimsc = new G4hMultipleScattering();
       }
       ph->RegisterProcess(pimsc, particle);
       ph->RegisterProcess(new G4hIonisation(), particle);
       ph->RegisterProcess(pib, particle);
       ph->RegisterProcess(pip, particle);
 
-    } else if (particleName == "kaon+" ||
-               particleName == "kaon-" ) {
-
-      if(nullptr == kb) {
-	kb = new G4hBremsstrahlung();
+    } else if (particleName == "kaon+" || particleName == "kaon-") {
+      if (nullptr == kb) {
+        kb = new G4hBremsstrahlung();
         kp = new G4hPairProduction();
-	kmsc = new G4hMultipleScattering();
+        kmsc = new G4hMultipleScattering();
       }
       ph->RegisterProcess(kmsc, particle);
       ph->RegisterProcess(new G4hIonisation(), particle);
       ph->RegisterProcess(kb, particle);
       ph->RegisterProcess(kp, particle);
 
-    } else if (particleName == "proton" ||
-	       particleName == "anti_proton") {
-
-      if(nullptr == pb) {
-	pb = new G4hBremsstrahlung();
-	pp = new G4hPairProduction();
+    } else if (particleName == "proton" || particleName == "anti_proton") {
+      if (nullptr == pb) {
+        pb = new G4hBremsstrahlung();
+        pp = new G4hPairProduction();
       }
       pmsc = new G4hMultipleScattering();
       ph->RegisterProcess(pmsc, particle);
@@ -257,39 +240,18 @@ void CMSEmStandardPhysics95::ConstructProcess()
       ph->RegisterProcess(pb, particle);
       ph->RegisterProcess(pp, particle);
 
-    } else if (particleName == "B+" ||
-	       particleName == "B-" ||
-	       particleName == "D+" ||
-	       particleName == "D-" ||
-	       particleName == "Ds+" ||
-	       particleName == "Ds-" ||
-               particleName == "anti_He3" ||
-               particleName == "anti_alpha" ||
-               particleName == "anti_deuteron" ||
-               particleName == "anti_lambda_c+" ||
-               particleName == "anti_omega-" ||
-               particleName == "anti_sigma_c+" ||
-               particleName == "anti_sigma_c++" ||
-               particleName == "anti_sigma+" ||
-               particleName == "anti_sigma-" ||
-               particleName == "anti_triton" ||
-               particleName == "anti_xi_c+" ||
-               particleName == "anti_xi-" ||
-               particleName == "deuteron" ||
-	       particleName == "lambda_c+" ||
-               particleName == "omega-" ||
-               particleName == "sigma_c+" ||
-               particleName == "sigma_c++" ||
-               particleName == "sigma+" ||
-               particleName == "sigma-" ||
-               particleName == "tau+" ||
-               particleName == "tau-" ||
-               particleName == "triton" ||
-               particleName == "xi_c+" ||
-               particleName == "xi-" ) {
-
-      if(nullptr == hmsc) {
-	hmsc = new G4hMultipleScattering("ionmsc");
+    } else if (particleName == "B+" || particleName == "B-" || particleName == "D+" || particleName == "D-" ||
+               particleName == "Ds+" || particleName == "Ds-" || particleName == "anti_He3" ||
+               particleName == "anti_alpha" || particleName == "anti_deuteron" || particleName == "anti_lambda_c+" ||
+               particleName == "anti_omega-" || particleName == "anti_sigma_c+" || particleName == "anti_sigma_c++" ||
+               particleName == "anti_sigma+" || particleName == "anti_sigma-" || particleName == "anti_triton" ||
+               particleName == "anti_xi_c+" || particleName == "anti_xi-" || particleName == "deuteron" ||
+               particleName == "lambda_c+" || particleName == "omega-" || particleName == "sigma_c+" ||
+               particleName == "sigma_c++" || particleName == "sigma+" || particleName == "sigma-" ||
+               particleName == "tau+" || particleName == "tau-" || particleName == "triton" ||
+               particleName == "xi_c+" || particleName == "xi-") {
+      if (nullptr == hmsc) {
+        hmsc = new G4hMultipleScattering("ionmsc");
       }
       ph->RegisterProcess(hmsc, particle);
       ph->RegisterProcess(new G4hIonisation(), particle);
diff --git a/SimG4Core/PhysicsLists/src/CMSEmStandardPhysics95msc93.cc b/SimG4Core/PhysicsLists/src/CMSEmStandardPhysics95msc93.cc
index 219f7eccae53e..e2469243ef012 100644
--- a/SimG4Core/PhysicsLists/src/CMSEmStandardPhysics95msc93.cc
+++ b/SimG4Core/PhysicsLists/src/CMSEmStandardPhysics95msc93.cc
@@ -70,15 +70,13 @@
 #include "G4BuilderType.hh"
 #include "G4SystemOfUnits.hh"
 
-CMSEmStandardPhysics95msc93::CMSEmStandardPhysics95msc93(const G4String& name, 
-							 G4int ver, 
-							 const std::string& reg)
-: G4VPhysicsConstructor(name), verbose(ver), region(reg) {
+CMSEmStandardPhysics95msc93::CMSEmStandardPhysics95msc93(const G4String& name, G4int ver, const std::string& reg)
+    : G4VPhysicsConstructor(name), verbose(ver), region(reg) {
   G4EmParameters* param = G4EmParameters::Instance();
   param->SetDefaults();
   param->SetVerbose(verbose);
   param->SetApplyCuts(true);
-  param->SetStepFunction(0.8, 1*CLHEP::mm);
+  param->SetStepFunction(0.8, 1 * CLHEP::mm);
   param->SetMscRangeFactor(0.2);
   param->SetMscStepLimitType(fMinimal);
   SetPhysicsType(bElectromagnetic);
@@ -132,8 +130,7 @@ void CMSEmStandardPhysics95msc93::ConstructParticle() {
   G4GenericIon::GenericIonDefinition();
 }
 
-void CMSEmStandardPhysics95msc93::ConstructProcess() 
-{
+void CMSEmStandardPhysics95msc93::ConstructProcess() {
   // Add standard EM Processes
   G4PhysicsListHelper* ph = G4PhysicsListHelper::GetPhysicsListHelper();
 
@@ -149,9 +146,9 @@ void CMSEmStandardPhysics95msc93::ConstructProcess()
 
   // muon & hadron multiple scattering
   G4MuMultipleScattering* mumsc = nullptr;
-  G4hMultipleScattering*  pimsc = nullptr;
-  G4hMultipleScattering*  kmsc = nullptr;
-  G4hMultipleScattering*  pmsc = nullptr;
+  G4hMultipleScattering* pimsc = nullptr;
+  G4hMultipleScattering* kmsc = nullptr;
+  G4hMultipleScattering* pmsc = nullptr;
   G4hMultipleScattering* hmsc = nullptr;
 
   // This EM builder takes default models of Geant4 10 EMV.
@@ -160,20 +157,17 @@ void CMSEmStandardPhysics95msc93::ConstructProcess()
 
   G4ParticleTable* table = G4ParticleTable::GetParticleTable();
   EmParticleList emList;
-  for(const auto& particleName : emList.PartNames()) {
+  for (const auto& particleName : emList.PartNames()) {
     G4ParticleDefinition* particle = table->FindParticle(particleName);
-    if(verbose > 1)
-      G4cout << "### " << GetPhysicsName() << " instantiates for " 
-	     << particleName << " at " << particle << G4endl;
+    if (verbose > 1)
+      G4cout << "### " << GetPhysicsName() << " instantiates for " << particleName << " at " << particle << G4endl;
 
     if (particleName == "gamma") {
-
       ph->RegisterProcess(new G4PhotoElectricEffect(), particle);
       ph->RegisterProcess(new G4ComptonScattering(), particle);
       ph->RegisterProcess(new G4GammaConversion(), particle);
 
     } else if (particleName == "e-") {
-
       G4eIonisation* eioni = new G4eIonisation();
       G4eMultipleScattering* msc = new G4eMultipleScattering;
       msc->SetEmModel(new UrbanMscModel93());
@@ -185,7 +179,6 @@ void CMSEmStandardPhysics95msc93::ConstructProcess()
       ph->RegisterProcess(ebrem, particle);
 
     } else if (particleName == "e+") {
-
       G4eIonisation* eioni = new G4eIonisation();
 
       G4eMultipleScattering* msc = new G4eMultipleScattering;
@@ -198,65 +191,54 @@ void CMSEmStandardPhysics95msc93::ConstructProcess()
       ph->RegisterProcess(ebrem, particle);
       ph->RegisterProcess(new G4eplusAnnihilation(), particle);
 
-    } else if (particleName == "mu+" ||
-               particleName == "mu-" ) {
-
-      if(nullptr == mub) {
-	mub = new G4MuBremsstrahlung();
-	mup = new G4MuPairProduction();
-	mumsc = new G4MuMultipleScattering();
+    } else if (particleName == "mu+" || particleName == "mu-") {
+      if (nullptr == mub) {
+        mub = new G4MuBremsstrahlung();
+        mup = new G4MuPairProduction();
+        mumsc = new G4MuMultipleScattering();
       }
       ph->RegisterProcess(mumsc, particle);
       ph->RegisterProcess(new G4MuIonisation(), particle);
       ph->RegisterProcess(mub, particle);
       ph->RegisterProcess(mup, particle);
 
-    } else if (particleName == "alpha" || 
-	       particleName == "He3" ) {
-
+    } else if (particleName == "alpha" || particleName == "He3") {
       ph->RegisterProcess(new G4hMultipleScattering(), particle);
       ph->RegisterProcess(new G4ionIonisation(), particle);
 
     } else if (particleName == "GenericIon") {
-
-      if(nullptr == hmsc) {
-	hmsc = new G4hMultipleScattering("ionmsc");
+      if (nullptr == hmsc) {
+        hmsc = new G4hMultipleScattering("ionmsc");
       }
       ph->RegisterProcess(hmsc, particle);
       ph->RegisterProcess(new G4ionIonisation(), particle);
 
-    } else if (particleName == "pi+" || 
-	       particleName == "pi-" ) {
-
-      if(nullptr == pib) {
-	pib = new G4hBremsstrahlung();
-	pip = new G4hPairProduction();
-	pimsc = new G4hMultipleScattering();
+    } else if (particleName == "pi+" || particleName == "pi-") {
+      if (nullptr == pib) {
+        pib = new G4hBremsstrahlung();
+        pip = new G4hPairProduction();
+        pimsc = new G4hMultipleScattering();
       }
       ph->RegisterProcess(pimsc, particle);
       ph->RegisterProcess(new G4hIonisation(), particle);
       ph->RegisterProcess(pib, particle);
       ph->RegisterProcess(pip, particle);
 
-    } else if (particleName == "kaon+" ||
-               particleName == "kaon-" ) {
-
-      if(nullptr == kb) {
-	kb = new G4hBremsstrahlung();
+    } else if (particleName == "kaon+" || particleName == "kaon-") {
+      if (nullptr == kb) {
+        kb = new G4hBremsstrahlung();
         kp = new G4hPairProduction();
-	kmsc = new G4hMultipleScattering();
+        kmsc = new G4hMultipleScattering();
       }
       ph->RegisterProcess(kmsc, particle);
       ph->RegisterProcess(new G4hIonisation(), particle);
       ph->RegisterProcess(kb, particle);
       ph->RegisterProcess(kp, particle);
 
-    } else if (particleName == "proton" ||
-	       particleName == "anti_proton") {
-
-      if(nullptr == pb) {
-	pb = new G4hBremsstrahlung();
-	pp = new G4hPairProduction();
+    } else if (particleName == "proton" || particleName == "anti_proton") {
+      if (nullptr == pb) {
+        pb = new G4hBremsstrahlung();
+        pp = new G4hPairProduction();
       }
       pmsc = new G4hMultipleScattering();
 
@@ -265,36 +247,17 @@ void CMSEmStandardPhysics95msc93::ConstructProcess()
       ph->RegisterProcess(pb, particle);
       ph->RegisterProcess(pp, particle);
 
-    } else if (particleName == "B+" ||
-	       particleName == "B-" ||
-	       particleName == "D+" ||
-	       particleName == "D-" ||
-	       particleName == "Ds+" ||
-	       particleName == "Ds-" ||
-               particleName == "anti_lambda_c+" ||
-               particleName == "anti_omega-" ||
-               particleName == "anti_proton" ||
-               particleName == "anti_sigma_c+" ||
-               particleName == "anti_sigma_c++" ||
-               particleName == "anti_sigma+" ||
-               particleName == "anti_sigma-" ||
-               particleName == "anti_xi_c+" ||
-               particleName == "anti_xi-" ||
-               particleName == "deuteron" ||
-	       particleName == "lambda_c+" ||
-               particleName == "omega-" ||
-               particleName == "sigma_c+" ||
-               particleName == "sigma_c++" ||
-               particleName == "sigma+" ||
-               particleName == "sigma-" ||
-               particleName == "tau+" ||
-               particleName == "tau-" ||
-               particleName == "triton" ||
-               particleName == "xi_c+" ||
-               particleName == "xi-" ) {
-
-      if(nullptr == hmsc) {
-	hmsc = new G4hMultipleScattering("ionmsc");
+    } else if (particleName == "B+" || particleName == "B-" || particleName == "D+" || particleName == "D-" ||
+               particleName == "Ds+" || particleName == "Ds-" || particleName == "anti_lambda_c+" ||
+               particleName == "anti_omega-" || particleName == "anti_proton" || particleName == "anti_sigma_c+" ||
+               particleName == "anti_sigma_c++" || particleName == "anti_sigma+" || particleName == "anti_sigma-" ||
+               particleName == "anti_xi_c+" || particleName == "anti_xi-" || particleName == "deuteron" ||
+               particleName == "lambda_c+" || particleName == "omega-" || particleName == "sigma_c+" ||
+               particleName == "sigma_c++" || particleName == "sigma+" || particleName == "sigma-" ||
+               particleName == "tau+" || particleName == "tau-" || particleName == "triton" ||
+               particleName == "xi_c+" || particleName == "xi-") {
+      if (nullptr == hmsc) {
+        hmsc = new G4hMultipleScattering("ionmsc");
       }
       ph->RegisterProcess(hmsc, particle);
       ph->RegisterProcess(new G4hIonisation(), particle);
diff --git a/SimG4Core/PhysicsLists/src/CMSEmStandardPhysicsLPM.cc b/SimG4Core/PhysicsLists/src/CMSEmStandardPhysicsLPM.cc
index 966466db2e75d..1d23cf7832cc6 100644
--- a/SimG4Core/PhysicsLists/src/CMSEmStandardPhysicsLPM.cc
+++ b/SimG4Core/PhysicsLists/src/CMSEmStandardPhysicsLPM.cc
@@ -74,13 +74,12 @@
 
 #include "G4SystemOfUnits.hh"
 
-CMSEmStandardPhysicsLPM::CMSEmStandardPhysicsLPM(G4int ver) :
-  G4VPhysicsConstructor("CMSEmStandard_emm"), verbose(ver) {
+CMSEmStandardPhysicsLPM::CMSEmStandardPhysicsLPM(G4int ver) : G4VPhysicsConstructor("CMSEmStandard_emm"), verbose(ver) {
   G4EmParameters* param = G4EmParameters::Instance();
   param->SetDefaults();
   param->SetVerbose(verbose);
   param->SetApplyCuts(true);
-  param->SetStepFunction(0.8, 1*CLHEP::mm);
+  param->SetStepFunction(0.8, 1 * CLHEP::mm);
   param->SetMscRangeFactor(0.2);
   param->SetMscStepLimitType(fMinimal);
   SetPhysicsType(bElectromagnetic);
@@ -135,8 +134,7 @@ void CMSEmStandardPhysicsLPM::ConstructParticle() {
 }
 
 void CMSEmStandardPhysicsLPM::ConstructProcess() {
-
-  if(verbose > 0) {
+  if (verbose > 0) {
     G4cout << "### " << GetPhysicsName() << " Construct Processes " << G4endl;
   }
 
@@ -158,10 +156,10 @@ void CMSEmStandardPhysicsLPM::ConstructProcess() {
 
   // muon & hadron multiple scattering
   G4MuMultipleScattering* mumsc = nullptr;
-  G4hMultipleScattering*  pimsc = nullptr;
-  G4hMultipleScattering*  kmsc = nullptr;
-  G4hMultipleScattering*  pmsc = nullptr;
-  G4hMultipleScattering*  hmsc = nullptr;
+  G4hMultipleScattering* pimsc = nullptr;
+  G4hMultipleScattering* kmsc = nullptr;
+  G4hMultipleScattering* pmsc = nullptr;
+  G4hMultipleScattering* hmsc = nullptr;
 
   // muon and hadron single scattering
   G4CoulombScattering* muss = nullptr;
@@ -169,26 +167,22 @@ void CMSEmStandardPhysicsLPM::ConstructProcess() {
   G4CoulombScattering* kss = nullptr;
 
   // high energy limit for e+- scattering models and bremsstrahlung
-  G4double highEnergyLimit = 100*MeV;
+  G4double highEnergyLimit = 100 * MeV;
 
-  G4Region* aRegion = 
-    G4RegionStore::GetInstance()->GetRegion("HcalRegion",false);
-  G4Region* bRegion = 
-    G4RegionStore::GetInstance()->GetRegion("HGCalRegion",false);
+  G4Region* aRegion = G4RegionStore::GetInstance()->GetRegion("HcalRegion", false);
+  G4Region* bRegion = G4RegionStore::GetInstance()->GetRegion("HGCalRegion", false);
 
   G4ParticleTable* table = G4ParticleTable::GetParticleTable();
   EmParticleList emList;
-  for(const auto& particleName : emList.PartNames()) {
+  for (const auto& particleName : emList.PartNames()) {
     G4ParticleDefinition* particle = table->FindParticle(particleName);
 
     if (particleName == "gamma") {
-
       ph->RegisterProcess(new G4PhotoElectricEffect(), particle);
       ph->RegisterProcess(new G4ComptonScattering(), particle);
       ph->RegisterProcess(new G4GammaConversion(), particle);
 
     } else if (particleName == "e-") {
-
       G4eIonisation* eioni = new G4eIonisation();
 
       G4eMultipleScattering* msc = new G4eMultipleScattering;
@@ -197,18 +191,19 @@ void CMSEmStandardPhysicsLPM::ConstructProcess() {
       G4UrbanMscModel* msc3 = new G4UrbanMscModel();
       //--- VI: these line should be moved down
       msc3->SetLocked(true);
-      //--- 
+      //---
       msc1->SetHighEnergyLimit(highEnergyLimit);
       msc2->SetLowEnergyLimit(highEnergyLimit);
       msc3->SetHighEnergyLimit(highEnergyLimit);
       msc->SetEmModel(msc1);
       msc->SetEmModel(msc2);
       msc->AddEmModel(-1, msc3, aRegion);
-      if (bRegion) msc->AddEmModel(-1, msc3, bRegion);
+      if (bRegion)
+        msc->AddEmModel(-1, msc3, bRegion);
 
-      G4eCoulombScatteringModel* ssm = new G4eCoulombScatteringModel(); 
+      G4eCoulombScatteringModel* ssm = new G4eCoulombScatteringModel();
       G4CoulombScattering* ss = new G4CoulombScattering();
-      ss->SetEmModel(ssm); 
+      ss->SetEmModel(ssm);
       ss->SetMinKinEnergy(highEnergyLimit);
       ssm->SetLowEnergyLimit(highEnergyLimit);
       ssm->SetActivationLowEnergyLimit(highEnergyLimit);
@@ -219,7 +214,6 @@ void CMSEmStandardPhysicsLPM::ConstructProcess() {
       ph->RegisterProcess(ss, particle);
 
     } else if (particleName == "e+") {
-
       G4eIonisation* eioni = new G4eIonisation();
 
       G4eMultipleScattering* msc = new G4eMultipleScattering;
@@ -233,11 +227,12 @@ void CMSEmStandardPhysicsLPM::ConstructProcess() {
       msc->SetEmModel(msc1);
       msc->SetEmModel(msc2);
       msc->AddEmModel(-1, msc3, aRegion);
-      if (bRegion) msc->AddEmModel(-1, msc3, bRegion);
+      if (bRegion)
+        msc->AddEmModel(-1, msc3, bRegion);
 
-      G4eCoulombScatteringModel* ssm = new G4eCoulombScatteringModel(); 
+      G4eCoulombScatteringModel* ssm = new G4eCoulombScatteringModel();
       G4CoulombScattering* ss = new G4CoulombScattering();
-      ss->SetEmModel(ssm); 
+      ss->SetEmModel(ssm);
       ss->SetMinKinEnergy(highEnergyLimit);
       ssm->SetLowEnergyLimit(highEnergyLimit);
       ssm->SetActivationLowEnergyLimit(highEnergyLimit);
@@ -248,14 +243,12 @@ void CMSEmStandardPhysicsLPM::ConstructProcess() {
       ph->RegisterProcess(new G4eplusAnnihilation(), particle);
       ph->RegisterProcess(ss, particle);
 
-    } else if (particleName == "mu+" ||
-               particleName == "mu-" ) {
-
-      if(nullptr == mub) {
-	mub = new G4MuBremsstrahlung();
-	mup = new G4MuPairProduction();
-	mumsc = new G4MuMultipleScattering();
-	mumsc->SetEmModel(new G4WentzelVIModel());
+    } else if (particleName == "mu+" || particleName == "mu-") {
+      if (nullptr == mub) {
+        mub = new G4MuBremsstrahlung();
+        mup = new G4MuPairProduction();
+        mumsc = new G4MuMultipleScattering();
+        mumsc->SetEmModel(new G4WentzelVIModel());
         muss = new G4CoulombScattering();
       }
       ph->RegisterProcess(mumsc, particle);
@@ -264,28 +257,23 @@ void CMSEmStandardPhysicsLPM::ConstructProcess() {
       ph->RegisterProcess(mup, particle);
       ph->RegisterProcess(muss, particle);
 
-    } else if (particleName == "alpha" || 
-	       particleName == "He3" ) {
-
+    } else if (particleName == "alpha" || particleName == "He3") {
       ph->RegisterProcess(new G4hMultipleScattering(), particle);
       ph->RegisterProcess(new G4ionIonisation(), particle);
 
     } else if (particleName == "GenericIon") {
-
-      if(nullptr == hmsc) {
-	hmsc = new G4hMultipleScattering("ionmsc");
+      if (nullptr == hmsc) {
+        hmsc = new G4hMultipleScattering("ionmsc");
       }
       ph->RegisterProcess(hmsc, particle);
       ph->RegisterProcess(new G4ionIonisation(), particle);
 
-    } else if (particleName == "pi+" || 
-	       particleName == "pi-" ) {
-
-      if(nullptr == pib) {
-	pib = new G4hBremsstrahlung();
-	pip = new G4hPairProduction();
-	pimsc = new G4hMultipleScattering();
-	pimsc->SetEmModel(new G4WentzelVIModel());
+    } else if (particleName == "pi+" || particleName == "pi-") {
+      if (nullptr == pib) {
+        pib = new G4hBremsstrahlung();
+        pip = new G4hPairProduction();
+        pimsc = new G4hMultipleScattering();
+        pimsc->SetEmModel(new G4WentzelVIModel());
         piss = new G4CoulombScattering();
       }
       ph->RegisterProcess(pimsc, particle);
@@ -294,14 +282,12 @@ void CMSEmStandardPhysicsLPM::ConstructProcess() {
       ph->RegisterProcess(pip, particle);
       ph->RegisterProcess(piss, particle);
 
-    } else if (particleName == "kaon+" ||
-               particleName == "kaon-" ) {
-
-      if(nullptr == kb) {
-	kb = new G4hBremsstrahlung();
+    } else if (particleName == "kaon+" || particleName == "kaon-") {
+      if (nullptr == kb) {
+        kb = new G4hBremsstrahlung();
         kp = new G4hPairProduction();
-	kmsc = new G4hMultipleScattering();
-	kmsc->SetEmModel(new G4WentzelVIModel());
+        kmsc = new G4hMultipleScattering();
+        kmsc->SetEmModel(new G4WentzelVIModel());
         kss = new G4CoulombScattering();
       }
       ph->RegisterProcess(kmsc, particle);
@@ -310,16 +296,14 @@ void CMSEmStandardPhysicsLPM::ConstructProcess() {
       ph->RegisterProcess(kp, particle);
       ph->RegisterProcess(kss, particle);
 
-    } else if (particleName == "proton" ||
-	       particleName == "anti_proton") {
-
-      if(nullptr == pb) {
-	pb = new G4hBremsstrahlung();
-	pp = new G4hPairProduction();
-	//--- VI: these lines should be moved out of the brackets
-	pmsc = new G4hMultipleScattering();
-	pmsc->SetEmModel(new G4WentzelVIModel());
-	//---
+    } else if (particleName == "proton" || particleName == "anti_proton") {
+      if (nullptr == pb) {
+        pb = new G4hBremsstrahlung();
+        pp = new G4hPairProduction();
+        //--- VI: these lines should be moved out of the brackets
+        pmsc = new G4hMultipleScattering();
+        pmsc->SetEmModel(new G4WentzelVIModel());
+        //---
       }
 
       ph->RegisterProcess(pmsc, particle);
@@ -328,39 +312,18 @@ void CMSEmStandardPhysicsLPM::ConstructProcess() {
       ph->RegisterProcess(pp, particle);
       ph->RegisterProcess(new G4CoulombScattering(), particle);
 
-    } else if (particleName == "B+" ||
-	       particleName == "B-" ||
-	       particleName == "D+" ||
-	       particleName == "D-" ||
-	       particleName == "Ds+" ||
-	       particleName == "Ds-" ||
-               particleName == "anti_He3" ||
-               particleName == "anti_alpha" ||
-               particleName == "anti_deuteron" ||
-               particleName == "anti_lambda_c+" ||
-               particleName == "anti_omega-" ||
-               particleName == "anti_sigma_c+" ||
-               particleName == "anti_sigma_c++" ||
-               particleName == "anti_sigma+" ||
-               particleName == "anti_sigma-" ||
-               particleName == "anti_triton" ||
-               particleName == "anti_xi_c+" ||
-               particleName == "anti_xi-" ||
-               particleName == "deuteron" ||
-	       particleName == "lambda_c+" ||
-               particleName == "omega-" ||
-               particleName == "sigma_c+" ||
-               particleName == "sigma_c++" ||
-               particleName == "sigma+" ||
-               particleName == "sigma-" ||
-               particleName == "tau+" ||
-               particleName == "tau-" ||
-               particleName == "triton" ||
-               particleName == "xi_c+" ||
-               particleName == "xi-" ) {
-
-      if(nullptr == hmsc) {
-	hmsc = new G4hMultipleScattering("ionmsc");
+    } else if (particleName == "B+" || particleName == "B-" || particleName == "D+" || particleName == "D-" ||
+               particleName == "Ds+" || particleName == "Ds-" || particleName == "anti_He3" ||
+               particleName == "anti_alpha" || particleName == "anti_deuteron" || particleName == "anti_lambda_c+" ||
+               particleName == "anti_omega-" || particleName == "anti_sigma_c+" || particleName == "anti_sigma_c++" ||
+               particleName == "anti_sigma+" || particleName == "anti_sigma-" || particleName == "anti_triton" ||
+               particleName == "anti_xi_c+" || particleName == "anti_xi-" || particleName == "deuteron" ||
+               particleName == "lambda_c+" || particleName == "omega-" || particleName == "sigma_c+" ||
+               particleName == "sigma_c++" || particleName == "sigma+" || particleName == "sigma-" ||
+               particleName == "tau+" || particleName == "tau-" || particleName == "triton" ||
+               particleName == "xi_c+" || particleName == "xi-") {
+      if (nullptr == hmsc) {
+        hmsc = new G4hMultipleScattering("ionmsc");
       }
       ph->RegisterProcess(hmsc, particle);
       ph->RegisterProcess(new G4hIonisation(), particle);
diff --git a/SimG4Core/PhysicsLists/src/CMSEmStandardPhysicsXS.cc b/SimG4Core/PhysicsLists/src/CMSEmStandardPhysicsXS.cc
index 89135b10c8532..ca4299ddeadb3 100644
--- a/SimG4Core/PhysicsLists/src/CMSEmStandardPhysicsXS.cc
+++ b/SimG4Core/PhysicsLists/src/CMSEmStandardPhysicsXS.cc
@@ -89,15 +89,14 @@
 
 #include "G4SystemOfUnits.hh"
 
-CMSEmStandardPhysicsXS::CMSEmStandardPhysicsXS(G4int ver) :
-  G4VPhysicsConstructor("CMSEmStandard_emn"), verbose(ver) {
+CMSEmStandardPhysicsXS::CMSEmStandardPhysicsXS(G4int ver) : G4VPhysicsConstructor("CMSEmStandard_emn"), verbose(ver) {
   G4EmParameters* param = G4EmParameters::Instance();
   param->SetDefaults();
   param->SetVerbose(verbose);
   param->SetApplyCuts(true);
-  param->SetLowestElectronEnergy(100*eV);
-  param->SetStepFunction(0.8, 1*CLHEP::mm);
-  param->SetUseMottCorrection(true); // use Mott-correction for e-/e+ msc gs
+  param->SetLowestElectronEnergy(100 * eV);
+  param->SetStepFunction(0.8, 1 * CLHEP::mm);
+  param->SetUseMottCorrection(true);  // use Mott-correction for e-/e+ msc gs
   param->SetMscRangeFactor(0.2);
   param->SetMscStepLimitType(fMinimal);
   param->SetFluo(true);
@@ -153,8 +152,7 @@ void CMSEmStandardPhysicsXS::ConstructParticle() {
 }
 
 void CMSEmStandardPhysicsXS::ConstructProcess() {
-
-  if(verbose > 0) {
+  if (verbose > 0) {
     G4cout << "### " << GetPhysicsName() << " Construct Processes " << G4endl;
   }
 
@@ -177,9 +175,9 @@ void CMSEmStandardPhysicsXS::ConstructProcess() {
 
   // muon & hadron multiple scattering
   G4MuMultipleScattering* mumsc = nullptr;
-  G4hMultipleScattering*  pimsc = nullptr;
-  G4hMultipleScattering*  kmsc = nullptr;
-  G4hMultipleScattering*  hmsc = nullptr;
+  G4hMultipleScattering* pimsc = nullptr;
+  G4hMultipleScattering* kmsc = nullptr;
+  G4hMultipleScattering* hmsc = nullptr;
 
   // muon and hadron single scattering
   G4CoulombScattering* muss = nullptr;
@@ -187,23 +185,20 @@ void CMSEmStandardPhysicsXS::ConstructProcess() {
   G4CoulombScattering* kss = nullptr;
 
   // high energy limit for e+- scattering models and bremsstrahlung
-  G4double highEnergyLimit = 100*MeV;
+  G4double highEnergyLimit = 100 * MeV;
 
   // nuclear stopping
   G4NuclearStopping* pnuc = nullptr;
 
-  G4Region* aRegion = 
-    G4RegionStore::GetInstance()->GetRegion("HcalRegion",false);
-  G4Region* bRegion = 
-    G4RegionStore::GetInstance()->GetRegion("HGCalRegion",false);
+  G4Region* aRegion = G4RegionStore::GetInstance()->GetRegion("HcalRegion", false);
+  G4Region* bRegion = G4RegionStore::GetInstance()->GetRegion("HGCalRegion", false);
 
   G4ParticleTable* table = G4ParticleTable::GetParticleTable();
   EmParticleList emList;
-  for(const auto& particleName : emList.PartNames()) {
+  for (const auto& particleName : emList.PartNames()) {
     G4ParticleDefinition* particle = table->FindParticle(particleName);
 
     if (particleName == "gamma") {
-
       G4PhotoElectricEffect* photo = new G4PhotoElectricEffect();
       photo->SetEmModel(new G4LivermorePhotoElectricModel());
       ph->RegisterProcess(photo, particle);
@@ -213,13 +208,12 @@ void CMSEmStandardPhysicsXS::ConstructProcess() {
       ph->RegisterProcess(new G4GammaConversion(), particle);
 
     } else if (particleName == "e-") {
-
       G4eIonisation* eioni = new G4eIonisation();
 
       G4eMultipleScattering* msc = new G4eMultipleScattering;
-      G4UrbanMscModel* msc1  = new G4UrbanMscModel();
+      G4UrbanMscModel* msc1 = new G4UrbanMscModel();
       G4WentzelVIModel* msc2 = new G4WentzelVIModel();
-      G4GoudsmitSaundersonMscModel* msc3  = new G4GoudsmitSaundersonMscModel();
+      G4GoudsmitSaundersonMscModel* msc3 = new G4GoudsmitSaundersonMscModel();
       msc3->SetStepLimitType(fUseSafetyPlus);
       msc3->SetRangeFactor(0.08);
       msc3->SetSkin(3.0);
@@ -230,11 +224,12 @@ void CMSEmStandardPhysicsXS::ConstructProcess() {
       msc->SetEmModel(msc1);
       msc->SetEmModel(msc2);
       msc->AddEmModel(-1, msc3, aRegion);
-      if (bRegion) msc->AddEmModel(-1, msc3, bRegion);
+      if (bRegion)
+        msc->AddEmModel(-1, msc3, bRegion);
 
-      G4eCoulombScatteringModel* ssm = new G4eCoulombScatteringModel(); 
+      G4eCoulombScatteringModel* ssm = new G4eCoulombScatteringModel();
       G4CoulombScattering* ss = new G4CoulombScattering();
-      ss->SetEmModel(ssm); 
+      ss->SetEmModel(ssm);
       ss->SetMinKinEnergy(highEnergyLimit);
       ssm->SetLowEnergyLimit(highEnergyLimit);
       ssm->SetActivationLowEnergyLimit(highEnergyLimit);
@@ -249,7 +244,9 @@ void CMSEmStandardPhysicsXS::ConstructProcess() {
       brem->SetEmModel(br2);
       br1->SetHighEnergyLimit(GeV);
 
-      if(!ee) { ee = new G4ePairProduction(); }
+      if (!ee) {
+        ee = new G4ePairProduction();
+      }
 
       ph->RegisterProcess(msc, particle);
       ph->RegisterProcess(eioni, particle);
@@ -258,13 +255,12 @@ void CMSEmStandardPhysicsXS::ConstructProcess() {
       ph->RegisterProcess(ss, particle);
 
     } else if (particleName == "e+") {
-
       G4eIonisation* eioni = new G4eIonisation();
 
       G4eMultipleScattering* msc = new G4eMultipleScattering;
       G4UrbanMscModel* msc1 = new G4UrbanMscModel();
-      G4WentzelVIModel* msc2= new G4WentzelVIModel();
-      G4GoudsmitSaundersonMscModel* msc3  = new G4GoudsmitSaundersonMscModel();
+      G4WentzelVIModel* msc2 = new G4WentzelVIModel();
+      G4GoudsmitSaundersonMscModel* msc3 = new G4GoudsmitSaundersonMscModel();
       msc3->SetStepLimitType(fUseSafetyPlus);
       msc3->SetRangeFactor(0.08);
       msc3->SetSkin(3.0);
@@ -275,11 +271,12 @@ void CMSEmStandardPhysicsXS::ConstructProcess() {
       msc->SetEmModel(msc1);
       msc->SetEmModel(msc2);
       msc->AddEmModel(-1, msc3, aRegion);
-      if (bRegion) msc->AddEmModel(-1, msc3, bRegion);
+      if (bRegion)
+        msc->AddEmModel(-1, msc3, bRegion);
 
-      G4eCoulombScatteringModel* ssm = new G4eCoulombScatteringModel(); 
+      G4eCoulombScatteringModel* ssm = new G4eCoulombScatteringModel();
       G4CoulombScattering* ss = new G4CoulombScattering();
-      ss->SetEmModel(ssm); 
+      ss->SetEmModel(ssm);
       ss->SetMinKinEnergy(highEnergyLimit);
       ssm->SetLowEnergyLimit(highEnergyLimit);
       ssm->SetActivationLowEnergyLimit(highEnergyLimit);
@@ -294,7 +291,9 @@ void CMSEmStandardPhysicsXS::ConstructProcess() {
       brem->SetEmModel(br2);
       br1->SetHighEnergyLimit(GeV);
 
-      if(!ee) { ee = new G4ePairProduction(); }
+      if (!ee) {
+        ee = new G4ePairProduction();
+      }
 
       ph->RegisterProcess(msc, particle);
       ph->RegisterProcess(eioni, particle);
@@ -303,14 +302,12 @@ void CMSEmStandardPhysicsXS::ConstructProcess() {
       ph->RegisterProcess(ee, particle);
       ph->RegisterProcess(ss, particle);
 
-    } else if (particleName == "mu+" ||
-               particleName == "mu-" ) {
-
-      if(nullptr == mub) {
-	mub = new G4MuBremsstrahlung();
-	mup = new G4MuPairProduction();
-	mumsc = new G4MuMultipleScattering();
-	mumsc->SetEmModel(new G4WentzelVIModel());
+    } else if (particleName == "mu+" || particleName == "mu-") {
+      if (nullptr == mub) {
+        mub = new G4MuBremsstrahlung();
+        mup = new G4MuPairProduction();
+        mumsc = new G4MuMultipleScattering();
+        mumsc->SetEmModel(new G4WentzelVIModel());
         muss = new G4CoulombScattering();
       }
       ph->RegisterProcess(mumsc, particle);
@@ -319,33 +316,32 @@ void CMSEmStandardPhysicsXS::ConstructProcess() {
       ph->RegisterProcess(mup, particle);
       ph->RegisterProcess(muss, particle);
 
-    } else if (particleName == "alpha" || 
-	       particleName == "He3" ) {
-
-      if(!pnuc) { pnuc = new G4NuclearStopping(); }
+    } else if (particleName == "alpha" || particleName == "He3") {
+      if (!pnuc) {
+        pnuc = new G4NuclearStopping();
+      }
 
       ph->RegisterProcess(new G4hMultipleScattering(), particle);
       ph->RegisterProcess(new G4ionIonisation(), particle);
       ph->RegisterProcess(pnuc, particle);
 
     } else if (particleName == "GenericIon") {
-
-      if(nullptr == hmsc) {
-	hmsc = new G4hMultipleScattering("ionmsc");
+      if (nullptr == hmsc) {
+        hmsc = new G4hMultipleScattering("ionmsc");
+      }
+      if (!pnuc) {
+        pnuc = new G4NuclearStopping();
       }
-      if(!pnuc) { pnuc = new G4NuclearStopping(); }
       ph->RegisterProcess(hmsc, particle);
       ph->RegisterProcess(new G4ionIonisation(), particle);
       ph->RegisterProcess(pnuc, particle);
 
-    } else if (particleName == "pi+" || 
-	       particleName == "pi-" ) {
-
-      if(nullptr == pib) {
-	pib = new G4hBremsstrahlung();
-	pip = new G4hPairProduction();
-	pimsc = new G4hMultipleScattering();
-	pimsc->SetEmModel(new G4WentzelVIModel());
+    } else if (particleName == "pi+" || particleName == "pi-") {
+      if (nullptr == pib) {
+        pib = new G4hBremsstrahlung();
+        pip = new G4hPairProduction();
+        pimsc = new G4hMultipleScattering();
+        pimsc->SetEmModel(new G4WentzelVIModel());
         piss = new G4CoulombScattering();
       }
       ph->RegisterProcess(pimsc, particle);
@@ -354,14 +350,12 @@ void CMSEmStandardPhysicsXS::ConstructProcess() {
       ph->RegisterProcess(pip, particle);
       ph->RegisterProcess(piss, particle);
 
-    } else if (particleName == "kaon+" ||
-               particleName == "kaon-" ) {
-
-      if(nullptr == kb) {
-	kb = new G4hBremsstrahlung();
+    } else if (particleName == "kaon+" || particleName == "kaon-") {
+      if (nullptr == kb) {
+        kb = new G4hBremsstrahlung();
         kp = new G4hPairProduction();
-	kmsc = new G4hMultipleScattering();
-	kmsc->SetEmModel(new G4WentzelVIModel());
+        kmsc = new G4hMultipleScattering();
+        kmsc->SetEmModel(new G4WentzelVIModel());
         kss = new G4CoulombScattering();
       }
       ph->RegisterProcess(kmsc, particle);
@@ -370,14 +364,14 @@ void CMSEmStandardPhysicsXS::ConstructProcess() {
       ph->RegisterProcess(kp, particle);
       ph->RegisterProcess(kss, particle);
 
-    } else if (particleName == "proton" ||
-	       particleName == "anti_proton") {
-
-      if(nullptr == pb) {
-	pb = new G4hBremsstrahlung();
-	pp = new G4hPairProduction();
+    } else if (particleName == "proton" || particleName == "anti_proton") {
+      if (nullptr == pb) {
+        pb = new G4hBremsstrahlung();
+        pp = new G4hPairProduction();
+      }
+      if (!pnuc) {
+        pnuc = new G4NuclearStopping();
       }
-      if(!pnuc) { pnuc = new G4NuclearStopping(); }
 
       G4hMultipleScattering* pmsc = new G4hMultipleScattering();
       pmsc->SetEmModel(new G4WentzelVIModel());
@@ -390,45 +384,26 @@ void CMSEmStandardPhysicsXS::ConstructProcess() {
       ph->RegisterProcess(pp, particle);
       ph->RegisterProcess(pss, particle);
 
-    } else if (particleName == "B+" ||
-	       particleName == "B-" ||
-	       particleName == "D+" ||
-	       particleName == "D-" ||
-	       particleName == "Ds+" ||
-	       particleName == "Ds-" ||
-               particleName == "anti_He3" ||
-               particleName == "anti_alpha" ||
-               particleName == "anti_deuteron" ||
-               particleName == "anti_lambda_c+" ||
-               particleName == "anti_omega-" ||
-               particleName == "anti_sigma_c+" ||
-               particleName == "anti_sigma_c++" ||
-               particleName == "anti_sigma+" ||
-               particleName == "anti_sigma-" ||
-               particleName == "anti_triton" ||
-               particleName == "anti_xi_c+" ||
-               particleName == "anti_xi-" ||
-               particleName == "deuteron" ||
-	       particleName == "lambda_c+" ||
-               particleName == "omega-" ||
-               particleName == "sigma_c+" ||
-               particleName == "sigma_c++" ||
-               particleName == "sigma+" ||
-               particleName == "sigma-" ||
-               particleName == "tau+" ||
-               particleName == "tau-" ||
-               particleName == "triton" ||
-               particleName == "xi_c+" ||
-               particleName == "xi-" ) {
-
-      if(nullptr == hmsc) {
-	hmsc = new G4hMultipleScattering("ionmsc");
+    } else if (particleName == "B+" || particleName == "B-" || particleName == "D+" || particleName == "D-" ||
+               particleName == "Ds+" || particleName == "Ds-" || particleName == "anti_He3" ||
+               particleName == "anti_alpha" || particleName == "anti_deuteron" || particleName == "anti_lambda_c+" ||
+               particleName == "anti_omega-" || particleName == "anti_sigma_c+" || particleName == "anti_sigma_c++" ||
+               particleName == "anti_sigma+" || particleName == "anti_sigma-" || particleName == "anti_triton" ||
+               particleName == "anti_xi_c+" || particleName == "anti_xi-" || particleName == "deuteron" ||
+               particleName == "lambda_c+" || particleName == "omega-" || particleName == "sigma_c+" ||
+               particleName == "sigma_c++" || particleName == "sigma+" || particleName == "sigma-" ||
+               particleName == "tau+" || particleName == "tau-" || particleName == "triton" ||
+               particleName == "xi_c+" || particleName == "xi-") {
+      if (nullptr == hmsc) {
+        hmsc = new G4hMultipleScattering("ionmsc");
       }
       ph->RegisterProcess(hmsc, particle);
       ph->RegisterProcess(new G4hIonisation(), particle);
     }
   }
-  if(pnuc) { pnuc->SetMaxKinEnergy(MeV); }
+  if (pnuc) {
+    pnuc->SetMaxKinEnergy(MeV);
+  }
   // Deexcitation
   //
   G4VAtomDeexcitation* de = new G4UAtomicDeexcitation();
diff --git a/SimG4Core/PhysicsLists/src/CMSFTFPNeutronBuilder.cc b/SimG4Core/PhysicsLists/src/CMSFTFPNeutronBuilder.cc
index 31633206d9697..ec198d51f17d6 100644
--- a/SimG4Core/PhysicsLists/src/CMSFTFPNeutronBuilder.cc
+++ b/SimG4Core/PhysicsLists/src/CMSFTFPNeutronBuilder.cc
@@ -5,10 +5,9 @@
 #include "G4NeutronInelasticCrossSection.hh"
 #include "G4SystemOfUnits.hh"
 
-CMSFTFPNeutronBuilder::CMSFTFPNeutronBuilder(G4bool quasiElastic) 
-{
-  theMin =   4*GeV;
-  theMax = 100*TeV;
+CMSFTFPNeutronBuilder::CMSFTFPNeutronBuilder(G4bool quasiElastic) {
+  theMin = 4 * GeV;
+  theMax = 100 * TeV;
   theModel = new G4TheoFSGenerator("FTFP");
 
   theStringModel = new G4FTFModel;
@@ -17,52 +16,40 @@ CMSFTFPNeutronBuilder::CMSFTFPNeutronBuilder(G4bool quasiElastic)
 
   theCascade = new G4GeneratorPrecompoundInterface;
   thePreEquilib = new G4PreCompoundModel(new G4ExcitationHandler);
-  theCascade->SetDeExcitation(thePreEquilib);  
+  theCascade->SetDeExcitation(thePreEquilib);
 
   theModel->SetTransport(theCascade);
 
   theModel->SetHighEnergyGenerator(theStringModel);
-  if (quasiElastic)
-  {
-     theQuasiElastic=new G4QuasiElasticChannel;
-     theModel->SetQuasiElasticChannel(theQuasiElastic);
-  } else 
-  {  theQuasiElastic=nullptr;}  
+  if (quasiElastic) {
+    theQuasiElastic = new G4QuasiElasticChannel;
+    theModel->SetQuasiElasticChannel(theQuasiElastic);
+  } else {
+    theQuasiElastic = nullptr;
+  }
 
   theModel->SetMinEnergy(theMin);
-  theModel->SetMaxEnergy(100*TeV);
+  theModel->SetMaxEnergy(100 * TeV);
 }
 
-CMSFTFPNeutronBuilder::
-~CMSFTFPNeutronBuilder() 
-{
+CMSFTFPNeutronBuilder::~CMSFTFPNeutronBuilder() {
   delete theStringDecay;
   delete theStringModel;
   delete thePreEquilib;
   delete theCascade;
-  if ( theQuasiElastic ) delete theQuasiElastic;
+  if (theQuasiElastic)
+    delete theQuasiElastic;
 }
 
-void CMSFTFPNeutronBuilder::
-Build(G4HadronElasticProcess * )
-{
-}
+void CMSFTFPNeutronBuilder::Build(G4HadronElasticProcess*) {}
 
-void CMSFTFPNeutronBuilder::
-Build(G4HadronFissionProcess * )
-{
-}
+void CMSFTFPNeutronBuilder::Build(G4HadronFissionProcess*) {}
 
-void CMSFTFPNeutronBuilder::
-Build(G4HadronCaptureProcess * )
-{
-}
+void CMSFTFPNeutronBuilder::Build(G4HadronCaptureProcess*) {}
 
-void CMSFTFPNeutronBuilder::
-Build(G4NeutronInelasticProcess * aP)
-{
+void CMSFTFPNeutronBuilder::Build(G4NeutronInelasticProcess* aP) {
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(theMax);
   aP->RegisterMe(theModel);
-  aP->AddDataSet(new G4NeutronInelasticCrossSection);  
+  aP->AddDataSet(new G4NeutronInelasticCrossSection);
 }
diff --git a/SimG4Core/PhysicsLists/src/CMSFTFPPiKBuilder.cc b/SimG4Core/PhysicsLists/src/CMSFTFPPiKBuilder.cc
index 3e6ed2eef7db6..293131d9fe015 100644
--- a/SimG4Core/PhysicsLists/src/CMSFTFPPiKBuilder.cc
+++ b/SimG4Core/PhysicsLists/src/CMSFTFPPiKBuilder.cc
@@ -4,92 +4,78 @@
 #include "G4ProcessManager.hh"
 #include "G4SystemOfUnits.hh"
 
-CMSFTFPPiKBuilder::CMSFTFPPiKBuilder(G4bool quasiElastic) 
- {
-   thePiData = new G4PiNuclearCrossSection;
-   theMin = 4*GeV;
-   theMax = 100*TeV;
-   theModel = new G4TheoFSGenerator("FTFP");
+CMSFTFPPiKBuilder::CMSFTFPPiKBuilder(G4bool quasiElastic) {
+  thePiData = new G4PiNuclearCrossSection;
+  theMin = 4 * GeV;
+  theMax = 100 * TeV;
+  theModel = new G4TheoFSGenerator("FTFP");
 
-   theStringModel = new G4FTFModel;
-   theStringDecay = new G4ExcitedStringDecay(new G4LundStringFragmentation);
-   theStringModel->SetFragmentationModel(theStringDecay);
+  theStringModel = new G4FTFModel;
+  theStringDecay = new G4ExcitedStringDecay(new G4LundStringFragmentation);
+  theStringModel->SetFragmentationModel(theStringDecay);
 
-   theCascade = new G4GeneratorPrecompoundInterface;
-   thePreEquilib = new G4PreCompoundModel(new G4ExcitationHandler);
-   theCascade->SetDeExcitation(thePreEquilib);  
+  theCascade = new G4GeneratorPrecompoundInterface;
+  thePreEquilib = new G4PreCompoundModel(new G4ExcitationHandler);
+  theCascade->SetDeExcitation(thePreEquilib);
 
-   theModel->SetHighEnergyGenerator(theStringModel);
-   if (quasiElastic)
-   {
-      theQuasiElastic=new G4QuasiElasticChannel;
-      theModel->SetQuasiElasticChannel(theQuasiElastic);
-   } else 
-   {  theQuasiElastic=nullptr;}  
+  theModel->SetHighEnergyGenerator(theStringModel);
+  if (quasiElastic) {
+    theQuasiElastic = new G4QuasiElasticChannel;
+    theModel->SetQuasiElasticChannel(theQuasiElastic);
+  } else {
+    theQuasiElastic = nullptr;
+  }
 
-   theModel->SetTransport(theCascade);
-   theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(100*TeV);
- }
+  theModel->SetTransport(theCascade);
+  theModel->SetMinEnergy(theMin);
+  theModel->SetMaxEnergy(100 * TeV);
+}
 
-CMSFTFPPiKBuilder::~CMSFTFPPiKBuilder() 
- {
-   delete theCascade;
-   delete theStringDecay;
-   delete theStringModel;
-   delete theModel;
-   if ( theQuasiElastic ) delete theQuasiElastic;
- }
+CMSFTFPPiKBuilder::~CMSFTFPPiKBuilder() {
+  delete theCascade;
+  delete theStringDecay;
+  delete theStringModel;
+  delete theModel;
+  if (theQuasiElastic)
+    delete theQuasiElastic;
+}
 
-void CMSFTFPPiKBuilder::
-Build(G4HadronElasticProcess * ) {}
+void CMSFTFPPiKBuilder::Build(G4HadronElasticProcess*) {}
 
-void CMSFTFPPiKBuilder::
-Build(G4PionPlusInelasticProcess * aP)
- {
-   theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(theMax);
-   aP->AddDataSet(thePiData);
-   aP->RegisterMe(theModel);
- }
+void CMSFTFPPiKBuilder::Build(G4PionPlusInelasticProcess* aP) {
+  theModel->SetMinEnergy(theMin);
+  theModel->SetMaxEnergy(theMax);
+  aP->AddDataSet(thePiData);
+  aP->RegisterMe(theModel);
+}
 
-void CMSFTFPPiKBuilder::
-Build(G4PionMinusInelasticProcess * aP)
- {
-   theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(theMax);
-   aP->AddDataSet(thePiData);
-   aP->RegisterMe(theModel);
- }
+void CMSFTFPPiKBuilder::Build(G4PionMinusInelasticProcess* aP) {
+  theModel->SetMinEnergy(theMin);
+  theModel->SetMaxEnergy(theMax);
+  aP->AddDataSet(thePiData);
+  aP->RegisterMe(theModel);
+}
 
-void CMSFTFPPiKBuilder::
-Build(G4KaonPlusInelasticProcess * aP)
- {
-   theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(theMax);
-   aP->RegisterMe(theModel);
- }
+void CMSFTFPPiKBuilder::Build(G4KaonPlusInelasticProcess* aP) {
+  theModel->SetMinEnergy(theMin);
+  theModel->SetMaxEnergy(theMax);
+  aP->RegisterMe(theModel);
+}
 
-void CMSFTFPPiKBuilder::
-Build(G4KaonMinusInelasticProcess * aP)
- {
-   theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(theMax);
-   aP->RegisterMe(theModel);
- }
+void CMSFTFPPiKBuilder::Build(G4KaonMinusInelasticProcess* aP) {
+  theModel->SetMinEnergy(theMin);
+  theModel->SetMaxEnergy(theMax);
+  aP->RegisterMe(theModel);
+}
 
-void CMSFTFPPiKBuilder::
-Build(G4KaonZeroLInelasticProcess * aP)
- {
-   theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(theMax);
-   aP->RegisterMe(theModel);
- }
+void CMSFTFPPiKBuilder::Build(G4KaonZeroLInelasticProcess* aP) {
+  theModel->SetMinEnergy(theMin);
+  theModel->SetMaxEnergy(theMax);
+  aP->RegisterMe(theModel);
+}
 
-void CMSFTFPPiKBuilder::
-Build(G4KaonZeroSInelasticProcess * aP)
- {
-   theModel->SetMinEnergy(theMin);
-   theModel->SetMaxEnergy(theMax);
-   aP->RegisterMe(theModel);
- }
+void CMSFTFPPiKBuilder::Build(G4KaonZeroSInelasticProcess* aP) {
+  theModel->SetMinEnergy(theMin);
+  theModel->SetMaxEnergy(theMax);
+  aP->RegisterMe(theModel);
+}
diff --git a/SimG4Core/PhysicsLists/src/CMSFTFPProtonBuilder.cc b/SimG4Core/PhysicsLists/src/CMSFTFPProtonBuilder.cc
index 008ba80ef38e7..6ccc5ef4d8ed0 100644
--- a/SimG4Core/PhysicsLists/src/CMSFTFPProtonBuilder.cc
+++ b/SimG4Core/PhysicsLists/src/CMSFTFPProtonBuilder.cc
@@ -5,10 +5,9 @@
 #include "G4ProtonInelasticCrossSection.hh"
 #include "G4SystemOfUnits.hh"
 
-CMSFTFPProtonBuilder::CMSFTFPProtonBuilder(G4bool quasiElastic) 
-{
-  theMin = 4*GeV;
-  theMax = 100.*TeV; 
+CMSFTFPProtonBuilder::CMSFTFPProtonBuilder(G4bool quasiElastic) {
+  theMin = 4 * GeV;
+  theMax = 100. * TeV;
   theModel = new G4TheoFSGenerator("FTFP");
 
   theStringModel = new G4FTFModel;
@@ -17,40 +16,35 @@ CMSFTFPProtonBuilder::CMSFTFPProtonBuilder(G4bool quasiElastic)
 
   theCascade = new G4GeneratorPrecompoundInterface;
   thePreEquilib = new G4PreCompoundModel(new G4ExcitationHandler);
-  theCascade->SetDeExcitation(thePreEquilib);  
+  theCascade->SetDeExcitation(thePreEquilib);
 
   theModel->SetHighEnergyGenerator(theStringModel);
-  if (quasiElastic)
-  {
-     theQuasiElastic=new G4QuasiElasticChannel;
-     theModel->SetQuasiElasticChannel(theQuasiElastic);
-  } else 
-  {  theQuasiElastic=nullptr;}  
+  if (quasiElastic) {
+    theQuasiElastic = new G4QuasiElasticChannel;
+    theModel->SetQuasiElasticChannel(theQuasiElastic);
+  } else {
+    theQuasiElastic = nullptr;
+  }
 
   theModel->SetTransport(theCascade);
   theModel->SetMinEnergy(theMin);
-  theModel->SetMaxEnergy(100*TeV);
+  theModel->SetMaxEnergy(100 * TeV);
 }
 
-void CMSFTFPProtonBuilder::Build(G4ProtonInelasticProcess * aP)
-{
+void CMSFTFPProtonBuilder::Build(G4ProtonInelasticProcess* aP) {
   theModel->SetMinEnergy(theMin);
   theModel->SetMaxEnergy(theMax);
   aP->RegisterMe(theModel);
-  aP->AddDataSet(new G4ProtonInelasticCrossSection);  
+  aP->AddDataSet(new G4ProtonInelasticCrossSection);
 }
 
-CMSFTFPProtonBuilder::
-~CMSFTFPProtonBuilder() 
-{
+CMSFTFPProtonBuilder::~CMSFTFPProtonBuilder() {
   delete theStringDecay;
   delete theStringModel;
   delete theModel;
   delete theCascade;
-  if ( theQuasiElastic ) delete theQuasiElastic;
+  if (theQuasiElastic)
+    delete theQuasiElastic;
 }
 
-void CMSFTFPProtonBuilder::
-Build(G4HadronElasticProcess * )
-{
-}
+void CMSFTFPProtonBuilder::Build(G4HadronElasticProcess*) {}
diff --git a/SimG4Core/PhysicsLists/src/CMSHadronPhysicsFTFP_BERT.cc b/SimG4Core/PhysicsLists/src/CMSHadronPhysicsFTFP_BERT.cc
index 7e2b9e4632acf..963c0fff7d604 100644
--- a/SimG4Core/PhysicsLists/src/CMSHadronPhysicsFTFP_BERT.cc
+++ b/SimG4Core/PhysicsLists/src/CMSHadronPhysicsFTFP_BERT.cc
@@ -1,5 +1,5 @@
 //
-#include <iomanip>   
+#include <iomanip>
 
 #include "SimG4Core/PhysicsLists/interface/CMSHadronPhysicsFTFP_BERT.h"
 
@@ -47,9 +47,7 @@
 #include "G4Threading.hh"
 
 CMSHadronPhysicsFTFP_BERT::CMSHadronPhysicsFTFP_BERT(G4int)
-  :  G4VPhysicsConstructor("hInelastic CMS FTFP_BERT")
-  , QuasiElastic(false)
-{
+    : G4VPhysicsConstructor("hInelastic CMS FTFP_BERT"), QuasiElastic(false) {
   minFTFP_pion = 4.0 * GeV;
   maxBERT_pion = 5.0 * GeV;
   minFTFP_kaon = 4.0 * GeV;
@@ -60,15 +58,13 @@ CMSHadronPhysicsFTFP_BERT::CMSHadronPhysicsFTFP_BERT(G4int)
   maxBERT_neutron = 5.0 * GeV;
 }
 
-CMSHadronPhysicsFTFP_BERT::~CMSHadronPhysicsFTFP_BERT()
-{
+CMSHadronPhysicsFTFP_BERT::~CMSHadronPhysicsFTFP_BERT() {
   //Detele master-owned stuff
   delete xs_k.Get();
-  std::for_each( xs_ds.Begin(), xs_ds.End(),[](G4VCrossSectionDataSet* el){ delete el;});
+  std::for_each(xs_ds.Begin(), xs_ds.End(), [](G4VCrossSectionDataSet* el) { delete el; });
 }
 
-void CMSHadronPhysicsFTFP_BERT::ConstructParticle()
-{
+void CMSHadronPhysicsFTFP_BERT::ConstructParticle() {
   G4MesonConstructor pMesonConstructor;
   pMesonConstructor.ConstructParticle();
 
@@ -79,27 +75,22 @@ void CMSHadronPhysicsFTFP_BERT::ConstructParticle()
   pShortLivedConstructor.ConstructParticle();
 }
 
-void CMSHadronPhysicsFTFP_BERT::TerminateWorker()
-{
+void CMSHadronPhysicsFTFP_BERT::TerminateWorker() {
   delete xs_k.Get();
-  std::for_each( xs_ds.Begin(), xs_ds.End(),[](G4VCrossSectionDataSet* el){ delete el;});
+  std::for_each(xs_ds.Begin(), xs_ds.End(), [](G4VCrossSectionDataSet* el) { delete el; });
   xs_ds.Clear();
   G4VPhysicsConstructor::TerminateWorker();
 }
 
-void CMSHadronPhysicsFTFP_BERT::DumpBanner()
-{
-  G4cout << G4endl
-       << " FTFP_BERT : new threshold between BERT and FTFP is over the interval " << G4endl
-       << " for pions :   " << minFTFP_pion/GeV << " to " << maxBERT_pion/GeV  << " GeV" << G4endl
-       << " for kaons :   " << minFTFP_kaon/GeV << " to " << maxBERT_kaon/GeV  << " GeV" << G4endl
-       << " for proton :  " << minFTFP_proton/GeV << " to " << maxBERT_proton/GeV  << " GeV" << G4endl
-       << " for neutron : " << minFTFP_neutron/GeV << " to " << maxBERT_neutron/GeV  << " GeV" << G4endl
-       << G4endl;
+void CMSHadronPhysicsFTFP_BERT::DumpBanner() {
+  G4cout << G4endl << " FTFP_BERT : new threshold between BERT and FTFP is over the interval " << G4endl
+         << " for pions :   " << minFTFP_pion / GeV << " to " << maxBERT_pion / GeV << " GeV" << G4endl
+         << " for kaons :   " << minFTFP_kaon / GeV << " to " << maxBERT_kaon / GeV << " GeV" << G4endl
+         << " for proton :  " << minFTFP_proton / GeV << " to " << maxBERT_proton / GeV << " GeV" << G4endl
+         << " for neutron : " << minFTFP_neutron / GeV << " to " << maxBERT_neutron / GeV << " GeV" << G4endl << G4endl;
 }
 
-void CMSHadronPhysicsFTFP_BERT::CreateModels()
-{
+void CMSHadronPhysicsFTFP_BERT::CreateModels() {
   Neutron();
   Proton();
   Pion();
@@ -107,8 +98,7 @@ void CMSHadronPhysicsFTFP_BERT::CreateModels()
   Others();
 }
 
-void CMSHadronPhysicsFTFP_BERT::Neutron()
-{
+void CMSHadronPhysicsFTFP_BERT::Neutron() {
   //General schema:
   // 1) Create a builder
   // 2) Call AddBuilder
@@ -117,19 +107,18 @@ void CMSHadronPhysicsFTFP_BERT::Neutron()
   auto neu = new G4NeutronBuilder;
   AddBuilder(neu);
   auto ftfpn = new G4FTFPNeutronBuilder(QuasiElastic);
-  AddBuilder( ftfpn );
+  AddBuilder(ftfpn);
   neu->RegisterMe(ftfpn);
   ftfpn->SetMinEnergy(minFTFP_neutron);
   auto bertn = new G4BertiniNeutronBuilder;
   AddBuilder(bertn);
   neu->RegisterMe(bertn);
-  bertn->SetMinEnergy(0.*GeV);
+  bertn->SetMinEnergy(0. * GeV);
   bertn->SetMaxEnergy(maxBERT_neutron);
   neu->Build();
 }
 
-void CMSHadronPhysicsFTFP_BERT::Proton()
-{
+void CMSHadronPhysicsFTFP_BERT::Proton() {
   auto pro = new G4ProtonBuilder;
   AddBuilder(pro);
   auto ftfpp = new G4FTFPProtonBuilder(QuasiElastic);
@@ -143,8 +132,7 @@ void CMSHadronPhysicsFTFP_BERT::Proton()
   pro->Build();
 }
 
-void CMSHadronPhysicsFTFP_BERT::Pion()
-{
+void CMSHadronPhysicsFTFP_BERT::Pion() {
   auto pi = new G4PionBuilder;
   AddBuilder(pi);
   auto ftfppi = new G4FTFPPionBuilder(QuasiElastic);
@@ -158,26 +146,24 @@ void CMSHadronPhysicsFTFP_BERT::Pion()
   pi->Build();
 }
 
-void CMSHadronPhysicsFTFP_BERT::Kaon()
-{
+void CMSHadronPhysicsFTFP_BERT::Kaon() {
   auto k = new G4KaonBuilder;
   AddBuilder(k);
   auto ftfpk = new G4FTFPKaonBuilder(QuasiElastic);
   AddBuilder(ftfpk);
   k->RegisterMe(ftfpk);
   ftfpk->SetMinEnergy(minFTFP_kaon);
-  auto bertk  = new G4BertiniKaonBuilder;
+  auto bertk = new G4BertiniKaonBuilder;
   AddBuilder(bertk);
   k->RegisterMe(bertk);
   bertk->SetMaxEnergy(maxBERT_kaon);
   k->Build();
 }
 
-void CMSHadronPhysicsFTFP_BERT::Others()
-{
+void CMSHadronPhysicsFTFP_BERT::Others() {
   //===== Hyperons ====== //
   auto hyp = new G4HyperonFTFPBuilder;
-  AddBuilder( hyp );
+  AddBuilder(hyp);
   hyp->Build();
 
   ///===== Anti-barions==== //
@@ -189,21 +175,19 @@ void CMSHadronPhysicsFTFP_BERT::Others()
   abar->Build();
 }
 
-void CMSHadronPhysicsFTFP_BERT::ConstructProcess()
-{
-  if(G4Threading::IsMasterThread()) {
-      DumpBanner();
+void CMSHadronPhysicsFTFP_BERT::ConstructProcess() {
+  if (G4Threading::IsMasterThread()) {
+    DumpBanner();
   }
   CreateModels();
   ExtraConfiguration();
 }
 
-void CMSHadronPhysicsFTFP_BERT::ExtraConfiguration()
-{
+void CMSHadronPhysicsFTFP_BERT::ExtraConfiguration() {
   //Modify XS for kaons
   auto xsk = new G4ComponentGGHadronNucleusXsc();
   xs_k.Put(xsk);
-  G4VCrossSectionDataSet * kaonxs = new G4CrossSectionInelastic(xsk);
+  G4VCrossSectionDataSet* kaonxs = new G4CrossSectionInelastic(xsk);
   xs_ds.Push_back(kaonxs);
   G4PhysListUtil::FindInelasticProcess(G4KaonMinus::KaonMinus())->AddDataSet(kaonxs);
   G4PhysListUtil::FindInelasticProcess(G4KaonPlus::KaonPlus())->AddDataSet(kaonxs);
@@ -211,23 +195,25 @@ void CMSHadronPhysicsFTFP_BERT::ExtraConfiguration()
   G4PhysListUtil::FindInelasticProcess(G4KaonZeroLong::KaonZeroLong())->AddDataSet(kaonxs);
 
   //Modify Neutrons
-  auto xs_n_in = (G4NeutronInelasticXS*)G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4NeutronInelasticXS::Default_Name());
-  xs_ds.Push_back(xs_n_in);//TODO: Is this needed? Who owns the pointer?
-  G4PhysListUtil::FindInelasticProcess(G4Neutron::Neutron())->AddDataSet( xs_n_in );
+  auto xs_n_in = (G4NeutronInelasticXS*)G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(
+      G4NeutronInelasticXS::Default_Name());
+  xs_ds.Push_back(xs_n_in);  //TODO: Is this needed? Who owns the pointer?
+  G4PhysListUtil::FindInelasticProcess(G4Neutron::Neutron())->AddDataSet(xs_n_in);
   G4HadronicProcess* capture = nullptr;
   G4ProcessManager* pmanager = G4Neutron::Neutron()->GetProcessManager();
-  G4ProcessVector*  pv = pmanager->GetProcessList();
-  for ( size_t i=0; i < static_cast<size_t>(pv->size()); ++i ) {
-    if ( fCapture == ((*pv)[i])->GetProcessSubType() ) {
+  G4ProcessVector* pv = pmanager->GetProcessList();
+  for (size_t i = 0; i < static_cast<size_t>(pv->size()); ++i) {
+    if (fCapture == ((*pv)[i])->GetProcessSubType()) {
       capture = static_cast<G4HadronicProcess*>((*pv)[i]);
     }
   }
-  if ( ! capture ) {
+  if (!capture) {
     capture = new G4HadronCaptureProcess("nCapture");
     pmanager->AddDiscreteProcess(capture);
   }
-  auto xs_n_c = (G4NeutronCaptureXS*)G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(G4NeutronCaptureXS::Default_Name());
+  auto xs_n_c = (G4NeutronCaptureXS*)G4CrossSectionDataSetRegistry::Instance()->GetCrossSectionDataSet(
+      G4NeutronCaptureXS::Default_Name());
   xs_ds.Push_back(xs_n_c);
-  capture->AddDataSet( xs_n_c );
-  capture->RegisterMe( new G4NeutronRadCapture() );
+  capture->AddDataSet(xs_n_c);
+  capture->RegisterMe(new G4NeutronRadCapture());
 }
diff --git a/SimG4Core/PhysicsLists/src/CMSHadronPhysicsFTFP_BERT_ATL.cc b/SimG4Core/PhysicsLists/src/CMSHadronPhysicsFTFP_BERT_ATL.cc
index 043d353866a01..1e22ff67227b6 100644
--- a/SimG4Core/PhysicsLists/src/CMSHadronPhysicsFTFP_BERT_ATL.cc
+++ b/SimG4Core/PhysicsLists/src/CMSHadronPhysicsFTFP_BERT_ATL.cc
@@ -9,7 +9,7 @@
 // energy region [9, 12] GeV (instead of [4, 5] GeV as in FTFP_BERT).
 //---------------------------------------------------------------------------
 //
-#include <iomanip>   
+#include <iomanip>
 
 #include "SimG4Core/PhysicsLists/interface/CMSHadronPhysicsFTFP_BERT_ATL.h"
 
@@ -34,50 +34,46 @@
 
 #include "G4PhysListUtil.hh"
 
-G4ThreadLocal CMSHadronPhysicsFTFP_BERT_ATL::ThreadPrivate* CMSHadronPhysicsFTFP_BERT_ATL::tpdata=nullptr;
+G4ThreadLocal CMSHadronPhysicsFTFP_BERT_ATL::ThreadPrivate* CMSHadronPhysicsFTFP_BERT_ATL::tpdata = nullptr;
 
 CMSHadronPhysicsFTFP_BERT_ATL::CMSHadronPhysicsFTFP_BERT_ATL(G4int)
-    :  G4VPhysicsConstructor("hInelastic FTFP_BERT_ATL")
-    , QuasiElastic(false)
-{}
+    : G4VPhysicsConstructor("hInelastic FTFP_BERT_ATL"), QuasiElastic(false) {}
 
-void CMSHadronPhysicsFTFP_BERT_ATL::CreateModels()
-{
-  G4double minFTFP =  9.0 * GeV;
+void CMSHadronPhysicsFTFP_BERT_ATL::CreateModels() {
+  G4double minFTFP = 9.0 * GeV;
   G4double maxBERT = 12.0 * GeV;
-  G4cout << " CMS_FTFP_BERT_ATL : new threshold between BERT and FTFP" 
-         << " is over the interval " << minFTFP/GeV << " to " << maxBERT/GeV 
-         << " GeV." << G4endl;
-  QuasiElastic= false; 
+  G4cout << " CMS_FTFP_BERT_ATL : new threshold between BERT and FTFP"
+         << " is over the interval " << minFTFP / GeV << " to " << maxBERT / GeV << " GeV." << G4endl;
+  QuasiElastic = false;
 
-  tpdata->theNeutrons=new G4NeutronBuilder;
-  tpdata->theNeutrons->RegisterMe(tpdata->theFTFPNeutron=new G4FTFPNeutronBuilder(QuasiElastic));
+  tpdata->theNeutrons = new G4NeutronBuilder;
+  tpdata->theNeutrons->RegisterMe(tpdata->theFTFPNeutron = new G4FTFPNeutronBuilder(QuasiElastic));
   tpdata->theFTFPNeutron->SetMinEnergy(minFTFP);
-  tpdata->theNeutrons->RegisterMe(tpdata->theBertiniNeutron=new G4BertiniNeutronBuilder);
-  tpdata->theBertiniNeutron->SetMinEnergy(0.0*GeV);
+  tpdata->theNeutrons->RegisterMe(tpdata->theBertiniNeutron = new G4BertiniNeutronBuilder);
+  tpdata->theBertiniNeutron->SetMinEnergy(0.0 * GeV);
   tpdata->theBertiniNeutron->SetMaxEnergy(maxBERT);
 
-  tpdata->thePro=new G4ProtonBuilder;
-  tpdata->thePro->RegisterMe(tpdata->theFTFPPro=new G4FTFPProtonBuilder(QuasiElastic));
+  tpdata->thePro = new G4ProtonBuilder;
+  tpdata->thePro->RegisterMe(tpdata->theFTFPPro = new G4FTFPProtonBuilder(QuasiElastic));
   tpdata->theFTFPPro->SetMinEnergy(minFTFP);
-  tpdata->thePro->RegisterMe(tpdata->theBertiniPro=new G4BertiniProtonBuilder);
+  tpdata->thePro->RegisterMe(tpdata->theBertiniPro = new G4BertiniProtonBuilder);
   tpdata->theBertiniPro->SetMaxEnergy(maxBERT);
 
-  tpdata->thePiK=new G4PiKBuilder;
-  tpdata->thePiK->RegisterMe(tpdata->theFTFPPiK=new G4FTFPPiKBuilder(QuasiElastic));
+  tpdata->thePiK = new G4PiKBuilder;
+  tpdata->thePiK->RegisterMe(tpdata->theFTFPPiK = new G4FTFPPiKBuilder(QuasiElastic));
   tpdata->theFTFPPiK->SetMinEnergy(minFTFP);
-  tpdata->thePiK->RegisterMe(tpdata->theBertiniPiK=new G4BertiniPiKBuilder);
+  tpdata->thePiK->RegisterMe(tpdata->theBertiniPiK = new G4BertiniPiKBuilder);
   tpdata->theBertiniPiK->SetMaxEnergy(maxBERT);
-  
-  tpdata->theHyperon=new G4HyperonFTFPBuilder;
-    
-  tpdata->theAntiBaryon=new G4AntiBarionBuilder;
-  tpdata->theAntiBaryon->RegisterMe(tpdata->theFTFPAntiBaryon=new G4FTFPAntiBarionBuilder(QuasiElastic));
+
+  tpdata->theHyperon = new G4HyperonFTFPBuilder;
+
+  tpdata->theAntiBaryon = new G4AntiBarionBuilder;
+  tpdata->theAntiBaryon->RegisterMe(tpdata->theFTFPAntiBaryon = new G4FTFPAntiBarionBuilder(QuasiElastic));
 }
 
-CMSHadronPhysicsFTFP_BERT_ATL::~CMSHadronPhysicsFTFP_BERT_ATL()
-{
-  if (!tpdata) return;
+CMSHadronPhysicsFTFP_BERT_ATL::~CMSHadronPhysicsFTFP_BERT_ATL() {
+  if (!tpdata)
+    return;
 
   delete tpdata->theNeutrons;
   delete tpdata->theBertiniNeutron;
@@ -86,23 +82,23 @@ CMSHadronPhysicsFTFP_BERT_ATL::~CMSHadronPhysicsFTFP_BERT_ATL()
   delete tpdata->thePiK;
   delete tpdata->theBertiniPiK;
   delete tpdata->theFTFPPiK;
-    
+
   delete tpdata->thePro;
   delete tpdata->theBertiniPro;
-  delete tpdata->theFTFPPro;    
-    
+  delete tpdata->theFTFPPro;
+
   delete tpdata->theHyperon;
   delete tpdata->theAntiBaryon;
   delete tpdata->theFTFPAntiBaryon;
- 
+
   //Note that here we need to set to 0 the pointer
   //since tpdata is static and if thread are "reused"
   //it can be problematic
-  delete tpdata; tpdata = nullptr;
+  delete tpdata;
+  tpdata = nullptr;
 }
 
-void CMSHadronPhysicsFTFP_BERT_ATL::ConstructParticle()
-{
+void CMSHadronPhysicsFTFP_BERT_ATL::ConstructParticle() {
   G4MesonConstructor pMesonConstructor;
   pMesonConstructor.ConstructParticle();
 
@@ -110,13 +106,13 @@ void CMSHadronPhysicsFTFP_BERT_ATL::ConstructParticle()
   pBaryonConstructor.ConstructParticle();
 
   G4ShortLivedConstructor pShortLivedConstructor;
-  pShortLivedConstructor.ConstructParticle();  
+  pShortLivedConstructor.ConstructParticle();
 }
 
 #include "G4ProcessManager.hh"
-void CMSHadronPhysicsFTFP_BERT_ATL::ConstructProcess()
-{
-  if ( tpdata == nullptr ) tpdata = new ThreadPrivate;
+void CMSHadronPhysicsFTFP_BERT_ATL::ConstructProcess() {
+  if (tpdata == nullptr)
+    tpdata = new ThreadPrivate;
   CreateModels();
   tpdata->theNeutrons->Build();
   tpdata->thePro->Build();
@@ -124,12 +120,12 @@ void CMSHadronPhysicsFTFP_BERT_ATL::ConstructProcess()
 
   // --- Kaons ---
   tpdata->xsKaon = new G4ComponentGGHadronNucleusXsc();
-  G4VCrossSectionDataSet * kaonxs = new G4CrossSectionInelastic(tpdata->xsKaon);
+  G4VCrossSectionDataSet* kaonxs = new G4CrossSectionInelastic(tpdata->xsKaon);
   G4PhysListUtil::FindInelasticProcess(G4KaonMinus::KaonMinus())->AddDataSet(kaonxs);
   G4PhysListUtil::FindInelasticProcess(G4KaonPlus::KaonPlus())->AddDataSet(kaonxs);
   G4PhysListUtil::FindInelasticProcess(G4KaonZeroShort::KaonZeroShort())->AddDataSet(kaonxs);
   G4PhysListUtil::FindInelasticProcess(G4KaonZeroLong::KaonZeroLong())->AddDataSet(kaonxs);
-    
+
   tpdata->theHyperon->Build();
   tpdata->theAntiBaryon->Build();
 
@@ -138,13 +134,13 @@ void CMSHadronPhysicsFTFP_BERT_ATL::ConstructProcess()
 
   G4HadronicProcess* capture = nullptr;
   G4ProcessManager* pmanager = G4Neutron::Neutron()->GetProcessManager();
-  G4ProcessVector*  pv = pmanager->GetProcessList();
-  for ( size_t i=0; i < static_cast<size_t>(pv->size()); ++i ) {
-    if ( fCapture == ((*pv)[i])->GetProcessSubType() ) {
+  G4ProcessVector* pv = pmanager->GetProcessList();
+  for (size_t i = 0; i < static_cast<size_t>(pv->size()); ++i) {
+    if (fCapture == ((*pv)[i])->GetProcessSubType()) {
       capture = static_cast<G4HadronicProcess*>((*pv)[i]);
     }
   }
-  if ( ! capture ) {
+  if (!capture) {
     capture = new G4HadronCaptureProcess("nCapture");
     pmanager->AddDiscreteProcess(capture);
   }
diff --git a/SimG4Core/PhysicsLists/src/CMSMonopolePhysics.cc b/SimG4Core/PhysicsLists/src/CMSMonopolePhysics.cc
index 619695af4fd69..8132a9cd500b6 100644
--- a/SimG4Core/PhysicsLists/src/CMSMonopolePhysics.cc
+++ b/SimG4Core/PhysicsLists/src/CMSMonopolePhysics.cc
@@ -14,69 +14,58 @@
 
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 
-CMSMonopolePhysics::CMSMonopolePhysics(const HepPDT::ParticleDataTable * pdt,
-				       const edm::ParameterSet & p) :
-  G4VPhysicsConstructor("Monopole Physics")
-{  
-  verbose   = p.getUntrackedParameter<int>("Verbosity",0);
-  magCharge = p.getUntrackedParameter<int>("MonopoleCharge",1);
-  deltaRay  = p.getUntrackedParameter<bool>("MonopoleDeltaRay",true);
-  multiSc   = p.getUntrackedParameter<bool>("MonopoleMultiScatter",false);
-  transport = p.getUntrackedParameter<bool>("MonopoleTransport",true);
-  double mass = p.getUntrackedParameter<double>("MonopoleMass",200);
+CMSMonopolePhysics::CMSMonopolePhysics(const HepPDT::ParticleDataTable* pdt, const edm::ParameterSet& p)
+    : G4VPhysicsConstructor("Monopole Physics") {
+  verbose = p.getUntrackedParameter<int>("Verbosity", 0);
+  magCharge = p.getUntrackedParameter<int>("MonopoleCharge", 1);
+  deltaRay = p.getUntrackedParameter<bool>("MonopoleDeltaRay", true);
+  multiSc = p.getUntrackedParameter<bool>("MonopoleMultiScatter", false);
+  transport = p.getUntrackedParameter<bool>("MonopoleTransport", true);
+  double mass = p.getUntrackedParameter<double>("MonopoleMass", 200);
   if (pdt && mass > 0.0) {
-    int ii=0;
-    for (HepPDT::ParticleDataTable::const_iterator p=pdt->begin(); 
-	 p != pdt->end(); ++p,++ii) {
+    int ii = 0;
+    for (HepPDT::ParticleDataTable::const_iterator p = pdt->begin(); p != pdt->end(); ++p, ++ii) {
       HepPDT::ParticleData particle = (p->second);
-      std::string particleName = (particle.name()).substr(0,8);
-      if (strcmp(particleName.c_str(),"Monopole") == 0) {
-	names.push_back(particle.name());
-	masses.push_back(mass*CLHEP::GeV);
-	elCharges.push_back((int)(particle.charge()));
-	pdgEncodings.push_back(particle.pid());
-	monopoles.push_back(nullptr);
-	if (verbose > 0) G4cout << "CMSMonopolePhysics: Monopole[" << ii
-				<< "] " << particleName << " Mass "
-				<< particle.mass() << " GeV, Magnetic Charge "
-				<< magCharge << ", Electric Charge "
-				<< particle.charge() << G4endl;
-      } else if(strcmp(particleName.c_str(),"AntiMono") == 0) {
-	names.push_back(particle.name());
-	masses.push_back(mass*CLHEP::GeV);
-	elCharges.push_back((int)(particle.charge()));
-	pdgEncodings.push_back(particle.pid());
-	monopoles.push_back(nullptr);
-	if (verbose > 0) G4cout << "CMSMonopolePhysics: Monopole[" << ii
-				<< "] " << particleName << " Mass "
-				<< particle.mass() << " GeV, Magnetic Charge "
-				<< magCharge << ", Electric Charge "
-				<< particle.charge() << G4endl; 
+      std::string particleName = (particle.name()).substr(0, 8);
+      if (strcmp(particleName.c_str(), "Monopole") == 0) {
+        names.push_back(particle.name());
+        masses.push_back(mass * CLHEP::GeV);
+        elCharges.push_back((int)(particle.charge()));
+        pdgEncodings.push_back(particle.pid());
+        monopoles.push_back(nullptr);
+        if (verbose > 0)
+          G4cout << "CMSMonopolePhysics: Monopole[" << ii << "] " << particleName << " Mass " << particle.mass()
+                 << " GeV, Magnetic Charge " << magCharge << ", Electric Charge " << particle.charge() << G4endl;
+      } else if (strcmp(particleName.c_str(), "AntiMono") == 0) {
+        names.push_back(particle.name());
+        masses.push_back(mass * CLHEP::GeV);
+        elCharges.push_back((int)(particle.charge()));
+        pdgEncodings.push_back(particle.pid());
+        monopoles.push_back(nullptr);
+        if (verbose > 0)
+          G4cout << "CMSMonopolePhysics: Monopole[" << ii << "] " << particleName << " Mass " << particle.mass()
+                 << " GeV, Magnetic Charge " << magCharge << ", Electric Charge " << particle.charge() << G4endl;
       }
     }
   }
-  if (verbose > 0) G4cout << "CMSMonopolePhysics has " << names.size()
-			  << " monopole candidates and delta Ray option " 
-			  << deltaRay << G4endl;
+  if (verbose > 0)
+    G4cout << "CMSMonopolePhysics has " << names.size() << " monopole candidates and delta Ray option " << deltaRay
+           << G4endl;
 }
 
 CMSMonopolePhysics::~CMSMonopolePhysics() {}
 
 void CMSMonopolePhysics::ConstructParticle() {
-  
-  for (unsigned int ii=0; ii<names.size(); ++ii) {
+  for (unsigned int ii = 0; ii < names.size(); ++ii) {
     // monopoles are created once in the master thread
     if (!monopoles[ii]) {
-      G4int mc = (pdgEncodings[ii] >= 0 ) ? magCharge : -magCharge;
-      Monopole* mpl = new Monopole(names[ii], pdgEncodings[ii], masses[ii],
-                                   mc, elCharges[ii]);
+      G4int mc = (pdgEncodings[ii] >= 0) ? magCharge : -magCharge;
+      Monopole* mpl = new Monopole(names[ii], pdgEncodings[ii], masses[ii], mc, elCharges[ii]);
       monopoles[ii] = mpl;
-      if (verbose > 0) G4cout << "Create Monopole " << names[ii] 
-			      << " of mass " << masses[ii]/CLHEP::GeV
-			      << " GeV, magnetic charge " << mc 
-			      << ", electric charge " << elCharges[ii]
-			      << " and PDG encoding " << pdgEncodings[ii]
-			      << " at " << monopoles[ii] << G4endl;
+      if (verbose > 0)
+        G4cout << "Create Monopole " << names[ii] << " of mass " << masses[ii] / CLHEP::GeV << " GeV, magnetic charge "
+               << mc << ", electric charge " << elCharges[ii] << " and PDG encoding " << pdgEncodings[ii] << " at "
+               << monopoles[ii] << G4endl;
     }
   }
 }
@@ -88,52 +77,51 @@ void CMSMonopolePhysics::ConstructProcess() {
   }
   G4PhysicsListHelper* ph = G4PhysicsListHelper::GetPhysicsListHelper();
 
-  for (unsigned int ii=0; ii<monopoles.size(); ++ii) {
+  for (unsigned int ii = 0; ii < monopoles.size(); ++ii) {
     if (monopoles[ii]) {
       Monopole* mpl = monopoles[ii];
-      G4ProcessManager *pmanager = mpl->GetProcessManager();
-      if(!pmanager) {
+      G4ProcessManager* pmanager = mpl->GetProcessManager();
+      if (!pmanager) {
         std::ostringstream o;
         o << "Monopole without a Process Manager";
-        throw edm::Exception( edm::errors::Configuration, o.str().c_str());
+        throw edm::Exception(edm::errors::Configuration, o.str().c_str());
         return;
       }
 
       G4double magn = mpl->MagneticCharge();
       G4double mass = mpl->GetPDGMass();
       if (verbose > 1) {
-	G4cout << "### CMSMonopolePhysics instantiates for " 
-	       << mpl->GetParticleName()
-	       << " at " << mpl << " Mass " << mass/CLHEP::GeV 
-	       << " GeV Mag " << magn  << " Process manager " << pmanager 
-	       << G4endl;
+        G4cout << "### CMSMonopolePhysics instantiates for " << mpl->GetParticleName() << " at " << mpl << " Mass "
+               << mass / CLHEP::GeV << " GeV Mag " << magn << " Process manager " << pmanager << G4endl;
       }
-  
+
       if (magn != 0.0) {
         G4int idxt(0);
         pmanager->RemoveProcess(idxt);
-        pmanager->AddProcess(new MonopoleTransportation(mpl,verbose),-1,0,0);
+        pmanager->AddProcess(new MonopoleTransportation(mpl, verbose), -1, 0, 0);
       }
 
       if (mpl->GetPDGCharge() != 0.0) {
-	if (multiSc) {
-	  G4hMultipleScattering* hmsc = new G4hMultipleScattering();
-	  ph->RegisterProcess(hmsc, mpl);
-	}
-	G4hIonisation* hioni = new G4hIonisation();
-	ph->RegisterProcess(hioni, mpl);
+        if (multiSc) {
+          G4hMultipleScattering* hmsc = new G4hMultipleScattering();
+          ph->RegisterProcess(hmsc, mpl);
+        }
+        G4hIonisation* hioni = new G4hIonisation();
+        ph->RegisterProcess(hioni, mpl);
       }
-      if(magn != 0.0) {
-	CMSmplIonisation* mplioni = new CMSmplIonisation(magn);
-        if(!deltaRay) {
-          G4mplIonisationModel* ion = new G4mplIonisationModel(magn,"PAI");
+      if (magn != 0.0) {
+        CMSmplIonisation* mplioni = new CMSmplIonisation(magn);
+        if (!deltaRay) {
+          G4mplIonisationModel* ion = new G4mplIonisationModel(magn, "PAI");
           ion->SetParticle(mpl);
-          mplioni->AddEmModel(0,ion,ion);
-	}
-	ph->RegisterProcess(mplioni, mpl);
+          mplioni->AddEmModel(0, ion, ion);
+        }
+        ph->RegisterProcess(mplioni, mpl);
       }
       pmanager->AddDiscreteProcess(new G4StepLimiter());
-      if (verbose > 1) { pmanager->DumpInfo(); }
+      if (verbose > 1) {
+        pmanager->DumpInfo();
+      }
     }
   }
 }
diff --git a/SimG4Core/PhysicsLists/src/CMSThermalNeutrons.cc b/SimG4Core/PhysicsLists/src/CMSThermalNeutrons.cc
index fab7d3bb856c9..b26487438067d 100644
--- a/SimG4Core/PhysicsLists/src/CMSThermalNeutrons.cc
+++ b/SimG4Core/PhysicsLists/src/CMSThermalNeutrons.cc
@@ -11,35 +11,28 @@
 
 #include "G4SystemOfUnits.hh"
 
-CMSThermalNeutrons::CMSThermalNeutrons(G4int ver) :
-  G4VHadronPhysics("CMSThermalNeutrons"), verbose(ver) {
-}
+CMSThermalNeutrons::CMSThermalNeutrons(G4int ver) : G4VHadronPhysics("CMSThermalNeutrons"), verbose(ver) {}
 
 CMSThermalNeutrons::~CMSThermalNeutrons() {}
 
 void CMSThermalNeutrons::ConstructProcess() {
- 
-  if(verbose > 0) {
+  if (verbose > 0) {
     G4cout << "### " << GetPhysicsName() << " Construct Processes " << G4endl;
   }
   G4Neutron* part = G4Neutron::Neutron();
   G4HadronicProcess* hpel = FindElasticProcess(part);
-  if(!hpel) {
-    G4cout << "### " << GetPhysicsName() 
-	   << " WARNING: Fail to add thermal neutron scattering" << G4endl;
+  if (!hpel) {
+    G4cout << "### " << GetPhysicsName() << " WARNING: Fail to add thermal neutron scattering" << G4endl;
     return;
   }
 
   G4int ni = (hpel->GetHadronicInteractionList()).size();
-  if(ni < 1) {
-    G4cout << "### " << GetPhysicsName() 
-	   << " WARNING: Fail to add thermal neutron scattering - Nint= " 
-	   << ni << G4endl;
+  if (ni < 1) {
+    G4cout << "### " << GetPhysicsName() << " WARNING: Fail to add thermal neutron scattering - Nint= " << ni << G4endl;
     return;
   }
-  (hpel->GetHadronicInteractionList())[ni-1]->SetMinEnergy(4*CLHEP::eV);
+  (hpel->GetHadronicInteractionList())[ni - 1]->SetMinEnergy(4 * CLHEP::eV);
 
   hpel->RegisterMe(new G4ParticleHPThermalScattering());
   hpel->AddDataSet(new G4ParticleHPThermalScatteringData());
-  
 }
diff --git a/SimG4Core/PhysicsLists/src/CMSmplIonisation.cc b/SimG4Core/PhysicsLists/src/CMSmplIonisation.cc
index 036853ea67f7d..bbe6247144916 100644
--- a/SimG4Core/PhysicsLists/src/CMSmplIonisation.cc
+++ b/SimG4Core/PhysicsLists/src/CMSmplIonisation.cc
@@ -28,63 +28,54 @@
 using namespace std;
 
 CMSmplIonisation::CMSmplIonisation(G4double mCharge, const G4String& name)
-  : G4VEnergyLossProcess(name),
-    magneticCharge(mCharge),
-    isInitialised(false)
-{
+    : G4VEnergyLossProcess(name), magneticCharge(mCharge), isInitialised(false) {
   // By default classical magnetic charge is used
-  if(magneticCharge == 0.0) { magneticCharge = eplus*0.5/fine_structure_const; }
+  if (magneticCharge == 0.0) {
+    magneticCharge = eplus * 0.5 / fine_structure_const;
+  }
 
   SetVerboseLevel(0);
   SetProcessSubType(fIonisation);
-  SetStepFunction(0.2, 1*mm);
+  SetStepFunction(0.2, 1 * mm);
   SetSecondaryParticle(G4Electron::Electron());
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-CMSmplIonisation::~CMSmplIonisation()
-{}
+CMSmplIonisation::~CMSmplIonisation() {}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-G4bool CMSmplIonisation::IsApplicable(const G4ParticleDefinition&)
-{
-  return true;
-}
+G4bool CMSmplIonisation::IsApplicable(const G4ParticleDefinition&) { return true; }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-G4double CMSmplIonisation::MinPrimaryEnergy(const G4ParticleDefinition* mpl,
-                                           const G4Material*,
-                                           G4double cut)
-{
-  G4double x = 0.5*cut/electron_mass_c2;
-  G4double mass  = mpl->GetPDGMass();
-  G4double ratio = electron_mass_c2/mass;
-  G4double gam   = x*ratio + std::sqrt((1. + x)*(1. + x*ratio*ratio));
-  return mass*(gam - 1.0);
+G4double CMSmplIonisation::MinPrimaryEnergy(const G4ParticleDefinition* mpl, const G4Material*, G4double cut) {
+  G4double x = 0.5 * cut / electron_mass_c2;
+  G4double mass = mpl->GetPDGMass();
+  G4double ratio = electron_mass_c2 / mass;
+  G4double gam = x * ratio + std::sqrt((1. + x) * (1. + x * ratio * ratio));
+  return mass * (gam - 1.0);
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-void CMSmplIonisation::InitialiseEnergyLossProcess(const G4ParticleDefinition* p,
-                                                   const G4ParticleDefinition*)
-{
-  if(isInitialised) { return; }
+void CMSmplIonisation::InitialiseEnergyLossProcess(const G4ParticleDefinition* p, const G4ParticleDefinition*) {
+  if (isInitialised) {
+    return;
+  }
 
   SetBaseParticle(nullptr);
 
   // monopole model is responsible both for energy loss and fluctuations
-  CMSmplIonisationWithDeltaModel* ion =
-    new CMSmplIonisationWithDeltaModel(magneticCharge,"PAI");
+  CMSmplIonisationWithDeltaModel* ion = new CMSmplIonisationWithDeltaModel(magneticCharge, "PAI");
   ion->SetParticle(p);
 
   // define size of dedx and range tables
   G4EmParameters* param = G4EmParameters::Instance();
-  G4double emin  = std::min(param->MinKinEnergy(),ion->LowEnergyLimit());
-  G4double emax  = std::max(param->MaxKinEnergy(),ion->HighEnergyLimit());
-  G4int bin = G4lrint(param->NumberOfBinsPerDecade()*std::log10(emax/emin));
+  G4double emin = std::min(param->MinKinEnergy(), ion->LowEnergyLimit());
+  G4double emax = std::max(param->MaxKinEnergy(), ion->HighEnergyLimit());
+  G4int bin = G4lrint(param->NumberOfBinsPerDecade() * std::log10(emax / emin));
   ion->SetLowEnergyLimit(emin);
   ion->SetHighEnergyLimit(emax);
   SetMinKinEnergy(emin);
@@ -92,23 +83,20 @@ void CMSmplIonisation::InitialiseEnergyLossProcess(const G4ParticleDefinition* p
   SetDEDXBinning(bin);
 
   SetEmModel(ion);
-  AddEmModel(1,ion,ion);
+  AddEmModel(1, ion, ion);
 
   isInitialised = true;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-void CMSmplIonisation::PrintInfo()
-{}
+void CMSmplIonisation::PrintInfo() {}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-void CMSmplIonisation::ProcessDescription(std::ostream& out) const
-{
+void CMSmplIonisation::ProcessDescription(std::ostream& out) const {
   out << "No description available." << G4endl;
   G4VEnergyLossProcess::ProcessDescription(out);
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-
diff --git a/SimG4Core/PhysicsLists/src/CMSmplIonisationWithDeltaModel.cc b/SimG4Core/PhysicsLists/src/CMSmplIonisationWithDeltaModel.cc
index b625d4e7e5f52..bd23de0e6a0ce 100644
--- a/SimG4Core/PhysicsLists/src/CMSmplIonisationWithDeltaModel.cc
+++ b/SimG4Core/PhysicsLists/src/CMSmplIonisationWithDeltaModel.cc
@@ -4,19 +4,18 @@
 //
 // File name:     CMSmplIonisationWithDeltaModel
 //
-// Author:        Vladimir Ivanchenko 
+// Author:        Vladimir Ivanchenko
 //
 // Creation date: 02.03.2019 copied from Geant4 10.5p01
 //
 //
 // -------------------------------------------------------------------
 // References
-// [1] Steven P. Ahlen: Energy loss of relativistic heavy ionizing particles, 
+// [1] Steven P. Ahlen: Energy loss of relativistic heavy ionizing particles,
 //     S.P. Ahlen, Rev. Mod. Phys 52(1980), p121
 // [2] K.A. Milton arXiv:hep-ex/0602040
 // [3] S.P. Ahlen and K. Kinoshita, Phys. Rev. D26 (1982) 2347
 
-
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
@@ -38,126 +37,122 @@ using namespace std;
 
 std::vector<G4double>* CMSmplIonisationWithDeltaModel::dedx0 = nullptr;
 
-CMSmplIonisationWithDeltaModel::CMSmplIonisationWithDeltaModel(G4double mCharge,
-                                                               const G4String& nam)
-  : G4VEmModel(nam),G4VEmFluctuationModel(nam),
-  magCharge(mCharge),
-  twoln10(std::log(100.0)),
-  betalow(0.01),
-  betalim(0.1),
-  beta2lim(betalim*betalim),
-  bg2lim(beta2lim*(1.0 + beta2lim))
-{
+CMSmplIonisationWithDeltaModel::CMSmplIonisationWithDeltaModel(G4double mCharge, const G4String& nam)
+    : G4VEmModel(nam),
+      G4VEmFluctuationModel(nam),
+      magCharge(mCharge),
+      twoln10(std::log(100.0)),
+      betalow(0.01),
+      betalim(0.1),
+      beta2lim(betalim * betalim),
+      bg2lim(beta2lim * (1.0 + beta2lim)) {
   nmpl = G4lrint(std::abs(magCharge) * 2 * fine_structure_const);
-  if(nmpl > 6)      { nmpl = 6; }
-  else if(nmpl < 1) { nmpl = 1; }
+  if (nmpl > 6) {
+    nmpl = 6;
+  } else if (nmpl < 1) {
+    nmpl = 1;
+  }
   pi_hbarc2_over_mc2 = pi * hbarc * hbarc / electron_mass_c2;
   chargeSquare = magCharge * magCharge;
-  dedxlim = 45.*nmpl*nmpl*GeV*cm2/g;
+  dedxlim = 45. * nmpl * nmpl * GeV * cm2 / g;
   fParticleChange = nullptr;
   theElectron = G4Electron::Electron();
-  G4cout << "### Monopole ionisation model with d-electron production, Gmag= " 
-         << magCharge/eplus << G4endl;
+  G4cout << "### Monopole ionisation model with d-electron production, Gmag= " << magCharge / eplus << G4endl;
   monopole = nullptr;
   mass = 0.0;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-CMSmplIonisationWithDeltaModel::~CMSmplIonisationWithDeltaModel()
-{
-  if(IsMaster()) { delete dedx0; }
+CMSmplIonisationWithDeltaModel::~CMSmplIonisationWithDeltaModel() {
+  if (IsMaster()) {
+    delete dedx0;
+  }
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-void CMSmplIonisationWithDeltaModel::SetParticle(const G4ParticleDefinition* p)
-{
+void CMSmplIonisationWithDeltaModel::SetParticle(const G4ParticleDefinition* p) {
   monopole = p;
-  mass     = monopole->GetPDGMass();
-  G4double emin = 
-    std::min(LowEnergyLimit(),0.1*mass*(1./sqrt(1. - betalow*betalow) - 1.)); 
-  G4double emax = 
-    std::max(HighEnergyLimit(),10*mass*(1./sqrt(1. - beta2lim) - 1.)); 
+  mass = monopole->GetPDGMass();
+  G4double emin = std::min(LowEnergyLimit(), 0.1 * mass * (1. / sqrt(1. - betalow * betalow) - 1.));
+  G4double emax = std::max(HighEnergyLimit(), 10 * mass * (1. / sqrt(1. - beta2lim) - 1.));
   SetLowEnergyLimit(emin);
   SetHighEnergyLimit(emax);
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-void 
-CMSmplIonisationWithDeltaModel::Initialise(const G4ParticleDefinition* p,
-                                           const G4DataVector&)
-{
-  if(!monopole) { SetParticle(p); }
-  if(!fParticleChange) { fParticleChange = GetParticleChangeForLoss(); }
-  if(IsMaster()) {
-    if(!dedx0) { dedx0 = new std::vector<G4double>; }
-    G4ProductionCutsTable* theCoupleTable=
-      G4ProductionCutsTable::GetProductionCutsTable();
+void CMSmplIonisationWithDeltaModel::Initialise(const G4ParticleDefinition* p, const G4DataVector&) {
+  if (!monopole) {
+    SetParticle(p);
+  }
+  if (!fParticleChange) {
+    fParticleChange = GetParticleChangeForLoss();
+  }
+  if (IsMaster()) {
+    if (!dedx0) {
+      dedx0 = new std::vector<G4double>;
+    }
+    G4ProductionCutsTable* theCoupleTable = G4ProductionCutsTable::GetProductionCutsTable();
     G4int numOfCouples = theCoupleTable->GetTableSize();
     G4int n = dedx0->size();
-    if(n < numOfCouples) { dedx0->resize(numOfCouples); }
+    if (n < numOfCouples) {
+      dedx0->resize(numOfCouples);
+    }
     G4Pow* g4calc = G4Pow::GetInstance();
 
     // initialise vector
-    for(G4int i=0; i<numOfCouples; ++i) {
-
-      const G4Material* material = 
-        theCoupleTable->GetMaterialCutsCouple(i)->GetMaterial();
+    for (G4int i = 0; i < numOfCouples; ++i) {
+      const G4Material* material = theCoupleTable->GetMaterialCutsCouple(i)->GetMaterial();
       G4double eDensity = material->GetElectronDensity();
-      G4double vF = electron_Compton_length*g4calc->A13(3.*pi*pi*eDensity);
-      (*dedx0)[i] = pi_hbarc2_over_mc2*eDensity*nmpl*nmpl*
-        (G4Log(2*vF/fine_structure_const) - 0.5)/vF;
+      G4double vF = electron_Compton_length * g4calc->A13(3. * pi * pi * eDensity);
+      (*dedx0)[i] = pi_hbarc2_over_mc2 * eDensity * nmpl * nmpl * (G4Log(2 * vF / fine_structure_const) - 0.5) / vF;
     }
   }
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4double 
-CMSmplIonisationWithDeltaModel::MinEnergyCut(const G4ParticleDefinition*,
-                                             const G4MaterialCutsCouple* couple)
-{
+G4double CMSmplIonisationWithDeltaModel::MinEnergyCut(const G4ParticleDefinition*, const G4MaterialCutsCouple* couple) {
   return couple->GetMaterial()->GetIonisation()->GetMeanExcitationEnergy();
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-G4double 
-CMSmplIonisationWithDeltaModel::ComputeDEDXPerVolume(const G4Material* material,
-                                                     const G4ParticleDefinition* p,
-                                                     G4double kineticEnergy,
-                                                     G4double maxEnergy)
-{
-  if(!monopole) { SetParticle(p); }
-  G4double tmax = MaxSecondaryEnergy(p,kineticEnergy);
+G4double CMSmplIonisationWithDeltaModel::ComputeDEDXPerVolume(const G4Material* material,
+                                                              const G4ParticleDefinition* p,
+                                                              G4double kineticEnergy,
+                                                              G4double maxEnergy) {
+  if (!monopole) {
+    SetParticle(p);
+  }
+  G4double tmax = MaxSecondaryEnergy(p, kineticEnergy);
   G4double cutEnergy = std::min(tmax, maxEnergy);
   cutEnergy = std::max(LowEnergyLimit(), cutEnergy);
-  G4double tau   = kineticEnergy / mass;
-  G4double gam   = tau + 1.0;
-  G4double bg2   = tau * (tau + 2.0);
+  G4double tau = kineticEnergy / mass;
+  G4double gam = tau + 1.0;
+  G4double bg2 = tau * (tau + 2.0);
   G4double beta2 = bg2 / (gam * gam);
-  G4double beta  = sqrt(beta2);
+  G4double beta = sqrt(beta2);
 
   // low-energy asymptotic formula
-  G4double dedx = (*dedx0)[CurrentCouple()->GetIndex()]*beta;
+  G4double dedx = (*dedx0)[CurrentCouple()->GetIndex()] * beta;
 
   // above asymptotic
-  if(beta > betalow) {
-
+  if (beta > betalow) {
     // high energy
-    if(beta >= betalim) {
+    if (beta >= betalim) {
       dedx = ComputeDEDXAhlen(material, bg2, cutEnergy);
 
     } else {
-      G4double dedx1 = (*dedx0)[CurrentCouple()->GetIndex()]*betalow;
+      G4double dedx1 = (*dedx0)[CurrentCouple()->GetIndex()] * betalow;
       G4double dedx2 = ComputeDEDXAhlen(material, bg2lim, cutEnergy);
 
-      // extrapolation between two formula 
+      // extrapolation between two formula
       G4double kapa2 = beta - betalow;
       G4double kapa1 = betalim - beta;
-      dedx = (kapa1*dedx1 + kapa2*dedx2)/(kapa1 + kapa2);
+      dedx = (kapa1 * dedx1 + kapa2 * dedx2) / (kapa1 + kapa2);
     }
   }
   return dedx;
@@ -165,33 +160,32 @@ CMSmplIonisationWithDeltaModel::ComputeDEDXPerVolume(const G4Material* material,
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-G4double 
-CMSmplIonisationWithDeltaModel::ComputeDEDXAhlen(const G4Material* material, 
-                                                 G4double bg2, 
-                                                 G4double cutEnergy)
-{
+G4double CMSmplIonisationWithDeltaModel::ComputeDEDXAhlen(const G4Material* material,
+                                                          G4double bg2,
+                                                          G4double cutEnergy) {
   G4double eDensity = material->GetElectronDensity();
-  G4double eexc  = material->GetIonisation()->GetMeanExcitationEnergy();
+  G4double eexc = material->GetIonisation()->GetMeanExcitationEnergy();
 
   // Ahlen's formula for nonconductors, [1]p157, f(5.7)
-  G4double dedx = 
-    0.5*(G4Log(2.0*electron_mass_c2*bg2*cutEnergy/(eexc*eexc)) -1.0);
+  G4double dedx = 0.5 * (G4Log(2.0 * electron_mass_c2 * bg2 * cutEnergy / (eexc * eexc)) - 1.0);
 
   // Kazama et al. cross-section correction
-  G4double  k = 0.406;
-  if(nmpl > 1) { k = 0.346; }
+  G4double k = 0.406;
+  if (nmpl > 1) {
+    k = 0.346;
+  }
 
   // Bloch correction
-  const G4double B[7] = { 0.0, 0.248, 0.672, 1.022, 1.243, 1.464, 1.685}; 
+  const G4double B[7] = {0.0, 0.248, 0.672, 1.022, 1.243, 1.464, 1.685};
 
   dedx += 0.5 * k - B[nmpl];
 
   // density effect correction
-  G4double x = G4Log(bg2)/twoln10;
+  G4double x = G4Log(bg2) / twoln10;
   dedx -= material->GetIonisation()->DensityCorrection(x);
 
   // now compute the total ionization loss
-  dedx *=  pi_hbarc2_over_mc2 * eDensity * nmpl * nmpl;
+  dedx *= pi_hbarc2_over_mc2 * eDensity * nmpl * nmpl;
 
   dedx = std::max(dedx, 0.0);
   return dedx;
@@ -199,91 +193,83 @@ CMSmplIonisationWithDeltaModel::ComputeDEDXAhlen(const G4Material* material,
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4double
-CMSmplIonisationWithDeltaModel::ComputeCrossSectionPerElectron(
-                                           const G4ParticleDefinition* p,
-                                           G4double kineticEnergy,
-                                           G4double cut,
-                                           G4double maxKinEnergy)
-{
-  if(!monopole) { SetParticle(p); }
+G4double CMSmplIonisationWithDeltaModel::ComputeCrossSectionPerElectron(const G4ParticleDefinition* p,
+                                                                        G4double kineticEnergy,
+                                                                        G4double cut,
+                                                                        G4double maxKinEnergy) {
+  if (!monopole) {
+    SetParticle(p);
+  }
   G4double tmax = MaxSecondaryEnergy(p, kineticEnergy);
   G4double maxEnergy = std::min(tmax, maxKinEnergy);
   G4double cutEnergy = std::max(LowEnergyLimit(), cut);
-  G4double cross = (cutEnergy < maxEnergy) 
-    ? (0.5/cutEnergy - 0.5/maxEnergy)*pi_hbarc2_over_mc2 * nmpl * nmpl : 0.0;
+  G4double cross =
+      (cutEnergy < maxEnergy) ? (0.5 / cutEnergy - 0.5 / maxEnergy) * pi_hbarc2_over_mc2 * nmpl * nmpl : 0.0;
   return cross;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4double 
-CMSmplIonisationWithDeltaModel::ComputeCrossSectionPerAtom(
-                                          const G4ParticleDefinition* p,
-                                          G4double kineticEnergy,
-                                          G4double Z, G4double,
-                                          G4double cutEnergy,
-                                          G4double maxEnergy)
-{
-  G4double cross = 
-    Z*ComputeCrossSectionPerElectron(p,kineticEnergy,cutEnergy,maxEnergy);
+G4double CMSmplIonisationWithDeltaModel::ComputeCrossSectionPerAtom(const G4ParticleDefinition* p,
+                                                                    G4double kineticEnergy,
+                                                                    G4double Z,
+                                                                    G4double,
+                                                                    G4double cutEnergy,
+                                                                    G4double maxEnergy) {
+  G4double cross = Z * ComputeCrossSectionPerElectron(p, kineticEnergy, cutEnergy, maxEnergy);
   return cross;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-void 
-CMSmplIonisationWithDeltaModel::SampleSecondaries(vector<G4DynamicParticle*>* vdp,
-                                                  const G4MaterialCutsCouple*,
-                                                  const G4DynamicParticle* dp,
-                                                  G4double minKinEnergy,
-                                                  G4double maxEnergy)
-{
+void CMSmplIonisationWithDeltaModel::SampleSecondaries(vector<G4DynamicParticle*>* vdp,
+                                                       const G4MaterialCutsCouple*,
+                                                       const G4DynamicParticle* dp,
+                                                       G4double minKinEnergy,
+                                                       G4double maxEnergy) {
   G4double kineticEnergy = dp->GetKineticEnergy();
-  G4double tmax = MaxSecondaryEnergy(dp->GetDefinition(),kineticEnergy);
+  G4double tmax = MaxSecondaryEnergy(dp->GetDefinition(), kineticEnergy);
 
-  G4double maxKinEnergy = std::min(maxEnergy,tmax);
-  if(minKinEnergy >= maxKinEnergy) { return; }
+  G4double maxKinEnergy = std::min(maxEnergy, tmax);
+  if (minKinEnergy >= maxKinEnergy) {
+    return;
+  }
 
   //G4cout << "CMSmplIonisationWithDeltaModel::SampleSecondaries: E(GeV)= "
   //         << kineticEnergy/GeV << " M(GeV)= " << mass/GeV
   //         << " tmin(MeV)= " << minKinEnergy/MeV << G4endl;
 
-  G4double totEnergy     = kineticEnergy + mass;
-  G4double etot2         = totEnergy*totEnergy;
-  G4double beta2         = kineticEnergy*(kineticEnergy + 2.0*mass)/etot2;
-  
+  G4double totEnergy = kineticEnergy + mass;
+  G4double etot2 = totEnergy * totEnergy;
+  G4double beta2 = kineticEnergy * (kineticEnergy + 2.0 * mass) / etot2;
+
   // sampling without nuclear size effect
   G4double q = G4UniformRand();
-  G4double deltaKinEnergy = minKinEnergy*maxKinEnergy
-    /(minKinEnergy*(1.0 - q) + maxKinEnergy*q);
+  G4double deltaKinEnergy = minKinEnergy * maxKinEnergy / (minKinEnergy * (1.0 - q) + maxKinEnergy * q);
 
   // delta-electron is produced
-  G4double totMomentum = totEnergy*sqrt(beta2);
-  G4double deltaMomentum =
-           sqrt(deltaKinEnergy * (deltaKinEnergy + 2.0*electron_mass_c2));
-  G4double cost = deltaKinEnergy * (totEnergy + electron_mass_c2) /
-                                   (deltaMomentum * totMomentum);
+  G4double totMomentum = totEnergy * sqrt(beta2);
+  G4double deltaMomentum = sqrt(deltaKinEnergy * (deltaKinEnergy + 2.0 * electron_mass_c2));
+  G4double cost = deltaKinEnergy * (totEnergy + electron_mass_c2) / (deltaMomentum * totMomentum);
   cost = std::min(cost, 1.0);
 
-  G4double sint = sqrt((1.0 - cost)*(1.0 + cost));
+  G4double sint = sqrt((1.0 - cost) * (1.0 + cost));
 
-  G4double phi = twopi * G4UniformRand() ;
+  G4double phi = twopi * G4UniformRand();
 
-  G4ThreeVector deltaDirection(sint*cos(phi),sint*sin(phi), cost);
+  G4ThreeVector deltaDirection(sint * cos(phi), sint * sin(phi), cost);
   const G4ThreeVector& direction = dp->GetMomentumDirection();
   deltaDirection.rotateUz(direction);
 
   // create G4DynamicParticle object for delta ray
-  G4DynamicParticle* delta = 
-    new G4DynamicParticle(theElectron,deltaDirection,deltaKinEnergy);
+  G4DynamicParticle* delta = new G4DynamicParticle(theElectron, deltaDirection, deltaKinEnergy);
 
   vdp->push_back(delta);
 
   // Change kinematics of primary particle
-  kineticEnergy       -= deltaKinEnergy;
-  G4ThreeVector finalP = direction*totMomentum - deltaDirection*deltaMomentum;
-  finalP               = finalP.unit();
+  kineticEnergy -= deltaKinEnergy;
+  G4ThreeVector finalP = direction * totMomentum - deltaDirection * deltaMomentum;
+  finalP = finalP.unit();
 
   fParticleChange->SetProposedKineticEnergy(kineticEnergy);
   fParticleChange->SetProposedMomentumDirection(finalP);
@@ -291,28 +277,26 @@ CMSmplIonisationWithDeltaModel::SampleSecondaries(vector<G4DynamicParticle*>* vd
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-G4double CMSmplIonisationWithDeltaModel::SampleFluctuations(
-                                       const G4MaterialCutsCouple* couple,
-                                       const G4DynamicParticle* dp,
-                                       G4double tmax,
-                                       G4double length,
-                                       G4double meanLoss)
-{
-  G4double siga = Dispersion(couple->GetMaterial(),dp,tmax,length);
+G4double CMSmplIonisationWithDeltaModel::SampleFluctuations(const G4MaterialCutsCouple* couple,
+                                                            const G4DynamicParticle* dp,
+                                                            G4double tmax,
+                                                            G4double length,
+                                                            G4double meanLoss) {
+  G4double siga = Dispersion(couple->GetMaterial(), dp, tmax, length);
   G4double loss = meanLoss;
   siga = sqrt(siga);
   G4double twomeanLoss = meanLoss + meanLoss;
 
-  if(twomeanLoss < siga) {
+  if (twomeanLoss < siga) {
     G4double x;
     do {
-      loss = twomeanLoss*G4UniformRand();
-      x = (loss - meanLoss)/siga;
+      loss = twomeanLoss * G4UniformRand();
+      x = (loss - meanLoss) / siga;
       // Loop checking, 07-Aug-2015, Vladimir Ivanchenko
-    } while (1.0 - 0.5*x*x < G4UniformRand());
+    } while (1.0 - 0.5 * x * x < G4UniformRand());
   } else {
     do {
-      loss = G4RandGauss::shoot(meanLoss,siga);
+      loss = G4RandGauss::shoot(meanLoss, siga);
       // Loop checking, 07-Aug-2015, Vladimir Ivanchenko
     } while (0.0 > loss || loss > twomeanLoss);
   }
@@ -321,32 +305,26 @@ G4double CMSmplIonisationWithDeltaModel::SampleFluctuations(
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-G4double 
-CMSmplIonisationWithDeltaModel::Dispersion(const G4Material* material,
-                                           const G4DynamicParticle* dp,
-                                           G4double tmax,
-                                           G4double length)
-{
+G4double CMSmplIonisationWithDeltaModel::Dispersion(const G4Material* material,
+                                                    const G4DynamicParticle* dp,
+                                                    G4double tmax,
+                                                    G4double length) {
   G4double siga = 0.0;
-  G4double tau   = dp->GetKineticEnergy()/mass;
-  if(tau > 0.0) { 
+  G4double tau = dp->GetKineticEnergy() / mass;
+  if (tau > 0.0) {
     G4double electronDensity = material->GetElectronDensity();
-    G4double gam   = tau + 1.0;
-    G4double invbeta2 = (gam*gam)/(tau * (tau+2.0));
-    siga  = (invbeta2 - 0.5) * twopi_mc2_rcl2 * tmax * length
-      * electronDensity * chargeSquare;
+    G4double gam = tau + 1.0;
+    G4double invbeta2 = (gam * gam) / (tau * (tau + 2.0));
+    siga = (invbeta2 - 0.5) * twopi_mc2_rcl2 * tmax * length * electronDensity * chargeSquare;
   }
   return siga;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
-G4double 
-CMSmplIonisationWithDeltaModel::MaxSecondaryEnergy(const G4ParticleDefinition*,
-                                                   G4double kinEnergy)
-{
-  G4double tau = kinEnergy/mass;
-  return 2.0*electron_mass_c2*tau*(tau + 2.);
+G4double CMSmplIonisationWithDeltaModel::MaxSecondaryEnergy(const G4ParticleDefinition*, G4double kinEnergy) {
+  G4double tau = kinEnergy / mass;
+  return 2.0 * electron_mass_c2 * tau * (tau + 2.);
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
diff --git a/SimG4Core/PhysicsLists/src/DummyEMPhysics.cc b/SimG4Core/PhysicsLists/src/DummyEMPhysics.cc
index bccdead0b3554..d3b407c4e5a2f 100644
--- a/SimG4Core/PhysicsLists/src/DummyEMPhysics.cc
+++ b/SimG4Core/PhysicsLists/src/DummyEMPhysics.cc
@@ -23,13 +23,12 @@
 
 #include "G4SystemOfUnits.hh"
 
-DummyEMPhysics::DummyEMPhysics(G4int ver) :
-  G4VPhysicsConstructor("CMSEmGeantV"), verbose(ver) {
+DummyEMPhysics::DummyEMPhysics(G4int ver) : G4VPhysicsConstructor("CMSEmGeantV"), verbose(ver) {
   G4EmParameters* param = G4EmParameters::Instance();
   param->SetDefaults();
   param->SetVerbose(verbose);
   param->SetApplyCuts(true);
-  param->SetStepFunction(0.8, 1*CLHEP::mm);
+  param->SetStepFunction(0.8, 1 * CLHEP::mm);
   param->SetLossFluctuations(false);
   param->SetMscRangeFactor(0.2);
   param->SetMscStepLimitType(fMinimal);
@@ -49,8 +48,7 @@ void DummyEMPhysics::ConstructParticle() {
 }
 
 void DummyEMPhysics::ConstructProcess() {
-
-  if(verbose > 0) {
+  if (verbose > 0) {
     G4cout << "### " << GetPhysicsName() << " Construct Processes " << G4endl;
   }
 
diff --git a/SimG4Core/PhysicsLists/src/EmParticleList.cc b/SimG4Core/PhysicsLists/src/EmParticleList.cc
index 6a5fd68967546..668418f86a55f 100644
--- a/SimG4Core/PhysicsLists/src/EmParticleList.cc
+++ b/SimG4Core/PhysicsLists/src/EmParticleList.cc
@@ -1,26 +1,52 @@
 #include "SimG4Core/PhysicsLists/interface/EmParticleList.h"
 
-EmParticleList::EmParticleList() 
-{
-  pNames = 
-    { 
-        "gamma",            "e-",           "e+",           "mu+",        "mu-",
-          "pi+",           "pi-",        "kaon+",         "kaon-",     "proton",
-  "anti_proton",         "alpha",          "He3",    "GenericIon",         "B+",
-           "B-",            "D+",           "D-",           "Ds+",        "Ds-",
-     "anti_He3",    "anti_alpha","anti_deuteron","anti_lambda_c+","anti_omega-",
-"anti_sigma_c+","anti_sigma_c++",  "anti_sigma+",   "anti_sigma-","anti_triton",
-   "anti_xi_c+",      "anti_xi-",     "deuteron",     "lambda_c+",     "omega-",
-     "sigma_c+",     "sigma_c++",       "sigma+",        "sigma-",       "tau+",
-         "tau-",        "triton",        "xi_c+",           "xi-"
-    };
+EmParticleList::EmParticleList() {
+  pNames = {"gamma",
+            "e-",
+            "e+",
+            "mu+",
+            "mu-",
+            "pi+",
+            "pi-",
+            "kaon+",
+            "kaon-",
+            "proton",
+            "anti_proton",
+            "alpha",
+            "He3",
+            "GenericIon",
+            "B+",
+            "B-",
+            "D+",
+            "D-",
+            "Ds+",
+            "Ds-",
+            "anti_He3",
+            "anti_alpha",
+            "anti_deuteron",
+            "anti_lambda_c+",
+            "anti_omega-",
+            "anti_sigma_c+",
+            "anti_sigma_c++",
+            "anti_sigma+",
+            "anti_sigma-",
+            "anti_triton",
+            "anti_xi_c+",
+            "anti_xi-",
+            "deuteron",
+            "lambda_c+",
+            "omega-",
+            "sigma_c+",
+            "sigma_c++",
+            "sigma+",
+            "sigma-",
+            "tau+",
+            "tau-",
+            "triton",
+            "xi_c+",
+            "xi-"};
 }
 
-EmParticleList::~EmParticleList() 
-{}
-
-const std::vector<G4String>& EmParticleList::PartNames() const
-{
-  return pNames;
-}
+EmParticleList::~EmParticleList() {}
 
+const std::vector<G4String>& EmParticleList::PartNames() const { return pNames; }
diff --git a/SimG4Core/PhysicsLists/src/HadronPhysicsCMS.cc b/SimG4Core/PhysicsLists/src/HadronPhysicsCMS.cc
index 780296860e479..56f71b72b1cee 100644
--- a/SimG4Core/PhysicsLists/src/HadronPhysicsCMS.cc
+++ b/SimG4Core/PhysicsLists/src/HadronPhysicsCMS.cc
@@ -2,7 +2,7 @@
 
 #include "globals.hh"
 #include "G4ios.hh"
-#include <iomanip>   
+#include <iomanip>
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 
@@ -11,100 +11,121 @@
 #include "G4ShortLivedConstructor.hh"
 #include "G4SystemOfUnits.hh"
 
-HadronPhysicsCMS::HadronPhysicsCMS(const G4String& name, G4bool quasiElastic) :
-  G4VPhysicsConstructor("hadron"), theNeutrons(nullptr), theBertiniNeutron(nullptr),
-  theBinaryNeutron(nullptr), theFTFPNeutron(nullptr), 
-  theQGSPNeutron(nullptr), thePiK(nullptr), theBertiniPiK(nullptr),
-  theBinaryPiK(nullptr), theFTFPPiK(nullptr), 
-  theQGSPPiK(nullptr), thePro(nullptr),theBertiniPro(nullptr),
-  theBinaryPro(nullptr), theFTFPPro(nullptr), 
-  theQGSPPro(nullptr),
-  theFTFNeutron(nullptr), theFTFPiK(nullptr), theFTFPro(nullptr), 
-  modelName(name), 
-  QuasiElastic(quasiElastic) 
-{}
+HadronPhysicsCMS::HadronPhysicsCMS(const G4String& name, G4bool quasiElastic)
+    : G4VPhysicsConstructor("hadron"),
+      theNeutrons(nullptr),
+      theBertiniNeutron(nullptr),
+      theBinaryNeutron(nullptr),
+      theFTFPNeutron(nullptr),
+      theQGSPNeutron(nullptr),
+      thePiK(nullptr),
+      theBertiniPiK(nullptr),
+      theBinaryPiK(nullptr),
+      theFTFPPiK(nullptr),
+      theQGSPPiK(nullptr),
+      thePro(nullptr),
+      theBertiniPro(nullptr),
+      theBinaryPro(nullptr),
+      theFTFPPro(nullptr),
+      theQGSPPro(nullptr),
+      theFTFNeutron(nullptr),
+      theFTFPiK(nullptr),
+      theFTFPro(nullptr),
+      modelName(name),
+      QuasiElastic(quasiElastic) {}
 
 void HadronPhysicsCMS::CreateModels() {
-
   theNeutrons = new G4NeutronBuilder;
-  thePro      = new G4ProtonBuilder;
-  thePiK      = new G4PiKBuilder;
+  thePro = new G4ProtonBuilder;
+  thePiK = new G4PiKBuilder;
 
   if (modelName == "Bertini") {
     theBertiniNeutron = new G4BertiniNeutronBuilder();
-    theBertiniNeutron->SetMaxEnergy(30.0*GeV);
+    theBertiniNeutron->SetMaxEnergy(30.0 * GeV);
     theNeutrons->RegisterMe(theBertiniNeutron);
-    theBertiniPro     = new G4BertiniProtonBuilder();
-    theBertiniPro->SetMaxEnergy(30.0*GeV);
+    theBertiniPro = new G4BertiniProtonBuilder();
+    theBertiniPro->SetMaxEnergy(30.0 * GeV);
     thePro->RegisterMe(theBertiniPro);
-    theBertiniPiK     = new G4BertiniPiKBuilder();
-    theBertiniPiK->SetMaxEnergy(30.0*GeV);
+    theBertiniPiK = new G4BertiniPiKBuilder();
+    theBertiniPiK->SetMaxEnergy(30.0 * GeV);
     thePiK->RegisterMe(theBertiniPiK);
   } else if (modelName == "Binary") {
     theBinaryNeutron = new G4BinaryNeutronBuilder();
-    theBinaryNeutron->SetMaxEnergy(30.0*GeV);
+    theBinaryNeutron->SetMaxEnergy(30.0 * GeV);
     theNeutrons->RegisterMe(theBinaryNeutron);
-    theBinaryPro     = new G4BinaryProtonBuilder();
-    theBinaryPro->SetMaxEnergy(30.0*GeV);
+    theBinaryPro = new G4BinaryProtonBuilder();
+    theBinaryPro->SetMaxEnergy(30.0 * GeV);
     thePro->RegisterMe(theBinaryPro);
-    theBinaryPiK     = new G4BinaryPiKBuilder(); 
-    theBinaryPiK->SetMaxEnergy(30.0*GeV);
+    theBinaryPiK = new G4BinaryPiKBuilder();
+    theBinaryPiK->SetMaxEnergy(30.0 * GeV);
     thePiK->RegisterMe(theBinaryPiK);
   } else if (modelName == "FTFP") {
     theFTFPNeutron = new G4FTFPNeutronBuilder();
-    theFTFPNeutron->SetMinEnergy(0.1*GeV);
+    theFTFPNeutron->SetMinEnergy(0.1 * GeV);
     theNeutrons->RegisterMe(theFTFPNeutron);
-    theFTFPPro     = new G4FTFPProtonBuilder();
-    theFTFPPro->SetMinEnergy(0.1*GeV);
+    theFTFPPro = new G4FTFPProtonBuilder();
+    theFTFPPro->SetMinEnergy(0.1 * GeV);
     thePro->RegisterMe(theFTFPPro);
-    theFTFPPiK     = new G4FTFPPiKBuilder();
-    theFTFPPiK->SetMinEnergy(0.1*GeV);
+    theFTFPPiK = new G4FTFPPiKBuilder();
+    theFTFPPiK->SetMinEnergy(0.1 * GeV);
     thePiK->RegisterMe(theFTFPPiK);
   } else if (modelName == "FTF") {
-    theFTFNeutron  = new G4FTFBinaryNeutronBuilder();
+    theFTFNeutron = new G4FTFBinaryNeutronBuilder();
     theNeutrons->RegisterMe(theFTFNeutron);
-    theFTFPro      = new G4FTFBinaryProtonBuilder();
+    theFTFPro = new G4FTFBinaryProtonBuilder();
     thePro->RegisterMe(theFTFPro);
-    theFTFPiK      = new G4FTFBinaryPiKBuilder();
+    theFTFPiK = new G4FTFBinaryPiKBuilder();
     thePiK->RegisterMe(theFTFPiK);
   } else {
     theQGSPNeutron = new G4QGSPNeutronBuilder(QuasiElastic);
-    theQGSPNeutron->SetMinEnergy(0.1*GeV);
+    theQGSPNeutron->SetMinEnergy(0.1 * GeV);
     theNeutrons->RegisterMe(theQGSPNeutron);
-    theQGSPPro     = new G4QGSPProtonBuilder(QuasiElastic);
-    theQGSPPro->SetMinEnergy(0.1*GeV);
+    theQGSPPro = new G4QGSPProtonBuilder(QuasiElastic);
+    theQGSPPro->SetMinEnergy(0.1 * GeV);
     thePro->RegisterMe(theQGSPPro);
-    theQGSPPiK     = new G4QGSPPiKBuilder(QuasiElastic);
-    theQGSPPiK->SetMinEnergy(0.1*GeV);
+    theQGSPPiK = new G4QGSPPiKBuilder(QuasiElastic);
+    theQGSPPiK->SetMinEnergy(0.1 * GeV);
     thePiK->RegisterMe(theQGSPPiK);
   }
-  
 }
 
 HadronPhysicsCMS::~HadronPhysicsCMS() {
-  if (theBertiniNeutron)   delete theBertiniNeutron;
-  if (theBinaryNeutron)    delete theBinaryNeutron;
-  if (theFTFPNeutron)      delete theFTFPNeutron;
-  if (theQGSPNeutron)      delete theQGSPNeutron;
-  if (theFTFNeutron)       delete theFTFNeutron;
+  if (theBertiniNeutron)
+    delete theBertiniNeutron;
+  if (theBinaryNeutron)
+    delete theBinaryNeutron;
+  if (theFTFPNeutron)
+    delete theFTFPNeutron;
+  if (theQGSPNeutron)
+    delete theQGSPNeutron;
+  if (theFTFNeutron)
+    delete theFTFNeutron;
   delete theNeutrons;
-  if (theBertiniPro)       delete theBertiniPro;
-  if (theBinaryPro)        delete theBinaryPro;
-  if (theFTFPPro)          delete theFTFPPro;
-  if (theQGSPPro)          delete theQGSPPro; 
-  if (theFTFPro)           delete theFTFPro;
+  if (theBertiniPro)
+    delete theBertiniPro;
+  if (theBinaryPro)
+    delete theBinaryPro;
+  if (theFTFPPro)
+    delete theFTFPPro;
+  if (theQGSPPro)
+    delete theQGSPPro;
+  if (theFTFPro)
+    delete theFTFPro;
   delete thePro;
-  if (theBertiniPiK)       delete theBertiniPiK;
-  if (theBinaryPiK)        delete theBinaryPiK;
-  if (theFTFPPiK)          delete theFTFPPiK;
-  if (theQGSPPiK)          delete theQGSPPiK;
-  if (theFTFPiK)           delete theFTFPiK;
+  if (theBertiniPiK)
+    delete theBertiniPiK;
+  if (theBinaryPiK)
+    delete theBinaryPiK;
+  if (theFTFPPiK)
+    delete theFTFPPiK;
+  if (theQGSPPiK)
+    delete theQGSPPiK;
+  if (theFTFPiK)
+    delete theFTFPiK;
   delete thePiK;
 }
 
-
 void HadronPhysicsCMS::ConstructParticle() {
-
   G4MesonConstructor pMesonConstructor;
   pMesonConstructor.ConstructParticle();
 
@@ -112,16 +133,14 @@ void HadronPhysicsCMS::ConstructParticle() {
   pBaryonConstructor.ConstructParticle();
 
   G4ShortLivedConstructor pShortLivedConstructor;
-  pShortLivedConstructor.ConstructParticle();  
+  pShortLivedConstructor.ConstructParticle();
 }
 
 #include "G4ProcessManager.hh"
 void HadronPhysicsCMS::ConstructProcess() {
-
   CreateModels();
   theNeutrons->Build();
   thePro->Build();
   thePiK->Build();
   //  theMiscLHEP->Build();
 }
-
diff --git a/SimG4Core/PhysicsLists/src/HadronPhysicsQGSPCMS_FTFP_BERT.cc b/SimG4Core/PhysicsLists/src/HadronPhysicsQGSPCMS_FTFP_BERT.cc
index 70973f00febaa..7f92f2db6c2fc 100644
--- a/SimG4Core/PhysicsLists/src/HadronPhysicsQGSPCMS_FTFP_BERT.cc
+++ b/SimG4Core/PhysicsLists/src/HadronPhysicsQGSPCMS_FTFP_BERT.cc
@@ -2,7 +2,7 @@
 
 #include "globals.hh"
 #include "G4ios.hh"
-#include <iomanip>   
+#include <iomanip>
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
 
@@ -19,108 +19,94 @@
 #include "G4PhysListUtil.hh"
 #include "G4SystemOfUnits.hh"
 
-G4ThreadLocal HadronPhysicsQGSPCMS_FTFP_BERT::ThreadPrivate* 
-HadronPhysicsQGSPCMS_FTFP_BERT::tpdata = nullptr;
+G4ThreadLocal HadronPhysicsQGSPCMS_FTFP_BERT::ThreadPrivate* HadronPhysicsQGSPCMS_FTFP_BERT::tpdata = nullptr;
 
 HadronPhysicsQGSPCMS_FTFP_BERT::HadronPhysicsQGSPCMS_FTFP_BERT(G4int)
-  :  G4VPhysicsConstructor("hInelasticQGSPCMS_FTFP_BERT")
-{}
+    : G4VPhysicsConstructor("hInelasticQGSPCMS_FTFP_BERT") {}
 
-void HadronPhysicsQGSPCMS_FTFP_BERT::CreateModels()
-{
+void HadronPhysicsQGSPCMS_FTFP_BERT::CreateModels() {
   // First transition, between BERT and FTF/P
-  G4double minFTFP= 6.0 * GeV;  
-  G4double maxBERT= 8.0 * GeV;  
+  G4double minFTFP = 6.0 * GeV;
+  G4double maxBERT = 8.0 * GeV;
   // Second transition, between FTF/P and QGS/P
-  G4double minQGSP= 12.0 * GeV;
-  G4double maxFTFP= 25.0 * GeV; 
+  G4double minQGSP = 12.0 * GeV;
+  G4double maxFTFP = 25.0 * GeV;
 
-  G4bool   quasiElasFTF= false;   // Use built-in quasi-elastic (not add-on)
-  G4bool   quasiElasQGS= true;    // For QGS, it must use it.
+  G4bool quasiElasFTF = false;  // Use built-in quasi-elastic (not add-on)
+  G4bool quasiElasQGS = true;   // For QGS, it must use it.
 
   G4cout << " New QGSPCMS_FTFP_BERT hadronic inealstic physics" << G4endl;
   G4cout << "   Thresholds: " << G4endl;
-  G4cout << "     1) between BERT  and FTFP over the interval " 
-	 << minFTFP/GeV << " to " << maxBERT/GeV << " GeV. " << G4endl;
-  G4cout << "     2) between FTFP and QGSP over the interval " 
-	 << minQGSP/GeV << " to " << maxFTFP/GeV << " GeV. " << G4endl;
+  G4cout << "     1) between BERT  and FTFP over the interval " << minFTFP / GeV << " to " << maxBERT / GeV << " GeV. "
+         << G4endl;
+  G4cout << "     2) between FTFP and QGSP over the interval " << minQGSP / GeV << " to " << maxFTFP / GeV << " GeV. "
+         << G4endl;
   G4cout << "   QuasiElastic: " << quasiElasQGS << " for QGS "
-	 << " and " << quasiElasFTF << " for FTF " << G4endl;
-
-  tpdata->theNeutrons=new G4NeutronBuilder;
-  tpdata->theNeutrons->RegisterMe(
-    tpdata->theQGSPNeutron=new G4QGSPNeutronBuilder(quasiElasQGS));
-  tpdata->theQGSPNeutron->SetMinEnergy(minQGSP);   
-  tpdata->theNeutrons->RegisterMe(
-    tpdata->theFTFPNeutron=new G4FTFPNeutronBuilder(quasiElasFTF));
-  tpdata->theFTFPNeutron->SetMinEnergy(minFTFP);   
-  tpdata->theFTFPNeutron->SetMaxEnergy(maxFTFP);   
-
-  tpdata->theNeutrons->RegisterMe(
-    tpdata->theBertiniNeutron=new G4BertiniNeutronBuilder);
-  tpdata->theBertiniNeutron->SetMinEnergy(0.0*GeV);
-  tpdata->theBertiniNeutron->SetMaxEnergy(maxBERT);  
-
-  tpdata->thePro=new G4ProtonBuilder;
-  tpdata->thePro->RegisterMe(
-    tpdata->theQGSPPro=new G4QGSPProtonBuilder(quasiElasQGS));
-  tpdata->theQGSPPro->SetMinEnergy(minQGSP);   
-  tpdata->thePro->RegisterMe(
-    tpdata->theFTFPPro=new G4FTFPProtonBuilder(quasiElasFTF));
-  tpdata->theFTFPPro->SetMinEnergy(minFTFP);   
-  tpdata->theFTFPPro->SetMaxEnergy(maxFTFP);   
-  tpdata->thePro->RegisterMe(
-    tpdata->theBertiniPro=new G4BertiniProtonBuilder);
-  tpdata->theBertiniPro->SetMaxEnergy(maxBERT); 
-  
-  tpdata->thePiK=new G4PiKBuilder;
-  tpdata->thePiK->RegisterMe(
-    tpdata->theQGSPPiK=new G4QGSPPiKBuilder(quasiElasQGS));
-  tpdata->theQGSPPiK->SetMinEnergy(minQGSP);   
-  tpdata->thePiK->RegisterMe(
-    tpdata->theFTFPPiK=new G4FTFPPiKBuilder(quasiElasFTF));
-  tpdata->theFTFPPiK->SetMaxEnergy(maxFTFP);  
-  tpdata->theFTFPPiK->SetMinEnergy(minFTFP); 
-  tpdata->thePiK->RegisterMe(tpdata->theBertiniPiK=new G4BertiniPiKBuilder);
-  tpdata->theBertiniPiK->SetMaxEnergy(maxBERT); 
-  
+         << " and " << quasiElasFTF << " for FTF " << G4endl;
+
+  tpdata->theNeutrons = new G4NeutronBuilder;
+  tpdata->theNeutrons->RegisterMe(tpdata->theQGSPNeutron = new G4QGSPNeutronBuilder(quasiElasQGS));
+  tpdata->theQGSPNeutron->SetMinEnergy(minQGSP);
+  tpdata->theNeutrons->RegisterMe(tpdata->theFTFPNeutron = new G4FTFPNeutronBuilder(quasiElasFTF));
+  tpdata->theFTFPNeutron->SetMinEnergy(minFTFP);
+  tpdata->theFTFPNeutron->SetMaxEnergy(maxFTFP);
+
+  tpdata->theNeutrons->RegisterMe(tpdata->theBertiniNeutron = new G4BertiniNeutronBuilder);
+  tpdata->theBertiniNeutron->SetMinEnergy(0.0 * GeV);
+  tpdata->theBertiniNeutron->SetMaxEnergy(maxBERT);
+
+  tpdata->thePro = new G4ProtonBuilder;
+  tpdata->thePro->RegisterMe(tpdata->theQGSPPro = new G4QGSPProtonBuilder(quasiElasQGS));
+  tpdata->theQGSPPro->SetMinEnergy(minQGSP);
+  tpdata->thePro->RegisterMe(tpdata->theFTFPPro = new G4FTFPProtonBuilder(quasiElasFTF));
+  tpdata->theFTFPPro->SetMinEnergy(minFTFP);
+  tpdata->theFTFPPro->SetMaxEnergy(maxFTFP);
+  tpdata->thePro->RegisterMe(tpdata->theBertiniPro = new G4BertiniProtonBuilder);
+  tpdata->theBertiniPro->SetMaxEnergy(maxBERT);
+
+  tpdata->thePiK = new G4PiKBuilder;
+  tpdata->thePiK->RegisterMe(tpdata->theQGSPPiK = new G4QGSPPiKBuilder(quasiElasQGS));
+  tpdata->theQGSPPiK->SetMinEnergy(minQGSP);
+  tpdata->thePiK->RegisterMe(tpdata->theFTFPPiK = new G4FTFPPiKBuilder(quasiElasFTF));
+  tpdata->theFTFPPiK->SetMaxEnergy(maxFTFP);
+  tpdata->theFTFPPiK->SetMinEnergy(minFTFP);
+  tpdata->thePiK->RegisterMe(tpdata->theBertiniPiK = new G4BertiniPiKBuilder);
+  tpdata->theBertiniPiK->SetMaxEnergy(maxBERT);
+
   // Hyperons use FTF
-  tpdata->theHyperon=new G4HyperonFTFPBuilder;
+  tpdata->theHyperon = new G4HyperonFTFPBuilder;
 
-  tpdata->theAntiBaryon=new G4AntiBarionBuilder;
-  tpdata->theAntiBaryon->RegisterMe(
-    tpdata->theFTFPAntiBaryon=new G4FTFPAntiBarionBuilder(quasiElasFTF));
+  tpdata->theAntiBaryon = new G4AntiBarionBuilder;
+  tpdata->theAntiBaryon->RegisterMe(tpdata->theFTFPAntiBaryon = new G4FTFPAntiBarionBuilder(quasiElasFTF));
 }
 
-HadronPhysicsQGSPCMS_FTFP_BERT::~HadronPhysicsQGSPCMS_FTFP_BERT()
-{
-  if(nullptr != tpdata) {
-   delete tpdata->theQGSPNeutron;
-   delete tpdata->theFTFPNeutron;
-   delete tpdata->theBertiniNeutron;
-   delete tpdata->theNeutrons;
-
-   delete tpdata->theQGSPPro;
-   delete tpdata->theFTFPPro;
-   delete tpdata->thePro;
-   delete tpdata->theBertiniPro;
-
-   delete tpdata->theQGSPPiK;
-   delete tpdata->theFTFPPiK;
-   delete tpdata->theBertiniPiK;
-   delete tpdata->thePiK;
-
-   delete tpdata->theHyperon;
-   delete tpdata->theAntiBaryon;
-   delete tpdata->theFTFPAntiBaryon;
-   
-   delete tpdata;
-   tpdata = nullptr;
+HadronPhysicsQGSPCMS_FTFP_BERT::~HadronPhysicsQGSPCMS_FTFP_BERT() {
+  if (nullptr != tpdata) {
+    delete tpdata->theQGSPNeutron;
+    delete tpdata->theFTFPNeutron;
+    delete tpdata->theBertiniNeutron;
+    delete tpdata->theNeutrons;
+
+    delete tpdata->theQGSPPro;
+    delete tpdata->theFTFPPro;
+    delete tpdata->thePro;
+    delete tpdata->theBertiniPro;
+
+    delete tpdata->theQGSPPiK;
+    delete tpdata->theFTFPPiK;
+    delete tpdata->theBertiniPiK;
+    delete tpdata->thePiK;
+
+    delete tpdata->theHyperon;
+    delete tpdata->theAntiBaryon;
+    delete tpdata->theFTFPAntiBaryon;
+
+    delete tpdata;
+    tpdata = nullptr;
   }
 }
 
-void HadronPhysicsQGSPCMS_FTFP_BERT::ConstructParticle()
-{
+void HadronPhysicsQGSPCMS_FTFP_BERT::ConstructParticle() {
   G4MesonConstructor pMesonConstructor;
   pMesonConstructor.ConstructParticle();
 
@@ -128,40 +114,39 @@ void HadronPhysicsQGSPCMS_FTFP_BERT::ConstructParticle()
   pBaryonConstructor.ConstructParticle();
 
   G4ShortLivedConstructor pShortLivedConstructor;
-  pShortLivedConstructor.ConstructParticle();  
+  pShortLivedConstructor.ConstructParticle();
 
   G4IonConstructor pIonConstructor;
   pIonConstructor.ConstructParticle();
 }
 
 #include "G4ProcessManager.hh"
-void HadronPhysicsQGSPCMS_FTFP_BERT::ConstructProcess()
-{
-  if ( tpdata == nullptr ) { tpdata = new ThreadPrivate; }
+void HadronPhysicsQGSPCMS_FTFP_BERT::ConstructProcess() {
+  if (tpdata == nullptr) {
+    tpdata = new ThreadPrivate;
+  }
   CreateModels();
   tpdata->theNeutrons->Build();
   tpdata->thePro->Build();
   tpdata->thePiK->Build();
-  tpdata->theHyperon->Build(); 
-  tpdata->theAntiBaryon->Build(); 
+  tpdata->theHyperon->Build();
+  tpdata->theAntiBaryon->Build();
 
   // --- Neutrons ---
-  G4PhysListUtil::FindInelasticProcess(G4Neutron::Neutron())
-    ->AddDataSet(new G4NeutronInelasticXS());
+  G4PhysListUtil::FindInelasticProcess(G4Neutron::Neutron())->AddDataSet(new G4NeutronInelasticXS());
 
   G4HadronicProcess* capture = nullptr;
   G4ProcessManager* pmanager = G4Neutron::Neutron()->GetProcessManager();
-  G4ProcessVector*  pv = pmanager->GetProcessList();
-  for ( size_t i=0; i < static_cast<size_t>(pv->size()); ++i ) {
-    if ( fCapture == ((*pv)[i])->GetProcessSubType() ) {
+  G4ProcessVector* pv = pmanager->GetProcessList();
+  for (size_t i = 0; i < static_cast<size_t>(pv->size()); ++i) {
+    if (fCapture == ((*pv)[i])->GetProcessSubType()) {
       capture = static_cast<G4HadronicProcess*>((*pv)[i]);
     }
   }
-  if ( ! capture ) {
+  if (!capture) {
     capture = new G4HadronCaptureProcess("nCapture");
     pmanager->AddDiscreteProcess(capture);
   }
   capture->AddDataSet(new G4NeutronCaptureXS());
   capture->RegisterMe(new G4NeutronRadCapture());
 }
-
diff --git a/SimG4Core/PhysicsLists/src/MonopoleTransportation.cc b/SimG4Core/PhysicsLists/src/MonopoleTransportation.cc
index e41ccbec4aad0..50b7377fe456e 100644
--- a/SimG4Core/PhysicsLists/src/MonopoleTransportation.cc
+++ b/SimG4Core/PhysicsLists/src/MonopoleTransportation.cc
@@ -1,16 +1,16 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //
-// This class is a process responsible for the transportation of 
-// magnetic monopoles, ie the geometrical propagation that encounters the 
+// This class is a process responsible for the transportation of
+// magnetic monopoles, ie the geometrical propagation that encounters the
 // geometrical sub-volumes of the detectors.
 //
 // =======================================================================
-// Created:  3 May 2010, J. Apostolakis, B. Bozsogi 
+// Created:  3 May 2010, J. Apostolakis, B. Bozsogi
 //                       G4MonopoleTransportation class for
 //                       Geant4 extended example "monopole"
 //
-// Adopted for CMSSW by V.Ivanchenko 30 April 2018 
+// Adopted for CMSSW by V.Ivanchenko 30 April 2018
 //
 // =======================================================================
 
@@ -31,67 +31,64 @@ class G4VSensitiveDetector;
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 MonopoleTransportation::MonopoleTransportation(const Monopole* mpl, G4int verb)
-  : G4VProcess( G4String("MonopoleTransportation"), fTransportation ),
-    fParticleDef(mpl),
-    fieldMgrCMS(nullptr),
-    fLinearNavigator(nullptr),
-    fFieldPropagator(nullptr),
-    fParticleIsLooping( false ),
-    fPreviousSftOrigin (0.,0.,0.),
-    fPreviousSafety    ( 0.0 ),
-    fThreshold_Warning_Energy( 100 * MeV ),  
-    fThreshold_Important_Energy( 250 * MeV ), 
-    fThresholdTrials( 10 ), 
-    fNoLooperTrials(0),
-    fSumEnergyKilled( 0.0 ), fMaxEnergyKilled( 0.0 ), 
-    fShortStepOptimisation(false),    // Old default: true (=fast short steps)
-    fpSafetyHelper(nullptr)
-{
+    : G4VProcess(G4String("MonopoleTransportation"), fTransportation),
+      fParticleDef(mpl),
+      fieldMgrCMS(nullptr),
+      fLinearNavigator(nullptr),
+      fFieldPropagator(nullptr),
+      fParticleIsLooping(false),
+      fPreviousSftOrigin(0., 0., 0.),
+      fPreviousSafety(0.0),
+      fThreshold_Warning_Energy(100 * MeV),
+      fThreshold_Important_Energy(250 * MeV),
+      fThresholdTrials(10),
+      fNoLooperTrials(0),
+      fSumEnergyKilled(0.0),
+      fMaxEnergyKilled(0.0),
+      fShortStepOptimisation(false),  // Old default: true (=fast short steps)
+      fpSafetyHelper(nullptr) {
   verboseLevel = verb;
 
   // set Process Sub Type
-  SetProcessSubType(TRANSPORTATION);  
+  SetProcessSubType(TRANSPORTATION);
 
 #ifdef G4MULTITHREADED
-  // Do not finalize the MonopoleTransportation class 
-  if (G4Threading::IsMasterThread())
-    {
-      return;
-    }
+  // Do not finalize the MonopoleTransportation class
+  if (G4Threading::IsMasterThread()) {
+    return;
+  }
 #endif
 
-  G4TransportationManager* transportMgr = 
-    G4TransportationManager::GetTransportationManager(); 
+  G4TransportationManager* transportMgr = G4TransportationManager::GetTransportationManager();
 
-  fLinearNavigator = transportMgr->GetNavigatorForTracking() ; 
+  fLinearNavigator = transportMgr->GetNavigatorForTracking();
 
-  fFieldPropagator = transportMgr->GetPropagatorInField() ;
-  fpSafetyHelper =   transportMgr->GetSafetyHelper();  
+  fFieldPropagator = transportMgr->GetPropagatorInField();
+  fpSafetyHelper = transportMgr->GetSafetyHelper();
 
   // Cannot determine whether a field exists here,
-  //  because it would only work if the field manager has informed 
-  //  about the detector's field before this transportation process 
+  //  because it would only work if the field manager has informed
+  //  about the detector's field before this transportation process
   //  is constructed.
   // Instead later the method DoesGlobalFieldExist() is called
 
-  fCurrentTouchableHandle = nullptr; 
+  fCurrentTouchableHandle = nullptr;
 
-  fEndGlobalTimeComputed  = false;
+  fEndGlobalTimeComputed = false;
   fCandidateEndGlobalTime = 0;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-MonopoleTransportation::~MonopoleTransportation()
-{
-  if( (verboseLevel > 0) && (fSumEnergyKilled > 0.0 ) ){ 
+MonopoleTransportation::~MonopoleTransportation() {
+  if ((verboseLevel > 0) && (fSumEnergyKilled > 0.0)) {
     /*
     G4cout << " MonopoleTransportation: Statistics for looping particles " 
            << G4endl;
     G4cout << "   Sum of energy of loopers killed: " <<  fSumEnergyKilled << G4endl;
     G4cout << "   Max energy of loopers killed: " <<  fMaxEnergyKilled << G4endl;
     */
-  } 
+  }
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -101,255 +98,230 @@ MonopoleTransportation::~MonopoleTransportation()
 //    Calculate the new value of the safety and return it.
 //    Store the final time, position and momentum.
 
-G4double MonopoleTransportation::
-AlongStepGetPhysicalInteractionLength( const G4Track&  track,
-                                             G4double, //  previousStepSize
-                                             G4double  currentMinimumStep,
-                                             G4double& currentSafety,
-                                             G4GPILSelection* selection )
-{  
+G4double MonopoleTransportation::AlongStepGetPhysicalInteractionLength(const G4Track& track,
+                                                                       G4double,  //  previousStepSize
+                                                                       G4double currentMinimumStep,
+                                                                       G4double& currentSafety,
+                                                                       G4GPILSelection* selection) {
   // change to monopole equation
   fieldMgrCMS->SetMonopoleTracking(true);
 
-  G4double geometryStepLength, newSafety ; 
-  fParticleIsLooping = false ;
+  G4double geometryStepLength, newSafety;
+  fParticleIsLooping = false;
 
-  // Initial actions moved to  StartTrack()   
+  // Initial actions moved to  StartTrack()
   // --------------------------------------
   // Note: in case another process changes touchable handle
-  //    it will be necessary to add here (for all steps)   
+  //    it will be necessary to add here (for all steps)
   // fCurrentTouchableHandle = aTrack->GetTouchableHandle();
 
   // GPILSelection is set to defaule value of CandidateForSelection
   // It is a return value
   //
-  *selection = CandidateForSelection ;
+  *selection = CandidateForSelection;
 
   // Get initial Energy/Momentum of the track
   //
-  const G4DynamicParticle* pParticle      = track.GetDynamicParticle() ;
-  const G4ThreeVector& startMomentumDir   = pParticle->GetMomentumDirection() ;
-  G4ThreeVector startPosition             = track.GetPosition() ;
+  const G4DynamicParticle* pParticle = track.GetDynamicParticle();
+  const G4ThreeVector& startMomentumDir = pParticle->GetMomentumDirection();
+  G4ThreeVector startPosition = track.GetPosition();
 
-  // The Step Point safety can be limited by other geometries and/or the 
+  // The Step Point safety can be limited by other geometries and/or the
   // assumptions of any process - it's not always the geometrical safety.
   // We calculate the starting point's isotropic safety here.
   //
-  G4ThreeVector OriginShift = startPosition - fPreviousSftOrigin ;
-  G4double      MagSqShift  = OriginShift.mag2() ;
-  if( MagSqShift >= sqr(fPreviousSafety) )
-  {
-     currentSafety = 0.0 ;
-  }
-  else
-  {
-     currentSafety = fPreviousSafety - std::sqrt(MagSqShift) ;
+  G4ThreeVector OriginShift = startPosition - fPreviousSftOrigin;
+  G4double MagSqShift = OriginShift.mag2();
+  if (MagSqShift >= sqr(fPreviousSafety)) {
+    currentSafety = 0.0;
+  } else {
+    currentSafety = fPreviousSafety - std::sqrt(MagSqShift);
   }
 
   // Is the monopole charged ?
   //
-  G4double particleMagneticCharge = fParticleDef->MagneticCharge() ; 
+  G4double particleMagneticCharge = fParticleDef->MagneticCharge();
   G4double particleElectricCharge = pParticle->GetCharge();
 
-  fGeometryLimitedStep = false ;
+  fGeometryLimitedStep = false;
 
   // There is no need to locate the current volume. It is Done elsewhere:
-  //   On track construction 
+  //   On track construction
   //   By the tracking, after all AlongStepDoIts, in "Relocation"
 
   // Check whether the particle have an (EM) field force exerting upon it
-  G4bool          fieldExertsForce = false ;
-    
-  if(particleMagneticCharge != 0.0 && fieldMgrCMS) {
+  G4bool fieldExertsForce = false;
+
+  if (particleMagneticCharge != 0.0 && fieldMgrCMS) {
     // Message the field Manager, to configure it for this track
-    fieldMgrCMS->ConfigureForTrack( &track );
+    fieldMgrCMS->ConfigureForTrack(&track);
     // Moved here, in order to allow a transition
     //   from a zero-field  status (with fieldMgr->(field)0
     //   to a finite field  status
 
     // If the field manager has no field, there is no field !
-    fieldExertsForce = (fieldMgrCMS->GetDetectorField() != nullptr);      
+    fieldExertsForce = (fieldMgrCMS->GetDetectorField() != nullptr);
   }
 
   // G4cout << " G4Transport:  field exerts force= " << fieldExertsForce
   //          << "  fieldMgr= " << fieldMgr << G4endl;
 
-  // Choose the calculation of the transportation: Field or not 
+  // Choose the calculation of the transportation: Field or not
   //
-  if( !fieldExertsForce ) 
-  {
-     G4double linearStepLength ;
-     if( fShortStepOptimisation && (currentMinimumStep <= currentSafety) )
-     {
-       // The Step is guaranteed to be taken
-       //
-       geometryStepLength   = currentMinimumStep ;
-       fGeometryLimitedStep = false ;
-     }
-     else
-     {
-       //  Find whether the straight path intersects a volume
-       //
-       linearStepLength = fLinearNavigator->ComputeStep( startPosition, 
-                                                         startMomentumDir,
-                                                         currentMinimumStep, 
-                                                         newSafety) ;
-       // Remember last safety origin & value.
-       //
-       fPreviousSftOrigin = startPosition ;
-       fPreviousSafety    = newSafety ; 
-       // fpSafetyHelper->SetCurrentSafety( newSafety, startPosition);
-
-       // The safety at the initial point has been re-calculated:
-       //
-       currentSafety = newSafety ;
-          
-       fGeometryLimitedStep= (linearStepLength <= currentMinimumStep); 
-       if( fGeometryLimitedStep )
-       {
-         // The geometry limits the Step size (an intersection was found.)
-         geometryStepLength   = linearStepLength ;
-       } 
-       else
-       {
-         // The full Step is taken.
-         geometryStepLength   = currentMinimumStep ;
-       }
-     }
-     endpointDistance = geometryStepLength ;
-
-     // Calculate final position
-     //
-     fTransportEndPosition = startPosition+geometryStepLength*startMomentumDir ;
-
-     // Momentum direction, energy and polarisation are unchanged by transport
-     //
-     fTransportEndMomentumDir   = startMomentumDir ; 
-     fTransportEndKineticEnergy = track.GetKineticEnergy() ;
-     fTransportEndSpin          = track.GetPolarization();
-     fParticleIsLooping         = false ;
-     fMomentumChanged           = false ; 
-     fEndGlobalTimeComputed     = false ;
-  }
-  else   //  A field exerts force
+  if (!fieldExertsForce) {
+    G4double linearStepLength;
+    if (fShortStepOptimisation && (currentMinimumStep <= currentSafety)) {
+      // The Step is guaranteed to be taken
+      //
+      geometryStepLength = currentMinimumStep;
+      fGeometryLimitedStep = false;
+    } else {
+      //  Find whether the straight path intersects a volume
+      //
+      linearStepLength = fLinearNavigator->ComputeStep(startPosition, startMomentumDir, currentMinimumStep, newSafety);
+      // Remember last safety origin & value.
+      //
+      fPreviousSftOrigin = startPosition;
+      fPreviousSafety = newSafety;
+      // fpSafetyHelper->SetCurrentSafety( newSafety, startPosition);
+
+      // The safety at the initial point has been re-calculated:
+      //
+      currentSafety = newSafety;
+
+      fGeometryLimitedStep = (linearStepLength <= currentMinimumStep);
+      if (fGeometryLimitedStep) {
+        // The geometry limits the Step size (an intersection was found.)
+        geometryStepLength = linearStepLength;
+      } else {
+        // The full Step is taken.
+        geometryStepLength = currentMinimumStep;
+      }
+    }
+    endpointDistance = geometryStepLength;
+
+    // Calculate final position
+    //
+    fTransportEndPosition = startPosition + geometryStepLength * startMomentumDir;
+
+    // Momentum direction, energy and polarisation are unchanged by transport
+    //
+    fTransportEndMomentumDir = startMomentumDir;
+    fTransportEndKineticEnergy = track.GetKineticEnergy();
+    fTransportEndSpin = track.GetPolarization();
+    fParticleIsLooping = false;
+    fMomentumChanged = false;
+    fEndGlobalTimeComputed = false;
+  } else  //  A field exerts force
   {
-     G4double       momentumMagnitude = pParticle->GetTotalMomentum() ;
-     G4ThreeVector  EndUnitMomentum ;
-     G4double       lengthAlongCurve ;
-     G4double       restMass = fParticleDef->GetPDGMass() ;
-
-     G4ChargeState chargeState(particleElectricCharge,  // The charge can change (dynamic)
-                               fParticleDef->GetPDGSpin(),
-                               0,   //  Magnetic moment:  pParticleDef->GetMagneticMoment(),
-                               0,   //  Electric Dipole moment - not in Particle Definition 
-                               particleMagneticCharge );   // in Mev/c 
-
-     G4EquationOfMotion* equationOfMotion = 
-       fFieldPropagator->GetChordFinder()->GetIntegrationDriver()->GetEquationOfMotion();
-
-     equationOfMotion
-       ->SetChargeMomentumMass( chargeState,       //  Was particleMagneticCharge - in Mev/c
-                                momentumMagnitude, //  Was particleElectricCharge 
-                                restMass ) ;  
-     // SetChargeMomentumMass now passes both the electric and magnetic charge - in chargeState
-
-     G4ThreeVector spin        = track.GetPolarization() ;
-     G4FieldTrack  aFieldTrack = G4FieldTrack( startPosition, 
-                                               track.GetMomentumDirection(),
-                                               0.0, 
-                                               track.GetKineticEnergy(),
-                                               restMass,
-                                               track.GetVelocity(),
-                                               track.GetGlobalTime(), // Lab.
-                                               track.GetProperTime(), // Part.
-                                               &spin                  ) ;
-     if( currentMinimumStep > 0 ) 
-     {
-        // Do the Transport in the field (non recti-linear)
-        //
-        lengthAlongCurve = fFieldPropagator->ComputeStep( aFieldTrack,
-                                                          currentMinimumStep, 
-                                                          currentSafety,
-                                                          track.GetVolume() ) ;
-        fGeometryLimitedStep= lengthAlongCurve < currentMinimumStep; 
-        if( fGeometryLimitedStep ) {
-           geometryStepLength   = lengthAlongCurve ;
-        } else {
-           geometryStepLength   = currentMinimumStep ;
-        }
-     }
-     else
-     {
-        geometryStepLength   = lengthAlongCurve= 0.0 ;
-        fGeometryLimitedStep = false ;
-     }
-
-     // Remember last safety origin & value.
-     //
-     fPreviousSftOrigin = startPosition ;
-     fPreviousSafety    = currentSafety ;         
-     // fpSafetyHelper->SetCurrentSafety( newSafety, startPosition);
-       
-     // Get the End-Position and End-Momentum (Dir-ection)
-     //
-     fTransportEndPosition = aFieldTrack.GetPosition() ;
-
-     // Momentum:  Magnitude and direction can be changed too now ...
-     //
-     fMomentumChanged         = true ; 
-     fTransportEndMomentumDir = aFieldTrack.GetMomentumDir() ;
-
-     fTransportEndKineticEnergy  = aFieldTrack.GetKineticEnergy() ; 
-
-     fCandidateEndGlobalTime   = aFieldTrack.GetLabTimeOfFlight();
-     fEndGlobalTimeComputed    = true;
-
-     fTransportEndSpin = aFieldTrack.GetSpin();
-     fParticleIsLooping = fFieldPropagator->IsParticleLooping() ;
-     endpointDistance   = (fTransportEndPosition - startPosition).mag() ;
+    G4double momentumMagnitude = pParticle->GetTotalMomentum();
+    G4ThreeVector EndUnitMomentum;
+    G4double lengthAlongCurve;
+    G4double restMass = fParticleDef->GetPDGMass();
+
+    G4ChargeState chargeState(particleElectricCharge,  // The charge can change (dynamic)
+                              fParticleDef->GetPDGSpin(),
+                              0,                        //  Magnetic moment:  pParticleDef->GetMagneticMoment(),
+                              0,                        //  Electric Dipole moment - not in Particle Definition
+                              particleMagneticCharge);  // in Mev/c
+
+    G4EquationOfMotion* equationOfMotion =
+        fFieldPropagator->GetChordFinder()->GetIntegrationDriver()->GetEquationOfMotion();
+
+    equationOfMotion->SetChargeMomentumMass(chargeState,        //  Was particleMagneticCharge - in Mev/c
+                                            momentumMagnitude,  //  Was particleElectricCharge
+                                            restMass);
+    // SetChargeMomentumMass now passes both the electric and magnetic charge - in chargeState
+
+    G4ThreeVector spin = track.GetPolarization();
+    G4FieldTrack aFieldTrack = G4FieldTrack(startPosition,
+                                            track.GetMomentumDirection(),
+                                            0.0,
+                                            track.GetKineticEnergy(),
+                                            restMass,
+                                            track.GetVelocity(),
+                                            track.GetGlobalTime(),  // Lab.
+                                            track.GetProperTime(),  // Part.
+                                            &spin);
+    if (currentMinimumStep > 0) {
+      // Do the Transport in the field (non recti-linear)
+      //
+      lengthAlongCurve =
+          fFieldPropagator->ComputeStep(aFieldTrack, currentMinimumStep, currentSafety, track.GetVolume());
+      fGeometryLimitedStep = lengthAlongCurve < currentMinimumStep;
+      if (fGeometryLimitedStep) {
+        geometryStepLength = lengthAlongCurve;
+      } else {
+        geometryStepLength = currentMinimumStep;
+      }
+    } else {
+      geometryStepLength = lengthAlongCurve = 0.0;
+      fGeometryLimitedStep = false;
+    }
+
+    // Remember last safety origin & value.
+    //
+    fPreviousSftOrigin = startPosition;
+    fPreviousSafety = currentSafety;
+    // fpSafetyHelper->SetCurrentSafety( newSafety, startPosition);
+
+    // Get the End-Position and End-Momentum (Dir-ection)
+    //
+    fTransportEndPosition = aFieldTrack.GetPosition();
+
+    // Momentum:  Magnitude and direction can be changed too now ...
+    //
+    fMomentumChanged = true;
+    fTransportEndMomentumDir = aFieldTrack.GetMomentumDir();
+
+    fTransportEndKineticEnergy = aFieldTrack.GetKineticEnergy();
+
+    fCandidateEndGlobalTime = aFieldTrack.GetLabTimeOfFlight();
+    fEndGlobalTimeComputed = true;
+
+    fTransportEndSpin = aFieldTrack.GetSpin();
+    fParticleIsLooping = fFieldPropagator->IsParticleLooping();
+    endpointDistance = (fTransportEndPosition - startPosition).mag();
   }
 
   // If we are asked to go a step length of 0, and we are on a boundary
   // then a boundary will also limit the step -> we must flag this.
   //
-  if( currentMinimumStep == 0.0 ) 
-  {
-      if( currentSafety == 0.0 )  fGeometryLimitedStep = true ;
+  if (currentMinimumStep == 0.0) {
+    if (currentSafety == 0.0)
+      fGeometryLimitedStep = true;
   }
 
   // Update the safety starting from the end-point,
   // if it will become negative at the end-point.
   //
-  if( currentSafety < endpointDistance ) 
-  {
-      if( particleMagneticCharge != 0.0 ) {
-
-         G4double endSafety =
-               fLinearNavigator->ComputeSafety( fTransportEndPosition) ;
-         currentSafety      = endSafety ;
-         fPreviousSftOrigin = fTransportEndPosition ;
-         fPreviousSafety    = currentSafety ; 
-         fpSafetyHelper->SetCurrentSafety( currentSafety, fTransportEndPosition);
-
-         // Because the Stepping Manager assumes it is from the start point, 
-         //  add the StepLength
-         //
-         currentSafety     += endpointDistance ;
-
-#ifdef G4DEBUG_TRANSPORT 
-         G4cout.precision(12) ;
-         G4cout << "***MonopoleTransportation::AlongStepGPIL ** " << G4endl  ;
-         G4cout << "  Called Navigator->ComputeSafety at " << fTransportEndPosition
-                << "    and it returned safety= " << endSafety << G4endl ; 
-         G4cout << "  Adding endpoint distance " << endpointDistance 
-                << "   to obtain pseudo-safety= " << currentSafety << G4endl ; 
+  if (currentSafety < endpointDistance) {
+    if (particleMagneticCharge != 0.0) {
+      G4double endSafety = fLinearNavigator->ComputeSafety(fTransportEndPosition);
+      currentSafety = endSafety;
+      fPreviousSftOrigin = fTransportEndPosition;
+      fPreviousSafety = currentSafety;
+      fpSafetyHelper->SetCurrentSafety(currentSafety, fTransportEndPosition);
+
+      // Because the Stepping Manager assumes it is from the start point,
+      //  add the StepLength
+      //
+      currentSafety += endpointDistance;
+
+#ifdef G4DEBUG_TRANSPORT
+      G4cout.precision(12);
+      G4cout << "***MonopoleTransportation::AlongStepGPIL ** " << G4endl;
+      G4cout << "  Called Navigator->ComputeSafety at " << fTransportEndPosition
+             << "    and it returned safety= " << endSafety << G4endl;
+      G4cout << "  Adding endpoint distance " << endpointDistance << "   to obtain pseudo-safety= " << currentSafety
+             << G4endl;
 #endif
-      }
-  }            
+    }
+  }
 
-  fParticleChange.ProposeTrueStepLength(geometryStepLength) ;
+  fParticleChange.ProposeTrueStepLength(geometryStepLength);
 
-  return geometryStepLength ;
+  return geometryStepLength;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -357,244 +329,207 @@ AlongStepGetPhysicalInteractionLength( const G4Track&  track,
 //   Initialize ParticleChange  (by setting all its members equal
 //                               to corresponding members in G4Track)
 
-G4VParticleChange* MonopoleTransportation::AlongStepDoIt( const G4Track& track,
-                                                          const G4Step&  stepData )
-{
-  fParticleChange.Initialize(track) ;
+G4VParticleChange* MonopoleTransportation::AlongStepDoIt(const G4Track& track, const G4Step& stepData) {
+  fParticleChange.Initialize(track);
 
-  //  Code for specific process 
+  //  Code for specific process
   //
-  fParticleChange.ProposePosition(fTransportEndPosition) ;
-  fParticleChange.ProposeMomentumDirection(fTransportEndMomentumDir) ;
-  fParticleChange.ProposeEnergy(fTransportEndKineticEnergy) ;
-  fParticleChange.SetMomentumChanged(fMomentumChanged) ;
+  fParticleChange.ProposePosition(fTransportEndPosition);
+  fParticleChange.ProposeMomentumDirection(fTransportEndMomentumDir);
+  fParticleChange.ProposeEnergy(fTransportEndKineticEnergy);
+  fParticleChange.SetMomentumChanged(fMomentumChanged);
 
   fParticleChange.ProposePolarization(fTransportEndSpin);
-  
-  G4double deltaTime = 0.0 ;
+
+  G4double deltaTime = 0.0;
 
   // Calculate  Lab Time of Flight (ONLY if field Equations used it!)
-  G4double startTime = track.GetGlobalTime() ;
-  
-  if (!fEndGlobalTimeComputed)
-  {
-     // The time was not integrated .. make the best estimate possible
-     //
-     G4double finalVelocity   = track.GetVelocity() ;
-     G4double initialVelocity = stepData.GetPreStepPoint()->GetVelocity() ;
-     G4double stepLength      = track.GetStepLength() ;
-
-     deltaTime= 0.0;  // in case initialVelocity = 0 
-     if (finalVelocity > 0.0)
-     {
-        G4double meanInverseVelocity ;
-        meanInverseVelocity = 0.5
-                            * ( 1.0 / initialVelocity + 1.0 / finalVelocity ) ;
-        deltaTime = stepLength * meanInverseVelocity ;
-     }
-     else if( initialVelocity > 0.0 )
-     {
-        deltaTime = stepLength/initialVelocity ;
-     }
-     fCandidateEndGlobalTime   = startTime + deltaTime ;
-  }
-  else
-  {
-     deltaTime = fCandidateEndGlobalTime - startTime ;
+  G4double startTime = track.GetGlobalTime();
+
+  if (!fEndGlobalTimeComputed) {
+    // The time was not integrated .. make the best estimate possible
+    //
+    G4double finalVelocity = track.GetVelocity();
+    G4double initialVelocity = stepData.GetPreStepPoint()->GetVelocity();
+    G4double stepLength = track.GetStepLength();
+
+    deltaTime = 0.0;  // in case initialVelocity = 0
+    if (finalVelocity > 0.0) {
+      G4double meanInverseVelocity;
+      meanInverseVelocity = 0.5 * (1.0 / initialVelocity + 1.0 / finalVelocity);
+      deltaTime = stepLength * meanInverseVelocity;
+    } else if (initialVelocity > 0.0) {
+      deltaTime = stepLength / initialVelocity;
+    }
+    fCandidateEndGlobalTime = startTime + deltaTime;
+  } else {
+    deltaTime = fCandidateEndGlobalTime - startTime;
   }
 
-  fParticleChange.ProposeGlobalTime( fCandidateEndGlobalTime ) ;
+  fParticleChange.ProposeGlobalTime(fCandidateEndGlobalTime);
 
   // Now Correct by Lorentz factor to get "proper" deltaTime
-  
-  G4double  restMass       = track.GetDynamicParticle()->GetMass() ;
-  G4double deltaProperTime = deltaTime*( restMass/track.GetTotalEnergy() ) ;
 
-  fParticleChange.ProposeProperTime(track.GetProperTime() + deltaProperTime) ;
+  G4double restMass = track.GetDynamicParticle()->GetMass();
+  G4double deltaProperTime = deltaTime * (restMass / track.GetTotalEnergy());
+
+  fParticleChange.ProposeProperTime(track.GetProperTime() + deltaProperTime);
   //fParticleChange. ProposeTrueStepLength( track.GetStepLength() ) ;
 
   // If the particle is caught looping or is stuck (in very difficult
-  // boundaries) in a magnetic field (doing many steps) 
+  // boundaries) in a magnetic field (doing many steps)
   //   THEN this kills it ...
   //
-  if ( fParticleIsLooping )
-  {
-      G4double endEnergy= fTransportEndKineticEnergy;
-
-      if( (endEnergy < fThreshold_Important_Energy) 
-          || (fNoLooperTrials >= fThresholdTrials ) ){
-        // Kill the looping particle 
-        //
-        fParticleChange.ProposeTrackStatus( fStopAndKill )  ;
-
-        // 'Bare' statistics
-        fSumEnergyKilled += endEnergy; 
-        if( endEnergy > fMaxEnergyKilled) { fMaxEnergyKilled= endEnergy; }
+  if (fParticleIsLooping) {
+    G4double endEnergy = fTransportEndKineticEnergy;
+
+    if ((endEnergy < fThreshold_Important_Energy) || (fNoLooperTrials >= fThresholdTrials)) {
+      // Kill the looping particle
+      //
+      fParticleChange.ProposeTrackStatus(fStopAndKill);
+
+      // 'Bare' statistics
+      fSumEnergyKilled += endEnergy;
+      if (endEnergy > fMaxEnergyKilled) {
+        fMaxEnergyKilled = endEnergy;
+      }
 
 #ifdef G4VERBOSE
-        if( (verboseLevel > 1) || 
-            ( endEnergy > fThreshold_Warning_Energy )  ) { 
-          G4cout << " MonopoleTransportation is killing track that is looping or stuck "
-                 << G4endl
-                 << "   This track has " << track.GetKineticEnergy() / MeV
-                 << " MeV energy." << G4endl;
-          G4cout << "   Number of trials = " << fNoLooperTrials 
-                 << "   No of calls to AlongStepDoIt = " << noCalls 
-                 << G4endl;
-        }
-#endif
-        fNoLooperTrials=0; 
+      if ((verboseLevel > 1) || (endEnergy > fThreshold_Warning_Energy)) {
+        G4cout << " MonopoleTransportation is killing track that is looping or stuck " << G4endl << "   This track has "
+               << track.GetKineticEnergy() / MeV << " MeV energy." << G4endl;
+        G4cout << "   Number of trials = " << fNoLooperTrials << "   No of calls to AlongStepDoIt = " << noCalls
+               << G4endl;
       }
-      else{
-        fNoLooperTrials ++; 
-#ifdef G4VERBOSE
-        if( (verboseLevel > 2) ){
-          G4cout << "   MonopoleTransportation::AlongStepDoIt(): Particle looping -  "
-                 << "   Number of trials = " << fNoLooperTrials 
-                 << "   No of calls to  = " << noCalls 
-                 << G4endl;
-        }
 #endif
+      fNoLooperTrials = 0;
+    } else {
+      fNoLooperTrials++;
+#ifdef G4VERBOSE
+      if ((verboseLevel > 2)) {
+        G4cout << "   MonopoleTransportation::AlongStepDoIt(): Particle looping -  "
+               << "   Number of trials = " << fNoLooperTrials << "   No of calls to  = " << noCalls << G4endl;
       }
-  }else{
-      fNoLooperTrials=0; 
+#endif
+    }
+  } else {
+    fNoLooperTrials = 0;
   }
 
   // Another (sometimes better way) is to use a user-limit maximum Step size
-  // to alleviate this problem .. 
+  // to alleviate this problem ..
 
   // Introduce smooth curved trajectories to particle-change
   //
-  fParticleChange.SetPointerToVectorOfAuxiliaryPoints
-    (fFieldPropagator->GimmeTrajectoryVectorAndForgetIt() );
+  fParticleChange.SetPointerToVectorOfAuxiliaryPoints(fFieldPropagator->GimmeTrajectoryVectorAndForgetIt());
 
-  return &fParticleChange ;
+  return &fParticleChange;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //
 //  This ensures that the PostStep action is always called,
 //  so that it can do the relocation if it is needed.
-// 
-
-G4double MonopoleTransportation::
-PostStepGetPhysicalInteractionLength( const G4Track&,
-                                            G4double, // previousStepSize
-                                            G4ForceCondition* pForceCond )
-{  
-  *pForceCond = Forced ; 
-  return DBL_MAX ;  // was kInfinity ; but convention now is DBL_MAX
+//
+
+G4double MonopoleTransportation::PostStepGetPhysicalInteractionLength(const G4Track&,
+                                                                      G4double,  // previousStepSize
+                                                                      G4ForceCondition* pForceCond) {
+  *pForceCond = Forced;
+  return DBL_MAX;  // was kInfinity ; but convention now is DBL_MAX
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4VParticleChange* MonopoleTransportation::PostStepDoIt( const G4Track& track,
-                                                   const G4Step& )
-{
-  G4TouchableHandle retCurrentTouchable ;   // The one to return
+G4VParticleChange* MonopoleTransportation::PostStepDoIt(const G4Track& track, const G4Step&) {
+  G4TouchableHandle retCurrentTouchable;  // The one to return
 
-  fParticleChange.ProposeTrackStatus(track.GetTrackStatus()) ;
+  fParticleChange.ProposeTrackStatus(track.GetTrackStatus());
 
   // If the Step was determined by the volume boundary,
   // logically relocate the particle
-  
-  if(fGeometryLimitedStep)
-  {  
-    // fCurrentTouchable will now become the previous touchable, 
+
+  if (fGeometryLimitedStep) {
+    // fCurrentTouchable will now become the previous touchable,
     // and what was the previous will be freed.
     // (Needed because the preStepPoint can point to the previous touchable)
 
-    fLinearNavigator->SetGeometricallyLimitedStep() ;
-    fLinearNavigator->
-    LocateGlobalPointAndUpdateTouchableHandle( track.GetPosition(),
-                                               track.GetMomentumDirection(),
-                                               fCurrentTouchableHandle,
-                                               true                      ) ;
-    // Check whether the particle is out of the world volume 
+    fLinearNavigator->SetGeometricallyLimitedStep();
+    fLinearNavigator->LocateGlobalPointAndUpdateTouchableHandle(
+        track.GetPosition(), track.GetMomentumDirection(), fCurrentTouchableHandle, true);
+    // Check whether the particle is out of the world volume
     // If so it has exited and must be killed.
     //
-    if( fCurrentTouchableHandle->GetVolume() == nullptr )
-    {
-       fParticleChange.ProposeTrackStatus( fStopAndKill ) ;
+    if (fCurrentTouchableHandle->GetVolume() == nullptr) {
+      fParticleChange.ProposeTrackStatus(fStopAndKill);
     }
-    retCurrentTouchable = fCurrentTouchableHandle ;
-    fParticleChange.SetTouchableHandle( fCurrentTouchableHandle ) ;
-  }
-  else                 // fGeometryLimitedStep  is false
-  {                    
+    retCurrentTouchable = fCurrentTouchableHandle;
+    fParticleChange.SetTouchableHandle(fCurrentTouchableHandle);
+  } else  // fGeometryLimitedStep  is false
+  {
     // This serves only to move the Navigator's location
     //
-    fLinearNavigator->LocateGlobalPointWithinVolume( track.GetPosition() ) ;
+    fLinearNavigator->LocateGlobalPointWithinVolume(track.GetPosition());
 
-    // The value of the track's current Touchable is retained. 
+    // The value of the track's current Touchable is retained.
     // (and it must be correct because we must use it below to
     // overwrite the (unset) one in particle change)
     //  It must be fCurrentTouchable too ??
     //
-    fParticleChange.SetTouchableHandle( track.GetTouchableHandle() ) ;
-    retCurrentTouchable = track.GetTouchableHandle() ;
-  }         // endif ( fGeometryLimitedStep ) 
-
-  const G4VPhysicalVolume* pNewVol = retCurrentTouchable->GetVolume() ;
-  const G4Material* pNewMaterial   = nullptr ;
-  const G4VSensitiveDetector* pNewSensitiveDetector   = nullptr ;
-                                                                                       
-  if( pNewVol != nullptr )
-  {
-    pNewMaterial= pNewVol->GetLogicalVolume()->GetMaterial();
-    pNewSensitiveDetector= pNewVol->GetLogicalVolume()->GetSensitiveDetector();
+    fParticleChange.SetTouchableHandle(track.GetTouchableHandle());
+    retCurrentTouchable = track.GetTouchableHandle();
+  }  // endif ( fGeometryLimitedStep )
+
+  const G4VPhysicalVolume* pNewVol = retCurrentTouchable->GetVolume();
+  const G4Material* pNewMaterial = nullptr;
+  const G4VSensitiveDetector* pNewSensitiveDetector = nullptr;
+
+  if (pNewVol != nullptr) {
+    pNewMaterial = pNewVol->GetLogicalVolume()->GetMaterial();
+    pNewSensitiveDetector = pNewVol->GetLogicalVolume()->GetSensitiveDetector();
   }
 
-  fParticleChange.SetMaterialInTouchable( 
-                     (G4Material *) pNewMaterial ) ;
-  fParticleChange.SetSensitiveDetectorInTouchable( 
-                     (G4VSensitiveDetector *) pNewSensitiveDetector ) ;
+  fParticleChange.SetMaterialInTouchable((G4Material*)pNewMaterial);
+  fParticleChange.SetSensitiveDetectorInTouchable((G4VSensitiveDetector*)pNewSensitiveDetector);
 
   const G4MaterialCutsCouple* pNewMaterialCutsCouple = nullptr;
-  if( pNewVol != nullptr )
-  {
-    pNewMaterialCutsCouple=pNewVol->GetLogicalVolume()->GetMaterialCutsCouple();
+  if (pNewVol != nullptr) {
+    pNewMaterialCutsCouple = pNewVol->GetLogicalVolume()->GetMaterialCutsCouple();
   }
 
-  if( pNewVol!=nullptr && pNewMaterialCutsCouple!=nullptr && 
-      pNewMaterialCutsCouple->GetMaterial()!=pNewMaterial )
-  {
+  if (pNewVol != nullptr && pNewMaterialCutsCouple != nullptr &&
+      pNewMaterialCutsCouple->GetMaterial() != pNewMaterial) {
     // for parametrized volume
     //
-    pNewMaterialCutsCouple =
-      G4ProductionCutsTable::GetProductionCutsTable()
-                             ->GetMaterialCutsCouple(pNewMaterial,
-                               pNewMaterialCutsCouple->GetProductionCuts());
+    pNewMaterialCutsCouple = G4ProductionCutsTable::GetProductionCutsTable()->GetMaterialCutsCouple(
+        pNewMaterial, pNewMaterialCutsCouple->GetProductionCuts());
   }
-  fParticleChange.SetMaterialCutsCoupleInTouchable( pNewMaterialCutsCouple );
+  fParticleChange.SetMaterialCutsCoupleInTouchable(pNewMaterialCutsCouple);
 
-  // temporarily until Get/Set Material of ParticleChange, 
-  // and StepPoint can be made const. 
+  // temporarily until Get/Set Material of ParticleChange,
+  // and StepPoint can be made const.
   // Set the touchable in ParticleChange
   // this must always be done because the particle change always
   // uses this value to overwrite the current touchable pointer.
   //
-  fParticleChange.SetTouchableHandle(retCurrentTouchable) ;
+  fParticleChange.SetTouchableHandle(retCurrentTouchable);
 
   // change to normal equation
   fieldMgrCMS->SetMonopoleTracking(false);
-  
-  return &fParticleChange ;
+
+  return &fParticleChange;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-// New method takes over the responsibility to reset the state 
-// of MonopoleTransportation object at the start of a new track 
-// or the resumption of a suspended track. 
+// New method takes over the responsibility to reset the state
+// of MonopoleTransportation object at the start of a new track
+// or the resumption of a suspended track.
 
-void 
-MonopoleTransportation::StartTracking(G4Track* aTrack)
-{
+void MonopoleTransportation::StartTracking(G4Track* aTrack) {
   // initialise pointer
-  if(!fieldMgrCMS) {
-    G4FieldManager* fieldMgr = 
-      fFieldPropagator->FindAndSetFieldManager(aTrack->GetVolume()); 
+  if (!fieldMgrCMS) {
+    G4FieldManager* fieldMgr = fFieldPropagator->FindAndSetFieldManager(aTrack->GetVolume());
     fieldMgrCMS = static_cast<CMSFieldManager*>(fieldMgr);
   }
 
@@ -605,27 +540,28 @@ MonopoleTransportation::StartTracking(G4Track* aTrack)
 
   // reset safety value and center
   //
-  fPreviousSafety    = 0.0 ; 
-  fPreviousSftOrigin = G4ThreeVector(0.,0.,0.) ;
-  
+  fPreviousSafety = 0.0;
+  fPreviousSftOrigin = G4ThreeVector(0., 0., 0.);
+
   // reset looping counter -- for motion in field
-  fNoLooperTrials= 0; 
+  fNoLooperTrials = 0;
   // Must clear this state .. else it depends on last track's value
 
   // ChordFinder reset internal state
   //
-  if( DoesGlobalFieldExist() ) {
-     fFieldPropagator->ClearPropagatorState();   
-       // Resets all state of field propagator class (ONLY)
-       //  including safety values (in case of overlaps and to wipe for first track).
-
-     G4ChordFinder* chordF= fFieldPropagator->GetChordFinder();
-     if( chordF ) chordF->ResetStepEstimate();
+  if (DoesGlobalFieldExist()) {
+    fFieldPropagator->ClearPropagatorState();
+    // Resets all state of field propagator class (ONLY)
+    //  including safety values (in case of overlaps and to wipe for first track).
+
+    G4ChordFinder* chordF = fFieldPropagator->GetChordFinder();
+    if (chordF)
+      chordF->ResetStepEstimate();
   }
 
   // Make sure to clear the chord finders of all fields (ie managers)
-  G4FieldManagerStore* fieldMgrStore= G4FieldManagerStore::GetInstance();
-  fieldMgrStore->ClearAllChordFindersState(); 
+  G4FieldManagerStore* fieldMgrStore = G4FieldManagerStore::GetInstance();
+  fieldMgrStore->ClearAllChordFindersState();
 
   // Update the current touchable handle  (from the track's)
   //
@@ -634,35 +570,25 @@ MonopoleTransportation::StartTracking(G4Track* aTrack)
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4double MonopoleTransportation::AtRestGetPhysicalInteractionLength(
-                             const G4Track& ,
-                             G4ForceCondition*) 
-{ 
-  return -1.0; 
-}
+G4double MonopoleTransportation::AtRestGetPhysicalInteractionLength(const G4Track&, G4ForceCondition*) { return -1.0; }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4VParticleChange* MonopoleTransportation::AtRestDoIt(const G4Track&,
-                                                      const G4Step&)
-{
-  return nullptr;
-}
+G4VParticleChange* MonopoleTransportation::AtRestDoIt(const G4Track&, const G4Step&) { return nullptr; }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 void MonopoleTransportation::ResetKilledStatistics(G4int report)
 // Statistics for tracks killed (currently due to looping in field)
 {
-  if( report ) { 
+  if (report) {
     G4cout << " MonopoleTransportation: Statistics for looping particles " << G4endl;
-    G4cout << "   Sum of energy of loopers killed: " <<  fSumEnergyKilled << G4endl;
-    G4cout << "   Max energy of loopers killed: " <<  fMaxEnergyKilled << G4endl;
-  } 
+    G4cout << "   Sum of energy of loopers killed: " << fSumEnergyKilled << G4endl;
+    G4cout << "   Max energy of loopers killed: " << fMaxEnergyKilled << G4endl;
+  }
 
-  fSumEnergyKilled= 0;
-  fMaxEnergyKilled= -1.0*CLHEP::GeV;
+  fSumEnergyKilled = 0;
+  fMaxEnergyKilled = -1.0 * CLHEP::GeV;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
-
diff --git a/SimG4Core/PhysicsLists/src/UrbanMscModel93.cc b/SimG4Core/PhysicsLists/src/UrbanMscModel93.cc
index 77a0f74f8bf0d..bfcdf56b8d946 100644
--- a/SimG4Core/PhysicsLists/src/UrbanMscModel93.cc
+++ b/SimG4Core/PhysicsLists/src/UrbanMscModel93.cc
@@ -1,14 +1,14 @@
 // -------------------------------------------------------------------
-//   
+//
 // GEANT4 Class file
-//    
+//
 //
 // File name:   UrbanMscModel93
 //
-// Original author:    Laszlo Urban, 
+// Original author:    Laszlo Urban,
 //
 //    V.Ivanchenko have copied from G4UrbanMscModel93 class
-//                 of Geant4 global tag geant4-09-06-ref-07 
+//                 of Geant4 global tag geant4-09-06-ref-07
 //                 and have adopted to CMSSW
 //
 // -------------------------------------------------------------------
@@ -36,66 +36,63 @@ static const G4double kappa = 2.5;
 static const G4double kappapl1 = 3.5;
 static const G4double kappami1 = 1.5;
 
-UrbanMscModel93::UrbanMscModel93(const G4String& nam)
-  : G4VMscModel(nam)
-{
-  masslimite    = 0.6*MeV;
-  lambdalimit   = 1.*mm;
-  fr            = 0.02;
-  taubig        = 8.0;
-  tausmall      = 1.e-16;
-  taulim        = 1.e-6;
-  currentTau    = taulim;
-  tlimitminfix  = 1.e-6*mm;            
-  stepmin       = tlimitminfix;
-  smallstep     = 1.e10;
-  currentRange  = 0. ;
-  rangeinit     = 0.;
-  tlimit        = 1.e10*mm;
-  tlimitmin     = 10.*tlimitminfix;            
-  tgeom         = 1.e50*mm;
-  geombig       = 1.e50*mm;
-  geommin       = 1.e-3*mm;
-  geomlimit     = geombig;
-  presafety     = 0.*mm;
-                          
-  y             = 0.;
-
-  Zold          = 0.;
-  Zeff          = 1.;
-  Z2            = 1.;                
-  Z23           = 1.;                    
-  lnZ           = 0.;
-  coeffth1      = 0.;
-  coeffth2      = 0.;
-  coeffc1       = 0.;
-  coeffc2       = 0.;
-  scr1ini       = fine_structure_const*fine_structure_const*
-                  electron_mass_c2*electron_mass_c2/(0.885*0.885*4.*pi);
-  scr2ini       = 3.76*fine_structure_const*fine_structure_const;
-  scr1          = 0.;
-  scr2          = 0.;
-
-  theta0max     = pi/6.;
-  rellossmax    = 0.50;
-  third         = 1./3.;
-  particle      = nullptr;
-  theManager    = G4LossTableManager::Instance(); 
-  firstStep     = true; 
-  inside        = false;  
-  insideskin    = false;
-
-  numlim        = 0.01;
-  xsi           = 3.;
-  ea            = G4Exp(-xsi);
-  eaa           = 1.-ea ;
-
-  skindepth = skin*stepmin;
+UrbanMscModel93::UrbanMscModel93(const G4String& nam) : G4VMscModel(nam) {
+  masslimite = 0.6 * MeV;
+  lambdalimit = 1. * mm;
+  fr = 0.02;
+  taubig = 8.0;
+  tausmall = 1.e-16;
+  taulim = 1.e-6;
+  currentTau = taulim;
+  tlimitminfix = 1.e-6 * mm;
+  stepmin = tlimitminfix;
+  smallstep = 1.e10;
+  currentRange = 0.;
+  rangeinit = 0.;
+  tlimit = 1.e10 * mm;
+  tlimitmin = 10. * tlimitminfix;
+  tgeom = 1.e50 * mm;
+  geombig = 1.e50 * mm;
+  geommin = 1.e-3 * mm;
+  geomlimit = geombig;
+  presafety = 0. * mm;
+
+  y = 0.;
+
+  Zold = 0.;
+  Zeff = 1.;
+  Z2 = 1.;
+  Z23 = 1.;
+  lnZ = 0.;
+  coeffth1 = 0.;
+  coeffth2 = 0.;
+  coeffc1 = 0.;
+  coeffc2 = 0.;
+  scr1ini =
+      fine_structure_const * fine_structure_const * electron_mass_c2 * electron_mass_c2 / (0.885 * 0.885 * 4. * pi);
+  scr2ini = 3.76 * fine_structure_const * fine_structure_const;
+  scr1 = 0.;
+  scr2 = 0.;
+
+  theta0max = pi / 6.;
+  rellossmax = 0.50;
+  third = 1. / 3.;
+  particle = nullptr;
+  theManager = G4LossTableManager::Instance();
+  firstStep = true;
+  inside = false;
+  insideskin = false;
+
+  numlim = 0.01;
+  xsi = 3.;
+  ea = G4Exp(-xsi);
+  eaa = 1. - ea;
+
+  skindepth = skin * stepmin;
 
   mass = proton_mass_c2;
   charge = ChargeSquare = 1.0;
-  currentKinEnergy = currentRadLength = lambda0 = lambdaeff = tPathLength 
-    = zPathLength = par1 = par2 = par3 = 0;
+  currentKinEnergy = currentRadLength = lambda0 = lambdaeff = tPathLength = zPathLength = par1 = par2 = par3 = 0;
 
   currentMaterialIndex = -1;
   fParticleChange = nullptr;
@@ -105,24 +102,19 @@ UrbanMscModel93::UrbanMscModel93(const G4String& nam)
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-UrbanMscModel93::~UrbanMscModel93()
-{}
+UrbanMscModel93::~UrbanMscModel93() {}
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-void UrbanMscModel93::Initialise(const G4ParticleDefinition* p,
-				 const G4DataVector&)
-{
-  skindepth = skin*stepmin;
+void UrbanMscModel93::Initialise(const G4ParticleDefinition* p, const G4DataVector&) {
+  skindepth = skin * stepmin;
 
   // set values of some data members
   SetParticle(p);
 
-  if(p->GetPDGMass() > MeV) {
-    G4cout << "### WARNING: UrbanMscModel93 model is used for " 
-	   << p->GetParticleName() << " !!! " << G4endl;
-    G4cout << "###          This model should be used only for e+-" 
-	   << G4endl;
+  if (p->GetPDGMass() > MeV) {
+    G4cout << "### WARNING: UrbanMscModel93 model is used for " << p->GetParticleName() << " !!! " << G4endl;
+    G4cout << "###          This model should be used only for e+-" << G4endl;
   }
 
   fParticleChange = GetParticleChangeForMSC(p);
@@ -130,145 +122,113 @@ void UrbanMscModel93::Initialise(const G4ParticleDefinition* p,
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4double UrbanMscModel93::ComputeCrossSectionPerAtom( 
-                             const G4ParticleDefinition* part,
-                                   G4double KineticEnergy,
-                                   G4double AtomicNumber,G4double,
-				   G4double, G4double)
-{
-  static const G4double sigmafactor = 
-    twopi*classic_electr_radius*classic_electr_radius;
-  static const G4double epsfactor = 2.*electron_mass_c2*electron_mass_c2*
-                            Bohr_radius*Bohr_radius/(hbarc*hbarc);
-  static const G4double epsmin = 1.e-4 , epsmax = 1.e10;
-
-  static const G4double Zdat[15] = { 4.,  6., 13., 20., 26., 29., 32., 38., 47.,
-				     50., 56., 64., 74., 79., 82. };
-
-  static const G4double Tdat[22] = { 100*eV,  200*eV,  400*eV,  700*eV,
-				     1*keV,   2*keV,   4*keV,   7*keV,
-				     10*keV,  20*keV,  40*keV,  70*keV,
-				     100*keV, 200*keV, 400*keV, 700*keV,
-				     1*MeV,   2*MeV,   4*MeV,   7*MeV,
-				     10*MeV,  20*MeV};
+G4double UrbanMscModel93::ComputeCrossSectionPerAtom(
+    const G4ParticleDefinition* part, G4double KineticEnergy, G4double AtomicNumber, G4double, G4double, G4double) {
+  static const G4double sigmafactor = twopi * classic_electr_radius * classic_electr_radius;
+  static const G4double epsfactor =
+      2. * electron_mass_c2 * electron_mass_c2 * Bohr_radius * Bohr_radius / (hbarc * hbarc);
+  static const G4double epsmin = 1.e-4, epsmax = 1.e10;
+
+  static const G4double Zdat[15] = {4., 6., 13., 20., 26., 29., 32., 38., 47., 50., 56., 64., 74., 79., 82.};
+
+  static const G4double Tdat[22] = {100 * eV, 200 * eV, 400 * eV, 700 * eV, 1 * keV,   2 * keV,   4 * keV,   7 * keV,
+                                    10 * keV, 20 * keV, 40 * keV, 70 * keV, 100 * keV, 200 * keV, 400 * keV, 700 * keV,
+                                    1 * MeV,  2 * MeV,  4 * MeV,  7 * MeV,  10 * MeV,  20 * MeV};
 
   // corr. factors for e-/e+ lambda for T <= Tlim
-  static const G4double celectron[15][22] =
-          {{1.125,1.072,1.051,1.047,1.047,1.050,1.052,1.054,
-            1.054,1.057,1.062,1.069,1.075,1.090,1.105,1.111,
-            1.112,1.108,1.100,1.093,1.089,1.087            },
-           {1.408,1.246,1.143,1.096,1.077,1.059,1.053,1.051,
-            1.052,1.053,1.058,1.065,1.072,1.087,1.101,1.108,
-            1.109,1.105,1.097,1.090,1.086,1.082            },
-           {2.833,2.268,1.861,1.612,1.486,1.309,1.204,1.156,
-            1.136,1.114,1.106,1.106,1.109,1.119,1.129,1.132,
-            1.131,1.124,1.113,1.104,1.099,1.098            },
-           {3.879,3.016,2.380,2.007,1.818,1.535,1.340,1.236,
-            1.190,1.133,1.107,1.099,1.098,1.103,1.110,1.113,
-            1.112,1.105,1.096,1.089,1.085,1.098            },
-           {6.937,4.330,2.886,2.256,1.987,1.628,1.395,1.265,
-            1.203,1.122,1.080,1.065,1.061,1.063,1.070,1.073,
-            1.073,1.070,1.064,1.059,1.056,1.056            },
-           {9.616,5.708,3.424,2.551,2.204,1.762,1.485,1.330,
-            1.256,1.155,1.099,1.077,1.070,1.068,1.072,1.074,
-            1.074,1.070,1.063,1.059,1.056,1.052            },
-           {11.72,6.364,3.811,2.806,2.401,1.884,1.564,1.386,
-            1.300,1.180,1.112,1.082,1.073,1.066,1.068,1.069,
-            1.068,1.064,1.059,1.054,1.051,1.050            },
-           {18.08,8.601,4.569,3.183,2.662,2.025,1.646,1.439,
-            1.339,1.195,1.108,1.068,1.053,1.040,1.039,1.039,
-            1.039,1.037,1.034,1.031,1.030,1.036            },
-           {18.22,10.48,5.333,3.713,3.115,2.367,1.898,1.631,
-            1.498,1.301,1.171,1.105,1.077,1.048,1.036,1.033,
-            1.031,1.028,1.024,1.022,1.021,1.024            },
-           {14.14,10.65,5.710,3.929,3.266,2.453,1.951,1.669,
-            1.528,1.319,1.178,1.106,1.075,1.040,1.027,1.022,
-            1.020,1.017,1.015,1.013,1.013,1.020            },
-           {14.11,11.73,6.312,4.240,3.478,2.566,2.022,1.720,
-            1.569,1.342,1.186,1.102,1.065,1.022,1.003,0.997,
-            0.995,0.993,0.993,0.993,0.993,1.011            },
-           {22.76,20.01,8.835,5.287,4.144,2.901,2.219,1.855,
-            1.677,1.410,1.224,1.121,1.073,1.014,0.986,0.976,
-            0.974,0.972,0.973,0.974,0.975,0.987            },
-           {50.77,40.85,14.13,7.184,5.284,3.435,2.520,2.059,
-            1.837,1.512,1.283,1.153,1.091,1.010,0.969,0.954,
-            0.950,0.947,0.949,0.952,0.954,0.963            },
-           {65.87,59.06,15.87,7.570,5.567,3.650,2.682,2.182,
-            1.939,1.579,1.325,1.178,1.108,1.014,0.965,0.947,
-            0.941,0.938,0.940,0.944,0.946,0.954            },
-           {55.60,47.34,15.92,7.810,5.755,3.767,2.760,2.239,
-            1.985,1.609,1.343,1.188,1.113,1.013,0.960,0.939,
-            0.933,0.930,0.933,0.936,0.939,0.949            }};
-	    
+  static const G4double celectron[15][22] = {
+      {1.125, 1.072, 1.051, 1.047, 1.047, 1.050, 1.052, 1.054, 1.054, 1.057, 1.062,
+       1.069, 1.075, 1.090, 1.105, 1.111, 1.112, 1.108, 1.100, 1.093, 1.089, 1.087},
+      {1.408, 1.246, 1.143, 1.096, 1.077, 1.059, 1.053, 1.051, 1.052, 1.053, 1.058,
+       1.065, 1.072, 1.087, 1.101, 1.108, 1.109, 1.105, 1.097, 1.090, 1.086, 1.082},
+      {2.833, 2.268, 1.861, 1.612, 1.486, 1.309, 1.204, 1.156, 1.136, 1.114, 1.106,
+       1.106, 1.109, 1.119, 1.129, 1.132, 1.131, 1.124, 1.113, 1.104, 1.099, 1.098},
+      {3.879, 3.016, 2.380, 2.007, 1.818, 1.535, 1.340, 1.236, 1.190, 1.133, 1.107,
+       1.099, 1.098, 1.103, 1.110, 1.113, 1.112, 1.105, 1.096, 1.089, 1.085, 1.098},
+      {6.937, 4.330, 2.886, 2.256, 1.987, 1.628, 1.395, 1.265, 1.203, 1.122, 1.080,
+       1.065, 1.061, 1.063, 1.070, 1.073, 1.073, 1.070, 1.064, 1.059, 1.056, 1.056},
+      {9.616, 5.708, 3.424, 2.551, 2.204, 1.762, 1.485, 1.330, 1.256, 1.155, 1.099,
+       1.077, 1.070, 1.068, 1.072, 1.074, 1.074, 1.070, 1.063, 1.059, 1.056, 1.052},
+      {11.72, 6.364, 3.811, 2.806, 2.401, 1.884, 1.564, 1.386, 1.300, 1.180, 1.112,
+       1.082, 1.073, 1.066, 1.068, 1.069, 1.068, 1.064, 1.059, 1.054, 1.051, 1.050},
+      {18.08, 8.601, 4.569, 3.183, 2.662, 2.025, 1.646, 1.439, 1.339, 1.195, 1.108,
+       1.068, 1.053, 1.040, 1.039, 1.039, 1.039, 1.037, 1.034, 1.031, 1.030, 1.036},
+      {18.22, 10.48, 5.333, 3.713, 3.115, 2.367, 1.898, 1.631, 1.498, 1.301, 1.171,
+       1.105, 1.077, 1.048, 1.036, 1.033, 1.031, 1.028, 1.024, 1.022, 1.021, 1.024},
+      {14.14, 10.65, 5.710, 3.929, 3.266, 2.453, 1.951, 1.669, 1.528, 1.319, 1.178,
+       1.106, 1.075, 1.040, 1.027, 1.022, 1.020, 1.017, 1.015, 1.013, 1.013, 1.020},
+      {14.11, 11.73, 6.312, 4.240, 3.478, 2.566, 2.022, 1.720, 1.569, 1.342, 1.186,
+       1.102, 1.065, 1.022, 1.003, 0.997, 0.995, 0.993, 0.993, 0.993, 0.993, 1.011},
+      {22.76, 20.01, 8.835, 5.287, 4.144, 2.901, 2.219, 1.855, 1.677, 1.410, 1.224,
+       1.121, 1.073, 1.014, 0.986, 0.976, 0.974, 0.972, 0.973, 0.974, 0.975, 0.987},
+      {50.77, 40.85, 14.13, 7.184, 5.284, 3.435, 2.520, 2.059, 1.837, 1.512, 1.283,
+       1.153, 1.091, 1.010, 0.969, 0.954, 0.950, 0.947, 0.949, 0.952, 0.954, 0.963},
+      {65.87, 59.06, 15.87, 7.570, 5.567, 3.650, 2.682, 2.182, 1.939, 1.579, 1.325,
+       1.178, 1.108, 1.014, 0.965, 0.947, 0.941, 0.938, 0.940, 0.944, 0.946, 0.954},
+      {55.60, 47.34, 15.92, 7.810, 5.755, 3.767, 2.760, 2.239, 1.985, 1.609, 1.343,
+       1.188, 1.113, 1.013, 0.960, 0.939, 0.933, 0.930, 0.933, 0.936, 0.939, 0.949}};
+
   static const G4double cpositron[15][22] = {
-           {2.589,2.044,1.658,1.446,1.347,1.217,1.144,1.110,
-            1.097,1.083,1.080,1.086,1.092,1.108,1.123,1.131,
-            1.131,1.126,1.117,1.108,1.103,1.100            },
-           {3.904,2.794,2.079,1.710,1.543,1.325,1.202,1.145,
-            1.122,1.096,1.089,1.092,1.098,1.114,1.130,1.137,
-            1.138,1.132,1.122,1.113,1.108,1.102            },
-           {7.970,6.080,4.442,3.398,2.872,2.127,1.672,1.451,
-            1.357,1.246,1.194,1.179,1.178,1.188,1.201,1.205,
-            1.203,1.190,1.173,1.159,1.151,1.145            },
-           {9.714,7.607,5.747,4.493,3.815,2.777,2.079,1.715,
-            1.553,1.353,1.253,1.219,1.211,1.214,1.225,1.228,
-            1.225,1.210,1.191,1.175,1.166,1.174            },
-           {17.97,12.95,8.628,6.065,4.849,3.222,2.275,1.820,
-            1.624,1.382,1.259,1.214,1.202,1.202,1.214,1.219,
-            1.217,1.203,1.184,1.169,1.160,1.151            },
-           {24.83,17.06,10.84,7.355,5.767,3.707,2.546,1.996,
-            1.759,1.465,1.311,1.252,1.234,1.228,1.238,1.241,
-            1.237,1.222,1.201,1.184,1.174,1.159            },
-           {23.26,17.15,11.52,8.049,6.375,4.114,2.792,2.155,
-            1.880,1.535,1.353,1.281,1.258,1.247,1.254,1.256,
-            1.252,1.234,1.212,1.194,1.183,1.170            },
-           {22.33,18.01,12.86,9.212,7.336,4.702,3.117,2.348,
-            2.015,1.602,1.385,1.297,1.268,1.251,1.256,1.258,
-            1.254,1.237,1.214,1.195,1.185,1.179            },
-           {33.91,24.13,15.71,10.80,8.507,5.467,3.692,2.808,
-            2.407,1.873,1.564,1.425,1.374,1.330,1.324,1.320,
-            1.312,1.288,1.258,1.235,1.221,1.205            },
-           {32.14,24.11,16.30,11.40,9.015,5.782,3.868,2.917,
-            2.490,1.925,1.596,1.447,1.391,1.342,1.332,1.327,
-            1.320,1.294,1.264,1.240,1.226,1.214            },
-           {29.51,24.07,17.19,12.28,9.766,6.238,4.112,3.066,
-            2.602,1.995,1.641,1.477,1.414,1.356,1.342,1.336,
-            1.328,1.302,1.270,1.245,1.231,1.233            },
-           {38.19,30.85,21.76,15.35,12.07,7.521,4.812,3.498,
-            2.926,2.188,1.763,1.563,1.484,1.405,1.382,1.371,
-            1.361,1.330,1.294,1.267,1.251,1.239            },
-           {49.71,39.80,27.96,19.63,15.36,9.407,5.863,4.155,
-            3.417,2.478,1.944,1.692,1.589,1.480,1.441,1.423,
-            1.409,1.372,1.330,1.298,1.280,1.258            },
-           {59.25,45.08,30.36,20.83,16.15,9.834,6.166,4.407,
-            3.641,2.648,2.064,1.779,1.661,1.531,1.482,1.459,
-            1.442,1.400,1.354,1.319,1.299,1.272            },
-           {56.38,44.29,30.50,21.18,16.51,10.11,6.354,4.542,
-            3.752,2.724,2.116,1.817,1.692,1.554,1.499,1.474,
-            1.456,1.412,1.364,1.328,1.307,1.282            }};
-
-  //data/corrections for T > Tlim  
-  static const G4double Tlim = 10.*MeV;
-  static const G4double beta2lim = Tlim*(Tlim+2.*electron_mass_c2)/
-                      ((Tlim+electron_mass_c2)*(Tlim+electron_mass_c2));
-  static const G4double bg2lim   = Tlim*(Tlim+2.*electron_mass_c2)/
-                      (electron_mass_c2*electron_mass_c2);
-
-  static const G4double sig0[15] = {
-                     0.2672*barn,  0.5922*barn, 2.653*barn,  6.235*barn,
-                      11.69*barn  , 13.24*barn  , 16.12*barn, 23.00*barn ,
-		      35.13*barn  , 39.95*barn  , 50.85*barn, 67.19*barn ,
-                      91.15*barn  , 104.4*barn  , 113.1*barn};
-		      		       
+      {2.589, 2.044, 1.658, 1.446, 1.347, 1.217, 1.144, 1.110, 1.097, 1.083, 1.080,
+       1.086, 1.092, 1.108, 1.123, 1.131, 1.131, 1.126, 1.117, 1.108, 1.103, 1.100},
+      {3.904, 2.794, 2.079, 1.710, 1.543, 1.325, 1.202, 1.145, 1.122, 1.096, 1.089,
+       1.092, 1.098, 1.114, 1.130, 1.137, 1.138, 1.132, 1.122, 1.113, 1.108, 1.102},
+      {7.970, 6.080, 4.442, 3.398, 2.872, 2.127, 1.672, 1.451, 1.357, 1.246, 1.194,
+       1.179, 1.178, 1.188, 1.201, 1.205, 1.203, 1.190, 1.173, 1.159, 1.151, 1.145},
+      {9.714, 7.607, 5.747, 4.493, 3.815, 2.777, 2.079, 1.715, 1.553, 1.353, 1.253,
+       1.219, 1.211, 1.214, 1.225, 1.228, 1.225, 1.210, 1.191, 1.175, 1.166, 1.174},
+      {17.97, 12.95, 8.628, 6.065, 4.849, 3.222, 2.275, 1.820, 1.624, 1.382, 1.259,
+       1.214, 1.202, 1.202, 1.214, 1.219, 1.217, 1.203, 1.184, 1.169, 1.160, 1.151},
+      {24.83, 17.06, 10.84, 7.355, 5.767, 3.707, 2.546, 1.996, 1.759, 1.465, 1.311,
+       1.252, 1.234, 1.228, 1.238, 1.241, 1.237, 1.222, 1.201, 1.184, 1.174, 1.159},
+      {23.26, 17.15, 11.52, 8.049, 6.375, 4.114, 2.792, 2.155, 1.880, 1.535, 1.353,
+       1.281, 1.258, 1.247, 1.254, 1.256, 1.252, 1.234, 1.212, 1.194, 1.183, 1.170},
+      {22.33, 18.01, 12.86, 9.212, 7.336, 4.702, 3.117, 2.348, 2.015, 1.602, 1.385,
+       1.297, 1.268, 1.251, 1.256, 1.258, 1.254, 1.237, 1.214, 1.195, 1.185, 1.179},
+      {33.91, 24.13, 15.71, 10.80, 8.507, 5.467, 3.692, 2.808, 2.407, 1.873, 1.564,
+       1.425, 1.374, 1.330, 1.324, 1.320, 1.312, 1.288, 1.258, 1.235, 1.221, 1.205},
+      {32.14, 24.11, 16.30, 11.40, 9.015, 5.782, 3.868, 2.917, 2.490, 1.925, 1.596,
+       1.447, 1.391, 1.342, 1.332, 1.327, 1.320, 1.294, 1.264, 1.240, 1.226, 1.214},
+      {29.51, 24.07, 17.19, 12.28, 9.766, 6.238, 4.112, 3.066, 2.602, 1.995, 1.641,
+       1.477, 1.414, 1.356, 1.342, 1.336, 1.328, 1.302, 1.270, 1.245, 1.231, 1.233},
+      {38.19, 30.85, 21.76, 15.35, 12.07, 7.521, 4.812, 3.498, 2.926, 2.188, 1.763,
+       1.563, 1.484, 1.405, 1.382, 1.371, 1.361, 1.330, 1.294, 1.267, 1.251, 1.239},
+      {49.71, 39.80, 27.96, 19.63, 15.36, 9.407, 5.863, 4.155, 3.417, 2.478, 1.944,
+       1.692, 1.589, 1.480, 1.441, 1.423, 1.409, 1.372, 1.330, 1.298, 1.280, 1.258},
+      {59.25, 45.08, 30.36, 20.83, 16.15, 9.834, 6.166, 4.407, 3.641, 2.648, 2.064,
+       1.779, 1.661, 1.531, 1.482, 1.459, 1.442, 1.400, 1.354, 1.319, 1.299, 1.272},
+      {56.38, 44.29, 30.50, 21.18, 16.51, 10.11, 6.354, 4.542, 3.752, 2.724, 2.116,
+       1.817, 1.692, 1.554, 1.499, 1.474, 1.456, 1.412, 1.364, 1.328, 1.307, 1.282}};
+
+  //data/corrections for T > Tlim
+  static const G4double Tlim = 10. * MeV;
+  static const G4double beta2lim =
+      Tlim * (Tlim + 2. * electron_mass_c2) / ((Tlim + electron_mass_c2) * (Tlim + electron_mass_c2));
+  static const G4double bg2lim = Tlim * (Tlim + 2. * electron_mass_c2) / (electron_mass_c2 * electron_mass_c2);
+
+  static const G4double sig0[15] = {0.2672 * barn,
+                                    0.5922 * barn,
+                                    2.653 * barn,
+                                    6.235 * barn,
+                                    11.69 * barn,
+                                    13.24 * barn,
+                                    16.12 * barn,
+                                    23.00 * barn,
+                                    35.13 * barn,
+                                    39.95 * barn,
+                                    50.85 * barn,
+                                    67.19 * barn,
+                                    91.15 * barn,
+                                    104.4 * barn,
+                                    113.1 * barn};
+
   static const G4double hecorr[15] = {
-                         120.70, 117.50, 105.00, 92.92, 79.23,  74.510,  68.29,
-                          57.39,  41.97,  36.14, 24.53, 10.21,  -7.855, -16.84,
-			 -22.30};
+      120.70, 117.50, 105.00, 92.92, 79.23, 74.510, 68.29, 57.39, 41.97, 36.14, 24.53, 10.21, -7.855, -16.84, -22.30};
 
   G4double sigma;
   SetParticle(part);
 
-  Z23 = pow(AtomicNumber,2./3.); 
+  Z23 = pow(AtomicNumber, 2. / 3.);
 
   // correction if particle .ne. e-/e+
   // compute equivalent kinetic energy
@@ -276,446 +236,432 @@ G4double UrbanMscModel93::ComputeCrossSectionPerAtom(
 
   G4double eKineticEnergy = KineticEnergy;
 
-  if(mass > electron_mass_c2)
-  {
-     G4double TAU = KineticEnergy/mass ;
-     G4double c = mass*TAU*(TAU+2.)/(electron_mass_c2*(TAU+1.)) ;
-     G4double w = c-2. ;
-     G4double tau = 0.5*(w+sqrt(w*w+4.*c)) ;
-     eKineticEnergy = electron_mass_c2*tau ;
+  if (mass > electron_mass_c2) {
+    G4double TAU = KineticEnergy / mass;
+    G4double c = mass * TAU * (TAU + 2.) / (electron_mass_c2 * (TAU + 1.));
+    G4double w = c - 2.;
+    G4double tau = 0.5 * (w + sqrt(w * w + 4. * c));
+    eKineticEnergy = electron_mass_c2 * tau;
   }
 
-  G4double eTotalEnergy = eKineticEnergy + electron_mass_c2 ;
-  G4double beta2 = eKineticEnergy*(eTotalEnergy+electron_mass_c2)
-                                 /(eTotalEnergy*eTotalEnergy);
-  G4double bg2   = eKineticEnergy*(eTotalEnergy+electron_mass_c2)
-                                 /(electron_mass_c2*electron_mass_c2);
+  G4double eTotalEnergy = eKineticEnergy + electron_mass_c2;
+  G4double beta2 = eKineticEnergy * (eTotalEnergy + electron_mass_c2) / (eTotalEnergy * eTotalEnergy);
+  G4double bg2 = eKineticEnergy * (eTotalEnergy + electron_mass_c2) / (electron_mass_c2 * electron_mass_c2);
 
-  G4double eps = epsfactor*bg2/Z23;
+  G4double eps = epsfactor * bg2 / Z23;
 
-  if     (eps<epsmin)  sigma = 2.*eps*eps;
-  else if(eps<epsmax)  sigma = G4Log(1.+2.*eps)-2.*eps/(1.+2.*eps);
-  else                 sigma = G4Log(2.*eps)-1.+1./eps;
+  if (eps < epsmin)
+    sigma = 2. * eps * eps;
+  else if (eps < epsmax)
+    sigma = G4Log(1. + 2. * eps) - 2. * eps / (1. + 2. * eps);
+  else
+    sigma = G4Log(2. * eps) - 1. + 1. / eps;
 
-  sigma *= ChargeSquare*AtomicNumber*AtomicNumber/(beta2*bg2);
+  sigma *= ChargeSquare * AtomicNumber * AtomicNumber / (beta2 * bg2);
 
-  // interpolate in AtomicNumber and beta2 
-  G4double c1,c2,cc1,cc2,corr;
+  // interpolate in AtomicNumber and beta2
+  G4double c1, c2, cc1, cc2, corr;
 
   // get bin number in Z
   G4int iZ = 14;
-  while ((iZ>=0)&&(Zdat[iZ]>=AtomicNumber)) iZ -= 1;
-  if (iZ==14)                               iZ = 13;
-  if (iZ==-1)                               iZ = 0 ;
+  while ((iZ >= 0) && (Zdat[iZ] >= AtomicNumber))
+    iZ -= 1;
+  if (iZ == 14)
+    iZ = 13;
+  if (iZ == -1)
+    iZ = 0;
 
   G4double ZZ1 = Zdat[iZ];
-  G4double ZZ2 = Zdat[iZ+1];
-  G4double ratZ = (AtomicNumber-ZZ1)*(AtomicNumber+ZZ1)/
-                  ((ZZ2-ZZ1)*(ZZ2+ZZ1));
+  G4double ZZ2 = Zdat[iZ + 1];
+  G4double ratZ = (AtomicNumber - ZZ1) * (AtomicNumber + ZZ1) / ((ZZ2 - ZZ1) * (ZZ2 + ZZ1));
 
-  if(eKineticEnergy <= Tlim) 
-  {
+  if (eKineticEnergy <= Tlim) {
     // get bin number in T (beta2)
     G4int iT = 21;
-    while ((iT>=0)&&(Tdat[iT]>=eKineticEnergy)) iT -= 1;
-    if(iT==21)                                  iT = 20;
-    if(iT==-1)                                  iT = 0 ;
+    while ((iT >= 0) && (Tdat[iT] >= eKineticEnergy))
+      iT -= 1;
+    if (iT == 21)
+      iT = 20;
+    if (iT == -1)
+      iT = 0;
 
     //  calculate betasquare values
-    G4double T = Tdat[iT],   E = T + electron_mass_c2;
-    G4double b2small = T*(E+electron_mass_c2)/(E*E);
+    G4double T = Tdat[iT], E = T + electron_mass_c2;
+    G4double b2small = T * (E + electron_mass_c2) / (E * E);
 
-    T = Tdat[iT+1]; E = T + electron_mass_c2;
-    G4double b2big = T*(E+electron_mass_c2)/(E*E);
-    G4double ratb2 = (beta2-b2small)/(b2big-b2small);
+    T = Tdat[iT + 1];
+    E = T + electron_mass_c2;
+    G4double b2big = T * (E + electron_mass_c2) / (E * E);
+    G4double ratb2 = (beta2 - b2small) / (b2big - b2small);
 
-    if (charge < 0.)
-    {
-       c1 = celectron[iZ][iT];
-       c2 = celectron[iZ+1][iT];
-       cc1 = c1+ratZ*(c2-c1);
+    if (charge < 0.) {
+      c1 = celectron[iZ][iT];
+      c2 = celectron[iZ + 1][iT];
+      cc1 = c1 + ratZ * (c2 - c1);
 
-       c1 = celectron[iZ][iT+1];
-       c2 = celectron[iZ+1][iT+1];
-       cc2 = c1+ratZ*(c2-c1);
+      c1 = celectron[iZ][iT + 1];
+      c2 = celectron[iZ + 1][iT + 1];
+      cc2 = c1 + ratZ * (c2 - c1);
 
-       corr = cc1+ratb2*(cc2-cc1);
+      corr = cc1 + ratb2 * (cc2 - cc1);
 
-       sigma *= sigmafactor/corr;
-    }
-    else              
-    {
-       c1 = cpositron[iZ][iT];
-       c2 = cpositron[iZ+1][iT];
-       cc1 = c1+ratZ*(c2-c1);
+      sigma *= sigmafactor / corr;
+    } else {
+      c1 = cpositron[iZ][iT];
+      c2 = cpositron[iZ + 1][iT];
+      cc1 = c1 + ratZ * (c2 - c1);
 
-       c1 = cpositron[iZ][iT+1];
-       c2 = cpositron[iZ+1][iT+1];
-       cc2 = c1+ratZ*(c2-c1);
+      c1 = cpositron[iZ][iT + 1];
+      c2 = cpositron[iZ + 1][iT + 1];
+      cc2 = c1 + ratZ * (c2 - c1);
 
-       corr = cc1+ratb2*(cc2-cc1);
+      corr = cc1 + ratb2 * (cc2 - cc1);
 
-       sigma *= sigmafactor/corr;
+      sigma *= sigmafactor / corr;
     }
-  }
-  else
-  {
-    c1 = bg2lim*sig0[iZ]*(1.+hecorr[iZ]*(beta2-beta2lim))/bg2;
-    c2 = bg2lim*sig0[iZ+1]*(1.+hecorr[iZ+1]*(beta2-beta2lim))/bg2;
-    if((AtomicNumber >= ZZ1) && (AtomicNumber <= ZZ2))
-      sigma = c1+ratZ*(c2-c1) ;
-    else if(AtomicNumber < ZZ1)
-      sigma = AtomicNumber*AtomicNumber*c1/(ZZ1*ZZ1);
-    else if(AtomicNumber > ZZ2)
-      sigma = AtomicNumber*AtomicNumber*c2/(ZZ2*ZZ2);
+  } else {
+    c1 = bg2lim * sig0[iZ] * (1. + hecorr[iZ] * (beta2 - beta2lim)) / bg2;
+    c2 = bg2lim * sig0[iZ + 1] * (1. + hecorr[iZ + 1] * (beta2 - beta2lim)) / bg2;
+    if ((AtomicNumber >= ZZ1) && (AtomicNumber <= ZZ2))
+      sigma = c1 + ratZ * (c2 - c1);
+    else if (AtomicNumber < ZZ1)
+      sigma = AtomicNumber * AtomicNumber * c1 / (ZZ1 * ZZ1);
+    else if (AtomicNumber > ZZ2)
+      sigma = AtomicNumber * AtomicNumber * c2 / (ZZ2 * ZZ2);
   }
   return sigma;
-
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-void UrbanMscModel93::StartTracking(G4Track* track)
-{
+void UrbanMscModel93::StartTracking(G4Track* track) {
   SetParticle(track->GetDynamicParticle()->GetDefinition());
-  firstStep = true; 
+  firstStep = true;
   inside = false;
   insideskin = false;
   tlimit = geombig;
-  stepmin = tlimitminfix ;
-  tlimitmin = 10.*stepmin ;
+  stepmin = tlimitminfix;
+  tlimitmin = 10. * stepmin;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4double UrbanMscModel93::ComputeTruePathLengthLimit(
-                             const G4Track& track,
-			     G4double& currentMinimalStep)
-{
+G4double UrbanMscModel93::ComputeTruePathLengthLimit(const G4Track& track, G4double& currentMinimalStep) {
   tPathLength = currentMinimalStep;
   const G4DynamicParticle* dp = track.GetDynamicParticle();
   G4StepPoint* sp = track.GetStep()->GetPreStepPoint();
   G4StepStatus stepStatus = sp->GetStepStatus();
   couple = track.GetMaterialCutsCouple();
-  SetCurrentCouple(couple); 
+  SetCurrentCouple(couple);
   currentMaterialIndex = couple->GetIndex();
   currentKinEnergy = dp->GetKineticEnergy();
-  currentRange = GetRange(particle,currentKinEnergy,couple);
-  lambda0 = GetTransportMeanFreePath(particle,currentKinEnergy);
+  currentRange = GetRange(particle, currentKinEnergy, couple);
+  lambda0 = GetTransportMeanFreePath(particle, currentKinEnergy);
 
   // stop here if small range particle
-  if(inside || tPathLength < tlimitminfix) { 
-    return ConvertTrueToGeom(tPathLength, currentMinimalStep); 
-  } 
-  
-  if(tPathLength > currentRange) { tPathLength = currentRange; }
+  if (inside || tPathLength < tlimitminfix) {
+    return ConvertTrueToGeom(tPathLength, currentMinimalStep);
+  }
+
+  if (tPathLength > currentRange) {
+    tPathLength = currentRange;
+  }
 
   presafety = sp->GetSafety();
 
-  // G4cout << "Urban2::StepLimit tPathLength= " 
+  // G4cout << "Urban2::StepLimit tPathLength= "
   // 	 <<tPathLength<<" safety= " << presafety
   //        << " range= " <<currentRange<< " lambda= "<<lambda0
   // 	 << " Alg: " << steppingAlgorithm <<G4endl;
 
   // far from geometry boundary
-  if(currentRange < presafety)
-    {
-      inside = true;
-      return ConvertTrueToGeom(tPathLength, currentMinimalStep);  
-    }
+  if (currentRange < presafety) {
+    inside = true;
+    return ConvertTrueToGeom(tPathLength, currentMinimalStep);
+  }
 
   // standard  version
   //
-  if (steppingAlgorithm == fUseDistanceToBoundary)
-    {
-      //compute geomlimit and presafety 
-      geomlimit = ComputeGeomLimit(track, presafety, currentRange);
-
-      // is it far from boundary ?
-      if(currentRange < presafety)
-	{
-	  inside = true;
-	  return ConvertTrueToGeom(tPathLength, currentMinimalStep);   
-	}
-
-      smallstep += 1.;
-      insideskin = false;
-
-      if(firstStep || stepStatus == fGeomBoundary)
-        {
-          rangeinit = currentRange;
-          if(firstStep) smallstep = 1.e10;
-          else  smallstep = 1.;
-
-          //define stepmin here (it depends on lambda!)
-          //rough estimation of lambda_elastic/lambda_transport
-          G4double rat = currentKinEnergy/MeV ;
-          rat = 1.e-3/(rat*(10.+rat)) ;
-          //stepmin ~ lambda_elastic
-          stepmin = rat*lambda0;
-          skindepth = skin*stepmin;
-          //define tlimitmin
-          tlimitmin = 10.*stepmin;
-          if(tlimitmin < tlimitminfix) tlimitmin = tlimitminfix;
-	  //G4cout << "rangeinit= " << rangeinit << " stepmin= " << stepmin
-	  //	 << " tlimitmin= " << tlimitmin << " geomlimit= " << geomlimit <<G4endl;
-          // constraint from the geometry
-          if((geomlimit < geombig) && (geomlimit > geommin))
-            {
-              // geomlimit is a geometrical step length
-              // transform it to true path length (estimation)
-              if((1.-geomlimit/lambda0) > 0.)
-                geomlimit = -lambda0*G4Log(1.-geomlimit/lambda0)+tlimitmin ;
-
-              if(stepStatus == fGeomBoundary)
-                tgeom = geomlimit/facgeom;
-              else
-                tgeom = 2.*geomlimit/facgeom;
-            }
-            else
-              tgeom = geombig;
-        }
+  if (steppingAlgorithm == fUseDistanceToBoundary) {
+    //compute geomlimit and presafety
+    geomlimit = ComputeGeomLimit(track, presafety, currentRange);
 
+    // is it far from boundary ?
+    if (currentRange < presafety) {
+      inside = true;
+      return ConvertTrueToGeom(tPathLength, currentMinimalStep);
+    }
 
-      //step limit 
-      tlimit = facrange*rangeinit;              
-      if(tlimit < facsafety*presafety)
-        tlimit = facsafety*presafety; 
+    smallstep += 1.;
+    insideskin = false;
 
-      //lower limit for tlimit
-      if(tlimit < tlimitmin) tlimit = tlimitmin;
+    if (firstStep || stepStatus == fGeomBoundary) {
+      rangeinit = currentRange;
+      if (firstStep)
+        smallstep = 1.e10;
+      else
+        smallstep = 1.;
+
+      //define stepmin here (it depends on lambda!)
+      //rough estimation of lambda_elastic/lambda_transport
+      G4double rat = currentKinEnergy / MeV;
+      rat = 1.e-3 / (rat * (10. + rat));
+      //stepmin ~ lambda_elastic
+      stepmin = rat * lambda0;
+      skindepth = skin * stepmin;
+      //define tlimitmin
+      tlimitmin = 10. * stepmin;
+      if (tlimitmin < tlimitminfix)
+        tlimitmin = tlimitminfix;
+      //G4cout << "rangeinit= " << rangeinit << " stepmin= " << stepmin
+      //	 << " tlimitmin= " << tlimitmin << " geomlimit= " << geomlimit <<G4endl;
+      // constraint from the geometry
+      if ((geomlimit < geombig) && (geomlimit > geommin)) {
+        // geomlimit is a geometrical step length
+        // transform it to true path length (estimation)
+        if ((1. - geomlimit / lambda0) > 0.)
+          geomlimit = -lambda0 * G4Log(1. - geomlimit / lambda0) + tlimitmin;
+
+        if (stepStatus == fGeomBoundary)
+          tgeom = geomlimit / facgeom;
+        else
+          tgeom = 2. * geomlimit / facgeom;
+      } else
+        tgeom = geombig;
+    }
 
-      if(tlimit > tgeom) tlimit = tgeom;
+    //step limit
+    tlimit = facrange * rangeinit;
+    if (tlimit < facsafety * presafety)
+      tlimit = facsafety * presafety;
+
+    //lower limit for tlimit
+    if (tlimit < tlimitmin)
+      tlimit = tlimitmin;
+
+    if (tlimit > tgeom)
+      tlimit = tgeom;
+
+    //G4cout << "tgeom= " << tgeom << " geomlimit= " << geomlimit
+    //      << " tlimit= " << tlimit << " presafety= " << presafety << G4endl;
+
+    // shortcut
+    if ((tPathLength < tlimit) && (tPathLength < presafety) && (smallstep >= skin) &&
+        (tPathLength < geomlimit - 0.999 * skindepth))
+      return ConvertTrueToGeom(tPathLength, currentMinimalStep);
+
+    // step reduction near to boundary
+    if (smallstep < skin) {
+      tlimit = stepmin;
+      insideskin = true;
+    } else if (geomlimit < geombig) {
+      if (geomlimit > skindepth) {
+        if (tlimit > geomlimit - 0.999 * skindepth)
+          tlimit = geomlimit - 0.999 * skindepth;
+      } else {
+        insideskin = true;
+        if (tlimit > stepmin)
+          tlimit = stepmin;
+      }
+    }
 
-      //G4cout << "tgeom= " << tgeom << " geomlimit= " << geomlimit  
-      //      << " tlimit= " << tlimit << " presafety= " << presafety << G4endl;
+    if (tlimit < stepmin)
+      tlimit = stepmin;
 
-      // shortcut
-      if((tPathLength < tlimit) && (tPathLength < presafety) &&
-         (smallstep >= skin) && (tPathLength < geomlimit-0.999*skindepth))
-	return ConvertTrueToGeom(tPathLength, currentMinimalStep);   
+    // randomize 1st step or 1st 'normal' step in volume
+    if (firstStep || ((smallstep == skin) && !insideskin)) {
+      G4double temptlimit = tlimit;
+      if (temptlimit > tlimitmin) {
+        do {
+          temptlimit = G4RandGauss::shoot(tlimit, 0.3 * tlimit);
+        } while ((temptlimit < tlimitmin) || (temptlimit > 2. * tlimit - tlimitmin));
+      } else
+        temptlimit = tlimitmin;
+      if (tPathLength > temptlimit)
+        tPathLength = temptlimit;
+    } else {
+      if (tPathLength > tlimit)
+        tPathLength = tlimit;
+    }
 
-      // step reduction near to boundary
-      if(smallstep < skin)
-	{
-	  tlimit = stepmin;
-	  insideskin = true;
-	}
-      else if(geomlimit < geombig)
-	{
-	  if(geomlimit > skindepth)
-	    {
-	      if(tlimit > geomlimit-0.999*skindepth)
-		tlimit = geomlimit-0.999*skindepth;
-	    }
-	  else
-	    {
-	      insideskin = true;
-	      if(tlimit > stepmin) tlimit = stepmin;
-	    }
-	}
+  }
+  // for 'normal' simulation with or without magnetic field
+  //  there no small step/single scattering at boundaries
+  else if (steppingAlgorithm == fUseSafety) {
+    // compute presafety again if presafety <= 0 and no boundary
+    // i.e. when it is needed for optimization purposes
+    if ((stepStatus != fGeomBoundary) && (presafety < tlimitminfix))
+      presafety = ComputeSafety(sp->GetPosition(), tPathLength);
+
+    // is far from boundary
+    if (currentRange < presafety) {
+      inside = true;
+      return ConvertTrueToGeom(tPathLength, currentMinimalStep);
+    }
 
-      if(tlimit < stepmin) tlimit = stepmin;
-
-      // randomize 1st step or 1st 'normal' step in volume
-      if(firstStep || ((smallstep == skin) && !insideskin)) 
-        { 
-          G4double temptlimit = tlimit;
-          if(temptlimit > tlimitmin)
-          {
-            do {
-              temptlimit = G4RandGauss::shoot(tlimit,0.3*tlimit);        
-               } while ((temptlimit < tlimitmin) || 
-                        (temptlimit > 2.*tlimit-tlimitmin));
-          }
-          else
-            temptlimit = tlimitmin;
-          if(tPathLength > temptlimit) tPathLength = temptlimit;
-        }
-      else
-        {  
-          if(tPathLength > tlimit) tPathLength = tlimit  ; 
-        }
+    if (firstStep || stepStatus == fGeomBoundary) {
+      rangeinit = currentRange;
+      fr = facrange;
+      // 9.1 like stepping for e+/e- only (not for muons,hadrons)
+      if (mass < masslimite) {
+        if (lambda0 > currentRange)
+          rangeinit = lambda0;
+        if (lambda0 > lambdalimit)
+          fr *= 0.75 + 0.25 * lambda0 / lambdalimit;
+      }
 
+      //lower limit for tlimit
+      G4double rat = currentKinEnergy / MeV;
+      rat = 1.e-3 / (rat * (10. + rat));
+      tlimitmin = 10. * lambda0 * rat;
+      if (tlimitmin < tlimitminfix)
+        tlimitmin = tlimitminfix;
     }
-    // for 'normal' simulation with or without magnetic field 
-    //  there no small step/single scattering at boundaries
-  else if(steppingAlgorithm == fUseSafety)
-    {
-      // compute presafety again if presafety <= 0 and no boundary
-      // i.e. when it is needed for optimization purposes
-      if((stepStatus != fGeomBoundary) && (presafety < tlimitminfix)) 
-	presafety = ComputeSafety(sp->GetPosition(),tPathLength); 
-
-      // is far from boundary
-      if(currentRange < presafety)
-        {
-          inside = true;
-          return ConvertTrueToGeom(tPathLength, currentMinimalStep);  
-        }
+    //step limit
+    tlimit = fr * rangeinit;
 
-      if(firstStep || stepStatus == fGeomBoundary)
-      {
-        rangeinit = currentRange;
-        fr = facrange;
-        // 9.1 like stepping for e+/e- only (not for muons,hadrons)
-        if(mass < masslimite) 
-        {
-          if(lambda0 > currentRange)
-            rangeinit = lambda0;
-          if(lambda0 > lambdalimit)
-            fr *= 0.75+0.25*lambda0/lambdalimit;
-        }
+    if (tlimit < facsafety * presafety)
+      tlimit = facsafety * presafety;
 
-        //lower limit for tlimit
-        G4double rat = currentKinEnergy/MeV ;
-        rat = 1.e-3/(rat*(10.+rat)) ;
-        tlimitmin = 10.*lambda0*rat;
-        if(tlimitmin < tlimitminfix) tlimitmin = tlimitminfix;
-      }
-      //step limit
-      tlimit = fr*rangeinit;               
+    //lower limit for tlimit
+    if (tlimit < tlimitmin)
+      tlimit = tlimitmin;
 
-      if(tlimit < facsafety*presafety)
-        tlimit = facsafety*presafety;
+    if (tPathLength > tlimit)
+      tPathLength = tlimit;
 
-      //lower limit for tlimit
-      if(tlimit < tlimitmin) tlimit = tlimitmin;
-      
-      if(tPathLength > tlimit) tPathLength = tlimit;
+  }
 
-    }
-  
   // version similar to 7.1 (needed for some experiments)
-  else
-    {
-      if (stepStatus == fGeomBoundary)
-	{
-	  if (currentRange > lambda0) tlimit = facrange*currentRange;
-	  else                        tlimit = facrange*lambda0;
-
-	  if(tlimit < tlimitmin) tlimit = tlimitmin;
-	  if(tPathLength > tlimit) tPathLength = tlimit;
-	}
+  else {
+    if (stepStatus == fGeomBoundary) {
+      if (currentRange > lambda0)
+        tlimit = facrange * currentRange;
+      else
+        tlimit = facrange * lambda0;
+
+      if (tlimit < tlimitmin)
+        tlimit = tlimitmin;
+      if (tPathLength > tlimit)
+        tPathLength = tlimit;
     }
-  //G4cout << "tPathLength= " << tPathLength 
+  }
+  //G4cout << "tPathLength= " << tPathLength
   //	 << " currentMinimalStep= " << currentMinimalStep << G4endl;
   return ConvertTrueToGeom(tPathLength, currentMinimalStep);
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4double UrbanMscModel93::ComputeGeomPathLength(G4double)
-{
-  firstStep = false; 
+G4double UrbanMscModel93::ComputeGeomPathLength(G4double) {
+  firstStep = false;
   lambdaeff = lambda0;
-  par1 = -1. ;  
-  par2 = par3 = 0. ;  
+  par1 = -1.;
+  par2 = par3 = 0.;
 
   //  do the true -> geom transformation
   zPathLength = tPathLength;
 
   // z = t for very small tPathLength
-  if(tPathLength < tlimitminfix) return zPathLength;
+  if (tPathLength < tlimitminfix)
+    return zPathLength;
 
   // this correction needed to run MSC with eIoni and eBrem inactivated
   // and makes no harm for a normal run
-  if(tPathLength > currentRange)
-    tPathLength = currentRange ;
+  if (tPathLength > currentRange)
+    tPathLength = currentRange;
 
-  G4double tau   = tPathLength/lambda0 ;
+  G4double tau = tPathLength / lambda0;
 
   if ((tau <= tausmall) || insideskin) {
-    zPathLength  = tPathLength;
-    if(zPathLength > lambda0) zPathLength = lambda0;
+    zPathLength = tPathLength;
+    if (zPathLength > lambda0)
+      zPathLength = lambda0;
     return zPathLength;
   }
 
   G4double zmean;
-  if (tPathLength < currentRange*dtrl) {
-    if(tau < taulim) zmean = tPathLength*(1.-0.5*tau) ;
-    else             zmean = lambda0*(1.-G4Exp(-tau));
-  } else if(currentKinEnergy < mass || tPathLength == currentRange)  {
-    par1 = 1./currentRange ;
-    par2 = 1./(par1*lambda0) ;
-    par3 = 1.+par2 ;
-    if(tPathLength < currentRange)
-      zmean = (1.-G4Exp(par3*G4Log(1.-tPathLength/currentRange)))/(par1*par3) ;
+  if (tPathLength < currentRange * dtrl) {
+    if (tau < taulim)
+      zmean = tPathLength * (1. - 0.5 * tau);
+    else
+      zmean = lambda0 * (1. - G4Exp(-tau));
+  } else if (currentKinEnergy < mass || tPathLength == currentRange) {
+    par1 = 1. / currentRange;
+    par2 = 1. / (par1 * lambda0);
+    par3 = 1. + par2;
+    if (tPathLength < currentRange)
+      zmean = (1. - G4Exp(par3 * G4Log(1. - tPathLength / currentRange))) / (par1 * par3);
     else
-      zmean = 1./(par1*par3) ;
+      zmean = 1. / (par1 * par3);
   } else {
-    G4double T1 = GetEnergy(particle,currentRange-tPathLength,couple);
-    G4double lambda1 = GetTransportMeanFreePath(particle,T1);
+    G4double T1 = GetEnergy(particle, currentRange - tPathLength, couple);
+    G4double lambda1 = GetTransportMeanFreePath(particle, T1);
 
-    par1 = (lambda0-lambda1)/(lambda0*tPathLength) ;
-    par2 = 1./(par1*lambda0) ;
-    par3 = 1.+par2 ;
-    zmean = (1.-G4Exp(par3*G4Log(lambda1/lambda0)))/(par1*par3) ;
+    par1 = (lambda0 - lambda1) / (lambda0 * tPathLength);
+    par2 = 1. / (par1 * lambda0);
+    par3 = 1. + par2;
+    zmean = (1. - G4Exp(par3 * G4Log(lambda1 / lambda0))) / (par1 * par3);
   }
 
-  zPathLength = zmean ;
+  zPathLength = zmean;
 
   //  sample z
-  if(samplez)
-  {
-    const G4double  ztmax = 0.99 ;
-    G4double zt = zmean/tPathLength ;
-
-    if (tPathLength > stepmin && zt < ztmax)              
-    {
-      G4double u,cz1;
-      if(zt >= third)
-      {
-        G4double cz = 0.5*(3.*zt-1.)/(1.-zt) ;
-        cz1 = 1.+cz ;
-        G4double u0 = cz/cz1 ;
-        G4double grej ;
+  if (samplez) {
+    const G4double ztmax = 0.99;
+    G4double zt = zmean / tPathLength;
+
+    if (tPathLength > stepmin && zt < ztmax) {
+      G4double u, cz1;
+      if (zt >= third) {
+        G4double cz = 0.5 * (3. * zt - 1.) / (1. - zt);
+        cz1 = 1. + cz;
+        G4double u0 = cz / cz1;
+        G4double grej;
         do {
-            u = G4Exp(G4Log(G4UniformRand())/cz1) ;
-            grej = G4Exp(cz*G4Log(u/u0))*(1.-u)/(1.-u0) ;
-           } while (grej < G4UniformRand()) ;
-      }
-      else
-      {
-        cz1 = 1./zt-1.;
-        u = 1.-G4Exp(G4Log(G4UniformRand())/cz1) ;
+          u = G4Exp(G4Log(G4UniformRand()) / cz1);
+          grej = G4Exp(cz * G4Log(u / u0)) * (1. - u) / (1. - u0);
+        } while (grej < G4UniformRand());
+      } else {
+        cz1 = 1. / zt - 1.;
+        u = 1. - G4Exp(G4Log(G4UniformRand()) / cz1);
       }
-      zPathLength = tPathLength*u ;
+      zPathLength = tPathLength * u;
     }
   }
 
-  if(zPathLength > lambda0) zPathLength = lambda0;
+  if (zPathLength > lambda0)
+    zPathLength = lambda0;
   //G4cout << "zPathLength= " << zPathLength << " lambda1= " << lambda0 << G4endl;
   return zPathLength;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4double UrbanMscModel93::ComputeTrueStepLength(G4double geomStepLength)
-{
-  // step defined other than transportation 
-  if(geomStepLength == zPathLength && tPathLength <= currentRange)
+G4double UrbanMscModel93::ComputeTrueStepLength(G4double geomStepLength) {
+  // step defined other than transportation
+  if (geomStepLength == zPathLength && tPathLength <= currentRange)
     return tPathLength;
 
   // t = z for very small step
   zPathLength = geomStepLength;
   tPathLength = geomStepLength;
-  if(geomStepLength < tlimitminfix) return tPathLength;
-  
+  if (geomStepLength < tlimitminfix)
+    return tPathLength;
+
   // recalculation
-  if((geomStepLength > lambda0*tausmall) && !insideskin)
-  {
-    if(par1 <  0.)
-      tPathLength = -lambda0*G4Log(1.-geomStepLength/lambda0) ;
-    else 
-    {
-      if(par1*par3*geomStepLength < 1.)
-        tPathLength = (1.-G4Exp(G4Log(1.-par1*par3*geomStepLength)/par3))/par1 ;
-      else 
+  if ((geomStepLength > lambda0 * tausmall) && !insideskin) {
+    if (par1 < 0.)
+      tPathLength = -lambda0 * G4Log(1. - geomStepLength / lambda0);
+    else {
+      if (par1 * par3 * geomStepLength < 1.)
+        tPathLength = (1. - G4Exp(G4Log(1. - par1 * par3 * geomStepLength) / par3)) / par1;
+      else
         tPathLength = currentRange;
-    }  
+    }
   }
-  if(tPathLength < geomStepLength) tPathLength = geomStepLength;
+  if (tPathLength < geomStepLength)
+    tPathLength = geomStepLength;
 
   //G4cout << "tPathLength= " << tPathLength << " step= " << geomStepLength << G4endl;
 
@@ -724,31 +670,31 @@ G4double UrbanMscModel93::ComputeTrueStepLength(G4double geomStepLength)
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4ThreeVector& 
-UrbanMscModel93::SampleScattering(const G4ThreeVector& oldDirection,
-				    G4double safety)
-{
-  fDisplacement.set(0.0,0.0,0.0);
+G4ThreeVector& UrbanMscModel93::SampleScattering(const G4ThreeVector& oldDirection, G4double safety) {
+  fDisplacement.set(0.0, 0.0, 0.0);
   G4double kineticEnergy = currentKinEnergy;
-  if (tPathLength > currentRange*dtrl) {
-    kineticEnergy = GetEnergy(particle,currentRange-tPathLength,couple);
+  if (tPathLength > currentRange * dtrl) {
+    kineticEnergy = GetEnergy(particle, currentRange - tPathLength, couple);
   } else {
-    kineticEnergy -= tPathLength*GetDEDX(particle,currentKinEnergy,couple);
+    kineticEnergy -= tPathLength * GetDEDX(particle, currentKinEnergy, couple);
+  }
+  if ((kineticEnergy <= eV) || (tPathLength <= tlimitminfix) || (tPathLength / tausmall < lambda0)) {
+    return fDisplacement;
   }
-  if((kineticEnergy <= eV) || (tPathLength <= tlimitminfix) ||
-     (tPathLength/tausmall < lambda0)) { return  fDisplacement; }
 
-  G4double cth  = SampleCosineTheta(tPathLength,kineticEnergy);
+  G4double cth = SampleCosineTheta(tPathLength, kineticEnergy);
 
   // protection against 'bad' cth values
-  if(std::fabs(cth) > 1.) { return  fDisplacement; }
-
-  // extra protection agaist high energy particles backscattered 
-  //  if(cth < 1.0 - 1000*tPathLength/lambda0 && kineticEnergy > 20*MeV) { 
-    //G4cout << "Warning: large scattering E(MeV)= " << kineticEnergy 
-    //	   << " s(mm)= " << tPathLength/mm
-    //	   << " 1-cosTheta= " << 1.0 - cth << G4endl;
-    // do Gaussian central scattering
+  if (std::fabs(cth) > 1.) {
+    return fDisplacement;
+  }
+
+  // extra protection agaist high energy particles backscattered
+  //  if(cth < 1.0 - 1000*tPathLength/lambda0 && kineticEnergy > 20*MeV) {
+  //G4cout << "Warning: large scattering E(MeV)= " << kineticEnergy
+  //	   << " s(mm)= " << tPathLength/mm
+  //	   << " 1-cosTheta= " << 1.0 - cth << G4endl;
+  // do Gaussian central scattering
   //  if(kineticEnergy > 0.5*GeV && cth < 0.9) {
   /*
   if(cth < 1.0 - 1000*tPathLength/lambda0 && 
@@ -766,17 +712,16 @@ UrbanMscModel93::SampleScattering(const G4ThreeVector& oldDirection,
   }
   */
 
-  G4double sth  = sqrt((1.0 - cth)*(1.0 + cth));
-  G4double phi  = twopi*G4UniformRand();
-  G4double dirx = sth*cos(phi);
-  G4double diry = sth*sin(phi);
+  G4double sth = sqrt((1.0 - cth) * (1.0 + cth));
+  G4double phi = twopi * G4UniformRand();
+  G4double dirx = sth * cos(phi);
+  G4double diry = sth * sin(phi);
 
-  G4ThreeVector newDirection(dirx,diry,cth);
+  G4ThreeVector newDirection(dirx, diry, cth);
   newDirection.rotateUz(oldDirection);
   fParticleChange->ProposeMomentumDirection(newDirection);
 
   if (latDisplasment && safety > tlimitminfix) {
-
     G4double r = SampleDisplacement();
     /*    
     G4cout << "UrbanMscModel93::SampleSecondaries: e(MeV)= " << kineticEnergy
@@ -785,148 +730,142 @@ UrbanMscModel93::SampleScattering(const G4ThreeVector& oldDirection,
            << " geomStep(mm)= " << zPathLength
            << G4endl;
     */
-    if(r > 0.)
-      {
-        G4double latcorr = LatCorrelation();
-        if(latcorr > r) latcorr = r;
-
-        // sample direction of lateral displacement
-        // compute it from the lateral correlation
-        G4double Phi = 0.;
-        if(std::abs(r*sth) < latcorr)
-          Phi  = twopi*G4UniformRand();
+    if (r > 0.) {
+      G4double latcorr = LatCorrelation();
+      if (latcorr > r)
+        latcorr = r;
+
+      // sample direction of lateral displacement
+      // compute it from the lateral correlation
+      G4double Phi = 0.;
+      if (std::abs(r * sth) < latcorr)
+        Phi = twopi * G4UniformRand();
+      else {
+        G4double psi = std::acos(latcorr / (r * sth));
+        if (G4UniformRand() < 0.5)
+          Phi = phi + psi;
         else
-        {
-          G4double psi = std::acos(latcorr/(r*sth));
-          if(G4UniformRand() < 0.5)
-            Phi = phi+psi;
-          else
-            Phi = phi-psi;
-        }
+          Phi = phi - psi;
+      }
 
-        dirx = r*std::cos(Phi);
-        diry = r*std::sin(Phi);
+      dirx = r * std::cos(Phi);
+      diry = r * std::sin(Phi);
 
-	fDisplacement.set(dirx,diry,0.0);
-	fDisplacement.rotateUz(oldDirection);
-      }
+      fDisplacement.set(dirx, diry, 0.0);
+      fDisplacement.rotateUz(oldDirection);
+    }
   }
   return fDisplacement;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4double UrbanMscModel93::SampleCosineTheta(G4double trueStepLength,
-					    G4double KineticEnergy)
-{
-  G4double cth = 1. ;
-  G4double tau = trueStepLength/lambda0 ;
+G4double UrbanMscModel93::SampleCosineTheta(G4double trueStepLength, G4double KineticEnergy) {
+  G4double cth = 1.;
+  G4double tau = trueStepLength / lambda0;
 
-  Zeff = couple->GetMaterial()->GetTotNbOfElectPerVolume()/
-         couple->GetMaterial()->GetTotNbOfAtomsPerVolume() ;
+  Zeff = couple->GetMaterial()->GetTotNbOfElectPerVolume() / couple->GetMaterial()->GetTotNbOfAtomsPerVolume();
 
-  if(Zold != Zeff)  
+  if (Zold != Zeff)
     UpdateCache();
 
-  if(insideskin)
-  {
+  if (insideskin) {
     //no scattering, single or plural scattering
-    G4double mean = trueStepLength/stepmin ;
+    G4double mean = trueStepLength / stepmin;
 
     G4int n = G4Poisson(mean);
-    if(n > 0)
-    {
+    if (n > 0) {
       //screening (Moliere-Bethe)
-      G4double mom2 = KineticEnergy*(2.*mass+KineticEnergy);
-      G4double beta2 = mom2/((KineticEnergy+mass)*(KineticEnergy+mass));
-      G4double ascr = scr1/mom2;
-      ascr *= 1.13+scr2/beta2;
-      G4double ascr1 = 1.+2.*ascr;
-      G4double bp1=ascr1+1.;
-      G4double bm1=ascr1-1.;
+      G4double mom2 = KineticEnergy * (2. * mass + KineticEnergy);
+      G4double beta2 = mom2 / ((KineticEnergy + mass) * (KineticEnergy + mass));
+      G4double ascr = scr1 / mom2;
+      ascr *= 1.13 + scr2 / beta2;
+      G4double ascr1 = 1. + 2. * ascr;
+      G4double bp1 = ascr1 + 1.;
+      G4double bm1 = ascr1 - 1.;
 
       // single scattering from screened Rutherford x-section
-      G4double ct,st,phi;
-      G4double sx=0.,sy=0.,sz=0.;
-      for(G4int i=1; i<=n; i++)
-      {
-        ct = ascr1-bp1*bm1/(2.*G4UniformRand()+bm1);
-        if(ct < -1.) ct = -1.;
-        if(ct >  1.) ct =  1.; 
-        st = sqrt(1.-ct*ct);
-        phi = twopi*G4UniformRand();
-        sx += st*cos(phi);
-        sy += st*sin(phi);
+      G4double ct, st, phi;
+      G4double sx = 0., sy = 0., sz = 0.;
+      for (G4int i = 1; i <= n; i++) {
+        ct = ascr1 - bp1 * bm1 / (2. * G4UniformRand() + bm1);
+        if (ct < -1.)
+          ct = -1.;
+        if (ct > 1.)
+          ct = 1.;
+        st = sqrt(1. - ct * ct);
+        phi = twopi * G4UniformRand();
+        sx += st * cos(phi);
+        sy += st * sin(phi);
         sz += ct;
       }
-      cth = sz/sqrt(sx*sx+sy*sy+sz*sz);
+      cth = sz / sqrt(sx * sx + sy * sy + sz * sz);
     }
-  }
-  else
-  {
-    if(trueStepLength >= currentRange*dtrl) 
-    {
-      if(par1*trueStepLength < 1.)
-	tau = -par2*G4Log(1.-par1*trueStepLength) ;
+  } else {
+    if (trueStepLength >= currentRange * dtrl) {
+      if (par1 * trueStepLength < 1.)
+        tau = -par2 * G4Log(1. - par1 * trueStepLength);
       // for the case if ioni/brems are inactivated
-      // see the corresponding condition in ComputeGeomPathLength 
-      else if(1.-KineticEnergy/currentKinEnergy > taulim)
-	tau = taubig ;
+      // see the corresponding condition in ComputeGeomPathLength
+      else if (1. - KineticEnergy / currentKinEnergy > taulim)
+        tau = taubig;
     }
-    currentTau = tau ;
-    lambdaeff = trueStepLength/currentTau;
+    currentTau = tau;
+    lambdaeff = trueStepLength / currentTau;
     currentRadLength = couple->GetMaterial()->GetRadlen();
 
-    if (tau >= taubig) cth = -1.+2.*G4UniformRand();
-    else if (tau >= tausmall)
-    {
+    if (tau >= taubig)
+      cth = -1. + 2. * G4UniformRand();
+    else if (tau >= tausmall) {
       G4double xmeanth, x2meanth;
-      if(tau < numlim) {
-	xmeanth = 1.0 - tau*(1.0 - 0.5*tau);
-        x2meanth= 1.0 - tau*(5.0 - 6.25*tau)*third;
+      if (tau < numlim) {
+        xmeanth = 1.0 - tau * (1.0 - 0.5 * tau);
+        x2meanth = 1.0 - tau * (5.0 - 6.25 * tau) * third;
       } else {
-	xmeanth = G4Exp(-tau);
-	x2meanth = (1.+2.*G4Exp(-2.5*tau))*third;
+        xmeanth = G4Exp(-tau);
+        x2meanth = (1. + 2. * G4Exp(-2.5 * tau)) * third;
       }
-      G4double relloss = 1.-KineticEnergy/currentKinEnergy;
+      G4double relloss = 1. - KineticEnergy / currentKinEnergy;
 
-      if(relloss > rellossmax) 
-        return SimpleScattering(xmeanth,x2meanth);
+      if (relloss > rellossmax)
+        return SimpleScattering(xmeanth, x2meanth);
 
-      G4double theta0 = ComputeTheta0(trueStepLength,KineticEnergy);
+      G4double theta0 = ComputeTheta0(trueStepLength, KineticEnergy);
 
-      //G4cout << "Theta0= " << theta0 << " theta0max= " << theta0max 
+      //G4cout << "Theta0= " << theta0 << " theta0max= " << theta0max
       //	     << "  sqrt(tausmall)= " << sqrt(tausmall) << G4endl;
 
       // protection for very small angles
-      G4double theta2 = theta0*theta0;
+      G4double theta2 = theta0 * theta0;
+
+      if (theta2 < tausmall) {
+        return cth;
+      }
 
-      if(theta2 < tausmall) { return cth; }
-    
-      if(theta0 > theta0max) {
-        return SimpleScattering(xmeanth,x2meanth);
+      if (theta0 > theta0max) {
+        return SimpleScattering(xmeanth, x2meanth);
       }
 
-      G4double x = theta2*(1.0 - theta2/12.);
-      if(theta2 > numlim) {
-	G4double sth = 2.*sin(0.5*theta0);
-	x = sth*sth;
+      G4double x = theta2 * (1.0 - theta2 / 12.);
+      if (theta2 > numlim) {
+        G4double sth = 2. * sin(0.5 * theta0);
+        x = sth * sth;
       }
 
-      G4double xmean1 = 1.-(1.-(1.+xsi)*ea)*x/eaa;
-      G4double x0 = 1. - xsi*x;
+      G4double xmean1 = 1. - (1. - (1. + xsi) * ea) * x / eaa;
+      G4double x0 = 1. - xsi * x;
 
       // G4cout << " xmean1= " << xmean1 << "  xmeanth= " << xmeanth << G4endl;
 
-      if(xmean1 <= 0.999*xmeanth) {
-        return SimpleScattering(xmeanth,x2meanth);
+      if (xmean1 <= 0.999 * xmeanth) {
+        return SimpleScattering(xmeanth, x2meanth);
       }
-      // from e- and muon scattering data                    
-      G4double c = coeffc1+coeffc2*y; 
+      // from e- and muon scattering data
+      G4double c = coeffc1 + coeffc2 * y;
 
       // tail should not be too big
-      if(c < 1.9) { 
-	/*
+      if (c < 1.9) {
+        /*
 	if(KineticEnergy > 200*MeV && c < 1.6) {
 	  G4cout << "UrbanMscModel93::SampleCosineTheta: E(GeV)= " 
 		 << KineticEnergy/GeV 
@@ -936,113 +875,110 @@ G4double UrbanMscModel93::SampleCosineTheta(G4double trueStepLength,
 		 << " tau= " << tau << G4endl;
 	}
 	*/
-	c = 1.9; 
+        c = 1.9;
       }
 
-      if(fabs(c-3.) < 0.001)      { c = 3.001; }
-      else if(fabs(c-2.) < 0.001) { c = 2.001; }
+      if (fabs(c - 3.) < 0.001) {
+        c = 3.001;
+      } else if (fabs(c - 2.) < 0.001) {
+        c = 2.001;
+      }
 
-      G4double c1 = c-1.;
+      G4double c1 = c - 1.;
 
       //from continuity of derivatives
-      G4double b = 1.+(c-xsi)*x;
+      G4double b = 1. + (c - xsi) * x;
 
-      G4double b1 = b+1.;
-      G4double bx = c*x;
+      G4double b1 = b + 1.;
+      G4double bx = c * x;
 
-      G4double eb1 = pow(b1,c1);
-      G4double ebx = pow(bx,c1);
-      G4double d = ebx/eb1;
+      G4double eb1 = pow(b1, c1);
+      G4double ebx = pow(bx, c1);
+      G4double d = ebx / eb1;
 
       // G4double xmean2 = (x0*eb1+ebx-(eb1*bx-b1*ebx)/(c-2.))/(eb1-ebx);
-      G4double xmean2 = (x0 + d - (bx - b1*d)/(c-2.))/(1. - d);
-      
-      G4double f1x0 = ea/eaa;
-      G4double f2x0 = c1/(c*(1. - d));
-      G4double prob = f2x0/(f1x0+f2x0);
+      G4double xmean2 = (x0 + d - (bx - b1 * d) / (c - 2.)) / (1. - d);
 
-      G4double qprob = xmeanth/(prob*xmean1+(1.-prob)*xmean2);
+      G4double f1x0 = ea / eaa;
+      G4double f2x0 = c1 / (c * (1. - d));
+      G4double prob = f2x0 / (f1x0 + f2x0);
+
+      G4double qprob = xmeanth / (prob * xmean1 + (1. - prob) * xmean2);
 
       // sampling of costheta
       //G4cout << "c= " << c << " qprob= " << qprob << " eb1= " << eb1
       // << " c1= " << c1 << " b1= " << b1 << " bx= " << bx << " eb1= " << eb1
       //	     << G4endl;
-      if(G4UniformRand() < qprob)
-      {
+      if (G4UniformRand() < qprob) {
         G4double var = 0;
-        if(G4UniformRand() < prob) {
-          cth = 1.+G4Log(ea+G4UniformRand()*eaa)*x;
+        if (G4UniformRand() < prob) {
+          cth = 1. + G4Log(ea + G4UniformRand() * eaa) * x;
         } else {
-          var = (1.0 - d)*G4UniformRand();
-          if(var < numlim*d) {
-            var /= (d*c1); 
-            cth = -1.0 + var*(1.0 - 0.5*var*c)*(2. + (c - xsi)*x);
-	  } else {
-	    cth = 1. + x*(c - xsi - c*pow(var + d, -1.0/c1));
-	    //b-b1*bx/G4Exp(log(ebx+(eb1-ebx)*G4UniformRand())/c1) ;
-	  }
-	}
-	if(KineticEnergy > 5*GeV && cth < 0.9) {
-	  G4cout << "UrbanMscModel93::SampleCosineTheta: E(GeV)= " 
-		 << KineticEnergy/GeV 
-		 << " 1-cosT= " << 1 - cth
-		 << " length(mm)= " << trueStepLength << " Zeff= " << Zeff 
-		 << " tau= " << tau
-		 << " prob= " << prob << " var= " << var << G4endl;
-	  G4cout << "  c= " << c << " qprob= " << qprob << " eb1= " << eb1
-		 << " ebx= " << ebx
-		 << " c1= " << c1 << " b= " << b << " b1= " << b1 
-		 << " bx= " << bx << " d= " << d
-		 << " ea= " << ea << " eaa= " << eaa << G4endl;
-	}
-      }
-      else {
-        cth = -1.+2.*G4UniformRand();
-	if(KineticEnergy > 5*GeV) {
-	  G4cout << "UrbanMscModel93::SampleCosineTheta: E(GeV)= " 
-		 << KineticEnergy/GeV 
-		 << " length(mm)= " << trueStepLength << " Zeff= " << Zeff 
-		 << " qprob= " << qprob << G4endl;
-	}
+          var = (1.0 - d) * G4UniformRand();
+          if (var < numlim * d) {
+            var /= (d * c1);
+            cth = -1.0 + var * (1.0 - 0.5 * var * c) * (2. + (c - xsi) * x);
+          } else {
+            cth = 1. + x * (c - xsi - c * pow(var + d, -1.0 / c1));
+            //b-b1*bx/G4Exp(log(ebx+(eb1-ebx)*G4UniformRand())/c1) ;
+          }
+        }
+        if (KineticEnergy > 5 * GeV && cth < 0.9) {
+          G4cout << "UrbanMscModel93::SampleCosineTheta: E(GeV)= " << KineticEnergy / GeV << " 1-cosT= " << 1 - cth
+                 << " length(mm)= " << trueStepLength << " Zeff= " << Zeff << " tau= " << tau << " prob= " << prob
+                 << " var= " << var << G4endl;
+          G4cout << "  c= " << c << " qprob= " << qprob << " eb1= " << eb1 << " ebx= " << ebx << " c1= " << c1
+                 << " b= " << b << " b1= " << b1 << " bx= " << bx << " d= " << d << " ea= " << ea << " eaa= " << eaa
+                 << G4endl;
+        }
+      } else {
+        cth = -1. + 2. * G4UniformRand();
+        if (KineticEnergy > 5 * GeV) {
+          G4cout << "UrbanMscModel93::SampleCosineTheta: E(GeV)= " << KineticEnergy / GeV
+                 << " length(mm)= " << trueStepLength << " Zeff= " << Zeff << " qprob= " << qprob << G4endl;
+        }
       }
     }
-  }  
-  return cth ;
+  }
+  return cth;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4double UrbanMscModel93::SampleDisplacement()
-{
+G4double UrbanMscModel93::SampleDisplacement() {
   // Compute rmean = sqrt(<r**2>) from theory
   G4double rmean = 0.0;
   if ((currentTau >= tausmall) && !insideskin) {
     if (currentTau < taulim) {
-      rmean = kappa*currentTau*currentTau*currentTau*
-             (1.-kappapl1*currentTau*0.25)/6. ;
+      rmean = kappa * currentTau * currentTau * currentTau * (1. - kappapl1 * currentTau * 0.25) / 6.;
 
     } else {
       G4double etau = 0.0;
-      if (currentTau<taubig) etau = G4Exp(-currentTau);
-      rmean = -kappa*currentTau;
-      rmean = -G4Exp(rmean)/(kappa*kappami1);
-      rmean += currentTau-kappapl1/kappa+kappa*etau/kappami1;
+      if (currentTau < taubig)
+        etau = G4Exp(-currentTau);
+      rmean = -kappa * currentTau;
+      rmean = -G4Exp(rmean) / (kappa * kappami1);
+      rmean += currentTau - kappapl1 / kappa + kappa * etau / kappami1;
     }
-    if (rmean>0.) rmean = 2.*lambdaeff*sqrt(rmean*third);
-    else          rmean = 0.;
+    if (rmean > 0.)
+      rmean = 2. * lambdaeff * sqrt(rmean * third);
+    else
+      rmean = 0.;
   }
 
-  if(rmean == 0.) return rmean;
+  if (rmean == 0.)
+    return rmean;
 
   // protection against z > t ...........................
-  G4double rmax = (tPathLength-zPathLength)*(tPathLength+zPathLength);
-    if(rmax <= 0.)
-      rmax = 0.;
-    else
-      rmax = sqrt(rmax);
+  G4double rmax = (tPathLength - zPathLength) * (tPathLength + zPathLength);
+  if (rmax <= 0.)
+    rmax = 0.;
+  else
+    rmax = sqrt(rmax);
+
+  if (rmean >= rmax)
+    return rmax;
 
-  if(rmean >= rmax) return rmax;
-     
   return rmean;
   // VI comment out for the time being
   /*
@@ -1062,22 +998,19 @@ G4double UrbanMscModel93::SampleDisplacement()
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4double UrbanMscModel93::LatCorrelation()
-{
+G4double UrbanMscModel93::LatCorrelation() {
   G4double latcorr = 0.;
-  if((currentTau >= tausmall) && !insideskin)
-  {
-    if(currentTau < taulim)
-      latcorr = lambdaeff*kappa*currentTau*currentTau*
-                (1.-kappapl1*currentTau*third)*third;
-    else
-    {
+  if ((currentTau >= tausmall) && !insideskin) {
+    if (currentTau < taulim)
+      latcorr = lambdaeff * kappa * currentTau * currentTau * (1. - kappapl1 * currentTau * third) * third;
+    else {
       G4double etau = 0.;
-      if(currentTau < taubig) etau = G4Exp(-currentTau);
-      latcorr = -kappa*currentTau;
-      latcorr = G4Exp(latcorr)/kappami1;
-      latcorr += 1.-kappa*etau/kappami1 ;
-      latcorr *= 2.*lambdaeff*third ;
+      if (currentTau < taubig)
+        etau = G4Exp(-currentTau);
+      latcorr = -kappa * currentTau;
+      latcorr = G4Exp(latcorr) / kappami1;
+      latcorr += 1. - kappa * etau / kappami1;
+      latcorr *= 2. * lambdaeff * third;
     }
   }
 
diff --git a/SimG4Core/PrintGeomInfo/interface/PrintGeomInfoAction.h b/SimG4Core/PrintGeomInfo/interface/PrintGeomInfoAction.h
index 80057c5a964a8..5375b01f4752f 100644
--- a/SimG4Core/PrintGeomInfo/interface/PrintGeomInfoAction.h
+++ b/SimG4Core/PrintGeomInfo/interface/PrintGeomInfoAction.h
@@ -4,7 +4,7 @@
 #include "SimG4Core/Watcher/interface/SimWatcher.h"
 #include "SimG4Core/Notification/interface/Observer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-    
+
 #include "G4NavigationHistory.hh"
 
 #include <iostream>
@@ -18,46 +18,45 @@ class G4LogicalVolume;
 class G4VPhysicalVolume;
 class G4VSolid;
 
-typedef std::map< G4VPhysicalVolume*, G4VPhysicalVolume*, std::less<G4VPhysicalVolume*> > mpvpv;
-typedef std::multimap< G4LogicalVolume*, G4VPhysicalVolume*, std::less<G4LogicalVolume*> > mmlvpv;
-
-class PrintGeomInfoAction : public SimWatcher,
-			    public Observer<const BeginOfJob *>,
-			    public Observer<const BeginOfRun *> {
+typedef std::map<G4VPhysicalVolume*, G4VPhysicalVolume*, std::less<G4VPhysicalVolume*> > mpvpv;
+typedef std::multimap<G4LogicalVolume*, G4VPhysicalVolume*, std::less<G4LogicalVolume*> > mmlvpv;
 
+class PrintGeomInfoAction : public SimWatcher, public Observer<const BeginOfJob*>, public Observer<const BeginOfRun*> {
 public:
-  PrintGeomInfoAction(edm::ParameterSet const & p);
+  PrintGeomInfoAction(edm::ParameterSet const& p);
   ~PrintGeomInfoAction() override;
+
 private:
-  void update(const BeginOfJob * job) override;
-  void update(const BeginOfRun * run) override;
+  void update(const BeginOfJob* job) override;
+  void update(const BeginOfRun* run) override;
   void dumpSummary(std::ostream& out = std::cout);
   void dumpG4LVList(std::ostream& out = std::cout);
   void dumpG4LVTree(std::ostream& out = std::cout);
   void dumpMaterialList(std::ostream& out = std::cout);
-  void dumpG4LVLeaf(G4LogicalVolume * lv, unsigned int leafDepth, unsigned int count, std::ostream & out = std::cout);
+  void dumpG4LVLeaf(G4LogicalVolume* lv, unsigned int leafDepth, unsigned int count, std::ostream& out = std::cout);
   int countNoTouchables();
-  void add1touchable(G4LogicalVolume * lv, int & nTouch);
+  void add1touchable(G4LogicalVolume* lv, int& nTouch);
   void dumpHierarchyTreePVLV(std::ostream& out = std::cout);
-  void dumpHierarchyLeafPVLV(G4LogicalVolume * lv, unsigned int leafDepth, std::ostream & out = std::cout);
-  void dumpLV(G4LogicalVolume * lv, unsigned int leafDepth, std::ostream & out = std::cout);
-  void dumpPV(G4VPhysicalVolume * pv, unsigned int leafDepth, std::ostream & out = std::cout);
-  void dumpTouch(G4VPhysicalVolume * pv, unsigned int leafDepth, std::ostream & out = std::cout);
+  void dumpHierarchyLeafPVLV(G4LogicalVolume* lv, unsigned int leafDepth, std::ostream& out = std::cout);
+  void dumpLV(G4LogicalVolume* lv, unsigned int leafDepth, std::ostream& out = std::cout);
+  void dumpPV(G4VPhysicalVolume* pv, unsigned int leafDepth, std::ostream& out = std::cout);
+  void dumpTouch(G4VPhysicalVolume* pv, unsigned int leafDepth, std::ostream& out = std::cout);
   std::string spacesFromLeafDepth(unsigned int leafDepth);
-  void dumpSolid(G4VSolid * sol, unsigned int leafDepth, std::ostream & out = std::cout);
-  G4VPhysicalVolume * getTopPV();
-  G4LogicalVolume * getTopLV();
+  void dumpSolid(G4VSolid* sol, unsigned int leafDepth, std::ostream& out = std::cout);
+  G4VPhysicalVolume* getTopPV();
+  G4LogicalVolume* getTopLV();
+
 private:
-  bool                     _dumpSummary, _dumpLVTree, _dumpLVList;
-  bool                     _dumpMaterial;
-  bool                     _dumpLV, _dumpSolid, _dumpAtts, _dumpSense;
-  bool                     _dumpPV, _dumpRotation, _dumpReplica, _dumpTouch;
-  std::string              name;
-  int                      nchar;
+  bool _dumpSummary, _dumpLVTree, _dumpLVList;
+  bool _dumpMaterial;
+  bool _dumpLV, _dumpSolid, _dumpAtts, _dumpSense;
+  bool _dumpPV, _dumpRotation, _dumpReplica, _dumpTouch;
+  std::string name;
+  int nchar;
   std::vector<std::string> names;
-  mpvpv                    thePVTree;
-  G4VPhysicalVolume *      theTopPV; 
-  G4NavigationHistory      fHistory;
+  mpvpv thePVTree;
+  G4VPhysicalVolume* theTopPV;
+  G4NavigationHistory fHistory;
 };
 
 #endif
diff --git a/SimG4Core/PrintGeomInfo/interface/PrintGeomSummary.h b/SimG4Core/PrintGeomInfo/interface/PrintGeomSummary.h
index 0bd033c367ecb..052a951ec1bbf 100644
--- a/SimG4Core/PrintGeomInfo/interface/PrintGeomSummary.h
+++ b/SimG4Core/PrintGeomInfo/interface/PrintGeomSummary.h
@@ -5,7 +5,7 @@
 #include "SimG4Core/Notification/interface/Observer.h"
 #include "DetectorDescription/Core/interface/DDSolidShapes.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-    
+
 #include "G4NavigationHistory.hh"
 
 #include <algorithm>
@@ -21,32 +21,29 @@ class G4LogicalVolume;
 class G4VPhysicalVolume;
 class G4VSolid;
 
-class PrintGeomSummary : public SimWatcher,
-                         public Observer<const BeginOfJob *>,
-                         public Observer<const BeginOfRun *> {
-
+class PrintGeomSummary : public SimWatcher, public Observer<const BeginOfJob *>, public Observer<const BeginOfRun *> {
 public:
-  PrintGeomSummary(edm::ParameterSet const & p);
+  PrintGeomSummary(edm::ParameterSet const &p);
   ~PrintGeomSummary() override;
 
 private:
-  void update(const BeginOfJob * job) override;
-  void update(const BeginOfRun * run) override;
-  void addSolid(const DDLogicalPart & part);
-  void fillLV(G4LogicalVolume * lv);
-  void dumpSummary(std::ostream& out, std::string name);
-  G4VPhysicalVolume * getTopPV();
+  void update(const BeginOfJob *job) override;
+  void update(const BeginOfRun *run) override;
+  void addSolid(const DDLogicalPart &part);
+  void fillLV(G4LogicalVolume *lv);
+  void dumpSummary(std::ostream &out, std::string name);
+  G4VPhysicalVolume *getTopPV();
   void addName(std::string name);
-  void printSummary(std::ostream & out);
+  void printSummary(std::ostream &out);
 
 private:
-  std::vector<std::string>           nodeNames_;
-  std::map<DDSolidShape,std::string> solidShape_;
-  std::map<std::string,DDSolidShape> solidMap_;
-  G4VPhysicalVolume *                theTopPV_; 
-  std::vector<G4LogicalVolume*>      lvs_, touch_;
-  std::vector<G4VSolid*>             sls_;
-  std::map<DDSolidShape,std::pair<int,int> > kount_;
+  std::vector<std::string> nodeNames_;
+  std::map<DDSolidShape, std::string> solidShape_;
+  std::map<std::string, DDSolidShape> solidMap_;
+  G4VPhysicalVolume *theTopPV_;
+  std::vector<G4LogicalVolume *> lvs_, touch_;
+  std::vector<G4VSolid *> sls_;
+  std::map<DDSolidShape, std::pair<int, int> > kount_;
 };
 
 #endif
diff --git a/SimG4Core/PrintGeomInfo/interface/PrintMaterialBudgetInfo.h b/SimG4Core/PrintGeomInfo/interface/PrintMaterialBudgetInfo.h
index ddc993538170e..b6f15711ebe22 100644
--- a/SimG4Core/PrintGeomInfo/interface/PrintMaterialBudgetInfo.h
+++ b/SimG4Core/PrintGeomInfo/interface/PrintMaterialBudgetInfo.h
@@ -18,42 +18,48 @@ class G4LogicalVolume;
 class G4VPhysicalVolume;
 class G4VSolid;
 
-typedef std::map< G4VPhysicalVolume*, G4VPhysicalVolume*, std::less<G4VPhysicalVolume*> > mpvpv;
-typedef std::multimap< G4LogicalVolume*, G4VPhysicalVolume*, std::less<G4LogicalVolume*> > mmlvpv;
+typedef std::map<G4VPhysicalVolume*, G4VPhysicalVolume*, std::less<G4VPhysicalVolume*> > mpvpv;
+typedef std::multimap<G4LogicalVolume*, G4VPhysicalVolume*, std::less<G4LogicalVolume*> > mmlvpv;
 
 class PrintMaterialBudgetInfo : public SimWatcher,
-				public Observer<const BeginOfJob*>,
-				public Observer<const BeginOfRun*> {
-
+                                public Observer<const BeginOfJob*>,
+                                public Observer<const BeginOfRun*> {
 public:
-  PrintMaterialBudgetInfo(edm::ParameterSet const & p);
+  PrintMaterialBudgetInfo(edm::ParameterSet const& p);
   ~PrintMaterialBudgetInfo() override;
+
 private:
-  void update(const BeginOfJob* job) override {};
+  void update(const BeginOfJob* job) override{};
   void update(const BeginOfRun* run) override;
   void dumpHeader(std::ostream& out = std::cout);
   void dumpLaTeXHeader(std::ostream& out = std::cout);
-  void dumpHierarchyLeaf(G4VPhysicalVolume* pv, G4LogicalVolume* lv, unsigned int leafDepth,
-			 std::ostream& weightOut = std::cout, std::ostream& texOut = std::cout);
-  void printInfo(G4VPhysicalVolume* pv, G4LogicalVolume* lv, unsigned int leafDepth,
-		 std::ostream& weightOut = std::cout, std::ostream& texOut = std::cout);
+  void dumpHierarchyLeaf(G4VPhysicalVolume* pv,
+                         G4LogicalVolume* lv,
+                         unsigned int leafDepth,
+                         std::ostream& weightOut = std::cout,
+                         std::ostream& texOut = std::cout);
+  void printInfo(G4VPhysicalVolume* pv,
+                 G4LogicalVolume* lv,
+                 unsigned int leafDepth,
+                 std::ostream& weightOut = std::cout,
+                 std::ostream& texOut = std::cout);
   void dumpElementMassFraction(std::ostream& elementOut = std::cout);
   void dumpLaTeXFooter(std::ostream& out = std::cout);
-  
+
 private:
-  std::string              name;
-  int                      nchar;
-  mpvpv                    thePVTree;
-  G4VPhysicalVolume*       theTopPV; 
-  G4NavigationHistory      fHistory;
-  bool                     volumeFound;
-  unsigned int             levelFound;
-  std::ofstream            weightOutputFile;
-  std::ofstream            elementOutputFile;
-  std::ofstream            texOutputFile;
+  std::string name;
+  int nchar;
+  mpvpv thePVTree;
+  G4VPhysicalVolume* theTopPV;
+  G4NavigationHistory fHistory;
+  bool volumeFound;
+  unsigned int levelFound;
+  std::ofstream weightOutputFile;
+  std::ofstream elementOutputFile;
+  std::ofstream texOutputFile;
   std::vector<std::string> elementNames;
-  std::vector<double>      elementTotalWeight;
-  std::vector<double>      elementWeightFraction;
+  std::vector<double> elementTotalWeight;
+  std::vector<double> elementWeightFraction;
   //
   std::string stringLaTeXUnderscore(std::string stringname);
   std::string stringLaTeXSuperscript(std::string stringname);
diff --git a/SimG4Core/PrintGeomInfo/interface/PrintSensitive.h b/SimG4Core/PrintGeomInfo/interface/PrintSensitive.h
index 70d124ffcaaa4..4cedf8d7c37cf 100644
--- a/SimG4Core/PrintGeomInfo/interface/PrintSensitive.h
+++ b/SimG4Core/PrintGeomInfo/interface/PrintSensitive.h
@@ -4,7 +4,7 @@
 #include "SimG4Core/Watcher/interface/SimWatcher.h"
 #include "SimG4Core/Notification/interface/Observer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-    
+
 #include "G4NavigationHistory.hh"
 
 #include <iostream>
@@ -13,25 +13,20 @@
 class BeginOfRun;
 class G4VPhysicalVolume;
 
-class PrintSensitive : public SimWatcher,
-                       public Observer<const BeginOfRun *> {
-
+class PrintSensitive : public SimWatcher, public Observer<const BeginOfRun *> {
 public:
-
-  PrintSensitive(edm::ParameterSet const & p);
+  PrintSensitive(edm::ParameterSet const &p);
   ~PrintSensitive() override;
 
 private:
-
-  void update(const BeginOfRun * run) override;
-  void dumpTouch(G4VPhysicalVolume * pv, unsigned int leafDepth, bool printIt,
-		 std::ostream & out = std::cout);
-  G4VPhysicalVolume * getTopPV();
+  void update(const BeginOfRun *run) override;
+  void dumpTouch(G4VPhysicalVolume *pv, unsigned int leafDepth, bool printIt, std::ostream &out = std::cout);
+  G4VPhysicalVolume *getTopPV();
 
 private:
-  std::string              name;
-  int                      nchar;
-  G4NavigationHistory      fHistory;
+  std::string name;
+  int nchar;
+  G4NavigationHistory fHistory;
 };
 
 #endif
diff --git a/SimG4Core/PrintGeomInfo/src/PrintGeomInfoAction.cc b/SimG4Core/PrintGeomInfo/src/PrintGeomInfoAction.cc
index e0b257e655751..b2b5b5decf29b 100644
--- a/SimG4Core/PrintGeomInfo/src/PrintGeomInfoAction.cc
+++ b/SimG4Core/PrintGeomInfo/src/PrintGeomInfoAction.cc
@@ -31,98 +31,93 @@
 using namespace CLHEP;
 
 PrintGeomInfoAction::PrintGeomInfoAction(const edm::ParameterSet &p) {
-
   _dumpSummary = p.getUntrackedParameter<bool>("DumpSummary", true);
-  _dumpLVTree  = p.getUntrackedParameter<bool>("DumpLVTree",  true);
-  _dumpMaterial= p.getUntrackedParameter<bool>("DumpMaterial",false);
-  _dumpLVList  = p.getUntrackedParameter<bool>("DumpLVList",  false);
-  _dumpLV      = p.getUntrackedParameter<bool>("DumpLV",      false);
-  _dumpSolid   = p.getUntrackedParameter<bool>("DumpSolid",   false);
-  _dumpAtts    = p.getUntrackedParameter<bool>("DumpAttributes", false);
-  _dumpPV      = p.getUntrackedParameter<bool>("DumpPV",      false);
-  _dumpRotation= p.getUntrackedParameter<bool>("DumpRotation",false);
+  _dumpLVTree = p.getUntrackedParameter<bool>("DumpLVTree", true);
+  _dumpMaterial = p.getUntrackedParameter<bool>("DumpMaterial", false);
+  _dumpLVList = p.getUntrackedParameter<bool>("DumpLVList", false);
+  _dumpLV = p.getUntrackedParameter<bool>("DumpLV", false);
+  _dumpSolid = p.getUntrackedParameter<bool>("DumpSolid", false);
+  _dumpAtts = p.getUntrackedParameter<bool>("DumpAttributes", false);
+  _dumpPV = p.getUntrackedParameter<bool>("DumpPV", false);
+  _dumpRotation = p.getUntrackedParameter<bool>("DumpRotation", false);
   _dumpReplica = p.getUntrackedParameter<bool>("DumpReplica", false);
-  _dumpTouch   = p.getUntrackedParameter<bool>("DumpTouch",   false);
-  _dumpSense   = p.getUntrackedParameter<bool>("DumpSense",   false);
-  name  = p.getUntrackedParameter<std::string>("Name","*");
+  _dumpTouch = p.getUntrackedParameter<bool>("DumpTouch", false);
+  _dumpSense = p.getUntrackedParameter<bool>("DumpSense", false);
+  name = p.getUntrackedParameter<std::string>("Name", "*");
   nchar = name.find("*");
-  name.assign(name,0,nchar);
+  name.assign(name, 0, nchar);
   names = p.getUntrackedParameter<std::vector<std::string> >("Names");
   G4cout << "PrintGeomInfoAction:: initialised with verbosity levels:"
-	 << " Summary   " << _dumpSummary << " LVTree   " << _dumpLVTree
-	 << " LVList    " << _dumpLVList  << " Material " << _dumpMaterial
-	 << "\n                                                        "
-	 << " LV        " << _dumpLV      << " Solid    " << _dumpSolid 
-	 << " Attribs   " << _dumpAtts
-	 << "\n                                                        "
-	 << " PV        " << _dumpPV      << " Rotation " << _dumpRotation
-	 << " Replica   " << _dumpReplica
-	 << "\n                                                        "
-	 << " Touchable " << _dumpTouch << " for names (0-" << nchar 
-	 << ") = " << name 
-	 << "\n                                                        "
-	 << " Sensitive " << _dumpSense << " for " << names.size()
-	 << " namess";
-  for (unsigned int i=0; i<names.size(); i++) G4cout << " " << names[i];
+         << " Summary   " << _dumpSummary << " LVTree   " << _dumpLVTree << " LVList    " << _dumpLVList << " Material "
+         << _dumpMaterial << "\n                                                        "
+         << " LV        " << _dumpLV << " Solid    " << _dumpSolid << " Attribs   " << _dumpAtts
+         << "\n                                                        "
+         << " PV        " << _dumpPV << " Rotation " << _dumpRotation << " Replica   " << _dumpReplica
+         << "\n                                                        "
+         << " Touchable " << _dumpTouch << " for names (0-" << nchar << ") = " << name
+         << "\n                                                        "
+         << " Sensitive " << _dumpSense << " for " << names.size() << " namess";
+  for (unsigned int i = 0; i < names.size(); i++)
+    G4cout << " " << names[i];
   G4cout << G4endl;
 }
- 
+
 PrintGeomInfoAction::~PrintGeomInfoAction() {}
- 
-void PrintGeomInfoAction::update(const BeginOfJob * job) {
 
+void PrintGeomInfoAction::update(const BeginOfJob *job) {
   if (_dumpSense) {
     edm::ESTransientHandle<DDCompactView> pDD;
     (*job)()->get<IdealGeometryRecord>().get(pDD);
 
-    G4cout << "PrintGeomInfoAction::Get Printout of Sensitive Volumes " 
-	   << "for " << names.size() << " Readout Units" << G4endl;
-    for (unsigned int i=0; i<names.size(); i++) {
+    G4cout << "PrintGeomInfoAction::Get Printout of Sensitive Volumes "
+           << "for " << names.size() << " Readout Units" << G4endl;
+    for (unsigned int i = 0; i < names.size(); i++) {
       std::string attribute = "ReadOutName";
-      std::string sd        = names[i];
-      DDSpecificsMatchesValueFilter filter{DDValue(attribute,sd,0)};
-      DDFilteredView fv(*pDD,filter);
-      G4cout << "PrintGeomInfoAction:: Get Filtered view for " 
-	     << attribute << " = " << sd << G4endl;
+      std::string sd = names[i];
+      DDSpecificsMatchesValueFilter filter{DDValue(attribute, sd, 0)};
+      DDFilteredView fv(*pDD, filter);
+      G4cout << "PrintGeomInfoAction:: Get Filtered view for " << attribute << " = " << sd << G4endl;
       bool dodet = fv.firstChild();
-      
+
       std::string spaces = spacesFromLeafDepth(1);
 
       while (dodet) {
-	const DDLogicalPart & log = fv.logicalPart();
-	std::string lvname = log.name().name();
-	DDTranslation tran = fv.translation();
-	std::vector<int> copy = fv.copyNumbers();
-
-	unsigned int leafDepth = copy.size();
-	G4cout << leafDepth << spaces << "### VOLUME = " << lvname 
-	       << " Copy No";
-	for (int k=leafDepth-1; k>=0; k--) G4cout << " " << copy[k];
-	G4cout << " Centre at " << tran << " (r = " << tran.Rho()
-	       << ", phi = " << tran.phi()/deg << ")" << G4endl;
-	dodet = fv.next();
+        const DDLogicalPart &log = fv.logicalPart();
+        std::string lvname = log.name().name();
+        DDTranslation tran = fv.translation();
+        std::vector<int> copy = fv.copyNumbers();
+
+        unsigned int leafDepth = copy.size();
+        G4cout << leafDepth << spaces << "### VOLUME = " << lvname << " Copy No";
+        for (int k = leafDepth - 1; k >= 0; k--)
+          G4cout << " " << copy[k];
+        G4cout << " Centre at " << tran << " (r = " << tran.Rho() << ", phi = " << tran.phi() / deg << ")" << G4endl;
+        dodet = fv.next();
       }
     }
   }
 }
-  
-void PrintGeomInfoAction::update(const BeginOfRun * run) {
 
+void PrintGeomInfoAction::update(const BeginOfRun *run) {
   theTopPV = getTopPV();
-  
-  if (_dumpSummary)  dumpSummary(G4cout);
-  if (_dumpLVTree)   dumpG4LVTree(G4cout);
-    
+
+  if (_dumpSummary)
+    dumpSummary(G4cout);
+  if (_dumpLVTree)
+    dumpG4LVTree(G4cout);
+
   //---------- Dump list of objects of each class with detail of parameters
-  if (_dumpMaterial) dumpMaterialList(G4cout);
-  if (_dumpLVList)   dumpG4LVList(G4cout);
+  if (_dumpMaterial)
+    dumpMaterialList(G4cout);
+  if (_dumpLVList)
+    dumpG4LVList(G4cout);
 
   //---------- Dump LV and PV information
-  if (_dumpLV || _dumpPV || _dumpTouch) dumpHierarchyTreePVLV(G4cout);
+  if (_dumpLV || _dumpPV || _dumpTouch)
+    dumpHierarchyTreePVLV(G4cout);
 }
 
-void PrintGeomInfoAction::dumpSummary(std::ostream & out) {
-
+void PrintGeomInfoAction::dumpSummary(std::ostream &out) {
   //---------- Dump number of objects of each class
   out << " @@@@@@@@@@@@@@@@@@ Dumping G4 geometry objects Summary " << G4endl;
   if (theTopPV == nullptr) {
@@ -131,276 +126,266 @@ void PrintGeomInfoAction::dumpSummary(std::ostream & out) {
   }
   out << " @@@ Geometry built inside world volume: " << theTopPV->GetName() << G4endl;
   // Get number of solids (< # LV if several LV share a solid)
-  const G4LogicalVolumeStore * lvs = G4LogicalVolumeStore::GetInstance();
+  const G4LogicalVolumeStore *lvs = G4LogicalVolumeStore::GetInstance();
   std::vector<G4LogicalVolume *>::const_iterator lvcite;
   std::set<G4VSolid *> theSolids;
-  for (lvcite = lvs->begin(); lvcite != lvs->end(); lvcite++) 
+  for (lvcite = lvs->begin(); lvcite != lvs->end(); lvcite++)
     theSolids.insert((*lvcite)->GetSolid());
   out << " Number of G4VSolid's: " << theSolids.size() << G4endl;
   out << " Number of G4LogicalVolume's: " << lvs->size() << G4endl;
-  const G4PhysicalVolumeStore * pvs = G4PhysicalVolumeStore::GetInstance();
+  const G4PhysicalVolumeStore *pvs = G4PhysicalVolumeStore::GetInstance();
   out << " Number of G4VPhysicalVolume's: " << pvs->size() << G4endl;
   out << " Number of Touchable's: " << countNoTouchables() << G4endl;
-  const G4MaterialTable * matTab = G4Material::GetMaterialTable();
+  const G4MaterialTable *matTab = G4Material::GetMaterialTable();
   out << " Number of G4Material's: " << matTab->size() << G4endl;
 }
 
-void PrintGeomInfoAction::dumpG4LVList(std::ostream & out) {
-
+void PrintGeomInfoAction::dumpG4LVList(std::ostream &out) {
   out << " @@@@@@@@@@@@@@@@ DUMPING G4LogicalVolume's List  " << G4endl;
-  const G4LogicalVolumeStore * lvs = G4LogicalVolumeStore::GetInstance();
-  std::vector<G4LogicalVolume*>::const_iterator lvcite;
-  for (lvcite = lvs->begin(); lvcite != lvs->end(); lvcite++) 
+  const G4LogicalVolumeStore *lvs = G4LogicalVolumeStore::GetInstance();
+  std::vector<G4LogicalVolume *>::const_iterator lvcite;
+  for (lvcite = lvs->begin(); lvcite != lvs->end(); lvcite++)
     out << "LV:" << (*lvcite)->GetName() << "\tMaterial: " << (*lvcite)->GetMaterial()->GetName() << G4endl;
 }
 
-void PrintGeomInfoAction::dumpG4LVTree(std::ostream & out) {
-
+void PrintGeomInfoAction::dumpG4LVTree(std::ostream &out) {
   out << " @@@@@@@@@@@@@@@@ DUMPING G4LogicalVolume's Tree  " << G4endl;
-  G4LogicalVolume * lv = getTopLV(); 
-  dumpG4LVLeaf(lv,0,1,out);
+  G4LogicalVolume *lv = getTopLV();
+  dumpG4LVLeaf(lv, 0, 1, out);
 }
 
-void PrintGeomInfoAction::dumpMaterialList(std::ostream & out) {
-
+void PrintGeomInfoAction::dumpMaterialList(std::ostream &out) {
   out << " @@@@@@@@@@@@@@@@ DUMPING G4Material List ";
-  const G4MaterialTable * matTab = G4Material::GetMaterialTable();
+  const G4MaterialTable *matTab = G4Material::GetMaterialTable();
   out << " with " << matTab->size() << " materials " << G4endl;
-  std::vector<G4Material*>::const_iterator matite;
+  std::vector<G4Material *>::const_iterator matite;
   for (matite = matTab->begin(); matite != matTab->end(); matite++)
     out << "Material: " << (*matite) << G4endl;
 }
 
-void PrintGeomInfoAction::dumpG4LVLeaf(G4LogicalVolume * lv, unsigned int leafDepth, unsigned int count, std::ostream & out) {
-
-  for (unsigned int ii=0; ii < leafDepth; ii++) out << "  ";
-  out << " LV:(" << leafDepth << ") " << lv->GetName() << " (" << count
-      << ")" << G4endl;
+void PrintGeomInfoAction::dumpG4LVLeaf(G4LogicalVolume *lv,
+                                       unsigned int leafDepth,
+                                       unsigned int count,
+                                       std::ostream &out) {
+  for (unsigned int ii = 0; ii < leafDepth; ii++)
+    out << "  ";
+  out << " LV:(" << leafDepth << ") " << lv->GetName() << " (" << count << ")" << G4endl;
   //--- If a volume is placed n types as daughter of this LV, it should only be counted once
-  std::map<G4LogicalVolume*, unsigned int> lvCount;
-  std::map<G4LogicalVolume*, unsigned int>::const_iterator cite;
+  std::map<G4LogicalVolume *, unsigned int> lvCount;
+  std::map<G4LogicalVolume *, unsigned int>::const_iterator cite;
   for (int ii = 0; ii < lv->GetNoDaughters(); ii++) {
     cite = lvCount.find(lv->GetDaughter(ii)->GetLogicalVolume());
-    if (cite != lvCount.end()) lvCount[cite->first] = (cite->second) + 1;
-    else lvCount.insert(std::pair< G4LogicalVolume*,unsigned int>(lv->GetDaughter(ii)->GetLogicalVolume(),1));
+    if (cite != lvCount.end())
+      lvCount[cite->first] = (cite->second) + 1;
+    else
+      lvCount.insert(std::pair<G4LogicalVolume *, unsigned int>(lv->GetDaughter(ii)->GetLogicalVolume(), 1));
   }
-  for (cite = lvCount.begin(); cite != lvCount.end(); cite++) 
-    dumpG4LVLeaf((cite->first), leafDepth+1, (cite->second), out);
+  for (cite = lvCount.begin(); cite != lvCount.end(); cite++)
+    dumpG4LVLeaf((cite->first), leafDepth + 1, (cite->second), out);
 }
 
 int PrintGeomInfoAction::countNoTouchables() {
-
   int nTouch = 0;
-  G4LogicalVolume * lv = getTopLV();
+  G4LogicalVolume *lv = getTopLV();
   add1touchable(lv, nTouch);
   return nTouch;
 }
 
-void PrintGeomInfoAction::add1touchable(G4LogicalVolume * lv, int & nTouch) {
-
+void PrintGeomInfoAction::add1touchable(G4LogicalVolume *lv, int &nTouch) {
   int siz = lv->GetNoDaughters();
-  for(int ii = 0; ii < siz; ii++)
+  for (int ii = 0; ii < siz; ii++)
     add1touchable(lv->GetDaughter(ii)->GetLogicalVolume(), ++nTouch);
 }
- 
-void PrintGeomInfoAction::dumpHierarchyTreePVLV(std::ostream & out) {
 
-  //dumps in the following order: 
+void PrintGeomInfoAction::dumpHierarchyTreePVLV(std::ostream &out) {
+  //dumps in the following order:
   //    1) a LV with details
   //    2) list of PVs daughters of this LV with details
   //    3) list of LVs daughters of this LV and for each go to 1)
-  
+
   //----- Get top PV
-  G4LogicalVolume*  topLV = getTopLV();
-  
+  G4LogicalVolume *topLV = getTopLV();
+
   //----- Dump this leaf (it will recursively dump all the tree)
   dumpHierarchyLeafPVLV(topLV, 0, out);
   dumpPV(theTopPV, 0, out);
-  
+
   //----- Dump the touchables (it will recursively dump all the tree)
-  if (_dumpTouch) dumpTouch(theTopPV, 0, out);
+  if (_dumpTouch)
+    dumpTouch(theTopPV, 0, out);
 }
 
-void PrintGeomInfoAction::dumpHierarchyLeafPVLV(G4LogicalVolume * lv, unsigned int leafDepth, std::ostream & out) {
-
-  //----- Dump this LV 
+void PrintGeomInfoAction::dumpHierarchyLeafPVLV(G4LogicalVolume *lv, unsigned int leafDepth, std::ostream &out) {
+  //----- Dump this LV
   dumpLV(lv, leafDepth, out);
 
   //----- Get LV daughters from list of PV daughters
   mmlvpv lvpvDaughters;
-  std::set< G4LogicalVolume * > lvDaughters;
+  std::set<G4LogicalVolume *> lvDaughters;
   int NoDaughters = lv->GetNoDaughters();
-  while ((NoDaughters--)>0) {
-    G4VPhysicalVolume * pvD = lv->GetDaughter(NoDaughters);
+  while ((NoDaughters--) > 0) {
+    G4VPhysicalVolume *pvD = lv->GetDaughter(NoDaughters);
     lvpvDaughters.insert(mmlvpv::value_type(pvD->GetLogicalVolume(), pvD));
     lvDaughters.insert(pvD->GetLogicalVolume());
   }
- 
-  std::set< G4LogicalVolume * >::const_iterator scite;
+
+  std::set<G4LogicalVolume *>::const_iterator scite;
   mmlvpv::const_iterator mmcite;
 
   //----- Dump daughters PV and LV
   for (scite = lvDaughters.begin(); scite != lvDaughters.end(); scite++) {
-    std::pair< mmlvpv::iterator, mmlvpv::iterator > mmER = lvpvDaughters.equal_range(*scite);    
+    std::pair<mmlvpv::iterator, mmlvpv::iterator> mmER = lvpvDaughters.equal_range(*scite);
     //----- Dump daughters PV of this LV
-    for (mmcite = mmER.first ; mmcite != mmER.second; mmcite++) 
-      dumpPV((*mmcite).second, leafDepth+1, out);
+    for (mmcite = mmER.first; mmcite != mmER.second; mmcite++)
+      dumpPV((*mmcite).second, leafDepth + 1, out);
     //----- Dump daughters LV
-    dumpHierarchyLeafPVLV(*scite, leafDepth+1, out );
+    dumpHierarchyLeafPVLV(*scite, leafDepth + 1, out);
   }
 }
- 
-void PrintGeomInfoAction::dumpLV(G4LogicalVolume * lv, unsigned int leafDepth, std::ostream & out) {
 
+void PrintGeomInfoAction::dumpLV(G4LogicalVolume *lv, unsigned int leafDepth, std::ostream &out) {
   std::string spaces = spacesFromLeafDepth(leafDepth);
 
-  //----- dump name 
-  if (_dumpLV) { 
-    out << leafDepth << spaces << "$$$ VOLUME = " << lv->GetName()
-	<< "  Solid: " << lv->GetSolid()->GetName() << "  MATERIAL: "
-	<< lv->GetMaterial()->GetName() << G4endl;
+  //----- dump name
+  if (_dumpLV) {
+    out << leafDepth << spaces << "$$$ VOLUME = " << lv->GetName() << "  Solid: " << lv->GetSolid()->GetName()
+        << "  MATERIAL: " << lv->GetMaterial()->GetName() << G4endl;
     if (_dumpSolid)
-      dumpSolid(lv->GetSolid(), leafDepth, out); //----- dump solid
+      dumpSolid(lv->GetSolid(), leafDepth, out);  //----- dump solid
 
-    //----- dump LV info 
-    //--- material 
+    //----- dump LV info
+    //--- material
     if (_dumpAtts) {
       //--- Visualisation attributes
-      const G4VisAttributes * fVA = lv->GetVisAttributes();
-      if (fVA!=nullptr) {
-	out <<  spaces << "  VISUALISATION ATTRIBUTES: " << G4endl;
-	out <<  spaces << "    IsVisible " << fVA->IsVisible() << G4endl;
-	out <<  spaces << "    IsDaughtersInvisible " << fVA->IsDaughtersInvisible() << G4endl;
-	out <<  spaces << "    Colour " << fVA->GetColour() << G4endl;
-	out <<  spaces << "    LineStyle " << fVA->GetLineStyle() << G4endl;
-	out <<  spaces << "    LineWidth " << fVA->GetLineWidth() << G4endl;
-	out <<  spaces << "    IsForceDrawingStyle " << fVA->IsForceDrawingStyle() << G4endl;
-	out <<  spaces << "    ForcedDrawingStyle " << fVA->GetForcedDrawingStyle() << G4endl;
-      }    
-    
+      const G4VisAttributes *fVA = lv->GetVisAttributes();
+      if (fVA != nullptr) {
+        out << spaces << "  VISUALISATION ATTRIBUTES: " << G4endl;
+        out << spaces << "    IsVisible " << fVA->IsVisible() << G4endl;
+        out << spaces << "    IsDaughtersInvisible " << fVA->IsDaughtersInvisible() << G4endl;
+        out << spaces << "    Colour " << fVA->GetColour() << G4endl;
+        out << spaces << "    LineStyle " << fVA->GetLineStyle() << G4endl;
+        out << spaces << "    LineWidth " << fVA->GetLineWidth() << G4endl;
+        out << spaces << "    IsForceDrawingStyle " << fVA->IsForceDrawingStyle() << G4endl;
+        out << spaces << "    ForcedDrawingStyle " << fVA->GetForcedDrawingStyle() << G4endl;
+      }
+
       //--- User Limits
-      G4UserLimits * fUL = lv->GetUserLimits();
+      G4UserLimits *fUL = lv->GetUserLimits();
       G4Track dummy;
-      if (fUL!=nullptr) {
-	out <<  spaces << "    MaxAllowedStep " << fUL->GetMaxAllowedStep(dummy) << G4endl;
-	out <<  spaces << "    UserMaxTrackLength " << fUL->GetUserMaxTrackLength(dummy) << G4endl;
-	out <<  spaces << "    UserMaxTime " << fUL->GetUserMaxTime(dummy) << G4endl;
-	out <<  spaces << "    UserMinEkine " << fUL->GetUserMinEkine(dummy) << G4endl;
-	out <<  spaces << "    UserMinRange " << fUL->GetUserMinRange(dummy) << G4endl;
+      if (fUL != nullptr) {
+        out << spaces << "    MaxAllowedStep " << fUL->GetMaxAllowedStep(dummy) << G4endl;
+        out << spaces << "    UserMaxTrackLength " << fUL->GetUserMaxTrackLength(dummy) << G4endl;
+        out << spaces << "    UserMaxTime " << fUL->GetUserMaxTime(dummy) << G4endl;
+        out << spaces << "    UserMinEkine " << fUL->GetUserMinEkine(dummy) << G4endl;
+        out << spaces << "    UserMinRange " << fUL->GetUserMinRange(dummy) << G4endl;
       }
-    
+
       //--- other LV info
-      if (lv->GetSensitiveDetector()) 
-	out << spaces << "  IS SENSITIVE DETECTOR " << G4endl;
-      if (lv->GetFieldManager()) 
-	out << spaces << "  FIELD ON " << G4endl;
+      if (lv->GetSensitiveDetector())
+        out << spaces << "  IS SENSITIVE DETECTOR " << G4endl;
+      if (lv->GetFieldManager())
+        out << spaces << "  FIELD ON " << G4endl;
 
       // Pointer (possibly NULL) to optimisation info objects.
-      out <<  spaces  
-	  << "        Quality for optimisation, average number of voxels to be spent per content " 
-	  << lv->GetSmartless() << G4endl;
+      out << spaces << "        Quality for optimisation, average number of voxels to be spent per content "
+          << lv->GetSmartless() << G4endl;
 
       // Pointer (possibly NULL) to G4FastSimulationManager object.
-      if (lv->GetFastSimulationManager()) 
-	out << spaces << "     Logical Volume is an envelope for a FastSimulationManager " 
-	    << G4endl;
-      out << spaces << "     Weight used in the event biasing technique = " 
-	  << lv->GetBiasWeight() << G4endl;
-    } 
+      if (lv->GetFastSimulationManager())
+        out << spaces << "     Logical Volume is an envelope for a FastSimulationManager " << G4endl;
+      out << spaces << "     Weight used in the event biasing technique = " << lv->GetBiasWeight() << G4endl;
+    }
   }
-}	
-
-void PrintGeomInfoAction::dumpPV(G4VPhysicalVolume * pv, unsigned int leafDepth, std::ostream & out) {
+}
 
+void PrintGeomInfoAction::dumpPV(G4VPhysicalVolume *pv, unsigned int leafDepth, std::ostream &out) {
   std::string spaces = spacesFromLeafDepth(leafDepth);
 
   //----- PV info
   if (_dumpPV) {
     std::string mother = "World";
-    if (pv->GetMotherLogical()) mother = pv->GetMotherLogical()->GetName();
-    out << leafDepth << spaces << "### VOLUME = " << pv->GetName() 
-	<< " Copy No " << pv->GetCopyNo() << " in " << mother
-	<< " at " << pv->GetTranslation();
+    if (pv->GetMotherLogical())
+      mother = pv->GetMotherLogical()->GetName();
+    out << leafDepth << spaces << "### VOLUME = " << pv->GetName() << " Copy No " << pv->GetCopyNo() << " in " << mother
+        << " at " << pv->GetTranslation();
   }
   if (!pv->IsReplicated()) {
     if (_dumpPV) {
-      if(pv->GetRotation() == nullptr) out << " with no rotation" << G4endl;
-      else  if(!_dumpRotation)   out << " with rotation" << G4endl; //just rotation name
-      else                       out << " with rotation " << *(pv->GetRotation()) << G4endl;
+      if (pv->GetRotation() == nullptr)
+        out << " with no rotation" << G4endl;
+      else if (!_dumpRotation)
+        out << " with rotation" << G4endl;  //just rotation name
+      else
+        out << " with rotation " << *(pv->GetRotation()) << G4endl;
     }
   } else {
-    if (_dumpReplica ) {
+    if (_dumpReplica) {
       out << spaces << "    It is replica: " << G4endl;
-      EAxis axis; 
-      int nReplicas; 
-      double width; 
-      double offset; 
+      EAxis axis;
+      int nReplicas;
+      double width;
+      double offset;
       bool consuming;
       pv->GetReplicationData(axis, nReplicas, width, offset, consuming);
-      out << spaces << "     axis " << axis << G4endl
-	  << spaces << "     nReplicas " << nReplicas << G4endl;
-      if (pv->GetParameterisation() != nullptr) 
-	out << spaces << "    It is parameterisation " << G4endl;
-      else 
-	out << spaces << "     width " << width << G4endl
-	    << spaces << "     offset " << offset << G4endl
-	    << spaces << "     consuming" <<  consuming << G4endl;
-      if (pv->GetParameterisation() != nullptr) 
-	out << spaces << "    It is parameterisation " << G4endl;
+      out << spaces << "     axis " << axis << G4endl << spaces << "     nReplicas " << nReplicas << G4endl;
+      if (pv->GetParameterisation() != nullptr)
+        out << spaces << "    It is parameterisation " << G4endl;
+      else
+        out << spaces << "     width " << width << G4endl << spaces << "     offset " << offset << G4endl << spaces
+            << "     consuming" << consuming << G4endl;
+      if (pv->GetParameterisation() != nullptr)
+        out << spaces << "    It is parameterisation " << G4endl;
     }
   }
 }
 
-void PrintGeomInfoAction::dumpTouch(G4VPhysicalVolume * pv, unsigned int leafDepth, std::ostream & out) {
-
+void PrintGeomInfoAction::dumpTouch(G4VPhysicalVolume *pv, unsigned int leafDepth, std::ostream &out) {
   std::string spaces = spacesFromLeafDepth(leafDepth);
-  if (leafDepth == 0) fHistory.SetFirstEntry(pv);
-  else fHistory.NewLevel(pv, kNormal, pv->GetCopyNo());
+  if (leafDepth == 0)
+    fHistory.SetFirstEntry(pv);
+  else
+    fHistory.NewLevel(pv, kNormal, pv->GetCopyNo());
 
-  G4ThreeVector globalpoint = fHistory.GetTopTransform().Inverse().TransformPoint(G4ThreeVector(0,0,0));
-  G4LogicalVolume * lv = pv->GetLogicalVolume();
+  G4ThreeVector globalpoint = fHistory.GetTopTransform().Inverse().TransformPoint(G4ThreeVector(0, 0, 0));
+  G4LogicalVolume *lv = pv->GetLogicalVolume();
 
   std::string mother = "World";
-  if (pv->GetMotherLogical()) mother = pv->GetMotherLogical()->GetName();
+  if (pv->GetMotherLogical())
+    mother = pv->GetMotherLogical()->GetName();
   std::string lvname = lv->GetName();
-  lvname.assign(lvname,0,nchar);
+  lvname.assign(lvname, 0, nchar);
   if (lvname == name)
-    out << leafDepth << spaces << "### VOLUME = " << lv->GetName() 
-	<< " Copy No " << pv->GetCopyNo() << " in " << mother
-	<< " global position of centre " << globalpoint << " (r = " 
-	<<  globalpoint.perp() << ", phi = " <<  globalpoint.phi()/deg
-	<< ")" << G4endl;
+    out << leafDepth << spaces << "### VOLUME = " << lv->GetName() << " Copy No " << pv->GetCopyNo() << " in " << mother
+        << " global position of centre " << globalpoint << " (r = " << globalpoint.perp()
+        << ", phi = " << globalpoint.phi() / deg << ")" << G4endl;
 
   int NoDaughters = lv->GetNoDaughters();
-  while ((NoDaughters--)>0) {
-    G4VPhysicalVolume * pvD = lv->GetDaughter(NoDaughters);
-    if (!pvD->IsReplicated()) dumpTouch(pvD, leafDepth+1, out);
+  while ((NoDaughters--) > 0) {
+    G4VPhysicalVolume *pvD = lv->GetDaughter(NoDaughters);
+    if (!pvD->IsReplicated())
+      dumpTouch(pvD, leafDepth + 1, out);
   }
 
-  if (leafDepth > 0) fHistory.BackLevel();
+  if (leafDepth > 0)
+    fHistory.BackLevel();
 }
 
 std::string PrintGeomInfoAction::spacesFromLeafDepth(unsigned int leafDepth) {
-
   std::string spaces;
   unsigned int ii;
-  for(ii = 0; ii < leafDepth; ii++) { spaces += "  "; }
+  for (ii = 0; ii < leafDepth; ii++) {
+    spaces += "  ";
+  }
   return spaces;
 }
 
-void PrintGeomInfoAction::dumpSolid(G4VSolid * sol, unsigned int leafDepth, std::ostream & out) {
-
+void PrintGeomInfoAction::dumpSolid(G4VSolid *sol, unsigned int leafDepth, std::ostream &out) {
   std::string spaces = spacesFromLeafDepth(leafDepth);
   out << spaces << *(sol) << G4endl;
 }
 
-G4VPhysicalVolume * PrintGeomInfoAction::getTopPV() {
-  
+G4VPhysicalVolume *PrintGeomInfoAction::getTopPV() {
   return G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume();
 }
 
-G4LogicalVolume * PrintGeomInfoAction::getTopLV() { 
-  return theTopPV->GetLogicalVolume(); 
-}
-
-
+G4LogicalVolume *PrintGeomInfoAction::getTopLV() { return theTopPV->GetLogicalVolume(); }
diff --git a/SimG4Core/PrintGeomInfo/src/PrintGeomSummary.cc b/SimG4Core/PrintGeomInfo/src/PrintGeomSummary.cc
index f0a6376b8f3d6..d8d3c08d573ab 100644
--- a/SimG4Core/PrintGeomInfo/src/PrintGeomSummary.cc
+++ b/SimG4Core/PrintGeomInfo/src/PrintGeomSummary.cc
@@ -29,150 +29,145 @@
 #include <set>
 #include <map>
 
-PrintGeomSummary::PrintGeomSummary(const edm::ParameterSet &p) : theTopPV_(nullptr) {
+PrintGeomSummary::PrintGeomSummary(const edm::ParameterSet& p) : theTopPV_(nullptr) {
   std::vector<std::string> defNames;
-  nodeNames_  = p.getUntrackedParameter<std::vector<std::string> >("NodeNames",defNames);
-  G4cout << "PrintGeomSummary:: initialised for " << nodeNames_.size()
-	 << " nodes:" << G4endl;
-  for (unsigned int ii=0; ii<nodeNames_.size(); ii++)
+  nodeNames_ = p.getUntrackedParameter<std::vector<std::string>>("NodeNames", defNames);
+  G4cout << "PrintGeomSummary:: initialised for " << nodeNames_.size() << " nodes:" << G4endl;
+  for (unsigned int ii = 0; ii < nodeNames_.size(); ii++)
     G4cout << "Node[" << ii << "] : " << nodeNames_[ii] << G4endl;
 
-  solidShape_[DDSolidShape::ddbox]            = "Box";
-  solidShape_[DDSolidShape::ddtubs]           = "Tube";
-  solidShape_[DDSolidShape::ddtrap]           = "Trapezoid";
-  solidShape_[DDSolidShape::ddcons]           = "Cone";
-  solidShape_[DDSolidShape::ddpolycone_rz]    = "Polycone_rz";
-  solidShape_[DDSolidShape::ddpolyhedra_rz]   = "Polyhedra_rz";
-  solidShape_[DDSolidShape::ddpolycone_rrz]   = "Polycone_rrz";
-  solidShape_[DDSolidShape::ddpolyhedra_rrz]  = "Polyhedra_rrz";
-  solidShape_[DDSolidShape::ddtorus]          = "Torus";
-  solidShape_[DDSolidShape::ddunion]          = "UnionSolid";
-  solidShape_[DDSolidShape::ddsubtraction]    = "SubtractionSolid"; 
-  solidShape_[DDSolidShape::ddintersection]   = "IntersectionSolid";
-  solidShape_[DDSolidShape::ddshapeless]      = "ShapelessSolid";
-  solidShape_[DDSolidShape::ddpseudotrap]     = "PseudoTrapezoid";
-  solidShape_[DDSolidShape::ddtrunctubs]      = "TruncatedTube";
-  solidShape_[DDSolidShape::ddsphere]         = "Sphere"; 
+  solidShape_[DDSolidShape::ddbox] = "Box";
+  solidShape_[DDSolidShape::ddtubs] = "Tube";
+  solidShape_[DDSolidShape::ddtrap] = "Trapezoid";
+  solidShape_[DDSolidShape::ddcons] = "Cone";
+  solidShape_[DDSolidShape::ddpolycone_rz] = "Polycone_rz";
+  solidShape_[DDSolidShape::ddpolyhedra_rz] = "Polyhedra_rz";
+  solidShape_[DDSolidShape::ddpolycone_rrz] = "Polycone_rrz";
+  solidShape_[DDSolidShape::ddpolyhedra_rrz] = "Polyhedra_rrz";
+  solidShape_[DDSolidShape::ddtorus] = "Torus";
+  solidShape_[DDSolidShape::ddunion] = "UnionSolid";
+  solidShape_[DDSolidShape::ddsubtraction] = "SubtractionSolid";
+  solidShape_[DDSolidShape::ddintersection] = "IntersectionSolid";
+  solidShape_[DDSolidShape::ddshapeless] = "ShapelessSolid";
+  solidShape_[DDSolidShape::ddpseudotrap] = "PseudoTrapezoid";
+  solidShape_[DDSolidShape::ddtrunctubs] = "TruncatedTube";
+  solidShape_[DDSolidShape::ddsphere] = "Sphere";
   solidShape_[DDSolidShape::ddellipticaltube] = "EllipticalTube";
-  solidShape_[DDSolidShape::ddcuttubs]        = "CutTubs";
-  solidShape_[DDSolidShape::ddextrudedpolygon]= "ExtrudedPolygon";
-  solidShape_[DDSolidShape::dd_not_init]      = "Unknown";
+  solidShape_[DDSolidShape::ddcuttubs] = "CutTubs";
+  solidShape_[DDSolidShape::ddextrudedpolygon] = "ExtrudedPolygon";
+  solidShape_[DDSolidShape::dd_not_init] = "Unknown";
 }
- 
+
 PrintGeomSummary::~PrintGeomSummary() {}
- 
-void PrintGeomSummary::update(const BeginOfJob * job) {
 
+void PrintGeomSummary::update(const BeginOfJob* job) {
   edm::ESTransientHandle<DDCompactView> pDD;
   (*job)()->get<IdealGeometryRecord>().get(pDD);
   const DDCompactView* cpv = &(*pDD);
 
-  const auto & gra = cpv->graph();
+  const auto& gra = cpv->graph();
 
   using Graph = DDCompactView::Graph;
   using adjl_iterator = Graph::const_adj_iterator;
 
-  Graph::index_type i=0;
+  Graph::index_type i = 0;
   solidMap_.clear();
-  for( adjl_iterator git=gra.begin();
-       git != gra.end(); ++git) {
-    const DDLogicalPart & ddLP = gra.nodeData(git);
+  for (adjl_iterator git = gra.begin(); git != gra.end(); ++git) {
+    const DDLogicalPart& ddLP = gra.nodeData(git);
     addSolid(ddLP);
     ++i;
     if (!git->empty()) {
-      // ask for children of ddLP  
-      for( Graph::edge_list::const_iterator cit  = git->begin();
-	   cit != git->end(); ++cit) {
-	const DDLogicalPart & ddcurLP = gra.nodeData(cit->first);
-	addSolid(ddcurLP);
+      // ask for children of ddLP
+      for (Graph::edge_list::const_iterator cit = git->begin(); cit != git->end(); ++cit) {
+        const DDLogicalPart& ddcurLP = gra.nodeData(cit->first);
+        addSolid(ddcurLP);
       }
     }
   }
-  G4cout << "Finds " << solidMap_.size() << " different solids in the tree" 
-	 << G4endl;
+  G4cout << "Finds " << solidMap_.size() << " different solids in the tree" << G4endl;
 }
 
-void PrintGeomSummary::addSolid(const DDLogicalPart & part) {
+void PrintGeomSummary::addSolid(const DDLogicalPart& part) {
   const DDSolid& solid = part.solid();
-  std::map<DDSolidShape,std::string>::iterator it = solidShape_.find(solid.shape());
+  std::map<DDSolidShape, std::string>::iterator it = solidShape_.find(solid.shape());
   std::string name = solid.name().name();
-  if (it == solidShape_.end()) solidMap_[name] = DDSolidShape::dd_not_init;
-  else                         solidMap_[name] = it->first;
-//G4cout << "Solid " << name << " is of shape " << solidMap_[name] << G4endl;
-}  
+  if (it == solidShape_.end())
+    solidMap_[name] = DDSolidShape::dd_not_init;
+  else
+    solidMap_[name] = it->first;
+  //G4cout << "Solid " << name << " is of shape " << solidMap_[name] << G4endl;
+}
 
-void PrintGeomSummary::update(const BeginOfRun * run) {
+void PrintGeomSummary::update(const BeginOfRun* run) {
   theTopPV_ = getTopPV();
   if (theTopPV_) {
-    lvs_.clear(); sls_.clear(); touch_.clear();
-    fillLV(theTopPV_->GetLogicalVolume()); 
+    lvs_.clear();
+    sls_.clear();
+    touch_.clear();
+    fillLV(theTopPV_->GetLogicalVolume());
     std::string name = theTopPV_->GetName();
-    dumpSummary(G4cout,name);
+    dumpSummary(G4cout, name);
 
-    for (unsigned int k=0; k<nodeNames_.size(); ++k) {
-      const G4LogicalVolumeStore * lvs = G4LogicalVolumeStore::GetInstance();
-      std::vector<G4LogicalVolume *>::const_iterator lvcite;
+    for (unsigned int k = 0; k < nodeNames_.size(); ++k) {
+      const G4LogicalVolumeStore* lvs = G4LogicalVolumeStore::GetInstance();
+      std::vector<G4LogicalVolume*>::const_iterator lvcite;
       for (lvcite = lvs->begin(); lvcite != lvs->end(); lvcite++) {
-	if ((*lvcite)->GetName() == (G4String)(nodeNames_[k])) {
-	  lvs_.clear(); sls_.clear(); touch_.clear();
-	  fillLV(*lvcite); 
-	  dumpSummary(G4cout,nodeNames_[k]);
-	}
+        if ((*lvcite)->GetName() == (G4String)(nodeNames_[k])) {
+          lvs_.clear();
+          sls_.clear();
+          touch_.clear();
+          fillLV(*lvcite);
+          dumpSummary(G4cout, nodeNames_[k]);
+        }
       }
     }
   }
 }
 
-void PrintGeomSummary::fillLV(G4LogicalVolume * lv) {
-
-  if (std::find(lvs_.begin(),lvs_.end(),lv) == lvs_.end()) lvs_.push_back(lv);
+void PrintGeomSummary::fillLV(G4LogicalVolume* lv) {
+  if (std::find(lvs_.begin(), lvs_.end(), lv) == lvs_.end())
+    lvs_.push_back(lv);
   G4VSolid* sl = lv->GetSolid();
-  if (std::find(sls_.begin(),sls_.end(),sl) == sls_.end()) sls_.push_back(sl);
+  if (std::find(sls_.begin(), sls_.end(), sl) == sls_.end())
+    sls_.push_back(sl);
   touch_.push_back(lv);
-  for(int ii = 0; ii < (int)(lv->GetNoDaughters()); ii++)
+  for (int ii = 0; ii < (int)(lv->GetNoDaughters()); ii++)
     fillLV(lv->GetDaughter(ii)->GetLogicalVolume());
 }
 
-void PrintGeomSummary::dumpSummary(std::ostream & out, std::string name) {
-
+void PrintGeomSummary::dumpSummary(std::ostream& out, std::string name) {
   //---------- Dump number of objects of each class
-  out << G4endl << G4endl
-      << "@@@@@@@@@@@@@@@@@@ Dumping Summary For Node " << name << G4endl;
+  out << G4endl << G4endl << "@@@@@@@@@@@@@@@@@@ Dumping Summary For Node " << name << G4endl;
   out << " Number of G4VSolid's: " << sls_.size() << G4endl;
   out << " Number of G4LogicalVolume's: " << lvs_.size() << G4endl;
   out << " Number of Touchable's: " << touch_.size() << G4endl;
   //First the solids
   out << G4endl << "Occurence of each type of shape among Solids" << G4endl;
   kount_.clear();
-  for (std::vector<G4VSolid*>::iterator it=sls_.begin(); it!=sls_.end(); ++it) {
+  for (std::vector<G4VSolid*>::iterator it = sls_.begin(); it != sls_.end(); ++it) {
     std::string name = (*it)->GetName();
     addName(name);
   }
   printSummary(out);
   //Then the logical volumes
-  out << G4endl << "Occurence of each type of shape among Logical Volumes" 
-      << G4endl;
+  out << G4endl << "Occurence of each type of shape among Logical Volumes" << G4endl;
   kount_.clear();
-  for (std::vector<G4LogicalVolume*>::iterator it = lvs_.begin(); 
-       it != lvs_.end(); ++it) {
+  for (std::vector<G4LogicalVolume*>::iterator it = lvs_.begin(); it != lvs_.end(); ++it) {
     std::string name = ((*it)->GetSolid())->GetName();
     addName(name);
   }
   printSummary(out);
   //Finally the touchables
-  out << G4endl << "Occurence of each type of shape among Touchables" 
-      << G4endl;
+  out << G4endl << "Occurence of each type of shape among Touchables" << G4endl;
   kount_.clear();
-  for (std::vector<G4LogicalVolume*>::iterator it = touch_.begin(); 
-       it != touch_.end(); ++it) {
+  for (std::vector<G4LogicalVolume*>::iterator it = touch_.begin(); it != touch_.end(); ++it) {
     std::string name = ((*it)->GetSolid())->GetName();
     addName(name);
   }
   printSummary(out);
 }
 
-G4VPhysicalVolume * PrintGeomSummary::getTopPV() {
-  
+G4VPhysicalVolume* PrintGeomSummary::getTopPV() {
   return G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume();
 }
 
@@ -180,27 +175,23 @@ void PrintGeomSummary::addName(std::string name) {
   bool refl(false);
   if (name.find("_refl") < name.size()) {
     refl = true;
-    name = name.substr(0,(name.find("_refl")));
+    name = name.substr(0, (name.find("_refl")));
   }
-  std::map<std::string,DDSolidShape>::const_iterator jt=solidMap_.find(name);
-  DDSolidShape shape =  (jt == solidMap_.end()) ? DDSolidShape::dd_not_init : jt->second;
-  std::map<DDSolidShape,std::pair<int,int>>::iterator itr = kount_.find(shape);
+  std::map<std::string, DDSolidShape>::const_iterator jt = solidMap_.find(name);
+  DDSolidShape shape = (jt == solidMap_.end()) ? DDSolidShape::dd_not_init : jt->second;
+  std::map<DDSolidShape, std::pair<int, int>>::iterator itr = kount_.find(shape);
   if (itr == kount_.end()) {
-    kount_[shape] = (refl) ? std::pair<int,int>(0,1) : std::pair<int,int>(1,0);
+    kount_[shape] = (refl) ? std::pair<int, int>(0, 1) : std::pair<int, int>(1, 0);
   } else {
-    kount_[shape] = (refl) ? 
-      std::pair<int,int>(((itr->second).first),++((itr->second).second)) :
-      std::pair<int,int>(++((itr->second).first),((itr->second).second));
+    kount_[shape] = (refl) ? std::pair<int, int>(((itr->second).first), ++((itr->second).second))
+                           : std::pair<int, int>(++((itr->second).first), ((itr->second).second));
   }
 }
 
-void PrintGeomSummary::printSummary(std::ostream & out) {
+void PrintGeomSummary::printSummary(std::ostream& out) {
   int k(0);
-  for (std::map<DDSolidShape,std::pair<int,int> >::iterator itr=kount_.begin();
-       itr != kount_.end(); ++itr, ++k) {
+  for (std::map<DDSolidShape, std::pair<int, int>>::iterator itr = kount_.begin(); itr != kount_.end(); ++itr, ++k) {
     std::string shape = solidShape_[itr->first];
-    out << "Shape [" << k << "]  " << shape << " # " << (itr->second).first
-	<< " : " << (itr->second).second << G4endl;
+    out << "Shape [" << k << "]  " << shape << " # " << (itr->second).first << " : " << (itr->second).second << G4endl;
   }
 }
-
diff --git a/SimG4Core/PrintGeomInfo/src/PrintMaterialBudgetInfo.cc b/SimG4Core/PrintGeomInfo/src/PrintMaterialBudgetInfo.cc
index 6be34022c8454..a3e67807bcf52 100644
--- a/SimG4Core/PrintGeomInfo/src/PrintMaterialBudgetInfo.cc
+++ b/SimG4Core/PrintGeomInfo/src/PrintMaterialBudgetInfo.cc
@@ -30,20 +30,20 @@
 #include <set>
 
 PrintMaterialBudgetInfo::PrintMaterialBudgetInfo(const edm::ParameterSet& p) {
-  name  = p.getUntrackedParameter<std::string>("Name","*");
+  name = p.getUntrackedParameter<std::string>("Name", "*");
   nchar = name.find("*");
-  name.assign(name,0,nchar);
+  name.assign(name, 0, nchar);
   std::cout << "PrintMaterialBudget selected volume " << name << std::endl;
   volumeFound = false;
-  std::string weightFileName = name+".weight";
-  weightOutputFile.open( weightFileName.c_str() );
-  std::string elementFileName = name+".element";
-  elementOutputFile.open( elementFileName.c_str() );
-  std::string texFileName = name+"_table.tex";
-  texOutputFile.open( texFileName.c_str() );
-  std::cout << "PrintMaterialBudget output file " << weightFileName  << std::endl;
+  std::string weightFileName = name + ".weight";
+  weightOutputFile.open(weightFileName.c_str());
+  std::string elementFileName = name + ".element";
+  elementOutputFile.open(elementFileName.c_str());
+  std::string texFileName = name + "_table.tex";
+  texOutputFile.open(texFileName.c_str());
+  std::cout << "PrintMaterialBudget output file " << weightFileName << std::endl;
   std::cout << "PrintMaterialBudget output file " << elementFileName << std::endl;
-  std::cout << "PrintMaterialBudget output file " << texFileName     << std::endl;
+  std::cout << "PrintMaterialBudget output file " << texFileName << std::endl;
   elementNames.clear();
   elementTotalWeight.clear();
   elementWeightFraction.clear();
@@ -52,19 +52,17 @@ PrintMaterialBudgetInfo::PrintMaterialBudgetInfo(const edm::ParameterSet& p) {
 PrintMaterialBudgetInfo::~PrintMaterialBudgetInfo() {}
 
 void PrintMaterialBudgetInfo::update(const BeginOfRun* run) {
-  
   G4Random::setTheEngine(new CLHEP::RanecuEngine);
   // Physical Volume
   theTopPV = G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume();
   assert(theTopPV);
   // Logical Volume
-  G4LogicalVolume*  lv = theTopPV->GetLogicalVolume();
+  G4LogicalVolume* lv = theTopPV->GetLogicalVolume();
   unsigned int leafDepth = 0;
   // the first time fill the vectors of elements
-  if( elementNames.empty() && elementTotalWeight.empty() && elementWeightFraction.empty()) {
-    for(unsigned int iElement = 0;
-	iElement < G4Element::GetNumberOfElements();
-	iElement++) { // first element in table is 0
+  if (elementNames.empty() && elementTotalWeight.empty() && elementWeightFraction.empty()) {
+    for (unsigned int iElement = 0; iElement < G4Element::GetNumberOfElements();
+         iElement++) {  // first element in table is 0
       elementNames.push_back("rr");
       elementTotalWeight.push_back(0);
       elementWeightFraction.push_back(0);
@@ -78,211 +76,230 @@ void PrintMaterialBudgetInfo::update(const BeginOfRun* run) {
   //
 }
 
-void PrintMaterialBudgetInfo::dumpHeader(std::ostream& out ) {
-  out << "Geom."      << "\t"
-      << "Volume"     << "\t" << "\t"
-      << "Copy"       << "\t"
-      << "Solid"      << "\t" << "\t"
-      << "Material"   << "\t"
-      << "Density"    << "\t" << "\t"
-      << "Mass"       << "\t" << "\t"
-      << std::endl;
-  out << "Level"     << "\t"
-      << "Name"      << "\t" << "\t"
-      << "Number"    << "\t"
-      << "Name"      << "\t" << "\t"
-      << "Name"      << "\t" << "\t"
-      << "[g/cm3]"   << "\t" << "\t"
-      << "[g]    "   << "\t" << "\t"
-      << std::endl;
+void PrintMaterialBudgetInfo::dumpHeader(std::ostream& out) {
+  out << "Geom."
+      << "\t"
+      << "Volume"
+      << "\t"
+      << "\t"
+      << "Copy"
+      << "\t"
+      << "Solid"
+      << "\t"
+      << "\t"
+      << "Material"
+      << "\t"
+      << "Density"
+      << "\t"
+      << "\t"
+      << "Mass"
+      << "\t"
+      << "\t" << std::endl;
+  out << "Level"
+      << "\t"
+      << "Name"
+      << "\t"
+      << "\t"
+      << "Number"
+      << "\t"
+      << "Name"
+      << "\t"
+      << "\t"
+      << "Name"
+      << "\t"
+      << "\t"
+      << "[g/cm3]"
+      << "\t"
+      << "\t"
+      << "[g]    "
+      << "\t"
+      << "\t" << std::endl;
 }
 
-void PrintMaterialBudgetInfo::dumpLaTeXHeader(std::ostream& out ) {
-  out << "\\begin{table}[h!]"                                     << std::endl
-      << "  \\caption{\\textsf {" << name << "} volume list.}"               << std::endl
-      << "  \\label{tab: " << name << "}"                         << std::endl
-      << "  \\begin{center}"                                      << std::endl
-      << "    \\begin{tabular}{ccccccc}"                          << std::endl
-      << "      \\hline"                                          << std::endl;
-  out << "      Geom."      << "\t & "
-      << "      Volume"     << "\t & "
-      << "      Copy"       << "\t & "
-      << "      Solid"      << "\t & "
-      << "      Material"   << "\t & "
-      << "      Density"    << "\t & "
-      << "      Mass"       << "\t \\\\ "
-      << std::endl;
-  out << "      Level"      << "\t & "
-      << "      Name"       << "\t & "
-      << "      Number"     << "\t & "
-      << "      Name"       << "\t & "
-      << "      Name"       << "\t & "
-      << "                " << "\t & "
-      << "                " << "\t \\\\ "
-      << std::endl
-      << "      \\hline\\hline"
-      << std::endl;
+void PrintMaterialBudgetInfo::dumpLaTeXHeader(std::ostream& out) {
+  out << "\\begin{table}[h!]" << std::endl
+      << "  \\caption{\\textsf {" << name << "} volume list.}" << std::endl
+      << "  \\label{tab: " << name << "}" << std::endl
+      << "  \\begin{center}" << std::endl
+      << "    \\begin{tabular}{ccccccc}" << std::endl
+      << "      \\hline" << std::endl;
+  out << "      Geom."
+      << "\t & "
+      << "      Volume"
+      << "\t & "
+      << "      Copy"
+      << "\t & "
+      << "      Solid"
+      << "\t & "
+      << "      Material"
+      << "\t & "
+      << "      Density"
+      << "\t & "
+      << "      Mass"
+      << "\t \\\\ " << std::endl;
+  out << "      Level"
+      << "\t & "
+      << "      Name"
+      << "\t & "
+      << "      Number"
+      << "\t & "
+      << "      Name"
+      << "\t & "
+      << "      Name"
+      << "\t & "
+      << "                "
+      << "\t & "
+      << "                "
+      << "\t \\\\ " << std::endl
+      << "      \\hline\\hline" << std::endl;
 }
 
-void PrintMaterialBudgetInfo::dumpLaTeXFooter(std::ostream& out ) {
-  out << "      \\hline"      << std::endl
+void PrintMaterialBudgetInfo::dumpLaTeXFooter(std::ostream& out) {
+  out << "      \\hline" << std::endl
       << "    \\end{tabular}" << std::endl
-      << "  \\end{center}"    << std::endl
-      << "\\end{table}"       << std::endl;
+      << "  \\end{center}" << std::endl
+      << "\\end{table}" << std::endl;
 }
 
-void PrintMaterialBudgetInfo::dumpHierarchyLeaf(G4VPhysicalVolume* pv, G4LogicalVolume* lv,
-						unsigned int leafDepth,
-						std::ostream& weightOut,
-						std::ostream& texOut ) {
-  
-  if( volumeFound && ( leafDepth <= levelFound ) ) return; 
-  if( volumeFound && ( leafDepth >  levelFound ) ) printInfo(pv, lv, leafDepth, weightOut, texOut);
-  
+void PrintMaterialBudgetInfo::dumpHierarchyLeaf(
+    G4VPhysicalVolume* pv, G4LogicalVolume* lv, unsigned int leafDepth, std::ostream& weightOut, std::ostream& texOut) {
+  if (volumeFound && (leafDepth <= levelFound))
+    return;
+  if (volumeFound && (leafDepth > levelFound))
+    printInfo(pv, lv, leafDepth, weightOut, texOut);
+
   // choose mother volume
   std::string lvname = lv->GetName();
-  lvname.assign(lvname,0,nchar);
+  lvname.assign(lvname, 0, nchar);
   if (lvname == name) {
     volumeFound = true;
-    levelFound  = leafDepth;
+    levelFound = leafDepth;
     printInfo(pv, lv, leafDepth, weightOut, texOut);
     texOut << "      \\hline" << std::endl;
   }
-  
+
   //----- Get LV daughters from list of PV daughters
   mmlvpv lvpvDaughters;
-  std::set< G4LogicalVolume* > lvDaughters;
+  std::set<G4LogicalVolume*> lvDaughters;
   int NoDaughters = lv->GetNoDaughters();
-  while ((NoDaughters--)>0)
-    {
-      G4VPhysicalVolume* pvD = lv->GetDaughter(NoDaughters);
-      lvpvDaughters.insert(mmlvpv::value_type(pvD->GetLogicalVolume(), pvD));
-      lvDaughters.insert(pvD->GetLogicalVolume());
-    }
-  
-  std::set< G4LogicalVolume* >::const_iterator scite;
+  while ((NoDaughters--) > 0) {
+    G4VPhysicalVolume* pvD = lv->GetDaughter(NoDaughters);
+    lvpvDaughters.insert(mmlvpv::value_type(pvD->GetLogicalVolume(), pvD));
+    lvDaughters.insert(pvD->GetLogicalVolume());
+  }
+
+  std::set<G4LogicalVolume*>::const_iterator scite;
   mmlvpv::const_iterator mmcite;
-  
+
   //----- Dump daughters PV and LV
   for (scite = lvDaughters.begin(); scite != lvDaughters.end(); scite++) {
-    std::pair< mmlvpv::iterator, mmlvpv::iterator > mmER = lvpvDaughters.equal_range(*scite);    
+    std::pair<mmlvpv::iterator, mmlvpv::iterator> mmER = lvpvDaughters.equal_range(*scite);
     //----- Dump daughters PV of this LV
-    for (mmcite = mmER.first ; mmcite != mmER.second; mmcite++) 
-      dumpHierarchyLeaf((*mmcite).second, *scite, leafDepth+1, weightOut, texOut );
+    for (mmcite = mmER.first; mmcite != mmER.second; mmcite++)
+      dumpHierarchyLeaf((*mmcite).second, *scite, leafDepth + 1, weightOut, texOut);
   }
-  
 }
 
-void PrintMaterialBudgetInfo::printInfo(G4VPhysicalVolume* pv, G4LogicalVolume* lv, unsigned int leafDepth,
-					std::ostream& weightOut, std::ostream& texOut ) {
-  
+void PrintMaterialBudgetInfo::printInfo(
+    G4VPhysicalVolume* pv, G4LogicalVolume* lv, unsigned int leafDepth, std::ostream& weightOut, std::ostream& texOut) {
   double density = lv->GetMaterial()->GetDensity();
-  double weight  = lv->GetMass(false,false);
-  
+  double weight = lv->GetMass(false, false);
+
   std::string volumeName = lv->GetName();
-  if(volumeName.size()<8) volumeName.append("\t");
-  
+  if (volumeName.size() < 8)
+    volumeName.append("\t");
+
   std::string solidName = lv->GetSolid()->GetName();
-  if(solidName.size()<8) solidName.append("\t");
-    
+  if (solidName.size() < 8)
+    solidName.append("\t");
+
   std::string materialName = lv->GetMaterial()->GetName();
-  if(materialName.size()<8) materialName.append("\t");
-  
-  //----- dump info 
-  weightOut << leafDepth                                            << "\t"
-	    << volumeName                                           << "\t"
-	    << pv->GetCopyNo()                                      << "\t"
-	    << solidName                                            << "\t"
-	    << materialName                                         << "\t"
-	    << G4BestUnit(density,"Volumic Mass")                   << "\t"
-	    << G4BestUnit(weight,"Mass")                            << "\t"
-	    << std::endl;
+  if (materialName.size() < 8)
+    materialName.append("\t");
+
+  //----- dump info
+  weightOut << leafDepth << "\t" << volumeName << "\t" << pv->GetCopyNo() << "\t" << solidName << "\t" << materialName
+            << "\t" << G4BestUnit(density, "Volumic Mass") << "\t" << G4BestUnit(weight, "Mass") << "\t" << std::endl;
+  //
+  texOut << "\t" << leafDepth << "\t & " << stringLaTeXUnderscore(volumeName) << "\t & " << pv->GetCopyNo() << "\t & "
+         << stringLaTeXUnderscore(solidName) << "\t & " << stringLaTeXUnderscore(materialName) << "\t & "
+         << stringLaTeXSuperscript(G4BestUnit(density, "Volumic Mass")) << "\t & "
+         << stringLaTeXSuperscript(G4BestUnit(weight, "Mass")) << "\t \\\\ " << std::endl;
   //
-  texOut << "\t" 
-	 << leafDepth                                                  << "\t & "
-	 << stringLaTeXUnderscore(volumeName)                          << "\t & "
-	 << pv->GetCopyNo()                                            << "\t & "
-	 << stringLaTeXUnderscore(solidName)                           << "\t & "
-	 << stringLaTeXUnderscore(materialName)                        << "\t & "
-	 << stringLaTeXSuperscript(G4BestUnit(density,"Volumic Mass")) << "\t & "
-	 << stringLaTeXSuperscript(G4BestUnit(weight,"Mass"))          << "\t \\\\ "
-	 << std::endl;
-  //  
-  for(unsigned int iElement = 0; iElement<(unsigned int)lv->GetMaterial()->GetNumberOfElements(); iElement++) {
+  for (unsigned int iElement = 0; iElement < (unsigned int)lv->GetMaterial()->GetNumberOfElements(); iElement++) {
     // exclude Air in element weight fraction computation
-    if(materialName.find("Air")) {
+    if (materialName.find("Air")) {
       std::string elementName = lv->GetMaterial()->GetElement(iElement)->GetName();
       double elementMassFraction = lv->GetMaterial()->GetFractionVector()[iElement];
-      double elementWeight = weight*elementMassFraction;
+      double elementWeight = weight * elementMassFraction;
       unsigned int elementIndex = (unsigned int)lv->GetMaterial()->GetElement(iElement)->GetIndex();
-      elementNames[elementIndex]        = elementName;
+      elementNames[elementIndex] = elementName;
       elementTotalWeight[elementIndex] += elementWeight;
     }
   }
 }
 
-void PrintMaterialBudgetInfo::dumpElementMassFraction(std::ostream& elementOut ) {
+void PrintMaterialBudgetInfo::dumpElementMassFraction(std::ostream& elementOut) {
   // calculate mass fraction
-  double totalWeight   = 0.0;
+  double totalWeight = 0.0;
   double totalFraction = 0.0;
-  for(unsigned int iElement = 0; iElement<(unsigned int)elementTotalWeight.size(); iElement++) {
-    totalWeight+=elementTotalWeight[iElement];
+  for (unsigned int iElement = 0; iElement < (unsigned int)elementTotalWeight.size(); iElement++) {
+    totalWeight += elementTotalWeight[iElement];
   }
   // calculate element mass fractions
-  for(unsigned int iElement = 0; iElement<(unsigned int)elementTotalWeight.size(); iElement++) {
-    elementWeightFraction[iElement] = elementTotalWeight[iElement]/totalWeight;
-    totalFraction+=elementWeightFraction[iElement];
+  for (unsigned int iElement = 0; iElement < (unsigned int)elementTotalWeight.size(); iElement++) {
+    elementWeightFraction[iElement] = elementTotalWeight[iElement] / totalWeight;
+    totalFraction += elementWeightFraction[iElement];
   }
   // header
-  elementOut << "Element"        << "\t\t"
-	     << "Index"          << "\t"
-	     << "Total Mass"     << "\t"
-	     << "Mass Fraction " << "\t"
-	     << std::endl;
+  elementOut << "Element"
+             << "\t\t"
+             << "Index"
+             << "\t"
+             << "Total Mass"
+             << "\t"
+             << "Mass Fraction "
+             << "\t" << std::endl;
   // dump
-  for(unsigned int iElement = 0; iElement<(unsigned int)elementTotalWeight.size(); iElement++) {
-    if(elementNames[iElement]!="rr") {
-      if(elementNames[iElement].size()<8) elementNames[iElement].append("\t");
-      elementOut << elementNames[iElement]                          << "\t"
-		 << iElement                                        << "\t"
-		 << G4BestUnit(elementTotalWeight[iElement],"Mass") << "\t"
-		 << elementWeightFraction[iElement]
-		 << std::endl;
+  for (unsigned int iElement = 0; iElement < (unsigned int)elementTotalWeight.size(); iElement++) {
+    if (elementNames[iElement] != "rr") {
+      if (elementNames[iElement].size() < 8)
+        elementNames[iElement].append("\t");
+      elementOut << elementNames[iElement] << "\t" << iElement << "\t"
+                 << G4BestUnit(elementTotalWeight[iElement], "Mass") << "\t" << elementWeightFraction[iElement]
+                 << std::endl;
     }
   }
-  elementOut << "\n\t\tTotal Weight without Air " << G4BestUnit(totalWeight,"Mass")
-	     << "\tTotal Fraction "   << totalFraction
-	     << std::endl;
+  elementOut << "\n\t\tTotal Weight without Air " << G4BestUnit(totalWeight, "Mass") << "\tTotal Fraction "
+             << totalFraction << std::endl;
 }
 
 std::string PrintMaterialBudgetInfo::stringLaTeXUnderscore(std::string stringname) {
   // To replace '\' with '\_' to compile LaTeX output
   std::string stringoutput;
-  
-  for (unsigned int  i=0; i<stringname.length() ; i++) {
-    if (stringname.substr(i,1) == "_") {
+
+  for (unsigned int i = 0; i < stringname.length(); i++) {
+    if (stringname.substr(i, 1) == "_") {
       stringoutput += "\\_";
     } else {
-      stringoutput += stringname.substr(i,1);
+      stringoutput += stringname.substr(i, 1);
     }
   }
-  
+
   return stringoutput;
-  
 }
 
 std::string PrintMaterialBudgetInfo::stringLaTeXSuperscript(std::string stringname) {
   // To replace 'm3' with 'm$^3$' to compile LaTeX output
-  std::string stringoutput = stringname.substr(0,1);
-  
-  for (unsigned int  i=1; i<stringname.length() ; i++) {
-    if (stringname.substr(i-1,1) == "m" && stringname.substr(i,1) == "3") {
+  std::string stringoutput = stringname.substr(0, 1);
+
+  for (unsigned int i = 1; i < stringname.length(); i++) {
+    if (stringname.substr(i - 1, 1) == "m" && stringname.substr(i, 1) == "3") {
       stringoutput += "$^3$";
     } else {
-      stringoutput += stringname.substr(i,1);
+      stringoutput += stringname.substr(i, 1);
     }
   }
-    
+
   return stringoutput;
-  
 }
diff --git a/SimG4Core/PrintGeomInfo/src/PrintSensitive.cc b/SimG4Core/PrintGeomInfo/src/PrintSensitive.cc
index f8b0b91c5d2b9..c59681cb15497 100644
--- a/SimG4Core/PrintGeomInfo/src/PrintSensitive.cc
+++ b/SimG4Core/PrintGeomInfo/src/PrintSensitive.cc
@@ -13,55 +13,54 @@
 using namespace CLHEP;
 
 PrintSensitive::PrintSensitive(const edm::ParameterSet &p) {
-  name  = p.getUntrackedParameter<std::string>("Name","*");
+  name = p.getUntrackedParameter<std::string>("Name", "*");
   nchar = name.find("*");
-  name.assign(name,0,nchar);
+  name.assign(name, 0, nchar);
   std::cout << "PrintSensitive:: Print position of all Sensitive Touchables: "
-	    << " for names (0-" << nchar << ") = " << name << "\n";
+            << " for names (0-" << nchar << ") = " << name << "\n";
 }
- 
+
 PrintSensitive::~PrintSensitive() {}
-  
-void PrintSensitive::update(const BeginOfRun * run) {
 
-  G4VPhysicalVolume * theTopPV = getTopPV();
+void PrintSensitive::update(const BeginOfRun *run) {
+  G4VPhysicalVolume *theTopPV = getTopPV();
   dumpTouch(theTopPV, 0, false, std::cout);
 }
 
-void PrintSensitive::dumpTouch(G4VPhysicalVolume * pv, unsigned int leafDepth, 
-			       bool printIt, std::ostream & out) {
-
-  if (leafDepth == 0) fHistory.SetFirstEntry(pv);
-  else fHistory.NewLevel(pv, kNormal, pv->GetCopyNo());
+void PrintSensitive::dumpTouch(G4VPhysicalVolume *pv, unsigned int leafDepth, bool printIt, std::ostream &out) {
+  if (leafDepth == 0)
+    fHistory.SetFirstEntry(pv);
+  else
+    fHistory.NewLevel(pv, kNormal, pv->GetCopyNo());
 
-  G4ThreeVector globalpoint = fHistory.GetTopTransform().Inverse().
-    TransformPoint(G4ThreeVector(0,0,0));
-  G4LogicalVolume * lv = pv->GetLogicalVolume();
+  G4ThreeVector globalpoint = fHistory.GetTopTransform().Inverse().TransformPoint(G4ThreeVector(0, 0, 0));
+  G4LogicalVolume *lv = pv->GetLogicalVolume();
 
   std::string mother = "World";
-  if (pv->GetMotherLogical()) mother = pv->GetMotherLogical()->GetName();
+  if (pv->GetMotherLogical())
+    mother = pv->GetMotherLogical()->GetName();
   std::string lvname = lv->GetName();
-  lvname.assign(lvname,0,nchar);
-  if (lvname == name) printIt = true;
+  lvname.assign(lvname, 0, nchar);
+  if (lvname == name)
+    printIt = true;
 
   if (lv->GetSensitiveDetector() && printIt) {
-    out << leafDepth << " ### VOLUME = " << lv->GetName() 
-	<< " Copy No " << pv->GetCopyNo() << " in " << mother
-	<< " global position of centre " << globalpoint << " (r=" 
-	<<  globalpoint.perp() << ", phi=" <<  globalpoint.phi()/deg
-	<< ")\n";
+    out << leafDepth << " ### VOLUME = " << lv->GetName() << " Copy No " << pv->GetCopyNo() << " in " << mother
+        << " global position of centre " << globalpoint << " (r=" << globalpoint.perp()
+        << ", phi=" << globalpoint.phi() / deg << ")\n";
   }
 
   int NoDaughters = lv->GetNoDaughters();
-  while ((NoDaughters--)>0)  {
-    G4VPhysicalVolume * pvD = lv->GetDaughter(NoDaughters);
-    if (!pvD->IsReplicated()) dumpTouch(pvD, leafDepth+1, printIt, out);
+  while ((NoDaughters--) > 0) {
+    G4VPhysicalVolume *pvD = lv->GetDaughter(NoDaughters);
+    if (!pvD->IsReplicated())
+      dumpTouch(pvD, leafDepth + 1, printIt, out);
   }
 
-  if (leafDepth > 0) fHistory.BackLevel();
+  if (leafDepth > 0)
+    fHistory.BackLevel();
 }
 
-G4VPhysicalVolume * PrintSensitive::getTopPV() {
-  return G4TransportationManager::GetTransportationManager()
-    ->GetNavigatorForTracking()->GetWorldVolume();
+G4VPhysicalVolume *PrintSensitive::getTopPV() {
+  return G4TransportationManager::GetTransportationManager()->GetNavigatorForTracking()->GetWorldVolume();
 }
diff --git a/SimG4Core/PrintGeomInfo/src/module.cc b/SimG4Core/PrintGeomInfo/src/module.cc
index 4e4bf3499f286..efc9bab12520f 100644
--- a/SimG4Core/PrintGeomInfo/src/module.cc
+++ b/SimG4Core/PrintGeomInfo/src/module.cc
@@ -4,7 +4,6 @@
 #include "SimG4Core/PrintGeomInfo/interface/PrintSensitive.h"
 #include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
-   
 
 DEFINE_SIMWATCHER(PrintGeomInfoAction);
 DEFINE_SIMWATCHER(PrintGeomSummary);
diff --git a/SimG4Core/PrintTrackNumber/interface/PrintTrackNumberAction.h b/SimG4Core/PrintTrackNumber/interface/PrintTrackNumberAction.h
index 328f1bb0b67f4..301fca4626369 100644
--- a/SimG4Core/PrintTrackNumber/interface/PrintTrackNumberAction.h
+++ b/SimG4Core/PrintTrackNumber/interface/PrintTrackNumberAction.h
@@ -1,31 +1,29 @@
 #ifndef SimG4Core_PrintTrackNumberAction_H
 #define SimG4Core_PrintTrackNumberAction_H
 
-#include "SimG4Core/Watcher/interface/SimWatcher.h"
-#include "SimG4Core/Notification/interface/Observer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-   
+#include "SimG4Core/Notification/interface/Observer.h"
+#include "SimG4Core/Watcher/interface/SimWatcher.h"
+
 class EndOfEvent;
 class EndOfTrack;
 
 class PrintTrackNumberAction : public SimWatcher,
-			       public Observer<const EndOfEvent *>, 
-			       public Observer<const EndOfTrack *> 
-{
+                               public Observer<const EndOfEvent *>,
+                               public Observer<const EndOfTrack *> {
 public:
-    PrintTrackNumberAction(edm::ParameterSet const & p);
-    ~PrintTrackNumberAction() override;
-    void update(const EndOfTrack * trk) override;
-    void update(const EndOfEvent * trk) override;
+  PrintTrackNumberAction(edm::ParameterSet const &p);
+  ~PrintTrackNumberAction() override;
+  void update(const EndOfTrack *trk) override;
+  void update(const EndOfEvent *trk) override;
+
 private:
-    int theNoTracks;
-    int theNoTracksThisEvent;
-    int theNoTracksNoUL;
-    int theNoTracksThisEventNoUL;
-    int theNoTracksToPrint;
-    bool bNoUserLimits;
+  int theNoTracks;
+  int theNoTracksThisEvent;
+  int theNoTracksNoUL;
+  int theNoTracksThisEventNoUL;
+  int theNoTracksToPrint;
+  bool bNoUserLimits;
 };
 
 #endif
-
-
diff --git a/SimG4Core/PrintTrackNumber/src/PrintTrackNumberAction.cc b/SimG4Core/PrintTrackNumber/src/PrintTrackNumberAction.cc
index 764af1a4cd6b5..ad4cd47aa6662 100644
--- a/SimG4Core/PrintTrackNumber/src/PrintTrackNumberAction.cc
+++ b/SimG4Core/PrintTrackNumber/src/PrintTrackNumberAction.cc
@@ -1,107 +1,77 @@
 #include "SimG4Core/PrintTrackNumber/interface/PrintTrackNumberAction.h"
 
-#include "SimG4Core/Notification/interface/EndOfTrack.h"
 #include "SimG4Core/Notification/interface/EndOfEvent.h"
+#include "SimG4Core/Notification/interface/EndOfTrack.h"
 
-#include "G4Track.hh"
 #include "G4Event.hh"
+#include "G4Track.hh"
 #include "G4VProcess.hh"
 
-PrintTrackNumberAction::PrintTrackNumberAction(edm::ParameterSet const & p)
-    : theNoTracks(0), theNoTracksThisEvent(0),
-      theNoTracksNoUL(0), theNoTracksThisEventNoUL(0)
-{
-    theNoTracksToPrint = p.getUntrackedParameter<int>("EachNTrack",-1); 
-    // do not count tracks killed by user limits (MinEkineCut for the moment only)
-    bNoUserLimits = p.getUntrackedParameter<bool>("NoUserLimits", true); 
-    std::cout << " PrintTrackNumberAction::bNoUserLimits " << bNoUserLimits << std::endl; 
+PrintTrackNumberAction::PrintTrackNumberAction(edm::ParameterSet const &p)
+    : theNoTracks(0), theNoTracksThisEvent(0), theNoTracksNoUL(0), theNoTracksThisEventNoUL(0) {
+  theNoTracksToPrint = p.getUntrackedParameter<int>("EachNTrack", -1);
+  // do not count tracks killed by user limits (MinEkineCut for the moment only)
+  bNoUserLimits = p.getUntrackedParameter<bool>("NoUserLimits", true);
+  std::cout << " PrintTrackNumberAction::bNoUserLimits " << bNoUserLimits << std::endl;
 }
- 
+
 PrintTrackNumberAction::~PrintTrackNumberAction() {}
- 
-void PrintTrackNumberAction::update(const EndOfTrack * trk)
-{
-    const G4Track * aTrack = (*trk)(); 
 
-    theNoTracks++;
-    theNoTracksThisEvent++;
-
-    if (bNoUserLimits) 
-    {
-	bool countTrk = true;
-	// tracks that have been killed before first step (by MinEkineCut). 
-	// In fact the track makes the first step, MinEkineCut process determines 
-	// that the energy is too low, set it to 0, and then at the next step 
-	// the 0-energy particle dies
-	if (aTrack->GetCurrentStepNumber() == 2) 
-	{
-	    const G4VProcess* proccur = 
-		aTrack->GetStep()->GetPostStepPoint()->GetProcessDefinedStep();
-	    if (proccur != nullptr)
-	    {
-		if (proccur->GetProcessName() == "MinEkineCut") 
-		{
-		    countTrk = false;
-		} 
-		else 
-		{
-		    // for e+, last step is annihil, while previous is MinEkineCut
-		    const G4VProcess* procprev = 
-			aTrack->GetStep()->GetPreStepPoint()->GetProcessDefinedStep();
-		    if (procprev != nullptr)
-		    {
-			if (procprev->GetProcessName() == "MinEkineCut") 
-			{
-			    countTrk = false;
-			}
-		    }
-		}
-	    }
-	}
-	if (countTrk) 
-	{
-	    theNoTracksNoUL++;
-	    theNoTracksThisEventNoUL++;
-	    if (theNoTracksToPrint > 0) 
-	    {
-		if (theNoTracksThisEventNoUL%theNoTracksToPrint == 0) 
-		{
-		    std::cout << "PTNA: Simulating Track Number = " 
-			      << theNoTracksThisEventNoUL << std::endl;
-		}
-	    }
-	}
-    } 
-    else 
-    {
-	if (theNoTracksToPrint > 0) 
-	{
-	    if (theNoTracksThisEvent%theNoTracksToPrint == 0) 
-	    {
-		std::cout << "PTNA: Simulating Track Number = " 
-			  << theNoTracksThisEvent << std::endl;
-	    }
-	}
-    }
-}
+void PrintTrackNumberAction::update(const EndOfTrack *trk) {
+  const G4Track *aTrack = (*trk)();
 
+  theNoTracks++;
+  theNoTracksThisEvent++;
 
-void PrintTrackNumberAction::update(const EndOfEvent * e)
-{
-    const G4Event * g4e = (*e)(); 
-    std::cout << "PTNA: Event simulated= " << g4e->GetEventID() << " #tracks= ";
-    if (bNoUserLimits) 
-    {
-	std::cout << theNoTracksThisEventNoUL << "  Total #tracks in run= " 
-		  << theNoTracksNoUL << " counting killed by UL= " << theNoTracks 
-		  << std::endl;
-	theNoTracksThisEventNoUL = 0;
-    } 
-    else 
-    {
-	std::cout << theNoTracksThisEvent << "  Total #tracks in run= " 
-		  << theNoTracks << std::endl;
-	theNoTracksThisEvent = 0;
+  if (bNoUserLimits) {
+    bool countTrk = true;
+    // tracks that have been killed before first step (by MinEkineCut).
+    // In fact the track makes the first step, MinEkineCut process determines
+    // that the energy is too low, set it to 0, and then at the next step
+    // the 0-energy particle dies
+    if (aTrack->GetCurrentStepNumber() == 2) {
+      const G4VProcess *proccur = aTrack->GetStep()->GetPostStepPoint()->GetProcessDefinedStep();
+      if (proccur != nullptr) {
+        if (proccur->GetProcessName() == "MinEkineCut") {
+          countTrk = false;
+        } else {
+          // for e+, last step is annihil, while previous is MinEkineCut
+          const G4VProcess *procprev = aTrack->GetStep()->GetPreStepPoint()->GetProcessDefinedStep();
+          if (procprev != nullptr) {
+            if (procprev->GetProcessName() == "MinEkineCut") {
+              countTrk = false;
+            }
+          }
+        }
+      }
+    }
+    if (countTrk) {
+      theNoTracksNoUL++;
+      theNoTracksThisEventNoUL++;
+      if (theNoTracksToPrint > 0) {
+        if (theNoTracksThisEventNoUL % theNoTracksToPrint == 0) {
+          std::cout << "PTNA: Simulating Track Number = " << theNoTracksThisEventNoUL << std::endl;
+        }
+      }
     }
+  } else {
+    if (theNoTracksToPrint > 0) {
+      if (theNoTracksThisEvent % theNoTracksToPrint == 0) {
+        std::cout << "PTNA: Simulating Track Number = " << theNoTracksThisEvent << std::endl;
+      }
+    }
+  }
 }
 
+void PrintTrackNumberAction::update(const EndOfEvent *e) {
+  const G4Event *g4e = (*e)();
+  std::cout << "PTNA: Event simulated= " << g4e->GetEventID() << " #tracks= ";
+  if (bNoUserLimits) {
+    std::cout << theNoTracksThisEventNoUL << "  Total #tracks in run= " << theNoTracksNoUL
+              << " counting killed by UL= " << theNoTracks << std::endl;
+    theNoTracksThisEventNoUL = 0;
+  } else {
+    std::cout << theNoTracksThisEvent << "  Total #tracks in run= " << theNoTracks << std::endl;
+    theNoTracksThisEvent = 0;
+  }
+}
diff --git a/SimG4Core/PrintTrackNumber/src/module.cc b/SimG4Core/PrintTrackNumber/src/module.cc
index 020da4de2fa68..315117d59794d 100644
--- a/SimG4Core/PrintTrackNumber/src/module.cc
+++ b/SimG4Core/PrintTrackNumber/src/module.cc
@@ -1,6 +1,5 @@
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "SimG4Core/PrintTrackNumber/interface/PrintTrackNumberAction.h"
 #include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-   
 
 DEFINE_SIMWATCHER(PrintTrackNumberAction);
diff --git a/SimG4Core/SaveSimTrackAction/interface/SaveSimTrack.h b/SimG4Core/SaveSimTrackAction/interface/SaveSimTrack.h
index 6262ae4affbb9..d173b62ae8124 100644
--- a/SimG4Core/SaveSimTrackAction/interface/SaveSimTrack.h
+++ b/SimG4Core/SaveSimTrackAction/interface/SaveSimTrack.h
@@ -1,25 +1,21 @@
 #ifndef SimG4Core_SaveSimTrack_H
 #define SimG4Core_SaveSimTrack_H
 
-#include "SimG4Core/Watcher/interface/SimWatcher.h"
-#include "SimG4Core/Notification/interface/Observer.h"
-#include "SimG4Core/Notification/interface/BeginOfTrack.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "SimG4Core/Notification/interface/BeginOfTrack.h"
+#include "SimG4Core/Notification/interface/Observer.h"
+#include "SimG4Core/Watcher/interface/SimWatcher.h"
 
 #include <vector>
 
-class SaveSimTrack : public SimWatcher,
-                     public Observer<const BeginOfTrack *> {
-
+class SaveSimTrack : public SimWatcher, public Observer<const BeginOfTrack *> {
 public:
-  SaveSimTrack(edm::ParameterSet const & p);
+  SaveSimTrack(edm::ParameterSet const &p);
   ~SaveSimTrack() override;
-  void update(const BeginOfTrack * trk) override;
+  void update(const BeginOfTrack *trk) override;
 
 private:
   std::vector<int> pdgs_;
 };
 
 #endif
-
-
diff --git a/SimG4Core/SaveSimTrackAction/src/SaveSimTrack.cc b/SimG4Core/SaveSimTrackAction/src/SaveSimTrack.cc
index 50e3aa1cde758..4f121feadb5b7 100644
--- a/SimG4Core/SaveSimTrackAction/src/SaveSimTrack.cc
+++ b/SimG4Core/SaveSimTrackAction/src/SaveSimTrack.cc
@@ -5,39 +5,33 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "G4Track.hh"
 #include "G4PhysicalConstants.hh"
 #include "G4SystemOfUnits.hh"
+#include "G4Track.hh"
 #include <algorithm>
 
-SaveSimTrack::SaveSimTrack(edm::ParameterSet const & p) {
-
+SaveSimTrack::SaveSimTrack(edm::ParameterSet const &p) {
   edm::ParameterSet ps = p.getParameter<edm::ParameterSet>("SaveSimTrack");
   pdgs_ = ps.getUntrackedParameter<std::vector<int>>("PDGCodes");
 
   edm::LogInfo("SaveSimTrack") << "SaveSimTrack:: Save Sim Track if PDG code "
-			       << "is one from the list of "  << pdgs_.size()
-			       << " items";
-  for (unsigned int k=0; k<pdgs_.size(); ++k)
+                               << "is one from the list of " << pdgs_.size() << " items";
+  for (unsigned int k = 0; k < pdgs_.size(); ++k)
     edm::LogInfo("SaveSimTrack") << "[" << k << "] " << pdgs_[k];
 }
 
 SaveSimTrack::~SaveSimTrack() {}
- 
-void SaveSimTrack::update(const BeginOfTrack * trk) {
 
-  G4Track* theTrack = (G4Track*)((*trk)());
-  TrackInformation * trkInfo = (TrackInformation *)(theTrack->GetUserInformation());
+void SaveSimTrack::update(const BeginOfTrack *trk) {
+  G4Track *theTrack = (G4Track *)((*trk)());
+  TrackInformation *trkInfo = (TrackInformation *)(theTrack->GetUserInformation());
   if (trkInfo) {
     int pdg = theTrack->GetDefinition()->GetPDGEncoding();
-    if (std::find(pdgs_.begin(),pdgs_.end(),pdg) != pdgs_.end()) {
+    if (std::find(pdgs_.begin(), pdgs_.end(), pdg) != pdgs_.end()) {
       trkInfo->storeTrack(true);
-      LogDebug("SaveSimTrack") << "Save SimTrack the Track " 
-			       << theTrack->GetTrackID() << " Type " 
-			       << theTrack->GetDefinition()->GetParticleName()
-			       << " Momentum " << theTrack->GetMomentum()/MeV 
-			       << " MeV/c";
+      LogDebug("SaveSimTrack") << "Save SimTrack the Track " << theTrack->GetTrackID() << " Type "
+                               << theTrack->GetDefinition()->GetParticleName() << " Momentum "
+                               << theTrack->GetMomentum() / MeV << " MeV/c";
     }
   }
 }
-
diff --git a/SimG4Core/SaveSimTrackAction/src/module.cc b/SimG4Core/SaveSimTrackAction/src/module.cc
index 8d9ac6999d93b..179270cbf5059 100644
--- a/SimG4Core/SaveSimTrackAction/src/module.cc
+++ b/SimG4Core/SaveSimTrackAction/src/module.cc
@@ -1,6 +1,5 @@
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "SimG4Core/SaveSimTrackAction/interface/SaveSimTrack.h"
 #include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-    
 
 DEFINE_SIMWATCHER(SaveSimTrack);
diff --git a/SimG4Core/SensitiveDetector/interface/SensitiveCaloDetector.h b/SimG4Core/SensitiveDetector/interface/SensitiveCaloDetector.h
index b8236547a3333..5d9f289ea8e12 100644
--- a/SimG4Core/SensitiveDetector/interface/SensitiveCaloDetector.h
+++ b/SimG4Core/SensitiveDetector/interface/SensitiveCaloDetector.h
@@ -16,6 +16,7 @@ class SensitiveCaloDetector : public SensitiveDetector
   SensitiveDetector(iname,cpv,clg,p,true) {};
 
   virtual void fillHits(edm::PCaloHitContainer &, const std::string& hname) = 0;
+  virtual void reset() {};
 };
 
 #endif
diff --git a/SimG4Core/TrackingVerbose/interface/TrackingVerboseAction.h b/SimG4Core/TrackingVerbose/interface/TrackingVerboseAction.h
index 5ffc565028320..065e641036929 100644
--- a/SimG4Core/TrackingVerbose/interface/TrackingVerboseAction.h
+++ b/SimG4Core/TrackingVerbose/interface/TrackingVerboseAction.h
@@ -12,7 +12,7 @@
 // each fTVTrackStep tracks (starting at 1, not 0) and if the trackNo is
 //     fTVTrackMin <= trackNo <= fTVTrackMax
 // each fTVTrackStep tracks (starting at 1, not 0)
-// 
+//
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef SimG4Core_TrackingVerbose_h
@@ -21,7 +21,7 @@
 #include "SimG4Core/Watcher/interface/SimWatcher.h"
 #include "SimG4Core/Notification/interface/Observer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-  
+
 #include "G4Step.hh"
 
 #include <vector>
@@ -34,27 +34,28 @@ class G4Track;
 class G4TrackingManager;
 class G4VSteppingVerbose;
 
-class TrackingVerboseAction :  public SimWatcher,
-			       public Observer<const BeginOfRun *>, 
-			       public Observer<const BeginOfEvent *>, 
-			       public Observer<const BeginOfTrack *>,
-                               public Observer<const EndOfTrack *>,
-                               public Observer<const G4Step *> {
-
+class TrackingVerboseAction : public SimWatcher,
+                              public Observer<const BeginOfRun *>,
+                              public Observer<const BeginOfEvent *>,
+                              public Observer<const BeginOfTrack *>,
+                              public Observer<const EndOfTrack *>,
+                              public Observer<const G4Step *> {
 public:
-  TrackingVerboseAction(edm::ParameterSet const & p);
+  TrackingVerboseAction(edm::ParameterSet const &p);
   ~TrackingVerboseAction() override;
   void update(const BeginOfRun *) override;
   void update(const BeginOfEvent *) override;
   void update(const BeginOfTrack *) override;
   void update(const EndOfTrack *) override;
-  void update(const G4Step*) override;
+  void update(const G4Step *) override;
+
 private:
   void setTrackingVerbose(int verblev);
-  bool checkTrackingVerbose(const G4Track*);
-  void printTrackInfo(const G4Track*);
+  bool checkTrackingVerbose(const G4Track *);
+  void printTrackInfo(const G4Track *);
+
 private:
-  int  fLarge;
+  int fLarge;
   bool fDEBUG;
   bool fG4Verbose;
   bool fHighEtPhotons;
@@ -68,8 +69,8 @@ class TrackingVerboseAction :  public SimWatcher,
   bool fTrackingVerboseON;
   bool fTkVerbThisEventON;
   std::vector<int> fPdgIds;
-  G4TrackingManager * theTrackingManager;
-  G4VSteppingVerbose* fVerbose;
+  G4TrackingManager *theTrackingManager;
+  G4VSteppingVerbose *fVerbose;
 };
 
 #endif
diff --git a/SimG4Core/TrackingVerbose/src/TrackingVerboseAction.cc b/SimG4Core/TrackingVerbose/src/TrackingVerboseAction.cc
index 9900ad7ea752a..920697ed4ac94 100644
--- a/SimG4Core/TrackingVerbose/src/TrackingVerboseAction.cc
+++ b/SimG4Core/TrackingVerbose/src/TrackingVerboseAction.cc
@@ -22,55 +22,49 @@
 #include "G4VSteppingVerbose.hh"
 #include "G4UnitsTable.hh"
 
-#include<algorithm>
+#include <algorithm>
 
 using namespace CLHEP;
 
-TrackingVerboseAction::TrackingVerboseAction(edm::ParameterSet const & p) :
-  theTrackingManager(nullptr), fVerbose(nullptr) {
-
+TrackingVerboseAction::TrackingVerboseAction(edm::ParameterSet const& p)
+    : theTrackingManager(nullptr), fVerbose(nullptr) {
   fLarge = int(1E10);
-  fDEBUG = p.getUntrackedParameter<bool>("DEBUG",false);
-  fHighEtPhotons = p.getUntrackedParameter<bool>("CheckForHighEtPhotons",false);
-  fG4Verbose = p.getUntrackedParameter<bool>("G4Verbose",false);
+  fDEBUG = p.getUntrackedParameter<bool>("DEBUG", false);
+  fHighEtPhotons = p.getUntrackedParameter<bool>("CheckForHighEtPhotons", false);
+  fG4Verbose = p.getUntrackedParameter<bool>("G4Verbose", false);
 
   //----- Set which events are verbose
-  fTVEventMin  = p.getUntrackedParameter<int>("EventMin",0);
-  fTVEventMax  = p.getUntrackedParameter<int>("EventMax",fLarge);
-  fTVEventStep = p.getUntrackedParameter<int>("EventStep",1);
+  fTVEventMin = p.getUntrackedParameter<int>("EventMin", 0);
+  fTVEventMax = p.getUntrackedParameter<int>("EventMax", fLarge);
+  fTVEventStep = p.getUntrackedParameter<int>("EventStep", 1);
 
   //----- Set which tracks of those events are verbose
-  fTVTrackMin  = p.getUntrackedParameter<int>("TrackMin",0);
-  fTVTrackMax  = p.getUntrackedParameter<int>("TrackMax",fLarge);
-  fTVTrackStep = p.getUntrackedParameter<int>("TrackStep",1);
+  fTVTrackMin = p.getUntrackedParameter<int>("TrackMin", 0);
+  fTVTrackMax = p.getUntrackedParameter<int>("TrackMax", fLarge);
+  fTVTrackStep = p.getUntrackedParameter<int>("TrackStep", 1);
 
   //----- Set the verbosity level
-  fVerboseLevel = p.getUntrackedParameter<int>("VerboseLevel",1);
-  fPdgIds       = p.getUntrackedParameter<std::vector<int> >("PDGids");
+  fVerboseLevel = p.getUntrackedParameter<int>("VerboseLevel", 1);
+  fPdgIds = p.getUntrackedParameter<std::vector<int> >("PDGids");
   if (fDEBUG) {
-    G4cout << "TV: fTVTrackMin " << fTVTrackMin 
-	   << " fTVTrackMax "    <<  fTVTrackMax 
-	   <<  " fTVTrackStep "  << fTVTrackStep  
-	   << " fTVEventMin "    << fTVEventMin 
-	   << " fTVEventMax "    << fTVEventMax   
-	   << " fTVEventStep "   << fTVEventStep 
-	   << " fVerboseLevel "  << fVerboseLevel 
-	   << " fG4Verbose "     << fG4Verbose 
-	   << " PDGIds     "     << fPdgIds.size() << G4endl;
-    for (unsigned int ii=0; ii<fPdgIds.size(); ++ii) 
+    G4cout << "TV: fTVTrackMin " << fTVTrackMin << " fTVTrackMax " << fTVTrackMax << " fTVTrackStep " << fTVTrackStep
+           << " fTVEventMin " << fTVEventMin << " fTVEventMax " << fTVEventMax << " fTVEventStep " << fTVEventStep
+           << " fVerboseLevel " << fVerboseLevel << " fG4Verbose " << fG4Verbose << " PDGIds     " << fPdgIds.size()
+           << G4endl;
+    for (unsigned int ii = 0; ii < fPdgIds.size(); ++ii)
       G4cout << "TV: PDGId[" << ii << "] = " << fPdgIds[ii] << G4endl;
   }
-  
+
   //----- Set verbosity off to start
   fTrackingVerboseON = false;
   fTkVerbThisEventON = false;
-  
+
   G4cout << " TrackingVerbose constructed " << G4endl;
 }
 
 TrackingVerboseAction::~TrackingVerboseAction() {}
 
-void TrackingVerboseAction::update(const BeginOfRun * run) {
+void TrackingVerboseAction::update(const BeginOfRun* run) {
   /*
   TrackingAction * ta = 
     dynamic_cast<TrackingAction*>(G4EventManager::GetEventManager()->GetUserTrackingAction());
@@ -78,46 +72,50 @@ void TrackingVerboseAction::update(const BeginOfRun * run) {
   */
   fVerbose = G4VSteppingVerbose::GetInstance();
   if (fDEBUG)
-    G4cout << " TV: Get the Tracking Manager: " << theTrackingManager
-	   << " and the SteppingVerbose: " << fVerbose << G4endl;
+    G4cout << " TV: Get the Tracking Manager: " << theTrackingManager << " and the SteppingVerbose: " << fVerbose
+           << G4endl;
 }
 
-void TrackingVerboseAction::update(const BeginOfEvent * evt) {
-  if (evt==nullptr) return;
-  const G4Event * anEvent = (*evt)();
-  if (anEvent==nullptr) return;
+void TrackingVerboseAction::update(const BeginOfEvent* evt) {
+  if (evt == nullptr)
+    return;
+  const G4Event* anEvent = (*evt)();
+  if (anEvent == nullptr)
+    return;
 
-  //----------- Set /tracking/verbose for this event 
+  //----------- Set /tracking/verbose for this event
   int eventNo = anEvent->GetEventID();
-  if (fDEBUG) G4cout << "TV: trackID: NEW EVENT " << eventNo << G4endl;
+  if (fDEBUG)
+    G4cout << "TV: trackID: NEW EVENT " << eventNo << G4endl;
 
   fTkVerbThisEventON = false;
   //----- Check if event is in the selected range
   if (eventNo >= fTVEventMin && eventNo <= fTVEventMax) {
-    if ((eventNo-fTVEventMin) % fTVEventStep == 0) fTkVerbThisEventON = true;
+    if ((eventNo - fTVEventMin) % fTVEventStep == 0)
+      fTkVerbThisEventON = true;
   }
 
   if (fDEBUG)
-    G4cout << " TV: fTkVerbThisEventON " <<  fTkVerbThisEventON 
-	   << " fTrackingVerboseON " << fTrackingVerboseON 
-	   << " fTVEventMin " << fTVEventMin << " fTVEventMax " << fTVEventMax << G4endl;
+    G4cout << " TV: fTkVerbThisEventON " << fTkVerbThisEventON << " fTrackingVerboseON " << fTrackingVerboseON
+           << " fTVEventMin " << fTVEventMin << " fTVEventMax " << fTVEventMax << G4endl;
   //----- check if verbosity has to be changed
   if ((fTkVerbThisEventON) && (!fTrackingVerboseON)) {
-    if (fTVTrackMin == 0 && fTVTrackMax == fLarge && fTVTrackStep != 1)	{
+    if (fTVTrackMin == 0 && fTVTrackMax == fLarge && fTVTrackStep != 1) {
       setTrackingVerbose(fVerboseLevel);
       fTrackingVerboseON = true;
-      if (fDEBUG) G4cout << "TV: VERBOSEet1 " << eventNo << G4endl;
+      if (fDEBUG)
+        G4cout << "TV: VERBOSEet1 " << eventNo << G4endl;
     }
-  } else if ((!fTkVerbThisEventON) && (fTrackingVerboseON) ) {
+  } else if ((!fTkVerbThisEventON) && (fTrackingVerboseON)) {
     setTrackingVerbose(0);
     fTrackingVerboseON = false;
-    if (fDEBUG) G4cout << "TV: VERBOSEet0 " << eventNo << G4endl;
+    if (fDEBUG)
+      G4cout << "TV: VERBOSEet0 " << eventNo << G4endl;
   }
-
 }
 
-void TrackingVerboseAction::update(const BeginOfTrack * trk) {
-  const G4Track * aTrack = (*trk)();
+void TrackingVerboseAction::update(const BeginOfTrack* trk) {
+  const G4Track* aTrack = (*trk)();
 
   //----- High ET photon printout
   //---------- Set /tracking/verbose
@@ -131,146 +129,138 @@ void TrackingVerboseAction::update(const BeginOfTrack * trk) {
   double tvty = aTrack->GetVertexPosition().y();
   double tvtz = aTrack->GetVertexPosition().z();
 
-  double g4t_phi=atan2(tkPy,tkPx);
+  double g4t_phi = atan2(tkPy, tkPx);
 
-  double drpart=sqrt(tkPx*tkPx + tkPy*tkPy);
+  double drpart = sqrt(tkPx * tkPx + tkPy * tkPy);
 
-  double mythetapart=acos(tkPz/sqrt(drpart*drpart+tkPz*tkPz));
+  double mythetapart = acos(tkPz / sqrt(drpart * drpart + tkPz * tkPz));
 
-  double g4t_eta=-log(tan(mythetapart/2.));
+  double g4t_eta = -log(tan(mythetapart / 2.));
   G4int MytrackNo = aTrack->GetTrackID();
-    
+
   if (fHighEtPhotons) {
-    if (aTrack->GetDefinition()->GetParticleName() == "gamma" && aTrack->GetParentID() !=0) {
-      if((tkPx*tkPx + tkPy*tkPy + tkPz*tkPz)>1000.0*1000.0 &&
-	 aTrack->GetCreatorProcess()->GetProcessName() == "LCapture") {
-	G4cout << "MY NEW GAMMA " << G4endl;
-	G4cout << "**********************************************************************"  << G4endl;
-	G4cout << "MY NEW TRACK ID = " << MytrackNo << "("
-	       << aTrack->GetDefinition()->GetParticleName()
-	       <<")"<< " PARENT ="<< aTrack->GetParentID() << G4endl;
-	G4cout << "Primary particle: " 
-	       << aTrack->GetDynamicParticle()->GetPrimaryParticle() << G4endl;
-	G4cout << "Process type: " << aTrack->GetCreatorProcess()->GetProcessType()
-	       << " Process name: " 
-	       << aTrack->GetCreatorProcess()->GetProcessName() << G4endl;
-	G4cout << "ToT E = " << aTrack->GetTotalEnergy() 
-	       << " KineE = " << aTrack->GetKineticEnergy()
-	       << " Tot P = " << tkP << " Pt = " << sqrt(tkPx*tkPx + tkPy*tkPy) 
-	       << " VTX=(" << tvtx << "," << tvty << "," << tvtz << ")" << G4endl;
-	if (aTrack->GetKineticEnergy() > 1.*GeV 
-	    && aTrack->GetCreatorProcess()->GetProcessName() != "LCapture")
-	  G4cout << " KineE > 1 GeV !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << G4endl;
-	const G4VTouchable* touchable=aTrack->GetTouchable();
-	if (touchable!=nullptr && touchable->GetVolume()!=nullptr &&
-	    touchable->GetVolume()->GetLogicalVolume()!=nullptr) {
-	  G4Material* material=touchable->GetVolume()->GetLogicalVolume()->GetMaterial();
-	  G4cout << "G4LCapture Gamma E(GeV) " 
-		 << aTrack->GetTotalEnergy()/GeV << "  "
-		 << material->GetName()<< " " 
-		 << touchable->GetVolume()->GetName() << G4endl;
-	  G4cout << "G4LCapture Gamma position(m): " 
-		 << aTrack->GetPosition()/m << G4endl;
-	  G4cout << "G4LCapture created Gamma direction " 
-		 << aTrack->GetMomentumDirection() << G4endl;
-	  G4cout << "G4LCapture gamma (eta,phi) = " 
-		 << "(" << g4t_eta << "," << g4t_phi << ")" << G4endl;
-	}
-	aTrack->GetUserInformation()->Print();
-	G4cout << "**********************************************************************"  << G4endl;
+    if (aTrack->GetDefinition()->GetParticleName() == "gamma" && aTrack->GetParentID() != 0) {
+      if ((tkPx * tkPx + tkPy * tkPy + tkPz * tkPz) > 1000.0 * 1000.0 &&
+          aTrack->GetCreatorProcess()->GetProcessName() == "LCapture") {
+        G4cout << "MY NEW GAMMA " << G4endl;
+        G4cout << "**********************************************************************" << G4endl;
+        G4cout << "MY NEW TRACK ID = " << MytrackNo << "(" << aTrack->GetDefinition()->GetParticleName() << ")"
+               << " PARENT =" << aTrack->GetParentID() << G4endl;
+        G4cout << "Primary particle: " << aTrack->GetDynamicParticle()->GetPrimaryParticle() << G4endl;
+        G4cout << "Process type: " << aTrack->GetCreatorProcess()->GetProcessType()
+               << " Process name: " << aTrack->GetCreatorProcess()->GetProcessName() << G4endl;
+        G4cout << "ToT E = " << aTrack->GetTotalEnergy() << " KineE = " << aTrack->GetKineticEnergy()
+               << " Tot P = " << tkP << " Pt = " << sqrt(tkPx * tkPx + tkPy * tkPy) << " VTX=(" << tvtx << "," << tvty
+               << "," << tvtz << ")" << G4endl;
+        if (aTrack->GetKineticEnergy() > 1. * GeV && aTrack->GetCreatorProcess()->GetProcessName() != "LCapture")
+          G4cout << " KineE > 1 GeV !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << G4endl;
+        const G4VTouchable* touchable = aTrack->GetTouchable();
+        if (touchable != nullptr && touchable->GetVolume() != nullptr &&
+            touchable->GetVolume()->GetLogicalVolume() != nullptr) {
+          G4Material* material = touchable->GetVolume()->GetLogicalVolume()->GetMaterial();
+          G4cout << "G4LCapture Gamma E(GeV) " << aTrack->GetTotalEnergy() / GeV << "  " << material->GetName() << " "
+                 << touchable->GetVolume()->GetName() << G4endl;
+          G4cout << "G4LCapture Gamma position(m): " << aTrack->GetPosition() / m << G4endl;
+          G4cout << "G4LCapture created Gamma direction " << aTrack->GetMomentumDirection() << G4endl;
+          G4cout << "G4LCapture gamma (eta,phi) = "
+                 << "(" << g4t_eta << "," << g4t_phi << ")" << G4endl;
+        }
+        aTrack->GetUserInformation()->Print();
+        G4cout << "**********************************************************************" << G4endl;
       }
     }
 
     if (aTrack->GetDefinition()->GetParticleName() == "gamma") {
-      const G4VProcess * proc = aTrack->GetCreatorProcess();
+      const G4VProcess* proc = aTrack->GetCreatorProcess();
       double Tgamma = aTrack->GetKineticEnergy();
       std::string ProcName;
-      const  std::string nullstr ("Null_prc");
-      if (proc) ProcName = proc->GetProcessName();
-      else      ProcName = nullstr;
-      if (Tgamma > 2.5*GeV ) { //&& ProcName!="Decay" && ProcName!="eBrem")
-	std::string volumeName("_Unknown_Vol_");
-	std::string materialName("_Unknown_Mat_");
-	G4Material * material = nullptr;
-	G4VPhysicalVolume * pvolume = nullptr;
-	G4LogicalVolume * lvolume = nullptr;
-	const G4VTouchable * touchable = aTrack->GetTouchable();
-	if (touchable) pvolume = touchable->GetVolume();
-	if (pvolume) {
-	  volumeName = pvolume->GetName();
-	  lvolume = pvolume->GetLogicalVolume();
-	}
-	if (lvolume) material = lvolume->GetMaterial();
-	if (material) materialName = material->GetName();
-	G4cout << "**** ALL photons > 2.5 GeV ****" << G4endl;
-	G4cout << ProcName << "**** ALL photons: gamma E(GeV) "
-	       << aTrack->GetTotalEnergy()/GeV << "  "
-	       <<  materialName << " " << volumeName << G4endl;
-	G4cout << ProcName << "**** ALL photons: gamma position(m): " 
-	       << aTrack->GetPosition()/m << G4endl;
-	G4cout << ProcName << "**** ALL photons: gamma direction " 
-	       << aTrack->GetMomentumDirection() << G4endl;
-	G4cout << "**********************************************************************"  << G4endl;
+      const std::string nullstr("Null_prc");
+      if (proc)
+        ProcName = proc->GetProcessName();
+      else
+        ProcName = nullstr;
+      if (Tgamma > 2.5 * GeV) {  //&& ProcName!="Decay" && ProcName!="eBrem")
+        std::string volumeName("_Unknown_Vol_");
+        std::string materialName("_Unknown_Mat_");
+        G4Material* material = nullptr;
+        G4VPhysicalVolume* pvolume = nullptr;
+        G4LogicalVolume* lvolume = nullptr;
+        const G4VTouchable* touchable = aTrack->GetTouchable();
+        if (touchable)
+          pvolume = touchable->GetVolume();
+        if (pvolume) {
+          volumeName = pvolume->GetName();
+          lvolume = pvolume->GetLogicalVolume();
+        }
+        if (lvolume)
+          material = lvolume->GetMaterial();
+        if (material)
+          materialName = material->GetName();
+        G4cout << "**** ALL photons > 2.5 GeV ****" << G4endl;
+        G4cout << ProcName << "**** ALL photons: gamma E(GeV) " << aTrack->GetTotalEnergy() / GeV << "  "
+               << materialName << " " << volumeName << G4endl;
+        G4cout << ProcName << "**** ALL photons: gamma position(m): " << aTrack->GetPosition() / m << G4endl;
+        G4cout << ProcName << "**** ALL photons: gamma direction " << aTrack->GetMomentumDirection() << G4endl;
+        G4cout << "**********************************************************************" << G4endl;
       }
-    }                                               
+    }
   }
-    
+
   //---------- Set /tracking/verbose
   //----- track is verbose only if event is verbose
   if (fTkVerbThisEventON) {
     bool trackingVerboseThisTrack = checkTrackingVerbose(aTrack);
 
-    //----- Set the /tracking/verbose for this track 
-    if ((trackingVerboseThisTrack) && (!fTrackingVerboseON) ) {
+    //----- Set the /tracking/verbose for this track
+    if ((trackingVerboseThisTrack) && (!fTrackingVerboseON)) {
       setTrackingVerbose(fVerboseLevel);
       fTrackingVerboseON = true;
-      if (fDEBUG) G4cout << "TV: VERBOSEtt1 " << aTrack->GetTrackID()
-			 << G4endl;
+      if (fDEBUG)
+        G4cout << "TV: VERBOSEtt1 " << aTrack->GetTrackID() << G4endl;
       printTrackInfo(aTrack);
-    } else if ((!trackingVerboseThisTrack) && ( fTrackingVerboseON )) {
+    } else if ((!trackingVerboseThisTrack) && (fTrackingVerboseON)) {
       setTrackingVerbose(0);
       fTrackingVerboseON = false;
-      if (fDEBUG) G4cout << "TV: VERBOSEtt0 " << aTrack->GetTrackID()
-			 << G4endl;
+      if (fDEBUG)
+        G4cout << "TV: VERBOSEtt0 " << aTrack->GetTrackID() << G4endl;
     }
   }
 }
 
-void TrackingVerboseAction::update(const EndOfTrack * trk) {
-  const G4Track * aTrack = (*trk)();
+void TrackingVerboseAction::update(const EndOfTrack* trk) {
+  const G4Track* aTrack = (*trk)();
   if (fTkVerbThisEventON) {
     bool trackingVerboseThisTrack = checkTrackingVerbose(aTrack);
-    if ((trackingVerboseThisTrack) && (fTrackingVerboseON ) &&
-	(fTVTrackMax < fLarge || fTVTrackStep != 1)) {
+    if ((trackingVerboseThisTrack) && (fTrackingVerboseON) && (fTVTrackMax < fLarge || fTVTrackStep != 1)) {
       setTrackingVerbose(0);
       fTrackingVerboseON = false;
-      if (fDEBUG) G4cout << "TV: VERBOSEtt0 " << aTrack->GetTrackID()
-			 << G4endl;
+      if (fDEBUG)
+        G4cout << "TV: VERBOSEtt0 " << aTrack->GetTrackID() << G4endl;
     }
   }
 }
 
 void TrackingVerboseAction::update(const G4Step* fStep) {
-
   if ((fG4Verbose) && (fTrackingVerboseON)) {
     G4Track* fTrack = fStep->GetTrack();
-    G4cout << std::setw( 5) << fTrack->GetCurrentStepNumber() << " "
-	   << std::setw( 8) << G4BestUnit(fTrack->GetPosition().x() , "Length") << " "
-	   << std::setw( 8) << G4BestUnit(fTrack->GetPosition().y() , "Length") << " "
-	   << std::setw( 8) << G4BestUnit(fTrack->GetPosition().z() , "Length") << " "
-	   << std::setw( 9) << G4BestUnit(fTrack->GetKineticEnergy() , "Energy") << " "
-	   << std::setw( 8) << G4BestUnit(fStep->GetTotalEnergyDeposit(), "Energy") << " "
-	   << std::setw( 8) << G4BestUnit(fStep->GetStepLength() , "Length") << " "
-	   << std::setw( 9) << G4BestUnit(fTrack->GetTrackLength() , "Length") << " "
-	   << std::setw( 9) << G4BestUnit(fTrack->GetGlobalTime(), "Time") << " ";
+    G4cout << std::setw(5) << fTrack->GetCurrentStepNumber() << " " << std::setw(8)
+           << G4BestUnit(fTrack->GetPosition().x(), "Length") << " " << std::setw(8)
+           << G4BestUnit(fTrack->GetPosition().y(), "Length") << " " << std::setw(8)
+           << G4BestUnit(fTrack->GetPosition().z(), "Length") << " " << std::setw(9)
+           << G4BestUnit(fTrack->GetKineticEnergy(), "Energy") << " " << std::setw(8)
+           << G4BestUnit(fStep->GetTotalEnergyDeposit(), "Energy") << " " << std::setw(8)
+           << G4BestUnit(fStep->GetStepLength(), "Length") << " " << std::setw(9)
+           << G4BestUnit(fTrack->GetTrackLength(), "Length") << " " << std::setw(9)
+           << G4BestUnit(fTrack->GetGlobalTime(), "Time") << " ";
 
     // Put cut comment here
-    if( fTrack->GetNextVolume() != nullptr ) {
+    if (fTrack->GetNextVolume() != nullptr) {
       G4cout << std::setw(11) << fTrack->GetNextVolume()->GetName() << " ";
     } else {
-      G4cout << std::setw(11) << "OutOfWorld" << " ";
+      G4cout << std::setw(11) << "OutOfWorld"
+             << " ";
     }
-    if(fStep->GetPostStepPoint()->GetProcessDefinedStep() != nullptr){
+    if (fStep->GetPostStepPoint()->GetProcessDefinedStep() != nullptr) {
       G4cout << fStep->GetPostStepPoint()->GetProcessDefinedStep()->GetProcessName();
     } else {
       G4cout << "User Limit";
@@ -280,36 +270,36 @@ void TrackingVerboseAction::update(const G4Step* fStep) {
 }
 
 void TrackingVerboseAction::setTrackingVerbose(int verblev) {
-  if (fDEBUG) G4cout << " setting verbose level " << verblev << G4endl;
-  if (theTrackingManager!=nullptr) theTrackingManager->SetVerboseLevel(verblev);
+  if (fDEBUG)
+    G4cout << " setting verbose level " << verblev << G4endl;
+  if (theTrackingManager != nullptr)
+    theTrackingManager->SetVerboseLevel(verblev);
 }
- 
+
 bool TrackingVerboseAction::checkTrackingVerbose(const G4Track* aTrack) {
-  int trackNo = aTrack->GetTrackID();    
+  int trackNo = aTrack->GetTrackID();
   bool trackingVerboseThisTrack = false;
   //----- Check if track is in the selected range
   if (trackNo >= fTVTrackMin && trackNo <= fTVTrackMax) {
-    if ((trackNo-fTVTrackMin) % fTVTrackStep == 0) trackingVerboseThisTrack = true;
+    if ((trackNo - fTVTrackMin) % fTVTrackStep == 0)
+      trackingVerboseThisTrack = true;
   }
   if (trackingVerboseThisTrack && (!fPdgIds.empty())) {
     int pdgId = aTrack->GetDefinition()->GetPDGEncoding();
-    if (std::count(fPdgIds.begin(),fPdgIds.end(),pdgId) == 0) trackingVerboseThisTrack = false;
+    if (std::count(fPdgIds.begin(), fPdgIds.end(), pdgId) == 0)
+      trackingVerboseThisTrack = false;
   }
   return trackingVerboseThisTrack;
 }
 
 void TrackingVerboseAction::printTrackInfo(const G4Track* aTrack) {
-  G4cout << G4endl
-	 << "*******************************************************"
-	 << "**************************************************" << G4endl
-	 << "* G4Track Information: "
-	 << "  Particle = " << aTrack->GetDefinition()->GetParticleName()
-	 << ","
-	 << "   Track ID = " << aTrack->GetTrackID()
-	 << ","
-	 << "   Parent ID = " << aTrack->GetParentID() << G4endl
-	 << "*******************************************************"
-	 << "**************************************************"
-	 << G4endl << G4endl;
-  if (fVerbose) fVerbose->TrackingStarted();
+  G4cout << G4endl << "*******************************************************"
+         << "**************************************************" << G4endl << "* G4Track Information: "
+         << "  Particle = " << aTrack->GetDefinition()->GetParticleName() << ","
+         << "   Track ID = " << aTrack->GetTrackID() << ","
+         << "   Parent ID = " << aTrack->GetParentID() << G4endl
+         << "*******************************************************"
+         << "**************************************************" << G4endl << G4endl;
+  if (fVerbose)
+    fVerbose->TrackingStarted();
 }
diff --git a/SimG4Core/TrackingVerbose/src/module.cc b/SimG4Core/TrackingVerbose/src/module.cc
index d4cee1208cb7a..068ec011a8568 100644
--- a/SimG4Core/TrackingVerbose/src/module.cc
+++ b/SimG4Core/TrackingVerbose/src/module.cc
@@ -1,6 +1,5 @@
 #include "SimG4Core/TrackingVerbose/interface/TrackingVerboseAction.h"
 #include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
-   
 
 DEFINE_SIMWATCHER(TrackingVerboseAction);
diff --git a/SimG4Core/Watcher/interface/SimProducer.h b/SimG4Core/Watcher/interface/SimProducer.h
index 7a16f1b0e60c7..89164429d0c20 100644
--- a/SimG4Core/Watcher/interface/SimProducer.h
+++ b/SimG4Core/Watcher/interface/SimProducer.h
@@ -4,7 +4,7 @@
 //
 // Package:     Watcher
 // Class  :     SimProducer
-// 
+//
 /**\class SimProducer SimProducer.h SimG4Core/Watcher/interface/SimProducer.h
 
  Description: a SimWatcher which puts data into the edm::Event
@@ -20,87 +20,83 @@
 
 // system include files
 #include <algorithm>
-#include <string>
-#include <vector>
 #include <functional>
 #include <memory>
+#include <string>
+#include <vector>
 
 // user include files
-#include "SimG4Core/Watcher/interface/SimWatcher.h"
 #include "FWCore/Framework/interface/ProducerBase.h"
+#include "SimG4Core/Watcher/interface/SimWatcher.h"
 
 namespace edm {
-   class Event;
-   class EventSetup;
-}
+  class Event;
+  class EventSetup;
+}  // namespace edm
 
 // forward declarations
 namespace simproducer {
-   class ProductInfoBase {
-      public:
-	 ProductInfoBase(const std::string& iInstanceName):
-	    m_instanceName(iInstanceName) {}
-
-	 virtual ~ProductInfoBase() {}
-
-	 const std::string& instanceName() const {
-	    return m_instanceName; }
-
-	 virtual void registerProduct(edm::ProducerBase*) const = 0;
-      private:
-	 std::string m_instanceName;
-   };
-
-   template<class T>
-   class ProductInfo : public ProductInfoBase {
-      public:
-	 ProductInfo(const std::string& iInstanceName) :
-	    ProductInfoBase(iInstanceName) {}
-
-         void registerProduct(edm::ProducerBase* iProd) const override {
-	    (*iProd). template produces<T>(this->instanceName());
-	 }
-   };
-}
-
-class SimProducer : public SimWatcher
-{
-
-   public:
-      SimProducer() {}
-      //virtual ~SimProducer();
-
-      // ---------- const member functions ---------------------
-
-      // ---------- static member functions --------------------
-
-      // ---------- member functions ---------------------------
-      virtual void produce(edm::Event&, const edm::EventSetup&) = 0;
-      
-      void registerProducts(edm::ProducerBase& iProd) {
-	 std::for_each(m_info.begin(), m_info.end(),
-                       std::bind(&simproducer::ProductInfoBase::registerProduct, std::placeholders::_1, &iProd));
-      }
-   protected:
-      template<class T>
-      void produces() {
-	 produces<T>("");
-      }
-
-      template<class T>
-      void produces(const std::string& instanceName) {
-	 m_info.push_back( 
-			  std::make_shared<simproducer::ProductInfo<T> >(instanceName) );
-      }
-
-   private:
-      SimProducer(const SimProducer&) = delete; // stop default
-
-      const SimProducer& operator=(const SimProducer&) = delete; // stop default
-
-      // ---------- member data --------------------------------
-      std::vector<std::shared_ptr< simproducer::ProductInfoBase> > m_info;
-};
+  class ProductInfoBase {
+  public:
+    ProductInfoBase(const std::string &iInstanceName) : m_instanceName(iInstanceName) {}
+
+    virtual ~ProductInfoBase() {}
+
+    const std::string &instanceName() const { return m_instanceName; }
+
+    virtual void registerProduct(edm::ProducerBase *) const = 0;
+
+  private:
+    std::string m_instanceName;
+  };
 
+  template <class T>
+  class ProductInfo : public ProductInfoBase {
+  public:
+    ProductInfo(const std::string &iInstanceName) : ProductInfoBase(iInstanceName) {}
+
+    void registerProduct(edm::ProducerBase *iProd) const override {
+      (*iProd).template produces<T>(this->instanceName());
+    }
+  };
+}  // namespace simproducer
+
+class SimProducer : public SimWatcher {
+public:
+  SimProducer() {}
+  // virtual ~SimProducer();
+
+  // ---------- const member functions ---------------------
+
+  // ---------- static member functions --------------------
+
+  // ---------- member functions ---------------------------
+  virtual void produce(edm::Event &, const edm::EventSetup &) = 0;
+
+  void registerProducts(edm::ProducerBase &iProd) {
+    std::for_each(m_info.begin(),
+                  m_info.end(),
+                  std::bind(&simproducer::ProductInfoBase::registerProduct, std::placeholders::_1, &iProd));
+  }
+
+protected:
+  template <class T>
+  void produces() {
+    produces<T>("");
+  }
+
+  template <class T>
+  void produces(const std::string &instanceName) {
+    m_info.push_back(std::make_shared<simproducer::ProductInfo<T>>(instanceName));
+  }
+
+private:
+  SimProducer(const SimProducer &) = delete;  // stop default
+
+  const SimProducer &operator=(const SimProducer &) = delete;  // stop default
+
+  // ---------- member data --------------------------------
+  std::vector<std::shared_ptr<simproducer::ProductInfoBase>> m_info;
+};
 
 #endif
diff --git a/SimG4Core/Watcher/interface/SimWatcher.h b/SimG4Core/Watcher/interface/SimWatcher.h
index 0ad1bf8a96d54..9f8a90d10ae9b 100644
--- a/SimG4Core/Watcher/interface/SimWatcher.h
+++ b/SimG4Core/Watcher/interface/SimWatcher.h
@@ -4,22 +4,23 @@
 //
 // Package:     Watcher
 // Class  :     SimWatcher
-// 
+//
 /**\class SimWatcher SimWatcher.h SimG4Core/Watcher/interface/SimWatcher.h
 
- Description: Base class for classes that 'watch' what OscarProducer does internally
+ Description: Base class for classes that 'watch' what OscarProducer does
+internally
 
  Usage:
     By itself, this class actually does nothing except allow dynamic loading
 into the OscarProducer.  To do useful work, one must inherit from this class
-and one or more 'Observer<T>' classes.  
+and one or more 'Observer<T>' classes.
 
     A class that inherits from OscarProducer must have a constructor that takes
 a 'const edm::ParameterSet&' as its only argument.  This constructor will be
 called by the dynamic loading code.
 */
 //
-// Original Author:  
+// Original Author:
 //         Created:  Tue Nov 22 15:35:11 EST 2005
 //
 
@@ -29,27 +30,23 @@ called by the dynamic loading code.
 
 // forward declarations
 
-class SimWatcher
-{
-
-   public:
-      SimWatcher() {}
-      virtual ~SimWatcher() {}
+class SimWatcher {
+public:
+  SimWatcher() {}
+  virtual ~SimWatcher() {}
 
-      // ---------- const member functions ---------------------
+  // ---------- const member functions ---------------------
 
-      // ---------- static member functions --------------------
+  // ---------- static member functions --------------------
 
-      // ---------- member functions ---------------------------
+  // ---------- member functions ---------------------------
 
-   private:
-      SimWatcher(const SimWatcher&) = delete; // stop default
+private:
+  SimWatcher(const SimWatcher &) = delete;  // stop default
 
-      const SimWatcher& operator=(const SimWatcher&) = delete; // stop default
-
-      // ---------- member data --------------------------------
+  const SimWatcher &operator=(const SimWatcher &) = delete;  // stop default
 
+  // ---------- member data --------------------------------
 };
 
-
 #endif
diff --git a/SimG4Core/Watcher/interface/SimWatcherFactory.h b/SimG4Core/Watcher/interface/SimWatcherFactory.h
index c08313ec8be8a..28ae9e1ed22c4 100644
--- a/SimG4Core/Watcher/interface/SimWatcherFactory.h
+++ b/SimG4Core/Watcher/interface/SimWatcherFactory.h
@@ -6,11 +6,10 @@
 
 #include "FWCore/PluginManager/interface/PluginFactory.h"
 
-typedef edmplugin::PluginFactory<SimWatcherMakerBase *() > SimWatcherFactory ;
+typedef edmplugin::PluginFactory<SimWatcherMakerBase *()> SimWatcherFactory;
 
-//This pattern was taken from the framework factory code
+// This pattern was taken from the framework factory code
 
-#define DEFINE_SIMWATCHER(type) \
-  DEFINE_EDM_PLUGIN(SimWatcherFactory, SimWatcherMaker<type>,#type)
+#define DEFINE_SIMWATCHER(type) DEFINE_EDM_PLUGIN(SimWatcherFactory, SimWatcherMaker<type>, #type)
 
 #endif
diff --git a/SimG4Core/Watcher/interface/SimWatcherMaker.h b/SimG4Core/Watcher/interface/SimWatcherMaker.h
index 9bd5f81c2f856..72c681a91e65d 100644
--- a/SimG4Core/Watcher/interface/SimWatcherMaker.h
+++ b/SimG4Core/Watcher/interface/SimWatcherMaker.h
@@ -4,8 +4,9 @@
 //
 // Package:     Watcher
 // Class  :     SimWatcherMaker
-// 
-/**\class SimWatcherMaker SimWatcherMaker.h SimG4Core/Watcher/interface/SimWatcherMaker.h
+//
+/**\class SimWatcherMaker SimWatcherMaker.h
+ SimG4Core/Watcher/interface/SimWatcherMaker.h
 
  Description: Makes a particular type of SimWatcher
 
@@ -14,7 +15,7 @@
 
 */
 //
-// Original Author:  
+// Original Author:
 //         Created:  Tue Nov 22 13:03:44 EST 2005
 //
 
@@ -22,44 +23,36 @@
 #include <memory>
 
 // user include files
-#include "SimG4Core/Watcher/interface/SimWatcherMakerBase.h"
 #include "SimG4Core/Notification/interface/SimActivityRegistryEnroller.h"
+#include "SimG4Core/Watcher/interface/SimWatcherMakerBase.h"
 
 // forward declarations
 
-template<class T>
-class SimWatcherMaker : public SimWatcherMakerBase
-{
-
-   public:
-      SimWatcherMaker(){}
-
-      // ---------- const member functions ---------------------
-      void make(const edm::ParameterSet& p,
-			SimActivityRegistry& reg,
-			std::shared_ptr<SimWatcher>& oWatcher,
-			std::shared_ptr<SimProducer>& oProd
-	 ) const override
-      {
-	auto returnValue = std::make_shared<T>(p);
-	SimActivityRegistryEnroller::enroll(reg, returnValue.get());
-	oWatcher = returnValue;
-
-	//If this is also a SimProducer, set the value
-	oProd = this->getSimProducer(returnValue.get(), returnValue);
-      }
-
-   private:
-      std::shared_ptr<SimProducer>
-      getSimProducer(SimProducer*, std::shared_ptr<T>& iProd) const{
-	 return std::shared_ptr<SimProducer>(iProd);
-      }
-      std::shared_ptr<SimProducer>
-      getSimProducer(void*, std::shared_ptr<T>& iProd) const{
-	 return std::shared_ptr<SimProducer>();
-      }
-
+template <class T>
+class SimWatcherMaker : public SimWatcherMakerBase {
+public:
+  SimWatcherMaker() {}
+
+  // ---------- const member functions ---------------------
+  void make(const edm::ParameterSet &p,
+            SimActivityRegistry &reg,
+            std::shared_ptr<SimWatcher> &oWatcher,
+            std::shared_ptr<SimProducer> &oProd) const override {
+    auto returnValue = std::make_shared<T>(p);
+    SimActivityRegistryEnroller::enroll(reg, returnValue.get());
+    oWatcher = returnValue;
+
+    // If this is also a SimProducer, set the value
+    oProd = this->getSimProducer(returnValue.get(), returnValue);
+  }
+
+private:
+  std::shared_ptr<SimProducer> getSimProducer(SimProducer *, std::shared_ptr<T> &iProd) const {
+    return std::shared_ptr<SimProducer>(iProd);
+  }
+  std::shared_ptr<SimProducer> getSimProducer(void *, std::shared_ptr<T> &iProd) const {
+    return std::shared_ptr<SimProducer>();
+  }
 };
 
-
 #endif
diff --git a/SimG4Core/Watcher/interface/SimWatcherMakerBase.h b/SimG4Core/Watcher/interface/SimWatcherMakerBase.h
index 9cdd03e5a0a21..3c212d05fb286 100644
--- a/SimG4Core/Watcher/interface/SimWatcherMakerBase.h
+++ b/SimG4Core/Watcher/interface/SimWatcherMakerBase.h
@@ -4,8 +4,9 @@
 //
 // Package:     Watcher
 // Class  :     SimWatcherMakerBase
-// 
-/**\class SimWatcherMakerBase SimWatcherMakerBase.h SimG4Core/Watcher/interface/SimWatcherMakerBase.h
+//
+/**\class SimWatcherMakerBase SimWatcherMakerBase.h
+ SimG4Core/Watcher/interface/SimWatcherMakerBase.h
 
  Description: Base class for the 'maker' which creates Watchers
 
@@ -26,25 +27,21 @@
 
 // forward declarations
 class SimActivityRegistry;
-namespace edm{
+namespace edm {
   class ParameterSet;
 }
 class SimWatcher;
 class SimProducer;
-class SimWatcherMakerBase
-{
-
-   public:
-      SimWatcherMakerBase() {}
-      virtual ~SimWatcherMakerBase() {}
-
-      // ---------- const member functions ---------------------
-      virtual void make(const edm::ParameterSet&,
-			SimActivityRegistry&,
-			std::shared_ptr<SimWatcher>&,
-			std::shared_ptr<SimProducer>&
-	 ) const = 0;
+class SimWatcherMakerBase {
+public:
+  SimWatcherMakerBase() {}
+  virtual ~SimWatcherMakerBase() {}
+
+  // ---------- const member functions ---------------------
+  virtual void make(const edm::ParameterSet &,
+                    SimActivityRegistry &,
+                    std::shared_ptr<SimWatcher> &,
+                    std::shared_ptr<SimProducer> &) const = 0;
 };
 
-
 #endif
diff --git a/SimG4Core/Watcher/src/SimWatcherFactory.cc b/SimG4Core/Watcher/src/SimWatcherFactory.cc
index ac2d3b21c02b6..40c872154bc0a 100644
--- a/SimG4Core/Watcher/src/SimWatcherFactory.cc
+++ b/SimG4Core/Watcher/src/SimWatcherFactory.cc
@@ -1,3 +1,3 @@
 #include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
 
-EDM_REGISTER_PLUGINFACTORY(SimWatcherFactory,"CMS Simulation SimWatcherFactory");
+EDM_REGISTER_PLUGINFACTORY(SimWatcherFactory, "CMS Simulation SimWatcherFactory");
diff --git a/SimG4Core/Watcher/test/IntSimProducer.cc b/SimG4Core/Watcher/test/IntSimProducer.cc
index 86d9b0c00ea86..4af03bf2d0f2e 100644
--- a/SimG4Core/Watcher/test/IntSimProducer.cc
+++ b/SimG4Core/Watcher/test/IntSimProducer.cc
@@ -2,32 +2,32 @@
 //
 // Package:     Watcher
 // Class  :     IntSimProducer
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
-// Original Author:  
+// Original Author:
 //         Created:  Tue Nov 29 11:33:37 EST 2005
 //
 
 // system include files
 
 // user include files
+#include "FWCore/Framework/interface/Event.h"
 #include "SimG4Core/Watcher/interface/SimProducer.h"
 #include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
-#include "FWCore/Framework/interface/Event.h"
-
 
 class IntSimProducer : public SimProducer {
-   public:
-      IntSimProducer(const edm::ParameterSet&);
-
-      void produce(edm::Event& e, const edm::EventSetup&) override {
-	 std::unique_ptr<int> newInt(new int(++m_int));
-	 e.put(std::move(newInt));
-      }
-   private:
-      int m_int;
+public:
+  IntSimProducer(const edm::ParameterSet &);
+
+  void produce(edm::Event &e, const edm::EventSetup &) override {
+    std::unique_ptr<int> newInt(new int(++m_int));
+    e.put(std::move(newInt));
+  }
+
+private:
+  int m_int;
 };
 //
 // constants, enums and typedefs
@@ -40,10 +40,9 @@ class IntSimProducer : public SimProducer {
 //
 // constructors and destructor
 //
-IntSimProducer::IntSimProducer(const edm::ParameterSet&)
-{
-   m_int = 0;
-   produces<int>();
+IntSimProducer::IntSimProducer(const edm::ParameterSet &) {
+  m_int = 0;
+  produces<int>();
 }
 
 DEFINE_SIMWATCHER(IntSimProducer);
diff --git a/SimGeneral/CaloAnalysis/plugins/CaloTruthAccumulator.cc b/SimGeneral/CaloAnalysis/plugins/CaloTruthAccumulator.cc
index 45ebd084cde2c..75274fe7ae520 100644
--- a/SimGeneral/CaloAnalysis/plugins/CaloTruthAccumulator.cc
+++ b/SimGeneral/CaloAnalysis/plugins/CaloTruthAccumulator.cc
@@ -1,6 +1,7 @@
 #define DEBUG false
 #if DEBUG
-// boost optional (used by boost graph) results in some false positives with -Wmaybe-uninitialized
+// boost optional (used by boost graph) results in some false positives with
+// -Wmaybe-uninitialized
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
@@ -56,23 +57,23 @@
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 
 namespace {
-using Index_t = unsigned;
-using Barcode_t = int;
-const std::string messageCategoryGraph_("CaloTruthAccumulatorGraphProducer");
-}
+  using Index_t = unsigned;
+  using Barcode_t = int;
+  const std::string messageCategoryGraph_("CaloTruthAccumulatorGraphProducer");
+}  // namespace
 
+using boost::add_edge;
 using boost::adjacency_list;
 using boost::directedS;
-using boost::listS;
-using boost::vecS;
-using boost::property;
 using boost::edge;
-using boost::edge_weight_t;
 using boost::edge_weight;
-using boost::add_edge;
+using boost::edge_weight_t;
+using boost::listS;
+using boost::property;
+using boost::vecS;
 using boost::vertex;
-using boost::vertex_name_t;
 using boost::vertex_name;
+using boost::vertex_name_t;
 
 /* GRAPH DEFINITIONS
 
@@ -101,52 +102,49 @@ using boost::vertex_name;
 
 */
 struct EdgeProperty {
-  EdgeProperty(const SimTrack* t, int h, int c) : simTrack(t), simHits(h), cumulative_simHits(c) {}
-  const SimTrack* simTrack;
+  EdgeProperty(const SimTrack *t, int h, int c) : simTrack(t), simHits(h), cumulative_simHits(c) {}
+  const SimTrack *simTrack;
   int simHits;
   int cumulative_simHits;
 };
 
 struct VertexProperty {
   VertexProperty() : simTrack(nullptr), cumulative_simHits(0) {}
-  VertexProperty(const SimTrack* t, int c) : simTrack(t), cumulative_simHits(c) {}
-  VertexProperty(const VertexProperty& other)
+  VertexProperty(const SimTrack *t, int c) : simTrack(t), cumulative_simHits(c) {}
+  VertexProperty(const VertexProperty &other)
       : simTrack(other.simTrack), cumulative_simHits(other.cumulative_simHits) {}
-  const SimTrack* simTrack;
+  const SimTrack *simTrack;
   int cumulative_simHits;
 };
 
 using EdgeParticleClustersProperty = property<edge_weight_t, EdgeProperty>;
 using VertexMotherParticleProperty = property<vertex_name_t, VertexProperty>;
-using DecayChain = adjacency_list<listS, vecS, directedS, VertexMotherParticleProperty,
-                                  EdgeParticleClustersProperty>;
+using DecayChain = adjacency_list<listS, vecS, directedS, VertexMotherParticleProperty, EdgeParticleClustersProperty>;
 
 class CaloTruthAccumulator : public DigiAccumulatorMixMod {
- public:
-  explicit CaloTruthAccumulator(const edm::ParameterSet& config,
-      edm::ProducerBase& mixMod,
-      edm::ConsumesCollector& iC);
-
- private:
-  void initializeEvent(const edm::Event& event, const edm::EventSetup& setup) override;
-  void accumulate(const edm::Event& event, const edm::EventSetup& setup) override;
-  void accumulate(const PileUpEventPrincipal& event, const edm::EventSetup& setup,
-                  edm::StreamID const&) override;
-  void finalizeEvent(edm::Event& event, const edm::EventSetup& setup) override;
-  void beginLuminosityBlock(edm::LuminosityBlock const& lumi,
-                            edm::EventSetup const& setup) override;
+public:
+  explicit CaloTruthAccumulator(const edm::ParameterSet &config, edm::ProducerBase &mixMod, edm::ConsumesCollector &iC);
+
+private:
+  void initializeEvent(const edm::Event &event, const edm::EventSetup &setup) override;
+  void accumulate(const edm::Event &event, const edm::EventSetup &setup) override;
+  void accumulate(const PileUpEventPrincipal &event, const edm::EventSetup &setup, edm::StreamID const &) override;
+  void finalizeEvent(edm::Event &event, const edm::EventSetup &setup) override;
+  void beginLuminosityBlock(edm::LuminosityBlock const &lumi, edm::EventSetup const &setup) override;
 
   /** @brief Both forms of accumulate() delegate to this templated method. */
   template <class T>
-  void accumulateEvent(const T& event, const edm::EventSetup& setup,
-                       const edm::Handle<edm::HepMCProduct>& hepMCproduct);
+  void accumulateEvent(const T &event,
+                       const edm::EventSetup &setup,
+                       const edm::Handle<edm::HepMCProduct> &hepMCproduct);
 
-  /** @brief Fills the supplied vector with pointers to the SimHits, checking for bad modules if
-   * required */
+  /** @brief Fills the supplied vector with pointers to the SimHits, checking
+   * for bad modules if required */
   template <class T>
-  void fillSimHits(std::vector<std::pair<DetId, const PCaloHit*> >& returnValue,
-                   std::unordered_map<int, std::map<int, float> >& simTrackDetIdEnergyMap,
-                   const T& event, const edm::EventSetup& setup);
+  void fillSimHits(std::vector<std::pair<DetId, const PCaloHit *>> &returnValue,
+                   std::unordered_map<int, std::map<int, float>> &simTrackDetIdEnergyMap,
+                   const T &event,
+                   const edm::EventSetup &setup);
 
   const std::string messageCategory_;
 
@@ -168,8 +166,8 @@ class CaloTruthAccumulator : public DigiAccumulatorMixMod {
 
   const edm::InputTag simTrackLabel_;
   const edm::InputTag simVertexLabel_;
-  edm::Handle<std::vector<SimTrack> > hSimTracks;
-  edm::Handle<std::vector<SimVertex> > hSimVertices;
+  edm::Handle<std::vector<SimTrack>> hSimTracks;
+  edm::Handle<std::vector<SimVertex>> hSimVertices;
 
   std::vector<edm::InputTag> collectionTags_;
   edm::InputTag genParticleLabel_;
@@ -179,7 +177,7 @@ class CaloTruthAccumulator : public DigiAccumulatorMixMod {
   const double minEnergy_, maxPseudoRapidity_;
   const bool premixStage1_;
 
- public:
+public:
   struct OutputCollections {
     std::unique_ptr<SimClusterCollection> pSimClusters;
     std::unique_ptr<CaloParticleCollection> pCaloParticles;
@@ -189,7 +187,7 @@ class CaloTruthAccumulator : public DigiAccumulatorMixMod {
     std::vector<uint32_t> sc_start_;
     std::vector<uint32_t> sc_stop_;
 
-    void swap(calo_particles& oth) {
+    void swap(calo_particles &oth) {
       sc_start_.swap(oth.sc_start_);
       sc_stop_.swap(oth.sc_stop_);
     }
@@ -200,177 +198,168 @@ class CaloTruthAccumulator : public DigiAccumulatorMixMod {
     }
   };
 
- private:
-  const HGCalTopology* hgtopo_[3] = {nullptr,nullptr,nullptr};
-  const HGCalDDDConstants* hgddd_[3] = {nullptr,nullptr,nullptr};
-  const HcalDDDRecConstants* hcddd_ = nullptr;
+private:
+  const HGCalTopology *hgtopo_[3] = {nullptr, nullptr, nullptr};
+  const HGCalDDDConstants *hgddd_[3] = {nullptr, nullptr, nullptr};
+  const HcalDDDRecConstants *hcddd_ = nullptr;
   OutputCollections output_;
   calo_particles m_caloParticles;
-  //geometry type (0 pre-TDR; 1 TDR)
+  // geometry type (0 pre-TDR; 1 TDR)
   int geometryType_;
 };
 
 /* Graph utility functions */
 
 namespace {
-template <typename Edge, typename Graph, typename Visitor>
-void accumulateSimHits_edge(Edge& e, const Graph& g, Visitor* v) {
-  auto const edge_property = get(edge_weight, g, e);
-  v->total_simHits += edge_property.simHits;
-  IfLogDebug(DEBUG, messageCategoryGraph_)
-      << " Examining edges " << e << " --> particle " << edge_property.simTrack->type() << "("
-      << edge_property.simTrack->trackId() << ")"
-      << " with SimClusters: " << edge_property.simHits
-      << " Accumulated SimClusters: " << v->total_simHits << std::endl;
-}
-template <typename Vertex, typename Graph>
-void print_vertex(Vertex& u, const Graph& g) {
-  auto const vertex_property = get(vertex_name, g, u);
-  IfLogDebug(DEBUG, messageCategoryGraph_) << " At " << u;
-  // The Mother of all vertices has **no** SimTrack associated.
-  if (vertex_property.simTrack)
-    IfLogDebug(DEBUG, messageCategoryGraph_) << " [" << vertex_property.simTrack->type() << "]"
-                                        << "(" << vertex_property.simTrack->trackId() << ")";
-  IfLogDebug(DEBUG, messageCategoryGraph_) << std::endl;
-}
+  template <typename Edge, typename Graph, typename Visitor>
+  void accumulateSimHits_edge(Edge &e, const Graph &g, Visitor *v) {
+    auto const edge_property = get(edge_weight, g, e);
+    v->total_simHits += edge_property.simHits;
+    IfLogDebug(DEBUG, messageCategoryGraph_)
+        << " Examining edges " << e << " --> particle " << edge_property.simTrack->type() << "("
+        << edge_property.simTrack->trackId() << ")"
+        << " with SimClusters: " << edge_property.simHits << " Accumulated SimClusters: " << v->total_simHits
+        << std::endl;
+  }
+  template <typename Vertex, typename Graph>
+  void print_vertex(Vertex &u, const Graph &g) {
+    auto const vertex_property = get(vertex_name, g, u);
+    IfLogDebug(DEBUG, messageCategoryGraph_) << " At " << u;
+    // The Mother of all vertices has **no** SimTrack associated.
+    if (vertex_property.simTrack)
+      IfLogDebug(DEBUG, messageCategoryGraph_) << " [" << vertex_property.simTrack->type() << "]"
+                                               << "(" << vertex_property.simTrack->trackId() << ")";
+    IfLogDebug(DEBUG, messageCategoryGraph_) << std::endl;
+  }
 
 // Graphviz output functions will only be generated in DEBUG mode
 #if DEBUG
-std::string graphviz_vertex(const VertexProperty& v) {
-  std::ostringstream oss;
-  oss << "{id: " << (v.simTrack ? v.simTrack->trackId() : 0)
-      << ",\\ntype: " << (v.simTrack ? v.simTrack->type() : 0) << ",\\nchits: " << v.cumulative_simHits
-      << "}";
-  return oss.str();
-}
+  std::string graphviz_vertex(const VertexProperty &v) {
+    std::ostringstream oss;
+    oss << "{id: " << (v.simTrack ? v.simTrack->trackId() : 0) << ",\\ntype: " << (v.simTrack ? v.simTrack->type() : 0)
+        << ",\\nchits: " << v.cumulative_simHits << "}";
+    return oss.str();
+  }
 
-std::string graphviz_edge(const EdgeProperty& e) {
-  std::ostringstream oss;
-  oss << "[" << (e.simTrack ? e.simTrack->trackId() : 0) << ","
-      << (e.simTrack ? e.simTrack->type() : 0)
-      << "," << e.simHits
-      << "," << e.cumulative_simHits << "]";
-  return oss.str();
-}
+  std::string graphviz_edge(const EdgeProperty &e) {
+    std::ostringstream oss;
+    oss << "[" << (e.simTrack ? e.simTrack->trackId() : 0) << "," << (e.simTrack ? e.simTrack->type() : 0) << ","
+        << e.simHits << "," << e.cumulative_simHits << "]";
+    return oss.str();
+  }
 #endif
 
-class SimHitsAccumulator_dfs_visitor : public boost::default_dfs_visitor {
- public:
-  int total_simHits = 0;
-  template <typename Edge, typename Graph>
-  void examine_edge(Edge e, const Graph& g) {
-    accumulateSimHits_edge(e, g, this);
-  }
-  template <typename Edge, typename Graph>
-  void finish_edge(Edge e, const Graph& g) {
-    auto const edge_property = get(edge_weight, g, e);
-    auto src = source(e, g);
-    auto trg = target(e, g);
-    auto cumulative =
-        edge_property.simHits + get(vertex_name, g, trg).cumulative_simHits +
-        (get(vertex_name, g, src).simTrack
-             ? get(vertex_name, g, src).cumulative_simHits
-             : 0);  // when we hit the root vertex we have to stop adding back its contribution.
-    auto const src_vertex_property = get(vertex_name, g, src);
-    put(get(vertex_name, const_cast<Graph&>(g)), src,
-        VertexProperty(src_vertex_property.simTrack, cumulative));
-    put(get(edge_weight, const_cast<Graph&>(g)), e,
-        EdgeProperty(edge_property.simTrack, edge_property.simHits, cumulative));
-    IfLogDebug(DEBUG, messageCategoryGraph_)
-        << " Finished edge: " << e << " Track id: " << get(edge_weight, g, e).simTrack->trackId()
-        << " has accumulated " << cumulative << " hits" << std::endl;
-    IfLogDebug(DEBUG, messageCategoryGraph_)
-        << " SrcVtx: " << src << "\t" << get(vertex_name, g, src).simTrack << "\t"
-        << get(vertex_name, g, src).cumulative_simHits << std::endl;
-    IfLogDebug(DEBUG, messageCategoryGraph_)
-        << " TrgVtx: " << trg << "\t" << get(vertex_name, g, trg).simTrack << "\t"
-        << get(vertex_name, g, trg).cumulative_simHits << std::endl;
-  }
-};
+  class SimHitsAccumulator_dfs_visitor : public boost::default_dfs_visitor {
+  public:
+    int total_simHits = 0;
+    template <typename Edge, typename Graph>
+    void examine_edge(Edge e, const Graph &g) {
+      accumulateSimHits_edge(e, g, this);
+    }
+    template <typename Edge, typename Graph>
+    void finish_edge(Edge e, const Graph &g) {
+      auto const edge_property = get(edge_weight, g, e);
+      auto src = source(e, g);
+      auto trg = target(e, g);
+      auto cumulative = edge_property.simHits + get(vertex_name, g, trg).cumulative_simHits +
+                        (get(vertex_name, g, src).simTrack ? get(vertex_name, g, src).cumulative_simHits
+                                                           : 0);  // when we hit the root vertex we have to stop
+                                                                  // adding back its contribution.
+      auto const src_vertex_property = get(vertex_name, g, src);
+      put(get(vertex_name, const_cast<Graph &>(g)), src, VertexProperty(src_vertex_property.simTrack, cumulative));
+      put(get(edge_weight, const_cast<Graph &>(g)),
+          e,
+          EdgeProperty(edge_property.simTrack, edge_property.simHits, cumulative));
+      IfLogDebug(DEBUG, messageCategoryGraph_)
+          << " Finished edge: " << e << " Track id: " << get(edge_weight, g, e).simTrack->trackId()
+          << " has accumulated " << cumulative << " hits" << std::endl;
+      IfLogDebug(DEBUG, messageCategoryGraph_) << " SrcVtx: " << src << "\t" << get(vertex_name, g, src).simTrack
+                                               << "\t" << get(vertex_name, g, src).cumulative_simHits << std::endl;
+      IfLogDebug(DEBUG, messageCategoryGraph_) << " TrgVtx: " << trg << "\t" << get(vertex_name, g, trg).simTrack
+                                               << "\t" << get(vertex_name, g, trg).cumulative_simHits << std::endl;
+    }
+  };
 
-using Selector = std::function<bool(EdgeProperty&)>;
-
-class CaloParticle_dfs_visitor : public boost::default_dfs_visitor {
- public:
-  CaloParticle_dfs_visitor(CaloTruthAccumulator::OutputCollections& output,
-                           CaloTruthAccumulator::calo_particles& caloParticles,
-                           std::unordered_multimap<Barcode_t, Index_t>& simHitBarcodeToIndex,
-                           std::unordered_map<int, std::map<int, float> >& simTrackDetIdEnergyMap,
-                           Selector selector)
-      : output_(output),
-        caloParticles_(caloParticles),
-        simHitBarcodeToIndex_(simHitBarcodeToIndex),
-        simTrackDetIdEnergyMap_(simTrackDetIdEnergyMap),
-        selector_(selector) {}
-  template <typename Vertex, typename Graph>
-  void discover_vertex(Vertex u, const Graph& g) {
-    // If we reach the vertex 0, it means that we are backtracking with respect
-    // to the first generation of stable particles: simply return;
-    //    if (u == 0) return;
-    print_vertex(u, g);
-    auto const vertex_property = get(vertex_name, g, u);
-    if (!vertex_property.simTrack) return;
-    auto trackIdx = vertex_property.simTrack->trackId();
-    IfLogDebug(DEBUG, messageCategoryGraph_)
-        << " Found " << simHitBarcodeToIndex_.count(trackIdx) << " associated simHits" << std::endl;
-    if (simHitBarcodeToIndex_.count(trackIdx)) {
-      output_.pSimClusters->emplace_back(*vertex_property.simTrack);
-      auto& simcluster = output_.pSimClusters->back();
-      std::unordered_map<uint32_t, float> acc_energy;
-      for (auto const& hit_and_energy : simTrackDetIdEnergyMap_[trackIdx]) {
-        acc_energy[hit_and_energy.first] += hit_and_energy.second;
-      }
-      for (auto const& hit_and_energy : acc_energy) {
-        simcluster.addRecHitAndFraction(hit_and_energy.first, hit_and_energy.second);
+  using Selector = std::function<bool(EdgeProperty &)>;
+
+  class CaloParticle_dfs_visitor : public boost::default_dfs_visitor {
+  public:
+    CaloParticle_dfs_visitor(CaloTruthAccumulator::OutputCollections &output,
+                             CaloTruthAccumulator::calo_particles &caloParticles,
+                             std::unordered_multimap<Barcode_t, Index_t> &simHitBarcodeToIndex,
+                             std::unordered_map<int, std::map<int, float>> &simTrackDetIdEnergyMap,
+                             Selector selector)
+        : output_(output),
+          caloParticles_(caloParticles),
+          simHitBarcodeToIndex_(simHitBarcodeToIndex),
+          simTrackDetIdEnergyMap_(simTrackDetIdEnergyMap),
+          selector_(selector) {}
+    template <typename Vertex, typename Graph>
+    void discover_vertex(Vertex u, const Graph &g) {
+      // If we reach the vertex 0, it means that we are backtracking with respect
+      // to the first generation of stable particles: simply return;
+      //    if (u == 0) return;
+      print_vertex(u, g);
+      auto const vertex_property = get(vertex_name, g, u);
+      if (!vertex_property.simTrack)
+        return;
+      auto trackIdx = vertex_property.simTrack->trackId();
+      IfLogDebug(DEBUG, messageCategoryGraph_)
+          << " Found " << simHitBarcodeToIndex_.count(trackIdx) << " associated simHits" << std::endl;
+      if (simHitBarcodeToIndex_.count(trackIdx)) {
+        output_.pSimClusters->emplace_back(*vertex_property.simTrack);
+        auto &simcluster = output_.pSimClusters->back();
+        std::unordered_map<uint32_t, float> acc_energy;
+        for (auto const &hit_and_energy : simTrackDetIdEnergyMap_[trackIdx]) {
+          acc_energy[hit_and_energy.first] += hit_and_energy.second;
+        }
+        for (auto const &hit_and_energy : acc_energy) {
+          simcluster.addRecHitAndFraction(hit_and_energy.first, hit_and_energy.second);
+        }
       }
     }
-  }
-  template <typename Edge, typename Graph>
-  void examine_edge(Edge e, const Graph& g) {
-    auto src = source(e, g);
-    auto vertex_property = get(vertex_name, g, src);
-    if (src == 0 or (vertex_property.simTrack == nullptr)) {
-      auto edge_property = get(edge_weight, g, e);
-      IfLogDebug(DEBUG, messageCategoryGraph_)
-        << "Considering CaloParticle: " << edge_property.simTrack->trackId();
-      if (selector_(edge_property)) {
-        IfLogDebug(DEBUG, messageCategoryGraph_)
-          << "Adding CaloParticle: " << edge_property.simTrack->trackId();
-        output_.pCaloParticles->emplace_back(*(edge_property.simTrack));
-        caloParticles_.sc_start_.push_back(output_.pSimClusters->size());
+    template <typename Edge, typename Graph>
+    void examine_edge(Edge e, const Graph &g) {
+      auto src = source(e, g);
+      auto vertex_property = get(vertex_name, g, src);
+      if (src == 0 or (vertex_property.simTrack == nullptr)) {
+        auto edge_property = get(edge_weight, g, e);
+        IfLogDebug(DEBUG, messageCategoryGraph_) << "Considering CaloParticle: " << edge_property.simTrack->trackId();
+        if (selector_(edge_property)) {
+          IfLogDebug(DEBUG, messageCategoryGraph_) << "Adding CaloParticle: " << edge_property.simTrack->trackId();
+          output_.pCaloParticles->emplace_back(*(edge_property.simTrack));
+          caloParticles_.sc_start_.push_back(output_.pSimClusters->size());
+        }
       }
     }
-  }
 
-  template <typename Edge, typename Graph>
-  void finish_edge(Edge e, const Graph& g) {
-    auto src = source(e, g);
-    auto vertex_property = get(vertex_name, g, src);
-    if (src == 0 or (vertex_property.simTrack == nullptr)) {
-      auto edge_property = get(edge_weight, g, e);
-      if (selector_(edge_property)) {
-        caloParticles_.sc_stop_.push_back(output_.pSimClusters->size());
+    template <typename Edge, typename Graph>
+    void finish_edge(Edge e, const Graph &g) {
+      auto src = source(e, g);
+      auto vertex_property = get(vertex_name, g, src);
+      if (src == 0 or (vertex_property.simTrack == nullptr)) {
+        auto edge_property = get(edge_weight, g, e);
+        if (selector_(edge_property)) {
+          caloParticles_.sc_stop_.push_back(output_.pSimClusters->size());
+        }
       }
     }
-  }
 
- private:
-  CaloTruthAccumulator::OutputCollections& output_;
-  CaloTruthAccumulator::calo_particles& caloParticles_;
-  std::unordered_multimap<Barcode_t, Index_t>& simHitBarcodeToIndex_;
-  std::unordered_map<int, std::map<int, float> >& simTrackDetIdEnergyMap_;
-  Selector selector_;
-};
-}
+  private:
+    CaloTruthAccumulator::OutputCollections &output_;
+    CaloTruthAccumulator::calo_particles &caloParticles_;
+    std::unordered_multimap<Barcode_t, Index_t> &simHitBarcodeToIndex_;
+    std::unordered_map<int, std::map<int, float>> &simTrackDetIdEnergyMap_;
+    Selector selector_;
+  };
+}  // namespace
 
-CaloTruthAccumulator::CaloTruthAccumulator(const edm::ParameterSet& config,
-                                                             edm::ProducerBase& mixMod,
-                                                             edm::ConsumesCollector& iC)
+CaloTruthAccumulator::CaloTruthAccumulator(const edm::ParameterSet &config,
+                                           edm::ProducerBase &mixMod,
+                                           edm::ConsumesCollector &iC)
     : messageCategory_("CaloTruthAccumulator"),
-      maximumPreviousBunchCrossing_(
-          config.getParameter<unsigned int>("maximumPreviousBunchCrossing")),
-      maximumSubsequentBunchCrossing_(
-          config.getParameter<unsigned int>("maximumSubsequentBunchCrossing")),
+      maximumPreviousBunchCrossing_(config.getParameter<unsigned int>("maximumPreviousBunchCrossing")),
+      maximumSubsequentBunchCrossing_(config.getParameter<unsigned int>("maximumSubsequentBunchCrossing")),
       simTrackLabel_(config.getParameter<edm::InputTag>("simTrackCollection")),
       simVertexLabel_(config.getParameter<edm::InputTag>("simVertexCollection")),
       collectionTags_(),
@@ -379,68 +368,69 @@ CaloTruthAccumulator::CaloTruthAccumulator(const edm::ParameterSet& config,
       minEnergy_(config.getParameter<double>("MinEnergy")),
       maxPseudoRapidity_(config.getParameter<double>("MaxPseudoRapidity")),
       premixStage1_(config.getParameter<bool>("premixStage1")),
-      geometryType_(-1)
-{
+      geometryType_(-1) {
   mixMod.produces<SimClusterCollection>("MergedCaloTruth");
   mixMod.produces<CaloParticleCollection>("MergedCaloTruth");
-  if(premixStage1_) {
-    mixMod.produces<std::vector<std::pair<unsigned int, float> > >("MergedCaloTruth");
+  if (premixStage1_) {
+    mixMod.produces<std::vector<std::pair<unsigned int, float>>>("MergedCaloTruth");
   }
 
-  iC.consumes<std::vector<SimTrack> >(simTrackLabel_);
-  iC.consumes<std::vector<SimVertex> >(simVertexLabel_);
-  iC.consumes<std::vector<reco::GenParticle> >(genParticleLabel_);
-  iC.consumes<std::vector<int> >(genParticleLabel_);
-  iC.consumes<std::vector<int> >(hepMCproductLabel_);
+  iC.consumes<std::vector<SimTrack>>(simTrackLabel_);
+  iC.consumes<std::vector<SimVertex>>(simVertexLabel_);
+  iC.consumes<std::vector<reco::GenParticle>>(genParticleLabel_);
+  iC.consumes<std::vector<int>>(genParticleLabel_);
+  iC.consumes<std::vector<int>>(hepMCproductLabel_);
 
   // Fill the collection tags
-  const edm::ParameterSet& simHitCollectionConfig = config.getParameterSet("simHitCollections");
+  const edm::ParameterSet &simHitCollectionConfig = config.getParameterSet("simHitCollections");
   std::vector<std::string> parameterNames = simHitCollectionConfig.getParameterNames();
 
-  for (auto const& parameterName : parameterNames) {
-    std::vector<edm::InputTag> tags =
-        simHitCollectionConfig.getParameter<std::vector<edm::InputTag> >(parameterName);
+  for (auto const &parameterName : parameterNames) {
+    std::vector<edm::InputTag> tags = simHitCollectionConfig.getParameter<std::vector<edm::InputTag>>(parameterName);
     collectionTags_.insert(collectionTags_.end(), tags.begin(), tags.end());
   }
 
-  for (auto const& collectionTag : collectionTags_) {
-    iC.consumes<std::vector<PCaloHit> >(collectionTag);
+  for (auto const &collectionTag : collectionTags_) {
+    iC.consumes<std::vector<PCaloHit>>(collectionTag);
   }
 }
 
-void CaloTruthAccumulator::beginLuminosityBlock(edm::LuminosityBlock const& iLumiBlock,
-                                                         const edm::EventSetup& iSetup) {
+void CaloTruthAccumulator::beginLuminosityBlock(edm::LuminosityBlock const &iLumiBlock, const edm::EventSetup &iSetup) {
   edm::ESHandle<CaloGeometry> geom;
   iSetup.get<CaloGeometryRecord>().get(geom);
   const HGCalGeometry *eegeom = nullptr, *fhgeom = nullptr, *bhgeomnew = nullptr;
-  const HcalGeometry* bhgeom = nullptr;
+  const HcalGeometry *bhgeom = nullptr;
 
-  eegeom = static_cast<const HGCalGeometry*>(geom->getSubdetectorGeometry(DetId::HGCalEE,ForwardSubdetector::ForwardEmpty));
-  //check if it's the new geometry
-  if(eegeom){
+  eegeom = static_cast<const HGCalGeometry *>(
+      geom->getSubdetectorGeometry(DetId::HGCalEE, ForwardSubdetector::ForwardEmpty));
+  // check if it's the new geometry
+  if (eegeom) {
     geometryType_ = 1;
-    fhgeom = static_cast<const HGCalGeometry*>(geom->getSubdetectorGeometry(DetId::HGCalHSi,ForwardSubdetector::ForwardEmpty));
-    bhgeomnew = static_cast<const HGCalGeometry*>(geom->getSubdetectorGeometry(DetId::HGCalHSc,ForwardSubdetector::ForwardEmpty));
-  }
-  else {
+    fhgeom = static_cast<const HGCalGeometry *>(
+        geom->getSubdetectorGeometry(DetId::HGCalHSi, ForwardSubdetector::ForwardEmpty));
+    bhgeomnew = static_cast<const HGCalGeometry *>(
+        geom->getSubdetectorGeometry(DetId::HGCalHSc, ForwardSubdetector::ForwardEmpty));
+  } else {
     geometryType_ = 0;
-    eegeom = static_cast<const HGCalGeometry*>(geom->getSubdetectorGeometry(DetId::Forward, HGCEE));
-    fhgeom = static_cast<const HGCalGeometry*>(geom->getSubdetectorGeometry(DetId::Forward, HGCHEF));
-    bhgeom = static_cast<const HcalGeometry*>(geom->getSubdetectorGeometry(DetId::Hcal, HcalEndcap));
+    eegeom = static_cast<const HGCalGeometry *>(geom->getSubdetectorGeometry(DetId::Forward, HGCEE));
+    fhgeom = static_cast<const HGCalGeometry *>(geom->getSubdetectorGeometry(DetId::Forward, HGCHEF));
+    bhgeom = static_cast<const HcalGeometry *>(geom->getSubdetectorGeometry(DetId::Hcal, HcalEndcap));
   }
   hgtopo_[0] = &(eegeom->topology());
   hgtopo_[1] = &(fhgeom->topology());
-  if(bhgeomnew) hgtopo_[2] = &(bhgeomnew->topology());
+  if (bhgeomnew)
+    hgtopo_[2] = &(bhgeomnew->topology());
 
   for (unsigned i = 0; i < 3; ++i) {
-    if(hgtopo_[i]) hgddd_[i] = &(hgtopo_[i]->dddConstants());
+    if (hgtopo_[i])
+      hgddd_[i] = &(hgtopo_[i]->dddConstants());
   }
 
-  if(bhgeom) hcddd_ = bhgeom->topology().dddConstants();
+  if (bhgeom)
+    hcddd_ = bhgeom->topology().dddConstants();
 }
 
-void CaloTruthAccumulator::initializeEvent(edm::Event const& event,
-                                                    edm::EventSetup const& setup) {
+void CaloTruthAccumulator::initializeEvent(edm::Event const &event, edm::EventSetup const &setup) {
   output_.pSimClusters.reset(new SimClusterCollection());
   output_.pCaloParticles.reset(new CaloParticleCollection());
 
@@ -454,8 +444,7 @@ void CaloTruthAccumulator::initializeEvent(edm::Event const& event,
     to get a handle to) which is only implemented for container-like objects
     like std::vector but not for edm::HepMCProduct!
 */
-void CaloTruthAccumulator::accumulate(edm::Event const& event,
-                                               edm::EventSetup const& setup) {
+void CaloTruthAccumulator::accumulate(edm::Event const &event, edm::EventSetup const &setup) {
   edm::Handle<edm::HepMCProduct> hepmc;
   event.getByLabel(hepMCproductLabel_, hepmc);
 
@@ -463,50 +452,48 @@ void CaloTruthAccumulator::accumulate(edm::Event const& event,
   accumulateEvent(event, setup, hepmc);
 }
 
-void CaloTruthAccumulator::accumulate(PileUpEventPrincipal const& event,
-                                               edm::EventSetup const& setup, edm::StreamID const&) {
+void CaloTruthAccumulator::accumulate(PileUpEventPrincipal const &event,
+                                      edm::EventSetup const &setup,
+                                      edm::StreamID const &) {
   if (event.bunchCrossing() >= -static_cast<int>(maximumPreviousBunchCrossing_) &&
       event.bunchCrossing() <= static_cast<int>(maximumSubsequentBunchCrossing_)) {
     // simply create empty handle as we do not have a HepMCProduct in PU anyway
     edm::Handle<edm::HepMCProduct> hepmc;
-    edm::LogInfo(messageCategory_)
-        << " CaloTruthAccumulator::accumulate (pileup) bunchCrossing="
-        << event.bunchCrossing();
+    edm::LogInfo(messageCategory_) << " CaloTruthAccumulator::accumulate (pileup) bunchCrossing="
+                                   << event.bunchCrossing();
     accumulateEvent(event, setup, hepmc);
   } else {
-    edm::LogInfo(messageCategory_)
-        << "Skipping pileup event for bunch crossing " << event.bunchCrossing();
+    edm::LogInfo(messageCategory_) << "Skipping pileup event for bunch crossing " << event.bunchCrossing();
   }
 }
 
-void CaloTruthAccumulator::finalizeEvent(edm::Event& event, edm::EventSetup const& setup) {
-  edm::LogInfo(messageCategory_) << "Adding " << output_.pSimClusters->size()
-                                 << " SimParticles and " << output_.pCaloParticles->size()
-                                 << " CaloParticles to the event.";
+void CaloTruthAccumulator::finalizeEvent(edm::Event &event, edm::EventSetup const &setup) {
+  edm::LogInfo(messageCategory_) << "Adding " << output_.pSimClusters->size() << " SimParticles and "
+                                 << output_.pCaloParticles->size() << " CaloParticles to the event.";
 
   // We need to normalize the hits and energies into hits and fractions (since
   // we have looped over all pileup events)
-  // For premixing stage1 we keep the energies, they will be normalized to fractions in stage2
+  // For premixing stage1 we keep the energies, they will be normalized to
+  // fractions in stage2
 
-  if(premixStage1_) {
-    auto totalEnergies = std::make_unique<std::vector<std::pair<unsigned int, float> > >();
+  if (premixStage1_) {
+    auto totalEnergies = std::make_unique<std::vector<std::pair<unsigned int, float>>>();
     totalEnergies->reserve(m_detIdToTotalSimEnergy.size());
     std::copy(m_detIdToTotalSimEnergy.begin(), m_detIdToTotalSimEnergy.end(), std::back_inserter(*totalEnergies));
     std::sort(totalEnergies->begin(), totalEnergies->end());
     event.put(std::move(totalEnergies), "MergedCaloTruth");
-  }
-  else {
-    for (auto& sc : *(output_.pSimClusters)) {
+  } else {
+    for (auto &sc : *(output_.pSimClusters)) {
       auto hitsAndEnergies = sc.hits_and_fractions();
       sc.clearHitsAndFractions();
-      for (auto& hAndE : hitsAndEnergies) {
+      for (auto &hAndE : hitsAndEnergies) {
         const float totalenergy = m_detIdToTotalSimEnergy[hAndE.first];
         float fraction = 0.;
         if (totalenergy > 0)
           fraction = hAndE.second / totalenergy;
         else
-          edm::LogWarning(messageCategory_) << "TotalSimEnergy for hit " << hAndE.first
-                                            << " is 0! The fraction for this hit cannot be computed.";
+          edm::LogWarning(messageCategory_)
+              << "TotalSimEnergy for hit " << hAndE.first << " is 0! The fraction for this hit cannot be computed.";
         sc.addRecHitAndFraction(hAndE.first, fraction);
       }
     }
@@ -517,7 +504,7 @@ void CaloTruthAccumulator::finalizeEvent(edm::Event& event, edm::EventSetup cons
 
   // now fill the calo particles
   for (unsigned i = 0; i < output_.pCaloParticles->size(); ++i) {
-    auto& cp = (*output_.pCaloParticles)[i];
+    auto &cp = (*output_.pCaloParticles)[i];
     for (unsigned j = m_caloParticles.sc_start_[i]; j < m_caloParticles.sc_stop_[i]; ++j) {
       edm::Ref<SimClusterCollection> ref(scHandle, j);
       cp.addSimCluster(ref);
@@ -533,12 +520,11 @@ void CaloTruthAccumulator::finalizeEvent(edm::Event& event, edm::EventSetup cons
 }
 
 template <class T>
-void CaloTruthAccumulator::accumulateEvent(
-    const T& event, const edm::EventSetup& setup,
-    const edm::Handle<edm::HepMCProduct>& hepMCproduct) {
-
-  edm::Handle<std::vector<reco::GenParticle> > hGenParticles;
-  edm::Handle<std::vector<int> > hGenParticleIndices;
+void CaloTruthAccumulator::accumulateEvent(const T &event,
+                                           const edm::EventSetup &setup,
+                                           const edm::Handle<edm::HepMCProduct> &hepMCproduct) {
+  edm::Handle<std::vector<reco::GenParticle>> hGenParticles;
+  edm::Handle<std::vector<int>> hGenParticleIndices;
 
   event.getByLabel(simTrackLabel_, hSimTracks);
   event.getByLabel(simVertexLabel_, hSimVertices);
@@ -546,8 +532,8 @@ void CaloTruthAccumulator::accumulateEvent(
   event.getByLabel(genParticleLabel_, hGenParticles);
   event.getByLabel(genParticleLabel_, hGenParticleIndices);
 
-  std::vector<std::pair<DetId, const PCaloHit*> > simHitPointers;
-  std::unordered_map<int, std::map<int, float> > simTrackDetIdEnergyMap;
+  std::vector<std::pair<DetId, const PCaloHit *>> simHitPointers;
+  std::unordered_map<int, std::map<int, float>> simTrackDetIdEnergyMap;
   fillSimHits(simHitPointers, simTrackDetIdEnergyMap, event, setup);
 
   // Clear maps from previous event fill them for this one
@@ -556,16 +542,15 @@ void CaloTruthAccumulator::accumulateEvent(
     m_simHitBarcodeToIndex.emplace(simHitPointers[i].second->geantTrackId(), i);
   }
 
-  auto const& tracks = *hSimTracks;
-  auto const& vertices = *hSimVertices;
+  auto const &tracks = *hSimTracks;
+  auto const &vertices = *hSimVertices;
   std::unordered_map<int, int> trackid_to_track_index;
   DecayChain decay;
   int idx = 0;
 
   IfLogDebug(DEBUG, messageCategory_) << " TRACKS" << std::endl;
-  for (auto const& t : tracks) {
-    IfLogDebug(DEBUG, messageCategory_)
-        << " " << idx << "\t" << t.trackId() << "\t" << t << std::endl;
+  for (auto const &t : tracks) {
+    IfLogDebug(DEBUG, messageCategory_) << " " << idx << "\t" << t.trackId() << "\t" << t << std::endl;
     trackid_to_track_index[t.trackId()] = idx;
     idx++;
   }
@@ -600,7 +585,7 @@ void CaloTruthAccumulator::accumulateEvent(
   std::vector<int> used_sim_tracks(tracks.size(), 0);
   std::vector<int> collapsed_vertices(vertices.size(), 0);
   IfLogDebug(DEBUG, messageCategory_) << " VERTICES" << std::endl;
-  for (auto const& v : vertices) {
+  for (auto const &v : vertices) {
     IfLogDebug(DEBUG, messageCategory_) << " " << idx++ << "\t" << v << std::endl;
     if (v.parentIndex() != -1) {
       auto trk_idx = trackid_to_track_index[v.parentIndex()];
@@ -613,15 +598,17 @@ void CaloTruthAccumulator::accumulateEvent(
         continue;
       }
       // Perform the actual vertex collapsing, if needed.
-      if (collapsed_vertices[origin_vtx]) origin_vtx = collapsed_vertices[origin_vtx];
-      add_edge(origin_vtx, v.vertexId(),
+      if (collapsed_vertices[origin_vtx])
+        origin_vtx = collapsed_vertices[origin_vtx];
+      add_edge(origin_vtx,
+               v.vertexId(),
                EdgeProperty(&tracks[trk_idx], simTrackDetIdEnergyMap[v.parentIndex()].size(), 0),
                decay);
       used_sim_tracks[trk_idx] = v.vertexId();
     }
   }
   // Build the motherParticle property to each vertex
-  auto const& vertexMothersProp = get(vertex_name, decay);
+  auto const &vertexMothersProp = get(vertex_name, decay);
   // Now recover the particles that did not decay. Append them with an index
   // bigger than the size of the generated vertices.
   int offset = vertices.size();
@@ -629,10 +616,10 @@ void CaloTruthAccumulator::accumulateEvent(
     if (!used_sim_tracks[i]) {
       auto origin_vtx = tracks[i].vertIndex();
       // Perform the actual vertex collapsing, if needed.
-      if (collapsed_vertices[origin_vtx]) origin_vtx = collapsed_vertices[origin_vtx];
-      add_edge(origin_vtx, offset,
-               EdgeProperty(&tracks[i], simTrackDetIdEnergyMap[tracks[i].trackId()].size(), 0),
-               decay);
+      if (collapsed_vertices[origin_vtx])
+        origin_vtx = collapsed_vertices[origin_vtx];
+      add_edge(
+          origin_vtx, offset, EdgeProperty(&tracks[i], simTrackDetIdEnergyMap[tracks[i].trackId()].size(), 0), decay);
       // The properties for "fake" vertices associated to stable particles have
       // to be set inside this loop, since they do not belong to the vertices
       // collection and would be skipped by that loop (coming next)
@@ -640,22 +627,26 @@ void CaloTruthAccumulator::accumulateEvent(
       offset++;
     }
   }
-  for (auto const& v : vertices) {
+  for (auto const &v : vertices) {
     if (v.parentIndex() != -1) {
       // Skip collapsed_vertices
-      if (collapsed_vertices[v.vertexId()]) continue;
-      put(vertexMothersProp, v.vertexId(),
-          VertexProperty(&tracks[trackid_to_track_index[v.parentIndex()]], 0));
+      if (collapsed_vertices[v.vertexId()])
+        continue;
+      put(vertexMothersProp, v.vertexId(), VertexProperty(&tracks[trackid_to_track_index[v.parentIndex()]], 0));
     }
   }
   SimHitsAccumulator_dfs_visitor vis;
   depth_first_search(decay, visitor(vis));
   CaloParticle_dfs_visitor caloParticleCreator(
-      output_, m_caloParticles, m_simHitBarcodeToIndex, simTrackDetIdEnergyMap,
-      [&](EdgeProperty& edge_property) -> bool {
-        // Apply selection on SimTracks in order to promote them to be CaloParticles.
-        // The function returns TRUE if the particle satisfies the selection, FALSE otherwise.
-        // Therefore the correct logic to select the particle is to ask for TRUE as return value.
+      output_,
+      m_caloParticles,
+      m_simHitBarcodeToIndex,
+      simTrackDetIdEnergyMap,
+      [&](EdgeProperty &edge_property) -> bool {
+        // Apply selection on SimTracks in order to promote them to be
+        // CaloParticles. The function returns TRUE if the particle satisfies
+        // the selection, FALSE otherwise. Therefore the correct logic to select
+        // the particle is to ask for TRUE as return value.
         return (edge_property.cumulative_simHits != 0 and !edge_property.simTrack->noGenpart() and
                 edge_property.simTrack->momentum().E() > minEnergy_ and
                 std::abs(edge_property.simTrack->momentum().Eta()) < maxPseudoRapidity_);
@@ -663,46 +654,47 @@ void CaloTruthAccumulator::accumulateEvent(
   depth_first_search(decay, visitor(caloParticleCreator));
 
 #if DEBUG
-  boost::write_graphviz(std::cout, decay, make_label_writer(make_transform_value_property_map(
-                                              &graphviz_vertex, get(vertex_name, decay))),
-                        make_label_writer(make_transform_value_property_map(
-                            &graphviz_edge, get(edge_weight, decay))));
+  boost::write_graphviz(std::cout,
+                        decay,
+                        make_label_writer(make_transform_value_property_map(&graphviz_vertex, get(vertex_name, decay))),
+                        make_label_writer(make_transform_value_property_map(&graphviz_edge, get(edge_weight, decay))));
 #endif
 }
 
 template <class T>
-void CaloTruthAccumulator::fillSimHits(
-    std::vector<std::pair<DetId, const PCaloHit*> >& returnValue,
-    std::unordered_map<int, std::map<int, float> >& simTrackDetIdEnergyMap, const T& event,
-    const edm::EventSetup& setup) {
-  for (auto const& collectionTag : collectionTags_) {
-    edm::Handle<std::vector<PCaloHit> > hSimHits;
+void CaloTruthAccumulator::fillSimHits(std::vector<std::pair<DetId, const PCaloHit *>> &returnValue,
+                                       std::unordered_map<int, std::map<int, float>> &simTrackDetIdEnergyMap,
+                                       const T &event,
+                                       const edm::EventSetup &setup) {
+  for (auto const &collectionTag : collectionTags_) {
+    edm::Handle<std::vector<PCaloHit>> hSimHits;
     const bool isHcal = (collectionTag.instance().find("HcalHits") != std::string::npos);
     event.getByLabel(collectionTag, hSimHits);
-    for (auto const& simHit : *hSimHits) {
+    for (auto const &simHit : *hSimHits) {
       DetId id(0);
       const uint32_t simId = simHit.id();
-      if (geometryType_==1) {
-        //no test numbering in new geometry
+      if (geometryType_ == 1) {
+        // no test numbering in new geometry
         id = simId;
-      }
-      else if (isHcal) {
+      } else if (isHcal) {
         HcalDetId hid = HcalHitRelabeller::relabel(simId, hcddd_);
-        if (hid.subdet() == HcalEndcap) id = hid;
+        if (hid.subdet() == HcalEndcap)
+          id = hid;
       } else {
         int subdet, layer, cell, sec, subsec, zp;
         HGCalTestNumbering::unpackHexagonIndex(simId, subdet, zp, layer, sec, subsec, cell);
-        const HGCalDDDConstants* ddd = hgddd_[subdet - 3];
-        std::pair<int, int> recoLayerCell =
-            ddd->simToReco(cell, layer, sec, hgtopo_[subdet - 3]->detectorType());
+        const HGCalDDDConstants *ddd = hgddd_[subdet - 3];
+        std::pair<int, int> recoLayerCell = ddd->simToReco(cell, layer, sec, hgtopo_[subdet - 3]->detectorType());
         cell = recoLayerCell.first;
         layer = recoLayerCell.second;
         // skip simhits with bad barcodes or non-existant layers
-        if (layer == -1 || simHit.geantTrackId() == 0) continue;
+        if (layer == -1 || simHit.geantTrackId() == 0)
+          continue;
         id = HGCalDetId((ForwardSubdetector)subdet, zp, layer, subsec, sec, cell);
       }
 
-      if (DetId(0) == id) continue;
+      if (DetId(0) == id)
+        continue;
 
       uint32_t detId = id.rawId();
       returnValue.emplace_back(id, &simHit);
diff --git a/SimGeneral/CaloAnalysis/plugins/PreMixingCaloParticleWorker.cc b/SimGeneral/CaloAnalysis/plugins/PreMixingCaloParticleWorker.cc
index f093b06ff350c..30f89cbb3c612 100644
--- a/SimGeneral/CaloAnalysis/plugins/PreMixingCaloParticleWorker.cc
+++ b/SimGeneral/CaloAnalysis/plugins/PreMixingCaloParticleWorker.cc
@@ -1,8 +1,8 @@
-#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ProducerBase.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "SimGeneral/MixingModule/interface/PileUpEventPrincipal.h"
 
 #include "DataFormats/Common/interface/Handle.h"
@@ -14,20 +14,23 @@
 #include "SimGeneral/PreMixingModule/interface/PreMixingWorker.h"
 #include "SimGeneral/PreMixingModule/interface/PreMixingWorkerFactory.h"
 
-class PreMixingCaloParticleWorker: public PreMixingWorker {
+class PreMixingCaloParticleWorker : public PreMixingWorker {
 public:
-  PreMixingCaloParticleWorker(const edm::ParameterSet& ps, edm::ProducerBase& producer, edm::ConsumesCollector && iC);
+  PreMixingCaloParticleWorker(const edm::ParameterSet &ps, edm::ProducerBase &producer, edm::ConsumesCollector &&iC);
   ~PreMixingCaloParticleWorker() override = default;
 
-  void initializeEvent(edm::Event const& iEvent, edm::EventSetup const& iSetup) override;
-  void addSignals(edm::Event const& iEvent, edm::EventSetup const& iSetup) override;
-  void addPileups(PileUpEventPrincipal const& pep, edm::EventSetup const& iSetup) override;
-  void put(edm::Event& iEvent, edm::EventSetup const& iSetup, std::vector<PileupSummaryInfo> const& ps, int bunchSpacing) override;
+  void initializeEvent(edm::Event const &iEvent, edm::EventSetup const &iSetup) override;
+  void addSignals(edm::Event const &iEvent, edm::EventSetup const &iSetup) override;
+  void addPileups(PileUpEventPrincipal const &pep, edm::EventSetup const &iSetup) override;
+  void put(edm::Event &iEvent,
+           edm::EventSetup const &iSetup,
+           std::vector<PileupSummaryInfo> const &ps,
+           int bunchSpacing) override;
 
 private:
-  using EnergyMap = std::vector<std::pair<unsigned, float> >;
+  using EnergyMap = std::vector<std::pair<unsigned, float>>;
 
-  void add(const SimClusterCollection& clusters, const CaloParticleCollection& particles, const EnergyMap& energyMap);
+  void add(const SimClusterCollection &clusters, const CaloParticleCollection &particles, const EnergyMap &energyMap);
 
   edm::EDGetTokenT<SimClusterCollection> sigClusterToken_;
   edm::EDGetTokenT<CaloParticleCollection> sigParticleToken_;
@@ -43,27 +46,29 @@ class PreMixingCaloParticleWorker: public PreMixingWorker {
   SimClusterRefProd clusterRef_;
 };
 
-PreMixingCaloParticleWorker::PreMixingCaloParticleWorker(const edm::ParameterSet& ps, edm::ProducerBase& producer, edm::ConsumesCollector && iC):
-  sigClusterToken_(iC.consumes<SimClusterCollection>(ps.getParameter<edm::InputTag>("labelSig"))),
-  sigParticleToken_(iC.consumes<CaloParticleCollection>(ps.getParameter<edm::InputTag>("labelSig"))),
-  sigEnergyToken_(iC.consumes<EnergyMap>(ps.getParameter<edm::InputTag>("labelSig"))),
-  particlePileInputTag_(ps.getParameter<edm::InputTag>("pileInputTag")),
-  particleCollectionDM_(ps.getParameter<std::string>("collectionDM"))
-{
+PreMixingCaloParticleWorker::PreMixingCaloParticleWorker(const edm::ParameterSet &ps,
+                                                         edm::ProducerBase &producer,
+                                                         edm::ConsumesCollector &&iC)
+    : sigClusterToken_(iC.consumes<SimClusterCollection>(ps.getParameter<edm::InputTag>("labelSig"))),
+      sigParticleToken_(iC.consumes<CaloParticleCollection>(ps.getParameter<edm::InputTag>("labelSig"))),
+      sigEnergyToken_(iC.consumes<EnergyMap>(ps.getParameter<edm::InputTag>("labelSig"))),
+      particlePileInputTag_(ps.getParameter<edm::InputTag>("pileInputTag")),
+      particleCollectionDM_(ps.getParameter<std::string>("collectionDM")) {
   producer.produces<SimClusterCollection>(particleCollectionDM_);
   producer.produces<CaloParticleCollection>(particleCollectionDM_);
 }
 
-void PreMixingCaloParticleWorker::initializeEvent(edm::Event const& iEvent, edm::EventSetup const& iSetup) {
+void PreMixingCaloParticleWorker::initializeEvent(edm::Event const &iEvent, edm::EventSetup const &iSetup) {
   newClusters_ = std::make_unique<SimClusterCollection>();
   newParticles_ = std::make_unique<CaloParticleCollection>();
 
   // need RefProds in order to re-key the CaloParticle->SimCluster refs
-  // TODO: try to remove const_cast, requires making Event non-const in BMixingModule::initializeEvent
-  clusterRef_ = const_cast<edm::Event&>(iEvent).getRefBeforePut<SimClusterCollection>(particleCollectionDM_);
+  // TODO: try to remove const_cast, requires making Event non-const in
+  // BMixingModule::initializeEvent
+  clusterRef_ = const_cast<edm::Event &>(iEvent).getRefBeforePut<SimClusterCollection>(particleCollectionDM_);
 }
 
-void PreMixingCaloParticleWorker::addSignals(edm::Event const& iEvent, edm::EventSetup const& iSetup) {
+void PreMixingCaloParticleWorker::addSignals(edm::Event const &iEvent, edm::EventSetup const &iSetup) {
   edm::Handle<SimClusterCollection> clusters;
   iEvent.getByToken(sigClusterToken_, clusters);
 
@@ -73,12 +78,12 @@ void PreMixingCaloParticleWorker::addSignals(edm::Event const& iEvent, edm::Even
   edm::Handle<EnergyMap> energy;
   iEvent.getByToken(sigEnergyToken_, energy);
 
-  if(clusters.isValid() && particles.isValid() && energy.isValid()) {
+  if (clusters.isValid() && particles.isValid() && energy.isValid()) {
     add(*clusters, *particles, *energy);
   }
 }
 
-void PreMixingCaloParticleWorker::addPileups(PileUpEventPrincipal const& pep, edm::EventSetup const& iSetup) {
+void PreMixingCaloParticleWorker::addPileups(PileUpEventPrincipal const &pep, edm::EventSetup const &iSetup) {
   edm::Handle<SimClusterCollection> clusters;
   pep.getByLabel(particlePileInputTag_, clusters);
 
@@ -88,12 +93,14 @@ void PreMixingCaloParticleWorker::addPileups(PileUpEventPrincipal const& pep, ed
   edm::Handle<EnergyMap> energy;
   pep.getByLabel(particlePileInputTag_, energy);
 
-  if(clusters.isValid() && particles.isValid() && energy.isValid()) {
+  if (clusters.isValid() && particles.isValid() && energy.isValid()) {
     add(*clusters, *particles, *energy);
   }
 }
 
-void PreMixingCaloParticleWorker::add(const SimClusterCollection& clusters, const CaloParticleCollection& particles, const EnergyMap& energy) {
+void PreMixingCaloParticleWorker::add(const SimClusterCollection &clusters,
+                                      const CaloParticleCollection &particles,
+                                      const EnergyMap &energy) {
   const size_t startingIndex = newClusters_->size();
 
   // Copy SimClusters
@@ -102,35 +109,38 @@ void PreMixingCaloParticleWorker::add(const SimClusterCollection& clusters, cons
 
   // Copy CaloParticles
   newParticles_->reserve(newParticles_->size() + particles.size());
-  for(const auto& p: particles) {
+  for (const auto &p : particles) {
     newParticles_->push_back(p);
-    auto& particle = newParticles_->back();
+    auto &particle = newParticles_->back();
 
     // re-key the refs to SimClusters
     particle.clearSimClusters();
-    for(const auto& ref: p.simClusters()) {
+    for (const auto &ref : p.simClusters()) {
       particle.addSimCluster(SimClusterRef(clusterRef_, startingIndex + ref.index()));
     }
   }
 
   // Add energies
-  for(const auto elem: energy) {
+  for (const auto elem : energy) {
     totalEnergy_[elem.first] += elem.second;
   }
 }
 
-void PreMixingCaloParticleWorker::put(edm::Event& iEvent, edm::EventSetup const& iSetup, std::vector<PileupSummaryInfo> const& ps, int bunchSpacing) {
-  for (auto& sc : *newClusters_) {
+void PreMixingCaloParticleWorker::put(edm::Event &iEvent,
+                                      edm::EventSetup const &iSetup,
+                                      std::vector<PileupSummaryInfo> const &ps,
+                                      int bunchSpacing) {
+  for (auto &sc : *newClusters_) {
     auto hitsAndEnergies = sc.hits_and_fractions();
     sc.clearHitsAndFractions();
-    for (auto& hAndE : hitsAndEnergies) {
+    for (auto &hAndE : hitsAndEnergies) {
       const float totalenergy = totalEnergy_[hAndE.first];
       float fraction = 0.;
       if (totalenergy > 0)
         fraction = hAndE.second / totalenergy;
       else
-        edm::LogWarning("PreMixingParticleWorker") << "TotalSimEnergy for hit " << hAndE.first
-                                                   << " is 0! The fraction for this hit cannot be computed.";
+        edm::LogWarning("PreMixingParticleWorker")
+            << "TotalSimEnergy for hit " << hAndE.first << " is 0! The fraction for this hit cannot be computed.";
       sc.addRecHitAndFraction(hAndE.first, fraction);
     }
   }
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingEMDigiWorker.cc b/SimGeneral/DataMixingModule/plugins/DataMixingEMDigiWorker.cc
index 425dba21d5152..89d46f26a2295 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingEMDigiWorker.cc
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingEMDigiWorker.cc
@@ -4,41 +4,39 @@
 //
 //--------------------------------------------
 
-#include <map>
-#include <memory>
-#include <cmath>
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "CondFormats/EcalObjects/interface/EcalGainRatios.h"
 #include "CondFormats/DataRecord/interface/EcalGainRatiosRcd.h"
-#include "CondFormats/EcalObjects/interface/EcalPedestals.h"
 #include "CondFormats/DataRecord/interface/EcalPedestalsRcd.h"
+#include "CondFormats/EcalObjects/interface/EcalGainRatios.h"
 #include "CondFormats/EcalObjects/interface/EcalMGPAGainRatio.h"
+#include "CondFormats/EcalObjects/interface/EcalPedestals.h"
+#include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include <cmath>
+#include <map>
+#include <memory>
 
 //
 //
 #include "DataMixingEMDigiWorker.h"
 
-
 using namespace std;
 
-namespace edm
-{
+namespace edm {
 
   // Virtual constructor
 
-  DataMixingEMDigiWorker::DataMixingEMDigiWorker() { }
+  DataMixingEMDigiWorker::DataMixingEMDigiWorker() {}
 
-  // Constructor 
-  DataMixingEMDigiWorker::DataMixingEMDigiWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC) : 
-							    label_(ps.getParameter<std::string>("Label"))
-
-  {                                                         
+  // Constructor
+  DataMixingEMDigiWorker::DataMixingEMDigiWorker(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC)
+      : label_(ps.getParameter<std::string>("Label"))
 
+  {
     // get the subdetector names
-    //    this->getSubdetectorNames();  //something like this may be useful to check what we are supposed to do...
+    //    this->getSubdetectorNames();  //something like this may be useful to
+    //    check what we are supposed to do...
 
     // declare the products to produce, retrieve
 
@@ -58,213 +56,182 @@ namespace edm
     EEDigiPileToken_ = iC.consumes<EEDigiCollection>(EEPileInputTag_);
     ESDigiPileToken_ = iC.consumes<ESDigiCollection>(ESPileInputTag_);
 
-    EBDigiCollectionDM_        = ps.getParameter<std::string>("EBDigiCollectionDM");
-    EEDigiCollectionDM_        = ps.getParameter<std::string>("EEDigiCollectionDM");
-    ESDigiCollectionDM_        = ps.getParameter<std::string>("ESDigiCollectionDM");
-
-
-
+    EBDigiCollectionDM_ = ps.getParameter<std::string>("EBDigiCollectionDM");
+    EEDigiCollectionDM_ = ps.getParameter<std::string>("EEDigiCollectionDM");
+    ESDigiCollectionDM_ = ps.getParameter<std::string>("ESDigiCollectionDM");
   }
-	       
 
   // Virtual destructor needed.
-  DataMixingEMDigiWorker::~DataMixingEMDigiWorker() { 
-  }  
+  DataMixingEMDigiWorker::~DataMixingEMDigiWorker() {}
 
-  void DataMixingEMDigiWorker::addEMSignals(const edm::Event &e,const edm::EventSetup& ES) { 
+  void DataMixingEMDigiWorker::addEMSignals(const edm::Event &e, const edm::EventSetup &ES) {
     // fill in maps of hits
 
-    LogInfo("DataMixingEMDigiWorker")<<"===============> adding MC signals for "<<e.id();
+    LogInfo("DataMixingEMDigiWorker") << "===============> adding MC signals for " << e.id();
 
     // EB first
 
-   Handle< EBDigiCollection > pEBDigis;
-
-   const EBDigiCollection*  EBDigis = nullptr;
+    Handle<EBDigiCollection> pEBDigis;
 
-   if(e.getByToken(EBDigiToken_, pEBDigis) ){
-     EBDigis = pEBDigis.product(); // get a ptr to the product
-     LogDebug("DataMixingEMDigiWorker") << "total # EB digis: " << EBDigis->size();
-   }
- 
-   if (EBDigis)
-     {
-       // loop over digis, storing them in a map so we can add pileup later
+    const EBDigiCollection *EBDigis = nullptr;
 
+    if (e.getByToken(EBDigiToken_, pEBDigis)) {
+      EBDigis = pEBDigis.product();  // get a ptr to the product
+      LogDebug("DataMixingEMDigiWorker") << "total # EB digis: " << EBDigis->size();
+    }
 
-       for(EBDigiCollection::const_iterator it  = EBDigis->begin();	
-	   it != EBDigis->end(); ++it) {
+    if (EBDigis) {
+      // loop over digis, storing them in a map so we can add pileup later
 
-	 EBDigiStorage_.insert(EBDigiMap::value_type( ( it->id() ), *it ));
-#ifdef DEBUG	 
-         // Commented out because this does not compile anymore	 
-         // LogDebug("DataMixingEMDigiWorker") << "processed EBDigi with rawId: "
-         //                                    << it->id().rawId() << "\n"
-         //                                    << " digi energy: " << it->energy();
-#endif
-       }
-     }
-
-   // EE next
-
-   Handle< EEDigiCollection > pEEDigis;
-
-   const EEDigiCollection*  EEDigis = nullptr;
-
-   
-   if(e.getByToken(EEDigiToken_, pEEDigis) ){
-     EEDigis = pEEDigis.product(); // get a ptr to the product
-     LogDebug("DataMixingEMDigiWorker") << "total # EE digis: " << EEDigis->size();
-   } 
-   
- 
-   if (EEDigis)
-     {
-       // loop over digis, storing them in a map so we can add pileup later
-       for(EEDigiCollection::const_iterator it  = EEDigis->begin();	
-	   it != EEDigis->end(); ++it) {
-
-	 EEDigiStorage_.insert(EEDigiMap::value_type( ( it->id() ), *it ));
-#ifdef DEBUG	 
-         // Commented out because this does not compile anymore	 
-	 // LogDebug("DataMixingEMDigiWorker") << "processed EEDigi with rawId: "
-         //                                    << it->id().rawId() << "\n"
-         //                                    << " digi energy: " << it->energy();
+      for (EBDigiCollection::const_iterator it = EBDigis->begin(); it != EBDigis->end(); ++it) {
+        EBDigiStorage_.insert(EBDigiMap::value_type((it->id()), *it));
+#ifdef DEBUG
+        // Commented out because this does not compile anymore
+        // LogDebug("DataMixingEMDigiWorker") << "processed EBDigi with rawId: "
+        //                                    << it->id().rawId() << "\n"
+        //                                    << " digi energy: " << it->energy();
 #endif
+      }
+    }
+
+    // EE next
+
+    Handle<EEDigiCollection> pEEDigis;
+
+    const EEDigiCollection *EEDigis = nullptr;
+
+    if (e.getByToken(EEDigiToken_, pEEDigis)) {
+      EEDigis = pEEDigis.product();  // get a ptr to the product
+      LogDebug("DataMixingEMDigiWorker") << "total # EE digis: " << EEDigis->size();
+    }
 
-       }
-     }
-   // ES next
+    if (EEDigis) {
+      // loop over digis, storing them in a map so we can add pileup later
+      for (EEDigiCollection::const_iterator it = EEDigis->begin(); it != EEDigis->end(); ++it) {
+        EEDigiStorage_.insert(EEDigiMap::value_type((it->id()), *it));
+#ifdef DEBUG
+        // Commented out because this does not compile anymore
+        // LogDebug("DataMixingEMDigiWorker") << "processed EEDigi with rawId: "
+        //                                    << it->id().rawId() << "\n"
+        //                                    << " digi energy: " << it->energy();
+#endif
+      }
+    }
+    // ES next
 
-   Handle< ESDigiCollection > pESDigis;
+    Handle<ESDigiCollection> pESDigis;
 
-   const ESDigiCollection*  ESDigis = nullptr;
+    const ESDigiCollection *ESDigis = nullptr;
 
-   
-   if(e.getByToken( ESDigiToken_, pESDigis) ){
-     ESDigis = pESDigis.product(); // get a ptr to the product
+    if (e.getByToken(ESDigiToken_, pESDigis)) {
+      ESDigis = pESDigis.product();  // get a ptr to the product
 #ifdef DEBUG
-     LogDebug("DataMixingEMDigiWorker") << "total # ES digis: " << ESDigis->size();
+      LogDebug("DataMixingEMDigiWorker") << "total # ES digis: " << ESDigis->size();
 #endif
-   } 
-
- 
-   if (ESDigis)
-     {
-
-       // loop over digis, storing them in a map so we can add pileup later
-       for(ESDigiCollection::const_iterator it  = ESDigis->begin();	
-	   it != ESDigis->end(); ++it) {
-
-	 ESDigiStorage_.insert(ESDigiMap::value_type( ( it->id() ), *it ));
-	 
-#ifdef DEBUG	 
-         // Commented out because this does not compile anymore	 
-         // LogDebug("DataMixingEMDigiWorker") << "processed ESDigi with rawId: "
-         //                                    << it->id().rawId() << "\n"
-         //                                    << " digi energy: " << it->energy();
+    }
+
+    if (ESDigis) {
+      // loop over digis, storing them in a map so we can add pileup later
+      for (ESDigiCollection::const_iterator it = ESDigis->begin(); it != ESDigis->end(); ++it) {
+        ESDigiStorage_.insert(ESDigiMap::value_type((it->id()), *it));
+
+#ifdef DEBUG
+        // Commented out because this does not compile anymore
+        // LogDebug("DataMixingEMDigiWorker") << "processed ESDigi with rawId: "
+        //                                    << it->id().rawId() << "\n"
+        //                                    << " digi energy: " << it->energy();
 #endif
+      }
+    }
 
-       }
-     }
-    
-  } // end of addEMSignals
+  }  // end of addEMSignals
 
-  void DataMixingEMDigiWorker::addEMPileups(const int bcr, const EventPrincipal *ep, unsigned int eventNr, const edm::EventSetup& ES,
-                                            ModuleCallingContext const* mcc) {
-  
-    LogInfo("DataMixingEMDigiWorker") <<"\n===============> adding pileups from event  "<<ep->id()<<" for bunchcrossing "<<bcr;
+  void DataMixingEMDigiWorker::addEMPileups(const int bcr,
+                                            const EventPrincipal *ep,
+                                            unsigned int eventNr,
+                                            const edm::EventSetup &ES,
+                                            ModuleCallingContext const *mcc) {
+    LogInfo("DataMixingEMDigiWorker") << "\n===============> adding pileups from event  " << ep->id()
+                                      << " for bunchcrossing " << bcr;
 
-    // fill in maps of hits; same code as addSignals, except now applied to the pileup events
+    // fill in maps of hits; same code as addSignals, except now applied to the
+    // pileup events
 
     // EB first
 
-    std::shared_ptr<Wrapper<EBDigiCollection>  const> EBDigisPTR = 
-      getProductByTag<EBDigiCollection>(*ep, EBPileInputTag_, mcc);
- 
-   if(EBDigisPTR ) {
+    std::shared_ptr<Wrapper<EBDigiCollection> const> EBDigisPTR =
+        getProductByTag<EBDigiCollection>(*ep, EBPileInputTag_, mcc);
 
-     const EBDigiCollection*  EBDigis = const_cast< EBDigiCollection * >(EBDigisPTR->product());
+    if (EBDigisPTR) {
+      const EBDigiCollection *EBDigis = const_cast<EBDigiCollection *>(EBDigisPTR->product());
 
-     LogDebug("DataMixingEMDigiWorker") << "total # EB digis: " << EBDigis->size();
+      LogDebug("DataMixingEMDigiWorker") << "total # EB digis: " << EBDigis->size();
 
-       // loop over digis, adding these to the existing maps
-     for(EBDigiCollection::const_iterator it  = EBDigis->begin();
-	 it != EBDigis->end(); ++it) {
+      // loop over digis, adding these to the existing maps
+      for (EBDigiCollection::const_iterator it = EBDigis->begin(); it != EBDigis->end(); ++it) {
+        EBDigiStorage_.insert(EBDigiMap::value_type((it->id()), *it));
 
-       	 EBDigiStorage_.insert(EBDigiMap::value_type( (it->id()), *it ));
-	 
-#ifdef DEBUG	 
-         // Commented out because this does not compile anymore	 
-       	 // LogDebug("DataMixingEMDigiWorker") << "processed EBDigi with rawId: "
-         //                                    << it->id().rawId() << "\n"
-         //                                    << " digi energy: " << it->energy();
+#ifdef DEBUG
+        // Commented out because this does not compile anymore
+        // LogDebug("DataMixingEMDigiWorker") << "processed EBDigi with rawId: "
+        //                                    << it->id().rawId() << "\n"
+        //                                    << " digi energy: " << it->energy();
 #endif
       }
     }
 
     // EE Next
 
-    std::shared_ptr<Wrapper<EEDigiCollection>  const> EEDigisPTR =
-      getProductByTag<EEDigiCollection>(*ep, EEPileInputTag_, mcc);
-
-    if(EEDigisPTR ) {
+    std::shared_ptr<Wrapper<EEDigiCollection> const> EEDigisPTR =
+        getProductByTag<EEDigiCollection>(*ep, EEPileInputTag_, mcc);
 
-     const EEDigiCollection*  EEDigis = const_cast< EEDigiCollection * >(EEDigisPTR->product()); 
+    if (EEDigisPTR) {
+      const EEDigiCollection *EEDigis = const_cast<EEDigiCollection *>(EEDigisPTR->product());
 
-     LogDebug("DataMixingEMDigiWorker") << "total # EE digis: " << EEDigis->size();
+      LogDebug("DataMixingEMDigiWorker") << "total # EE digis: " << EEDigis->size();
 
-     for(EEDigiCollection::const_iterator it  = EEDigis->begin();
-	 it != EEDigis->end(); ++it) {
+      for (EEDigiCollection::const_iterator it = EEDigis->begin(); it != EEDigis->end(); ++it) {
+        EEDigiStorage_.insert(EEDigiMap::value_type((it->id()), *it));
 
-       EEDigiStorage_.insert(EEDigiMap::value_type( (it->id()), *it ));
-	 
-#ifdef DEBUG	 
-       // Commented out because this does not compile anymore	 
-       // LogDebug("DataMixingEMDigiWorker") << "processed EEDigi with rawId: "
-       //                                    << it->id().rawId() << "\n"
-       //                                    << " digi energy: " << it->energy();
+#ifdef DEBUG
+        // Commented out because this does not compile anymore
+        // LogDebug("DataMixingEMDigiWorker") << "processed EEDigi with rawId: "
+        //                                    << it->id().rawId() << "\n"
+        //                                    << " digi energy: " << it->energy();
 #endif
-     }
-   }
+      }
+    }
     // ES Next
 
-    std::shared_ptr<Wrapper<ESDigiCollection>  const> ESDigisPTR =
-      getProductByTag<ESDigiCollection>(*ep, ESPileInputTag_, mcc);
+    std::shared_ptr<Wrapper<ESDigiCollection> const> ESDigisPTR =
+        getProductByTag<ESDigiCollection>(*ep, ESPileInputTag_, mcc);
 
-    if(ESDigisPTR ) {
-
-      const ESDigiCollection*  ESDigis = const_cast< ESDigiCollection * >(ESDigisPTR->product());
+    if (ESDigisPTR) {
+      const ESDigiCollection *ESDigis = const_cast<ESDigiCollection *>(ESDigisPTR->product());
 
       LogDebug("DataMixingEMDigiWorker") << "total # ES digis: " << ESDigis->size();
 
-      for(ESDigiCollection::const_iterator it  = ESDigis->begin();
-	  it != ESDigis->end(); ++it) {
-
-	ESDigiStorage_.insert(ESDigiMap::value_type( (it->id()), *it ));
+      for (ESDigiCollection::const_iterator it = ESDigis->begin(); it != ESDigis->end(); ++it) {
+        ESDigiStorage_.insert(ESDigiMap::value_type((it->id()), *it));
 
 #ifdef DEBUG
-        // Commented out because this does not compile anymore	 
+        // Commented out because this does not compile anymore
         // LogDebug("DataMixingEMDigiWorker") << "processed ESDigi with rawId: "
         //                                    << it->id().rawId() << "\n"
         //                                    << " digi energy: " << it->energy();
 #endif
       }
     }
- 
-  
- 
   }
- 
-  void DataMixingEMDigiWorker::putEM(edm::Event &e, const edm::EventSetup& ES) {
 
+  void DataMixingEMDigiWorker::putEM(edm::Event &e, const edm::EventSetup &ES) {
     // collection of digis to put in the event
-    std::unique_ptr< EBDigiCollection > EBdigis( new EBDigiCollection );
-    std::unique_ptr< EEDigiCollection > EEdigis( new EEDigiCollection );
-    std::unique_ptr< ESDigiCollection > ESdigis( new ESDigiCollection );
-
+    std::unique_ptr<EBDigiCollection> EBdigis(new EBDigiCollection);
+    std::unique_ptr<EEDigiCollection> EEdigis(new EEDigiCollection);
+    std::unique_ptr<ESDigiCollection> ESdigis(new ESDigiCollection);
 
-    // loop over the maps we have, re-making individual hits or digis if necessary.
+    // loop over the maps we have, re-making individual hits or digis if
+    // necessary.
     DetId formerID = 0;
     DetId currentID;
 
@@ -282,121 +249,109 @@ namespace edm
 
     EBDigiMap::const_iterator iEBchk;
 
-    
-
-    for(EBDigiMap::const_iterator iEB  = EBDigiStorage_.begin();
-	iEB != EBDigiStorage_.end(); iEB++) {
-
-      currentID = iEB->first; 
-
-      if (currentID == formerID) { // we have to add these digis together
-	/*	
-	cout<< " Adding signals " << EBDetId(currentID).ieta() << " " 
-	                          << EBDetId(currentID).iphi() << std::endl;
-
-	cout << 1 << " " ; 
-	for (int i=0; i<10;++i)  std::cout << EB_old[i].adc()<< "["<<EB_old[i].gainId()<< "] " ; std::cout << std::endl;
- 
-	cout << 2 << " " ; 
-	for (int i=0; i<10;++i)  std::cout << (iEB->second)[i].adc()<< "["<<(iEB->second)[i].gainId()<< "] " ; std::cout << std::endl;
-	*/
-	//loop over digi samples in each DataFrame
-	unsigned int sizenew = (iEB->second).size();
-	unsigned int sizeold = EB_old.size();
-
-	unsigned int max_samp = std::max(sizenew, sizeold);
-
-	// samples from different events can be of different lengths - sum all
-	// that overlap.
-	// check to see if gains match - if not, scale smaller cell down.
-
-	int sw_gain_consensus=0;
-
-
-	for(unsigned int isamp = 0; isamp<max_samp; isamp++) {
-	  if(isamp < sizenew) {
-	    gain_new = (iEB->second)[isamp].gainId();
-	    adc_new = (iEB->second)[isamp].adc();
-	  }
-	  else { adc_new = 0;}
-
-	  if(isamp < sizeold) {
-	      gain_old = EB_old[isamp].gainId();
-	      adc_old = EB_old[isamp].adc();
-	  }
-	  else { adc_old = 0;}
-
-	  const std::vector<float> pedeStals = GetPedestals(ES,currentID);
-	  const std::vector<float> gainRatios = GetGainRatios(ES,currentID);
-
-	  if(adc_new>0 && adc_old>0) {
-	    if(gain_old == gain_new) {  // we're happy - easy case
-	      gain_consensus = gain_old;
-	    }
-	    else {  // lower gain sample has more energy
-	     	      	      
-
-	      if(gain_old < gain_new) { // old has higher gain than new, scale to lower gain
-		
-	
-		float ratio = gainRatios[gain_new-1]/gainRatios[gain_old-1];
-		adc_old = (int) round ((adc_old - pedeStals[gain_old-1]) / ratio + pedeStals[gain_new-1] );  
-		gain_consensus = gain_new;
-	      }
-	      else { // scale to old (lower) gain
-		float ratio = gainRatios[gain_old-1]/gainRatios[gain_new-1];
-		adc_new = (int) round ( (adc_new - pedeStals[gain_new-1]) / ratio+ pedeStals[gain_old-1] );
-		gain_consensus = gain_old;
-	      } 
-	    }
-	  }
-
-	 
-	  // add values, but don't count pedestals twice
-	  adc_sum = adc_new + adc_old - (int) round (pedeStals[gain_consensus-1]);
-
-
-	  // if we are now saturating that gain, switch to the next
-	  if (adc_sum> 4096) {
-	    if (gain_consensus<3){
-
-	      double ratio = gainRatios[gain_consensus]/gainRatios[gain_consensus-1];
-	      adc_sum = (int) round ((adc_sum - pedeStals[gain_consensus-1])/ ratio + pedeStals[gain_consensus]  )  ;
-	      sw_gain_consensus=++gain_consensus;	      
-	    }
-	    else adc_sum = 4096;
-		
-	  } 
-
-	  // furthermore, make sure we don't decrease our gain once we've switched up
-	  // in case go back 
-	  if (gain_consensus<sw_gain_consensus){
-
-	    double ratio = gainRatios[sw_gain_consensus-1]/gainRatios[gain_consensus-1];
- 	    adc_sum = (int) round((adc_sum - pedeStals[gain_consensus-1] )/ratio + pedeStals[sw_gain_consensus-1]);
-	    gain_consensus = sw_gain_consensus;
-	  }
-
-	  EcalMGPASample sample(adc_sum, gain_consensus);
-	  EB_old.setSample(isamp,sample);  // overwrite old sample, adding new info
-	} // for sample
-
-
-      } // if current = former
-      else {
-	  if(formerID>0) {
-	    EBdigis->push_back( formerID, EB_old.frame().begin() );
-	  }
-	  //save pointers for next iteration
-	  formerID = currentID;
-	  EB_old = iEB->second;
+    for (EBDigiMap::const_iterator iEB = EBDigiStorage_.begin(); iEB != EBDigiStorage_.end(); iEB++) {
+      currentID = iEB->first;
 
-      }
+      if (currentID == formerID) {  // we have to add these digis together
+        /*
+      cout<< " Adding signals " << EBDetId(currentID).ieta() << " "
+                                << EBDetId(currentID).iphi() << std::endl;
+
+      cout << 1 << " " ;
+      for (int i=0; i<10;++i)  std::cout << EB_old[i].adc()<<
+      "["<<EB_old[i].gainId()<< "] " ; std::cout << std::endl;
+
+      cout << 2 << " " ;
+      for (int i=0; i<10;++i)  std::cout << (iEB->second)[i].adc()<<
+      "["<<(iEB->second)[i].gainId()<< "] " ; std::cout << std::endl;
+      */
+        // loop over digi samples in each DataFrame
+        unsigned int sizenew = (iEB->second).size();
+        unsigned int sizeold = EB_old.size();
+
+        unsigned int max_samp = std::max(sizenew, sizeold);
+
+        // samples from different events can be of different lengths - sum all
+        // that overlap.
+        // check to see if gains match - if not, scale smaller cell down.
+
+        int sw_gain_consensus = 0;
 
+        for (unsigned int isamp = 0; isamp < max_samp; isamp++) {
+          if (isamp < sizenew) {
+            gain_new = (iEB->second)[isamp].gainId();
+            adc_new = (iEB->second)[isamp].adc();
+          } else {
+            adc_new = 0;
+          }
+
+          if (isamp < sizeold) {
+            gain_old = EB_old[isamp].gainId();
+            adc_old = EB_old[isamp].adc();
+          } else {
+            adc_old = 0;
+          }
+
+          const std::vector<float> pedeStals = GetPedestals(ES, currentID);
+          const std::vector<float> gainRatios = GetGainRatios(ES, currentID);
+
+          if (adc_new > 0 && adc_old > 0) {
+            if (gain_old == gain_new) {  // we're happy - easy case
+              gain_consensus = gain_old;
+            } else {  // lower gain sample has more energy
+
+              if (gain_old < gain_new) {  // old has higher gain than new, scale to lower gain
+
+                float ratio = gainRatios[gain_new - 1] / gainRatios[gain_old - 1];
+                adc_old = (int)round((adc_old - pedeStals[gain_old - 1]) / ratio + pedeStals[gain_new - 1]);
+                gain_consensus = gain_new;
+              } else {  // scale to old (lower) gain
+                float ratio = gainRatios[gain_old - 1] / gainRatios[gain_new - 1];
+                adc_new = (int)round((adc_new - pedeStals[gain_new - 1]) / ratio + pedeStals[gain_old - 1]);
+                gain_consensus = gain_old;
+              }
+            }
+          }
+
+          // add values, but don't count pedestals twice
+          adc_sum = adc_new + adc_old - (int)round(pedeStals[gain_consensus - 1]);
+
+          // if we are now saturating that gain, switch to the next
+          if (adc_sum > 4096) {
+            if (gain_consensus < 3) {
+              double ratio = gainRatios[gain_consensus] / gainRatios[gain_consensus - 1];
+              adc_sum = (int)round((adc_sum - pedeStals[gain_consensus - 1]) / ratio + pedeStals[gain_consensus]);
+              sw_gain_consensus = ++gain_consensus;
+            } else
+              adc_sum = 4096;
+          }
+
+          // furthermore, make sure we don't decrease our gain once we've switched
+          // up in case go back
+          if (gain_consensus < sw_gain_consensus) {
+            double ratio = gainRatios[sw_gain_consensus - 1] / gainRatios[gain_consensus - 1];
+            adc_sum = (int)round((adc_sum - pedeStals[gain_consensus - 1]) / ratio + pedeStals[sw_gain_consensus - 1]);
+            gain_consensus = sw_gain_consensus;
+          }
+
+          EcalMGPASample sample(adc_sum, gain_consensus);
+          EB_old.setSample(isamp,
+                           sample);  // overwrite old sample, adding new info
+        }                            // for sample
+
+      }  // if current = former
+      else {
+        if (formerID > 0) {
+          EBdigis->push_back(formerID, EB_old.frame().begin());
+        }
+        // save pointers for next iteration
+        formerID = currentID;
+        EB_old = iEB->second;
+      }
 
       iEBchk = iEB;
-      if((++iEBchk) == EBDigiStorage_.end()) {  //make sure not to lose the last one
-	    EBdigis->push_back( currentID, (iEB->second).frame().begin()) ;
+      if ((++iEBchk) == EBDigiStorage_.end()) {  // make sure not to lose the last one
+        EBdigis->push_back(currentID, (iEB->second).frame().begin());
       }
     }
 
@@ -407,98 +362,88 @@ namespace edm
 
     EEDigiMap::const_iterator iEEchk;
 
-    for(EEDigiMap::const_iterator iEE  = EEDigiStorage_.begin();
-	iEE != EEDigiStorage_.end(); iEE++) {
-
-      currentID = iEE->first; 
-
-      if (currentID == formerID) { // we have to add these digis together
-
-	//loop over digi samples in each DataFrame
-	unsigned int sizenew = (iEE->second).size();
-	unsigned int sizeold = EE_old.size();
-
-	unsigned int max_samp = std::max(sizenew, sizeold);
-
-	// samples from different events can be of different lengths - sum all
-	// that overlap.
-	// check to see if gains match - if not, scale smaller cell down.
-
-	for(unsigned int isamp = 0; isamp<max_samp; isamp++) {
-	  if(isamp < sizenew) {
-	    gain_new = (iEE->second)[isamp].gainId();
-	    adc_new = (iEE->second)[isamp].adc();
-	  }
-	  else { adc_new = 0;}
-
-	  if(isamp < sizeold) {
-	      gain_old = EE_old[isamp].gainId();
-	      adc_old = EE_old[isamp].adc();
-	  }
-	  else { adc_old = 0;}
-
-	  const std::vector<float> pedeStals = GetPedestals(ES,currentID);
-	  const std::vector<float> gainRatios = GetGainRatios(ES,currentID);
-
-	  if(adc_new>0 && adc_old>0) {
-	    if(gain_old == gain_new) {  // we're happy - easy case
-	      gain_consensus = gain_old;
-	    }
-	    else {  // lower gain sample has more energy
-
-	      if(gain_old < gain_new) { // old has higher gain than new, scale to lower gain
-		
-		
-		float ratio = gainRatios[gain_new-1]/gainRatios[gain_old-1];
-		adc_old = (int) round ((adc_old - pedeStals[gain_old-1]) / ratio + pedeStals[gain_new-1] );  
-		gain_consensus = gain_new;
-	      }
-	      else { // scale to old (lower) gain
-		float ratio = gainRatios[gain_old-1]/gainRatios[gain_new-1];
-		adc_new = (int) round ( (adc_new - pedeStals[gain_new-1]) / ratio+ pedeStals[gain_old-1] );
-		gain_consensus = gain_old;
-	      } 
-	    }
-	    
+    for (EEDigiMap::const_iterator iEE = EEDigiStorage_.begin(); iEE != EEDigiStorage_.end(); iEE++) {
+      currentID = iEE->first;
+
+      if (currentID == formerID) {  // we have to add these digis together
+
+        // loop over digi samples in each DataFrame
+        unsigned int sizenew = (iEE->second).size();
+        unsigned int sizeold = EE_old.size();
+
+        unsigned int max_samp = std::max(sizenew, sizeold);
+
+        // samples from different events can be of different lengths - sum all
+        // that overlap.
+        // check to see if gains match - if not, scale smaller cell down.
+
+        for (unsigned int isamp = 0; isamp < max_samp; isamp++) {
+          if (isamp < sizenew) {
+            gain_new = (iEE->second)[isamp].gainId();
+            adc_new = (iEE->second)[isamp].adc();
+          } else {
+            adc_new = 0;
           }
-	     
-
-         // add values, but don't count pedestals twice
-         adc_sum = adc_new + adc_old - (int) round (pedeStals[gain_consensus-1]);
-	  
-	  // if the sum saturates this gain, switch
-	  if (adc_sum> 4096) {
-	    if (gain_consensus<3){
-	      
-	      double ratio = gainRatios[gain_consensus]/gainRatios[gain_consensus-1];
-	      adc_sum = (int) round ((adc_sum - pedeStals[gain_consensus-1])/ ratio + pedeStals[gain_consensus]  )  ;
-	      ++gain_consensus;
-	    }
-	    else adc_sum = 4096;
-	    
-	  } 
-	  
-	  EcalMGPASample sample(adc_sum, gain_consensus);
-	  EE_old.setSample(isamp,sample);
-	}
 
+          if (isamp < sizeold) {
+            gain_old = EE_old[isamp].gainId();
+            adc_old = EE_old[isamp].adc();
+          } else {
+            adc_old = 0;
+          }
+
+          const std::vector<float> pedeStals = GetPedestals(ES, currentID);
+          const std::vector<float> gainRatios = GetGainRatios(ES, currentID);
+
+          if (adc_new > 0 && adc_old > 0) {
+            if (gain_old == gain_new) {  // we're happy - easy case
+              gain_consensus = gain_old;
+            } else {  // lower gain sample has more energy
+
+              if (gain_old < gain_new) {  // old has higher gain than new, scale to lower gain
+
+                float ratio = gainRatios[gain_new - 1] / gainRatios[gain_old - 1];
+                adc_old = (int)round((adc_old - pedeStals[gain_old - 1]) / ratio + pedeStals[gain_new - 1]);
+                gain_consensus = gain_new;
+              } else {  // scale to old (lower) gain
+                float ratio = gainRatios[gain_old - 1] / gainRatios[gain_new - 1];
+                adc_new = (int)round((adc_new - pedeStals[gain_new - 1]) / ratio + pedeStals[gain_old - 1]);
+                gain_consensus = gain_old;
+              }
+            }
+          }
+
+          // add values, but don't count pedestals twice
+          adc_sum = adc_new + adc_old - (int)round(pedeStals[gain_consensus - 1]);
+
+          // if the sum saturates this gain, switch
+          if (adc_sum > 4096) {
+            if (gain_consensus < 3) {
+              double ratio = gainRatios[gain_consensus] / gainRatios[gain_consensus - 1];
+              adc_sum = (int)round((adc_sum - pedeStals[gain_consensus - 1]) / ratio + pedeStals[gain_consensus]);
+              ++gain_consensus;
+            } else
+              adc_sum = 4096;
+          }
+
+          EcalMGPASample sample(adc_sum, gain_consensus);
+          EE_old.setSample(isamp, sample);
+        }
+
+      } else {
+        if (formerID > 0) {
+          EEdigis->push_back(formerID, EE_old.frame().begin());
+        }
+        // save pointers for next iteration
+        formerID = currentID;
+        EE_old = iEE->second;
       }
-      else {
-	  if(formerID>0) {
-	    EEdigis->push_back(formerID, EE_old.frame().begin() );
-	     
-	  }
-	  //save pointers for next iteration
-	  formerID = currentID;
-	  EE_old = iEE->second;
-      }
-     
+
       iEEchk = iEE;
-      if((++iEEchk) == EEDigiStorage_.end()) {  //make sure not to lose the last one
-	    EEdigis->push_back(currentID, (iEE->second).frame().begin());
+      if ((++iEEchk) == EEDigiStorage_.end()) {  // make sure not to lose the last one
+        EEdigis->push_back(currentID, (iEE->second).frame().begin());
       }
     }
-   
 
     // ES next...
 
@@ -507,129 +452,119 @@ namespace edm
 
     ESDigiMap::const_iterator iESchk;
 
-    for(ESDigiMap::const_iterator iES  = ESDigiStorage_.begin();
-	iES != ESDigiStorage_.end(); iES++) {
-
-      currentID = iES->first; 
+    for (ESDigiMap::const_iterator iES = ESDigiStorage_.begin(); iES != ESDigiStorage_.end(); iES++) {
+      currentID = iES->first;
 
-      if (currentID == formerID) { // we have to add these digis together
+      if (currentID == formerID) {  // we have to add these digis together
 
-	//loop over digi samples in each DataFrame
-	unsigned int sizenew = (iES->second).size();
-	unsigned int sizeold = ES_old.size();
-	uint16_t rawdat = 0;
-	unsigned int max_samp = std::max(sizenew, sizeold);
+        // loop over digi samples in each DataFrame
+        unsigned int sizenew = (iES->second).size();
+        unsigned int sizeold = ES_old.size();
+        uint16_t rawdat = 0;
+        unsigned int max_samp = std::max(sizenew, sizeold);
 
-	// samples from different events can be of different lengths - sum all
-	// that overlap.
-	// check to see if gains match - if not, scale smaller cell down.
+        // samples from different events can be of different lengths - sum all
+        // that overlap.
+        // check to see if gains match - if not, scale smaller cell down.
 
-	for(unsigned int isamp = 0; isamp<max_samp; isamp++) {
-	  if(isamp < sizenew) {
-	    adc_new = (iES->second)[isamp].adc();
-	    rawdat = (iES->second)[isamp].raw();
-	  }
-	  else { adc_new = 0;}
-
-	  if(isamp < sizeold) {
-	      adc_old = ES_old[isamp].adc();
-	      rawdat = ES_old[isamp].raw();
-	  }
-	  else { adc_old = 0;}
+        for (unsigned int isamp = 0; isamp < max_samp; isamp++) {
+          if (isamp < sizenew) {
+            adc_new = (iES->second)[isamp].adc();
+            rawdat = (iES->second)[isamp].raw();
+          } else {
+            adc_new = 0;
+          }
 
-	  // add values
-	  adc_sum = adc_new + adc_old;
-	  // make data word of gain, rawdata
-	  adc_sum = std::min(adc_sum,4095); //first 12 bits of (uint)
-	  data = adc_sum+(rawdat&0xF000); // data is 14 bit word with gain as MSBs
-	  ES_old.setSample(isamp,data);
-	}
+          if (isamp < sizeold) {
+            adc_old = ES_old[isamp].adc();
+            rawdat = ES_old[isamp].raw();
+          } else {
+            adc_old = 0;
+          }
 
-      }
-      else {
-	  if(formerID>0) {
-	    ESdigis->push_back(ES_old);
-	  }
-	  //save pointers for next iteration
-	  formerID = currentID;
-	  ES_old = iES->second;
+          // add values
+          adc_sum = adc_new + adc_old;
+          // make data word of gain, rawdata
+          adc_sum = std::min(adc_sum, 4095);   // first 12 bits of (uint)
+          data = adc_sum + (rawdat & 0xF000);  // data is 14 bit word with gain as MSBs
+          ES_old.setSample(isamp, data);
+        }
+
+      } else {
+        if (formerID > 0) {
+          ESdigis->push_back(ES_old);
+        }
+        // save pointers for next iteration
+        formerID = currentID;
+        ES_old = iES->second;
       }
 
       iESchk = iES;
-      if((++iESchk) == ESDigiStorage_.end()) {  //make sure not to lose the last one
-	ESdigis->push_back(iES->second);
-	//	ESDataFrame df( (*ESdigis)->back() );
-	//for(int isamp=0; isamp<(iES->second).size(); isamp++) {
-	//  df.setSample(isamp,(iES->second).data[isamp]);
-	//	}
+      if ((++iESchk) == ESDigiStorage_.end()) {  // make sure not to lose the last one
+        ESdigis->push_back(iES->second);
+        //	ESDataFrame df( (*ESdigis)->back() );
+        // for(int isamp=0; isamp<(iES->second).size(); isamp++) {
+        //  df.setSample(isamp,(iES->second).data[isamp]);
+        //	}
       }
     }
 
-
     // done merging
 
-    // put the collection of reconstructed hits in the event   
-    LogInfo("DataMixingEMDigiWorker") << "total # EB Merged digis: " << EBdigis->size() ;
-    LogInfo("DataMixingEMDigiWorker") << "total # EE Merged digis: " << EEdigis->size() ;
-    LogInfo("DataMixingEMDigiWorker") << "total # ES Merged digis: " << ESdigis->size() ;
+    // put the collection of reconstructed hits in the event
+    LogInfo("DataMixingEMDigiWorker") << "total # EB Merged digis: " << EBdigis->size();
+    LogInfo("DataMixingEMDigiWorker") << "total # EE Merged digis: " << EEdigis->size();
+    LogInfo("DataMixingEMDigiWorker") << "total # ES Merged digis: " << ESdigis->size();
+
+    e.put(std::move(EBdigis), EBDigiCollectionDM_);
+    e.put(std::move(EEdigis), EEDigiCollectionDM_);
+    e.put(std::move(ESdigis), ESDigiCollectionDM_);
 
-    e.put(std::move(EBdigis), EBDigiCollectionDM_ );
-    e.put(std::move(EEdigis), EEDigiCollectionDM_ );
-    e.put(std::move(ESdigis), ESDigiCollectionDM_ );
-    
     // clear local storage after this event
 
     EBDigiStorage_.clear();
     EEDigiStorage_.clear();
     ESDigiStorage_.clear();
-
   }
-  const std::vector<float>  DataMixingEMDigiWorker::GetPedestals (const edm::EventSetup& ES, const DetId& detid) {
-    
+  const std::vector<float> DataMixingEMDigiWorker::GetPedestals(const edm::EventSetup &ES, const DetId &detid) {
     std::vector<float> pedeStals(3);
 
     // get pedestals
     edm::ESHandle<EcalPedestals> pedHandle;
-    ES.get<EcalPedestalsRcd>().get( pedHandle );
-    
-    
-    const EcalPedestalsMap & pedMap = pedHandle.product()->getMap(); // map of pedestals
-    EcalPedestalsMapIterator pedIter; // pedestal iterator
-    EcalPedestals::Item aped; // pedestal object for a single xtal
-    
-    
+    ES.get<EcalPedestalsRcd>().get(pedHandle);
+
+    const EcalPedestalsMap &pedMap = pedHandle.product()->getMap();  // map of pedestals
+    EcalPedestalsMapIterator pedIter;                                // pedestal iterator
+    EcalPedestals::Item aped;                                        // pedestal object for a single xtal
+
     pedIter = pedMap.find(detid);
-    if( pedIter != pedMap.end() ) {
+    if (pedIter != pedMap.end()) {
       aped = (*pedIter);
       pedeStals[0] = aped.mean_x12;
       pedeStals[1] = aped.mean_x6;
       pedeStals[2] = aped.mean_x1;
     } else {
-      edm::LogError("DataMixingMissingInput") << "Cannot find pedestals";  
+      edm::LogError("DataMixingMissingInput") << "Cannot find pedestals";
       pedeStals[0] = 0;
       pedeStals[1] = 0;
       pedeStals[2] = 0;
     }
-    
-    
+
     return pedeStals;
   }
 
-  const std::vector<float>  DataMixingEMDigiWorker::GetGainRatios(const edm::EventSetup& ES, const DetId& detid) {
-
+  const std::vector<float> DataMixingEMDigiWorker::GetGainRatios(const edm::EventSetup &ES, const DetId &detid) {
     std::vector<float> gainRatios(3);
-    // get gain ratios  
+    // get gain ratios
     edm::ESHandle<EcalGainRatios> grHandle;
     ES.get<EcalGainRatiosRcd>().get(grHandle);
-    EcalMGPAGainRatio theRatio= (*grHandle)[detid];
-    
-    
+    EcalMGPAGainRatio theRatio = (*grHandle)[detid];
+
     gainRatios[0] = 1.;
     gainRatios[1] = theRatio.gain12Over6();
-    gainRatios[2] = theRatio.gain6Over1()  * theRatio.gain12Over6();
+    gainRatios[2] = theRatio.gain6Over1() * theRatio.gain12Over6();
 
     return gainRatios;
   }
 
-
-} //edm
+}  // namespace edm
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingEMDigiWorker.h b/SimGeneral/DataMixingModule/plugins/DataMixingEMDigiWorker.h
index 63e84b01aaacf..f804452f4073d 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingEMDigiWorker.h
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingEMDigiWorker.h
@@ -3,7 +3,7 @@
 
 /** \class DataMixingEMDigiWorker
  *
- * DataMixingModule is the EDProducer subclass 
+ * DataMixingModule is the EDProducer subclass
  * that overlays rawdata events on top of MC,
  * using real data for pileup simulation
  * This class takes care of the EM information at the Digi level
@@ -14,100 +14,98 @@
  *
  ************************************************************/
 
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/EventPrincipal.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "DataFormats/Provenance/interface/ProductID.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
 #include "DataFormats/EcalDetId/interface/EEDetId.h"
 #include "DataFormats/EcalDetId/interface/ESDetId.h"
+#include "DataFormats/Provenance/interface/ProductID.h"
 
-#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "DataFormats/EcalDigi/interface/EBDataFrame.h"
 #include "DataFormats/EcalDigi/interface/EEDataFrame.h"
 #include "DataFormats/EcalDigi/interface/ESDataFrame.h"
-
+#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 
 #include <map>
-#include <vector>
 #include <string>
+#include <vector>
 
-
-namespace edm
-{
+namespace edm {
   class ModuleCallingContext;
 
-  class DataMixingEMDigiWorker
-    {
-    public:
-
-      DataMixingEMDigiWorker();
-
-     /** standard constructor*/
-      explicit DataMixingEMDigiWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC);
-
-      /**Default destructor*/
-      virtual ~DataMixingEMDigiWorker();
-
-      void putEM(edm::Event &e,const edm::EventSetup& ES) ;
-      void addEMSignals(const edm::Event &e,const edm::EventSetup& ES); 
-      void addEMPileups(const int bcr, const edm::EventPrincipal*,unsigned int EventId,const edm::EventSetup& ES,
-                        ModuleCallingContext const*);
-
+  class DataMixingEMDigiWorker {
+  public:
+    DataMixingEMDigiWorker();
 
-    private:
-      /// retrieve pedestals for that detid [0]=g12, [1]=g6, [2]=g12
-      const std::vector<float> GetPedestals (const edm::EventSetup& ES, 
-					     const DetId& detid) ;
+    /** standard constructor*/
+    explicit DataMixingEMDigiWorker(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC);
 
-      /// retrieve gain ratios for that detid [0]=g12, [1]=g6, [2]=g12
-      const std::vector<float> GetGainRatios(const edm::EventSetup& ES, 
-					     const DetId& detid) ;
+    /**Default destructor*/
+    virtual ~DataMixingEMDigiWorker();
 
-      // data specifiers
+    void putEM(edm::Event &e, const edm::EventSetup &ES);
+    void addEMSignals(const edm::Event &e, const edm::EventSetup &ES);
+    void addEMPileups(const int bcr,
+                      const edm::EventPrincipal *,
+                      unsigned int EventId,
+                      const edm::EventSetup &ES,
+                      ModuleCallingContext const *);
 
-      edm::InputTag EBProducerSig_; // primary? name given to collection of EB calib digis
-      edm::InputTag EEProducerSig_; // primary? name given to collection of EE calib digis
-      edm::InputTag ESProducerSig_; // primary? name given to collection of ES calib digis
+  private:
+    /// retrieve pedestals for that detid [0]=g12, [1]=g6, [2]=g12
+    const std::vector<float> GetPedestals(const edm::EventSetup &ES, const DetId &detid);
 
-      edm::InputTag EBdigiCollectionSig_; // secondary name given to collection of EB calib digis
-      edm::InputTag EEdigiCollectionSig_; // secondary name given to collection of EE calib digis
-      edm::InputTag ESdigiCollectionSig_; // secondary name given to collection of ES calib digis
+    /// retrieve gain ratios for that detid [0]=g12, [1]=g6, [2]=g12
+    const std::vector<float> GetGainRatios(const edm::EventSetup &ES, const DetId &detid);
 
-      edm::InputTag EBPileInputTag_; // complete input tag for EB pileup digis
-      edm::InputTag EEPileInputTag_; // complete input tag for EE pileup digis
-      edm::InputTag ESPileInputTag_; // complete input tag for ES pileup digis
+    // data specifiers
 
-      edm::EDGetTokenT<EBDigiCollection> EBDigiToken_ ;  // Token to retrieve information
-      edm::EDGetTokenT<EEDigiCollection> EEDigiToken_ ;  // Token to retrieve information
-      edm::EDGetTokenT<ESDigiCollection> ESDigiToken_ ;  // Token to retrieve information  
+    edm::InputTag EBProducerSig_;  // primary? name given to collection of EB calib digis
+    edm::InputTag EEProducerSig_;  // primary? name given to collection of EE calib digis
+    edm::InputTag ESProducerSig_;  // primary? name given to collection of ES calib digis
 
-      edm::EDGetTokenT<EBDigiCollection> EBDigiPileToken_ ;  // Token to retrieve information
-      edm::EDGetTokenT<EEDigiCollection> EEDigiPileToken_ ;  // Token to retrieve information
-      edm::EDGetTokenT<ESDigiCollection> ESDigiPileToken_ ;  // Token to retrieve information  
+    edm::InputTag EBdigiCollectionSig_;  // secondary name given to collection of
+                                         // EB calib digis
+    edm::InputTag EEdigiCollectionSig_;  // secondary name given to collection of
+                                         // EE calib digis
+    edm::InputTag ESdigiCollectionSig_;  // secondary name given to collection of
+                                         // ES calib digis
 
+    edm::InputTag EBPileInputTag_;  // complete input tag for EB pileup digis
+    edm::InputTag EEPileInputTag_;  // complete input tag for EE pileup digis
+    edm::InputTag ESPileInputTag_;  // complete input tag for ES pileup digis
 
-      std::string EBDigiCollectionDM_; // secondary name to be given to EB collection of hits
-      std::string EEDigiCollectionDM_; // secondary name to be given to EE collection of hits
-      std::string ESDigiCollectionDM_; // secondary name to be given to ES collection of hits
+    edm::EDGetTokenT<EBDigiCollection> EBDigiToken_;  // Token to retrieve information
+    edm::EDGetTokenT<EEDigiCollection> EEDigiToken_;  // Token to retrieve information
+    edm::EDGetTokenT<ESDigiCollection> ESDigiToken_;  // Token to retrieve information
 
-      typedef std::multimap<DetId, EBDataFrame> EBDigiMap;
-      typedef std::multimap<DetId, EEDataFrame> EEDigiMap;
-      typedef std::multimap<DetId, ESDataFrame> ESDigiMap;
+    edm::EDGetTokenT<EBDigiCollection> EBDigiPileToken_;  // Token to retrieve information
+    edm::EDGetTokenT<EEDigiCollection> EEDigiPileToken_;  // Token to retrieve information
+    edm::EDGetTokenT<ESDigiCollection> ESDigiPileToken_;  // Token to retrieve information
 
-      EBDigiMap EBDigiStorage_;
-      EEDigiMap EEDigiStorage_;
-      ESDigiMap ESDigiStorage_;
+    std::string EBDigiCollectionDM_;  // secondary name to be given to EB
+                                      // collection of hits
+    std::string EEDigiCollectionDM_;  // secondary name to be given to EE
+                                      // collection of hits
+    std::string ESDigiCollectionDM_;  // secondary name to be given to ES
+                                      // collection of hits
 
+    typedef std::multimap<DetId, EBDataFrame> EBDigiMap;
+    typedef std::multimap<DetId, EEDataFrame> EEDigiMap;
+    typedef std::multimap<DetId, ESDataFrame> ESDigiMap;
 
-      //      unsigned int eventId_; //=0 for signal, from 1-n for pileup events
+    EBDigiMap EBDigiStorage_;
+    EEDigiMap EEDigiStorage_;
+    ESDigiMap ESDigiStorage_;
 
-      std::string label_;
+    //      unsigned int eventId_; //=0 for signal, from 1-n for pileup events
 
-    };
-}//edm
+    std::string label_;
+  };
+}  // namespace edm
 
-#endif // SimDataMixingEMDigiWorker_h
+#endif  // SimDataMixingEMDigiWorker_h
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingEMWorker.cc b/SimGeneral/DataMixingModule/plugins/DataMixingEMWorker.cc
index 0a272446bd7fa..4ccb02c99ed58 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingEMWorker.cc
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingEMWorker.cc
@@ -4,32 +4,30 @@
 //
 //--------------------------------------------
 
+#include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <map>
 #include <memory>
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/Common/interface/Handle.h"
 //
 //
 #include "DataMixingEMWorker.h"
 
-
 using namespace std;
 
-namespace edm
-{
+namespace edm {
 
   // Virtual constructor
 
-  DataMixingEMWorker::DataMixingEMWorker() { }
-
-  // Constructor 
-  DataMixingEMWorker::DataMixingEMWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC) : 
-							    label_(ps.getParameter<std::string>("Label"))
+  DataMixingEMWorker::DataMixingEMWorker() {}
 
-  {                                                         
+  // Constructor
+  DataMixingEMWorker::DataMixingEMWorker(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC)
+      : label_(ps.getParameter<std::string>("Label"))
 
+  {
     // get the subdetector names
-    //    this->getSubdetectorNames();  //something like this may be useful to check what we are supposed to do...
+    //    this->getSubdetectorNames();  //something like this may be useful to
+    //    check what we are supposed to do...
 
     // declare the products to produce, retrieve
 
@@ -41,7 +39,6 @@ namespace edm
     EERecHitToken_ = iC.consumes<EERecHitCollection>(EEProducerSig_);
     ESRecHitToken_ = iC.consumes<ESRecHitCollection>(ESProducerSig_);
 
-
     EBrechitCollectionSig_ = ps.getParameter<edm::InputTag>("EBrechitCollectionSig");
     EErechitCollectionSig_ = ps.getParameter<edm::InputTag>("EErechitCollectionSig");
     ESrechitCollectionSig_ = ps.getParameter<edm::InputTag>("ESrechitCollectionSig");
@@ -54,205 +51,170 @@ namespace edm
     EEPileRecHitToken_ = iC.consumes<EERecHitCollection>(EEPileRecHitInputTag_);
     ESPileRecHitToken_ = iC.consumes<ESRecHitCollection>(ESPileRecHitInputTag_);
 
-
-    EBRecHitCollectionDM_        = ps.getParameter<std::string>("EBRecHitCollectionDM");
-    EERecHitCollectionDM_        = ps.getParameter<std::string>("EERecHitCollectionDM");
-    ESRecHitCollectionDM_        = ps.getParameter<std::string>("ESRecHitCollectionDM");
-
+    EBRecHitCollectionDM_ = ps.getParameter<std::string>("EBRecHitCollectionDM");
+    EERecHitCollectionDM_ = ps.getParameter<std::string>("EERecHitCollectionDM");
+    ESRecHitCollectionDM_ = ps.getParameter<std::string>("ESRecHitCollectionDM");
   }
-	       
 
   // Virtual destructor needed.
-  DataMixingEMWorker::~DataMixingEMWorker() { 
-  }  
+  DataMixingEMWorker::~DataMixingEMWorker() {}
 
-  void DataMixingEMWorker::addEMSignals(const edm::Event &e) { 
+  void DataMixingEMWorker::addEMSignals(const edm::Event &e) {
     // fill in maps of hits
 
-    LogInfo("DataMixingEMWorker")<<"===============> adding MC signals for "<<e.id();
+    LogInfo("DataMixingEMWorker") << "===============> adding MC signals for " << e.id();
 
     // EB first
 
-   Handle< EBRecHitCollection > pEBRecHits;
-
-   const EBRecHitCollection*  EBRecHits = nullptr;
-
-   if(e.getByToken(EBRecHitToken_, pEBRecHits) ){
-     EBRecHits = pEBRecHits.product(); // get a ptr to the product
-     LogDebug("DataMixingEMWorker") << "total # EB rechits: " << EBRecHits->size();
-   }
-   
- 
-   if (EBRecHits)
-     {
-       // loop over rechits, storing them in a map so we can add pileup later
-       for(EBRecHitCollection::const_iterator it  = EBRecHits->begin();	
-	   it != EBRecHits->end(); ++it) {
-
-	 EBRecHitStorage_.insert(EBRecHitMap::value_type( ( it->id() ), *it ));
-	 
-         LogDebug("DataMixingEMWorker") << "processed EBRecHit with rawId: "
-				      << it->id().rawId() << "\n"
-				      << " rechit energy: " << it->energy();
-
-       }
-     }
-
-   // EE next
-
-   Handle< EERecHitCollection > pEERecHits;
-
-   const EERecHitCollection*  EERecHits = nullptr;
-
-   
-   if(e.getByToken(EERecHitToken_, pEERecHits) ){
-     EERecHits = pEERecHits.product(); // get a ptr to the product
-     LogDebug("DataMixingEMWorker") << "total # EE rechits: " << EERecHits->size();
-   } 
-   
- 
-   if (EERecHits)
-     {
-       // loop over rechits, storing them in a map so we can add pileup later
-       for(EERecHitCollection::const_iterator it  = EERecHits->begin();	
-	   it != EERecHits->end(); ++it) {
-
-	 EERecHitStorage_.insert(EERecHitMap::value_type( ( it->id() ), *it ));
-#ifdef DEBUG	 
-	 LogDebug("DataMixingEMWorker") << "processed EERecHit with rawId: "
-				      << it->id().rawId() << "\n"
-				      << " rechit energy: " << it->energy();
-#endif
+    Handle<EBRecHitCollection> pEBRecHits;
+
+    const EBRecHitCollection *EBRecHits = nullptr;
+
+    if (e.getByToken(EBRecHitToken_, pEBRecHits)) {
+      EBRecHits = pEBRecHits.product();  // get a ptr to the product
+      LogDebug("DataMixingEMWorker") << "total # EB rechits: " << EBRecHits->size();
+    }
+
+    if (EBRecHits) {
+      // loop over rechits, storing them in a map so we can add pileup later
+      for (EBRecHitCollection::const_iterator it = EBRecHits->begin(); it != EBRecHits->end(); ++it) {
+        EBRecHitStorage_.insert(EBRecHitMap::value_type((it->id()), *it));
 
-       }
-     }
-   // ES next
+        LogDebug("DataMixingEMWorker") << "processed EBRecHit with rawId: " << it->id().rawId() << "\n"
+                                       << " rechit energy: " << it->energy();
+      }
+    }
+
+    // EE next
+
+    Handle<EERecHitCollection> pEERecHits;
 
-   Handle< ESRecHitCollection > pESRecHits;
+    const EERecHitCollection *EERecHits = nullptr;
 
-   const ESRecHitCollection*  ESRecHits = nullptr;
+    if (e.getByToken(EERecHitToken_, pEERecHits)) {
+      EERecHits = pEERecHits.product();  // get a ptr to the product
+      LogDebug("DataMixingEMWorker") << "total # EE rechits: " << EERecHits->size();
+    }
 
-   
-   if(e.getByToken( ESRecHitToken_, pESRecHits) ){
-     ESRecHits = pESRecHits.product(); // get a ptr to the product
+    if (EERecHits) {
+      // loop over rechits, storing them in a map so we can add pileup later
+      for (EERecHitCollection::const_iterator it = EERecHits->begin(); it != EERecHits->end(); ++it) {
+        EERecHitStorage_.insert(EERecHitMap::value_type((it->id()), *it));
 #ifdef DEBUG
-     LogDebug("DataMixingEMWorker") << "total # ES rechits: " << ESRecHits->size();
+        LogDebug("DataMixingEMWorker") << "processed EERecHit with rawId: " << it->id().rawId() << "\n"
+                                       << " rechit energy: " << it->energy();
 #endif
-   } 
-   
- 
-   if (ESRecHits)
-     {
-       // loop over rechits, storing them in a map so we can add pileup later
-       for(ESRecHitCollection::const_iterator it  = ESRecHits->begin();	
-	   it != ESRecHits->end(); ++it) {
-
-	 ESRecHitStorage_.insert(ESRecHitMap::value_type( ( it->id() ), *it ));
-	 
-#ifdef DEBUG	 
-         LogDebug("DataMixingEMWorker") << "processed ESRecHit with rawId: "
-				      << it->id().rawId() << "\n"
-				      << " rechit energy: " << it->energy();
+      }
+    }
+    // ES next
+
+    Handle<ESRecHitCollection> pESRecHits;
+
+    const ESRecHitCollection *ESRecHits = nullptr;
+
+    if (e.getByToken(ESRecHitToken_, pESRecHits)) {
+      ESRecHits = pESRecHits.product();  // get a ptr to the product
+#ifdef DEBUG
+      LogDebug("DataMixingEMWorker") << "total # ES rechits: " << ESRecHits->size();
+#endif
+    }
+
+    if (ESRecHits) {
+      // loop over rechits, storing them in a map so we can add pileup later
+      for (ESRecHitCollection::const_iterator it = ESRecHits->begin(); it != ESRecHits->end(); ++it) {
+        ESRecHitStorage_.insert(ESRecHitMap::value_type((it->id()), *it));
+
+#ifdef DEBUG
+        LogDebug("DataMixingEMWorker") << "processed ESRecHit with rawId: " << it->id().rawId() << "\n"
+                                       << " rechit energy: " << it->energy();
 #endif
+      }
+    }
 
-       }
-     }
-    
-  } // end of addEMSignals
+  }  // end of addEMSignals
 
-  void DataMixingEMWorker::addEMPileups(const int bcr, const EventPrincipal *ep, unsigned int eventNr,
-                                        ModuleCallingContext const* mcc) {
-  
-    LogInfo("DataMixingEMWorker") <<"\n===============> adding pileups from event  "<<ep->id()<<" for bunchcrossing "<<bcr;
+  void DataMixingEMWorker::addEMPileups(const int bcr,
+                                        const EventPrincipal *ep,
+                                        unsigned int eventNr,
+                                        ModuleCallingContext const *mcc) {
+    LogInfo("DataMixingEMWorker") << "\n===============> adding pileups from event  " << ep->id()
+                                  << " for bunchcrossing " << bcr;
 
-    // fill in maps of hits; same code as addSignals, except now applied to the pileup events
+    // fill in maps of hits; same code as addSignals, except now applied to the
+    // pileup events
 
     // EB first
 
-    std::shared_ptr<Wrapper<EBRecHitCollection>  const> EBRecHitsPTR =
-      getProductByTag<EBRecHitCollection>(*ep, EBPileRecHitInputTag_, mcc);
-
-    if(EBRecHitsPTR ) {
+    std::shared_ptr<Wrapper<EBRecHitCollection> const> EBRecHitsPTR =
+        getProductByTag<EBRecHitCollection>(*ep, EBPileRecHitInputTag_, mcc);
 
-      const EBRecHitCollection*  EBRecHits = const_cast< EBRecHitCollection * >(EBRecHitsPTR->product());
+    if (EBRecHitsPTR) {
+      const EBRecHitCollection *EBRecHits = const_cast<EBRecHitCollection *>(EBRecHitsPTR->product());
 
       LogDebug("DataMixingEMWorker") << "total # EB rechits: " << EBRecHits->size();
 
-      // loop over digis, adding these to the existing maps                                         
-      for(EBRecHitCollection::const_iterator it  = EBRecHits->begin();
-	  it != EBRecHits->end(); ++it) {
-
-	EBRecHitStorage_.insert(EBRecHitMap::value_type( (it->id()), *it ));
+      // loop over digis, adding these to the existing maps
+      for (EBRecHitCollection::const_iterator it = EBRecHits->begin(); it != EBRecHits->end(); ++it) {
+        EBRecHitStorage_.insert(EBRecHitMap::value_type((it->id()), *it));
 
 #ifdef DEBUG
-	LogDebug("DataMixingEMWorker") << "processed EBRecHit with rawId: "
-					   << it->id().rawId() << "\n"
-					   << " rechit energy: " << it->energy();
+        LogDebug("DataMixingEMWorker") << "processed EBRecHit with rawId: " << it->id().rawId() << "\n"
+                                       << " rechit energy: " << it->energy();
 #endif
       }
     }
 
     // EE Next
 
-    std::shared_ptr<Wrapper<EERecHitCollection>  const> EERecHitsPTR =
-      getProductByTag<EERecHitCollection>(*ep, EEPileRecHitInputTag_, mcc);
-
-    if(EERecHitsPTR ) {
+    std::shared_ptr<Wrapper<EERecHitCollection> const> EERecHitsPTR =
+        getProductByTag<EERecHitCollection>(*ep, EEPileRecHitInputTag_, mcc);
 
-      const EERecHitCollection*  EERecHits = const_cast< EERecHitCollection * >(EERecHitsPTR->product());
+    if (EERecHitsPTR) {
+      const EERecHitCollection *EERecHits = const_cast<EERecHitCollection *>(EERecHitsPTR->product());
 
       LogDebug("DataMixingEMWorker") << "total # EE rechits: " << EERecHits->size();
 
-      // loop over digis, adding these to the existing maps                                         
-      for(EERecHitCollection::const_iterator it  = EERecHits->begin();
-          it != EERecHits->end(); ++it) {
-
-        EERecHitStorage_.insert(EERecHitMap::value_type( (it->id()), *it ));
+      // loop over digis, adding these to the existing maps
+      for (EERecHitCollection::const_iterator it = EERecHits->begin(); it != EERecHits->end(); ++it) {
+        EERecHitStorage_.insert(EERecHitMap::value_type((it->id()), *it));
 
 #ifdef DEBUG
-        LogDebug("DataMixingEMWorker") << "processed EERecHit with rawId: "
-				       << it->id().rawId() << "\n"
-				       << " rechit energy: " << it->energy();
+        LogDebug("DataMixingEMWorker") << "processed EERecHit with rawId: " << it->id().rawId() << "\n"
+                                       << " rechit energy: " << it->energy();
 #endif
       }
     }
 
     // ES Next
 
-    std::shared_ptr<Wrapper<ESRecHitCollection>  const> ESRecHitsPTR =
-      getProductByTag<ESRecHitCollection>(*ep, ESPileRecHitInputTag_, mcc);
-
-    if(ESRecHitsPTR ) {
+    std::shared_ptr<Wrapper<ESRecHitCollection> const> ESRecHitsPTR =
+        getProductByTag<ESRecHitCollection>(*ep, ESPileRecHitInputTag_, mcc);
 
-      const ESRecHitCollection*  ESRecHits = const_cast< ESRecHitCollection * >(ESRecHitsPTR->product());
+    if (ESRecHitsPTR) {
+      const ESRecHitCollection *ESRecHits = const_cast<ESRecHitCollection *>(ESRecHitsPTR->product());
 
       LogDebug("DataMixingEMWorker") << "total # ES rechits: " << ESRecHits->size();
 
-      // loop over digis, adding these to the existing maps                                         
-      for(ESRecHitCollection::const_iterator it  = ESRecHits->begin();
-          it != ESRecHits->end(); ++it) {
-
-        ESRecHitStorage_.insert(ESRecHitMap::value_type( (it->id()), *it ));
+      // loop over digis, adding these to the existing maps
+      for (ESRecHitCollection::const_iterator it = ESRecHits->begin(); it != ESRecHits->end(); ++it) {
+        ESRecHitStorage_.insert(ESRecHitMap::value_type((it->id()), *it));
 
 #ifdef DEBUG
-        LogDebug("DataMixingEMWorker") << "processed ESRecHit with rawId: "
-				       << it->id().rawId() << "\n"
-				       << " rechit energy: " << it->energy();
+        LogDebug("DataMixingEMWorker") << "processed ESRecHit with rawId: " << it->id().rawId() << "\n"
+                                       << " rechit energy: " << it->energy();
 #endif
       }
     }
-
-
   }
- 
-  void DataMixingEMWorker::putEM(edm::Event &e) {
 
+  void DataMixingEMWorker::putEM(edm::Event &e) {
     // collection of rechits to put in the event
-    std::unique_ptr< EBRecHitCollection > EBrechits( new EBRecHitCollection );
-    std::unique_ptr< EERecHitCollection > EErechits( new EERecHitCollection );
-    std::unique_ptr< ESRecHitCollection > ESrechits( new ESRecHitCollection );
+    std::unique_ptr<EBRecHitCollection> EBrechits(new EBRecHitCollection);
+    std::unique_ptr<EERecHitCollection> EErechits(new EERecHitCollection);
+    std::unique_ptr<ESRecHitCollection> ESrechits(new ESRecHitCollection);
 
-    // loop over the maps we have, re-making individual hits or digis if necessary.
+    // loop over the maps we have, re-making individual hits or digis if
+    // necessary.
     DetId formerID = 0;
     DetId currentID;
     float ESum = 0.;
@@ -262,127 +224,119 @@ namespace edm
 
     EBRecHitMap::const_iterator iEBchk;
 
-    for(EBRecHitMap::const_iterator iEB  = EBRecHitStorage_.begin();
-	iEB != EBRecHitStorage_.end(); ++iEB) {
-
-      currentID = iEB->first; 
-
-      if (currentID == formerID) { // we have to add these rechits together
-
-	ESum+=(iEB->second).energy(); 
-      }
-      else {
-	  if(formerID>0) {
-	    // cutoff for ESum?
-	    EcalRecHit aHit(formerID, ESum, EBTime);
-	    EBrechits->push_back( aHit );
-	  }
-	  //save pointers for next iteration
-	  formerID = currentID;
-	  ESum = (iEB->second).energy();
-	  EBTime = (iEB->second).time();  // take time of first hit in sequence - is this ok?
+    for (EBRecHitMap::const_iterator iEB = EBRecHitStorage_.begin(); iEB != EBRecHitStorage_.end(); ++iEB) {
+      currentID = iEB->first;
+
+      if (currentID == formerID) {  // we have to add these rechits together
+
+        ESum += (iEB->second).energy();
+      } else {
+        if (formerID > 0) {
+          // cutoff for ESum?
+          EcalRecHit aHit(formerID, ESum, EBTime);
+          EBrechits->push_back(aHit);
+        }
+        // save pointers for next iteration
+        formerID = currentID;
+        ESum = (iEB->second).energy();
+        EBTime = (iEB->second).time();  // take time of first hit in sequence - is this ok?
       }
 
       iEBchk = iEB;
-      if((++iEBchk) == EBRecHitStorage_.end()) {  //make sure not to lose the last one
-	EcalRecHit aHit(formerID, ESum, EBTime);
-	EBrechits->push_back( aHit );	  
+      if ((++iEBchk) == EBRecHitStorage_.end()) {  // make sure not to lose the last one
+        EcalRecHit aHit(formerID, ESum, EBTime);
+        EBrechits->push_back(aHit);
       }
     }
 
     // EE next...
 
-    // loop over the maps we have, re-making individual hits or digis if necessary.
+    // loop over the maps we have, re-making individual hits or digis if
+    // necessary.
     formerID = 0;
     ESum = 0.;
     float EETime = 0.;
-    
-    EERecHitMap::const_iterator iEEchk;
-
-    for(EERecHitMap::const_iterator iEE  = EERecHitStorage_.begin();
-	iEE != EERecHitStorage_.end(); ++iEE) {
 
-      currentID = iEE->first; 
-
-      if (currentID == formerID) { // we have to add these rechits together
+    EERecHitMap::const_iterator iEEchk;
 
-	ESum+=(iEE->second).energy(); 
-      }
-      else {
-	  if(formerID>0) {
-	    // cutoff for ESum?
-	    EcalRecHit aHit(formerID, ESum, EETime);
-	    EErechits->push_back( aHit );
-	  }
-	  //save pointers for next iteration
-	  formerID = currentID;
-	  ESum = (iEE->second).energy();
-	  EETime = (iEE->second).time();  // take time of first hit in sequence - is this ok?
+    for (EERecHitMap::const_iterator iEE = EERecHitStorage_.begin(); iEE != EERecHitStorage_.end(); ++iEE) {
+      currentID = iEE->first;
+
+      if (currentID == formerID) {  // we have to add these rechits together
+
+        ESum += (iEE->second).energy();
+      } else {
+        if (formerID > 0) {
+          // cutoff for ESum?
+          EcalRecHit aHit(formerID, ESum, EETime);
+          EErechits->push_back(aHit);
+        }
+        // save pointers for next iteration
+        formerID = currentID;
+        ESum = (iEE->second).energy();
+        EETime = (iEE->second).time();  // take time of first hit in sequence - is this ok?
       }
 
       iEEchk = iEE;
-      if((++iEEchk) == EERecHitStorage_.end()) {  //make sure not to lose the last one
-	EcalRecHit aHit(formerID, ESum, EETime);
-	EErechits->push_back( aHit );	  
+      if ((++iEEchk) == EERecHitStorage_.end()) {  // make sure not to lose the last one
+        EcalRecHit aHit(formerID, ESum, EETime);
+        EErechits->push_back(aHit);
       }
     }
 
     // ES next...
 
-    // loop over the maps we have, re-making individual hits or digis if necessary.
+    // loop over the maps we have, re-making individual hits or digis if
+    // necessary.
     formerID = 0;
     ESum = 0.;
     float ESTime = 0.;
 
     ESRecHitMap::const_iterator iESchk;
 
-    for(ESRecHitMap::const_iterator iES  = ESRecHitStorage_.begin();
-	iES != ESRecHitStorage_.end(); ++iES) {
-
-      currentID = iES->first; 
-
-      if (currentID == formerID) { // we have to add these rechits together
-
-	ESum+=(iES->second).energy(); 
-      }
-      else {
-	  if(formerID>0) {
-	    // cutoff for ESum?
-	    EcalRecHit aHit(formerID, ESum, ESTime);
-	    ESrechits->push_back( aHit );
-	  }
-	  //save pointers for next iteration
-	  formerID = currentID;
-	  ESum = (iES->second).energy();
-	  ESTime = (iES->second).time();  // take time of first hit in sequence - is this ok?
+    for (ESRecHitMap::const_iterator iES = ESRecHitStorage_.begin(); iES != ESRecHitStorage_.end(); ++iES) {
+      currentID = iES->first;
+
+      if (currentID == formerID) {  // we have to add these rechits together
+
+        ESum += (iES->second).energy();
+      } else {
+        if (formerID > 0) {
+          // cutoff for ESum?
+          EcalRecHit aHit(formerID, ESum, ESTime);
+          ESrechits->push_back(aHit);
+        }
+        // save pointers for next iteration
+        formerID = currentID;
+        ESum = (iES->second).energy();
+        ESTime = (iES->second).time();  // take time of first hit in sequence - is this ok?
       }
 
       iESchk = iES;
-      if((++iESchk) == ESRecHitStorage_.end()) {  //make sure not to lose the last one
-	EcalRecHit aHit(formerID, ESum, ESTime);
-	ESrechits->push_back( aHit );	  
+      if ((++iESchk) == ESRecHitStorage_.end()) {  // make sure not to lose the last one
+        EcalRecHit aHit(formerID, ESum, ESTime);
+        ESrechits->push_back(aHit);
       }
     }
 
     // done merging
 
-    // put the collection of reconstructed hits in the event   
-    LogInfo("DataMixingEMWorker") << "total # EB Merged rechits: " << EBrechits->size() ;
-    LogInfo("DataMixingEMWorker") << "total # EE Merged rechits: " << EErechits->size() ;
-    LogInfo("DataMixingEMWorker") << "total # ES Merged rechits: " << ESrechits->size() ;
+    // put the collection of reconstructed hits in the event
+    LogInfo("DataMixingEMWorker") << "total # EB Merged rechits: " << EBrechits->size();
+    LogInfo("DataMixingEMWorker") << "total # EE Merged rechits: " << EErechits->size();
+    LogInfo("DataMixingEMWorker") << "total # ES Merged rechits: " << ESrechits->size();
+
+    e.put(std::move(EBrechits), EBRecHitCollectionDM_);
+    e.put(std::move(EErechits), EERecHitCollectionDM_);
+    e.put(std::move(ESrechits), ESRecHitCollectionDM_);
 
-    e.put(std::move(EBrechits), EBRecHitCollectionDM_ );
-    e.put(std::move(EErechits), EERecHitCollectionDM_ );
-    e.put(std::move(ESrechits), ESRecHitCollectionDM_ );
-    
     // clear local storage after this event
 
     EBRecHitStorage_.clear();
     EERecHitStorage_.clear();
     ESRecHitStorage_.clear();
-
   }
 
-} //edm
+}  // namespace edm
 
 //  LocalWords:  ESProducerSig
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingEMWorker.h b/SimGeneral/DataMixingModule/plugins/DataMixingEMWorker.h
index 14129f8ce121a..04fe93d12add6 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingEMWorker.h
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingEMWorker.h
@@ -3,7 +3,7 @@
 
 /** \class DataMixingEMWorker
  *
- * DataMixingModule is the EDProducer subclass 
+ * DataMixingModule is the EDProducer subclass
  * that overlays rawdata events on top of MC,
  * using real data for pileup simulation
  * This class takes care of the EM information
@@ -14,89 +14,85 @@
  *
  ************************************************************/
 
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventPrincipal.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 
-#include "DataFormats/Provenance/interface/ProductID.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/EcalRecHit/interface/EcalRecHit.h"
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
 #include "DataFormats/EcalDetId/interface/EEDetId.h"
 #include "DataFormats/EcalDetId/interface/ESDetId.h"
+#include "DataFormats/EcalRecHit/interface/EcalRecHit.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
+#include "DataFormats/Provenance/interface/ProductID.h"
 
 #include <map>
-#include <vector>
 #include <string>
+#include <vector>
 
-
-namespace edm
-{
+namespace edm {
   class ModuleCallingContext;
 
-  class DataMixingEMWorker
-    {
-    public:
-
-      DataMixingEMWorker();
-
-     /** standard constructor*/
-      explicit DataMixingEMWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC);
-
-      /**Default destructor*/
-      virtual ~DataMixingEMWorker();
-
-      void putEM(edm::Event &e) ;
-      void addEMSignals(const edm::Event &e); 
-      void addEMPileups(const int bcr, const edm::EventPrincipal*,unsigned int EventId,
-                        ModuleCallingContext const*);
-
-
-    private:
-      // data specifiers
+  class DataMixingEMWorker {
+  public:
+    DataMixingEMWorker();
 
-      edm::InputTag EBProducerSig_; // primary? name given to collection of EB calib rechits
-      edm::InputTag EEProducerSig_; // primary? name given to collection of EE calib rechits
-      edm::InputTag ESProducerSig_; // primary? name given to collection of ES calib rechits
+    /** standard constructor*/
+    explicit DataMixingEMWorker(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC);
 
-      edm::InputTag EBrechitCollectionSig_; // secondary name given to collection of EB calib rechits
-      edm::InputTag EErechitCollectionSig_; // secondary name given to collection of EE calib rechits
-      edm::InputTag ESrechitCollectionSig_; // secondary name given to collection of ES calib rechits
+    /**Default destructor*/
+    virtual ~DataMixingEMWorker();
 
-      edm::InputTag EBPileRecHitInputTag_; // full InputTag for pileup EB calib rechits
-      edm::InputTag EEPileRecHitInputTag_; // full InputTag for pileup EE calib rechits
-      edm::InputTag ESPileRecHitInputTag_; // full InputTag for pileup ES calib rechits
+    void putEM(edm::Event &e);
+    void addEMSignals(const edm::Event &e);
+    void addEMPileups(const int bcr, const edm::EventPrincipal *, unsigned int EventId, ModuleCallingContext const *);
 
-      edm::EDGetTokenT<EBRecHitCollection> EBRecHitToken_ ;  // Token to retrieve information
-      edm::EDGetTokenT<EERecHitCollection> EERecHitToken_ ;  // Token to retrieve information
-      edm::EDGetTokenT<ESRecHitCollection> ESRecHitToken_ ;  // Token to retrieve information  
+  private:
+    // data specifiers
 
-      edm::EDGetTokenT<EBRecHitCollection> EBPileRecHitToken_ ;  // Token to retrieve information
-      edm::EDGetTokenT<EERecHitCollection> EEPileRecHitToken_ ;  // Token to retrieve information
-      edm::EDGetTokenT<ESRecHitCollection> ESPileRecHitToken_ ;  // Token to retrieve information  
+    edm::InputTag EBProducerSig_;  // primary? name given to collection of EB calib rechits
+    edm::InputTag EEProducerSig_;  // primary? name given to collection of EE calib rechits
+    edm::InputTag ESProducerSig_;  // primary? name given to collection of ES calib rechits
 
+    edm::InputTag EBrechitCollectionSig_;  // secondary name given to collection of
+                                           // EB calib rechits
+    edm::InputTag EErechitCollectionSig_;  // secondary name given to collection of
+                                           // EE calib rechits
+    edm::InputTag ESrechitCollectionSig_;  // secondary name given to collection of
+                                           // ES calib rechits
 
+    edm::InputTag EBPileRecHitInputTag_;  // full InputTag for pileup EB calib rechits
+    edm::InputTag EEPileRecHitInputTag_;  // full InputTag for pileup EE calib rechits
+    edm::InputTag ESPileRecHitInputTag_;  // full InputTag for pileup ES calib rechits
 
-      std::string EBRecHitCollectionDM_; // secondary name to be given to EB collection of hits
-      std::string EERecHitCollectionDM_; // secondary name to be given to EE collection of hits
-      std::string ESRecHitCollectionDM_; // secondary name to be given to ES collection of hits
+    edm::EDGetTokenT<EBRecHitCollection> EBRecHitToken_;  // Token to retrieve information
+    edm::EDGetTokenT<EERecHitCollection> EERecHitToken_;  // Token to retrieve information
+    edm::EDGetTokenT<ESRecHitCollection> ESRecHitToken_;  // Token to retrieve information
 
-      typedef std::multimap<DetId, EcalRecHit> EBRecHitMap;
-      typedef std::multimap<DetId, EcalRecHit> EERecHitMap;
-      typedef std::multimap<DetId, EcalRecHit> ESRecHitMap;
+    edm::EDGetTokenT<EBRecHitCollection> EBPileRecHitToken_;  // Token to retrieve information
+    edm::EDGetTokenT<EERecHitCollection> EEPileRecHitToken_;  // Token to retrieve information
+    edm::EDGetTokenT<ESRecHitCollection> ESPileRecHitToken_;  // Token to retrieve information
 
-      EBRecHitMap EBRecHitStorage_;
-      EERecHitMap EERecHitStorage_;
-      ESRecHitMap ESRecHitStorage_;
+    std::string EBRecHitCollectionDM_;  // secondary name to be given to EB
+                                        // collection of hits
+    std::string EERecHitCollectionDM_;  // secondary name to be given to EE
+                                        // collection of hits
+    std::string ESRecHitCollectionDM_;  // secondary name to be given to ES
+                                        // collection of hits
 
+    typedef std::multimap<DetId, EcalRecHit> EBRecHitMap;
+    typedef std::multimap<DetId, EcalRecHit> EERecHitMap;
+    typedef std::multimap<DetId, EcalRecHit> ESRecHitMap;
 
-      //      unsigned int eventId_; //=0 for signal, from 1-n for pileup events
+    EBRecHitMap EBRecHitStorage_;
+    EERecHitMap EERecHitStorage_;
+    ESRecHitMap ESRecHitStorage_;
 
-      std::string label_;
+    //      unsigned int eventId_; //=0 for signal, from 1-n for pileup events
 
-    };
-}//edm
+    std::string label_;
+  };
+}  // namespace edm
 
-#endif // SimDataMixingEMWorker_h
+#endif  // SimDataMixingEMWorker_h
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingGeneralTrackWorker.cc b/SimGeneral/DataMixingModule/plugins/DataMixingGeneralTrackWorker.cc
index 10f74fa4221d6..dd11ed7cbdea1 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingGeneralTrackWorker.cc
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingGeneralTrackWorker.cc
@@ -4,9 +4,9 @@
 //
 //--------------------------------------------
 
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <map>
 #include <memory>
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "DataFormats/Common/interface/Handle.h"
 //
@@ -15,102 +15,87 @@
 
 using namespace std;
 
-namespace edm
-{
+namespace edm {
 
   // Virtual constructor
 
-  DataMixingGeneralTrackWorker::DataMixingGeneralTrackWorker() { }
-
-  // Constructor 
-  DataMixingGeneralTrackWorker::DataMixingGeneralTrackWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC)
-  {                                                         
+  DataMixingGeneralTrackWorker::DataMixingGeneralTrackWorker() {}
 
+  // Constructor
+  DataMixingGeneralTrackWorker::DataMixingGeneralTrackWorker(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC) {
     // get the subdetector names
-    //    this->getSubdetectorNames();  //something like this may be useful to check what we are supposed to do...
+    //    this->getSubdetectorNames();  //something like this may be useful to
+    //    check what we are supposed to do...
 
     // declare the products to produce
 
-    GeneralTrackLabelSig_  = ps.getParameter<edm::InputTag>("GeneralTrackLabelSig");
+    GeneralTrackLabelSig_ = ps.getParameter<edm::InputTag>("GeneralTrackLabelSig");
 
     GeneralTrackPileInputTag_ = ps.getParameter<edm::InputTag>("GeneralTrackPileInputTag");
 
-    GeneralTrackCollectionDM_  = ps.getParameter<std::string>("GeneralTrackDigiCollectionDM");
+    GeneralTrackCollectionDM_ = ps.getParameter<std::string>("GeneralTrackDigiCollectionDM");
 
     GTrackSigToken_ = iC.consumes<reco::TrackCollection>(GeneralTrackLabelSig_);
     GTrackPileToken_ = iC.consumes<reco::TrackCollection>(GeneralTrackPileInputTag_);
-
   }
-	       
 
   // Virtual destructor needed.
-  DataMixingGeneralTrackWorker::~DataMixingGeneralTrackWorker() { 
-  }  
+  DataMixingGeneralTrackWorker::~DataMixingGeneralTrackWorker() {}
 
-
-
-  void DataMixingGeneralTrackWorker::addGeneralTrackSignals(const edm::Event &e) { 
-
-    // Create new track list; Rely on the fact that addSignals gets called first...
+  void DataMixingGeneralTrackWorker::addGeneralTrackSignals(const edm::Event &e) {
+    // Create new track list; Rely on the fact that addSignals gets called
+    // first...
 
     NewTrackList_ = std::unique_ptr<reco::TrackCollection>(new reco::TrackCollection());
 
     // grab tracks, store copy
 
-    //edm::Handle<reco::TrackCollection> generalTrkHandle;
-    //e.getByLabel("generalTracks", generalTrkHandle);
+    // edm::Handle<reco::TrackCollection> generalTrkHandle;
+    // e.getByLabel("generalTracks", generalTrkHandle);
     edm::Handle<reco::TrackCollection> tracks;
     e.getByToken(GTrackSigToken_, tracks);
 
     if (tracks.isValid()) {
-      for (reco::TrackCollection::const_iterator track = tracks->begin();  track != tracks->end();  ++track) {
-	NewTrackList_->push_back(*track);
+      for (reco::TrackCollection::const_iterator track = tracks->begin(); track != tracks->end(); ++track) {
+        NewTrackList_->push_back(*track);
       }
-      
     }
 
-  } // end of addGeneralTrackSignals
-
+  }  // end of addGeneralTrackSignals
 
+  void DataMixingGeneralTrackWorker::addGeneralTrackPileups(const int bcr,
+                                                            const EventPrincipal *ep,
+                                                            unsigned int eventNr,
+                                                            ModuleCallingContext const *mcc) {
+    LogDebug("DataMixingGeneralTrackWorker")
+        << "\n===============> adding pileups from event  " << ep->id() << " for bunchcrossing " << bcr;
 
-  void DataMixingGeneralTrackWorker::addGeneralTrackPileups(const int bcr, const EventPrincipal *ep, unsigned int eventNr,
-                                                            ModuleCallingContext const* mcc) {
-    LogDebug("DataMixingGeneralTrackWorker") <<"\n===============> adding pileups from event  "<<ep->id()<<" for bunchcrossing "<<bcr;
+    std::shared_ptr<Wrapper<reco::TrackCollection> const> inputPTR =
+        getProductByTag<reco::TrackCollection>(*ep, GeneralTrackPileInputTag_, mcc);
 
+    if (inputPTR) {
+      const reco::TrackCollection *tracks = const_cast<reco::TrackCollection *>(inputPTR->product());
 
-    std::shared_ptr<Wrapper<reco::TrackCollection >  const> inputPTR =
-      getProductByTag<reco::TrackCollection >(*ep, GeneralTrackPileInputTag_, mcc);
+      // grab tracks, store copy
 
-    if(inputPTR ) {
-
-      const reco::TrackCollection  *tracks = const_cast< reco::TrackCollection * >(inputPTR->product());
-
-    // grab tracks, store copy
-
-
-      for (reco::TrackCollection::const_iterator track = tracks->begin();  track != tracks->end();  ++track) {
-	NewTrackList_->push_back(*track);
+      for (reco::TrackCollection::const_iterator track = tracks->begin(); track != tracks->end(); ++track) {
+        NewTrackList_->push_back(*track);
       }
-      
     }
-
   }
 
-
- 
   void DataMixingGeneralTrackWorker::putGeneralTrack(edm::Event &e) {
-
     // collection of Tracks to put in the event
 
-    // put the collection of digis in the event   
-    LogInfo("DataMixingGeneralTrackWorker") << "total # Merged Tracks: " << NewTrackList_->size() ;
+    // put the collection of digis in the event
+    LogInfo("DataMixingGeneralTrackWorker") << "total # Merged Tracks: " << NewTrackList_->size();
 
     // put collection
 
     e.put(std::move(NewTrackList_), GeneralTrackCollectionDM_);
 
     // clear local storage for this event
-    //NewTrackList_.clear();
+    // NewTrackList_.clear();
   }
 
-} //edm
+}  // namespace edm
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingGeneralTrackWorker.h b/SimGeneral/DataMixingModule/plugins/DataMixingGeneralTrackWorker.h
index 7a48a4d3524e6..5244045b15dd0 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingGeneralTrackWorker.h
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingGeneralTrackWorker.h
@@ -3,7 +3,7 @@
 
 /** \class DataMixingGeneralTrackWorker
  *
- * DataMixingModule is the EDProducer subclass 
+ * DataMixingModule is the EDProducer subclass
  * that overlays rawdata events on top of MC,
  * using real data for pileup simulation
  * This class takes care of the GeneralTrack information
@@ -14,62 +14,60 @@
  *
  ************************************************************/
 
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventPrincipal.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 
-#include "DataFormats/Provenance/interface/ProductID.h"
 #include "DataFormats/Common/interface/Handle.h"
-//Data Formats
+#include "DataFormats/Provenance/interface/ProductID.h"
+// Data Formats
 #include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/TrackReco/interface/TrackExtra.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
 
 #include <map>
-#include <vector>
 #include <string>
+#include <vector>
 
-
-
-namespace edm
-{
+namespace edm {
   class ModuleCallingContext;
 
-  class DataMixingGeneralTrackWorker
-    {
-    public:
-
-      DataMixingGeneralTrackWorker();
-
-     /** standard constructor*/
-      explicit DataMixingGeneralTrackWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC);
-
-      /**Default destructor*/
-      virtual ~DataMixingGeneralTrackWorker();
-
-      void putGeneralTrack(edm::Event &e) ;
-      void addGeneralTrackSignals(const edm::Event &e); 
-      void addGeneralTrackPileups(const int bcr, const edm::EventPrincipal*,unsigned int EventId, ModuleCallingContext const*);
+  class DataMixingGeneralTrackWorker {
+  public:
+    DataMixingGeneralTrackWorker();
 
+    /** standard constructor*/
+    explicit DataMixingGeneralTrackWorker(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC);
 
-    private:
-      // data specifiers
+    /**Default destructor*/
+    virtual ~DataMixingGeneralTrackWorker();
 
-      edm::InputTag GeneralTrackcollectionSig_ ; // primary name given to collection of GeneralTracks
-      edm::InputTag GeneralTrackLabelSig_ ;           // secondary name given to collection of GeneralTracks
-      edm::InputTag GeneralTrackPileInputTag_ ;    // InputTag for pileup tracks
-      std::string GeneralTrackCollectionDM_  ; // secondary name to be given to new GeneralTrack
+    void putGeneralTrack(edm::Event &e);
+    void addGeneralTrackSignals(const edm::Event &e);
+    void addGeneralTrackPileups(const int bcr,
+                                const edm::EventPrincipal *,
+                                unsigned int EventId,
+                                ModuleCallingContext const *);
 
-      edm::EDGetTokenT<reco::TrackCollection>GTrackSigToken_ ;  // Token to retrieve information  
-      edm::EDGetTokenT<reco::TrackCollection>GTrackPileToken_ ;  // Token to retrieve information  
+  private:
+    // data specifiers
 
-      // 
+    edm::InputTag GeneralTrackcollectionSig_;  // primary name given to collection
+                                               // of GeneralTracks
+    edm::InputTag GeneralTrackLabelSig_;       // secondary name given to collection of
+                                               // GeneralTracks
+    edm::InputTag GeneralTrackPileInputTag_;   // InputTag for pileup tracks
+    std::string GeneralTrackCollectionDM_;     // secondary name to be given to new
+                                               // GeneralTrack
 
-      std::unique_ptr<reco::TrackCollection> NewTrackList_;
+    edm::EDGetTokenT<reco::TrackCollection> GTrackSigToken_;   // Token to retrieve information
+    edm::EDGetTokenT<reco::TrackCollection> GTrackPileToken_;  // Token to retrieve information
 
+    //
 
-    };
-}//edm
+    std::unique_ptr<reco::TrackCollection> NewTrackList_;
+  };
+}  // namespace edm
 
-#endif // SimDataMixingGeneralTrackWorker_h
+#endif  // SimDataMixingGeneralTrackWorker_h
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorker.cc b/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorker.cc
index bb8837d8e1f97..749927f6768f4 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorker.cc
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorker.cc
@@ -4,17 +4,17 @@
 //
 //--------------------------------------------
 
-#include <map>
-#include <memory>
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/Common/interface/Handle.h"
-// calibration headers, for future reference 
-#include "CalibFormats/HcalObjects/interface/HcalCoderDb.h"   
-#include "CalibFormats/HcalObjects/interface/HcalCalibrations.h" 
-#include "CalibFormats/HcalObjects/interface/HcalDbService.h"  
-#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"   
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include <map>
+#include <memory>
+// calibration headers, for future reference
+#include "CalibFormats/HcalObjects/interface/HcalCalibrations.h"
+#include "CalibFormats/HcalObjects/interface/HcalCoderDb.h"
+#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
+#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
 //
 //
 #include "DataMixingHcalDigiWorker.h"
@@ -26,199 +26,230 @@ namespace {
   typedef std::multimap<DetId, CaloSamples> HcalDigiMap;
 
   template <class DIGI>
-  void convertFc2adc (const  CaloSamples& fC, const HcalDbService& conditions, DIGI& digi, int capIdOffset = 0) {
+  void convertFc2adc(const CaloSamples &fC, const HcalDbService &conditions, DIGI &digi, int capIdOffset = 0) {
     HcalDetId id = fC.id();
-    const HcalQIECoder* channelCoder = conditions.getHcalCoder (id);
-    const HcalQIEShape* shape = conditions.getHcalShape (channelCoder);
-    HcalCoderDb coder (*channelCoder, *shape);
+    const HcalQIECoder *channelCoder = conditions.getHcalCoder(id);
+    const HcalQIEShape *shape = conditions.getHcalShape(channelCoder);
+    HcalCoderDb coder(*channelCoder, *shape);
     coder.fC2adc(fC, digi, capIdOffset);
   }
 
   template <class DIGI>
-  void convertAdc2fChelper (const DIGI& digi, const HcalDbService& conditions, CaloSamples& fC, const HcalDetId& id) {
-    const HcalCalibrations& calib = conditions.getHcalCalibrations(id);
+  void convertAdc2fChelper(const DIGI &digi, const HcalDbService &conditions, CaloSamples &fC, const HcalDetId &id) {
+    const HcalCalibrations &calib = conditions.getHcalCalibrations(id);
     for (int i = 0; i < digi.size(); ++i) {
-      int capId (digi.sample(i).capid());
-      fC[i] -= calib.pedestal (capId);
+      int capId(digi.sample(i).capid());
+      fC[i] -= calib.pedestal(capId);
     }
   }
-  
+
   template <>
-  void convertAdc2fChelper<QIE10DataFrame> (const QIE10DataFrame& digi, const HcalDbService& conditions, CaloSamples& fC, const HcalDetId& id) {
-    const HcalCalibrations& calib = conditions.getHcalCalibrations(id);
+  void convertAdc2fChelper<QIE10DataFrame>(const QIE10DataFrame &digi,
+                                           const HcalDbService &conditions,
+                                           CaloSamples &fC,
+                                           const HcalDetId &id) {
+    const HcalCalibrations &calib = conditions.getHcalCalibrations(id);
     for (int i = 0; i < digi.samples(); ++i) {
-      int capId (digi[i].capid());
-      fC[i] -= calib.pedestal (capId);
+      int capId(digi[i].capid());
+      fC[i] -= calib.pedestal(capId);
     }
   }
-  
+
   template <>
-  void convertAdc2fChelper<QIE11DataFrame> (const QIE11DataFrame& digi, const HcalDbService& conditions, CaloSamples& fC, const HcalDetId& id) {
-    const HcalCalibrations& calib = conditions.getHcalCalibrations(id);
+  void convertAdc2fChelper<QIE11DataFrame>(const QIE11DataFrame &digi,
+                                           const HcalDbService &conditions,
+                                           CaloSamples &fC,
+                                           const HcalDetId &id) {
+    const HcalCalibrations &calib = conditions.getHcalCalibrations(id);
     for (int i = 0; i < digi.samples(); ++i) {
-      int capId (digi[i].capid());
-      fC[i] -= calib.pedestal (capId);
+      int capId(digi[i].capid());
+      fC[i] -= calib.pedestal(capId);
     }
   }
-  
+
   template <class DIGI>
-  void convertAdc2fC (const DIGI& digi, const HcalDbService& conditions, bool keepPedestals, CaloSamples& fC) {
-    HcalDetId id (digi.id());
-    const HcalQIECoder* channelCoder = conditions.getHcalCoder (id);
-    const HcalQIEShape* shape = conditions.getHcalShape (channelCoder);
-    HcalCoderDb coder (*channelCoder, *shape);
+  void convertAdc2fC(const DIGI &digi, const HcalDbService &conditions, bool keepPedestals, CaloSamples &fC) {
+    HcalDetId id(digi.id());
+    const HcalQIECoder *channelCoder = conditions.getHcalCoder(id);
+    const HcalQIEShape *shape = conditions.getHcalShape(channelCoder);
+    HcalCoderDb coder(*channelCoder, *shape);
     coder.adc2fC(digi, fC);
-    if (!keepPedestals) { // subtract pedestals
-      convertAdc2fChelper(digi,conditions,fC,id);
+    if (!keepPedestals) {  // subtract pedestals
+      convertAdc2fChelper(digi, conditions, fC, id);
     }
   }
 
   template <class DIGIS>
-   void convertHcalDigis (const DIGIS& digis, const HcalDbService& conditions, bool keepPedestals, HcalDigiMap& map) {
+  void convertHcalDigis(const DIGIS &digis, const HcalDbService &conditions, bool keepPedestals, HcalDigiMap &map) {
     for (auto digi = digis.begin(); digi != digis.end(); ++digi) {
       CaloSamples fC;
-      convertAdc2fC (*digi, conditions, keepPedestals, fC);
+      convertAdc2fC(*digi, conditions, keepPedestals, fC);
       if (!keepPedestals && map.find(digi->id()) == map.end()) {
-        edm::LogWarning("DataMixingHcalDigiWorker")<<"No signal hits found for HCAL cell "<<digi->id()<<" Pedestals may be lost for mixed hit";
+        edm::LogWarning("DataMixingHcalDigiWorker")
+            << "No signal hits found for HCAL cell " << digi->id() << " Pedestals may be lost for mixed hit";
       }
-      map.insert(HcalDigiMap::value_type (digi->id(), fC));
+      map.insert(HcalDigiMap::value_type(digi->id(), fC));
     }
   }
 
   template <>
-   void convertHcalDigis<QIE10DigiCollection> (const QIE10DigiCollection& digis, const HcalDbService& conditions, bool keepPedestals, HcalDigiMap& map) {
+  void convertHcalDigis<QIE10DigiCollection>(const QIE10DigiCollection &digis,
+                                             const HcalDbService &conditions,
+                                             bool keepPedestals,
+                                             HcalDigiMap &map) {
     for (auto digiItr = digis.begin(); digiItr != digis.end(); ++digiItr) {
       QIE10DataFrame digi(*digiItr);
-	  CaloSamples fC;
-      convertAdc2fC (digi, conditions, keepPedestals, fC);
+      CaloSamples fC;
+      convertAdc2fC(digi, conditions, keepPedestals, fC);
       if (!keepPedestals && map.find(digi.id()) == map.end()) {
-        edm::LogWarning("DataMixingHcalDigiWorker")<<"No signal hits found for HCAL cell "<<digi.id()<<" Pedestals may be lost for mixed hit";
+        edm::LogWarning("DataMixingHcalDigiWorker")
+            << "No signal hits found for HCAL cell " << digi.id() << " Pedestals may be lost for mixed hit";
       }
-      map.insert(HcalDigiMap::value_type (digi.id(), fC));
+      map.insert(HcalDigiMap::value_type(digi.id(), fC));
     }
   }
-  
+
   template <>
-   void convertHcalDigis<QIE11DigiCollection> (const QIE11DigiCollection& digis, const HcalDbService& conditions, bool keepPedestals, HcalDigiMap& map) {
+  void convertHcalDigis<QIE11DigiCollection>(const QIE11DigiCollection &digis,
+                                             const HcalDbService &conditions,
+                                             bool keepPedestals,
+                                             HcalDigiMap &map) {
     for (auto digiItr = digis.begin(); digiItr != digis.end(); ++digiItr) {
       QIE11DataFrame digi(*digiItr);
-	  CaloSamples fC;
-      convertAdc2fC (digi, conditions, keepPedestals, fC);
+      CaloSamples fC;
+      convertAdc2fC(digi, conditions, keepPedestals, fC);
       if (!keepPedestals && map.find(digi.id()) == map.end()) {
-        edm::LogWarning("DataMixingHcalDigiWorker")<<"No signal hits found for HCAL cell "<<digi.id()<<" Pedestals may be lost for mixed hit";
+        edm::LogWarning("DataMixingHcalDigiWorker")
+            << "No signal hits found for HCAL cell " << digi.id() << " Pedestals may be lost for mixed hit";
       }
-      map.insert(HcalDigiMap::value_type (digi.id(), fC));
+      map.insert(HcalDigiMap::value_type(digi.id(), fC));
     }
   }
-  
+
   template <class DIGIS>
-  bool convertSignalHcalDigis (const edm::Event &e, const edm::EDGetTokenT<DIGIS>& token,
-                               const HcalDbService& conditions, HcalDigiMap& map) {
+  bool convertSignalHcalDigis(const edm::Event &e,
+                              const edm::EDGetTokenT<DIGIS> &token,
+                              const HcalDbService &conditions,
+                              HcalDigiMap &map) {
     edm::Handle<DIGIS> digis;
-    if (!e.getByToken (token, digis)) return false;
-    convertHcalDigis (*digis, conditions, true, map); // keep pedestals
+    if (!e.getByToken(token, digis))
+      return false;
+    convertHcalDigis(*digis, conditions, true, map);  // keep pedestals
     return true;
   }
 
   template <class DIGIS>
-  bool convertPileupHcalDigis (const edm::EventPrincipal& ep, 
-                               const edm::InputTag& tag, const edm::ModuleCallingContext* mcc,
-                               const HcalDbService& conditions, HcalDigiMap& map) {
+  bool convertPileupHcalDigis(const edm::EventPrincipal &ep,
+                              const edm::InputTag &tag,
+                              const edm::ModuleCallingContext *mcc,
+                              const HcalDbService &conditions,
+                              HcalDigiMap &map) {
     auto digis = edm::getProductByTag<DIGIS>(ep, tag, mcc);
-    if (!digis) return false;
-    convertHcalDigis (*(digis->product()), conditions, false, map); // subtract pedestals
+    if (!digis)
+      return false;
+    convertHcalDigis(*(digis->product()), conditions, false,
+                     map);  // subtract pedestals
     return true;
   }
 
   template <class DIGIS>
-  void buildHcalDigisHelper (DIGIS& digis, const DetId& formerID, CaloSamples& resultSample, const HcalDbService& conditions){
+  void buildHcalDigisHelper(DIGIS &digis,
+                            const DetId &formerID,
+                            CaloSamples &resultSample,
+                            const HcalDbService &conditions) {
     // make new digi
     digis.push_back(typename DIGIS::value_type(formerID));
-    convertFc2adc (resultSample, conditions, digis.back(), 0); // FR guess: simulation starts with 0
+    convertFc2adc(resultSample, conditions, digis.back(),
+                  0);  // FR guess: simulation starts with 0
   }
-  
+
   template <>
-  void buildHcalDigisHelper<QIE10DigiCollection> (QIE10DigiCollection& digis, const DetId& formerID, CaloSamples& resultSample, const HcalDbService& conditions){
+  void buildHcalDigisHelper<QIE10DigiCollection>(QIE10DigiCollection &digis,
+                                                 const DetId &formerID,
+                                                 CaloSamples &resultSample,
+                                                 const HcalDbService &conditions) {
     // make new digi
     digis.push_back(formerID.rawId());
-	QIE10DataFrame digi( digis.back() );
-    convertFc2adc (resultSample, conditions, digi, 0); // FR guess: simulation starts with 0
+    QIE10DataFrame digi(digis.back());
+    convertFc2adc(resultSample, conditions, digi,
+                  0);  // FR guess: simulation starts with 0
   }
-  
+
   template <>
-  void buildHcalDigisHelper<QIE11DigiCollection> (QIE11DigiCollection& digis, const DetId& formerID, CaloSamples& resultSample, const HcalDbService& conditions){
+  void buildHcalDigisHelper<QIE11DigiCollection>(QIE11DigiCollection &digis,
+                                                 const DetId &formerID,
+                                                 CaloSamples &resultSample,
+                                                 const HcalDbService &conditions) {
     // make new digi
     digis.push_back(formerID.rawId());
-	QIE11DataFrame digi( digis.back() );
-    convertFc2adc (resultSample, conditions, digi, 0); // FR guess: simulation starts with 0
+    QIE11DataFrame digi(digis.back());
+    convertFc2adc(resultSample, conditions, digi,
+                  0);  // FR guess: simulation starts with 0
   }
-  
+
   template <class DIGIS>
-  std::unique_ptr<DIGIS> buildHcalDigis (const HcalDigiMap& map, const HcalDbService& conditions) {
-    std::unique_ptr<DIGIS> digis( new DIGIS );
-    // loop over the maps we have, re-making individual hits or digis if necessary.
+  std::unique_ptr<DIGIS> buildHcalDigis(const HcalDigiMap &map, const HcalDbService &conditions) {
+    std::unique_ptr<DIGIS> digis(new DIGIS);
+    // loop over the maps we have, re-making individual hits or digis if
+    // necessary.
     DetId formerID = 0;
     CaloSamples resultSample;
 
-    for(auto hit = map.begin(); hit != map.end(); ++hit) {
-      DetId currentID = hit->first; 
-      const CaloSamples& hitSample = hit->second;
+    for (auto hit = map.begin(); hit != map.end(); ++hit) {
+      DetId currentID = hit->first;
+      const CaloSamples &hitSample = hit->second;
 
-      if (currentID == formerID) { // accumulating hits
-        //loop over digi samples in each CaloSample                                                  
+      if (currentID == formerID) {  // accumulating hits
+        // loop over digi samples in each CaloSample
         unsigned int sizenew = (hitSample).size();
         unsigned int sizeold = resultSample.size();
-        if (sizenew > sizeold) { // extend sample
-          resultSample.setSize (sizenew);
+        if (sizenew > sizeold) {  // extend sample
+          resultSample.setSize(sizenew);
         }
-        for(unsigned int isamp = 0; isamp<sizenew; isamp++) { // add new values
-          resultSample[isamp] += hitSample[isamp]; // for debugging below
+        for (unsigned int isamp = 0; isamp < sizenew; isamp++) {  // add new values
+          resultSample[isamp] += hitSample[isamp];                // for debugging below
         }
       }
       auto hit1 = hit;
-      bool lastEntry = (++hit1 ==  map.end());
-      if (currentID != formerID || lastEntry) { // store current digi
-        if (formerID>0 || lastEntry) {
+      bool lastEntry = (++hit1 == map.end());
+      if (currentID != formerID || lastEntry) {  // store current digi
+        if (formerID > 0 || lastEntry) {
           // make new digi
-          buildHcalDigisHelper(*digis,formerID,resultSample,conditions);
+          buildHcalDigisHelper(*digis, formerID, resultSample, conditions);
         }
-        //reset pointers for next iteration                                                                 
+        // reset pointers for next iteration
         formerID = currentID;
         resultSample = hitSample;
       }
     }
     return digis;
   }
-  
-  
 
-} // namespace {}
+}  // namespace
 
-namespace edm
-{
+namespace edm {
 
   // Virtual constructor
 
-  DataMixingHcalDigiWorker::DataMixingHcalDigiWorker() { }
-
-  // Constructor 
-  DataMixingHcalDigiWorker::DataMixingHcalDigiWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC) : 
-                                                            label_(ps.getParameter<std::string>("Label"))
-  {                                                         
+  DataMixingHcalDigiWorker::DataMixingHcalDigiWorker() {}
 
+  // Constructor
+  DataMixingHcalDigiWorker::DataMixingHcalDigiWorker(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC)
+      : label_(ps.getParameter<std::string>("Label")) {
     // get the subdetector names
-    //    this->getSubdetectorNames();  //something like this may be useful to check what we are supposed to do...
+    //    this->getSubdetectorNames();  //something like this may be useful to
+    //    check what we are supposed to do...
 
     // declare the products to produce
 
-    // Hcal 
+    // Hcal
 
-    HBHEdigiCollectionSig_  = ps.getParameter<edm::InputTag>("HBHEdigiCollectionSig");
-    HOdigiCollectionSig_    = ps.getParameter<edm::InputTag>("HOdigiCollectionSig");
-    HFdigiCollectionSig_    = ps.getParameter<edm::InputTag>("HFdigiCollectionSig");
-    ZDCdigiCollectionSig_   = ps.getParameter<edm::InputTag>("ZDCdigiCollectionSig");
-    QIE10digiCollectionSig_   = ps.getParameter<edm::InputTag>("QIE10digiCollectionSig");
-    QIE11digiCollectionSig_   = ps.getParameter<edm::InputTag>("QIE11digiCollectionSig");
+    HBHEdigiCollectionSig_ = ps.getParameter<edm::InputTag>("HBHEdigiCollectionSig");
+    HOdigiCollectionSig_ = ps.getParameter<edm::InputTag>("HOdigiCollectionSig");
+    HFdigiCollectionSig_ = ps.getParameter<edm::InputTag>("HFdigiCollectionSig");
+    ZDCdigiCollectionSig_ = ps.getParameter<edm::InputTag>("ZDCdigiCollectionSig");
+    QIE10digiCollectionSig_ = ps.getParameter<edm::InputTag>("QIE10digiCollectionSig");
+    QIE11digiCollectionSig_ = ps.getParameter<edm::InputTag>("QIE11digiCollectionSig");
 
     HBHEPileInputTag_ = ps.getParameter<edm::InputTag>("HBHEPileInputTag");
     HOPileInputTag_ = ps.getParameter<edm::InputTag>("HOPileInputTag");
@@ -240,161 +271,157 @@ namespace edm
     QIE11DigiPToken_ = iC.consumes<QIE11DigiCollection>(QIE11PileInputTag_);
 
     DoZDC_ = false;
-    if(!ZDCPileInputTag_.label().empty()) DoZDC_ = true;
+    if (!ZDCPileInputTag_.label().empty())
+      DoZDC_ = true;
 
-    if(DoZDC_) { 
+    if (DoZDC_) {
       ZDCDigiToken_ = iC.consumes<ZDCDigiCollection>(ZDCdigiCollectionSig_);
       ZDCDigiPToken_ = iC.consumes<ZDCDigiCollection>(ZDCPileInputTag_);
     }
 
-
     HBHEDigiCollectionDM_ = ps.getParameter<std::string>("HBHEDigiCollectionDM");
-    HODigiCollectionDM_   = ps.getParameter<std::string>("HODigiCollectionDM");
-    HFDigiCollectionDM_   = ps.getParameter<std::string>("HFDigiCollectionDM");
-    ZDCDigiCollectionDM_  = ps.getParameter<std::string>("ZDCDigiCollectionDM");
-    QIE10DigiCollectionDM_  = ps.getParameter<std::string>("QIE10DigiCollectionDM");
-    QIE11DigiCollectionDM_  = ps.getParameter<std::string>("QIE11DigiCollectionDM");
-
-
+    HODigiCollectionDM_ = ps.getParameter<std::string>("HODigiCollectionDM");
+    HFDigiCollectionDM_ = ps.getParameter<std::string>("HFDigiCollectionDM");
+    ZDCDigiCollectionDM_ = ps.getParameter<std::string>("ZDCDigiCollectionDM");
+    QIE10DigiCollectionDM_ = ps.getParameter<std::string>("QIE10DigiCollectionDM");
+    QIE11DigiCollectionDM_ = ps.getParameter<std::string>("QIE11DigiCollectionDM");
   }
 
   // Virtual destructor needed.
-  DataMixingHcalDigiWorker::~DataMixingHcalDigiWorker() { 
-  }  
-
-  void DataMixingHcalDigiWorker::addHcalSignals(const edm::Event &e,const edm::EventSetup& ES) { 
-    // Calibration stuff will look like this:                                                 
-    // get conditions                                                                         
-    edm::ESHandle<HcalDbService> conditions;                                                
-    ES.get<HcalDbRecord>().get(conditions);                                         
+  DataMixingHcalDigiWorker::~DataMixingHcalDigiWorker() {}
 
+  void DataMixingHcalDigiWorker::addHcalSignals(const edm::Event &e, const edm::EventSetup &ES) {
+    // Calibration stuff will look like this:
+    // get conditions
+    edm::ESHandle<HcalDbService> conditions;
+    ES.get<HcalDbRecord>().get(conditions);
 
     // fill in maps of hits
 
-    LogInfo("DataMixingHcalDigiWorker")<<"===============> adding MC signals for "<<e.id();
-    convertSignalHcalDigis<HBHEDigiCollection> (e, HBHEDigiToken_, *conditions, HBHEDigiStorage_);
-    convertSignalHcalDigis<HODigiCollection> (e, HODigiToken_, *conditions, HODigiStorage_);
-    convertSignalHcalDigis<HFDigiCollection> (e, HFDigiToken_, *conditions, HFDigiStorage_);
-    convertSignalHcalDigis<QIE10DigiCollection> (e, QIE10DigiToken_, *conditions, QIE10DigiStorage_);
-    convertSignalHcalDigis<QIE11DigiCollection> (e, QIE11DigiToken_, *conditions, QIE11DigiStorage_);
+    LogInfo("DataMixingHcalDigiWorker") << "===============> adding MC signals for " << e.id();
+    convertSignalHcalDigis<HBHEDigiCollection>(e, HBHEDigiToken_, *conditions, HBHEDigiStorage_);
+    convertSignalHcalDigis<HODigiCollection>(e, HODigiToken_, *conditions, HODigiStorage_);
+    convertSignalHcalDigis<HFDigiCollection>(e, HFDigiToken_, *conditions, HFDigiStorage_);
+    convertSignalHcalDigis<QIE10DigiCollection>(e, QIE10DigiToken_, *conditions, QIE10DigiStorage_);
+    convertSignalHcalDigis<QIE11DigiCollection>(e, QIE11DigiToken_, *conditions, QIE11DigiStorage_);
 
+    // ZDC next
 
+    if (DoZDC_) {
+      Handle<ZDCDigiCollection> pZDCDigis;
 
-   // ZDC next
+      const ZDCDigiCollection *ZDCDigis = nullptr;
 
-   if(DoZDC_){
+      if (e.getByToken(ZDCDigiToken_, pZDCDigis)) {
+        ZDCDigis = pZDCDigis.product();  // get a ptr to the product
+#ifdef DEBUG
+        LogDebug("DataMixingHcalDigiWorker") << "total # ZDC digis: " << ZDCDigis->size();
+#endif
+      }
 
-     Handle< ZDCDigiCollection > pZDCDigis;
+      if (ZDCDigis) {
+        // loop over digis, storing them in a map so we can add pileup later
+        for (ZDCDigiCollection::const_iterator it = ZDCDigis->begin(); it != ZDCDigis->end(); ++it) {
+          // calibration, for future reference:  (same block for all Hcal types)
+          // ZDC is different
+          HcalZDCDetId cell = it->id();
+          //         const HcalCalibrations&
+          //         calibrations=conditions->getHcalCalibrations(cell);
+          const HcalQIECoder *channelCoder = conditions->getHcalCoder(cell);
+          const HcalQIEShape *shape = conditions->getHcalShape(channelCoder);  // this one is generic
+          HcalCoderDb coder(*channelCoder, *shape);
 
-     const ZDCDigiCollection*  ZDCDigis = nullptr;
+          CaloSamples tool;
+          coder.adc2fC((*it), tool);
 
-     if( e.getByToken( ZDCDigiToken_, pZDCDigis) ) {
-       ZDCDigis = pZDCDigis.product(); // get a ptr to the product
-#ifdef DEBUG
-       LogDebug("DataMixingHcalDigiWorker") << "total # ZDC digis: " << ZDCDigis->size();
-#endif
-     } 
-   
- 
-     if (ZDCDigis)
-       {
-         // loop over digis, storing them in a map so we can add pileup later
-         for(ZDCDigiCollection::const_iterator it  = ZDCDigis->begin(); it != ZDCDigis->end(); ++it) {
-
-           // calibration, for future reference:  (same block for all Hcal types) ZDC is different                               
-           HcalZDCDetId cell = it->id();
-           //         const HcalCalibrations& calibrations=conditions->getHcalCalibrations(cell);                
-           const HcalQIECoder* channelCoder = conditions->getHcalCoder (cell);
-           const HcalQIEShape* shape = conditions->getHcalShape (channelCoder); // this one is generic         
-           HcalCoderDb coder (*channelCoder, *shape);
-
-           CaloSamples tool;
-           coder.adc2fC((*it),tool);
-
-           ZDCDigiStorage_.insert(ZDCDigiMap::value_type( ( it->id() ), tool ));
+          ZDCDigiStorage_.insert(ZDCDigiMap::value_type((it->id()), tool));
 
 #ifdef DEBUG
-           // Commented out because this does not compile anymore	 
-           // LogDebug("DataMixingHcalDigiWorker") << "processed ZDCDigi with rawId: "
-           //                                      << it->id() << "\n"
-           //                                      << " digi energy: " << it->energy();
+          // Commented out because this does not compile anymore
+          // LogDebug("DataMixingHcalDigiWorker") << "processed ZDCDigi with
+          // rawId: "
+          //                                      << it->id() << "\n"
+          //                                      << " digi energy: " <<
+          //                                      it->energy();
 #endif
+        }
+      }
+    }
 
-         }
-       }
-   }
-    
-  } // end of addHCalSignals
+  }  // end of addHCalSignals
 
-  void DataMixingHcalDigiWorker::addHcalPileups(const int bcr, const EventPrincipal *ep, unsigned int eventNr,const edm::EventSetup& ES,
-                                                ModuleCallingContext const* mcc) {
-  
-    LogDebug("DataMixingHcalDigiWorker") <<"\n===============> adding pileups from event  "<<ep->id()<<" for bunchcrossing "<<bcr;
+  void DataMixingHcalDigiWorker::addHcalPileups(const int bcr,
+                                                const EventPrincipal *ep,
+                                                unsigned int eventNr,
+                                                const edm::EventSetup &ES,
+                                                ModuleCallingContext const *mcc) {
+    LogDebug("DataMixingHcalDigiWorker") << "\n===============> adding pileups from event  " << ep->id()
+                                         << " for bunchcrossing " << bcr;
 
-    // get conditions                                                                                                             
+    // get conditions
     edm::ESHandle<HcalDbService> conditions;
     ES.get<HcalDbRecord>().get(conditions);
 
-    convertPileupHcalDigis<HBHEDigiCollection> (*ep, HBHEPileInputTag_, mcc, *conditions, HBHEDigiStorage_);
-    convertPileupHcalDigis<HODigiCollection> (*ep, HOPileInputTag_, mcc, *conditions, HODigiStorage_);
-    convertPileupHcalDigis<HFDigiCollection> (*ep, HFPileInputTag_, mcc, *conditions, HFDigiStorage_);
-    convertPileupHcalDigis<QIE10DigiCollection> (*ep, QIE10PileInputTag_, mcc, *conditions, QIE10DigiStorage_);
-    convertPileupHcalDigis<QIE11DigiCollection> (*ep, QIE11PileInputTag_, mcc, *conditions, QIE11DigiStorage_);
-
+    convertPileupHcalDigis<HBHEDigiCollection>(*ep, HBHEPileInputTag_, mcc, *conditions, HBHEDigiStorage_);
+    convertPileupHcalDigis<HODigiCollection>(*ep, HOPileInputTag_, mcc, *conditions, HODigiStorage_);
+    convertPileupHcalDigis<HFDigiCollection>(*ep, HFPileInputTag_, mcc, *conditions, HFDigiStorage_);
+    convertPileupHcalDigis<QIE10DigiCollection>(*ep, QIE10PileInputTag_, mcc, *conditions, QIE10DigiStorage_);
+    convertPileupHcalDigis<QIE11DigiCollection>(*ep, QIE11PileInputTag_, mcc, *conditions, QIE11DigiStorage_);
 
     // ZDC Next
 
-    if(DoZDC_) {
-
+    if (DoZDC_) {
+      std::shared_ptr<Wrapper<ZDCDigiCollection> const> ZDCDigisPTR =
+          getProductByTag<ZDCDigiCollection>(*ep, ZDCPileInputTag_, mcc);
 
-      std::shared_ptr<Wrapper<ZDCDigiCollection>  const> ZDCDigisPTR = getProductByTag<ZDCDigiCollection>(*ep, ZDCPileInputTag_, mcc);
- 
-      if(ZDCDigisPTR ) {
-
-        const ZDCDigiCollection*  ZDCDigis = const_cast< ZDCDigiCollection * >(ZDCDigisPTR->product());
+      if (ZDCDigisPTR) {
+        const ZDCDigiCollection *ZDCDigis = const_cast<ZDCDigiCollection *>(ZDCDigisPTR->product());
 
         LogDebug("DataMixingHcalDigiWorker") << "total # ZDC digis: " << ZDCDigis->size();
 
         // loop over digis, adding these to the existing maps
-        for(ZDCDigiCollection::const_iterator it  = ZDCDigis->begin(); it != ZDCDigis->end(); ++it) {
-
-          // calibration, for future reference:  (same block for all Hcal types) ZDC is different
+        for (ZDCDigiCollection::const_iterator it = ZDCDigis->begin(); it != ZDCDigis->end(); ++it) {
+          // calibration, for future reference:  (same block for all Hcal types)
+          // ZDC is different
           HcalZDCDetId cell = it->id();
-          const HcalQIECoder* channelCoder = conditions->getHcalCoder (cell);
-          const HcalQIEShape* shape = conditions->getHcalShape (channelCoder); // this one is generic
-          HcalCoderDb coder (*channelCoder, *shape);
+          const HcalQIECoder *channelCoder = conditions->getHcalCoder(cell);
+          const HcalQIEShape *shape = conditions->getHcalShape(channelCoder);  // this one is generic
+          HcalCoderDb coder(*channelCoder, *shape);
 
           CaloSamples tool;
-          coder.adc2fC((*it),tool);
+          coder.adc2fC((*it), tool);
 
-          ZDCDigiStorage_.insert(ZDCDigiMap::value_type( (it->id()), tool ));
+          ZDCDigiStorage_.insert(ZDCDigiMap::value_type((it->id()), tool));
 
 #ifdef DEBUG
           // Commented out because this does not compile anymore
-          // LogDebug("DataMixingHcalDigiWorker") << "processed ZDCDigi with rawId: "
+          // LogDebug("DataMixingHcalDigiWorker") << "processed ZDCDigi with
+          // rawId: "
           //                                      << it->id() << "\n"
-          //                                      << " digi energy: " << it->energy();
+          //                                      << " digi energy: " <<
+          //                                      it->energy();
 #endif
         }
       }
     }
-
-
   }
- 
-  void DataMixingHcalDigiWorker::putHcal(edm::Event &e,const edm::EventSetup& ES) {
+
+  void DataMixingHcalDigiWorker::putHcal(edm::Event &e, const edm::EventSetup &ES) {
     edm::ESHandle<HcalDbService> conditions;
     ES.get<HcalDbRecord>().get(conditions);
 
     // collection of digis to put in the event
-    std::unique_ptr< HBHEDigiCollection > HBHEdigis = buildHcalDigis<HBHEDigiCollection> (HBHEDigiStorage_, *conditions);
-    std::unique_ptr< HODigiCollection > HOdigis = buildHcalDigis<HODigiCollection> (HODigiStorage_, *conditions);
-    std::unique_ptr< HFDigiCollection > HFdigis = buildHcalDigis<HFDigiCollection> (HFDigiStorage_, *conditions);
-    std::unique_ptr< QIE10DigiCollection > QIE10digis = buildHcalDigis<QIE10DigiCollection> (QIE10DigiStorage_, *conditions);
-    std::unique_ptr< QIE11DigiCollection > QIE11digis = buildHcalDigis<QIE11DigiCollection> (QIE11DigiStorage_, *conditions);
-    std::unique_ptr< ZDCDigiCollection > ZDCdigis( new ZDCDigiCollection );
-
-    // loop over the maps we have, re-making individual hits or digis if necessary.
+    std::unique_ptr<HBHEDigiCollection> HBHEdigis = buildHcalDigis<HBHEDigiCollection>(HBHEDigiStorage_, *conditions);
+    std::unique_ptr<HODigiCollection> HOdigis = buildHcalDigis<HODigiCollection>(HODigiStorage_, *conditions);
+    std::unique_ptr<HFDigiCollection> HFdigis = buildHcalDigis<HFDigiCollection>(HFDigiStorage_, *conditions);
+    std::unique_ptr<QIE10DigiCollection> QIE10digis =
+        buildHcalDigis<QIE10DigiCollection>(QIE10DigiStorage_, *conditions);
+    std::unique_ptr<QIE11DigiCollection> QIE11digis =
+        buildHcalDigis<QIE11DigiCollection>(QIE11DigiStorage_, *conditions);
+    std::unique_ptr<ZDCDigiCollection> ZDCdigis(new ZDCDigiCollection);
+
+    // loop over the maps we have, re-making individual hits or digis if
+    // necessary.
     DetId formerID = 0;
     DetId currentID;
 
@@ -402,110 +429,113 @@ namespace edm
     double fC_old;
     double fC_sum;
 
-
     // ZDC next...
 
-    // loop over the maps we have, re-making individual hits or digis if necessary.
+    // loop over the maps we have, re-making individual hits or digis if
+    // necessary.
     formerID = 0;
     CaloSamples ZDC_old;
 
     ZDCDigiMap::const_iterator iZDCchk;
 
-    for(ZDCDigiMap::const_iterator iZDC  = ZDCDigiStorage_.begin(); iZDC != ZDCDigiStorage_.end(); ++iZDC) {
-
-      currentID = iZDC->first; 
+    for (ZDCDigiMap::const_iterator iZDC = ZDCDigiStorage_.begin(); iZDC != ZDCDigiStorage_.end(); ++iZDC) {
+      currentID = iZDC->first;
 
-      if (currentID == formerID) { // we have to add these digis together
+      if (currentID == formerID) {  // we have to add these digis together
 
-        //loop over digi samples in each CaloSample                                                           
+        // loop over digi samples in each CaloSample
         unsigned int sizenew = (iZDC->second).size();
         unsigned int sizeold = ZDC_old.size();
 
         unsigned int max_samp = std::max(sizenew, sizeold);
 
-        CaloSamples ZDC_bigger(currentID,max_samp);
+        CaloSamples ZDC_bigger(currentID, max_samp);
 
         bool usenew = false;
 
-        if(sizenew > sizeold) usenew = true;
+        if (sizenew > sizeold)
+          usenew = true;
 
-        // samples from different events can be of different lengths - sum all                               
-        // that overlap.                                                                                     
+        // samples from different events can be of different lengths - sum all
+        // that overlap.
 
-        for(unsigned int isamp = 0; isamp<max_samp; isamp++) {
-          if(isamp < sizenew) {
+        for (unsigned int isamp = 0; isamp < max_samp; isamp++) {
+          if (isamp < sizenew) {
             fC_new = (iZDC->second)[isamp];
+          } else {
+            fC_new = 0;
           }
-          else { fC_new = 0;}
 
-          if(isamp < sizeold) {
+          if (isamp < sizeold) {
             fC_old = ZDC_old[isamp];
+          } else {
+            fC_old = 0;
           }
-          else { fC_old = 0;}
 
-          // add values                                                                                      
+          // add values
           fC_sum = fC_new + fC_old;
 
-          if(usenew) {ZDC_bigger[isamp] = fC_sum; }
-          else { ZDC_old[isamp] = fC_sum; }  // overwrite old sample, adding new info     
-
+          if (usenew) {
+            ZDC_bigger[isamp] = fC_sum;
+          } else {
+            ZDC_old[isamp] = fC_sum;
+          }  // overwrite old sample, adding new info
         }
-        if(usenew) ZDC_old = ZDC_bigger; // save new, larger sized sample in "old" slot
-      
-      }
-      else {
-        if(formerID>0) {
+        if (usenew)
+          ZDC_old = ZDC_bigger;  // save new, larger sized sample in "old" slot
+
+      } else {
+        if (formerID > 0) {
           // make new digi
-          ZDCdigis->push_back(ZDCDataFrame(formerID));	  
+          ZDCdigis->push_back(ZDCDataFrame(formerID));
 
           // set up information to convert back
 
           HcalZDCDetId cell = ZDC_old.id();
-          const HcalQIECoder* channelCoder = conditions->getHcalCoder (cell);
-          const HcalQIEShape* shape = conditions->getHcalShape (channelCoder); // this one is generic         
-          HcalCoderDb coder (*channelCoder, *shape);
+          const HcalQIECoder *channelCoder = conditions->getHcalCoder(cell);
+          const HcalQIEShape *shape = conditions->getHcalShape(channelCoder);  // this one is generic
+          HcalCoderDb coder(*channelCoder, *shape);
 
           unsigned int sizeold = ZDC_old.size();
-          for(unsigned int isamp = 0; isamp<sizeold; isamp++) {
-            coder.fC2adc(ZDC_old,(ZDCdigis->back()), 1 );   // as per simulation, capid=1
+          for (unsigned int isamp = 0; isamp < sizeold; isamp++) {
+            coder.fC2adc(ZDC_old, (ZDCdigis->back()),
+                         1);  // as per simulation, capid=1
           }
         }
-        //save pointers for next iteration                                                                 
+        // save pointers for next iteration
         formerID = currentID;
         ZDC_old = iZDC->second;
       }
 
       iZDCchk = iZDC;
-      if((++iZDCchk) == ZDCDigiStorage_.end()) {  //make sure not to lose the last one                         
-          // make new digi
-          ZDCdigis->push_back(ZDCDataFrame(currentID));	  
+      if ((++iZDCchk) == ZDCDigiStorage_.end()) {  // make sure not to lose the last one
+        // make new digi
+        ZDCdigis->push_back(ZDCDataFrame(currentID));
 
-          // set up information to convert back
+        // set up information to convert back
 
-          HcalZDCDetId cell = (iZDC->second).id();
-          const HcalQIECoder* channelCoder = conditions->getHcalCoder (cell);
-          const HcalQIEShape* shape = conditions->getHcalShape (channelCoder); // this one is generic         
-          HcalCoderDb coder (*channelCoder, *shape);
+        HcalZDCDetId cell = (iZDC->second).id();
+        const HcalQIECoder *channelCoder = conditions->getHcalCoder(cell);
+        const HcalQIEShape *shape = conditions->getHcalShape(channelCoder);  // this one is generic
+        HcalCoderDb coder(*channelCoder, *shape);
 
-          unsigned int sizeold = (iZDC->second).size();
-          for(unsigned int isamp = 0; isamp<sizeold; isamp++) {
-            coder.fC2adc(ZDC_old,(ZDCdigis->back()), 1 );   // as per simulation, capid=1
-          }
+        unsigned int sizeold = (iZDC->second).size();
+        for (unsigned int isamp = 0; isamp < sizeold; isamp++) {
+          coder.fC2adc(ZDC_old, (ZDCdigis->back()),
+                       1);  // as per simulation, capid=1
+        }
       }
     }
 
+    // done merging
 
-  
-   //done merging
-
-    // put the collection of recunstructed hits in the event   
-    LogInfo("DataMixingHcalDigiWorker") << "total # HBHE Merged digis: " << HBHEdigis->size() ;
-    LogInfo("DataMixingHcalDigiWorker") << "total # HO Merged digis: " << HOdigis->size() ;
-    LogInfo("DataMixingHcalDigiWorker") << "total # HF Merged digis: " << HFdigis->size() ;
-    LogInfo("DataMixingHcalDigiWorker") << "total # QIE10 Merged digis: " << QIE10digis->size() ;
-    LogInfo("DataMixingHcalDigiWorker") << "total # QIE11 Merged digis: " << QIE11digis->size() ;
-    LogInfo("DataMixingHcalDigiWorker") << "total # ZDC Merged digis: " << ZDCdigis->size() ;
-
+    // put the collection of recunstructed hits in the event
+    LogInfo("DataMixingHcalDigiWorker") << "total # HBHE Merged digis: " << HBHEdigis->size();
+    LogInfo("DataMixingHcalDigiWorker") << "total # HO Merged digis: " << HOdigis->size();
+    LogInfo("DataMixingHcalDigiWorker") << "total # HF Merged digis: " << HFdigis->size();
+    LogInfo("DataMixingHcalDigiWorker") << "total # QIE10 Merged digis: " << QIE10digis->size();
+    LogInfo("DataMixingHcalDigiWorker") << "total # QIE11 Merged digis: " << QIE11digis->size();
+    LogInfo("DataMixingHcalDigiWorker") << "total # ZDC Merged digis: " << ZDCdigis->size();
 
     e.put(std::move(HBHEdigis), HBHEDigiCollectionDM_);
     e.put(std::move(HOdigis), HODigiCollectionDM_);
@@ -521,7 +551,6 @@ namespace edm
     QIE10DigiStorage_.clear();
     QIE11DigiStorage_.clear();
     ZDCDigiStorage_.clear();
-
   }
 
-} //edm
+}  // namespace edm
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorker.h b/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorker.h
index 3784034ea1e8b..38cad44b26b47 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorker.h
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorker.h
@@ -3,7 +3,7 @@
 
 /** \class DataMixingHcalDigiWorker
  *
- * DataMixingModule is the EDProducer subclass 
+ * DataMixingModule is the EDProducer subclass
  * that overlays rawdata events on top of MC,
  * using real data for pileup simulation
  * This class takes care of the Hcal information at Digi level
@@ -14,109 +14,107 @@
  *
  ************************************************************/
 
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventPrincipal.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 
 #include "CalibFormats/CaloObjects/interface/CaloSamples.h"
-#include "DataFormats/Provenance/interface/ProductID.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 #include "DataFormats/HcalDigi/interface/HBHEDataFrame.h"
-#include "DataFormats/HcalDigi/interface/HODataFrame.h"
 #include "DataFormats/HcalDigi/interface/HFDataFrame.h"
+#include "DataFormats/HcalDigi/interface/HODataFrame.h"
+#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 #include "DataFormats/HcalDigi/interface/QIE10DataFrame.h"
 #include "DataFormats/HcalDigi/interface/QIE11DataFrame.h"
-
+#include "DataFormats/Provenance/interface/ProductID.h"
 
 #include <map>
-#include <vector>
 #include <string>
+#include <vector>
 
-
-namespace edm
-{
+namespace edm {
   class ModuleCallingContext;
 
-  class DataMixingHcalDigiWorker
-    {
-    public:
-
-      DataMixingHcalDigiWorker();
-
-     /** standard constructor*/
-      explicit DataMixingHcalDigiWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC);
-
-      /**Default destructor*/
-      virtual ~DataMixingHcalDigiWorker();
-
-      void putHcal(edm::Event &e,const edm::EventSetup& ES) ;
-      void addHcalSignals(const edm::Event &e,const edm::EventSetup& ES); 
-      void addHcalPileups(const int bcr, const edm::EventPrincipal*,unsigned int EventId,const edm::EventSetup& ES,
-                          ModuleCallingContext const*);
-
-
-    private:
-      // data specifiers
-
-      // Hcal
-      edm::InputTag HBHEdigiCollectionSig_; // secondary name given to collection of digis
-      edm::InputTag HOdigiCollectionSig_  ; // secondary name given to collection of digis
-      edm::InputTag HFdigiCollectionSig_  ; // secondary name given to collection of digis
-      edm::InputTag ZDCdigiCollectionSig_ ; // secondary name given to collection of digis
-      edm::InputTag QIE10digiCollectionSig_ ; // secondary name given to collection of digis
-      edm::InputTag QIE11digiCollectionSig_ ; // secondary name given to collection of digis
-
-      edm::InputTag HBHEPileInputTag_; // InputTag for Pileup Digis collection  
-      edm::InputTag HOPileInputTag_  ; // InputTag for Pileup Digis collection
-      edm::InputTag HFPileInputTag_  ; // InputTag for Pileup Digis collection
-      edm::InputTag ZDCPileInputTag_ ; // InputTag for Pileup Digis collection
-      edm::InputTag QIE10PileInputTag_ ; // InputTag for Pileup Digis collection
-      edm::InputTag QIE11PileInputTag_ ; // InputTag for Pileup Digis collection
-
-      edm::EDGetTokenT<HBHEDigiCollection> HBHEDigiToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<HODigiCollection> HODigiToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<HFDigiCollection> HFDigiToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<ZDCDigiCollection> ZDCDigiToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<QIE10DigiCollection> QIE10DigiToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<QIE11DigiCollection> QIE11DigiToken_ ;  // Token to retrieve information 
-
-      edm::EDGetTokenT<HBHEDigiCollection> HBHEDigiPToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<HODigiCollection> HODigiPToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<HFDigiCollection> HFDigiPToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<ZDCDigiCollection> ZDCDigiPToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<QIE10DigiCollection> QIE10DigiPToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<QIE11DigiCollection> QIE11DigiPToken_ ;  // Token to retrieve information 
-
-
-      std::string HBHEDigiCollectionDM_; // secondary name to be given to collection of digis
-      std::string HODigiCollectionDM_  ; // secondary name to be given to collection of digis
-      std::string HFDigiCollectionDM_  ; // secondary name to be given to collection of digis
-      std::string ZDCDigiCollectionDM_ ; // secondary name to be given to collection of digis
-      std::string QIE10DigiCollectionDM_ ; // secondary name to be given to collection of digis
-      std::string QIE11DigiCollectionDM_ ; // secondary name to be given to collection of digis
-
-      typedef std::multimap<DetId, CaloSamples> HBHEDigiMap;
-      typedef std::multimap<DetId, CaloSamples> HFDigiMap;
-      typedef std::multimap<DetId, CaloSamples> HODigiMap;
-      typedef std::multimap<DetId, CaloSamples> ZDCDigiMap;
-      typedef std::multimap<DetId, CaloSamples> QIE10DigiMap;
-      typedef std::multimap<DetId, CaloSamples> QIE11DigiMap;
-
-      HBHEDigiMap HBHEDigiStorage_;
-      HFDigiMap   HFDigiStorage_;
-      HODigiMap   HODigiStorage_;
-      ZDCDigiMap  ZDCDigiStorage_;
-      QIE10DigiMap  QIE10DigiStorage_;
-      QIE11DigiMap  QIE11DigiStorage_;
-
-      bool DoZDC_;
-
-      std::string label_;
-
-    };
-}//edm
-
-#endif // SimDataMixingHcalDigiWorker_h
+  class DataMixingHcalDigiWorker {
+  public:
+    DataMixingHcalDigiWorker();
+
+    /** standard constructor*/
+    explicit DataMixingHcalDigiWorker(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC);
+
+    /**Default destructor*/
+    virtual ~DataMixingHcalDigiWorker();
+
+    void putHcal(edm::Event &e, const edm::EventSetup &ES);
+    void addHcalSignals(const edm::Event &e, const edm::EventSetup &ES);
+    void addHcalPileups(const int bcr,
+                        const edm::EventPrincipal *,
+                        unsigned int EventId,
+                        const edm::EventSetup &ES,
+                        ModuleCallingContext const *);
+
+  private:
+    // data specifiers
+
+    // Hcal
+    edm::InputTag HBHEdigiCollectionSig_;   // secondary name given to collection of digis
+    edm::InputTag HOdigiCollectionSig_;     // secondary name given to collection of digis
+    edm::InputTag HFdigiCollectionSig_;     // secondary name given to collection of digis
+    edm::InputTag ZDCdigiCollectionSig_;    // secondary name given to collection of digis
+    edm::InputTag QIE10digiCollectionSig_;  // secondary name given to collection of digis
+    edm::InputTag QIE11digiCollectionSig_;  // secondary name given to collection of digis
+
+    edm::InputTag HBHEPileInputTag_;   // InputTag for Pileup Digis collection
+    edm::InputTag HOPileInputTag_;     // InputTag for Pileup Digis collection
+    edm::InputTag HFPileInputTag_;     // InputTag for Pileup Digis collection
+    edm::InputTag ZDCPileInputTag_;    // InputTag for Pileup Digis collection
+    edm::InputTag QIE10PileInputTag_;  // InputTag for Pileup Digis collection
+    edm::InputTag QIE11PileInputTag_;  // InputTag for Pileup Digis collection
+
+    edm::EDGetTokenT<HBHEDigiCollection> HBHEDigiToken_;    // Token to retrieve information
+    edm::EDGetTokenT<HODigiCollection> HODigiToken_;        // Token to retrieve information
+    edm::EDGetTokenT<HFDigiCollection> HFDigiToken_;        // Token to retrieve information
+    edm::EDGetTokenT<ZDCDigiCollection> ZDCDigiToken_;      // Token to retrieve information
+    edm::EDGetTokenT<QIE10DigiCollection> QIE10DigiToken_;  // Token to retrieve information
+    edm::EDGetTokenT<QIE11DigiCollection> QIE11DigiToken_;  // Token to retrieve information
+
+    edm::EDGetTokenT<HBHEDigiCollection> HBHEDigiPToken_;    // Token to retrieve information
+    edm::EDGetTokenT<HODigiCollection> HODigiPToken_;        // Token to retrieve information
+    edm::EDGetTokenT<HFDigiCollection> HFDigiPToken_;        // Token to retrieve information
+    edm::EDGetTokenT<ZDCDigiCollection> ZDCDigiPToken_;      // Token to retrieve information
+    edm::EDGetTokenT<QIE10DigiCollection> QIE10DigiPToken_;  // Token to retrieve information
+    edm::EDGetTokenT<QIE11DigiCollection> QIE11DigiPToken_;  // Token to retrieve information
+
+    std::string HBHEDigiCollectionDM_;   // secondary name to be given to collection
+                                         // of digis
+    std::string HODigiCollectionDM_;     // secondary name to be given to collection of digis
+    std::string HFDigiCollectionDM_;     // secondary name to be given to collection of digis
+    std::string ZDCDigiCollectionDM_;    // secondary name to be given to collection of digis
+    std::string QIE10DigiCollectionDM_;  // secondary name to be given to
+                                         // collection of digis
+    std::string QIE11DigiCollectionDM_;  // secondary name to be given to
+                                         // collection of digis
+
+    typedef std::multimap<DetId, CaloSamples> HBHEDigiMap;
+    typedef std::multimap<DetId, CaloSamples> HFDigiMap;
+    typedef std::multimap<DetId, CaloSamples> HODigiMap;
+    typedef std::multimap<DetId, CaloSamples> ZDCDigiMap;
+    typedef std::multimap<DetId, CaloSamples> QIE10DigiMap;
+    typedef std::multimap<DetId, CaloSamples> QIE11DigiMap;
+
+    HBHEDigiMap HBHEDigiStorage_;
+    HFDigiMap HFDigiStorage_;
+    HODigiMap HODigiStorage_;
+    ZDCDigiMap ZDCDigiStorage_;
+    QIE10DigiMap QIE10DigiStorage_;
+    QIE11DigiMap QIE11DigiStorage_;
+
+    bool DoZDC_;
+
+    std::string label_;
+  };
+}  // namespace edm
+
+#endif  // SimDataMixingHcalDigiWorker_h
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.cc b/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.cc
index 43921163f2623..e1ac54ebe2256 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.cc
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.cc
@@ -4,10 +4,10 @@
 //
 //--------------------------------------------
 
+#include "DataMixingHcalDigiWorkerProd.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/EDMException.h"
-#include "DataMixingHcalDigiWorkerProd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
@@ -15,18 +15,16 @@
 
 using namespace std;
 namespace edm {
-  // Constructor 
-  DataMixingHcalDigiWorkerProd::DataMixingHcalDigiWorkerProd(const edm::ParameterSet& ps, edm::ConsumesCollector&& iC) : 
-    HBHEPileInputTag_(ps.getParameter<edm::InputTag>("HBHEPileInputTag")),
-    HOPileInputTag_(ps.getParameter<edm::InputTag>("HOPileInputTag")),
-    HFPileInputTag_(ps.getParameter<edm::InputTag>("HFPileInputTag")),
-    ZDCPileInputTag_(ps.getParameter<edm::InputTag>("ZDCPileInputTag")),
-    QIE10PileInputTag_(ps.getParameter<edm::InputTag>("QIE10PileInputTag")),
-    QIE11PileInputTag_(ps.getParameter<edm::InputTag>("QIE11PileInputTag")),
-    label_(ps.getParameter<std::string>("Label"))
-  {  
-
-    // 
+  // Constructor
+  DataMixingHcalDigiWorkerProd::DataMixingHcalDigiWorkerProd(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC)
+      : HBHEPileInputTag_(ps.getParameter<edm::InputTag>("HBHEPileInputTag")),
+        HOPileInputTag_(ps.getParameter<edm::InputTag>("HOPileInputTag")),
+        HFPileInputTag_(ps.getParameter<edm::InputTag>("HFPileInputTag")),
+        ZDCPileInputTag_(ps.getParameter<edm::InputTag>("ZDCPileInputTag")),
+        QIE10PileInputTag_(ps.getParameter<edm::InputTag>("QIE10PileInputTag")),
+        QIE11PileInputTag_(ps.getParameter<edm::InputTag>("QIE11PileInputTag")),
+        label_(ps.getParameter<std::string>("Label")) {
+    //
     tok_hbhe_ = iC.consumes<HBHEDigitizerTraits::DigiCollection>(HBHEPileInputTag_);
     tok_ho_ = iC.consumes<HODigitizerTraits::DigiCollection>(HOPileInputTag_);
     tok_hf_ = iC.consumes<HFDigitizerTraits::DigiCollection>(HFPileInputTag_);
@@ -34,65 +32,64 @@ namespace edm {
     tok_qie10_ = iC.consumes<HcalQIE10DigitizerTraits::DigiCollection>(QIE10PileInputTag_);
     tok_qie11_ = iC.consumes<HcalQIE11DigitizerTraits::DigiCollection>(QIE11PileInputTag_);
 
-    theHBHESignalGenerator = HBHESignalGenerator(HBHEPileInputTag_,tok_hbhe_);
-    theHOSignalGenerator = HOSignalGenerator(HOPileInputTag_,tok_ho_);
-    theHFSignalGenerator = HFSignalGenerator(HFPileInputTag_,tok_hf_);
-    theZDCSignalGenerator = ZDCSignalGenerator(ZDCPileInputTag_,tok_zdc_);
-    theQIE10SignalGenerator = QIE10SignalGenerator(QIE10PileInputTag_,tok_qie10_);
-    theQIE11SignalGenerator = QIE11SignalGenerator(QIE11PileInputTag_,tok_qie11_);
+    theHBHESignalGenerator = HBHESignalGenerator(HBHEPileInputTag_, tok_hbhe_);
+    theHOSignalGenerator = HOSignalGenerator(HOPileInputTag_, tok_ho_);
+    theHFSignalGenerator = HFSignalGenerator(HFPileInputTag_, tok_hf_);
+    theZDCSignalGenerator = ZDCSignalGenerator(ZDCPileInputTag_, tok_zdc_);
+    theQIE10SignalGenerator = QIE10SignalGenerator(QIE10PileInputTag_, tok_qie10_);
+    theQIE11SignalGenerator = QIE11SignalGenerator(QIE11PileInputTag_, tok_qie11_);
 
     // get the subdetector names
-    //    this->getSubdetectorNames();  //something like this may be useful to check what we are supposed to do...
+    //    this->getSubdetectorNames();  //something like this may be useful to
+    //    check what we are supposed to do...
 
     // declare the products to produce
 
-    // Hcal 
+    // Hcal
     // Signal inputs now handled by HcalDigitizer - gets pSimHits directly
 
     HBHEDigiCollectionDM_ = ps.getParameter<std::string>("HBHEDigiCollectionDM");
-    HODigiCollectionDM_   = ps.getParameter<std::string>("HODigiCollectionDM");
-    HFDigiCollectionDM_   = ps.getParameter<std::string>("HFDigiCollectionDM");
-    ZDCDigiCollectionDM_  = ps.getParameter<std::string>("ZDCDigiCollectionDM");
-    QIE10DigiCollectionDM_  = ps.getParameter<std::string>("QIE10DigiCollectionDM");
-    QIE11DigiCollectionDM_  = ps.getParameter<std::string>("QIE11DigiCollectionDM");
+    HODigiCollectionDM_ = ps.getParameter<std::string>("HODigiCollectionDM");
+    HFDigiCollectionDM_ = ps.getParameter<std::string>("HFDigiCollectionDM");
+    ZDCDigiCollectionDM_ = ps.getParameter<std::string>("ZDCDigiCollectionDM");
+    QIE10DigiCollectionDM_ = ps.getParameter<std::string>("QIE10DigiCollectionDM");
+    QIE11DigiCollectionDM_ = ps.getParameter<std::string>("QIE11DigiCollectionDM");
 
     // initialize HcalDigitizer here...
 
-    myHcalDigitizer_ = new HcalDigiProducer( ps, iC );
-
-    myHcalDigitizer_->setHBHENoiseSignalGenerator( & theHBHESignalGenerator );
-    myHcalDigitizer_->setHFNoiseSignalGenerator( & theHFSignalGenerator );
-    myHcalDigitizer_->setHONoiseSignalGenerator( & theHOSignalGenerator );
-    myHcalDigitizer_->setZDCNoiseSignalGenerator( & theZDCSignalGenerator );
-    myHcalDigitizer_->setQIE10NoiseSignalGenerator( & theQIE10SignalGenerator );
-    myHcalDigitizer_->setQIE11NoiseSignalGenerator( & theQIE11SignalGenerator );
+    myHcalDigitizer_ = new HcalDigiProducer(ps, iC);
 
+    myHcalDigitizer_->setHBHENoiseSignalGenerator(&theHBHESignalGenerator);
+    myHcalDigitizer_->setHFNoiseSignalGenerator(&theHFSignalGenerator);
+    myHcalDigitizer_->setHONoiseSignalGenerator(&theHOSignalGenerator);
+    myHcalDigitizer_->setZDCNoiseSignalGenerator(&theZDCSignalGenerator);
+    myHcalDigitizer_->setQIE10NoiseSignalGenerator(&theQIE10SignalGenerator);
+    myHcalDigitizer_->setQIE11NoiseSignalGenerator(&theQIE11SignalGenerator);
   }
-	       
+
   // Virtual destructor needed.
-  DataMixingHcalDigiWorkerProd::~DataMixingHcalDigiWorkerProd() { 
-    delete myHcalDigitizer_;
-  }  
+  DataMixingHcalDigiWorkerProd::~DataMixingHcalDigiWorkerProd() { delete myHcalDigitizer_; }
 
-  void DataMixingHcalDigiWorkerProd::beginRun(const edm::Run& run, const edm::EventSetup& ES) {
-    myHcalDigitizer_->beginRun(run, ES); 
+  void DataMixingHcalDigiWorkerProd::beginRun(const edm::Run &run, const edm::EventSetup &ES) {
+    myHcalDigitizer_->beginRun(run, ES);
   }
 
-  void DataMixingHcalDigiWorkerProd::initializeEvent(const edm::Event &e, const edm::EventSetup& ES) {
-    myHcalDigitizer_->initializeEvent(e, ES); 
+  void DataMixingHcalDigiWorkerProd::initializeEvent(const edm::Event &e, const edm::EventSetup &ES) {
+    myHcalDigitizer_->initializeEvent(e, ES);
   }
 
-  void DataMixingHcalDigiWorkerProd::addHcalSignals(const edm::Event &e,const edm::EventSetup& ES) { 
-    
+  void DataMixingHcalDigiWorkerProd::addHcalSignals(const edm::Event &e, const edm::EventSetup &ES) {
     myHcalDigitizer_->accumulate(e, ES);
 
-  } // end of addHcalSignals
-
-  void DataMixingHcalDigiWorkerProd::addHcalPileups(const int bcr, const EventPrincipal *ep, unsigned int eventNr,const edm::EventSetup& ES,
-                                                    edm::ModuleCallingContext const* mcc) {
-  
-    LogDebug("DataMixingHcalDigiWorkerProd") <<"\n===============> adding pileups from event  "<<ep->id()<<" for bunchcrossing "<<bcr;
+  }  // end of addHcalSignals
 
+  void DataMixingHcalDigiWorkerProd::addHcalPileups(const int bcr,
+                                                    const EventPrincipal *ep,
+                                                    unsigned int eventNr,
+                                                    const edm::EventSetup &ES,
+                                                    edm::ModuleCallingContext const *mcc) {
+    LogDebug("DataMixingHcalDigiWorkerProd")
+        << "\n===============> adding pileups from event  " << ep->id() << " for bunchcrossing " << bcr;
 
     theHBHESignalGenerator.initializeEvent(ep, &ES);
     theHOSignalGenerator.initializeEvent(ep, &ES);
@@ -110,18 +107,15 @@ namespace edm {
     theQIE11SignalGenerator.fill(mcc);
   }
 
-  void DataMixingHcalDigiWorkerProd::putHcal(edm::Event &e,const edm::EventSetup& ES) {
-
+  void DataMixingHcalDigiWorkerProd::putHcal(edm::Event &e, const edm::EventSetup &ES) {
     // Digitize
-    //edm::Service<edm::RandomNumberGenerator> rng;
-    //CLHEP::HepRandomEngine* engine = &rng->getEngine(e.streamID());
+    // edm::Service<edm::RandomNumberGenerator> rng;
+    // CLHEP::HepRandomEngine* engine = &rng->getEngine(e.streamID());
 
-    //myHcalDigitizer_->initializeEvent( e, ES );
+    // myHcalDigitizer_->initializeEvent( e, ES );
 
     //    myHcalDigitizer_->finalizeEvent( e, ES, engine );
-    myHcalDigitizer_->finalizeEvent( e, ES);
-
+    myHcalDigitizer_->finalizeEvent(e, ES);
   }
 
-} //edm
-
+}  // namespace edm
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.h b/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.h
index fc9fb448b743c..3bf45e8c8216b 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.h
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.h
@@ -3,7 +3,7 @@
 
 /** \class DataMixingHcalDigiWorkerProd
  *
- * DataMixingModule is the EDProducer subclass 
+ * DataMixingModule is the EDProducer subclass
  * that overlays rawdata events on top of MC,
  * using real data for pileup simulation
  * This class takes care of the Hcal information at Digi level
@@ -20,81 +20,82 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "CalibFormats/CaloObjects/interface/CaloSamples.h"
-#include "DataFormats/Provenance/interface/ProductID.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 #include "DataFormats/HcalDigi/interface/HBHEDataFrame.h"
-#include "DataFormats/HcalDigi/interface/HODataFrame.h"
 #include "DataFormats/HcalDigi/interface/HFDataFrame.h"
+#include "DataFormats/HcalDigi/interface/HODataFrame.h"
+#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 #include "DataFormats/HcalDigi/interface/QIE10DataFrame.h"
 #include "DataFormats/HcalDigi/interface/QIE11DataFrame.h"
-#include "SimCalorimetry/HcalSimProducers/interface/HcalDigiProducer.h"
+#include "DataFormats/Provenance/interface/ProductID.h"
 #include "SimCalorimetry/HcalSimAlgos/interface/HcalSignalGenerator.h"
+#include "SimCalorimetry/HcalSimProducers/interface/HcalDigiProducer.h"
 #include "SimGeneral/DataMixingModule/plugins/HcalNoiseStorage.h"
 
 #include <map>
-#include <vector>
 #include <string>
+#include <vector>
 
-
-namespace edm
-{
+namespace edm {
   class ConsumesCollector;
   class ModuleCallingContext;
 
-  class DataMixingHcalDigiWorkerProd
-    {
-    public:
-
-     /** standard constructor*/
-      explicit DataMixingHcalDigiWorkerProd(const edm::ParameterSet& ps, edm::ConsumesCollector&& iC);
-
-      /**Default destructor*/
-      virtual ~DataMixingHcalDigiWorkerProd();
-
-      void putHcal(edm::Event &e,const edm::EventSetup& ES);
-      void addHcalSignals(const edm::Event &e,const edm::EventSetup& ES); 
-      void addHcalPileups(const int bcr, const edm::EventPrincipal*,unsigned int EventId,
-                          const edm::EventSetup& ES, edm::ModuleCallingContext const*);
-
-    void beginRun(const edm::Run& run, const edm::EventSetup& ES);
-    void initializeEvent(const edm::Event &e, const edm::EventSetup& ES);
-
-    private:
-      // data specifiers
-
-      // Hcal
-      edm::InputTag HBHEPileInputTag_; // InputTag for Pileup Digis collection  
-      edm::InputTag HOPileInputTag_  ; // InputTag for Pileup Digis collection
-      edm::InputTag HFPileInputTag_  ; // InputTag for Pileup Digis collection
-      edm::InputTag ZDCPileInputTag_ ; // InputTag for Pileup Digis collection
-      edm::InputTag QIE10PileInputTag_ ; // InputTag for Pileup Digis collection
-      edm::InputTag QIE11PileInputTag_ ; // InputTag for Pileup Digis collection
-      std::string HBHEDigiCollectionDM_; // secondary name to be given to collection of digis
-      std::string HODigiCollectionDM_  ; // secondary name to be given to collection of digis
-      std::string HFDigiCollectionDM_  ; // secondary name to be given to collection of digis
-      std::string ZDCDigiCollectionDM_ ; // secondary name to be given to collection of digis
-      std::string QIE10DigiCollectionDM_ ; // secondary name to be given to collection of digis
-      std::string QIE11DigiCollectionDM_ ; // secondary name to be given to collection of digis
-
-      edm::EDGetTokenT<HBHEDigitizerTraits::DigiCollection> tok_hbhe_;
-      edm::EDGetTokenT<HODigitizerTraits::DigiCollection> tok_ho_;
-      edm::EDGetTokenT<HFDigitizerTraits::DigiCollection> tok_hf_;
-      edm::EDGetTokenT<ZDCDigitizerTraits::DigiCollection> tok_zdc_;
-      edm::EDGetTokenT<HcalQIE10DigitizerTraits::DigiCollection> tok_qie10_;
-      edm::EDGetTokenT<HcalQIE11DigitizerTraits::DigiCollection> tok_qie11_;
-
-      HcalDigiProducer* myHcalDigitizer_;
-      HBHESignalGenerator theHBHESignalGenerator;
-      HOSignalGenerator theHOSignalGenerator;
-      HFSignalGenerator theHFSignalGenerator;
-      ZDCSignalGenerator theZDCSignalGenerator;
-      QIE10SignalGenerator theQIE10SignalGenerator;
-      QIE11SignalGenerator theQIE11SignalGenerator;
-
-      std::string label_;
-
-    };
-}//edm
-
-#endif // SimDataMixingHcalDigiWorkerProd_h
+  class DataMixingHcalDigiWorkerProd {
+  public:
+    /** standard constructor*/
+    explicit DataMixingHcalDigiWorkerProd(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC);
+
+    /**Default destructor*/
+    virtual ~DataMixingHcalDigiWorkerProd();
+
+    void putHcal(edm::Event &e, const edm::EventSetup &ES);
+    void addHcalSignals(const edm::Event &e, const edm::EventSetup &ES);
+    void addHcalPileups(const int bcr,
+                        const edm::EventPrincipal *,
+                        unsigned int EventId,
+                        const edm::EventSetup &ES,
+                        edm::ModuleCallingContext const *);
+
+    void beginRun(const edm::Run &run, const edm::EventSetup &ES);
+    void initializeEvent(const edm::Event &e, const edm::EventSetup &ES);
+
+  private:
+    // data specifiers
+
+    // Hcal
+    edm::InputTag HBHEPileInputTag_;     // InputTag for Pileup Digis collection
+    edm::InputTag HOPileInputTag_;       // InputTag for Pileup Digis collection
+    edm::InputTag HFPileInputTag_;       // InputTag for Pileup Digis collection
+    edm::InputTag ZDCPileInputTag_;      // InputTag for Pileup Digis collection
+    edm::InputTag QIE10PileInputTag_;    // InputTag for Pileup Digis collection
+    edm::InputTag QIE11PileInputTag_;    // InputTag for Pileup Digis collection
+    std::string HBHEDigiCollectionDM_;   // secondary name to be given to collection
+                                         // of digis
+    std::string HODigiCollectionDM_;     // secondary name to be given to collection of digis
+    std::string HFDigiCollectionDM_;     // secondary name to be given to collection of digis
+    std::string ZDCDigiCollectionDM_;    // secondary name to be given to collection of digis
+    std::string QIE10DigiCollectionDM_;  // secondary name to be given to
+                                         // collection of digis
+    std::string QIE11DigiCollectionDM_;  // secondary name to be given to
+                                         // collection of digis
+
+    edm::EDGetTokenT<HBHEDigitizerTraits::DigiCollection> tok_hbhe_;
+    edm::EDGetTokenT<HODigitizerTraits::DigiCollection> tok_ho_;
+    edm::EDGetTokenT<HFDigitizerTraits::DigiCollection> tok_hf_;
+    edm::EDGetTokenT<ZDCDigitizerTraits::DigiCollection> tok_zdc_;
+    edm::EDGetTokenT<HcalQIE10DigitizerTraits::DigiCollection> tok_qie10_;
+    edm::EDGetTokenT<HcalQIE11DigitizerTraits::DigiCollection> tok_qie11_;
+
+    HcalDigiProducer *myHcalDigitizer_;
+    HBHESignalGenerator theHBHESignalGenerator;
+    HOSignalGenerator theHOSignalGenerator;
+    HFSignalGenerator theHFSignalGenerator;
+    ZDCSignalGenerator theZDCSignalGenerator;
+    QIE10SignalGenerator theQIE10SignalGenerator;
+    QIE11SignalGenerator theQIE11SignalGenerator;
+
+    std::string label_;
+  };
+}  // namespace edm
+
+#endif  // SimDataMixingHcalDigiWorkerProd_h
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingHcalWorker.cc b/SimGeneral/DataMixingModule/plugins/DataMixingHcalWorker.cc
index 29528071a2d32..a0a9770ef699a 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingHcalWorker.cc
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingHcalWorker.cc
@@ -4,41 +4,39 @@
 //
 //--------------------------------------------
 
+#include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <map>
 #include <memory>
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/Common/interface/Handle.h"
 //
 //
 #include "DataMixingHcalWorker.h"
 
-
 using namespace std;
 
-namespace edm
-{
+namespace edm {
 
   // Virtual constructor
 
-  DataMixingHcalWorker::DataMixingHcalWorker() { } 
-
-  // Constructor 
-  DataMixingHcalWorker::DataMixingHcalWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC) : 
-							    label_(ps.getParameter<std::string>("Label"))
+  DataMixingHcalWorker::DataMixingHcalWorker() {}
 
-  {                                                         
+  // Constructor
+  DataMixingHcalWorker::DataMixingHcalWorker(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC)
+      : label_(ps.getParameter<std::string>("Label"))
 
+  {
     // get the subdetector names
-    //    this->getSubdetectorNames();  //something like this may be useful to check what we are supposed to do...
+    //    this->getSubdetectorNames();  //something like this may be useful to
+    //    check what we are supposed to do...
 
     // declare the products to produce
 
-    // Hcal 
+    // Hcal
 
-    HBHErechitCollectionSig_  = ps.getParameter<edm::InputTag>("HBHEProducerSig");
-    HOrechitCollectionSig_    = ps.getParameter<edm::InputTag>("HOProducerSig");
-    HFrechitCollectionSig_    = ps.getParameter<edm::InputTag>("HFProducerSig");
-    ZDCrechitCollectionSig_   = ps.getParameter<edm::InputTag>("ZDCrechitCollectionSig");
+    HBHErechitCollectionSig_ = ps.getParameter<edm::InputTag>("HBHEProducerSig");
+    HOrechitCollectionSig_ = ps.getParameter<edm::InputTag>("HOProducerSig");
+    HFrechitCollectionSig_ = ps.getParameter<edm::InputTag>("HFProducerSig");
+    ZDCrechitCollectionSig_ = ps.getParameter<edm::InputTag>("ZDCrechitCollectionSig");
 
     HBHEPileRecHitInputTag_ = ps.getParameter<edm::InputTag>("HBHEPileRecHitInputTag");
     HOPileRecHitInputTag_ = ps.getParameter<edm::InputTag>("HOPileRecHitInputTag");
@@ -46,9 +44,9 @@ namespace edm
     ZDCPileRecHitInputTag_ = ps.getParameter<edm::InputTag>("ZDCPileRecHitInputTag");
 
     HBHERecHitCollectionDM_ = ps.getParameter<std::string>("HBHERecHitCollectionDM");
-    HORecHitCollectionDM_   = ps.getParameter<std::string>("HORecHitCollectionDM");
-    HFRecHitCollectionDM_   = ps.getParameter<std::string>("HFRecHitCollectionDM");
-    ZDCRecHitCollectionDM_  = ps.getParameter<std::string>("ZDCRecHitCollectionDM");
+    HORecHitCollectionDM_ = ps.getParameter<std::string>("HORecHitCollectionDM");
+    HFRecHitCollectionDM_ = ps.getParameter<std::string>("HFRecHitCollectionDM");
+    ZDCRecHitCollectionDM_ = ps.getParameter<std::string>("ZDCRecHitCollectionDM");
 
     HBHERecHitToken_ = iC.consumes<HBHERecHitCollection>(HBHErechitCollectionSig_);
     HORecHitToken_ = iC.consumes<HORecHitCollection>(HOrechitCollectionSig_);
@@ -58,264 +56,222 @@ namespace edm
     HORecHitPToken_ = iC.consumes<HORecHitCollection>(HOPileRecHitInputTag_);
     HFRecHitPToken_ = iC.consumes<HFRecHitCollection>(HFPileRecHitInputTag_);
 
-
     ZDCRecHitToken_ = iC.consumes<ZDCRecHitCollection>(ZDCrechitCollectionSig_);
     ZDCRecHitPToken_ = iC.consumes<ZDCRecHitCollection>(ZDCPileRecHitInputTag_);
-
   }
-	       
+
   // Virtual destructor needed.
-  DataMixingHcalWorker::~DataMixingHcalWorker() { 
-  }  
+  DataMixingHcalWorker::~DataMixingHcalWorker() {}
 
-  void DataMixingHcalWorker::addHcalSignals(const edm::Event &e) { 
+  void DataMixingHcalWorker::addHcalSignals(const edm::Event &e) {
     // fill in maps of hits
 
-    LogInfo("DataMixingHcalWorker")<<"===============> adding MC signals for "<<e.id();
+    LogInfo("DataMixingHcalWorker") << "===============> adding MC signals for " << e.id();
 
     // HBHE first
 
-   Handle< HBHERecHitCollection > pHBHERecHits;
-
-   const HBHERecHitCollection*  HBHERecHits = nullptr;
-
-   if( e.getByToken( HBHERecHitToken_, pHBHERecHits) ) {
-     HBHERecHits = pHBHERecHits.product(); // get a ptr to the product
-     LogDebug("DataMixingHcalWorker") << "total # HBHE rechits: " << HBHERecHits->size();
-   } 
-   
- 
-   if (HBHERecHits)
-     {
-       // loop over rechits, storing them in a map so we can add pileup later
-       for(HBHERecHitCollection::const_iterator it  = HBHERecHits->begin();	
-	   it != HBHERecHits->end(); ++it) {
-
-	 HBHERecHitStorage_.insert(HBHERecHitMap::value_type( ( it->id() ), *it ));
-	 
-#ifdef DEBUG	 
-         LogDebug("DataMixingHcalWorker") << "processed HBHERecHit with rawId: "
-				      << it->id() << "\n"
-				      << " rechit energy: " << it->energy();
-#endif
-
-       }
-     }
+    Handle<HBHERecHitCollection> pHBHERecHits;
 
-   // HO next
+    const HBHERecHitCollection *HBHERecHits = nullptr;
 
-   Handle< HORecHitCollection > pHORecHits;
+    if (e.getByToken(HBHERecHitToken_, pHBHERecHits)) {
+      HBHERecHits = pHBHERecHits.product();  // get a ptr to the product
+      LogDebug("DataMixingHcalWorker") << "total # HBHE rechits: " << HBHERecHits->size();
+    }
 
-   const HORecHitCollection*  HORecHits = nullptr;
+    if (HBHERecHits) {
+      // loop over rechits, storing them in a map so we can add pileup later
+      for (HBHERecHitCollection::const_iterator it = HBHERecHits->begin(); it != HBHERecHits->end(); ++it) {
+        HBHERecHitStorage_.insert(HBHERecHitMap::value_type((it->id()), *it));
 
-   if( e.getByToken( HORecHitToken_, pHORecHits) ){
-     HORecHits = pHORecHits.product(); // get a ptr to the product
 #ifdef DEBUG
-     LogDebug("DataMixingHcalWorker") << "total # HO rechits: " << HORecHits->size();
-#endif
-   } 
-   
- 
-   if (HORecHits)
-     {
-       // loop over rechits, storing them in a map so we can add pileup later
-       for(HORecHitCollection::const_iterator it  = HORecHits->begin();	
-	   it != HORecHits->end(); ++it) {
-
-	 HORecHitStorage_.insert(HORecHitMap::value_type( ( it->id() ), *it ));
-	 
-#ifdef DEBUG	 
-         LogDebug("DataMixingHcalWorker") << "processed HORecHit with rawId: "
-				      << it->id() << "\n"
-				      << " rechit energy: " << it->energy();
+        LogDebug("DataMixingHcalWorker") << "processed HBHERecHit with rawId: " << it->id() << "\n"
+                                         << " rechit energy: " << it->energy();
 #endif
+      }
+    }
 
-       }
-     }
+    // HO next
 
-   // HF next
+    Handle<HORecHitCollection> pHORecHits;
 
-   Handle< HFRecHitCollection > pHFRecHits;
+    const HORecHitCollection *HORecHits = nullptr;
 
-   const HFRecHitCollection*  HFRecHits = nullptr;
+    if (e.getByToken(HORecHitToken_, pHORecHits)) {
+      HORecHits = pHORecHits.product();  // get a ptr to the product
+#ifdef DEBUG
+      LogDebug("DataMixingHcalWorker") << "total # HO rechits: " << HORecHits->size();
+#endif
+    }
+
+    if (HORecHits) {
+      // loop over rechits, storing them in a map so we can add pileup later
+      for (HORecHitCollection::const_iterator it = HORecHits->begin(); it != HORecHits->end(); ++it) {
+        HORecHitStorage_.insert(HORecHitMap::value_type((it->id()), *it));
 
-   if( e.getByToken( HFRecHitToken_, pHFRecHits) ) {
-     HFRecHits = pHFRecHits.product(); // get a ptr to the product
 #ifdef DEBUG
-     LogDebug("DataMixingHcalWorker") << "total # HF rechits: " << HFRecHits->size();
+        LogDebug("DataMixingHcalWorker") << "processed HORecHit with rawId: " << it->id() << "\n"
+                                         << " rechit energy: " << it->energy();
 #endif
-   } 
-   
- 
-   if (HFRecHits)
-     {
-       // loop over rechits, storing them in a map so we can add pileup later
-       for(HFRecHitCollection::const_iterator it  = HFRecHits->begin();	
-	   it != HFRecHits->end(); ++it) {
-
-	 HFRecHitStorage_.insert(HFRecHitMap::value_type( ( it->id() ), *it ));
-	 
-#ifdef DEBUG	 
-         LogDebug("DataMixingHcalWorker") << "processed HFRecHit with rawId: "
-				      << it->id() << "\n"
-				      << " rechit energy: " << it->energy();
+      }
+    }
+
+    // HF next
+
+    Handle<HFRecHitCollection> pHFRecHits;
+
+    const HFRecHitCollection *HFRecHits = nullptr;
+
+    if (e.getByToken(HFRecHitToken_, pHFRecHits)) {
+      HFRecHits = pHFRecHits.product();  // get a ptr to the product
+#ifdef DEBUG
+      LogDebug("DataMixingHcalWorker") << "total # HF rechits: " << HFRecHits->size();
 #endif
+    }
+
+    if (HFRecHits) {
+      // loop over rechits, storing them in a map so we can add pileup later
+      for (HFRecHitCollection::const_iterator it = HFRecHits->begin(); it != HFRecHits->end(); ++it) {
+        HFRecHitStorage_.insert(HFRecHitMap::value_type((it->id()), *it));
 
-       }
-     }
+#ifdef DEBUG
+        LogDebug("DataMixingHcalWorker") << "processed HFRecHit with rawId: " << it->id() << "\n"
+                                         << " rechit energy: " << it->energy();
+#endif
+      }
+    }
 
-   // ZDC next
+    // ZDC next
 
-   Handle< ZDCRecHitCollection > pZDCRecHits;
+    Handle<ZDCRecHitCollection> pZDCRecHits;
 
-   const ZDCRecHitCollection*  ZDCRecHits = nullptr;
+    const ZDCRecHitCollection *ZDCRecHits = nullptr;
 
-   if( e.getByToken( ZDCRecHitToken_, pZDCRecHits) ) {
-     ZDCRecHits = pZDCRecHits.product(); // get a ptr to the product
+    if (e.getByToken(ZDCRecHitToken_, pZDCRecHits)) {
+      ZDCRecHits = pZDCRecHits.product();  // get a ptr to the product
 #ifdef DEBUG
-     LogDebug("DataMixingHcalWorker") << "total # ZDC rechits: " << ZDCRecHits->size();
+      LogDebug("DataMixingHcalWorker") << "total # ZDC rechits: " << ZDCRecHits->size();
 #endif
-   } 
-   
- 
-   if (ZDCRecHits)
-     {
-       // loop over rechits, storing them in a map so we can add pileup later
-       for(ZDCRecHitCollection::const_iterator it  = ZDCRecHits->begin();	
-	   it != ZDCRecHits->end(); ++it) {
-
-	 ZDCRecHitStorage_.insert(ZDCRecHitMap::value_type( ( it->id() ), *it ));
-	 
-#ifdef DEBUG	 
-         LogDebug("DataMixingHcalWorker") << "processed ZDCRecHit with rawId: "
-				      << it->id() << "\n"
-				      << " rechit energy: " << it->energy();
+    }
+
+    if (ZDCRecHits) {
+      // loop over rechits, storing them in a map so we can add pileup later
+      for (ZDCRecHitCollection::const_iterator it = ZDCRecHits->begin(); it != ZDCRecHits->end(); ++it) {
+        ZDCRecHitStorage_.insert(ZDCRecHitMap::value_type((it->id()), *it));
+
+#ifdef DEBUG
+        LogDebug("DataMixingHcalWorker") << "processed ZDCRecHit with rawId: " << it->id() << "\n"
+                                         << " rechit energy: " << it->energy();
 #endif
+      }
+    }
 
-       }
-     }
-    
-  } // end of addEMSignals
+  }  // end of addEMSignals
 
-  void DataMixingHcalWorker::addHcalPileups(const int bcr, const EventPrincipal *ep, unsigned int eventNr,
-                                            ModuleCallingContext const* mcc) {
-  
-    LogDebug("DataMixingHcalWorker") <<"\n===============> adding pileups from event  "<<ep->id()<<" for bunchcrossing "<<bcr;
+  void DataMixingHcalWorker::addHcalPileups(const int bcr,
+                                            const EventPrincipal *ep,
+                                            unsigned int eventNr,
+                                            ModuleCallingContext const *mcc) {
+    LogDebug("DataMixingHcalWorker") << "\n===============> adding pileups from event  " << ep->id()
+                                     << " for bunchcrossing " << bcr;
 
-    // fill in maps of hits; same code as addSignals, except now applied to the pileup events
+    // fill in maps of hits; same code as addSignals, except now applied to the
+    // pileup events
 
     // HBHE first
 
-    std::shared_ptr<Wrapper<HBHERecHitCollection>  const> HBHERecHitsPTR =
-      getProductByTag<HBHERecHitCollection>(*ep, HBHEPileRecHitInputTag_, mcc);
-
-    if(HBHERecHitsPTR ) {
+    std::shared_ptr<Wrapper<HBHERecHitCollection> const> HBHERecHitsPTR =
+        getProductByTag<HBHERecHitCollection>(*ep, HBHEPileRecHitInputTag_, mcc);
 
-      const HBHERecHitCollection*  HBHERecHits = const_cast< HBHERecHitCollection * >(HBHERecHitsPTR->product());
+    if (HBHERecHitsPTR) {
+      const HBHERecHitCollection *HBHERecHits = const_cast<HBHERecHitCollection *>(HBHERecHitsPTR->product());
 
       LogDebug("DataMixingEMWorker") << "total # HBHE rechits: " << HBHERecHits->size();
 
-      // loop over rechits, adding these to the existing maps                                                     
-      for(HBHERecHitCollection::const_iterator it  = HBHERecHits->begin();
-          it != HBHERecHits->end(); ++it) {
-
-        HBHERecHitStorage_.insert(HBHERecHitMap::value_type( (it->id()), *it ));
+      // loop over rechits, adding these to the existing maps
+      for (HBHERecHitCollection::const_iterator it = HBHERecHits->begin(); it != HBHERecHits->end(); ++it) {
+        HBHERecHitStorage_.insert(HBHERecHitMap::value_type((it->id()), *it));
 
 #ifdef DEBUG
-        LogDebug("DataMixingEMWorker") << "processed HBHERecHit with rawId: "
-				       << it->id().rawId() << "\n"
-				       << " rechit energy: " << it->energy();
+        LogDebug("DataMixingEMWorker") << "processed HBHERecHit with rawId: " << it->id().rawId() << "\n"
+                                       << " rechit energy: " << it->energy();
 #endif
       }
     }
 
     // HO Next
 
-    std::shared_ptr<Wrapper<HORecHitCollection>  const> HORecHitsPTR =
-      getProductByTag<HORecHitCollection>(*ep, HOPileRecHitInputTag_, mcc);
-
-    if(HORecHitsPTR ) {
+    std::shared_ptr<Wrapper<HORecHitCollection> const> HORecHitsPTR =
+        getProductByTag<HORecHitCollection>(*ep, HOPileRecHitInputTag_, mcc);
 
-      const HORecHitCollection*  HORecHits = const_cast< HORecHitCollection * >(HORecHitsPTR->product());
+    if (HORecHitsPTR) {
+      const HORecHitCollection *HORecHits = const_cast<HORecHitCollection *>(HORecHitsPTR->product());
 
       LogDebug("DataMixingEMWorker") << "total # HO rechits: " << HORecHits->size();
 
-      // loop over rechits, adding these to the existing maps                                                     
-      for(HORecHitCollection::const_iterator it  = HORecHits->begin();
-          it != HORecHits->end(); ++it) {
-
-        HORecHitStorage_.insert(HORecHitMap::value_type( (it->id()), *it ));
+      // loop over rechits, adding these to the existing maps
+      for (HORecHitCollection::const_iterator it = HORecHits->begin(); it != HORecHits->end(); ++it) {
+        HORecHitStorage_.insert(HORecHitMap::value_type((it->id()), *it));
 
 #ifdef DEBUG
-        LogDebug("DataMixingEMWorker") << "processed HORecHit with rawId: "
-				       << it->id().rawId() << "\n"
-				       << " rechit energy: " << it->energy();
+        LogDebug("DataMixingEMWorker") << "processed HORecHit with rawId: " << it->id().rawId() << "\n"
+                                       << " rechit energy: " << it->energy();
 #endif
       }
     }
 
     // HF Next
 
-    std::shared_ptr<Wrapper<HFRecHitCollection>  const> HFRecHitsPTR =
-      getProductByTag<HFRecHitCollection>(*ep, HFPileRecHitInputTag_, mcc);
-
-    if(HFRecHitsPTR ) {
+    std::shared_ptr<Wrapper<HFRecHitCollection> const> HFRecHitsPTR =
+        getProductByTag<HFRecHitCollection>(*ep, HFPileRecHitInputTag_, mcc);
 
-      const HFRecHitCollection*  HFRecHits = const_cast< HFRecHitCollection * >(HFRecHitsPTR->product());
+    if (HFRecHitsPTR) {
+      const HFRecHitCollection *HFRecHits = const_cast<HFRecHitCollection *>(HFRecHitsPTR->product());
 
       LogDebug("DataMixingEMWorker") << "total # HF rechits: " << HFRecHits->size();
 
-      // loop over rechits, adding these to the existing maps                                                     
-      for(HFRecHitCollection::const_iterator it  = HFRecHits->begin();
-          it != HFRecHits->end(); ++it) {
-
-        HFRecHitStorage_.insert(HFRecHitMap::value_type( (it->id()), *it ));
+      // loop over rechits, adding these to the existing maps
+      for (HFRecHitCollection::const_iterator it = HFRecHits->begin(); it != HFRecHits->end(); ++it) {
+        HFRecHitStorage_.insert(HFRecHitMap::value_type((it->id()), *it));
 
 #ifdef DEBUG
-        LogDebug("DataMixingEMWorker") << "processed HFRecHit with rawId: "
-				       << it->id().rawId() << "\n"
-				       << " rechit energy: " << it->energy();
+        LogDebug("DataMixingEMWorker") << "processed HFRecHit with rawId: " << it->id().rawId() << "\n"
+                                       << " rechit energy: " << it->energy();
 #endif
       }
     }
 
     // ZDC Next
 
-    std::shared_ptr<Wrapper<ZDCRecHitCollection>  const> ZDCRecHitsPTR =
-      getProductByTag<ZDCRecHitCollection>(*ep, ZDCPileRecHitInputTag_, mcc);
-
-    if(ZDCRecHitsPTR ) {
+    std::shared_ptr<Wrapper<ZDCRecHitCollection> const> ZDCRecHitsPTR =
+        getProductByTag<ZDCRecHitCollection>(*ep, ZDCPileRecHitInputTag_, mcc);
 
-      const ZDCRecHitCollection*  ZDCRecHits = const_cast< ZDCRecHitCollection * >(ZDCRecHitsPTR->product());
+    if (ZDCRecHitsPTR) {
+      const ZDCRecHitCollection *ZDCRecHits = const_cast<ZDCRecHitCollection *>(ZDCRecHitsPTR->product());
 
       LogDebug("DataMixingEMWorker") << "total # ZDC rechits: " << ZDCRecHits->size();
 
-      // loop over rechits, adding these to the existing maps                                                     
-      for(ZDCRecHitCollection::const_iterator it  = ZDCRecHits->begin();
-          it != ZDCRecHits->end(); ++it) {
-
-        ZDCRecHitStorage_.insert(ZDCRecHitMap::value_type( (it->id()), *it ));
+      // loop over rechits, adding these to the existing maps
+      for (ZDCRecHitCollection::const_iterator it = ZDCRecHits->begin(); it != ZDCRecHits->end(); ++it) {
+        ZDCRecHitStorage_.insert(ZDCRecHitMap::value_type((it->id()), *it));
 
 #ifdef DEBUG
-        LogDebug("DataMixingEMWorker") << "processed ZDCRecHit with rawId: "
-				       << it->id().rawId() << "\n"
-				       << " rechit energy: " << it->energy();
+        LogDebug("DataMixingEMWorker") << "processed ZDCRecHit with rawId: " << it->id().rawId() << "\n"
+                                       << " rechit energy: " << it->energy();
 #endif
       }
     }
-
-
   }
- 
-  void DataMixingHcalWorker::putHcal(edm::Event &e) {
 
+  void DataMixingHcalWorker::putHcal(edm::Event &e) {
     // collection of rechits to put in the event
-    std::unique_ptr< HBHERecHitCollection > HBHErechits( new HBHERecHitCollection );
-    std::unique_ptr< HORecHitCollection > HOrechits( new HORecHitCollection );
-    std::unique_ptr< HFRecHitCollection > HFrechits( new HFRecHitCollection );
-    std::unique_ptr< ZDCRecHitCollection > ZDCrechits( new ZDCRecHitCollection );
+    std::unique_ptr<HBHERecHitCollection> HBHErechits(new HBHERecHitCollection);
+    std::unique_ptr<HORecHitCollection> HOrechits(new HORecHitCollection);
+    std::unique_ptr<HFRecHitCollection> HFrechits(new HFRecHitCollection);
+    std::unique_ptr<ZDCRecHitCollection> ZDCrechits(new ZDCRecHitCollection);
 
-    // loop over the maps we have, re-making individual hits or rechits if necessary.
+    // loop over the maps we have, re-making individual hits or rechits if
+    // necessary.
     DetId formerID = 0;
     DetId currentID;
     float ESum = 0.;
@@ -325,115 +281,108 @@ namespace edm
 
     HBHERecHitMap::const_iterator iHBchk;
 
-    for(HBHERecHitMap::const_iterator iHB  = HBHERecHitStorage_.begin();
-	iHB != HBHERecHitStorage_.end(); ++iHB) {
-
-      currentID = iHB->first; 
+    for (HBHERecHitMap::const_iterator iHB = HBHERecHitStorage_.begin(); iHB != HBHERecHitStorage_.end(); ++iHB) {
+      currentID = iHB->first;
 
-      if (currentID == formerID) { // we have to add these rechits together
+      if (currentID == formerID) {  // we have to add these rechits together
 
-	ESum+=(iHB->second).energy();  
+        ESum += (iHB->second).energy();
 
-      }
-      else {
-	if(formerID>0) {
-	  // cutoff for ESum?                                                                                 
-	  HBHERecHit aHit(formerID, ESum, HBTime);
-	  HBHErechits->push_back( aHit );
-	}
-	//save pointers for next iteration                                                                    
-	formerID = currentID;
-	ESum = (iHB->second).energy();
-	HBTime = (iHB->second).time();  // take time of first hit in sequence - is this ok?
+      } else {
+        if (formerID > 0) {
+          // cutoff for ESum?
+          HBHERecHit aHit(formerID, ESum, HBTime);
+          HBHErechits->push_back(aHit);
+        }
+        // save pointers for next iteration
+        formerID = currentID;
+        ESum = (iHB->second).energy();
+        HBTime = (iHB->second).time();  // take time of first hit in sequence - is this ok?
       }
 
       iHBchk = iHB;
-      if((++iHBchk) == HBHERecHitStorage_.end()) {  //make sure not to lose the last one  
+      if ((++iHBchk) == HBHERecHitStorage_.end()) {  // make sure not to lose the last one
         HBHERecHit aHit(formerID, ESum, HBTime);
-        HBHErechits->push_back( aHit );
+        HBHErechits->push_back(aHit);
       }
     }
 
     // HO next...
 
-    // loop over the maps we have, re-making individual hits or rechits if necessary.
+    // loop over the maps we have, re-making individual hits or rechits if
+    // necessary.
     formerID = 0;
     ESum = 0.;
     float HOTime = 0.;
 
     HORecHitMap::const_iterator iHOchk;
 
-    for(HORecHitMap::const_iterator iHO  = HORecHitStorage_.begin();
-	iHO != HORecHitStorage_.end(); ++iHO) {
-
-      currentID = iHO->first; 
+    for (HORecHitMap::const_iterator iHO = HORecHitStorage_.begin(); iHO != HORecHitStorage_.end(); ++iHO) {
+      currentID = iHO->first;
 
-      if (currentID == formerID) { // we have to add these rechits together
+      if (currentID == formerID) {  // we have to add these rechits together
 
-	ESum+=(iHO->second).energy();  
+        ESum += (iHO->second).energy();
 
-      }
-      else {
-	if(formerID>0) {
-	  // cutoff for ESum?                                                                                 
-	  HORecHit aHit(formerID, ESum, HOTime);
-	  HOrechits->push_back( aHit );
-	}
-	//save pointers for next iteration                                                                    
-	formerID = currentID;
-	ESum = (iHO->second).energy();
-	HOTime = (iHO->second).time();  // take time of first hit in sequence - is this ok?
+      } else {
+        if (formerID > 0) {
+          // cutoff for ESum?
+          HORecHit aHit(formerID, ESum, HOTime);
+          HOrechits->push_back(aHit);
+        }
+        // save pointers for next iteration
+        formerID = currentID;
+        ESum = (iHO->second).energy();
+        HOTime = (iHO->second).time();  // take time of first hit in sequence - is this ok?
       }
 
       iHOchk = iHO;
-      if((++iHOchk) == HORecHitStorage_.end()) {  //make sure not to lose the last one  
+      if ((++iHOchk) == HORecHitStorage_.end()) {  // make sure not to lose the last one
         HORecHit aHit(formerID, ESum, HOTime);
-        HOrechits->push_back( aHit );
+        HOrechits->push_back(aHit);
       }
     }
 
-
     // HF next...
 
-    // loop over the maps we have, re-making individual hits or rechits if necessary.
+    // loop over the maps we have, re-making individual hits or rechits if
+    // necessary.
     formerID = 0;
     ESum = 0.;
     float HFTime = 0.;
 
     HFRecHitMap::const_iterator iHFchk;
 
-    for(HFRecHitMap::const_iterator iHF  = HFRecHitStorage_.begin();
-	iHF != HFRecHitStorage_.end(); ++iHF) {
+    for (HFRecHitMap::const_iterator iHF = HFRecHitStorage_.begin(); iHF != HFRecHitStorage_.end(); ++iHF) {
+      currentID = iHF->first;
 
-      currentID = iHF->first; 
+      if (currentID == formerID) {  // we have to add these rechits together
 
-      if (currentID == formerID) { // we have to add these rechits together
+        ESum += (iHF->second).energy();
 
-	ESum+=(iHF->second).energy();  
-
-      }
-      else {
-	if(formerID>0) {
-	  // cutoff for ESum?                                                                                 
-	  HFRecHit aHit(formerID, ESum, HFTime);
-	  HFrechits->push_back( aHit );
-	}
-	//save pointers for next iteration                                                                    
-	formerID = currentID;
-	ESum = (iHF->second).energy();
-	HFTime = (iHF->second).time();  // take time of first hit in sequence - is this ok?
+      } else {
+        if (formerID > 0) {
+          // cutoff for ESum?
+          HFRecHit aHit(formerID, ESum, HFTime);
+          HFrechits->push_back(aHit);
+        }
+        // save pointers for next iteration
+        formerID = currentID;
+        ESum = (iHF->second).energy();
+        HFTime = (iHF->second).time();  // take time of first hit in sequence - is this ok?
       }
 
       iHFchk = iHF;
-      if((++iHFchk) == HFRecHitStorage_.end()) {  //make sure not to lose the last one  
+      if ((++iHFchk) == HFRecHitStorage_.end()) {  // make sure not to lose the last one
         HFRecHit aHit(formerID, ESum, HBTime);
-        HFrechits->push_back( aHit );
+        HFrechits->push_back(aHit);
       }
     }
 
     // ZDC next...
 
-    // loop over the maps we have, re-making individual hits or rechits if necessary.
+    // loop over the maps we have, re-making individual hits or rechits if
+    // necessary.
     formerID = 0;
     ESum = 0.;
     float ZDCTime = 0.;
@@ -442,55 +391,51 @@ namespace edm
 
     ZDCRecHitMap::const_iterator iZDCchk;
 
-    for(ZDCRecHitMap::const_iterator iZDC  = ZDCRecHitStorage_.begin();
-	iZDC != ZDCRecHitStorage_.end(); ++iZDC) {
+    for (ZDCRecHitMap::const_iterator iZDC = ZDCRecHitStorage_.begin(); iZDC != ZDCRecHitStorage_.end(); ++iZDC) {
+      currentID = iZDC->first;
 
-      currentID = iZDC->first; 
+      if (currentID == formerID) {  // we have to add these rechits together
 
-      if (currentID == formerID) { // we have to add these rechits together
+        ESum += (iZDC->second).energy();
 
-	ESum+=(iZDC->second).energy();  
-	
+      } else {
+        if (formerID > 0) {
+          // cutoff for ESum?
+          ZDCRecHit aHit(formerID, ESum, ZDCTime, lowGainEnergy);
+          ZDCrechits->push_back(aHit);
+        }
+        // save pointers for next iteration
+        formerID = currentID;
+        ESum = (iZDC->second).energy();
+        lowGainEnergy = (iZDC->second).lowGainEnergy();
+        ZDCTime = (iZDC->second).time();  // take time of first hit in sequence - is this ok?
       }
-      else {
-	if(formerID>0) {
-	  // cutoff for ESum?                                                                                 
-	  ZDCRecHit aHit(formerID, ESum, ZDCTime, lowGainEnergy);
-	  ZDCrechits->push_back( aHit );
-	}
-	//save pointers for next iteration                                                                    
-	formerID = currentID;
-	ESum = (iZDC->second).energy();
-	lowGainEnergy = (iZDC->second).lowGainEnergy();
-	ZDCTime = (iZDC->second).time();  // take time of first hit in sequence - is this ok?
-      }
-      
+
       iZDCchk = iZDC;
-      if((++iZDCchk) == ZDCRecHitStorage_.end()) {  //make sure not to lose the last one  
-	ZDCRecHit aHit(formerID, ESum, HBTime, lowGainEnergy);
-	ZDCrechits->push_back( aHit );
+      if ((++iZDCchk) == ZDCRecHitStorage_.end()) {  // make sure not to lose the last one
+        ZDCRecHit aHit(formerID, ESum, HBTime, lowGainEnergy);
+        ZDCrechits->push_back(aHit);
       }
-    } 
-  
-   //done merging
+    }
+
+    // done merging
 
-    // put the collection of recunstructed hits in the event   
-    LogInfo("DataMixingHcalWorker") << "total # HBHE Merged rechits: " << HBHErechits->size() ;
-    LogInfo("DataMixingHcalWorker") << "total # HO Merged rechits: " << HOrechits->size() ;
-    LogInfo("DataMixingHcalWorker") << "total # HF Merged rechits: " << HFrechits->size() ;
-    LogInfo("DataMixingHcalWorker") << "total # ZDC Merged rechits: " << ZDCrechits->size() ;
+    // put the collection of recunstructed hits in the event
+    LogInfo("DataMixingHcalWorker") << "total # HBHE Merged rechits: " << HBHErechits->size();
+    LogInfo("DataMixingHcalWorker") << "total # HO Merged rechits: " << HOrechits->size();
+    LogInfo("DataMixingHcalWorker") << "total # HF Merged rechits: " << HFrechits->size();
+    LogInfo("DataMixingHcalWorker") << "total # ZDC Merged rechits: " << ZDCrechits->size();
 
-    e.put(std::move(HBHErechits), HBHERecHitCollectionDM_ );
-    e.put(std::move(HOrechits), HORecHitCollectionDM_ );
-    e.put(std::move(HFrechits), HFRecHitCollectionDM_ );
-    e.put(std::move(ZDCrechits), ZDCRecHitCollectionDM_ );
+    e.put(std::move(HBHErechits), HBHERecHitCollectionDM_);
+    e.put(std::move(HOrechits), HORecHitCollectionDM_);
+    e.put(std::move(HFrechits), HFRecHitCollectionDM_);
+    e.put(std::move(ZDCrechits), ZDCRecHitCollectionDM_);
 
     // clear local storage after this event
     HBHERecHitStorage_.clear();
     HORecHitStorage_.clear();
     HFRecHitStorage_.clear();
     ZDCRecHitStorage_.clear();
-
   }
 
-} //edm
+}  // namespace edm
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingHcalWorker.h b/SimGeneral/DataMixingModule/plugins/DataMixingHcalWorker.h
index bc1d79de0af5f..3013a11de24bf 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingHcalWorker.h
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingHcalWorker.h
@@ -3,7 +3,7 @@
 
 /** \class DataMixingHcalWorker
  *
- * DataMixingModule is the EDProducer subclass 
+ * DataMixingModule is the EDProducer subclass
  * that overlays rawdata events on top of MC,
  * using real data for pileup simulation
  * This class takes care of the Hcal information
@@ -14,87 +14,87 @@
  *
  ************************************************************/
 
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventPrincipal.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 
-#include "DataFormats/Provenance/interface/ProductID.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
+#include "DataFormats/Provenance/interface/ProductID.h"
 
 #include <map>
-#include <vector>
 #include <string>
+#include <vector>
 
-
-namespace edm
-{
+namespace edm {
   class ModuleCallingContext;
 
-  class DataMixingHcalWorker
-    {
-    public:
-
-      DataMixingHcalWorker();
-
-     /** standard constructor*/
-      explicit DataMixingHcalWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC);
-
-      /**Default destructor*/
-      virtual ~DataMixingHcalWorker();
-
-      void putHcal(edm::Event &e) ;
-      void addHcalSignals(const edm::Event &e); 
-      void addHcalPileups(const int bcr, const edm::EventPrincipal*,unsigned int EventId,
-                          ModuleCallingContext const*);
-
-
-    private:
-      // data specifiers
-
-      // Hcal
-      edm::InputTag HBHErechitCollectionSig_; // secondary name given to collection of EB rechits
-      edm::InputTag HOrechitCollectionSig_  ; // secondary name given to collection of EB rechits
-      edm::InputTag HFrechitCollectionSig_  ; // secondary name given to collection of EB rechits
-      edm::InputTag ZDCrechitCollectionSig_ ; // secondary name given to collection of EB rechits
-
-      edm::InputTag HBHEPileRecHitInputTag_ ; // InputTag for HB RecHits for Pileup
-      edm::InputTag HOPileRecHitInputTag_   ; // InputTag for HO RecHits for Pileup 
-      edm::InputTag HFPileRecHitInputTag_   ; // InputTag for HF RecHits for Pileup 
-      edm::InputTag ZDCPileRecHitInputTag_  ; // InputTag for ZDC RecHits for Pileup 
-
-      edm::EDGetTokenT<HBHERecHitCollection> HBHERecHitToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<HORecHitCollection> HORecHitToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<HFRecHitCollection> HFRecHitToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<ZDCRecHitCollection> ZDCRecHitToken_ ;  // Token to retrieve information 
-
-      edm::EDGetTokenT<HBHERecHitCollection> HBHERecHitPToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<HORecHitCollection> HORecHitPToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<HFRecHitCollection> HFRecHitPToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<ZDCRecHitCollection> ZDCRecHitPToken_ ;  // Token to retrieve information 
-
-      std::string HBHERecHitCollectionDM_; // secondary name to be given to EB collection of hits
-      std::string HORecHitCollectionDM_  ; // secondary name to be given to EB collection of hits
-      std::string HFRecHitCollectionDM_  ; // secondary name to be given to EB collection of hits
-      std::string ZDCRecHitCollectionDM_ ; // secondary name to be given to EB collection of hits
-
-      typedef std::multimap<DetId, HBHERecHit> HBHERecHitMap;
-      typedef std::multimap<DetId, HFRecHit>   HFRecHitMap;
-      typedef std::multimap<DetId, HORecHit>   HORecHitMap;
-      typedef std::multimap<DetId, ZDCRecHit>  ZDCRecHitMap;
-
-      HBHERecHitMap HBHERecHitStorage_;
-      HFRecHitMap   HFRecHitStorage_;
-      HORecHitMap   HORecHitStorage_;
-      ZDCRecHitMap  ZDCRecHitStorage_;
-
-
-      //      unsigned int eventId_; //=0 for signal, from 1-n for pileup events
-
-      std::string label_;
-
-    };
-}//edm
-
-#endif // SimDataMixingHcalWorker_h
+  class DataMixingHcalWorker {
+  public:
+    DataMixingHcalWorker();
+
+    /** standard constructor*/
+    explicit DataMixingHcalWorker(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC);
+
+    /**Default destructor*/
+    virtual ~DataMixingHcalWorker();
+
+    void putHcal(edm::Event &e);
+    void addHcalSignals(const edm::Event &e);
+    void addHcalPileups(const int bcr, const edm::EventPrincipal *, unsigned int EventId, ModuleCallingContext const *);
+
+  private:
+    // data specifiers
+
+    // Hcal
+    edm::InputTag HBHErechitCollectionSig_;  // secondary name given to collection
+                                             // of EB rechits
+    edm::InputTag HOrechitCollectionSig_;    // secondary name given to collection of
+                                             // EB rechits
+    edm::InputTag HFrechitCollectionSig_;    // secondary name given to collection of
+                                             // EB rechits
+    edm::InputTag ZDCrechitCollectionSig_;   // secondary name given to collection
+                                             // of EB rechits
+
+    edm::InputTag HBHEPileRecHitInputTag_;  // InputTag for HB RecHits for Pileup
+    edm::InputTag HOPileRecHitInputTag_;    // InputTag for HO RecHits for Pileup
+    edm::InputTag HFPileRecHitInputTag_;    // InputTag for HF RecHits for Pileup
+    edm::InputTag ZDCPileRecHitInputTag_;   // InputTag for ZDC RecHits for Pileup
+
+    edm::EDGetTokenT<HBHERecHitCollection> HBHERecHitToken_;  // Token to retrieve information
+    edm::EDGetTokenT<HORecHitCollection> HORecHitToken_;      // Token to retrieve information
+    edm::EDGetTokenT<HFRecHitCollection> HFRecHitToken_;      // Token to retrieve information
+    edm::EDGetTokenT<ZDCRecHitCollection> ZDCRecHitToken_;    // Token to retrieve information
+
+    edm::EDGetTokenT<HBHERecHitCollection> HBHERecHitPToken_;  // Token to retrieve information
+    edm::EDGetTokenT<HORecHitCollection> HORecHitPToken_;      // Token to retrieve information
+    edm::EDGetTokenT<HFRecHitCollection> HFRecHitPToken_;      // Token to retrieve information
+    edm::EDGetTokenT<ZDCRecHitCollection> ZDCRecHitPToken_;    // Token to retrieve information
+
+    std::string HBHERecHitCollectionDM_;  // secondary name to be given to EB
+                                          // collection of hits
+    std::string HORecHitCollectionDM_;    // secondary name to be given to EB
+                                          // collection of hits
+    std::string HFRecHitCollectionDM_;    // secondary name to be given to EB
+                                          // collection of hits
+    std::string ZDCRecHitCollectionDM_;   // secondary name to be given to EB
+                                          // collection of hits
+
+    typedef std::multimap<DetId, HBHERecHit> HBHERecHitMap;
+    typedef std::multimap<DetId, HFRecHit> HFRecHitMap;
+    typedef std::multimap<DetId, HORecHit> HORecHitMap;
+    typedef std::multimap<DetId, ZDCRecHit> ZDCRecHitMap;
+
+    HBHERecHitMap HBHERecHitStorage_;
+    HFRecHitMap HFRecHitStorage_;
+    HORecHitMap HORecHitStorage_;
+    ZDCRecHitMap ZDCRecHitStorage_;
+
+    //      unsigned int eventId_; //=0 for signal, from 1-n for pileup events
+
+    std::string label_;
+  };
+}  // namespace edm
+
+#endif  // SimDataMixingHcalWorker_h
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingModule.cc b/SimGeneral/DataMixingModule/plugins/DataMixingModule.cc
index b3e84b5855614..776028b92e5d3 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingModule.cc
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingModule.cc
@@ -4,44 +4,42 @@
 //
 //--------------------------------------------
 
-#include <map>
+#include <functional>
 #include <iostream>
+#include <map>
 #include <memory>
-#include <functional>
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/ModuleContextSentry.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/InternalContext.h"
 #include "FWCore/ServiceRegistry/interface/ModuleCallingContext.h"
 #include "FWCore/ServiceRegistry/interface/ParentContext.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
-#include "DataFormats/Common/interface/Handle.h"
 //
 //
-#include "SimDataFormats/CrossingFrame/interface/CrossingFramePlaybackInfoNew.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataMixingModule.h"
+#include "SimDataFormats/CrossingFrame/interface/CrossingFramePlaybackInfoNew.h"
 #include "SimGeneral/MixingModule/interface/PileUpEventPrincipal.h"
 
 using namespace std;
 
-namespace edm
-{
-
-  // Constructor 
-  DataMixingModule::DataMixingModule(const edm::ParameterSet& ps, MixingCache::Config const* globalConf) :
-    BMixingModule(ps, globalConf),
-    EBPileInputTag_(ps.getParameter<edm::InputTag>("EBPileInputTag")),
-    EEPileInputTag_(ps.getParameter<edm::InputTag>("EEPileInputTag")),
-    ESPileInputTag_(ps.getParameter<edm::InputTag>("ESPileInputTag")),
-    HBHEPileInputTag_(ps.getParameter<edm::InputTag>("HBHEPileInputTag")),
-    HOPileInputTag_(ps.getParameter<edm::InputTag>("HOPileInputTag")),
-    HFPileInputTag_(ps.getParameter<edm::InputTag>("HFPileInputTag")),
-    ZDCPileInputTag_(ps.getParameter<edm::InputTag>("ZDCPileInputTag")),
-    QIE10PileInputTag_(ps.getParameter<edm::InputTag>("QIE10PileInputTag")),
-    QIE11PileInputTag_(ps.getParameter<edm::InputTag>("QIE11PileInputTag")),
-							    label_(ps.getParameter<std::string>("Label"))
-  {  
+namespace edm {
+
+  // Constructor
+  DataMixingModule::DataMixingModule(const edm::ParameterSet &ps, MixingCache::Config const *globalConf)
+      : BMixingModule(ps, globalConf),
+        EBPileInputTag_(ps.getParameter<edm::InputTag>("EBPileInputTag")),
+        EEPileInputTag_(ps.getParameter<edm::InputTag>("EEPileInputTag")),
+        ESPileInputTag_(ps.getParameter<edm::InputTag>("ESPileInputTag")),
+        HBHEPileInputTag_(ps.getParameter<edm::InputTag>("HBHEPileInputTag")),
+        HOPileInputTag_(ps.getParameter<edm::InputTag>("HOPileInputTag")),
+        HFPileInputTag_(ps.getParameter<edm::InputTag>("HFPileInputTag")),
+        ZDCPileInputTag_(ps.getParameter<edm::InputTag>("ZDCPileInputTag")),
+        QIE10PileInputTag_(ps.getParameter<edm::InputTag>("QIE10PileInputTag")),
+        QIE11PileInputTag_(ps.getParameter<edm::InputTag>("QIE11PileInputTag")),
+        label_(ps.getParameter<std::string>("Label")) {
     // prepare for data access in DataMixingHcalDigiWorkerProd
     tok_hbhe_ = consumes<HBHEDigitizerTraits::DigiCollection>(HBHEPileInputTag_);
     tok_ho_ = consumes<HODigitizerTraits::DigiCollection>(HOPileInputTag_);
@@ -51,153 +49,153 @@ namespace edm
     tok_qie11_ = consumes<HcalQIE11DigitizerTraits::DigiCollection>(QIE11PileInputTag_);
 
     // get the subdetector names
-    this->getSubdetectorNames();  //something like this may be useful to check what we are supposed to do...
+    this->getSubdetectorNames();  // something like this may be useful to check
+                                  // what we are supposed to do...
 
-    // For now, list all of them here.  Later, make this selectable with input parameters
-    // 
+    // For now, list all of them here.  Later, make this selectable with input
+    // parameters
+    //
 
     // Check to see if we are working in Full or Fast Simulation
 
     MergeTrackerDigis_ = (ps.getParameter<std::string>("TrackerMergeType")) == "Digis";
     MergeEMDigis_ = (ps.getParameter<std::string>("EcalMergeType")) == "Digis";
     MergeHcalDigis_ = (ps.getParameter<std::string>("HcalMergeType")) == "Digis";
-    if(MergeHcalDigis_) MergeHcalDigisProd_ = (ps.getParameter<std::string>("HcalDigiMerge")=="FullProd");
+    if (MergeHcalDigis_)
+      MergeHcalDigisProd_ = (ps.getParameter<std::string>("HcalDigiMerge") == "FullProd");
 
     // Put Fast Sim Sequences here for Simplification: Fewer options!
 
-    
-    if(MergeEMDigis_) {
-
+    if (MergeEMDigis_) {
       // cout<<"EM Digis TRUE!!!"<<endl;
 
-      EBDigiCollectionDM_        = ps.getParameter<std::string>("EBDigiCollectionDM");
-      EEDigiCollectionDM_        = ps.getParameter<std::string>("EEDigiCollectionDM");
-      ESDigiCollectionDM_        = ps.getParameter<std::string>("ESDigiCollectionDM");
-      //   nMaxPrintout_            = ps.getUntrackedParameter<int>("nMaxPrintout",10);
-
-      produces< EBDigiCollection >(EBDigiCollectionDM_);
-      produces< EEDigiCollection >(EEDigiCollectionDM_);
-      produces< ESDigiCollection >(ESDigiCollectionDM_);
+      EBDigiCollectionDM_ = ps.getParameter<std::string>("EBDigiCollectionDM");
+      EEDigiCollectionDM_ = ps.getParameter<std::string>("EEDigiCollectionDM");
+      ESDigiCollectionDM_ = ps.getParameter<std::string>("ESDigiCollectionDM");
+      //   nMaxPrintout_            =
+      //   ps.getUntrackedParameter<int>("nMaxPrintout",10);
 
+      produces<EBDigiCollection>(EBDigiCollectionDM_);
+      produces<EEDigiCollection>(EEDigiCollectionDM_);
+      produces<ESDigiCollection>(ESDigiCollectionDM_);
 
       EMDigiWorker_ = new DataMixingEMDigiWorker(ps, consumesCollector());
-    }
-    else { // merge RecHits 
-      EBRecHitCollectionDM_        = ps.getParameter<std::string>("EBRecHitCollectionDM");
-      EERecHitCollectionDM_        = ps.getParameter<std::string>("EERecHitCollectionDM");
-      ESRecHitCollectionDM_        = ps.getParameter<std::string>("ESRecHitCollectionDM");
-      //   nMaxPrintout_            = ps.getUntrackedParameter<int>("nMaxPrintout",10);
+    } else {  // merge RecHits
+      EBRecHitCollectionDM_ = ps.getParameter<std::string>("EBRecHitCollectionDM");
+      EERecHitCollectionDM_ = ps.getParameter<std::string>("EERecHitCollectionDM");
+      ESRecHitCollectionDM_ = ps.getParameter<std::string>("ESRecHitCollectionDM");
+      //   nMaxPrintout_            =
+      //   ps.getUntrackedParameter<int>("nMaxPrintout",10);
 
-      produces< EBRecHitCollection >(EBRecHitCollectionDM_);
-      produces< EERecHitCollection >(EERecHitCollectionDM_);
-      produces< ESRecHitCollection >(ESRecHitCollectionDM_);
+      produces<EBRecHitCollection>(EBRecHitCollectionDM_);
+      produces<EERecHitCollection>(EERecHitCollectionDM_);
+      produces<ESRecHitCollection>(ESRecHitCollectionDM_);
 
       EMWorker_ = new DataMixingEMWorker(ps, consumesCollector());
     }
     // Hcal next
 
-    if(MergeHcalDigis_){
+    if (MergeHcalDigis_) {
       HBHEDigiCollectionDM_ = ps.getParameter<std::string>("HBHEDigiCollectionDM");
-      HODigiCollectionDM_   = ps.getParameter<std::string>("HODigiCollectionDM");
-      HFDigiCollectionDM_   = ps.getParameter<std::string>("HFDigiCollectionDM");
-      ZDCDigiCollectionDM_  = ps.getParameter<std::string>("ZDCDigiCollectionDM");
-      QIE10DigiCollectionDM_  = ps.getParameter<std::string>("QIE10DigiCollectionDM");
-      QIE11DigiCollectionDM_  = ps.getParameter<std::string>("QIE11DigiCollectionDM");
+      HODigiCollectionDM_ = ps.getParameter<std::string>("HODigiCollectionDM");
+      HFDigiCollectionDM_ = ps.getParameter<std::string>("HFDigiCollectionDM");
+      ZDCDigiCollectionDM_ = ps.getParameter<std::string>("ZDCDigiCollectionDM");
+      QIE10DigiCollectionDM_ = ps.getParameter<std::string>("QIE10DigiCollectionDM");
+      QIE11DigiCollectionDM_ = ps.getParameter<std::string>("QIE11DigiCollectionDM");
 
-      produces< HBHEDigiCollection >();
-      produces< HODigiCollection >();
-      produces< HFDigiCollection >();
-      produces< ZDCDigiCollection >();
+      produces<HBHEDigiCollection>();
+      produces<HODigiCollection>();
+      produces<HFDigiCollection>();
+      produces<ZDCDigiCollection>();
 
       produces<QIE10DigiCollection>("HFQIE10DigiCollection");
       produces<QIE11DigiCollection>("HBHEQIE11DigiCollection");
 
-      if(ps.getParameter<bool>("debugCaloSamples")){
+      if (ps.getParameter<bool>("debugCaloSamples")) {
         produces<CaloSamplesCollection>("HcalSamples");
       }
-      if(ps.getParameter<bool>("injectTestHits")){
+      if (ps.getParameter<bool>("injectTestHits")) {
         produces<edm::PCaloHitContainer>("HcalHits");
       }
 
-      if(MergeHcalDigisProd_) HcalDigiWorkerProd_ = new DataMixingHcalDigiWorkerProd(ps, consumesCollector());
-      else HcalDigiWorker_ = new DataMixingHcalDigiWorker(ps, consumesCollector());
+      if (MergeHcalDigisProd_)
+        HcalDigiWorkerProd_ = new DataMixingHcalDigiWorkerProd(ps, consumesCollector());
+      else
+        HcalDigiWorker_ = new DataMixingHcalDigiWorker(ps, consumesCollector());
 
-    }
-    else{
+    } else {
       HBHERecHitCollectionDM_ = ps.getParameter<std::string>("HBHERecHitCollectionDM");
-      HORecHitCollectionDM_   = ps.getParameter<std::string>("HORecHitCollectionDM");
-      HFRecHitCollectionDM_   = ps.getParameter<std::string>("HFRecHitCollectionDM");
-      ZDCRecHitCollectionDM_  = ps.getParameter<std::string>("ZDCRecHitCollectionDM");
+      HORecHitCollectionDM_ = ps.getParameter<std::string>("HORecHitCollectionDM");
+      HFRecHitCollectionDM_ = ps.getParameter<std::string>("HFRecHitCollectionDM");
+      ZDCRecHitCollectionDM_ = ps.getParameter<std::string>("ZDCRecHitCollectionDM");
 
-      produces< HBHERecHitCollection >(HBHERecHitCollectionDM_);
-      produces< HORecHitCollection >(HORecHitCollectionDM_);
-      produces< HFRecHitCollection >(HFRecHitCollectionDM_);
-      produces< ZDCRecHitCollection >(ZDCRecHitCollectionDM_);
+      produces<HBHERecHitCollection>(HBHERecHitCollectionDM_);
+      produces<HORecHitCollection>(HORecHitCollectionDM_);
+      produces<HFRecHitCollection>(HFRecHitCollectionDM_);
+      produces<ZDCRecHitCollection>(ZDCRecHitCollectionDM_);
 
       HcalWorker_ = new DataMixingHcalWorker(ps, consumesCollector());
     }
 
     // Muons
 
-    DTDigiCollectionDM_  = ps.getParameter<std::string>("DTDigiCollectionDM");
+    DTDigiCollectionDM_ = ps.getParameter<std::string>("DTDigiCollectionDM");
     RPCDigiCollectionDM_ = ps.getParameter<std::string>("RPCDigiCollectionDM");
     CSCStripDigiCollectionDM_ = ps.getParameter<std::string>("CSCStripDigiCollectionDM");
-    CSCWireDigiCollectionDM_  = ps.getParameter<std::string>("CSCWireDigiCollectionDM");
-    CSCComparatorDigiCollectionDM_  = ps.getParameter<std::string>("CSCComparatorDigiCollectionDM");
+    CSCWireDigiCollectionDM_ = ps.getParameter<std::string>("CSCWireDigiCollectionDM");
+    CSCComparatorDigiCollectionDM_ = ps.getParameter<std::string>("CSCComparatorDigiCollectionDM");
 
-
-    produces< DTDigiCollection >();
-    produces< RPCDigiCollection >();
-    produces< CSCStripDigiCollection >(CSCStripDigiCollectionDM_);
-    produces< CSCWireDigiCollection >(CSCWireDigiCollectionDM_);
-    produces< CSCComparatorDigiCollection >(CSCComparatorDigiCollectionDM_);
+    produces<DTDigiCollection>();
+    produces<RPCDigiCollection>();
+    produces<CSCStripDigiCollection>(CSCStripDigiCollectionDM_);
+    produces<CSCWireDigiCollection>(CSCWireDigiCollectionDM_);
+    produces<CSCComparatorDigiCollection>(CSCComparatorDigiCollectionDM_);
 
     MuonWorker_ = new DataMixingMuonWorker(ps, consumesCollector());
 
-
     // Si-Strips
 
-    useSiStripRawDigi_ = ps.exists("SiStripRawDigiSource")?
-      ps.getParameter<std::string>("SiStripRawDigiSource")=="PILEUP" ||
-      ps.getParameter<std::string>("SiStripRawDigiSource")=="SIGNAL" : false;
-
-    SiStripDigiCollectionDM_  = ps.getParameter<std::string>("SiStripDigiCollectionDM");
+    useSiStripRawDigi_ = ps.exists("SiStripRawDigiSource")
+                             ? ps.getParameter<std::string>("SiStripRawDigiSource") == "PILEUP" ||
+                                   ps.getParameter<std::string>("SiStripRawDigiSource") == "SIGNAL"
+                             : false;
 
-    if(useSiStripRawDigi_) {
+    SiStripDigiCollectionDM_ = ps.getParameter<std::string>("SiStripDigiCollectionDM");
 
-      produces< edm::DetSetVector<SiStripRawDigi> > (SiStripDigiCollectionDM_);
+    if (useSiStripRawDigi_) {
+      produces<edm::DetSetVector<SiStripRawDigi>>(SiStripDigiCollectionDM_);
       SiStripRawWorker_ = new DataMixingSiStripRawWorker(ps, consumesCollector());
 
     } else {
-
-      produces< edm::DetSetVector<SiStripDigi> > (SiStripDigiCollectionDM_);
+      produces<edm::DetSetVector<SiStripDigi>>(SiStripDigiCollectionDM_);
 
       SiStripWorker_ = new DataMixingSiStripWorker(ps, consumesCollector());
     }
 
     // Pixels
 
-    PixelDigiCollectionDM_  = ps.getParameter<std::string>("PixelDigiCollectionDM");
+    PixelDigiCollectionDM_ = ps.getParameter<std::string>("PixelDigiCollectionDM");
 
-    produces< edm::DetSetVector<PixelDigi> > (PixelDigiCollectionDM_);
+    produces<edm::DetSetVector<PixelDigi>>(PixelDigiCollectionDM_);
 
     SiPixelWorker_ = new DataMixingSiPixelWorker(ps, consumesCollector());
 
-
-    // Pileup Information: if doing pre-mixing, we have to save the pileup information from the Secondary stream
+    // Pileup Information: if doing pre-mixing, we have to save the pileup
+    // information from the Secondary stream
 
     MergePileup_ = ps.getParameter<bool>("MergePileupInfo");
 
-    if(MergePileup_) {
-      produces< std::vector<PileupSummaryInfo> >();
-      produces< int >("bunchSpacing");
+    if (MergePileup_) {
+      produces<std::vector<PileupSummaryInfo>>();
+      produces<int>("bunchSpacing");
       produces<CrossingFramePlaybackInfoNew>();
 
       std::vector<edm::InputTag> GenPUProtonsInputTags;
-      GenPUProtonsInputTags = ps.getParameter<std::vector<edm::InputTag> >("GenPUProtonsInputTags");
-      for(std::vector<edm::InputTag>::const_iterator it_InputTag = GenPUProtonsInputTags.begin(); 
-                                                     it_InputTag != GenPUProtonsInputTags.end(); ++it_InputTag) 
-         produces< std::vector<reco::GenParticle> >( it_InputTag->label() );
+      GenPUProtonsInputTags = ps.getParameter<std::vector<edm::InputTag>>("GenPUProtonsInputTags");
+      for (std::vector<edm::InputTag>::const_iterator it_InputTag = GenPUProtonsInputTags.begin();
+           it_InputTag != GenPUProtonsInputTags.end();
+           ++it_InputTag)
+        produces<std::vector<reco::GenParticle>>(it_InputTag->label());
 
       PUWorker_ = new DataMixingPileupCopy(ps, consumesCollector());
     }
@@ -207,166 +205,179 @@ namespace edm
     // get subdetector names
     // edm::Service<edm::ConstProductRegistry> reg;
     // Loop over provenance of products in registry.
-    //for (edm::ProductRegistry::ProductList::const_iterator it = reg->productList().begin(); it != reg->productList().end(); ++it) {
-
-      //  **** Check this out.... ****
-
-      // See FWCore/Framework/interface/BranchDescription.h
-      // BranchDescription contains all the information for the product.
-
-      // This section not very backwards-compatible in terms of digi-merging.  Need to be able to specify here which data format
-      // to look at...
-
-      //      edm::BranchDescription desc = it->second;
-      //if (!desc.friendlyClassName_.compare(0,9,"EBRecHitC")) {
-      //	Subdetectors_.push_back(desc.productInstanceName_);
-      //LogInfo("DataMixingModule") <<"Adding container "<<desc.productInstanceName_ <<" for pileup treatment";
-      //}
-      //else if (!desc.friendlyClassName_.compare(0,9,"EERecHitC")) {
-	//      else if (!desc.friendlyClassName_.compare(0,9,"EErechitC") && desc.productInstanceName_.compare(0,11,"TrackerHits")) {
-      //	Subdetectors_.push_back(desc.productInstanceName_);
-      //LogInfo("DataMixingModule") <<"Adding container "<<desc.productInstanceName_ <<" for pileup treatment";
-      //}
-      //else if (!desc.friendlyClassName_.compare(0,9,"HBRecHitC")) {
-      //	Subdetectors_.push_back(desc.productInstanceName_);
-      //LogInfo("DataMixingModule") <<"Adding container "<<desc.productInstanceName_ <<" for pileup treatment";
-      //}
-      //else if (!desc.friendlyClassName_.compare(0,9,"HERecHitC")) {
-      //	Subdetectors_.push_back(desc.productInstanceName_);
-      //LogInfo("DataMixingModule") <<"Adding container "<<desc.productInstanceName_ <<" for pileup treatment";
-      // }
-	// and so on with other detector types...
+    // for (edm::ProductRegistry::ProductList::const_iterator it =
+    // reg->productList().begin(); it != reg->productList().end(); ++it) {
+
+    //  **** Check this out.... ****
+
+    // See FWCore/Framework/interface/BranchDescription.h
+    // BranchDescription contains all the information for the product.
+
+    // This section not very backwards-compatible in terms of digi-merging.  Need
+    // to be able to specify here which data format to look at...
+
+    //      edm::BranchDescription desc = it->second;
+    // if (!desc.friendlyClassName_.compare(0,9,"EBRecHitC")) {
+    //	Subdetectors_.push_back(desc.productInstanceName_);
+    // LogInfo("DataMixingModule") <<"Adding container
+    // "<<desc.productInstanceName_ <<" for pileup treatment";
+    //}
+    // else if (!desc.friendlyClassName_.compare(0,9,"EERecHitC")) {
+    //      else if (!desc.friendlyClassName_.compare(0,9,"EErechitC") &&
+    //      desc.productInstanceName_.compare(0,11,"TrackerHits")) {
+    //	Subdetectors_.push_back(desc.productInstanceName_);
+    // LogInfo("DataMixingModule") <<"Adding container
+    // "<<desc.productInstanceName_ <<" for pileup treatment";
+    //}
+    // else if (!desc.friendlyClassName_.compare(0,9,"HBRecHitC")) {
+    //	Subdetectors_.push_back(desc.productInstanceName_);
+    // LogInfo("DataMixingModule") <<"Adding container
+    // "<<desc.productInstanceName_ <<" for pileup treatment";
+    //}
+    // else if (!desc.friendlyClassName_.compare(0,9,"HERecHitC")) {
+    //	Subdetectors_.push_back(desc.productInstanceName_);
+    // LogInfo("DataMixingModule") <<"Adding container
+    // "<<desc.productInstanceName_ <<" for pileup treatment";
+    // }
+    // and so on with other detector types...
     // }
-  }       
-	       
-
-  void DataMixingModule::initializeEvent(const edm::Event &e, const edm::EventSetup& ES) { 
   }
-  
 
-  void DataMixingModule::beginRun(edm::Run const& run, const edm::EventSetup& ES) { 
-    BMixingModule::beginRun( run, ES);
-  }
+  void DataMixingModule::initializeEvent(const edm::Event &e, const edm::EventSetup &ES) {}
 
-  void DataMixingModule::endRun(edm::Run const& run, const edm::EventSetup& ES) { 
-    BMixingModule::endRun( run, ES);
-  }
+  void DataMixingModule::beginRun(edm::Run const &run, const edm::EventSetup &ES) { BMixingModule::beginRun(run, ES); }
+
+  void DataMixingModule::endRun(edm::Run const &run, const edm::EventSetup &ES) { BMixingModule::endRun(run, ES); }
 
   // Virtual destructor needed.
-  DataMixingModule::~DataMixingModule() { 
-    if(MergeEMDigis_){ 
+  DataMixingModule::~DataMixingModule() {
+    if (MergeEMDigis_) {
       delete EMDigiWorker_;
-    }    
-    else {delete EMWorker_;}
-    if(MergeHcalDigis_) { 
-      if(MergeHcalDigisProd_) { delete HcalDigiWorkerProd_;}
-      else { delete HcalDigiWorker_; }}
-    else {delete HcalWorker_;}
-    if(MuonWorker_) delete MuonWorker_;
-    if(useSiStripRawDigi_)
+    } else {
+      delete EMWorker_;
+    }
+    if (MergeHcalDigis_) {
+      if (MergeHcalDigisProd_) {
+        delete HcalDigiWorkerProd_;
+      } else {
+        delete HcalDigiWorker_;
+      }
+    } else {
+      delete HcalWorker_;
+    }
+    if (MuonWorker_)
+      delete MuonWorker_;
+    if (useSiStripRawDigi_)
       delete SiStripRawWorker_;
-    else delete SiStripWorker_;
+    else
+      delete SiStripWorker_;
     delete SiPixelWorker_;
-    if(MergePileup_) { delete PUWorker_;}
+    if (MergePileup_) {
+      delete PUWorker_;
+    }
   }
 
-  void DataMixingModule::addSignals(const edm::Event &e, const edm::EventSetup& ES) { 
+  void DataMixingModule::addSignals(const edm::Event &e, const edm::EventSetup &ES) {
     // fill in maps of hits
 
-    LogDebug("DataMixingModule")<<"===============> adding MC signals for "<<e.id();
+    LogDebug("DataMixingModule") << "===============> adding MC signals for " << e.id();
 
     // Ecal
-    if(MergeEMDigis_) { 
+    if (MergeEMDigis_) {
       EMDigiWorker_->addEMSignals(e, ES);
+    } else {
+      EMWorker_->addEMSignals(e);
     }
-    else{ EMWorker_->addEMSignals(e);}
 
     // Hcal
-    if(MergeHcalDigis_) { 
-      if(MergeHcalDigisProd_){
-	HcalDigiWorkerProd_->addHcalSignals(e, ES);
-      }
-      else{
-	HcalDigiWorker_->addHcalSignals(e, ES);
+    if (MergeHcalDigis_) {
+      if (MergeHcalDigisProd_) {
+        HcalDigiWorkerProd_->addHcalSignals(e, ES);
+      } else {
+        HcalDigiWorker_->addHcalSignals(e, ES);
       }
+    } else {
+      HcalWorker_->addHcalSignals(e);
     }
-    else {HcalWorker_->addHcalSignals(e);}
-    
+
     // Muon
     MuonWorker_->addMuonSignals(e);
 
     // SiStrips
-    if(useSiStripRawDigi_) SiStripRawWorker_->addSiStripSignals(e);
-    else SiStripWorker_->addSiStripSignals(e);
+    if (useSiStripRawDigi_)
+      SiStripRawWorker_->addSiStripSignals(e);
+    else
+      SiStripWorker_->addSiStripSignals(e);
 
     // SiPixels
     SiPixelWorker_->addSiPixelSignals(e);
     AddedPileup_ = false;
-  } // end of addSignals
-
-  
-
-
-  bool DataMixingModule::pileWorker(const EventPrincipal &ep, int bcr, int eventNr, const edm::EventSetup& ES, edm::ModuleCallingContext const* mcc) {  
+  }  // end of addSignals
 
+  bool DataMixingModule::pileWorker(
+      const EventPrincipal &ep, int bcr, int eventNr, const edm::EventSetup &ES, edm::ModuleCallingContext const *mcc) {
     InternalContext internalContext(ep.id(), mcc);
     ParentContext parentContext(&internalContext);
     ModuleCallingContext moduleCallingContext(&moduleDescription());
     ModuleContextSentry moduleContextSentry(&moduleCallingContext, parentContext);
 
-    LogDebug("DataMixingModule") <<"\n===============> adding pileups from event  "<<ep.id()<<" for bunchcrossing "<<bcr;
+    LogDebug("DataMixingModule") << "\n===============> adding pileups from event  " << ep.id() << " for bunchcrossing "
+                                 << bcr;
 
-    // Note:  setupPileUpEvent may modify the run and lumi numbers of the EventPrincipal to match that of the primary event.
+    // Note:  setupPileUpEvent may modify the run and lumi numbers of the
+    // EventPrincipal to match that of the primary event.
     setupPileUpEvent(ES);
 
-    // check and see if we need to copy the pileup information from 
-    // secondary stream to the output stream  
-    // We only have the pileup event here, so pick the first time and store the info
-
+    // check and see if we need to copy the pileup information from
+    // secondary stream to the output stream
+    // We only have the pileup event here, so pick the first time and store the
+    // info
 
-    if(MergePileup_ && !AddedPileup_){
-      
+    if (MergePileup_ && !AddedPileup_) {
       PUWorker_->addPileupInfo(&ep, eventNr, &moduleCallingContext);
 
       AddedPileup_ = true;
     }
 
-    // fill in maps of hits; same code as addSignals, except now applied to the pileup events
+    // fill in maps of hits; same code as addSignals, except now applied to the
+    // pileup events
 
     // Ecal
-    if(MergeEMDigis_) {  
+    if (MergeEMDigis_) {
       EMDigiWorker_->addEMPileups(bcr, &ep, eventNr, ES, &moduleCallingContext);
+    } else {
+      EMWorker_->addEMPileups(bcr, &ep, eventNr, &moduleCallingContext);
     }
-    else {EMWorker_->addEMPileups(bcr, &ep, eventNr, &moduleCallingContext); }
 
     // Hcal
-    if(MergeHcalDigis_) {    
-      if(MergeHcalDigisProd_) {    
-	HcalDigiWorkerProd_->addHcalPileups(bcr, &ep, eventNr, ES, &moduleCallingContext);
+    if (MergeHcalDigis_) {
+      if (MergeHcalDigisProd_) {
+        HcalDigiWorkerProd_->addHcalPileups(bcr, &ep, eventNr, ES, &moduleCallingContext);
+      } else {
+        HcalDigiWorker_->addHcalPileups(bcr, &ep, eventNr, ES, &moduleCallingContext);
       }
-      else{
-	HcalDigiWorker_->addHcalPileups(bcr, &ep, eventNr, ES, &moduleCallingContext);}
+    } else {
+      HcalWorker_->addHcalPileups(bcr, &ep, eventNr, &moduleCallingContext);
     }
-    else {HcalWorker_->addHcalPileups(bcr, &ep, eventNr, &moduleCallingContext);}
 
     // Muon
     MuonWorker_->addMuonPileups(bcr, &ep, eventNr, &moduleCallingContext);
 
     // SiStrips
-    if(useSiStripRawDigi_) SiStripRawWorker_->addSiStripPileups(bcr, &ep, eventNr, &moduleCallingContext);
-    else SiStripWorker_->addSiStripPileups(bcr, &ep, eventNr, &moduleCallingContext);
+    if (useSiStripRawDigi_)
+      SiStripRawWorker_->addSiStripPileups(bcr, &ep, eventNr, &moduleCallingContext);
+    else
+      SiStripWorker_->addSiStripPileups(bcr, &ep, eventNr, &moduleCallingContext);
 
     // SiPixels
-    //whoops this should be for the MC worker ????? SiPixelWorker_->setPileupInfo(ps,bunchSpacing);
+    // whoops this should be for the MC worker ?????
+    // SiPixelWorker_->setPileupInfo(ps,bunchSpacing);
     SiPixelWorker_->addSiPixelPileups(bcr, &ep, eventNr, &moduleCallingContext);
 
     return true;
   }
 
-
-  
-  void DataMixingModule::doPileUp(edm::Event &e, const edm::EventSetup& ES)
-  {
+  void DataMixingModule::doPileUp(edm::Event &e, const edm::EventSetup &ES) {
     using namespace std::placeholders;
 
     std::vector<edm::SecondaryEventIDAndFileInfo> recordEventID;
@@ -374,88 +385,85 @@ namespace edm
     PileupList.clear();
     TrueNumInteractions_.clear();
 
-    ModuleCallingContext const* mcc = e.moduleCallingContext();
+    ModuleCallingContext const *mcc = e.moduleCallingContext();
 
-    for (int bunchCrossing=minBunch_;bunchCrossing<=maxBunch_;++bunchCrossing) {
-      for (unsigned int isource=0;isource<maxNbSources_;++isource) {
+    for (int bunchCrossing = minBunch_; bunchCrossing <= maxBunch_; ++bunchCrossing) {
+      for (unsigned int isource = 0; isource < maxNbSources_; ++isource) {
         std::shared_ptr<PileUp> source = inputSources_[isource];
-        if (!source || !(source->doPileUp(bunchCrossing))) 
+        if (!source || !(source->doPileUp(bunchCrossing)))
           continue;
 
-	if (isource==0) 
+        if (isource == 0)
           source->CalculatePileup(minBunch_, maxBunch_, PileupList, TrueNumInteractions_, e.streamID());
 
-	int NumPU_Events = 0;
-	if (isource ==0) { 
+        int NumPU_Events = 0;
+        if (isource == 0) {
           NumPU_Events = PileupList[bunchCrossing - minBunch_];
         } else {
           // non-minbias pileup only gets one event for now. Fix later if desired.
           NumPU_Events = 1;
-        }  
+        }
 
         source->readPileUp(
-                e.id(),
-                recordEventID,
-                std::bind(&DataMixingModule::pileWorker, std::ref(*this),
-			  _1, bunchCrossing, _2, std::cref(ES), mcc),
-		NumPU_Events,
-                e.streamID()
-			   );
+            e.id(),
+            recordEventID,
+            std::bind(&DataMixingModule::pileWorker, std::ref(*this), _1, bunchCrossing, _2, std::cref(ES), mcc),
+            NumPU_Events,
+            e.streamID());
       }
     }
-
   }
 
-
-  void DataMixingModule::put(edm::Event &e,const edm::EventSetup& ES) {
-
+  void DataMixingModule::put(edm::Event &e, const edm::EventSetup &ES) {
     // individual workers...
 
     // move pileup first so we have access to the information for the put step
 
     std::vector<PileupSummaryInfo> ps;
-    int bunchSpacing=10000;
+    int bunchSpacing = 10000;
 
-    if(MergePileup_) { 
-      PUWorker_->getPileupInfo(ps,bunchSpacing);      
+    if (MergePileup_) {
+      PUWorker_->getPileupInfo(ps, bunchSpacing);
       PUWorker_->putPileupInfo(e);
     }
 
     // Ecal
-    if(MergeEMDigis_) {
-      EMDigiWorker_->putEM(e,ES);
+    if (MergeEMDigis_) {
+      EMDigiWorker_->putEM(e, ES);
+    } else {
+      EMWorker_->putEM(e);
     }
-    else {EMWorker_->putEM(e);}
 
     // Hcal
-    if(MergeHcalDigis_) {
-      if(MergeHcalDigisProd_) {
-	HcalDigiWorkerProd_->putHcal(e,ES);
-      }
-      else{
-	HcalDigiWorker_->putHcal(e,ES);
+    if (MergeHcalDigis_) {
+      if (MergeHcalDigisProd_) {
+        HcalDigiWorkerProd_->putHcal(e, ES);
+      } else {
+        HcalDigiWorker_->putHcal(e, ES);
       }
+    } else {
+      HcalWorker_->putHcal(e);
     }
-    else {HcalWorker_->putHcal(e);}
 
     // Muon
     MuonWorker_->putMuon(e);
 
     // SiStrips
-    if(useSiStripRawDigi_) SiStripRawWorker_->putSiStrip(e);
-    else SiStripWorker_->putSiStrip(e);
+    if (useSiStripRawDigi_)
+      SiStripRawWorker_->putSiStrip(e);
+    else
+      SiStripWorker_->putSiStrip(e);
 
     // SiPixels
     SiPixelWorker_->putSiPixel(e);
   }
 
-  void DataMixingModule::beginLuminosityBlock(LuminosityBlock const& l1, EventSetup const& c) {
+  void DataMixingModule::beginLuminosityBlock(LuminosityBlock const &l1, EventSetup const &c) {
     BMixingModule::beginLuminosityBlock(l1, c);
   }
 
-  void DataMixingModule::endLuminosityBlock(LuminosityBlock const& l1, EventSetup const& c) {
+  void DataMixingModule::endLuminosityBlock(LuminosityBlock const &l1, EventSetup const &c) {
     BMixingModule::endLuminosityBlock(l1, c);
   }
 
-
-} //edm
+}  // namespace edm
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingModule.h b/SimGeneral/DataMixingModule/plugins/DataMixingModule.h
index 918664db29b8c..76e99d2f60d86 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingModule.h
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingModule.h
@@ -3,7 +3,7 @@
 
 /** \class DataMixingModule
  *
- * DataMixingModule is the EDProducer subclass 
+ * DataMixingModule is the EDProducer subclass
  * that overlays rawdata events on top of MC,
  * using real data for pileup simulation
  *
@@ -15,171 +15,185 @@
 #include "Mixing/Base/interface/BMixingModule.h"
 
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/EventPrincipal.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "DataFormats/Provenance/interface/ProductID.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/Provenance/interface/ProductID.h"
 
 #include "SimDataFormats/PileupSummaryInfo/interface/PileupSummaryInfo.h"
 
-#include "SimGeneral/DataMixingModule/plugins/DataMixingEMWorker.h"
-#include "SimGeneral/DataMixingModule/plugins/DataMixingHcalWorker.h"
 #include "SimGeneral/DataMixingModule/plugins/DataMixingEMDigiWorker.h"
+#include "SimGeneral/DataMixingModule/plugins/DataMixingEMWorker.h"
 #include "SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorker.h"
 #include "SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.h"
+#include "SimGeneral/DataMixingModule/plugins/DataMixingHcalWorker.h"
 #include "SimGeneral/DataMixingModule/plugins/DataMixingMuonWorker.h"
-#include "SimGeneral/DataMixingModule/plugins/DataMixingSiStripWorker.h"
-#include "SimGeneral/DataMixingModule/plugins/DataMixingSiStripRawWorker.h"
-#include "SimGeneral/DataMixingModule/plugins/DataMixingSiPixelWorker.h"
 #include "SimGeneral/DataMixingModule/plugins/DataMixingPileupCopy.h"
+#include "SimGeneral/DataMixingModule/plugins/DataMixingSiPixelWorker.h"
+#include "SimGeneral/DataMixingModule/plugins/DataMixingSiStripRawWorker.h"
+#include "SimGeneral/DataMixingModule/plugins/DataMixingSiStripWorker.h"
 
 #include <map>
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace edm {
 
   class ModuleCallingContext;
 
-  class DataMixingModule : public BMixingModule
-    {
-    public:
-
-      /** standard constructor*/
-      explicit DataMixingModule(const edm::ParameterSet& ps, MixingCache::Config const* globalConf);
-
-      /**Default destructor*/
-      ~DataMixingModule() override;
-
-      // copies, with EventSetup
-      void checkSignal(const edm::Event &e) override {}; 
-      void createnewEDProduct() override {}
-      void addSignals(const edm::Event &e, const edm::EventSetup& ES) override; 
-      void doPileUp(edm::Event &e,const edm::EventSetup& ES) override;
-      void put(edm::Event &e,const edm::EventSetup& ES) override ;
-
-      void initializeEvent(edm::Event const& e, edm::EventSetup const& eventSetup) override;
-      void beginRun(edm::Run const& run, edm::EventSetup const& eventSetup) override;
-      bool pileWorker(const edm::EventPrincipal&, int bcr, int EventId,const edm::EventSetup& ES, ModuleCallingContext const*);
-      //virtual void beginJob();
-      //virtual void endJob();
-      void beginLuminosityBlock(LuminosityBlock const& l1, EventSetup const& c) override;
-      void endLuminosityBlock(LuminosityBlock const& l1, EventSetup const& c) override;
-      void endRun(const edm::Run& r, const edm::EventSetup& setup) override;
-
-
-
-    private:
-      // data specifiers
-
-      // Ecal
-      //output:
-      std::string EBRecHitCollectionDM_; // secondary name to be given to EB collection of hits
-      std::string EERecHitCollectionDM_; // secondary name to be given to EE collection of hits
-      std::string ESRecHitCollectionDM_; // secondary name to be given to EE collection of hits
-      //Digis:
-      //output
-      std::string EBDigiCollectionDM_; // secondary name to be given to EB collection of hits
-      std::string EEDigiCollectionDM_; // secondary name to be given to EE collection of hits
-      std::string ESDigiCollectionDM_; // secondary name to be given to EE collection of hits
-
-      // Hcal
-      // Rechits:
-      // output:
-      std::string HBHERecHitCollectionDM_; // secondary name to be given to HBHE collection of hits
-      std::string HORecHitCollectionDM_  ; // secondary name to be given to HO collection of hits
-      std::string HFRecHitCollectionDM_  ; // secondary name to be given to HF collection of hits
-      std::string ZDCRecHitCollectionDM_ ; // secondary name to be given to ZDC collection of hits
-      // Digis:
-      // output:
-      std::string HBHEDigiCollectionDM_; // secondary name to be given to HBHE collection of hits
-      std::string HODigiCollectionDM_  ; // secondary name to be given to HO collection of hits
-      std::string HFDigiCollectionDM_  ; // secondary name to be given to HF collection of hits
-      std::string ZDCDigiCollectionDM_ ; // secondary name to be given to ZDC collection of hits
-      std::string QIE10DigiCollectionDM_ ; // secondary name to be given to QIE10 collection of hits
-      std::string QIE11DigiCollectionDM_ ; // secondary name to be given to QIE11 collection of hits
-
-      // Muons
-      // output:
-      std::string DTDigiCollectionDM_;       // secondary name to be given to new DT digis
-      std::string RPCDigiCollectionDM_;      // secondary name to be given to new RPC digis
-      std::string CSCStripDigiCollectionDM_; // secondary name given to new collection of CSC Strip digis
-      std::string CSCWireDigiCollectionDM_;  // secondary name given to new collection of CSC wire digis
-      std::string CSCComparatorDigiCollectionDM_; // "     "                              CSC Comparator digis
-
-      // SiStrips
-      std::string SiStripDigiCollectionDM_  ; // secondary name to be given to new SiStrip digis
-
-      // SiPixels
-      std::string PixelDigiCollectionDM_  ; // secondary name to be given to new SiPixel digis
-
-      // merge tracker digis or tracks?
-      bool MergeTrackerDigis_;
-
-      // Submodules to handle the individual detectors
-
-      DataMixingPileupCopy  *PUWorker_;
-
-      DataMixingEMWorker *EMWorker_ ;
-      DataMixingEMDigiWorker *EMDigiWorker_ ;
-      bool MergeEMDigis_;
-
-      // Hcal 
-      
-      DataMixingHcalWorker *HcalWorker_ ;
-      DataMixingHcalDigiWorker *HcalDigiWorker_ ;
-      DataMixingHcalDigiWorkerProd *HcalDigiWorkerProd_ ;
-
-     // tokens needed to DataMixingHcalDigiWorkerProd
-      edm::InputTag EBPileInputTag_; // InputTag for Pileup Digis collection  
-      edm::InputTag EEPileInputTag_  ; // InputTag for Pileup Digis collection
-      edm::InputTag ESPileInputTag_  ; // InputTag for Pileup Digis collection
-      edm::InputTag HBHEPileInputTag_; // InputTag for Pileup Digis collection  
-      edm::InputTag HOPileInputTag_  ; // InputTag for Pileup Digis collection
-      edm::InputTag HFPileInputTag_  ; // InputTag for Pileup Digis collection
-      edm::InputTag ZDCPileInputTag_ ; // InputTag for Pileup Digis collection
-      edm::InputTag QIE10PileInputTag_ ; // InputTag for Pileup Digis collection
-      edm::InputTag QIE11PileInputTag_ ; // InputTag for Pileup Digis collection
-      edm::EDGetTokenT<HBHEDigitizerTraits::DigiCollection> tok_hbhe_;
-      edm::EDGetTokenT<HODigitizerTraits::DigiCollection> tok_ho_;
-      edm::EDGetTokenT<HFDigitizerTraits::DigiCollection> tok_hf_;
-      edm::EDGetTokenT<ZDCDigitizerTraits::DigiCollection> tok_zdc_;
-      edm::EDGetTokenT<HcalQIE10DigitizerTraits::DigiCollection> tok_qie10_;
-      edm::EDGetTokenT<HcalQIE11DigitizerTraits::DigiCollection> tok_qie11_;
-
-      bool MergeHcalDigis_;
-      bool MergeHcalDigisProd_;
-
-      bool MergePileup_;
-      bool AddedPileup_;
-
-      // Muons
-
-      DataMixingMuonWorker *MuonWorker_ ;
-
-      // Si-Strips
-
-      DataMixingSiStripWorker *SiStripWorker_ ;
-      DataMixingSiStripRawWorker *SiStripRawWorker_ ;
-      bool useSiStripRawDigi_;
-      std::string siStripRawDigiSource_;
-
-      // Pixels
-
-      DataMixingSiPixelWorker *SiPixelWorker_ ;
-
-
-      virtual void getSubdetectorNames();  
-
-      // internally used information : subdetectors present in input
-      std::vector<std::string> Subdetectors_;
-
-      //      unsigned int eventId_; //=0 for signal, from 1-n for pileup events
-
-      std::string label_;
-
-    };
-}//edm
+  class DataMixingModule : public BMixingModule {
+  public:
+    /** standard constructor*/
+    explicit DataMixingModule(const edm::ParameterSet &ps, MixingCache::Config const *globalConf);
+
+    /**Default destructor*/
+    ~DataMixingModule() override;
+
+    // copies, with EventSetup
+    void checkSignal(const edm::Event &e) override{};
+    void createnewEDProduct() override {}
+    void addSignals(const edm::Event &e, const edm::EventSetup &ES) override;
+    void doPileUp(edm::Event &e, const edm::EventSetup &ES) override;
+    void put(edm::Event &e, const edm::EventSetup &ES) override;
+
+    void initializeEvent(edm::Event const &e, edm::EventSetup const &eventSetup) override;
+    void beginRun(edm::Run const &run, edm::EventSetup const &eventSetup) override;
+    bool pileWorker(
+        const edm::EventPrincipal &, int bcr, int EventId, const edm::EventSetup &ES, ModuleCallingContext const *);
+    // virtual void beginJob();
+    // virtual void endJob();
+    void beginLuminosityBlock(LuminosityBlock const &l1, EventSetup const &c) override;
+    void endLuminosityBlock(LuminosityBlock const &l1, EventSetup const &c) override;
+    void endRun(const edm::Run &r, const edm::EventSetup &setup) override;
+
+  private:
+    // data specifiers
+
+    // Ecal
+    // output:
+    std::string EBRecHitCollectionDM_;  // secondary name to be given to EB
+                                        // collection of hits
+    std::string EERecHitCollectionDM_;  // secondary name to be given to EE
+                                        // collection of hits
+    std::string ESRecHitCollectionDM_;  // secondary name to be given to EE
+                                        // collection of hits
+    // Digis:
+    // output
+    std::string EBDigiCollectionDM_;  // secondary name to be given to EB
+                                      // collection of hits
+    std::string EEDigiCollectionDM_;  // secondary name to be given to EE
+                                      // collection of hits
+    std::string ESDigiCollectionDM_;  // secondary name to be given to EE
+                                      // collection of hits
+
+    // Hcal
+    // Rechits:
+    // output:
+    std::string HBHERecHitCollectionDM_;  // secondary name to be given to HBHE
+                                          // collection of hits
+    std::string HORecHitCollectionDM_;    // secondary name to be given to HO
+                                          // collection of hits
+    std::string HFRecHitCollectionDM_;    // secondary name to be given to HF
+                                          // collection of hits
+    std::string ZDCRecHitCollectionDM_;   // secondary name to be given to ZDC
+                                          // collection of hits
+    // Digis:
+    // output:
+    std::string HBHEDigiCollectionDM_;   // secondary name to be given to HBHE
+                                         // collection of hits
+    std::string HODigiCollectionDM_;     // secondary name to be given to HO
+                                         // collection of hits
+    std::string HFDigiCollectionDM_;     // secondary name to be given to HF
+                                         // collection of hits
+    std::string ZDCDigiCollectionDM_;    // secondary name to be given to ZDC
+                                         // collection of hits
+    std::string QIE10DigiCollectionDM_;  // secondary name to be given to QIE10
+                                         // collection of hits
+    std::string QIE11DigiCollectionDM_;  // secondary name to be given to QIE11
+                                         // collection of hits
+
+    // Muons
+    // output:
+    std::string DTDigiCollectionDM_;             // secondary name to be given to new DT digis
+    std::string RPCDigiCollectionDM_;            // secondary name to be given to new RPC digis
+    std::string CSCStripDigiCollectionDM_;       // secondary name given to new
+                                                 // collection of CSC Strip digis
+    std::string CSCWireDigiCollectionDM_;        // secondary name given to new
+                                                 // collection of CSC wire digis
+    std::string CSCComparatorDigiCollectionDM_;  // "     " CSC Comparator digis
+
+    // SiStrips
+    std::string SiStripDigiCollectionDM_;  // secondary name to be given to new
+                                           // SiStrip digis
+
+    // SiPixels
+    std::string PixelDigiCollectionDM_;  // secondary name to be given to new SiPixel digis
+
+    // merge tracker digis or tracks?
+    bool MergeTrackerDigis_;
+
+    // Submodules to handle the individual detectors
+
+    DataMixingPileupCopy *PUWorker_;
+
+    DataMixingEMWorker *EMWorker_;
+    DataMixingEMDigiWorker *EMDigiWorker_;
+    bool MergeEMDigis_;
+
+    // Hcal
+
+    DataMixingHcalWorker *HcalWorker_;
+    DataMixingHcalDigiWorker *HcalDigiWorker_;
+    DataMixingHcalDigiWorkerProd *HcalDigiWorkerProd_;
+
+    // tokens needed to DataMixingHcalDigiWorkerProd
+    edm::InputTag EBPileInputTag_;     // InputTag for Pileup Digis collection
+    edm::InputTag EEPileInputTag_;     // InputTag for Pileup Digis collection
+    edm::InputTag ESPileInputTag_;     // InputTag for Pileup Digis collection
+    edm::InputTag HBHEPileInputTag_;   // InputTag for Pileup Digis collection
+    edm::InputTag HOPileInputTag_;     // InputTag for Pileup Digis collection
+    edm::InputTag HFPileInputTag_;     // InputTag for Pileup Digis collection
+    edm::InputTag ZDCPileInputTag_;    // InputTag for Pileup Digis collection
+    edm::InputTag QIE10PileInputTag_;  // InputTag for Pileup Digis collection
+    edm::InputTag QIE11PileInputTag_;  // InputTag for Pileup Digis collection
+    edm::EDGetTokenT<HBHEDigitizerTraits::DigiCollection> tok_hbhe_;
+    edm::EDGetTokenT<HODigitizerTraits::DigiCollection> tok_ho_;
+    edm::EDGetTokenT<HFDigitizerTraits::DigiCollection> tok_hf_;
+    edm::EDGetTokenT<ZDCDigitizerTraits::DigiCollection> tok_zdc_;
+    edm::EDGetTokenT<HcalQIE10DigitizerTraits::DigiCollection> tok_qie10_;
+    edm::EDGetTokenT<HcalQIE11DigitizerTraits::DigiCollection> tok_qie11_;
+
+    bool MergeHcalDigis_;
+    bool MergeHcalDigisProd_;
+
+    bool MergePileup_;
+    bool AddedPileup_;
+
+    // Muons
+
+    DataMixingMuonWorker *MuonWorker_;
+
+    // Si-Strips
+
+    DataMixingSiStripWorker *SiStripWorker_;
+    DataMixingSiStripRawWorker *SiStripRawWorker_;
+    bool useSiStripRawDigi_;
+    std::string siStripRawDigiSource_;
+
+    // Pixels
+
+    DataMixingSiPixelWorker *SiPixelWorker_;
+
+    virtual void getSubdetectorNames();
+
+    // internally used information : subdetectors present in input
+    std::vector<std::string> Subdetectors_;
+
+    //      unsigned int eventId_; //=0 for signal, from 1-n for pileup events
+
+    std::string label_;
+  };
+}  // namespace edm
 
 #endif
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingMuonWorker.cc b/SimGeneral/DataMixingModule/plugins/DataMixingMuonWorker.cc
index d97c4ee0a8fde..3e25193c84d4c 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingMuonWorker.cc
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingMuonWorker.cc
@@ -4,41 +4,39 @@
 //
 //--------------------------------------------
 
+#include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <map>
 #include <memory>
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/Common/interface/Handle.h"
 //
 //
 #include "DataMixingMuonWorker.h"
 
-
 using namespace std;
 
-namespace edm
-{
+namespace edm {
 
   // Virtual constructor
 
-  DataMixingMuonWorker::DataMixingMuonWorker() { } 
-
-  // Constructor 
-  DataMixingMuonWorker::DataMixingMuonWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC) : 
-							    label_(ps.getParameter<std::string>("Label"))
+  DataMixingMuonWorker::DataMixingMuonWorker() {}
 
-  {                                                         
+  // Constructor
+  DataMixingMuonWorker::DataMixingMuonWorker(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC)
+      : label_(ps.getParameter<std::string>("Label"))
 
+  {
     // get the subdetector names
-    //    this->getSubdetectorNames();  //something like this may be useful to check what we are supposed to do...
+    //    this->getSubdetectorNames();  //something like this may be useful to
+    //    check what we are supposed to do...
 
     // Declare the products to produce
 
-    DTDigiTagSig_           = ps.getParameter<edm::InputTag>("DTDigiTagSig");
-    RPCDigiTagSig_          = ps.getParameter<edm::InputTag>("RPCDigiTagSig");
+    DTDigiTagSig_ = ps.getParameter<edm::InputTag>("DTDigiTagSig");
+    RPCDigiTagSig_ = ps.getParameter<edm::InputTag>("RPCDigiTagSig");
 
-    CSCstripdigi_collectionSig_   = ps.getParameter<edm::InputTag>("CSCstripdigiCollectionSig");
-    CSCwiredigi_collectionSig_    = ps.getParameter<edm::InputTag>("CSCwiredigiCollectionSig");
-    CSCCompdigi_collectionSig_    = ps.getParameter<edm::InputTag>("CSCCompdigiCollectionSig");
+    CSCstripdigi_collectionSig_ = ps.getParameter<edm::InputTag>("CSCstripdigiCollectionSig");
+    CSCwiredigi_collectionSig_ = ps.getParameter<edm::InputTag>("CSCwiredigiCollectionSig");
+    CSCCompdigi_collectionSig_ = ps.getParameter<edm::InputTag>("CSCCompdigiCollectionSig");
 
     DTDigiToken_ = iC.consumes<DTDigiCollection>(DTDigiTagSig_);
     CSCStripDigiToken_ = iC.consumes<CSCStripDigiCollection>(CSCstripdigi_collectionSig_);
@@ -46,11 +44,11 @@ namespace edm
     CSCCompDigiToken_ = iC.consumes<CSCComparatorDigiCollection>(CSCCompdigi_collectionSig_);
     RPCDigiToken_ = iC.consumes<RPCDigiCollection>(RPCDigiTagSig_);
 
-    DTPileInputTag_       = ps.getParameter<edm::InputTag>("DTPileInputTag");
-    RPCPileInputTag_      = ps.getParameter<edm::InputTag>("RPCPileInputTag");
-    CSCWirePileInputTag_  = ps.getParameter<edm::InputTag>("CSCWirePileInputTag");
+    DTPileInputTag_ = ps.getParameter<edm::InputTag>("DTPileInputTag");
+    RPCPileInputTag_ = ps.getParameter<edm::InputTag>("RPCPileInputTag");
+    CSCWirePileInputTag_ = ps.getParameter<edm::InputTag>("CSCWirePileInputTag");
     CSCStripPileInputTag_ = ps.getParameter<edm::InputTag>("CSCStripPileInputTag");
-    CSCCompPileInputTag_  = ps.getParameter<edm::InputTag>("CSCCompPileInputTag");
+    CSCCompPileInputTag_ = ps.getParameter<edm::InputTag>("CSCCompPileInputTag");
 
     DTDigiPToken_ = iC.consumes<DTDigiCollection>(DTPileInputTag_);
     CSCStripDigiPToken_ = iC.consumes<CSCStripDigiCollection>(CSCStripPileInputTag_);
@@ -58,340 +56,318 @@ namespace edm
     CSCCompDigiPToken_ = iC.consumes<CSCComparatorDigiCollection>(CSCCompPileInputTag_);
     RPCDigiPToken_ = iC.consumes<RPCDigiCollection>(RPCPileInputTag_);
 
-
     // outputs:
 
-    DTDigiCollectionDM_  = ps.getParameter<std::string>("DTDigiCollectionDM");
+    DTDigiCollectionDM_ = ps.getParameter<std::string>("DTDigiCollectionDM");
     RPCDigiCollectionDM_ = ps.getParameter<std::string>("RPCDigiCollectionDM");
     CSCStripDigiCollectionDM_ = ps.getParameter<std::string>("CSCStripDigiCollectionDM");
-    CSCWireDigiCollectionDM_  = ps.getParameter<std::string>("CSCWireDigiCollectionDM");
-    CSCComparatorDigiCollectionDM_  = ps.getParameter<std::string>("CSCComparatorDigiCollectionDM");
-
-
+    CSCWireDigiCollectionDM_ = ps.getParameter<std::string>("CSCWireDigiCollectionDM");
+    CSCComparatorDigiCollectionDM_ = ps.getParameter<std::string>("CSCComparatorDigiCollectionDM");
   }
-	       
 
   // Virtual destructor needed.
-  DataMixingMuonWorker::~DataMixingMuonWorker() { 
-  }  
+  DataMixingMuonWorker::~DataMixingMuonWorker() {}
 
-  void DataMixingMuonWorker::addMuonSignals(const edm::Event &e) { 
+  void DataMixingMuonWorker::addMuonSignals(const edm::Event &e) {
     // fill in maps of hits
 
-    LogDebug("DataMixingMuonWorker")<<"===============> adding MC signals for "<<e.id();
+    LogDebug("DataMixingMuonWorker") << "===============> adding MC signals for " << e.id();
 
     // DT
-    // 
+    //
 
     OurDTDigis_ = new DTDigiCollection();
-    Handle<DTDigiCollection> pDTdigis; 
+    Handle<DTDigiCollection> pDTdigis;
 
     // Get the digis from the event
-    if( e.getByToken(DTDigiToken_, pDTdigis) ) {
-
-    //    LogInfo("DataMixingMuonWorker") << "total # DT Digis: " << DTdigis->size();
+    if (e.getByToken(DTDigiToken_, pDTdigis)) {
+      //    LogInfo("DataMixingMuonWorker") << "total # DT Digis: " <<
+      //    DTdigis->size();
 
-    // Loop over digis, copying them to our own local storage
-      const DTDigiCollection* DTdigis = pDTdigis.product();
+      // Loop over digis, copying them to our own local storage
+      const DTDigiCollection *DTdigis = pDTdigis.product();
       DTDigiCollection::DigiRangeIterator DLayerIt;
       for (DLayerIt = DTdigis->begin(); DLayerIt != DTdigis->end(); ++DLayerIt) {
-	// The layerId
-	const DTLayerId& layerId = (*DLayerIt).first;
+        // The layerId
+        const DTLayerId &layerId = (*DLayerIt).first;
 
-	// Get the iterators over the digis associated with this LayerId
-	const DTDigiCollection::Range& range = (*DLayerIt).second;
+        // Get the iterators over the digis associated with this LayerId
+        const DTDigiCollection::Range &range = (*DLayerIt).second;
 
-	OurDTDigis_->put(range, layerId);
+        OurDTDigis_->put(range, layerId);
       }
     }
     // RPC
-    // 
+    //
 
     OurRPCDigis_ = new RPCDigiCollection();
 
     // Get the digis from the event
-    Handle<RPCDigiCollection> pRPCdigis; 
+    Handle<RPCDigiCollection> pRPCdigis;
 
-    if( e.getByToken(RPCDigiToken_, pRPCdigis) ) {
+    if (e.getByToken(RPCDigiToken_, pRPCdigis)) {
+      // Loop over digis, copying them to our own local storage
 
-    // Loop over digis, copying them to our own local storage
-
-      const RPCDigiCollection* RPCdigis = pRPCdigis.product();
+      const RPCDigiCollection *RPCdigis = pRPCdigis.product();
       RPCDigiCollection::DigiRangeIterator RLayerIt;
       for (RLayerIt = RPCdigis->begin(); RLayerIt != RPCdigis->end(); ++RLayerIt) {
-	// The layerId
-	const RPCDetId& layerId = (*RLayerIt).first;
+        // The layerId
+        const RPCDetId &layerId = (*RLayerIt).first;
 
-	// Get the iterators over the digis associated with this LayerId
-	const RPCDigiCollection::Range& range = (*RLayerIt).second;
+        // Get the iterators over the digis associated with this LayerId
+        const RPCDigiCollection::Range &range = (*RLayerIt).second;
 
-	OurRPCDigis_->put(range, layerId);
-      
+        OurRPCDigis_->put(range, layerId);
       }
     }
     // CSCStrip
-    // 
+    //
 
     OurCSCStripDigis_ = new CSCStripDigiCollection();
 
     // Get the digis from the event
-    Handle<CSCStripDigiCollection> pCSCStripdigis; 
-
-    if( e.getByToken(CSCStripDigiToken_, pCSCStripdigis) ) {
+    Handle<CSCStripDigiCollection> pCSCStripdigis;
 
-    //if(pCSCStripdigis.isValid() ) { std::cout << "Signal: have CSCStripDigis" << std::endl;}
-    //else { std::cout << "Signal: NO CSCStripDigis" << std::endl;}
+    if (e.getByToken(CSCStripDigiToken_, pCSCStripdigis)) {
+      // if(pCSCStripdigis.isValid() ) { std::cout << "Signal: have CSCStripDigis"
+      // << std::endl;} else { std::cout << "Signal: NO CSCStripDigis" <<
+      // std::endl;}
 
+      // Loop over digis, copying them to our own local storage
 
-    // Loop over digis, copying them to our own local storage
-
-      const CSCStripDigiCollection* CSCStripdigis = pCSCStripdigis.product();
+      const CSCStripDigiCollection *CSCStripdigis = pCSCStripdigis.product();
       CSCStripDigiCollection::DigiRangeIterator CSLayerIt;
       for (CSLayerIt = CSCStripdigis->begin(); CSLayerIt != CSCStripdigis->end(); ++CSLayerIt) {
-	// The layerId
-	const CSCDetId& layerId = (*CSLayerIt).first;
-
-	// Get the iterators over the digis associated with this LayerId
-	const CSCStripDigiCollection::Range& range = (*CSLayerIt).second;
+        // The layerId
+        const CSCDetId &layerId = (*CSLayerIt).first;
 
-	//std::cout << " Signal CSC layer " << (*CSLayerIt).first << std::endl;
+        // Get the iterators over the digis associated with this LayerId
+        const CSCStripDigiCollection::Range &range = (*CSLayerIt).second;
 
-	//for(CSCStripDigiCollection::const_iterator dtdigi=range.first; dtdigi!=range.second; dtdigi++){
-	//  std::cout << "Digi " << (*dtdigi) << std::endl;
-	//}
+        // std::cout << " Signal CSC layer " << (*CSLayerIt).first << std::endl;
 
+        // for(CSCStripDigiCollection::const_iterator dtdigi=range.first;
+        // dtdigi!=range.second; dtdigi++){
+        //  std::cout << "Digi " << (*dtdigi) << std::endl;
+        //}
 
-	OurCSCStripDigis_->put(range, layerId);
+        OurCSCStripDigis_->put(range, layerId);
       }
     }
     // CSCWire
-    // 
+    //
 
     OurCSCWireDigis_ = new CSCWireDigiCollection();
 
     // Get the digis from the event
-    Handle<CSCWireDigiCollection> pCSCWiredigis; 
+    Handle<CSCWireDigiCollection> pCSCWiredigis;
 
-    if( e.getByToken(CSCWireDigiToken_, pCSCWiredigis) ) {
-   
+    if (e.getByToken(CSCWireDigiToken_, pCSCWiredigis)) {
+      // if(pCSCWiredigis.isValid() ) { std::cout << "Signal: have CSCWireDigis"
+      // << std::endl;} else { std::cout << "Signal: NO CSCWireDigis" <<
+      // std::endl;}
 
-    //if(pCSCWiredigis.isValid() ) { std::cout << "Signal: have CSCWireDigis" << std::endl;}
-    //else { std::cout << "Signal: NO CSCWireDigis" << std::endl;}
-    
-    // Loop over digis, copying them to our own local storage
+      // Loop over digis, copying them to our own local storage
 
-      const CSCWireDigiCollection* CSCWiredigis = pCSCWiredigis.product();
+      const CSCWireDigiCollection *CSCWiredigis = pCSCWiredigis.product();
       CSCWireDigiCollection::DigiRangeIterator CWLayerIt;
       for (CWLayerIt = CSCWiredigis->begin(); CWLayerIt != CSCWiredigis->end(); ++CWLayerIt) {
-	// The layerId
-	const CSCDetId& layerId = (*CWLayerIt).first;
+        // The layerId
+        const CSCDetId &layerId = (*CWLayerIt).first;
 
-	// Get the iterators over the digis associated with this LayerId
-	const CSCWireDigiCollection::Range& range = (*CWLayerIt).second;
+        // Get the iterators over the digis associated with this LayerId
+        const CSCWireDigiCollection::Range &range = (*CWLayerIt).second;
 
-	OurCSCWireDigis_->put(range, layerId);
-      
+        OurCSCWireDigis_->put(range, layerId);
       }
     }
 
     // CSCComparators
-    // 
+    //
 
     OurCSCComparatorDigis_ = new CSCComparatorDigiCollection();
 
     // Get the digis from the event
-    Handle<CSCComparatorDigiCollection> pCSCComparatordigis; 
+    Handle<CSCComparatorDigiCollection> pCSCComparatordigis;
 
-    //std::cout << "CSCComp label: " << CSCDigiTagSig_.label() << " " << CSCCompdigi_collectionSig_.label() << std::endl;
+    // std::cout << "CSCComp label: " << CSCDigiTagSig_.label() << " " <<
+    // CSCCompdigi_collectionSig_.label() << std::endl;
 
-    if( e.getByToken(CSCCompDigiToken_, pCSCComparatordigis) ) {
-   
+    if (e.getByToken(CSCCompDigiToken_, pCSCComparatordigis)) {
+      // if(pCSCComparatordigis.isValid() ) { std::cout << "Signal: have
+      // CSCComparatorDigis" << std::endl;} else { std::cout << "Signal: NO
+      // CSCComparatorDigis" << std::endl;}
 
-      //if(pCSCComparatordigis.isValid() ) { std::cout << "Signal: have CSCComparatorDigis" << std::endl;}
-      //else { std::cout << "Signal: NO CSCComparatorDigis" << std::endl;}
-    
-    // Loop over digis, copying them to our own local storage
+      // Loop over digis, copying them to our own local storage
 
-      const CSCComparatorDigiCollection* CSCComparatordigis = pCSCComparatordigis.product();
+      const CSCComparatorDigiCollection *CSCComparatordigis = pCSCComparatordigis.product();
       CSCComparatorDigiCollection::DigiRangeIterator CWLayerIt;
       for (CWLayerIt = CSCComparatordigis->begin(); CWLayerIt != CSCComparatordigis->end(); ++CWLayerIt) {
-	// The layerId
-	const CSCDetId& layerId = (*CWLayerIt).first;
+        // The layerId
+        const CSCDetId &layerId = (*CWLayerIt).first;
 
-	// Get the iterators over the digis associated with this LayerId
-	const CSCComparatorDigiCollection::Range& range = (*CWLayerIt).second;
+        // Get the iterators over the digis associated with this LayerId
+        const CSCComparatorDigiCollection::Range &range = (*CWLayerIt).second;
 
-	OurCSCComparatorDigis_->put(range, layerId);
-      
+        OurCSCComparatorDigis_->put(range, layerId);
       }
     }
 
-    
-  } // end of addMuonSignals
+  }  // end of addMuonSignals
 
-  void DataMixingMuonWorker::addMuonPileups(const int bcr, const EventPrincipal *ep, unsigned int eventNr,
-                                            ModuleCallingContext const* mcc) {
-  
-    LogDebug("DataMixingMuonWorker") <<"\n===============> adding pileups from event  "<<ep->id()<<" for bunchcrossing "<<bcr;
+  void DataMixingMuonWorker::addMuonPileups(const int bcr,
+                                            const EventPrincipal *ep,
+                                            unsigned int eventNr,
+                                            ModuleCallingContext const *mcc) {
+    LogDebug("DataMixingMuonWorker") << "\n===============> adding pileups from event  " << ep->id()
+                                     << " for bunchcrossing " << bcr;
 
-    // fill in maps of hits; same code as addSignals, except now applied to the pileup events
+    // fill in maps of hits; same code as addSignals, except now applied to the
+    // pileup events
 
     // DT
-    // 
+    //
     // Get the digis from the event
 
-   std::shared_ptr<Wrapper<DTDigiCollection>  const> DTDigisPTR = 
-     getProductByTag<DTDigiCollection>(*ep, DTPileInputTag_, mcc);
- 
-   if(DTDigisPTR ) {
-
-     const DTDigiCollection*  DTDigis = const_cast< DTDigiCollection * >(DTDigisPTR->product());
+    std::shared_ptr<Wrapper<DTDigiCollection> const> DTDigisPTR =
+        getProductByTag<DTDigiCollection>(*ep, DTPileInputTag_, mcc);
 
-     DTDigiCollection::DigiRangeIterator DTLayerIt;
-     for (DTLayerIt = DTDigis->begin(); DTLayerIt != DTDigis->end(); ++DTLayerIt) {
-	// The layerId
-	const DTLayerId& layerId = (*DTLayerIt).first;
+    if (DTDigisPTR) {
+      const DTDigiCollection *DTDigis = const_cast<DTDigiCollection *>(DTDigisPTR->product());
 
-	// Get the iterators over the Digis associated with this LayerId
-	const DTDigiCollection::Range& range = (*DTLayerIt).second;
+      DTDigiCollection::DigiRangeIterator DTLayerIt;
+      for (DTLayerIt = DTDigis->begin(); DTLayerIt != DTDigis->end(); ++DTLayerIt) {
+        // The layerId
+        const DTLayerId &layerId = (*DTLayerIt).first;
 
+        // Get the iterators over the Digis associated with this LayerId
+        const DTDigiCollection::Range &range = (*DTLayerIt).second;
 
-	OurDTDigis_->put(range, layerId);
-      
+        OurDTDigis_->put(range, layerId);
       }
     }
     // RPC
-    // 
+    //
 
     // Get the digis from the event
 
+    std::shared_ptr<Wrapper<RPCDigiCollection> const> RPCDigisPTR =
+        getProductByTag<RPCDigiCollection>(*ep, RPCPileInputTag_, mcc);
 
-   std::shared_ptr<Wrapper<RPCDigiCollection>  const> RPCDigisPTR = 
-     getProductByTag<RPCDigiCollection>(*ep, RPCPileInputTag_, mcc);
- 
-   if(RPCDigisPTR ) {
+    if (RPCDigisPTR) {
+      const RPCDigiCollection *RPCDigis = const_cast<RPCDigiCollection *>(RPCDigisPTR->product());
 
-     const RPCDigiCollection*  RPCDigis = const_cast< RPCDigiCollection * >(RPCDigisPTR->product());
+      RPCDigiCollection::DigiRangeIterator RPCLayerIt;
+      for (RPCLayerIt = RPCDigis->begin(); RPCLayerIt != RPCDigis->end(); ++RPCLayerIt) {
+        // The layerId
+        const RPCDetId &layerId = (*RPCLayerIt).first;
 
-     RPCDigiCollection::DigiRangeIterator RPCLayerIt;
-     for (RPCLayerIt = RPCDigis->begin(); RPCLayerIt != RPCDigis->end(); ++RPCLayerIt) {
-	// The layerId
-	const RPCDetId& layerId = (*RPCLayerIt).first;
+        // Get the iterators over the digis associated with this LayerId
+        const RPCDigiCollection::Range &range = (*RPCLayerIt).second;
 
-	// Get the iterators over the digis associated with this LayerId
-	const RPCDigiCollection::Range& range = (*RPCLayerIt).second;
-
-	OurRPCDigis_->put(range, layerId);
-      
+        OurRPCDigis_->put(range, layerId);
       }
     }
 
     // CSCStrip
-    // 
+    //
 
     // Get the digis from the event
 
-   std::shared_ptr<Wrapper<CSCStripDigiCollection>  const> CSCStripDigisPTR = 
-     getProductByTag<CSCStripDigiCollection>(*ep, CSCStripPileInputTag_, mcc);
- 
-   if(CSCStripDigisPTR ) {
+    std::shared_ptr<Wrapper<CSCStripDigiCollection> const> CSCStripDigisPTR =
+        getProductByTag<CSCStripDigiCollection>(*ep, CSCStripPileInputTag_, mcc);
 
-     const CSCStripDigiCollection*  CSCStripDigis = const_cast< CSCStripDigiCollection * >(CSCStripDigisPTR->product());
+    if (CSCStripDigisPTR) {
+      const CSCStripDigiCollection *CSCStripDigis = const_cast<CSCStripDigiCollection *>(CSCStripDigisPTR->product());
 
-     CSCStripDigiCollection::DigiRangeIterator CSCStripLayerIt;
-     for (CSCStripLayerIt = CSCStripDigis->begin(); CSCStripLayerIt != CSCStripDigis->end(); ++CSCStripLayerIt) {
-	// The layerId
-	const CSCDetId& layerId = (*CSCStripLayerIt).first;
+      CSCStripDigiCollection::DigiRangeIterator CSCStripLayerIt;
+      for (CSCStripLayerIt = CSCStripDigis->begin(); CSCStripLayerIt != CSCStripDigis->end(); ++CSCStripLayerIt) {
+        // The layerId
+        const CSCDetId &layerId = (*CSCStripLayerIt).first;
 
-	// Get the iterators over the digis associated with this LayerId
-	const CSCStripDigiCollection::Range& range = (*CSCStripLayerIt).second;
+        // Get the iterators over the digis associated with this LayerId
+        const CSCStripDigiCollection::Range &range = (*CSCStripLayerIt).second;
 
-	//std::cout << " Pileup CSC layer " << (*CSCStripLayerIt).first << std::endl;
+        // std::cout << " Pileup CSC layer " << (*CSCStripLayerIt).first <<
+        // std::endl;
 
-	//for(CSCStripDigiCollection::const_iterator dtdigi=range.first; dtdigi!=range.second; dtdigi++){
-	//  std::cout << "Digi " << (*dtdigi) << std::endl;
-	//	}
+        // for(CSCStripDigiCollection::const_iterator dtdigi=range.first;
+        // dtdigi!=range.second; dtdigi++){
+        //  std::cout << "Digi " << (*dtdigi) << std::endl;
+        //	}
 
-	OurCSCStripDigis_->put(range, layerId);
-      
+        OurCSCStripDigis_->put(range, layerId);
       }
     }
 
     // CSCWire
-    // 
+    //
 
     // Get the digis from the event
 
-   std::shared_ptr<Wrapper<CSCWireDigiCollection>  const> CSCWireDigisPTR = 
-     getProductByTag<CSCWireDigiCollection>(*ep, CSCWirePileInputTag_, mcc);
- 
-   if(CSCWireDigisPTR ) {
+    std::shared_ptr<Wrapper<CSCWireDigiCollection> const> CSCWireDigisPTR =
+        getProductByTag<CSCWireDigiCollection>(*ep, CSCWirePileInputTag_, mcc);
 
-     const CSCWireDigiCollection*  CSCWireDigis = const_cast< CSCWireDigiCollection * >(CSCWireDigisPTR->product());
+    if (CSCWireDigisPTR) {
+      const CSCWireDigiCollection *CSCWireDigis = const_cast<CSCWireDigiCollection *>(CSCWireDigisPTR->product());
 
-     CSCWireDigiCollection::DigiRangeIterator CSCWireLayerIt;
-     for (CSCWireLayerIt = CSCWireDigis->begin(); CSCWireLayerIt != CSCWireDigis->end(); ++CSCWireLayerIt) {
-	// The layerId
-	const CSCDetId& layerId = (*CSCWireLayerIt).first;
+      CSCWireDigiCollection::DigiRangeIterator CSCWireLayerIt;
+      for (CSCWireLayerIt = CSCWireDigis->begin(); CSCWireLayerIt != CSCWireDigis->end(); ++CSCWireLayerIt) {
+        // The layerId
+        const CSCDetId &layerId = (*CSCWireLayerIt).first;
 
-	// Get the iterators over the digis associated with this LayerId
-	const CSCWireDigiCollection::Range& range = (*CSCWireLayerIt).second;
+        // Get the iterators over the digis associated with this LayerId
+        const CSCWireDigiCollection::Range &range = (*CSCWireLayerIt).second;
 
-	OurCSCWireDigis_->put(range, layerId);
-      
+        OurCSCWireDigis_->put(range, layerId);
       }
     }
 
-   // CSCComparators
-   //
-
-   // Get the digis from the event
-
-   std::shared_ptr<Wrapper<CSCComparatorDigiCollection>  const> CSCComparatorDigisPTR =
-     getProductByTag<CSCComparatorDigiCollection>(*ep, CSCCompPileInputTag_, mcc);
-
-   if(CSCComparatorDigisPTR ) {
-
-     const CSCComparatorDigiCollection*  CSCComparatorDigis = const_cast< CSCComparatorDigiCollection * >(CSCComparatorDigisPTR->product());
+    // CSCComparators
+    //
 
-     CSCComparatorDigiCollection::DigiRangeIterator CSCComparatorLayerIt;
-     for (CSCComparatorLayerIt = CSCComparatorDigis->begin(); CSCComparatorLayerIt != CSCComparatorDigis->end(); ++CSCComparatorLayerIt) {
-       // The layerId
-       const CSCDetId& layerId = (*CSCComparatorLayerIt).first;
+    // Get the digis from the event
 
-       // Get the iterators over the digis associated with this LayerId
-       const CSCComparatorDigiCollection::Range& range = (*CSCComparatorLayerIt).second;
+    std::shared_ptr<Wrapper<CSCComparatorDigiCollection> const> CSCComparatorDigisPTR =
+        getProductByTag<CSCComparatorDigiCollection>(*ep, CSCCompPileInputTag_, mcc);
 
-       OurCSCComparatorDigis_->put(range, layerId);
+    if (CSCComparatorDigisPTR) {
+      const CSCComparatorDigiCollection *CSCComparatorDigis =
+          const_cast<CSCComparatorDigiCollection *>(CSCComparatorDigisPTR->product());
 
-     }
-   }
+      CSCComparatorDigiCollection::DigiRangeIterator CSCComparatorLayerIt;
+      for (CSCComparatorLayerIt = CSCComparatorDigis->begin(); CSCComparatorLayerIt != CSCComparatorDigis->end();
+           ++CSCComparatorLayerIt) {
+        // The layerId
+        const CSCDetId &layerId = (*CSCComparatorLayerIt).first;
 
+        // Get the iterators over the digis associated with this LayerId
+        const CSCComparatorDigiCollection::Range &range = (*CSCComparatorLayerIt).second;
 
+        OurCSCComparatorDigis_->put(range, layerId);
+      }
+    }
   }
- 
-  void DataMixingMuonWorker::putMuon(edm::Event &e) {
 
+  void DataMixingMuonWorker::putMuon(edm::Event &e) {
     // collections of digis to put in the event
-    std::unique_ptr< DTDigiCollection > DTDigiMerge( new DTDigiCollection );
-    std::unique_ptr< RPCDigiCollection > RPCDigiMerge( new RPCDigiCollection );
-    std::unique_ptr< CSCStripDigiCollection > CSCStripDigiMerge( new CSCStripDigiCollection );
-    std::unique_ptr< CSCWireDigiCollection > CSCWireDigiMerge( new CSCWireDigiCollection );
-    std::unique_ptr< CSCComparatorDigiCollection > CSCComparatorDigiMerge( new CSCComparatorDigiCollection );
+    std::unique_ptr<DTDigiCollection> DTDigiMerge(new DTDigiCollection);
+    std::unique_ptr<RPCDigiCollection> RPCDigiMerge(new RPCDigiCollection);
+    std::unique_ptr<CSCStripDigiCollection> CSCStripDigiMerge(new CSCStripDigiCollection);
+    std::unique_ptr<CSCWireDigiCollection> CSCWireDigiMerge(new CSCWireDigiCollection);
+    std::unique_ptr<CSCComparatorDigiCollection> CSCComparatorDigiMerge(new CSCComparatorDigiCollection);
 
     // Loop over DT digis, copying them from our own local storage
 
     DTDigiCollection::DigiRangeIterator DLayerIt;
     for (DLayerIt = OurDTDigis_->begin(); DLayerIt != OurDTDigis_->end(); ++DLayerIt) {
       // The layerId
-      const DTLayerId& layerId = (*DLayerIt).first;
+      const DTLayerId &layerId = (*DLayerIt).first;
 
       // Get the iterators over the digis associated with this LayerId
-      const DTDigiCollection::Range& range = (*DLayerIt).second;
-
+      const DTDigiCollection::Range &range = (*DLayerIt).second;
 
       DTDigiMerge->put(range, layerId);
-      
     }
 
     // Loop over RPC digis, copying them from our own local storage
@@ -399,33 +375,32 @@ namespace edm
     RPCDigiCollection::DigiRangeIterator RLayerIt;
     for (RLayerIt = OurRPCDigis_->begin(); RLayerIt != OurRPCDigis_->end(); ++RLayerIt) {
       // The layerId
-      const RPCDetId& layerId = (*RLayerIt).first;
+      const RPCDetId &layerId = (*RLayerIt).first;
 
       // Get the iterators over the digis associated with this LayerId
-      const RPCDigiCollection::Range& range = (*RLayerIt).second;
+      const RPCDigiCollection::Range &range = (*RLayerIt).second;
 
       RPCDigiMerge->put(range, layerId);
-      
     }
     // Loop over CSCStrip digis, copying them from our own local storage
 
     CSCStripDigiCollection::DigiRangeIterator CSLayerIt;
     for (CSLayerIt = OurCSCStripDigis_->begin(); CSLayerIt != OurCSCStripDigis_->end(); ++CSLayerIt) {
       // The layerId
-      const CSCDetId& layerId = (*CSLayerIt).first;
+      const CSCDetId &layerId = (*CSLayerIt).first;
 
       // Get the iterators over the digis associated with this LayerId
-      const CSCStripDigiCollection::Range& range = (*CSLayerIt).second;
+      const CSCStripDigiCollection::Range &range = (*CSLayerIt).second;
 
       std::vector<CSCStripDigi> NewDigiList;
 
       std::vector<int> StripList;
       std::vector<CSCStripDigiCollection::const_iterator> StripPointer;
 
-      for(CSCStripDigiCollection::const_iterator dtdigi=range.first; dtdigi!=range.second; ++dtdigi){
-        //std::cout << "Digi " << (*dtdigi).getStrip() << std::endl;
-	StripList.push_back( (*dtdigi).getStrip() );
-	StripPointer.push_back( dtdigi );
+      for (CSCStripDigiCollection::const_iterator dtdigi = range.first; dtdigi != range.second; ++dtdigi) {
+        // std::cout << "Digi " << (*dtdigi).getStrip() << std::endl;
+        StripList.push_back((*dtdigi).getStrip());
+        StripPointer.push_back(dtdigi);
       }
 
       int PrevStrip = -1;
@@ -433,82 +408,83 @@ namespace edm
 
       std::vector<CSCStripDigiCollection::const_iterator>::const_iterator StripPtr = StripPointer.begin();
 
-      for( std::vector<int>::const_iterator istrip = StripList.begin(); istrip !=StripList.end(); ++istrip) {
-       
-	const int CurrentStrip = *(istrip);
-	
-	if(CurrentStrip > PrevStrip) { 
-	  PrevStrip = CurrentStrip; 
-
-	  int dupl_count;
-	  dupl_count = std::count(StripList.begin(), StripList.end(), CurrentStrip);
-	  if(dupl_count > 1) {
-	    std::vector<int>::const_iterator  duplicate = istrip;
-	    ++duplicate;
-	    std::vector<CSCStripDigiCollection::const_iterator>::const_iterator DuplPointer = StripPtr;
-	    ++DuplPointer;
-	    for( ; duplicate!=StripList.end(); ++duplicate) {
-	      if( (*duplicate) == CurrentStrip ) {
-
-		//		std::cout << " Duplicate of current " << CurrentStrip << " found at " << (duplicate - StripList.begin()) << std::endl;
-
-		DuplicateList.push_back(CurrentStrip);
-
-		std::vector<int> pileup_adc = (**DuplPointer).getADCCounts();
-		std::vector<int> signal_adc = (**StripPtr).getADCCounts();
-
-		std::vector<int>::const_iterator minplace;
-		
-		minplace = std::min_element(pileup_adc.begin(), pileup_adc.end());
-
-		int minvalue = (*minplace);
-		
-		std::vector<int> new_adc;
-
-		std::vector<int>::const_iterator newsig = signal_adc.begin();
-
-		for(std::vector<int>::const_iterator ibin = pileup_adc.begin(); ibin!=pileup_adc.end(); ++ibin) {
-		  new_adc.push_back((*newsig)+(*ibin)-minvalue);
-
-		  ++newsig;
-		}
-
-		CSCStripDigi newDigi(CurrentStrip, new_adc);
-		NewDigiList.push_back(newDigi);
-	      }
-	      ++DuplPointer;
-	    }
-	  }
-	  else { NewDigiList.push_back(**StripPtr); }
-	}  // if strips monotonically increasing...  Haven't hit duplicates yet
-	else { // reached end of signal digis, or there was no overlap
-	  PrevStrip = 1000;  // now into pileup signals, stop looking forward for duplicates
-
-	  // check if this digi was in the duplicate list
-	  int check;
-	  check = std::count(DuplicateList.begin(), DuplicateList.end(), CurrentStrip);
-	  if(check == 0) NewDigiList.push_back(**StripPtr);
-	}
-	++StripPtr;
+      for (std::vector<int>::const_iterator istrip = StripList.begin(); istrip != StripList.end(); ++istrip) {
+        const int CurrentStrip = *(istrip);
+
+        if (CurrentStrip > PrevStrip) {
+          PrevStrip = CurrentStrip;
+
+          int dupl_count;
+          dupl_count = std::count(StripList.begin(), StripList.end(), CurrentStrip);
+          if (dupl_count > 1) {
+            std::vector<int>::const_iterator duplicate = istrip;
+            ++duplicate;
+            std::vector<CSCStripDigiCollection::const_iterator>::const_iterator DuplPointer = StripPtr;
+            ++DuplPointer;
+            for (; duplicate != StripList.end(); ++duplicate) {
+              if ((*duplicate) == CurrentStrip) {
+                //		std::cout << " Duplicate of current " <<
+                // CurrentStrip << " found at " << (duplicate - StripList.begin())
+                //<< std::endl;
+
+                DuplicateList.push_back(CurrentStrip);
+
+                std::vector<int> pileup_adc = (**DuplPointer).getADCCounts();
+                std::vector<int> signal_adc = (**StripPtr).getADCCounts();
+
+                std::vector<int>::const_iterator minplace;
+
+                minplace = std::min_element(pileup_adc.begin(), pileup_adc.end());
+
+                int minvalue = (*minplace);
+
+                std::vector<int> new_adc;
+
+                std::vector<int>::const_iterator newsig = signal_adc.begin();
+
+                for (std::vector<int>::const_iterator ibin = pileup_adc.begin(); ibin != pileup_adc.end(); ++ibin) {
+                  new_adc.push_back((*newsig) + (*ibin) - minvalue);
+
+                  ++newsig;
+                }
+
+                CSCStripDigi newDigi(CurrentStrip, new_adc);
+                NewDigiList.push_back(newDigi);
+              }
+              ++DuplPointer;
+            }
+          } else {
+            NewDigiList.push_back(**StripPtr);
+          }
+        }                    // if strips monotonically increasing...  Haven't hit duplicates yet
+        else {               // reached end of signal digis, or there was no overlap
+          PrevStrip = 1000;  // now into pileup signals, stop looking forward for
+                             // duplicates
+
+          // check if this digi was in the duplicate list
+          int check;
+          check = std::count(DuplicateList.begin(), DuplicateList.end(), CurrentStrip);
+          if (check == 0)
+            NewDigiList.push_back(**StripPtr);
+        }
+        ++StripPtr;
       }
 
       CSCStripDigiCollection::Range stripRange(NewDigiList.begin(), NewDigiList.end());
 
       CSCStripDigiMerge->put(stripRange, layerId);
-
     }
     // Loop over CSCStrip digis, copying them from our own local storage
 
     CSCWireDigiCollection::DigiRangeIterator CWLayerIt;
     for (CWLayerIt = OurCSCWireDigis_->begin(); CWLayerIt != OurCSCWireDigis_->end(); ++CWLayerIt) {
       // The layerId
-      const CSCDetId& layerId = (*CWLayerIt).first;
+      const CSCDetId &layerId = (*CWLayerIt).first;
 
       // Get the iterators over the digis associated with this LayerId
-      const CSCWireDigiCollection::Range& range = (*CWLayerIt).second;
+      const CSCWireDigiCollection::Range &range = (*CWLayerIt).second;
 
       CSCWireDigiMerge->put(range, layerId);
-      
     }
 
     // Loop over CSCComparator digis, copying them from our own local storage
@@ -516,27 +492,27 @@ namespace edm
     CSCComparatorDigiCollection::DigiRangeIterator CCLayerIt;
     for (CCLayerIt = OurCSCComparatorDigis_->begin(); CCLayerIt != OurCSCComparatorDigis_->end(); ++CCLayerIt) {
       // The layerId
-      const CSCDetId& layerId = (*CCLayerIt).first;
+      const CSCDetId &layerId = (*CCLayerIt).first;
 
       // Get the iterators over the digis associated with this LayerId
-      const CSCComparatorDigiCollection::Range& range = (*CCLayerIt).second;
+      const CSCComparatorDigiCollection::Range &range = (*CCLayerIt).second;
 
       CSCComparatorDigiMerge->put(range, layerId);
-      
     }
 
-
-    // put the collection of recunstructed hits in the event   
-    //    LogDebug("DataMixingMuonWorker") << "total # DT Merged Digis: " << DTDigiMerge->size() ;
-    //    LogDebug("DataMixingMuonWorker") << "total # RPC Merged Digis: " << RPCDigiMerge->size() ;
-    //    LogDebug("DataMixingMuonWorker") << "total # CSCStrip Merged Digis: " << CSCStripDigiMerge->size() ;
-    //    LogDebug("DataMixingMuonWorker") << "total # CSCWire Merged Digis: " << CSCWireDigiMerge->size() ;
+    // put the collection of recunstructed hits in the event
+    //    LogDebug("DataMixingMuonWorker") << "total # DT Merged Digis: " <<
+    //    DTDigiMerge->size() ; LogDebug("DataMixingMuonWorker") << "total # RPC
+    //    Merged Digis: " << RPCDigiMerge->size() ;
+    //    LogDebug("DataMixingMuonWorker") << "total # CSCStrip Merged Digis: " <<
+    //    CSCStripDigiMerge->size() ; LogDebug("DataMixingMuonWorker") << "total #
+    //    CSCWire Merged Digis: " << CSCWireDigiMerge->size() ;
 
     e.put(std::move(DTDigiMerge));
     e.put(std::move(RPCDigiMerge));
-    e.put(std::move(CSCStripDigiMerge), CSCStripDigiCollectionDM_ );
-    e.put(std::move(CSCWireDigiMerge), CSCWireDigiCollectionDM_ );
-    e.put(std::move(CSCComparatorDigiMerge), CSCComparatorDigiCollectionDM_ );
+    e.put(std::move(CSCStripDigiMerge), CSCStripDigiCollectionDM_);
+    e.put(std::move(CSCWireDigiMerge), CSCWireDigiCollectionDM_);
+    e.put(std::move(CSCComparatorDigiMerge), CSCComparatorDigiCollectionDM_);
 
     // clear local storage for this event
     delete OurDTDigis_;
@@ -544,7 +520,6 @@ namespace edm
     delete OurCSCStripDigis_;
     delete OurCSCWireDigis_;
     delete OurCSCComparatorDigis_;
-
   }
 
-} //edm
+}  // namespace edm
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingMuonWorker.h b/SimGeneral/DataMixingModule/plugins/DataMixingMuonWorker.h
index 6f59fef199f57..ff5236e5c5f93 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingMuonWorker.h
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingMuonWorker.h
@@ -3,7 +3,7 @@
 
 /** \class DataMixingMuonWorker
  *
- * DataMixingModule is the EDProducer subclass 
+ * DataMixingModule is the EDProducer subclass
  * that overlays rawdata events on top of MC,
  * using real data for pileup simulation
  * This class takes care of the Muon information
@@ -14,99 +14,99 @@
  *
  ************************************************************/
 
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventPrincipal.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 
-#include "DataFormats/Provenance/interface/ProductID.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/Provenance/interface/ProductID.h"
 
-//DT
+// DT
 #include "DataFormats/DTDigi/interface/DTDigiCollection.h"
-//RPC
+// RPC
 #include "DataFormats/RPCDigi/interface/RPCDigiCollection.h"
-//CSC
+// CSC
+#include "DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCStripDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
-#include "DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h"
 
 #include <map>
-#include <vector>
 #include <string>
+#include <vector>
 
-
-namespace edm
-{
+namespace edm {
   class ModuleCallingContext;
 
-  class DataMixingMuonWorker
-    {
-    public:
-
-      DataMixingMuonWorker();
-
-     /** standard constructor*/
-      explicit DataMixingMuonWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC);
-
-      /**Default destructor*/
-      virtual ~DataMixingMuonWorker();
-
-      void putMuon(edm::Event &e) ;
-      void addMuonSignals(const edm::Event &e); 
-      void addMuonPileups(const int bcr, const edm::EventPrincipal*,unsigned int EventId, ModuleCallingContext const*);
-
-
-    private:
-      // data specifiers
-
-      edm::InputTag DTdigi_collectionSig_; // secondary name given to collection of DT digis
-      edm::InputTag RPCdigi_collectionSig_; // secondary name given to collection of RPC digis
-      edm::InputTag CSCDigiTagSig_; // primary? name given to collection of CSC digis
-      edm::InputTag DTDigiTagSig_; // primary? name given to collection of DT digis
-      edm::InputTag RPCDigiTagSig_; // primary? name given to collection of RPC digis
-      edm::InputTag CSCstripdigi_collectionSig_; // secondary name given to collection of CSC Strip digis
-      edm::InputTag CSCwiredigi_collectionSig_; // secondary name given to collection of CSC wire digis
-      edm::InputTag CSCCompdigi_collectionSig_; // secondary name given to collection of CSC wire digis
-
-      edm::InputTag DTPileInputTag_       ; // InputTag for pileup DTs
-      edm::InputTag RPCPileInputTag_      ; // InputTag for pileup RPCs
-      edm::InputTag CSCWirePileInputTag_  ; // InputTag for pileup CSC Wires
-      edm::InputTag CSCStripPileInputTag_ ; // InputTag for pileup CSC Strips
-      edm::InputTag CSCCompPileInputTag_ ; // InputTag for pileup CSC Comparators
-
-      edm::EDGetTokenT<DTDigiCollection> DTDigiToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<CSCStripDigiCollection> CSCStripDigiToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<CSCWireDigiCollection> CSCWireDigiToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<CSCComparatorDigiCollection> CSCCompDigiToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<RPCDigiCollection> RPCDigiToken_ ;  // Token to retrieve information 
-
-      edm::EDGetTokenT<DTDigiCollection> DTDigiPToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<CSCStripDigiCollection> CSCStripDigiPToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<CSCWireDigiCollection> CSCWireDigiPToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<CSCComparatorDigiCollection> CSCCompDigiPToken_ ;  // Token to retrieve information
-      edm::EDGetTokenT<RPCDigiCollection> RPCDigiPToken_ ;  // Token to retrieve information 
-
-      std::string DTDigiCollectionDM_; // secondary name to be given to new DT digis
-      std::string RPCDigiCollectionDM_; // secondary name to be given to new RPC digis
-      std::string CSCStripDigiCollectionDM_; // secondary name given to new collection of CSC Strip digis
-      std::string CSCWireDigiCollectionDM_; // secondary name given to new collection of CSC wire digis
-      std::string CSCComparatorDigiCollectionDM_; // secondary name given to new collection of CSC comparator digis
-
-      // just hold our own DigiCollections - order of digis in layer doesn't appear to matter...
-      // will make a copy and put this back into the event...
-
-      DTDigiCollection* OurDTDigis_;  
-      RPCDigiCollection* OurRPCDigis_;  
-      CSCStripDigiCollection* OurCSCStripDigis_;  
-      CSCWireDigiCollection* OurCSCWireDigis_;  
-      CSCComparatorDigiCollection* OurCSCComparatorDigis_;  
-
-      //      unsigned int eventId_; //=0 for signal, from 1-n for pileup events
-
-      std::string label_;
-
-    };
-}//edm
-
-#endif // SimDataMixingMuonWorker_h
+  class DataMixingMuonWorker {
+  public:
+    DataMixingMuonWorker();
+
+    /** standard constructor*/
+    explicit DataMixingMuonWorker(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC);
+
+    /**Default destructor*/
+    virtual ~DataMixingMuonWorker();
+
+    void putMuon(edm::Event &e);
+    void addMuonSignals(const edm::Event &e);
+    void addMuonPileups(const int bcr, const edm::EventPrincipal *, unsigned int EventId, ModuleCallingContext const *);
+
+  private:
+    // data specifiers
+
+    edm::InputTag DTdigi_collectionSig_;        // secondary name given to collection of DT digis
+    edm::InputTag RPCdigi_collectionSig_;       // secondary name given to collection of RPC digis
+    edm::InputTag CSCDigiTagSig_;               // primary? name given to collection of CSC digis
+    edm::InputTag DTDigiTagSig_;                // primary? name given to collection of DT digis
+    edm::InputTag RPCDigiTagSig_;               // primary? name given to collection of RPC digis
+    edm::InputTag CSCstripdigi_collectionSig_;  // secondary name given to
+                                                // collection of CSC Strip digis
+    edm::InputTag CSCwiredigi_collectionSig_;   // secondary name given to
+                                                // collection of CSC wire digis
+    edm::InputTag CSCCompdigi_collectionSig_;   // secondary name given to
+                                                // collection of CSC wire digis
+
+    edm::InputTag DTPileInputTag_;        // InputTag for pileup DTs
+    edm::InputTag RPCPileInputTag_;       // InputTag for pileup RPCs
+    edm::InputTag CSCWirePileInputTag_;   // InputTag for pileup CSC Wires
+    edm::InputTag CSCStripPileInputTag_;  // InputTag for pileup CSC Strips
+    edm::InputTag CSCCompPileInputTag_;   // InputTag for pileup CSC Comparators
+
+    edm::EDGetTokenT<DTDigiCollection> DTDigiToken_;                  // Token to retrieve information
+    edm::EDGetTokenT<CSCStripDigiCollection> CSCStripDigiToken_;      // Token to retrieve information
+    edm::EDGetTokenT<CSCWireDigiCollection> CSCWireDigiToken_;        // Token to retrieve information
+    edm::EDGetTokenT<CSCComparatorDigiCollection> CSCCompDigiToken_;  // Token to retrieve information
+    edm::EDGetTokenT<RPCDigiCollection> RPCDigiToken_;                // Token to retrieve information
+
+    edm::EDGetTokenT<DTDigiCollection> DTDigiPToken_;                  // Token to retrieve information
+    edm::EDGetTokenT<CSCStripDigiCollection> CSCStripDigiPToken_;      // Token to retrieve information
+    edm::EDGetTokenT<CSCWireDigiCollection> CSCWireDigiPToken_;        // Token to retrieve information
+    edm::EDGetTokenT<CSCComparatorDigiCollection> CSCCompDigiPToken_;  // Token to retrieve information
+    edm::EDGetTokenT<RPCDigiCollection> RPCDigiPToken_;                // Token to retrieve information
+
+    std::string DTDigiCollectionDM_;             // secondary name to be given to new DT digis
+    std::string RPCDigiCollectionDM_;            // secondary name to be given to new RPC digis
+    std::string CSCStripDigiCollectionDM_;       // secondary name given to new
+                                                 // collection of CSC Strip digis
+    std::string CSCWireDigiCollectionDM_;        // secondary name given to new
+                                                 // collection of CSC wire digis
+    std::string CSCComparatorDigiCollectionDM_;  // secondary name given to new collection
+                                                 // of CSC comparator digis
+
+    // just hold our own DigiCollections - order of digis in layer doesn't appear
+    // to matter... will make a copy and put this back into the event...
+
+    DTDigiCollection *OurDTDigis_;
+    RPCDigiCollection *OurRPCDigis_;
+    CSCStripDigiCollection *OurCSCStripDigis_;
+    CSCWireDigiCollection *OurCSCWireDigis_;
+    CSCComparatorDigiCollection *OurCSCComparatorDigis_;
+
+    //      unsigned int eventId_; //=0 for signal, from 1-n for pileup events
+
+    std::string label_;
+  };
+}  // namespace edm
+
+#endif  // SimDataMixingMuonWorker_h
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingPileupCopy.cc b/SimGeneral/DataMixingModule/plugins/DataMixingPileupCopy.cc
index d3c274345756a..3797a058849b0 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingPileupCopy.cc
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingPileupCopy.cc
@@ -3,125 +3,122 @@
 // Author:  Mike Hildreth, University of Notre Dame
 //
 //--------------------------------------------
+#include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <map>
 #include <memory>
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/Common/interface/Handle.h"
 
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 //
 //
 #include "DataMixingPileupCopy.h"
 
-
 using namespace std;
 
-namespace edm
-{
+namespace edm {
 
   // Virtual constructor
 
-  DataMixingPileupCopy::DataMixingPileupCopy() { } 
-
-  // Constructor 
-  DataMixingPileupCopy::DataMixingPileupCopy(const edm::ParameterSet& ps, edm::ConsumesCollector && iC) : 
-							    label_(ps.getParameter<std::string>("Label"))
+  DataMixingPileupCopy::DataMixingPileupCopy() {}
 
-  {                                                         
+  // Constructor
+  DataMixingPileupCopy::DataMixingPileupCopy(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC)
+      : label_(ps.getParameter<std::string>("Label"))
 
+  {
     // Pileup/Playback information
 
     PileupInfoInputTag_ = ps.getParameter<edm::InputTag>("PileupInfoInputTag");
     BunchSpacingInputTag_ = ps.getParameter<edm::InputTag>("BunchSpacingInputTag");
     CFPlaybackInputTag_ = ps.getParameter<edm::InputTag>("CFPlaybackInputTag");
 
-    GenPUProtonsInputTags_ = ps.getParameter<std::vector<edm::InputTag> >("GenPUProtonsInputTags");
+    GenPUProtonsInputTags_ = ps.getParameter<std::vector<edm::InputTag>>("GenPUProtonsInputTags");
 
     // apparently, we don't need consumes from Secondary input stream
-    //iC.consumes<std::vector<PileupSummaryInfo>>(PileupInfoInputTag_);
-    //iC.consumes<int>(BunchSpacingInputTag_);
-    //iC.consumes<CrossingFramePlaybackInfoNew>(CFPlaybackInputTag_);
+    // iC.consumes<std::vector<PileupSummaryInfo>>(PileupInfoInputTag_);
+    // iC.consumes<int>(BunchSpacingInputTag_);
+    // iC.consumes<CrossingFramePlaybackInfoNew>(CFPlaybackInputTag_);
   }
-	       
-  // Virtual destructor needed.
-  DataMixingPileupCopy::~DataMixingPileupCopy() { 
-  }  
 
+  // Virtual destructor needed.
+  DataMixingPileupCopy::~DataMixingPileupCopy() {}
 
-  void DataMixingPileupCopy::addPileupInfo(const EventPrincipal *ep, unsigned int eventNr,
-                                           ModuleCallingContext const* mcc) {
-  
-    LogDebug("DataMixingPileupCopy") <<"\n===============> adding pileup Info from event  "<<ep->id();
+  void DataMixingPileupCopy::addPileupInfo(const EventPrincipal *ep,
+                                           unsigned int eventNr,
+                                           ModuleCallingContext const *mcc) {
+    LogDebug("DataMixingPileupCopy") << "\n===============> adding pileup Info from event  " << ep->id();
 
     // find PileupSummaryInfo, CFPlayback information, if it's there
 
     // Pileup info first
 
-    std::shared_ptr<Wrapper< std::vector<PileupSummaryInfo> >  const> PileupInfoPTR =
-      getProductByTag<std::vector<PileupSummaryInfo>>(*ep,PileupInfoInputTag_, mcc);
+    std::shared_ptr<Wrapper<std::vector<PileupSummaryInfo>> const> PileupInfoPTR =
+        getProductByTag<std::vector<PileupSummaryInfo>>(*ep, PileupInfoInputTag_, mcc);
 
-    std::shared_ptr<Wrapper< int >  const> bsPTR =
-      getProductByTag<int>(*ep,BunchSpacingInputTag_, mcc);
+    std::shared_ptr<Wrapper<int> const> bsPTR = getProductByTag<int>(*ep, BunchSpacingInputTag_, mcc);
 
-    if(PileupInfoPTR ) {
-      PileupSummaryStorage_ = *(PileupInfoPTR->product()) ;
+    if (PileupInfoPTR) {
+      PileupSummaryStorage_ = *(PileupInfoPTR->product());
       LogDebug("DataMixingEMWorker") << "PileupInfo Size: " << PileupSummaryStorage_.size();
     }
 
-    if(bsPTR ) {
-      bsStorage_ = *(bsPTR->product()) ;
-    }
-    else {
-      bsStorage_=10000;
+    if (bsPTR) {
+      bsStorage_ = *(bsPTR->product());
+    } else {
+      bsStorage_ = 10000;
     }
 
     // Gen. PU protons
-    std::shared_ptr<edm::Wrapper<std::vector<reco::GenParticle> > const> GenPUProtonsPTR;
-    for(std::vector<edm::InputTag>::const_iterator it_InputTag = GenPUProtonsInputTags_.begin(); 
-                                                   it_InputTag != GenPUProtonsInputTags_.end(); ++it_InputTag){ 
-      GenPUProtonsPTR = getProductByTag<std::vector<reco::GenParticle> >( *ep, *it_InputTag , mcc);
-      if( GenPUProtonsPTR != nullptr ){
-         GenPUProtons_.push_back( *( GenPUProtonsPTR->product() ) );
-         GenPUProtons_labels_.push_back( it_InputTag->label() );
-      } else edm::LogWarning("DataMixingPileupCopy") << "Missing product with label: " << ( *it_InputTag ).label();
+    std::shared_ptr<edm::Wrapper<std::vector<reco::GenParticle>> const> GenPUProtonsPTR;
+    for (std::vector<edm::InputTag>::const_iterator it_InputTag = GenPUProtonsInputTags_.begin();
+         it_InputTag != GenPUProtonsInputTags_.end();
+         ++it_InputTag) {
+      GenPUProtonsPTR = getProductByTag<std::vector<reco::GenParticle>>(*ep, *it_InputTag, mcc);
+      if (GenPUProtonsPTR != nullptr) {
+        GenPUProtons_.push_back(*(GenPUProtonsPTR->product()));
+        GenPUProtons_labels_.push_back(it_InputTag->label());
+      } else
+        edm::LogWarning("DataMixingPileupCopy") << "Missing product with label: " << (*it_InputTag).label();
     }
 
     // Playback
-    std::shared_ptr<Wrapper<CrossingFramePlaybackInfoNew>  const> PlaybackPTR =
-      getProductByTag<CrossingFramePlaybackInfoNew>(*ep,CFPlaybackInputTag_, mcc);
+    std::shared_ptr<Wrapper<CrossingFramePlaybackInfoNew> const> PlaybackPTR =
+        getProductByTag<CrossingFramePlaybackInfoNew>(*ep, CFPlaybackInputTag_, mcc);
     FoundPlayback_ = false;
-    if(PlaybackPTR ) {
-      CrossingFramePlaybackStorage_ = *(PlaybackPTR->product()) ;
+    if (PlaybackPTR) {
+      CrossingFramePlaybackStorage_ = *(PlaybackPTR->product());
       FoundPlayback_ = true;
     }
   }
- 
+
   void DataMixingPileupCopy::putPileupInfo(edm::Event &e) {
-    std::unique_ptr<std::vector<PileupSummaryInfo> > PSIVector(new std::vector<PileupSummaryInfo>);
+    std::unique_ptr<std::vector<PileupSummaryInfo>> PSIVector(new std::vector<PileupSummaryInfo>);
     std::unique_ptr<int> bsInt(new int);
 
     std::vector<PileupSummaryInfo>::const_iterator PSiter;
-    for(PSiter = PileupSummaryStorage_.begin(); PSiter != PileupSummaryStorage_.end(); PSiter++){
+    for (PSiter = PileupSummaryStorage_.begin(); PSiter != PileupSummaryStorage_.end(); PSiter++) {
       PSIVector->push_back(*PSiter);
     }
 
-    *bsInt=bsStorage_;
+    *bsInt = bsStorage_;
 
-    if(FoundPlayback_ ) {
-      std::unique_ptr<CrossingFramePlaybackInfoNew> CFPlaybackInfo(new CrossingFramePlaybackInfoNew(CrossingFramePlaybackStorage_));
+    if (FoundPlayback_) {
+      std::unique_ptr<CrossingFramePlaybackInfoNew> CFPlaybackInfo(
+          new CrossingFramePlaybackInfoNew(CrossingFramePlaybackStorage_));
       e.put(std::move(CFPlaybackInfo));
     }
     e.put(std::move(PSIVector));
-    e.put(std::move(bsInt),"bunchSpacing");
+    e.put(std::move(bsInt), "bunchSpacing");
 
     // Gen. PU protons
-    for(size_t idx = 0; idx < GenPUProtons_.size(); ++idx){
-       std::unique_ptr<std::vector<reco::GenParticle> > GenPUProtons_ptr( new std::vector<reco::GenParticle>() );
-       std::vector<reco::GenParticle>::const_iterator it_GenParticle = GenPUProtons_.at(idx).begin();
-       std::vector<reco::GenParticle>::const_iterator it_GenParticle_end = GenPUProtons_.at(idx).end();
-       for(; it_GenParticle != it_GenParticle_end; ++ it_GenParticle) GenPUProtons_ptr->push_back( *it_GenParticle );
-
-       e.put( std::move(GenPUProtons_ptr), GenPUProtons_labels_.at(idx) );
+    for (size_t idx = 0; idx < GenPUProtons_.size(); ++idx) {
+      std::unique_ptr<std::vector<reco::GenParticle>> GenPUProtons_ptr(new std::vector<reco::GenParticle>());
+      std::vector<reco::GenParticle>::const_iterator it_GenParticle = GenPUProtons_.at(idx).begin();
+      std::vector<reco::GenParticle>::const_iterator it_GenParticle_end = GenPUProtons_.at(idx).end();
+      for (; it_GenParticle != it_GenParticle_end; ++it_GenParticle)
+        GenPUProtons_ptr->push_back(*it_GenParticle);
+
+      e.put(std::move(GenPUProtons_ptr), GenPUProtons_labels_.at(idx));
     }
 
     // clear local storage after this event
@@ -129,4 +126,4 @@ namespace edm
     GenPUProtons_.clear();
     GenPUProtons_labels_.clear();
   }
-} //edm
+}  // namespace edm
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingPileupCopy.h b/SimGeneral/DataMixingModule/plugins/DataMixingPileupCopy.h
index 15729b07751e9..84f70fecec45a 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingPileupCopy.h
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingPileupCopy.h
@@ -3,10 +3,11 @@
 
 /** \class DataMixingPileupCopy
  *
- * DataMixingModule is the EDProducer subclass 
+ * DataMixingModule is the EDProducer subclass
  * that overlays rawdata events on top of MC,
  * using real data for pileup simulation
- * This class takes care of existing pileup information in the case of pre-mixing
+ * This class takes care of existing pileup information in the case of
+ *pre-mixing
  *
  * \author Mike Hildreth, University of Notre Dame
  *
@@ -14,73 +15,69 @@
  *
  ************************************************************/
 
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventPrincipal.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 
-#include "DataFormats/Provenance/interface/ProductID.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/Provenance/interface/ProductID.h"
 
-#include "SimDataFormats/PileupSummaryInfo/interface/PileupSummaryInfo.h"
 #include "SimDataFormats/CrossingFrame/interface/CrossingFramePlaybackInfoNew.h"
+#include "SimDataFormats/PileupSummaryInfo/interface/PileupSummaryInfo.h"
 
 #include <map>
-#include <vector>
 #include <string>
+#include <vector>
 
-namespace reco{
-  class GenParticle; 
+namespace reco {
+  class GenParticle;
 }
 
-namespace edm
-{
+namespace edm {
   class ModuleCallingContext;
 
-  class DataMixingPileupCopy
-    {
-    public:
-
-      DataMixingPileupCopy();
-
-     /** standard constructor*/
-      explicit DataMixingPileupCopy(const edm::ParameterSet& ps, edm::ConsumesCollector && iC);
-
-      /**Default destructor*/
-      virtual ~DataMixingPileupCopy();
+  class DataMixingPileupCopy {
+  public:
+    DataMixingPileupCopy();
 
-      void putPileupInfo(edm::Event &e) ;
-      void addPileupInfo(const edm::EventPrincipal*,unsigned int EventId,
-                         ModuleCallingContext const* mcc);
+    /** standard constructor*/
+    explicit DataMixingPileupCopy(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC);
 
-      void getPileupInfo(std::vector<PileupSummaryInfo> &ps, int &bs) { ps=PileupSummaryStorage_; bs=bsStorage_;}
+    /**Default destructor*/
+    virtual ~DataMixingPileupCopy();
 
-    private:
+    void putPileupInfo(edm::Event &e);
+    void addPileupInfo(const edm::EventPrincipal *, unsigned int EventId, ModuleCallingContext const *mcc);
 
-      // data specifiers
+    void getPileupInfo(std::vector<PileupSummaryInfo> &ps, int &bs) {
+      ps = PileupSummaryStorage_;
+      bs = bsStorage_;
+    }
 
+  private:
+    // data specifiers
 
-      edm::InputTag PileupInfoInputTag_ ;     // InputTag for PileupSummaryInfo
-      edm::InputTag BunchSpacingInputTag_ ;     // InputTag for bunch spacing int
-      edm::InputTag CFPlaybackInputTag_   ;   // InputTag for CrossingFrame Playback information
+    edm::InputTag PileupInfoInputTag_;    // InputTag for PileupSummaryInfo
+    edm::InputTag BunchSpacingInputTag_;  // InputTag for bunch spacing int
+    edm::InputTag CFPlaybackInputTag_;    // InputTag for CrossingFrame Playback information
 
-      std::vector<edm::InputTag> GenPUProtonsInputTags_ ;
-   
-      CrossingFramePlaybackInfoNew CrossingFramePlaybackStorage_;
+    std::vector<edm::InputTag> GenPUProtonsInputTags_;
 
-      std::vector<PileupSummaryInfo> PileupSummaryStorage_;
-      int bsStorage_;
+    CrossingFramePlaybackInfoNew CrossingFramePlaybackStorage_;
 
-      std::vector<std::string> GenPUProtons_labels_;
-      std::vector<std::vector<reco::GenParticle> > GenPUProtons_;
+    std::vector<PileupSummaryInfo> PileupSummaryStorage_;
+    int bsStorage_;
 
-      //      unsigned int eventId_; //=0 for signal, from 1-n for pileup events
+    std::vector<std::string> GenPUProtons_labels_;
+    std::vector<std::vector<reco::GenParticle>> GenPUProtons_;
 
-      std::string label_;
+    //      unsigned int eventId_; //=0 for signal, from 1-n for pileup events
 
-      bool FoundPlayback_;
+    std::string label_;
 
-    };
-}//edm
+    bool FoundPlayback_;
+  };
+}  // namespace edm
 
-#endif // SimDataMixingPileupCopy_h
+#endif  // SimDataMixingPileupCopy_h
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingSiPixelWorker.cc b/SimGeneral/DataMixingModule/plugins/DataMixingSiPixelWorker.cc
index bae040ad0a98c..697cf251e333e 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingSiPixelWorker.cc
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingSiPixelWorker.cc
@@ -4,231 +4,212 @@
 //
 //--------------------------------------------
 
+#include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <map>
 #include <memory>
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/Common/interface/Handle.h"
 //
 //
 #include "DataMixingSiPixelWorker.h"
 
-
 using namespace std;
 
-namespace edm
-{
+namespace edm {
 
   // Virtual constructor
 
-  DataMixingSiPixelWorker::DataMixingSiPixelWorker() { } 
-
-  // Constructor 
-  DataMixingSiPixelWorker::DataMixingSiPixelWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC) : 
-							    label_(ps.getParameter<std::string>("Label"))
+  DataMixingSiPixelWorker::DataMixingSiPixelWorker() {}
 
-  {                                                         
+  // Constructor
+  DataMixingSiPixelWorker::DataMixingSiPixelWorker(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC)
+      : label_(ps.getParameter<std::string>("Label"))
 
+  {
     // get the subdetector names
-    //    this->getSubdetectorNames();  //something like this may be useful to check what we are supposed to do...
+    //    this->getSubdetectorNames();  //something like this may be useful to
+    //    check what we are supposed to do...
 
     // declare the products to produce
 
-    pixeldigi_collectionSig_   = ps.getParameter<edm::InputTag>("pixeldigiCollectionSig");
-    pixeldigi_collectionPile_   = ps.getParameter<edm::InputTag>("pixeldigiCollectionPile");
-    PixelDigiCollectionDM_  = ps.getParameter<std::string>("PixelDigiCollectionDM");
-
-    PixelDigiToken_ = iC.consumes<edm::DetSetVector<PixelDigi> >(pixeldigi_collectionSig_);
-    PixelDigiPToken_ = iC.consumes<edm::DetSetVector<PixelDigi> >(pixeldigi_collectionPile_);
+    pixeldigi_collectionSig_ = ps.getParameter<edm::InputTag>("pixeldigiCollectionSig");
+    pixeldigi_collectionPile_ = ps.getParameter<edm::InputTag>("pixeldigiCollectionPile");
+    PixelDigiCollectionDM_ = ps.getParameter<std::string>("PixelDigiCollectionDM");
 
+    PixelDigiToken_ = iC.consumes<edm::DetSetVector<PixelDigi>>(pixeldigi_collectionSig_);
+    PixelDigiPToken_ = iC.consumes<edm::DetSetVector<PixelDigi>>(pixeldigi_collectionPile_);
 
-    // clear local storage for this event                                                                     
+    // clear local storage for this event
     SiHitStorage_.clear();
-
   }
-	       
 
   // Virtual destructor needed.
-  DataMixingSiPixelWorker::~DataMixingSiPixelWorker() { 
-  }  
-
+  DataMixingSiPixelWorker::~DataMixingSiPixelWorker() {}
 
-
-  void DataMixingSiPixelWorker::addSiPixelSignals(const edm::Event &e) { 
+  void DataMixingSiPixelWorker::addSiPixelSignals(const edm::Event &e) {
     // fill in maps of hits
 
-    LogDebug("DataMixingSiPixelWorker")<<"===============> adding MC signals for "<<e.id();
-
-    Handle< edm::DetSetVector<PixelDigi> >  input;
-
-    if( e.getByToken(PixelDigiToken_,input) ) {
+    LogDebug("DataMixingSiPixelWorker") << "===============> adding MC signals for " << e.id();
 
-      //loop on all detsets (detectorIDs) inside the input collection
-      edm::DetSetVector<PixelDigi>::const_iterator DSViter=input->begin();
-      for (; DSViter!=input->end();DSViter++){
+    Handle<edm::DetSetVector<PixelDigi>> input;
 
+    if (e.getByToken(PixelDigiToken_, input)) {
+      // loop on all detsets (detectorIDs) inside the input collection
+      edm::DetSetVector<PixelDigi>::const_iterator DSViter = input->begin();
+      for (; DSViter != input->end(); DSViter++) {
 #ifdef DEBUG
-	LogDebug("DataMixingSiPixelWorker")  << "Processing DetID " << DSViter->id;
+        LogDebug("DataMixingSiPixelWorker") << "Processing DetID " << DSViter->id;
 #endif
 
-	uint32_t detID = DSViter->id;
-	edm::DetSet<PixelDigi>::const_iterator begin =(DSViter->data).begin();
-	edm::DetSet<PixelDigi>::const_iterator end   =(DSViter->data).end();
-	edm::DetSet<PixelDigi>::const_iterator icopy;
-  
-	OneDetectorMap LocalMap;
-
-	for (icopy=begin; icopy!=end; icopy++) {
-	  LocalMap.insert(OneDetectorMap::value_type( (icopy->channel()), *icopy ));
-	}
-
-	SiHitStorage_.insert( SiGlobalIndex::value_type( detID, LocalMap ) );
-      }
- 
-    }    
-  } // end of addSiPixelSignals
+        uint32_t detID = DSViter->id;
+        edm::DetSet<PixelDigi>::const_iterator begin = (DSViter->data).begin();
+        edm::DetSet<PixelDigi>::const_iterator end = (DSViter->data).end();
+        edm::DetSet<PixelDigi>::const_iterator icopy;
 
+        OneDetectorMap LocalMap;
 
+        for (icopy = begin; icopy != end; icopy++) {
+          LocalMap.insert(OneDetectorMap::value_type((icopy->channel()), *icopy));
+        }
 
-  void DataMixingSiPixelWorker::addSiPixelPileups(const int bcr, const EventPrincipal *ep, unsigned int eventNr,
-                                                  ModuleCallingContext const* mcc) {
-  
-    LogDebug("DataMixingSiPixelWorker") <<"\n===============> adding pileups from event  "<<ep->id()<<" for bunchcrossing "<<bcr;
-
-    // fill in maps of hits; same code as addSignals, except now applied to the pileup events
-
-    std::shared_ptr<Wrapper<edm::DetSetVector<PixelDigi> >  const> inputPTR =
-      getProductByTag<edm::DetSetVector<PixelDigi> >(*ep, pixeldigi_collectionPile_, mcc);
+        SiHitStorage_.insert(SiGlobalIndex::value_type(detID, LocalMap));
+      }
+    }
+  }  // end of addSiPixelSignals
 
-    if(inputPTR ) {
+  void DataMixingSiPixelWorker::addSiPixelPileups(const int bcr,
+                                                  const EventPrincipal *ep,
+                                                  unsigned int eventNr,
+                                                  ModuleCallingContext const *mcc) {
+    LogDebug("DataMixingSiPixelWorker") << "\n===============> adding pileups from event  " << ep->id()
+                                        << " for bunchcrossing " << bcr;
 
-      const edm::DetSetVector<PixelDigi>  *input = const_cast< edm::DetSetVector<PixelDigi> * >(inputPTR->product());
+    // fill in maps of hits; same code as addSignals, except now applied to the
+    // pileup events
 
+    std::shared_ptr<Wrapper<edm::DetSetVector<PixelDigi>> const> inputPTR =
+        getProductByTag<edm::DetSetVector<PixelDigi>>(*ep, pixeldigi_collectionPile_, mcc);
 
+    if (inputPTR) {
+      const edm::DetSetVector<PixelDigi> *input = const_cast<edm::DetSetVector<PixelDigi> *>(inputPTR->product());
 
       //   Handle< edm::DetSetVector<PixelDigi> >  input;
 
       //   if( e->getByLabel(pixeldigi_collectionPile_,input) ) {
 
-      //loop on all detsets (detectorIDs) inside the input collection
-      edm::DetSetVector<PixelDigi>::const_iterator DSViter=input->begin();
-      for (; DSViter!=input->end();DSViter++){
-
+      // loop on all detsets (detectorIDs) inside the input collection
+      edm::DetSetVector<PixelDigi>::const_iterator DSViter = input->begin();
+      for (; DSViter != input->end(); DSViter++) {
 #ifdef DEBUG
-	LogDebug("DataMixingSiPixelWorker")  << "Pileups: Processing DetID " << DSViter->id;
+        LogDebug("DataMixingSiPixelWorker") << "Pileups: Processing DetID " << DSViter->id;
 #endif
 
-	uint32_t detID = DSViter->id;
-	edm::DetSet<PixelDigi>::const_iterator begin =(DSViter->data).begin();
-	edm::DetSet<PixelDigi>::const_iterator end   =(DSViter->data).end();
-	edm::DetSet<PixelDigi>::const_iterator icopy;
+        uint32_t detID = DSViter->id;
+        edm::DetSet<PixelDigi>::const_iterator begin = (DSViter->data).begin();
+        edm::DetSet<PixelDigi>::const_iterator end = (DSViter->data).end();
+        edm::DetSet<PixelDigi>::const_iterator icopy;
 
-	// find correct local map (or new one) for this detector ID
+        // find correct local map (or new one) for this detector ID
 
-	SiGlobalIndex::const_iterator itest;
+        SiGlobalIndex::const_iterator itest;
 
-	itest = SiHitStorage_.find(detID);
+        itest = SiHitStorage_.find(detID);
 
-	if(itest!=SiHitStorage_.end()) {  // this detID already has hits, add to existing map
+        if (itest != SiHitStorage_.end()) {  // this detID already has hits, add to existing map
 
-	  OneDetectorMap LocalMap = itest->second;
+          OneDetectorMap LocalMap = itest->second;
 
-	  // fill in local map with extra channels
-	  for (icopy=begin; icopy!=end; icopy++) {
-	    LocalMap.insert(OneDetectorMap::value_type( (icopy->channel()), *icopy ));
-	  }
+          // fill in local map with extra channels
+          for (icopy = begin; icopy != end; icopy++) {
+            LocalMap.insert(OneDetectorMap::value_type((icopy->channel()), *icopy));
+          }
 
-	  SiHitStorage_[detID]=LocalMap;
-	  
-	}
-	else{ // fill local storage with this information, put in global collection
+          SiHitStorage_[detID] = LocalMap;
 
-	  OneDetectorMap LocalMap;
+        } else {  // fill local storage with this information, put in global
+                  // collection
 
-	  for (icopy=begin; icopy!=end; icopy++) {
-	    LocalMap.insert(OneDetectorMap::value_type( (icopy->channel()), *icopy ));
-	  }
+          OneDetectorMap LocalMap;
 
-	  SiHitStorage_.insert( SiGlobalIndex::value_type( detID, LocalMap ) );
-	}
+          for (icopy = begin; icopy != end; icopy++) {
+            LocalMap.insert(OneDetectorMap::value_type((icopy->channel()), *icopy));
+          }
 
+          SiHitStorage_.insert(SiGlobalIndex::value_type(detID, LocalMap));
+        }
       }
     }
   }
 
-
- 
   void DataMixingSiPixelWorker::putSiPixel(edm::Event &e) {
-
     // collection of Digis to put in the event
 
-    std::vector< edm::DetSet<PixelDigi> > vPixelDigi;
+    std::vector<edm::DetSet<PixelDigi>> vPixelDigi;
 
-    // loop through our collection of detectors, merging hits and putting new ones in the output
+    // loop through our collection of detectors, merging hits and putting new ones
+    // in the output
 
     // big loop over Detector IDs:
 
-    for(SiGlobalIndex::const_iterator IDet = SiHitStorage_.begin();
-	IDet != SiHitStorage_.end(); IDet++) {
+    for (SiGlobalIndex::const_iterator IDet = SiHitStorage_.begin(); IDet != SiHitStorage_.end(); IDet++) {
+      edm::DetSet<PixelDigi> SPD(IDet->first);  // Make empty collection with this detector ID
 
-      edm::DetSet<PixelDigi> SPD(IDet->first); // Make empty collection with this detector ID
-	
       OneDetectorMap LocalMap = IDet->second;
 
-      //counter variables
+      // counter variables
       int formerPixel = -1;
       int currentPixel;
       int ADCSum = 0;
 
-
       OneDetectorMap::const_iterator iLocalchk;
 
-      for(OneDetectorMap::const_iterator iLocal  = LocalMap.begin();
-	  iLocal != LocalMap.end(); ++iLocal) {
-
-	currentPixel = iLocal->first; 
-
-	if (currentPixel == formerPixel) { // we have to add these digis together
-	  ADCSum+=(iLocal->second).adc();
-	}
-	else{
-	  if(formerPixel!=-1){             // ADC info stolen from SiStrips...
-	    if (ADCSum > 511) ADCSum = 255;
-	    else if (ADCSum > 253 && ADCSum < 512) ADCSum = 254;
-	    PixelDigi aHit(formerPixel, ADCSum);
-	    SPD.push_back( aHit );	  
-	  }
-	  // save pointers for next iteration
-	  formerPixel = currentPixel;
-	  ADCSum = (iLocal->second).adc();
-	}
-
-	iLocalchk = iLocal;
-	if((++iLocalchk) == LocalMap.end()) {  //make sure not to lose the last one
-	  if (ADCSum > 511) ADCSum = 255;
-	  else if (ADCSum > 253 && ADCSum < 512) ADCSum = 254;
-	  SPD.push_back( PixelDigi(formerPixel, ADCSum) );	  
-	} 
-
-      }// end of loop over one detector
+      for (OneDetectorMap::const_iterator iLocal = LocalMap.begin(); iLocal != LocalMap.end(); ++iLocal) {
+        currentPixel = iLocal->first;
+
+        if (currentPixel == formerPixel) {  // we have to add these digis together
+          ADCSum += (iLocal->second).adc();
+        } else {
+          if (formerPixel != -1) {  // ADC info stolen from SiStrips...
+            if (ADCSum > 511)
+              ADCSum = 255;
+            else if (ADCSum > 253 && ADCSum < 512)
+              ADCSum = 254;
+            PixelDigi aHit(formerPixel, ADCSum);
+            SPD.push_back(aHit);
+          }
+          // save pointers for next iteration
+          formerPixel = currentPixel;
+          ADCSum = (iLocal->second).adc();
+        }
+
+        iLocalchk = iLocal;
+        if ((++iLocalchk) == LocalMap.end()) {  // make sure not to lose the last one
+          if (ADCSum > 511)
+            ADCSum = 255;
+          else if (ADCSum > 253 && ADCSum < 512)
+            ADCSum = 254;
+          SPD.push_back(PixelDigi(formerPixel, ADCSum));
+        }
+
+      }  // end of loop over one detector
 
       // stick this into the global vector of detector info
       vPixelDigi.push_back(SPD);
 
-    } // end of big loop over all detector IDs
+    }  // end of big loop over all detector IDs
 
-    // put the collection of digis in the event   
-    LogInfo("DataMixingSiPixelWorker") << "total # Merged Pixels: " << vPixelDigi.size() ;
+    // put the collection of digis in the event
+    LogInfo("DataMixingSiPixelWorker") << "total # Merged Pixels: " << vPixelDigi.size();
 
     // make new digi collection
-    
-    std::unique_ptr< edm::DetSetVector<PixelDigi> > MyPixelDigis(new edm::DetSetVector<PixelDigi>(vPixelDigi) );
+
+    std::unique_ptr<edm::DetSetVector<PixelDigi>> MyPixelDigis(new edm::DetSetVector<PixelDigi>(vPixelDigi));
 
     // put collection
 
-    e.put(std::move(MyPixelDigis), PixelDigiCollectionDM_ );
+    e.put(std::move(MyPixelDigis), PixelDigiCollectionDM_);
 
     // clear local storage for this event
     SiHitStorage_.clear();
   }
 
-} //edm
+}  // namespace edm
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingSiPixelWorker.h b/SimGeneral/DataMixingModule/plugins/DataMixingSiPixelWorker.h
index b6bbf7d88d657..b50c9cdcf6792 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingSiPixelWorker.h
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingSiPixelWorker.h
@@ -3,7 +3,7 @@
 
 /** \class DataMixingSiPixelWorker
  *
- * DataMixingModule is the EDProducer subclass 
+ * DataMixingModule is the EDProducer subclass
  * that overlays rawdata events on top of MC,
  * using real data for pileup simulation
  * This class takes care of the Si Pixel information
@@ -14,67 +14,66 @@
  *
  ************************************************************/
 
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventPrincipal.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 
-#include "DataFormats/Provenance/interface/ProductID.h"
 #include "DataFormats/Common/interface/Handle.h"
-//Data Formats
-#include "DataFormats/Common/interface/DetSetVector.h"
+#include "DataFormats/Provenance/interface/ProductID.h"
+// Data Formats
 #include "DataFormats/Common/interface/DetSet.h"
+#include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
 
 #include <map>
-#include <vector>
 #include <string>
+#include <vector>
 
-
-namespace edm
-{
+namespace edm {
   class ModuleCallingContext;
 
-  class DataMixingSiPixelWorker
-    {
-    public:
-
-      DataMixingSiPixelWorker();
-
-     /** standard constructor*/
-      explicit DataMixingSiPixelWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC);
-
-      /**Default destructor*/
-      virtual ~DataMixingSiPixelWorker();
-
-      void putSiPixel(edm::Event &e) ;
-      void addSiPixelSignals(const edm::Event &e); 
-      void addSiPixelPileups(const int bcr, const edm::EventPrincipal*,unsigned int EventId, ModuleCallingContext const*);
+  class DataMixingSiPixelWorker {
+  public:
+    DataMixingSiPixelWorker();
 
+    /** standard constructor*/
+    explicit DataMixingSiPixelWorker(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC);
 
-    private:
-      // data specifiers
+    /**Default destructor*/
+    virtual ~DataMixingSiPixelWorker();
 
-      edm::InputTag pixeldigi_collectionSig_ ; // secondary name given to collection of SiPixel digis
-      edm::InputTag pixeldigi_collectionPile_ ; // secondary name given to collection of SiPixel digis
-      std::string PixelDigiCollectionDM_  ; // secondary name to be given to new SiPixel digis
+    void putSiPixel(edm::Event &e);
+    void addSiPixelSignals(const edm::Event &e);
+    void addSiPixelPileups(const int bcr,
+                           const edm::EventPrincipal *,
+                           unsigned int EventId,
+                           ModuleCallingContext const *);
 
-      edm::EDGetTokenT<edm::DetSetVector<PixelDigi> > PixelDigiToken_ ;  // Token to retrieve information 
-      edm::EDGetTokenT<edm::DetSetVector<PixelDigi> > PixelDigiPToken_ ;  // Token to retrieve information 
+  private:
+    // data specifiers
 
-      // 
+    edm::InputTag pixeldigi_collectionSig_;   // secondary name given to collection
+                                              // of SiPixel digis
+    edm::InputTag pixeldigi_collectionPile_;  // secondary name given to collection
+                                              // of SiPixel digis
+    std::string PixelDigiCollectionDM_;       // secondary name to be given to new SiPixel digis
 
-      typedef std::multimap<int, PixelDigi> OneDetectorMap;   // maps by pixel ID for later combination - can have duplicate pixels
-      typedef std::map<uint32_t, OneDetectorMap> SiGlobalIndex; // map to all data for each detector ID
+    edm::EDGetTokenT<edm::DetSetVector<PixelDigi>> PixelDigiToken_;   // Token to retrieve information
+    edm::EDGetTokenT<edm::DetSetVector<PixelDigi>> PixelDigiPToken_;  // Token to retrieve information
 
-      SiGlobalIndex SiHitStorage_;
+    //
 
+    typedef std::multimap<int, PixelDigi> OneDetectorMap;      // maps by pixel ID for later combination - can have
+                                                               // duplicate pixels
+    typedef std::map<uint32_t, OneDetectorMap> SiGlobalIndex;  // map to all data for each detector ID
 
-      //      unsigned int eventId_; //=0 for signal, from 1-n for pileup events
+    SiGlobalIndex SiHitStorage_;
 
-      std::string label_;
+    //      unsigned int eventId_; //=0 for signal, from 1-n for pileup events
 
-    };
-}//edm
+    std::string label_;
+  };
+}  // namespace edm
 
-#endif // SimDataMixingSiPixelWorker_h
+#endif  // SimDataMixingSiPixelWorker_h
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingSiStripRawWorker.cc b/SimGeneral/DataMixingModule/plugins/DataMixingSiStripRawWorker.cc
index 216629741cb58..e58bfc143a77a 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingSiStripRawWorker.cc
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingSiStripRawWorker.cc
@@ -4,202 +4,183 @@
 //
 //--------------------------------------------
 
+#include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <map>
 #include <memory>
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/Common/interface/Handle.h"
 //
 //
 #include "DataMixingSiStripRawWorker.h"
 
 using namespace std;
 
-namespace edm
-{
+namespace edm {
 
   // Virtual constructor
 
-  DataMixingSiStripRawWorker::DataMixingSiStripRawWorker() { }
+  DataMixingSiStripRawWorker::DataMixingSiStripRawWorker() {}
 
-  // Constructor 
-  DataMixingSiStripRawWorker::DataMixingSiStripRawWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC) : 
-							    label_(ps.getParameter<std::string>("Label"))
-
-  {                                                         
+  // Constructor
+  DataMixingSiStripRawWorker::DataMixingSiStripRawWorker(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC)
+      : label_(ps.getParameter<std::string>("Label"))
 
+  {
     // get the subdetector names
-    //    this->getSubdetectorNames();  //something like this may be useful to check what we are supposed to do...
+    //    this->getSubdetectorNames();  //something like this may be useful to
+    //    check what we are supposed to do...
 
     // declare the products to produce
 
-    Sistripdigi_collectionSig_   = ps.getParameter<edm::InputTag>("SistripdigiCollectionSig");
-    SistripLabelSig_   = ps.getParameter<edm::InputTag>("SistripLabelSig");
+    Sistripdigi_collectionSig_ = ps.getParameter<edm::InputTag>("SistripdigiCollectionSig");
+    SistripLabelSig_ = ps.getParameter<edm::InputTag>("SistripLabelSig");
 
     SiStripPileInputTag_ = ps.getParameter<edm::InputTag>("SiStripPileInputTag");
     SiStripRawInputTag_ = ps.getParameter<edm::InputTag>("SiStripRawInputTag");
 
-    SiStripDigiCollectionDM_  = ps.getParameter<std::string>("SiStripDigiCollectionDM");
+    SiStripDigiCollectionDM_ = ps.getParameter<std::string>("SiStripDigiCollectionDM");
 
     SiStripRawDigiSource_ = ps.getParameter<std::string>("SiStripRawDigiSource");
 
-    // clear local storage for this event                                                                     
+    // clear local storage for this event
     SiHitStorage_.clear();
-    
-    edm::InputTag tag = edm::InputTag(Sistripdigi_collectionSig_.label(),SistripLabelSig_.label());
 
-    SiStripInputTok_ = iC.consumes< edm::DetSetVector<SiStripDigi> >(tag);
-    SiStripRawInputTok_ = iC.consumes< edm::DetSetVector<SiStripRawDigi> >(SiStripRawInputTag_);
+    edm::InputTag tag = edm::InputTag(Sistripdigi_collectionSig_.label(), SistripLabelSig_.label());
 
+    SiStripInputTok_ = iC.consumes<edm::DetSetVector<SiStripDigi>>(tag);
+    SiStripRawInputTok_ = iC.consumes<edm::DetSetVector<SiStripRawDigi>>(SiStripRawInputTag_);
   }
-	       
 
   // Virtual destructor needed.
-  DataMixingSiStripRawWorker::~DataMixingSiStripRawWorker() { 
-  }  
-
+  DataMixingSiStripRawWorker::~DataMixingSiStripRawWorker() {}
 
+  void DataMixingSiStripRawWorker::addSiStripSignals(const edm::Event &e) {
+    edm::Handle<edm::DetSetVector<SiStripDigi>> hSSD;
+    edm::Handle<edm::DetSetVector<SiStripRawDigi>> hSSRD;
 
-  void DataMixingSiStripRawWorker::addSiStripSignals(const edm::Event &e) { 
-
-    
-    edm::Handle< edm::DetSetVector<SiStripDigi> >      hSSD;
-    edm::Handle< edm::DetSetVector<SiStripRawDigi> >   hSSRD;
-    
-    if (SiStripRawDigiSource_=="SIGNAL") {
-      e.getByToken(SiStripRawInputTok_,hSSRD);
+    if (SiStripRawDigiSource_ == "SIGNAL") {
+      e.getByToken(SiStripRawInputTok_, hSSRD);
       rawdigicollection_ = hSSRD.product();
-    } else if (SiStripRawDigiSource_=="PILEUP") {
-      e.getByToken(SiStripInputTok_,hSSD);
-      digicollection_ =  hSSD.product();
-    } //else {
-      //std::cout << "you shouldn't be here" << std::endl;
-      //}
-    
-
-  } // end of addSiStripSignals
-
-
-
-  void DataMixingSiStripRawWorker::addSiStripPileups(const int bcr, const EventPrincipal *ep, unsigned int eventNr,
-                                                     ModuleCallingContext const* mcc) {
-    
-    LogDebug("DataMixingSiStripRawWorker") << "\n===============> adding pileups from event  "
-					   << ep->id() << " for bunchcrossing " << bcr;
-
-    std::shared_ptr<Wrapper<edm::DetSetVector<SiStripDigi> > const>    pSSD;
-    std::shared_ptr<Wrapper<edm::DetSetVector<SiStripRawDigi> > const> pSSRD;
-    
-    if (SiStripRawDigiSource_=="SIGNAL") {
-      pSSD = getProductByTag<edm::DetSetVector<SiStripDigi> >(*ep, SiStripPileInputTag_, mcc);
-      digicollection_ = const_cast< edm::DetSetVector<SiStripDigi> * >(pSSD->product());
-    } else if (SiStripRawDigiSource_=="PILEUP") {
-      pSSRD = getProductByTag<edm::DetSetVector<SiStripRawDigi> >(*ep, SiStripRawInputTag_, mcc);
-      rawdigicollection_ = const_cast< edm::DetSetVector<SiStripRawDigi> * >(pSSRD->product());
+    } else if (SiStripRawDigiSource_ == "PILEUP") {
+      e.getByToken(SiStripInputTok_, hSSD);
+      digicollection_ = hSSD.product();
+    }  // else {
+       // std::cout << "you shouldn't be here" << std::endl;
+       //}
+
+  }  // end of addSiStripSignals
+
+  void DataMixingSiStripRawWorker::addSiStripPileups(const int bcr,
+                                                     const EventPrincipal *ep,
+                                                     unsigned int eventNr,
+                                                     ModuleCallingContext const *mcc) {
+    LogDebug("DataMixingSiStripRawWorker")
+        << "\n===============> adding pileups from event  " << ep->id() << " for bunchcrossing " << bcr;
+
+    std::shared_ptr<Wrapper<edm::DetSetVector<SiStripDigi>> const> pSSD;
+    std::shared_ptr<Wrapper<edm::DetSetVector<SiStripRawDigi>> const> pSSRD;
+
+    if (SiStripRawDigiSource_ == "SIGNAL") {
+      pSSD = getProductByTag<edm::DetSetVector<SiStripDigi>>(*ep, SiStripPileInputTag_, mcc);
+      digicollection_ = const_cast<edm::DetSetVector<SiStripDigi> *>(pSSD->product());
+    } else if (SiStripRawDigiSource_ == "PILEUP") {
+      pSSRD = getProductByTag<edm::DetSetVector<SiStripRawDigi>>(*ep, SiStripRawInputTag_, mcc);
+      rawdigicollection_ = const_cast<edm::DetSetVector<SiStripRawDigi> *>(pSSRD->product());
     } else {
       std::cout << "you shouldn't be here" << std::endl;
     }
 
-  } // end of addSiStripPileups
+  }  // end of addSiStripPileups
 
- 
   void DataMixingSiStripRawWorker::putSiStrip(edm::Event &e) {
-
-
     //------------------
     //  (1) Fill a map from the Digi collection
     //
 
     // fill in maps of SiStripDigis
     OneDetectorMap LocalMap;
-    
-    //loop on all detsets (detectorIDs) inside the input collection
-    edm::DetSetVector<SiStripDigi>::const_iterator DSViter=digicollection_->begin();
-    for (; DSViter!=digicollection_->end();DSViter++){
-      
+
+    // loop on all detsets (detectorIDs) inside the input collection
+    edm::DetSetVector<SiStripDigi>::const_iterator DSViter = digicollection_->begin();
+    for (; DSViter != digicollection_->end(); DSViter++) {
 #ifdef DEBUG
-      LogDebug("DataMixingSiStripRawWorker")  << "Processing DetID " << DSViter->id;
+      LogDebug("DataMixingSiStripRawWorker") << "Processing DetID " << DSViter->id;
 #endif
-      
+
       LocalMap.clear();
       LocalMap.reserve((DSViter->data).size());
-      LocalMap.insert(LocalMap.end(),(DSViter->data).begin(),(DSViter->data).end());	
-      
-      SiHitStorage_.insert( SiGlobalIndex::value_type( DSViter->id, LocalMap ) );
-    }
+      LocalMap.insert(LocalMap.end(), (DSViter->data).begin(), (DSViter->data).end());
 
+      SiHitStorage_.insert(SiGlobalIndex::value_type(DSViter->id, LocalMap));
+    }
 
     //------------------
     //  (2) Loop over the input RawDigi collection and add the Digis from the map
     //
 
     // collection of RawDigis to put back in the event
-    std::vector< edm::DetSet<SiStripRawDigi> > vSiStripRawDigi;
-
-    //loop on all detsets (detectorIDs) inside the SiStripRawDigis collection
-    edm::DetSetVector<SiStripRawDigi>::const_iterator rawDSViter=rawdigicollection_->begin();
-    for (; rawDSViter!=rawdigicollection_->end();rawDSViter++){
+    std::vector<edm::DetSet<SiStripRawDigi>> vSiStripRawDigi;
 
+    // loop on all detsets (detectorIDs) inside the SiStripRawDigis collection
+    edm::DetSetVector<SiStripRawDigi>::const_iterator rawDSViter = rawdigicollection_->begin();
+    for (; rawDSViter != rawdigicollection_->end(); rawDSViter++) {
       // Make empty collection with this detID
-      edm::DetSet<SiStripRawDigi> SSRD(rawDSViter->id); 
+      edm::DetSet<SiStripRawDigi> SSRD(rawDSViter->id);
 
       // find local map (if it exists) for this detector ID
       SiGlobalIndex::const_iterator itest;
       itest = SiHitStorage_.find(rawDSViter->id);
 
       // if detID already has digis in existing map, add them to rawdigis
-      if(itest!=SiHitStorage_.end()) {  
-
+      if (itest != SiHitStorage_.end()) {
 #ifdef DEBUG
-	LogDebug("DataMixingSiStripRawWorker")  << "Pileups: Processing DetID " << rawDSViter->id;
+        LogDebug("DataMixingSiStripRawWorker") << "Pileups: Processing DetID " << rawDSViter->id;
 #endif
 
-	// get the map from storage
-	LocalMap = itest->second;
-	OneDetectorMap::const_iterator iLocal  = LocalMap.begin();
-
-	// loop on all strips in rawdigi detset
-	int currentstrip=0;
-	edm::DetSet<SiStripRawDigi>::const_iterator iRawDigi = rawDSViter->begin();
-	while( iRawDigi != rawDSViter->end() ) {
-
-	  int ADCSum = iRawDigi->adc();
-
-	  // if current strip exists in map, add ADC values
-	  if(iLocal->strip() == currentstrip) {
-	    ADCSum += iLocal->adc();
-	    iLocal++;
-	  }
-
-	  // put ADC sum in DetSet and go to next strip
-	  SSRD.push_back( SiStripRawDigi(ADCSum) );
-	  iRawDigi++;
-	  currentstrip++;
-
-	}
-
-	// copy combined digi+rawdigi into rawdigi DetSetVector
-	vSiStripRawDigi.push_back(SSRD);
-
-      // otherwise, just copy the rawdigis from the background event to the output
+        // get the map from storage
+        LocalMap = itest->second;
+        OneDetectorMap::const_iterator iLocal = LocalMap.begin();
+
+        // loop on all strips in rawdigi detset
+        int currentstrip = 0;
+        edm::DetSet<SiStripRawDigi>::const_iterator iRawDigi = rawDSViter->begin();
+        while (iRawDigi != rawDSViter->end()) {
+          int ADCSum = iRawDigi->adc();
+
+          // if current strip exists in map, add ADC values
+          if (iLocal->strip() == currentstrip) {
+            ADCSum += iLocal->adc();
+            iLocal++;
+          }
+
+          // put ADC sum in DetSet and go to next strip
+          SSRD.push_back(SiStripRawDigi(ADCSum));
+          iRawDigi++;
+          currentstrip++;
+        }
+
+        // copy combined digi+rawdigi into rawdigi DetSetVector
+        vSiStripRawDigi.push_back(SSRD);
+
+        // otherwise, just copy the rawdigis from the background event to the
+        // output
       } else {
-	vSiStripRawDigi.push_back(*rawDSViter);
+        vSiStripRawDigi.push_back(*rawDSViter);
       }
-
     }
 
-
     //------------------
     //  (3) Put the new RawDigi collection back into the event
     //
 
     // make new raw digi collection
-    std::unique_ptr< edm::DetSetVector<SiStripRawDigi> > MySiStripRawDigis(new edm::DetSetVector<SiStripRawDigi>(vSiStripRawDigi) );
+    std::unique_ptr<edm::DetSetVector<SiStripRawDigi>> MySiStripRawDigis(
+        new edm::DetSetVector<SiStripRawDigi>(vSiStripRawDigi));
 
     // put collection
-    e.put(std::move(MySiStripRawDigis), SiStripDigiCollectionDM_ );
+    e.put(std::move(MySiStripRawDigis), SiStripDigiCollectionDM_);
 
     // clear local storage for this event
     SiHitStorage_.clear();
   }
 
-}
+}  // namespace edm
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingSiStripRawWorker.h b/SimGeneral/DataMixingModule/plugins/DataMixingSiStripRawWorker.h
index e3209f115be8d..1fafd22891305 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingSiStripRawWorker.h
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingSiStripRawWorker.h
@@ -3,7 +3,7 @@
 
 /** \class DataMixingSiStripRawWorker
  *
- * DataMixingModule is the EDProducer subclass 
+ * DataMixingModule is the EDProducer subclass
  * that overlays rawdata events on top of MC,
  * using real data for pileup simulation
  * This class takes care of the SiStrip information
@@ -14,72 +14,72 @@
  *
  ************************************************************/
 
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventPrincipal.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 
-#include "DataFormats/Provenance/interface/ProductID.h"
 #include "DataFormats/Common/interface/Handle.h"
-//Data Formats
-#include "DataFormats/Common/interface/DetSetVector.h"
+#include "DataFormats/Provenance/interface/ProductID.h"
+// Data Formats
 #include "DataFormats/Common/interface/DetSet.h"
+#include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/SiStripDigi/interface/SiStripDigi.h"
 #include "DataFormats/SiStripDigi/interface/SiStripRawDigi.h"
 
 #include <map>
-#include <vector>
 #include <string>
+#include <vector>
 
-
-namespace edm
-{
+namespace edm {
   class ModuleCallingContext;
 
-  class DataMixingSiStripRawWorker
-    {
-    public:
-
-      DataMixingSiStripRawWorker();
-
-     /** standard constructor*/
-      explicit DataMixingSiStripRawWorker(const edm::ParameterSet& ps, edm::ConsumesCollector&& iC);
+  class DataMixingSiStripRawWorker {
+  public:
+    DataMixingSiStripRawWorker();
 
-      /**Default destructor*/
-      virtual ~DataMixingSiStripRawWorker();
+    /** standard constructor*/
+    explicit DataMixingSiStripRawWorker(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC);
 
-      void putSiStrip(edm::Event &e) ;
-      void addSiStripSignals(const edm::Event &e); 
-      void addSiStripPileups(const int bcr, const edm::EventPrincipal*,unsigned int EventId,
-                             ModuleCallingContext const*);
+    /**Default destructor*/
+    virtual ~DataMixingSiStripRawWorker();
 
+    void putSiStrip(edm::Event &e);
+    void addSiStripSignals(const edm::Event &e);
+    void addSiStripPileups(const int bcr,
+                           const edm::EventPrincipal *,
+                           unsigned int EventId,
+                           ModuleCallingContext const *);
 
-    private:
-      // data specifiers
+  private:
+    // data specifiers
 
-      edm::InputTag Sistripdigi_collectionSig_ ; // primary name given to collection of SiStrip digis
-      edm::InputTag SistripLabelSig_ ;           // secondary name given to collection of SiStrip digis
-      edm::InputTag SiStripPileInputTag_;        // InputTag for pileup strips
-      edm::InputTag SiStripRawInputTag_;         // InputTag for strips with rawdigis
-      edm::EDGetTokenT<edm::DetSetVector<SiStripDigi>> SiStripInputTok_ ; // InputToken for strips with rawdigis
-      edm::EDGetTokenT<edm::DetSetVector<SiStripRawDigi>> SiStripRawInputTok_ ; // InputToken for strips with rawdigis
-      std::string SiStripDigiCollectionDM_  ;    // secondary name to be given to new SiStrip raw digis
-      std::string SiStripRawDigiSource_ ;        // which collection is rawdigis: either "SIGNAL" or "PILEUP" 
+    edm::InputTag Sistripdigi_collectionSig_;  // primary name given to collection
+                                               // of SiStrip digis
+    edm::InputTag SistripLabelSig_;            // secondary name given to collection of SiStrip digis
+    edm::InputTag SiStripPileInputTag_;        // InputTag for pileup strips
+    edm::InputTag SiStripRawInputTag_;         // InputTag for strips with rawdigis
+    edm::EDGetTokenT<edm::DetSetVector<SiStripDigi>> SiStripInputTok_;        // InputToken for strips with rawdigis
+    edm::EDGetTokenT<edm::DetSetVector<SiStripRawDigi>> SiStripRawInputTok_;  // InputToken for strips with rawdigis
+    std::string SiStripDigiCollectionDM_;                                     // secondary name to be given to new
+                                                                              // SiStrip raw digis
+    std::string SiStripRawDigiSource_;                                        // which collection is rawdigis: either
+                                                                              // "SIGNAL" or "PILEUP"
 
-      // 
+    //
 
-      typedef std::vector<SiStripDigi> OneDetectorMap;   // maps by strip ID for later combination - can have duplicate strips
-      typedef std::map<uint32_t, OneDetectorMap> SiGlobalIndex; // map to all data for each detector ID
-      
-      SiGlobalIndex SiHitStorage_;
+    typedef std::vector<SiStripDigi> OneDetectorMap;           // maps by strip ID for later combination - can have
+                                                               // duplicate strips
+    typedef std::map<uint32_t, OneDetectorMap> SiGlobalIndex;  // map to all data for each detector ID
 
-      // SiStripDigi and SiStripRawDigi collections
-      const edm::DetSetVector<SiStripDigi>    *digicollection_;
-      const edm::DetSetVector<SiStripRawDigi> *rawdigicollection_;
+    SiGlobalIndex SiHitStorage_;
 
-      std::string label_;
+    // SiStripDigi and SiStripRawDigi collections
+    const edm::DetSetVector<SiStripDigi> *digicollection_;
+    const edm::DetSetVector<SiStripRawDigi> *rawdigicollection_;
 
-    };
-}//edm
+    std::string label_;
+  };
+}  // namespace edm
 
-#endif // SimDataMixingSiStripRawWorker_h
+#endif  // SimDataMixingSiStripRawWorker_h
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingSiStripWorker.cc b/SimGeneral/DataMixingModule/plugins/DataMixingSiStripWorker.cc
index a8f8da3c66ed6..33ef2e7152824 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingSiStripWorker.cc
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingSiStripWorker.cc
@@ -4,209 +4,198 @@
 //
 //--------------------------------------------
 
+#include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include <map>
 #include <memory>
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/Common/interface/Handle.h"
 //
 //
 #include "DataMixingSiStripWorker.h"
 
 using namespace std;
 
-namespace edm
-{
+namespace edm {
 
   // Virtual constructor
 
-  DataMixingSiStripWorker::DataMixingSiStripWorker() { }
-
-  // Constructor 
-  DataMixingSiStripWorker::DataMixingSiStripWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC) : 
-							    label_(ps.getParameter<std::string>("Label"))
+  DataMixingSiStripWorker::DataMixingSiStripWorker() {}
 
-  {                                                         
+  // Constructor
+  DataMixingSiStripWorker::DataMixingSiStripWorker(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC)
+      : label_(ps.getParameter<std::string>("Label"))
 
+  {
     // get the subdetector names
-    //    this->getSubdetectorNames();  //something like this may be useful to check what we are supposed to do...
+    //    this->getSubdetectorNames();  //something like this may be useful to
+    //    check what we are supposed to do...
 
     // declare the products to produce
 
-    SistripLabelSig_   = ps.getParameter<edm::InputTag>("SistripLabelSig");
+    SistripLabelSig_ = ps.getParameter<edm::InputTag>("SistripLabelSig");
     SiStripPileInputTag_ = ps.getParameter<edm::InputTag>("SiStripPileInputTag");
 
-    SiStripDigiCollectionDM_  = ps.getParameter<std::string>("SiStripDigiCollectionDM");
-
-    SiStripDigiToken_ = iC.consumes<edm::DetSetVector<SiStripDigi> >(SistripLabelSig_);
-    SiStripDigiPToken_ = iC.consumes<edm::DetSetVector<SiStripDigi> >(SiStripPileInputTag_);
+    SiStripDigiCollectionDM_ = ps.getParameter<std::string>("SiStripDigiCollectionDM");
 
+    SiStripDigiToken_ = iC.consumes<edm::DetSetVector<SiStripDigi>>(SistripLabelSig_);
+    SiStripDigiPToken_ = iC.consumes<edm::DetSetVector<SiStripDigi>>(SiStripPileInputTag_);
 
-
-    // clear local storage for this event                                                                     
+    // clear local storage for this event
     SiHitStorage_.clear();
-
   }
-	       
 
   // Virtual destructor needed.
-  DataMixingSiStripWorker::~DataMixingSiStripWorker() { 
-  }  
-
-
+  DataMixingSiStripWorker::~DataMixingSiStripWorker() {}
 
-  void DataMixingSiStripWorker::addSiStripSignals(const edm::Event &e) { 
+  void DataMixingSiStripWorker::addSiStripSignals(const edm::Event &e) {
     // fill in maps of hits
 
-    Handle< edm::DetSetVector<SiStripDigi> >  input;
+    Handle<edm::DetSetVector<SiStripDigi>> input;
 
-    if( e.getByToken(SiStripDigiToken_,input) ) {
+    if (e.getByToken(SiStripDigiToken_, input)) {
       OneDetectorMap LocalMap;
 
-      //loop on all detsets (detectorIDs) inside the input collection
-      edm::DetSetVector<SiStripDigi>::const_iterator DSViter=input->begin();
-      for (; DSViter!=input->end();DSViter++){
-
+      // loop on all detsets (detectorIDs) inside the input collection
+      edm::DetSetVector<SiStripDigi>::const_iterator DSViter = input->begin();
+      for (; DSViter != input->end(); DSViter++) {
 #ifdef DEBUG
-	LogDebug("DataMixingSiStripWorker")  << "Processing DetID " << DSViter->id;
+        LogDebug("DataMixingSiStripWorker") << "Processing DetID " << DSViter->id;
 #endif
 
-	LocalMap.clear();
-	LocalMap.reserve((DSViter->data).size());
-	LocalMap.insert(LocalMap.end(),(DSViter->data).begin(),(DSViter->data).end());	
-	
-	SiHitStorage_.insert( SiGlobalIndex::value_type( DSViter->id, LocalMap ) );
+        LocalMap.clear();
+        LocalMap.reserve((DSViter->data).size());
+        LocalMap.insert(LocalMap.end(), (DSViter->data).begin(), (DSViter->data).end());
+
+        SiHitStorage_.insert(SiGlobalIndex::value_type(DSViter->id, LocalMap));
       }
- 
     }
-  } // end of addSiStripSignals
-
-
-
-  void DataMixingSiStripWorker::addSiStripPileups(const int bcr, const EventPrincipal *ep, unsigned int eventNr,
-                                                  ModuleCallingContext const* mcc) {
-    LogDebug("DataMixingSiStripWorker") <<"\n===============> adding pileups from event  "<<ep->id()<<" for bunchcrossing "<<bcr;
+  }  // end of addSiStripSignals
 
-    // fill in maps of hits; same code as addSignals, except now applied to the pileup events
+  void DataMixingSiStripWorker::addSiStripPileups(const int bcr,
+                                                  const EventPrincipal *ep,
+                                                  unsigned int eventNr,
+                                                  ModuleCallingContext const *mcc) {
+    LogDebug("DataMixingSiStripWorker") << "\n===============> adding pileups from event  " << ep->id()
+                                        << " for bunchcrossing " << bcr;
 
-    std::shared_ptr<Wrapper<edm::DetSetVector<SiStripDigi> >  const> inputPTR =
-      getProductByTag<edm::DetSetVector<SiStripDigi> >(*ep, SiStripPileInputTag_, mcc);
+    // fill in maps of hits; same code as addSignals, except now applied to the
+    // pileup events
 
-    if(inputPTR ) {
+    std::shared_ptr<Wrapper<edm::DetSetVector<SiStripDigi>> const> inputPTR =
+        getProductByTag<edm::DetSetVector<SiStripDigi>>(*ep, SiStripPileInputTag_, mcc);
 
-      const edm::DetSetVector<SiStripDigi>  *input = const_cast< edm::DetSetVector<SiStripDigi> * >(inputPTR->product());
+    if (inputPTR) {
+      const edm::DetSetVector<SiStripDigi> *input = const_cast<edm::DetSetVector<SiStripDigi> *>(inputPTR->product());
 
       // Handle< edm::DetSetVector<SiStripDigi> >  input;
 
-      // if( e->getByLabel(Sistripdigi_collectionPile_.label(),SistripLabelPile_.label(),input) ) {
+      // if(
+      // e->getByLabel(Sistripdigi_collectionPile_.label(),SistripLabelPile_.label(),input)
+      // ) {
 
       OneDetectorMap LocalMap;
 
-      //loop on all detsets (detectorIDs) inside the input collection
-      edm::DetSetVector<SiStripDigi>::const_iterator DSViter=input->begin();
-      for (; DSViter!=input->end();DSViter++){
-
+      // loop on all detsets (detectorIDs) inside the input collection
+      edm::DetSetVector<SiStripDigi>::const_iterator DSViter = input->begin();
+      for (; DSViter != input->end(); DSViter++) {
 #ifdef DEBUG
-	LogDebug("DataMixingSiStripWorker")  << "Pileups: Processing DetID " << DSViter->id;
+        LogDebug("DataMixingSiStripWorker") << "Pileups: Processing DetID " << DSViter->id;
 #endif
 
-	// find correct local map (or new one) for this detector ID
+        // find correct local map (or new one) for this detector ID
+
+        SiGlobalIndex::const_iterator itest;
 
-	SiGlobalIndex::const_iterator itest;
+        itest = SiHitStorage_.find(DSViter->id);
 
-	itest = SiHitStorage_.find(DSViter->id);
+        if (itest != SiHitStorage_.end()) {  // this detID already has hits, add to existing map
 
-	if(itest!=SiHitStorage_.end()) {  // this detID already has hits, add to existing map
+          LocalMap = itest->second;
 
-	  LocalMap = itest->second;
+          // fill in local map with extra channels
+          LocalMap.insert(LocalMap.end(), (DSViter->data).begin(), (DSViter->data).end());
+          std::stable_sort(LocalMap.begin(), LocalMap.end(), DataMixingSiStripWorker::StrictWeakOrdering());
+          SiHitStorage_[DSViter->id] = LocalMap;
 
-	  // fill in local map with extra channels
-	  LocalMap.insert(LocalMap.end(),(DSViter->data).begin(),(DSViter->data).end());
-	  std::stable_sort(LocalMap.begin(),LocalMap.end(),DataMixingSiStripWorker::StrictWeakOrdering());
-	  SiHitStorage_[DSViter->id]=LocalMap;
-	  
-	}
-	else{ // fill local storage with this information, put in global collection
+        } else {  // fill local storage with this information, put in global
+                  // collection
 
-	  LocalMap.clear();
-	  LocalMap.reserve((DSViter->data).size());
-	  LocalMap.insert(LocalMap.end(),(DSViter->data).begin(),(DSViter->data).end());
+          LocalMap.clear();
+          LocalMap.reserve((DSViter->data).size());
+          LocalMap.insert(LocalMap.end(), (DSViter->data).begin(), (DSViter->data).end());
 
-	  SiHitStorage_.insert( SiGlobalIndex::value_type( DSViter->id, LocalMap ) );
-	}
+          SiHitStorage_.insert(SiGlobalIndex::value_type(DSViter->id, LocalMap));
+        }
       }
     }
   }
 
-
- 
   void DataMixingSiStripWorker::putSiStrip(edm::Event &e) {
-
     // collection of Digis to put in the event
-    std::vector< edm::DetSet<SiStripDigi> > vSiStripDigi;
+    std::vector<edm::DetSet<SiStripDigi>> vSiStripDigi;
 
-    // loop through our collection of detectors, merging hits and putting new ones in the output
+    // loop through our collection of detectors, merging hits and putting new ones
+    // in the output
 
     // big loop over Detector IDs:
 
-    for(SiGlobalIndex::const_iterator IDet = SiHitStorage_.begin();
-	IDet != SiHitStorage_.end(); IDet++) {
+    for (SiGlobalIndex::const_iterator IDet = SiHitStorage_.begin(); IDet != SiHitStorage_.end(); IDet++) {
+      edm::DetSet<SiStripDigi> SSD(IDet->first);  // Make empty collection with this detector ID
 
-      edm::DetSet<SiStripDigi> SSD(IDet->first); // Make empty collection with this detector ID
-	
       OneDetectorMap LocalMap = IDet->second;
 
-      //counter variables
+      // counter variables
       int formerStrip = -1;
       int currentStrip;
       int ADCSum = 0;
 
       OneDetectorMap::const_iterator iLocalchk;
-      OneDetectorMap::const_iterator iLocal  = LocalMap.begin();
-      for(;iLocal != LocalMap.end(); ++iLocal) {
-
-	currentStrip = iLocal->strip(); 
-
-	if (currentStrip == formerStrip) { // we have to add these digis together
-	  ADCSum+=iLocal->adc();          // on every element...
-	}
-	else{
-	  if(formerStrip!=-1){
-	    if (ADCSum > 511) ADCSum = 255;
-	    else if (ADCSum > 253 && ADCSum < 512) ADCSum = 254;
-	    SiStripDigi aHit(formerStrip, ADCSum);
-	    SSD.push_back( aHit );	  
-	  }
-	  // save pointers for next iteration
-	  formerStrip = currentStrip;
-	  ADCSum = iLocal->adc();
-	}
-
-	iLocalchk = iLocal;
-	if((++iLocalchk) == LocalMap.end()) {  //make sure not to lose the last one
-	  if (ADCSum > 511) ADCSum = 255;
-	  else if (ADCSum > 253 && ADCSum < 512) ADCSum = 254;
-	  SSD.push_back( SiStripDigi(formerStrip, ADCSum) );	  
-	} // end of loop over one detector
-	
+      OneDetectorMap::const_iterator iLocal = LocalMap.begin();
+      for (; iLocal != LocalMap.end(); ++iLocal) {
+        currentStrip = iLocal->strip();
+
+        if (currentStrip == formerStrip) {  // we have to add these digis together
+          ADCSum += iLocal->adc();          // on every element...
+        } else {
+          if (formerStrip != -1) {
+            if (ADCSum > 511)
+              ADCSum = 255;
+            else if (ADCSum > 253 && ADCSum < 512)
+              ADCSum = 254;
+            SiStripDigi aHit(formerStrip, ADCSum);
+            SSD.push_back(aHit);
+          }
+          // save pointers for next iteration
+          formerStrip = currentStrip;
+          ADCSum = iLocal->adc();
+        }
+
+        iLocalchk = iLocal;
+        if ((++iLocalchk) == LocalMap.end()) {  // make sure not to lose the last one
+          if (ADCSum > 511)
+            ADCSum = 255;
+          else if (ADCSum > 253 && ADCSum < 512)
+            ADCSum = 254;
+          SSD.push_back(SiStripDigi(formerStrip, ADCSum));
+        }  // end of loop over one detector
       }
       // stick this into the global vector of detector info
       vSiStripDigi.push_back(SSD);
 
-    } // end of big loop over all detector IDs
+    }  // end of big loop over all detector IDs
 
-    // put the collection of digis in the event   
-    LogInfo("DataMixingSiStripWorker") << "total # Merged strips: " << vSiStripDigi.size() ;
+    // put the collection of digis in the event
+    LogInfo("DataMixingSiStripWorker") << "total # Merged strips: " << vSiStripDigi.size();
 
     // make new digi collection
-    
-    std::unique_ptr< edm::DetSetVector<SiStripDigi> > MySiStripDigis(new edm::DetSetVector<SiStripDigi>(vSiStripDigi) );
+
+    std::unique_ptr<edm::DetSetVector<SiStripDigi>> MySiStripDigis(new edm::DetSetVector<SiStripDigi>(vSiStripDigi));
 
     // put collection
 
-    e.put(std::move(MySiStripDigis), SiStripDigiCollectionDM_ );
+    e.put(std::move(MySiStripDigis), SiStripDigiCollectionDM_);
 
     // clear local storage for this event
     SiHitStorage_.clear();
   }
 
-} //edm
+}  // namespace edm
diff --git a/SimGeneral/DataMixingModule/plugins/DataMixingSiStripWorker.h b/SimGeneral/DataMixingModule/plugins/DataMixingSiStripWorker.h
index b69a19d57681d..395736d318572 100644
--- a/SimGeneral/DataMixingModule/plugins/DataMixingSiStripWorker.h
+++ b/SimGeneral/DataMixingModule/plugins/DataMixingSiStripWorker.h
@@ -3,7 +3,7 @@
 
 /** \class DataMixingSiStripWorker
  *
- * DataMixingModule is the EDProducer subclass 
+ * DataMixingModule is the EDProducer subclass
  * that overlays rawdata events on top of MC,
  * using real data for pileup simulation
  * This class takes care of the SiStrip information
@@ -14,75 +14,70 @@
  *
  ************************************************************/
 
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventPrincipal.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 
-#include "DataFormats/Provenance/interface/ProductID.h"
 #include "DataFormats/Common/interface/Handle.h"
-//Data Formats
-#include "DataFormats/Common/interface/DetSetVector.h"
+#include "DataFormats/Provenance/interface/ProductID.h"
+// Data Formats
 #include "DataFormats/Common/interface/DetSet.h"
+#include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/SiStripDigi/interface/SiStripDigi.h"
 
 #include <map>
-#include <vector>
 #include <string>
+#include <vector>
 
-
-namespace edm
-{
+namespace edm {
   class ModuleCallingContext;
 
-  class DataMixingSiStripWorker
-    {
-    public:
-
-      DataMixingSiStripWorker();
-
-     /** standard constructor*/
-      explicit DataMixingSiStripWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC);
-
-      /**Default destructor*/
-      virtual ~DataMixingSiStripWorker();
+  class DataMixingSiStripWorker {
+  public:
+    DataMixingSiStripWorker();
 
-      void putSiStrip(edm::Event &e) ;
-      void addSiStripSignals(const edm::Event &e); 
-      void addSiStripPileups(const int bcr, const edm::EventPrincipal*,unsigned int EventId,
-                             ModuleCallingContext const*);
+    /** standard constructor*/
+    explicit DataMixingSiStripWorker(const edm::ParameterSet &ps, edm::ConsumesCollector &&iC);
 
+    /**Default destructor*/
+    virtual ~DataMixingSiStripWorker();
 
-    private:
-      // data specifiers
+    void putSiStrip(edm::Event &e);
+    void addSiStripSignals(const edm::Event &e);
+    void addSiStripPileups(const int bcr,
+                           const edm::EventPrincipal *,
+                           unsigned int EventId,
+                           ModuleCallingContext const *);
 
-      edm::InputTag SistripLabelSig_ ;        // name given to collection of SiStrip digis
-      edm::InputTag SiStripPileInputTag_ ;    // InputTag for pileup strips
-      std::string SiStripDigiCollectionDM_  ; // secondary name to be given to new SiStrip digis
+  private:
+    // data specifiers
 
-      edm::EDGetTokenT<edm::DetSetVector<SiStripDigi> > SiStripDigiToken_ ;  // Token to retrieve information            
-      edm::EDGetTokenT<edm::DetSetVector<SiStripDigi> > SiStripDigiPToken_ ;  // Token to retrieve information           
+    edm::InputTag SistripLabelSig_;        // name given to collection of SiStrip digis
+    edm::InputTag SiStripPileInputTag_;    // InputTag for pileup strips
+    std::string SiStripDigiCollectionDM_;  // secondary name to be given to new
+                                           // SiStrip digis
 
+    edm::EDGetTokenT<edm::DetSetVector<SiStripDigi>> SiStripDigiToken_;   // Token to retrieve information
+    edm::EDGetTokenT<edm::DetSetVector<SiStripDigi>> SiStripDigiPToken_;  // Token to retrieve information
 
-      // 
+    //
 
-      typedef std::vector<SiStripDigi> OneDetectorMap;   // maps by strip ID for later combination - can have duplicate strips
-      typedef std::map<uint32_t, OneDetectorMap> SiGlobalIndex; // map to all data for each detector ID
+    typedef std::vector<SiStripDigi> OneDetectorMap;           // maps by strip ID for later combination - can have
+                                                               // duplicate strips
+    typedef std::map<uint32_t, OneDetectorMap> SiGlobalIndex;  // map to all data for each detector ID
 
-      SiGlobalIndex SiHitStorage_;
+    SiGlobalIndex SiHitStorage_;
 
+    //      unsigned int eventId_; //=0 for signal, from 1-n for pileup events
 
-      //      unsigned int eventId_; //=0 for signal, from 1-n for pileup events
-
-      std::string label_;
-
-      class StrictWeakOrdering{
-      public:
-	bool operator() (SiStripDigi i,SiStripDigi j) const {return i.strip() < j.strip();}
-      };
-
+    std::string label_;
 
+    class StrictWeakOrdering {
+    public:
+      bool operator()(SiStripDigi i, SiStripDigi j) const { return i.strip() < j.strip(); }
     };
-}//edm
+  };
+}  // namespace edm
 
-#endif // SimDataMixingSiStripWorker_h
+#endif  // SimDataMixingSiStripWorker_h
diff --git a/SimGeneral/DataMixingModule/plugins/HcalNoiseStorage.h b/SimGeneral/DataMixingModule/plugins/HcalNoiseStorage.h
index 80a2efa1b6878..30b581c2673c6 100644
--- a/SimGeneral/DataMixingModule/plugins/HcalNoiseStorage.h
+++ b/SimGeneral/DataMixingModule/plugins/HcalNoiseStorage.h
@@ -3,7 +3,7 @@
 
 /** \class HcalNoiseStorage
  *
- * DataMixingModule is the EDProducer subclass 
+ * DataMixingModule is the EDProducer subclass
  * that overlays rawdata events on top of MC,
  * using real data for pileup simulation
  * This class is used to pass noise hits from the individual
@@ -16,43 +16,38 @@
  ************************************************************/
 
 #include "CalibFormats/CaloObjects/interface/CaloSamples.h"
-#include "DataFormats/Provenance/interface/ProductID.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 #include "DataFormats/HcalDigi/interface/HBHEDataFrame.h"
-#include "DataFormats/HcalDigi/interface/HODataFrame.h"
 #include "DataFormats/HcalDigi/interface/HFDataFrame.h"
+#include "DataFormats/HcalDigi/interface/HODataFrame.h"
+#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
+#include "DataFormats/Provenance/interface/ProductID.h"
 #include "SimCalorimetry/CaloSimAlgos/interface/CaloVNoiseSignalGenerator.h"
 
-
 #include <map>
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace CLHEP {
   class HepRandomEngine;
 }
 
-namespace edm
-{
-  class HcalNoiseStorage : public CaloVNoiseSignalGenerator
-    {
-    public:
-
-      HcalNoiseStorage() {};
-      ~HcalNoiseStorage() override {};
-
-     /** standard constructor*/
-     // explicit HcalNoiseStorage();
+namespace edm {
+  class HcalNoiseStorage : public CaloVNoiseSignalGenerator {
+  public:
+    HcalNoiseStorage(){};
+    ~HcalNoiseStorage() override{};
 
-      /**Default destructor*/
-      //virtual ~HcalNoiseStorage();
+    /** standard constructor*/
+    // explicit HcalNoiseStorage();
 
-      void fillNoiseSignals(CLHEP::HepRandomEngine*) override {};
+    /**Default destructor*/
+    // virtual ~HcalNoiseStorage();
 
-    private:
+    void fillNoiseSignals(CLHEP::HepRandomEngine *) override{};
 
-    };
-}//edm
+  private:
+  };
+}  // namespace edm
 
-#endif // SimHcalNoiseStorage_h
+#endif  // SimHcalNoiseStorage_h
diff --git a/SimGeneral/DataMixingModule/plugins/SealModule.cc b/SimGeneral/DataMixingModule/plugins/SealModule.cc
index dc6737a19a1bc..5d755eeb43ac2 100644
--- a/SimGeneral/DataMixingModule/plugins/SealModule.cc
+++ b/SimGeneral/DataMixingModule/plugins/SealModule.cc
@@ -5,10 +5,6 @@
 
 #include "DataMixingModule.h"
 
-  using edm::DataMixingModule;
-
-
+using edm::DataMixingModule;
 
 DEFINE_FWK_MODULE(DataMixingModule);
-
-
diff --git a/SimGeneral/Debugging/plugins/CaloParticleDebugger.cc b/SimGeneral/Debugging/plugins/CaloParticleDebugger.cc
index 29ba0936aa554..513c0c9f47662 100644
--- a/SimGeneral/Debugging/plugins/CaloParticleDebugger.cc
+++ b/SimGeneral/Debugging/plugins/CaloParticleDebugger.cc
@@ -40,41 +40,38 @@
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "Geometry/HcalCommonData/interface/HcalHitRelabeller.h"
 
-
 //
 // class declaration
 //
 
-class CaloParticleDebugger : public edm::one::EDAnalyzer<>  {
-   public:
-      explicit CaloParticleDebugger(const edm::ParameterSet&);
-      ~CaloParticleDebugger() override;
-
-      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-
-
-   private:
-      void beginJob() override;
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      void endJob() override;
-      void fillSimHits(std::map<int, float> &,
-          const edm::Event& , const edm::EventSetup &);
-      edm::InputTag simTracks_;
-      edm::InputTag genParticles_;
-      edm::InputTag simVertices_;
-      edm::InputTag trackingParticles_;
-      edm::InputTag caloParticles_;
-      edm::InputTag simClusters_;
-      std::vector<edm::InputTag> collectionTags_;
-      edm::EDGetTokenT<std::vector<SimTrack> > simTracksToken_;
-      edm::EDGetTokenT<std::vector<reco::GenParticle> > genParticlesToken_;
-      edm::EDGetTokenT<std::vector<SimVertex> > simVerticesToken_;
-      edm::EDGetTokenT<std::vector<TrackingParticle> > trackingParticlesToken_;
-      edm::EDGetTokenT<std::vector<CaloParticle> > caloParticlesToken_;
-      edm::EDGetTokenT<std::vector<SimCluster>> simClustersToken_;
-      std::vector<edm::EDGetTokenT<std::vector<PCaloHit> > > collectionTagsToken_;
-      int geometryType_ = 0;
-      // ----------member data ---------------------------
+class CaloParticleDebugger : public edm::one::EDAnalyzer<> {
+public:
+  explicit CaloParticleDebugger(const edm::ParameterSet&);
+  ~CaloParticleDebugger() override;
+
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
+private:
+  void beginJob() override;
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void endJob() override;
+  void fillSimHits(std::map<int, float>&, const edm::Event&, const edm::EventSetup&);
+  edm::InputTag simTracks_;
+  edm::InputTag genParticles_;
+  edm::InputTag simVertices_;
+  edm::InputTag trackingParticles_;
+  edm::InputTag caloParticles_;
+  edm::InputTag simClusters_;
+  std::vector<edm::InputTag> collectionTags_;
+  edm::EDGetTokenT<std::vector<SimTrack>> simTracksToken_;
+  edm::EDGetTokenT<std::vector<reco::GenParticle>> genParticlesToken_;
+  edm::EDGetTokenT<std::vector<SimVertex>> simVerticesToken_;
+  edm::EDGetTokenT<std::vector<TrackingParticle>> trackingParticlesToken_;
+  edm::EDGetTokenT<std::vector<CaloParticle>> caloParticlesToken_;
+  edm::EDGetTokenT<std::vector<SimCluster>> simClustersToken_;
+  std::vector<edm::EDGetTokenT<std::vector<PCaloHit>>> collectionTagsToken_;
+  int geometryType_ = 0;
+  // ----------member data ---------------------------
 };
 
 //
@@ -89,101 +86,93 @@ class CaloParticleDebugger : public edm::one::EDAnalyzer<>  {
 // constructors and destructor
 //
 CaloParticleDebugger::CaloParticleDebugger(const edm::ParameterSet& iConfig)
-  : simTracks_(iConfig.getParameter<edm::InputTag>("simTracks")),
-  genParticles_(iConfig.getParameter<edm::InputTag>("genParticles")),
-  simVertices_(iConfig.getParameter<edm::InputTag>("simVertices")),
-  trackingParticles_(iConfig.getParameter<edm::InputTag>("trackingParticles")),
-  caloParticles_(iConfig.getParameter<edm::InputTag>("caloParticles")),
-  simClusters_(iConfig.getParameter<edm::InputTag>("simClusters")),
-  collectionTags_(iConfig.getParameter<std::vector<edm::InputTag> >("collectionTags")) {
+    : simTracks_(iConfig.getParameter<edm::InputTag>("simTracks")),
+      genParticles_(iConfig.getParameter<edm::InputTag>("genParticles")),
+      simVertices_(iConfig.getParameter<edm::InputTag>("simVertices")),
+      trackingParticles_(iConfig.getParameter<edm::InputTag>("trackingParticles")),
+      caloParticles_(iConfig.getParameter<edm::InputTag>("caloParticles")),
+      simClusters_(iConfig.getParameter<edm::InputTag>("simClusters")),
+      collectionTags_(iConfig.getParameter<std::vector<edm::InputTag>>("collectionTags")) {
   edm::ConsumesCollector&& iC = consumesCollector();
-  simTracksToken_ = iC.consumes<std::vector<SimTrack> >(simTracks_);
-  genParticlesToken_ = iC.consumes<std::vector<reco::GenParticle> > (genParticles_);
-  simVerticesToken_ = iC.consumes<std::vector<SimVertex> >(simVertices_);
-  trackingParticlesToken_ = iC.consumes<std::vector<TrackingParticle> >(trackingParticles_);
-  caloParticlesToken_ = iC.consumes<std::vector<CaloParticle> >(caloParticles_);
-  simClustersToken_ = iC.consumes<std::vector<SimCluster> >(simClusters_);
-  for (auto const & collectionTag : collectionTags_) {
-    collectionTagsToken_.push_back(iC.consumes<std::vector<PCaloHit> >(collectionTag));
+  simTracksToken_ = iC.consumes<std::vector<SimTrack>>(simTracks_);
+  genParticlesToken_ = iC.consumes<std::vector<reco::GenParticle>>(genParticles_);
+  simVerticesToken_ = iC.consumes<std::vector<SimVertex>>(simVertices_);
+  trackingParticlesToken_ = iC.consumes<std::vector<TrackingParticle>>(trackingParticles_);
+  caloParticlesToken_ = iC.consumes<std::vector<CaloParticle>>(caloParticles_);
+  simClustersToken_ = iC.consumes<std::vector<SimCluster>>(simClusters_);
+  for (auto const& collectionTag : collectionTags_) {
+    collectionTagsToken_.push_back(iC.consumes<std::vector<PCaloHit>>(collectionTag));
   }
 }
 
 CaloParticleDebugger::~CaloParticleDebugger() {}
 
-
 //
 // member functions
 //
 
 // ------------ method called for each event  ------------
-void
-CaloParticleDebugger::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
+void CaloParticleDebugger::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   using namespace edm;
   using std::begin;
   using std::end;
-  using std::sort;
   using std::iota;
+  using std::sort;
 
-  edm::Handle<std::vector<SimTrack> > simTracksH;
-  edm::Handle<std::vector<reco::GenParticle> > genParticlesH;
-  edm::Handle<std::vector<SimVertex> > simVerticesH;
-  edm::Handle<std::vector<TrackingParticle> > trackingParticlesH;
-  edm::Handle<std::vector<CaloParticle> > caloParticlesH;
-  edm::Handle<std::vector<SimCluster> > simClustersH;
+  edm::Handle<std::vector<SimTrack>> simTracksH;
+  edm::Handle<std::vector<reco::GenParticle>> genParticlesH;
+  edm::Handle<std::vector<SimVertex>> simVerticesH;
+  edm::Handle<std::vector<TrackingParticle>> trackingParticlesH;
+  edm::Handle<std::vector<CaloParticle>> caloParticlesH;
+  edm::Handle<std::vector<SimCluster>> simClustersH;
 
   iEvent.getByToken(simTracksToken_, simTracksH);
-  auto const & tracks = *simTracksH.product();
+  auto const& tracks = *simTracksH.product();
   std::vector<int> sorted_tracks_idx(tracks.size());
   iota(begin(sorted_tracks_idx), end(sorted_tracks_idx), 0);
-  sort(begin(sorted_tracks_idx),
-       end(sorted_tracks_idx),
-       [&tracks] (int i, int j) {
-        return tracks[i].momentum().eta() < tracks[j].momentum().eta();
-        });
+  sort(begin(sorted_tracks_idx), end(sorted_tracks_idx), [&tracks](int i, int j) {
+    return tracks[i].momentum().eta() < tracks[j].momentum().eta();
+  });
 
   iEvent.getByToken(genParticlesToken_, genParticlesH);
-  auto const & genParticles = *genParticlesH.product();
+  auto const& genParticles = *genParticlesH.product();
   std::vector<int> sorted_genParticles_idx(genParticles.size());
   iota(begin(sorted_genParticles_idx), end(sorted_genParticles_idx), 0);
-  sort(begin(sorted_genParticles_idx),
-       end(sorted_genParticles_idx), [&genParticles](int i, int j) {
-       return genParticles[i].momentum().eta() < genParticles[j].momentum().eta();});
+  sort(begin(sorted_genParticles_idx), end(sorted_genParticles_idx), [&genParticles](int i, int j) {
+    return genParticles[i].momentum().eta() < genParticles[j].momentum().eta();
+  });
 
   iEvent.getByToken(simVerticesToken_, simVerticesH);
-  auto const & vertices = *simVerticesH.product();
+  auto const& vertices = *simVerticesH.product();
   std::vector<int> sorted_vertices_idx(vertices.size());
   iota(begin(sorted_vertices_idx), end(sorted_vertices_idx), 0);
-  sort(begin(sorted_vertices_idx),
-       end(sorted_vertices_idx), [&vertices](int i, int j){
-        return vertices[i].vertexId() < vertices[j].vertexId();
-      });
+  sort(begin(sorted_vertices_idx), end(sorted_vertices_idx), [&vertices](int i, int j) {
+    return vertices[i].vertexId() < vertices[j].vertexId();
+  });
 
   iEvent.getByToken(trackingParticlesToken_, trackingParticlesH);
-  auto const & trackingpart = *trackingParticlesH.product();
+  auto const& trackingpart = *trackingParticlesH.product();
   std::vector<int> sorted_tp_idx(trackingpart.size());
   iota(begin(sorted_tp_idx), end(sorted_tp_idx), 0);
-  sort(begin(sorted_tp_idx),
-       end(sorted_tp_idx), [&trackingpart] (int i, int j){
-        return trackingpart[i].eta() < trackingpart[j].eta();
-       });
+  sort(begin(sorted_tp_idx), end(sorted_tp_idx), [&trackingpart](int i, int j) {
+    return trackingpart[i].eta() < trackingpart[j].eta();
+  });
 
   iEvent.getByToken(caloParticlesToken_, caloParticlesH);
-  auto const & calopart = *caloParticlesH.product();
+  auto const& calopart = *caloParticlesH.product();
   std::vector<int> sorted_cp_idx(calopart.size());
-  iota(begin(sorted_cp_idx),
-       end(sorted_cp_idx), 0);
-  sort(begin(sorted_cp_idx),
-       end(sorted_cp_idx), [&calopart](int i, int j){
-       return calopart[i].eta() < calopart[j].eta();});
+  iota(begin(sorted_cp_idx), end(sorted_cp_idx), 0);
+  sort(begin(sorted_cp_idx), end(sorted_cp_idx), [&calopart](int i, int j) {
+    return calopart[i].eta() < calopart[j].eta();
+  });
 
   iEvent.getByToken(simClustersToken_, simClustersH);
-  auto const & simclusters = *simClustersH.product();
+  auto const& simclusters = *simClustersH.product();
   std::vector<int> sorted_simcl_idx(simclusters.size());
-  iota(begin(sorted_simcl_idx),
-       end(sorted_simcl_idx), 0);
-  sort(begin(sorted_simcl_idx),
-       end(sorted_simcl_idx), [&simclusters](int i, int j){
-       return simclusters[i].eta() < simclusters[j].eta();});
+  iota(begin(sorted_simcl_idx), end(sorted_simcl_idx), 0);
+  sort(begin(sorted_simcl_idx), end(sorted_simcl_idx), [&simclusters](int i, int j) {
+    return simclusters[i].eta() < simclusters[j].eta();
+  });
 
   // Let's first fill in hits information
   std::map<int, float> detIdToTotalSimEnergy;
@@ -195,7 +184,7 @@ CaloParticleDebugger::analyze(const edm::Event& iEvent, const edm::EventSetup& i
   std::cout << "Printing SimTracks information" << std::endl;
   std::cout << "IDX\tTrackId\tPDGID\tMOMENTUM(x,y,z,E)\tVertexIdx\tGenPartIdx" << std::endl;
   for (auto i : sorted_tracks_idx) {
-    auto const & t = tracks[i];
+    auto const& t = tracks[i];
     std::cout << idx << "\t" << t.trackId() << "\t" << t << std::endl;
     trackid_to_track_index[t.trackId()] = idx;
     idx++;
@@ -204,53 +193,48 @@ CaloParticleDebugger::analyze(const edm::Event& iEvent, const edm::EventSetup& i
   std::cout << "Printing GenParticles information" << std::endl;
   std::cout << "IDX\tPDGID\tMOMENTUM(x,y,z)\tVertex(x,y,z)" << std::endl;
   for (auto i : sorted_genParticles_idx) {
-    auto const & gp = genParticles[i];
-    std::cout << i
-      << "\t" << gp.pdgId()
-      << "\t" << gp.momentum()
-      << "\t" << gp.vertex() << std::endl;
+    auto const& gp = genParticles[i];
+    std::cout << i << "\t" << gp.pdgId() << "\t" << gp.momentum() << "\t" << gp.vertex() << std::endl;
   }
 
   std::cout << "Printing SimVertex information" << std::endl;
   std::cout << "IDX\tPOSITION(x,y,z)\tPARENT_INDEX\tVERTEX_ID" << std::endl;
   for (auto i : sorted_vertices_idx) {
-    auto const & v = vertices[i];
-      std::cout << i << "\t" << v << std::endl;
+    auto const& v = vertices[i];
+    std::cout << i << "\t" << v << std::endl;
   }
   std::cout << "Printing TrackingParticles information" << std::endl;
   for (auto i : sorted_tp_idx) {
-    auto const & tp = trackingpart[i];
+    auto const& tp = trackingpart[i];
     std::cout << i << "\t" << tp << std::endl;
   }
 
   std::cout << "Printing CaloParticles information" << std::endl;
   idx = 0;
   for (auto i : sorted_cp_idx) {
-    auto const & cp = calopart[i];
-    std::cout << "\n\n" << idx++ << " |Eta|: " << std::abs(cp.momentum().eta())
-              << "\tType: " << cp.pdgId()
-              << "\tEnergy: " << cp.energy()
-              << "\tIdx: " << cp.g4Tracks()[0].trackId() << std::endl; // << cp << std::endl;
+    auto const& cp = calopart[i];
+    std::cout << "\n\n"
+              << idx++ << " |Eta|: " << std::abs(cp.momentum().eta()) << "\tType: " << cp.pdgId()
+              << "\tEnergy: " << cp.energy() << "\tIdx: " << cp.g4Tracks()[0].trackId()
+              << std::endl;  // << cp << std::endl;
     double total_sim_energy = 0.;
     double total_cp_energy = 0.;
     std::cout << "--> Overall simclusters's size: " << cp.simClusters().size() << std::endl;
     // All the next mess just to print the simClusters ordered
-    auto const & simcs = cp.simClusters();
+    auto const& simcs = cp.simClusters();
     std::vector<int> sorted_sc_idx(simcs.size());
     iota(begin(sorted_sc_idx), end(sorted_sc_idx), 0);
-    sort(begin(sorted_sc_idx),
-        end(sorted_sc_idx),
-        [&simcs] (int i, int j) {
-        return simcs[i]->momentum().eta() < simcs[j]->momentum().eta();
-        });
+    sort(begin(sorted_sc_idx), end(sorted_sc_idx), [&simcs](int i, int j) {
+      return simcs[i]->momentum().eta() < simcs[j]->momentum().eta();
+    });
     for (auto i : sorted_sc_idx) {
-      std::cout <<  *(simcs[i]);
+      std::cout << *(simcs[i]);
     }
 
-    for (auto const & sc : cp.simClusters()) {
-      for (auto const & cl : sc->hits_and_fractions()) {
-        total_sim_energy += detIdToTotalSimEnergy[cl.first]*cl.second;
-        total_cp_energy += cp.energy()*cl.second;
+    for (auto const& sc : cp.simClusters()) {
+      for (auto const& cl : sc->hits_and_fractions()) {
+        total_sim_energy += detIdToTotalSimEnergy[cl.first] * cl.second;
+        total_cp_energy += cp.energy() * cl.second;
       }
     }
     std::cout << "--> Overall SC energy (sum using sim energies): " << total_sim_energy << std::endl;
@@ -260,49 +244,47 @@ CaloParticleDebugger::analyze(const edm::Event& iEvent, const edm::EventSetup& i
   idx = 0;
   std::cout << "Printing SimClusters information" << std::endl;
   for (auto i : sorted_simcl_idx) {
-    auto const & simcl = simclusters[i];
-    std::cout << "\n\n" << idx++ << " |Eta|: " << std::abs(simcl.momentum().eta())
-              << "\tType: " << simcl.pdgId()
-              << "\tEnergy: " << simcl.energy()
-              << "\tKey: " << i << std::endl; // << simcl << std::endl;
+    auto const& simcl = simclusters[i];
+    std::cout << "\n\n"
+              << idx++ << " |Eta|: " << std::abs(simcl.momentum().eta()) << "\tType: " << simcl.pdgId()
+              << "\tEnergy: " << simcl.energy() << "\tKey: " << i << std::endl;  // << simcl << std::endl;
     double total_sim_energy = 0.;
     std::cout << "--> Overall simclusters's size: " << simcl.numberOfRecHits() << std::endl;
-    for (auto const & cl : simcl.hits_and_fractions()) {
-      total_sim_energy += detIdToTotalSimEnergy[cl.first]*cl.second;
+    for (auto const& cl : simcl.hits_and_fractions()) {
+      total_sim_energy += detIdToTotalSimEnergy[cl.first] * cl.second;
     }
     std::cout << simcl << std::endl;
     std::cout << "--> Overall SimCluster energy (sum using sim energies): " << total_sim_energy << std::endl;
   }
 }
 
-
 // ------------ method called once each job just before starting event loop  ------------
-void
-CaloParticleDebugger::beginJob() {}
+void CaloParticleDebugger::beginJob() {}
 
 // ------------ method called once each job just after ending the event loop  ------------
-void
-CaloParticleDebugger::endJob() {}
+void CaloParticleDebugger::endJob() {}
 
-void CaloParticleDebugger::fillSimHits(
-    std::map<int, float> & detIdToTotalSimEnergy,
-    const edm::Event& iEvent, const edm::EventSetup& iSetup ) {
+void CaloParticleDebugger::fillSimHits(std::map<int, float>& detIdToTotalSimEnergy,
+                                       const edm::Event& iEvent,
+                                       const edm::EventSetup& iSetup) {
   // Taken needed quantities from the EventSetup
   edm::ESHandle<CaloGeometry> geom;
   iSetup.get<CaloGeometryRecord>().get(geom);
   const HGCalGeometry *eegeom = nullptr, *fhgeom = nullptr, *bhgeomnew = nullptr;
-  const HcalGeometry *bhgeom = nullptr;
+  const HcalGeometry* bhgeom = nullptr;
   const HGCalDDDConstants* hgddd[3];
-  const HGCalTopology*     hgtopo[3];
+  const HGCalTopology* hgtopo[3];
   const HcalDDDRecConstants* hcddd = nullptr;
-  eegeom = static_cast<const HGCalGeometry*>(geom->getSubdetectorGeometry(DetId::HGCalEE,ForwardSubdetector::ForwardEmpty));
+  eegeom =
+      static_cast<const HGCalGeometry*>(geom->getSubdetectorGeometry(DetId::HGCalEE, ForwardSubdetector::ForwardEmpty));
   //check if it's the new geometry
-  if(eegeom){
+  if (eegeom) {
     geometryType_ = 1;
-    fhgeom = static_cast<const HGCalGeometry*>(geom->getSubdetectorGeometry(DetId::HGCalHSi,ForwardSubdetector::ForwardEmpty));
-    bhgeomnew = static_cast<const HGCalGeometry*>(geom->getSubdetectorGeometry(DetId::HGCalHSc,ForwardSubdetector::ForwardEmpty));
-  }
-  else {
+    fhgeom = static_cast<const HGCalGeometry*>(
+        geom->getSubdetectorGeometry(DetId::HGCalHSi, ForwardSubdetector::ForwardEmpty));
+    bhgeomnew = static_cast<const HGCalGeometry*>(
+        geom->getSubdetectorGeometry(DetId::HGCalHSc, ForwardSubdetector::ForwardEmpty));
+  } else {
     geometryType_ = 0;
     eegeom = static_cast<const HGCalGeometry*>(geom->getSubdetectorGeometry(DetId::Forward, HGCEE));
     fhgeom = static_cast<const HGCalGeometry*>(geom->getSubdetectorGeometry(DetId::Forward, HGCHEF));
@@ -310,54 +292,57 @@ void CaloParticleDebugger::fillSimHits(
   }
   hgtopo[0] = &(eegeom->topology());
   hgtopo[1] = &(fhgeom->topology());
-  if(bhgeomnew) hgtopo[2] = &(bhgeomnew->topology());
+  if (bhgeomnew)
+    hgtopo[2] = &(bhgeomnew->topology());
 
   for (unsigned i = 0; i < 3; ++i) {
-    if(hgtopo[i]) hgddd[i] = &(hgtopo[i]->dddConstants());
+    if (hgtopo[i])
+      hgddd[i] = &(hgtopo[i]->dddConstants());
   }
 
-  if(bhgeom) hcddd = bhgeom->topology().dddConstants();
+  if (bhgeom)
+    hcddd = bhgeom->topology().dddConstants();
 
   // loop over the collections
   int token = 0;
   for (auto const& collectionTag : collectionTags_) {
-    edm::Handle< std::vector<PCaloHit> > hSimHits;
-    const bool isHcal = ( collectionTag.instance().find("HcalHits") != std::string::npos );
+    edm::Handle<std::vector<PCaloHit>> hSimHits;
+    const bool isHcal = (collectionTag.instance().find("HcalHits") != std::string::npos);
     iEvent.getByToken(collectionTagsToken_[token++], hSimHits);
     for (auto const& simHit : *hSimHits) {
       DetId id(0);
       const uint32_t simId = simHit.id();
-      if (geometryType_==1) {
-                //no test numbering in new geometry
+      if (geometryType_ == 1) {
+        //no test numbering in new geometry
         id = simId;
-      }
-      else if (isHcal) {
+      } else if (isHcal) {
         assert(hcddd);
         HcalDetId hid = HcalHitRelabeller::relabel(simId, hcddd);
-        if (hid.subdet() == HcalEndcap) id = hid;
+        if (hid.subdet() == HcalEndcap)
+          id = hid;
       } else {
         int subdet, layer, cell, sec, subsec, zp;
         HGCalTestNumbering::unpackHexagonIndex(simId, subdet, zp, layer, sec, subsec, cell);
-        const HGCalDDDConstants* ddd = hgddd[subdet-3];
-        std::pair<int, int> recoLayerCell = ddd->simToReco(cell, layer, sec,
-            hgtopo[subdet-3]->detectorType());
-        cell  = recoLayerCell.first;
+        const HGCalDDDConstants* ddd = hgddd[subdet - 3];
+        std::pair<int, int> recoLayerCell = ddd->simToReco(cell, layer, sec, hgtopo[subdet - 3]->detectorType());
+        cell = recoLayerCell.first;
         layer = recoLayerCell.second;
         // skip simhits with bad barcodes or non-existant layers
-        if (layer == -1 || simHit.geantTrackId() == 0) continue;
+        if (layer == -1 || simHit.geantTrackId() == 0)
+          continue;
         id = HGCalDetId((ForwardSubdetector)subdet, zp, layer, subsec, sec, cell);
       }
 
-      if (DetId(0) == id) continue;
+      if (DetId(0) == id)
+        continue;
 
       detIdToTotalSimEnergy[id.rawId()] += simHit.energy();
     }
-  } // end of loop over InputTags
+  }  // end of loop over InputTags
 }
 
 // ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
-void
-CaloParticleDebugger::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+void CaloParticleDebugger::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   edm::ParameterSetDescription desc;
   desc.add<edm::InputTag>("simTracks", edm::InputTag("g4SimHits"));
   desc.add<edm::InputTag>("genParticles", edm::InputTag("genParticles"));
@@ -365,10 +350,10 @@ CaloParticleDebugger::fillDescriptions(edm::ConfigurationDescriptions& descripti
   desc.add<edm::InputTag>("trackingParticles", edm::InputTag("mix", "MergedTrackTruth"));
   desc.add<edm::InputTag>("caloParticles", edm::InputTag("mix", "MergedCaloTruth"));
   desc.add<edm::InputTag>("simClusters", edm::InputTag("mix", "MergedCaloTruth"));
-  desc.add<std::vector<edm::InputTag> >("collectionTags",
-      { edm::InputTag("g4SimHits", "HGCHitsEE"),
-        edm::InputTag("g4SimHits", "HGCHitsHEfront"),
-        edm::InputTag("g4SimHits", "HcalHits")});
+  desc.add<std::vector<edm::InputTag>>("collectionTags",
+                                       {edm::InputTag("g4SimHits", "HGCHitsEE"),
+                                        edm::InputTag("g4SimHits", "HGCHitsHEfront"),
+                                        edm::InputTag("g4SimHits", "HcalHits")});
   descriptions.add("caloParticleDebugger", desc);
 }
 
diff --git a/SimGeneral/GFlash/interface/GflashAntiProtonShowerProfile.h b/SimGeneral/GFlash/interface/GflashAntiProtonShowerProfile.h
index 1dbfef795624b..bb0b277c86747 100644
--- a/SimGeneral/GFlash/interface/GflashAntiProtonShowerProfile.h
+++ b/SimGeneral/GFlash/interface/GflashAntiProtonShowerProfile.h
@@ -1,24 +1,17 @@
 #ifndef GflashAntiProtonShowerProfile_H
-#define GflashAntiProtonShowerProfile_H 
+#define GflashAntiProtonShowerProfile_H
 
 #include "SimGeneral/GFlash/interface/GflashHadronShowerProfile.h"
 
-class GflashAntiProtonShowerProfile : public GflashHadronShowerProfile
-{
+class GflashAntiProtonShowerProfile : public GflashHadronShowerProfile {
 public:
   //-------------------------
   // Constructor, destructor
   //-------------------------
-  GflashAntiProtonShowerProfile (const edm::ParameterSet& parSet) : 
-    GflashHadronShowerProfile (parSet) {}; 
-  ~GflashAntiProtonShowerProfile () override {};
+  GflashAntiProtonShowerProfile(const edm::ParameterSet &parSet) : GflashHadronShowerProfile(parSet){};
+  ~GflashAntiProtonShowerProfile() override{};
 
   void loadParameters() override;
-
 };
 
 #endif
-
-
-
-
diff --git a/SimGeneral/GFlash/interface/GflashEMShowerProfile.h b/SimGeneral/GFlash/interface/GflashEMShowerProfile.h
index 770f48bff89bf..eed3ba1ecdb8e 100644
--- a/SimGeneral/GFlash/interface/GflashEMShowerProfile.h
+++ b/SimGeneral/GFlash/interface/GflashEMShowerProfile.h
@@ -1,5 +1,5 @@
 #ifndef GflashEMShowerProfile_H
-#define GflashEMShowerProfile_H 
+#define GflashEMShowerProfile_H
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -12,30 +12,31 @@ class GflashHit;
 class GflashShowino;
 class GflashHistogram;
 
-class GflashEMShowerProfile 
-{
+class GflashEMShowerProfile {
 public:
   //-------------------------
   // Constructor, destructor
   //-------------------------
-  GflashEMShowerProfile (const edm::ParameterSet& parSet);
-  ~GflashEMShowerProfile ();
+  GflashEMShowerProfile(const edm::ParameterSet &parSet);
+  ~GflashEMShowerProfile();
 
-  void initialize(int showerType, double energy, 
-		  double globalTime, double charge,
-                  Gflash3Vector &position,Gflash3Vector &momentum);
+  void initialize(int showerType,
+                  double energy,
+                  double globalTime,
+                  double charge,
+                  Gflash3Vector &position,
+                  Gflash3Vector &momentum);
 
   void parameterization();
-  GflashShowino* getGflashShowino() { return theShowino; }
-  std::vector<GflashHit>& getGflashHitList() {return theGflashHitList;};
+  GflashShowino *getGflashShowino() { return theShowino; }
+  std::vector<GflashHit> &getGflashHitList() { return theGflashHitList; };
 
-private: 
+private:
   double getDistanceToOut(Gflash::CalorimeterNumber kCalor);
-  Gflash3Vector locateHitPosition(GflashTrajectoryPoint& point, 
-				  double rCore, double rTail, 
-				  double probability, double &rShower);
+  Gflash3Vector locateHitPosition(
+      GflashTrajectoryPoint &point, double rCore, double rTail, double probability, double &rShower);
 
-private:  
+private:
   Gflash::CalorimeterNumber jCalorimeter;
 
   edm::ParameterSet theParSet;
@@ -44,13 +45,8 @@ class GflashEMShowerProfile
   double theEnergyScaleEE;
 
   GflashShowino *theShowino;
-  GflashHistogram* theHisto;
+  GflashHistogram *theHisto;
   std::vector<GflashHit> theGflashHitList;
-
 };
 
 #endif
-
-
-
-
diff --git a/SimGeneral/GFlash/interface/GflashHadronShowerProfile.h b/SimGeneral/GFlash/interface/GflashHadronShowerProfile.h
index 50ddc5f229d21..5254c80c68f08 100644
--- a/SimGeneral/GFlash/interface/GflashHadronShowerProfile.h
+++ b/SimGeneral/GFlash/interface/GflashHadronShowerProfile.h
@@ -1,44 +1,47 @@
 #ifndef GflashHadronShowerProfile_H
-#define GflashHadronShowerProfile_H 
+#define GflashHadronShowerProfile_H
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "SimGeneral/GFlash/interface/GflashNameSpace.h"
 #include "SimGeneral/GFlash/interface/GflashHistogram.h"
-#include "SimGeneral/GFlash/interface/GflashTrajectory.h"
+#include "SimGeneral/GFlash/interface/GflashNameSpace.h"
 #include "SimGeneral/GFlash/interface/GflashShowino.h"
+#include "SimGeneral/GFlash/interface/GflashTrajectory.h"
 
 #include <vector>
 
 class GflashHit;
 
-class GflashHadronShowerProfile 
-{
+class GflashHadronShowerProfile {
 public:
   //-------------------------
   // Constructor, destructor
   //-------------------------
-  GflashHadronShowerProfile (const edm::ParameterSet& parSet);
-  virtual ~GflashHadronShowerProfile ();
+  GflashHadronShowerProfile(const edm::ParameterSet &parSet);
+  virtual ~GflashHadronShowerProfile();
 
-  void initialize(int showerType, double energy, double globalTime, double charge,
-		  Gflash3Vector &position,Gflash3Vector &momentum);
+  void initialize(int showerType,
+                  double energy,
+                  double globalTime,
+                  double charge,
+                  Gflash3Vector &position,
+                  Gflash3Vector &momentum);
 
   virtual void loadParameters();
   void hadronicParameterization();
-  GflashShowino* getGflashShowino() { return theShowino; }
-  std::vector<GflashHit>& getGflashHitList() {return theGflashHitList;}; 
+  GflashShowino *getGflashShowino() { return theShowino; }
+  std::vector<GflashHit> &getGflashHitList() { return theGflashHitList; };
 
 protected:
   double longitudinalProfile();
   double hoProfile(double pathLength, double refDepth);
   void doCholeskyReduction(double **cc, double **vv, const int ndim);
   void getFluctuationVector(double *lowTriangle, double *correlationVector);
-  void setEnergyScale(double einc, const Gflash3Vector& ssp);
+  void setEnergyScale(double einc, const Gflash3Vector &ssp);
 
   int getNumberOfSpots(Gflash::CalorimeterNumber kCalor);
   double medianLateralArm(double depth, Gflash::CalorimeterNumber kCalor);
-  Gflash3Vector locateHitPosition(GflashTrajectoryPoint& point, double lateralArm);
+  Gflash3Vector locateHitPosition(GflashTrajectoryPoint &point, double lateralArm);
 
   double fTanh(double einc, const double *par);
   double fLnE1(double einc, const double *par);
@@ -53,19 +56,16 @@ class GflashHadronShowerProfile
   double theBField;
   bool theGflashHcalOuter;
 
-  GflashShowino *theShowino; 
-  GflashHistogram* theHisto;
+  GflashShowino *theShowino;
+  GflashHistogram *theHisto;
 
-  double energyScale[Gflash::kNumberCalorimeter]; 
-  double averageSpotEnergy[Gflash::kNumberCalorimeter]; 
-  double longEcal[Gflash::NPar];  
-  double longHcal[Gflash::NPar];  
-  double lateralPar[Gflash::kNumberCalorimeter][Gflash::Nrpar]; 
+  double energyScale[Gflash::kNumberCalorimeter];
+  double averageSpotEnergy[Gflash::kNumberCalorimeter];
+  double longEcal[Gflash::NPar];
+  double longHcal[Gflash::NPar];
+  double lateralPar[Gflash::kNumberCalorimeter][Gflash::Nrpar];
 
   std::vector<GflashHit> theGflashHitList;
 };
 
 #endif
-
-
-
diff --git a/SimGeneral/GFlash/interface/GflashHistogram.h b/SimGeneral/GFlash/interface/GflashHistogram.h
index b2deec870f906..fff2ae7570834 100644
--- a/SimGeneral/GFlash/interface/GflashHistogram.h
+++ b/SimGeneral/GFlash/interface/GflashHistogram.h
@@ -3,26 +3,24 @@
 
 // created by Soon Yung Jun, Dongwook Jang, 2007/12/07
 
-#include <TObject.h>
 #include <TFile.h>
-#include <TTree.h>
 #include <TH1F.h>
 #include <TH2F.h>
+#include <TObject.h>
 #include <TProfile.h>
 #include <TString.h>
+#include <TTree.h>
 
 #include <string>
 
 class GflashHistogram : public TObject {
+public:
+  static GflashHistogram *instance();
 
- public:
-
-  static GflashHistogram* instance();
-  
   GflashHistogram();
   ~GflashHistogram() override;
 
-  void bookHistogram(std::string histFileName="gflash_histogram.root");
+  void bookHistogram(std::string histFileName = "gflash_histogram.root");
   void setStoreFlag(bool flag) { theStoreFlag = flag; }
   bool getStoreFlag() { return theStoreFlag; }
 
@@ -34,99 +32,97 @@ class GflashHistogram : public TObject {
   // add hitograms here
 
   // histogram output
-  TFile*    histFile_;
+  TFile *histFile_;
 
   // histograms for EM shower model in GflashEMShowerProfile
-  TH1F*     em_incE;
-  TH1F*     em_ssp_rho;
-  TH1F*     em_ssp_z;
-  TH1F*     em_long;
-  TH2F*     em_lateral;
-  TH1F*     em_long_sd;
-  TH2F*     em_lateral_sd;
-  TH1F*     em_nSpots_sd;
+  TH1F *em_incE;
+  TH1F *em_ssp_rho;
+  TH1F *em_ssp_z;
+  TH1F *em_long;
+  TH2F *em_lateral;
+  TH1F *em_long_sd;
+  TH2F *em_lateral_sd;
+  TH1F *em_nSpots_sd;
 
   // histograms for HAD shower model in GflashHadronShowerModel
 
-  TH1F*     preStepPosition;
-  TH1F*     postStepPosition;
-  TH1F*     deltaStep;
-  TH1F*     kineticEnergy;
-  TH1F*     energyLoss;
-  TH1F*     energyRatio;
+  TH1F *preStepPosition;
+  TH1F *postStepPosition;
+  TH1F *deltaStep;
+  TH1F *kineticEnergy;
+  TH1F *energyLoss;
+  TH1F *energyRatio;
 
   // histograms for HAD shower model in GflashHadronShowerProfile
 
-  TH1F*     rshower;
-  TH1F*     lateralx;
-  TH1F*     lateraly;
-  TH2F*     gfhlongProfile;
+  TH1F *rshower;
+  TH1F *lateralx;
+  TH1F *lateraly;
+  TH2F *gfhlongProfile;
 
   // histograms for Watcher
 
-  TH1F*     g4vertexTrack;
-  TH2F*     g4stepCharge;
-  TH1F*     g4nSecondary;
-  TH1F*     g4pidSecondary;
-  TH1F*     g4energySecondary;
-  TH1F*     g4energyPi0;
-  TH1F*     g4energyElectron;
-  TH1F*     g4energyPhoton;
-
-  TH1F*     g4totalEnergySecPi0;
-  TH1F*     g4totalEnergySecElectron;
-  TH1F*     g4totalEnergySecPhoton;
-
-  TH1F*     g4energyEM;
-  TH1F*     g4energyHad;
-  TH1F*     g4energyTotal;
-  TH1F*     g4energyEMMip;
-  TH1F*     g4energyHadMip;
-  TH1F*     g4energyMip;
-  TH2F*     g4energyEMvsHad;
-
-  TH1F*     g4energySensitiveEM;
-  TH1F*     g4energySensitiveHad;
-  TH1F*     g4energySensitiveTotal;
-  TH1F*     g4energyHybridTotal;
-  TH1F*     g4energySensitiveEMMip;
-  TH2F*     g4energySensitiveEMvsHad;
-
-  TH2F*     g4energyEMProfile;
-  TH2F*     g4energyHadProfile;
-  TH2F*     g4energyTotalProfile;
-  TH2F*     g4energyHybridProfile;
-
-  TH1F*     g4ssp;
-  TH1F*     g4energy;
-  TH1F*     g4energyLoss;
-  TH1F*     g4momentum;
-  TH1F*     g4charge;
-
-  TH2F*     g4rshower;
-  TH2F*     g4rshowerR1;
-  TH2F*     g4rshowerR2;
-  TH2F*     g4rshowerR3;
-  TH2F*     g4lateralXY;
-  TH2F*     g4lateralRZ;
-  TH2F*     g4spotXY;
-  TH2F*     g4spotRZ;
-  TH2F*     g4spotRZ0;
-  TH2F*     g4trajectoryXY;
-  TH2F*     g4trajectoryRZ;
-
-  TH1F*     g4stepRho;
-  TH1F*     g4trajectoryPhi0;
-
-  TH2F*     g4longProfile;
-  TH2F*     g4longDetector;
-  TH2F*     g4longSensitive;
-
- private:
-
-  static GflashHistogram* instance_;
-  bool   theStoreFlag;
-
+  TH1F *g4vertexTrack;
+  TH2F *g4stepCharge;
+  TH1F *g4nSecondary;
+  TH1F *g4pidSecondary;
+  TH1F *g4energySecondary;
+  TH1F *g4energyPi0;
+  TH1F *g4energyElectron;
+  TH1F *g4energyPhoton;
+
+  TH1F *g4totalEnergySecPi0;
+  TH1F *g4totalEnergySecElectron;
+  TH1F *g4totalEnergySecPhoton;
+
+  TH1F *g4energyEM;
+  TH1F *g4energyHad;
+  TH1F *g4energyTotal;
+  TH1F *g4energyEMMip;
+  TH1F *g4energyHadMip;
+  TH1F *g4energyMip;
+  TH2F *g4energyEMvsHad;
+
+  TH1F *g4energySensitiveEM;
+  TH1F *g4energySensitiveHad;
+  TH1F *g4energySensitiveTotal;
+  TH1F *g4energyHybridTotal;
+  TH1F *g4energySensitiveEMMip;
+  TH2F *g4energySensitiveEMvsHad;
+
+  TH2F *g4energyEMProfile;
+  TH2F *g4energyHadProfile;
+  TH2F *g4energyTotalProfile;
+  TH2F *g4energyHybridProfile;
+
+  TH1F *g4ssp;
+  TH1F *g4energy;
+  TH1F *g4energyLoss;
+  TH1F *g4momentum;
+  TH1F *g4charge;
+
+  TH2F *g4rshower;
+  TH2F *g4rshowerR1;
+  TH2F *g4rshowerR2;
+  TH2F *g4rshowerR3;
+  TH2F *g4lateralXY;
+  TH2F *g4lateralRZ;
+  TH2F *g4spotXY;
+  TH2F *g4spotRZ;
+  TH2F *g4spotRZ0;
+  TH2F *g4trajectoryXY;
+  TH2F *g4trajectoryRZ;
+
+  TH1F *g4stepRho;
+  TH1F *g4trajectoryPhi0;
+
+  TH2F *g4longProfile;
+  TH2F *g4longDetector;
+  TH2F *g4longSensitive;
+
+private:
+  static GflashHistogram *instance_;
+  bool theStoreFlag;
 };
 
 #endif
diff --git a/SimGeneral/GFlash/interface/GflashHit.h b/SimGeneral/GFlash/interface/GflashHit.h
old mode 100755
new mode 100644
index ed99b0010d144..8f87c1de103bf
--- a/SimGeneral/GFlash/interface/GflashHit.h
+++ b/SimGeneral/GFlash/interface/GflashHit.h
@@ -3,22 +3,20 @@
 
 #include "SimGeneral/GFlash/interface/Gflash3Vector.h"
 
-class GflashHit
-{
+class GflashHit {
 public:
-  
   GflashHit();
-  GflashHit(double time, double energy, Gflash3Vector& pos);
+  GflashHit(double time, double energy, Gflash3Vector &pos);
   ~GflashHit();
-  
+
   inline double getTime() const { return theTime; }
   inline double getEnergy() const { return theEnergy; }
-  inline const Gflash3Vector& getPosition() const { return thePosition; }
+  inline const Gflash3Vector &getPosition() const { return thePosition; }
 
   inline void setTime(const double time) { theTime = time; }
   inline void setEnergy(const double energy) { theEnergy = energy; }
-  inline void setPosition(const Gflash3Vector& pos) { thePosition = pos; }
-    
+  inline void setPosition(const Gflash3Vector &pos) { thePosition = pos; }
+
 private:
   double theTime;
   double theEnergy;
diff --git a/SimGeneral/GFlash/interface/GflashKaonMinusShowerProfile.h b/SimGeneral/GFlash/interface/GflashKaonMinusShowerProfile.h
index 758dc5e38d925..80959a12936b3 100644
--- a/SimGeneral/GFlash/interface/GflashKaonMinusShowerProfile.h
+++ b/SimGeneral/GFlash/interface/GflashKaonMinusShowerProfile.h
@@ -1,23 +1,17 @@
 #ifndef GflashKaonMinusShowerProfile_H
-#define GflashKaonMinusShowerProfile_H 
+#define GflashKaonMinusShowerProfile_H
 
 #include "SimGeneral/GFlash/interface/GflashHadronShowerProfile.h"
 
-class GflashKaonMinusShowerProfile : public GflashHadronShowerProfile
-{
+class GflashKaonMinusShowerProfile : public GflashHadronShowerProfile {
 public:
   //-------------------------
   // Constructor, destructor
   //-------------------------
-  GflashKaonMinusShowerProfile (const edm::ParameterSet& parSet) : 
-    GflashHadronShowerProfile (parSet) {}; 
-  ~GflashKaonMinusShowerProfile () override {};
+  GflashKaonMinusShowerProfile(const edm::ParameterSet &parSet) : GflashHadronShowerProfile(parSet){};
+  ~GflashKaonMinusShowerProfile() override{};
 
   void loadParameters() override;
 };
 
 #endif
-
-
-
-
diff --git a/SimGeneral/GFlash/interface/GflashKaonPlusShowerProfile.h b/SimGeneral/GFlash/interface/GflashKaonPlusShowerProfile.h
index d389a26143985..05f6c68775e6c 100644
--- a/SimGeneral/GFlash/interface/GflashKaonPlusShowerProfile.h
+++ b/SimGeneral/GFlash/interface/GflashKaonPlusShowerProfile.h
@@ -1,23 +1,17 @@
 #ifndef GflashKaonPlusShowerProfile_H
-#define GflashKaonPlusShowerProfile_H 
+#define GflashKaonPlusShowerProfile_H
 
 #include "SimGeneral/GFlash/interface/GflashHadronShowerProfile.h"
 
-class GflashKaonPlusShowerProfile : public GflashHadronShowerProfile
-{
+class GflashKaonPlusShowerProfile : public GflashHadronShowerProfile {
 public:
   //-------------------------
   // Constructor, destructor
   //-------------------------
-  GflashKaonPlusShowerProfile (const edm::ParameterSet& parSet) : 
-    GflashHadronShowerProfile (parSet) {}; 
-  ~GflashKaonPlusShowerProfile () override {};
+  GflashKaonPlusShowerProfile(const edm::ParameterSet &parSet) : GflashHadronShowerProfile(parSet){};
+  ~GflashKaonPlusShowerProfile() override{};
 
   void loadParameters() override;
 };
 
 #endif
-
-
-
-
diff --git a/SimGeneral/GFlash/interface/GflashNameSpace.h b/SimGeneral/GFlash/interface/GflashNameSpace.h
index bb293dcb2c390..982a18d2ada4b 100644
--- a/SimGeneral/GFlash/interface/GflashNameSpace.h
+++ b/SimGeneral/GFlash/interface/GflashNameSpace.h
@@ -1,824 +1,788 @@
 #ifndef GflashNameSpace_H
-#define GflashNameSpace_H 
+#define GflashNameSpace_H
 
 #include "SimGeneral/GFlash/interface/Gflash3Vector.h"
 
 namespace Gflash {
 
-  //unit convention: energy in GeV, length in cm, time in nanosecond
+  // unit convention: energy in GeV, length in cm, time in nanosecond
 
   enum CalorimeterNumber {
-    kNULL = -1,         // ECAL Barrel - ESPM
-    kESPM,              // ECAL Barrel - ESPM
-    kHB,                // HCAL Barrel - HB
-    kENCA,              // ECAL Endcap - ENCA
-    kHE,                // HCAL Endcap - HE
-    kHO,                // HCAL Outer  - HO
-    kHF,                // HCAL Forward - HF
+    kNULL = -1,  // ECAL Barrel - ESPM
+    kESPM,       // ECAL Barrel - ESPM
+    kHB,         // HCAL Barrel - HB
+    kENCA,       // ECAL Endcap - ENCA
+    kHE,         // HCAL Endcap - HE
+    kHO,         // HCAL Outer  - HO
+    kHF,         // HCAL Forward - HF
     kNumberCalorimeter
   };
-  
-  CalorimeterNumber getCalorimeterNumber(const Gflash3Vector& position);
-  double rhoBackEB(const Gflash3Vector& position);
-  double zBackEE(const Gflash3Vector& position);
-  int findShowerType(const Gflash3Vector& position);
-
-  //                                            EB     HB     EE     HE      HO,     HF
-  const double Zmin[kNumberCalorimeter]   = {0.000, 0.000, 317.2, 391.95, 0.000, 1110.0}; // in cm
-  const double Zmax[kNumberCalorimeter]   = {317.0, 433.2, 399.1, 554.10, 661.0, 1275.0};
-  const double Rmin[kNumberCalorimeter]   = {123.8, 177.5,  31.6,  31.6,  382.0,  12.5};
-  const double Rmax[kNumberCalorimeter]   = {177.5, 287.7, 171.1, 263.9,  407.0, 140.0};
-
-  const double EtaMin[kNumberCalorimeter] = {0.000, 0.000, 1.479,  1.479, 0.000, 3.000};
-  const double EtaMax[kNumberCalorimeter] = {1.479, 1.479, 3.000,  3.000, 1.262, 5.000};
-
-  const double RFrontCrystalEB  = 129.0; // rho in cm
-  const double ZFrontCrystalEE  = 320.9; // z in cm
-  const double ROffCrystalEB    =   5.2; // rho in cm
-  const double ZOffCrystalEE    =   3.7; // z in cm
-  const double LengthCrystalEB  =  23.0;
-  const double LengthCrystalEE  =  22.0;
-
-  //constants needed for GflashHadronShowerModel
-  const double energyCutOff     =   1.0;
-
-  //cut value for quasi-elastic like interactions on the secondary energy, 
-  //ratio = (Leading Energy of Secondaries)/(Total Energy)
-  const double QuasiElasticLike =  0.95;
-
-  //minimum distance to the back of parameterized envelopes in [cm]
-  const double MinDistanceToOut =  10.0;
-    
-  //constants needed for GflashHadronShowerProfile
-
-  const double criticalEnergy                = 0.0086155;
-  const double rMoliere[kNumberCalorimeter]  = { 2.19, 2.19, 2.19, 2.19, 2.19, 1.72}; // in cm
-  const double radLength[kNumberCalorimeter] = { 0.89, 1.49, 0.89, 1.49, 1.49, 1.76}; // in cm
-  const double intLength[kNumberCalorimeter] = { 22.4,16.42, 22.4, 16.42, 16.42, 16.77}; // in cm
-  const double Z[kNumberCalorimeter]         = { 68.36, 68.36, 68.36, 68.36, 68.36, 55.845}; // mass of molicule
 
-  // The step size of showino along the helix trajectory in cm unit
-  const double divisionStep         =   1.0;
+  CalorimeterNumber getCalorimeterNumber(const Gflash3Vector &position);
+  double rhoBackEB(const Gflash3Vector &position);
+  double zBackEE(const Gflash3Vector &position);
+  int findShowerType(const Gflash3Vector &position);
 
-  //maximum shower depth for the hadronic lateral in interaction length unit
-  const double maxShowerDepthforR50 =   6.0;
+  //                                            EB     HB     EE     HE      HO,
+  //                                            HF
+  const double Zmin[kNumberCalorimeter] = {0.000, 0.000, 317.2, 391.95, 0.000, 1110.0};  // in cm
+  const double Zmax[kNumberCalorimeter] = {317.0, 433.2, 399.1, 554.10, 661.0, 1275.0};
+  const double Rmin[kNumberCalorimeter] = {123.8, 177.5, 31.6, 31.6, 382.0, 12.5};
+  const double Rmax[kNumberCalorimeter] = {177.5, 287.7, 171.1, 263.9, 407.0, 140.0};
 
-  //maximum size of the lateral arm for hadronic showers = 12 * interaction length
-  const double maxLateralArmforR50  = 197.0;
+  const double EtaMin[kNumberCalorimeter] = {0.000, 0.000, 1.479, 1.479, 0.000, 3.000};
+  const double EtaMax[kNumberCalorimeter] = {1.479, 1.479, 3.000, 3.000, 1.262, 5.000};
 
-  //minimum particle energy to trigger HO parameterization in [GeV]
-  const double MinEnergyCutOffForHO =   2.5;
+  const double RFrontCrystalEB = 129.0;  // rho in cm
+  const double ZFrontCrystalEE = 320.9;  // z in cm
+  const double ROffCrystalEB = 5.2;      // rho in cm
+  const double ZOffCrystalEE = 3.7;      // z in cm
+  const double LengthCrystalEB = 23.0;
+  const double LengthCrystalEE = 22.0;
 
-  //additional energy scale for the Hcal sensitive detector
-  const double scaleSensitiveHB = 0.180;
-  //  const double scaleSensitiveHE = 0.220;
-  const double scaleSensitiveHE = 0.180;
+  // constants needed for GflashHadronShowerModel
+  const double energyCutOff = 1.0;
 
-  // properties for different sub-detectors (calorimeters)
+  // cut value for quasi-elastic like interactions on the secondary energy,
+  // ratio = (Leading Energy of Secondaries)/(Total Energy)
+  const double QuasiElasticLike = 0.95;
 
-  const double SAMHAD[3][kNumberCalorimeter] = {{0.0,0.89,0.0,0.89,0.89,0.0},
-						{0.0,0.00,0.0,0.00,0.00,0.0},
-						{0.0,0.00,0.0,0.00,0.00,0.0}};
-  const double RLTHAD[kNumberCalorimeter] = {32.7,23.7,32.7,23.7,23.7,23.7};
+  // minimum distance to the back of parameterized envelopes in [cm]
+  const double MinDistanceToOut = 10.0;
 
+  // constants needed for GflashHadronShowerProfile
 
-  //parameters for logitudinal/lateral parameterizations and energy responses
+  const double criticalEnergy = 0.0086155;
+  const double rMoliere[kNumberCalorimeter] = {2.19, 2.19, 2.19, 2.19, 2.19, 1.72};       // in cm
+  const double radLength[kNumberCalorimeter] = {0.89, 1.49, 0.89, 1.49, 1.49, 1.76};      // in cm
+  const double intLength[kNumberCalorimeter] = {22.4, 16.42, 22.4, 16.42, 16.42, 16.77};  // in cm
+  const double Z[kNumberCalorimeter] = {68.36, 68.36, 68.36, 68.36, 68.36, 55.845};       // mass of molicule
 
-  const int NPar  = 5;
-  const int Nrpar = 4;
-
-  //Pion(-/+) parameters
+  // The step size of showino along the helix trajectory in cm unit
+  const double divisionStep = 1.0;
 
-  const double pion_emscale[2][5] = {
-    {  8.4338e-01,  1.8663e-01, -1.1906e+00,  6.8340e-01, -3.1237e-02 },
-    {  1.8918e-01,  2.2620e-02,  4.2555e+00,  1.8317e+00, -6.1358e-03 }
-  };
+  // maximum shower depth for the hadronic lateral in interaction length unit
+  const double maxShowerDepthforR50 = 6.0;
 
-  const double pion_hadscale[8][5] = {
-    //based on LogNormal of Had Energy - RegionI
-    { -4.4752e+00,  3.8163e+00,  2.7962e-01, -7.6887e-01,  9.6721e-01 },
-    {  1.1228e+00,  6.5039e-01,  4.5585e+00, -8.0282e+00, -1.7630e-01 },
-    {  2.8223e+00,  5.9029e+00, -1.5873e-01, -8.7078e-01,  3.8598e-01 },
-    { -8.2726e-01,  1.0359e-01,  2.2052e+01,  2.9719e+00,  6.4103e-02 },
-    //LogNormal of Had Energy for mip-like response
-    { -8.1787e-02,  8.3243e+00,  3.7488e-03,  3.2653e+00,  9.5662e-01 },
-    {  1.0567e-01, -2.0485e-01,  2.3345e-01,  4.5563e-01,  2.3694e-02 },
-    //correction of response if ssp is between Ecal and Hcal
-    {  1.8736e-01,  1.7391e-01,  1.0991e+00,  3.3557e+00,  0.0000e+00 },
-    {  5.3155e-02,  9.3601e-02,  8.8143e-01,  2.3251e+00, -2.1999e-02 }
-  };
+  // maximum size of the lateral arm for hadronic showers = 12 * interaction
+  // length
+  const double maxLateralArmforR50 = 197.0;
 
-  const double pion_correl_hadem[5] = 
-    { -7.3137e-01,  1.2367e-01, -8.5607e-01,  1.0989e+00, -1.2858e-02 };
-
-  //pion longitudinal parameters
-
-  const double pion_par[8*NPar][5] = {
-    {  4.4600e-01,  9.8040e-02,  1.4319e+00,  2.3920e+00,  5.8971e-02 }, //Mean Ecal ShowerType1
-    {  3.2392e+00,  5.4986e+00,  1.5979e-01,  3.2165e+00, -6.7426e-01 },
-    { -2.7502e-01, -2.2450e+00, -2.0636e-01,  2.7225e+00, -3.2656e-01 },
-    {  5.3763e-01,  3.1128e-01,  1.5000e+00,  2.7038e+00,  9.7550e-02 },
-    {  5.8269e+00,  5.9630e+00,  2.3568e-01,  3.2485e+00, -1.2201e+00 },
-
-    {  1.6324e+00,  1.1370e+00,  3.0111e-01,  4.4501e+00, -2.5984e-01 }, //Mean Hcal ShowerType1
-    {  1.2732e+00, -3.8571e-01,  1.2127e+00,  9.7707e-01, -1.4888e-02 },
-    { -4.0078e-01, -1.0428e+00,  6.6820e-01,  2.3706e-01, -1.3898e-01 },
-    {  1.9612e+00, -1.4451e+00,  5.2179e-01,  7.7221e-01,  4.1455e-02 },
-    {  2.8888e+00, -3.2074e+00,  3.4082e-01,  3.3507e-01,  2.7346e-02 },
-
-    {  3.5029e+00,  5.5470e+00,  1.5174e-01,  3.9215e+00, -7.5815e-01 }, //Mean Hcal ShowerType2
-    {  1.2035e+00, -4.3918e-01,  9.8431e-01,  5.3485e-01, -3.4481e-02 },
-    {  2.4186e+01,  2.5653e+01, -6.8909e-01, -2.7461e+00, -1.5702e-01 },
-    {  1.0827e+01,  1.0659e+01, -3.3366e-01, -3.1979e+00,  1.1158e-01 },
-    {  1.5010e+01, -1.5988e+01,  2.2580e-01, -4.3233e+00,  1.1448e-01 },
-
-    {  4.0761e-01,  5.0999e-02,  1.7222e+00,  2.1085e+00,  5.4258e-02 }, //Mean Hcal ShowerType3
-    {  1.0394e+01, -9.5700e+00,  1.1167e+00, -1.6884e+00, -3.3264e-02 },
-    { -1.1882e+00,  1.6460e-01, -2.5897e+00,  5.4484e-01, -1.5845e-01 },
-    {  2.7227e+01,  2.6921e+01, -3.5664e-01, -4.8584e+00,  1.1698e-01 },
-    {  2.1544e+01, -2.2048e+01,  2.5227e-01, -5.2186e+00,  6.7578e-02 },
-
-    {  3.6152e-02,  1.5236e-01, -5.4226e-01,  3.4917e+00,  3.1429e-02 },  //Sigma Ecal ShowerType1
-    {  4.9213e-01,  1.0093e-01, -7.8460e-01,  2.2417e+00, -1.9762e-02 },
-    {  3.6555e-01,  2.2955e-02, -3.3972e+01,  2.7112e+00, -2.0412e-02 },
-    {  7.1526e-01,  3.1537e-01, -4.8117e-01,  1.3809e+00, -1.1832e-02 },
-    {  5.3792e-01,  1.7556e-01, -5.9724e-01,  3.9307e-01, -2.1343e-02 },
-
-    {  2.7662e-01,  5.6892e-02, -1.0211e+00,  1.5592e+00, -2.0545e-02 },  //Sigma Hcal ShowerType1
-    {  2.1221e+00,  1.7139e+00,  2.9685e-01,  3.0293e+00, -4.9449e-01 },
-    {  9.8715e-01,  1.7377e-01, -1.5715e+00,  1.1948e+00, -7.4157e-02 },
-    {  1.2424e+00,  5.8446e-01, -7.3994e-01,  1.6481e+00, -6.4211e-02 },
-    {  1.2797e+00,  9.5722e-01, -4.1961e-01,  1.5458e+00, -1.9276e-02 },
-
-    {  5.6503e-01,  3.2484e-01, -6.8870e-01, -9.6941e-01, -2.4937e-02 },  //Sigma Hcal ShowerType2
-    {  7.2561e-01,  5.3369e-02,  9.1553e+00,  1.9652e+00, -5.4515e-02 },
-    {  3.3058e+01,  8.7333e+01, -2.4388e-02, -1.5815e+01,  1.6538e+00 },
-    {  1.1171e+00,  6.8039e-01, -6.0860e-01,  1.2764e+00, -2.1545e-02 },
-    {  2.2385e+00,  2.4309e+00, -2.4251e-01, -8.3314e-01,  4.4941e-02 },
-
-    {  2.5595e-01,  2.0105e-02, -1.7804e+00,  2.6746e+00, -2.6966e-02 },  //Sigma Hcal ShowerType3 
-    {  3.0882e-01,  3.1336e-01, -5.1932e-01,  3.3669e+00,  6.9642e-02 },
-    {  6.1781e-01,  1.1997e-01,  9.2596e-01, -1.3085e+01, -5.1192e-02 },
-    {  1.4680e+00, -1.1644e+00,  4.1119e-01, -2.3604e-01,  3.1277e-03 },
-    {  3.9081e+00,  4.2913e+00, -1.7321e-01, -3.9169e+00,  6.0504e-02 }
-  };
+  // minimum particle energy to trigger HO parameterization in [GeV]
+  const double MinEnergyCutOffForHO = 2.5;
 
-  const double pion_rho[8*NPar][5] = {
-    {  1.2318e-01,  3.0000e-01,  8.8725e-01,  1.6928e+00,  0.0000e+00 },  //Ecal ShowerType1
-    {  4.1546e-01,  1.6375e-01,  2.0719e+00,  1.2931e+00, -2.3695e-03 },
-    { -9.4588e-01,  1.7680e+00,  1.1180e+00, -1.7623e+00,  6.6812e-03 },
-    { -1.8668e-01,  1.5000e-01, -5.0000e+00,  2.4000e+00,  6.0000e-02 },
-    {  1.1945e-01,  1.5393e-01, -1.6983e+00,  2.2457e+00,  5.1813e-02 },
-    {  3.4322e-02,  2.0564e-01, -1.4297e+00,  2.1601e+00,  4.0797e-02 },
-    { -1.0894e-01,  1.4305e-01, -1.5543e+00,  2.5491e+00,  5.6509e-02 },
-    {  8.1763e-02,  8.0722e-02, -5.8023e+00,  2.4338e+00,  5.4228e-02 },
-    {  9.4796e-02,  1.5509e-01, -1.8610e+00,  2.3388e+00,  3.9771e-02 },
-    {  7.8380e-01,  1.4165e-01,  7.7385e-01,  1.9248e+00,  4.2539e-03 },
-
-    {  4.2393e-01,  2.7909e-01,  9.2577e-01,  2.7916e+00, -6.8012e-02 },  //Hcal ShowerType1
-    {  5.6826e-01,  2.9822e-01,  8.1516e-01,  2.3029e+00, -9.2674e-02 },
-    {  8.0676e-01,  1.0045e+00, -4.2949e-03, -1.1090e+01, -9.6997e-04 },
-    { -1.8671e-01,  7.4935e-01,  3.6716e-04,  4.3540e+00,  8.4585e-02 },
-    {  3.7378e-01,  1.8905e+00,  1.3206e-01,  8.3958e-01, -1.4278e-01 },
-    {  2.4541e-01,  1.4579e-01,  1.3386e+00,  1.1209e+00,  1.5902e-03 },
-    {  4.4394e-02,  1.1718e-01,  2.0436e+00,  1.0125e+00, -2.0101e-02 },
-    {  1.5076e-01,  8.8556e-02, -1.8958e+00,  2.2495e+00,  4.6895e-02 },
-    {  5.0817e-01,  1.2550e-01,  2.3684e+00,  1.0669e+00, -1.3888e-02 },
-    {  8.3803e-01,  5.6501e-02, -1.2531e+00,  2.7326e+00, -4.1174e-02 },
-
-    {  3.0277e-01,  2.1400e-01,  1.2867e+00,  2.3086e+00, -8.7281e-02 },  //Hcal ShowerType2
-    {  5.2508e-01,  2.6391e-01,  1.3357e+00,  1.9172e+00, -9.2390e-02 },
-    {  7.5387e-01, -3.2142e-02,  4.7437e+00,  8.5346e-01, -1.1566e-02 },
-    { -7.5633e-02,  8.8550e-02,  2.2340e+00,  9.7441e-01,  3.2514e-02 },
-    {  2.0314e-01,  1.2932e-01,  9.9352e-01,  6.6276e-01,  3.2726e-02 },
-    { -2.6996e+00,  3.9944e+00, -2.3836e-01,  3.4896e+00,  8.5793e-01 },
-    {  1.2888e-01,  2.4009e-01,  9.8654e-01,  9.8778e-01, -4.3265e-02 },
-    {  2.2281e-01,  8.4319e-02,  4.8402e-04, -2.0111e-01,  1.9263e-02 },
-    { -9.3521e+00,  1.0283e+01,  3.5236e-01, -4.8949e+00, -7.7675e-02 },
-    {  7.6844e-01, -9.0198e-02,  1.0364e+00,  2.3443e+00, -1.4107e-02 },
-
-    {  3.0154e-01,  3.6790e-01,  7.5730e-01,  1.7676e+00, -9.7870e-02 },  //Hcal ShowerType3
-    {  4.2110e-01,  3.6328e-01,  9.7741e-01,  1.1211e+00, -6.4038e-02 },
-    {  7.6092e-01,  3.5780e-02,  9.7086e-01,  1.9511e+00, -1.2363e-02 },
-    { -1.4874e+00,  2.4273e+00, -1.0552e-01,  7.3591e+00,  1.7302e-01 },
-    { -1.6966e+00,  2.9215e+00, -2.2195e-01,  3.3990e+00,  6.0529e-01 },
-    {  1.6144e-01,  2.1615e-01, -7.4824e-01,  3.1003e+00,  0.0000e+00 },
-    { -2.2588e+00,  3.9894e+01,  5.5166e-02, -1.1180e+00, -2.1166e+00 },
-    {  6.8954e-01,  1.1032e+00,  2.4371e-01,  1.8565e+00, -1.9127e-01 },
-    {  4.7802e-02,  3.0961e+00,  1.4566e-01, -1.0462e+00, -3.6505e-01 },
-    {  6.3815e-01, -5.1494e-01,  3.3634e-01,  1.4517e+00,  8.8357e-02 }
-  };
+  // additional energy scale for the Hcal sensitive detector
+  const double scaleSensitiveHB = 0.180;
+  //  const double scaleSensitiveHE = 0.220;
+  const double scaleSensitiveHE = 0.180;
 
-  //pion lateral parameters
+  // properties for different sub-detectors (calorimeters)
 
-  const double pion_rpar[4*Nrpar][5] = {
-    {  1.7239e+00,  9.3646e-01, -7.6784e-01,  1.6319e+00,  0.0000e+00 }, //Ecal for showerType = 1
-    {  8.0152e+00,  1.3573e+00, -2.2490e+00,  2.0799e+00, -9.1649e-01 },
-    {  7.3494e-01,  8.7912e-02, -1.9433e+00,  1.2044e+00, -3.4421e-02 },
-    { -2.2025e-01,  7.3525e-02,  3.1836e+00,  1.4077e+00,  2.3818e-02 },
+  const double SAMHAD[3][kNumberCalorimeter] = {
+      {0.0, 0.89, 0.0, 0.89, 0.89, 0.0}, {0.0, 0.00, 0.0, 0.00, 0.00, 0.0}, {0.0, 0.00, 0.0, 0.00, 0.00, 0.0}};
+  const double RLTHAD[kNumberCalorimeter] = {32.7, 23.7, 32.7, 23.7, 23.7, 23.7};
 
-    {  2.0617e+01,  2.1354e+00, -1.3979e+00,  2.4424e+00, -2.0928e+00 }, //Hcal for showerType = 1
-    {  1.4732e+02,  1.4804e+02, -1.0534e+00, -2.1180e+00,  1.9513e-02 },
-    {  5.2939e-01,  2.3488e-01,  4.2874e-01,  1.4435e+00, -6.7974e-02 },
-    { -2.2405e-02,  1.7781e-01,  5.8629e-03, -2.6258e+01,  2.0595e-03 },
+  // parameters for logitudinal/lateral parameterizations and energy responses
 
-    {  1.3184e+01,  5.3308e+00, -6.5926e-01,  1.4287e+00, -9.1948e-01 }, //Hcal for showerType = 2
-    {  6.0658e+00,  7.6593e+00, -6.9664e-01, -1.7824e+00,  1.5619e-01 },
-    {  5.5211e-01,  0.0000e+00,  0.0000e+00,  0.0000e+00, -2.9011e-02 },
-    {  2.1551e-02, -5.4231e-02,  1.6615e+00,  2.7025e-01,  1.1807e-02 },
+  const int NPar = 5;
+  const int Nrpar = 4;
 
-    {  9.0230e-01,  8.7071e-01, -5.9984e-01,  2.7973e+00,  2.4553e-01 }, //Hcal for showerType = 3
-    {  7.5508e+00,  3.6556e+00, -8.3028e-01,  1.1326e+00, -6.4124e-01 },
-    {  2.5737e+01,  2.5165e+01, -5.6146e-01, -4.0345e+00, -2.9592e-02 },
-    { -3.1200e-01,  2.0000e-01,  2.8915e+00,  7.5519e-01,  1.5230e-02 }
-  };
+  // Pion(-/+) parameters
 
-  //Proton paramters
+  const double pion_emscale[2][5] = {{8.4338e-01, 1.8663e-01, -1.1906e+00, 6.8340e-01, -3.1237e-02},
+                                     {1.8918e-01, 2.2620e-02, 4.2555e+00, 1.8317e+00, -6.1358e-03}};
 
-  const double pro_emscale[2][5] = {
-    {  6.2614e-01,  1.7633e-01, -1.2677e+00,  1.3193e+00,  2.4973e-03 },
-    {  1.6413e-01,  5.2570e-03,  1.8876e+02,  1.2887e+00, -4.0266e-03 }
-  };
+  const double pion_hadscale[8][5] = {
+      // based on LogNormal of Had Energy - RegionI
+      {-4.4752e+00, 3.8163e+00, 2.7962e-01, -7.6887e-01, 9.6721e-01},
+      {1.1228e+00, 6.5039e-01, 4.5585e+00, -8.0282e+00, -1.7630e-01},
+      {2.8223e+00, 5.9029e+00, -1.5873e-01, -8.7078e-01, 3.8598e-01},
+      {-8.2726e-01, 1.0359e-01, 2.2052e+01, 2.9719e+00, 6.4103e-02},
+      // LogNormal of Had Energy for mip-like response
+      {-8.1787e-02, 8.3243e+00, 3.7488e-03, 3.2653e+00, 9.5662e-01},
+      {1.0567e-01, -2.0485e-01, 2.3345e-01, 4.5563e-01, 2.3694e-02},
+      // correction of response if ssp is between Ecal and Hcal
+      {1.8736e-01, 1.7391e-01, 1.0991e+00, 3.3557e+00, 0.0000e+00},
+      {5.3155e-02, 9.3601e-02, 8.8143e-01, 2.3251e+00, -2.1999e-02}};
+
+  const double pion_correl_hadem[5] = {-7.3137e-01, 1.2367e-01, -8.5607e-01, 1.0989e+00, -1.2858e-02};
+
+  // pion longitudinal parameters
+
+  const double pion_par[8 * NPar][5] = {
+      {4.4600e-01, 9.8040e-02, 1.4319e+00, 2.3920e+00, 5.8971e-02},  // Mean Ecal ShowerType1
+      {3.2392e+00, 5.4986e+00, 1.5979e-01, 3.2165e+00, -6.7426e-01},
+      {-2.7502e-01, -2.2450e+00, -2.0636e-01, 2.7225e+00, -3.2656e-01},
+      {5.3763e-01, 3.1128e-01, 1.5000e+00, 2.7038e+00, 9.7550e-02},
+      {5.8269e+00, 5.9630e+00, 2.3568e-01, 3.2485e+00, -1.2201e+00},
+
+      {1.6324e+00, 1.1370e+00, 3.0111e-01, 4.4501e+00, -2.5984e-01},  // Mean Hcal ShowerType1
+      {1.2732e+00, -3.8571e-01, 1.2127e+00, 9.7707e-01, -1.4888e-02},
+      {-4.0078e-01, -1.0428e+00, 6.6820e-01, 2.3706e-01, -1.3898e-01},
+      {1.9612e+00, -1.4451e+00, 5.2179e-01, 7.7221e-01, 4.1455e-02},
+      {2.8888e+00, -3.2074e+00, 3.4082e-01, 3.3507e-01, 2.7346e-02},
+
+      {3.5029e+00, 5.5470e+00, 1.5174e-01, 3.9215e+00, -7.5815e-01},  // Mean Hcal ShowerType2
+      {1.2035e+00, -4.3918e-01, 9.8431e-01, 5.3485e-01, -3.4481e-02},
+      {2.4186e+01, 2.5653e+01, -6.8909e-01, -2.7461e+00, -1.5702e-01},
+      {1.0827e+01, 1.0659e+01, -3.3366e-01, -3.1979e+00, 1.1158e-01},
+      {1.5010e+01, -1.5988e+01, 2.2580e-01, -4.3233e+00, 1.1448e-01},
+
+      {4.0761e-01, 5.0999e-02, 1.7222e+00, 2.1085e+00, 5.4258e-02},  // Mean Hcal ShowerType3
+      {1.0394e+01, -9.5700e+00, 1.1167e+00, -1.6884e+00, -3.3264e-02},
+      {-1.1882e+00, 1.6460e-01, -2.5897e+00, 5.4484e-01, -1.5845e-01},
+      {2.7227e+01, 2.6921e+01, -3.5664e-01, -4.8584e+00, 1.1698e-01},
+      {2.1544e+01, -2.2048e+01, 2.5227e-01, -5.2186e+00, 6.7578e-02},
+
+      {3.6152e-02, 1.5236e-01, -5.4226e-01, 3.4917e+00, 3.1429e-02},  // Sigma Ecal ShowerType1
+      {4.9213e-01, 1.0093e-01, -7.8460e-01, 2.2417e+00, -1.9762e-02},
+      {3.6555e-01, 2.2955e-02, -3.3972e+01, 2.7112e+00, -2.0412e-02},
+      {7.1526e-01, 3.1537e-01, -4.8117e-01, 1.3809e+00, -1.1832e-02},
+      {5.3792e-01, 1.7556e-01, -5.9724e-01, 3.9307e-01, -2.1343e-02},
+
+      {2.7662e-01, 5.6892e-02, -1.0211e+00, 1.5592e+00, -2.0545e-02},  // Sigma Hcal ShowerType1
+      {2.1221e+00, 1.7139e+00, 2.9685e-01, 3.0293e+00, -4.9449e-01},
+      {9.8715e-01, 1.7377e-01, -1.5715e+00, 1.1948e+00, -7.4157e-02},
+      {1.2424e+00, 5.8446e-01, -7.3994e-01, 1.6481e+00, -6.4211e-02},
+      {1.2797e+00, 9.5722e-01, -4.1961e-01, 1.5458e+00, -1.9276e-02},
+
+      {5.6503e-01, 3.2484e-01, -6.8870e-01, -9.6941e-01, -2.4937e-02},  // Sigma Hcal ShowerType2
+      {7.2561e-01, 5.3369e-02, 9.1553e+00, 1.9652e+00, -5.4515e-02},
+      {3.3058e+01, 8.7333e+01, -2.4388e-02, -1.5815e+01, 1.6538e+00},
+      {1.1171e+00, 6.8039e-01, -6.0860e-01, 1.2764e+00, -2.1545e-02},
+      {2.2385e+00, 2.4309e+00, -2.4251e-01, -8.3314e-01, 4.4941e-02},
+
+      {2.5595e-01, 2.0105e-02, -1.7804e+00, 2.6746e+00, -2.6966e-02},  // Sigma Hcal ShowerType3
+      {3.0882e-01, 3.1336e-01, -5.1932e-01, 3.3669e+00, 6.9642e-02},
+      {6.1781e-01, 1.1997e-01, 9.2596e-01, -1.3085e+01, -5.1192e-02},
+      {1.4680e+00, -1.1644e+00, 4.1119e-01, -2.3604e-01, 3.1277e-03},
+      {3.9081e+00, 4.2913e+00, -1.7321e-01, -3.9169e+00, 6.0504e-02}};
+
+  const double pion_rho[8 * NPar][5] = {
+      {1.2318e-01, 3.0000e-01, 8.8725e-01, 1.6928e+00, 0.0000e+00},  // Ecal ShowerType1
+      {4.1546e-01, 1.6375e-01, 2.0719e+00, 1.2931e+00, -2.3695e-03},
+      {-9.4588e-01, 1.7680e+00, 1.1180e+00, -1.7623e+00, 6.6812e-03},
+      {-1.8668e-01, 1.5000e-01, -5.0000e+00, 2.4000e+00, 6.0000e-02},
+      {1.1945e-01, 1.5393e-01, -1.6983e+00, 2.2457e+00, 5.1813e-02},
+      {3.4322e-02, 2.0564e-01, -1.4297e+00, 2.1601e+00, 4.0797e-02},
+      {-1.0894e-01, 1.4305e-01, -1.5543e+00, 2.5491e+00, 5.6509e-02},
+      {8.1763e-02, 8.0722e-02, -5.8023e+00, 2.4338e+00, 5.4228e-02},
+      {9.4796e-02, 1.5509e-01, -1.8610e+00, 2.3388e+00, 3.9771e-02},
+      {7.8380e-01, 1.4165e-01, 7.7385e-01, 1.9248e+00, 4.2539e-03},
+
+      {4.2393e-01, 2.7909e-01, 9.2577e-01, 2.7916e+00, -6.8012e-02},  // Hcal ShowerType1
+      {5.6826e-01, 2.9822e-01, 8.1516e-01, 2.3029e+00, -9.2674e-02},
+      {8.0676e-01, 1.0045e+00, -4.2949e-03, -1.1090e+01, -9.6997e-04},
+      {-1.8671e-01, 7.4935e-01, 3.6716e-04, 4.3540e+00, 8.4585e-02},
+      {3.7378e-01, 1.8905e+00, 1.3206e-01, 8.3958e-01, -1.4278e-01},
+      {2.4541e-01, 1.4579e-01, 1.3386e+00, 1.1209e+00, 1.5902e-03},
+      {4.4394e-02, 1.1718e-01, 2.0436e+00, 1.0125e+00, -2.0101e-02},
+      {1.5076e-01, 8.8556e-02, -1.8958e+00, 2.2495e+00, 4.6895e-02},
+      {5.0817e-01, 1.2550e-01, 2.3684e+00, 1.0669e+00, -1.3888e-02},
+      {8.3803e-01, 5.6501e-02, -1.2531e+00, 2.7326e+00, -4.1174e-02},
+
+      {3.0277e-01, 2.1400e-01, 1.2867e+00, 2.3086e+00, -8.7281e-02},  // Hcal ShowerType2
+      {5.2508e-01, 2.6391e-01, 1.3357e+00, 1.9172e+00, -9.2390e-02},
+      {7.5387e-01, -3.2142e-02, 4.7437e+00, 8.5346e-01, -1.1566e-02},
+      {-7.5633e-02, 8.8550e-02, 2.2340e+00, 9.7441e-01, 3.2514e-02},
+      {2.0314e-01, 1.2932e-01, 9.9352e-01, 6.6276e-01, 3.2726e-02},
+      {-2.6996e+00, 3.9944e+00, -2.3836e-01, 3.4896e+00, 8.5793e-01},
+      {1.2888e-01, 2.4009e-01, 9.8654e-01, 9.8778e-01, -4.3265e-02},
+      {2.2281e-01, 8.4319e-02, 4.8402e-04, -2.0111e-01, 1.9263e-02},
+      {-9.3521e+00, 1.0283e+01, 3.5236e-01, -4.8949e+00, -7.7675e-02},
+      {7.6844e-01, -9.0198e-02, 1.0364e+00, 2.3443e+00, -1.4107e-02},
+
+      {3.0154e-01, 3.6790e-01, 7.5730e-01, 1.7676e+00, -9.7870e-02},  // Hcal ShowerType3
+      {4.2110e-01, 3.6328e-01, 9.7741e-01, 1.1211e+00, -6.4038e-02},
+      {7.6092e-01, 3.5780e-02, 9.7086e-01, 1.9511e+00, -1.2363e-02},
+      {-1.4874e+00, 2.4273e+00, -1.0552e-01, 7.3591e+00, 1.7302e-01},
+      {-1.6966e+00, 2.9215e+00, -2.2195e-01, 3.3990e+00, 6.0529e-01},
+      {1.6144e-01, 2.1615e-01, -7.4824e-01, 3.1003e+00, 0.0000e+00},
+      {-2.2588e+00, 3.9894e+01, 5.5166e-02, -1.1180e+00, -2.1166e+00},
+      {6.8954e-01, 1.1032e+00, 2.4371e-01, 1.8565e+00, -1.9127e-01},
+      {4.7802e-02, 3.0961e+00, 1.4566e-01, -1.0462e+00, -3.6505e-01},
+      {6.3815e-01, -5.1494e-01, 3.3634e-01, 1.4517e+00, 8.8357e-02}};
+
+  // pion lateral parameters
+
+  const double pion_rpar[4 * Nrpar][5] = {
+      {1.7239e+00, 9.3646e-01, -7.6784e-01, 1.6319e+00, 0.0000e+00},  // Ecal for showerType = 1
+      {8.0152e+00, 1.3573e+00, -2.2490e+00, 2.0799e+00, -9.1649e-01},
+      {7.3494e-01, 8.7912e-02, -1.9433e+00, 1.2044e+00, -3.4421e-02},
+      {-2.2025e-01, 7.3525e-02, 3.1836e+00, 1.4077e+00, 2.3818e-02},
+
+      {2.0617e+01, 2.1354e+00, -1.3979e+00, 2.4424e+00, -2.0928e+00},  // Hcal for showerType = 1
+      {1.4732e+02, 1.4804e+02, -1.0534e+00, -2.1180e+00, 1.9513e-02},
+      {5.2939e-01, 2.3488e-01, 4.2874e-01, 1.4435e+00, -6.7974e-02},
+      {-2.2405e-02, 1.7781e-01, 5.8629e-03, -2.6258e+01, 2.0595e-03},
+
+      {1.3184e+01, 5.3308e+00, -6.5926e-01, 1.4287e+00, -9.1948e-01},  // Hcal for showerType = 2
+      {6.0658e+00, 7.6593e+00, -6.9664e-01, -1.7824e+00, 1.5619e-01},
+      {5.5211e-01, 0.0000e+00, 0.0000e+00, 0.0000e+00, -2.9011e-02},
+      {2.1551e-02, -5.4231e-02, 1.6615e+00, 2.7025e-01, 1.1807e-02},
+
+      {9.0230e-01, 8.7071e-01, -5.9984e-01, 2.7973e+00, 2.4553e-01},  // Hcal for showerType = 3
+      {7.5508e+00, 3.6556e+00, -8.3028e-01, 1.1326e+00, -6.4124e-01},
+      {2.5737e+01, 2.5165e+01, -5.6146e-01, -4.0345e+00, -2.9592e-02},
+      {-3.1200e-01, 2.0000e-01, 2.8915e+00, 7.5519e-01, 1.5230e-02}};
+
+  // Proton paramters
+
+  const double pro_emscale[2][5] = {{6.2614e-01, 1.7633e-01, -1.2677e+00, 1.3193e+00, 2.4973e-03},
+                                    {1.6413e-01, 5.2570e-03, 1.8876e+02, 1.2887e+00, -4.0266e-03}};
 
   const double pro_hadscale[8][5] = {
-    //based on LogNormal of Had Energy 
-    { -1.2767e+02,  1.2691e+02,  2.6892e-01, -8.4621e+00,  9.7956e-01 },
-    {  1.2283e+00,  1.6307e-01, -3.6863e+00,  1.8677e+00, -4.5990e-02 },
-    {  1.8917e+00,  2.0947e+00, -3.6371e-01,  3.7861e-01,  8.8760e-02 },
-    { -7.6830e-01,  3.1319e-01,  8.2844e-01,  1.5865e+00,  2.4735e-02 },
-    //LogNormal of Had Energy for mip-like response
-    { -1.0927e+01,  1.0727e+01,  2.9922e+00, -8.2073e-01,  9.8722e-01 },
-    {  7.2797e-02,  2.3601e-02, -1.4900e+00,  1.8989e+00,  3.4294e-04 },
-    //correction of response if ssp is between Ecal and Hcal
-    {  1.8736e-01,  1.7391e-01,  1.0991e+00,  3.3557e+00,  0.0000e+00 },
-    {  4.7858e-01,  5.8552e-01,  3.9112e-01,  2.6945e+00, -1.7791e-01 }
-  };
-
-  const double pro_correl_hadem[5] = 
-    { -6.7711e-01,  2.5760e-01, -4.9826e-01,  3.4791e-01,  0.0000e+00 };
-
-  //proton longitudinal parameters
-
-  const double pro_par[8*NPar][5] = {
-    {  3.5805e-01,  8.2073e-02,  2.4040e+00,  2.8935e+00,  7.1200e-02 },  //Mean Ecal ShowerType1
-    {  8.1351e-01,  9.3288e-02,  4.5959e+00,  4.1930e+00,  8.2825e-02 },
-    { -1.2342e+00,  1.3826e-01,  8.1966e-01,  3.7141e+00,  2.7493e-02 },
-    {  5.6140e-01,  2.1720e-01,  2.0061e+00,  2.8141e+00,  1.1165e-01 },
-    {  3.9409e+00,  2.6083e+00,  3.0382e-01,  3.2679e+00, -6.3072e-01 },
-
-    {  1.5450e+00,  1.1047e+00,  2.9732e-01,  4.5325e+00, -2.4096e-01 },  //Mean Hcal ShowerType1
-    {  1.5098e+00, -6.8331e-01,  8.7004e-01,  5.0915e-01, -9.3536e-03 },
-    {  6.9904e+00, -8.9057e+00,  3.8745e-01, -2.9089e+00, -6.0353e-02 },
-    {  1.8465e+00, -1.1548e+00,  7.1662e-01,  9.2467e-01,  7.0536e-03 },
-    {  2.1807e+00, -1.4464e+00,  7.2033e-01,  1.0696e+00, -1.3923e-01 },
-
-    {  3.9185e+00,  6.1651e+00,  1.4738e-01,  4.2079e+00, -8.1423e-01 },  //Mean Hcal ShowerType2
-    {  8.3119e+00,  7.5628e+00, -4.9561e-01, -2.9352e+00, -3.0061e-02 },
-    {  2.7150e+00,  4.5234e+00, -4.6494e-01, -1.9846e+00, -9.9347e-02 },
-    {  2.2762e+00,  1.7668e+00, -5.3421e-01, -6.4613e-03,  5.3533e-02 },
-    {  2.6187e+00, -2.3479e+00,  4.9602e-01,  1.8344e-01, -5.3695e-02 },
-
-    {  1.9666e+00,  3.0810e+00,  1.7874e-01,  3.2441e+00, -4.4566e-01 }, //Mean Hcal ShowerType3
-    {  1.6223e+01,  1.7175e+01, -1.3214e-01, -1.0103e+01,  1.9030e-01 },
-    {  8.1636e+01,  8.3368e+01, -5.0505e-01, -5.2201e+00, -1.0340e-01 },
-    {  5.5674e+01,  5.5241e+01, -3.8856e-01, -5.5563e+00,  9.2886e-02 },
-    {  6.1932e+01,  6.2078e+01, -3.2123e-01, -5.9991e+00,  2.2640e-02 },
-
-    {  7.9984e-02,  1.0177e-01, -4.9195e-01,  3.6549e+00,  1.3986e-02 },  //Sigma Ecal ShowerType1
-    {  4.6155e-01,  1.1266e-01, -1.1120e+00,  2.8973e+00, -7.7394e-03 },
-    {  3.6587e-01,  3.0463e-02, -1.8552e+00,  2.9503e+00, -1.9858e-02 },
-    {  7.0777e-01,  1.5344e-01, -9.7573e-01,  2.2658e+00, -4.3013e-02 },
-    {  3.7488e-01,  3.3388e-01, -3.2414e-01,  1.7099e+00,  2.7456e-02 },
-
-    {  2.3330e-01,  8.3848e-02, -1.4841e+00,  1.6539e+00, -8.9738e-03 },  //Sigma Hcal ShowerType1
-    {  9.0862e-01,  1.9284e-01, -2.9385e+00,  5.5159e-01, -4.4707e-02 },
-    {  1.0615e+00,  4.0817e-01, -9.2562e-01,  7.7349e-01, -5.2196e-02 },
-    {  1.3044e+00,  6.9523e-01, -8.0370e-01,  1.3130e+00, -6.0052e-02 },
-    {  1.3648e+00,  6.7204e-01, -7.7137e-01,  1.3261e+00, -8.1459e-02 },
-
-    {  2.3378e-01,  8.4699e-02, -1.2727e+00,  1.3170e+00, -9.0939e-03 },  //Sigma Hcal ShowerType2
-    {  6.7311e-01,  2.6483e-02, -2.3889e+01,  3.3071e+00, -3.8701e-02 },
-    {  1.9157e+01,  1.8483e+01, -6.2208e-01, -3.5409e+00, -6.3584e-02 },
-    {  1.2720e+00,  7.7241e-01, -6.6997e-01,  8.5122e-01, -3.7883e-02 },
-    {  3.2209e+00,  2.8976e+00, -3.4428e-01, -1.5930e+00, -2.2328e-02 },
-
-    {  2.3064e+00,  2.1994e+00, -2.4570e-01, -6.2275e+00, -6.5378e-03 },  //Sigma Hcal ShowerType3
-    {  6.2645e-01,  1.0763e-01, -2.4655e+00,  3.0694e+00, -2.2801e-02 },
-    {  3.9143e+00, -3.1821e+00,  2.2346e+00, -8.5515e-01, -7.0756e-02 },
-    {  8.8440e+00,  8.6952e+00, -2.8769e-01, -4.4932e+00,  2.0374e-02 },
-    {  7.1745e+00,  7.0713e+00, -2.5061e-01, -4.6686e+00,  1.0573e-02 }
-  };
-
-  const double pro_rho[8*NPar][5] = {
-    {  1.9717e+00,  6.6780e+00,  1.4425e-01,  2.2917e+00, -8.1369e-01 },  //Ecal ShowerType1
-    { -6.3565e+00,  7.0824e+00,  1.9663e-01, -7.8033e+00, -2.3854e-02 },
-    {  8.0629e-01,  6.5672e-02,  1.4501e+00,  3.3136e-01, -5.6348e-03 },
-    { -1.6000e-01,  2.3904e-01,  1.1818e+00,  6.1474e-01, -1.0088e-02 },
-    {  1.0966e-01,  1.8834e-01, -1.4410e+00,  2.6445e+00,  9.0217e-02 },
-    {  1.0565e-02,  2.4379e-01, -1.3677e+00,  2.7338e+00,  7.6137e-02 },
-    { -3.1898e-02,  1.1508e-01,  1.5916e+00,  6.2431e-01, -9.8921e-03 },
-    {  1.5641e-01,  1.8429e-01,  1.8207e+00,  4.9841e-01,  1.3907e-03 },
-    { -1.5532e-01,  3.4349e-01, -8.5195e-01,  2.8581e+00,  1.4698e-01 },
-    {  6.9661e-01,  2.0247e-01,  7.0948e-01,  6.1266e-01,  1.0035e-02 },
-
-    {  2.8900e-01,  1.9972e-01,  1.3997e+00,  2.8253e+00, -3.0914e-02 },  //Hcal ShowerType1
-    {  3.2869e-01,  8.6843e-02,  6.0682e+01,  2.1983e+00, -1.0146e-02 },
-    {  7.8200e-01,  6.8963e-02, -1.9113e+00,  7.5866e-01,  5.9595e-03 },
-    {  9.5356e-01,  1.1469e+00,  3.0959e-01,  1.0238e+01,  7.6437e-02 },
-    {  3.4378e-01,  1.6417e-01,  1.2061e+00,  1.6405e+00,  2.3441e-02 },
-    {  2.8005e-01,  2.0804e-01,  1.3118e+00,  1.1119e+00, -1.9884e-02 },
-    { -2.7624e-02,  1.0661e-01,  2.7942e+00,  5.8531e-01, -8.9599e-03 },
-    {  2.3749e-01,  2.6046e-02,  1.8467e+01,  6.2294e-01,  9.8564e-03 },
-    {  4.6006e-01,  2.0859e-01,  1.2562e+00,  7.6745e-01, -1.9148e-02 },
-    {  8.1573e-01,  6.8433e-02, -2.1358e+00,  2.2568e+00, -3.8336e-02 },
-
-    {  1.1195e-01,  1.1879e-01,  2.9551e+00,  1.9034e+00, -2.0542e-02 },  //Hcal ShowerType2
-    {  4.1285e-01,  4.6288e-01,  5.0506e-01,  1.4100e+00, -1.2918e-01 },
-    {  7.7938e-01, -4.7534e-02,  1.8256e+01,  6.8910e-02, -8.8481e-03 },
-    {  2.1819e-01,  2.1512e-01,  7.0238e-01,  3.6517e+00, -2.4946e-02 },
-    {  3.5413e-01,  1.8842e-01,  1.0927e+00,  1.2173e+00,  3.4229e-04 },
-    { -1.9019e+00,  2.8987e+00, -2.5328e-01,  3.4091e+00,  6.5499e-01 },
-    { -7.1433e-02,  7.6591e-02, -6.8698e+00,  2.1165e+00,  5.6828e-02 },
-    {  2.2651e-01,  7.3121e-01,  6.9897e-04,  3.5656e+00,  2.7391e-02 },
-    { -9.1867e+00,  1.0087e+01,  3.4287e-01, -5.2458e+00, -7.1044e-02 },
-    {  7.7621e-01, -9.5476e-02,  1.0892e+00,  1.8212e+00, -1.6587e-02 },
-
-    {  1.4812e-01,  3.7207e-01,  6.7394e-01,  1.6932e+00, -8.9577e-02 },  //Hcal ShowerType3
-    { -1.0980e+01,  1.1814e+01,  2.9231e-01, -5.5518e+00, -9.7033e-02 },
-    {  7.8865e-01, -4.6499e-02,  1.0071e+01, -1.7465e-01, -7.8028e-03 },
-    { -4.8628e-03,  6.8062e-02,  4.0379e-04, -2.9541e+00,  1.4925e-02 },
-    {  3.2583e-01,  2.2048e-01,  1.3796e+00,  7.7019e-01, -1.9870e-02 },
-    { -4.1067e+00,  8.5741e+00, -1.8161e-01,  3.0661e+00,  1.4121e+00 },
-    {  1.3314e-01,  1.3727e-01, -2.5181e-04, -4.8352e-01, -7.1482e-03 },
-    {  1.8448e-01, -1.0892e-01,  2.0336e-04, -3.5803e+01,  6.2453e-02 },
-    { -4.3394e+00,  6.7933e+00,  1.2905e-01, -6.7132e+00, -2.7930e-01 },
-    {  7.6150e-01, -1.3613e-01,  9.9347e-01,  1.1661e+00,  5.4822e-03 }
-  };
-
-  //proton lateral parameters
-
-  const double pro_rpar[4*Nrpar][5] = {
-    {  2.0473e+01,  1.8293e+01, -2.7258e-03, -1.4304e+03, -2.7740e-01 },  //Ecal for showerType = 1
-    {  4.3030e+00,  3.1796e+01, -1.4979e-01,  1.2390e+00,  2.8661e+00 },
-    { -7.1506e-01,  3.4815e+00, -1.8282e-01,  2.4101e+00,  5.4402e-01 },
-    {  2.5011e+00,  5.3549e+00,  1.7772e-01,  2.9511e+00, -8.8951e-01 },
-
-    {  2.0252e+01,  1.6754e+00, -3.3596e+00,  2.1412e+00, -2.1051e+00 },  //Hcal for showerType = 1
-    { -1.6270e+00,  5.0493e+00, -1.6916e-01,  1.5961e+00,  7.2367e-01 },
-    {  5.0396e-01,  7.1958e-02,  1.4915e+00,  1.4498e+00, -4.0554e-02 },
-    { -1.3402e-01,  1.3657e-01,  2.3093e+00, -3.1556e+00,  5.2742e-03 },
-
-    {  1.2771e+01,  2.8591e+00, -7.5931e-01,  1.5374e+00, -1.2623e+00 },  //Hcal for showerType = 2
-    { -4.1051e+00,  3.1735e+00, -3.5820e-01,  3.0133e+00,  1.0538e+00 },
-    {  4.9758e-01,  5.9756e-02, -1.9593e+00,  2.9959e+00, -1.3451e-02 },
-    {  2.0201e-01,  1.0967e-01,  1.2310e+00,  3.3239e+00, -6.2154e-02 },
-
-    { -4.8143e+00,  1.0479e+01, -2.1974e-01,  3.0933e+00,  2.0855e+00 },  //Hcal for showerType = 3
-    {  2.5276e+01,  2.1056e+01, -4.4710e-01, -1.7116e+00, -6.7854e-01 },
-    { -5.8886e-01,  2.6766e+00, -1.9974e-01,  2.6381e+00,  4.3146e-01 },
-    { -1.7710e-02,  9.4732e-02,  4.2625e+00,  3.3545e+00, -2.9552e-02 }
-  };
-
-  //Anti-Proton paramters
-
-  const double pbar_emscale[2][5] = {
-    {  1.9246e+01,  1.8870e+01, -3.3127e-01, -4.8509e+00, -2.3785e-02 },
-    {  3.5744e+00,  3.3661e+00, -4.9667e-01, -4.1388e+00, -8.8824e-03 }
-  };
+      // based on LogNormal of Had Energy
+      {-1.2767e+02, 1.2691e+02, 2.6892e-01, -8.4621e+00, 9.7956e-01},
+      {1.2283e+00, 1.6307e-01, -3.6863e+00, 1.8677e+00, -4.5990e-02},
+      {1.8917e+00, 2.0947e+00, -3.6371e-01, 3.7861e-01, 8.8760e-02},
+      {-7.6830e-01, 3.1319e-01, 8.2844e-01, 1.5865e+00, 2.4735e-02},
+      // LogNormal of Had Energy for mip-like response
+      {-1.0927e+01, 1.0727e+01, 2.9922e+00, -8.2073e-01, 9.8722e-01},
+      {7.2797e-02, 2.3601e-02, -1.4900e+00, 1.8989e+00, 3.4294e-04},
+      // correction of response if ssp is between Ecal and Hcal
+      {1.8736e-01, 1.7391e-01, 1.0991e+00, 3.3557e+00, 0.0000e+00},
+      {4.7858e-01, 5.8552e-01, 3.9112e-01, 2.6945e+00, -1.7791e-01}};
+
+  const double pro_correl_hadem[5] = {-6.7711e-01, 2.5760e-01, -4.9826e-01, 3.4791e-01, 0.0000e+00};
+
+  // proton longitudinal parameters
+
+  const double pro_par[8 * NPar][5] = {
+      {3.5805e-01, 8.2073e-02, 2.4040e+00, 2.8935e+00, 7.1200e-02},  // Mean Ecal ShowerType1
+      {8.1351e-01, 9.3288e-02, 4.5959e+00, 4.1930e+00, 8.2825e-02},
+      {-1.2342e+00, 1.3826e-01, 8.1966e-01, 3.7141e+00, 2.7493e-02},
+      {5.6140e-01, 2.1720e-01, 2.0061e+00, 2.8141e+00, 1.1165e-01},
+      {3.9409e+00, 2.6083e+00, 3.0382e-01, 3.2679e+00, -6.3072e-01},
+
+      {1.5450e+00, 1.1047e+00, 2.9732e-01, 4.5325e+00, -2.4096e-01},  // Mean Hcal ShowerType1
+      {1.5098e+00, -6.8331e-01, 8.7004e-01, 5.0915e-01, -9.3536e-03},
+      {6.9904e+00, -8.9057e+00, 3.8745e-01, -2.9089e+00, -6.0353e-02},
+      {1.8465e+00, -1.1548e+00, 7.1662e-01, 9.2467e-01, 7.0536e-03},
+      {2.1807e+00, -1.4464e+00, 7.2033e-01, 1.0696e+00, -1.3923e-01},
+
+      {3.9185e+00, 6.1651e+00, 1.4738e-01, 4.2079e+00, -8.1423e-01},  // Mean Hcal ShowerType2
+      {8.3119e+00, 7.5628e+00, -4.9561e-01, -2.9352e+00, -3.0061e-02},
+      {2.7150e+00, 4.5234e+00, -4.6494e-01, -1.9846e+00, -9.9347e-02},
+      {2.2762e+00, 1.7668e+00, -5.3421e-01, -6.4613e-03, 5.3533e-02},
+      {2.6187e+00, -2.3479e+00, 4.9602e-01, 1.8344e-01, -5.3695e-02},
+
+      {1.9666e+00, 3.0810e+00, 1.7874e-01, 3.2441e+00, -4.4566e-01},  // Mean Hcal ShowerType3
+      {1.6223e+01, 1.7175e+01, -1.3214e-01, -1.0103e+01, 1.9030e-01},
+      {8.1636e+01, 8.3368e+01, -5.0505e-01, -5.2201e+00, -1.0340e-01},
+      {5.5674e+01, 5.5241e+01, -3.8856e-01, -5.5563e+00, 9.2886e-02},
+      {6.1932e+01, 6.2078e+01, -3.2123e-01, -5.9991e+00, 2.2640e-02},
+
+      {7.9984e-02, 1.0177e-01, -4.9195e-01, 3.6549e+00, 1.3986e-02},  // Sigma Ecal ShowerType1
+      {4.6155e-01, 1.1266e-01, -1.1120e+00, 2.8973e+00, -7.7394e-03},
+      {3.6587e-01, 3.0463e-02, -1.8552e+00, 2.9503e+00, -1.9858e-02},
+      {7.0777e-01, 1.5344e-01, -9.7573e-01, 2.2658e+00, -4.3013e-02},
+      {3.7488e-01, 3.3388e-01, -3.2414e-01, 1.7099e+00, 2.7456e-02},
+
+      {2.3330e-01, 8.3848e-02, -1.4841e+00, 1.6539e+00, -8.9738e-03},  // Sigma Hcal ShowerType1
+      {9.0862e-01, 1.9284e-01, -2.9385e+00, 5.5159e-01, -4.4707e-02},
+      {1.0615e+00, 4.0817e-01, -9.2562e-01, 7.7349e-01, -5.2196e-02},
+      {1.3044e+00, 6.9523e-01, -8.0370e-01, 1.3130e+00, -6.0052e-02},
+      {1.3648e+00, 6.7204e-01, -7.7137e-01, 1.3261e+00, -8.1459e-02},
+
+      {2.3378e-01, 8.4699e-02, -1.2727e+00, 1.3170e+00, -9.0939e-03},  // Sigma Hcal ShowerType2
+      {6.7311e-01, 2.6483e-02, -2.3889e+01, 3.3071e+00, -3.8701e-02},
+      {1.9157e+01, 1.8483e+01, -6.2208e-01, -3.5409e+00, -6.3584e-02},
+      {1.2720e+00, 7.7241e-01, -6.6997e-01, 8.5122e-01, -3.7883e-02},
+      {3.2209e+00, 2.8976e+00, -3.4428e-01, -1.5930e+00, -2.2328e-02},
+
+      {2.3064e+00, 2.1994e+00, -2.4570e-01, -6.2275e+00, -6.5378e-03},  // Sigma Hcal ShowerType3
+      {6.2645e-01, 1.0763e-01, -2.4655e+00, 3.0694e+00, -2.2801e-02},
+      {3.9143e+00, -3.1821e+00, 2.2346e+00, -8.5515e-01, -7.0756e-02},
+      {8.8440e+00, 8.6952e+00, -2.8769e-01, -4.4932e+00, 2.0374e-02},
+      {7.1745e+00, 7.0713e+00, -2.5061e-01, -4.6686e+00, 1.0573e-02}};
+
+  const double pro_rho[8 * NPar][5] = {
+      {1.9717e+00, 6.6780e+00, 1.4425e-01, 2.2917e+00, -8.1369e-01},  // Ecal ShowerType1
+      {-6.3565e+00, 7.0824e+00, 1.9663e-01, -7.8033e+00, -2.3854e-02},
+      {8.0629e-01, 6.5672e-02, 1.4501e+00, 3.3136e-01, -5.6348e-03},
+      {-1.6000e-01, 2.3904e-01, 1.1818e+00, 6.1474e-01, -1.0088e-02},
+      {1.0966e-01, 1.8834e-01, -1.4410e+00, 2.6445e+00, 9.0217e-02},
+      {1.0565e-02, 2.4379e-01, -1.3677e+00, 2.7338e+00, 7.6137e-02},
+      {-3.1898e-02, 1.1508e-01, 1.5916e+00, 6.2431e-01, -9.8921e-03},
+      {1.5641e-01, 1.8429e-01, 1.8207e+00, 4.9841e-01, 1.3907e-03},
+      {-1.5532e-01, 3.4349e-01, -8.5195e-01, 2.8581e+00, 1.4698e-01},
+      {6.9661e-01, 2.0247e-01, 7.0948e-01, 6.1266e-01, 1.0035e-02},
+
+      {2.8900e-01, 1.9972e-01, 1.3997e+00, 2.8253e+00, -3.0914e-02},  // Hcal ShowerType1
+      {3.2869e-01, 8.6843e-02, 6.0682e+01, 2.1983e+00, -1.0146e-02},
+      {7.8200e-01, 6.8963e-02, -1.9113e+00, 7.5866e-01, 5.9595e-03},
+      {9.5356e-01, 1.1469e+00, 3.0959e-01, 1.0238e+01, 7.6437e-02},
+      {3.4378e-01, 1.6417e-01, 1.2061e+00, 1.6405e+00, 2.3441e-02},
+      {2.8005e-01, 2.0804e-01, 1.3118e+00, 1.1119e+00, -1.9884e-02},
+      {-2.7624e-02, 1.0661e-01, 2.7942e+00, 5.8531e-01, -8.9599e-03},
+      {2.3749e-01, 2.6046e-02, 1.8467e+01, 6.2294e-01, 9.8564e-03},
+      {4.6006e-01, 2.0859e-01, 1.2562e+00, 7.6745e-01, -1.9148e-02},
+      {8.1573e-01, 6.8433e-02, -2.1358e+00, 2.2568e+00, -3.8336e-02},
+
+      {1.1195e-01, 1.1879e-01, 2.9551e+00, 1.9034e+00, -2.0542e-02},  // Hcal ShowerType2
+      {4.1285e-01, 4.6288e-01, 5.0506e-01, 1.4100e+00, -1.2918e-01},
+      {7.7938e-01, -4.7534e-02, 1.8256e+01, 6.8910e-02, -8.8481e-03},
+      {2.1819e-01, 2.1512e-01, 7.0238e-01, 3.6517e+00, -2.4946e-02},
+      {3.5413e-01, 1.8842e-01, 1.0927e+00, 1.2173e+00, 3.4229e-04},
+      {-1.9019e+00, 2.8987e+00, -2.5328e-01, 3.4091e+00, 6.5499e-01},
+      {-7.1433e-02, 7.6591e-02, -6.8698e+00, 2.1165e+00, 5.6828e-02},
+      {2.2651e-01, 7.3121e-01, 6.9897e-04, 3.5656e+00, 2.7391e-02},
+      {-9.1867e+00, 1.0087e+01, 3.4287e-01, -5.2458e+00, -7.1044e-02},
+      {7.7621e-01, -9.5476e-02, 1.0892e+00, 1.8212e+00, -1.6587e-02},
+
+      {1.4812e-01, 3.7207e-01, 6.7394e-01, 1.6932e+00, -8.9577e-02},  // Hcal ShowerType3
+      {-1.0980e+01, 1.1814e+01, 2.9231e-01, -5.5518e+00, -9.7033e-02},
+      {7.8865e-01, -4.6499e-02, 1.0071e+01, -1.7465e-01, -7.8028e-03},
+      {-4.8628e-03, 6.8062e-02, 4.0379e-04, -2.9541e+00, 1.4925e-02},
+      {3.2583e-01, 2.2048e-01, 1.3796e+00, 7.7019e-01, -1.9870e-02},
+      {-4.1067e+00, 8.5741e+00, -1.8161e-01, 3.0661e+00, 1.4121e+00},
+      {1.3314e-01, 1.3727e-01, -2.5181e-04, -4.8352e-01, -7.1482e-03},
+      {1.8448e-01, -1.0892e-01, 2.0336e-04, -3.5803e+01, 6.2453e-02},
+      {-4.3394e+00, 6.7933e+00, 1.2905e-01, -6.7132e+00, -2.7930e-01},
+      {7.6150e-01, -1.3613e-01, 9.9347e-01, 1.1661e+00, 5.4822e-03}};
+
+  // proton lateral parameters
+
+  const double pro_rpar[4 * Nrpar][5] = {
+      {2.0473e+01, 1.8293e+01, -2.7258e-03, -1.4304e+03, -2.7740e-01},  // Ecal for showerType = 1
+      {4.3030e+00, 3.1796e+01, -1.4979e-01, 1.2390e+00, 2.8661e+00},
+      {-7.1506e-01, 3.4815e+00, -1.8282e-01, 2.4101e+00, 5.4402e-01},
+      {2.5011e+00, 5.3549e+00, 1.7772e-01, 2.9511e+00, -8.8951e-01},
+
+      {2.0252e+01, 1.6754e+00, -3.3596e+00, 2.1412e+00, -2.1051e+00},  // Hcal for showerType = 1
+      {-1.6270e+00, 5.0493e+00, -1.6916e-01, 1.5961e+00, 7.2367e-01},
+      {5.0396e-01, 7.1958e-02, 1.4915e+00, 1.4498e+00, -4.0554e-02},
+      {-1.3402e-01, 1.3657e-01, 2.3093e+00, -3.1556e+00, 5.2742e-03},
+
+      {1.2771e+01, 2.8591e+00, -7.5931e-01, 1.5374e+00, -1.2623e+00},  // Hcal for showerType = 2
+      {-4.1051e+00, 3.1735e+00, -3.5820e-01, 3.0133e+00, 1.0538e+00},
+      {4.9758e-01, 5.9756e-02, -1.9593e+00, 2.9959e+00, -1.3451e-02},
+      {2.0201e-01, 1.0967e-01, 1.2310e+00, 3.3239e+00, -6.2154e-02},
+
+      {-4.8143e+00, 1.0479e+01, -2.1974e-01, 3.0933e+00, 2.0855e+00},  // Hcal for showerType = 3
+      {2.5276e+01, 2.1056e+01, -4.4710e-01, -1.7116e+00, -6.7854e-01},
+      {-5.8886e-01, 2.6766e+00, -1.9974e-01, 2.6381e+00, 4.3146e-01},
+      {-1.7710e-02, 9.4732e-02, 4.2625e+00, 3.3545e+00, -2.9552e-02}};
+
+  // Anti-Proton paramters
+
+  const double pbar_emscale[2][5] = {{1.9246e+01, 1.8870e+01, -3.3127e-01, -4.8509e+00, -2.3785e-02},
+                                     {3.5744e+00, 3.3661e+00, -4.9667e-01, -4.1388e+00, -8.8824e-03}};
 
   const double pbar_hadscale[8][5] = {
-    //based on LogNormal of Had Energy 
-    { -1.8857e+00,  9.4549e-01,  1.0173e+00,  2.3654e+00,  1.0381e+00 },
-    {  1.4276e+00,  8.3835e-01, -9.1466e-01,  2.3945e+00,  0.0000e+00 },
-    {  1.0005e+00,  5.0454e-01, -9.6777e-01,  2.4216e+00, -3.0214e-02 },
-    { -7.1494e-01,  3.7825e-01,  1.1627e+00,  2.7411e+00,  5.5459e-03 },
-    //LogNormal of Had Energy for mip-like response
-    {  1.5770e+00,  1.1215e+00,  4.2471e-01,  3.8321e+00,  5.2852e-01 },
-    { -6.5624e-02,  2.7895e-01, -3.2639e-01,  2.3605e+00,  6.3871e-02 },
-    //correction of response if ssp is between Ecal and Hcal
-    {  1.8736e-01,  1.7391e-01,  1.0991e+00,  3.3557e+00,  0.0000e+00 },
-    {  9.1334e-02,  8.4321e-02,  9.1042e-01,  2.7686e+00, -3.0344e-02 }
-  };
-
-  const double pbar_correl_hadem[5] = 
-    { -5.8253e-01,  3.6344e-01, -4.6371e-01,  2.8284e-01,  0.0000e+00 };
-
-  //anti-proton longitudinal parameters
-
-  const double pbar_par[8*NPar][5] = {
-    {  2.2962e+00,  1.8237e+00,  1.5856e-01,  1.1724e+01, -2.5137e-02 },  //Mean Ecal ShowerType1 
-    {  5.1688e-01,  2.9636e-02,  3.9787e+01,  3.1512e+00,  1.7428e-01 },
-    { -1.3058e+00,  4.9530e-02,  1.5425e+00,  4.1539e+00,  5.7473e-02 },
-    {  2.9921e-01,  2.0357e-01,  2.9853e+00,  1.8306e+00,  1.5198e-01 },
-    {  3.8358e+00,  5.0343e+00,  1.3900e-01,  3.2366e+00, -6.1138e-01 },
-
-    {  9.2918e-01,  3.4905e-01,  4.4705e-01,  4.3199e+00, -1.0055e-01 },  //Mean Hcal ShowerType1
-    {  1.1081e+00, -3.4156e-01,  1.2140e+00,  1.0438e+00,  2.1996e-02 },
-    {  2.5596e+01, -4.7613e+01,  3.8236e-02, -1.6258e+01,  8.3889e-01 },
-    {  1.4731e+00, -8.7282e-01,  7.6302e-01,  1.4135e+00,  4.0020e-02 },
-    {  1.5854e+00, -1.5158e+00,  5.3554e-01,  1.7953e+00, -2.1115e-02 },
-
-    {  1.6397e+00,  1.4348e+00,  1.8597e-01,  5.0391e+00, -2.1112e-01 },  //Mean Hcal ShowerType2
-    {  1.9561e+00,  9.1382e-01,  5.2437e-01,  3.2069e+00, -3.6565e-01 },
-    {  8.4435e-01,  2.0674e+00, -4.2496e-01, -3.2228e+00, -2.0347e-01 },
-    {  1.3139e+00,  6.8898e-01, -9.0400e-01,  1.1612e+00,  5.2261e-02 },
-    {  1.3894e+00, -2.3487e+00,  3.5770e-01,  1.2953e+00,  1.4271e-01 },
-
-    {  6.4737e-01,  7.3992e-02,  9.2454e-01,  4.8070e+00, -3.3204e-03 },  //Mean Hcal ShowerType3
-    {  9.6156e-01,  1.5021e-01,  2.1087e+00,  2.7135e+00, -5.6608e-02 },
-    { -2.9797e+00,  3.7631e+00, -1.8261e-01,  2.8053e+00,  4.3358e-01 },
-    {  1.0332e+00,  4.4820e-01, -1.2826e+00,  9.7747e-01,  9.4973e-02 },
-    {  1.6588e+00,  3.6401e+00, -2.4077e-01,  3.4642e-01,  2.7807e-01 },
-
-    {  7.9348e-01,  6.0791e-01, -5.2480e-01, -4.1979e+00, -9.7594e-03 },  //Sigma Ecal ShowerType1
-    {  6.7623e-01,  1.1835e-01,  2.5074e+01,  2.9602e+00, -7.6399e-02 },
-    {  4.3953e-01,  5.0370e-02,  4.3043e+01,  2.9560e+00, -3.5965e-02 },
-    {  6.7091e-01,  1.1626e-01, -5.7986e-01,  2.9029e-01, -2.8586e-02 },
-    {  4.2821e-01,  8.0538e-02, -9.3285e-01,  1.2197e+00, -1.3245e-02 },
-
-    {  2.3715e-01,  6.1849e-02, -7.9327e-01,  2.4567e+00, -1.5569e-02 },  //Sigma Hcal ShowerType1
-    {  7.7529e-01,  8.4253e-02, -2.8453e+00,  6.6960e-01, -2.3133e-02 },
-    {  9.7261e-01,  1.1777e-01, -1.2671e+00,  1.3352e+00, -9.0527e-02 },
-    {  1.1170e+00,  5.7366e-01, -7.9215e-01,  1.8696e+00, -3.2848e-02 },
-    {  1.0912e+00,  5.3449e-01, -8.3799e-01,  2.2648e+00, -5.3589e-02 },
-
-    {  2.0364e-01,  1.1109e-01, -5.4911e-01,  2.2371e+00, -2.7723e-03 },  //Sigma Hcal ShowerType2
-    {  5.0058e-01,  8.3324e-02, -1.5426e+00,  4.3092e+00,  1.7710e-02 },
-    {  4.8258e+00, -5.3363e+00, -6.9399e-02,  1.3639e+01, -3.1232e-01 },
-    {  1.0654e+00,  4.3313e-01, -8.1864e-01,  1.5794e+00, -5.0301e-02 },
-    {  9.7937e-01,  4.9011e-01, -7.5635e-01,  2.0913e+00, -4.3251e-02 },
-
-    {  2.4410e-01,  6.9464e-02, -5.7121e-01,  1.5400e+00, -1.8889e-02 },  //Sigma Hcal ShowerType3   
-    {  6.8356e-01,  4.4101e-02,  2.0167e+01,  2.9570e+00, -4.3937e-02 },
-    {  2.9627e-01, -4.3021e-01,  1.3628e-01,  1.3540e+01, -5.0582e-02 },
-    {  9.2673e-01,  3.5636e-01, -6.8759e-01,  1.1528e+00, -3.6487e-02 },
-    {  8.1179e-01,  5.0238e-01, -5.7945e-01,  1.8664e+00, -9.9021e-03 }
-  };
-
-  const double pbar_rho[8*NPar][5] = {
-    {  1.6115e-01,  7.7749e-02,  1.3576e+01,  6.4878e-01, -3.2481e-03 },  //Ecal ShowerType1
-    {  4.1746e-01,  6.4980e-02, -1.8986e+01,  2.9812e+00,  8.2744e-03 },
-    {  8.3730e-01,  5.2519e-02,  1.9080e+01,  2.9734e+00, -7.2551e-04 },
-    {  4.7186e-01,  2.3447e+00,  1.5313e-01,  2.1195e+00, -2.7598e-01 },
-    {  2.6387e-01,  1.2494e-01,  2.0479e+01,  2.9541e+00,  3.9418e-03 },
-    {  1.4487e-01,  1.7347e-01,  2.0829e+01,  2.9708e+00, -1.7575e-02 },
-    { -3.2116e-02,  1.0593e-01, -3.6256e+00,  2.0405e+00,  3.9701e-02 },
-    {  3.2368e-01,  3.4897e-01,  4.0152e-01,  1.9683e+00, -4.3362e-02 },
-    {  3.3095e-01,  8.8705e-02,  3.0619e+01,  3.2302e+00, -2.6705e-02 },
-    {  6.8646e-01,  1.3220e-01,  1.8172e+00,  1.8252e+00,  2.5609e-02 },
-
-    {  2.5579e-01,  1.3158e-01,  2.0117e+00,  2.6834e+00, -1.8803e-02 },  //Hcal ShowerType1
-    {  5.4665e-01,  3.5282e-01,  7.0197e-01,  1.8240e+00, -1.2513e-01 },
-    {  7.8407e-01,  4.6267e-02, -1.9313e+00,  1.2055e+00,  3.1770e-03 },
-    {  1.9774e-01,  1.4336e+00,  1.0833e-01,  2.5249e+00, -6.1467e-02 },
-    {  4.8669e-01,  2.5554e-01,  7.8888e-01,  2.7417e+00,  0.0000e+00 },
-    {  2.5270e-01,  1.3412e-01,  7.7256e-01,  1.3281e+00,  1.2302e-02 },
-    {  4.3116e-02,  1.3977e-01,  1.2806e+00,  8.8424e-01, -2.2153e-02 },
-    { -1.1513e-01,  1.1712e+00, -1.9271e-01,  1.8406e+00,  2.3827e-01 },
-    {  4.8509e-01,  1.9358e-01,  6.8277e-01,  7.8174e-01, -1.2847e-02 },
-    {  6.8735e-01,  1.7148e-01, -8.8434e-01,  2.6390e+00,  1.8336e-02 },
-
-    {  2.6738e-01,  1.6698e-01,  1.6242e+00,  2.3194e+00, -5.4439e-02 },  //Hcal ShowerType2 
-    {  5.1565e-01,  3.1755e-01,  7.6866e-01,  1.4314e+00, -1.2355e-01 },
-    {  1.4488e+00, -1.0738e+00,  1.5373e-01, -4.4945e+00,  5.0825e-02 },
-    { -5.0531e-02,  5.4899e-01,  6.4605e-04,  6.2060e+00,  5.0480e-02 },
-    {  5.0045e-01,  2.8609e-01,  7.7954e-01,  2.4851e+00, -1.7178e-02 },
-    {  2.4183e-01,  1.1418e-01,  1.1548e+00,  6.8739e-01,  1.4071e-03 },
-    { -2.7267e-01,  2.9060e-01, -9.2639e-01,  3.3275e+00,  1.3254e-01 },
-    {  3.6510e-01,  6.8755e-02,  1.7529e+00,  3.3932e+00,  3.5968e-03 },
-    { -2.2256e+00,  4.0953e+00,  1.2237e-01, -6.3486e+00, -1.6487e-01 },
-    {  6.7014e-01, -1.8220e-01,  8.3413e-01,  2.3705e+00,  3.1919e-02 },
-
-    { -9.2169e-02,  2.7435e-01, -1.4954e+00,  3.4936e+00,  5.4085e-02 },  //Hcal ShowerType3
-    { -5.7426e-02,  4.2696e-01, -9.1241e-01,  3.5629e+00,  1.0904e-01 },
-    {  7.4201e-01,  4.7628e-02,  1.5747e+00, -4.6694e+00, -1.4296e-02 },
-    {  1.8949e-02,  1.0836e-01, -1.2242e+00,  2.7149e+00,  1.3031e-02 },
-    { -1.5217e+00,  2.4872e+00,  8.1875e-02, -1.0666e+01, -1.4661e-03 },
-    {  2.2412e-01,  9.4590e-02, -2.4942e+00,  1.8584e+00,  1.6461e-02 },
-    { -5.4793e-01,  8.2034e-01, -4.2542e-01,  3.6711e+00,  1.9032e-01 },
-    { -2.5079e-01, -8.8412e-01,  1.5082e-01,  5.3762e+00,  1.3426e-01 },
-    { -7.3299e+00,  8.1099e+00,  4.0558e-01, -5.0694e+00, -5.9030e-02 },
-    {  5.6633e-01, -4.7278e-01,  4.1026e-01,  1.7565e+00,  1.1369e-01 }
-  };
-
-  //anti-proton lateral parameters
-  const double pbar_rpar[4*Nrpar][5] = {
-    {  1.8776e+00,  2.8426e-01,  2.3530e+01,  3.0047e+00, -1.7332e-01 },  //Ecal for showerType = 1
-    {  9.1705e+00,  4.0028e+00, -4.4536e-01,  6.4847e-01, -5.9678e-01 },
-    {  5.9148e-01,  7.5552e-02, -3.0172e+01,  1.3417e+00,  2.0513e-02 },
-    { -1.3812e-01,  8.0542e-02,  5.5994e+01,  1.2251e+00, -1.6587e-02 },
-
-    {  1.7618e+01,  4.3991e+00, -9.7543e-01,  2.7789e+00, -1.2115e+00 },  //Hcal for showerType = 1
-    { -7.6558e-02,  1.3021e+00, -1.4519e+00,  1.3966e+00,  1.6778e-01 },
-    {  5.9899e-01,  1.6407e-01,  8.4000e-01,  2.1795e+00, -7.0504e-02 },
-    { -1.4042e-01,  1.3416e-01,  2.3339e+00, -2.7260e+00,  5.8295e-03 },
-
-    {  1.2340e+01,  5.3893e+00, -4.9219e-01,  1.5722e+00, -6.8433e-01 },  //Hcal for showerType = 2
-    {  1.0814e-01,  1.6610e+00, -1.1174e+00, -5.0663e+00,  1.9605e-01 },
-    {  4.9994e-01,  0.0000e+00,  0.0000e+00,  0.0000e+00, -2.0081e-02 },
-    {  4.6168e-01,  3.5308e-01,  5.4512e-01,  3.2036e+00, -1.4086e-01 },
-
-    { -1.6306e+00,  3.5609e+00, -1.8903e-01,  6.6580e+00,  4.6936e-01 },  //Hcal for showerType = 3
-    {  6.5560e+00,  2.3432e+00, -9.8700e-01,  1.3115e+00, -6.5919e-01 },
-    {  7.4461e-01,  6.6885e-02, -8.9140e-01, -1.2050e+01, -4.5248e-02 },
-    { -2.4275e-01,  1.6289e-01, -2.9514e-04, -1.1208e+00,  4.3240e-02 }
-  };
-
-  //Kaon-Minus paramters
-
-  const double kminus_emscale[2][5] = {
-    {  8.3935e-01,  2.4180e-01, -1.4484e+00,  1.0397e+00, -2.2546e-02 },
-    {  2.3334e-01,  3.6810e-02,  1.0247e+01,  1.8556e+00, -1.9288e-02 }
-  };
+      // based on LogNormal of Had Energy
+      {-1.8857e+00, 9.4549e-01, 1.0173e+00, 2.3654e+00, 1.0381e+00},
+      {1.4276e+00, 8.3835e-01, -9.1466e-01, 2.3945e+00, 0.0000e+00},
+      {1.0005e+00, 5.0454e-01, -9.6777e-01, 2.4216e+00, -3.0214e-02},
+      {-7.1494e-01, 3.7825e-01, 1.1627e+00, 2.7411e+00, 5.5459e-03},
+      // LogNormal of Had Energy for mip-like response
+      {1.5770e+00, 1.1215e+00, 4.2471e-01, 3.8321e+00, 5.2852e-01},
+      {-6.5624e-02, 2.7895e-01, -3.2639e-01, 2.3605e+00, 6.3871e-02},
+      // correction of response if ssp is between Ecal and Hcal
+      {1.8736e-01, 1.7391e-01, 1.0991e+00, 3.3557e+00, 0.0000e+00},
+      {9.1334e-02, 8.4321e-02, 9.1042e-01, 2.7686e+00, -3.0344e-02}};
+
+  const double pbar_correl_hadem[5] = {-5.8253e-01, 3.6344e-01, -4.6371e-01, 2.8284e-01, 0.0000e+00};
+
+  // anti-proton longitudinal parameters
+
+  const double pbar_par[8 * NPar][5] = {
+      {2.2962e+00, 1.8237e+00, 1.5856e-01, 1.1724e+01, -2.5137e-02},  // Mean Ecal ShowerType1
+      {5.1688e-01, 2.9636e-02, 3.9787e+01, 3.1512e+00, 1.7428e-01},
+      {-1.3058e+00, 4.9530e-02, 1.5425e+00, 4.1539e+00, 5.7473e-02},
+      {2.9921e-01, 2.0357e-01, 2.9853e+00, 1.8306e+00, 1.5198e-01},
+      {3.8358e+00, 5.0343e+00, 1.3900e-01, 3.2366e+00, -6.1138e-01},
+
+      {9.2918e-01, 3.4905e-01, 4.4705e-01, 4.3199e+00, -1.0055e-01},  // Mean Hcal ShowerType1
+      {1.1081e+00, -3.4156e-01, 1.2140e+00, 1.0438e+00, 2.1996e-02},
+      {2.5596e+01, -4.7613e+01, 3.8236e-02, -1.6258e+01, 8.3889e-01},
+      {1.4731e+00, -8.7282e-01, 7.6302e-01, 1.4135e+00, 4.0020e-02},
+      {1.5854e+00, -1.5158e+00, 5.3554e-01, 1.7953e+00, -2.1115e-02},
+
+      {1.6397e+00, 1.4348e+00, 1.8597e-01, 5.0391e+00, -2.1112e-01},  // Mean Hcal ShowerType2
+      {1.9561e+00, 9.1382e-01, 5.2437e-01, 3.2069e+00, -3.6565e-01},
+      {8.4435e-01, 2.0674e+00, -4.2496e-01, -3.2228e+00, -2.0347e-01},
+      {1.3139e+00, 6.8898e-01, -9.0400e-01, 1.1612e+00, 5.2261e-02},
+      {1.3894e+00, -2.3487e+00, 3.5770e-01, 1.2953e+00, 1.4271e-01},
+
+      {6.4737e-01, 7.3992e-02, 9.2454e-01, 4.8070e+00, -3.3204e-03},  // Mean Hcal ShowerType3
+      {9.6156e-01, 1.5021e-01, 2.1087e+00, 2.7135e+00, -5.6608e-02},
+      {-2.9797e+00, 3.7631e+00, -1.8261e-01, 2.8053e+00, 4.3358e-01},
+      {1.0332e+00, 4.4820e-01, -1.2826e+00, 9.7747e-01, 9.4973e-02},
+      {1.6588e+00, 3.6401e+00, -2.4077e-01, 3.4642e-01, 2.7807e-01},
+
+      {7.9348e-01, 6.0791e-01, -5.2480e-01, -4.1979e+00, -9.7594e-03},  // Sigma Ecal ShowerType1
+      {6.7623e-01, 1.1835e-01, 2.5074e+01, 2.9602e+00, -7.6399e-02},
+      {4.3953e-01, 5.0370e-02, 4.3043e+01, 2.9560e+00, -3.5965e-02},
+      {6.7091e-01, 1.1626e-01, -5.7986e-01, 2.9029e-01, -2.8586e-02},
+      {4.2821e-01, 8.0538e-02, -9.3285e-01, 1.2197e+00, -1.3245e-02},
+
+      {2.3715e-01, 6.1849e-02, -7.9327e-01, 2.4567e+00, -1.5569e-02},  // Sigma Hcal ShowerType1
+      {7.7529e-01, 8.4253e-02, -2.8453e+00, 6.6960e-01, -2.3133e-02},
+      {9.7261e-01, 1.1777e-01, -1.2671e+00, 1.3352e+00, -9.0527e-02},
+      {1.1170e+00, 5.7366e-01, -7.9215e-01, 1.8696e+00, -3.2848e-02},
+      {1.0912e+00, 5.3449e-01, -8.3799e-01, 2.2648e+00, -5.3589e-02},
+
+      {2.0364e-01, 1.1109e-01, -5.4911e-01, 2.2371e+00, -2.7723e-03},  // Sigma Hcal ShowerType2
+      {5.0058e-01, 8.3324e-02, -1.5426e+00, 4.3092e+00, 1.7710e-02},
+      {4.8258e+00, -5.3363e+00, -6.9399e-02, 1.3639e+01, -3.1232e-01},
+      {1.0654e+00, 4.3313e-01, -8.1864e-01, 1.5794e+00, -5.0301e-02},
+      {9.7937e-01, 4.9011e-01, -7.5635e-01, 2.0913e+00, -4.3251e-02},
+
+      {2.4410e-01, 6.9464e-02, -5.7121e-01, 1.5400e+00, -1.8889e-02},  // Sigma Hcal ShowerType3
+      {6.8356e-01, 4.4101e-02, 2.0167e+01, 2.9570e+00, -4.3937e-02},
+      {2.9627e-01, -4.3021e-01, 1.3628e-01, 1.3540e+01, -5.0582e-02},
+      {9.2673e-01, 3.5636e-01, -6.8759e-01, 1.1528e+00, -3.6487e-02},
+      {8.1179e-01, 5.0238e-01, -5.7945e-01, 1.8664e+00, -9.9021e-03}};
+
+  const double pbar_rho[8 * NPar][5] = {
+      {1.6115e-01, 7.7749e-02, 1.3576e+01, 6.4878e-01, -3.2481e-03},  // Ecal ShowerType1
+      {4.1746e-01, 6.4980e-02, -1.8986e+01, 2.9812e+00, 8.2744e-03},
+      {8.3730e-01, 5.2519e-02, 1.9080e+01, 2.9734e+00, -7.2551e-04},
+      {4.7186e-01, 2.3447e+00, 1.5313e-01, 2.1195e+00, -2.7598e-01},
+      {2.6387e-01, 1.2494e-01, 2.0479e+01, 2.9541e+00, 3.9418e-03},
+      {1.4487e-01, 1.7347e-01, 2.0829e+01, 2.9708e+00, -1.7575e-02},
+      {-3.2116e-02, 1.0593e-01, -3.6256e+00, 2.0405e+00, 3.9701e-02},
+      {3.2368e-01, 3.4897e-01, 4.0152e-01, 1.9683e+00, -4.3362e-02},
+      {3.3095e-01, 8.8705e-02, 3.0619e+01, 3.2302e+00, -2.6705e-02},
+      {6.8646e-01, 1.3220e-01, 1.8172e+00, 1.8252e+00, 2.5609e-02},
+
+      {2.5579e-01, 1.3158e-01, 2.0117e+00, 2.6834e+00, -1.8803e-02},  // Hcal ShowerType1
+      {5.4665e-01, 3.5282e-01, 7.0197e-01, 1.8240e+00, -1.2513e-01},
+      {7.8407e-01, 4.6267e-02, -1.9313e+00, 1.2055e+00, 3.1770e-03},
+      {1.9774e-01, 1.4336e+00, 1.0833e-01, 2.5249e+00, -6.1467e-02},
+      {4.8669e-01, 2.5554e-01, 7.8888e-01, 2.7417e+00, 0.0000e+00},
+      {2.5270e-01, 1.3412e-01, 7.7256e-01, 1.3281e+00, 1.2302e-02},
+      {4.3116e-02, 1.3977e-01, 1.2806e+00, 8.8424e-01, -2.2153e-02},
+      {-1.1513e-01, 1.1712e+00, -1.9271e-01, 1.8406e+00, 2.3827e-01},
+      {4.8509e-01, 1.9358e-01, 6.8277e-01, 7.8174e-01, -1.2847e-02},
+      {6.8735e-01, 1.7148e-01, -8.8434e-01, 2.6390e+00, 1.8336e-02},
+
+      {2.6738e-01, 1.6698e-01, 1.6242e+00, 2.3194e+00, -5.4439e-02},  // Hcal ShowerType2
+      {5.1565e-01, 3.1755e-01, 7.6866e-01, 1.4314e+00, -1.2355e-01},
+      {1.4488e+00, -1.0738e+00, 1.5373e-01, -4.4945e+00, 5.0825e-02},
+      {-5.0531e-02, 5.4899e-01, 6.4605e-04, 6.2060e+00, 5.0480e-02},
+      {5.0045e-01, 2.8609e-01, 7.7954e-01, 2.4851e+00, -1.7178e-02},
+      {2.4183e-01, 1.1418e-01, 1.1548e+00, 6.8739e-01, 1.4071e-03},
+      {-2.7267e-01, 2.9060e-01, -9.2639e-01, 3.3275e+00, 1.3254e-01},
+      {3.6510e-01, 6.8755e-02, 1.7529e+00, 3.3932e+00, 3.5968e-03},
+      {-2.2256e+00, 4.0953e+00, 1.2237e-01, -6.3486e+00, -1.6487e-01},
+      {6.7014e-01, -1.8220e-01, 8.3413e-01, 2.3705e+00, 3.1919e-02},
+
+      {-9.2169e-02, 2.7435e-01, -1.4954e+00, 3.4936e+00, 5.4085e-02},  // Hcal ShowerType3
+      {-5.7426e-02, 4.2696e-01, -9.1241e-01, 3.5629e+00, 1.0904e-01},
+      {7.4201e-01, 4.7628e-02, 1.5747e+00, -4.6694e+00, -1.4296e-02},
+      {1.8949e-02, 1.0836e-01, -1.2242e+00, 2.7149e+00, 1.3031e-02},
+      {-1.5217e+00, 2.4872e+00, 8.1875e-02, -1.0666e+01, -1.4661e-03},
+      {2.2412e-01, 9.4590e-02, -2.4942e+00, 1.8584e+00, 1.6461e-02},
+      {-5.4793e-01, 8.2034e-01, -4.2542e-01, 3.6711e+00, 1.9032e-01},
+      {-2.5079e-01, -8.8412e-01, 1.5082e-01, 5.3762e+00, 1.3426e-01},
+      {-7.3299e+00, 8.1099e+00, 4.0558e-01, -5.0694e+00, -5.9030e-02},
+      {5.6633e-01, -4.7278e-01, 4.1026e-01, 1.7565e+00, 1.1369e-01}};
+
+  // anti-proton lateral parameters
+  const double pbar_rpar[4 * Nrpar][5] = {
+      {1.8776e+00, 2.8426e-01, 2.3530e+01, 3.0047e+00, -1.7332e-01},  // Ecal for showerType = 1
+      {9.1705e+00, 4.0028e+00, -4.4536e-01, 6.4847e-01, -5.9678e-01},
+      {5.9148e-01, 7.5552e-02, -3.0172e+01, 1.3417e+00, 2.0513e-02},
+      {-1.3812e-01, 8.0542e-02, 5.5994e+01, 1.2251e+00, -1.6587e-02},
+
+      {1.7618e+01, 4.3991e+00, -9.7543e-01, 2.7789e+00, -1.2115e+00},  // Hcal for showerType = 1
+      {-7.6558e-02, 1.3021e+00, -1.4519e+00, 1.3966e+00, 1.6778e-01},
+      {5.9899e-01, 1.6407e-01, 8.4000e-01, 2.1795e+00, -7.0504e-02},
+      {-1.4042e-01, 1.3416e-01, 2.3339e+00, -2.7260e+00, 5.8295e-03},
+
+      {1.2340e+01, 5.3893e+00, -4.9219e-01, 1.5722e+00, -6.8433e-01},  // Hcal for showerType = 2
+      {1.0814e-01, 1.6610e+00, -1.1174e+00, -5.0663e+00, 1.9605e-01},
+      {4.9994e-01, 0.0000e+00, 0.0000e+00, 0.0000e+00, -2.0081e-02},
+      {4.6168e-01, 3.5308e-01, 5.4512e-01, 3.2036e+00, -1.4086e-01},
+
+      {-1.6306e+00, 3.5609e+00, -1.8903e-01, 6.6580e+00, 4.6936e-01},  // Hcal for showerType = 3
+      {6.5560e+00, 2.3432e+00, -9.8700e-01, 1.3115e+00, -6.5919e-01},
+      {7.4461e-01, 6.6885e-02, -8.9140e-01, -1.2050e+01, -4.5248e-02},
+      {-2.4275e-01, 1.6289e-01, -2.9514e-04, -1.1208e+00, 4.3240e-02}};
+
+  // Kaon-Minus paramters
+
+  const double kminus_emscale[2][5] = {{8.3935e-01, 2.4180e-01, -1.4484e+00, 1.0397e+00, -2.2546e-02},
+                                       {2.3334e-01, 3.6810e-02, 1.0247e+01, 1.8556e+00, -1.9288e-02}};
 
   const double kminus_hadscale[8][5] = {
-    //based on LogNormal of Had Energy 
-    { -5.9393e+01,  6.4013e+01,  1.0843e-01, -1.2441e+01,  4.2589e-01 },
-    {  1.3649e+01,  1.2266e+01, -4.9381e-01, -3.6921e+00, -1.1441e-01 },
-    {  1.2102e+00,  4.7458e-01, -9.4128e-01,  2.1482e+00, -5.1031e-02 },
-    { -6.2018e-01,  2.0288e-01,  1.1271e+00,  2.8535e+00,  0.0000e+00 },
-    //LogNormal of Had Energy for mip-like response
-    {  1.7106e-01,  1.3766e-01,  7.3972e-01,  4.1351e+00,  9.0284e-01 },
-    {  5.7520e-01, -1.2499e+00,  8.0351e-02, -4.7481e+00,  6.0937e-02 },
-    //correction of response if ssp is between Ecal and Hcal
-    {  1.8736e-01,  1.7391e-01,  1.0991e+00,  3.3557e+00,  0.0000e+00 },
-    {  4.2896e-02,  6.7448e-02,  7.4893e-01,  2.8837e+00, -1.1509e-02 }
-  };
-
-  const double kminus_correl_hadem[5] = 
-    { -7.3480e-01,  1.8541e-01, -7.6211e-01,  9.4878e-01,  2.5519e-03 };
-
-  //kaon-minus longitudinal parameters
-
-  const double kminus_par[8*NPar][5] = {
-    {  4.5986e-01,  8.0360e-02,  1.9103e+00,  2.7576e+00,  5.8024e-02 },  //Mean Ecal ShowerType1 
-    {  5.6306e-01,  8.6175e-02,  7.5699e+00,  1.9142e+00,  1.4928e-01 },
-    { -1.4029e+00,  8.6442e-02,  4.7447e+00,  2.0026e+00,  7.8132e-02 },
-    {  5.1022e-01,  3.1763e-01,  1.4969e+00,  2.4374e+00,  1.0470e-01 },
-    {  4.4840e+00,  4.0858e+00,  2.4837e-01,  3.0941e+00, -8.4496e-01 },
-
-    {  2.0880e+00,  1.9024e+00,  2.2650e-01,  4.5397e+00, -3.5337e-01 },  //Mean Hcal ShowerType1
-    {  1.2654e+00, -3.2827e-01,  1.4255e+00,  9.2278e-01, -2.8213e-02 },
-    { -8.5073e-01,  4.8949e-01, -1.1802e+00,  8.3284e-01, -1.6258e-01 },
-    {  2.4486e+00, -2.0627e+00,  4.1771e-01,  2.8534e-02,  5.9279e-02 },
-    {  1.0307e+01, -1.2125e+01,  1.8949e-01, -3.5864e+00,  1.9567e-01 },
-
-    {  3.0833e+00,  4.5830e+00,  1.6380e-01,  3.8496e+00, -6.6617e-01 },  //Mean Hcal ShowerType2
-    {  1.5334e+01, -1.4598e+01,  4.5394e-01, -4.3694e+00, -3.0904e-02 },
-    {  1.1765e+01,  1.3252e+01, -6.1629e-01, -2.8795e+00, -1.5726e-01 },
-    {  1.1343e+01,  1.1615e+01, -2.4147e-01, -4.5126e+00,  1.6850e-01 },
-    {  1.5856e+01, -1.6981e+01,  2.0512e-01, -5.0463e+00,  1.2586e-01 },
-
-    {  4.3696e-01,  5.9373e-02,  1.5520e+00,  2.8488e+00,  4.4038e-02 },  //Mean Hcal ShowerType3
-    {  5.4176e-01,  4.6653e+00, -1.1337e-01,  6.3126e-01,  4.5058e-01 },
-    { -1.3576e+00,  1.3274e-01, -2.0240e+00,  7.4848e-01, -1.3586e-01 },
-    {  8.4917e+00,  1.0264e+01, -1.5633e-01, -5.1903e+00,  3.7948e-01 },
-    {  2.4254e+01, -2.5119e+01,  2.1971e-01, -6.2339e+00,  1.1753e-01 },
-
-    {  6.6849e-02,  1.1461e-01, -6.0693e-01,  3.5849e+00,  2.1510e-02 },  //Sigma Ecal ShowerType1 
-    {  4.4751e-01,  6.7414e-02, -1.7351e+00,  3.1800e+00, -1.4204e-02 },
-    {  2.3277e-01,  9.8312e-02, -8.1359e-01,  3.3423e+00,  2.0069e-02 },
-    {  6.0942e-01,  2.5435e-01, -5.7408e-01,  2.2588e+00, -2.7305e-03 },
-    {  4.7227e-01,  6.9822e-01, -1.8614e-01,  5.0224e-01,  5.3256e-02 },
-
-    {  2.7710e-01,  5.4557e-02, -9.1426e-01,  1.3652e+00, -2.1545e-02 },  //Sigma Hcal ShowerType1
-    {  8.5475e-01,  9.0583e-02,  3.6811e+00,  2.1694e+00, -8.1316e-02 },
-    {  9.9153e-01,  1.7054e-01, -2.3509e+00,  1.0596e+00, -7.7110e-02 },
-    {  1.2402e+00,  6.9760e-01, -5.8527e-01,  1.3975e+00, -4.4764e-02 },
-    {  1.1041e+00,  9.4012e-01, -4.0793e-01,  1.7098e+00,  6.9772e-03 },
-
-    {  4.5757e-01,  2.2138e-01, -8.3016e-01, -6.5474e-01, -2.5193e-02 },  //Sigma Hcal ShowerType2
-    {  4.6612e-01,  1.1899e-01, -8.7496e-01,  4.0150e+00,  2.3778e-02 },
-    {  3.2115e+01,  3.1746e+01, -2.1227e-01, -1.1088e+01,  0.0000e+00 },
-    {  1.4220e+00,  1.3834e+00, -3.3056e-01,  2.2772e-01,  3.5460e-02 },
-    {  1.0770e+00,  2.3134e+00, -2.0993e-01,  7.6896e-01,  1.7177e-01 },
-
-    {  1.0333e+00,  8.4267e-01, -2.2255e-01, -6.2499e+00, -2.0389e-02 },  //Sigma Hcal ShowerType3
-    {  4.5615e-01,  1.4719e-01, -1.0516e+00,  3.2503e+00,  2.9697e-02 },
-    {  7.1504e-01,  4.0454e-01,  6.8555e-04, -1.7412e+01, -5.0839e-02 },
-    {  3.4149e+00,  3.8890e+00, -1.8545e-01, -3.4381e+00,  9.7396e-02 },
-    {  3.7946e+00,  4.0784e+00, -1.7896e-01, -3.9979e+00,  5.1072e-02 }
-  };
-
-  const double kminus_rho[8*NPar][5] = {
-    { -4.5951e-02,  3.6373e-01,  4.9181e-01,  6.9207e-01,  1.4429e-02 },  //Ecal ShowerType1 
-    {  1.6996e-01,  4.2946e-01,  6.2046e-01, -3.7396e-02, -1.4572e-02 },
-    {  8.3137e-01,  2.9433e-02,  3.2221e+00,  1.6200e+00, -8.8843e-04 },
-    { -1.3483e-01,  9.3124e-02, -4.7555e+01,  1.9746e+00,  4.2961e-02 },
-    {  1.4051e-01,  9.3445e-02, -3.3320e+00,  2.3752e+00,  3.7645e-02 },
-    {  7.8256e-02,  1.2162e-01, -2.9812e+00,  2.1452e+00,  1.7049e-02 },
-    { -8.5479e-03,  9.6577e-02, -2.5794e+00,  2.1738e+00,  2.0528e-02 },
-    {  1.9550e-01,  9.8667e-02,  2.3510e+00,  9.3278e-01, -1.0451e-02 },
-    {  1.3706e-01, -1.1500e-01,  2.4339e+00,  2.3990e+00,  2.4792e-02 },
-    {  7.8427e-01,  1.6946e-01,  6.7162e-01,  1.6939e+00, -6.8641e-04 },
-
-    {  3.0252e-01,  2.0969e-01,  1.2233e+00,  2.5744e+00, -3.5561e-02 },  //Hcal ShowerType1
-    {  5.0366e-01,  2.6734e-01,  9.1620e-01,  2.1240e+00, -7.5807e-02 },
-    {  7.6809e-01,  5.2611e-02, -3.3231e+00,  1.0126e+00,  6.1410e-03 },
-    { -1.7444e-01,  4.5874e-01,  1.0344e-03,  2.5811e+00,  7.8505e-02 },
-    {  2.5192e-01,  6.2636e-02,  1.3799e+00,  1.4204e+00,  6.1673e-02 },
-    {  2.9799e-01,  1.5329e-01,  1.2920e+00,  1.3530e+00, -1.0006e-02 },
-    { -1.8200e-01,  4.7254e-01,  5.0000e-01, -3.6152e-01, -4.6662e-02 },
-    {  1.6888e-01, -6.7814e-02,  6.5507e+00,  2.1306e+00,  4.1608e-02 },
-    {  4.8725e-01,  1.3573e-01,  1.7021e+00,  8.4936e-01, -1.0376e-02 },
-    {  8.3064e-01,  4.7621e-02, -1.4663e+00,  2.5843e+00, -4.1124e-02 },
-
-    {  2.5820e-01,  2.1436e-01,  1.3064e+00,  2.1257e+00, -7.9308e-02 },  //Hcal ShowerType2 
-    {  4.9118e-01,  2.3914e-01,  2.0019e+00,  1.8543e+00, -8.3488e-02 },
-    {  9.7119e-01, -2.4913e-01,  2.1162e+00, -2.2685e-01, -1.1841e-02 },
-    { -3.1042e-02,  8.5169e-02,  1.6265e+00,  1.3944e+00,  1.6725e-02 },
-    {  2.8430e-01,  1.0624e-01,  1.2654e+00,  8.8490e-01,  2.1335e-02 },
-    { -1.7883e+00,  2.5865e+00, -2.6200e-01,  3.5317e+00,  5.8945e-01 },
-    { -3.4648e-01,  3.0452e-01, -8.5428e-01,  3.7070e+00,  1.4478e-01 },
-    {  9.6655e-01,  1.1316e+00, -1.9048e-01, -3.5009e+00,  8.1655e-02 },
-    {  5.3247e-01,  1.1047e-01,  2.1538e+00,  7.0882e-01, -2.0301e-02 },
-    {  7.7207e-01, -8.5138e-02,  8.8082e-01,  2.0751e+00, -1.7783e-02 },
-
-    {  4.4074e-02,  1.1797e-01,  9.8745e-01,  1.2754e+00,  0.0000e+00 },  //Hcal ShowerType3
-    {  3.0829e-01,  3.7222e-01,  6.4042e-01,  7.1567e-01, -4.8572e-02 },
-    {  7.2438e-01,  1.3993e-02,  2.8178e+01,  1.1987e+00, -1.8113e-03 },
-    {  3.3772e-02,  5.2144e-02, -2.1020e+01,  2.2369e+00,  0.0000e+00 },
-    { -8.7740e+01,  8.8231e+01,  5.0000e-01, -6.4849e+00, -2.5865e-02 },
-    {  1.6919e-01,  1.5093e-01, -1.6970e+00,  3.1185e+00,  0.0000e+00 },
-    { -2.7414e-01,  4.2637e-01, -4.5968e-01,  4.0680e+00,  1.1120e-01 },
-    {  3.5779e-01,  1.3748e+00,  1.5201e-01,  4.5045e-01, -1.4935e-01 },
-    { -4.4323e+01,  4.5858e+01,  1.4803e-01, -1.5183e+01, -1.7599e-01 },
-    {  4.4308e-01, -1.9361e+00,  1.7101e-01,  1.2267e+00,  2.6132e-01 }
-  };
-
-  //kaon-minus lateral parameters
-
-  const double kminus_rpar[4*Nrpar][5] = {
-    {  1.5255e+00,  7.1460e-01, -9.6109e-01,  2.1485e+00,  0.0000e+00 },  //Ecal for showerType = 1
-    {  8.1702e+00,  1.1618e+00, -3.2615e+00,  1.9965e+00, -9.8151e-01 },
-    {  8.0394e-01,  1.1379e-01, -5.7818e+01,  1.8315e+00, -3.1074e-02 },
-    { -3.4073e-01,  1.5998e-01,  5.6939e+01,  1.8305e+00,  1.5185e-02 },
-
-    {  1.8546e+01,  3.9927e+00, -6.4386e-01,  2.5076e+00, -1.3842e+00 },  //Hcal for showerType = 1
-    { -2.9410e-01,  6.9922e-01, -7.1734e+01,  1.3073e+00,  8.2441e-02 },
-    {  4.8144e-01,  6.6668e-02,  1.4955e+00,  1.5032e+00, -2.8181e-02 },
-    { -5.4174e-03,  1.7362e-02,  1.2282e+01,  2.4035e-01,  6.1898e-04 },
-
-    {  2.0741e+01,  3.9654e+01, -1.8029e-01, -4.2558e-01,  2.5375e+00 },  //Hcal for showerType = 2
-    { -1.1271e+00,  5.6222e-01, -5.1185e+01,  9.9351e-01,  1.9139e-01 },
-    {  4.8514e-01,  2.6816e-02, -3.7361e+01,  2.7567e+00, -8.2626e-03 },
-    { -9.0682e-02,  7.2902e-02,  2.3265e+00, -6.5459e+00,  8.8080e-03 },
-
-    { -2.9248e+00,  5.6213e+00, -3.2437e-01,  3.0222e+00,  1.5066e+00 },  //Hcal for showerType = 3
-    {  7.4285e+00,  3.1786e+00, -9.1437e-01,  1.1013e+00, -7.0831e-01 },
-    {  9.6057e-01,  3.6162e-01, -3.6673e-01, -8.9691e-01, -3.2462e-02 },
-    { -2.9505e+01,  2.9362e+01,  1.0665e+00, -2.3946e+00,  1.6595e-02 }
-  };
-
-  //Kaon-Plus paramters
-
-  const double kplus_emscale[2][5] = {
-    {  7.8775e-01,  2.7022e-01, -1.4291e+00,  1.3980e+00, -1.2795e-02 },
-    {  2.2224e-01,  1.7480e-02,  1.1984e+01,  1.8265e+00, -1.6718e-02 }
-  };
+      // based on LogNormal of Had Energy
+      {-5.9393e+01, 6.4013e+01, 1.0843e-01, -1.2441e+01, 4.2589e-01},
+      {1.3649e+01, 1.2266e+01, -4.9381e-01, -3.6921e+00, -1.1441e-01},
+      {1.2102e+00, 4.7458e-01, -9.4128e-01, 2.1482e+00, -5.1031e-02},
+      {-6.2018e-01, 2.0288e-01, 1.1271e+00, 2.8535e+00, 0.0000e+00},
+      // LogNormal of Had Energy for mip-like response
+      {1.7106e-01, 1.3766e-01, 7.3972e-01, 4.1351e+00, 9.0284e-01},
+      {5.7520e-01, -1.2499e+00, 8.0351e-02, -4.7481e+00, 6.0937e-02},
+      // correction of response if ssp is between Ecal and Hcal
+      {1.8736e-01, 1.7391e-01, 1.0991e+00, 3.3557e+00, 0.0000e+00},
+      {4.2896e-02, 6.7448e-02, 7.4893e-01, 2.8837e+00, -1.1509e-02}};
+
+  const double kminus_correl_hadem[5] = {-7.3480e-01, 1.8541e-01, -7.6211e-01, 9.4878e-01, 2.5519e-03};
+
+  // kaon-minus longitudinal parameters
+
+  const double kminus_par[8 * NPar][5] = {
+      {4.5986e-01, 8.0360e-02, 1.9103e+00, 2.7576e+00, 5.8024e-02},  // Mean Ecal ShowerType1
+      {5.6306e-01, 8.6175e-02, 7.5699e+00, 1.9142e+00, 1.4928e-01},
+      {-1.4029e+00, 8.6442e-02, 4.7447e+00, 2.0026e+00, 7.8132e-02},
+      {5.1022e-01, 3.1763e-01, 1.4969e+00, 2.4374e+00, 1.0470e-01},
+      {4.4840e+00, 4.0858e+00, 2.4837e-01, 3.0941e+00, -8.4496e-01},
+
+      {2.0880e+00, 1.9024e+00, 2.2650e-01, 4.5397e+00, -3.5337e-01},  // Mean Hcal ShowerType1
+      {1.2654e+00, -3.2827e-01, 1.4255e+00, 9.2278e-01, -2.8213e-02},
+      {-8.5073e-01, 4.8949e-01, -1.1802e+00, 8.3284e-01, -1.6258e-01},
+      {2.4486e+00, -2.0627e+00, 4.1771e-01, 2.8534e-02, 5.9279e-02},
+      {1.0307e+01, -1.2125e+01, 1.8949e-01, -3.5864e+00, 1.9567e-01},
+
+      {3.0833e+00, 4.5830e+00, 1.6380e-01, 3.8496e+00, -6.6617e-01},  // Mean Hcal ShowerType2
+      {1.5334e+01, -1.4598e+01, 4.5394e-01, -4.3694e+00, -3.0904e-02},
+      {1.1765e+01, 1.3252e+01, -6.1629e-01, -2.8795e+00, -1.5726e-01},
+      {1.1343e+01, 1.1615e+01, -2.4147e-01, -4.5126e+00, 1.6850e-01},
+      {1.5856e+01, -1.6981e+01, 2.0512e-01, -5.0463e+00, 1.2586e-01},
+
+      {4.3696e-01, 5.9373e-02, 1.5520e+00, 2.8488e+00, 4.4038e-02},  // Mean Hcal ShowerType3
+      {5.4176e-01, 4.6653e+00, -1.1337e-01, 6.3126e-01, 4.5058e-01},
+      {-1.3576e+00, 1.3274e-01, -2.0240e+00, 7.4848e-01, -1.3586e-01},
+      {8.4917e+00, 1.0264e+01, -1.5633e-01, -5.1903e+00, 3.7948e-01},
+      {2.4254e+01, -2.5119e+01, 2.1971e-01, -6.2339e+00, 1.1753e-01},
+
+      {6.6849e-02, 1.1461e-01, -6.0693e-01, 3.5849e+00, 2.1510e-02},  // Sigma Ecal ShowerType1
+      {4.4751e-01, 6.7414e-02, -1.7351e+00, 3.1800e+00, -1.4204e-02},
+      {2.3277e-01, 9.8312e-02, -8.1359e-01, 3.3423e+00, 2.0069e-02},
+      {6.0942e-01, 2.5435e-01, -5.7408e-01, 2.2588e+00, -2.7305e-03},
+      {4.7227e-01, 6.9822e-01, -1.8614e-01, 5.0224e-01, 5.3256e-02},
+
+      {2.7710e-01, 5.4557e-02, -9.1426e-01, 1.3652e+00, -2.1545e-02},  // Sigma Hcal ShowerType1
+      {8.5475e-01, 9.0583e-02, 3.6811e+00, 2.1694e+00, -8.1316e-02},
+      {9.9153e-01, 1.7054e-01, -2.3509e+00, 1.0596e+00, -7.7110e-02},
+      {1.2402e+00, 6.9760e-01, -5.8527e-01, 1.3975e+00, -4.4764e-02},
+      {1.1041e+00, 9.4012e-01, -4.0793e-01, 1.7098e+00, 6.9772e-03},
+
+      {4.5757e-01, 2.2138e-01, -8.3016e-01, -6.5474e-01, -2.5193e-02},  // Sigma Hcal ShowerType2
+      {4.6612e-01, 1.1899e-01, -8.7496e-01, 4.0150e+00, 2.3778e-02},
+      {3.2115e+01, 3.1746e+01, -2.1227e-01, -1.1088e+01, 0.0000e+00},
+      {1.4220e+00, 1.3834e+00, -3.3056e-01, 2.2772e-01, 3.5460e-02},
+      {1.0770e+00, 2.3134e+00, -2.0993e-01, 7.6896e-01, 1.7177e-01},
+
+      {1.0333e+00, 8.4267e-01, -2.2255e-01, -6.2499e+00, -2.0389e-02},  // Sigma Hcal ShowerType3
+      {4.5615e-01, 1.4719e-01, -1.0516e+00, 3.2503e+00, 2.9697e-02},
+      {7.1504e-01, 4.0454e-01, 6.8555e-04, -1.7412e+01, -5.0839e-02},
+      {3.4149e+00, 3.8890e+00, -1.8545e-01, -3.4381e+00, 9.7396e-02},
+      {3.7946e+00, 4.0784e+00, -1.7896e-01, -3.9979e+00, 5.1072e-02}};
+
+  const double kminus_rho[8 * NPar][5] = {
+      {-4.5951e-02, 3.6373e-01, 4.9181e-01, 6.9207e-01, 1.4429e-02},  // Ecal ShowerType1
+      {1.6996e-01, 4.2946e-01, 6.2046e-01, -3.7396e-02, -1.4572e-02},
+      {8.3137e-01, 2.9433e-02, 3.2221e+00, 1.6200e+00, -8.8843e-04},
+      {-1.3483e-01, 9.3124e-02, -4.7555e+01, 1.9746e+00, 4.2961e-02},
+      {1.4051e-01, 9.3445e-02, -3.3320e+00, 2.3752e+00, 3.7645e-02},
+      {7.8256e-02, 1.2162e-01, -2.9812e+00, 2.1452e+00, 1.7049e-02},
+      {-8.5479e-03, 9.6577e-02, -2.5794e+00, 2.1738e+00, 2.0528e-02},
+      {1.9550e-01, 9.8667e-02, 2.3510e+00, 9.3278e-01, -1.0451e-02},
+      {1.3706e-01, -1.1500e-01, 2.4339e+00, 2.3990e+00, 2.4792e-02},
+      {7.8427e-01, 1.6946e-01, 6.7162e-01, 1.6939e+00, -6.8641e-04},
+
+      {3.0252e-01, 2.0969e-01, 1.2233e+00, 2.5744e+00, -3.5561e-02},  // Hcal ShowerType1
+      {5.0366e-01, 2.6734e-01, 9.1620e-01, 2.1240e+00, -7.5807e-02},
+      {7.6809e-01, 5.2611e-02, -3.3231e+00, 1.0126e+00, 6.1410e-03},
+      {-1.7444e-01, 4.5874e-01, 1.0344e-03, 2.5811e+00, 7.8505e-02},
+      {2.5192e-01, 6.2636e-02, 1.3799e+00, 1.4204e+00, 6.1673e-02},
+      {2.9799e-01, 1.5329e-01, 1.2920e+00, 1.3530e+00, -1.0006e-02},
+      {-1.8200e-01, 4.7254e-01, 5.0000e-01, -3.6152e-01, -4.6662e-02},
+      {1.6888e-01, -6.7814e-02, 6.5507e+00, 2.1306e+00, 4.1608e-02},
+      {4.8725e-01, 1.3573e-01, 1.7021e+00, 8.4936e-01, -1.0376e-02},
+      {8.3064e-01, 4.7621e-02, -1.4663e+00, 2.5843e+00, -4.1124e-02},
+
+      {2.5820e-01, 2.1436e-01, 1.3064e+00, 2.1257e+00, -7.9308e-02},  // Hcal ShowerType2
+      {4.9118e-01, 2.3914e-01, 2.0019e+00, 1.8543e+00, -8.3488e-02},
+      {9.7119e-01, -2.4913e-01, 2.1162e+00, -2.2685e-01, -1.1841e-02},
+      {-3.1042e-02, 8.5169e-02, 1.6265e+00, 1.3944e+00, 1.6725e-02},
+      {2.8430e-01, 1.0624e-01, 1.2654e+00, 8.8490e-01, 2.1335e-02},
+      {-1.7883e+00, 2.5865e+00, -2.6200e-01, 3.5317e+00, 5.8945e-01},
+      {-3.4648e-01, 3.0452e-01, -8.5428e-01, 3.7070e+00, 1.4478e-01},
+      {9.6655e-01, 1.1316e+00, -1.9048e-01, -3.5009e+00, 8.1655e-02},
+      {5.3247e-01, 1.1047e-01, 2.1538e+00, 7.0882e-01, -2.0301e-02},
+      {7.7207e-01, -8.5138e-02, 8.8082e-01, 2.0751e+00, -1.7783e-02},
+
+      {4.4074e-02, 1.1797e-01, 9.8745e-01, 1.2754e+00, 0.0000e+00},  // Hcal ShowerType3
+      {3.0829e-01, 3.7222e-01, 6.4042e-01, 7.1567e-01, -4.8572e-02},
+      {7.2438e-01, 1.3993e-02, 2.8178e+01, 1.1987e+00, -1.8113e-03},
+      {3.3772e-02, 5.2144e-02, -2.1020e+01, 2.2369e+00, 0.0000e+00},
+      {-8.7740e+01, 8.8231e+01, 5.0000e-01, -6.4849e+00, -2.5865e-02},
+      {1.6919e-01, 1.5093e-01, -1.6970e+00, 3.1185e+00, 0.0000e+00},
+      {-2.7414e-01, 4.2637e-01, -4.5968e-01, 4.0680e+00, 1.1120e-01},
+      {3.5779e-01, 1.3748e+00, 1.5201e-01, 4.5045e-01, -1.4935e-01},
+      {-4.4323e+01, 4.5858e+01, 1.4803e-01, -1.5183e+01, -1.7599e-01},
+      {4.4308e-01, -1.9361e+00, 1.7101e-01, 1.2267e+00, 2.6132e-01}};
+
+  // kaon-minus lateral parameters
+
+  const double kminus_rpar[4 * Nrpar][5] = {
+      {1.5255e+00, 7.1460e-01, -9.6109e-01, 2.1485e+00, 0.0000e+00},  // Ecal for showerType = 1
+      {8.1702e+00, 1.1618e+00, -3.2615e+00, 1.9965e+00, -9.8151e-01},
+      {8.0394e-01, 1.1379e-01, -5.7818e+01, 1.8315e+00, -3.1074e-02},
+      {-3.4073e-01, 1.5998e-01, 5.6939e+01, 1.8305e+00, 1.5185e-02},
+
+      {1.8546e+01, 3.9927e+00, -6.4386e-01, 2.5076e+00, -1.3842e+00},  // Hcal for showerType = 1
+      {-2.9410e-01, 6.9922e-01, -7.1734e+01, 1.3073e+00, 8.2441e-02},
+      {4.8144e-01, 6.6668e-02, 1.4955e+00, 1.5032e+00, -2.8181e-02},
+      {-5.4174e-03, 1.7362e-02, 1.2282e+01, 2.4035e-01, 6.1898e-04},
+
+      {2.0741e+01, 3.9654e+01, -1.8029e-01, -4.2558e-01, 2.5375e+00},  // Hcal for showerType = 2
+      {-1.1271e+00, 5.6222e-01, -5.1185e+01, 9.9351e-01, 1.9139e-01},
+      {4.8514e-01, 2.6816e-02, -3.7361e+01, 2.7567e+00, -8.2626e-03},
+      {-9.0682e-02, 7.2902e-02, 2.3265e+00, -6.5459e+00, 8.8080e-03},
+
+      {-2.9248e+00, 5.6213e+00, -3.2437e-01, 3.0222e+00, 1.5066e+00},  // Hcal for showerType = 3
+      {7.4285e+00, 3.1786e+00, -9.1437e-01, 1.1013e+00, -7.0831e-01},
+      {9.6057e-01, 3.6162e-01, -3.6673e-01, -8.9691e-01, -3.2462e-02},
+      {-2.9505e+01, 2.9362e+01, 1.0665e+00, -2.3946e+00, 1.6595e-02}};
+
+  // Kaon-Plus paramters
+
+  const double kplus_emscale[2][5] = {{7.8775e-01, 2.7022e-01, -1.4291e+00, 1.3980e+00, -1.2795e-02},
+                                      {2.2224e-01, 1.7480e-02, 1.1984e+01, 1.8265e+00, -1.6718e-02}};
 
   const double kplus_hadscale[8][5] = {
-    //based on LogNormal of Had Energy 
-    { -1.1629e+02,  1.1506e+02,  4.8753e-01, -4.4057e+00,  1.0940e+00 },
-    {  2.2018e+00,  1.1327e+00, -6.4208e-01,  1.2240e-01, -7.2109e-02 },
-    {  1.5217e+00,  1.9949e+00, -4.0047e-01,  1.0897e+00,  1.4482e-01 },
-    { -1.2902e+01,  1.5504e+01,  1.1257e-01, -8.4732e+00, -3.0451e-01 },
-    //LogNormal of Had Energy for mip-like response
-    {  3.4887e-01,  1.9201e-01,  8.5205e-01,  3.8457e+00,  8.5097e-01 },
-    {  5.1252e-01,  7.7619e-01, -1.3001e-01, -4.1296e+00,  3.8339e-02 },
-    //correction of response if ssp is between Ecal and Hcal
-    {  1.8736e-01,  1.7391e-01,  1.0991e+00,  3.3557e+00,  0.0000e+00 },
-    {  8.2313e-01,  1.3027e+00,  2.5263e-01,  2.8203e+00, -2.8548e-01 }
-  };
-
-  const double kplus_correl_hadem[5] = 
-    { -6.9227e-01,  1.8762e-01, -7.1395e-01,  7.1711e-01, -7.3016e-03 };
-
-  //kaon-plus longitudinal parameters
-
-  const double kplus_par[8*NPar][5] = {
-    {  3.8772e-01,  7.5923e-02,  2.3857e+00,  2.8135e+00,  7.0675e-02 },  //Mean Ecal ShowerType1
-    {  1.4815e+00,  9.8518e-01,  3.4748e-01,  3.3609e+00, -1.2142e-01 },
-    { -7.4688e-01,  7.4632e-01,  3.7387e-01,  3.1767e+00, -1.2898e-01 },
-    {  6.4780e-01,  3.3263e-01,  1.6380e+00,  2.8163e+00,  7.5372e-02 },
-    {  4.8648e+00,  4.4851e+00,  2.5096e-01,  3.1485e+00, -9.4875e-01 },
-
-    {  1.6983e+00,  1.3064e+00,  2.8039e-01,  4.3610e+00, -2.8089e-01 },  //Mean Hcal ShowerType1
-    {  1.4443e+00, -5.0550e-01,  1.0680e+00,  5.6710e-01, -1.5739e-02 },
-    { -5.3822e-01,  1.0584e+00, -6.4612e-01,  3.5104e-01, -1.1463e-01 },
-    {  2.3248e+00, -2.2851e+00,  3.6709e-01,  1.3197e-01,  1.2563e-01 },
-    {  2.1837e+00, -2.2043e+00,  4.6015e-01,  9.2583e-01, -7.4904e-03 },
-
-    {  3.3203e+00,  5.0310e+00,  1.6001e-01,  3.9441e+00, -7.1274e-01 },  //Mean Hcal ShowerType2
-    {  1.1513e+00, -1.8085e-01,  3.3413e+00,  7.0993e-01, -6.3645e-02 },
-    {  1.3898e+01,  1.5638e+01, -4.1890e-01, -3.9674e+00, -1.1401e-01 },
-    {  2.0012e+01,  1.9866e+01, -2.9212e-01, -5.0006e+00,  1.1974e-01 },
-    {  2.4295e+00, -2.2834e+00,  4.8288e-01,  2.9977e-01, -3.0573e-02 },
-
-    {  3.8408e-01,  6.1344e-02,  1.0667e+00,  3.0242e+00,  5.0278e-02 },  //Mean Hcal ShowerType3
-    {  1.8964e+00,  5.1610e+00, -8.8169e-02, -1.9272e+00,  3.1513e-01 },
-    {  1.4200e+01,  1.6127e+01, -2.8959e-01, -6.1679e+00, -7.4159e-02 },
-    {  2.7497e+01,  2.7062e+01, -3.3540e-01, -5.5799e+00,  1.0200e-01 },
-    {  2.3118e+01, -2.3752e+01,  2.6134e-01, -5.2177e+00,  9.7844e-02 }, 
-
-    { -3.5273e-02,  2.6492e-01, -2.7154e-01,  4.1599e+00,  3.7807e-02 },  //Sigma Ecal ShowerType1
-    {  5.4462e-01,  4.9507e-02, -1.8513e+01,  2.9250e+00, -3.6791e-02 },
-    {  3.7860e-01,  1.8549e-02, -2.9438e+00,  2.4898e+00, -2.2790e-02 },
-    {  6.6597e-01,  6.5499e-02, -2.1924e+01,  2.9525e+00, -4.7980e-02 },
-    {  1.0753e+00,  9.2583e-01, -1.4431e-01, -5.0882e+00,  2.9234e-03 },
-
-    {  2.6008e-01,  6.1267e-02, -1.7484e+00,  1.6088e+00, -1.7668e-02 },  //Sigma Hcal ShowerType1
-    {  8.6750e-01,  8.7283e-02,  2.5881e+00,  2.5618e+00, -8.5318e-02 },
-    {  1.0368e+00,  2.5737e-01, -1.3413e+00,  8.7206e-01, -7.0973e-02 },
-    {  1.2517e+00,  6.4973e-01, -7.3033e-01,  1.4095e+00, -5.3997e-02 },
-    {  1.9193e+00,  1.9482e+00, -3.0639e-01,  6.6016e-02,  2.9074e-02 },
-
-    {  2.7361e-01,  5.8267e-02, -1.5294e+00,  1.0185e+00, -2.2741e-02 },  //Sigma Hcal ShowerType2
-    {  5.3653e-01,  1.0764e-01, -6.6807e-01,  4.7074e+00, -3.4054e-03 },
-    {  5.8520e+01,  5.8162e+01, -2.3280e-01, -1.1136e+01,  0.0000e+00 },
-    {  1.2192e+00,  6.9207e-01, -6.8090e-01,  8.9059e-01, -3.8146e-02 },
-    {  3.2972e+00,  2.9315e+00, -3.4433e-01, -1.6434e+00, -2.8242e-02 },
-
-    {  1.4349e+00,  1.4443e+00, -1.2105e-01, -9.0252e+00,  2.3150e-03 },  //Sigma Hcal ShowerType3
-    {  4.9465e-01,  1.8568e-01, -9.3747e-01,  3.2665e+00,  2.3940e-02 },
-    {  2.3407e+00, -3.8601e+00,  2.9374e-02, -1.4549e+01,  1.4344e-02 },
-    {  4.8451e+00,  4.6687e+00, -2.7170e-01, -3.7684e+00,  1.8616e-02 },
-    {  5.0127e+00,  5.0025e+00, -2.3093e-01, -4.0513e+00,  2.3821e-02 }
-  };
-
-  const double kplus_rho[8*NPar][5] = {
-    {  3.8772e-01,  7.5923e-02,  2.3857e+00,  2.8135e+00,  7.0675e-02 },  //Ecal ShowerType1
-    {  1.4815e+00,  9.8518e-01,  3.4748e-01,  3.3609e+00, -1.2142e-01 },
-    { -7.4688e-01,  7.4632e-01,  3.7387e-01,  3.1767e+00, -1.2898e-01 },
-    {  6.4780e-01,  3.3263e-01,  1.6380e+00,  2.8163e+00,  7.5372e-02 },
-    {  4.8648e+00,  4.4851e+00,  2.5096e-01,  3.1485e+00, -9.4875e-01 },
-    { -3.5273e-02,  2.6492e-01, -2.7154e-01,  4.1599e+00,  3.7807e-02 },
-    {  5.4462e-01,  4.9507e-02, -1.8513e+01,  2.9250e+00, -3.6791e-02 },
-    {  3.7860e-01,  1.8549e-02, -2.9438e+00,  2.4898e+00, -2.2790e-02 },
-    {  6.6597e-01,  6.5499e-02, -2.1924e+01,  2.9525e+00, -4.7980e-02 },
-    {  1.0753e+00,  9.2583e-01, -1.4431e-01, -5.0882e+00,  2.9234e-03 },
-
-    {  1.6983e+00,  1.3064e+00,  2.8039e-01,  4.3610e+00, -2.8089e-01 },  //Hcal ShowerType1
-    {  1.4443e+00, -5.0550e-01,  1.0680e+00,  5.6710e-01, -1.5739e-02 },
-    { -5.3822e-01,  1.0584e+00, -6.4612e-01,  3.5104e-01, -1.1463e-01 },
-    {  2.3248e+00, -2.2851e+00,  3.6709e-01,  1.3197e-01,  1.2563e-01 },
-    {  2.1837e+00, -2.2043e+00,  4.6015e-01,  9.2583e-01, -7.4904e-03 },
-    {  2.6008e-01,  6.1267e-02, -1.7484e+00,  1.6088e+00, -1.7668e-02 },
-    {  8.6750e-01,  8.7283e-02,  2.5881e+00,  2.5618e+00, -8.5318e-02 },
-    {  1.0368e+00,  2.5737e-01, -1.3413e+00,  8.7206e-01, -7.0973e-02 },
-    {  1.2517e+00,  6.4973e-01, -7.3033e-01,  1.4095e+00, -5.3997e-02 },
-    {  1.9193e+00,  1.9482e+00, -3.0639e-01,  6.6016e-02,  2.9074e-02 },
-
-    {  2.4423e-01,  2.2650e-01,  1.3877e+00,  1.8939e+00, -7.5389e-02 },  //Hcal ShowerType2
-    {  4.6760e-01,  2.6361e-01,  1.4374e+00,  1.6434e+00, -9.9844e-02 },
-    {  7.4796e-01, -4.4661e-02,  1.7292e+01,  7.0879e-01,  2.4763e-03 },
-    { -6.4806e+00,  6.4231e+00,  1.0400e+00, -2.2650e+00,  4.7778e-02 },
-    {  3.4440e-01,  1.1933e-01,  2.1685e+00,  1.3074e+00,  1.5225e-02 },
-    { -1.1990e+00,  1.8273e+00, -2.2560e-01,  4.3776e+00,  3.3393e-01 },
-    { -1.3851e+00,  1.7655e+00, -2.6978e-01,  3.6071e+00,  4.2187e-01 },
-    {  2.8248e-01,  4.8579e-02,  1.0095e+00,  3.5771e+00,  1.1249e-02 },
-    { -4.8075e+00,  5.5604e+00,  5.3060e-01, -3.1000e+00, -4.5298e-02 },
-    {  7.2139e-01, -1.2988e-01,  1.3460e+00,  1.7526e+00,  8.9762e-03 },
-
-    {  4.7434e-02,  3.1872e+00,  1.6477e-01,  3.0236e-01, -4.2486e-01 },  //Hcal ShowerType3
-    {  9.4033e-02,  5.7792e-01,  6.8058e-01,  2.1194e-01, -8.2046e-02 },
-    {  7.4700e-01,  2.0561e-02,  4.2268e+01,  1.6399e+00, -1.1949e-02 },
-    {  5.2255e-02,  4.6034e-02, -1.7110e+00,  1.8247e+00,  0.0000e+00 },
-    { -1.0684e+02,  1.0739e+02,  5.0000e-01, -6.3340e+00, -2.6291e-02 },
-    {  2.0912e-01,  1.3043e-01, -4.9417e+00,  2.9813e+00,  0.0000e+00 },
-    { -1.8831e+00,  3.4253e+00, -1.8757e-01,  3.5963e+00,  5.6274e-01 },
-    {  1.4591e-03,  1.6858e+00,  1.2556e-01, -7.6405e-01, -1.1943e-01 },
-    { -6.2423e+00,  7.1383e+00,  3.8814e-01, -4.3872e+00, -9.4735e-02 },
-    {  7.2200e-01, -1.1568e-01,  1.3604e+00,  1.3338e+00,  1.6450e-02 }
-  };
-
-  //kaon-plus lateral parameters
-
-  const double kplus_rpar[4*Nrpar][5] = {
-    {  2.0917e+00,  1.2528e+00, -6.9494e-01,  1.7600e+00,  0.0000e+00 },  //Ecal for showerType = 1
-    {  7.8866e+00,  6.3777e-01, -4.3657e+00,  2.0492e+00, -1.0208e+00 },
-    {  7.3150e-01,  1.6104e-01, -8.4279e+00,  2.0670e+00, -3.3696e-03 },
-    { -2.4312e-01,  1.8371e-01,  1.5265e+01,  2.0458e+00, -1.6358e-02 },
-
-    {  2.0008e+01,  2.1622e+00, -3.4949e+00,  1.9954e+00, -2.0569e+00 },  //Hcal for showerType = 1
-    { -4.1668e-02,  5.4366e-01, -1.3780e+01,  7.0957e-01, -1.1259e-02 },
-    {  5.0855e-01,  1.0979e-01,  1.2233e+00,  1.4132e+00, -4.5390e-02 },
-    { -5.9436e-02, -1.0396e-01,  3.7419e-01,  1.9661e+00,  3.6075e-02 },
-
-    {  1.2970e+01,  2.5925e+00, -1.5404e+00,  1.6391e+00, -1.3978e+00 },  //Hcal for showerType = 2
-    {  1.9183e-01,  1.3373e+00, -1.1090e+00, -7.6909e+00,  6.3587e-02 },
-    {  4.3892e-01,  7.0247e-02, -1.8419e+01,  2.9160e+00,  1.2592e-02 },
-    {  6.2448e-02,  6.3318e-02,  6.1143e-01,  2.4479e+00, -2.4459e-02 },
-
-    {  2.0954e+00,  4.0916e-01, -6.9750e+01,  1.9870e+00, -5.3104e-02 },  //Hcal for showerType = 3
-    {  6.4162e+00,  1.8264e+00, -9.6305e-01,  1.5012e+00, -7.5696e-01 },
-    {  4.3430e+00,  1.3126e+01, -2.5342e-02, -1.0939e+01,  2.1736e-01 },
-    { -5.0784e+01,  5.0870e+01,  2.0000e-01, -1.3669e+01, -1.2081e-02 }
-  };
-
-  //HcalOuter parameters
-  const double  ho_nonzero[5] = 
-    {4.79943e-01,4.61158e-01,7.09011e-01,4.86440e+00,0.0000e+00};   
-}
+      // based on LogNormal of Had Energy
+      {-1.1629e+02, 1.1506e+02, 4.8753e-01, -4.4057e+00, 1.0940e+00},
+      {2.2018e+00, 1.1327e+00, -6.4208e-01, 1.2240e-01, -7.2109e-02},
+      {1.5217e+00, 1.9949e+00, -4.0047e-01, 1.0897e+00, 1.4482e-01},
+      {-1.2902e+01, 1.5504e+01, 1.1257e-01, -8.4732e+00, -3.0451e-01},
+      // LogNormal of Had Energy for mip-like response
+      {3.4887e-01, 1.9201e-01, 8.5205e-01, 3.8457e+00, 8.5097e-01},
+      {5.1252e-01, 7.7619e-01, -1.3001e-01, -4.1296e+00, 3.8339e-02},
+      // correction of response if ssp is between Ecal and Hcal
+      {1.8736e-01, 1.7391e-01, 1.0991e+00, 3.3557e+00, 0.0000e+00},
+      {8.2313e-01, 1.3027e+00, 2.5263e-01, 2.8203e+00, -2.8548e-01}};
+
+  const double kplus_correl_hadem[5] = {-6.9227e-01, 1.8762e-01, -7.1395e-01, 7.1711e-01, -7.3016e-03};
+
+  // kaon-plus longitudinal parameters
+
+  const double kplus_par[8 * NPar][5] = {
+      {3.8772e-01, 7.5923e-02, 2.3857e+00, 2.8135e+00, 7.0675e-02},  // Mean Ecal ShowerType1
+      {1.4815e+00, 9.8518e-01, 3.4748e-01, 3.3609e+00, -1.2142e-01},
+      {-7.4688e-01, 7.4632e-01, 3.7387e-01, 3.1767e+00, -1.2898e-01},
+      {6.4780e-01, 3.3263e-01, 1.6380e+00, 2.8163e+00, 7.5372e-02},
+      {4.8648e+00, 4.4851e+00, 2.5096e-01, 3.1485e+00, -9.4875e-01},
+
+      {1.6983e+00, 1.3064e+00, 2.8039e-01, 4.3610e+00, -2.8089e-01},  // Mean Hcal ShowerType1
+      {1.4443e+00, -5.0550e-01, 1.0680e+00, 5.6710e-01, -1.5739e-02},
+      {-5.3822e-01, 1.0584e+00, -6.4612e-01, 3.5104e-01, -1.1463e-01},
+      {2.3248e+00, -2.2851e+00, 3.6709e-01, 1.3197e-01, 1.2563e-01},
+      {2.1837e+00, -2.2043e+00, 4.6015e-01, 9.2583e-01, -7.4904e-03},
+
+      {3.3203e+00, 5.0310e+00, 1.6001e-01, 3.9441e+00, -7.1274e-01},  // Mean Hcal ShowerType2
+      {1.1513e+00, -1.8085e-01, 3.3413e+00, 7.0993e-01, -6.3645e-02},
+      {1.3898e+01, 1.5638e+01, -4.1890e-01, -3.9674e+00, -1.1401e-01},
+      {2.0012e+01, 1.9866e+01, -2.9212e-01, -5.0006e+00, 1.1974e-01},
+      {2.4295e+00, -2.2834e+00, 4.8288e-01, 2.9977e-01, -3.0573e-02},
+
+      {3.8408e-01, 6.1344e-02, 1.0667e+00, 3.0242e+00, 5.0278e-02},  // Mean Hcal ShowerType3
+      {1.8964e+00, 5.1610e+00, -8.8169e-02, -1.9272e+00, 3.1513e-01},
+      {1.4200e+01, 1.6127e+01, -2.8959e-01, -6.1679e+00, -7.4159e-02},
+      {2.7497e+01, 2.7062e+01, -3.3540e-01, -5.5799e+00, 1.0200e-01},
+      {2.3118e+01, -2.3752e+01, 2.6134e-01, -5.2177e+00, 9.7844e-02},
+
+      {-3.5273e-02, 2.6492e-01, -2.7154e-01, 4.1599e+00, 3.7807e-02},  // Sigma Ecal ShowerType1
+      {5.4462e-01, 4.9507e-02, -1.8513e+01, 2.9250e+00, -3.6791e-02},
+      {3.7860e-01, 1.8549e-02, -2.9438e+00, 2.4898e+00, -2.2790e-02},
+      {6.6597e-01, 6.5499e-02, -2.1924e+01, 2.9525e+00, -4.7980e-02},
+      {1.0753e+00, 9.2583e-01, -1.4431e-01, -5.0882e+00, 2.9234e-03},
+
+      {2.6008e-01, 6.1267e-02, -1.7484e+00, 1.6088e+00, -1.7668e-02},  // Sigma Hcal ShowerType1
+      {8.6750e-01, 8.7283e-02, 2.5881e+00, 2.5618e+00, -8.5318e-02},
+      {1.0368e+00, 2.5737e-01, -1.3413e+00, 8.7206e-01, -7.0973e-02},
+      {1.2517e+00, 6.4973e-01, -7.3033e-01, 1.4095e+00, -5.3997e-02},
+      {1.9193e+00, 1.9482e+00, -3.0639e-01, 6.6016e-02, 2.9074e-02},
+
+      {2.7361e-01, 5.8267e-02, -1.5294e+00, 1.0185e+00, -2.2741e-02},  // Sigma Hcal ShowerType2
+      {5.3653e-01, 1.0764e-01, -6.6807e-01, 4.7074e+00, -3.4054e-03},
+      {5.8520e+01, 5.8162e+01, -2.3280e-01, -1.1136e+01, 0.0000e+00},
+      {1.2192e+00, 6.9207e-01, -6.8090e-01, 8.9059e-01, -3.8146e-02},
+      {3.2972e+00, 2.9315e+00, -3.4433e-01, -1.6434e+00, -2.8242e-02},
+
+      {1.4349e+00, 1.4443e+00, -1.2105e-01, -9.0252e+00, 2.3150e-03},  // Sigma Hcal ShowerType3
+      {4.9465e-01, 1.8568e-01, -9.3747e-01, 3.2665e+00, 2.3940e-02},
+      {2.3407e+00, -3.8601e+00, 2.9374e-02, -1.4549e+01, 1.4344e-02},
+      {4.8451e+00, 4.6687e+00, -2.7170e-01, -3.7684e+00, 1.8616e-02},
+      {5.0127e+00, 5.0025e+00, -2.3093e-01, -4.0513e+00, 2.3821e-02}};
+
+  const double kplus_rho[8 * NPar][5] = {
+      {3.8772e-01, 7.5923e-02, 2.3857e+00, 2.8135e+00, 7.0675e-02},  // Ecal ShowerType1
+      {1.4815e+00, 9.8518e-01, 3.4748e-01, 3.3609e+00, -1.2142e-01},
+      {-7.4688e-01, 7.4632e-01, 3.7387e-01, 3.1767e+00, -1.2898e-01},
+      {6.4780e-01, 3.3263e-01, 1.6380e+00, 2.8163e+00, 7.5372e-02},
+      {4.8648e+00, 4.4851e+00, 2.5096e-01, 3.1485e+00, -9.4875e-01},
+      {-3.5273e-02, 2.6492e-01, -2.7154e-01, 4.1599e+00, 3.7807e-02},
+      {5.4462e-01, 4.9507e-02, -1.8513e+01, 2.9250e+00, -3.6791e-02},
+      {3.7860e-01, 1.8549e-02, -2.9438e+00, 2.4898e+00, -2.2790e-02},
+      {6.6597e-01, 6.5499e-02, -2.1924e+01, 2.9525e+00, -4.7980e-02},
+      {1.0753e+00, 9.2583e-01, -1.4431e-01, -5.0882e+00, 2.9234e-03},
+
+      {1.6983e+00, 1.3064e+00, 2.8039e-01, 4.3610e+00, -2.8089e-01},  // Hcal ShowerType1
+      {1.4443e+00, -5.0550e-01, 1.0680e+00, 5.6710e-01, -1.5739e-02},
+      {-5.3822e-01, 1.0584e+00, -6.4612e-01, 3.5104e-01, -1.1463e-01},
+      {2.3248e+00, -2.2851e+00, 3.6709e-01, 1.3197e-01, 1.2563e-01},
+      {2.1837e+00, -2.2043e+00, 4.6015e-01, 9.2583e-01, -7.4904e-03},
+      {2.6008e-01, 6.1267e-02, -1.7484e+00, 1.6088e+00, -1.7668e-02},
+      {8.6750e-01, 8.7283e-02, 2.5881e+00, 2.5618e+00, -8.5318e-02},
+      {1.0368e+00, 2.5737e-01, -1.3413e+00, 8.7206e-01, -7.0973e-02},
+      {1.2517e+00, 6.4973e-01, -7.3033e-01, 1.4095e+00, -5.3997e-02},
+      {1.9193e+00, 1.9482e+00, -3.0639e-01, 6.6016e-02, 2.9074e-02},
+
+      {2.4423e-01, 2.2650e-01, 1.3877e+00, 1.8939e+00, -7.5389e-02},  // Hcal ShowerType2
+      {4.6760e-01, 2.6361e-01, 1.4374e+00, 1.6434e+00, -9.9844e-02},
+      {7.4796e-01, -4.4661e-02, 1.7292e+01, 7.0879e-01, 2.4763e-03},
+      {-6.4806e+00, 6.4231e+00, 1.0400e+00, -2.2650e+00, 4.7778e-02},
+      {3.4440e-01, 1.1933e-01, 2.1685e+00, 1.3074e+00, 1.5225e-02},
+      {-1.1990e+00, 1.8273e+00, -2.2560e-01, 4.3776e+00, 3.3393e-01},
+      {-1.3851e+00, 1.7655e+00, -2.6978e-01, 3.6071e+00, 4.2187e-01},
+      {2.8248e-01, 4.8579e-02, 1.0095e+00, 3.5771e+00, 1.1249e-02},
+      {-4.8075e+00, 5.5604e+00, 5.3060e-01, -3.1000e+00, -4.5298e-02},
+      {7.2139e-01, -1.2988e-01, 1.3460e+00, 1.7526e+00, 8.9762e-03},
+
+      {4.7434e-02, 3.1872e+00, 1.6477e-01, 3.0236e-01, -4.2486e-01},  // Hcal ShowerType3
+      {9.4033e-02, 5.7792e-01, 6.8058e-01, 2.1194e-01, -8.2046e-02},
+      {7.4700e-01, 2.0561e-02, 4.2268e+01, 1.6399e+00, -1.1949e-02},
+      {5.2255e-02, 4.6034e-02, -1.7110e+00, 1.8247e+00, 0.0000e+00},
+      {-1.0684e+02, 1.0739e+02, 5.0000e-01, -6.3340e+00, -2.6291e-02},
+      {2.0912e-01, 1.3043e-01, -4.9417e+00, 2.9813e+00, 0.0000e+00},
+      {-1.8831e+00, 3.4253e+00, -1.8757e-01, 3.5963e+00, 5.6274e-01},
+      {1.4591e-03, 1.6858e+00, 1.2556e-01, -7.6405e-01, -1.1943e-01},
+      {-6.2423e+00, 7.1383e+00, 3.8814e-01, -4.3872e+00, -9.4735e-02},
+      {7.2200e-01, -1.1568e-01, 1.3604e+00, 1.3338e+00, 1.6450e-02}};
+
+  // kaon-plus lateral parameters
+
+  const double kplus_rpar[4 * Nrpar][5] = {
+      {2.0917e+00, 1.2528e+00, -6.9494e-01, 1.7600e+00, 0.0000e+00},  // Ecal for showerType = 1
+      {7.8866e+00, 6.3777e-01, -4.3657e+00, 2.0492e+00, -1.0208e+00},
+      {7.3150e-01, 1.6104e-01, -8.4279e+00, 2.0670e+00, -3.3696e-03},
+      {-2.4312e-01, 1.8371e-01, 1.5265e+01, 2.0458e+00, -1.6358e-02},
+
+      {2.0008e+01, 2.1622e+00, -3.4949e+00, 1.9954e+00, -2.0569e+00},  // Hcal for showerType = 1
+      {-4.1668e-02, 5.4366e-01, -1.3780e+01, 7.0957e-01, -1.1259e-02},
+      {5.0855e-01, 1.0979e-01, 1.2233e+00, 1.4132e+00, -4.5390e-02},
+      {-5.9436e-02, -1.0396e-01, 3.7419e-01, 1.9661e+00, 3.6075e-02},
+
+      {1.2970e+01, 2.5925e+00, -1.5404e+00, 1.6391e+00, -1.3978e+00},  // Hcal for showerType = 2
+      {1.9183e-01, 1.3373e+00, -1.1090e+00, -7.6909e+00, 6.3587e-02},
+      {4.3892e-01, 7.0247e-02, -1.8419e+01, 2.9160e+00, 1.2592e-02},
+      {6.2448e-02, 6.3318e-02, 6.1143e-01, 2.4479e+00, -2.4459e-02},
+
+      {2.0954e+00, 4.0916e-01, -6.9750e+01, 1.9870e+00, -5.3104e-02},  // Hcal for showerType = 3
+      {6.4162e+00, 1.8264e+00, -9.6305e-01, 1.5012e+00, -7.5696e-01},
+      {4.3430e+00, 1.3126e+01, -2.5342e-02, -1.0939e+01, 2.1736e-01},
+      {-5.0784e+01, 5.0870e+01, 2.0000e-01, -1.3669e+01, -1.2081e-02}};
+
+  // HcalOuter parameters
+  const double ho_nonzero[5] = {4.79943e-01, 4.61158e-01, 7.09011e-01, 4.86440e+00, 0.0000e+00};
+}  // namespace Gflash
 
 #endif
diff --git a/SimGeneral/GFlash/interface/GflashPiKShowerProfile.h b/SimGeneral/GFlash/interface/GflashPiKShowerProfile.h
index 1484b59b234bf..877bedb10c33b 100644
--- a/SimGeneral/GFlash/interface/GflashPiKShowerProfile.h
+++ b/SimGeneral/GFlash/interface/GflashPiKShowerProfile.h
@@ -1,23 +1,17 @@
 #ifndef GflashPiKShowerProfile_H
-#define GflashPiKShowerProfile_H 
+#define GflashPiKShowerProfile_H
 
 #include "SimGeneral/GFlash/interface/GflashHadronShowerProfile.h"
 
-class GflashPiKShowerProfile : public GflashHadronShowerProfile
-{
+class GflashPiKShowerProfile : public GflashHadronShowerProfile {
 public:
   //-------------------------
   // Constructor, destructor
   //-------------------------
-  GflashPiKShowerProfile (const edm::ParameterSet& parSet) : 
-    GflashHadronShowerProfile (parSet) {}; 
-  ~GflashPiKShowerProfile () override {};
+  GflashPiKShowerProfile(const edm::ParameterSet &parSet) : GflashHadronShowerProfile(parSet){};
+  ~GflashPiKShowerProfile() override{};
 
   void loadParameters() override;
 };
 
 #endif
-
-
-
-
diff --git a/SimGeneral/GFlash/interface/GflashProtonShowerProfile.h b/SimGeneral/GFlash/interface/GflashProtonShowerProfile.h
index ec17908faa3e3..65e20d0177ebb 100644
--- a/SimGeneral/GFlash/interface/GflashProtonShowerProfile.h
+++ b/SimGeneral/GFlash/interface/GflashProtonShowerProfile.h
@@ -1,24 +1,17 @@
 #ifndef GflashProtonShowerProfile_H
-#define GflashProtonShowerProfile_H 
+#define GflashProtonShowerProfile_H
 
 #include "SimGeneral/GFlash/interface/GflashHadronShowerProfile.h"
 
-class GflashProtonShowerProfile : public GflashHadronShowerProfile
-{
+class GflashProtonShowerProfile : public GflashHadronShowerProfile {
 public:
   //-------------------------
   // Constructor, destructor
   //-------------------------
-  GflashProtonShowerProfile (const edm::ParameterSet& parSet) : 
-    GflashHadronShowerProfile (parSet) {}; 
-  ~GflashProtonShowerProfile () override {};
+  GflashProtonShowerProfile(const edm::ParameterSet &parSet) : GflashHadronShowerProfile(parSet){};
+  ~GflashProtonShowerProfile() override{};
 
   void loadParameters() override;
-
 };
 
 #endif
-
-
-
-
diff --git a/SimGeneral/GFlash/interface/GflashShowino.h b/SimGeneral/GFlash/interface/GflashShowino.h
index dddbe737e9745..24f5e393ae12c 100644
--- a/SimGeneral/GFlash/interface/GflashShowino.h
+++ b/SimGeneral/GFlash/interface/GflashShowino.h
@@ -6,7 +6,6 @@
 #include "SimGeneral/GFlash/interface/GflashTrajectory.h"
 
 class GflashShowino {
-
 public:
   //-------------------------
   // Constructor, destructor
@@ -14,9 +13,13 @@ class GflashShowino {
   GflashShowino();
   ~GflashShowino();
 
-  void initialize(int showerType, double energy, double globalTime,double charge, 
-		  Gflash3Vector &position,Gflash3Vector &momentum,
-		  double magneticField);
+  void initialize(int showerType,
+                  double energy,
+                  double globalTime,
+                  double charge,
+                  Gflash3Vector &position,
+                  Gflash3Vector &momentum,
+                  double magneticField);
 
   void updateShowino(double deltaStep);
 
@@ -24,31 +27,30 @@ class GflashShowino {
   double getEnergy() { return theEnergy; }
   double getPathLengthOnEcal() { return thePathLengthOnEcal; }
   double getPathLengthAtShower() { return thePathLengthAtShower; }
-  Gflash3Vector& getPositionAtShower() { return thePositionAtShower; }
+  Gflash3Vector &getPositionAtShower() { return thePositionAtShower; }
   double getStepLengthToHcal() { return theStepLengthToHcal; }
   double getStepLengthToOut() { return theStepLengthToOut; }
-  GflashTrajectory* getHelix() { return theHelix; }
+  GflashTrajectory *getHelix() { return theHelix; }
 
   double getGlobalTime() { return theGlobalTime; }
   double getPathLength() { return thePathLength; }
-  Gflash3Vector& getPosition() { return thePosition; }
-  double getEnergyDeposited() { return theEnergyDeposited ; }
-  double getDepth() { return (thePathLength-thePathLengthAtShower); }
+  Gflash3Vector &getPosition() { return thePosition; }
+  double getEnergyDeposited() { return theEnergyDeposited; }
+  double getDepth() { return (thePathLength - thePathLengthAtShower); }
 
   void setGlobalTime(double globalTime) { theGlobalTime = globalTime; }
   void setPathLength(double pathLength) { thePathLength = pathLength; }
-  void setPosition(const Gflash3Vector& position) { thePosition = position; }
-  void addEnergyDeposited(double energy ) { theEnergyDeposited += energy; }
+  void setPosition(const Gflash3Vector &position) { thePosition = position; }
+  void addEnergyDeposited(double energy) { theEnergyDeposited += energy; }
 
 private:
-  Gflash3Vector& simulateFirstInteractionPoint(int showType, Gflash3Vector& pos);
-  int convertShowerType(int fastSimShowerType, const Gflash3Vector& pos);
+  Gflash3Vector &simulateFirstInteractionPoint(int showType, Gflash3Vector &pos);
+  int convertShowerType(int fastSimShowerType, const Gflash3Vector &pos);
   void evaluateLengths();
 
 private:
-
-  //fixed at the shower starting point
-  int theShowerType ; 
+  // fixed at the shower starting point
+  int theShowerType;
   double theEnergy;
   Gflash3Vector thePositionAtShower;
   double thePathLengthAtShower;
@@ -56,16 +58,14 @@ class GflashShowino {
   double theStepLengthToHcal;
   double theStepLengthToOut;
 
-  //updated along the showino trajectory line
+  // updated along the showino trajectory line
   double thePathLength;
   double theGlobalTime;
   Gflash3Vector thePosition;
   double theEnergyDeposited;
 
-  GflashTrajectory* theHelix;
+  GflashTrajectory *theHelix;
   GflashTrajectoryPoint theTrajectoryPoint;
 };
 
 #endif
-
-
diff --git a/SimGeneral/GFlash/interface/GflashTrajectory.h b/SimGeneral/GFlash/interface/GflashTrajectory.h
index 5e930746f7d4f..1f20b0163900d 100644
--- a/SimGeneral/GFlash/interface/GflashTrajectory.h
+++ b/SimGeneral/GFlash/interface/GflashTrajectory.h
@@ -3,14 +3,12 @@
 
 #include "SimGeneral/GFlash/interface/GflashTrajectoryPoint.h"
 
-class GflashTrajectory 
-{
+class GflashTrajectory {
 public:
-
   GflashTrajectory();
   ~GflashTrajectory();
 
-  void initializeTrajectory(const HepGeom::Vector3D<double>  &, const HepGeom::Point3D<double>  &, double q, double Field);
+  void initializeTrajectory(const HepGeom::Vector3D<double> &, const HepGeom::Point3D<double> &, double q, double Field);
 
   void setCotTheta(double cotTheta);
   void setCurvature(double curvature);
@@ -19,10 +17,10 @@ class GflashTrajectory
   void setPhi0(double phi0);
 
   double getCotTheta() const { return _cotTheta; }
-  double getCurvature() const  { return _curvature; }
+  double getCurvature() const { return _curvature; }
   double getZ0() const { return _z0; };
   double getD0() const { return _d0; };
-  double getPhi0() const { return _phi0;};
+  double getPhi0() const { return _phi0; };
 
   // Get sines and cosines of Phi0 and Theta
   double getSinPhi0() const;
@@ -31,26 +29,25 @@ class GflashTrajectory
   double getCosTheta() const;
 
   // Get Position as a function of (three-dimensional) path length
-  HepGeom::Point3D<double>  getPosition(double s = 0.0) const;
+  HepGeom::Point3D<double> getPosition(double s = 0.0) const;
 
   // Get Direction as a function of (three-dimensional) path length
-  HepGeom::Vector3D<double>  getDirection(double s = 0.0) const;
+  HepGeom::Vector3D<double> getDirection(double s = 0.0) const;
 
-  void getGflashTrajectoryPoint(GflashTrajectoryPoint& point, double s) const;
-  double getPathLengthAtRhoEquals(double rho) const; 
-  double getPathLengthAtZ(double z) const; 
+  void getGflashTrajectoryPoint(GflashTrajectoryPoint &point, double s) const;
+  double getPathLengthAtRhoEquals(double rho) const;
+  double getPathLengthAtZ(double z) const;
 
   double getZAtR(double r) const;
   double getL2DAtR(double r) const;
 
-  //needed whenever _sinPhi0, _cosPh0, _sinTheta, or _cosTheta is used.
+  // needed whenever _sinPhi0, _cosPh0, _sinTheta, or _cosTheta is used.
   void _refreshCache() const;
 
   // neede whenever _ss or _cc are used.
   void _cacheSinesAndCosines(double s) const;
 
 private:
-
   // This is the GflashTrajectory:
   double _cotTheta;
   double _curvature;
@@ -59,7 +56,7 @@ class GflashTrajectory
   double _phi0;
 
   // This is the cache
-  mutable bool   _isStale;
+  mutable bool _isStale;
   mutable double _sinPhi0;
   mutable double _cosPhi0;
   mutable double _sinTheta;
@@ -69,9 +66,6 @@ class GflashTrajectory
   mutable double _aa;
   mutable double _ss;
   mutable double _cc;
-
 };
 
 #endif
-
-
diff --git a/SimGeneral/GFlash/interface/GflashTrajectoryPoint.h b/SimGeneral/GFlash/interface/GflashTrajectoryPoint.h
index f0a91c3e18d7c..559fb965225ee 100644
--- a/SimGeneral/GFlash/interface/GflashTrajectoryPoint.h
+++ b/SimGeneral/GFlash/interface/GflashTrajectoryPoint.h
@@ -6,27 +6,25 @@
 #include "SimGeneral/GFlash/interface/Gflash3Vector.h"
 
 class GflashTrajectoryPoint {
-
 public:
   //-------------------------
   // Constructor, destructor
   //-------------------------
   GflashTrajectoryPoint();
 
-  GflashTrajectoryPoint(Gflash3Vector& position, Gflash3Vector& momentum, 
-			double pathLength);
+  GflashTrajectoryPoint(Gflash3Vector &position, Gflash3Vector &momentum, double pathLength);
 
   ~GflashTrajectoryPoint();
 
   double getPathLength() { return thePathLength; }
-  Gflash3Vector& getPosition() { return thePosition; }
-  Gflash3Vector& getMomentum() { return theMomentum; }
-  Gflash3Vector  getOrthogonalUnitVector() { return theMomentum.orthogonal().unit(); }
-  Gflash3Vector  getCrossUnitVector() { return theMomentum.cross(getOrthogonalUnitVector()).unit(); }
+  Gflash3Vector &getPosition() { return thePosition; }
+  Gflash3Vector &getMomentum() { return theMomentum; }
+  Gflash3Vector getOrthogonalUnitVector() { return theMomentum.orthogonal().unit(); }
+  Gflash3Vector getCrossUnitVector() { return theMomentum.cross(getOrthogonalUnitVector()).unit(); }
 
-  void setPosition(const Gflash3Vector& position ) { thePosition = position; }
-  void setMomentum(const Gflash3Vector& momentum ) { theMomentum = momentum; }
-  void setPathLength(double pathLength ) { thePathLength = pathLength; }
+  void setPosition(const Gflash3Vector &position) { thePosition = position; }
+  void setMomentum(const Gflash3Vector &momentum) { theMomentum = momentum; }
+  void setPathLength(double pathLength) { thePathLength = pathLength; }
 
 private:
   Gflash3Vector thePosition;
@@ -35,5 +33,3 @@ class GflashTrajectoryPoint {
 };
 
 #endif
-
-
diff --git a/SimGeneral/GFlash/src/GflashAntiProtonShowerProfile.cc b/SimGeneral/GFlash/src/GflashAntiProtonShowerProfile.cc
index 8703af7cd492b..a94024abe2ac0 100644
--- a/SimGeneral/GFlash/src/GflashAntiProtonShowerProfile.cc
+++ b/SimGeneral/GFlash/src/GflashAntiProtonShowerProfile.cc
@@ -1,8 +1,7 @@
 #include "SimGeneral/GFlash/interface/GflashAntiProtonShowerProfile.h"
 #include <CLHEP/Random/RandGaussQ.h>
 
-void GflashAntiProtonShowerProfile::loadParameters()
-{
+void GflashAntiProtonShowerProfile::loadParameters() {
   double einc = theShowino->getEnergy();
   Gflash3Vector position = theShowino->getPositionAtShower();
   int showerType = theShowino->getShowerType();
@@ -10,79 +9,86 @@ void GflashAntiProtonShowerProfile::loadParameters()
   // energy scale
   double energyMeanHcal = 0.0;
   double energySigmaHcal = 0.0;
-  
+
   double r1 = 0.0;
   double r2 = 0.0;
 
-  if(showerType == 0 || showerType == 1 || showerType == 4 || showerType == 5) {
-
+  if (showerType == 0 || showerType == 1 || showerType == 4 || showerType == 5) {
     //@@@ energy dependent energyRho based on tuning with testbeam data
-    double energyRho =  fTanh(einc,Gflash::pbar_correl_hadem); 
+    double energyRho = fTanh(einc, Gflash::pbar_correl_hadem);
 
-    if(showerType == 0 || showerType == 1) {
+    if (showerType == 0 || showerType == 1) {
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-
-	energyScale[Gflash::kESPM] = einc*(fTanh(einc,Gflash::pbar_emscale[0]) + fTanh(einc,Gflash::pbar_emscale[1])*r1);
-
-	//LogNormal mean and sigma of Hcal energy
-	energyMeanHcal  = (fTanh(einc,Gflash::pbar_hadscale[0]) +
-			   fTanh(einc,Gflash::pbar_hadscale[1])*depthScale(position.getRho(),Gflash::RFrontCrystalEB,Gflash::LengthCrystalEB));
-	energySigmaHcal = (fTanh(einc,Gflash::pbar_hadscale[2]) +  
-			   fTanh(einc,Gflash::pbar_hadscale[3])*depthScale(position.getRho(),Gflash::RFrontCrystalEB,Gflash::LengthCrystalEB));
-         
-	r2 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kHB] = exp(energyMeanHcal+energySigmaHcal*(energyRho*r1 + sqrt(1.0- energyRho*energyRho)*r2 ));
-      } while ( energyScale[Gflash::kESPM] < 0 || energyScale[Gflash::kHB] > einc*1.5 ); 
-    }
-    else {
+        r1 = CLHEP::RandGaussQ::shoot();
+
+        energyScale[Gflash::kESPM] =
+            einc * (fTanh(einc, Gflash::pbar_emscale[0]) + fTanh(einc, Gflash::pbar_emscale[1]) * r1);
+
+        // LogNormal mean and sigma of Hcal energy
+        energyMeanHcal = (fTanh(einc, Gflash::pbar_hadscale[0]) +
+                          fTanh(einc, Gflash::pbar_hadscale[1]) *
+                              depthScale(position.getRho(), Gflash::RFrontCrystalEB, Gflash::LengthCrystalEB));
+        energySigmaHcal = (fTanh(einc, Gflash::pbar_hadscale[2]) +
+                           fTanh(einc, Gflash::pbar_hadscale[3]) *
+                               depthScale(position.getRho(), Gflash::RFrontCrystalEB, Gflash::LengthCrystalEB));
+
+        r2 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kHB] =
+            exp(energyMeanHcal + energySigmaHcal * (energyRho * r1 + sqrt(1.0 - energyRho * energyRho) * r2));
+      } while (energyScale[Gflash::kESPM] < 0 || energyScale[Gflash::kHB] > einc * 1.5);
+    } else {
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kENCA] = einc*(fTanh(einc,Gflash::pbar_emscale[0]) + fTanh(einc,Gflash::pbar_emscale[1])*r1);
-	
-	//@@@extend depthScale for HE
-	energyMeanHcal  = (fTanh(einc,Gflash::pbar_hadscale[0]) + 
-			   fTanh(einc,Gflash::pbar_hadscale[1])*depthScale(std::fabs(position.getZ()),Gflash::ZFrontCrystalEE,Gflash::LengthCrystalEE));
-	energySigmaHcal = (fTanh(einc,Gflash::pbar_hadscale[2]) +
-			   fTanh(einc,Gflash::pbar_hadscale[3])*depthScale(std::fabs(position.getZ()),Gflash::ZFrontCrystalEE,Gflash::LengthCrystalEE));
-	r2 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kHE] = exp(energyMeanHcal+energySigmaHcal*(energyRho*r1 + sqrt(1.0- energyRho*energyRho)*r2 ));
-      } while ( energyScale[Gflash::kENCA] < 0 || energyScale[Gflash::kHE] > einc*1.5 ); 
+        r1 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kENCA] =
+            einc * (fTanh(einc, Gflash::pbar_emscale[0]) + fTanh(einc, Gflash::pbar_emscale[1]) * r1);
+
+        //@@@extend depthScale for HE
+        energyMeanHcal = (fTanh(einc, Gflash::pbar_hadscale[0]) +
+                          fTanh(einc, Gflash::pbar_hadscale[1]) *
+                              depthScale(std::fabs(position.getZ()), Gflash::ZFrontCrystalEE, Gflash::LengthCrystalEE));
+        energySigmaHcal =
+            (fTanh(einc, Gflash::pbar_hadscale[2]) +
+             fTanh(einc, Gflash::pbar_hadscale[3]) *
+                 depthScale(std::fabs(position.getZ()), Gflash::ZFrontCrystalEE, Gflash::LengthCrystalEE));
+        r2 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kHE] =
+            exp(energyMeanHcal + energySigmaHcal * (energyRho * r1 + sqrt(1.0 - energyRho * energyRho) * r2));
+      } while (energyScale[Gflash::kENCA] < 0 || energyScale[Gflash::kHE] > einc * 1.5);
     }
-  }
-  else if(showerType == 2 || showerType == 3 || showerType == 6 || showerType == 7) { 
-    //Hcal response for mip-like pions (mip)
-    
-    energyMeanHcal  = fTanh(einc,Gflash::pbar_hadscale[4]);
-    energySigmaHcal = fTanh(einc,Gflash::pbar_hadscale[5]);
+  } else if (showerType == 2 || showerType == 3 || showerType == 6 || showerType == 7) {
+    // Hcal response for mip-like pions (mip)
+
+    energyMeanHcal = fTanh(einc, Gflash::pbar_hadscale[4]);
+    energySigmaHcal = fTanh(einc, Gflash::pbar_hadscale[5]);
 
-    double gap_corr = einc*fTanh(einc,Gflash::pbar_hadscale[6]);
+    double gap_corr = einc * fTanh(einc, Gflash::pbar_hadscale[6]);
 
-    if(showerType == 2 || showerType == 3) {
+    if (showerType == 2 || showerType == 3) {
       energyScale[Gflash::kESPM] = 0.0;
 
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kHB] = exp(energyMeanHcal+energySigmaHcal*r1);
-      } while ( energyScale[Gflash::kHB] > einc*1.5 );
+        r1 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kHB] = exp(energyMeanHcal + energySigmaHcal * r1);
+      } while (energyScale[Gflash::kHB] > einc * 1.5);
 
-      if(showerType == 2) {
-        energyScale[Gflash::kHE] = std::max(0.0,energyScale[Gflash::kHB]
-                                 - gap_corr*depthScale(position.getRho(),Gflash::Rmin[Gflash::kHB],28.));
+      if (showerType == 2) {
+        energyScale[Gflash::kHE] = std::max(
+            0.0, energyScale[Gflash::kHB] - gap_corr * depthScale(position.getRho(), Gflash::Rmin[Gflash::kHB], 28.));
       }
-    }
-    else if(showerType == 6 || showerType == 7 ) {
+    } else if (showerType == 6 || showerType == 7) {
       energyScale[Gflash::kENCA] = 0.0;
 
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-        energyMeanHcal += std::log(1.0-fTanh(einc,Gflash::pbar_hadscale[7]));
-        energyScale[Gflash::kHE] = exp(energyMeanHcal+energySigmaHcal*r1);
-      } while ( energyScale[Gflash::kHE] > einc*1.5 );
-
-      if(showerType == 6) {
-        energyScale[Gflash::kHE] = std::max(0.0,energyScale[Gflash::kHE]
-                                 - gap_corr*depthScale(std::fabs(position.getZ()),Gflash::Zmin[Gflash::kHE],66.));
+        r1 = CLHEP::RandGaussQ::shoot();
+        energyMeanHcal += std::log(1.0 - fTanh(einc, Gflash::pbar_hadscale[7]));
+        energyScale[Gflash::kHE] = exp(energyMeanHcal + energySigmaHcal * r1);
+      } while (energyScale[Gflash::kHE] > einc * 1.5);
+
+      if (showerType == 6) {
+        energyScale[Gflash::kHE] =
+            std::max(0.0,
+                     energyScale[Gflash::kHE] -
+                         gap_corr * depthScale(std::fabs(position.getZ()), Gflash::Zmin[Gflash::kHE], 66.));
       }
     }
   }
@@ -90,76 +96,79 @@ void GflashAntiProtonShowerProfile::loadParameters()
   // parameters for the longitudinal profiles
   //@@@check longitudinal profiles of endcaps for possible variations
 
-  double *rhoHcal = new double [2*Gflash::NPar];
-  double *correlationVectorHcal = new double [Gflash::NPar*(Gflash::NPar+1)/2];
+  double *rhoHcal = new double[2 * Gflash::NPar];
+  double *correlationVectorHcal = new double[Gflash::NPar * (Gflash::NPar + 1) / 2];
 
-  //@@@until we have a separate parameterization for Endcap 
+  //@@@until we have a separate parameterization for Endcap
 
-  if(showerType>3) {
+  if (showerType > 3) {
     showerType -= 4;
   }
-  //no separate parameterization before crystal
-  if(showerType==0) showerType = 1; 
+  // no separate parameterization before crystal
+  if (showerType == 0)
+    showerType = 1;
 
-  //Hcal parameters are always needed regardless of showerType
-  for(int i = 0 ; i < 2*Gflash::NPar ; i++ ) {
-    rhoHcal[i] = fTanh(einc,Gflash::pbar_rho[i + showerType*2*Gflash::NPar]);
+  // Hcal parameters are always needed regardless of showerType
+  for (int i = 0; i < 2 * Gflash::NPar; i++) {
+    rhoHcal[i] = fTanh(einc, Gflash::pbar_rho[i + showerType * 2 * Gflash::NPar]);
   }
 
-  getFluctuationVector(rhoHcal,correlationVectorHcal);
+  getFluctuationVector(rhoHcal, correlationVectorHcal);
 
   double normalZ[Gflash::NPar];
-  for (int i = 0; i < Gflash::NPar ; i++) normalZ[i] = CLHEP::RandGaussQ::shoot();
-  
-  for(int i = 0 ; i < Gflash::NPar ; i++) {
+  for (int i = 0; i < Gflash::NPar; i++)
+    normalZ[i] = CLHEP::RandGaussQ::shoot();
+
+  for (int i = 0; i < Gflash::NPar; i++) {
     double correlationSum = 0.0;
 
-    for(int j = 0 ; j < i+1 ; j++) {
-      correlationSum += correlationVectorHcal[i*(i+1)/2+j]*normalZ[j];
+    for (int j = 0; j < i + 1; j++) {
+      correlationSum += correlationVectorHcal[i * (i + 1) / 2 + j] * normalZ[j];
     }
-    longHcal[i] = fTanh(einc,Gflash::pbar_par[i+showerType*Gflash::NPar]) +
-		  fTanh(einc,Gflash::pbar_par[i+(4+showerType)*Gflash::NPar])*correlationSum;
+    longHcal[i] = fTanh(einc, Gflash::pbar_par[i + showerType * Gflash::NPar]) +
+                  fTanh(einc, Gflash::pbar_par[i + (4 + showerType) * Gflash::NPar]) * correlationSum;
   }
-  delete [] rhoHcal;
-  delete [] correlationVectorHcal;
+  delete[] rhoHcal;
+  delete[] correlationVectorHcal;
 
   // lateral parameters for Hcal
 
-  for (int i = 0 ; i < Gflash::Nrpar ; i++) {
-    lateralPar[Gflash::kHB][i] = fTanh(einc,Gflash::pbar_rpar[i+showerType*Gflash::Nrpar]);
+  for (int i = 0; i < Gflash::Nrpar; i++) {
+    lateralPar[Gflash::kHB][i] = fTanh(einc, Gflash::pbar_rpar[i + showerType * Gflash::Nrpar]);
     lateralPar[Gflash::kHE][i] = lateralPar[Gflash::kHB][i];
   }
 
-  //Ecal parameters are needed if and only if the shower starts inside the crystal
+  // Ecal parameters are needed if and only if the shower starts inside the
+  // crystal
 
-  if(showerType == 1) {
+  if (showerType == 1) {
+    double *rhoEcal = new double[2 * Gflash::NPar];
+    double *correlationVectorEcal = new double[Gflash::NPar * (Gflash::NPar + 1) / 2];
+    for (int i = 0; i < 2 * Gflash::NPar; i++)
+      rhoEcal[i] = fTanh(einc, Gflash::pbar_rho[i]);
 
-    double *rhoEcal = new double [2*Gflash::NPar];
-    double *correlationVectorEcal = new double [Gflash::NPar*(Gflash::NPar+1)/2];
-    for(int i = 0 ; i < 2*Gflash::NPar ; i++ ) rhoEcal[i] = fTanh(einc,Gflash::pbar_rho[i]);
+    getFluctuationVector(rhoEcal, correlationVectorEcal);
 
-    getFluctuationVector(rhoEcal,correlationVectorEcal);
-
-    for(int i = 0 ; i < Gflash::NPar ; i++) normalZ[i] = CLHEP::RandGaussQ::shoot();
-    for(int i = 0 ; i < Gflash::NPar ; i++) {
+    for (int i = 0; i < Gflash::NPar; i++)
+      normalZ[i] = CLHEP::RandGaussQ::shoot();
+    for (int i = 0; i < Gflash::NPar; i++) {
       double correlationSum = 0.0;
 
-      for(int j = 0 ; j < i+1 ; j++) {
-	correlationSum += correlationVectorEcal[i*(i+1)/2+j]*normalZ[j];
+      for (int j = 0; j < i + 1; j++) {
+        correlationSum += correlationVectorEcal[i * (i + 1) / 2 + j] * normalZ[j];
       }
-      longEcal[i] = fTanh(einc,Gflash::pbar_par[i]) +
-   	            0.5*fTanh(einc,Gflash::pbar_par[i+4*Gflash::NPar])*correlationSum;
+      longEcal[i] =
+          fTanh(einc, Gflash::pbar_par[i]) + 0.5 * fTanh(einc, Gflash::pbar_par[i + 4 * Gflash::NPar]) * correlationSum;
     }
 
-    delete [] rhoEcal;
-    delete [] correlationVectorEcal;
+    delete[] rhoEcal;
+    delete[] correlationVectorEcal;
 
     // lateral parameters for Ecal
 
-    for (int i = 0 ; i < Gflash::Nrpar ; i++) {
-      lateralPar[Gflash::kESPM][i] = fTanh(einc,Gflash::pbar_rpar[i]);
+    for (int i = 0; i < Gflash::Nrpar; i++) {
+      lateralPar[Gflash::kESPM][i] = fTanh(einc, Gflash::pbar_rpar[i]);
       lateralPar[Gflash::kENCA][i] = lateralPar[Gflash::kESPM][i];
     }
   }
-
 }
diff --git a/SimGeneral/GFlash/src/GflashEMShowerProfile.cc b/SimGeneral/GFlash/src/GflashEMShowerProfile.cc
index 49ff7a5172714..83acd77f91920 100644
--- a/SimGeneral/GFlash/src/GflashEMShowerProfile.cc
+++ b/SimGeneral/GFlash/src/GflashEMShowerProfile.cc
@@ -4,21 +4,20 @@
 //
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "SimGeneral/GFlash/interface/GflashEMShowerProfile.h"
-#include "SimGeneral/GFlash/interface/GflashTrajectory.h"
-#include "SimGeneral/GFlash/interface/GflashTrajectoryPoint.h"
-#include "SimGeneral/GFlash/interface/GflashHit.h"
 #include "SimGeneral/GFlash/interface/Gflash3Vector.h"
+#include "SimGeneral/GFlash/interface/GflashEMShowerProfile.h"
 #include "SimGeneral/GFlash/interface/GflashHistogram.h"
+#include "SimGeneral/GFlash/interface/GflashHit.h"
 #include "SimGeneral/GFlash/interface/GflashShowino.h"
+#include "SimGeneral/GFlash/interface/GflashTrajectory.h"
+#include "SimGeneral/GFlash/interface/GflashTrajectoryPoint.h"
 
 #include <CLHEP/GenericFunctions/IncompleteGamma.hh>
-#include <CLHEP/Units/PhysicalConstants.h>
-#include <CLHEP/Random/Randomize.h>
 #include <CLHEP/Random/RandGaussQ.h>
+#include <CLHEP/Random/Randomize.h>
+#include <CLHEP/Units/PhysicalConstants.h>
 
-GflashEMShowerProfile::GflashEMShowerProfile(const edm::ParameterSet& parSet) : theParSet(parSet)
-{
+GflashEMShowerProfile::GflashEMShowerProfile(const edm::ParameterSet &parSet) : theParSet(parSet) {
   theBField = parSet.getParameter<double>("bField");
   theEnergyScaleEB = parSet.getParameter<double>("energyScaleEB");
   theEnergyScaleEE = parSet.getParameter<double>("energyScaleEE");
@@ -28,102 +27,101 @@ GflashEMShowerProfile::GflashEMShowerProfile(const edm::ParameterSet& parSet) :
   theShowino = new GflashShowino();
 
   theHisto = GflashHistogram::instance();
-
 }
 
-
-GflashEMShowerProfile::~GflashEMShowerProfile()
-{
-  if(theShowino) delete theShowino;
+GflashEMShowerProfile::~GflashEMShowerProfile() {
+  if (theShowino)
+    delete theShowino;
 }
 
-void GflashEMShowerProfile::initialize(int showerType, double energy, double globalTime, double charge,
-				       Gflash3Vector &position,Gflash3Vector &momentum) 
-{
-  theShowino->initialize(showerType, energy, globalTime, charge,
-                         position, momentum, theBField);
+void GflashEMShowerProfile::initialize(
+    int showerType, double energy, double globalTime, double charge, Gflash3Vector &position, Gflash3Vector &momentum) {
+  theShowino->initialize(showerType, energy, globalTime, charge, position, momentum, theBField);
 }
 
-void GflashEMShowerProfile::parameterization()
-{
+void GflashEMShowerProfile::parameterization() {
   // This part of code is copied from the original GFlash Fortran code.
   // reference : hep-ex/0001020v1
   // The units used in Geant4 internally are in mm, MeV.
   // For simplicity, the units here are in cm, GeV.
 
-  const double energyCutoff     = 0.01; 
-  const int    maxNumberOfSpots = 100000;
+  const double energyCutoff = 0.01;
+  const int maxNumberOfSpots = 100000;
 
-  double incomingEnergy   = theShowino->getEnergy();
+  double incomingEnergy = theShowino->getEnergy();
   Gflash3Vector showerStartingPosition = theShowino->getPositionAtShower();
 
-  //find the calorimeter at the shower starting point
+  // find the calorimeter at the shower starting point
   jCalorimeter = Gflash::getCalorimeterNumber(showerStartingPosition);
 
   double logEinc = std::log(incomingEnergy);
-  double y = incomingEnergy / Gflash::criticalEnergy; // y = E/Ec, criticalEnergy is in GeV
+  double y = incomingEnergy / Gflash::criticalEnergy;  // y = E/Ec, criticalEnergy is in GeV
   double logY = std::log(y);
 
   // Total number of spots are not yet optimized.
-  double nSpots = 93.0 * std::log(Gflash::Z[jCalorimeter]) * std::pow(incomingEnergy,0.876);
+  double nSpots = 93.0 * std::log(Gflash::Z[jCalorimeter]) * std::pow(incomingEnergy, 0.876);
 
-  //path Length from the origin to the shower starting point in cm
+  // path Length from the origin to the shower starting point in cm
   double pathLength0 = theShowino->getPathLengthAtShower();
-  double pathLength = pathLength0; // this will grow along the shower development
+  double pathLength = pathLength0;  // this will grow along the shower development
 
   //--- 2.2  Fix intrinsic properties of em. showers.
 
   double fluctuatedTmax = std::log(logY - 0.7157);
-  double fluctuatedAlpha = std::log(0.7996 +(0.4581 + 1.8628/Gflash::Z[jCalorimeter])*logY);
+  double fluctuatedAlpha = std::log(0.7996 + (0.4581 + 1.8628 / Gflash::Z[jCalorimeter]) * logY);
 
-  double sigmaTmax = 1.0/( -1.4  + 1.26 * logY);
-  double sigmaAlpha = 1.0/( -0.58 + 0.86 * logY);
-  double rho = 0.705  - 0.023 * logY;
-  double sqrtPL = std::sqrt((1.0+rho)/2.0);
-  double sqrtLE = std::sqrt((1.0-rho)/2.0);
+  double sigmaTmax = 1.0 / (-1.4 + 1.26 * logY);
+  double sigmaAlpha = 1.0 / (-0.58 + 0.86 * logY);
+  double rho = 0.705 - 0.023 * logY;
+  double sqrtPL = std::sqrt((1.0 + rho) / 2.0);
+  double sqrtLE = std::sqrt((1.0 - rho) / 2.0);
 
-  double norm1 =  CLHEP::RandGaussQ::shoot();
-  double norm2 =  CLHEP::RandGaussQ::shoot();
-  double tempTmax = fluctuatedTmax + sigmaTmax*(sqrtPL*norm1 + sqrtLE*norm2);
-  double tempAlpha = fluctuatedAlpha + sigmaAlpha*(sqrtPL*norm1 - sqrtLE*norm2);
+  double norm1 = CLHEP::RandGaussQ::shoot();
+  double norm2 = CLHEP::RandGaussQ::shoot();
+  double tempTmax = fluctuatedTmax + sigmaTmax * (sqrtPL * norm1 + sqrtLE * norm2);
+  double tempAlpha = fluctuatedAlpha + sigmaAlpha * (sqrtPL * norm1 - sqrtLE * norm2);
 
   // tmax, alpha, beta : parameters of gamma distribution
   double tmax = std::exp(tempTmax);
   double alpha = std::exp(tempAlpha);
-  double beta = std::max(0.0,(alpha - 1.0)/tmax);
- 
+  double beta = std::max(0.0, (alpha - 1.0) / tmax);
+
   // spot fluctuations are added to tmax, alpha, beta
-  double averageTmax = logY-0.858;
-  double averageAlpha = 0.21+(0.492+2.38/Gflash::Z[jCalorimeter])*logY;
-  double spotTmax  = averageTmax * (0.698 + .00212*Gflash::Z[jCalorimeter]);
-  double spotAlpha = averageAlpha * (0.639 + .00334*Gflash::Z[jCalorimeter]);
-  double spotBeta = std::max(0.0,(spotAlpha-1.0)/spotTmax);
+  double averageTmax = logY - 0.858;
+  double averageAlpha = 0.21 + (0.492 + 2.38 / Gflash::Z[jCalorimeter]) * logY;
+  double spotTmax = averageTmax * (0.698 + .00212 * Gflash::Z[jCalorimeter]);
+  double spotAlpha = averageAlpha * (0.639 + .00334 * Gflash::Z[jCalorimeter]);
+  double spotBeta = std::max(0.0, (spotAlpha - 1.0) / spotTmax);
 
-   if(theHisto->getStoreFlag()) {
+  if (theHisto->getStoreFlag()) {
     theHisto->em_incE->Fill(incomingEnergy);
     theHisto->em_ssp_rho->Fill(showerStartingPosition.rho());
     theHisto->em_ssp_z->Fill(showerStartingPosition.z());
   }
 
   //  parameters for lateral distribution and fluctuation
-  double z1=0.0251+0.00319*logEinc;
-  double z2=0.1162-0.000381*Gflash::Z[jCalorimeter];
-
-  double k1=0.659 - 0.00309 * Gflash::Z[jCalorimeter];
-  double k2=0.645;
-  double k3=-2.59;
-  double k4=0.3585+ 0.0421*logEinc;
-
-  double p1=2.623 -0.00094*Gflash::Z[jCalorimeter];
-  double p2=0.401 +0.00187*Gflash::Z[jCalorimeter];
-  double p3=1.313 -0.0686*logEinc;
-
-  // @@@ dwjang, intial tuning by comparing 20-150GeV TB data : e25Scale = 1.006 for EB with ecalNotContainment = 1.0.
-  // Now e25Scale is a configurable parameter with default ecalNotContainment which is 0.97 for EB and 0.975 for EE.
-  // So if ecalNotContainment constants are to be changed in the future, e25Scale should be changed accordingly.
+  double z1 = 0.0251 + 0.00319 * logEinc;
+  double z2 = 0.1162 - 0.000381 * Gflash::Z[jCalorimeter];
+
+  double k1 = 0.659 - 0.00309 * Gflash::Z[jCalorimeter];
+  double k2 = 0.645;
+  double k3 = -2.59;
+  double k4 = 0.3585 + 0.0421 * logEinc;
+
+  double p1 = 2.623 - 0.00094 * Gflash::Z[jCalorimeter];
+  double p2 = 0.401 + 0.00187 * Gflash::Z[jCalorimeter];
+  double p3 = 1.313 - 0.0686 * logEinc;
+
+  // @@@ dwjang, intial tuning by comparing 20-150GeV TB data : e25Scale = 1.006
+  // for EB with ecalNotContainment = 1.0. Now e25Scale is a configurable
+  // parameter with default ecalNotContainment which is 0.97 for EB and 0.975
+  // for EE. So if ecalNotContainment constants are to be changed in the future,
+  // e25Scale should be changed accordingly.
   double e25Scale = 1.0;
-  if(jCalorimeter == Gflash::kESPM) e25Scale = theEnergyScaleEB;
-  else if(jCalorimeter == Gflash::kENCA) e25Scale = theEnergyScaleEE;
+  if (jCalorimeter == Gflash::kESPM)
+    e25Scale = theEnergyScaleEB;
+  else if (jCalorimeter == Gflash::kENCA)
+    e25Scale = theEnergyScaleEE;
 
   // @@@ dwjang, intial tuning by comparing 20-150GeV TB data : p1 *= 0.965
   p1 *= 0.965;
@@ -131,44 +129,43 @@ void GflashEMShowerProfile::parameterization()
   // preparation of longitudinal integration
   double stepLengthLeft = getDistanceToOut(jCalorimeter);
 
-  int    nSpots_sd = 0; // count total number of spots in SD
-  double zInX0 = 0.0; // shower depth in X0 unit
-  double deltaZInX0 = 0.0; // segment of depth in X0 unit
-  double deltaZ = 0.0; // segment of depth in cm
-  double stepLengthLeftInX0 = 0.0; // step length left in X0 unit
+  int nSpots_sd = 0;                // count total number of spots in SD
+  double zInX0 = 0.0;               // shower depth in X0 unit
+  double deltaZInX0 = 0.0;          // segment of depth in X0 unit
+  double deltaZ = 0.0;              // segment of depth in cm
+  double stepLengthLeftInX0 = 0.0;  // step length left in X0 unit
 
-  const double divisionStepInX0 = 0.1; //step size in X0 unit
-  double energy = incomingEnergy; // energy left in GeV
+  const double divisionStepInX0 = 0.1;  // step size in X0 unit
+  double energy = incomingEnergy;       // energy left in GeV
 
   Genfun::IncompleteGamma gammaDist;
 
-  double energyInGamma = 0.0; // energy in a specific depth(z) according to Gamma distribution
-  double preEnergyInGamma = 0.0; // energy calculated in a previous depth
-  double sigmaInGamma  = 0.; // sigma of energy in a specific depth(z) according to Gamma distribution
-  double preSigmaInGamma = 0.0; // sigma of energy in a previous depth
+  double energyInGamma = 0.0;     // energy in a specific depth(z) according to Gamma distribution
+  double preEnergyInGamma = 0.0;  // energy calculated in a previous depth
+  double sigmaInGamma = 0.;       // sigma of energy in a specific depth(z) according
+                                  // to Gamma distribution
+  double preSigmaInGamma = 0.0;   // sigma of energy in a previous depth
 
-  //energy segment in Gamma distribution of shower in each step  
-  double deltaEnergy =0.0 ; // energy in deltaZ
-  int spotCounter = 0; // keep track of number of spots generated
+  // energy segment in Gamma distribution of shower in each step
+  double deltaEnergy = 0.0;  // energy in deltaZ
+  int spotCounter = 0;       // keep track of number of spots generated
 
-  //step increment along the shower direction
+  // step increment along the shower direction
   double deltaStep = 0.0;
 
   theGflashHitList.clear();
 
   // loop for longitudinal integration
-  while(energy > 0.0 && stepLengthLeft > 0.0) { 
-
+  while (energy > 0.0 && stepLengthLeft > 0.0) {
     stepLengthLeftInX0 = stepLengthLeft / Gflash::radLength[jCalorimeter];
 
-    if ( stepLengthLeftInX0 < divisionStepInX0 ) {
+    if (stepLengthLeftInX0 < divisionStepInX0) {
       deltaZInX0 = stepLengthLeftInX0;
-      deltaZ     = deltaZInX0 * Gflash::radLength[jCalorimeter];
+      deltaZ = deltaZInX0 * Gflash::radLength[jCalorimeter];
       stepLengthLeft = 0.0;
-    }
-    else {
+    } else {
       deltaZInX0 = divisionStepInX0;
-      deltaZ     = deltaZInX0 * Gflash::radLength[jCalorimeter];
+      deltaZ = deltaZInX0 * Gflash::radLength[jCalorimeter];
       stepLengthLeft -= deltaZ;
     }
 
@@ -176,76 +173,79 @@ void GflashEMShowerProfile::parameterization()
 
     int nSpotsInStep = 0;
 
-    if ( energy > energyCutoff  ) {
-      preEnergyInGamma  = energyInGamma;
-      gammaDist.a().setValue(alpha);  //alpha
-      energyInGamma = gammaDist(beta*zInX0); //beta
-      double energyInDeltaZ  = energyInGamma - preEnergyInGamma;
-      deltaEnergy   = std::min(energy,incomingEnergy*energyInDeltaZ);
- 
-      preSigmaInGamma  = sigmaInGamma;
-      gammaDist.a().setValue(spotAlpha);  //alpha spot
-      sigmaInGamma = gammaDist(spotBeta*zInX0); //beta spot
-      nSpotsInStep = std::max(1,int(nSpots * (sigmaInGamma - preSigmaInGamma)));
-    }
-    else {
+    if (energy > energyCutoff) {
+      preEnergyInGamma = energyInGamma;
+      gammaDist.a().setValue(alpha);            // alpha
+      energyInGamma = gammaDist(beta * zInX0);  // beta
+      double energyInDeltaZ = energyInGamma - preEnergyInGamma;
+      deltaEnergy = std::min(energy, incomingEnergy * energyInDeltaZ);
+
+      preSigmaInGamma = sigmaInGamma;
+      gammaDist.a().setValue(spotAlpha);           // alpha spot
+      sigmaInGamma = gammaDist(spotBeta * zInX0);  // beta spot
+      nSpotsInStep = std::max(1, int(nSpots * (sigmaInGamma - preSigmaInGamma)));
+    } else {
       deltaEnergy = energy;
-      preSigmaInGamma  = sigmaInGamma;
-      nSpotsInStep = std::max(1,int(nSpots * (1.0 - preSigmaInGamma)));
+      preSigmaInGamma = sigmaInGamma;
+      nSpotsInStep = std::max(1, int(nSpots * (1.0 - preSigmaInGamma)));
     }
 
-    if ( deltaEnergy > energy || (energy-deltaEnergy) < energyCutoff ) deltaEnergy = energy;
+    if (deltaEnergy > energy || (energy - deltaEnergy) < energyCutoff)
+      deltaEnergy = energy;
 
-    energy  -= deltaEnergy;
+    energy -= deltaEnergy;
 
-    if ( spotCounter+nSpotsInStep > maxNumberOfSpots ) {
+    if (spotCounter + nSpotsInStep > maxNumberOfSpots) {
       nSpotsInStep = maxNumberOfSpots - spotCounter;
-      if ( nSpotsInStep < 1 ) { // @@ check
-	edm::LogInfo("SimGeneralGFlash") << "GflashEMShowerProfile: Too Many Spots ";
+      if (nSpotsInStep < 1) {  // @@ check
+        edm::LogInfo("SimGeneralGFlash") << "GflashEMShowerProfile: Too Many Spots ";
         edm::LogInfo("SimGeneralGFlash") << " - break to regenerate nSpotsInStep ";
         break;
       }
     }
 
     // It begins with 0.5 of deltaZ and then icreases by 1 deltaZ
-    deltaStep  += 0.5*deltaZ;
+    deltaStep += 0.5 * deltaZ;
     pathLength += deltaStep;
-    deltaStep   =  0.5*deltaZ;
+    deltaStep = 0.5 * deltaZ;
 
     // lateral shape and fluctuations for  homogenous calo.
-    double tScale = tmax *alpha/(alpha-1.0) * (std::exp(fluctuatedAlpha)-1.0)/std::exp(fluctuatedAlpha);
-    double tau = std::min(10.0,(zInX0 - 0.5*deltaZInX0)/tScale);
-    double rCore = z1 + z2 * tau; 
-    double rTail = k1 *( std::exp(k3*(tau-k2)) + std::exp(k4*(tau-k2))); // @@ check RT3 sign
-    double p23 = (p2 - tau)/p3;
-    double probabilityWeight = p1 *  std::exp( p23 - std::exp(p23) );
+    double tScale = tmax * alpha / (alpha - 1.0) * (std::exp(fluctuatedAlpha) - 1.0) / std::exp(fluctuatedAlpha);
+    double tau = std::min(10.0, (zInX0 - 0.5 * deltaZInX0) / tScale);
+    double rCore = z1 + z2 * tau;
+    double rTail = k1 * (std::exp(k3 * (tau - k2)) + std::exp(k4 * (tau - k2)));  // @@ check RT3 sign
+    double p23 = (p2 - tau) / p3;
+    double probabilityWeight = p1 * std::exp(p23 - std::exp(p23));
 
     // Deposition of spots according to lateral distr.
     // Apply absolute energy scale
     // Convert into MeV unit
     double hitEnergy = deltaEnergy / nSpotsInStep * e25Scale * CLHEP::GeV;
-    double hitTime = theShowino->getGlobalTime()*CLHEP::nanosecond + (pathLength - pathLength0)/30.0;
+    double hitTime = theShowino->getGlobalTime() * CLHEP::nanosecond + (pathLength - pathLength0) / 30.0;
 
     GflashHit aHit;
 
-    for (int ispot = 0 ;  ispot < nSpotsInStep ; ispot++) {
+    for (int ispot = 0; ispot < nSpotsInStep; ispot++) {
       spotCounter++;
 
-      // Compute global position of generated spots with taking into account magnetic field
-      // Divide deltaZ into nSpotsInStep and give a spot a global position
-      double incrementPath = (deltaZ/nSpotsInStep)*(ispot+0.5 - 0.5*nSpotsInStep);
+      // Compute global position of generated spots with taking into account
+      // magnetic field Divide deltaZ into nSpotsInStep and give a spot a global
+      // position
+      double incrementPath = (deltaZ / nSpotsInStep) * (ispot + 0.5 - 0.5 * nSpotsInStep);
 
-      // trajectoryPoint give a spot an imaginary point along the shower development
+      // trajectoryPoint give a spot an imaginary point along the shower
+      // development
       GflashTrajectoryPoint trajectoryPoint;
-      theShowino->getHelix()->getGflashTrajectoryPoint(trajectoryPoint,pathLength+incrementPath);
+      theShowino->getHelix()->getGflashTrajectoryPoint(trajectoryPoint, pathLength + incrementPath);
 
       double rShower = 0.0;
-      Gflash3Vector hitPosition = locateHitPosition(trajectoryPoint,rCore,rTail,probabilityWeight,rShower);
+      Gflash3Vector hitPosition = locateHitPosition(trajectoryPoint, rCore, rTail, probabilityWeight, rShower);
 
       // Convert into mm unit
       hitPosition *= CLHEP::cm;
 
-      if( std::fabs(hitPosition.getZ()/CLHEP::cm) > Gflash::Zmax[Gflash::kHE]) continue;
+      if (std::fabs(hitPosition.getZ() / CLHEP::cm) > Gflash::Zmax[Gflash::kHE])
+        continue;
 
       // put energy and position to a Hit
       aHit.setTime(hitTime);
@@ -253,69 +253,62 @@ void GflashEMShowerProfile::parameterization()
       aHit.setPosition(hitPosition);
       theGflashHitList.push_back(aHit);
 
-      double zInX0_spot = std::abs(pathLength+incrementPath - pathLength0)/Gflash::radLength[jCalorimeter];
+      double zInX0_spot = std::abs(pathLength + incrementPath - pathLength0) / Gflash::radLength[jCalorimeter];
 
       nSpots_sd++;
 
-      // for histogramming      
-      if(theHisto->getStoreFlag()) {
-	theHisto->em_long->Fill(zInX0_spot,hitEnergy/CLHEP::GeV);
-	theHisto->em_lateral->Fill(zInX0_spot,rShower/Gflash::rMoliere[jCalorimeter],hitEnergy/CLHEP::GeV);
-	theHisto->em_long_sd->Fill(zInX0_spot,hitEnergy/CLHEP::GeV);
-	theHisto->em_lateral_sd->Fill(zInX0_spot,rShower/Gflash::rMoliere[jCalorimeter],hitEnergy/CLHEP::GeV);
+      // for histogramming
+      if (theHisto->getStoreFlag()) {
+        theHisto->em_long->Fill(zInX0_spot, hitEnergy / CLHEP::GeV);
+        theHisto->em_lateral->Fill(zInX0_spot, rShower / Gflash::rMoliere[jCalorimeter], hitEnergy / CLHEP::GeV);
+        theHisto->em_long_sd->Fill(zInX0_spot, hitEnergy / CLHEP::GeV);
+        theHisto->em_lateral_sd->Fill(zInX0_spot, rShower / Gflash::rMoliere[jCalorimeter], hitEnergy / CLHEP::GeV);
       }
-      
-    } // end of for spot iteration
 
-  } // end of while for longitudinal integration
+    }  // end of for spot iteration
 
-  if(theHisto->getStoreFlag()) {
+  }  // end of while for longitudinal integration
+
+  if (theHisto->getStoreFlag()) {
     theHisto->em_nSpots_sd->Fill(nSpots_sd);
   }
 
   //  delete theGflashNavigator;
-
 }
 
 double GflashEMShowerProfile::getDistanceToOut(Gflash::CalorimeterNumber kCalor) {
-
   double stepLengthLeft = 0.0;
-  if(kCalor == Gflash::kESPM ) {
-    stepLengthLeft = theShowino->getHelix()->getPathLengthAtRhoEquals(Gflash::Rmax[Gflash::kESPM])
-                   - theShowino->getPathLengthAtShower();
-  }
-  else if (kCalor == Gflash::kENCA) {
+  if (kCalor == Gflash::kESPM) {
+    stepLengthLeft = theShowino->getHelix()->getPathLengthAtRhoEquals(Gflash::Rmax[Gflash::kESPM]) -
+                     theShowino->getPathLengthAtShower();
+  } else if (kCalor == Gflash::kENCA) {
     double zsign = (theShowino->getPosition()).getEta() > 0 ? 1.0 : -1.0;
-    stepLengthLeft = theShowino->getHelix()->getPathLengthAtZ(zsign*Gflash::Zmax[Gflash::kENCA])
-                   - theShowino->getPathLengthAtShower();
+    stepLengthLeft = theShowino->getHelix()->getPathLengthAtZ(zsign * Gflash::Zmax[Gflash::kENCA]) -
+                     theShowino->getPathLengthAtShower();
   }
   return stepLengthLeft;
-
 }
 
-Gflash3Vector GflashEMShowerProfile::locateHitPosition(GflashTrajectoryPoint& point, 
-				     double rCore, double rTail, double probability,double &rShower)
-{
+Gflash3Vector GflashEMShowerProfile::locateHitPosition(
+    GflashTrajectoryPoint &point, double rCore, double rTail, double probability, double &rShower) {
   double u1 = CLHEP::HepUniformRand();
   double u2 = CLHEP::HepUniformRand();
   double rInRM = 0.0;
-  
-  if (u1 < probability ) {
-    rInRM = rCore* std::sqrt( u2/(1.0-u2) );
-  }
-  else {
-    rInRM = rTail * std::sqrt( u2/(1.0-u2) );
+
+  if (u1 < probability) {
+    rInRM = rCore * std::sqrt(u2 / (1.0 - u2));
+  } else {
+    rInRM = rTail * std::sqrt(u2 / (1.0 - u2));
   }
-  
-  rShower =  rInRM * Gflash::rMoliere[jCalorimeter];
+
+  rShower = rInRM * Gflash::rMoliere[jCalorimeter];
 
   // Uniform & random rotation of spot along the azimuthal angle
-  double azimuthalAngle = CLHEP::twopi*CLHEP::HepUniformRand();
+  double azimuthalAngle = CLHEP::twopi * CLHEP::HepUniformRand();
 
   // actual spot position by adding a radial vector to a trajectoryPoint
-  Gflash3Vector position = point.getPosition() +
-    rShower*std::cos(azimuthalAngle)*point.getOrthogonalUnitVector() +
-    rShower*std::sin(azimuthalAngle)*point.getCrossUnitVector();
-  
+  Gflash3Vector position = point.getPosition() + rShower * std::cos(azimuthalAngle) * point.getOrthogonalUnitVector() +
+                           rShower * std::sin(azimuthalAngle) * point.getCrossUnitVector();
+
   return position;
 }
diff --git a/SimGeneral/GFlash/src/GflashHadronShowerProfile.cc b/SimGeneral/GFlash/src/GflashHadronShowerProfile.cc
index b26cd551e3a01..91e454cdd8441 100644
--- a/SimGeneral/GFlash/src/GflashHadronShowerProfile.cc
+++ b/SimGeneral/GFlash/src/GflashHadronShowerProfile.cc
@@ -1,21 +1,20 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "SimGeneral/GFlash/interface/GflashHadronShowerProfile.h"
-#include "SimGeneral/GFlash/interface/GflashTrajectoryPoint.h"
 #include "SimGeneral/GFlash/interface/GflashHit.h"
+#include "SimGeneral/GFlash/interface/GflashTrajectoryPoint.h"
 
 #include <CLHEP/GenericFunctions/IncompleteGamma.hh>
 #include <CLHEP/GenericFunctions/LogGamma.hh>
-#include <CLHEP/Units/PhysicalConstants.h>
-#include <CLHEP/Units/SystemOfUnits.h>
-#include <CLHEP/Random/Randomize.h>
 #include <CLHEP/Random/RandGaussQ.h>
 #include <CLHEP/Random/RandPoissonQ.h>
+#include <CLHEP/Random/Randomize.h>
+#include <CLHEP/Units/PhysicalConstants.h>
+#include <CLHEP/Units/SystemOfUnits.h>
 
 #include <cmath>
 
-GflashHadronShowerProfile::GflashHadronShowerProfile(const edm::ParameterSet& parSet) : theParSet(parSet)
-{
+GflashHadronShowerProfile::GflashHadronShowerProfile(const edm::ParameterSet &parSet) : theParSet(parSet) {
   theBField = parSet.getParameter<double>("bField");
   theGflashHcalOuter = parSet.getParameter<bool>("GflashHcalOuter");
 
@@ -23,34 +22,31 @@ GflashHadronShowerProfile::GflashHadronShowerProfile(const edm::ParameterSet& pa
   theHisto = GflashHistogram::instance();
 }
 
-GflashHadronShowerProfile::~GflashHadronShowerProfile() 
-{
-  if(theShowino) delete theShowino;
+GflashHadronShowerProfile::~GflashHadronShowerProfile() {
+  if (theShowino)
+    delete theShowino;
 }
 
-void GflashHadronShowerProfile::initialize(int showerType, double energy, double globalTime,double charge, 
-					   Gflash3Vector &position,Gflash3Vector &momentum) { 
-
-  //initialize GflashShowino for this track
-  theShowino->initialize(showerType, energy, globalTime, charge, 
-			 position, momentum, theBField);
-
+void GflashHadronShowerProfile::initialize(
+    int showerType, double energy, double globalTime, double charge, Gflash3Vector &position, Gflash3Vector &momentum) {
+  // initialize GflashShowino for this track
+  theShowino->initialize(showerType, energy, globalTime, charge, position, momentum, theBField);
 }
 
-void GflashHadronShowerProfile::hadronicParameterization()
-{
-  // The skeleton of this method is based on the fortran code gfshow.F originally written  
-  // by S. Peters and G. Grindhammer (also see NIM A290 (1990) 469-488), but longitudinal
-  // parameterizations of hadron showers are significantly modified for the CMS calorimeter  
+void GflashHadronShowerProfile::hadronicParameterization() {
+  // The skeleton of this method is based on the fortran code gfshow.F
+  // originally written by S. Peters and G. Grindhammer (also see NIM A290
+  // (1990) 469-488), but longitudinal parameterizations of hadron showers are
+  // significantly modified for the CMS calorimeter
 
   // unit convention: energy in [GeV] and length in [cm]
   // intrinsic properties of hadronic showers (lateral shower profile)
-  
+
   // The step size of showino along the helix trajectory in cm unit
   double showerDepthR50 = 0.0;
   bool firstHcalHit = true;
 
-  //initial valuses that will be changed as the shower developes
+  // initial valuses that will be changed as the shower developes
   double stepLengthLeft = theShowino->getStepLengthToOut();
 
   double deltaStep = 0.0;
@@ -62,14 +58,12 @@ void GflashHadronShowerProfile::hadronicParameterization()
 
   GflashHit aHit;
 
-  while(stepLengthLeft > 0.0) {
-
+  while (stepLengthLeft > 0.0) {
     // update shower depth and stepLengthLeft
-    if ( stepLengthLeft < Gflash::divisionStep ) {
+    if (stepLengthLeft < Gflash::divisionStep) {
       deltaStep = stepLengthLeft;
-      stepLengthLeft  = 0.0;
-    }
-    else {
+      stepLengthLeft = 0.0;
+    } else {
       deltaStep = Gflash::divisionStep;
       stepLengthLeft -= deltaStep;
     }
@@ -77,66 +71,71 @@ void GflashHadronShowerProfile::hadronicParameterization()
     showerDepth += deltaStep;
     showerDepthR50 += deltaStep;
 
-    //update GflashShowino
+    // update GflashShowino
     theShowino->updateShowino(deltaStep);
 
-    //evaluate energy in this deltaStep along the longitudinal shower profile
-    double heightProfile = 0.; 
+    // evaluate energy in this deltaStep along the longitudinal shower profile
+    double heightProfile = 0.;
     double deltaEnergy = 0.;
 
     whichCalor = Gflash::getCalorimeterNumber(theShowino->getPosition());
 
-    //skip if Showino is outside envelopes
-    if(whichCalor == Gflash::kNULL ) continue;
+    // skip if Showino is outside envelopes
+    if (whichCalor == Gflash::kNULL)
+      continue;
 
     heightProfile = longitudinalProfile();
 
-    //skip if the delta energy for this step will be very small
-    if(heightProfile < 1.00e-08 ) continue;
+    // skip if the delta energy for this step will be very small
+    if (heightProfile < 1.00e-08)
+      continue;
 
-    //get energy deposition for this step 
-    deltaEnergy =  heightProfile*Gflash::divisionStep*energyScale[whichCalor];    
+    // get energy deposition for this step
+    deltaEnergy = heightProfile * Gflash::divisionStep * energyScale[whichCalor];
     theShowino->addEnergyDeposited(deltaEnergy);
 
-    //apply sampling fluctuation if showino is inside the sampling calorimeter
+    // apply sampling fluctuation if showino is inside the sampling calorimeter
     double hadronicFraction = 1.0;
     double fluctuatedEnergy = deltaEnergy;
 
-    int nSpotsInStep = std::max(1,static_cast<int>(getNumberOfSpots(whichCalor)*(deltaEnergy/energyScale[whichCalor]) ));
-    double sampleSpotEnergy = hadronicFraction*fluctuatedEnergy/nSpotsInStep;
+    int nSpotsInStep =
+        std::max(1, static_cast<int>(getNumberOfSpots(whichCalor) * (deltaEnergy / energyScale[whichCalor])));
+    double sampleSpotEnergy = hadronicFraction * fluctuatedEnergy / nSpotsInStep;
 
     // Lateral shape and fluctuations
 
-    if((whichCalor==Gflash::kHB || whichCalor==Gflash::kHE) && firstHcalHit) {
+    if ((whichCalor == Gflash::kHB || whichCalor == Gflash::kHE) && firstHcalHit) {
       firstHcalHit = false;
-      //reset the showerDepth used in the lateral parameterization inside Hcal
+      // reset the showerDepth used in the lateral parameterization inside Hcal
       showerDepthR50 = Gflash::divisionStep;
     }
 
-    //evaluate the fluctuated median of the lateral distribution, R50
-    double R50 = medianLateralArm(showerDepthR50,whichCalor);
+    // evaluate the fluctuated median of the lateral distribution, R50
+    double R50 = medianLateralArm(showerDepthR50, whichCalor);
 
-    double hitEnergy = sampleSpotEnergy*CLHEP::GeV;
-    double hitTime = theShowino->getGlobalTime()*CLHEP::nanosecond;
+    double hitEnergy = sampleSpotEnergy * CLHEP::GeV;
+    double hitTime = theShowino->getGlobalTime() * CLHEP::nanosecond;
 
     Gflash::CalorimeterNumber hitCalor = Gflash::kNULL;
 
-    for (int ispot = 0 ;  ispot < nSpotsInStep ; ispot++) {
-	
-      // Compute global position of generated spots with taking into account magnetic field
-      // Divide deltaStep into nSpotsInStep and give a spot a global position
-      double incrementPath = theShowino->getPathLength() 
-	+ (deltaStep/nSpotsInStep)*(ispot+0.5 - 0.5*nSpotsInStep);
-	
-      // trajectoryPoint give a spot an imaginary point along the shower development
+    for (int ispot = 0; ispot < nSpotsInStep; ispot++) {
+      // Compute global position of generated spots with taking into account
+      // magnetic field Divide deltaStep into nSpotsInStep and give a spot a
+      // global position
+      double incrementPath =
+          theShowino->getPathLength() + (deltaStep / nSpotsInStep) * (ispot + 0.5 - 0.5 * nSpotsInStep);
+
+      // trajectoryPoint give a spot an imaginary point along the shower
+      // development
       GflashTrajectoryPoint trajectoryPoint;
-      theShowino->getHelix()->getGflashTrajectoryPoint(trajectoryPoint,incrementPath);
-	
-      Gflash3Vector hitPosition = locateHitPosition(trajectoryPoint,R50);   
-	
-      hitCalor = Gflash::getCalorimeterNumber(hitPosition);	  
+      theShowino->getHelix()->getGflashTrajectoryPoint(trajectoryPoint, incrementPath);
+
+      Gflash3Vector hitPosition = locateHitPosition(trajectoryPoint, R50);
 
-      if( hitCalor == Gflash::kNULL) continue;
+      hitCalor = Gflash::getCalorimeterNumber(hitPosition);
+
+      if (hitCalor == Gflash::kNULL)
+        continue;
 
       hitPosition *= CLHEP::cm;
 
@@ -144,167 +143,160 @@ void GflashHadronShowerProfile::hadronicParameterization()
       aHit.setEnergy(hitEnergy);
       aHit.setPosition(hitPosition);
       theGflashHitList.push_back(aHit);
-	
-    } // end of for spot iteration
-  } // end of while for longitudinal integration
-
-  //HO parameterization
-
-  if(theShowino->getEnergy()> Gflash::MinEnergyCutOffForHO &&
-     fabs(theShowino->getPositionAtShower().pseudoRapidity()) < Gflash::EtaMax[Gflash::kHO] && 
-     theGflashHcalOuter) {
-    
-    //non zero ho fraction to simulate based on geant4
-    double nonzeroProb = 0.7*fTanh(theShowino->getEnergy(),Gflash::ho_nonzero);
+
+    }  // end of for spot iteration
+  }    // end of while for longitudinal integration
+
+  // HO parameterization
+
+  if (theShowino->getEnergy() > Gflash::MinEnergyCutOffForHO &&
+      fabs(theShowino->getPositionAtShower().pseudoRapidity()) < Gflash::EtaMax[Gflash::kHO] && theGflashHcalOuter) {
+    // non zero ho fraction to simulate based on geant4
+    double nonzeroProb = 0.7 * fTanh(theShowino->getEnergy(), Gflash::ho_nonzero);
     double r0 = CLHEP::HepUniformRand();
-    double leftoverE =  theShowino->getEnergy() - theShowino->getEnergyDeposited();
+    double leftoverE = theShowino->getEnergy() - theShowino->getEnergyDeposited();
 
-    //@@@ nonzeroProb is not random - need further correlation for non-zero HO energy
+    //@@@ nonzeroProb is not random - need further correlation for non-zero HO
+    // energy
 
-    if( r0 < nonzeroProb && leftoverE > 0.0) {
-            
-      //starting path Length and stepLengthLeft
-      double pathLength = theShowino->getHelix()->getPathLengthAtRhoEquals(Gflash::Rmin[Gflash::kHO]-10);
-      stepLengthLeft = theShowino->getHelix()->getPathLengthAtRhoEquals(Gflash::Rmax[Gflash::kHO]+10) - pathLength;
+    if (r0 < nonzeroProb && leftoverE > 0.0) {
+      // starting path Length and stepLengthLeft
+      double pathLength = theShowino->getHelix()->getPathLengthAtRhoEquals(Gflash::Rmin[Gflash::kHO] - 10);
+      stepLengthLeft = theShowino->getHelix()->getPathLengthAtRhoEquals(Gflash::Rmax[Gflash::kHO] + 10) - pathLength;
       showerDepth = pathLength - theShowino->getPathLengthAtShower();
-      
+
       theShowino->setPathLength(pathLength);
-      
+
       double pathLengthx = theShowino->getHelix()->getPathLengthAtRhoEquals(Gflash::Rmax[Gflash::kHO]);
       double pathLengthy = theShowino->getHelix()->getPathLengthAtRhoEquals(Gflash::Rmax[Gflash::kHB]);
-      
-      while(stepLengthLeft > 0.0) {
-	
-	// update shower depth and stepLengthLeft
-	if ( stepLengthLeft < Gflash::divisionStep ) {
-	  deltaStep = stepLengthLeft;
-	  stepLengthLeft  = 0.0;
-	}
-	else {
-	  deltaStep = Gflash::divisionStep;
-	  stepLengthLeft -= deltaStep;
-	}
-	
-	showerDepth += deltaStep;
-	
-	//update GflashShowino
-	theShowino->updateShowino(deltaStep);
-	
-	//evaluate energy in this deltaStep along the longitudinal shower profile
-	double heightProfile = 0.; 
-	double deltaEnergy = 0.;
-	
-	double hoScale  = leftoverE*(pathLengthx-pathLengthy)/(pathLengthx- theShowino->getPathLengthAtShower());
-	double refDepth = theShowino->getPathLength() 
-	  - theShowino->getHelix()->getPathLengthAtRhoEquals(Gflash::Rmax[Gflash::kHB]);
-	
-	if( refDepth > 0) {
-	  heightProfile = hoProfile(theShowino->getPathLength(),refDepth);
-	  deltaEnergy = heightProfile*Gflash::divisionStep*hoScale;
-	}
-	
-	int nSpotsInStep = std::max(50,static_cast<int>((160.+40* CLHEP::RandGaussQ::shoot())*std::log(theShowino->getEnergy())+50.));
-	
-      	double hoFraction = 1.00;
-	double poissonProb = CLHEP::RandPoissonQ::shoot(1.0);
-	
-	double fluctuatedEnergy = deltaEnergy*poissonProb;
-	double sampleSpotEnergy = hoFraction*fluctuatedEnergy/nSpotsInStep;
-	
-	// Lateral shape and fluctuations
-	
-	//evaluate the fluctuated median of the lateral distribution, R50
-	double R50 = medianLateralArm(showerDepth,Gflash::kHB);
-
-	double hitEnergy = sampleSpotEnergy*CLHEP::GeV;
-	double hitTime = theShowino->getGlobalTime()*CLHEP::nanosecond;
-	
-	for (int ispot = 0 ;  ispot < nSpotsInStep ; ispot++) {
-	  
-	  double incrementPath = theShowino->getPathLength() 
-	    + (deltaStep/nSpotsInStep)*(ispot+0.5 - 0.5*nSpotsInStep);
-	  
-	  // trajectoryPoint give a spot an imaginary point along the shower development
-	  GflashTrajectoryPoint trajectoryPoint;
-	  theShowino->getHelix()->getGflashTrajectoryPoint(trajectoryPoint,incrementPath);
-	  
-	  Gflash3Vector hitPosition = locateHitPosition(trajectoryPoint,R50);   
-	  hitPosition *= CLHEP::cm;
-
-	  if(std::fabs(hitPosition.getZ()/CLHEP::cm) > Gflash::Zmax[Gflash::kHO] ) continue;
-
-	  aHit.setTime(hitTime);
-	  aHit.setEnergy(hitEnergy);
-	  aHit.setPosition(hitPosition);
-	  theGflashHitList.push_back(aHit);
-	  
-	} // end of for HO spot iteration
-      } // end of while for HO longitudinal integration
+
+      while (stepLengthLeft > 0.0) {
+        // update shower depth and stepLengthLeft
+        if (stepLengthLeft < Gflash::divisionStep) {
+          deltaStep = stepLengthLeft;
+          stepLengthLeft = 0.0;
+        } else {
+          deltaStep = Gflash::divisionStep;
+          stepLengthLeft -= deltaStep;
+        }
+
+        showerDepth += deltaStep;
+
+        // update GflashShowino
+        theShowino->updateShowino(deltaStep);
+
+        // evaluate energy in this deltaStep along the longitudinal shower
+        // profile
+        double heightProfile = 0.;
+        double deltaEnergy = 0.;
+
+        double hoScale = leftoverE * (pathLengthx - pathLengthy) / (pathLengthx - theShowino->getPathLengthAtShower());
+        double refDepth =
+            theShowino->getPathLength() - theShowino->getHelix()->getPathLengthAtRhoEquals(Gflash::Rmax[Gflash::kHB]);
+
+        if (refDepth > 0) {
+          heightProfile = hoProfile(theShowino->getPathLength(), refDepth);
+          deltaEnergy = heightProfile * Gflash::divisionStep * hoScale;
+        }
+
+        int nSpotsInStep = std::max(
+            50, static_cast<int>((160. + 40 * CLHEP::RandGaussQ::shoot()) * std::log(theShowino->getEnergy()) + 50.));
+
+        double hoFraction = 1.00;
+        double poissonProb = CLHEP::RandPoissonQ::shoot(1.0);
+
+        double fluctuatedEnergy = deltaEnergy * poissonProb;
+        double sampleSpotEnergy = hoFraction * fluctuatedEnergy / nSpotsInStep;
+
+        // Lateral shape and fluctuations
+
+        // evaluate the fluctuated median of the lateral distribution, R50
+        double R50 = medianLateralArm(showerDepth, Gflash::kHB);
+
+        double hitEnergy = sampleSpotEnergy * CLHEP::GeV;
+        double hitTime = theShowino->getGlobalTime() * CLHEP::nanosecond;
+
+        for (int ispot = 0; ispot < nSpotsInStep; ispot++) {
+          double incrementPath =
+              theShowino->getPathLength() + (deltaStep / nSpotsInStep) * (ispot + 0.5 - 0.5 * nSpotsInStep);
+
+          // trajectoryPoint give a spot an imaginary point along the shower
+          // development
+          GflashTrajectoryPoint trajectoryPoint;
+          theShowino->getHelix()->getGflashTrajectoryPoint(trajectoryPoint, incrementPath);
+
+          Gflash3Vector hitPosition = locateHitPosition(trajectoryPoint, R50);
+          hitPosition *= CLHEP::cm;
+
+          if (std::fabs(hitPosition.getZ() / CLHEP::cm) > Gflash::Zmax[Gflash::kHO])
+            continue;
+
+          aHit.setTime(hitTime);
+          aHit.setEnergy(hitEnergy);
+          aHit.setPosition(hitPosition);
+          theGflashHitList.push_back(aHit);
+
+        }  // end of for HO spot iteration
+      }    // end of while for HO longitudinal integration
     }
   }
 
   //  delete theGflashNavigator;
-
 }
 
-void GflashHadronShowerProfile::loadParameters()
-{
+void GflashHadronShowerProfile::loadParameters() {
   edm::LogInfo("SimGeneralGFlash") << "GflashHadronShowerProfile::loadParameters() "
-				   << "should be implimented for each particle type";
+                                   << "should be implimented for each particle type";
 }
 
-double GflashHadronShowerProfile::medianLateralArm(double showerDepthR50, Gflash::CalorimeterNumber kCalor) 
-{
+double GflashHadronShowerProfile::medianLateralArm(double showerDepthR50, Gflash::CalorimeterNumber kCalor) {
   double lateralArm = 0.0;
-  if(kCalor != Gflash::kNULL) {
-    
-    double showerDepthR50X = std::min(showerDepthR50/22.4, Gflash::maxShowerDepthforR50);
-    double R50          = lateralPar[kCalor][0] + std::max(0.0,lateralPar[kCalor][1]) * showerDepthR50X;
+  if (kCalor != Gflash::kNULL) {
+    double showerDepthR50X = std::min(showerDepthR50 / 22.4, Gflash::maxShowerDepthforR50);
+    double R50 = lateralPar[kCalor][0] + std::max(0.0, lateralPar[kCalor][1]) * showerDepthR50X;
     double varinanceR50 = std::pow((lateralPar[kCalor][2] + lateralPar[kCalor][3] * showerDepthR50X) * R50, 2);
-    
+
     // Simulation of lognormal distribution
-    
-    if(R50>0) {
-      double sigmaSq  = std::log(varinanceR50/(R50*R50)+1.0);
+
+    if (R50 > 0) {
+      double sigmaSq = std::log(varinanceR50 / (R50 * R50) + 1.0);
       double sigmaR50 = std::sqrt(sigmaSq);
-      double meanR50  = std::log(R50) - (sigmaSq/2.);
-      
-      lateralArm = std::exp(meanR50 + sigmaR50* CLHEP::RandGaussQ::shoot());
+      double meanR50 = std::log(R50) - (sigmaSq / 2.);
+
+      lateralArm = std::exp(meanR50 + sigmaR50 * CLHEP::RandGaussQ::shoot());
     }
   }
   return lateralArm;
 }
 
-Gflash3Vector GflashHadronShowerProfile::locateHitPosition(GflashTrajectoryPoint& point, double lateralArm) 
-{
+Gflash3Vector GflashHadronShowerProfile::locateHitPosition(GflashTrajectoryPoint &point, double lateralArm) {
   // Smearing in r according to f(r)= 2.*r*R50**2/(r**2+R50**2)**2
   double rnunif = CLHEP::HepUniformRand();
-  double rxPDF = std::sqrt(rnunif/(1.-rnunif));
-  double rShower = lateralArm*rxPDF;
-  
-  //rShower within maxLateralArmforR50
-  rShower = std::min(Gflash::maxLateralArmforR50,rShower);
+  double rxPDF = std::sqrt(rnunif / (1. - rnunif));
+  double rShower = lateralArm * rxPDF;
+
+  // rShower within maxLateralArmforR50
+  rShower = std::min(Gflash::maxLateralArmforR50, rShower);
 
   // Uniform smearing in phi
-  double azimuthalAngle = CLHEP::twopi*CLHEP::HepUniformRand(); 
+  double azimuthalAngle = CLHEP::twopi * CLHEP::HepUniformRand();
 
   // actual spot position by adding a radial vector to a trajectoryPoint
-  Gflash3Vector position = point.getPosition() +
-    rShower*std::cos(azimuthalAngle)*point.getOrthogonalUnitVector() +
-    rShower*std::sin(azimuthalAngle)*point.getCrossUnitVector();
-  
+  Gflash3Vector position = point.getPosition() + rShower * std::cos(azimuthalAngle) * point.getOrthogonalUnitVector() +
+                           rShower * std::sin(azimuthalAngle) * point.getCrossUnitVector();
+
   //@@@debugging histograms
-  if(theHisto->getStoreFlag()) {
+  if (theHisto->getStoreFlag()) {
     theHisto->rshower->Fill(rShower);
-    theHisto->lateralx->Fill(rShower*std::cos(azimuthalAngle));
-    theHisto->lateraly->Fill(rShower*std::sin(azimuthalAngle));
+    theHisto->lateralx->Fill(rShower * std::cos(azimuthalAngle));
+    theHisto->lateraly->Fill(rShower * std::sin(azimuthalAngle));
   }
   return position;
 }
 
-//double GflashHadronShowerProfile::longitudinalProfile(double showerDepth, double pathLength) {
+// double GflashHadronShowerProfile::longitudinalProfile(double showerDepth,
+// double pathLength) {
 double GflashHadronShowerProfile::longitudinalProfile() {
-
   double heightProfile = 0.0;
 
   Gflash3Vector pos = theShowino->getPosition();
@@ -312,171 +304,167 @@ double GflashHadronShowerProfile::longitudinalProfile() {
   double showerDepth = theShowino->getDepth();
   double transDepth = theShowino->getStepLengthToHcal();
 
-  // Energy in a delta step (dz) = (energy to deposite)*[Gamma(z+dz)-Gamma(z)]*dz
-  // where the incomplete Gamma function gives an intergrate probability of the longitudinal 
-  // shower up to the shower depth (z).
-  // Instead, we use approximated energy; energy in dz = (energy to deposite)*gamma(z)*dz
-  // where gamma is the Gamma-distributed probability function
+  // Energy in a delta step (dz) = (energy to
+  // deposite)*[Gamma(z+dz)-Gamma(z)]*dz where the incomplete Gamma function
+  // gives an intergrate probability of the longitudinal shower up to the shower
+  // depth (z). Instead, we use approximated energy; energy in dz = (energy to
+  // deposite)*gamma(z)*dz where gamma is the Gamma-distributed probability
+  // function
 
   Gflash::CalorimeterNumber whichCalor = Gflash::getCalorimeterNumber(pos);
 
-  if(showerType == 0 || showerType == 4 ) {
+  if (showerType == 0 || showerType == 4) {
     double shiftDepth = theShowino->getPathLengthOnEcal() - theShowino->getPathLengthAtShower();
-    if(shiftDepth > 0 ) {
-      heightProfile = twoGammaProfile(longEcal,showerDepth-shiftDepth,whichCalor);
-    }
-    else  {
+    if (shiftDepth > 0) {
+      heightProfile = twoGammaProfile(longEcal, showerDepth - shiftDepth, whichCalor);
+    } else {
       heightProfile = 0.;
-      //      std::cout << "negative shiftDepth for showerType 0 " << shiftDepth << std::endl;
+      //      std::cout << "negative shiftDepth for showerType 0 " << shiftDepth
+      //      << std::endl;
     }
-  }  
-  else if(showerType == 1 || showerType == 5 ) {
-    if(whichCalor == Gflash::kESPM || whichCalor == Gflash::kENCA ) {
-      heightProfile = twoGammaProfile(longEcal,showerDepth,whichCalor);
-    }
-    else if(whichCalor == Gflash::kHB || whichCalor == Gflash::kHE) {
-      heightProfile = twoGammaProfile(longHcal,showerDepth-transDepth,whichCalor);
-    }
-    else  heightProfile = 0.;
-  }  
-  else if (showerType == 2 || showerType == 6 ) {
-    //two gammas between crystal and Hcal
-    if((showerDepth - transDepth) > 0.0) {
-      heightProfile = twoGammaProfile(longHcal,showerDepth-transDepth,Gflash::kHB);
-    }
-    else heightProfile = 0.;
-  }
-  else if (showerType == 3 || showerType == 7 ) {
-    //two gammas inside Hcal
-    heightProfile = twoGammaProfile(longHcal,showerDepth,Gflash::kHB);
+  } else if (showerType == 1 || showerType == 5) {
+    if (whichCalor == Gflash::kESPM || whichCalor == Gflash::kENCA) {
+      heightProfile = twoGammaProfile(longEcal, showerDepth, whichCalor);
+    } else if (whichCalor == Gflash::kHB || whichCalor == Gflash::kHE) {
+      heightProfile = twoGammaProfile(longHcal, showerDepth - transDepth, whichCalor);
+    } else
+      heightProfile = 0.;
+  } else if (showerType == 2 || showerType == 6) {
+    // two gammas between crystal and Hcal
+    if ((showerDepth - transDepth) > 0.0) {
+      heightProfile = twoGammaProfile(longHcal, showerDepth - transDepth, Gflash::kHB);
+    } else
+      heightProfile = 0.;
+  } else if (showerType == 3 || showerType == 7) {
+    // two gammas inside Hcal
+    heightProfile = twoGammaProfile(longHcal, showerDepth, Gflash::kHB);
   }
 
   return heightProfile;
 }
 
 double GflashHadronShowerProfile::hoProfile(double pathLength, double refDepth) {
-
   double heightProfile = 0;
 
   GflashTrajectoryPoint tempPoint;
-  theShowino->getHelix()->getGflashTrajectoryPoint(tempPoint,pathLength);
+  theShowino->getHelix()->getGflashTrajectoryPoint(tempPoint, pathLength);
 
-  double dint = 1.4*Gflash::intLength[Gflash::kHO]*std::sin(tempPoint.getPosition().getTheta());
-  heightProfile = std::exp(-1.0*refDepth/dint);
+  double dint = 1.4 * Gflash::intLength[Gflash::kHO] * std::sin(tempPoint.getPosition().getTheta());
+  heightProfile = std::exp(-1.0 * refDepth / dint);
 
   return heightProfile;
 }
 
 void GflashHadronShowerProfile::getFluctuationVector(double *lowTriangle, double *correlationVector) {
+  const int dim = Gflash::NPar;
 
-    const int dim = Gflash::NPar;
+  double **xr = new double *[dim];
+  double **xrho = new double *[dim];
 
-    double **xr   = new double *[dim];
-    double **xrho = new double *[dim];
-    
-    for(int j=0;j<dim;j++) {
-      xr[j]   = new double [dim];
-      xrho[j] = new double [dim];
-    }
-    
-    for(int i = 0; i < dim; i++) {
-      for(int j = 0; j < i+1 ; j++) {
-        if(j==i) xrho[i][j] = 1.0;
-	else {
-	  xrho[i][j] = lowTriangle[i*(i-1)/2 + j];
-	  xrho[j][i] = xrho[i][j];
-	}
+  for (int j = 0; j < dim; j++) {
+    xr[j] = new double[dim];
+    xrho[j] = new double[dim];
+  }
+
+  for (int i = 0; i < dim; i++) {
+    for (int j = 0; j < i + 1; j++) {
+      if (j == i)
+        xrho[i][j] = 1.0;
+      else {
+        xrho[i][j] = lowTriangle[i * (i - 1) / 2 + j];
+        xrho[j][i] = xrho[i][j];
       }
     }
+  }
 
-    doCholeskyReduction(xrho,xr,dim);
+  doCholeskyReduction(xrho, xr, dim);
 
-    for(int i = 0 ; i < dim ; i++) {
-      for (int j = 0 ; j < i+1 ; j++){
-	correlationVector[i*(i+1)/2 + j] = xr[i][j];
-      }
+  for (int i = 0; i < dim; i++) {
+    for (int j = 0; j < i + 1; j++) {
+      correlationVector[i * (i + 1) / 2 + j] = xr[i][j];
     }
+  }
 
-    for(int j=0;j<dim;j++) delete [] xr[j];
-    delete [] xr;
-    for(int j=0;j<dim;j++) delete [] xrho[j];
-    delete [] xrho;
+  for (int j = 0; j < dim; j++)
+    delete[] xr[j];
+  delete[] xr;
+  for (int j = 0; j < dim; j++)
+    delete[] xrho[j];
+  delete[] xrho;
 }
 
 void GflashHadronShowerProfile::doCholeskyReduction(double **vv, double **cc, const int ndim) {
-
   double sumCjkSquare;
   double vjjLess;
   double sumCikjk;
 
   cc[0][0] = std::sqrt(vv[0][0]);
 
-  for(int j=1 ; j < ndim ; j++) {
-    cc[j][0] = vv[j][0]/cc[0][0];
+  for (int j = 1; j < ndim; j++) {
+    cc[j][0] = vv[j][0] / cc[0][0];
   }
 
-  for(int j=1 ; j < ndim ; j++) {
-
+  for (int j = 1; j < ndim; j++) {
     sumCjkSquare = 0.0;
-    for (int k=0 ; k < j ; k++) sumCjkSquare += cc[j][k]*cc[j][k];
+    for (int k = 0; k < j; k++)
+      sumCjkSquare += cc[j][k] * cc[j][k];
 
-    vjjLess =  vv[j][j] - sumCjkSquare;
+    vjjLess = vv[j][j] - sumCjkSquare;
 
-    //check for the case that vjjLess is negative
+    // check for the case that vjjLess is negative
     cc[j][j] = std::sqrt(std::fabs(vjjLess));
 
-    for (int i=j+1 ; i < ndim ; i++) {
+    for (int i = j + 1; i < ndim; i++) {
       sumCikjk = 0.;
-      for(int k=0 ; k < j ; k++) sumCikjk += cc[i][k]*cc[j][k];
-      cc[i][j] = (vv[i][j] - sumCikjk)/cc[j][j];
+      for (int k = 0; k < j; k++)
+        sumCikjk += cc[i][k] * cc[j][k];
+      cc[i][j] = (vv[i][j] - sumCikjk) / cc[j][j];
     }
   }
 }
 
 int GflashHadronShowerProfile::getNumberOfSpots(Gflash::CalorimeterNumber kCalor) {
-  //generator number of spots: energy dependent Gamma distribution of Nspots based on Geant4
-  //replacing old parameterization of H1,
-  //int numberOfSpots = std::max( 50, static_cast<int>(80.*std::log(einc)+50.));
+  // generator number of spots: energy dependent Gamma distribution of Nspots
+  // based on Geant4 replacing old parameterization of H1, int numberOfSpots =
+  // std::max( 50, static_cast<int>(80.*std::log(einc)+50.));
 
   double einc = theShowino->getEnergy();
   int showerType = theShowino->getShowerType();
 
   int numberOfSpots = 0;
-  double nmean  = 0.0;
+  double nmean = 0.0;
   double nsigma = 0.0;
 
-  if(showerType == 0 || showerType == 1 || showerType == 4 || showerType == 5 ) {
-    if(kCalor == Gflash::kESPM || kCalor == Gflash::kENCA) {
-      nmean = 10000 + 5000*log(einc);
+  if (showerType == 0 || showerType == 1 || showerType == 4 || showerType == 5) {
+    if (kCalor == Gflash::kESPM || kCalor == Gflash::kENCA) {
+      nmean = 10000 + 5000 * log(einc);
       nsigma = 1000;
     }
-    if(kCalor == Gflash::kHB || kCalor == Gflash::kHE) {
-      nmean =  5000 + 2500*log(einc);
-      nsigma =  500;
-    }
-  }
-  else if (showerType == 2 || showerType == 3 || showerType == 6 || showerType == 7 ) {
-    if(kCalor == Gflash::kHB || kCalor == Gflash::kHE) {
-      nmean =  5000 + 2500*log(einc);
-      nsigma =  500;
+    if (kCalor == Gflash::kHB || kCalor == Gflash::kHE) {
+      nmean = 5000 + 2500 * log(einc);
+      nsigma = 500;
     }
-    else {
+  } else if (showerType == 2 || showerType == 3 || showerType == 6 || showerType == 7) {
+    if (kCalor == Gflash::kHB || kCalor == Gflash::kHE) {
+      nmean = 5000 + 2500 * log(einc);
+      nsigma = 500;
+    } else {
       nmean = 10000;
       nsigma = 1000;
     }
   }
-  //@@@need correlation and individual fluctuation on alphaNspots and betaNspots here:
-  //evaluating covariance should be straight forward since the distribution is 'one' Gamma
+  //@@@need correlation and individual fluctuation on alphaNspots and betaNspots
+  // here: evaluating covariance should be straight forward since the
+  // distribution is 'one' Gamma
 
-  numberOfSpots = std::max(500,static_cast<int> (nmean+nsigma* CLHEP::RandGaussQ::shoot()));
+  numberOfSpots = std::max(500, static_cast<int>(nmean + nsigma * CLHEP::RandGaussQ::shoot()));
 
-  //until we optimize the reduction scale in the number of Nspots
-      
-  if( kCalor == Gflash::kESPM ||  kCalor == Gflash::kENCA) {
-    numberOfSpots = static_cast<int>(numberOfSpots/100);
-  }
-  else {
-    numberOfSpots = static_cast<int>(numberOfSpots/3.0);
+  // until we optimize the reduction scale in the number of Nspots
+
+  if (kCalor == Gflash::kESPM || kCalor == Gflash::kENCA) {
+    numberOfSpots = static_cast<int>(numberOfSpots / 100);
+  } else {
+    numberOfSpots = static_cast<int>(numberOfSpots / 3.0);
   }
 
   return numberOfSpots;
@@ -484,46 +472,49 @@ int GflashHadronShowerProfile::getNumberOfSpots(Gflash::CalorimeterNumber kCalor
 
 double GflashHadronShowerProfile::fTanh(double einc, const double *par) {
   double func = 0.0;
-  if(einc>0.0) func = par[0]+par[1]*std::tanh(par[2]*(std::log(einc)-par[3])) + par[4]*std::log(einc);
+  if (einc > 0.0)
+    func = par[0] + par[1] * std::tanh(par[2] * (std::log(einc) - par[3])) + par[4] * std::log(einc);
   return func;
 }
 
 double GflashHadronShowerProfile::fLnE1(double einc, const double *par) {
   double func = 0.0;
-  if(einc>0.0) func = par[0]+par[1]*std::log(einc);
+  if (einc > 0.0)
+    func = par[0] + par[1] * std::log(einc);
   return func;
 }
 
 double GflashHadronShowerProfile::depthScale(double ssp, double ssp0, double length) {
   double func = 0.0;
-  if(length>0.0) func = std::pow((ssp-ssp0)/length,2.0);
+  if (length > 0.0)
+    func = std::pow((ssp - ssp0) / length, 2.0);
   return func;
 }
 
 double GflashHadronShowerProfile::gammaProfile(double alpha, double beta, double showerDepth, double lengthUnit) {
   double gamma = 0.0;
   //  if(alpha > 0 && beta > 0 && lengthUnit > 0) {
-  if(showerDepth>0.0) {
+  if (showerDepth > 0.0) {
     Genfun::LogGamma lgam;
-    double x = showerDepth*(beta/lengthUnit);
-    gamma = (beta/lengthUnit)*std::pow(x,alpha-1.0)*std::exp(-x)/std::exp(lgam(alpha));
+    double x = showerDepth * (beta / lengthUnit);
+    gamma = (beta / lengthUnit) * std::pow(x, alpha - 1.0) * std::exp(-x) / std::exp(lgam(alpha));
   }
   return gamma;
 }
- 
+
 double GflashHadronShowerProfile::twoGammaProfile(double *longPar, double depth, Gflash::CalorimeterNumber kIndex) {
   double twoGamma = 0.0;
 
-  longPar[0] = std::min(1.0,longPar[0]);
-  longPar[0] = std::max(0.0,longPar[0]);
+  longPar[0] = std::min(1.0, longPar[0]);
+  longPar[0] = std::max(0.0, longPar[0]);
 
-  if(longPar[3] > 4.0 || longPar[4] > 4.0) {
-    double rfactor = 2.0/std::max(longPar[3],longPar[4]);
-    longPar[3] = rfactor*(longPar[3]+1.0);  
-    longPar[4] *= rfactor;  
+  if (longPar[3] > 4.0 || longPar[4] > 4.0) {
+    double rfactor = 2.0 / std::max(longPar[3], longPar[4]);
+    longPar[3] = rfactor * (longPar[3] + 1.0);
+    longPar[4] *= rfactor;
   }
 
-  twoGamma  = longPar[0]*gammaProfile(exp(longPar[1]),exp(longPar[2]),depth,Gflash::radLength[kIndex])
-         +(1-longPar[0])*gammaProfile(exp(longPar[3]),exp(longPar[4]),depth,Gflash::intLength[kIndex]);
+  twoGamma = longPar[0] * gammaProfile(exp(longPar[1]), exp(longPar[2]), depth, Gflash::radLength[kIndex]) +
+             (1 - longPar[0]) * gammaProfile(exp(longPar[3]), exp(longPar[4]), depth, Gflash::intLength[kIndex]);
   return twoGamma;
 }
diff --git a/SimGeneral/GFlash/src/GflashHistogram.cc b/SimGeneral/GFlash/src/GflashHistogram.cc
index cd4829b420ae0..3a39d19079ef2 100644
--- a/SimGeneral/GFlash/src/GflashHistogram.cc
+++ b/SimGeneral/GFlash/src/GflashHistogram.cc
@@ -1,127 +1,138 @@
 #include "SimGeneral/GFlash/interface/GflashHistogram.h"
 
-GflashHistogram* GflashHistogram::instance_ = nullptr;
+GflashHistogram *GflashHistogram::instance_ = nullptr;
 
-GflashHistogram* GflashHistogram::instance(){
-
-  if(instance_ == nullptr) instance_ = new GflashHistogram();
+GflashHistogram *GflashHistogram::instance() {
+  if (instance_ == nullptr)
+    instance_ = new GflashHistogram();
   return instance_;
-
 }
 
-GflashHistogram::GflashHistogram() :
-  theStoreFlag(false)
-{
-}
+GflashHistogram::GflashHistogram() : theStoreFlag(false) {}
 
-void GflashHistogram::bookHistogram(std::string histFileName) 
-{
-  histFile_ = new TFile(histFileName.c_str(),"RECREATE");
+void GflashHistogram::bookHistogram(std::string histFileName) {
+  histFile_ = new TFile(histFileName.c_str(), "RECREATE");
 
   TH1::AddDirectory(kTRUE);
 
   histFile_->mkdir("GflashEMShowerProfile");
   histFile_->cd("GflashEMShowerProfile");
 
-  em_incE       = new TH1F("em_incE","Incoming energy at Ecal;E (GeV);Number of Events",500,0.0,500.0);
-  em_ssp_rho    = new TH1F("em_ssp_rho","Shower starting position;#rho (cm);Number of Events",100,100.0,200.0);
-  em_ssp_z      = new TH1F("em_ssp_z","Shower starting position;z (cm);Number of Events",800,-400.0,400.0);
-  em_long       = new TH1F("em_long","Longitudinal Profile;Radiation Length;Number of Spots",100,0.0,50.0);
-  em_lateral    = new TH2F("em_lateral","Lateral Profile vs. Shower Depth;Radiation Length;Moliere Radius",100,0.0,50.0,100,0.0,3.0);
-  em_long_sd    = new TH1F("em_long_sd","Longitudinal Profile in Sensitive Detector;Radiation Length;Number of Spots",100,0.0,50.0);
-  em_lateral_sd = new TH2F("em_lateral_sd","Lateral Profile vs. Shower Depth in Sensitive Detector;Radiation Length;Moliere Radius",100,0.0,50.0,100,0.0,3.0);
-  em_nSpots_sd  = new TH1F("em_nSpots_sd","Number of Gflash Spots in Sensitive Detector;Number of Spots;Number of Events",1000,0.0,100000);
+  em_incE = new TH1F("em_incE", "Incoming energy at Ecal;E (GeV);Number of Events", 500, 0.0, 500.0);
+  em_ssp_rho = new TH1F("em_ssp_rho", "Shower starting position;#rho (cm);Number of Events", 100, 100.0, 200.0);
+  em_ssp_z = new TH1F("em_ssp_z", "Shower starting position;z (cm);Number of Events", 800, -400.0, 400.0);
+  em_long = new TH1F("em_long", "Longitudinal Profile;Radiation Length;Number of Spots", 100, 0.0, 50.0);
+  em_lateral = new TH2F(
+      "em_lateral", "Lateral Profile vs. Shower Depth;Radiation Length;Moliere Radius", 100, 0.0, 50.0, 100, 0.0, 3.0);
+  em_long_sd = new TH1F("em_long_sd",
+                        "Longitudinal Profile in Sensitive Detector;Radiation "
+                        "Length;Number of Spots",
+                        100,
+                        0.0,
+                        50.0);
+  em_lateral_sd = new TH2F("em_lateral_sd",
+                           "Lateral Profile vs. Shower Depth in Sensitive "
+                           "Detector;Radiation Length;Moliere Radius",
+                           100,
+                           0.0,
+                           50.0,
+                           100,
+                           0.0,
+                           3.0);
+  em_nSpots_sd = new TH1F("em_nSpots_sd",
+                          "Number of Gflash Spots in Sensitive Detector;Number "
+                          "of Spots;Number of Events",
+                          1000,
+                          0.0,
+                          100000);
 
   histFile_->mkdir("GflashHadronShowerModel");
   histFile_->cd("GflashHadronShowerModel");
 
-  preStepPosition  = new TH1F("preStepPosition","PreStep Position Shower",500,120.0,270.);
-  postStepPosition = new TH1F("postStepPosition","PostStep Position Shower",500,120.0,270.);
-  deltaStep        = new TH1F("deltaStep","Delta Step",200,0.0,100.);
-  kineticEnergy    = new TH1F("kineticEnergy","Kinetic Energy",200,0.0,200.);
-  energyLoss       = new TH1F("energyLoss","Energy Loss",200,0.0,200.);
-  energyRatio      = new TH1F("energyRatio","energyLeading/energyTotal",200,0.0,1.);
+  preStepPosition = new TH1F("preStepPosition", "PreStep Position Shower", 500, 120.0, 270.);
+  postStepPosition = new TH1F("postStepPosition", "PostStep Position Shower", 500, 120.0, 270.);
+  deltaStep = new TH1F("deltaStep", "Delta Step", 200, 0.0, 100.);
+  kineticEnergy = new TH1F("kineticEnergy", "Kinetic Energy", 200, 0.0, 200.);
+  energyLoss = new TH1F("energyLoss", "Energy Loss", 200, 0.0, 200.);
+  energyRatio = new TH1F("energyRatio", "energyLeading/energyTotal", 200, 0.0, 1.);
 
   histFile_->mkdir("GflashHadronShowerProfile");
   histFile_->cd("GflashHadronShowerProfile");
 
-  rshower = new TH1F("rshower","Lateral Lever" ,200,0.,100.);
-  lateralx = new TH1F("lateralx","Lateral-X Distribution" ,200,-100.,100.);
-  lateraly = new TH1F("lateraly","Lateral-Y Distribution" ,200,-100.,100.);
-  gfhlongProfile   = new TH2F("gfhlongProfile","Longitudinal Profile (all hits)",160,0.0,160.,60,125,245);
+  rshower = new TH1F("rshower", "Lateral Lever", 200, 0., 100.);
+  lateralx = new TH1F("lateralx", "Lateral-X Distribution", 200, -100., 100.);
+  lateraly = new TH1F("lateraly", "Lateral-Y Distribution", 200, -100., 100.);
+  gfhlongProfile = new TH2F("gfhlongProfile", "Longitudinal Profile (all hits)", 160, 0.0, 160., 60, 125, 245);
 
   histFile_->mkdir("GflashWatcher");
   histFile_->cd("GflashWatcher");
 
-  g4vertexTrack = new TH1F("g4vertexTrack","Vertex of Track",300,0.0,300.);
-  g4stepCharge  = new TH2F("g4stepCharge","Geant4 Step Charge",300,120.,420,5,-2.5,2.5);
-  g4nSecondary = new TH1F("g4nSecondary","number of Secondaries",100,0.0,100.);
-  g4pidSecondary = new TH1F("g4pidSecondary","PID of Secondaries",3000,-500.0,2500.);
-
-  g4energySecondary = new TH1F("g4energySecondary","Kinetic Energy of Secondaries",300,0.0,15.);
-  g4energyPi0 = new TH1F("g4energyPi0","Kinetic Energy of Pi0",300,0.0,15.);
-  g4energyElectron = new TH1F("g4energyElectron","Kinetic Energy of Electron",300,0.0,15.);
-  g4energyPhoton = new TH1F("g4energyPhoton","Kinetic Energy of Photon",300,0.0,15.);
-
-  g4totalEnergySecPhoton = new TH1F("g4totalEnergySecPhoton","Total Kinetic Energy of Sec Photon",300,0.0,3.);
-  g4totalEnergySecElectron = new TH1F("g4toalEnergySecElectron","Total Kinetic Energy of Sec Electron",300,0.0,3.);
-  g4totalEnergySecPi0 = new TH1F("g4totalEnergySecPi0","Total Kinetic Energy of Sec Pi0",300,0.0,30.);
-
-  g4energyEM = new TH1F("energyEM","EM Energy",600,0.0,150.0);
-  g4energyHad = new TH1F("energyHad","Had Energy",600,0.0,150.0);
-  g4energyTotal = new TH1F("energyTotal","Total Energy",600,0.0,150.0);
-  g4energyEMMip = new TH1F("energyEMMip","EM Energy (MIP)",100,0.0,2.0);
-  g4energyHadMip = new TH1F("energyHadMip","Had Energy (MIP)",600,0.0,150.0);
-  g4energyMip = new TH1F("energyMip","Total Energy (MIP)",600,0.0,150.0);
-  g4energyEMvsHad = new TH2F("energyEMvsHad","EM Energy",600,0.0,150.0,600,0.0,150.0);
-
-  g4energySensitiveEM = new TH1F("energySensitiveEM","Sensitive EM Energy",600,0.0,150.0);
-  g4energySensitiveHad = new TH1F("energySensitiveHad","Sensitive Had Energy",600,0.0,150.0);
-  g4energySensitiveTotal = new TH1F("energySensitiveTotal","Sensitive Total Energy",600,0.0,150.0);
-  g4energyHybridTotal = new TH1F("energyHybridTotal","Hybrid Total Energy",600,0.0,150.0);
-  g4energySensitiveEMMip = new TH1F("energySensitiveEMMip","Sensitive EM Energy (MIP)",100,0.0,2.0);
-  g4energySensitiveEMvsHad = new TH2F("energySensitiveEMvsHad","Sensitive EM Energy vs Had",600,0.0,150.0,600,0.0,150.0);
-
-  g4energyEMProfile = new TH2F("energyEMProfile","EM Energy Profile",600,0.0,150.0,60,125,245);
-  g4energyHadProfile = new TH2F("energyHadProfile","Had Energy Profile",600,0.0,150.0,60,125,245);
-  g4energyTotalProfile = new TH2F("energyTotalProfile","Total Energy Profile",600,0.0,150.0,60,125,245);
-  g4energyHybridProfile = new TH2F("energyHybridProfile","Hybrid Energy Profile",600,0.0,150.0,60,125,245);
-
-  g4ssp = new TH1F("g4ssp","Shower Starting Position",160,120.0,280.);
-  g4energy = new TH1F("g4energy","Energy at Shower Starting Position",600,0.0,150.0);
-  g4energyLoss  = new TH1F("g4energyLoss","Energy Loss",600,0.0,150.);
-  g4momentum = new TH1F("g4momentum","Momentum/GeV at Shower Starting Position",300,0.0,150.0);
-  g4charge = new TH1F("g4charge","Track Charge at Shower Starting Position",10,-5.0,5.0);
-
-  g4rshower    = new TH2F("g4rshower","rshower",200,0.,40,25,125.,250);
-  g4rshowerR1   = new TH2F("g4rshowerR1","rshower vs depth ssp=127-129",200,0.,40,40,0.0,160.);
-  g4rshowerR2   = new TH2F("g4rshowerR2","rshower vs depth ssp=131-133",200,0.,40,40,0.0,160.);
-  g4rshowerR3   = new TH2F("g4rshowerR3","rshower vs depth ssp=173-175",200,0.,40,40,0.0,160.);
-
-  g4lateralXY    = new TH2F("g4lateralXY","Lateral Profile XY",160,-40.,40,25,125.,250);
-  g4lateralRZ    = new TH2F("g4lateralRZ","Lateral Profile RZ",160,-40.,40,25,125.,250);
-  g4spotXY  = new TH2F("g4spotXY","x-y of spots in global coordinate",800,-400.,400.,800,-400.0,400.0);
-  g4spotRZ  = new TH2F("g4spotRZ","r-z of spots in global coordinate",1200,-1500.,1500.,400,.0,400.0);
-  g4spotRZ0  = new TH2F("g4spotRZ0","all r-z of spots in global coordinate",1200,-1500.,1500.,400,.0,400.0);
-
-  g4stepRho         = new TH1F("g4stepRho","rho of Geant4 Step",200,120.,320.);
-  g4trajectoryPhi0  = new TH1F("g4trajectoryPhi0","trajectory Phi0",2000,-5.,5.);
-
-  g4trajectoryXY  = new TH2F("g4trajectoryXY","trajectory x-y",800,-400.0,400.0,800,-400.0,400.0);
-  g4trajectoryRZ  = new TH2F("g4trajectoryRZ","trajectory r-z ",1200,-600.0,600.0,400,0.0,400.0);
-
-  g4longProfile   = new TH2F("g4longProfile","Longitudinal Profile (all hits)",160,0.0,160.,60,125,245);
-  g4longDetector  = new TH2F("g4longDetector","Longitudinal Profile (hits inisde detectors)",160,0.0,160.,60,125,245);
-  g4longSensitive = new TH2F("g4longSensitive","Longitudinal Profile (Sensitive)",160,0.0,160.,60,125,245);
-
+  g4vertexTrack = new TH1F("g4vertexTrack", "Vertex of Track", 300, 0.0, 300.);
+  g4stepCharge = new TH2F("g4stepCharge", "Geant4 Step Charge", 300, 120., 420, 5, -2.5, 2.5);
+  g4nSecondary = new TH1F("g4nSecondary", "number of Secondaries", 100, 0.0, 100.);
+  g4pidSecondary = new TH1F("g4pidSecondary", "PID of Secondaries", 3000, -500.0, 2500.);
+
+  g4energySecondary = new TH1F("g4energySecondary", "Kinetic Energy of Secondaries", 300, 0.0, 15.);
+  g4energyPi0 = new TH1F("g4energyPi0", "Kinetic Energy of Pi0", 300, 0.0, 15.);
+  g4energyElectron = new TH1F("g4energyElectron", "Kinetic Energy of Electron", 300, 0.0, 15.);
+  g4energyPhoton = new TH1F("g4energyPhoton", "Kinetic Energy of Photon", 300, 0.0, 15.);
+
+  g4totalEnergySecPhoton = new TH1F("g4totalEnergySecPhoton", "Total Kinetic Energy of Sec Photon", 300, 0.0, 3.);
+  g4totalEnergySecElectron = new TH1F("g4toalEnergySecElectron", "Total Kinetic Energy of Sec Electron", 300, 0.0, 3.);
+  g4totalEnergySecPi0 = new TH1F("g4totalEnergySecPi0", "Total Kinetic Energy of Sec Pi0", 300, 0.0, 30.);
+
+  g4energyEM = new TH1F("energyEM", "EM Energy", 600, 0.0, 150.0);
+  g4energyHad = new TH1F("energyHad", "Had Energy", 600, 0.0, 150.0);
+  g4energyTotal = new TH1F("energyTotal", "Total Energy", 600, 0.0, 150.0);
+  g4energyEMMip = new TH1F("energyEMMip", "EM Energy (MIP)", 100, 0.0, 2.0);
+  g4energyHadMip = new TH1F("energyHadMip", "Had Energy (MIP)", 600, 0.0, 150.0);
+  g4energyMip = new TH1F("energyMip", "Total Energy (MIP)", 600, 0.0, 150.0);
+  g4energyEMvsHad = new TH2F("energyEMvsHad", "EM Energy", 600, 0.0, 150.0, 600, 0.0, 150.0);
+
+  g4energySensitiveEM = new TH1F("energySensitiveEM", "Sensitive EM Energy", 600, 0.0, 150.0);
+  g4energySensitiveHad = new TH1F("energySensitiveHad", "Sensitive Had Energy", 600, 0.0, 150.0);
+  g4energySensitiveTotal = new TH1F("energySensitiveTotal", "Sensitive Total Energy", 600, 0.0, 150.0);
+  g4energyHybridTotal = new TH1F("energyHybridTotal", "Hybrid Total Energy", 600, 0.0, 150.0);
+  g4energySensitiveEMMip = new TH1F("energySensitiveEMMip", "Sensitive EM Energy (MIP)", 100, 0.0, 2.0);
+  g4energySensitiveEMvsHad =
+      new TH2F("energySensitiveEMvsHad", "Sensitive EM Energy vs Had", 600, 0.0, 150.0, 600, 0.0, 150.0);
+
+  g4energyEMProfile = new TH2F("energyEMProfile", "EM Energy Profile", 600, 0.0, 150.0, 60, 125, 245);
+  g4energyHadProfile = new TH2F("energyHadProfile", "Had Energy Profile", 600, 0.0, 150.0, 60, 125, 245);
+  g4energyTotalProfile = new TH2F("energyTotalProfile", "Total Energy Profile", 600, 0.0, 150.0, 60, 125, 245);
+  g4energyHybridProfile = new TH2F("energyHybridProfile", "Hybrid Energy Profile", 600, 0.0, 150.0, 60, 125, 245);
+
+  g4ssp = new TH1F("g4ssp", "Shower Starting Position", 160, 120.0, 280.);
+  g4energy = new TH1F("g4energy", "Energy at Shower Starting Position", 600, 0.0, 150.0);
+  g4energyLoss = new TH1F("g4energyLoss", "Energy Loss", 600, 0.0, 150.);
+  g4momentum = new TH1F("g4momentum", "Momentum/GeV at Shower Starting Position", 300, 0.0, 150.0);
+  g4charge = new TH1F("g4charge", "Track Charge at Shower Starting Position", 10, -5.0, 5.0);
+
+  g4rshower = new TH2F("g4rshower", "rshower", 200, 0., 40, 25, 125., 250);
+  g4rshowerR1 = new TH2F("g4rshowerR1", "rshower vs depth ssp=127-129", 200, 0., 40, 40, 0.0, 160.);
+  g4rshowerR2 = new TH2F("g4rshowerR2", "rshower vs depth ssp=131-133", 200, 0., 40, 40, 0.0, 160.);
+  g4rshowerR3 = new TH2F("g4rshowerR3", "rshower vs depth ssp=173-175", 200, 0., 40, 40, 0.0, 160.);
+
+  g4lateralXY = new TH2F("g4lateralXY", "Lateral Profile XY", 160, -40., 40, 25, 125., 250);
+  g4lateralRZ = new TH2F("g4lateralRZ", "Lateral Profile RZ", 160, -40., 40, 25, 125., 250);
+  g4spotXY = new TH2F("g4spotXY", "x-y of spots in global coordinate", 800, -400., 400., 800, -400.0, 400.0);
+  g4spotRZ = new TH2F("g4spotRZ", "r-z of spots in global coordinate", 1200, -1500., 1500., 400, .0, 400.0);
+  g4spotRZ0 = new TH2F("g4spotRZ0", "all r-z of spots in global coordinate", 1200, -1500., 1500., 400, .0, 400.0);
+
+  g4stepRho = new TH1F("g4stepRho", "rho of Geant4 Step", 200, 120., 320.);
+  g4trajectoryPhi0 = new TH1F("g4trajectoryPhi0", "trajectory Phi0", 2000, -5., 5.);
+
+  g4trajectoryXY = new TH2F("g4trajectoryXY", "trajectory x-y", 800, -400.0, 400.0, 800, -400.0, 400.0);
+  g4trajectoryRZ = new TH2F("g4trajectoryRZ", "trajectory r-z ", 1200, -600.0, 600.0, 400, 0.0, 400.0);
+
+  g4longProfile = new TH2F("g4longProfile", "Longitudinal Profile (all hits)", 160, 0.0, 160., 60, 125, 245);
+  g4longDetector =
+      new TH2F("g4longDetector", "Longitudinal Profile (hits inisde detectors)", 160, 0.0, 160., 60, 125, 245);
+  g4longSensitive = new TH2F("g4longSensitive", "Longitudinal Profile (Sensitive)", 160, 0.0, 160., 60, 125, 245);
 }
 
-
-GflashHistogram::~GflashHistogram(){
-
+GflashHistogram::~GflashHistogram() {
   histFile_->cd();
   histFile_->Write();
   histFile_->Close();
-
 }
-
diff --git a/SimGeneral/GFlash/src/GflashHit.cc b/SimGeneral/GFlash/src/GflashHit.cc
old mode 100755
new mode 100644
index 61ad018b4660b..56639a3e5140a
--- a/SimGeneral/GFlash/src/GflashHit.cc
+++ b/SimGeneral/GFlash/src/GflashHit.cc
@@ -1,19 +1,11 @@
 #include "SimGeneral/GFlash/interface/GflashHit.h"
 
-GflashHit::GflashHit() :
-  theTime(0),
-  theEnergy(0),
-  thePosition(0)
-{
-}
+GflashHit::GflashHit() : theTime(0), theEnergy(0), thePosition(0) {}
 
-GflashHit::GflashHit(double time, double energy, Gflash3Vector& pos) 
-{
+GflashHit::GflashHit(double time, double energy, Gflash3Vector &pos) {
   theTime = time;
   theEnergy = energy;
   thePosition = pos;
 }
 
-GflashHit::~GflashHit() 
-{
-}
+GflashHit::~GflashHit() {}
diff --git a/SimGeneral/GFlash/src/GflashKaonMinusShowerProfile.cc b/SimGeneral/GFlash/src/GflashKaonMinusShowerProfile.cc
index cc8526c5eeb16..9391f61f91198 100644
--- a/SimGeneral/GFlash/src/GflashKaonMinusShowerProfile.cc
+++ b/SimGeneral/GFlash/src/GflashKaonMinusShowerProfile.cc
@@ -1,8 +1,7 @@
 #include "SimGeneral/GFlash/interface/GflashKaonMinusShowerProfile.h"
 #include <CLHEP/Random/RandGaussQ.h>
 
-void GflashKaonMinusShowerProfile::loadParameters()
-{
+void GflashKaonMinusShowerProfile::loadParameters() {
   double einc = theShowino->getEnergy();
   Gflash3Vector position = theShowino->getPositionAtShower();
   int showerType = theShowino->getShowerType();
@@ -10,80 +9,86 @@ void GflashKaonMinusShowerProfile::loadParameters()
   // energy scale
   double energyMeanHcal = 0.0;
   double energySigmaHcal = 0.0;
-  
+
   double r1 = 0.0;
   double r2 = 0.0;
 
-  if(showerType == 0 || showerType == 1 || showerType == 4 || showerType == 5) {
-
+  if (showerType == 0 || showerType == 1 || showerType == 4 || showerType == 5) {
     //@@@ energy dependent energyRho based on tuning with testbeam data
-    double energyRho =  fTanh(einc,Gflash::kminus_correl_hadem); 
+    double energyRho = fTanh(einc, Gflash::kminus_correl_hadem);
 
-    if(showerType == 0 || showerType == 1) {
+    if (showerType == 0 || showerType == 1) {
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-
-	energyScale[Gflash::kESPM] = einc*(fTanh(einc,Gflash::kminus_emscale[0]) + fTanh(einc,Gflash::kminus_emscale[1])*r1);
-
-	//LogNormal mean and sigma of Hcal energy
-	energyMeanHcal  = (fTanh(einc,Gflash::kminus_hadscale[0]) +
-			   fTanh(einc,Gflash::kminus_hadscale[1])*depthScale(position.getRho(),Gflash::RFrontCrystalEB,Gflash::LengthCrystalEB));
-	energySigmaHcal = (fTanh(einc,Gflash::kminus_hadscale[2]) +  
-			   fTanh(einc,Gflash::kminus_hadscale[3])*depthScale(position.getRho(),Gflash::RFrontCrystalEB,Gflash::LengthCrystalEB));
-         
-	r2 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kHB] = exp(energyMeanHcal+energySigmaHcal*(energyRho*r1 + sqrt(1.0- energyRho*energyRho)*r2 ));
-      } while ( energyScale[Gflash::kESPM] < 0 || energyScale[Gflash::kHB] > einc*1.5 ); 
-    }
-    else {
+        r1 = CLHEP::RandGaussQ::shoot();
+
+        energyScale[Gflash::kESPM] =
+            einc * (fTanh(einc, Gflash::kminus_emscale[0]) + fTanh(einc, Gflash::kminus_emscale[1]) * r1);
+
+        // LogNormal mean and sigma of Hcal energy
+        energyMeanHcal = (fTanh(einc, Gflash::kminus_hadscale[0]) +
+                          fTanh(einc, Gflash::kminus_hadscale[1]) *
+                              depthScale(position.getRho(), Gflash::RFrontCrystalEB, Gflash::LengthCrystalEB));
+        energySigmaHcal = (fTanh(einc, Gflash::kminus_hadscale[2]) +
+                           fTanh(einc, Gflash::kminus_hadscale[3]) *
+                               depthScale(position.getRho(), Gflash::RFrontCrystalEB, Gflash::LengthCrystalEB));
+
+        r2 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kHB] =
+            exp(energyMeanHcal + energySigmaHcal * (energyRho * r1 + sqrt(1.0 - energyRho * energyRho) * r2));
+      } while (energyScale[Gflash::kESPM] < 0 || energyScale[Gflash::kHB] > einc * 1.5);
+    } else {
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kENCA] = einc*(fTanh(einc,Gflash::kminus_emscale[0]) + fTanh(einc,Gflash::kminus_emscale[1])*r1);
-	
-	//@@@extend depthScale for HE
-	energyMeanHcal  = (fTanh(einc,Gflash::kminus_hadscale[0]) + 
-			   fTanh(einc,Gflash::kminus_hadscale[1])*depthScale(std::fabs(position.getZ()),Gflash::ZFrontCrystalEE,Gflash::LengthCrystalEE));
-	energySigmaHcal = (fTanh(einc,Gflash::kminus_hadscale[2]) +
-			   fTanh(einc,Gflash::kminus_hadscale[3])*depthScale(std::fabs(position.getZ()),Gflash::ZFrontCrystalEE,Gflash::LengthCrystalEE));
-	r2 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kHE] = exp(energyMeanHcal+energySigmaHcal*(energyRho*r1 + sqrt(1.0- energyRho*energyRho)*r2 ));
-      } while ( energyScale[Gflash::kENCA] < 0 || energyScale[Gflash::kHE] > einc*1.5 ); 
+        r1 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kENCA] =
+            einc * (fTanh(einc, Gflash::kminus_emscale[0]) + fTanh(einc, Gflash::kminus_emscale[1]) * r1);
+
+        //@@@extend depthScale for HE
+        energyMeanHcal = (fTanh(einc, Gflash::kminus_hadscale[0]) +
+                          fTanh(einc, Gflash::kminus_hadscale[1]) *
+                              depthScale(std::fabs(position.getZ()), Gflash::ZFrontCrystalEE, Gflash::LengthCrystalEE));
+        energySigmaHcal =
+            (fTanh(einc, Gflash::kminus_hadscale[2]) +
+             fTanh(einc, Gflash::kminus_hadscale[3]) *
+                 depthScale(std::fabs(position.getZ()), Gflash::ZFrontCrystalEE, Gflash::LengthCrystalEE));
+        r2 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kHE] =
+            exp(energyMeanHcal + energySigmaHcal * (energyRho * r1 + sqrt(1.0 - energyRho * energyRho) * r2));
+      } while (energyScale[Gflash::kENCA] < 0 || energyScale[Gflash::kHE] > einc * 1.5);
     }
-  }
-  else if(showerType == 2 || showerType == 3 || showerType == 6 || showerType == 7) { 
-    //Hcal response for mip-like pions (mip)
-    
-    energyMeanHcal  = fTanh(einc,Gflash::kminus_hadscale[4]);
-    energySigmaHcal = fTanh(einc,Gflash::kminus_hadscale[5]);
+  } else if (showerType == 2 || showerType == 3 || showerType == 6 || showerType == 7) {
+    // Hcal response for mip-like pions (mip)
+
+    energyMeanHcal = fTanh(einc, Gflash::kminus_hadscale[4]);
+    energySigmaHcal = fTanh(einc, Gflash::kminus_hadscale[5]);
 
-    double gap_corr = einc*fTanh(einc,Gflash::kminus_hadscale[6]);
+    double gap_corr = einc * fTanh(einc, Gflash::kminus_hadscale[6]);
 
-    if(showerType == 2 || showerType == 3) {
+    if (showerType == 2 || showerType == 3) {
       energyScale[Gflash::kESPM] = 0.0;
 
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kHB] = exp(energyMeanHcal+energySigmaHcal*r1);
-      } while ( energyScale[Gflash::kHB] > einc*1.5 );
+        r1 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kHB] = exp(energyMeanHcal + energySigmaHcal * r1);
+      } while (energyScale[Gflash::kHB] > einc * 1.5);
 
-      if(showerType == 2) {
-        energyScale[Gflash::kHE] = std::max(0.0,energyScale[Gflash::kHB]
-                                 - gap_corr*depthScale(position.getRho(),Gflash::Rmin[Gflash::kHB],28.));
+      if (showerType == 2) {
+        energyScale[Gflash::kHE] = std::max(
+            0.0, energyScale[Gflash::kHB] - gap_corr * depthScale(position.getRho(), Gflash::Rmin[Gflash::kHB], 28.));
       }
-    }
-    else if(showerType == 6 || showerType == 7 ) {
+    } else if (showerType == 6 || showerType == 7) {
       energyScale[Gflash::kENCA] = 0.0;
 
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-        energyMeanHcal += std::log(1.0-fTanh(einc,Gflash::kminus_hadscale[7]));
-        energyScale[Gflash::kHE] = exp(energyMeanHcal+energySigmaHcal*r1);
-      } while ( energyScale[Gflash::kHE] > einc*1.5 );
-
-
-      if(showerType == 6) {
-        energyScale[Gflash::kHE] = std::max(0.0,energyScale[Gflash::kHE]
-                                 - gap_corr*depthScale(std::fabs(position.getZ()),Gflash::Zmin[Gflash::kHE],66.));
+        r1 = CLHEP::RandGaussQ::shoot();
+        energyMeanHcal += std::log(1.0 - fTanh(einc, Gflash::kminus_hadscale[7]));
+        energyScale[Gflash::kHE] = exp(energyMeanHcal + energySigmaHcal * r1);
+      } while (energyScale[Gflash::kHE] > einc * 1.5);
+
+      if (showerType == 6) {
+        energyScale[Gflash::kHE] =
+            std::max(0.0,
+                     energyScale[Gflash::kHE] -
+                         gap_corr * depthScale(std::fabs(position.getZ()), Gflash::Zmin[Gflash::kHE], 66.));
       }
     }
   }
@@ -91,76 +96,79 @@ void GflashKaonMinusShowerProfile::loadParameters()
   // parameters for the longitudinal profiles
   //@@@check longitudinal profiles of endcaps for possible variations
 
-  double *rhoHcal = new double [2*Gflash::NPar];
-  double *correlationVectorHcal = new double [Gflash::NPar*(Gflash::NPar+1)/2];
+  double *rhoHcal = new double[2 * Gflash::NPar];
+  double *correlationVectorHcal = new double[Gflash::NPar * (Gflash::NPar + 1) / 2];
 
-  //@@@until we have a separate parameterization for Endcap 
+  //@@@until we have a separate parameterization for Endcap
 
-  if(showerType>3) {
+  if (showerType > 3) {
     showerType -= 4;
   }
-  //no separate parameterization before crystal
-  if(showerType==0) showerType = 1; 
+  // no separate parameterization before crystal
+  if (showerType == 0)
+    showerType = 1;
 
-  //Hcal parameters are always needed regardless of showerType
-  for(int i = 0 ; i < 2*Gflash::NPar ; i++ ) {
-    rhoHcal[i] = fTanh(einc,Gflash::kminus_rho[i + showerType*2*Gflash::NPar]);
+  // Hcal parameters are always needed regardless of showerType
+  for (int i = 0; i < 2 * Gflash::NPar; i++) {
+    rhoHcal[i] = fTanh(einc, Gflash::kminus_rho[i + showerType * 2 * Gflash::NPar]);
   }
 
-  getFluctuationVector(rhoHcal,correlationVectorHcal);
+  getFluctuationVector(rhoHcal, correlationVectorHcal);
 
   double normalZ[Gflash::NPar];
-  for (int i = 0; i < Gflash::NPar ; i++) normalZ[i] = CLHEP::RandGaussQ::shoot();
-  
-  for(int i = 0 ; i < Gflash::NPar ; i++) {
+  for (int i = 0; i < Gflash::NPar; i++)
+    normalZ[i] = CLHEP::RandGaussQ::shoot();
+
+  for (int i = 0; i < Gflash::NPar; i++) {
     double correlationSum = 0.0;
 
-    for(int j = 0 ; j < i+1 ; j++) {
-      correlationSum += correlationVectorHcal[i*(i+1)/2+j]*normalZ[j];
+    for (int j = 0; j < i + 1; j++) {
+      correlationSum += correlationVectorHcal[i * (i + 1) / 2 + j] * normalZ[j];
     }
-    longHcal[i] = fTanh(einc,Gflash::kminus_par[i+showerType*Gflash::NPar]) +
-		  fTanh(einc,Gflash::kminus_par[i+(4+showerType)*Gflash::NPar])*correlationSum;
+    longHcal[i] = fTanh(einc, Gflash::kminus_par[i + showerType * Gflash::NPar]) +
+                  fTanh(einc, Gflash::kminus_par[i + (4 + showerType) * Gflash::NPar]) * correlationSum;
   }
-  delete [] rhoHcal;
-  delete [] correlationVectorHcal;
+  delete[] rhoHcal;
+  delete[] correlationVectorHcal;
 
   // lateral parameters for Hcal
 
-  for (int i = 0 ; i < Gflash::Nrpar ; i++) {
-    lateralPar[Gflash::kHB][i] = fTanh(einc,Gflash::kminus_rpar[i+showerType*Gflash::Nrpar]);
+  for (int i = 0; i < Gflash::Nrpar; i++) {
+    lateralPar[Gflash::kHB][i] = fTanh(einc, Gflash::kminus_rpar[i + showerType * Gflash::Nrpar]);
     lateralPar[Gflash::kHE][i] = lateralPar[Gflash::kHB][i];
   }
 
-  //Ecal parameters are needed if and only if the shower starts inside the crystal
+  // Ecal parameters are needed if and only if the shower starts inside the
+  // crystal
 
-  if(showerType == 1) {
+  if (showerType == 1) {
+    double *rhoEcal = new double[2 * Gflash::NPar];
+    double *correlationVectorEcal = new double[Gflash::NPar * (Gflash::NPar + 1) / 2];
+    for (int i = 0; i < 2 * Gflash::NPar; i++)
+      rhoEcal[i] = fTanh(einc, Gflash::kminus_rho[i]);
 
-    double *rhoEcal = new double [2*Gflash::NPar];
-    double *correlationVectorEcal = new double [Gflash::NPar*(Gflash::NPar+1)/2];
-    for(int i = 0 ; i < 2*Gflash::NPar ; i++ ) rhoEcal[i] = fTanh(einc,Gflash::kminus_rho[i]);
+    getFluctuationVector(rhoEcal, correlationVectorEcal);
 
-    getFluctuationVector(rhoEcal,correlationVectorEcal);
-
-    for(int i = 0 ; i < Gflash::NPar ; i++) normalZ[i] = CLHEP::RandGaussQ::shoot();
-    for(int i = 0 ; i < Gflash::NPar ; i++) {
+    for (int i = 0; i < Gflash::NPar; i++)
+      normalZ[i] = CLHEP::RandGaussQ::shoot();
+    for (int i = 0; i < Gflash::NPar; i++) {
       double correlationSum = 0.0;
 
-      for(int j = 0 ; j < i+1 ; j++) {
-	correlationSum += correlationVectorEcal[i*(i+1)/2+j]*normalZ[j];
+      for (int j = 0; j < i + 1; j++) {
+        correlationSum += correlationVectorEcal[i * (i + 1) / 2 + j] * normalZ[j];
       }
-      longEcal[i] = fTanh(einc,Gflash::kminus_par[i]) +
-   	            0.5*fTanh(einc,Gflash::kminus_par[i+4*Gflash::NPar])*correlationSum;
+      longEcal[i] = fTanh(einc, Gflash::kminus_par[i]) +
+                    0.5 * fTanh(einc, Gflash::kminus_par[i + 4 * Gflash::NPar]) * correlationSum;
     }
 
-    delete [] rhoEcal;
-    delete [] correlationVectorEcal;
+    delete[] rhoEcal;
+    delete[] correlationVectorEcal;
 
     // lateral parameters for Ecal
 
-    for (int i = 0 ; i < Gflash::Nrpar ; i++) {
-      lateralPar[Gflash::kESPM][i] = fTanh(einc,Gflash::kminus_rpar[i]);
+    for (int i = 0; i < Gflash::Nrpar; i++) {
+      lateralPar[Gflash::kESPM][i] = fTanh(einc, Gflash::kminus_rpar[i]);
       lateralPar[Gflash::kENCA][i] = lateralPar[Gflash::kESPM][i];
     }
   }
-
 }
diff --git a/SimGeneral/GFlash/src/GflashKaonPlusShowerProfile.cc b/SimGeneral/GFlash/src/GflashKaonPlusShowerProfile.cc
index 3d845d3a965a3..6d19257a1f24b 100644
--- a/SimGeneral/GFlash/src/GflashKaonPlusShowerProfile.cc
+++ b/SimGeneral/GFlash/src/GflashKaonPlusShowerProfile.cc
@@ -1,8 +1,7 @@
 #include "SimGeneral/GFlash/interface/GflashKaonPlusShowerProfile.h"
 #include <CLHEP/Random/RandGaussQ.h>
 
-void GflashKaonPlusShowerProfile::loadParameters()
-{
+void GflashKaonPlusShowerProfile::loadParameters() {
   double einc = theShowino->getEnergy();
   Gflash3Vector position = theShowino->getPositionAtShower();
   int showerType = theShowino->getShowerType();
@@ -10,79 +9,86 @@ void GflashKaonPlusShowerProfile::loadParameters()
   // energy scale
   double energyMeanHcal = 0.0;
   double energySigmaHcal = 0.0;
-  
+
   double r1 = 0.0;
   double r2 = 0.0;
 
-  if(showerType == 0 || showerType == 1 || showerType == 4 || showerType == 5) {
-
+  if (showerType == 0 || showerType == 1 || showerType == 4 || showerType == 5) {
     //@@@ energy dependent energyRho based on tuning with testbeam data
-    double energyRho =  fTanh(einc,Gflash::kplus_correl_hadem); 
+    double energyRho = fTanh(einc, Gflash::kplus_correl_hadem);
 
-    if(showerType == 0 || showerType == 1) {
+    if (showerType == 0 || showerType == 1) {
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-
-	energyScale[Gflash::kESPM] = einc*(fTanh(einc,Gflash::kplus_emscale[0]) + fTanh(einc,Gflash::kplus_emscale[1])*r1);
-
-	//LogNormal mean and sigma of Hcal energy
-	energyMeanHcal  = (fTanh(einc,Gflash::kplus_hadscale[0]) +
-			   fTanh(einc,Gflash::kplus_hadscale[1])*depthScale(position.getRho(),Gflash::RFrontCrystalEB,Gflash::LengthCrystalEB));
-	energySigmaHcal = (fTanh(einc,Gflash::kplus_hadscale[2]) +  
-			   fTanh(einc,Gflash::kplus_hadscale[3])*depthScale(position.getRho(),Gflash::RFrontCrystalEB,Gflash::LengthCrystalEB));
-         
-	r2 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kHB] = exp(energyMeanHcal+energySigmaHcal*(energyRho*r1 + sqrt(1.0- energyRho*energyRho)*r2 ));
-      } while ( energyScale[Gflash::kESPM] < 0 || energyScale[Gflash::kHB] > einc*1.5 ); 
-    }
-    else {
+        r1 = CLHEP::RandGaussQ::shoot();
+
+        energyScale[Gflash::kESPM] =
+            einc * (fTanh(einc, Gflash::kplus_emscale[0]) + fTanh(einc, Gflash::kplus_emscale[1]) * r1);
+
+        // LogNormal mean and sigma of Hcal energy
+        energyMeanHcal = (fTanh(einc, Gflash::kplus_hadscale[0]) +
+                          fTanh(einc, Gflash::kplus_hadscale[1]) *
+                              depthScale(position.getRho(), Gflash::RFrontCrystalEB, Gflash::LengthCrystalEB));
+        energySigmaHcal = (fTanh(einc, Gflash::kplus_hadscale[2]) +
+                           fTanh(einc, Gflash::kplus_hadscale[3]) *
+                               depthScale(position.getRho(), Gflash::RFrontCrystalEB, Gflash::LengthCrystalEB));
+
+        r2 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kHB] =
+            exp(energyMeanHcal + energySigmaHcal * (energyRho * r1 + sqrt(1.0 - energyRho * energyRho) * r2));
+      } while (energyScale[Gflash::kESPM] < 0 || energyScale[Gflash::kHB] > einc * 1.5);
+    } else {
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kENCA] = einc*(fTanh(einc,Gflash::kplus_emscale[0]) + fTanh(einc,Gflash::kplus_emscale[1])*r1);
-	
-	//@@@extend depthScale for HE
-	energyMeanHcal  = (fTanh(einc,Gflash::kplus_hadscale[0]) + 
-			   fTanh(einc,Gflash::kplus_hadscale[1])*depthScale(std::fabs(position.getZ()),Gflash::ZFrontCrystalEE,Gflash::LengthCrystalEE));
-	energySigmaHcal = (fTanh(einc,Gflash::kplus_hadscale[2]) +
-			   fTanh(einc,Gflash::kplus_hadscale[3])*depthScale(std::fabs(position.getZ()),Gflash::ZFrontCrystalEE,Gflash::LengthCrystalEE));
-	r2 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kHE] = exp(energyMeanHcal+energySigmaHcal*(energyRho*r1 + sqrt(1.0- energyRho*energyRho)*r2 ));
-      } while ( energyScale[Gflash::kENCA] < 0 || energyScale[Gflash::kHE] > einc*1.5 ); 
+        r1 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kENCA] =
+            einc * (fTanh(einc, Gflash::kplus_emscale[0]) + fTanh(einc, Gflash::kplus_emscale[1]) * r1);
+
+        //@@@extend depthScale for HE
+        energyMeanHcal = (fTanh(einc, Gflash::kplus_hadscale[0]) +
+                          fTanh(einc, Gflash::kplus_hadscale[1]) *
+                              depthScale(std::fabs(position.getZ()), Gflash::ZFrontCrystalEE, Gflash::LengthCrystalEE));
+        energySigmaHcal =
+            (fTanh(einc, Gflash::kplus_hadscale[2]) +
+             fTanh(einc, Gflash::kplus_hadscale[3]) *
+                 depthScale(std::fabs(position.getZ()), Gflash::ZFrontCrystalEE, Gflash::LengthCrystalEE));
+        r2 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kHE] =
+            exp(energyMeanHcal + energySigmaHcal * (energyRho * r1 + sqrt(1.0 - energyRho * energyRho) * r2));
+      } while (energyScale[Gflash::kENCA] < 0 || energyScale[Gflash::kHE] > einc * 1.5);
     }
-  }
-  else if(showerType == 2 || showerType == 3 || showerType == 6 || showerType == 7) { 
-    //Hcal response for mip-like pions (mip)
-    
-    energyMeanHcal  = fTanh(einc,Gflash::kplus_hadscale[4]);
-    energySigmaHcal = fTanh(einc,Gflash::kplus_hadscale[5]);
+  } else if (showerType == 2 || showerType == 3 || showerType == 6 || showerType == 7) {
+    // Hcal response for mip-like pions (mip)
+
+    energyMeanHcal = fTanh(einc, Gflash::kplus_hadscale[4]);
+    energySigmaHcal = fTanh(einc, Gflash::kplus_hadscale[5]);
 
-    double gap_corr = einc*fTanh(einc,Gflash::kplus_hadscale[6]);
+    double gap_corr = einc * fTanh(einc, Gflash::kplus_hadscale[6]);
 
-    if(showerType == 2 || showerType == 3) {
+    if (showerType == 2 || showerType == 3) {
       energyScale[Gflash::kESPM] = 0.0;
 
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kHB] = exp(energyMeanHcal+energySigmaHcal*r1);
-      } while ( energyScale[Gflash::kHB] > einc*1.5 );
+        r1 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kHB] = exp(energyMeanHcal + energySigmaHcal * r1);
+      } while (energyScale[Gflash::kHB] > einc * 1.5);
 
-      if(showerType == 2) {
-        energyScale[Gflash::kHE] = std::max(0.0,energyScale[Gflash::kHB]
-                                 - gap_corr*depthScale(position.getRho(),Gflash::Rmin[Gflash::kHB],28.));
+      if (showerType == 2) {
+        energyScale[Gflash::kHE] = std::max(
+            0.0, energyScale[Gflash::kHB] - gap_corr * depthScale(position.getRho(), Gflash::Rmin[Gflash::kHB], 28.));
       }
-    }
-    else if(showerType == 6 || showerType == 7 ) {
+    } else if (showerType == 6 || showerType == 7) {
       energyScale[Gflash::kENCA] = 0.0;
 
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-        energyMeanHcal += std::log(1.0-fTanh(einc,Gflash::kplus_hadscale[7]));
-        energyScale[Gflash::kHE] = exp(energyMeanHcal+energySigmaHcal*r1);
-      } while ( energyScale[Gflash::kHE] > einc*1.5 );
-
-      if(showerType == 6) {
-        energyScale[Gflash::kHE] = std::max(0.0,energyScale[Gflash::kHE]
-                                 - gap_corr*depthScale(std::fabs(position.getZ()),Gflash::Zmin[Gflash::kHE],66.));
+        r1 = CLHEP::RandGaussQ::shoot();
+        energyMeanHcal += std::log(1.0 - fTanh(einc, Gflash::kplus_hadscale[7]));
+        energyScale[Gflash::kHE] = exp(energyMeanHcal + energySigmaHcal * r1);
+      } while (energyScale[Gflash::kHE] > einc * 1.5);
+
+      if (showerType == 6) {
+        energyScale[Gflash::kHE] =
+            std::max(0.0,
+                     energyScale[Gflash::kHE] -
+                         gap_corr * depthScale(std::fabs(position.getZ()), Gflash::Zmin[Gflash::kHE], 66.));
       }
     }
   }
@@ -90,76 +96,79 @@ void GflashKaonPlusShowerProfile::loadParameters()
   // parameters for the longitudinal profiles
   //@@@check longitudinal profiles of endcaps for possible variations
 
-  double *rhoHcal = new double [2*Gflash::NPar];
-  double *correlationVectorHcal = new double [Gflash::NPar*(Gflash::NPar+1)/2];
+  double *rhoHcal = new double[2 * Gflash::NPar];
+  double *correlationVectorHcal = new double[Gflash::NPar * (Gflash::NPar + 1) / 2];
 
-  //@@@until we have a separate parameterization for Endcap 
+  //@@@until we have a separate parameterization for Endcap
 
-  if(showerType>3) {
+  if (showerType > 3) {
     showerType -= 4;
   }
-  //no separate parameterization before crystal
-  if(showerType==0) showerType = 1; 
+  // no separate parameterization before crystal
+  if (showerType == 0)
+    showerType = 1;
 
-  //Hcal parameters are always needed regardless of showerType
-  for(int i = 0 ; i < 2*Gflash::NPar ; i++ ) {
-    rhoHcal[i] = fTanh(einc,Gflash::kplus_rho[i + showerType*2*Gflash::NPar]);
+  // Hcal parameters are always needed regardless of showerType
+  for (int i = 0; i < 2 * Gflash::NPar; i++) {
+    rhoHcal[i] = fTanh(einc, Gflash::kplus_rho[i + showerType * 2 * Gflash::NPar]);
   }
 
-  getFluctuationVector(rhoHcal,correlationVectorHcal);
+  getFluctuationVector(rhoHcal, correlationVectorHcal);
 
   double normalZ[Gflash::NPar];
-  for (int i = 0; i < Gflash::NPar ; i++) normalZ[i] = CLHEP::RandGaussQ::shoot();
-  
-  for(int i = 0 ; i < Gflash::NPar ; i++) {
+  for (int i = 0; i < Gflash::NPar; i++)
+    normalZ[i] = CLHEP::RandGaussQ::shoot();
+
+  for (int i = 0; i < Gflash::NPar; i++) {
     double correlationSum = 0.0;
 
-    for(int j = 0 ; j < i+1 ; j++) {
-      correlationSum += correlationVectorHcal[i*(i+1)/2+j]*normalZ[j];
+    for (int j = 0; j < i + 1; j++) {
+      correlationSum += correlationVectorHcal[i * (i + 1) / 2 + j] * normalZ[j];
     }
-    longHcal[i] = fTanh(einc,Gflash::kplus_par[i+showerType*Gflash::NPar]) +
-		  fTanh(einc,Gflash::kplus_par[i+(4+showerType)*Gflash::NPar])*correlationSum;
+    longHcal[i] = fTanh(einc, Gflash::kplus_par[i + showerType * Gflash::NPar]) +
+                  fTanh(einc, Gflash::kplus_par[i + (4 + showerType) * Gflash::NPar]) * correlationSum;
   }
-  delete [] rhoHcal;
-  delete [] correlationVectorHcal;
+  delete[] rhoHcal;
+  delete[] correlationVectorHcal;
 
   // lateral parameters for Hcal
 
-  for (int i = 0 ; i < Gflash::Nrpar ; i++) {
-    lateralPar[Gflash::kHB][i] = fTanh(einc,Gflash::kplus_rpar[i+showerType*Gflash::Nrpar]);
+  for (int i = 0; i < Gflash::Nrpar; i++) {
+    lateralPar[Gflash::kHB][i] = fTanh(einc, Gflash::kplus_rpar[i + showerType * Gflash::Nrpar]);
     lateralPar[Gflash::kHE][i] = lateralPar[Gflash::kHB][i];
   }
 
-  //Ecal parameters are needed if and only if the shower starts inside the crystal
+  // Ecal parameters are needed if and only if the shower starts inside the
+  // crystal
 
-  if(showerType == 1) {
+  if (showerType == 1) {
+    double *rhoEcal = new double[2 * Gflash::NPar];
+    double *correlationVectorEcal = new double[Gflash::NPar * (Gflash::NPar + 1) / 2];
+    for (int i = 0; i < 2 * Gflash::NPar; i++)
+      rhoEcal[i] = fTanh(einc, Gflash::kplus_rho[i]);
 
-    double *rhoEcal = new double [2*Gflash::NPar];
-    double *correlationVectorEcal = new double [Gflash::NPar*(Gflash::NPar+1)/2];
-    for(int i = 0 ; i < 2*Gflash::NPar ; i++ ) rhoEcal[i] = fTanh(einc,Gflash::kplus_rho[i]);
+    getFluctuationVector(rhoEcal, correlationVectorEcal);
 
-    getFluctuationVector(rhoEcal,correlationVectorEcal);
-
-    for(int i = 0 ; i < Gflash::NPar ; i++) normalZ[i] = CLHEP::RandGaussQ::shoot();
-    for(int i = 0 ; i < Gflash::NPar ; i++) {
+    for (int i = 0; i < Gflash::NPar; i++)
+      normalZ[i] = CLHEP::RandGaussQ::shoot();
+    for (int i = 0; i < Gflash::NPar; i++) {
       double correlationSum = 0.0;
 
-      for(int j = 0 ; j < i+1 ; j++) {
-	correlationSum += correlationVectorEcal[i*(i+1)/2+j]*normalZ[j];
+      for (int j = 0; j < i + 1; j++) {
+        correlationSum += correlationVectorEcal[i * (i + 1) / 2 + j] * normalZ[j];
       }
-      longEcal[i] = fTanh(einc,Gflash::kplus_par[i]) +
-   	            0.5*fTanh(einc,Gflash::kplus_par[i+4*Gflash::NPar])*correlationSum;
+      longEcal[i] = fTanh(einc, Gflash::kplus_par[i]) +
+                    0.5 * fTanh(einc, Gflash::kplus_par[i + 4 * Gflash::NPar]) * correlationSum;
     }
 
-    delete [] rhoEcal;
-    delete [] correlationVectorEcal;
+    delete[] rhoEcal;
+    delete[] correlationVectorEcal;
 
     // lateral parameters for Ecal
 
-    for (int i = 0 ; i < Gflash::Nrpar ; i++) {
-      lateralPar[Gflash::kESPM][i] = fTanh(einc,Gflash::kplus_rpar[i]);
+    for (int i = 0; i < Gflash::Nrpar; i++) {
+      lateralPar[Gflash::kESPM][i] = fTanh(einc, Gflash::kplus_rpar[i]);
       lateralPar[Gflash::kENCA][i] = lateralPar[Gflash::kESPM][i];
     }
   }
-
 }
diff --git a/SimGeneral/GFlash/src/GflashNameSpace.cc b/SimGeneral/GFlash/src/GflashNameSpace.cc
index f5d1ec7389053..edd08baee0172 100644
--- a/SimGeneral/GFlash/src/GflashNameSpace.cc
+++ b/SimGeneral/GFlash/src/GflashNameSpace.cc
@@ -2,96 +2,98 @@
 
 namespace Gflash {
 
-//beginning of the Gflash name space
+  // beginning of the Gflash name space
 
-CalorimeterNumber getCalorimeterNumber(const Gflash3Vector& position)
-{
-  //return the calorimeter number of sensitive detectors (coarse)
+  CalorimeterNumber getCalorimeterNumber(const Gflash3Vector &position) {
+    // return the calorimeter number of sensitive detectors (coarse)
 
-  CalorimeterNumber index = kNULL;
-  double eta = position.getEta();
-  
-  //central
-  if (std::fabs(eta) < EtaMax[kESPM] ) {
-    double rho = position.getRho();
-    double rhoBack = rhoBackEB(position); 
-    if(rho > Gflash::Rmin[kESPM] && rho < rhoBack ) {
-      index = kESPM;
+    CalorimeterNumber index = kNULL;
+    double eta = position.getEta();
+
+    // central
+    if (std::fabs(eta) < EtaMax[kESPM]) {
+      double rho = position.getRho();
+      double rhoBack = rhoBackEB(position);
+      if (rho > Gflash::Rmin[kESPM] && rho < rhoBack) {
+        index = kESPM;
+      } else if (rho > Rmin[kHB] && rho < Rmax[kHB]) {
+        index = kHB;
+      }
     }
-    else if(rho > Rmin[kHB] && rho < Rmax[kHB]) {
-      index = kHB;
+    // forward
+    else if (std::fabs(eta) < EtaMax[kENCA]) {
+      double z = std::fabs(position.getZ());
+      double zBack = zBackEE(position);
+      if (z > Gflash::Zmin[kENCA] && z < zBack) {
+        index = kENCA;
+      } else if (z > Zmin[kHE] && z < Zmax[kHE]) {
+        index = kHE;
+      }
+      // HF is not in the standard Gflash implementation yet
+      //      if( z > Zmin[kHF] && z < Zmax[kHF] ) {
+      //	index = kHF;
+      //      }
     }
+
+    return index;
   }
-  //forward
-  else if (std::fabs(eta) < EtaMax[kENCA]) {
-    double z = std::fabs(position.getZ());
-    double zBack = zBackEE(position);
-    if( z > Gflash::Zmin[kENCA] && z < zBack ) {
-      index = kENCA;
+
+  int findShowerType(const Gflash3Vector &position) {
+    // type of hadron showers subject to the shower starting point (ssp)
+    // showerType = -1 : default (invalid)
+    // showerType =  0 : ssp before EBRY (barrel crystal)
+    // showerType =  1 : ssp inside EBRY
+    // showerType =  2 : ssp after  EBRY before HB
+    // showerType =  3 : ssp inside HB
+    // showerType =  4 : ssp before EFRY (endcap crystal)
+    // showerType =  5 : ssp inside EFRY
+    // showerType =  6 : ssp after  EFRY before HE
+    // showerType =  7 : ssp inside HE
+
+    int showerType = -1;
+
+    // central
+    double eta = position.getEta();
+    if (std::fabs(eta) < EtaMax[kESPM]) {
+      double rho = position.getRho();
+      double rhoBack = rhoBackEB(position);
+      if (rho < Gflash::RFrontCrystalEB)
+        showerType = 0;
+      else if (rho < rhoBack)
+        showerType = 1;
+      else if (rho < Rmin[kHB])
+        showerType = 2;
+      else
+        showerType = 3;
     }
-    else if( z > Zmin[kHE] && z < Zmax[kHE] ) {
-      index = kHE;
+    // forward
+    else if (std::fabs(eta) < EtaMax[Gflash::kENCA]) {
+      double z = std::fabs(position.getZ());
+      double zBack = zBackEE(position);
+      if (z < Gflash::ZFrontCrystalEE)
+        showerType = 4;
+      else if (z < zBack)
+        showerType = 5;
+      else if (z < Zmin[kHE])
+        showerType = 6;
+      else
+        showerType = 7;
     }
-    //HF is not in the standard Gflash implementation yet
-    //      if( z > Zmin[kHF] && z < Zmax[kHF] ) {
-    //	index = kHF;
-    //      }
-  }
-  
-  return index;
-}
-  
-int findShowerType(const Gflash3Vector& position) 
-{
-  // type of hadron showers subject to the shower starting point (ssp)
-  // showerType = -1 : default (invalid)
-  // showerType =  0 : ssp before EBRY (barrel crystal)
-  // showerType =  1 : ssp inside EBRY
-  // showerType =  2 : ssp after  EBRY before HB
-  // showerType =  3 : ssp inside HB
-  // showerType =  4 : ssp before EFRY (endcap crystal)
-  // showerType =  5 : ssp inside EFRY
-  // showerType =  6 : ssp after  EFRY before HE
-  // showerType =  7 : ssp inside HE
 
-  int showerType = -1;
-    
-  //central
-  double eta = position.getEta();
-  if (std::fabs(eta) < EtaMax[kESPM]) {
-    double rho = position.getRho();
-    double rhoBack = rhoBackEB(position); 
-    if(rho < Gflash::RFrontCrystalEB) showerType = 0;
-    else if (rho < rhoBack ) showerType = 1;
-    else if (rho < Rmin[kHB] ) showerType = 2;
-    else showerType = 3;
+    return showerType;
   }
-  //forward
-  else if (std::fabs(eta) < EtaMax[Gflash::kENCA] ) {
-    double z = std::fabs(position.getZ());
-    double zBack = zBackEE(position);
-    if(z < Gflash::ZFrontCrystalEE ) showerType = 4;
-    else if (z < zBack ) showerType = 5;
-    else if (z < Zmin[kHE] ) showerType = 6;
-    else showerType = 7;
-  }
-  
-  return showerType;
-}
-
-double rhoBackEB(const Gflash3Vector& position) 
-{
-  //return (Gflash::RFrontCrystalEB + Gflash::LengthCrystalEB*std::sin(position.getTheta()));
-  return (Gflash::RFrontCrystalEB + Gflash::LengthCrystalEB );
-
-}
 
-double zBackEE(const Gflash3Vector& position) 
-{
-  //return (Gflash::ZFrontCrystalEE + Gflash::LengthCrystalEE*std::fabs(std::cos(position.getTheta())));
-  return (Gflash::ZFrontCrystalEE + Gflash::LengthCrystalEE);
-}
+  double rhoBackEB(const Gflash3Vector &position) {
+    // return (Gflash::RFrontCrystalEB +
+    // Gflash::LengthCrystalEB*std::sin(position.getTheta()));
+    return (Gflash::RFrontCrystalEB + Gflash::LengthCrystalEB);
+  }
 
-//end of the Gflash name space
-}
+  double zBackEE(const Gflash3Vector &position) {
+    // return (Gflash::ZFrontCrystalEE +
+    // Gflash::LengthCrystalEE*std::fabs(std::cos(position.getTheta())));
+    return (Gflash::ZFrontCrystalEE + Gflash::LengthCrystalEE);
+  }
 
+  // end of the Gflash name space
+}  // namespace Gflash
diff --git a/SimGeneral/GFlash/src/GflashPiKShowerProfile.cc b/SimGeneral/GFlash/src/GflashPiKShowerProfile.cc
index 44059ceeda9f7..c8c36130cecab 100644
--- a/SimGeneral/GFlash/src/GflashPiKShowerProfile.cc
+++ b/SimGeneral/GFlash/src/GflashPiKShowerProfile.cc
@@ -1,8 +1,7 @@
 #include "SimGeneral/GFlash/interface/GflashPiKShowerProfile.h"
 #include <CLHEP/Random/RandGaussQ.h>
 
-void GflashPiKShowerProfile::loadParameters()
-{
+void GflashPiKShowerProfile::loadParameters() {
   double einc = theShowino->getEnergy();
   Gflash3Vector position = theShowino->getPositionAtShower();
   int showerType = theShowino->getShowerType();
@@ -10,79 +9,86 @@ void GflashPiKShowerProfile::loadParameters()
   // energy scale
   double energyMeanHcal = 0.0;
   double energySigmaHcal = 0.0;
-  
+
   double r1 = 0.0;
   double r2 = 0.0;
 
-  if(showerType == 0 || showerType == 1 || showerType == 4 || showerType == 5) {
-
+  if (showerType == 0 || showerType == 1 || showerType == 4 || showerType == 5) {
     //@@@ energy dependent energyRho based on tuning with testbeam data
-    double energyRho =  fTanh(einc,Gflash::pion_correl_hadem); 
+    double energyRho = fTanh(einc, Gflash::pion_correl_hadem);
 
-    if(showerType == 0 || showerType == 1) {
+    if (showerType == 0 || showerType == 1) {
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-
-	energyScale[Gflash::kESPM] = einc*(fTanh(einc,Gflash::pion_emscale[0]) + fTanh(einc,Gflash::pion_emscale[1])*r1);
-
-	//LogNormal mean and sigma of Hcal energy
-	energyMeanHcal  = (fTanh(einc,Gflash::pion_hadscale[0]) +
-			   fTanh(einc,Gflash::pion_hadscale[1])*depthScale(position.getRho(),Gflash::RFrontCrystalEB,Gflash::LengthCrystalEB));
-	energySigmaHcal = (fTanh(einc,Gflash::pion_hadscale[2]) +  
-			   fTanh(einc,Gflash::pion_hadscale[3])*depthScale(position.getRho(),Gflash::RFrontCrystalEB,Gflash::LengthCrystalEB));
-         
-	r2 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kHB] = exp(energyMeanHcal+energySigmaHcal*(energyRho*r1 + sqrt(1.0- energyRho*energyRho)*r2 ));
-      } while ( energyScale[Gflash::kESPM] < 0 || energyScale[Gflash::kHB] > einc*1.5 ); 
-    }
-    else {
+        r1 = CLHEP::RandGaussQ::shoot();
+
+        energyScale[Gflash::kESPM] =
+            einc * (fTanh(einc, Gflash::pion_emscale[0]) + fTanh(einc, Gflash::pion_emscale[1]) * r1);
+
+        // LogNormal mean and sigma of Hcal energy
+        energyMeanHcal = (fTanh(einc, Gflash::pion_hadscale[0]) +
+                          fTanh(einc, Gflash::pion_hadscale[1]) *
+                              depthScale(position.getRho(), Gflash::RFrontCrystalEB, Gflash::LengthCrystalEB));
+        energySigmaHcal = (fTanh(einc, Gflash::pion_hadscale[2]) +
+                           fTanh(einc, Gflash::pion_hadscale[3]) *
+                               depthScale(position.getRho(), Gflash::RFrontCrystalEB, Gflash::LengthCrystalEB));
+
+        r2 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kHB] =
+            exp(energyMeanHcal + energySigmaHcal * (energyRho * r1 + sqrt(1.0 - energyRho * energyRho) * r2));
+      } while (energyScale[Gflash::kESPM] < 0 || energyScale[Gflash::kHB] > einc * 1.5);
+    } else {
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kENCA] = einc*(fTanh(einc,Gflash::pion_emscale[0]) + fTanh(einc,Gflash::pion_emscale[1])*r1);
-	
-	//@@@extend depthScale for HE
-	energyMeanHcal  = (fTanh(einc,Gflash::pion_hadscale[0]) + 
-			   fTanh(einc,Gflash::pion_hadscale[1])*depthScale(std::fabs(position.getZ()),Gflash::ZFrontCrystalEE,Gflash::LengthCrystalEE));
-	energySigmaHcal = (fTanh(einc,Gflash::pion_hadscale[2]) +
-			   fTanh(einc,Gflash::pion_hadscale[3])*depthScale(std::fabs(position.getZ()),Gflash::ZFrontCrystalEE,Gflash::LengthCrystalEE));
-	r2 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kHE] = exp(energyMeanHcal+energySigmaHcal*(energyRho*r1 + sqrt(1.0- energyRho*energyRho)*r2 ));
-      } while ( energyScale[Gflash::kENCA] < 0 || energyScale[Gflash::kHE] > einc*1.5 ); 
+        r1 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kENCA] =
+            einc * (fTanh(einc, Gflash::pion_emscale[0]) + fTanh(einc, Gflash::pion_emscale[1]) * r1);
+
+        //@@@extend depthScale for HE
+        energyMeanHcal = (fTanh(einc, Gflash::pion_hadscale[0]) +
+                          fTanh(einc, Gflash::pion_hadscale[1]) *
+                              depthScale(std::fabs(position.getZ()), Gflash::ZFrontCrystalEE, Gflash::LengthCrystalEE));
+        energySigmaHcal =
+            (fTanh(einc, Gflash::pion_hadscale[2]) +
+             fTanh(einc, Gflash::pion_hadscale[3]) *
+                 depthScale(std::fabs(position.getZ()), Gflash::ZFrontCrystalEE, Gflash::LengthCrystalEE));
+        r2 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kHE] =
+            exp(energyMeanHcal + energySigmaHcal * (energyRho * r1 + sqrt(1.0 - energyRho * energyRho) * r2));
+      } while (energyScale[Gflash::kENCA] < 0 || energyScale[Gflash::kHE] > einc * 1.5);
     }
-  }
-  else if(showerType == 2 || showerType == 3 || showerType == 6 || showerType == 7) { 
-    //Hcal response for mip-like pions (mip)
-    
-    energyMeanHcal  = fTanh(einc,Gflash::pion_hadscale[4]);
-    energySigmaHcal = fTanh(einc,Gflash::pion_hadscale[5]);
+  } else if (showerType == 2 || showerType == 3 || showerType == 6 || showerType == 7) {
+    // Hcal response for mip-like pions (mip)
+
+    energyMeanHcal = fTanh(einc, Gflash::pion_hadscale[4]);
+    energySigmaHcal = fTanh(einc, Gflash::pion_hadscale[5]);
 
-    double gap_corr = einc*fTanh(einc,Gflash::pion_hadscale[6]);
+    double gap_corr = einc * fTanh(einc, Gflash::pion_hadscale[6]);
 
-    if(showerType == 2 || showerType == 3) {
+    if (showerType == 2 || showerType == 3) {
       energyScale[Gflash::kESPM] = 0.0;
 
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kHB] = exp(energyMeanHcal+energySigmaHcal*r1);
-      } while ( energyScale[Gflash::kHB] > einc*1.5 );
+        r1 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kHB] = exp(energyMeanHcal + energySigmaHcal * r1);
+      } while (energyScale[Gflash::kHB] > einc * 1.5);
 
-      if(showerType == 2) {
-        energyScale[Gflash::kHE] = std::max(0.0,energyScale[Gflash::kHB]
-                                 - gap_corr*depthScale(position.getRho(),Gflash::Rmin[Gflash::kHB],28.));
+      if (showerType == 2) {
+        energyScale[Gflash::kHE] = std::max(
+            0.0, energyScale[Gflash::kHB] - gap_corr * depthScale(position.getRho(), Gflash::Rmin[Gflash::kHB], 28.));
       }
-    }
-    else if(showerType == 6 || showerType == 7 ) {
+    } else if (showerType == 6 || showerType == 7) {
       energyScale[Gflash::kENCA] = 0.0;
 
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-	energyMeanHcal +=  std::log(1.0-fTanh(einc,Gflash::pion_hadscale[7]));
-        energyScale[Gflash::kHE] = exp(energyMeanHcal+energySigmaHcal*r1);
-      } while ( energyScale[Gflash::kHE] > einc*1.5 );
-
-      if(showerType == 6) {
-        energyScale[Gflash::kHE] = std::max(0.0,energyScale[Gflash::kHE]
-                                 - gap_corr*depthScale(std::fabs(position.getZ()),Gflash::Zmin[Gflash::kHE],66.));
+        r1 = CLHEP::RandGaussQ::shoot();
+        energyMeanHcal += std::log(1.0 - fTanh(einc, Gflash::pion_hadscale[7]));
+        energyScale[Gflash::kHE] = exp(energyMeanHcal + energySigmaHcal * r1);
+      } while (energyScale[Gflash::kHE] > einc * 1.5);
+
+      if (showerType == 6) {
+        energyScale[Gflash::kHE] =
+            std::max(0.0,
+                     energyScale[Gflash::kHE] -
+                         gap_corr * depthScale(std::fabs(position.getZ()), Gflash::Zmin[Gflash::kHE], 66.));
       }
     }
   }
@@ -90,76 +96,79 @@ void GflashPiKShowerProfile::loadParameters()
   // parameters for the longitudinal profiles
   //@@@check longitudinal profiles of endcaps for possible variations
 
-  double *rhoHcal = new double [2*Gflash::NPar];
-  double *correlationVectorHcal = new double [Gflash::NPar*(Gflash::NPar+1)/2];
+  double *rhoHcal = new double[2 * Gflash::NPar];
+  double *correlationVectorHcal = new double[Gflash::NPar * (Gflash::NPar + 1) / 2];
 
-  //@@@until we have a separate parameterization for Endcap 
+  //@@@until we have a separate parameterization for Endcap
 
-  if(showerType>3) {
+  if (showerType > 3) {
     showerType -= 4;
   }
-  //no separate parameterization before crystal
-  if(showerType==0) showerType = 1; 
+  // no separate parameterization before crystal
+  if (showerType == 0)
+    showerType = 1;
 
-  //Hcal parameters are always needed regardless of showerType
-  for(int i = 0 ; i < 2*Gflash::NPar ; i++ ) {
-    rhoHcal[i] = fTanh(einc,Gflash::pion_rho[i + showerType*2*Gflash::NPar]);
+  // Hcal parameters are always needed regardless of showerType
+  for (int i = 0; i < 2 * Gflash::NPar; i++) {
+    rhoHcal[i] = fTanh(einc, Gflash::pion_rho[i + showerType * 2 * Gflash::NPar]);
   }
 
-  getFluctuationVector(rhoHcal,correlationVectorHcal);
+  getFluctuationVector(rhoHcal, correlationVectorHcal);
 
   double normalZ[Gflash::NPar];
-  for (int i = 0; i < Gflash::NPar ; i++) normalZ[i] = CLHEP::RandGaussQ::shoot();
-  
-  for(int i = 0 ; i < Gflash::NPar ; i++) {
+  for (int i = 0; i < Gflash::NPar; i++)
+    normalZ[i] = CLHEP::RandGaussQ::shoot();
+
+  for (int i = 0; i < Gflash::NPar; i++) {
     double correlationSum = 0.0;
 
-    for(int j = 0 ; j < i+1 ; j++) {
-      correlationSum += correlationVectorHcal[i*(i+1)/2+j]*normalZ[j];
+    for (int j = 0; j < i + 1; j++) {
+      correlationSum += correlationVectorHcal[i * (i + 1) / 2 + j] * normalZ[j];
     }
-    longHcal[i] = fTanh(einc,Gflash::pion_par[i+showerType*Gflash::NPar]) +
-		  fTanh(einc,Gflash::pion_par[i+(4+showerType)*Gflash::NPar])*correlationSum;
+    longHcal[i] = fTanh(einc, Gflash::pion_par[i + showerType * Gflash::NPar]) +
+                  fTanh(einc, Gflash::pion_par[i + (4 + showerType) * Gflash::NPar]) * correlationSum;
   }
-  delete [] rhoHcal;
-  delete [] correlationVectorHcal;
+  delete[] rhoHcal;
+  delete[] correlationVectorHcal;
 
   // lateral parameters for Hcal
 
-  for (int i = 0 ; i < Gflash::Nrpar ; i++) {
-    lateralPar[Gflash::kHB][i] = fTanh(einc,Gflash::pion_rpar[i+showerType*Gflash::Nrpar]);
+  for (int i = 0; i < Gflash::Nrpar; i++) {
+    lateralPar[Gflash::kHB][i] = fTanh(einc, Gflash::pion_rpar[i + showerType * Gflash::Nrpar]);
     lateralPar[Gflash::kHE][i] = lateralPar[Gflash::kHB][i];
   }
 
-  //Ecal parameters are needed if and only if the shower starts inside the crystal
+  // Ecal parameters are needed if and only if the shower starts inside the
+  // crystal
 
-  if(showerType == 1) {
+  if (showerType == 1) {
+    double *rhoEcal = new double[2 * Gflash::NPar];
+    double *correlationVectorEcal = new double[Gflash::NPar * (Gflash::NPar + 1) / 2];
+    for (int i = 0; i < 2 * Gflash::NPar; i++)
+      rhoEcal[i] = fTanh(einc, Gflash::pion_rho[i]);
 
-    double *rhoEcal = new double [2*Gflash::NPar];
-    double *correlationVectorEcal = new double [Gflash::NPar*(Gflash::NPar+1)/2];
-    for(int i = 0 ; i < 2*Gflash::NPar ; i++ ) rhoEcal[i] = fTanh(einc,Gflash::pion_rho[i]);
+    getFluctuationVector(rhoEcal, correlationVectorEcal);
 
-    getFluctuationVector(rhoEcal,correlationVectorEcal);
-
-    for(int i = 0 ; i < Gflash::NPar ; i++) normalZ[i] = CLHEP::RandGaussQ::shoot();
-    for(int i = 0 ; i < Gflash::NPar ; i++) {
+    for (int i = 0; i < Gflash::NPar; i++)
+      normalZ[i] = CLHEP::RandGaussQ::shoot();
+    for (int i = 0; i < Gflash::NPar; i++) {
       double correlationSum = 0.0;
 
-      for(int j = 0 ; j < i+1 ; j++) {
-	correlationSum += correlationVectorEcal[i*(i+1)/2+j]*normalZ[j];
+      for (int j = 0; j < i + 1; j++) {
+        correlationSum += correlationVectorEcal[i * (i + 1) / 2 + j] * normalZ[j];
       }
-      longEcal[i] = fTanh(einc,Gflash::pion_par[i]) +
-   	            0.5*fTanh(einc,Gflash::pion_par[i+4*Gflash::NPar])*correlationSum;
+      longEcal[i] =
+          fTanh(einc, Gflash::pion_par[i]) + 0.5 * fTanh(einc, Gflash::pion_par[i + 4 * Gflash::NPar]) * correlationSum;
     }
 
-    delete [] rhoEcal;
-    delete [] correlationVectorEcal;
+    delete[] rhoEcal;
+    delete[] correlationVectorEcal;
 
     // lateral parameters for Ecal
 
-    for (int i = 0 ; i < Gflash::Nrpar ; i++) {
-      lateralPar[Gflash::kESPM][i] = fTanh(einc,Gflash::pion_rpar[i]);
+    for (int i = 0; i < Gflash::Nrpar; i++) {
+      lateralPar[Gflash::kESPM][i] = fTanh(einc, Gflash::pion_rpar[i]);
       lateralPar[Gflash::kENCA][i] = lateralPar[Gflash::kESPM][i];
     }
   }
-
 }
diff --git a/SimGeneral/GFlash/src/GflashProtonShowerProfile.cc b/SimGeneral/GFlash/src/GflashProtonShowerProfile.cc
index 6924076c9ab40..fc1f243a53c33 100644
--- a/SimGeneral/GFlash/src/GflashProtonShowerProfile.cc
+++ b/SimGeneral/GFlash/src/GflashProtonShowerProfile.cc
@@ -1,8 +1,7 @@
 #include "SimGeneral/GFlash/interface/GflashProtonShowerProfile.h"
 #include <CLHEP/Random/RandGaussQ.h>
 
-void GflashProtonShowerProfile::loadParameters()
-{
+void GflashProtonShowerProfile::loadParameters() {
   double einc = theShowino->getEnergy();
   Gflash3Vector position = theShowino->getPositionAtShower();
   int showerType = theShowino->getShowerType();
@@ -10,79 +9,86 @@ void GflashProtonShowerProfile::loadParameters()
   // energy scale
   double energyMeanHcal = 0.0;
   double energySigmaHcal = 0.0;
-  
+
   double r1 = 0.0;
   double r2 = 0.0;
 
-  if(showerType == 0 || showerType == 1 || showerType == 4 || showerType == 5) {
-
+  if (showerType == 0 || showerType == 1 || showerType == 4 || showerType == 5) {
     //@@@ energy dependent energyRho based on tuning with testbeam data
-    double energyRho =  fTanh(einc,Gflash::pro_correl_hadem); 
+    double energyRho = fTanh(einc, Gflash::pro_correl_hadem);
 
-    if(showerType == 0 || showerType == 1) {
+    if (showerType == 0 || showerType == 1) {
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-
-	energyScale[Gflash::kESPM] = einc*(fTanh(einc,Gflash::pro_emscale[0]) + fTanh(einc,Gflash::pro_emscale[1])*r1);
-
-	//LogNormal mean and sigma of Hcal energy
-	energyMeanHcal  = (fTanh(einc,Gflash::pro_hadscale[0]) +
-			   fTanh(einc,Gflash::pro_hadscale[1])*depthScale(position.getRho(),Gflash::RFrontCrystalEB,Gflash::LengthCrystalEB));
-	energySigmaHcal = (fTanh(einc,Gflash::pro_hadscale[2]) +  
-			   fTanh(einc,Gflash::pro_hadscale[3])*depthScale(position.getRho(),Gflash::RFrontCrystalEB,Gflash::LengthCrystalEB));
-         
-	r2 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kHB] = exp(energyMeanHcal+energySigmaHcal*(energyRho*r1 + sqrt(1.0- energyRho*energyRho)*r2 ));
-      } while ( energyScale[Gflash::kESPM] < 0 || energyScale[Gflash::kHB] > einc*1.5 ); 
-    }
-    else {
+        r1 = CLHEP::RandGaussQ::shoot();
+
+        energyScale[Gflash::kESPM] =
+            einc * (fTanh(einc, Gflash::pro_emscale[0]) + fTanh(einc, Gflash::pro_emscale[1]) * r1);
+
+        // LogNormal mean and sigma of Hcal energy
+        energyMeanHcal = (fTanh(einc, Gflash::pro_hadscale[0]) +
+                          fTanh(einc, Gflash::pro_hadscale[1]) *
+                              depthScale(position.getRho(), Gflash::RFrontCrystalEB, Gflash::LengthCrystalEB));
+        energySigmaHcal = (fTanh(einc, Gflash::pro_hadscale[2]) +
+                           fTanh(einc, Gflash::pro_hadscale[3]) *
+                               depthScale(position.getRho(), Gflash::RFrontCrystalEB, Gflash::LengthCrystalEB));
+
+        r2 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kHB] =
+            exp(energyMeanHcal + energySigmaHcal * (energyRho * r1 + sqrt(1.0 - energyRho * energyRho) * r2));
+      } while (energyScale[Gflash::kESPM] < 0 || energyScale[Gflash::kHB] > einc * 1.5);
+    } else {
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kENCA] = einc*(fTanh(einc,Gflash::pro_emscale[0]) + fTanh(einc,Gflash::pro_emscale[1])*r1);
-	
-	//@@@extend depthScale for HE
-	energyMeanHcal  = (fTanh(einc,Gflash::pro_hadscale[0]) + 
-			   fTanh(einc,Gflash::pro_hadscale[1])*depthScale(std::fabs(position.getZ()),Gflash::ZFrontCrystalEE,Gflash::LengthCrystalEE));
-	energySigmaHcal = (fTanh(einc,Gflash::pro_hadscale[2]) +
-			   fTanh(einc,Gflash::pro_hadscale[3])*depthScale(std::fabs(position.getZ()),Gflash::ZFrontCrystalEE,Gflash::LengthCrystalEE));
-	r2 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kHE] = exp(energyMeanHcal+energySigmaHcal*(energyRho*r1 + sqrt(1.0- energyRho*energyRho)*r2 ));
-      } while ( energyScale[Gflash::kENCA] < 0 || energyScale[Gflash::kHE] > einc*1.5 ); 
+        r1 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kENCA] =
+            einc * (fTanh(einc, Gflash::pro_emscale[0]) + fTanh(einc, Gflash::pro_emscale[1]) * r1);
+
+        //@@@extend depthScale for HE
+        energyMeanHcal = (fTanh(einc, Gflash::pro_hadscale[0]) +
+                          fTanh(einc, Gflash::pro_hadscale[1]) *
+                              depthScale(std::fabs(position.getZ()), Gflash::ZFrontCrystalEE, Gflash::LengthCrystalEE));
+        energySigmaHcal =
+            (fTanh(einc, Gflash::pro_hadscale[2]) +
+             fTanh(einc, Gflash::pro_hadscale[3]) *
+                 depthScale(std::fabs(position.getZ()), Gflash::ZFrontCrystalEE, Gflash::LengthCrystalEE));
+        r2 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kHE] =
+            exp(energyMeanHcal + energySigmaHcal * (energyRho * r1 + sqrt(1.0 - energyRho * energyRho) * r2));
+      } while (energyScale[Gflash::kENCA] < 0 || energyScale[Gflash::kHE] > einc * 1.5);
     }
-  }
-  else if(showerType == 2 || showerType == 3 || showerType == 6 || showerType == 7) { 
-    //Hcal response for mip-like pions (mip)
-    
-    energyMeanHcal  = fTanh(einc,Gflash::pro_hadscale[4]);
-    energySigmaHcal = fTanh(einc,Gflash::pro_hadscale[5]);
+  } else if (showerType == 2 || showerType == 3 || showerType == 6 || showerType == 7) {
+    // Hcal response for mip-like pions (mip)
+
+    energyMeanHcal = fTanh(einc, Gflash::pro_hadscale[4]);
+    energySigmaHcal = fTanh(einc, Gflash::pro_hadscale[5]);
 
-    double gap_corr = einc*fTanh(einc,Gflash::pro_hadscale[6]);
+    double gap_corr = einc * fTanh(einc, Gflash::pro_hadscale[6]);
 
-    if(showerType == 2 || showerType == 3) {
+    if (showerType == 2 || showerType == 3) {
       energyScale[Gflash::kESPM] = 0.0;
 
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-	energyScale[Gflash::kHB] = exp(energyMeanHcal+energySigmaHcal*r1);
-      } while ( energyScale[Gflash::kHB] > einc*1.5 );
+        r1 = CLHEP::RandGaussQ::shoot();
+        energyScale[Gflash::kHB] = exp(energyMeanHcal + energySigmaHcal * r1);
+      } while (energyScale[Gflash::kHB] > einc * 1.5);
 
-      if(showerType == 2) {
-        energyScale[Gflash::kHE] = std::max(0.0,energyScale[Gflash::kHB]
-                                 - gap_corr*depthScale(position.getRho(),Gflash::Rmin[Gflash::kHB],28.));
+      if (showerType == 2) {
+        energyScale[Gflash::kHE] = std::max(
+            0.0, energyScale[Gflash::kHB] - gap_corr * depthScale(position.getRho(), Gflash::Rmin[Gflash::kHB], 28.));
       }
-    }
-    else if(showerType == 6 || showerType == 7 ) {
+    } else if (showerType == 6 || showerType == 7) {
       energyScale[Gflash::kENCA] = 0.0;
 
       do {
-	r1 = CLHEP::RandGaussQ::shoot();
-        energyMeanHcal += std::log(1.0-fTanh(einc,Gflash::pro_hadscale[7]));
-        energyScale[Gflash::kHE] = exp(energyMeanHcal+energySigmaHcal*r1);
-      } while ( energyScale[Gflash::kHE] > einc*1.5 );
-
-      if(showerType == 6) {
-        energyScale[Gflash::kHE] = std::max(0.0,energyScale[Gflash::kHE]
-                                 - gap_corr*depthScale(std::fabs(position.getZ()),Gflash::Zmin[Gflash::kHE],66.));
+        r1 = CLHEP::RandGaussQ::shoot();
+        energyMeanHcal += std::log(1.0 - fTanh(einc, Gflash::pro_hadscale[7]));
+        energyScale[Gflash::kHE] = exp(energyMeanHcal + energySigmaHcal * r1);
+      } while (energyScale[Gflash::kHE] > einc * 1.5);
+
+      if (showerType == 6) {
+        energyScale[Gflash::kHE] =
+            std::max(0.0,
+                     energyScale[Gflash::kHE] -
+                         gap_corr * depthScale(std::fabs(position.getZ()), Gflash::Zmin[Gflash::kHE], 66.));
       }
     }
   }
@@ -90,76 +96,79 @@ void GflashProtonShowerProfile::loadParameters()
   // parameters for the longitudinal profiles
   //@@@check longitudinal profiles of endcaps for possible variations
 
-  double *rhoHcal = new double [2*Gflash::NPar];
-  double *correlationVectorHcal = new double [Gflash::NPar*(Gflash::NPar+1)/2];
+  double *rhoHcal = new double[2 * Gflash::NPar];
+  double *correlationVectorHcal = new double[Gflash::NPar * (Gflash::NPar + 1) / 2];
 
-  //@@@until we have a separate parameterization for Endcap 
+  //@@@until we have a separate parameterization for Endcap
 
-  if(showerType>3) {
+  if (showerType > 3) {
     showerType -= 4;
   }
-  //no separate parameterization before crystal
-  if(showerType==0) showerType = 1; 
+  // no separate parameterization before crystal
+  if (showerType == 0)
+    showerType = 1;
 
-  //Hcal parameters are always needed regardless of showerType
-  for(int i = 0 ; i < 2*Gflash::NPar ; i++ ) {
-    rhoHcal[i] = fTanh(einc,Gflash::pro_rho[i + showerType*2*Gflash::NPar]);
+  // Hcal parameters are always needed regardless of showerType
+  for (int i = 0; i < 2 * Gflash::NPar; i++) {
+    rhoHcal[i] = fTanh(einc, Gflash::pro_rho[i + showerType * 2 * Gflash::NPar]);
   }
 
-  getFluctuationVector(rhoHcal,correlationVectorHcal);
+  getFluctuationVector(rhoHcal, correlationVectorHcal);
 
   double normalZ[Gflash::NPar];
-  for (int i = 0; i < Gflash::NPar ; i++) normalZ[i] = CLHEP::RandGaussQ::shoot();
-  
-  for(int i = 0 ; i < Gflash::NPar ; i++) {
+  for (int i = 0; i < Gflash::NPar; i++)
+    normalZ[i] = CLHEP::RandGaussQ::shoot();
+
+  for (int i = 0; i < Gflash::NPar; i++) {
     double correlationSum = 0.0;
 
-    for(int j = 0 ; j < i+1 ; j++) {
-      correlationSum += correlationVectorHcal[i*(i+1)/2+j]*normalZ[j];
+    for (int j = 0; j < i + 1; j++) {
+      correlationSum += correlationVectorHcal[i * (i + 1) / 2 + j] * normalZ[j];
     }
-    longHcal[i] = fTanh(einc,Gflash::pro_par[i+showerType*Gflash::NPar]) +
-		  fTanh(einc,Gflash::pro_par[i+(4+showerType)*Gflash::NPar])*correlationSum;
+    longHcal[i] = fTanh(einc, Gflash::pro_par[i + showerType * Gflash::NPar]) +
+                  fTanh(einc, Gflash::pro_par[i + (4 + showerType) * Gflash::NPar]) * correlationSum;
   }
-  delete [] rhoHcal;
-  delete [] correlationVectorHcal;
+  delete[] rhoHcal;
+  delete[] correlationVectorHcal;
 
   // lateral parameters for Hcal
 
-  for (int i = 0 ; i < Gflash::Nrpar ; i++) {
-    lateralPar[Gflash::kHB][i] = fTanh(einc,Gflash::pro_rpar[i+showerType*Gflash::Nrpar]);
+  for (int i = 0; i < Gflash::Nrpar; i++) {
+    lateralPar[Gflash::kHB][i] = fTanh(einc, Gflash::pro_rpar[i + showerType * Gflash::Nrpar]);
     lateralPar[Gflash::kHE][i] = lateralPar[Gflash::kHB][i];
   }
 
-  //Ecal parameters are needed if and only if the shower starts inside the crystal
+  // Ecal parameters are needed if and only if the shower starts inside the
+  // crystal
 
-  if(showerType == 1) {
+  if (showerType == 1) {
+    double *rhoEcal = new double[2 * Gflash::NPar];
+    double *correlationVectorEcal = new double[Gflash::NPar * (Gflash::NPar + 1) / 2];
+    for (int i = 0; i < 2 * Gflash::NPar; i++)
+      rhoEcal[i] = fTanh(einc, Gflash::pro_rho[i]);
 
-    double *rhoEcal = new double [2*Gflash::NPar];
-    double *correlationVectorEcal = new double [Gflash::NPar*(Gflash::NPar+1)/2];
-    for(int i = 0 ; i < 2*Gflash::NPar ; i++ ) rhoEcal[i] = fTanh(einc,Gflash::pro_rho[i]);
+    getFluctuationVector(rhoEcal, correlationVectorEcal);
 
-    getFluctuationVector(rhoEcal,correlationVectorEcal);
-
-    for(int i = 0 ; i < Gflash::NPar ; i++) normalZ[i] = CLHEP::RandGaussQ::shoot();
-    for(int i = 0 ; i < Gflash::NPar ; i++) {
+    for (int i = 0; i < Gflash::NPar; i++)
+      normalZ[i] = CLHEP::RandGaussQ::shoot();
+    for (int i = 0; i < Gflash::NPar; i++) {
       double correlationSum = 0.0;
 
-      for(int j = 0 ; j < i+1 ; j++) {
-	correlationSum += correlationVectorEcal[i*(i+1)/2+j]*normalZ[j];
+      for (int j = 0; j < i + 1; j++) {
+        correlationSum += correlationVectorEcal[i * (i + 1) / 2 + j] * normalZ[j];
       }
-      longEcal[i] = fTanh(einc,Gflash::pro_par[i]) +
-   	            0.5*fTanh(einc,Gflash::pro_par[i+4*Gflash::NPar])*correlationSum;
+      longEcal[i] =
+          fTanh(einc, Gflash::pro_par[i]) + 0.5 * fTanh(einc, Gflash::pro_par[i + 4 * Gflash::NPar]) * correlationSum;
     }
 
-    delete [] rhoEcal;
-    delete [] correlationVectorEcal;
+    delete[] rhoEcal;
+    delete[] correlationVectorEcal;
 
     // lateral parameters for Ecal
 
-    for (int i = 0 ; i < Gflash::Nrpar ; i++) {
-      lateralPar[Gflash::kESPM][i] = fTanh(einc,Gflash::pro_rpar[i]);
+    for (int i = 0; i < Gflash::Nrpar; i++) {
+      lateralPar[Gflash::kESPM][i] = fTanh(einc, Gflash::pro_rpar[i]);
       lateralPar[Gflash::kENCA][i] = lateralPar[Gflash::kESPM][i];
     }
   }
-
 }
diff --git a/SimGeneral/GFlash/src/GflashShowino.cc b/SimGeneral/GFlash/src/GflashShowino.cc
index c4bdcf209fadc..fcb41a1f04b72 100644
--- a/SimGeneral/GFlash/src/GflashShowino.cc
+++ b/SimGeneral/GFlash/src/GflashShowino.cc
@@ -1,198 +1,204 @@
 #include "SimGeneral/GFlash/interface/GflashShowino.h"
 #include <CLHEP/Random/Randomize.h>
 
-GflashShowino::GflashShowino() 
-  : theShowerType(-1), theEnergy(0), thePositionAtShower(0,0,0), thePathLengthAtShower(0), 
-    thePathLengthOnEcal(0), theStepLengthToHcal(0), theStepLengthToOut(0),  
-    thePathLength(0), theGlobalTime(0), thePosition(0,0,0), theEnergyDeposited(0)
-{
-  theHelix =  new GflashTrajectory;
+GflashShowino::GflashShowino()
+    : theShowerType(-1),
+      theEnergy(0),
+      thePositionAtShower(0, 0, 0),
+      thePathLengthAtShower(0),
+      thePathLengthOnEcal(0),
+      theStepLengthToHcal(0),
+      theStepLengthToOut(0),
+      thePathLength(0),
+      theGlobalTime(0),
+      thePosition(0, 0, 0),
+      theEnergyDeposited(0) {
+  theHelix = new GflashTrajectory;
 }
 
-GflashShowino::~GflashShowino() 
-{
-  delete theHelix;
-}
-
-void GflashShowino::initialize(int showerType, double energy, double globalTime, double charge, 
-			       Gflash3Vector &position, Gflash3Vector &momentum,
-			       double magneticField) {
+GflashShowino::~GflashShowino() { delete theHelix; }
 
+void GflashShowino::initialize(int showerType,
+                               double energy,
+                               double globalTime,
+                               double charge,
+                               Gflash3Vector &position,
+                               Gflash3Vector &momentum,
+                               double magneticField) {
   theEnergy = energy;
   theGlobalTime = globalTime;
   theEnergyDeposited = 0.0;
 
   // inside the magnetic field (tesla unit);
-  theHelix->initializeTrajectory(momentum,position,charge,magneticField);
+  theHelix->initializeTrajectory(momentum, position, charge, magneticField);
 
-  if(showerType<100) {
-    thePositionAtShower = position;  
+  if (showerType < 100) {
+    thePositionAtShower = position;
     thePosition = thePositionAtShower;
     theShowerType = showerType;
 
-  }
-  else {
-    //this input is from FastSimulation
-    //1. simulate the shower starting position
-    thePositionAtShower = simulateFirstInteractionPoint(showerType,position);
+  } else {
+    // this input is from FastSimulation
+    // 1. simulate the shower starting position
+    thePositionAtShower = simulateFirstInteractionPoint(showerType, position);
     thePosition = thePositionAtShower;
 
-    //2. find shower type depending on where is the shower starting point
+    // 2. find shower type depending on where is the shower starting point
     theShowerType = Gflash::findShowerType(thePositionAtShower);
-
-  }  
+  }
 
   evaluateLengths();
-
 }
 
-void GflashShowino::updateShowino(double deltaStep)
-{
+void GflashShowino::updateShowino(double deltaStep) {
   thePathLength += deltaStep;
-  //trajectory point of showino along the shower depth at the pathLength
+  // trajectory point of showino along the shower depth at the pathLength
   GflashTrajectoryPoint trajectoryShowino;
-  theHelix->getGflashTrajectoryPoint(trajectoryShowino,thePathLength);
+  theHelix->getGflashTrajectoryPoint(trajectoryShowino, thePathLength);
 
   thePosition = trajectoryShowino.getPosition();
 
-  theGlobalTime +=  (theEnergy/100.0)*deltaStep/30.0; //@@@calculate exact time change in nsec
+  theGlobalTime += (theEnergy / 100.0) * deltaStep / 30.0;  //@@@calculate exact time change in nsec
 }
 
 void GflashShowino::evaluateLengths() {
-  //thePathLengthAtShower: path Length from the origin to the shower starting point in cm
-  //theStepLengthToOut: the total path length from the starting point of
-  //                    shower to the maximum distance inside paramerized envelopes
+  // thePathLengthAtShower: path Length from the origin to the shower starting
+  // point in cm theStepLengthToOut: the total path length from the starting
+  // point of
+  //                    shower to the maximum distance inside paramerized
+  //                    envelopes
   double eta = thePosition.getEta();
-  
+
   if (std::fabs(eta) < Gflash::EtaMax[Gflash::kESPM]) {
-    thePathLengthOnEcal   = theHelix->getPathLengthAtRhoEquals(Gflash::RFrontCrystalEB);
+    thePathLengthOnEcal = theHelix->getPathLengthAtRhoEquals(Gflash::RFrontCrystalEB);
     thePathLengthAtShower = theHelix->getPathLengthAtRhoEquals(thePosition.getRho());
     double pathLengthAtHcalBack = theHelix->getPathLengthAtRhoEquals(Gflash::Rmax[Gflash::kHB]);
-    if (pathLengthAtHcalBack>0) {
-      theStepLengthToOut  = std::min(300.,pathLengthAtHcalBack - thePathLengthAtShower);
+    if (pathLengthAtHcalBack > 0) {
+      theStepLengthToOut = std::min(300., pathLengthAtHcalBack - thePathLengthAtShower);
+    } else {
+      theStepLengthToOut = 200.;
     }
-    else {
-      theStepLengthToOut  = 200.;
-    }
-    theStepLengthToHcal   = theHelix->getPathLengthAtRhoEquals(Gflash::Rmin[Gflash::kHB]) - thePathLengthAtShower;
+    theStepLengthToHcal = theHelix->getPathLengthAtRhoEquals(Gflash::Rmin[Gflash::kHB]) - thePathLengthAtShower;
 
-  }
-  else if (std::fabs(eta) < Gflash::EtaMax[Gflash::kENCA] ) {
-    double zsign = (eta > 0) ? 1.0 : -1.0 ; 
-    thePathLengthOnEcal   = theHelix->getPathLengthAtZ(zsign*Gflash::ZFrontCrystalEE);
+  } else if (std::fabs(eta) < Gflash::EtaMax[Gflash::kENCA]) {
+    double zsign = (eta > 0) ? 1.0 : -1.0;
+    thePathLengthOnEcal = theHelix->getPathLengthAtZ(zsign * Gflash::ZFrontCrystalEE);
     thePathLengthAtShower = theHelix->getPathLengthAtZ(thePosition.getZ());
-    theStepLengthToOut    = std::min(300.,theHelix->getPathLengthAtZ(zsign*Gflash::Zmax[Gflash::kHE]) - thePathLengthAtShower);
-    theStepLengthToHcal   = theHelix->getPathLengthAtZ(zsign*Gflash::Zmin[Gflash::kHE]) - thePathLengthAtShower;
-  }
-  else { 
+    theStepLengthToOut =
+        std::min(300., theHelix->getPathLengthAtZ(zsign * Gflash::Zmax[Gflash::kHE]) - thePathLengthAtShower);
+    theStepLengthToHcal = theHelix->getPathLengthAtZ(zsign * Gflash::Zmin[Gflash::kHE]) - thePathLengthAtShower;
+  } else {
     //@@@extend for HF later
     theStepLengthToOut = 200.0;
   }
-  
-  thePathLength = thePathLengthAtShower;
 
+  thePathLength = thePathLengthAtShower;
 }
 
-Gflash3Vector& GflashShowino::simulateFirstInteractionPoint(int fastSimShowerType, Gflash3Vector &position) {
-
-  //determine the shower starting point (ssp):
-  //the position at the entrance + the mean free path till the inelastic interaction inside calo
+Gflash3Vector &GflashShowino::simulateFirstInteractionPoint(int fastSimShowerType, Gflash3Vector &position) {
+  // determine the shower starting point (ssp):
+  // the position at the entrance + the mean free path till the inelastic
+  // interaction inside calo
 
   double depthAtShower = 0.0;
 
-  //set thePathLengthOnEcal, the pathLength at the reference (r=123.8 for barrel and z=304.5 for endcap)
-    
-  //effective interaction length fitter to ssp from Geant4
+  // set thePathLengthOnEcal, the pathLength at the reference (r=123.8 for
+  // barrel and z=304.5 for endcap)
+
+  // effective interaction length fitter to ssp from Geant4
   double effectiveLambda = 0.0;
-  if(theEnergy > 0.0 &&  theEnergy < 15) {
-    effectiveLambda = 24.6+2.6*std::tanh(3.0*(std::log(theEnergy)-1.43));
-  }
-  else {
-    effectiveLambda = 28.4+1.20*std::tanh(1.5*(std::log(theEnergy)-4.3));
+  if (theEnergy > 0.0 && theEnergy < 15) {
+    effectiveLambda = 24.6 + 2.6 * std::tanh(3.0 * (std::log(theEnergy) - 1.43));
+  } else {
+    effectiveLambda = 28.4 + 1.20 * std::tanh(1.5 * (std::log(theEnergy) - 4.3));
   }
-  //fraction before the crystal, but inside Ecal
-  //  double frac_ssp1 = 1.5196e-01+1.3300e-01*tanh(-4.6971e-01*(std::log(theEnergy)+2.4162e+00));
-  //fraction after the crystal, but before Hcal
-  double frac_ssp2 = 2.8310e+00+2.6766e+00*tanh(-4.8068e-01*(std::log(theEnergy)+3.4857e+00));
-
-  if(fastSimShowerType == 100 ) { //fastTrack.onEcal() == 1
-
-    //    double rhoTemp = Gflash::ROffCrystalEB + Gflash::LengthCrystalEB*std::sin(position.getTheta());
-    double rhoTemp = Gflash::LengthCrystalEB*std::sin(position.getTheta());
-    thePathLengthOnEcal  = theHelix->getPathLengthAtRhoEquals(Gflash::RFrontCrystalEB);
-    double pathLengthAt2 = theHelix->getPathLengthAtRhoEquals(Gflash::RFrontCrystalEB + rhoTemp );
+  // fraction before the crystal, but inside Ecal
+  //  double frac_ssp1
+  //  = 1.5196e-01+1.3300e-01*tanh(-4.6971e-01*(std::log(theEnergy)+2.4162e+00));
+  // fraction after the crystal, but before Hcal
+  double frac_ssp2 = 2.8310e+00 + 2.6766e+00 * tanh(-4.8068e-01 * (std::log(theEnergy) + 3.4857e+00));
+
+  if (fastSimShowerType == 100) {  // fastTrack.onEcal() == 1
+
+    //    double rhoTemp = Gflash::ROffCrystalEB +
+    //    Gflash::LengthCrystalEB*std::sin(position.getTheta());
+    double rhoTemp = Gflash::LengthCrystalEB * std::sin(position.getTheta());
+    thePathLengthOnEcal = theHelix->getPathLengthAtRhoEquals(Gflash::RFrontCrystalEB);
+    double pathLengthAt2 = theHelix->getPathLengthAtRhoEquals(Gflash::RFrontCrystalEB + rhoTemp);
     double pathLengthAt3 = theHelix->getPathLengthAtRhoEquals(Gflash::Rmin[Gflash::kHB]);
 
-    ///fraction before the crystal, but inside Ecal
+    /// fraction before the crystal, but inside Ecal
     /*
     if(CLHEP::HepUniformRand() < frac_ssp1 ) {
-      depthAtShower = (pathLengthAt1-thePathLengthOnEcal)*CLHEP::HepUniformRand();
+      depthAtShower =
+    (pathLengthAt1-thePathLengthOnEcal)*CLHEP::HepUniformRand();
     }
     else {
     */
-    //inside the crystal
-    //      depthAtShower = (pathLengthAt1-thePathLengthOnEcal) - effectiveLambda*log(CLHEP::HepUniformRand());
-      depthAtShower = - effectiveLambda*log(CLHEP::HepUniformRand());
-      //after the crystal
-      if(depthAtShower > (pathLengthAt2 - thePathLengthOnEcal) ) {
-	//before Hcal
-	if(CLHEP::HepUniformRand() < frac_ssp2 ) {
-	  depthAtShower = (pathLengthAt2 - thePathLengthOnEcal) + (pathLengthAt3-pathLengthAt2)*CLHEP::HepUniformRand();
-	}
-	//inside Hcal
-	else {
-	  depthAtShower = (pathLengthAt3 - thePathLengthOnEcal) - effectiveLambda*log(CLHEP::HepUniformRand());
-	  //check whether the shower starts beyond HB
-	  double pathLengthAt4 = theHelix->getPathLengthAtRhoEquals(Gflash::Rmax[Gflash::kHB]);
-	  if(depthAtShower > (pathLengthAt4 - thePathLengthOnEcal)) {
-	    depthAtShower = (pathLengthAt4 - pathLengthAt3)*CLHEP::HepUniformRand();
-	  }
-	}
+    // inside the crystal
+    //      depthAtShower = (pathLengthAt1-thePathLengthOnEcal) -
+    //      effectiveLambda*log(CLHEP::HepUniformRand());
+    depthAtShower = -effectiveLambda * log(CLHEP::HepUniformRand());
+    // after the crystal
+    if (depthAtShower > (pathLengthAt2 - thePathLengthOnEcal)) {
+      // before Hcal
+      if (CLHEP::HepUniformRand() < frac_ssp2) {
+        depthAtShower =
+            (pathLengthAt2 - thePathLengthOnEcal) + (pathLengthAt3 - pathLengthAt2) * CLHEP::HepUniformRand();
       }
-      //    }
-  }
-  else if(fastSimShowerType == 101 ) { //fastTrack.onEcal() == 2 
+      // inside Hcal
+      else {
+        depthAtShower = (pathLengthAt3 - thePathLengthOnEcal) - effectiveLambda * log(CLHEP::HepUniformRand());
+        // check whether the shower starts beyond HB
+        double pathLengthAt4 = theHelix->getPathLengthAtRhoEquals(Gflash::Rmax[Gflash::kHB]);
+        if (depthAtShower > (pathLengthAt4 - thePathLengthOnEcal)) {
+          depthAtShower = (pathLengthAt4 - pathLengthAt3) * CLHEP::HepUniformRand();
+        }
+      }
+    }
+    //    }
+  } else if (fastSimShowerType == 101) {  // fastTrack.onEcal() == 2
 
     double zTemp = Gflash::LengthCrystalEE;
-    double zsign = (position.getEta() > 0) ? 1.0 : -1.0 ; 
+    double zsign = (position.getEta() > 0) ? 1.0 : -1.0;
+
+    thePathLengthOnEcal = theHelix->getPathLengthAtZ(zsign * Gflash::ZFrontCrystalEE);
+    double pathLengthAt2 = theHelix->getPathLengthAtZ(zsign * (Gflash::ZFrontCrystalEE + zTemp));
+    double pathLengthAt3 = theHelix->getPathLengthAtZ(zsign * Gflash::Zmin[Gflash::kHE]);
 
-    thePathLengthOnEcal  = theHelix->getPathLengthAtZ(zsign*Gflash::ZFrontCrystalEE);
-    double pathLengthAt2 = theHelix->getPathLengthAtZ(zsign*(Gflash::ZFrontCrystalEE + zTemp));
-    double pathLengthAt3 = theHelix->getPathLengthAtZ(zsign*Gflash::Zmin[Gflash::kHE]);
-      
     /*
     if(CLHEP::HepUniformRand() <  frac_ssp1 ) {
-      depthAtShower = (pathLengthAt1-thePathLengthOnEcal)*CLHEP::HepUniformRand();
+      depthAtShower =
+    (pathLengthAt1-thePathLengthOnEcal)*CLHEP::HepUniformRand();
     }
     else {
     */
-    //      depthAtShower = (pathLengthAt1-thePathLengthOnEcal)-effectiveLambda*std::log(CLHEP::HepUniformRand());
-      depthAtShower = -effectiveLambda*std::log(CLHEP::HepUniformRand());
-
-      if(depthAtShower > (pathLengthAt2 - thePathLengthOnEcal) ) {
-	if(CLHEP::HepUniformRand() < frac_ssp2 ) {
-	  depthAtShower = (pathLengthAt2 - thePathLengthOnEcal) +(pathLengthAt3 - pathLengthAt2)*CLHEP::HepUniformRand();
-	}
-	else {
-	  depthAtShower = (pathLengthAt3 - thePathLengthOnEcal)-effectiveLambda*std::log(CLHEP::HepUniformRand());
-	  //shower starts beyond HE
-	  double pathLengthAt4 = theHelix->getPathLengthAtZ(zsign*Gflash::Zmax[Gflash::kHE]);
-	  if(depthAtShower > (pathLengthAt4 - thePathLengthOnEcal)) {
-	    depthAtShower = (pathLengthAt4 - pathLengthAt3)*CLHEP::HepUniformRand();
-	  }
-	}
+    //      depthAtShower =
+    //      (pathLengthAt1-thePathLengthOnEcal)-effectiveLambda*std::log(CLHEP::HepUniformRand());
+    depthAtShower = -effectiveLambda * std::log(CLHEP::HepUniformRand());
+
+    if (depthAtShower > (pathLengthAt2 - thePathLengthOnEcal)) {
+      if (CLHEP::HepUniformRand() < frac_ssp2) {
+        depthAtShower =
+            (pathLengthAt2 - thePathLengthOnEcal) + (pathLengthAt3 - pathLengthAt2) * CLHEP::HepUniformRand();
+      } else {
+        depthAtShower = (pathLengthAt3 - thePathLengthOnEcal) - effectiveLambda * std::log(CLHEP::HepUniformRand());
+        // shower starts beyond HE
+        double pathLengthAt4 = theHelix->getPathLengthAtZ(zsign * Gflash::Zmax[Gflash::kHE]);
+        if (depthAtShower > (pathLengthAt4 - thePathLengthOnEcal)) {
+          depthAtShower = (pathLengthAt4 - pathLengthAt3) * CLHEP::HepUniformRand();
+        }
       }
-      //    }
-  }
-  else {
-    depthAtShower = 0.0; 
+    }
+    //    }
+  } else {
+    depthAtShower = 0.0;
   }
 
-  double pathLength  = thePathLengthOnEcal + depthAtShower;
+  double pathLength = thePathLengthOnEcal + depthAtShower;
 
-  theHelix->getGflashTrajectoryPoint(theTrajectoryPoint,pathLength);
+  theHelix->getGflashTrajectoryPoint(theTrajectoryPoint, pathLength);
 
-  //return the initial showino position at the shower starting position
+  // return the initial showino position at the shower starting position
   return theTrajectoryPoint.getPosition();
-
 }
diff --git a/SimGeneral/GFlash/src/GflashTrajectory.cc b/SimGeneral/GFlash/src/GflashTrajectory.cc
index f273f4d6576c3..5eea9f322e3db 100644
--- a/SimGeneral/GFlash/src/GflashTrajectory.cc
+++ b/SimGeneral/GFlash/src/GflashTrajectory.cc
@@ -3,219 +3,211 @@
 #include "SimGeneral/GFlash/interface/GflashTrajectory.h"
 
 GflashTrajectory::GflashTrajectory()
-  :
-   _cotTheta(0.0),_curvature(0.0),_z0(0.0),_d0(0.0),_phi0(0.0),
-   _isStale(true),
-   _sinPhi0(2),_cosPhi0(2),_sinTheta(2),_cosTheta(2),
-   _s(-999.999),
-   _aa(2),_ss(2),_cc(2)
-{
-  //detault constructor
+    : _cotTheta(0.0),
+      _curvature(0.0),
+      _z0(0.0),
+      _d0(0.0),
+      _phi0(0.0),
+      _isStale(true),
+      _sinPhi0(2),
+      _cosPhi0(2),
+      _sinTheta(2),
+      _cosTheta(2),
+      _s(-999.999),
+      _aa(2),
+      _ss(2),
+      _cc(2) {
+  // detault constructor
 }
 
-//GflashTrajectory::GflashTrajectory(const HepGeom::Vector3D<double>  & MomentumGev, const HepGeom::Point3D<double>   & PositionCm,
-//	     double q, double BFieldTesla) 
-void GflashTrajectory::initializeTrajectory(const HepGeom::Vector3D<double>  & MomentumGev, const HepGeom::Point3D<double>   & PositionCm,
-	     double q, double BFieldTesla) 
- {
-  double CotTheta = 0.0 ;
+// GflashTrajectory::GflashTrajectory(const HepGeom::Vector3D<double>  &
+// MomentumGev, const HepGeom::Point3D<double>   & PositionCm, 	     double q,
+// double
+// BFieldTesla)
+void GflashTrajectory::initializeTrajectory(const HepGeom::Vector3D<double> &MomentumGev,
+                                            const HepGeom::Point3D<double> &PositionCm,
+                                            double q,
+                                            double BFieldTesla) {
+  double CotTheta = 0.0;
   double W = 0;
   double Z0 = 0;
   double D0 = 0;
-  double Phi0 =0;
+  double Phi0 = 0;
 
   if (BFieldTesla != 0.0 && q != 0.0) {
-    double CurvatureConstant=0.0029979;
-    double Helicity       = -1.0 * fabs(BFieldTesla) * fabs(q) / (BFieldTesla*q);
-    double Radius         = fabs(MomentumGev.perp()/(CurvatureConstant*BFieldTesla*q));
-    
-    if(Radius==0.0) W = HUGE_VAL;   else     W        = Helicity/Radius;
-    double phi1     = MomentumGev.phi();
-    double x        = PositionCm.x(),        y        = PositionCm.y(),    z = PositionCm.z(); 
-    double sinPhi1  = sin(phi1),             cosPhi1  = cos(phi1);
-    double gamma    = atan((x*cosPhi1 + y*sinPhi1)/(x*sinPhi1-y*cosPhi1 -1/W));
-    Phi0            = phi1+gamma;
-    if(Phi0 >  M_PI) Phi0 = Phi0 - 2.0*M_PI; 
-    if(Phi0 < -M_PI) Phi0 = Phi0 + 2.0*M_PI; 
-    D0              = ((1/W + y*cosPhi1 - x*sinPhi1) /cos(gamma) - 1/W);
-    CotTheta        = MomentumGev.z()/MomentumGev.perp();
-    Z0              = z + gamma*CotTheta/W;
+    double CurvatureConstant = 0.0029979;
+    double Helicity = -1.0 * fabs(BFieldTesla) * fabs(q) / (BFieldTesla * q);
+    double Radius = fabs(MomentumGev.perp() / (CurvatureConstant * BFieldTesla * q));
+
+    if (Radius == 0.0)
+      W = HUGE_VAL;
+    else
+      W = Helicity / Radius;
+    double phi1 = MomentumGev.phi();
+    double x = PositionCm.x(), y = PositionCm.y(), z = PositionCm.z();
+    double sinPhi1 = sin(phi1), cosPhi1 = cos(phi1);
+    double gamma = atan((x * cosPhi1 + y * sinPhi1) / (x * sinPhi1 - y * cosPhi1 - 1 / W));
+    Phi0 = phi1 + gamma;
+    if (Phi0 > M_PI)
+      Phi0 = Phi0 - 2.0 * M_PI;
+    if (Phi0 < -M_PI)
+      Phi0 = Phi0 + 2.0 * M_PI;
+    D0 = ((1 / W + y * cosPhi1 - x * sinPhi1) / cos(gamma) - 1 / W);
+    CotTheta = MomentumGev.z() / MomentumGev.perp();
+    Z0 = z + gamma * CotTheta / W;
+  } else {
+    CLHEP::Hep3Vector direction = MomentumGev.unit();
+    CLHEP::Hep3Vector projectedDirection = CLHEP::Hep3Vector(direction.x(), direction.y(), 0.0).unit();
+    double s = projectedDirection.dot(PositionCm);
+    double sprime = s / sin(direction.theta());
+    Z0 = (PositionCm - sprime * direction).z();
+    Phi0 = MomentumGev.phi();
+    CotTheta = MomentumGev.z() / MomentumGev.perp();
+    W = 0.0;
+    D0 = (PositionCm.y() * cos(Phi0) - PositionCm.x() * sin(Phi0));
   }
-  else {
-    CLHEP::Hep3Vector direction          = MomentumGev.unit(); 
-    CLHEP::Hep3Vector projectedDirection = CLHEP::Hep3Vector(direction.x(),direction.y(),0.0).unit();
-    double s                      = projectedDirection.dot(PositionCm);
-    double sprime                 = s/sin(direction.theta());
-    Z0                            = (PositionCm - sprime*direction).z();
-    Phi0                          = MomentumGev.phi();
-    CotTheta                      = MomentumGev.z()/MomentumGev.perp();
-    W                             = 0.0;
-    D0                           = (PositionCm.y()*cos(Phi0) - PositionCm.x()*sin(Phi0));
-  } 
-  
-   _cotTheta=CotTheta;
-   _curvature=W/2;
-   _z0=Z0;
-   _d0=D0;
-   _phi0=Phi0;
 
-   _isStale=true;
-   _s=-999.999;
-   _aa =-999.999; 
-   _ss =-999.999; 
-   _cc =-999.999; 
-   _sinPhi0 = 1.0;
-   _cosPhi0 = 1.0;
-   _sinTheta = 1.0;
-   _cosTheta = 1.0;
-}
+  _cotTheta = CotTheta;
+  _curvature = W / 2;
+  _z0 = Z0;
+  _d0 = D0;
+  _phi0 = Phi0;
 
-GflashTrajectory::~GflashTrajectory()
-{
+  _isStale = true;
+  _s = -999.999;
+  _aa = -999.999;
+  _ss = -999.999;
+  _cc = -999.999;
+  _sinPhi0 = 1.0;
+  _cosPhi0 = 1.0;
+  _sinTheta = 1.0;
+  _cosTheta = 1.0;
 }
 
+GflashTrajectory::~GflashTrajectory() {}
+
 void GflashTrajectory::setCotTheta(double cotTheta) {
-  _cotTheta=cotTheta;
-  _isStale=true;
+  _cotTheta = cotTheta;
+  _isStale = true;
 }
 
-void GflashTrajectory::setCurvature(double curvature){
-  _curvature=curvature;
-  _isStale=true;
+void GflashTrajectory::setCurvature(double curvature) {
+  _curvature = curvature;
+  _isStale = true;
 }
 
 void GflashTrajectory::setZ0(double z0) {
   _z0 = z0;
-  _isStale=true;
+  _isStale = true;
 }
 
-void GflashTrajectory::setD0(double d0){
-  _d0=d0;
-  _isStale=true;
+void GflashTrajectory::setD0(double d0) {
+  _d0 = d0;
+  _isStale = true;
 }
 
-void GflashTrajectory::setPhi0(double phi0){
-  _phi0=phi0;
-  _isStale=true;
+void GflashTrajectory::setPhi0(double phi0) {
+  _phi0 = phi0;
+  _isStale = true;
 }
 
-double GflashTrajectory::getSinPhi0() const{
+double GflashTrajectory::getSinPhi0() const {
   _refreshCache();
   return _sinPhi0;
 }
-double GflashTrajectory::getCosPhi0() const{
+double GflashTrajectory::getCosPhi0() const {
   _refreshCache();
   return _cosPhi0;
 }
-double GflashTrajectory::getSinTheta() const{
+double GflashTrajectory::getSinTheta() const {
   _refreshCache();
   return _sinTheta;
 }
-double GflashTrajectory::getCosTheta() const{
+double GflashTrajectory::getCosTheta() const {
   _refreshCache();
   return _cosTheta;
 }
 
-HepGeom::Point3D<double>  GflashTrajectory::getPosition(double s) const
-{
+HepGeom::Point3D<double> GflashTrajectory::getPosition(double s) const {
   _cacheSinesAndCosines(s);
-  if (s==0.0 || _curvature==0.0) {
-      return HepGeom::Point3D<double> (-_d0*_sinPhi0+s*_cosPhi0*_sinTheta,
-                        _d0*_cosPhi0+s*_sinPhi0*_sinTheta,
-                        _z0+s*_cosTheta);
+  if (s == 0.0 || _curvature == 0.0) {
+    return HepGeom::Point3D<double>(
+        -_d0 * _sinPhi0 + s * _cosPhi0 * _sinTheta, _d0 * _cosPhi0 + s * _sinPhi0 * _sinTheta, _z0 + s * _cosTheta);
   } else {
-      return HepGeom::Point3D<double> ((_cosPhi0*_ss-_sinPhi0*(2.0*_curvature*_d0+1.0-_cc))
-                        /(2.0*_curvature),
-                        (_sinPhi0*_ss+_cosPhi0*(2.0*_curvature*_d0+1.0-_cc))
-                        /(2.0*_curvature),   
-                        _s*_cosTheta + _z0);
+    return HepGeom::Point3D<double>(
+        (_cosPhi0 * _ss - _sinPhi0 * (2.0 * _curvature * _d0 + 1.0 - _cc)) / (2.0 * _curvature),
+        (_sinPhi0 * _ss + _cosPhi0 * (2.0 * _curvature * _d0 + 1.0 - _cc)) / (2.0 * _curvature),
+        _s * _cosTheta + _z0);
   }
 }
 
-HepGeom::Vector3D<double>  GflashTrajectory::getDirection(double s) const
-{
+HepGeom::Vector3D<double> GflashTrajectory::getDirection(double s) const {
   _cacheSinesAndCosines(s);
-  if (s==0.0) {
-      return HepGeom::Vector3D<double> (_cosPhi0*_sinTheta,_sinPhi0*_sinTheta,_cosTheta);
+  if (s == 0.0) {
+    return HepGeom::Vector3D<double>(_cosPhi0 * _sinTheta, _sinPhi0 * _sinTheta, _cosTheta);
   }
-  double   xtan     = _sinTheta*(_cosPhi0*_cc -_sinPhi0*_ss); 
-  double   ytan     = _sinTheta*(_cosPhi0*_ss +_sinPhi0*_cc); 
-  double ztan       = _cosTheta;
-  return HepGeom::Vector3D<double> (xtan,ytan,ztan);
+  double xtan = _sinTheta * (_cosPhi0 * _cc - _sinPhi0 * _ss);
+  double ytan = _sinTheta * (_cosPhi0 * _ss + _sinPhi0 * _cc);
+  double ztan = _cosTheta;
+  return HepGeom::Vector3D<double>(xtan, ytan, ztan);
 }
 
-
-void GflashTrajectory::getGflashTrajectoryPoint(GflashTrajectoryPoint& point, double s) const {
-  
+void GflashTrajectory::getGflashTrajectoryPoint(GflashTrajectoryPoint &point, double s) const {
   _cacheSinesAndCosines(s);
 
-  double cP0sT = _cosPhi0*_sinTheta, sP0sT = _sinPhi0*_sinTheta;
-  if ( s && _curvature) {
-    point.getPosition().set((_cosPhi0*_ss-
-			     _sinPhi0*(2.0*_curvature*_d0+1.0-_cc))
-			    /(2.0*_curvature),
-			    (_sinPhi0*_ss+
-			     _cosPhi0*(2.0*_curvature*_d0+1.0-_cc))
-			    /(2.0*_curvature),
-			    s*_cosTheta + _z0);
-    
-    point.getMomentum().set(cP0sT*_cc-sP0sT*_ss,
-			    cP0sT*_ss+sP0sT*_cc,
-			    _cosTheta);
+  double cP0sT = _cosPhi0 * _sinTheta, sP0sT = _sinPhi0 * _sinTheta;
+  if (s && _curvature) {
+    point.getPosition().set((_cosPhi0 * _ss - _sinPhi0 * (2.0 * _curvature * _d0 + 1.0 - _cc)) / (2.0 * _curvature),
+                            (_sinPhi0 * _ss + _cosPhi0 * (2.0 * _curvature * _d0 + 1.0 - _cc)) / (2.0 * _curvature),
+                            s * _cosTheta + _z0);
+
+    point.getMomentum().set(cP0sT * _cc - sP0sT * _ss, cP0sT * _ss + sP0sT * _cc, _cosTheta);
     point.setPathLength(s);
-  }
-  else {
-    point.getPosition().set(-_d0*_sinPhi0+s*cP0sT,
-			    _d0*_cosPhi0+s*sP0sT,
-			    _z0+s*_cosTheta);
-    
-    point.getMomentum().set(cP0sT,sP0sT,_cosTheta);
-    
+  } else {
+    point.getPosition().set(-_d0 * _sinPhi0 + s * cP0sT, _d0 * _cosPhi0 + s * sP0sT, _z0 + s * _cosTheta);
+
+    point.getMomentum().set(cP0sT, sP0sT, _cosTheta);
+
     point.setPathLength(s);
   }
-  
 }
 
-double GflashTrajectory::getPathLengthAtRhoEquals(double rho) const
-{
-  return (getSinTheta()?(getL2DAtR(rho)/getSinTheta()):0.0);
+double GflashTrajectory::getPathLengthAtRhoEquals(double rho) const {
+  return (getSinTheta() ? (getL2DAtR(rho) / getSinTheta()) : 0.0);
 }
 
 double GflashTrajectory::getPathLengthAtZ(double z) const {
-  return (getCosTheta()?(z-getZ0())/getCosTheta():0.0);
+  return (getCosTheta() ? (z - getZ0()) / getCosTheta() : 0.0);
 }
 
-double GflashTrajectory::getZAtR(double rho) const {
-  return _z0 + getCotTheta()*getL2DAtR(rho);
-}
+double GflashTrajectory::getZAtR(double rho) const { return _z0 + getCotTheta() * getL2DAtR(rho); }
 
 double GflashTrajectory::getL2DAtR(double rho) const {
-
   double L2D;
 
   double c = getCurvature();
   double d = getD0();
 
-  if (c!=0.0) {
-    double rad = (rho*rho-d*d)/(1.0+2.0*c*d);
+  if (c != 0.0) {
+    double rad = (rho * rho - d * d) / (1.0 + 2.0 * c * d);
     double rprime;
-    if (rad<0.0) {
+    if (rad < 0.0) {
       rprime = 0.0;
+    } else {
+      rprime = sqrt(rad);
     }
-    else {
-      rprime = sqrt( rad );
-    }
-    if (c*rprime > 1.0 || c*rprime < -1.0) {
-      L2D = c*rprime > 0. ? M_PI/c : -M_PI/c;
-    }
-    else
-      L2D = asin(c*rprime)/c;
+    if (c * rprime > 1.0 || c * rprime < -1.0) {
+      L2D = c * rprime > 0. ? M_PI / c : -M_PI / c;
+    } else
+      L2D = asin(c * rprime) / c;
   } else {
-    double rad = rho*rho-d*d;
+    double rad = rho * rho - d * d;
     double rprime;
-    if (rad<0.0) rprime = 0.0;
-    else rprime = sqrt( rad );
-    
+    if (rad < 0.0)
+      rprime = 0.0;
+    else
+      rprime = sqrt(rad);
+
     L2D = rprime;
   }
   return L2D;
@@ -224,28 +216,26 @@ double GflashTrajectory::getL2DAtR(double rho) const {
 // Update _sinTheta,_cosTheta,_sinPhi0, and _cosPhi0
 void GflashTrajectory::_refreshCache() const {
   if (_isStale) {
-    _isStale=false;
+    _isStale = false;
     double theta;
-    if ( _cotTheta==0.0 ) {
-       theta = M_PI/2.0;
-    }
-    else {
-       theta=atan(1.0/_cotTheta);
-       if (theta<0.0) theta+=M_PI;
-    }
-    if (theta==0.0) {
-      _sinTheta=0.0;
-      _cosTheta=1.0;
+    if (_cotTheta == 0.0) {
+      theta = M_PI / 2.0;
+    } else {
+      theta = atan(1.0 / _cotTheta);
+      if (theta < 0.0)
+        theta += M_PI;
     }
-    else {
-      _cosTheta=cos(theta);
-      _sinTheta=sqrt(1-_cosTheta*_cosTheta);
+    if (theta == 0.0) {
+      _sinTheta = 0.0;
+      _cosTheta = 1.0;
+    } else {
+      _cosTheta = cos(theta);
+      _sinTheta = sqrt(1 - _cosTheta * _cosTheta);
     }
-    if (_phi0==0.0) {
-      _sinPhi0=0.0;
-      _cosPhi0=1.0;
-    }
-    else {
+    if (_phi0 == 0.0) {
+      _sinPhi0 = 0.0;
+      _cosPhi0 = 1.0;
+    } else {
       _cosPhi0 = cos(_phi0);
       _sinPhi0 = sin(_phi0);
       //      _sinPhi0 = sqrt(1.0-_cosPhi0*_cosPhi0);
@@ -256,16 +246,15 @@ void GflashTrajectory::_refreshCache() const {
 // Update _s, _aa, _ss, and _cc if the arclength has changed.
 void GflashTrajectory::_cacheSinesAndCosines(double s) const {
   _refreshCache();
-  if (_s!=s){
-    _s=s;
-    _aa=2.0*_s*_curvature*_sinTheta;
-    if (_aa==0.0) {
-      _ss=0.0;
-      _cc=1.0;
-    }
-    else {
-      _ss=sin(_aa);
-      _cc=cos(_aa);
+  if (_s != s) {
+    _s = s;
+    _aa = 2.0 * _s * _curvature * _sinTheta;
+    if (_aa == 0.0) {
+      _ss = 0.0;
+      _cc = 1.0;
+    } else {
+      _ss = sin(_aa);
+      _cc = cos(_aa);
     }
   }
 }
diff --git a/SimGeneral/GFlash/src/GflashTrajectoryPoint.cc b/SimGeneral/GFlash/src/GflashTrajectoryPoint.cc
index 5c428d452b05b..9f16ae16d5c3c 100644
--- a/SimGeneral/GFlash/src/GflashTrajectoryPoint.cc
+++ b/SimGeneral/GFlash/src/GflashTrajectoryPoint.cc
@@ -1,20 +1,13 @@
 #include "SimGeneral/GFlash/interface/GflashTrajectoryPoint.h"
 
-
-GflashTrajectoryPoint::GflashTrajectoryPoint() 
-  : thePosition(0,0,0), theMomentum(0,0,0), thePathLength(0) 
-{
-  //default constructor
+GflashTrajectoryPoint::GflashTrajectoryPoint() : thePosition(0, 0, 0), theMomentum(0, 0, 0), thePathLength(0) {
+  // default constructor
 }
 
-GflashTrajectoryPoint::GflashTrajectoryPoint(Gflash3Vector& position, Gflash3Vector& momentum, 
-					     double pathLength)
-{
+GflashTrajectoryPoint::GflashTrajectoryPoint(Gflash3Vector &position, Gflash3Vector &momentum, double pathLength) {
   thePosition = position;
   theMomentum = momentum;
   thePathLength = pathLength;
 }
 
-GflashTrajectoryPoint::~GflashTrajectoryPoint() 
-{
-}
+GflashTrajectoryPoint::~GflashTrajectoryPoint() {}
diff --git a/SimGeneral/HepPDTESSource/interface/HepPDTESSource.h b/SimGeneral/HepPDTESSource/interface/HepPDTESSource.h
index 8b66821a34271..8d059ceae8871 100644
--- a/SimGeneral/HepPDTESSource/interface/HepPDTESSource.h
+++ b/SimGeneral/HepPDTESSource/interface/HepPDTESSource.h
@@ -4,8 +4,9 @@
 //
 // Package:    HepPDTESSource
 // Class:      HepPDTESSource
-// 
-/**\class HepPDTESSource HepPDTESSource.h PhysicsTools/HepPDTESSource/interface/HepPDTESSource.h
+//
+/**\class HepPDTESSource HepPDTESSource.h
+ PhysicsTools/HepPDTESSource/interface/HepPDTESSource.h
 
  Description: HepPDT particle data table ESSource
 
@@ -16,21 +17,21 @@
 // Original Author:  Luca Lista
 //         Created:  Fri Mar 10 15:58:18 CET 2006
 //
-#include <memory>
-#include <fstream>
-#include "HepPDT/TableBuilder.hh"
-#include "HepPDT/ParticleDataTable.hh"
-#include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
 #include "FWCore/Framework/interface/SourceFactory.h"
+#include "HepPDT/ParticleDataTable.hh"
+#include "HepPDT/TableBuilder.hh"
 #include "SimGeneral/HepPDTRecord/interface/PDTRecord.h"
 #include <climits>
+#include <fstream>
+#include <memory>
 
-class HepPDTESSource : public edm::ESProducer, public  edm::EventSetupRecordIntervalFinder {
+class HepPDTESSource : public edm::ESProducer, public edm::EventSetupRecordIntervalFinder {
 public:
   /// constructor from parameter set
-  HepPDTESSource( const edm::ParameterSet& );
+  HepPDTESSource(const edm::ParameterSet &);
   /// destructor
   ~HepPDTESSource() override;
   /// define the particle data table type
@@ -38,11 +39,11 @@ class HepPDTESSource : public edm::ESProducer, public  edm::EventSetupRecordInte
   /// define the return type
   typedef std::unique_ptr<PDT> ReturnType;
   /// return the particle table
-  ReturnType produce( const PDTRecord & );
+  ReturnType produce(const PDTRecord &);
   /// set validity interval
-  void setIntervalFor( const edm::eventsetup::EventSetupRecordKey &,
-		       const edm::IOVSyncValue &,
-		       edm::ValidityInterval & ) override;
+  void setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                      const edm::IOVSyncValue &,
+                      edm::ValidityInterval &) override;
 
 private:
   edm::FileInPath pdtFileName;
diff --git a/SimGeneral/HepPDTESSource/src/HepPDTESSource.cc b/SimGeneral/HepPDTESSource/src/HepPDTESSource.cc
old mode 100755
new mode 100644
index ef702798825aa..3f8d917e47a4b
--- a/SimGeneral/HepPDTESSource/src/HepPDTESSource.cc
+++ b/SimGeneral/HepPDTESSource/src/HepPDTESSource.cc
@@ -1,17 +1,16 @@
-#include "SimGeneral/HepPDTESSource/interface/HepPDTESSource.h"
 #include "HepPDT/HeavyIonUnknownID.hh"
+#include "SimGeneral/HepPDTESSource/interface/HepPDTESSource.h"
 #include "tbb/concurrent_vector.h"
 
 namespace {
 
   class CachingHeavyIonUnknownID : public HepPDT::ProcessUnknownID {
-    HepPDT::ParticleData  * processUnknownID( HepPDT::ParticleID id, 
-                                              const HepPDT::ParticleDataTable & table) final {
-      //HeavyIonUnknownID constructs a new particle but does not delete it
+    HepPDT::ParticleData *processUnknownID(HepPDT::ParticleID id, const HepPDT::ParticleDataTable &table) final {
+      // HeavyIonUnknownID constructs a new particle but does not delete it
       // we need to do that ourselves
-      std::unique_ptr<HepPDT::ParticleData> p{ wrapped_.processUnknownID(id, table) };
-      auto* pPtr = p.get();
-      if(p) {
+      std::unique_ptr<HepPDT::ParticleData> p{wrapped_.processUnknownID(id, table)};
+      auto *pPtr = p.get();
+      if (p) {
         particles_.emplace_back(std::move(p));
       }
       return pPtr;
@@ -21,42 +20,38 @@ namespace {
     tbb::concurrent_vector<std::unique_ptr<HepPDT::ParticleData>> particles_;
   };
 
-}
+}  // namespace
 
-HepPDTESSource::HepPDTESSource( const edm::ParameterSet& cfg ) :
-  pdtFileName( cfg.getParameter<edm::FileInPath>( "pdtFileName" ) ) {
-  setWhatProduced( this );
+HepPDTESSource::HepPDTESSource(const edm::ParameterSet &cfg)
+    : pdtFileName(cfg.getParameter<edm::FileInPath>("pdtFileName")) {
+  setWhatProduced(this);
   findingRecord<PDTRecord>();
 }
 
-HepPDTESSource::~HepPDTESSource() {
-}
+HepPDTESSource::~HepPDTESSource() {}
 
-HepPDTESSource::ReturnType
-HepPDTESSource::produce( const PDTRecord & iRecord ) {
+HepPDTESSource::ReturnType HepPDTESSource::produce(const PDTRecord &iRecord) {
   using namespace edm::es;
-  auto pdt = std::make_unique<PDT>( "PDG table" , new CachingHeavyIonUnknownID );
-  std::ifstream pdtFile( pdtFileName.fullPath().c_str() );
-  if( ! pdtFile ) 
-    throw cms::Exception( "FileNotFound", "can't open pdt file" )
-      << "cannot open " << pdtFileName.fullPath();
-  { // notice: the builder has to be destroyed 
+  auto pdt = std::make_unique<PDT>("PDG table", new CachingHeavyIonUnknownID);
+  std::ifstream pdtFile(pdtFileName.fullPath().c_str());
+  if (!pdtFile)
+    throw cms::Exception("FileNotFound", "can't open pdt file") << "cannot open " << pdtFileName.fullPath();
+  {  // notice: the builder has to be destroyed
     // in order to fill the table!
-    HepPDT::TableBuilder builder( * pdt );
-    if( ! addParticleTable( pdtFile, builder ) ) { 
-      throw cms::Exception( "ConfigError", "can't read pdt file" )
-	<< "wrong format of " << pdtFileName.fullPath();
+    HepPDT::TableBuilder builder(*pdt);
+    if (!addParticleTable(pdtFile, builder)) {
+      throw cms::Exception("ConfigError", "can't read pdt file") << "wrong format of " << pdtFileName.fullPath();
     }
-  }  
+  }
   return pdt;
 }
 
-void HepPDTESSource::setIntervalFor( const edm::eventsetup::EventSetupRecordKey&,
-				     const edm::IOVSyncValue&,
-				     edm::ValidityInterval& oInterval ) {
+void HepPDTESSource::setIntervalFor(const edm::eventsetup::EventSetupRecordKey &,
+                                    const edm::IOVSyncValue &,
+                                    edm::ValidityInterval &oInterval) {
   // the same PDT is valid for any time
-  oInterval = edm::ValidityInterval( edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime() );
+  oInterval = edm::ValidityInterval(edm::IOVSyncValue::beginOfTime(), edm::IOVSyncValue::endOfTime());
 }
 
-//define this as a plug-in
-//DEFINE_FWK_EVENTSETUP_SOURCE( HepPDTESSource );
+// define this as a plug-in
+// DEFINE_FWK_EVENTSETUP_SOURCE( HepPDTESSource );
diff --git a/SimGeneral/HepPDTESSource/src/SealModule.cc b/SimGeneral/HepPDTESSource/src/SealModule.cc
index e0cd874382d0e..6572223b3a206 100644
--- a/SimGeneral/HepPDTESSource/src/SealModule.cc
+++ b/SimGeneral/HepPDTESSource/src/SealModule.cc
@@ -1,6 +1,4 @@
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "SimGeneral/HepPDTESSource/interface/HepPDTESSource.h"
 
-
-  
-  DEFINE_FWK_EVENTSETUP_SOURCE( HepPDTESSource );
+DEFINE_FWK_EVENTSETUP_SOURCE(HepPDTESSource);
diff --git a/SimGeneral/HepPDTESSource/test/HepPDTAnalyzer.cc b/SimGeneral/HepPDTESSource/test/HepPDTAnalyzer.cc
index 73b53c14ea091..db8fb7f8d3b21 100644
--- a/SimGeneral/HepPDTESSource/test/HepPDTAnalyzer.cc
+++ b/SimGeneral/HepPDTESSource/test/HepPDTAnalyzer.cc
@@ -1,89 +1,85 @@
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "SimGeneral/HepPDTESSource/test/HepPDTAnalyzer.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "SimGeneral/HepPDTESSource/test/HepPDTAnalyzer.h"
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
 
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
 using namespace edm;
 using namespace std;
 
-HepPDTAnalyzer::HepPDTAnalyzer(const edm::ParameterSet& iConfig) :
-  particleName_( iConfig.getParameter<std::string>( "particleName" ) ) {
-}
+HepPDTAnalyzer::HepPDTAnalyzer(const edm::ParameterSet &iConfig)
+    : particleName_(iConfig.getParameter<std::string>("particleName")) {}
 
-HepPDTAnalyzer::~HepPDTAnalyzer() {
-}
+HepPDTAnalyzer::~HepPDTAnalyzer() {}
 
-void
-HepPDTAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
+void HepPDTAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace edm;
-  
-  ESHandle <ParticleDataTable> pdt;
-  iSetup.getData( pdt );
 
-  if ( particleName_ == "all" ) {
+  ESHandle<ParticleDataTable> pdt;
+  iSetup.getData(pdt);
+
+  if (particleName_ == "all") {
     std::cout << " Number of particles in table = " << pdt->size() << std::endl;
     printBanner();
-    for ( ParticleDataTable::const_iterator iter = pdt->begin() ; iter != pdt->end() ; iter++ ) {
-      const ParticleData * part = pdt->particle ( (*iter).first );
-       printInfo(part); 	
+    for (ParticleDataTable::const_iterator iter = pdt->begin(); iter != pdt->end(); iter++) {
+      const ParticleData *part = pdt->particle((*iter).first);
+      printInfo(part);
     }
-  } else if ( particleName_ == "names" ) {
+  } else if (particleName_ == "names") {
     std::cout << " Number of particles in table = " << pdt->size() << std::endl;
     printBanner();
-    for ( ParticleDataTable::const_iterator iter = pdt->begin() ; iter != pdt->end() ; iter++ ) {
-      const ParticleData * part = pdt->particle ( (*iter).first );
-       std::cout << " " << part->name() << std::endl; 	
+    for (ParticleDataTable::const_iterator iter = pdt->begin(); iter != pdt->end(); iter++) {
+      const ParticleData *part = pdt->particle((*iter).first);
+      std::cout << " " << part->name() << std::endl;
     }
-  } else if ( particleName_ == "checkAllowedIDs") {
+  } else if (particleName_ == "checkAllowedIDs") {
     int maxID = 2000000000;
-    int minID = -1*maxID;
+    int minID = -1 * maxID;
     int legalcount = 0;
     std::cout << " Scanning IDs from " << minID << " to " << maxID << std::endl;
     printBanner();
-    for (int ii=minID; ii<=maxID; ii++) {
+    for (int ii = minID; ii <= maxID; ii++) {
       const ParticleData *part = pdt->particle(ii);
       if (part) {
         legalcount++;
         printInfo(part);
       }
-      if (abs(ii)>=1000000000) ii=ii+9;
+      if (abs(ii) >= 1000000000)
+        ii = ii + 9;
     }
     std::cout << "  Found " << legalcount << " legal IDs in range." << std::endl;
-  }
-  else {
+  } else {
     printBanner();
-    const ParticleData * part = pdt->particle( particleName_ );
+    const ParticleData *part = pdt->particle(particleName_);
     printInfo(part);
   }
-   
 }
 
-void 
-HepPDTAnalyzer::printInfo(const ParticleData* & part) {
-
-  cout << setfill(' ') << setw(14); 
+void HepPDTAnalyzer::printInfo(const ParticleData *&part) {
+  cout << setfill(' ') << setw(14);
   cout << part->name();
-  cout << setfill(' ') << setw(12); 
-  cout << part->pid(); 
-  cout << setfill(' ') << setw(8) << setprecision(3) ; 
+  cout << setfill(' ') << setw(12);
+  cout << part->pid();
+  cout << setfill(' ') << setw(8) << setprecision(3);
   cout << part->charge();
-  cout << setfill(' ') << setw(12) << setprecision(6) ; 
+  cout << setfill(' ') << setw(12) << setprecision(6);
   cout << part->mass();
-  cout << setfill(' ') << setw(14) << setprecision(5) ; 
+  cout << setfill(' ') << setw(14) << setprecision(5);
   cout << part->totalWidth();
-  cout << setfill(' ') << setw(14) << setprecision(5) ;
+  cout << setfill(' ') << setw(14) << setprecision(5);
   cout << part->lifetime() << endl;
-
 }
 
-void
-HepPDTAnalyzer::printBanner() {
-    cout << " Particle name    ID        Charge     Mass       Tot. Width      Lifetime " << endl; 
-    cout << " ------------------------------------------------------------------------- " << endl;
+void HepPDTAnalyzer::printBanner() {
+  cout << " Particle name    ID        Charge     Mass       Tot. Width      "
+          "Lifetime "
+       << endl;
+  cout << " -------------------------------------------------------------------"
+          "------ "
+       << endl;
 }
 
 #include "FWCore/Framework/interface/MakerMacros.h"
diff --git a/SimGeneral/HepPDTESSource/test/HepPDTAnalyzer.h b/SimGeneral/HepPDTESSource/test/HepPDTAnalyzer.h
index ac9d9c8faf190..5629d19bb65e5 100644
--- a/SimGeneral/HepPDTESSource/test/HepPDTAnalyzer.h
+++ b/SimGeneral/HepPDTESSource/test/HepPDTAnalyzer.h
@@ -5,8 +5,9 @@
 //
 // Package:    HepPDTAnalyzer
 // Class:      HepPDTAnalyzer
-// 
-/**\class HepPDTAnalyzer HepPDTAnalyzer.cc test/HepPDTAnalyzer/src/HepPDTAnalyzer.cc
+//
+/**\class HepPDTAnalyzer HepPDTAnalyzer.cc
+ test/HepPDTAnalyzer/src/HepPDTAnalyzer.cc
 
  Description: <one line class summary>
 
@@ -19,13 +20,13 @@
 //
 //
 
-#include <memory>
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include <memory>
 
 #include "FWCore/Framework/interface/Event.h"
-#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
 
 namespace edm {
@@ -34,15 +35,15 @@ namespace edm {
 
 class HepPDTAnalyzer : public edm::EDAnalyzer {
 public:
-  explicit HepPDTAnalyzer( const edm::ParameterSet & );
+  explicit HepPDTAnalyzer(const edm::ParameterSet &);
   ~HepPDTAnalyzer() override;
-  
-  
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
 
-  void printInfo(const ParticleData* & part);
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+
+  void printInfo(const ParticleData *&part);
+
+  void printBanner();
 
-  void printBanner(); 
 private:
   std::string particleName_;
 };
diff --git a/SimGeneral/HepPDTRecord/interface/PDTRecord.h b/SimGeneral/HepPDTRecord/interface/PDTRecord.h
old mode 100755
new mode 100644
index 6721936460d83..89928d79f54c1
--- a/SimGeneral/HepPDTRecord/interface/PDTRecord.h
+++ b/SimGeneral/HepPDTRecord/interface/PDTRecord.h
@@ -11,8 +11,6 @@
 
 #include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
 
-class PDTRecord : 
-  public edm::eventsetup::EventSetupRecordImplementation<PDTRecord> {
-};
+class PDTRecord : public edm::eventsetup::EventSetupRecordImplementation<PDTRecord> {};
 
 #endif
diff --git a/SimGeneral/HepPDTRecord/interface/ParticleDataTable.h b/SimGeneral/HepPDTRecord/interface/ParticleDataTable.h
index c482eab6c2a75..12390b81f8bf8 100644
--- a/SimGeneral/HepPDTRecord/interface/ParticleDataTable.h
+++ b/SimGeneral/HepPDTRecord/interface/ParticleDataTable.h
@@ -8,6 +8,6 @@
 typedef HepPDT::ParticleDataTable ParticleDataTable;
 typedef HepPDT::ParticleData ParticleData;
 
-EVENTSETUP_DATA_DEFAULT_RECORD( HepPDT::ParticleDataTable, PDTRecord )
+EVENTSETUP_DATA_DEFAULT_RECORD(HepPDT::ParticleDataTable, PDTRecord)
 
 #endif
diff --git a/SimGeneral/HepPDTRecord/interface/PdtEntry.h b/SimGeneral/HepPDTRecord/interface/PdtEntry.h
index b322ab03c8f3a..24710e4d1d58d 100644
--- a/SimGeneral/HepPDTRecord/interface/PdtEntry.h
+++ b/SimGeneral/HepPDTRecord/interface/PdtEntry.h
@@ -5,29 +5,33 @@
  * \author Luca Lista, INFN
  *
  */
-#include <string>
 #include <iterator>
+#include <string>
 #include <vector>
 
-namespace edm { class EventSetup; }
-namespace HepPDT { class ParticleData; }
+namespace edm {
+  class EventSetup;
+}
+namespace HepPDT {
+  class ParticleData;
+}
 
 class PdtEntry {
 public:
   /// default construct
-  explicit PdtEntry() : pdgId_( 0 ), data_( nullptr ) { }
+  explicit PdtEntry() : pdgId_(0), data_(nullptr) {}
   /// construct from PDG id
-  explicit PdtEntry( int pdgId ) : pdgId_( pdgId ), data_( nullptr ) { }
+  explicit PdtEntry(int pdgId) : pdgId_(pdgId), data_(nullptr) {}
   /// construct from particle name
-  explicit PdtEntry( const std::string & name ) : pdgId_( 0 ), name_( name ), data_( nullptr ) { }
+  explicit PdtEntry(const std::string &name) : pdgId_(0), name_(name), data_(nullptr) {}
   /// PDG id
   int pdgId() const;
   /// particle name
-  const std::string & name() const;
+  const std::string &name() const;
   /// particle data
-  const HepPDT::ParticleData & data() const; 
+  const HepPDT::ParticleData &data() const;
   /// fill data from Event Setup
-  void setup( const edm::EventSetup & ); 
+  void setup(const edm::EventSetup &);
 
 private:
   /// PDG id
@@ -35,112 +39,116 @@ class PdtEntry {
   /// particle name
   std::string name_;
   /// particle data
-  const HepPDT::ParticleData * data_;
+  const HepPDT::ParticleData *data_;
 };
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 namespace edm {
   namespace pdtentry {
-    PdtEntry getPdtEntry(Entry const& e, char const* name);
-    std::vector<PdtEntry> getPdtEntryVector(Entry const& e, char const* name);
-  }
+    PdtEntry getPdtEntry(Entry const &e, char const *name);
+    std::vector<PdtEntry> getPdtEntryVector(Entry const &e, char const *name);
+  }  // namespace pdtentry
 
-  template<>
-  inline PdtEntry ParameterSet::getParameter<PdtEntry>(std::string const& name) const {
-    Entry const& e = retrieve(name);
+  template <>
+  inline PdtEntry ParameterSet::getParameter<PdtEntry>(std::string const &name) const {
+    Entry const &e = retrieve(name);
     return pdtentry::getPdtEntry(e, name.c_str());
   }
 
-  template<>
-  inline PdtEntry ParameterSet::getUntrackedParameter<PdtEntry>(std::string const& name) const {
-    Entry const* e = getEntryPointerOrThrow_(name);
+  template <>
+  inline PdtEntry ParameterSet::getUntrackedParameter<PdtEntry>(std::string const &name) const {
+    Entry const *e = getEntryPointerOrThrow_(name);
     return pdtentry::getPdtEntry(*e, name.c_str());
   }
 
-  template<>
-  inline PdtEntry ParameterSet::getUntrackedParameter<PdtEntry>(std::string const& name, 
-								PdtEntry const& defaultValue) const {
-    Entry const* e = retrieveUntracked(name);
-    if (e == nullptr) return defaultValue;
+  template <>
+  inline PdtEntry ParameterSet::getUntrackedParameter<PdtEntry>(std::string const &name,
+                                                                PdtEntry const &defaultValue) const {
+    Entry const *e = retrieveUntracked(name);
+    if (e == nullptr)
+      return defaultValue;
     return pdtentry::getPdtEntry(*e, name.c_str());
   }
 
-  template<>
-  inline PdtEntry ParameterSet::getParameter<PdtEntry>(char const* name) const {
-    Entry const& e = retrieve(name);
+  template <>
+  inline PdtEntry ParameterSet::getParameter<PdtEntry>(char const *name) const {
+    Entry const &e = retrieve(name);
     return pdtentry::getPdtEntry(e, name);
   }
 
-  template<>
-  inline PdtEntry ParameterSet::getUntrackedParameter<PdtEntry>(char const* name) const {
-    Entry const* e = getEntryPointerOrThrow_(name);
+  template <>
+  inline PdtEntry ParameterSet::getUntrackedParameter<PdtEntry>(char const *name) const {
+    Entry const *e = getEntryPointerOrThrow_(name);
     return pdtentry::getPdtEntry(*e, name);
   }
 
-  template<>
-  inline PdtEntry ParameterSet::getUntrackedParameter<PdtEntry>(char const* name, 
-								PdtEntry const& defaultValue) const {
-    Entry const* e = retrieveUntracked(name);
-    if (e == nullptr) return defaultValue;
+  template <>
+  inline PdtEntry ParameterSet::getUntrackedParameter<PdtEntry>(char const *name, PdtEntry const &defaultValue) const {
+    Entry const *e = retrieveUntracked(name);
+    if (e == nullptr)
+      return defaultValue;
     return pdtentry::getPdtEntry(*e, name);
   }
 
-  template<>
-  inline std::vector<PdtEntry> ParameterSet::getParameter<std::vector<PdtEntry> >(std::string const& name) const {
-    Entry const& e = retrieve(name);
+  template <>
+  inline std::vector<PdtEntry> ParameterSet::getParameter<std::vector<PdtEntry>>(std::string const &name) const {
+    Entry const &e = retrieve(name);
     return pdtentry::getPdtEntryVector(e, name.c_str());
   }
 
-  template<>
-  inline std::vector<PdtEntry> ParameterSet::getUntrackedParameter<std::vector<PdtEntry> >(std::string const& name) const {
-    Entry const* e = getEntryPointerOrThrow_(name);
+  template <>
+  inline std::vector<PdtEntry> ParameterSet::getUntrackedParameter<std::vector<PdtEntry>>(
+      std::string const &name) const {
+    Entry const *e = getEntryPointerOrThrow_(name);
     return pdtentry::getPdtEntryVector(*e, name.c_str());
   }
 
-  template<>
-  inline std::vector<PdtEntry> ParameterSet::getUntrackedParameter<std::vector<PdtEntry> >(std::string const& name,
-								   std::vector<PdtEntry> const& defaultValue) const {
-    Entry const* e = retrieveUntracked(name);
-    if (e == nullptr) return defaultValue;
+  template <>
+  inline std::vector<PdtEntry> ParameterSet::getUntrackedParameter<std::vector<PdtEntry>>(
+      std::string const &name, std::vector<PdtEntry> const &defaultValue) const {
+    Entry const *e = retrieveUntracked(name);
+    if (e == nullptr)
+      return defaultValue;
     return pdtentry::getPdtEntryVector(*e, name.c_str());
   }
 
-  template<>
-  inline std::vector<PdtEntry> ParameterSet::getParameter<std::vector<PdtEntry> >(char const* name) const {
-    Entry const& e = retrieve(name);
+  template <>
+  inline std::vector<PdtEntry> ParameterSet::getParameter<std::vector<PdtEntry>>(char const *name) const {
+    Entry const &e = retrieve(name);
     return pdtentry::getPdtEntryVector(e, name);
   }
 
-  template<>
-  inline std::vector<PdtEntry> ParameterSet::getUntrackedParameter<std::vector<PdtEntry> >(char const* name) const {
-    Entry const* e = getEntryPointerOrThrow_(name);
+  template <>
+  inline std::vector<PdtEntry> ParameterSet::getUntrackedParameter<std::vector<PdtEntry>>(char const *name) const {
+    Entry const *e = getEntryPointerOrThrow_(name);
     return pdtentry::getPdtEntryVector(*e, name);
   }
 
-  template<>
-  inline std::vector<PdtEntry> ParameterSet::getUntrackedParameter<std::vector<PdtEntry> >(char const* name,
-								   std::vector<PdtEntry> const& defaultValue) const {
-    Entry const* e = retrieveUntracked(name);
-    if (e == nullptr) return defaultValue;
+  template <>
+  inline std::vector<PdtEntry> ParameterSet::getUntrackedParameter<std::vector<PdtEntry>>(
+      char const *name, std::vector<PdtEntry> const &defaultValue) const {
+    Entry const *e = retrieveUntracked(name);
+    if (e == nullptr)
+      return defaultValue;
     return pdtentry::getPdtEntryVector(*e, name);
   }
 
-  template<>
+  template <>
   inline std::vector<std::string> ParameterSet::getParameterNamesForType<PdtEntry>(bool trackiness) const {
     std::vector<std::string> ints = getParameterNamesForType<int>(trackiness);
     std::vector<std::string> strings = getParameterNamesForType<std::string>(trackiness);
-    std::copy( strings.begin(), strings.end(), std::back_insert_iterator<std::vector<std::string> >( ints ) ); 
+    std::copy(strings.begin(), strings.end(), std::back_insert_iterator<std::vector<std::string>>(ints));
     return ints;
   }
-  
-  template<>
-  inline std::vector<std::string> ParameterSet::getParameterNamesForType<std::vector<PdtEntry> >(bool trackiness) const {
-    std::vector<std::string> ints = getParameterNamesForType<std::vector<int> >(trackiness);
-    std::vector<std::string> strings = getParameterNamesForType<std::vector<std::string> >(trackiness);
-    std::copy( strings.begin(), strings.end(), std::back_insert_iterator<std::vector<std::string> >( ints ) ); 
+
+  template <>
+  inline std::vector<std::string> ParameterSet::getParameterNamesForType<std::vector<PdtEntry>>(bool trackiness) const {
+    std::vector<std::string> ints = getParameterNamesForType<std::vector<int>>(trackiness);
+    std::vector<std::string> strings = getParameterNamesForType<std::vector<std::string>>(trackiness);
+    std::copy(strings.begin(), strings.end(), std::back_insert_iterator<std::vector<std::string>>(ints));
     return ints;
   }
 
-}
+}  // namespace edm
 #endif
diff --git a/SimGeneral/HepPDTRecord/src/ES_ParticleDataTable.cc b/SimGeneral/HepPDTRecord/src/ES_ParticleDataTable.cc
old mode 100755
new mode 100644
index c183690b49ea9..0f9dc098e943d
--- a/SimGeneral/HepPDTRecord/src/ES_ParticleDataTable.cc
+++ b/SimGeneral/HepPDTRecord/src/ES_ParticleDataTable.cc
@@ -1,4 +1,4 @@
 #include "FWCore/Utilities/interface/typelookup.h"
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
 
-TYPELOOKUP_DATA_REG( HepPDT::ParticleDataTable );
+TYPELOOKUP_DATA_REG(HepPDT::ParticleDataTable);
diff --git a/SimGeneral/HepPDTRecord/src/PDTRecord.cc b/SimGeneral/HepPDTRecord/src/PDTRecord.cc
old mode 100755
new mode 100644
index 6d553b8ad6702..1b6b51c85d814
--- a/SimGeneral/HepPDTRecord/src/PDTRecord.cc
+++ b/SimGeneral/HepPDTRecord/src/PDTRecord.cc
@@ -1,4 +1,4 @@
-#include "SimGeneral/HepPDTRecord/interface/PDTRecord.h"
 #include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
+#include "SimGeneral/HepPDTRecord/interface/PDTRecord.h"
 
-EVENTSETUP_RECORD_REG( PDTRecord );
+EVENTSETUP_RECORD_REG(PDTRecord);
diff --git a/SimGeneral/HepPDTRecord/src/PdtEntry.cc b/SimGeneral/HepPDTRecord/src/PdtEntry.cc
index 397c1f7c463fd..93f225fa363a7 100644
--- a/SimGeneral/HepPDTRecord/src/PdtEntry.cc
+++ b/SimGeneral/HepPDTRecord/src/PdtEntry.cc
@@ -1,87 +1,78 @@
-#include "SimGeneral/HepPDTRecord/interface/PdtEntry.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
+#include "SimGeneral/HepPDTRecord/interface/PdtEntry.h"
 
 int PdtEntry::pdgId() const {
   if (pdgId_ == 0)
-    throw cms::Exception("ConfigError")
-      << "PdtEntry::pdgId was not set.\n"
-      << "please, call PdtEntry::setup(const EventSetup & es)";
+    throw cms::Exception("ConfigError") << "PdtEntry::pdgId was not set.\n"
+                                        << "please, call PdtEntry::setup(const EventSetup & es)";
   return pdgId_;
 }
 
-std::string const& PdtEntry::name() const {
+std::string const &PdtEntry::name() const {
   if (name_.empty())
-    throw cms::Exception("ConfigError")
-      << "PdtEntry::name was not set."
-      << "please, call PdtEntry::setup(const EventSetup & es)";
+    throw cms::Exception("ConfigError") << "PdtEntry::name was not set."
+                                        << "please, call PdtEntry::setup(const EventSetup & es)";
   return name_;
 }
 
-HepPDT::ParticleData const& PdtEntry::data() const { 
-  if(data_ == nullptr)
-    throw cms::Exception("ConfigError")
-      << "PdtEntry::name was not set."
-      << "please, call PdtEntry::setup(const EventSetup & es)";
-  return * data_; 
-} 
+HepPDT::ParticleData const &PdtEntry::data() const {
+  if (data_ == nullptr)
+    throw cms::Exception("ConfigError") << "PdtEntry::name was not set."
+                                        << "please, call PdtEntry::setup(const EventSetup & es)";
+  return *data_;
+}
 
-void PdtEntry::setup(edm::EventSetup const& es) {
+void PdtEntry::setup(edm::EventSetup const &es) {
   edm::ESHandle<HepPDT::ParticleDataTable> pdt;
   es.getData(pdt);
-  HepPDT::ParticleData const* p = nullptr;
+  HepPDT::ParticleData const *p = nullptr;
   if (pdgId_ == 0) {
     p = pdt->particle(name_);
-    if (p == nullptr) 
-      throw cms::Exception("ConfigError")
-	<< "PDT has no entry for " << name_ << "."
-	<< "PdtEntry can't be set.";
+    if (p == nullptr)
+      throw cms::Exception("ConfigError") << "PDT has no entry for " << name_ << "."
+                                          << "PdtEntry can't be set.";
     pdgId_ = p->pid();
   } else {
     p = pdt->particle(pdgId_);
-    if (p == nullptr) 
-      throw cms::Exception("ConfigError")
-	<< "PDT has no entry for " << pdgId_ << "."
-	<< "PdtEntry can't be set.";
+    if (p == nullptr)
+      throw cms::Exception("ConfigError") << "PDT has no entry for " << pdgId_ << "."
+                                          << "PdtEntry can't be set.";
     name_ = p->name();
   }
   data_ = p;
 }
 namespace edm {
   namespace pdtentry {
-    PdtEntry getPdtEntry(Entry const& e, char const* name) {
+    PdtEntry getPdtEntry(Entry const &e, char const *name) {
       if (e.typeCode() == 'I')
         return PdtEntry(e.getInt32());
-      else if(e.typeCode() == 'S') 
+      else if (e.typeCode() == 'S')
         return PdtEntry(e.getString());
-      else 
+      else
         throw Exception(errors::Configuration, "EntryError")
-	  << "can not convert representation of " << name 
-	  << " to value of type PdtEntry. "
-	  << "Please, provide a parameter either of type int32 or string.";
+            << "can not convert representation of " << name << " to value of type PdtEntry. "
+            << "Please, provide a parameter either of type int32 or string.";
     }
 
-    std::vector<PdtEntry> getPdtEntryVector(Entry const& e, char const* name) {
+    std::vector<PdtEntry> getPdtEntryVector(Entry const &e, char const *name) {
       std::vector<PdtEntry> ret;
-      if (e.typeCode() == 'i') { 
+      if (e.typeCode() == 'i') {
         std::vector<int> v(e.getVInt32());
-        for(std::vector<int>::const_iterator i = v.begin(); i != v.end(); ++ i)
+        for (std::vector<int>::const_iterator i = v.begin(); i != v.end(); ++i)
           ret.push_back(PdtEntry(*i));
         return ret;
-      }
-      else if(e.typeCode() == 's') {
+      } else if (e.typeCode() == 's') {
         std::vector<std::string> v(e.getVString());
-        for(std::vector<std::string>::const_iterator i = v.begin(); i != v.end(); ++i)
+        for (std::vector<std::string>::const_iterator i = v.begin(); i != v.end(); ++i)
           ret.push_back(PdtEntry(*i));
         return ret;
-      }
-      else 
+      } else
         throw Exception(errors::Configuration, "EntryError")
-  	<< "can not convert representation of " << name 
-  	<< " to value of type PdtEntry. "
-  	<< "Please, provide a parameter either of type int32 or string.";
+            << "can not convert representation of " << name << " to value of type PdtEntry. "
+            << "Please, provide a parameter either of type int32 or string.";
     }
-  }
-}
+  }  // namespace pdtentry
+}  // namespace edm
diff --git a/SimGeneral/HepPDTRecord/test/testPdtEntry.cc b/SimGeneral/HepPDTRecord/test/testPdtEntry.cc
index 3080c6a6585bc..b76380724b4cb 100644
--- a/SimGeneral/HepPDTRecord/test/testPdtEntry.cc
+++ b/SimGeneral/HepPDTRecord/test/testPdtEntry.cc
@@ -1,6 +1,6 @@
-#include <cppunit/extensions/HelperMacros.h>
+#include "FWCore/Utilities/interface/EDMException.h"
 #include "SimGeneral/HepPDTRecord/interface/PdtEntry.h"
-#include "FWCore/Utilities/interface/EDMException.h" 
+#include <cppunit/extensions/HelperMacros.h>
 #include <iostream>
 using namespace std;
 using namespace edm;
@@ -13,86 +13,86 @@ class testPdtEntry : public CppUnit::TestFixture {
 public:
   void setUp() override {}
   void tearDown() override {}
-  void checkAll(); 
+  void checkAll();
 };
 
-CPPUNIT_TEST_SUITE_REGISTRATION( testPdtEntry );
+CPPUNIT_TEST_SUITE_REGISTRATION(testPdtEntry);
 
 void testPdtEntry::checkAll() {
   using namespace std;
-  PdtEntry e( 13 );
-  CPPUNIT_ASSERT_THROW( e.name(), cms::Exception ); 
-  PdtEntry n( "mu-" );
-  CPPUNIT_ASSERT_THROW( n.pdgId(), cms::Exception ); 
+  PdtEntry e(13);
+  CPPUNIT_ASSERT_THROW(e.name(), cms::Exception);
+  PdtEntry n("mu-");
+  CPPUNIT_ASSERT_THROW(n.pdgId(), cms::Exception);
 
   {
     ParameterSet cfg;
-    cfg.addParameter<int>( "pdt1", 13 );
-    cfg.addParameter<string>( "pdt2", "mu-" );
-    int pdt1 = cfg.getParameter<int>( "pdt1" );
-    string pdt2 = cfg.getParameter<string>( "pdt2" );
-    PdtEntry e1  = cfg.getParameter<PdtEntry>( "pdt1" );
-    PdtEntry e2  = cfg.getParameter<PdtEntry>( "pdt2" );
-    CPPUNIT_ASSERT( pdt1 == e1.pdgId() );
-    CPPUNIT_ASSERT( pdt2 == e2.name() );
+    cfg.addParameter<int>("pdt1", 13);
+    cfg.addParameter<string>("pdt2", "mu-");
+    int pdt1 = cfg.getParameter<int>("pdt1");
+    string pdt2 = cfg.getParameter<string>("pdt2");
+    PdtEntry e1 = cfg.getParameter<PdtEntry>("pdt1");
+    PdtEntry e2 = cfg.getParameter<PdtEntry>("pdt2");
+    CPPUNIT_ASSERT(pdt1 == e1.pdgId());
+    CPPUNIT_ASSERT(pdt2 == e2.name());
     vector<string> p = cfg.getParameterNamesForType<PdtEntry>();
-    CPPUNIT_ASSERT( p.size() == 2 );
+    CPPUNIT_ASSERT(p.size() == 2);
   }
   {
     ParameterSet cfg;
-    cfg.addUntrackedParameter<int>( "pdt1", 13 );
-    cfg.addUntrackedParameter<string>( "pdt2", "mu-" );
-    int pdt1 = cfg.getUntrackedParameter<int>( "pdt1" );
-    string pdt2 = cfg.getUntrackedParameter<string>( "pdt2" );
-    PdtEntry e1  = cfg.getUntrackedParameter<PdtEntry>( "pdt1" );
-    PdtEntry e2  = cfg.getUntrackedParameter<PdtEntry>( "pdt2" );
-    CPPUNIT_ASSERT( pdt1 == e1.pdgId() );
-    CPPUNIT_ASSERT( pdt2 == e2.name() );
+    cfg.addUntrackedParameter<int>("pdt1", 13);
+    cfg.addUntrackedParameter<string>("pdt2", "mu-");
+    int pdt1 = cfg.getUntrackedParameter<int>("pdt1");
+    string pdt2 = cfg.getUntrackedParameter<string>("pdt2");
+    PdtEntry e1 = cfg.getUntrackedParameter<PdtEntry>("pdt1");
+    PdtEntry e2 = cfg.getUntrackedParameter<PdtEntry>("pdt2");
+    CPPUNIT_ASSERT(pdt1 == e1.pdgId());
+    CPPUNIT_ASSERT(pdt2 == e2.name());
   }
   {
     ParameterSet cfg;
-    int pdt1 = cfg.getUntrackedParameter<int>( "pdt1", 13 );
-    string pdt2 = cfg.getUntrackedParameter<string>( "pdt2", "mu-" );
-    PdtEntry e1  = cfg.getUntrackedParameter<PdtEntry>( "pdt1", PdtEntry( 13 ) );
-    PdtEntry e2  = cfg.getUntrackedParameter<PdtEntry>( "pdt2", PdtEntry( "mu-" ) );
-    CPPUNIT_ASSERT( pdt1 == e1.pdgId() );
-    CPPUNIT_ASSERT( pdt2 == e2.name() );
+    int pdt1 = cfg.getUntrackedParameter<int>("pdt1", 13);
+    string pdt2 = cfg.getUntrackedParameter<string>("pdt2", "mu-");
+    PdtEntry e1 = cfg.getUntrackedParameter<PdtEntry>("pdt1", PdtEntry(13));
+    PdtEntry e2 = cfg.getUntrackedParameter<PdtEntry>("pdt2", PdtEntry("mu-"));
+    CPPUNIT_ASSERT(pdt1 == e1.pdgId());
+    CPPUNIT_ASSERT(pdt2 == e2.name());
   }
   {
     ParameterSet cfg;
-    cfg.addParameter<vector<int> >( "pdt1", vector<int>( 1, 13 ) );
-    cfg.addParameter<vector<string> >( "pdt2", vector<string>( 1, "mu-" ) );
-    vector<int> pdt1 = cfg.getParameter<vector<int> >( "pdt1" );
-    vector<string> pdt2 = cfg.getParameter<vector<string> >( "pdt2" );
-    vector<PdtEntry> e1  = cfg.getParameter<vector<PdtEntry> >( "pdt1" );
-    vector<PdtEntry> e2  = cfg.getParameter<vector<PdtEntry> >( "pdt2" );
-    CPPUNIT_ASSERT( e1.size() == pdt1.size() );
-    CPPUNIT_ASSERT( e2.size() == pdt2.size() );
-    CPPUNIT_ASSERT( pdt1.front() == e1.front().pdgId() );
-    CPPUNIT_ASSERT( pdt2.front() == e2.front().name() );
+    cfg.addParameter<vector<int>>("pdt1", vector<int>(1, 13));
+    cfg.addParameter<vector<string>>("pdt2", vector<string>(1, "mu-"));
+    vector<int> pdt1 = cfg.getParameter<vector<int>>("pdt1");
+    vector<string> pdt2 = cfg.getParameter<vector<string>>("pdt2");
+    vector<PdtEntry> e1 = cfg.getParameter<vector<PdtEntry>>("pdt1");
+    vector<PdtEntry> e2 = cfg.getParameter<vector<PdtEntry>>("pdt2");
+    CPPUNIT_ASSERT(e1.size() == pdt1.size());
+    CPPUNIT_ASSERT(e2.size() == pdt2.size());
+    CPPUNIT_ASSERT(pdt1.front() == e1.front().pdgId());
+    CPPUNIT_ASSERT(pdt2.front() == e2.front().name());
   }
   {
     ParameterSet cfg;
-    cfg.addUntrackedParameter<vector<int> >( "pdt1", vector<int>( 1, 13 ) );
-    cfg.addUntrackedParameter<vector<string> >( "pdt2", vector<string>( 1, "mu-" ) );
-    vector<int> pdt1 = cfg.getUntrackedParameter<vector<int> >( "pdt1" );
-    vector<string> pdt2 = cfg.getUntrackedParameter<vector<string> >( "pdt2" );
-    vector<PdtEntry> e1  = cfg.getUntrackedParameter<vector<PdtEntry> >( "pdt1" );
-    vector<PdtEntry> e2  = cfg.getUntrackedParameter<vector<PdtEntry> >( "pdt2" );
-    CPPUNIT_ASSERT( e1.size() == pdt1.size() );
-    CPPUNIT_ASSERT( e2.size() == pdt2.size() );
-    CPPUNIT_ASSERT( pdt1.front() == e1.front().pdgId() );
-    CPPUNIT_ASSERT( pdt2.front() == e2.front().name() );
+    cfg.addUntrackedParameter<vector<int>>("pdt1", vector<int>(1, 13));
+    cfg.addUntrackedParameter<vector<string>>("pdt2", vector<string>(1, "mu-"));
+    vector<int> pdt1 = cfg.getUntrackedParameter<vector<int>>("pdt1");
+    vector<string> pdt2 = cfg.getUntrackedParameter<vector<string>>("pdt2");
+    vector<PdtEntry> e1 = cfg.getUntrackedParameter<vector<PdtEntry>>("pdt1");
+    vector<PdtEntry> e2 = cfg.getUntrackedParameter<vector<PdtEntry>>("pdt2");
+    CPPUNIT_ASSERT(e1.size() == pdt1.size());
+    CPPUNIT_ASSERT(e2.size() == pdt2.size());
+    CPPUNIT_ASSERT(pdt1.front() == e1.front().pdgId());
+    CPPUNIT_ASSERT(pdt2.front() == e2.front().name());
   }
   {
     ParameterSet cfg;
-    vector<int> pdt1 = cfg.getUntrackedParameter<vector<int> >( "pdt1", vector<int>( 1, 13 ) );
-    vector<string> pdt2 = cfg.getUntrackedParameter<vector<string> >( "pdt2", vector<string>( 1, "mu-" ) );
-    vector<PdtEntry> e1  = cfg.getUntrackedParameter<vector<PdtEntry> >( "pdt1", vector<PdtEntry>( 1, PdtEntry( 13 ) ) );
-    vector<PdtEntry> e2  = cfg.getUntrackedParameter<vector<PdtEntry> >( "pdt2", vector<PdtEntry>( 1, PdtEntry( "mu-" ) ) );
-    CPPUNIT_ASSERT( e1.size() == pdt1.size() );
-    CPPUNIT_ASSERT( e2.size() == pdt2.size() );
-    CPPUNIT_ASSERT( pdt1.front() == e1.front().pdgId() );
-    CPPUNIT_ASSERT( pdt2.front() == e2.front().name() );
+    vector<int> pdt1 = cfg.getUntrackedParameter<vector<int>>("pdt1", vector<int>(1, 13));
+    vector<string> pdt2 = cfg.getUntrackedParameter<vector<string>>("pdt2", vector<string>(1, "mu-"));
+    vector<PdtEntry> e1 = cfg.getUntrackedParameter<vector<PdtEntry>>("pdt1", vector<PdtEntry>(1, PdtEntry(13)));
+    vector<PdtEntry> e2 = cfg.getUntrackedParameter<vector<PdtEntry>>("pdt2", vector<PdtEntry>(1, PdtEntry("mu-")));
+    CPPUNIT_ASSERT(e1.size() == pdt1.size());
+    CPPUNIT_ASSERT(e2.size() == pdt2.size());
+    CPPUNIT_ASSERT(pdt1.front() == e1.front().pdgId());
+    CPPUNIT_ASSERT(pdt2.front() == e2.front().name());
   }
 }
diff --git a/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py b/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py
index fecabc280e10b..ec6e841468a48 100644
--- a/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py
+++ b/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py
@@ -27,7 +27,7 @@
     cms.PSet(type = cms.string('PixelDigiSimLinkedmDetSetVector'))
 )
 simSiPixelDigis = cms.EDAlias(
-    mix = _pixelCommon + [cms.PSet(type = cms.string('PixelFEDChanneledmNewDetSetVector'))]
+    mix = _pixelCommon
 ) 
 simSiStripDigis = cms.EDAlias(
     mix = cms.VPSet(
@@ -52,8 +52,8 @@
 from Configuration.Eras.Modifier_run3_common_cff import run3_common
 run3_common.toModify(simCastorDigis, mix = None)
 
-from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
-phase2_tracker.toModify(simSiPixelDigis, mix = _pixelCommon) 
+from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
+phase1Pixel.toModify(simSiPixelDigis, mix = _pixelCommon + [cms.PSet(type = cms.string('PixelFEDChanneledmNewDetSetVector'))])
 
 # no castor,pixel,strip digis in fastsim
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
diff --git a/SimGeneral/MixingModule/python/aliases_cfi.py b/SimGeneral/MixingModule/python/aliases_cfi.py
index e1ef3cceaf570..10e4c62a87d34 100644
--- a/SimGeneral/MixingModule/python/aliases_cfi.py
+++ b/SimGeneral/MixingModule/python/aliases_cfi.py
@@ -27,7 +27,7 @@
     cms.PSet(type = cms.string('PixelDigiSimLinkedmDetSetVector'))
 )
 simSiPixelDigis = cms.EDAlias(
-    mix = _pixelCommon + [cms.PSet(type = cms.string('PixelFEDChanneledmNewDetSetVector'))]
+    mix = _pixelCommon
 ) 
 simSiStripDigis = cms.EDAlias(
     mix = cms.VPSet(
@@ -83,8 +83,8 @@
 from Configuration.Eras.Modifier_phase2_hfnose_cff import phase2_hfnose
 (~phase2_hfnose).toModify(simHFNoseUnsuppressedDigis, mix = None)
 
-from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
-phase2_tracker.toModify(simSiPixelDigis, mix = _pixelCommon) 
+from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
+phase1Pixel.toModify(simSiPixelDigis, mix = _pixelCommon + [cms.PSet(type = cms.string('PixelFEDChanneledmNewDetSetVector'))])
 
 # no castor,pixel,strip digis in fastsim
 from Configuration.Eras.Modifier_fastSim_cff import fastSim
diff --git a/SimGeneral/MixingModule/python/digitizersCosmics_cfi.py b/SimGeneral/MixingModule/python/digitizersCosmics_cfi.py
index b81807992e094..9c1bce518f9bc 100644
--- a/SimGeneral/MixingModule/python/digitizersCosmics_cfi.py
+++ b/SimGeneral/MixingModule/python/digitizersCosmics_cfi.py
@@ -55,7 +55,9 @@
   )
 )
 
-
+from Configuration.Eras.Modifier_run3_common_cff import run3_common
+run3_common.toModify( theDigitizers, castor = None )
+run3_common.toModify( theDigitizersValid, castor = None )
 
 
 
diff --git a/SimGeneral/MixingModule/python/mix_2017_25ns_UltraLegacy_PoissonOOTPU_cfi.py b/SimGeneral/MixingModule/python/mix_2017_25ns_UltraLegacy_PoissonOOTPU_cfi.py
new file mode 100644
index 0000000000000..dbed0089735b1
--- /dev/null
+++ b/SimGeneral/MixingModule/python/mix_2017_25ns_UltraLegacy_PoissonOOTPU_cfi.py
@@ -0,0 +1,38 @@
+import FWCore.ParameterSet.Config as cms
+from SimGeneral.MixingModule.mix_probFunction_25ns_PoissonOOTPU_cfi import *
+mix.input.nbPileupEvents.probFunctionVariable = cms.vint32(
+    0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
+    10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+    20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+    30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+    40, 41, 42, 43, 44, 45, 46, 47, 48, 49,
+    50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
+    60, 61, 62, 63, 64, 65, 66, 67, 68, 69,
+    70, 71, 72, 73, 74, 75, 76, 77, 78, 79,
+    80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+    90, 91, 92, 93, 94, 95, 96, 97, 98
+    )
+
+mix.input.nbPileupEvents.probValue = cms.vdouble(
+    1.1840841518e-05, 3.46661037703e-05, 8.98772521472e-05, 7.47400487733e-05, 0.000123005176624,
+    0.000156501700614, 0.000154660478659, 0.000177496185603, 0.000324149805611, 0.000737524009713,
+    0.00140432980253, 0.00244424508696, 0.00380027898037, 0.00541093042612, 0.00768803501793,
+    0.010828224552, 0.0146608623707, 0.01887739113, 0.0228418813823, 0.0264817796874,
+    0.0294637401336, 0.0317960986171, 0.0336645950831, 0.0352638818387, 0.036869429333,
+    0.0382797316998, 0.039386705577, 0.0398389681346, 0.039646211131, 0.0388392805703,
+    0.0374195678161, 0.0355377892706, 0.0333383902828, 0.0308286549265, 0.0282914440969,
+    0.0257860718304, 0.02341635055, 0.0213126338243, 0.0195035612803, 0.0181079838989,
+    0.0171991315458, 0.0166377598339, 0.0166445341361, 0.0171943735369, 0.0181980997278,
+    0.0191339792146, 0.0198518804356, 0.0199714909193, 0.0194616474094, 0.0178626975229,
+    0.0153296785464, 0.0126789254325, 0.0100766041988, 0.00773867100481, 0.00592386091874,
+    0.00434706240169, 0.00310217013427, 0.00213213401899, 0.0013996000761, 0.000879148859271,
+    0.000540866009427, 0.000326115560156, 0.000193965828516, 0.000114607606623, 6.74262828734e-05,
+    3.97805301078e-05, 2.19948704638e-05, 9.72007976207e-06, 4.26179259146e-06, 2.80015581327e-06,
+    1.14675436465e-06, 2.52452411995e-07, 9.08394910044e-08, 1.14291987912e-08, 0.0,
+    0.0, 0.0, 0.0, 0.0, 0.0,
+    0.0, 0.0, 0.0, 0.0, 0.0,
+    0.0, 0.0, 0.0, 0.0, 0.0,
+    0.0, 0.0, 0.0, 0.0, 0.0,
+    0.0, 0.0, 0.0, 0.0
+    )
+
diff --git a/SimGeneral/NoiseGenerators/BuildFile.xml b/SimGeneral/NoiseGenerators/BuildFile.xml
index 96777f018f62c..fdd13f4caa2be 100644
--- a/SimGeneral/NoiseGenerators/BuildFile.xml
+++ b/SimGeneral/NoiseGenerators/BuildFile.xml
@@ -1,5 +1,6 @@
 <use   name="clhep"/>
 <use   name="gsl"/>
+<use   name="DataFormats/Math"/>
 <export>
   <lib   name="1"/>
 </export>
diff --git a/SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.h b/SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.h
index 9694361e8f084..392e1c4c8e114 100644
--- a/SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.h
+++ b/SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.h
@@ -16,65 +16,60 @@ Uses a Cholesky decomposition
 Any input array f is "noisified" with f += H*r
 where r is an array of random numbers
 
-The above matrix multiplication is expedited in the 
+The above matrix multiplication is expedited in the
 trivial cases of a purely diagonal or identity correlation matrix.
 */
 
 #include "DataFormats/Math/interface/Error.h"
-#include<vector>
+#include <vector>
 
 namespace CLHEP {
   class HepRandomEngine;
 }
 
-template<class M> 
-class CorrelatedNoisifier
-{
-   public:
+template <class M>
+class CorrelatedNoisifier {
+public:
+  typedef std::vector<double> VecDou;
 
-      typedef std::vector<double> VecDou ;
+  CorrelatedNoisifier(const M &symCorMat);  // correlation matrix
 
-      CorrelatedNoisifier( const M& symCorMat ); //correlation matrix
+  CorrelatedNoisifier(int *dummy, const M &cholDecMat);  // decomposition matrix
 
-      CorrelatedNoisifier( int* dummy, const M& cholDecMat ); //decomposition matrix
+  virtual ~CorrelatedNoisifier();
 
-      virtual ~CorrelatedNoisifier() ;
+  void resetCorrelationMatrix(const M &symCorMat);
 
-      void resetCorrelationMatrix( const M& symCorMat ) ;
+  void resetCholDecompMatrix(const M &cholMat);
 
-      void resetCholDecompMatrix( const M& cholMat ) ;
+  template <class T>
+  void noisify(T &frame,  // applies random noise to frame
+               CLHEP::HepRandomEngine *,
+               const VecDou *rangau = nullptr) const;  // use these
 
-      template<class T>
-      void noisify( T& frame ,  // applies random noise to frame
-                    CLHEP::HepRandomEngine*,
-		    const VecDou* rangau = nullptr ) const ; // use these 
+  const M &cholMat() const;  // return decomposition
 
-      const M& cholMat() const ; // return decomposition
+  const VecDou &vecgau() const;
 
-      const VecDou& vecgau() const ;
+private:
+  static const double k_precision;  // precision to which 0 & 1 are compared
 
-   private:
+  void init(const M &symCorMat);
 
-      static const double k_precision ; // precision to which 0 & 1 are compared
+  void initChol();
 
-      void init( const M& symCorMat ) ;
+  bool computeDecomposition(const M &symCorMat);
 
-      void initChol() ;
+  bool checkDecomposition(const M &symCorMat, M &HHtDiff) const;
 
-      bool computeDecomposition( const M& symCorMat ) ;
+  void checkOffDiagonal(const M &symCorMat);
 
-      bool checkDecomposition( const M& symCorMat ,
-			       M&       HHtDiff     ) const ;
+  mutable VecDou m_vecgau;
 
-      void checkOffDiagonal( const M& symCorMat ) ;
+  bool m_isDiagonal;
+  bool m_isIdentity;
 
-      mutable VecDou m_vecgau ;
-
-      bool m_isDiagonal ;
-      bool m_isIdentity ;
-
-      M m_H ;
+  M m_H;
 };
 
-
 #endif
diff --git a/SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.icc b/SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.icc
index b72872cd2776e..2e01059cf0fcc 100644
--- a/SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.icc
+++ b/SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.icc
@@ -1,216 +1,171 @@
-#include "SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.h"
 #include "FWCore/Utilities/interface/Exception.h"
+#include "SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.h"
 
 #include "CLHEP/Random/RandGaussQ.h"
 
-template<class M> 
-const double CorrelatedNoisifier<M>::k_precision ( 1.e-7 ) ;
+template <class M>
+const double CorrelatedNoisifier<M>::k_precision(1.e-7);
 
-template<class M> 
-CorrelatedNoisifier<M>::~CorrelatedNoisifier()
-{
-}
+template <class M>
+CorrelatedNoisifier<M>::~CorrelatedNoisifier() {}
 
-template<class M> 
-CorrelatedNoisifier<M>::CorrelatedNoisifier( const M& symCorMat ) :
-   m_H ( ROOT::Math::SMatrixIdentity() )
-{
-   init( symCorMat ) ;
+template <class M>
+CorrelatedNoisifier<M>::CorrelatedNoisifier(const M &symCorMat) : m_H(ROOT::Math::SMatrixIdentity()) {
+  init(symCorMat);
 }
 
-template<class M> 
-CorrelatedNoisifier<M>::CorrelatedNoisifier( int* dummy, const M& cholDecMat  ) :
-   m_H ( cholDecMat )
-{
-   initChol() ;
+template <class M>
+CorrelatedNoisifier<M>::CorrelatedNoisifier(int *dummy, const M &cholDecMat) : m_H(cholDecMat) {
+  initChol();
 }
 
-template<class M>
-void CorrelatedNoisifier<M>::initChol()
-{
-   M symCorMat ;
-   for ( unsigned int i = 0 ; i < m_H.kRows ; ++i ) 
-   {
-      for ( unsigned int j = 0 ; j < m_H.kRows ; ++j )
-      {
-	 double sum ( 0 ) ;
-	 for( unsigned int k ( 0 ) ; k != m_H.kRows ;++k )
-	 {
-	    const double hik  ( k>i ? 0 : m_H(i,k) ) ;
-	    const double htkj ( k>j ? 0 : m_H(k,j) ) ;
-	    sum += hik*htkj ;
-	 }
-	 symCorMat(i,j) = sum ;
+template <class M>
+void CorrelatedNoisifier<M>::initChol() {
+  M symCorMat;
+  for (unsigned int i = 0; i < m_H.kRows; ++i) {
+    for (unsigned int j = 0; j < m_H.kRows; ++j) {
+      double sum(0);
+      for (unsigned int k(0); k != m_H.kRows; ++k) {
+        const double hik(k > i ? 0 : m_H(i, k));
+        const double htkj(k > j ? 0 : m_H(k, j));
+        sum += hik * htkj;
       }
-   }
-   checkOffDiagonal( symCorMat );
+      symCorMat(i, j) = sum;
+    }
+  }
+  checkOffDiagonal(symCorMat);
 }
 
-template<class M>
-void CorrelatedNoisifier<M>::resetCorrelationMatrix( const M& symCorMat )
-{
-   m_H = ROOT::Math::SMatrixIdentity() ;
-   init( symCorMat ) ;
+template <class M>
+void CorrelatedNoisifier<M>::resetCorrelationMatrix(const M &symCorMat) {
+  m_H = ROOT::Math::SMatrixIdentity();
+  init(symCorMat);
 }
 
-template<class M>
-void CorrelatedNoisifier<M>::resetCholDecompMatrix( const M& cholDecMat )
-{
-   m_H = cholDecMat ;
-   initChol();
+template <class M>
+void CorrelatedNoisifier<M>::resetCholDecompMatrix(const M &cholDecMat) {
+  m_H = cholDecMat;
+  initChol();
 }
 
-template<class M>
-void CorrelatedNoisifier<M>::init( const M& symCorMat )
-{
-   checkOffDiagonal( symCorMat );
+template <class M>
+void CorrelatedNoisifier<M>::init(const M &symCorMat) {
+  checkOffDiagonal(symCorMat);
 
-   const bool okDecomp ( m_isIdentity ||
-			 computeDecomposition( symCorMat ) ) ;
+  const bool okDecomp(m_isIdentity || computeDecomposition(symCorMat));
 
-   if( !okDecomp ) throw cms::Exception("CorrelatedNoisifier")
-      << "Bad covariance matrix. " << symCorMat ;
+  if (!okDecomp)
+    throw cms::Exception("CorrelatedNoisifier") << "Bad covariance matrix. " << symCorMat;
 
-   M HHtDiff ;
-   const bool check ( checkDecomposition( symCorMat, HHtDiff ) ) ;
-   if( !check ) throw cms::Exception("CorrelatedNoisifier")
-      << "Decomposition failed, difference = " << HHtDiff ;
+  M HHtDiff;
+  const bool check(checkDecomposition(symCorMat, HHtDiff));
+  if (!check)
+    throw cms::Exception("CorrelatedNoisifier") << "Decomposition failed, difference = " << HHtDiff;
 }
 
-template<class M>
-void 
-CorrelatedNoisifier<M>::checkOffDiagonal( const M& symCorMat ) 
-{
-   m_isDiagonal = true ;
-   m_isIdentity = true ;
-
-   for ( unsigned int i = 0 ; i < m_H.kRows ; i++ ) 
-   {
-      if( symCorMat( i, i ) < 0. )
-	 throw cms::Exception("CorrelatedNoisifier") 
-	    << "Bad correlation matrix.  Negative diagonal";
-      if( m_isIdentity &&
-	  fabs( symCorMat( i, i ) - 1. ) > k_precision ) m_isIdentity = false ;
-      for ( unsigned int j = 0 ; j < i ; ++j ) 
-      {
-	 if( fabs( symCorMat( i, j ) ) > k_precision ) 
-	 { 
-	    m_isDiagonal = false ; 
-	    m_isIdentity = false;
-	    return ; 
-	 }
+template <class M>
+void CorrelatedNoisifier<M>::checkOffDiagonal(const M &symCorMat) {
+  m_isDiagonal = true;
+  m_isIdentity = true;
+
+  for (unsigned int i = 0; i < m_H.kRows; i++) {
+    if (symCorMat(i, i) < 0.)
+      throw cms::Exception("CorrelatedNoisifier") << "Bad correlation matrix.  Negative diagonal";
+    if (m_isIdentity && fabs(symCorMat(i, i) - 1.) > k_precision)
+      m_isIdentity = false;
+    for (unsigned int j = 0; j < i; ++j) {
+      if (fabs(symCorMat(i, j)) > k_precision) {
+        m_isDiagonal = false;
+        m_isIdentity = false;
+        return;
       }
-   }  
+    }
+  }
 }
 
-template<class M> 
-bool
-CorrelatedNoisifier<M>::computeDecomposition( const M& symCorMat )
-{
-   const double s00 = std::sqrt( symCorMat(0,0) ) ;
-
-   for ( unsigned int i = 0 ; i < m_H.kRows ; ++i ) 
-   {
-      m_H(i,0) = symCorMat(i,0)/s00 ;
-      if( 0 < i )
-      {
-
-	 if( !m_isDiagonal )
-	 {
-	    for ( unsigned int j = 1 ; j < i ; ++j )
-	    {
-	       double sum ( symCorMat(i,j) ) ;
-	       for ( unsigned int k = 0 ; k < j ; ++k ) sum -= m_H(i,k)*m_H(j,k) ;
-	       m_H(i,j) = sum/m_H(j,j) ;
-	    }
-	 }
-
-	 double hii = symCorMat(i,i) ;
-	 for ( unsigned int j = 0 ; j < i ; ++j ) 
-	 {
-	    const double hij ( m_H(i,j) ) ;
-	    hii -= hij*hij ;
-	 }
-
-	 if( hii <= k_precision ) return false ; // protect sqrt in next line
-
-	 m_H(i,i) = sqrt( hii ) ;
+template <class M>
+bool CorrelatedNoisifier<M>::computeDecomposition(const M &symCorMat) {
+  const double s00 = std::sqrt(symCorMat(0, 0));
+
+  for (unsigned int i = 0; i < m_H.kRows; ++i) {
+    m_H(i, 0) = symCorMat(i, 0) / s00;
+    if (0 < i) {
+      if (!m_isDiagonal) {
+        for (unsigned int j = 1; j < i; ++j) {
+          double sum(symCorMat(i, j));
+          for (unsigned int k = 0; k < j; ++k)
+            sum -= m_H(i, k) * m_H(j, k);
+          m_H(i, j) = sum / m_H(j, j);
+        }
       }
-   }
-   return true ;
-}
 
-template<class M> 
-bool 
-CorrelatedNoisifier<M>::checkDecomposition( const M& symCorMat ,
-					    M&       HHtDiff     ) const
-{
-   bool equal ( true ) ;
-   for ( unsigned int i = 0 ; i < m_H.kRows ; ++i ) 
-   {
-      for ( unsigned int j = 0 ; j < m_H.kRows ; ++j )
-      {
-	 double sum ( 0 ) ;
-	 for( unsigned int k ( 0 ) ; k != m_H.kRows ;++k )
-	 {
-	    const double hik  ( k>i ? 0 : m_H(i,k) ) ;
-	    const double htkj ( k>j ? 0 : m_H(k,j) ) ;
-	    sum += hik*htkj ;
-	 }
-	 const double diff ( symCorMat(i,j) - sum ) ;
-	 HHtDiff(i,j) = diff ;
-	 equal = equal && ( fabs( diff ) < k_precision ) ;
+      double hii = symCorMat(i, i);
+      for (unsigned int j = 0; j < i; ++j) {
+        const double hij(m_H(i, j));
+        hii -= hij * hij;
       }
-   }
-   return equal ;
+
+      if (hii <= k_precision)
+        return false;  // protect sqrt in next line
+
+      m_H(i, i) = sqrt(hii);
+    }
+  }
+  return true;
 }
 
-template<class M> 
-template<class T>
-void 
-CorrelatedNoisifier<M>::noisify( 
-   T& frame ,
-   CLHEP::HepRandomEngine* engine,
-   const typename CorrelatedNoisifier<M>::VecDou* rangau ) const
-{
-   if( (unsigned int) frame.size() !=
-       (unsigned int) m_H.kRows        ) 
-      throw cms::Exception("Configuration")
-	 << "CorrelatedNoisifier::noisify(frame) was passed wrong size frame object" ;
-
-   if( nullptr != rangau )
-   {
-      assert( m_H.kRows == rangau->size() ) ;
-      m_vecgau = *rangau ;
-   }
-   else
-   {
-      if( m_H.kRows != m_vecgau.size() )
-	 m_vecgau = VecDou( m_H.kRows, (double) 0.0 ) ;
-      CLHEP::RandGaussQ::shootArray(engine, m_H.kRows, &m_vecgau.front() ) ;
-   }
-
-   for( unsigned int i ( 0 ) ; i < m_H.kRows ; ++i )
-   { 
-      frame[i] += ( m_isIdentity ? m_vecgau[i] : m_H(i,i)*m_vecgau[i] ) ;
-      if( !m_isDiagonal ) 
-      {
-	 for( unsigned int j = 0; j < i; ++j ) 
-	    frame[i] += m_H(j,i)*m_vecgau[j] ;
+template <class M>
+bool CorrelatedNoisifier<M>::checkDecomposition(const M &symCorMat, M &HHtDiff) const {
+  bool equal(true);
+  for (unsigned int i = 0; i < m_H.kRows; ++i) {
+    for (unsigned int j = 0; j < m_H.kRows; ++j) {
+      double sum(0);
+      for (unsigned int k(0); k != m_H.kRows; ++k) {
+        const double hik(k > i ? 0 : m_H(i, k));
+        const double htkj(k > j ? 0 : m_H(k, j));
+        sum += hik * htkj;
       }
-   }
+      const double diff(symCorMat(i, j) - sum);
+      HHtDiff(i, j) = diff;
+      equal = equal && (fabs(diff) < k_precision);
+    }
+  }
+  return equal;
+}
+
+template <class M>
+template <class T>
+void CorrelatedNoisifier<M>::noisify(T &frame,
+                                     CLHEP::HepRandomEngine *engine,
+                                     const typename CorrelatedNoisifier<M>::VecDou *rangau) const {
+  if ((unsigned int)frame.size() != (unsigned int)m_H.kRows)
+    throw cms::Exception("Configuration") << "CorrelatedNoisifier::noisify(frame) was passed wrong size frame "
+                                             "object";
+
+  if (nullptr != rangau) {
+    assert(m_H.kRows == rangau->size());
+    m_vecgau = *rangau;
+  } else {
+    if (m_H.kRows != m_vecgau.size())
+      m_vecgau = VecDou(m_H.kRows, (double)0.0);
+    CLHEP::RandGaussQ::shootArray(engine, m_H.kRows, &m_vecgau.front());
+  }
+
+  for (unsigned int i(0); i < m_H.kRows; ++i) {
+    frame[i] += (m_isIdentity ? m_vecgau[i] : m_H(i, i) * m_vecgau[i]);
+    if (!m_isDiagonal) {
+      for (unsigned int j = 0; j < i; ++j)
+        frame[i] += m_H(j, i) * m_vecgau[j];
+    }
+  }
 }
 
-template<class M> 
-const M&
-CorrelatedNoisifier<M>::cholMat() const
-{
-   return m_H ;
+template <class M>
+const M &CorrelatedNoisifier<M>::cholMat() const {
+  return m_H;
 }
 
-template<class M> 
-const typename CorrelatedNoisifier<M>::VecDou& 
-CorrelatedNoisifier<M>::vecgau() const
-{
-   return m_vecgau ;
+template <class M>
+const typename CorrelatedNoisifier<M>::VecDou &CorrelatedNoisifier<M>::vecgau() const {
+  return m_vecgau;
 }
diff --git a/SimGeneral/NoiseGenerators/interface/GaussianTailNoiseGenerator.h b/SimGeneral/NoiseGenerators/interface/GaussianTailNoiseGenerator.h
index 45610adaebcd5..001872dd13caf 100644
--- a/SimGeneral/NoiseGenerators/interface/GaussianTailNoiseGenerator.h
+++ b/SimGeneral/NoiseGenerators/interface/GaussianTailNoiseGenerator.h
@@ -6,59 +6,50 @@
  * - is larger than threshold*noiseRMS. <BR>
  *
  * Initial author : Veronique Lefebure 08.10.98 <BR>
- *                  according to the FORTRAN code tgreset.F from Pascal Vanlaer <BR>
- * Modified by C. Delaere 01.10.09 <BR>
+ *                  according to the FORTRAN code tgreset.F from Pascal Vanlaer
+ * <BR> Modified by C. Delaere 01.10.09 <BR>
  *
  * Fills in a map \< channel number, generated noise \>
  */
 #ifndef GaussianTailNoiseGenerator_h
 #define GaussianTailNoiseGenerator_h
 
-#include <vector>
 #include <map>
+#include <vector>
 
 namespace CLHEP {
   class HepRandomEngine;
 }
 
 class GaussianTailNoiseGenerator {
-
 public:
-
   GaussianTailNoiseGenerator();
 
   // Compiler-generated destructor, copy c'tor, and assignment are all
   // correct.
 
-  void generate(int NumberOfchannels, 
-		float threshold,
-		float noiseRMS, 
-		std::map<int,float>& theMap,
-                CLHEP::HepRandomEngine*);
-
-  void generate(int NumberOfchannels, 
-		float threshold,
-		float noiseRMS, 
-		std::vector<std::pair<int,float> >&,
-                CLHEP::HepRandomEngine*);
-/*
-  void generateRaw(int NumberOfchannels, 
-		   float noiseRMS, 
-		   std::vector<std::pair<int,float> >&,
-                   CLHEP::HepRandomEngine*);
-*/
-  void generateRaw(float noiseRMS,
-		   std::vector<double>&,
-                   CLHEP::HepRandomEngine*);
+  void generate(
+      int NumberOfchannels, float threshold, float noiseRMS, std::map<int, float> &theMap, CLHEP::HepRandomEngine *);
+
+  void generate(int NumberOfchannels,
+                float threshold,
+                float noiseRMS,
+                std::vector<std::pair<int, float>> &,
+                CLHEP::HepRandomEngine *);
+  /*
+    void generateRaw(int NumberOfchannels,
+                     float noiseRMS,
+                     std::vector<std::pair<int,float> >&,
+                     CLHEP::HepRandomEngine*);
+  */
+  void generateRaw(float noiseRMS, std::vector<double> &, CLHEP::HepRandomEngine *);
 
 protected:
+  int *getRandomChannels(int, int, CLHEP::HepRandomEngine *);
 
-  int* getRandomChannels(int, int, CLHEP::HepRandomEngine*);
-
-  double generate_gaussian_tail(const double,const double, CLHEP::HepRandomEngine*);
+  double generate_gaussian_tail(const double, const double, CLHEP::HepRandomEngine *);
 
 private:
-
   int channel512_[512];
   int channel768_[768];
 };
diff --git a/SimGeneral/NoiseGenerators/src/GaussianTailNoiseGenerator.cc b/SimGeneral/NoiseGenerators/src/GaussianTailNoiseGenerator.cc
index 5ce885a020274..4bcb271b07ea6 100644
--- a/SimGeneral/NoiseGenerators/src/GaussianTailNoiseGenerator.cc
+++ b/SimGeneral/NoiseGenerators/src/GaussianTailNoiseGenerator.cc
@@ -1,7 +1,7 @@
-#include "SimGeneral/NoiseGenerators/interface/GaussianTailNoiseGenerator.h"
-#include "CLHEP/Random/RandPoissonQ.h"
-#include "CLHEP/Random/RandGaussQ.h"
 #include "CLHEP/Random/RandFlat.h"
+#include "CLHEP/Random/RandGaussQ.h"
+#include "CLHEP/Random/RandPoissonQ.h"
+#include "SimGeneral/NoiseGenerators/interface/GaussianTailNoiseGenerator.h"
 
 #include <cmath>
 
@@ -11,24 +11,28 @@
 GaussianTailNoiseGenerator::GaussianTailNoiseGenerator() {
   // we have two cases: 512 and 768 channels
   // other cases are not allowed so far (performances issue)
-  for(unsigned int i=0;i<512;++i) channel512_[i]=i;
-  for(unsigned int i=0;i<768;++i) channel768_[i]=i;
+  for (unsigned int i = 0; i < 512; ++i)
+    channel512_[i] = i;
+  for (unsigned int i = 0; i < 768; ++i)
+    channel768_[i] = i;
 }
 
 // this version is used by pixel
-void GaussianTailNoiseGenerator::generate(int NumberOfchannels, 
-					  float threshold, 
-					  float noiseRMS, 
-					  std::map<int,float, std::less<int> >& theMap,
-                                          CLHEP::HepRandomEngine* engine ) {
-
-   // Gaussian tail probability
+void GaussianTailNoiseGenerator::generate(int NumberOfchannels,
+                                          float threshold,
+                                          float noiseRMS,
+                                          std::map<int, float, std::less<int>> &theMap,
+                                          CLHEP::HepRandomEngine *engine) {
+  // Gaussian tail probability
   gsl_sf_result result;
   int status = gsl_sf_erf_Q_e(threshold, &result);
 
-  if (status != 0) std::cerr<<"GaussianTailNoiseGenerator::could not compute gaussian tail probability for the threshold chosen"<<std::endl;
+  if (status != 0)
+    std::cerr << "GaussianTailNoiseGenerator::could not compute gaussian tail "
+                 "probability for the threshold chosen"
+              << std::endl;
 
-  float probabilityLeft = result.val;  
+  float probabilityLeft = result.val;
   float meanNumberOfNoisyChannels = probabilityLeft * NumberOfchannels;
 
   CLHEP::RandPoissonQ randPoissonQ(*engine, meanNumberOfNoisyChannels);
@@ -36,43 +40,45 @@ void GaussianTailNoiseGenerator::generate(int NumberOfchannels,
 
   float lowLimit = threshold * noiseRMS;
   for (int i = 0; i < numberOfNoisyChannels; i++) {
-
-    // Find a random channel number    
+    // Find a random channel number
     int theChannelNumber = (int)CLHEP::RandFlat::shoot(engine, NumberOfchannels);
 
     // Find random noise value
     double noise = generate_gaussian_tail(lowLimit, noiseRMS, engine);
-              
+
     // Fill in map
     theMap[theChannelNumber] = noise;
-    
   }
 }
 
 // this version is used by strips
-void GaussianTailNoiseGenerator::generate(int NumberOfchannels, 
-					  float threshold, 
-					  float noiseRMS, 
-					  std::vector<std::pair<int,float> > &theVector,
-                                          CLHEP::HepRandomEngine* engine ) {
+void GaussianTailNoiseGenerator::generate(int NumberOfchannels,
+                                          float threshold,
+                                          float noiseRMS,
+                                          std::vector<std::pair<int, float>> &theVector,
+                                          CLHEP::HepRandomEngine *engine) {
   // Compute number of channels with noise above threshold
   // Gaussian tail probability
   gsl_sf_result result;
   int status = gsl_sf_erf_Q_e(threshold, &result);
-  if (status != 0) std::cerr<<"GaussianTailNoiseGenerator::could not compute gaussian tail probability for the threshold chosen"<<std::endl;
-  double probabilityLeft = result.val;  
+  if (status != 0)
+    std::cerr << "GaussianTailNoiseGenerator::could not compute gaussian tail "
+                 "probability for the threshold chosen"
+              << std::endl;
+  double probabilityLeft = result.val;
   double meanNumberOfNoisyChannels = probabilityLeft * NumberOfchannels;
 
   CLHEP::RandPoissonQ randPoissonQ(*engine, meanNumberOfNoisyChannels);
   int numberOfNoisyChannels = randPoissonQ.fire();
 
-  if(numberOfNoisyChannels>NumberOfchannels) numberOfNoisyChannels=NumberOfchannels;
+  if (numberOfNoisyChannels > NumberOfchannels)
+    numberOfNoisyChannels = NumberOfchannels;
 
   // Compute the list of noisy channels
   theVector.reserve(numberOfNoisyChannels);
   float lowLimit = threshold * noiseRMS;
-  int*  channels = getRandomChannels(numberOfNoisyChannels,NumberOfchannels, engine);
-  
+  int *channels = getRandomChannels(numberOfNoisyChannels, NumberOfchannels, engine);
+
   for (int i = 0; i < numberOfNoisyChannels; i++) {
     // Find random noise value
     double noise = generate_gaussian_tail(lowLimit, noiseRMS, engine);
@@ -83,10 +89,10 @@ void GaussianTailNoiseGenerator::generate(int NumberOfchannels,
 
 /*
 // used by strips in VR mode
-void GaussianTailNoiseGenerator::generateRaw(int NumberOfchannels, 
-					     float noiseRMS, 
-					     std::vector<std::pair<int,float> > &theVector,
-                                             CLHEP::HepRandomEngine* engine ) {
+void GaussianTailNoiseGenerator::generateRaw(int NumberOfchannels,
+                                             float noiseRMS,
+                                             std::vector<std::pair<int,float> >
+&theVector, CLHEP::HepRandomEngine* engine ) {
   theVector.reserve(NumberOfchannels);
   for (int i = 0; i < NumberOfchannels; i++) {
     // Find random noise value
@@ -100,26 +106,30 @@ void GaussianTailNoiseGenerator::generateRaw(int NumberOfchannels,
 // used by strips in VR mode
 void GaussianTailNoiseGenerator::generateRaw(float noiseRMS,
                                              std::vector<double> &theVector,
-                                             CLHEP::HepRandomEngine* engine ) {
+                                             CLHEP::HepRandomEngine *engine) {
   // it was shown that a complex approach, inspired from the ZS case,
-  // does not allow to gain much. 
+  // does not allow to gain much.
   // A cut at 2 sigmas only saves 25% of the processing time, while the cost
   // in terms of meaning is huge.
   // We therefore use here the trivial approach (as in the early 2XX cycle)
   unsigned int numberOfchannels = theVector.size();
   for (unsigned int i = 0; i < numberOfchannels; ++i) {
-    if(theVector[i]==0) theVector[i] = CLHEP::RandGaussQ::shoot(engine, 0., noiseRMS);
+    if (theVector[i] == 0)
+      theVector[i] = CLHEP::RandGaussQ::shoot(engine, 0., noiseRMS);
   }
 }
 
-int*
-GaussianTailNoiseGenerator::getRandomChannels(int numberOfNoisyChannels, int numberOfchannels, CLHEP::HepRandomEngine* engine) {
-  if(numberOfNoisyChannels>numberOfchannels) numberOfNoisyChannels = numberOfchannels;
-  int* array = channel512_;
-  if(numberOfchannels==768) array = channel768_;
+int *GaussianTailNoiseGenerator::getRandomChannels(int numberOfNoisyChannels,
+                                                   int numberOfchannels,
+                                                   CLHEP::HepRandomEngine *engine) {
+  if (numberOfNoisyChannels > numberOfchannels)
+    numberOfNoisyChannels = numberOfchannels;
+  int *array = channel512_;
+  if (numberOfchannels == 768)
+    array = channel768_;
   int theChannelNumber;
-  for(int j=0;j<numberOfNoisyChannels;++j) {
-    theChannelNumber = (int)CLHEP::RandFlat::shoot(engine, numberOfchannels-j) + j;
+  for (int j = 0; j < numberOfNoisyChannels; ++j) {
+    theChannelNumber = (int)CLHEP::RandFlat::shoot(engine, numberOfchannels - j) + j;
     // swap the two array elements... this is optimized by the compiler
     int b = array[j];
     array[j] = array[theChannelNumber];
@@ -128,45 +138,43 @@ GaussianTailNoiseGenerator::getRandomChannels(int numberOfNoisyChannels, int num
   return array;
 }
 
-double
-GaussianTailNoiseGenerator::generate_gaussian_tail(const double a, const double sigma, CLHEP::HepRandomEngine* engine){
+double GaussianTailNoiseGenerator::generate_gaussian_tail(const double a,
+                                                          const double sigma,
+                                                          CLHEP::HepRandomEngine *engine) {
   /* Returns a gaussian random variable larger than a
    * This implementation does one-sided upper-tailed deviates.
    */
-  
-  double s = a/sigma;
-  
-  if (s < 1){
+
+  double s = a / sigma;
+
+  if (s < 1) {
     /*
       For small s, use a direct rejection method. The limit s < 1
-      can be adjusted to optimise the overall efficiency 
+      can be adjusted to optimise the overall efficiency
     */
     double x;
-    
-    do{
+
+    do {
       x = CLHEP::RandGaussQ::shoot(engine, 0., 1.0);
-    }
-    while (x < s);
+    } while (x < s);
     return x * sigma;
-    
-  }else{
-    
+
+  } else {
     /* Use the "supertail" deviates from the last two steps
      * of Marsaglia's rectangle-wedge-tail method, as described
      * in Knuth, v2, 3rd ed, pp 123-128.  (See also exercise 11, p139,
      * and the solution, p586.)
      */
-    
+
     double u, v, x;
-    
-    do{
+
+    do {
       u = CLHEP::RandFlat::shoot(engine);
-      do{
-	v = CLHEP::RandFlat::shoot(engine);
-      }while (v == 0.0);
+      do {
+        v = CLHEP::RandFlat::shoot(engine);
+      } while (v == 0.0);
       x = sqrt(s * s - 2 * log(v));
-    }
-    while (x * u > s);
+    } while (x * u > s);
     return x * sigma;
   }
 }
diff --git a/SimGeneral/NoiseGenerators/test/CorrelatedNoisifierTest.cpp b/SimGeneral/NoiseGenerators/test/CorrelatedNoisifierTest.cpp
index 08efb0c46fd4f..60eb5da85a75c 100644
--- a/SimGeneral/NoiseGenerators/test/CorrelatedNoisifierTest.cpp
+++ b/SimGeneral/NoiseGenerators/test/CorrelatedNoisifierTest.cpp
@@ -1,7 +1,7 @@
+#include "CLHEP/Random/JamesRandom.h"
+#include "CommonTools/Statistics/interface/AutocorrelationAnalyzer.h"
 #include "SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.h"
 #include "SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.icc"
-#include "CommonTools/Statistics/interface/AutocorrelationAnalyzer.h"
-#include "CLHEP/Random/JamesRandom.h"
 
 namespace CLHEP {
   class HepRandomEngine;
@@ -9,85 +9,80 @@ namespace CLHEP {
 
 typedef math::ErrorD<10>::type MyMat;
 
-template class CorrelatedNoisifier< MyMat > ;
-
-template
-void
-CorrelatedNoisifier< MyMat >::noisify(std::vector<double>&,
-                                      CLHEP::HepRandomEngine*,
-				      const std::vector<double>*) const ;
-
-int main()
-{
-   math::ErrorD<10>::type input;
-   for (int k = 0; k < 10; k++) 
-   {
-      for (int kk = k; kk < 10; kk++) 
-      {
-	 input(k,kk) =
-	    kk == k ? 1
-	    : kk == k+1 ? 0.67
-	    : kk == k+2 ? 0.53
-	    : kk == k+3 ? 0.44
-	    : kk == k+4 ? 0.39
-	    : kk == k+5 ? 0.36
-	    : kk == k+6 ? 0.38
-	    : kk == k+7 ? 0.35
-	    : kk == k+8 ? 0.36
-	    : kk == k+9 ? 0.32
-	    : 0.;
+template class CorrelatedNoisifier<MyMat>;
+
+template void CorrelatedNoisifier<MyMat>::noisify(std::vector<double> &,
+                                                  CLHEP::HepRandomEngine *,
+                                                  const std::vector<double> *) const;
+
+int main() {
+  math::ErrorD<10>::type input;
+  for (int k = 0; k < 10; k++) {
+    for (int kk = k; kk < 10; kk++) {
+      input(k, kk) =
+          kk == k
+              ? 1
+              : kk == k + 1
+                    ? 0.67
+                    : kk == k + 2
+                          ? 0.53
+                          : kk == k + 3
+                                ? 0.44
+                                : kk == k + 4
+                                      ? 0.39
+                                      : kk == k + 5
+                                            ? 0.36
+                                            : kk == k + 6
+                                                  ? 0.38
+                                                  : kk == k + 7 ? 0.35 : kk == k + 8 ? 0.36 : kk == k + 9 ? 0.32 : 0.;
+    }
+  }
+  CLHEP::HepJamesRandom engine;
+
+  typedef math::ErrorD<10>::type MatType;
+  typedef CorrelatedNoisifier<MatType> Noisifier;
+
+  MatType chol;
+
+  for (unsigned int itry(0); itry != 2; ++itry) {
+    //      Noisifier noisifier ( input, &engine ) ;
+    Noisifier noisifier(0 == itry ? Noisifier(input) : Noisifier(nullptr, chol));
+
+    if (0 == itry)
+      chol = noisifier.cholMat();
+
+    AutocorrelationAnalyzer analyzer(10);
+
+    const unsigned int nTotal = 1000000;
+    for (unsigned int i = 0; i < nTotal; ++i) {
+      std::vector<double> samples(10);
+      noisifier.noisify(samples, &engine);
+      analyzer.analyze(samples);
+    }
+
+    double big(-999);
+    math::ErrorD<10>::type ratdif;
+    for (int k = 0; k < 10; k++) {
+      for (int kk = k; kk < 10; kk++) {
+        const double diff(input(k, kk) - analyzer.correlation(k, kk));
+        ratdif(k, kk) = diff / input(k, kk);
+        if (fabs(ratdif(k, kk)) > big)
+          big = fabs(ratdif(k, kk));
       }
-   }
-   CLHEP::HepJamesRandom  engine;
+    }
 
-   typedef math::ErrorD<10>::type MatType ;
-   typedef CorrelatedNoisifier<MatType> Noisifier ;   
+    std::cout << "In " << nTotal << " trials, the biggest fractional deviation\n"
+              << "of observed correlations from input correlations =" << big << std::endl;
 
-   MatType chol ;
+    std::cout << std::endl
+              << "Initial correlations:"
+              << "\n"
+              << input << std::endl;
+    ;
 
-   for( unsigned int itry ( 0 ) ; itry != 2 ; ++itry )
-   {
-//      Noisifier noisifier ( input, &engine ) ;
-      Noisifier noisifier ( 0 == itry ?
-			       Noisifier(input) :
-				  Noisifier( nullptr, chol ) );
-
-      if( 0 == itry ) chol = noisifier.cholMat() ;
-
-      AutocorrelationAnalyzer analyzer(10);
-
-      const unsigned int nTotal = 1000000;
-      for( unsigned int i=0; i<nTotal; ++i ) 
-      {
-	 std::vector<double> samples(10);
-	 noisifier.noisify(samples, &engine);
-	 analyzer.analyze(samples);
-      }
+    std::cout << analyzer << std::endl;
 
-      double big ( -999 ) ;
-      math::ErrorD<10>::type ratdif ;
-      for (int k = 0; k < 10; k++) 
-      {
-	 for (int kk = k; kk < 10; kk++) 
-	 {
-	    const double diff ( input(k,kk)-analyzer.correlation(k,kk) ) ;
-	    ratdif(k,kk) = diff/input(k,kk) ;
-	    if( fabs( ratdif(k,kk) ) > big ) big = fabs( ratdif(k,kk) ) ;
-	 }
-      }
-
-      std::cout<<"In "<<nTotal<<" trials, the biggest fractional deviation\n"
-	       <<"of observed correlations from input correlations ="
-	       <<big<<std::endl ;
-
-      std::cout << std::endl << "Initial correlations:" << "\n" 
-		<< input << std::endl;;
-
-      std::cout << analyzer << std::endl;
-
-      std::cout<< ratdif<<std::endl;
-      std::cout << std::endl << "\nSQUARE of initial matrix:\n" << input*input<<std::endl ;
-   }
+    std::cout << ratdif << std::endl;
+    std::cout << std::endl << "\nSQUARE of initial matrix:\n" << input * input << std::endl;
+  }
 }
-
-
diff --git a/SimGeneral/NoiseGenerators/test/GaussianTailNoiseGeneratorTest.cc b/SimGeneral/NoiseGenerators/test/GaussianTailNoiseGeneratorTest.cc
index 137b1bbd1c671..ac9e783a71096 100644
--- a/SimGeneral/NoiseGenerators/test/GaussianTailNoiseGeneratorTest.cc
+++ b/SimGeneral/NoiseGenerators/test/GaussianTailNoiseGeneratorTest.cc
@@ -1,8 +1,8 @@
 // system include files
 #include <memory>
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -10,98 +10,88 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 #include "FWCore/Utilities/interface/Exception.h"
+#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 
 #include "SimGeneral/NoiseGenerators/interface/GaussianTailNoiseGenerator.h"
 
-#include <TROOT.h>
 #include <TFile.h>
 #include <TH1F.h>
+#include <TROOT.h>
 
 class GaussianTailNoiseGeneratorTest : public edm::EDAnalyzer {
 public:
-  explicit GaussianTailNoiseGeneratorTest(const edm::ParameterSet&);
+  explicit GaussianTailNoiseGeneratorTest(const edm::ParameterSet &);
   ~GaussianTailNoiseGeneratorTest() override;
 
 private:
-  void beginJob() override ;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void endJob() override ;
+  void beginJob() override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
   // ----------member data ---------------------------
   std::string filename_;
-  TFile* hFile;
-  TH1F* randNumber;
-  GaussianTailNoiseGenerator* genNoise;
+  TFile *hFile;
+  TH1F *randNumber;
+  GaussianTailNoiseGenerator *genNoise;
 };
 
 namespace CLHEP {
   class HepRandomEngine;
 }
 
-GaussianTailNoiseGeneratorTest::GaussianTailNoiseGeneratorTest(const edm::ParameterSet& iConfig):
-  filename_(iConfig.getParameter<std::string>("FileName"))
-{
-   //now do what ever initialization is needed
+GaussianTailNoiseGeneratorTest::GaussianTailNoiseGeneratorTest(const edm::ParameterSet &iConfig)
+    : filename_(iConfig.getParameter<std::string>("FileName")) {
+  // now do what ever initialization is needed
   edm::Service<edm::RandomNumberGenerator> rng;
-  if ( ! rng.isAvailable()) {
-    throw cms::Exception("Configuration")
-      << "GaussianTailNoiseGeneratorTest requires the RandomNumberGeneratorService\n"
-      "which is not present in the configuration file.  You must add the service\n"
-      "in the configuration file or remove the modules that require it.";
+  if (!rng.isAvailable()) {
+    throw cms::Exception("Configuration") << "GaussianTailNoiseGeneratorTest requires the "
+                                             "RandomNumberGeneratorService\n"
+                                             "which is not present in the configuration file.  You must add the "
+                                             "service\n"
+                                             "in the configuration file or remove the modules that require it.";
   }
   genNoise = new GaussianTailNoiseGenerator();
 }
 
-
-GaussianTailNoiseGeneratorTest::~GaussianTailNoiseGeneratorTest()
-{
-  delete genNoise;
-}
-
+GaussianTailNoiseGeneratorTest::~GaussianTailNoiseGeneratorTest() { delete genNoise; }
 
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-GaussianTailNoiseGeneratorTest::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-  
+void GaussianTailNoiseGeneratorTest::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   float threshold = 2.;
   int numStrips = 512;
-  float noiseRMS = 5*250;
+  float noiseRMS = 5 * 250;
 
-  std::vector<std::pair<int,float> > generatedNoise;
+  std::vector<std::pair<int, float>> generatedNoise;
 
   edm::Service<edm::RandomNumberGenerator> rng;
-  genNoise->generate(numStrips,threshold,noiseRMS,generatedNoise, &rng->getEngine(iEvent.streamID()));
+  genNoise->generate(numStrips, threshold, noiseRMS, generatedNoise, &rng->getEngine(iEvent.streamID()));
 
-  typedef std::vector<std::pair<int,float> >::const_iterator VI;
+  typedef std::vector<std::pair<int, float>>::const_iterator VI;
 
-  for(VI p = generatedNoise.begin(); p != generatedNoise.end(); p++){
+  for (VI p = generatedNoise.begin(); p != generatedNoise.end(); p++) {
     randNumber->Fill((*p).second);
   }
-
 }
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-GaussianTailNoiseGeneratorTest::beginJob()
-{
-  hFile = new TFile (filename_.c_str(), "RECREATE" );
-  randNumber = new TH1F("randNumber","Random Number Distribution",200,2000,6000); 
+// ------------ method called once each job just before starting event loop
+// ------------
+void GaussianTailNoiseGeneratorTest::beginJob() {
+  hFile = new TFile(filename_.c_str(), "RECREATE");
+  randNumber = new TH1F("randNumber", "Random Number Distribution", 200, 2000, 6000);
 }
 
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-GaussianTailNoiseGeneratorTest::endJob(){
+// ------------ method called once each job just after ending the event loop
+// ------------
+void GaussianTailNoiseGeneratorTest::endJob() {
   hFile->Write();
   hFile->Close();
-  
+
   return;
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(GaussianTailNoiseGeneratorTest);
diff --git a/SimGeneral/PileupInformation/interface/PileupInformation.h b/SimGeneral/PileupInformation/interface/PileupInformation.h
old mode 100755
new mode 100644
index 13a9c342a0057..fa9f222309b27
--- a/SimGeneral/PileupInformation/interface/PileupInformation.h
+++ b/SimGeneral/PileupInformation/interface/PileupInformation.h
@@ -25,57 +25,47 @@
 
 #include "SimGeneral/TrackingAnalysis/interface/EncodedTruthId.h"
 
-class PileupInformation : public edm::stream::EDProducer<>
-{
-
+class PileupInformation : public edm::stream::EDProducer<> {
 public:
-
-    explicit PileupInformation( const edm::ParameterSet & );
+  explicit PileupInformation(const edm::ParameterSet &);
 
 private:
-
-    void produce( edm::Event &, const edm::EventSetup & ) override;
-
-    edm::ParameterSet conf_;
-
-    typedef std::map<EncodedEventId, unsigned int> EncodedEventIdToIndex;
-    typedef std::map< int, int > myindex;
-    myindex event_index_;
-
-    std::vector<float> zpositions;
-    std::vector<float> sumpT_lowpT;
-    std::vector<float> sumpT_highpT;
-    std::vector<int> ntrks_lowpT;
-    std::vector<int> ntrks_highpT;
-
-
-    double                   distanceCut_;
-    double                   volumeRadius_;
-    double                   volumeZ_;
-    double                   pTcut_1_;
-    double                   pTcut_2_;
-    bool isPreMixed_;
-
-
-    edm::EDGetTokenT<TrackingParticleCollection>     trackingTruthT_;
-    edm::EDGetTokenT<TrackingVertexCollection>     trackingTruthV_;
-    edm::EDGetTokenT<PileupMixingContent>            PileupInfoLabel_;
-    edm::EDGetTokenT<int> bunchSpacingToken_;
-    edm::EDGetTokenT<std::vector<PileupSummaryInfo> > pileupSummaryToken_;
-    edm::EDGetTokenT<PileupVertexContent>            PileupVtxLabel_;
-
-    bool LookAtTrackingTruth_ ;
-
-    bool saveVtxTimes_;
-
-    std::string MessageCategory_;
-    //std::string simHitLabel_;
-    //std::unique_ptr<MixCollection<SimTrack> >   simTracks_;
-    //std::unique_ptr<MixCollection<SimVertex> >  simVertexes_;
-
-
-
+  void produce(edm::Event &, const edm::EventSetup &) override;
+
+  edm::ParameterSet conf_;
+
+  typedef std::map<EncodedEventId, unsigned int> EncodedEventIdToIndex;
+  typedef std::map<int, int> myindex;
+  myindex event_index_;
+
+  std::vector<float> zpositions;
+  std::vector<float> sumpT_lowpT;
+  std::vector<float> sumpT_highpT;
+  std::vector<int> ntrks_lowpT;
+  std::vector<int> ntrks_highpT;
+
+  double distanceCut_;
+  double volumeRadius_;
+  double volumeZ_;
+  double pTcut_1_;
+  double pTcut_2_;
+  bool isPreMixed_;
+
+  edm::EDGetTokenT<TrackingParticleCollection> trackingTruthT_;
+  edm::EDGetTokenT<TrackingVertexCollection> trackingTruthV_;
+  edm::EDGetTokenT<PileupMixingContent> PileupInfoLabel_;
+  edm::EDGetTokenT<int> bunchSpacingToken_;
+  edm::EDGetTokenT<std::vector<PileupSummaryInfo> > pileupSummaryToken_;
+  edm::EDGetTokenT<PileupVertexContent> PileupVtxLabel_;
+
+  bool LookAtTrackingTruth_;
+
+  bool saveVtxTimes_;
+
+  std::string MessageCategory_;
+  //std::string simHitLabel_;
+  //std::unique_ptr<MixCollection<SimTrack> >   simTracks_;
+  //std::unique_ptr<MixCollection<SimVertex> >  simVertexes_;
 };
 
-
 #endif
diff --git a/SimGeneral/PileupInformation/plugins/GenPUProtonProducer.cc b/SimGeneral/PileupInformation/plugins/GenPUProtonProducer.cc
old mode 100755
new mode 100644
index d399098173618..8f55bfc48ac2a
--- a/SimGeneral/PileupInformation/plugins/GenPUProtonProducer.cc
+++ b/SimGeneral/PileupInformation/plugins/GenPUProtonProducer.cc
@@ -25,96 +25,94 @@
 namespace {
 
   class ConvertParticle {
-    public:
-     static constexpr int PDGCacheMax = 32768;
-     static constexpr double mmToCm = 0.1;
-
-     ConvertParticle() :
-        abortOnUnknownPDGCode_( true ),
-        initialized_( false ),
-        chargeP_( PDGCacheMax, 0 ), chargeM_( PDGCacheMax, 0 ) {};
-
-     ConvertParticle(bool abortOnUnknownPDGCode) :
-        abortOnUnknownPDGCode_( abortOnUnknownPDGCode ),
-        initialized_( false ),
-        chargeP_( PDGCacheMax, 0 ), chargeM_( PDGCacheMax, 0 ) {};
-
-     ~ConvertParticle() {};
-
-     bool initialized() const { return initialized_; }
-
-     void init(HepPDT::ParticleDataTable const& pdt) {
-	if( !initialized_ ) {
-	   for( HepPDT::ParticleDataTable::const_iterator p = pdt.begin(); p != pdt.end(); ++p ) {
-	      HepPDT::ParticleID const& id = p->first;
-	      int pdgId = id.pid(), apdgId = std::abs( pdgId );
-	      int q3 = id.threeCharge();
-	      if ( apdgId < PDGCacheMax && pdgId > 0 ) {
-		 chargeP_[ apdgId ] = q3;
-		 chargeM_[ apdgId ] = -q3;
-	      } else if ( apdgId < PDGCacheMax ) {
-		 chargeP_[ apdgId ] = -q3;
-		 chargeM_[ apdgId ] = q3;
-	      } else {
-	         chargeMap_.emplace( pdgId, q3);
-	         chargeMap_.emplace( -pdgId, -q3);
-	      }
-	   }
-	   initialized_ = true;
-	}
-     }
-
-     bool operator() (reco::GenParticle& cand, HepMC::GenParticle const* part) const {
-	reco::Candidate::LorentzVector p4( part->momentum() );
-	int pdgId = part->pdg_id();
-	cand.setThreeCharge( chargeTimesThree( pdgId ) );
-	cand.setPdgId( pdgId );
-	cand.setStatus( part->status() );
-	cand.setP4( p4 );
-	cand.setCollisionId(0);
-	HepMC::GenVertex const* v = part->production_vertex();
-	if ( v != nullptr ) {
-	   HepMC::ThreeVector vtx = v->point3d();
-	   reco::Candidate::Point vertex( vtx.x() * mmToCm, vtx.y() * mmToCm, vtx.z() * mmToCm );
-	   cand.setVertex( vertex );
-	} else {
-	   cand.setVertex( reco::Candidate::Point( 0, 0, 0 ) );
-	}
-	return true;
-     }
-
-    private:
-     bool abortOnUnknownPDGCode_;
-     bool initialized_; 
-     std::vector<int> chargeP_, chargeM_;
-     std::unordered_map<int, int> chargeMap_;
-
-     int chargeTimesThree( int id ) const {
-	if( std::abs( id ) < PDGCacheMax )
-	   return id > 0 ? chargeP_[ id ] : chargeM_[ - id ];
-
-	auto f = chargeMap_.find( id );
-	if ( f == chargeMap_.end() )  {
-	   if ( abortOnUnknownPDGCode_ )
-	      throw edm::Exception( edm::errors::LogicError ) << "invalid PDG id: " << id << std::endl;
-	   else
-	      return HepPDT::ParticleID(id).threeCharge();
-	}
-	return f->second;
-     }
-
-  }; 
-
-  class SelectProton { 
-     public:
-        bool operator() ( HepMC::GenParticle const* part, double minPz ) const {
-           bool selection = ( ( !part->end_vertex() && part->status() == 1 ) && 
-                              ( part->pdg_id() == 2212 ) && ( TMath::Abs( part->momentum().pz() ) >= minPz ) );
-           return selection;
+  public:
+    static constexpr int PDGCacheMax = 32768;
+    static constexpr double mmToCm = 0.1;
+
+    ConvertParticle()
+        : abortOnUnknownPDGCode_(true), initialized_(false), chargeP_(PDGCacheMax, 0), chargeM_(PDGCacheMax, 0){};
+
+    ConvertParticle(bool abortOnUnknownPDGCode)
+        : abortOnUnknownPDGCode_(abortOnUnknownPDGCode),
+          initialized_(false),
+          chargeP_(PDGCacheMax, 0),
+          chargeM_(PDGCacheMax, 0){};
+
+    ~ConvertParticle(){};
+
+    bool initialized() const { return initialized_; }
+
+    void init(HepPDT::ParticleDataTable const& pdt) {
+      if (!initialized_) {
+        for (HepPDT::ParticleDataTable::const_iterator p = pdt.begin(); p != pdt.end(); ++p) {
+          HepPDT::ParticleID const& id = p->first;
+          int pdgId = id.pid(), apdgId = std::abs(pdgId);
+          int q3 = id.threeCharge();
+          if (apdgId < PDGCacheMax && pdgId > 0) {
+            chargeP_[apdgId] = q3;
+            chargeM_[apdgId] = -q3;
+          } else if (apdgId < PDGCacheMax) {
+            chargeP_[apdgId] = -q3;
+            chargeM_[apdgId] = q3;
+          } else {
+            chargeMap_.emplace(pdgId, q3);
+            chargeMap_.emplace(-pdgId, -q3);
+          }
         }
+        initialized_ = true;
+      }
+    }
+
+    bool operator()(reco::GenParticle& cand, HepMC::GenParticle const* part) const {
+      reco::Candidate::LorentzVector p4(part->momentum());
+      int pdgId = part->pdg_id();
+      cand.setThreeCharge(chargeTimesThree(pdgId));
+      cand.setPdgId(pdgId);
+      cand.setStatus(part->status());
+      cand.setP4(p4);
+      cand.setCollisionId(0);
+      HepMC::GenVertex const* v = part->production_vertex();
+      if (v != nullptr) {
+        HepMC::ThreeVector vtx = v->point3d();
+        reco::Candidate::Point vertex(vtx.x() * mmToCm, vtx.y() * mmToCm, vtx.z() * mmToCm);
+        cand.setVertex(vertex);
+      } else {
+        cand.setVertex(reco::Candidate::Point(0, 0, 0));
+      }
+      return true;
+    }
+
+  private:
+    bool abortOnUnknownPDGCode_;
+    bool initialized_;
+    std::vector<int> chargeP_, chargeM_;
+    std::unordered_map<int, int> chargeMap_;
+
+    int chargeTimesThree(int id) const {
+      if (std::abs(id) < PDGCacheMax)
+        return id > 0 ? chargeP_[id] : chargeM_[-id];
+
+      auto f = chargeMap_.find(id);
+      if (f == chargeMap_.end()) {
+        if (abortOnUnknownPDGCode_)
+          throw edm::Exception(edm::errors::LogicError) << "invalid PDG id: " << id << std::endl;
+        else
+          return HepPDT::ParticleID(id).threeCharge();
+      }
+      return f->second;
+    }
   };
 
-} // Anonymous namespace
+  class SelectProton {
+  public:
+    bool operator()(HepMC::GenParticle const* part, double minPz) const {
+      bool selection = ((!part->end_vertex() && part->status() == 1) && (part->pdg_id() == 2212) &&
+                        (TMath::Abs(part->momentum().pz()) >= minPz));
+      return selection;
+    }
+  };
+
+}  // Anonymous namespace
 
 #include "FWCore/Framework/interface/global/EDProducer.h"
 #include "FWCore/Utilities/interface/InputTag.h"
@@ -127,25 +125,26 @@ namespace {
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 
-namespace edm { class ParameterSet; }
+namespace edm {
+  class ParameterSet;
+}
 
 class GenPUProtonProducer : public edm::global::EDProducer<edm::RunCache<ConvertParticle> > {
- public:
-  GenPUProtonProducer( const edm::ParameterSet & );
+public:
+  GenPUProtonProducer(const edm::ParameterSet&);
   ~GenPUProtonProducer() override;
 
-  void produce( edm::StreamID, edm::Event& e, const edm::EventSetup&) const override;
+  void produce(edm::StreamID, edm::Event& e, const edm::EventSetup&) const override;
   std::shared_ptr<ConvertParticle> globalBeginRun(const edm::Run&, const edm::EventSetup&) const override;
-  void globalEndRun(edm::Run const&, edm::EventSetup const&) const override {};
+  void globalEndRun(edm::Run const&, edm::EventSetup const&) const override{};
 
- private:
+private:
   edm::EDGetTokenT<CrossingFrame<edm::HepMCProduct> > mixToken_;
 
   bool abortOnUnknownPDGCode_;
   std::vector<int> bunchList_;
-  double minPz_; 
+  double minPz_;
   SelectProton select_;
-
 };
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -167,89 +166,88 @@ using namespace reco;
 using namespace std;
 using namespace HepMC;
 
-GenPUProtonProducer::GenPUProtonProducer( const ParameterSet & cfg ) :
-  abortOnUnknownPDGCode_( cfg.getUntrackedParameter<bool>( "abortOnUnknownPDGCode", true ) ),
-  bunchList_( cfg.getParameter<vector<int> >( "bunchCrossingList" ) ),
-  minPz_( cfg.getParameter<double>( "minPz" ) ) 
-{
+GenPUProtonProducer::GenPUProtonProducer(const ParameterSet& cfg)
+    : abortOnUnknownPDGCode_(cfg.getUntrackedParameter<bool>("abortOnUnknownPDGCode", true)),
+      bunchList_(cfg.getParameter<vector<int> >("bunchCrossingList")),
+      minPz_(cfg.getParameter<double>("minPz")) {
   produces<GenParticleCollection>();
-  mixToken_ = consumes<CrossingFrame<HepMCProduct> >( InputTag(cfg.getParameter<std::string>( "mix" ),"generatorSmeared") );
+  mixToken_ =
+      consumes<CrossingFrame<HepMCProduct> >(InputTag(cfg.getParameter<std::string>("mix"), "generatorSmeared"));
 }
 
-GenPUProtonProducer::~GenPUProtonProducer() { }
+GenPUProtonProducer::~GenPUProtonProducer() {}
 
 std::shared_ptr<ConvertParticle> GenPUProtonProducer::globalBeginRun(const Run&, const EventSetup& es) const {
   ESHandle<HepPDT::ParticleDataTable> pdt;
-  es.getData( pdt );
-  auto convert_ptr = std::make_shared<ConvertParticle>( abortOnUnknownPDGCode_ );
-  if( !convert_ptr->initialized() ) convert_ptr->init( *pdt );
+  es.getData(pdt);
+  auto convert_ptr = std::make_shared<ConvertParticle>(abortOnUnknownPDGCode_);
+  if (!convert_ptr->initialized())
+    convert_ptr->init(*pdt);
 
   return convert_ptr;
 }
 
-void GenPUProtonProducer::produce( StreamID, Event& evt, const EventSetup& es ) const {
-
-   size_t totalSize = 0;
-   size_t npiles = 1;
-
-   Handle<CrossingFrame<HepMCProduct> > cf;
-   evt.getByToken(mixToken_,cf);
-   std::unique_ptr<MixCollection<HepMCProduct> > cfhepmcprod( new MixCollection<HepMCProduct>( cf.product() ) );
-   npiles = cfhepmcprod->size();
-
-   LogDebug("GenPUProtonProducer") << " Number of pile-up events : " << npiles << endl;
-
-   for(size_t icf = 0; icf < npiles; ++icf){
-      LogDebug("GenPUProtonProducer") << "CF " << icf << " size : " << cfhepmcprod->getObject(icf).GetEvent()->particles_size() << endl;
-      totalSize += cfhepmcprod->getObject(icf).GetEvent()->particles_size();
-   }
-   LogDebug("GenPUProtonProducer") << "Total size : " << totalSize << endl;
-
-   // Initialise containers
-   auto candsPtr = std::make_unique<GenParticleCollection>();
-   GenParticleCollection& cands = *candsPtr;
-
-   // Loop over pile-up events
-   ConvertParticle const& convertParticle_ = *runCache( evt.getRun().index() );
-
-   MixCollection<HepMCProduct>::MixItr mixHepMC_itr;
-   unsigned int total_number_of_protons = 0;
-   size_t idx_mix = 0;
-   // Fill collection
-   for( mixHepMC_itr = cfhepmcprod->begin() ; mixHepMC_itr != cfhepmcprod->end() ; ++mixHepMC_itr, ++idx_mix ){
-      int bunch = mixHepMC_itr.bunch();
-
-      if( find( bunchList_.begin(), bunchList_.end(), bunch ) != bunchList_.end() ){
-
-	 auto event = (*mixHepMC_itr).GetEvent();
-
-	 size_t num_particles = event->particles_size();
-
-	 // Fill output collection
-	 unsigned int number_of_protons = 0;
-	 for( auto p = event->particles_begin() ; p != event->particles_end() ; ++p ) {
-	    HepMC::GenParticle const* part = *p;  
-	    if( select_(part, minPz_) ) {
-	       reco::GenParticle cand;
-	       convertParticle_( cand, part );
-               ++number_of_protons;
-               cands.push_back( cand );
-	    } 
-	 }
-	 LogDebug("GenPUProtonProducer") << "Idx : " << idx_mix << " Bunch : " << bunch 
-                                         << " Number of particles : " << num_particles 
-                                         << " Number of protons : " << number_of_protons << endl;
-
-         total_number_of_protons += number_of_protons;
+void GenPUProtonProducer::produce(StreamID, Event& evt, const EventSetup& es) const {
+  size_t totalSize = 0;
+  size_t npiles = 1;
+
+  Handle<CrossingFrame<HepMCProduct> > cf;
+  evt.getByToken(mixToken_, cf);
+  std::unique_ptr<MixCollection<HepMCProduct> > cfhepmcprod(new MixCollection<HepMCProduct>(cf.product()));
+  npiles = cfhepmcprod->size();
+
+  LogDebug("GenPUProtonProducer") << " Number of pile-up events : " << npiles << endl;
+
+  for (size_t icf = 0; icf < npiles; ++icf) {
+    LogDebug("GenPUProtonProducer") << "CF " << icf
+                                    << " size : " << cfhepmcprod->getObject(icf).GetEvent()->particles_size() << endl;
+    totalSize += cfhepmcprod->getObject(icf).GetEvent()->particles_size();
+  }
+  LogDebug("GenPUProtonProducer") << "Total size : " << totalSize << endl;
+
+  // Initialise containers
+  auto candsPtr = std::make_unique<GenParticleCollection>();
+  GenParticleCollection& cands = *candsPtr;
+
+  // Loop over pile-up events
+  ConvertParticle const& convertParticle_ = *runCache(evt.getRun().index());
+
+  MixCollection<HepMCProduct>::MixItr mixHepMC_itr;
+  unsigned int total_number_of_protons = 0;
+  size_t idx_mix = 0;
+  // Fill collection
+  for (mixHepMC_itr = cfhepmcprod->begin(); mixHepMC_itr != cfhepmcprod->end(); ++mixHepMC_itr, ++idx_mix) {
+    int bunch = mixHepMC_itr.bunch();
+
+    if (find(bunchList_.begin(), bunchList_.end(), bunch) != bunchList_.end()) {
+      auto event = (*mixHepMC_itr).GetEvent();
+
+      size_t num_particles = event->particles_size();
+
+      // Fill output collection
+      unsigned int number_of_protons = 0;
+      for (auto p = event->particles_begin(); p != event->particles_end(); ++p) {
+        HepMC::GenParticle const* part = *p;
+        if (select_(part, minPz_)) {
+          reco::GenParticle cand;
+          convertParticle_(cand, part);
+          ++number_of_protons;
+          cands.push_back(cand);
+        }
       }
-   }
-   LogDebug("GenPUProtonProducer") << "Total number of protons : " << total_number_of_protons << endl;
-   LogDebug("GenPUProtonProducer") << "Output collection size : " << cands.size() << endl;
+      LogDebug("GenPUProtonProducer") << "Idx : " << idx_mix << " Bunch : " << bunch
+                                      << " Number of particles : " << num_particles
+                                      << " Number of protons : " << number_of_protons << endl;
 
-   evt.put( std::move(candsPtr) );
+      total_number_of_protons += number_of_protons;
+    }
+  }
+  LogDebug("GenPUProtonProducer") << "Total number of protons : " << total_number_of_protons << endl;
+  LogDebug("GenPUProtonProducer") << "Output collection size : " << cands.size() << endl;
+
+  evt.put(std::move(candsPtr));
 }
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-DEFINE_FWK_MODULE( GenPUProtonProducer );
-
+DEFINE_FWK_MODULE(GenPUProtonProducer);
diff --git a/SimGeneral/PileupInformation/plugins/PileupInformation.cc b/SimGeneral/PileupInformation/plugins/PileupInformation.cc
index 1acfe43f3452b..983d19188a806 100644
--- a/SimGeneral/PileupInformation/plugins/PileupInformation.cc
+++ b/SimGeneral/PileupInformation/plugins/PileupInformation.cc
@@ -2,7 +2,7 @@
 // Description:  adds pileup information object to event
 // Author:  Mike Hildreth
 //
-// Adds a vector of PileupSummaryInfo objects to the event. 
+// Adds a vector of PileupSummaryInfo objects to the event.
 // One for each bunch crossing.
 //
 //--------------------------------------------
@@ -16,91 +16,86 @@
 
 #include "SimGeneral/PileupInformation/interface/PileupInformation.h"
 
+PileupInformation::PileupInformation(const edm::ParameterSet& config) {
+  // Initialize global parameters
 
-PileupInformation::PileupInformation(const edm::ParameterSet & config) 
-{
-    // Initialize global parameters
-
-    pTcut_1_                = 0.1;
-    pTcut_2_                = 0.5; // defaults                                                       
-    isPreMixed_             = config.getParameter<bool>("isPreMixed");
-
-    if ( !isPreMixed_ ) {
-      distanceCut_            = config.getParameter<double>("vertexDistanceCut");
-      volumeRadius_           = config.getParameter<double>("volumeRadius");
-      volumeZ_                = config.getParameter<double>("volumeZ");
-      pTcut_1_                = config.getParameter<double>("pTcut_1");
-      pTcut_2_                = config.getParameter<double>("pTcut_2");
-      
-      PileupInfoLabel_        = consumes<PileupMixingContent>(config.getParameter<edm::InputTag>("PileupMixingLabel"));
-      
-      PileupVtxLabel_         = consumes<PileupVertexContent>(config.getParameter<edm::InputTag>("PileupMixingLabel"));
-
-      LookAtTrackingTruth_    = config.getUntrackedParameter<bool>("doTrackTruth");
-      
-      trackingTruthT_          = mayConsume<TrackingParticleCollection>(config.getParameter<edm::InputTag>("TrackingParticlesLabel"));
-      trackingTruthV_          = mayConsume<TrackingVertexCollection>(config.getParameter<edm::InputTag>("TrackingParticlesLabel"));
-
-      saveVtxTimes_ = config.getParameter<bool>("saveVtxTimes");
-      
-      MessageCategory_        = "PileupInformation";
-      
-      edm::LogInfo (MessageCategory_) << "Setting up PileupInformation";
-      edm::LogInfo (MessageCategory_) << "Vertex distance cut set to " << distanceCut_  << " mm";
-      edm::LogInfo (MessageCategory_) << "Volume radius set to "       << volumeRadius_ << " mm";
-      edm::LogInfo (MessageCategory_) << "Volume Z      set to "       << volumeZ_      << " mm";
-      edm::LogInfo (MessageCategory_) << "Lower pT Threshold set to "       << pTcut_1_      << " GeV";
-      edm::LogInfo (MessageCategory_) << "Upper pT Threshold set to "       << pTcut_2_      << " GeV";
-    }
-    else{
-      pileupSummaryToken_=consumes<std::vector<PileupSummaryInfo> >(config.getParameter<edm::InputTag>("PileupSummaryInfoInputTag"));
-      bunchSpacingToken_=consumes<int>(config.getParameter<edm::InputTag>("BunchSpacingInputTag"));
-    }  
+  pTcut_1_ = 0.1;
+  pTcut_2_ = 0.5;  // defaults
+  isPreMixed_ = config.getParameter<bool>("isPreMixed");
 
-    produces< std::vector<PileupSummaryInfo> >();
-    produces<int>("bunchSpacing");
+  if (!isPreMixed_) {
+    distanceCut_ = config.getParameter<double>("vertexDistanceCut");
+    volumeRadius_ = config.getParameter<double>("volumeRadius");
+    volumeZ_ = config.getParameter<double>("volumeZ");
+    pTcut_1_ = config.getParameter<double>("pTcut_1");
+    pTcut_2_ = config.getParameter<double>("pTcut_2");
 
-    //produces<PileupSummaryInfo>();
-}
+    PileupInfoLabel_ = consumes<PileupMixingContent>(config.getParameter<edm::InputTag>("PileupMixingLabel"));
+
+    PileupVtxLabel_ = consumes<PileupVertexContent>(config.getParameter<edm::InputTag>("PileupMixingLabel"));
+
+    LookAtTrackingTruth_ = config.getUntrackedParameter<bool>("doTrackTruth");
+
+    trackingTruthT_ =
+        mayConsume<TrackingParticleCollection>(config.getParameter<edm::InputTag>("TrackingParticlesLabel"));
+    trackingTruthV_ =
+        mayConsume<TrackingVertexCollection>(config.getParameter<edm::InputTag>("TrackingParticlesLabel"));
+
+    saveVtxTimes_ = config.getParameter<bool>("saveVtxTimes");
+
+    MessageCategory_ = "PileupInformation";
+
+    edm::LogInfo(MessageCategory_) << "Setting up PileupInformation";
+    edm::LogInfo(MessageCategory_) << "Vertex distance cut set to " << distanceCut_ << " mm";
+    edm::LogInfo(MessageCategory_) << "Volume radius set to " << volumeRadius_ << " mm";
+    edm::LogInfo(MessageCategory_) << "Volume Z      set to " << volumeZ_ << " mm";
+    edm::LogInfo(MessageCategory_) << "Lower pT Threshold set to " << pTcut_1_ << " GeV";
+    edm::LogInfo(MessageCategory_) << "Upper pT Threshold set to " << pTcut_2_ << " GeV";
+  } else {
+    pileupSummaryToken_ =
+        consumes<std::vector<PileupSummaryInfo> >(config.getParameter<edm::InputTag>("PileupSummaryInfoInputTag"));
+    bunchSpacingToken_ = consumes<int>(config.getParameter<edm::InputTag>("BunchSpacingInputTag"));
+  }
 
+  produces<std::vector<PileupSummaryInfo> >();
+  produces<int>("bunchSpacing");
 
-void PileupInformation::produce(edm::Event &event, const edm::EventSetup & setup)
-{
+  //produces<PileupSummaryInfo>();
+}
 
+void PileupInformation::produce(edm::Event& event, const edm::EventSetup& setup) {
   std::unique_ptr<std::vector<PileupSummaryInfo> > PSIVector(new std::vector<PileupSummaryInfo>);
 
-  if ( isPreMixed_ ) {
-    edm::Handle< std::vector<PileupSummaryInfo> > psiInput;  
-    event.getByToken(pileupSummaryToken_,psiInput);
+  if (isPreMixed_) {
+    edm::Handle<std::vector<PileupSummaryInfo> > psiInput;
+    event.getByToken(pileupSummaryToken_, psiInput);
 
     std::vector<PileupSummaryInfo>::const_iterator PSiter;
 
-    for(PSiter = psiInput.product()->begin(); PSiter != psiInput.product()->end(); PSiter++){
-
+    for (PSiter = psiInput.product()->begin(); PSiter != psiInput.product()->end(); PSiter++) {
       PSIVector->push_back(*PSiter);
     }
 
-
-    edm::Handle< int> bsInput;
-    event.getByToken(bunchSpacingToken_,bsInput);
-    int bunchSpacing=*(bsInput.product());
+    edm::Handle<int> bsInput;
+    event.getByToken(bunchSpacingToken_, bsInput);
+    int bunchSpacing = *(bsInput.product());
 
     event.put(std::move(PSIVector));
-    
+
     //add bunch spacing to the event as a seperate integer for use by downstream modules
     std::unique_ptr<int> bunchSpacingP(new int(bunchSpacing));
-    event.put(std::move(bunchSpacingP),"bunchSpacing");
-    
+    event.put(std::move(bunchSpacingP), "bunchSpacing");
+
     return;
   }
 
-  edm::Handle< PileupMixingContent > MixingPileup;  // Get True pileup information from MixingModule
+  edm::Handle<PileupMixingContent> MixingPileup;  // Get True pileup information from MixingModule
   event.getByToken(PileupInfoLabel_, MixingPileup);
 
   std::vector<int> BunchCrossings;
   std::vector<int> Interactions_Xing;
   std::vector<float> TrueInteractions_Xing;
-  std::vector< std::vector<edm::EventID> > eventInfoList_Xing;
+  std::vector<std::vector<edm::EventID> > eventInfoList_Xing;
 
   int bunchSpacing;
 
@@ -109,39 +104,37 @@ void PileupInformation::produce(edm::Event &event, const edm::EventSetup & setup
   const std::vector<int>& bunchCrossing = MixInfo->getMix_bunchCrossing();
   const std::vector<int>& interactions = MixInfo->getMix_Ninteractions();
   const std::vector<float>& TrueInteractions = MixInfo->getMix_TrueInteractions();
-  const std::vector<edm::EventID> eventInfoList= MixInfo->getMix_eventInfo();
+  const std::vector<edm::EventID> eventInfoList = MixInfo->getMix_eventInfo();
 
   bunchSpacing = MixInfo->getMix_bunchSpacing();
-  unsigned int totalIntPU=0;
+  unsigned int totalIntPU = 0;
 
-  for(int ib=0; ib<(int)bunchCrossing.size(); ++ib){
+  for (int ib = 0; ib < (int)bunchCrossing.size(); ++ib) {
     //      std::cout << " bcr, nint " << bunchCrossing[ib] << " " << interactions[ib] << std::endl;
     BunchCrossings.push_back(bunchCrossing[ib]);
     Interactions_Xing.push_back(interactions[ib]);
     TrueInteractions_Xing.push_back(TrueInteractions[ib]);
 
     std::vector<edm::EventID> eventInfos;
-    eventInfos.reserve( interactions[ib] );
-    for ( int pu=0; pu< interactions[ib]; pu++) {
-      eventInfos.push_back(eventInfoList[totalIntPU+pu]);
+    eventInfos.reserve(interactions[ib]);
+    for (int pu = 0; pu < interactions[ib]; pu++) {
+      eventInfos.push_back(eventInfoList[totalIntPU + pu]);
     }
-    totalIntPU+=(interactions[ib]);
+    totalIntPU += (interactions[ib]);
     eventInfoList_Xing.push_back(eventInfos);
-
   }
-  
+
   // store information from pileup vertices, if it's in the event. Have to loop on interactions again.
-  std::vector< std::vector<float> > ptHatList_Xing;
-  std::vector< std::vector<float> > zPosList_Xing;
-  std::vector< std::vector<float> > tPosList_Xing;
+  std::vector<std::vector<float> > ptHatList_Xing;
+  std::vector<std::vector<float> > zPosList_Xing;
+  std::vector<std::vector<float> > tPosList_Xing;
 
   bool Have_pThats = false;
 
-  edm::Handle< PileupVertexContent > MixingPileupVtx;  // Get True pileup information from MixingModule
-  if(event.getByToken(PileupVtxLabel_, MixingPileupVtx)) {  // extract information - way easier than counting vertices
+  edm::Handle<PileupVertexContent> MixingPileupVtx;          // Get True pileup information from MixingModule
+  if (event.getByToken(PileupVtxLabel_, MixingPileupVtx)) {  // extract information - way easier than counting vertices
     const PileupVertexContent* MixVtxInfo = MixingPileupVtx.product();
 
-
     Have_pThats = true;
 
     const std::vector<int>& bunchCrossing = MixInfo->getMix_bunchCrossing();
@@ -153,33 +146,32 @@ void PileupInformation::produce(edm::Event &event, const edm::EventSetup & setup
 
     // store information from pileup vertices, if it's in the event:
 
-    unsigned int totalIntPU=0;
+    unsigned int totalIntPU = 0;
 
-    for(int ib=0; ib<(int)bunchCrossing.size(); ++ib){
+    for (int ib = 0; ib < (int)bunchCrossing.size(); ++ib) {
       //      std::cout << " bcr, nint " << bunchCrossing[ib] << " " << interactions[ib] << std::endl;
-      
+
       std::vector<float> zposBX, tposBX;
       std::vector<float> pthatBX;
-      zposBX.reserve( interactions[ib] );
-      if (saveVtxTimes_) tposBX.reserve( interactions[ib] );
-      pthatBX.reserve( interactions[ib] );
-      for ( int pu=0; pu< interactions[ib]; pu++) {
-	zposBX.push_back(ZposInput[totalIntPU+pu]);
-	if (saveVtxTimes_) tposBX.push_back(TposInput[totalIntPU+pu]);
-	pthatBX.push_back(PtHatInput[totalIntPU+pu]);
+      zposBX.reserve(interactions[ib]);
+      if (saveVtxTimes_)
+        tposBX.reserve(interactions[ib]);
+      pthatBX.reserve(interactions[ib]);
+      for (int pu = 0; pu < interactions[ib]; pu++) {
+        zposBX.push_back(ZposInput[totalIntPU + pu]);
+        if (saveVtxTimes_)
+          tposBX.push_back(TposInput[totalIntPU + pu]);
+        pthatBX.push_back(PtHatInput[totalIntPU + pu]);
       }
-      totalIntPU+=(interactions[ib]);
+      totalIntPU += (interactions[ib]);
       zPosList_Xing.push_back(zposBX);
       tPosList_Xing.push_back(tposBX);
       ptHatList_Xing.push_back(pthatBX);
-      
     }
   }  // end of VertexInfo block
 
-
   //Now, get information on valid particles that look like they could be in the tracking volume
 
-
   zpositions.clear();
   sumpT_lowpT.clear();
   sumpT_highpT.clear();
@@ -187,29 +179,26 @@ void PileupInformation::produce(edm::Event &event, const edm::EventSetup & setup
   ntrks_highpT.clear();
   event_index_.clear();
 
-  int lastEvent = 0; // zero is the true MC hard-scatter event
+  int lastEvent = 0;  // zero is the true MC hard-scatter event
 
   // int lastBunchCrossing = 0; // 0 is the true bunch crossing, should always come first.
 
   bool HaveTrackingParticles = false;
 
   edm::Handle<TrackingParticleCollection> mergedPH;
-  edm::Handle<TrackingVertexCollection>   mergedVH;
+  edm::Handle<TrackingVertexCollection> mergedVH;
 
   TrackingVertexCollection::const_iterator iVtx;
   TrackingVertexCollection::const_iterator iVtxTest;
   TrackingParticleCollection::const_iterator iTrackTest;
 
-  if( LookAtTrackingTruth_ ){
-
-    if(event.getByToken(trackingTruthT_, mergedPH) && event.getByToken(trackingTruthV_, mergedVH)) {
-
+  if (LookAtTrackingTruth_) {
+    if (event.getByToken(trackingTruthT_, mergedPH) && event.getByToken(trackingTruthV_, mergedVH)) {
       HaveTrackingParticles = true;
 
       iVtxTest = mergedVH->begin();
       iTrackTest = mergedPH->begin();
     }
-
   }
 
   int nminb_vtx = 0;
@@ -219,169 +208,154 @@ void PileupInformation::produce(edm::Event &event, const edm::EventSetup & setup
   std::vector<int>::iterator BXIter;
   std::vector<int>::iterator InteractionsIter = Interactions_Xing.begin();
   std::vector<float>::iterator TInteractionsIter = TrueInteractions_Xing.begin();
-  std::vector< std::vector<edm::EventID> >::iterator TEventInfoIter = eventInfoList_Xing.begin();
+  std::vector<std::vector<edm::EventID> >::iterator TEventInfoIter = eventInfoList_Xing.begin();
 
-  std::vector< std::vector<float> >::iterator zPosIter;
-  std::vector< std::vector<float> >::iterator tPosIter;
-  std::vector< std::vector<float> >::iterator pThatIter;
+  std::vector<std::vector<float> >::iterator zPosIter;
+  std::vector<std::vector<float> >::iterator tPosIter;
+  std::vector<std::vector<float> >::iterator pThatIter;
 
-  if(Have_pThats) {
+  if (Have_pThats) {
     zPosIter = zPosList_Xing.begin();
     tPosIter = tPosList_Xing.begin();
     pThatIter = ptHatList_Xing.begin();
   }
 
-  // loop over the bunch crossings and interactions we have extracted 
-
-  for( BXIter = BunchCrossings.begin(); BXIter != BunchCrossings.end(); ++BXIter, ++InteractionsIter, ++TInteractionsIter, ++TEventInfoIter) {
+  // loop over the bunch crossings and interactions we have extracted
 
+  for (BXIter = BunchCrossings.begin(); BXIter != BunchCrossings.end();
+       ++BXIter, ++InteractionsIter, ++TInteractionsIter, ++TEventInfoIter) {
     //std::cout << "looking for BX: " << (*BXIter) << std::endl;
 
-    if(HaveTrackingParticles) {  // leave open the option of not producing TrackingParticles and just keeping # interactions
-
-      for (iVtx = iVtxTest; iVtx != mergedVH->end(); ++iVtx) {     
+    if (HaveTrackingParticles) {  // leave open the option of not producing TrackingParticles and just keeping # interactions
 
-	if(iVtx->eventId().bunchCrossing() == (*BXIter) ) { // found first vertex in this bunch crossing
+      for (iVtx = iVtxTest; iVtx != mergedVH->end(); ++iVtx) {
+        if (iVtx->eventId().bunchCrossing() == (*BXIter)) {  // found first vertex in this bunch crossing
 
-	  if(iVtx->eventId().event() != lastEvent) {
+          if (iVtx->eventId().event() != lastEvent) {
+            //std::cout << "BX,event " << iVtx->eventId().bunchCrossing() << " " << iVtx->eventId().event() << std::endl;
 
-	    //std::cout << "BX,event " << iVtx->eventId().bunchCrossing() << " " << iVtx->eventId().event() << std::endl;
+            float zpos = 0.;
+            zpos = iVtx->position().z();
+            zpositions.push_back(zpos);  //save z position of each vertex
+            sumpT_lowpT.push_back(0.);
+            sumpT_highpT.push_back(0.);
+            ntrks_lowpT.push_back(0);
+            ntrks_highpT.push_back(0);
 
-	    float zpos = 0.;
-	    zpos = iVtx->position().z();
-	    zpositions.push_back(zpos);  //save z position of each vertex
-	    sumpT_lowpT.push_back(0.);
-	    sumpT_highpT.push_back(0.);
-	    ntrks_lowpT.push_back(0);
-	    ntrks_highpT.push_back(0);
+            lastEvent = iVtx->eventId().event();
+            iVtxTest = --iVtx;  // just for security
 
-	    lastEvent = iVtx->eventId().event();
-	    iVtxTest = --iVtx; // just for security
+            // turns out events aren't sequential... save map of indices
 
-	    // turns out events aren't sequential... save map of indices
+            event_index_.insert(myindex::value_type(lastEvent, nminb_vtx));
 
-	    event_index_.insert(myindex::value_type(lastEvent,nminb_vtx));
-	     
-	    ++nminb_vtx;
+            ++nminb_vtx;
 
-	    continue;
-	  }
-	}
+            continue;
+          }
+        }
       }
-    
+
       // next loop over tracks to get information
 
-      for (TrackingParticleCollection::const_iterator iTrack = iTrackTest; iTrack != mergedPH->end(); ++iTrack)
-	{
-	  bool FoundTrk = false;
-
-	  float zpos=0.;
-
-	  if(iTrack->eventId().bunchCrossing() == (*BXIter) && iTrack->eventId().event() > 0 )
-	    {
-	      FoundTrk = true;
-	      int correct_index = event_index_[iTrack->eventId().event()];
-
-	      //std::cout << " track index, correct index " << iTrack->eventId().event() << " " << correct_index << std::endl;
-
-	      zpos = zpositions[correct_index];
-	      if(iTrack->matchedHit()>0) {
-		if(fabs(iTrack->parentVertex()->position().z()-zpos)<0.1) {  //make sure track really comes from this vertex
-		  //std::cout << *iTrack << std::endl;                                              
-		  float Tpx = iTrack->p4().px();
-		  float Tpy = iTrack->p4().py();
-		  float TpT = sqrt(Tpx*Tpx + Tpy*Tpy);
-		  if( TpT>pTcut_1_ ) {
-		    sumpT_lowpT[correct_index]+=TpT;
-		    ++ntrks_lowpT[correct_index];
-		  }
-		  if( TpT>pTcut_2_ ){
-		    sumpT_highpT[correct_index]+=TpT;
-		    ++ntrks_highpT[correct_index];
-		  }
-		}
-	      }
-	    }
-	  else{
-	    if(FoundTrk) {
-
-	      iTrackTest = --iTrack;  // reset so we can start over next time
-	      --iTrackTest;  // just to be sure
-	      break;
-	    }
-	
-	  }
-	
-	} // end of track loop
-
-    } // end of check that we have TrackingParticles to begin with...
-
-
-    // now that we have all of the track information for a given bunch crossing, 
+      for (TrackingParticleCollection::const_iterator iTrack = iTrackTest; iTrack != mergedPH->end(); ++iTrack) {
+        bool FoundTrk = false;
+
+        float zpos = 0.;
+
+        if (iTrack->eventId().bunchCrossing() == (*BXIter) && iTrack->eventId().event() > 0) {
+          FoundTrk = true;
+          int correct_index = event_index_[iTrack->eventId().event()];
+
+          //std::cout << " track index, correct index " << iTrack->eventId().event() << " " << correct_index << std::endl;
+
+          zpos = zpositions[correct_index];
+          if (iTrack->matchedHit() > 0) {
+            if (fabs(iTrack->parentVertex()->position().z() - zpos) <
+                0.1) {  //make sure track really comes from this vertex
+              //std::cout << *iTrack << std::endl;
+              float Tpx = iTrack->p4().px();
+              float Tpy = iTrack->p4().py();
+              float TpT = sqrt(Tpx * Tpx + Tpy * Tpy);
+              if (TpT > pTcut_1_) {
+                sumpT_lowpT[correct_index] += TpT;
+                ++ntrks_lowpT[correct_index];
+              }
+              if (TpT > pTcut_2_) {
+                sumpT_highpT[correct_index] += TpT;
+                ++ntrks_highpT[correct_index];
+              }
+            }
+          }
+        } else {
+          if (FoundTrk) {
+            iTrackTest = --iTrack;  // reset so we can start over next time
+            --iTrackTest;           // just to be sure
+            break;
+          }
+        }
+
+      }  // end of track loop
+
+    }  // end of check that we have TrackingParticles to begin with...
+
+    // now that we have all of the track information for a given bunch crossing,
     // make PileupSummary for this one and move on
 
     //	  std::cout << "Making PSI for bunch " << lastBunchCrossing << std::endl;
 
-    if(!HaveTrackingParticles) { // stick in one value so we don't have empty vectors
+    if (!HaveTrackingParticles) {  // stick in one value so we don't have empty vectors
 
-      zpositions.push_back(-999.);  
+      zpositions.push_back(-999.);
       sumpT_lowpT.push_back(0.);
       sumpT_highpT.push_back(0.);
       ntrks_lowpT.push_back(0);
       ntrks_highpT.push_back(0);
-
     }
 
-    if(Have_pThats) {
-
-      PileupSummaryInfo	PSI_bunch = PileupSummaryInfo(
-						      (*InteractionsIter),
-						      (*zPosIter),
-						      (*tPosIter),
-						      sumpT_lowpT,
-						      sumpT_highpT,
-						      ntrks_lowpT,
-						      ntrks_highpT,
-						      (*TEventInfoIter),
-						      (*pThatIter),
-						      (*BXIter),
-						      (*TInteractionsIter),
-						      bunchSpacing
-						      );
+    if (Have_pThats) {
+      PileupSummaryInfo PSI_bunch = PileupSummaryInfo((*InteractionsIter),
+                                                      (*zPosIter),
+                                                      (*tPosIter),
+                                                      sumpT_lowpT,
+                                                      sumpT_highpT,
+                                                      ntrks_lowpT,
+                                                      ntrks_highpT,
+                                                      (*TEventInfoIter),
+                                                      (*pThatIter),
+                                                      (*BXIter),
+                                                      (*TInteractionsIter),
+                                                      bunchSpacing);
       PSIVector->push_back(PSI_bunch);
 
       zPosIter++;
       tPosIter++;
       pThatIter++;
-    }
-    else{
-
-      std::vector<float> zposZeros( (*TEventInfoIter).size(), 0);
-      std::vector<float> tposZeros( (*TEventInfoIter).size(), 0);
-      std::vector<float> pThatZeros( (*TEventInfoIter).size(), 0);
-
-      PileupSummaryInfo	PSI_bunch = PileupSummaryInfo(
-						      (*InteractionsIter),
-						      zposZeros,
-						      tposZeros,
-						      sumpT_lowpT,
-						      sumpT_highpT,
-						      ntrks_lowpT,
-						      ntrks_highpT,
-						      (*TEventInfoIter),
-						      pThatZeros,
-						      (*BXIter),
-						      (*TInteractionsIter),
-						      bunchSpacing
-						      );
+    } else {
+      std::vector<float> zposZeros((*TEventInfoIter).size(), 0);
+      std::vector<float> tposZeros((*TEventInfoIter).size(), 0);
+      std::vector<float> pThatZeros((*TEventInfoIter).size(), 0);
+
+      PileupSummaryInfo PSI_bunch = PileupSummaryInfo((*InteractionsIter),
+                                                      zposZeros,
+                                                      tposZeros,
+                                                      sumpT_lowpT,
+                                                      sumpT_highpT,
+                                                      ntrks_lowpT,
+                                                      ntrks_highpT,
+                                                      (*TEventInfoIter),
+                                                      pThatZeros,
+                                                      (*BXIter),
+                                                      (*TInteractionsIter),
+                                                      bunchSpacing);
 
       PSIVector->push_back(PSI_bunch);
     }
     //std::cout << " " << std::endl;
     //std::cout << "Adding Bunch Crossing, nint " << (*BXIter) << " " <<  (*InteractionsIter) << std::endl;
- 
+
     //for(int iv = 0; iv<(*InteractionsIter); ++iv){
-    	    
+
     // std::cout << "Z position " << zpositions[iv] << std::endl;
     // std::cout << "ntrks_lowpT " << ntrks_lowpT[iv] << std::endl;
     // std::cout << "sumpT_lowpT " << sumpT_lowpT[iv] << std::endl;
@@ -390,8 +364,6 @@ void PileupInformation::produce(edm::Event &event, const edm::EventSetup & setup
     //std::cout << iv << " " << PSI_bunch.getPU_EventID()[iv] << std::endl;
     //}
 
-
-
     // if(HaveTrackingParticles) lastBunchCrossing = iVtx->eventId().bunchCrossing();
 
     event_index_.clear();
@@ -401,10 +373,9 @@ void PileupInformation::produce(edm::Event &event, const edm::EventSetup & setup
     ntrks_lowpT.clear();
     ntrks_highpT.clear();
     nminb_vtx = 0;
-    lastEvent=0;
-
+    lastEvent = 0;
 
-  } // end of loop over bunch crossings
+  }  // end of loop over bunch crossings
 
   // put our vector of PileupSummaryInfo objects into the event.
 
@@ -412,9 +383,7 @@ void PileupInformation::produce(edm::Event &event, const edm::EventSetup & setup
 
   //add bunch spacing to the event as a seperate integer for use by downstream modules
   std::unique_ptr<int> bunchSpacingP(new int(bunchSpacing));
-  event.put(std::move(bunchSpacingP),"bunchSpacing");
-
+  event.put(std::move(bunchSpacingP), "bunchSpacing");
 }
 
-
 DEFINE_FWK_MODULE(PileupInformation);
diff --git a/SimGeneral/PileupInformation/plugins/PileupVertexAccumulator.cc b/SimGeneral/PileupInformation/plugins/PileupVertexAccumulator.cc
index 7450602ac28e2..6e7f6d2f78155 100644
--- a/SimGeneral/PileupInformation/plugins/PileupVertexAccumulator.cc
+++ b/SimGeneral/PileupInformation/plugins/PileupVertexAccumulator.cc
@@ -2,7 +2,7 @@
 //
 // Package:    PileupVertexAccumulator
 // Class:      PileupVertexAccumulator
-// 
+//
 /**\class PileupVertexAccumulator PileupVertexAccumulator.cc SimTracker/PileupVertexAccumulator/src/PileupVertexAccumulator.cc
 
  Description: <one line class summary>
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <set>
@@ -49,7 +48,6 @@
 #include "FWCore/Utilities/interface/StreamID.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -63,34 +61,30 @@
 //
 //using namespace std;
 
+namespace cms {
+  PileupVertexAccumulator::PileupVertexAccumulator(const edm::ParameterSet& iConfig,
+                                                   edm::ProducerBase& mixMod,
+                                                   edm::ConsumesCollector& iC)
+      : Mtag_(iConfig.getParameter<edm::InputTag>("vtxTag")),
+        fallbackMtag_(iConfig.getParameter<edm::InputTag>("vtxFallbackTag")),
+        saveVtxTimes_(iConfig.getParameter<bool>("saveVtxTimes")) {
+    edm::LogInfo("PixelDigitizer ") << "Enter the Pixel Digitizer";
+
+    const std::string alias("PileupVertexAccum");
 
-namespace cms
-{
-  PileupVertexAccumulator::PileupVertexAccumulator(const edm::ParameterSet& iConfig, edm::ProducerBase& mixMod, edm::ConsumesCollector& iC) :
-    Mtag_(iConfig.getParameter<edm::InputTag>("vtxTag")),
-    fallbackMtag_(iConfig.getParameter<edm::InputTag>("vtxFallbackTag")),
-    saveVtxTimes_(iConfig.getParameter<bool>("saveVtxTimes"))
-  {
-    edm::LogInfo ("PixelDigitizer ") <<"Enter the Pixel Digitizer";
-    
-    const std::string alias ("PileupVertexAccum"); 
-    
     mixMod.produces<PileupVertexContent>().setBranchAlias(alias);
 
     iC.consumes<edm::HepMCProduct>(Mtag_);
     iC.mayConsume<edm::HepMCProduct>(fallbackMtag_);
   }
-  
-  PileupVertexAccumulator::~PileupVertexAccumulator(){  
-  }
 
+  PileupVertexAccumulator::~PileupVertexAccumulator() {}
 
   //
   // member functions
   //
-  
-  void
-  PileupVertexAccumulator::initializeEvent(edm::Event const& e, edm::EventSetup const& iSetup) {
+
+  void PileupVertexAccumulator::initializeEvent(edm::Event const& e, edm::EventSetup const& iSetup) {
     // Make sure that the first crossing processed starts indexing the minbias events from zero.
 
     pT_Hats_.clear();
@@ -98,21 +92,20 @@ namespace cms
     t_posns_.clear();
   }
 
-  void
-  PileupVertexAccumulator::accumulate(edm::Event const& iEvent, edm::EventSetup const& iSetup) {
+  void PileupVertexAccumulator::accumulate(edm::Event const& iEvent, edm::EventSetup const& iSetup) {
     // don't do anything for hard-scatter signal events
   }
 
-  void
-  PileupVertexAccumulator::accumulate(PileUpEventPrincipal const& iEvent, edm::EventSetup const& iSetup, edm::StreamID const& streamID) {
-
+  void PileupVertexAccumulator::accumulate(PileUpEventPrincipal const& iEvent,
+                                           edm::EventSetup const& iSetup,
+                                           edm::StreamID const& streamID) {
     edm::Handle<edm::HepMCProduct> MCevt;
     iEvent.getByLabel(Mtag_, MCevt);
-    if(MCevt.whyFailed()) {
+    if (MCevt.whyFailed()) {
       iEvent.getByLabel(fallbackMtag_, MCevt);
     }
 
-    const HepMC::GenEvent *myGenEvent = MCevt->GetEvent();
+    const HepMC::GenEvent* myGenEvent = MCevt->GetEvent();
 
     double pthat = myGenEvent->event_scale();
     float pt_hat = float(pthat);
@@ -124,35 +117,30 @@ namespace cms
     HepMC::GenEvent::vertex_const_iterator vend = myGenEvent->vertices_end();
 
     // for production point, pick first vertex
-    viter=vbegin; 
+    viter = vbegin;
 
-    if(viter!=vend){
+    if (viter != vend) {
       // The origin vertex (turn it to cm's from GenEvent mm's)
-      HepMC::GenVertex* v = *viter;   
-      float zpos = v->position().z()*0.1;
- 
+      HepMC::GenVertex* v = *viter;
+      float zpos = v->position().z() * 0.1;
+
       z_posns_.push_back(zpos);
 
       if (saveVtxTimes_) {
-          float tpos = v->position().t()/299792458e-6; // turn from mm to ns
-          t_posns_.push_back(tpos);
+        float tpos = v->position().t() / 299792458e-6;  // turn from mm to ns
+        t_posns_.push_back(tpos);
       }
     }
 
     //    delete myGenEvent;
-
   }
 
   // ------------ method called to produce write the data  ------------
-  void
-  PileupVertexAccumulator::finalizeEvent(edm::Event& iEvent, const edm::EventSetup& iSetup) {
-
+  void PileupVertexAccumulator::finalizeEvent(edm::Event& iEvent, const edm::EventSetup& iSetup) {
     std::unique_ptr<PileupVertexContent> PUVtxC(new PileupVertexContent(pT_Hats_, z_posns_, t_posns_));
 
     // write output to event
     iEvent.put(std::move(PUVtxC));
   }
 
-
-}// end namespace cms::
-
+}  // namespace cms
diff --git a/SimGeneral/PileupInformation/plugins/PileupVertexAccumulator.h b/SimGeneral/PileupInformation/plugins/PileupVertexAccumulator.h
index de2476aca8770..cb394701c2705 100644
--- a/SimGeneral/PileupInformation/plugins/PileupVertexAccumulator.h
+++ b/SimGeneral/PileupInformation/plugins/PileupVertexAccumulator.h
@@ -29,17 +29,19 @@ namespace edm {
   class Event;
   class EventSetup;
   class ParameterSet;
-  template<typename T> class Handle;
+  template <typename T>
+  class Handle;
   class StreamID;
-}
+}  // namespace edm
 
 class PileUpEventPrincipal;
 
 namespace cms {
   class PileupVertexAccumulator : public DigiAccumulatorMixMod {
   public:
-
-    explicit PileupVertexAccumulator(const edm::ParameterSet& conf, edm::ProducerBase& mixMod, edm::ConsumesCollector& iC);
+    explicit PileupVertexAccumulator(const edm::ParameterSet& conf,
+                                     edm::ProducerBase& mixMod,
+                                     edm::ConsumesCollector& iC);
 
     ~PileupVertexAccumulator() override;
 
@@ -57,9 +59,7 @@ namespace cms {
     edm::InputTag Mtag_;
     edm::InputTag fallbackMtag_;
     bool saveVtxTimes_;
-
   };
-}
-
+}  // namespace cms
 
 #endif
diff --git a/SimGeneral/PileupInformation/plugins/SealModule.cc b/SimGeneral/PileupInformation/plugins/SealModule.cc
index b916fac36a4d2..82765c41b287c 100644
--- a/SimGeneral/PileupInformation/plugins/SealModule.cc
+++ b/SimGeneral/PileupInformation/plugins/SealModule.cc
@@ -4,4 +4,3 @@
 
 using cms::PileupVertexAccumulator;
 DEFINE_DIGI_ACCUMULATOR(PileupVertexAccumulator);
-
diff --git a/SimGeneral/TrackingAnalysis/interface/EncodedTruthId.h b/SimGeneral/TrackingAnalysis/interface/EncodedTruthId.h
index 1c7e287bcb813..cf400cacc016a 100644
--- a/SimGeneral/TrackingAnalysis/interface/EncodedTruthId.h
+++ b/SimGeneral/TrackingAnalysis/interface/EncodedTruthId.h
@@ -1,60 +1,43 @@
 #ifndef TrackingAnalysis_EncodedTruthId_h
 #define TrackingAnalysis_EncodedTruthId_h
 
-#include <iosfwd>
 #include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
+#include <iosfwd>
 
-class EncodedTruthId : public EncodedEventId
-{
-
-    friend std::ostream& operator<< (std::ostream& os, const EncodedTruthId & id);
+class EncodedTruthId : public EncodedEventId {
+  friend std::ostream &operator<<(std::ostream &os, const EncodedTruthId &id);
 
 public:
-
-// Constructors
-    EncodedTruthId();
-    EncodedTruthId(EncodedEventId eid, int index);
-
-// Getters
-    int index() const
-    {
-        return index_;
-    }
-
-// Operators
-    int operator==(const EncodedTruthId& id) const
-    {
-        if (EncodedEventId::operator==(id))
-        {
-            return index_ == id.index_;
-        }
-        else
-        {
-            return EncodedEventId::operator==(id);
-        }
+  // Constructors
+  EncodedTruthId();
+  EncodedTruthId(EncodedEventId eid, int index);
+
+  // Getters
+  int index() const { return index_; }
+
+  // Operators
+  int operator==(const EncodedTruthId &id) const {
+    if (EncodedEventId::operator==(id)) {
+      return index_ == id.index_;
+    } else {
+      return EncodedEventId::operator==(id);
     }
+  }
 
-    int operator!=(const EncodedTruthId& id) const
-    {
-        return !(operator==(id));
-    }
+  int operator!=(const EncodedTruthId &id) const { return !(operator==(id)); }
 
-    int operator<( const EncodedTruthId& id) const
-    {
-        if (EncodedEventId::operator==(id))
-        {
-            return index_ < id.index_;
-        }
-        else
-        {
-            return (EncodedEventId::operator<(id));
-        }
+  int operator<(const EncodedTruthId &id) const {
+    if (EncodedEventId::operator==(id)) {
+      return index_ < id.index_;
+    } else {
+      return (EncodedEventId::operator<(id));
     }
+  }
 
 private:
-    int index_;
+  int index_;
 };
 
-std::ostream& operator<<(std::ostream & os , EncodedTruthId& id);
+std::ostream &operator<<(std::ostream &os, EncodedTruthId &id);
 
 #endif
diff --git a/SimGeneral/TrackingAnalysis/interface/MuonPSimHitSelector.h b/SimGeneral/TrackingAnalysis/interface/MuonPSimHitSelector.h
index 8e8a5a544881d..5edd58e1940ba 100644
--- a/SimGeneral/TrackingAnalysis/interface/MuonPSimHitSelector.h
+++ b/SimGeneral/TrackingAnalysis/interface/MuonPSimHitSelector.h
@@ -4,21 +4,17 @@
 #include "SimGeneral/TrackingAnalysis/interface/PSimHitSelector.h"
 
 //! MuonPSimHitSelector class
-class MuonPSimHitSelector : public PSimHitSelector
-{
-
+class MuonPSimHitSelector : public PSimHitSelector {
 public:
+  //! Constructor by pset.
+  /* Creates a MuonPSimHitSelector with association given by pset.
 
-    //! Constructor by pset.
-    /* Creates a MuonPSimHitSelector with association given by pset.
-
-       /param[in] pset with the configuration values
-    */
-    MuonPSimHitSelector(edm::ParameterSet const & config) : PSimHitSelector(config) {}
-
-    //! Pre-process event information
-    void select(PSimHitCollection &, edm::Event const &, edm::EventSetup const &) const override;
+     /param[in] pset with the configuration values
+  */
+  MuonPSimHitSelector(edm::ParameterSet const &config) : PSimHitSelector(config) {}
 
+  //! Pre-process event information
+  void select(PSimHitCollection &, edm::Event const &, edm::EventSetup const &) const override;
 };
 
 #endif
diff --git a/SimGeneral/TrackingAnalysis/interface/PSimHitSelector.h b/SimGeneral/TrackingAnalysis/interface/PSimHitSelector.h
index 5c7fd7c6f90ec..68d1abe84443d 100644
--- a/SimGeneral/TrackingAnalysis/interface/PSimHitSelector.h
+++ b/SimGeneral/TrackingAnalysis/interface/PSimHitSelector.h
@@ -12,32 +12,28 @@
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 
 //! PSimHitSelector class
-class PSimHitSelector
-{
-
+class PSimHitSelector {
 public:
+  typedef std::vector<PSimHit> PSimHitCollection;
 
-    typedef std::vector<PSimHit> PSimHitCollection;
-
-    //! Constructor by pset.
-    /* Creates a MuonPSimHitSelector with association given by pset.
+  //! Constructor by pset.
+  /* Creates a MuonPSimHitSelector with association given by pset.
 
-       /param[in] pset with the configuration values
-    */
-    PSimHitSelector(edm::ParameterSet const &);
-    std::string mixLabel_;
+     /param[in] pset with the configuration values
+  */
+  PSimHitSelector(edm::ParameterSet const &);
+  std::string mixLabel_;
 
-    //! Virtual destructor.
-    virtual ~PSimHitSelector() {}
+  //! Virtual destructor.
+  virtual ~PSimHitSelector() {}
 
-    //! Select the psimhit add them to a PSimHitCollection
-    virtual void select(PSimHitCollection &, edm::Event const &, edm::EventSetup const &) const;
+  //! Select the psimhit add them to a PSimHitCollection
+  virtual void select(PSimHitCollection &, edm::Event const &, edm::EventSetup const &) const;
 
 protected:
+  typedef std::map<std::string, std::vector<std::string>> PSimHitCollectionMap;
 
-    typedef std::map<std::string, std::vector<std::string> > PSimHitCollectionMap;
-
-    PSimHitCollectionMap pSimHitCollectionMap_;
+  PSimHitCollectionMap pSimHitCollectionMap_;
 };
 
 #endif
diff --git a/SimGeneral/TrackingAnalysis/interface/PixelPSimHitSelector.h b/SimGeneral/TrackingAnalysis/interface/PixelPSimHitSelector.h
index 73e52a00519a7..1484f65ce9765 100644
--- a/SimGeneral/TrackingAnalysis/interface/PixelPSimHitSelector.h
+++ b/SimGeneral/TrackingAnalysis/interface/PixelPSimHitSelector.h
@@ -4,21 +4,17 @@
 #include "SimGeneral/TrackingAnalysis/interface/PSimHitSelector.h"
 
 //! PixelPSimHitSelector class
-class PixelPSimHitSelector : public PSimHitSelector
-{
-
+class PixelPSimHitSelector : public PSimHitSelector {
 public:
+  //! Constructor by pset.
+  /* Creates a PixelPSimHitSelector with association given by pset.
 
-    //! Constructor by pset.
-    /* Creates a PixelPSimHitSelector with association given by pset.
-
-       /param[in] pset with the configuration values
-    */
-    PixelPSimHitSelector(edm::ParameterSet const & config) : PSimHitSelector(config) {}
-
-    //! Pre-process event information
-    void select(PSimHitCollection &, edm::Event const &, edm::EventSetup const &) const override;
+     /param[in] pset with the configuration values
+  */
+  PixelPSimHitSelector(edm::ParameterSet const &config) : PSimHitSelector(config) {}
 
+  //! Pre-process event information
+  void select(PSimHitCollection &, edm::Event const &, edm::EventSetup const &) const override;
 };
 
 #endif
diff --git a/SimGeneral/TrackingAnalysis/interface/SimHitTPAssociationProducer.h b/SimGeneral/TrackingAnalysis/interface/SimHitTPAssociationProducer.h
index 2823973e3edee..cd13b32303ee2 100644
--- a/SimGeneral/TrackingAnalysis/interface/SimHitTPAssociationProducer.h
+++ b/SimGeneral/TrackingAnalysis/interface/SimHitTPAssociationProducer.h
@@ -1,9 +1,9 @@
 #ifndef SimGeneral_TrackingAnalysis_SimHitTPAssociationProducer_h
 #define SimGeneral_TrackingAnalysis_SimHitTPAssociationProducer_h
 
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/global/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
@@ -12,22 +12,20 @@
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticleFwd.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-class SimHitTPAssociationProducer : public edm::global::EDProducer<>
-{
+class SimHitTPAssociationProducer : public edm::global::EDProducer<> {
 public:
-
   typedef std::pair<TrackingParticleRef, TrackPSimHitRef> SimHitTPPair;
   typedef std::vector<SimHitTPPair> SimHitTPAssociationList;
 
-  explicit SimHitTPAssociationProducer(const edm::ParameterSet&);
+  explicit SimHitTPAssociationProducer(const edm::ParameterSet &);
   ~SimHitTPAssociationProducer() override;
 
-  static bool simHitTPAssociationListGreater(SimHitTPPair i,SimHitTPPair j) { return (i.first.key()>j.first.key()); }
+  static bool simHitTPAssociationListGreater(SimHitTPPair i, SimHitTPPair j) { return (i.first.key() > j.first.key()); }
 
 private:
-  void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
+  void produce(edm::StreamID, edm::Event &, const edm::EventSetup &) const override;
 
-  std::vector<edm::EDGetTokenT<edm::PSimHitContainer> > _simHitSrc;
+  std::vector<edm::EDGetTokenT<edm::PSimHitContainer>> _simHitSrc;
   edm::EDGetTokenT<TrackingParticleCollection> _trackingParticleSrc;
 };
 #endif
diff --git a/SimGeneral/TrackingAnalysis/interface/TrackerPSimHitSelector.h b/SimGeneral/TrackingAnalysis/interface/TrackerPSimHitSelector.h
index 793926c6c3730..75d0e03c908e7 100644
--- a/SimGeneral/TrackingAnalysis/interface/TrackerPSimHitSelector.h
+++ b/SimGeneral/TrackingAnalysis/interface/TrackerPSimHitSelector.h
@@ -4,21 +4,17 @@
 #include "SimGeneral/TrackingAnalysis/interface/PSimHitSelector.h"
 
 //! TrackerPSimHitSelector class
-class TrackerPSimHitSelector : public PSimHitSelector
-{
-
+class TrackerPSimHitSelector : public PSimHitSelector {
 public:
+  //! Constructor by pset.
+  /* Creates a TrackerPSimHitSelector with association given by pset.
 
-    //! Constructor by pset.
-    /* Creates a TrackerPSimHitSelector with association given by pset.
-
-       /param[in] pset with the configuration values
-    */
-    TrackerPSimHitSelector(edm::ParameterSet const & config) : PSimHitSelector(config) {}
-
-    //! Pre-process event information
-    void select(PSimHitCollection &, edm::Event const &, edm::EventSetup const &) const override;
+     /param[in] pset with the configuration values
+  */
+  TrackerPSimHitSelector(edm::ParameterSet const &config) : PSimHitSelector(config) {}
 
+  //! Pre-process event information
+  void select(PSimHitCollection &, edm::Event const &, edm::EventSetup const &) const override;
 };
 
 #endif
diff --git a/SimGeneral/TrackingAnalysis/interface/TrackingParticleNumberOfLayers.h b/SimGeneral/TrackingAnalysis/interface/TrackingParticleNumberOfLayers.h
index 3b047994c1fc0..8d62182dd64e5 100644
--- a/SimGeneral/TrackingAnalysis/interface/TrackingParticleNumberOfLayers.h
+++ b/SimGeneral/TrackingAnalysis/interface/TrackingParticleNumberOfLayers.h
@@ -4,8 +4,8 @@
 #include "FWCore/Framework/interface/Event.h"
 
 #include "DataFormats/Common/interface/ValueMap.h"
-#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 
 /**
  * This class calculates the number of tracker layers, pixel layers,
@@ -43,17 +43,14 @@
  */
 class TrackingParticleNumberOfLayers {
 public:
-  TrackingParticleNumberOfLayers(const edm::Event& iEvent, const std::vector<edm::EDGetTokenT<std::vector<PSimHit> > >& simHitTokens);
+  TrackingParticleNumberOfLayers(const edm::Event &iEvent,
+                                 const std::vector<edm::EDGetTokenT<std::vector<PSimHit>>> &simHitTokens);
 
-  enum {
-    nTrackerLayers = 0,
-    nPixelLayers = 1,
-    nStripMonoAndStereoLayers = 2
-  };
+  enum { nTrackerLayers = 0, nPixelLayers = 1, nStripMonoAndStereoLayers = 2 };
   std::tuple<std::unique_ptr<edm::ValueMap<unsigned int>>,
              std::unique_ptr<edm::ValueMap<unsigned int>>,
              std::unique_ptr<edm::ValueMap<unsigned int>>>
-  calculate(const edm::Handle<TrackingParticleCollection>& tps, const edm::EventSetup& iSetup) const;
+  calculate(const edm::Handle<TrackingParticleCollection> &tps, const edm::EventSetup &iSetup) const;
 
 private:
   // used as multimap, but faster
diff --git a/SimGeneral/TrackingAnalysis/plugins/PreMixingTrackerDigiSimLinkWorkers.cc b/SimGeneral/TrackingAnalysis/plugins/PreMixingTrackerDigiSimLinkWorkers.cc
index e693540e80766..b1bb37aecdd54 100644
--- a/SimGeneral/TrackingAnalysis/plugins/PreMixingTrackerDigiSimLinkWorkers.cc
+++ b/SimGeneral/TrackingAnalysis/plugins/PreMixingTrackerDigiSimLinkWorkers.cc
@@ -1,11 +1,11 @@
+#include "DataFormats/Common/interface/DetSetVector.h"
+#include "SimDataFormats/TrackerDigiSimLink/interface/PixelDigiSimLink.h"
+#include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h"
 #include "SimGeneral/PreMixingModule/interface/PreMixingDigiSimLinkWorker.h"
 #include "SimGeneral/PreMixingModule/interface/PreMixingWorkerFactory.h"
-#include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h"
-#include "SimDataFormats/TrackerDigiSimLink/interface/PixelDigiSimLink.h"
-#include "DataFormats/Common/interface/DetSetVector.h"
 
-using PreMixingPixelDigiSimLinkWorker = PreMixingDigiSimLinkWorker<edm::DetSetVector<PixelDigiSimLink> >;
-using PreMixingStripDigiSimLinkWorker = PreMixingDigiSimLinkWorker<edm::DetSetVector<StripDigiSimLink> >;
+using PreMixingPixelDigiSimLinkWorker = PreMixingDigiSimLinkWorker<edm::DetSetVector<PixelDigiSimLink>>;
+using PreMixingStripDigiSimLinkWorker = PreMixingDigiSimLinkWorker<edm::DetSetVector<StripDigiSimLink>>;
 
 DEFINE_PREMIXING_WORKER(PreMixingPixelDigiSimLinkWorker);
 DEFINE_PREMIXING_WORKER(PreMixingStripDigiSimLinkWorker);
diff --git a/SimGeneral/TrackingAnalysis/plugins/PreMixingTrackingParticleWorker.cc b/SimGeneral/TrackingAnalysis/plugins/PreMixingTrackingParticleWorker.cc
index e64d4516fe26f..3829d700764c7 100644
--- a/SimGeneral/TrackingAnalysis/plugins/PreMixingTrackingParticleWorker.cc
+++ b/SimGeneral/TrackingAnalysis/plugins/PreMixingTrackingParticleWorker.cc
@@ -1,8 +1,8 @@
-#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ProducerBase.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "SimGeneral/MixingModule/interface/PileUpEventPrincipal.h"
 
 #include "DataFormats/Common/interface/Handle.h"
@@ -12,26 +12,31 @@
 #include "SimGeneral/PreMixingModule/interface/PreMixingWorker.h"
 #include "SimGeneral/PreMixingModule/interface/PreMixingWorkerFactory.h"
 
-class PreMixingTrackingParticleWorker: public PreMixingWorker {
+class PreMixingTrackingParticleWorker : public PreMixingWorker {
 public:
-  PreMixingTrackingParticleWorker(const edm::ParameterSet& ps, edm::ProducerBase& producer, edm::ConsumesCollector && iC);
+  PreMixingTrackingParticleWorker(const edm::ParameterSet &ps,
+                                  edm::ProducerBase &producer,
+                                  edm::ConsumesCollector &&iC);
   ~PreMixingTrackingParticleWorker() override = default;
-    
-  void initializeEvent(edm::Event const& iEvent, edm::EventSetup const& iSetup) override;
-  void addSignals(edm::Event const& iEvent, edm::EventSetup const& iSetup) override;
-  void addPileups(PileUpEventPrincipal const& pep, edm::EventSetup const& iSetup) override;
-  void put(edm::Event& iEvent, edm::EventSetup const& iSetup, std::vector<PileupSummaryInfo> const& ps, int bunchSpacing) override;
+
+  void initializeEvent(edm::Event const &iEvent, edm::EventSetup const &iSetup) override;
+  void addSignals(edm::Event const &iEvent, edm::EventSetup const &iSetup) override;
+  void addPileups(PileUpEventPrincipal const &pep, edm::EventSetup const &iSetup) override;
+  void put(edm::Event &iEvent,
+           edm::EventSetup const &iSetup,
+           std::vector<PileupSummaryInfo> const &ps,
+           int bunchSpacing) override;
 
 private:
-  void add(const std::vector<TrackingParticle>& particles, const std::vector<TrackingVertex>& vertices);
-    
-  edm::EDGetTokenT<std::vector<TrackingParticle> > TrackSigToken_;  // Token to retrieve information  
-  edm::EDGetTokenT<std::vector<TrackingVertex> > VtxSigToken_;  // Token to retrieve information  
+  void add(const std::vector<TrackingParticle> &particles, const std::vector<TrackingVertex> &vertices);
 
-  edm::InputTag TrackingParticlePileInputTag_ ;    // InputTag for pileup tracks
+  edm::EDGetTokenT<std::vector<TrackingParticle>> TrackSigToken_;  // Token to retrieve information
+  edm::EDGetTokenT<std::vector<TrackingVertex>> VtxSigToken_;      // Token to retrieve information
 
-  std::string TrackingParticleCollectionDM_; // secondary name to be given to new TrackingParticle
+  edm::InputTag TrackingParticlePileInputTag_;  // InputTag for pileup tracks
 
+  std::string TrackingParticleCollectionDM_;  // secondary name to be given to
+                                              // new TrackingParticle
 
   std::unique_ptr<std::vector<TrackingParticle>> NewTrackList_;
   std::unique_ptr<std::vector<TrackingVertex>> NewVertexList_;
@@ -39,41 +44,45 @@ class PreMixingTrackingParticleWorker: public PreMixingWorker {
   TrackingVertexRefProd VertexListRef_;
 };
 
-PreMixingTrackingParticleWorker::PreMixingTrackingParticleWorker(const edm::ParameterSet& ps, edm::ProducerBase& producer, edm::ConsumesCollector && iC):
-  TrackSigToken_(iC.consumes<std::vector<TrackingParticle> >(ps.getParameter<edm::InputTag>("labelSig"))),
-  VtxSigToken_  (iC.consumes<std::vector<TrackingVertex>   >(ps.getParameter<edm::InputTag>("labelSig"))),
-  TrackingParticlePileInputTag_(ps.getParameter<edm::InputTag>("pileInputTag")),
-  TrackingParticleCollectionDM_(ps.getParameter<std::string>("collectionDM"))
-{
-  producer.produces< std::vector<TrackingParticle> >(TrackingParticleCollectionDM_);
-  producer.produces< std::vector<TrackingVertex> >(TrackingParticleCollectionDM_);
+PreMixingTrackingParticleWorker::PreMixingTrackingParticleWorker(const edm::ParameterSet &ps,
+                                                                 edm::ProducerBase &producer,
+                                                                 edm::ConsumesCollector &&iC)
+    : TrackSigToken_(iC.consumes<std::vector<TrackingParticle>>(ps.getParameter<edm::InputTag>("labelSig"))),
+      VtxSigToken_(iC.consumes<std::vector<TrackingVertex>>(ps.getParameter<edm::InputTag>("labelSig"))),
+      TrackingParticlePileInputTag_(ps.getParameter<edm::InputTag>("pileInputTag")),
+      TrackingParticleCollectionDM_(ps.getParameter<std::string>("collectionDM")) {
+  producer.produces<std::vector<TrackingParticle>>(TrackingParticleCollectionDM_);
+  producer.produces<std::vector<TrackingVertex>>(TrackingParticleCollectionDM_);
 }
 
-
-void PreMixingTrackingParticleWorker::initializeEvent(edm::Event const& iEvent, edm::EventSetup const& iSetup) {
+void PreMixingTrackingParticleWorker::initializeEvent(edm::Event const &iEvent, edm::EventSetup const &iSetup) {
   NewTrackList_ = std::make_unique<std::vector<TrackingParticle>>();
   NewVertexList_ = std::make_unique<std::vector<TrackingVertex>>();
 
   // need RefProds in order to re-key the particle<->vertex refs
-  // TODO: try to remove const_cast, requires making Event non-const in BMixingModule::initializeEvent
-  TrackListRef_  = const_cast<edm::Event&>(iEvent).getRefBeforePut< std::vector<TrackingParticle> >(TrackingParticleCollectionDM_);
-  VertexListRef_ = const_cast<edm::Event&>(iEvent).getRefBeforePut< std::vector<TrackingVertex> >(TrackingParticleCollectionDM_);    
+  // TODO: try to remove const_cast, requires making Event non-const in
+  // BMixingModule::initializeEvent
+  TrackListRef_ =
+      const_cast<edm::Event &>(iEvent).getRefBeforePut<std::vector<TrackingParticle>>(TrackingParticleCollectionDM_);
+  VertexListRef_ =
+      const_cast<edm::Event &>(iEvent).getRefBeforePut<std::vector<TrackingVertex>>(TrackingParticleCollectionDM_);
 }
 
-void PreMixingTrackingParticleWorker::addSignals(edm::Event const& iEvent, edm::EventSetup const& iSetup) {
+void PreMixingTrackingParticleWorker::addSignals(edm::Event const &iEvent, edm::EventSetup const &iSetup) {
   edm::Handle<std::vector<TrackingParticle>> tracks;
   iEvent.getByToken(TrackSigToken_, tracks);
 
   edm::Handle<std::vector<TrackingVertex>> vtxs;
   iEvent.getByToken(VtxSigToken_, vtxs);
 
-  if(tracks.isValid() && vtxs.isValid()) {
+  if (tracks.isValid() && vtxs.isValid()) {
     add(*tracks, *vtxs);
   }
 }
 
-void PreMixingTrackingParticleWorker::addPileups(PileUpEventPrincipal const& pep, edm::EventSetup const& iSetup) {
-  LogDebug("PreMixingTrackingParticleWorker") <<"\n===============> adding pileups from event  "<<pep.principal().id()<<" for bunchcrossing "<<pep.bunchCrossing();
+void PreMixingTrackingParticleWorker::addPileups(PileUpEventPrincipal const &pep, edm::EventSetup const &iSetup) {
+  LogDebug("PreMixingTrackingParticleWorker") << "\n===============> adding pileups from event  "
+                                              << pep.principal().id() << " for bunchcrossing " << pep.bunchCrossing();
 
   edm::Handle<std::vector<TrackingParticle>> inputHandle;
   pep.getByLabel(TrackingParticlePileInputTag_, inputHandle);
@@ -81,62 +90,67 @@ void PreMixingTrackingParticleWorker::addPileups(PileUpEventPrincipal const& pep
   edm::Handle<std::vector<TrackingVertex>> inputVHandle;
   pep.getByLabel(TrackingParticlePileInputTag_, inputVHandle);
 
-  if(inputHandle.isValid() && inputVHandle.isValid()) {
+  if (inputHandle.isValid() && inputVHandle.isValid()) {
     add(*inputHandle, *inputVHandle);
   }
 }
 
-void PreMixingTrackingParticleWorker::add(const std::vector<TrackingParticle>& particles, const std::vector<TrackingVertex>& vertices) {
+void PreMixingTrackingParticleWorker::add(const std::vector<TrackingParticle> &particles,
+                                          const std::vector<TrackingVertex> &vertices) {
   const size_t StartingIndexV = NewVertexList_->size();
   const size_t StartingIndexT = NewTrackList_->size();
 
-  // grab Vertices, store copy, preserving indices.  Easier to loop over vertices first - fewer links
-  for(const auto& vtx: vertices) {
+  // grab Vertices, store copy, preserving indices.  Easier to loop over
+  // vertices first - fewer links
+  for (const auto &vtx : vertices) {
     NewVertexList_->push_back(vtx);
   }
 
   // grab tracks, store copy
-  for(const auto& track: particles) {
-    const auto& oldRef=track.parentVertex();
-    auto newRef=TrackingVertexRef( VertexListRef_, oldRef.index()+StartingIndexV );
+  for (const auto &track : particles) {
+    const auto &oldRef = track.parentVertex();
+    auto newRef = TrackingVertexRef(VertexListRef_, oldRef.index() + StartingIndexV);
     NewTrackList_->push_back(track);
 
-    auto & Ntrack = NewTrackList_->back();  //modify copy
+    auto &Ntrack = NewTrackList_->back();  // modify copy
 
-    Ntrack.setParentVertex( newRef );
+    Ntrack.setParentVertex(newRef);
     Ntrack.clearDecayVertices();
 
     // next, loop over daughter vertices, same strategy
-    for( auto const& vertexRef : track.decayVertices() ) {
-      auto newRef=TrackingVertexRef( VertexListRef_, vertexRef.index()+StartingIndexV );
+    for (auto const &vertexRef : track.decayVertices()) {
+      auto newRef = TrackingVertexRef(VertexListRef_, vertexRef.index() + StartingIndexV);
       Ntrack.addDecayVertex(newRef);
     }
   }
 
   // Now that tracks are handled, go back and put correct Refs in vertices
-  // Operate only on the added pileup vertices, and leave the already-existing vertices untouched
+  // Operate only on the added pileup vertices, and leave the already-existing
+  // vertices untouched
   std::vector<decltype(TrackingParticleRef().index())> sourceTrackIndices;
   std::vector<decltype(TrackingParticleRef().index())> daughterTrackIndices;
-  for(size_t iVertex = StartingIndexV; iVertex != NewVertexList_->size(); ++iVertex) {
-    auto& vertex = (*NewVertexList_)[iVertex];
+  for (size_t iVertex = StartingIndexV; iVertex != NewVertexList_->size(); ++iVertex) {
+    auto &vertex = (*NewVertexList_)[iVertex];
 
     // Need to copy the indices before clearing the vectors
     sourceTrackIndices.reserve(vertex.sourceTracks().size());
     daughterTrackIndices.reserve(vertex.daughterTracks().size());
-    for(auto const& ref: vertex.sourceTracks()) sourceTrackIndices.push_back(ref.index());
-    for(auto const& ref: vertex.daughterTracks()) daughterTrackIndices.push_back(ref.index());
+    for (auto const &ref : vertex.sourceTracks())
+      sourceTrackIndices.push_back(ref.index());
+    for (auto const &ref : vertex.daughterTracks())
+      daughterTrackIndices.push_back(ref.index());
 
     vertex.clearParentTracks();
     vertex.clearDaughterTracks();
 
-    for( auto index : sourceTrackIndices ) {
-      auto newRef=TrackingParticleRef( TrackListRef_, index+StartingIndexT );
+    for (auto index : sourceTrackIndices) {
+      auto newRef = TrackingParticleRef(TrackListRef_, index + StartingIndexT);
       vertex.addParentTrack(newRef);
     }
 
-    // next, loop over daughter tracks, same strategy                                                                 
-    for( auto index : daughterTrackIndices ) {
-      auto newRef=TrackingParticleRef( TrackListRef_, index+StartingIndexT );
+    // next, loop over daughter tracks, same strategy
+    for (auto index : daughterTrackIndices) {
+      auto newRef = TrackingParticleRef(TrackListRef_, index + StartingIndexT);
       vertex.addDaughterTrack(newRef);
     }
 
@@ -144,9 +158,12 @@ void PreMixingTrackingParticleWorker::add(const std::vector<TrackingParticle>& p
     daughterTrackIndices.clear();
   }
 }
-  
-void PreMixingTrackingParticleWorker::put(edm::Event& iEvent, edm::EventSetup const& iSetup, std::vector<PileupSummaryInfo> const& ps, int bunchSpacing) {
-  edm::LogInfo("PreMixingTrackingParticleWorker") << "total # Merged Tracks: " << NewTrackList_->size() ;
+
+void PreMixingTrackingParticleWorker::put(edm::Event &iEvent,
+                                          edm::EventSetup const &iSetup,
+                                          std::vector<PileupSummaryInfo> const &ps,
+                                          int bunchSpacing) {
+  edm::LogInfo("PreMixingTrackingParticleWorker") << "total # Merged Tracks: " << NewTrackList_->size();
   iEvent.put(std::move(NewTrackList_), TrackingParticleCollectionDM_);
   iEvent.put(std::move(NewVertexList_), TrackingParticleCollectionDM_);
 }
diff --git a/SimGeneral/TrackingAnalysis/plugins/SimHitTPAssociationProducer.cc b/SimGeneral/TrackingAnalysis/plugins/SimHitTPAssociationProducer.cc
index 70051ca42fe05..e8c9523b9e0dd 100644
--- a/SimGeneral/TrackingAnalysis/plugins/SimHitTPAssociationProducer.cc
+++ b/SimGeneral/TrackingAnalysis/plugins/SimHitTPAssociationProducer.cc
@@ -1,8 +1,8 @@
-#include <memory>
-#include <vector>
-#include <iostream>
 #include <fstream>
+#include <iostream>
+#include <memory>
 #include <utility>
+#include <vector>
 
 #include "FWCore/Utilities/interface/InputTag.h"
 
@@ -14,27 +14,26 @@
 
 #include "SimGeneral/TrackingAnalysis/interface/SimHitTPAssociationProducer.h"
 
-SimHitTPAssociationProducer::SimHitTPAssociationProducer(const edm::ParameterSet & cfg) 
-  : _simHitSrc(),
-    _trackingParticleSrc(consumes<TrackingParticleCollection>(cfg.getParameter<edm::InputTag>("trackingParticleSrc")))
-{
+SimHitTPAssociationProducer::SimHitTPAssociationProducer(const edm::ParameterSet &cfg)
+    : _simHitSrc(),
+      _trackingParticleSrc(
+          consumes<TrackingParticleCollection>(cfg.getParameter<edm::InputTag>("trackingParticleSrc"))) {
   produces<SimHitTPAssociationList>();
-  std::vector<edm::InputTag> tags = cfg.getParameter<std::vector<edm::InputTag> >("simHitSrc");
+  std::vector<edm::InputTag> tags = cfg.getParameter<std::vector<edm::InputTag>>("simHitSrc");
   _simHitSrc.reserve(tags.size());
-  for(auto const& tag  : tags) {
+  for (auto const &tag : tags) {
     _simHitSrc.emplace_back(consumes<edm::PSimHitContainer>(tag));
   }
 }
 
-SimHitTPAssociationProducer::~SimHitTPAssociationProducer() {
-}
-		
-void SimHitTPAssociationProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& es) const {
+SimHitTPAssociationProducer::~SimHitTPAssociationProducer() {}
+
+void SimHitTPAssociationProducer::produce(edm::StreamID, edm::Event &iEvent, const edm::EventSetup &es) const {
   std::unique_ptr<SimHitTPAssociationList> simHitTPList(new SimHitTPAssociationList);
- 
+
   // TrackingParticle
-  edm::Handle<TrackingParticleCollection>  TPCollectionH;
-  iEvent.getByToken(_trackingParticleSrc,  TPCollectionH);
+  edm::Handle<TrackingParticleCollection> TPCollectionH;
+  iEvent.getByToken(_trackingParticleSrc, TPCollectionH);
 
   // prepare temporary map between SimTrackId and TrackingParticle index
   std::map<std::pair<size_t, EncodedEventId>, TrackingParticleRef> mapping;
@@ -42,32 +41,31 @@ void SimHitTPAssociationProducer::produce(edm::StreamID, edm::Event& iEvent, con
     TrackingParticleRef trackingParticle(TPCollectionH, itp);
     // SimTracks inside TrackingParticle
     EncodedEventId eid(trackingParticle->eventId());
-    for (auto itrk  = trackingParticle->g4Track_begin(); itrk != trackingParticle->g4Track_end(); ++itrk) {
+    for (auto itrk = trackingParticle->g4Track_begin(); itrk != trackingParticle->g4Track_end(); ++itrk) {
       std::pair<uint32_t, EncodedEventId> trkid(itrk->trackId(), eid);
       mapping.insert(std::make_pair(trkid, trackingParticle));
     }
   }
 
   // PSimHits
-  for (auto const& psit : _simHitSrc ) {
-    edm::Handle<edm::PSimHitContainer>  PSimHitCollectionH;
-    iEvent.getByToken(psit,  PSimHitCollectionH);
-    for (unsigned int psimHit = 0;psimHit != PSimHitCollectionH->size();++psimHit) {
-      TrackPSimHitRef pSimHitRef(PSimHitCollectionH,psimHit);
-      std::pair<uint32_t, EncodedEventId> simTkIds(pSimHitRef->trackId(),pSimHitRef->eventId()); 
+  for (auto const &psit : _simHitSrc) {
+    edm::Handle<edm::PSimHitContainer> PSimHitCollectionH;
+    iEvent.getByToken(psit, PSimHitCollectionH);
+    for (unsigned int psimHit = 0; psimHit != PSimHitCollectionH->size(); ++psimHit) {
+      TrackPSimHitRef pSimHitRef(PSimHitCollectionH, psimHit);
+      std::pair<uint32_t, EncodedEventId> simTkIds(pSimHitRef->trackId(), pSimHitRef->eventId());
       auto ipos = mapping.find(simTkIds);
       if (ipos != mapping.end()) {
-	simHitTPList->push_back(std::make_pair(ipos->second,pSimHitRef));
+        simHitTPList->push_back(std::make_pair(ipos->second, pSimHitRef));
       }
     }
-  } 
-  
-  std::sort(simHitTPList->begin(),simHitTPList->end(),simHitTPAssociationListGreater);
-  iEvent.put(std::move(simHitTPList));
+  }
 
+  std::sort(simHitTPList->begin(), simHitTPList->end(), simHitTPAssociationListGreater);
+  iEvent.put(std::move(simHitTPList));
 }
 
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 
 DEFINE_FWK_MODULE(SimHitTPAssociationProducer);
diff --git a/SimGeneral/TrackingAnalysis/plugins/TrackingParticleNumberOfLayersProducer.cc b/SimGeneral/TrackingAnalysis/plugins/TrackingParticleNumberOfLayersProducer.cc
index 95e96397a18d8..f20ebc5a9830b 100644
--- a/SimGeneral/TrackingAnalysis/plugins/TrackingParticleNumberOfLayersProducer.cc
+++ b/SimGeneral/TrackingAnalysis/plugins/TrackingParticleNumberOfLayersProducer.cc
@@ -1,34 +1,33 @@
-#include "FWCore/Framework/interface/global/EDProducer.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 #include "SimGeneral/TrackingAnalysis/interface/TrackingParticleNumberOfLayers.h"
 
 /**
- * The purpose of this producer is to create a ValueMap<pair<unsigned int, unsigned int>>
- * for the number of pixel and strip stereo tracker layers the TrackingParticle has hits on.
+ * The purpose of this producer is to create a ValueMap<pair<unsigned int,
+ * unsigned int>> for the number of pixel and strip stereo tracker layers the
+ * TrackingParticle has hits on.
  */
-class TrackingParticleNumberOfLayersProducer: public edm::global::EDProducer<> {
+class TrackingParticleNumberOfLayersProducer : public edm::global::EDProducer<> {
 public:
-  TrackingParticleNumberOfLayersProducer(const edm::ParameterSet& iConfig);
+  TrackingParticleNumberOfLayersProducer(const edm::ParameterSet &iConfig);
 
-  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 
-  void produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const override;
+  void produce(edm::StreamID, edm::Event &iEvent, const edm::EventSetup &iSetup) const override;
 
 private:
   edm::EDGetTokenT<TrackingParticleCollection> tpToken_;
   std::vector<edm::EDGetTokenT<std::vector<PSimHit>>> simHitTokens_;
 };
 
-
-TrackingParticleNumberOfLayersProducer::TrackingParticleNumberOfLayersProducer(const edm::ParameterSet& iConfig):
-  tpToken_(consumes<TrackingParticleCollection>(iConfig.getParameter<edm::InputTag>("trackingParticles")))
-{
-  for(const auto& tag: iConfig.getParameter<std::vector<edm::InputTag>>("simHits")) {
+TrackingParticleNumberOfLayersProducer::TrackingParticleNumberOfLayersProducer(const edm::ParameterSet &iConfig)
+    : tpToken_(consumes<TrackingParticleCollection>(iConfig.getParameter<edm::InputTag>("trackingParticles"))) {
+  for (const auto &tag : iConfig.getParameter<std::vector<edm::InputTag>>("simHits")) {
     simHitTokens_.push_back(consumes<std::vector<PSimHit>>(tag));
   }
 
@@ -37,29 +36,30 @@ TrackingParticleNumberOfLayersProducer::TrackingParticleNumberOfLayersProducer(c
   produces<edm::ValueMap<unsigned int>>("stripStereoLayers");
 }
 
-void TrackingParticleNumberOfLayersProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+void TrackingParticleNumberOfLayersProducer::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
   edm::ParameterSetDescription desc;
   desc.add<edm::InputTag>("trackingParticles", edm::InputTag("mix", "MergedTrackTruth"));
 
-  desc.add<std::vector<edm::InputTag> >("simHits", {
-      edm::InputTag("g4SimHits", "TrackerHitsPixelBarrelLowTof"),
-      edm::InputTag("g4SimHits", "TrackerHitsPixelBarrelHighTof"),
-      edm::InputTag("g4SimHits", "TrackerHitsPixelEndcapLowTof"),
-      edm::InputTag("g4SimHits", "TrackerHitsPixelEndcapHighTof"),
-      edm::InputTag("g4SimHits", "TrackerHitsTIBLowTof"),
-      edm::InputTag("g4SimHits", "TrackerHitsTIBHighTof"),
-      edm::InputTag("g4SimHits", "TrackerHitsTIDLowTof"),
-      edm::InputTag("g4SimHits", "TrackerHitsTIDHighTof"),
-      edm::InputTag("g4SimHits", "TrackerHitsTOBLowTof"),
-      edm::InputTag("g4SimHits", "TrackerHitsTOBHighTof"),
-      edm::InputTag("g4SimHits", "TrackerHitsTECLowTof"),
-      edm::InputTag("g4SimHits", "TrackerHitsTECHighTof")
-    });
+  desc.add<std::vector<edm::InputTag>>("simHits",
+                                       {edm::InputTag("g4SimHits", "TrackerHitsPixelBarrelLowTof"),
+                                        edm::InputTag("g4SimHits", "TrackerHitsPixelBarrelHighTof"),
+                                        edm::InputTag("g4SimHits", "TrackerHitsPixelEndcapLowTof"),
+                                        edm::InputTag("g4SimHits", "TrackerHitsPixelEndcapHighTof"),
+                                        edm::InputTag("g4SimHits", "TrackerHitsTIBLowTof"),
+                                        edm::InputTag("g4SimHits", "TrackerHitsTIBHighTof"),
+                                        edm::InputTag("g4SimHits", "TrackerHitsTIDLowTof"),
+                                        edm::InputTag("g4SimHits", "TrackerHitsTIDHighTof"),
+                                        edm::InputTag("g4SimHits", "TrackerHitsTOBLowTof"),
+                                        edm::InputTag("g4SimHits", "TrackerHitsTOBHighTof"),
+                                        edm::InputTag("g4SimHits", "TrackerHitsTECLowTof"),
+                                        edm::InputTag("g4SimHits", "TrackerHitsTECHighTof")});
 
   descriptions.add("trackingParticleNumberOfLayersProducer", desc);
 }
 
-void TrackingParticleNumberOfLayersProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const {
+void TrackingParticleNumberOfLayersProducer::produce(edm::StreamID,
+                                                     edm::Event &iEvent,
+                                                     const edm::EventSetup &iSetup) const {
   edm::Handle<TrackingParticleCollection> htps;
   iEvent.getByToken(tpToken_, htps);
 
diff --git a/SimGeneral/TrackingAnalysis/plugins/TrackingTruthAccumulator.cc b/SimGeneral/TrackingAnalysis/plugins/TrackingTruthAccumulator.cc
index 4d4a448cbe84a..c2d428fdbf7f9 100644
--- a/SimGeneral/TrackingAnalysis/plugins/TrackingTruthAccumulator.cc
+++ b/SimGeneral/TrackingAnalysis/plugins/TrackingTruthAccumulator.cc
@@ -1,1268 +1,1416 @@
 /** @file
  * @brief Definitions of the TrackingTruthAccumulator methods.
  *
- * There are a lot of utility classes and functions in this file. This makes it quite long but
- * I didn't want to confuse the directory structure with lots of extra files. My reasoning was
- * that lots of people look at the directory contents but only the really interested ones will
- * look in this particular file, and the utility stuff isn't used elsewhere.
+ * There are a lot of utility classes and functions in this file. This makes it
+ * quite long but I didn't want to confuse the directory structure with lots of
+ * extra files. My reasoning was that lots of people look at the directory
+ * contents but only the really interested ones will look in this particular
+ * file, and the utility stuff isn't used elsewhere.
  *
  * There are three main sections to this file, from top to bottom:
- * 1 - Declarations of extra utility stuff not in the header file. All in the unnamed namespace.
- * 2 - Definitions of the TrackingTruthAccumulator methods.
+ * 1 - Declarations of extra utility stuff not in the header file. All in the
+ * unnamed namespace. 2 - Definitions of the TrackingTruthAccumulator methods.
  * 3 - Definitions of the utility classes and functions declared in (1).
  *
  * @author Mark Grimes (mark.grimes@bristol.ac.uk)
  * @date circa Oct/2012 to Feb/2013
  *
  * Changelog:
- * 05/May/2015 Mark Grimes - Added functionality to add a collection of just the initial vertices
- * for FastTimer studies.
+ * 05/May/2015 Mark Grimes - Added functionality to add a collection of just the
+ * initial vertices for FastTimer studies.
  *
- * 17/Jul/2014 Dominik Nowatschin (dominik.nowatschin@cern.ch) - added SimVertex and a ref to
- * HepMC::Genvertex to TrackingVertex in TrackingParticleFactory::createTrackingVertex; handle to
- * edm::HepMCProduct is created directly in TrackingTruthAccumulator::accumulate and not in 
- * accumulateEvent as edm::Event and PileUpEventPrincipal have different getByLabel() functions
- * 
- * 07/Feb/2013 Mark Grimes - Reorganised and added a bit more documentation. Still not enough
- * though.
- * 12/Mar/2012 Mark Grimes - Updated TrackingParticle creation to fit in with Subir Sarkar's
- * re-implementation of TrackingParticle.
+ * 17/Jul/2014 Dominik Nowatschin (dominik.nowatschin@cern.ch) - added SimVertex
+ * and a ref to HepMC::Genvertex to TrackingVertex in
+ * TrackingParticleFactory::createTrackingVertex; handle to edm::HepMCProduct is
+ * created directly in TrackingTruthAccumulator::accumulate and not in
+ * accumulateEvent as edm::Event and PileUpEventPrincipal have different
+ * getByLabel() functions
+ *
+ * 07/Feb/2013 Mark Grimes - Reorganised and added a bit more documentation.
+ * Still not enough though. 12/Mar/2012 Mark Grimes - Updated TrackingParticle
+ * creation to fit in with Subir Sarkar's re-implementation of TrackingParticle.
  */
 #include "SimGeneral/TrackingAnalysis/plugins/TrackingTruthAccumulator.h"
 
-#include "SimGeneral/MixingModule/interface/DigiAccumulatorMixModFactory.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "SimGeneral/MixingModule/interface/PileUpEventPrincipal.h"
 #include "FWCore/Framework/interface/ProducerBase.h"
-#include "SimGeneral/TrackingAnalysis/interface/EncodedTruthId.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertex.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimGeneral/MixingModule/interface/DigiAccumulatorMixModFactory.h"
+#include "SimGeneral/MixingModule/interface/PileUpEventPrincipal.h"
+#include "SimGeneral/TrackingAnalysis/interface/EncodedTruthId.h"
 
+#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
-#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Utilities/interface/isFinite.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
-//Turn on integrity checking
+// Turn on integrity checking
 //#define DO_DEBUG_TESTING
 
-
 //---------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------
-//------                                                                     ------
-//------  Declarations for utility classes and functions in the unnamed      ------
-//------  namespace. The definitions are right at the bottom of the file.    ------
-//------                                                                     ------
+//------ ------
+//------  Declarations for utility classes and functions in the unnamed ------
+//------  namespace. The definitions are right at the bottom of the file. ------
+//------ ------
 //---------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------
 
-namespace
-{
-	/** @brief Class to represent tracks in the decay chain.
-	 * @author Mark Grimes (mark.grimes@bristol.ac.uk)
-	 * @date 30/Oct/2012
-	 */
-	struct DecayChainTrack
-	{
-		int simTrackIndex;
-		struct DecayChainVertex* pParentVertex;
-		// Some things have multiple decay vertices. Not sure how that works but it seems to be mostly electrons and some photons.
-		std::vector<struct DecayChainVertex*> daughterVertices;
-		DecayChainTrack* pMergedBremSource;
-		DecayChainTrack() : simTrackIndex(-1), pParentVertex(nullptr), pMergedBremSource(nullptr) {}
-		DecayChainTrack( int newSimTrackIndex ) : simTrackIndex(newSimTrackIndex), pParentVertex(nullptr), pMergedBremSource() {}
-	};
-
-	/** @brief Class to represent a vertex in the decay chain, and it's relationship with parents and daughters.
-	 * @author Mark Grimes (mark.grimes@bristol.ac.uk)
-	 * @date 30/Oct/2012
-	 */
-	struct DecayChainVertex
-	{
-		int simVertexIndex;
-		DecayChainTrack* pParentTrack;
-		std::vector<DecayChainTrack*> daughterTracks;
-		DecayChainVertex* pMergedBremSource;
-		DecayChainVertex() : simVertexIndex(-1), pParentTrack(nullptr), pMergedBremSource(nullptr) {}
-		DecayChainVertex( int newIndex ) : simVertexIndex(newIndex), pParentTrack(nullptr), pMergedBremSource(nullptr) {}
-	};
-
-	/** @brief Intermediary class. Mainly here to handle memory safely.
-	 *
-	 * Reconstructs the parent and child information from SimVertex and SimTracks to create the decay chain.
-	 * SimVertex and SimTrack only have information about their parent, so to get information about the children the
-	 * whole collection has to be analysed. This function does that and returns a tree of DecayChainTrack and
-	 * DecayChainVertex classes that represent the full decay chain.
-	 *
-	 * @author Mark Grimes (mark.grimes@bristol.ac.uk)
-	 * @date 31/Oct/2012
-	 */
-	struct DecayChain
-	{
-	public:
-		DecayChain( const std::vector<SimTrack>& trackCollection, const std::vector<SimVertex>& vertexCollection );
-		const size_t decayTracksSize;
-		const size_t decayVerticesSize;
+namespace {
+  /** @brief Class to represent tracks in the decay chain.
+ * @author Mark Grimes (mark.grimes@bristol.ac.uk)
+ * @date 30/Oct/2012
+ */
+  struct DecayChainTrack {
+    int simTrackIndex;
+    struct DecayChainVertex *pParentVertex;
+    // Some things have multiple decay vertices. Not sure how that works but it
+    // seems to be mostly electrons and some photons.
+    std::vector<struct DecayChainVertex *> daughterVertices;
+    DecayChainTrack *pMergedBremSource;
+    DecayChainTrack() : simTrackIndex(-1), pParentVertex(nullptr), pMergedBremSource(nullptr) {}
+    DecayChainTrack(int newSimTrackIndex)
+        : simTrackIndex(newSimTrackIndex), pParentVertex(nullptr), pMergedBremSource() {}
+  };
+
+  /** @brief Class to represent a vertex in the decay chain, and it's relationship
+ * with parents and daughters.
+ * @author Mark Grimes (mark.grimes@bristol.ac.uk)
+ * @date 30/Oct/2012
+ */
+  struct DecayChainVertex {
+    int simVertexIndex;
+    DecayChainTrack *pParentTrack;
+    std::vector<DecayChainTrack *> daughterTracks;
+    DecayChainVertex *pMergedBremSource;
+    DecayChainVertex() : simVertexIndex(-1), pParentTrack(nullptr), pMergedBremSource(nullptr) {}
+    DecayChainVertex(int newIndex) : simVertexIndex(newIndex), pParentTrack(nullptr), pMergedBremSource(nullptr) {}
+  };
+
+  /** @brief Intermediary class. Mainly here to handle memory safely.
+ *
+ * Reconstructs the parent and child information from SimVertex and SimTracks to
+ * create the decay chain. SimVertex and SimTrack only have information about
+ * their parent, so to get information about the children the whole collection
+ * has to be analysed. This function does that and returns a tree of
+ * DecayChainTrack and DecayChainVertex classes that represent the full decay
+ * chain.
+ *
+ * @author Mark Grimes (mark.grimes@bristol.ac.uk)
+ * @date 31/Oct/2012
+ */
+  struct DecayChain {
+  public:
+    DecayChain(const std::vector<SimTrack> &trackCollection, const std::vector<SimVertex> &vertexCollection);
+    const size_t decayTracksSize;
+    const size_t decayVerticesSize;
 
 #if defined(DO_DEBUG_TESTING)
-		/** @brief Testing check. Won't actually be called when the code becomes production.
-		 *
-		 * Checks that there are no dangling objects not associated in the decay chain.
-		 */
-		void integrityCheck();
+    /** @brief Testing check. Won't actually be called when the code becomes
+   * production.
+   *
+   * Checks that there are no dangling objects not associated in the decay
+   * chain.
+   */
+    void integrityCheck();
 #endif
-		const SimTrack& getSimTrack( const ::DecayChainTrack* pDecayTrack ) const { return simTrackCollection_.at( pDecayTrack->simTrackIndex ); }
-		const SimVertex& getSimVertex( const ::DecayChainVertex* pDecayVertex ) const { return simVertexCollection_.at( pDecayVertex->simVertexIndex ); }
-	private:
-		void findBrem( const std::vector<SimTrack>& trackCollection, const std::vector<SimVertex>& vertexCollection );
-		std::unique_ptr< ::DecayChainTrack[]> decayTracks_;
-		std::unique_ptr< ::DecayChainVertex[]> decayVertices_;
-
-		/// The vertices at the top of the decay chain. These are a subset of the ones in the decayVertices member. Don't delete them.
-		std::vector< ::DecayChainVertex*> rootVertices_;
-
-		// Keep a record of the constructor parameters
-		const std::vector<SimTrack>& simTrackCollection_;
-		const std::vector<SimVertex>& simVertexCollection_;
-	public:
-		const std::unique_ptr< ::DecayChainTrack[]>& decayTracks; ///< Reference maps to decayTracks_ for easy external const access.
-		const std::unique_ptr< ::DecayChainVertex[]>& decayVertices; ///< Reference maps to decayVertices_ for easy external const access.
-		const std::vector< ::DecayChainVertex*>& rootVertices; ///< Reference maps to rootVertices_ for easy external const access.
-	};
-
-	/** @brief Class to create TrackingParticle and TrackingVertex objects.
-	 * @author Mark Grimes (mark.grimes@bristol.ac.uk)
-	 * @date 12/Nov/2012
-	 */
-	class TrackingParticleFactory
-	{
-	public:
-		TrackingParticleFactory( const ::DecayChain& decayChain, const edm::Handle< std::vector<reco::GenParticle> >& hGenParticles,
-				const edm::Handle< edm::HepMCProduct >& hepMCproduct, const edm::Handle< std::vector<int> >& hHepMCGenParticleIndices,
-				const std::vector<const PSimHit*>& simHits, double volumeRadius, double volumeZ, double vertexDistanceCut, bool allowDifferentProcessTypes );
-		TrackingParticle createTrackingParticle( const DecayChainTrack* pTrack, const TrackerTopology *tTopo ) const;
-		TrackingVertex createTrackingVertex( const DecayChainVertex* pVertex) const;
-		bool vectorIsInsideVolume( const math::XYZTLorentzVectorD& vector ) const;
-	private:
-		const ::DecayChain& decayChain_;
-		const edm::Handle< std::vector<reco::GenParticle> >& hGenParticles_;
-		const edm::Handle< edm::HepMCProduct >& hepMCproduct_;
-		std::vector<int> genParticleIndices_;
-		const std::vector<const PSimHit*>& simHits_;
-		const double volumeRadius_;
-		const double volumeZ_;
-		const double vertexDistanceCut2_; // distance based on which HepMC::GenVertexs are added to SimVertexs
-		std::multimap<unsigned int, size_t> trackIdToHitIndex_; ///< A multimap linking SimTrack::trackId() to the hit index in pSimHits_
-		bool allowDifferentProcessTypeForDifferentDetectors_; ///< See the comment for the same member in TrackingTruthAccumulator
-	};
-
-	/** @brief Handles adding objects to the output collections correctly, and checks to see if a particular object already exists.
-	 * @author Mark Grimes (mark.grimes@bristol.ac.uk)
-	 * @date 09/Nov/2012
-	 */
-	class OutputCollectionWrapper
-	{
-	public:
-		OutputCollectionWrapper( const DecayChain& decayChain, TrackingTruthAccumulator::OutputCollections& outputCollections );
-		TrackingParticle* addTrackingParticle( const ::DecayChainTrack* pDecayTrack, const TrackingParticle& trackingParticle );
-		TrackingVertex* addTrackingVertex( const ::DecayChainVertex* pDecayVertex, const TrackingVertex& trackingVertex );
-		TrackingParticle* getTrackingParticle( const ::DecayChainTrack* pDecayTrack );
-		/// @brief After this call, any call to getTrackingParticle or getRef with pOriginalTrack will return the TrackingParticle for pProxyTrack instead.
-		void setProxy( const ::DecayChainTrack* pOriginalTrack, const ::DecayChainTrack* pProxyTrack );
-		void setProxy( const ::DecayChainVertex* pOriginalVertex, const ::DecayChainVertex* pProxyVertex );
-		TrackingVertex* getTrackingVertex( const ::DecayChainVertex* pDecayVertex );
-		TrackingParticleRef getRef( const ::DecayChainTrack* pDecayTrack );
-		TrackingVertexRef getRef( const ::DecayChainVertex* pDecayVertex );
-	private:
-		void associateToExistingObjects( const ::DecayChainVertex* pChainVertex );
-		void associateToExistingObjects( const ::DecayChainTrack* pChainTrack );
-		TrackingTruthAccumulator::OutputCollections& output_;
-		std::vector<int> trackingParticleIndices_;
-		std::vector<int> trackingVertexIndices_;
-	};
-
-	/** @brief Adds the supplied TrackingParticle and its parent TrackingVertex to the output collection. Checks to make sure they don't already exist first.
-	 * @author Mark Grimes (mark.grimes@bristol.ac.uk)
-	 * @date 12/Nov/2012
-	 */
-	TrackingParticle* addTrackAndParentVertex( ::DecayChainTrack* pDecayTrack, const TrackingParticle& trackingParticle, ::OutputCollectionWrapper* pOutput );
-
-	/** @brief Creates a TrackingParticle for the supplied DecayChainTrack and adds it to the output if it passes selection. Gets called recursively if adding parents.
-	 * @author Mark Grimes (mark.grimes@bristol.ac.uk)
-	 * @date 05/Nov/2012
-	 */
-	void addTrack( ::DecayChainTrack* pDecayChainTrack, const TrackingParticleSelector* pSelector, ::OutputCollectionWrapper* pUnmergedOutput, ::OutputCollectionWrapper* pMergedOutput, const ::TrackingParticleFactory& objectFactory, bool addAncestors, const TrackerTopology *tTopo);
-
-} // end of the unnamed namespace
-
+    const SimTrack &getSimTrack(const ::DecayChainTrack *pDecayTrack) const {
+      return simTrackCollection_.at(pDecayTrack->simTrackIndex);
+    }
+    const SimVertex &getSimVertex(const ::DecayChainVertex *pDecayVertex) const {
+      return simVertexCollection_.at(pDecayVertex->simVertexIndex);
+    }
+
+  private:
+    void findBrem(const std::vector<SimTrack> &trackCollection, const std::vector<SimVertex> &vertexCollection);
+    std::unique_ptr<::DecayChainTrack[]> decayTracks_;
+    std::unique_ptr<::DecayChainVertex[]> decayVertices_;
+
+    /// The vertices at the top of the decay chain. These are a subset of the ones
+    /// in the decayVertices member. Don't delete them.
+    std::vector<::DecayChainVertex *> rootVertices_;
+
+    // Keep a record of the constructor parameters
+    const std::vector<SimTrack> &simTrackCollection_;
+    const std::vector<SimVertex> &simVertexCollection_;
+
+  public:
+    const std::unique_ptr<::DecayChainTrack[]> &decayTracks;  ///< Reference maps to decayTracks_ for easy external const
+                                                              ///< access.
+    const std::unique_ptr<::DecayChainVertex[]> &decayVertices;  ///< Reference maps to decayVertices_ for easy external
+                                                                 ///< const access.
+    const std::vector<::DecayChainVertex *> &rootVertices;       ///< Reference maps to rootVertices_ for easy external
+                                                                 ///< const access.
+  };
+
+  /** @brief Class to create TrackingParticle and TrackingVertex objects.
+ * @author Mark Grimes (mark.grimes@bristol.ac.uk)
+ * @date 12/Nov/2012
+ */
+  class TrackingParticleFactory {
+  public:
+    TrackingParticleFactory(const ::DecayChain &decayChain,
+                            const edm::Handle<std::vector<reco::GenParticle>> &hGenParticles,
+                            const edm::Handle<edm::HepMCProduct> &hepMCproduct,
+                            const edm::Handle<std::vector<int>> &hHepMCGenParticleIndices,
+                            const std::vector<const PSimHit *> &simHits,
+                            double volumeRadius,
+                            double volumeZ,
+                            double vertexDistanceCut,
+                            bool allowDifferentProcessTypes);
+    TrackingParticle createTrackingParticle(const DecayChainTrack *pTrack, const TrackerTopology *tTopo) const;
+    TrackingVertex createTrackingVertex(const DecayChainVertex *pVertex) const;
+    bool vectorIsInsideVolume(const math::XYZTLorentzVectorD &vector) const;
+
+  private:
+    const ::DecayChain &decayChain_;
+    const edm::Handle<std::vector<reco::GenParticle>> &hGenParticles_;
+    const edm::Handle<edm::HepMCProduct> &hepMCproduct_;
+    std::vector<int> genParticleIndices_;
+    const std::vector<const PSimHit *> &simHits_;
+    const double volumeRadius_;
+    const double volumeZ_;
+    const double vertexDistanceCut2_;                        // distance based on which HepMC::GenVertexs
+                                                             // are added to SimVertexs
+    std::multimap<unsigned int, size_t> trackIdToHitIndex_;  ///< A multimap linking SimTrack::trackId() to the hit
+                                                             ///< index in pSimHits_
+    bool allowDifferentProcessTypeForDifferentDetectors_;    ///< See the comment for
+                                                             ///< the same member in
+                                                             ///< TrackingTruthAccumulator
+  };
+
+  /** @brief Handles adding objects to the output collections correctly, and
+ * checks to see if a particular object already exists.
+ * @author Mark Grimes (mark.grimes@bristol.ac.uk)
+ * @date 09/Nov/2012
+ */
+  class OutputCollectionWrapper {
+  public:
+    OutputCollectionWrapper(const DecayChain &decayChain,
+                            TrackingTruthAccumulator::OutputCollections &outputCollections);
+    TrackingParticle *addTrackingParticle(const ::DecayChainTrack *pDecayTrack,
+                                          const TrackingParticle &trackingParticle);
+    TrackingVertex *addTrackingVertex(const ::DecayChainVertex *pDecayVertex, const TrackingVertex &trackingVertex);
+    TrackingParticle *getTrackingParticle(const ::DecayChainTrack *pDecayTrack);
+    /// @brief After this call, any call to getTrackingParticle or getRef with
+    /// pOriginalTrack will return the TrackingParticle for pProxyTrack instead.
+    void setProxy(const ::DecayChainTrack *pOriginalTrack, const ::DecayChainTrack *pProxyTrack);
+    void setProxy(const ::DecayChainVertex *pOriginalVertex, const ::DecayChainVertex *pProxyVertex);
+    TrackingVertex *getTrackingVertex(const ::DecayChainVertex *pDecayVertex);
+    TrackingParticleRef getRef(const ::DecayChainTrack *pDecayTrack);
+    TrackingVertexRef getRef(const ::DecayChainVertex *pDecayVertex);
+
+  private:
+    void associateToExistingObjects(const ::DecayChainVertex *pChainVertex);
+    void associateToExistingObjects(const ::DecayChainTrack *pChainTrack);
+    TrackingTruthAccumulator::OutputCollections &output_;
+    std::vector<int> trackingParticleIndices_;
+    std::vector<int> trackingVertexIndices_;
+  };
+
+  /** @brief Adds the supplied TrackingParticle and its parent TrackingVertex to
+ * the output collection. Checks to make sure they don't already exist first.
+ * @author Mark Grimes (mark.grimes@bristol.ac.uk)
+ * @date 12/Nov/2012
+ */
+  TrackingParticle *addTrackAndParentVertex(::DecayChainTrack *pDecayTrack,
+                                            const TrackingParticle &trackingParticle,
+                                            ::OutputCollectionWrapper *pOutput);
 
+  /** @brief Creates a TrackingParticle for the supplied DecayChainTrack and adds
+ * it to the output if it passes selection. Gets called recursively if adding
+ * parents.
+ * @author Mark Grimes (mark.grimes@bristol.ac.uk)
+ * @date 05/Nov/2012
+ */
+  void addTrack(::DecayChainTrack *pDecayChainTrack,
+                const TrackingParticleSelector *pSelector,
+                ::OutputCollectionWrapper *pUnmergedOutput,
+                ::OutputCollectionWrapper *pMergedOutput,
+                const ::TrackingParticleFactory &objectFactory,
+                bool addAncestors,
+                const TrackerTopology *tTopo);
 
+}  // namespace
 
 //---------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------
-//------                                                                     ------
-//------  Definitions for the TrackingTruthAccumulator methods               ------
-//------  are below.                                                         ------
-//------                                                                     ------
+//------ ------
+//------  Definitions for the TrackingTruthAccumulator methods ------
+//------  are below. ------
+//------ ------
 //---------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------
 
-TrackingTruthAccumulator::TrackingTruthAccumulator( const edm::ParameterSet & config, edm::ProducerBase& mixMod, edm::ConsumesCollector& iC) :
-		messageCategory_("TrackingTruthAccumulator"),
-		volumeRadius_( config.getParameter<double>("volumeRadius") ),
-		volumeZ_( config.getParameter<double>("volumeZ") ),
-		vertexDistanceCut_( config.getParameter<double>("vertexDistanceCut") ),
-		ignoreTracksOutsideVolume_( config.getParameter<bool>("ignoreTracksOutsideVolume") ),
-		maximumPreviousBunchCrossing_( config.getParameter<unsigned int>("maximumPreviousBunchCrossing") ),
-		maximumSubsequentBunchCrossing_( config.getParameter<unsigned int>("maximumSubsequentBunchCrossing") ),
-		createUnmergedCollection_( config.getParameter<bool>("createUnmergedCollection") ),
-		createMergedCollection_(config.getParameter<bool>("createMergedBremsstrahlung") ),
-		createInitialVertexCollection_(config.getParameter<bool>("createInitialVertexCollection") ),
-		addAncestors_( config.getParameter<bool>("alwaysAddAncestors") ),
-		removeDeadModules_( config.getParameter<bool>("removeDeadModules") ),
-		simTrackLabel_( config.getParameter<edm::InputTag>("simTrackCollection") ),
-		simVertexLabel_( config.getParameter<edm::InputTag>("simVertexCollection") ),
-		collectionTags_( ),
-		genParticleLabel_( config.getParameter<edm::InputTag>("genParticleCollection") ),
-		hepMCproductLabel_( config.getParameter<edm::InputTag>("HepMCProductLabel") ),
-		allowDifferentProcessTypeForDifferentDetectors_( config.getParameter<bool>("allowDifferentSimHitProcesses") )
-{
-	//
-	// Make sure at least one of the merged and unmerged collections have been set
-	// to be created.
-	//
-	if( !createUnmergedCollection_ && !createMergedCollection_ )
-		edm::LogError(messageCategory_) << "Both \"createUnmergedCollection\" and \"createMergedBremsstrahlung\" have been"
-			<< "set to false, which means no collections will be created";
-
-	// Initialize selection for building TrackingParticles
-	//
-	if( config.exists( "select" ) )
-	{
-		edm::ParameterSet param=config.getParameter<edm::ParameterSet>("select");
-		selector_=TrackingParticleSelector( param.getParameter<double>( "ptMinTP" ),
-				param.getParameter<double>( "ptMaxTP" ),
-				param.getParameter<double>( "minRapidityTP" ),
-				param.getParameter<double>( "maxRapidityTP" ),
-				param.getParameter<double>( "tipTP" ),
-				param.getParameter<double>( "lipTP" ),
-				param.getParameter<int>( "minHitTP" ),
-				param.getParameter<bool>( "signalOnlyTP" ),
-				param.getParameter<bool>( "intimeOnlyTP" ),
-				param.getParameter<bool>( "chargedOnlyTP" ),
-				param.getParameter<bool>( "stableOnlyTP" ),
-				param.getParameter<std::vector<int> >("pdgIdTP") );
-		selectorFlag_=true;
-
-		// Also set these two variables, which are used to drop out early if the SimTrack doesn't conform.
-		// The selector_ requires a full TrackingParticle object, but these two variables can veto things early.
-		chargedOnly_=param.getParameter<bool>( "chargedOnlyTP" );
-		signalOnly_=param.getParameter<bool>( "signalOnlyTP" );
-	}
-	else
-	{
-		selectorFlag_=false;
-		chargedOnly_=false;
-		signalOnly_=false;
-	}
-
-	//
-	// Need to state what collections are going to be added to the event. This
-	// depends on which of the merged and unmerged collections have been configured
-	// to be created.
-	//
-	if( createUnmergedCollection_ )
-	{
-		mixMod.produces<TrackingVertexCollection>();
-		mixMod.produces<TrackingParticleCollection>();
-	}
-
-	if( createMergedCollection_ )
-	{
-		mixMod.produces<TrackingParticleCollection>("MergedTrackTruth");
-		mixMod.produces<TrackingVertexCollection>("MergedTrackTruth");
-	}
-
-	if( createInitialVertexCollection_ )
-	{
-		mixMod.produces<TrackingVertexCollection>("InitialVertices");
-	}
-
-	iC.consumes<std::vector<SimTrack> >(simTrackLabel_);
-	iC.consumes<std::vector<SimVertex> >(simVertexLabel_);
-	iC.consumes<std::vector<reco::GenParticle> >(genParticleLabel_);
-	iC.consumes<std::vector<int> >(genParticleLabel_);
-	iC.consumes<std::vector<int> >(hepMCproductLabel_);
-
-	// Fill the collection tags
-        const edm::ParameterSet& simHitCollectionConfig=config.getParameterSet("simHitCollections");
-	std::vector<std::string> parameterNames=simHitCollectionConfig.getParameterNames();
-
-	for( const auto& parameterName : parameterNames )
-	{
-           std::vector<edm::InputTag> tags=simHitCollectionConfig.getParameter<std::vector<edm::InputTag> >(parameterName);
-           collectionTags_.insert(collectionTags_.end(), tags.begin(), tags.end());
-        }
-
-	for( const auto& collectionTag : collectionTags_ ) {
-	  iC.consumes<std::vector<PSimHit> >(collectionTag);
-        }
-
+TrackingTruthAccumulator::TrackingTruthAccumulator(const edm::ParameterSet &config,
+                                                   edm::ProducerBase &mixMod,
+                                                   edm::ConsumesCollector &iC)
+    : messageCategory_("TrackingTruthAccumulator"),
+      volumeRadius_(config.getParameter<double>("volumeRadius")),
+      volumeZ_(config.getParameter<double>("volumeZ")),
+      vertexDistanceCut_(config.getParameter<double>("vertexDistanceCut")),
+      ignoreTracksOutsideVolume_(config.getParameter<bool>("ignoreTracksOutsideVolume")),
+      maximumPreviousBunchCrossing_(config.getParameter<unsigned int>("maximumPreviousBunchCrossing")),
+      maximumSubsequentBunchCrossing_(config.getParameter<unsigned int>("maximumSubsequentBunchCrossing")),
+      createUnmergedCollection_(config.getParameter<bool>("createUnmergedCollection")),
+      createMergedCollection_(config.getParameter<bool>("createMergedBremsstrahlung")),
+      createInitialVertexCollection_(config.getParameter<bool>("createInitialVertexCollection")),
+      addAncestors_(config.getParameter<bool>("alwaysAddAncestors")),
+      removeDeadModules_(config.getParameter<bool>("removeDeadModules")),
+      simTrackLabel_(config.getParameter<edm::InputTag>("simTrackCollection")),
+      simVertexLabel_(config.getParameter<edm::InputTag>("simVertexCollection")),
+      collectionTags_(),
+      genParticleLabel_(config.getParameter<edm::InputTag>("genParticleCollection")),
+      hepMCproductLabel_(config.getParameter<edm::InputTag>("HepMCProductLabel")),
+      allowDifferentProcessTypeForDifferentDetectors_(config.getParameter<bool>("allowDifferentSimHitProcesses")) {
+  //
+  // Make sure at least one of the merged and unmerged collections have been set
+  // to be created.
+  //
+  if (!createUnmergedCollection_ && !createMergedCollection_)
+    edm::LogError(messageCategory_) << "Both \"createUnmergedCollection\" and "
+                                       "\"createMergedBremsstrahlung\" have been"
+                                    << "set to false, which means no collections will be created";
+
+  // Initialize selection for building TrackingParticles
+  //
+  if (config.exists("select")) {
+    edm::ParameterSet param = config.getParameter<edm::ParameterSet>("select");
+    selector_ = TrackingParticleSelector(param.getParameter<double>("ptMinTP"),
+                                         param.getParameter<double>("ptMaxTP"),
+                                         param.getParameter<double>("minRapidityTP"),
+                                         param.getParameter<double>("maxRapidityTP"),
+                                         param.getParameter<double>("tipTP"),
+                                         param.getParameter<double>("lipTP"),
+                                         param.getParameter<int>("minHitTP"),
+                                         param.getParameter<bool>("signalOnlyTP"),
+                                         param.getParameter<bool>("intimeOnlyTP"),
+                                         param.getParameter<bool>("chargedOnlyTP"),
+                                         param.getParameter<bool>("stableOnlyTP"),
+                                         param.getParameter<std::vector<int>>("pdgIdTP"));
+    selectorFlag_ = true;
+
+    // Also set these two variables, which are used to drop out early if the
+    // SimTrack doesn't conform. The selector_ requires a full TrackingParticle
+    // object, but these two variables can veto things early.
+    chargedOnly_ = param.getParameter<bool>("chargedOnlyTP");
+    signalOnly_ = param.getParameter<bool>("signalOnlyTP");
+  } else {
+    selectorFlag_ = false;
+    chargedOnly_ = false;
+    signalOnly_ = false;
+  }
+
+  //
+  // Need to state what collections are going to be added to the event. This
+  // depends on which of the merged and unmerged collections have been
+  // configured to be created.
+  //
+  if (createUnmergedCollection_) {
+    mixMod.produces<TrackingVertexCollection>();
+    mixMod.produces<TrackingParticleCollection>();
+  }
+
+  if (createMergedCollection_) {
+    mixMod.produces<TrackingParticleCollection>("MergedTrackTruth");
+    mixMod.produces<TrackingVertexCollection>("MergedTrackTruth");
+  }
+
+  if (createInitialVertexCollection_) {
+    mixMod.produces<TrackingVertexCollection>("InitialVertices");
+  }
+
+  iC.consumes<std::vector<SimTrack>>(simTrackLabel_);
+  iC.consumes<std::vector<SimVertex>>(simVertexLabel_);
+  iC.consumes<std::vector<reco::GenParticle>>(genParticleLabel_);
+  iC.consumes<std::vector<int>>(genParticleLabel_);
+  iC.consumes<std::vector<int>>(hepMCproductLabel_);
+
+  // Fill the collection tags
+  const edm::ParameterSet &simHitCollectionConfig = config.getParameterSet("simHitCollections");
+  std::vector<std::string> parameterNames = simHitCollectionConfig.getParameterNames();
+
+  for (const auto &parameterName : parameterNames) {
+    std::vector<edm::InputTag> tags = simHitCollectionConfig.getParameter<std::vector<edm::InputTag>>(parameterName);
+    collectionTags_.insert(collectionTags_.end(), tags.begin(), tags.end());
+  }
+
+  for (const auto &collectionTag : collectionTags_) {
+    iC.consumes<std::vector<PSimHit>>(collectionTag);
+  }
 }
 
-void TrackingTruthAccumulator::initializeEvent( edm::Event const& event, edm::EventSetup const& setup )
-{
-	if( createUnmergedCollection_ )
-	{
-		unmergedOutput_.pTrackingParticles.reset( new TrackingParticleCollection );
-		unmergedOutput_.pTrackingVertices.reset( new TrackingVertexCollection );
-		unmergedOutput_.refTrackingParticles=const_cast<edm::Event&>( event ).getRefBeforePut<TrackingParticleCollection>();
-		unmergedOutput_.refTrackingVertexes=const_cast<edm::Event&>( event ).getRefBeforePut<TrackingVertexCollection>();
-	}
-
-	if( createMergedCollection_ )
-	{
-		mergedOutput_.pTrackingParticles.reset( new TrackingParticleCollection );
-		mergedOutput_.pTrackingVertices.reset( new TrackingVertexCollection );
-		mergedOutput_.refTrackingParticles=const_cast<edm::Event&>( event ).getRefBeforePut<TrackingParticleCollection>("MergedTrackTruth");
-		mergedOutput_.refTrackingVertexes=const_cast<edm::Event&>( event ).getRefBeforePut<TrackingVertexCollection>("MergedTrackTruth");
-	}
-
-	if( createInitialVertexCollection_ )
-	{
-		pInitialVertices_.reset( new TrackingVertexCollection );
-	}
+void TrackingTruthAccumulator::initializeEvent(edm::Event const &event, edm::EventSetup const &setup) {
+  if (createUnmergedCollection_) {
+    unmergedOutput_.pTrackingParticles.reset(new TrackingParticleCollection);
+    unmergedOutput_.pTrackingVertices.reset(new TrackingVertexCollection);
+    unmergedOutput_.refTrackingParticles =
+        const_cast<edm::Event &>(event).getRefBeforePut<TrackingParticleCollection>();
+    unmergedOutput_.refTrackingVertexes = const_cast<edm::Event &>(event).getRefBeforePut<TrackingVertexCollection>();
+  }
+
+  if (createMergedCollection_) {
+    mergedOutput_.pTrackingParticles.reset(new TrackingParticleCollection);
+    mergedOutput_.pTrackingVertices.reset(new TrackingVertexCollection);
+    mergedOutput_.refTrackingParticles =
+        const_cast<edm::Event &>(event).getRefBeforePut<TrackingParticleCollection>("MergedTrackTruth");
+    mergedOutput_.refTrackingVertexes =
+        const_cast<edm::Event &>(event).getRefBeforePut<TrackingVertexCollection>("MergedTrackTruth");
+  }
+
+  if (createInitialVertexCollection_) {
+    pInitialVertices_.reset(new TrackingVertexCollection);
+  }
 }
 
-/// create handle to edm::HepMCProduct here because event.getByLabel with edm::HepMCProduct only works for edm::Event
-/// but not for PileUpEventPrincipal; PileUpEventPrincipal::getByLabel tries to call T::value_type and T::iterator
-/// (where T is the type of the object one wants to get a handle to) which is only implemented for container-like objects
+/// create handle to edm::HepMCProduct here because event.getByLabel with
+/// edm::HepMCProduct only works for edm::Event but not for
+/// PileUpEventPrincipal; PileUpEventPrincipal::getByLabel tries to call
+/// T::value_type and T::iterator (where T is the type of the object one wants
+/// to get a handle to) which is only implemented for container-like objects
 /// like std::vector but not for edm::HepMCProduct!
 
-void TrackingTruthAccumulator::accumulate( edm::Event const& event, edm::EventSetup const& setup )
-{
-	// Call the templated version that does the same for both signal and pileup events
-	
-	edm::Handle< edm::HepMCProduct > hepmc;
-	event.getByLabel(hepMCproductLabel_, hepmc);
-	
-	accumulateEvent( event, setup, hepmc );
-}
+void TrackingTruthAccumulator::accumulate(edm::Event const &event, edm::EventSetup const &setup) {
+  // Call the templated version that does the same for both signal and pileup
+  // events
 
-void TrackingTruthAccumulator::accumulate( PileUpEventPrincipal const& event, edm::EventSetup const& setup, edm::StreamID const& )
-{
-	// If this bunch crossing is outside the user configured limit, don't do anything.
-	if( event.bunchCrossing()>=-static_cast<int>(maximumPreviousBunchCrossing_) && event.bunchCrossing()<=static_cast<int>(maximumSubsequentBunchCrossing_) )
-	{
-		//edm::LogInfo(messageCategory_) << "Analysing pileup event for bunch crossing " << event.bunchCrossing();
-		
-		//simply create empty handle as we do not have a HepMCProduct in PU anyway
-		edm::Handle< edm::HepMCProduct > hepmc;
-		accumulateEvent( event, setup, hepmc );
-	}
-	else edm::LogInfo(messageCategory_) << "Skipping pileup event for bunch crossing " << event.bunchCrossing();
+  edm::Handle<edm::HepMCProduct> hepmc;
+  event.getByLabel(hepMCproductLabel_, hepmc);
+
+  accumulateEvent(event, setup, hepmc);
 }
 
-void TrackingTruthAccumulator::finalizeEvent( edm::Event& event, edm::EventSetup const& setup )
-{
+void TrackingTruthAccumulator::accumulate(PileUpEventPrincipal const &event,
+                                          edm::EventSetup const &setup,
+                                          edm::StreamID const &) {
+  // If this bunch crossing is outside the user configured limit, don't do
+  // anything.
+  if (event.bunchCrossing() >= -static_cast<int>(maximumPreviousBunchCrossing_) &&
+      event.bunchCrossing() <= static_cast<int>(maximumSubsequentBunchCrossing_)) {
+    // edm::LogInfo(messageCategory_) << "Analysing pileup event for bunch
+    // crossing " << event.bunchCrossing();
+
+    // simply create empty handle as we do not have a HepMCProduct in PU anyway
+    edm::Handle<edm::HepMCProduct> hepmc;
+    accumulateEvent(event, setup, hepmc);
+  } else
+    edm::LogInfo(messageCategory_) << "Skipping pileup event for bunch crossing " << event.bunchCrossing();
+}
 
-	if( createUnmergedCollection_ )
-	{
-		edm::LogInfo("TrackingTruthAccumulator") << "Adding " << unmergedOutput_.pTrackingParticles->size() << " TrackingParticles and " << unmergedOutput_.pTrackingVertices->size()
-				<< " TrackingVertexs to the event.";
+void TrackingTruthAccumulator::finalizeEvent(edm::Event &event, edm::EventSetup const &setup) {
+  if (createUnmergedCollection_) {
+    edm::LogInfo("TrackingTruthAccumulator")
+        << "Adding " << unmergedOutput_.pTrackingParticles->size() << " TrackingParticles and "
+        << unmergedOutput_.pTrackingVertices->size() << " TrackingVertexs to the event.";
 
-		event.put(std::move(unmergedOutput_.pTrackingParticles));
-		event.put(std::move(unmergedOutput_.pTrackingVertices));
-	}
+    event.put(std::move(unmergedOutput_.pTrackingParticles));
+    event.put(std::move(unmergedOutput_.pTrackingVertices));
+  }
 
-	if( createMergedCollection_ )
-	{
-		edm::LogInfo("TrackingTruthAccumulator") << "Adding " << mergedOutput_.pTrackingParticles->size() << " merged TrackingParticles and " << mergedOutput_.pTrackingVertices->size()
-				<< " merged TrackingVertexs to the event.";
+  if (createMergedCollection_) {
+    edm::LogInfo("TrackingTruthAccumulator")
+        << "Adding " << mergedOutput_.pTrackingParticles->size() << " merged TrackingParticles and "
+        << mergedOutput_.pTrackingVertices->size() << " merged TrackingVertexs to the event.";
 
-		event.put(std::move(mergedOutput_.pTrackingParticles), "MergedTrackTruth" );
-		event.put(std::move(mergedOutput_.pTrackingVertices), "MergedTrackTruth" );
-	}
+    event.put(std::move(mergedOutput_.pTrackingParticles), "MergedTrackTruth");
+    event.put(std::move(mergedOutput_.pTrackingVertices), "MergedTrackTruth");
+  }
 
-	if( createInitialVertexCollection_ )
-	{
-		edm::LogInfo("TrackingTruthAccumulator") << "Adding " << pInitialVertices_->size() << " initial TrackingVertexs to the event.";
+  if (createInitialVertexCollection_) {
+    edm::LogInfo("TrackingTruthAccumulator")
+        << "Adding " << pInitialVertices_->size() << " initial TrackingVertexs to the event.";
 
-		event.put(std::move(pInitialVertices_), "InitialVertices" );
-	}
+    event.put(std::move(pInitialVertices_), "InitialVertices");
+  }
 }
 
-template<class T> void TrackingTruthAccumulator::accumulateEvent( const T& event, const edm::EventSetup& setup, const edm::Handle< edm::HepMCProduct >& hepMCproduct)
-{
-	//
-	// Get the collections
-	//
-	edm::Handle<std::vector<SimTrack> > hSimTracks;
-	edm::Handle<std::vector<SimVertex> > hSimVertices;
-	edm::Handle< std::vector<reco::GenParticle> > hGenParticles;
-	edm::Handle< std::vector<int> > hGenParticleIndices;
-
-	event.getByLabel( simTrackLabel_, hSimTracks );
-	event.getByLabel( simVertexLabel_, hSimVertices );
-
-	try
-	{
-		event.getByLabel( genParticleLabel_, hGenParticles );
-		event.getByLabel( genParticleLabel_, hGenParticleIndices );
-	}
-	catch( cms::Exception& exception )
-	{
-		//
-		// The Monte Carlo is not always available, e.g. for pileup events. The information
-		// is only used if it's available, but for some reason the PileUpEventPrincipal
-		// wrapper throws an exception here rather than waiting to see if the handle is
-		// used (as is the case for edm::Event). So I just want to catch this exception
-		// and use the normal handle checking later on.
-		//
-	}
-
-	//Retrieve tracker topology from geometry
-	edm::ESHandle<TrackerTopology> tTopoHandle;
-	setup.get<TrackerTopologyRcd>().get(tTopoHandle);
-	const TrackerTopology* const tTopo = tTopoHandle.product();
-
-
-	// Run through the collections and work out the decay chain of each track/vertex. The
-	// information in SimTrack and SimVertex only allows traversing upwards, but this will
-	// allow traversal in both directions. This is required for things like grouping electrons
-	// that bremsstrahlung as one TrackingParticle if "mergedBremsstrahlung" is set in the
-	// config file.
-	DecayChain decayChain( *hSimTracks, *hSimVertices );
-
-	// I only want to create these collections if they're actually required
-	std::unique_ptr< ::OutputCollectionWrapper> pUnmergedCollectionWrapper;
-	std::unique_ptr< ::OutputCollectionWrapper> pMergedCollectionWrapper;
-	if( createUnmergedCollection_ ) pUnmergedCollectionWrapper.reset( new ::OutputCollectionWrapper( decayChain, unmergedOutput_ ) );
-	if( createMergedCollection_ ) pMergedCollectionWrapper.reset( new ::OutputCollectionWrapper( decayChain, mergedOutput_ ) );
-
-	std::vector<const PSimHit*> simHitPointers;
-	fillSimHits( simHitPointers, event, setup );
-	TrackingParticleFactory objectFactory( decayChain, hGenParticles, hepMCproduct, hGenParticleIndices, simHitPointers, volumeRadius_, volumeZ_, vertexDistanceCut_, allowDifferentProcessTypeForDifferentDetectors_ );
+template <class T>
+void TrackingTruthAccumulator::accumulateEvent(const T &event,
+                                               const edm::EventSetup &setup,
+                                               const edm::Handle<edm::HepMCProduct> &hepMCproduct) {
+  //
+  // Get the collections
+  //
+  edm::Handle<std::vector<SimTrack>> hSimTracks;
+  edm::Handle<std::vector<SimVertex>> hSimVertices;
+  edm::Handle<std::vector<reco::GenParticle>> hGenParticles;
+  edm::Handle<std::vector<int>> hGenParticleIndices;
+
+  event.getByLabel(simTrackLabel_, hSimTracks);
+  event.getByLabel(simVertexLabel_, hSimVertices);
+
+  try {
+    event.getByLabel(genParticleLabel_, hGenParticles);
+    event.getByLabel(genParticleLabel_, hGenParticleIndices);
+  } catch (cms::Exception &exception) {
+    //
+    // The Monte Carlo is not always available, e.g. for pileup events. The
+    // information is only used if it's available, but for some reason the
+    // PileUpEventPrincipal wrapper throws an exception here rather than waiting
+    // to see if the handle is used (as is the case for edm::Event). So I just
+    // want to catch this exception and use the normal handle checking later on.
+    //
+  }
+
+  // Retrieve tracker topology from geometry
+  edm::ESHandle<TrackerTopology> tTopoHandle;
+  setup.get<TrackerTopologyRcd>().get(tTopoHandle);
+  const TrackerTopology *const tTopo = tTopoHandle.product();
+
+  // Run through the collections and work out the decay chain of each
+  // track/vertex. The information in SimTrack and SimVertex only allows
+  // traversing upwards, but this will allow traversal in both directions. This
+  // is required for things like grouping electrons that bremsstrahlung as one
+  // TrackingParticle if "mergedBremsstrahlung" is set in the config file.
+  DecayChain decayChain(*hSimTracks, *hSimVertices);
+
+  // I only want to create these collections if they're actually required
+  std::unique_ptr<::OutputCollectionWrapper> pUnmergedCollectionWrapper;
+  std::unique_ptr<::OutputCollectionWrapper> pMergedCollectionWrapper;
+  if (createUnmergedCollection_)
+    pUnmergedCollectionWrapper.reset(new ::OutputCollectionWrapper(decayChain, unmergedOutput_));
+  if (createMergedCollection_)
+    pMergedCollectionWrapper.reset(new ::OutputCollectionWrapper(decayChain, mergedOutput_));
+
+  std::vector<const PSimHit *> simHitPointers;
+  fillSimHits(simHitPointers, event, setup);
+  TrackingParticleFactory objectFactory(decayChain,
+                                        hGenParticles,
+                                        hepMCproduct,
+                                        hGenParticleIndices,
+                                        simHitPointers,
+                                        volumeRadius_,
+                                        volumeZ_,
+                                        vertexDistanceCut_,
+                                        allowDifferentProcessTypeForDifferentDetectors_);
 
 #if defined(DO_DEBUG_TESTING)
-	// While I'm testing, perform some checks.
-	// TODO - drop this call once I'm happy it works in all situations.
-	decayChain.integrityCheck();
+  // While I'm testing, perform some checks.
+  // TODO - drop this call once I'm happy it works in all situations.
+  decayChain.integrityCheck();
 #endif
 
-	TrackingParticleSelector* pSelector=nullptr;
-	if( selectorFlag_ ) pSelector=&selector_;
-
-	// Run over all of the SimTracks, but because I'm interested in the decay hierarchy
-	// do it through the DecayChainTrack objects. These are looped over in sequence here
-	// but they have the hierarchy information for the functions called to traverse the
-	// decay chain.
-
-	for( size_t index=0; index<decayChain.decayTracksSize; ++index )
-	{
-		::DecayChainTrack* pDecayTrack=&decayChain.decayTracks[index];
-		const SimTrack& simTrack=hSimTracks->at(pDecayTrack->simTrackIndex);
-
-
-		// Perform some quick checks to see if we can drop out early. Note that these are
-		// a subset of the cuts in the selector_ so the created TrackingParticle could still
-		// fail. The selector_ requires the full TrackingParticle to be made however, which
-		// can be computationally expensive.
-		if( chargedOnly_ && simTrack.charge()==0 ) continue;
-		if( signalOnly_ && (simTrack.eventId().bunchCrossing()!=0 || simTrack.eventId().event()!=0) ) continue;
-
-		// Also perform a check to see if the production vertex is inside the tracker volume (if required).
-		if( ignoreTracksOutsideVolume_ )
-		{
-			const SimVertex& simVertex=hSimVertices->at( pDecayTrack->pParentVertex->simVertexIndex );
-			if( !objectFactory.vectorIsInsideVolume( simVertex.position() ) ) continue;
-		}
-
-
-		// This function creates the TrackinParticle and adds it to the collection if it
-		// passes the selection criteria specified in the configuration. If the config
-		// specifies adding ancestors, the function is called recursively to do that.
-		::addTrack( pDecayTrack, pSelector, pUnmergedCollectionWrapper.get(), pMergedCollectionWrapper.get(), objectFactory, addAncestors_, tTopo );
-	}
-
-	// If configured to create a collection of initial vertices, add them from this bunch
-	// crossing. No selection is applied on this collection, but it also has no links to
-	// the TrackingParticle decay products.
-	// There are a lot of "initial vertices", I'm not entirely sure what they all are
-	// (nuclear interactions in the detector maybe?), but the one for the main event is
-	// the one with vertexId==0.
-	if( createInitialVertexCollection_ )
-	{
-		// Pretty sure the one with vertexId==0 is always the first one, but doesn't hurt to check
-		for( const auto& pRootVertex : decayChain.rootVertices )
-		{
-			const SimVertex& vertex=hSimVertices->at(decayChain.rootVertices[0]->simVertexIndex);
-			if( vertex.vertexId()!=0 ) continue;
-
-			pInitialVertices_->push_back( objectFactory.createTrackingVertex(pRootVertex) );
-			break;
-		}
-	}
+  TrackingParticleSelector *pSelector = nullptr;
+  if (selectorFlag_)
+    pSelector = &selector_;
+
+  // Run over all of the SimTracks, but because I'm interested in the decay
+  // hierarchy do it through the DecayChainTrack objects. These are looped over
+  // in sequence here but they have the hierarchy information for the functions
+  // called to traverse the decay chain.
+
+  for (size_t index = 0; index < decayChain.decayTracksSize; ++index) {
+    ::DecayChainTrack *pDecayTrack = &decayChain.decayTracks[index];
+    const SimTrack &simTrack = hSimTracks->at(pDecayTrack->simTrackIndex);
+
+    // Perform some quick checks to see if we can drop out early. Note that
+    // these are a subset of the cuts in the selector_ so the created
+    // TrackingParticle could still fail. The selector_ requires the full
+    // TrackingParticle to be made however, which can be computationally
+    // expensive.
+    if (chargedOnly_ && simTrack.charge() == 0)
+      continue;
+    if (signalOnly_ && (simTrack.eventId().bunchCrossing() != 0 || simTrack.eventId().event() != 0))
+      continue;
+
+    // Also perform a check to see if the production vertex is inside the
+    // tracker volume (if required).
+    if (ignoreTracksOutsideVolume_) {
+      const SimVertex &simVertex = hSimVertices->at(pDecayTrack->pParentVertex->simVertexIndex);
+      if (!objectFactory.vectorIsInsideVolume(simVertex.position()))
+        continue;
+    }
+
+    // This function creates the TrackinParticle and adds it to the collection
+    // if it passes the selection criteria specified in the configuration. If
+    // the config specifies adding ancestors, the function is called recursively
+    // to do that.
+    ::addTrack(pDecayTrack,
+               pSelector,
+               pUnmergedCollectionWrapper.get(),
+               pMergedCollectionWrapper.get(),
+               objectFactory,
+               addAncestors_,
+               tTopo);
+  }
+
+  // If configured to create a collection of initial vertices, add them from
+  // this bunch crossing. No selection is applied on this collection, but it
+  // also has no links to the TrackingParticle decay products. There are a lot
+  // of "initial vertices", I'm not entirely sure what they all are (nuclear
+  // interactions in the detector maybe?), but the one for the main event is the
+  // one with vertexId==0.
+  if (createInitialVertexCollection_) {
+    // Pretty sure the one with vertexId==0 is always the first one, but doesn't
+    // hurt to check
+    for (const auto &pRootVertex : decayChain.rootVertices) {
+      const SimVertex &vertex = hSimVertices->at(decayChain.rootVertices[0]->simVertexIndex);
+      if (vertex.vertexId() != 0)
+        continue;
+
+      pInitialVertices_->push_back(objectFactory.createTrackingVertex(pRootVertex));
+      break;
+    }
+  }
 }
 
-template<class T> void TrackingTruthAccumulator::fillSimHits( std::vector<const PSimHit*>& returnValue, const T& event, const edm::EventSetup& setup )
-{
-	// loop over the collections
-	for( const auto& collectionTag : collectionTags_ )
-	{
-		edm::Handle< std::vector<PSimHit> > hSimHits;
-		event.getByLabel( collectionTag, hSimHits );
-
-		// TODO - implement removing the dead modules
-		for( const auto& simHit : *hSimHits )
-		{
-			returnValue.push_back( &simHit );
-		}
-
-	} // end of loop over InputTags
-
-        // sort the SimHits according to their time of flight,
-        // necessary for looping over them "in order" in
-        // TrackingParticleFactory::createTrackingParticle()
-        std::sort(returnValue.begin(), returnValue.end(), [](const PSimHit *a, const PSimHit *b) {
-            const auto atof = edm::isFinite(a->timeOfFlight()) ? a->timeOfFlight() : std::numeric_limits<decltype(a->timeOfFlight())>::max();
-            const auto btof = edm::isFinite(b->timeOfFlight()) ? b->timeOfFlight() : std::numeric_limits<decltype(b->timeOfFlight())>::max();
-            return atof < btof;
-          });
+template <class T>
+void TrackingTruthAccumulator::fillSimHits(std::vector<const PSimHit *> &returnValue,
+                                           const T &event,
+                                           const edm::EventSetup &setup) {
+  // loop over the collections
+  for (const auto &collectionTag : collectionTags_) {
+    edm::Handle<std::vector<PSimHit>> hSimHits;
+    event.getByLabel(collectionTag, hSimHits);
+
+    // TODO - implement removing the dead modules
+    for (const auto &simHit : *hSimHits) {
+      returnValue.push_back(&simHit);
+    }
+
+  }  // end of loop over InputTags
+
+  // sort the SimHits according to their time of flight,
+  // necessary for looping over them "in order" in
+  // TrackingParticleFactory::createTrackingParticle()
+  std::sort(returnValue.begin(), returnValue.end(), [](const PSimHit *a, const PSimHit *b) {
+    const auto atof =
+        edm::isFinite(a->timeOfFlight()) ? a->timeOfFlight() : std::numeric_limits<decltype(a->timeOfFlight())>::max();
+    const auto btof =
+        edm::isFinite(b->timeOfFlight()) ? b->timeOfFlight() : std::numeric_limits<decltype(b->timeOfFlight())>::max();
+    return atof < btof;
+  });
 }
 
-
 //---------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------
-//------                                                                     ------
-//------  End of the definitions for the TrackingTruthAccumulator methods.   ------
-//------  Definitions for the functions and classes declared in the unnamed  ------
-//------  namespace are below. Documentation for those is above, where       ------
-//------  they're declared.                                                  ------
-//------                                                                     ------
+//------ ------
+//------  End of the definitions for the TrackingTruthAccumulator methods.
+//------
+//------  Definitions for the functions and classes declared in the unnamed
+//------
+//------  namespace are below. Documentation for those is above, where ------
+//------  they're declared. ------
+//------ ------
 //---------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------
 //---------------------------------------------------------------------------------
 
-
-namespace // Unnamed namespace for things only used in this file
+namespace  // Unnamed namespace for things only used in this file
 {
-	//---------------------------------------------------------------------------------
-	//---------------------------------------------------------------------------------
-	//----   TrackingParticleFactory methods   ----------------------------------------
-	//---------------------------------------------------------------------------------
-	//---------------------------------------------------------------------------------
-
-	::TrackingParticleFactory::TrackingParticleFactory( const ::DecayChain& decayChain, const edm::Handle< std::vector<reco::GenParticle> >& hGenParticles,
-			const edm::Handle< edm::HepMCProduct >& hepMCproduct, const edm::Handle< std::vector<int> >& hHepMCGenParticleIndices, const std::vector<const PSimHit*>& simHits,
-			double volumeRadius, double volumeZ, double vertexDistanceCut, bool allowDifferentProcessTypes )
-		: decayChain_(decayChain), hGenParticles_(hGenParticles), hepMCproduct_(hepMCproduct), simHits_(simHits), volumeRadius_(volumeRadius),
-		  volumeZ_(volumeZ), vertexDistanceCut2_(vertexDistanceCut*vertexDistanceCut), allowDifferentProcessTypeForDifferentDetectors_(allowDifferentProcessTypes)
-	{
-		// Need to create a multimap to get from a SimTrackId to all of the hits in it. The SimTrackId
-		// is an unsigned int.
-		for( size_t index=0; index<simHits_.size(); ++index )
-		{
-			trackIdToHitIndex_.insert( std::make_pair( simHits_[index]->trackId(), index ) );
-		}
-
-		if( hHepMCGenParticleIndices.isValid() ) // Monte Carlo might not be available for the pileup events
-		{
-			genParticleIndices_.resize( hHepMCGenParticleIndices->size()+1 );
-
-			// What I need is the reverse mapping of this vector. The sizes are already equivalent because I set
-			// the size in the initialiser list.
-			for( size_t recoGenParticleIndex=0; recoGenParticleIndex<hHepMCGenParticleIndices->size(); ++recoGenParticleIndex )
-			{
-				size_t hepMCGenParticleIndex=(*hHepMCGenParticleIndices)[recoGenParticleIndex];
-
-				// They should be the same size, give or take a fencepost error, so this should never happen - but just in case
-				if( genParticleIndices_.size()<=hepMCGenParticleIndex ) genParticleIndices_.resize(hepMCGenParticleIndex+1);
-
-				genParticleIndices_[ hepMCGenParticleIndex ]=recoGenParticleIndex;
-			}
-		}
-	}
-
-	TrackingParticle TrackingParticleFactory::createTrackingParticle( const ::DecayChainTrack* pChainTrack, const TrackerTopology *tTopo ) const
-	{
-		typedef math::XYZTLorentzVectorD LorentzVector;
-		typedef math::XYZPoint Vector;
-
-		const SimTrack& simTrack=decayChain_.getSimTrack( pChainTrack );
-		const SimVertex& parentSimVertex=decayChain_.getSimVertex( pChainTrack->pParentVertex );
-
-		LorentzVector position( 0, 0, 0, 0 );
-		if( !simTrack.noVertex() ) position=parentSimVertex.position();
-
-		int pdgId=simTrack.type();
-
-		TrackingParticle returnValue;
-		// N.B. The sim track is added a few lines below, the parent and decay vertices are added in
-		// another function later on.
-
-		//
-		// If there is some valid Monte Carlo for this track, take some information from that.
-		// Only do so if it is from the signal event however. Not sure why but that's what the
-		// old code did.
-		//
-		if( simTrack.eventId().event()==0 && simTrack.eventId().bunchCrossing()==0 ) // if this is a track in the signal event
-		{
-			int hepMCGenParticleIndex=simTrack.genpartIndex();
-			if( hepMCGenParticleIndex>=0 && hepMCGenParticleIndex<static_cast<int>(genParticleIndices_.size()) && hGenParticles_.isValid() )
-			{
-				int recoGenParticleIndex=genParticleIndices_[hepMCGenParticleIndex];
-				reco::GenParticleRef generatorParticleRef( hGenParticles_, recoGenParticleIndex );
-				pdgId=generatorParticleRef->pdgId();
-				returnValue.addGenParticle( generatorParticleRef );
-			}
-		}
-
-		returnValue.addG4Track( simTrack );
-
-		// I need to run over the sim hits and count up the different types of hits. To be honest
-		// I don't fully understand this next section of code, I copied it from the old TrackingTruthProducer
-		// to provide the same results. The different types of hits that I need to count are:
-		size_t matchedHits=0; // As far as I can tell, this is the number of tracker layers with hits on them, i.e. taking account of overlaps.
-		size_t numberOfHits=0; // The total number of hits not taking account of overlaps.
-		size_t numberOfTrackerHits=0; // The number of tracker hits not taking account of overlaps.
-
-		bool init=true;
-		int processType=0;
-		int particleType=0;
-		int oldLayer = 0;
-		int newLayer = 0;
-		DetId oldDetector;
-		DetId newDetector;
-
-		// Loop over the SimHits associated to this SimTrack
-		// in the order defined by time of flight, which is
-		// probably the best quantity available for going
-		// through the hits "in order" (ok, most important is
-		// to get the first hit right because processType and
-		// particleType are taken from it)
-		for( auto iHitIndex=trackIdToHitIndex_.lower_bound( simTrack.trackId() ), end=trackIdToHitIndex_.upper_bound( simTrack.trackId() );
-				iHitIndex!=end;
-				++iHitIndex )
-		{
-			const auto& pSimHit=simHits_[ iHitIndex->second ];
-
-                        // Skip hits with particle type different from SimTrack pdgId
-                        if(pSimHit->particleType() != pdgId)
-                          continue;
-
-			// Initial condition for consistent simhit selection
-			if( init )
-			{
-				processType=pSimHit->processType();
-				particleType=pSimHit->particleType();
-				newDetector=DetId( pSimHit->detUnitId() );
-				init=false;
-			}
-
-			oldDetector=newDetector;
-			newDetector=DetId( pSimHit->detUnitId() );
-
-			// Fast sim seems to have different processType between tracker and muons, so if this flag
-			// has been set allow the processType to change if the detector changes.
-			if( allowDifferentProcessTypeForDifferentDetectors_ && newDetector.det()!=oldDetector.det() ) processType=pSimHit->processType();
-
-			// Check for delta and interaction products discards
-			if( processType==pSimHit->processType() && particleType==pSimHit->particleType() )
-			{
-				++numberOfHits;
-				oldLayer=newLayer;
-                                newLayer=0;
-				if( newDetector.det() == DetId::Tracker ) {
-                                  ++numberOfTrackerHits;
-
-                                  newLayer=tTopo->layer( newDetector );
-
-                                  // Count hits using layers for glued detectors
-                                  if( (oldLayer!=newLayer || (oldLayer==newLayer && oldDetector.subdetId()!=newDetector.subdetId())) ) ++matchedHits;
-                                }
-			}
-		} // end of loop over the sim hits for this sim track
-
-		returnValue.setNumberOfTrackerLayers( matchedHits );
-		returnValue.setNumberOfHits( numberOfHits );
-		returnValue.setNumberOfTrackerHits( numberOfTrackerHits );
-
-		return returnValue;
-	}
-
-	TrackingVertex TrackingParticleFactory::createTrackingVertex( const ::DecayChainVertex* pChainVertex) const
-	{
-                
-		typedef math::XYZTLorentzVectorD LorentzVector;
-		typedef math::XYZPoint Vector;
-		typedef edm::Ref<edm::HepMCProduct, HepMC::GenVertex >   GenVertexRef;
-		
-		const SimVertex& simVertex=decayChain_.getSimVertex( pChainVertex );
-
-		bool isInVolume=this->vectorIsInsideVolume( simVertex.position() );
-
-		TrackingVertex returnValue( simVertex.position(), isInVolume, simVertex.eventId() );
-		
-		// add the SimVertex to the TrackingVertex
-		returnValue.addG4Vertex(simVertex);
-                
-		// also add refs to nearby HepMC::GenVertexs; the way this is done (i.e. based on the position) is transcribed over from the old TrackingTruthProducer
-		if( simVertex.eventId().event()==0 && simVertex.eventId().bunchCrossing()==0 && hepMCproduct_.isValid()) // if this is a track in the signal event
-		{
-			const HepMC::GenEvent* genEvent = hepMCproduct_->GetEvent();
-			
-			if (genEvent != nullptr)
-			{
-				Vector tvPosition(returnValue.position().x(), returnValue.position().y(), returnValue.position().z());
-                
-				for (HepMC::GenEvent::vertex_const_iterator iGenVertex = genEvent->vertices_begin(); iGenVertex != genEvent->vertices_end(); ++iGenVertex)
-				{
-					HepMC::ThreeVector rawPosition = (*iGenVertex)->position();
-                    
-					Vector genPosition(rawPosition.x()*0.1, rawPosition.y()*0.1, rawPosition.z()*0.1);
-                    
-					auto distance2 = (tvPosition - genPosition).mag2();
-                    
-					if (distance2 < vertexDistanceCut2_)
-						returnValue.addGenVertex( GenVertexRef(hepMCproduct_, (*iGenVertex)->barcode()) );
-				}
-			}
-		}
-                
-		return returnValue;
-	}
-
-	bool ::TrackingParticleFactory::vectorIsInsideVolume( const math::XYZTLorentzVectorD& vector ) const
-	{
-		return ( vector.Pt()<volumeRadius_ && std::abs( vector.z() )<volumeZ_ );
-	}
-
-	//---------------------------------------------------------------------------------
-	//---------------------------------------------------------------------------------
-	//----   DecayChain methods   -----------------------------------------------------
-	//---------------------------------------------------------------------------------
-	//---------------------------------------------------------------------------------
-
-	::DecayChain::DecayChain( const std::vector<SimTrack>& trackCollection, const std::vector<SimVertex>& vertexCollection )
-		: decayTracksSize( trackCollection.size() ),
-		  decayVerticesSize( vertexCollection.size() ),
-		  decayTracks_( new DecayChainTrack[decayTracksSize] ),
-		  decayVertices_( new DecayChainVertex[decayVerticesSize] ),
-		  simTrackCollection_( trackCollection ),
-		  simVertexCollection_( vertexCollection ),
-		  decayTracks( decayTracks_ ), // These const references map onto the actual members for public const access
-		  decayVertices( decayVertices_ ),
-		  rootVertices( rootVertices_ )
-	{
-		// I need some maps to be able to get object pointers from the track/vertex ID
-		std::map<int,::DecayChainTrack*> trackIdToDecayTrack;
-		std::map<int,::DecayChainVertex*> vertexIdToDecayVertex;
-
-		// First create a DecayChainTrack for every SimTrack and make a note of the
-		// trackIds in the map. Also add a pointer to the daughter list of the parent
-		// DecayChainVertex, which might include creating the vertex object if it
-		// doesn't already exist.
-		size_t decayVertexIndex=0; // The index of the next free slot in the DecayChainVertex array.
-		for( size_t index=0; index<trackCollection.size(); ++index )
-		{
-			::DecayChainTrack* pDecayTrack=&decayTracks_[index]; // Get a pointer for ease of use
-
-			// This is the array index of the SimTrack that this DecayChainTrack corresponds to. At
-			// the moment this is a 1 to 1 relationship with the DecayChainTrack index, but they won't
-			// necessarily be accessed through the array later so it's still required to store it.
-			pDecayTrack->simTrackIndex=index;
-
-			trackIdToDecayTrack[ trackCollection[index].trackId() ]=pDecayTrack;
-
-			int parentVertexIndex=trackCollection[index].vertIndex();
-			if( parentVertexIndex>=0 )
-			{
-				// Get the DecayChainVertex corresponding to this SimVertex, or initialise it if it hasn't been done already.
-				::DecayChainVertex*& pParentVertex=vertexIdToDecayVertex[parentVertexIndex];
-				if( pParentVertex==nullptr )
-				{
-					// Note that I'm using a reference, so changing pParentVertex will change the entry in the map too.
-					pParentVertex=&decayVertices_[decayVertexIndex];
-					++decayVertexIndex;
-					pParentVertex->simVertexIndex=parentVertexIndex;
-				}
-				pParentVertex->daughterTracks.push_back(pDecayTrack);
-				pDecayTrack->pParentVertex=pParentVertex;
-			}
-			else throw std::runtime_error( "TrackingTruthAccumulator: Found a track with an invalid parent vertex index." );
-		}
-
-		// This assert was originally in to check the internal consistency of the decay chain. Fast sim
-		// pileup seems to have a load of vertices with no tracks pointing to them though, so fast sim fails
-		// this assert if pileup is added. I don't think the problem is vital however, so if the assert is
-		// taken out these extra vertices are ignored.
-		//assert( vertexIdToDecayVertex.size()==vertexCollection.size() && vertexCollection.size()==decayVertexIndex );
-
-		// I still need to set DecayChainTrack::daughterVertices and DecayChainVertex::pParentTrack.
-		// The information to do this comes from SimVertex::parentIndex. I couldn't do this before
-		// because I need all of the DecayChainTracks initialised.
-		for( auto& decayVertexMapPair : vertexIdToDecayVertex )
-		{
-			::DecayChainVertex* pDecayVertex=decayVertexMapPair.second;
-			int parentTrackIndex=vertexCollection[pDecayVertex->simVertexIndex].parentIndex();
-			if( parentTrackIndex!=-1 )
-			{
-				std::map<int,::DecayChainTrack*>::iterator iParentTrackMapPair=trackIdToDecayTrack.find(parentTrackIndex);
-				if( iParentTrackMapPair==trackIdToDecayTrack.end() )
-				{
-					std::stringstream errorStream;
-					errorStream << "TrackingTruthAccumulator: Something has gone wrong with the indexing. Parent track index is " << parentTrackIndex << ".";
-					throw std::runtime_error( errorStream.str() );
-				}
-
-				::DecayChainTrack* pParentTrackHierarchy=iParentTrackMapPair->second;
-
-				pParentTrackHierarchy->daughterVertices.push_back( pDecayVertex );
-				pDecayVertex->pParentTrack=pParentTrackHierarchy;
-			}
-			else rootVertices_.push_back(pDecayVertex); // Has no parent so is at the top of the decay chain.
-		} // end of loop over the vertexIdToDecayVertex map
-
-		findBrem( trackCollection, vertexCollection );
-
-	} // end of ::DecayChain constructor
+  //---------------------------------------------------------------------------------
+  //---------------------------------------------------------------------------------
+  //----   TrackingParticleFactory methods
+  //----------------------------------------
+  //---------------------------------------------------------------------------------
+  //---------------------------------------------------------------------------------
+
+  ::TrackingParticleFactory::TrackingParticleFactory(const ::DecayChain &decayChain,
+                                                     const edm::Handle<std::vector<reco::GenParticle>> &hGenParticles,
+                                                     const edm::Handle<edm::HepMCProduct> &hepMCproduct,
+                                                     const edm::Handle<std::vector<int>> &hHepMCGenParticleIndices,
+                                                     const std::vector<const PSimHit *> &simHits,
+                                                     double volumeRadius,
+                                                     double volumeZ,
+                                                     double vertexDistanceCut,
+                                                     bool allowDifferentProcessTypes)
+      : decayChain_(decayChain),
+        hGenParticles_(hGenParticles),
+        hepMCproduct_(hepMCproduct),
+        simHits_(simHits),
+        volumeRadius_(volumeRadius),
+        volumeZ_(volumeZ),
+        vertexDistanceCut2_(vertexDistanceCut * vertexDistanceCut),
+        allowDifferentProcessTypeForDifferentDetectors_(allowDifferentProcessTypes) {
+    // Need to create a multimap to get from a SimTrackId to all of the hits in
+    // it. The SimTrackId is an unsigned int.
+    for (size_t index = 0; index < simHits_.size(); ++index) {
+      trackIdToHitIndex_.insert(std::make_pair(simHits_[index]->trackId(), index));
+    }
+
+    if (hHepMCGenParticleIndices.isValid())  // Monte Carlo might not be available
+                                             // for the pileup events
+    {
+      genParticleIndices_.resize(hHepMCGenParticleIndices->size() + 1);
+
+      // What I need is the reverse mapping of this vector. The sizes are already
+      // equivalent because I set the size in the initialiser list.
+      for (size_t recoGenParticleIndex = 0; recoGenParticleIndex < hHepMCGenParticleIndices->size();
+           ++recoGenParticleIndex) {
+        size_t hepMCGenParticleIndex = (*hHepMCGenParticleIndices)[recoGenParticleIndex];
+
+        // They should be the same size, give or take a fencepost error, so this
+        // should never happen - but just in case
+        if (genParticleIndices_.size() <= hepMCGenParticleIndex)
+          genParticleIndices_.resize(hepMCGenParticleIndex + 1);
+
+        genParticleIndices_[hepMCGenParticleIndex] = recoGenParticleIndex;
+      }
+    }
+  }
+
+  TrackingParticle TrackingParticleFactory::createTrackingParticle(const ::DecayChainTrack *pChainTrack,
+                                                                   const TrackerTopology *tTopo) const {
+    typedef math::XYZTLorentzVectorD LorentzVector;
+    typedef math::XYZPoint Vector;
+
+    const SimTrack &simTrack = decayChain_.getSimTrack(pChainTrack);
+    const SimVertex &parentSimVertex = decayChain_.getSimVertex(pChainTrack->pParentVertex);
+
+    LorentzVector position(0, 0, 0, 0);
+    if (!simTrack.noVertex())
+      position = parentSimVertex.position();
+
+    int pdgId = simTrack.type();
+
+    TrackingParticle returnValue;
+    // N.B. The sim track is added a few lines below, the parent and decay
+    // vertices are added in another function later on.
+
+    //
+    // If there is some valid Monte Carlo for this track, take some information
+    // from that. Only do so if it is from the signal event however. Not sure why
+    // but that's what the old code did.
+    //
+    if (simTrack.eventId().event() == 0 &&
+        simTrack.eventId().bunchCrossing() == 0)  // if this is a track in the signal event
+    {
+      int hepMCGenParticleIndex = simTrack.genpartIndex();
+      if (hepMCGenParticleIndex >= 0 && hepMCGenParticleIndex < static_cast<int>(genParticleIndices_.size()) &&
+          hGenParticles_.isValid()) {
+        int recoGenParticleIndex = genParticleIndices_[hepMCGenParticleIndex];
+        reco::GenParticleRef generatorParticleRef(hGenParticles_, recoGenParticleIndex);
+        pdgId = generatorParticleRef->pdgId();
+        returnValue.addGenParticle(generatorParticleRef);
+      }
+    }
+
+    returnValue.addG4Track(simTrack);
+
+    // I need to run over the sim hits and count up the different types of hits.
+    // To be honest I don't fully understand this next section of code, I copied
+    // it from the old TrackingTruthProducer to provide the same results. The
+    // different types of hits that I need to count are:
+    size_t matchedHits = 0;          // As far as I can tell, this is the number of tracker layers with hits
+                                     // on them, i.e. taking account of overlaps.
+    size_t numberOfHits = 0;         // The total number of hits not taking account of overlaps.
+    size_t numberOfTrackerHits = 0;  // The number of tracker hits not taking account of overlaps.
+
+    bool init = true;
+    int processType = 0;
+    int particleType = 0;
+    int oldLayer = 0;
+    int newLayer = 0;
+    DetId oldDetector;
+    DetId newDetector;
+
+    // Loop over the SimHits associated to this SimTrack
+    // in the order defined by time of flight, which is
+    // probably the best quantity available for going
+    // through the hits "in order" (ok, most important is
+    // to get the first hit right because processType and
+    // particleType are taken from it)
+    for (auto iHitIndex = trackIdToHitIndex_.lower_bound(simTrack.trackId()),
+              end = trackIdToHitIndex_.upper_bound(simTrack.trackId());
+         iHitIndex != end;
+         ++iHitIndex) {
+      const auto &pSimHit = simHits_[iHitIndex->second];
+
+      // Skip hits with particle type different from SimTrack pdgId
+      if (pSimHit->particleType() != pdgId)
+        continue;
+
+      // Initial condition for consistent simhit selection
+      if (init) {
+        processType = pSimHit->processType();
+        particleType = pSimHit->particleType();
+        newDetector = DetId(pSimHit->detUnitId());
+        init = false;
+      }
+
+      oldDetector = newDetector;
+      newDetector = DetId(pSimHit->detUnitId());
+
+      // Fast sim seems to have different processType between tracker and muons,
+      // so if this flag has been set allow the processType to change if the
+      // detector changes.
+      if (allowDifferentProcessTypeForDifferentDetectors_ && newDetector.det() != oldDetector.det())
+        processType = pSimHit->processType();
+
+      // Check for delta and interaction products discards
+      if (processType == pSimHit->processType() && particleType == pSimHit->particleType()) {
+        ++numberOfHits;
+        oldLayer = newLayer;
+        newLayer = 0;
+        if (newDetector.det() == DetId::Tracker) {
+          ++numberOfTrackerHits;
+
+          newLayer = tTopo->layer(newDetector);
+
+          // Count hits using layers for glued detectors
+          if ((oldLayer != newLayer || (oldLayer == newLayer && oldDetector.subdetId() != newDetector.subdetId())))
+            ++matchedHits;
+        }
+      }
+    }  // end of loop over the sim hits for this sim track
+
+    returnValue.setNumberOfTrackerLayers(matchedHits);
+    returnValue.setNumberOfHits(numberOfHits);
+    returnValue.setNumberOfTrackerHits(numberOfTrackerHits);
+
+    return returnValue;
+  }
+
+  TrackingVertex TrackingParticleFactory::createTrackingVertex(const ::DecayChainVertex *pChainVertex) const {
+    typedef math::XYZTLorentzVectorD LorentzVector;
+    typedef math::XYZPoint Vector;
+    typedef edm::Ref<edm::HepMCProduct, HepMC::GenVertex> GenVertexRef;
+
+    const SimVertex &simVertex = decayChain_.getSimVertex(pChainVertex);
+
+    bool isInVolume = this->vectorIsInsideVolume(simVertex.position());
+
+    TrackingVertex returnValue(simVertex.position(), isInVolume, simVertex.eventId());
+
+    // add the SimVertex to the TrackingVertex
+    returnValue.addG4Vertex(simVertex);
+
+    // also add refs to nearby HepMC::GenVertexs; the way this is done (i.e. based
+    // on the position) is transcribed over from the old TrackingTruthProducer
+    if (simVertex.eventId().event() == 0 && simVertex.eventId().bunchCrossing() == 0 &&
+        hepMCproduct_.isValid())  // if this is a track in the signal event
+    {
+      const HepMC::GenEvent *genEvent = hepMCproduct_->GetEvent();
+
+      if (genEvent != nullptr) {
+        Vector tvPosition(returnValue.position().x(), returnValue.position().y(), returnValue.position().z());
+
+        for (HepMC::GenEvent::vertex_const_iterator iGenVertex = genEvent->vertices_begin();
+             iGenVertex != genEvent->vertices_end();
+             ++iGenVertex) {
+          HepMC::ThreeVector rawPosition = (*iGenVertex)->position();
+
+          Vector genPosition(rawPosition.x() * 0.1, rawPosition.y() * 0.1, rawPosition.z() * 0.1);
+
+          auto distance2 = (tvPosition - genPosition).mag2();
+
+          if (distance2 < vertexDistanceCut2_)
+            returnValue.addGenVertex(GenVertexRef(hepMCproduct_, (*iGenVertex)->barcode()));
+        }
+      }
+    }
+
+    return returnValue;
+  }
+
+  bool ::TrackingParticleFactory::vectorIsInsideVolume(const math::XYZTLorentzVectorD &vector) const {
+    return (vector.Pt() < volumeRadius_ && std::abs(vector.z()) < volumeZ_);
+  }
+
+  //---------------------------------------------------------------------------------
+  //---------------------------------------------------------------------------------
+  //----   DecayChain methods
+  //-----------------------------------------------------
+  //---------------------------------------------------------------------------------
+  //---------------------------------------------------------------------------------
+
+  ::DecayChain::DecayChain(const std::vector<SimTrack> &trackCollection, const std::vector<SimVertex> &vertexCollection)
+      : decayTracksSize(trackCollection.size()),
+        decayVerticesSize(vertexCollection.size()),
+        decayTracks_(new DecayChainTrack[decayTracksSize]),
+        decayVertices_(new DecayChainVertex[decayVerticesSize]),
+        simTrackCollection_(trackCollection),
+        simVertexCollection_(vertexCollection),
+        decayTracks(decayTracks_),  // These const references map onto the actual
+                                    // members for public const access
+        decayVertices(decayVertices_),
+        rootVertices(rootVertices_) {
+    // I need some maps to be able to get object pointers from the track/vertex ID
+    std::map<int, ::DecayChainTrack *> trackIdToDecayTrack;
+    std::map<int, ::DecayChainVertex *> vertexIdToDecayVertex;
+
+    // First create a DecayChainTrack for every SimTrack and make a note of the
+    // trackIds in the map. Also add a pointer to the daughter list of the parent
+    // DecayChainVertex, which might include creating the vertex object if it
+    // doesn't already exist.
+    size_t decayVertexIndex = 0;  // The index of the next free slot in the DecayChainVertex array.
+    for (size_t index = 0; index < trackCollection.size(); ++index) {
+      ::DecayChainTrack *pDecayTrack = &decayTracks_[index];  // Get a pointer for ease of use
+
+      // This is the array index of the SimTrack that this DecayChainTrack
+      // corresponds to. At the moment this is a 1 to 1 relationship with the
+      // DecayChainTrack index, but they won't necessarily be accessed through the
+      // array later so it's still required to store it.
+      pDecayTrack->simTrackIndex = index;
+
+      trackIdToDecayTrack[trackCollection[index].trackId()] = pDecayTrack;
+
+      int parentVertexIndex = trackCollection[index].vertIndex();
+      if (parentVertexIndex >= 0) {
+        // Get the DecayChainVertex corresponding to this SimVertex, or initialise
+        // it if it hasn't been done already.
+        ::DecayChainVertex *&pParentVertex = vertexIdToDecayVertex[parentVertexIndex];
+        if (pParentVertex == nullptr) {
+          // Note that I'm using a reference, so changing pParentVertex will
+          // change the entry in the map too.
+          pParentVertex = &decayVertices_[decayVertexIndex];
+          ++decayVertexIndex;
+          pParentVertex->simVertexIndex = parentVertexIndex;
+        }
+        pParentVertex->daughterTracks.push_back(pDecayTrack);
+        pDecayTrack->pParentVertex = pParentVertex;
+      } else
+        throw std::runtime_error(
+            "TrackingTruthAccumulator: Found a track with "
+            "an invalid parent vertex index.");
+    }
+
+    // This assert was originally in to check the internal consistency of the
+    // decay chain. Fast sim pileup seems to have a load of vertices with no
+    // tracks pointing to them though, so fast sim fails this assert if pileup is
+    // added. I don't think the problem is vital however, so if the assert is
+    // taken out these extra vertices are ignored.
+    // assert( vertexIdToDecayVertex.size()==vertexCollection.size() &&
+    // vertexCollection.size()==decayVertexIndex );
+
+    // I still need to set DecayChainTrack::daughterVertices and
+    // DecayChainVertex::pParentTrack. The information to do this comes from
+    // SimVertex::parentIndex. I couldn't do this before because I need all of the
+    // DecayChainTracks initialised.
+    for (auto &decayVertexMapPair : vertexIdToDecayVertex) {
+      ::DecayChainVertex *pDecayVertex = decayVertexMapPair.second;
+      int parentTrackIndex = vertexCollection[pDecayVertex->simVertexIndex].parentIndex();
+      if (parentTrackIndex != -1) {
+        std::map<int, ::DecayChainTrack *>::iterator iParentTrackMapPair = trackIdToDecayTrack.find(parentTrackIndex);
+        if (iParentTrackMapPair == trackIdToDecayTrack.end()) {
+          std::stringstream errorStream;
+          errorStream << "TrackingTruthAccumulator: Something has gone wrong "
+                         "with the indexing. Parent track index is "
+                      << parentTrackIndex << ".";
+          throw std::runtime_error(errorStream.str());
+        }
+
+        ::DecayChainTrack *pParentTrackHierarchy = iParentTrackMapPair->second;
+
+        pParentTrackHierarchy->daughterVertices.push_back(pDecayVertex);
+        pDecayVertex->pParentTrack = pParentTrackHierarchy;
+      } else
+        rootVertices_.push_back(pDecayVertex);  // Has no parent so is at the top of the decay chain.
+    }                                           // end of loop over the vertexIdToDecayVertex map
+
+    findBrem(trackCollection, vertexCollection);
+
+  }  // end of ::DecayChain constructor
 
 #if defined(DO_DEBUG_TESTING)
-	// Function documentation is with the declaration above. This function is only used for testing.
-	void ::DecayChain::integrityCheck()
-	{
-		//
-		// Start off checking the tracks
-		//
-		for( size_t index=0; index<decayTracksSize; ++index )
-		{
-			const auto& decayTrack=decayTracks[index];
-			//
-			// Tracks should always have a production vertex
-			//
-			if( decayTrack.pParentVertex==NULL ) throw std::runtime_error( "TrackingTruthAccumulator.cc integrityCheck(): Found DecayChainTrack with no parent vertex." );
-
-			//
-			// Make sure the parent has this as a child. Also make sure it's only listed once.
-			//
-			size_t numberOfTimesListed=0;
-			for( const auto pSiblingTrack : decayTrack.pParentVertex->daughterTracks )
-			{
-				if( pSiblingTrack==&decayTrack ) ++numberOfTimesListed;
-			}
-			if( numberOfTimesListed!=1 ) throw std::runtime_error( "TrackingTruthAccumulator.cc integrityCheck(): Found DecayChainTrack whose parent does not have it listed once and only once as a child." );
-
-			//
-			// Make sure all of the children have this listed as a parent.
-			//
-			for( const auto pDaughterVertex : decayTrack.daughterVertices )
-			{
-				if( pDaughterVertex->pParentTrack!=&decayTrack ) throw std::runtime_error( "TrackingTruthAccumulator.cc integrityCheck(): Found DecayChainTrack whose child does not have it listed as the parent." );
-			}
-
-			//
-			// Follow the chain up to the root vertex, and make sure that is listed in rootVertices
-			//
-			const DecayChainVertex* pAncestorVertex=decayTrack.pParentVertex;
-			while( pAncestorVertex->pParentTrack!=NULL )
-			{
-				if( pAncestorVertex->pParentTrack->pParentVertex==NULL ) throw std::runtime_error( "TrackingTruthAccumulator.cc integrityCheck(): Found DecayChainTrack with no parent vertex higher in the decay chain." );
-				pAncestorVertex=pAncestorVertex->pParentTrack->pParentVertex;
-			}
-			if( std::find( rootVertices.begin(), rootVertices.end(), pAncestorVertex )==rootVertices.end() )
-			{
-				throw std::runtime_error( "TrackingTruthAccumulator.cc integrityCheck(): Found DecayChainTrack whose root vertex is not recorded anywhere." );
-			}
-		} // end of loop over decayTracks
-
-		//
-		// Now check the vertices
-		//
-		for( size_t index=0; index<decayVerticesSize; ++index )
-		{
-			const auto& decayVertex=decayVertices[index];
-
-			//
-			// Make sure this, or a vertex higher in the chain, is in the list of root vertices.
-			//
-			const DecayChainVertex* pAncestorVertex=&decayVertex;
-			while( pAncestorVertex->pParentTrack!=NULL )
-			{
-				if( pAncestorVertex->pParentTrack->pParentVertex==NULL ) throw std::runtime_error( "TrackingTruthAccumulator.cc integrityCheck(): Found DecayChainTrack with no parent vertex higher in the vertex decay chain." );
-				pAncestorVertex=pAncestorVertex->pParentTrack->pParentVertex;
-			}
-			if( std::find( rootVertices.begin(), rootVertices.end(), pAncestorVertex )==rootVertices.end() )
-			{
-				throw std::runtime_error( "TrackingTruthAccumulator.cc integrityCheck(): Found DecayChainTrack whose root vertex is not recorded anywhere." );
-			}
-
-			//
-			// Make sure the parent has this listed in its daughters once and only once.
-			//
-			if( decayVertex.pParentTrack!=NULL )
-			{
-				size_t numberOfTimesListed=0;
-				for( const auto pSibling : decayVertex.pParentTrack->daughterVertices )
-				{
-					if( pSibling==&decayVertex ) ++numberOfTimesListed;
-				}
-				if( numberOfTimesListed!=1 ) throw std::runtime_error( "TrackingTruthAccumulator.cc integrityCheck(): Found DecayChainVertex whose parent does not have it listed once and only once as a child." );
-			}
-
-			//
-			// Make sure all of the children have this listed as the parent
-			//
-			for( const auto pDaughter : decayVertex.daughterTracks )
-			{
-				if( pDaughter->pParentVertex!=&decayVertex ) throw std::runtime_error( "TrackingTruthAccumulator.cc integrityCheck(): Found DecayChainVertex whose child does not have it listed as the parent." );
-			}
-		} // end of loop over decay vertices
-
-		std::cout << "TrackingTruthAccumulator.cc integrityCheck() completed successfully" << std::endl;
-	} // end of ::DecayChain::integrityCheck()
+  // Function documentation is with the declaration above. This function is only
+  // used for testing.
+  void ::DecayChain::integrityCheck() {
+    //
+    // Start off checking the tracks
+    //
+    for (size_t index = 0; index < decayTracksSize; ++index) {
+      const auto &decayTrack = decayTracks[index];
+      //
+      // Tracks should always have a production vertex
+      //
+      if (decayTrack.pParentVertex == NULL)
+        throw std::runtime_error(
+            "TrackingTruthAccumulator.cc integrityCheck(): "
+            "Found DecayChainTrack with no parent vertex.");
+
+      //
+      // Make sure the parent has this as a child. Also make sure it's only listed
+      // once.
+      //
+      size_t numberOfTimesListed = 0;
+      for (const auto pSiblingTrack : decayTrack.pParentVertex->daughterTracks) {
+        if (pSiblingTrack == &decayTrack)
+          ++numberOfTimesListed;
+      }
+      if (numberOfTimesListed != 1)
+        throw std::runtime_error(
+            "TrackingTruthAccumulator.cc integrityCheck(): "
+            "Found DecayChainTrack whose parent does not "
+            "have it listed once and only once as a child.");
+
+      //
+      // Make sure all of the children have this listed as a parent.
+      //
+      for (const auto pDaughterVertex : decayTrack.daughterVertices) {
+        if (pDaughterVertex->pParentTrack != &decayTrack)
+          throw std::runtime_error(
+              "TrackingTruthAccumulator.cc integrityCheck(): Found "
+              "DecayChainTrack whose child does not have it listed as the "
+              "parent.");
+      }
+
+      //
+      // Follow the chain up to the root vertex, and make sure that is listed in
+      // rootVertices
+      //
+      const DecayChainVertex *pAncestorVertex = decayTrack.pParentVertex;
+      while (pAncestorVertex->pParentTrack != NULL) {
+        if (pAncestorVertex->pParentTrack->pParentVertex == NULL)
+          throw std::runtime_error(
+              "TrackingTruthAccumulator.cc integrityCheck(): Found "
+              "DecayChainTrack with no parent vertex higher in the decay chain.");
+        pAncestorVertex = pAncestorVertex->pParentTrack->pParentVertex;
+      }
+      if (std::find(rootVertices.begin(), rootVertices.end(), pAncestorVertex) == rootVertices.end()) {
+        throw std::runtime_error(
+            "TrackingTruthAccumulator.cc integrityCheck(): Found DecayChainTrack "
+            "whose root vertex is not recorded anywhere.");
+      }
+    }  // end of loop over decayTracks
+
+    //
+    // Now check the vertices
+    //
+    for (size_t index = 0; index < decayVerticesSize; ++index) {
+      const auto &decayVertex = decayVertices[index];
+
+      //
+      // Make sure this, or a vertex higher in the chain, is in the list of root
+      // vertices.
+      //
+      const DecayChainVertex *pAncestorVertex = &decayVertex;
+      while (pAncestorVertex->pParentTrack != NULL) {
+        if (pAncestorVertex->pParentTrack->pParentVertex == NULL)
+          throw std::runtime_error(
+              "TrackingTruthAccumulator.cc integrityCheck(): Found "
+              "DecayChainTrack with no parent vertex higher in the vertex decay "
+              "chain.");
+        pAncestorVertex = pAncestorVertex->pParentTrack->pParentVertex;
+      }
+      if (std::find(rootVertices.begin(), rootVertices.end(), pAncestorVertex) == rootVertices.end()) {
+        throw std::runtime_error(
+            "TrackingTruthAccumulator.cc integrityCheck(): Found DecayChainTrack "
+            "whose root vertex is not recorded anywhere.");
+      }
+
+      //
+      // Make sure the parent has this listed in its daughters once and only once.
+      //
+      if (decayVertex.pParentTrack != NULL) {
+        size_t numberOfTimesListed = 0;
+        for (const auto pSibling : decayVertex.pParentTrack->daughterVertices) {
+          if (pSibling == &decayVertex)
+            ++numberOfTimesListed;
+        }
+        if (numberOfTimesListed != 1)
+          throw std::runtime_error(
+              "TrackingTruthAccumulator.cc integrityCheck(): Found "
+              "DecayChainVertex whose parent does not have it listed once and "
+              "only once as a child.");
+      }
+
+      //
+      // Make sure all of the children have this listed as the parent
+      //
+      for (const auto pDaughter : decayVertex.daughterTracks) {
+        if (pDaughter->pParentVertex != &decayVertex)
+          throw std::runtime_error(
+              "TrackingTruthAccumulator.cc integrityCheck(): Found "
+              "DecayChainVertex whose child does not have it listed as the "
+              "parent.");
+      }
+    }  // end of loop over decay vertices
+
+    std::cout << "TrackingTruthAccumulator.cc integrityCheck() completed successfully" << std::endl;
+  }  // end of ::DecayChain::integrityCheck()
 #endif
 
-	void ::DecayChain::findBrem( const std::vector<SimTrack>& trackCollection, const std::vector<SimVertex>& vertexCollection )
-	{
-		for( size_t index=0; index<decayVerticesSize; ++index )
-		{
-			auto& vertex=decayVertices_[index];
-
-			// Make sure parent is an electron
-			if( vertex.pParentTrack==nullptr ) continue;
-			int parentTrackPDG=trackCollection[vertex.pParentTrack->simTrackIndex].type();
-			if( std::abs( parentTrackPDG )!=11 ) continue;
-
-			size_t numberOfElectrons=0;
-			size_t numberOfNonElectronsOrPhotons=0;
-			for( auto& pDaughterTrack : vertex.daughterTracks )
-			{
-				const auto& simTrack=trackCollection[pDaughterTrack->simTrackIndex];
-				if( simTrack.type()==11 || simTrack.type()==-11 ) ++numberOfElectrons;
-				else if( simTrack.type()!=22 ) ++numberOfNonElectronsOrPhotons;
-			}
-			if( numberOfElectrons==1 && numberOfNonElectronsOrPhotons==0 )
-			{
-				// This is a valid brem, run through and tell all daughters to use the parent
-				// as the brem
-				for( auto& pDaughterTrack : vertex.daughterTracks ) pDaughterTrack->pMergedBremSource=vertex.pParentTrack;
-				vertex.pMergedBremSource=vertex.pParentTrack->pParentVertex;
-			}
-		}
-	} // end of ::DecayChain::findBrem()
-
-
-	//---------------------------------------------------------------------------------
-	//---------------------------------------------------------------------------------
-	//----   OutputCollectionWrapper methods   ----------------------------------------
-	//---------------------------------------------------------------------------------
-	//---------------------------------------------------------------------------------
-
-	::OutputCollectionWrapper::OutputCollectionWrapper( const ::DecayChain& decayChain, TrackingTruthAccumulator::OutputCollections& outputCollections )
-		: output_(outputCollections),
-		  trackingParticleIndices_(decayChain.decayTracksSize,-1),
-		  trackingVertexIndices_(decayChain.decayVerticesSize,-1)
-	{
-		// No operation besides the initialiser list
-	}
-
-	TrackingParticle* ::OutputCollectionWrapper::addTrackingParticle( const ::DecayChainTrack* pDecayTrack, const TrackingParticle& trackingParticle )
-	{
-		if( trackingParticleIndices_[pDecayTrack->simTrackIndex]!=-1 ) throw std::runtime_error( "OutputCollectionWrapper::addTrackingParticle - trying to add a particle twice" );
-
-		trackingParticleIndices_[pDecayTrack->simTrackIndex]=output_.pTrackingParticles->size();
-		output_.pTrackingParticles->push_back( trackingParticle );
-
-		// Clear any associations in case there were any beforehand
-		output_.pTrackingParticles->back().clearDecayVertices();
-		output_.pTrackingParticles->back().clearParentVertex();
-
-		// Associate to the objects that are already in the output collections
-		associateToExistingObjects( pDecayTrack );
-
-		return &output_.pTrackingParticles->back();
-	}
-
-	TrackingVertex* ::OutputCollectionWrapper::addTrackingVertex( const ::DecayChainVertex* pDecayVertex, const TrackingVertex& trackingVertex )
-	{
-		if( trackingVertexIndices_[pDecayVertex->simVertexIndex]!=-1 ) throw std::runtime_error( "OutputCollectionWrapper::addTrackingVertex - trying to add a vertex twice" );
-
-		trackingVertexIndices_[pDecayVertex->simVertexIndex]=output_.pTrackingVertices->size();
-		output_.pTrackingVertices->push_back( trackingVertex );
-
-		// Associate the new vertex to any parents or children that are already in the output collections
-		associateToExistingObjects( pDecayVertex );
-
-		return &output_.pTrackingVertices->back();
-	}
-
-	TrackingParticle* ::OutputCollectionWrapper::getTrackingParticle( const ::DecayChainTrack* pDecayTrack )
-	{
-		const int index=trackingParticleIndices_[pDecayTrack->simTrackIndex];
-		if( index==-1 ) return nullptr;
-		else return &(*output_.pTrackingParticles)[index];
-	}
-
-	TrackingVertex* ::OutputCollectionWrapper::getTrackingVertex( const ::DecayChainVertex* pDecayVertex )
-	{
-		const int index=trackingVertexIndices_[pDecayVertex->simVertexIndex];
-		if( index==-1 ) return nullptr;
-		else return &(*output_.pTrackingVertices)[index];
-	}
-
-	TrackingParticleRef OutputCollectionWrapper::getRef( const ::DecayChainTrack* pDecayTrack )
-	{
-		const int index=trackingParticleIndices_[pDecayTrack->simTrackIndex];
-		if( index==-1 ) throw std::runtime_error( "OutputCollectionWrapper::getRefTrackingParticle - ref requested for a non existent TrackingParticle" );
-		else return TrackingParticleRef( output_.refTrackingParticles, index );
-	}
-
-	TrackingVertexRef OutputCollectionWrapper::getRef( const ::DecayChainVertex* pDecayVertex )
-	{
-		const int index=trackingVertexIndices_[pDecayVertex->simVertexIndex];
-		if( index==-1 ) throw std::runtime_error( "OutputCollectionWrapper::getRefTrackingParticle - ref requested for a non existent TrackingVertex" );
-		else return TrackingVertexRef( output_.refTrackingVertexes, index );
-	}
-
-	void ::OutputCollectionWrapper::setProxy( const ::DecayChainTrack* pOriginalTrack, const ::DecayChainTrack* pProxyTrack )
-	{
-		int& index=trackingParticleIndices_[pOriginalTrack->simTrackIndex];
-		if( index!=-1 ) throw std::runtime_error( "OutputCollectionWrapper::setProxy() was called for a TrackingParticle that has already been created" );
-		// Note that index is a reference so this call changes the value in the vector too
-		index=trackingParticleIndices_[pProxyTrack->simTrackIndex];
-	}
-
-	void ::OutputCollectionWrapper::setProxy( const ::DecayChainVertex* pOriginalVertex, const ::DecayChainVertex* pProxyVertex )
-	{
-		int& index=trackingVertexIndices_[pOriginalVertex->simVertexIndex];
-		const int newIndex=trackingVertexIndices_[pProxyVertex->simVertexIndex];
-
-		if( index!=-1 && index!=newIndex ) throw std::runtime_error( "OutputCollectionWrapper::setProxy() was called for a TrackingVertex that has already been created" );
-
-		// Note that index is a reference so this call changes the value in the vector too
-		index=newIndex;
-	}
-
-	void ::OutputCollectionWrapper::associateToExistingObjects( const ::DecayChainVertex* pChainVertex )
-	{
-		// First make sure the DecayChainVertex supplied has been turned into a TrackingVertex
-		TrackingVertex* pTrackingVertex=getTrackingVertex( pChainVertex );
-		if( pTrackingVertex==nullptr ) throw std::runtime_error( "associateToExistingObjects was passed a non existent TrackingVertex" );
-
-		//
-		// Associate to the parent track (if there is one)
-		//
-		::DecayChainTrack* pParentChainTrack=pChainVertex->pParentTrack;
-		if( pParentChainTrack!=nullptr ) // Make sure there is a parent track first
-		{
-			// There is a parent track, but it might not have been turned into a TrackingParticle yet
-			TrackingParticle* pParentTrackingParticle=getTrackingParticle(pParentChainTrack);
-			if( pParentTrackingParticle!=nullptr )
-			{
-				pParentTrackingParticle->addDecayVertex( getRef(pChainVertex) );
-				pTrackingVertex->addParentTrack( getRef(pParentChainTrack) );
-			}
-			// Don't worry about the "else" case - the parent track might not necessarily get added
-			// to the output collection at all. A check is done on daughter vertices when tracks
-			// are added, so the association will be picked up then.
-		}
-
-		//
-		// A parent TrackingVertex is always associated to a daughter TrackingParticle when
-		// the TrackingParticle is created. Hence there is no need to check the list of
-		// daughter tracks.
-		//
-	}
-
-	void ::OutputCollectionWrapper::associateToExistingObjects( const ::DecayChainTrack* pChainTrack )
-	{
-		//
-		// First make sure this DecayChainTrack has been turned into a TrackingParticle
-		//
-		TrackingParticle* pTrackingParticle=getTrackingParticle( pChainTrack );
-		if( pTrackingParticle==nullptr ) throw std::runtime_error( "associateToExistingObjects was passed a non existent TrackingParticle" );
-
-		// Get the parent vertex. This should always already have been turned into a TrackingVertex, and
-		// there should always be a parent DecayChainVertex.
-		::DecayChainVertex* pParentChainVertex=pChainTrack->pParentVertex;
-		TrackingVertex* pParentTrackingVertex=getTrackingVertex( pParentChainVertex );
-
-		//
-		// First associate to the parent vertex.
-		//
-		pTrackingParticle->setParentVertex( getRef(pParentChainVertex) );
-		pParentTrackingVertex->addDaughterTrack( getRef(pChainTrack) );
-
-		// If there are any daughter vertices that have already been made into a TrackingVertex
-		// make sure they know about each other. If the daughter vertices haven't been made into
-		// TrackingVertexs yet, I won't do anything and create the association when the vertex is
-		// made.
-		for( auto pDaughterChainVertex : pChainTrack->daughterVertices )
-		{
-			TrackingVertex* pDaughterTrackingVertex=getTrackingVertex( pDaughterChainVertex );
-			if( pDaughterTrackingVertex!=nullptr )
-			{
-				pTrackingParticle->addDecayVertex( getRef(pDaughterChainVertex) );
-				pDaughterTrackingVertex->addParentTrack( getRef(pChainTrack) );
-			}
-		}
-	}
-
-
-	TrackingParticle* addTrackAndParentVertex( ::DecayChainTrack* pDecayTrack, const TrackingParticle& trackingParticle, ::OutputCollectionWrapper* pOutput )
-	{
-		// See if this TrackingParticle has already been created (could be if the DecayChainTracks are
-		// looped over in a funny order). If it has then there's no need to do anything.
-		TrackingParticle* pTrackingParticle=pOutput->getTrackingParticle( pDecayTrack );
-		if( pTrackingParticle==nullptr )
-		{
-			// Need to make sure the production vertex has been created first
-			if( pOutput->getTrackingVertex( pDecayTrack->pParentVertex ) == nullptr )
-			{
-				// TrackingVertex doesn't exist in the output collection yet. However, it's already been
-				// created in the addTrack() function and a temporary reference to it set in the TrackingParticle.
-				// I'll use that reference to create a copy in the output collection. When the TrackingParticle
-				// is added to the output collection a few lines below the temporary reference to the parent
-				// vertex will be cleared, and the correct one referring to the output collection will be set.
-				pOutput->addTrackingVertex( pDecayTrack->pParentVertex, *trackingParticle.parentVertex() );
-			}
-
-
-			pTrackingParticle=pOutput->addTrackingParticle( pDecayTrack, trackingParticle );
-		}
-
-		return pTrackingParticle;
-	}
-
-	void addTrack( ::DecayChainTrack* pDecayChainTrack, const TrackingParticleSelector* pSelector, ::OutputCollectionWrapper* pUnmergedOutput, ::OutputCollectionWrapper* pMergedOutput, const ::TrackingParticleFactory& objectFactory, bool addAncestors, const TrackerTopology *tTopo )
-	{
-		if( pDecayChainTrack==nullptr ) return; // This is required for when the addAncestors_ recursive call reaches the top of the chain
-
-		// Check to see if this particle has already been processed while traversing up the parents
-		// of another split in the decay chain. The check in the line above only stops when the top
-		// of the chain is reached, whereas this will stop when a previously traversed split is reached.
-		{ // block to limit the scope of temporary variables
-			bool alreadyProcessed=true;
-			if( pUnmergedOutput!=nullptr )
-			{
-				if( pUnmergedOutput->getTrackingParticle( pDecayChainTrack )==nullptr ) alreadyProcessed=false;
-			}
-			if( pMergedOutput!=nullptr )
-			{
-				if( pMergedOutput->getTrackingParticle( pDecayChainTrack )==nullptr ) alreadyProcessed=false;
-			}
-			if( alreadyProcessed ) return;
-		}
-
-		// Create a TrackingParticle.
-		TrackingParticle newTrackingParticle=objectFactory.createTrackingParticle( pDecayChainTrack, tTopo );
-
-		// The selector checks the impact parameters from the vertex, so I need to have a valid reference
-		// to the parent vertex in the TrackingParticle before that can be called. TrackingParticle needs
-		// an edm::Ref for the parent TrackingVertex though. I still don't know if this is going to be
-		// added to the collection so I can't take it from there, so I need to create a temporary one.
-		// When the addTrackAndParentVertex() is called (assuming it passes selection) it will use the
-		// temporary reference to create a copy of the parent vertex, put that in the output collection,
-		// and then set the reference in the TrackingParticle properly.
-		TrackingVertexCollection dummyCollection; // Only needed to create an edm::Ref
-		dummyCollection.push_back( objectFactory.createTrackingVertex( pDecayChainTrack->pParentVertex) );
-		TrackingVertexRef temporaryRef( &dummyCollection, 0 );
-		newTrackingParticle.setParentVertex( temporaryRef );
-
-		// If a selector has been supplied apply it on the new TrackingParticle and return if it fails.
-		if( pSelector )
-		{
-			if( !(*pSelector)( newTrackingParticle ) ) return; // Return if the TrackingParticle fails selection
-		}
-
-		// Add the ancestors first (if required) so that the collection has some kind of chronological
-		// order. I don't know how important that is but other code might assume chronological order.
-		// If adding ancestors, no selection is applied. Note that I've already checked that all
-		// DecayChainTracks have a pParentVertex.
-		if( addAncestors ) addTrack( pDecayChainTrack->pParentVertex->pParentTrack, nullptr, pUnmergedOutput, pMergedOutput, objectFactory, addAncestors, tTopo );
-
-		// If creation of the unmerged collection has been turned off in the config this pointer
-		// will be null.
-		if( pUnmergedOutput!=nullptr ) addTrackAndParentVertex( pDecayChainTrack, newTrackingParticle, pUnmergedOutput );
-
-		// If creation of the merged collection has been turned off in the config this pointer
-		// will be null.
-		if( pMergedOutput!=nullptr )
-		{
-			::DecayChainTrack* pBremParentChainTrack=pDecayChainTrack;
-			while( pBremParentChainTrack->pMergedBremSource!=nullptr ) pBremParentChainTrack=pBremParentChainTrack->pMergedBremSource;
-
-			if( pBremParentChainTrack!=pDecayChainTrack )
-			{
-				TrackingParticle* pBremParentTrackingParticle=addTrackAndParentVertex( pBremParentChainTrack, newTrackingParticle, pMergedOutput );
-				// The original particle in the bremsstrahlung decay chain has been
-				// created (or retrieved if it already existed), now copy in the
-				// extra information.
-				// TODO - copy extra information.
-
-				if( std::abs( newTrackingParticle.pdgId() ) == 22 )
-				{
-					// Photons are added as separate TrackingParticles, but with the production
-					// vertex changed to be the production vertex of the original electron.
-
-					// Set up a proxy, so that all requests for the parent TrackingVertex get
-					// redirected to the brem parent's TrackingVertex.
-					pMergedOutput->setProxy( pDecayChainTrack->pParentVertex, pBremParentChainTrack->pParentVertex );
-
-					// Now that pMergedOutput thinks the parent vertex is the brem parent's vertex I can
-					// call this and it will set the TrackingParticle parent vertex correctly to the brem
-					// parent vertex.
-					addTrackAndParentVertex( pDecayChainTrack, newTrackingParticle, pMergedOutput );
-				}
-				else if( std::abs( newTrackingParticle.pdgId() ) == 11 )
-				{
-					// Electrons have their G4 tracks and SimHits copied to the parent TrackingParticle.
-					for( const auto& trackSegment : newTrackingParticle.g4Tracks() )
-					{
-						pBremParentTrackingParticle->addG4Track( trackSegment );
-					}
-
-					// Also copy the generator particle references
-					for( const auto& genParticleRef : newTrackingParticle.genParticles() )
-					{
-						pBremParentTrackingParticle->addGenParticle( genParticleRef );
-					}
-
-					pBremParentTrackingParticle->setNumberOfHits(pBremParentTrackingParticle->numberOfHits()+newTrackingParticle.numberOfHits());
-					pBremParentTrackingParticle->setNumberOfTrackerHits(pBremParentTrackingParticle->numberOfTrackerHits()+newTrackingParticle.numberOfTrackerHits());
-					pBremParentTrackingParticle->setNumberOfTrackerLayers(pBremParentTrackingParticle->numberOfTrackerLayers()+newTrackingParticle.numberOfTrackerLayers());
-
-					// Set a proxy in the output collection wrapper so that any attempt to get objects for
-					// this DecayChainTrack again get redirected to the brem parent.
-					pMergedOutput->setProxy( pDecayChainTrack, pBremParentChainTrack );
-				}
-			}
-			else
-			{
-				// This is not the result of bremsstrahlung so add to the collection as normal.
-				addTrackAndParentVertex( pDecayChainTrack, newTrackingParticle, pMergedOutput );
-			}
-		} // end of "if( pMergedOutput!=NULL )", i.e. end of "if bremsstrahlung merging is turned on"
-
-	} // end of addTrack function
-
-} // end of the unnamed namespace
+  void ::DecayChain::findBrem(const std::vector<SimTrack> &trackCollection,
+                              const std::vector<SimVertex> &vertexCollection) {
+    for (size_t index = 0; index < decayVerticesSize; ++index) {
+      auto &vertex = decayVertices_[index];
+
+      // Make sure parent is an electron
+      if (vertex.pParentTrack == nullptr)
+        continue;
+      int parentTrackPDG = trackCollection[vertex.pParentTrack->simTrackIndex].type();
+      if (std::abs(parentTrackPDG) != 11)
+        continue;
+
+      size_t numberOfElectrons = 0;
+      size_t numberOfNonElectronsOrPhotons = 0;
+      for (auto &pDaughterTrack : vertex.daughterTracks) {
+        const auto &simTrack = trackCollection[pDaughterTrack->simTrackIndex];
+        if (simTrack.type() == 11 || simTrack.type() == -11)
+          ++numberOfElectrons;
+        else if (simTrack.type() != 22)
+          ++numberOfNonElectronsOrPhotons;
+      }
+      if (numberOfElectrons == 1 && numberOfNonElectronsOrPhotons == 0) {
+        // This is a valid brem, run through and tell all daughters to use the
+        // parent as the brem
+        for (auto &pDaughterTrack : vertex.daughterTracks)
+          pDaughterTrack->pMergedBremSource = vertex.pParentTrack;
+        vertex.pMergedBremSource = vertex.pParentTrack->pParentVertex;
+      }
+    }
+  }  // end of ::DecayChain::findBrem()
+
+  //---------------------------------------------------------------------------------
+  //---------------------------------------------------------------------------------
+  //----   OutputCollectionWrapper methods
+  //----------------------------------------
+  //---------------------------------------------------------------------------------
+  //---------------------------------------------------------------------------------
+
+  ::OutputCollectionWrapper::OutputCollectionWrapper(const ::DecayChain &decayChain,
+                                                     TrackingTruthAccumulator::OutputCollections &outputCollections)
+      : output_(outputCollections),
+        trackingParticleIndices_(decayChain.decayTracksSize, -1),
+        trackingVertexIndices_(decayChain.decayVerticesSize, -1) {
+    // No operation besides the initialiser list
+  }
+
+  TrackingParticle * ::OutputCollectionWrapper::addTrackingParticle(const ::DecayChainTrack *pDecayTrack,
+                                                                    const TrackingParticle &trackingParticle) {
+    if (trackingParticleIndices_[pDecayTrack->simTrackIndex] != -1)
+      throw std::runtime_error(
+          "OutputCollectionWrapper::addTrackingParticle - "
+          "trying to add a particle twice");
+
+    trackingParticleIndices_[pDecayTrack->simTrackIndex] = output_.pTrackingParticles->size();
+    output_.pTrackingParticles->push_back(trackingParticle);
+
+    // Clear any associations in case there were any beforehand
+    output_.pTrackingParticles->back().clearDecayVertices();
+    output_.pTrackingParticles->back().clearParentVertex();
+
+    // Associate to the objects that are already in the output collections
+    associateToExistingObjects(pDecayTrack);
+
+    return &output_.pTrackingParticles->back();
+  }
+
+  TrackingVertex * ::OutputCollectionWrapper::addTrackingVertex(const ::DecayChainVertex *pDecayVertex,
+                                                                const TrackingVertex &trackingVertex) {
+    if (trackingVertexIndices_[pDecayVertex->simVertexIndex] != -1)
+      throw std::runtime_error(
+          "OutputCollectionWrapper::addTrackingVertex - "
+          "trying to add a vertex twice");
+
+    trackingVertexIndices_[pDecayVertex->simVertexIndex] = output_.pTrackingVertices->size();
+    output_.pTrackingVertices->push_back(trackingVertex);
+
+    // Associate the new vertex to any parents or children that are already in the
+    // output collections
+    associateToExistingObjects(pDecayVertex);
+
+    return &output_.pTrackingVertices->back();
+  }
+
+  TrackingParticle * ::OutputCollectionWrapper::getTrackingParticle(const ::DecayChainTrack *pDecayTrack) {
+    const int index = trackingParticleIndices_[pDecayTrack->simTrackIndex];
+    if (index == -1)
+      return nullptr;
+    else
+      return &(*output_.pTrackingParticles)[index];
+  }
+
+  TrackingVertex * ::OutputCollectionWrapper::getTrackingVertex(const ::DecayChainVertex *pDecayVertex) {
+    const int index = trackingVertexIndices_[pDecayVertex->simVertexIndex];
+    if (index == -1)
+      return nullptr;
+    else
+      return &(*output_.pTrackingVertices)[index];
+  }
+
+  TrackingParticleRef OutputCollectionWrapper::getRef(const ::DecayChainTrack *pDecayTrack) {
+    const int index = trackingParticleIndices_[pDecayTrack->simTrackIndex];
+    if (index == -1)
+      throw std::runtime_error(
+          "OutputCollectionWrapper::getRefTrackingParticle - ref requested for a "
+          "non existent TrackingParticle");
+    else
+      return TrackingParticleRef(output_.refTrackingParticles, index);
+  }
+
+  TrackingVertexRef OutputCollectionWrapper::getRef(const ::DecayChainVertex *pDecayVertex) {
+    const int index = trackingVertexIndices_[pDecayVertex->simVertexIndex];
+    if (index == -1)
+      throw std::runtime_error(
+          "OutputCollectionWrapper::getRefTrackingParticle - ref requested for a "
+          "non existent TrackingVertex");
+    else
+      return TrackingVertexRef(output_.refTrackingVertexes, index);
+  }
+
+  void ::OutputCollectionWrapper::setProxy(const ::DecayChainTrack *pOriginalTrack,
+                                           const ::DecayChainTrack *pProxyTrack) {
+    int &index = trackingParticleIndices_[pOriginalTrack->simTrackIndex];
+    if (index != -1)
+      throw std::runtime_error(
+          "OutputCollectionWrapper::setProxy() was called for a TrackingParticle "
+          "that has already been created");
+    // Note that index is a reference so this call changes the value in the vector
+    // too
+    index = trackingParticleIndices_[pProxyTrack->simTrackIndex];
+  }
+
+  void ::OutputCollectionWrapper::setProxy(const ::DecayChainVertex *pOriginalVertex,
+                                           const ::DecayChainVertex *pProxyVertex) {
+    int &index = trackingVertexIndices_[pOriginalVertex->simVertexIndex];
+    const int newIndex = trackingVertexIndices_[pProxyVertex->simVertexIndex];
+
+    if (index != -1 && index != newIndex)
+      throw std::runtime_error(
+          "OutputCollectionWrapper::setProxy() was called for a TrackingVertex "
+          "that has already been created");
+
+    // Note that index is a reference so this call changes the value in the vector
+    // too
+    index = newIndex;
+  }
+
+  void ::OutputCollectionWrapper::associateToExistingObjects(const ::DecayChainVertex *pChainVertex) {
+    // First make sure the DecayChainVertex supplied has been turned into a
+    // TrackingVertex
+    TrackingVertex *pTrackingVertex = getTrackingVertex(pChainVertex);
+    if (pTrackingVertex == nullptr)
+      throw std::runtime_error("associateToExistingObjects was passed a non existent TrackingVertex");
+
+    //
+    // Associate to the parent track (if there is one)
+    //
+    ::DecayChainTrack *pParentChainTrack = pChainVertex->pParentTrack;
+    if (pParentChainTrack != nullptr)  // Make sure there is a parent track first
+    {
+      // There is a parent track, but it might not have been turned into a
+      // TrackingParticle yet
+      TrackingParticle *pParentTrackingParticle = getTrackingParticle(pParentChainTrack);
+      if (pParentTrackingParticle != nullptr) {
+        pParentTrackingParticle->addDecayVertex(getRef(pChainVertex));
+        pTrackingVertex->addParentTrack(getRef(pParentChainTrack));
+      }
+      // Don't worry about the "else" case - the parent track might not
+      // necessarily get added to the output collection at all. A check is done on
+      // daughter vertices when tracks are added, so the association will be
+      // picked up then.
+    }
+
+    //
+    // A parent TrackingVertex is always associated to a daughter TrackingParticle
+    // when the TrackingParticle is created. Hence there is no need to check the
+    // list of daughter tracks.
+    //
+  }
+
+  void ::OutputCollectionWrapper::associateToExistingObjects(const ::DecayChainTrack *pChainTrack) {
+    //
+    // First make sure this DecayChainTrack has been turned into a
+    // TrackingParticle
+    //
+    TrackingParticle *pTrackingParticle = getTrackingParticle(pChainTrack);
+    if (pTrackingParticle == nullptr)
+      throw std::runtime_error(
+          "associateToExistingObjects was passed a non "
+          "existent TrackingParticle");
+
+    // Get the parent vertex. This should always already have been turned into a
+    // TrackingVertex, and there should always be a parent DecayChainVertex.
+    ::DecayChainVertex *pParentChainVertex = pChainTrack->pParentVertex;
+    TrackingVertex *pParentTrackingVertex = getTrackingVertex(pParentChainVertex);
+
+    //
+    // First associate to the parent vertex.
+    //
+    pTrackingParticle->setParentVertex(getRef(pParentChainVertex));
+    pParentTrackingVertex->addDaughterTrack(getRef(pChainTrack));
+
+    // If there are any daughter vertices that have already been made into a
+    // TrackingVertex make sure they know about each other. If the daughter
+    // vertices haven't been made into TrackingVertexs yet, I won't do anything
+    // and create the association when the vertex is made.
+    for (auto pDaughterChainVertex : pChainTrack->daughterVertices) {
+      TrackingVertex *pDaughterTrackingVertex = getTrackingVertex(pDaughterChainVertex);
+      if (pDaughterTrackingVertex != nullptr) {
+        pTrackingParticle->addDecayVertex(getRef(pDaughterChainVertex));
+        pDaughterTrackingVertex->addParentTrack(getRef(pChainTrack));
+      }
+    }
+  }
+
+  TrackingParticle *addTrackAndParentVertex(::DecayChainTrack *pDecayTrack,
+                                            const TrackingParticle &trackingParticle,
+                                            ::OutputCollectionWrapper *pOutput) {
+    // See if this TrackingParticle has already been created (could be if the
+    // DecayChainTracks are looped over in a funny order). If it has then there's
+    // no need to do anything.
+    TrackingParticle *pTrackingParticle = pOutput->getTrackingParticle(pDecayTrack);
+    if (pTrackingParticle == nullptr) {
+      // Need to make sure the production vertex has been created first
+      if (pOutput->getTrackingVertex(pDecayTrack->pParentVertex) == nullptr) {
+        // TrackingVertex doesn't exist in the output collection yet. However,
+        // it's already been created in the addTrack() function and a temporary
+        // reference to it set in the TrackingParticle. I'll use that reference to
+        // create a copy in the output collection. When the TrackingParticle is
+        // added to the output collection a few lines below the temporary
+        // reference to the parent vertex will be cleared, and the correct one
+        // referring to the output collection will be set.
+        pOutput->addTrackingVertex(pDecayTrack->pParentVertex, *trackingParticle.parentVertex());
+      }
+
+      pTrackingParticle = pOutput->addTrackingParticle(pDecayTrack, trackingParticle);
+    }
+
+    return pTrackingParticle;
+  }
+
+  void addTrack(::DecayChainTrack *pDecayChainTrack,
+                const TrackingParticleSelector *pSelector,
+                ::OutputCollectionWrapper *pUnmergedOutput,
+                ::OutputCollectionWrapper *pMergedOutput,
+                const ::TrackingParticleFactory &objectFactory,
+                bool addAncestors,
+                const TrackerTopology *tTopo) {
+    if (pDecayChainTrack == nullptr)
+      return;  // This is required for when the addAncestors_ recursive call
+               // reaches the top of the chain
+
+    // Check to see if this particle has already been processed while traversing
+    // up the parents of another split in the decay chain. The check in the line
+    // above only stops when the top of the chain is reached, whereas this will
+    // stop when a previously traversed split is reached.
+    {  // block to limit the scope of temporary variables
+      bool alreadyProcessed = true;
+      if (pUnmergedOutput != nullptr) {
+        if (pUnmergedOutput->getTrackingParticle(pDecayChainTrack) == nullptr)
+          alreadyProcessed = false;
+      }
+      if (pMergedOutput != nullptr) {
+        if (pMergedOutput->getTrackingParticle(pDecayChainTrack) == nullptr)
+          alreadyProcessed = false;
+      }
+      if (alreadyProcessed)
+        return;
+    }
+
+    // Create a TrackingParticle.
+    TrackingParticle newTrackingParticle = objectFactory.createTrackingParticle(pDecayChainTrack, tTopo);
+
+    // The selector checks the impact parameters from the vertex, so I need to
+    // have a valid reference to the parent vertex in the TrackingParticle before
+    // that can be called. TrackingParticle needs an edm::Ref for the parent
+    // TrackingVertex though. I still don't know if this is going to be added to
+    // the collection so I can't take it from there, so I need to create a
+    // temporary one. When the addTrackAndParentVertex() is called (assuming it
+    // passes selection) it will use the temporary reference to create a copy of
+    // the parent vertex, put that in the output collection, and then set the
+    // reference in the TrackingParticle properly.
+    TrackingVertexCollection dummyCollection;  // Only needed to create an edm::Ref
+    dummyCollection.push_back(objectFactory.createTrackingVertex(pDecayChainTrack->pParentVertex));
+    TrackingVertexRef temporaryRef(&dummyCollection, 0);
+    newTrackingParticle.setParentVertex(temporaryRef);
+
+    // If a selector has been supplied apply it on the new TrackingParticle and
+    // return if it fails.
+    if (pSelector) {
+      if (!(*pSelector)(newTrackingParticle))
+        return;  // Return if the TrackingParticle fails selection
+    }
+
+    // Add the ancestors first (if required) so that the collection has some kind
+    // of chronological order. I don't know how important that is but other code
+    // might assume chronological order. If adding ancestors, no selection is
+    // applied. Note that I've already checked that all DecayChainTracks have a
+    // pParentVertex.
+    if (addAncestors)
+      addTrack(pDecayChainTrack->pParentVertex->pParentTrack,
+               nullptr,
+               pUnmergedOutput,
+               pMergedOutput,
+               objectFactory,
+               addAncestors,
+               tTopo);
+
+    // If creation of the unmerged collection has been turned off in the config
+    // this pointer will be null.
+    if (pUnmergedOutput != nullptr)
+      addTrackAndParentVertex(pDecayChainTrack, newTrackingParticle, pUnmergedOutput);
+
+    // If creation of the merged collection has been turned off in the config this
+    // pointer will be null.
+    if (pMergedOutput != nullptr) {
+      ::DecayChainTrack *pBremParentChainTrack = pDecayChainTrack;
+      while (pBremParentChainTrack->pMergedBremSource != nullptr)
+        pBremParentChainTrack = pBremParentChainTrack->pMergedBremSource;
+
+      if (pBremParentChainTrack != pDecayChainTrack) {
+        TrackingParticle *pBremParentTrackingParticle =
+            addTrackAndParentVertex(pBremParentChainTrack, newTrackingParticle, pMergedOutput);
+        // The original particle in the bremsstrahlung decay chain has been
+        // created (or retrieved if it already existed), now copy in the
+        // extra information.
+        // TODO - copy extra information.
+
+        if (std::abs(newTrackingParticle.pdgId()) == 22) {
+          // Photons are added as separate TrackingParticles, but with the
+          // production vertex changed to be the production vertex of the original
+          // electron.
+
+          // Set up a proxy, so that all requests for the parent TrackingVertex
+          // get redirected to the brem parent's TrackingVertex.
+          pMergedOutput->setProxy(pDecayChainTrack->pParentVertex, pBremParentChainTrack->pParentVertex);
+
+          // Now that pMergedOutput thinks the parent vertex is the brem parent's
+          // vertex I can call this and it will set the TrackingParticle parent
+          // vertex correctly to the brem parent vertex.
+          addTrackAndParentVertex(pDecayChainTrack, newTrackingParticle, pMergedOutput);
+        } else if (std::abs(newTrackingParticle.pdgId()) == 11) {
+          // Electrons have their G4 tracks and SimHits copied to the parent
+          // TrackingParticle.
+          for (const auto &trackSegment : newTrackingParticle.g4Tracks()) {
+            pBremParentTrackingParticle->addG4Track(trackSegment);
+          }
+
+          // Also copy the generator particle references
+          for (const auto &genParticleRef : newTrackingParticle.genParticles()) {
+            pBremParentTrackingParticle->addGenParticle(genParticleRef);
+          }
+
+          pBremParentTrackingParticle->setNumberOfHits(pBremParentTrackingParticle->numberOfHits() +
+                                                       newTrackingParticle.numberOfHits());
+          pBremParentTrackingParticle->setNumberOfTrackerHits(pBremParentTrackingParticle->numberOfTrackerHits() +
+                                                              newTrackingParticle.numberOfTrackerHits());
+          pBremParentTrackingParticle->setNumberOfTrackerLayers(pBremParentTrackingParticle->numberOfTrackerLayers() +
+                                                                newTrackingParticle.numberOfTrackerLayers());
+
+          // Set a proxy in the output collection wrapper so that any attempt to
+          // get objects for this DecayChainTrack again get redirected to the brem
+          // parent.
+          pMergedOutput->setProxy(pDecayChainTrack, pBremParentChainTrack);
+        }
+      } else {
+        // This is not the result of bremsstrahlung so add to the collection as
+        // normal.
+        addTrackAndParentVertex(pDecayChainTrack, newTrackingParticle, pMergedOutput);
+      }
+    }  // end of "if( pMergedOutput!=NULL )", i.e. end of "if bremsstrahlung
+       // merging is turned on"
+
+  }  // end of addTrack function
+
+}  // namespace
 
 // Register with the framework
-DEFINE_DIGI_ACCUMULATOR (TrackingTruthAccumulator);
+DEFINE_DIGI_ACCUMULATOR(TrackingTruthAccumulator);
diff --git a/SimGeneral/TrackingAnalysis/plugins/TrackingTruthAccumulator.h b/SimGeneral/TrackingAnalysis/plugins/TrackingTruthAccumulator.h
index c107e7f8a01e2..c9c494c5d9adf 100644
--- a/SimGeneral/TrackingAnalysis/plugins/TrackingTruthAccumulator.h
+++ b/SimGeneral/TrackingAnalysis/plugins/TrackingTruthAccumulator.h
@@ -1,151 +1,188 @@
 #ifndef TrackingAnalysis_TrackingTruthAccumulator_h
 #define TrackingAnalysis_TrackingTruthAccumulator_h
 
-#include "SimGeneral/MixingModule/interface/DigiAccumulatorMixMod.h"
-#include "SimTracker/Common/interface/TrackingParticleSelector.h"
-#include <memory> // required for std::unique_ptr
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticleFwd.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertexContainer.h"
-
+#include "SimGeneral/MixingModule/interface/DigiAccumulatorMixMod.h"
+#include "SimTracker/Common/interface/TrackingParticleSelector.h"
+#include <memory>  // required for std::unique_ptr
 
 // Forward declarations
-namespace edm
-{
-	class ParameterSet;
-        class ConsumesCollector;
-	class ProducerBase;
-	class Event;
-	class EventSetup;
-        class StreamID;
-}
+namespace edm {
+  class ParameterSet;
+  class ConsumesCollector;
+  class ProducerBase;
+  class Event;
+  class EventSetup;
+  class StreamID;
+}  // namespace edm
 class PileUpEventPrincipal;
 class PSimHit;
 
-
-
 /** @brief Replacement for TrackingTruthProducer in the new pileup mixing setup.
  *
  * The configuration parameters are:
  *
  * <table>
  * <tr>
- *     <th>Parameter name                  </th><th> Type              </th><th> Description </th>
+ *     <th>Parameter name                  </th><th> Type              </th><th>
+ * Description </th>
  * </tr>
- * <tr><td> volumeRadius                   </td><td> double            </td><td> The volume radius in cm used if ignoreTracksOutsideVolume is true. </td></tr>
- * <tr><td> volumeZ                        </td><td> double            </td><td> The volume z in cm used if ignoreTracksOutsideVolume is true. </td></tr>
- * <tr><td> ignoreTracksOutsideVolume      </td><td> bool              </td><td> If true, sim tracks that have a production vertex outside the volume specified by
- *                                                                               volumeRadius and volumeZ won't be turned into TrackingParticles. Doesn't make much
- *                                                                               difference to be honest, over a huge range of volume sizes so there must be a cut
- *                                                                               earlier in the simulation. </td></tr>
- * <tr><td> maximumPreviousBunchCrossing   </td><td> unsigned int      </td><td> Bunch crossings before this number (inclusive; use positive integer) won't be included.
- *                                                                               Setting to zero means only in-time. </td></tr>
- * <tr><td> maximumSubsequentBunchCrossing </td><td> unsigned int      </td><td> Bunch crossings after this won't create any TrackingParticles. </td></tr>
- * <tr><td> createUnmergedCollection       </td><td> bool              </td><td> Whether to create the TrackingParticle collection without bremsstrahlung merged. </td></tr>
- * <tr><td> createMergedBremsstrahlung     </td><td> bool              </td><td> Whether to create the TrackingParticle collection with bremsstrahlung merged. At
- *                                                                               least one of createUnmergedCollection or createMergedBremsstrahlung should be true
- *                                                                               otherwise nothing will be produced. </td></tr>
- * <tr><td> createInitialVertexCollection  </td><td> bool              </td><td> Whether to create a collection of just the initial vertices. You can usually get this
- *                                                                               information from one of the other collections (merged or unmerged bremsstrahlung), but
- *                                                                               for this collection no selection is applied. Hence you will always have all of the initial
- *                                                                               vertices regardless of how tightly you select TrackingParticles with the "select" parameter.
- *                                                                               Note that <b>the collection will have no links to the products of these vertices<b>.  If you
- *                                                                               want to know what came off these vertices you will have to look in one of the other
- *                                                                               collections. The name of the collection will be "InitialVertices".</td></tr>
- * <tr><td> alwaysAddAncestors             </td><td> bool              </td><td> If a sim track passes selection and is turned into a TrackingParticle, all of it's
- *                                                                               parents will also be created even if they fail the selection. This was the default
- *                                                                               behaviour for the old TrackingParticleProducer. </td></tr>
- * <tr><td> removeDeadModules              </td><td> bool              </td><td> Hasn't been implemented yet (as of 22/May/2013). </td></tr>
- * <tr><td> simTrackCollection             </td><td> edm::InputTag     </td><td> The input SimTrack collection </td></tr>
- * <tr><td> simVertexCollection            </td><td> edm::InputTag     </td><td> The input SimVerted collection </td></tr>
- * <tr><td> simHitCollections              </td><td> edm::ParameterSet </td><td> A ParameterSet of vectors of InputTags that are the input PSimHits </td></tr>
- * <tr><td> genParticleCollection          </td><td> edm::InputTag     </td><td> The input reco::GenParticle collection. Note that there's a difference between
- *                                                                               reco::GenParticle and HepMC::GenParticle; the old TrackingTruthProducer used to
- *                                                                               use HepMC::GenParticle. </td></tr>
- * <tr><td> allowDifferentSimHitProcesses  </td><td> bool              </td><td> Should be false for FullSim and true for FastSim. There's more documentation in
- *                                                                               the code if you're really interested. </td></tr>
- * <tr><td> select                         </td><td> edm::ParameterSet </td><td> A ParameterSet used to configure a TrackingParticleSelector. If the TrackingParticle
- *                                                                               doesn't pass this selector then it's not added to the output. </td></tr>
+ * <tr><td> volumeRadius                   </td><td> double            </td><td>
+ * The volume radius in cm used if ignoreTracksOutsideVolume is true. </td></tr>
+ * <tr><td> volumeZ                        </td><td> double            </td><td>
+ * The volume z in cm used if ignoreTracksOutsideVolume is true. </td></tr>
+ * <tr><td> ignoreTracksOutsideVolume      </td><td> bool              </td><td>
+ * If true, sim tracks that have a production vertex outside the volume
+ * specified by volumeRadius and volumeZ won't be turned into TrackingParticles.
+ * Doesn't make much difference to be honest, over a huge range of volume sizes
+ * so there must be a cut earlier in the simulation. </td></tr> <tr><td>
+ * maximumPreviousBunchCrossing   </td><td> unsigned int      </td><td> Bunch
+ * crossings before this number (inclusive; use positive integer) won't be
+ * included. Setting to zero means only in-time. </td></tr> <tr><td>
+ * maximumSubsequentBunchCrossing </td><td> unsigned int      </td><td> Bunch
+ * crossings after this won't create any TrackingParticles. </td></tr> <tr><td>
+ * createUnmergedCollection       </td><td> bool              </td><td> Whether
+ * to create the TrackingParticle collection without bremsstrahlung merged.
+ * </td></tr> <tr><td> createMergedBremsstrahlung     </td><td> bool </td><td>
+ * Whether to create the TrackingParticle collection with bremsstrahlung merged.
+ * At least one of createUnmergedCollection or createMergedBremsstrahlung should
+ * be true otherwise nothing will be produced. </td></tr> <tr><td>
+ * createInitialVertexCollection  </td><td> bool              </td><td> Whether
+ * to create a collection of just the initial vertices. You can usually get this
+ *                                                                               information
+ * from one of the other collections (merged or unmerged bremsstrahlung), but
+ *                                                                               for
+ * this collection no selection is applied. Hence you will always have all of
+ * the initial vertices regardless of how tightly you select TrackingParticles
+ * with the "select" parameter. Note that <b>the collection will have no links
+ * to the products of these vertices<b>.  If you want to know what came off
+ * these vertices you will have to look in one of the other collections. The
+ * name of the collection will be "InitialVertices".</td></tr> <tr><td>
+ * alwaysAddAncestors             </td><td> bool              </td><td> If a sim
+ * track passes selection and is turned into a TrackingParticle, all of it's
+ *                                                                               parents
+ * will also be created even if they fail the selection. This was the default
+ *                                                                               behaviour
+ * for the old TrackingParticleProducer. </td></tr> <tr><td> removeDeadModules
+ * </td><td> bool              </td><td> Hasn't been implemented yet (as of
+ * 22/May/2013). </td></tr> <tr><td> simTrackCollection             </td><td>
+ * edm::InputTag     </td><td> The input SimTrack collection </td></tr> <tr><td>
+ * simVertexCollection            </td><td> edm::InputTag     </td><td> The
+ * input SimVerted collection </td></tr> <tr><td> simHitCollections </td><td>
+ * edm::ParameterSet </td><td> A ParameterSet of vectors of InputTags that are
+ * the input PSimHits </td></tr> <tr><td> genParticleCollection </td><td>
+ * edm::InputTag     </td><td> The input reco::GenParticle collection. Note that
+ * there's a difference between reco::GenParticle and HepMC::GenParticle; the
+ * old TrackingTruthProducer used to use HepMC::GenParticle. </td></tr> <tr><td>
+ * allowDifferentSimHitProcesses  </td><td> bool              </td><td> Should
+ * be false for FullSim and true for FastSim. There's more documentation in the
+ * code if you're really interested. </td></tr> <tr><td> select </td><td>
+ * edm::ParameterSet </td><td> A ParameterSet used to configure a
+ * TrackingParticleSelector. If the TrackingParticle doesn't pass this selector
+ * then it's not added to the output. </td></tr>
  * </table>
  *
  * @author Mark Grimes (mark.grimes@bristol.ac.uk)
  * @date 11/Oct/2012
  */
-class TrackingTruthAccumulator : public DigiAccumulatorMixMod
-{
+class TrackingTruthAccumulator : public DigiAccumulatorMixMod {
 public:
-	explicit TrackingTruthAccumulator( const edm::ParameterSet& config, edm::ProducerBase& mixMod, edm::ConsumesCollector& iC);
+  explicit TrackingTruthAccumulator(const edm::ParameterSet &config,
+                                    edm::ProducerBase &mixMod,
+                                    edm::ConsumesCollector &iC);
+
 private:
-	void initializeEvent( const edm::Event& event, const edm::EventSetup& setup ) override;
-	void accumulate( const edm::Event& event, const edm::EventSetup& setup ) override;
-	void accumulate( const PileUpEventPrincipal& event, const edm::EventSetup& setup, edm::StreamID const& ) override;
-	void finalizeEvent( edm::Event& event, const edm::EventSetup& setup ) override;
+  void initializeEvent(const edm::Event &event, const edm::EventSetup &setup) override;
+  void accumulate(const edm::Event &event, const edm::EventSetup &setup) override;
+  void accumulate(const PileUpEventPrincipal &event, const edm::EventSetup &setup, edm::StreamID const &) override;
+  void finalizeEvent(edm::Event &event, const edm::EventSetup &setup) override;
 
-	/** @brief Both forms of accumulate() delegate to this templated method. */
-	template<class T> void accumulateEvent( const T& event, const edm::EventSetup& setup, const edm::Handle< edm::HepMCProduct >& hepMCproduct );
+  /** @brief Both forms of accumulate() delegate to this templated method. */
+  template <class T>
+  void accumulateEvent(const T &event,
+                       const edm::EventSetup &setup,
+                       const edm::Handle<edm::HepMCProduct> &hepMCproduct);
 
-	/** @brief Fills the supplied vector with pointers to the SimHits, checking for bad modules if required */
-	template<class T> void fillSimHits( std::vector<const PSimHit*>& returnValue, const T& event, const edm::EventSetup& setup );
+  /** @brief Fills the supplied vector with pointers to the SimHits, checking
+   * for bad modules if required */
+  template <class T>
+  void fillSimHits(std::vector<const PSimHit *> &returnValue, const T &event, const edm::EventSetup &setup);
 
-	const std::string messageCategory_; ///< The message category used to send messages to MessageLogger
+  const std::string messageCategory_;  ///< The message category used to send
+                                       ///< messages to MessageLogger
 
-	const double volumeRadius_;
-	const double volumeZ_;
-	/// maximum distance for HepMC::GenVertex to be added to SimVertex
-	const double vertexDistanceCut_;
-	const bool ignoreTracksOutsideVolume_;
+  const double volumeRadius_;
+  const double volumeZ_;
+  /// maximum distance for HepMC::GenVertex to be added to SimVertex
+  const double vertexDistanceCut_;
+  const bool ignoreTracksOutsideVolume_;
 
-	/** The maximum bunch crossing BEFORE the signal crossing to create TrackinParticles for. Use positive values. If set to zero no
-	 * previous bunches are added and only in-time, signal and after bunches (defined by maximumSubsequentBunchCrossing_) are used.*/
-	const unsigned int maximumPreviousBunchCrossing_;
-	/** The maximum bunch crossing AFTER the signal crossing to create TrackinParticles for. E.g. if set to zero only
-	 * uses the signal and in time pileup (and previous bunches defined by the maximumPreviousBunchCrossing_ parameter). */
-	const unsigned int maximumSubsequentBunchCrossing_;
-	/// If bremsstrahlung merging, whether to also add the unmerged collection to the event or not.
-	const bool createUnmergedCollection_;
-	const bool createMergedCollection_;
-	/// Whether or not to create a separate collection for just the initial interaction vertices
-	const bool createInitialVertexCollection_;
-	/// Whether or not to add the full parentage of any TrackingParticle that is inserted in the collection.
-	const bool addAncestors_;
+  /** The maximum bunch crossing BEFORE the signal crossing to create
+   * TrackinParticles for. Use positive values. If set to zero no previous
+   * bunches are added and only in-time, signal and after bunches (defined by
+   * maximumSubsequentBunchCrossing_) are used.*/
+  const unsigned int maximumPreviousBunchCrossing_;
+  /** The maximum bunch crossing AFTER the signal crossing to create
+   * TrackinParticles for. E.g. if set to zero only
+   * uses the signal and in time pileup (and previous bunches defined by the
+   * maximumPreviousBunchCrossing_ parameter). */
+  const unsigned int maximumSubsequentBunchCrossing_;
+  /// If bremsstrahlung merging, whether to also add the unmerged collection to
+  /// the event or not.
+  const bool createUnmergedCollection_;
+  const bool createMergedCollection_;
+  /// Whether or not to create a separate collection for just the initial
+  /// interaction vertices
+  const bool createInitialVertexCollection_;
+  /// Whether or not to add the full parentage of any TrackingParticle that is
+  /// inserted in the collection.
+  const bool addAncestors_;
 
-	/// As of 11/Feb/2013 this option hasn't been implemented yet.
-	const bool removeDeadModules_;
-	const edm::InputTag simTrackLabel_;
-	const edm::InputTag simVertexLabel_;
-        std::vector<edm::InputTag> collectionTags_;
-	edm::InputTag genParticleLabel_;
-	/// Needed to add HepMC::GenVertex to SimVertex
-	edm::InputTag hepMCproductLabel_;
+  /// As of 11/Feb/2013 this option hasn't been implemented yet.
+  const bool removeDeadModules_;
+  const edm::InputTag simTrackLabel_;
+  const edm::InputTag simVertexLabel_;
+  std::vector<edm::InputTag> collectionTags_;
+  edm::InputTag genParticleLabel_;
+  /// Needed to add HepMC::GenVertex to SimVertex
+  edm::InputTag hepMCproductLabel_;
 
-	bool selectorFlag_;
-	TrackingParticleSelector selector_;
-	/// Uses the same config as selector_, but can be used to drop out early since selector_ requires the TrackingParticle to be created first.
-	bool chargedOnly_;
-	/// Uses the same config as selector_, but can be used to drop out early since selector_ requires the TrackingParticle to be created first.
-	bool signalOnly_;
+  bool selectorFlag_;
+  TrackingParticleSelector selector_;
+  /// Uses the same config as selector_, but can be used to drop out early since
+  /// selector_ requires the TrackingParticle to be created first.
+  bool chargedOnly_;
+  /// Uses the same config as selector_, but can be used to drop out early since
+  /// selector_ requires the TrackingParticle to be created first.
+  bool signalOnly_;
+
+  /** @brief When counting hits, allows hits in different detectors to have a
+   * different process type.
+   *
+   * Fast sim PSimHits seem to have a peculiarity where the process type (as
+   * reported by PSimHit::processType()) is different for the tracker than the
+   * muons. When counting how many hits there are, the code usually only counts
+   * the number of hits that have the same process type as the first hit.
+   * Setting this to true will also count hits that have the same process type
+   * as the first hit in the second detector.<br/>
+   */
+  bool allowDifferentProcessTypeForDifferentDetectors_;
 
-	/** @brief When counting hits, allows hits in different detectors to have a different process type.
-	 *
-	 * Fast sim PSimHits seem to have a peculiarity where the process type (as reported by PSimHit::processType()) is
-	 * different for the tracker than the muons. When counting how many hits there are, the code usually only counts
-	 * the number of hits that have the same process type as the first hit. Setting this to true will also count hits
-	 * that have the same process type as the first hit in the second detector.<br/>
-	 */
-	bool allowDifferentProcessTypeForDifferentDetectors_;
 public:
-	// These always go hand in hand, and I need to pass them around in the internal
-	// functions, so I might as well package them up in a struct.
-	struct OutputCollections
-	{
-		std::unique_ptr<TrackingParticleCollection> pTrackingParticles;
-		std::unique_ptr<TrackingVertexCollection> pTrackingVertices;
-		TrackingParticleRefProd refTrackingParticles;
-		TrackingVertexRefProd refTrackingVertexes;
-	};
+  // These always go hand in hand, and I need to pass them around in the
+  // internal functions, so I might as well package them up in a struct.
+  struct OutputCollections {
+    std::unique_ptr<TrackingParticleCollection> pTrackingParticles;
+    std::unique_ptr<TrackingVertexCollection> pTrackingVertices;
+    TrackingParticleRefProd refTrackingParticles;
+    TrackingVertexRefProd refTrackingVertexes;
+  };
+
 private:
-	OutputCollections unmergedOutput_;
-	OutputCollections mergedOutput_;
-	std::unique_ptr<TrackingVertexCollection> pInitialVertices_;
+  OutputCollections unmergedOutput_;
+  OutputCollections mergedOutput_;
+  std::unique_ptr<TrackingVertexCollection> pInitialVertices_;
 };
 
-#endif // end of "#ifndef TrackingAnalysis_TrackingTruthAccumulator_h"
+#endif  // end of "#ifndef TrackingAnalysis_TrackingTruthAccumulator_h"
diff --git a/SimGeneral/TrackingAnalysis/src/EncodedTruthId.cc b/SimGeneral/TrackingAnalysis/src/EncodedTruthId.cc
index e9de9761c1ada..5edb66e5b1bd6 100644
--- a/SimGeneral/TrackingAnalysis/src/EncodedTruthId.cc
+++ b/SimGeneral/TrackingAnalysis/src/EncodedTruthId.cc
@@ -2,13 +2,8 @@
 
 EncodedTruthId::EncodedTruthId() {}
 
-EncodedTruthId::EncodedTruthId(EncodedEventId eid, int index):
-        EncodedEventId(eid), index_(index) {}
+EncodedTruthId::EncodedTruthId(EncodedEventId eid, int index) : EncodedEventId(eid), index_(index) {}
 
-std::ostream& operator<<(std::ostream & os , EncodedTruthId& id)
-{
-    return os  << "(" << id.bunchCrossing() << ","
-           << id.event()         << ","
-           << id.index()         << ")";
+std::ostream &operator<<(std::ostream &os, EncodedTruthId &id) {
+  return os << "(" << id.bunchCrossing() << "," << id.event() << "," << id.index() << ")";
 }
-
diff --git a/SimGeneral/TrackingAnalysis/src/MuonPSimHitSelector.cc b/SimGeneral/TrackingAnalysis/src/MuonPSimHitSelector.cc
index 41500f8573e18..6cbee4ba88c9a 100644
--- a/SimGeneral/TrackingAnalysis/src/MuonPSimHitSelector.cc
+++ b/SimGeneral/TrackingAnalysis/src/MuonPSimHitSelector.cc
@@ -11,44 +11,41 @@
 
 // #include "SimTracker/Common/interface/SimHitSelectorFromDB.h"
 
-
-void MuonPSimHitSelector::select(PSimHitCollection & selection, edm::Event const & event, edm::EventSetup const & setup) const
-{
-    // Look for psimhit collection associated to the muon system
-    PSimHitCollectionMap::const_iterator pSimHitCollections = pSimHitCollectionMap_.find("muon");
-
-    // Check that there are psimhit collections defined for the tracker
-    if (pSimHitCollections == pSimHitCollectionMap_.end()) return;
-
-    // Grab all the PSimHit from the different sencitive volumes
-    edm::Handle<CrossingFrame<PSimHit> > cfPSimHits;
-    std::vector<const CrossingFrame<PSimHit> *> cfPSimHitProductPointers;
-
-    // Collect the product pointers to the different psimhit collection
-    for (std::size_t i = 0; i < pSimHitCollections->second.size(); ++i)
-    {
-        event.getByLabel("mix", pSimHitCollections->second[i], cfPSimHits);
-        cfPSimHitProductPointers.push_back(cfPSimHits.product());
-    }
-
-    // Create a mix collection from the different psimhit collections
-    std::unique_ptr<MixCollection<PSimHit> > pSimHits(new MixCollection<PSimHit>(cfPSimHitProductPointers));
-
-    // Get CSC Bad Chambers (ME4/2)
-    edm::ESHandle<CSCBadChambers> cscBadChambers;
-    setup.get<CSCBadChambersRcd>().get(cscBadChambers);
-
-    // Select only psimhits from alive modules
-    for (MixCollection<PSimHit>::MixItr pSimHit = pSimHits->begin(); pSimHit != pSimHits->end(); ++pSimHit)
-    {
-        DetId dId = DetId( pSimHit->detUnitId() );
-
-        if (dId.det() == DetId::Muon && dId.subdetId() == MuonSubdetId::CSC)
-        {
-            if ( !cscBadChambers->isInBadChamber(CSCDetId(dId)) )
-                selection.push_back(*pSimHit);
-        }
-        else
-            selection.push_back(*pSimHit);
-    }
+void MuonPSimHitSelector::select(PSimHitCollection &selection,
+                                 edm::Event const &event,
+                                 edm::EventSetup const &setup) const {
+  // Look for psimhit collection associated to the muon system
+  PSimHitCollectionMap::const_iterator pSimHitCollections = pSimHitCollectionMap_.find("muon");
+
+  // Check that there are psimhit collections defined for the tracker
+  if (pSimHitCollections == pSimHitCollectionMap_.end())
+    return;
+
+  // Grab all the PSimHit from the different sencitive volumes
+  edm::Handle<CrossingFrame<PSimHit>> cfPSimHits;
+  std::vector<const CrossingFrame<PSimHit> *> cfPSimHitProductPointers;
+
+  // Collect the product pointers to the different psimhit collection
+  for (std::size_t i = 0; i < pSimHitCollections->second.size(); ++i) {
+    event.getByLabel("mix", pSimHitCollections->second[i], cfPSimHits);
+    cfPSimHitProductPointers.push_back(cfPSimHits.product());
+  }
+
+  // Create a mix collection from the different psimhit collections
+  std::unique_ptr<MixCollection<PSimHit>> pSimHits(new MixCollection<PSimHit>(cfPSimHitProductPointers));
+
+  // Get CSC Bad Chambers (ME4/2)
+  edm::ESHandle<CSCBadChambers> cscBadChambers;
+  setup.get<CSCBadChambersRcd>().get(cscBadChambers);
+
+  // Select only psimhits from alive modules
+  for (MixCollection<PSimHit>::MixItr pSimHit = pSimHits->begin(); pSimHit != pSimHits->end(); ++pSimHit) {
+    DetId dId = DetId(pSimHit->detUnitId());
+
+    if (dId.det() == DetId::Muon && dId.subdetId() == MuonSubdetId::CSC) {
+      if (!cscBadChambers->isInBadChamber(CSCDetId(dId)))
+        selection.push_back(*pSimHit);
+    } else
+      selection.push_back(*pSimHit);
+  }
 }
diff --git a/SimGeneral/TrackingAnalysis/src/PSimHitSelector.cc b/SimGeneral/TrackingAnalysis/src/PSimHitSelector.cc
index e2f303f401a87..347a8ff3ea635 100644
--- a/SimGeneral/TrackingAnalysis/src/PSimHitSelector.cc
+++ b/SimGeneral/TrackingAnalysis/src/PSimHitSelector.cc
@@ -4,53 +4,46 @@
 
 #include "SimGeneral/TrackingAnalysis/interface/PSimHitSelector.h"
 
-PSimHitSelector::PSimHitSelector(edm::ParameterSet const & config)
-{
-    // Initilize psimhit collection discriminated by sub systems
-    edm::ParameterSet pSimHitCollections = config.getParameter<edm::ParameterSet>("simHitCollections");
-
-    std::vector<std::string> subdetectors( pSimHitCollections.getParameterNames() );
-
-    mixLabel_ = config.getParameter<std::string>("mixLabel");
-
-    for (size_t i = 0; i < subdetectors.size(); ++i)
-    {
-        pSimHitCollectionMap_.insert(
-            std::pair<std::string, std::vector<std::string> >(
-                subdetectors[i],
-                pSimHitCollections.getParameter<std::vector<std::string> >(subdetectors[i])
-            )
-        );
-    }
-}
+PSimHitSelector::PSimHitSelector(edm::ParameterSet const &config) {
+  // Initilize psimhit collection discriminated by sub systems
+  edm::ParameterSet pSimHitCollections = config.getParameter<edm::ParameterSet>("simHitCollections");
+
+  std::vector<std::string> subdetectors(pSimHitCollections.getParameterNames());
 
+  mixLabel_ = config.getParameter<std::string>("mixLabel");
+
+  for (size_t i = 0; i < subdetectors.size(); ++i) {
+    pSimHitCollectionMap_.insert(std::pair<std::string, std::vector<std::string>>(
+        subdetectors[i], pSimHitCollections.getParameter<std::vector<std::string>>(subdetectors[i])));
+  }
+}
 
-void PSimHitSelector::select(PSimHitCollection & selection, edm::Event const & event, edm::EventSetup const & setup) const
-{
-    // Look for all psimhit collections
-    PSimHitCollectionMap::const_iterator pSimHitCollections = pSimHitCollectionMap_.begin();
+void PSimHitSelector::select(PSimHitCollection &selection,
+                             edm::Event const &event,
+                             edm::EventSetup const &setup) const {
+  // Look for all psimhit collections
+  PSimHitCollectionMap::const_iterator pSimHitCollections = pSimHitCollectionMap_.begin();
 
-    std::vector<const CrossingFrame<PSimHit> *> cfPSimHitProductPointers;
+  std::vector<const CrossingFrame<PSimHit> *> cfPSimHitProductPointers;
 
-    for (; pSimHitCollections != pSimHitCollectionMap_.end(); ++pSimHitCollections)
-    {
-        // Grab all the PSimHit from the different sencitive volumes
-        edm::Handle<CrossingFrame<PSimHit> > cfPSimHits;
+  for (; pSimHitCollections != pSimHitCollectionMap_.end(); ++pSimHitCollections) {
+    // Grab all the PSimHit from the different sencitive volumes
+    edm::Handle<CrossingFrame<PSimHit>> cfPSimHits;
 
-        // Collect the product pointers to the different psimhit collection
-        for (std::size_t i = 0; i < pSimHitCollections->second.size(); ++i)
-        {
-            event.getByLabel(mixLabel_, pSimHitCollections->second[i], cfPSimHits);
-            cfPSimHitProductPointers.push_back(cfPSimHits.product());
-        }
+    // Collect the product pointers to the different psimhit collection
+    for (std::size_t i = 0; i < pSimHitCollections->second.size(); ++i) {
+      event.getByLabel(mixLabel_, pSimHitCollections->second[i], cfPSimHits);
+      cfPSimHitProductPointers.push_back(cfPSimHits.product());
     }
+  }
 
-    if (cfPSimHitProductPointers.empty()) return;
+  if (cfPSimHitProductPointers.empty())
+    return;
 
-    // Create a mix collection from the different psimhit collections
-    std::unique_ptr<MixCollection<PSimHit> > pSimHits(new MixCollection<PSimHit>(cfPSimHitProductPointers));
+  // Create a mix collection from the different psimhit collections
+  std::unique_ptr<MixCollection<PSimHit>> pSimHits(new MixCollection<PSimHit>(cfPSimHitProductPointers));
 
-    // Select all psimhits
-    for (MixCollection<PSimHit>::MixItr pSimHit = pSimHits->begin(); pSimHit != pSimHits->end(); ++pSimHit)
-        selection.push_back(*pSimHit);
+  // Select all psimhits
+  for (MixCollection<PSimHit>::MixItr pSimHit = pSimHits->begin(); pSimHit != pSimHits->end(); ++pSimHit)
+    selection.push_back(*pSimHit);
 }
diff --git a/SimGeneral/TrackingAnalysis/src/PixelPSimHitSelector.cc b/SimGeneral/TrackingAnalysis/src/PixelPSimHitSelector.cc
index b917dc4ff50bb..dce45bd4eed0f 100644
--- a/SimGeneral/TrackingAnalysis/src/PixelPSimHitSelector.cc
+++ b/SimGeneral/TrackingAnalysis/src/PixelPSimHitSelector.cc
@@ -1,6 +1,6 @@
 
-#include "CondFormats/SiPixelObjects/interface/SiPixelQuality.h"
 #include "CondFormats/DataRecord/interface/SiPixelQualityRcd.h"
+#include "CondFormats/SiPixelObjects/interface/SiPixelQuality.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
 
@@ -9,41 +9,40 @@
 
 #include "SimGeneral/TrackingAnalysis/interface/PixelPSimHitSelector.h"
 
-
-void PixelPSimHitSelector::select(PSimHitCollection & selection, edm::Event const & event, edm::EventSetup const & setup) const
-{
-    // Look for psimhit collection associated o the tracker
-    PSimHitCollectionMap::const_iterator pSimHitCollections = pSimHitCollectionMap_.find("pixel");
-
-    // Check that there are psimhit collections defined for the tracker
-    if (pSimHitCollections == pSimHitCollectionMap_.end()) return;
-
-    // Grab all the PSimHit from the different sencitive volumes
-    edm::Handle<CrossingFrame<PSimHit> > cfPSimHits;
-    std::vector<const CrossingFrame<PSimHit> *> cfPSimHitProductPointers;
-
-    // Collect the product pointers to the different psimhit collection
-    for (std::size_t i = 0; i < pSimHitCollections->second.size(); ++i)
-    {
-        event.getByLabel("mix", pSimHitCollections->second[i], cfPSimHits);
-        cfPSimHitProductPointers.push_back(cfPSimHits.product());
-    }
-
-    // Create a mix collection from the different psimhit collections
-    std::unique_ptr<MixCollection<PSimHit> > pSimHits( new MixCollection<PSimHit>(cfPSimHitProductPointers) );
-
-    // Accessing dead pixel modules from DB:
-    edm::ESHandle<SiPixelQuality> siPixelBadModule;
-    setup.get<SiPixelQualityRcd>().get(siPixelBadModule);
-
-    // Reading the DB information
-    std::vector<SiPixelQuality::disabledModuleType> badModules( siPixelBadModule->getBadComponentList() );
-    SiPixelQuality pixelQuality(badModules);
-
-    // Select only psimhits from alive modules
-    for (MixCollection<PSimHit>::MixItr pSimHit = pSimHits->begin(); pSimHit != pSimHits->end(); ++pSimHit)
-    {
-        if ( !pixelQuality.IsModuleBad(pSimHit->detUnitId()) )
-            selection.push_back(*pSimHit);
-    }
+void PixelPSimHitSelector::select(PSimHitCollection &selection,
+                                  edm::Event const &event,
+                                  edm::EventSetup const &setup) const {
+  // Look for psimhit collection associated o the tracker
+  PSimHitCollectionMap::const_iterator pSimHitCollections = pSimHitCollectionMap_.find("pixel");
+
+  // Check that there are psimhit collections defined for the tracker
+  if (pSimHitCollections == pSimHitCollectionMap_.end())
+    return;
+
+  // Grab all the PSimHit from the different sencitive volumes
+  edm::Handle<CrossingFrame<PSimHit>> cfPSimHits;
+  std::vector<const CrossingFrame<PSimHit> *> cfPSimHitProductPointers;
+
+  // Collect the product pointers to the different psimhit collection
+  for (std::size_t i = 0; i < pSimHitCollections->second.size(); ++i) {
+    event.getByLabel("mix", pSimHitCollections->second[i], cfPSimHits);
+    cfPSimHitProductPointers.push_back(cfPSimHits.product());
+  }
+
+  // Create a mix collection from the different psimhit collections
+  std::unique_ptr<MixCollection<PSimHit>> pSimHits(new MixCollection<PSimHit>(cfPSimHitProductPointers));
+
+  // Accessing dead pixel modules from DB:
+  edm::ESHandle<SiPixelQuality> siPixelBadModule;
+  setup.get<SiPixelQualityRcd>().get(siPixelBadModule);
+
+  // Reading the DB information
+  std::vector<SiPixelQuality::disabledModuleType> badModules(siPixelBadModule->getBadComponentList());
+  SiPixelQuality pixelQuality(badModules);
+
+  // Select only psimhits from alive modules
+  for (MixCollection<PSimHit>::MixItr pSimHit = pSimHits->begin(); pSimHit != pSimHits->end(); ++pSimHit) {
+    if (!pixelQuality.IsModuleBad(pSimHit->detUnitId()))
+      selection.push_back(*pSimHit);
+  }
 }
diff --git a/SimGeneral/TrackingAnalysis/src/TrackerPSimHitSelector.cc b/SimGeneral/TrackingAnalysis/src/TrackerPSimHitSelector.cc
index 4769f62fd00ad..63bf96817053c 100644
--- a/SimGeneral/TrackingAnalysis/src/TrackerPSimHitSelector.cc
+++ b/SimGeneral/TrackingAnalysis/src/TrackerPSimHitSelector.cc
@@ -12,39 +12,39 @@
 
 #include "SimTracker/Common/interface/SimHitSelectorFromDB.h"
 
-
-void TrackerPSimHitSelector::select(PSimHitCollection & selection, edm::Event const & event, edm::EventSetup const & setup) const
-{
-    // Look for psimhit collection associated o the tracker
-    PSimHitCollectionMap::const_iterator pSimHitCollections = pSimHitCollectionMap_.find("tracker");
-
-    // Check that there are psimhit collections defined for the tracker
-    if (pSimHitCollections == pSimHitCollectionMap_.end()) return;
-
-    // Grab all the PSimHit from the different sencitive volumes
-    edm::Handle<CrossingFrame<PSimHit> > cfPSimHits;
-    std::vector<const CrossingFrame<PSimHit> *> cfPSimHitProductPointers;
-
-    // Collect the product pointers to the different psimhit collection
-    for (std::size_t i = 0; i < pSimHitCollections->second.size(); ++i)
-    {
-      event.getByLabel(mixLabel_, pSimHitCollections->second[i], cfPSimHits);
-      cfPSimHitProductPointers.push_back(cfPSimHits.product());
-    }
-
-    // Create a mix collection from the different psimhit collections
-    std::unique_ptr<MixCollection<PSimHit> > pSimHits(new MixCollection<PSimHit>(cfPSimHitProductPointers));
-
-    // Setup the cabling mapping
-    std::map<uint32_t, std::vector<int> > theDetIdList;
-    edm::ESHandle<SiStripDetCabling> detCabling;
-    setup.get<SiStripDetCablingRcd>().get( detCabling );
-    detCabling->addConnected(theDetIdList);
-
-    // Select only psimhits from alive modules
-    std::vector<std::pair<const PSimHit*,int> > psimhits(SimHitSelectorFromDB().getSimHit(pSimHits, theDetIdList));
-
-    // Add the selected psimhit to the main list
-    for (std::size_t i = 0; i < psimhits.size(); ++i)
-        selection.push_back( *(const_cast<PSimHit*>(psimhits[i].first)) );
+void TrackerPSimHitSelector::select(PSimHitCollection &selection,
+                                    edm::Event const &event,
+                                    edm::EventSetup const &setup) const {
+  // Look for psimhit collection associated o the tracker
+  PSimHitCollectionMap::const_iterator pSimHitCollections = pSimHitCollectionMap_.find("tracker");
+
+  // Check that there are psimhit collections defined for the tracker
+  if (pSimHitCollections == pSimHitCollectionMap_.end())
+    return;
+
+  // Grab all the PSimHit from the different sencitive volumes
+  edm::Handle<CrossingFrame<PSimHit>> cfPSimHits;
+  std::vector<const CrossingFrame<PSimHit> *> cfPSimHitProductPointers;
+
+  // Collect the product pointers to the different psimhit collection
+  for (std::size_t i = 0; i < pSimHitCollections->second.size(); ++i) {
+    event.getByLabel(mixLabel_, pSimHitCollections->second[i], cfPSimHits);
+    cfPSimHitProductPointers.push_back(cfPSimHits.product());
+  }
+
+  // Create a mix collection from the different psimhit collections
+  std::unique_ptr<MixCollection<PSimHit>> pSimHits(new MixCollection<PSimHit>(cfPSimHitProductPointers));
+
+  // Setup the cabling mapping
+  std::map<uint32_t, std::vector<int>> theDetIdList;
+  edm::ESHandle<SiStripDetCabling> detCabling;
+  setup.get<SiStripDetCablingRcd>().get(detCabling);
+  detCabling->addConnected(theDetIdList);
+
+  // Select only psimhits from alive modules
+  std::vector<std::pair<const PSimHit *, int>> psimhits(SimHitSelectorFromDB().getSimHit(pSimHits, theDetIdList));
+
+  // Add the selected psimhit to the main list
+  for (std::size_t i = 0; i < psimhits.size(); ++i)
+    selection.push_back(*(const_cast<PSimHit *>(psimhits[i].first)));
 }
diff --git a/SimGeneral/TrackingAnalysis/src/TrackingParticleNumberOfLayers.cc b/SimGeneral/TrackingAnalysis/src/TrackingParticleNumberOfLayers.cc
index a311ad78df66a..07a4470407910 100644
--- a/SimGeneral/TrackingAnalysis/src/TrackingParticleNumberOfLayers.cc
+++ b/SimGeneral/TrackingAnalysis/src/TrackingParticleNumberOfLayers.cc
@@ -3,33 +3,39 @@
 #include "FWCore/Framework/interface/ESHandle.h"
 
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "FWCore/Utilities/interface/isFinite.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
 namespace {
-  bool trackIdHitPairLess(const std::pair<unsigned int, const PSimHit*>& a, const std::pair<unsigned int, const PSimHit*>& b) {
+  bool trackIdHitPairLess(const std::pair<unsigned int, const PSimHit *> &a,
+                          const std::pair<unsigned int, const PSimHit *> &b) {
     return a.first < b.first;
   }
 
-  bool trackIdHitPairLessSort(const std::pair<unsigned int, const PSimHit*>& a, const std::pair<unsigned int, const PSimHit*>& b) {
-    if(a.first == b.first) {
-      const auto atof = edm::isFinite(a.second->timeOfFlight()) ? a.second->timeOfFlight() : std::numeric_limits<decltype(a.second->timeOfFlight())>::max();
-      const auto btof = edm::isFinite(b.second->timeOfFlight()) ? b.second->timeOfFlight() : std::numeric_limits<decltype(b.second->timeOfFlight())>::max();
+  bool trackIdHitPairLessSort(const std::pair<unsigned int, const PSimHit *> &a,
+                              const std::pair<unsigned int, const PSimHit *> &b) {
+    if (a.first == b.first) {
+      const auto atof = edm::isFinite(a.second->timeOfFlight())
+                            ? a.second->timeOfFlight()
+                            : std::numeric_limits<decltype(a.second->timeOfFlight())>::max();
+      const auto btof = edm::isFinite(b.second->timeOfFlight())
+                            ? b.second->timeOfFlight()
+                            : std::numeric_limits<decltype(b.second->timeOfFlight())>::max();
       return atof < btof;
     }
     return a.first < b.first;
   }
-}
-
-TrackingParticleNumberOfLayers::TrackingParticleNumberOfLayers(const edm::Event& iEvent, const std::vector<edm::EDGetTokenT<std::vector<PSimHit> > >& simHitTokens) {
+}  // namespace
 
+TrackingParticleNumberOfLayers::TrackingParticleNumberOfLayers(
+    const edm::Event &iEvent, const std::vector<edm::EDGetTokenT<std::vector<PSimHit>>> &simHitTokens) {
   // A multimap linking SimTrack::trackId() to a pointer to PSimHit
   // Similar to TrackingTruthAccumulator
-  for(const auto& simHitToken: simHitTokens) {
-    edm::Handle<std::vector<PSimHit> > hsimhits;
+  for (const auto &simHitToken : simHitTokens) {
+    edm::Handle<std::vector<PSimHit>> hsimhits;
     iEvent.getByToken(simHitToken, hsimhits);
-    trackIdToHitPtr_.reserve(trackIdToHitPtr_.size()+hsimhits->size());
-    for(const auto& simHit: *hsimhits) {
+    trackIdToHitPtr_.reserve(trackIdToHitPtr_.size() + hsimhits->size());
+    for (const auto &simHit : *hsimhits) {
       trackIdToHitPtr_.emplace_back(simHit.trackId(), &simHit);
     }
   }
@@ -39,23 +45,24 @@ TrackingParticleNumberOfLayers::TrackingParticleNumberOfLayers(const edm::Event&
 std::tuple<std::unique_ptr<edm::ValueMap<unsigned int>>,
            std::unique_ptr<edm::ValueMap<unsigned int>>,
            std::unique_ptr<edm::ValueMap<unsigned int>>>
-TrackingParticleNumberOfLayers::calculate(const edm::Handle<TrackingParticleCollection>& htps, const edm::EventSetup& iSetup) const {
-  //Retrieve tracker topology from geometry
+TrackingParticleNumberOfLayers::calculate(const edm::Handle<TrackingParticleCollection> &htps,
+                                          const edm::EventSetup &iSetup) const {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology& tTopo = *tTopoHandle;
+  const TrackerTopology &tTopo = *tTopoHandle;
 
-  const TrackingParticleCollection& tps = *htps;
+  const TrackingParticleCollection &tps = *htps;
   std::vector<unsigned int> valuesLayers(tps.size(), 0);
   std::vector<unsigned int> valuesPixelLayers(tps.size(), 0);
   std::vector<unsigned int> valuesStripMonoAndStereoLayers(tps.size(), 0);
-  for(size_t iTP=0; iTP<tps.size(); ++iTP) {
-    const TrackingParticle& tp = tps[iTP];
+  for (size_t iTP = 0; iTP < tps.size(); ++iTP) {
+    const TrackingParticle &tp = tps[iTP];
     const auto pdgId = tp.pdgId();
 
     // I would prefer a better way...
-    constexpr unsigned int maxSubdet = static_cast<unsigned>(StripSubdetector::TEC)+1;
-    constexpr unsigned int maxLayer = 0xF+1; // as in HitPattern.h
+    constexpr unsigned int maxSubdet = static_cast<unsigned>(StripSubdetector::TEC) + 1;
+    constexpr unsigned int maxLayer = 0xF + 1;  // as in HitPattern.h
     bool hasHit[maxSubdet][maxLayer];
     bool hasPixel[maxSubdet][maxLayer];
     bool hasMono[maxSubdet][maxLayer];
@@ -65,75 +72,82 @@ TrackingParticleNumberOfLayers::calculate(const edm::Handle<TrackingParticleColl
     memset(hasMono, 0, sizeof(hasMono));
     memset(hasStereo, 0, sizeof(hasStereo));
 
-    for(const SimTrack& simTrack: tp.g4Tracks()) {
+    for (const SimTrack &simTrack : tp.g4Tracks()) {
       // Logic is from TrackingTruthAccumulator
-      auto range = std::equal_range(trackIdToHitPtr_.begin(), trackIdToHitPtr_.end(), std::pair<unsigned int, const PSimHit *>(simTrack.trackId(), nullptr), trackIdHitPairLess);
-      if(range.first == range.second) continue;
+      auto range = std::equal_range(trackIdToHitPtr_.begin(),
+                                    trackIdToHitPtr_.end(),
+                                    std::pair<unsigned int, const PSimHit *>(simTrack.trackId(), nullptr),
+                                    trackIdHitPairLess);
+      if (range.first == range.second)
+        continue;
 
       auto iHitPtr = range.first;
-      for(; iHitPtr != range.second; ++iHitPtr) {
+      for (; iHitPtr != range.second; ++iHitPtr) {
         // prevent simhits with particleType != pdgId from being the "first hit"
-        if(iHitPtr->second->particleType() == pdgId)
+        if (iHitPtr->second->particleType() == pdgId)
           break;
       }
-      if(iHitPtr == range.second) // no simhits with particleType == pdgId
+      if (iHitPtr == range.second)  // no simhits with particleType == pdgId
         continue;
       int processType = iHitPtr->second->processType();
       int particleType = iHitPtr->second->particleType();
 
-      for(; iHitPtr != range.second; ++iHitPtr) {
-        const PSimHit& simHit = *(iHitPtr->second);
-        if(simHit.eventId() != tp.eventId())
+      for (; iHitPtr != range.second; ++iHitPtr) {
+        const PSimHit &simHit = *(iHitPtr->second);
+        if (simHit.eventId() != tp.eventId())
           continue;
-        DetId newDetector = DetId( simHit.detUnitId() );
+        DetId newDetector = DetId(simHit.detUnitId());
 
         // Check for delta and interaction products discards
-        if( processType == simHit.processType() && particleType == simHit.particleType() && pdgId == simHit.particleType() ) {
+        if (processType == simHit.processType() && particleType == simHit.particleType() &&
+            pdgId == simHit.particleType()) {
           // The logic of this piece follows HitPattern
           bool isPixel = false;
           bool isStripStereo = false;
           bool isStripMono = false;
 
-          switch(newDetector.subdetId()) {
-          case PixelSubdetector::PixelBarrel:
-          case PixelSubdetector::PixelEndcap:
-            isPixel = true;
-            break;
-          case StripSubdetector::TIB:
-            isStripMono = tTopo.tibIsRPhi(newDetector);
-            isStripStereo = tTopo.tibIsStereo(newDetector);
-            break;
-          case StripSubdetector::TID:
-            isStripMono = tTopo.tidIsRPhi(newDetector);
-            isStripStereo = tTopo.tidIsStereo(newDetector);
-            break;
-          case StripSubdetector::TOB:
-            isStripMono = tTopo.tobIsRPhi(newDetector);
-            isStripStereo = tTopo.tobIsStereo(newDetector);
-            break;
-          case StripSubdetector::TEC:
-            isStripMono = tTopo.tecIsRPhi(newDetector);
-            isStripStereo = tTopo.tecIsStereo(newDetector);
-            break;
+          switch (newDetector.subdetId()) {
+            case PixelSubdetector::PixelBarrel:
+            case PixelSubdetector::PixelEndcap:
+              isPixel = true;
+              break;
+            case StripSubdetector::TIB:
+              isStripMono = tTopo.tibIsRPhi(newDetector);
+              isStripStereo = tTopo.tibIsStereo(newDetector);
+              break;
+            case StripSubdetector::TID:
+              isStripMono = tTopo.tidIsRPhi(newDetector);
+              isStripStereo = tTopo.tidIsStereo(newDetector);
+              break;
+            case StripSubdetector::TOB:
+              isStripMono = tTopo.tobIsRPhi(newDetector);
+              isStripStereo = tTopo.tobIsStereo(newDetector);
+              break;
+            case StripSubdetector::TEC:
+              isStripMono = tTopo.tecIsRPhi(newDetector);
+              isStripStereo = tTopo.tecIsStereo(newDetector);
+              break;
           }
 
           const auto subdet = newDetector.subdetId();
-          const auto layer = tTopo.layer( newDetector );
+          const auto layer = tTopo.layer(newDetector);
 
           hasHit[subdet][layer] = true;
-          if(isPixel)            hasPixel[subdet][layer]  = isPixel;
-          else if(isStripMono)   hasMono[subdet][layer]   = isStripMono;
-          else if(isStripStereo) hasStereo[subdet][layer] = isStripStereo;
+          if (isPixel)
+            hasPixel[subdet][layer] = isPixel;
+          else if (isStripMono)
+            hasMono[subdet][layer] = isStripMono;
+          else if (isStripStereo)
+            hasStereo[subdet][layer] = isStripStereo;
         }
       }
     }
 
-
     unsigned int nLayers = 0;
     unsigned int nPixelLayers = 0;
     unsigned int nStripMonoAndStereoLayers = 0;
-    for(unsigned int i=0; i<maxSubdet; ++i) {
-      for(unsigned int j=0; j<maxLayer; ++j) {
+    for (unsigned int i = 0; i < maxSubdet; ++i) {
+      for (unsigned int j = 0; j < maxLayer; ++j) {
         nLayers += hasHit[i][j];
         nPixelLayers += hasPixel[i][j];
         nStripMonoAndStereoLayers += (hasMono[i][j] && hasStereo[i][j]);
diff --git a/SimGeneral/TrackingAnalysis/src/classes.h b/SimGeneral/TrackingAnalysis/src/classes.h
index dcccb02ace183..25f38e7c0bbdf 100644
--- a/SimGeneral/TrackingAnalysis/src/classes.h
+++ b/SimGeneral/TrackingAnalysis/src/classes.h
@@ -6,18 +6,17 @@
 
 namespace SimGeneral_TrackingAnalysis {
   struct dictionary {
-    edm::Ptr< TrackingParticle >                  TP;
-    std::vector< edm::Ptr< TrackingParticle > > V_TP;
+    edm::Ptr<TrackingParticle> TP;
+    std::vector<edm::Ptr<TrackingParticle>> V_TP;
     std::pair<TrackingParticleRef, TrackPSimHitRef> dummy13;
-    edm::Wrapper<std::pair<TrackingParticleRef, TrackPSimHitRef> > dummy14;
-    std::vector<std::pair<TrackingParticleRef, TrackPSimHitRef> > dummy07;
-    edm::Wrapper<std::vector<std::pair<TrackingParticleRef, TrackPSimHitRef> > > dummy08;
-    
-    std::pair< edm::Ptr< TTTrack< Ref_Phase2TrackerDigi_ > >, edm::Ptr< TrackingParticle > >                P_TAM_S_TP_PD;
-    std::pair< edm::Ptr< TrackingParticle >, std::vector< edm::Ptr< TTTrack< Ref_Phase2TrackerDigi_ > > > > P_TAM_TP_S_PD;
+    edm::Wrapper<std::pair<TrackingParticleRef, TrackPSimHitRef>> dummy14;
+    std::vector<std::pair<TrackingParticleRef, TrackPSimHitRef>> dummy07;
+    edm::Wrapper<std::vector<std::pair<TrackingParticleRef, TrackPSimHitRef>>> dummy08;
 
-    std::map< edm::Ptr< TTTrack< Ref_Phase2TrackerDigi_ > >, edm::Ptr< TrackingParticle > >                M_TAM_S_TP_PD;
-    std::map< edm::Ptr< TrackingParticle >, std::vector< edm::Ptr< TTTrack< Ref_Phase2TrackerDigi_ > > > > M_TAM_TP_S_PD;
-    
+    std::pair<edm::Ptr<TTTrack<Ref_Phase2TrackerDigi_>>, edm::Ptr<TrackingParticle>> P_TAM_S_TP_PD;
+    std::pair<edm::Ptr<TrackingParticle>, std::vector<edm::Ptr<TTTrack<Ref_Phase2TrackerDigi_>>>> P_TAM_TP_S_PD;
+
+    std::map<edm::Ptr<TTTrack<Ref_Phase2TrackerDigi_>>, edm::Ptr<TrackingParticle>> M_TAM_S_TP_PD;
+    std::map<edm::Ptr<TrackingParticle>, std::vector<edm::Ptr<TTTrack<Ref_Phase2TrackerDigi_>>>> M_TAM_TP_S_PD;
   };
-}
+}  // namespace SimGeneral_TrackingAnalysis
diff --git a/SimGeneral/TrackingAnalysis/test/TrackingTruthOutputTest.cc b/SimGeneral/TrackingAnalysis/test/TrackingTruthOutputTest.cc
index 780a4b49acff4..4f8a8bd741b33 100644
--- a/SimGeneral/TrackingAnalysis/test/TrackingTruthOutputTest.cc
+++ b/SimGeneral/TrackingAnalysis/test/TrackingTruthOutputTest.cc
@@ -1,11 +1,10 @@
-#include "SimGeneral/TrackingAnalysis/test/TrackingTruthOutputTest.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "SimGeneral/TrackingAnalysis/test/TrackingTruthOutputTest.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -16,57 +15,47 @@
 
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 
-typedef edm::RefVector< std::vector<TrackingParticle> > TrackingParticleContainer;
-typedef std::vector<TrackingParticle>                   TrackingParticleCollection;
+typedef edm::RefVector<std::vector<TrackingParticle>> TrackingParticleContainer;
+typedef std::vector<TrackingParticle> TrackingParticleCollection;
 
-typedef TrackingParticleRefVector::iterator               tp_iterator;
-typedef TrackingVertex::genv_iterator                   genv_iterator;
-typedef TrackingVertex::g4v_iterator                     g4v_iterator;
+typedef TrackingParticleRefVector::iterator tp_iterator;
+typedef TrackingVertex::genv_iterator genv_iterator;
+typedef TrackingVertex::g4v_iterator g4v_iterator;
 
-TrackingTruthOutputTest::TrackingTruthOutputTest(const edm::ParameterSet& conf){
-  conf_ = conf;
-}
+TrackingTruthOutputTest::TrackingTruthOutputTest(const edm::ParameterSet &conf) { conf_ = conf; }
 
-void TrackingTruthOutputTest::analyze(const edm::Event& event, const edm::EventSetup& c){
+void TrackingTruthOutputTest::analyze(const edm::Event &event, const edm::EventSetup &c) {
   using namespace std;
 
   edm::Handle<TrackingParticleCollection> mergedPH;
-  edm::Handle<TrackingVertexCollection>   mergedVH;
+  edm::Handle<TrackingVertexCollection> mergedVH;
 
   edm::InputTag trackingTruth = conf_.getUntrackedParameter<edm::InputTag>("trackingTruth");
 
   event.getByLabel(trackingTruth, mergedPH);
   event.getByLabel(trackingTruth, mergedVH);
 
-  if ( conf_.getUntrackedParameter<bool>("dumpVertexes") )
-  {
+  if (conf_.getUntrackedParameter<bool>("dumpVertexes")) {
     std::cout << std::endl << "Dumping merged vertices: " << std::endl;
-    for (TrackingVertexCollection::const_iterator iVertex = mergedVH->begin(); iVertex != mergedVH->end(); ++iVertex) 
-    {
+    for (TrackingVertexCollection::const_iterator iVertex = mergedVH->begin(); iVertex != mergedVH->end(); ++iVertex) {
       std::cout << std::endl << *iVertex;
       std::cout << "Daughters of this vertex:" << std::endl;
-      for (tp_iterator iTrack = iVertex->daughterTracks_begin(); iTrack != iVertex->daughterTracks_end(); ++iTrack) 
+      for (tp_iterator iTrack = iVertex->daughterTracks_begin(); iTrack != iVertex->daughterTracks_end(); ++iTrack)
         std::cout << **iTrack;
     }
     std::cout << std::endl;
   }
 
-  if ( conf_.getUntrackedParameter<bool>("dumpOnlyBremsstrahlung") )
-  {
-     std::cout << std::endl << "Dumping only merged tracks: " << std::endl;
-     for (TrackingParticleCollection::const_iterator iTrack = mergedPH->begin(); iTrack != mergedPH->end(); ++iTrack)
-        if (iTrack->g4Tracks().size() > 1)
-            std::cout << *iTrack << std::endl;
-  }
-  else
-  {
-    std::cout << std::endl << "Dump of merged tracks: " << std::endl;
+  if (conf_.getUntrackedParameter<bool>("dumpOnlyBremsstrahlung")) {
+    std::cout << std::endl << "Dumping only merged tracks: " << std::endl;
     for (TrackingParticleCollection::const_iterator iTrack = mergedPH->begin(); iTrack != mergedPH->end(); ++iTrack)
+      if (iTrack->g4Tracks().size() > 1)
         std::cout << *iTrack << std::endl;
+  } else {
+    std::cout << std::endl << "Dump of merged tracks: " << std::endl;
+    for (TrackingParticleCollection::const_iterator iTrack = mergedPH->begin(); iTrack != mergedPH->end(); ++iTrack)
+      std::cout << *iTrack << std::endl;
   }
 }
 
-
 DEFINE_FWK_MODULE(TrackingTruthOutputTest);
-
-
diff --git a/SimGeneral/TrackingAnalysis/test/TrackingTruthOutputTest.h b/SimGeneral/TrackingAnalysis/test/TrackingTruthOutputTest.h
old mode 100755
new mode 100644
index 40a4243777ce4..136efdf808fda
--- a/SimGeneral/TrackingAnalysis/test/TrackingTruthOutputTest.h
+++ b/SimGeneral/TrackingAnalysis/test/TrackingTruthOutputTest.h
@@ -3,18 +3,16 @@
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class TrackingTruthOutputTest  : public edm::EDAnalyzer {
- public:
+class TrackingTruthOutputTest : public edm::EDAnalyzer {
+public:
+  explicit TrackingTruthOutputTest(const edm::ParameterSet &conf);
 
-  explicit TrackingTruthOutputTest(const edm::ParameterSet& conf);
+  ~TrackingTruthOutputTest() override {}
 
-  ~TrackingTruthOutputTest() override{}
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
-  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
-
- private:
+private:
   edm::ParameterSet conf_;
-
 };
 
 #endif
diff --git a/SimMuon/CSCDigitizer/plugins/CSCChamberMasker.cc b/SimMuon/CSCDigitizer/plugins/CSCChamberMasker.cc
index 6739fe3bf53c3..57ad5d3e84976 100644
--- a/SimMuon/CSCDigitizer/plugins/CSCChamberMasker.cc
+++ b/SimMuon/CSCDigitizer/plugins/CSCChamberMasker.cc
@@ -2,8 +2,9 @@
 //
 // Package:    SimMuon/CSCDigitizer
 // Class:      CSCChamberMasker
-// 
-/**\class CSCChamberMasker CSCChamberMasker.cc SimMuon/CSCDigitizer/plugins/CSCChamberMasker.cc
+//
+/**\class CSCChamberMasker CSCChamberMasker.cc
+ SimMuon/CSCDigitizer/plugins/CSCChamberMasker.cc
 
  Description: Class to mask CSC digis on a chamber by chamber basis
 
@@ -14,19 +15,18 @@
 //
 //
 
-
 // system include files
+#include <algorithm>
+#include <iostream>
 #include <map>
 #include <memory>
 #include <string>
-#include <iostream>
-#include <algorithm>
 
 // user include files
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/Event.h"
@@ -37,77 +37,70 @@
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 #include "Geometry/CSCGeometry/interface/CSCChamber.h"
 #include "Geometry/CSCGeometry/interface/CSCLayer.h"
 
+#include "DataFormats/CSCDigi/interface/CSCALCTDigi.h"
+#include "DataFormats/CSCDigi/interface/CSCALCTDigiCollection.h"
+#include "DataFormats/CSCDigi/interface/CSCCLCTDigi.h"
+#include "DataFormats/CSCDigi/interface/CSCCLCTDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCStripDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCStripDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCWireDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
-#include "DataFormats/CSCDigi/interface/CSCCLCTDigi.h"
-#include "DataFormats/CSCDigi/interface/CSCCLCTDigiCollection.h"
-#include "DataFormats/CSCDigi/interface/CSCALCTDigi.h"
-#include "DataFormats/CSCDigi/interface/CSCALCTDigiCollection.h"
 #include "DataFormats/MuonDetId/interface/CSCDetId.h"
 #include "DataFormats/MuonDetId/interface/CSCIndexer.h"
 
-#include "CondFormats/RecoMuonObjects/interface/MuonSystemAging.h"
 #include "CondFormats/DataRecord/interface/MuonSystemAgingRcd.h"
+#include "CondFormats/RecoMuonObjects/interface/MuonSystemAging.h"
 
+#include "CLHEP/Random/RandomEngine.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
-#include "CLHEP/Random/RandomEngine.h"
-
 
 //
 // class declaration
 //
 
-class CSCChamberMasker : public edm::stream::EDProducer<>
-{
-
+class CSCChamberMasker : public edm::stream::EDProducer<> {
 public:
-  explicit CSCChamberMasker(const edm::ParameterSet&);
+  explicit CSCChamberMasker(const edm::ParameterSet &);
   ~CSCChamberMasker() override;
 
-  static void fillDescriptions(edm::ConfigurationDescriptions&);
+  static void fillDescriptions(edm::ConfigurationDescriptions &);
 
 private:
-  void produce(edm::Event&, const edm::EventSetup&) override;
-      
-  void beginRun(edm::Run const&, edm::EventSetup const&) override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
+
+  void beginRun(edm::Run const &, edm::EventSetup const &) override;
 
-  void createMaskedChamberCollection(edm::ESHandle<CSCGeometry> &); 
+  void createMaskedChamberCollection(edm::ESHandle<CSCGeometry> &);
 
-  template<typename T, typename C = MuonDigiCollection<CSCDetId, T> > 
-  void ageDigis(edm::Event & event,
-		edm::EDGetTokenT<C> & digiToken,
-		CLHEP::HepRandomEngine & randGen, 
-		std::unique_ptr<C> & filteredDigis);
+  template <typename T, typename C = MuonDigiCollection<CSCDetId, T>>
+  void ageDigis(edm::Event &event,
+                edm::EDGetTokenT<C> &digiToken,
+                CLHEP::HepRandomEngine &randGen,
+                std::unique_ptr<C> &filteredDigis);
 
-  template<typename T, typename C = MuonDigiCollection<CSCDetId, T> > 
-  void copyDigis(edm::Event & event,
-		 edm::EDGetTokenT<C> & digiToken,
-		 std::unique_ptr<C> & filteredDigis);
+  template <typename T, typename C = MuonDigiCollection<CSCDetId, T>>
+  void copyDigis(edm::Event &event, edm::EDGetTokenT<C> &digiToken, std::unique_ptr<C> &filteredDigis);
 
   // ----------member data ---------------------------
 
-  edm::EDGetTokenT <CSCStripDigiCollection> m_stripDigiToken;
-  edm::EDGetTokenT <CSCWireDigiCollection>  m_wireDigiToken;
-  edm::EDGetTokenT <CSCCLCTDigiCollection>  m_clctDigiToken;
-  edm::EDGetTokenT <CSCALCTDigiCollection>  m_alctDigiToken;
-  std::map<CSCDetId, std::pair<unsigned int,float> > m_CSCEffs;  
-  
+  edm::EDGetTokenT<CSCStripDigiCollection> m_stripDigiToken;
+  edm::EDGetTokenT<CSCWireDigiCollection> m_wireDigiToken;
+  edm::EDGetTokenT<CSCCLCTDigiCollection> m_clctDigiToken;
+  edm::EDGetTokenT<CSCALCTDigiCollection> m_alctDigiToken;
+  std::map<CSCDetId, std::pair<unsigned int, float>> m_CSCEffs;
 };
 
 //
 // constants, enums and typedefs
 //
 
-
 //
 // static data member definitions
 //
@@ -115,144 +108,110 @@ class CSCChamberMasker : public edm::stream::EDProducer<>
 //
 // constructors and destructor
 //
-CSCChamberMasker::CSCChamberMasker(const edm::ParameterSet& iConfig) 
-    :
-  m_stripDigiToken(consumes<CSCStripDigiCollection>(iConfig.getParameter<edm::InputTag>("stripDigiTag")) )
-  ,m_wireDigiToken(consumes<CSCWireDigiCollection>(iConfig.getParameter<edm::InputTag>("wireDigiTag")) )
-  ,m_clctDigiToken(consumes<CSCCLCTDigiCollection>(iConfig.getParameter<edm::InputTag>("clctDigiTag")) )
-  ,m_alctDigiToken(consumes<CSCALCTDigiCollection>(iConfig.getParameter<edm::InputTag>("alctDigiTag")) )
-{
-
+CSCChamberMasker::CSCChamberMasker(const edm::ParameterSet &iConfig)
+    : m_stripDigiToken(consumes<CSCStripDigiCollection>(iConfig.getParameter<edm::InputTag>("stripDigiTag"))),
+      m_wireDigiToken(consumes<CSCWireDigiCollection>(iConfig.getParameter<edm::InputTag>("wireDigiTag"))),
+      m_clctDigiToken(consumes<CSCCLCTDigiCollection>(iConfig.getParameter<edm::InputTag>("clctDigiTag"))),
+      m_alctDigiToken(consumes<CSCALCTDigiCollection>(iConfig.getParameter<edm::InputTag>("alctDigiTag"))) {
   produces<CSCStripDigiCollection>("MuonCSCStripDigi");
   produces<CSCWireDigiCollection>("MuonCSCWireDigi");
   produces<CSCCLCTDigiCollection>("MuonCSCCLCTDigi");
   produces<CSCALCTDigiCollection>("MuonCSCALCTDigi");
-
-}
-
-
-CSCChamberMasker::~CSCChamberMasker()
-{
- 
 }
 
+CSCChamberMasker::~CSCChamberMasker() {}
 
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-CSCChamberMasker::produce(edm::Event& event, const edm::EventSetup& conditions)
-{
-  
+void CSCChamberMasker::produce(edm::Event &event, const edm::EventSetup &conditions) {
   edm::Service<edm::RandomNumberGenerator> randGenService;
-  CLHEP::HepRandomEngine& randGen = randGenService->getEngine(event.streamID());
- 
+  CLHEP::HepRandomEngine &randGen = randGenService->getEngine(event.streamID());
+
   std::unique_ptr<CSCStripDigiCollection> filteredStripDigis(new CSCStripDigiCollection());
   std::unique_ptr<CSCWireDigiCollection> filteredWireDigis(new CSCWireDigiCollection());
   std::unique_ptr<CSCCLCTDigiCollection> filteredCLCTDigis(new CSCCLCTDigiCollection());
   std::unique_ptr<CSCALCTDigiCollection> filteredALCTDigis(new CSCALCTDigiCollection());
 
   // Handle wire and strip digis
-  ageDigis<CSCStripDigi>(event,m_stripDigiToken,randGen,filteredStripDigis);
-  ageDigis<CSCWireDigi>(event,m_wireDigiToken,randGen,filteredWireDigis);
+  ageDigis<CSCStripDigi>(event, m_stripDigiToken, randGen, filteredStripDigis);
+  ageDigis<CSCWireDigi>(event, m_wireDigiToken, randGen, filteredWireDigis);
 
   // Don't touch CLCT or ALCT digis
-  copyDigis<CSCCLCTDigi>(event,m_clctDigiToken,filteredCLCTDigis);
-  copyDigis<CSCALCTDigi>(event,m_alctDigiToken,filteredALCTDigis);
+  copyDigis<CSCCLCTDigi>(event, m_clctDigiToken, filteredCLCTDigis);
+  copyDigis<CSCALCTDigi>(event, m_alctDigiToken, filteredALCTDigis);
 
   event.put(std::move(filteredStripDigis), "MuonCSCStripDigi");
   event.put(std::move(filteredWireDigis), "MuonCSCWireDigi");
   event.put(std::move(filteredCLCTDigis), "MuonCSCCLCTDigi");
   event.put(std::move(filteredALCTDigis), "MuonCSCALCTDigi");
-
 }
 
 // ------------ method called to copy digis into aged collection  ------------
-template<typename T, typename C> 
-void
-CSCChamberMasker::copyDigis(edm::Event & event,
-			    edm::EDGetTokenT<C> & digiToken,
-			    std::unique_ptr<C> & filteredDigis)
-{
-
-  if (!digiToken.isUninitialized())
-    {
-      edm::Handle<C> digis;
-      event.getByToken(digiToken, digis);
-      for ( const auto & j : (*digis) ) 
-	{
-          auto digiItr = j.second.first;
-          auto last    = j.second.second;
-
-          CSCDetId const cscDetId = j.first;
-
-          for( ; digiItr != last; ++digiItr) 
-	    {
-              filteredDigis->insertDigi(cscDetId,*digiItr);
-	    }
-	}
+template <typename T, typename C>
+void CSCChamberMasker::copyDigis(edm::Event &event, edm::EDGetTokenT<C> &digiToken, std::unique_ptr<C> &filteredDigis) {
+  if (!digiToken.isUninitialized()) {
+    edm::Handle<C> digis;
+    event.getByToken(digiToken, digis);
+    for (const auto &j : (*digis)) {
+      auto digiItr = j.second.first;
+      auto last = j.second.second;
+
+      CSCDetId const cscDetId = j.first;
+
+      for (; digiItr != last; ++digiItr) {
+        filteredDigis->insertDigi(cscDetId, *digiItr);
+      }
     }
-
+  }
 }
 
 // ------------ method aging digis------------
-template<typename T, typename C> 
-void
-CSCChamberMasker::ageDigis(edm::Event & event,
-			   edm::EDGetTokenT<C> & digiToken,
-			   CLHEP::HepRandomEngine & randGen,
-			   std::unique_ptr<C> & filteredDigis)
-{
-    
-  if(!digiToken.isUninitialized())
-    {
-      edm::Handle<C> digis;
-      event.getByToken(digiToken, digis);
-      
-      for ( const auto & j : (*digis) ) 
-	{
-          auto digiItr = j.second.first;
-          auto last    = j.second.second;
-	  
-          CSCDetId const cscDetId = j.first;
-	  
-          // Since lookups are chamber-centric, make new DetId with layer=0
-          CSCDetId chId = CSCDetId(cscDetId.endcap(), cscDetId.station(), cscDetId.ring(), cscDetId.chamber(), 0);
-	  
-          for( ; digiItr != last; ++digiItr) {
-	    
-	    auto chEffIt = m_CSCEffs.find(chId);
-	    
-	    if (chEffIt != m_CSCEffs.end()) 
-	      {
-
-		std::pair<unsigned int, float> typeEff = chEffIt->second;
-		int type = typeEff.first % 10; // second digit gives type of inefficiency
-		int layer = typeEff.first/10; // first digit gives layer (0 = chamber level)
-
-		bool doRandomize = false;
-		if (((std::is_same<T,CSCStripDigi>::value && type == EFF_WIRES)  || 
-		     (std::is_same<T,CSCWireDigi>::value && type  == EFF_STRIPS) || 
-		     type == EFF_CHAMBER) && (layer == 0 || cscDetId.layer() == layer)) doRandomize = true;
-
-                  if (!doRandomize  || (randGen.flat() <= typeEff.second)) {
-                      filteredDigis->insertDigi(cscDetId,*digiItr);
-		  }
-              } 
-
+template <typename T, typename C>
+void CSCChamberMasker::ageDigis(edm::Event &event,
+                                edm::EDGetTokenT<C> &digiToken,
+                                CLHEP::HepRandomEngine &randGen,
+                                std::unique_ptr<C> &filteredDigis) {
+  if (!digiToken.isUninitialized()) {
+    edm::Handle<C> digis;
+    event.getByToken(digiToken, digis);
+
+    for (const auto &j : (*digis)) {
+      auto digiItr = j.second.first;
+      auto last = j.second.second;
+
+      CSCDetId const cscDetId = j.first;
+
+      // Since lookups are chamber-centric, make new DetId with layer=0
+      CSCDetId chId = CSCDetId(cscDetId.endcap(), cscDetId.station(), cscDetId.ring(), cscDetId.chamber(), 0);
+
+      for (; digiItr != last; ++digiItr) {
+        auto chEffIt = m_CSCEffs.find(chId);
+
+        if (chEffIt != m_CSCEffs.end()) {
+          std::pair<unsigned int, float> typeEff = chEffIt->second;
+          int type = typeEff.first % 10;   // second digit gives type of inefficiency
+          int layer = typeEff.first / 10;  // first digit gives layer (0 = chamber level)
+
+          bool doRandomize = false;
+          if (((std::is_same<T, CSCStripDigi>::value && type == EFF_WIRES) ||
+               (std::is_same<T, CSCWireDigi>::value && type == EFF_STRIPS) || type == EFF_CHAMBER) &&
+              (layer == 0 || cscDetId.layer() == layer))
+            doRandomize = true;
+
+          if (!doRandomize || (randGen.flat() <= typeEff.second)) {
+            filteredDigis->insertDigi(cscDetId, *digiItr);
           }
+        }
       }
+    }
   }
 }
 
-
 // ------------ method called when starting to processes a run  ------------
-void
-CSCChamberMasker::beginRun(edm::Run const& run, edm::EventSetup const& iSetup)
-{
-
+void CSCChamberMasker::beginRun(edm::Run const &run, edm::EventSetup const &iSetup) {
   m_CSCEffs.clear();
 
   edm::ESHandle<CSCGeometry> cscGeom;
@@ -263,43 +222,35 @@ CSCChamberMasker::beginRun(edm::Run const& run, edm::EventSetup const& iSetup)
 
   const auto chambers = cscGeom->chambers();
 
-  for ( const auto * ch : chambers)
-  {
-
-      CSCDetId  chId    = ch->id();
-      unsigned int rawId = chId.rawIdMaker(chId.endcap(), chId.station(), chId.ring(), chId.chamber(), 0);
-      float eff = 1.;
-      int type = 0;
-      for ( auto & agingPair : agingObj->m_CSCChambEffs)
-      {
-          if ( agingPair.first != rawId) continue;
-
-          type = agingPair.second.first;
-          eff = agingPair.second.second;
-          m_CSCEffs[chId] = std::make_pair(type, eff);	 
-          break;
-      }
-
+  for (const auto *ch : chambers) {
+    CSCDetId chId = ch->id();
+    unsigned int rawId = chId.rawIdMaker(chId.endcap(), chId.station(), chId.ring(), chId.chamber(), 0);
+    float eff = 1.;
+    int type = 0;
+    for (auto &agingPair : agingObj->m_CSCChambEffs) {
+      if (agingPair.first != rawId)
+        continue;
+
+      type = agingPair.second.first;
+      eff = agingPair.second.second;
+      m_CSCEffs[chId] = std::make_pair(type, eff);
+      break;
+    }
   }
-
 }
 
-  
-// ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
-void
-CSCChamberMasker::fillDescriptions(edm::ConfigurationDescriptions& descriptions) 
-{
-
+// ------------ method fills 'descriptions' with the allowed parameters for the
+// module  ------------
+void CSCChamberMasker::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
   edm::ParameterSetDescription desc;
-  desc.add<edm::InputTag>("stripDigiTag",      edm::InputTag("simMuonCSCDigis:MuonCSCStripDigi"));
-  desc.add<edm::InputTag>("wireDigiTag",       edm::InputTag("simMuonCSCDigis:MuonCSCWireDigi"));
+  desc.add<edm::InputTag>("stripDigiTag", edm::InputTag("simMuonCSCDigis:MuonCSCStripDigi"));
+  desc.add<edm::InputTag>("wireDigiTag", edm::InputTag("simMuonCSCDigis:MuonCSCWireDigi"));
   desc.add<edm::InputTag>("comparatorDigiTag", edm::InputTag("simMuonCSCDigis:MuonCSCComparatorDigi"));
-  desc.add<edm::InputTag>("rpcDigiTag",        edm::InputTag("simMuonCSCDigis:MuonCSCRPCDigi"));
-  desc.add<edm::InputTag>("alctDigiTag",       edm::InputTag("simMuonCSCDigis:MuonCSCALCTDigi"));
-  desc.add<edm::InputTag>("clctDigiTag",       edm::InputTag("simMuonCSCDigis:MuonCSCCLCTDigi"));
-  descriptions.add("cscChamberMasker",desc);
-
+  desc.add<edm::InputTag>("rpcDigiTag", edm::InputTag("simMuonCSCDigis:MuonCSCRPCDigi"));
+  desc.add<edm::InputTag>("alctDigiTag", edm::InputTag("simMuonCSCDigis:MuonCSCALCTDigi"));
+  desc.add<edm::InputTag>("clctDigiTag", edm::InputTag("simMuonCSCDigis:MuonCSCCLCTDigi"));
+  descriptions.add("cscChamberMasker", desc);
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(CSCChamberMasker);
diff --git a/SimMuon/CSCDigitizer/plugins/PreMixingCSCWorker.cc b/SimMuon/CSCDigitizer/plugins/PreMixingCSCWorker.cc
index 6d0e513df5dfe..522ab07dd795b 100644
--- a/SimMuon/CSCDigitizer/plugins/PreMixingCSCWorker.cc
+++ b/SimMuon/CSCDigitizer/plugins/PreMixingCSCWorker.cc
@@ -1,29 +1,29 @@
 #include "SimGeneral/PreMixingModule/interface/PreMixingMuonWorker.h"
 #include "SimGeneral/PreMixingModule/interface/PreMixingWorkerFactory.h"
 
+#include "DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCStripDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
-#include "DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h"
 
 // Specialize put for CSC strip
 template <>
-void PreMixingMuonWorker<CSCStripDigiCollection>::put(edm::Event& iEvent) {
+void PreMixingMuonWorker<CSCStripDigiCollection>::put(edm::Event &iEvent) {
   auto merged = std::make_unique<CSCStripDigiCollection>();
-  for(const auto& elem: *accumulated_) {
+  for (const auto &elem : *accumulated_) {
     // The layerId
-    const CSCDetId& layerId = elem.first;
+    const CSCDetId &layerId = elem.first;
 
     // Get the iterators over the digis associated with this LayerId
-    const CSCStripDigiCollection::Range& range = elem.second;
+    const CSCStripDigiCollection::Range &range = elem.second;
 
     std::vector<CSCStripDigi> NewDigiList;
 
     std::vector<int> StripList;
     std::vector<CSCStripDigiCollection::const_iterator> StripPointer;
 
-    for(CSCStripDigiCollection::const_iterator dtdigi=range.first; dtdigi!=range.second; ++dtdigi){
-      StripList.push_back( (*dtdigi).getStrip() );
-      StripPointer.push_back( dtdigi );
+    for (CSCStripDigiCollection::const_iterator dtdigi = range.first; dtdigi != range.second; ++dtdigi) {
+      StripList.push_back((*dtdigi).getStrip());
+      StripPointer.push_back(dtdigi);
     }
 
     int PrevStrip = -1;
@@ -31,39 +31,38 @@ void PreMixingMuonWorker<CSCStripDigiCollection>::put(edm::Event& iEvent) {
 
     std::vector<CSCStripDigiCollection::const_iterator>::const_iterator StripPtr = StripPointer.begin();
 
-    for( std::vector<int>::const_iterator istrip = StripList.begin(); istrip !=StripList.end(); ++istrip) {
-       
+    for (std::vector<int>::const_iterator istrip = StripList.begin(); istrip != StripList.end(); ++istrip) {
       const int CurrentStrip = *(istrip);
-	
-      if(CurrentStrip > PrevStrip) { 
-        PrevStrip = CurrentStrip; 
+
+      if (CurrentStrip > PrevStrip) {
+        PrevStrip = CurrentStrip;
 
         int dupl_count;
         dupl_count = std::count(StripList.begin(), StripList.end(), CurrentStrip);
-        if(dupl_count > 1) {
-          std::vector<int>::const_iterator  duplicate = istrip;
+        if (dupl_count > 1) {
+          std::vector<int>::const_iterator duplicate = istrip;
           ++duplicate;
           std::vector<CSCStripDigiCollection::const_iterator>::const_iterator DuplPointer = StripPtr;
           ++DuplPointer;
-          for( ; duplicate!=StripList.end(); ++duplicate) {
-            if( (*duplicate) == CurrentStrip ) {
+          for (; duplicate != StripList.end(); ++duplicate) {
+            if ((*duplicate) == CurrentStrip) {
               DuplicateList.push_back(CurrentStrip);
 
               std::vector<int> pileup_adc = (**DuplPointer).getADCCounts();
               std::vector<int> signal_adc = (**StripPtr).getADCCounts();
 
               std::vector<int>::const_iterator minplace;
-		
+
               minplace = std::min_element(pileup_adc.begin(), pileup_adc.end());
 
               int minvalue = (*minplace);
-		
+
               std::vector<int> new_adc;
 
               std::vector<int>::const_iterator newsig = signal_adc.begin();
 
-              for(std::vector<int>::const_iterator ibin = pileup_adc.begin(); ibin!=pileup_adc.end(); ++ibin) {
-                new_adc.push_back((*newsig)+(*ibin)-minvalue);
+              for (std::vector<int>::const_iterator ibin = pileup_adc.begin(); ibin != pileup_adc.end(); ++ibin) {
+                new_adc.push_back((*newsig) + (*ibin) - minvalue);
 
                 ++newsig;
               }
@@ -73,16 +72,19 @@ void PreMixingMuonWorker<CSCStripDigiCollection>::put(edm::Event& iEvent) {
             }
             ++DuplPointer;
           }
+        } else {
+          NewDigiList.push_back(**StripPtr);
         }
-        else { NewDigiList.push_back(**StripPtr); }
-      }  // if strips monotonically increasing...  Haven't hit duplicates yet
-      else { // reached end of signal digis, or there was no overlap
-        PrevStrip = 1000;  // now into pileup signals, stop looking forward for duplicates
+      }                    // if strips monotonically increasing...  Haven't hit duplicates yet
+      else {               // reached end of signal digis, or there was no overlap
+        PrevStrip = 1000;  // now into pileup signals, stop looking forward for
+                           // duplicates
 
         // check if this digi was in the duplicate list
         int check;
         check = std::count(DuplicateList.begin(), DuplicateList.end(), CurrentStrip);
-        if(check == 0) NewDigiList.push_back(**StripPtr);
+        if (check == 0)
+          NewDigiList.push_back(**StripPtr);
       }
       ++StripPtr;
     }
@@ -97,33 +99,37 @@ void PreMixingMuonWorker<CSCStripDigiCollection>::put(edm::Event& iEvent) {
 }
 
 // CSC has three digi collections
-class PreMixingCSCWorker: public PreMixingWorker {
+class PreMixingCSCWorker : public PreMixingWorker {
 public:
-  PreMixingCSCWorker(const edm::ParameterSet& ps, edm::ProducerBase& producer, edm::ConsumesCollector&& iC):
-    stripWorker_(ps.getParameter<edm::ParameterSet>("strip"), producer, iC),
-    wireWorker_(ps.getParameter<edm::ParameterSet>("wire"), producer, iC),
-    comparatorWorker_(ps.getParameter<edm::ParameterSet>("comparator"), producer, iC) {}
+  PreMixingCSCWorker(const edm::ParameterSet &ps, edm::ProducerBase &producer, edm::ConsumesCollector &&iC)
+      : stripWorker_(ps.getParameter<edm::ParameterSet>("strip"), producer, iC),
+        wireWorker_(ps.getParameter<edm::ParameterSet>("wire"), producer, iC),
+        comparatorWorker_(ps.getParameter<edm::ParameterSet>("comparator"), producer, iC) {}
   ~PreMixingCSCWorker() override = default;
 
-  void initializeEvent(edm::Event const& iEvent, edm::EventSetup const& iSetup) override {}
+  void initializeEvent(edm::Event const &iEvent, edm::EventSetup const &iSetup) override {}
 
-  void addSignals(edm::Event const& iEvent, edm::EventSetup const& iSetup) override {
+  void addSignals(edm::Event const &iEvent, edm::EventSetup const &iSetup) override {
     stripWorker_.addSignals(iEvent, iSetup);
     wireWorker_.addSignals(iEvent, iSetup);
     comparatorWorker_.addSignals(iEvent, iSetup);
   }
 
-  void addPileups(PileUpEventPrincipal const& pep, edm::EventSetup const& iSetup) override {
+  void addPileups(PileUpEventPrincipal const &pep, edm::EventSetup const &iSetup) override {
     stripWorker_.addPileups(pep, iSetup);
     wireWorker_.addPileups(pep, iSetup);
     comparatorWorker_.addPileups(pep, iSetup);
   }
 
-  void put(edm::Event& iEvent, edm::EventSetup const& iSetup, std::vector<PileupSummaryInfo> const& ps, int bunchSpacing) override {
+  void put(edm::Event &iEvent,
+           edm::EventSetup const &iSetup,
+           std::vector<PileupSummaryInfo> const &ps,
+           int bunchSpacing) override {
     stripWorker_.put(iEvent);
     wireWorker_.put(iEvent);
     comparatorWorker_.put(iEvent);
   }
+
 private:
   PreMixingMuonWorker<CSCStripDigiCollection> stripWorker_;
   PreMixingMuonWorker<CSCWireDigiCollection> wireWorker_;
diff --git a/SimMuon/CSCDigitizer/plugins/SealModule.cc b/SimMuon/CSCDigitizer/plugins/SealModule.cc
index fe60581c3d547..487cf7626a0f1 100644
--- a/SimMuon/CSCDigitizer/plugins/SealModule.cc
+++ b/SimMuon/CSCDigitizer/plugins/SealModule.cc
@@ -1,10 +1,9 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "SimMuon/CSCDigitizer/src/CSCDigiProducer.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "SimMuon/CSCDigitizer/src/CSCDigiDump.h"
+#include "SimMuon/CSCDigitizer/src/CSCDigiProducer.h"
 #include "SimMuon/CSCDigitizer/src/CSCNeutronWriter.h"
 
-
 DEFINE_FWK_MODULE(CSCDigiProducer);
 DEFINE_FWK_MODULE(CSCDigiDump);
 DEFINE_FWK_MODULE(CSCNeutronWriter);
diff --git a/SimMuon/CSCDigitizer/src/CSCAnalogSignal.cc b/SimMuon/CSCDigitizer/src/CSCAnalogSignal.cc
index 99726fa4ebada..6f09cc490e034 100644
--- a/SimMuon/CSCDigitizer/src/CSCAnalogSignal.cc
+++ b/SimMuon/CSCDigitizer/src/CSCAnalogSignal.cc
@@ -1,26 +1,21 @@
 #include "SimMuon/CSCDigitizer/src/CSCAnalogSignal.h"
-#include <iostream>
 #include <algorithm>
+#include <iostream>
 
 // =================================
 float CSCAnalogSignal::peakTime() const {
   size_t imax = std::max_element(theBinValues.begin(), theBinValues.end()) - theBinValues.begin();
-  return imax/invBinSize + theTimeOffset;
+  return imax / invBinSize + theTimeOffset;
 }
 
-
-std::ostream & operator<<(std::ostream & stream, const CSCAnalogSignal & signal) {
-  stream << "CSCAnalogSignal: Element " << signal.theElement
-         << "   Total " << signal.theTotal << std::endl;
-  for ( int i = 0; i < int( signal.theBinValues.size() ); ++i ) { 
-
+std::ostream &operator<<(std::ostream &stream, const CSCAnalogSignal &signal) {
+  stream << "CSCAnalogSignal: Element " << signal.theElement << "   Total " << signal.theTotal << std::endl;
+  for (int i = 0; i < int(signal.theBinValues.size()); ++i) {
     //@@ ptc 26-Feb-02 Don't both with very small amplitudes
 
-    if ( signal.theBinValues[i] > 1.E-10 ) {
-       stream << i*signal.getBinSize()+signal.getTimeOffset() << 
-       "\t" << signal.theBinValues[i] << std::endl;
+    if (signal.theBinValues[i] > 1.E-10) {
+      stream << i * signal.getBinSize() + signal.getTimeOffset() << "\t" << signal.theBinValues[i] << std::endl;
     }
   }
   return stream;
 }
-
diff --git a/SimMuon/CSCDigitizer/src/CSCAnalogSignal.h b/SimMuon/CSCDigitizer/src/CSCAnalogSignal.h
index 32b9b19f9081e..3fae9055fc9b6 100644
--- a/SimMuon/CSCDigitizer/src/CSCAnalogSignal.h
+++ b/SimMuon/CSCDigitizer/src/CSCAnalogSignal.h
@@ -9,112 +9,106 @@
  *
  * Last mod: <BR>
  * 30-Jun-00 ptc Add further traps in getBinValue() and setBinValue(). <BR>
- * 06-Jul-00 ptc In fact the getBinValue trap was an important bug-fix: 
- * it trapped on > size() of stl std::vector but should have trapped >= size(). 
+ * 06-Jul-00 ptc In fact the getBinValue trap was an important bug-fix:
+ * it trapped on > size() of stl std::vector but should have trapped >= size().
  * It occasionally does reach size(). <BR>
  * <p>
- * Mods (performace improvements) by Vin  31/07/2000<br> 
+ * Mods (performace improvements) by Vin  31/07/2000<br>
  *   Critical methods (getBinValue, get Value +=) inlined<br>
- *   bin-size stored and used as his inverse 
- *   (encapulation helped in not changing interface, named changed to use compiler
- *   to catch its occurrencies)<br>
- *   swap input std::vector (be careful if const..)<br>
- *   do proper interpolation (not just /2)<br>
- *  
+ *   bin-size stored and used as his inverse
+ *   (encapulation helped in not changing interface, named changed to use
+ * compiler to catch its occurrencies)<br> swap input std::vector (be careful if
+ * const..)<br> do proper interpolation (not just /2)<br>
+ *
  */
 
-#include <vector>
-#include <iosfwd>
 #include <cassert>
+#include <iosfwd>
+#include <vector>
 
-//TODO remove
+// TODO remove
 #include <iostream>
 
-class CSCAnalogSignal
-{
+class CSCAnalogSignal {
 public:
+  inline CSCAnalogSignal() : theElement(0), invBinSize(0.), theBinValues(0), theTotal(0), theTimeOffset(0.) {}
 
-  inline CSCAnalogSignal() : theElement(0), invBinSize(0.), theBinValues(0), 
-                               theTotal(0), theTimeOffset(0.) 
-  {}
-  
-  inline CSCAnalogSignal(int element, float binSize, std::vector<float> & binValues, float total=0., float timeOffset=0.)  :
-    theElement(element), invBinSize(1./binSize), 
-    theBinValues(), theTotal(total), theTimeOffset(timeOffset) {
+  inline CSCAnalogSignal(
+      int element, float binSize, std::vector<float> &binValues, float total = 0., float timeOffset = 0.)
+      : theElement(element), invBinSize(1. / binSize), theBinValues(), theTotal(total), theTimeOffset(timeOffset) {
     theBinValues.swap(binValues);
   }
 
-  /// constructor from time and amp shape 
-//  CSCAnalogSignal(int element, const CSCAnalogSignal& shape, float time, float total);
-
+  /// constructor from time and amp shape
+  //  CSCAnalogSignal(int element, const CSCAnalogSignal& shape, float time,
+  //  float total);
 
-  inline int getElement() const {return theElement;};
-  inline void setElement(int element)  {theElement = element;};
-  inline float  getBinValue(int i) const {
-    return (i >= static_cast<int>(theBinValues.size()) || i < 0 ) ? 0. : theBinValues[i];
+  inline int getElement() const { return theElement; };
+  inline void setElement(int element) { theElement = element; };
+  inline float getBinValue(int i) const {
+    return (i >= static_cast<int>(theBinValues.size()) || i < 0) ? 0. : theBinValues[i];
   }
 
-
   inline float getValue(float t) const {
-  // interpolate between bins, if necessary
+    // interpolate between bins, if necessary
     float retval = 0.;
-    float f = (t-theTimeOffset)*invBinSize + 0.000000001;
-    if(f>=0.) {
+    float f = (t - theTimeOffset) * invBinSize + 0.000000001;
+    if (f >= 0.) {
       int i = static_cast<int>(f);
       f -= static_cast<float>(i);
-      retval = (1.-f)*getBinValue(i) + f*getBinValue(i + 1);
+      retval = (1. - f) * getBinValue(i) + f * getBinValue(i + 1);
     }
     return retval;
   }
 
-//  inline void  setBinValue(int i, float value) {
-//    if( i >= 0 && i < theBinValues.size() )
-//      theBinValues[i] = value;
-//  } 
- 
-  inline int   getSize()    const {return theBinValues.size();};
-  inline float getBinSize() const {return 1./invBinSize;};
-  inline float getTotal()   const {return theTotal;};
-  inline float getTimeOffset() const {return theTimeOffset;};
-  inline void  setTimeOffset(float offset) {theTimeOffset = offset;};
-
-  inline void superimpose(const CSCAnalogSignal & signal2) {
+  //  inline void  setBinValue(int i, float value) {
+  //    if( i >= 0 && i < theBinValues.size() )
+  //      theBinValues[i] = value;
+  //  }
+
+  inline int getSize() const { return theBinValues.size(); };
+  inline float getBinSize() const { return 1. / invBinSize; };
+  inline float getTotal() const { return theTotal; };
+  inline float getTimeOffset() const { return theTimeOffset; };
+  inline void setTimeOffset(float offset) { theTimeOffset = offset; };
+
+  inline void superimpose(const CSCAnalogSignal &signal2) {
     size_t n = theBinValues.size();
-    for(size_t i = 0; i < n; ++i) {
-       float t = i/invBinSize + theTimeOffset;
-       theBinValues[i]+=signal2.getValue(t);
+    for (size_t i = 0; i < n; ++i) {
+      float t = i / invBinSize + theTimeOffset;
+      theBinValues[i] += signal2.getValue(t);
     }
-    theTotal += signal2.theTotal; 
+    theTotal += signal2.theTotal;
   }
 
   inline void operator+=(float offset) {
-    for(int i = 0; i < getSize(); ++i) {
+    for (int i = 0; i < getSize(); ++i) {
       theBinValues[i] += offset;
     }
   }
 
   inline void operator*=(float scaleFactor) {
-    for(int i = 0; i < getSize(); ++i) {
+    for (int i = 0; i < getSize(); ++i) {
       theBinValues[i] *= scaleFactor;
-     }
+    }
     theTotal *= scaleFactor;
   }
 
-  friend std::ostream & operator<<(std::ostream &, const CSCAnalogSignal &);
+  friend std::ostream &operator<<(std::ostream &, const CSCAnalogSignal &);
 
-  float & operator[](int i) {
-    assert(i>=0 && i < getSize());
+  float &operator[](int i) {
+    assert(i >= 0 && i < getSize());
     return theBinValues[i];
   }
 
-  const float & operator[](int i) const {
-    assert(i>=0 && i < getSize());
+  const float &operator[](int i) const {
+    assert(i >= 0 && i < getSize());
     return theBinValues[i];
   }
 
   /// the time when the signal peaks
   float peakTime() const;
-  unsigned size() const {return theBinValues.size();}
+  unsigned size() const { return theBinValues.size(); }
 
 private:
   int theElement;
@@ -125,4 +119,3 @@ class CSCAnalogSignal
 };
 
 #endif
-
diff --git a/SimMuon/CSCDigitizer/src/CSCBaseElectronicsSim.cc b/SimMuon/CSCDigitizer/src/CSCBaseElectronicsSim.cc
index d8f37d2bbc593..99a108a56840b 100644
--- a/SimMuon/CSCDigitizer/src/CSCBaseElectronicsSim.cc
+++ b/SimMuon/CSCDigitizer/src/CSCBaseElectronicsSim.cc
@@ -1,52 +1,45 @@
 // This is CSCBaseElectronicsSim.cc
 
+#include "CLHEP/Units/GlobalPhysicalConstants.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "SimMuon/CSCDigitizer/src/CSCBaseElectronicsSim.h"
-#include "SimMuon/CSCDigitizer/src/CSCDetectorHit.h"
 #include "Geometry/CSCGeometry/interface/CSCLayer.h"
-#include "CLHEP/Units/GlobalPhysicalConstants.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
+#include "SimMuon/CSCDigitizer/src/CSCBaseElectronicsSim.h"
+#include "SimMuon/CSCDigitizer/src/CSCDetectorHit.h"
 
 #include "CLHEP/Random/RandGaussQ.h"
 
-#include<list>
-#include<algorithm>
-
-CSCBaseElectronicsSim::CSCBaseElectronicsSim(const edm::ParameterSet & p)
-: 
-  theSpecs(nullptr),
-  theLayerGeometry(nullptr),
-  theLayer(nullptr),
-  theSignalMap(),
-  theAmpResponse(),
-  theBunchSpacing(25.),
-  theNoiseWasAdded(false),
-  nElements(0),
-  theShapingTime(p.getParameter<int>("shapingTime")),
-  thePeakTimeSigma(p.getParameter<double>("peakTimeSigma")),
-  theBunchTimingOffsets(p.getParameter<std::vector<double> >("bunchTimingOffsets")),
-  theSignalStartTime(p.getParameter<double>("signalStartTime")),
-  theSignalStopTime(p.getParameter<double>("signalStopTime")),
-  theSamplingTime(p.getParameter<double>("samplingTime")),
-  theNumberOfSamples(static_cast<int>((theSignalStopTime-theSignalStartTime)/theSamplingTime)),
-  theOffsetOfBxZero(p.getParameter<int>("timeBitForBxZero")),
-  theSignalPropagationSpeed(p.getParameter<std::vector<double> >("signalSpeed")),
-  theTimingCalibrationError(p.getParameter<std::vector<double> >("timingCalibrationError")),
-  doNoise_(p.getParameter<bool>("doNoise"))
-{
+#include <algorithm>
+#include <list>
+
+CSCBaseElectronicsSim::CSCBaseElectronicsSim(const edm::ParameterSet &p)
+    : theSpecs(nullptr),
+      theLayerGeometry(nullptr),
+      theLayer(nullptr),
+      theSignalMap(),
+      theAmpResponse(),
+      theBunchSpacing(25.),
+      theNoiseWasAdded(false),
+      nElements(0),
+      theShapingTime(p.getParameter<int>("shapingTime")),
+      thePeakTimeSigma(p.getParameter<double>("peakTimeSigma")),
+      theBunchTimingOffsets(p.getParameter<std::vector<double>>("bunchTimingOffsets")),
+      theSignalStartTime(p.getParameter<double>("signalStartTime")),
+      theSignalStopTime(p.getParameter<double>("signalStopTime")),
+      theSamplingTime(p.getParameter<double>("samplingTime")),
+      theNumberOfSamples(static_cast<int>((theSignalStopTime - theSignalStartTime) / theSamplingTime)),
+      theOffsetOfBxZero(p.getParameter<int>("timeBitForBxZero")),
+      theSignalPropagationSpeed(p.getParameter<std::vector<double>>("signalSpeed")),
+      theTimingCalibrationError(p.getParameter<std::vector<double>>("timingCalibrationError")),
+      doNoise_(p.getParameter<bool>("doNoise")) {
   assert(theBunchTimingOffsets.size() == 11);
 }
 
+CSCBaseElectronicsSim::~CSCBaseElectronicsSim() {}
 
-CSCBaseElectronicsSim::~CSCBaseElectronicsSim()
-{
-}
-
-
-void CSCBaseElectronicsSim::simulate(const CSCLayer * layer,
-                                     const std::vector<CSCDetectorHit> & detectorHits,
-                                     CLHEP::HepRandomEngine* engine)
-{
+void CSCBaseElectronicsSim::simulate(const CSCLayer *layer,
+                                     const std::vector<CSCDetectorHit> &detectorHits,
+                                     CLHEP::HepRandomEngine *engine) {
   theNoiseWasAdded = false;
 
   {
@@ -56,29 +49,28 @@ void CSCBaseElectronicsSim::simulate(const CSCLayer * layer,
     // can we swap for efficiency?
     theDigiSimLinks = DigiSimLinks(layerId().rawId());
   }
-  
+
   {
     size_t nHits = detectorHits.size();
-      // turn each detector hit into an analog signal
-    for( size_t i = 0; i < nHits; ++i) {
-      int element = readoutElement( detectorHits[i].getElement() );
+    // turn each detector hit into an analog signal
+    for (size_t i = 0; i < nHits; ++i) {
+      int element = readoutElement(detectorHits[i].getElement());
 
       // skip if  hit element is not part of a readout element
       // e.g. wire in non-readout group
-      if ( element != 0 ) add( amplifySignal(detectorHits[i]), engine );
+      if (element != 0)
+        add(amplifySignal(detectorHits[i]), engine);
     }
   }
-  
+
   {
-    if(doNoise_) {
+    if (doNoise_) {
       addNoise(engine);
     }
   }
-} 
-
+}
 
-void CSCBaseElectronicsSim::setLayer(const CSCLayer * layer) 
-{
+void CSCBaseElectronicsSim::setLayer(const CSCLayer *layer) {
   // fill the specs member data
   theSpecs = layer->chamber()->specs();
   theLayerGeometry = layer->geometry();
@@ -88,31 +80,25 @@ void CSCBaseElectronicsSim::setLayer(const CSCLayer * layer)
   initParameters();
 }
 
-
 void CSCBaseElectronicsSim::fillAmpResponse() {
   std::vector<float> ampBinValues(theNumberOfSamples);
   int i = 0;
-  for( ; i < theNumberOfSamples; ++i) {
-    ampBinValues[i] = calculateAmpResponse(i*theSamplingTime);
+  for (; i < theNumberOfSamples; ++i) {
+    ampBinValues[i] = calculateAmpResponse(i * theSamplingTime);
     // truncate any entries that are trivially small
-    if(i>5 && ampBinValues[i] < 0.000001) break;
+    if (i > 5 && ampBinValues[i] < 0.000001)
+      break;
   }
   ampBinValues.resize(i);
   theAmpResponse = CSCAnalogSignal(0, theSamplingTime, ampBinValues, 1., 0.);
 
-  LogTrace("CSCBaseElectronicsSim") << 
-    "CSCBaseElectronicsSim: dump of theAmpResponse follows...\n"
-	 << theAmpResponse;
+  LogTrace("CSCBaseElectronicsSim") << "CSCBaseElectronicsSim: dump of theAmpResponse follows...\n" << theAmpResponse;
 }
 
-
-
-CSCAnalogSignal
-CSCBaseElectronicsSim::amplifySignal(const CSCDetectorHit & detectorHit)  {
+CSCAnalogSignal CSCBaseElectronicsSim::amplifySignal(const CSCDetectorHit &detectorHit) {
   int element = readoutElement(detectorHit.getElement());
 
-  float readoutTime = detectorHit.getTime() 
-                    + signalDelay(element, detectorHit.getPosition());
+  float readoutTime = detectorHit.getTime() + signalDelay(element, detectorHit.getPosition());
 
   // start from the amp response, and modify it.
   CSCAnalogSignal thisSignal(theAmpResponse);
@@ -120,21 +106,18 @@ CSCBaseElectronicsSim::amplifySignal(const CSCDetectorHit & detectorHit)  {
   thisSignal.setTimeOffset(readoutTime);
   thisSignal.setElement(element);
   // keep track of links between digis and hits
-  theDetectorHitMap.insert( DetectorHitMap::value_type(channelIndex(element), detectorHit) );
+  theDetectorHitMap.insert(DetectorHitMap::value_type(channelIndex(element), detectorHit));
   return thisSignal;
-} 
-
+}
 
-CSCAnalogSignal CSCBaseElectronicsSim::makeNoiseSignal(int element, CLHEP::HepRandomEngine*) {
+CSCAnalogSignal CSCBaseElectronicsSim::makeNoiseSignal(int element, CLHEP::HepRandomEngine *) {
   std::vector<float> binValues(theNumberOfSamples);
   // default is empty
   return CSCAnalogSignal(element, theSamplingTime, binValues, 0., theSignalStartTime);
-} 
-
+}
 
-void CSCBaseElectronicsSim::addNoise(CLHEP::HepRandomEngine* engine) {
-  for(CSCSignalMap::iterator mapI = theSignalMap.begin(); 
-      mapI!=  theSignalMap.end(); ++mapI) {
+void CSCBaseElectronicsSim::addNoise(CLHEP::HepRandomEngine *engine) {
+  for (CSCSignalMap::iterator mapI = theSignalMap.begin(); mapI != theSignalMap.end(); ++mapI) {
     // superimpose electronics noise
     (*mapI).second.superimpose(makeNoiseSignal((*mapI).first, engine));
     // DON'T do amp gain variations.  Handled in strips by calibration code
@@ -145,35 +128,32 @@ void CSCBaseElectronicsSim::addNoise(CLHEP::HepRandomEngine* engine) {
   theNoiseWasAdded = true;
 }
 
-
-CSCAnalogSignal & CSCBaseElectronicsSim::find(int element, CLHEP::HepRandomEngine* engine) {
-  if(element <= 0 || element > nElements) {
-    LogTrace("CSCBaseElectronicsSim") << "CSCBaseElectronicsSim: bad element = " << element << 
-         ". There are " << nElements  << " elements.";
+CSCAnalogSignal &CSCBaseElectronicsSim::find(int element, CLHEP::HepRandomEngine *engine) {
+  if (element <= 0 || element > nElements) {
+    LogTrace("CSCBaseElectronicsSim") << "CSCBaseElectronicsSim: bad element = " << element << ". There are "
+                                      << nElements << " elements.";
     edm::LogError("Error in CSCBaseElectronicsSim:  element out of bounds");
   }
   CSCSignalMap::iterator signalMapItr = theSignalMap.find(element);
-  if(signalMapItr == theSignalMap.end()) {
+  if (signalMapItr == theSignalMap.end()) {
     CSCAnalogSignal newSignal;
-    if(theNoiseWasAdded) {
+    if (theNoiseWasAdded) {
       newSignal = makeNoiseSignal(element, engine);
     } else {
       std::vector<float> emptyV(theNumberOfSamples);
       newSignal = CSCAnalogSignal(element, theSamplingTime, emptyV, 0., theSignalStartTime);
     }
-    signalMapItr = theSignalMap.insert( std::pair<int, CSCAnalogSignal>(element, newSignal) ).first;
+    signalMapItr = theSignalMap.insert(std::pair<int, CSCAnalogSignal>(element, newSignal)).first;
   }
   return (*signalMapItr).second;
 }
 
-
-CSCAnalogSignal & CSCBaseElectronicsSim::add(const CSCAnalogSignal & signal, CLHEP::HepRandomEngine* engine) {
+CSCAnalogSignal &CSCBaseElectronicsSim::add(const CSCAnalogSignal &signal, CLHEP::HepRandomEngine *engine) {
   int element = signal.getElement();
-  CSCAnalogSignal & newSignal = find(element, engine);
+  CSCAnalogSignal &newSignal = find(element, engine);
   newSignal.superimpose(signal);
   return newSignal;
 }
- 
 
 float CSCBaseElectronicsSim::signalDelay(int element, float pos) const {
   // readout is on top edge of chamber for strips, right edge
@@ -184,24 +164,22 @@ float CSCBaseElectronicsSim::signalDelay(int element, float pos) const {
   return distance / speed;
 }
 
-
 void CSCBaseElectronicsSim::addLinks(int channelIndex) {
-  std::pair<DetectorHitMap::iterator, DetectorHitMap::iterator> channelHitItr 
-    = theDetectorHitMap.equal_range(channelIndex);
+  std::pair<DetectorHitMap::iterator, DetectorHitMap::iterator> channelHitItr =
+      theDetectorHitMap.equal_range(channelIndex);
 
   // find the fraction contribution for each SimTrack
-  std::map<int,float> simTrackChargeMap;
+  std::map<int, float> simTrackChargeMap;
   std::map<int, EncodedEventId> eventIdMap;
   float totalCharge = 0;
-  for( DetectorHitMap::iterator hitItr = channelHitItr.first; 
-                                hitItr != channelHitItr.second; ++hitItr){
-    const PSimHit * hit = hitItr->second.getSimHit();
+  for (DetectorHitMap::iterator hitItr = channelHitItr.first; hitItr != channelHitItr.second; ++hitItr) {
+    const PSimHit *hit = hitItr->second.getSimHit();
     // might be zero for unit tests and such
-    if(hit != nullptr) {
+    if (hit != nullptr) {
       int simTrackId = hitItr->second.getSimHit()->trackId();
       float charge = hitItr->second.getCharge();
-      std::map<int,float>::iterator chargeItr = simTrackChargeMap.find(simTrackId);
-      if( chargeItr == simTrackChargeMap.end() ) {
+      std::map<int, float>::iterator chargeItr = simTrackChargeMap.find(simTrackId);
+      if (chargeItr == simTrackChargeMap.end()) {
         simTrackChargeMap[simTrackId] = charge;
         eventIdMap[simTrackId] = hit->eventId();
       } else {
@@ -211,14 +189,10 @@ void CSCBaseElectronicsSim::addLinks(int channelIndex) {
     }
   }
 
-  for(std::map<int,float>::iterator chargeItr = simTrackChargeMap.begin(); 
-                          chargeItr != simTrackChargeMap.end(); ++chargeItr) {
+  for (std::map<int, float>::iterator chargeItr = simTrackChargeMap.begin(); chargeItr != simTrackChargeMap.end();
+       ++chargeItr) {
     int simTrackId = chargeItr->first;
-    theDigiSimLinks.push_back( StripDigiSimLink(channelIndex, simTrackId,  
-                                  eventIdMap[simTrackId], chargeItr->second/totalCharge ) );
-    
+    theDigiSimLinks.push_back(
+        StripDigiSimLink(channelIndex, simTrackId, eventIdMap[simTrackId], chargeItr->second / totalCharge));
   }
 }
-
-
-
diff --git a/SimMuon/CSCDigitizer/src/CSCBaseElectronicsSim.h b/SimMuon/CSCDigitizer/src/CSCBaseElectronicsSim.h
index 7ed37f80782e2..900f0d0bb34b5 100644
--- a/SimMuon/CSCDigitizer/src/CSCBaseElectronicsSim.h
+++ b/SimMuon/CSCDigitizer/src/CSCBaseElectronicsSim.h
@@ -13,10 +13,10 @@
  *
  */
 
-#include "SimMuon/CSCDigitizer/src/CSCAnalogSignal.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include <vector>
+#include "SimMuon/CSCDigitizer/src/CSCAnalogSignal.h"
 #include <map>
+#include <vector>
 
 #include "DataFormats/Common/interface/DetSet.h"
 #include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h"
@@ -34,31 +34,27 @@ namespace CLHEP {
   class HepRandomEngine;
 }
 
-class CSCBaseElectronicsSim
-{
+class CSCBaseElectronicsSim {
 public:
-
-  typedef std::map<int, CSCAnalogSignal, std::less<int> > CSCSignalMap;
+  typedef std::map<int, CSCAnalogSignal, std::less<int>> CSCSignalMap;
   typedef edm::DetSet<StripDigiSimLink> DigiSimLinks;
- 
+
   // takes the input detector hits, turns them into DIGIs, and
   // stores them in the layer
-  void simulate(const CSCLayer * layer,
-                const std::vector<CSCDetectorHit> & inputHits,
-                CLHEP::HepRandomEngine*);
+  void simulate(const CSCLayer *layer, const std::vector<CSCDetectorHit> &inputHits, CLHEP::HepRandomEngine *);
+
+  const DigiSimLinks &digiSimLinks() const { return theDigiSimLinks; }
 
-  const DigiSimLinks & digiSimLinks() const {return theDigiSimLinks;}
- 
   virtual ~CSCBaseElectronicsSim();
 
   /// for standalone apps who don't calculate it from the geometry
-  void setLayerId(const CSCDetId & id) {theLayerId = id;}
+  void setLayerId(const CSCDetId &id) { theLayerId = id; }
 
 protected:
   // constructor protected, so this class must be a base class
-  CSCBaseElectronicsSim(const edm::ParameterSet & p);
+  CSCBaseElectronicsSim(const edm::ParameterSet &p);
 
-  void setLayer(const CSCLayer * layer);
+  void setLayer(const CSCLayer *layer);
   // initialize things that change from layer to layer
   virtual void initParameters() = 0;
 
@@ -69,7 +65,7 @@ class CSCBaseElectronicsSim
   CSCAnalogSignal amplifySignal(const CSCDetectorHit &);
 
   // returns readout element.  So wire 20 might be part of wire group 2.
-  virtual int readoutElement(int element) const = 0; 
+  virtual int readoutElement(int element) const = 0;
 
   //  fills the member map of signals on strips, superimposing any duplicates
   void combineAnalogSignals(const std::vector<CSCAnalogSignal> &);
@@ -83,14 +79,14 @@ class CSCBaseElectronicsSim
     theSignalStopTime = stopTime;
   }
 
-  void addNoise(CLHEP::HepRandomEngine*);
+  void addNoise(CLHEP::HepRandomEngine *);
 
-  CSCAnalogSignal & find(int element, CLHEP::HepRandomEngine*);
+  CSCAnalogSignal &find(int element, CLHEP::HepRandomEngine *);
   // the returned signal will be the one stored in the
   // signal, not the original.  If another signal
   // is found on this element, they will be superimposed.
-  CSCAnalogSignal & add(const CSCAnalogSignal &, CLHEP::HepRandomEngine*);
-  virtual CSCAnalogSignal makeNoiseSignal(int element, CLHEP::HepRandomEngine*);
+  CSCAnalogSignal &add(const CSCAnalogSignal &, CLHEP::HepRandomEngine *);
+  virtual CSCAnalogSignal makeNoiseSignal(int element, CLHEP::HepRandomEngine *);
 
   /// how long, in ns, it takes a signal at pos to propagate to
   /// the readout edge.  This may be negative, since the timing
@@ -102,20 +98,21 @@ class CSCBaseElectronicsSim
   virtual void addLinks(int channelIndex);
 
   /// lets users map channels to different indices for links
-  virtual int channelIndex(int channel) const {return channel;}
+  virtual int channelIndex(int channel) const { return channel; }
 
   /// the CSCDetId corresponding to the current layer
-  CSCDetId layerId() const {return theLayerId;}
+  CSCDetId layerId() const { return theLayerId; }
 
-  /// the average time-of-flight from the interaction point to the given detector
-  double averageTimeOfFlight(const DetId & detId) const;
+  /// the average time-of-flight from the interaction point to the given
+  /// detector
+  double averageTimeOfFlight(const DetId &detId) const;
 
   // member data
-  enum {NONE, CONSERVATIVE, RADICAL}; 
+  enum { NONE, CONSERVATIVE, RADICAL };
 
-  const CSCChamberSpecs * theSpecs;
-  const CSCLayerGeometry * theLayerGeometry;
-  const CSCLayer * theLayer;  // the one currently being digitized
+  const CSCChamberSpecs *theSpecs;
+  const CSCLayerGeometry *theLayerGeometry;
+  const CSCLayer *theLayer;  // the one currently being digitized
   CSCDetId theLayerId;
 
   CSCSignalMap theSignalMap;
@@ -135,7 +132,7 @@ class CSCBaseElectronicsSim
   // amplifier parameters
   int theShapingTime;
   float thePeakTimeSigma;
-  // used to correct the bunch timing so that the signal event 
+  // used to correct the bunch timing so that the signal event
   // comes at BX zero.
   std::vector<double> theBunchTimingOffsets;
 
@@ -150,15 +147,15 @@ class CSCBaseElectronicsSim
   int theNumberOfSamples;
 
   // Which bit in the 16-bit time word corresponds to the zeroth beam crossing?
-  int theOffsetOfBxZero; // bit corresponding to bx 0 (counting from 0-15)
-  /// Speed (cm/ns) that it takes for the signal to get from the element to the readout.
-  /// Actually negative in strips, due to reflection effects.
+  int theOffsetOfBxZero;  // bit corresponding to bx 0 (counting from 0-15)
+  /// Speed (cm/ns) that it takes for the signal to get from the element to the
+  /// readout. Actually negative in strips, due to reflection effects.
   std::vector<double> theSignalPropagationSpeed;
   std::vector<double> theTimingCalibrationError;
   bool doNoise_;
 
   // keeps track of which hits contribute to which channels
-  typedef std::multimap<int, CSCDetectorHit, std::less<int> >  DetectorHitMap;
+  typedef std::multimap<int, CSCDetectorHit, std::less<int>> DetectorHitMap;
   DetectorHitMap theDetectorHitMap;
   DigiSimLinks theDigiSimLinks;
 };
diff --git a/SimMuon/CSCDigitizer/src/CSCConfigurableStripConditions.cc b/SimMuon/CSCDigitizer/src/CSCConfigurableStripConditions.cc
index 1105f5c519ecc..4f2956b61d446 100644
--- a/SimMuon/CSCDigitizer/src/CSCConfigurableStripConditions.cc
+++ b/SimMuon/CSCDigitizer/src/CSCConfigurableStripConditions.cc
@@ -1,101 +1,81 @@
-#include "SimMuon/CSCDigitizer/src/CSCConfigurableStripConditions.h"
 #include "DataFormats/MuonDetId/interface/CSCDetId.h"
-#include "Geometry/CSCGeometry/interface/CSCChamberSpecs.h"
 #include "FWCore/Utilities/interface/Exception.h"
+#include "Geometry/CSCGeometry/interface/CSCChamberSpecs.h"
+#include "SimMuon/CSCDigitizer/src/CSCConfigurableStripConditions.h"
 
-CSCConfigurableStripConditions::CSCConfigurableStripConditions(const edm::ParameterSet & p)
-: theGain( p.getParameter<double>("gain") ),
-  theME11Gain( p.getParameter<double>("me11gain") ),
-  theGainSigma( p.getParameter<double>("ampGainSigma") ),
-  thePedestal( p.getParameter<double>("pedestal") ),
-  thePedestalSigma( p.getParameter<double>("pedestalSigma") ),
-  theCapacitiveCrosstalk(0.0167),
-  theResistiveCrosstalk(0.02)
-{
+CSCConfigurableStripConditions::CSCConfigurableStripConditions(const edm::ParameterSet &p)
+    : theGain(p.getParameter<double>("gain")),
+      theME11Gain(p.getParameter<double>("me11gain")),
+      theGainSigma(p.getParameter<double>("ampGainSigma")),
+      thePedestal(p.getParameter<double>("pedestal")),
+      thePedestalSigma(p.getParameter<double>("pedestalSigma")),
+      theCapacitiveCrosstalk(0.0167),
+      theResistiveCrosstalk(0.02) {
   theNoisifiers.resize(9);
-  makeNoisifier(1, p.getParameter<std::vector<double> >("me11a") );
-  makeNoisifier(2, p.getParameter<std::vector<double> >("me11") );
-  makeNoisifier(3, p.getParameter<std::vector<double> >("me12") );
-  makeNoisifier(4, p.getParameter<std::vector<double> >("me13") ); // not sure about this one
-  makeNoisifier(5, p.getParameter<std::vector<double> >("me21") );
-  makeNoisifier(6, p.getParameter<std::vector<double> >("me22") );
-  makeNoisifier(7, p.getParameter<std::vector<double> >("me31") );
-  makeNoisifier(8, p.getParameter<std::vector<double> >("me32") );
-  makeNoisifier(9, p.getParameter<std::vector<double> >("me31") ); // for lack of a better idea
+  makeNoisifier(1, p.getParameter<std::vector<double>>("me11a"));
+  makeNoisifier(2, p.getParameter<std::vector<double>>("me11"));
+  makeNoisifier(3, p.getParameter<std::vector<double>>("me12"));
+  makeNoisifier(4, p.getParameter<std::vector<double>>("me13"));  // not sure about this one
+  makeNoisifier(5, p.getParameter<std::vector<double>>("me21"));
+  makeNoisifier(6, p.getParameter<std::vector<double>>("me22"));
+  makeNoisifier(7, p.getParameter<std::vector<double>>("me31"));
+  makeNoisifier(8, p.getParameter<std::vector<double>>("me32"));
+  makeNoisifier(9, p.getParameter<std::vector<double>>("me31"));  // for lack of a better idea
 }
 
-
-CSCConfigurableStripConditions::~CSCConfigurableStripConditions()
-{
-  for(int i = 0; i < 9; ++i)
-  {
+CSCConfigurableStripConditions::~CSCConfigurableStripConditions() {
+  for (int i = 0; i < 9; ++i) {
     delete theNoisifiers[i];
   }
 }
 
-
-float CSCConfigurableStripConditions::gain(const CSCDetId & detId, int channel) const
-{
-  if(detId.station() == 1 && (detId.ring() == 1 || detId.ring() == 4) )
-  {
+float CSCConfigurableStripConditions::gain(const CSCDetId &detId, int channel) const {
+  if (detId.station() == 1 && (detId.ring() == 1 || detId.ring() == 4)) {
     return theME11Gain;
-  }  
-  else
-  {
+  } else {
     return theGain;
   }
 }
 
-
-void CSCConfigurableStripConditions::fetchNoisifier(const CSCDetId & detId, int istrip)
-{
-  //TODO get this moved toCSCDetId
+void CSCConfigurableStripConditions::fetchNoisifier(const CSCDetId &detId, int istrip) {
+  // TODO get this moved toCSCDetId
   int chamberType = CSCChamberSpecs::whatChamberType(detId.station(), detId.ring());
-  theNoisifier = theNoisifiers[chamberType-1];
+  theNoisifier = theNoisifiers[chamberType - 1];
 }
 
-
-void CSCConfigurableStripConditions::makeNoisifier(int chamberType, const std::vector<double> & correlations)
-{
-
+void CSCConfigurableStripConditions::makeNoisifier(int chamberType, const std::vector<double> &correlations) {
   // format is 33, 34, 44, 35, 45, 55
   //           46, 56, 66, 57, 67, 77
-  if(correlations.size() != 12)
-  {
+  if (correlations.size() != 12) {
     throw cms::Exception("CSCConfigurableStripConditions")
-      << "Expect 12 noise correlation coefficients, but got "
-      << correlations.size();
+        << "Expect 12 noise correlation coefficients, but got " << correlations.size();
   }
 
   CSCCorrelatedNoiseMatrix matrix;
-  matrix(3,3) = correlations[0];
-  matrix(3,4) = correlations[1];
-  matrix(4,4) = correlations[2];
-  matrix(3,5) = correlations[3];
-  matrix(4,5) = correlations[4];
-  matrix(5,5) = correlations[5];
-  matrix(4,6) = correlations[6];
-  matrix(5,6) = correlations[7];
-  matrix(6,6) = correlations[8];
-  matrix(5,7) = correlations[9];
-  matrix(6,7) = correlations[10];
-  matrix(7,7) = correlations[11];
+  matrix(3, 3) = correlations[0];
+  matrix(3, 4) = correlations[1];
+  matrix(4, 4) = correlations[2];
+  matrix(3, 5) = correlations[3];
+  matrix(4, 5) = correlations[4];
+  matrix(5, 5) = correlations[5];
+  matrix(4, 6) = correlations[6];
+  matrix(5, 6) = correlations[7];
+  matrix(6, 6) = correlations[8];
+  matrix(5, 7) = correlations[9];
+  matrix(6, 7) = correlations[10];
+  matrix(7, 7) = correlations[11];
 
   // since I don't know how to correlate the pedestal samples,
   // take as constant
   double scaVariance = 2. * thePedestalSigma * thePedestalSigma;
-  matrix(0,0) = scaVariance;
-  matrix(1,1) = scaVariance;
-  matrix(2,2) = scaVariance;
-  theNoisifiers[chamberType-1] = new CSCCorrelatedNoisifier(matrix);
-
+  matrix(0, 0) = scaVariance;
+  matrix(1, 1) = scaVariance;
+  matrix(2, 2) = scaVariance;
+  theNoisifiers[chamberType - 1] = new CSCCorrelatedNoisifier(matrix);
 }
 
-void CSCConfigurableStripConditions::crosstalk(const CSCDetId&detId, int channel,
-                 double stripLength, bool leftRight,
-                 float & capacitive, float & resistive) const
-{
+void CSCConfigurableStripConditions::crosstalk(
+    const CSCDetId &detId, int channel, double stripLength, bool leftRight, float &capacitive, float &resistive) const {
   capacitive = theCapacitiveCrosstalk * stripLength;
   resistive = theResistiveCrosstalk;
 }
-
diff --git a/SimMuon/CSCDigitizer/src/CSCConfigurableStripConditions.h b/SimMuon/CSCDigitizer/src/CSCConfigurableStripConditions.h
index d800a8699f4ae..2b994795aad9c 100644
--- a/SimMuon/CSCDigitizer/src/CSCConfigurableStripConditions.h
+++ b/SimMuon/CSCDigitizer/src/CSCConfigurableStripConditions.h
@@ -1,31 +1,33 @@
 #ifndef CSCDigitizer_CSCConfigurableStripConditions_h
 #define CSCDigitizer_CSCConfigurableStripConditions_h
 
-#include "SimMuon/CSCDigitizer/src/CSCStripConditions.h"
-#include "SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.h"
+#include "SimMuon/CSCDigitizer/src/CSCStripConditions.h"
 
-class CSCConfigurableStripConditions : public CSCStripConditions
-{
+class CSCConfigurableStripConditions : public CSCStripConditions {
 public:
-  CSCConfigurableStripConditions(const edm::ParameterSet & p);
+  CSCConfigurableStripConditions(const edm::ParameterSet &p);
   ~CSCConfigurableStripConditions() override;
 
   /// channels count from 1
-  float gain(const CSCDetId & detId, int channel) const override;
-  float gainSigma(const CSCDetId & detId, int channel) const override {return theGainSigma;}
+  float gain(const CSCDetId &detId, int channel) const override;
+  float gainSigma(const CSCDetId &detId, int channel) const override { return theGainSigma; }
 
   /// in ADC counts
-  float pedestal(const CSCDetId & detId, int channel) const override {return thePedestal;}
-  float pedestalSigma(const CSCDetId & detId, int channel) const override {return thePedestalSigma;}
+  float pedestal(const CSCDetId &detId, int channel) const override { return thePedestal; }
+  float pedestalSigma(const CSCDetId &detId, int channel) const override { return thePedestalSigma; }
 
-  void crosstalk(const CSCDetId&detId, int channel,
-                 double stripLength, bool leftRight,
-                 float & capacitive, float & resistive) const override;
+  void crosstalk(const CSCDetId &detId,
+                 int channel,
+                 double stripLength,
+                 bool leftRight,
+                 float &capacitive,
+                 float &resistive) const override;
 
 private:
-  void fetchNoisifier(const CSCDetId & detId, int istrip) override;
-  void makeNoisifier(int chamberType, const std::vector<double> & correlations);
+  void fetchNoisifier(const CSCDetId &detId, int istrip) override;
+  void makeNoisifier(int chamberType, const std::vector<double> &correlations);
   std::vector<CSCCorrelatedNoisifier *> theNoisifiers;
 
   float theGain;
@@ -40,5 +42,3 @@ class CSCConfigurableStripConditions : public CSCStripConditions
 };
 
 #endif
-
-
diff --git a/SimMuon/CSCDigitizer/src/CSCCrossGap.cc b/SimMuon/CSCDigitizer/src/CSCCrossGap.cc
index c88572c6e9f0c..4e60d989b34c8 100644
--- a/SimMuon/CSCDigitizer/src/CSCCrossGap.cc
+++ b/SimMuon/CSCDigitizer/src/CSCCrossGap.cc
@@ -1,38 +1,26 @@
-#include "SimMuon/CSCDigitizer/src/CSCCrossGap.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimMuon/CSCDigitizer/src/CSCCrossGap.h"
 #include <cmath>
 
 #include <iostream>
-CSCCrossGap:: CSCCrossGap(double mass, float mom, LocalVector gap)
-: theBeta2(0.),
-  theGamma(1.),
-  loggam(0.),
-  theGap(gap),
-  clusters(),
-  electronsInClusters(),
-  steps(),
-  elosses()
-{
-  logGamma( mass, mom);
-  LogTrace("CSCCrossGap")
-     << "CSCCrossGap: simhit \n"
-     << "mass = " << mass << "GeV/c2, momentum = " << mom << 
-       " GeV/c, gap length = " << length() << " cm \n";
+CSCCrossGap::CSCCrossGap(double mass, float mom, LocalVector gap)
+    : theBeta2(0.), theGamma(1.), loggam(0.), theGap(gap), clusters(), electronsInClusters(), steps(), elosses() {
+  logGamma(mass, mom);
+  LogTrace("CSCCrossGap") << "CSCCrossGap: simhit \n"
+                          << "mass = " << mass << "GeV/c2, momentum = " << mom << " GeV/c, gap length = " << length()
+                          << " cm \n";
 }
 
-double CSCCrossGap::logGamma( double mass, float mom ) 
-{
-  theGamma = sqrt((mom/mass)*(mom/mass) + 1. );
-  theBeta2 = 1. - 1./(theGamma*theGamma);
-  double betgam = sqrt(theGamma*theGamma -1.);
-  LogTrace("CSCCrossGap") << "gamma = " << theGamma << ", beta2 = " << theBeta2 <<
-    ", beta*gamma = " << betgam;
+double CSCCrossGap::logGamma(double mass, float mom) {
+  theGamma = sqrt((mom / mass) * (mom / mass) + 1.);
+  theBeta2 = 1. - 1. / (theGamma * theGamma);
+  double betgam = sqrt(theGamma * theGamma - 1.);
+  LogTrace("CSCCrossGap") << "gamma = " << theGamma << ", beta2 = " << theBeta2 << ", beta*gamma = " << betgam;
 
   // The lowest value in table (=theGammaBins[0]) is ln(1.1)=0.0953102
   // (Compensate later if lower)
-  loggam = log( std::max(1.1, theGamma ) ); // F-P literal IS double by default!
+  loggam = log(std::max(1.1, theGamma));  // F-P literal IS double by default!
   LogTrace("CSCCrossGap") << "logGamma = " << loggam;
 
   return loggam;
 }
-
diff --git a/SimMuon/CSCDigitizer/src/CSCCrossGap.h b/SimMuon/CSCDigitizer/src/CSCCrossGap.h
index 0f1a1161fa213..bc14f9756baba 100644
--- a/SimMuon/CSCDigitizer/src/CSCCrossGap.h
+++ b/SimMuon/CSCDigitizer/src/CSCCrossGap.h
@@ -2,26 +2,25 @@
 #define MU_END_CROSS_GAP_H
 
 /** \class CSCCrossGap
-* Class used to represent one CSC gas gap crossing by a charged track.
-*
-* \author Tim Cox
-*
-* This is used by CSCCSCGasCollisions in the digitization of the CSCs.
-* Actually this may NOT model the whole gas gap, but just the path length
-* corresponding to a PSimHit in the gap (i.e. from the PSimHit 'entry point'
-* to its 'exit point'). PSimHit's can have a pretty evanescent existence
-* and I can't pretend to have a full understanding of their full range
-* of characteristics. Yet another thing 'to be studied'.
-*
-*/
+ * Class used to represent one CSC gas gap crossing by a charged track.
+ *
+ * \author Tim Cox
+ *
+ * This is used by CSCCSCGasCollisions in the digitization of the CSCs.
+ * Actually this may NOT model the whole gas gap, but just the path length
+ * corresponding to a PSimHit in the gap (i.e. from the PSimHit 'entry point'
+ * to its 'exit point'). PSimHit's can have a pretty evanescent existence
+ * and I can't pretend to have a full understanding of their full range
+ * of characteristics. Yet another thing 'to be studied'.
+ *
+ */
 
-#include <vector>
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "DataFormats/GeometryVector/interface/LocalVector.h"
+#include <vector>
 
 class CSCCrossGap {
 public:
-
   /**
    * iam = particle type in PDG code.
    * mom = momentum of particle
@@ -39,15 +38,15 @@ class CSCCrossGap {
   std::vector<float> eLossPerStep() const { return elosses; }
   int noOfElosses() const { return elosses.size(); }
 
-  void addCluster(LocalPoint here) { clusters.push_back( here ); }
-  void addElectrons(int nelec = 1) { electronsInClusters.push_back( nelec ); }
+  void addCluster(LocalPoint here) { clusters.push_back(here); }
+  void addElectrons(int nelec = 1) { electronsInClusters.push_back(nelec); }
   void addElectronToBack() { ++electronsInClusters.back(); }
 
-  void addStep( double step ) { steps.push_back( step ); }
-  void addEloss( float eloss ) { elosses.push_back( eloss ); }
-  
-  double logGamma( double mass, float momentum );
-  double logGamma(){ return loggam; }
+  void addStep(double step) { steps.push_back(step); }
+  void addEloss(float eloss) { elosses.push_back(eloss); }
+
+  double logGamma(double mass, float momentum);
+  double logGamma() { return loggam; }
   double beta2() const { return theBeta2; }
   double gamma() const { return theGamma; }
   LocalVector gapVector() const { return theGap; }
@@ -55,17 +54,15 @@ class CSCCrossGap {
   float length() const { return theGap.mag(); }
 
 private:
-
-  double theBeta2; // Lorentz beta^2
-  double theGamma; // Lorentz gamma
-  double loggam; 
+  double theBeta2;  // Lorentz beta^2
+  double theGamma;  // Lorentz gamma
+  double loggam;
   LocalVector theGap;
 
   std::vector<LocalPoint> clusters;
   std::vector<int> electronsInClusters;
   std::vector<double> steps;
   std::vector<float> elosses;
-
 };
 
 #endif
diff --git a/SimMuon/CSCDigitizer/src/CSCCrosstalkGenerator.cc b/SimMuon/CSCDigitizer/src/CSCCrosstalkGenerator.cc
index 4239dc570b42d..677f214686bc0 100644
--- a/SimMuon/CSCDigitizer/src/CSCCrosstalkGenerator.cc
+++ b/SimMuon/CSCDigitizer/src/CSCCrosstalkGenerator.cc
@@ -1,37 +1,32 @@
-#include "SimMuon/CSCDigitizer/src/CSCCrosstalkGenerator.h"
 #include "SimMuon/CSCDigitizer/src/CSCAnalogSignal.h"
+#include "SimMuon/CSCDigitizer/src/CSCCrosstalkGenerator.h"
 
-CSCAnalogSignal CSCCrosstalkGenerator::getCrosstalk(const CSCAnalogSignal & inputSignal) const {
+CSCAnalogSignal CSCCrosstalkGenerator::getCrosstalk(const CSCAnalogSignal &inputSignal) const {
   int nBins = inputSignal.getSize();
   float binSize = inputSignal.getBinSize();
   std::vector<float> binValues(nBins);
-  
-  for(int outputBin = 0; outputBin < nBins; ++outputBin) {
-    float aTime = outputBin*binSize - theDelay;
-    float slope = inputSignal.getValue(aTime) - inputSignal.getValue(aTime-1.);
-    binValues[outputBin] = slope * theCrosstalk 
-                         + theResistiveFraction * inputSignal.getValue(aTime);
+
+  for (int outputBin = 0; outputBin < nBins; ++outputBin) {
+    float aTime = outputBin * binSize - theDelay;
+    float slope = inputSignal.getValue(aTime) - inputSignal.getValue(aTime - 1.);
+    binValues[outputBin] = slope * theCrosstalk + theResistiveFraction * inputSignal.getValue(aTime);
   }
 
   return CSCAnalogSignal(0, binSize, binValues, 0., inputSignal.getTimeOffset());
 }
-  
-
-float CSCCrosstalkGenerator::ratio(const CSCAnalogSignal & crosstalkSignal, const CSCAnalogSignal & signal) const
-{
 
+float CSCCrosstalkGenerator::ratio(const CSCAnalogSignal &crosstalkSignal, const CSCAnalogSignal &signal) const {
   float maxFirst = 0., maxSecond = 0.;
   int nbins = signal.getSize();
-  for(int i = 1; i < nbins; ++i)
-  {
+  for (int i = 1; i < nbins; ++i) {
     float v1 = signal.getBinValue(i);
     float v2 = crosstalkSignal.getBinValue(i);
 
-    if(v1 > maxFirst) maxFirst = v1;
-    if(v2 > maxSecond) maxSecond = v2;
-
+    if (v1 > maxFirst)
+      maxFirst = v1;
+    if (v2 > maxSecond)
+      maxSecond = v2;
   }
 
-  return maxSecond/maxFirst;
+  return maxSecond / maxFirst;
 }
-
diff --git a/SimMuon/CSCDigitizer/src/CSCCrosstalkGenerator.h b/SimMuon/CSCDigitizer/src/CSCCrosstalkGenerator.h
index b6059c65709f0..940fae9ec8b87 100644
--- a/SimMuon/CSCDigitizer/src/CSCCrosstalkGenerator.h
+++ b/SimMuon/CSCDigitizer/src/CSCCrosstalkGenerator.h
@@ -13,25 +13,23 @@ class CSCAnalogSignal;
  *    for subtracting the crosstalk from the input signal,
  *    and adding the crosstalk signal to the neighbors.
  *
- *  \author Rick Wilkinson, 
+ *  \author Rick Wilkinson,
  */
 
-class CSCCrosstalkGenerator
-{
+class CSCCrosstalkGenerator {
 public:
-  CSCCrosstalkGenerator() : theCrosstalk(0), theDelay(0),
-                              theResistiveFraction(0.) {};
+  CSCCrosstalkGenerator() : theCrosstalk(0), theDelay(0), theResistiveFraction(0.){};
 
   void setParameters(float crosstalk, float delay, float resistiveFraction) {
     theCrosstalk = crosstalk;
-    theDelay     = delay;
+    theDelay = delay;
     theResistiveFraction = resistiveFraction;
   }
 
-  CSCAnalogSignal getCrosstalk(const CSCAnalogSignal & inputSignal) const;
+  CSCAnalogSignal getCrosstalk(const CSCAnalogSignal &inputSignal) const;
 
-  /// analyzes the ratio between two signals. 
-  float ratio(const CSCAnalogSignal & crosstalkSignal, const CSCAnalogSignal & signal) const;
+  /// analyzes the ratio between two signals.
+  float ratio(const CSCAnalogSignal &crosstalkSignal, const CSCAnalogSignal &signal) const;
 
 private:
   float theCrosstalk;
@@ -41,4 +39,3 @@ class CSCCrosstalkGenerator
 };
 
 #endif
-
diff --git a/SimMuon/CSCDigitizer/src/CSCDbStripConditions.cc b/SimMuon/CSCDigitizer/src/CSCDbStripConditions.cc
index d1658154f01b1..d9cfd42000b1b 100644
--- a/SimMuon/CSCDigitizer/src/CSCDbStripConditions.cc
+++ b/SimMuon/CSCDigitizer/src/CSCDbStripConditions.cc
@@ -1,117 +1,97 @@
-#include "SimMuon/CSCDigitizer/src/CSCDbStripConditions.h"
-#include "DataFormats/MuonDetId/interface/CSCDetId.h"
-#include "FWCore/Utilities/interface/Exception.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "CondFormats/CSCObjects/interface/CSCChannelTranslator.h"
+#include "CondFormats/DataRecord/interface/CSCDBCrosstalkRcd.h"
 #include "CondFormats/DataRecord/interface/CSCDBGainsRcd.h"
-#include "CondFormats/DataRecord/interface/CSCDBPedestalsRcd.h"
 #include "CondFormats/DataRecord/interface/CSCDBNoiseMatrixRcd.h"
-#include "CondFormats/DataRecord/interface/CSCDBCrosstalkRcd.h"
-
-
-CSCDbStripConditions::CSCDbStripConditions(const edm::ParameterSet & pset)
-: CSCStripConditions(),
-  theConditions( pset ),
-  theCapacitiveCrosstalk(pset.getParameter<double>("capacativeCrosstalk")),
-  theResistiveCrosstalkScaling(pset.getParameter<double>("resistiveCrosstalkScaling")),
-  theGainsConstant(pset.getParameter<double>("gainsConstant")),
-  doCorrelatedNoise_(pset.getParameter<bool>("doCorrelatedNoise"))
-{
-//  theCapacitiveCrosstalk = = 1/maxslope/maxsignal) = 1/ (0.00231/0.143);
-// Howoever, need a bit more.  Maybe the slope gets smeared?
-}
-
+#include "CondFormats/DataRecord/interface/CSCDBPedestalsRcd.h"
+#include "DataFormats/MuonDetId/interface/CSCDetId.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Utilities/interface/Exception.h"
+#include "SimMuon/CSCDigitizer/src/CSCDbStripConditions.h"
 
-CSCDbStripConditions::~CSCDbStripConditions()
-{
-  if(theNoisifier != nullptr) delete theNoisifier;
+CSCDbStripConditions::CSCDbStripConditions(const edm::ParameterSet &pset)
+    : CSCStripConditions(),
+      theConditions(pset),
+      theCapacitiveCrosstalk(pset.getParameter<double>("capacativeCrosstalk")),
+      theResistiveCrosstalkScaling(pset.getParameter<double>("resistiveCrosstalkScaling")),
+      theGainsConstant(pset.getParameter<double>("gainsConstant")),
+      doCorrelatedNoise_(pset.getParameter<bool>("doCorrelatedNoise")) {
+  //  theCapacitiveCrosstalk = = 1/maxslope/maxsignal) = 1/ (0.00231/0.143);
+  // Howoever, need a bit more.  Maybe the slope gets smeared?
 }
 
-
-void CSCDbStripConditions::initializeEvent(const edm::EventSetup & es)
-{
-  theConditions.initializeEvent(es);
+CSCDbStripConditions::~CSCDbStripConditions() {
+  if (theNoisifier != nullptr)
+    delete theNoisifier;
 }
 
+void CSCDbStripConditions::initializeEvent(const edm::EventSetup &es) { theConditions.initializeEvent(es); }
 
-float CSCDbStripConditions::gain(const CSCDetId & id, int channel) const
-{
-  return theConditions.gain(id, channel)  * theGainsConstant;
+float CSCDbStripConditions::gain(const CSCDetId &id, int channel) const {
+  return theConditions.gain(id, channel) * theGainsConstant;
 }
 
-
-float CSCDbStripConditions::pedestal(const CSCDetId & id, int channel) const
-{
+float CSCDbStripConditions::pedestal(const CSCDetId &id, int channel) const {
   return theConditions.pedestal(id, channel);
 }
 
-
-float CSCDbStripConditions::pedestalSigma(const CSCDetId& id, int channel) const
-{
+float CSCDbStripConditions::pedestalSigma(const CSCDetId &id, int channel) const {
   return theConditions.pedestalSigma(id, channel);
 }
 
-
-void CSCDbStripConditions::crosstalk(const CSCDetId& id, int channel,
-			double stripLength, bool leftRight,
-			float & capacitive, float & resistive) const
-{
-  resistive = theConditions.crosstalkIntercept(id, channel, leftRight)
-             * theResistiveCrosstalkScaling;
+void CSCDbStripConditions::crosstalk(
+    const CSCDetId &id, int channel, double stripLength, bool leftRight, float &capacitive, float &resistive) const {
+  resistive = theConditions.crosstalkIntercept(id, channel, leftRight) * theResistiveCrosstalkScaling;
   float slope = theConditions.crosstalkSlope(id, channel, leftRight);
   // ns before the peak where slope is max
   float maxSlopeTime = 60.;
   // some confusion about +/-
-  float capacitiveFraction = fabs(slope)*maxSlopeTime;
+  float capacitiveFraction = fabs(slope) * maxSlopeTime;
   // theCapacitiveCrosstalk is the number needed for 100% xtalk, so
   capacitive = theCapacitiveCrosstalk * capacitiveFraction;
 }
 
-
-void CSCDbStripConditions::fetchNoisifier(const CSCDetId & id, int istrip)
-{
-  std::vector<float> me(12); // buffer for matrix elements
-  theConditions.noiseMatrixElements( id, istrip, me ); // fill it
+void CSCDbStripConditions::fetchNoisifier(const CSCDetId &id, int istrip) {
+  std::vector<float> me(12);                          // buffer for matrix elements
+  theConditions.noiseMatrixElements(id, istrip, me);  // fill it
 
   CSCCorrelatedNoiseMatrix matrix;
-  //TODO get the pedestals right
-  matrix(2,2) = me[0]; // item.elem33;
-  matrix(3,3) = me[3]; // item.elem44;
-  matrix(4,4) = me[6]; // item.elem55;
-  matrix(5,5) = me[9]; // item.elem66;
-  matrix(6,6) = me[11]; // item.elem77;
-
-  if(doCorrelatedNoise_)
-  {
-    matrix(2,3) = me[1]; // item.elem34;
-    matrix(2,4) = me[2]; // item.elem35;
-    matrix(3,4) = me[4]; // item.elem45;
-    matrix(3,5) = me[5]; // item.elem46;
-    matrix(4,5) = me[7]; // item.elem56;
-    matrix(4,6) = me[8]; // item.elem57;
-    matrix(5,6) = me[10]; // item.elem67;
+  // TODO get the pedestals right
+  matrix(2, 2) = me[0];   // item.elem33;
+  matrix(3, 3) = me[3];   // item.elem44;
+  matrix(4, 4) = me[6];   // item.elem55;
+  matrix(5, 5) = me[9];   // item.elem66;
+  matrix(6, 6) = me[11];  // item.elem77;
+
+  if (doCorrelatedNoise_) {
+    matrix(2, 3) = me[1];   // item.elem34;
+    matrix(2, 4) = me[2];   // item.elem35;
+    matrix(3, 4) = me[4];   // item.elem45;
+    matrix(3, 5) = me[5];   // item.elem46;
+    matrix(4, 5) = me[7];   // item.elem56;
+    matrix(4, 6) = me[8];   // item.elem57;
+    matrix(5, 6) = me[10];  // item.elem67;
   }
 
   // the other diagonal elements can just come from the pedestal sigma
   float sigma = pedestalSigma(id, istrip);
   //@@  float scaVariance = 2 * sigma * sigma;
-  //@@ The '2 *' IS strictly correct, but currently the value in the cond db is 2x too large since
-  //@@ it is the rms of the distribution of pedestals of all 8 time samples rather than the rms of
+  //@@ The '2 *' IS strictly correct, but currently the value in the cond db is
+  // 2x too large since
+  //@@ it is the rms of the distribution of pedestals of all 8 time samples
+  // rather than the rms of
   //@@ the average of the first two time samples
   float scaVariance = sigma * sigma;
-  matrix(0,0) = matrix(1,1) = matrix(7,7) = scaVariance;
+  matrix(0, 0) = matrix(1, 1) = matrix(7, 7) = scaVariance;
 
   // unknown neighbors can be the average of the known neighbors
-  //float avgNeighbor = (matrix(2,3)+matrix(3,4)+matrix(4,5)+matrix(5,6))/4.;
-  //float avg2away = (matrix(2,4)+matrix(3,5)+matrix(4,6))/3.;
-  //matrix(0,1) = matrix(1,2) = matrix(6,7) = avgNeighbor;
-  //matrix(0,2) = matrix(1,3) = matrix(5,7) = avg2away;
+  // float avgNeighbor = (matrix(2,3)+matrix(3,4)+matrix(4,5)+matrix(5,6))/4.;
+  // float avg2away = (matrix(2,4)+matrix(3,5)+matrix(4,6))/3.;
+  // matrix(0,1) = matrix(1,2) = matrix(6,7) = avgNeighbor;
+  // matrix(0,2) = matrix(1,3) = matrix(5,7) = avg2away;
 
-  if(theNoisifier != nullptr) delete theNoisifier;
+  if (theNoisifier != nullptr)
+    delete theNoisifier;
   theNoisifier = new CSCCorrelatedNoisifier(matrix);
 }
 
-bool CSCDbStripConditions::isInBadChamber( const CSCDetId& id ) const
-{
-  return theConditions.isInBadChamber( id );
-}
+bool CSCDbStripConditions::isInBadChamber(const CSCDetId &id) const { return theConditions.isInBadChamber(id); }
diff --git a/SimMuon/CSCDigitizer/src/CSCDbStripConditions.h b/SimMuon/CSCDigitizer/src/CSCDbStripConditions.h
index 308a21e7dd9ec..9a4fb028561ee 100644
--- a/SimMuon/CSCDigitizer/src/CSCDbStripConditions.h
+++ b/SimMuon/CSCDigitizer/src/CSCDbStripConditions.h
@@ -1,37 +1,39 @@
 #ifndef CSCDigitizer_CSCDbStripConditions_h
 #define CSCDigitizer_CSCDbStripConditions_h
 
-#include "SimMuon/CSCDigitizer/src/CSCStripConditions.h"
 #include "CalibMuon/CSCCalibration/interface/CSCConditions.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "SimMuon/CSCDigitizer/src/CSCStripConditions.h"
 
-class CSCDbStripConditions : public CSCStripConditions
-{
+class CSCDbStripConditions : public CSCStripConditions {
 public:
-  explicit CSCDbStripConditions(const edm::ParameterSet & pset);
+  explicit CSCDbStripConditions(const edm::ParameterSet &pset);
   ~CSCDbStripConditions() override;
 
   /// fetch the maps from the database
-  void initializeEvent(const edm::EventSetup & es) override;
+  void initializeEvent(const edm::EventSetup &es) override;
 
   /// channels count from 1
-  float gain(const CSCDetId & detId, int channel) const override;
+  float gain(const CSCDetId &detId, int channel) const override;
   /// total calibration precision
-  float gainSigma(const CSCDetId & detId, int channel) const override {return 0.005;}
+  float gainSigma(const CSCDetId &detId, int channel) const override { return 0.005; }
 
   /// in ADC counts
-  float pedestal(const CSCDetId & detId, int channel) const override;
-  float pedestalSigma(const CSCDetId & detId, int channel) const override;
+  float pedestal(const CSCDetId &detId, int channel) const override;
+  float pedestalSigma(const CSCDetId &detId, int channel) const override;
 
-  void crosstalk(const CSCDetId&detId, int channel,
-                 double stripLength, bool leftRight,
-                 float & capacitive, float & resistive) const override;
+  void crosstalk(const CSCDetId &detId,
+                 int channel,
+                 double stripLength,
+                 bool leftRight,
+                 float &capacitive,
+                 float &resistive) const override;
 
   /// check list of bad chambers from db
-  bool isInBadChamber( const CSCDetId& id ) const override;
+  bool isInBadChamber(const CSCDetId &id) const override;
 
 private:
-  void fetchNoisifier(const CSCDetId & detId, int istrip) override;  
+  void fetchNoisifier(const CSCDetId &detId, int istrip) override;
 
   CSCConditions theConditions;
 
@@ -46,5 +48,3 @@ class CSCDbStripConditions : public CSCStripConditions
 };
 
 #endif
-
-
diff --git a/SimMuon/CSCDigitizer/src/CSCDetectorHit.cc b/SimMuon/CSCDigitizer/src/CSCDetectorHit.cc
index d94d358302c82..979f371289fed 100644
--- a/SimMuon/CSCDigitizer/src/CSCDetectorHit.cc
+++ b/SimMuon/CSCDigitizer/src/CSCDetectorHit.cc
@@ -1,11 +1,8 @@
 #include "SimMuon/CSCDigitizer/src/CSCDetectorHit.h"
 #include <iostream>
 
-std::ostream & operator<<(std::ostream & stream, const CSCDetectorHit & hit) {
-  stream << "element: " << hit.getElement()
-         << "  charge: " << hit.getCharge()
-         << "   pos:  " << hit.getPosition()
-         << "   time: " << hit.getTime() << std::endl; 
+std::ostream &operator<<(std::ostream &stream, const CSCDetectorHit &hit) {
+  stream << "element: " << hit.getElement() << "  charge: " << hit.getCharge() << "   pos:  " << hit.getPosition()
+         << "   time: " << hit.getTime() << std::endl;
   return stream;
 }
-
diff --git a/SimMuon/CSCDigitizer/src/CSCDetectorHit.h b/SimMuon/CSCDigitizer/src/CSCDetectorHit.h
index 1bc9eb891e35f..343b42a57803d 100644
--- a/SimMuon/CSCDigitizer/src/CSCDetectorHit.h
+++ b/SimMuon/CSCDigitizer/src/CSCDetectorHit.h
@@ -13,32 +13,29 @@
 #include <iosfwd>
 class PSimHit;
 
-class CSCDetectorHit
-{
+class CSCDetectorHit {
 public:
-  CSCDetectorHit(int element, float charge, float position, float time,
-                   const PSimHit * hitp)
-    : theElement(element), theCharge(charge),
-      thePosition(position),   theTime(time), theHitp(hitp) {}
+  CSCDetectorHit(int element, float charge, float position, float time, const PSimHit *hitp)
+      : theElement(element), theCharge(charge), thePosition(position), theTime(time), theHitp(hitp) {}
 
-  int   getElement()  const {return theElement;}
-  float getCharge()   const {return theCharge;}
-  float getPosition() const {return thePosition;}
-  float getTime()     const {return theTime;}
-  const PSimHit * getSimHit() const {return theHitp;}
+  int getElement() const { return theElement; }
+  float getCharge() const { return theCharge; }
+  float getPosition() const { return thePosition; }
+  float getTime() const { return theTime; }
+  const PSimHit *getSimHit() const { return theHitp; }
+
+  friend std::ostream &operator<<(std::ostream &, const CSCDetectorHit &);
 
-  friend std::ostream & operator<<(std::ostream &, const CSCDetectorHit &);
 private:
   /// strip or wire number
-  int   theElement;
+  int theElement;
   float theCharge;
   /// the position is along the element, with (0,0) the center of the chamber
-  float thePosition; 
+  float thePosition;
   /// start counting time at the beam crossing
   float theTime;
   /// theSimHit that created this hit
-  const PSimHit * theHitp;
+  const PSimHit *theHitp;
 };
 
 #endif
-
diff --git a/SimMuon/CSCDigitizer/src/CSCDigiDump.cc b/SimMuon/CSCDigitizer/src/CSCDigiDump.cc
index 9fb81f2ea9d4a..951e22b025ec7 100644
--- a/SimMuon/CSCDigitizer/src/CSCDigiDump.cc
+++ b/SimMuon/CSCDigitizer/src/CSCDigiDump.cc
@@ -1,22 +1,20 @@
-// Mar-2015: Changed cout to LogVerbatim - and uses Digi::print() which also used cout
-// until I switched to LogVerbatim on 03-Mar-2015 for 75X
+// Mar-2015: Changed cout to LogVerbatim - and uses Digi::print() which also
+// used cout until I switched to LogVerbatim on 03-Mar-2015 for 75X
 
-#include "SimMuon/CSCDigitizer/src/CSCDigiDump.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Utilities/interface/InputTag.h"
+#include "SimMuon/CSCDigitizer/src/CSCDigiDump.h"
 #include <iostream>
 
-CSCDigiDump::CSCDigiDump(edm::ParameterSet const& conf)
-{  
+CSCDigiDump::CSCDigiDump(edm::ParameterSet const &conf) {
   wd_token = consumes<CSCWireDigiCollection>(conf.getParameter<edm::InputTag>("wireDigiTag"));
   sd_token = consumes<CSCStripDigiCollection>(conf.getParameter<edm::InputTag>("stripDigiTag"));
   cd_token = consumes<CSCComparatorDigiCollection>(conf.getParameter<edm::InputTag>("comparatorDigiTag"));
 }
 
-
-void CSCDigiDump::analyze(edm::Event const& e, edm::EventSetup const& c) {
+void CSCDigiDump::analyze(edm::Event const &e, edm::EventSetup const &c) {
   edm::Handle<CSCStripDigiCollection> strips;
   edm::Handle<CSCWireDigiCollection> wires;
   edm::Handle<CSCComparatorDigiCollection> comparators;
@@ -25,38 +23,34 @@ void CSCDigiDump::analyze(edm::Event const& e, edm::EventSetup const& c) {
 
   e.getByToken(wd_token, wires);
 
-  for (CSCWireDigiCollection::DigiRangeIterator j=wires->begin(); j!=wires->end(); j++) {
+  for (CSCWireDigiCollection::DigiRangeIterator j = wires->begin(); j != wires->end(); j++) {
     edm::LogVerbatim("CSCDigi") << "Wire digis from " << CSCDetId((*j).first);
     std::vector<CSCWireDigi>::const_iterator digiItr = (*j).second.first;
     std::vector<CSCWireDigi>::const_iterator last = (*j).second.second;
-    for( ; digiItr != last; ++digiItr) {
-       digiItr->print();
+    for (; digiItr != last; ++digiItr) {
+      digiItr->print();
     }
   }
 
   e.getByToken(sd_token, strips);
 
-  for (CSCStripDigiCollection::DigiRangeIterator j=strips->begin(); j!=strips->end(); j++) {
+  for (CSCStripDigiCollection::DigiRangeIterator j = strips->begin(); j != strips->end(); j++) {
     edm::LogVerbatim("CSCDigi") << "Strip digis from " << CSCDetId((*j).first);
     std::vector<CSCStripDigi>::const_iterator digiItr = (*j).second.first;
     std::vector<CSCStripDigi>::const_iterator last = (*j).second.second;
-    for( ; digiItr != last; ++digiItr) {
-       digiItr->print();
+    for (; digiItr != last; ++digiItr) {
+      digiItr->print();
     }
   }
 
   e.getByToken(cd_token, comparators);
 
-  for (CSCComparatorDigiCollection::DigiRangeIterator j=comparators->begin(); 
-       j!=comparators->end(); j++) 
-  {
+  for (CSCComparatorDigiCollection::DigiRangeIterator j = comparators->begin(); j != comparators->end(); j++) {
     edm::LogVerbatim("CSCDigi") << "Comparator digis from " << CSCDetId((*j).first);
     std::vector<CSCComparatorDigi>::const_iterator digiItr = (*j).second.first;
     std::vector<CSCComparatorDigi>::const_iterator last = (*j).second.second;
-    for( ; digiItr != last; ++digiItr) {
-       digiItr->print();
+    for (; digiItr != last; ++digiItr) {
+      digiItr->print();
     }
   }
 }
-
-
diff --git a/SimMuon/CSCDigitizer/src/CSCDigiDump.h b/SimMuon/CSCDigitizer/src/CSCDigiDump.h
index 7de49d62b237e..810d8b0e27107 100644
--- a/SimMuon/CSCDigitizer/src/CSCDigiDump.h
+++ b/SimMuon/CSCDigitizer/src/CSCDigiDump.h
@@ -1,17 +1,17 @@
 #ifndef CSCDigitizer_CSCDigiDump_h
 #define CSCDigitizer_CSCDigiDump_h
 
+#include "DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h"
+#include "DataFormats/CSCDigi/interface/CSCStripDigiCollection.h"
+#include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/CSCDigi/interface/CSCStripDigiCollection.h"
-#include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
-#include "DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h"
 
 class CSCDigiDump : public edm::one::EDAnalyzer<> {
 public:
-  explicit CSCDigiDump(edm::ParameterSet const& conf);
-  void analyze(edm::Event const& e, edm::EventSetup const& c) override;
+  explicit CSCDigiDump(edm::ParameterSet const &conf);
+  void analyze(edm::Event const &e, edm::EventSetup const &c) override;
 
 private:
   edm::EDGetTokenT<CSCWireDigiCollection> wd_token;
@@ -20,4 +20,3 @@ class CSCDigiDump : public edm::one::EDAnalyzer<> {
 };
 
 #endif
-
diff --git a/SimMuon/CSCDigitizer/src/CSCDigiProducer.cc b/SimMuon/CSCDigitizer/src/CSCDigiProducer.cc
index 9bdff673e9031..02ce01e346ef1 100644
--- a/SimMuon/CSCDigitizer/src/CSCDigiProducer.cc
+++ b/SimMuon/CSCDigitizer/src/CSCDigiProducer.cc
@@ -12,96 +12,78 @@
 
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include <FWCore/MessageLogger/interface/MessageLogger.h>
 
 #include <string>
 
-CSCDigiProducer::CSCDigiProducer(const edm::ParameterSet& ps) 
-:  theDigitizer(ps),
-   theStripConditions(nullptr)
-{
+CSCDigiProducer::CSCDigiProducer(const edm::ParameterSet &ps) : theDigitizer(ps), theStripConditions(nullptr) {
   produces<CSCWireDigiCollection>("MuonCSCWireDigi");
   produces<CSCStripDigiCollection>("MuonCSCStripDigi");
   produces<CSCComparatorDigiCollection>("MuonCSCComparatorDigi");
   produces<DigiSimLinks>("MuonCSCWireDigiSimLinks");
   produces<DigiSimLinks>("MuonCSCStripDigiSimLinks");
-  std::string stripConditions( ps.getParameter<std::string>("stripConditions") );
+  std::string stripConditions(ps.getParameter<std::string>("stripConditions"));
   geometryType = ps.getParameter<std::string>("GeometryType");
   edm::ParameterSet stripPSet = ps.getParameter<edm::ParameterSet>("strips");
-  if( stripConditions == "Configurable" )
-  {
+  if (stripConditions == "Configurable") {
     theStripConditions = new CSCConfigurableStripConditions(stripPSet);
-  }
-  else if ( stripConditions == "Database" )
-  {
+  } else if (stripConditions == "Database") {
     theStripConditions = new CSCDbStripConditions(stripPSet);
-  }
-  else
-  {
-    throw cms::Exception("CSCDigiProducer") 
-      << "Bad option for strip conditions: "
-      << stripConditions;
+  } else {
+    throw cms::Exception("CSCDigiProducer") << "Bad option for strip conditions: " << stripConditions;
   }
   theDigitizer.setStripConditions(theStripConditions);
 
   edm::Service<edm::RandomNumberGenerator> rng;
-  if ( ! rng.isAvailable()) {
-   throw cms::Exception("Configuration")
-     << "CSCDigitizer requires the RandomNumberGeneratorService\n"
-        "which is not present in the configuration file.  You must add the service\n"
-        "in the configuration file or remove the modules that require it.";
+  if (!rng.isAvailable()) {
+    throw cms::Exception("Configuration") << "CSCDigitizer requires the RandomNumberGeneratorService\n"
+                                             "which is not present in the configuration file.  You must add the "
+                                             "service\n"
+                                             "in the configuration file or remove the modules that require it.";
   }
 
   std::string mix_ = ps.getParameter<std::string>("mixLabel");
   std::string collection_ = ps.getParameter<std::string>("InputCollection");
-  cf_token = consumes<CrossingFrame<PSimHit> >( edm::InputTag(mix_, collection_) );
-}
-
-
-CSCDigiProducer::~CSCDigiProducer()
-{
-  delete theStripConditions;
+  cf_token = consumes<CrossingFrame<PSimHit>>(edm::InputTag(mix_, collection_));
 }
 
+CSCDigiProducer::~CSCDigiProducer() { delete theStripConditions; }
 
-void CSCDigiProducer::produce(edm::Event& ev, const edm::EventSetup& eventSetup) {
-
-  edm::LogVerbatim("CSCDigitizer") << "[CSCDigiProducer::produce] starting event " << 
-      ev.id().event() << " of run " << ev.id().run();
+void CSCDigiProducer::produce(edm::Event &ev, const edm::EventSetup &eventSetup) {
+  edm::LogVerbatim("CSCDigitizer") << "[CSCDigiProducer::produce] starting event " << ev.id().event() << " of run "
+                                   << ev.id().run();
   edm::Service<edm::RandomNumberGenerator> rng;
-  CLHEP::HepRandomEngine* engine = &rng->getEngine(ev.streamID());
+  CLHEP::HepRandomEngine *engine = &rng->getEngine(ev.streamID());
 
-  edm::Handle<CrossingFrame<PSimHit> > cf;
+  edm::Handle<CrossingFrame<PSimHit>> cf;
   ev.getByToken(cf_token, cf);
 
-  std::unique_ptr<MixCollection<PSimHit> >
-    hits( new MixCollection<PSimHit>(cf.product()) );
+  std::unique_ptr<MixCollection<PSimHit>> hits(new MixCollection<PSimHit>(cf.product()));
 
   // Create empty output
 
   std::unique_ptr<CSCWireDigiCollection> pWireDigis(new CSCWireDigiCollection());
   std::unique_ptr<CSCStripDigiCollection> pStripDigis(new CSCStripDigiCollection());
   std::unique_ptr<CSCComparatorDigiCollection> pComparatorDigis(new CSCComparatorDigiCollection());
-  std::unique_ptr<DigiSimLinks> pWireDigiSimLinks(new DigiSimLinks() );
-  std::unique_ptr<DigiSimLinks> pStripDigiSimLinks(new DigiSimLinks() );
+  std::unique_ptr<DigiSimLinks> pWireDigiSimLinks(new DigiSimLinks());
+  std::unique_ptr<DigiSimLinks> pStripDigiSimLinks(new DigiSimLinks());
 
   //@@ DOES NOTHING IF NO HITS.  Remove this for when there's real neutrons
-  if(hits->size() > 0) 
-  {
+  if (hits->size() > 0) {
     // find the geometry & conditions for this event
     edm::ESHandle<CSCGeometry> hGeom;
-    eventSetup.get<MuonGeometryRecord>().get(geometryType,hGeom);
+    eventSetup.get<MuonGeometryRecord>().get(geometryType, hGeom);
     const CSCGeometry *pGeom = &*hGeom;
 
-    theDigitizer.setGeometry( pGeom );
+    theDigitizer.setGeometry(pGeom);
 
     // find the magnetic field
     edm::ESHandle<MagneticField> magfield;
@@ -109,20 +91,18 @@ void CSCDigiProducer::produce(edm::Event& ev, const edm::EventSetup& eventSetup)
 
     theDigitizer.setMagneticField(&*magfield);
 
-
     // set the particle table
-    edm::ESHandle < ParticleDataTable > pdt;
-    eventSetup.getData( pdt );
+    edm::ESHandle<ParticleDataTable> pdt;
+    eventSetup.getData(pdt);
     theDigitizer.setParticleDataTable(&*pdt);
 
     theStripConditions->initializeEvent(eventSetup);
 
     // run the digitizer
-    theDigitizer.doAction(*hits, *pWireDigis, *pStripDigis, *pComparatorDigis,
-                          *pWireDigiSimLinks, *pStripDigiSimLinks, engine);
+    theDigitizer.doAction(
+        *hits, *pWireDigis, *pStripDigis, *pComparatorDigis, *pWireDigiSimLinks, *pStripDigiSimLinks, engine);
   }
 
-
   // store them in the event
   ev.put(std::move(pWireDigis), "MuonCSCWireDigi");
   ev.put(std::move(pStripDigis), "MuonCSCStripDigi");
@@ -130,4 +110,3 @@ void CSCDigiProducer::produce(edm::Event& ev, const edm::EventSetup& eventSetup)
   ev.put(std::move(pWireDigiSimLinks), "MuonCSCWireDigiSimLinks");
   ev.put(std::move(pStripDigiSimLinks), "MuonCSCStripDigiSimLinks");
 }
-
diff --git a/SimMuon/CSCDigitizer/src/CSCDigiProducer.h b/SimMuon/CSCDigitizer/src/CSCDigiProducer.h
index 4b1ea2bbfa413..1988142906b48 100644
--- a/SimMuon/CSCDigitizer/src/CSCDigiProducer.h
+++ b/SimMuon/CSCDigitizer/src/CSCDigiProducer.h
@@ -3,30 +3,27 @@
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/stream/EDProducer.h"
-#include "SimMuon/CSCDigitizer/src/CSCDigitizer.h"
 #include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
+#include "SimMuon/CSCDigitizer/src/CSCDigitizer.h"
 
 class CSCStripConditions;
 
-class CSCDigiProducer : public edm::stream::EDProducer<>
-{
+class CSCDigiProducer : public edm::stream::EDProducer<> {
 public:
   typedef CSCDigitizer::DigiSimLinks DigiSimLinks;
 
-  explicit CSCDigiProducer(const edm::ParameterSet& ps);
+  explicit CSCDigiProducer(const edm::ParameterSet &ps);
   ~CSCDigiProducer() override;
 
   /**Produces the EDM products,*/
-  void produce(edm::Event& e, const edm::EventSetup& c) override;
+  void produce(edm::Event &e, const edm::EventSetup &c) override;
 
 private:
-
   CSCDigitizer theDigitizer;
-  CSCStripConditions * theStripConditions;
+  CSCStripConditions *theStripConditions;
   std::string geometryType;
-  edm::EDGetTokenT<CrossingFrame<PSimHit> > cf_token; 
+  edm::EDGetTokenT<CrossingFrame<PSimHit>> cf_token;
 };
 
 #endif
-
diff --git a/SimMuon/CSCDigitizer/src/CSCDigitizer.cc b/SimMuon/CSCDigitizer/src/CSCDigitizer.cc
index 177d723b0b938..f33087432be3a 100644
--- a/SimMuon/CSCDigitizer/src/CSCDigitizer.cc
+++ b/SimMuon/CSCDigitizer/src/CSCDigitizer.cc
@@ -1,36 +1,32 @@
-#include "SimMuon/CSCDigitizer/src/CSCDigitizer.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "Geometry/CSCGeometry/interface/CSCLayer.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "SimMuon/CSCDigitizer/src/CSCDetectorHit.h"
-#include "SimMuon/CSCDigitizer/src/CSCWireHitSim.h"
-#include "SimMuon/CSCDigitizer/src/CSCStripHitSim.h"
+#include "SimMuon/CSCDigitizer/src/CSCDigitizer.h"
 #include "SimMuon/CSCDigitizer/src/CSCDriftSim.h"
-#include "SimMuon/CSCDigitizer/src/CSCWireElectronicsSim.h"
-#include "SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.h"
 #include "SimMuon/CSCDigitizer/src/CSCNeutronReader.h"
 #include "SimMuon/CSCDigitizer/src/CSCStripConditions.h"
-#include "Geometry/CSCGeometry/interface/CSCLayer.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.h"
+#include "SimMuon/CSCDigitizer/src/CSCStripHitSim.h"
+#include "SimMuon/CSCDigitizer/src/CSCWireElectronicsSim.h"
+#include "SimMuon/CSCDigitizer/src/CSCWireHitSim.h"
 #include <iostream>
 
-
-CSCDigitizer::CSCDigitizer(const edm::ParameterSet & p)
-: theDriftSim(new CSCDriftSim()),
-  theWireHitSim(new CSCWireHitSim(theDriftSim, p)),
-  theStripHitSim(new CSCStripHitSim()),
-  theWireElectronicsSim(new CSCWireElectronicsSim(p.getParameter<edm::ParameterSet>("wires"))),
-  theStripElectronicsSim(new CSCStripElectronicsSim(p.getParameter<edm::ParameterSet>("strips"))),
-  theNeutronReader(nullptr),
-  theCSCGeometry(nullptr),
-  theLayersNeeded(p.getParameter<unsigned int>("layersNeeded")),
-  digitizeBadChambers_(p.getParameter<bool>("digitizeBadChambers"))
-{
-  if(p.getParameter<bool>("doNeutrons"))
-  {
+CSCDigitizer::CSCDigitizer(const edm::ParameterSet &p)
+    : theDriftSim(new CSCDriftSim()),
+      theWireHitSim(new CSCWireHitSim(theDriftSim, p)),
+      theStripHitSim(new CSCStripHitSim()),
+      theWireElectronicsSim(new CSCWireElectronicsSim(p.getParameter<edm::ParameterSet>("wires"))),
+      theStripElectronicsSim(new CSCStripElectronicsSim(p.getParameter<edm::ParameterSet>("strips"))),
+      theNeutronReader(nullptr),
+      theCSCGeometry(nullptr),
+      theLayersNeeded(p.getParameter<unsigned int>("layersNeeded")),
+      digitizeBadChambers_(p.getParameter<bool>("digitizeBadChambers")) {
+  if (p.getParameter<bool>("doNeutrons")) {
     theNeutronReader = new CSCNeutronReader(p.getParameter<edm::ParameterSet>("neutrons"));
   }
 }
 
-
 CSCDigitizer::~CSCDigitizer() {
   delete theNeutronReader;
   delete theStripElectronicsSim;
@@ -40,88 +36,81 @@ CSCDigitizer::~CSCDigitizer() {
   delete theDriftSim;
 }
 
-
-
-void CSCDigitizer::doAction(MixCollection<PSimHit> & simHits, 
-                            CSCWireDigiCollection & wireDigis, 
-                            CSCStripDigiCollection & stripDigis, 
-                            CSCComparatorDigiCollection & comparators,
-                            DigiSimLinks & wireDigiSimLinks,
-                            DigiSimLinks & stripDigiSimLinks,
-                            CLHEP::HepRandomEngine* engine)
-{
+void CSCDigitizer::doAction(MixCollection<PSimHit> &simHits,
+                            CSCWireDigiCollection &wireDigis,
+                            CSCStripDigiCollection &stripDigis,
+                            CSCComparatorDigiCollection &comparators,
+                            DigiSimLinks &wireDigiSimLinks,
+                            DigiSimLinks &stripDigiSimLinks,
+                            CLHEP::HepRandomEngine *engine) {
   // arrange the hits by layer
   std::map<int, edm::PSimHitContainer> hitMap;
-  for(MixCollection<PSimHit>::MixItr hitItr = simHits.begin();
-      hitItr != simHits.end(); ++hitItr) 
-  {
+  for (MixCollection<PSimHit>::MixItr hitItr = simHits.begin(); hitItr != simHits.end(); ++hitItr) {
     hitMap[hitItr->detUnitId()].push_back(*hitItr);
   }
 
   // count how many layers on each chamber are hit
-  std::map<int, std::set<int> > layersInChamberHit;
-  for(std::map<int, edm::PSimHitContainer>::const_iterator hitMapItr = hitMap.begin();
-      hitMapItr != hitMap.end(); ++hitMapItr)
-  {
-    CSCDetId cscDetId(hitMapItr->first); 
+  std::map<int, std::set<int>> layersInChamberHit;
+  for (std::map<int, edm::PSimHitContainer>::const_iterator hitMapItr = hitMap.begin(); hitMapItr != hitMap.end();
+       ++hitMapItr) {
+    CSCDetId cscDetId(hitMapItr->first);
     int chamberId = cscDetId.chamberId();
     layersInChamberHit[chamberId].insert(cscDetId.layer());
   }
 
   // add neutron background, if needed
-  if(theNeutronReader != nullptr)
-  {
+  if (theNeutronReader != nullptr) {
     theNeutronReader->addHits(hitMap, engine);
   }
 
   // now loop over layers and run the simulation for each one
-  for(std::map<int, edm::PSimHitContainer>::const_iterator hitMapItr = hitMap.begin();
-      hitMapItr != hitMap.end(); ++hitMapItr)
-  {
+  for (std::map<int, edm::PSimHitContainer>::const_iterator hitMapItr = hitMap.begin(); hitMapItr != hitMap.end();
+       ++hitMapItr) {
     CSCDetId detId = CSCDetId(hitMapItr->first);
     int chamberId = detId.chamberId();
     int endc = detId.endcap();
     int stat = detId.station();
     int ring = detId.ring();
     int cham = detId.chamber();
-    
+
     unsigned int nLayersInChamberHitForWireDigis = 0;
-    if (stat == 1 && ring == 1) { // ME1b
-        std::set<int> layersInME1a = layersInChamberHit[CSCDetId(endc,stat,4,cham,0)];
-        std::set<int> layersInME11 = layersInChamberHit[chamberId];
-        layersInME11.insert(layersInME1a.begin(),layersInME1a.end());
-        nLayersInChamberHitForWireDigis = layersInME11.size();
-    }
-    else if (stat == 1 && ring == 4) { // ME1a
-        std::set<int> layersInME1b = layersInChamberHit[CSCDetId(endc,stat,1,cham,0)];
-        std::set<int> layersInME11 = layersInChamberHit[chamberId];
-        layersInME11.insert(layersInME1b.begin(),layersInME1b.end());
-        nLayersInChamberHitForWireDigis = layersInME11.size();
-    }
-    else nLayersInChamberHitForWireDigis = layersInChamberHit[chamberId].size();
+    if (stat == 1 && ring == 1) {  // ME1b
+      std::set<int> layersInME1a = layersInChamberHit[CSCDetId(endc, stat, 4, cham, 0)];
+      std::set<int> layersInME11 = layersInChamberHit[chamberId];
+      layersInME11.insert(layersInME1a.begin(), layersInME1a.end());
+      nLayersInChamberHitForWireDigis = layersInME11.size();
+    } else if (stat == 1 && ring == 4) {  // ME1a
+      std::set<int> layersInME1b = layersInChamberHit[CSCDetId(endc, stat, 1, cham, 0)];
+      std::set<int> layersInME11 = layersInChamberHit[chamberId];
+      layersInME11.insert(layersInME1b.begin(), layersInME1b.end());
+      nLayersInChamberHitForWireDigis = layersInME11.size();
+    } else
+      nLayersInChamberHitForWireDigis = layersInChamberHit[chamberId].size();
 
     unsigned int nLayersInChamberHitForStripDigis = layersInChamberHit[chamberId].size();
-    
-    if (nLayersInChamberHitForWireDigis < theLayersNeeded && nLayersInChamberHitForStripDigis < theLayersNeeded) continue;
+
+    if (nLayersInChamberHitForWireDigis < theLayersNeeded && nLayersInChamberHitForStripDigis < theLayersNeeded)
+      continue;
     // skip bad chambers
-    if ( !digitizeBadChambers_ && theConditions->isInBadChamber( CSCDetId(hitMapItr->first) ) ) continue;
+    if (!digitizeBadChambers_ && theConditions->isInBadChamber(CSCDetId(hitMapItr->first)))
+      continue;
 
-    const CSCLayer * layer = findLayer(hitMapItr->first);
-    const edm::PSimHitContainer & layerSimHits = hitMapItr->second;
+    const CSCLayer *layer = findLayer(hitMapItr->first);
+    const edm::PSimHitContainer &layerSimHits = hitMapItr->second;
 
     std::vector<CSCDetectorHit> newWireHits, newStripHits;
 
-    //    LogTrace("CSCDigitizer") << "CSCDigitizer: found " << layerSimHits.size() <<" hit(s) in layer"
+    //    LogTrace("CSCDigitizer") << "CSCDigitizer: found " <<
+    //    layerSimHits.size() <<" hit(s) in layer"
     edm::LogVerbatim("CSCDigitizer") << "[CSCDigitizer] found " << layerSimHits.size() << " hit(s) in layer"
-				     << layer->id();
-      //       << " E" << layer->id().endcap() << " S" << layer->id().station() << " R" << layer->id().ring()
-      //       << " C" << layer->id().chamber() << " L" << layer->id().layer();
+                                     << layer->id();
+    //       << " E" << layer->id().endcap() << " S" << layer->id().station() <<
+    //       " R" << layer->id().ring()
+    //       << " C" << layer->id().chamber() << " L" << layer->id().layer();
 
     // turn the edm::PSimHits into WireHits, using the WireHitSim
-    {
-      newWireHits.swap(theWireHitSim->simulate(layer, layerSimHits, engine));
-    }
-    if(!newWireHits.empty()) {
+    { newWireHits.swap(theWireHitSim->simulate(layer, layerSimHits, engine)); }
+    if (!newWireHits.empty()) {
       newStripHits.swap(theStripHitSim->simulate(layer, newWireHits));
     }
 
@@ -129,97 +118,77 @@ void CSCDigitizer::doAction(MixCollection<PSimHit> & simHits,
     if (nLayersInChamberHitForWireDigis >= theLayersNeeded) {
       theWireElectronicsSim->simulate(layer, newWireHits, engine);
       theWireElectronicsSim->fillDigis(wireDigis, engine);
-      wireDigiSimLinks.insert( theWireElectronicsSim->digiSimLinks() );
-    }  
+      wireDigiSimLinks.insert(theWireElectronicsSim->digiSimLinks());
+    }
     if (nLayersInChamberHitForStripDigis >= theLayersNeeded) {
       theStripElectronicsSim->simulate(layer, newStripHits, engine);
       theStripElectronicsSim->fillDigis(stripDigis, comparators, engine);
-      stripDigiSimLinks.insert( theStripElectronicsSim->digiSimLinks() );
+      stripDigiSimLinks.insert(theStripElectronicsSim->digiSimLinks());
     }
   }
 
   // fill in the layers were missing from this chamber
   std::list<int> missingLayers = layersMissing(stripDigis);
-  for(std::list<int>::const_iterator missingLayerItr = missingLayers.begin();
-      missingLayerItr != missingLayers.end(); ++missingLayerItr)
-  {
-    const CSCLayer * layer = findLayer(*missingLayerItr);
+  for (std::list<int>::const_iterator missingLayerItr = missingLayers.begin(); missingLayerItr != missingLayers.end();
+       ++missingLayerItr) {
+    const CSCLayer *layer = findLayer(*missingLayerItr);
     theStripElectronicsSim->fillMissingLayer(layer, comparators, stripDigis, engine);
   }
 }
 
-
-std::list<int> CSCDigitizer::layersMissing(const CSCStripDigiCollection & stripDigis) const
-{
+std::list<int> CSCDigitizer::layersMissing(const CSCStripDigiCollection &stripDigis) const {
   std::list<int> result;
 
-  std::map<int, std::list<int> > layersInChamberWithDigi;
-  for (CSCStripDigiCollection::DigiRangeIterator j=stripDigis.begin(); 
-       j!=stripDigis.end(); j++) 
-  {
+  std::map<int, std::list<int>> layersInChamberWithDigi;
+  for (CSCStripDigiCollection::DigiRangeIterator j = stripDigis.begin(); j != stripDigis.end(); j++) {
     CSCDetId layerId((*j).first);
     // make sure the vector of digis isn't empty
-    if((*j).second.first != (*j).second.second)
-    {
+    if ((*j).second.first != (*j).second.second) {
       int chamberId = layerId.chamberId();
       layersInChamberWithDigi[chamberId].push_back(layerId.layer());
     }
- } 
+  }
 
   std::list<int> oneThruSix;
-  for(int i = 1; i <=6; ++i)
+  for (int i = 1; i <= 6; ++i)
     oneThruSix.push_back(i);
 
-  for(std::map<int, std::list<int> >::iterator layersInChamberWithDigiItr = layersInChamberWithDigi.begin();
-      layersInChamberWithDigiItr != layersInChamberWithDigi.end(); ++ layersInChamberWithDigiItr)
-  {
-    std::list<int> & layersHit = layersInChamberWithDigiItr->second;
-    if (layersHit.size() < 6 && layersHit.size() >= theLayersNeeded) 
-    {
+  for (std::map<int, std::list<int>>::iterator layersInChamberWithDigiItr = layersInChamberWithDigi.begin();
+       layersInChamberWithDigiItr != layersInChamberWithDigi.end();
+       ++layersInChamberWithDigiItr) {
+    std::list<int> &layersHit = layersInChamberWithDigiItr->second;
+    if (layersHit.size() < 6 && layersHit.size() >= theLayersNeeded) {
       layersHit.sort();
       std::list<int> missingLayers(6);
-      std::list<int>::iterator lastLayerMissing =
-        set_difference(oneThruSix.begin(), oneThruSix.end(),
-                       layersHit.begin(), layersHit.end(), missingLayers.begin());
+      std::list<int>::iterator lastLayerMissing = set_difference(
+          oneThruSix.begin(), oneThruSix.end(), layersHit.begin(), layersHit.end(), missingLayers.begin());
       int chamberId = layersInChamberWithDigiItr->first;
-      for(std::list<int>::iterator layerMissingItr = missingLayers.begin();
-          layerMissingItr != lastLayerMissing; ++layerMissingItr)
-      {
+      for (std::list<int>::iterator layerMissingItr = missingLayers.begin(); layerMissingItr != lastLayerMissing;
+           ++layerMissingItr) {
         // got from layer 1-6 to layer ID
-        result.push_back(chamberId + *layerMissingItr); 
+        result.push_back(chamberId + *layerMissingItr);
       }
     }
   }
   return result;
 }
 
+void CSCDigitizer::setMagneticField(const MagneticField *field) { theDriftSim->setMagneticField(field); }
 
-void CSCDigitizer::setMagneticField(const MagneticField * field) {
-  theDriftSim->setMagneticField(field);
+void CSCDigitizer::setStripConditions(CSCStripConditions *cond) {
+  theConditions = cond;                              // cache here
+  theStripElectronicsSim->setStripConditions(cond);  // percolate downwards
 }
 
+void CSCDigitizer::setParticleDataTable(const ParticleDataTable *pdt) { theWireHitSim->setParticleDataTable(pdt); }
 
-void CSCDigitizer::setStripConditions(CSCStripConditions * cond)
-{
-  theConditions = cond; // cache here
-  theStripElectronicsSim->setStripConditions(cond); // percolate downwards
-}
-
-
-void CSCDigitizer::setParticleDataTable(const ParticleDataTable * pdt)
-{
-  theWireHitSim->setParticleDataTable(pdt);
-}
-
-
-const CSCLayer * CSCDigitizer::findLayer(int detId) const {
+const CSCLayer *CSCDigitizer::findLayer(int detId) const {
   assert(theCSCGeometry != nullptr);
-  const GeomDetUnit* detUnit = theCSCGeometry->idToDetUnit(CSCDetId(detId));
-  if(detUnit == nullptr)
-  {
+  const GeomDetUnit *detUnit = theCSCGeometry->idToDetUnit(CSCDetId(detId));
+  if (detUnit == nullptr) {
     throw cms::Exception("CSCDigiProducer") << "Invalid DetUnit: " << CSCDetId(detId)
-      << "\nPerhaps your signal or pileup dataset are not compatible with the current release?";
-  }  
+                                            << "\nPerhaps your signal or pileup dataset are not compatible with "
+                                               "the current release?";
+  }
   return dynamic_cast<const CSCLayer *>(detUnit);
 }
-
diff --git a/SimMuon/CSCDigitizer/src/CSCDigitizer.h b/SimMuon/CSCDigitizer/src/CSCDigitizer.h
index 1622a9c949819..5feec4ffa3c98 100644
--- a/SimMuon/CSCDigitizer/src/CSCDigitizer.h
+++ b/SimMuon/CSCDigitizer/src/CSCDigitizer.h
@@ -10,16 +10,16 @@
  *
  */
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
-#include "DataFormats/CSCDigi/interface/CSCStripDigiCollection.h"
+#include "CLHEP/Random/RandomEngine.h"
 #include "DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h"
+#include "DataFormats/CSCDigi/interface/CSCStripDigiCollection.h"
+#include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
-#include "CLHEP/Random/RandomEngine.h"
 #include <boost/utility.hpp>
 
 #include "DataFormats/Common/interface/DetSetVector.h"
@@ -38,54 +38,52 @@ namespace CLHEP {
   class HepRandomEngine;
 }
 
-class CSCDigitizer : public boost::noncopyable
-{
+class CSCDigitizer : public boost::noncopyable {
 public:
   typedef edm::DetSetVector<StripDigiSimLink> DigiSimLinks;
 
   /// configurable parameters
-  explicit CSCDigitizer(const edm::ParameterSet & p);
-  
+  explicit CSCDigitizer(const edm::ParameterSet &p);
+
   ~CSCDigitizer();
 
   /**  digitize
    */
-  void doAction(MixCollection<PSimHit> & simHits,
-                CSCWireDigiCollection & wireDigis,
-                CSCStripDigiCollection & stripDigis,
-                CSCComparatorDigiCollection & comparators,
-                DigiSimLinks & wireDigiSimLinks,
-                DigiSimLinks & stripDigiSimLinks,
-                CLHEP::HepRandomEngine*);
+  void doAction(MixCollection<PSimHit> &simHits,
+                CSCWireDigiCollection &wireDigis,
+                CSCStripDigiCollection &stripDigis,
+                CSCComparatorDigiCollection &comparators,
+                DigiSimLinks &wireDigiSimLinks,
+                DigiSimLinks &stripDigiSimLinks,
+                CLHEP::HepRandomEngine *);
 
   /// sets geometry
-  void setGeometry(const CSCGeometry * geom) {theCSCGeometry = geom;}
+  void setGeometry(const CSCGeometry *geom) { theCSCGeometry = geom; }
 
   /// sets the magnetic field
-  void setMagneticField(const MagneticField * field);
+  void setMagneticField(const MagneticField *field);
 
-  void setStripConditions(CSCStripConditions * cond);
+  void setStripConditions(CSCStripConditions *cond);
 
-  void setParticleDataTable(const ParticleDataTable * pdt);
+  void setParticleDataTable(const ParticleDataTable *pdt);
 
 private:
   /// finds the layer in the geometry associated with this det ID
-  const CSCLayer * findLayer(int detId) const;
+  const CSCLayer *findLayer(int detId) const;
 
   /// finds which layers, 1-6, aren't in the current list
-  std::list<int> layersMissing(const CSCStripDigiCollection & stripDigis) const;
-
-  CSCDriftSim            * theDriftSim;
-  CSCWireHitSim          * theWireHitSim;
-  CSCStripHitSim         * theStripHitSim;
-  CSCWireElectronicsSim  * theWireElectronicsSim;
-  CSCStripElectronicsSim * theStripElectronicsSim;
-  CSCNeutronReader       * theNeutronReader;
-  const CSCGeometry      * theCSCGeometry;
-  CSCStripConditions     * theConditions;
+  std::list<int> layersMissing(const CSCStripDigiCollection &stripDigis) const;
+
+  CSCDriftSim *theDriftSim;
+  CSCWireHitSim *theWireHitSim;
+  CSCStripHitSim *theStripHitSim;
+  CSCWireElectronicsSim *theWireElectronicsSim;
+  CSCStripElectronicsSim *theStripElectronicsSim;
+  CSCNeutronReader *theNeutronReader;
+  const CSCGeometry *theCSCGeometry;
+  CSCStripConditions *theConditions;
   unsigned int theLayersNeeded;
   bool digitizeBadChambers_;
 };
 
 #endif
-
diff --git a/SimMuon/CSCDigitizer/src/CSCDriftParam.cc b/SimMuon/CSCDigitizer/src/CSCDriftParam.cc
index f54a9399bcb1f..e3e7e98e0cee8 100644
--- a/SimMuon/CSCDigitizer/src/CSCDriftParam.cc
+++ b/SimMuon/CSCDigitizer/src/CSCDriftParam.cc
@@ -5,55 +5,50 @@
 // vin tried to optimize them...
 //     with no sizeble effect....
 
-double CSCDriftSim::avgDrift() const{
-    /* Initialized data */
-
-    static const double coeff[6] = { -.08618265,-.0020471805,-7.7771331e-4,
-            -.0058433565,-5.0241491e-4,.0010223353 };
-
-
-/* ! Parameterization of Lorentz drift in CSCs */
-/* ***********************************************************************
- * DOC MC_ALL_BDFT                                                       *
- *                                                                       *
- * DOC  Function    : Parameterization of the Lorentz drift of electrons *
- * DOC                in the muon endcap CSCs.                           *
- *                                                                       *
- * DOC  References  : None                                               *
- *                                                                       *
- * DOC  Arguments   : BZ  - z componant of the local magnetic            *
- *                         field in kgauss                               *
- * DOC                ZCELL - distance from the anode wire in the wire   *
- *                           plane coordinate normalized to one          *
- * DOC  Errors      : None                                               *
- *                                                                       *
- * DOC  Returns     : Drift distance along the anode wire                *
- *                                                                       *
- * DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
- * ***********************************************************************
- */
-
-
-
-
-    const double x10 = 1.;
-    const double x11 = bz / 40.;
-    const double x12 = x11 * 2. * x11 - x10;
-    const double x13 = x11 * 2. * x12 - x11;
-    const double x14 = x11 * 2. * x13 - x12;
-    const double x15 = x11 * 2. * x14 - x13;
-    const double x16 = x11 * 2. * x15 - x14;
-    const double x17 = x11 * 2. * x16 - x15;
-    const double x18 = x11 * 2. * x17 - x16;
-    const double x19 = x11 * 2. * x18 - x17;
-    const double x20 = 1.;
-    const double x21 = zcell;
-    const double x22 = x21 * 2. * x21 - x20;
-    const double x23 = x21 * 2. * x22 - x21;
-    const double x24 = x21 * 2. * x23 - x22;
-    const double x25 = x21 * 2. * x24 - x23;
-    const double x26 = x21 * 2. * x25 - x24;
-    const double x27 = x21 * 2. * x26 - x25;
+double CSCDriftSim::avgDrift() const {
+  /* Initialized data */
+
+  static const double coeff[6] = {-.08618265, -.0020471805, -7.7771331e-4, -.0058433565, -5.0241491e-4, .0010223353};
+
+  /* ! Parameterization of Lorentz drift in CSCs */
+  /* ***********************************************************************
+   * DOC MC_ALL_BDFT                                                       *
+   *                                                                       *
+   * DOC  Function    : Parameterization of the Lorentz drift of electrons *
+   * DOC                in the muon endcap CSCs.                           *
+   *                                                                       *
+   * DOC  References  : None                                               *
+   *                                                                       *
+   * DOC  Arguments   : BZ  - z componant of the local magnetic            *
+   *                         field in kgauss                               *
+   * DOC                ZCELL - distance from the anode wire in the wire   *
+   *                           plane coordinate normalized to one          *
+   * DOC  Errors      : None                                               *
+   *                                                                       *
+   * DOC  Returns     : Drift distance along the anode wire                *
+   *                                                                       *
+   * DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
+   * ***********************************************************************
+   */
+
+  const double x10 = 1.;
+  const double x11 = bz / 40.;
+  const double x12 = x11 * 2. * x11 - x10;
+  const double x13 = x11 * 2. * x12 - x11;
+  const double x14 = x11 * 2. * x13 - x12;
+  const double x15 = x11 * 2. * x14 - x13;
+  const double x16 = x11 * 2. * x15 - x14;
+  const double x17 = x11 * 2. * x16 - x15;
+  const double x18 = x11 * 2. * x17 - x16;
+  const double x19 = x11 * 2. * x18 - x17;
+  const double x20 = 1.;
+  const double x21 = zcell;
+  const double x22 = x21 * 2. * x21 - x20;
+  const double x23 = x21 * 2. * x22 - x21;
+  const double x24 = x21 * 2. * x23 - x22;
+  const double x25 = x21 * 2. * x24 - x23;
+  const double x26 = x21 * 2. * x25 - x24;
+  const double x27 = x21 * 2. * x26 - x25;
 
   // not sure why we need a minus sign for avgDrift, but we think the
   // parametrization has a wrong sign.  For the +z endcap, bz should
@@ -61,44 +56,39 @@ double CSCDriftSim::avgDrift() const{
   // if drifting up (neg zcell), and to the left if it drifts down.  It doesn't.
   // the first-order term here is -0.08 * bz/40 * zcell
 
-    return -1 * (coeff[0] * x11 * x21 + coeff[1] * x17 * x21 + coeff[2] * x21 +
-            coeff[3] * x11 * x27 + coeff[4] * x22 + coeff[5] * x19);
+  return -1 * (coeff[0] * x11 * x21 + coeff[1] * x17 * x21 + coeff[2] * x21 + coeff[3] * x11 * x27 + coeff[4] * x22 +
+               coeff[5] * x19);
 }
 
-
 double CSCDriftSim::driftSigma() const {
-    // Initialized data 
-
-    static const double coeff[3] = { .01069525,.010364504,.0021662697 };
-
-
-/* ! Parameterization of Lorentz drift error in CSCs */
-/*************************************************************************
- * DOC MC_ALL_BSIG                                                       *
- *                                                                       *
- * DOC  Function    : Parameterization of the dispersion in Lorentz Drift*
- * DOC                in the muon endcap CSCs.                           *
- *                                                                       *
- * DOC  References  : None                                               *
- *                                                                       *
- * DOC  Arguments   : BZ  - z componant of the local magnetic            *
- * DOC                ZCELL - distance from the anode wire in the wire   *
- *                           plane coordinate normalized to 1            *
- * DOC  Errors      : None                                               *
- *                                                                       *
- * DOC  Returns     : Dispersion in Lorentz drift along anode wire       *
- *                                                                       *
- * DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
- * ***********************************************************************
- */
-
-
-    const double x11 = bz / 40.;
-    const double x20 = 1.;
-    const double x21 = zcell;
-    const double x22 = x21 * 2. * x21 - x20;
-
-    return coeff[0] + coeff[1] * x11 * x21 + coeff[2] * x22;
-} 
-
- 
+  // Initialized data
+
+  static const double coeff[3] = {.01069525, .010364504, .0021662697};
+
+  /* ! Parameterization of Lorentz drift error in CSCs */
+  /*************************************************************************
+   * DOC MC_ALL_BSIG                                                       *
+   *                                                                       *
+   * DOC  Function    : Parameterization of the dispersion in Lorentz Drift*
+   * DOC                in the muon endcap CSCs.                           *
+   *                                                                       *
+   * DOC  References  : None                                               *
+   *                                                                       *
+   * DOC  Arguments   : BZ  - z componant of the local magnetic            *
+   * DOC                ZCELL - distance from the anode wire in the wire   *
+   *                           plane coordinate normalized to 1            *
+   * DOC  Errors      : None                                               *
+   *                                                                       *
+   * DOC  Returns     : Dispersion in Lorentz drift along anode wire       *
+   *                                                                       *
+   * DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
+   * ***********************************************************************
+   */
+
+  const double x11 = bz / 40.;
+  const double x20 = 1.;
+  const double x21 = zcell;
+  const double x22 = x21 * 2. * x21 - x20;
+
+  return coeff[0] + coeff[1] * x11 * x21 + coeff[2] * x22;
+}
diff --git a/SimMuon/CSCDigitizer/src/CSCDriftParamHighB.cc b/SimMuon/CSCDigitizer/src/CSCDriftParamHighB.cc
index 4786e37c996a3..4e213b4760e6f 100644
--- a/SimMuon/CSCDigitizer/src/CSCDriftParamHighB.cc
+++ b/SimMuon/CSCDigitizer/src/CSCDriftParamHighB.cc
@@ -2,331 +2,342 @@
 #include <cmath>
 
 double CSCDriftSim::avgPathLengthHighB() {
-    /* Initialized data */
-
-    static const double coeff[18] = { .16916627,.11057547,.054287448,.01179527,
-            .0062073273,-.013570915,-.0027121772,-.0053792764,-.0027452986,
-            -.0020556715,.0021511659,.0011376412,.0026183373,.0017980602,
-            -.0012975418,-.0010798782,-.0012322628,-8.3635924e-4 };
-
-    /* Local variables */
-    double x10, x11, x12, x13, x14, x20, x21, x22, x23, x24, x25;
-
-/* ! Parameterization of drift path length - high field chambers */
-/* ***********************************************************************
- */
-/* DOC MC_BHGH_SLEN                                                      *
- */
-/*                                                                      *
-*/
-/* DOC  Function    : Parameterization of the drift path length          *
- */
-/* DOC                in the muon endcap CSCs.                           *
- */
-/*                                                                      *
-*/
-/* DOC  References  : None                                               *
- */
-/*                                                                      *
-*/
-/* DOC  Arguments   : YCELL - distance from the anode wire in the        *
- */
-/*                           anode-cathode coordinate plane             *
-*/
-/* DOC                ZCELL - distance from the anode wire in the wire   *
- */
-/*                           plane coordinate                           *
-*/
-/* DOC  Errors      : None                                               *
- */
-/*                                                                      *
-*/
-/* DOC  Returns     : Drift path length for high field CSC chambers      *
- */
-/*                                                                      *
-*/
-/* DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
- */
-/* ***********************************************************************
- */
-
-
-
-    x10 = 1.;
-    x11 = fabs(ycell) * 2. - 1.;
-    x12 = x11 * 2. * x11 - x10;
-    x13 = x11 * 2. * x12 - x11;
-    x14 = x11 * 2. * x13 - x12;
-    x20 = 1.;
-    x21 = fabs(zcell) * 2. - 1.;
-    x22 = x21 * 2. * x21 - x20;
-    x23 = x21 * 2. * x22 - x21;
-    x24 = x21 * 2. * x23 - x22;
-    x25 = x21 * 2. * x24 - x23;
-
-    return coeff[0] + coeff[1] * x11 + coeff[2] * x21 + coeff[3] * x22 +
-            coeff[4] * x12 + coeff[5] * x11 * x21 + coeff[6] * x13 + coeff[7]
-            * x12 * x22 + coeff[8] * x12 * x23 + coeff[9] * x11 * x24 + coeff[
-            10] * x12 * x21 + coeff[11] * x14 + coeff[12] * x11 * x22 + coeff[
-            13] * x13 * x22 + coeff[14] * x13 * x21 + coeff[15] * x12 * x24 +
-            coeff[16] * x11 * x25 + coeff[17] * x11 * x23;
+  /* Initialized data */
+
+  static const double coeff[18] = {.16916627,
+                                   .11057547,
+                                   .054287448,
+                                   .01179527,
+                                   .0062073273,
+                                   -.013570915,
+                                   -.0027121772,
+                                   -.0053792764,
+                                   -.0027452986,
+                                   -.0020556715,
+                                   .0021511659,
+                                   .0011376412,
+                                   .0026183373,
+                                   .0017980602,
+                                   -.0012975418,
+                                   -.0010798782,
+                                   -.0012322628,
+                                   -8.3635924e-4};
+
+  /* Local variables */
+  double x10, x11, x12, x13, x14, x20, x21, x22, x23, x24, x25;
+
+  /* ! Parameterization of drift path length - high field chambers */
+  /* ***********************************************************************
+   */
+  /* DOC MC_BHGH_SLEN                                                      *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Function    : Parameterization of the drift path length          *
+   */
+  /* DOC                in the muon endcap CSCs.                           *
+   */
+  /*                                                                      *
+   */
+  /* DOC  References  : None                                               *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Arguments   : YCELL - distance from the anode wire in the        *
+   */
+  /*                           anode-cathode coordinate plane             *
+   */
+  /* DOC                ZCELL - distance from the anode wire in the wire   *
+   */
+  /*                           plane coordinate                           *
+   */
+  /* DOC  Errors      : None                                               *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Returns     : Drift path length for high field CSC chambers      *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
+   */
+  /* ***********************************************************************
+   */
+
+  x10 = 1.;
+  x11 = fabs(ycell) * 2. - 1.;
+  x12 = x11 * 2. * x11 - x10;
+  x13 = x11 * 2. * x12 - x11;
+  x14 = x11 * 2. * x13 - x12;
+  x20 = 1.;
+  x21 = fabs(zcell) * 2. - 1.;
+  x22 = x21 * 2. * x21 - x20;
+  x23 = x21 * 2. * x22 - x21;
+  x24 = x21 * 2. * x23 - x22;
+  x25 = x21 * 2. * x24 - x23;
+
+  return coeff[0] + coeff[1] * x11 + coeff[2] * x21 + coeff[3] * x22 + coeff[4] * x12 + coeff[5] * x11 * x21 +
+         coeff[6] * x13 + coeff[7] * x12 * x22 + coeff[8] * x12 * x23 + coeff[9] * x11 * x24 + coeff[10] * x12 * x21 +
+         coeff[11] * x14 + coeff[12] * x11 * x22 + coeff[13] * x13 * x22 + coeff[14] * x13 * x21 +
+         coeff[15] * x12 * x24 + coeff[16] * x11 * x25 + coeff[17] * x11 * x23;
 }
 
-
 double CSCDriftSim::pathSigmaHighB() {
-    /* Initialized data */
-
-    static const double coeff[9] = { .0049089564,.0091482062,.0024036507,
-            .0065285652,.0041487742,-.0038102526,-.0043923587,.0019230151,
-            .0013543258 };
-
-    /* System generated locals */
-    float ret_val;
-
-    /* Local variables */
-    double /*x10,*/ x11, x12, x13, x14, x15, x16, /*x20,*/ x21, x22, x23,
-            x24, x25, x26, x27, x28, x29;
-
-/* ! Parameterization of path length dispersion- high field chambers */
-/* ***********************************************************************
- */
-/* DOC MC_BHGH_SSIG                                                      *
- */
-/*                                                                      *
-*/
-/* DOC  Function    : Parameterization of the drift path length          *
- */
-/* DOC                dispersion in the muon endcap CSCs.                *
- */
-/*                                                                      *
-*/
-/* DOC  References  : None                                               *
- */
-/*                                                                      *
-*/
-/* DOC  Arguments   : YCELL - distance from the anode wire in the        *
- */
-/*                           anode-cathode coordinate plane             *
-*/
-/* DOC                ZCELL - distance from the anode wire in the wire   *
- */
-/*                           plane coordinate                           *
-*/
-/*           **NOTE** Both distances normalize to cell dim=1x1          *
-*/
-/* DOC  Errors      : None                                               *
- */
-/*                                                                      *
-*/
-/* DOC  Returns     : Path length dispersion for high field CSC chambers *
- */
-/*                                                                      *
-*/
-/* DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
- */
-/* ***********************************************************************
- */
-
-
-    //x10 = 1.; //not used later
-    x11 = fabs(ycell) * 2. - 1.;
-    x12 = x11 * x11;
-    x13 = x11 * x12;
-    x14 = x11 * x13;
-    x15 = x11 * x14;
-    x16 = x11 * x15;
-    //x20 = 1.; //not used later
-    x21 = fabs(zcell) * 2. - 1.;
-    x22 = x21 * x21;
-    x23 = x21 * x22;
-    x24 = x21 * x23;
-    x25 = x21 * x24;
-    x26 = x21 * x25;
-    x27 = x21 * x26;
-    x28 = x21 * x27;
-    x29 = x21 * x28;
-
-    ret_val = coeff[0] + coeff[1] * x21 + coeff[2] * x11 + coeff[3] * x22 +
-            coeff[4] * x11 * x21 + coeff[5] * x16 * x22 + coeff[6] * x16 *
-            x23 + coeff[7] * x11 * x22 + coeff[8] * x29;
-
-    return ret_val;
+  /* Initialized data */
+
+  static const double coeff[9] = {.0049089564,
+                                  .0091482062,
+                                  .0024036507,
+                                  .0065285652,
+                                  .0041487742,
+                                  -.0038102526,
+                                  -.0043923587,
+                                  .0019230151,
+                                  .0013543258};
+
+  /* System generated locals */
+  float ret_val;
+
+  /* Local variables */
+  double /*x10,*/ x11, x12, x13, x14, x15, x16, /*x20,*/ x21, x22, x23, x24, x25, x26, x27, x28, x29;
+
+  /* ! Parameterization of path length dispersion- high field chambers */
+  /* ***********************************************************************
+   */
+  /* DOC MC_BHGH_SSIG                                                      *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Function    : Parameterization of the drift path length          *
+   */
+  /* DOC                dispersion in the muon endcap CSCs.                *
+   */
+  /*                                                                      *
+   */
+  /* DOC  References  : None                                               *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Arguments   : YCELL - distance from the anode wire in the        *
+   */
+  /*                           anode-cathode coordinate plane             *
+   */
+  /* DOC                ZCELL - distance from the anode wire in the wire   *
+   */
+  /*                           plane coordinate                           *
+   */
+  /*           **NOTE** Both distances normalize to cell dim=1x1          *
+   */
+  /* DOC  Errors      : None                                               *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Returns     : Path length dispersion for high field CSC chambers *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
+   */
+  /* ***********************************************************************
+   */
+
+  // x10 = 1.; //not used later
+  x11 = fabs(ycell) * 2. - 1.;
+  x12 = x11 * x11;
+  x13 = x11 * x12;
+  x14 = x11 * x13;
+  x15 = x11 * x14;
+  x16 = x11 * x15;
+  // x20 = 1.; //not used later
+  x21 = fabs(zcell) * 2. - 1.;
+  x22 = x21 * x21;
+  x23 = x21 * x22;
+  x24 = x21 * x23;
+  x25 = x21 * x24;
+  x26 = x21 * x25;
+  x27 = x21 * x26;
+  x28 = x21 * x27;
+  x29 = x21 * x28;
+
+  ret_val = coeff[0] + coeff[1] * x21 + coeff[2] * x11 + coeff[3] * x22 + coeff[4] * x11 * x21 + coeff[5] * x16 * x22 +
+            coeff[6] * x16 * x23 + coeff[7] * x11 * x22 + coeff[8] * x29;
+
+  return ret_val;
 }
 
-
 double CSCDriftSim::avgDriftTimeHighB() {
-    /* Initialized data */
-
-    static const double coeff[27] = { 22.384492,10.562894,14.032961,7.06233,
-            3.5523289,-5.0176704,1.999075,1.0635552,-3.2770096,-2.7384958,
-            .98411495,-2.0963696,-1.4006525,-.47542728,.64179451,-.80308436,
-            .42964647,-.4153324,.50423068,.35049792,-.42595896,-.30947641,
-            .16671267,-.21336584,.22979164,.23481052,.32550435 };
-
-    /* System generated locals */
-    float ret_val;
-
-    /* Local variables */
-    double x10, x11, x12, x13, x14, x15, x16, x17, x20, x21, x22,
-            x23, x24, x25, x26, x27;
-
-/* ! Parameterization of drift time - high field chambers */
-/* ***********************************************************************
- */
-/* DOC MC_BHGH_TIME                                                      *
- */
-/*                                                                      *
-*/
-/* DOC  Function    : Parameterization of the drift time                 *
- */
-/* DOC                in the muon endcap CSCs.                           *
- */
-/*                                                                      *
-*/
-/* DOC  References  : None                                               *
- */
-/*                                                                      *
-*/
-/* DOC  Arguments   : YCELL - distance from the anode wire in the        *
- */
-/*                           anode-cathode coordinate plane             *
-*/
-/*                           (ycell=1 > d_acat)                         *
-*/
-/* DOC                ZCELL - distance from the anode wire in the wire   *
- */
-/*                           plane coordinate (zcell=1 > d_anod/2.)     *
-*/
-/* DOC  Errors      : None                                               *
- */
-/*                                                                      *
-*/
-/* DOC  Returns     : Drift time for high field CSC chambers             *
- */
-/*                                                                      *
-*/
-/* DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
- */
-/* ***********************************************************************
- */
-
-
-    x10 = 1.;
-    x11 = fabs(ycell) * 2. - 1.;
-    x12 = x11 * 2. * x11 - x10;
-    x13 = x11 * 2. * x12 - x11;
-    x14 = x11 * 2. * x13 - x12;
-    x15 = x11 * 2. * x14 - x13;
-    x16 = x11 * 2. * x15 - x14;
-    x17 = x11 * 2. * x16 - x15;
-    x20 = 1.;
-    x21 = fabs(zcell) * 2. - 1.;
-    x22 = x21 * 2. * x21 - x20;
-    x23 = x21 * 2. * x22 - x21;
-    x24 = x21 * 2. * x23 - x22;
-    x25 = x21 * 2. * x24 - x23;
-    x26 = x21 * 2. * x25 - x24;
-    x27 = x21 * 2. * x26 - x25;
-
-    ret_val = coeff[0] + coeff[1] * x11 + coeff[2] * x21 + coeff[3] * x22 +
-            coeff[4] * x23 + coeff[5] * x11 * x21 + coeff[6] * x24 + coeff[7]
-            * x12 + coeff[8] * x11 * x22 + coeff[9] * x11 * x23 + coeff[10] *
-            x25 + coeff[11] * x11 * x24 + coeff[12] * x11 * x25 + coeff[13] *
-            x13 + coeff[14] * x12 * x21 + coeff[15] * x11 * x26 + coeff[16] *
-            x26 + coeff[17] * x11 * x27 + coeff[18] * x17 * x21 + coeff[19] *
-            x15 * x21 + coeff[20] * x12 * x22 + coeff[21] * x12 * x23 + coeff[
-            22] * x27 + coeff[23] * x14 * x22 + coeff[24] * x16 * x21 + coeff[
-            25] * x17 + coeff[26] * x17 * x22;
-
-    return ret_val;
+  /* Initialized data */
+
+  static const double coeff[27] = {22.384492,  10.562894,  14.032961,  7.06233,   3.5523289,  -5.0176704, 1.999075,
+                                   1.0635552,  -3.2770096, -2.7384958, .98411495, -2.0963696, -1.4006525, -.47542728,
+                                   .64179451,  -.80308436, .42964647,  -.4153324, .50423068,  .35049792,  -.42595896,
+                                   -.30947641, .16671267,  -.21336584, .22979164, .23481052,  .32550435};
+
+  /* System generated locals */
+  float ret_val;
+
+  /* Local variables */
+  double x10, x11, x12, x13, x14, x15, x16, x17, x20, x21, x22, x23, x24, x25, x26, x27;
+
+  /* ! Parameterization of drift time - high field chambers */
+  /* ***********************************************************************
+   */
+  /* DOC MC_BHGH_TIME                                                      *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Function    : Parameterization of the drift time                 *
+   */
+  /* DOC                in the muon endcap CSCs.                           *
+   */
+  /*                                                                      *
+   */
+  /* DOC  References  : None                                               *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Arguments   : YCELL - distance from the anode wire in the        *
+   */
+  /*                           anode-cathode coordinate plane             *
+   */
+  /*                           (ycell=1 > d_acat)                         *
+   */
+  /* DOC                ZCELL - distance from the anode wire in the wire   *
+   */
+  /*                           plane coordinate (zcell=1 > d_anod/2.)     *
+   */
+  /* DOC  Errors      : None                                               *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Returns     : Drift time for high field CSC chambers             *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
+   */
+  /* ***********************************************************************
+   */
+
+  x10 = 1.;
+  x11 = fabs(ycell) * 2. - 1.;
+  x12 = x11 * 2. * x11 - x10;
+  x13 = x11 * 2. * x12 - x11;
+  x14 = x11 * 2. * x13 - x12;
+  x15 = x11 * 2. * x14 - x13;
+  x16 = x11 * 2. * x15 - x14;
+  x17 = x11 * 2. * x16 - x15;
+  x20 = 1.;
+  x21 = fabs(zcell) * 2. - 1.;
+  x22 = x21 * 2. * x21 - x20;
+  x23 = x21 * 2. * x22 - x21;
+  x24 = x21 * 2. * x23 - x22;
+  x25 = x21 * 2. * x24 - x23;
+  x26 = x21 * 2. * x25 - x24;
+  x27 = x21 * 2. * x26 - x25;
+
+  ret_val = coeff[0] + coeff[1] * x11 + coeff[2] * x21 + coeff[3] * x22 + coeff[4] * x23 + coeff[5] * x11 * x21 +
+            coeff[6] * x24 + coeff[7] * x12 + coeff[8] * x11 * x22 + coeff[9] * x11 * x23 + coeff[10] * x25 +
+            coeff[11] * x11 * x24 + coeff[12] * x11 * x25 + coeff[13] * x13 + coeff[14] * x12 * x21 +
+            coeff[15] * x11 * x26 + coeff[16] * x26 + coeff[17] * x11 * x27 + coeff[18] * x17 * x21 +
+            coeff[19] * x15 * x21 + coeff[20] * x12 * x22 + coeff[21] * x12 * x23 + coeff[22] * x27 +
+            coeff[23] * x14 * x22 + coeff[24] * x16 * x21 + coeff[25] * x17 + coeff[26] * x17 * x22;
+
+  return ret_val;
 }
 
-
 double CSCDriftSim::driftTimeSigmaHighB() {
-    /* Initialized data */
-
-    static const double coeff[17] = { 5.5533465,3.3733352,3.776603,2.2673355,
-            1.3401485,.84209333,-.71621378,.57572407,-.52313936,-.78790514,
-            -.71786066,.43370011,.29223306,-.37791975,.21121024,.31513644,
-            .25382701 };
-
-    /* System generated locals */
-    float ret_val;
-
-    /* Local variables */
-    double x10, x11, x12, x13, x14, x15, x16, x17, x18, /*x19,*/ x20,
-            x21, x22, x23, x24, x25, x26, x27, x28, x29;
-
-/* ! Parameterization of drift time dispersion- high field chambers */
-/* ***********************************************************************
- */
-/* DOC MC_BHGH_TSIG                                                      *
- */
-/*                                                                      *
-*/
-/* DOC  Function    : Parameterization of the drift time dispersion      *
- */
-/* DOC                in the muon endcap CSCs.                           *
- */
-/*                                                                      *
-*/
-/* DOC  References  : None                                               *
- */
-/*                                                                      *
-*/
-/* DOC  Arguments   : YCELL - distance from the anode wire in the        *
- */
-/*                           anode-cathode coordinate plane             *
-*/
-/*                           (ycell=1 > d_acat)                         *
-*/
-/* DOC                ZCELL - distance from the anode wire in the wire   *
- */
-/*                           plane coordinate (zcell=1 > d_anod/2.)     *
-*/
-/* DOC  Errors      : None                                               *
- */
-/*                                                                      *
-*/
-/* DOC  Returns     : Drift time dispersion for high field CSC chambers  *
- */
-/*                                                                      *
-*/
-/* DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
- */
-/* ***********************************************************************
- */
-
-
-
-    x10 = 1.;
-    x11 = fabs(ycell) * 2. - 1.;
-    x12 = x11 * 2. * x11 - x10;
-    x13 = x11 * 2. * x12 - x11;
-    x14 = x11 * 2. * x13 - x12;
-    x15 = x11 * 2. * x14 - x13;
-    x16 = x11 * 2. * x15 - x14;
-    x17 = x11 * 2. * x16 - x15;
-    x18 = x11 * 2. * x17 - x16;
-    //x19 = x11 * 2. * x18 - x17; //not used later
-    x20 = 1.;
-    x21 = fabs(zcell) * 2. - 1.;
-    x22 = x21 * 2. * x21 - x20;
-    x23 = x21 * 2. * x22 - x21;
-    x24 = x21 * 2. * x23 - x22;
-    x25 = x21 * 2. * x24 - x23;
-    x26 = x21 * 2. * x25 - x24;
-    x27 = x21 * 2. * x26 - x25;
-    x28 = x21 * 2. * x27 - x26;
-    x29 = x21 * 2. * x28 - x27;
-
-    ret_val = coeff[0] * x21 + coeff[1] + coeff[2] * x22 + coeff[3] * x23 +
-            coeff[4] * x24 + coeff[5] * x25 + coeff[6] * x11 * x23 + coeff[7]
-            * x26 + coeff[8] * x11 * x25 + coeff[9] * x11 * x24 + coeff[10] *
-            x11 * x22 + coeff[11] * x27 + coeff[12] * x28 + coeff[13] * x11 *
-            x26 + coeff[14] * x29 + coeff[15] * x16 * x21 + coeff[16] * x18 *
-            x21;
-
-    return ret_val;
-} 
-
+  /* Initialized data */
+
+  static const double coeff[17] = {5.5533465,
+                                   3.3733352,
+                                   3.776603,
+                                   2.2673355,
+                                   1.3401485,
+                                   .84209333,
+                                   -.71621378,
+                                   .57572407,
+                                   -.52313936,
+                                   -.78790514,
+                                   -.71786066,
+                                   .43370011,
+                                   .29223306,
+                                   -.37791975,
+                                   .21121024,
+                                   .31513644,
+                                   .25382701};
+
+  /* System generated locals */
+  float ret_val;
+
+  /* Local variables */
+  double x10, x11, x12, x13, x14, x15, x16, x17, x18, /*x19,*/ x20, x21, x22, x23, x24, x25, x26, x27, x28, x29;
+
+  /* ! Parameterization of drift time dispersion- high field chambers */
+  /* ***********************************************************************
+   */
+  /* DOC MC_BHGH_TSIG                                                      *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Function    : Parameterization of the drift time dispersion      *
+   */
+  /* DOC                in the muon endcap CSCs.                           *
+   */
+  /*                                                                      *
+   */
+  /* DOC  References  : None                                               *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Arguments   : YCELL - distance from the anode wire in the        *
+   */
+  /*                           anode-cathode coordinate plane             *
+   */
+  /*                           (ycell=1 > d_acat)                         *
+   */
+  /* DOC                ZCELL - distance from the anode wire in the wire   *
+   */
+  /*                           plane coordinate (zcell=1 > d_anod/2.)     *
+   */
+  /* DOC  Errors      : None                                               *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Returns     : Drift time dispersion for high field CSC chambers  *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
+   */
+  /* ***********************************************************************
+   */
+
+  x10 = 1.;
+  x11 = fabs(ycell) * 2. - 1.;
+  x12 = x11 * 2. * x11 - x10;
+  x13 = x11 * 2. * x12 - x11;
+  x14 = x11 * 2. * x13 - x12;
+  x15 = x11 * 2. * x14 - x13;
+  x16 = x11 * 2. * x15 - x14;
+  x17 = x11 * 2. * x16 - x15;
+  x18 = x11 * 2. * x17 - x16;
+  // x19 = x11 * 2. * x18 - x17; //not used later
+  x20 = 1.;
+  x21 = fabs(zcell) * 2. - 1.;
+  x22 = x21 * 2. * x21 - x20;
+  x23 = x21 * 2. * x22 - x21;
+  x24 = x21 * 2. * x23 - x22;
+  x25 = x21 * 2. * x24 - x23;
+  x26 = x21 * 2. * x25 - x24;
+  x27 = x21 * 2. * x26 - x25;
+  x28 = x21 * 2. * x27 - x26;
+  x29 = x21 * 2. * x28 - x27;
+
+  ret_val = coeff[0] * x21 + coeff[1] + coeff[2] * x22 + coeff[3] * x23 + coeff[4] * x24 + coeff[5] * x25 +
+            coeff[6] * x11 * x23 + coeff[7] * x26 + coeff[8] * x11 * x25 + coeff[9] * x11 * x24 +
+            coeff[10] * x11 * x22 + coeff[11] * x27 + coeff[12] * x28 + coeff[13] * x11 * x26 + coeff[14] * x29 +
+            coeff[15] * x16 * x21 + coeff[16] * x18 * x21;
+
+  return ret_val;
+}
diff --git a/SimMuon/CSCDigitizer/src/CSCDriftParamLowB.cc b/SimMuon/CSCDigitizer/src/CSCDriftParamLowB.cc
index a782867025df5..68a71b10b617e 100644
--- a/SimMuon/CSCDigitizer/src/CSCDriftParamLowB.cc
+++ b/SimMuon/CSCDigitizer/src/CSCDriftParamLowB.cc
@@ -5,312 +5,315 @@
 // the following functions were all generated by f2c.
 
 double CSCDriftSim::avgPathLengthLowB() {
-
-    static  const double coeff[7] = { .28872209,.21705601,.063908389,-.012224924,
-            .012901814,-.0089355058,-.015769145 };
-
-    // System generated locals
-    float ret_val;
-
-    // Local variables
-    double x10, x11, x12, x13, x20, x21, x22;
-
-/* ! Parameterization of drift path length - low field chambers */
-/* ***********************************************************************
- */
-/* DOC MC_BHGH_SLEN                                                      *
- */
-/*                                                                      *
-*/
-/* DOC  Function    : Parameterization of the drift path length          *
- */
-/* DOC                in the muon endcap CSCs.                           *
- */
-/*                                                                      *
-*/
-/* DOC  References  : None                                               *
- */
-/*                                                                      *
-*/
-/* DOC  Arguments   : YCELL - distance from the anode wire in the        *
- */
-/*                           anode-cathode coordinate plane             *
-*/
-/* DOC                ZCELL - distance from the anode wire in the wire   *
- */
-/*                           plane coordinate                           *
-*/
-/* DOC  Errors      : None                                               *
- */
-/*                                                                      *
-*/
-/* DOC  Returns     : Drift path length for low field CSC chambers      *
-*/
-/*                                                                      *
-*/
-/* DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
- */
-/* ***********************************************************************
- */
-
-
-    x10 = 1.;
-    x11 = fabs(ycell) * 2. - 1.;
-    x12 = x11 * 2. * x11 - x10;
-    x13 = x11 * 2. * x12 - x11;
-    x20 = 1.;
-    x21 = fabs(zcell) * 2. - 1.;
-    x22 = x21 * 2. * x21 - x20;
-    ret_val = coeff[0] + coeff[1] * x11 + coeff[2] * x21 + coeff[3] * x12 *
-            x22 + coeff[4] * x22 + coeff[5] * x13 + coeff[6] * x11 * x21;
-    return ret_val;
+  static const double coeff[7] = {.28872209, .21705601, .063908389, -.012224924, .012901814, -.0089355058, -.015769145};
+
+  // System generated locals
+  float ret_val;
+
+  // Local variables
+  double x10, x11, x12, x13, x20, x21, x22;
+
+  /* ! Parameterization of drift path length - low field chambers */
+  /* ***********************************************************************
+   */
+  /* DOC MC_BHGH_SLEN                                                      *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Function    : Parameterization of the drift path length          *
+   */
+  /* DOC                in the muon endcap CSCs.                           *
+   */
+  /*                                                                      *
+   */
+  /* DOC  References  : None                                               *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Arguments   : YCELL - distance from the anode wire in the        *
+   */
+  /*                           anode-cathode coordinate plane             *
+   */
+  /* DOC                ZCELL - distance from the anode wire in the wire   *
+   */
+  /*                           plane coordinate                           *
+   */
+  /* DOC  Errors      : None                                               *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Returns     : Drift path length for low field CSC chambers      *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
+   */
+  /* ***********************************************************************
+   */
+
+  x10 = 1.;
+  x11 = fabs(ycell) * 2. - 1.;
+  x12 = x11 * 2. * x11 - x10;
+  x13 = x11 * 2. * x12 - x11;
+  x20 = 1.;
+  x21 = fabs(zcell) * 2. - 1.;
+  x22 = x21 * 2. * x21 - x20;
+  ret_val = coeff[0] + coeff[1] * x11 + coeff[2] * x21 + coeff[3] * x12 * x22 + coeff[4] * x22 + coeff[5] * x13 +
+            coeff[6] * x11 * x21;
+  return ret_val;
 }
 
-
 double CSCDriftSim::pathSigmaLowB() {
-    /* Initialized data */
-
-    static  const double coeff[12] = { .002854441,8.701339e-4,.0053064193,
-            .0012356508,9.8627318e-4,.0013802449,-5.4633755e-4,.0026078648,
-            .0044171026,6.2029063e-4,.0011392474,-.0056275595 };
-
-    /* System generated locals */
-    float ret_val;
-
-    /* Local variables */
-    double /*x10,*/ x11, x12, x13, x14, x15, x16, /*x20,*/ x21, x22, x23,
-            x24, x25, x26, x27, x28, x29, x210, x211, x212, x213;
-
-/* ! Parameterization of path length dispersion- low field chambers */
-/* ***********************************************************************
- */
-/* DOC MC_BHGH_SSIG                                                      *
- */
-/*                                                                      *
-*/
-/* DOC  Function    : Parameterization of the drift path length          *
- */
-/* DOC                dispersion in the muon endcap CSCs.                *
- */
-/*                                                                      *
-*/
-/* DOC  References  : None                                               *
- */
-/*                                                                      *
-*/
-/* DOC  Arguments   : YCELL - distance from the anode wire in the        *
- */
-/*                           anode-cathode coordinate plane             *
-*/
-/* DOC                ZCELL - distance from the anode wire in the wire   *
- */
-/*                           plane coordinate                           *
-*/
-/*           **NOTE** Both distances normalize to cell dim=1x1          *
-*/
-/* DOC  Errors      : None                                               *
- */
-/*                                                                      *
-*/
-/* DOC  Returns     : Path length dispersion for low field CSC chambers *
-*/
-/*                                                                      *
-*/
-/* DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
- */
-/* ***********************************************************************
- */
-
-
-    //x10 = 1.; //not used later
-    x11 = fabs(ycell) * 2. - 1.;
-    x12 = x11 * x11;
-    x13 = x11 * x12;
-    x14 = x11 * x13;
-    x15 = x11 * x14;
-    x16 = x11 * x15;
-    //x20 = 1.; //not used later
-    x21 = fabs(zcell) * 2. - 1.;
-    x22 = x21 * x21;
-    x23 = x21 * x22;
-    x24 = x21 * x23;
-    x25 = x21 * x24;
-    x26 = x21 * x25;
-    x27 = x21 * x26;
-    x28 = x21 * x27;
-    x29 = x21 * x28;
-    x210 = x21 * x29;
-    x211 = x21 * x210;
-    x212 = x21 * x211;
-    x213 = x21 * x212;
-    ret_val = coeff[0] + coeff[1] * x23 + coeff[2] * x24 + coeff[3] * x13 +
-            coeff[4] * x11 * x21 + coeff[5] * x11 * x22 + coeff[6] * x16 +
-            coeff[7] * x213 + coeff[8] * x212 + coeff[9] * x21 + coeff[10] *
-            x11 * x23 + coeff[11] * x26;
-
-    return ret_val;
+  /* Initialized data */
+
+  static const double coeff[12] = {.002854441,
+                                   8.701339e-4,
+                                   .0053064193,
+                                   .0012356508,
+                                   9.8627318e-4,
+                                   .0013802449,
+                                   -5.4633755e-4,
+                                   .0026078648,
+                                   .0044171026,
+                                   6.2029063e-4,
+                                   .0011392474,
+                                   -.0056275595};
+
+  /* System generated locals */
+  float ret_val;
+
+  /* Local variables */
+  double /*x10,*/ x11, x12, x13, x14, x15, x16, /*x20,*/ x21, x22, x23, x24, x25, x26, x27, x28, x29, x210, x211, x212,
+      x213;
+
+  /* ! Parameterization of path length dispersion- low field chambers */
+  /* ***********************************************************************
+   */
+  /* DOC MC_BHGH_SSIG                                                      *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Function    : Parameterization of the drift path length          *
+   */
+  /* DOC                dispersion in the muon endcap CSCs.                *
+   */
+  /*                                                                      *
+   */
+  /* DOC  References  : None                                               *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Arguments   : YCELL - distance from the anode wire in the        *
+   */
+  /*                           anode-cathode coordinate plane             *
+   */
+  /* DOC                ZCELL - distance from the anode wire in the wire   *
+   */
+  /*                           plane coordinate                           *
+   */
+  /*           **NOTE** Both distances normalize to cell dim=1x1          *
+   */
+  /* DOC  Errors      : None                                               *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Returns     : Path length dispersion for low field CSC chambers *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
+   */
+  /* ***********************************************************************
+   */
+
+  // x10 = 1.; //not used later
+  x11 = fabs(ycell) * 2. - 1.;
+  x12 = x11 * x11;
+  x13 = x11 * x12;
+  x14 = x11 * x13;
+  x15 = x11 * x14;
+  x16 = x11 * x15;
+  // x20 = 1.; //not used later
+  x21 = fabs(zcell) * 2. - 1.;
+  x22 = x21 * x21;
+  x23 = x21 * x22;
+  x24 = x21 * x23;
+  x25 = x21 * x24;
+  x26 = x21 * x25;
+  x27 = x21 * x26;
+  x28 = x21 * x27;
+  x29 = x21 * x28;
+  x210 = x21 * x29;
+  x211 = x21 * x210;
+  x212 = x21 * x211;
+  x213 = x21 * x212;
+  ret_val = coeff[0] + coeff[1] * x23 + coeff[2] * x24 + coeff[3] * x13 + coeff[4] * x11 * x21 + coeff[5] * x11 * x22 +
+            coeff[6] * x16 + coeff[7] * x213 + coeff[8] * x212 + coeff[9] * x21 + coeff[10] * x11 * x23 +
+            coeff[11] * x26;
+
+  return ret_val;
 }
 
-
 double CSCDriftSim::avgDriftTimeLowB() {
-    /* Initialized data */
-
-    static const double coeff[20] = { 42.981588,25.732805,26.539129,16.719016,
-            10.862044,7.4859085,5.0353142,3.3620548,1.9057762,2.2207695,
-            -2.6787582,1.2977292,-.8358091,1.2452612,.74813469,-.57581194,
-            .32705275,-.85426489,-.55688158,-.38384903 };
-
-    /* System generated locals */
-    float ret_val;
-
-    /* Local variables */
-    double x10, x11, x12, x13, x14, x20, x21, x22, x23, x24, x25,
-            x26, x27, x28, x29;
-
-/* ! Parameterization of drift time - low field chambers */
-/* ***********************************************************************
- */
-/* DOC MC_BLOW_TIME                                                      *
- */
-/*                                                                      *
-*/
-/* DOC  Function    : Parameterization of the drift time                 *
- */
-/* DOC                in the muon endcap CSCs.                           *
- */
-/*                                                                      *
-*/
-/* DOC  References  : None                                               *
- */
-/*                                                                      *
-*/
-/* DOC  Arguments   : YCELL - distance from the anode wire in the        *
- */
-/*                           anode-cathode coordinate plane             *
-*/
-/*                           (ycell=1 > d_acat)                         *
-*/
-/* DOC                ZCELL - distance from the anode wire in the wire   *
- */
-/*                           plane coordinate (zcell=1 > d_anod/2.)     *
-*/
-/* DOC  Errors      : None                                               *
- */
-/*                                                                      *
-*/
-/* DOC  Returns     : Drift time for low field CSC chambers              *
- */
-/*                                                                      *
-*/
-/* DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
- */
-/* ***********************************************************************
- */
-
-
-
-
-    x10 = 1.;
-    x11 = fabs(ycell) * 2. - 1.;
-    x12 = x11 * 2. * x11 - x10;
-    x13 = x11 * 2. * x12 - x11;
-    x14 = x11 * 2. * x13 - x12;
-    x20 = 1.;
-    x21 = fabs(zcell) * 2. - 1.;
-    x22 = x21 * 2. * x21 - x20;
-    x23 = x21 * 2. * x22 - x21;
-    x24 = x21 * 2. * x23 - x22;
-    x25 = x21 * 2. * x24 - x23;
-    x26 = x21 * 2. * x25 - x24;
-    x27 = x21 * 2. * x26 - x25;
-    x28 = x21 * 2. * x27 - x26;
-    x29 = x21 * 2. * x28 - x27;
-
-    ret_val = coeff[0] + coeff[1] * x11 + coeff[2] * x21 + coeff[3] * x22 +
-            coeff[4] * x23 + coeff[5] * x24 + coeff[6] * x25 + coeff[7] * x26
-            + coeff[8] * x12 + coeff[9] * x27 + coeff[10] * x11 * x21 + coeff[
-            11] * x28 + coeff[12] * x13 + coeff[13] * x12 * x21 + coeff[14] *
-            x29 + coeff[15] * x13 * x21 + coeff[16] * x14 + coeff[17] * x11 *
-            x22 + coeff[18] * x11 * x23 + coeff[19] * x11 * x24;
-    return ret_val;
+  /* Initialized data */
+
+  static const double coeff[20] = {42.981588, 25.732805,  26.539129, 16.719016,  10.862044,  7.4859085, 5.0353142,
+                                   3.3620548, 1.9057762,  2.2207695, -2.6787582, 1.2977292,  -.8358091, 1.2452612,
+                                   .74813469, -.57581194, .32705275, -.85426489, -.55688158, -.38384903};
+
+  /* System generated locals */
+  float ret_val;
+
+  /* Local variables */
+  double x10, x11, x12, x13, x14, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29;
+
+  /* ! Parameterization of drift time - low field chambers */
+  /* ***********************************************************************
+   */
+  /* DOC MC_BLOW_TIME                                                      *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Function    : Parameterization of the drift time                 *
+   */
+  /* DOC                in the muon endcap CSCs.                           *
+   */
+  /*                                                                      *
+   */
+  /* DOC  References  : None                                               *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Arguments   : YCELL - distance from the anode wire in the        *
+   */
+  /*                           anode-cathode coordinate plane             *
+   */
+  /*                           (ycell=1 > d_acat)                         *
+   */
+  /* DOC                ZCELL - distance from the anode wire in the wire   *
+   */
+  /*                           plane coordinate (zcell=1 > d_anod/2.)     *
+   */
+  /* DOC  Errors      : None                                               *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Returns     : Drift time for low field CSC chambers              *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
+   */
+  /* ***********************************************************************
+   */
+
+  x10 = 1.;
+  x11 = fabs(ycell) * 2. - 1.;
+  x12 = x11 * 2. * x11 - x10;
+  x13 = x11 * 2. * x12 - x11;
+  x14 = x11 * 2. * x13 - x12;
+  x20 = 1.;
+  x21 = fabs(zcell) * 2. - 1.;
+  x22 = x21 * 2. * x21 - x20;
+  x23 = x21 * 2. * x22 - x21;
+  x24 = x21 * 2. * x23 - x22;
+  x25 = x21 * 2. * x24 - x23;
+  x26 = x21 * 2. * x25 - x24;
+  x27 = x21 * 2. * x26 - x25;
+  x28 = x21 * 2. * x27 - x26;
+  x29 = x21 * 2. * x28 - x27;
+
+  ret_val = coeff[0] + coeff[1] * x11 + coeff[2] * x21 + coeff[3] * x22 + coeff[4] * x23 + coeff[5] * x24 +
+            coeff[6] * x25 + coeff[7] * x26 + coeff[8] * x12 + coeff[9] * x27 + coeff[10] * x11 * x21 +
+            coeff[11] * x28 + coeff[12] * x13 + coeff[13] * x12 * x21 + coeff[14] * x29 + coeff[15] * x13 * x21 +
+            coeff[16] * x14 + coeff[17] * x11 * x22 + coeff[18] * x11 * x23 + coeff[19] * x11 * x24;
+  return ret_val;
 }
 
-
 double CSCDriftSim::driftTimeSigmaLowB() {
-    /* Initialized data */
-
-    static  const double coeff[19] = { 6.2681223,3.5916437,5.5425809,4.6974052,
-            3.8472392,3.1019155,2.4323913,1.8695623,1.3909068,.99056625,
-            .52066638,.64671229,.68023389,.40512251,.40202738,.23908531,
-            -.41245784,-.32196924,-.29890696 };
-
-    /* Local variables */
-    double /*x10,*/ x11, x20, x21, x22, x23, x24, x25, x26, x27, x28,
-      x29, x210, x211, x212;
-
-/* ! Parameterization of drift time dispersion- low field chambers */
-/* ***********************************************************************
- */
-/* DOC MC_BHGH_TSIG                                                      *
- */
-/*                                                                      *
-*/
-/* DOC  Function    : Parameterization of the drift time dispersion      *
- */
-/* DOC                in the muon endcap CSCs.                           *
- */
-/*                                                                      *
-*/
-/* DOC  References  : None                                               *
- */
-/*                                                                      *
-*/
-/* DOC  Arguments   : YCELL - distance from the anode wire in the        *
- */
-/*                           anode-cathode coordinate plane             *
-*/
-/*                           (ycell=1 > d_acat)                         *
-*/
-/* DOC                ZCELL - distance from the anode wire in the wire   *
- */
-/*                           plane coordinate (zcell=1 > d_anod/2.)     *
-*/
-/* DOC  Errors      : None                                               *
- */
-/*                                                                      *
-*/
-/* DOC  Returns     : Drift time dispersion for low field CSC chambers   *
- */
-/*                                                                      *
-*/
-/* DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
- */
-/* ***********************************************************************
- */
-
-
-
-    //x10 = 1.; //not used
-    x11 = fabs(ycell) * 2. - 1.;
-    x20 = 1.;
-    x21 = fabs(zcell) * 2. - 1.;
-    x22 = x21 * 2. * x21 - x20;
-    x23 = x21 * 2. * x22 - x21;
-    x24 = x21 * 2. * x23 - x22;
-    x25 = x21 * 2. * x24 - x23;
-    x26 = x21 * 2. * x25 - x24;
-    x27 = x21 * 2. * x26 - x25;
-    x28 = x21 * 2. * x27 - x26;
-    x29 = x21 * 2. * x28 - x27;
-    x210 = x21 * 2. * x29 - x28;
-    x211 = x21 * 2. * x210 - x29;
-    x212 = x21 * 2. * x211 - x210;
-
-    return coeff[0] * x21 + coeff[1] + coeff[2] * x22 + coeff[3] * x23 +
-            coeff[4] * x24 + coeff[5] * x25 + coeff[6] * x26 + coeff[7] * x27
-            + coeff[8] * x28 + coeff[9] * x29 + coeff[10] * x11 + coeff[11] *
-            x11 * x21 + coeff[12] * x210 + coeff[13] * x11 * x22 + coeff[14] *
-             x211 + coeff[15] * x212 + coeff[16] * x11 * x25 + coeff[17] *
-            x11 * x27 + coeff[18] * x11 * x26;
+  /* Initialized data */
+
+  static const double coeff[19] = {6.2681223,
+                                   3.5916437,
+                                   5.5425809,
+                                   4.6974052,
+                                   3.8472392,
+                                   3.1019155,
+                                   2.4323913,
+                                   1.8695623,
+                                   1.3909068,
+                                   .99056625,
+                                   .52066638,
+                                   .64671229,
+                                   .68023389,
+                                   .40512251,
+                                   .40202738,
+                                   .23908531,
+                                   -.41245784,
+                                   -.32196924,
+                                   -.29890696};
+
+  /* Local variables */
+  double /*x10,*/ x11, x20, x21, x22, x23, x24, x25, x26, x27, x28, x29, x210, x211, x212;
+
+  /* ! Parameterization of drift time dispersion- low field chambers */
+  /* ***********************************************************************
+   */
+  /* DOC MC_BHGH_TSIG                                                      *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Function    : Parameterization of the drift time dispersion      *
+   */
+  /* DOC                in the muon endcap CSCs.                           *
+   */
+  /*                                                                      *
+   */
+  /* DOC  References  : None                                               *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Arguments   : YCELL - distance from the anode wire in the        *
+   */
+  /*                           anode-cathode coordinate plane             *
+   */
+  /*                           (ycell=1 > d_acat)                         *
+   */
+  /* DOC                ZCELL - distance from the anode wire in the wire   *
+   */
+  /*                           plane coordinate (zcell=1 > d_anod/2.)     *
+   */
+  /* DOC  Errors      : None                                               *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Returns     : Drift time dispersion for low field CSC chambers   *
+   */
+  /*                                                                      *
+   */
+  /* DOC  Created     : 15-OCT-1996   Author : Jeff Rowe                   *
+   */
+  /* ***********************************************************************
+   */
+
+  // x10 = 1.; //not used
+  x11 = fabs(ycell) * 2. - 1.;
+  x20 = 1.;
+  x21 = fabs(zcell) * 2. - 1.;
+  x22 = x21 * 2. * x21 - x20;
+  x23 = x21 * 2. * x22 - x21;
+  x24 = x21 * 2. * x23 - x22;
+  x25 = x21 * 2. * x24 - x23;
+  x26 = x21 * 2. * x25 - x24;
+  x27 = x21 * 2. * x26 - x25;
+  x28 = x21 * 2. * x27 - x26;
+  x29 = x21 * 2. * x28 - x27;
+  x210 = x21 * 2. * x29 - x28;
+  x211 = x21 * 2. * x210 - x29;
+  x212 = x21 * 2. * x211 - x210;
+
+  return coeff[0] * x21 + coeff[1] + coeff[2] * x22 + coeff[3] * x23 + coeff[4] * x24 + coeff[5] * x25 +
+         coeff[6] * x26 + coeff[7] * x27 + coeff[8] * x28 + coeff[9] * x29 + coeff[10] * x11 + coeff[11] * x11 * x21 +
+         coeff[12] * x210 + coeff[13] * x11 * x22 + coeff[14] * x211 + coeff[15] * x212 + coeff[16] * x11 * x25 +
+         coeff[17] * x11 * x27 + coeff[18] * x11 * x26;
 }
-
diff --git a/SimMuon/CSCDigitizer/src/CSCDriftSim.cc b/SimMuon/CSCDigitizer/src/CSCDriftSim.cc
index 85415ffafaa2e..612787f8b3cd0 100644
--- a/SimMuon/CSCDigitizer/src/CSCDriftSim.cc
+++ b/SimMuon/CSCDigitizer/src/CSCDriftSim.cc
@@ -1,43 +1,42 @@
+#include "DataFormats/GeometryVector/interface/LocalVector.h"
+#include "DataFormats/Math/interface/Point3D.h"
+#include "DataFormats/Math/interface/Vector3D.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "SimMuon/CSCDigitizer/src/CSCDriftSim.h"
-#include "SimMuon/CSCDigitizer/src/CSCDetectorHit.h"
 #include "Geometry/CSCGeometry/interface/CSCChamberSpecs.h"
 #include "Geometry/CSCGeometry/interface/CSCLayer.h"
 #include "Geometry/CSCGeometry/interface/CSCLayerGeometry.h"
-#include "DataFormats/GeometryVector/interface/LocalVector.h"
-#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
-#include "DataFormats/Math/interface/Point3D.h"
-#include "DataFormats/Math/interface/Vector3D.h"
 #include "Math/GenVector/RotationZ.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
+#include "SimMuon/CSCDigitizer/src/CSCDetectorHit.h"
+#include "SimMuon/CSCDigitizer/src/CSCDriftSim.h"
 
 #include "CLHEP/Random/RandFlat.h"
 #include "CLHEP/Random/RandGaussQ.h"
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"  
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 
 #include <cmath>
 #include <iostream>
 
 static const int N_INTEGRAL_STEPS = 700;
 
-CSCDriftSim::CSCDriftSim() 
-: bz(0.), // should make these local variables
-  ycell(0.),
-  zcell(0.),
-  dNdEIntegral(N_INTEGRAL_STEPS, 0.),
-  STEP_SIZE(0.01),
-  ELECTRON_DIFFUSION_COEFF(0.0161),
-  theMagneticField(nullptr)
-{
+CSCDriftSim::CSCDriftSim()
+    : bz(0.),  // should make these local variables
+      ycell(0.),
+      zcell(0.),
+      dNdEIntegral(N_INTEGRAL_STEPS, 0.),
+      STEP_SIZE(0.01),
+      ELECTRON_DIFFUSION_COEFF(0.0161),
+      theMagneticField(nullptr) {
   // just initialize avalanche sim.  There has to be a better
   // way to take the integral of a function!
   double sum = 0.;
   int i;
-  for(i = 0; i < N_INTEGRAL_STEPS; ++i) {
-    if(i > 1) {
-      double xx = STEP_SIZE * (double(i) - 0.5 );
-      double dNdE = pow( xx, 0.38) * exp(-1.38*xx);
+  for (i = 0; i < N_INTEGRAL_STEPS; ++i) {
+    if (i > 1) {
+      double xx = STEP_SIZE * (double(i) - 0.5);
+      double dNdE = pow(xx, 0.38) * exp(-1.38 * xx);
 
       sum += dNdE;
     }
@@ -46,96 +45,91 @@ CSCDriftSim::CSCDriftSim()
   }
 
   // now normalize the whole map
-  for(i =  0; i < N_INTEGRAL_STEPS; ++i) {
+  for (i = 0; i < N_INTEGRAL_STEPS; ++i) {
     dNdEIntegral[i] /= sum;
   }
 }
 
+CSCDriftSim::~CSCDriftSim() {}
 
-CSCDriftSim::~CSCDriftSim()
-{
-}
-
-
-CSCDetectorHit 
-CSCDriftSim::getWireHit(const Local3DPoint & pos, const CSCLayer * layer,
-                        int nearestWire, const PSimHit & simHit,
-                        CLHEP::HepRandomEngine* engine) {
-
-  const CSCChamberSpecs * specs = layer->chamber()->specs();
-  const CSCLayerGeometry * geom = layer->geometry();
+CSCDetectorHit CSCDriftSim::getWireHit(const Local3DPoint &pos,
+                                       const CSCLayer *layer,
+                                       int nearestWire,
+                                       const PSimHit &simHit,
+                                       CLHEP::HepRandomEngine *engine) {
+  const CSCChamberSpecs *specs = layer->chamber()->specs();
+  const CSCLayerGeometry *geom = layer->geometry();
   math::LocalPoint clusterPos(pos.x(), pos.y(), pos.z());
-  LogTrace("CSCDriftSim") << "CSCDriftSim: ionization cluster at: " <<  pos; 
+  LogTrace("CSCDriftSim") << "CSCDriftSim: ionization cluster at: " << pos;
   // set the coordinate system with the x-axis along the nearest wire,
   // with the origin in the center of the chamber, on that wire.
-  math::LocalVector yShift(0, -1.*geom->yOfWire(nearestWire), 0.);
-  ROOT::Math::RotationZ rotation(-1.*geom->wireAngle());
+  math::LocalVector yShift(0, -1. * geom->yOfWire(nearestWire), 0.);
+  ROOT::Math::RotationZ rotation(-1. * geom->wireAngle());
 
   clusterPos = yShift + clusterPos;
   clusterPos = rotation * clusterPos;
   GlobalPoint globalPosition = layer->surface().toGlobal(pos);
   assert(theMagneticField != nullptr);
- 
+
   //  bz = theMagneticField->inTesla(globalPosition).z() * 10.;
 
   // We need magnetic field in _local_ coordinates
   // Interface now allows access in kGauss directly.
-  bz = layer->toLocal( theMagneticField->inKGauss( globalPosition ) ).z();
+  bz = layer->toLocal(theMagneticField->inKGauss(globalPosition)).z();
 
   // these subroutines label the coordinates in GEANT coords...
   ycell = clusterPos.z() / specs->anodeCathodeSpacing();
-  zcell = 2.*clusterPos.y() / specs->wireSpacing();
+  zcell = 2. * clusterPos.y() / specs->wireSpacing();
 
-  LogTrace("CSCDriftSim") << "CSCDriftSim: bz " << bz <<" avgDrift " << avgDrift()
-       << " wireAngle " << geom->wireAngle()
-       << " ycell " << ycell << " zcell " << zcell;
+  LogTrace("CSCDriftSim") << "CSCDriftSim: bz " << bz << " avgDrift " << avgDrift() << " wireAngle "
+                          << geom->wireAngle() << " ycell " << ycell << " zcell " << zcell;
 
   double avgPathLength, pathSigma, avgDriftTime, driftTimeSigma;
   static const float B_FIELD_CUT = 15.f;
-  if(fabs(bz) < B_FIELD_CUT) {
-    avgPathLength  = avgPathLengthLowB();
-    pathSigma      = pathSigmaLowB();
-    avgDriftTime   = avgDriftTimeLowB();
+  if (fabs(bz) < B_FIELD_CUT) {
+    avgPathLength = avgPathLengthLowB();
+    pathSigma = pathSigmaLowB();
+    avgDriftTime = avgDriftTimeLowB();
     driftTimeSigma = driftTimeSigmaLowB();
-  }
-  else {
-    avgPathLength  = avgPathLengthHighB();
-    pathSigma      = pathSigmaHighB();
-    avgDriftTime   = avgDriftTimeHighB();
+  } else {
+    avgPathLength = avgPathLengthHighB();
+    pathSigma = pathSigmaHighB();
+    avgDriftTime = avgDriftTimeHighB();
     driftTimeSigma = driftTimeSigmaHighB();
   }
 
-  // electron drift path length 
+  // electron drift path length
   double pathLength = std::max(CLHEP::RandGaussQ::shoot(engine, avgPathLength, pathSigma), 0.);
 
   // electron drift distance along the anode wire, including diffusion
   double diffusionSigma = ELECTRON_DIFFUSION_COEFF * sqrt(pathLength);
-  double x = clusterPos.x() + CLHEP::RandGaussQ::shoot(engine, avgDrift(), driftSigma())
-                            + CLHEP::RandGaussQ::shoot(engine, 0., diffusionSigma);
+  double x = clusterPos.x() + CLHEP::RandGaussQ::shoot(engine, avgDrift(), driftSigma()) +
+             CLHEP::RandGaussQ::shoot(engine, 0., diffusionSigma);
 
   // electron drift time
-  double driftTime  = std::max(CLHEP::RandGaussQ::shoot(engine, avgDriftTime, driftTimeSigma), 0.);
+  double driftTime = std::max(CLHEP::RandGaussQ::shoot(engine, avgDriftTime, driftTimeSigma), 0.);
 
   //@@ Parameters which should be defined outside the code
   // f_att is the fraction of drift electrons lost due to attachment
-  //static const double f_att = 0.5;
+  // static const double f_att = 0.5;
   static const double f_collected = 0.82;
 
-  // Avalanche charge, with fluctuation ('avalancheCharge()' is the fluctuation generator!)
-  //double charge = avalancheCharge() * f_att * f_collected * gasGain(layer->id()) * e_SI * 1.e15;
+  // Avalanche charge, with fluctuation ('avalancheCharge()' is the fluctuation
+  // generator!)
+  // double charge = avalancheCharge() * f_att * f_collected *
+  // gasGain(layer->id()) * e_SI * 1.e15;
   // doing fattachment by random chance of killing
   double charge = avalancheCharge(engine) * f_collected * gasGain(layer->id()) * e_SI * 1.e15;
 
   float t = simHit.tof() + driftTime;
-  LogTrace("CSCDriftSim") << "CSCDriftSim: tof = " << simHit.tof() << 
-      " driftTime = " << driftTime <<
-      " MEDH = " << CSCDetectorHit(nearestWire, charge, x, t, &simHit);
+  LogTrace("CSCDriftSim") << "CSCDriftSim: tof = " << simHit.tof() << " driftTime = " << driftTime
+                          << " MEDH = " << CSCDetectorHit(nearestWire, charge, x, t, &simHit);
   return CSCDetectorHit(nearestWire, charge, x, t, &simHit);
 }
 
 // Generate avalanche fluctuation
 #include <algorithm>
-double CSCDriftSim::avalancheCharge(CLHEP::HepRandomEngine* engine) {
+double CSCDriftSim::avalancheCharge(CLHEP::HepRandomEngine *engine) {
   double returnVal = 0.;
   // pick a random value along the dNdE integral
   double x = CLHEP::RandFlat::shoot(engine);
@@ -147,36 +141,33 @@ double CSCDriftSim::avalancheCharge(CLHEP::HepRandomEngine* engine) {
   }
   */
   // return position of first element with a value >= x
-  std::vector<double>::const_iterator p=lower_bound(dNdEIntegral.begin(),dNdEIntegral.end(),x);
-  if (p==dNdEIntegral.end()) i=isiz-1;
-  else i = p-dNdEIntegral.begin();
-			      
+  std::vector<double>::const_iterator p = lower_bound(dNdEIntegral.begin(), dNdEIntegral.end(), x);
+  if (p == dNdEIntegral.end())
+    i = isiz - 1;
+  else
+    i = p - dNdEIntegral.begin();
 
   // now extrapolate between values
-  if( i ==  isiz-1 ) {
-    //edm::LogInfo("CSCDriftSim") << "Funky integral in CSCDriftSim " << x;
+  if (i == isiz - 1) {
+    // edm::LogInfo("CSCDriftSim") << "Funky integral in CSCDriftSim " << x;
     returnVal = STEP_SIZE * double(i) * dNdEIntegral[i];
-  }
-  else {
+  } else {
     double x1 = dNdEIntegral[i];
-    double x2 = dNdEIntegral[i+1];
-    returnVal = STEP_SIZE * (double(i) + (x-x1)/(x2-x1)); 
+    double x2 = dNdEIntegral[i + 1];
+    returnVal = STEP_SIZE * (double(i) + (x - x1) / (x2 - x1));
   }
-  LogTrace("CSCDriftSim") << "CSCDriftSim: avalanche fluc " << returnVal << "  " << x ;
+  LogTrace("CSCDriftSim") << "CSCDriftSim: avalanche fluc " << returnVal << "  " << x;
 
-  return returnVal;  
+  return returnVal;
 }
 
-
-double CSCDriftSim::gasGain(const CSCDetId & detId) const
-{
+double CSCDriftSim::gasGain(const CSCDetId &detId) const {
   double result = 130000.;  // 1.30 E05
   // if ME1/1, add some extra gas gain to compensate
   // for a smaller gas gap
   int ring = detId.ring();
-  if(detId.station() == 1 && (ring == 1 || ring == 4))
-  {
-    result = 213000.; // 2.13 E05 ( to match real world as of Jan-2011)
+  if (detId.station() == 1 && (ring == 1 || ring == 4)) {
+    result = 213000.;  // 2.13 E05 ( to match real world as of Jan-2011)
   }
   return result;
 }
diff --git a/SimMuon/CSCDigitizer/src/CSCDriftSim.h b/SimMuon/CSCDigitizer/src/CSCDriftSim.h
index 31b9588b8edfb..562abdaf50d13 100644
--- a/SimMuon/CSCDigitizer/src/CSCDriftSim.h
+++ b/SimMuon/CSCDigitizer/src/CSCDriftSim.h
@@ -12,9 +12,9 @@
  * Last mod: <BR>
  * 30-Jun-00 ptc Doxygenate. <BR>
  *               Bug-fix in ctor: first bin of integral was 'nan'. <BR>
- *               Bug-trap in avalancheCharge(): very rarely could attempt access outside std::vector. <BR>
- * <p>
- * 01-08/00 vin  use binary search in avalancheCharge()<br>
+ *               Bug-trap in avalancheCharge(): very rarely could attempt access
+ * outside std::vector. <BR> <p> 01-08/00 vin  use binary search in
+ * avalancheCharge()<br>
  */
 
 #include <vector>
@@ -29,21 +29,22 @@ namespace CLHEP {
   class HepRandomEngine;
 }
 
-class CSCDriftSim
-{
+class CSCDriftSim {
 public:
   CSCDriftSim();
 
   ~CSCDriftSim();
 
-  /** takes a point, 
+  /** takes a point,
    and creates a signal on the wire
   */
-  CSCDetectorHit getWireHit(const Local3DPoint & ionClusterPosition,
-                            const CSCLayer *, int wire, const PSimHit & simHit,
-                            CLHEP::HepRandomEngine*);
+  CSCDetectorHit getWireHit(const Local3DPoint &ionClusterPosition,
+                            const CSCLayer *,
+                            int wire,
+                            const PSimHit &simHit,
+                            CLHEP::HepRandomEngine *);
 
-  void setMagneticField(const MagneticField * field) {theMagneticField = field;}
+  void setMagneticField(const MagneticField *field) { theMagneticField = field; }
 
 private:
   // helper functions
@@ -57,8 +58,8 @@ class CSCDriftSim
   double driftTimeSigmaHighB();
   double avgDrift() const;
   double driftSigma() const;
-  double avalancheCharge(CLHEP::HepRandomEngine*);
-  double gasGain(const CSCDetId & id) const;
+  double avalancheCharge(CLHEP::HepRandomEngine *);
+  double gasGain(const CSCDetId &id) const;
 
   // local magnetic field
   float bz;
@@ -70,7 +71,7 @@ class CSCDriftSim
 
   const double ELECTRON_DIFFUSION_COEFF;
 
-  const MagneticField * theMagneticField;
+  const MagneticField *theMagneticField;
 };
 
 #endif
diff --git a/SimMuon/CSCDigitizer/src/CSCGasCollisions.cc b/SimMuon/CSCDigitizer/src/CSCGasCollisions.cc
index 80933074644e7..7a945ce5df71b 100644
--- a/SimMuon/CSCDigitizer/src/CSCGasCollisions.cc
+++ b/SimMuon/CSCDigitizer/src/CSCGasCollisions.cc
@@ -1,31 +1,35 @@
 // This implements the CSC gas ionization simulation.
-// It requires the GEANT3-generated tables in the input file 
+// It requires the GEANT3-generated tables in the input file
 // (default) MuonData/EndcapData/collisions.dat
 
 // Outstanding problems to fix 15-Oct-2003
-// - ework must be re-tuned once eion or ework are removed before delta e range estimation.
+// - ework must be re-tuned once eion or ework are removed before delta e range
+// estimation.
 // - logic of long-range delta e's must be revisited.
-// - The code here needs to have diagnostic output removed, or reduced. PARTICULARLY filling of std::vectors!
-// - 'gap' is a misnomer, when simhit entry and exit don't coincide with gap edges
-//  so the CSCCrossGap might better be named as a simhit-related thing. 
+// - The code here needs to have diagnostic output removed, or reduced.
+// PARTICULARLY filling of std::vectors!
+// - 'gap' is a misnomer, when simhit entry and exit don't coincide with gap
+// edges
+//  so the CSCCrossGap might better be named as a simhit-related thing.
 // 22-Jan-2004 Corrected position of trap for 'infinite' loop while
 //    generating steps. Output files (debugV-flagged only) require SC flag.
 //    Increase deCut from 10 keV to 100 keV to accomodate protons!
-// Mar-2015: cout to LogVerbatim. Change superseded debugV-flagged code to flag from config.
+// Mar-2015: cout to LogVerbatim. Change superseded debugV-flagged code to flag
+// from config.
 
-#include "FWCore/Utilities/interface/Exception.h"
 #include "DataFormats/GeometryVector/interface/LocalVector.h"
-#include "SimMuon/CSCDigitizer/src/CSCGasCollisions.h"
-#include "FWCore/ParameterSet/interface/FileInPath.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/FileInPath.h"
+#include "FWCore/Utilities/interface/Exception.h"
+#include "SimMuon/CSCDigitizer/src/CSCGasCollisions.h"
 
 #include "CLHEP/Random/RandExponential.h"
 #include "CLHEP/Random/RandFlat.h"
 
 // Only needed if file writing code is activated again
 // #include <iostream>
-#include <fstream>
 #include <cassert>
+#include <fstream>
 
 // stdlib math functions
 // for 'abs':
@@ -39,8 +43,8 @@
 // for 'greater' and 'less':
 #include <functional>
 // for 'accumulate':
-#include <numeric>
 #include <iterator>
+#include <numeric>
 
 using namespace std;
 
@@ -51,25 +55,29 @@ CO2   13.7 eV
 CF4    17.8
 to arrive at a weighted average of eion = 14.95 */
 
-CSCGasCollisions::CSCGasCollisions( const edm::ParameterSet & pset ) 
- : me("CSCGasCollisions"),
-  gasDensity( 2.1416e-03 ), 
-  deCut( 1.e05 ), eion( 14.95 ), ework( 34.0 ), clusterExtent( 0.001 ),
-  theGammaBins(N_GAMMA, 0.), theEnergyBins(N_ENERGY, 0.), 
-  theCollisionTable(N_ENTRIES, 0.), theCrossGap( nullptr ),
-  theParticleDataTable(nullptr),
-  saveGasCollisions_ ( false ), dumpGasCollisions_( false )
-{
-
+CSCGasCollisions::CSCGasCollisions(const edm::ParameterSet &pset)
+    : me("CSCGasCollisions"),
+      gasDensity(2.1416e-03),
+      deCut(1.e05),
+      eion(14.95),
+      ework(34.0),
+      clusterExtent(0.001),
+      theGammaBins(N_GAMMA, 0.),
+      theEnergyBins(N_ENERGY, 0.),
+      theCollisionTable(N_ENTRIES, 0.),
+      theCrossGap(nullptr),
+      theParticleDataTable(nullptr),
+      saveGasCollisions_(false),
+      dumpGasCollisions_(false) {
   dumpGasCollisions_ = pset.getUntrackedParameter<bool>("dumpGasCollisions");
 
-  edm::LogInfo(me) << "Constructing a " << me << ":"; 
+  edm::LogInfo(me) << "Constructing a " << me << ":";
   edm::LogInfo(me) << "gas density = " << gasDensity << " g/cm3";
-  edm::LogInfo(me) << "max eloss per collision allowed = " << deCut/1000. 
-       << " keV (for higher elosses, hits should have been simulated.)";
+  edm::LogInfo(me) << "max eloss per collision allowed = " << deCut / 1000.
+                   << " keV (for higher elosses, hits should have been simulated.)";
   edm::LogInfo(me) << "ionization threshold = " << eion << " eV";
   edm::LogInfo(me) << "effective work function = " << ework << " eV";
-  edm::LogInfo(me) << "cluster extent = " << clusterExtent*1.e04 << " micrometres";
+  edm::LogInfo(me) << "cluster extent = " << clusterExtent * 1.e04 << " micrometres";
   edm::LogInfo(me) << "dump gas collision and simhit information? " << dumpGasCollisions();
   edm::LogInfo(me) << "save gas collision information? -NOT YET IMPLEMENTED- " << saveGasCollisions();
 
@@ -82,7 +90,6 @@ CSCGasCollisions::~CSCGasCollisions() {
 }
 
 void CSCGasCollisions::readCollisionTable() {
-
   // I'd prefer to allow comments in the data file which means
   // complications of reading line-by-line and then item-by-item.
 
@@ -92,16 +99,16 @@ void CSCGasCollisions::readCollisionTable() {
 
   // We use the default CMSSW data file path
   // We use the default file name 'collisions.dat'
-   
+
   // This can be reset in .orcarc by SimpleConfigurable
   //    Muon:Endcap:CollisionsFile
 
   // TODO make configurable
   string colliFile = "SimMuon/CSCDigitizer/data/collisions.dat";
-  edm::FileInPath f1{ colliFile };
+  edm::FileInPath f1{colliFile};
   edm::LogInfo(me) << ": reading " << f1.fullPath();
 
-  ifstream  fin{ f1.fullPath() };
+  ifstream fin{f1.fullPath()};
 
   if (fin.fail()) {
     string errorMessage = "Cannot open input file " + f1.fullPath();
@@ -109,163 +116,158 @@ void CSCGasCollisions::readCollisionTable() {
     throw cms::Exception(errorMessage);
   }
 
-  fin.clear( );                  // Clear eof read status
-  fin.seekg( 0, ios::beg );      // Position at start of file
+  fin.clear();             // Clear eof read status
+  fin.seekg(0, ios::beg);  // Position at start of file
 
   // @@ We had better have the right sizes everywhere or all
   // hell will break loose. There's no trapping.
   LogTrace(me) << "Reading gamma bins";
   int j = 0;
-  for(int i = 0; i<N_GAMMA; ++i) {
+  for (int i = 0; i < N_GAMMA; ++i) {
     fin >> theGammaBins[i];
     LogTrace(me) << ++j << "   " << theGammaBins[i];
   }
 
   j = 0;
   LogTrace(me) << "Reading energy bins \n";
-  for(int i = 0; i<N_ENERGY; ++i) {
-     fin >> theEnergyBins[i];
-     LogTrace(me) << ++j << "   " << theEnergyBins[i];
+  for (int i = 0; i < N_ENERGY; ++i) {
+    fin >> theEnergyBins[i];
+    LogTrace(me) << ++j << "   " << theEnergyBins[i];
   }
 
   j = 0;
   LogTrace(me) << "Reading collisions table \n";
 
-  for(int i = 0; i<N_ENTRIES; ++i) {
-     fin >> theCollisionTable[i];
-     LogTrace(me) << ++j << "   " << theCollisionTable[i];
+  for (int i = 0; i < N_ENTRIES; ++i) {
+    fin >> theCollisionTable[i];
+    LogTrace(me) << ++j << "   " << theCollisionTable[i];
   }
 
   fin.close();
 }
 
+void CSCGasCollisions::setParticleDataTable(const ParticleDataTable *pdt) { theParticleDataTable = pdt; }
 
-void CSCGasCollisions::setParticleDataTable(const ParticleDataTable * pdt)
-{
-  theParticleDataTable = pdt;
-}
-
+void CSCGasCollisions::simulate(const PSimHit &simhit,
+                                std::vector<LocalPoint> &positions,
+                                std::vector<int> &electrons,
+                                CLHEP::HepRandomEngine *engine) {
+  const float epsilonL = 0.01;  // Shortness of simhit 'length'
+  //  const float max_gap_z = 1.5;                     // Gas gaps are 0.5
+  //  or 1.0 cm
 
-void CSCGasCollisions::simulate( const PSimHit& simhit, 
-   std::vector<LocalPoint>& positions, std::vector<int>& electrons, CLHEP::HepRandomEngine* engine ) {
+  // Note that what I call the 'gap' may in fact be the 'length' of a PSimHit
+  // which does not start and end on the gap edges. This confuses the
+  // nomenclature at least.
 
-  const float epsilonL = 0.01;                     // Shortness of simhit 'length'
-  //  const float max_gap_z = 1.5;                     // Gas gaps are 0.5 or 1.0 cm
-
-  // Note that what I call the 'gap' may in fact be the 'length' of a PSimHit which
-  // does not start and end on the gap edges. This confuses the nomenclature at least.
-
-  double mom    = simhit.pabs();                   // in GeV/c - see MuonSensitiveDetector.cc
+  double mom = simhit.pabs();  // in GeV/c - see MuonSensitiveDetector.cc
   //  int iam       = simhit.particleType();           // PDG type
-  delete theCrossGap;                              // before building new one
+  delete theCrossGap;  // before building new one
   assert(theParticleDataTable != nullptr);
-  ParticleData const * particle = theParticleDataTable->particle( simhit.particleType() );
-  double mass = 0.105658; // assume a muon
-  if(particle == nullptr)
-  {
-     edm::LogError("CSCGasCollisions") << "Cannot find particle of type " << simhit.particleType()
-            << " in the PDT";
-  }
-  else 
-  {
+  ParticleData const *particle = theParticleDataTable->particle(simhit.particleType());
+  double mass = 0.105658;  // assume a muon
+  if (particle == nullptr) {
+    edm::LogError("CSCGasCollisions") << "Cannot find particle of type " << simhit.particleType() << " in the PDT";
+  } else {
     mass = particle->mass();
   }
 
-  theCrossGap   = new CSCCrossGap( mass, mom, simhit.exitPoint() - simhit.entryPoint() );
+  theCrossGap = new CSCCrossGap(mass, mom, simhit.exitPoint() - simhit.entryPoint());
   float gapSize = theCrossGap->length();
 
   // Test the simhit 'length' (beware of angular effects)
   //  if ( gapSize <= epsilonL || gapSize > max_gap_z ) {
-  if ( gapSize <= epsilonL ) {
-    edm::LogVerbatim("CSCDigitizer") 
-      << "[CSCGasCollisions] WARNING! simhit entry and exit are too close - skipping simhit:"
-      << "\n entry = " << simhit.entryPoint()
-      << ": exit  = " << simhit.exitPoint()
-      << "\n particle type = " << simhit.particleType() << " : momentum = " << simhit.pabs()
-      << " GeV/c : energy loss = " << simhit.energyLoss()*1.E06 << " keV"
-      << ", gapSize = " << gapSize << " cm (< epsilonL = " << epsilonL << " cm)";
-    return; //@@ Just skip this PSimHit
+  if (gapSize <= epsilonL) {
+    edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] WARNING! simhit entry and exit are too close - "
+                                        "skipping simhit:"
+                                     << "\n entry = " << simhit.entryPoint() << ": exit  = " << simhit.exitPoint()
+                                     << "\n particle type = " << simhit.particleType()
+                                     << " : momentum = " << simhit.pabs()
+                                     << " GeV/c : energy loss = " << simhit.energyLoss() * 1.E06 << " keV"
+                                     << ", gapSize = " << gapSize << " cm (< epsilonL = " << epsilonL << " cm)";
+    return;  //@@ Just skip this PSimHit
   }
 
   // Interpolate the table for current gamma value
   // Extract collisions binned by energy loss values, for this gamma
   std::vector<float> collisions(N_ENERGY);
-  double loggam = theCrossGap->logGamma(); 
-  fillCollisionsForThisGamma( static_cast<float>(loggam), collisions );
+  double loggam = theCrossGap->logGamma();
+  fillCollisionsForThisGamma(static_cast<float>(loggam), collisions);
 
-  double anmin = exp(collisions[N_ENERGY-1]);
+  double anmin = exp(collisions[N_ENERGY - 1]);
   double anmax = exp(collisions[0]);
-  double amu   = anmax - anmin;
+  double amu = anmax - anmin;
 
-  LogTrace(me) << "collisions extremes = " << collisions[N_ENERGY-1]
-     << ", " << collisions[0] << "\n"
-     << "anmin = " << anmin << ", anmax = " << anmax << "\n"
-     << "amu = " << amu << "\n";
+  LogTrace(me) << "collisions extremes = " << collisions[N_ENERGY - 1] << ", " << collisions[0] << "\n"
+               << "anmin = " << anmin << ", anmax = " << anmax << "\n"
+               << "amu = " << amu << "\n";
 
-  float dedx       = 0.; // total energy loss
-  double sum_steps = 0.; // total distance across gap (along simhit direction)
-  int n_steps      = 0;  // no. of steps/primary collisions
-  int n_try        = 0;  // no. of tries to generate steps
-  double step      = -1.; // Sentinel for start
+  float dedx = 0.;        // total energy loss
+  double sum_steps = 0.;  // total distance across gap (along simhit direction)
+  int n_steps = 0;        // no. of steps/primary collisions
+  int n_try = 0;          // no. of tries to generate steps
+  double step = -1.;      // Sentinel for start
 
-  LocalPoint layerLocalPoint( simhit.entryPoint() );
+  LocalPoint layerLocalPoint(simhit.entryPoint());
 
   // step/primary collision loop
-  while ( sum_steps < gapSize) {
+  while (sum_steps < gapSize) {
     ++n_try;
-    if ( n_try > MAX_STEPS ) {
+    if (n_try > MAX_STEPS) {
       int maxst = MAX_STEPS;
-      edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] WARNING! n_try = " << n_try 
-	   << " is > MAX_STEPS = " << maxst << " - skipping simhit:"
-           << "\n entry = " << simhit.entryPoint()
-           << ": exit  = " << simhit.exitPoint()
-           << "\n particle type = " << simhit.particleType() << " : momentum = " << simhit.pabs()
-           << " GeV/c : energy loss = " << simhit.energyLoss()*1.E06 << " keV"
-           << "\n gapSize = " << gapSize << " cm, last step = " << step 
-           << " cm, sum_steps = " << sum_steps << " cm, n_steps = " << n_steps;
+      edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] WARNING! n_try = " << n_try
+                                       << " is > MAX_STEPS = " << maxst << " - skipping simhit:"
+                                       << "\n entry = " << simhit.entryPoint() << ": exit  = " << simhit.exitPoint()
+                                       << "\n particle type = " << simhit.particleType()
+                                       << " : momentum = " << simhit.pabs()
+                                       << " GeV/c : energy loss = " << simhit.energyLoss() * 1.E06 << " keV"
+                                       << "\n gapSize = " << gapSize << " cm, last step = " << step
+                                       << " cm, sum_steps = " << sum_steps << " cm, n_steps = " << n_steps;
       break;
     }
-    step = generateStep( amu, engine );
-    if ( sum_steps + step > gapSize ) break; // this step goes too far
+    step = generateStep(amu, engine);
+    if (sum_steps + step > gapSize)
+      break;  // this step goes too far
 
-    float eloss = generateEnergyLoss( amu, anmin, anmax, collisions, engine );
+    float eloss = generateEnergyLoss(amu, anmin, anmax, collisions, engine);
 
     // Is the eloss too large? (then GEANT should have produced hits!)
-    if ( eloss > deCut ) {
-      edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] WARNING! eloss = " << eloss 
-              << " eV is too large (> " << deCut << " eV) - trying another collision";
-      continue; // to generate another collision/step
+    if (eloss > deCut) {
+      edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] WARNING! eloss = " << eloss << " eV is too large (> "
+                                       << deCut << " eV) - trying another collision";
+      continue;  // to generate another collision/step
     }
 
-    dedx      += eloss; // the energy lost from the ionizing particle
+    dedx += eloss;      // the energy lost from the ionizing particle
     sum_steps += step;  // the position of the ionizing particle
     ++n_steps;          // the number of primary collisions
-    
-    if (n_steps > MAX_STEPS ) { // Extra-careful trap for bizarreness
-        edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] WARNING! " << n_steps 
-             << " is too many steps -  skipping simhit:"
-             << "\n entry = " << simhit.entryPoint()
-             << ": exit  = " << simhit.exitPoint()
-             << "\n particle type = " << simhit.particleType() << " : momentum = " << simhit.pabs()
-             << " GeV/c : energy loss = " << simhit.energyLoss()*1.E06 << " keV"
-	     << "\ngapSize=" << gapSize << " cm, last step=" << step << " cm, sum_steps=" << sum_steps << " cm";
-        break;
+
+    if (n_steps > MAX_STEPS) {  // Extra-careful trap for bizarreness
+      edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] WARNING! " << n_steps
+                                       << " is too many steps -  skipping simhit:"
+                                       << "\n entry = " << simhit.entryPoint() << ": exit  = " << simhit.exitPoint()
+                                       << "\n particle type = " << simhit.particleType()
+                                       << " : momentum = " << simhit.pabs()
+                                       << " GeV/c : energy loss = " << simhit.energyLoss() * 1.E06 << " keV"
+                                       << "\ngapSize=" << gapSize << " cm, last step=" << step
+                                       << " cm, sum_steps=" << sum_steps << " cm";
+      break;
     }
     LogTrace(me) << "sum_steps = " << sum_steps << " cm , dedx = " << dedx << " eV";
-    
-    // Generate ionization. 
+
+    // Generate ionization.
     // eion is the minimum energy at which ionization can occur in the gas
-    if ( eloss > eion  ) {
-      layerLocalPoint += step * theCrossGap->unitVector(); // local point where the collision occurs
-      ionize( eloss, layerLocalPoint );
-    }
-    else {
+    if (eloss > eion) {
+      layerLocalPoint += step * theCrossGap->unitVector();  // local point where the collision occurs
+      ionize(eloss, layerLocalPoint);
+    } else {
       LogTrace(me) << "Energy available = " << eloss << " eV is too low for ionization (< eion = " << eion << " eV)";
     }
 
-  } // step/collision loop
+  }  // step/collision loop
 
-  if ( dumpGasCollisions() ) writeSummary( n_try, n_steps, sum_steps, dedx, simhit );
+  if (dumpGasCollisions())
+    writeSummary(n_try, n_steps, sum_steps, dedx, simhit);
 
   // Return values in two container arguments
   positions = theCrossGap->ionClusters();
@@ -273,309 +275,308 @@ void CSCGasCollisions::simulate( const PSimHit& simhit,
   return;
 }
 
-double CSCGasCollisions::generateStep( double avCollisions, CLHEP::HepRandomEngine* engine ) const
-{
-// Generate a m.f.p.  (1/avCollisions = cm/collision)
-  double step = (CLHEP::RandExponential::shoot(engine))/avCollisions;
+double CSCGasCollisions::generateStep(double avCollisions, CLHEP::HepRandomEngine *engine) const {
+  // Generate a m.f.p.  (1/avCollisions = cm/collision)
+  double step = (CLHEP::RandExponential::shoot(engine)) / avCollisions;
 
-// Without using CLHEP: approx random exponential by...
-//    double da = double(rand())/double(RAND_MAX);
-//    double step = -log(1.-da)/avCollisions;
+  // Without using CLHEP: approx random exponential by...
+  //    double da = double(rand())/double(RAND_MAX);
+  //    double step = -log(1.-da)/avCollisions;
 
-  LogTrace(me)  << " step = " << step << " cm";
-    // Next line only used to fill a container of 'step's for later diagnostic dumps
-  if ( dumpGasCollisions() ) theCrossGap->addStep( step );
-    return step;
+  LogTrace(me) << " step = " << step << " cm";
+  // Next line only used to fill a container of 'step's for later diagnostic
+  // dumps
+  if (dumpGasCollisions())
+    theCrossGap->addStep(step);
+  return step;
 }
 
-float CSCGasCollisions::generateEnergyLoss( double avCollisions, double anmin, double anmax, 
-                   const std::vector<float>& collisions, CLHEP::HepRandomEngine* engine ) const
-{
-// Generate a no. of collisions between collisions[0] and [N_ENERGY-1]
-   float lnColl = log(CLHEP::RandFlat::shoot(engine, anmin, anmax));
-
-// Without using CLHEP: approx random between anmin and anmax
-//    double ra = double(rand())/double(RAND_MAX)*avCollisions;
-//    cout << "ra = " << ra << std::endl;
-//    float lnColl = static_cast<float>( log( ra ) );
-
-    // Find energy loss for that number
-    float lnE    = lnEnergyLoss( lnColl, collisions );
-    float eloss  = exp(lnE);
-    // Compensate if gamma was actually below 1.1
-    if ( theCrossGap->gamma() < 1.1 ) eloss = eloss * 0.173554/theCrossGap->beta2();
-    LogTrace(me) << "eloss = " << eloss << " eV";
-    // Next line only used to fill container of eloss's for later diagnostic dumps
-    if ( dumpGasCollisions() ) theCrossGap->addEloss( eloss );
-    return eloss;
+float CSCGasCollisions::generateEnergyLoss(double avCollisions,
+                                           double anmin,
+                                           double anmax,
+                                           const std::vector<float> &collisions,
+                                           CLHEP::HepRandomEngine *engine) const {
+  // Generate a no. of collisions between collisions[0] and [N_ENERGY-1]
+  float lnColl = log(CLHEP::RandFlat::shoot(engine, anmin, anmax));
+
+  // Without using CLHEP: approx random between anmin and anmax
+  //    double ra = double(rand())/double(RAND_MAX)*avCollisions;
+  //    cout << "ra = " << ra << std::endl;
+  //    float lnColl = static_cast<float>( log( ra ) );
+
+  // Find energy loss for that number
+  float lnE = lnEnergyLoss(lnColl, collisions);
+  float eloss = exp(lnE);
+  // Compensate if gamma was actually below 1.1
+  if (theCrossGap->gamma() < 1.1)
+    eloss = eloss * 0.173554 / theCrossGap->beta2();
+  LogTrace(me) << "eloss = " << eloss << " eV";
+  // Next line only used to fill container of eloss's for later diagnostic dumps
+  if (dumpGasCollisions())
+    theCrossGap->addEloss(eloss);
+  return eloss;
 }
 
-void  CSCGasCollisions::ionize( double energyAvailable, LocalPoint startHere ) const
-{
-  while ( energyAvailable > eion ) {
-    LogTrace(me) << "     NEW CLUSTER " << theCrossGap->noOfClusters() + 1 <<
-	       " AT " << startHere;
-    LocalPoint newCluster( startHere );
+void CSCGasCollisions::ionize(double energyAvailable, LocalPoint startHere) const {
+  while (energyAvailable > eion) {
+    LogTrace(me) << "     NEW CLUSTER " << theCrossGap->noOfClusters() + 1 << " AT " << startHere;
+    LocalPoint newCluster(startHere);
     theCrossGap->addCluster(newCluster);
 
-  //@@ I consider NOT subtracting eion before calculating range to be a bug.
-  //@@ But this changes tuning of the algorithm so leave it until after the big rush to 7_5_0
-  //@@  energyAvailable -= eion; 
+    //@@ I consider NOT subtracting eion before calculating range to be a bug.
+    //@@ But this changes tuning of the algorithm so leave it until after the
+    // big rush to 7_5_0
+    //@@  energyAvailable -= eion;
 
-  // Sauli CERN 77-09: delta e range with E in MeV (Sauli references Kobetich & Katz 1968
-  // but that has nothing to do with this expression! He seems to have  made a mistake.)
-    // I found the Sauli-quoted relationship in R. Glocker, Z. Naturforsch. Ba, 129 (1948):
-    // delta e range R = aE^n with a=710, n=1.72 for E in MeV and R in mg/cm^2
-    // applicable over the range E = 0.001 to 0.3 MeV.
+    // Sauli CERN 77-09: delta e range with E in MeV (Sauli references Kobetich
+    // & Katz 1968 but that has nothing to do with this expression! He seems to
+    // have  made a mistake.) I found the Sauli-quoted relationship in R.
+    // Glocker, Z. Naturforsch. Ba, 129 (1948): delta e range R = aE^n with
+    // a=710, n=1.72 for E in MeV and R in mg/cm^2 applicable over the range E =
+    // 0.001 to 0.3 MeV.
 
-  // Take HALF that range. //@@ Why? Why not...
-    double range = 0.5 * (0.71/gasDensity)*pow( energyAvailable*1.E-6, 1.72);
+    // Take HALF that range. //@@ Why? Why not...
+    double range = 0.5 * (0.71 / gasDensity) * pow(energyAvailable * 1.E-6, 1.72);
     LogTrace(me) << " range = " << range << " cm";
-    if ( range < clusterExtent ) {
-
+    if (range < clusterExtent) {
       // short-range delta e
-          // How many electrons can we make? Now use *average* energy for ionization (not *minimum*)
-      int nelec = static_cast<int>(energyAvailable/ework);
+      // How many electrons can we make? Now use *average* energy for ionization
+      // (not *minimum*)
+      int nelec = static_cast<int>(energyAvailable / ework);
       LogTrace(me) << "short-range delta energy in = " << energyAvailable << " eV";
-      //energyAvailable -= nelec*(energyAvailable/ework);
-      energyAvailable -= nelec*ework;
-	    // If still above eion (minimum, not average) add one more e
-      if ( energyAvailable > eion ) {
+      // energyAvailable -= nelec*(energyAvailable/ework);
+      energyAvailable -= nelec * ework;
+      // If still above eion (minimum, not average) add one more e
+      if (energyAvailable > eion) {
         ++nelec;
         energyAvailable -= eion;
       }
       LogTrace(me) << "short-range delta energy out = " << energyAvailable << " eV, nelec = " << nelec;
-      theCrossGap->addElectrons( nelec );
+      theCrossGap->addElectrons(nelec);
       break;
 
-     }
-     else {
+    } else {
       // long-range delta e
-         LogTrace(me) << "long-range delta \n"
-             << "no. of electrons in cluster now = " << theCrossGap->noOfElectrons();
-         theCrossGap->addElectrons( 1 ); // Position is at startHere still
-
-          bool new_range = false;
-          while ( !new_range && (energyAvailable>ework) ) {
-       	    energyAvailable -= ework;
-            while ( energyAvailable > eion ) {
-              double range2 = 0.5 * 0.71/gasDensity*pow( 1.E-6*energyAvailable, 1.72);
-              double drange = range - range2;
-              LogTrace(me) << "  energy left = " << energyAvailable << 
-		" eV, range2 = " << range2 << " cm, drange = " << drange << " cm";
-              if ( drange < clusterExtent ) {
-                theCrossGap->addElectronToBack(); // increment last element
-              }
-              else {
-                startHere += drange*theCrossGap->unitVector(); // update delta e start position
-                range = range2;                       // update range
-                new_range = true;                     // Test range again
-                LogTrace(me) << "reset range to range2 = " << range 
-                             << " from startHere = " << startHere << "  and iterate";
-              }
-       	      break; // out of inner while energyAvailable>eion
-
-            } // inner while energyAvailable>eion
-
-          } // while !new_range && energyAvailable>ework
-
-	  // energyAvailable now less than ework, but still may be over eion...add an e
-          if ( energyAvailable > eion ) {
-            energyAvailable -= ework; // yes, it may go negative
-            theCrossGap->addElectronToBack(); // add one more e
+      LogTrace(me) << "long-range delta \n"
+                   << "no. of electrons in cluster now = " << theCrossGap->noOfElectrons();
+      theCrossGap->addElectrons(1);  // Position is at startHere still
+
+      bool new_range = false;
+      while (!new_range && (energyAvailable > ework)) {
+        energyAvailable -= ework;
+        while (energyAvailable > eion) {
+          double range2 = 0.5 * 0.71 / gasDensity * pow(1.E-6 * energyAvailable, 1.72);
+          double drange = range - range2;
+          LogTrace(me) << "  energy left = " << energyAvailable << " eV, range2 = " << range2
+                       << " cm, drange = " << drange << " cm";
+          if (drange < clusterExtent) {
+            theCrossGap->addElectronToBack();  // increment last element
+          } else {
+            startHere += drange * theCrossGap->unitVector();  // update delta e start position
+            range = range2;                                   // update range
+            new_range = true;                                 // Test range again
+            LogTrace(me) << "reset range to range2 = " << range << " from startHere = " << startHere << "  and iterate";
           }
+          break;  // out of inner while energyAvailable>eion
+
+        }  // inner while energyAvailable>eion
 
-        } // if range
+      }  // while !new_range && energyAvailable>ework
 
-      } // outer while energyAvailable>eion
+      // energyAvailable now less than ework, but still may be over eion...add
+      // an e
+      if (energyAvailable > eion) {
+        energyAvailable -= ework;          // yes, it may go negative
+        theCrossGap->addElectronToBack();  // add one more e
+      }
+
+    }  // if range
+
+  }  // outer while energyAvailable>eion
 }
 
-void CSCGasCollisions::writeSummary( int n_try, int n_steps, double sum_steps, float dedx, 
-           const PSimHit& simhit ) const
-{
+void CSCGasCollisions::writeSummary(int n_try, int n_steps, double sum_steps, float dedx, const PSimHit &simhit) const {
   // Switched from std::cout to LogVerbatim, Mar 2015
 
-  std::vector<LocalPoint> ion_clusters   = theCrossGap->ionClusters();
-  std::vector<int> electrons             = theCrossGap->electrons();
-  std::vector<float> elosses             = theCrossGap->eLossPerStep();
-  std::vector<double> steps              = theCrossGap->stepLengths();
+  std::vector<LocalPoint> ion_clusters = theCrossGap->ionClusters();
+  std::vector<int> electrons = theCrossGap->electrons();
+  std::vector<float> elosses = theCrossGap->eLossPerStep();
+  std::vector<double> steps = theCrossGap->stepLengths();
 
   edm::LogVerbatim("CSCDigitizer") << "------------------"
-                                 << "\nAFTER CROSSING GAP";
+                                   << "\nAFTER CROSSING GAP";
   /*
-  edm::LogVerbatim("CSCDigitizer") << "no. of steps tried             = " << n_try
-                                 << "\nno. of steps from theCrossGap  = " << theCrossGap->noOfSteps()
-				 << "\nsize of steps vector           = " << steps.size();
-                                 
-  edm::LogVerbatim("CSCDigitizer") << "no. of collisions (steps)      = " << n_steps
-			         << "\nsize of elosses vector         = " << elosses.size()
-				 << "\nsize of ion clusters vector    = " << ion_clusters.size()
-                                 << "\nsize of electrons vector       = " << electrons.size();
+  edm::LogVerbatim("CSCDigitizer") << "no. of steps tried             = " <<
+  n_try
+                                 << "\nno. of steps from theCrossGap  = " <<
+  theCrossGap->noOfSteps()
+                                 << "\nsize of steps vector           = " <<
+  steps.size();
+
+  edm::LogVerbatim("CSCDigitizer") << "no. of collisions (steps)      = " <<
+  n_steps
+                                 << "\nsize of elosses vector         = " <<
+  elosses.size()
+                                 << "\nsize of ion clusters vector    = " <<
+  ion_clusters.size()
+                                 << "\nsize of electrons vector       = " <<
+  electrons.size();
   */
 
-  size_t nsteps = n_steps; // force ridiculous type conversion
-  size_t mstep = steps.size() - 1; // final step gets filled but is outside gas gap - unless we reach MAX_STEPS
-  if ( (nsteps != MAX_STEPS) && (nsteps != mstep) ) {
-    edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] WARNING! no. of steps = " << nsteps 
+  size_t nsteps = n_steps;          // force ridiculous type conversion
+  size_t mstep = steps.size() - 1;  // final step gets filled but is outside gas
+                                    // gap - unless we reach MAX_STEPS
+  if ((nsteps != MAX_STEPS) && (nsteps != mstep)) {
+    edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] WARNING! no. of steps = " << nsteps
                                      << " .ne. steps.size()-1 = " << mstep;
   }
   size_t meloss = elosses.size();
 
-  if ( nsteps != meloss ){
-    edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] WARNING! no. of steps = " << nsteps 
+  if (nsteps != meloss) {
+    edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] WARNING! no. of steps = " << nsteps
                                      << " .ne. no. of elosses = " << meloss;
-  }
-  else {
+  } else {
     edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] # / length of step / energy loss per collision:";
-    for ( size_t i = 0; i != nsteps; ++i ) {
-      edm::LogVerbatim("CSCDigitizer") << i+1 << " / S: " << steps[i] << " / E: " << elosses[i];
+    for (size_t i = 0; i != nsteps; ++i) {
+      edm::LogVerbatim("CSCDigitizer") << i + 1 << " / S: " << steps[i] << " / E: " << elosses[i];
     }
   }
 
   size_t mclus = ion_clusters.size();
   size_t melec = electrons.size();
 
-  if ( mclus != melec ){
-    edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] WARNING! size of cluster vector = " << mclus 
-            << " .ne. size of electrons vector = " << melec;
-  }
-  else {
-    edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] # / postion of cluster / electrons per cluster: ";
-    for ( size_t i = 0; i != mclus; ++i ) {
-      edm::LogVerbatim("CSCDigitizer") << i+1 <<  " / I: " << ion_clusters[i] << " / E: " << electrons[i];
+  if (mclus != melec) {
+    edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] WARNING! size of cluster vector = " << mclus
+                                     << " .ne. size of electrons vector = " << melec;
+  } else {
+    edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] # / postion of "
+                                        "cluster / electrons per cluster: ";
+    for (size_t i = 0; i != mclus; ++i) {
+      edm::LogVerbatim("CSCDigitizer") << i + 1 << " / I: " << ion_clusters[i] << " / E: " << electrons[i];
     }
   }
 
-  int n_ic = count_if( elosses.begin(), elosses.end(), [&](auto c){return c > this->eion;} );
+  int n_ic = count_if(elosses.begin(), elosses.end(), [&](auto c) { return c > this->eion; });
 
   edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] total no. of collision steps = " << n_steps;
   edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] total sum of steps = " << sum_steps << " cm";
-  if ( nsteps > 0 ) edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] average step length = " << 
-      sum_steps/float(nsteps) << " cm";
-  edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] total energy loss across gap = " << 
-      dedx << " eV = " << dedx/1000. << " keV";
-  edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] no. of primary ionizing collisions across gap = no. with eloss > eion = "
-      << eion << " eV = " << n_ic;
-  if ( nsteps > 0 ) edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] average energy loss/collision = " <<  
-      dedx/float(nsteps) << " eV";
-
-  std::vector<int>::const_iterator bigger = find(electrons.begin(), electrons.end(), 0 );
-  if ( bigger != electrons.end() ) {
+  if (nsteps > 0)
+    edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] average step length = " << sum_steps / float(nsteps)
+                                     << " cm";
+  edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] total energy loss across gap = " << dedx
+                                   << " eV = " << dedx / 1000. << " keV";
+  edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] no. of primary ionizing collisions across gap = "
+                                      "no. with eloss > eion = "
+                                   << eion << " eV = " << n_ic;
+  if (nsteps > 0)
+    edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] average energy loss/collision = " << dedx / float(nsteps)
+                                     << " eV";
+
+  std::vector<int>::const_iterator bigger = find(electrons.begin(), electrons.end(), 0);
+  if (bigger != electrons.end()) {
     edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] TROUBLE! There is a cluster with 0 electrons.";
   }
 
-  int n_e = accumulate(electrons.begin(), electrons.end(), 0 );
+  int n_e = accumulate(electrons.begin(), electrons.end(), 0);
 
   edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] SUMMARY: simhit"
-      << "\n entry = " << simhit.entryPoint()
-      << ": exit  = " << simhit.exitPoint()
-      << "\n particle type = " << simhit.particleType() << " : momentum = " << simhit.pabs()
-      << " GeV/c : energy loss = " << simhit.energyLoss()*1.E06 << " keV";
-
-  if ( nsteps > 0 ) {
-    edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] SUMMARY: ionization" 
-      << " : steps= " << nsteps << " : sum(steps)= " << sum_steps << " cm : <step>= " 
-      << sum_steps/float(nsteps) << " cm"
-      << " : ionizing= " << n_ic << " : ionclus= " << mclus << " : total e= " << n_e
-      << " : <dedx/step>= " << dedx/float(nsteps)
-      << " eV : <e/ionclus>= " << float(n_e)/float(mclus)
-      << " : dedx= " << dedx/1000. << " keV";
-  }
-  else {
+                                   << "\n entry = " << simhit.entryPoint() << ": exit  = " << simhit.exitPoint()
+                                   << "\n particle type = " << simhit.particleType()
+                                   << " : momentum = " << simhit.pabs()
+                                   << " GeV/c : energy loss = " << simhit.energyLoss() * 1.E06 << " keV";
+
+  if (nsteps > 0) {
+    edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisions] SUMMARY: ionization"
+                                     << " : steps= " << nsteps << " : sum(steps)= " << sum_steps
+                                     << " cm : <step>= " << sum_steps / float(nsteps) << " cm"
+                                     << " : ionizing= " << n_ic << " : ionclus= " << mclus << " : total e= " << n_e
+                                     << " : <dedx/step>= " << dedx / float(nsteps)
+                                     << " eV : <e/ionclus>= " << float(n_e) / float(mclus)
+                                     << " : dedx= " << dedx / 1000. << " keV";
+  } else {
     edm::LogVerbatim("CSCDigitizer") << "[CSCGasCollisons] ERROR? no collision steps!";
   }
 
   // Turn off output file -  used for initial development
   //  if ( saveGasCollisions() ) {
   //    ofstream of0("osteplen.dat",ios::app);
-  //    std::copy( steps.begin(), steps.end(), std::ostream_iterator<float>(of0,"\n"));
+  //    std::copy( steps.begin(), steps.end(),
+  //    std::ostream_iterator<float>(of0,"\n"));
 
   //    ofstream of1("olperc.dat",ios::app);
-  //    std::copy( elosses.begin(), elosses.end(), std::ostream_iterator<float>(of1,"\n"));
+  //    std::copy( elosses.begin(), elosses.end(),
+  //    std::ostream_iterator<float>(of1,"\n"));
 
   //   ofstream of2("oclpos.dat",ios::app);
-  //   std::copy( ion_clusters.begin(), ion_clusters.end(), std::ostream_iterator<LocalPoint>(of2,"\n"));
+  //   std::copy( ion_clusters.begin(), ion_clusters.end(),
+  //   std::ostream_iterator<LocalPoint>(of2,"\n"));
 
   //   ofstream of3("oepercl.dat",ios::app);
-  //   std::copy( electrons.begin(), electrons.end(), std::ostream_iterator<int>(of3,"\n"));
+  //   std::copy( electrons.begin(), electrons.end(),
+  //   std::ostream_iterator<int>(of3,"\n"));
   // }
-
 }
 
-float CSCGasCollisions::lnEnergyLoss( float lnCollisions, 
-   const std::vector<float>& collisions ) const {
-
+float CSCGasCollisions::lnEnergyLoss(float lnCollisions, const std::vector<float> &collisions) const {
   float lnE = -1.;
 
-   // Find collision[] bin in which lnCollisions falls
-    std::vector<float>::const_iterator it = find(collisions.begin(),
-      collisions.end(), lnCollisions );
-
-    if ( it != collisions.end() ) {
-      // found the value
-      std::vector<float>::difference_type ihi = it - collisions.begin();
-      LogTrace(me) << ": using one energy bin " << ihi << " = " 
-                         << theEnergyBins[ihi]
-		         << " for lnCollisions = " << lnCollisions;
-      lnE = theEnergyBins[ihi];
-    }
-    else {
-      // interpolate the value
-      std::vector<float>::const_iterator loside = find_if(collisions.begin(),
-        collisions.end(), [&lnCollisions](auto c){return c < lnCollisions;});
-      std::vector<float>::difference_type ilo = loside - collisions.begin();
-      if ( ilo > 0 ) {
-        LogTrace(me) << ": using energy bin " 
-                           << ilo-1 << " and " << ilo;
-        lnE = theEnergyBins[ilo-1] + (lnCollisions-collisions[ilo-1])*
-          (theEnergyBins[ilo]-theEnergyBins[ilo-1]) /
-             (collisions[ilo]-collisions[ilo-1]);
-      }
-      else {
-        LogTrace(me) << ": using one energy bin 0 = " 
-                           << theEnergyBins[0]
-			   << " for lnCollisions = " << lnCollisions;
-        lnE = theEnergyBins[0]; //@@ WHAT ELSE TO DO?
-      }
+  // Find collision[] bin in which lnCollisions falls
+  std::vector<float>::const_iterator it = find(collisions.begin(), collisions.end(), lnCollisions);
+
+  if (it != collisions.end()) {
+    // found the value
+    std::vector<float>::difference_type ihi = it - collisions.begin();
+    LogTrace(me) << ": using one energy bin " << ihi << " = " << theEnergyBins[ihi]
+                 << " for lnCollisions = " << lnCollisions;
+    lnE = theEnergyBins[ihi];
+  } else {
+    // interpolate the value
+    std::vector<float>::const_iterator loside =
+        find_if(collisions.begin(), collisions.end(), [&lnCollisions](auto c) { return c < lnCollisions; });
+    std::vector<float>::difference_type ilo = loside - collisions.begin();
+    if (ilo > 0) {
+      LogTrace(me) << ": using energy bin " << ilo - 1 << " and " << ilo;
+      lnE = theEnergyBins[ilo - 1] + (lnCollisions - collisions[ilo - 1]) *
+                                         (theEnergyBins[ilo] - theEnergyBins[ilo - 1]) /
+                                         (collisions[ilo] - collisions[ilo - 1]);
+    } else {
+      LogTrace(me) << ": using one energy bin 0 = " << theEnergyBins[0] << " for lnCollisions = " << lnCollisions;
+      lnE = theEnergyBins[0];  //@@ WHAT ELSE TO DO?
     }
+  }
 
-    return lnE;
+  return lnE;
 }
 
-void CSCGasCollisions::fillCollisionsForThisGamma( float logGamma,
-   std::vector<float>& collisions ) const
-{
-  std::vector<float>::const_iterator bigger = find_if(theGammaBins.begin(),
-    theGammaBins.end(), [&logGamma](auto c){return c > logGamma;});
+void CSCGasCollisions::fillCollisionsForThisGamma(float logGamma, std::vector<float> &collisions) const {
+  std::vector<float>::const_iterator bigger =
+      find_if(theGammaBins.begin(), theGammaBins.end(), [&logGamma](auto c) { return c > logGamma; });
 
-  if ( bigger == theGammaBins.end() ) {
+  if (bigger == theGammaBins.end()) {
     // use highest bin
-    LogTrace(me) << ": using highest gamma bin" 
-		      << " for logGamma = " << logGamma;
-    for (int i=0; i<N_ENERGY; ++i)
-      collisions[i] = theCollisionTable[i*N_GAMMA];
-  }
-  else {
+    LogTrace(me) << ": using highest gamma bin"
+                 << " for logGamma = " << logGamma;
+    for (int i = 0; i < N_ENERGY; ++i)
+      collisions[i] = theCollisionTable[i * N_GAMMA];
+  } else {
     // use bigger and its lower neighbour
     std::vector<float>::difference_type ihi = bigger - theGammaBins.begin();
-    if ( ihi > 0 ) {
-      double dlg2 = *bigger--; // and decrement after deref
-      //LogTrace(me) << ": using gamma bins " 
+    if (ihi > 0) {
+      double dlg2 = *bigger--;  // and decrement after deref
+      // LogTrace(me) << ": using gamma bins "
       //                   << ihi-1 << " and " << ihi;
-      double dlg1 = *bigger;   // now the preceding element
-      double dlg = (logGamma-dlg1)/(dlg2-dlg1);
+      double dlg1 = *bigger;  // now the preceding element
+      double dlg = (logGamma - dlg1) / (dlg2 - dlg1);
       double omdlg = 1. - dlg;
-      for (int i=0; i<N_ENERGY; ++i)
-        collisions[i] = theCollisionTable[i*N_GAMMA+ihi-1]*omdlg +
-          theCollisionTable[i*N_GAMMA+ihi]*dlg;
-    }
-    else {
+      for (int i = 0; i < N_ENERGY; ++i)
+        collisions[i] = theCollisionTable[i * N_GAMMA + ihi - 1] * omdlg + theCollisionTable[i * N_GAMMA + ihi] * dlg;
+    } else {
       // bigger has no lower neighbour
-       LogTrace(me) << ": using lowest gamma bin" 
-       		         << " for logGamma = " << logGamma;
+      LogTrace(me) << ": using lowest gamma bin"
+                   << " for logGamma = " << logGamma;
 
-      for (int i=0; i<N_ENERGY; ++i)
-        collisions[i] = theCollisionTable[i*N_GAMMA];
+      for (int i = 0; i < N_ENERGY; ++i)
+        collisions[i] = theCollisionTable[i * N_GAMMA];
     }
   }
 }
diff --git a/SimMuon/CSCDigitizer/src/CSCGasCollisions.h b/SimMuon/CSCDigitizer/src/CSCGasCollisions.h
index a994dbdd9632f..183c61c972252 100644
--- a/SimMuon/CSCDigitizer/src/CSCGasCollisions.h
+++ b/SimMuon/CSCDigitizer/src/CSCGasCollisions.h
@@ -11,14 +11,14 @@
  * Of course the version here is much improved :) <BR>
  */
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
-#include "SimMuon/CSCDigitizer/src/CSCCrossGap.h"
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
+#include "SimMuon/CSCDigitizer/src/CSCCrossGap.h"
 
-#include <vector>
 #include <string>
+#include <vector>
 
 namespace CLHEP {
   class HepRandomEngine;
@@ -26,56 +26,61 @@ namespace CLHEP {
 
 class CSCGasCollisions {
 public:
+  CSCGasCollisions(const edm::ParameterSet &pset);
+  virtual ~CSCGasCollisions();
 
-   CSCGasCollisions(const edm::ParameterSet & pset);
-   virtual ~CSCGasCollisions();
-
-   void setParticleDataTable(const ParticleDataTable * pdt);
+  void setParticleDataTable(const ParticleDataTable *pdt);
 
-   void simulate(const PSimHit&, 
-                 std::vector<LocalPoint>& clusters, std::vector<int>& electrons, CLHEP::HepRandomEngine* );
+  void simulate(const PSimHit &,
+                std::vector<LocalPoint> &clusters,
+                std::vector<int> &electrons,
+                CLHEP::HepRandomEngine *);
 
-   bool dumpGasCollisions( void ) const { return dumpGasCollisions_; }
-   bool saveGasCollisions( void ) const { return saveGasCollisions_; }
+  bool dumpGasCollisions(void) const { return dumpGasCollisions_; }
+  bool saveGasCollisions(void) const { return saveGasCollisions_; }
 
-   static const int N_GAMMA = 21;
-   static const int N_ENERGY = 63;
-   static const int N_ENTRIES = N_GAMMA*N_ENERGY;
-   static const int MAX_STEPS = 400;
+  static const int N_GAMMA = 21;
+  static const int N_ENERGY = 63;
+  static const int N_ENTRIES = N_GAMMA * N_ENERGY;
+  static const int MAX_STEPS = 400;
 
 private:
-   void readCollisionTable();
-   void fillCollisionsForThisGamma( float, std::vector<float>& ) const;
-   float lnEnergyLoss( float, const std::vector<float>& ) const;
-   double generateStep( double avCollisions, CLHEP::HepRandomEngine* ) const;
-   float generateEnergyLoss( double avCollisions, 
-                             double anmin, double anmax, const std::vector<float>& collisions,
-                             CLHEP::HepRandomEngine* ) const;
-
-   void ionize( double energyTransferred, LocalPoint startHere) const;
-	
-   void writeSummary( int n_try, int n_steps, double sum_steps, float dedx, const PSimHit& simhit ) const;
-
-   const std::string me;       // class name
-   double gasDensity;     // Density of CSC gas mix
-   // The question of what is reasonable for deCut is complex. But it seems clear that
-   // this simulation is not credible if any delta electrons generated here
-   // have ranges more than a few mm, or equivalently, energies above a few keV.
-   // deCut = 1000 = 1 keV
-   // deCut = 10000 = 10 keV
-   double deCut;          // Delta electron cutoff in eV (Match GEANT!)
-   double eion;           // ionization threshold (eV) (min. E for ionizatiom)
-   double ework;          // effective work function (av. energy to create one ion pair)
-   double clusterExtent;  // Precision of localization of ion clus. Typically 10 microns.
-
-   std::vector<float> theGammaBins;
-   std::vector<float> theEnergyBins;
-   std::vector<float> theCollisionTable;
-
-   CSCCrossGap* theCrossGap; // Owned by CSCGasCollisions
-   const ParticleDataTable * theParticleDataTable;
-   bool saveGasCollisions_; // write file of collisions details (not yet implemented in cmssw)
-   bool dumpGasCollisions_; // flag to write summary
+  void readCollisionTable();
+  void fillCollisionsForThisGamma(float, std::vector<float> &) const;
+  float lnEnergyLoss(float, const std::vector<float> &) const;
+  double generateStep(double avCollisions, CLHEP::HepRandomEngine *) const;
+  float generateEnergyLoss(double avCollisions,
+                           double anmin,
+                           double anmax,
+                           const std::vector<float> &collisions,
+                           CLHEP::HepRandomEngine *) const;
+
+  void ionize(double energyTransferred, LocalPoint startHere) const;
+
+  void writeSummary(int n_try, int n_steps, double sum_steps, float dedx, const PSimHit &simhit) const;
+
+  const std::string me;  // class name
+  double gasDensity;     // Density of CSC gas mix
+  // The question of what is reasonable for deCut is complex. But it seems clear
+  // that this simulation is not credible if any delta electrons generated here
+  // have ranges more than a few mm, or equivalently, energies above a few keV.
+  // deCut = 1000 = 1 keV
+  // deCut = 10000 = 10 keV
+  double deCut;          // Delta electron cutoff in eV (Match GEANT!)
+  double eion;           // ionization threshold (eV) (min. E for ionizatiom)
+  double ework;          // effective work function (av. energy to create one ion pair)
+  double clusterExtent;  // Precision of localization of ion clus. Typically 10
+                         // microns.
+
+  std::vector<float> theGammaBins;
+  std::vector<float> theEnergyBins;
+  std::vector<float> theCollisionTable;
+
+  CSCCrossGap *theCrossGap;  // Owned by CSCGasCollisions
+  const ParticleDataTable *theParticleDataTable;
+  bool saveGasCollisions_;  // write file of collisions details (not yet
+                            // implemented in cmssw)
+  bool dumpGasCollisions_;  // flag to write summary
 };
 
 #endif
diff --git a/SimMuon/CSCDigitizer/src/CSCNeutronReader.cc b/SimMuon/CSCDigitizer/src/CSCNeutronReader.cc
index 839f9d8420fa7..42e0a810ffd57 100644
--- a/SimMuon/CSCDigitizer/src/CSCNeutronReader.cc
+++ b/SimMuon/CSCDigitizer/src/CSCNeutronReader.cc
@@ -1,29 +1,26 @@
-#include "SimMuon/CSCDigitizer/src/CSCNeutronReader.h"
-#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "DataFormats/MuonDetId/interface/CSCDetId.h"
 #include "Geometry/CSCGeometry/interface/CSCChamberSpecs.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
+#include "SimMuon/CSCDigitizer/src/CSCNeutronReader.h"
 
-
-void CSCNeutronReader::addHits(std::map<int, edm::PSimHitContainer> & hitMap, CLHEP::HepRandomEngine* engine)
-{
+void CSCNeutronReader::addHits(std::map<int, edm::PSimHitContainer> &hitMap, CLHEP::HepRandomEngine *engine) {
   std::vector<int> chambersDone;
 
   std::map<int, edm::PSimHitContainer> signalHits = hitMap;
-  for(std::map<int, edm::PSimHitContainer>::const_iterator signalHitItr = signalHits.begin();
-      signalHitItr != signalHits.end(); ++signalHitItr)
-  {
+  for (std::map<int, edm::PSimHitContainer>::const_iterator signalHitItr = signalHits.begin();
+       signalHitItr != signalHits.end();
+       ++signalHitItr) {
     int chamberIndex = chamberId(signalHitItr->first);
 
     // see if this chamber has been done yet
-    if(find(chambersDone.begin(), chambersDone.end(), chamberIndex) == chambersDone.end())
-    {
+    if (find(chambersDone.begin(), chambersDone.end(), chamberIndex) == chambersDone.end()) {
       edm::PSimHitContainer neutronHits;
       generateChamberNoise(chamberType(chamberIndex), chamberIndex, neutronHits, engine);
 
       // add these hits to the original map
-      for(edm::PSimHitContainer::const_iterator neutronHitItr = neutronHits.begin();
-          neutronHitItr != neutronHits.end(); ++neutronHitItr) 
-      {
+      for (edm::PSimHitContainer::const_iterator neutronHitItr = neutronHits.begin();
+           neutronHitItr != neutronHits.end();
+           ++neutronHitItr) {
         uint32_t layerId = neutronHitItr->detUnitId();
         hitMap[layerId].push_back(*neutronHitItr);
       }
@@ -33,29 +30,16 @@ void CSCNeutronReader::addHits(std::map<int, edm::PSimHitContainer> & hitMap, CL
   }
 }
 
-
-int CSCNeutronReader::detId(int chamberIndex, int localDetId )
-{
+int CSCNeutronReader::detId(int chamberIndex, int localDetId) {
   // add the layer bits
   return chamberIndex + localDetId;
 }
 
+int CSCNeutronReader::localDetId(int globalDetId) const { return CSCDetId(globalDetId).layer(); }
 
-int CSCNeutronReader::localDetId(int globalDetId) const
-{
-  return CSCDetId(globalDetId).layer();
-}
-
-
-int CSCNeutronReader::chamberType(int globalDetId) const
-{
+int CSCNeutronReader::chamberType(int globalDetId) const {
   CSCDetId id(globalDetId);
   return CSCChamberSpecs::whatChamberType(id.station(), id.ring());
 }
 
-
-int CSCNeutronReader::chamberId(int globalDetId) const
-{
-  return CSCDetId(globalDetId).chamberId().rawId();
-}
-
+int CSCNeutronReader::chamberId(int globalDetId) const { return CSCDetId(globalDetId).chamberId().rawId(); }
diff --git a/SimMuon/CSCDigitizer/src/CSCNeutronReader.h b/SimMuon/CSCDigitizer/src/CSCNeutronReader.h
index ca24750863e2e..7a0352bd73463 100644
--- a/SimMuon/CSCDigitizer/src/CSCNeutronReader.h
+++ b/SimMuon/CSCDigitizer/src/CSCNeutronReader.h
@@ -7,25 +7,20 @@ namespace CLHEP {
   class HepRandomEngine;
 }
 
-class CSCNeutronReader : public SubsystemNeutronReader
-{
+class CSCNeutronReader : public SubsystemNeutronReader {
 public:
-  CSCNeutronReader(const edm::ParameterSet & pset)
-  : SubsystemNeutronReader(pset) {}
+  CSCNeutronReader(const edm::ParameterSet &pset) : SubsystemNeutronReader(pset) {}
   ~CSCNeutronReader() override {}
 
-  void addHits(std::map<int, edm::PSimHitContainer> & hitMap, CLHEP::HepRandomEngine*);
+  void addHits(std::map<int, edm::PSimHitContainer> &hitMap, CLHEP::HepRandomEngine *);
 
-  int detId(int chamberIndex, int localDetId ) override;
+  int detId(int chamberIndex, int localDetId) override;
 
   int localDetId(int globalDetId) const;
 
   int chamberType(int globalDetId) const;
 
   int chamberId(int globalDetId) const;
-
-
 };
 
 #endif
-
diff --git a/SimMuon/CSCDigitizer/src/CSCNeutronWriter.cc b/SimMuon/CSCDigitizer/src/CSCNeutronWriter.cc
index d78ec6ed13ac2..0e1c3ba87658b 100644
--- a/SimMuon/CSCDigitizer/src/CSCNeutronWriter.cc
+++ b/SimMuon/CSCDigitizer/src/CSCNeutronWriter.cc
@@ -1,38 +1,21 @@
-#include "SimMuon/CSCDigitizer/src/CSCNeutronWriter.h"
 #include "DataFormats/MuonDetId/interface/CSCDetId.h"
 #include "Geometry/CSCGeometry/interface/CSCChamberSpecs.h"
+#include "SimMuon/CSCDigitizer/src/CSCNeutronWriter.h"
 #include <iostream>
 
-CSCNeutronWriter::CSCNeutronWriter(edm::ParameterSet const& pset)
-: SubsystemNeutronWriter(pset)
-{
-  for(int i = 1; i <= 10; ++i)
-  {
+CSCNeutronWriter::CSCNeutronWriter(edm::ParameterSet const &pset) : SubsystemNeutronWriter(pset) {
+  for (int i = 1; i <= 10; ++i) {
     initialize(i);
   }
 }
 
+CSCNeutronWriter::~CSCNeutronWriter() {}
 
-CSCNeutronWriter::~CSCNeutronWriter() {
-}
-
-
-int CSCNeutronWriter::localDetId(int globalDetId) const
-{
-  return CSCDetId(globalDetId).layer();
-}
+int CSCNeutronWriter::localDetId(int globalDetId) const { return CSCDetId(globalDetId).layer(); }
 
-
-int CSCNeutronWriter::chamberType(int globalDetId) const
-{
+int CSCNeutronWriter::chamberType(int globalDetId) const {
   CSCDetId id(globalDetId);
   return CSCChamberSpecs::whatChamberType(id.station(), id.ring());
 }
 
-
-int CSCNeutronWriter::chamberId(int globalDetId) const
-{
-  return CSCDetId(globalDetId).chamberId().rawId();
-}
-
-
+int CSCNeutronWriter::chamberId(int globalDetId) const { return CSCDetId(globalDetId).chamberId().rawId(); }
diff --git a/SimMuon/CSCDigitizer/src/CSCNeutronWriter.h b/SimMuon/CSCDigitizer/src/CSCNeutronWriter.h
index 3f67718405257..e369d0cee7ef9 100644
--- a/SimMuon/CSCDigitizer/src/CSCNeutronWriter.h
+++ b/SimMuon/CSCDigitizer/src/CSCNeutronWriter.h
@@ -10,10 +10,9 @@
   \author   Rick Wilkinson, Caltech
  */
 
-class CSCNeutronWriter : public SubsystemNeutronWriter
-{
+class CSCNeutronWriter : public SubsystemNeutronWriter {
 public:
-  explicit CSCNeutronWriter(edm::ParameterSet const& pset);
+  explicit CSCNeutronWriter(edm::ParameterSet const &pset);
   ~CSCNeutronWriter() override;
 
 protected:
@@ -24,9 +23,7 @@ class CSCNeutronWriter : public SubsystemNeutronWriter
   int chamberId(int globalDetId) const override;
 
   /// decides whether this cluster is good enough to be included
-  bool accept(const edm::PSimHitContainer & cluster) const override {return true;}
-
+  bool accept(const edm::PSimHitContainer &cluster) const override { return true; }
 };
 
 #endif
-
diff --git a/SimMuon/CSCDigitizer/src/CSCStripAmpResponse.cc b/SimMuon/CSCDigitizer/src/CSCStripAmpResponse.cc
index 224c93fb7730c..1036dde078c2f 100644
--- a/SimMuon/CSCDigitizer/src/CSCStripAmpResponse.cc
+++ b/SimMuon/CSCDigitizer/src/CSCStripAmpResponse.cc
@@ -2,564 +2,544 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "SimMuon/CSCDigitizer/src/CSCStripAmpResponse.h"
 
-#include <iostream>
 #include <cmath>
-
+#include <iostream>
 
 CSCStripAmpResponse::CSCStripAmpResponse(int shapingTime, int tailShaping)
-: theShapingTime(shapingTime),
-  theTailShaping(tailShaping)
-{
-}
+    : theShapingTime(shapingTime), theTailShaping(tailShaping) {}
 
+float CSCStripAmpResponse::calculateAmpResponse(float t) const {
+  // Local variables
+  double t1, t3, t5, t7, cat = 0.;
 
-float CSCStripAmpResponse::calculateAmpResponse(float t) const
-{
+  // ! CSC Cathode amplifier-shaper response to single e-
 
-    // Local variables 
-    double t1, t3, t5, t7, cat=0.;
+  //     Author: S. Durkin Oct. 13, 1995
 
-// ! CSC Cathode amplifier-shaper response to single e- 
+  //     Routine gives cathode amplifier response to a single drift electron
+  //     Positive ion drift collection is included
+  //     FLAGS:      itp  amplifier/shaper peaking time
+  //     10,20,30,40,50,60,70,80,90,100,150,200,250,300 nsec available
+  //                 itl  amplifier tail cancellation
+  //                      1 no tail cancellation
+  //                      2 conservative tail cancellation
+  //                      3 radical tail cancellation(some charge loss)
 
-//     Author: S. Durkin Oct. 13, 1995 
+  //     calculations were done using maple
+  //     4-pole semigaussian shaper is assumed
 
-//     Routine gives cathode amplifier response to a single drift electron 
-//     Positive ion drift collection is included 
-//     FLAGS:      itp  amplifier/shaper peaking time 
-//     10,20,30,40,50,60,70,80,90,100,150,200,250,300 nsec available 
-//                 itl  amplifier tail cancellation 
-//                      1 no tail cancellation 
-//                      2 conservative tail cancellation 
-//                      3 radical tail cancellation(some charge loss) 
+  //     frequency 2tp/27/exp(-3)/(stp/3+1)**3
+  //                           |
+  //                           \/
+  //     time     (t/tp)**3/exp(-3)*exp(-3t/tp)
 
-//     calculations were done using maple 
-//     4-pole semigaussian shaper is assumed 
+  //     this time distribution was convoluted with positive ion
+  //     drift formula
 
-//     frequency 2tp/27/exp(-3)/(stp/3+1)**3 
-//                           | 
-//                           \/ 
-//     time     (t/tp)**3/exp(-3)*exp(-3t/tp) 
+  //                1/(t0+t)*.05650     note:normalization estimated from K1
+  //                                         Gatti N.I.M. 163,82(1979)
+  //                where t0=2.1 nsec (GEM gas)
 
-//     this time distribution was convoluted with positive ion 
-//     drift formula 
+  //            standard tail cancellation has lowest pole removed (exp approx)
+  //            using 1 zero and 1 pole
+  //            radical tail cancellation has lowest two poles removed (exp
+  //            approx) using 2 zeros and 2 poles
 
-//                1/(t0+t)*.05650     note:normalization estimated from K1 
-//                                         Gatti N.I.M. 163,82(1979) 
-//                where t0=2.1 nsec (GEM gas) 
+  if (theTailShaping != 0 && theTailShaping != 1 && theTailShaping != 2) {
+    edm::LogError("CSCStripElectronicsSim") << "Bad TailShaping CSCStripElectronicsSim" << theTailShaping;
+    return 0.;
+  }
 
-//            standard tail cancellation has lowest pole removed (exp approx) 
-//            using 1 zero and 1 pole 
-//            radical tail cancellation has lowest two poles removed (exp approx) 
-//            using 2 zeros and 2 poles 
-
-    if(theTailShaping != 0 && theTailShaping != 1 && theTailShaping != 2) {
-       edm::LogError("CSCStripElectronicsSim") << "Bad TailShaping CSCStripElectronicsSim"
-            << theTailShaping;
-        return 0.;
-    }
-
-    switch(theShapingTime) {
-/*
-    case 10:
-// no tail cancellation, tp= 10,t0=2.1 
-	if (theTailShaping == NONE) {
-// Computing 2nd power 
-	    t5 = t * t;
-	    t7 = exp(t * -.3);
-	    cat = exp(t * -.06523809524) * .2100138871 + exp(t * 
-		    -.400952381) * 23.38590029 + exp(t * -.01333333333) * 
-		    .02085199407 + exp(t * -.002285714286) * .004416201989 + 
-		    t5 * .00345590637 * t * t7 - t5 * .1260070972 * t7 + t *
-		     2.304266717 * t7 - t7 * 23.62118237;
-	}
-//  tail cancellation, tp= 10,t0=2.1 
-	if (theTailShaping == CONSERVATIVE) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.3);
-	    cat = t1 * .003469104089 * t * t3 - t1 * .1263548058 * t3 + t * 
-		    2.310721678 * t3 - t3 * 23.68962448 + exp(t * 
-		    -.01333333333) * .02323396152 + exp(t * -.400952381) * 
-		    23.45252892 + exp(t * -.06523809524) * .2138615931 + exp(
-		    t * -.003418326524) * 1.274497241e-11;
-	}
-//  radical tail cancellation, tp= 10,t0=2.1 
-	if (theTailShaping == RADICAL) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.3);
-	    cat = t1 * .003561830965 * t * t3 - t1 * .1287358512 * t3 + t * 
-		    2.355429782 * t3 - t3 * 24.16270544 - exp(t * 
-		    -.0207962661) * 1.717680715e-10 + exp(t * -.003418326524)
-		     * 7.271661158e-12 + exp(t * -.400952381) * 23.91293094 
-		    + exp(t * -.06523809524) * .2497744869;
-	}
-        break; 
-    case 20:
-// no tail cancellation, tp= 20,t0=2.1 
-	if (theTailShaping == NONE) {
-// Computing 2nd power 
-	    t5 = t * t;
-	    t7 = exp(t * -.15);
-	    cat = exp(t * -.06523809524) * 1.544776642 + exp(t * 
-		    -.400952381) * .07655350666 + exp(t * -.01333333333) * 
-		    .0504563677 + exp(t * -.002285714286) * .009108935882 + 
-		    t5 * 1.849663895e-5 * t * t7 - t5 * .008530427568 * t7 - 
-		    t * .1199681494 * t7 - t7 * 1.680895453;
-	}
-//  tail cancellation, tp= 20,t0=2.1 
-	if (theTailShaping == CONSERVATIVE) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.15);
-	    cat = t1 * 1.863955948e-5 * t * t3 - t1 * .008593415697 * t3 -
-		    t * .1217545504 * t3 - t3 * 1.706070522 + exp(t * 
-		    -.01333333333) * .05622010555 + exp(t * -.400952381) * 
-		    .07677161489 + exp(t * -.06523809524) * 1.573078801 + 
-		    exp(t * -.003418326524) * 2.669976603e-11;
-	}
-//  radical tail cancellation, tp= 20,t0=2.1 
-	if (theTailShaping == RADICAL) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.15);
-	    cat = t1 * 1.971619848e-5 * t * t3 - t1 * .009064781071 * t3 -
-		    t * .1360836779 * t3 - t3 * 1.915518161 - exp(t * 
-		    -.0207962661) * 4.682061154e-10 + exp(t * -.003418326524)
-		     * 1.523358744e-11 + exp(t * -.400952381) * .07827873625 
-		    + exp(t * -.06523809524) * 1.837239425;
-	}
-        break; 
-*/
+  switch (theShapingTime) {
+      /*
+        case 10:
+    // no tail cancellation, tp= 10,t0=2.1
+            if (theTailShaping == NONE) {
+    // Computing 2nd power
+                t5 = t * t;
+                t7 = exp(t * -.3);
+                cat = exp(t * -.06523809524) * .2100138871 + exp(t *
+                        -.400952381) * 23.38590029 + exp(t * -.01333333333) *
+                        .02085199407 + exp(t * -.002285714286) * .004416201989 +
+                        t5 * .00345590637 * t * t7 - t5 * .1260070972 * t7 + t *
+                         2.304266717 * t7 - t7 * 23.62118237;
+            }
+    //  tail cancellation, tp= 10,t0=2.1
+            if (theTailShaping == CONSERVATIVE) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.3);
+                cat = t1 * .003469104089 * t * t3 - t1 * .1263548058 * t3 + t *
+                        2.310721678 * t3 - t3 * 23.68962448 + exp(t *
+                        -.01333333333) * .02323396152 + exp(t * -.400952381) *
+                        23.45252892 + exp(t * -.06523809524) * .2138615931 +
+    exp( t * -.003418326524) * 1.274497241e-11;
+            }
+    //  radical tail cancellation, tp= 10,t0=2.1
+            if (theTailShaping == RADICAL) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.3);
+                cat = t1 * .003561830965 * t * t3 - t1 * .1287358512 * t3 + t *
+                        2.355429782 * t3 - t3 * 24.16270544 - exp(t *
+                        -.0207962661) * 1.717680715e-10 + exp(t *
+    -.003418326524)
+                         * 7.271661158e-12 + exp(t * -.400952381) * 23.91293094
+                        + exp(t * -.06523809524) * .2497744869;
+            }
+            break;
+        case 20:
+    // no tail cancellation, tp= 20,t0=2.1
+            if (theTailShaping == NONE) {
+    // Computing 2nd power
+                t5 = t * t;
+                t7 = exp(t * -.15);
+                cat = exp(t * -.06523809524) * 1.544776642 + exp(t *
+                        -.400952381) * .07655350666 + exp(t * -.01333333333) *
+                        .0504563677 + exp(t * -.002285714286) * .009108935882 +
+                        t5 * 1.849663895e-5 * t * t7 - t5 * .008530427568 * t7 -
+                        t * .1199681494 * t7 - t7 * 1.680895453;
+            }
+    //  tail cancellation, tp= 20,t0=2.1
+            if (theTailShaping == CONSERVATIVE) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.15);
+                cat = t1 * 1.863955948e-5 * t * t3 - t1 * .008593415697 * t3 -
+                        t * .1217545504 * t3 - t3 * 1.706070522 + exp(t *
+                        -.01333333333) * .05622010555 + exp(t * -.400952381) *
+                        .07677161489 + exp(t * -.06523809524) * 1.573078801 +
+                        exp(t * -.003418326524) * 2.669976603e-11;
+            }
+    //  radical tail cancellation, tp= 20,t0=2.1
+            if (theTailShaping == RADICAL) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.15);
+                cat = t1 * 1.971619848e-5 * t * t3 - t1 * .009064781071 * t3 -
+                        t * .1360836779 * t3 - t3 * 1.915518161 - exp(t *
+                        -.0207962661) * 4.682061154e-10 + exp(t *
+    -.003418326524)
+                         * 1.523358744e-11 + exp(t * -.400952381) * .07827873625
+                        + exp(t * -.06523809524) * 1.837239425;
+            }
+            break;
+    */
     case 30:
-// no tail cancellation, tp= 30,t0=2.1 
-	if (theTailShaping == NONE) {
-// Computing 2nd power 
-	    t5 = t * t;
-	    t7 = exp(t * -.1);
-	    cat = exp(t * -.06523809524) * 16.18007335 + exp(t * 
-		    -.400952381) * .01096643477 + exp(t * -.01333333333) * 
-		    .0924451733 + exp(t * -.002285714286) * .01409456303 - 
-		    t5 * 7.567748611e-5 * t * t7 - t5 * .01068701841 * t7 - 
-		    t * .5685389492 * t7 - t7 * 16.29757952;
-	}
-//  tail cancellation, tp= 30,t0=2.1 
-	if (theTailShaping == CONSERVATIVE) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.1);
-	    cat = t1 * -7.656495508e-5 * t * t3 - t1 * .01083991133 * t3 - 
-		    t * .5783722846 * t3 - t3 * 16.59051472 + exp(t * 
-		    -.01333333333) * .1030053814 + exp(t * -.400952381) * 
-		    .01099767919 + exp(t * -.06523809524) * 16.47651166 + 
-		    exp(t * -.003418326524) * 4.197333487e-11;
-	}
-//  radical tail cancellation, tp= 30,t0=2.1 
-	if (theTailShaping == RADICAL) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.1);
-	    cat = t1 * -8.37792502e-5 * t * t3 - t1 * .0121345525 * t3 - t *
-		     .6655605456 * t3 - t3 * 19.25455777 - exp(t * 
-		    -.0207962661) * 9.823832281e-10 + exp(t * -.003418326524)
-		     * 2.394794269e-11 + exp(t * -.400952381) * .01121357717 
-		    + exp(t * -.06523809524) * 19.2433442;
-	}
-        break; 
-/*
-    case 40:
-// no tail cancellation, tp= 40,t0=2.1 
-	if (theTailShaping == NONE) {
-// Computing 2nd power 
-	    t5 = t * t;
-	    t7 = exp(t * -.075);
-	    cat = exp(t * -.06523809524) * 1097.590331 + exp(t * 
-		    -.400952381) * .003362201622 + exp(t * -.01333333333) * 
-		    .1521508944 + exp(t * -.002285714286) * .01939048554 - 
-		    t5 * 1.579570388e-4 * t * t7 - t5 * .05281648589 * t7 -
-		    t * 10.72426897 * t7 - t7 * 1097.765235;
-	}
-//  tail cancellation, tp= 40,t0=2.1 
-	if (theTailShaping == CONSERVATIVE) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.075);
-	    cat = t1 * -1.604563386e-4 * t * t3 - t1 * .05375692904 * t3 -
-		    t * 10.92023147 * t3 - t3 * 1117.872403 + exp(t * 
-		    -.01333333333) * .1695314135 + exp(t * -.400952381) * 
-		    .003371780853 + exp(t * -.06523809524) * 1117.6995 + exp(
-		    t * -.003418326524) * 5.868522605e-11;
-	}
-//  radical tail cancellation, tp= 40,t0=2.1 
-	if (theTailShaping == RADICAL) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.075);
-	    cat = t1 * -1.825484488e-4 * t * t3 - t1 * .06238107065 * t3 -
-		    t * 12.7419738 * t3 - t3 * 1305.393597 - exp(t * 
-		    -.0207962661) * 1.889428819e-9 + exp(t * -.003418326524) 
-		    * 3.348293469e-11 + exp(t * -.400952381) * .003437973064 
-		    + exp(t * -.06523809524) * 1305.390159;
-	}
-        break; 
-    case 50:
-// no tail cancellation, tp= 50,t0=2.1 
-	if (theTailShaping == NONE) {
-// Computing 2nd power 
-	    t5 = t * t;
-	    t7 = exp(t * -.06);
-	    cat = exp(t * -.06523809524) * 6778.833027 + exp(t * 
-		    -.400952381) * .001437922352 + exp(t * -.01333333333) * 
-		    .237530423 + exp(t * -.002285714286) * .02501521924 + t5 
-		    * 1.670506271e-4 * t * t7 - t5 * .09338148045 * t7 + t *
-		     35.49613478 * t7 - t7 * 6779.097011;
-	}
-//  tail cancellation, tp= 50,t0=2.1 
-	if (theTailShaping == CONSERVATIVE) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.06);
-	    cat = t1 * 1.703945294e-4 * t * t3 - t1 * .09507342939 * t3 + t 
-		    * 36.14686596 * t3 - t3 * 6903.29548 + exp(t * 
-		    -.01333333333) * .2646640264 + exp(t * -.400952381) * 
-		    .001442019131 + exp(t * -.06523809524) * 6903.029373 + 
-		    exp(t * -.003418326524) * 7.696672009e-11;
-	}
-//  radical tail cancellation, tp= 50,t0=2.1 
-	if (theTailShaping == RADICAL) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.06);
-	    cat = t1 * 2.028313098e-4 * t * t3 - t1 * .1106897038 * t3 + t *
-		     42.23121193 * t3 - t3 * 8062.228042 - exp(t * 
-		    -.0207962661) * 3.535147864e-9 + exp(t * -.003418326524) 
-		    * 4.391346571e-11 + exp(t * -.400952381) * .001470327741 
-		    + exp(t * -.06523809524) * 8062.226572;
-	}
-        break; 
-    case 60:
-// no tail cancellation, tp= 60,t0=2.1 
-	if (theTailShaping == NONE) {
-// Computing 2nd power 
-	    t5 = t * t;
-	    t7 = exp(t * -.05);
-	    cat = exp(t * -.06523809524) * 54.77495457 + exp(t * 
-		    -.400952381) * 7.412655802e-4 + exp(t * -.01333333333) * 
-		    .3606757184 + exp(t * -.002285714286) * .03098847247 + 
-		    t5 * 3.411745868e-5 * t * t7 - t5 * .006682738979 * t7 + 
-		    t * .8202227541 * t7 - t7 * 55.16736002;
-	}
-//  tail cancellation, tp= 60,t0=2.1 
-	if (theTailShaping == CONSERVATIVE) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.05);
-	    cat = t1 * 3.494700919e-5 * t * t3 - t1 * .006791801191 * t3 +
-		    t * .8354834745 * t3 - t3 * 56.18111721 + exp(t * 
-		    -.01333333333) * .40187647 + exp(t * -.400952381) * 
-		    7.433775162e-4 + exp(t * -.06523809524) * 55.77849736 + 
-		    exp(t * -.003418326524) * 9.696210758e-11;
-	}
-//  radical tail cancellation, tp= 60,t0=2.1 
-	if (theTailShaping == RADICAL) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.05);
-	    cat = t1 * 4.387761992e-5 * t * t3 - t1 * .007610015855 * t3 +
-		    t * .9929540112 * t3 - t3 * 65.14590792 - exp(t * 
-		    -.0207962661) * 6.643853476e-9 + exp(t * -.003418326524) 
-		    * 5.532186095e-11 + exp(t * -.400952381) * 7.57970932e-4 
-		    + exp(t * -.06523809524) * 65.14514995;
-	}
-        break; 
-    case 70:
-// no tail cancellation, tp= 70,t0=2.1 
-	if (theTailShaping == NONE) {
-// Computing 2nd power 
-	    t5 = t * t;
-	    t7 = exp(t * -.04285714286);
-	    cat = exp(t * -.06523809524) * 7.412251365 + exp(t * 
-		    -.400952381) * 4.306575393e-4 + exp(t * -.01333333333) * 
-		    .5403469187 + exp(t * -.002285714286) * .03733123063 + 
-		    t5 * 1.441232259e-5 * t * t7 - t5 * .002150258989 * t7 + 
-		    t * .1485797804 * t7 - t7 * 7.990360172;
-	}
-//  tail cancellation, tp= 70,t0=2.1 
-	if (theTailShaping == CONSERVATIVE) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.04285714286);
-	    cat = t1 * 1.48262187e-5 * t * t3 - t1 * .002180526664 * t3 + t 
-		    * .1513118077 * t3 - t3 * 8.150556465 + exp(t * 
-		    -.01333333333) * .6020718923 + exp(t * -.400952381) * 
-		    4.318845237e-4 + exp(t * -.06523809524) * 7.548052688 + 
-		    exp(t * -.003418326524) * 1.188301202e-10;
-	}
-//  radical tail cancellation, tp= 70,t0=2.1 
-	if (theTailShaping == RADICAL) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.04285714286);
-	    cat = t1 * 1.984175252e-5 * t * t3 - t1 * .00223612384 * t3 + t 
-		    * .1974584549 * t3 - t3 * 8.816006345 - exp(t * 
-		    -.0207962661) * 1.284819542e-8 + exp(t * -.003418326524) 
-		    * 6.779868504e-11 + exp(t * -.400952381) * 4.40362949e-4 
-		    + exp(t * -.06523809524) * 8.815565996;
-	}
-        break; 
-    case 80:
-// no tail cancellation, tp= 80,t0=2.1 
-	if (theTailShaping == NONE) {
-// Computing 2nd power 
-	    t5 = t * t;
-	    t7 = exp(t * -.0375);
-	    cat = exp(t * -.06523809524) * 2.104660307 + exp(t * 
-		    -.400952381) * 2.718693973e-4 + exp(t * -.01333333333) * 
-		    .806342238 + exp(t * -.002285714286) * .04406584799 + t5 
-		    * 7.444156851e-6 * t * t7 - t5 * .00109040647 * t7 + t *
-		     .03743972817 * t7 - t7 * 2.955340262;
-	}
-//  tail cancellation, tp= 80,t0=2.1 
-	if (theTailShaping == CONSERVATIVE) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.0375);
-	    cat = t1 * 7.69154327e-6 * t * t3 - t1 * .001104867276 * t3 + t 
-		    * .0378353391 * t3 - t3 * 3.041945271 + exp(t * 
-		    -.01333333333) * .8984524213 + exp(t * -.400952381) * 
-		    2.726439789e-4 + exp(t * -.06523809524) * 2.143220205 + 
-		    exp(t * -.003418326524) * 1.42745537e-10;
-	}
-//  radical tail cancellation, tp= 80,t0=2.1 
-	if (theTailShaping == RADICAL) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.0375);
-	    cat = t1 * 1.112798871e-5 * t * t3 - t1 * 9.813148933e-4 * t3 +
-		    t * .06953288418 * t3 - t3 * 2.503400292 - exp(t * 
-		    -.0207962661) * 2.618804719e-8 + exp(t * -.003418326524) 
-		    * 8.144365827e-11 + exp(t * -.400952381) * 
-		    2.779963161e-4 + exp(t * -.06523809524) * 2.50312232;
-	}
-        break;
-    case 90:
-// no tail cancellation, tp= 90,t0=2.1 
-	if (theTailShaping == NONE) {
-// Computing 2nd power 
-	    t5 = t * t;
-	    t7 = exp(t * -.03333333333);
-	    cat = exp(t * -.06523809524) * .8445180788 + exp(t * 
-		    -.400952381) * 1.824319111e-4 + exp(t * -.01333333333) * 
-		    1.207282396 + exp(t * -.002285714286) * .051216146 + t5 *
-		     4.216536082e-6 * t * t7 - t5 * 7.082920848e-4 * t7 + t 
-		    * .001275426356 * t7 - t7 * 2.103199053;
-	}
-//  tail cancellation, tp= 90,t0=2.1 
-	if (theTailShaping == CONSERVATIVE) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.03333333333);
-	    cat = t1 * 4.376178381e-6 * t * t3 - t1 * 7.190991486e-4 * t3 +
-		    t * 6.011974229e-4 * t3 - t3 * 2.205366435 + exp(t * 
-		    -.01333333333) * 1.345192821 + exp(t * -.400952381) * 
-		    1.829516768e-4 + exp(t * -.06523809524) * .8599906622 + 
-		    exp(t * -.003418326524) * 1.68900989e-10;
-	}
-//  radical tail cancellation, tp= 90,t0=2.1 
-	if (theTailShaping == RADICAL) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.03333333333);
-	    cat = t1 * 6.981183555e-6 * t * t3 - t1 * 5.238041184e-4 * t3 +
-		    t * .03211389084 * t3 - t3 * 1.004591827 - exp(t * 
-		    -.0207962661) * 5.795834545e-8 + exp(t * -.003418326524) 
-		    * 9.636668658e-11 + exp(t * -.400952381) * 
-		    1.865432436e-4 + exp(t * -.06523809524) * 1.004405341;
-	}
-        break; 
-*/
+      // no tail cancellation, tp= 30,t0=2.1
+      if (theTailShaping == NONE) {
+        // Computing 2nd power
+        t5 = t * t;
+        t7 = exp(t * -.1);
+        cat = exp(t * -.06523809524) * 16.18007335 + exp(t * -.400952381) * .01096643477 +
+              exp(t * -.01333333333) * .0924451733 + exp(t * -.002285714286) * .01409456303 -
+              t5 * 7.567748611e-5 * t * t7 - t5 * .01068701841 * t7 - t * .5685389492 * t7 - t7 * 16.29757952;
+      }
+      //  tail cancellation, tp= 30,t0=2.1
+      if (theTailShaping == CONSERVATIVE) {
+        // Computing 2nd power
+        t1 = t * t;
+        t3 = exp(t * -.1);
+        cat = t1 * -7.656495508e-5 * t * t3 - t1 * .01083991133 * t3 - t * .5783722846 * t3 - t3 * 16.59051472 +
+              exp(t * -.01333333333) * .1030053814 + exp(t * -.400952381) * .01099767919 +
+              exp(t * -.06523809524) * 16.47651166 + exp(t * -.003418326524) * 4.197333487e-11;
+      }
+      //  radical tail cancellation, tp= 30,t0=2.1
+      if (theTailShaping == RADICAL) {
+        // Computing 2nd power
+        t1 = t * t;
+        t3 = exp(t * -.1);
+        cat = t1 * -8.37792502e-5 * t * t3 - t1 * .0121345525 * t3 - t * .6655605456 * t3 - t3 * 19.25455777 -
+              exp(t * -.0207962661) * 9.823832281e-10 + exp(t * -.003418326524) * 2.394794269e-11 +
+              exp(t * -.400952381) * .01121357717 + exp(t * -.06523809524) * 19.2433442;
+      }
+      break;
+      /*
+        case 40:
+    // no tail cancellation, tp= 40,t0=2.1
+            if (theTailShaping == NONE) {
+    // Computing 2nd power
+                t5 = t * t;
+                t7 = exp(t * -.075);
+                cat = exp(t * -.06523809524) * 1097.590331 + exp(t *
+                        -.400952381) * .003362201622 + exp(t * -.01333333333) *
+                        .1521508944 + exp(t * -.002285714286) * .01939048554 -
+                        t5 * 1.579570388e-4 * t * t7 - t5 * .05281648589 * t7 -
+                        t * 10.72426897 * t7 - t7 * 1097.765235;
+            }
+    //  tail cancellation, tp= 40,t0=2.1
+            if (theTailShaping == CONSERVATIVE) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.075);
+                cat = t1 * -1.604563386e-4 * t * t3 - t1 * .05375692904 * t3 -
+                        t * 10.92023147 * t3 - t3 * 1117.872403 + exp(t *
+                        -.01333333333) * .1695314135 + exp(t * -.400952381) *
+                        .003371780853 + exp(t * -.06523809524) * 1117.6995 +
+    exp( t * -.003418326524) * 5.868522605e-11;
+            }
+    //  radical tail cancellation, tp= 40,t0=2.1
+            if (theTailShaping == RADICAL) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.075);
+                cat = t1 * -1.825484488e-4 * t * t3 - t1 * .06238107065 * t3 -
+                        t * 12.7419738 * t3 - t3 * 1305.393597 - exp(t *
+                        -.0207962661) * 1.889428819e-9 + exp(t * -.003418326524)
+                        * 3.348293469e-11 + exp(t * -.400952381) * .003437973064
+                        + exp(t * -.06523809524) * 1305.390159;
+            }
+            break;
+        case 50:
+    // no tail cancellation, tp= 50,t0=2.1
+            if (theTailShaping == NONE) {
+    // Computing 2nd power
+                t5 = t * t;
+                t7 = exp(t * -.06);
+                cat = exp(t * -.06523809524) * 6778.833027 + exp(t *
+                        -.400952381) * .001437922352 + exp(t * -.01333333333) *
+                        .237530423 + exp(t * -.002285714286) * .02501521924 + t5
+                        * 1.670506271e-4 * t * t7 - t5 * .09338148045 * t7 + t *
+                         35.49613478 * t7 - t7 * 6779.097011;
+            }
+    //  tail cancellation, tp= 50,t0=2.1
+            if (theTailShaping == CONSERVATIVE) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.06);
+                cat = t1 * 1.703945294e-4 * t * t3 - t1 * .09507342939 * t3 + t
+                        * 36.14686596 * t3 - t3 * 6903.29548 + exp(t *
+                        -.01333333333) * .2646640264 + exp(t * -.400952381) *
+                        .001442019131 + exp(t * -.06523809524) * 6903.029373 +
+                        exp(t * -.003418326524) * 7.696672009e-11;
+            }
+    //  radical tail cancellation, tp= 50,t0=2.1
+            if (theTailShaping == RADICAL) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.06);
+                cat = t1 * 2.028313098e-4 * t * t3 - t1 * .1106897038 * t3 + t *
+                         42.23121193 * t3 - t3 * 8062.228042 - exp(t *
+                        -.0207962661) * 3.535147864e-9 + exp(t * -.003418326524)
+                        * 4.391346571e-11 + exp(t * -.400952381) * .001470327741
+                        + exp(t * -.06523809524) * 8062.226572;
+            }
+            break;
+        case 60:
+    // no tail cancellation, tp= 60,t0=2.1
+            if (theTailShaping == NONE) {
+    // Computing 2nd power
+                t5 = t * t;
+                t7 = exp(t * -.05);
+                cat = exp(t * -.06523809524) * 54.77495457 + exp(t *
+                        -.400952381) * 7.412655802e-4 + exp(t * -.01333333333) *
+                        .3606757184 + exp(t * -.002285714286) * .03098847247 +
+                        t5 * 3.411745868e-5 * t * t7 - t5 * .006682738979 * t7 +
+                        t * .8202227541 * t7 - t7 * 55.16736002;
+            }
+    //  tail cancellation, tp= 60,t0=2.1
+            if (theTailShaping == CONSERVATIVE) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.05);
+                cat = t1 * 3.494700919e-5 * t * t3 - t1 * .006791801191 * t3 +
+                        t * .8354834745 * t3 - t3 * 56.18111721 + exp(t *
+                        -.01333333333) * .40187647 + exp(t * -.400952381) *
+                        7.433775162e-4 + exp(t * -.06523809524) * 55.77849736 +
+                        exp(t * -.003418326524) * 9.696210758e-11;
+            }
+    //  radical tail cancellation, tp= 60,t0=2.1
+            if (theTailShaping == RADICAL) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.05);
+                cat = t1 * 4.387761992e-5 * t * t3 - t1 * .007610015855 * t3 +
+                        t * .9929540112 * t3 - t3 * 65.14590792 - exp(t *
+                        -.0207962661) * 6.643853476e-9 + exp(t * -.003418326524)
+                        * 5.532186095e-11 + exp(t * -.400952381) * 7.57970932e-4
+                        + exp(t * -.06523809524) * 65.14514995;
+            }
+            break;
+        case 70:
+    // no tail cancellation, tp= 70,t0=2.1
+            if (theTailShaping == NONE) {
+    // Computing 2nd power
+                t5 = t * t;
+                t7 = exp(t * -.04285714286);
+                cat = exp(t * -.06523809524) * 7.412251365 + exp(t *
+                        -.400952381) * 4.306575393e-4 + exp(t * -.01333333333) *
+                        .5403469187 + exp(t * -.002285714286) * .03733123063 +
+                        t5 * 1.441232259e-5 * t * t7 - t5 * .002150258989 * t7 +
+                        t * .1485797804 * t7 - t7 * 7.990360172;
+            }
+    //  tail cancellation, tp= 70,t0=2.1
+            if (theTailShaping == CONSERVATIVE) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.04285714286);
+                cat = t1 * 1.48262187e-5 * t * t3 - t1 * .002180526664 * t3 + t
+                        * .1513118077 * t3 - t3 * 8.150556465 + exp(t *
+                        -.01333333333) * .6020718923 + exp(t * -.400952381) *
+                        4.318845237e-4 + exp(t * -.06523809524) * 7.548052688 +
+                        exp(t * -.003418326524) * 1.188301202e-10;
+            }
+    //  radical tail cancellation, tp= 70,t0=2.1
+            if (theTailShaping == RADICAL) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.04285714286);
+                cat = t1 * 1.984175252e-5 * t * t3 - t1 * .00223612384 * t3 + t
+                        * .1974584549 * t3 - t3 * 8.816006345 - exp(t *
+                        -.0207962661) * 1.284819542e-8 + exp(t * -.003418326524)
+                        * 6.779868504e-11 + exp(t * -.400952381) * 4.40362949e-4
+                        + exp(t * -.06523809524) * 8.815565996;
+            }
+            break;
+        case 80:
+    // no tail cancellation, tp= 80,t0=2.1
+            if (theTailShaping == NONE) {
+    // Computing 2nd power
+                t5 = t * t;
+                t7 = exp(t * -.0375);
+                cat = exp(t * -.06523809524) * 2.104660307 + exp(t *
+                        -.400952381) * 2.718693973e-4 + exp(t * -.01333333333) *
+                        .806342238 + exp(t * -.002285714286) * .04406584799 + t5
+                        * 7.444156851e-6 * t * t7 - t5 * .00109040647 * t7 + t *
+                         .03743972817 * t7 - t7 * 2.955340262;
+            }
+    //  tail cancellation, tp= 80,t0=2.1
+            if (theTailShaping == CONSERVATIVE) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.0375);
+                cat = t1 * 7.69154327e-6 * t * t3 - t1 * .001104867276 * t3 + t
+                        * .0378353391 * t3 - t3 * 3.041945271 + exp(t *
+                        -.01333333333) * .8984524213 + exp(t * -.400952381) *
+                        2.726439789e-4 + exp(t * -.06523809524) * 2.143220205 +
+                        exp(t * -.003418326524) * 1.42745537e-10;
+            }
+    //  radical tail cancellation, tp= 80,t0=2.1
+            if (theTailShaping == RADICAL) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.0375);
+                cat = t1 * 1.112798871e-5 * t * t3 - t1 * 9.813148933e-4 * t3 +
+                        t * .06953288418 * t3 - t3 * 2.503400292 - exp(t *
+                        -.0207962661) * 2.618804719e-8 + exp(t * -.003418326524)
+                        * 8.144365827e-11 + exp(t * -.400952381) *
+                        2.779963161e-4 + exp(t * -.06523809524) * 2.50312232;
+            }
+            break;
+        case 90:
+    // no tail cancellation, tp= 90,t0=2.1
+            if (theTailShaping == NONE) {
+    // Computing 2nd power
+                t5 = t * t;
+                t7 = exp(t * -.03333333333);
+                cat = exp(t * -.06523809524) * .8445180788 + exp(t *
+                        -.400952381) * 1.824319111e-4 + exp(t * -.01333333333) *
+                        1.207282396 + exp(t * -.002285714286) * .051216146 + t5
+    * 4.216536082e-6 * t * t7 - t5 * 7.082920848e-4 * t7 + t
+                        * .001275426356 * t7 - t7 * 2.103199053;
+            }
+    //  tail cancellation, tp= 90,t0=2.1
+            if (theTailShaping == CONSERVATIVE) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.03333333333);
+                cat = t1 * 4.376178381e-6 * t * t3 - t1 * 7.190991486e-4 * t3 +
+                        t * 6.011974229e-4 * t3 - t3 * 2.205366435 + exp(t *
+                        -.01333333333) * 1.345192821 + exp(t * -.400952381) *
+                        1.829516768e-4 + exp(t * -.06523809524) * .8599906622 +
+                        exp(t * -.003418326524) * 1.68900989e-10;
+            }
+    //  radical tail cancellation, tp= 90,t0=2.1
+            if (theTailShaping == RADICAL) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.03333333333);
+                cat = t1 * 6.981183555e-6 * t * t3 - t1 * 5.238041184e-4 * t3 +
+                        t * .03211389084 * t3 - t3 * 1.004591827 - exp(t *
+                        -.0207962661) * 5.795834545e-8 + exp(t * -.003418326524)
+                        * 9.636668658e-11 + exp(t * -.400952381) *
+                        1.865432436e-4 + exp(t * -.06523809524) * 1.004405341;
+            }
+            break;
+    */
     case 100:
-// no tail cancellation, tp=100,t0=2.1 
-	if (theTailShaping == NONE) {
-// Computing 2nd power 
-	    t5 = t * t;
-	    t7 = exp(t * -.03);
-	    cat = exp(t * -.06523809524) * .4137221868 + exp(t * 
-		    -.400952381) * 1.282766787e-4 + exp(t * -.01333333333) * 
-		    1.824993745 + exp(t * -.002285714286) * .05880752038 + 
-		    t5 * 2.491640871e-6 * t * t7 - t5 * 5.417458918e-4 * t7 
-		    - t * .01742000448 * t7 - t7 * 2.297651729;
-	}
-//  tail cancellation, tp=100,t0=2.1 
-	if (theTailShaping == CONSERVATIVE) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.03);
-	    cat = t1 * 2.597806608e-6 * t * t3 - t1 * 5.528471798e-4 * t3 -
-		    t * .0189975081 * t3 - t3 * 2.454897362 + exp(t * 
-		    -.01333333333) * 2.033466647 + exp(t * -.400952381) * 
-		    1.28642151e-4 + exp(t * -.06523809524) * .4213020729 + 
-		    exp(t * -.003418326524) * 1.975089906e-10;
-	}
-//  radical tail cancellation, tp=100,t0=2.1 
-	if (theTailShaping == RADICAL) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.03);
-	    cat = t1 * 4.704262123e-6 * t * t3 - t1 * 3.14519427e-4 * t3 +
-		    t * .01738754854 * t3 - t3 * .4921806115 - exp(t * 
-		    -.0207962661) * 1.454692205e-7 + exp(t * -.003418326524) 
-		    * 1.126890204e-10 + exp(t * -.400952381) * 
-		    1.311675549e-4 + exp(t * -.06523809524) * .4920495894;
-	}
-        break; 
-/*
-    case 150:
-// no tail cancellation, tp=150,t0=2.1 
-	if (theTailShaping == NONE) {
-// Computing 2nd power 
-	    t5 = t * t;
-	    t7 = exp(t * -.02);
-	    cat = exp(t * -.06523809524) * .0451302243 + exp(t * 
-		    -.400952381) * 3.417148182e-5 + exp(t * -.01333333333) * 
-		    21.12261275 + exp(t * -.002285714286) * .1043948969 - t5 
-		    * 1.285903907e-7 * t * t7 - t5 * 5.344294733e-4 * t7 -
-		    t * .1406120762 * t7 - t7 * 21.27217204;
-	}
-//  tail cancellation, tp=150,t0=2.1 
-	if (theTailShaping == CONSERVATIVE) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.02);
-	    cat = t1 * -1.373737668e-7 * t * t3 - t1 * 5.725228237e-4 * t3 - 
-		    t * .1548112258 * t3 - t3 * 23.58148492 + exp(t * 
-		    -.01333333333) * 23.5354936 + exp(t * -.400952381) * 
-		    3.426883961e-5 + exp(t * -.06523809524) * .04595706409 + 
-		    exp(t * -.003418326524) * 3.864816979e-10;
-	}
-//  radical tail cancellation, tp=150,t0=2.1 
-	if (theTailShaping == RADICAL) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.02);
-	    cat = t1 * 1.150149576e-6 * t * t3 - t1 * 5.745717877e-5 * t3 +
-		    t * .00244082808 * t3 - t3 * .05294004164 - exp(t * 
-		    -.0207962661) * 7.693441476e-4 + exp(t * -.003418326524) 
-		    * 2.205076529e-10 + exp(t * -.400952381) * 
-		    3.494157914e-5 + exp(t * -.06523809524) * .05367444399;
-	}
-        break; 
-    case 200:
-// no tail cancellation, tp=200,t0=2.1 
-	if (theTailShaping == NONE) {
-// Computing 2nd power 
-	    t5 = t * t;
-	    t7 = exp(t * -.015);
-	    cat = exp(t * -.06523809524) * .01251802645 + exp(t * 
-		    -.400952381) * 1.36834457e-5 + exp(t * -.01333333333) * 
-		    2281.242177 + exp(t * -.002285714286) * .1659547829 - t5 
-		    * 1.421417147e-6 * t * t7 - t5 * .003198621512 * t7 - t 
-		    * 3.803546128 * t7 - t7 * 2281.420663;
-	}
-//  tail cancellation, tp=200,t0=2.1 
-	if (theTailShaping == CONSERVATIVE) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.015);
-	    cat = t1 * -1.560422488e-6 * t * t3 - t1 * .003547432409 * t3 -
-		    t * 4.235743145 * t3 - t3 * 2541.846068 + exp(t * 
-		    -.01333333333) * 2541.833308 + exp(t * -.400952381) * 
-		    1.372243114e-5 + exp(t * -.06523809524) * .01274737169 + 
-		    exp(t * -.003418326524) * 6.850793727e-10;
-	}
-//  radical tail cancellation, tp=200,t0=2.1 
-	if (theTailShaping == RADICAL) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.015);
-	    cat = t1 * 4.486861205e-7 * t * t3 - t1 * 1.982974483e-5 * t3 +
-		    t * 7.533435174e-4 * t3 - t3 * .01490186176 - exp(t * 
-		    -.0207962661) * 1.155963393e-7 + exp(t * -.003418326524) 
-		    * 3.908729581e-10 + exp(t * -.400952381) * 
-		    1.399181936e-5 + exp(t * -.06523809524) * .01488798515;
-	}
-        break;
-    case 250:
-// no tail cancellation, tp=250,t0=2.1 
-	if (theTailShaping == NONE) {
-// Computing 2nd power 
-	    t5 = t * t;
-	    t7 = exp(t * -.012);
-	    cat = exp(t * -.06523809524) * .005082161364 + exp(t * 
-		    -.400952381) * 6.792264583e-6 + exp(t * -.01333333333) * 
-		    2851.552722 + exp(t * -.002285714286) * .2493354963 + t5 
-		    * 1.282866561e-6 * t * t7 - t5 * .002554194047 * t7 + t 
-		    * 3.799921386 * t7 - t7 * 2851.807146;
-	}
-//  tail cancellation, tp=250,t0=2.1 
-	if (theTailShaping == CONSERVATIVE) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.012);
-	    cat = t1 * 1.452179735e-6 * t * t3 - t1 * .0028321086 * t3 + t *
-		     4.236667018 * t3 - t3 * 3177.296817 + exp(t * 
-		    -.01333333333) * 3177.291635 + exp(t * -.400952381) * 
-		    6.811616389e-6 + exp(t * -.06523809524) * .005175272648 
-		    + exp(t * -.003418326524) * 1.163611956e-9;
-	}
-//  radical tail cancellation, tp=250,t0=2.1 
-	if (theTailShaping == RADICAL) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.012);
-	    cat = t1 * 2.201206315e-7 * t * t3 - t1 * 9.091071906e-6 * t3 +
-		    t * 3.244901734e-4 * t3 - t3 * .006051269645 - exp(t * 
-		    -.0207962661) * 1.115870681e-8 + exp(t * -.003418326524) 
-		    * 6.639003673e-10 + exp(t * -.400952381) * 
-		    6.945336809e-6 + exp(t * -.06523809524) * .006044334803;
-	}
-        break; 
-    case 300:
-// no tail cancellation, tp=300,t0=2.1 
-	if (theTailShaping == NONE) {
-// Computing 2nd power 
-	    t5 = t * t ;
-	    t7 = exp(t * -.01);
-	    cat = exp(t * -.06523809524) * .002537698188 + exp(t * 
-		    -.400952381) * 3.850890276e-6 + exp(t * -.01333333333) * 
-		    42.24522552 + exp(t * -.002285714286) * .3628281578 + t5 
-		    * 3.42649397e-7 * t * t7 - t5 * 2.496575507e-4 * t7 + t 
-		    * .1381601414 * t7 - t7 * 42.61059522;
-	}
-//  tail cancellation, tp=300,t0=2.1 
-	if (theTailShaping == CONSERVATIVE) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.01);
-	    cat = t1 * 4.016144767e-7 * t * t3 - t1 * 2.657431191e-4 * t3 +
-		    t * .1570475462 * t3 - t3 * 47.07357524 + exp(t * 
-		    -.01333333333) * 47.07098718 + exp(t * -.400952381) * 
-		    3.861861828e-6 + exp(t * -.06523809524) * .002584191857 
-		    + exp(t * -.003418326524) * 1.946287754e-9;
-	}
-//  radical tail cancellation, tp=300,t0=2.1 
-	if (theTailShaping == RADICAL) {
-// Computing 2nd power 
-	    t1 = t * t;
-	    t3 = exp(t * -.01);
-	    cat = t1 * 1.239979555e-7 * t * t3 - t1 * 4.905476843e-6 * t3 +
-		    t * 1.682559598e-4 * t3 - t3 * .00302208046 - exp(t * 
-		    -.0207962661) * 2.845569802e-9 + exp(t * -.003418326524) 
-		    * 1.110457097e-9 + exp(t * -.400952381) * 3.937674932e-6 
-		    + exp(t * -.06523809524) * .00301814452;
-	}
-        break;
-*/
+      // no tail cancellation, tp=100,t0=2.1
+      if (theTailShaping == NONE) {
+        // Computing 2nd power
+        t5 = t * t;
+        t7 = exp(t * -.03);
+        cat = exp(t * -.06523809524) * .4137221868 + exp(t * -.400952381) * 1.282766787e-4 +
+              exp(t * -.01333333333) * 1.824993745 + exp(t * -.002285714286) * .05880752038 +
+              t5 * 2.491640871e-6 * t * t7 - t5 * 5.417458918e-4 * t7 - t * .01742000448 * t7 - t7 * 2.297651729;
+      }
+      //  tail cancellation, tp=100,t0=2.1
+      if (theTailShaping == CONSERVATIVE) {
+        // Computing 2nd power
+        t1 = t * t;
+        t3 = exp(t * -.03);
+        cat = t1 * 2.597806608e-6 * t * t3 - t1 * 5.528471798e-4 * t3 - t * .0189975081 * t3 - t3 * 2.454897362 +
+              exp(t * -.01333333333) * 2.033466647 + exp(t * -.400952381) * 1.28642151e-4 +
+              exp(t * -.06523809524) * .4213020729 + exp(t * -.003418326524) * 1.975089906e-10;
+      }
+      //  radical tail cancellation, tp=100,t0=2.1
+      if (theTailShaping == RADICAL) {
+        // Computing 2nd power
+        t1 = t * t;
+        t3 = exp(t * -.03);
+        cat = t1 * 4.704262123e-6 * t * t3 - t1 * 3.14519427e-4 * t3 + t * .01738754854 * t3 - t3 * .4921806115 -
+              exp(t * -.0207962661) * 1.454692205e-7 + exp(t * -.003418326524) * 1.126890204e-10 +
+              exp(t * -.400952381) * 1.311675549e-4 + exp(t * -.06523809524) * .4920495894;
+      }
+      break;
+      /*
+        case 150:
+    // no tail cancellation, tp=150,t0=2.1
+            if (theTailShaping == NONE) {
+    // Computing 2nd power
+                t5 = t * t;
+                t7 = exp(t * -.02);
+                cat = exp(t * -.06523809524) * .0451302243 + exp(t *
+                        -.400952381) * 3.417148182e-5 + exp(t * -.01333333333) *
+                        21.12261275 + exp(t * -.002285714286) * .1043948969 - t5
+                        * 1.285903907e-7 * t * t7 - t5 * 5.344294733e-4 * t7 -
+                        t * .1406120762 * t7 - t7 * 21.27217204;
+            }
+    //  tail cancellation, tp=150,t0=2.1
+            if (theTailShaping == CONSERVATIVE) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.02);
+                cat = t1 * -1.373737668e-7 * t * t3 - t1 * 5.725228237e-4 * t3 -
+                        t * .1548112258 * t3 - t3 * 23.58148492 + exp(t *
+                        -.01333333333) * 23.5354936 + exp(t * -.400952381) *
+                        3.426883961e-5 + exp(t * -.06523809524) * .04595706409 +
+                        exp(t * -.003418326524) * 3.864816979e-10;
+            }
+    //  radical tail cancellation, tp=150,t0=2.1
+            if (theTailShaping == RADICAL) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.02);
+                cat = t1 * 1.150149576e-6 * t * t3 - t1 * 5.745717877e-5 * t3 +
+                        t * .00244082808 * t3 - t3 * .05294004164 - exp(t *
+                        -.0207962661) * 7.693441476e-4 + exp(t * -.003418326524)
+                        * 2.205076529e-10 + exp(t * -.400952381) *
+                        3.494157914e-5 + exp(t * -.06523809524) * .05367444399;
+            }
+            break;
+        case 200:
+    // no tail cancellation, tp=200,t0=2.1
+            if (theTailShaping == NONE) {
+    // Computing 2nd power
+                t5 = t * t;
+                t7 = exp(t * -.015);
+                cat = exp(t * -.06523809524) * .01251802645 + exp(t *
+                        -.400952381) * 1.36834457e-5 + exp(t * -.01333333333) *
+                        2281.242177 + exp(t * -.002285714286) * .1659547829 - t5
+                        * 1.421417147e-6 * t * t7 - t5 * .003198621512 * t7 - t
+                        * 3.803546128 * t7 - t7 * 2281.420663;
+            }
+    //  tail cancellation, tp=200,t0=2.1
+            if (theTailShaping == CONSERVATIVE) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.015);
+                cat = t1 * -1.560422488e-6 * t * t3 - t1 * .003547432409 * t3 -
+                        t * 4.235743145 * t3 - t3 * 2541.846068 + exp(t *
+                        -.01333333333) * 2541.833308 + exp(t * -.400952381) *
+                        1.372243114e-5 + exp(t * -.06523809524) * .01274737169 +
+                        exp(t * -.003418326524) * 6.850793727e-10;
+            }
+    //  radical tail cancellation, tp=200,t0=2.1
+            if (theTailShaping == RADICAL) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.015);
+                cat = t1 * 4.486861205e-7 * t * t3 - t1 * 1.982974483e-5 * t3 +
+                        t * 7.533435174e-4 * t3 - t3 * .01490186176 - exp(t *
+                        -.0207962661) * 1.155963393e-7 + exp(t * -.003418326524)
+                        * 3.908729581e-10 + exp(t * -.400952381) *
+                        1.399181936e-5 + exp(t * -.06523809524) * .01488798515;
+            }
+            break;
+        case 250:
+    // no tail cancellation, tp=250,t0=2.1
+            if (theTailShaping == NONE) {
+    // Computing 2nd power
+                t5 = t * t;
+                t7 = exp(t * -.012);
+                cat = exp(t * -.06523809524) * .005082161364 + exp(t *
+                        -.400952381) * 6.792264583e-6 + exp(t * -.01333333333) *
+                        2851.552722 + exp(t * -.002285714286) * .2493354963 + t5
+                        * 1.282866561e-6 * t * t7 - t5 * .002554194047 * t7 + t
+                        * 3.799921386 * t7 - t7 * 2851.807146;
+            }
+    //  tail cancellation, tp=250,t0=2.1
+            if (theTailShaping == CONSERVATIVE) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.012);
+                cat = t1 * 1.452179735e-6 * t * t3 - t1 * .0028321086 * t3 + t *
+                         4.236667018 * t3 - t3 * 3177.296817 + exp(t *
+                        -.01333333333) * 3177.291635 + exp(t * -.400952381) *
+                        6.811616389e-6 + exp(t * -.06523809524) * .005175272648
+                        + exp(t * -.003418326524) * 1.163611956e-9;
+            }
+    //  radical tail cancellation, tp=250,t0=2.1
+            if (theTailShaping == RADICAL) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.012);
+                cat = t1 * 2.201206315e-7 * t * t3 - t1 * 9.091071906e-6 * t3 +
+                        t * 3.244901734e-4 * t3 - t3 * .006051269645 - exp(t *
+                        -.0207962661) * 1.115870681e-8 + exp(t * -.003418326524)
+                        * 6.639003673e-10 + exp(t * -.400952381) *
+                        6.945336809e-6 + exp(t * -.06523809524) * .006044334803;
+            }
+            break;
+        case 300:
+    // no tail cancellation, tp=300,t0=2.1
+            if (theTailShaping == NONE) {
+    // Computing 2nd power
+                t5 = t * t ;
+                t7 = exp(t * -.01);
+                cat = exp(t * -.06523809524) * .002537698188 + exp(t *
+                        -.400952381) * 3.850890276e-6 + exp(t * -.01333333333) *
+                        42.24522552 + exp(t * -.002285714286) * .3628281578 + t5
+                        * 3.42649397e-7 * t * t7 - t5 * 2.496575507e-4 * t7 + t
+                        * .1381601414 * t7 - t7 * 42.61059522;
+            }
+    //  tail cancellation, tp=300,t0=2.1
+            if (theTailShaping == CONSERVATIVE) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.01);
+                cat = t1 * 4.016144767e-7 * t * t3 - t1 * 2.657431191e-4 * t3 +
+                        t * .1570475462 * t3 - t3 * 47.07357524 + exp(t *
+                        -.01333333333) * 47.07098718 + exp(t * -.400952381) *
+                        3.861861828e-6 + exp(t * -.06523809524) * .002584191857
+                        + exp(t * -.003418326524) * 1.946287754e-9;
+            }
+    //  radical tail cancellation, tp=300,t0=2.1
+            if (theTailShaping == RADICAL) {
+    // Computing 2nd power
+                t1 = t * t;
+                t3 = exp(t * -.01);
+                cat = t1 * 1.239979555e-7 * t * t3 - t1 * 4.905476843e-6 * t3 +
+                        t * 1.682559598e-4 * t3 - t3 * .00302208046 - exp(t *
+                        -.0207962661) * 2.845569802e-9 + exp(t * -.003418326524)
+                        * 1.110457097e-9 + exp(t * -.400952381) * 3.937674932e-6
+                        + exp(t * -.06523809524) * .00301814452;
+            }
+            break;
+    */
     default:
-        edm::LogError("CSCStripElectronicsSim") << "Bad shaping time CSCStripElectronicsSim " 
-             << theShapingTime;
-        break;
-    }
-    return cat;
+      edm::LogError("CSCStripElectronicsSim") << "Bad shaping time CSCStripElectronicsSim " << theShapingTime;
+      break;
+  }
+  return cat;
 }
-
diff --git a/SimMuon/CSCDigitizer/src/CSCStripAmpResponse.h b/SimMuon/CSCDigitizer/src/CSCStripAmpResponse.h
index 79d8e30fa4285..4793d422853f0 100644
--- a/SimMuon/CSCDigitizer/src/CSCStripAmpResponse.h
+++ b/SimMuon/CSCDigitizer/src/CSCStripAmpResponse.h
@@ -1,11 +1,9 @@
 #ifndef CSCDigitizer_CSCStripAmpResponse_h
 #define CSCDigitizer_CSCStripAmpResponse_h
 
-
-class CSCStripAmpResponse
-{
+class CSCStripAmpResponse {
 public:
-  enum tailShapes {NONE, CONSERVATIVE, RADICAL};
+  enum tailShapes { NONE, CONSERVATIVE, RADICAL };
 
   CSCStripAmpResponse(int shapingTime, int tailShaping);
 
@@ -17,4 +15,3 @@ class CSCStripAmpResponse
 };
 
 #endif
-
diff --git a/SimMuon/CSCDigitizer/src/CSCStripConditions.cc b/SimMuon/CSCDigitizer/src/CSCStripConditions.cc
index 2e80719e46b47..c4a6eee24c733 100644
--- a/SimMuon/CSCDigitizer/src/CSCStripConditions.cc
+++ b/SimMuon/CSCDigitizer/src/CSCStripConditions.cc
@@ -4,53 +4,34 @@
 
 #include "CLHEP/Random/RandGaussQ.h"
 
-template class CorrelatedNoisifier< CSCStripConditions::CSCCorrelatedNoiseMatrix > ;
+template class CorrelatedNoisifier<CSCStripConditions::CSCCorrelatedNoiseMatrix>;
 
-template
-void
-CorrelatedNoisifier< CSCStripConditions::CSCCorrelatedNoiseMatrix
-		     >::noisify(CSCAnalogSignal&,
-                                CLHEP::HepRandomEngine*,
-				const std::vector<double>* rangau) const ;
+template void CorrelatedNoisifier<CSCStripConditions::CSCCorrelatedNoiseMatrix>::noisify(
+    CSCAnalogSignal &, CLHEP::HepRandomEngine *, const std::vector<double> *rangau) const;
 
+CSCStripConditions::CSCStripConditions() : theNoisifier(nullptr) {}
 
-CSCStripConditions::CSCStripConditions()
-  : theNoisifier(nullptr)
- {}
+CSCStripConditions::~CSCStripConditions() {}
 
-
-CSCStripConditions::~CSCStripConditions() 
-{
-}
-
-
-float CSCStripConditions::smearedGain(const CSCDetId & detId, int channel, CLHEP::HepRandomEngine* engine) const
-{
-  return CLHEP::RandGaussQ::shoot(engine, gain(detId, channel), gainSigma(detId, channel) );
+float CSCStripConditions::smearedGain(const CSCDetId &detId, int channel, CLHEP::HepRandomEngine *engine) const {
+  return CLHEP::RandGaussQ::shoot(engine, gain(detId, channel), gainSigma(detId, channel));
 }
 
-
-void CSCStripConditions::noisify(const CSCDetId & detId, CSCAnalogSignal & signal, CLHEP::HepRandomEngine* engine)
-{
+void CSCStripConditions::noisify(const CSCDetId &detId, CSCAnalogSignal &signal, CLHEP::HepRandomEngine *engine) {
   const int nScaBins = 8;
   const float scaBinSize = 50.;
   int channel = signal.getElement();
   std::vector<float> binValues(nScaBins, 0.);
   // use a temporary signal, in case we have to rebin
-  CSCAnalogSignal tmpSignal(channel, scaBinSize, binValues,
-                            0., signal.getTimeOffset());
+  CSCAnalogSignal tmpSignal(channel, scaBinSize, binValues, 0., signal.getTimeOffset());
 
-  fetchNoisifier(detId, channel );
+  fetchNoisifier(detId, channel);
   theNoisifier->noisify(tmpSignal, engine);
   // noise matrix is in ADC counts. onvert to fC
-  tmpSignal *= 1./gain(detId, channel);
+  tmpSignal *= 1. / gain(detId, channel);
   signal.superimpose(tmpSignal);
 }
 
- 
-float CSCStripConditions::analogNoise(const CSCDetId & detId, int channel) const
-{
+float CSCStripConditions::analogNoise(const CSCDetId &detId, int channel) const {
   return sqrt(2) * pedestalSigma(detId, channel) / gain(detId, channel);
 }
-
-
diff --git a/SimMuon/CSCDigitizer/src/CSCStripConditions.h b/SimMuon/CSCDigitizer/src/CSCStripConditions.h
index 83408b5c262fb..a993d3337b4df 100644
--- a/SimMuon/CSCDigitizer/src/CSCStripConditions.h
+++ b/SimMuon/CSCDigitizer/src/CSCStripConditions.h
@@ -1,17 +1,16 @@
 #ifndef CSCDigitizer_CSCStripConditions_h
 #define CSCDigitizer_CSCStripConditions_h
 
-#include "SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.h"
-#include "SimMuon/CSCDigitizer/src/CSCAnalogSignal.h"
 #include "DataFormats/MuonDetId/interface/CSCDetId.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "SimGeneral/NoiseGenerators/interface/CorrelatedNoisifier.h"
+#include "SimMuon/CSCDigitizer/src/CSCAnalogSignal.h"
 
 namespace CLHEP {
   class HepRandomEngine;
 }
 
-class CSCStripConditions
-{
+class CSCStripConditions {
 public:
   typedef math::ErrorD<8>::type CSCCorrelatedNoiseMatrix;
   typedef CorrelatedNoisifier<CSCCorrelatedNoiseMatrix> CSCCorrelatedNoisifier;
@@ -20,35 +19,37 @@ class CSCStripConditions
   virtual ~CSCStripConditions();
 
   /// superimposes noise, in fC, on the signal
-  void noisify(const CSCDetId & detId, CSCAnalogSignal & signal, CLHEP::HepRandomEngine*);
+  void noisify(const CSCDetId &detId, CSCAnalogSignal &signal, CLHEP::HepRandomEngine *);
 
-  virtual void initializeEvent(const edm::EventSetup & es) {}
+  virtual void initializeEvent(const edm::EventSetup &es) {}
 
   /// channels count from 1
   /// gain is the ratio that takes us from fC to ADC.  Nominally around 2
-  virtual float gain(const CSCDetId & detId, int channel) const = 0;
-  virtual float gainSigma(const CSCDetId & detId, int channel) const = 0;
-  virtual float smearedGain(const CSCDetId & detId, int channel, CLHEP::HepRandomEngine*) const;
+  virtual float gain(const CSCDetId &detId, int channel) const = 0;
+  virtual float gainSigma(const CSCDetId &detId, int channel) const = 0;
+  virtual float smearedGain(const CSCDetId &detId, int channel, CLHEP::HepRandomEngine *) const;
 
   /// in ADC counts
-  virtual float pedestal(const CSCDetId & detId, int channel) const = 0;
-  virtual float pedestalSigma(const CSCDetId & detId, int channel) const = 0;
+  virtual float pedestal(const CSCDetId &detId, int channel) const = 0;
+  virtual float pedestalSigma(const CSCDetId &detId, int channel) const = 0;
 
   /// calculated from pedestalSigma & gain
-  float analogNoise(const CSCDetId & detId, int channel) const;
+  float analogNoise(const CSCDetId &detId, int channel) const;
 
-  virtual void crosstalk(const CSCDetId&detId, int channel,
-                 double stripLength, bool leftRight, 
-                 float & capacitive, float & resistive) const = 0;
+  virtual void crosstalk(const CSCDetId &detId,
+                         int channel,
+                         double stripLength,
+                         bool leftRight,
+                         float &capacitive,
+                         float &resistive) const = 0;
 
   /// is supplied layer/chamber flagged as bad? (default impl. is no)
-  virtual bool isInBadChamber( const CSCDetId& id ) const { return false; }
-  
+  virtual bool isInBadChamber(const CSCDetId &id) const { return false; }
+
 protected:
-  virtual void fetchNoisifier(const CSCDetId & detId, int istrip) = 0;
+  virtual void fetchNoisifier(const CSCDetId &detId, int istrip) = 0;
 
-  CSCCorrelatedNoisifier * theNoisifier;
+  CSCCorrelatedNoisifier *theNoisifier;
 };
 
 #endif
-
diff --git a/SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.cc b/SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.cc
index bdd9c239c1ac1..8b64fb94bc9a7 100644
--- a/SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.cc
+++ b/SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.cc
@@ -1,60 +1,57 @@
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.h"
-#include "SimMuon/CSCDigitizer/src/CSCAnalogSignal.h"
-#include "SimMuon/CSCDigitizer/src/CSCCrosstalkGenerator.h"
-#include "SimMuon/CSCDigitizer/src/CSCStripConditions.h"
 #include "DataFormats/CSCDigi/interface/CSCComparatorDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCStripDigi.h"
-#include "Geometry/CSCGeometry/interface/CSCLayer.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "Geometry/CSCGeometry/interface/CSCChamberSpecs.h"
+#include "Geometry/CSCGeometry/interface/CSCLayer.h"
 #include "Geometry/CSCGeometry/interface/CSCLayerGeometry.h"
+#include "SimMuon/CSCDigitizer/src/CSCAnalogSignal.h"
+#include "SimMuon/CSCDigitizer/src/CSCCrosstalkGenerator.h"
 #include "SimMuon/CSCDigitizer/src/CSCDetectorHit.h"
+#include "SimMuon/CSCDigitizer/src/CSCStripConditions.h"
+#include "SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.h"
 
-#include "CLHEP/Units/GlobalPhysicalConstants.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"  
 #include "CLHEP/Random/RandGaussQ.h"
+#include "CLHEP/Units/GlobalPhysicalConstants.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 
-#include "boost/bind.hpp"  
-#include <list>
+#include "boost/bind.hpp"
 #include <cassert>
+#include <list>
 
 // This is CSCStripElectronicsSim.cc
 
-CSCStripElectronicsSim::CSCStripElectronicsSim(const edm::ParameterSet & p)
-: CSCBaseElectronicsSim(p),
-  theAmpResponse(theShapingTime, CSCStripAmpResponse::RADICAL),
-  theComparatorThreshold(20.),
-  theComparatorNoise(0.),
-  theComparatorRMSOffset(2.),
-  theComparatorSaturation(1057.),
-  theComparatorWait(50.),
-  theComparatorDeadTime(100.),
-  theDaqDeadTime(200.),
-  theTimingOffset(0.),
-  nScaBins_(p.getParameter<int>("nScaBins")),
-  doSuppression_(p.getParameter<bool>("doSuppression")),
-  doCrosstalk_(p.getParameter<bool>("doCrosstalk")),
-  theStripConditions(nullptr),
-  theCrosstalkGenerator(nullptr),
-  theComparatorClockJump(2),
-  sca_time_bin_size(50.),
-  sca_peak_bin(p.getParameter<int>("scaPeakBin")),
-  theComparatorTimeBinOffset(p.getParameter<double>("comparatorTimeBinOffset")),
-  theComparatorTimeOffset(p.getParameter<double>("comparatorTimeOffset")),
-  theComparatorSamplingTime(p.getParameter<double>("comparatorSamplingTime")),
-  theSCATimingOffsets(p.getParameter<std::vector<double> >("scaTimingOffsets"))
-{
-
-  if(doCrosstalk_) {
+CSCStripElectronicsSim::CSCStripElectronicsSim(const edm::ParameterSet &p)
+    : CSCBaseElectronicsSim(p),
+      theAmpResponse(theShapingTime, CSCStripAmpResponse::RADICAL),
+      theComparatorThreshold(20.),
+      theComparatorNoise(0.),
+      theComparatorRMSOffset(2.),
+      theComparatorSaturation(1057.),
+      theComparatorWait(50.),
+      theComparatorDeadTime(100.),
+      theDaqDeadTime(200.),
+      theTimingOffset(0.),
+      nScaBins_(p.getParameter<int>("nScaBins")),
+      doSuppression_(p.getParameter<bool>("doSuppression")),
+      doCrosstalk_(p.getParameter<bool>("doCrosstalk")),
+      theStripConditions(nullptr),
+      theCrosstalkGenerator(nullptr),
+      theComparatorClockJump(2),
+      sca_time_bin_size(50.),
+      sca_peak_bin(p.getParameter<int>("scaPeakBin")),
+      theComparatorTimeBinOffset(p.getParameter<double>("comparatorTimeBinOffset")),
+      theComparatorTimeOffset(p.getParameter<double>("comparatorTimeOffset")),
+      theComparatorSamplingTime(p.getParameter<double>("comparatorSamplingTime")),
+      theSCATimingOffsets(p.getParameter<std::vector<double>>("scaTimingOffsets")) {
+  if (doCrosstalk_) {
     theCrosstalkGenerator = new CSCCrosstalkGenerator();
   }
 
   fillAmpResponse();
 }
 
-
 CSCStripElectronicsSim::~CSCStripElectronicsSim() {
-  if(doCrosstalk_) {
+  if (doCrosstalk_) {
     delete theCrosstalkGenerator;
   }
 }
@@ -62,178 +59,156 @@ CSCStripElectronicsSim::~CSCStripElectronicsSim() {
 void CSCStripElectronicsSim::initParameters() {
   nElements = theLayerGeometry->numberOfStrips();
   theComparatorThreshold = 20.;
-  //selfTest();
+  // selfTest();
 
-  //calculate the offset to the peak
+  // calculate the offset to the peak
   float averageDistance = theLayer->surface().position().mag();
-  theAverageTimeOfFlight = averageDistance * cm / c_light; // Units of c_light: mm/ns
+  theAverageTimeOfFlight = averageDistance * cm / c_light;  // Units of c_light: mm/ns
   int chamberType = theSpecs->chamberType();
-  theTimingOffset = theShapingTime + theAverageTimeOfFlight
-         + theBunchTimingOffsets[chamberType];
-//TODO make sure config gets overridden
-  theSignalStartTime = theTimingOffset
-                     - (sca_peak_bin-1) * sca_time_bin_size;
-  theSignalStopTime = theSignalStartTime + nScaBins_*sca_time_bin_size;
-  theNumberOfSamples = nScaBins_*static_cast<int>(sca_time_bin_size/theSamplingTime);
-
-}  
-
-
-int CSCStripElectronicsSim::readoutElement(int strip) const {
-  return theLayerGeometry->channel(strip);
+  theTimingOffset = theShapingTime + theAverageTimeOfFlight + theBunchTimingOffsets[chamberType];
+  // TODO make sure config gets overridden
+  theSignalStartTime = theTimingOffset - (sca_peak_bin - 1) * sca_time_bin_size;
+  theSignalStopTime = theSignalStartTime + nScaBins_ * sca_time_bin_size;
+  theNumberOfSamples = nScaBins_ * static_cast<int>(sca_time_bin_size / theSamplingTime);
 }
 
+int CSCStripElectronicsSim::readoutElement(int strip) const { return theLayerGeometry->channel(strip); }
 
-float CSCStripElectronicsSim::calculateAmpResponse(float t) const
-{
-  return theAmpResponse.calculateAmpResponse(t);
-}
+float CSCStripElectronicsSim::calculateAmpResponse(float t) const { return theAmpResponse.calculateAmpResponse(t); }
 
-
-CSCAnalogSignal CSCStripElectronicsSim::makeNoiseSignal(int element, CLHEP::HepRandomEngine* engine) {
+CSCAnalogSignal CSCStripElectronicsSim::makeNoiseSignal(int element, CLHEP::HepRandomEngine *engine) {
   std::vector<float> noiseBins(nScaBins_);
   CSCAnalogSignal tmpSignal(element, sca_time_bin_size, noiseBins);
-  if(doNoise_) {
+  if (doNoise_) {
     theStripConditions->noisify(layerId(), tmpSignal, engine);
   }
   // now rebin it
   std::vector<float> binValues(theNumberOfSamples);
-  for(int ibin=0; ibin < theNumberOfSamples; ++ibin) {
-     binValues[ibin] = tmpSignal.getValue(ibin*theSamplingTime);
+  for (int ibin = 0; ibin < theNumberOfSamples; ++ibin) {
+    binValues[ibin] = tmpSignal.getValue(ibin * theSamplingTime);
   }
   CSCAnalogSignal finalSignal(element, theSamplingTime, binValues, 0., theSignalStartTime);
   return finalSignal;
 }
 
-
-float CSCStripElectronicsSim::comparatorReading(const CSCAnalogSignal & signal,
+float CSCStripElectronicsSim::comparatorReading(const CSCAnalogSignal &signal,
                                                 float time,
-                                                CLHEP::HepRandomEngine* engine) const {
-   return std::min(signal.getValue(time), theComparatorSaturation)
-     +  theComparatorRMSOffset * CLHEP::RandGaussQ::shoot(engine);
+                                                CLHEP::HepRandomEngine *engine) const {
+  return std::min(signal.getValue(time), theComparatorSaturation) +
+         theComparatorRMSOffset * CLHEP::RandGaussQ::shoot(engine);
 }
 
-
-void
-CSCStripElectronicsSim::runComparator(std::vector<CSCComparatorDigi> & result, CLHEP::HepRandomEngine* engine) {
+void CSCStripElectronicsSim::runComparator(std::vector<CSCComparatorDigi> &result, CLHEP::HepRandomEngine *engine) {
   // first, make a list of all the comparators we actually
   // need to run
   std::list<int> comparatorsWithSignal;
   CSCSignalMap::iterator signalMapItr;
-  for(signalMapItr = theSignalMap.begin();
-      signalMapItr != theSignalMap.end(); ++signalMapItr) {
+  for (signalMapItr = theSignalMap.begin(); signalMapItr != theSignalMap.end(); ++signalMapItr) {
     // Elements in signal map count from 1
     // 1,2->0,  3,4->1,  5,6->2, ...
-	comparatorsWithSignal.push_back( ((*signalMapItr).first-1)/2 );
+    comparatorsWithSignal.push_back(((*signalMapItr).first - 1) / 2);
   }
   // no need to sort
   comparatorsWithSignal.unique();
-  for(std::list<int>::iterator listItr = comparatorsWithSignal.begin();
-      listItr != comparatorsWithSignal.end(); ++listItr) {
+  for (std::list<int>::iterator listItr = comparatorsWithSignal.begin(); listItr != comparatorsWithSignal.end();
+       ++listItr) {
     int iComparator = *listItr;
     // find signal1 and signal2
     // iComparator counts from 0
     // icomp =0->1,2,  =1->3,4,  =2->5,6, ...
-    const CSCAnalogSignal & signal1 = find(readoutElement(iComparator*2 + 1), engine);
-    const CSCAnalogSignal & signal2 = find(readoutElement(iComparator*2 + 2), engine);
-    for(float time = theSignalStartTime +theComparatorTimeOffset; 
-        time < theSignalStopTime-theComparatorWait; 
-        time += theComparatorSamplingTime) 
-    {
-      if(comparatorReading(signal1, time, engine) > theComparatorThreshold
-         || comparatorReading(signal2, time, engine) > theComparatorThreshold) {
-	 // wait a bit, so we can run the comparator at the signal peak
+    const CSCAnalogSignal &signal1 = find(readoutElement(iComparator * 2 + 1), engine);
+    const CSCAnalogSignal &signal2 = find(readoutElement(iComparator * 2 + 2), engine);
+    for (float time = theSignalStartTime + theComparatorTimeOffset; time < theSignalStopTime - theComparatorWait;
+         time += theComparatorSamplingTime) {
+      if (comparatorReading(signal1, time, engine) > theComparatorThreshold ||
+          comparatorReading(signal2, time, engine) > theComparatorThreshold) {
+        // wait a bit, so we can run the comparator at the signal peak
         float comparatorTime = time;
         time += theComparatorWait;
-		  
+
         float height1 = comparatorReading(signal1, time, engine);
         float height2 = comparatorReading(signal2, time, engine);
-        int output = 0; 
+        int output = 0;
         int strip = 0;
-	 // distrip logic; comparator output is for pairs of strips:
-         // hit  bin  dec
-         // x--- 100   4
-         // -x-- 101   5
-         // --x- 110   6
-         // ---x 111   7
-         // just to prevent a copy
-         const CSCAnalogSignal * mainSignal = nullptr;
-         // pick the higher of the two strips in the pair
-         if(height1 > height2) {
-           mainSignal = &signal1;
-           float leftStrip = 0.;
-           if(iComparator > 0)  {
-             leftStrip = comparatorReading(find(readoutElement(iComparator*2), engine), time, engine);
-           }
-           // if this strip is higher than either of its neighbors, make a comparator digi
-           if(leftStrip < height1 && height1 > theComparatorThreshold) {
-             output = (leftStrip < height2);
-             strip = iComparator*2 + 1;
-           }
-         } else {
-           mainSignal = &signal2;
-           float rightStrip = 0.;
-           if(iComparator*2+3 <= nElements) {
-             rightStrip = comparatorReading(find(readoutElement(iComparator*2+3), engine), time, engine);
-           }
-           if(rightStrip < height2 && height2 > theComparatorThreshold) {
-             output = (height1 < rightStrip);
-             strip = iComparator*2 + 2;
-           }
-         }
-         if(strip != 0) {
-
-           float bxFloat = (comparatorTime-theTimingOffset)/theBunchSpacing
-                           + theComparatorTimeBinOffset + theOffsetOfBxZero;
-
-
-      // Comparator digi as of Nov-2006 adapted to real data: time word has 16 bits with set bit
-      // flagging appropriate bunch crossing, and bx 0 corresponding to 9th bit i.e.
-
-      //      1st bit set (bit 0) <-> bx -9
-      //      2nd              1  <-> bx -8
-      //      ...           ...       ....
-      //      8th              9  <-> bx  0
-      //      9th             10  <-> bx +1
-      //      ...           ...       ....
-      //     16th             15  <-> bx +6
-
-      // Parameter theOffsetOfBxZero = 9 @@WARNING! This offset may be changed (hardware)!
-
-           int timeWord = 0; // and this will remain if too early or late
-           if ( (bxFloat>= 0) && (bxFloat<16) ) 
- 	       timeWord = (1 << static_cast<int>(bxFloat) ); // set appropriate bit
-
-           CSCComparatorDigi newDigi(strip, output, timeWord);
-           result.push_back(newDigi);
-         }
-
-         // wait for the comparator to reset
-         time += theComparatorDeadTime;
-         // really should be zero, but strip signal doesn't go negative yet
-         float resetThreshold = 1;
-         while(time < theSignalStopTime
-            && mainSignal->getValue(time) > resetThreshold) {
-           time += theComparatorSamplingTime;
-         }
-
-       } // if over threshold
-    } // loop over time samples
-  }  // loop over comparators  
+        // distrip logic; comparator output is for pairs of strips:
+        // hit  bin  dec
+        // x--- 100   4
+        // -x-- 101   5
+        // --x- 110   6
+        // ---x 111   7
+        // just to prevent a copy
+        const CSCAnalogSignal *mainSignal = nullptr;
+        // pick the higher of the two strips in the pair
+        if (height1 > height2) {
+          mainSignal = &signal1;
+          float leftStrip = 0.;
+          if (iComparator > 0) {
+            leftStrip = comparatorReading(find(readoutElement(iComparator * 2), engine), time, engine);
+          }
+          // if this strip is higher than either of its neighbors, make a
+          // comparator digi
+          if (leftStrip < height1 && height1 > theComparatorThreshold) {
+            output = (leftStrip < height2);
+            strip = iComparator * 2 + 1;
+          }
+        } else {
+          mainSignal = &signal2;
+          float rightStrip = 0.;
+          if (iComparator * 2 + 3 <= nElements) {
+            rightStrip = comparatorReading(find(readoutElement(iComparator * 2 + 3), engine), time, engine);
+          }
+          if (rightStrip < height2 && height2 > theComparatorThreshold) {
+            output = (height1 < rightStrip);
+            strip = iComparator * 2 + 2;
+          }
+        }
+        if (strip != 0) {
+          float bxFloat =
+              (comparatorTime - theTimingOffset) / theBunchSpacing + theComparatorTimeBinOffset + theOffsetOfBxZero;
+
+          // Comparator digi as of Nov-2006 adapted to real data: time word has
+          // 16 bits with set bit flagging appropriate bunch crossing, and bx 0
+          // corresponding to 9th bit i.e.
+
+          //      1st bit set (bit 0) <-> bx -9
+          //      2nd              1  <-> bx -8
+          //      ...           ...       ....
+          //      8th              9  <-> bx  0
+          //      9th             10  <-> bx +1
+          //      ...           ...       ....
+          //     16th             15  <-> bx +6
+
+          // Parameter theOffsetOfBxZero = 9 @@WARNING! This offset may be
+          // changed (hardware)!
+
+          int timeWord = 0;  // and this will remain if too early or late
+          if ((bxFloat >= 0) && (bxFloat < 16))
+            timeWord = (1 << static_cast<int>(bxFloat));  // set appropriate bit
+
+          CSCComparatorDigi newDigi(strip, output, timeWord);
+          result.push_back(newDigi);
+        }
+
+        // wait for the comparator to reset
+        time += theComparatorDeadTime;
+        // really should be zero, but strip signal doesn't go negative yet
+        float resetThreshold = 1;
+        while (time < theSignalStopTime && mainSignal->getValue(time) > resetThreshold) {
+          time += theComparatorSamplingTime;
+        }
+
+      }  // if over threshold
+    }    // loop over time samples
+  }      // loop over comparators
   // sort by time
   sort(result.begin(), result.end());
 }
 
-
-std::list<int> 
-CSCStripElectronicsSim::getKeyStrips(const std::vector<CSCComparatorDigi> & comparators) const
-{
+std::list<int> CSCStripElectronicsSim::getKeyStrips(const std::vector<CSCComparatorDigi> &comparators) const {
   std::list<int> result;
-  for(std::vector<CSCComparatorDigi>::const_iterator compItr = comparators.begin();
-      compItr != comparators.end(); ++compItr)
-  {
-    if(std::abs(compItr->getTimeBin()-theOffsetOfBxZero) <= 2)
-    {
+  for (std::vector<CSCComparatorDigi>::const_iterator compItr = comparators.begin(); compItr != comparators.end();
+       ++compItr) {
+    if (std::abs(compItr->getTimeBin() - theOffsetOfBxZero) <= 2) {
       result.push_back(compItr->getStrip());
     }
   }
@@ -243,183 +218,151 @@ CSCStripElectronicsSim::getKeyStrips(const std::vector<CSCComparatorDigi> & comp
   return result;
 }
 
-
-std::list<int>
-CSCStripElectronicsSim::getKeyStripsFromMC() const
-{
+std::list<int> CSCStripElectronicsSim::getKeyStripsFromMC() const {
   // assumes the detector hit map is filled
   std::list<int> result;
-  transform(theDetectorHitMap.begin(), theDetectorHitMap.end(), 
-  //   back_inserter(result), boost::bind(&DetectorHitMap::value_type::first,_1));
-  // suggested code from Chris Jones
-      back_inserter(result), std::bind(&DetectorHitMap::value_type::first,std::placeholders::_1));
-  //  back_inserter(result), [](DetectorHitMap::value_type const& iValue) { return iValue.first; } );
+  transform(theDetectorHitMap.begin(),
+            theDetectorHitMap.end(),
+            //   back_inserter(result),
+            //   boost::bind(&DetectorHitMap::value_type::first,_1));
+            // suggested code from Chris Jones
+            back_inserter(result),
+            std::bind(&DetectorHitMap::value_type::first, std::placeholders::_1));
+  //  back_inserter(result), [](DetectorHitMap::value_type const& iValue) {
+  //  return iValue.first; } );
   result.sort();
   result.unique();
   return result;
 }
 
-
-std::list<int> 
-CSCStripElectronicsSim::channelsToRead(const std::list<int> & keyStrips, int window) const
-{
+std::list<int> CSCStripElectronicsSim::channelsToRead(const std::list<int> &keyStrips, int window) const {
   std::list<int> result;
   std::list<int>::const_iterator keyStripItr = keyStrips.begin();
-  if(doSuppression_)
-  {
-    for( ; keyStripItr != keyStrips.end(); ++keyStripItr)
-    { 
+  if (doSuppression_) {
+    for (; keyStripItr != keyStrips.end(); ++keyStripItr) {
       // pick the five strips around the comparator
-      for(int istrip = (*keyStripItr)-window; istrip <= (*keyStripItr)+window; ++istrip)
-      {
-        if(istrip>0 && istrip<= nElements)
-        {
+      for (int istrip = (*keyStripItr) - window; istrip <= (*keyStripItr) + window; ++istrip) {
+        if (istrip > 0 && istrip <= nElements) {
           result.push_back(readoutElement(istrip));
         }
       }
     }
     result.sort();
     result.unique();
-  }
-  else 
-  {
+  } else {
     // read the whole CFEB, 16 strips
     std::list<int> cfebsToRead;
-    for( ; keyStripItr != keyStrips.end(); ++keyStripItr)
-    {
-      int cfeb = (readoutElement(*keyStripItr)-1)/16;
+    for (; keyStripItr != keyStrips.end(); ++keyStripItr) {
+      int cfeb = (readoutElement(*keyStripItr) - 1) / 16;
       cfebsToRead.push_back(cfeb);
-      int remainder = (readoutElement(*keyStripItr)-1)%16;
+      int remainder = (readoutElement(*keyStripItr) - 1) % 16;
       // if we're within 3 strips of an edge, take neighboring CFEB, too
-      if(remainder < window && cfeb != 0)
-      {
-        cfebsToRead.push_back(cfeb-1);
+      if (remainder < window && cfeb != 0) {
+        cfebsToRead.push_back(cfeb - 1);
       }
       // the 'readouElement' makes it so that ME1/1 has just one CFEB
-      int maxCFEBs = readoutElement(nElements)/16 - 1;
-      if(remainder >= 16-window && cfeb != maxCFEBs)
-      {
-        cfebsToRead.push_back(cfeb+1);
+      int maxCFEBs = readoutElement(nElements) / 16 - 1;
+      if (remainder >= 16 - window && cfeb != maxCFEBs) {
+        cfebsToRead.push_back(cfeb + 1);
       }
     }
     cfebsToRead.sort();
     cfebsToRead.unique();
 
     // now convert the CFEBS to strips
-    for(std::list<int>::const_iterator cfebItr = cfebsToRead.begin();
-        cfebItr != cfebsToRead.end(); ++cfebItr)
-    {
-      for(int i = 1; i <= 16; ++i)
-      {
-        result.push_back((*cfebItr)*16 + i);
+    for (std::list<int>::const_iterator cfebItr = cfebsToRead.begin(); cfebItr != cfebsToRead.end(); ++cfebItr) {
+      for (int i = 1; i <= 16; ++i) {
+        result.push_back((*cfebItr) * 16 + i);
       }
     }
   }
   return result;
 }
-       
-
-   
 
-bool SortSignalsByTotal(const CSCAnalogSignal & s1,
-                        const CSCAnalogSignal & s2) {
-  return ( s1.getTotal() > s2.getTotal() );
+bool SortSignalsByTotal(const CSCAnalogSignal &s1, const CSCAnalogSignal &s2) {
+  return (s1.getTotal() > s2.getTotal());
 }
 
-
-void CSCStripElectronicsSim::fillDigis(CSCStripDigiCollection & digis, 
-                                       CSCComparatorDigiCollection & comparators,
-                                       CLHEP::HepRandomEngine* engine)
-{
-  if(doCrosstalk_) {
+void CSCStripElectronicsSim::fillDigis(CSCStripDigiCollection &digis,
+                                       CSCComparatorDigiCollection &comparators,
+                                       CLHEP::HepRandomEngine *engine) {
+  if (doCrosstalk_) {
     addCrosstalk(engine);
-  } 
+  }
 
   std::vector<CSCComparatorDigi> comparatorOutputs;
   runComparator(comparatorOutputs, engine);
   // copy these to the result
-  if(!comparatorOutputs.empty())
-  {
-    CSCComparatorDigiCollection::Range range(comparatorOutputs.begin(), 
-                                             comparatorOutputs.end());
+  if (!comparatorOutputs.empty()) {
+    CSCComparatorDigiCollection::Range range(comparatorOutputs.begin(), comparatorOutputs.end());
     comparators.put(range, layerId());
   }
 
-  //std::list<int> keyStrips = getKeyStrips(comparatorOutputs);
+  // std::list<int> keyStrips = getKeyStrips(comparatorOutputs);
   std::list<int> keyStrips = getKeyStripsFromMC();
   fillStripDigis(keyStrips, digis, engine);
 }
 
-
-void CSCStripElectronicsSim::fillStripDigis(const std::list<int> & keyStrips,
-                                            CSCStripDigiCollection & digis,
-                                            CLHEP::HepRandomEngine* engine)
-{
+void CSCStripElectronicsSim::fillStripDigis(const std::list<int> &keyStrips,
+                                            CSCStripDigiCollection &digis,
+                                            CLHEP::HepRandomEngine *engine) {
   std::list<int> stripsToDo = channelsToRead(keyStrips, 3);
   std::vector<CSCStripDigi> stripDigis;
   stripDigis.reserve(stripsToDo.size());
-  for(std::list<int>::const_iterator stripItr = stripsToDo.begin();
-      stripItr != stripsToDo.end(); ++stripItr)
-  {
-    createDigi( *stripItr, find(*stripItr, engine), stripDigis, engine);
+  for (std::list<int>::const_iterator stripItr = stripsToDo.begin(); stripItr != stripsToDo.end(); ++stripItr) {
+    createDigi(*stripItr, find(*stripItr, engine), stripDigis, engine);
   }
 
   CSCStripDigiCollection::Range stripRange(stripDigis.begin(), stripDigis.end());
   digis.put(stripRange, layerId());
 }
 
- 
-void CSCStripElectronicsSim::addCrosstalk(CLHEP::HepRandomEngine* engine) {
+void CSCStripElectronicsSim::addCrosstalk(CLHEP::HepRandomEngine *engine) {
   // this is needed so we can add a noise signal to the map
   // without messing up any iterators
   std::vector<CSCAnalogSignal> realSignals;
   realSignals.reserve(theSignalMap.size());
   CSCSignalMap::iterator mapI = theSignalMap.begin(), mapEnd = theSignalMap.end();
-  for( ; mapI != mapEnd; ++mapI) {
+  for (; mapI != mapEnd; ++mapI) {
     realSignals.push_back((*mapI).second);
   }
   sort(realSignals.begin(), realSignals.end(), SortSignalsByTotal);
-  std::vector<CSCAnalogSignal>::iterator realSignalItr = realSignals.begin(),
-                                         realSignalsEnd = realSignals.end();
-  for( ; realSignalItr != realSignalsEnd;  ++realSignalItr)
-  {
+  std::vector<CSCAnalogSignal>::iterator realSignalItr = realSignals.begin(), realSignalsEnd = realSignals.end();
+  for (; realSignalItr != realSignalsEnd; ++realSignalItr) {
     int thisStrip = (*realSignalItr).getElement();
     // add it to each neighbor
-    if(thisStrip > 1) {
+    if (thisStrip > 1) {
       int otherStrip = thisStrip - 1;
       addCrosstalk(*realSignalItr, thisStrip, otherStrip, engine);
     }
-    if(thisStrip < nElements) {
+    if (thisStrip < nElements) {
       int otherStrip = thisStrip + 1;
       addCrosstalk(*realSignalItr, thisStrip, otherStrip, engine);
     }
   }
 }
 
-
-void CSCStripElectronicsSim::addCrosstalk(const CSCAnalogSignal & signal,
-                                          int thisStrip, int otherStrip,
-                                          CLHEP::HepRandomEngine* engine)
-{
+void CSCStripElectronicsSim::addCrosstalk(const CSCAnalogSignal &signal,
+                                          int thisStrip,
+                                          int otherStrip,
+                                          CLHEP::HepRandomEngine *engine) {
   float capacitiveCrosstalk, resistiveCrosstalk;
   bool leftRight = (otherStrip > thisStrip);
-  theStripConditions->crosstalk(layerId(), thisStrip, 
-                                theLayerGeometry->length(), leftRight,
-                                capacitiveCrosstalk, resistiveCrosstalk);
+  theStripConditions->crosstalk(
+      layerId(), thisStrip, theLayerGeometry->length(), leftRight, capacitiveCrosstalk, resistiveCrosstalk);
   theCrosstalkGenerator->setParameters(capacitiveCrosstalk, 0., resistiveCrosstalk);
-  CSCAnalogSignal crosstalkSignal( theCrosstalkGenerator->getCrosstalk(signal) );
+  CSCAnalogSignal crosstalkSignal(theCrosstalkGenerator->getCrosstalk(signal));
   find(readoutElement(otherStrip), engine).superimpose(crosstalkSignal);
 
   // Now subtract the crosstalk signal from the original signal
   crosstalkSignal *= -1.;
   find(thisStrip, engine).superimpose(crosstalkSignal);
-
 }
 
-
-void CSCStripElectronicsSim::createDigi(int channel, const CSCAnalogSignal & signal, std::vector<CSCStripDigi> & result,
-                                        CLHEP::HepRandomEngine* engine)
-{
+void CSCStripElectronicsSim::createDigi(int channel,
+                                        const CSCAnalogSignal &signal,
+                                        std::vector<CSCStripDigi> &result,
+                                        CLHEP::HepRandomEngine *engine) {
   // fill in the sca information
   std::vector<int> scaCounts(nScaBins_);
 
@@ -429,12 +372,10 @@ void CSCStripElectronicsSim::createDigi(int channel, const CSCAnalogSignal & sig
   float timeSmearing = CLHEP::RandGaussQ::shoot(engine) * theTimingCalibrationError[chamberType];
   // undo the correction for TOF, instead, using some nominal
   // value from ME2/1
-  float t0 = theSignalStartTime+theSCATimingOffsets[chamberType] + timeSmearing
-           + 29. - theAverageTimeOfFlight;
-  for(int scaBin = 0; scaBin < nScaBins_; ++scaBin) {
-    float t = t0 + scaBin*sca_time_bin_size;
-    scaCounts[scaBin] = static_cast< int >
-      ( pedestal + signal.getValue(t) * gain );
+  float t0 = theSignalStartTime + theSCATimingOffsets[chamberType] + timeSmearing + 29. - theAverageTimeOfFlight;
+  for (int scaBin = 0; scaBin < nScaBins_; ++scaBin) {
+    float t = t0 + scaBin * sca_time_bin_size;
+    scaCounts[scaBin] = static_cast<int>(pedestal + signal.getValue(t) * gain);
   }
   CSCStripDigi newDigi(channel, scaCounts);
 
@@ -446,33 +387,28 @@ void CSCStripElectronicsSim::createDigi(int channel, const CSCAnalogSignal & sig
   LogTrace("CSCStripElectronicsSim") << newDigi;
 }
 
-
-void CSCStripElectronicsSim::doSaturation(CSCStripDigi & digi)
-{
+void CSCStripElectronicsSim::doSaturation(CSCStripDigi &digi) {
   std::vector<int> scaCounts(digi.getADCCounts());
-  for(unsigned scaBin = 0; scaBin < scaCounts.size(); ++scaBin) {
+  for (unsigned scaBin = 0; scaBin < scaCounts.size(); ++scaBin) {
     scaCounts[scaBin] = std::min(scaCounts[scaBin], 4095);
   }
   digi.setADCCounts(scaCounts);
 }
 
-
-void CSCStripElectronicsSim::fillMissingLayer(const CSCLayer * layer,
-                                              const CSCComparatorDigiCollection & comparators,
-                                              CSCStripDigiCollection & digis,
-                                              CLHEP::HepRandomEngine* engine)
-{
+void CSCStripElectronicsSim::fillMissingLayer(const CSCLayer *layer,
+                                              const CSCComparatorDigiCollection &comparators,
+                                              CSCStripDigiCollection &digis,
+                                              CLHEP::HepRandomEngine *engine) {
   theSignalMap.clear();
   setLayer(layer);
   CSCDetId chamberId(theLayerId.chamberId());
   // find all comparator key strips in this chamber
   std::list<int> chamberKeyStrips;
-  for(CSCComparatorDigiCollection::DigiRangeIterator comparatorItr = comparators.begin();
-      comparatorItr != comparators.end(); ++comparatorItr)
-  {
+  for (CSCComparatorDigiCollection::DigiRangeIterator comparatorItr = comparators.begin();
+       comparatorItr != comparators.end();
+       ++comparatorItr) {
     // could be more efficient
-    if(CSCDetId((*comparatorItr).first).chamberId() == chamberId)
-    {
+    if (CSCDetId((*comparatorItr).first).chamberId() == chamberId) {
       std::vector<CSCComparatorDigi> layerComparators((*comparatorItr).second.first, (*comparatorItr).second.second);
       std::list<int> layerKeyStrips = getKeyStrips(layerComparators);
       chamberKeyStrips.insert(chamberKeyStrips.end(), layerKeyStrips.begin(), layerKeyStrips.end());
@@ -482,31 +418,23 @@ void CSCStripElectronicsSim::fillMissingLayer(const CSCLayer * layer,
   chamberKeyStrips.unique();
   fillStripDigis(chamberKeyStrips, digis, engine);
 }
-    
 
-void CSCStripElectronicsSim::selfTest() const
-{
+void CSCStripElectronicsSim::selfTest() const {
   // make sure the zero suppression algorithms work
   std::list<int> keyStrips, stripsRead;
-  // 
+  //
   bool isGanged = (readoutElement(nElements) == 16);
   keyStrips.push_back(readoutElement(19));
   keyStrips.push_back(readoutElement(30));
-  keyStrips.push_back(readoutElement(32)); 
+  keyStrips.push_back(readoutElement(32));
   stripsRead = channelsToRead(keyStrips, 3);
-  if(doSuppression_)
-  {
+  if (doSuppression_) {
     unsigned int expectedSize = isGanged ? 10 : 12;
     assert(stripsRead.size() == expectedSize);
     assert(stripsRead.front() == readoutElement(17));
-  }
-  else 
-  {
+  } else {
     unsigned int expectedSize = isGanged ? 16 : 48;
     assert(stripsRead.size() == expectedSize);
     assert(stripsRead.front() == 1);
   }
 }
-
-
-  
diff --git a/SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.h b/SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.h
index 96708cd6d0cf2..4cecea4e6d390 100644
--- a/SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.h
+++ b/SimMuon/CSCDigitizer/src/CSCStripElectronicsSim.h
@@ -8,44 +8,46 @@
  *
  */
 
-#include "SimMuon/CSCDigitizer/src/CSCBaseElectronicsSim.h"
-#include "DataFormats/CSCDigi/interface/CSCStripDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h"
+#include "DataFormats/CSCDigi/interface/CSCStripDigiCollection.h"
+#include "SimMuon/CSCDigitizer/src/CSCBaseElectronicsSim.h"
 #include "SimMuon/CSCDigitizer/src/CSCStripAmpResponse.h"
 
 class CSCDetectorHit;
 class CSCComparatorDigi;
 class CSCCrosstalkGenerator;
 class CSCStripConditions;
-#include <vector>
-#include <string>
 #include <list>
+#include <string>
+#include <vector>
 
 namespace CLHEP {
   class HepRandomEngine;
 }
 
-class CSCStripElectronicsSim : public CSCBaseElectronicsSim
-{
+class CSCStripElectronicsSim : public CSCBaseElectronicsSim {
 public:
   /// configurable parameters
-  explicit CSCStripElectronicsSim(const edm::ParameterSet & p);
+  explicit CSCStripElectronicsSim(const edm::ParameterSet &p);
 
   ~CSCStripElectronicsSim() override;
 
-  void fillDigis(CSCStripDigiCollection & digis,
-                 CSCComparatorDigiCollection & comparators,
-                 CLHEP::HepRandomEngine*);
+  void fillDigis(CSCStripDigiCollection &digis, CSCComparatorDigiCollection &comparators, CLHEP::HepRandomEngine *);
+
+  void fillMissingLayer(const CSCLayer *layer,
+                        const CSCComparatorDigiCollection &comparators,
+                        CSCStripDigiCollection &digis,
+                        CLHEP::HepRandomEngine *);
 
-  void fillMissingLayer(const CSCLayer * layer, const CSCComparatorDigiCollection & comparators, 
-                        CSCStripDigiCollection & digis, CLHEP::HepRandomEngine*);
+  void setStripConditions(CSCStripConditions *cond) { theStripConditions = cond; }
 
-  void setStripConditions(CSCStripConditions * cond) {theStripConditions = cond;}
+  CSCAnalogSignal makeNoiseSignal(int element, CLHEP::HepRandomEngine *) override;
 
-  CSCAnalogSignal makeNoiseSignal(int element, CLHEP::HepRandomEngine*) override;
+  void createDigi(int istrip,
+                  const CSCAnalogSignal &signal,
+                  std::vector<CSCStripDigi> &result,
+                  CLHEP::HepRandomEngine *);
 
-  void createDigi(int istrip, const CSCAnalogSignal & signal, std::vector<CSCStripDigi> & result, CLHEP::HepRandomEngine*);
- 
 private:
   /// initialization for each layer
   void initParameters() override;
@@ -55,43 +57,35 @@ class CSCStripElectronicsSim : public CSCBaseElectronicsSim
   float calculateAmpResponse(float t) const override;
   CSCStripAmpResponse theAmpResponse;
 
-  void runComparator(std::vector<CSCComparatorDigi> & result, CLHEP::HepRandomEngine*);
+  void runComparator(std::vector<CSCComparatorDigi> &result, CLHEP::HepRandomEngine *);
 
   /// calculates the comparator reading, including saturation and offsets
-  float comparatorReading(const CSCAnalogSignal & signal, float time, CLHEP::HepRandomEngine*) const;
+  float comparatorReading(const CSCAnalogSignal &signal, float time, CLHEP::HepRandomEngine *) const;
 
   // tells which strips to read out around the input strip
-  void getReadoutRange(int inputStrip, 
-                       int & minStrip, int & maxStrip);
+  void getReadoutRange(int inputStrip, int &minStrip, int &maxStrip);
 
   /// finds the key strips from these comparators
-  std::list<int>
-  getKeyStrips(const std::vector<CSCComparatorDigi> & comparators) const;
+  std::list<int> getKeyStrips(const std::vector<CSCComparatorDigi> &comparators) const;
 
   /// get ths strips that have detector hits
-  std::list<int>
-  getKeyStripsFromMC() const;
+  std::list<int> getKeyStripsFromMC() const;
   /// finds what strips to read.  Will either take 5 strips around
   /// the keystrip, or the whole CFEB, based on doSuppression_
-  std::list<int>
-  channelsToRead(const std::list<int> & keyStrips, int window) const;
+  std::list<int> channelsToRead(const std::list<int> &keyStrips, int window) const;
 
-  void fillStripDigis(const std::list<int> & keyStrips,
-                      CSCStripDigiCollection & digis,
-                      CLHEP::HepRandomEngine*);
-
-  void addCrosstalk(CLHEP::HepRandomEngine*);
-  void addCrosstalk(const CSCAnalogSignal & signal,
-                    int thisStrip, int otherStrip, CLHEP::HepRandomEngine*);
+  void fillStripDigis(const std::list<int> &keyStrips, CSCStripDigiCollection &digis, CLHEP::HepRandomEngine *);
 
+  void addCrosstalk(CLHEP::HepRandomEngine *);
+  void addCrosstalk(const CSCAnalogSignal &signal, int thisStrip, int otherStrip, CLHEP::HepRandomEngine *);
 
   void selfTest() const;
 
   // saturation of the 12-bit ADC.  Max reading is 4095
-  void doSaturation(CSCStripDigi & digi);
+  void doSaturation(CSCStripDigi &digi);
 
   // useful constants
-  float theComparatorThreshold;      // in fC
+  float theComparatorThreshold;  // in fC
   float theComparatorNoise;
   float theComparatorRMSOffset;
   // note that we don't implement the effect of the x3.5 amplifier
@@ -106,15 +100,15 @@ class CSCStripElectronicsSim : public CSCBaseElectronicsSim
   int nScaBins_;
   bool doSuppression_;
   bool doCrosstalk_;
-  CSCStripConditions * theStripConditions;
-  CSCCrosstalkGenerator * theCrosstalkGenerator;
+  CSCStripConditions *theStripConditions;
+  CSCCrosstalkGenerator *theCrosstalkGenerator;
 
   int theComparatorClockJump;
   // the length of each SCA time bin, in ns.  50 by default
   float sca_time_bin_size;
   // the SCA bin which holds the peak signal.  4, by default.
   // that's really the 5th, since We start counting at 0
-  int   sca_peak_bin;
+  int sca_peak_bin;
   // which time bin the trigger crossing goes in
   double theComparatorTimeBinOffset;
   // to center comparator signals
@@ -128,4 +122,3 @@ class CSCStripElectronicsSim : public CSCBaseElectronicsSim
 };
 
 #endif
-
diff --git a/SimMuon/CSCDigitizer/src/CSCStripHitSim.cc b/SimMuon/CSCDigitizer/src/CSCStripHitSim.cc
index 8f35ebc6bfaa7..71a3eaa5f58ab 100644
--- a/SimMuon/CSCDigitizer/src/CSCStripHitSim.cc
+++ b/SimMuon/CSCDigitizer/src/CSCStripHitSim.cc
@@ -1,60 +1,56 @@
-#include "SimMuon/CSCDigitizer/src/CSCStripHitSim.h"
-#include "Geometry/CSCGeometry/interface/CSCLayer.h"
+#include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "Geometry/CSCGeometry/interface/CSCChamberSpecs.h"
+#include "Geometry/CSCGeometry/interface/CSCLayer.h"
 #include "Geometry/CSCGeometry/interface/CSCLayerGeometry.h"
-#include "DataFormats/GeometryVector/interface/LocalPoint.h"
+#include "SimMuon/CSCDigitizer/src/CSCStripHitSim.h"
 
 // This is CSCStripHitSim.cc
 // Author: Rick Wilkinson, Tim Cox
 
-
-std::vector<CSCDetectorHit> &
-CSCStripHitSim::simulate(const CSCLayer * layer, 
-                           const std::vector<CSCDetectorHit> & wireHits)
-{
+std::vector<CSCDetectorHit> &CSCStripHitSim::simulate(const CSCLayer *layer,
+                                                      const std::vector<CSCDetectorHit> &wireHits) {
   // make sure the gatti function is initialized
-  const CSCChamberSpecs * chamberSpecs = layer->chamber()->specs();
-  const CSCLayerGeometry* geom = layer->geometry();
+  const CSCChamberSpecs *chamberSpecs = layer->chamber()->specs();
+  const CSCLayerGeometry *geom = layer->geometry();
   theGattiFunction.initChamberSpecs(*chamberSpecs);
   const int nNodes = chamberSpecs->nNodes();
-  
+
   // for every wire hit, induce a Gatti-distributed charge on the
   // cathode strips
   newStripHits.clear();
-  newStripHits.reserve((2*nNodes+1)*wireHits.size());
+  newStripHits.reserve((2 * nNodes + 1) * wireHits.size());
   std::vector<CSCDetectorHit>::const_iterator wireHitI;
-  for(wireHitI = wireHits.begin(); wireHitI != wireHits.end(); ++wireHitI){
-    int   wire        = (*wireHitI).getElement();
-    float wireCharge  = (*wireHitI).getCharge();
+  for (wireHitI = wireHits.begin(); wireHitI != wireHits.end(); ++wireHitI) {
+    int wire = (*wireHitI).getElement();
+    float wireCharge = (*wireHitI).getCharge();
     float wireHitTime = (*wireHitI).getTime();
     // The wire hit position is _along the wire_, measured from where
     // the wire intersects local y axis, so convert to local x...
-    float hitX   = (*wireHitI).getPosition() * cos(geom->wireAngle());
-    float hitY   = geom->yOfWire(wire, hitX);
+    float hitX = (*wireHitI).getPosition() * cos(geom->wireAngle());
+    float hitY = geom->yOfWire(wire, hitX);
     const LocalPoint wireHitPos(hitX, hitY);
 
     int centerStrip = geom->nearestStrip(wireHitPos);
     int firstStrip = std::max(centerStrip - nNodes, 1);
-    int lastStrip  = std::min(centerStrip + nNodes, geom->numberOfStrips());
-    for(int istrip = firstStrip; istrip <= lastStrip; istrip++) {
+    int lastStrip = std::min(centerStrip + nNodes, geom->numberOfStrips());
+    for (int istrip = firstStrip; istrip <= lastStrip; istrip++) {
       float offset = hitX - geom->xOfStrip(istrip, hitY);
       float stripWidth = geom->stripPitch(wireHitPos);
       float binValue = theGattiFunction.binValue(offset, stripWidth);
       // we divide by 2 because charge goes on either cathode.
       // if you're following the TDR, we already multiplied the
-      // charge by 0.82 in the WireHitSim (well, DriftSim), so that explains 
+      // charge by 0.82 in the WireHitSim (well, DriftSim), so that explains
       // their f_ind=0.41.
-   
+
       // this seems to be folded in the Amp response, which peaks
       // around 0.14.  The difference may be because the amp response
       // convolutes in different drift times.
-      //float collectionFraction = 0.19;
-      const float igain = 1./0.9; // mv/fC
+      // float collectionFraction = 0.19;
+      const float igain = 1. / 0.9;  // mv/fC
       float stripCharge = wireCharge * binValue * igain * 0.5;
       float stripTime = wireHitTime;
       float position = hitY / sin(geom->stripAngle(istrip));
-      CSCDetectorHit newStripHit(istrip, stripCharge, position, stripTime, 
-                                   (*wireHitI).getSimHit());
+      CSCDetectorHit newStripHit(istrip, stripCharge, position, stripTime, (*wireHitI).getSimHit());
       newStripHits.push_back(newStripHit);
     }
   }  // loop over wire hits
diff --git a/SimMuon/CSCDigitizer/src/CSCStripHitSim.h b/SimMuon/CSCDigitizer/src/CSCStripHitSim.h
index e52fb4762fd8d..672b2d3b37923 100644
--- a/SimMuon/CSCDigitizer/src/CSCStripHitSim.h
+++ b/SimMuon/CSCDigitizer/src/CSCStripHitSim.h
@@ -16,14 +16,13 @@
 
 // declarations
 class CSCLayer;
-//class CSCDetectorHit;
+// class CSCDetectorHit;
 
-class CSCStripHitSim
-{
+class CSCStripHitSim {
 public:
   // make strip hits from the given wire hits
-  std::vector<CSCDetectorHit> & simulate(const CSCLayer * layer, 
-                       const std::vector<CSCDetectorHit> & wireHits);
+  std::vector<CSCDetectorHit> &simulate(const CSCLayer *layer, const std::vector<CSCDetectorHit> &wireHits);
+
 private:
   CSCGattiFunction theGattiFunction;
   std::vector<CSCDetectorHit> newStripHits;
diff --git a/SimMuon/CSCDigitizer/src/CSCWireElectronicsSim.cc b/SimMuon/CSCDigitizer/src/CSCWireElectronicsSim.cc
index f7d0ec5975c3b..5cf472681d461 100644
--- a/SimMuon/CSCDigitizer/src/CSCWireElectronicsSim.cc
+++ b/SimMuon/CSCDigitizer/src/CSCWireElectronicsSim.cc
@@ -1,59 +1,45 @@
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "SimMuon/CSCDigitizer/src/CSCWireElectronicsSim.h"
-#include "SimMuon/CSCDigitizer/src/CSCAnalogSignal.h"
 #include "DataFormats/CSCDigi/interface/CSCWireDigi.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "Geometry/CSCGeometry/interface/CSCChamberSpecs.h"
 #include "Geometry/CSCGeometry/interface/CSCLayer.h"
 #include "Geometry/CSCGeometry/interface/CSCLayerGeometry.h"
-#include "Geometry/CSCGeometry/interface/CSCChamberSpecs.h"
+#include "SimMuon/CSCDigitizer/src/CSCAnalogSignal.h"
+#include "SimMuon/CSCDigitizer/src/CSCWireElectronicsSim.h"
 
 #include "CLHEP/Random/RandGaussQ.h"
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"  
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 
 #include <iostream>
 
-
-CSCWireElectronicsSim::CSCWireElectronicsSim(const edm::ParameterSet & p) 
- : CSCBaseElectronicsSim(p),
-   theFraction(0.5),
-   theWireNoise(0.0),
-   theWireThreshold(0.)
-{
+CSCWireElectronicsSim::CSCWireElectronicsSim(const edm::ParameterSet &p)
+    : CSCBaseElectronicsSim(p), theFraction(0.5), theWireNoise(0.0), theWireThreshold(0.) {
   fillAmpResponse();
 }
 
-
 void CSCWireElectronicsSim::initParameters() {
   nElements = theLayerGeometry->numberOfWireGroups();
-  theWireNoise = theSpecs->wireNoise(theShapingTime)
-                * e_SI * pow(10.0,15);
+  theWireNoise = theSpecs->wireNoise(theShapingTime) * e_SI * pow(10.0, 15);
   theWireThreshold = theWireNoise * 8;
 }
 
+int CSCWireElectronicsSim::readoutElement(int element) const { return theLayerGeometry->wireGroup(element); }
 
-int CSCWireElectronicsSim::readoutElement(int element) const {
-  return theLayerGeometry->wireGroup(element);
-}
-
-void CSCWireElectronicsSim::fillDigis(CSCWireDigiCollection & digis, CLHEP::HepRandomEngine* engine) {
-
-  if(theSignalMap.empty()) {
+void CSCWireElectronicsSim::fillDigis(CSCWireDigiCollection &digis, CLHEP::HepRandomEngine *engine) {
+  if (theSignalMap.empty()) {
     return;
   }
 
   // Loop over analog signals, run the fractional discriminator on each one,
   // and save the DIGI in the layer.
-  for(CSCSignalMap::iterator mapI = theSignalMap.begin(),
-      lastSignal = theSignalMap.end();
-      mapI != lastSignal; ++mapI) 
-  {
+  for (CSCSignalMap::iterator mapI = theSignalMap.begin(), lastSignal = theSignalMap.end(); mapI != lastSignal;
+       ++mapI) {
     int wireGroup = (*mapI).first;
-    const CSCAnalogSignal & signal = (*mapI).second;
-    LogTrace("CSCWireElectronicsSim") << "CSCWireElectronicsSim: dump of wire signal follows... " 
-       <<  signal;
+    const CSCAnalogSignal &signal = (*mapI).second;
+    LogTrace("CSCWireElectronicsSim") << "CSCWireElectronicsSim: dump of wire signal follows... " << signal;
     int signalSize = signal.getSize();
 
-    int timeWord = 0; // and this will remain if too early or late (<bx-6 or >bx+9)
+    int timeWord = 0;  // and this will remain if too early or late (<bx-6 or >bx+9)
 
     // the way we handle noise in this chamber is by randomly varying
     // the threshold
@@ -61,16 +47,14 @@ void CSCWireElectronicsSim::fillDigis(CSCWireDigiCollection & digis, CLHEP::HepR
     if (doNoise_) {
       threshold += CLHEP::RandGaussQ::shoot(engine) * theWireNoise;
     }
-    for(int ibin = 0; ibin < signalSize; ++ibin)
-    {
-      if(signal.getBinValue(ibin) > threshold) 
-      {
+    for (int ibin = 0; ibin < signalSize; ++ibin) {
+      if (signal.getBinValue(ibin) > threshold) {
         // jackpot.  Now define this signal as everything up until
         // the signal goes below zero.
         int lastbin = signalSize;
         int i;
-        for(i = ibin; i < signalSize; ++i) {
-          if(signal.getBinValue(i) < 0.) {
+        for (i = ibin; i < signalSize; ++i) {
+          if (signal.getBinValue(i) < 0.) {
             lastbin = i;
             break;
           }
@@ -78,63 +62,62 @@ void CSCWireElectronicsSim::fillDigis(CSCWireDigiCollection & digis, CLHEP::HepR
 
         float qMax = 0.0;
         // in this loop, find the max charge and the 'fifth' electron arrival
-        for ( i = ibin; i < lastbin; ++i)
-        {
+        for (i = ibin; i < lastbin; ++i) {
           float next_charge = signal.getBinValue(i);
-          if(next_charge > qMax) {
+          if (next_charge > qMax) {
             qMax = next_charge;
           }
         }
-     
+
         int bin_firing_FD = 0;
-        for ( i = ibin; i < lastbin; ++i)
-        {
-          if( signal.getBinValue(i) >= qMax * theFraction )
-          {
-             bin_firing_FD = i;
-	     //@@ Long-standing but unlikely minor bug, I (Tim) think - following 'break' was missing...
-	     //@@ ... So if both ibins 0 and 1 could fire FD, we'd flag the firing bin as 1 not 0
-	     //@@ (since the above test was restricted to bin_firing_FD==0 too).
-	     break;
+        for (i = ibin; i < lastbin; ++i) {
+          if (signal.getBinValue(i) >= qMax * theFraction) {
+            bin_firing_FD = i;
+            //@@ Long-standing but unlikely minor bug, I (Tim) think - following
+            //'break' was missing...
+            //@@ ... So if both ibins 0 and 1 could fire FD, we'd flag the
+            // firing bin as 1 not 0
+            //@@ (since the above test was restricted to bin_firing_FD==0 too).
+            break;
           }
-        } 
+        }
 
         float tofOffset = timeOfFlightCalibration(wireGroup);
         int chamberType = theSpecs->chamberType();
 
-        // Note that CSCAnalogSignal::superimpose does not reset theTimeOffset to the earliest
-	// of the two signal's time offsets. If it did then we could handle signals from any
-	// time range e.g. form pileup events many bx's from the signal bx (bx=0).
-	// But then we would be wastefully storing signals over times which we can never
-	// see in the real detector, because only hits within a few bx's of bx=0 are read out.
-	// Instead, the working time range for wire hits is always started from
-	// theSignalStartTime, set as a parameter in the config file.
-	// On the other hand, if any of the overlapped CSCAnalogSignals happens to have
-        // a timeOffset earlier than theSignalStartTime (which is currently set to -100 ns)
-	// then we're in trouble. For pileup events this would mean events from collisions
-	// earlier than 4 bx before the signal bx.
-
-        float fdTime = theSignalStartTime + theSamplingTime*bin_firing_FD;
-        if(doNoise_) {
+        // Note that CSCAnalogSignal::superimpose does not reset theTimeOffset
+        // to the earliest of the two signal's time offsets. If it did then we
+        // could handle signals from any time range e.g. form pileup events many
+        // bx's from the signal bx (bx=0). But then we would be wastefully
+        // storing signals over times which we can never see in the real
+        // detector, because only hits within a few bx's of bx=0 are read out.
+        // Instead, the working time range for wire hits is always started from
+        // theSignalStartTime, set as a parameter in the config file.
+        // On the other hand, if any of the overlapped CSCAnalogSignals happens
+        // to have a timeOffset earlier than theSignalStartTime (which is
+        // currently set to -100 ns) then we're in trouble. For pileup events
+        // this would mean events from collisions earlier than 4 bx before the
+        // signal bx.
+
+        float fdTime = theSignalStartTime + theSamplingTime * bin_firing_FD;
+        if (doNoise_) {
           fdTime += theTimingCalibrationError[chamberType] * CLHEP::RandGaussQ::shoot(engine);
         }
 
-        float bxFloat = (fdTime - tofOffset- theBunchTimingOffsets[chamberType]) / theBunchSpacing
-                           + theOffsetOfBxZero;
+        float bxFloat = (fdTime - tofOffset - theBunchTimingOffsets[chamberType]) / theBunchSpacing + theOffsetOfBxZero;
         int bxInt = static_cast<int>(bxFloat);
-        if(bxFloat >= 0 && bxFloat < 16)
-        {
-           timeWord |= (1 << bxInt );
-           // discriminator stays high for 35 ns
-           if(bxFloat-bxInt > 0.6) 
-           {
-             timeWord |= (1 << (bxInt+1) );
-           }
+        if (bxFloat >= 0 && bxFloat < 16) {
+          timeWord |= (1 << bxInt);
+          // discriminator stays high for 35 ns
+          if (bxFloat - bxInt > 0.6) {
+            timeWord |= (1 << (bxInt + 1));
+          }
         }
 
-        // Wire digi as of Oct-2006 adapted to real data: time word has 16 bits with set bit
-        // flagging appropriate bunch crossing, and bx 0 corresponding to the 7th bit, 'bit 6':
-  
+        // Wire digi as of Oct-2006 adapted to real data: time word has 16 bits
+        // with set bit flagging appropriate bunch crossing, and bx 0
+        // corresponding to the 7th bit, 'bit 6':
+
         //      1st bit set (bit 0) <-> bx -6
         //      2nd              1  <-> bx -5
         //      ...           ...       ....
@@ -145,63 +128,55 @@ void CSCWireElectronicsSim::fillDigis(CSCWireDigiCollection & digis, CLHEP::HepR
 
         // skip over all the time bins used for this digi
         ibin = lastbin;
-      } // if over threshold
-    } // loop over time bins in signal
+      }  // if over threshold
+    }    // loop over time bins in signal
 
     // Only create a wire digi if there is a wire hit within [-6 bx, +9 bx]
-    if(timeWord != 0)
-    {
+    if (timeWord != 0) {
       CSCWireDigi newDigi(wireGroup, timeWord);
       LogTrace("CSCWireElectronicsSim") << newDigi;
       digis.insertDigi(layerId(), newDigi);
       addLinks(channelIndex(wireGroup));
     }
-  } // loop over wire signals   
+  }  // loop over wire signals
 }
 
-
 float CSCWireElectronicsSim::calculateAmpResponse(float t) const {
   static const float fC_by_ns = 1000000;
   static const float resistor = 20000;
-  static const float amplifier_pole               = 1/7.5;
+  static const float amplifier_pole = 1 / 7.5;
   static const float fastest_chamber_exp_risetime = 10.;
-  static const float p0=amplifier_pole;
-  static const float p1=1/fastest_chamber_exp_risetime;
+  static const float p0 = amplifier_pole;
+  static const float p1 = 1 / fastest_chamber_exp_risetime;
 
   static const float dp = p0 - p1;
 
   // ENABLE DISC:
 
-  static const float norm = -12 * resistor * p1 * pow(p0/dp, 4) / fC_by_ns;
+  static const float norm = -12 * resistor * p1 * pow(p0 / dp, 4) / fC_by_ns;
 
-  float enable_disc_volts = norm*(  exp(-p0*t) *(1          +
-						 t*dp       +
-						 pow(t*dp,2)/2 +
-						 pow(t*dp,3)/6  )
-				    - exp(-p1*t) );
+  float enable_disc_volts =
+      norm * (exp(-p0 * t) * (1 + t * dp + pow(t * dp, 2) / 2 + pow(t * dp, 3) / 6) - exp(-p1 * t));
   static const float collectionFraction = 0.12;
-  static const float igain = 1./0.005; // volts per fC
+  static const float igain = 1. / 0.005;  // volts per fC
   return enable_disc_volts * igain * collectionFraction;
-}                                                                               
-
+}
 
 float CSCWireElectronicsSim::timeOfFlightCalibration(int wireGroup) const {
   // calibration is done for groups of 8 wire groups, facetiously
   // called wireGroupGroups
-  int middleWireGroup = wireGroup - wireGroup%8 + 4;
+  int middleWireGroup = wireGroup - wireGroup % 8 + 4;
   int numberOfWireGroups = theLayerGeometry->numberOfWireGroups();
-  if(middleWireGroup > numberOfWireGroups) 
-     middleWireGroup = numberOfWireGroups;
+  if (middleWireGroup > numberOfWireGroups)
+    middleWireGroup = numberOfWireGroups;
 
   GlobalPoint centerOfGroupGroup = theLayer->centerOfWireGroup(middleWireGroup);
   float averageDist = centerOfGroupGroup.mag();
-  float averageTOF  = averageDist * cm / c_light; // Units of c_light: mm/ns
+  float averageTOF = averageDist * cm / c_light;  // Units of c_light: mm/ns
+
+  LogTrace("CSCWireElectronicsSim") << "CSCWireElectronicsSim: TofCalib  wg = " << wireGroup
+                                    << " mid wg = " << middleWireGroup << " av dist = " << averageDist
+                                    << " av tof = " << averageTOF;
 
-  LogTrace("CSCWireElectronicsSim") << "CSCWireElectronicsSim: TofCalib  wg = " << wireGroup << 
-       " mid wg = " << middleWireGroup << 
-       " av dist = " << averageDist << 
-      " av tof = " << averageTOF;
-  
   return averageTOF;
 }
- 
diff --git a/SimMuon/CSCDigitizer/src/CSCWireElectronicsSim.h b/SimMuon/CSCDigitizer/src/CSCWireElectronicsSim.h
index 3963f06bfa8ba..71646e8c64047 100644
--- a/SimMuon/CSCDigitizer/src/CSCWireElectronicsSim.h
+++ b/SimMuon/CSCDigitizer/src/CSCWireElectronicsSim.h
@@ -8,8 +8,8 @@
  *
  */
 
-#include "SimMuon/CSCDigitizer/src/CSCBaseElectronicsSim.h"
 #include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
+#include "SimMuon/CSCDigitizer/src/CSCBaseElectronicsSim.h"
 
 // declarations
 class CSCLayer;
@@ -17,16 +17,14 @@ class CSCDetectorHit;
 class CSCWireDigi;
 class CSCAnalogSignal;
 
-
-class CSCWireElectronicsSim : public CSCBaseElectronicsSim
-{
+class CSCWireElectronicsSim : public CSCBaseElectronicsSim {
 public:
   /// configurable parameters
   CSCWireElectronicsSim(const edm::ParameterSet &p);
 
-  void setFraction(float newFraction)  {theFraction = newFraction;};
+  void setFraction(float newFraction) { theFraction = newFraction; };
 
-  void fillDigis(CSCWireDigiCollection & digis, CLHEP::HepRandomEngine*);
+  void fillDigis(CSCWireDigiCollection &digis, CLHEP::HepRandomEngine *);
 
 private:
   /// initialization for each layer
@@ -36,11 +34,11 @@ class CSCWireElectronicsSim : public CSCBaseElectronicsSim
   int readoutElement(int element) const override;
 
   float calculateAmpResponse(float t) const override;
- 
+
   virtual float timeOfFlightCalibration(int wireGroup) const;
 
   /// we code strip indices from 1-80, and wire indices start at 100
-  int channelIndex(int channel) const override {return channel+100;}
+  int channelIndex(int channel) const override { return channel + 100; }
 
   // member data
   // the fractional discriminator returns the time when the signal
@@ -48,7 +46,6 @@ class CSCWireElectronicsSim : public CSCBaseElectronicsSim
   float theFraction;
   float theWireNoise;
   float theWireThreshold;
-
 };
 
 #endif
diff --git a/SimMuon/CSCDigitizer/src/CSCWireHitSim.cc b/SimMuon/CSCDigitizer/src/CSCWireHitSim.cc
index 24a8ffba86a7e..437c483604789 100644
--- a/SimMuon/CSCDigitizer/src/CSCWireHitSim.cc
+++ b/SimMuon/CSCDigitizer/src/CSCWireHitSim.cc
@@ -1,104 +1,77 @@
-#include "SimMuon/CSCDigitizer/src/CSCWireHitSim.h"
-#include "SimMuon/CSCDigitizer/src/CSCDriftSim.h"
-#include "SimMuon/CSCDigitizer/src/CSCGasCollisions.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "Geometry/CSCGeometry/interface/CSCLayer.h"
 #include "Geometry/CSCGeometry/interface/CSCLayerGeometry.h"
+#include "SimMuon/CSCDigitizer/src/CSCDriftSim.h"
+#include "SimMuon/CSCDigitizer/src/CSCGasCollisions.h"
+#include "SimMuon/CSCDigitizer/src/CSCWireHitSim.h"
 
 #include "CLHEP/Random/RandFlat.h"
 
-CSCWireHitSim::CSCWireHitSim(CSCDriftSim* driftSim, const edm::ParameterSet & p) 
-: theDriftSim(driftSim),
-  theGasIonizer( new CSCGasCollisions( p ) ) ,
-  theNewWireHits()
-{
-}
-
+CSCWireHitSim::CSCWireHitSim(CSCDriftSim *driftSim, const edm::ParameterSet &p)
+    : theDriftSim(driftSim), theGasIonizer(new CSCGasCollisions(p)), theNewWireHits() {}
 
-CSCWireHitSim::~CSCWireHitSim() {
-  delete theGasIonizer;
-}
+CSCWireHitSim::~CSCWireHitSim() { delete theGasIonizer; }
 
-
-std::vector<CSCDetectorHit> &
-CSCWireHitSim::simulate(const CSCLayer * layer, 
-                        const edm::PSimHitContainer & simHits,
-                        CLHEP::HepRandomEngine* engine)
-{
-  const CSCLayerGeometry * geom = layer->geometry(); 
+std::vector<CSCDetectorHit> &CSCWireHitSim::simulate(const CSCLayer *layer,
+                                                     const edm::PSimHitContainer &simHits,
+                                                     CLHEP::HepRandomEngine *engine) {
+  const CSCLayerGeometry *geom = layer->geometry();
 
   theNewWireHits.clear();
-  for (edm::PSimHitContainer::const_iterator hitItr = simHits.begin();
-       hitItr != simHits.end();  ++hitItr)
-  {
-
-    std::vector<LocalPoint> ionClusters 
-      = getIonizationClusters(*hitItr, layer, engine);
+  for (edm::PSimHitContainer::const_iterator hitItr = simHits.begin(); hitItr != simHits.end(); ++hitItr) {
+    std::vector<LocalPoint> ionClusters = getIonizationClusters(*hitItr, layer, engine);
 
     unsigned nClusters = ionClusters.size();
-    theNewWireHits.reserve(theNewWireHits.size()+nClusters);
-
-    for(unsigned icl = 0; icl < nClusters; ++icl) {
+    theNewWireHits.reserve(theNewWireHits.size() + nClusters);
 
+    for (unsigned icl = 0; icl < nClusters; ++icl) {
       // Drift the electrons in the cluster to the nearest wire...
-      int nearestWire=geom->nearestWire(ionClusters[icl]);
+      int nearestWire = geom->nearestWire(ionClusters[icl]);
 
       // The wire hit contains wire# and position measured _along the wire_
       // from where it intersects local y axis.
 
-      theNewWireHits.push_back( 
-          theDriftSim->getWireHit(ionClusters[icl], layer, nearestWire,
-                                  *hitItr, engine) );
-
+      theNewWireHits.push_back(theDriftSim->getWireHit(ionClusters[icl], layer, nearestWire, *hitItr, engine));
     }
-  } 
+  }
   return theNewWireHits;
 }
 
-std::vector<LocalPoint> 
-CSCWireHitSim::getIonizationClusters(const PSimHit & simHit, 
-                                     const CSCLayer * layer,
-                                     CLHEP::HepRandomEngine* engine)
-{
-  const LocalPoint & entryPoint = simHit.entryPoint();
-  const LocalPoint & exitPoint  = simHit.exitPoint();
+std::vector<LocalPoint> CSCWireHitSim::getIonizationClusters(const PSimHit &simHit,
+                                                             const CSCLayer *layer,
+                                                             CLHEP::HepRandomEngine *engine) {
+  const LocalPoint &entryPoint = simHit.entryPoint();
+  const LocalPoint &exitPoint = simHit.exitPoint();
 
-  LogTrace("CSCWireHitSim") << "CSCWireHitSim:" 
-      << " type=" << simHit.particleType() 
-      << " mom=" << simHit.pabs()
-      << "\n Local entry " << entryPoint << " exit " << exitPoint;
+  LogTrace("CSCWireHitSim") << "CSCWireHitSim:"
+                            << " type=" << simHit.particleType() << " mom=" << simHit.pabs() << "\n Local entry "
+                            << entryPoint << " exit " << exitPoint;
 
   std::vector<LocalPoint> positions;
   std::vector<int> electrons;
-  theGasIonizer->simulate( simHit, positions, electrons, engine );
+  theGasIonizer->simulate(simHit, positions, electrons, engine);
 
-  std::vector<LocalPoint> results; // start empty
+  std::vector<LocalPoint> results;  // start empty
 
   int j = 0;
-  for( std::vector<LocalPoint>::const_iterator pointItr = positions.begin(); 
-                                         pointItr != positions.end(); ++pointItr ) 
-  {
+  for (std::vector<LocalPoint>::const_iterator pointItr = positions.begin(); pointItr != positions.end(); ++pointItr) {
     ++j;
     // some verification
-    if(layer->geometry()->inside(*pointItr) ) {
+    if (layer->geometry()->inside(*pointItr)) {
       // push the point for each electron at this point
-      
-      for( int ie = 1;  ie <= electrons[j-1]; ++ie ) {
+
+      for (int ie = 1; ie <= electrons[j - 1]; ++ie) {
         // probability of getting attached
         float f_att = 0.5;
-        if(CLHEP::RandFlat::shoot(engine) > f_att) {
+        if (CLHEP::RandFlat::shoot(engine) > f_att) {
           results.push_back(*pointItr);
         }
       }
     }
   }
   LogTrace("CSCWireHitSim") << "CSCWireHitSim: there are " << results.size()
-     << " clusters identified with each electron.";
+                            << " clusters identified with each electron.";
   return results;
 }
 
-
-void CSCWireHitSim::setParticleDataTable(const ParticleDataTable * pdt)
-{
-  theGasIonizer->setParticleDataTable(pdt);
-}
+void CSCWireHitSim::setParticleDataTable(const ParticleDataTable *pdt) { theGasIonizer->setParticleDataTable(pdt); }
diff --git a/SimMuon/CSCDigitizer/src/CSCWireHitSim.h b/SimMuon/CSCDigitizer/src/CSCWireHitSim.h
index f90f3b6e8e5eb..2af3eeb19115b 100644
--- a/SimMuon/CSCDigitizer/src/CSCWireHitSim.h
+++ b/SimMuon/CSCDigitizer/src/CSCWireHitSim.h
@@ -7,12 +7,12 @@
  * \author Tim Cox
  */
 
-#include <vector>
+#include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include "SimMuon/CSCDigitizer/src/CSCDetectorHit.h"
-#include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
+#include "SimMuon/CSCDigitizer/src/CSCDetectorHit.h"
+#include <vector>
 
 class CSCDriftSim;
 class CSCLayer;
@@ -24,29 +24,26 @@ namespace CLHEP {
   class HepRandomEngine;
 }
 
-class CSCWireHitSim
-{
+class CSCWireHitSim {
 public:
-  explicit CSCWireHitSim(CSCDriftSim* driftSim, const edm::ParameterSet & p);
+  explicit CSCWireHitSim(CSCDriftSim *driftSim, const edm::ParameterSet &p);
   ~CSCWireHitSim();
 
   // makes wire hits from the given g3hits
-  std::vector<CSCDetectorHit> & simulate(const CSCLayer * layer, 
-                                         const edm::PSimHitContainer & simHits,
-                                         CLHEP::HepRandomEngine*);
+  std::vector<CSCDetectorHit> &simulate(const CSCLayer *layer,
+                                        const edm::PSimHitContainer &simHits,
+                                        CLHEP::HepRandomEngine *);
 
-  void setParticleDataTable(const ParticleDataTable * pdt);
+  void setParticleDataTable(const ParticleDataTable *pdt);
 
 private:
   // Helper functions
-  std::vector<Local3DPoint> getIonizationClusters(const PSimHit & hit, 
-                                                  const CSCLayer *,
-                                                  CLHEP::HepRandomEngine*);
+  std::vector<Local3DPoint> getIonizationClusters(const PSimHit &hit, const CSCLayer *, CLHEP::HepRandomEngine *);
   CSCDetectorHit driftElectronsToWire();
 
   // member data
-  CSCDriftSim*  theDriftSim;
-  CSCGasCollisions* theGasIonizer;
+  CSCDriftSim *theDriftSim;
+  CSCGasCollisions *theGasIonizer;
   std::vector<CSCDetectorHit> theNewWireHits;
 };
 
diff --git a/SimMuon/CSCDigitizer/test/CSCGasCollisionsTest.cpp b/SimMuon/CSCDigitizer/test/CSCGasCollisionsTest.cpp
index 83e7db6458a99..4e47e2be30aeb 100644
--- a/SimMuon/CSCDigitizer/test/CSCGasCollisionsTest.cpp
+++ b/SimMuon/CSCDigitizer/test/CSCGasCollisionsTest.cpp
@@ -5,25 +5,23 @@
 // because CSCGasCollisions continues to run assuming muon mass
 // if table is bad or particle type does not exist in it.)
 
-#include "SimMuon/CSCDigitizer/src/CSCGasCollisions.h"
 #include "CLHEP/Random/JamesRandom.h"
+#include "DataFormats/MuonDetId/interface/CSCDetId.h"
+#include "SimMuon/CSCDigitizer/src/CSCGasCollisions.h"
 #include <algorithm>
-#include <numeric>
 #include <functional>
-#include "DataFormats/MuonDetId/interface/CSCDetId.h"
-
-int main() 
-{
+#include <numeric>
 
+int main() {
   // Set up pset param explicitly required by CSCGasCollisions.
   // Note that it has no effect because this stand-alone program
   // does not activate MessageLogger which now controls output
   // in CSCGasCollisions.
   edm::ParameterSet pset;
-  pset.addUntrackedParameter<bool>("dumpGasCollisions", false); 
+  pset.addUntrackedParameter<bool>("dumpGasCollisions", false);
   pset.registerIt();
 
-  CSCGasCollisions collisions (  pset );
+  CSCGasCollisions collisions(pset);
 
   ParticleDataTable dummyTable;
   // let the code assume a muon
@@ -31,9 +29,8 @@ int main()
 
   CLHEP::HepJamesRandom engine;
 
-  PSimHit simHit(LocalPoint(0.,0.,-0.5), LocalPoint(0.,0.,0.5),
-                 4., 0., 0.000005, 13,
-                 CSCDetId(1,1,1,1,1), 0, 0., 0., 0);
+  PSimHit simHit(
+      LocalPoint(0., 0., -0.5), LocalPoint(0., 0., 0.5), 4., 0., 0.000005, 13, CSCDetId(1, 1, 1, 1, 1), 0, 0., 0., 0);
 
   /*
   PSimHit( const Local3DPoint& entry, const Local3DPoint& exit,
@@ -45,7 +42,7 @@ int main()
   int n = 100;
   int sumElectrons = 0;
   int sumClusters = 0;
-  for(int i = 0; i < n; ++i) {
+  for (int i = 0; i < n; ++i) {
     std::vector<LocalPoint> clusters;
     std::vector<int> electrons;
     collisions.simulate(simHit, clusters, electrons, &engine);
@@ -54,6 +51,6 @@ int main()
     sumClusters += clusters.size();
   }
 
-  std::cout << "Clusters: " << sumClusters/n << "  electrons: " << sumElectrons/n << std::endl;
+  std::cout << "Clusters: " << sumClusters / n << "  electrons: " << sumElectrons / n << std::endl;
   return 0;
 }
diff --git a/SimMuon/CSCDigitizer/test/CSCNoiseMatrixTest.cc b/SimMuon/CSCDigitizer/test/CSCNoiseMatrixTest.cc
index 6527b1aa24a3f..d1f0116dbea9d 100644
--- a/SimMuon/CSCDigitizer/test/CSCNoiseMatrixTest.cc
+++ b/SimMuon/CSCDigitizer/test/CSCNoiseMatrixTest.cc
@@ -1,36 +1,35 @@
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "CalibMuon/CSCCalibration/interface/CSCConditions.h"
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 #include "Geometry/CSCGeometry/interface/CSCLayerGeometry.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "SimMuon/CSCDigitizer/src/CSCDbStripConditions.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/Event.h"
 
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 #include "FWCore/Utilities/interface/EDMException.h"
+#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 
-class CSCNoiseMatrixTest : public edm::EDAnalyzer
-{
+class CSCNoiseMatrixTest : public edm::EDAnalyzer {
 public:
-  CSCNoiseMatrixTest(const edm::ParameterSet & pset) : theDbConditions(pset) {
+  CSCNoiseMatrixTest(const edm::ParameterSet &pset) : theDbConditions(pset) {
     edm::Service<edm::RandomNumberGenerator> rng;
-    if ( ! rng.isAvailable()) {
-     throw cms::Exception("Configuration")
-       << "CSCNoiseMatrixTest requires the RandomNumberGeneratorService\n"
-          "which is not present in the configuration file.  You must add the service\n"
-          "in the configuration file or remove the modules that require it.";
+    if (!rng.isAvailable()) {
+      throw cms::Exception("Configuration") << "CSCNoiseMatrixTest requires the RandomNumberGeneratorService\n"
+                                               "which is not present in the configuration file.  You must add "
+                                               "the service\n"
+                                               "in the configuration file or remove the modules that require it.";
     }
   }
 
   ~CSCNoiseMatrixTest() override {}
-  //virtual void beginRun(edm::Run const& run, edm::EventSetup const& eventSetup)
-  void analyze(const edm::Event& e, const edm::EventSetup&eventSetup) override
-  {
+  // virtual void beginRun(edm::Run const& run, edm::EventSetup const&
+  // eventSetup)
+  void analyze(const edm::Event &e, const edm::EventSetup &eventSetup) override {
     edm::Service<edm::RandomNumberGenerator> rng;
-    CLHEP::HepRandomEngine* engine = &rng->getEngine(e.streamID());
+    CLHEP::HepRandomEngine *engine = &rng->getEngine(e.streamID());
 
     theDbConditions.initializeEvent(eventSetup);
     // fake signal is going to get noisified 200000 times!
@@ -40,36 +39,30 @@ class CSCNoiseMatrixTest : public edm::EDAnalyzer
 
     // find the geometry & conditions for this event
     edm::ESHandle<CSCGeometry> hGeom;
-    eventSetup.get<MuonGeometryRecord>().get("idealForDigi",hGeom);
+    eventSetup.get<MuonGeometryRecord>().get("idealForDigi", hGeom);
     const CSCGeometry *pGeom = &*hGeom;
 
     // try making a noisifier and using it
-    const CSCGeometry::LayerContainer& layers = pGeom->layers();
-    for(auto layerItr = layers.begin();
-        layerItr != layers.end(); ++layerItr)
-    {
+    const CSCGeometry::LayerContainer &layers = pGeom->layers();
+    for (auto layerItr = layers.begin(); layerItr != layers.end(); ++layerItr) {
       unsigned nstrips = (**layerItr).geometry()->numberOfStrips();
-      for(unsigned istrip = 1; istrip != nstrips; ++istrip)
-      {
+      for (unsigned istrip = 1; istrip != nstrips; ++istrip) {
         CSCAnalogSignal signal(istrip, scaBinSize, binValues, 0., 0.);
-        //theDbConditions.fetchNoisifier((**layerItr).id(),istrip); 
-        try {       
+        // theDbConditions.fetchNoisifier((**layerItr).id(),istrip);
+        try {
           theDbConditions.noisify((**layerItr).id(), signal, engine);
-        }
-        catch(cms::Exception & e) {
-           std::cerr << "Bad Noise Matrix for " << (**layerItr).id()  
-                     << "strip " << istrip << "\n";
-           std::cerr << e.what() << std::endl;
+        } catch (cms::Exception &e) {
+          std::cerr << "Bad Noise Matrix for " << (**layerItr).id() << "strip " << istrip << "\n";
+          std::cerr << e.what() << std::endl;
         }
       }
     }
   }
 
-  //virtual void analyze(const edm::Event&, const edm::EventSetup&) {}
+  // virtual void analyze(const edm::Event&, const edm::EventSetup&) {}
 
 private:
   CSCDbStripConditions theDbConditions;
 };
 
 DEFINE_FWK_MODULE(CSCNoiseMatrixTest);
-
diff --git a/SimMuon/Configuration/python/SimMuon_cff.py b/SimMuon/Configuration/python/SimMuon_cff.py
index 8e6c00e2da55e..523a85d668c8c 100644
--- a/SimMuon/Configuration/python/SimMuon_cff.py
+++ b/SimMuon/Configuration/python/SimMuon_cff.py
@@ -12,21 +12,22 @@
 # RPC digitizer
 # 
 from SimMuon.RPCDigitizer.muonrpcdigi_cfi import *
-muonDigi = cms.Sequence(simMuonCSCDigis+simMuonDTDigis+simMuonRPCDigis)
+muonDigiTask = cms.Task(simMuonCSCDigis, simMuonDTDigis, simMuonRPCDigis)
+muonDigi = cms.Sequence(muonDigiTask)
 
 from SimMuon.GEMDigitizer.muonGEMDigi_cff import *
 from SimMuon.GEMDigitizer.muonME0Digi_cff import *
 
-_run3_muonDigi = muonDigi.copy()
-_run3_muonDigi += muonGEMDigi
+_run3_muonDigiTask = muonDigiTask.copy()
+_run3_muonDigiTask.add(muonGEMDigiTask)
 
-_phase2_muonDigi = _run3_muonDigi.copy()
-_phase2_muonDigi += muonME0Digi
+_phase2_muonDigiTask = _run3_muonDigiTask.copy()
+_phase2_muonDigiTask.add(muonME0DigiTask)
 
 from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017
-run2_GEM_2017.toReplaceWith( muonDigi, _run3_muonDigi )
+run2_GEM_2017.toReplaceWith( muonDigiTask, _run3_muonDigiTask )
 from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
-run3_GEM.toReplaceWith( muonDigi, _run3_muonDigi )
+run3_GEM.toReplaceWith( muonDigiTask, _run3_muonDigiTask )
 from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon
-phase2_muon.toReplaceWith( muonDigi, _phase2_muonDigi )
+phase2_muon.toReplaceWith( muonDigiTask, _phase2_muonDigiTask )
 
diff --git a/SimMuon/DTDigitizer/interface/DTDigiSyncBase.h b/SimMuon/DTDigitizer/interface/DTDigiSyncBase.h
index 8aa0de99d62e7..4e63a1c8f0502 100644
--- a/SimMuon/DTDigitizer/interface/DTDigiSyncBase.h
+++ b/SimMuon/DTDigitizer/interface/DTDigiSyncBase.h
@@ -12,7 +12,6 @@ class DTLayer;
 
 class DTDigiSyncBase {
 public:
-
   /// Constructor
   DTDigiSyncBase(){};
 
@@ -20,11 +19,9 @@ class DTDigiSyncBase {
   virtual ~DTDigiSyncBase(){};
 
   /// Delays to be added to digi times during digitization, in ns.
-  virtual double digitizerOffset(const DTWireId * id, const DTLayer* layer) const = 0;
+  virtual double digitizerOffset(const DTWireId *id, const DTLayer *layer) const = 0;
 
   /// Offset to obtain "raw" TDCs for the L1 emulator from digis.
-  virtual double emulatorOffset(const DTWireId * id) const = 0;
-
+  virtual double emulatorOffset(const DTWireId *id) const = 0;
 };
 #endif
-
diff --git a/SimMuon/DTDigitizer/interface/DTDigiSyncFactory.h b/SimMuon/DTDigitizer/interface/DTDigiSyncFactory.h
index 41b899c1db920..bb21e37b238e9 100644
--- a/SimMuon/DTDigitizer/interface/DTDigiSyncFactory.h
+++ b/SimMuon/DTDigitizer/interface/DTDigiSyncFactory.h
@@ -14,9 +14,10 @@
 #include "FWCore/PluginManager/interface/PluginFactory.h"
 #include "SimMuon/DTDigitizer/interface/DTDigiSyncBase.h"
 
-namespace edm {class ParameterSet;}
+namespace edm {
+  class ParameterSet;
+}
 
 typedef edmplugin::PluginFactory<DTDigiSyncBase *(const edm::ParameterSet &)> DTDigiSyncFactory;
-  
-#endif
 
+#endif
diff --git a/SimMuon/DTDigitizer/plugins/DTChamberMasker.cc b/SimMuon/DTDigitizer/plugins/DTChamberMasker.cc
index f1dddf2aa7e4d..3515057fe033d 100644
--- a/SimMuon/DTDigitizer/plugins/DTChamberMasker.cc
+++ b/SimMuon/DTDigitizer/plugins/DTChamberMasker.cc
@@ -2,8 +2,9 @@
 //
 // Package:    SimMuon/DTDigitizer
 // Class:      DTChamberMasker
-// 
-/**\class DTChamberMasker DTChamberMasker.cc SimMuon/DTDigitizer/plugins/DTChamberMasker.cc
+//
+/**\class DTChamberMasker DTChamberMasker.cc
+ SimMuon/DTDigitizer/plugins/DTChamberMasker.cc
 
  Description: Class to mask DT digis on a chamber by chamber basis
 
@@ -14,19 +15,18 @@
 //
 //
 
-
 // system include files
+#include <algorithm>
+#include <iostream>
 #include <map>
 #include <memory>
 #include <string>
-#include <iostream>
-#include <algorithm>
 
 // user include files
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/Event.h"
@@ -37,8 +37,8 @@
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 #include "Geometry/DTGeometry/interface/DTChamber.h"
 #include "Geometry/DTGeometry/interface/DTLayer.h"
@@ -48,39 +48,35 @@
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
 #include "DataFormats/MuonDetId/interface/DTWireId.h"
 
-#include "CondFormats/RecoMuonObjects/interface/MuonSystemAging.h"
 #include "CondFormats/DataRecord/interface/MuonSystemAgingRcd.h"
+#include "CondFormats/RecoMuonObjects/interface/MuonSystemAging.h"
 
+#include "CLHEP/Random/RandomEngine.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
-#include "CLHEP/Random/RandomEngine.h"
-
 
 //
 // class declaration
 //
 
-class DTChamberMasker : public edm::stream::EDProducer<>
-{
-
+class DTChamberMasker : public edm::stream::EDProducer<> {
 public:
-  explicit DTChamberMasker(const edm::ParameterSet&);
+  explicit DTChamberMasker(const edm::ParameterSet &);
   ~DTChamberMasker() override;
-  
-  static void fillDescriptions(edm::ConfigurationDescriptions&);
+
+  static void fillDescriptions(edm::ConfigurationDescriptions &);
 
 private:
-  void produce(edm::Event&, const edm::EventSetup&) override;
-      
-  void beginRun(edm::Run const&, edm::EventSetup const&) override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
+
+  void beginRun(edm::Run const &, edm::EventSetup const &) override;
 
-  void createMaskedChamberCollection(edm::ESHandle<DTGeometry> &); 
+  void createMaskedChamberCollection(edm::ESHandle<DTGeometry> &);
 
   // ----------member data ---------------------------
 
-  edm::EDGetTokenT <DTDigiCollection> m_digiToken;
-  std::map<unsigned int, float> m_ChEffs;  
-  
+  edm::EDGetTokenT<DTDigiCollection> m_digiToken;
+  std::map<unsigned int, float> m_ChEffs;
 };
 
 //
@@ -90,81 +86,57 @@ class DTChamberMasker : public edm::stream::EDProducer<>
 //
 // constructors and destructor
 //
-DTChamberMasker::DTChamberMasker(const edm::ParameterSet& iConfig) :
-  m_digiToken(consumes<DTDigiCollection>(iConfig.getParameter<edm::InputTag>("digiTag")) )
-{
-
+DTChamberMasker::DTChamberMasker(const edm::ParameterSet &iConfig)
+    : m_digiToken(consumes<DTDigiCollection>(iConfig.getParameter<edm::InputTag>("digiTag"))) {
   produces<DTDigiCollection>();
-
 }
 
-
-DTChamberMasker::~DTChamberMasker()
-{
-
-}
+DTChamberMasker::~DTChamberMasker() {}
 
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-DTChamberMasker::produce(edm::Event& event, const edm::EventSetup& conditions)
-{
-  
+void DTChamberMasker::produce(edm::Event &event, const edm::EventSetup &conditions) {
   edm::Service<edm::RandomNumberGenerator> randGenService;
-  CLHEP::HepRandomEngine& randGen = randGenService->getEngine(event.streamID());
- 
+  CLHEP::HepRandomEngine &randGen = randGenService->getEngine(event.streamID());
+
   std::unique_ptr<DTDigiCollection> filteredDigis(new DTDigiCollection());
 
-  if(!m_digiToken.isUninitialized())
-    {
-      edm::Handle<DTDigiCollection> dtDigis;
-      event.getByToken(m_digiToken, dtDigis);
-  
-      for ( const auto & dtLayerId : (*dtDigis) )
-	{
-	  
-	  uint32_t rawId = (dtLayerId.first).chamberId().rawId();
-	  auto chEffIt = m_ChEffs.find(rawId);
-
-	  if (chEffIt == m_ChEffs.end() || randGen.flat() <= chEffIt->second)
-	    filteredDigis->put(dtLayerId.second,dtLayerId.first);
-	  
-	}
+  if (!m_digiToken.isUninitialized()) {
+    edm::Handle<DTDigiCollection> dtDigis;
+    event.getByToken(m_digiToken, dtDigis);
 
+    for (const auto &dtLayerId : (*dtDigis)) {
+      uint32_t rawId = (dtLayerId.first).chamberId().rawId();
+      auto chEffIt = m_ChEffs.find(rawId);
+
+      if (chEffIt == m_ChEffs.end() || randGen.flat() <= chEffIt->second)
+        filteredDigis->put(dtLayerId.second, dtLayerId.first);
     }
-  
-  event.put(std::move(filteredDigis));
+  }
 
+  event.put(std::move(filteredDigis));
 }
 
 // ------------ method called when starting to processes a run  ------------
-void
-DTChamberMasker::beginRun(edm::Run const& run, edm::EventSetup const& iSetup)
-{
-
+void DTChamberMasker::beginRun(edm::Run const &run, edm::EventSetup const &iSetup) {
   m_ChEffs.clear();
 
   edm::ESHandle<MuonSystemAging> agingObj;
   iSetup.get<MuonSystemAgingRcd>().get(agingObj);
 
   m_ChEffs = agingObj->m_DTChambEffs;
-
 }
 
-  
-// ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
-void
-DTChamberMasker::fillDescriptions(edm::ConfigurationDescriptions& descriptions) 
-{
-
+// ------------ method fills 'descriptions' with the allowed parameters for the
+// module  ------------
+void DTChamberMasker::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
   edm::ParameterSetDescription desc;
   desc.add<edm::InputTag>("digiTag", edm::InputTag("simMuonDTDigis"));
-  descriptions.add("dtChamberMasker",desc);
-
+  descriptions.add("dtChamberMasker", desc);
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(DTChamberMasker);
diff --git a/SimMuon/DTDigitizer/plugins/PreMixingDTDigiSimLinkWorker.cc b/SimMuon/DTDigitizer/plugins/PreMixingDTDigiSimLinkWorker.cc
index 420056ef7745f..79919e5723ec6 100644
--- a/SimMuon/DTDigitizer/plugins/PreMixingDTDigiSimLinkWorker.cc
+++ b/SimMuon/DTDigitizer/plugins/PreMixingDTDigiSimLinkWorker.cc
@@ -1,14 +1,15 @@
+#include "SimDataFormats/DigiSimLinks/interface/DTDigiSimLinkCollection.h"
 #include "SimGeneral/PreMixingModule/interface/PreMixingDigiSimLinkWorker.h"
 #include "SimGeneral/PreMixingModule/interface/PreMixingWorkerFactory.h"
-#include "SimDataFormats/DigiSimLinks/interface/DTDigiSimLinkCollection.h"
 
 // DT does not use DetSetVector, so have to specialize put()
 template <>
-void PreMixingDigiSimLinkWorker<DTDigiSimLinkCollection>::addPileups(PileUpEventPrincipal const& pep, edm::EventSetup const& iSetup) {
+void PreMixingDigiSimLinkWorker<DTDigiSimLinkCollection>::addPileups(PileUpEventPrincipal const &pep,
+                                                                     edm::EventSetup const &iSetup) {
   edm::Handle<DTDigiSimLinkCollection> digis;
   pep.getByLabel(pileupTag_, digis);
-  if(digis.isValid()) {
-    for(const auto& elem: *digis) {
+  if (digis.isValid()) {
+    for (const auto &elem : *digis) {
       merged_->put(elem.second, elem.first);
     }
   }
diff --git a/SimMuon/DTDigitizer/plugins/PreMixingDTWorker.cc b/SimMuon/DTDigitizer/plugins/PreMixingDTWorker.cc
index d815142c51fd1..90bef26e655d1 100644
--- a/SimMuon/DTDigitizer/plugins/PreMixingDTWorker.cc
+++ b/SimMuon/DTDigitizer/plugins/PreMixingDTWorker.cc
@@ -1,6 +1,6 @@
+#include "DataFormats/DTDigi/interface/DTDigiCollection.h"
 #include "SimGeneral/PreMixingModule/interface/PreMixingMuonWorker.h"
 #include "SimGeneral/PreMixingModule/interface/PreMixingWorkerFactory.h"
-#include "DataFormats/DTDigi/interface/DTDigiCollection.h"
 
 using PreMixingDTWorker = PreMixingMuonWorker<DTDigiCollection>;
 
diff --git a/SimMuon/DTDigitizer/src/DTDigiReader.cc b/SimMuon/DTDigitizer/src/DTDigiReader.cc
index 5f13024e3baea..2433b0c28bdca 100644
--- a/SimMuon/DTDigitizer/src/DTDigiReader.cc
+++ b/SimMuon/DTDigitizer/src/DTDigiReader.cc
@@ -2,49 +2,50 @@
 #define SimMuon_DTDigiReader_h
 
 /** \class DTDigiReader
- *  Analyse the the muon-drift-tubes digitizer. 
- *  
+ *  Analyse the the muon-drift-tubes digitizer.
+ *
  *  \authors: R. Bellan
  */
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 
-#include <FWCore/Framework/interface/one/EDAnalyzer.h>
-#include <FWCore/Framework/interface/Event.h>
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <FWCore/Framework/interface/Event.h>
+#include <FWCore/Framework/interface/one/EDAnalyzer.h>
 
-#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
 #include "DataFormats/MuonDetId/interface/DTWireId.h"
 #include <DataFormats/DTDigi/interface/DTDigiCollection.h>
 
 #include <iostream>
 
-#include "TH1F.h"  //FIXME
 #include "TFile.h"
+#include "TH1F.h"  //FIXME
 
 using namespace edm;
 using namespace std;
 
-class DTDigiReader: public edm::one::EDAnalyzer<> {
-  
+class DTDigiReader : public edm::one::EDAnalyzer<> {
 public:
-  explicit DTDigiReader(const ParameterSet& pset){
-    file = new TFile("DTDigiPlots.root","RECREATE");
+  explicit DTDigiReader(const ParameterSet &pset) {
+    file = new TFile("DTDigiPlots.root", "RECREATE");
     file->cd();
-    DigiTimeBox = new TH1F("DigiTimeBox","Digi Time Box",2048,0,1600);
-    DigiTimeBoxW0 = new TH1F("DigiTimeBoxW0","Digi Time Box W0",2000,0,1600);
-    DigiTimeBoxW1 = new TH1F("DigiTimeBoxW1","Digi Time Box W1",2000,0,1600);
-    DigiTimeBoxW2 = new TH1F("DigiTimeBoxW2","Digi Time Box W2",2000,0,1600);
-    if(file->IsOpen()) cout<<"file open!"<<endl;
-    else cout<<"*** Error in opening file ***"<<endl;
+    DigiTimeBox = new TH1F("DigiTimeBox", "Digi Time Box", 2048, 0, 1600);
+    DigiTimeBoxW0 = new TH1F("DigiTimeBoxW0", "Digi Time Box W0", 2000, 0, 1600);
+    DigiTimeBoxW1 = new TH1F("DigiTimeBoxW1", "Digi Time Box W1", 2000, 0, 1600);
+    DigiTimeBoxW2 = new TH1F("DigiTimeBoxW2", "Digi Time Box W2", 2000, 0, 1600);
+    if (file->IsOpen())
+      cout << "file open!" << endl;
+    else
+      cout << "*** Error in opening file ***" << endl;
     label = pset.getUntrackedParameter<string>("label");
-    psim_token = consumes<PSimHitContainer>( edm::InputTag("g4SimHits","MuonDTHits") );
-    DTd_token = consumes<DTDigiCollection>( edm::InputTag(label) );
+    psim_token = consumes<PSimHitContainer>(edm::InputTag("g4SimHits", "MuonDTHits"));
+    DTd_token = consumes<DTDigiCollection>(edm::InputTag(label));
   }
-  
-  ~DTDigiReader() override{
+
+  ~DTDigiReader() override {
     file->cd();
     DigiTimeBox->Write();
     DigiTimeBoxW0->Write();
@@ -54,64 +55,56 @@ class DTDigiReader: public edm::one::EDAnalyzer<> {
     //    delete file;
     // delete DigiTimeBox;
   }
-  
-  void analyze(const Event & event, const EventSetup& eventSetup) override{
-    cout << "--- Run: " << event.id().run()
-	 << " Event: " << event.id().event() << endl;
-    
+
+  void analyze(const Event &event, const EventSetup &eventSetup) override {
+    cout << "--- Run: " << event.id().run() << " Event: " << event.id().event() << endl;
+
     Handle<DTDigiCollection> dtDigis;
     event.getByToken(DTd_token, dtDigis);
-     // event.getByLabel("MuonDTDigis", dtDigis);
-    Handle<PSimHitContainer> simHits; 
-    event.getByToken(psim_token,simHits);    
-
+    // event.getByLabel("MuonDTDigis", dtDigis);
+    Handle<PSimHitContainer> simHits;
+    event.getByToken(psim_token, simHits);
 
     DTDigiCollection::DigiRangeIterator detUnitIt;
-    for (detUnitIt=dtDigis->begin();
-	 detUnitIt!=dtDigis->end();
-	 ++detUnitIt){
-      
-      const DTLayerId& id = (*detUnitIt).first;
-      const DTDigiCollection::Range& range = (*detUnitIt).second;
-      
+    for (detUnitIt = dtDigis->begin(); detUnitIt != dtDigis->end(); ++detUnitIt) {
+      const DTLayerId &id = (*detUnitIt).first;
+      const DTDigiCollection::Range &range = (*detUnitIt).second;
+
       // DTLayerId print-out
-      cout<<"--------------"<<endl;
-      cout<<"id: "<<id;
-      
+      cout << "--------------" << endl;
+      cout << "id: " << id;
+
       // Loop over the digis of this DetUnit
-      for (DTDigiCollection::const_iterator digiIt = range.first;
-	   digiIt!=range.second;
-	   ++digiIt){
-	//	if((*digiIt).time()<703 &&(*digiIt).time()>699) {
-	  cout<<" Wire: "<<(*digiIt).wire()<<endl
-	      <<" digi time (ns): "<<(*digiIt).time()<<endl;
-	  
-	  for(vector<PSimHit>::const_iterator simHit = simHits->begin();
-	      simHit != simHits->end(); simHit++){
-	    DTWireId wireId((*simHit).detUnitId());
-	    if (wireId.layerId()==id && abs((*simHit).particleType())==13){
-	      cout<<"entry: "<<(*simHit).entryPoint()<<endl
-		  <<"exit: "<<(*simHit).exitPoint()<<endl
-		  <<"TOF: "<<(*simHit).timeOfFlight()<<endl;
-	    }
-	  }
-
-	  //	}
-
-	if(id.layer()==3)
-	  DigiTimeBoxW0->Fill((*digiIt).time());
-	else if(abs(id.superlayer())==1)
-	  DigiTimeBoxW1->Fill((*digiIt).time());
-	else if(abs(id.superlayer())==2)
-	  DigiTimeBoxW2->Fill((*digiIt).time());
-	else cout<<"Error"<<endl;
-	DigiTimeBox->Fill((*digiIt).time());
-	
-      }// for digis in layer
-    }// for layers
-    cout<<"--------------"<<endl;
+      for (DTDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) {
+        //	if((*digiIt).time()<703 &&(*digiIt).time()>699) {
+        cout << " Wire: " << (*digiIt).wire() << endl << " digi time (ns): " << (*digiIt).time() << endl;
+
+        for (vector<PSimHit>::const_iterator simHit = simHits->begin(); simHit != simHits->end(); simHit++) {
+          DTWireId wireId((*simHit).detUnitId());
+          if (wireId.layerId() == id && abs((*simHit).particleType()) == 13) {
+            cout << "entry: " << (*simHit).entryPoint() << endl
+                 << "exit: " << (*simHit).exitPoint() << endl
+                 << "TOF: " << (*simHit).timeOfFlight() << endl;
+          }
+        }
+
+        //	}
+
+        if (id.layer() == 3)
+          DigiTimeBoxW0->Fill((*digiIt).time());
+        else if (abs(id.superlayer()) == 1)
+          DigiTimeBoxW1->Fill((*digiIt).time());
+        else if (abs(id.superlayer()) == 2)
+          DigiTimeBoxW2->Fill((*digiIt).time());
+        else
+          cout << "Error" << endl;
+        DigiTimeBox->Fill((*digiIt).time());
+
+      }  // for digis in layer
+    }    // for layers
+    cout << "--------------" << endl;
   }
-  
+
 private:
   string label;
   TH1F *DigiTimeBox;
@@ -120,9 +113,8 @@ class DTDigiReader: public edm::one::EDAnalyzer<> {
   TH1F *DigiTimeBoxW2;
   TFile *file;
 
-  edm::EDGetTokenT< PSimHitContainer > psim_token;
-  edm::EDGetTokenT< DTDigiCollection > DTd_token;
-  
+  edm::EDGetTokenT<PSimHitContainer> psim_token;
+  edm::EDGetTokenT<DTDigiCollection> DTd_token;
 };
 
-#endif    
+#endif
diff --git a/SimMuon/DTDigitizer/src/DTDigiSyncFactory.cc b/SimMuon/DTDigitizer/src/DTDigiSyncFactory.cc
index 61a820ea827e1..9302dcb38ef27 100644
--- a/SimMuon/DTDigitizer/src/DTDigiSyncFactory.cc
+++ b/SimMuon/DTDigitizer/src/DTDigiSyncFactory.cc
@@ -8,5 +8,4 @@
 
 #include "FWCore/PluginManager/interface/PluginFactory.h"
 
-EDM_REGISTER_PLUGINFACTORY(DTDigiSyncFactory,"DTDigiSyncFactory");
-
+EDM_REGISTER_PLUGINFACTORY(DTDigiSyncFactory, "DTDigiSyncFactory");
diff --git a/SimMuon/DTDigitizer/src/DTDigiSyncFromTable.cc b/SimMuon/DTDigitizer/src/DTDigiSyncFromTable.cc
index a1c6e5314a215..afc01303e9991 100644
--- a/SimMuon/DTDigitizer/src/DTDigiSyncFromTable.cc
+++ b/SimMuon/DTDigitizer/src/DTDigiSyncFromTable.cc
@@ -4,20 +4,19 @@
  *  \author N. Amapane, R. Bellan - INFN Torino
  */
 
-#include "SimMuon/DTDigitizer/src/DTDigiSyncFromTable.h"
 #include "DataFormats/MuonDetId/interface/DTWireId.h"
+#include "SimMuon/DTDigitizer/src/DTDigiSyncFromTable.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "Geometry/DTGeometry/interface/DTLayer.h"
 
-DTDigiSyncFromTable::DTDigiSyncFromTable(const edm::ParameterSet& pSet){}
+DTDigiSyncFromTable::DTDigiSyncFromTable(const edm::ParameterSet &pSet) {}
 
-DTDigiSyncFromTable::~DTDigiSyncFromTable(){}
+DTDigiSyncFromTable::~DTDigiSyncFromTable() {}
 
 // Delays to be added to digi times during digitization, in ns.
-double DTDigiSyncFromTable::digitizerOffset(const DTWireId * id, const DTLayer* layer) const {
-  
+double DTDigiSyncFromTable::digitizerOffset(const DTWireId *id, const DTLayer *layer) const {
   double result = 0;
 
   // ...
@@ -26,8 +25,7 @@ double DTDigiSyncFromTable::digitizerOffset(const DTWireId * id, const DTLayer*
 }
 
 // Offset to obtain "raw" TDCs for the L1 emulator from digis.
-double DTDigiSyncFromTable::emulatorOffset(const DTWireId * id) const {
-
+double DTDigiSyncFromTable::emulatorOffset(const DTWireId *id) const {
   double result = 0;
 
   // ...
diff --git a/SimMuon/DTDigitizer/src/DTDigiSyncFromTable.h b/SimMuon/DTDigitizer/src/DTDigiSyncFromTable.h
index c7d1acfcbadea..eafdc31ecbdf9 100644
--- a/SimMuon/DTDigitizer/src/DTDigiSyncFromTable.h
+++ b/SimMuon/DTDigitizer/src/DTDigiSyncFromTable.h
@@ -11,23 +11,24 @@
 
 class DTWireId;
 class DTLayer;
-namespace edm{class ParameterSet;}
+namespace edm {
+  class ParameterSet;
+}
 
 class DTDigiSyncFromTable : public DTDigiSyncBase {
 public:
   /// Constructor
-  DTDigiSyncFromTable(const edm::ParameterSet&);
+  DTDigiSyncFromTable(const edm::ParameterSet &);
 
   /// Destructor
   ~DTDigiSyncFromTable() override;
 
   /// Delays to be added to digi times during digitization, in ns.
-  double digitizerOffset(const DTWireId * id, const DTLayer* layer=nullptr) const override;
+  double digitizerOffset(const DTWireId *id, const DTLayer *layer = nullptr) const override;
 
   /// Offset to obtain "raw" TDCs for the L1 emulator from digis.
-  double emulatorOffset(const DTWireId * id) const override;
+  double emulatorOffset(const DTWireId *id) const override;
 
 private:
 };
 #endif
-
diff --git a/SimMuon/DTDigitizer/src/DTDigiSyncTOFCorr.cc b/SimMuon/DTDigitizer/src/DTDigiSyncTOFCorr.cc
index e8c803122523b..648567d4e141c 100644
--- a/SimMuon/DTDigitizer/src/DTDigiSyncTOFCorr.cc
+++ b/SimMuon/DTDigitizer/src/DTDigiSyncTOFCorr.cc
@@ -4,62 +4,54 @@
  *  \author N. Amapane, R. Bellan - INFN Torino
  */
 
-#include "SimMuon/DTDigitizer/src/DTDigiSyncTOFCorr.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/MuonDetId/interface/DTWireId.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "SimMuon/DTDigitizer/src/DTDigiSyncTOFCorr.h"
 
-#include "Geometry/DTGeometry/interface/DTLayer.h"
 #include "Geometry/DTGeometry/interface/DTChamber.h"
+#include "Geometry/DTGeometry/interface/DTLayer.h"
 #include "Geometry/DTGeometry/interface/DTSuperLayer.h"
 #include <iostream>
 
 using namespace std;
 
-DTDigiSyncTOFCorr::DTDigiSyncTOFCorr(const edm::ParameterSet& pSet){
-  
-  theOffset = pSet.getParameter<double>("offset"); //500ns
-  corrType = pSet.getParameter<int>("TOFCorrection"); //1
+DTDigiSyncTOFCorr::DTDigiSyncTOFCorr(const edm::ParameterSet &pSet) {
+  theOffset = pSet.getParameter<double>("offset");     // 500ns
+  corrType = pSet.getParameter<int>("TOFCorrection");  // 1
 }
 
-
-DTDigiSyncTOFCorr::~DTDigiSyncTOFCorr(){}
-
+DTDigiSyncTOFCorr::~DTDigiSyncTOFCorr() {}
 
 // Delays to be added to digi times during digitization, in ns.
-double DTDigiSyncTOFCorr::digitizerOffset(const DTWireId * id, const DTLayer* layer) const {
-
+double DTDigiSyncTOFCorr::digitizerOffset(const DTWireId *id, const DTLayer *layer) const {
   double offset = theOffset;
-  const double cSpeed = 29.9792458; // cm/ns
+  const double cSpeed = 29.9792458;  // cm/ns
 
-  if (corrType==1) {
+  if (corrType == 1) {
     // Subtraction of assumed TOF, per CHAMBER
     double flightL = layer->chamber()->surface().position().mag();
-    offset -= flightL/cSpeed;
-  } else if (corrType==2) {
-    // Subtraction of assumed TOF, per WIRE 
+    offset -= flightL / cSpeed;
+  } else if (corrType == 2) {
+    // Subtraction of assumed TOF, per WIRE
 
     // Position of the wire in the Layer's reference frame
     float localXPos = layer->specificTopology().wirePosition(id->wire());
-    LocalPoint localPos(localXPos,0,0); 
+    LocalPoint localPos(localXPos, 0, 0);
 
     // Distance of the wire to the CMS's I.P.
     double flightL = layer->surface().toGlobal(localPos).mag();
 
-    offset -= flightL/cSpeed;
+    offset -= flightL / cSpeed;
 
-  } else if (corrType==3) {
+  } else if (corrType == 3) {
     // Subtraction of assumed TOF, per SUPERLAYER
     double flightL = layer->superLayer()->surface().position().mag();
-    offset -= flightL/cSpeed;
-  } else if (corrType!=0){
-    cout << "ERROR: SimMuon:DTDigitizer:DTDigiSyncTOFCorr:TOFCorrection = " << corrType
-	 << "is not defined " << endl; 
+    offset -= flightL / cSpeed;
+  } else if (corrType != 0) {
+    cout << "ERROR: SimMuon:DTDigitizer:DTDigiSyncTOFCorr:TOFCorrection = " << corrType << "is not defined " << endl;
   }
   return offset;
 }
 
-
 // Offset to obtain "raw" TDCs for the L1 emulator from digis.
-double DTDigiSyncTOFCorr::emulatorOffset(const DTWireId * id) const {
-  return theOffset;
-}
+double DTDigiSyncTOFCorr::emulatorOffset(const DTWireId *id) const { return theOffset; }
diff --git a/SimMuon/DTDigitizer/src/DTDigiSyncTOFCorr.h b/SimMuon/DTDigitizer/src/DTDigiSyncTOFCorr.h
index 1060f5a1f4005..36fd55e71d1a6 100644
--- a/SimMuon/DTDigitizer/src/DTDigiSyncTOFCorr.h
+++ b/SimMuon/DTDigitizer/src/DTDigiSyncTOFCorr.h
@@ -4,19 +4,19 @@
 /** \class DTDigiSyncTOFCorr
  *  Digi offset computed as:           <br>
  *  t0 = Tcommon - aTOF                <br><br>
- *  
+ *
  *  where Tcommon is a fixed offset defined in                    <br>
  *  DTDigiSyncTOFCorr:offset (in ORCA the default was = 500 ns)       <br><br>
  *
- *  and aTOF is set according to MuBarDigiSyncTOFCorr:TOFCorrection: <br> 
+ *  and aTOF is set according to MuBarDigiSyncTOFCorr:TOFCorrection: <br>
  *  0: no TOF correction (aTOF=0)                                         <br>
  *  1: aTOF = the TOF of an infinite-momentum particle travelling from the
  *     nominal IP to the 3D center of the chamber                         <br>
- *  2: ditto, but for a particle travelling to the 3D center of the wire. 
- *     (This mode is avaliable for comparison with older data which were  
+ *  2: ditto, but for a particle travelling to the 3D center of the wire.
+ *     (This mode is avaliable for comparison with older data which were
  *     produced in this way)
  *  3: aTOF = the TOF of an infinite-momentum particle travelling from the
- *     nominal IP to the 3D center of the SL. Use this, unless you 
+ *     nominal IP to the 3D center of the SL. Use this, unless you
  *     really know what you are doing.
  *
  *  \author N. Amapane, R. Bellan - INFN Torino
@@ -26,25 +26,26 @@
 
 class DTWireId;
 class DTLayer;
-namespace edm{class ParameterSet;}
+namespace edm {
+  class ParameterSet;
+}
 
 class DTDigiSyncTOFCorr : public DTDigiSyncBase {
 public:
   /// Constructor
-  DTDigiSyncTOFCorr(const edm::ParameterSet&);
+  DTDigiSyncTOFCorr(const edm::ParameterSet &);
 
   /// Destructor
   ~DTDigiSyncTOFCorr() override;
 
   /// Delays to be added to digi times during digitization, in ns.
-  double digitizerOffset(const DTWireId * id, const DTLayer* layer=nullptr) const override;
+  double digitizerOffset(const DTWireId *id, const DTLayer *layer = nullptr) const override;
 
   /// Offset to obtain "raw" TDCs for the L1 emulator from digis.
-  double emulatorOffset(const DTWireId * id) const override;
+  double emulatorOffset(const DTWireId *id) const override;
 
 private:
   double theOffset;
   int corrType;
 };
 #endif
-
diff --git a/SimMuon/DTDigitizer/src/DTDigitizer.cc b/SimMuon/DTDigitizer/src/DTDigitizer.cc
index 71fa0a0cef6c9..da64063de65db 100644
--- a/SimMuon/DTDigitizer/src/DTDigitizer.cc
+++ b/SimMuon/DTDigitizer/src/DTDigitizer.cc
@@ -6,30 +6,30 @@
 // system include files
 #include <memory>
 
-//C++ headers
+// C++ headers
 #include <cmath>
 
-//Random generator
-#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
+// Random generator
 #include "FWCore/Utilities/interface/Exception.h"
-#include <CLHEP/Random/RandGaussQ.h>
+#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 #include <CLHEP/Random/RandFlat.h>
+#include <CLHEP/Random/RandGaussQ.h>
 
 // Framework
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EventSetup.h"
+#include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 // Geometry
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
 #include "Geometry/DTGeometry/interface/DTLayer.h"
 #include "Geometry/DTGeometry/interface/DTTopology.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
 
@@ -39,197 +39,193 @@
 
 // Digis
 #include "DataFormats/DTDigi/interface/DTDigiCollection.h"
-#include "DataFormats/MuonDetId/interface/DTWireId.h"
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
+#include "DataFormats/MuonDetId/interface/DTWireId.h"
 
 // DTDigitizer
-#include "SimMuon/DTDigitizer/interface/DTDigiSyncFactory.h"
 #include "SimMuon/DTDigitizer/interface/DTDigiSyncBase.h"
+#include "SimMuon/DTDigitizer/interface/DTDigiSyncFactory.h"
 
-#include "SimMuon/DTDigitizer/src/DTDriftTimeParametrization.h"
 #include "SimMuon/DTDigitizer/src/DTDigitizer.h"
+#include "SimMuon/DTDigitizer/src/DTDriftTimeParametrization.h"
 
 // namespaces
 using namespace edm;
 using namespace std;
 
 // Constructor
-DTDigitizer::DTDigitizer(const ParameterSet& conf_):
-  // Sync Algo
-  theSync{DTDigiSyncFactory::get()->create(conf_.getParameter<string>("SyncName"),
-                                           conf_.getParameter<ParameterSet>("pset"))}
- {
-  
+DTDigitizer::DTDigitizer(const ParameterSet &conf_)
+    :  // Sync Algo
+      theSync{DTDigiSyncFactory::get()->create(conf_.getParameter<string>("SyncName"),
+                                               conf_.getParameter<ParameterSet>("pset"))} {
   // Set verbose output
-  debug=conf_.getUntrackedParameter<bool>("debug"); 
-    
-  if (debug) LogPrint("DTDigitizer")<<"Creating a DTDigitizer"<<endl;
-  
-  //register the Producer with a label
-  //produces<DTDigiCollection>("MuonDTDigis"); // FIXME: Do I pass it by ParameterSet?
-  produces<DTDigiCollection>(); // FIXME: Do I pass it by ParameterSet?
+  debug = conf_.getUntrackedParameter<bool>("debug");
+
+  if (debug)
+    LogPrint("DTDigitizer") << "Creating a DTDigitizer" << endl;
+
+  // register the Producer with a label
+  // produces<DTDigiCollection>("MuonDTDigis"); // FIXME: Do I pass it by
+  // ParameterSet?
+  produces<DTDigiCollection>();  // FIXME: Do I pass it by ParameterSet?
   //  produces<DTDigiSimLinkCollection>("MuonDTDigiSimLinks");
   produces<DTDigiSimLinkCollection>();
-  
-  //Parameters:
 
-  // build digis only for mu hits (for debug purposes) 
-  onlyMuHits=conf_.getParameter<bool>("onlyMuHits");
-  
+  // Parameters:
+
+  // build digis only for mu hits (for debug purposes)
+  onlyMuHits = conf_.getParameter<bool>("onlyMuHits");
+
   // interpolate parametrization function
-  interpolate=conf_.getParameter<bool>("interpolate");
-  
+  interpolate = conf_.getParameter<bool>("interpolate");
+
   // Velocity of signal propagation along the wire (cm/ns)
   // For the default value
   // cfr. CMS-IN 2000-021:   (2.56+-0.17)x1e8 m/s
   //      CMS NOTE 2003-17:  (0.244)  m/ns
-  vPropWire=conf_.getParameter<double>("vPropWire"); //24.4
+  vPropWire = conf_.getParameter<double>("vPropWire");  // 24.4
+
+  // Dead time for signals on the same wire (number from M. Pegoraro)
+  deadTime = conf_.getParameter<double>("deadTime");  // 150
 
-  // Dead time for signals on the same wire (number from M. Pegoraro)  
-  deadTime=conf_.getParameter<double>("deadTime"); //150
-  
   // further configurable smearing
-  smearing=conf_.getParameter<double>("Smearing"); // 3.
+  smearing = conf_.getParameter<double>("Smearing");  // 3.
 
   // Debug flag to switch to the Ideal model
   // it uses a constant drift velocity and doesn't set any external delay
   IdealModel = conf_.getParameter<bool>("IdealModel");
 
   // Constant drift velocity needed by the above flag
-  if(IdealModel)
-    theConstVDrift = conf_.getParameter<double>("IdealModelConstantDriftVelocity"); // 55 um/ns
-  else theConstVDrift = 55.;
+  if (IdealModel)
+    theConstVDrift = conf_.getParameter<double>("IdealModelConstantDriftVelocity");  // 55 um/ns
+  else
+    theConstVDrift = 55.;
 
   // get random engine
   edm::Service<edm::RandomNumberGenerator> rng;
-  if ( ! rng.isAvailable()) {
-    throw cms::Exception("Configuration")
-      << "RandomNumberGeneratorService for DTDigitizer missing in cfg file";
+  if (!rng.isAvailable()) {
+    throw cms::Exception("Configuration") << "RandomNumberGeneratorService for DTDigitizer missing in cfg file";
   }
 
-  // MultipleLinks=false ==> one-to-one correspondence between digis and SimHits 
+  // MultipleLinks=false ==> one-to-one correspondence between digis and SimHits
   MultipleLinks = conf_.getParameter<bool>("MultipleLinks");
-  // MultipleLinks=true ==> association of SimHits within a time window LinksTimeWindow 
-  // (of the order of the resolution)
-  LinksTimeWindow = conf_.getParameter<double>("LinksTimeWindow"); // (10 ns)
+  // MultipleLinks=true ==> association of SimHits within a time window
+  // LinksTimeWindow (of the order of the resolution)
+  LinksTimeWindow = conf_.getParameter<double>("LinksTimeWindow");  // (10 ns)
 
-  //Name of Collection used for create the XF 
+  // Name of Collection used for create the XF
   mix_ = conf_.getParameter<std::string>("mixLabel");
   collection_for_XF = conf_.getParameter<std::string>("InputCollection");
-  cf_token = consumes<CrossingFrame<PSimHit> >( edm::InputTag(mix_, collection_for_XF) );
+  cf_token = consumes<CrossingFrame<PSimHit>>(edm::InputTag(mix_, collection_for_XF));
 
-  //String to choice between ideal (the deafult) and (mis)aligned geometry for the digitization step 
+  // String to choice between ideal (the deafult) and (mis)aligned geometry for
+  // the digitization step
   geometryType = conf_.getParameter<std::string>("GeometryType");
-
 }
 
 // method called to produce the data
-void DTDigitizer::produce(Event& iEvent, const EventSetup& iSetup){
-
+void DTDigitizer::produce(Event &iEvent, const EventSetup &iSetup) {
   edm::Service<edm::RandomNumberGenerator> rng;
-  CLHEP::HepRandomEngine* engine = &rng->getEngine(iEvent.streamID());
+  CLHEP::HepRandomEngine *engine = &rng->getEngine(iEvent.streamID());
+
+  if (debug)
+    LogPrint("DTDigitizer") << "--- Run: " << iEvent.id().run() << " Event: " << iEvent.id().event() << endl;
 
-  if(debug)
-    LogPrint("DTDigitizer") << "--- Run: " << iEvent.id().run()
-	 << " Event: " << iEvent.id().event() << endl;
-  
   //************ 1 ***************
-   // create the container for the SimHits
-  //  Handle<PSimHitContainer> simHits; 
+  // create the container for the SimHits
+  //  Handle<PSimHitContainer> simHits;
   //  iEvent.getByLabel("g4SimHits","MuonDTHits",simHits);
-    
+
   // use MixCollection instead of the previous
-  Handle<CrossingFrame<PSimHit> > xFrame;
+  Handle<CrossingFrame<PSimHit>> xFrame;
   iEvent.getByToken(cf_token, xFrame);
-  
-  unique_ptr<MixCollection<PSimHit> >
-    simHits( new MixCollection<PSimHit>(xFrame.product()) );
 
-   // create the pointer to the Digi container
+  unique_ptr<MixCollection<PSimHit>> simHits(new MixCollection<PSimHit>(xFrame.product()));
+
+  // create the pointer to the Digi container
   unique_ptr<DTDigiCollection> output(new DTDigiCollection());
-   // pointer to the DigiSimLink container
+  // pointer to the DigiSimLink container
   unique_ptr<DTDigiSimLinkCollection> outputLinks(new DTDigiSimLinkCollection());
-  
+
   // Muon Geometry
   ESHandle<DTGeometry> muonGeom;
-  iSetup.get<MuonGeometryRecord>().get(geometryType,muonGeom);
+  iSetup.get<MuonGeometryRecord>().get(geometryType, muonGeom);
 
-  // Magnetic Field  
+  // Magnetic Field
   ESHandle<MagneticField> magnField;
   iSetup.get<IdealMagneticFieldRecord>().get(magnField);
 
   //************ 2 ***************
 
   // These are sorted by DetId, i.e. by layer and then by wire #
-  //  map<DTDetId, vector<const PSimHit*> > wireMap;     
-  DTWireIdMap wireMap;     
-  
-  for(MixCollection<PSimHit>::MixItr simHit = simHits->begin();
-       simHit != simHits->end(); simHit++){
-    
+  //  map<DTDetId, vector<const PSimHit*> > wireMap;
+  DTWireIdMap wireMap;
+
+  for (MixCollection<PSimHit>::MixItr simHit = simHits->begin(); simHit != simHits->end(); simHit++) {
     // Create the id of the wire, the simHits in the DT known also the wireId
- 
-    DTWireId wireId( (*simHit).detUnitId() );
+
+    DTWireId wireId((*simHit).detUnitId());
     // Fill the map
     wireMap[wireId].push_back(&(*simHit));
   }
-  
-  pair<float,bool> time(0.,false);
+
+  pair<float, bool> time(0., false);
 
   //************ 3 ***************
   // Loop over the wires
-  for(DTWireIdMapConstIter wire = wireMap.begin(); wire!=wireMap.end(); wire++){
+  for (DTWireIdMapConstIter wire = wireMap.begin(); wire != wireMap.end(); wire++) {
     // SimHit Container associated to the wire
-    const vector<const PSimHit*> & vhit = (*wire).second; 
-    if(!vhit.empty()) {
-      TDContainer tdCont; // It is a vector<pair<const PSimHit*,float> >;
-      
+    const vector<const PSimHit *> &vhit = (*wire).second;
+    if (!vhit.empty()) {
+      TDContainer tdCont;  // It is a vector<pair<const PSimHit*,float> >;
+
       //************ 4 ***************
       DTWireId wireId = (*wire).first;
 
-      //const DTLayer* layer = dynamic_cast< const DTLayer* > (muonGeom->idToDet(wireId.layerId()));
-      const DTLayer* layer = muonGeom->layer(wireId.layerId()); 
+      // const DTLayer* layer = dynamic_cast< const DTLayer* >
+      // (muonGeom->idToDet(wireId.layerId()));
+      const DTLayer *layer = muonGeom->layer(wireId.layerId());
 
-      // Loop on the hits of this wire    
-      for (vector<const PSimHit*>::const_iterator hit=vhit.begin();
-	   hit != vhit.end(); hit++){
-	//************ 5 ***************
-	LocalPoint locPos = (*hit)->localPosition();
+      // Loop on the hits of this wire
+      for (vector<const PSimHit *>::const_iterator hit = vhit.begin(); hit != vhit.end(); hit++) {
+        //************ 5 ***************
+        LocalPoint locPos = (*hit)->localPosition();
 
-	const LocalVector BLoc=layer->surface().toLocal(magnField->inTesla(layer->surface().toGlobal(locPos)));
+        const LocalVector BLoc = layer->surface().toLocal(magnField->inTesla(layer->surface().toGlobal(locPos)));
 
-	time = computeTime(layer, wireId, *hit, BLoc, engine);
+        time = computeTime(layer, wireId, *hit, BLoc, engine);
 
-	//************ 6 ***************
-	if (time.second) {
-	  tdCont.push_back(make_pair((*hit),time.first));
-	} else {
-	  if (debug) LogPrint("DTDigitizer") << "hit discarded" << endl;
-	}
+        //************ 6 ***************
+        if (time.second) {
+          tdCont.push_back(make_pair((*hit), time.first));
+        } else {
+          if (debug)
+            LogPrint("DTDigitizer") << "hit discarded" << endl;
+        }
       }
 
       //************ 7 ***************
 
       // the loading must be done by layer but
-      // the digitization must be done by wire (in order to take into account the dead time)
+      // the digitization must be done by wire (in order to take into account
+      // the dead time)
 
-      storeDigis(wireId,tdCont,*output,*outputLinks);
+      storeDigis(wireId, tdCont, *output, *outputLinks);
     }
-    
   }
 
-  //************ 8 ***************  
+  //************ 8 ***************
   // Load the Digi Container in the Event
-  //iEvent.put(std::move(output),"MuonDTDigis");
+  // iEvent.put(std::move(output),"MuonDTDigis");
   iEvent.put(std::move(output));
   iEvent.put(std::move(outputLinks));
-
 }
 
-pair<float,bool> DTDigitizer::computeTime(const DTLayer* layer, const DTWireId &wireId, 
-                                          const PSimHit *hit, const LocalVector &BLoc,
-                                          CLHEP::HepRandomEngine* engine){
-
+pair<float, bool> DTDigitizer::computeTime(const DTLayer *layer,
+                                           const DTWireId &wireId,
+                                           const PSimHit *hit,
+                                           const LocalVector &BLoc,
+                                           CLHEP::HepRandomEngine *engine) {
   LocalPoint entryP = hit->entryPoint();
   LocalPoint exitP = hit->exitPoint();
   int partType = hit->particleType();
@@ -237,32 +233,34 @@ pair<float,bool> DTDigitizer::computeTime(const DTLayer* layer, const DTWireId &
   const DTTopology &topo = layer->specificTopology();
 
   // Pay attention: in CMSSW the rf of the SimHit is in the layer's rf
-  
-  if(debug)  LogPrint("DTDigitizer")<<"Hit local entry point: "<<entryP<<endl
-		 <<"Hit local exit point: "<<exitP<<endl;
 
-  float xwire = topo.wirePosition(wireId.wire()); 
+  if (debug)
+    LogPrint("DTDigitizer") << "Hit local entry point: " << entryP << endl << "Hit local exit point: " << exitP << endl;
+
+  float xwire = topo.wirePosition(wireId.wire());
   float xEntry = entryP.x() - xwire;
-  float xExit  = exitP.x() - xwire;
+  float xExit = exitP.x() - xwire;
 
-  if(debug) LogPrint("DTDigitizer")<<"wire position: "<<xwire
-		<<" x entry in cell rf: "<<xEntry
-		<<" x exit in cell rf: "<<xExit<<endl;
-  
-  DTTopology::Side entrySide = topo.onWhichBorder(xEntry,entryP.y(),entryP.z());
-  DTTopology::Side exitSide  = topo.onWhichBorder(xExit,exitP.y(),exitP.z());
+  if (debug)
+    LogPrint("DTDigitizer") << "wire position: " << xwire << " x entry in cell rf: " << xEntry
+                            << " x exit in cell rf: " << xExit << endl;
 
-   if (debug) dumpHit(hit, xEntry, xExit,topo);
+  DTTopology::Side entrySide = topo.onWhichBorder(xEntry, entryP.y(), entryP.z());
+  DTTopology::Side exitSide = topo.onWhichBorder(xExit, exitP.y(), exitP.z());
+
+  if (debug)
+    dumpHit(hit, xEntry, xExit, topo);
 
   // The bolean is used to flag the drift time computation
-  pair<float,bool> driftTime(0.,false);  
+  pair<float, bool> driftTime(0., false);
 
   // if delta in gas->ignore, since it is included in the parametrisation.
   // FIXME: should check that it is actually a delta ray produced by a nearby
-  // muon hit. 
+  // muon hit.
 
   if (partType == 11 && entrySide == DTTopology::none) {
-     if (debug) LogPrint("DTDigitizer") << "    e- hit in gas; discarding " << endl;
+    if (debug)
+      LogPrint("DTDigitizer") << "    e- hit in gas; discarding " << endl;
     return driftTime;
   }
 
@@ -272,23 +270,23 @@ pair<float,bool> DTDigitizer::computeTime(const DTLayer* layer, const DTWireId &
   // Radius and sagitta according to direction of momentum
   // (just for printing)
   // NOTE: in cmsim, d is always taken // pHat!
-  LocalVector d = (exitP-entryP);
+  LocalVector d = (exitP - entryP);
   LocalVector pHat = hit->localDirection().unit();
   LocalVector hHat = (d.cross(pHat.cross(d))).unit();
   float cosAlpha = hHat.dot(pHat);
-  float sinAlpha = sqrt(1.-cosAlpha*cosAlpha);
-  float radius_P = (d.mag())/(2.*cosAlpha);
-  float sagitta_P = radius_P*(1.-sinAlpha);
+  float sinAlpha = sqrt(1. - cosAlpha * cosAlpha);
+  float radius_P = (d.mag()) / (2. * cosAlpha);
+  float sagitta_P = radius_P * (1. - sinAlpha);
 
   // Radius, sagitta according to field bending
   // (just for printing)
-  float halfd = d.mag()/2.;
+  float halfd = d.mag() / 2.;
   float BMag = BLoc.mag();
-  LocalVector pT = (pHat - (BLoc.unit()*pHat.dot(BLoc.unit())))*(hit->pabs());
-  float radius_B = (pT.mag()/(0.3*BMag))*100.;
+  LocalVector pT = (pHat - (BLoc.unit() * pHat.dot(BLoc.unit()))) * (hit->pabs());
+  float radius_B = (pT.mag() / (0.3 * BMag)) * 100.;
   float sagitta_B;
   if (radius_B > halfd) {
-    sagitta_B = radius_B - sqrt(radius_B*radius_B - halfd*halfd);
+    sagitta_B = radius_B - sqrt(radius_B * radius_B - halfd * halfd);
   } else {
     sagitta_B = radius_B;
   }
@@ -296,39 +294,40 @@ pair<float,bool> DTDigitizer::computeTime(const DTLayer* layer, const DTWireId &
   // cos(delta), delta= angle between direction at entry and hit segment
   // (just for printing)
   float delta = pHat.dot(d.unit());
-  if (debug) LogPrint("DTDigitizer") << "   delta                 = " << delta  << endl
-		  << "   cosAlpha              = " << cosAlpha << endl
-		  << "   sinAlpha              = " << sinAlpha << endl
-		  << "   pMag                  = " << pT.mag() << endl
-		  << "   bMag                  = " << BMag << endl
-		  << "   pT                    = " << pT << endl
-		  << "   halfd                 = " << halfd << endl
-		  << "   radius_P  (cm)        = " << radius_P << endl
-		  << "   sagitta_P (um)        = " << sagitta_P*10000. << endl
-		  << "   radius_B  (cm)        = " << radius_B << endl
-		  << "   sagitta_B (um)        = " << sagitta_B*10000. << endl;
+  if (debug)
+    LogPrint("DTDigitizer") << "   delta                 = " << delta << endl
+                            << "   cosAlpha              = " << cosAlpha << endl
+                            << "   sinAlpha              = " << sinAlpha << endl
+                            << "   pMag                  = " << pT.mag() << endl
+                            << "   bMag                  = " << BMag << endl
+                            << "   pT                    = " << pT << endl
+                            << "   halfd                 = " << halfd << endl
+                            << "   radius_P  (cm)        = " << radius_P << endl
+                            << "   sagitta_P (um)        = " << sagitta_P * 10000. << endl
+                            << "   radius_B  (cm)        = " << radius_B << endl
+                            << "   sagitta_B (um)        = " << sagitta_B * 10000. << endl;
 
   // Select cases where parametrization can not be used.
-  bool noParametrisation = 
-    ( ( entrySide == DTTopology::none || exitSide == DTTopology::none ) // case # 2,3,8,9 or 11
-      || (entrySide == exitSide)                   // case # 4 or 10
-      || ((entrySide == DTTopology::xMin && exitSide == DTTopology::xMax) || 
-	  (entrySide == DTTopology::xMax && exitSide == DTTopology::xMin)) // Hit is case # 7
-      );
-
-  // FIXME: now, debug warning only; consider treating those 
-  // with TM algo. 
-  if ( delta < 0.99996 // Track is not straight. FIXME: use sagitta?
-       && (noParametrisation == false)) {
-    if (debug) LogPrint("DTDigitizer") << "*** WARNING: hit is not straight, type = " << partType << endl;
+  bool noParametrisation = ((entrySide == DTTopology::none || exitSide == DTTopology::none)  // case # 2,3,8,9 or 11
+                            || (entrySide == exitSide)                                       // case # 4 or 10
+                            || ((entrySide == DTTopology::xMin && exitSide == DTTopology::xMax) ||
+                                (entrySide == DTTopology::xMax && exitSide == DTTopology::xMin))  // Hit is case # 7
+  );
+
+  // FIXME: now, debug warning only; consider treating those
+  // with TM algo.
+  if (delta < 0.99996  // Track is not straight. FIXME: use sagitta?
+      && (noParametrisation == false)) {
+    if (debug)
+      LogPrint("DTDigitizer") << "*** WARNING: hit is not straight, type = " << partType << endl;
   }
 
   //************ 5A ***************
 
   if (!noParametrisation) {
-   
-    LocalVector dir = hit->momentumAtEntry(); // ex Measurement3DVector dir = hit->measurementDirection(); //FIXME?
-    float theta = atan(dir.x()/-dir.z())*180/M_PI;
+    LocalVector dir = hit->momentumAtEntry();  // ex Measurement3DVector dir =
+                                               // hit->measurementDirection(); //FIXME?
+    float theta = atan(dir.x() / -dir.z()) * 180 / M_PI;
 
     // FIXME: use dir if M.S. is included as GARFIELD option...
     //        otherwise use hit segment dirction.
@@ -336,89 +335,88 @@ pair<float,bool> DTDigitizer::computeTime(const DTLayer* layer, const DTWireId &
     //    float theta = atan(dir0.x()/-dir0.z())*180/M_PI;
     float x;
 
-    Local3DPoint pt = hit->localPosition();  //ex Measurement3DPoint pt = hit->measurementPosition(); // FIXME?
-     
-    if(fabs(pt.z()) < 0.002) { 
+    Local3DPoint pt = hit->localPosition();  // ex Measurement3DPoint pt =
+                                             // hit->measurementPosition(); // FIXME?
+
+    if (fabs(pt.z()) < 0.002) {
       // hit center within 20 um from z=0, no need to extrapolate.
       x = pt.x() - xwire;
     } else {
-      x = xEntry - (entryP.z()*(xExit-xEntry))/(exitP.z()-entryP.z());
+      x = xEntry - (entryP.z() * (xExit - xEntry)) / (exitP.z() - entryP.z());
     }
 
-    if(IdealModel) return make_pair(fabs(x)/theConstVDrift,true);
-    else driftTime = driftTimeFromParametrization(x, theta, By, Bz, engine);
-
+    if (IdealModel)
+      return make_pair(fabs(x) / theConstVDrift, true);
+    else
+      driftTime = driftTimeFromParametrization(x, theta, By, Bz, engine);
   }
 
- 
-  if ((driftTime.second)==false) {
+  if ((driftTime.second) == false) {
     // Parametrisation not applicable, or failed. Use time map.
     driftTime = driftTimeFromTimeMap();
   }
-  
+
   //************ 5B ***************
 
   // Signal propagation, TOF etc.
   if (driftTime.second) {
-    driftTime.first += externalDelays(layer,wireId,hit);
+    driftTime.first += externalDelays(layer, wireId, hit);
   }
   return driftTime;
-} 
+}
 
 //************ 5A ***************
 
-pair<float,bool> DTDigitizer::driftTimeFromParametrization(float x, float theta, float By, float Bz,
-                                                           CLHEP::HepRandomEngine* engine) const {
-
+pair<float, bool> DTDigitizer::driftTimeFromParametrization(
+    float x, float theta, float By, float Bz, CLHEP::HepRandomEngine *engine) const {
   // Convert from CMSSW frame/units r.f. to parametrization ones.
-  x *= 10.;  //cm -> mm 
+  x *= 10.;  // cm -> mm
 
   // FIXME: Current parametrisation can extrapolate above 21 mm,
   // however a detailed study is needed before using this.
-   if (fabs(x) > 21.) {
-     if (debug) LogPrint("DTDigitizer") << "*** WARNING: parametrisation: x out of range = "
-		     << x << ", skipping" << endl;
-     return pair<float,bool>(0.f,false);
+  if (fabs(x) > 21.) {
+    if (debug)
+      LogPrint("DTDigitizer") << "*** WARNING: parametrisation: x out of range = " << x << ", skipping" << endl;
+    return pair<float, bool>(0.f, false);
   }
 
   // Different r.f. of the parametrization:
-  // X_par = X_ORCA; Y_par=Z_ORCA; Z_par = -Y_ORCA  
+  // X_par = X_ORCA; Y_par=Z_ORCA; Z_par = -Y_ORCA
 
-  float By_par = Bz;  // Bnorm
-  float Bz_par = -By; // Bwire
+  float By_par = Bz;   // Bnorm
+  float Bz_par = -By;  // Bwire
   float theta_par = theta;
 
   // Parametrisation uses interpolation up to |theta|=45 deg,
   // |Bwire|=0.4, |Bnorm|=0.75; extrapolation above.
-  if (fabs(theta_par)>45.) {
-    if (debug) LogPrint("DTDigitizer") << "*** WARNING: extrapolating theta > 45: "
-		    << theta << endl;
+  if (fabs(theta_par) > 45.) {
+    if (debug)
+      LogPrint("DTDigitizer") << "*** WARNING: extrapolating theta > 45: " << theta << endl;
     // theta_par = min(fabs(theta_par),45.f)*((theta_par<0.)?-1.:1.);
   }
-  if (fabs(By_par)>0.75) {
-    if (debug) LogPrint("DTDigitizer") << "*** WARNING: extrapolating Bnorm > 0.75: "
-		    << By_par << endl;
+  if (fabs(By_par) > 0.75) {
+    if (debug)
+      LogPrint("DTDigitizer") << "*** WARNING: extrapolating Bnorm > 0.75: " << By_par << endl;
     // By_par = min(fabs(By_par),0.75f)*((By_par<0.)?-1.:1.);
   }
-  if (fabs(Bz_par)>0.4) {
-    if (debug) LogPrint("DTDigitizer") << "*** WARNING: extrapolating Bwire >0.4: "
-		    << Bz_par << endl;
+  if (fabs(Bz_par) > 0.4) {
+    if (debug)
+      LogPrint("DTDigitizer") << "*** WARNING: extrapolating Bwire >0.4: " << Bz_par << endl;
     // Bz_par = min(fabs(Bz_par),0.4)*((Bz_par<0.)?-1.:1.);
   }
 
   DTDriftTimeParametrization::drift_time DT;
   static const DTDriftTimeParametrization par;
-  unsigned short flag = par.MB_DT_drift_time (x, theta_par, By_par, Bz_par, 0, &DT, interpolate);
+  unsigned short flag = par.MB_DT_drift_time(x, theta_par, By_par, Bz_par, 0, &DT, interpolate);
 
   if (debug) {
-    LogPrint("DTDigitizer") << "    Parametrisation: x, theta, Bnorm, Bwire = "
-	 << x << " " <<  theta_par << " " << By_par << " " << Bz_par << endl
-	 << "  time=" << DT.t_drift
-	 << "  sigma_m=" <<  DT.t_width_m
-	 << "  sigma_p=" <<  DT.t_width_p << endl;
-    if (flag!=1) {
+    LogPrint("DTDigitizer") << "    Parametrisation: x, theta, Bnorm, Bwire = " << x << " " << theta_par << " "
+                            << By_par << " " << Bz_par << endl
+                            << "  time=" << DT.t_drift << "  sigma_m=" << DT.t_width_m << "  sigma_p=" << DT.t_width_p
+                            << endl;
+    if (flag != 1) {
       LogPrint("DTDigitizer") << "*** WARNING: call to parametrisation failed" << endl;
-      return pair<float,bool>(0.f,false); 
+      return pair<float, bool>(0.f, false);
     }
   }
 
@@ -426,23 +424,26 @@ pair<float,bool> DTDigitizer::driftTimeFromParametrization(float x, float theta,
   float time = asymGausSmear(DT.t_drift, DT.t_width_m, DT.t_width_p, engine);
 
   // Do not allow the smearing to lead to negative values
-  time = max(time,0.f);
+  time = max(time, 0.f);
 
-  // Apply a Gaussian smearing to account for electronic effects (cf. 2004 TB analysis)
-  // The width of the Gaussian can be configured with the "Smearing" parameter
+  // Apply a Gaussian smearing to account for electronic effects (cf. 2004 TB
+  // analysis) The width of the Gaussian can be configured with the "Smearing"
+  // parameter
 
   double u = CLHEP::RandGaussQ::shoot(engine, 0., smearing);
   time += u;
 
-  if (debug) LogPrint("DTDigitizer") << "  drift time = " << time << endl;
-  
-  return pair<float,bool>(time,true); 
-}
+  if (debug)
+    LogPrint("DTDigitizer") << "  drift time = " << time << endl;
 
-float DTDigitizer::asymGausSmear(double mean, double sigmaLeft, double sigmaRight,
-                                 CLHEP::HepRandomEngine* engine) const {
+  return pair<float, bool>(time, true);
+}
 
-  double f = sigmaLeft/(sigmaLeft+sigmaRight);
+float DTDigitizer::asymGausSmear(double mean,
+                                 double sigmaLeft,
+                                 double sigmaRight,
+                                 CLHEP::HepRandomEngine *engine) const {
+  double f = sigmaLeft / (sigmaLeft + sigmaRight);
   double t;
 
   if (CLHEP::RandFlat::shoot(engine) <= f) {
@@ -455,73 +456,65 @@ float DTDigitizer::asymGausSmear(double mean, double sigmaLeft, double sigmaRigh
   return static_cast<float>(t);
 }
 
-pair<float,bool> DTDigitizer::driftTimeFromTimeMap() const {
+pair<float, bool> DTDigitizer::driftTimeFromTimeMap() const {
   // FIXME: not yet implemented.
-  if (debug) LogPrint("DTDigitizer") << "   TimeMap " << endl;
-  return pair<float,bool>(0.,false);
+  if (debug)
+    LogPrint("DTDigitizer") << "   TimeMap " << endl;
+  return pair<float, bool>(0., false);
 }
 
 //************ 5B ***************
 
-float DTDigitizer::externalDelays(const DTLayer* layer,
-				  const DTWireId &wireId, 
-				  const PSimHit *hit) const {
-  
+float DTDigitizer::externalDelays(const DTLayer *layer, const DTWireId &wireId, const PSimHit *hit) const {
   // Time of signal propagation along wire.
-  
+
   float wireCoord = hit->localPosition().y();
-  float halfL     = (layer->specificTopology().cellLenght())/2.;
-  float propgL = halfL - wireCoord; // the FE is always located at the pos coord.
+  float halfL = (layer->specificTopology().cellLenght()) / 2.;
+  float propgL = halfL - wireCoord;  // the FE is always located at the pos coord.
 
-  float propDelay = propgL/vPropWire;
+  float propDelay = propgL / vPropWire;
 
   // Real TOF.
-  float tof = hit->tof();  
+  float tof = hit->tof();
 
   // Delays and t0 according to theSync
 
-  double sync= theSync->digitizerOffset(&wireId,layer);
-
+  double sync = theSync->digitizerOffset(&wireId, layer);
 
   if (debug) {
-    LogPrint("DTDigitizer") << "    propDelay =" << propDelay
-	 << "; TOF=" << tof
-	 << "; sync= " << sync
-	 << endl;
+    LogPrint("DTDigitizer") << "    propDelay =" << propDelay << "; TOF=" << tof << "; sync= " << sync << endl;
   }
-  
+
   return propDelay + tof + sync;
 }
 
-
 // accumulate digis by layer
 
-void DTDigitizer::storeDigis(DTWireId &wireId, 
-			     TDContainer &hits,
-			     DTDigiCollection &output, DTDigiSimLinkCollection &outputLinks){
-
+void DTDigitizer::storeDigis(DTWireId &wireId,
+                             TDContainer &hits,
+                             DTDigiCollection &output,
+                             DTDigiSimLinkCollection &outputLinks) {
   //************ 7A ***************
 
   // sort signal times
-  sort(hits.begin(),hits.end(),hitLessT());
+  sort(hits.begin(), hits.end(), hitLessT());
 
   //************ 7B ***************
 
   float wakeTime = -999999.0;
   float resolTime = -999999.0;
-  int digiN = -1; // Digi identifier within the cell (for multiple digis)
+  int digiN = -1;  // Digi identifier within the cell (for multiple digis)
   DTDigi digi;
 
   // loop over signal times and drop signals inside dead time
-  for ( TDContainer::const_iterator hit = hits.begin() ; hit != hits.end() ; 
-	hit++ ) {
-
-    if (onlyMuHits && abs((*hit).first->particleType())!=13) continue;
+  for (TDContainer::const_iterator hit = hits.begin(); hit != hits.end(); hit++) {
+    if (onlyMuHits && abs((*hit).first->particleType()) != 13)
+      continue;
 
     //************ 7C ***************
-	
+
     float time = (*hit).second;
-    if ( time > wakeTime ) {
+    if (time > wakeTime) {
       // Note that digi is constructed with a float value (in ns)
       int wireN = wireId.wire();
       digiN++;
@@ -532,80 +525,76 @@ void DTDigitizer::storeDigis(DTWireId &wireId,
       EncodedEventId evId = (*hit).first->eventId();
       DTDigiSimLink digisimLink(wireN, digiN, time, SimTrackId, evId);
 
-      if(debug) {
-	LogPrint("DTDigitizer")<<endl<<"---- DTDigitizer ----"<<endl;
-	LogPrint("DTDigitizer")<<"wireId: "<<wireId<<endl;
-	LogPrint("DTDigitizer")<<"sim. time = "<<time<<endl;
-	LogPrint("DTDigitizer")<<"digi number = "<< digi.number()<<", digi time = "<<digi.time()
-	    <<", linked to SimTrack Id = "<<SimTrackId<<endl;
+      if (debug) {
+        LogPrint("DTDigitizer") << endl << "---- DTDigitizer ----" << endl;
+        LogPrint("DTDigitizer") << "wireId: " << wireId << endl;
+        LogPrint("DTDigitizer") << "sim. time = " << time << endl;
+        LogPrint("DTDigitizer") << "digi number = " << digi.number() << ", digi time = " << digi.time()
+                                << ", linked to SimTrack Id = " << SimTrackId << endl;
       }
 
       //************ 7D ***************
-      if(digi.countsTDC() < pow(2.,16)){
-	DTLayerId layerID = wireId.layerId();  //taking the layer in which reside the wire
-        output.insertDigi(layerID, digi); // ordering Digis by layer
+      if (digi.countsTDC() < pow(2., 16)) {
+        DTLayerId layerID = wireId.layerId();  // taking the layer in which reside the wire
+        output.insertDigi(layerID, digi);      // ordering Digis by layer
         outputLinks.insertDigi(layerID, digisimLink);
-	wakeTime = time + deadTime;
-	resolTime = time + LinksTimeWindow;
-      } 
-      else {
-	digiN--;
+        wakeTime = time + deadTime;
+        resolTime = time + LinksTimeWindow;
+      } else {
+        digiN--;
       }
-    }
-    else if (MultipleLinks && time < resolTime){
+    } else if (MultipleLinks && time < resolTime) {
       int wireN = wireId.wire();
       unsigned int SimTrackId = (*hit).first->trackId();
       EncodedEventId evId = (*hit).first->eventId();
       DTDigiSimLink digisimLink(wireN, digiN, time, SimTrackId, evId);
-      DTLayerId layerID = wireId.layerId(); 
+      DTLayerId layerID = wireId.layerId();
       outputLinks.insertDigi(layerID, digisimLink);
 
-      if(debug) { 
-	LogPrint("DTDigitizer")<<"\nAdded multiple link: \n"
-	    <<"digi number = "<<digi.number()<<", digi time = "<<digi.time()<<" (sim. time = "<<time<<")"
-	    <<", linked to SimTrack Id = "<<SimTrackId<<endl;
+      if (debug) {
+        LogPrint("DTDigitizer") << "\nAdded multiple link: \n"
+                                << "digi number = " << digi.number() << ", digi time = " << digi.time()
+                                << " (sim. time = " << time << ")"
+                                << ", linked to SimTrack Id = " << SimTrackId << endl;
       }
     }
   }
-  
 }
 
-void DTDigitizer::dumpHit(const PSimHit * hit,
-                          float xEntry, float xExit,
-                          const DTTopology &topo) {
-  
+void DTDigitizer::dumpHit(const PSimHit *hit, float xEntry, float xExit, const DTTopology &topo) {
   LocalPoint entryP = hit->entryPoint();
   LocalPoint exitP = hit->exitPoint();
-  
-  DTTopology::Side entrySide = topo.onWhichBorder(xEntry,entryP.y(),entryP.z());
-  DTTopology::Side exitSide  = topo.onWhichBorder(xExit,exitP.y(),exitP.z());
+
+  DTTopology::Side entrySide = topo.onWhichBorder(xEntry, entryP.y(), entryP.z());
+  DTTopology::Side exitSide = topo.onWhichBorder(xExit, exitP.y(), exitP.z());
   //  ProcessTypeEnumerator pTypes;
-  
-  LogPrint("DTDigitizer") << endl
-       << "------- SimHit: " << endl
-       << "   Particle type         = " << hit->particleType() << endl
-       << "   process type          = " << hit->processType() << endl
-       << "   process type          = " << hit->processType() << endl
-    // << "   packedTrackId         = " << hit->packedTrackId() << endl
-       << "   trackId               = " << hit->trackId() << endl // new,is the same as the
-                                                                  // previous?? FIXME-Check
-       << "   |p|                   = " << hit->pabs() << endl
-       << "   Energy loss           = " << hit->energyLoss() << endl
-    // << "   timeOffset            = " << hit->timeOffset() << endl
-    // << "   measurementPosition   = " << hit->measurementPosition() << endl
-    // << "   measurementDirection  = " << hit->measurementDirection() << endl      //FIXME
-       << "   localDirection        = " << hit->momentumAtEntry().unit() << endl    //FIXME is it a versor?
-       << "   Entry point           = " << entryP << " cell x = " << xEntry << endl
-       << "   Exit point            = " << exitP << " cell x = " << xExit << endl
-       << "   DR =                  = " << (exitP-entryP).mag() << endl
-       << "   Dx =                  = " << (exitP-entryP).x() << endl
-       << "   Cell w,h,l            = (" << topo.cellWidth()
-       << " , " << topo.cellHeight() 
-       << " , " << topo.cellLenght() << ") cm" << endl
-       << "   DY entry from edge    = " << topo.cellLenght()/2.-fabs(entryP.y())
-       << "   DY exit  from edge    = " << topo.cellLenght()/2.-fabs(exitP.y())
-       << "   entrySide = "  << (int)entrySide
-       << " ; exitSide = " << (int)exitSide << endl;
 
+  LogPrint("DTDigitizer") << endl
+                          << "------- SimHit: " << endl
+                          << "   Particle type         = " << hit->particleType() << endl
+                          << "   process type          = " << hit->processType() << endl
+                          << "   process type          = " << hit->processType()
+                          << endl
+                          // << "   packedTrackId         = " << hit->packedTrackId() << endl
+                          << "   trackId               = " << hit->trackId()
+                          << endl  // new,is the same as the
+                                   // previous?? FIXME-Check
+                          << "   |p|                   = " << hit->pabs() << endl
+                          << "   Energy loss           = " << hit->energyLoss()
+                          << endl
+                          // << "   timeOffset            = " << hit->timeOffset() << endl
+                          // << "   measurementPosition   = " << hit->measurementPosition() << endl
+                          // << "   measurementDirection  = " << hit->measurementDirection() << endl
+                          // //FIXME
+                          << "   localDirection        = " << hit->momentumAtEntry().unit()
+                          << endl  // FIXME is it a versor?
+                          << "   Entry point           = " << entryP << " cell x = " << xEntry << endl
+                          << "   Exit point            = " << exitP << " cell x = " << xExit << endl
+                          << "   DR =                  = " << (exitP - entryP).mag() << endl
+                          << "   Dx =                  = " << (exitP - entryP).x() << endl
+                          << "   Cell w,h,l            = (" << topo.cellWidth() << " , " << topo.cellHeight() << " , "
+                          << topo.cellLenght() << ") cm" << endl
+                          << "   DY entry from edge    = " << topo.cellLenght() / 2. - fabs(entryP.y())
+                          << "   DY exit  from edge    = " << topo.cellLenght() / 2. - fabs(exitP.y())
+                          << "   entrySide = " << (int)entrySide << " ; exitSide = " << (int)exitSide << endl;
 }
-
diff --git a/SimMuon/DTDigitizer/src/DTDigitizer.h b/SimMuon/DTDigitizer/src/DTDigitizer.h
index 94d2928325efe..0b9ed279bc0e3 100644
--- a/SimMuon/DTDigitizer/src/DTDigitizer.h
+++ b/SimMuon/DTDigitizer/src/DTDigitizer.h
@@ -2,31 +2,29 @@
 #define SimMuon_DTDigitizer_h
 
 /** \class DTDigitizer
- *  Digitize the muon drift tubes. 
- *  The parametrisation function in DTDriftTimeParametrization 
- *  from P.G.Abia, J.Puerta is used in all cases where it is applicable. 
+ *  Digitize the muon drift tubes.
+ *  The parametrisation function in DTDriftTimeParametrization
+ *  from P.G.Abia, J.Puerta is used in all cases where it is applicable.
  *
  *  \authors: G. Bevilacqua, N. Amapane, G. Cerminara, R. Bellan
  */
 
 #include "FWCore/Framework/interface/stream/EDProducer.h"
 
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "DataFormats/DTDigi/interface/DTDigiCollection.h"
-#include "SimDataFormats/DigiSimLinks/interface/DTDigiSimLinkCollection.h"
 #include "DataFormats/MuonDetId/interface/DTWireId.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "SimDataFormats/DigiSimLinks/interface/DTDigiSimLinkCollection.h"
 
 #include "DataFormats/GeometryVector/interface/LocalVector.h"
 // SimHits
-#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 #include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
-#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
+#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-
-
-#include <vector>
 #include <memory>
+#include <vector>
 
 namespace CLHEP {
   class HepRandomEngine;
@@ -39,72 +37,71 @@ class DTBaseDigiSync;
 class DTTopology;
 class DTDigiSyncBase;
 
-
-namespace edm {class ParameterSet; class Event; class EventSetup;}
+namespace edm {
+  class ParameterSet;
+  class Event;
+  class EventSetup;
+}  // namespace edm
 
 class DTDigitizer : public edm::stream::EDProducer<> {
-  
- public:
+public:
+  explicit DTDigitizer(const edm::ParameterSet &);
 
-  explicit DTDigitizer(const edm::ParameterSet&);
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
-  void produce(edm::Event&, const edm::EventSetup&) override;
-  
- private:
-  typedef std::pair<const PSimHit*,float> hitAndT; // hit & corresponding time
-  typedef std::vector<hitAndT> TDContainer; // hits & times for one wire
+private:
+  typedef std::pair<const PSimHit *, float> hitAndT;  // hit & corresponding time
+  typedef std::vector<hitAndT> TDContainer;           // hits & times for one wire
 
-  typedef std::map<DTWireId, std::vector<const PSimHit*> > DTWireIdMap; 
-  typedef DTWireIdMap::iterator DTWireIdMapIter;  
-  typedef DTWireIdMap::const_iterator DTWireIdMapConstIter;  
+  typedef std::map<DTWireId, std::vector<const PSimHit *>> DTWireIdMap;
+  typedef DTWireIdMap::iterator DTWireIdMapIter;
+  typedef DTWireIdMap::const_iterator DTWireIdMapConstIter;
 
   // Sort hits container by time.
   struct hitLessT {
-    bool operator()(const  hitAndT & h1, const hitAndT & h2) {
-      if (h1.second < h2.second) return true;
+    bool operator()(const hitAndT &h1, const hitAndT &h2) {
+      if (h1.second < h2.second)
+        return true;
       return false;
     }
   };
 
-  // Calculate the drift time for one hit. 
+  // Calculate the drift time for one hit.
   // if status flag == false, hit has to be discarded.
-  std::pair<float,bool> computeTime(const DTLayer* layer,const DTWireId &wireId, 
-				    const PSimHit *hit, 
-				    const LocalVector &BLoc,
-                                    CLHEP::HepRandomEngine*); //FIXME??
-  
+  std::pair<float, bool> computeTime(const DTLayer *layer,
+                                     const DTWireId &wireId,
+                                     const PSimHit *hit,
+                                     const LocalVector &BLoc,
+                                     CLHEP::HepRandomEngine *);  // FIXME??
+
   // Calculate the drift time using the GARFIELD cell parametrization,
   // taking care of all conversions from CMSSW local coordinates
   // to the conventions used for the parametrization.
-  std::pair<float,bool> driftTimeFromParametrization(float x, float alpha, float By,
-						     float Bz, CLHEP::HepRandomEngine*) const;
-  
+  std::pair<float, bool> driftTimeFromParametrization(
+      float x, float alpha, float By, float Bz, CLHEP::HepRandomEngine *) const;
+
   // Calculate the drift time for the cases where it is not possible
   // to use the GARFIELD cell parametrization.
-  std::pair<float,bool> driftTimeFromTimeMap() const;
-  
-  // Add all delays other than drift times (signal propagation along the wire, 
+  std::pair<float, bool> driftTimeFromTimeMap() const;
+
+  // Add all delays other than drift times (signal propagation along the wire,
   // TOF etc.; subtract calibration time.
-  float externalDelays(const DTLayer* layer,
-		       const DTWireId &wireId, 
-		       const PSimHit *hit) const;
+  float externalDelays(const DTLayer *layer, const DTWireId &wireId, const PSimHit *hit) const;
 
   // Store digis for one wire, taking into account the dead time.
-  //FiXME put alias for the map.
-  void storeDigis(DTWireId &wireId, 
-		  TDContainer &hits,
-		  DTDigiCollection &output, DTDigiSimLinkCollection &outputLinks);
-  
+  // FiXME put alias for the map.
+  void storeDigis(DTWireId &wireId, TDContainer &hits, DTDigiCollection &output, DTDigiSimLinkCollection &outputLinks);
+
   // Debug output
-  void dumpHit(const PSimHit * hit, float xEntry, float xExit, const DTTopology &topo);
-  
+  void dumpHit(const PSimHit *hit, float xEntry, float xExit, const DTTopology &topo);
+
   // Double half-gaussian smearing.
-  float asymGausSmear(double mean, double sigmaLeft, double sigmaRight, CLHEP::HepRandomEngine*) const;
-  
+  float asymGausSmear(double mean, double sigmaLeft, double sigmaRight, CLHEP::HepRandomEngine *) const;
+
   // Allow debugging and testing.
   friend class DTDigitizerAnalysis;
 
-  //Its Atributes:
+  // Its Atributes:
   double vPropWire;
   float deadTime;
   float smearing;
@@ -119,18 +116,16 @@ class DTDigitizer : public edm::stream::EDProducer<> {
 
   // Ideal model. Used for debug
   bool IdealModel;
-  float theConstVDrift;  
+  float theConstVDrift;
 
   // to configure the creation of Digi-Sim links
   bool MultipleLinks;
   float LinksTimeWindow;
-  
-  //Name of Collection use for create the XF 
+
+  // Name of Collection use for create the XF
   std::string mix_;
   std::string collection_for_XF;
 
-  edm::EDGetTokenT<CrossingFrame<PSimHit> > cf_token;
-
-
+  edm::EDGetTokenT<CrossingFrame<PSimHit>> cf_token;
 };
 #endif
diff --git a/SimMuon/DTDigitizer/src/DTDriftTimeParametrization.cc b/SimMuon/DTDigitizer/src/DTDriftTimeParametrization.cc
index 81c05bb5495f4..8e825b2d0cb63 100644
--- a/SimMuon/DTDigitizer/src/DTDriftTimeParametrization.cc
+++ b/SimMuon/DTDigitizer/src/DTDriftTimeParametrization.cc
@@ -20,596 +20,5550 @@
 
 #ifndef MB_DT_STANDALONE
 #include "SimMuon/DTDigitizer/src/DTDriftTimeParametrization.h"
-#include "DataFormats/MuonData/src/DTDriftTimeParameters.icc" 
 #else
 #include "SimMuon/DTDigitizer/src/DTDriftTimeParametrization.h"
-#include "DataFormats/MuonData/src/DTDriftTimeParameters.icc"
 #endif
+#include "DataFormats/MuonData/src/DTDriftTimeParameters.icc"
 
+DTDriftTimeParametrization::DTDriftTimeParametrization() {}
 
-DTDriftTimeParametrization::DTDriftTimeParametrization(){}
-
-DTDriftTimeParametrization::~DTDriftTimeParametrization(){}
-
-unsigned short DTDriftTimeParametrization::MB_DT_drift_time (double x,
-								double alpha,
-								double by,
-								double bz,
-								short ifl,
-								drift_time *DT,
-								short interpolate) const {
-      unsigned short i, j, n_func, ial, iby, ibz;
-      unsigned short i_alpha, i_By, i_Bz;
-      unsigned short j_alpha, j_By, j_Bz;
-
-      double dist;
-      double OffSet;
-      double par_t[N_Par_t];
-      double par_sigma_t[N_Sigma_t];
-
-      double V_al[3], V_by[3], V_bz[3];
-
-      double DTV_v_drift  [N_Func];
-      double DTV_t_drift  [N_Func];
-      double DTV_delta_t  [N_Func];
-      double DTV_t_width_m[N_Func];
-      double DTV_t_width_p[N_Func];
-
-      DT->v_drift   = -1;
-      DT->t_drift   = -1;
-      DT->delta_t   = -1;
-      DT->t_width_m = -1;
-      DT->t_width_p = -1;
-
-/* Check 'interpolate' and initialize DTV */
-
-      switch(interpolate) {
-         case 1:  n_func = N_Func;
-                  for ( j=0 ; j<N_Func ; j++ ) {
-                     DTV_v_drift[j]   = -1;
-                     DTV_t_drift[j]   = -1;
-                     DTV_delta_t[j]   = -1;
-                     DTV_t_width_m[j] = -1;
-                     DTV_t_width_p[j] = -1;
-                  }
-                  break ;
-
-         case 0:  n_func = 1;
-                  break ;
-
-         default: printf ("*** ERROR, MB_DT_drift_time:  invalid interpolate value = %d\n",interpolate);
-                  return (0);
-      }
+DTDriftTimeParametrization::~DTDriftTimeParametrization() {}
 
-#ifdef MB_DT_DEBUG
+unsigned short DTDriftTimeParametrization::MB_DT_drift_time(
+    double x, double alpha, double by, double bz, short ifl, drift_time *DT, short interpolate) const {
+  unsigned short i, j, n_func, ial, iby, ibz;
+  unsigned short i_alpha, i_By, i_Bz;
+  unsigned short j_alpha, j_By, j_Bz;
 
-/* Dump input values */
+  double dist;
+  double OffSet;
+  double par_t[N_Par_t];
+  double par_sigma_t[N_Sigma_t];
 
-      printf ("\nMB_DT_drift_time:  Function called with values:\n\n");
-      printf ("MB_DT_drift_time:    x     = %f\n",x    );
-      printf ("MB_DT_drift_time:    alpha = %f\n",alpha);
-      printf ("MB_DT_drift_time:    by    = %f\n",by   );
-      printf ("MB_DT_drift_time:    bz    = %f\n",bz   );
-      printf ("MB_DT_drift_time:    ifl   = %d\n",ifl  );
+  double V_al[3], V_by[3], V_bz[3];
 
-#endif
+  double DTV_v_drift[N_Func];
+  double DTV_t_drift[N_Func];
+  double DTV_delta_t[N_Func];
+  double DTV_t_width_m[N_Func];
+  double DTV_t_width_p[N_Func];
 
-/* Take into account the symmetries of the parametrisations */
+  DT->v_drift = -1;
+  DT->t_drift = -1;
+  DT->delta_t = -1;
+  DT->t_width_m = -1;
+  DT->t_width_p = -1;
 
-      if ( ifl<0 ) {
-         printf ("*** ERROR, MB_DT_drift_time:  invalid ifl value = %d\n",ifl);
-         return (0);
-      }
+  /* Check 'interpolate' and initialize DTV */
 
-      dist = ( ifl == 0 ) ? x : x-DT_Cell_HalfWidth;   // dist = [-21,21] mm
+  switch (interpolate) {
+    case 1:
+      n_func = N_Func;
+      for (j = 0; j < N_Func; j++) {
+        DTV_v_drift[j] = -1;
+        DTV_t_drift[j] = -1;
+        DTV_delta_t[j] = -1;
+        DTV_t_width_m[j] = -1;
+        DTV_t_width_p[j] = -1;
+      }
+      break;
 
-      by = fabs(by);         //  f (By) = f (-By)
+    case 0:
+      n_func = 1;
+      break;
 
-      if ( bz < 0 ) {        //  f (alpha, Bz) = f (-alpha, -Bz)
-         bz    = -bz;
-         alpha = -alpha;
-      }
+    default:
+      printf("*** ERROR, MB_DT_drift_time:  invalid interpolate value = %d\n", interpolate);
+      return (0);
+  }
 
-/* Check boundaries of the variables and take the closest values */
+#ifdef MB_DT_DEBUG
 
-      MB_DT_Check_boundaries (dist, alpha, by, bz, ifl) ;
+  /* Dump input values */
 
-      MB_DT_Get_grid_points (alpha, by, bz, &i_alpha, &i_By, &i_Bz, &j_alpha, &j_By, &j_Bz) ;
+  printf("\nMB_DT_drift_time:  Function called with values:\n\n");
+  printf("MB_DT_drift_time:    x     = %f\n", x);
+  printf("MB_DT_drift_time:    alpha = %f\n", alpha);
+  printf("MB_DT_drift_time:    by    = %f\n", by);
+  printf("MB_DT_drift_time:    bz    = %f\n", bz);
+  printf("MB_DT_drift_time:    ifl   = %d\n", ifl);
 
-#ifdef MB_DT_DEBUG
-      printf("MB_DT_drift_time:\n");
-      printf("MB_DT_drift_time:  i_alpha j_alpha alpha_value's %d %d %.0f %.0f\n",i_alpha,j_alpha,alpha_value[i_alpha],alpha_value[j_alpha]);
-      printf("MB_DT_drift_time:  i_By    j_By    By_value's    %d %d %.2f %.2f\n",i_By   ,j_By   ,   By_value[i_By]   ,   By_value[j_By]);
-      printf("MB_DT_drift_time:  i_Bz    j_Bz    Bz_value's    %d %d %.2f %.2f\n",i_Bz   ,j_Bz   ,   Bz_value[i_Bz]   ,   Bz_value[j_Bz]);
 #endif
 
-/* Get the parametrisations for the different grid points */
+  /* Take into account the symmetries of the parametrisations */
 
-      for ( j=0 ; j<n_func ; j++ ) {
+  if (ifl < 0) {
+    printf("*** ERROR, MB_DT_drift_time:  invalid ifl value = %d\n", ifl);
+    return (0);
+  }
 
-         ial = (j&4) ? j_alpha : i_alpha;
-         iby = (j&2) ? j_By    : i_By   ;
-         ibz = (j&1) ? j_Bz    : i_Bz   ;
+  dist = (ifl == 0) ? x : x - DT_Cell_HalfWidth;  // dist = [-21,21] mm
+
+  by = fabs(by);  //  f (By) = f (-By)
+
+  if (bz < 0) {  //  f (alpha, Bz) = f (-alpha, -Bz)
+    bz = -bz;
+    alpha = -alpha;
+  }
 
-         for ( i=0 ; i<N_Par_t   ; i++ ) par_t[i]       =       fun_t[ial][iby][ibz][i];
-         for ( i=0 ; i<N_Sigma_t ; i++ ) par_sigma_t[i] = fun_sigma_t[ial][iby][ibz][i];
+  /* Check boundaries of the variables and take the closest values */
 
-         OffSet = par_t[N_Par_t-1];
+  MB_DT_Check_boundaries(dist, alpha, by, bz, ifl);
 
-         DTV_v_drift[j]   = par_t[0];                                           // drift velocity
-         DTV_delta_t[j]   = MB_DT_delta_t (dist, par_t);                        // deviation from linearity
-         DTV_t_drift[j]   = MB_DT_time (dist, par_t) + DTV_delta_t[j] + OffSet; // drift time
-         DTV_t_width_m[j] = MB_DT_sigma_t_m (dist, par_sigma_t);                // time width (minus, left)
-         DTV_t_width_p[j] = MB_DT_sigma_t_p (dist, par_sigma_t);                // time width (plus, right)
+  MB_DT_Get_grid_points(alpha, by, bz, &i_alpha, &i_By, &i_Bz, &j_alpha, &j_By, &j_Bz);
 
 #ifdef MB_DT_DEBUG
-         printf("MB_DT_drift_LOOP: OffSet = %f\n",OffSet);
-         printf("MB_DT_drift_LOOP: dist, v_drift, t_drift, lin, t_width_m, t_width_p = %f %f %f %f %f %f\n",
-                                   dist, DTV_v_drift[j], DTV_t_drift[j], DTV_delta_t[j], DTV_t_width_m[j], DTV_t_width_p[j]) ;
+  printf("MB_DT_drift_time:\n");
+  printf("MB_DT_drift_time:  i_alpha j_alpha alpha_value's %d %d %.0f %.0f\n",
+         i_alpha,
+         j_alpha,
+         alpha_value[i_alpha],
+         alpha_value[j_alpha]);
+  printf(
+      "MB_DT_drift_time:  i_By    j_By    By_value's    %d %d %.2f %.2f\n", i_By, j_By, By_value[i_By], By_value[j_By]);
+  printf(
+      "MB_DT_drift_time:  i_Bz    j_Bz    Bz_value's    %d %d %.2f %.2f\n", i_Bz, j_Bz, Bz_value[i_Bz], Bz_value[j_Bz]);
 #endif
-      }
 
-/* Return interpolated or grid values */
+  /* Get the parametrisations for the different grid points */
 
-      if ( interpolate == 0 ) {
+  for (j = 0; j < n_func; j++) {
+    ial = (j & 4) ? j_alpha : i_alpha;
+    iby = (j & 2) ? j_By : i_By;
+    ibz = (j & 1) ? j_Bz : i_Bz;
 
-         DT->v_drift   = DTV_v_drift[0];
-         DT->delta_t   = DTV_delta_t[0];
-         DT->t_drift   = DTV_t_drift[0];
-         DT->t_width_m = DTV_t_width_m[0];
-         DT->t_width_p = DTV_t_width_p[0];
-      }
-      else {
+    for (i = 0; i < N_Par_t; i++)
+      par_t[i] = fun_t[ial][iby][ibz][i];
+    for (i = 0; i < N_Sigma_t; i++)
+      par_sigma_t[i] = fun_sigma_t[ial][iby][ibz][i];
 
-         V_al[0] = alpha ; V_al[1] = alpha_value[i_alpha] ; V_al[2] = alpha_value[j_alpha];
-         V_by[0] = by    ; V_by[1] =    By_value[i_By]    ; V_by[2] =    By_value[j_By];
-         V_bz[0] = bz    ; V_bz[1] =    Bz_value[i_Bz]    ; V_bz[2] =    Bz_value[j_Bz];
+    OffSet = par_t[N_Par_t - 1];
 
-         DT->v_drift   = MB_DT_MLInterpolation (V_al, V_by, V_bz, DTV_v_drift  );
-         DT->delta_t   = MB_DT_MLInterpolation (V_al, V_by, V_bz, DTV_delta_t  );
-         DT->t_drift   = MB_DT_MLInterpolation (V_al, V_by, V_bz, DTV_t_drift  );
-         DT->t_width_m = MB_DT_MLInterpolation (V_al, V_by, V_bz, DTV_t_width_m);
-         DT->t_width_p = MB_DT_MLInterpolation (V_al, V_by, V_bz, DTV_t_width_p);
-      }
+    DTV_v_drift[j] = par_t[0];                                           // drift velocity
+    DTV_delta_t[j] = MB_DT_delta_t(dist, par_t);                         // deviation from linearity
+    DTV_t_drift[j] = MB_DT_time(dist, par_t) + DTV_delta_t[j] + OffSet;  // drift time
+    DTV_t_width_m[j] = MB_DT_sigma_t_m(dist, par_sigma_t);               // time width (minus, left)
+    DTV_t_width_p[j] = MB_DT_sigma_t_p(dist, par_sigma_t);               // time width (plus, right)
 
 #ifdef MB_DT_DEBUG
-         printf("MB_DT_drift_time: dist, v_drift, t_drift, lin, t_width_m, t_width_p = %f %f %f %f %f %f\n",
-                                   dist, DT->v_drift, DT->t_drift, DT->delta_t, DT->t_width_m, DT->t_width_p) ;
+    printf("MB_DT_drift_LOOP: OffSet = %f\n", OffSet);
+    printf(
+        "MB_DT_drift_LOOP: dist, v_drift, t_drift, lin, t_width_m, "
+        "t_width_p = %f %f %f %f %f %f\n",
+        dist,
+        DTV_v_drift[j],
+        DTV_t_drift[j],
+        DTV_delta_t[j],
+        DTV_t_width_m[j],
+        DTV_t_width_p[j]);
 #endif
+  }
 
-      return (1);
-}
+  /* Return interpolated or grid values */
+
+  if (interpolate == 0) {
+    DT->v_drift = DTV_v_drift[0];
+    DT->delta_t = DTV_delta_t[0];
+    DT->t_drift = DTV_t_drift[0];
+    DT->t_width_m = DTV_t_width_m[0];
+    DT->t_width_p = DTV_t_width_p[0];
+  } else {
+    V_al[0] = alpha;
+    V_al[1] = alpha_value[i_alpha];
+    V_al[2] = alpha_value[j_alpha];
+    V_by[0] = by;
+    V_by[1] = By_value[i_By];
+    V_by[2] = By_value[j_By];
+    V_bz[0] = bz;
+    V_bz[1] = Bz_value[i_Bz];
+    V_bz[2] = Bz_value[j_Bz];
 
+    DT->v_drift = MB_DT_MLInterpolation(V_al, V_by, V_bz, DTV_v_drift);
+    DT->delta_t = MB_DT_MLInterpolation(V_al, V_by, V_bz, DTV_delta_t);
+    DT->t_drift = MB_DT_MLInterpolation(V_al, V_by, V_bz, DTV_t_drift);
+    DT->t_width_m = MB_DT_MLInterpolation(V_al, V_by, V_bz, DTV_t_width_m);
+    DT->t_width_p = MB_DT_MLInterpolation(V_al, V_by, V_bz, DTV_t_width_p);
+  }
 
-double DTDriftTimeParametrization::MB_DT_time (double dist, double *par) const {
-  return ( fabs(dist)/par[0] );        // par[0] is the drift velocity, 'time' is the linear part of the drift time
+#ifdef MB_DT_DEBUG
+  printf(
+      "MB_DT_drift_time: dist, v_drift, t_drift, lin, t_width_m, t_width_p "
+      "= %f %f %f %f %f %f\n",
+      dist,
+      DT->v_drift,
+      DT->t_drift,
+      DT->delta_t,
+      DT->t_width_m,
+      DT->t_width_p);
+#endif
+
+  return (1);
 }
 
+double DTDriftTimeParametrization::MB_DT_time(double dist, double *par) const {
+  return (fabs(dist) / par[0]);  // par[0] is the drift velocity, 'time' is the
+                                 // linear part of the drift time
+}
 
-double DTDriftTimeParametrization::MB_DT_delta_t (double dist, double *par) const {
-      double x2, x = fabs(dist);   // the parametrisations are symmetric under 'distance'
+double DTDriftTimeParametrization::MB_DT_delta_t(double dist, double *par) const {
+  double x2,
+      x = fabs(dist);  // the parametrisations are symmetric under 'distance'
 
 #ifdef MB_DT_DEBUG
-      printf("MB_DT_delta_t:  distance = %f\n",dist);
+  printf("MB_DT_delta_t:  distance = %f\n", dist);
 #endif
 
-      if (x > 20.5) x = 20.5;
+  if (x > 20.5)
+    x = 20.5;
 
-      x2 = x*x;
+  x2 = x * x;
 
-      if ( x <= par[15] ) { return ( par[1]  + par[2] *x + par[3] *x2 ); }
-      if ( x <= par[16] ) { return ( par[4]  + par[5] *x + par[6] *x2 + par[7]*x2*x + par[8]*x2*x2 ); }
-      if ( x <= par[17] ) { return ( par[9]  + par[10]*x + par[11]*x2 ); }
-                            return ( par[12] + par[13]*x + par[14]*x2 );
+  if (x <= par[15]) {
+    return (par[1] + par[2] * x + par[3] * x2);
+  }
+  if (x <= par[16]) {
+    return (par[4] + par[5] * x + par[6] * x2 + par[7] * x2 * x + par[8] * x2 * x2);
+  }
+  if (x <= par[17]) {
+    return (par[9] + par[10] * x + par[11] * x2);
+  }
+  return (par[12] + par[13] * x + par[14] * x2);
 }
 
 /*** Parameter values ***/
 const double DTDriftTimeParametrization::fun_t[N_alpha][N_By][N_Bz][N_Par_t] = {
-  {
-    {
-      {0.0556,   21.34705,   -6.96399,    0.35271,  203.90453, -104.80794,   18.28547,   -1.30401,    0.03275,  273.81519,  -35.83563,    1.16495, -753.42102,   77.48154,   -1.95997,    4.49997,   14.00007,   17.99991,  -23.626},  // n45_000_000
-      {0.0551,   20.12002,   -6.09022,    0.20681,  223.97505, -118.36366,   21.44865,   -1.60532,    0.04271,  270.20386,  -36.11132,    1.19632, -506.08789,   52.77610,   -1.34591,    4.49992,   13.00009,   18.00009,  -23.006},  // n45_000_005
-      {0.0532,   22.64252,   -7.01973,    0.27407,  272.82883, -144.53683,   26.37216,   -1.99599,    0.05375,  213.83403,  -29.41826,    1.00120, -181.11723,   19.91018,   -0.52793,    4.50008,   12.99998,   17.50009,  -25.473},  // n45_000_010
-      {0.0509,   24.60296,   -7.34058,    0.19231,  244.55084, -129.32730,   23.34324,   -1.74226,    0.04621,  201.75102,  -27.64251,    0.93503, -391.06934,   42.55398,   -1.14046,    4.50001,   13.00008,   17.50007,  -27.649},  // n45_000_020
-      {0.0459,   35.19739,  -12.72399,    0.82496,  219.79767, -122.39584,   23.16365,   -1.81852,    0.05099,   33.15854,   -3.62644,    0.10813,  242.22430,  -27.24386,    0.77503,    3.99991,   12.99995,   17.49999,  -34.742}  // n45_000_040
-    },
-    {
-      {0.0556,   23.47685,   -8.34788,    0.56330,  213.68536, -111.25289,   19.83977,   -1.46156,    0.03829,  268.73987,  -35.73555,    1.17504, -976.49487,  101.42268,   -2.60155,    4.49995,   13.00010,   17.99994,  -22.653},  // n45_010_000
-      {0.0539,   21.92575,   -6.58595,    0.23726,  249.07654, -129.80739,   23.23713,   -1.72368,    0.04553,  239.65262,  -32.08323,    1.06191, -234.11412,   25.03827,   -0.64926,    4.50006,   13.00008,   18.00010,  -24.648},  // n45_010_005
-      {0.0529,   22.61788,   -6.98878,    0.28042,  261.96185, -136.82344,   24.54535,   -1.82414,    0.04822,  244.46667,  -33.34550,    1.12370, -154.02357,   16.72743,   -0.43642,    4.49994,   13.00003,   17.49991,  -25.754},  // n45_010_010
-      {0.0503,   26.16062,   -8.46428,    0.33477,  302.83527, -162.17517,   29.83293,   -2.28033,    0.06214,  120.24834,  -16.60756,    0.57321,  -31.34743,    3.94957,   -0.10648,    4.49990,   12.99992,   17.49991,  -28.268},  // n45_010_020
-      {0.0455,   29.13318,   -7.44854,   -0.11280,  247.42845, -138.42383,   26.36739,   -2.07792,    0.05824,  -15.27696,    2.35121,   -0.07738,  843.33795,  -92.83479,    2.55818,    3.99998,   13.00010,   17.49996,  -35.652}  // n45_010_040
-    },
-    {
-      {0.0546,   21.65291,   -7.32142,    0.41473,  238.05736, -123.21256,   21.84104,   -1.60086,    0.04170,  288.07898,  -38.67337,    1.27893, -146.99965,   15.34303,   -0.37914,    4.50009,   13.00008,   18.00010,  -23.516},  // n45_020_000
-      {0.0536,   22.83323,   -7.32162,    0.35624,  254.37949, -133.71416,   24.20572,   -1.81791,    0.04859,  265.44885,  -35.82408,    1.18952, -367.49500,   39.09926,   -1.01936,    4.50007,   12.99990,   17.99998,  -25.103},  // n45_020_005
-      {0.0525,   22.89064,   -7.50724,    0.35807,  263.14096, -137.41765,   24.59718,   -1.82434,    0.04816,  260.92102,  -35.77632,    1.21411, -120.74561,   13.57980,   -0.35998,    4.50010,   13.00003,   17.49990,  -25.668},  // n45_020_010
-      {0.0501,   27.56264,   -8.36092,    0.34846,  280.92746, -149.80585,   27.64182,   -2.12167,    0.05800,   93.69006,  -13.13720,    0.45715,  404.89532,  -41.76568,    1.08711,    4.50005,   12.99990,   17.99990,  -30.318},  // n45_020_020
-      {0.0452,   34.83423,  -12.54972,    0.78016,  254.07550, -141.08177,   26.62092,   -2.08591,    0.05833,    0.55111,    0.21139,   -0.00703, -967.87006,  106.11289,   -2.89635,    3.99990,   12.99994,   17.49998,  -34.852}  // n45_020_040
-    },
-    {
-      {0.0544,   26.32459,  -10.53177,    0.93040,  251.63989, -129.98534,   23.09303,   -1.69873,    0.04445,  280.66638,  -37.63805,    1.24673, -201.37688,   21.12012,   -0.52982,    4.49990,   13.00005,   18.00010,  -23.861},  // n45_035_000
-      {0.0531,   22.40640,   -6.86159,    0.26979,  253.23177, -132.69228,   23.89915,   -1.78324,    0.04735,  261.03448,  -35.25933,    1.17819, -156.46935,   17.62596,   -0.47129,    4.50007,   12.99990,   17.99992,  -25.405},  // n45_035_005
-      {0.0519,   24.48436,   -8.19295,    0.43653,  244.87477, -129.25404,   23.38988,   -1.75025,    0.04651,  221.16148,  -30.49145,    1.03962,  -77.42811,    8.86109,   -0.23411,    4.50005,   13.00001,   17.49990,  -26.621},  // n45_035_010
-      {0.0490,   27.54592,   -7.85817,    0.14745,  269.54703, -145.31207,   26.88966,   -2.06419,    0.05636,   49.46454,   -7.25126,    0.26222, -444.55106,   48.72118,   -1.32262,    4.49993,   13.00005,   17.99994,  -31.249},  // n45_035_020
-      {0.0444,   39.57302,  -14.23033,    0.94574,  247.34340, -137.52171,   26.04779,   -2.04512,    0.05723,  -16.18505,    2.96769,   -0.11460,  343.79227,  -36.75109,    0.97961,    4.00010,   12.99995,   17.50004,  -37.630}  // n45_035_040
-    },
-    {
-      {0.0516,   24.34674,   -7.87709,    0.37804,  282.50534, -150.57143,   27.66784,   -2.10759,    0.05707,  339.87830,  -45.95683,    1.52710, -107.54557,   12.88849,   -0.36115,    4.50005,   13.00010,   17.99990,  -27.185},  // n45_075_000
-      {0.0504,   28.34387,   -8.77552,    0.39341,  272.40631, -145.91614,   26.96898,   -2.06394,    0.05607,  247.39044,  -33.70679,    1.12984, -172.82640,   19.71150,   -0.54088,    4.50001,   12.99999,   17.99990,  -29.936},  // n45_075_005
-      {0.0493,   28.58276,   -8.74982,    0.32508,  245.57239, -132.78421,   24.61257,   -1.88289,    0.05102,  208.86082,  -29.06264,    0.99613,   27.88273,   -1.83100,    0.03098,    4.49995,   13.00010,   17.49990,  -30.681},  // n45_075_010
-      {0.0467,   32.95806,   -9.22834,    0.21091,  141.83414,  -77.67659,   14.26616,   -1.06239,    0.02763, -152.14319,   18.28754,   -0.54282, -432.47064,   46.42408,   -1.24075,    4.50004,   14.99996,   17.99998,  -36.152},  // n45_075_020
-      {0.0419,   35.31950,   -8.90751,   -0.13073,  248.74876, -143.95366,   28.25199,   -2.29551,    0.06640,  -85.96542,   12.64282,   -0.45169, 1490.03564, -169.05728,    4.78326,    3.50010,   12.50004,   16.99996,  -42.091}  // n45_075_040
-    }
-  },
-  {
-    {
-      {0.0544,   12.02829,   -7.40015,    1.30379,   43.37532,  -26.39556,    5.35578,   -0.43884,    0.01260,  145.46245,  -20.74179,    0.72371, -140.69408,   15.17467,   -0.39886,    3.00010,   12.00006,   17.00006,  -13.091},  // n30_000_000
-      {0.0544,   12.17225,   -7.41092,    1.24452,   32.49359,  -19.72482,    3.96512,   -0.31761,    0.00877,  137.65800,  -19.71537,    0.69510,  -84.40689,    9.18351,   -0.24364,    2.99992,   13.00002,   15.99992,  -11.877},  // n30_000_005
-      {0.0535,   10.09782,   -3.48335,    0.09858,   24.06240,  -14.90732,    3.01716,   -0.23947,    0.00647,  -78.47299,    8.89017,   -0.24701, -498.49789,   52.10888,   -1.35749,    2.79994,   15.79993,   18.80009,  -13.025},  // n30_000_010
-      {0.0521,   12.48625,   -5.57940,    0.52129,   19.99268,  -12.06886,    2.35090,   -0.18104,    0.00478,  -42.83843,    4.99808,   -0.14358, -932.24323,   97.14581,   -2.52863,    2.80009,   15.80007,   18.79990,  -13.967},  // n30_000_020
-      {0.0486,   16.90578,   -7.81519,    0.81126,  -54.68472,   22.78378,   -3.43191,    0.22412,   -0.00534,   -0.96960,    0.00000,    0.00000,  270.55811,  -31.58020,    0.91311,    4.99990,   15.99992,   16.00006,  -17.944}  // n30_000_040
-    },
-    {
-      {0.0546,   10.50846,   -5.29561,    0.73587,   35.61295,  -21.81653,    4.44775,   -0.36190,    0.01016,  125.11208,  -17.72876,    0.61527, -252.87012,   27.83852,   -0.75726,    2.99996,   13.00005,   16.99991,  -11.891},  // n30_010_000
-      {0.0538,   13.82166,   -8.41836,    1.46693,   41.42838,  -24.67595,    4.89261,   -0.39061,    0.01088,  101.84756,  -14.59387,    0.51187, -102.60970,   11.58532,   -0.32062,    2.99992,   12.00010,   17.00002,  -12.726},  // n30_010_005
-      {0.0533,   10.02378,   -4.18202,    0.35273,   23.17132,  -14.38326,    2.92480,   -0.23425,    0.00640,   -9.74465,    1.03864,   -0.02399,  101.14448,   -9.56073,    0.22607,    2.79997,   15.79990,   18.80007,  -13.029},  // n30_010_010
-      {0.0514,   16.85991,  -10.01705,    1.59953,   35.87551,  -22.16305,    4.58261,   -0.38245,    0.01112,   22.04525,   -3.36521,    0.12388,  -28.07022,    3.47386,   -0.10500,    2.99990,   12.00008,   17.00006,  -15.106},  // n30_010_020
-      {0.0484,   17.64043,   -8.23605,    0.86634,  -65.37102,   27.61690,   -4.17907,    0.27086,   -0.00636,   -0.71597,    0.00000,    0.00000,  110.49440,  -12.61240,    0.35386,    4.99992,   15.99990,   16.00010,  -18.301}  // n30_010_040
-    },
-    {
-      {0.0542,   10.61119,   -4.81186,    0.47728,   25.39100,  -15.49208,    3.09400,   -0.24304,    0.00650, -129.38751,   13.97083,   -0.36772,  310.84363,  -30.34959,    0.74419,    3.79998,   15.80009,   18.79992,  -12.328},  // n30_020_000
-      {0.0537,    9.45552,   -4.40769,    0.56877,   26.91584,  -16.39761,    3.30689,   -0.26415,    0.00721,  -49.32124,    5.45733,   -0.14527,  132.94531,  -12.97332,    0.31939,    2.79990,   15.79990,   18.80001,  -12.595},  // n30_020_005
-      {0.0526,   11.95296,   -5.51446,    0.68167,   39.21638,  -23.69438,    4.77174,   -0.38544,    0.01078,   45.19357,   -6.78626,    0.24607,  -48.77351,    5.52608,   -0.15304,    3.00009,   12.99993,   17.00009,  -14.151},  // n30_020_010
-      {0.0516,   10.71178,   -3.57908,    0.02521,   18.29098,  -11.27427,    2.27489,   -0.18095,    0.00491,  -53.40305,    6.39828,   -0.18888, -265.34558,   28.02021,   -0.73933,    2.80008,   15.79990,   18.79991,  -15.068},  // n30_020_020
-      {0.0480,   19.84383,  -11.91102,    2.13543,   55.65884,  -37.20134,    8.45703,   -0.79769,    0.02683,  -40.83831,    6.56598,   -0.25411,   78.84777,   -9.64567,    0.28815,    2.60000,   10.60000,   16.60000,  -18.767}  // n30_020_040
-    },
-    {
-      {0.0538,    9.77490,   -4.19736,    0.39676,   34.10266,  -21.31430,    4.38286,   -0.35806,    0.01007,  123.15682,  -17.61632,    0.61873,  -90.73568,   10.27755,   -0.28197,    3.00009,   12.99996,   17.00002,  -12.478},  // n30_035_000
-      {0.0528,   12.71873,   -6.05552,    0.71727,   24.37415,  -14.84087,    2.97935,   -0.23613,    0.00638,  -71.85704,    7.87551,   -0.21014,  154.82376,  -15.24096,    0.37810,    2.80001,   15.79999,   18.80010,  -13.818},  // n30_035_005
-      {0.0523,   12.70250,   -6.14688,    0.70107,   21.59659,  -13.49774,    2.76834,   -0.22298,    0.00611,  -30.30122,    3.69126,   -0.10883, -569.66058,   58.89044,   -1.51892,    2.79993,   15.80006,   18.79990,  -14.093},  // n30_035_010
-      {0.0506,   14.95800,   -7.41055,    0.94875,   36.21025,  -22.22674,    4.56376,   -0.37880,    0.01097,   -3.42937,    0.41517,   -0.01354,  -10.90930,    1.10235,   -0.02727,    2.99994,   12.99993,   16.00010,  -15.801},  // n30_035_020
-      {0.0476,   15.20345,   -6.35598,    0.58291,   51.63944,  -34.20549,    7.71758,   -0.72357,    0.02425,  -33.85521,    5.63837,   -0.22500,  123.52173,  -15.07774,    0.45050,    2.79991,   10.80002,   16.79990,  -19.019}  // n30_035_040
-    },
-    {
-      {0.0516,   12.97644,   -7.65767,    1.25358,   25.26432,  -15.73275,    3.25373,   -0.26458,    0.00731, -133.77692,   15.32261,   -0.43018, -433.24936,   46.14915,   -1.22258,    2.80008,   15.79990,   18.80009,  -14.341},  // n30_075_000
-      {0.0510,   15.37631,   -8.94591,    1.41497,   43.32719,  -27.41883,    5.83498,   -0.50094,    0.01498,   74.70872,  -11.11151,    0.40330,  -19.07158,    2.89428,   -0.09607,    2.99995,   11.99994,   17.00009,  -14.871},  // n30_075_005
-      {0.0503,   14.27279,   -6.31985,    0.58991,   27.02040,  -17.00821,    3.53459,   -0.29061,    0.00817,  -82.97021,    9.88717,   -0.29015,    5.42775,   -0.23209,   -0.00080,    2.99997,   14.99992,   18.00004,  -15.635},  // n30_075_010
-      {0.0489,   15.62591,   -6.95156,    0.68369,  -34.81164,   12.47115,   -1.49043,    0.07155,   -0.00115, -571.62305,   70.96561,   -2.19960,  -27.58549,    3.09197,   -0.08708,    4.79991,   15.80000,   16.80008,  -17.303},  // n30_075_020
-      {0.0454,   20.81723,   -9.64598,    1.02340, -100.56699,   45.18776,   -7.29277,    0.50381,   -0.01257,  277.65717,  -32.89027,    0.96029,   -0.59399,    0.00000,    0.00000,    4.99990,   15.00006,   19.00008,  -21.800}  // n30_075_040
-    }
-  },
-  {
-    {
-      {0.0544,    5.15583,   -4.70408,    1.07790,    9.20580,   -5.71742,    1.16416,   -0.09314,    0.00253,  -25.96579,    2.55128,   -0.05759,  135.86987,  -13.61908,    0.34400,    2.79997,   14.80001,   18.59992,  -7.037} ,  // n15_000_000
-      {0.0545,    2.72086,   -2.44420,    0.53150,    8.34304,   -5.54141,    1.24046,   -0.11054,    0.00337,   16.37812,   -2.49669,    0.09179, -118.29626,   13.14874,   -0.36252,    2.99990,   13.00010,   16.99993,  -5.821} ,  // n15_000_005
-      {0.0542,    7.04427,   -6.04255,    1.25814,    1.42384,   -1.11609,    0.28499,   -0.02717,    0.00085,   33.17001,   -4.19362,    0.13213,  328.73511,  -33.51883,    0.85442,    2.79993,   14.80010,   18.60006,  -6.113} ,  // n15_000_010
-      {0.0535,    5.12398,   -3.89514,    0.76766,    4.77615,   -2.86220,    0.54986,   -0.04103,    0.00104,   19.59106,   -2.56051,    0.08173,   -4.91891,    0.71080,   -0.02330,    2.79990,   14.79996,   18.60001,  -6.314} ,  // n15_000_020
-      {0.0515,    7.68969,   -5.24261,    0.90644,   -1.58864,    1.39165,   -0.37362,    0.03690,   -0.00117,  135.29031,  -16.05836,    0.47038, 1411.35645, -149.59120,    3.96109,    2.79992,   14.80009,   18.59993,  -8.225}   // n15_000_040
-    },
-    {
-      {0.0547,    4.95313,   -4.23139,    0.89194,    4.96015,   -3.42971,    0.78409,   -0.06992,    0.00209,  -36.60931,    4.16215,   -0.11561, -304.73657,   32.21627,   -0.84887,    2.79990,   14.79990,   18.60010,  -5.642} ,  // n15_010_000
-      {0.0544,    5.82981,   -4.71911,    0.95993,    2.12498,   -1.31817,    0.27326,   -0.02128,    0.00054,  -54.23685,    6.21635,   -0.17618, -150.26959,   15.80998,   -0.41438,    2.80007,   14.79991,   18.59998,  -5.992} ,  // n15_010_005
-      {0.0536,    6.49502,   -3.79257,    0.67160,    3.45038,   -1.63639,    0.38074,   -0.03547,    0.00108,  -21.40683,    2.47712,   -0.07186,   96.90859,   -9.85733,    0.24929,    2.80009,   14.80005,   18.60005,  -7.900} ,  // n15_010_010
-      {0.0530,    5.59734,   -3.51634,    0.56247,    5.12685,   -3.27172,    0.69464,   -0.05906,    0.00175,    0.81910,    0.00483,   -0.00422,   89.50581,  -10.01878,    0.27853,    2.99994,   13.00004,   17.00010,  -6.915} ,  // n15_010_020
-      {0.0512,    8.89250,   -6.53871,    1.21522,    0.14898,   -0.04314,    0.02908,   -0.00803,    0.00051,  -12.78912,    2.48673,   -0.10846, -286.44650,   28.79558,   -0.72277,    2.80008,   12.79991,   17.79990,  -8.735}   // n15_010_040
-    },
-    {
-      {0.0542,    5.15909,   -4.45618,    0.97589,    7.92727,   -5.01963,    1.04355,   -0.08496,    0.00234,  -32.56310,    3.36885,   -0.08303, -229.57448,   24.70668,   -0.66076,    2.79992,   14.80007,   18.60006,  -6.189} ,  // n15_020_000
-      {0.0541,    5.20920,   -3.93600,    0.74711,    2.56127,   -1.95993,    0.50566,   -0.04967,    0.00160,  -25.76940,    3.05973,   -0.08870,   14.04008,   -0.72793,   -0.00014,    2.80010,   14.80000,   18.60007,  -6.059} ,  // n15_020_005
-      {0.0534,    5.79195,   -4.37132,    0.85893,    3.70324,   -2.22071,    0.45012,   -0.03585,    0.00096,  -47.66541,    5.54301,   -0.15947,  -18.43453,    1.93889,   -0.05019,    2.80008,   14.80010,   18.59996,  -6.913} ,  // n15_020_010
-      {0.0531,    6.43553,   -4.70297,    0.87794,    3.68327,   -2.37621,    0.51006,   -0.04359,    0.00128,   30.71634,   -3.68416,    0.10945, -509.76675,   53.55701,   -1.40576,    2.80002,   14.80003,   18.60006,  -7.086} ,  // n15_020_020
-      {0.0508,    9.11012,   -7.09825,    1.45455,    4.66057,   -2.45429,    0.46939,   -0.04189,    0.00145,  -39.55202,    6.29214,   -0.24184,   37.30247,   -5.06056,    0.16162,    2.79990,   12.79990,   16.80010,  -8.997}   // n15_020_040
-    },
-    {
-      {0.0537,    6.40691,   -5.49193,    1.16838,    5.57856,   -3.67899,    0.80202,   -0.06814,    0.00195,  -46.95383,    5.43495,   -0.15458, -451.53543,   47.17558,   -1.22925,    2.79991,   14.79991,   18.60010,  -6.487} ,  // n15_035_000
-      {0.0532,    6.14548,   -4.58795,    0.86695,    4.89932,   -3.27508,    0.71204,   -0.06016,    0.00171,  -44.25770,    5.21435,   -0.15199,    3.61357,   -0.34367,    0.00845,    2.80003,   14.80004,   18.60001,  -6.989} ,  // n15_035_005
-      {0.0532,    5.89561,   -5.09059,    1.10119,    5.41174,   -3.42880,    0.72989,   -0.06247,    0.00184,    7.81991,   -0.92149,    0.02809,  180.41719,  -18.32281,    0.46475,    2.79991,   14.80009,   18.60009,  -6.735} ,  // n15_035_010
-      {0.0521,    6.64698,   -4.27610,    0.67890,    3.10066,   -2.01044,    0.40558,   -0.03231,    0.00089,   34.00752,   -3.95576,    0.11220, -412.73959,   43.10798,   -1.12679,    2.79992,   14.79995,   18.60007,  -7.747} ,  // n15_035_020
-      {0.0504,   11.07455,   -7.72291,    1.30333,   -4.79900,    3.42508,   -0.79738,    0.07117,   -0.00211,   48.61763,   -6.24639,    0.19083, -103.75107,    9.44356,   -0.21184,    3.59990,   16.59990,   18.40009,  -9.247}   // n15_035_040
-    },
-    {
-      {0.0518,    6.57869,   -4.78600,    0.86715,    2.58534,   -2.02494,    0.52075,   -0.05119,    0.00166,  -13.07997,    1.62109,   -0.04827,   75.01424,   -7.38827,    0.18147,    2.79993,   14.80010,   18.59990,  -7.488} ,  // n15_075_000
-      {0.0515,    7.56311,   -5.77572,    1.12582,    3.74138,   -2.46266,    0.55779,   -0.04984,    0.00151,  -27.80692,    3.40043,   -0.10174, -367.20175,   38.79574,   -1.02370,    2.79998,   14.79990,   18.60006,  -7.753} ,  // n15_075_005
-      {0.0510,    7.35396,   -5.51035,    1.02783,    2.01886,   -1.50637,    0.36287,   -0.03298,    0.00100,  -14.75043,    1.78729,   -0.05314,   63.01197,   -6.35469,    0.15982,    2.79990,   14.80009,   18.59990,  -8.146} ,  // n15_075_010
-      {0.0505,    6.73393,   -4.39475,    0.64563,   -3.93495,    2.06476,   -0.37202,    0.02751,   -0.00071,  -19.33320,    2.73622,   -0.09443,  135.14197,  -15.02469,    0.41394,    2.80010,   14.80000,   18.60008,  -8.474} ,  // n15_075_020
-      {0.0482,   10.48373,   -7.22014,    1.23274,   -3.24592,    1.86890,   -0.28628,    0.00727,    0.00048,  -60.63380,    9.71823,   -0.37682,  251.41760,  -29.21386,    0.83723,    2.80007,   12.80009,   15.79999,  -10.835}  // n15_075_040
-    }
-  },
-  {
-    {
-      {0.0543,    5.31433,   -5.76899,    1.44590,    6.44555,   -3.66946,    0.67856,   -0.04847,    0.00113,   13.23424,   -2.07025,    0.07750,   -3.80756,    0.39704,   -0.00898,    2.79990,   12.79991,   16.79995,  -6.167} ,  // n10_000_000
-      {0.0545,    2.80214,   -1.85750,    0.32210,    7.05960,   -4.72284,    1.06601,   -0.09623,    0.00298,   -1.46244,   -0.00068,    0.00630,   -1.31243,    0.10888,   -0.00066,    2.99990,   13.00009,   17.00004,  -4.979} ,  // n10_000_005
-      {0.0543,    4.69283,   -4.74218,    1.11056,    2.25137,   -1.58655,    0.39614,   -0.04000,    0.00138,    0.13713,    0.00265,   -0.00080,  -77.28876,    8.65255,   -0.24135,    2.80009,   12.80006,   16.80010,  -5.181} ,  // n10_000_010
-      {0.0537,    3.71591,   -2.68610,    0.51265,    1.55431,   -0.56102,    0.04067,    0.00180,   -0.00018,   -3.25513,    0.37977,   -0.01031,   46.62582,   -4.91344,    0.12845,    2.99990,   12.99990,   16.99993,  -5.466} ,  // n10_000_020
-      {0.0523,    8.53341,   -8.51434,    2.10704,    2.89123,   -1.30142,    0.20912,   -0.01773,    0.00067,   -8.35565,    1.62414,   -0.06996,  321.09369,  -36.31496,    1.01997,    2.60009,   12.59997,   16.60007,  -6.632}   // n10_000_040
-    },
-    {
-      {0.0548,    4.06744,   -4.35233,    1.04407,    2.71573,   -1.78713,    0.38714,   -0.03383,    0.00101,   23.53139,   -3.55742,    0.13136,    0.24132,    0.21412,   -0.01062,    2.80006,   12.79990,   16.79990,  -4.311} ,  // n10_010_000
-      {0.0545,    5.03551,   -4.90304,    1.14041,   -1.24835,    1.36558,   -0.41541,    0.04732,   -0.00178,    9.57684,   -1.53951,    0.05917,   58.66669,   -6.43043,    0.17637,    2.79990,   12.80010,   16.79990,  -5.087} ,  // n10_010_005
-      {0.0542,    3.46245,   -3.21186,    0.74255,    5.08009,   -3.36450,    0.77901,   -0.07410,    0.00245,   10.14345,   -1.43950,    0.05093,   19.25351,   -2.03230,    0.05394,    2.80006,   12.79992,   16.80010,  -5.171} ,  // n10_010_010
-      {0.0534,    3.15748,   -2.18161,    0.38901,    1.71296,   -0.94781,    0.16103,   -0.01087,    0.00026,    3.85353,   -0.51340,    0.01709,   61.33098,   -6.79149,    0.18714,    2.80010,   12.80009,   16.79996,  -5.619} ,  // n10_010_020
-      {0.0520,    8.35032,   -6.84816,    1.32655,   -3.47044,    2.83625,   -0.59091,    0.04170,   -0.00082,  -31.26133,    5.01397,   -0.19426, -142.61188,   16.05372,   -0.45521,    3.59990,   12.59994,   16.59991,  -6.840}   // n10_010_040
-    },
-    {
-      {0.0542,    4.60591,   -4.23038,    0.95123,    3.29486,   -1.96391,    0.38595,   -0.02958,    0.00075,   21.45546,   -3.24843,    0.11924,    1.68004,    0.00070,   -0.00410,    2.79990,   12.80010,   16.80010,  -5.157} ,  // n10_020_000
-      {0.0542,    4.99825,   -4.92871,    1.16714,    6.59206,   -4.44758,    1.04350,   -0.09880,    0.00321,   -3.77429,    0.26928,   -0.00098,  -25.37696,    2.96633,   -0.08498,    2.79990,   12.79990,   16.79995,  -5.165} ,  // n10_020_005
-      {0.0537,    4.51838,   -3.89387,    0.84966,    3.18585,   -1.90323,    0.39493,   -0.03359,    0.00099,   -0.76826,    0.02198,    0.00150,  -10.82031,    1.09152,   -0.02655,    2.79994,   12.79999,   16.80001,  -5.735} ,  // n10_020_010
-      {0.0534,    4.95005,   -3.71635,    0.70869,    1.64530,   -1.01881,    0.21855,   -0.02041,    0.00069,    3.63433,   -0.50524,    0.01775,   57.82526,   -6.41205,    0.17734,    2.79997,   12.80007,   16.80003,  -5.786} ,  // n10_020_020
-      {0.0516,    7.14246,   -5.86699,    1.18521,   -4.74809,    3.52733,   -0.82383,    0.07262,   -0.00212,  -81.65875,   12.07768,   -0.44058,  -22.08574,    1.86005,   -0.03905,    3.00003,   13.00006,   16.40005,  -7.131}   // n10_020_040
-    },
-    {
-      {0.0537,    4.29139,   -3.82248,    0.83470,    3.28732,   -2.21447,    0.50615,   -0.04601,    0.00142,    7.79420,   -1.32820,    0.05377,    2.25977,   -0.08850,   -0.00041,    2.79992,   12.80009,   16.79993,  -5.408} ,  // n10_035_000
-      {0.0534,    4.85414,   -4.58254,    1.07052,    3.93412,   -2.31881,    0.48792,   -0.04236,    0.00128,   -1.73573,    0.12168,   -0.00001,   28.81659,   -3.12377,    0.08492,    2.79990,   12.80006,   16.79990,  -5.819} ,  // n10_035_005
-      {0.0534,    4.84886,   -3.83682,    0.78937,    4.80844,   -3.17207,    0.73710,   -0.07092,    0.00237,   -3.22681,    0.36733,   -0.00948,   -0.62177,    0.17712,   -0.00739,    2.80000,   12.79996,   16.79995,  -5.602} ,  // n10_035_010
-      {0.0526,    6.44918,   -5.98697,    1.38022,    3.87839,   -1.88362,    0.28585,   -0.01621,    0.00028,  -18.93701,    2.71133,   -0.09629,  -50.20261,    5.46946,   -0.14969,    2.79990,   12.80007,   16.79991,  -6.356} ,  // n10_035_020
-      {0.0511,    4.88408,   -2.61896,    0.32138,   -7.98858,    5.39548,   -1.20880,    0.10569,   -0.00312,  -21.55942,    3.74262,   -0.15474,  211.87878,  -24.57761,    0.70341,    3.00009,   12.99996,   15.99998,  -7.572}   // n10_035_040
-    },
-    {
-      {0.0519,    5.85053,   -5.30637,    1.14670,    2.48510,   -1.94073,    0.49985,   -0.04955,    0.00163,  -11.93217,    1.32390,   -0.03362,   36.70197,   -3.76405,    0.09692,    2.79990,   12.79992,   16.79990,  -6.318} ,  // n10_075_000
-      {0.0516,    8.14939,   -7.54269,    1.70262,    3.64994,   -2.18582,    0.47011,   -0.04174,    0.00129,  -21.54301,    2.87521,   -0.09473,  -36.17973,    4.08269,   -0.11475,    2.79992,   12.79990,   16.79990,  -6.828} ,  // n10_075_005
-      {0.0512,    4.27975,   -3.29716,    0.65427,    3.20534,   -2.14230,    0.50056,   -0.04794,    0.00160,   -4.39993,    0.65871,   -0.02395,  -28.33160,    3.18199,   -0.08935,    2.79990,   12.79995,   16.79991,  -6.920} ,  // n10_075_010
-      {0.0508,    6.18226,   -4.87602,    0.98338,    0.65737,   -0.22400,    0.04406,   -0.00734,    0.00040,  -10.79803,    1.67484,   -0.06248,   28.25488,   -2.92017,    0.07266,    2.80006,   12.79990,   16.80005,  -7.296} ,  // n10_075_020
-      {0.0489,    9.33675,   -6.63393,    1.14675,  -11.92019,    7.28760,   -1.43136,    0.10688,   -0.00259,  -49.72197,    7.75946,   -0.29509,  255.75706,  -29.24851,    0.82573,    3.59991,   12.59990,   16.59992,  -9.291}   // n10_075_040
-    }
-  },
-  {
-    {
-      {0.0543,    3.52395,   -3.63040,    0.89249,    3.51265,   -1.96893,    0.36939,   -0.02623,    0.00059,   -0.99400,   -0.05350,    0.00740,  -10.79336,    1.16854,   -0.03062,    2.79994,   12.79995,   16.79990,  -5.738} ,  // n05_000_000
-      {0.0546,    3.76873,   -4.20799,    1.03985,   -0.16890,    0.35091,   -0.12331,    0.01496,   -0.00060,   -1.11111,   -0.03797,    0.00661,  -90.40871,    9.86148,   -0.26625,    2.79990,   12.79992,   16.79998,  -4.283} ,  // n05_000_005
-      {0.0546,    3.30270,   -3.34261,    0.77505,   -0.75751,    0.37468,   -0.02595,   -0.00400,    0.00032,    7.87401,   -1.19774,    0.04470,    0.56358,    0.05046,   -0.00370,    2.79993,   12.80009,   16.80004,  -4.403} ,  // n05_000_010
-      {0.0541,    3.47970,   -3.79418,    0.91147,   -1.02923,    0.79414,   -0.20341,    0.02024,   -0.00069,   -6.30273,    0.81141,   -0.02580,    4.45289,   -0.52484,    0.01563,    2.79990,   12.80000,   16.80001,  -4.530} ,  // n05_000_020
-      {0.0529,    5.48741,   -5.11403,    1.21818,    1.77252,   -0.19757,   -0.10172,    0.01488,   -0.00049,  -17.26815,    2.70783,   -0.10225,  187.30664,  -21.08027,    0.58888,    2.79990,   12.80001,   16.79992,  -5.662}   // n05_000_040
-    },
-    {
-      {0.0545,    3.90405,   -3.84382,    0.84744,   -1.61055,    0.74095,   -0.09128,    0.00137,    0.00011,   -2.29756,   -0.00023,    0.00671,  -40.90726,    4.72474,   -0.13774,    2.80010,   12.80009,   16.79993,  -4.346} ,  // n05_010_000
-      {0.0547,    4.15091,   -4.40477,    1.04243,    2.87282,   -1.37036,    0.20973,   -0.01313,    0.00029,   33.03365,   -4.61881,    0.15964,   94.07873,  -10.33107,    0.28442,    2.99993,   13.00010,   16.99991,  -4.089} ,  // n05_010_005
-      {0.0543,    3.63330,   -3.76174,    0.89524,    0.12283,    0.00008,    0.00335,   -0.00159,    0.00007,   -3.30342,    0.21604,   -0.00090,  -11.64955,    1.52367,   -0.04917,    2.79993,   12.79990,   16.79992,  -4.477} ,  // n05_010_010
-      {0.0538,    3.39387,   -3.24534,    0.78020,    2.27773,   -1.00549,    0.14543,   -0.00863,    0.00017,  -23.20937,    3.11838,   -0.10375,    3.32732,   -0.44284,    0.01421,    2.79993,   12.80007,   16.80010,  -4.974} ,  // n05_010_020
-      {0.0528,    9.82555,  -12.01304,    3.41696,    1.59046,   -0.61731,    0.14104,   -0.02013,    0.00099,  -11.84331,    2.13296,   -0.08775,  -94.00870,   10.66124,   -0.30427,    2.39996,   12.80002,   16.80005,  -5.828}   // n05_010_040
-    },
-    {
-      {0.0541,    3.82167,   -3.82514,    0.89331,    3.49704,   -1.93244,    0.39105,   -0.03397,    0.00104,   25.34212,   -3.55576,    0.12087,    1.28510,   -0.08738,    0.00009,    3.00010,   13.00007,   16.99991,  -4.729} ,  // n05_020_000
-      {0.0543,    3.64420,   -3.65454,    0.83720,   -1.48764,    0.93548,   -0.18427,    0.01425,   -0.00040,   -4.89646,    0.33175,    0.00000,    3.88087,   -0.14858,   -0.00251,    2.79999,   12.80009,   16.80010,  -4.573} ,  // n05_020_005
-      {0.0540,    3.87984,   -3.98142,    0.92178,   -2.91226,    2.03763,   -0.47256,    0.04352,   -0.00138,   15.29778,   -2.19560,    0.07770,  -31.72825,    3.58404,   -0.09971,    2.79998,   12.79990,   16.80010,  -4.738} ,  // n05_020_010
-      {0.0538,    4.06595,   -4.31760,    1.06015,    2.40211,   -1.37919,    0.29324,   -0.02774,    0.00094,   -2.17193,    0.20292,   -0.00348,   31.48715,   -3.39075,    0.09118,    2.79997,   12.79991,   16.79999,  -4.848} ,  // n05_020_020
-      {0.0523,    6.42028,   -7.71858,    2.57858,    3.93713,   -2.79519,    0.76109,   -0.09091,    0.00381,  -15.75499,    2.42475,   -0.09114,  636.79877,  -68.72087,    1.84803,    1.80003,   10.80000,   18.40010,  -6.175}   // n05_020_040
-    },
-    {
-      {0.0537,    3.01635,   -2.75036,    0.61407,    1.09268,   -0.54231,    0.08258,   -0.00429,    0.00003,  -15.88831,    2.00380,   -0.06220,  -26.85873,    2.99003,   -0.08203,    2.79990,   12.80009,   16.80004,  -4.877} ,  // n05_035_000
-      {0.0535,    3.28088,   -2.98657,    0.64691,    0.81601,   -0.33281,    0.04347,   -0.00260,    0.00006,   -4.51525,    0.51724,   -0.01402,  -39.71747,    4.40580,   -0.12095,    3.00009,   13.00003,   16.99999,  -5.199} ,  // n05_035_005
-      {0.0536,    3.10208,   -2.59025,    0.54351,    1.27989,   -0.87976,    0.22317,   -0.02301,    0.00080,   -8.05347,    1.05794,   -0.03407,    0.03963,    0.04140,   -0.00224,    2.79993,   12.80010,   16.80010,  -5.099} ,  // n05_035_010
-      {0.0530,    3.88474,   -4.01258,    0.97961,    2.76926,   -1.44551,    0.25304,   -0.01850,    0.00049,   -8.54036,    1.26181,   -0.04583,  -53.43386,    5.83363,   -0.15890,    2.80001,   12.80009,   16.79990,  -5.450} ,  // n05_035_020
-      {0.0519,    5.56229,   -5.00309,    1.15739,    4.15868,   -2.21568,    0.45798,   -0.04698,    0.00184,  -30.84895,    4.71621,   -0.17612,  173.01314,  -19.56656,    0.54698,    2.79991,   10.79992,   16.80010,  -6.392}   // n05_035_040
-    },
-    {
-      {0.0518,    5.52023,   -4.93440,    1.05227,   -0.15830,    0.05088,    0.05749,   -0.01425,    0.00074,  -10.92503,    1.48823,   -0.04880,   30.94530,   -3.29152,    0.08749,    2.99990,   12.99991,   16.99994,  -6.054} ,  // n05_075_000
-      {0.0517,    4.12817,   -3.37719,    0.67768,   -0.90127,    0.61424,   -0.11345,    0.00680,   -0.00010,  -13.06180,    1.73825,   -0.05695,   47.99504,   -5.27710,    0.14445,    2.99995,   12.99991,   17.00003,  -5.913} ,  // n05_075_005
-      {0.0514,    8.89363,  -11.78030,    3.61852,    0.40479,   -0.00175,    0.03539,   -0.00872,    0.00046,    1.46465,    0.00010,   -0.00644,   -0.42764,   -0.13628,    0.00813,    2.19990,   13.00010,   16.99990,  -6.432} ,  // n05_075_010
-      {0.0514,    5.81492,   -5.65047,    1.28300,   -0.12733,    0.08589,   -0.00155,   -0.00276,    0.00020,  -43.73930,    6.10746,   -0.20896, -101.13957,   11.19796,   -0.30859,    2.80009,   12.79991,   16.79992,  -6.138} ,  // n05_075_020
-      {0.0498,    7.09559,   -4.98614,    0.87509,   -4.37041,    2.51690,   -0.37104,    0.00864,    0.00061,  -42.02439,    6.66953,   -0.25537,  148.40695,  -17.13779,    0.48860,    2.80010,   12.79991,   15.80009,  -7.891}   // n05_075_040
-    }
-  },
-  {
-    {
-      {0.0543,    3.76799,   -3.79645,    0.90153,   -0.36069,    0.80581,   -0.32382,    0.04398,   -0.00190,    9.79637,   -1.48921,    0.05549,   19.28946,   -2.03789,    0.05452,    2.79990,   10.79991,   16.80009,  -5.404} ,  // p00_000_000
-      {0.0546,    3.82106,   -4.81566,    1.29179,    5.41929,   -3.19906,    0.64556,   -0.05210,    0.00139,   -0.81829,   -0.04402,    0.00683,   24.48976,   -2.58636,    0.06849,    2.80010,   10.79992,   16.79990,  -4.073} ,  // p00_000_005
-      {0.0548,    2.59458,   -3.11658,    0.76319,   -2.47920,    1.42871,   -0.26598,    0.02061,   -0.00060,    6.94846,   -1.20938,    0.05033,  -16.15617,    2.19575,   -0.07049,    2.79998,   10.79990,   16.79990,  -3.843} ,  // p00_000_010
-      {0.0545,    3.75406,   -4.15496,    1.00047,    2.21270,   -1.00560,    0.14494,   -0.00810,    0.00014,   -3.44034,    0.42174,   -0.01233,  -76.68801,    8.37637,   -0.22680,    2.99990,   12.99998,   16.99990,  -4.030} ,  // p00_000_020
-      {0.0536,    4.88338,   -4.18911,    1.01147,    0.22740,    0.90668,   -0.27666,    0.02379,   -0.00058,  -15.95048,    2.40404,   -0.08744,  189.58817,  -21.30053,    0.59530,    2.79992,   10.80001,   16.80006,  -5.686}   // p00_000_040
-    },
-    {
-      {0.0546,    3.44645,   -3.45838,    0.81590,    2.18456,   -1.38198,    0.30328,   -0.02639,    0.00075,    8.21530,   -1.42017,    0.05814,   91.35162,   -9.60887,    0.25100,    2.80010,   10.80005,   16.79996,  -4.220} ,  // p00_010_000
-      {0.0548,    2.75028,   -2.68273,    0.61177,   -0.57933,    0.91382,   -0.38003,    0.05400,   -0.00245,    3.24628,   -0.61262,    0.02645,   -2.09549,    0.21266,   -0.00375,    2.80009,   10.80010,   16.79997,  -3.653} ,  // p00_010_005
-      {0.0546,    2.70611,   -3.34802,    0.88092,    4.40942,   -3.10474,    0.78174,   -0.08153,    0.00297,    1.09646,   -0.28915,    0.01555,   -2.05598,    0.45305,   -0.01746,    2.79990,   10.79991,   16.79991,  -4.038} ,  // p00_010_010
-      {0.0543,    3.25394,   -3.33658,    0.81489,   -2.84847,    2.58124,   -0.70980,    0.07537,   -0.00274,    0.24704,   -0.07807,    0.00436,  -97.48288,   10.60200,   -0.28509,    2.79999,   10.79996,   16.79991,  -4.177} ,  // p00_010_020
-      {0.0534,    5.51633,   -5.47922,    1.32827,    3.23522,   -1.98395,    0.53711,   -0.06763,    0.00295,  -12.64715,    1.78651,   -0.06177,  142.89133,  -15.78519,    0.43307,    2.79993,   10.79996,   16.80002,  -5.303}   // p00_010_040
-    },
-    {
-      {0.0543,    3.83509,   -4.50681,    1.14988,   -1.81414,    2.01830,   -0.66458,    0.08274,   -0.00345,   -0.75361,    0.04758,   -0.00006,  -30.74572,    3.22642,   -0.08301,    2.79999,   10.79997,   16.79990,  -4.182} ,  // p00_020_000
-      {0.0544,    3.72419,   -3.75085,    0.89331,    5.06850,   -3.61323,    0.90860,   -0.09357,    0.00333,   -2.47935,    0.17367,    0.00000,  -38.44076,    4.33291,   -0.12016,    2.79998,   10.80010,   16.79994,  -4.274} ,  // p00_020_005
-      {0.0541,    3.60098,   -4.08631,    1.02594,    0.38653,    0.00000,   -0.04602,    0.00957,   -0.00054,    6.90171,   -1.19481,    0.04906,   33.38736,   -3.52823,    0.09411,    2.79990,   10.80003,   16.79991,  -4.431} ,  // p00_020_010
-      {0.0542,    4.35829,   -4.48529,    1.09419,   -0.35691,    0.74460,   -0.23642,    0.02550,   -0.00092,   -0.46932,   -0.00004,    0.00219,  -74.86735,    8.26935,   -0.22643,    2.80010,   10.79993,   16.79992,  -4.387} ,  // p00_020_020
-      {0.0531,    4.75210,   -5.06107,    1.27805,    6.00138,   -3.80203,    0.91453,   -0.09835,    0.00381,  -17.96639,    2.64675,   -0.09498,  -12.06511,    1.13330,   -0.02580,    2.79990,   10.79990,   16.79990,  -5.121}   // p00_020_040
-    },
-    {
-      {0.0537,    4.53583,   -5.01609,    1.24148,   -0.20410,    0.48658,   -0.17332,    0.02196,   -0.00094,   -0.65554,   -0.00069,    0.00305,  -12.91353,    1.42730,   -0.03852,    2.79991,   10.80007,   16.79990,  -4.717} ,  // p00_035_000
-      {0.0536,    3.27927,   -3.53667,    0.85289,   -2.45949,    1.99823,   -0.53911,    0.05891,   -0.00226,    2.14069,   -0.44621,    0.02037,    0.89235,    0.04147,   -0.00423,    2.79999,   10.79995,   16.79990,  -4.785} ,  // p00_035_005
-      {0.0538,    3.56528,   -3.72096,    0.89163,    1.62636,   -1.18726,    0.32579,   -0.03669,    0.00140,   -4.88346,    0.62603,   -0.01912,  -49.13002,    5.52842,   -0.15416,    2.79990,   10.80009,   16.79993,  -4.555} ,  // p00_035_010
-      {0.0535,    4.32451,   -4.03719,    0.91759,    4.90756,   -3.44341,    0.85696,   -0.09010,    0.00338,   -1.68175,    0.30318,   -0.01274,  -35.38565,    3.75842,   -0.09899,    2.79995,   10.79994,   16.80010,  -4.869} ,  // p00_035_020
-      {0.0526,    6.10928,   -5.52450,    1.30919,    1.72007,   -0.30570,    0.01722,   -0.00541,    0.00039,  -31.95194,    4.69680,   -0.16974,  154.33820,  -17.43290,    0.48747,    2.79990,   10.80010,   16.80002,  -5.917}   // p00_035_040
-    },
-    {
-      {0.0518,    4.80158,   -4.99797,    1.15695,   -0.48634,    0.01350,    0.07747,   -0.01460,    0.00064,  -14.23129,    1.90494,   -0.06282,  -16.16497,    1.90240,   -0.05581,    2.79992,   10.80005,   16.80008,  -5.555} ,  // p00_075_000
-      {0.0518,    6.09790,   -6.13402,    1.46244,    4.00057,   -2.84777,    0.78122,   -0.09052,    0.00364,   -1.12694,    0.09193,   -0.00017,   25.41941,   -2.71645,    0.07294,    2.80001,   10.79992,   16.79990,  -5.715} ,  // p00_075_005
-      {0.0517,    5.15090,   -5.19541,    1.23944,   -0.20110,    0.63034,   -0.22759,    0.02784,   -0.00114,   -8.28137,    1.15878,   -0.03946,  -56.81646,    6.38595,   -0.17863,    2.79990,   10.80004,   16.79990,  -5.648} ,  // p00_075_010
-      {0.0517,    4.57055,   -4.44359,    1.05180,   -1.40135,    1.49769,   -0.41303,    0.04130,   -0.00140,   -7.77098,    1.04314,   -0.03377,   -3.15739,    0.59889,   -0.02368,    2.79993,   10.80010,   16.79990,  -5.631} ,  // p00_075_020
-      {0.0506,    6.53860,   -4.96034,    0.92868,   -8.50805,    5.26425,   -1.00181,    0.06905,   -0.00144,  -53.81376,    7.69174,   -0.26679,  322.08820,  -35.44020,    0.96969,    2.99999,   13.00008,   16.99994,  -6.746}   // p00_075_040
-    }
-  },
-  {
-    {
-      {0.0543,    3.20236,   -3.06598,    0.72444,    0.40048,    0.18377,   -0.12531,    0.01896,   -0.00084,   11.71295,   -1.75476,    0.06411,    4.85250,   -0.44279,    0.01032,    2.79993,   10.80010,   16.80005,  -5.750} ,  // p05_000_000
-      {0.0547,    3.86949,   -4.25660,    1.08794,    6.13220,   -3.82570,    0.84391,   -0.07816,    0.00260,   12.91564,   -2.03192,    0.07826,   56.09587,   -5.97003,    0.15968,    2.79990,   10.79990,   16.80010,  -4.142} ,  // p05_000_005
-      {0.0550,    1.83797,   -1.70884,    0.36424,    0.50697,   -0.49066,    0.14896,   -0.01588,    0.00053,   -8.21327,    0.82283,   -0.01767,   -0.40389,    0.33499,   -0.01599,    3.00007,   13.00008,   16.99991,  -4.101} ,  // p05_000_010
-      {0.0548,    2.16141,   -2.61393,    0.68679,    0.94387,   -0.11163,   -0.10725,    0.02326,   -0.00121,   14.30174,   -2.24025,    0.08527,  -17.96364,    2.12023,   -0.05996,    2.79991,   10.80004,   16.80010,  -4.006} ,  // p05_000_020
-      {0.0545,    3.68494,   -3.86856,    0.98901,    4.15157,   -2.17274,    0.42476,   -0.04018,    0.00147,   -1.34507,    0.02086,    0.00673,   15.56388,   -1.64565,    0.04602,    2.79990,   10.79992,   16.79993,  -4.467}   // p05_000_040
-    },
-    {
-      {0.0547,    2.58980,   -2.76951,    0.63926,   -2.57033,    1.51632,   -0.30619,    0.02928,   -0.00115,   -3.06252,    0.24585,   -0.00207,  -63.37688,    7.17805,   -0.20101,    2.80008,   10.80010,   16.80010,  -4.346} ,  // p05_010_000
-      {0.0548,    4.90806,   -5.07148,    1.20918,    3.73549,   -1.67154,    0.24451,   -0.01339,    0.00020,   21.84240,   -3.29400,    0.12173,   95.69867,  -10.18625,    0.27160,    2.99990,   13.00009,   16.99992,  -4.195} ,  // p05_010_005
-      {0.0547,    2.40467,   -2.58903,    0.62992,   -0.56719,    0.54459,   -0.16120,    0.02099,   -0.00099,    1.54622,   -0.42685,    0.02201,   -0.50269,    0.34417,   -0.01662,    2.79993,   10.80007,   16.79994,  -4.294} ,  // p05_010_010
-      {0.0546,    2.77709,   -2.98777,    0.75694,    4.87724,   -3.10782,    0.69867,   -0.06568,    0.00219,    4.65089,   -0.78246,    0.03173, -139.27916,   15.43570,   -0.42368,    2.80010,   10.79996,   16.80010,  -4.389} ,  // p05_010_020
-      {0.0543,    2.95071,   -2.98128,    0.71601,   -0.14464,    0.11727,    0.03743,   -0.01438,    0.00090,   -1.32565,   -0.04086,    0.01138,  536.00171,  -57.13625,    1.52309,    2.79992,   10.80009,   17.80006,  -4.562}   // p05_010_040
-    },
-    {
-      {0.0543,    4.02597,   -4.21252,    1.02828,   -0.17343,    0.69087,   -0.27893,    0.03721,   -0.00160,    4.08064,   -0.69074,    0.02782,   -0.97485,   -0.00007,    0.00462,    2.80005,   10.80007,   16.80010,  -4.523} ,  // p05_020_000
-      {0.0545,    3.38196,   -3.13275,    0.68453,   -1.13411,    0.52841,   -0.04159,   -0.00258,    0.00023,    3.44952,   -0.67711,    0.02995,   24.96747,   -2.54510,    0.06490,    2.80001,   10.79998,   16.80003,  -4.479} ,  // p05_020_005
-      {0.0543,    3.75787,   -3.54792,    0.82019,    4.81413,   -3.26644,    0.78085,   -0.07765,    0.00274,   12.18999,   -1.89030,    0.07116,  -40.52675,    4.51477,   -0.12332,    2.79995,   10.79996,   16.79991,  -4.519} ,  // p05_020_010
-      {0.0546,    4.23149,   -4.63446,    1.16135,    0.87792,   -0.31076,    0.06533,   -0.00842,    0.00040,    9.18120,   -1.47974,    0.05832,   -2.95420,    0.47588,   -0.01508,    2.79993,   10.79991,   16.80009,  -4.469} ,  // p05_020_020
-      {0.0539,    2.93939,   -2.70202,    0.65254,    1.08548,   -0.22783,    0.00916,   -0.00178,    0.00015,   18.54346,   -2.86941,    0.11101,  181.68613,  -19.85721,    0.54416,    2.79992,   12.79992,   16.79992,  -4.805}   // p05_020_040
-    },
-    {
-      {0.0537,    5.37485,   -5.09690,    1.11559,    0.09981,   -0.00991,    0.01123,   -0.00199,    0.00009,    4.87962,   -0.77397,    0.03026,   45.53274,   -4.89593,    0.13206,    2.99990,   13.00007,   16.99992,  -5.034} ,  // p05_035_000
-      {0.0537,    2.75395,   -2.81804,    0.69482,    3.29961,   -2.21512,    0.55936,   -0.05964,    0.00223,    6.86265,   -1.14848,    0.04638,   22.48904,   -2.32044,    0.06077,    2.79990,   10.80010,   16.80000,  -4.849} ,  // p05_035_005
-      {0.0540,    3.05963,   -2.91645,    0.67651,    4.79621,   -3.36434,    0.82088,   -0.08130,    0.00277,   -1.26532,   -0.00003,    0.00653,   55.81568,   -6.03851,    0.16372,    2.79992,   10.79991,   16.79995,  -4.610} ,  // p05_035_010
-      {0.0539,    4.50273,   -4.47464,    1.04658,    2.40997,   -0.95976,    0.12542,   -0.00623,    0.00008,   12.66042,   -1.94269,    0.07334,   46.26167,   -4.86763,    0.12912,    2.99990,   12.99990,   17.00006,  -4.607} ,  // p05_035_020
-      {0.0534,    3.46352,   -2.71784,    0.61065,    4.49239,   -2.46297,    0.51111,   -0.04854,    0.00169,   -3.15886,    0.30690,   -0.00384,  177.58841,  -19.38068,    0.52764,    2.80009,   12.79990,   16.79999,  -5.299}   // p05_035_040
-    },
-    {
-      {0.0518,    4.13331,   -3.86000,    0.86326,    2.42719,   -1.93170,    0.54085,   -0.05904,    0.00213,  -11.14144,    1.45630,   -0.04617,   -0.54484,    0.23793,   -0.01119,    2.80007,   10.80009,   16.79990,  -5.993} ,  // p05_075_000
-      {0.0519,    4.70055,   -4.32619,    0.96433,    3.33259,   -2.47838,    0.65984,   -0.07234,    0.00275,    5.63716,   -0.97334,    0.04057,   45.18773,   -4.59013,    0.11573,    2.79995,   10.80009,   16.79992,  -5.805} ,  // p05_075_005
-      {0.0518,    4.39903,   -4.01056,    0.93724,    5.60386,   -3.45739,    0.77267,   -0.07374,    0.00253,    5.16848,   -0.88884,    0.03682,   37.69211,   -3.91721,    0.10185,    2.80004,   10.79998,   16.80005,  -5.986} ,  // p05_075_010
-      {0.0520,    5.11761,   -5.05555,    1.18823,    5.51935,   -2.98553,    0.59399,   -0.05167,    0.00162,  -10.69337,    1.31076,   -0.03832,   62.00644,   -6.58853,    0.17479,    2.99990,   12.99990,   17.00003,  -5.744} ,  // p05_075_020
-      {0.0514,    3.82005,   -3.17396,    0.65537,   -4.48834,    2.82946,   -0.50317,    0.02763,   -0.00026,  -64.93736,    8.85430,   -0.29397,  177.10834,  -19.47346,    0.53484,    2.99991,   12.99991,   17.00010,  -6.002}   // p05_075_040
-    }
-  },
-  {
-    {
-      {0.0543,    4.61255,   -4.47335,    1.08066,    7.81198,   -4.69806,    0.95467,   -0.07838,    0.00224,   29.20573,   -4.13587,    0.14425,  -22.36250,    2.42590,   -0.06362,    2.79990,   12.79995,   16.80010,  -6.241} ,  // p10_000_000
-      {0.0549,    3.81120,   -5.03492,    1.28912,    2.65849,   -1.66231,    0.27149,   -0.01465,    0.00015,   22.30671,   -3.55454,    0.13656,    1.43494,    0.00007,   -0.00107,    2.79999,   12.80008,   16.79990,  -3.819} ,  // p10_000_005
-      {0.0552,    3.76955,   -3.61290,    0.80350,    0.92407,   -0.76737,    0.19330,   -0.01649,    0.00039,   -7.66726,    0.42662,    0.00538,  -18.31787,    2.29378,   -0.06803,    2.80008,   12.79990,   16.80010,  -4.244} ,  // p10_000_010
-      {0.0551,    2.59243,   -2.77429,    0.67012,    1.51560,   -0.95600,    0.19363,   -0.01336,    0.00024,   30.96554,   -4.76593,    0.17906,   17.16256,   -1.42566,    0.02914,    2.79990,   12.79991,   16.80010,  -4.520} ,  // p10_000_020
-      {0.0553,    4.79851,   -5.41729,    1.41378,    3.43541,   -1.57203,    0.27185,   -0.02253,    0.00071,   21.51097,   -3.53675,    0.14236,   51.79659,   -5.41250,    0.14671,    2.79990,   12.79991,   16.79993,  -4.308}   // p10_000_040
-    },
-    {
-      {0.0547,    3.46481,   -2.87026,    0.61625,    7.36747,   -5.06461,    1.18415,   -0.11060,    0.00353,    5.35887,   -1.07249,    0.04778,   34.95335,   -3.64082,    0.09580,    2.80008,   12.79990,   16.79990,  -4.922} ,  // p10_010_000
-      {0.0550,    4.69969,   -4.31429,    0.97579,    2.12514,   -1.08621,    0.17380,   -0.00800,   -0.00002,   25.99059,   -3.89979,    0.14298,   -8.16072,    1.04312,   -0.03023,    2.79994,   12.80010,   16.80007,  -4.667} ,  // p10_010_005
-      {0.0550,    3.99941,   -4.23272,    1.02992,    5.08114,   -3.36968,    0.75881,   -0.06849,    0.00212,   27.76900,   -4.09722,    0.14862,  -14.14435,    1.69047,   -0.04738,    2.79990,   12.80000,   16.79990,  -4.383} ,  // p10_010_010
-      {0.0552,    3.15235,   -3.00832,    0.66198,    3.94565,   -2.53519,    0.53845,   -0.04446,    0.00123,   33.05710,   -5.04188,    0.18862,  -20.42994,    2.64234,   -0.07832,    2.99994,   12.99998,   17.00009,  -4.038} ,  // p10_010_020
-      {0.0551,    3.28645,   -3.91935,    1.03975,    4.55043,   -2.75666,    0.60502,   -0.05555,    0.00176,   25.34828,   -4.27963,    0.17518,   79.00926,   -8.15489,    0.21573,    2.80010,   12.80008,   16.80010,  -4.428}   // p10_010_040
-    },
-    {
-      {0.0543,    4.87086,   -4.84372,    1.18281,    2.04073,   -1.03475,    0.15456,   -0.00697,    0.00000,   13.90032,   -2.19623,    0.08345,  -34.24716,    3.88468,   -0.10765,    2.59990,   12.99994,   16.99996,  -5.013} ,  // p10_020_000
-      {0.0546,    2.86437,   -2.78814,    0.65623,    2.72769,   -1.77484,    0.40658,   -0.03702,    0.00113,   17.45303,   -2.89654,    0.11513,   22.80558,   -2.06406,    0.04661,    2.79992,   12.80004,   16.80009,  -4.892} ,  // p10_020_005
-      {0.0546,    3.59562,   -4.19797,    1.10386,    5.76635,   -3.34477,    0.65744,   -0.05232,    0.00144,   31.33425,   -4.68104,    0.17197,   29.80136,   -3.04004,    0.07973,    2.79992,   12.80007,   16.80006,  -4.748} ,  // p10_020_010
-      {0.0550,    2.37871,   -1.89158,    0.36492,    2.62634,   -2.01068,    0.50965,   -0.04877,    0.00153,   -7.12011,    0.43067,    0.00398,  -19.83286,    2.36679,   -0.06592,    2.99993,   13.00010,   16.99991,  -4.425} ,  // p10_020_020
-      {0.0548,    3.90142,   -4.16391,    1.04337,    6.39498,   -4.20534,    0.98066,   -0.09481,    0.00318,   48.52671,   -7.22254,    0.26706,   36.18306,   -3.72209,    0.10244,    2.80009,   12.79993,   16.80006,  -4.416}   // p10_020_040
-    },
-    {
-      {0.0538,    4.49764,   -4.68410,    1.10591,    1.05590,   -0.73158,    0.17723,   -0.01728,    0.00056,    0.19885,   -0.21392,    0.01325,  -34.62253,    3.86451,   -0.10613,    2.79990,   12.80008,   16.79991,  -5.141} ,  // p10_035_000
-      {0.0538,    5.01613,   -4.60918,    1.00224,    1.73770,   -1.41499,    0.37564,   -0.03781,    0.00126,   13.08375,   -2.09309,    0.08115,    1.91464,    0.00191,   -0.00398,    2.79996,   12.79997,   16.80010,  -5.393} ,  // p10_035_005
-      {0.0542,    4.65886,   -4.30014,    0.94893,   -0.48479,    0.43129,   -0.12090,    0.01465,   -0.00063,  -16.81617,    1.93515,   -0.05374,  -26.51077,    3.01264,   -0.08353,    2.79993,   12.80009,   16.79994,  -5.024} ,  // p10_035_010
-      {0.0543,    1.65049,   -1.97893,    0.51725,    2.53607,   -1.49595,    0.28551,   -0.02046,    0.00045,   12.51428,   -2.11664,    0.08557,  -23.64483,    2.74093,   -0.07546,    2.79990,   12.79991,   16.80006,  -4.830} ,  // p10_035_020
-      {0.0544,    3.37819,   -3.39199,    0.79922,   -0.27506,    0.22007,   -0.01246,   -0.00559,    0.00042,   34.90525,   -5.21147,    0.19470,  106.87849,  -11.34946,    0.30505,    2.80008,   12.79990,   16.79999,  -4.670}   // p10_035_040
-    },
-    {
-      {0.0518,    8.05245,   -7.68090,    1.71684,    0.20151,   -0.44682,    0.20302,   -0.02753,    0.00111,   -7.95962,    0.84128,   -0.01892,   25.57248,   -2.43510,    0.05729,    2.79990,   12.79990,   16.80007,  -6.525} ,  // p10_075_000
-      {0.0520,    8.30465,   -8.03651,    1.84952,    2.88947,   -1.83047,    0.42855,   -0.04121,    0.00136,   -4.21482,    0.34233,   -0.00294,  -18.93556,    2.26961,   -0.06550,    2.80007,   12.79996,   16.79990,  -6.353} ,  // p10_075_005
-      {0.0521,    5.82454,   -5.49265,    1.26068,    3.77310,   -2.33061,    0.50881,   -0.04523,    0.00139,    8.76934,   -1.50125,    0.06171,   32.65368,   -3.43916,    0.09243,    2.79995,   12.79991,   16.79991,  -6.096} ,  // p10_075_010
-      {0.0524,    6.52483,   -6.76609,    1.64758,    4.43848,   -2.59053,    0.53965,   -0.04552,    0.00130,  -27.81909,    3.26964,   -0.09104,   57.14166,   -5.92876,    0.15547,    2.79990,   12.80007,   16.79991,  -5.892} ,  // p10_075_020
-      {0.0522,    4.72587,   -6.37174,    1.78114,    7.31014,   -4.48617,    1.04331,   -0.10511,    0.00370,  -12.52113,    1.09512,   -0.01058,   57.02774,   -5.68329,    0.14648,    2.79990,   12.79991,   16.80009,  -5.997}   // p10_075_040
-    }
-  },
-  {
-    {
-      {0.0539,    6.75967,   -2.97628,    0.42284,   14.29705,   -7.32112,    1.43944,   -0.11640,    0.00326,   57.60227,   -8.05949,    0.27747,  -85.84425,    9.70984,   -0.27198,    3.80002,   12.79995,   16.80010,  -9.471} ,  // p15_000_000
-      {0.0548,    3.28645,   -1.88083,    0.25488,   14.96242,   -9.04928,    1.85074,   -0.15300,    0.00439,   20.61109,   -3.19294,    0.11955,  -84.98413,    9.55607,   -0.26519,    3.79991,   12.79994,   16.79993,  -5.783} ,  // p15_000_005
-      {0.0554,   -4.26924,    6.40241,   -1.80375,    3.83559,   -3.45490,    0.90539,   -0.08711,    0.00274,   30.29626,   -4.87601,    0.18930,   -4.18640,    0.96561,   -0.03624,    2.79990,   12.79997,   16.80010,  -5.333} ,  // p15_000_010
-      {0.0557,    2.54956,   -2.72439,    0.58392,    7.71558,   -5.22553,    1.08578,   -0.08798,    0.00242,   52.54388,   -7.81094,    0.28497, -110.35490,   12.51210,   -0.34684,    3.00005,   12.99993,   16.99991,  -4.335} ,  // p15_000_020
-      {0.0561,    3.11770,   -2.67604,    0.64175,    7.67093,   -4.52628,    0.91930,   -0.07680,    0.00223,   52.55859,   -8.13716,    0.31026, -134.55896,   15.23328,   -0.41786,    2.79990,   12.80003,   16.80010,  -4.681}   // p15_000_040
-    },
-    {
-      {0.0548,    2.85752,   -1.94411,    0.29406,   -6.92030,    3.46253,   -0.61157,    0.04739,   -0.00139,   30.04456,   -4.65055,    0.17505,    1.22831,    0.19239,   -0.01112,    3.80010,   12.80005,   16.79991,  -5.765} ,  // p15_010_000
-      {0.0554,    3.93566,   -3.88181,    0.67483,    4.16404,   -3.25206,    0.67740,   -0.05392,    0.00144,   29.83762,   -4.70534,    0.17978,    2.48750,    0.00001,   -0.00340,    3.79990,   12.79996,   16.79990,  -4.222} ,  // p15_010_005
-      {0.0553,    4.14466,   -4.70643,    1.05916,    4.96554,   -4.03322,    0.92178,   -0.08086,    0.00238,   19.84434,   -3.32640,    0.13081,  -93.14327,   10.10124,   -0.26813,    2.80009,   12.80010,   16.79997,  -4.343} ,  // p15_010_010
-      {0.0555,    3.51818,   -2.67466,    0.54255,    7.13151,   -4.50687,    0.93075,   -0.07529,    0.00205,   56.95231,   -8.48881,    0.30988, -141.52164,   15.89914,   -0.43858,    2.79991,   12.79990,   16.79991,  -5.084} ,  // p15_010_020
-      {0.0559,    3.89499,   -3.95543,    0.95578,    5.84340,   -3.80372,    0.85051,   -0.07724,    0.00240,   29.29273,   -4.86435,    0.19527, -239.00053,   26.69204,   -0.73250,    2.80002,   12.80000,   16.79997,  -4.948}   // p15_010_040
-    },
-    {
-      {0.0542,    7.45577,   -5.47708,    0.93871,   11.13320,   -6.32428,    1.25250,   -0.10197,    0.00291,   47.82215,   -6.88771,    0.24350,    0.99839,    0.02577,   -0.00212,    3.80006,   12.79992,   16.80009,  -6.331} ,  // p15_020_000
-      {0.0547,    5.46306,   -3.97193,    0.66786,    7.51414,   -4.87473,    1.09206,   -0.09787,    0.00299,   23.81616,   -3.79773,    0.14630,  -16.69421,    2.13227,   -0.06315,    3.79990,   12.79991,   16.79990,  -5.899} ,  // p15_020_005
-      {0.0548,    3.49234,   -2.71455,    0.57572,    9.53674,   -6.12139,    1.30414,   -0.10978,    0.00315,   50.74908,   -7.50880,    0.27236,    1.99712,    0.00424,   -0.00211,    2.79998,   12.80010,   16.79992,  -5.738} ,  // p15_020_010
-      {0.0552,    5.91344,   -5.47834,    1.25894,    9.82249,   -6.43014,    1.42222,   -0.12561,    0.00380,   70.81713,  -10.44954,    0.37800,  -81.52750,    9.56502,   -0.27358,    2.79999,   12.80005,   16.79990,  -5.491} ,  // p15_020_020
-      {0.0555,    4.99997,   -5.32575,    1.35827,    9.34656,   -5.55418,    1.12280,   -0.09210,    0.00261,   82.41172,  -12.46464,    0.46575,    8.20463,    0.00034,   -0.01329,    2.79991,   12.80005,   16.80010,  -4.961}   // p15_020_040
-    },
-    {
-      {0.0537,    8.66871,   -8.59491,    2.13963,    8.77537,   -5.51864,    1.18744,   -0.10291,    0.00307,   -6.47143,    0.52082,   -0.00646,  -27.71366,    3.16684,   -0.08860,    2.59990,   12.99996,   16.99994,  -6.675} ,  // p15_035_000
-      {0.0539,    4.62390,   -3.50484,    0.68064,    8.49884,   -5.47756,    1.19090,   -0.10373,    0.00311,   14.54671,   -2.36893,    0.09233,  -13.59277,    1.71853,   -0.05074,    2.99996,   12.99999,   17.00007,  -6.372} ,  // p15_035_005
-      {0.0545,    7.29436,   -6.60560,    1.42536,   -0.33022,    0.35786,   -0.06182,    0.00499,   -0.00020,   46.87251,   -7.09273,    0.26344,    9.05742,   -0.80637,    0.02073,    2.99992,   13.00001,   16.39997,  -5.895} ,  // p15_035_010
-      {0.0547,    5.25905,   -4.37134,    0.96265,    9.13990,   -5.61797,    1.15884,   -0.09542,    0.00270,   46.20668,   -6.84214,    0.24923,  -71.68587,    8.28743,   -0.23363,    2.79990,   12.80009,   16.79999,  -5.922} ,  // p15_035_020
-      {0.0552,    3.60159,   -3.26762,    0.77637,    6.46627,   -4.10550,    0.92929,   -0.08589,    0.00273,   70.99803,  -10.75255,    0.40317,   61.53351,   -6.00462,    0.15409,    2.80002,   12.80010,   16.80010,  -5.158}   // p15_035_040
-    },
-    {
-      {0.0518,    8.55031,   -7.94292,    1.89369,   11.02563,   -7.59173,    1.80739,   -0.17483,    0.00586,  -13.28089,    1.65701,   -0.04940,  -46.56146,    5.45907,   -0.15789,    2.59991,   12.00007,   17.00008,  -7.737} ,  // p15_075_000
-      {0.0521,    7.18166,   -6.01651,    1.21814,    2.43363,   -1.77826,    0.45100,   -0.04348,    0.00137,   -6.98630,    0.48466,   -0.00020,    0.89998,    0.00165,   -0.00007,    2.99990,   12.99992,   16.39993,  -7.416} ,  // p15_075_005
-      {0.0522,    7.15505,   -5.81547,    1.18139,    5.06047,   -3.07090,    0.65204,   -0.05581,    0.00163,   34.26066,   -5.22068,    0.19407,  -32.08974,    3.80938,   -0.10985,    2.99991,   12.99993,   16.39990,  -7.269} ,  // p15_075_010
-      {0.0528,    5.38865,   -4.39337,    0.91388,    5.14703,   -3.46478,    0.79934,   -0.07280,    0.00224,   16.43457,   -2.92250,    0.12318,   31.08896,   -2.97667,    0.07448,    2.80007,   12.80005,   16.79990,  -6.694} ,  // p15_075_020
-      {0.0530,    5.30422,   -4.13874,    0.81738,    3.37868,   -2.32631,    0.58993,   -0.06041,    0.00205,   18.44731,   -4.12627,    0.20107, -126.24677,   15.05903,   -0.43280,    2.99998,   13.00005,   16.00001,  -6.496}   // p15_075_040
-    }
-  },
-  {
-    {
-      {0.0544,   10.61662,   -4.66383,    0.42516,   29.08390,  -17.46141,    3.40602,   -0.26049,    0.00678, -255.29288,   28.47131,   -0.78533, -253.99155,   26.36440,   -0.67581,    3.79994,   15.80006,   18.60002,  -13.202},  // p30_000_000
-      {0.0551,    8.48104,   -3.31969,    0.24238,   19.35292,  -13.50383,    2.83199,   -0.22423,    0.00592, -330.91690,   36.65610,   -1.00339,  -29.81560,    4.30657,   -0.13451,    4.80007,   15.80010,   18.60009,  -11.472},  // p30_000_005
-      {0.0561,    8.21242,   -4.20316,    0.59937,   34.98674,  -21.78326,    4.51224,   -0.37530,    0.01091,  158.52663,  -22.60890,    0.79016, -293.95880,   31.92491,   -0.85202,    3.00010,   12.00009,   17.00010,  -10.328},  // p30_000_010
-      {0.0570,    7.82783,   -3.53628,    0.32742,   25.88920,  -15.62944,    3.05299,   -0.23138,    0.00591, -333.66858,   35.40715,   -0.91798,   28.07013,   -0.20378,   -0.04726,    3.79997,   15.79990,   18.79990,  -9.445} ,  // p30_000_020
-      {0.0590,    5.23373,   -2.13316,    0.21623,   41.95924,  -23.06488,    4.26929,   -0.31721,    0.00813,  -79.40607,    4.20908,    0.04657, -301.68414,   33.18764,   -0.87989,    3.80005,   15.79991,   17.79990,  -8.083}   // p30_000_040
-    },
-    {
-      {0.0548,    9.11327,   -3.80718,    0.27176,   17.72807,  -12.00591,    2.53188,   -0.20527,    0.00560, -220.21121,   24.72145,   -0.68478,  367.76862,  -37.77391,    0.97563,    3.80009,   15.79991,   18.60010,  -11.387},  // p30_010_000
-      {0.0555,    8.44225,   -3.76365,    0.34830,   16.84440,  -11.45504,    2.36289,   -0.18514,    0.00485, -243.74149,   26.40218,   -0.70330,  386.71576,  -39.71713,    1.02916,    4.80010,   15.79990,   18.59990,  -10.875},  // p30_010_005
-      {0.0559,    7.24607,   -3.03818,    0.24462,   22.67508,  -14.77998,    3.00055,   -0.23325,    0.00609, -206.00262,   21.17171,   -0.52507, -146.17339,   16.12455,   -0.43035,    4.80005,   15.80010,   17.80010,  -10.516},  // p30_010_010
-      {0.0573,    6.45449,   -2.76923,    0.23920,   32.66528,  -19.06378,    3.65477,   -0.27470,    0.00701, -493.64062,   54.21835,   -1.46628, -871.48663,   92.04108,   -2.40908,    3.80001,   15.80010,   18.80009,  -9.104} ,  // p30_010_020
-      {0.0588,    6.37161,   -3.11835,    0.36682,   37.10630,  -21.05871,    3.99062,   -0.30092,    0.00778, -172.28308,   15.36689,   -0.28755, -636.64410,   68.52458,   -1.80834,    3.79993,   15.79990,   17.80007,  -7.964}   // p30_010_040
-    },
-    {
-      {0.0542,    9.44688,   -3.71389,    0.24703,   26.78260,  -16.48410,    3.28849,   -0.25822,    0.00691,  -81.39407,    8.60310,   -0.22002, -212.08173,   22.63139,   -0.59648,    3.79990,   15.79996,   18.59994,  -12.045},  // p30_020_000
-      {0.0550,    9.56795,   -4.10759,    0.36162,   -9.53957,   -0.04329,    0.68184,   -0.08320,    0.00268, -236.68367,   26.12769,   -0.71066,  114.03345,  -10.77724,    0.25972,    4.80010,   15.79993,   18.59991,  -11.348},  // p30_020_005
-      {0.0556,    9.11780,   -3.84344,    0.33944,   17.16139,  -12.17312,    2.60583,   -0.21060,    0.00567, -179.89798,   18.42106,   -0.45231,  -65.40993,    7.61139,   -0.20637,    4.80010,   15.79990,   17.80008,  -10.972},  // p30_020_010
-      {0.0568,    6.22430,   -2.44412,    0.15530,   23.72676,  -14.46505,    2.85771,   -0.21916,    0.00566, -439.93677,   48.29883,   -1.30727, -403.80157,   42.89093,   -1.12186,    3.79993,   15.79991,   18.80005,  -9.806} ,  // p30_020_020
-      {0.0585,    7.10131,   -4.24196,    0.75234,   32.10036,  -19.29766,    3.81396,   -0.29743,    0.00795,  271.80072,  -38.36960,    1.33922, -420.36700,   45.48018,   -1.19808,    2.99990,   12.99990,   17.00000,  -8.254}   // p30_020_040
-    },
-    {
-      {0.0537,   10.21091,   -4.78163,    0.49243,   24.68602,  -15.27425,    3.08510,   -0.24448,    0.00659, -126.04826,   13.79405,   -0.36900,   74.71278,   -6.67548,    0.15121,    3.79992,   15.80010,   18.60007,  -12.748},  // p30_035_000
-      {0.0543,    8.22007,   -3.20905,    0.26448,   34.80609,  -21.45596,    4.36322,   -0.35304,    0.00985,  150.36832,  -21.25133,    0.73889, -159.37085,   17.70522,   -0.48091,    2.99991,   12.99990,   16.99990,  -12.074},  // p30_035_005
-      {0.0552,   11.57362,   -7.38167,    1.28619,   32.91651,  -20.29951,    4.14324,   -0.33554,    0.00934,  152.41504,  -21.69770,    0.75989, -106.28696,   11.76815,   -0.31353,    2.99991,   13.00000,   16.99990,  -10.962},  // p30_035_010
-      {0.0563,    6.23912,   -1.89622,    0.00004,   26.12958,  -16.01497,    3.17671,   -0.24497,    0.00639, -394.40930,   43.23233,   -1.16464, -108.84921,   12.83091,   -0.35549,    3.80001,   15.79997,   18.80005,  -10.032},  // p30_035_020
-      {0.0581,    7.03247,   -4.28547,    0.74398,   25.93132,  -15.87561,    3.21769,   -0.25820,    0.00716,  179.21277,  -26.07754,    0.93573, -663.24866,   72.29580,   -1.93585,    3.00009,   12.00010,   17.00003,  -8.411}   // p30_035_040
-    },
-    {
-      {0.0517,    9.70148,   -3.91269,    0.30846,   -7.65310,   -1.78739,    1.13266,   -0.12649,    0.00406, -150.20160,   17.06530,   -0.47568, -236.91472,   25.69370,   -0.68892,    4.79990,   15.79996,   18.60010,  -14.074},  // p30_075_000
-      {0.0524,   10.13101,   -5.01916,    0.50429,    0.63606,   -5.57866,    1.69481,   -0.16088,    0.00479, -294.30109,   33.31309,   -0.93149, -413.55151,   44.23528,   -1.17401,    4.80010,   15.79990,   18.59990,  -12.376},  // p30_075_005
-      {0.0530,   11.92036,   -6.75281,    0.98658,   33.86113,  -21.37756,    4.41361,   -0.36021,    0.01007,  158.84935,  -22.86018,    0.80770,  -69.85017,    8.13320,   -0.22409,    3.00003,   12.99994,   16.99990,  -12.283},  // p30_075_010
-      {0.0543,   10.18101,   -5.88503,    0.91264,   31.02949,  -19.52331,    4.05557,   -0.33247,    0.00935,  243.09650,  -34.45361,    1.20640, -132.55496,   15.19251,   -0.41413,    3.00007,   13.00010,   16.99990,  -11.256},  // p30_075_020
-      {0.0558,    8.64585,   -4.88029,    0.73985,   28.65805,  -18.33885,    3.90765,   -0.33077,    0.00968,  232.41695,  -34.30407,    1.24759, -314.29739,   35.06829,   -0.94139,    2.99995,   11.99996,   17.00000,  -9.834}   // p30_075_040
-    }
-  },
-  {
-    {
-      {0.0557,   17.92760,   -4.80648,   -0.00062,   87.95326,  -44.90956,    7.07027,   -0.40233,    0.00644,  198.99698,  -26.92573,    0.89975, -668.47876,   68.69582,   -1.73436,    3.49990,   12.00009,   18.50010,  -23.132},  // p45_000_000
-      {0.0566,   20.56676,   -6.82244,    0.33277,  175.13602,  -90.53445,   15.76371,   -1.11647,    0.02779,  180.29503,  -22.57693,    0.70006, -597.75354,   60.71547,   -1.50728,    4.49994,   13.99990,   16.99990,  -21.234},  // p45_000_005
-      {0.0586,   20.56975,   -8.20942,    0.62927,  142.57861,  -73.70823,   12.67121,   -0.87488,    0.02100,  725.19733,  -88.49728,    2.68396, -1232.48926, 124.71665,   -3.11487,    4.49990,   15.49997,   18.99992,  -18.255},  // p45_000_010
-      {0.0608,   12.99930,   -4.40646,    0.16615,  135.46375,  -69.37206,   11.77502,   -0.80074,    0.01894,  834.58325, -100.01414,    2.98189, -2341.82739, 237.54265,   -5.96752,    4.49998,   15.49990,   17.99990,  -15.521},  // p45_000_020
-      {0.0646,    5.82714,   -0.20208,   -0.33431,  121.90810,  -59.59846,    9.64799,   -0.62125,    0.01383,  459.80518,  -57.52971,    1.79004, -2399.81445, 241.79126,   -6.01292,    4.50004,   14.00010,   17.99997,  -13.067}  // p45_000_040
-    },
-    {
-      {0.0556,   18.73014,   -5.72701,    0.19442,  210.71324, -108.49732,   18.98730,   -1.36407,    0.03470,  214.51993,  -29.06502,    0.96904, -548.95691,   56.81079,   -1.44214,    4.49995,   12.00008,   18.49993,  -21.938},  // p45_010_000
-      {0.0572,   17.82296,   -5.60061,    0.19641,  156.14261,  -81.31771,   14.21418,   -1.00593,    0.02491,   88.89441,  -10.67603,    0.30999, -837.22253,   86.09529,   -2.17788,    4.49998,   14.00000,   16.99990,  -20.646},  // p45_010_005
-      {0.0586,   15.68601,   -5.05629,    0.15237,  123.19237,  -64.52366,   11.14414,   -0.76840,    0.01837,  818.15198,  -99.75158,    3.02816, -1100.24219, 112.98646,   -2.85447,    4.50006,   15.49991,   18.99993,  -18.115},  // p45_010_010
-      {0.0614,   14.13518,   -5.31521,    0.32966,  126.34982,  -65.43266,   11.26074,   -0.77525,    0.01854,  641.93475,  -76.69814,    2.28030, -2960.33691, 301.67068,   -7.62206,    4.49996,   15.49992,   17.99994,  -15.170},  // p45_010_020
-      {0.0643,   11.92501,   -4.88406,    0.42808,  153.55266,  -75.53246,   12.51486,   -0.84085,    0.01989,  527.21625,  -65.90746,    2.04721, -2539.25317, 256.57034,   -6.40381,    4.50010,   14.00007,   17.99990,  -13.099}  // p45_010_040
-    },
-    {
-      {0.0551,   18.76994,   -5.08732,   -0.00695,  183.72238,  -96.75191,   17.17280,   -1.24386,    0.03169,  253.61079,  -33.36923,    1.08613, -618.65979,   64.60046,   -1.65856,    4.49992,   14.00004,   16.99990,  -22.614},  // p45_020_000
-      {0.0564,   19.01751,   -5.73905,    0.18643,  201.07152, -104.59877,   18.50068,   -1.33975,    0.03423,  336.03275,  -42.75151,    1.34662, -834.15784,   86.52957,   -2.20905,    4.50000,   13.99993,   17.00000,  -21.622},  // p45_020_005
-      {0.0578,   16.23072,   -5.33147,    0.20100,  156.70125,  -80.35872,   13.73304,   -0.94558,    0.02267,  681.61133,  -84.21975,    2.58614, -1049.93359, 108.72073,   -2.77210,    4.49993,   15.49993,   18.99991,  -19.116},  // p45_020_010
-      {0.0605,   15.63967,   -6.31759,    0.49985,  184.82843,  -94.30469,   16.26149,   -1.14093,    0.02816,  190.08217,  -22.96738,    0.68538, -2344.32666, 237.12065,   -5.94170,    4.49997,   13.99995,   17.99990,  -16.280},  // p45_020_020
-      {0.0638,    6.05559,    0.00002,   -0.38734,  161.59608,  -80.28737,   13.43472,   -0.91133,    0.02171,  314.70325,  -38.83810,    1.18871, -3235.08618, 328.47684,   -8.26153,    4.50005,   14.00001,   17.99991,  -13.602}  // p45_020_040
-    },
-    {
-      {0.0542,   21.63719,   -6.46348,    0.18335,  153.53262,  -81.56468,   14.57769,   -1.05863,    0.02693,  381.95724,  -50.40508,    1.64370, -560.77686,   58.72067,   -1.51340,    4.50000,   13.99994,   16.99993,  -24.157},  // p45_035_000
-      {0.0557,   20.55025,   -7.11530,    0.34058,  171.14911,  -90.11083,   15.90498,   -1.14251,    0.02881,  246.92723,  -31.69450,    0.99712, -892.47058,   92.59153,   -2.37127,    4.50010,   14.00007,   16.99990,  -20.995},  // p45_035_005
-      {0.0570,   16.49973,   -5.22144,    0.12479,  138.85353,  -72.43115,   12.49747,   -0.86734,    0.02092,  955.99622, -118.19658,    3.63192, -975.28864,   99.94202,   -2.52613,    4.50010,   15.50010,   18.00004,  -19.636},  // p45_035_010
-      {0.0602,   15.55931,   -6.60743,    0.51995,  173.41943,  -90.44087,   15.88782,   -1.13649,    0.02866,  310.30878,  -38.38401,    1.17837, -2338.81030, 237.64796,   -5.98044,    4.50010,   14.00002,   17.99990,  -15.753},  // p45_035_020
-      {0.0638,   10.96490,   -4.79228,    0.37885,  156.69714,  -80.06792,   13.74100,   -0.95676,    0.02343,  406.64651,  -50.97632,    1.58610, -3313.41284, 338.56537,   -8.57343,    4.49990,   14.00008,   17.99990,  -12.285}  // p45_035_040
-    },
-    {
-      {0.0516,   25.10588,   -7.03224,    0.15306,  205.25684, -109.31027,   19.82121,   -1.46893,    0.03823,  452.53693,  -60.25387,    1.98362, -541.77319,   57.50642,   -1.50294,    4.49990,   13.99990,   16.99993,  -27.947},  // p45_075_000
-      {0.0535,   19.89361,   -6.09960,    0.17821,  198.89348, -105.43513,   18.93069,   -1.38671,    0.03569,  409.90585,  -53.51824,    1.72764, -803.38422,   83.82904,   -2.15337,    4.50004,   14.00009,   16.99990,  -23.850},  // p45_075_005
-      {0.0540,   19.16553,   -5.66443,    0.04920,  131.46606,  -71.21025,   12.69343,   -0.90599,    0.02236,  648.16327,  -82.04230,    2.57039, -1096.53784, 113.75765,   -2.92251,    4.50000,   15.49990,   18.00008,  -22.902},  // p45_075_010
-      {0.0575,   18.06837,   -6.77291,    0.44879,  164.18694,  -86.73592,   15.42702,   -1.10863,    0.02787,  382.57480,  -48.49550,    1.52342, -1999.79858, 202.65134,   -5.07618,    4.49991,   14.00009,   17.99990,  -19.025},  // p45_075_020
-      {0.0610,   15.26029,   -6.09591,    0.45420,  125.71390,  -65.64382,   11.38995,   -0.78601,    0.01875,  813.33154,  -98.42193,    2.96368, -3919.15771, 400.35605,  -10.13975,    4.49990,   15.50004,   17.99990,  -15.366} // p45_075_040
-    }
-  }
-};
+    {{
+         {0.0556,
+          21.34705,
+          -6.96399,
+          0.35271,
+          203.90453,
+          -104.80794,
+          18.28547,
+          -1.30401,
+          0.03275,
+          273.81519,
+          -35.83563,
+          1.16495,
+          -753.42102,
+          77.48154,
+          -1.95997,
+          4.49997,
+          14.00007,
+          17.99991,
+          -23.626},  // n45_000_000
+         {0.0551,
+          20.12002,
+          -6.09022,
+          0.20681,
+          223.97505,
+          -118.36366,
+          21.44865,
+          -1.60532,
+          0.04271,
+          270.20386,
+          -36.11132,
+          1.19632,
+          -506.08789,
+          52.77610,
+          -1.34591,
+          4.49992,
+          13.00009,
+          18.00009,
+          -23.006},  // n45_000_005
+         {0.0532,
+          22.64252,
+          -7.01973,
+          0.27407,
+          272.82883,
+          -144.53683,
+          26.37216,
+          -1.99599,
+          0.05375,
+          213.83403,
+          -29.41826,
+          1.00120,
+          -181.11723,
+          19.91018,
+          -0.52793,
+          4.50008,
+          12.99998,
+          17.50009,
+          -25.473},  // n45_000_010
+         {0.0509,
+          24.60296,
+          -7.34058,
+          0.19231,
+          244.55084,
+          -129.32730,
+          23.34324,
+          -1.74226,
+          0.04621,
+          201.75102,
+          -27.64251,
+          0.93503,
+          -391.06934,
+          42.55398,
+          -1.14046,
+          4.50001,
+          13.00008,
+          17.50007,
+          -27.649},  // n45_000_020
+         {0.0459,
+          35.19739,
+          -12.72399,
+          0.82496,
+          219.79767,
+          -122.39584,
+          23.16365,
+          -1.81852,
+          0.05099,
+          33.15854,
+          -3.62644,
+          0.10813,
+          242.22430,
+          -27.24386,
+          0.77503,
+          3.99991,
+          12.99995,
+          17.49999,
+          -34.742}  // n45_000_040
+     },
+     {
+         {0.0556,
+          23.47685,
+          -8.34788,
+          0.56330,
+          213.68536,
+          -111.25289,
+          19.83977,
+          -1.46156,
+          0.03829,
+          268.73987,
+          -35.73555,
+          1.17504,
+          -976.49487,
+          101.42268,
+          -2.60155,
+          4.49995,
+          13.00010,
+          17.99994,
+          -22.653},  // n45_010_000
+         {0.0539,
+          21.92575,
+          -6.58595,
+          0.23726,
+          249.07654,
+          -129.80739,
+          23.23713,
+          -1.72368,
+          0.04553,
+          239.65262,
+          -32.08323,
+          1.06191,
+          -234.11412,
+          25.03827,
+          -0.64926,
+          4.50006,
+          13.00008,
+          18.00010,
+          -24.648},  // n45_010_005
+         {0.0529,
+          22.61788,
+          -6.98878,
+          0.28042,
+          261.96185,
+          -136.82344,
+          24.54535,
+          -1.82414,
+          0.04822,
+          244.46667,
+          -33.34550,
+          1.12370,
+          -154.02357,
+          16.72743,
+          -0.43642,
+          4.49994,
+          13.00003,
+          17.49991,
+          -25.754},  // n45_010_010
+         {0.0503,
+          26.16062,
+          -8.46428,
+          0.33477,
+          302.83527,
+          -162.17517,
+          29.83293,
+          -2.28033,
+          0.06214,
+          120.24834,
+          -16.60756,
+          0.57321,
+          -31.34743,
+          3.94957,
+          -0.10648,
+          4.49990,
+          12.99992,
+          17.49991,
+          -28.268},  // n45_010_020
+         {0.0455,
+          29.13318,
+          -7.44854,
+          -0.11280,
+          247.42845,
+          -138.42383,
+          26.36739,
+          -2.07792,
+          0.05824,
+          -15.27696,
+          2.35121,
+          -0.07738,
+          843.33795,
+          -92.83479,
+          2.55818,
+          3.99998,
+          13.00010,
+          17.49996,
+          -35.652}  // n45_010_040
+     },
+     {
+         {0.0546,
+          21.65291,
+          -7.32142,
+          0.41473,
+          238.05736,
+          -123.21256,
+          21.84104,
+          -1.60086,
+          0.04170,
+          288.07898,
+          -38.67337,
+          1.27893,
+          -146.99965,
+          15.34303,
+          -0.37914,
+          4.50009,
+          13.00008,
+          18.00010,
+          -23.516},  // n45_020_000
+         {0.0536,
+          22.83323,
+          -7.32162,
+          0.35624,
+          254.37949,
+          -133.71416,
+          24.20572,
+          -1.81791,
+          0.04859,
+          265.44885,
+          -35.82408,
+          1.18952,
+          -367.49500,
+          39.09926,
+          -1.01936,
+          4.50007,
+          12.99990,
+          17.99998,
+          -25.103},  // n45_020_005
+         {0.0525,
+          22.89064,
+          -7.50724,
+          0.35807,
+          263.14096,
+          -137.41765,
+          24.59718,
+          -1.82434,
+          0.04816,
+          260.92102,
+          -35.77632,
+          1.21411,
+          -120.74561,
+          13.57980,
+          -0.35998,
+          4.50010,
+          13.00003,
+          17.49990,
+          -25.668},  // n45_020_010
+         {0.0501,
+          27.56264,
+          -8.36092,
+          0.34846,
+          280.92746,
+          -149.80585,
+          27.64182,
+          -2.12167,
+          0.05800,
+          93.69006,
+          -13.13720,
+          0.45715,
+          404.89532,
+          -41.76568,
+          1.08711,
+          4.50005,
+          12.99990,
+          17.99990,
+          -30.318},  // n45_020_020
+         {0.0452,
+          34.83423,
+          -12.54972,
+          0.78016,
+          254.07550,
+          -141.08177,
+          26.62092,
+          -2.08591,
+          0.05833,
+          0.55111,
+          0.21139,
+          -0.00703,
+          -967.87006,
+          106.11289,
+          -2.89635,
+          3.99990,
+          12.99994,
+          17.49998,
+          -34.852}  // n45_020_040
+     },
+     {
+         {0.0544,
+          26.32459,
+          -10.53177,
+          0.93040,
+          251.63989,
+          -129.98534,
+          23.09303,
+          -1.69873,
+          0.04445,
+          280.66638,
+          -37.63805,
+          1.24673,
+          -201.37688,
+          21.12012,
+          -0.52982,
+          4.49990,
+          13.00005,
+          18.00010,
+          -23.861},  // n45_035_000
+         {0.0531,
+          22.40640,
+          -6.86159,
+          0.26979,
+          253.23177,
+          -132.69228,
+          23.89915,
+          -1.78324,
+          0.04735,
+          261.03448,
+          -35.25933,
+          1.17819,
+          -156.46935,
+          17.62596,
+          -0.47129,
+          4.50007,
+          12.99990,
+          17.99992,
+          -25.405},  // n45_035_005
+         {0.0519,
+          24.48436,
+          -8.19295,
+          0.43653,
+          244.87477,
+          -129.25404,
+          23.38988,
+          -1.75025,
+          0.04651,
+          221.16148,
+          -30.49145,
+          1.03962,
+          -77.42811,
+          8.86109,
+          -0.23411,
+          4.50005,
+          13.00001,
+          17.49990,
+          -26.621},  // n45_035_010
+         {0.0490,
+          27.54592,
+          -7.85817,
+          0.14745,
+          269.54703,
+          -145.31207,
+          26.88966,
+          -2.06419,
+          0.05636,
+          49.46454,
+          -7.25126,
+          0.26222,
+          -444.55106,
+          48.72118,
+          -1.32262,
+          4.49993,
+          13.00005,
+          17.99994,
+          -31.249},  // n45_035_020
+         {0.0444,
+          39.57302,
+          -14.23033,
+          0.94574,
+          247.34340,
+          -137.52171,
+          26.04779,
+          -2.04512,
+          0.05723,
+          -16.18505,
+          2.96769,
+          -0.11460,
+          343.79227,
+          -36.75109,
+          0.97961,
+          4.00010,
+          12.99995,
+          17.50004,
+          -37.630}  // n45_035_040
+     },
+     {
+         {0.0516,
+          24.34674,
+          -7.87709,
+          0.37804,
+          282.50534,
+          -150.57143,
+          27.66784,
+          -2.10759,
+          0.05707,
+          339.87830,
+          -45.95683,
+          1.52710,
+          -107.54557,
+          12.88849,
+          -0.36115,
+          4.50005,
+          13.00010,
+          17.99990,
+          -27.185},  // n45_075_000
+         {0.0504,
+          28.34387,
+          -8.77552,
+          0.39341,
+          272.40631,
+          -145.91614,
+          26.96898,
+          -2.06394,
+          0.05607,
+          247.39044,
+          -33.70679,
+          1.12984,
+          -172.82640,
+          19.71150,
+          -0.54088,
+          4.50001,
+          12.99999,
+          17.99990,
+          -29.936},  // n45_075_005
+         {0.0493,
+          28.58276,
+          -8.74982,
+          0.32508,
+          245.57239,
+          -132.78421,
+          24.61257,
+          -1.88289,
+          0.05102,
+          208.86082,
+          -29.06264,
+          0.99613,
+          27.88273,
+          -1.83100,
+          0.03098,
+          4.49995,
+          13.00010,
+          17.49990,
+          -30.681},  // n45_075_010
+         {0.0467,
+          32.95806,
+          -9.22834,
+          0.21091,
+          141.83414,
+          -77.67659,
+          14.26616,
+          -1.06239,
+          0.02763,
+          -152.14319,
+          18.28754,
+          -0.54282,
+          -432.47064,
+          46.42408,
+          -1.24075,
+          4.50004,
+          14.99996,
+          17.99998,
+          -36.152},  // n45_075_020
+         {0.0419,
+          35.31950,
+          -8.90751,
+          -0.13073,
+          248.74876,
+          -143.95366,
+          28.25199,
+          -2.29551,
+          0.06640,
+          -85.96542,
+          12.64282,
+          -0.45169,
+          1490.03564,
+          -169.05728,
+          4.78326,
+          3.50010,
+          12.50004,
+          16.99996,
+          -42.091}  // n45_075_040
+     }},
+    {{
+         {0.0544,
+          12.02829,
+          -7.40015,
+          1.30379,
+          43.37532,
+          -26.39556,
+          5.35578,
+          -0.43884,
+          0.01260,
+          145.46245,
+          -20.74179,
+          0.72371,
+          -140.69408,
+          15.17467,
+          -0.39886,
+          3.00010,
+          12.00006,
+          17.00006,
+          -13.091},  // n30_000_000
+         {0.0544,
+          12.17225,
+          -7.41092,
+          1.24452,
+          32.49359,
+          -19.72482,
+          3.96512,
+          -0.31761,
+          0.00877,
+          137.65800,
+          -19.71537,
+          0.69510,
+          -84.40689,
+          9.18351,
+          -0.24364,
+          2.99992,
+          13.00002,
+          15.99992,
+          -11.877},  // n30_000_005
+         {0.0535,
+          10.09782,
+          -3.48335,
+          0.09858,
+          24.06240,
+          -14.90732,
+          3.01716,
+          -0.23947,
+          0.00647,
+          -78.47299,
+          8.89017,
+          -0.24701,
+          -498.49789,
+          52.10888,
+          -1.35749,
+          2.79994,
+          15.79993,
+          18.80009,
+          -13.025},  // n30_000_010
+         {0.0521,
+          12.48625,
+          -5.57940,
+          0.52129,
+          19.99268,
+          -12.06886,
+          2.35090,
+          -0.18104,
+          0.00478,
+          -42.83843,
+          4.99808,
+          -0.14358,
+          -932.24323,
+          97.14581,
+          -2.52863,
+          2.80009,
+          15.80007,
+          18.79990,
+          -13.967},  // n30_000_020
+         {0.0486,
+          16.90578,
+          -7.81519,
+          0.81126,
+          -54.68472,
+          22.78378,
+          -3.43191,
+          0.22412,
+          -0.00534,
+          -0.96960,
+          0.00000,
+          0.00000,
+          270.55811,
+          -31.58020,
+          0.91311,
+          4.99990,
+          15.99992,
+          16.00006,
+          -17.944}  // n30_000_040
+     },
+     {
+         {0.0546,
+          10.50846,
+          -5.29561,
+          0.73587,
+          35.61295,
+          -21.81653,
+          4.44775,
+          -0.36190,
+          0.01016,
+          125.11208,
+          -17.72876,
+          0.61527,
+          -252.87012,
+          27.83852,
+          -0.75726,
+          2.99996,
+          13.00005,
+          16.99991,
+          -11.891},  // n30_010_000
+         {0.0538,
+          13.82166,
+          -8.41836,
+          1.46693,
+          41.42838,
+          -24.67595,
+          4.89261,
+          -0.39061,
+          0.01088,
+          101.84756,
+          -14.59387,
+          0.51187,
+          -102.60970,
+          11.58532,
+          -0.32062,
+          2.99992,
+          12.00010,
+          17.00002,
+          -12.726},  // n30_010_005
+         {0.0533,
+          10.02378,
+          -4.18202,
+          0.35273,
+          23.17132,
+          -14.38326,
+          2.92480,
+          -0.23425,
+          0.00640,
+          -9.74465,
+          1.03864,
+          -0.02399,
+          101.14448,
+          -9.56073,
+          0.22607,
+          2.79997,
+          15.79990,
+          18.80007,
+          -13.029},  // n30_010_010
+         {0.0514,
+          16.85991,
+          -10.01705,
+          1.59953,
+          35.87551,
+          -22.16305,
+          4.58261,
+          -0.38245,
+          0.01112,
+          22.04525,
+          -3.36521,
+          0.12388,
+          -28.07022,
+          3.47386,
+          -0.10500,
+          2.99990,
+          12.00008,
+          17.00006,
+          -15.106},  // n30_010_020
+         {0.0484,
+          17.64043,
+          -8.23605,
+          0.86634,
+          -65.37102,
+          27.61690,
+          -4.17907,
+          0.27086,
+          -0.00636,
+          -0.71597,
+          0.00000,
+          0.00000,
+          110.49440,
+          -12.61240,
+          0.35386,
+          4.99992,
+          15.99990,
+          16.00010,
+          -18.301}  // n30_010_040
+     },
+     {
+         {0.0542,
+          10.61119,
+          -4.81186,
+          0.47728,
+          25.39100,
+          -15.49208,
+          3.09400,
+          -0.24304,
+          0.00650,
+          -129.38751,
+          13.97083,
+          -0.36772,
+          310.84363,
+          -30.34959,
+          0.74419,
+          3.79998,
+          15.80009,
+          18.79992,
+          -12.328},  // n30_020_000
+         {0.0537,
+          9.45552,
+          -4.40769,
+          0.56877,
+          26.91584,
+          -16.39761,
+          3.30689,
+          -0.26415,
+          0.00721,
+          -49.32124,
+          5.45733,
+          -0.14527,
+          132.94531,
+          -12.97332,
+          0.31939,
+          2.79990,
+          15.79990,
+          18.80001,
+          -12.595},  // n30_020_005
+         {0.0526,
+          11.95296,
+          -5.51446,
+          0.68167,
+          39.21638,
+          -23.69438,
+          4.77174,
+          -0.38544,
+          0.01078,
+          45.19357,
+          -6.78626,
+          0.24607,
+          -48.77351,
+          5.52608,
+          -0.15304,
+          3.00009,
+          12.99993,
+          17.00009,
+          -14.151},  // n30_020_010
+         {0.0516,
+          10.71178,
+          -3.57908,
+          0.02521,
+          18.29098,
+          -11.27427,
+          2.27489,
+          -0.18095,
+          0.00491,
+          -53.40305,
+          6.39828,
+          -0.18888,
+          -265.34558,
+          28.02021,
+          -0.73933,
+          2.80008,
+          15.79990,
+          18.79991,
+          -15.068},  // n30_020_020
+         {0.0480,
+          19.84383,
+          -11.91102,
+          2.13543,
+          55.65884,
+          -37.20134,
+          8.45703,
+          -0.79769,
+          0.02683,
+          -40.83831,
+          6.56598,
+          -0.25411,
+          78.84777,
+          -9.64567,
+          0.28815,
+          2.60000,
+          10.60000,
+          16.60000,
+          -18.767}  // n30_020_040
+     },
+     {
+         {0.0538,
+          9.77490,
+          -4.19736,
+          0.39676,
+          34.10266,
+          -21.31430,
+          4.38286,
+          -0.35806,
+          0.01007,
+          123.15682,
+          -17.61632,
+          0.61873,
+          -90.73568,
+          10.27755,
+          -0.28197,
+          3.00009,
+          12.99996,
+          17.00002,
+          -12.478},  // n30_035_000
+         {0.0528,
+          12.71873,
+          -6.05552,
+          0.71727,
+          24.37415,
+          -14.84087,
+          2.97935,
+          -0.23613,
+          0.00638,
+          -71.85704,
+          7.87551,
+          -0.21014,
+          154.82376,
+          -15.24096,
+          0.37810,
+          2.80001,
+          15.79999,
+          18.80010,
+          -13.818},  // n30_035_005
+         {0.0523,
+          12.70250,
+          -6.14688,
+          0.70107,
+          21.59659,
+          -13.49774,
+          2.76834,
+          -0.22298,
+          0.00611,
+          -30.30122,
+          3.69126,
+          -0.10883,
+          -569.66058,
+          58.89044,
+          -1.51892,
+          2.79993,
+          15.80006,
+          18.79990,
+          -14.093},  // n30_035_010
+         {0.0506,
+          14.95800,
+          -7.41055,
+          0.94875,
+          36.21025,
+          -22.22674,
+          4.56376,
+          -0.37880,
+          0.01097,
+          -3.42937,
+          0.41517,
+          -0.01354,
+          -10.90930,
+          1.10235,
+          -0.02727,
+          2.99994,
+          12.99993,
+          16.00010,
+          -15.801},  // n30_035_020
+         {0.0476,
+          15.20345,
+          -6.35598,
+          0.58291,
+          51.63944,
+          -34.20549,
+          7.71758,
+          -0.72357,
+          0.02425,
+          -33.85521,
+          5.63837,
+          -0.22500,
+          123.52173,
+          -15.07774,
+          0.45050,
+          2.79991,
+          10.80002,
+          16.79990,
+          -19.019}  // n30_035_040
+     },
+     {
+         {0.0516,
+          12.97644,
+          -7.65767,
+          1.25358,
+          25.26432,
+          -15.73275,
+          3.25373,
+          -0.26458,
+          0.00731,
+          -133.77692,
+          15.32261,
+          -0.43018,
+          -433.24936,
+          46.14915,
+          -1.22258,
+          2.80008,
+          15.79990,
+          18.80009,
+          -14.341},  // n30_075_000
+         {0.0510,
+          15.37631,
+          -8.94591,
+          1.41497,
+          43.32719,
+          -27.41883,
+          5.83498,
+          -0.50094,
+          0.01498,
+          74.70872,
+          -11.11151,
+          0.40330,
+          -19.07158,
+          2.89428,
+          -0.09607,
+          2.99995,
+          11.99994,
+          17.00009,
+          -14.871},  // n30_075_005
+         {0.0503,
+          14.27279,
+          -6.31985,
+          0.58991,
+          27.02040,
+          -17.00821,
+          3.53459,
+          -0.29061,
+          0.00817,
+          -82.97021,
+          9.88717,
+          -0.29015,
+          5.42775,
+          -0.23209,
+          -0.00080,
+          2.99997,
+          14.99992,
+          18.00004,
+          -15.635},  // n30_075_010
+         {0.0489,
+          15.62591,
+          -6.95156,
+          0.68369,
+          -34.81164,
+          12.47115,
+          -1.49043,
+          0.07155,
+          -0.00115,
+          -571.62305,
+          70.96561,
+          -2.19960,
+          -27.58549,
+          3.09197,
+          -0.08708,
+          4.79991,
+          15.80000,
+          16.80008,
+          -17.303},  // n30_075_020
+         {0.0454,
+          20.81723,
+          -9.64598,
+          1.02340,
+          -100.56699,
+          45.18776,
+          -7.29277,
+          0.50381,
+          -0.01257,
+          277.65717,
+          -32.89027,
+          0.96029,
+          -0.59399,
+          0.00000,
+          0.00000,
+          4.99990,
+          15.00006,
+          19.00008,
+          -21.800}  // n30_075_040
+     }},
+    {{
+         {0.0544,
+          5.15583,
+          -4.70408,
+          1.07790,
+          9.20580,
+          -5.71742,
+          1.16416,
+          -0.09314,
+          0.00253,
+          -25.96579,
+          2.55128,
+          -0.05759,
+          135.86987,
+          -13.61908,
+          0.34400,
+          2.79997,
+          14.80001,
+          18.59992,
+          -7.037},  // n15_000_000
+         {0.0545,
+          2.72086,
+          -2.44420,
+          0.53150,
+          8.34304,
+          -5.54141,
+          1.24046,
+          -0.11054,
+          0.00337,
+          16.37812,
+          -2.49669,
+          0.09179,
+          -118.29626,
+          13.14874,
+          -0.36252,
+          2.99990,
+          13.00010,
+          16.99993,
+          -5.821},  // n15_000_005
+         {0.0542,
+          7.04427,
+          -6.04255,
+          1.25814,
+          1.42384,
+          -1.11609,
+          0.28499,
+          -0.02717,
+          0.00085,
+          33.17001,
+          -4.19362,
+          0.13213,
+          328.73511,
+          -33.51883,
+          0.85442,
+          2.79993,
+          14.80010,
+          18.60006,
+          -6.113},  // n15_000_010
+         {0.0535,
+          5.12398,
+          -3.89514,
+          0.76766,
+          4.77615,
+          -2.86220,
+          0.54986,
+          -0.04103,
+          0.00104,
+          19.59106,
+          -2.56051,
+          0.08173,
+          -4.91891,
+          0.71080,
+          -0.02330,
+          2.79990,
+          14.79996,
+          18.60001,
+          -6.314},  // n15_000_020
+         {0.0515,
+          7.68969,
+          -5.24261,
+          0.90644,
+          -1.58864,
+          1.39165,
+          -0.37362,
+          0.03690,
+          -0.00117,
+          135.29031,
+          -16.05836,
+          0.47038,
+          1411.35645,
+          -149.59120,
+          3.96109,
+          2.79992,
+          14.80009,
+          18.59993,
+          -8.225}  // n15_000_040
+     },
+     {
+         {0.0547,
+          4.95313,
+          -4.23139,
+          0.89194,
+          4.96015,
+          -3.42971,
+          0.78409,
+          -0.06992,
+          0.00209,
+          -36.60931,
+          4.16215,
+          -0.11561,
+          -304.73657,
+          32.21627,
+          -0.84887,
+          2.79990,
+          14.79990,
+          18.60010,
+          -5.642},  // n15_010_000
+         {0.0544,
+          5.82981,
+          -4.71911,
+          0.95993,
+          2.12498,
+          -1.31817,
+          0.27326,
+          -0.02128,
+          0.00054,
+          -54.23685,
+          6.21635,
+          -0.17618,
+          -150.26959,
+          15.80998,
+          -0.41438,
+          2.80007,
+          14.79991,
+          18.59998,
+          -5.992},  // n15_010_005
+         {0.0536,
+          6.49502,
+          -3.79257,
+          0.67160,
+          3.45038,
+          -1.63639,
+          0.38074,
+          -0.03547,
+          0.00108,
+          -21.40683,
+          2.47712,
+          -0.07186,
+          96.90859,
+          -9.85733,
+          0.24929,
+          2.80009,
+          14.80005,
+          18.60005,
+          -7.900},  // n15_010_010
+         {0.0530,
+          5.59734,
+          -3.51634,
+          0.56247,
+          5.12685,
+          -3.27172,
+          0.69464,
+          -0.05906,
+          0.00175,
+          0.81910,
+          0.00483,
+          -0.00422,
+          89.50581,
+          -10.01878,
+          0.27853,
+          2.99994,
+          13.00004,
+          17.00010,
+          -6.915},  // n15_010_020
+         {0.0512,
+          8.89250,
+          -6.53871,
+          1.21522,
+          0.14898,
+          -0.04314,
+          0.02908,
+          -0.00803,
+          0.00051,
+          -12.78912,
+          2.48673,
+          -0.10846,
+          -286.44650,
+          28.79558,
+          -0.72277,
+          2.80008,
+          12.79991,
+          17.79990,
+          -8.735}  // n15_010_040
+     },
+     {
+         {0.0542,
+          5.15909,
+          -4.45618,
+          0.97589,
+          7.92727,
+          -5.01963,
+          1.04355,
+          -0.08496,
+          0.00234,
+          -32.56310,
+          3.36885,
+          -0.08303,
+          -229.57448,
+          24.70668,
+          -0.66076,
+          2.79992,
+          14.80007,
+          18.60006,
+          -6.189},  // n15_020_000
+         {0.0541,
+          5.20920,
+          -3.93600,
+          0.74711,
+          2.56127,
+          -1.95993,
+          0.50566,
+          -0.04967,
+          0.00160,
+          -25.76940,
+          3.05973,
+          -0.08870,
+          14.04008,
+          -0.72793,
+          -0.00014,
+          2.80010,
+          14.80000,
+          18.60007,
+          -6.059},  // n15_020_005
+         {0.0534,
+          5.79195,
+          -4.37132,
+          0.85893,
+          3.70324,
+          -2.22071,
+          0.45012,
+          -0.03585,
+          0.00096,
+          -47.66541,
+          5.54301,
+          -0.15947,
+          -18.43453,
+          1.93889,
+          -0.05019,
+          2.80008,
+          14.80010,
+          18.59996,
+          -6.913},  // n15_020_010
+         {0.0531,
+          6.43553,
+          -4.70297,
+          0.87794,
+          3.68327,
+          -2.37621,
+          0.51006,
+          -0.04359,
+          0.00128,
+          30.71634,
+          -3.68416,
+          0.10945,
+          -509.76675,
+          53.55701,
+          -1.40576,
+          2.80002,
+          14.80003,
+          18.60006,
+          -7.086},  // n15_020_020
+         {0.0508,
+          9.11012,
+          -7.09825,
+          1.45455,
+          4.66057,
+          -2.45429,
+          0.46939,
+          -0.04189,
+          0.00145,
+          -39.55202,
+          6.29214,
+          -0.24184,
+          37.30247,
+          -5.06056,
+          0.16162,
+          2.79990,
+          12.79990,
+          16.80010,
+          -8.997}  // n15_020_040
+     },
+     {
+         {0.0537,
+          6.40691,
+          -5.49193,
+          1.16838,
+          5.57856,
+          -3.67899,
+          0.80202,
+          -0.06814,
+          0.00195,
+          -46.95383,
+          5.43495,
+          -0.15458,
+          -451.53543,
+          47.17558,
+          -1.22925,
+          2.79991,
+          14.79991,
+          18.60010,
+          -6.487},  // n15_035_000
+         {0.0532,
+          6.14548,
+          -4.58795,
+          0.86695,
+          4.89932,
+          -3.27508,
+          0.71204,
+          -0.06016,
+          0.00171,
+          -44.25770,
+          5.21435,
+          -0.15199,
+          3.61357,
+          -0.34367,
+          0.00845,
+          2.80003,
+          14.80004,
+          18.60001,
+          -6.989},  // n15_035_005
+         {0.0532,
+          5.89561,
+          -5.09059,
+          1.10119,
+          5.41174,
+          -3.42880,
+          0.72989,
+          -0.06247,
+          0.00184,
+          7.81991,
+          -0.92149,
+          0.02809,
+          180.41719,
+          -18.32281,
+          0.46475,
+          2.79991,
+          14.80009,
+          18.60009,
+          -6.735},  // n15_035_010
+         {0.0521,
+          6.64698,
+          -4.27610,
+          0.67890,
+          3.10066,
+          -2.01044,
+          0.40558,
+          -0.03231,
+          0.00089,
+          34.00752,
+          -3.95576,
+          0.11220,
+          -412.73959,
+          43.10798,
+          -1.12679,
+          2.79992,
+          14.79995,
+          18.60007,
+          -7.747},  // n15_035_020
+         {0.0504,
+          11.07455,
+          -7.72291,
+          1.30333,
+          -4.79900,
+          3.42508,
+          -0.79738,
+          0.07117,
+          -0.00211,
+          48.61763,
+          -6.24639,
+          0.19083,
+          -103.75107,
+          9.44356,
+          -0.21184,
+          3.59990,
+          16.59990,
+          18.40009,
+          -9.247}  // n15_035_040
+     },
+     {
+         {0.0518,
+          6.57869,
+          -4.78600,
+          0.86715,
+          2.58534,
+          -2.02494,
+          0.52075,
+          -0.05119,
+          0.00166,
+          -13.07997,
+          1.62109,
+          -0.04827,
+          75.01424,
+          -7.38827,
+          0.18147,
+          2.79993,
+          14.80010,
+          18.59990,
+          -7.488},  // n15_075_000
+         {0.0515,
+          7.56311,
+          -5.77572,
+          1.12582,
+          3.74138,
+          -2.46266,
+          0.55779,
+          -0.04984,
+          0.00151,
+          -27.80692,
+          3.40043,
+          -0.10174,
+          -367.20175,
+          38.79574,
+          -1.02370,
+          2.79998,
+          14.79990,
+          18.60006,
+          -7.753},  // n15_075_005
+         {0.0510,
+          7.35396,
+          -5.51035,
+          1.02783,
+          2.01886,
+          -1.50637,
+          0.36287,
+          -0.03298,
+          0.00100,
+          -14.75043,
+          1.78729,
+          -0.05314,
+          63.01197,
+          -6.35469,
+          0.15982,
+          2.79990,
+          14.80009,
+          18.59990,
+          -8.146},  // n15_075_010
+         {0.0505,
+          6.73393,
+          -4.39475,
+          0.64563,
+          -3.93495,
+          2.06476,
+          -0.37202,
+          0.02751,
+          -0.00071,
+          -19.33320,
+          2.73622,
+          -0.09443,
+          135.14197,
+          -15.02469,
+          0.41394,
+          2.80010,
+          14.80000,
+          18.60008,
+          -8.474},  // n15_075_020
+         {0.0482,
+          10.48373,
+          -7.22014,
+          1.23274,
+          -3.24592,
+          1.86890,
+          -0.28628,
+          0.00727,
+          0.00048,
+          -60.63380,
+          9.71823,
+          -0.37682,
+          251.41760,
+          -29.21386,
+          0.83723,
+          2.80007,
+          12.80009,
+          15.79999,
+          -10.835}  // n15_075_040
+     }},
+    {{
+         {0.0543,
+          5.31433,
+          -5.76899,
+          1.44590,
+          6.44555,
+          -3.66946,
+          0.67856,
+          -0.04847,
+          0.00113,
+          13.23424,
+          -2.07025,
+          0.07750,
+          -3.80756,
+          0.39704,
+          -0.00898,
+          2.79990,
+          12.79991,
+          16.79995,
+          -6.167},  // n10_000_000
+         {0.0545,
+          2.80214,
+          -1.85750,
+          0.32210,
+          7.05960,
+          -4.72284,
+          1.06601,
+          -0.09623,
+          0.00298,
+          -1.46244,
+          -0.00068,
+          0.00630,
+          -1.31243,
+          0.10888,
+          -0.00066,
+          2.99990,
+          13.00009,
+          17.00004,
+          -4.979},  // n10_000_005
+         {0.0543,
+          4.69283,
+          -4.74218,
+          1.11056,
+          2.25137,
+          -1.58655,
+          0.39614,
+          -0.04000,
+          0.00138,
+          0.13713,
+          0.00265,
+          -0.00080,
+          -77.28876,
+          8.65255,
+          -0.24135,
+          2.80009,
+          12.80006,
+          16.80010,
+          -5.181},  // n10_000_010
+         {0.0537,
+          3.71591,
+          -2.68610,
+          0.51265,
+          1.55431,
+          -0.56102,
+          0.04067,
+          0.00180,
+          -0.00018,
+          -3.25513,
+          0.37977,
+          -0.01031,
+          46.62582,
+          -4.91344,
+          0.12845,
+          2.99990,
+          12.99990,
+          16.99993,
+          -5.466},  // n10_000_020
+         {0.0523,
+          8.53341,
+          -8.51434,
+          2.10704,
+          2.89123,
+          -1.30142,
+          0.20912,
+          -0.01773,
+          0.00067,
+          -8.35565,
+          1.62414,
+          -0.06996,
+          321.09369,
+          -36.31496,
+          1.01997,
+          2.60009,
+          12.59997,
+          16.60007,
+          -6.632}  // n10_000_040
+     },
+     {
+         {0.0548,
+          4.06744,
+          -4.35233,
+          1.04407,
+          2.71573,
+          -1.78713,
+          0.38714,
+          -0.03383,
+          0.00101,
+          23.53139,
+          -3.55742,
+          0.13136,
+          0.24132,
+          0.21412,
+          -0.01062,
+          2.80006,
+          12.79990,
+          16.79990,
+          -4.311},  // n10_010_000
+         {0.0545,
+          5.03551,
+          -4.90304,
+          1.14041,
+          -1.24835,
+          1.36558,
+          -0.41541,
+          0.04732,
+          -0.00178,
+          9.57684,
+          -1.53951,
+          0.05917,
+          58.66669,
+          -6.43043,
+          0.17637,
+          2.79990,
+          12.80010,
+          16.79990,
+          -5.087},  // n10_010_005
+         {0.0542,
+          3.46245,
+          -3.21186,
+          0.74255,
+          5.08009,
+          -3.36450,
+          0.77901,
+          -0.07410,
+          0.00245,
+          10.14345,
+          -1.43950,
+          0.05093,
+          19.25351,
+          -2.03230,
+          0.05394,
+          2.80006,
+          12.79992,
+          16.80010,
+          -5.171},  // n10_010_010
+         {0.0534,
+          3.15748,
+          -2.18161,
+          0.38901,
+          1.71296,
+          -0.94781,
+          0.16103,
+          -0.01087,
+          0.00026,
+          3.85353,
+          -0.51340,
+          0.01709,
+          61.33098,
+          -6.79149,
+          0.18714,
+          2.80010,
+          12.80009,
+          16.79996,
+          -5.619},  // n10_010_020
+         {0.0520,
+          8.35032,
+          -6.84816,
+          1.32655,
+          -3.47044,
+          2.83625,
+          -0.59091,
+          0.04170,
+          -0.00082,
+          -31.26133,
+          5.01397,
+          -0.19426,
+          -142.61188,
+          16.05372,
+          -0.45521,
+          3.59990,
+          12.59994,
+          16.59991,
+          -6.840}  // n10_010_040
+     },
+     {
+         {0.0542,
+          4.60591,
+          -4.23038,
+          0.95123,
+          3.29486,
+          -1.96391,
+          0.38595,
+          -0.02958,
+          0.00075,
+          21.45546,
+          -3.24843,
+          0.11924,
+          1.68004,
+          0.00070,
+          -0.00410,
+          2.79990,
+          12.80010,
+          16.80010,
+          -5.157},  // n10_020_000
+         {0.0542,
+          4.99825,
+          -4.92871,
+          1.16714,
+          6.59206,
+          -4.44758,
+          1.04350,
+          -0.09880,
+          0.00321,
+          -3.77429,
+          0.26928,
+          -0.00098,
+          -25.37696,
+          2.96633,
+          -0.08498,
+          2.79990,
+          12.79990,
+          16.79995,
+          -5.165},  // n10_020_005
+         {0.0537,
+          4.51838,
+          -3.89387,
+          0.84966,
+          3.18585,
+          -1.90323,
+          0.39493,
+          -0.03359,
+          0.00099,
+          -0.76826,
+          0.02198,
+          0.00150,
+          -10.82031,
+          1.09152,
+          -0.02655,
+          2.79994,
+          12.79999,
+          16.80001,
+          -5.735},  // n10_020_010
+         {0.0534,
+          4.95005,
+          -3.71635,
+          0.70869,
+          1.64530,
+          -1.01881,
+          0.21855,
+          -0.02041,
+          0.00069,
+          3.63433,
+          -0.50524,
+          0.01775,
+          57.82526,
+          -6.41205,
+          0.17734,
+          2.79997,
+          12.80007,
+          16.80003,
+          -5.786},  // n10_020_020
+         {0.0516,
+          7.14246,
+          -5.86699,
+          1.18521,
+          -4.74809,
+          3.52733,
+          -0.82383,
+          0.07262,
+          -0.00212,
+          -81.65875,
+          12.07768,
+          -0.44058,
+          -22.08574,
+          1.86005,
+          -0.03905,
+          3.00003,
+          13.00006,
+          16.40005,
+          -7.131}  // n10_020_040
+     },
+     {
+         {0.0537,
+          4.29139,
+          -3.82248,
+          0.83470,
+          3.28732,
+          -2.21447,
+          0.50615,
+          -0.04601,
+          0.00142,
+          7.79420,
+          -1.32820,
+          0.05377,
+          2.25977,
+          -0.08850,
+          -0.00041,
+          2.79992,
+          12.80009,
+          16.79993,
+          -5.408},  // n10_035_000
+         {0.0534,
+          4.85414,
+          -4.58254,
+          1.07052,
+          3.93412,
+          -2.31881,
+          0.48792,
+          -0.04236,
+          0.00128,
+          -1.73573,
+          0.12168,
+          -0.00001,
+          28.81659,
+          -3.12377,
+          0.08492,
+          2.79990,
+          12.80006,
+          16.79990,
+          -5.819},  // n10_035_005
+         {0.0534,
+          4.84886,
+          -3.83682,
+          0.78937,
+          4.80844,
+          -3.17207,
+          0.73710,
+          -0.07092,
+          0.00237,
+          -3.22681,
+          0.36733,
+          -0.00948,
+          -0.62177,
+          0.17712,
+          -0.00739,
+          2.80000,
+          12.79996,
+          16.79995,
+          -5.602},  // n10_035_010
+         {0.0526,
+          6.44918,
+          -5.98697,
+          1.38022,
+          3.87839,
+          -1.88362,
+          0.28585,
+          -0.01621,
+          0.00028,
+          -18.93701,
+          2.71133,
+          -0.09629,
+          -50.20261,
+          5.46946,
+          -0.14969,
+          2.79990,
+          12.80007,
+          16.79991,
+          -6.356},  // n10_035_020
+         {0.0511,
+          4.88408,
+          -2.61896,
+          0.32138,
+          -7.98858,
+          5.39548,
+          -1.20880,
+          0.10569,
+          -0.00312,
+          -21.55942,
+          3.74262,
+          -0.15474,
+          211.87878,
+          -24.57761,
+          0.70341,
+          3.00009,
+          12.99996,
+          15.99998,
+          -7.572}  // n10_035_040
+     },
+     {
+         {0.0519,
+          5.85053,
+          -5.30637,
+          1.14670,
+          2.48510,
+          -1.94073,
+          0.49985,
+          -0.04955,
+          0.00163,
+          -11.93217,
+          1.32390,
+          -0.03362,
+          36.70197,
+          -3.76405,
+          0.09692,
+          2.79990,
+          12.79992,
+          16.79990,
+          -6.318},  // n10_075_000
+         {0.0516,
+          8.14939,
+          -7.54269,
+          1.70262,
+          3.64994,
+          -2.18582,
+          0.47011,
+          -0.04174,
+          0.00129,
+          -21.54301,
+          2.87521,
+          -0.09473,
+          -36.17973,
+          4.08269,
+          -0.11475,
+          2.79992,
+          12.79990,
+          16.79990,
+          -6.828},  // n10_075_005
+         {0.0512,
+          4.27975,
+          -3.29716,
+          0.65427,
+          3.20534,
+          -2.14230,
+          0.50056,
+          -0.04794,
+          0.00160,
+          -4.39993,
+          0.65871,
+          -0.02395,
+          -28.33160,
+          3.18199,
+          -0.08935,
+          2.79990,
+          12.79995,
+          16.79991,
+          -6.920},  // n10_075_010
+         {0.0508,
+          6.18226,
+          -4.87602,
+          0.98338,
+          0.65737,
+          -0.22400,
+          0.04406,
+          -0.00734,
+          0.00040,
+          -10.79803,
+          1.67484,
+          -0.06248,
+          28.25488,
+          -2.92017,
+          0.07266,
+          2.80006,
+          12.79990,
+          16.80005,
+          -7.296},  // n10_075_020
+         {0.0489,
+          9.33675,
+          -6.63393,
+          1.14675,
+          -11.92019,
+          7.28760,
+          -1.43136,
+          0.10688,
+          -0.00259,
+          -49.72197,
+          7.75946,
+          -0.29509,
+          255.75706,
+          -29.24851,
+          0.82573,
+          3.59991,
+          12.59990,
+          16.59992,
+          -9.291}  // n10_075_040
+     }},
+    {{
+         {0.0543,
+          3.52395,
+          -3.63040,
+          0.89249,
+          3.51265,
+          -1.96893,
+          0.36939,
+          -0.02623,
+          0.00059,
+          -0.99400,
+          -0.05350,
+          0.00740,
+          -10.79336,
+          1.16854,
+          -0.03062,
+          2.79994,
+          12.79995,
+          16.79990,
+          -5.738},  // n05_000_000
+         {0.0546,
+          3.76873,
+          -4.20799,
+          1.03985,
+          -0.16890,
+          0.35091,
+          -0.12331,
+          0.01496,
+          -0.00060,
+          -1.11111,
+          -0.03797,
+          0.00661,
+          -90.40871,
+          9.86148,
+          -0.26625,
+          2.79990,
+          12.79992,
+          16.79998,
+          -4.283},  // n05_000_005
+         {0.0546,
+          3.30270,
+          -3.34261,
+          0.77505,
+          -0.75751,
+          0.37468,
+          -0.02595,
+          -0.00400,
+          0.00032,
+          7.87401,
+          -1.19774,
+          0.04470,
+          0.56358,
+          0.05046,
+          -0.00370,
+          2.79993,
+          12.80009,
+          16.80004,
+          -4.403},  // n05_000_010
+         {0.0541,
+          3.47970,
+          -3.79418,
+          0.91147,
+          -1.02923,
+          0.79414,
+          -0.20341,
+          0.02024,
+          -0.00069,
+          -6.30273,
+          0.81141,
+          -0.02580,
+          4.45289,
+          -0.52484,
+          0.01563,
+          2.79990,
+          12.80000,
+          16.80001,
+          -4.530},  // n05_000_020
+         {0.0529,
+          5.48741,
+          -5.11403,
+          1.21818,
+          1.77252,
+          -0.19757,
+          -0.10172,
+          0.01488,
+          -0.00049,
+          -17.26815,
+          2.70783,
+          -0.10225,
+          187.30664,
+          -21.08027,
+          0.58888,
+          2.79990,
+          12.80001,
+          16.79992,
+          -5.662}  // n05_000_040
+     },
+     {
+         {0.0545,
+          3.90405,
+          -3.84382,
+          0.84744,
+          -1.61055,
+          0.74095,
+          -0.09128,
+          0.00137,
+          0.00011,
+          -2.29756,
+          -0.00023,
+          0.00671,
+          -40.90726,
+          4.72474,
+          -0.13774,
+          2.80010,
+          12.80009,
+          16.79993,
+          -4.346},  // n05_010_000
+         {0.0547,
+          4.15091,
+          -4.40477,
+          1.04243,
+          2.87282,
+          -1.37036,
+          0.20973,
+          -0.01313,
+          0.00029,
+          33.03365,
+          -4.61881,
+          0.15964,
+          94.07873,
+          -10.33107,
+          0.28442,
+          2.99993,
+          13.00010,
+          16.99991,
+          -4.089},  // n05_010_005
+         {0.0543,
+          3.63330,
+          -3.76174,
+          0.89524,
+          0.12283,
+          0.00008,
+          0.00335,
+          -0.00159,
+          0.00007,
+          -3.30342,
+          0.21604,
+          -0.00090,
+          -11.64955,
+          1.52367,
+          -0.04917,
+          2.79993,
+          12.79990,
+          16.79992,
+          -4.477},  // n05_010_010
+         {0.0538,
+          3.39387,
+          -3.24534,
+          0.78020,
+          2.27773,
+          -1.00549,
+          0.14543,
+          -0.00863,
+          0.00017,
+          -23.20937,
+          3.11838,
+          -0.10375,
+          3.32732,
+          -0.44284,
+          0.01421,
+          2.79993,
+          12.80007,
+          16.80010,
+          -4.974},  // n05_010_020
+         {0.0528,
+          9.82555,
+          -12.01304,
+          3.41696,
+          1.59046,
+          -0.61731,
+          0.14104,
+          -0.02013,
+          0.00099,
+          -11.84331,
+          2.13296,
+          -0.08775,
+          -94.00870,
+          10.66124,
+          -0.30427,
+          2.39996,
+          12.80002,
+          16.80005,
+          -5.828}  // n05_010_040
+     },
+     {
+         {0.0541,
+          3.82167,
+          -3.82514,
+          0.89331,
+          3.49704,
+          -1.93244,
+          0.39105,
+          -0.03397,
+          0.00104,
+          25.34212,
+          -3.55576,
+          0.12087,
+          1.28510,
+          -0.08738,
+          0.00009,
+          3.00010,
+          13.00007,
+          16.99991,
+          -4.729},  // n05_020_000
+         {0.0543,
+          3.64420,
+          -3.65454,
+          0.83720,
+          -1.48764,
+          0.93548,
+          -0.18427,
+          0.01425,
+          -0.00040,
+          -4.89646,
+          0.33175,
+          0.00000,
+          3.88087,
+          -0.14858,
+          -0.00251,
+          2.79999,
+          12.80009,
+          16.80010,
+          -4.573},  // n05_020_005
+         {0.0540,
+          3.87984,
+          -3.98142,
+          0.92178,
+          -2.91226,
+          2.03763,
+          -0.47256,
+          0.04352,
+          -0.00138,
+          15.29778,
+          -2.19560,
+          0.07770,
+          -31.72825,
+          3.58404,
+          -0.09971,
+          2.79998,
+          12.79990,
+          16.80010,
+          -4.738},  // n05_020_010
+         {0.0538,
+          4.06595,
+          -4.31760,
+          1.06015,
+          2.40211,
+          -1.37919,
+          0.29324,
+          -0.02774,
+          0.00094,
+          -2.17193,
+          0.20292,
+          -0.00348,
+          31.48715,
+          -3.39075,
+          0.09118,
+          2.79997,
+          12.79991,
+          16.79999,
+          -4.848},  // n05_020_020
+         {0.0523,
+          6.42028,
+          -7.71858,
+          2.57858,
+          3.93713,
+          -2.79519,
+          0.76109,
+          -0.09091,
+          0.00381,
+          -15.75499,
+          2.42475,
+          -0.09114,
+          636.79877,
+          -68.72087,
+          1.84803,
+          1.80003,
+          10.80000,
+          18.40010,
+          -6.175}  // n05_020_040
+     },
+     {
+         {0.0537,
+          3.01635,
+          -2.75036,
+          0.61407,
+          1.09268,
+          -0.54231,
+          0.08258,
+          -0.00429,
+          0.00003,
+          -15.88831,
+          2.00380,
+          -0.06220,
+          -26.85873,
+          2.99003,
+          -0.08203,
+          2.79990,
+          12.80009,
+          16.80004,
+          -4.877},  // n05_035_000
+         {0.0535,
+          3.28088,
+          -2.98657,
+          0.64691,
+          0.81601,
+          -0.33281,
+          0.04347,
+          -0.00260,
+          0.00006,
+          -4.51525,
+          0.51724,
+          -0.01402,
+          -39.71747,
+          4.40580,
+          -0.12095,
+          3.00009,
+          13.00003,
+          16.99999,
+          -5.199},  // n05_035_005
+         {0.0536,
+          3.10208,
+          -2.59025,
+          0.54351,
+          1.27989,
+          -0.87976,
+          0.22317,
+          -0.02301,
+          0.00080,
+          -8.05347,
+          1.05794,
+          -0.03407,
+          0.03963,
+          0.04140,
+          -0.00224,
+          2.79993,
+          12.80010,
+          16.80010,
+          -5.099},  // n05_035_010
+         {0.0530,
+          3.88474,
+          -4.01258,
+          0.97961,
+          2.76926,
+          -1.44551,
+          0.25304,
+          -0.01850,
+          0.00049,
+          -8.54036,
+          1.26181,
+          -0.04583,
+          -53.43386,
+          5.83363,
+          -0.15890,
+          2.80001,
+          12.80009,
+          16.79990,
+          -5.450},  // n05_035_020
+         {0.0519,
+          5.56229,
+          -5.00309,
+          1.15739,
+          4.15868,
+          -2.21568,
+          0.45798,
+          -0.04698,
+          0.00184,
+          -30.84895,
+          4.71621,
+          -0.17612,
+          173.01314,
+          -19.56656,
+          0.54698,
+          2.79991,
+          10.79992,
+          16.80010,
+          -6.392}  // n05_035_040
+     },
+     {
+         {0.0518,
+          5.52023,
+          -4.93440,
+          1.05227,
+          -0.15830,
+          0.05088,
+          0.05749,
+          -0.01425,
+          0.00074,
+          -10.92503,
+          1.48823,
+          -0.04880,
+          30.94530,
+          -3.29152,
+          0.08749,
+          2.99990,
+          12.99991,
+          16.99994,
+          -6.054},  // n05_075_000
+         {0.0517,
+          4.12817,
+          -3.37719,
+          0.67768,
+          -0.90127,
+          0.61424,
+          -0.11345,
+          0.00680,
+          -0.00010,
+          -13.06180,
+          1.73825,
+          -0.05695,
+          47.99504,
+          -5.27710,
+          0.14445,
+          2.99995,
+          12.99991,
+          17.00003,
+          -5.913},  // n05_075_005
+         {0.0514,
+          8.89363,
+          -11.78030,
+          3.61852,
+          0.40479,
+          -0.00175,
+          0.03539,
+          -0.00872,
+          0.00046,
+          1.46465,
+          0.00010,
+          -0.00644,
+          -0.42764,
+          -0.13628,
+          0.00813,
+          2.19990,
+          13.00010,
+          16.99990,
+          -6.432},  // n05_075_010
+         {0.0514,
+          5.81492,
+          -5.65047,
+          1.28300,
+          -0.12733,
+          0.08589,
+          -0.00155,
+          -0.00276,
+          0.00020,
+          -43.73930,
+          6.10746,
+          -0.20896,
+          -101.13957,
+          11.19796,
+          -0.30859,
+          2.80009,
+          12.79991,
+          16.79992,
+          -6.138},  // n05_075_020
+         {0.0498,
+          7.09559,
+          -4.98614,
+          0.87509,
+          -4.37041,
+          2.51690,
+          -0.37104,
+          0.00864,
+          0.00061,
+          -42.02439,
+          6.66953,
+          -0.25537,
+          148.40695,
+          -17.13779,
+          0.48860,
+          2.80010,
+          12.79991,
+          15.80009,
+          -7.891}  // n05_075_040
+     }},
+    {{
+         {0.0543,
+          3.76799,
+          -3.79645,
+          0.90153,
+          -0.36069,
+          0.80581,
+          -0.32382,
+          0.04398,
+          -0.00190,
+          9.79637,
+          -1.48921,
+          0.05549,
+          19.28946,
+          -2.03789,
+          0.05452,
+          2.79990,
+          10.79991,
+          16.80009,
+          -5.404},  // p00_000_000
+         {0.0546,
+          3.82106,
+          -4.81566,
+          1.29179,
+          5.41929,
+          -3.19906,
+          0.64556,
+          -0.05210,
+          0.00139,
+          -0.81829,
+          -0.04402,
+          0.00683,
+          24.48976,
+          -2.58636,
+          0.06849,
+          2.80010,
+          10.79992,
+          16.79990,
+          -4.073},  // p00_000_005
+         {0.0548,
+          2.59458,
+          -3.11658,
+          0.76319,
+          -2.47920,
+          1.42871,
+          -0.26598,
+          0.02061,
+          -0.00060,
+          6.94846,
+          -1.20938,
+          0.05033,
+          -16.15617,
+          2.19575,
+          -0.07049,
+          2.79998,
+          10.79990,
+          16.79990,
+          -3.843},  // p00_000_010
+         {0.0545,
+          3.75406,
+          -4.15496,
+          1.00047,
+          2.21270,
+          -1.00560,
+          0.14494,
+          -0.00810,
+          0.00014,
+          -3.44034,
+          0.42174,
+          -0.01233,
+          -76.68801,
+          8.37637,
+          -0.22680,
+          2.99990,
+          12.99998,
+          16.99990,
+          -4.030},  // p00_000_020
+         {0.0536,
+          4.88338,
+          -4.18911,
+          1.01147,
+          0.22740,
+          0.90668,
+          -0.27666,
+          0.02379,
+          -0.00058,
+          -15.95048,
+          2.40404,
+          -0.08744,
+          189.58817,
+          -21.30053,
+          0.59530,
+          2.79992,
+          10.80001,
+          16.80006,
+          -5.686}  // p00_000_040
+     },
+     {
+         {0.0546,
+          3.44645,
+          -3.45838,
+          0.81590,
+          2.18456,
+          -1.38198,
+          0.30328,
+          -0.02639,
+          0.00075,
+          8.21530,
+          -1.42017,
+          0.05814,
+          91.35162,
+          -9.60887,
+          0.25100,
+          2.80010,
+          10.80005,
+          16.79996,
+          -4.220},  // p00_010_000
+         {0.0548,
+          2.75028,
+          -2.68273,
+          0.61177,
+          -0.57933,
+          0.91382,
+          -0.38003,
+          0.05400,
+          -0.00245,
+          3.24628,
+          -0.61262,
+          0.02645,
+          -2.09549,
+          0.21266,
+          -0.00375,
+          2.80009,
+          10.80010,
+          16.79997,
+          -3.653},  // p00_010_005
+         {0.0546,
+          2.70611,
+          -3.34802,
+          0.88092,
+          4.40942,
+          -3.10474,
+          0.78174,
+          -0.08153,
+          0.00297,
+          1.09646,
+          -0.28915,
+          0.01555,
+          -2.05598,
+          0.45305,
+          -0.01746,
+          2.79990,
+          10.79991,
+          16.79991,
+          -4.038},  // p00_010_010
+         {0.0543,
+          3.25394,
+          -3.33658,
+          0.81489,
+          -2.84847,
+          2.58124,
+          -0.70980,
+          0.07537,
+          -0.00274,
+          0.24704,
+          -0.07807,
+          0.00436,
+          -97.48288,
+          10.60200,
+          -0.28509,
+          2.79999,
+          10.79996,
+          16.79991,
+          -4.177},  // p00_010_020
+         {0.0534,
+          5.51633,
+          -5.47922,
+          1.32827,
+          3.23522,
+          -1.98395,
+          0.53711,
+          -0.06763,
+          0.00295,
+          -12.64715,
+          1.78651,
+          -0.06177,
+          142.89133,
+          -15.78519,
+          0.43307,
+          2.79993,
+          10.79996,
+          16.80002,
+          -5.303}  // p00_010_040
+     },
+     {
+         {0.0543,
+          3.83509,
+          -4.50681,
+          1.14988,
+          -1.81414,
+          2.01830,
+          -0.66458,
+          0.08274,
+          -0.00345,
+          -0.75361,
+          0.04758,
+          -0.00006,
+          -30.74572,
+          3.22642,
+          -0.08301,
+          2.79999,
+          10.79997,
+          16.79990,
+          -4.182},  // p00_020_000
+         {0.0544,
+          3.72419,
+          -3.75085,
+          0.89331,
+          5.06850,
+          -3.61323,
+          0.90860,
+          -0.09357,
+          0.00333,
+          -2.47935,
+          0.17367,
+          0.00000,
+          -38.44076,
+          4.33291,
+          -0.12016,
+          2.79998,
+          10.80010,
+          16.79994,
+          -4.274},  // p00_020_005
+         {0.0541,
+          3.60098,
+          -4.08631,
+          1.02594,
+          0.38653,
+          0.00000,
+          -0.04602,
+          0.00957,
+          -0.00054,
+          6.90171,
+          -1.19481,
+          0.04906,
+          33.38736,
+          -3.52823,
+          0.09411,
+          2.79990,
+          10.80003,
+          16.79991,
+          -4.431},  // p00_020_010
+         {0.0542,
+          4.35829,
+          -4.48529,
+          1.09419,
+          -0.35691,
+          0.74460,
+          -0.23642,
+          0.02550,
+          -0.00092,
+          -0.46932,
+          -0.00004,
+          0.00219,
+          -74.86735,
+          8.26935,
+          -0.22643,
+          2.80010,
+          10.79993,
+          16.79992,
+          -4.387},  // p00_020_020
+         {0.0531,
+          4.75210,
+          -5.06107,
+          1.27805,
+          6.00138,
+          -3.80203,
+          0.91453,
+          -0.09835,
+          0.00381,
+          -17.96639,
+          2.64675,
+          -0.09498,
+          -12.06511,
+          1.13330,
+          -0.02580,
+          2.79990,
+          10.79990,
+          16.79990,
+          -5.121}  // p00_020_040
+     },
+     {
+         {0.0537,
+          4.53583,
+          -5.01609,
+          1.24148,
+          -0.20410,
+          0.48658,
+          -0.17332,
+          0.02196,
+          -0.00094,
+          -0.65554,
+          -0.00069,
+          0.00305,
+          -12.91353,
+          1.42730,
+          -0.03852,
+          2.79991,
+          10.80007,
+          16.79990,
+          -4.717},  // p00_035_000
+         {0.0536,
+          3.27927,
+          -3.53667,
+          0.85289,
+          -2.45949,
+          1.99823,
+          -0.53911,
+          0.05891,
+          -0.00226,
+          2.14069,
+          -0.44621,
+          0.02037,
+          0.89235,
+          0.04147,
+          -0.00423,
+          2.79999,
+          10.79995,
+          16.79990,
+          -4.785},  // p00_035_005
+         {0.0538,
+          3.56528,
+          -3.72096,
+          0.89163,
+          1.62636,
+          -1.18726,
+          0.32579,
+          -0.03669,
+          0.00140,
+          -4.88346,
+          0.62603,
+          -0.01912,
+          -49.13002,
+          5.52842,
+          -0.15416,
+          2.79990,
+          10.80009,
+          16.79993,
+          -4.555},  // p00_035_010
+         {0.0535,
+          4.32451,
+          -4.03719,
+          0.91759,
+          4.90756,
+          -3.44341,
+          0.85696,
+          -0.09010,
+          0.00338,
+          -1.68175,
+          0.30318,
+          -0.01274,
+          -35.38565,
+          3.75842,
+          -0.09899,
+          2.79995,
+          10.79994,
+          16.80010,
+          -4.869},  // p00_035_020
+         {0.0526,
+          6.10928,
+          -5.52450,
+          1.30919,
+          1.72007,
+          -0.30570,
+          0.01722,
+          -0.00541,
+          0.00039,
+          -31.95194,
+          4.69680,
+          -0.16974,
+          154.33820,
+          -17.43290,
+          0.48747,
+          2.79990,
+          10.80010,
+          16.80002,
+          -5.917}  // p00_035_040
+     },
+     {
+         {0.0518,
+          4.80158,
+          -4.99797,
+          1.15695,
+          -0.48634,
+          0.01350,
+          0.07747,
+          -0.01460,
+          0.00064,
+          -14.23129,
+          1.90494,
+          -0.06282,
+          -16.16497,
+          1.90240,
+          -0.05581,
+          2.79992,
+          10.80005,
+          16.80008,
+          -5.555},  // p00_075_000
+         {0.0518,
+          6.09790,
+          -6.13402,
+          1.46244,
+          4.00057,
+          -2.84777,
+          0.78122,
+          -0.09052,
+          0.00364,
+          -1.12694,
+          0.09193,
+          -0.00017,
+          25.41941,
+          -2.71645,
+          0.07294,
+          2.80001,
+          10.79992,
+          16.79990,
+          -5.715},  // p00_075_005
+         {0.0517,
+          5.15090,
+          -5.19541,
+          1.23944,
+          -0.20110,
+          0.63034,
+          -0.22759,
+          0.02784,
+          -0.00114,
+          -8.28137,
+          1.15878,
+          -0.03946,
+          -56.81646,
+          6.38595,
+          -0.17863,
+          2.79990,
+          10.80004,
+          16.79990,
+          -5.648},  // p00_075_010
+         {0.0517,
+          4.57055,
+          -4.44359,
+          1.05180,
+          -1.40135,
+          1.49769,
+          -0.41303,
+          0.04130,
+          -0.00140,
+          -7.77098,
+          1.04314,
+          -0.03377,
+          -3.15739,
+          0.59889,
+          -0.02368,
+          2.79993,
+          10.80010,
+          16.79990,
+          -5.631},  // p00_075_020
+         {0.0506,
+          6.53860,
+          -4.96034,
+          0.92868,
+          -8.50805,
+          5.26425,
+          -1.00181,
+          0.06905,
+          -0.00144,
+          -53.81376,
+          7.69174,
+          -0.26679,
+          322.08820,
+          -35.44020,
+          0.96969,
+          2.99999,
+          13.00008,
+          16.99994,
+          -6.746}  // p00_075_040
+     }},
+    {{
+         {0.0543,
+          3.20236,
+          -3.06598,
+          0.72444,
+          0.40048,
+          0.18377,
+          -0.12531,
+          0.01896,
+          -0.00084,
+          11.71295,
+          -1.75476,
+          0.06411,
+          4.85250,
+          -0.44279,
+          0.01032,
+          2.79993,
+          10.80010,
+          16.80005,
+          -5.750},  // p05_000_000
+         {0.0547,
+          3.86949,
+          -4.25660,
+          1.08794,
+          6.13220,
+          -3.82570,
+          0.84391,
+          -0.07816,
+          0.00260,
+          12.91564,
+          -2.03192,
+          0.07826,
+          56.09587,
+          -5.97003,
+          0.15968,
+          2.79990,
+          10.79990,
+          16.80010,
+          -4.142},  // p05_000_005
+         {0.0550,
+          1.83797,
+          -1.70884,
+          0.36424,
+          0.50697,
+          -0.49066,
+          0.14896,
+          -0.01588,
+          0.00053,
+          -8.21327,
+          0.82283,
+          -0.01767,
+          -0.40389,
+          0.33499,
+          -0.01599,
+          3.00007,
+          13.00008,
+          16.99991,
+          -4.101},  // p05_000_010
+         {0.0548,
+          2.16141,
+          -2.61393,
+          0.68679,
+          0.94387,
+          -0.11163,
+          -0.10725,
+          0.02326,
+          -0.00121,
+          14.30174,
+          -2.24025,
+          0.08527,
+          -17.96364,
+          2.12023,
+          -0.05996,
+          2.79991,
+          10.80004,
+          16.80010,
+          -4.006},  // p05_000_020
+         {0.0545,
+          3.68494,
+          -3.86856,
+          0.98901,
+          4.15157,
+          -2.17274,
+          0.42476,
+          -0.04018,
+          0.00147,
+          -1.34507,
+          0.02086,
+          0.00673,
+          15.56388,
+          -1.64565,
+          0.04602,
+          2.79990,
+          10.79992,
+          16.79993,
+          -4.467}  // p05_000_040
+     },
+     {
+         {0.0547,
+          2.58980,
+          -2.76951,
+          0.63926,
+          -2.57033,
+          1.51632,
+          -0.30619,
+          0.02928,
+          -0.00115,
+          -3.06252,
+          0.24585,
+          -0.00207,
+          -63.37688,
+          7.17805,
+          -0.20101,
+          2.80008,
+          10.80010,
+          16.80010,
+          -4.346},  // p05_010_000
+         {0.0548,
+          4.90806,
+          -5.07148,
+          1.20918,
+          3.73549,
+          -1.67154,
+          0.24451,
+          -0.01339,
+          0.00020,
+          21.84240,
+          -3.29400,
+          0.12173,
+          95.69867,
+          -10.18625,
+          0.27160,
+          2.99990,
+          13.00009,
+          16.99992,
+          -4.195},  // p05_010_005
+         {0.0547,
+          2.40467,
+          -2.58903,
+          0.62992,
+          -0.56719,
+          0.54459,
+          -0.16120,
+          0.02099,
+          -0.00099,
+          1.54622,
+          -0.42685,
+          0.02201,
+          -0.50269,
+          0.34417,
+          -0.01662,
+          2.79993,
+          10.80007,
+          16.79994,
+          -4.294},  // p05_010_010
+         {0.0546,
+          2.77709,
+          -2.98777,
+          0.75694,
+          4.87724,
+          -3.10782,
+          0.69867,
+          -0.06568,
+          0.00219,
+          4.65089,
+          -0.78246,
+          0.03173,
+          -139.27916,
+          15.43570,
+          -0.42368,
+          2.80010,
+          10.79996,
+          16.80010,
+          -4.389},  // p05_010_020
+         {0.0543,
+          2.95071,
+          -2.98128,
+          0.71601,
+          -0.14464,
+          0.11727,
+          0.03743,
+          -0.01438,
+          0.00090,
+          -1.32565,
+          -0.04086,
+          0.01138,
+          536.00171,
+          -57.13625,
+          1.52309,
+          2.79992,
+          10.80009,
+          17.80006,
+          -4.562}  // p05_010_040
+     },
+     {
+         {0.0543,
+          4.02597,
+          -4.21252,
+          1.02828,
+          -0.17343,
+          0.69087,
+          -0.27893,
+          0.03721,
+          -0.00160,
+          4.08064,
+          -0.69074,
+          0.02782,
+          -0.97485,
+          -0.00007,
+          0.00462,
+          2.80005,
+          10.80007,
+          16.80010,
+          -4.523},  // p05_020_000
+         {0.0545,
+          3.38196,
+          -3.13275,
+          0.68453,
+          -1.13411,
+          0.52841,
+          -0.04159,
+          -0.00258,
+          0.00023,
+          3.44952,
+          -0.67711,
+          0.02995,
+          24.96747,
+          -2.54510,
+          0.06490,
+          2.80001,
+          10.79998,
+          16.80003,
+          -4.479},  // p05_020_005
+         {0.0543,
+          3.75787,
+          -3.54792,
+          0.82019,
+          4.81413,
+          -3.26644,
+          0.78085,
+          -0.07765,
+          0.00274,
+          12.18999,
+          -1.89030,
+          0.07116,
+          -40.52675,
+          4.51477,
+          -0.12332,
+          2.79995,
+          10.79996,
+          16.79991,
+          -4.519},  // p05_020_010
+         {0.0546,
+          4.23149,
+          -4.63446,
+          1.16135,
+          0.87792,
+          -0.31076,
+          0.06533,
+          -0.00842,
+          0.00040,
+          9.18120,
+          -1.47974,
+          0.05832,
+          -2.95420,
+          0.47588,
+          -0.01508,
+          2.79993,
+          10.79991,
+          16.80009,
+          -4.469},  // p05_020_020
+         {0.0539,
+          2.93939,
+          -2.70202,
+          0.65254,
+          1.08548,
+          -0.22783,
+          0.00916,
+          -0.00178,
+          0.00015,
+          18.54346,
+          -2.86941,
+          0.11101,
+          181.68613,
+          -19.85721,
+          0.54416,
+          2.79992,
+          12.79992,
+          16.79992,
+          -4.805}  // p05_020_040
+     },
+     {
+         {0.0537,
+          5.37485,
+          -5.09690,
+          1.11559,
+          0.09981,
+          -0.00991,
+          0.01123,
+          -0.00199,
+          0.00009,
+          4.87962,
+          -0.77397,
+          0.03026,
+          45.53274,
+          -4.89593,
+          0.13206,
+          2.99990,
+          13.00007,
+          16.99992,
+          -5.034},  // p05_035_000
+         {0.0537,
+          2.75395,
+          -2.81804,
+          0.69482,
+          3.29961,
+          -2.21512,
+          0.55936,
+          -0.05964,
+          0.00223,
+          6.86265,
+          -1.14848,
+          0.04638,
+          22.48904,
+          -2.32044,
+          0.06077,
+          2.79990,
+          10.80010,
+          16.80000,
+          -4.849},  // p05_035_005
+         {0.0540,
+          3.05963,
+          -2.91645,
+          0.67651,
+          4.79621,
+          -3.36434,
+          0.82088,
+          -0.08130,
+          0.00277,
+          -1.26532,
+          -0.00003,
+          0.00653,
+          55.81568,
+          -6.03851,
+          0.16372,
+          2.79992,
+          10.79991,
+          16.79995,
+          -4.610},  // p05_035_010
+         {0.0539,
+          4.50273,
+          -4.47464,
+          1.04658,
+          2.40997,
+          -0.95976,
+          0.12542,
+          -0.00623,
+          0.00008,
+          12.66042,
+          -1.94269,
+          0.07334,
+          46.26167,
+          -4.86763,
+          0.12912,
+          2.99990,
+          12.99990,
+          17.00006,
+          -4.607},  // p05_035_020
+         {0.0534,
+          3.46352,
+          -2.71784,
+          0.61065,
+          4.49239,
+          -2.46297,
+          0.51111,
+          -0.04854,
+          0.00169,
+          -3.15886,
+          0.30690,
+          -0.00384,
+          177.58841,
+          -19.38068,
+          0.52764,
+          2.80009,
+          12.79990,
+          16.79999,
+          -5.299}  // p05_035_040
+     },
+     {
+         {0.0518,
+          4.13331,
+          -3.86000,
+          0.86326,
+          2.42719,
+          -1.93170,
+          0.54085,
+          -0.05904,
+          0.00213,
+          -11.14144,
+          1.45630,
+          -0.04617,
+          -0.54484,
+          0.23793,
+          -0.01119,
+          2.80007,
+          10.80009,
+          16.79990,
+          -5.993},  // p05_075_000
+         {0.0519,
+          4.70055,
+          -4.32619,
+          0.96433,
+          3.33259,
+          -2.47838,
+          0.65984,
+          -0.07234,
+          0.00275,
+          5.63716,
+          -0.97334,
+          0.04057,
+          45.18773,
+          -4.59013,
+          0.11573,
+          2.79995,
+          10.80009,
+          16.79992,
+          -5.805},  // p05_075_005
+         {0.0518,
+          4.39903,
+          -4.01056,
+          0.93724,
+          5.60386,
+          -3.45739,
+          0.77267,
+          -0.07374,
+          0.00253,
+          5.16848,
+          -0.88884,
+          0.03682,
+          37.69211,
+          -3.91721,
+          0.10185,
+          2.80004,
+          10.79998,
+          16.80005,
+          -5.986},  // p05_075_010
+         {0.0520,
+          5.11761,
+          -5.05555,
+          1.18823,
+          5.51935,
+          -2.98553,
+          0.59399,
+          -0.05167,
+          0.00162,
+          -10.69337,
+          1.31076,
+          -0.03832,
+          62.00644,
+          -6.58853,
+          0.17479,
+          2.99990,
+          12.99990,
+          17.00003,
+          -5.744},  // p05_075_020
+         {0.0514,
+          3.82005,
+          -3.17396,
+          0.65537,
+          -4.48834,
+          2.82946,
+          -0.50317,
+          0.02763,
+          -0.00026,
+          -64.93736,
+          8.85430,
+          -0.29397,
+          177.10834,
+          -19.47346,
+          0.53484,
+          2.99991,
+          12.99991,
+          17.00010,
+          -6.002}  // p05_075_040
+     }},
+    {{
+         {0.0543,
+          4.61255,
+          -4.47335,
+          1.08066,
+          7.81198,
+          -4.69806,
+          0.95467,
+          -0.07838,
+          0.00224,
+          29.20573,
+          -4.13587,
+          0.14425,
+          -22.36250,
+          2.42590,
+          -0.06362,
+          2.79990,
+          12.79995,
+          16.80010,
+          -6.241},  // p10_000_000
+         {0.0549,
+          3.81120,
+          -5.03492,
+          1.28912,
+          2.65849,
+          -1.66231,
+          0.27149,
+          -0.01465,
+          0.00015,
+          22.30671,
+          -3.55454,
+          0.13656,
+          1.43494,
+          0.00007,
+          -0.00107,
+          2.79999,
+          12.80008,
+          16.79990,
+          -3.819},  // p10_000_005
+         {0.0552,
+          3.76955,
+          -3.61290,
+          0.80350,
+          0.92407,
+          -0.76737,
+          0.19330,
+          -0.01649,
+          0.00039,
+          -7.66726,
+          0.42662,
+          0.00538,
+          -18.31787,
+          2.29378,
+          -0.06803,
+          2.80008,
+          12.79990,
+          16.80010,
+          -4.244},  // p10_000_010
+         {0.0551,
+          2.59243,
+          -2.77429,
+          0.67012,
+          1.51560,
+          -0.95600,
+          0.19363,
+          -0.01336,
+          0.00024,
+          30.96554,
+          -4.76593,
+          0.17906,
+          17.16256,
+          -1.42566,
+          0.02914,
+          2.79990,
+          12.79991,
+          16.80010,
+          -4.520},  // p10_000_020
+         {0.0553,
+          4.79851,
+          -5.41729,
+          1.41378,
+          3.43541,
+          -1.57203,
+          0.27185,
+          -0.02253,
+          0.00071,
+          21.51097,
+          -3.53675,
+          0.14236,
+          51.79659,
+          -5.41250,
+          0.14671,
+          2.79990,
+          12.79991,
+          16.79993,
+          -4.308}  // p10_000_040
+     },
+     {
+         {0.0547,
+          3.46481,
+          -2.87026,
+          0.61625,
+          7.36747,
+          -5.06461,
+          1.18415,
+          -0.11060,
+          0.00353,
+          5.35887,
+          -1.07249,
+          0.04778,
+          34.95335,
+          -3.64082,
+          0.09580,
+          2.80008,
+          12.79990,
+          16.79990,
+          -4.922},  // p10_010_000
+         {0.0550,
+          4.69969,
+          -4.31429,
+          0.97579,
+          2.12514,
+          -1.08621,
+          0.17380,
+          -0.00800,
+          -0.00002,
+          25.99059,
+          -3.89979,
+          0.14298,
+          -8.16072,
+          1.04312,
+          -0.03023,
+          2.79994,
+          12.80010,
+          16.80007,
+          -4.667},  // p10_010_005
+         {0.0550,
+          3.99941,
+          -4.23272,
+          1.02992,
+          5.08114,
+          -3.36968,
+          0.75881,
+          -0.06849,
+          0.00212,
+          27.76900,
+          -4.09722,
+          0.14862,
+          -14.14435,
+          1.69047,
+          -0.04738,
+          2.79990,
+          12.80000,
+          16.79990,
+          -4.383},  // p10_010_010
+         {0.0552,
+          3.15235,
+          -3.00832,
+          0.66198,
+          3.94565,
+          -2.53519,
+          0.53845,
+          -0.04446,
+          0.00123,
+          33.05710,
+          -5.04188,
+          0.18862,
+          -20.42994,
+          2.64234,
+          -0.07832,
+          2.99994,
+          12.99998,
+          17.00009,
+          -4.038},  // p10_010_020
+         {0.0551,
+          3.28645,
+          -3.91935,
+          1.03975,
+          4.55043,
+          -2.75666,
+          0.60502,
+          -0.05555,
+          0.00176,
+          25.34828,
+          -4.27963,
+          0.17518,
+          79.00926,
+          -8.15489,
+          0.21573,
+          2.80010,
+          12.80008,
+          16.80010,
+          -4.428}  // p10_010_040
+     },
+     {
+         {0.0543,
+          4.87086,
+          -4.84372,
+          1.18281,
+          2.04073,
+          -1.03475,
+          0.15456,
+          -0.00697,
+          0.00000,
+          13.90032,
+          -2.19623,
+          0.08345,
+          -34.24716,
+          3.88468,
+          -0.10765,
+          2.59990,
+          12.99994,
+          16.99996,
+          -5.013},  // p10_020_000
+         {0.0546,
+          2.86437,
+          -2.78814,
+          0.65623,
+          2.72769,
+          -1.77484,
+          0.40658,
+          -0.03702,
+          0.00113,
+          17.45303,
+          -2.89654,
+          0.11513,
+          22.80558,
+          -2.06406,
+          0.04661,
+          2.79992,
+          12.80004,
+          16.80009,
+          -4.892},  // p10_020_005
+         {0.0546,
+          3.59562,
+          -4.19797,
+          1.10386,
+          5.76635,
+          -3.34477,
+          0.65744,
+          -0.05232,
+          0.00144,
+          31.33425,
+          -4.68104,
+          0.17197,
+          29.80136,
+          -3.04004,
+          0.07973,
+          2.79992,
+          12.80007,
+          16.80006,
+          -4.748},  // p10_020_010
+         {0.0550,
+          2.37871,
+          -1.89158,
+          0.36492,
+          2.62634,
+          -2.01068,
+          0.50965,
+          -0.04877,
+          0.00153,
+          -7.12011,
+          0.43067,
+          0.00398,
+          -19.83286,
+          2.36679,
+          -0.06592,
+          2.99993,
+          13.00010,
+          16.99991,
+          -4.425},  // p10_020_020
+         {0.0548,
+          3.90142,
+          -4.16391,
+          1.04337,
+          6.39498,
+          -4.20534,
+          0.98066,
+          -0.09481,
+          0.00318,
+          48.52671,
+          -7.22254,
+          0.26706,
+          36.18306,
+          -3.72209,
+          0.10244,
+          2.80009,
+          12.79993,
+          16.80006,
+          -4.416}  // p10_020_040
+     },
+     {
+         {0.0538,
+          4.49764,
+          -4.68410,
+          1.10591,
+          1.05590,
+          -0.73158,
+          0.17723,
+          -0.01728,
+          0.00056,
+          0.19885,
+          -0.21392,
+          0.01325,
+          -34.62253,
+          3.86451,
+          -0.10613,
+          2.79990,
+          12.80008,
+          16.79991,
+          -5.141},  // p10_035_000
+         {0.0538,
+          5.01613,
+          -4.60918,
+          1.00224,
+          1.73770,
+          -1.41499,
+          0.37564,
+          -0.03781,
+          0.00126,
+          13.08375,
+          -2.09309,
+          0.08115,
+          1.91464,
+          0.00191,
+          -0.00398,
+          2.79996,
+          12.79997,
+          16.80010,
+          -5.393},  // p10_035_005
+         {0.0542,
+          4.65886,
+          -4.30014,
+          0.94893,
+          -0.48479,
+          0.43129,
+          -0.12090,
+          0.01465,
+          -0.00063,
+          -16.81617,
+          1.93515,
+          -0.05374,
+          -26.51077,
+          3.01264,
+          -0.08353,
+          2.79993,
+          12.80009,
+          16.79994,
+          -5.024},  // p10_035_010
+         {0.0543,
+          1.65049,
+          -1.97893,
+          0.51725,
+          2.53607,
+          -1.49595,
+          0.28551,
+          -0.02046,
+          0.00045,
+          12.51428,
+          -2.11664,
+          0.08557,
+          -23.64483,
+          2.74093,
+          -0.07546,
+          2.79990,
+          12.79991,
+          16.80006,
+          -4.830},  // p10_035_020
+         {0.0544,
+          3.37819,
+          -3.39199,
+          0.79922,
+          -0.27506,
+          0.22007,
+          -0.01246,
+          -0.00559,
+          0.00042,
+          34.90525,
+          -5.21147,
+          0.19470,
+          106.87849,
+          -11.34946,
+          0.30505,
+          2.80008,
+          12.79990,
+          16.79999,
+          -4.670}  // p10_035_040
+     },
+     {
+         {0.0518,
+          8.05245,
+          -7.68090,
+          1.71684,
+          0.20151,
+          -0.44682,
+          0.20302,
+          -0.02753,
+          0.00111,
+          -7.95962,
+          0.84128,
+          -0.01892,
+          25.57248,
+          -2.43510,
+          0.05729,
+          2.79990,
+          12.79990,
+          16.80007,
+          -6.525},  // p10_075_000
+         {0.0520,
+          8.30465,
+          -8.03651,
+          1.84952,
+          2.88947,
+          -1.83047,
+          0.42855,
+          -0.04121,
+          0.00136,
+          -4.21482,
+          0.34233,
+          -0.00294,
+          -18.93556,
+          2.26961,
+          -0.06550,
+          2.80007,
+          12.79996,
+          16.79990,
+          -6.353},  // p10_075_005
+         {0.0521,
+          5.82454,
+          -5.49265,
+          1.26068,
+          3.77310,
+          -2.33061,
+          0.50881,
+          -0.04523,
+          0.00139,
+          8.76934,
+          -1.50125,
+          0.06171,
+          32.65368,
+          -3.43916,
+          0.09243,
+          2.79995,
+          12.79991,
+          16.79991,
+          -6.096},  // p10_075_010
+         {0.0524,
+          6.52483,
+          -6.76609,
+          1.64758,
+          4.43848,
+          -2.59053,
+          0.53965,
+          -0.04552,
+          0.00130,
+          -27.81909,
+          3.26964,
+          -0.09104,
+          57.14166,
+          -5.92876,
+          0.15547,
+          2.79990,
+          12.80007,
+          16.79991,
+          -5.892},  // p10_075_020
+         {0.0522,
+          4.72587,
+          -6.37174,
+          1.78114,
+          7.31014,
+          -4.48617,
+          1.04331,
+          -0.10511,
+          0.00370,
+          -12.52113,
+          1.09512,
+          -0.01058,
+          57.02774,
+          -5.68329,
+          0.14648,
+          2.79990,
+          12.79991,
+          16.80009,
+          -5.997}  // p10_075_040
+     }},
+    {{
+         {0.0539,
+          6.75967,
+          -2.97628,
+          0.42284,
+          14.29705,
+          -7.32112,
+          1.43944,
+          -0.11640,
+          0.00326,
+          57.60227,
+          -8.05949,
+          0.27747,
+          -85.84425,
+          9.70984,
+          -0.27198,
+          3.80002,
+          12.79995,
+          16.80010,
+          -9.471},  // p15_000_000
+         {0.0548,
+          3.28645,
+          -1.88083,
+          0.25488,
+          14.96242,
+          -9.04928,
+          1.85074,
+          -0.15300,
+          0.00439,
+          20.61109,
+          -3.19294,
+          0.11955,
+          -84.98413,
+          9.55607,
+          -0.26519,
+          3.79991,
+          12.79994,
+          16.79993,
+          -5.783},  // p15_000_005
+         {0.0554,
+          -4.26924,
+          6.40241,
+          -1.80375,
+          3.83559,
+          -3.45490,
+          0.90539,
+          -0.08711,
+          0.00274,
+          30.29626,
+          -4.87601,
+          0.18930,
+          -4.18640,
+          0.96561,
+          -0.03624,
+          2.79990,
+          12.79997,
+          16.80010,
+          -5.333},  // p15_000_010
+         {0.0557,
+          2.54956,
+          -2.72439,
+          0.58392,
+          7.71558,
+          -5.22553,
+          1.08578,
+          -0.08798,
+          0.00242,
+          52.54388,
+          -7.81094,
+          0.28497,
+          -110.35490,
+          12.51210,
+          -0.34684,
+          3.00005,
+          12.99993,
+          16.99991,
+          -4.335},  // p15_000_020
+         {0.0561,
+          3.11770,
+          -2.67604,
+          0.64175,
+          7.67093,
+          -4.52628,
+          0.91930,
+          -0.07680,
+          0.00223,
+          52.55859,
+          -8.13716,
+          0.31026,
+          -134.55896,
+          15.23328,
+          -0.41786,
+          2.79990,
+          12.80003,
+          16.80010,
+          -4.681}  // p15_000_040
+     },
+     {
+         {0.0548,
+          2.85752,
+          -1.94411,
+          0.29406,
+          -6.92030,
+          3.46253,
+          -0.61157,
+          0.04739,
+          -0.00139,
+          30.04456,
+          -4.65055,
+          0.17505,
+          1.22831,
+          0.19239,
+          -0.01112,
+          3.80010,
+          12.80005,
+          16.79991,
+          -5.765},  // p15_010_000
+         {0.0554,
+          3.93566,
+          -3.88181,
+          0.67483,
+          4.16404,
+          -3.25206,
+          0.67740,
+          -0.05392,
+          0.00144,
+          29.83762,
+          -4.70534,
+          0.17978,
+          2.48750,
+          0.00001,
+          -0.00340,
+          3.79990,
+          12.79996,
+          16.79990,
+          -4.222},  // p15_010_005
+         {0.0553,
+          4.14466,
+          -4.70643,
+          1.05916,
+          4.96554,
+          -4.03322,
+          0.92178,
+          -0.08086,
+          0.00238,
+          19.84434,
+          -3.32640,
+          0.13081,
+          -93.14327,
+          10.10124,
+          -0.26813,
+          2.80009,
+          12.80010,
+          16.79997,
+          -4.343},  // p15_010_010
+         {0.0555,
+          3.51818,
+          -2.67466,
+          0.54255,
+          7.13151,
+          -4.50687,
+          0.93075,
+          -0.07529,
+          0.00205,
+          56.95231,
+          -8.48881,
+          0.30988,
+          -141.52164,
+          15.89914,
+          -0.43858,
+          2.79991,
+          12.79990,
+          16.79991,
+          -5.084},  // p15_010_020
+         {0.0559,
+          3.89499,
+          -3.95543,
+          0.95578,
+          5.84340,
+          -3.80372,
+          0.85051,
+          -0.07724,
+          0.00240,
+          29.29273,
+          -4.86435,
+          0.19527,
+          -239.00053,
+          26.69204,
+          -0.73250,
+          2.80002,
+          12.80000,
+          16.79997,
+          -4.948}  // p15_010_040
+     },
+     {
+         {0.0542,
+          7.45577,
+          -5.47708,
+          0.93871,
+          11.13320,
+          -6.32428,
+          1.25250,
+          -0.10197,
+          0.00291,
+          47.82215,
+          -6.88771,
+          0.24350,
+          0.99839,
+          0.02577,
+          -0.00212,
+          3.80006,
+          12.79992,
+          16.80009,
+          -6.331},  // p15_020_000
+         {0.0547,
+          5.46306,
+          -3.97193,
+          0.66786,
+          7.51414,
+          -4.87473,
+          1.09206,
+          -0.09787,
+          0.00299,
+          23.81616,
+          -3.79773,
+          0.14630,
+          -16.69421,
+          2.13227,
+          -0.06315,
+          3.79990,
+          12.79991,
+          16.79990,
+          -5.899},  // p15_020_005
+         {0.0548,
+          3.49234,
+          -2.71455,
+          0.57572,
+          9.53674,
+          -6.12139,
+          1.30414,
+          -0.10978,
+          0.00315,
+          50.74908,
+          -7.50880,
+          0.27236,
+          1.99712,
+          0.00424,
+          -0.00211,
+          2.79998,
+          12.80010,
+          16.79992,
+          -5.738},  // p15_020_010
+         {0.0552,
+          5.91344,
+          -5.47834,
+          1.25894,
+          9.82249,
+          -6.43014,
+          1.42222,
+          -0.12561,
+          0.00380,
+          70.81713,
+          -10.44954,
+          0.37800,
+          -81.52750,
+          9.56502,
+          -0.27358,
+          2.79999,
+          12.80005,
+          16.79990,
+          -5.491},  // p15_020_020
+         {0.0555,
+          4.99997,
+          -5.32575,
+          1.35827,
+          9.34656,
+          -5.55418,
+          1.12280,
+          -0.09210,
+          0.00261,
+          82.41172,
+          -12.46464,
+          0.46575,
+          8.20463,
+          0.00034,
+          -0.01329,
+          2.79991,
+          12.80005,
+          16.80010,
+          -4.961}  // p15_020_040
+     },
+     {
+         {0.0537,
+          8.66871,
+          -8.59491,
+          2.13963,
+          8.77537,
+          -5.51864,
+          1.18744,
+          -0.10291,
+          0.00307,
+          -6.47143,
+          0.52082,
+          -0.00646,
+          -27.71366,
+          3.16684,
+          -0.08860,
+          2.59990,
+          12.99996,
+          16.99994,
+          -6.675},  // p15_035_000
+         {0.0539,
+          4.62390,
+          -3.50484,
+          0.68064,
+          8.49884,
+          -5.47756,
+          1.19090,
+          -0.10373,
+          0.00311,
+          14.54671,
+          -2.36893,
+          0.09233,
+          -13.59277,
+          1.71853,
+          -0.05074,
+          2.99996,
+          12.99999,
+          17.00007,
+          -6.372},  // p15_035_005
+         {0.0545,
+          7.29436,
+          -6.60560,
+          1.42536,
+          -0.33022,
+          0.35786,
+          -0.06182,
+          0.00499,
+          -0.00020,
+          46.87251,
+          -7.09273,
+          0.26344,
+          9.05742,
+          -0.80637,
+          0.02073,
+          2.99992,
+          13.00001,
+          16.39997,
+          -5.895},  // p15_035_010
+         {0.0547,
+          5.25905,
+          -4.37134,
+          0.96265,
+          9.13990,
+          -5.61797,
+          1.15884,
+          -0.09542,
+          0.00270,
+          46.20668,
+          -6.84214,
+          0.24923,
+          -71.68587,
+          8.28743,
+          -0.23363,
+          2.79990,
+          12.80009,
+          16.79999,
+          -5.922},  // p15_035_020
+         {0.0552,
+          3.60159,
+          -3.26762,
+          0.77637,
+          6.46627,
+          -4.10550,
+          0.92929,
+          -0.08589,
+          0.00273,
+          70.99803,
+          -10.75255,
+          0.40317,
+          61.53351,
+          -6.00462,
+          0.15409,
+          2.80002,
+          12.80010,
+          16.80010,
+          -5.158}  // p15_035_040
+     },
+     {
+         {0.0518,
+          8.55031,
+          -7.94292,
+          1.89369,
+          11.02563,
+          -7.59173,
+          1.80739,
+          -0.17483,
+          0.00586,
+          -13.28089,
+          1.65701,
+          -0.04940,
+          -46.56146,
+          5.45907,
+          -0.15789,
+          2.59991,
+          12.00007,
+          17.00008,
+          -7.737},  // p15_075_000
+         {0.0521,
+          7.18166,
+          -6.01651,
+          1.21814,
+          2.43363,
+          -1.77826,
+          0.45100,
+          -0.04348,
+          0.00137,
+          -6.98630,
+          0.48466,
+          -0.00020,
+          0.89998,
+          0.00165,
+          -0.00007,
+          2.99990,
+          12.99992,
+          16.39993,
+          -7.416},  // p15_075_005
+         {0.0522,
+          7.15505,
+          -5.81547,
+          1.18139,
+          5.06047,
+          -3.07090,
+          0.65204,
+          -0.05581,
+          0.00163,
+          34.26066,
+          -5.22068,
+          0.19407,
+          -32.08974,
+          3.80938,
+          -0.10985,
+          2.99991,
+          12.99993,
+          16.39990,
+          -7.269},  // p15_075_010
+         {0.0528,
+          5.38865,
+          -4.39337,
+          0.91388,
+          5.14703,
+          -3.46478,
+          0.79934,
+          -0.07280,
+          0.00224,
+          16.43457,
+          -2.92250,
+          0.12318,
+          31.08896,
+          -2.97667,
+          0.07448,
+          2.80007,
+          12.80005,
+          16.79990,
+          -6.694},  // p15_075_020
+         {0.0530,
+          5.30422,
+          -4.13874,
+          0.81738,
+          3.37868,
+          -2.32631,
+          0.58993,
+          -0.06041,
+          0.00205,
+          18.44731,
+          -4.12627,
+          0.20107,
+          -126.24677,
+          15.05903,
+          -0.43280,
+          2.99998,
+          13.00005,
+          16.00001,
+          -6.496}  // p15_075_040
+     }},
+    {{
+         {0.0544,
+          10.61662,
+          -4.66383,
+          0.42516,
+          29.08390,
+          -17.46141,
+          3.40602,
+          -0.26049,
+          0.00678,
+          -255.29288,
+          28.47131,
+          -0.78533,
+          -253.99155,
+          26.36440,
+          -0.67581,
+          3.79994,
+          15.80006,
+          18.60002,
+          -13.202},  // p30_000_000
+         {0.0551,
+          8.48104,
+          -3.31969,
+          0.24238,
+          19.35292,
+          -13.50383,
+          2.83199,
+          -0.22423,
+          0.00592,
+          -330.91690,
+          36.65610,
+          -1.00339,
+          -29.81560,
+          4.30657,
+          -0.13451,
+          4.80007,
+          15.80010,
+          18.60009,
+          -11.472},  // p30_000_005
+         {0.0561,
+          8.21242,
+          -4.20316,
+          0.59937,
+          34.98674,
+          -21.78326,
+          4.51224,
+          -0.37530,
+          0.01091,
+          158.52663,
+          -22.60890,
+          0.79016,
+          -293.95880,
+          31.92491,
+          -0.85202,
+          3.00010,
+          12.00009,
+          17.00010,
+          -10.328},  // p30_000_010
+         {0.0570,
+          7.82783,
+          -3.53628,
+          0.32742,
+          25.88920,
+          -15.62944,
+          3.05299,
+          -0.23138,
+          0.00591,
+          -333.66858,
+          35.40715,
+          -0.91798,
+          28.07013,
+          -0.20378,
+          -0.04726,
+          3.79997,
+          15.79990,
+          18.79990,
+          -9.445},  // p30_000_020
+         {0.0590,
+          5.23373,
+          -2.13316,
+          0.21623,
+          41.95924,
+          -23.06488,
+          4.26929,
+          -0.31721,
+          0.00813,
+          -79.40607,
+          4.20908,
+          0.04657,
+          -301.68414,
+          33.18764,
+          -0.87989,
+          3.80005,
+          15.79991,
+          17.79990,
+          -8.083}  // p30_000_040
+     },
+     {
+         {0.0548,
+          9.11327,
+          -3.80718,
+          0.27176,
+          17.72807,
+          -12.00591,
+          2.53188,
+          -0.20527,
+          0.00560,
+          -220.21121,
+          24.72145,
+          -0.68478,
+          367.76862,
+          -37.77391,
+          0.97563,
+          3.80009,
+          15.79991,
+          18.60010,
+          -11.387},  // p30_010_000
+         {0.0555,
+          8.44225,
+          -3.76365,
+          0.34830,
+          16.84440,
+          -11.45504,
+          2.36289,
+          -0.18514,
+          0.00485,
+          -243.74149,
+          26.40218,
+          -0.70330,
+          386.71576,
+          -39.71713,
+          1.02916,
+          4.80010,
+          15.79990,
+          18.59990,
+          -10.875},  // p30_010_005
+         {0.0559,
+          7.24607,
+          -3.03818,
+          0.24462,
+          22.67508,
+          -14.77998,
+          3.00055,
+          -0.23325,
+          0.00609,
+          -206.00262,
+          21.17171,
+          -0.52507,
+          -146.17339,
+          16.12455,
+          -0.43035,
+          4.80005,
+          15.80010,
+          17.80010,
+          -10.516},  // p30_010_010
+         {0.0573,
+          6.45449,
+          -2.76923,
+          0.23920,
+          32.66528,
+          -19.06378,
+          3.65477,
+          -0.27470,
+          0.00701,
+          -493.64062,
+          54.21835,
+          -1.46628,
+          -871.48663,
+          92.04108,
+          -2.40908,
+          3.80001,
+          15.80010,
+          18.80009,
+          -9.104},  // p30_010_020
+         {0.0588,
+          6.37161,
+          -3.11835,
+          0.36682,
+          37.10630,
+          -21.05871,
+          3.99062,
+          -0.30092,
+          0.00778,
+          -172.28308,
+          15.36689,
+          -0.28755,
+          -636.64410,
+          68.52458,
+          -1.80834,
+          3.79993,
+          15.79990,
+          17.80007,
+          -7.964}  // p30_010_040
+     },
+     {
+         {0.0542,
+          9.44688,
+          -3.71389,
+          0.24703,
+          26.78260,
+          -16.48410,
+          3.28849,
+          -0.25822,
+          0.00691,
+          -81.39407,
+          8.60310,
+          -0.22002,
+          -212.08173,
+          22.63139,
+          -0.59648,
+          3.79990,
+          15.79996,
+          18.59994,
+          -12.045},  // p30_020_000
+         {0.0550,
+          9.56795,
+          -4.10759,
+          0.36162,
+          -9.53957,
+          -0.04329,
+          0.68184,
+          -0.08320,
+          0.00268,
+          -236.68367,
+          26.12769,
+          -0.71066,
+          114.03345,
+          -10.77724,
+          0.25972,
+          4.80010,
+          15.79993,
+          18.59991,
+          -11.348},  // p30_020_005
+         {0.0556,
+          9.11780,
+          -3.84344,
+          0.33944,
+          17.16139,
+          -12.17312,
+          2.60583,
+          -0.21060,
+          0.00567,
+          -179.89798,
+          18.42106,
+          -0.45231,
+          -65.40993,
+          7.61139,
+          -0.20637,
+          4.80010,
+          15.79990,
+          17.80008,
+          -10.972},  // p30_020_010
+         {0.0568,
+          6.22430,
+          -2.44412,
+          0.15530,
+          23.72676,
+          -14.46505,
+          2.85771,
+          -0.21916,
+          0.00566,
+          -439.93677,
+          48.29883,
+          -1.30727,
+          -403.80157,
+          42.89093,
+          -1.12186,
+          3.79993,
+          15.79991,
+          18.80005,
+          -9.806},  // p30_020_020
+         {0.0585,
+          7.10131,
+          -4.24196,
+          0.75234,
+          32.10036,
+          -19.29766,
+          3.81396,
+          -0.29743,
+          0.00795,
+          271.80072,
+          -38.36960,
+          1.33922,
+          -420.36700,
+          45.48018,
+          -1.19808,
+          2.99990,
+          12.99990,
+          17.00000,
+          -8.254}  // p30_020_040
+     },
+     {
+         {0.0537,
+          10.21091,
+          -4.78163,
+          0.49243,
+          24.68602,
+          -15.27425,
+          3.08510,
+          -0.24448,
+          0.00659,
+          -126.04826,
+          13.79405,
+          -0.36900,
+          74.71278,
+          -6.67548,
+          0.15121,
+          3.79992,
+          15.80010,
+          18.60007,
+          -12.748},  // p30_035_000
+         {0.0543,
+          8.22007,
+          -3.20905,
+          0.26448,
+          34.80609,
+          -21.45596,
+          4.36322,
+          -0.35304,
+          0.00985,
+          150.36832,
+          -21.25133,
+          0.73889,
+          -159.37085,
+          17.70522,
+          -0.48091,
+          2.99991,
+          12.99990,
+          16.99990,
+          -12.074},  // p30_035_005
+         {0.0552,
+          11.57362,
+          -7.38167,
+          1.28619,
+          32.91651,
+          -20.29951,
+          4.14324,
+          -0.33554,
+          0.00934,
+          152.41504,
+          -21.69770,
+          0.75989,
+          -106.28696,
+          11.76815,
+          -0.31353,
+          2.99991,
+          13.00000,
+          16.99990,
+          -10.962},  // p30_035_010
+         {0.0563,
+          6.23912,
+          -1.89622,
+          0.00004,
+          26.12958,
+          -16.01497,
+          3.17671,
+          -0.24497,
+          0.00639,
+          -394.40930,
+          43.23233,
+          -1.16464,
+          -108.84921,
+          12.83091,
+          -0.35549,
+          3.80001,
+          15.79997,
+          18.80005,
+          -10.032},  // p30_035_020
+         {0.0581,
+          7.03247,
+          -4.28547,
+          0.74398,
+          25.93132,
+          -15.87561,
+          3.21769,
+          -0.25820,
+          0.00716,
+          179.21277,
+          -26.07754,
+          0.93573,
+          -663.24866,
+          72.29580,
+          -1.93585,
+          3.00009,
+          12.00010,
+          17.00003,
+          -8.411}  // p30_035_040
+     },
+     {
+         {0.0517,
+          9.70148,
+          -3.91269,
+          0.30846,
+          -7.65310,
+          -1.78739,
+          1.13266,
+          -0.12649,
+          0.00406,
+          -150.20160,
+          17.06530,
+          -0.47568,
+          -236.91472,
+          25.69370,
+          -0.68892,
+          4.79990,
+          15.79996,
+          18.60010,
+          -14.074},  // p30_075_000
+         {0.0524,
+          10.13101,
+          -5.01916,
+          0.50429,
+          0.63606,
+          -5.57866,
+          1.69481,
+          -0.16088,
+          0.00479,
+          -294.30109,
+          33.31309,
+          -0.93149,
+          -413.55151,
+          44.23528,
+          -1.17401,
+          4.80010,
+          15.79990,
+          18.59990,
+          -12.376},  // p30_075_005
+         {0.0530,
+          11.92036,
+          -6.75281,
+          0.98658,
+          33.86113,
+          -21.37756,
+          4.41361,
+          -0.36021,
+          0.01007,
+          158.84935,
+          -22.86018,
+          0.80770,
+          -69.85017,
+          8.13320,
+          -0.22409,
+          3.00003,
+          12.99994,
+          16.99990,
+          -12.283},  // p30_075_010
+         {0.0543,
+          10.18101,
+          -5.88503,
+          0.91264,
+          31.02949,
+          -19.52331,
+          4.05557,
+          -0.33247,
+          0.00935,
+          243.09650,
+          -34.45361,
+          1.20640,
+          -132.55496,
+          15.19251,
+          -0.41413,
+          3.00007,
+          13.00010,
+          16.99990,
+          -11.256},  // p30_075_020
+         {0.0558,
+          8.64585,
+          -4.88029,
+          0.73985,
+          28.65805,
+          -18.33885,
+          3.90765,
+          -0.33077,
+          0.00968,
+          232.41695,
+          -34.30407,
+          1.24759,
+          -314.29739,
+          35.06829,
+          -0.94139,
+          2.99995,
+          11.99996,
+          17.00000,
+          -9.834}  // p30_075_040
+     }},
+    {{
+         {0.0557,
+          17.92760,
+          -4.80648,
+          -0.00062,
+          87.95326,
+          -44.90956,
+          7.07027,
+          -0.40233,
+          0.00644,
+          198.99698,
+          -26.92573,
+          0.89975,
+          -668.47876,
+          68.69582,
+          -1.73436,
+          3.49990,
+          12.00009,
+          18.50010,
+          -23.132},  // p45_000_000
+         {0.0566,
+          20.56676,
+          -6.82244,
+          0.33277,
+          175.13602,
+          -90.53445,
+          15.76371,
+          -1.11647,
+          0.02779,
+          180.29503,
+          -22.57693,
+          0.70006,
+          -597.75354,
+          60.71547,
+          -1.50728,
+          4.49994,
+          13.99990,
+          16.99990,
+          -21.234},  // p45_000_005
+         {0.0586,
+          20.56975,
+          -8.20942,
+          0.62927,
+          142.57861,
+          -73.70823,
+          12.67121,
+          -0.87488,
+          0.02100,
+          725.19733,
+          -88.49728,
+          2.68396,
+          -1232.48926,
+          124.71665,
+          -3.11487,
+          4.49990,
+          15.49997,
+          18.99992,
+          -18.255},  // p45_000_010
+         {0.0608,
+          12.99930,
+          -4.40646,
+          0.16615,
+          135.46375,
+          -69.37206,
+          11.77502,
+          -0.80074,
+          0.01894,
+          834.58325,
+          -100.01414,
+          2.98189,
+          -2341.82739,
+          237.54265,
+          -5.96752,
+          4.49998,
+          15.49990,
+          17.99990,
+          -15.521},  // p45_000_020
+         {0.0646,
+          5.82714,
+          -0.20208,
+          -0.33431,
+          121.90810,
+          -59.59846,
+          9.64799,
+          -0.62125,
+          0.01383,
+          459.80518,
+          -57.52971,
+          1.79004,
+          -2399.81445,
+          241.79126,
+          -6.01292,
+          4.50004,
+          14.00010,
+          17.99997,
+          -13.067}  // p45_000_040
+     },
+     {
+         {0.0556,
+          18.73014,
+          -5.72701,
+          0.19442,
+          210.71324,
+          -108.49732,
+          18.98730,
+          -1.36407,
+          0.03470,
+          214.51993,
+          -29.06502,
+          0.96904,
+          -548.95691,
+          56.81079,
+          -1.44214,
+          4.49995,
+          12.00008,
+          18.49993,
+          -21.938},  // p45_010_000
+         {0.0572,
+          17.82296,
+          -5.60061,
+          0.19641,
+          156.14261,
+          -81.31771,
+          14.21418,
+          -1.00593,
+          0.02491,
+          88.89441,
+          -10.67603,
+          0.30999,
+          -837.22253,
+          86.09529,
+          -2.17788,
+          4.49998,
+          14.00000,
+          16.99990,
+          -20.646},  // p45_010_005
+         {0.0586,
+          15.68601,
+          -5.05629,
+          0.15237,
+          123.19237,
+          -64.52366,
+          11.14414,
+          -0.76840,
+          0.01837,
+          818.15198,
+          -99.75158,
+          3.02816,
+          -1100.24219,
+          112.98646,
+          -2.85447,
+          4.50006,
+          15.49991,
+          18.99993,
+          -18.115},  // p45_010_010
+         {0.0614,
+          14.13518,
+          -5.31521,
+          0.32966,
+          126.34982,
+          -65.43266,
+          11.26074,
+          -0.77525,
+          0.01854,
+          641.93475,
+          -76.69814,
+          2.28030,
+          -2960.33691,
+          301.67068,
+          -7.62206,
+          4.49996,
+          15.49992,
+          17.99994,
+          -15.170},  // p45_010_020
+         {0.0643,
+          11.92501,
+          -4.88406,
+          0.42808,
+          153.55266,
+          -75.53246,
+          12.51486,
+          -0.84085,
+          0.01989,
+          527.21625,
+          -65.90746,
+          2.04721,
+          -2539.25317,
+          256.57034,
+          -6.40381,
+          4.50010,
+          14.00007,
+          17.99990,
+          -13.099}  // p45_010_040
+     },
+     {
+         {0.0551,
+          18.76994,
+          -5.08732,
+          -0.00695,
+          183.72238,
+          -96.75191,
+          17.17280,
+          -1.24386,
+          0.03169,
+          253.61079,
+          -33.36923,
+          1.08613,
+          -618.65979,
+          64.60046,
+          -1.65856,
+          4.49992,
+          14.00004,
+          16.99990,
+          -22.614},  // p45_020_000
+         {0.0564,
+          19.01751,
+          -5.73905,
+          0.18643,
+          201.07152,
+          -104.59877,
+          18.50068,
+          -1.33975,
+          0.03423,
+          336.03275,
+          -42.75151,
+          1.34662,
+          -834.15784,
+          86.52957,
+          -2.20905,
+          4.50000,
+          13.99993,
+          17.00000,
+          -21.622},  // p45_020_005
+         {0.0578,
+          16.23072,
+          -5.33147,
+          0.20100,
+          156.70125,
+          -80.35872,
+          13.73304,
+          -0.94558,
+          0.02267,
+          681.61133,
+          -84.21975,
+          2.58614,
+          -1049.93359,
+          108.72073,
+          -2.77210,
+          4.49993,
+          15.49993,
+          18.99991,
+          -19.116},  // p45_020_010
+         {0.0605,
+          15.63967,
+          -6.31759,
+          0.49985,
+          184.82843,
+          -94.30469,
+          16.26149,
+          -1.14093,
+          0.02816,
+          190.08217,
+          -22.96738,
+          0.68538,
+          -2344.32666,
+          237.12065,
+          -5.94170,
+          4.49997,
+          13.99995,
+          17.99990,
+          -16.280},  // p45_020_020
+         {0.0638,
+          6.05559,
+          0.00002,
+          -0.38734,
+          161.59608,
+          -80.28737,
+          13.43472,
+          -0.91133,
+          0.02171,
+          314.70325,
+          -38.83810,
+          1.18871,
+          -3235.08618,
+          328.47684,
+          -8.26153,
+          4.50005,
+          14.00001,
+          17.99991,
+          -13.602}  // p45_020_040
+     },
+     {
+         {0.0542,
+          21.63719,
+          -6.46348,
+          0.18335,
+          153.53262,
+          -81.56468,
+          14.57769,
+          -1.05863,
+          0.02693,
+          381.95724,
+          -50.40508,
+          1.64370,
+          -560.77686,
+          58.72067,
+          -1.51340,
+          4.50000,
+          13.99994,
+          16.99993,
+          -24.157},  // p45_035_000
+         {0.0557,
+          20.55025,
+          -7.11530,
+          0.34058,
+          171.14911,
+          -90.11083,
+          15.90498,
+          -1.14251,
+          0.02881,
+          246.92723,
+          -31.69450,
+          0.99712,
+          -892.47058,
+          92.59153,
+          -2.37127,
+          4.50010,
+          14.00007,
+          16.99990,
+          -20.995},  // p45_035_005
+         {0.0570,
+          16.49973,
+          -5.22144,
+          0.12479,
+          138.85353,
+          -72.43115,
+          12.49747,
+          -0.86734,
+          0.02092,
+          955.99622,
+          -118.19658,
+          3.63192,
+          -975.28864,
+          99.94202,
+          -2.52613,
+          4.50010,
+          15.50010,
+          18.00004,
+          -19.636},  // p45_035_010
+         {0.0602,
+          15.55931,
+          -6.60743,
+          0.51995,
+          173.41943,
+          -90.44087,
+          15.88782,
+          -1.13649,
+          0.02866,
+          310.30878,
+          -38.38401,
+          1.17837,
+          -2338.81030,
+          237.64796,
+          -5.98044,
+          4.50010,
+          14.00002,
+          17.99990,
+          -15.753},  // p45_035_020
+         {0.0638,
+          10.96490,
+          -4.79228,
+          0.37885,
+          156.69714,
+          -80.06792,
+          13.74100,
+          -0.95676,
+          0.02343,
+          406.64651,
+          -50.97632,
+          1.58610,
+          -3313.41284,
+          338.56537,
+          -8.57343,
+          4.49990,
+          14.00008,
+          17.99990,
+          -12.285}  // p45_035_040
+     },
+     {
+         {0.0516,
+          25.10588,
+          -7.03224,
+          0.15306,
+          205.25684,
+          -109.31027,
+          19.82121,
+          -1.46893,
+          0.03823,
+          452.53693,
+          -60.25387,
+          1.98362,
+          -541.77319,
+          57.50642,
+          -1.50294,
+          4.49990,
+          13.99990,
+          16.99993,
+          -27.947},  // p45_075_000
+         {0.0535,
+          19.89361,
+          -6.09960,
+          0.17821,
+          198.89348,
+          -105.43513,
+          18.93069,
+          -1.38671,
+          0.03569,
+          409.90585,
+          -53.51824,
+          1.72764,
+          -803.38422,
+          83.82904,
+          -2.15337,
+          4.50004,
+          14.00009,
+          16.99990,
+          -23.850},  // p45_075_005
+         {0.0540,
+          19.16553,
+          -5.66443,
+          0.04920,
+          131.46606,
+          -71.21025,
+          12.69343,
+          -0.90599,
+          0.02236,
+          648.16327,
+          -82.04230,
+          2.57039,
+          -1096.53784,
+          113.75765,
+          -2.92251,
+          4.50000,
+          15.49990,
+          18.00008,
+          -22.902},  // p45_075_010
+         {0.0575,
+          18.06837,
+          -6.77291,
+          0.44879,
+          164.18694,
+          -86.73592,
+          15.42702,
+          -1.10863,
+          0.02787,
+          382.57480,
+          -48.49550,
+          1.52342,
+          -1999.79858,
+          202.65134,
+          -5.07618,
+          4.49991,
+          14.00009,
+          17.99990,
+          -19.025},  // p45_075_020
+         {0.0610,
+          15.26029,
+          -6.09591,
+          0.45420,
+          125.71390,
+          -65.64382,
+          11.38995,
+          -0.78601,
+          0.01875,
+          813.33154,
+          -98.42193,
+          2.96368,
+          -3919.15771,
+          400.35605,
+          -10.13975,
+          4.49990,
+          15.50004,
+          17.99990,
+          -15.366}  // p45_075_040
+     }}};
diff --git a/SimMuon/DTDigitizer/src/DTDriftTimeParametrization.h b/SimMuon/DTDigitizer/src/DTDriftTimeParametrization.h
index d508a661e99ba..0847d90f48698 100644
--- a/SimMuon/DTDigitizer/src/DTDriftTimeParametrization.h
+++ b/SimMuon/DTDigitizer/src/DTDriftTimeParametrization.h
@@ -16,13 +16,11 @@
  ************************************************************************
  */
 
-
-#define N_alpha     11
-#define N_By         5
-#define N_Bz         5
-#define N_Par_t     19
-#define N_Sigma_t    7
-
+#define N_alpha 11
+#define N_By 5
+#define N_Bz 5
+#define N_Par_t 19
+#define N_Sigma_t 7
 
 class DTDriftTimeParametrization {
 public:
@@ -34,56 +32,40 @@ class DTDriftTimeParametrization {
 
   /// Structure used to return output values
   typedef struct {
-    double v_drift, t_drift, delta_t, t_width_m, t_width_p ;
-  } drift_time ;
+    double v_drift, t_drift, delta_t, t_width_m, t_width_p;
+  } drift_time;
 
   /// Calculate drift time and spread
-  unsigned short MB_DT_drift_time (double x,
-				   double alpha,
-				   double by,
-				   double bz,
-				   short ifl,
-				   drift_time *DT,
-				   short interpolate) const;
+  unsigned short MB_DT_drift_time(
+      double x, double alpha, double by, double bz, short ifl, drift_time *DT, short interpolate) const;
 
 private:
-  double MB_DT_time      (double , double *) const;
-  double MB_DT_delta_t   (double , double *) const;
-  double MB_DT_sigma_t_m (double , double *) const;
-  double MB_DT_sigma_t_p (double , double *) const;
+  double MB_DT_time(double, double *) const;
+  double MB_DT_delta_t(double, double *) const;
+  double MB_DT_sigma_t_m(double, double *) const;
+  double MB_DT_sigma_t_p(double, double *) const;
+
+  unsigned short MB_DT_Check_boundaries(double distime, double alpha, double by, double bz, short ifl) const;
 
-  unsigned short MB_DT_Check_boundaries (double distime,
-					 double alpha,
-					 double by,
-					 double bz,
-					 short ifl) const;
+  void MB_DT_Get_grid_values(
+      double Var, unsigned short *pi, unsigned short *pj, short Initial, unsigned short N, const double *Values) const;
+
+  void MB_DT_Get_grid_points(double alpha,
+                             double by,
+                             double bz,
+                             unsigned short *p_alpha,
+                             unsigned short *p_By,
+                             unsigned short *p_Bz,
+                             unsigned short *q_alpha,
+                             unsigned short *q_By,
+                             unsigned short *q_Bz) const;
+
+  double MB_DT_MLInterpolation(double *al, double *by, double *bz, double *f) const;
 
-  void MB_DT_Get_grid_values (double Var,
-			      unsigned short *pi,
-			      unsigned short *pj,
-			      short Initial,
-			      unsigned short N,
-			      const double *Values) const;
-  
-  void MB_DT_Get_grid_points (double alpha, 
-			      double by,
-			      double bz,
-			      unsigned short *p_alpha,
-			      unsigned short *p_By,
-			      unsigned short *p_Bz,
-			      unsigned short *q_alpha,
-			      unsigned short *q_By,
-			      unsigned short *q_Bz) const;
-  
-  double MB_DT_MLInterpolation (double *al,
-				double *by,
-				double *bz,
-				double *f) const;
-  
   /*** Points of the grid ***/
   static const double alpha_value[N_alpha];
-  static const double    By_value[N_By];
-  static const double    Bz_value[N_Bz];
+  static const double By_value[N_By];
+  static const double Bz_value[N_Bz];
 
   /*** Parameter values ***/
   static const double fun_t[N_alpha][N_By][N_Bz][N_Par_t];
@@ -91,6 +73,5 @@ class DTDriftTimeParametrization {
 
   /*** skew factor ***/
   static const double velocitySkew;
-
 };
 #endif
diff --git a/SimMuon/DTDigitizer/src/DTNeutronWriter.cc b/SimMuon/DTDigitizer/src/DTNeutronWriter.cc
index 3e1103b2a7621..2abbe5e4c7929 100644
--- a/SimMuon/DTDigitizer/src/DTNeutronWriter.cc
+++ b/SimMuon/DTDigitizer/src/DTNeutronWriter.cc
@@ -1,30 +1,12 @@
-#include "SimMuon/DTDigitizer/src/DTNeutronWriter.h"
 #include "DataFormats/MuonDetId/interface/DTWireId.h"
+#include "SimMuon/DTDigitizer/src/DTNeutronWriter.h"
 
-DTNeutronWriter::DTNeutronWriter(edm::ParameterSet const& pset)
-  : SubsystemNeutronWriter(pset)
-{
-}
-
-
-DTNeutronWriter::~DTNeutronWriter() {
-}
-
-
-int DTNeutronWriter::localDetId(int globalDetId) const
-{
-  return DTLayerId(globalDetId).layer();
-}
-
+DTNeutronWriter::DTNeutronWriter(edm::ParameterSet const &pset) : SubsystemNeutronWriter(pset) {}
 
-int DTNeutronWriter::chamberType(int globalDetId) const
-{
-  return globalDetId;
-}
+DTNeutronWriter::~DTNeutronWriter() {}
 
+int DTNeutronWriter::localDetId(int globalDetId) const { return DTLayerId(globalDetId).layer(); }
 
-int DTNeutronWriter::chamberId(int globalDetId) const
-{
-  return DTChamberId(globalDetId).rawId();
-}
+int DTNeutronWriter::chamberType(int globalDetId) const { return globalDetId; }
 
+int DTNeutronWriter::chamberId(int globalDetId) const { return DTChamberId(globalDetId).rawId(); }
diff --git a/SimMuon/DTDigitizer/src/DTNeutronWriter.h b/SimMuon/DTDigitizer/src/DTNeutronWriter.h
index bedd83e1e89c4..66a14554110e3 100644
--- a/SimMuon/DTDigitizer/src/DTNeutronWriter.h
+++ b/SimMuon/DTDigitizer/src/DTNeutronWriter.h
@@ -9,13 +9,12 @@
   Original Author:  Vadim Khotilovich
 */
 
-class DTNeutronWriter : public SubsystemNeutronWriter
-{
- public:
-  explicit DTNeutronWriter(edm::ParameterSet const& pset);
+class DTNeutronWriter : public SubsystemNeutronWriter {
+public:
+  explicit DTNeutronWriter(edm::ParameterSet const &pset);
   ~DTNeutronWriter() override;
 
- protected:
+protected:
   int localDetId(int globalDetId) const override;
 
   int chamberType(int globalDetId) const override;
@@ -23,8 +22,7 @@ class DTNeutronWriter : public SubsystemNeutronWriter
   int chamberId(int globalDetId) const override;
 
   /// decides whether this cluster is good enough to be included
-  bool accept(const edm::PSimHitContainer & cluster) const override {return true;}
-
+  bool accept(const edm::PSimHitContainer &cluster) const override { return true; }
 };
 
 #endif
diff --git a/SimMuon/DTDigitizer/src/SealModule.cc b/SimMuon/DTDigitizer/src/SealModule.cc
index 5392214509302..ab018fda43aeb 100644
--- a/SimMuon/DTDigitizer/src/SealModule.cc
+++ b/SimMuon/DTDigitizer/src/SealModule.cc
@@ -2,9 +2,8 @@
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "SimMuon/DTDigitizer/src/DTDigitizer.h"
 #include "SimMuon/DTDigitizer/src/DTDigiReader.cc"
-
+#include "SimMuon/DTDigitizer/src/DTDigitizer.h"
 
 DEFINE_FWK_MODULE(DTDigitizer);
 DEFINE_FWK_MODULE(DTDigiReader);
@@ -13,9 +12,8 @@ DEFINE_FWK_MODULE(DTDigiReader);
 #include "SimMuon/DTDigitizer/src/DTDigiSyncTOFCorr.h"
 
 #include "SimMuon/DTDigitizer/interface/DTDigiSyncFactory.h"
-DEFINE_EDM_PLUGIN (DTDigiSyncFactory, DTDigiSyncFromTable, "DTDigiSyncFromTable");
-DEFINE_EDM_PLUGIN (DTDigiSyncFactory, DTDigiSyncTOFCorr, "DTDigiSyncTOFCorr");
+DEFINE_EDM_PLUGIN(DTDigiSyncFactory, DTDigiSyncFromTable, "DTDigiSyncFromTable");
+DEFINE_EDM_PLUGIN(DTDigiSyncFactory, DTDigiSyncTOFCorr, "DTDigiSyncTOFCorr");
 
 #include "SimMuon/DTDigitizer/src/DTNeutronWriter.h"
 DEFINE_FWK_MODULE(DTNeutronWriter);
-
diff --git a/SimMuon/DTDigitizer/test/DTDigiAnalyzer.cc b/SimMuon/DTDigitizer/test/DTDigiAnalyzer.cc
index 7b9347ec60468..848263edc5cbc 100644
--- a/SimMuon/DTDigitizer/test/DTDigiAnalyzer.cc
+++ b/SimMuon/DTDigitizer/test/DTDigiAnalyzer.cc
@@ -1,31 +1,30 @@
 /** \class DTDigiAnalyzer
- *  Analyse the the muon-drift-tubes digitizer. 
- *  
+ *  Analyse the the muon-drift-tubes digitizer.
+ *
  *  \authors: R. Bellan
  */
 
-#include <FWCore/Framework/interface/Event.h>
-#include <DataFormats/DTDigi/interface/DTDigiCollection.h>
-#include "SimMuon/DTDigitizer/test/DTDigiAnalyzer.h"
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
+#include "SimMuon/DTDigitizer/test/DTDigiAnalyzer.h"
+#include <DataFormats/DTDigi/interface/DTDigiCollection.h>
+#include <FWCore/Framework/interface/Event.h>
 
-// #include "SimMuon/DTDigitizer/test/analysis/DTMCStatistics.h"     
-// #include "SimMuon/DTDigitizer/test/analysis/DTMuonDigiStatistics.h" 
+// #include "SimMuon/DTDigitizer/test/analysis/DTMCStatistics.h"
+// #include "SimMuon/DTDigitizer/test/analysis/DTMuonDigiStatistics.h"
 // #include "SimMuon/DTDigitizer/test/analysis/DTHitsAnalysis.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
+#include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
 #include "Geometry/DTGeometry/interface/DTLayer.h"
-#include "DataFormats/GeometryVector/interface/LocalPoint.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
-#include "DataFormats/MuonDetId/interface/DTWireId.h"
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
+#include "DataFormats/MuonDetId/interface/DTWireId.h"
 
 #include <iostream>
 #include <string>
@@ -34,39 +33,32 @@
 
 #include "SimMuon/DTDigitizer/test/Histograms.h"
 
-
-
 using namespace edm;
 using namespace std;
 
-DTDigiAnalyzer:: DTDigiAnalyzer(const ParameterSet& pset):
-  hDigis_global("Global"),
-  hDigis_W0("Wheel0"),
-  hDigis_W1("Wheel1"),
-  hDigis_W2("Wheel2"),
-  hAllHits("AllHits")
-{
-//   MCStatistics = new DTMCStatistics();
-//   MuonDigiStatistics = new DTMuonDigiStatistics();
-//   HitsAnalysis = new DTHitsAnalysis();
-  label = pset.getUntrackedParameter<string>("label");  
-  file = new TFile("DTDigiPlots.root","RECREATE");
+DTDigiAnalyzer::DTDigiAnalyzer(const ParameterSet &pset)
+    : hDigis_global("Global"), hDigis_W0("Wheel0"), hDigis_W1("Wheel1"), hDigis_W2("Wheel2"), hAllHits("AllHits") {
+  //   MCStatistics = new DTMCStatistics();
+  //   MuonDigiStatistics = new DTMuonDigiStatistics();
+  //   HitsAnalysis = new DTHitsAnalysis();
+  label = pset.getUntrackedParameter<string>("label");
+  file = new TFile("DTDigiPlots.root", "RECREATE");
   file->cd();
-  DigiTimeBox = new TH1F("DigiTimeBox","Digi Time Box",2048,0,1600);
-  if(file->IsOpen()) cout<<"file open!"<<endl;
-  else cout<<"*** Error in opening file ***"<<endl;
-
-  psim_token = consumes<PSimHitContainer>( edm::InputTag("g4SimHits","MuonDTHits") );
-  DTd_token = consumes<DTDigiCollection>( edm::InputTag(label) );
-
+  DigiTimeBox = new TH1F("DigiTimeBox", "Digi Time Box", 2048, 0, 1600);
+  if (file->IsOpen())
+    cout << "file open!" << endl;
+  else
+    cout << "*** Error in opening file ***" << endl;
+
+  psim_token = consumes<PSimHitContainer>(edm::InputTag("g4SimHits", "MuonDTHits"));
+  DTd_token = consumes<DTDigiCollection>(edm::InputTag(label));
 }
 
-DTDigiAnalyzer::~DTDigiAnalyzer(){
-}
+DTDigiAnalyzer::~DTDigiAnalyzer() {}
 
-void DTDigiAnalyzer::endJob(){
-  //cout<<"Number of analyzed event: "<<nevts<<endl;
-  //HitsAnalysis->Report();
+void DTDigiAnalyzer::endJob() {
+  // cout<<"Number of analyzed event: "<<nevts<<endl;
+  // HitsAnalysis->Report();
   file->cd();
   DigiTimeBox->Write();
   hDigis_global.Write();
@@ -79,118 +71,112 @@ void DTDigiAnalyzer::endJob(){
   // delete DigiTimeBox;
 }
 
-void  DTDigiAnalyzer::analyze(const Event & event, const EventSetup& eventSetup){
-  cout << "--- Run: " << event.id().run()
-       << " Event: " << event.id().event() << endl;
-  
+void DTDigiAnalyzer::analyze(const Event &event, const EventSetup &eventSetup) {
+  cout << "--- Run: " << event.id().run() << " Event: " << event.id().event() << endl;
+
   Handle<DTDigiCollection> dtDigis;
   event.getByToken(DTd_token, dtDigis);
-  
-  Handle<PSimHitContainer> simHits; 
-  event.getByToken(psim_token,simHits);    
+
+  Handle<PSimHitContainer> simHits;
+  event.getByToken(psim_token, simHits);
 
   ESHandle<DTGeometry> muonGeom;
   eventSetup.get<MuonGeometryRecord>().get(muonGeom);
 
+  DTWireIdMap wireMap;
 
-  DTWireIdMap wireMap;     
-  
-  for(vector<PSimHit>::const_iterator hit = simHits->begin();
-      hit != simHits->end(); hit++){    
+  for (vector<PSimHit>::const_iterator hit = simHits->begin(); hit != simHits->end(); hit++) {
     // Create the id of the wire, the simHits in the DT known also the wireId
-     DTWireId wireId(hit->detUnitId());
+    DTWireId wireId(hit->detUnitId());
     // Fill the map
     wireMap[wireId].push_back(&(*hit));
 
     LocalPoint entryP = hit->entryPoint();
     LocalPoint exitP = hit->exitPoint();
     int partType = hit->particleType();
-    
-    float path = (exitP-entryP).mag();
-    float path_x = fabs((exitP-entryP).x());
-    
-    hAllHits.Fill(entryP.x(),exitP.x(),
-		   entryP.y(),exitP.y(),
-		   entryP.z(),exitP.z(),
-		   path , path_x, 
-		   partType, hit->processType(),
-		  hit->pabs());
-
-    if( hit->timeOfFlight() > 1e4){
-      cout<<"PID: "<<hit->particleType()
-	  <<" TOF: "<<hit->timeOfFlight()
-	  <<" Proc Type: "<<hit->processType() 
-	  <<" p: " << hit->pabs() <<endl;
+
+    float path = (exitP - entryP).mag();
+    float path_x = fabs((exitP - entryP).x());
+
+    hAllHits.Fill(entryP.x(),
+                  exitP.x(),
+                  entryP.y(),
+                  exitP.y(),
+                  entryP.z(),
+                  exitP.z(),
+                  path,
+                  path_x,
+                  partType,
+                  hit->processType(),
+                  hit->pabs());
+
+    if (hit->timeOfFlight() > 1e4) {
+      cout << "PID: " << hit->particleType() << " TOF: " << hit->timeOfFlight() << " Proc Type: " << hit->processType()
+           << " p: " << hit->pabs() << endl;
       hAllHits.FillTOF(hit->timeOfFlight());
     }
   }
-  
+
   DTDigiCollection::DigiRangeIterator detUnitIt;
-  for (detUnitIt=dtDigis->begin();
-       detUnitIt!=dtDigis->end();
-       ++detUnitIt){
-    
-    const DTLayerId& id = (*detUnitIt).first;
-    const DTDigiCollection::Range& range = (*detUnitIt).second;
-    
+  for (detUnitIt = dtDigis->begin(); detUnitIt != dtDigis->end(); ++detUnitIt) {
+    const DTLayerId &id = (*detUnitIt).first;
+    const DTDigiCollection::Range &range = (*detUnitIt).second;
+
     // DTLayerId print-out
-    cout<<"--------------"<<endl;
-    cout<<"id: "<<id;
-    
+    cout << "--------------" << endl;
+    cout << "id: " << id;
+
     // Loop over the digis of this DetUnit
-    for (DTDigiCollection::const_iterator digiIt = range.first;
-	 digiIt!=range.second;
-	 ++digiIt){
-      cout<<" Wire: "<<(*digiIt).wire()<<endl
-	  <<" digi time (ns): "<<(*digiIt).time()<<endl;
+    for (DTDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) {
+      cout << " Wire: " << (*digiIt).wire() << endl << " digi time (ns): " << (*digiIt).time() << endl;
       DigiTimeBox->Fill((*digiIt).time());
-      
-      DTWireId wireId(id,(*digiIt).wire());
-      int mu=0;
+
+      DTWireId wireId(id, (*digiIt).wire());
+      int mu = 0;
       float theta = 0;
-      
-      for(vector<const PSimHit*>::iterator hit = wireMap[wireId].begin();
-	  hit != wireMap[wireId].end(); hit++){
-	cout<<"momentum x: "<<(*hit)->momentumAtEntry().x()<<endl
-	    <<"momentum z: "<<(*hit)->momentumAtEntry().z()<<endl;
-	if( abs((*hit)->particleType()) == 13){
-	  theta = atan( (*hit)->momentumAtEntry().x()/ (-(*hit)->momentumAtEntry().z()) )*180/M_PI;
-	  cout<<"atan: "<<theta<<endl;
-	  mu++;
-	}
-	else{
-	  // 	  cout<<"PID: "<<(*hit)->particleType()
-	  // 	      <<" TOF: "<<(*hit)->timeOfFlight()
-	  // 	      <<" Proc Type: "<<(*hit)->processType() 
-	  // 	      <<" p: " << (*hit)->pabs() <<endl;
-	}
+
+      for (vector<const PSimHit *>::iterator hit = wireMap[wireId].begin(); hit != wireMap[wireId].end(); hit++) {
+        cout << "momentum x: " << (*hit)->momentumAtEntry().x() << endl
+             << "momentum z: " << (*hit)->momentumAtEntry().z() << endl;
+        if (abs((*hit)->particleType()) == 13) {
+          theta = atan((*hit)->momentumAtEntry().x() / (-(*hit)->momentumAtEntry().z())) * 180 / M_PI;
+          cout << "atan: " << theta << endl;
+          mu++;
+        } else {
+          // 	  cout<<"PID: "<<(*hit)->particleType()
+          // 	      <<" TOF: "<<(*hit)->timeOfFlight()
+          // 	      <<" Proc Type: "<<(*hit)->processType()
+          // 	      <<" p: " << (*hit)->pabs() <<endl;
+        }
       }
-      if(mu && theta){
-	hDigis_global.Fill((*digiIt).time(),theta,id.superlayer());
-	//filling digi histos for wheel and for RZ and RPhi
-	WheelHistos(id.wheel())->Fill((*digiIt).time(),theta,id.superlayer());
+      if (mu && theta) {
+        hDigis_global.Fill((*digiIt).time(), theta, id.superlayer());
+        // filling digi histos for wheel and for RZ and RPhi
+        WheelHistos(id.wheel())->Fill((*digiIt).time(), theta, id.superlayer());
       }
-	  
-    }// for digis in layer
-  }// for layers
-  cout<<"--------------"<<endl;
+
+    }  // for digis in layer
+  }    // for layers
+  cout << "--------------" << endl;
 }
 
-hDigis* DTDigiAnalyzer::WheelHistos(int wheel){
-  switch(abs(wheel)){
+hDigis *DTDigiAnalyzer::WheelHistos(int wheel) {
+  switch (abs(wheel)) {
+    case 0:
+      return &hDigis_W0;
+
+    case 1:
+      return &hDigis_W1;
 
-  case 0: return  &hDigis_W0;
-  
-  case 1: return  &hDigis_W1;
-    
-  case 2: return  &hDigis_W2;
-     
-  default: return nullptr;
+    case 2:
+      return &hDigis_W2;
+
+    default:
+      return nullptr;
   }
 }
 
-
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 
 DEFINE_FWK_MODULE(DTDigiAnalyzer);
diff --git a/SimMuon/DTDigitizer/test/DTDigiAnalyzer.h b/SimMuon/DTDigitizer/test/DTDigiAnalyzer.h
index 265ef13458301..5b157635c8bbb 100644
--- a/SimMuon/DTDigitizer/test/DTDigiAnalyzer.h
+++ b/SimMuon/DTDigitizer/test/DTDigiAnalyzer.h
@@ -2,42 +2,44 @@
 #define SimMuon_DTDigiAnalyzer_h
 
 /** \class DTDigiAnalyzer
- *  Analyse the the muon-drift-tubes digitizer. 
- *  
+ *  Analyse the the muon-drift-tubes digitizer.
+ *
  *  \authors: R. Bellan
  */
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 
-#include <FWCore/Framework/interface/EDAnalyzer.h>
-#include <DataFormats/MuonDetId/interface/DTWireId.h>
-#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "DataFormats/DTDigi/interface/DTDigiCollection.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include "SimMuon/DTDigitizer/test/Histograms.h"
+#include <DataFormats/MuonDetId/interface/DTWireId.h>
+#include <FWCore/Framework/interface/EDAnalyzer.h>
 
 class TH1F;
 class TFile;
 class PSimHit;
-//class DTMCStatistics;
-//class DTMuonDigiStatistics;
-//class DTHitsAnalysis;
-class   hDigis;
+// class DTMCStatistics;
+// class DTMuonDigiStatistics;
+// class DTHitsAnalysis;
+class hDigis;
 
 namespace edm {
-  class ParameterSet; class Event; class EventSetup;}
-
-class DTDigiAnalyzer : public edm::EDAnalyzer{
-  
- public:
-  explicit DTDigiAnalyzer(const edm::ParameterSet& pset);
+  class ParameterSet;
+  class Event;
+  class EventSetup;
+}  // namespace edm
+
+class DTDigiAnalyzer : public edm::EDAnalyzer {
+public:
+  explicit DTDigiAnalyzer(const edm::ParameterSet &pset);
   ~DTDigiAnalyzer() override;
   void endJob() override;
-  void analyze(const edm::Event & event, const edm::EventSetup& eventSetup) override;
-  hDigis* WheelHistos(int wheel);
-  
- private:
-  typedef std::map<DTWireId, std::vector<const PSimHit*> > DTWireIdMap; 
+  void analyze(const edm::Event &event, const edm::EventSetup &eventSetup) override;
+  hDigis *WheelHistos(int wheel);
+
+private:
+  typedef std::map<DTWireId, std::vector<const PSimHit *>> DTWireIdMap;
 
   TH1F *DigiTimeBox;
   TFile *file;
@@ -46,8 +48,8 @@ class DTDigiAnalyzer : public edm::EDAnalyzer{
   // DTMuonDigiStatistics  *MuonDigiStatistics;
   // DTHitsAnalysis        *HitsAnalysis;
 
-  edm::EDGetTokenT< edm::PSimHitContainer > psim_token;
-  edm::EDGetTokenT< DTDigiCollection > DTd_token;
+  edm::EDGetTokenT<edm::PSimHitContainer> psim_token;
+  edm::EDGetTokenT<DTDigiCollection> DTd_token;
 
   hDigis hDigis_global;
   hDigis hDigis_W0;
@@ -55,7 +57,6 @@ class DTDigiAnalyzer : public edm::EDAnalyzer{
   hDigis hDigis_W2;
 
   hHits hAllHits;
-  
 };
 
-#endif    
+#endif
diff --git a/SimMuon/DTDigitizer/test/Histograms.h b/SimMuon/DTDigitizer/test/Histograms.h
index 9a12a08db8d2f..50782118fd6c9 100644
--- a/SimMuon/DTDigitizer/test/Histograms.h
+++ b/SimMuon/DTDigitizer/test/Histograms.h
@@ -6,238 +6,265 @@
  *
  *  \author R. Bellan - INFN Torino
  */
-#include "TString.h"
+#include "TFile.h"
 #include "TH1F.h"
 #include "TH2F.h"
 #include "TH3F.h"
-#include "TFile.h"
+#include "TString.h"
 
-#include <string>
 #include <iostream>
+#include <string>
 
 #include "DataFormats/GeometryVector/interface/Pi.h"
 
-
 namespace hist_helper {
   struct no_deleter {
-    void operator() (void *) const {}
+    void operator()(void *) const {}
   };
-  template<typename T>
-    std::shared_ptr<T> make_non_owning(T* iT) {
+  template <typename T>
+  std::shared_ptr<T> make_non_owning(T *iT) {
     return std::shared_ptr<T>(iT, no_deleter());
   }
 
-  template<typename T>
-    std::shared_ptr<T> make_non_owning_cast(TObject* iT) {
-    return std::shared_ptr<T>(dynamic_cast<T*>(iT), no_deleter());
+  template <typename T>
+  std::shared_ptr<T> make_non_owning_cast(TObject *iT) {
+    return std::shared_ptr<T>(dynamic_cast<T *>(iT), no_deleter());
   }
-}
+}  // namespace hist_helper
 
-class hDigis{
- public:
-  hDigis(std::string name_){
+class hDigis {
+public:
+  hDigis(std::string name_) {
     TString N = name_.c_str();
-    name=N;
-    //booking degli istogrammi unidimensionali
-    hMuonDigis = std::make_shared<TH1F>(N+"_hMuonDigis", "number of muon digis", 20, 0., 20.);
-    hMuonTimeDigis  = std::make_shared<TH1F>(N+"_hMuonTimeDigis", "Muon digis time box", 2048, 0., 1600.);
-    //    control = std::make_shared<TH1F> (N+"_control", "control", 2048, 0., 1600.);
-    //2D
-    hMuonTimeDigis_vs_theta= std::make_shared<TH2F>(N+"_hMuonTimeDigis_vs_theta","Muon digis time box vs theta",120,-60,60,960,0.,1500.);
-    hMuonTimeDigis_vs_theta_RZ= std::make_shared<TH2F>(N+"_hMuonTimeDigis_vs_theta_RZ","Muon digis time box vs theta only RZ SL",120,-60,60,960,0.,1500.); 
-    hMuonTimeDigis_vs_theta_RPhi= std::make_shared<TH2F>(N+"_hMuonTimeDigis_vs_theta_RPhi","Muon digis time box vs theta only RPhi SL",120,-60,60,960,0.,1500.);
-  }
-
-  virtual ~hDigis(){
-//     delete hMuonDigis; 
-//     delete hMuonTimeDigis; 
-//     delete hMuonTimeDigis_vs_theta;
-//     delete hMuonTimeDigis_vs_theta_RZ;
-//     delete hMuonTimeDigis_vs_theta_RPhi;
-  }
-  	 
-  hDigis(std::string name_,TFile *file){
-    name=name_.c_str();
-    //per lettura da file degli istogrammi
-    //1D
-    hMuonDigis = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_MuonDigis")); 
-    hMuonTimeDigis  = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_MuonTimeDigis")); 
-    //  control = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_control")); 
-    //2D
-    hMuonTimeDigis_vs_theta = hist_helper::make_non_owning_cast<TH2F>( file->Get(name+"_MuonTimeDigis_vs_theta")); 
-    hMuonTimeDigis_vs_theta_RZ= hist_helper::make_non_owning_cast<TH2F>( file->Get(name+"_MuonTimeDigis_vs_theta_RZ")); 
-    hMuonTimeDigis_vs_theta_RPhi= hist_helper::make_non_owning_cast<TH2F>( file->Get(name+"_MuonTimeDigis_vs_theta_RPhi")); 
-  }
-  
-  void Write(){
+    name = N;
+    // booking degli istogrammi unidimensionali
+    hMuonDigis = std::make_shared<TH1F>(N + "_hMuonDigis", "number of muon digis", 20, 0., 20.);
+    hMuonTimeDigis = std::make_shared<TH1F>(N + "_hMuonTimeDigis", "Muon digis time box", 2048, 0., 1600.);
+    //    control = std::make_shared<TH1F> (N+"_control", "control", 2048, 0.,
+    //    1600.);
+    // 2D
+    hMuonTimeDigis_vs_theta = std::make_shared<TH2F>(
+        N + "_hMuonTimeDigis_vs_theta", "Muon digis time box vs theta", 120, -60, 60, 960, 0., 1500.);
+    hMuonTimeDigis_vs_theta_RZ = std::make_shared<TH2F>(
+        N + "_hMuonTimeDigis_vs_theta_RZ", "Muon digis time box vs theta only RZ SL", 120, -60, 60, 960, 0., 1500.);
+    hMuonTimeDigis_vs_theta_RPhi = std::make_shared<TH2F>(
+        N + "_hMuonTimeDigis_vs_theta_RPhi", "Muon digis time box vs theta only RPhi SL", 120, -60, 60, 960, 0., 1500.);
+  }
+
+  virtual ~hDigis() {
+    //     delete hMuonDigis;
+    //     delete hMuonTimeDigis;
+    //     delete hMuonTimeDigis_vs_theta;
+    //     delete hMuonTimeDigis_vs_theta_RZ;
+    //     delete hMuonTimeDigis_vs_theta_RPhi;
+  }
+
+  hDigis(std::string name_, TFile *file) {
+    name = name_.c_str();
+    // per lettura da file degli istogrammi
+    // 1D
+    hMuonDigis = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_MuonDigis"));
+    hMuonTimeDigis = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_MuonTimeDigis"));
+    //  control = hist_helper::make_non_owning_cast<TH1F>(
+    //  file->Get(name+"_control"));
+    // 2D
+    hMuonTimeDigis_vs_theta = hist_helper::make_non_owning_cast<TH2F>(file->Get(name + "_MuonTimeDigis_vs_theta"));
+    hMuonTimeDigis_vs_theta_RZ =
+        hist_helper::make_non_owning_cast<TH2F>(file->Get(name + "_MuonTimeDigis_vs_theta_RZ"));
+    hMuonTimeDigis_vs_theta_RPhi =
+        hist_helper::make_non_owning_cast<TH2F>(file->Get(name + "_MuonTimeDigis_vs_theta_RPhi"));
+  }
+
+  void Write() {
     // 1D
-    hMuonDigis->Write(); 
-    hMuonTimeDigis->Write(); 
+    hMuonDigis->Write();
+    hMuonTimeDigis->Write();
 
-    // 2D    
+    // 2D
     hMuonTimeDigis_vs_theta->Write();
     hMuonTimeDigis_vs_theta_RZ->Write();
     hMuonTimeDigis_vs_theta_RPhi->Write();
   }
-  
+
   //  void Fill(double ndigi, double time,double theta){
-  void Fill(double time,double theta, int sltype){
-    hMuonTimeDigis->Fill(time); 
-    hMuonTimeDigis_vs_theta->Fill(theta,time);
-    if (sltype==2) hMuonTimeDigis_vs_theta_RZ->Fill(theta,time);
-    else hMuonTimeDigis_vs_theta_RPhi->Fill(theta,time);
+  void Fill(double time, double theta, int sltype) {
+    hMuonTimeDigis->Fill(time);
+    hMuonTimeDigis_vs_theta->Fill(theta, time);
+    if (sltype == 2)
+      hMuonTimeDigis_vs_theta_RZ->Fill(theta, time);
+    else
+      hMuonTimeDigis_vs_theta_RPhi->Fill(theta, time);
   }
 
-  void FillnDigis(int nDigis){
-    hMuonDigis->Fill(nDigis);
-  }
+  void FillnDigis(int nDigis) { hMuonDigis->Fill(nDigis); }
 
-  void Asymmetry(){
-    std::cout<<"["<<name<<"] theta asymmetry: "<<TH2asymmetry(hMuonTimeDigis_vs_theta.get())<<std::endl;
-    std::cout<<"["<<name<<"] theta_RZ asymmetry: "<<TH2asymmetry(hMuonTimeDigis_vs_theta_RZ.get())<<std::endl;
-    std::cout<<"["<<name<<"] theta_RPhi asymmetry: "<<TH2asymmetry(hMuonTimeDigis_vs_theta_RPhi.get())<<std::endl;
+  void Asymmetry() {
+    std::cout << "[" << name << "] theta asymmetry: " << TH2asymmetry(hMuonTimeDigis_vs_theta.get()) << std::endl;
+    std::cout << "[" << name << "] theta_RZ asymmetry: " << TH2asymmetry(hMuonTimeDigis_vs_theta_RZ.get()) << std::endl;
+    std::cout << "[" << name << "] theta_RPhi asymmetry: " << TH2asymmetry(hMuonTimeDigis_vs_theta_RPhi.get())
+              << std::endl;
   }
-  
- private:
 
-  double TH2asymmetry(TH2F* H){
-    double sx=H->Integral(0,60,0,960);
-    double dx=H->Integral(60,120,0,960);
-    double asym=(sx-dx)/(sx+dx);
+private:
+  double TH2asymmetry(TH2F *H) {
+    double sx = H->Integral(0, 60, 0, 960);
+    double dx = H->Integral(60, 120, 0, 960);
+    double asym = (sx - dx) / (sx + dx);
     return asym;
   }
-  
 
-
- public:
-  //1D  
-  std::shared_ptr<TH1F> hMuonDigis; 
-  std::shared_ptr<TH1F> hMuonTimeDigis; 
-  //2D
+public:
+  // 1D
+  std::shared_ptr<TH1F> hMuonDigis;
+  std::shared_ptr<TH1F> hMuonTimeDigis;
+  // 2D
   std::shared_ptr<TH2F> hMuonTimeDigis_vs_theta;
   std::shared_ptr<TH2F> hMuonTimeDigis_vs_theta_RZ;
   std::shared_ptr<TH2F> hMuonTimeDigis_vs_theta_RPhi;
 
- private:
+private:
   TString name;
-   
 };
 
-class hHits{
- public:
-  hHits(std::string name_){
+class hHits {
+public:
+  hHits(std::string name_) {
     TString N = name_.c_str();
-    name=N;
-    //booking degli istogrammi unidimensionali
-    hHitType= std::make_shared<TH1F>(N+"_HitType","Hit Type distribution for "+N,20,-5,15);
-    hDeltaZ = std::make_shared<TH1F>(N+"_DeltaZ","z_{exit} - z_{entry} distribution for "+N,100,-1.2,1.2);
-    hDeltaY = std::make_shared<TH1F>(N+"_DeltaY","y_{exit} - y_{entry} distribution for "+N,100,-1.2,1.2);
-    hDeltaX = std::make_shared<TH1F>(N+"_DeltaX","x_{exit} - x_{entry} distribution for "+N,100,-1.2,1.2);
-    hZentry = std::make_shared<TH1F>(N+"_Zentry","z_{entry} distribution for "+N,500,-0.6,0.6);
-    hZexit  = std::make_shared<TH1F>(N+"_Zexit","z_{exit} distribution for "+N,500,-0.6,0.6);
-    hXentry = std::make_shared<TH1F>(N+"_Xentry","x_{entry} distribution for "+N,500,-0.6,0.6);
-    hXexit  = std::make_shared<TH1F>(N+"_Xexit","x_{exit} distribution for "+N,500,-0.6,0.6);
-    hYentry = std::make_shared<TH1F>(N+"_Yentry","y_{entry} distribution for "+N,500,-0.6,0.6);
-    hYexit  = std::make_shared<TH1F>(N+"_Yexit","y_{exit} distribution for "+N,500,-0.6,0.6);
-    hHitMomentum = std::make_shared<TH1F>(N+"_HitMomentum","Momentum distribution for "+N,100,0,100);
-    hAbsZEntry   = std::make_shared<TH1F>(N+"_AbsZEntry","|z| distribution for "+N+" entry points in the horizontal planes of the cell",100,0.57,0.58);
-    hAbsZExit    = std::make_shared<TH1F>(N+"_AbsZExit","|z| distribution for "+N+" exit points in the horizontal planes of the cell",100,0.57,0.58);
-    hAbsXEntry   = std::make_shared<TH1F>(N+"_AbsXEntry","|x| distribution for "+N+" entry points in the vertical planes of the cell",100,2.045,2.055);
-    hAbsXExit    = std::make_shared<TH1F>(N+"_AbsXExit","|x| distribution for "+N+" exit points in the vertical planes of the cell",100,2.04,2.06);
-    hAbsYEntry   = std::make_shared<TH1F>(N+"_AbsYEntry","|y| distribution for "+N+" entry points in the vertical planes of the cell",100,0,150);
-    hAbsYExit    = std::make_shared<TH1F>(N+"_AbsYExit","|y| distribution for "+N+" exit points in the vertical planes of the cell",100,0,150);
-    hSagittaGeom = std::make_shared<TH1F>(N+"_SagittaGeom","Geometric Sagitta distribution for "+N,100,0,.01);
-    hSagittaMag= std::make_shared<TH1F>(N+"_SagittaMag","Sagitta from magnetic bendig distribution, for "+N,100,0,.06);
-    hSagittaPVSType= std::make_shared<TH2F>(N+"_SagittaPVSType","Sagitta P VS hit type",14,0,14,100,0,.01);
-    hSagittaBVSType= std::make_shared<TH2F>(N+"_SagittaBVSType","Sagitta B VS hit type",14,0,14,100,0,.06);
-    hPathVSType= std::make_shared<TH2F>(N+"_PathVSType","Path VS hit type",14,0,14,840,0,4.2);
-    hPathXVSType= std::make_shared<TH2F>(N+"_PathXVSType","X Path VS hit type",14,0,14,840,0,4.2);
-    hProcessType= std::make_shared<TH1F>(N+"_ProcessType","Process Type",17,0,17);
-    hProcessVsHitType = std::make_shared<TH2F>(N+"_ProcessVsHitType","Process Type Vs Hit Type",14,0,14,17,0,17);
-    hPathVsProcess = std::make_shared<TH2F>(N+"_PathVsProcess","Path vs Process Type",14,0,14,840,0,4.2);
-    hPathXVsProcess = std::make_shared<TH2F>(N+"_PathXVsProcess","Path along X vs Process Type",14,0,14,840,0,4.2);
-
-    h3DPathXVsProcessVsType = std::make_shared<TH3F>(N+"_h3DPathXVsProcessVsType","Path along X vs Process Type and hit type",14,0,14,17,0,17,840,0,4.2);
-    h3DPathVsProcessVsType  = std::make_shared<TH3F>(N+"_h3DPathVsProcessVsType","Path vs Process Type and hit type",14,0,14,17,0,17,840,0,4.2);
-    h3DXexitVsProcessVsType = std::make_shared<TH3F>(N+"_h3DXexitVsProcessVsType","X exit vs Process Type and hit type",14,0,14,17,0,17,500,-0.6,0.6);
-
-    hHitTOF= std::make_shared<TH1F>(N+"_HitTOF","Hit TOF distribution for "+N,1000,1e4,1e8);
-
-  }
-  
-  virtual ~hHits(){
-//     delete hHitType;
-//     delete hZentry;
-//     delete hZexit;  
-//     delete hXentry;
-//     delete hXexit;
-//     delete hYentry;
-//     delete hYexit;
-//     delete hDeltaZ;
-//     delete hDeltaY;
-//     delete hDeltaX;
-//     delete hAbsZEntry;
-//     delete hAbsZExit;
-//     delete hAbsXEntry;
-//     delete hAbsXExit;
-//     delete hAbsYEntry;
-//     delete hAbsYExit;
-//     delete hHitMomentum;
-//     delete hSagittaGeom;
-//     delete hSagittaMag;
-//     delete hSagittaPVSType;
-//     delete hSagittaBVSType;
-//     delete hPathVSType;
-//     delete hPathXVSType;
-//     delete hProcessType;
-//     delete hProcessVsHitType;
-//     delete hPathVsProcess;
-//     delete hPathXVsProcess;
-
-//     delete h3DPathXVsProcessVsType;
-//     delete h3DPathVsProcessVsType;
-//     delete h3DXexitVsProcessVsType;
-
- }
-  	 
-  hHits(std::string name_,TFile *file){
-    name=name_.c_str();
-    //per lettura da file degli istogrammi
-    //1D
-    hHitType =     hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_HitType")); 
-    hDeltaZ =      hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_DeltaZ"));
-    hDeltaY =      hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_DeltaY"));
-    hDeltaX =      hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_DeltaX"));
-    hZentry =      hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_Zentry"));
-    hZexit =       hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_Zexit"));
-    hXentry =      hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_Xentry"));
-    hXexit =       hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_Xexit"));
-    hYentry =      hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_Yentry"));
-    hYexit =       hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_Yexit"));
-    hHitMomentum = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_HitMomentum"));
-    hAbsZEntry =   hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_AbsZEntry"));
-    hAbsZExit =    hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_AbsZExit"));
-    hAbsXEntry =   hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_AbsXEntry"));
-    hAbsXExit =    hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_AbsXExit"));
-    hAbsYEntry =   hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_AbsYEntry"));
-    hAbsYExit =    hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_AbsYExit"));
-    hSagittaGeom = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_SagittaGeom"));
-    hSagittaMag  = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_SagittaMag"));
-    hSagittaPVSType=hist_helper::make_non_owning_cast<TH2F>( file->Get(name+"_SagittaPVSType"));
-    hSagittaBVSType=hist_helper::make_non_owning_cast<TH2F>( file->Get(name+"_SagittaBVSType"));
-    hPathVSType    =hist_helper::make_non_owning_cast<TH2F>( file->Get(name+"_PathVSType"));
-    hPathXVSType   =hist_helper::make_non_owning_cast<TH2F>( file->Get(name+"_PathXVSType"));
-    hProcessType  = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_ProcessType"));
-    hProcessVsHitType = hist_helper::make_non_owning_cast<TH2F>( file->Get(name+"_ProcessVsHitType"));
-    hPathVsProcess    = hist_helper::make_non_owning_cast<TH2F>( file->Get(name+"_PathVsProcess"));
-    hPathXVsProcess   = hist_helper::make_non_owning_cast<TH2F>( file->Get(name+"_PathXVsProcess"));
-    h3DPathXVsProcessVsType = hist_helper::make_non_owning_cast<TH3F>( file->Get(name+"_h3DPathXVsProcessVsType"));
-    h3DPathVsProcessVsType  = hist_helper::make_non_owning_cast<TH3F>( file->Get(name+"_h3DPathVsProcessVsType"));
-    h3DXexitVsProcessVsType = hist_helper::make_non_owning_cast<TH3F>( file->Get(name+"_h3DXexitVsProcessVsType"));
-
-  }
-  
-  void Write(){
+    name = N;
+    // booking degli istogrammi unidimensionali
+    hHitType = std::make_shared<TH1F>(N + "_HitType", "Hit Type distribution for " + N, 20, -5, 15);
+    hDeltaZ = std::make_shared<TH1F>(N + "_DeltaZ", "z_{exit} - z_{entry} distribution for " + N, 100, -1.2, 1.2);
+    hDeltaY = std::make_shared<TH1F>(N + "_DeltaY", "y_{exit} - y_{entry} distribution for " + N, 100, -1.2, 1.2);
+    hDeltaX = std::make_shared<TH1F>(N + "_DeltaX", "x_{exit} - x_{entry} distribution for " + N, 100, -1.2, 1.2);
+    hZentry = std::make_shared<TH1F>(N + "_Zentry", "z_{entry} distribution for " + N, 500, -0.6, 0.6);
+    hZexit = std::make_shared<TH1F>(N + "_Zexit", "z_{exit} distribution for " + N, 500, -0.6, 0.6);
+    hXentry = std::make_shared<TH1F>(N + "_Xentry", "x_{entry} distribution for " + N, 500, -0.6, 0.6);
+    hXexit = std::make_shared<TH1F>(N + "_Xexit", "x_{exit} distribution for " + N, 500, -0.6, 0.6);
+    hYentry = std::make_shared<TH1F>(N + "_Yentry", "y_{entry} distribution for " + N, 500, -0.6, 0.6);
+    hYexit = std::make_shared<TH1F>(N + "_Yexit", "y_{exit} distribution for " + N, 500, -0.6, 0.6);
+    hHitMomentum = std::make_shared<TH1F>(N + "_HitMomentum", "Momentum distribution for " + N, 100, 0, 100);
+    hAbsZEntry =
+        std::make_shared<TH1F>(N + "_AbsZEntry",
+                               "|z| distribution for " + N + " entry points in the horizontal planes of the cell",
+                               100,
+                               0.57,
+                               0.58);
+    hAbsZExit =
+        std::make_shared<TH1F>(N + "_AbsZExit",
+                               "|z| distribution for " + N + " exit points in the horizontal planes of the cell",
+                               100,
+                               0.57,
+                               0.58);
+    hAbsXEntry =
+        std::make_shared<TH1F>(N + "_AbsXEntry",
+                               "|x| distribution for " + N + " entry points in the vertical planes of the cell",
+                               100,
+                               2.045,
+                               2.055);
+    hAbsXExit = std::make_shared<TH1F>(N + "_AbsXExit",
+                                       "|x| distribution for " + N + " exit points in the vertical planes of the cell",
+                                       100,
+                                       2.04,
+                                       2.06);
+    hAbsYEntry = std::make_shared<TH1F>(
+        N + "_AbsYEntry", "|y| distribution for " + N + " entry points in the vertical planes of the cell", 100, 0, 150);
+    hAbsYExit = std::make_shared<TH1F>(
+        N + "_AbsYExit", "|y| distribution for " + N + " exit points in the vertical planes of the cell", 100, 0, 150);
+    hSagittaGeom = std::make_shared<TH1F>(N + "_SagittaGeom", "Geometric Sagitta distribution for " + N, 100, 0, .01);
+    hSagittaMag =
+        std::make_shared<TH1F>(N + "_SagittaMag", "Sagitta from magnetic bendig distribution, for " + N, 100, 0, .06);
+    hSagittaPVSType = std::make_shared<TH2F>(N + "_SagittaPVSType", "Sagitta P VS hit type", 14, 0, 14, 100, 0, .01);
+    hSagittaBVSType = std::make_shared<TH2F>(N + "_SagittaBVSType", "Sagitta B VS hit type", 14, 0, 14, 100, 0, .06);
+    hPathVSType = std::make_shared<TH2F>(N + "_PathVSType", "Path VS hit type", 14, 0, 14, 840, 0, 4.2);
+    hPathXVSType = std::make_shared<TH2F>(N + "_PathXVSType", "X Path VS hit type", 14, 0, 14, 840, 0, 4.2);
+    hProcessType = std::make_shared<TH1F>(N + "_ProcessType", "Process Type", 17, 0, 17);
+    hProcessVsHitType =
+        std::make_shared<TH2F>(N + "_ProcessVsHitType", "Process Type Vs Hit Type", 14, 0, 14, 17, 0, 17);
+    hPathVsProcess = std::make_shared<TH2F>(N + "_PathVsProcess", "Path vs Process Type", 14, 0, 14, 840, 0, 4.2);
+    hPathXVsProcess =
+        std::make_shared<TH2F>(N + "_PathXVsProcess", "Path along X vs Process Type", 14, 0, 14, 840, 0, 4.2);
+
+    h3DPathXVsProcessVsType = std::make_shared<TH3F>(
+        N + "_h3DPathXVsProcessVsType", "Path along X vs Process Type and hit type", 14, 0, 14, 17, 0, 17, 840, 0, 4.2);
+    h3DPathVsProcessVsType = std::make_shared<TH3F>(
+        N + "_h3DPathVsProcessVsType", "Path vs Process Type and hit type", 14, 0, 14, 17, 0, 17, 840, 0, 4.2);
+    h3DXexitVsProcessVsType = std::make_shared<TH3F>(
+        N + "_h3DXexitVsProcessVsType", "X exit vs Process Type and hit type", 14, 0, 14, 17, 0, 17, 500, -0.6, 0.6);
+
+    hHitTOF = std::make_shared<TH1F>(N + "_HitTOF", "Hit TOF distribution for " + N, 1000, 1e4, 1e8);
+  }
+
+  virtual ~hHits() {
+    //     delete hHitType;
+    //     delete hZentry;
+    //     delete hZexit;
+    //     delete hXentry;
+    //     delete hXexit;
+    //     delete hYentry;
+    //     delete hYexit;
+    //     delete hDeltaZ;
+    //     delete hDeltaY;
+    //     delete hDeltaX;
+    //     delete hAbsZEntry;
+    //     delete hAbsZExit;
+    //     delete hAbsXEntry;
+    //     delete hAbsXExit;
+    //     delete hAbsYEntry;
+    //     delete hAbsYExit;
+    //     delete hHitMomentum;
+    //     delete hSagittaGeom;
+    //     delete hSagittaMag;
+    //     delete hSagittaPVSType;
+    //     delete hSagittaBVSType;
+    //     delete hPathVSType;
+    //     delete hPathXVSType;
+    //     delete hProcessType;
+    //     delete hProcessVsHitType;
+    //     delete hPathVsProcess;
+    //     delete hPathXVsProcess;
+
+    //     delete h3DPathXVsProcessVsType;
+    //     delete h3DPathVsProcessVsType;
+    //     delete h3DXexitVsProcessVsType;
+  }
+
+  hHits(std::string name_, TFile *file) {
+    name = name_.c_str();
+    // per lettura da file degli istogrammi
+    // 1D
+    hHitType = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_HitType"));
+    hDeltaZ = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_DeltaZ"));
+    hDeltaY = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_DeltaY"));
+    hDeltaX = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_DeltaX"));
+    hZentry = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_Zentry"));
+    hZexit = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_Zexit"));
+    hXentry = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_Xentry"));
+    hXexit = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_Xexit"));
+    hYentry = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_Yentry"));
+    hYexit = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_Yexit"));
+    hHitMomentum = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_HitMomentum"));
+    hAbsZEntry = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_AbsZEntry"));
+    hAbsZExit = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_AbsZExit"));
+    hAbsXEntry = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_AbsXEntry"));
+    hAbsXExit = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_AbsXExit"));
+    hAbsYEntry = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_AbsYEntry"));
+    hAbsYExit = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_AbsYExit"));
+    hSagittaGeom = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_SagittaGeom"));
+    hSagittaMag = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_SagittaMag"));
+    hSagittaPVSType = hist_helper::make_non_owning_cast<TH2F>(file->Get(name + "_SagittaPVSType"));
+    hSagittaBVSType = hist_helper::make_non_owning_cast<TH2F>(file->Get(name + "_SagittaBVSType"));
+    hPathVSType = hist_helper::make_non_owning_cast<TH2F>(file->Get(name + "_PathVSType"));
+    hPathXVSType = hist_helper::make_non_owning_cast<TH2F>(file->Get(name + "_PathXVSType"));
+    hProcessType = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_ProcessType"));
+    hProcessVsHitType = hist_helper::make_non_owning_cast<TH2F>(file->Get(name + "_ProcessVsHitType"));
+    hPathVsProcess = hist_helper::make_non_owning_cast<TH2F>(file->Get(name + "_PathVsProcess"));
+    hPathXVsProcess = hist_helper::make_non_owning_cast<TH2F>(file->Get(name + "_PathXVsProcess"));
+    h3DPathXVsProcessVsType = hist_helper::make_non_owning_cast<TH3F>(file->Get(name + "_h3DPathXVsProcessVsType"));
+    h3DPathVsProcessVsType = hist_helper::make_non_owning_cast<TH3F>(file->Get(name + "_h3DPathVsProcessVsType"));
+    h3DXexitVsProcessVsType = hist_helper::make_non_owning_cast<TH3F>(file->Get(name + "_h3DXexitVsProcessVsType"));
+  }
+
+  void Write() {
     hHitType->Write();
     hZentry->Write();
     hZexit->Write();
@@ -270,15 +297,20 @@ class hHits{
     h3DXexitVsProcessVsType->Write();
     hHitTOF->Write();
   }
-  
-  void FillTOF(double tof){hHitTOF->Fill(tof);}
 
-  void Fill(double xEntry,double xExit,
-	    double entryPy, double exitPy,
-	    double entryPz, double exitPz,
-	    double path, double path_x,
-	    int hitType,float processType,
-	    double pAbs){//,double wire_length){
+  void FillTOF(double tof) { hHitTOF->Fill(tof); }
+
+  void Fill(double xEntry,
+            double xExit,
+            double entryPy,
+            double exitPy,
+            double entryPz,
+            double exitPz,
+            double path,
+            double path_x,
+            int hitType,
+            float processType,
+            double pAbs) {  //,double wire_length){
 
     hHitType->Fill(hitType);
     hZentry->Fill(entryPz);
@@ -298,37 +330,37 @@ class hHits{
     hAbsZEntry->Fill(fabs(entryPz));
     hAbsZExit->Fill(fabs(exitPz));
 
-    if(fabs(entryPz) < 0.573) {
-      hAbsXEntry->Fill(fabs(xEntry));  
+    if (fabs(entryPz) < 0.573) {
+      hAbsXEntry->Fill(fabs(xEntry));
     }
 
-    if(fabs(exitPz) < 0.573) {
+    if (fabs(exitPz) < 0.573) {
       hAbsXExit->Fill(fabs(xExit));
     }
 
-    //  hAbsYEntry->Fill(wire_length/2.-fabs(entryPy)); 
-    // hAbsYExit->Fill(wire_length/2.-fabs(exitPy)); 
+    //  hAbsYEntry->Fill(wire_length/2.-fabs(entryPy));
+    // hAbsYExit->Fill(wire_length/2.-fabs(exitPy));
 
-    hPathVSType->Fill(hitType,path);
-    hPathXVSType->Fill(hitType,path_x);
+    hPathVSType->Fill(hitType, path);
+    hPathXVSType->Fill(hitType, path_x);
     hProcessType->Fill(processType);
-    hProcessVsHitType->Fill(hitType,processType);
-    hPathVsProcess->Fill(processType,path);
-    hPathXVsProcess->Fill(processType,path_x);
+    hProcessVsHitType->Fill(hitType, processType);
+    hPathVsProcess->Fill(processType, path);
+    hPathXVsProcess->Fill(processType, path_x);
 
-    h3DPathXVsProcessVsType->Fill(processType,hitType,path_x);
-    h3DPathVsProcessVsType->Fill(processType,hitType,path);
-    h3DXexitVsProcessVsType->Fill(processType,hitType,xExit);
-}
+    h3DPathXVsProcessVsType->Fill(processType, hitType, path_x);
+    h3DPathVsProcessVsType->Fill(processType, hitType, path);
+    h3DXexitVsProcessVsType->Fill(processType, hitType, xExit);
+  }
 
-  void FillSagittas(double SG,double SM,int hitType){
+  void FillSagittas(double SG, double SM, int hitType) {
     hSagittaGeom->Fill(SG);
     hSagittaMag->Fill(SM);
-    hSagittaPVSType->Fill(hitType,SG);
-    hSagittaBVSType->Fill(hitType,SM);
+    hSagittaPVSType->Fill(hitType, SG);
+    hSagittaBVSType->Fill(hitType, SM);
   }
 
- public:
+public:
   std::shared_ptr<TH1F> hHitType;
   std::shared_ptr<TH1F> hZentry;
   std::shared_ptr<TH1F> hZexit;
@@ -346,7 +378,7 @@ class hHits{
   std::shared_ptr<TH1F> hAbsYEntry;
   std::shared_ptr<TH1F> hAbsYExit;
   std::shared_ptr<TH1F> hHitMomentum;
-  std::shared_ptr<TH1F> hSagittaGeom; 
+  std::shared_ptr<TH1F> hSagittaGeom;
   std::shared_ptr<TH1F> hSagittaMag;
   std::shared_ptr<TH2F> hSagittaPVSType;
   std::shared_ptr<TH2F> hSagittaBVSType;
@@ -361,61 +393,62 @@ class hHits{
   std::shared_ptr<TH3F> h3DXexitVsProcessVsType;
   std::shared_ptr<TH1F> hHitTOF;
 
- private:
+private:
   TString name;
 };
 
-class hDeltaR{
- public:
-  hDeltaR(std::string name_){
+class hDeltaR {
+public:
+  hDeltaR(std::string name_) {
     TString N = name_.c_str();
-    name=N;
-    //booking degli istogrammi unidimensionali
-    hZentry = std::make_shared<TH1F>(N+"_Zentry","z_{entry} distribution",120,-0.6,0.6);
-    hXentry = std::make_shared<TH1F>(N+"_Xentry","x_{entry} distribution",120,-4.2,4.2);
-    hYentry = std::make_shared<TH1F>(N+"_Yentry","y_{entry} distribution",120,-400,400);
-    hHitMomentum = std::make_shared<TH1F>(N+"_HitMomentum","Momentum distribution",100,0,.2);
-    hHitEnergyLoss = std::make_shared<TH1F>(N+"_HitEnergyLoss","Energy Loss distribution",75,0,100); //in keV--> x10^6
-    hSagittaMag= std::make_shared<TH1F>(N+"_SagittaMag","Sagitta from magnetic bendig",120,0,.04);
-    hPath= std::make_shared<TH1F>(N+"_Path","Path",200,0,4.2);
-    hPathX= std::make_shared<TH1F>(N+"_PathX","X Path",200,0,4.2);
-    hZoomPath= std::make_shared<TH1F>(N+"_ZoomPath","Path",200,0,.1);
-    hZoomPathX= std::make_shared<TH1F>(N+"_ZoomPathX","X Path",200,0,.1);
-    hType = std::make_shared<TH1F>(N+"_Type","Delta type 3-electron 2-positron",4,0,4);
-  }
-   
-  virtual ~hDeltaR(){
-//     delete hType;
-//     delete hZentry;
-//     delete hXentry;
-//     delete hYentry;
-//     delete hHitMomentum;
-//     delete hHitEnergyLoss;
-//     delete hSagittaMag;
-//     delete hPath;
-//     delete hPathX;
-//     delete hZoomPath;
-//     delete hZoomPathX;
-  }
-  
-  hDeltaR(std::string name_,TFile *file){
-    name=name_.c_str();
-    //per lettura da file degli istogrammi
-    //1D
-    hType =      hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_Type"));
-    hZentry =      hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_Zentry"));
-    hXentry =      hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_Xentry"));
-    hYentry =      hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_Yentry"));
-    hHitMomentum = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_HitMomentum"));
-    hHitMomentum = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_HitEnergyLoss"));
-    hSagittaMag  = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_SagittaMag"));
-    hPath    =hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_Path"));
-    hPathX   =hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_PathX"));
-    hZoomPath    =hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_ZoomPath"));
-    hZoomPathX   =hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_ZoomPathX"));
-  }
-  
-  void Write(){
+    name = N;
+    // booking degli istogrammi unidimensionali
+    hZentry = std::make_shared<TH1F>(N + "_Zentry", "z_{entry} distribution", 120, -0.6, 0.6);
+    hXentry = std::make_shared<TH1F>(N + "_Xentry", "x_{entry} distribution", 120, -4.2, 4.2);
+    hYentry = std::make_shared<TH1F>(N + "_Yentry", "y_{entry} distribution", 120, -400, 400);
+    hHitMomentum = std::make_shared<TH1F>(N + "_HitMomentum", "Momentum distribution", 100, 0, .2);
+    hHitEnergyLoss =
+        std::make_shared<TH1F>(N + "_HitEnergyLoss", "Energy Loss distribution", 75, 0, 100);  // in keV--> x10^6
+    hSagittaMag = std::make_shared<TH1F>(N + "_SagittaMag", "Sagitta from magnetic bendig", 120, 0, .04);
+    hPath = std::make_shared<TH1F>(N + "_Path", "Path", 200, 0, 4.2);
+    hPathX = std::make_shared<TH1F>(N + "_PathX", "X Path", 200, 0, 4.2);
+    hZoomPath = std::make_shared<TH1F>(N + "_ZoomPath", "Path", 200, 0, .1);
+    hZoomPathX = std::make_shared<TH1F>(N + "_ZoomPathX", "X Path", 200, 0, .1);
+    hType = std::make_shared<TH1F>(N + "_Type", "Delta type 3-electron 2-positron", 4, 0, 4);
+  }
+
+  virtual ~hDeltaR() {
+    //     delete hType;
+    //     delete hZentry;
+    //     delete hXentry;
+    //     delete hYentry;
+    //     delete hHitMomentum;
+    //     delete hHitEnergyLoss;
+    //     delete hSagittaMag;
+    //     delete hPath;
+    //     delete hPathX;
+    //     delete hZoomPath;
+    //     delete hZoomPathX;
+  }
+
+  hDeltaR(std::string name_, TFile *file) {
+    name = name_.c_str();
+    // per lettura da file degli istogrammi
+    // 1D
+    hType = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_Type"));
+    hZentry = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_Zentry"));
+    hXentry = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_Xentry"));
+    hYentry = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_Yentry"));
+    hHitMomentum = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_HitMomentum"));
+    hHitMomentum = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_HitEnergyLoss"));
+    hSagittaMag = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_SagittaMag"));
+    hPath = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_Path"));
+    hPathX = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_PathX"));
+    hZoomPath = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_ZoomPath"));
+    hZoomPathX = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_ZoomPathX"));
+  }
+
+  void Write() {
     hType->Write();
     hZentry->Write();
     hXentry->Write();
@@ -426,35 +459,41 @@ class hDeltaR{
     hPathX->Write();
     hZoomPath->Write();
     hZoomPathX->Write();
-
   }
-  
-  void Fill(double xEntry, double yEntry, double zEntry,
-	    double path, double path_x, double SM,
-	    double pAbs, double En, int type){
-    
+
+  void Fill(double xEntry,
+            double yEntry,
+            double zEntry,
+            double path,
+            double path_x,
+            double SM,
+            double pAbs,
+            double En,
+            int type) {
     hZentry->Fill(zEntry);
     hXentry->Fill(xEntry);
     hYentry->Fill(yEntry);
 
     hHitMomentum->Fill(pAbs);
-    hHitEnergyLoss->Fill(En*1e6);
-    
+    hHitEnergyLoss->Fill(En * 1e6);
+
     hPath->Fill(path);
     hPathX->Fill(path_x);
-    if(path<=.1) hZoomPath->Fill(path);
-    if(path_x<=.1) hZoomPathX->Fill(path_x);
-    
+    if (path <= .1)
+      hZoomPath->Fill(path);
+    if (path_x <= .1)
+      hZoomPathX->Fill(path_x);
+
     hSagittaMag->Fill(SM);
     hType->Fill(type);
   }
-  
- public:
+
+public:
   std::shared_ptr<TH1F> hType;
   std::shared_ptr<TH1F> hZentry;
   std::shared_ptr<TH1F> hXentry;
   std::shared_ptr<TH1F> hYentry;
-  std::shared_ptr<TH1F> hHitMomentum;		
+  std::shared_ptr<TH1F> hHitMomentum;
   std::shared_ptr<TH1F> hHitEnergyLoss;
   std::shared_ptr<TH1F> hSagittaMag;
   std::shared_ptr<TH1F> hPath;
@@ -462,156 +501,152 @@ class hDeltaR{
   std::shared_ptr<TH1F> hZoomPath;
   std::shared_ptr<TH1F> hZoomPathX;
 
-  
- private:
+private:
   TString name;
 };
 
-
-class hParam{
- public:
-  hParam(std::string name_){
+class hParam {
+public:
+  hParam(std::string name_) {
     TString N = name_.c_str();
-    name=N;
-    //booking degli istogrammi unidimensionali
-    HitParam_X = std::make_shared<TH1F>(N+"_HitParam_X","Distribution of theta for parameterization cases in Rphi layers",100,-2.1,2.1);  
-    HitParam_Theta = std::make_shared<TH1F>(N+"_HitParam_Theta","Distribution of theta for parameterization cases in Rphi layers",100,-180.,180.);  
-    HitParam_Bwire = std::make_shared<TH1F>(N+"_HitParam_Bwire","Distribution of bwire for parameterization cases in Rz layers",100,-0.5,0.5);
-    HitParam_Bnorm = std::make_shared<TH1F>(N+"_HitParam_Bnorm","Distribution of bnorm for parameterization cases in Rphi layers",100,-1,1);  
-  }
-  
-  virtual ~hParam(){
-//   delete HitParam_X;
-//   delete HitParam_Theta;
-//   delete HitParam_Bwire;
-//   delete HitParam_Bnorm;
-  }
-  	 
-  hParam(std::string name_,TFile *file){
-    name=name_.c_str();
-    //per lettura da file degli istogrammi
-    //1D
-    HitParam_X       = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_HitParam_X"));
-    HitParam_Theta   = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_HitParam_Theta"));
-    HitParam_Bwire   = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_HitParam_Bwire"));
-    HitParam_Bnorm   = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_HitParam_Bnorm"));
-  }
-
-  void Fill(double x,double theta,double Bwire,double Bnorm){
+    name = N;
+    // booking degli istogrammi unidimensionali
+    HitParam_X = std::make_shared<TH1F>(
+        N + "_HitParam_X", "Distribution of theta for parameterization cases in Rphi layers", 100, -2.1, 2.1);
+    HitParam_Theta = std::make_shared<TH1F>(
+        N + "_HitParam_Theta", "Distribution of theta for parameterization cases in Rphi layers", 100, -180., 180.);
+    HitParam_Bwire = std::make_shared<TH1F>(
+        N + "_HitParam_Bwire", "Distribution of bwire for parameterization cases in Rz layers", 100, -0.5, 0.5);
+    HitParam_Bnorm = std::make_shared<TH1F>(
+        N + "_HitParam_Bnorm", "Distribution of bnorm for parameterization cases in Rphi layers", 100, -1, 1);
+  }
+
+  virtual ~hParam() {
+    //   delete HitParam_X;
+    //   delete HitParam_Theta;
+    //   delete HitParam_Bwire;
+    //   delete HitParam_Bnorm;
+  }
+
+  hParam(std::string name_, TFile *file) {
+    name = name_.c_str();
+    // per lettura da file degli istogrammi
+    // 1D
+    HitParam_X = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_HitParam_X"));
+    HitParam_Theta = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_HitParam_Theta"));
+    HitParam_Bwire = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_HitParam_Bwire"));
+    HitParam_Bnorm = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_HitParam_Bnorm"));
+  }
+
+  void Fill(double x, double theta, double Bwire, double Bnorm) {
     HitParam_X->Fill(x);
     HitParam_Theta->Fill(theta);
     HitParam_Bwire->Fill(Bwire);
     HitParam_Bnorm->Fill(Bnorm);
   }
 
-  void Write(){
+  void Write() {
     HitParam_X->Write();
     HitParam_Theta->Write();
     HitParam_Bwire->Write();
     HitParam_Bnorm->Write();
   }
-  
- public:
+
+public:
   std::shared_ptr<TH1F> HitParam_X;
   std::shared_ptr<TH1F> HitParam_Theta;
   std::shared_ptr<TH1F> HitParam_Bwire;
   std::shared_ptr<TH1F> HitParam_Bnorm;
 
- private:
+private:
   TString name;
-
 };
 
-class hMuonStat{
- public:
-    hMuonStat(std::string name_){
-      TString N = name_.c_str();
-      name=N;
-      //booking degli istogrammi unidimensionali
-      hMuonNumber  = std::make_shared<TH1F> ("hMuon"+N, "Muon hits ", 200, 0., 200.);
-      hMuonVsEta  = std::make_shared<TH1F> ("hMuon"+N+"VsEta", "Muon "+N+" vs eta",100, -1.2, 1.2);
-      hMuonVsPhi  = std::make_shared<TH1F> ("hMuon"+N+"VsPhi", "Muon "+N+" vs phi",100, -Geom::pi(), +Geom::pi());
-    }
-        
-    hMuonStat(std::string name_,TFile *file){
-      name=name_.c_str();
-      //per lettura da file degli istogrammi
-      //1D
-      hMuonNumber  =  hist_helper::make_non_owning_cast<TH1F>( file->Get("hMuon"+name));
-      hMuonVsEta =  hist_helper::make_non_owning_cast<TH1F>( file->Get("hMuon"+name+"VsEta"));
-      hMuonVsPhi  = hist_helper::make_non_owning_cast<TH1F>( file->Get("hMuon"+name+"VsPhi"));
-    }
-    
-    ~hMuonStat(){
-//       delete hMuonNumber;
-//       delete hMuonVsEta;
-//       delete hMuonVsPhi;
-    }
-    void Write(){
-      hMuonNumber->Write();
-      hMuonVsEta->Write();
-      hMuonVsPhi->Write();
-    }
+class hMuonStat {
+public:
+  hMuonStat(std::string name_) {
+    TString N = name_.c_str();
+    name = N;
+    // booking degli istogrammi unidimensionali
+    hMuonNumber = std::make_shared<TH1F>("hMuon" + N, "Muon hits ", 200, 0., 200.);
+    hMuonVsEta = std::make_shared<TH1F>("hMuon" + N + "VsEta", "Muon " + N + " vs eta", 100, -1.2, 1.2);
+    hMuonVsPhi = std::make_shared<TH1F>("hMuon" + N + "VsPhi", "Muon " + N + " vs phi", 100, -Geom::pi(), +Geom::pi());
+  }
 
-    void Fill(int hits,double eta, double phi){
-      hMuonNumber->Fill(hits);
-      hMuonVsEta->Fill(eta,hits);
-      hMuonVsPhi->Fill(phi,hits);
-    }
+  hMuonStat(std::string name_, TFile *file) {
+    name = name_.c_str();
+    // per lettura da file degli istogrammi
+    // 1D
+    hMuonNumber = hist_helper::make_non_owning_cast<TH1F>(file->Get("hMuon" + name));
+    hMuonVsEta = hist_helper::make_non_owning_cast<TH1F>(file->Get("hMuon" + name + "VsEta"));
+    hMuonVsPhi = hist_helper::make_non_owning_cast<TH1F>(file->Get("hMuon" + name + "VsPhi"));
+  }
 
- public:
-    std::shared_ptr<TH1F> hMuonNumber;
-    std::shared_ptr<TH1F> hMuonVsEta;
-    std::shared_ptr<TH1F> hMuonVsPhi;
-    
- private:
-  TString   name;
+  ~hMuonStat() {
+    //       delete hMuonNumber;
+    //       delete hMuonVsEta;
+    //       delete hMuonVsPhi;
+  }
+  void Write() {
+    hMuonNumber->Write();
+    hMuonVsEta->Write();
+    hMuonVsPhi->Write();
+  }
 
-};
+  void Fill(int hits, double eta, double phi) {
+    hMuonNumber->Fill(hits);
+    hMuonVsEta->Fill(eta, hits);
+    hMuonVsPhi->Fill(phi, hits);
+  }
 
+public:
+  std::shared_ptr<TH1F> hMuonNumber;
+  std::shared_ptr<TH1F> hMuonVsEta;
+  std::shared_ptr<TH1F> hMuonVsPhi;
 
-class hTOF{
+private:
+  TString name;
+};
+
+class hTOF {
 public:
-  hTOF(std::string name){
+  hTOF(std::string name) {
     TString N = name.c_str();
 
-    hTOF_true =   std::make_shared<TH1F>(N+"_TOF_true","TOF true",200,10.,35.);
-    hTOF_hitPos = std::make_shared<TH1F>(N+"_TOF_hitPos","TOF assumed, hit pos",200,10.,35.);
-    hTOF_WC     = std::make_shared<TH1F>(N+"_TOF_WC","TOF assumed, wire center",200,10.,35.);
-
-    hDeltaTOF_hitPos = std::make_shared<TH1F>(N+"_DeltaTOF_hitPos","TOF assumed, hit pos",200,-5.,5.);
-    hDeltaTOF_WC     = std::make_shared<TH1F>(N+"_DelataTOF_WC","TOF assumed, wire center",200,-5.,5.);
+    hTOF_true = std::make_shared<TH1F>(N + "_TOF_true", "TOF true", 200, 10., 35.);
+    hTOF_hitPos = std::make_shared<TH1F>(N + "_TOF_hitPos", "TOF assumed, hit pos", 200, 10., 35.);
+    hTOF_WC = std::make_shared<TH1F>(N + "_TOF_WC", "TOF assumed, wire center", 200, 10., 35.);
 
-  }
-  
-  hTOF(std::string name_,TFile *file){
-    name=name_.c_str();
-    hTOF_true =  hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_TOF_true"));
-    hTOF_hitPos=  hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_TOF_hitPos"));
-    hTOF_WC    =  hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_TOF_WC"));
-    hDeltaTOF_hitPos= hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_DeltaTOF_hitPos"));
-    hDeltaTOF_WC=     hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_DeltaTOF_WC"));
+    hDeltaTOF_hitPos = std::make_shared<TH1F>(N + "_DeltaTOF_hitPos", "TOF assumed, hit pos", 200, -5., 5.);
+    hDeltaTOF_WC = std::make_shared<TH1F>(N + "_DelataTOF_WC", "TOF assumed, wire center", 200, -5., 5.);
   }
 
+  hTOF(std::string name_, TFile *file) {
+    name = name_.c_str();
+    hTOF_true = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_TOF_true"));
+    hTOF_hitPos = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_TOF_hitPos"));
+    hTOF_WC = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_TOF_WC"));
+    hDeltaTOF_hitPos = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_DeltaTOF_hitPos"));
+    hDeltaTOF_WC = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_DeltaTOF_WC"));
+  }
 
-  ~hTOF(){
-//     delete hTOF_true;
-//     delete hTOF_hitPos;
-//     delete hTOF_WC;
-//     delete hDeltaTOF_hitPos;
-//     delete hDeltaTOF_WC;
+  ~hTOF() {
+    //     delete hTOF_true;
+    //     delete hTOF_hitPos;
+    //     delete hTOF_WC;
+    //     delete hDeltaTOF_hitPos;
+    //     delete hDeltaTOF_WC;
   }
-  
-  void Fill(float tof, float TOF_WC, float TOF_hitPos){
+
+  void Fill(float tof, float TOF_WC, float TOF_hitPos) {
     hTOF_hitPos->Fill(TOF_hitPos);
     hTOF_WC->Fill(TOF_WC);
     hTOF_true->Fill(tof);
-    hDeltaTOF_hitPos->Fill(tof-TOF_hitPos);
-    hDeltaTOF_WC->Fill(tof-TOF_WC);
+    hDeltaTOF_hitPos->Fill(tof - TOF_hitPos);
+    hDeltaTOF_WC->Fill(tof - TOF_WC);
   }
 
-
-  void Write(){
+  void Write() {
     hTOF_true->Write();
     hTOF_hitPos->Write();
     hTOF_WC->Write();
@@ -619,7 +654,6 @@ class hTOF{
     hDeltaTOF_WC->Write();
   }
 
-
 public:
   std::shared_ptr<TH1F> hTOF_true;
   std::shared_ptr<TH1F> hTOF_hitPos;
@@ -627,139 +661,137 @@ class hTOF{
   std::shared_ptr<TH1F> hDeltaTOF_hitPos;
   std::shared_ptr<TH1F> hDeltaTOF_WC;
 
- private:
+private:
   TString name;
-  
 };
 
-class hTDelay{
+class hTDelay {
 public:
-  hTDelay(std::string name){
+  hTDelay(std::string name) {
     TString N = name.c_str();
-    
-    hTDelay_true     = std::make_shared<TH1F>(N+"_TDelay_true", "Delay (true)",
-			   100, 0., 15.);
-    hTDelay_WC  = std::make_shared<TH1F>(N+"_TDelay_WC", "Delay (assumed, wire center)",
-			   100, 0., 15.);
-
-    hTDelay_hitpos  = std::make_shared<TH1F>(N+"_TDelay_hitpos", "Delay (assumed, hit pos)",
-			       100, 0., 15.);
-    
-    hDeltaTDelay_WC = std::make_shared<TH1F>(N+"_dTDelay_WC", "Delay true - WC",
-			   150, -15, 15.);
-    hDeltaTDelay_hitpos = std::make_shared<TH1F>(N+"_dTDelay_hitpos", "Delay true - hitpos",
-			       150, -15, 15.);
-
-  }
-  
-  hTDelay(std::string name_,TFile *file){
-    name=name_.c_str();
-    hTDelay_true = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_TDelay_true"));
-    hTDelay_WC  = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_TDelay_WC"));
-    hTDelay_hitpos  = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_TDelay_hitpos"));
-    hDeltaTDelay_WC = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_DeltaTDelay_WC"));
-    hDeltaTDelay_hitpos = hist_helper::make_non_owning_cast<TH1F>( file->Get(name+"_DeltaTDelay_hitpos"));
+
+    hTDelay_true = std::make_shared<TH1F>(N + "_TDelay_true", "Delay (true)", 100, 0., 15.);
+    hTDelay_WC = std::make_shared<TH1F>(N + "_TDelay_WC", "Delay (assumed, wire center)", 100, 0., 15.);
+
+    hTDelay_hitpos = std::make_shared<TH1F>(N + "_TDelay_hitpos", "Delay (assumed, hit pos)", 100, 0., 15.);
+
+    hDeltaTDelay_WC = std::make_shared<TH1F>(N + "_dTDelay_WC", "Delay true - WC", 150, -15, 15.);
+    hDeltaTDelay_hitpos = std::make_shared<TH1F>(N + "_dTDelay_hitpos", "Delay true - hitpos", 150, -15, 15.);
+  }
+
+  hTDelay(std::string name_, TFile *file) {
+    name = name_.c_str();
+    hTDelay_true = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_TDelay_true"));
+    hTDelay_WC = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_TDelay_WC"));
+    hTDelay_hitpos = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_TDelay_hitpos"));
+    hDeltaTDelay_WC = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_DeltaTDelay_WC"));
+    hDeltaTDelay_hitpos = hist_helper::make_non_owning_cast<TH1F>(file->Get(name + "_DeltaTDelay_hitpos"));
   }
   ~hTDelay() {
-//     delete hTDelay_true;	
-//     delete hTDelay_WC;	
-//     delete hTDelay_hitpos;
-//     delete hDeltaTDelay_WC;
-//     delete hDeltaTDelay_hitpos;
-  }  
-
-  void Fill(float t_True, float t_WC, float t_hitpos){
-   hTDelay_true->Fill(t_True);	  
-   hTDelay_WC->Fill(t_WC);  
-   hTDelay_hitpos->Fill(t_hitpos);
-   hDeltaTDelay_WC->Fill(t_WC-t_True);
-   hDeltaTDelay_hitpos->Fill(t_hitpos-t_True);
-  }
-
-  void Write(){
-    hTDelay_true->Write();	
+    //     delete hTDelay_true;
+    //     delete hTDelay_WC;
+    //     delete hTDelay_hitpos;
+    //     delete hDeltaTDelay_WC;
+    //     delete hDeltaTDelay_hitpos;
+  }
+
+  void Fill(float t_True, float t_WC, float t_hitpos) {
+    hTDelay_true->Fill(t_True);
+    hTDelay_WC->Fill(t_WC);
+    hTDelay_hitpos->Fill(t_hitpos);
+    hDeltaTDelay_WC->Fill(t_WC - t_True);
+    hDeltaTDelay_hitpos->Fill(t_hitpos - t_True);
+  }
+
+  void Write() {
+    hTDelay_true->Write();
     hTDelay_WC->Write();
     hTDelay_hitpos->Write();
     hDeltaTDelay_WC->Write();
     hDeltaTDelay_hitpos->Write();
-  }  
+  }
 
 public:
-  std::shared_ptr<TH1F>  hTDelay_true;
-  std::shared_ptr<TH1F>  hTDelay_WC;
-  std::shared_ptr<TH1F>  hTDelay_hitpos;
-  std::shared_ptr<TH1F>  hDeltaTDelay_WC;
-  std::shared_ptr<TH1F>  hDeltaTDelay_hitpos;
- private:
+  std::shared_ptr<TH1F> hTDelay_true;
+  std::shared_ptr<TH1F> hTDelay_WC;
+  std::shared_ptr<TH1F> hTDelay_hitpos;
+  std::shared_ptr<TH1F> hDeltaTDelay_WC;
+  std::shared_ptr<TH1F> hDeltaTDelay_hitpos;
+
+private:
   TString name;
 };
 
-template<class hTime>
-class hTimes{
- public:
-  hTimes(std::string name){
-    RZ = std::make_shared<hTime>(name+"_RZ");
-    RPhi = std::make_shared<hTime>(name+"_RPhi");
-    W0 = std::make_shared<hTime>(name+"_Wheel0");
-    W1 = std::make_shared<hTime>(name+"_Wheel1");
-    W2 = std::make_shared<hTime>(name+"_Wheel2");  
-  }
-  
-  hTimes(std::string name_,TFile *file){
-    name=name_.c_str();
-
-    RZ =   hist_helper::make_non_owning_cast<hTime>( file->Get(name+"_RZ"));
-    RPhi = hist_helper::make_non_owning_cast<hTime>( file->Get(name+"_RPhi"));
-    W0 =   hist_helper::make_non_owning_cast<hTime>( file->Get(name+"_Wheel0"));
-    W1 =   hist_helper::make_non_owning_cast<hTime>( file->Get(name+"_Wheel1"));
-    W2 =   hist_helper::make_non_owning_cast<hTime>( file->Get(name+"_Wheel2"));
-  }
-
- 
-  ~hTimes(){
-//     delete RZ;
-//     delete RPhi;
-//     delete W0;
-//     delete W1;
-//     delete W2;
-  }
-
-  void Fill(float t_True, float t_WC, float t_hitpos, int wheel_type, int sltype){
-    if (sltype==2) RZ->Fill(t_True,t_WC,t_hitpos);
-    else  RPhi->Fill(t_True,t_WC,t_hitpos);
-    WheelHistos(wheel_type)->Fill(t_True,t_WC,t_hitpos);
-  }
-  
-  void Write(){
+template <class hTime>
+class hTimes {
+public:
+  hTimes(std::string name) {
+    RZ = std::make_shared<hTime>(name + "_RZ");
+    RPhi = std::make_shared<hTime>(name + "_RPhi");
+    W0 = std::make_shared<hTime>(name + "_Wheel0");
+    W1 = std::make_shared<hTime>(name + "_Wheel1");
+    W2 = std::make_shared<hTime>(name + "_Wheel2");
+  }
+
+  hTimes(std::string name_, TFile *file) {
+    name = name_.c_str();
+
+    RZ = hist_helper::make_non_owning_cast<hTime>(file->Get(name + "_RZ"));
+    RPhi = hist_helper::make_non_owning_cast<hTime>(file->Get(name + "_RPhi"));
+    W0 = hist_helper::make_non_owning_cast<hTime>(file->Get(name + "_Wheel0"));
+    W1 = hist_helper::make_non_owning_cast<hTime>(file->Get(name + "_Wheel1"));
+    W2 = hist_helper::make_non_owning_cast<hTime>(file->Get(name + "_Wheel2"));
+  }
+
+  ~hTimes() {
+    //     delete RZ;
+    //     delete RPhi;
+    //     delete W0;
+    //     delete W1;
+    //     delete W2;
+  }
+
+  void Fill(float t_True, float t_WC, float t_hitpos, int wheel_type, int sltype) {
+    if (sltype == 2)
+      RZ->Fill(t_True, t_WC, t_hitpos);
+    else
+      RPhi->Fill(t_True, t_WC, t_hitpos);
+    WheelHistos(wheel_type)->Fill(t_True, t_WC, t_hitpos);
+  }
+
+  void Write() {
     RZ->Write();
     RPhi->Write();
     W0->Write();
     W1->Write();
     W2->Write();
-  }  
+  }
 
+  hTime *WheelHistos(int wheel) {
+    switch (abs(wheel)) {
+      case 0:
+        return W0;
 
-  hTime* WheelHistos(int wheel){
-  switch(abs(wheel)){
+      case 1:
+        return W1;
 
-  case 0: return  W0;
-  
-  case 1: return  W1;
-    
-  case 2: return  W2;
-     
-  default: return NULL;
+      case 2:
+        return W2;
+
+      default:
+        return NULL;
+    }
   }
-}
- private:
+
+private:
   std::shared_ptr<hTime> RZ;
   std::shared_ptr<hTime> RPhi;
   std::shared_ptr<hTime> W0;
   std::shared_ptr<hTime> W1;
   std::shared_ptr<hTime> W2;
- private:
+
+private:
   TString name;
 };
 
 #endif
-
diff --git a/SimMuon/DTDigitizer/test/stubs/DTAngleParam.cc b/SimMuon/DTDigitizer/test/stubs/DTAngleParam.cc
index 840b34635bfee..3f73f12e3b0cf 100644
--- a/SimMuon/DTDigitizer/test/stubs/DTAngleParam.cc
+++ b/SimMuon/DTDigitizer/test/stubs/DTAngleParam.cc
@@ -8,7 +8,7 @@
 //
 //   Author List:
 //   P. Ronchese           INFN - PADOVA
-//   Modifications: 
+//   Modifications:
 //
 //
 //--------------------------------------------------
@@ -36,215 +36,324 @@
 // Constructors --
 //----------------
 
-DTAngleParam::DTAngleParam() : 
- // default constructor : assume 0 angle
- _angle(0.0),
- l_func( 9),
- h_func(10) {
-}
-
+DTAngleParam::DTAngleParam()
+    :  // default constructor : assume 0 angle
+      _angle(0.0),
+      l_func(9),
+      h_func(10) {}
 
 DTAngleParam::DTAngleParam(float angle) {
+  // determine angle bin in -45/+45 range by steps of 5
 
- // determine angle bin in -45/+45 range by steps of 5
-
- int i_ang = static_cast<int>(angle+45.0);
- int l_bin;
-
- if ( i_ang <  0 ) l_bin =  0;
- else
- if ( i_ang >= 90 ) l_bin = 17;
- else              l_bin = i_ang/5;
+  int i_ang = static_cast<int>(angle + 45.0);
+  int l_bin;
 
- int h_bin = l_bin+1;
+  if (i_ang < 0)
+    l_bin = 0;
+  else if (i_ang >= 90)
+    l_bin = 17;
+  else
+    l_bin = i_ang / 5;
 
- // store actual angle and function parameters for lower/higher bin bounds
- _angle = angle;
- l_func = ParamFunc(l_bin);
- h_func = ParamFunc(h_bin);
+  int h_bin = l_bin + 1;
 
+  // store actual angle and function parameters for lower/higher bin bounds
+  _angle = angle;
+  l_func = ParamFunc(l_bin);
+  h_func = ParamFunc(h_bin);
 }
 
-
 //--------------
 // Destructor --
 //--------------
 
-DTAngleParam::~DTAngleParam() {
-}
-
+DTAngleParam::~DTAngleParam() {}
 
 //--------------
 // Operations --
 //--------------
 
 float DTAngleParam::time(float bwire, float xcoor) const {
+  // compute drift time for lower/higher bin bounds
+  float l_time = l_func.time(bwire, xcoor);
+  float h_time = h_func.time(bwire, xcoor);
 
- // compute drift time for lower/higher bin bounds
- float l_time = l_func.time(bwire,xcoor);
- float h_time = h_func.time(bwire,xcoor);
-
- // interpolate times for actual angle
- return l_time+((h_time-l_time)*l_func.dist(_angle)/
-                                l_func.dist(h_func));
+  // interpolate times for actual angle
+  return l_time + ((h_time - l_time) * l_func.dist(_angle) / l_func.dist(h_func));
 }
 
-
-const int   DTAngleParam::table_num_terms[19] = { 
-      7,7,6,7,8,7,5,6,5,7,4,2,7,8,6,6,6,8,7 };
-
-const int   DTAngleParam::table_pow_field[190] = {
-      0, 0, 0, 0, 1, 1, 1,-1,-1,-1,
-      0, 0, 0, 0, 1, 1, 1,-1,-1,-1,
-      0, 0, 0, 0, 2, 2,-1,-1,-1,-1,
-      0, 0, 0, 1, 1, 0, 1,-1,-1,-1,
-      0, 0, 0, 0, 2, 1, 1, 1,-1,-1,
-      0, 0, 3, 0, 0, 2, 1,-1,-1,-1,
-      0, 0, 1, 1, 1,-1,-1,-1,-1,-1,
-      0, 0, 0, 0, 1, 1,-1,-1,-1,-1,
-      0, 0, 1, 1, 1,-1,-1,-1,-1,-1,
-      0, 0, 0, 2, 0, 3, 1,-1,-1,-1,
-      0, 0, 0, 0,-1,-1,-1,-1,-1,-1,
-      0, 0,-1,-1,-1,-1,-1,-1,-1,-1,
-      0, 0, 0, 0, 2, 1, 3,-1,-1,-1,
-      0, 0, 0, 0, 3, 1, 1, 2,-1,-1,
-      0, 0, 0, 1, 0, 1,-1,-1,-1,-1,
-      0, 0, 0, 0, 1, 1,-1,-1,-1,-1,
-      0, 0, 0, 0, 1, 1,-1,-1,-1,-1,
-      0, 0, 0, 0, 1, 1, 1, 2,-1,-1,
-      0, 0, 0, 0, 1, 1, 1,-1,-1,-1 };
-
-
-const int   DTAngleParam::table_pow_xcoor[190] = {
-      0, 1, 3, 2, 0, 1, 2,-1,-1,-1,
-      0, 1, 3, 2, 0, 1, 2,-1,-1,-1,
-      0, 1, 3, 2, 0, 1,-1,-1,-1,-1,
-      0, 1, 3, 0, 1, 2, 2,-1,-1,-1,
-      0, 1, 3, 2, 1, 0, 1, 2,-1,-1,
-      0, 1, 0, 3, 2, 1, 0,-1,-1,-1,
-      0, 1, 0, 1, 2,-1,-1,-1,-1,-1,
-      0, 1, 3, 2, 0, 2,-1,-1,-1,-1,
-      0, 1, 0, 1, 2,-1,-1,-1,-1,-1,
-      0, 1, 3, 1, 2, 0, 2,-1,-1,-1,
-      0, 1, 3, 2,-1,-1,-1,-1,-1,-1,
-      0, 1,-1,-1,-1,-1,-1,-1,-1,-1,
-      0, 1, 3, 2, 0, 2, 0,-1,-1,-1,
-      0, 1, 3, 2, 0, 0, 2, 0,-1,-1,
-      0, 1, 3, 0, 2, 2,-1,-1,-1,-1,
-      0, 1, 3, 2, 0, 1,-1,-1,-1,-1,
-      0, 1, 3, 2, 0, 1,-1,-1,-1,-1,
-      0, 1, 3, 2, 0, 1, 2, 0,-1,-1,
-      0, 1, 3, 2, 0, 1, 2,-1,-1,-1 };
-
-
-const float DTAngleParam::table_offsc[19] = {
-      -1.6341677E-03,
-      -1.9150710E-03,
-      -1.9032805E-03,
-      -1.9542247E-03,
-      -1.9582238E-03,
-      -1.8554466E-03,
-      -1.9125413E-03,
-      -1.9741140E-03,
-      -1.9815513E-03,
-      -1.9835865E-03,
-      -1.9833876E-03,
-      -1.8502035E-03,
-      -1.9108272E-03,
-      -1.9580512E-03,
-      -1.9557050E-03,
-      -1.8146527E-03,
-      -1.7686716E-03,
-      -1.7501116E-03,
-      -1.6865443E-03 };
-      
-
-const float DTAngleParam::table_coeff[190] = {
-      0.32362    ,-0.10029    , 0.33372E-01,-0.97290E-01, 0.14761,
-     -0.15878    , 0.43523E-01, 0          , 0          , 0,
-
-      0.32860    ,-0.11620    , 0.25506E-01,-0.75019E-01, 0.11910,
-     -0.98917E-01, 0.18437E-01, 0          , 0          , 0,
-
-      0.34235    ,-0.14353    , 0.17375E-01,-0.48856E-01, 0.27060,
-     -0.14935    , 0          , 0          , 0          , 0,
-
-      0.34117    ,-0.15159    , 0.11491E-01, 0.89598E-01,-0.67190E-01, 
-     -0.32898E-01, 0.10769E-01, 0          , 0          , 0,
-
-      0.34218    ,-0.14871    , 0.99750E-02,-0.31434E-01, 0.41733E-01,
-      0.76480E-01,-0.90189E-01, 0.21807E-01, 0          , 0,
-
-      0.34941    ,-0.15649    , 0.31413    , 0.99644E-02,-0.29251E-01,
-     -0.56078E-01, 0.11125E-01, 0          , 0          , 0,
-
-      0.35068    ,-0.17724    , 0.59457E-01,-0.73007E-01, 0.24587E-01,
-      0          , 0          , 0          , 0          , 0,
-
-      0.35073    ,-0.16944    , 0.46646E-02,-0.12188E-01, 0.26793E-01, 
-     -0.90753E-02, 0          , 0          , 0          , 0,
-
-      0.35095    ,-0.17652    , 0.34244E-01,-0.25854E-01, 0.33369E-02 ,
-      0          , 0          , 0          , 0          , 0,
-
-      0.35302    ,-0.17322    , 0.19561E-02,-0.59183E-01,-0.63050E-02,
-      0.16520    , 0.62952E-02, 0          , 0          , 0,
-
-      0.34995    ,-0.16756    , 0.35931E-02,-0.11169E-01, 0,
-      0          , 0          , 0          , 0          , 0,
-
-      0.34867    ,-0.17543    , 0          , 0          , 0,
-      0          , 0          , 0          , 0          , 0,
-
-      0.34773    ,-0.16523    , 0.46184E-02,-0.14212E-01,-0.11195 ,
-      0.60685E-02, 0.20589    , 0          , 0          , 0,
-
-      0.34647    ,-0.16158    , 0.57246E-02,-0.17762E-01,-0.41158,
-     -0.41086E-01, 0.72317E-02, 0.17672    , 0          , 0,
-
-      0.34311    ,-0.15890    , 0.67728E-02,-0.27006E-01,-0.20412E-01,
-      0.77523E-02, 0          , 0          , 0          , 0,
-
-      0.33889    ,-0.14902    , 0.10912E-01,-0.32543E-01,-0.47053E-01,
-      0.26043E-01, 0          , 0          , 0          , 0,
-
-      0.33616    ,-0.13829    , 0.15988E-01,-0.47280E-01,-0.71785E-01,
-      0.40111E-01, 0          , 0          , 0          , 0,
-
-      0.33327    ,-0.13235    , 0.23152E-01,-0.62435E-01,-0.11302,
-      0.10277    ,-0.30199E-01, 0.52548E-01, 0          , 0,
-
-      0.33239    ,-0.14388    , 0.22312E-01,-0.55883E-01,-0.95301E-01,
-      0.92658E-01,-0.21228E-01, 0          , 0          , 0           };
-      
+const int DTAngleParam::table_num_terms[19] = {7, 7, 6, 7, 8, 7, 5, 6, 5, 7, 4, 2, 7, 8, 6, 6, 6, 8, 7};
+
+const int DTAngleParam::table_pow_field[190] = {
+    0,  0,  0,  0,  1,  1,  1,  -1, -1, -1, 0,  0,  0,  0,  1,  1,  1,  -1, -1, -1, 0,  0,  0,  0,  2,  2,  -1, -1,
+    -1, -1, 0,  0,  0,  1,  1,  0,  1,  -1, -1, -1, 0,  0,  0,  0,  2,  1,  1,  1,  -1, -1, 0,  0,  3,  0,  0,  2,
+    1,  -1, -1, -1, 0,  0,  1,  1,  1,  -1, -1, -1, -1, -1, 0,  0,  0,  0,  1,  1,  -1, -1, -1, -1, 0,  0,  1,  1,
+    1,  -1, -1, -1, -1, -1, 0,  0,  0,  2,  0,  3,  1,  -1, -1, -1, 0,  0,  0,  0,  -1, -1, -1, -1, -1, -1, 0,  0,
+    -1, -1, -1, -1, -1, -1, -1, -1, 0,  0,  0,  0,  2,  1,  3,  -1, -1, -1, 0,  0,  0,  0,  3,  1,  1,  2,  -1, -1,
+    0,  0,  0,  1,  0,  1,  -1, -1, -1, -1, 0,  0,  0,  0,  1,  1,  -1, -1, -1, -1, 0,  0,  0,  0,  1,  1,  -1, -1,
+    -1, -1, 0,  0,  0,  0,  1,  1,  1,  2,  -1, -1, 0,  0,  0,  0,  1,  1,  1,  -1, -1, -1};
+
+const int DTAngleParam::table_pow_xcoor[190] = {
+    0,  1,  3,  2,  0,  1,  2,  -1, -1, -1, 0,  1,  3,  2,  0,  1,  2,  -1, -1, -1, 0,  1,  3,  2,  0,  1,  -1, -1,
+    -1, -1, 0,  1,  3,  0,  1,  2,  2,  -1, -1, -1, 0,  1,  3,  2,  1,  0,  1,  2,  -1, -1, 0,  1,  0,  3,  2,  1,
+    0,  -1, -1, -1, 0,  1,  0,  1,  2,  -1, -1, -1, -1, -1, 0,  1,  3,  2,  0,  2,  -1, -1, -1, -1, 0,  1,  0,  1,
+    2,  -1, -1, -1, -1, -1, 0,  1,  3,  1,  2,  0,  2,  -1, -1, -1, 0,  1,  3,  2,  -1, -1, -1, -1, -1, -1, 0,  1,
+    -1, -1, -1, -1, -1, -1, -1, -1, 0,  1,  3,  2,  0,  2,  0,  -1, -1, -1, 0,  1,  3,  2,  0,  0,  2,  0,  -1, -1,
+    0,  1,  3,  0,  2,  2,  -1, -1, -1, -1, 0,  1,  3,  2,  0,  1,  -1, -1, -1, -1, 0,  1,  3,  2,  0,  1,  -1, -1,
+    -1, -1, 0,  1,  3,  2,  0,  1,  2,  0,  -1, -1, 0,  1,  3,  2,  0,  1,  2,  -1, -1, -1};
+
+const float DTAngleParam::table_offsc[19] = {-1.6341677E-03,
+                                             -1.9150710E-03,
+                                             -1.9032805E-03,
+                                             -1.9542247E-03,
+                                             -1.9582238E-03,
+                                             -1.8554466E-03,
+                                             -1.9125413E-03,
+                                             -1.9741140E-03,
+                                             -1.9815513E-03,
+                                             -1.9835865E-03,
+                                             -1.9833876E-03,
+                                             -1.8502035E-03,
+                                             -1.9108272E-03,
+                                             -1.9580512E-03,
+                                             -1.9557050E-03,
+                                             -1.8146527E-03,
+                                             -1.7686716E-03,
+                                             -1.7501116E-03,
+                                             -1.6865443E-03};
+
+const float DTAngleParam::table_coeff[190] = {0.32362,
+                                              -0.10029,
+                                              0.33372E-01,
+                                              -0.97290E-01,
+                                              0.14761,
+                                              -0.15878,
+                                              0.43523E-01,
+                                              0,
+                                              0,
+                                              0,
+
+                                              0.32860,
+                                              -0.11620,
+                                              0.25506E-01,
+                                              -0.75019E-01,
+                                              0.11910,
+                                              -0.98917E-01,
+                                              0.18437E-01,
+                                              0,
+                                              0,
+                                              0,
+
+                                              0.34235,
+                                              -0.14353,
+                                              0.17375E-01,
+                                              -0.48856E-01,
+                                              0.27060,
+                                              -0.14935,
+                                              0,
+                                              0,
+                                              0,
+                                              0,
+
+                                              0.34117,
+                                              -0.15159,
+                                              0.11491E-01,
+                                              0.89598E-01,
+                                              -0.67190E-01,
+                                              -0.32898E-01,
+                                              0.10769E-01,
+                                              0,
+                                              0,
+                                              0,
+
+                                              0.34218,
+                                              -0.14871,
+                                              0.99750E-02,
+                                              -0.31434E-01,
+                                              0.41733E-01,
+                                              0.76480E-01,
+                                              -0.90189E-01,
+                                              0.21807E-01,
+                                              0,
+                                              0,
+
+                                              0.34941,
+                                              -0.15649,
+                                              0.31413,
+                                              0.99644E-02,
+                                              -0.29251E-01,
+                                              -0.56078E-01,
+                                              0.11125E-01,
+                                              0,
+                                              0,
+                                              0,
+
+                                              0.35068,
+                                              -0.17724,
+                                              0.59457E-01,
+                                              -0.73007E-01,
+                                              0.24587E-01,
+                                              0,
+                                              0,
+                                              0,
+                                              0,
+                                              0,
+
+                                              0.35073,
+                                              -0.16944,
+                                              0.46646E-02,
+                                              -0.12188E-01,
+                                              0.26793E-01,
+                                              -0.90753E-02,
+                                              0,
+                                              0,
+                                              0,
+                                              0,
+
+                                              0.35095,
+                                              -0.17652,
+                                              0.34244E-01,
+                                              -0.25854E-01,
+                                              0.33369E-02,
+                                              0,
+                                              0,
+                                              0,
+                                              0,
+                                              0,
+
+                                              0.35302,
+                                              -0.17322,
+                                              0.19561E-02,
+                                              -0.59183E-01,
+                                              -0.63050E-02,
+                                              0.16520,
+                                              0.62952E-02,
+                                              0,
+                                              0,
+                                              0,
+
+                                              0.34995,
+                                              -0.16756,
+                                              0.35931E-02,
+                                              -0.11169E-01,
+                                              0,
+                                              0,
+                                              0,
+                                              0,
+                                              0,
+                                              0,
+
+                                              0.34867,
+                                              -0.17543,
+                                              0,
+                                              0,
+                                              0,
+                                              0,
+                                              0,
+                                              0,
+                                              0,
+                                              0,
+
+                                              0.34773,
+                                              -0.16523,
+                                              0.46184E-02,
+                                              -0.14212E-01,
+                                              -0.11195,
+                                              0.60685E-02,
+                                              0.20589,
+                                              0,
+                                              0,
+                                              0,
+
+                                              0.34647,
+                                              -0.16158,
+                                              0.57246E-02,
+                                              -0.17762E-01,
+                                              -0.41158,
+                                              -0.41086E-01,
+                                              0.72317E-02,
+                                              0.17672,
+                                              0,
+                                              0,
+
+                                              0.34311,
+                                              -0.15890,
+                                              0.67728E-02,
+                                              -0.27006E-01,
+                                              -0.20412E-01,
+                                              0.77523E-02,
+                                              0,
+                                              0,
+                                              0,
+                                              0,
+
+                                              0.33889,
+                                              -0.14902,
+                                              0.10912E-01,
+                                              -0.32543E-01,
+                                              -0.47053E-01,
+                                              0.26043E-01,
+                                              0,
+                                              0,
+                                              0,
+                                              0,
+
+                                              0.33616,
+                                              -0.13829,
+                                              0.15988E-01,
+                                              -0.47280E-01,
+                                              -0.71785E-01,
+                                              0.40111E-01,
+                                              0,
+                                              0,
+                                              0,
+                                              0,
+
+                                              0.33327,
+                                              -0.13235,
+                                              0.23152E-01,
+                                              -0.62435E-01,
+                                              -0.11302,
+                                              0.10277,
+                                              -0.30199E-01,
+                                              0.52548E-01,
+                                              0,
+                                              0,
+
+                                              0.33239,
+                                              -0.14388,
+                                              0.22312E-01,
+                                              -0.55883E-01,
+                                              -0.95301E-01,
+                                              0.92658E-01,
+                                              -0.21228E-01,
+                                              0,
+                                              0,
+                                              0};
 
 DTAngleParam::ParamFunc::ParamFunc() {
-/*
- // default constructor: assume central bin ( 0 angle )
- bin_angle = 0.0;
- num_terms = table_num_terms+ 9;
- pow_field = table_pow_field+ 90;
- pow_xcoor = table_pow_xcoor+ 90;
- offsc     = table_offsc    + 9;
- coeff     = table_coeff    + 90;
-*/
+  /*
+   // default constructor: assume central bin ( 0 angle )
+   bin_angle = 0.0;
+   num_terms = table_num_terms+ 9;
+   pow_field = table_pow_field+ 90;
+   pow_xcoor = table_pow_xcoor+ 90;
+   offsc     = table_offsc    + 9;
+   coeff     = table_coeff    + 90;
+  */
 }
 
-
 DTAngleParam::ParamFunc::ParamFunc(int bin) {
-
- // store bound
- bin_angle = (bin*5.0)-45.0;
- // select parameters inside tables
- num_terms = table_num_terms+ bin;
- pow_field = table_pow_field+(bin*10);
- pow_xcoor = table_pow_xcoor+(bin*10);
- offsc     = table_offsc    + bin;
- coeff     = table_coeff    +(bin*10);
-
+  // store bound
+  bin_angle = (bin * 5.0) - 45.0;
+  // select parameters inside tables
+  num_terms = table_num_terms + bin;
+  pow_field = table_pow_field + (bin * 10);
+  pow_xcoor = table_pow_xcoor + (bin * 10);
+  offsc = table_offsc + bin;
+  coeff = table_coeff + (bin * 10);
 }
 
-
 /*
 void DTAngleParam::ParamFunc::set(int bin) {
 
@@ -260,33 +369,25 @@ void DTAngleParam::ParamFunc::set(int bin) {
 }
 */
 
-
-DTAngleParam::ParamFunc::~ParamFunc() {
-}
-
+DTAngleParam::ParamFunc::~ParamFunc() {}
 
 float DTAngleParam::ParamFunc::time(float bwire, float xcoor) const {
-
- // compute drift time
-
- // set constant offset
- float y = *offsc;
-
- // build up polynomial
- int i;
- //int j;
- //float x;
- for ( i = 0 ; i < *num_terms ; i++ ) {
-//  x = 1.0;
-//  for ( j = 0 ; j < pow_field[i] ; j++ ) x *= bwire;
-//  for ( j = 0 ; j < pow_xcoor[i] ; j++ ) x *= xcoor;
-//  y += (*coeff)*x;
-  y += coeff[i]*pow(bwire,pow_field[i])*
-                pow(xcoor,pow_xcoor[i]);
- }
-
- return y;
-
+  // compute drift time
+
+  // set constant offset
+  float y = *offsc;
+
+  // build up polynomial
+  int i;
+  // int j;
+  // float x;
+  for (i = 0; i < *num_terms; i++) {
+    //  x = 1.0;
+    //  for ( j = 0 ; j < pow_field[i] ; j++ ) x *= bwire;
+    //  for ( j = 0 ; j < pow_xcoor[i] ; j++ ) x *= xcoor;
+    //  y += (*coeff)*x;
+    y += coeff[i] * pow(bwire, pow_field[i]) * pow(xcoor, pow_xcoor[i]);
+  }
+
+  return y;
 }
-
-
diff --git a/SimMuon/DTDigitizer/test/stubs/DTAngleParam.h b/SimMuon/DTDigitizer/test/stubs/DTAngleParam.h
index 8f4c68046ca3c..6df3dbbe2dc6e 100644
--- a/SimMuon/DTDigitizer/test/stubs/DTAngleParam.h
+++ b/SimMuon/DTDigitizer/test/stubs/DTAngleParam.h
@@ -1,12 +1,11 @@
 
 /*
- * This class taken for the pakage MBDigitizer implements the 
- * Rovelli-Gresele parametrization used in ORCA 6. It is included here 
+ * This class taken for the pakage MBDigitizer implements the
+ * Rovelli-Gresele parametrization used in ORCA 6. It is included here
  * for comparison with the current parametrization.
- *  
+ *
  */
 
-
 #ifndef DTANGLEPARAM_H
 #define DTANGLEPARAM_H
 
@@ -31,73 +30,68 @@
 
 /* Class DTAngleParam Interface */
 
-class DTAngleParam{
-
+class DTAngleParam {
+public:
+  /** Constructor with angle 0.*/
+  DTAngleParam();
+  /** Constructor with a given angle (degree)*/
+  DTAngleParam(float angle);
+
+  /** Destructor */
+  ~DTAngleParam();
+
+  /* Operations */
+  /// return the time given x and B
+  float time(float bwire, float xcoor) const;
+
+private:
+  // tables of function parameters
+  // 19 angle values up to 10 terms in a function
+  static const int table_num_terms[19];
+  static const int table_pow_field[190];
+  static const int table_pow_xcoor[190];
+  static const float table_offsc[19];
+  static const float table_coeff[190];
+
+  /// private class to hold parameters for an angle bin
+  class ParamFunc {
   public:
+    ParamFunc();
+    ParamFunc(int bin);
+    ~ParamFunc();
 
-    /** Constructor with angle 0.*/ 
-    DTAngleParam();
-    /** Constructor with a given angle (degree)*/ 
-    DTAngleParam(float angle);
+    // reset
+    //   void set(int bin);
 
-    /** Destructor */ 
-    ~DTAngleParam() ;
-
-    /* Operations */ 
-    /// return the time given x and B
+    // function  to compute drift time
     float time(float bwire, float xcoor) const;
 
-  private:
-    // tables of function parameters 
-    // 19 angle values up to 10 terms in a function
-    static const int   table_num_terms[19];
-    static const int   table_pow_field[190];
-    static const int   table_pow_xcoor[190];
-    static const float table_offsc[    19];
-    static const float table_coeff[    190];
-
-    /// private class to hold parameters for an angle bin
-    class ParamFunc {
-
-      public:
-
-        ParamFunc();
-        ParamFunc(int bin);
-        ~ParamFunc();
-
-        // reset
-        //   void set(int bin);
-
-        // function  to compute drift time
-        float time(float bwire, float xcoor) const;
-
-        // functions to compute angle difference 
-        inline
-          float dist(float angle)           const  // to a given value
-          { return          angle-bin_angle; }
-        inline
-          float dist(const ParamFunc& func) const  // to another bin
-          { return func.bin_angle-bin_angle; }
-
-      private:
-
-        float  bin_angle;
-        const int*   num_terms;
-        const int*   pow_field;
-        const int*   pow_xcoor;
-        const float* offsc;
-        const float* coeff;
-
-    };
-
-    // angle value and function parameters for lower/higher angle bins
-    float _angle;
-    ParamFunc l_func;
-    ParamFunc h_func;
-
-    friend class ParamFunc;
-
-  protected:
+    // functions to compute angle difference
+    inline float dist(float angle) const  // to a given value
+    {
+      return angle - bin_angle;
+    }
+    inline float dist(const ParamFunc &func) const  // to another bin
+    {
+      return func.bin_angle - bin_angle;
+    }
 
+  private:
+    float bin_angle;
+    const int *num_terms;
+    const int *pow_field;
+    const int *pow_xcoor;
+    const float *offsc;
+    const float *coeff;
+  };
+
+  // angle value and function parameters for lower/higher angle bins
+  float _angle;
+  ParamFunc l_func;
+  ParamFunc h_func;
+
+  friend class ParamFunc;
+
+protected:
 };
-#endif // MUBARANGLEPARAM_H
+#endif  // MUBARANGLEPARAM_H
diff --git a/SimMuon/DTDigitizer/test/stubs/DTBNormParam.cc b/SimMuon/DTDigitizer/test/stubs/DTBNormParam.cc
index cff68791deb1a..6a2015f54aa01 100644
--- a/SimMuon/DTDigitizer/test/stubs/DTBNormParam.cc
+++ b/SimMuon/DTDigitizer/test/stubs/DTBNormParam.cc
@@ -9,7 +9,7 @@
 //
 //   Author List:
 //   P. Ronchese           INFN - PADOVA
-//   Modifications: 
+//   Modifications:
 //
 //
 //--------------------------------------------------
@@ -36,110 +36,92 @@
 // Constructors --
 //----------------
 
-DTBNormParam::DTBNormParam() : 
- // default constructor : assume 0 field
- _bnorm(0.0),
- l_func(0),
- h_func(1) {
-}
-
+DTBNormParam::DTBNormParam()
+    :  // default constructor : assume 0 field
+      _bnorm(0.0),
+      l_func(0),
+      h_func(1) {}
 
 DTBNormParam::DTBNormParam(float bnorm) {
+  // determine Bnorm bin in 0.0/1.0 range by steps of 0.1
 
- // determine Bnorm bin in 0.0/1.0 range by steps of 0.1
-
- float x_bno = fabs(bnorm)*10.0;
- int i_bno = static_cast<int>(x_bno);
- int l_bin;
-
- if ( i_bno > 9 ) l_bin = 9;
- else             l_bin = i_bno;
+  float x_bno = fabs(bnorm) * 10.0;
+  int i_bno = static_cast<int>(x_bno);
+  int l_bin;
 
- int h_bin = l_bin+1;
+  if (i_bno > 9)
+    l_bin = 9;
+  else
+    l_bin = i_bno;
 
- // store actual Bnorm and function parameters for lower/higher bin bounds
- _bnorm = bnorm;
- l_func = ParamFunc(l_bin);
- h_func = ParamFunc(h_bin);
+  int h_bin = l_bin + 1;
 
+  // store actual Bnorm and function parameters for lower/higher bin bounds
+  _bnorm = bnorm;
+  l_func = ParamFunc(l_bin);
+  h_func = ParamFunc(h_bin);
 }
 
-
 //--------------
 // Destructor --
 //--------------
 
-DTBNormParam::~DTBNormParam() {
-}
-
+DTBNormParam::~DTBNormParam() {}
 
 //--------------
 // Operations --
 //--------------
 
 float DTBNormParam::tcor(float xpos) const {
+  // compute drift time for lower/higher bin bounds
+  float l_tcor = l_func.tcor(xpos);
+  float h_tcor = h_func.tcor(xpos);
 
- // compute drift time for lower/higher bin bounds
- float l_tcor = l_func.tcor(xpos);
- float h_tcor = h_func.tcor(xpos);
-
- // interpolate time corrections for actual Bnorm
- return l_tcor+((h_tcor-l_tcor)*l_func.dist(_bnorm)/
-                                l_func.dist(h_func));
-
+  // interpolate time corrections for actual Bnorm
+  return l_tcor + ((h_tcor - l_tcor) * l_func.dist(_bnorm) / l_func.dist(h_func));
 }
 
-
-
-const float DTBNormParam::table_offsc[11] = {
-    0.0,
-    0.51630E-03,
-    0.31628E-02,
-    0.49082E-02,
-    0.75994E-02,
-    0.10643E-01,
-    0.13419E-01,
-    0.16636E-01,
-    0.20108E-01,
-    0.24405E-01,
-    0.28550E-01 };
-      
-
-const float DTBNormParam::table_coeff[11] = {
-    0.0,
-    0.13900E-03,
-   -0.16361E-02,
-   -0.25234E-02,
-   -0.39586E-02,
-   -0.56774E-02,
-   -0.70548E-02,
-   -0.86567E-02,
-   -0.10549E-01,
-   -0.12765E-01,
-   -0.14833E-01 };
-      
+const float DTBNormParam::table_offsc[11] = {0.0,
+                                             0.51630E-03,
+                                             0.31628E-02,
+                                             0.49082E-02,
+                                             0.75994E-02,
+                                             0.10643E-01,
+                                             0.13419E-01,
+                                             0.16636E-01,
+                                             0.20108E-01,
+                                             0.24405E-01,
+                                             0.28550E-01};
+
+const float DTBNormParam::table_coeff[11] = {0.0,
+                                             0.13900E-03,
+                                             -0.16361E-02,
+                                             -0.25234E-02,
+                                             -0.39586E-02,
+                                             -0.56774E-02,
+                                             -0.70548E-02,
+                                             -0.86567E-02,
+                                             -0.10549E-01,
+                                             -0.12765E-01,
+                                             -0.14833E-01};
 
 DTBNormParam::ParamFunc::ParamFunc() {
-/*
- // default constructor: assume central bin ( 0 field )
- bin_bnorm = 0.0;
- offsc     = table_offsc;
- coeff     = table_coeff;
-*/
+  /*
+   // default constructor: assume central bin ( 0 field )
+   bin_bnorm = 0.0;
+   offsc     = table_offsc;
+   coeff     = table_coeff;
+  */
 }
 
-
 DTBNormParam::ParamFunc::ParamFunc(int bin) {
-
- // store bound
- bin_bnorm = bin*0.1;
- // select parameters inside tables
- offsc     = table_offsc+bin;
- coeff     = table_coeff+bin;
-
+  // store bound
+  bin_bnorm = bin * 0.1;
+  // select parameters inside tables
+  offsc = table_offsc + bin;
+  coeff = table_coeff + bin;
 }
 
-
 /*
 void DTBNormParam::ParamFunc::set(int bin) {
 
@@ -152,89 +134,9 @@ void DTBNormParam::ParamFunc::set(int bin) {
 }
 */
 
-
-DTBNormParam::ParamFunc::~ParamFunc() {
-}
-
+DTBNormParam::ParamFunc::~ParamFunc() {}
 
 float DTBNormParam::ParamFunc::tcor(float xpos) const {
-
- // compute drift time correction
- return *offsc+(*coeff*xpos);
-
+  // compute drift time correction
+  return *offsc + (*coeff * xpos);
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/SimMuon/DTDigitizer/test/stubs/DTBNormParam.h b/SimMuon/DTDigitizer/test/stubs/DTBNormParam.h
index bff12ece3e407..6cd90f035698d 100644
--- a/SimMuon/DTDigitizer/test/stubs/DTBNormParam.h
+++ b/SimMuon/DTDigitizer/test/stubs/DTBNormParam.h
@@ -1,8 +1,8 @@
 /*
- * This class taken for the pakage MBDigitizer implements the 
- * Rovelli-Gresele parametrization used in ORCA 6. It is included here 
+ * This class taken for the pakage MBDigitizer implements the
+ * Rovelli-Gresele parametrization used in ORCA 6. It is included here
  * for comparison with the current parametrization.
- *  
+ *
  */
 
 #ifndef DTBNORMPARAM_H
@@ -29,67 +29,61 @@
 
 /* Class DTBNormParam Interface */
 
-class DTBNormParam{
-
-  public:
-
-    /** Constructor Field=0*/ 
-    DTBNormParam();
-    /** Constructor Field normal in Tesla*/ 
-    DTBNormParam(float bnorm);
+class DTBNormParam {
+public:
+  /** Constructor Field=0*/
+  DTBNormParam();
+  /** Constructor Field normal in Tesla*/
+  DTBNormParam(float bnorm);
 
-    /** Destructor (empty)*/ 
-    ~DTBNormParam();
-
-    /* Operations */ 
-    /// return the correction for Bnorm field
-    float tcor(float xpos) const;
-
-  private:
-    // tables of function parameters for 10 normal B filed values
-    const static float table_offsc[11];
-    const static float table_coeff[11];
+  /** Destructor (empty)*/
+  ~DTBNormParam();
 
-    /// private class to hold parameters for a Bnorm bin
-    class ParamFunc {
+  /* Operations */
+  /// return the correction for Bnorm field
+  float tcor(float xpos) const;
 
-      public:
+private:
+  // tables of function parameters for 10 normal B filed values
+  const static float table_offsc[11];
+  const static float table_coeff[11];
 
-        ParamFunc();
-        ParamFunc(int bin);
-        ~ParamFunc();
-
-        // reset
-        //   void set(int bin);
-
-        // function  to compute drift time correction
-        float tcor(float xpos) const;
-
-        // functions to compute normal B field component difference 
-        inline
-          float dist(float bnorm)           const  // to a given value
-          { return          bnorm-bin_bnorm; }
-        inline
-          float dist(const ParamFunc& func) const  // to another bin
-          { return func.bin_bnorm-bin_bnorm; }
-
-      private:
+  /// private class to hold parameters for a Bnorm bin
+  class ParamFunc {
+  public:
+    ParamFunc();
+    ParamFunc(int bin);
+    ~ParamFunc();
 
-        float  bin_bnorm;
-        const float* offsc;
-        const float* coeff;
+    // reset
+    //   void set(int bin);
 
-    };
+    // function  to compute drift time correction
+    float tcor(float xpos) const;
 
-    // Bnorm value and function parameters for lower/higher Bnorm bins
-    float _bnorm;
-    ParamFunc l_func;
-    ParamFunc h_func;
+    // functions to compute normal B field component difference
+    inline float dist(float bnorm) const  // to a given value
+    {
+      return bnorm - bin_bnorm;
+    }
+    inline float dist(const ParamFunc &func) const  // to another bin
+    {
+      return func.bin_bnorm - bin_bnorm;
+    }
 
-    friend class ParamFunc;
+  private:
+    float bin_bnorm;
+    const float *offsc;
+    const float *coeff;
+  };
 
+  // Bnorm value and function parameters for lower/higher Bnorm bins
+  float _bnorm;
+  ParamFunc l_func;
+  ParamFunc h_func;
 
-  protected:
+  friend class ParamFunc;
 
+protected:
 };
-#endif // MUBARBNORMPARAM_H
+#endif  // MUBARBNORMPARAM_H
diff --git a/SimMuon/DTDigitizer/test/stubs/DTTime2DriftParametrization.cc b/SimMuon/DTDigitizer/test/stubs/DTTime2DriftParametrization.cc
index 226762fddca81..716e5f44fc793 100644
--- a/SimMuon/DTDigitizer/test/stubs/DTTime2DriftParametrization.cc
+++ b/SimMuon/DTDigitizer/test/stubs/DTTime2DriftParametrization.cc
@@ -26,578 +26,4439 @@
 #include "DataFormats/MuonData/src/DTDriftTimeParameters.icc"
 #endif
 
-DTTime2DriftParametrization::DTTime2DriftParametrization(){}
-
-DTTime2DriftParametrization::~DTTime2DriftParametrization(){}
-
-unsigned short DTTime2DriftParametrization::MB_DT_drift_distance (double time,
-								    double alpha,
-								    double by,
-								    double bz,
-								    drift_distance *DX,
-								    short interpolate) const {
-      unsigned short i, j, n_func, ial, iby, ibz;
-      unsigned short i_alpha, i_By, i_Bz;
-      unsigned short j_alpha, j_By, j_Bz;
-
-      double OffSet;
-      double par_x[N_Par_x];
-      double par_sigma_t[N_Sigma_t];
-
-      double V_al[3], V_by[3], V_bz[3];
-
-      double DXV_v_drift  [N_Func];
-      double DXV_x_drift  [N_Func];
-      double DXV_delta_x  [N_Func];
-      double DXV_x_width_m[N_Func];
-      double DXV_x_width_p[N_Func];
-
-      DX->v_drift   = -1;
-      DX->x_drift   = -1;
-      DX->delta_x   = -1;
-      DX->x_width_m = -1;
-      DX->x_width_p = -1;
-
-/* Check 'interpolate' and initialize DXV */
-
-      switch(interpolate) {
-         case 1:  n_func = N_Func;
-                  for ( j=0 ; j<N_Func ; j++ ) {
-                     DXV_v_drift[j]   = -1;
-                     DXV_x_drift[j]   = -1;
-                     DXV_delta_x[j]   = -1;
-                     DXV_x_width_m[j] = -1;
-                     DXV_x_width_p[j] = -1;
-                  }
-                  break ;
-
-         case 0:  n_func = 1;
-                  break ;
-
-         default: printf ("*** ERROR, MB_DT_drift_distance:  invalid interpolate value = %d\n",interpolate);
-                  return (0);
-      }
+DTTime2DriftParametrization::DTTime2DriftParametrization() {}
 
-#ifdef MB_DT_DEBUG
+DTTime2DriftParametrization::~DTTime2DriftParametrization() {}
 
-/* Dump input values */
+unsigned short DTTime2DriftParametrization::MB_DT_drift_distance(
+    double time, double alpha, double by, double bz, drift_distance *DX, short interpolate) const {
+  unsigned short i, j, n_func, ial, iby, ibz;
+  unsigned short i_alpha, i_By, i_Bz;
+  unsigned short j_alpha, j_By, j_Bz;
 
-      printf ("\nMB_DT_drift_distance:  Function called with values:\n\n");
-      printf ("MB_DT_drift_distance:    time  = %f\n",time );
-      printf ("MB_DT_drift_distance:    alpha = %f\n",alpha);
-      printf ("MB_DT_drift_distance:    by    = %f\n",by   );
-      printf ("MB_DT_drift_distance:    bz    = %f\n",bz   );
+  double OffSet;
+  double par_x[N_Par_x];
+  double par_sigma_t[N_Sigma_t];
 
-#endif
+  double V_al[3], V_by[3], V_bz[3];
 
-/* Take into account the symmetries of the parametrisations */
+  double DXV_v_drift[N_Func];
+  double DXV_x_drift[N_Func];
+  double DXV_delta_x[N_Func];
+  double DXV_x_width_m[N_Func];
+  double DXV_x_width_p[N_Func];
 
-      by = fabs(by);         //  f-1 (By) = f-1 (-By)
+  DX->v_drift = -1;
+  DX->x_drift = -1;
+  DX->delta_x = -1;
+  DX->x_width_m = -1;
+  DX->x_width_p = -1;
 
-      if ( bz < 0 ) {        //  f-1 (alpha,Bz) = f-1 (-alpha, -Bz)
-         bz    = -bz;
-         alpha = -alpha;
-      }
+  /* Check 'interpolate' and initialize DXV */
 
-/* Check boundaries of the variables and take the closest values */
+  switch (interpolate) {
+    case 1:
+      n_func = N_Func;
+      for (j = 0; j < N_Func; j++) {
+        DXV_v_drift[j] = -1;
+        DXV_x_drift[j] = -1;
+        DXV_delta_x[j] = -1;
+        DXV_x_width_m[j] = -1;
+        DXV_x_width_p[j] = -1;
+      }
+      break;
 
-      MB_DT_Check_boundaries (time, alpha, by, bz, -1) ;
+    case 0:
+      n_func = 1;
+      break;
 
-      MB_DT_Get_grid_points (alpha, by, bz, &i_alpha, &i_By, &i_Bz, &j_alpha, &j_By, &j_Bz) ;
+    default:
+      printf("*** ERROR, MB_DT_drift_distance:  invalid interpolate value = %d\n", interpolate);
+      return (0);
+  }
 
 #ifdef MB_DT_DEBUG
-      printf("MB_DT_drift_distance:\n");
-      printf("MB_DT_drift_distance:  i_alpha j_alpha alpha_value's %d %d %.0f %.0f\n",i_alpha,j_alpha,alpha_value[i_alpha],alpha_value[j_alpha]);
-      printf("MB_DT_drift_distance:  i_By    j_By    By_value's    %d %d %.2f %.2f\n",i_By   ,j_By   ,   By_value[i_By]   ,   By_value[j_By]);
-      printf("MB_DT_drift_distance:  i_Bz    j_Bz    Bz_value's    %d %d %.2f %.2f\n",i_Bz   ,j_Bz   ,   Bz_value[i_Bz]   ,   Bz_value[j_Bz]);
+
+  /* Dump input values */
+
+  printf("\nMB_DT_drift_distance:  Function called with values:\n\n");
+  printf("MB_DT_drift_distance:    time  = %f\n", time);
+  printf("MB_DT_drift_distance:    alpha = %f\n", alpha);
+  printf("MB_DT_drift_distance:    by    = %f\n", by);
+  printf("MB_DT_drift_distance:    bz    = %f\n", bz);
+
 #endif
 
-/* Get the parametrisations for the different grid points */
+  /* Take into account the symmetries of the parametrisations */
 
-      for ( j=0 ; j<n_func ; j++ ) {
+  by = fabs(by);  //  f-1 (By) = f-1 (-By)
 
-         ial = (j&4) ? j_alpha : i_alpha;
-         iby = (j&2) ? j_By    : i_By   ;
-         ibz = (j&1) ? j_Bz    : i_Bz   ;
+  if (bz < 0) {  //  f-1 (alpha,Bz) = f-1 (-alpha, -Bz)
+    bz = -bz;
+    alpha = -alpha;
+  }
 
-         for ( i=0 ; i<N_Par_x   ; i++ ) par_x[i]       =       fun_x[ial][iby][ibz][i];
-         for ( i=0 ; i<N_Sigma_t ; i++ ) par_sigma_t[i] = fun_sigma_t[ial][iby][ibz][i];
+  /* Check boundaries of the variables and take the closest values */
 
-         OffSet = par_x[N_Par_x-1];
+  MB_DT_Check_boundaries(time, alpha, by, bz, -1);
 
-         DXV_v_drift[j]   = par_x[0];                                                       // drift velocity
-         DXV_delta_x[j]   = MB_DT_delta_x (time, par_x);                                    // deviation from linearity
-         DXV_x_drift[j]   = MB_DT_dist (time, par_x) + DXV_delta_x[j] - OffSet*par_x[0];    // drift distance to the wire (signed)
-         DXV_x_width_m[j] = MB_DT_sigma_t_m (DXV_x_drift[j], par_sigma_t) * DXV_v_drift[j]; // distance width ~ vd * sigma_t(x)  (minus, left)
-         DXV_x_width_p[j] = MB_DT_sigma_t_p (DXV_x_drift[j], par_sigma_t) * DXV_v_drift[j]; // distance width ~ vd * sigma_t(x)  (plus, right)
+  MB_DT_Get_grid_points(alpha, by, bz, &i_alpha, &i_By, &i_Bz, &j_alpha, &j_By, &j_Bz);
 
 #ifdef MB_DT_DEBUG
-         printf("MB_DT_drift_LOOP: OffSet = %f\n",OffSet);
-         printf("MB_DT_drift_LOOP: time, v_drift, x_drift, lin, x_width_m, x_width_p = %f %f %f %f %f %f\n",
-                                   time, DXV_v_drift[j], DXV_x_drift[j], DXV_delta_x[j], DXV_x_width_m[j], DXV_x_width_p[j]) ;
+  printf("MB_DT_drift_distance:\n");
+  printf("MB_DT_drift_distance:  i_alpha j_alpha alpha_value's %d %d %.0f %.0f\n",
+         i_alpha,
+         j_alpha,
+         alpha_value[i_alpha],
+         alpha_value[j_alpha]);
+  printf("MB_DT_drift_distance:  i_By    j_By    By_value's    %d %d %.2f %.2f\n",
+         i_By,
+         j_By,
+         By_value[i_By],
+         By_value[j_By]);
+  printf("MB_DT_drift_distance:  i_Bz    j_Bz    Bz_value's    %d %d %.2f %.2f\n",
+         i_Bz,
+         j_Bz,
+         Bz_value[i_Bz],
+         Bz_value[j_Bz]);
 #endif
-      }
 
-/* Return interpolated or grid values */
+  /* Get the parametrisations for the different grid points */
 
-      if ( interpolate == 0 ) {
+  for (j = 0; j < n_func; j++) {
+    ial = (j & 4) ? j_alpha : i_alpha;
+    iby = (j & 2) ? j_By : i_By;
+    ibz = (j & 1) ? j_Bz : i_Bz;
 
-         DX->v_drift   = DXV_v_drift[0];
-         DX->delta_x   = DXV_delta_x[0];
-         DX->x_drift   = DXV_x_drift[0];
-         DX->x_width_m = DXV_x_width_m[0];
-         DX->x_width_p = DXV_x_width_p[0];
-      }
-      else {
+    for (i = 0; i < N_Par_x; i++)
+      par_x[i] = fun_x[ial][iby][ibz][i];
+    for (i = 0; i < N_Sigma_t; i++)
+      par_sigma_t[i] = fun_sigma_t[ial][iby][ibz][i];
 
-         V_al[0] = alpha ; V_al[1] = alpha_value[i_alpha] ; V_al[2] = alpha_value[j_alpha];
-         V_by[0] = by    ; V_by[1] =    By_value[i_By]    ; V_by[2] =    By_value[j_By];
-         V_bz[0] = bz    ; V_bz[1] =    Bz_value[i_Bz]    ; V_bz[2] =    Bz_value[j_Bz];
+    OffSet = par_x[N_Par_x - 1];
 
-         DX->v_drift   = MB_DT_MLInterpolation (V_al, V_by, V_bz, DXV_v_drift  );
-         DX->delta_x   = MB_DT_MLInterpolation (V_al, V_by, V_bz, DXV_delta_x  );
-         DX->x_drift   = MB_DT_MLInterpolation (V_al, V_by, V_bz, DXV_x_drift  );
-         DX->x_width_m = MB_DT_MLInterpolation (V_al, V_by, V_bz, DXV_x_width_m);
-         DX->x_width_p = MB_DT_MLInterpolation (V_al, V_by, V_bz, DXV_x_width_p);
-      }
+    DXV_v_drift[j] = par_x[0];                    // drift velocity
+    DXV_delta_x[j] = MB_DT_delta_x(time, par_x);  // deviation from linearity
+    DXV_x_drift[j] =
+        MB_DT_dist(time, par_x) + DXV_delta_x[j] - OffSet * par_x[0];  // drift distance to the wire (signed)
+    DXV_x_width_m[j] = MB_DT_sigma_t_m(DXV_x_drift[j], par_sigma_t) *
+                       DXV_v_drift[j];  // distance width ~ vd * sigma_t(x)  (minus, left)
+    DXV_x_width_p[j] = MB_DT_sigma_t_p(DXV_x_drift[j], par_sigma_t) *
+                       DXV_v_drift[j];  // distance width ~ vd * sigma_t(x)  (plus, right)
 
 #ifdef MB_DT_DEBUG
-      printf("MB_DT_drift_distance: time, v_drift, x_drift, lin, x_width_m, x_width_p = %f %f %f %f %f %f\n",
-                                    time, DX->v_drift, DX->x_drift, DX->delta_x, DX->x_width_m, DX->x_width_p) ;
+    printf("MB_DT_drift_LOOP: OffSet = %f\n", OffSet);
+    printf(
+        "MB_DT_drift_LOOP: time, v_drift, x_drift, lin, x_width_m, "
+        "x_width_p = %f %f %f %f %f %f\n",
+        time,
+        DXV_v_drift[j],
+        DXV_x_drift[j],
+        DXV_delta_x[j],
+        DXV_x_width_m[j],
+        DXV_x_width_p[j]);
 #endif
+  }
 
-      return (1);
-}
+  /* Return interpolated or grid values */
 
+  if (interpolate == 0) {
+    DX->v_drift = DXV_v_drift[0];
+    DX->delta_x = DXV_delta_x[0];
+    DX->x_drift = DXV_x_drift[0];
+    DX->x_width_m = DXV_x_width_m[0];
+    DX->x_width_p = DXV_x_width_p[0];
+  } else {
+    V_al[0] = alpha;
+    V_al[1] = alpha_value[i_alpha];
+    V_al[2] = alpha_value[j_alpha];
+    V_by[0] = by;
+    V_by[1] = By_value[i_By];
+    V_by[2] = By_value[j_By];
+    V_bz[0] = bz;
+    V_bz[1] = Bz_value[i_Bz];
+    V_bz[2] = Bz_value[j_Bz];
 
-double DTTime2DriftParametrization::MB_DT_delta_x (double t, double *par) const {
-      double t2 = t*t;
+    DX->v_drift = MB_DT_MLInterpolation(V_al, V_by, V_bz, DXV_v_drift);
+    DX->delta_x = MB_DT_MLInterpolation(V_al, V_by, V_bz, DXV_delta_x);
+    DX->x_drift = MB_DT_MLInterpolation(V_al, V_by, V_bz, DXV_x_drift);
+    DX->x_width_m = MB_DT_MLInterpolation(V_al, V_by, V_bz, DXV_x_width_m);
+    DX->x_width_p = MB_DT_MLInterpolation(V_al, V_by, V_bz, DXV_x_width_p);
+  }
 
 #ifdef MB_DT_DEBUG
-      printf("MB_DT_delta_x:  time = %f\n",t);
+  printf(
+      "MB_DT_drift_distance: time, v_drift, x_drift, lin, x_width_m, "
+      "x_width_p = %f %f %f %f %f %f\n",
+      time,
+      DX->v_drift,
+      DX->x_drift,
+      DX->delta_x,
+      DX->x_width_m,
+      DX->x_width_p);
 #endif
 
-//
-// Now distances are in microns. Divide by 1000 to get mm.
-//
-      if ( t <= par[12] ) { return ( -0.001 * (par[1] + par[2] *t + par[3] *t2) ); }
-      if ( t <= par[13] ) { return ( -0.001 * (par[4] + par[5] *t + par[6] *t2 + par[7]*t2*t + par[8]*t2*t2) ); }
-                            return ( -0.001 * (par[9] + par[10]*t + par[11]*t2) );
+  return (1);
 }
 
+double DTTime2DriftParametrization::MB_DT_delta_x(double t, double *par) const {
+  double t2 = t * t;
 
-double DTTime2DriftParametrization::MB_DT_dist (double time, double *par) const {
-      return ( time * par[0] );        // par[0] is the drift velocity, 'dist' is the linear part of the drift distance
+#ifdef MB_DT_DEBUG
+  printf("MB_DT_delta_x:  time = %f\n", t);
+#endif
+
+  //
+  // Now distances are in microns. Divide by 1000 to get mm.
+  //
+  if (t <= par[12]) {
+    return (-0.001 * (par[1] + par[2] * t + par[3] * t2));
+  }
+  if (t <= par[13]) {
+    return (-0.001 * (par[4] + par[5] * t + par[6] * t2 + par[7] * t2 * t + par[8] * t2 * t2));
+  }
+  return (-0.001 * (par[9] + par[10] * t + par[11] * t2));
 }
 
+double DTTime2DriftParametrization::MB_DT_dist(double time, double *par) const {
+  return (time * par[0]);  // par[0] is the drift velocity, 'dist' is the linear
+                           // part of the drift distance
+}
 
 /*** Parameter values ***/
 const double DTTime2DriftParametrization::fun_x[N_alpha][N_By][N_Bz][N_Par_x] = {
-  {
-    {
-      {0.0556,   1249.091,   -37.3962,   0.210716,  -248.9907,  -29.16312,   0.5448455,   -0.00284367,   4.56805e-06,  -20767.3652,  124.84555,   -0.1816447,    78.2008,    306.621,  -23.626},  // n45_000_000
-      {0.0551,   1264.495,   -37.3751,   0.213438,   342.1500,  -46.29582,   0.7196100,   -0.00360379,   5.74672e-06,  -16790.2227,  100.94481,   -0.1463796,    80.4290,    286.511,  -23.006},  // n45_000_005
-      {0.0532,   1370.302,   -40.4711,   0.227257, -1891.1428,   12.38329,   0.1725410,    -0.0014882,   2.85433e-06,  -11878.5010,   72.83394,   -0.1082567,    81.3510,    294.789,  -25.473},  // n45_000_010
-      {0.0509,   1337.285,   -35.2571,   0.128641,  1361.5851,  -65.93077,   0.8067306,   -0.00359326,   5.30568e-06,   -8246.3301,   49.22989,   -0.0712043,    64.8110,    297.581,  -27.649},  // n45_000_020
-      {0.0459,   1994.901,   -73.5534,   0.664908,  2798.6650, -105.17569,   1.1786412,    -0.0051563,   7.80827e-06,    2493.3286,  -14.38918,    0.0217881,    43.7810,    262.759,  -34.742}  // n45_000_040
-    },
-    {
-      {0.0556,   1300.534,   -38.6583,   0.220980,  -652.3927,  -17.54267,   0.4277454,   -0.00238086,   3.93922e-06,  -34923.6289,  211.34445,   -0.3137028,    79.8810,    308.349,  -22.653},  // n45_010_000
-      {0.0539,   1349.306,   -39.0137,   0.212369,  -132.2905,  -33.74292,   0.5870680,    -0.0030146,   4.82427e-06,  -16301.8662,   98.47250,   -0.1450356,    80.4508,    291.509,  -24.648},  // n45_010_005
-      {0.0529,   1372.372,   -39.9514,   0.218569,  -376.1956,  -28.43015,   0.5437251,   -0.00286743,    4.6476e-06,   -6392.2407,   38.91557,   -0.0562898,    81.3302,    298.009,  -25.754},  // n45_010_010
-      {0.0503,   1362.911,   -36.5874,   0.130881,   655.5482,  -46.15765,   0.6107563,   -0.00279134,   4.17058e-06,    -351.2815,    3.01151,   -0.0036896,    64.7310,    301.681,  -28.268},  // n45_010_020
-      {0.0455,   1496.772,   -35.5192,   0.000306,  1405.5243,  -54.52723,   0.5815363,   -0.00232048,   3.12659e-06,   13530.8340,  -75.37423,    0.1054318,    43.4005,    317.919,  -35.652}  // n45_010_040
-    },
-    {
-      {0.0546,   1301.588,   -39.0543,   0.221729,   977.0822,  -63.35442,   0.8654332,   -0.00411758,   6.37418e-06,  -15795.6533,   93.66738,   -0.1347689,    79.6790,    286.739,  -23.516},  // n45_020_000
-      {0.0536,   1380.848,   -41.1513,   0.239972,  -323.4976,  -27.07115,   0.5216565,   -0.00278335,   4.54835e-06,  -17069.2969,  102.25611,   -0.1496941,    80.9393,    293.471,  -25.103},  // n45_020_005
-      {0.0525,   1338.909,   -38.8524,   0.190713,  1944.7535,  -83.14005,   0.9903185,   -0.00440433,   6.56261e-06,   -9602.8262,   57.39394,   -0.0823630,    63.8009,    289.591,  -25.668},  // n45_020_010
-      {0.0501,   1459.019,   -37.9183,   0.155072,   322.7930,  -32.23593,   0.4708977,   -0.00227083,   3.51019e-06,     811.7312,   -4.37993,    0.0075575,    64.7010,    301.509,  -30.318},  // n45_020_020
-      {0.0452,   1766.482,   -57.3231,   0.362109,  1598.8593,  -59.84822,   0.6028637,   -0.00229073,   2.95719e-06,     142.5617,    0.00869,   -0.0000022,    43.4791,    321.810,  -34.852}  // n45_020_040
-    },
-    {
-      {0.0544,   1289.751,   -37.8311,   0.210551,   664.5193,  -55.27165,   0.7930264,   -0.00382813,   5.94986e-06,  -17405.2617,  103.62366,   -0.1498085,    80.6210,    289.749,  -23.861},  // n45_035_000
-      {0.0531,   1334.003,   -38.6883,   0.214017,  -185.8394,  -31.29477,   0.5548654,   -0.00285611,   4.56639e-06,  -10874.5098,   64.55344,   -0.0920744,    81.3706,    297.581,  -25.405},  // n45_035_005
-      {0.0519,   1331.227,   -37.2272,   0.175508,  1786.6555,  -77.57774,   0.9363343,   -0.00419419,   6.26833e-06,   -7455.0024,   44.57640,   -0.0637211,    64.4110,    292.829,  -26.621},  // n45_035_010
-      {0.0490,   1433.240,   -36.0542,   0.108478,  3076.3159, -116.81192,   1.3428463,   -0.00598159,   9.10496e-06,   -2025.6472,   11.36878,   -0.0146284,    49.8610,    254.269,  -31.249},  // n45_035_020
-      {0.0444,   1832.118,   -55.1764,   0.330668, -4676.3032,   86.73433,  -0.5740449,    0.00165354,  -1.75581e-06,   -1335.1753,    8.67068,   -0.0135205,    88.2990,    324.461,  -37.630}  // n45_035_040
-    },
-    {
-      {0.0516,   1411.662,   -42.1616,   0.247709,  -437.2861,  -26.87500,   0.5358523,   -0.00284772,   4.58766e-06,  -16797.9414,   98.23483,   -0.1405248,    83.3893,    302.941,  -27.185},  // n45_075_000
-      {0.0504,   1593.857,   -45.6800,   0.266588, -1746.9763,    8.74155,   0.2015864,   -0.00154185,   2.78823e-06,   -9310.3115,   54.40162,   -0.0769520,    84.1790,    310.481,  -29.936},  // n45_075_005
-      {0.0493,   1570.420,   -44.3442,   0.228917,   838.0950,  -49.20692,   0.6512479,    -0.0030081,   4.51173e-06,   -6909.3086,   40.57237,   -0.0575639,    65.5710,    305.179,  -30.681},  // n45_075_010
-      {0.0467,   1733.900,   -47.9114,   0.264232,  3050.7056, -111.13289,   1.2574373,   -0.00551889,   8.26139e-06,   -2180.8857,   12.74333,   -0.0179582,    50.5099,    263.381,  -36.152},  // n45_075_020
-      {0.0419,   2045.534,   -61.4659,   0.351936, -1621.1132,   21.93342,  -0.0886306,   0.000104115,    3.2232e-08,   10660.4551,  -57.27732,    0.0763714,    67.9698,    328.550,  -42.091}  // n45_075_040
-    }
-  },
-  {
-    {
-      {0.0544,    661.644,   -21.4548,   0.150075,   444.5770,  -23.67808,   0.3244083,   -0.00157777,   2.48303e-06,  -10515.9336,   63.69555,   -0.0945404,    93.2245,    275.475,  -13.091},  // n30_000_000
-      {0.0544,    696.376,   -22.5798,   0.161791,  1305.6302,  -42.57114,   0.4789453,   -0.00215211,   3.30427e-06,   -4190.3496,   25.47451,   -0.0376212,    94.4488,    278.144,  -11.877},  // n30_000_005
-      {0.0535,    737.981,   -22.9524,   0.159446,   496.1301,  -22.39173,   0.2971912,   -0.00144682,   2.31446e-06,   -3349.5435,   20.81764,   -0.0315911,    95.5680,    282.552,  -13.025},  // n30_000_010
-      {0.0521,    785.876,   -24.0922,   0.161019, -1048.5413,   16.74757,  -0.0663961,  -1.62409e-05,   3.10503e-07,     153.2331,   -0.63314,    0.0006426,    96.9831,    289.849,  -13.967},  // n30_000_020
-      {0.0486,    898.364,   -26.8266,   0.176826, -1725.3418,   39.48061,  -0.3211800,     0.0011243,  -1.42777e-06,    7672.2515,  -45.37175,    0.0660975,   101.5030,    306.865,  -17.944}  // n30_000_040
-    },
-    {
-      {0.0546,    598.887,   -18.2973,   0.125265,  1577.2565,  -52.13367,   0.5851559,   -0.00261341,   3.98356e-06,   -8627.1562,   53.66836,   -0.0820753,    94.4968,    275.712,  -11.891},  // n30_010_000
-      {0.0538,    827.893,   -25.1728,   0.166522,  -872.9512,    7.56132,   0.0563854,  -0.000598549,   1.20605e-06,   -6883.4878,   42.06039,   -0.0632109,    94.8550,    280.377,  -12.726},  // n30_010_005
-      {0.0533,    707.092,   -21.8938,   0.149668,  -888.6555,   11.29115,   0.0051492,  -0.000379969,   9.19879e-07,   -2796.6306,   17.48043,   -0.0267174,    96.0408,    283.777,  -13.029},  // n30_010_010
-      {0.0514,    934.589,   -29.3263,   0.203515,  -370.4773,    3.02731,   0.0367987,  -0.000352283,   7.08131e-07,    1598.2100,   -9.32773,    0.0136123,    97.7671,    293.065,  -15.106},  // n30_010_020
-      {0.0484,    972.442,   -29.1723,   0.193183, -2727.0569,   63.37098,  -0.5184089,    0.00179479,  -2.23153e-06,    2775.4517,  -15.94901,    0.0221969,   101.9351,    308.617,  -18.301}  // n30_010_040
-    },
-    {
-      {0.0542,    723.781,   -22.9229,   0.160962,  1456.9366,  -47.56628,   0.5309216,   -0.00236099,   3.58726e-06,   -8046.5757,   49.95736,   -0.0760213,    94.8090,    278.655,  -12.328},  // n30_020_000
-      {0.0537,    676.840,   -20.7743,   0.141595,  -484.0721,    0.94731,   0.1017064,  -0.000774435,    1.5048e-06,   -3992.2529,   24.94127,   -0.0379982,    95.6874,    281.816,  -12.595},  // n30_020_005
-      {0.0526,    624.156,   -17.8632,   0.113379,  -743.2964,    6.02184,   0.0562616,  -0.000558642,   1.11584e-06,   -3504.3020,   21.19222,   -0.0315027,    96.2631,    286.808,  -14.151},  // n30_020_010
-      {0.0516,    737.353,   -22.3599,   0.150195, -1458.8893,   27.65503,  -0.1631772,   0.000337951,  -1.50699e-07,     -53.0105,    0.63676,   -0.0012999,    97.8950,    292.111,  -15.068},  // n30_020_020
-      {0.0480,    974.744,   -29.3660,   0.195912, -2384.1865,   54.89895,  -0.4495114,    0.00157499,  -1.99515e-06,    3973.4858,  -23.74227,    0.0346751,    97.7037,    307.001,  -18.767}  // n30_020_040
-    },
-    {
-      {0.0538,    565.198,   -17.4339,   0.118042,   940.0779,  -36.38837,   0.4428219,   -0.00205962,   3.20829e-06,   -6553.2090,   40.17127,   -0.0601241,    95.3917,    281.824,  -12.478},  // n30_035_000
-      {0.0528,    784.903,   -24.0389,   0.164625,  -159.6993,   -5.80579,   0.1472273,  -0.000875771,   1.53404e-06,   -4135.1328,   25.06886,   -0.0371285,    96.2315,    285.681,  -13.818},  // n30_035_005
-      {0.0523,    788.275,   -24.3241,   0.166503, -1935.1375,   37.76367,  -0.2305371,   0.000505415,  -2.72688e-07,   -1436.0129,    8.95674,   -0.0135539,    97.2793,    288.807,  -14.093},  // n30_035_010
-      {0.0506,    860.751,   -25.5843,   0.167629, -1957.8579,   38.80153,  -0.2581428,   0.000702039,  -6.66945e-07,     252.4353,   -1.73282,    0.0029522,    98.8487,    296.879,  -15.801},  // n30_035_020
-      {0.0476,    881.687,   -26.0314,   0.167940, -1793.2728,   40.26773,  -0.3257867,    0.00114058,  -1.45197e-06,    5482.5552,  -32.56463,    0.0474041,   102.7830,    312.679,  -19.019}  // n30_035_040
-    },
-    {
-      {0.0516,    749.935,   -23.2223,   0.160383,  -855.8171,   10.29520,   0.0210917,  -0.000462279,   1.04472e-06,   -4622.7788,   28.05522,   -0.0414290,    98.7431,    292.544,  -14.341},  // n30_075_000
-      {0.0510,    840.556,   -25.9320,   0.177274,  -491.6305,    2.60982,   0.0727019,  -0.000590733,   1.13391e-06,   -3522.1973,   21.40963,   -0.0317276,    99.8071,    296.039,  -14.871},  // n30_075_005
-      {0.0503,    761.912,   -22.5559,   0.149579,  -655.7001,    7.14253,   0.0234984,  -0.000369465,   7.93294e-07,   -1683.2029,   10.66983,   -0.0162962,   100.3689,    299.847,  -15.635},  // n30_075_010
-      {0.0489,    896.258,   -26.4845,   0.173658, -1954.9786,   40.05451,  -0.2770390,   0.000791113,  -7.99368e-07,    1774.9106,   -9.88953,    0.0136026,   101.9279,    307.001,  -17.303},  // n30_075_020
-      {0.0454,   1055.460,   -30.6924,   0.198003, -2914.5913,   68.15729,  -0.5596287,    0.00194156,   -2.4101e-06,    3996.9961,  -23.60917,    0.0335653,   106.4321,    326.817,  -21.800}  // n30_075_040
-    }
-  },
-  {
-    {
-      {0.0544,    280.108,   -15.7155,   0.222215,   423.5003,  -15.40026,   0.1803494,  -0.000819977,   1.25848e-06,   -2701.0981,   16.40063,   -0.0242576,    45.4038,    283.859,  -7.037} ,  // n15_000_000
-      {0.0545,    515.820,   -32.6711,   0.472151,   201.8439,   -7.09815,   0.0866570,   -0.00041511,   6.65956e-07,   -2233.3193,   13.93478,   -0.0213755,    46.7350,    285.071,  -5.821} ,  // n15_000_005
-      {0.0542,    520.312,   -28.2251,   0.369691,   105.5701,   -3.99062,   0.0511237,  -0.000252236,   4.13335e-07,    -199.2496,    1.27530,   -0.0018711,    46.4873,    286.935,  -6.113} ,  // n15_000_010
-      {0.0535,    560.264,   -30.7412,   0.404970,    68.7243,   -2.19197,   0.0250043,  -0.000104595,   1.39395e-07,   -1487.4546,    8.66851,   -0.0125515,    47.0955,    290.008,  -6.314} ,  // n15_000_020
-      {0.0515,    635.142,   -31.8153,   0.396365,   -25.4636,    2.46947,  -0.0442671,    0.00025748,  -4.59825e-07,    5422.4453,  -33.38743,    0.0505844,    47.3318,    299.926,  -8.225}   // n15_000_040
-    },
-    {
-      {0.0547,    493.199,   -28.5060,   0.389282,   201.5373,   -7.73180,   0.0999743,  -0.000503051,    8.4396e-07,   -2066.8286,   13.51634,   -0.0214888,    46.7353,    284.623,  -5.642} ,  // n15_010_000
-      {0.0544,    546.773,   -30.4149,   0.407799,   230.2068,   -7.93929,   0.0907344,  -0.000404279,    6.0749e-07,   -2232.8101,   13.63719,   -0.0205257,    47.0390,    285.064,  -5.992} ,  // n15_010_005
-      {0.0536,    513.420,   -23.0638,   0.288751,   138.8691,   -2.89693,   0.0376467,  -0.000201462,    3.4641e-07,    -104.2009,    0.82561,   -0.0016494,    46.8640,    287.439,  -7.900} ,  // n15_010_010
-      {0.0530,    618.762,   -32.6759,   0.424982,   142.9014,   -4.06779,   0.0382704,  -0.000142783,   1.83574e-07,    1740.7522,  -10.85107,    0.0167234,    47.0630,    292.231,  -6.915} ,  // n15_010_020
-      {0.0512,    584.420,   -28.2308,   0.341261,  -174.9973,    7.49327,  -0.0980080,    0.00047885,  -7.68592e-07,    6299.7798,  -38.54675,    0.0580255,    43.7750,    297.393,  -8.735}   // n15_010_040
-    },
-    {
-      {0.0542,    548.766,   -32.4677,   0.457710,   402.3637,  -14.14943,   0.1640171,  -0.000743861,   1.13977e-06,   -3988.7603,   24.62158,   -0.0373790,    46.5670,    285.767,  -6.189} ,  // n15_020_000
-      {0.0541,    551.358,   -29.7854,   0.383668,   -58.9587,    1.04228,   0.0082786,  -0.000121549,   2.92325e-07,   -1212.0813,    8.31316,   -0.0138557,    46.6310,    287.169,  -6.059} ,  // n15_020_005
-      {0.0534,    538.365,   -29.0861,   0.384690,   182.5977,   -6.08375,   0.0704031,  -0.000323122,   5.03191e-07,     372.3823,   -1.94234,    0.0024682,    46.9990,    289.681,  -6.913} ,  // n15_020_010
-      {0.0531,    638.346,   -34.8982,   0.460682,   140.5902,   -4.66933,   0.0532486,   -0.00024105,    3.7042e-07,     397.4993,   -2.27136,    0.0032063,    46.9752,    291.423,  -7.086} ,  // n15_020_020
-      {0.0508,    633.224,   -32.7010,   0.429323,   -66.1159,    4.35364,  -0.0675923,   0.000355363,  -5.87668e-07,    8061.5674,  -48.78617,    0.0729436,    43.3594,    299.471,  -8.997}   // n15_020_040
-    },
-    {
-      {0.0537,    585.770,   -32.7382,   0.438016,   197.0154,   -7.16578,   0.0879935,  -0.000417491,   6.61675e-07,   -2715.0459,   16.88474,   -0.0257524,    46.9830,    288.888,  -6.487} ,  // n15_035_000
-      {0.0532,    634.700,   -35.0860,   0.464050,    91.8519,   -3.30027,   0.0404732,  -0.000188339,   2.87341e-07,   -2108.3696,   12.55404,   -0.0184916,    46.6950,    290.287,  -6.989} ,  // n15_035_005
-      {0.0532,    605.780,   -35.7804,   0.495017,   148.8390,   -5.04066,   0.0595426,  -0.000282432,   4.55683e-07,     293.7796,   -1.20117,    0.0010490,    46.8955,    291.304,  -6.735} ,  // n15_035_010
-      {0.0521,    597.537,   -30.9445,   0.405020,   173.2489,   -4.18172,   0.0336465,  -0.000107916,   1.15996e-07,     796.4302,   -4.86666,    0.0070672,    47.2870,    295.399,  -7.747} ,  // n15_035_020
-      {0.0504,    736.120,   -37.9788,   0.498652,     4.0650,    2.09798,  -0.0473512,   0.000294158,  -5.37919e-07,    6944.4492,  -42.29051,    0.0633100,    43.5670,    301.885,  -9.247}   // n15_035_040
-    },
-    {
-      {0.0518,    611.823,   -32.5274,   0.414581,    32.8465,   -1.51198,   0.0257819,  -0.000154599,   2.85662e-07,    -117.6394,    1.33964,   -0.0027604,    47.7751,    298.952,  -7.488} ,  // n15_075_000
-      {0.0515,    691.713,   -37.3491,   0.485409,   101.6508,   -3.37849,   0.0412602,  -0.000198536,   3.19258e-07,   -1632.7256,   10.50634,   -0.0165798,    47.6870,    299.967,  -7.753} ,  // n15_075_005
-      {0.0510,    608.731,   -31.0313,   0.384066,    42.7490,   -1.61686,   0.0213272,  -0.000104293,   1.66454e-07,   -1098.8243,    7.12108,   -0.0114011,    47.9190,    302.392,  -8.146} ,  // n15_075_010
-      {0.0505,    624.432,   -31.1192,   0.363026,  -349.8549,   11.20893,  -0.1181044,   0.000497622,  -7.22609e-07,      32.2961,   -0.94522,    0.0021847,    48.1671,    305.137,  -8.474} ,  // n15_075_020
-      {0.0482,    708.313,   -34.1303,   0.405405,  -370.3401,   14.31818,  -0.1704450,   0.000761735,  -1.12644e-06,    6256.2383,  -35.79566,    0.0500375,    44.7639,    315.032,  -10.835}  // n15_075_040
-    }
-  },
-  {
-    {
-      {0.0543,    482.202,   -32.0608,   0.482724,   355.8447,  -11.83323,   0.1303268,  -0.000569553,   8.51141e-07,    -641.0774,    3.71752,   -0.0051548,    46.4350,    284.888,  -6.167} ,  // n10_000_000
-      {0.0545,    294.784,   -14.8973,   0.183950,    70.6762,   -3.02203,   0.0432333,   -0.00023106,   4.01597e-07,     408.7505,   -2.47051,    0.0039195,    47.4156,    285.465,  -4.979} ,  // n10_000_005
-      {0.0543,    551.169,   -34.5252,   0.490315,   100.1681,   -2.99469,   0.0335697,  -0.000160407,   2.69727e-07,      87.8598,    0.49517,   -0.0022606,    47.5271,    286.991,  -5.181} ,  // n10_000_010
-      {0.0537,    433.416,   -24.4625,   0.337966,   209.2171,   -5.79581,   0.0539141,  -0.000207398,   2.84911e-07,      35.8637,    0.37622,   -0.0015022,    47.5830,    289.391,  -5.466} ,  // n10_000_020
-      {0.0523,    582.930,   -34.4991,   0.498282,    18.4208,    1.78898,  -0.0430855,   0.000264403,  -4.76488e-07,    3644.6670,  -22.45636,    0.0339720,    44.4710,    294.487,  -6.632}   // n10_000_040
-    },
-    {
-      {0.0548,    404.498,   -25.6095,   0.363479,    97.4297,   -3.42009,   0.0405102,  -0.000196944,   3.28348e-07,    -960.2191,    6.14599,   -0.0094942,    47.3751,    284.905,  -4.311} ,  // n10_010_000
-      {0.0545,    589.176,   -36.3108,   0.517859,   231.6770,   -7.11434,   0.0760865,  -0.000330537,   4.97531e-07,    1830.9408,  -11.65743,    0.0185333,    47.4790,    284.623,  -5.087} ,  // n10_010_005
-      {0.0542,    405.303,   -23.8855,   0.326044,     4.4413,    0.01361,   0.0024068,  -2.86501e-05,    7.2286e-08,    1233.5764,   -7.63692,    0.0118956,    47.7030,    287.951,  -5.171} ,  // n10_010_010
-      {0.0534,    398.447,   -21.7451,   0.287043,    80.8576,   -2.03592,   0.0155457,  -4.63902e-05,    4.8592e-08,    2429.4221,  -15.05335,    0.0231679,    47.7031,    291.415,  -5.619} ,  // n10_010_020
-      {0.0520,    560.400,   -30.5424,   0.400372,  -432.6007,   16.68758,  -0.1960918,   0.000881002,  -1.33002e-06,    3042.4573,  -18.51538,    0.0274602,    44.5031,    294.975,  -6.840}   // n10_010_040
-    },
-    {
-      {0.0542,    494.054,   -29.3652,   0.408306,   209.2332,   -6.95220,   0.0781366,  -0.000350227,   5.34037e-07,   -2029.2206,   12.48364,   -0.0189363,    47.5031,    286.568,  -5.157} ,  // n10_020_000
-      {0.0542,    521.165,   -31.0171,   0.424773,   -73.9372,    2.20773,  -0.0117791,  -9.92663e-06,    9.9873e-08,     904.0173,   -5.29526,    0.0078845,    47.1990,    287.416,  -5.165} ,  // n10_020_005
-      {0.0537,    459.702,   -26.4735,   0.363628,   149.3246,   -4.30190,   0.0433552,  -0.000180486,   2.61685e-07,    -815.5165,    4.91555,   -0.0072902,    47.7274,    289.745,  -5.735} ,  // n10_020_010
-      {0.0534,    489.016,   -26.8271,   0.359168,   -78.9943,    4.34104,  -0.0562197,   0.000258697,  -3.90802e-07,     -56.5670,    0.21668,   -0.0001294,    47.6470,    291.335,  -5.786} ,  // n10_020_020
-      {0.0516,    611.173,   -33.5181,   0.438966,  -189.9971,    8.58779,  -0.1140145,   0.000554113,  -8.79833e-07,    5560.9287,  -34.13583,    0.0515256,    48.3190,    300.913,  -7.131}   // n10_020_040
-    },
-    {
-      {0.0537,    372.594,   -21.1078,   0.284052,   128.4009,   -4.48399,   0.0543108,  -0.000262015,   4.27507e-07,    -340.5131,    2.36116,   -0.0037728,    47.6722,    289.151,  -5.408} ,  // n10_035_000
-      {0.0534,    523.639,   -31.3279,   0.434482,    95.8907,   -2.92172,   0.0323685,   -0.00014803,   2.34646e-07,    1453.3218,   -8.82569,    0.0134259,    47.4630,    291.191,  -5.819} ,  // n10_035_005
-      {0.0534,    497.780,   -27.7636,   0.368634,   -25.9006,    1.56222,  -0.0185932,     7.255e-05,   -8.7794e-08,    -103.7204,    0.48110,   -0.0002811,    47.9110,    291.185,  -5.602} ,  // n10_035_010
-      {0.0526,    644.840,   -37.8582,   0.525025,   223.0479,   -5.96465,   0.0520599,  -0.000183032,   2.24579e-07,    1097.2280,   -6.64303,    0.0098586,    48.0230,    294.455,  -6.356} ,  // n10_035_020
-      {0.0511,    562.862,   -28.4031,   0.354786,  -137.9524,    6.92762,  -0.0974680,   0.000489186,  -7.94401e-07,    6786.2295,  -41.54120,    0.0623709,    48.5592,    302.768,  -7.572}   // n10_035_040
-    },
-    {
-      {0.0519,    573.358,   -32.4528,   0.420570,  -149.4460,    4.24506,  -0.0322658,    8.1967e-05,   -4.9569e-08,    -224.5401,    1.80872,   -0.0031874,    48.6390,    299.695,  -6.318} ,  // n10_075_000
-      {0.0516,    593.940,   -32.6651,   0.425715,   -14.2820,    1.11578,  -0.0133427,   5.15847e-05,   -6.1772e-08,    -524.4960,    3.48466,   -0.0056522,    48.8391,    300.599,  -6.828} ,  // n10_075_005
-      {0.0512,    453.240,   -24.3397,   0.311356,   -63.7068,    2.66275,  -0.0308241,   0.000132578,  -1.90352e-07,    -592.5206,    3.64809,   -0.0056133,    48.8390,    302.223,  -6.920} ,  // n10_075_010
-      {0.0508,    564.054,   -30.0969,   0.385886,   -97.5094,    4.63294,  -0.0604914,   0.000281774,  -4.26399e-07,    1331.7659,   -7.53164,    0.0103100,    48.8790,    304.168,  -7.296} ,  // n10_075_020
-      {0.0489,    625.945,   -30.9072,   0.377180,  -335.6169,   13.13234,  -0.1552891,   0.000683332,  -9.94053e-07,   10158.1289,  -58.57383,    0.0831801,    45.5030,    312.469,  -9.291}   // n10_075_040
-    }
-  },
-  {
-    {
-      {0.0543,    663.026,   -66.3824,   1.590667,    72.0376,   -3.26491,   0.0455382,  -0.000229681,   3.75741e-07,    -628.4452,    3.83021,   -0.0056639,    26.0951,    285.728,  -5.738} ,  // n05_000_000
-      {0.0546,    918.491,   -92.9771,   2.210514,    87.3605,   -3.37392,   0.0426091,  -0.000209767,   3.44974e-07,    -416.8792,    2.42383,   -0.0032668,    27.1351,    286.464,  -4.283} ,  // n05_000_005
-      {0.0546,   1044.805,  -106.6222,   2.515087,   -47.3540,    2.83865,  -0.0410201,   0.000210697,   -3.4721e-07,      29.6137,   -0.05393,    0.0000013,    27.1350,    286.623,  -4.403} ,  // n05_000_010
-      {0.0541,   1061.803,  -110.1372,   2.635414,    43.4643,   -1.97770,   0.0288297,  -0.000151462,   2.57535e-07,    1076.8308,   -6.48455,    0.0097862,    26.9672,    288.905,  -4.530} ,  // n05_000_020
-      {0.0529,   1044.142,   -95.3682,   2.125540,   -22.1336,    3.36905,  -0.0610331,   0.000332354,  -5.53872e-07,    4825.4048,  -29.65764,    0.0450632,    27.5951,    295.163,  -5.662}   // n05_000_040
-    },
-    {
-      {0.0545,    780.566,   -77.2458,   1.804181,    50.4201,   -2.03741,   0.0302131,  -0.000179939,   3.36629e-07,   -1228.8286,    8.18394,   -0.0138241,    27.1830,    285.639,  -4.346} ,  // n05_010_000
-      {0.0547,   1099.360,  -115.2038,   2.801082,    80.6932,   -2.37632,   0.0211609,  -7.62156e-05,     9.532e-08,   -1685.8831,   10.05291,   -0.0147013,    26.9910,    285.992,  -4.089} ,  // n05_010_005
-      {0.0543,    963.487,   -98.7356,   2.377767,    76.2896,   -2.26147,   0.0244245,   -0.00011911,   2.03054e-07,    -305.2742,    2.36013,   -0.0044983,    26.9929,    287.336,  -4.477} ,  // n05_010_010
-      {0.0538,    993.758,  -102.1095,   2.456116,    71.8907,   -1.42774,   0.0066664,  -3.03117e-07,   -2.9456e-08,    1032.4103,   -6.57065,    0.0104143,    27.3353,    290.000,  -4.974} ,  // n05_010_020
-      {0.0528,   1236.552,  -128.1032,   3.237446,   -28.3956,    3.24945,  -0.0547030,    0.00028825,  -4.69546e-07,    2359.1118,  -13.47842,    0.0187080,    23.8070,    291.160,  -5.828}   // n05_010_040
-    },
-    {
-      {0.0541,    816.087,   -78.8288,   1.826369,    42.1378,   -1.21251,   0.0140799,  -7.27033e-05,   1.22868e-07,     -80.4310,    0.11370,    0.0002046,    26.9590,    287.807,  -4.729} ,  // n05_020_000
-      {0.0543,    877.623,   -86.7326,   2.031615,    41.1299,   -1.34082,   0.0177186,  -0.000102602,   1.96117e-07,   -1007.4371,    6.73725,   -0.0109791,    26.9590,    287.601,  -4.573} ,  // n05_020_005
-      {0.0540,    971.299,   -97.6710,   2.293463,    17.7953,    0.01280,  -0.0056469,   4.02706e-05,   -7.5715e-08,   -1314.7979,    8.00797,   -0.0120391,    27.3194,    288.825,  -4.738} ,  // n05_020_010
-      {0.0538,    821.123,   -79.3886,   1.821767,    -4.2026,    0.86868,  -0.0147592,   7.00417e-05,   -9.9007e-08,     885.9829,   -5.31948,    0.0079739,    27.2150,    289.496,  -4.848} ,  // n05_020_020
-      {0.0523,   1094.897,  -104.1715,   2.396472,   -11.2571,    2.78845,  -0.0491065,   0.000256411,  -4.08813e-07,   10539.9600,  -63.91719,    0.0960592,    27.1510,    298.511,  -6.175}   // n05_020_040
-    },
-    {
-      {0.0537,    850.220,   -83.0064,   1.949804,    70.7089,   -2.21260,   0.0232815,  -0.000102662,   1.59498e-07,     -70.7027,    0.46120,   -0.0006131,    26.8072,    290.223,  -4.877} ,  // n05_035_000
-      {0.0535,   1127.985,  -113.1409,   2.683142,    59.7940,   -1.39309,   0.0110045,  -4.14216e-05,    6.1915e-08,    -411.4487,    2.56911,   -0.0038557,    27.0070,    291.433,  -5.199} ,  // n05_035_005
-      {0.0536,    866.648,   -84.5795,   1.969876,    61.4061,   -1.60660,   0.0164774,  -7.68717e-05,   1.29166e-07,     672.2648,   -3.79337,    0.0053410,    27.4072,    290.743,  -5.099} ,  // n05_035_010
-      {0.0530,    902.376,   -88.9089,   2.082175,    39.8051,   -0.71595,   0.0019324,   1.04399e-05,   -3.5354e-08,     150.0020,   -0.90192,    0.0013065,    27.0958,    293.233,  -5.450} ,  // n05_035_020
-      {0.0519,    650.965,   -38.5310,   0.528112,   -93.5919,    5.72136,  -0.0837748,   0.000418829,   -6.6837e-07,    4590.1616,  -27.41714,    0.0401395,    49.0072,    300.271,  -6.392}   // n05_035_040
-    },
-    {
-      {0.0518,    846.170,   -76.0185,   1.676375,    -3.2868,    1.40082,  -0.0227767,   0.000106051,  -1.48939e-07,      79.7298,    0.00002,   -0.0006157,    27.2870,    300.456,  -6.054} ,  // n05_075_000
-      {0.0517,    368.141,   -26.3914,   0.495436,    24.0810,   -0.25672,  -0.0002538,   3.18501e-06,       2.2e-11,      78.7188,   -0.23021,    0.0000152,    27.3524,    300.927,  -5.913} ,  // n05_075_005
-      {0.0514,    506.276,   -29.2148,   0.394222,  -119.2112,    5.65304,  -0.0689402,    0.00030383,   -4.4049e-07,    -154.2037,   -0.00011,    0.0011320,    49.4791,    321.536,  -6.432} ,  // n05_075_010
-      {0.0514,    842.388,   -77.0330,   1.713260,    12.2687,    0.39519,  -0.0115245,   6.74754e-05,   -1.0879e-07,      14.2363,    0.57216,   -0.0016718,    27.2710,    303.274,  -6.138} ,  // n05_075_020
-      {0.0498,    553.290,   -29.6331,   0.380781,  -472.4498,   17.95012,  -0.2075450,   0.000902416,  -1.30673e-06,    5532.4624,  -31.97427,    0.0452127,    46.1289,    308.865,  -7.891}   // n05_075_040
-    }
-  },
-  {
-    {
-      {0.0543,    289.615,   -23.7225,   0.472795,   -36.2762,    1.70436,  -0.0274302,   0.000175927,  -3.76834e-07,     149.8167,   -1.39171,    0.0030299,    25.8682,    230.471,  -5.404} ,  // p00_000_000
-      {0.0546,    668.249,   -63.5458,   1.432858,     4.4654,   -0.69246,   0.0167983,  -0.000116652,   2.37179e-07,    -434.5546,    2.77058,   -0.0042488,    26.9110,    230.455,  -4.073} ,  // p00_000_005
-      {0.0548,    772.488,   -77.5895,   1.793609,   -51.0175,    1.77691,  -0.0153707,   4.18382e-05,   -2.5882e-08,    -800.1181,    5.45148,   -0.0089384,    27.0791,    230.241,  -3.843} ,  // p00_000_010
-      {0.0545,    928.222,   -90.6655,   2.068940,   -67.9672,    3.19609,  -0.0476606,   0.000271537,  -5.21355e-07,    -333.3984,    2.18458,   -0.0033733,    27.0070,    230.065,  -4.030} ,  // p00_000_020
-      {0.0536,    743.875,   -67.2333,   1.541026,    54.1464,    0.70253,  -0.0161563,   4.36933e-05,    5.9264e-08,    1824.7556,  -12.11723,    0.0198029,    27.6030,    234.361,  -5.686}   // p00_000_040
-    },
-    {
-      {0.0546,    902.211,   -89.9522,   2.126992,   123.5839,   -4.92113,   0.0654918,  -0.000344321,    6.0871e-07,    -638.3031,    4.28184,   -0.0071127,    27.2871,    230.057,  -4.220} ,  // p00_010_000
-      {0.0548,    921.661,   -92.2935,   2.176105,   161.0861,   -7.46099,   0.1061745,  -0.000576633,   1.04659e-06,     -53.5814,   -0.15769,    0.0012197,    27.3510,    230.208,  -3.653} ,  // p00_010_005
-      {0.0546,    885.081,   -88.8020,   2.049073,   -48.0536,    1.63944,  -0.0136554,   2.91183e-05,    1.3021e-08,    -150.5886,    0.91592,   -0.0011813,    27.2630,    230.848,  -4.038} ,  // p00_010_010
-      {0.0543,   1012.134,  -101.9436,   2.394910,   -14.5198,    2.00805,  -0.0356362,   0.000206718,  -3.87657e-07,    -285.5976,    1.71756,   -0.0022512,    27.4310,    231.856,  -4.177} ,  // p00_010_020
-      {0.0534,   1067.225,  -100.4478,   2.273133,   -16.1798,    1.66276,  -0.0170743,    4.1267e-06,   1.85777e-07,    1270.8571,   -8.31610,    0.0132797,    27.1910,    234.696,  -5.303}   // p00_010_040
-    },
-    {
-      {0.0543,    972.852,   -98.6335,   2.322881,    78.4235,   -3.94691,   0.0626297,  -0.000366262,   7.02291e-07,      88.7705,   -0.87615,    0.0020051,    27.2630,    230.657,  -4.182} ,  // p00_020_000
-      {0.0544,   1016.250,  -100.4747,   2.340127,    45.6626,   -2.03200,   0.0376704,  -0.000260815,   5.66934e-07,    -373.3793,    2.31714,   -0.0032993,    27.1510,    231.064,  -4.274} ,  // p00_020_005
-      {0.0541,    706.308,   -65.6239,   1.456052,    -2.8856,    0.15829,  -0.0000781,  -6.71131e-06,    1.1953e-08,    -202.7576,    1.02348,   -0.0010172,    27.3930,    232.569,  -4.431} ,  // p00_020_010
-      {0.0542,    989.765,   -96.0692,   2.217921,    14.9726,    0.00241,   0.0003819,  -2.65291e-05,   1.00609e-07,    -258.0817,    1.72505,   -0.0027117,    27.0872,    231.769,  -4.387} ,  // p00_020_020
-      {0.0531,   1114.745,  -111.2184,   2.615693,    18.2961,    0.50617,  -0.0084253,  -7.56255e-06,   1.58186e-07,    1404.9285,   -9.17056,    0.0147852,    27.2310,    236.752,  -5.121}   // p00_020_040
-    },
-    {
-      {0.0537,   1012.495,   -99.3533,   2.284698,     2.4251,    0.00145,   0.0022004,  -2.62711e-05,     6.737e-08,    -155.1503,    0.86565,   -0.0010724,    27.3274,    233.679,  -4.717} ,  // p00_035_000
-      {0.0536,    820.854,   -76.0255,   1.626807,  -178.6863,    7.21592,  -0.0939839,   0.000486539,  -8.74298e-07,    -381.0762,    2.31054,   -0.0033492,    27.2870,    234.039,  -4.785} ,  // p00_035_005
-      {0.0538,    770.818,   -73.5234,   1.669331,    24.2091,   -0.98415,   0.0176303,    -0.0001242,    2.7732e-07,    -180.6738,    1.19439,   -0.0018249,    27.3191,    233.311,  -4.555} ,  // p00_035_010
-      {0.0535,    987.550,   -92.7189,   2.082989,    12.4541,   -0.08230,  -0.0001818,  -3.87795e-06,    2.5149e-08,     323.4502,   -2.24899,    0.0038834,    27.3590,    234.951,  -4.869} ,  // p00_035_020
-      {0.0526,   1091.041,  -100.5277,   2.268617,   -24.3450,    3.95018,  -0.0648846,   0.000325397,  -5.05291e-07,    5624.6475,  -33.66283,    0.0497849,    27.4794,    296.856,  -5.917}   // p00_035_040
-    },
-    {
-      {0.0518,    906.047,   -86.9465,   1.973729,    47.2169,   -2.42283,   0.0403015,  -0.000261595,   5.48691e-07,    -443.7711,    3.06377,   -0.0051786,    27.4230,    241.297,  -5.555} ,  // p00_075_000
-      {0.0518,    962.031,   -86.6783,   1.901755,    -1.5936,    1.05420,  -0.0151409,    6.2351e-05,   -7.2903e-08,    -248.4788,    1.67118,   -0.0026560,    27.5352,    241.721,  -5.715} ,  // p00_075_005
-      {0.0517,   1039.619,  -100.0136,   2.303679,    67.4217,   -1.38425,   0.0080315,  -1.77911e-05,      1.45e-08,    -116.7918,    0.79208,   -0.0012724,    27.6310,    241.833,  -5.648} ,  // p00_075_010
-      {0.0517,    913.013,   -86.8368,   1.987933,    18.3200,    0.87979,  -0.0216340,   0.000124679,  -2.13529e-07,    -303.7535,    2.09690,   -0.0034978,    27.5110,    242.335,  -5.631} ,  // p00_075_020
-      {0.0506,    958.899,   -78.2435,   1.590885,  -111.3634,    6.71019,  -0.0914355,   0.000416366,  -5.95608e-07,    9726.7734,  -55.22470,    0.0778337,    27.7837,    310.280,  -6.746}   // p00_075_040
-    }
-  },
-  {
-    {
-      {0.0543,    696.547,   -71.7835,   1.763779,    84.2507,   -3.15106,   0.0394331,  -0.000190268,   3.06408e-07,     860.6631,   -5.55575,    0.0089867,    26.1516,    285.608,  -5.750} ,  // p05_000_000
-      {0.0547,    886.012,   -88.4547,   2.075261,    18.0386,   -0.82981,   0.0143024,   -8.7464e-05,    1.6728e-07,      96.0948,   -0.57534,    0.0011086,    26.7350,    285.000,  -4.142} ,  // p05_000_005
-      {0.0550,    842.528,   -89.4159,   2.175662,    41.0640,   -1.55421,   0.0238825,   -0.00014118,   2.67382e-07,    -696.6580,    4.99751,   -0.0085472,    26.9831,    284.807,  -4.101} ,  // p05_000_010
-      {0.0548,    919.531,   -98.4007,   2.419015,    47.7716,   -1.56864,   0.0177191,  -7.91865e-05,    1.1846e-07,   -3942.1045,   24.33616,   -0.0370322,    26.7111,    285.879,  -4.006} ,  // p05_000_020
-      {0.0545,    980.022,   -98.0226,   2.321404,    74.2535,   -1.73373,   0.0139841,  -5.59236e-05,    9.4178e-08,    1429.3680,   -8.87354,    0.0141598,    27.3712,    288.663,  -4.467}   // p05_000_040
-    },
-    {
-      {0.0547,    625.688,   -62.0451,   1.439093,   -11.4410,    0.01840,   0.0093194,  -8.78087e-05,   2.00186e-07,     783.8522,   -4.57127,    0.0068869,    26.6390,    285.519,  -4.346} ,  // p05_010_000
-      {0.0548,    695.967,   -75.8269,   1.918397,   128.6090,   -4.26920,   0.0481577,   -0.00022175,   3.53129e-07,     236.0552,   -1.44921,    0.0024358,    26.9030,    285.487,  -4.195} ,  // p05_010_005
-      {0.0547,    865.005,   -86.2078,   2.008639,    -7.2586,    0.01234,   0.0080995,  -7.85358e-05,   1.81736e-07,    -973.2291,    6.82770,   -0.0115285,    26.8071,    285.552,  -4.294} ,  // p05_010_010
-      {0.0546,    948.409,   -98.6395,   2.386155,    57.2934,   -1.76341,   0.0207853,  -0.000103446,   1.77386e-07,    -849.1052,    5.23769,   -0.0076821,    26.9432,    287.079,  -4.389} ,  // p05_010_020
-      {0.0543,    745.066,   -70.3617,   1.570678,  -100.0891,    4.65540,  -0.0576809,   0.000248944,  -3.40433e-07,    1045.9683,   -6.00401,    0.0090176,    26.8310,    290.321,  -4.562}   // p05_010_040
-    },
-    {
-      {0.0543,    927.075,   -92.2744,   2.168058,    26.2967,   -0.55144,   0.0049539,  -2.29069e-05,     4.001e-08,     526.2325,   -3.71631,    0.0066360,    26.9363,    287.753,  -4.523} ,  // p05_020_000
-      {0.0545,    821.476,   -82.9178,   1.984995,    87.5068,   -3.02167,   0.0398399,  -0.000213386,   3.82012e-07,     714.7357,   -3.71298,    0.0048374,    27.0472,    286.592,  -4.479} ,  // p05_020_005
-      {0.0543,    848.828,   -84.8760,   2.020220,    90.9654,   -3.15733,   0.0389501,  -0.000191609,   3.16806e-07,   -1171.0167,    7.27429,   -0.0109703,    27.0231,    287.231,  -4.519} ,  // p05_020_010
-      {0.0546,    889.890,   -89.5310,   2.115131,    -0.8272,    0.29102,  -0.0009026,  -1.47083e-05,      5.27e-08,   -1885.8252,   11.85770,   -0.0182013,    26.6471,    287.289,  -4.469} ,  // p05_020_020
-      {0.0539,    777.052,   -76.7719,   1.813559,    14.3051,    1.07654,  -0.0214579,   0.000103143,  -1.38949e-07,     187.0997,   -0.89280,    0.0015244,    27.1590,    291.553,  -4.805}   // p05_020_040
-    },
-    {
-      {0.0537,   1068.376,  -103.0411,   2.371422,    22.8346,   -0.49907,   0.0058217,  -3.13124e-05,    5.8011e-08,     749.1772,   -4.66128,    0.0073394,    26.9197,    290.305,  -5.034} ,  // p05_035_000
-      {0.0537,    922.462,   -95.1797,   2.308590,    57.9130,   -1.35554,   0.0124857,  -5.57341e-05,     9.373e-08,      18.7257,   -0.00962,    0.0000362,    26.7918,    290.512,  -4.849} ,  // p05_035_005
-      {0.0540,    894.928,   -89.1535,   2.089837,    34.6807,   -0.83026,   0.0109258,  -6.79551e-05,   1.38895e-07,    1548.7596,   -9.23427,    0.0138524,    27.3110,    289.360,  -4.610} ,  // p05_035_010
-      {0.0539,    667.240,   -60.7462,   1.344259,     7.5475,    0.05767,  -0.0005791,  -5.70037e-06,    2.5165e-08,   -1358.5505,    8.50055,   -0.0129859,    27.1272,    290.160,  -4.607} ,  // p05_035_020
-      {0.0534,    802.429,   -73.0618,   1.651703,    34.0876,    0.61236,  -0.0182647,   9.43796e-05,  -1.30823e-07,    3222.7056,  -18.93312,    0.0277841,    27.3115,    294.422,  -5.299}   // p05_035_040
-    },
-    {
-      {0.0518,    700.383,   -61.1032,   1.299594,   -39.2225,    1.94442,  -0.0216961,   8.01258e-05,   -8.9898e-08,     -81.5502,    1.08486,   -0.0024083,    27.1193,    300.399,  -5.993} ,  // p05_075_000
-      {0.0519,    927.206,   -87.9845,   2.000143,    20.6650,    0.00520,  -0.0027720,   8.80259e-06,      1.98e-09,       9.6791,    0.49922,   -0.0014792,    27.4390,    299.895,  -5.805} ,  // p05_075_005
-      {0.0518,    934.941,   -86.2463,   1.936011,    25.1119,    0.00001,  -0.0039262,   2.03358e-05,    -2.417e-08,     322.9187,   -1.49668,    0.0016812,    27.2631,    300.177,  -5.986} ,  // p05_075_010
-      {0.0520,    993.549,   -97.2560,   2.264713,    33.6250,   -0.24020,  -0.0012194,   2.96477e-06,    1.2554e-08,     307.3519,   -1.21447,    0.0009945,    27.2962,    299.423,  -5.744} ,  // p05_075_020
-      {0.0514,    468.694,   -25.9941,   0.331209,  -500.7382,   17.79676,  -0.1940950,   0.000794647,  -1.07709e-06,    5181.4653,  -29.96476,    0.0433838,    49.8310,    330.333,  -6.002}   // p05_075_040
-    }
-  },
-  {
-    {
-      {0.0543,    444.967,   -28.4588,   0.424836,   339.9133,  -10.95517,   0.1171990,  -0.000501034,   7.36781e-07,   -2649.7520,   16.23221,   -0.0243355,    46.2672,    284.537,  -6.241} ,  // p10_000_000
-      {0.0549,    390.870,   -27.6837,   0.408923,   266.7567,   -9.91893,   0.1121593,  -0.000503336,    7.7673e-07,   -2359.8765,   14.73537,   -0.0223716,    47.5111,    284.903,  -3.819} ,  // p10_000_005
-      {0.0552,    409.388,   -24.6673,   0.339988,   118.3806,   -4.90476,   0.0690942,  -0.000371486,   6.54186e-07,    -734.2883,    5.10949,   -0.0083707,    47.5030,    283.249,  -4.244} ,  // p10_000_010
-      {0.0551,    380.723,   -24.1178,   0.349059,   260.4387,   -9.22805,   0.1110720,   -0.00052683,   8.44974e-07,   -3205.7256,   20.19859,   -0.0310497,    47.3030,    283.016,  -4.520} ,  // p10_000_020
-      {0.0553,    486.981,   -30.5322,   0.443449,    99.9095,   -1.69511,   0.0103569,  -4.79413e-05,   1.09043e-07,   -2123.6826,   13.27378,   -0.0196028,    47.5750,    283.845,  -4.308}   // p10_000_040
-    },
-    {
-      {0.0547,    334.865,   -18.0900,   0.234656,    28.0558,   -1.31094,   0.0236035,  -0.000147807,   2.84406e-07,   -1982.7886,   12.94529,   -0.0206795,    47.4070,    285.407,  -4.922} ,  // p10_010_000
-      {0.0550,    429.850,   -25.6893,   0.361947,   303.1457,  -10.41588,   0.1197167,  -0.000541544,   8.32066e-07,   -1949.4258,   12.09917,   -0.0183208,    47.3590,    284.001,  -4.667} ,  // p10_010_005
-      {0.0550,    423.318,   -26.4854,   0.376344,   149.3362,   -5.23585,   0.0640293,  -0.000311324,   5.10747e-07,   -1775.4415,   11.07509,   -0.0167572,    47.4950,    284.279,  -4.383} ,  // p10_010_010
-      {0.0552,    297.030,   -18.7851,   0.271372,   340.4187,  -12.44870,   0.1500386,  -0.000704622,   1.11893e-06,   -2600.6030,   16.39101,   -0.0249243,    47.5830,    283.537,  -4.038} ,  // p10_010_020
-      {0.0551,    450.229,   -30.1270,   0.444823,    83.7979,   -2.33059,   0.0303516,  -0.000179137,   3.56033e-07,   -1380.3755,    8.95670,   -0.0133352,    47.6073,    285.729,  -4.428}   // p10_010_040
-    },
-    {
-      {0.0543,    462.093,   -27.4985,   0.384078,   222.0224,   -7.10104,   0.0761050,  -0.000328127,   4.86688e-07,   -2415.0276,   14.77577,   -0.0221916,    47.6152,    287.224,  -5.013} ,  // p10_020_000
-      {0.0546,    410.525,   -25.3196,   0.357600,    86.1671,   -2.82200,   0.0374626,  -0.000203459,    3.6567e-07,   -1225.1757,    8.02644,   -0.0127149,    47.7198,    286.049,  -4.892} ,  // p10_020_005
-      {0.0546,    425.689,   -28.0149,   0.413345,   266.2513,   -8.37519,   0.0905441,  -0.000398737,   6.07633e-07,   -2265.1531,   14.01686,   -0.0211383,    47.9031,    286.079,  -4.748} ,  // p10_020_010
-      {0.0550,    352.606,   -20.9216,   0.288158,    74.4119,   -2.92493,   0.0432526,  -0.000241122,   4.34542e-07,   -2950.2568,   18.57295,   -0.0283706,    47.5670,    284.361,  -4.425} ,  // p10_020_020
-      {0.0548,    426.454,   -26.8953,   0.385533,    41.4826,   -0.64755,   0.0068814,  -5.47065e-05,   1.37691e-07,   -1917.6680,   11.55652,   -0.0162119,    47.7271,    287.553,  -4.416}   // p10_020_040
-    },
-    {
-      {0.0538,    451.981,   -28.1736,   0.395521,    58.9204,   -1.83209,   0.0213037,  -0.000103434,   1.71531e-07,    -902.2464,    5.53711,   -0.0082508,    47.8630,    289.529,  -5.141} ,  // p10_035_000
-      {0.0538,    526.171,   -30.8816,   0.417017,   -11.5804,    0.17697,   0.0048610,  -5.44665e-05,   1.27224e-07,   -1179.8983,    7.40392,   -0.0112711,    47.7831,    289.144,  -5.393} ,  // p10_035_005
-      {0.0542,    519.251,   -30.5322,   0.416795,   105.8949,   -3.68688,   0.0468085,  -0.000236976,   4.02292e-07,    -522.6336,    3.57232,   -0.0057089,    47.8710,    287.729,  -5.024} ,  // p10_035_010
-      {0.0543,    306.942,   -19.4907,   0.280199,   191.3041,   -6.54247,   0.0757187,  -0.000349694,   5.51907e-07,   -1488.0515,    9.10737,   -0.0133225,    47.8879,    287.129,  -4.830} ,  // p10_035_020
-      {0.0544,    416.048,   -25.6481,   0.359893,   -69.9605,    3.42775,  -0.0426010,   0.000176246,  -2.21218e-07,     735.8124,   -4.44674,    0.0074687,    48.0711,    289.529,  -4.670}   // p10_035_040
-    },
-    {
-      {0.0518,    630.817,   -35.9510,   0.472383,  -129.8099,    4.43541,  -0.0423146,   0.000145196,  -1.56665e-07,     247.9289,   -0.67855,   -0.0000069,    48.8551,    299.968,  -6.525} ,  // p10_075_000
-      {0.0520,    624.701,   -35.2674,   0.463107,    -7.5412,    0.00076,   0.0079323,  -7.26227e-05,   1.60222e-07,      55.1657,    0.03637,   -0.0002848,    48.5190,    298.776,  -6.353} ,  // p10_075_005
-      {0.0521,    529.047,   -30.6393,   0.414497,    94.8947,   -2.61612,   0.0286424,  -0.000135713,   2.24151e-07,      30.5315,   -0.00030,    0.0000620,    48.7990,    298.433,  -6.096} ,  // p10_075_010
-      {0.0524,    546.891,   -32.8178,   0.454503,   151.0075,   -4.67180,   0.0561091,  -0.000281675,    4.8355e-07,    3507.9709,  -19.82098,    0.0281110,    48.7116,    297.617,  -5.892} ,  // p10_075_020
-      {0.0522,    490.736,   -33.0332,   0.479720,  -205.0307,    8.57113,  -0.0979068,   0.000392854,   -5.0076e-07,     259.6651,   -0.86469,    0.0012109,    48.9432,    301.888,  -5.997}   // p10_075_040
-    }
-  },
-  {
-    {
-      {0.0539,    618.555,   -29.3519,   0.407479,   489.6862,  -13.50907,   0.1496090,  -0.000668385,   1.00837e-06,   -4786.4731,   29.78914,   -0.0459188,    45.4550,    283.713,  -9.471} ,  // p15_000_000
-      {0.0548,    481.651,   -27.1630,   0.372552,   396.5359,  -14.25051,   0.1670385,   -0.00076671,   1.19298e-06,   -1978.3080,   12.40154,   -0.0189188,    46.4470,    283.047,  -5.783} ,  // p15_000_005
-      {0.0554,    290.698,   -15.0619,   0.179752,   116.3914,   -6.70812,   0.1055461,   -0.00058638,   1.04249e-06,   -3111.3262,   20.36962,   -0.0324368,    46.2950,    280.183,  -5.333} ,  // p15_000_010
-      {0.0557,    317.726,   -22.0054,   0.323944,   366.2626,  -14.60828,   0.1764353,  -0.000826521,   1.31135e-06,   -4860.8784,   30.47407,   -0.0465112,    46.1916,    280.625,  -4.335} ,  // p15_000_020
-      {0.0561,    367.769,   -22.0139,   0.322166,   348.6285,  -11.34895,   0.1285156,  -0.000603347,   9.88116e-07,   -8028.9995,   50.82850,   -0.0781526,    46.6846,    279.732,  -4.681}   // p15_000_040
-    },
-    {
-      {0.0548,    446.717,   -27.6451,   0.394353,   195.2927,   -7.15040,   0.0881320,  -0.000429922,   7.07225e-07,   -2658.1968,   17.04272,   -0.0267249,    46.4553,    284.321,  -5.765} ,  // p15_010_000
-      {0.0554,    505.207,   -34.6656,   0.499380,   355.9942,  -14.83115,   0.1758237,  -0.000811081,   1.27602e-06,   -2110.8472,   13.34021,   -0.0202956,    46.3591,    282.232,  -4.222} ,  // p15_010_005
-      {0.0553,    537.478,   -36.3405,   0.521155,   253.6998,  -11.15294,   0.1399077,  -0.000678278,   1.10707e-06,   -1763.7476,   10.62043,   -0.0151664,    46.5049,    282.073,  -4.343} ,  // p15_010_010
-      {0.0555,    501.484,   -29.7783,   0.424330,   469.7086,  -16.62958,   0.1949605,  -0.000904706,    1.4272e-06,   -6666.8008,   41.94084,   -0.0646212,    46.4551,    280.472,  -5.084} ,  // p15_010_020
-      {0.0559,    470.110,   -29.0327,   0.417035,   201.0962,   -6.90415,   0.0847450,  -0.000428597,   7.42681e-07,   -6483.8740,   40.95590,   -0.0627083,    46.6631,    281.215,  -4.948}   // p15_010_040
-    },
-    {
-      {0.0542,    715.150,   -41.3902,   0.571101,   304.5117,  -10.43529,   0.1201256,  -0.000548814,   8.51862e-07,   -1760.8561,   10.78495,   -0.0161043,    46.6710,    285.929,  -6.331} ,  // p15_020_000
-      {0.0547,    658.439,   -39.8237,   0.562939,   231.8015,   -8.28794,   0.1035891,  -0.000511959,   8.49801e-07,   -2560.7815,   16.39720,   -0.0255540,    46.4322,    284.233,  -5.899} ,  // p15_020_005
-      {0.0548,    414.682,   -23.5832,   0.334302,   491.5483,  -17.12633,   0.1987145,  -0.000908154,   1.40874e-06,   -3339.7017,   20.71245,   -0.0313189,    46.4311,    283.720,  -5.738} ,  // p15_020_010
-      {0.0552,    643.887,   -39.6919,   0.568328,   347.0768,  -12.66702,   0.1579001,  -0.000775179,   1.27647e-06,   -7132.7778,   45.49577,   -0.0713910,    46.5272,    280.913,  -5.491} ,  // p15_020_020
-      {0.0555,    586.081,   -37.8925,   0.563541,   414.4861,  -13.86712,   0.1607843,  -0.000763897,   1.25664e-06,   -6512.6489,   41.39564,   -0.0635409,    46.7110,    282.863,  -4.961}   // p15_020_040
-    },
-    {
-      {0.0537,    684.029,   -39.6581,   0.549837,   248.6428,   -8.13178,   0.0939024,  -0.000436782,   6.91317e-07,   -2259.1494,   14.56773,   -0.0231138,    46.7990,    288.751,  -6.675} ,  // p15_035_000
-      {0.0539,    475.128,   -26.9227,   0.367868,   219.2943,   -7.81167,   0.0945481,  -0.000451036,   7.25412e-07,   -1352.0148,    8.56153,   -0.0131034,    46.4872,    287.552,  -6.372} ,  // p15_035_005
-      {0.0545,    351.110,   -19.3620,   0.260745,    92.5998,   -3.41361,   0.0496447,  -0.000274342,   4.88951e-07,   -3070.5591,   19.25337,   -0.0294163,    46.7517,    285.161,  -5.895} ,  // p15_035_010
-      {0.0547,    556.671,   -32.0973,   0.450015,   433.2410,  -14.75811,   0.1688557,   -0.00076681,   1.18891e-06,   -4002.7505,   25.24431,   -0.0388803,    46.7514,    284.007,  -5.922} ,  // p15_035_020
-      {0.0552,    365.319,   -21.5027,   0.305726,   176.2112,   -5.83624,   0.0741807,  -0.000390559,   6.98712e-07,   -4699.8848,   29.63368,   -0.0448165,    46.8313,    284.233,  -5.158}   // p15_035_040
-    },
-    {
-      {0.0518,    621.361,   -33.3111,   0.426117,   -75.5622,    2.42624,  -0.0184954,   3.91961e-05,      -3.9e-11,   -1776.4901,   11.82981,   -0.0192065,    47.7590,    298.825,  -7.737} ,  // p15_075_000
-      {0.0521,    382.142,   -19.4660,   0.243987,    91.9575,   -3.43488,   0.0462838,   -0.00023754,   3.98771e-07,   -1568.6532,    9.65921,   -0.0143480,    47.9195,    297.199,  -7.416} ,  // p15_075_005
-      {0.0522,    373.028,   -18.9158,   0.243496,   225.1808,   -7.53399,   0.0873045,  -0.000404019,   6.32245e-07,   -2645.6333,   16.30164,   -0.0246428,    47.5512,    296.345,  -7.269} ,  // p15_075_010
-      {0.0528,    602.134,   -34.4702,   0.467003,   169.5936,   -5.89679,   0.0749325,   -0.00037753,   6.36807e-07,    -750.4797,    5.06339,   -0.0076102,    47.7590,    294.831,  -6.694} ,  // p15_075_020
-      {0.0530,    565.434,   -31.4761,   0.419217,    54.0884,   -1.76104,   0.0308998,  -0.000216639,   4.63628e-07,   -6329.3975,   39.49205,   -0.0590629,    47.8631,    297.367,  -6.496}   // p15_075_040
-    }
-  },
-  {
-    {
-      {0.0544,    666.463,   -21.3878,   0.149755,   649.4370,  -29.52684,   0.3811547,   -0.00180754,   2.82459e-06,   -6885.1675,   41.58986,   -0.0613047,    73.9282,    275.579,  -13.202},  // p30_000_000
-      {0.0551,    663.811,   -21.4668,   0.154208,  1095.6870,  -41.93940,   0.5029961,   -0.00229908,   3.51539e-06,   -9617.8633,   58.74586,   -0.0877752,    74.6711,    273.760,  -11.472},  // p30_000_005
-      {0.0561,    631.227,   -21.3640,   0.161188,   947.9635,  -37.74511,   0.4696087,   -0.00221308,   3.46725e-06,  -12851.9990,   79.94849,   -0.1216095,    74.4157,    268.871,  -10.328},  // p30_000_010
-      {0.0570,    542.750,   -17.6239,   0.124934,  2498.4397,  -77.39868,   0.8261456,   -0.00355034,     5.244e-06,  -15202.8721,   94.94591,   -0.1446921,    92.5528,    264.840,  -9.445} ,  // p30_000_020
-      {0.0590,    345.066,    -9.2243,   0.052292,  2681.5320,  -88.77964,   0.9949263,   -0.00448531,   6.97869e-06,  -14757.0254,   92.72736,   -0.1395036,    90.0636,    259.212,  -8.083}   // p30_000_040
-    },
-    {
-      {0.0548,    700.934,   -23.7393,   0.175354,   200.3159,  -17.05980,   0.2673405,     -0.001403,   2.34438e-06,   -7364.8179,   45.84827,   -0.0699186,    74.9273,    276.703,  -11.387},  // p30_010_000
-      {0.0555,    520.402,   -15.8165,   0.099321,   557.5676,  -27.24042,   0.3586717,   -0.00171478,   2.68558e-06,   -9390.8203,   57.14725,   -0.0849253,    74.7515,    272.847,  -10.875},  // p30_010_005
-      {0.0559,    579.052,   -19.2583,   0.140442,  1338.6992,  -49.13049,   0.5776027,   -0.00262005,     3.997e-06,  -11335.1484,   69.45791,   -0.1037953,    74.6551,    270.008,  -10.516},  // p30_010_010
-      {0.0573,    537.389,   -17.0785,   0.116394,   758.0134,  -36.34122,   0.4834257,    -0.0023376,   3.70117e-06,  -14798.0811,   92.13703,   -0.1392673,    92.2409,    264.271,  -9.104} ,  // p30_010_020
-      {0.0588,    445.450,   -14.0082,   0.095526,  2645.2361,  -86.68890,   0.9697553,   -0.00436719,   6.78475e-06,  -14777.9561,   92.31094,   -0.1378682,    90.7604,    260.489,  -7.964}   // p30_010_040
-    },
-    {
-      {0.0542,    653.501,   -20.5394,   0.140783,   646.2662,  -29.47562,   0.3827417,   -0.00183945,   2.92208e-06,   -4510.4043,   27.14243,   -0.0396915,    74.9998,    279.064,  -12.045},  // p30_020_000
-      {0.0550,    643.921,   -20.5326,   0.144599,   -13.3782,  -10.71516,   0.2055312,   -0.00114825,   1.96388e-06,   -8626.5527,   53.29684,   -0.0805921,    75.1838,    274.904,  -11.348},  // p30_020_005
-      {0.0556,    677.056,   -21.9846,   0.161014,  1029.1294,  -39.96080,   0.4893214,   -0.00228495,   3.56631e-06,   -9896.2520,   60.35292,   -0.0894654,    74.5673,    272.040,  -10.972},  // p30_020_010
-      {0.0568,    493.109,   -15.7785,   0.109324,   538.3813,  -27.78613,   0.3822607,   -0.00188315,   3.01036e-06,  -13770.9863,   85.53278,   -0.1294430,    91.9207,    266.055,  -9.806} ,  // p30_020_020
-      {0.0585,    438.066,   -13.3681,   0.087134,  1439.5156,  -57.68326,   0.7229532,   -0.00347484,   5.62005e-06,  -14117.8672,   88.19157,   -0.1317443,    90.5847,    261.543,  -8.254}   // p30_020_040
-    },
-    {
-      {0.0537,    750.612,   -24.7531,   0.182830,   385.3733,  -21.04696,   0.2956944,   -0.00147668,   2.39428e-06,   -5680.8027,   34.69738,   -0.0517378,    75.9672,    281.497,  -12.748},  // p30_035_000
-      {0.0543,    469.437,   -13.0089,   0.073764,   722.2865,  -31.78866,   0.4069758,   -0.00193378,   3.03995e-06,   -8950.8496,   54.99032,   -0.0826676,    75.2551,    277.999,  -12.074},  // p30_035_005
-      {0.0552,    411.203,   -12.2256,   0.080060,   642.2927,  -30.93592,   0.4155416,   -0.00203922,   3.28911e-06,   -8490.0098,   52.16059,   -0.0779041,    94.2560,    274.064,  -10.962},  // p30_035_010
-      {0.0563,    557.440,   -17.6681,   0.122377,  1209.2566,  -45.34520,   0.5447492,   -0.00251467,   3.89677e-06,  -13035.4639,   80.70238,   -0.1213974,    92.8646,    268.673,  -10.032},  // p30_035_020
-      {0.0581,    491.429,   -15.7457,   0.111179,  1546.3083,  -55.71778,   0.6661981,    -0.0031227,   4.97053e-06,  -16498.6426,  103.90786,   -0.1574202,    91.7591,    263.521,  -8.411}   // p30_035_040
-    },
-    {
-      {0.0517,    865.294,   -29.3301,   0.222901,   -44.5315,   -9.09935,   0.1820098,   -0.00101846,   1.73084e-06,   -4239.0176,   25.70850,   -0.0377992,    78.0954,    292.223,  -14.074},  // p30_075_000
-      {0.0524,    703.572,   -24.6691,   0.183864,   270.5533,  -19.10135,   0.2794582,    -0.0014063,   2.27132e-06,   -8685.2158,   52.30726,   -0.0771287,    77.4650,    288.559,  -12.376},  // p30_075_005
-      {0.0530,    474.285,   -14.5547,   0.095701,   812.2191,  -35.11754,   0.4441313,   -0.00209413,   3.27122e-06,   -7957.1304,   47.67856,   -0.0695332,    97.3439,    285.225,  -12.283},  // p30_075_010
-      {0.0543,    567.884,   -18.0292,   0.126235,  1405.6339,  -49.01416,   0.5709846,   -0.00260125,   4.01091e-06,  -12098.4277,   73.53913,   -0.1083410,    96.3750,    279.455,  -11.256},  // p30_075_020
-      {0.0558,    589.211,   -19.2235,   0.138965,  2047.7167,  -67.84039,   0.7780075,   -0.00357741,   5.64058e-06,  -14283.4629,   87.03631,   -0.1264499,    94.8953,    274.800,  -9.834}   // p30_075_040
-    }
-  },
-  {
-    {
-      {0.0557,   1155.683,   -33.4839,   0.145686,  2719.7532, -108.17351,   1.2747917,   -0.00565097,   8.39053e-06,  -25073.9219,  151.94778,   -0.2242298,    48.0090,    280.461,  -23.132},  // p45_000_000
-      {0.0566,   1567.902,   -57.4336,   0.493112,  3101.4058, -117.88098,   1.3597585,   -0.00595373,   8.77726e-06,  -13633.4766,   80.32226,   -0.1119712,    49.1791,    267.921,  -21.234},  // p45_000_005
-      {0.0586,    942.516,   -24.8914,   0.069922,  3201.7031, -125.89007,   1.4943951,   -0.00670695,   1.00958e-05,  -21764.9766,  128.79881,   -0.1829160,    48.9092,    277.421,  -18.255},  // p45_000_010
-      {0.0608,    902.899,   -28.3868,   0.146040,  2763.3792, -110.55793,   1.3092294,   -0.00576718,   8.44305e-06,  -36576.5859,  224.45471,   -0.3327475,    48.5103,    268.711,  -15.521},  // p45_000_020
-      {0.0646,    711.781,   -23.1849,   0.186509,  4643.2041, -175.78204,   2.0932548,   -0.00957828,    1.4855e-05,  -37398.5391,  230.35623,   -0.3369770,    48.6790,    268.309,  -13.067}  // p45_000_040
-    },
-    {
-      {0.0556,   1641.623,   -64.7275,   0.614411,  3210.3213, -121.40795,   1.3998587,   -0.00616869,   9.16989e-06,  -19828.0742,  119.30855,   -0.1743972,    49.2190,    282.671,  -21.938},  // p45_010_000
-      {0.0572,   1610.209,   -63.4580,   0.592605,  2768.5166, -107.84313,   1.2726152,   -0.00567878,   8.50342e-06,  -32543.1211,  199.08755,   -0.2973665,    48.7990,    285.080,  -20.646},  // p45_010_005
-      {0.0586,    928.771,   -25.3291,   0.083051,  2961.2415, -116.65910,   1.3792919,    -0.0061337,   9.13495e-06,  -28516.6875,  170.91864,   -0.2473477,    49.1495,    279.221,  -18.115},  // p45_010_010
-      {0.0614,    697.019,   -15.7292,  -0.019192,  2759.0288, -111.27457,   1.3488168,   -0.00610496,   9.22191e-06,  -48335.2852,  296.50076,   -0.4415575,    48.8303,    278.460,  -15.170},  // p45_010_020
-      {0.0643,    728.698,   -23.1926,   0.134520,  7521.9775, -250.69135,   2.7667563,    -0.0121051,   1.82258e-05,  -47137.4609,  294.16156,   -0.4410425,    76.2704,    269.670,  -13.099}  // p45_010_040
-    },
-    {
-      {0.0551,   1639.562,   -59.6881,   0.481906,  2429.6221,  -96.85565,   1.1416782,   -0.00508391,   7.60136e-06,  -19924.7695,  120.50782,   -0.1772735,    48.7597,    286.281,  -22.614},  // p45_020_000
-      {0.0564,   1679.394,   -65.3192,   0.612274,  2898.1484, -111.21368,   1.3012885,   -0.00577897,   8.62735e-06,  -28883.1250,  175.93024,   -0.2613033,    48.6290,    290.061,  -21.622},  // p45_020_005
-      {0.0578,   1028.881,   -31.4676,   0.174174,  3294.5210, -127.39808,   1.4879825,   -0.00659637,   9.82866e-06,  -30447.3281,  183.44189,   -0.2685859,    49.0103,    282.221,  -19.116},  // p45_020_010
-      {0.0605,    987.504,   -35.0554,   0.268233,  3260.0154, -126.96191,   1.5010443,   -0.00669193,   9.99986e-06,  -47952.3516,  293.34497,   -0.4373715,    48.9605,    282.169,  -16.280},  // p45_020_020
-      {0.0638,    737.828,   -20.6664,   0.091813,  5752.2773, -202.03827,   2.2940526,    -0.0101768,   1.54107e-05,  -45469.1484,  281.75494,   -0.4197274,    76.6694,    270.691,  -13.602}  // p45_020_040
-    },
-    {
-      {0.0542,   1700.905,   -61.6863,   0.520964,  2477.6436,  -96.00250,   1.1263552,   -0.00501486,   7.48948e-06,  -19374.1973,  116.43007,   -0.1708154,    49.2597,    289.479,  -24.157},  // p45_035_000
-      {0.0557,   1693.034,   -67.1800,   0.612665,  2736.7632, -107.30387,   1.2492670,   -0.00551679,   8.17755e-06,  -29085.2188,  174.85184,   -0.2573700,    49.3107,    294.369,  -20.995},  // p45_035_005
-      {0.0570,   1132.273,   -37.3184,   0.238228,  2983.1143, -116.76418,   1.3644956,   -0.00605594,   9.03055e-06,  -30742.9336,  185.21771,   -0.2724257,    49.2094,    286.281,  -19.636},  // p45_035_010
-      {0.0602,    960.894,   -34.8964,   0.249818,  2856.6895, -115.03755,   1.3748089,   -0.00615177,   9.20856e-06,  -43965.3828,  265.75473,   -0.3902870,    48.9310,    285.569,  -15.753},  // p45_035_020
-      {0.0638,    666.124,   -23.1595,   0.130440,  4357.2236, -164.68300,   1.9449605,   -0.00882303,   1.35497e-05,  -40430.5156,  246.79733,   -0.3601314,    76.9310,    272.809,  -12.285}  // p45_035_040
-    },
-    {
-      {0.0516,   1653.837,   -51.0220,   0.339328,  2723.0000, -102.57573,   1.1830099,   -0.00518046,   7.60151e-06,  -20496.1836,  120.97394,   -0.1747967,    50.2893,    289.521,  -27.947},  // p45_075_000
-      {0.0535,   1526.754,   -53.9677,   0.420266,  2347.2256,  -92.32782,   1.0779294,   -0.00471772,   6.88652e-06,  -14132.0469,   83.37365,   -0.1184724,    49.9892,    308.469,  -23.850},  // p45_075_005
-      {0.0540,   1196.020,   -34.6963,   0.147162,  2420.2214,  -97.45383,   1.1485654,   -0.00508606,   7.49954e-06,  -30471.5801,  178.43796,   -0.2565020,    49.6709,    299.041,  -22.902},  // p45_075_010
-      {0.0575,   1024.607,   -30.8345,   0.158428,  2716.1501, -108.09632,   1.2932163,   -0.00575735,   8.52492e-06,  -42679.3125,  249.51328,   -0.3542388,    49.6602,    297.609,  -19.025},  // p45_075_020
-      {0.0610,   1024.109,   -34.5451,   0.232132,  3806.4932, -143.60016,   1.6938646,   -0.00757451,   1.13681e-05,  -52197.4844,  311.64444,   -0.4489692,    79.7896,    283.900,  -15.366}   // p45_075_040
-    }
-  }
-};
+    {{
+         {0.0556,
+          1249.091,
+          -37.3962,
+          0.210716,
+          -248.9907,
+          -29.16312,
+          0.5448455,
+          -0.00284367,
+          4.56805e-06,
+          -20767.3652,
+          124.84555,
+          -0.1816447,
+          78.2008,
+          306.621,
+          -23.626},  // n45_000_000
+         {0.0551,
+          1264.495,
+          -37.3751,
+          0.213438,
+          342.1500,
+          -46.29582,
+          0.7196100,
+          -0.00360379,
+          5.74672e-06,
+          -16790.2227,
+          100.94481,
+          -0.1463796,
+          80.4290,
+          286.511,
+          -23.006},  // n45_000_005
+         {0.0532,
+          1370.302,
+          -40.4711,
+          0.227257,
+          -1891.1428,
+          12.38329,
+          0.1725410,
+          -0.0014882,
+          2.85433e-06,
+          -11878.5010,
+          72.83394,
+          -0.1082567,
+          81.3510,
+          294.789,
+          -25.473},  // n45_000_010
+         {0.0509,
+          1337.285,
+          -35.2571,
+          0.128641,
+          1361.5851,
+          -65.93077,
+          0.8067306,
+          -0.00359326,
+          5.30568e-06,
+          -8246.3301,
+          49.22989,
+          -0.0712043,
+          64.8110,
+          297.581,
+          -27.649},  // n45_000_020
+         {0.0459,
+          1994.901,
+          -73.5534,
+          0.664908,
+          2798.6650,
+          -105.17569,
+          1.1786412,
+          -0.0051563,
+          7.80827e-06,
+          2493.3286,
+          -14.38918,
+          0.0217881,
+          43.7810,
+          262.759,
+          -34.742}  // n45_000_040
+     },
+     {
+         {0.0556,
+          1300.534,
+          -38.6583,
+          0.220980,
+          -652.3927,
+          -17.54267,
+          0.4277454,
+          -0.00238086,
+          3.93922e-06,
+          -34923.6289,
+          211.34445,
+          -0.3137028,
+          79.8810,
+          308.349,
+          -22.653},  // n45_010_000
+         {0.0539,
+          1349.306,
+          -39.0137,
+          0.212369,
+          -132.2905,
+          -33.74292,
+          0.5870680,
+          -0.0030146,
+          4.82427e-06,
+          -16301.8662,
+          98.47250,
+          -0.1450356,
+          80.4508,
+          291.509,
+          -24.648},  // n45_010_005
+         {0.0529,
+          1372.372,
+          -39.9514,
+          0.218569,
+          -376.1956,
+          -28.43015,
+          0.5437251,
+          -0.00286743,
+          4.6476e-06,
+          -6392.2407,
+          38.91557,
+          -0.0562898,
+          81.3302,
+          298.009,
+          -25.754},  // n45_010_010
+         {0.0503,
+          1362.911,
+          -36.5874,
+          0.130881,
+          655.5482,
+          -46.15765,
+          0.6107563,
+          -0.00279134,
+          4.17058e-06,
+          -351.2815,
+          3.01151,
+          -0.0036896,
+          64.7310,
+          301.681,
+          -28.268},  // n45_010_020
+         {0.0455,
+          1496.772,
+          -35.5192,
+          0.000306,
+          1405.5243,
+          -54.52723,
+          0.5815363,
+          -0.00232048,
+          3.12659e-06,
+          13530.8340,
+          -75.37423,
+          0.1054318,
+          43.4005,
+          317.919,
+          -35.652}  // n45_010_040
+     },
+     {
+         {0.0546,
+          1301.588,
+          -39.0543,
+          0.221729,
+          977.0822,
+          -63.35442,
+          0.8654332,
+          -0.00411758,
+          6.37418e-06,
+          -15795.6533,
+          93.66738,
+          -0.1347689,
+          79.6790,
+          286.739,
+          -23.516},  // n45_020_000
+         {0.0536,
+          1380.848,
+          -41.1513,
+          0.239972,
+          -323.4976,
+          -27.07115,
+          0.5216565,
+          -0.00278335,
+          4.54835e-06,
+          -17069.2969,
+          102.25611,
+          -0.1496941,
+          80.9393,
+          293.471,
+          -25.103},  // n45_020_005
+         {0.0525,
+          1338.909,
+          -38.8524,
+          0.190713,
+          1944.7535,
+          -83.14005,
+          0.9903185,
+          -0.00440433,
+          6.56261e-06,
+          -9602.8262,
+          57.39394,
+          -0.0823630,
+          63.8009,
+          289.591,
+          -25.668},  // n45_020_010
+         {0.0501,
+          1459.019,
+          -37.9183,
+          0.155072,
+          322.7930,
+          -32.23593,
+          0.4708977,
+          -0.00227083,
+          3.51019e-06,
+          811.7312,
+          -4.37993,
+          0.0075575,
+          64.7010,
+          301.509,
+          -30.318},  // n45_020_020
+         {0.0452,
+          1766.482,
+          -57.3231,
+          0.362109,
+          1598.8593,
+          -59.84822,
+          0.6028637,
+          -0.00229073,
+          2.95719e-06,
+          142.5617,
+          0.00869,
+          -0.0000022,
+          43.4791,
+          321.810,
+          -34.852}  // n45_020_040
+     },
+     {
+         {0.0544,
+          1289.751,
+          -37.8311,
+          0.210551,
+          664.5193,
+          -55.27165,
+          0.7930264,
+          -0.00382813,
+          5.94986e-06,
+          -17405.2617,
+          103.62366,
+          -0.1498085,
+          80.6210,
+          289.749,
+          -23.861},  // n45_035_000
+         {0.0531,
+          1334.003,
+          -38.6883,
+          0.214017,
+          -185.8394,
+          -31.29477,
+          0.5548654,
+          -0.00285611,
+          4.56639e-06,
+          -10874.5098,
+          64.55344,
+          -0.0920744,
+          81.3706,
+          297.581,
+          -25.405},  // n45_035_005
+         {0.0519,
+          1331.227,
+          -37.2272,
+          0.175508,
+          1786.6555,
+          -77.57774,
+          0.9363343,
+          -0.00419419,
+          6.26833e-06,
+          -7455.0024,
+          44.57640,
+          -0.0637211,
+          64.4110,
+          292.829,
+          -26.621},  // n45_035_010
+         {0.0490,
+          1433.240,
+          -36.0542,
+          0.108478,
+          3076.3159,
+          -116.81192,
+          1.3428463,
+          -0.00598159,
+          9.10496e-06,
+          -2025.6472,
+          11.36878,
+          -0.0146284,
+          49.8610,
+          254.269,
+          -31.249},  // n45_035_020
+         {0.0444,
+          1832.118,
+          -55.1764,
+          0.330668,
+          -4676.3032,
+          86.73433,
+          -0.5740449,
+          0.00165354,
+          -1.75581e-06,
+          -1335.1753,
+          8.67068,
+          -0.0135205,
+          88.2990,
+          324.461,
+          -37.630}  // n45_035_040
+     },
+     {
+         {0.0516,
+          1411.662,
+          -42.1616,
+          0.247709,
+          -437.2861,
+          -26.87500,
+          0.5358523,
+          -0.00284772,
+          4.58766e-06,
+          -16797.9414,
+          98.23483,
+          -0.1405248,
+          83.3893,
+          302.941,
+          -27.185},  // n45_075_000
+         {0.0504,
+          1593.857,
+          -45.6800,
+          0.266588,
+          -1746.9763,
+          8.74155,
+          0.2015864,
+          -0.00154185,
+          2.78823e-06,
+          -9310.3115,
+          54.40162,
+          -0.0769520,
+          84.1790,
+          310.481,
+          -29.936},  // n45_075_005
+         {0.0493,
+          1570.420,
+          -44.3442,
+          0.228917,
+          838.0950,
+          -49.20692,
+          0.6512479,
+          -0.0030081,
+          4.51173e-06,
+          -6909.3086,
+          40.57237,
+          -0.0575639,
+          65.5710,
+          305.179,
+          -30.681},  // n45_075_010
+         {0.0467,
+          1733.900,
+          -47.9114,
+          0.264232,
+          3050.7056,
+          -111.13289,
+          1.2574373,
+          -0.00551889,
+          8.26139e-06,
+          -2180.8857,
+          12.74333,
+          -0.0179582,
+          50.5099,
+          263.381,
+          -36.152},  // n45_075_020
+         {0.0419,
+          2045.534,
+          -61.4659,
+          0.351936,
+          -1621.1132,
+          21.93342,
+          -0.0886306,
+          0.000104115,
+          3.2232e-08,
+          10660.4551,
+          -57.27732,
+          0.0763714,
+          67.9698,
+          328.550,
+          -42.091}  // n45_075_040
+     }},
+    {{
+         {0.0544,
+          661.644,
+          -21.4548,
+          0.150075,
+          444.5770,
+          -23.67808,
+          0.3244083,
+          -0.00157777,
+          2.48303e-06,
+          -10515.9336,
+          63.69555,
+          -0.0945404,
+          93.2245,
+          275.475,
+          -13.091},  // n30_000_000
+         {0.0544,
+          696.376,
+          -22.5798,
+          0.161791,
+          1305.6302,
+          -42.57114,
+          0.4789453,
+          -0.00215211,
+          3.30427e-06,
+          -4190.3496,
+          25.47451,
+          -0.0376212,
+          94.4488,
+          278.144,
+          -11.877},  // n30_000_005
+         {0.0535,
+          737.981,
+          -22.9524,
+          0.159446,
+          496.1301,
+          -22.39173,
+          0.2971912,
+          -0.00144682,
+          2.31446e-06,
+          -3349.5435,
+          20.81764,
+          -0.0315911,
+          95.5680,
+          282.552,
+          -13.025},  // n30_000_010
+         {0.0521,
+          785.876,
+          -24.0922,
+          0.161019,
+          -1048.5413,
+          16.74757,
+          -0.0663961,
+          -1.62409e-05,
+          3.10503e-07,
+          153.2331,
+          -0.63314,
+          0.0006426,
+          96.9831,
+          289.849,
+          -13.967},  // n30_000_020
+         {0.0486,
+          898.364,
+          -26.8266,
+          0.176826,
+          -1725.3418,
+          39.48061,
+          -0.3211800,
+          0.0011243,
+          -1.42777e-06,
+          7672.2515,
+          -45.37175,
+          0.0660975,
+          101.5030,
+          306.865,
+          -17.944}  // n30_000_040
+     },
+     {
+         {0.0546,
+          598.887,
+          -18.2973,
+          0.125265,
+          1577.2565,
+          -52.13367,
+          0.5851559,
+          -0.00261341,
+          3.98356e-06,
+          -8627.1562,
+          53.66836,
+          -0.0820753,
+          94.4968,
+          275.712,
+          -11.891},  // n30_010_000
+         {0.0538,
+          827.893,
+          -25.1728,
+          0.166522,
+          -872.9512,
+          7.56132,
+          0.0563854,
+          -0.000598549,
+          1.20605e-06,
+          -6883.4878,
+          42.06039,
+          -0.0632109,
+          94.8550,
+          280.377,
+          -12.726},  // n30_010_005
+         {0.0533,
+          707.092,
+          -21.8938,
+          0.149668,
+          -888.6555,
+          11.29115,
+          0.0051492,
+          -0.000379969,
+          9.19879e-07,
+          -2796.6306,
+          17.48043,
+          -0.0267174,
+          96.0408,
+          283.777,
+          -13.029},  // n30_010_010
+         {0.0514,
+          934.589,
+          -29.3263,
+          0.203515,
+          -370.4773,
+          3.02731,
+          0.0367987,
+          -0.000352283,
+          7.08131e-07,
+          1598.2100,
+          -9.32773,
+          0.0136123,
+          97.7671,
+          293.065,
+          -15.106},  // n30_010_020
+         {0.0484,
+          972.442,
+          -29.1723,
+          0.193183,
+          -2727.0569,
+          63.37098,
+          -0.5184089,
+          0.00179479,
+          -2.23153e-06,
+          2775.4517,
+          -15.94901,
+          0.0221969,
+          101.9351,
+          308.617,
+          -18.301}  // n30_010_040
+     },
+     {
+         {0.0542,
+          723.781,
+          -22.9229,
+          0.160962,
+          1456.9366,
+          -47.56628,
+          0.5309216,
+          -0.00236099,
+          3.58726e-06,
+          -8046.5757,
+          49.95736,
+          -0.0760213,
+          94.8090,
+          278.655,
+          -12.328},  // n30_020_000
+         {0.0537,
+          676.840,
+          -20.7743,
+          0.141595,
+          -484.0721,
+          0.94731,
+          0.1017064,
+          -0.000774435,
+          1.5048e-06,
+          -3992.2529,
+          24.94127,
+          -0.0379982,
+          95.6874,
+          281.816,
+          -12.595},  // n30_020_005
+         {0.0526,
+          624.156,
+          -17.8632,
+          0.113379,
+          -743.2964,
+          6.02184,
+          0.0562616,
+          -0.000558642,
+          1.11584e-06,
+          -3504.3020,
+          21.19222,
+          -0.0315027,
+          96.2631,
+          286.808,
+          -14.151},  // n30_020_010
+         {0.0516,
+          737.353,
+          -22.3599,
+          0.150195,
+          -1458.8893,
+          27.65503,
+          -0.1631772,
+          0.000337951,
+          -1.50699e-07,
+          -53.0105,
+          0.63676,
+          -0.0012999,
+          97.8950,
+          292.111,
+          -15.068},  // n30_020_020
+         {0.0480,
+          974.744,
+          -29.3660,
+          0.195912,
+          -2384.1865,
+          54.89895,
+          -0.4495114,
+          0.00157499,
+          -1.99515e-06,
+          3973.4858,
+          -23.74227,
+          0.0346751,
+          97.7037,
+          307.001,
+          -18.767}  // n30_020_040
+     },
+     {
+         {0.0538,
+          565.198,
+          -17.4339,
+          0.118042,
+          940.0779,
+          -36.38837,
+          0.4428219,
+          -0.00205962,
+          3.20829e-06,
+          -6553.2090,
+          40.17127,
+          -0.0601241,
+          95.3917,
+          281.824,
+          -12.478},  // n30_035_000
+         {0.0528,
+          784.903,
+          -24.0389,
+          0.164625,
+          -159.6993,
+          -5.80579,
+          0.1472273,
+          -0.000875771,
+          1.53404e-06,
+          -4135.1328,
+          25.06886,
+          -0.0371285,
+          96.2315,
+          285.681,
+          -13.818},  // n30_035_005
+         {0.0523,
+          788.275,
+          -24.3241,
+          0.166503,
+          -1935.1375,
+          37.76367,
+          -0.2305371,
+          0.000505415,
+          -2.72688e-07,
+          -1436.0129,
+          8.95674,
+          -0.0135539,
+          97.2793,
+          288.807,
+          -14.093},  // n30_035_010
+         {0.0506,
+          860.751,
+          -25.5843,
+          0.167629,
+          -1957.8579,
+          38.80153,
+          -0.2581428,
+          0.000702039,
+          -6.66945e-07,
+          252.4353,
+          -1.73282,
+          0.0029522,
+          98.8487,
+          296.879,
+          -15.801},  // n30_035_020
+         {0.0476,
+          881.687,
+          -26.0314,
+          0.167940,
+          -1793.2728,
+          40.26773,
+          -0.3257867,
+          0.00114058,
+          -1.45197e-06,
+          5482.5552,
+          -32.56463,
+          0.0474041,
+          102.7830,
+          312.679,
+          -19.019}  // n30_035_040
+     },
+     {
+         {0.0516,
+          749.935,
+          -23.2223,
+          0.160383,
+          -855.8171,
+          10.29520,
+          0.0210917,
+          -0.000462279,
+          1.04472e-06,
+          -4622.7788,
+          28.05522,
+          -0.0414290,
+          98.7431,
+          292.544,
+          -14.341},  // n30_075_000
+         {0.0510,
+          840.556,
+          -25.9320,
+          0.177274,
+          -491.6305,
+          2.60982,
+          0.0727019,
+          -0.000590733,
+          1.13391e-06,
+          -3522.1973,
+          21.40963,
+          -0.0317276,
+          99.8071,
+          296.039,
+          -14.871},  // n30_075_005
+         {0.0503,
+          761.912,
+          -22.5559,
+          0.149579,
+          -655.7001,
+          7.14253,
+          0.0234984,
+          -0.000369465,
+          7.93294e-07,
+          -1683.2029,
+          10.66983,
+          -0.0162962,
+          100.3689,
+          299.847,
+          -15.635},  // n30_075_010
+         {0.0489,
+          896.258,
+          -26.4845,
+          0.173658,
+          -1954.9786,
+          40.05451,
+          -0.2770390,
+          0.000791113,
+          -7.99368e-07,
+          1774.9106,
+          -9.88953,
+          0.0136026,
+          101.9279,
+          307.001,
+          -17.303},  // n30_075_020
+         {0.0454,
+          1055.460,
+          -30.6924,
+          0.198003,
+          -2914.5913,
+          68.15729,
+          -0.5596287,
+          0.00194156,
+          -2.4101e-06,
+          3996.9961,
+          -23.60917,
+          0.0335653,
+          106.4321,
+          326.817,
+          -21.800}  // n30_075_040
+     }},
+    {{
+         {0.0544,
+          280.108,
+          -15.7155,
+          0.222215,
+          423.5003,
+          -15.40026,
+          0.1803494,
+          -0.000819977,
+          1.25848e-06,
+          -2701.0981,
+          16.40063,
+          -0.0242576,
+          45.4038,
+          283.859,
+          -7.037},  // n15_000_000
+         {0.0545,
+          515.820,
+          -32.6711,
+          0.472151,
+          201.8439,
+          -7.09815,
+          0.0866570,
+          -0.00041511,
+          6.65956e-07,
+          -2233.3193,
+          13.93478,
+          -0.0213755,
+          46.7350,
+          285.071,
+          -5.821},  // n15_000_005
+         {0.0542,
+          520.312,
+          -28.2251,
+          0.369691,
+          105.5701,
+          -3.99062,
+          0.0511237,
+          -0.000252236,
+          4.13335e-07,
+          -199.2496,
+          1.27530,
+          -0.0018711,
+          46.4873,
+          286.935,
+          -6.113},  // n15_000_010
+         {0.0535,
+          560.264,
+          -30.7412,
+          0.404970,
+          68.7243,
+          -2.19197,
+          0.0250043,
+          -0.000104595,
+          1.39395e-07,
+          -1487.4546,
+          8.66851,
+          -0.0125515,
+          47.0955,
+          290.008,
+          -6.314},  // n15_000_020
+         {0.0515,
+          635.142,
+          -31.8153,
+          0.396365,
+          -25.4636,
+          2.46947,
+          -0.0442671,
+          0.00025748,
+          -4.59825e-07,
+          5422.4453,
+          -33.38743,
+          0.0505844,
+          47.3318,
+          299.926,
+          -8.225}  // n15_000_040
+     },
+     {
+         {0.0547,
+          493.199,
+          -28.5060,
+          0.389282,
+          201.5373,
+          -7.73180,
+          0.0999743,
+          -0.000503051,
+          8.4396e-07,
+          -2066.8286,
+          13.51634,
+          -0.0214888,
+          46.7353,
+          284.623,
+          -5.642},  // n15_010_000
+         {0.0544,
+          546.773,
+          -30.4149,
+          0.407799,
+          230.2068,
+          -7.93929,
+          0.0907344,
+          -0.000404279,
+          6.0749e-07,
+          -2232.8101,
+          13.63719,
+          -0.0205257,
+          47.0390,
+          285.064,
+          -5.992},  // n15_010_005
+         {0.0536,
+          513.420,
+          -23.0638,
+          0.288751,
+          138.8691,
+          -2.89693,
+          0.0376467,
+          -0.000201462,
+          3.4641e-07,
+          -104.2009,
+          0.82561,
+          -0.0016494,
+          46.8640,
+          287.439,
+          -7.900},  // n15_010_010
+         {0.0530,
+          618.762,
+          -32.6759,
+          0.424982,
+          142.9014,
+          -4.06779,
+          0.0382704,
+          -0.000142783,
+          1.83574e-07,
+          1740.7522,
+          -10.85107,
+          0.0167234,
+          47.0630,
+          292.231,
+          -6.915},  // n15_010_020
+         {0.0512,
+          584.420,
+          -28.2308,
+          0.341261,
+          -174.9973,
+          7.49327,
+          -0.0980080,
+          0.00047885,
+          -7.68592e-07,
+          6299.7798,
+          -38.54675,
+          0.0580255,
+          43.7750,
+          297.393,
+          -8.735}  // n15_010_040
+     },
+     {
+         {0.0542,
+          548.766,
+          -32.4677,
+          0.457710,
+          402.3637,
+          -14.14943,
+          0.1640171,
+          -0.000743861,
+          1.13977e-06,
+          -3988.7603,
+          24.62158,
+          -0.0373790,
+          46.5670,
+          285.767,
+          -6.189},  // n15_020_000
+         {0.0541,
+          551.358,
+          -29.7854,
+          0.383668,
+          -58.9587,
+          1.04228,
+          0.0082786,
+          -0.000121549,
+          2.92325e-07,
+          -1212.0813,
+          8.31316,
+          -0.0138557,
+          46.6310,
+          287.169,
+          -6.059},  // n15_020_005
+         {0.0534,
+          538.365,
+          -29.0861,
+          0.384690,
+          182.5977,
+          -6.08375,
+          0.0704031,
+          -0.000323122,
+          5.03191e-07,
+          372.3823,
+          -1.94234,
+          0.0024682,
+          46.9990,
+          289.681,
+          -6.913},  // n15_020_010
+         {0.0531,
+          638.346,
+          -34.8982,
+          0.460682,
+          140.5902,
+          -4.66933,
+          0.0532486,
+          -0.00024105,
+          3.7042e-07,
+          397.4993,
+          -2.27136,
+          0.0032063,
+          46.9752,
+          291.423,
+          -7.086},  // n15_020_020
+         {0.0508,
+          633.224,
+          -32.7010,
+          0.429323,
+          -66.1159,
+          4.35364,
+          -0.0675923,
+          0.000355363,
+          -5.87668e-07,
+          8061.5674,
+          -48.78617,
+          0.0729436,
+          43.3594,
+          299.471,
+          -8.997}  // n15_020_040
+     },
+     {
+         {0.0537,
+          585.770,
+          -32.7382,
+          0.438016,
+          197.0154,
+          -7.16578,
+          0.0879935,
+          -0.000417491,
+          6.61675e-07,
+          -2715.0459,
+          16.88474,
+          -0.0257524,
+          46.9830,
+          288.888,
+          -6.487},  // n15_035_000
+         {0.0532,
+          634.700,
+          -35.0860,
+          0.464050,
+          91.8519,
+          -3.30027,
+          0.0404732,
+          -0.000188339,
+          2.87341e-07,
+          -2108.3696,
+          12.55404,
+          -0.0184916,
+          46.6950,
+          290.287,
+          -6.989},  // n15_035_005
+         {0.0532,
+          605.780,
+          -35.7804,
+          0.495017,
+          148.8390,
+          -5.04066,
+          0.0595426,
+          -0.000282432,
+          4.55683e-07,
+          293.7796,
+          -1.20117,
+          0.0010490,
+          46.8955,
+          291.304,
+          -6.735},  // n15_035_010
+         {0.0521,
+          597.537,
+          -30.9445,
+          0.405020,
+          173.2489,
+          -4.18172,
+          0.0336465,
+          -0.000107916,
+          1.15996e-07,
+          796.4302,
+          -4.86666,
+          0.0070672,
+          47.2870,
+          295.399,
+          -7.747},  // n15_035_020
+         {0.0504,
+          736.120,
+          -37.9788,
+          0.498652,
+          4.0650,
+          2.09798,
+          -0.0473512,
+          0.000294158,
+          -5.37919e-07,
+          6944.4492,
+          -42.29051,
+          0.0633100,
+          43.5670,
+          301.885,
+          -9.247}  // n15_035_040
+     },
+     {
+         {0.0518,
+          611.823,
+          -32.5274,
+          0.414581,
+          32.8465,
+          -1.51198,
+          0.0257819,
+          -0.000154599,
+          2.85662e-07,
+          -117.6394,
+          1.33964,
+          -0.0027604,
+          47.7751,
+          298.952,
+          -7.488},  // n15_075_000
+         {0.0515,
+          691.713,
+          -37.3491,
+          0.485409,
+          101.6508,
+          -3.37849,
+          0.0412602,
+          -0.000198536,
+          3.19258e-07,
+          -1632.7256,
+          10.50634,
+          -0.0165798,
+          47.6870,
+          299.967,
+          -7.753},  // n15_075_005
+         {0.0510,
+          608.731,
+          -31.0313,
+          0.384066,
+          42.7490,
+          -1.61686,
+          0.0213272,
+          -0.000104293,
+          1.66454e-07,
+          -1098.8243,
+          7.12108,
+          -0.0114011,
+          47.9190,
+          302.392,
+          -8.146},  // n15_075_010
+         {0.0505,
+          624.432,
+          -31.1192,
+          0.363026,
+          -349.8549,
+          11.20893,
+          -0.1181044,
+          0.000497622,
+          -7.22609e-07,
+          32.2961,
+          -0.94522,
+          0.0021847,
+          48.1671,
+          305.137,
+          -8.474},  // n15_075_020
+         {0.0482,
+          708.313,
+          -34.1303,
+          0.405405,
+          -370.3401,
+          14.31818,
+          -0.1704450,
+          0.000761735,
+          -1.12644e-06,
+          6256.2383,
+          -35.79566,
+          0.0500375,
+          44.7639,
+          315.032,
+          -10.835}  // n15_075_040
+     }},
+    {{
+         {0.0543,
+          482.202,
+          -32.0608,
+          0.482724,
+          355.8447,
+          -11.83323,
+          0.1303268,
+          -0.000569553,
+          8.51141e-07,
+          -641.0774,
+          3.71752,
+          -0.0051548,
+          46.4350,
+          284.888,
+          -6.167},  // n10_000_000
+         {0.0545,
+          294.784,
+          -14.8973,
+          0.183950,
+          70.6762,
+          -3.02203,
+          0.0432333,
+          -0.00023106,
+          4.01597e-07,
+          408.7505,
+          -2.47051,
+          0.0039195,
+          47.4156,
+          285.465,
+          -4.979},  // n10_000_005
+         {0.0543,
+          551.169,
+          -34.5252,
+          0.490315,
+          100.1681,
+          -2.99469,
+          0.0335697,
+          -0.000160407,
+          2.69727e-07,
+          87.8598,
+          0.49517,
+          -0.0022606,
+          47.5271,
+          286.991,
+          -5.181},  // n10_000_010
+         {0.0537,
+          433.416,
+          -24.4625,
+          0.337966,
+          209.2171,
+          -5.79581,
+          0.0539141,
+          -0.000207398,
+          2.84911e-07,
+          35.8637,
+          0.37622,
+          -0.0015022,
+          47.5830,
+          289.391,
+          -5.466},  // n10_000_020
+         {0.0523,
+          582.930,
+          -34.4991,
+          0.498282,
+          18.4208,
+          1.78898,
+          -0.0430855,
+          0.000264403,
+          -4.76488e-07,
+          3644.6670,
+          -22.45636,
+          0.0339720,
+          44.4710,
+          294.487,
+          -6.632}  // n10_000_040
+     },
+     {
+         {0.0548,
+          404.498,
+          -25.6095,
+          0.363479,
+          97.4297,
+          -3.42009,
+          0.0405102,
+          -0.000196944,
+          3.28348e-07,
+          -960.2191,
+          6.14599,
+          -0.0094942,
+          47.3751,
+          284.905,
+          -4.311},  // n10_010_000
+         {0.0545,
+          589.176,
+          -36.3108,
+          0.517859,
+          231.6770,
+          -7.11434,
+          0.0760865,
+          -0.000330537,
+          4.97531e-07,
+          1830.9408,
+          -11.65743,
+          0.0185333,
+          47.4790,
+          284.623,
+          -5.087},  // n10_010_005
+         {0.0542,
+          405.303,
+          -23.8855,
+          0.326044,
+          4.4413,
+          0.01361,
+          0.0024068,
+          -2.86501e-05,
+          7.2286e-08,
+          1233.5764,
+          -7.63692,
+          0.0118956,
+          47.7030,
+          287.951,
+          -5.171},  // n10_010_010
+         {0.0534,
+          398.447,
+          -21.7451,
+          0.287043,
+          80.8576,
+          -2.03592,
+          0.0155457,
+          -4.63902e-05,
+          4.8592e-08,
+          2429.4221,
+          -15.05335,
+          0.0231679,
+          47.7031,
+          291.415,
+          -5.619},  // n10_010_020
+         {0.0520,
+          560.400,
+          -30.5424,
+          0.400372,
+          -432.6007,
+          16.68758,
+          -0.1960918,
+          0.000881002,
+          -1.33002e-06,
+          3042.4573,
+          -18.51538,
+          0.0274602,
+          44.5031,
+          294.975,
+          -6.840}  // n10_010_040
+     },
+     {
+         {0.0542,
+          494.054,
+          -29.3652,
+          0.408306,
+          209.2332,
+          -6.95220,
+          0.0781366,
+          -0.000350227,
+          5.34037e-07,
+          -2029.2206,
+          12.48364,
+          -0.0189363,
+          47.5031,
+          286.568,
+          -5.157},  // n10_020_000
+         {0.0542,
+          521.165,
+          -31.0171,
+          0.424773,
+          -73.9372,
+          2.20773,
+          -0.0117791,
+          -9.92663e-06,
+          9.9873e-08,
+          904.0173,
+          -5.29526,
+          0.0078845,
+          47.1990,
+          287.416,
+          -5.165},  // n10_020_005
+         {0.0537,
+          459.702,
+          -26.4735,
+          0.363628,
+          149.3246,
+          -4.30190,
+          0.0433552,
+          -0.000180486,
+          2.61685e-07,
+          -815.5165,
+          4.91555,
+          -0.0072902,
+          47.7274,
+          289.745,
+          -5.735},  // n10_020_010
+         {0.0534,
+          489.016,
+          -26.8271,
+          0.359168,
+          -78.9943,
+          4.34104,
+          -0.0562197,
+          0.000258697,
+          -3.90802e-07,
+          -56.5670,
+          0.21668,
+          -0.0001294,
+          47.6470,
+          291.335,
+          -5.786},  // n10_020_020
+         {0.0516,
+          611.173,
+          -33.5181,
+          0.438966,
+          -189.9971,
+          8.58779,
+          -0.1140145,
+          0.000554113,
+          -8.79833e-07,
+          5560.9287,
+          -34.13583,
+          0.0515256,
+          48.3190,
+          300.913,
+          -7.131}  // n10_020_040
+     },
+     {
+         {0.0537,
+          372.594,
+          -21.1078,
+          0.284052,
+          128.4009,
+          -4.48399,
+          0.0543108,
+          -0.000262015,
+          4.27507e-07,
+          -340.5131,
+          2.36116,
+          -0.0037728,
+          47.6722,
+          289.151,
+          -5.408},  // n10_035_000
+         {0.0534,
+          523.639,
+          -31.3279,
+          0.434482,
+          95.8907,
+          -2.92172,
+          0.0323685,
+          -0.00014803,
+          2.34646e-07,
+          1453.3218,
+          -8.82569,
+          0.0134259,
+          47.4630,
+          291.191,
+          -5.819},  // n10_035_005
+         {0.0534,
+          497.780,
+          -27.7636,
+          0.368634,
+          -25.9006,
+          1.56222,
+          -0.0185932,
+          7.255e-05,
+          -8.7794e-08,
+          -103.7204,
+          0.48110,
+          -0.0002811,
+          47.9110,
+          291.185,
+          -5.602},  // n10_035_010
+         {0.0526,
+          644.840,
+          -37.8582,
+          0.525025,
+          223.0479,
+          -5.96465,
+          0.0520599,
+          -0.000183032,
+          2.24579e-07,
+          1097.2280,
+          -6.64303,
+          0.0098586,
+          48.0230,
+          294.455,
+          -6.356},  // n10_035_020
+         {0.0511,
+          562.862,
+          -28.4031,
+          0.354786,
+          -137.9524,
+          6.92762,
+          -0.0974680,
+          0.000489186,
+          -7.94401e-07,
+          6786.2295,
+          -41.54120,
+          0.0623709,
+          48.5592,
+          302.768,
+          -7.572}  // n10_035_040
+     },
+     {
+         {0.0519,
+          573.358,
+          -32.4528,
+          0.420570,
+          -149.4460,
+          4.24506,
+          -0.0322658,
+          8.1967e-05,
+          -4.9569e-08,
+          -224.5401,
+          1.80872,
+          -0.0031874,
+          48.6390,
+          299.695,
+          -6.318},  // n10_075_000
+         {0.0516,
+          593.940,
+          -32.6651,
+          0.425715,
+          -14.2820,
+          1.11578,
+          -0.0133427,
+          5.15847e-05,
+          -6.1772e-08,
+          -524.4960,
+          3.48466,
+          -0.0056522,
+          48.8391,
+          300.599,
+          -6.828},  // n10_075_005
+         {0.0512,
+          453.240,
+          -24.3397,
+          0.311356,
+          -63.7068,
+          2.66275,
+          -0.0308241,
+          0.000132578,
+          -1.90352e-07,
+          -592.5206,
+          3.64809,
+          -0.0056133,
+          48.8390,
+          302.223,
+          -6.920},  // n10_075_010
+         {0.0508,
+          564.054,
+          -30.0969,
+          0.385886,
+          -97.5094,
+          4.63294,
+          -0.0604914,
+          0.000281774,
+          -4.26399e-07,
+          1331.7659,
+          -7.53164,
+          0.0103100,
+          48.8790,
+          304.168,
+          -7.296},  // n10_075_020
+         {0.0489,
+          625.945,
+          -30.9072,
+          0.377180,
+          -335.6169,
+          13.13234,
+          -0.1552891,
+          0.000683332,
+          -9.94053e-07,
+          10158.1289,
+          -58.57383,
+          0.0831801,
+          45.5030,
+          312.469,
+          -9.291}  // n10_075_040
+     }},
+    {{
+         {0.0543,
+          663.026,
+          -66.3824,
+          1.590667,
+          72.0376,
+          -3.26491,
+          0.0455382,
+          -0.000229681,
+          3.75741e-07,
+          -628.4452,
+          3.83021,
+          -0.0056639,
+          26.0951,
+          285.728,
+          -5.738},  // n05_000_000
+         {0.0546,
+          918.491,
+          -92.9771,
+          2.210514,
+          87.3605,
+          -3.37392,
+          0.0426091,
+          -0.000209767,
+          3.44974e-07,
+          -416.8792,
+          2.42383,
+          -0.0032668,
+          27.1351,
+          286.464,
+          -4.283},  // n05_000_005
+         {0.0546,
+          1044.805,
+          -106.6222,
+          2.515087,
+          -47.3540,
+          2.83865,
+          -0.0410201,
+          0.000210697,
+          -3.4721e-07,
+          29.6137,
+          -0.05393,
+          0.0000013,
+          27.1350,
+          286.623,
+          -4.403},  // n05_000_010
+         {0.0541,
+          1061.803,
+          -110.1372,
+          2.635414,
+          43.4643,
+          -1.97770,
+          0.0288297,
+          -0.000151462,
+          2.57535e-07,
+          1076.8308,
+          -6.48455,
+          0.0097862,
+          26.9672,
+          288.905,
+          -4.530},  // n05_000_020
+         {0.0529,
+          1044.142,
+          -95.3682,
+          2.125540,
+          -22.1336,
+          3.36905,
+          -0.0610331,
+          0.000332354,
+          -5.53872e-07,
+          4825.4048,
+          -29.65764,
+          0.0450632,
+          27.5951,
+          295.163,
+          -5.662}  // n05_000_040
+     },
+     {
+         {0.0545,
+          780.566,
+          -77.2458,
+          1.804181,
+          50.4201,
+          -2.03741,
+          0.0302131,
+          -0.000179939,
+          3.36629e-07,
+          -1228.8286,
+          8.18394,
+          -0.0138241,
+          27.1830,
+          285.639,
+          -4.346},  // n05_010_000
+         {0.0547,
+          1099.360,
+          -115.2038,
+          2.801082,
+          80.6932,
+          -2.37632,
+          0.0211609,
+          -7.62156e-05,
+          9.532e-08,
+          -1685.8831,
+          10.05291,
+          -0.0147013,
+          26.9910,
+          285.992,
+          -4.089},  // n05_010_005
+         {0.0543,
+          963.487,
+          -98.7356,
+          2.377767,
+          76.2896,
+          -2.26147,
+          0.0244245,
+          -0.00011911,
+          2.03054e-07,
+          -305.2742,
+          2.36013,
+          -0.0044983,
+          26.9929,
+          287.336,
+          -4.477},  // n05_010_010
+         {0.0538,
+          993.758,
+          -102.1095,
+          2.456116,
+          71.8907,
+          -1.42774,
+          0.0066664,
+          -3.03117e-07,
+          -2.9456e-08,
+          1032.4103,
+          -6.57065,
+          0.0104143,
+          27.3353,
+          290.000,
+          -4.974},  // n05_010_020
+         {0.0528,
+          1236.552,
+          -128.1032,
+          3.237446,
+          -28.3956,
+          3.24945,
+          -0.0547030,
+          0.00028825,
+          -4.69546e-07,
+          2359.1118,
+          -13.47842,
+          0.0187080,
+          23.8070,
+          291.160,
+          -5.828}  // n05_010_040
+     },
+     {
+         {0.0541,
+          816.087,
+          -78.8288,
+          1.826369,
+          42.1378,
+          -1.21251,
+          0.0140799,
+          -7.27033e-05,
+          1.22868e-07,
+          -80.4310,
+          0.11370,
+          0.0002046,
+          26.9590,
+          287.807,
+          -4.729},  // n05_020_000
+         {0.0543,
+          877.623,
+          -86.7326,
+          2.031615,
+          41.1299,
+          -1.34082,
+          0.0177186,
+          -0.000102602,
+          1.96117e-07,
+          -1007.4371,
+          6.73725,
+          -0.0109791,
+          26.9590,
+          287.601,
+          -4.573},  // n05_020_005
+         {0.0540,
+          971.299,
+          -97.6710,
+          2.293463,
+          17.7953,
+          0.01280,
+          -0.0056469,
+          4.02706e-05,
+          -7.5715e-08,
+          -1314.7979,
+          8.00797,
+          -0.0120391,
+          27.3194,
+          288.825,
+          -4.738},  // n05_020_010
+         {0.0538,
+          821.123,
+          -79.3886,
+          1.821767,
+          -4.2026,
+          0.86868,
+          -0.0147592,
+          7.00417e-05,
+          -9.9007e-08,
+          885.9829,
+          -5.31948,
+          0.0079739,
+          27.2150,
+          289.496,
+          -4.848},  // n05_020_020
+         {0.0523,
+          1094.897,
+          -104.1715,
+          2.396472,
+          -11.2571,
+          2.78845,
+          -0.0491065,
+          0.000256411,
+          -4.08813e-07,
+          10539.9600,
+          -63.91719,
+          0.0960592,
+          27.1510,
+          298.511,
+          -6.175}  // n05_020_040
+     },
+     {
+         {0.0537,
+          850.220,
+          -83.0064,
+          1.949804,
+          70.7089,
+          -2.21260,
+          0.0232815,
+          -0.000102662,
+          1.59498e-07,
+          -70.7027,
+          0.46120,
+          -0.0006131,
+          26.8072,
+          290.223,
+          -4.877},  // n05_035_000
+         {0.0535,
+          1127.985,
+          -113.1409,
+          2.683142,
+          59.7940,
+          -1.39309,
+          0.0110045,
+          -4.14216e-05,
+          6.1915e-08,
+          -411.4487,
+          2.56911,
+          -0.0038557,
+          27.0070,
+          291.433,
+          -5.199},  // n05_035_005
+         {0.0536,
+          866.648,
+          -84.5795,
+          1.969876,
+          61.4061,
+          -1.60660,
+          0.0164774,
+          -7.68717e-05,
+          1.29166e-07,
+          672.2648,
+          -3.79337,
+          0.0053410,
+          27.4072,
+          290.743,
+          -5.099},  // n05_035_010
+         {0.0530,
+          902.376,
+          -88.9089,
+          2.082175,
+          39.8051,
+          -0.71595,
+          0.0019324,
+          1.04399e-05,
+          -3.5354e-08,
+          150.0020,
+          -0.90192,
+          0.0013065,
+          27.0958,
+          293.233,
+          -5.450},  // n05_035_020
+         {0.0519,
+          650.965,
+          -38.5310,
+          0.528112,
+          -93.5919,
+          5.72136,
+          -0.0837748,
+          0.000418829,
+          -6.6837e-07,
+          4590.1616,
+          -27.41714,
+          0.0401395,
+          49.0072,
+          300.271,
+          -6.392}  // n05_035_040
+     },
+     {
+         {0.0518,
+          846.170,
+          -76.0185,
+          1.676375,
+          -3.2868,
+          1.40082,
+          -0.0227767,
+          0.000106051,
+          -1.48939e-07,
+          79.7298,
+          0.00002,
+          -0.0006157,
+          27.2870,
+          300.456,
+          -6.054},  // n05_075_000
+         {0.0517,
+          368.141,
+          -26.3914,
+          0.495436,
+          24.0810,
+          -0.25672,
+          -0.0002538,
+          3.18501e-06,
+          2.2e-11,
+          78.7188,
+          -0.23021,
+          0.0000152,
+          27.3524,
+          300.927,
+          -5.913},  // n05_075_005
+         {0.0514,
+          506.276,
+          -29.2148,
+          0.394222,
+          -119.2112,
+          5.65304,
+          -0.0689402,
+          0.00030383,
+          -4.4049e-07,
+          -154.2037,
+          -0.00011,
+          0.0011320,
+          49.4791,
+          321.536,
+          -6.432},  // n05_075_010
+         {0.0514,
+          842.388,
+          -77.0330,
+          1.713260,
+          12.2687,
+          0.39519,
+          -0.0115245,
+          6.74754e-05,
+          -1.0879e-07,
+          14.2363,
+          0.57216,
+          -0.0016718,
+          27.2710,
+          303.274,
+          -6.138},  // n05_075_020
+         {0.0498,
+          553.290,
+          -29.6331,
+          0.380781,
+          -472.4498,
+          17.95012,
+          -0.2075450,
+          0.000902416,
+          -1.30673e-06,
+          5532.4624,
+          -31.97427,
+          0.0452127,
+          46.1289,
+          308.865,
+          -7.891}  // n05_075_040
+     }},
+    {{
+         {0.0543,
+          289.615,
+          -23.7225,
+          0.472795,
+          -36.2762,
+          1.70436,
+          -0.0274302,
+          0.000175927,
+          -3.76834e-07,
+          149.8167,
+          -1.39171,
+          0.0030299,
+          25.8682,
+          230.471,
+          -5.404},  // p00_000_000
+         {0.0546,
+          668.249,
+          -63.5458,
+          1.432858,
+          4.4654,
+          -0.69246,
+          0.0167983,
+          -0.000116652,
+          2.37179e-07,
+          -434.5546,
+          2.77058,
+          -0.0042488,
+          26.9110,
+          230.455,
+          -4.073},  // p00_000_005
+         {0.0548,
+          772.488,
+          -77.5895,
+          1.793609,
+          -51.0175,
+          1.77691,
+          -0.0153707,
+          4.18382e-05,
+          -2.5882e-08,
+          -800.1181,
+          5.45148,
+          -0.0089384,
+          27.0791,
+          230.241,
+          -3.843},  // p00_000_010
+         {0.0545,
+          928.222,
+          -90.6655,
+          2.068940,
+          -67.9672,
+          3.19609,
+          -0.0476606,
+          0.000271537,
+          -5.21355e-07,
+          -333.3984,
+          2.18458,
+          -0.0033733,
+          27.0070,
+          230.065,
+          -4.030},  // p00_000_020
+         {0.0536,
+          743.875,
+          -67.2333,
+          1.541026,
+          54.1464,
+          0.70253,
+          -0.0161563,
+          4.36933e-05,
+          5.9264e-08,
+          1824.7556,
+          -12.11723,
+          0.0198029,
+          27.6030,
+          234.361,
+          -5.686}  // p00_000_040
+     },
+     {
+         {0.0546,
+          902.211,
+          -89.9522,
+          2.126992,
+          123.5839,
+          -4.92113,
+          0.0654918,
+          -0.000344321,
+          6.0871e-07,
+          -638.3031,
+          4.28184,
+          -0.0071127,
+          27.2871,
+          230.057,
+          -4.220},  // p00_010_000
+         {0.0548,
+          921.661,
+          -92.2935,
+          2.176105,
+          161.0861,
+          -7.46099,
+          0.1061745,
+          -0.000576633,
+          1.04659e-06,
+          -53.5814,
+          -0.15769,
+          0.0012197,
+          27.3510,
+          230.208,
+          -3.653},  // p00_010_005
+         {0.0546,
+          885.081,
+          -88.8020,
+          2.049073,
+          -48.0536,
+          1.63944,
+          -0.0136554,
+          2.91183e-05,
+          1.3021e-08,
+          -150.5886,
+          0.91592,
+          -0.0011813,
+          27.2630,
+          230.848,
+          -4.038},  // p00_010_010
+         {0.0543,
+          1012.134,
+          -101.9436,
+          2.394910,
+          -14.5198,
+          2.00805,
+          -0.0356362,
+          0.000206718,
+          -3.87657e-07,
+          -285.5976,
+          1.71756,
+          -0.0022512,
+          27.4310,
+          231.856,
+          -4.177},  // p00_010_020
+         {0.0534,
+          1067.225,
+          -100.4478,
+          2.273133,
+          -16.1798,
+          1.66276,
+          -0.0170743,
+          4.1267e-06,
+          1.85777e-07,
+          1270.8571,
+          -8.31610,
+          0.0132797,
+          27.1910,
+          234.696,
+          -5.303}  // p00_010_040
+     },
+     {
+         {0.0543,
+          972.852,
+          -98.6335,
+          2.322881,
+          78.4235,
+          -3.94691,
+          0.0626297,
+          -0.000366262,
+          7.02291e-07,
+          88.7705,
+          -0.87615,
+          0.0020051,
+          27.2630,
+          230.657,
+          -4.182},  // p00_020_000
+         {0.0544,
+          1016.250,
+          -100.4747,
+          2.340127,
+          45.6626,
+          -2.03200,
+          0.0376704,
+          -0.000260815,
+          5.66934e-07,
+          -373.3793,
+          2.31714,
+          -0.0032993,
+          27.1510,
+          231.064,
+          -4.274},  // p00_020_005
+         {0.0541,
+          706.308,
+          -65.6239,
+          1.456052,
+          -2.8856,
+          0.15829,
+          -0.0000781,
+          -6.71131e-06,
+          1.1953e-08,
+          -202.7576,
+          1.02348,
+          -0.0010172,
+          27.3930,
+          232.569,
+          -4.431},  // p00_020_010
+         {0.0542,
+          989.765,
+          -96.0692,
+          2.217921,
+          14.9726,
+          0.00241,
+          0.0003819,
+          -2.65291e-05,
+          1.00609e-07,
+          -258.0817,
+          1.72505,
+          -0.0027117,
+          27.0872,
+          231.769,
+          -4.387},  // p00_020_020
+         {0.0531,
+          1114.745,
+          -111.2184,
+          2.615693,
+          18.2961,
+          0.50617,
+          -0.0084253,
+          -7.56255e-06,
+          1.58186e-07,
+          1404.9285,
+          -9.17056,
+          0.0147852,
+          27.2310,
+          236.752,
+          -5.121}  // p00_020_040
+     },
+     {
+         {0.0537,
+          1012.495,
+          -99.3533,
+          2.284698,
+          2.4251,
+          0.00145,
+          0.0022004,
+          -2.62711e-05,
+          6.737e-08,
+          -155.1503,
+          0.86565,
+          -0.0010724,
+          27.3274,
+          233.679,
+          -4.717},  // p00_035_000
+         {0.0536,
+          820.854,
+          -76.0255,
+          1.626807,
+          -178.6863,
+          7.21592,
+          -0.0939839,
+          0.000486539,
+          -8.74298e-07,
+          -381.0762,
+          2.31054,
+          -0.0033492,
+          27.2870,
+          234.039,
+          -4.785},  // p00_035_005
+         {0.0538,
+          770.818,
+          -73.5234,
+          1.669331,
+          24.2091,
+          -0.98415,
+          0.0176303,
+          -0.0001242,
+          2.7732e-07,
+          -180.6738,
+          1.19439,
+          -0.0018249,
+          27.3191,
+          233.311,
+          -4.555},  // p00_035_010
+         {0.0535,
+          987.550,
+          -92.7189,
+          2.082989,
+          12.4541,
+          -0.08230,
+          -0.0001818,
+          -3.87795e-06,
+          2.5149e-08,
+          323.4502,
+          -2.24899,
+          0.0038834,
+          27.3590,
+          234.951,
+          -4.869},  // p00_035_020
+         {0.0526,
+          1091.041,
+          -100.5277,
+          2.268617,
+          -24.3450,
+          3.95018,
+          -0.0648846,
+          0.000325397,
+          -5.05291e-07,
+          5624.6475,
+          -33.66283,
+          0.0497849,
+          27.4794,
+          296.856,
+          -5.917}  // p00_035_040
+     },
+     {
+         {0.0518,
+          906.047,
+          -86.9465,
+          1.973729,
+          47.2169,
+          -2.42283,
+          0.0403015,
+          -0.000261595,
+          5.48691e-07,
+          -443.7711,
+          3.06377,
+          -0.0051786,
+          27.4230,
+          241.297,
+          -5.555},  // p00_075_000
+         {0.0518,
+          962.031,
+          -86.6783,
+          1.901755,
+          -1.5936,
+          1.05420,
+          -0.0151409,
+          6.2351e-05,
+          -7.2903e-08,
+          -248.4788,
+          1.67118,
+          -0.0026560,
+          27.5352,
+          241.721,
+          -5.715},  // p00_075_005
+         {0.0517,
+          1039.619,
+          -100.0136,
+          2.303679,
+          67.4217,
+          -1.38425,
+          0.0080315,
+          -1.77911e-05,
+          1.45e-08,
+          -116.7918,
+          0.79208,
+          -0.0012724,
+          27.6310,
+          241.833,
+          -5.648},  // p00_075_010
+         {0.0517,
+          913.013,
+          -86.8368,
+          1.987933,
+          18.3200,
+          0.87979,
+          -0.0216340,
+          0.000124679,
+          -2.13529e-07,
+          -303.7535,
+          2.09690,
+          -0.0034978,
+          27.5110,
+          242.335,
+          -5.631},  // p00_075_020
+         {0.0506,
+          958.899,
+          -78.2435,
+          1.590885,
+          -111.3634,
+          6.71019,
+          -0.0914355,
+          0.000416366,
+          -5.95608e-07,
+          9726.7734,
+          -55.22470,
+          0.0778337,
+          27.7837,
+          310.280,
+          -6.746}  // p00_075_040
+     }},
+    {{
+         {0.0543,
+          696.547,
+          -71.7835,
+          1.763779,
+          84.2507,
+          -3.15106,
+          0.0394331,
+          -0.000190268,
+          3.06408e-07,
+          860.6631,
+          -5.55575,
+          0.0089867,
+          26.1516,
+          285.608,
+          -5.750},  // p05_000_000
+         {0.0547,
+          886.012,
+          -88.4547,
+          2.075261,
+          18.0386,
+          -0.82981,
+          0.0143024,
+          -8.7464e-05,
+          1.6728e-07,
+          96.0948,
+          -0.57534,
+          0.0011086,
+          26.7350,
+          285.000,
+          -4.142},  // p05_000_005
+         {0.0550,
+          842.528,
+          -89.4159,
+          2.175662,
+          41.0640,
+          -1.55421,
+          0.0238825,
+          -0.00014118,
+          2.67382e-07,
+          -696.6580,
+          4.99751,
+          -0.0085472,
+          26.9831,
+          284.807,
+          -4.101},  // p05_000_010
+         {0.0548,
+          919.531,
+          -98.4007,
+          2.419015,
+          47.7716,
+          -1.56864,
+          0.0177191,
+          -7.91865e-05,
+          1.1846e-07,
+          -3942.1045,
+          24.33616,
+          -0.0370322,
+          26.7111,
+          285.879,
+          -4.006},  // p05_000_020
+         {0.0545,
+          980.022,
+          -98.0226,
+          2.321404,
+          74.2535,
+          -1.73373,
+          0.0139841,
+          -5.59236e-05,
+          9.4178e-08,
+          1429.3680,
+          -8.87354,
+          0.0141598,
+          27.3712,
+          288.663,
+          -4.467}  // p05_000_040
+     },
+     {
+         {0.0547,
+          625.688,
+          -62.0451,
+          1.439093,
+          -11.4410,
+          0.01840,
+          0.0093194,
+          -8.78087e-05,
+          2.00186e-07,
+          783.8522,
+          -4.57127,
+          0.0068869,
+          26.6390,
+          285.519,
+          -4.346},  // p05_010_000
+         {0.0548,
+          695.967,
+          -75.8269,
+          1.918397,
+          128.6090,
+          -4.26920,
+          0.0481577,
+          -0.00022175,
+          3.53129e-07,
+          236.0552,
+          -1.44921,
+          0.0024358,
+          26.9030,
+          285.487,
+          -4.195},  // p05_010_005
+         {0.0547,
+          865.005,
+          -86.2078,
+          2.008639,
+          -7.2586,
+          0.01234,
+          0.0080995,
+          -7.85358e-05,
+          1.81736e-07,
+          -973.2291,
+          6.82770,
+          -0.0115285,
+          26.8071,
+          285.552,
+          -4.294},  // p05_010_010
+         {0.0546,
+          948.409,
+          -98.6395,
+          2.386155,
+          57.2934,
+          -1.76341,
+          0.0207853,
+          -0.000103446,
+          1.77386e-07,
+          -849.1052,
+          5.23769,
+          -0.0076821,
+          26.9432,
+          287.079,
+          -4.389},  // p05_010_020
+         {0.0543,
+          745.066,
+          -70.3617,
+          1.570678,
+          -100.0891,
+          4.65540,
+          -0.0576809,
+          0.000248944,
+          -3.40433e-07,
+          1045.9683,
+          -6.00401,
+          0.0090176,
+          26.8310,
+          290.321,
+          -4.562}  // p05_010_040
+     },
+     {
+         {0.0543,
+          927.075,
+          -92.2744,
+          2.168058,
+          26.2967,
+          -0.55144,
+          0.0049539,
+          -2.29069e-05,
+          4.001e-08,
+          526.2325,
+          -3.71631,
+          0.0066360,
+          26.9363,
+          287.753,
+          -4.523},  // p05_020_000
+         {0.0545,
+          821.476,
+          -82.9178,
+          1.984995,
+          87.5068,
+          -3.02167,
+          0.0398399,
+          -0.000213386,
+          3.82012e-07,
+          714.7357,
+          -3.71298,
+          0.0048374,
+          27.0472,
+          286.592,
+          -4.479},  // p05_020_005
+         {0.0543,
+          848.828,
+          -84.8760,
+          2.020220,
+          90.9654,
+          -3.15733,
+          0.0389501,
+          -0.000191609,
+          3.16806e-07,
+          -1171.0167,
+          7.27429,
+          -0.0109703,
+          27.0231,
+          287.231,
+          -4.519},  // p05_020_010
+         {0.0546,
+          889.890,
+          -89.5310,
+          2.115131,
+          -0.8272,
+          0.29102,
+          -0.0009026,
+          -1.47083e-05,
+          5.27e-08,
+          -1885.8252,
+          11.85770,
+          -0.0182013,
+          26.6471,
+          287.289,
+          -4.469},  // p05_020_020
+         {0.0539,
+          777.052,
+          -76.7719,
+          1.813559,
+          14.3051,
+          1.07654,
+          -0.0214579,
+          0.000103143,
+          -1.38949e-07,
+          187.0997,
+          -0.89280,
+          0.0015244,
+          27.1590,
+          291.553,
+          -4.805}  // p05_020_040
+     },
+     {
+         {0.0537,
+          1068.376,
+          -103.0411,
+          2.371422,
+          22.8346,
+          -0.49907,
+          0.0058217,
+          -3.13124e-05,
+          5.8011e-08,
+          749.1772,
+          -4.66128,
+          0.0073394,
+          26.9197,
+          290.305,
+          -5.034},  // p05_035_000
+         {0.0537,
+          922.462,
+          -95.1797,
+          2.308590,
+          57.9130,
+          -1.35554,
+          0.0124857,
+          -5.57341e-05,
+          9.373e-08,
+          18.7257,
+          -0.00962,
+          0.0000362,
+          26.7918,
+          290.512,
+          -4.849},  // p05_035_005
+         {0.0540,
+          894.928,
+          -89.1535,
+          2.089837,
+          34.6807,
+          -0.83026,
+          0.0109258,
+          -6.79551e-05,
+          1.38895e-07,
+          1548.7596,
+          -9.23427,
+          0.0138524,
+          27.3110,
+          289.360,
+          -4.610},  // p05_035_010
+         {0.0539,
+          667.240,
+          -60.7462,
+          1.344259,
+          7.5475,
+          0.05767,
+          -0.0005791,
+          -5.70037e-06,
+          2.5165e-08,
+          -1358.5505,
+          8.50055,
+          -0.0129859,
+          27.1272,
+          290.160,
+          -4.607},  // p05_035_020
+         {0.0534,
+          802.429,
+          -73.0618,
+          1.651703,
+          34.0876,
+          0.61236,
+          -0.0182647,
+          9.43796e-05,
+          -1.30823e-07,
+          3222.7056,
+          -18.93312,
+          0.0277841,
+          27.3115,
+          294.422,
+          -5.299}  // p05_035_040
+     },
+     {
+         {0.0518,
+          700.383,
+          -61.1032,
+          1.299594,
+          -39.2225,
+          1.94442,
+          -0.0216961,
+          8.01258e-05,
+          -8.9898e-08,
+          -81.5502,
+          1.08486,
+          -0.0024083,
+          27.1193,
+          300.399,
+          -5.993},  // p05_075_000
+         {0.0519,
+          927.206,
+          -87.9845,
+          2.000143,
+          20.6650,
+          0.00520,
+          -0.0027720,
+          8.80259e-06,
+          1.98e-09,
+          9.6791,
+          0.49922,
+          -0.0014792,
+          27.4390,
+          299.895,
+          -5.805},  // p05_075_005
+         {0.0518,
+          934.941,
+          -86.2463,
+          1.936011,
+          25.1119,
+          0.00001,
+          -0.0039262,
+          2.03358e-05,
+          -2.417e-08,
+          322.9187,
+          -1.49668,
+          0.0016812,
+          27.2631,
+          300.177,
+          -5.986},  // p05_075_010
+         {0.0520,
+          993.549,
+          -97.2560,
+          2.264713,
+          33.6250,
+          -0.24020,
+          -0.0012194,
+          2.96477e-06,
+          1.2554e-08,
+          307.3519,
+          -1.21447,
+          0.0009945,
+          27.2962,
+          299.423,
+          -5.744},  // p05_075_020
+         {0.0514,
+          468.694,
+          -25.9941,
+          0.331209,
+          -500.7382,
+          17.79676,
+          -0.1940950,
+          0.000794647,
+          -1.07709e-06,
+          5181.4653,
+          -29.96476,
+          0.0433838,
+          49.8310,
+          330.333,
+          -6.002}  // p05_075_040
+     }},
+    {{
+         {0.0543,
+          444.967,
+          -28.4588,
+          0.424836,
+          339.9133,
+          -10.95517,
+          0.1171990,
+          -0.000501034,
+          7.36781e-07,
+          -2649.7520,
+          16.23221,
+          -0.0243355,
+          46.2672,
+          284.537,
+          -6.241},  // p10_000_000
+         {0.0549,
+          390.870,
+          -27.6837,
+          0.408923,
+          266.7567,
+          -9.91893,
+          0.1121593,
+          -0.000503336,
+          7.7673e-07,
+          -2359.8765,
+          14.73537,
+          -0.0223716,
+          47.5111,
+          284.903,
+          -3.819},  // p10_000_005
+         {0.0552,
+          409.388,
+          -24.6673,
+          0.339988,
+          118.3806,
+          -4.90476,
+          0.0690942,
+          -0.000371486,
+          6.54186e-07,
+          -734.2883,
+          5.10949,
+          -0.0083707,
+          47.5030,
+          283.249,
+          -4.244},  // p10_000_010
+         {0.0551,
+          380.723,
+          -24.1178,
+          0.349059,
+          260.4387,
+          -9.22805,
+          0.1110720,
+          -0.00052683,
+          8.44974e-07,
+          -3205.7256,
+          20.19859,
+          -0.0310497,
+          47.3030,
+          283.016,
+          -4.520},  // p10_000_020
+         {0.0553,
+          486.981,
+          -30.5322,
+          0.443449,
+          99.9095,
+          -1.69511,
+          0.0103569,
+          -4.79413e-05,
+          1.09043e-07,
+          -2123.6826,
+          13.27378,
+          -0.0196028,
+          47.5750,
+          283.845,
+          -4.308}  // p10_000_040
+     },
+     {
+         {0.0547,
+          334.865,
+          -18.0900,
+          0.234656,
+          28.0558,
+          -1.31094,
+          0.0236035,
+          -0.000147807,
+          2.84406e-07,
+          -1982.7886,
+          12.94529,
+          -0.0206795,
+          47.4070,
+          285.407,
+          -4.922},  // p10_010_000
+         {0.0550,
+          429.850,
+          -25.6893,
+          0.361947,
+          303.1457,
+          -10.41588,
+          0.1197167,
+          -0.000541544,
+          8.32066e-07,
+          -1949.4258,
+          12.09917,
+          -0.0183208,
+          47.3590,
+          284.001,
+          -4.667},  // p10_010_005
+         {0.0550,
+          423.318,
+          -26.4854,
+          0.376344,
+          149.3362,
+          -5.23585,
+          0.0640293,
+          -0.000311324,
+          5.10747e-07,
+          -1775.4415,
+          11.07509,
+          -0.0167572,
+          47.4950,
+          284.279,
+          -4.383},  // p10_010_010
+         {0.0552,
+          297.030,
+          -18.7851,
+          0.271372,
+          340.4187,
+          -12.44870,
+          0.1500386,
+          -0.000704622,
+          1.11893e-06,
+          -2600.6030,
+          16.39101,
+          -0.0249243,
+          47.5830,
+          283.537,
+          -4.038},  // p10_010_020
+         {0.0551,
+          450.229,
+          -30.1270,
+          0.444823,
+          83.7979,
+          -2.33059,
+          0.0303516,
+          -0.000179137,
+          3.56033e-07,
+          -1380.3755,
+          8.95670,
+          -0.0133352,
+          47.6073,
+          285.729,
+          -4.428}  // p10_010_040
+     },
+     {
+         {0.0543,
+          462.093,
+          -27.4985,
+          0.384078,
+          222.0224,
+          -7.10104,
+          0.0761050,
+          -0.000328127,
+          4.86688e-07,
+          -2415.0276,
+          14.77577,
+          -0.0221916,
+          47.6152,
+          287.224,
+          -5.013},  // p10_020_000
+         {0.0546,
+          410.525,
+          -25.3196,
+          0.357600,
+          86.1671,
+          -2.82200,
+          0.0374626,
+          -0.000203459,
+          3.6567e-07,
+          -1225.1757,
+          8.02644,
+          -0.0127149,
+          47.7198,
+          286.049,
+          -4.892},  // p10_020_005
+         {0.0546,
+          425.689,
+          -28.0149,
+          0.413345,
+          266.2513,
+          -8.37519,
+          0.0905441,
+          -0.000398737,
+          6.07633e-07,
+          -2265.1531,
+          14.01686,
+          -0.0211383,
+          47.9031,
+          286.079,
+          -4.748},  // p10_020_010
+         {0.0550,
+          352.606,
+          -20.9216,
+          0.288158,
+          74.4119,
+          -2.92493,
+          0.0432526,
+          -0.000241122,
+          4.34542e-07,
+          -2950.2568,
+          18.57295,
+          -0.0283706,
+          47.5670,
+          284.361,
+          -4.425},  // p10_020_020
+         {0.0548,
+          426.454,
+          -26.8953,
+          0.385533,
+          41.4826,
+          -0.64755,
+          0.0068814,
+          -5.47065e-05,
+          1.37691e-07,
+          -1917.6680,
+          11.55652,
+          -0.0162119,
+          47.7271,
+          287.553,
+          -4.416}  // p10_020_040
+     },
+     {
+         {0.0538,
+          451.981,
+          -28.1736,
+          0.395521,
+          58.9204,
+          -1.83209,
+          0.0213037,
+          -0.000103434,
+          1.71531e-07,
+          -902.2464,
+          5.53711,
+          -0.0082508,
+          47.8630,
+          289.529,
+          -5.141},  // p10_035_000
+         {0.0538,
+          526.171,
+          -30.8816,
+          0.417017,
+          -11.5804,
+          0.17697,
+          0.0048610,
+          -5.44665e-05,
+          1.27224e-07,
+          -1179.8983,
+          7.40392,
+          -0.0112711,
+          47.7831,
+          289.144,
+          -5.393},  // p10_035_005
+         {0.0542,
+          519.251,
+          -30.5322,
+          0.416795,
+          105.8949,
+          -3.68688,
+          0.0468085,
+          -0.000236976,
+          4.02292e-07,
+          -522.6336,
+          3.57232,
+          -0.0057089,
+          47.8710,
+          287.729,
+          -5.024},  // p10_035_010
+         {0.0543,
+          306.942,
+          -19.4907,
+          0.280199,
+          191.3041,
+          -6.54247,
+          0.0757187,
+          -0.000349694,
+          5.51907e-07,
+          -1488.0515,
+          9.10737,
+          -0.0133225,
+          47.8879,
+          287.129,
+          -4.830},  // p10_035_020
+         {0.0544,
+          416.048,
+          -25.6481,
+          0.359893,
+          -69.9605,
+          3.42775,
+          -0.0426010,
+          0.000176246,
+          -2.21218e-07,
+          735.8124,
+          -4.44674,
+          0.0074687,
+          48.0711,
+          289.529,
+          -4.670}  // p10_035_040
+     },
+     {
+         {0.0518,
+          630.817,
+          -35.9510,
+          0.472383,
+          -129.8099,
+          4.43541,
+          -0.0423146,
+          0.000145196,
+          -1.56665e-07,
+          247.9289,
+          -0.67855,
+          -0.0000069,
+          48.8551,
+          299.968,
+          -6.525},  // p10_075_000
+         {0.0520,
+          624.701,
+          -35.2674,
+          0.463107,
+          -7.5412,
+          0.00076,
+          0.0079323,
+          -7.26227e-05,
+          1.60222e-07,
+          55.1657,
+          0.03637,
+          -0.0002848,
+          48.5190,
+          298.776,
+          -6.353},  // p10_075_005
+         {0.0521,
+          529.047,
+          -30.6393,
+          0.414497,
+          94.8947,
+          -2.61612,
+          0.0286424,
+          -0.000135713,
+          2.24151e-07,
+          30.5315,
+          -0.00030,
+          0.0000620,
+          48.7990,
+          298.433,
+          -6.096},  // p10_075_010
+         {0.0524,
+          546.891,
+          -32.8178,
+          0.454503,
+          151.0075,
+          -4.67180,
+          0.0561091,
+          -0.000281675,
+          4.8355e-07,
+          3507.9709,
+          -19.82098,
+          0.0281110,
+          48.7116,
+          297.617,
+          -5.892},  // p10_075_020
+         {0.0522,
+          490.736,
+          -33.0332,
+          0.479720,
+          -205.0307,
+          8.57113,
+          -0.0979068,
+          0.000392854,
+          -5.0076e-07,
+          259.6651,
+          -0.86469,
+          0.0012109,
+          48.9432,
+          301.888,
+          -5.997}  // p10_075_040
+     }},
+    {{
+         {0.0539,
+          618.555,
+          -29.3519,
+          0.407479,
+          489.6862,
+          -13.50907,
+          0.1496090,
+          -0.000668385,
+          1.00837e-06,
+          -4786.4731,
+          29.78914,
+          -0.0459188,
+          45.4550,
+          283.713,
+          -9.471},  // p15_000_000
+         {0.0548,
+          481.651,
+          -27.1630,
+          0.372552,
+          396.5359,
+          -14.25051,
+          0.1670385,
+          -0.00076671,
+          1.19298e-06,
+          -1978.3080,
+          12.40154,
+          -0.0189188,
+          46.4470,
+          283.047,
+          -5.783},  // p15_000_005
+         {0.0554,
+          290.698,
+          -15.0619,
+          0.179752,
+          116.3914,
+          -6.70812,
+          0.1055461,
+          -0.00058638,
+          1.04249e-06,
+          -3111.3262,
+          20.36962,
+          -0.0324368,
+          46.2950,
+          280.183,
+          -5.333},  // p15_000_010
+         {0.0557,
+          317.726,
+          -22.0054,
+          0.323944,
+          366.2626,
+          -14.60828,
+          0.1764353,
+          -0.000826521,
+          1.31135e-06,
+          -4860.8784,
+          30.47407,
+          -0.0465112,
+          46.1916,
+          280.625,
+          -4.335},  // p15_000_020
+         {0.0561,
+          367.769,
+          -22.0139,
+          0.322166,
+          348.6285,
+          -11.34895,
+          0.1285156,
+          -0.000603347,
+          9.88116e-07,
+          -8028.9995,
+          50.82850,
+          -0.0781526,
+          46.6846,
+          279.732,
+          -4.681}  // p15_000_040
+     },
+     {
+         {0.0548,
+          446.717,
+          -27.6451,
+          0.394353,
+          195.2927,
+          -7.15040,
+          0.0881320,
+          -0.000429922,
+          7.07225e-07,
+          -2658.1968,
+          17.04272,
+          -0.0267249,
+          46.4553,
+          284.321,
+          -5.765},  // p15_010_000
+         {0.0554,
+          505.207,
+          -34.6656,
+          0.499380,
+          355.9942,
+          -14.83115,
+          0.1758237,
+          -0.000811081,
+          1.27602e-06,
+          -2110.8472,
+          13.34021,
+          -0.0202956,
+          46.3591,
+          282.232,
+          -4.222},  // p15_010_005
+         {0.0553,
+          537.478,
+          -36.3405,
+          0.521155,
+          253.6998,
+          -11.15294,
+          0.1399077,
+          -0.000678278,
+          1.10707e-06,
+          -1763.7476,
+          10.62043,
+          -0.0151664,
+          46.5049,
+          282.073,
+          -4.343},  // p15_010_010
+         {0.0555,
+          501.484,
+          -29.7783,
+          0.424330,
+          469.7086,
+          -16.62958,
+          0.1949605,
+          -0.000904706,
+          1.4272e-06,
+          -6666.8008,
+          41.94084,
+          -0.0646212,
+          46.4551,
+          280.472,
+          -5.084},  // p15_010_020
+         {0.0559,
+          470.110,
+          -29.0327,
+          0.417035,
+          201.0962,
+          -6.90415,
+          0.0847450,
+          -0.000428597,
+          7.42681e-07,
+          -6483.8740,
+          40.95590,
+          -0.0627083,
+          46.6631,
+          281.215,
+          -4.948}  // p15_010_040
+     },
+     {
+         {0.0542,
+          715.150,
+          -41.3902,
+          0.571101,
+          304.5117,
+          -10.43529,
+          0.1201256,
+          -0.000548814,
+          8.51862e-07,
+          -1760.8561,
+          10.78495,
+          -0.0161043,
+          46.6710,
+          285.929,
+          -6.331},  // p15_020_000
+         {0.0547,
+          658.439,
+          -39.8237,
+          0.562939,
+          231.8015,
+          -8.28794,
+          0.1035891,
+          -0.000511959,
+          8.49801e-07,
+          -2560.7815,
+          16.39720,
+          -0.0255540,
+          46.4322,
+          284.233,
+          -5.899},  // p15_020_005
+         {0.0548,
+          414.682,
+          -23.5832,
+          0.334302,
+          491.5483,
+          -17.12633,
+          0.1987145,
+          -0.000908154,
+          1.40874e-06,
+          -3339.7017,
+          20.71245,
+          -0.0313189,
+          46.4311,
+          283.720,
+          -5.738},  // p15_020_010
+         {0.0552,
+          643.887,
+          -39.6919,
+          0.568328,
+          347.0768,
+          -12.66702,
+          0.1579001,
+          -0.000775179,
+          1.27647e-06,
+          -7132.7778,
+          45.49577,
+          -0.0713910,
+          46.5272,
+          280.913,
+          -5.491},  // p15_020_020
+         {0.0555,
+          586.081,
+          -37.8925,
+          0.563541,
+          414.4861,
+          -13.86712,
+          0.1607843,
+          -0.000763897,
+          1.25664e-06,
+          -6512.6489,
+          41.39564,
+          -0.0635409,
+          46.7110,
+          282.863,
+          -4.961}  // p15_020_040
+     },
+     {
+         {0.0537,
+          684.029,
+          -39.6581,
+          0.549837,
+          248.6428,
+          -8.13178,
+          0.0939024,
+          -0.000436782,
+          6.91317e-07,
+          -2259.1494,
+          14.56773,
+          -0.0231138,
+          46.7990,
+          288.751,
+          -6.675},  // p15_035_000
+         {0.0539,
+          475.128,
+          -26.9227,
+          0.367868,
+          219.2943,
+          -7.81167,
+          0.0945481,
+          -0.000451036,
+          7.25412e-07,
+          -1352.0148,
+          8.56153,
+          -0.0131034,
+          46.4872,
+          287.552,
+          -6.372},  // p15_035_005
+         {0.0545,
+          351.110,
+          -19.3620,
+          0.260745,
+          92.5998,
+          -3.41361,
+          0.0496447,
+          -0.000274342,
+          4.88951e-07,
+          -3070.5591,
+          19.25337,
+          -0.0294163,
+          46.7517,
+          285.161,
+          -5.895},  // p15_035_010
+         {0.0547,
+          556.671,
+          -32.0973,
+          0.450015,
+          433.2410,
+          -14.75811,
+          0.1688557,
+          -0.00076681,
+          1.18891e-06,
+          -4002.7505,
+          25.24431,
+          -0.0388803,
+          46.7514,
+          284.007,
+          -5.922},  // p15_035_020
+         {0.0552,
+          365.319,
+          -21.5027,
+          0.305726,
+          176.2112,
+          -5.83624,
+          0.0741807,
+          -0.000390559,
+          6.98712e-07,
+          -4699.8848,
+          29.63368,
+          -0.0448165,
+          46.8313,
+          284.233,
+          -5.158}  // p15_035_040
+     },
+     {
+         {0.0518,
+          621.361,
+          -33.3111,
+          0.426117,
+          -75.5622,
+          2.42624,
+          -0.0184954,
+          3.91961e-05,
+          -3.9e-11,
+          -1776.4901,
+          11.82981,
+          -0.0192065,
+          47.7590,
+          298.825,
+          -7.737},  // p15_075_000
+         {0.0521,
+          382.142,
+          -19.4660,
+          0.243987,
+          91.9575,
+          -3.43488,
+          0.0462838,
+          -0.00023754,
+          3.98771e-07,
+          -1568.6532,
+          9.65921,
+          -0.0143480,
+          47.9195,
+          297.199,
+          -7.416},  // p15_075_005
+         {0.0522,
+          373.028,
+          -18.9158,
+          0.243496,
+          225.1808,
+          -7.53399,
+          0.0873045,
+          -0.000404019,
+          6.32245e-07,
+          -2645.6333,
+          16.30164,
+          -0.0246428,
+          47.5512,
+          296.345,
+          -7.269},  // p15_075_010
+         {0.0528,
+          602.134,
+          -34.4702,
+          0.467003,
+          169.5936,
+          -5.89679,
+          0.0749325,
+          -0.00037753,
+          6.36807e-07,
+          -750.4797,
+          5.06339,
+          -0.0076102,
+          47.7590,
+          294.831,
+          -6.694},  // p15_075_020
+         {0.0530,
+          565.434,
+          -31.4761,
+          0.419217,
+          54.0884,
+          -1.76104,
+          0.0308998,
+          -0.000216639,
+          4.63628e-07,
+          -6329.3975,
+          39.49205,
+          -0.0590629,
+          47.8631,
+          297.367,
+          -6.496}  // p15_075_040
+     }},
+    {{
+         {0.0544,
+          666.463,
+          -21.3878,
+          0.149755,
+          649.4370,
+          -29.52684,
+          0.3811547,
+          -0.00180754,
+          2.82459e-06,
+          -6885.1675,
+          41.58986,
+          -0.0613047,
+          73.9282,
+          275.579,
+          -13.202},  // p30_000_000
+         {0.0551,
+          663.811,
+          -21.4668,
+          0.154208,
+          1095.6870,
+          -41.93940,
+          0.5029961,
+          -0.00229908,
+          3.51539e-06,
+          -9617.8633,
+          58.74586,
+          -0.0877752,
+          74.6711,
+          273.760,
+          -11.472},  // p30_000_005
+         {0.0561,
+          631.227,
+          -21.3640,
+          0.161188,
+          947.9635,
+          -37.74511,
+          0.4696087,
+          -0.00221308,
+          3.46725e-06,
+          -12851.9990,
+          79.94849,
+          -0.1216095,
+          74.4157,
+          268.871,
+          -10.328},  // p30_000_010
+         {0.0570,
+          542.750,
+          -17.6239,
+          0.124934,
+          2498.4397,
+          -77.39868,
+          0.8261456,
+          -0.00355034,
+          5.244e-06,
+          -15202.8721,
+          94.94591,
+          -0.1446921,
+          92.5528,
+          264.840,
+          -9.445},  // p30_000_020
+         {0.0590,
+          345.066,
+          -9.2243,
+          0.052292,
+          2681.5320,
+          -88.77964,
+          0.9949263,
+          -0.00448531,
+          6.97869e-06,
+          -14757.0254,
+          92.72736,
+          -0.1395036,
+          90.0636,
+          259.212,
+          -8.083}  // p30_000_040
+     },
+     {
+         {0.0548,
+          700.934,
+          -23.7393,
+          0.175354,
+          200.3159,
+          -17.05980,
+          0.2673405,
+          -0.001403,
+          2.34438e-06,
+          -7364.8179,
+          45.84827,
+          -0.0699186,
+          74.9273,
+          276.703,
+          -11.387},  // p30_010_000
+         {0.0555,
+          520.402,
+          -15.8165,
+          0.099321,
+          557.5676,
+          -27.24042,
+          0.3586717,
+          -0.00171478,
+          2.68558e-06,
+          -9390.8203,
+          57.14725,
+          -0.0849253,
+          74.7515,
+          272.847,
+          -10.875},  // p30_010_005
+         {0.0559,
+          579.052,
+          -19.2583,
+          0.140442,
+          1338.6992,
+          -49.13049,
+          0.5776027,
+          -0.00262005,
+          3.997e-06,
+          -11335.1484,
+          69.45791,
+          -0.1037953,
+          74.6551,
+          270.008,
+          -10.516},  // p30_010_010
+         {0.0573,
+          537.389,
+          -17.0785,
+          0.116394,
+          758.0134,
+          -36.34122,
+          0.4834257,
+          -0.0023376,
+          3.70117e-06,
+          -14798.0811,
+          92.13703,
+          -0.1392673,
+          92.2409,
+          264.271,
+          -9.104},  // p30_010_020
+         {0.0588,
+          445.450,
+          -14.0082,
+          0.095526,
+          2645.2361,
+          -86.68890,
+          0.9697553,
+          -0.00436719,
+          6.78475e-06,
+          -14777.9561,
+          92.31094,
+          -0.1378682,
+          90.7604,
+          260.489,
+          -7.964}  // p30_010_040
+     },
+     {
+         {0.0542,
+          653.501,
+          -20.5394,
+          0.140783,
+          646.2662,
+          -29.47562,
+          0.3827417,
+          -0.00183945,
+          2.92208e-06,
+          -4510.4043,
+          27.14243,
+          -0.0396915,
+          74.9998,
+          279.064,
+          -12.045},  // p30_020_000
+         {0.0550,
+          643.921,
+          -20.5326,
+          0.144599,
+          -13.3782,
+          -10.71516,
+          0.2055312,
+          -0.00114825,
+          1.96388e-06,
+          -8626.5527,
+          53.29684,
+          -0.0805921,
+          75.1838,
+          274.904,
+          -11.348},  // p30_020_005
+         {0.0556,
+          677.056,
+          -21.9846,
+          0.161014,
+          1029.1294,
+          -39.96080,
+          0.4893214,
+          -0.00228495,
+          3.56631e-06,
+          -9896.2520,
+          60.35292,
+          -0.0894654,
+          74.5673,
+          272.040,
+          -10.972},  // p30_020_010
+         {0.0568,
+          493.109,
+          -15.7785,
+          0.109324,
+          538.3813,
+          -27.78613,
+          0.3822607,
+          -0.00188315,
+          3.01036e-06,
+          -13770.9863,
+          85.53278,
+          -0.1294430,
+          91.9207,
+          266.055,
+          -9.806},  // p30_020_020
+         {0.0585,
+          438.066,
+          -13.3681,
+          0.087134,
+          1439.5156,
+          -57.68326,
+          0.7229532,
+          -0.00347484,
+          5.62005e-06,
+          -14117.8672,
+          88.19157,
+          -0.1317443,
+          90.5847,
+          261.543,
+          -8.254}  // p30_020_040
+     },
+     {
+         {0.0537,
+          750.612,
+          -24.7531,
+          0.182830,
+          385.3733,
+          -21.04696,
+          0.2956944,
+          -0.00147668,
+          2.39428e-06,
+          -5680.8027,
+          34.69738,
+          -0.0517378,
+          75.9672,
+          281.497,
+          -12.748},  // p30_035_000
+         {0.0543,
+          469.437,
+          -13.0089,
+          0.073764,
+          722.2865,
+          -31.78866,
+          0.4069758,
+          -0.00193378,
+          3.03995e-06,
+          -8950.8496,
+          54.99032,
+          -0.0826676,
+          75.2551,
+          277.999,
+          -12.074},  // p30_035_005
+         {0.0552,
+          411.203,
+          -12.2256,
+          0.080060,
+          642.2927,
+          -30.93592,
+          0.4155416,
+          -0.00203922,
+          3.28911e-06,
+          -8490.0098,
+          52.16059,
+          -0.0779041,
+          94.2560,
+          274.064,
+          -10.962},  // p30_035_010
+         {0.0563,
+          557.440,
+          -17.6681,
+          0.122377,
+          1209.2566,
+          -45.34520,
+          0.5447492,
+          -0.00251467,
+          3.89677e-06,
+          -13035.4639,
+          80.70238,
+          -0.1213974,
+          92.8646,
+          268.673,
+          -10.032},  // p30_035_020
+         {0.0581,
+          491.429,
+          -15.7457,
+          0.111179,
+          1546.3083,
+          -55.71778,
+          0.6661981,
+          -0.0031227,
+          4.97053e-06,
+          -16498.6426,
+          103.90786,
+          -0.1574202,
+          91.7591,
+          263.521,
+          -8.411}  // p30_035_040
+     },
+     {
+         {0.0517,
+          865.294,
+          -29.3301,
+          0.222901,
+          -44.5315,
+          -9.09935,
+          0.1820098,
+          -0.00101846,
+          1.73084e-06,
+          -4239.0176,
+          25.70850,
+          -0.0377992,
+          78.0954,
+          292.223,
+          -14.074},  // p30_075_000
+         {0.0524,
+          703.572,
+          -24.6691,
+          0.183864,
+          270.5533,
+          -19.10135,
+          0.2794582,
+          -0.0014063,
+          2.27132e-06,
+          -8685.2158,
+          52.30726,
+          -0.0771287,
+          77.4650,
+          288.559,
+          -12.376},  // p30_075_005
+         {0.0530,
+          474.285,
+          -14.5547,
+          0.095701,
+          812.2191,
+          -35.11754,
+          0.4441313,
+          -0.00209413,
+          3.27122e-06,
+          -7957.1304,
+          47.67856,
+          -0.0695332,
+          97.3439,
+          285.225,
+          -12.283},  // p30_075_010
+         {0.0543,
+          567.884,
+          -18.0292,
+          0.126235,
+          1405.6339,
+          -49.01416,
+          0.5709846,
+          -0.00260125,
+          4.01091e-06,
+          -12098.4277,
+          73.53913,
+          -0.1083410,
+          96.3750,
+          279.455,
+          -11.256},  // p30_075_020
+         {0.0558,
+          589.211,
+          -19.2235,
+          0.138965,
+          2047.7167,
+          -67.84039,
+          0.7780075,
+          -0.00357741,
+          5.64058e-06,
+          -14283.4629,
+          87.03631,
+          -0.1264499,
+          94.8953,
+          274.800,
+          -9.834}  // p30_075_040
+     }},
+    {{
+         {0.0557,
+          1155.683,
+          -33.4839,
+          0.145686,
+          2719.7532,
+          -108.17351,
+          1.2747917,
+          -0.00565097,
+          8.39053e-06,
+          -25073.9219,
+          151.94778,
+          -0.2242298,
+          48.0090,
+          280.461,
+          -23.132},  // p45_000_000
+         {0.0566,
+          1567.902,
+          -57.4336,
+          0.493112,
+          3101.4058,
+          -117.88098,
+          1.3597585,
+          -0.00595373,
+          8.77726e-06,
+          -13633.4766,
+          80.32226,
+          -0.1119712,
+          49.1791,
+          267.921,
+          -21.234},  // p45_000_005
+         {0.0586,
+          942.516,
+          -24.8914,
+          0.069922,
+          3201.7031,
+          -125.89007,
+          1.4943951,
+          -0.00670695,
+          1.00958e-05,
+          -21764.9766,
+          128.79881,
+          -0.1829160,
+          48.9092,
+          277.421,
+          -18.255},  // p45_000_010
+         {0.0608,
+          902.899,
+          -28.3868,
+          0.146040,
+          2763.3792,
+          -110.55793,
+          1.3092294,
+          -0.00576718,
+          8.44305e-06,
+          -36576.5859,
+          224.45471,
+          -0.3327475,
+          48.5103,
+          268.711,
+          -15.521},  // p45_000_020
+         {0.0646,
+          711.781,
+          -23.1849,
+          0.186509,
+          4643.2041,
+          -175.78204,
+          2.0932548,
+          -0.00957828,
+          1.4855e-05,
+          -37398.5391,
+          230.35623,
+          -0.3369770,
+          48.6790,
+          268.309,
+          -13.067}  // p45_000_040
+     },
+     {
+         {0.0556,
+          1641.623,
+          -64.7275,
+          0.614411,
+          3210.3213,
+          -121.40795,
+          1.3998587,
+          -0.00616869,
+          9.16989e-06,
+          -19828.0742,
+          119.30855,
+          -0.1743972,
+          49.2190,
+          282.671,
+          -21.938},  // p45_010_000
+         {0.0572,
+          1610.209,
+          -63.4580,
+          0.592605,
+          2768.5166,
+          -107.84313,
+          1.2726152,
+          -0.00567878,
+          8.50342e-06,
+          -32543.1211,
+          199.08755,
+          -0.2973665,
+          48.7990,
+          285.080,
+          -20.646},  // p45_010_005
+         {0.0586,
+          928.771,
+          -25.3291,
+          0.083051,
+          2961.2415,
+          -116.65910,
+          1.3792919,
+          -0.0061337,
+          9.13495e-06,
+          -28516.6875,
+          170.91864,
+          -0.2473477,
+          49.1495,
+          279.221,
+          -18.115},  // p45_010_010
+         {0.0614,
+          697.019,
+          -15.7292,
+          -0.019192,
+          2759.0288,
+          -111.27457,
+          1.3488168,
+          -0.00610496,
+          9.22191e-06,
+          -48335.2852,
+          296.50076,
+          -0.4415575,
+          48.8303,
+          278.460,
+          -15.170},  // p45_010_020
+         {0.0643,
+          728.698,
+          -23.1926,
+          0.134520,
+          7521.9775,
+          -250.69135,
+          2.7667563,
+          -0.0121051,
+          1.82258e-05,
+          -47137.4609,
+          294.16156,
+          -0.4410425,
+          76.2704,
+          269.670,
+          -13.099}  // p45_010_040
+     },
+     {
+         {0.0551,
+          1639.562,
+          -59.6881,
+          0.481906,
+          2429.6221,
+          -96.85565,
+          1.1416782,
+          -0.00508391,
+          7.60136e-06,
+          -19924.7695,
+          120.50782,
+          -0.1772735,
+          48.7597,
+          286.281,
+          -22.614},  // p45_020_000
+         {0.0564,
+          1679.394,
+          -65.3192,
+          0.612274,
+          2898.1484,
+          -111.21368,
+          1.3012885,
+          -0.00577897,
+          8.62735e-06,
+          -28883.1250,
+          175.93024,
+          -0.2613033,
+          48.6290,
+          290.061,
+          -21.622},  // p45_020_005
+         {0.0578,
+          1028.881,
+          -31.4676,
+          0.174174,
+          3294.5210,
+          -127.39808,
+          1.4879825,
+          -0.00659637,
+          9.82866e-06,
+          -30447.3281,
+          183.44189,
+          -0.2685859,
+          49.0103,
+          282.221,
+          -19.116},  // p45_020_010
+         {0.0605,
+          987.504,
+          -35.0554,
+          0.268233,
+          3260.0154,
+          -126.96191,
+          1.5010443,
+          -0.00669193,
+          9.99986e-06,
+          -47952.3516,
+          293.34497,
+          -0.4373715,
+          48.9605,
+          282.169,
+          -16.280},  // p45_020_020
+         {0.0638,
+          737.828,
+          -20.6664,
+          0.091813,
+          5752.2773,
+          -202.03827,
+          2.2940526,
+          -0.0101768,
+          1.54107e-05,
+          -45469.1484,
+          281.75494,
+          -0.4197274,
+          76.6694,
+          270.691,
+          -13.602}  // p45_020_040
+     },
+     {
+         {0.0542,
+          1700.905,
+          -61.6863,
+          0.520964,
+          2477.6436,
+          -96.00250,
+          1.1263552,
+          -0.00501486,
+          7.48948e-06,
+          -19374.1973,
+          116.43007,
+          -0.1708154,
+          49.2597,
+          289.479,
+          -24.157},  // p45_035_000
+         {0.0557,
+          1693.034,
+          -67.1800,
+          0.612665,
+          2736.7632,
+          -107.30387,
+          1.2492670,
+          -0.00551679,
+          8.17755e-06,
+          -29085.2188,
+          174.85184,
+          -0.2573700,
+          49.3107,
+          294.369,
+          -20.995},  // p45_035_005
+         {0.0570,
+          1132.273,
+          -37.3184,
+          0.238228,
+          2983.1143,
+          -116.76418,
+          1.3644956,
+          -0.00605594,
+          9.03055e-06,
+          -30742.9336,
+          185.21771,
+          -0.2724257,
+          49.2094,
+          286.281,
+          -19.636},  // p45_035_010
+         {0.0602,
+          960.894,
+          -34.8964,
+          0.249818,
+          2856.6895,
+          -115.03755,
+          1.3748089,
+          -0.00615177,
+          9.20856e-06,
+          -43965.3828,
+          265.75473,
+          -0.3902870,
+          48.9310,
+          285.569,
+          -15.753},  // p45_035_020
+         {0.0638,
+          666.124,
+          -23.1595,
+          0.130440,
+          4357.2236,
+          -164.68300,
+          1.9449605,
+          -0.00882303,
+          1.35497e-05,
+          -40430.5156,
+          246.79733,
+          -0.3601314,
+          76.9310,
+          272.809,
+          -12.285}  // p45_035_040
+     },
+     {
+         {0.0516,
+          1653.837,
+          -51.0220,
+          0.339328,
+          2723.0000,
+          -102.57573,
+          1.1830099,
+          -0.00518046,
+          7.60151e-06,
+          -20496.1836,
+          120.97394,
+          -0.1747967,
+          50.2893,
+          289.521,
+          -27.947},  // p45_075_000
+         {0.0535,
+          1526.754,
+          -53.9677,
+          0.420266,
+          2347.2256,
+          -92.32782,
+          1.0779294,
+          -0.00471772,
+          6.88652e-06,
+          -14132.0469,
+          83.37365,
+          -0.1184724,
+          49.9892,
+          308.469,
+          -23.850},  // p45_075_005
+         {0.0540,
+          1196.020,
+          -34.6963,
+          0.147162,
+          2420.2214,
+          -97.45383,
+          1.1485654,
+          -0.00508606,
+          7.49954e-06,
+          -30471.5801,
+          178.43796,
+          -0.2565020,
+          49.6709,
+          299.041,
+          -22.902},  // p45_075_010
+         {0.0575,
+          1024.607,
+          -30.8345,
+          0.158428,
+          2716.1501,
+          -108.09632,
+          1.2932163,
+          -0.00575735,
+          8.52492e-06,
+          -42679.3125,
+          249.51328,
+          -0.3542388,
+          49.6602,
+          297.609,
+          -19.025},  // p45_075_020
+         {0.0610,
+          1024.109,
+          -34.5451,
+          0.232132,
+          3806.4932,
+          -143.60016,
+          1.6938646,
+          -0.00757451,
+          1.13681e-05,
+          -52197.4844,
+          311.64444,
+          -0.4489692,
+          79.7896,
+          283.900,
+          -15.366}  // p45_075_040
+     }}};
diff --git a/SimMuon/DTDigitizer/test/stubs/DTTime2DriftParametrization.h b/SimMuon/DTDigitizer/test/stubs/DTTime2DriftParametrization.h
index dff61478e8faa..ae19b157624bb 100644
--- a/SimMuon/DTDigitizer/test/stubs/DTTime2DriftParametrization.h
+++ b/SimMuon/DTDigitizer/test/stubs/DTTime2DriftParametrization.h
@@ -16,13 +16,11 @@
  ************************************************************************
  */
 
-
-#define N_alpha     11
-#define N_By         5
-#define N_Bz         5
-#define N_Par_x     15
-#define N_Sigma_t    7
-
+#define N_alpha 11
+#define N_By 5
+#define N_Bz 5
+#define N_Par_x 15
+#define N_Sigma_t 7
 
 class DTTime2DriftParametrization {
 public:
@@ -34,63 +32,46 @@ class DTTime2DriftParametrization {
 
   /// Structure used to return output values
   typedef struct {
-    double v_drift, x_drift, delta_x, x_width_m, x_width_p ;
+    double v_drift, x_drift, delta_x, x_width_m, x_width_p;
   } drift_distance;
 
   /// Calculate drift distance and spread
-  unsigned short MB_DT_drift_distance (double time,
-				       double alpha,
-				       double by,
-				       double bz,
-				       drift_distance *DX,
-				       short interpolate) const;
-
+  unsigned short MB_DT_drift_distance(
+      double time, double alpha, double by, double bz, drift_distance *DX, short interpolate) const;
 
 private:
-  double MB_DT_dist      (double , double *) const;
-  double MB_DT_delta_x   (double , double *) const;
-  double MB_DT_sigma_t_m (double , double *) const;
-  double MB_DT_sigma_t_p (double , double *) const;
+  double MB_DT_dist(double, double *) const;
+  double MB_DT_delta_x(double, double *) const;
+  double MB_DT_sigma_t_m(double, double *) const;
+  double MB_DT_sigma_t_p(double, double *) const;
+
+  unsigned short MB_DT_Check_boundaries(double distime, double alpha, double by, double bz, short ifl) const;
 
-  unsigned short MB_DT_Check_boundaries (double distime,
-					 double alpha,
-					 double by,
-					 double bz,
-					 short ifl) const;
+  void MB_DT_Get_grid_values(
+      double Var, unsigned short *pi, unsigned short *pj, short Initial, unsigned short N, const double *Values) const;
+
+  void MB_DT_Get_grid_points(double alpha,
+                             double by,
+                             double bz,
+                             unsigned short *p_alpha,
+                             unsigned short *p_By,
+                             unsigned short *p_Bz,
+                             unsigned short *q_alpha,
+                             unsigned short *q_By,
+                             unsigned short *q_Bz) const;
+
+  double MB_DT_MLInterpolation(double *al, double *by, double *bz, double *f) const;
 
-  void MB_DT_Get_grid_values (double Var,
-			      unsigned short *pi,
-			      unsigned short *pj,
-			      short Initial,
-			      unsigned short N,
-			      const double *Values) const;
-  
-  void MB_DT_Get_grid_points (double alpha, 
-			      double by,
-			      double bz,
-			      unsigned short *p_alpha,
-			      unsigned short *p_By,
-			      unsigned short *p_Bz,
-			      unsigned short *q_alpha,
-			      unsigned short *q_By,
-			      unsigned short *q_Bz) const;
-  
-  double MB_DT_MLInterpolation (double *al,
-				double *by,
-				double *bz,
-				double *f) const;
-  
   /*** Points of the grid ***/
   static const double alpha_value[N_alpha];
-  static const double    By_value[N_By];
-  static const double    Bz_value[N_Bz];
+  static const double By_value[N_By];
+  static const double Bz_value[N_Bz];
 
   /*** Parameter values ***/
-  static const double fun_x[N_alpha][N_By][N_Bz][N_Par_x];  
+  static const double fun_x[N_alpha][N_By][N_Bz][N_Par_x];
   static const double fun_sigma_t[N_alpha][N_By][N_Bz][N_Sigma_t];
 
   /*** skew factor ***/
   static const double velocitySkew;
-
 };
 #endif
diff --git a/SimMuon/DTDigitizer/test/stubs/Utils.cc b/SimMuon/DTDigitizer/test/stubs/Utils.cc
index bdb4499dd5d7c..63f2b40d46e16 100644
--- a/SimMuon/DTDigitizer/test/stubs/Utils.cc
+++ b/SimMuon/DTDigitizer/test/stubs/Utils.cc
@@ -4,33 +4,29 @@
 
 #include "Utils.h"
 
-#include "SimMuon/DTDigitizer/src/DTDriftTimeParametrization.h"
 #include "DTTime2DriftParametrization.h"
+#include "SimMuon/DTDigitizer/src/DTDriftTimeParametrization.h"
 
-#include <CLHEP/Random/RandGaussQ.h>
 #include <CLHEP/Random/RandFlat.h>
+#include <CLHEP/Random/RandGaussQ.h>
 #include <cmath>
 
-
-void* driftTime(double x, double theta, double bWire, double bNorm,
-		short interpolate){
+void *driftTime(double x, double theta, double bWire, double bNorm, short interpolate) {
   static DTDriftTimeParametrization::drift_time DT;
 
   // Convert coordinates...
-  x*=10.; // cm->mm
+  x *= 10.;  // cm->mm
   double by_par = bNorm;
   double bz_par = -bWire;
-  
+
   DTDriftTimeParametrization param;
-  
-  //  unsigned short flag = 
-  param.MB_DT_drift_time(x,theta,by_par,bz_par,0,&DT, interpolate);
-  return &DT;
 
+  //  unsigned short flag =
+  param.MB_DT_drift_time(x, theta, by_par, bz_par, 0, &DT, interpolate);
+  return &DT;
 }
 
-void* trackDistance(double t, double theta, double bWire, double bNorm,
-		    short interpolate){
+void *trackDistance(double t, double theta, double bWire, double bNorm, short interpolate) {
   static DTTime2DriftParametrization::drift_distance DX;
 
   // Convert coordinates...
@@ -38,49 +34,44 @@ void* trackDistance(double t, double theta, double bWire, double bNorm,
   double bz_par = -bWire;
 
   DTTime2DriftParametrization param;
-  
-  // unsigned short flag = 
-  param.MB_DT_drift_distance(t,theta,by_par,bz_par,&DX, interpolate);
-  return &DX;
 
+  // unsigned short flag =
+  param.MB_DT_drift_distance(t, theta, by_par, bz_par, &DX, interpolate);
+  return &DX;
 }
 
-double smearedTime(double x, double theta, double Bwire, double Bnorm,
-		   short interpolate){
-  DTDriftTimeParametrization::drift_time * DT;
-  DT = (DTDriftTimeParametrization::drift_time *) 
-    driftTime(x, theta, Bwire, Bnorm, interpolate);
+double smearedTime(double x, double theta, double Bwire, double Bnorm, short interpolate) {
+  DTDriftTimeParametrization::drift_time *DT;
+  DT = (DTDriftTimeParametrization::drift_time *)driftTime(x, theta, Bwire, Bnorm, interpolate);
   return asymGausSample(DT->t_drift, DT->t_width_m, DT->t_width_p);
 }
 
 double asymGausSample(double mean, double sigma1, double sigma2) {
-
-  double f = sigma1/(sigma1+sigma2);
+  double f = sigma1 / (sigma1 + sigma2);
   double t;
 
   if (CLHEP::RandFlat::shoot() <= f) {
-    t = CLHEP::RandGaussQ::shoot(mean,sigma1);
+    t = CLHEP::RandGaussQ::shoot(mean, sigma1);
     return mean - fabs(t - mean);
   } else {
-    t = CLHEP::RandGaussQ::shoot(mean,sigma2);
-    return mean + fabs(t - mean);    
+    t = CLHEP::RandGaussQ::shoot(mean, sigma2);
+    return mean + fabs(t - mean);
   }
 }
 
-
-#include <string>
-#include <sstream>
 #include <iomanip>
+#include <sstream>
+#include <string>
 
 #include <iostream>
 
-TString dToTString(double f, int precision){
- std::stringstream StrStm;
- std::string Str;
+TString dToTString(double f, int precision) {
+  std::stringstream StrStm;
+  std::string Str;
 
- StrStm << std::setprecision(precision); // (Actually the default is 6);
- StrStm << f;
- Str = StrStm.str();
- TString tStr(Str.c_str());
- return tStr; 
+  StrStm << std::setprecision(precision);  // (Actually the default is 6);
+  StrStm << f;
+  Str = StrStm.str();
+  TString tStr(Str.c_str());
+  return tStr;
 }
diff --git a/SimMuon/DTDigitizer/test/stubs/Utils.h b/SimMuon/DTDigitizer/test/stubs/Utils.h
index cae1f4f8a2191..2781b1fc51d95 100644
--- a/SimMuon/DTDigitizer/test/stubs/Utils.h
+++ b/SimMuon/DTDigitizer/test/stubs/Utils.h
@@ -2,9 +2,9 @@
 #define Utils_H
 
 /*
- * Parametrization function and related utilities, for testing purposes. 
+ * Parametrization function and related utilities, for testing purposes.
  *
- * Coordinates are 
+ * Coordinates are
  * x in cm; theta in degrees, B in T, t in ns
  * Bwire = By in ORCA r.f.
  * Bnorm = Bz in ORCA r.f.
@@ -12,26 +12,23 @@
  *  \author N. Amapane - INFN Torino
  */
 
-
 // Drift space-time parametrization after J. Puerta, P. Garcia-Abia
-void* driftTime(double x, double theta, double Bwire, double Bnorm, short interpolate);
+void *driftTime(double x, double theta, double Bwire, double Bnorm, short interpolate);
 
 // Inverse time-space parametrization after J. Puerta, P. Garcia-Abia
-void* trackDistance(double x, double theta, double Bwire, double Bnorm, short interpolate);
+void *trackDistance(double x, double theta, double Bwire, double Bnorm, short interpolate);
 
 // Drift time parametrization after T. Rovelli, A. Gresele
 float oldParametrization(float x, float theta, float Bwire, float Bnorm);
 
 double smearedTime(double x, double theta, double Bwire, double Bnorm, short interpolate);
 
-// Smearing of an asymmetric distribution which results from combining two 
+// Smearing of an asymmetric distribution which results from combining two
 // gaussians with the same peak and different sigmas.
-double asymGausSample(double mean, double sigma1 ,double sigma2);
-
+double asymGausSample(double mean, double sigma1, double sigma2);
 
 #include "TString.h"
 // Convert a double to a TString with a given precision.
-TString dToTString(double f, int precision=6);
+TString dToTString(double f, int precision = 6);
 
 #endif
-
diff --git a/SimMuon/DTDigitizer/test/stubs/classes.h b/SimMuon/DTDigitizer/test/stubs/classes.h
index 9f4ad1a80a989..b8f09e1fe2b12 100644
--- a/SimMuon/DTDigitizer/test/stubs/classes.h
+++ b/SimMuon/DTDigitizer/test/stubs/classes.h
@@ -2,6 +2,5 @@
 #include "SimMuon/DTDigitizer/test/stubs/computeRange.h"
 
 namespace SimMuon_DTDigitizer_test {
-  struct dictionary {
-  };
-}
+  struct dictionary {};
+}  // namespace SimMuon_DTDigitizer_test
diff --git a/SimMuon/DTDigitizer/test/stubs/computeRange.cc b/SimMuon/DTDigitizer/test/stubs/computeRange.cc
index f66390e29b508..7c9da8f9f9d49 100644
--- a/SimMuon/DTDigitizer/test/stubs/computeRange.cc
+++ b/SimMuon/DTDigitizer/test/stubs/computeRange.cc
@@ -4,6 +4,6 @@
 
 float computeRange(float energy, float density) {
   float range = 0;
-  range = ((5.37e2)*energy*(1-(0.9815)/(1+(energy*3.1230e3))))/density;
+  range = ((5.37e2) * energy * (1 - (0.9815) / (1 + (energy * 3.1230e3)))) / density;
   return range;
 }
diff --git a/SimMuon/DTDigitizer/test/stubs/oldParametrization.cc b/SimMuon/DTDigitizer/test/stubs/oldParametrization.cc
index 4a3829d7bd8a7..67c34fa013e70 100644
--- a/SimMuon/DTDigitizer/test/stubs/oldParametrization.cc
+++ b/SimMuon/DTDigitizer/test/stubs/oldParametrization.cc
@@ -1,12 +1,11 @@
 
 /*
- * This class collects code fome the pakage MBDigitizer, which interfaces 
- * the Rovelli-Gresele parametrization used with ORCA 6. It is included here 
+ * This class collects code fome the pakage MBDigitizer, which interfaces
+ * the Rovelli-Gresele parametrization used with ORCA 6. It is included here
  * for comparison with the current parametrization.
- *  
+ *
  */
 
-
 #include "Utils.h"
 
 #include "DTAngleParam.h"
@@ -15,81 +14,77 @@
 #include <cmath>
 #include <iostream>
 
-
-
-//cfr. DTTimeDrift::ShortDistCorrect
+// cfr. DTTimeDrift::ShortDistCorrect
 float ShortDistCorrect(float x) {
-  float mu_drift_corr = fabs(x); // cfr. DTSpaceDrift:69
+  float mu_drift_corr = fabs(x);  // cfr. DTSpaceDrift:69
   float min_dist = 0.03;
 
   const float factor_range = 2.0;
-  float short_range = factor_range*min_dist;
+  float short_range = factor_range * min_dist;
   float punch_dist = short_range - mu_drift_corr;
-  if ( punch_dist > 0.0 ) 
-  mu_drift_corr = short_range - punch_dist*(factor_range-1.0)/factor_range;
+  if (punch_dist > 0.0)
+    mu_drift_corr = short_range - punch_dist * (factor_range - 1.0) / factor_range;
 
   return mu_drift_corr;
 }
 
-
 // x in cm; B in T
 // Bwire = By in ORCA r.f.
 // Bnorm = Bz in ORCA r.f.
 
 float oldParametrization(float x, float theta, float Bwire, float Bnorm) {
-
   // Change coordinates.
-  Bwire = -Bwire; // correct BUG in ORCA.
+  Bwire = -Bwire;  // correct BUG in ORCA.
 
   //**********************************************************************
 
-  //CFR DTTimeDrift::ShortDistCorrect
+  // CFR DTTimeDrift::ShortDistCorrect
   x = ShortDistCorrect(x);
 
-  //CFR DTTimeDrift::TimeCompute
+  // CFR DTTimeDrift::TimeCompute
 
   // set some cell parameters
-  const float cell_width = 2.1; // (mu_wire->wireType()->width())/2;
+  const float cell_width = 2.1;  // (mu_wire->wireType()->width())/2;
 
-  const float volume_lim = cell_width-0.0025;
-  const float volume_par = cell_width-0.1;
-  const float edge_width = volume_lim-volume_par;
+  const float volume_lim = cell_width - 0.0025;
+  const float volume_par = cell_width - 0.1;
+  const float edge_width = volume_lim - volume_par;
 
-  // define coordinate with 0 inside the I beam  
+  // define coordinate with 0 inside the I beam
   // mu_drift_corr = x
-  float xcoor = cell_width-fabs(x);  
+  float xcoor = cell_width - fabs(x);
 
-  if ( xcoor < 0.0 ) 
+  if (xcoor < 0.0)
     xcoor = 0.0;
 
-  if ( xcoor > volume_lim ) {
+  if (xcoor > volume_lim) {
     return 0.0;
   }
-  
-  xcoor *= (2/cell_width);  
+
+  xcoor *= (2 / cell_width);
 
   // ****** patch to use the old parametrization with the new geometry ******
   //   bool extrapolate = ( mu_drift_corr > cell_width );
   //  float mu_drift_extr = ( extrapolate ? cell_width : mu_drift_corr );
-   // ****** ********************************************************** ******
+  // ****** ********************************************************** ******
   float angle = theta;
-  while ( angle > 360.0 ) angle -= 360.0;
-  if ( ( angle >  90.0 ) && ( angle <= 270.0 ) ) 
+  while (angle > 360.0)
+    angle -= 360.0;
+  if ((angle > 90.0) && (angle <= 270.0))
     angle -= 180.0;
-  else
-  if ( ( angle > 270.0 ) && ( angle <= 360.0 ) ) 
+  else if ((angle > 270.0) && (angle <= 360.0))
     angle -= 360.0;
 
-  //access to CMS Magnetic Field
-  if ( Bwire < 0.0 ) {
+  // access to CMS Magnetic Field
+  if (Bwire < 0.0) {
     Bwire = fabs(Bwire);
     angle = -angle;
   }
 
   // handle cell edge cases
-  bool out_of_volume = ( xcoor > volume_par );
-  float xpos=xcoor;
-  if ( out_of_volume ) {
+  bool out_of_volume = (xcoor > volume_par);
+  float xpos = xcoor;
+  if (out_of_volume) {
     xpos = xcoor;
     xcoor = volume_par;
   }
@@ -106,15 +101,12 @@ float oldParametrization(float x, float theta, float Bwire, float Bnorm) {
   mu_time_drift += bnorm_func.tcor(xcoor);
 
   // correct for cell edge cases
-  if (out_of_volume) mu_time_drift *= 
-		       ( 1.0 - ((xpos-volume_par)/edge_width) );
-
- 
-  //correzione lunghezza cella
-   mu_time_drift*=cell_width/2.;
-  
-   
-  mu_time_drift *= 1000.0;
-  return   mu_time_drift;
+  if (out_of_volume)
+    mu_time_drift *= (1.0 - ((xpos - volume_par) / edge_width));
 
+  // correzione lunghezza cella
+  mu_time_drift *= cell_width / 2.;
+
+  mu_time_drift *= 1000.0;
+  return mu_time_drift;
 }
diff --git a/SimMuon/DTDigitizer/test/testDriftTimeParam.cpp b/SimMuon/DTDigitizer/test/testDriftTimeParam.cpp
index ae4c824f85a04..ddcec1675e2bf 100644
--- a/SimMuon/DTDigitizer/test/testDriftTimeParam.cpp
+++ b/SimMuon/DTDigitizer/test/testDriftTimeParam.cpp
@@ -3,13 +3,13 @@
    Test suit for DTDigitizer
 
    \author Riccardo Bellan
-   \version 
+   \version
    \date 15 Feb 2006
 
-   \note 
-    Compute the DT drift time using the DT prarametrization, 
+   \note
+    Compute the DT drift time using the DT prarametrization,
     prompting the user for the parameters.
-  
+
 */
 
 #include "SimMuon/DTDigitizer/src/DTDriftTimeParametrization.cc"
@@ -20,57 +20,50 @@ void average() {
   short interpolate = 1;
   DTDriftTimeParametrization::drift_time DT;
   static const DTDriftTimeParametrization p;
-  double alpha =0;
-  double Bwire =0;
-  double Bnorm=0;
+  double alpha = 0;
+  double Bwire = 0;
+  double Bnorm = 0;
 
   float mean = 0;
-  int count =0;
-  for (int i = 1; i<21; i++) {
-    p.MB_DT_drift_time(i,alpha,Bwire,Bnorm,0,&DT, interpolate);
-    mean += DT.v_drift ;
+  int count = 0;
+  for (int i = 1; i < 21; i++) {
+    p.MB_DT_drift_time(i, alpha, Bwire, Bnorm, 0, &DT, interpolate);
+    mean += DT.v_drift;
     count++;
   }
-  
+
   mean /= count;
-  
+
   std::cout << " mean vd = " << mean;
 }
 
-
-void printDt(double x, double alpha, double Bwire, double Bnorm, int ifl)
-{
+void printDt(double x, double alpha, double Bwire, double Bnorm, int ifl) {
   short interpolate = 1;
-//  DRIFT_TIME * DT;
+  //  DRIFT_TIME * DT;
   DTDriftTimeParametrization::drift_time DT;
-  static  const DTDriftTimeParametrization p;
-  unsigned short status = p.MB_DT_drift_time(x,alpha,Bwire,Bnorm,ifl,&DT, interpolate);
-
-  std::cout << "(x = " << x << ", alpha = " << alpha
-       << ", Bwire = " << Bwire <<", Bnorm = "<<Bnorm<<", ifl = "<<ifl<<"):" << std::endl
-       << "\tt_drift (ns) = " << DT.t_drift
-       << " t_width_m = "<< DT.t_width_m 
-       << " t_width_p = " << DT.t_width_p 
-       << " v_drift (ns) = " << DT.v_drift
-       << " status " << status
-       <<std::endl;
-
-} //end printDt()
+  static const DTDriftTimeParametrization p;
+  unsigned short status = p.MB_DT_drift_time(x, alpha, Bwire, Bnorm, ifl, &DT, interpolate);
 
+  std::cout << "(x = " << x << ", alpha = " << alpha << ", Bwire = " << Bwire << ", Bnorm = " << Bnorm
+            << ", ifl = " << ifl << "):" << std::endl
+            << "\tt_drift (ns) = " << DT.t_drift << " t_width_m = " << DT.t_width_m << " t_width_p = " << DT.t_width_p
+            << " v_drift (ns) = " << DT.v_drift << " status " << status << std::endl;
 
+}  // end printDt()
 
 int main() {
-
   average();
 
-  std::cout << "Enter x(mm), alpha(deg), Bwire(T), Bnorm(T), ifl(0=x from wire; 1=x fom cell edge)" << std::endl;
+  std::cout << "Enter x(mm), alpha(deg), Bwire(T), Bnorm(T), ifl(0=x from "
+               "wire; 1=x fom cell edge)"
+            << std::endl;
 
-  while(true){
-    double x=0, alpha=0, Bwire=0, Bnorm=0;
-    int ifl=1;
+  while (true) {
+    double x = 0, alpha = 0, Bwire = 0, Bnorm = 0;
+    int ifl = 1;
     std::cin >> x >> alpha >> Bwire >> Bnorm >> ifl;
-    if (!std::cin) break;
-    printDt( x, alpha, Bwire, Bnorm, ifl);
+    if (!std::cin)
+      break;
+    printDt(x, alpha, Bwire, Bnorm, ifl);
   }
 }
-
diff --git a/SimMuon/GEMDigitizer/python/muonGEMDigi_cff.py b/SimMuon/GEMDigitizer/python/muonGEMDigi_cff.py
index 41b2b6813dcef..2911bd336905b 100644
--- a/SimMuon/GEMDigitizer/python/muonGEMDigi_cff.py
+++ b/SimMuon/GEMDigitizer/python/muonGEMDigi_cff.py
@@ -4,4 +4,5 @@
 from SimMuon.GEMDigitizer.muonGEMPadDigis_cfi import *
 from SimMuon.GEMDigitizer.muonGEMPadDigiClusters_cfi import *
 
-muonGEMDigi = cms.Sequence(simMuonGEMDigis*simMuonGEMPadDigis*simMuonGEMPadDigiClusters)
+muonGEMDigiTask = cms.Task(simMuonGEMDigis, simMuonGEMPadDigis, simMuonGEMPadDigiClusters)
+muonGEMDigi = cms.Sequence(muonGEMDigiTask)
diff --git a/SimMuon/GEMDigitizer/python/muonME0Digi_cff.py b/SimMuon/GEMDigitizer/python/muonME0Digi_cff.py
index 10491d2705aa6..75aa3215fa9b7 100644
--- a/SimMuon/GEMDigitizer/python/muonME0Digi_cff.py
+++ b/SimMuon/GEMDigitizer/python/muonME0Digi_cff.py
@@ -6,8 +6,9 @@
 from SimMuon.GEMDigitizer.muonME0PseudoDigis_cfi import *
 from SimMuon.GEMDigitizer.muonME0PseudoReDigis_cfi import *
 
-muonME0RealDigi = cms.Sequence(simMuonME0Digis * simMuonME0PadDigis + simMuonME0PadDigiClusters)
+muonME0RealDigi = cms.Task(simMuonME0Digis, simMuonME0PadDigis, simMuonME0PadDigiClusters)
 
-muonME0PseudoDigi = cms.Sequence(simMuonME0PseudoDigis * simMuonME0PseudoReDigis)
+muonME0PseudoDigi = cms.Task(simMuonME0PseudoDigis, simMuonME0PseudoReDigis)
 
-muonME0Digi = cms.Sequence(muonME0RealDigi * muonME0PseudoDigi)
+muonME0DigiTask = cms.Task(muonME0RealDigi, muonME0PseudoDigi)
+muonME0Digi = cms.Sequence(muonME0DigiTask)
diff --git a/SimMuon/GEMDigitizer/test/runGEMDigiProducer_cfg.py b/SimMuon/GEMDigitizer/test/runGEMDigiProducer_cfg.py
index 8b498b66b1247..83d0ee7d16795 100644
--- a/SimMuon/GEMDigitizer/test/runGEMDigiProducer_cfg.py
+++ b/SimMuon/GEMDigitizer/test/runGEMDigiProducer_cfg.py
@@ -1,8 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
-
-process = cms.Process("GEMDIGI", eras.Phase2C2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process("GEMDIGI", Phase2)
 
 process.load('Configuration.StandardSequences.Services_cff')
 process.load('FWCore.MessageService.MessageLogger_cfi')
diff --git a/SimMuon/GEMDigitizer/test/runME0ReDigiProducer_cfg.py b/SimMuon/GEMDigitizer/test/runME0ReDigiProducer_cfg.py
index da64296a1617d..1357e1104f5e0 100644
--- a/SimMuon/GEMDigitizer/test/runME0ReDigiProducer_cfg.py
+++ b/SimMuon/GEMDigitizer/test/runME0ReDigiProducer_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("GEMDIGI", eras.Phase2C2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process("GEMDIGI", Phase2)
 
 process.load('Configuration.StandardSequences.Services_cff')
 process.load('FWCore.MessageService.MessageLogger_cfi')
diff --git a/SimMuon/MCTruth/interface/CSCHitAssociator.h b/SimMuon/MCTruth/interface/CSCHitAssociator.h
index a1736597cf2ab..6f940d8ff90d7 100644
--- a/SimMuon/MCTruth/interface/CSCHitAssociator.h
+++ b/SimMuon/MCTruth/interface/CSCHitAssociator.h
@@ -1,50 +1,47 @@
 #ifndef MCTruth_CSCHitAssociator_h
 #define MCTruth_CSCHitAssociator_h
 
-#include "DataFormats/CSCRecHit/interface/CSCRecHit2D.h"
+#include "CondFormats/CSCObjects/interface/CSCBadChambers.h"
+#include "CondFormats/DataRecord/interface/CSCBadChambersRcd.h"
 #include "DataFormats/CSCDigi/interface/CSCStripDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCWireDigi.h"
-#include "SimDataFormats/Track/interface/SimTrackContainer.h"
+#include "DataFormats/CSCRecHit/interface/CSCRecHit2D.h"
+#include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/Common/interface/DetSetVector.h"
-#include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
-#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 #include "Geometry/CSCGeometry/interface/CSCLayerGeometry.h"
-#include "CondFormats/CSCObjects/interface/CSCBadChambers.h"
-#include "CondFormats/DataRecord/interface/CSCBadChambersRcd.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
+#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
+#include "SimDataFormats/Track/interface/SimTrackContainer.h"
+#include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-class CSCHitAssociator
-{
+class CSCHitAssociator {
 public:
   typedef edm::DetSetVector<StripDigiSimLink> DigiSimLinks;
   typedef edm::DetSetVector<StripDigiSimLink> WireDigiSimLinks;
   typedef edm::DetSet<StripDigiSimLink> LayerLinks;
-  typedef std::pair <uint32_t, EncodedEventId> SimHitIdpr;
+  typedef std::pair<uint32_t, EncodedEventId> SimHitIdpr;
+
+  CSCHitAssociator(const edm::Event &, const edm::EventSetup &, const edm::ParameterSet &);
+  CSCHitAssociator(const edm::ParameterSet &, edm::ConsumesCollector &&iC);
 
-  CSCHitAssociator(const edm::Event&, const edm::EventSetup&, const edm::ParameterSet&); 
-  CSCHitAssociator(const edm::ParameterSet&, edm::ConsumesCollector && iC);
- 
-  void initEvent(const edm::Event &, const edm::EventSetup& );
+  void initEvent(const edm::Event &, const edm::EventSetup &);
 
   std::vector<SimHitIdpr> associateHitId(const TrackingRecHit &) const;
   std::vector<SimHitIdpr> associateCSCHitId(const CSCRecHit2D *) const;
 
-
 private:
-
-  const DigiSimLinks  * theDigiSimLinks;
+  const DigiSimLinks *theDigiSimLinks;
 
   edm::InputTag linksTag;
 
-  const CSCGeometry* cscgeom;
+  const CSCGeometry *cscgeom;
 };
 
 #endif
diff --git a/SimMuon/MCTruth/interface/CSCTruthTest.h b/SimMuon/MCTruth/interface/CSCTruthTest.h
index 7fc5b2e171b07..1cfd4ea14e15f 100644
--- a/SimMuon/MCTruth/interface/CSCTruthTest.h
+++ b/SimMuon/MCTruth/interface/CSCTruthTest.h
@@ -6,16 +6,13 @@
 #include "SimMuon/MCTruth/interface/MuonTruth.h"
 
 class CSCTruthTest : public edm::stream::EDAnalyzer<> {
-
 public:
-  explicit CSCTruthTest(const edm::ParameterSet&);
+  explicit CSCTruthTest(const edm::ParameterSet &);
   ~CSCTruthTest() override;
 
 private:
-
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  const edm::ParameterSet& conf_;
-
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  const edm::ParameterSet &conf_;
 };
 
 #endif
diff --git a/SimMuon/MCTruth/interface/DTHitAssociator.h b/SimMuon/MCTruth/interface/DTHitAssociator.h
index b9b3d19a2edd8..1c6a728a1129f 100644
--- a/SimMuon/MCTruth/interface/DTHitAssociator.h
+++ b/SimMuon/MCTruth/interface/DTHitAssociator.h
@@ -1,69 +1,64 @@
 #ifndef MCTruth_DTHitAssociator_h
 #define MCTruth_DTHitAssociator_h
 
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Utilities/interface/InputTag.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
-#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
-#include "DataFormats/DTRecHit/interface/DTRecHitCollection.h"
+#include "DataFormats/DTDigi/interface/DTDigiCollection.h"
 #include "DataFormats/DTRecHit/interface/DTRecHit1D.h"
+#include "DataFormats/DTRecHit/interface/DTRecHitCollection.h"
 #include "DataFormats/MuonDetId/interface/DTWireId.h"
-#include "DataFormats/DTDigi/interface/DTDigiCollection.h"
-#include "SimDataFormats/DigiSimLinks/interface/DTDigiSimLinkCollection.h"
-#include "Geometry/DTGeometry/interface/DTGeometry.h"
+#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Utilities/interface/InputTag.h"
+#include "Geometry/DTGeometry/interface/DTGeometry.h"
+#include "SimDataFormats/DigiSimLinks/interface/DTDigiSimLinkCollection.h"
+#include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-#include <vector>
 #include <map>
+#include <vector>
 
 class DTHitAssociator {
+public:
+  typedef std::pair<uint32_t, EncodedEventId> SimHitIdpr;
+  typedef std::pair<PSimHit, bool> PSimHit_withFlag;
+  typedef std::map<DTWireId, std::vector<PSimHit_withFlag>> SimHitMap;
+  typedef std::map<DTWireId, std::vector<DTRecHit1DPair>> RecHitMap;
+  typedef std::map<DTWireId, std::vector<DTDigi>> DigiMap;
+  typedef std::map<DTWireId, std::vector<DTDigiSimLink>> LinksMap;
 
- public:
-  typedef std::pair <uint32_t, EncodedEventId> SimHitIdpr;
-  typedef std::pair<PSimHit,bool> PSimHit_withFlag;
-  typedef std::map<DTWireId, std::vector<PSimHit_withFlag> > SimHitMap;
-  typedef std::map<DTWireId, std::vector<DTRecHit1DPair> > RecHitMap;
-  typedef std::map<DTWireId, std::vector<DTDigi> > DigiMap;
-  typedef std::map<DTWireId, std::vector<DTDigiSimLink> > LinksMap;
+  DTHitAssociator(const edm::Event &, const edm::EventSetup &, const edm::ParameterSet &, bool printRtS);
+  DTHitAssociator(const edm::ParameterSet &, edm::ConsumesCollector &&iC);
 
-  DTHitAssociator(const edm::Event&, const edm::EventSetup&, const edm::ParameterSet&, bool printRtS); 
-  DTHitAssociator(const edm::ParameterSet&, edm::ConsumesCollector && iC); 
+  void initEvent(const edm::Event &, const edm::EventSetup &);
 
-  void initEvent(const edm::Event&, const edm::EventSetup& );
+  virtual ~DTHitAssociator() {}
 
-  virtual ~DTHitAssociator(){}
+  std::vector<SimHitIdpr> associateHitId(const TrackingRecHit &hit) const;
+  std::vector<SimHitIdpr> associateDTHitId(const DTRecHit1D *dtrechit) const;
 
-  std::vector<SimHitIdpr> associateHitId(const TrackingRecHit & hit) const;
-  std::vector<SimHitIdpr> associateDTHitId(const DTRecHit1D * dtrechit) const;
-  
-  std::vector<PSimHit> associateHit(const TrackingRecHit & hit) const;
+  std::vector<PSimHit> associateHit(const TrackingRecHit &hit) const;
 
   SimHitMap mapOfSimHit;
   RecHitMap mapOfRecHit;
   DigiMap mapOfDigi;
   LinksMap mapOfLinks;
 
- private:
+private:
   edm::InputTag DTsimhitsTag;
   edm::InputTag DTsimhitsXFTag;
   edm::InputTag DTdigiTag;
   edm::InputTag DTdigisimlinkTag;
   edm::InputTag DTrechitTag;
-  
+
   bool dumpDT;
   bool crossingframe;
   bool links_exist;
   bool associatorByWire;
-  
+
   bool SimHitOK(const edm::ESHandle<DTGeometry> &, const PSimHit &);
   bool printRtS;
-
 };
 
 #endif
-
-
-
diff --git a/SimMuon/MCTruth/interface/GEMHitAssociator.h b/SimMuon/MCTruth/interface/GEMHitAssociator.h
index c188c95420192..048fbec774ac2 100644
--- a/SimMuon/MCTruth/interface/GEMHitAssociator.h
+++ b/SimMuon/MCTruth/interface/GEMHitAssociator.h
@@ -1,71 +1,66 @@
 #ifndef MCTruth_GEMHitAssociator_h
 #define MCTruth_GEMHitAssociator_h
 
-#include "FWCore/Framework/interface/Event.h"
+#include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/MuonDetId/interface/GEMDetId.h"
+#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
+#include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
-#include "DataFormats/MuonDetId/interface/GEMDetId.h"
-#include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 
-#include <vector>
 #include <map>
-#include <string>
 #include <set>
+#include <string>
+#include <vector>
 
-#include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
-#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
+#include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/DetId/interface/DetId.h"
-#include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
 #include "DataFormats/GEMDigi/interface/GEMDigiCollection.h"
 #include "DataFormats/GEMRecHit/interface/GEMRecHitCollection.h"
 #include "DataFormats/GEMRecHit/interface/GEMSegmentCollection.h"
+#include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Geometry/GEMGeometry/interface/GEMGeometry.h"
-#include "DataFormats/Common/interface/DetSetVector.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
+#include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
+#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 
 class GEMHitAssociator {
+public:
+  typedef edm::DetSetVector<StripDigiSimLink> DigiSimLinks;
+  typedef edm::DetSet<StripDigiSimLink> LayerLinks;
+  typedef std::pair<uint32_t, EncodedEventId> SimHitIdpr;
 
- public:
+  // Constructor with configurable parameters
+  GEMHitAssociator(const edm::ParameterSet &, edm::ConsumesCollector &&ic);
+  GEMHitAssociator(const edm::Event &e, const edm::EventSetup &eventSetup, const edm::ParameterSet &conf);
 
-   typedef edm::DetSetVector<StripDigiSimLink> DigiSimLinks;
-   typedef edm::DetSet<StripDigiSimLink> LayerLinks;
-   typedef std::pair<uint32_t, EncodedEventId> SimHitIdpr;
+  void initEvent(const edm::Event &, const edm::EventSetup &);
 
-   // Constructor with configurable parameters
-   GEMHitAssociator(const edm::ParameterSet&, edm::ConsumesCollector && ic);
-   GEMHitAssociator(const edm::Event& e, const edm::EventSetup& eventSetup, const edm::ParameterSet& conf);
-    
-   void initEvent(const edm::Event&, const edm::EventSetup&);
+  // Destructor
+  ~GEMHitAssociator() {}
 
-   // Destructor
-   ~GEMHitAssociator(){}
+  std::vector<SimHitIdpr> associateRecHit(const GEMRecHit *gemrechit) const;
 
-   std::vector<SimHitIdpr> associateRecHit(const GEMRecHit * gemrechit) const;
+private:
+  const DigiSimLinks *theDigiSimLinks;
+  edm::InputTag GEMdigisimlinkTag;
 
- private:
-    
-   const DigiSimLinks * theDigiSimLinks;
-   edm::InputTag GEMdigisimlinkTag;
- 
-   bool crossingframe;
-   bool useGEMs_;
-   edm::InputTag GEMsimhitsTag;
-   edm::InputTag GEMsimhitsXFTag;
-    
-   edm::EDGetTokenT<CrossingFrame<PSimHit> > GEMsimhitsXFToken_;
-   edm::EDGetTokenT<edm::PSimHitContainer> GEMsimhitsToken_;
-   edm::EDGetTokenT<edm::DetSetVector<StripDigiSimLink> > GEMdigisimlinkToken_;
+  bool crossingframe;
+  bool useGEMs_;
+  edm::InputTag GEMsimhitsTag;
+  edm::InputTag GEMsimhitsXFTag;
 
-   std::map<unsigned int, edm::PSimHitContainer> _SimHitMap;
+  edm::EDGetTokenT<CrossingFrame<PSimHit>> GEMsimhitsXFToken_;
+  edm::EDGetTokenT<edm::PSimHitContainer> GEMsimhitsToken_;
+  edm::EDGetTokenT<edm::DetSetVector<StripDigiSimLink>> GEMdigisimlinkToken_;
 
- };
+  std::map<unsigned int, edm::PSimHitContainer> _SimHitMap;
+};
 
 #endif
-
diff --git a/SimMuon/MCTruth/interface/MuonAssociatorByHits.h b/SimMuon/MCTruth/interface/MuonAssociatorByHits.h
index 85fa3b339d15b..43fbd420844f9 100644
--- a/SimMuon/MCTruth/interface/MuonAssociatorByHits.h
+++ b/SimMuon/MCTruth/interface/MuonAssociatorByHits.h
@@ -1,16 +1,16 @@
 #ifndef MuonAssociatorByHits_h
 #define MuonAssociatorByHits_h
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/Common/interface/Ref.h"
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/TrackReco/interface/Track.h"
-#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
+#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
 #include "SimMuon/MCTruth/interface/MuonAssociatorByHitsHelper.h"
@@ -23,57 +23,56 @@ namespace muonAssociatorByHitsDiagnostics {
 }
 
 class MuonAssociatorByHits {
-  
- public:
-  
-  MuonAssociatorByHits (const edm::ParameterSet& conf, edm::ConsumesCollector && iC);   
+public:
+  MuonAssociatorByHits(const edm::ParameterSet &conf, edm::ConsumesCollector &&iC);
   virtual ~MuonAssociatorByHits();
-  
-  // Originally from TrackAssociatorBase from where this class used to inherit from
-  reco::RecoToSimCollection associateRecoToSim(edm::Handle<edm::View<reco::Track> >& tCH,
-						       edm::Handle<TrackingParticleCollection>& tPCH,
-						       const edm::Event * event ,
-                                                       const edm::EventSetup * setup ) const {
+
+  // Originally from TrackAssociatorBase from where this class used to inherit
+  // from
+  reco::RecoToSimCollection associateRecoToSim(edm::Handle<edm::View<reco::Track>> &tCH,
+                                               edm::Handle<TrackingParticleCollection> &tPCH,
+                                               const edm::Event *event,
+                                               const edm::EventSetup *setup) const {
     edm::RefToBaseVector<reco::Track> tc;
-    for (unsigned int j=0; j<tCH->size();j++)
+    for (unsigned int j = 0; j < tCH->size(); j++)
       tc.push_back(tCH->refAt(j));
 
     edm::RefVector<TrackingParticleCollection> tpc(tPCH.id());
-    for (unsigned int j=0; j<tPCH->size();j++)
-      tpc.push_back(edm::Ref<TrackingParticleCollection>(tPCH,j));
+    for (unsigned int j = 0; j < tPCH->size(); j++)
+      tpc.push_back(edm::Ref<TrackingParticleCollection>(tPCH, j));
 
-    return associateRecoToSim(tc,tpc,event,setup);
+    return associateRecoToSim(tc, tpc, event, setup);
   }
 
-  virtual reco::SimToRecoCollection associateSimToReco(edm::Handle<edm::View<reco::Track> >& tCH,
-						       edm::Handle<TrackingParticleCollection>& tPCH,
-						       const edm::Event * event ,
-                                                       const edm::EventSetup * setup ) const {
+  virtual reco::SimToRecoCollection associateSimToReco(edm::Handle<edm::View<reco::Track>> &tCH,
+                                                       edm::Handle<TrackingParticleCollection> &tPCH,
+                                                       const edm::Event *event,
+                                                       const edm::EventSetup *setup) const {
     edm::RefToBaseVector<reco::Track> tc;
-    for (unsigned int j=0; j<tCH->size();j++)
+    for (unsigned int j = 0; j < tCH->size(); j++)
       tc.push_back(tCH->refAt(j));
 
     edm::RefVector<TrackingParticleCollection> tpc(tPCH.id());
-    for (unsigned int j=0; j<tPCH->size();j++)
-      tpc.push_back(edm::Ref<TrackingParticleCollection>(tPCH,j));
+    for (unsigned int j = 0; j < tPCH->size(); j++)
+      tpc.push_back(edm::Ref<TrackingParticleCollection>(tPCH, j));
 
-    return associateSimToReco(tc,tpc,event,setup);
+    return associateSimToReco(tc, tpc, event, setup);
   }
 
- 
   /* Associate SimTracks to RecoTracks By Hits */
   /// Association Reco To Sim with Collections
-  reco::RecoToSimCollection associateRecoToSim(const edm::RefToBaseVector<reco::Track>&,
-					       const edm::RefVector<TrackingParticleCollection>&,
-					       const edm::Event * event = nullptr, const edm::EventSetup * setup = nullptr) const;
-  
+  reco::RecoToSimCollection associateRecoToSim(const edm::RefToBaseVector<reco::Track> &,
+                                               const edm::RefVector<TrackingParticleCollection> &,
+                                               const edm::Event *event = nullptr,
+                                               const edm::EventSetup *setup = nullptr) const;
+
   /// Association Sim To Reco with Collections
-  reco::SimToRecoCollection associateSimToReco(const edm::RefToBaseVector<reco::Track>&,
-					       const edm::RefVector<TrackingParticleCollection>&,
-					       const edm::Event * event = nullptr, const edm::EventSetup * setup = nullptr) const;
+  reco::SimToRecoCollection associateSimToReco(const edm::RefToBaseVector<reco::Track> &,
+                                               const edm::RefVector<TrackingParticleCollection> &,
+                                               const edm::Event *event = nullptr,
+                                               const edm::EventSetup *setup = nullptr) const;
 
- 
- private:
+private:
   MuonAssociatorByHitsHelper helper_;
   edm::ParameterSet const conf_;
   TrackerHitAssociator::Config trackerHitAssociatorConfig_;
diff --git a/SimMuon/MCTruth/interface/MuonAssociatorByHitsHelper.h b/SimMuon/MCTruth/interface/MuonAssociatorByHitsHelper.h
index c4cfb51a61793..85ac17928d062 100644
--- a/SimMuon/MCTruth/interface/MuonAssociatorByHitsHelper.h
+++ b/SimMuon/MCTruth/interface/MuonAssociatorByHitsHelper.h
@@ -1,23 +1,23 @@
 #ifndef MuonAssociatorByHitsHelper_h
 #define MuonAssociatorByHitsHelper_h
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/Common/interface/Ref.h"
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
+#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
 #include "DataFormats/TrackReco/interface/Track.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
-#include "SimMuon/MCTruth/interface/DTHitAssociator.h"
+#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 #include "SimMuon/MCTruth/interface/CSCHitAssociator.h"
-#include "SimMuon/MCTruth/interface/RPCHitAssociator.h"
+#include "SimMuon/MCTruth/interface/DTHitAssociator.h"
 #include "SimMuon/MCTruth/interface/GEMHitAssociator.h"
+#include "SimMuon/MCTruth/interface/RPCHitAssociator.h"
 #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
-#include "SimDataFormats/Track/interface/SimTrackContainer.h"
-#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <functional>
@@ -25,68 +25,88 @@
 class TrackerTopology;
 
 class MuonAssociatorByHitsHelper {
-  
- public:
-  typedef std::pair <uint32_t, EncodedEventId> SimHitIdpr;
-  //typedef std::map<unsigned int, std::vector<SimHitIdpr> > MapOfMatchedIds;
-  typedef std::pair<unsigned int,std::vector<SimHitIdpr> > uint_SimHitIdpr_pair;
+public:
+  typedef std::pair<uint32_t, EncodedEventId> SimHitIdpr;
+  // typedef std::map<unsigned int, std::vector<SimHitIdpr> > MapOfMatchedIds;
+  typedef std::pair<unsigned int, std::vector<SimHitIdpr>> uint_SimHitIdpr_pair;
   typedef boost::ptr_vector<uint_SimHitIdpr_pair> MapOfMatchedIds;
-  typedef std::vector<std::pair<trackingRecHit_iterator, trackingRecHit_iterator> > TrackHitsCollection;
-  
-  MuonAssociatorByHitsHelper (const edm::ParameterSet& conf);   
+  typedef std::vector<std::pair<trackingRecHit_iterator, trackingRecHit_iterator>> TrackHitsCollection;
+
+  MuonAssociatorByHitsHelper(const edm::ParameterSet &conf);
 
   struct Resources {
-    TrackerTopology const* tTopo_;
-    TrackerHitAssociator const* trackerHitAssoc_;
-    CSCHitAssociator const* cscHitAssoc_;
-    DTHitAssociator const* dtHitAssoc_;
-    RPCHitAssociator const* rpcHitAssoc_;
-    GEMHitAssociator const* gemHitAssoc_;
-    std::function<void(const TrackHitsCollection&, const TrackingParticleCollection&)> diagnostics_;
+    TrackerTopology const *tTopo_;
+    TrackerHitAssociator const *trackerHitAssoc_;
+    CSCHitAssociator const *cscHitAssoc_;
+    DTHitAssociator const *dtHitAssoc_;
+    RPCHitAssociator const *rpcHitAssoc_;
+    GEMHitAssociator const *gemHitAssoc_;
+    std::function<void(const TrackHitsCollection &, const TrackingParticleCollection &)> diagnostics_;
   };
-  
- 
+
   struct IndexMatch {
-      IndexMatch(size_t index, double global_quality) : idx(index), quality(global_quality) {}
-      size_t idx; double quality; 
-      bool operator<(const IndexMatch &other) const { return other.quality < quality; } 
+    IndexMatch(size_t index, double global_quality) : idx(index), quality(global_quality) {}
+    size_t idx;
+    double quality;
+    bool operator<(const IndexMatch &other) const { return other.quality < quality; }
   };
-  typedef std::map<size_t, std::vector<IndexMatch> > IndexAssociation;
- 
-  IndexAssociation associateSimToRecoIndices(const TrackHitsCollection &, 
-                                             const edm::RefVector<TrackingParticleCollection>&,
-                                             Resources const&) const;
+  typedef std::map<size_t, std::vector<IndexMatch>> IndexAssociation;
 
-  IndexAssociation associateRecoToSimIndices(const TrackHitsCollection &, 
-                                             const edm::RefVector<TrackingParticleCollection>&,
-                                             Resources const&) const;
-  
+  IndexAssociation associateSimToRecoIndices(const TrackHitsCollection &,
+                                             const edm::RefVector<TrackingParticleCollection> &,
+                                             Resources const &) const;
 
+  IndexAssociation associateRecoToSimIndices(const TrackHitsCollection &,
+                                             const edm::RefVector<TrackingParticleCollection> &,
+                                             Resources const &) const;
 
- private:
-  void getMatchedIds
-    (MapOfMatchedIds & tracker_matchedIds_valid, MapOfMatchedIds & muon_matchedIds_valid,
-     MapOfMatchedIds & tracker_matchedIds_INVALID, MapOfMatchedIds & muon_matchedIds_INVALID,
-     int& n_tracker_valid, int& n_dt_valid, int& n_csc_valid, int& n_rpc_valid, int& n_gem_valid,
-     int& n_tracker_matched_valid, int& n_dt_matched_valid, int& n_csc_matched_valid, int& n_rpc_matched_valid, int& n_gem_matched_valid,
-     int& n_tracker_INVALID, int& n_dt_INVALID, int& n_csc_INVALID, int& n_rpc_INVALID, int& n_gem_INVALID,
-     int& n_tracker_matched_INVALID, int& n_dt_matched_INVALID, int& n_csc_matched_INVALID, int& n_rpc_matched_INVALID, int& n_gem_matched_INVALID,
-     trackingRecHit_iterator begin, trackingRecHit_iterator end,
-     const TrackerHitAssociator* trackertruth, const DTHitAssociator& dttruth, const CSCHitAssociator& csctruth, const RPCHitAssociator& rpctruth, const GEMHitAssociator& gemtruth,
-     bool printRts, const TrackerTopology *) const;
-  
-  int getShared(MapOfMatchedIds & matchedIds, TrackingParticleCollection::const_iterator trpart) const;
+private:
+  void getMatchedIds(MapOfMatchedIds &tracker_matchedIds_valid,
+                     MapOfMatchedIds &muon_matchedIds_valid,
+                     MapOfMatchedIds &tracker_matchedIds_INVALID,
+                     MapOfMatchedIds &muon_matchedIds_INVALID,
+                     int &n_tracker_valid,
+                     int &n_dt_valid,
+                     int &n_csc_valid,
+                     int &n_rpc_valid,
+                     int &n_gem_valid,
+                     int &n_tracker_matched_valid,
+                     int &n_dt_matched_valid,
+                     int &n_csc_matched_valid,
+                     int &n_rpc_matched_valid,
+                     int &n_gem_matched_valid,
+                     int &n_tracker_INVALID,
+                     int &n_dt_INVALID,
+                     int &n_csc_INVALID,
+                     int &n_rpc_INVALID,
+                     int &n_gem_INVALID,
+                     int &n_tracker_matched_INVALID,
+                     int &n_dt_matched_INVALID,
+                     int &n_csc_matched_INVALID,
+                     int &n_rpc_matched_INVALID,
+                     int &n_gem_matched_INVALID,
+                     trackingRecHit_iterator begin,
+                     trackingRecHit_iterator end,
+                     const TrackerHitAssociator *trackertruth,
+                     const DTHitAssociator &dttruth,
+                     const CSCHitAssociator &csctruth,
+                     const RPCHitAssociator &rpctruth,
+                     const GEMHitAssociator &gemtruth,
+                     bool printRts,
+                     const TrackerTopology *) const;
 
-  const bool includeZeroHitMuons;    
+  int getShared(MapOfMatchedIds &matchedIds, TrackingParticleCollection::const_iterator trpart) const;
+
+  const bool includeZeroHitMuons;
   const bool acceptOneStubMatchings;
   bool UseTracker;
   bool UseMuon;
   const bool AbsoluteNumberOfHits_track;
-  unsigned int NHitCut_track;    
+  unsigned int NHitCut_track;
   double EfficiencyCut_track;
   double PurityCut_track;
   const bool AbsoluteNumberOfHits_muon;
-  unsigned int NHitCut_muon;    
+  unsigned int NHitCut_muon;
   double EfficiencyCut_muon;
   double PurityCut_muon;
   const bool UsePixels;
@@ -95,12 +115,11 @@ class MuonAssociatorByHitsHelper {
   const bool ThreeHitTracksAreSpecial;
   const bool dumpDT;
 
-  int LayerFromDetid(const DetId&) const;
-  const TrackingRecHit* getHitPtr(edm::OwnVector<TrackingRecHit>::const_iterator iter) const {return &*iter;}
-  const TrackingRecHit* getHitPtr(const trackingRecHit_iterator& iter) const {return &**iter;}
-
-  std::string write_matched_simtracks(const std::vector<SimHitIdpr>&) const;
+  int LayerFromDetid(const DetId &) const;
+  const TrackingRecHit *getHitPtr(edm::OwnVector<TrackingRecHit>::const_iterator iter) const { return &*iter; }
+  const TrackingRecHit *getHitPtr(const trackingRecHit_iterator &iter) const { return &**iter; }
 
+  std::string write_matched_simtracks(const std::vector<SimHitIdpr> &) const;
 };
 
 #endif
diff --git a/SimMuon/MCTruth/interface/MuonToSimAssociatorBase.h b/SimMuon/MCTruth/interface/MuonToSimAssociatorBase.h
index 94bab9175e0ca..ea641728df1ec 100644
--- a/SimMuon/MCTruth/interface/MuonToSimAssociatorBase.h
+++ b/SimMuon/MCTruth/interface/MuonToSimAssociatorBase.h
@@ -1,46 +1,49 @@
 #ifndef MuonToSimAssociatorBase_h
 #define MuonToSimAssociatorBase_h
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/Common/interface/Ref.h"
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 
-
 class TrackerTopology;
 
-class MuonToSimAssociatorBase  {
-  
- public:
-  
-  MuonToSimAssociatorBase ();
+class MuonToSimAssociatorBase {
+public:
+  MuonToSimAssociatorBase();
   virtual ~MuonToSimAssociatorBase();
-  
+
   enum MuonTrackType { InnerTk, OuterTk, GlobalTk, Segments };
 
-  struct RefToBaseSort { 
-    template<typename T> bool operator()(const edm::RefToBase<T> &r1, const edm::RefToBase<T> &r2) const { 
-        return (r1.id() == r2.id() ? r1.key() < r2.key() : r1.id() < r2.id()); 
+  struct RefToBaseSort {
+    template <typename T>
+    bool operator()(const edm::RefToBase<T> &r1, const edm::RefToBase<T> &r2) const {
+      return (r1.id() == r2.id() ? r1.key() < r2.key() : r1.id() < r2.id());
     }
   };
-  typedef std::map<edm::RefToBase<reco::Muon>, std::vector<std::pair<TrackingParticleRef, double> >, RefToBaseSort> MuonToSimCollection;
-  typedef std::map<TrackingParticleRef, std::vector<std::pair<edm::RefToBase<reco::Muon>, double> > >               SimToMuonCollection;
-
-
-  virtual void associateMuons(MuonToSimCollection & recoToSim, SimToMuonCollection & simToReco,
-                              const edm::RefToBaseVector<reco::Muon> &, MuonTrackType ,
-                              const edm::RefVector<TrackingParticleCollection>&,
-                              const edm::Event * event = nullptr, const edm::EventSetup * setup = nullptr) const = 0; 
-
-  virtual void associateMuons(MuonToSimCollection & recoToSim, SimToMuonCollection & simToReco,
-                              const edm::Handle<edm::View<reco::Muon> > &, MuonTrackType , 
-                              const edm::Handle<TrackingParticleCollection>&,
-                              const edm::Event * event = nullptr, const edm::EventSetup * setup = nullptr) const = 0;
-
+  typedef std::map<edm::RefToBase<reco::Muon>, std::vector<std::pair<TrackingParticleRef, double>>, RefToBaseSort>
+      MuonToSimCollection;
+  typedef std::map<TrackingParticleRef, std::vector<std::pair<edm::RefToBase<reco::Muon>, double>>> SimToMuonCollection;
+
+  virtual void associateMuons(MuonToSimCollection &recoToSim,
+                              SimToMuonCollection &simToReco,
+                              const edm::RefToBaseVector<reco::Muon> &,
+                              MuonTrackType,
+                              const edm::RefVector<TrackingParticleCollection> &,
+                              const edm::Event *event = nullptr,
+                              const edm::EventSetup *setup = nullptr) const = 0;
+
+  virtual void associateMuons(MuonToSimCollection &recoToSim,
+                              SimToMuonCollection &simToReco,
+                              const edm::Handle<edm::View<reco::Muon>> &,
+                              MuonTrackType,
+                              const edm::Handle<TrackingParticleCollection> &,
+                              const edm::Event *event = nullptr,
+                              const edm::EventSetup *setup = nullptr) const = 0;
 };
 
 #endif
diff --git a/SimMuon/MCTruth/interface/MuonToSimAssociatorByHits.h b/SimMuon/MCTruth/interface/MuonToSimAssociatorByHits.h
index d1a71c8d5c92a..82c76c9a4e8d6 100644
--- a/SimMuon/MCTruth/interface/MuonToSimAssociatorByHits.h
+++ b/SimMuon/MCTruth/interface/MuonToSimAssociatorByHits.h
@@ -1,38 +1,38 @@
 #ifndef MuonToSimAssociatorByHits_h
 #define MuonToSimAssociatorByHits_h
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "SimMuon/MCTruth/interface/MuonToSimAssociatorBase.h"
 
 #include "SimMuon/MCTruth/interface/MuonAssociatorByHitsHelper.h"
 #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
 
 class MuonToSimAssociatorByHits : public MuonToSimAssociatorBase {
-  
- public:
-  
-  MuonToSimAssociatorByHits (const edm::ParameterSet& conf, edm::ConsumesCollector && iC);   
+public:
+  MuonToSimAssociatorByHits(const edm::ParameterSet &conf, edm::ConsumesCollector &&iC);
   ~MuonToSimAssociatorByHits() override;
 
-
-
-  void associateMuons(MuonToSimCollection & recoToSim, SimToMuonCollection & simToReco,
-                      const edm::RefToBaseVector<reco::Muon> &, MuonTrackType ,
-                      const edm::RefVector<TrackingParticleCollection>&,
-                      const edm::Event * event = nullptr, const edm::EventSetup * setup = nullptr) const override ; 
-
-  void associateMuons(MuonToSimCollection & recoToSim, SimToMuonCollection & simToReco,
-                      const edm::Handle<edm::View<reco::Muon> > &, MuonTrackType , 
-                      const edm::Handle<TrackingParticleCollection>&,
-                      const edm::Event * event = nullptr, const edm::EventSetup * setup = nullptr) const override;
-
- private:
-
+  void associateMuons(MuonToSimCollection &recoToSim,
+                      SimToMuonCollection &simToReco,
+                      const edm::RefToBaseVector<reco::Muon> &,
+                      MuonTrackType,
+                      const edm::RefVector<TrackingParticleCollection> &,
+                      const edm::Event *event = nullptr,
+                      const edm::EventSetup *setup = nullptr) const override;
+
+  void associateMuons(MuonToSimCollection &recoToSim,
+                      SimToMuonCollection &simToReco,
+                      const edm::Handle<edm::View<reco::Muon>> &,
+                      MuonTrackType,
+                      const edm::Handle<TrackingParticleCollection> &,
+                      const edm::Event *event = nullptr,
+                      const edm::EventSetup *setup = nullptr) const override;
+
+private:
   MuonAssociatorByHitsHelper helper_;
   edm::ParameterSet const conf_;
   TrackerHitAssociator::Config trackerHitAssociatorConfig_;
-
 };
 
 #endif
diff --git a/SimMuon/MCTruth/interface/MuonTruth.h b/SimMuon/MCTruth/interface/MuonTruth.h
index 10205120a2a11..96c0850205153 100644
--- a/SimMuon/MCTruth/interface/MuonTruth.h
+++ b/SimMuon/MCTruth/interface/MuonTruth.h
@@ -1,42 +1,41 @@
 #ifndef MCTruth_MuonTruth_h
 #define MCTruth_MuonTruth_h
 
-#include "DataFormats/CSCRecHit/interface/CSCRecHit2D.h"
+#include "CondFormats/CSCObjects/interface/CSCBadChambers.h"
+#include "CondFormats/DataRecord/interface/CSCBadChambersRcd.h"
 #include "DataFormats/CSCDigi/interface/CSCStripDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCWireDigi.h"
-#include "SimDataFormats/Track/interface/SimTrackContainer.h"
+#include "DataFormats/CSCRecHit/interface/CSCRecHit2D.h"
+#include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/Common/interface/DetSetVector.h"
-#include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
-#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 #include "Geometry/CSCGeometry/interface/CSCLayerGeometry.h"
-#include "CondFormats/CSCObjects/interface/CSCBadChambers.h"
-#include "CondFormats/DataRecord/interface/CSCBadChambersRcd.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
+#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
+#include "SimDataFormats/Track/interface/SimTrackContainer.h"
+#include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-class MuonTruth
-{
+class MuonTruth {
 public:
   typedef edm::DetSetVector<StripDigiSimLink> DigiSimLinks;
   typedef edm::DetSetVector<StripDigiSimLink> WireDigiSimLinks;
   typedef edm::DetSet<StripDigiSimLink> LayerLinks;
-  typedef std::pair <uint32_t, EncodedEventId> SimHitIdpr;
+  typedef std::pair<uint32_t, EncodedEventId> SimHitIdpr;
 
-  MuonTruth(const edm::Event&, const edm::EventSetup&, const edm::ParameterSet&); 
-  MuonTruth(const edm::ParameterSet&, edm::ConsumesCollector && iC);
- 
-  void initEvent(const edm::Event &, const edm::EventSetup& );
+  MuonTruth(const edm::Event &, const edm::EventSetup &, const edm::ParameterSet &);
+  MuonTruth(const edm::ParameterSet &, edm::ConsumesCollector &&iC);
 
-  void analyze(const CSCRecHit2D & recHit);
-  void analyze(const CSCStripDigi & stripDigi, int rawDetIdCorrespondingToCSCLayer);
-  void analyze(const CSCWireDigi & wireDigi  , int rawDetIdCorrespondingToCSCLayer);
+  void initEvent(const edm::Event &, const edm::EventSetup &);
+
+  void analyze(const CSCRecHit2D &recHit);
+  void analyze(const CSCStripDigi &stripDigi, int rawDetIdCorrespondingToCSCLayer);
+  void analyze(const CSCWireDigi &wireDigi, int rawDetIdCorrespondingToCSCLayer);
 
   /// analyze() must be called before any of the following
   float muonFraction();
@@ -45,23 +44,22 @@ class MuonTruth
 
   std::vector<PSimHit> simHits();
 
-  const CSCBadChambers* cscBadChambers;
+  const CSCBadChambers *cscBadChambers;
 
 private:
-
-  std::vector<PSimHit> hitsFromSimTrack(SimHitIdpr truthId) ;
+  std::vector<PSimHit> hitsFromSimTrack(SimHitIdpr truthId);
   // goes to SimHits for information
   int particleType(SimHitIdpr truthId);
 
-  void addChannel(const LayerLinks &layerLinks, int channel, float weight=1.);
+  void addChannel(const LayerLinks &layerLinks, int channel, float weight = 1.);
 
   std::map<SimHitIdpr, float> theChargeMap;
   float theTotalCharge;
 
   unsigned int theDetId;
 
-  const DigiSimLinks  * theDigiSimLinks;
-  const DigiSimLinks  * theWireDigiSimLinks;
+  const DigiSimLinks *theDigiSimLinks;
+  const DigiSimLinks *theWireDigiSimLinks;
 
   edm::InputTag linksTag;
   edm::InputTag wireLinksTag;
@@ -72,7 +70,7 @@ class MuonTruth
 
   std::map<unsigned int, edm::PSimHitContainer> theSimHitMap;
 
-  const CSCGeometry* cscgeom;
+  const CSCGeometry *cscgeom;
 };
 
 #endif
diff --git a/SimMuon/MCTruth/interface/PSimHitMap.h b/SimMuon/MCTruth/interface/PSimHitMap.h
index b720d371ddca0..75adf20caa3e6 100644
--- a/SimMuon/MCTruth/interface/PSimHitMap.h
+++ b/SimMuon/MCTruth/interface/PSimHitMap.h
@@ -1,33 +1,30 @@
 #ifndef MCTruth_PSimHitMap_h
 #define MCTruth_PSimHitMap_h
 
-#include "FWCore/Utilities/interface/InputTag.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
-#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 #include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include <map>
 
-class PSimHitMap
-{
- public:
-  PSimHitMap(const edm::InputTag & iT, edm::ConsumesCollector && iC)
-    :  theMap(), theEmptyContainer()
-  {
-    sh_token = iC.consumes<CrossingFrame<PSimHit> >(iT);
+class PSimHitMap {
+public:
+  PSimHitMap(const edm::InputTag &iT, edm::ConsumesCollector &&iC) : theMap(), theEmptyContainer() {
+    sh_token = iC.consumes<CrossingFrame<PSimHit>>(iT);
   }
 
-  void fill(const edm::Event & e);
+  void fill(const edm::Event &e);
 
-  const edm::PSimHitContainer & hits(int detId) const;
+  const edm::PSimHitContainer &hits(int detId) const;
 
   std::vector<int> detsWithHits() const;
 
- private:
+private:
   std::map<int, edm::PSimHitContainer> theMap;
   edm::PSimHitContainer theEmptyContainer;
   //  edm::InputTag simHitsTag;
-  edm::EDGetTokenT<CrossingFrame<PSimHit> > sh_token;
+  edm::EDGetTokenT<CrossingFrame<PSimHit>> sh_token;
 };
 
 #endif
diff --git a/SimMuon/MCTruth/interface/RPCHitAssociator.h b/SimMuon/MCTruth/interface/RPCHitAssociator.h
index 95f87304fafa9..f12eb9a67ee00 100644
--- a/SimMuon/MCTruth/interface/RPCHitAssociator.h
+++ b/SimMuon/MCTruth/interface/RPCHitAssociator.h
@@ -1,71 +1,65 @@
 #ifndef MCTruth_RPCHitAssociator_h
 #define MCTruth_RPCHitAssociator_h
 
-#include "FWCore/Framework/interface/Event.h"
+#include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/MuonDetId/interface/RPCDetId.h"
+#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
+#include "SimDataFormats/RPCDigiSimLink/interface/RPCDigiSimLink.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
-#include "DataFormats/MuonDetId/interface/RPCDetId.h"
-#include "SimDataFormats/RPCDigiSimLink/interface/RPCDigiSimLink.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 
-#include <vector>
 #include <map>
-#include <string>
 #include <set>
+#include <string>
+#include <vector>
 
-#include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
-#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
+#include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
 #include "DataFormats/RPCDigi/interface/RPCDigiCollection.h"
 #include "DataFormats/RPCRecHit/interface/RPCRecHitCollection.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Geometry/RPCGeometry/interface/RPCGeometry.h"
-#include "DataFormats/Common/interface/DetSetVector.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
+#include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
+#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 
 class RPCHitAssociator {
-
- public:
-   typedef edm::DetSetVector<RPCDigiSimLink> RPCDigiSimLinks;
-   typedef std::pair<uint32_t, EncodedEventId> SimHitIdpr;
+public:
+  typedef edm::DetSetVector<RPCDigiSimLink> RPCDigiSimLinks;
+  typedef std::pair<uint32_t, EncodedEventId> SimHitIdpr;
 
   // Constructor with configurable parameters
-   RPCHitAssociator(const edm::ParameterSet&, edm::ConsumesCollector && ic); 
-   RPCHitAssociator(const edm::Event& e, const edm::EventSetup& eventSetup, const edm::ParameterSet& conf );
+  RPCHitAssociator(const edm::ParameterSet &, edm::ConsumesCollector &&ic);
+  RPCHitAssociator(const edm::Event &e, const edm::EventSetup &eventSetup, const edm::ParameterSet &conf);
 
-   void initEvent(const edm::Event&, const edm::EventSetup&);
-  
-  // Destructor
-  ~RPCHitAssociator(){}
+  void initEvent(const edm::Event &, const edm::EventSetup &);
 
-   std::vector<SimHitIdpr> associateRecHit(const TrackingRecHit & hit) const;
-   std::set<RPCDigiSimLink> findRPCDigiSimLink(uint32_t rpcDetId, int strip, int bx) const;
-   //   const PSimHit* linkToSimHit(RPCDigiSimLink link);
+  // Destructor
+  ~RPCHitAssociator() {}
 
+  std::vector<SimHitIdpr> associateRecHit(const TrackingRecHit &hit) const;
+  std::set<RPCDigiSimLink> findRPCDigiSimLink(uint32_t rpcDetId, int strip, int bx) const;
+  //   const PSimHit* linkToSimHit(RPCDigiSimLink link);
 
- private:
-   edm::Handle< edm::DetSetVector<RPCDigiSimLink> > _thelinkDigis;
-   edm::InputTag RPCdigisimlinkTag;
- 
-   bool crossingframe;
-   edm::InputTag RPCsimhitsTag;
-   edm::InputTag RPCsimhitsXFTag;
+private:
+  edm::Handle<edm::DetSetVector<RPCDigiSimLink>> _thelinkDigis;
+  edm::InputTag RPCdigisimlinkTag;
 
-   edm::EDGetTokenT<CrossingFrame<PSimHit> > RPCsimhitsXFToken_;
-   edm::EDGetTokenT<edm::PSimHitContainer> RPCsimhitsToken_;
-   edm::EDGetTokenT<edm::DetSetVector<RPCDigiSimLink> > RPCdigisimlinkToken_; 
+  bool crossingframe;
+  edm::InputTag RPCsimhitsTag;
+  edm::InputTag RPCsimhitsXFTag;
 
-   std::map<unsigned int, edm::PSimHitContainer> _SimHitMap;
+  edm::EDGetTokenT<CrossingFrame<PSimHit>> RPCsimhitsXFToken_;
+  edm::EDGetTokenT<edm::PSimHitContainer> RPCsimhitsToken_;
+  edm::EDGetTokenT<edm::DetSetVector<RPCDigiSimLink>> RPCdigisimlinkToken_;
 
- };
+  std::map<unsigned int, edm::PSimHitContainer> _SimHitMap;
+};
 
 #endif
-
-
-
diff --git a/SimMuon/MCTruth/interface/TrackerMuonHitExtractor.h b/SimMuon/MCTruth/interface/TrackerMuonHitExtractor.h
index 29fa117bd1f5f..4acf278b5009f 100644
--- a/SimMuon/MCTruth/interface/TrackerMuonHitExtractor.h
+++ b/SimMuon/MCTruth/interface/TrackerMuonHitExtractor.h
@@ -1,36 +1,37 @@
 //
 // modified & integrated by Giovanni Abbiendi
-// from code by Arun Luthra: UserCode/luthra/MuonTrackSelector/src/MuonTrackSelector.cc
+// from code by Arun Luthra:
+// UserCode/luthra/MuonTrackSelector/src/MuonTrackSelector.cc
 //
 #ifndef MCTruth_TrackerMuonHitExtractor_h
 #define MCTruth_TrackerMuonHitExtractor_h
 
-#include <memory>
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/MuonReco/interface/MuonFwd.h"
-#include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/CSCRecHit/interface/CSCSegmentCollection.h"
 #include "DataFormats/DTRecHit/interface/DTRecSegment4DCollection.h"
+#include "DataFormats/MuonReco/interface/Muon.h"
+#include "DataFormats/MuonReco/interface/MuonFwd.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <memory>
 
 class TrackerMuonHitExtractor {
-  public:
-    explicit TrackerMuonHitExtractor(const edm::ParameterSet&, edm::ConsumesCollector && ic);
-    explicit TrackerMuonHitExtractor(const edm::ParameterSet& );
-    ~TrackerMuonHitExtractor();
+public:
+  explicit TrackerMuonHitExtractor(const edm::ParameterSet &, edm::ConsumesCollector &&ic);
+  explicit TrackerMuonHitExtractor(const edm::ParameterSet &);
+  ~TrackerMuonHitExtractor();
 
-    void init(const edm::Event&, const edm::EventSetup&);
-    std::vector<const TrackingRecHit *> getMuonHits(const reco::Muon &mu) const ;
-  private:
-    edm::Handle<DTRecSegment4DCollection> dtSegmentCollectionH_;
-    edm::Handle<CSCSegmentCollection> cscSegmentCollectionH_;
+  void init(const edm::Event &, const edm::EventSetup &);
+  std::vector<const TrackingRecHit *> getMuonHits(const reco::Muon &mu) const;
 
-    edm::EDGetTokenT<DTRecSegment4DCollection> inputDTRecSegment4DToken_;
-    edm::EDGetTokenT<CSCSegmentCollection> inputCSCSegmentToken_;
-    edm::InputTag inputDTRecSegment4DCollection_;
-    edm::InputTag inputCSCSegmentCollection_;
+private:
+  edm::Handle<DTRecSegment4DCollection> dtSegmentCollectionH_;
+  edm::Handle<CSCSegmentCollection> cscSegmentCollectionH_;
 
+  edm::EDGetTokenT<DTRecSegment4DCollection> inputDTRecSegment4DToken_;
+  edm::EDGetTokenT<CSCSegmentCollection> inputCSCSegmentToken_;
+  edm::InputTag inputDTRecSegment4DCollection_;
+  edm::InputTag inputCSCSegmentCollection_;
 };
 
 #endif
diff --git a/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.cc b/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.cc
index 8fb44a300a5f0..bd08c2ad034e6 100644
--- a/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.cc
+++ b/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.cc
@@ -1,26 +1,24 @@
-#include <memory>
-#include "SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.h"
+#include <memory>
 
-MuonAssociatorEDProducer::MuonAssociatorEDProducer(const edm::ParameterSet& parset):
-  tracksTag(parset.getParameter< edm::InputTag >("tracksTag")),
-  tpTag(parset.getParameter< edm::InputTag >("tpTag")),
-  ignoreMissingTrackCollection(parset.getUntrackedParameter<bool>("ignoreMissingTrackCollection",false)),
-  parset_(parset)
-{
-  
+MuonAssociatorEDProducer::MuonAssociatorEDProducer(const edm::ParameterSet &parset)
+    : tracksTag(parset.getParameter<edm::InputTag>("tracksTag")),
+      tpTag(parset.getParameter<edm::InputTag>("tpTag")),
+      ignoreMissingTrackCollection(parset.getUntrackedParameter<bool>("ignoreMissingTrackCollection", false)),
+      parset_(parset) {
   edm::LogVerbatim("MuonAssociatorEDProducer") << "constructing  MuonAssociatorEDProducer";
   produces<reco::RecoToSimCollection>();
   produces<reco::SimToRecoCollection>();
-  tpToken_=consumes<TrackingParticleCollection>(tpTag);
-  tracksToken_=consumes<edm::View<reco::Track> >(tracksTag);
+  tpToken_ = consumes<TrackingParticleCollection>(tpTag);
+  tracksToken_ = consumes<edm::View<reco::Track>>(tracksTag);
 
   /// Perform some sanity checks of the configuration
   LogTrace("MuonAssociatorEDProducer") << "constructing  MuonAssociatorByHits" << parset_.dump();
-  edm::LogVerbatim("MuonAssociatorEDProducer") << "\n MuonAssociatorByHits will associate reco::Tracks with "<<tracksTag
-					   << "\n\t\t and TrackingParticles with "<<tpTag;
+  edm::LogVerbatim("MuonAssociatorEDProducer") << "\n MuonAssociatorByHits will associate reco::Tracks with "
+                                               << tracksTag << "\n\t\t and TrackingParticles with " << tpTag;
   const std::string recoTracksLabel = tracksTag.label();
   const std::string recoTracksInstance = tracksTag.instance();
 
@@ -29,92 +27,97 @@ MuonAssociatorEDProducer::MuonAssociatorEDProducer(const edm::ParameterSet& pars
   if (recoTracksLabel == "standAloneMuons" || recoTracksLabel == "standAloneSETMuons" ||
       recoTracksLabel == "cosmicMuons" || recoTracksLabel == "hltL2Muons") {
     if (parset_.getParameter<bool>("UseTracker")) {
-      edm::LogWarning("MuonAssociatorEDProducer") 
-	<<"\n*** WARNING : inconsistent input tracksTag = "<<tracksTag
-	<<"\n with UseTracker = true"<<"\n ---> setting UseTracker = false ";
-      parset_.addParameter<bool>("UseTracker",false);
+      edm::LogWarning("MuonAssociatorEDProducer")
+          << "\n*** WARNING : inconsistent input tracksTag = " << tracksTag << "\n with UseTracker = true"
+          << "\n ---> setting UseTracker = false ";
+      parset_.addParameter<bool>("UseTracker", false);
     }
     if (!parset_.getParameter<bool>("UseMuon")) {
-      edm::LogWarning("MuonAssociatorEDProducer") 
-	<<"\n*** WARNING : inconsistent input tracksTag = "<<tracksTag
-	<<"\n with UseMuon = false"<<"\n ---> setting UseMuon = true ";
-      parset_.addParameter<bool>("UseMuon",true);
+      edm::LogWarning("MuonAssociatorEDProducer")
+          << "\n*** WARNING : inconsistent input tracksTag = " << tracksTag << "\n with UseMuon = false"
+          << "\n ---> setting UseMuon = true ";
+      parset_.addParameter<bool>("UseMuon", true);
     }
   }
   // tracks with hits only on tracker
   if (recoTracksLabel == "generalTracks" || recoTracksLabel == "ctfWithMaterialTracksP5LHCNavigation" ||
-      recoTracksLabel == "hltL3TkTracksFromL2" || 
+      recoTracksLabel == "hltL3TkTracksFromL2" ||
       (recoTracksLabel == "hltL3Muons" && recoTracksInstance == "L2Seeded")) {
     if (parset_.getParameter<bool>("UseMuon")) {
-      edm::LogWarning("MuonAssociatorEDProducer") 
-	<<"\n*** WARNING : inconsistent input tracksTag = "<<tracksTag
-	<<"\n with UseMuon = true"<<"\n ---> setting UseMuon = false ";
-      parset_.addParameter<bool>("UseMuon",false);
+      edm::LogWarning("MuonAssociatorEDProducer")
+          << "\n*** WARNING : inconsistent input tracksTag = " << tracksTag << "\n with UseMuon = true"
+          << "\n ---> setting UseMuon = false ";
+      parset_.addParameter<bool>("UseMuon", false);
     }
     if (!parset_.getParameter<bool>("UseTracker")) {
-      edm::LogWarning("MuonAssociatorEDProducer") 
-	<<"\n*** WARNING : inconsistent input tracksTag = "<<tracksTag
-	<<"\n with UseTracker = false"<<"\n ---> setting UseTracker = true ";
-      parset_.addParameter<bool>("UseTracker",true);
+      edm::LogWarning("MuonAssociatorEDProducer")
+          << "\n*** WARNING : inconsistent input tracksTag = " << tracksTag << "\n with UseTracker = false"
+          << "\n ---> setting UseTracker = true ";
+      parset_.addParameter<bool>("UseTracker", true);
     }
   }
 
-  LogTrace("MuonAssociatorEDProducer") << "MuonAssociatorEDProducer::beginJob : constructing MuonAssociatorByHits";
-  associatorByHits = new MuonAssociatorByHits(parset_,consumesCollector());
+  LogTrace("MuonAssociatorEDProducer") << "MuonAssociatorEDProducer::beginJob "
+                                          ": constructing MuonAssociatorByHits";
+  associatorByHits = new MuonAssociatorByHits(parset_, consumesCollector());
 }
 
 MuonAssociatorEDProducer::~MuonAssociatorEDProducer() {}
 
-void MuonAssociatorEDProducer::beginJob() {
-}
+void MuonAssociatorEDProducer::beginJob() {}
 
 void MuonAssociatorEDProducer::endJob() {}
 
-void MuonAssociatorEDProducer::produce(edm::Event& event, const edm::EventSetup& setup) {
-   using namespace edm;
-
-   Handle<TrackingParticleCollection>  TPCollection ;
-   LogTrace("MuonAssociatorEDProducer") <<"getting TrackingParticle collection - "<<tpTag;
-   event.getByToken(tpToken_, TPCollection);
-   LogTrace("MuonAssociatorEDProducer") <<"\t... size = "<<TPCollection->size();
-
-   Handle<edm::View<reco::Track> > trackCollection;
-   LogTrace("MuonAssociatorEDProducer") <<"getting reco::Track collection - "<<tracksTag;
-   bool trackAvailable = event.getByToken (tracksToken_, trackCollection);
-   if (trackAvailable) LogTrace("MuonAssociatorEDProducer") <<"\t... size = "<<trackCollection->size();
-   else LogTrace("MuonAssociatorEDProducer") <<"\t... NOT FOUND.";
-
-   std::unique_ptr<reco::RecoToSimCollection> rts;
-   std::unique_ptr<reco::SimToRecoCollection> str;
-
-   if (ignoreMissingTrackCollection && !trackAvailable) {
-     //the track collection is not in the event and we're being told to ignore this.
-     //do not output anything to the event, other wise this would be considered as inefficiency.
-     LogTrace("MuonAssociatorEDProducer") << "\n ignoring missing track collection." << "\n";
-   }   
-   else {
-     edm::LogVerbatim("MuonAssociatorEDProducer") 
-       <<"\n >>> RecoToSim association <<< \n"
-       <<"     Track collection : "
-       <<tracksTag.label()<<":"<<tracksTag.instance()<<" (size = "<<trackCollection->size()<<") \n"
-       <<"     TrackingParticle collection : "
-       <<tpTag.label()<<":"<<tpTag.instance()<<" (size = "<<TPCollection->size()<<")";
-     
-     reco::RecoToSimCollection recSimColl = associatorByHits->associateRecoToSim(trackCollection,TPCollection,&event,&setup);
-     
-     edm::LogVerbatim("MuonAssociatorEDProducer") 
-       <<"\n >>> SimToReco association <<< \n"
-       <<"     TrackingParticle collection : "
-       <<tpTag.label()<<":"<<tpTag.instance()<<" (size = "<<TPCollection->size()<<") \n"
-       <<"     Track collection : "
-       <<tracksTag.label()<<":"<<tracksTag.instance()<<" (size = "<<trackCollection->size()<<")";
-     
-     reco::SimToRecoCollection simRecColl = associatorByHits->associateSimToReco(trackCollection,TPCollection,&event,&setup);
-     
-     rts.reset(new reco::RecoToSimCollection(recSimColl));
-     str.reset(new reco::SimToRecoCollection(simRecColl));
-     
-     event.put(std::move(rts));
-     event.put(std::move(str));
-   }
+void MuonAssociatorEDProducer::produce(edm::Event &event, const edm::EventSetup &setup) {
+  using namespace edm;
+
+  Handle<TrackingParticleCollection> TPCollection;
+  LogTrace("MuonAssociatorEDProducer") << "getting TrackingParticle collection - " << tpTag;
+  event.getByToken(tpToken_, TPCollection);
+  LogTrace("MuonAssociatorEDProducer") << "\t... size = " << TPCollection->size();
+
+  Handle<edm::View<reco::Track>> trackCollection;
+  LogTrace("MuonAssociatorEDProducer") << "getting reco::Track collection - " << tracksTag;
+  bool trackAvailable = event.getByToken(tracksToken_, trackCollection);
+  if (trackAvailable)
+    LogTrace("MuonAssociatorEDProducer") << "\t... size = " << trackCollection->size();
+  else
+    LogTrace("MuonAssociatorEDProducer") << "\t... NOT FOUND.";
+
+  std::unique_ptr<reco::RecoToSimCollection> rts;
+  std::unique_ptr<reco::SimToRecoCollection> str;
+
+  if (ignoreMissingTrackCollection && !trackAvailable) {
+    // the track collection is not in the event and we're being told to ignore
+    // this. do not output anything to the event, other wise this would be
+    // considered as inefficiency.
+    LogTrace("MuonAssociatorEDProducer") << "\n ignoring missing track collection."
+                                         << "\n";
+  } else {
+    edm::LogVerbatim("MuonAssociatorEDProducer")
+        << "\n >>> RecoToSim association <<< \n"
+        << "     Track collection : " << tracksTag.label() << ":" << tracksTag.instance()
+        << " (size = " << trackCollection->size() << ") \n"
+        << "     TrackingParticle collection : " << tpTag.label() << ":" << tpTag.instance()
+        << " (size = " << TPCollection->size() << ")";
+
+    reco::RecoToSimCollection recSimColl =
+        associatorByHits->associateRecoToSim(trackCollection, TPCollection, &event, &setup);
+
+    edm::LogVerbatim("MuonAssociatorEDProducer")
+        << "\n >>> SimToReco association <<< \n"
+        << "     TrackingParticle collection : " << tpTag.label() << ":" << tpTag.instance()
+        << " (size = " << TPCollection->size() << ") \n"
+        << "     Track collection : " << tracksTag.label() << ":" << tracksTag.instance()
+        << " (size = " << trackCollection->size() << ")";
+
+    reco::SimToRecoCollection simRecColl =
+        associatorByHits->associateSimToReco(trackCollection, TPCollection, &event, &setup);
+
+    rts.reset(new reco::RecoToSimCollection(recSimColl));
+    str.reset(new reco::SimToRecoCollection(simRecColl));
+
+    event.put(std::move(rts));
+    event.put(std::move(str));
+  }
 }
diff --git a/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.h b/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.h
index 4bd51cca16cba..4f6c8447531a1 100644
--- a/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.h
+++ b/SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.h
@@ -1,33 +1,33 @@
 #ifndef MCTruth_MuonAssociatorEDProducer_h
 #define MCTruth_MuonAssociatorEDProducer_h
 
-#include <memory>
-#include "FWCore/Framework/interface/stream/EDProducer.h"
+#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "SimMuon/MCTruth/interface/MuonAssociatorByHits.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include <memory>
 
 class MuonAssociatorEDProducer : public edm::stream::EDProducer<> {
 public:
-  explicit MuonAssociatorEDProducer(const edm::ParameterSet&);
+  explicit MuonAssociatorEDProducer(const edm::ParameterSet &);
   ~MuonAssociatorEDProducer() override;
-  
+
 private:
-  virtual void beginJob() ;
-  void produce(edm::Event&, const edm::EventSetup&) override;
+  virtual void beginJob();
+  void produce(edm::Event &, const edm::EventSetup &) override;
   virtual void endJob();
 
   edm::InputTag tracksTag;
   edm::InputTag tpTag;
   edm::EDGetTokenT<TrackingParticleCollection> tpToken_;
-  edm::EDGetTokenT<edm::View<reco::Track> > tracksToken_;
+  edm::EDGetTokenT<edm::View<reco::Track>> tracksToken_;
 
   bool ignoreMissingTrackCollection;
   edm::ParameterSet parset_;
-  MuonAssociatorByHits * associatorByHits;
+  MuonAssociatorByHits *associatorByHits;
 };
 
 #endif
diff --git a/SimMuon/MCTruth/plugins/MuonSimClassifier.cc b/SimMuon/MCTruth/plugins/MuonSimClassifier.cc
index 58ba69d813d87..140293b546055 100644
--- a/SimMuon/MCTruth/plugins/MuonSimClassifier.cc
+++ b/SimMuon/MCTruth/plugins/MuonSimClassifier.cc
@@ -7,22 +7,26 @@
 
 
  CLASSIFICATION: For each RECO Muon, match to SIM particle, and then:
-  - If the SIM is not a Muon, label as Punchthrough (1) except if it is an electron or positron (11)
+  - If the SIM is not a Muon, label as Punchthrough (1) except if it is an
+ electron or positron (11)
   - If the SIM is a Muon, then look at it's provenance.
-     A) the SIM muon is also a GEN muon, whose parent is NOT A HADRON AND NOT A TAU
+     A) the SIM muon is also a GEN muon, whose parent is NOT A HADRON AND NOT A
+ TAU
         -> classify as "primary" (4).
-     B) the SIM muon is also a GEN muon, whose parent is HEAVY FLAVOURED HADRON OR A TAU
+     B) the SIM muon is also a GEN muon, whose parent is HEAVY FLAVOURED HADRON
+ OR A TAU
         -> classify as "heavy flavour" (3)
      C) classify as "light flavour/decay" (2)
 
-  In any case, if the TP is not preferentially matched back to the same RECO muon,
-  label as Ghost (flip the classification)
+  In any case, if the TP is not preferentially matched back to the same RECO
+ muon, label as Ghost (flip the classification)
 
 
  FLAVOUR:
   - for non-muons: 0
   - for primary muons: 13
-  - for non primary muons: flavour of the mother: std::abs(pdgId) of heaviest quark, or 15 for tau
+  - for non primary muons: flavour of the mother: std::abs(pdgId) of heaviest
+ quark, or 15 for tau
 
 */
 //
@@ -31,7 +35,6 @@
 //         revised:  3/Aug/2017
 //
 
-
 // system include files
 #include <memory>
 #include <set>
@@ -40,541 +43,548 @@
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/stream/EDProducer.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "DataFormats/Common/interface/View.h"
-#include "DataFormats/Common/interface/ValueMap.h"
 #include "DataFormats/Common/interface/Association.h"
+#include "DataFormats/Common/interface/ValueMap.h"
+#include "DataFormats/Common/interface/View.h"
 
-#include "DataFormats/MuonReco/interface/Muon.h"
-#include "DataFormats/MuonReco/interface/MuonSimInfo.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
+#include "DataFormats/MuonReco/interface/Muon.h"
+#include "DataFormats/MuonReco/interface/MuonSimInfo.h"
 
 #include "SimDataFormats/Associations/interface/MuonToTrackingParticleAssociator.h"
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertex.h"
+#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 
 #include "CommonTools/Utils/interface/StringCutObjectSelector.h"
 
 //
 // class decleration
 class MuonSimClassifier : public edm::stream::EDProducer<> {
-    public:
-        explicit MuonSimClassifier(const edm::ParameterSet&);
-        ~MuonSimClassifier() override;
-
-    private:
-        void produce(edm::Event&, const edm::EventSetup&) override;
-        /// The RECO objects
-        edm::EDGetTokenT<edm::View<reco::Muon> > muonsToken_;
-
-        /// Track to use
-        reco::MuonTrackType trackType_;
-
-        /// The TrackingParticle objects
-        edm::EDGetTokenT<TrackingParticleCollection> trackingParticlesToken_;
-
-        /// The Associations
-        edm::InputTag associatorLabel_;
-        edm::EDGetTokenT<reco::MuonToTrackingParticleAssociator> muAssocToken_;
-
-        /// Cylinder to use to decide if a decay is early or late
-        double decayRho_, decayAbsZ_;
-
-        /// Create a link to the generator level particles
-        bool linkToGenParticles_;
-        edm::InputTag genParticles_;
-        edm::EDGetTokenT<reco::GenParticleCollection> genParticlesToken_;
-
-        /// Returns the flavour given a pdg id code
-        int flavour(int pdgId) const ;
-
-        /// Write a ValueMap<int> in the event
-        template<typename T>
-        void writeValueMap(edm::Event &iEvent,
-                const edm::Handle<edm::View<reco::Muon> > & handle,
-                const std::vector<T> & values,
-                const std::string    & label) const ;
-
-        TrackingParticleRef getTpMother(TrackingParticleRef tp) {
-            if (tp.isNonnull() && tp->parentVertex().isNonnull() && !tp->parentVertex()->sourceTracks().empty()) {
-                return tp->parentVertex()->sourceTracks()[0];
-            } else {
-                return TrackingParticleRef();
-            }
-        }
-
-        /// Convert TrackingParticle into GenParticle, save into output collection,
-        /// if mother is primary set reference to it,
-        /// return index in output collection
-        int convertAndPush(const TrackingParticle &tp,
-                           reco::GenParticleCollection &out,
-                           const TrackingParticleRef &momRef,
-                           const edm::Handle<reco::GenParticleCollection> & genParticles) const ;
+public:
+  explicit MuonSimClassifier(const edm::ParameterSet &);
+  ~MuonSimClassifier() override;
+
+private:
+  void produce(edm::Event &, const edm::EventSetup &) override;
+  /// The RECO objects
+  edm::EDGetTokenT<edm::View<reco::Muon>> muonsToken_;
+
+  /// Track to use
+  reco::MuonTrackType trackType_;
+
+  /// The TrackingParticle objects
+  edm::EDGetTokenT<TrackingParticleCollection> trackingParticlesToken_;
+
+  /// The Associations
+  edm::InputTag associatorLabel_;
+  edm::EDGetTokenT<reco::MuonToTrackingParticleAssociator> muAssocToken_;
+
+  /// Cylinder to use to decide if a decay is early or late
+  double decayRho_, decayAbsZ_;
+
+  /// Create a link to the generator level particles
+  bool linkToGenParticles_;
+  edm::InputTag genParticles_;
+  edm::EDGetTokenT<reco::GenParticleCollection> genParticlesToken_;
+
+  /// Returns the flavour given a pdg id code
+  int flavour(int pdgId) const;
+
+  /// Write a ValueMap<int> in the event
+  template <typename T>
+  void writeValueMap(edm::Event &iEvent,
+                     const edm::Handle<edm::View<reco::Muon>> &handle,
+                     const std::vector<T> &values,
+                     const std::string &label) const;
+
+  TrackingParticleRef getTpMother(TrackingParticleRef tp) {
+    if (tp.isNonnull() && tp->parentVertex().isNonnull() && !tp->parentVertex()->sourceTracks().empty()) {
+      return tp->parentVertex()->sourceTracks()[0];
+    } else {
+      return TrackingParticleRef();
+    }
+  }
+
+  /// Convert TrackingParticle into GenParticle, save into output collection,
+  /// if mother is primary set reference to it,
+  /// return index in output collection
+  int convertAndPush(const TrackingParticle &tp,
+                     reco::GenParticleCollection &out,
+                     const TrackingParticleRef &momRef,
+                     const edm::Handle<reco::GenParticleCollection> &genParticles) const;
 };
 
-
-MuonSimClassifier::MuonSimClassifier(const edm::ParameterSet &iConfig) :
-    muonsToken_(consumes<edm::View<reco::Muon> >(iConfig.getParameter<edm::InputTag>("muons"))),
-    trackingParticlesToken_(consumes<TrackingParticleCollection>(iConfig.getParameter<edm::InputTag>("trackingParticles"))),
-    muAssocToken_(consumes<reco::MuonToTrackingParticleAssociator>(iConfig.getParameter<edm::InputTag>("associatorLabel"))),
-    decayRho_(iConfig.getParameter<double>("decayRho")),
-    decayAbsZ_(iConfig.getParameter<double>("decayAbsZ")),
-    linkToGenParticles_(iConfig.getParameter<bool>("linkToGenParticles")),
-    genParticles_(linkToGenParticles_ ? iConfig.getParameter<edm::InputTag>("genParticles") : edm::InputTag())
+MuonSimClassifier::MuonSimClassifier(const edm::ParameterSet &iConfig)
+    : muonsToken_(consumes<edm::View<reco::Muon>>(iConfig.getParameter<edm::InputTag>("muons"))),
+      trackingParticlesToken_(
+          consumes<TrackingParticleCollection>(iConfig.getParameter<edm::InputTag>("trackingParticles"))),
+      muAssocToken_(
+          consumes<reco::MuonToTrackingParticleAssociator>(iConfig.getParameter<edm::InputTag>("associatorLabel"))),
+      decayRho_(iConfig.getParameter<double>("decayRho")),
+      decayAbsZ_(iConfig.getParameter<double>("decayAbsZ")),
+      linkToGenParticles_(iConfig.getParameter<bool>("linkToGenParticles")),
+      genParticles_(linkToGenParticles_ ? iConfig.getParameter<edm::InputTag>("genParticles") : edm::InputTag())
 
 {
-    std::string trackType = iConfig.getParameter< std::string >("trackType");
-    if (trackType == "inner") trackType_ = reco::InnerTk;
-    else if (trackType == "outer") trackType_ = reco::OuterTk;
-    else if (trackType == "global") trackType_ = reco::GlobalTk;
-    else if (trackType == "segments") trackType_ = reco::Segments;
-    else if (trackType == "glb_or_trk") trackType_ = reco::GlbOrTrk;
-    else throw cms::Exception("Configuration") << "Track type '" << trackType << "' not supported.\n";
-    if (linkToGenParticles_) {
-      genParticlesToken_ = consumes<reco::GenParticleCollection>(genParticles_);
-    }
-
-    produces<edm::ValueMap<reco::MuonSimInfo> >();
-    if (linkToGenParticles_) {
-        produces<reco::GenParticleCollection>("secondaries");
-        produces<edm::Association<reco::GenParticleCollection> >("toPrimaries");
-        produces<edm::Association<reco::GenParticleCollection> >("toSecondaries");
-    }
+  std::string trackType = iConfig.getParameter<std::string>("trackType");
+  if (trackType == "inner")
+    trackType_ = reco::InnerTk;
+  else if (trackType == "outer")
+    trackType_ = reco::OuterTk;
+  else if (trackType == "global")
+    trackType_ = reco::GlobalTk;
+  else if (trackType == "segments")
+    trackType_ = reco::Segments;
+  else if (trackType == "glb_or_trk")
+    trackType_ = reco::GlbOrTrk;
+  else
+    throw cms::Exception("Configuration") << "Track type '" << trackType << "' not supported.\n";
+  if (linkToGenParticles_) {
+    genParticlesToken_ = consumes<reco::GenParticleCollection>(genParticles_);
+  }
+
+  produces<edm::ValueMap<reco::MuonSimInfo>>();
+  if (linkToGenParticles_) {
+    produces<reco::GenParticleCollection>("secondaries");
+    produces<edm::Association<reco::GenParticleCollection>>("toPrimaries");
+    produces<edm::Association<reco::GenParticleCollection>>("toSecondaries");
+  }
 }
 
-MuonSimClassifier::~MuonSimClassifier()
-{
-}
+MuonSimClassifier::~MuonSimClassifier() {}
 
-void dumpFormatedInfo(const reco::MuonSimInfo& simInfo){
+void dumpFormatedInfo(const reco::MuonSimInfo &simInfo) {
   return;
-  LogTrace("MuonSimClassifier") << 
-    "\t Particle pdgId = " << simInfo.pdgId << 
-    ", (Event,Bx) = "<< "(" << simInfo.tpEvent << "," << simInfo.tpBX << ")" <<
-    "\n\t   q*p = " << simInfo.charge*simInfo.p4.P() << 
-    ", pT = " << simInfo.p4.pt() << ", eta = " << simInfo.p4.eta() << ", phi = " << simInfo.p4.phi() <<
-    "\n\t   produced at vertex rho = " << simInfo.vertex.Rho() << ", z = " << simInfo.vertex.Z() <<
-    ", (GEANT4 process = " << simInfo.g4processType << ")\n";
+  LogTrace("MuonSimClassifier") << "\t Particle pdgId = " << simInfo.pdgId << ", (Event,Bx) = "
+                                << "(" << simInfo.tpEvent << "," << simInfo.tpBX << ")"
+                                << "\n\t   q*p = " << simInfo.charge * simInfo.p4.P() << ", pT = " << simInfo.p4.pt()
+                                << ", eta = " << simInfo.p4.eta() << ", phi = " << simInfo.p4.phi()
+                                << "\n\t   produced at vertex rho = " << simInfo.vertex.Rho()
+                                << ", z = " << simInfo.vertex.Z() << ", (GEANT4 process = " << simInfo.g4processType
+                                << ")\n";
 }
 
-void
-MuonSimClassifier::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-    edm::Handle<edm::View<reco::Muon> > muons;
-    iEvent.getByToken(muonsToken_, muons);
-
-    edm::Handle<TrackingParticleCollection> trackingParticles;
-    iEvent.getByToken(trackingParticlesToken_, trackingParticles);
-
-    edm::Handle<reco::GenParticleCollection> genParticles;
-    if (linkToGenParticles_) {
-        iEvent.getByToken(genParticlesToken_, genParticles);
-    }
-
-    edm::Handle<reco::MuonToTrackingParticleAssociator> associatorBase;
-    iEvent.getByToken(muAssocToken_, associatorBase);
-    const reco::MuonToTrackingParticleAssociator * assoByHits = associatorBase.product();
-
-    reco::MuonToSimCollection recSimColl;
-    reco::SimToMuonCollection simRecColl;
-    LogTrace("MuonSimClassifier") <<"\n ***************************************************************** ";
-    LogTrace("MuonSimClassifier") <<  " RECO MUON association, type:  "<< trackType_;
-    LogTrace("MuonSimClassifier") <<  " ***************************************************************** \n";
-
-    edm::RefToBaseVector<reco::Muon> allMuons;
-    for (size_t i = 0, n = muons->size(); i < n; ++i) {
-      allMuons.push_back(muons->refAt(i));
-    }
-    
-    edm::RefVector<TrackingParticleCollection> allTPs;
-    for (size_t i = 0, n = trackingParticles->size(); i < n; ++i) {
-        allTPs.push_back(TrackingParticleRef(trackingParticles,i));
-    }
-
-    assoByHits->associateMuons(recSimColl, simRecColl, allMuons, trackType_, allTPs);
-
-    // for global muons without hits on muon detectors, look at the linked standalone muon
-    reco::MuonToSimCollection updSTA_recSimColl;
-    reco::SimToMuonCollection updSTA_simRecColl;
-    if (trackType_ == reco::GlobalTk) {
-      LogTrace("MuonSimClassifier") <<"\n ***************************************************************** ";
-      LogTrace("MuonSimClassifier") <<  " STANDALONE (UpdAtVtx) MUON association ";
-      LogTrace("MuonSimClassifier") <<  " ***************************************************************** \n";
-      assoByHits->associateMuons(updSTA_recSimColl, updSTA_simRecColl, allMuons, reco::OuterTk, allTPs);
+void MuonSimClassifier::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  edm::Handle<edm::View<reco::Muon>> muons;
+  iEvent.getByToken(muonsToken_, muons);
+
+  edm::Handle<TrackingParticleCollection> trackingParticles;
+  iEvent.getByToken(trackingParticlesToken_, trackingParticles);
+
+  edm::Handle<reco::GenParticleCollection> genParticles;
+  if (linkToGenParticles_) {
+    iEvent.getByToken(genParticlesToken_, genParticles);
+  }
+
+  edm::Handle<reco::MuonToTrackingParticleAssociator> associatorBase;
+  iEvent.getByToken(muAssocToken_, associatorBase);
+  const reco::MuonToTrackingParticleAssociator *assoByHits = associatorBase.product();
+
+  reco::MuonToSimCollection recSimColl;
+  reco::SimToMuonCollection simRecColl;
+  LogTrace("MuonSimClassifier") << "\n "
+                                   "***************************************************************** ";
+  LogTrace("MuonSimClassifier") << " RECO MUON association, type:  " << trackType_;
+  LogTrace("MuonSimClassifier") << " ******************************************"
+                                   "*********************** \n";
+
+  edm::RefToBaseVector<reco::Muon> allMuons;
+  for (size_t i = 0, n = muons->size(); i < n; ++i) {
+    allMuons.push_back(muons->refAt(i));
+  }
+
+  edm::RefVector<TrackingParticleCollection> allTPs;
+  for (size_t i = 0, n = trackingParticles->size(); i < n; ++i) {
+    allTPs.push_back(TrackingParticleRef(trackingParticles, i));
+  }
+
+  assoByHits->associateMuons(recSimColl, simRecColl, allMuons, trackType_, allTPs);
+
+  // for global muons without hits on muon detectors, look at the linked
+  // standalone muon
+  reco::MuonToSimCollection updSTA_recSimColl;
+  reco::SimToMuonCollection updSTA_simRecColl;
+  if (trackType_ == reco::GlobalTk) {
+    LogTrace("MuonSimClassifier") << "\n "
+                                     "***************************************************************** ";
+    LogTrace("MuonSimClassifier") << " STANDALONE (UpdAtVtx) MUON association ";
+    LogTrace("MuonSimClassifier") << " ****************************************"
+                                     "************************* \n";
+    assoByHits->associateMuons(updSTA_recSimColl, updSTA_simRecColl, allMuons, reco::OuterTk, allTPs);
+  }
+
+  typedef reco::MuonToSimCollection::const_iterator r2s_it;
+  typedef reco::SimToMuonCollection::const_iterator s2r_it;
+
+  size_t nmu = muons->size();
+  LogTrace("MuonSimClassifier") << "\n There are " << nmu << " reco::Muons.";
+
+  std::vector<reco::MuonSimInfo> simInfo;
+
+  std::unique_ptr<reco::GenParticleCollection> secondaries;  // output collection of secondary muons
+  std::map<TrackingParticleRef, int> tpToSecondaries;        // map from tp to (index+1) in output collection
+  std::vector<int> muToPrimary(nmu, -1), muToSecondary(nmu,
+                                                       -1);  // map from input into (index) in output, -1 for null
+  if (linkToGenParticles_)
+    secondaries.reset(new reco::GenParticleCollection());
+
+  // loop on reco muons
+  for (size_t i = 0; i < nmu; ++i) {
+    simInfo.push_back(reco::MuonSimInfo());
+    LogTrace("MuonSimClassifier") << "\n reco::Muon # " << i;
+
+    TrackingParticleRef tp;
+    edm::RefToBase<reco::Muon> muMatchBack;
+    r2s_it match = recSimColl.find(allMuons.at(i));
+    s2r_it matchback;
+    if (match != recSimColl.end()) {
+      // match->second is vector, front is first element, first is the ref
+      // (second would be the quality)
+      tp = match->second.front().first;
+      simInfo[i].tpId = tp.isNonnull() ? tp.key() : -1;  // we check, even if null refs should not appear here at all
+      simInfo[i].tpAssoQuality = match->second.front().second;
+      s2r_it matchback = simRecColl.find(tp);
+      if (matchback != simRecColl.end()) {
+        muMatchBack = matchback->second.front().first;
+      } else {
+        LogTrace("MuonSimClassifier") << "\n***WARNING:  This I do NOT understand: why no match back? "
+                                         "*** \n";
+      }
+    } else {
+      if ((trackType_ == reco::GlobalTk) && allMuons.at(i)->isGlobalMuon()) {
+        // perform a second attempt, matching with the standalone muon
+        r2s_it matchSta = updSTA_recSimColl.find(allMuons.at(i));
+        if (matchSta != updSTA_recSimColl.end()) {
+          tp = matchSta->second.front().first;
+          simInfo[i].tpId = tp.isNonnull() ? tp.key() : -1;  // we check, even if null refs
+                                                             // should not appear here at all
+          simInfo[i].tpAssoQuality = matchSta->second.front().second;
+          s2r_it matchback = updSTA_simRecColl.find(tp);
+          if (matchback != updSTA_simRecColl.end()) {
+            muMatchBack = matchback->second.front().first;
+          } else {
+            LogTrace("MuonSimClassifier") << "\n***WARNING:  This I do NOT understand: why no match back "
+                                             "in updSTA? *** \n";
+          }
+        }
+      } else {
+        LogTrace("MuonSimClassifier") << "\t No matching TrackingParticle is found ";
+      }
     }
 
-    typedef reco::MuonToSimCollection::const_iterator r2s_it;
-    typedef reco::SimToMuonCollection::const_iterator s2r_it;
-
-    size_t nmu = muons->size();
-    LogTrace("MuonSimClassifier") <<"\n There are "<<nmu<<" reco::Muons.";
-
-    std::vector<reco::MuonSimInfo> simInfo;
-
-    std::unique_ptr<reco::GenParticleCollection> secondaries;     // output collection of secondary muons
-    std::map<TrackingParticleRef, int>         tpToSecondaries; // map from tp to (index+1) in output collection
-    std::vector<int> muToPrimary(nmu, -1), muToSecondary(nmu, -1); // map from input into (index) in output, -1 for null
-    if (linkToGenParticles_) secondaries.reset(new reco::GenParticleCollection());
-    
-    // loop on reco muons
-    for(size_t i = 0; i < nmu; ++i) {
-      simInfo.push_back(reco::MuonSimInfo());
-      LogTrace("MuonSimClassifier") <<"\n reco::Muon # "<<i;
-
-        TrackingParticleRef        tp;
-        edm::RefToBase<reco::Muon> muMatchBack;
-        r2s_it match = recSimColl.find(allMuons.at(i));
-        s2r_it matchback;
-        if (match != recSimColl.end()) {
-	  // match->second is vector, front is first element, first is the ref (second would be the quality)
-	  tp = match->second.front().first;
-	  simInfo[i].tpId = tp.isNonnull() ? tp.key() : -1; // we check, even if null refs should not appear here at all
-	  simInfo[i].tpAssoQuality = match->second.front().second;
-	  s2r_it matchback = simRecColl.find(tp);
-	  if (matchback != simRecColl.end()) {
-	    muMatchBack = matchback->second.front().first;
-	  } else {
-	    LogTrace("MuonSimClassifier") << "\n***WARNING:  This I do NOT understand: why no match back? *** \n";
-	  }
+    if (tp.isNonnull()) {
+      bool isGhost = muMatchBack != allMuons.at(i);
+      if (isGhost)
+        LogTrace("MuonSimClassifier") << "\t *** This seems a Duplicate muon ! "
+                                         "classif[i] will be < 0 ***";
+
+      // identify signal and pileup TP
+      simInfo[i].tpBX = tp->eventId().bunchCrossing();
+      simInfo[i].tpEvent = tp->eventId().event();
+
+      simInfo[i].pdgId = tp->pdgId();
+      simInfo[i].vertex = tp->vertex();
+
+      // added info on GEANT process producing the TrackingParticle
+      const std::vector<SimVertex> &g4Vs = tp->parentVertex()->g4Vertices();
+      simInfo[i].g4processType = g4Vs[0].processType();
+
+      simInfo[i].charge = tp->charge();
+      simInfo[i].p4 = tp->p4();
+
+      // Try to extract mother and grand mother of this muon.
+      // Unfortunately, SIM and GEN histories require diffent code :-(
+      if (!tp->genParticles().empty()) {  // Muon is in GEN
+        reco::GenParticleRef genp = tp->genParticles()[0];
+        reco::GenParticleRef genMom = genp->numberOfMothers() > 0 ? genp->motherRef() : reco::GenParticleRef();
+        reco::GenParticleRef mMom = genMom;
+
+        if (genMom.isNonnull()) {
+          if (genMom->pdgId() != tp->pdgId()) {
+            simInfo[i].motherPdgId = genMom->pdgId();
+            simInfo[i].motherStatus = genMom->status();
+            simInfo[i].motherVertex = genMom->vertex();
+          } else {
+            // if mother has the same identity look backwards for the real
+            // mother (it may happen in radiative decays)
+            int jm = 0;
+            while (mMom->pdgId() == tp->pdgId()) {
+              jm++;
+              if (mMom->numberOfMothers() > 0) {
+                mMom = mMom->motherRef();
+              }
+              LogTrace("MuonSimClassifier") << "\t\t backtracking mother " << jm << ", pdgId = " << mMom->pdgId()
+                                            << ", status= " << mMom->status();
+            }
+            genMom = mMom;  // redefine genMom
+            simInfo[i].motherPdgId = genMom->pdgId();
+            simInfo[i].motherStatus = genMom->status();
+            simInfo[i].motherVertex = genMom->vertex();
+          }
+          dumpFormatedInfo(simInfo[i]);
+          LogTrace("MuonSimClassifier") << "\t   has GEN mother pdgId = " << simInfo[i].motherPdgId
+                                        << " (status = " << simInfo[i].motherStatus << ")";
+
+          reco::GenParticleRef genGMom = genMom->numberOfMothers() > 0 ? genMom->motherRef() : reco::GenParticleRef();
+
+          if (genGMom.isNonnull()) {
+            simInfo[i].grandMotherPdgId = genGMom->pdgId();
+            LogTrace("MuonSimClassifier")
+                << "\t\t mother prod. vertex rho = " << simInfo[i].motherVertex.Rho()
+                << ", z = " << simInfo[i].motherVertex.Z() << ", grand-mom pdgId = " << simInfo[i].grandMotherPdgId;
+          }
+          // in this case, we might want to know the heaviest mom flavour
+          for (reco::GenParticleRef nMom = genMom;
+               nMom.isNonnull() && std::abs(nMom->pdgId()) >= 100;  // stop when we're no longer
+                                                                    // looking at hadrons or mesons
+               nMom = nMom->numberOfMothers() > 0 ? nMom->motherRef() : reco::GenParticleRef()) {
+            int flav = flavour(nMom->pdgId());
+            if (simInfo[i].heaviestMotherFlavour < flav)
+              simInfo[i].heaviestMotherFlavour = flav;
+            LogTrace("MuonSimClassifier")
+                << "\t\t backtracking flavour: mom pdgId = " << nMom->pdgId() << ", flavour = " << flav
+                << ", heaviest so far = " << simInfo[i].heaviestMotherFlavour;
+          }
+        } else {  // mother is null ??
+          dumpFormatedInfo(simInfo[i]);
+          LogTrace("MuonSimClassifier") << "\t   has NO mother!";
+        }
+      } else {  // Muon is in SIM Only
+        TrackingParticleRef simMom = getTpMother(tp);
+        if (simMom.isNonnull()) {
+          simInfo[i].motherPdgId = simMom->pdgId();
+          simInfo[i].motherVertex = simMom->vertex();
+          dumpFormatedInfo(simInfo[i]);
+          LogTrace("MuonSimClassifier") << "\t   has SIM mother pdgId = " << simInfo[i].motherPdgId
+                                        << " produced at rho = " << simMom->vertex().Rho()
+                                        << ", z = " << simMom->vertex().Z();
+
+          if (!simMom->genParticles().empty()) {
+            simInfo[i].motherStatus = simMom->genParticles()[0]->status();
+            reco::GenParticleRef genGMom =
+                (simMom->genParticles()[0]->numberOfMothers() > 0 ? simMom->genParticles()[0]->motherRef()
+                                                                  : reco::GenParticleRef());
+            if (genGMom.isNonnull())
+              simInfo[i].grandMotherPdgId = genGMom->pdgId();
+            LogTrace("MuonSimClassifier") << "\t\t SIM mother is in GEN (status " << simInfo[i].motherStatus
+                                          << "), grand-mom id = " << simInfo[i].grandMotherPdgId;
+          } else {
+            simInfo[i].motherStatus = -1;
+            TrackingParticleRef simGMom = getTpMother(simMom);
+            if (simGMom.isNonnull())
+              simInfo[i].grandMotherPdgId = simGMom->pdgId();
+            LogTrace("MuonSimClassifier")
+                << "\t\t SIM mother is in SIM only, grand-mom id = " << simInfo[i].grandMotherPdgId;
+          }
+        } else {
+          dumpFormatedInfo(simInfo[i]);
+          LogTrace("MuonSimClassifier") << "\t   has NO mother!";
+        }
+      }
+      simInfo[i].motherFlavour = flavour(simInfo[i].motherPdgId);
+      simInfo[i].grandMotherFlavour = flavour(simInfo[i].grandMotherPdgId);
+
+      // Check first IF this is a muon at all
+      if (std::abs(tp->pdgId()) != 13) {
+        if (std::abs(tp->pdgId()) == 11) {
+          simInfo[i].primaryClass = isGhost ? reco::MuonSimType::GhostElectron : reco::MuonSimType::MatchedElectron;
+          simInfo[i].extendedClass =
+              isGhost ? reco::ExtendedMuonSimType::ExtGhostElectron : reco::ExtendedMuonSimType::ExtMatchedElectron;
+          LogTrace("MuonSimClassifier") << "\t This is electron/positron. classif[i] = " << simInfo[i].primaryClass;
+        } else {
+          simInfo[i].primaryClass =
+              isGhost ? reco::MuonSimType::GhostPunchthrough : reco::MuonSimType::MatchedPunchthrough;
+          simInfo[i].extendedClass = isGhost ? reco::ExtendedMuonSimType::ExtGhostPunchthrough
+                                             : reco::ExtendedMuonSimType::ExtMatchedPunchthrough;
+          LogTrace("MuonSimClassifier") << "\t This is not a muon. Sorry. classif[i] = " << simInfo[i].primaryClass;
+        }
+        continue;
+      }
+
+      // Is this SIM muon also a GEN muon, with a mother?
+      if (!tp->genParticles().empty() && (simInfo[i].motherPdgId != 0)) {
+        if (std::abs(simInfo[i].motherPdgId) < 100 && (std::abs(simInfo[i].motherPdgId) != 15)) {
+          simInfo[i].primaryClass =
+              isGhost ? reco::MuonSimType::GhostPrimaryMuon : reco::MuonSimType::MatchedPrimaryMuon;
+          simInfo[i].flavour = 13;
+          simInfo[i].extendedClass = isGhost ? reco::ExtendedMuonSimType::GhostMuonFromGaugeOrHiggsBoson
+                                             : reco::ExtendedMuonSimType::MatchedMuonFromGaugeOrHiggsBoson;
+          LogTrace("MuonSimClassifier") << "\t This seems PRIMARY MUON ! classif[i] = " << simInfo[i].primaryClass;
+        } else if (simInfo[i].motherFlavour == 4 || simInfo[i].motherFlavour == 5 || simInfo[i].motherFlavour == 15) {
+          simInfo[i].primaryClass =
+              isGhost ? reco::MuonSimType::GhostMuonFromHeavyFlavour : reco::MuonSimType::MatchedMuonFromHeavyFlavour;
+          simInfo[i].flavour = simInfo[i].motherFlavour;
+          if (simInfo[i].motherFlavour == 15)
+            simInfo[i].extendedClass =
+                isGhost ? reco::ExtendedMuonSimType::GhostMuonFromTau : reco::ExtendedMuonSimType::MatchedMuonFromTau;
+          else if (simInfo[i].motherFlavour == 5)
+            simInfo[i].extendedClass =
+                isGhost ? reco::ExtendedMuonSimType::GhostMuonFromB : reco::ExtendedMuonSimType::MatchedMuonFromB;
+          else if (simInfo[i].heaviestMotherFlavour == 5)
+            simInfo[i].extendedClass =
+                isGhost ? reco::ExtendedMuonSimType::GhostMuonFromBtoC : reco::ExtendedMuonSimType::MatchedMuonFromBtoC;
+          else
+            simInfo[i].extendedClass =
+                isGhost ? reco::ExtendedMuonSimType::GhostMuonFromC : reco::ExtendedMuonSimType::MatchedMuonFromC;
+          LogTrace("MuonSimClassifier") << "\t This seems HEAVY FLAVOUR ! classif[i] = " << simInfo[i].primaryClass;
+        } else {
+          simInfo[i].primaryClass =
+              isGhost ? reco::MuonSimType::GhostMuonFromLightFlavour : reco::MuonSimType::MatchedMuonFromLightFlavour;
+          simInfo[i].flavour = simInfo[i].motherFlavour;
+          LogTrace("MuonSimClassifier") << "\t This seems LIGHT FLAVOUR ! classif[i] = " << simInfo[i].primaryClass;
+        }
+      } else {
+        simInfo[i].primaryClass =
+            isGhost ? reco::MuonSimType::GhostMuonFromLightFlavour : reco::MuonSimType::MatchedMuonFromLightFlavour;
+        simInfo[i].flavour = simInfo[i].motherFlavour;
+        LogTrace("MuonSimClassifier") << "\t This seems LIGHT FLAVOUR ! classif[i] = " << simInfo[i].primaryClass;
+      }
+
+      // extended classification
+      // don't we override previous decisions?
+      if (simInfo[i].motherPdgId == 0)
+        // if it has no mom, it's not a primary particle so it won't be in ppMuX
+        simInfo[i].extendedClass = isGhost ? reco::ExtendedMuonSimType::GhostMuonFromNonPrimaryParticle
+                                           : reco::ExtendedMuonSimType::MatchedMuonFromNonPrimaryParticle;
+      else if (std::abs(simInfo[i].motherPdgId) < 100) {
+        if (simInfo[i].motherFlavour == 15)
+          simInfo[i].extendedClass =
+              isGhost ? reco::ExtendedMuonSimType::GhostMuonFromTau : reco::ExtendedMuonSimType::MatchedMuonFromTau;
+        else
+          simInfo[i].extendedClass = isGhost ? reco::ExtendedMuonSimType::GhostMuonFromGaugeOrHiggsBoson
+                                             : reco::ExtendedMuonSimType::MatchedMuonFromGaugeOrHiggsBoson;
+      } else if (simInfo[i].motherFlavour == 5)
+        simInfo[i].extendedClass =
+            isGhost ? reco::ExtendedMuonSimType::GhostMuonFromB : reco::ExtendedMuonSimType::MatchedMuonFromB;
+      else if (simInfo[i].motherFlavour == 4) {
+        if (simInfo[i].heaviestMotherFlavour == 5)
+          simInfo[i].extendedClass =
+              isGhost ? reco::ExtendedMuonSimType::GhostMuonFromBtoC : reco::ExtendedMuonSimType::MatchedMuonFromBtoC;
+        else
+          simInfo[i].extendedClass =
+              isGhost ? reco::ExtendedMuonSimType::GhostMuonFromC : reco::ExtendedMuonSimType::MatchedMuonFromC;
+      } else if (simInfo[i].motherStatus != -1) {  // primary light particle
+        int id = std::abs(simInfo[i].motherPdgId);
+        if (id != /*pi+*/ 211 && id != /*K+*/ 321 && id != 130 /*K0L*/)
+          // other light particle, possibly short-lived
+          simInfo[i].extendedClass = isGhost ? reco::ExtendedMuonSimType::GhostMuonFromOtherLight
+                                             : reco::ExtendedMuonSimType::MatchedMuonFromOtherLight;
+        else if (simInfo[i].vertex.Rho() < decayRho_ && std::abs(simInfo[i].vertex.Z()) < decayAbsZ_)
+          // decay a la ppMuX (primary pi/K within a cylinder)
+          simInfo[i].extendedClass = isGhost ? reco::ExtendedMuonSimType::GhostMuonFromPiKppMuX
+                                             : reco::ExtendedMuonSimType::MatchedMuonFromPiKppMuX;
+        else
+          // late decay that wouldn't be in ppMuX
+          simInfo[i].extendedClass = isGhost ? reco::ExtendedMuonSimType::GhostMuonFromPiKNotppMuX
+                                             : reco::ExtendedMuonSimType::MatchedMuonFromPiKNotppMuX;
+      } else
+        // decay of non-primary particle, would not be in ppMuX
+        simInfo[i].extendedClass = isGhost ? reco::ExtendedMuonSimType::GhostMuonFromNonPrimaryParticle
+                                           : reco::ExtendedMuonSimType::MatchedMuonFromNonPrimaryParticle;
+
+      if (linkToGenParticles_ && std::abs(simInfo[i].extendedClass) >= 2) {
+        // Link to the genParticle if possible, but not decays in flight (in
+        // ppMuX they're in GEN block, but they have wrong parameters)
+        if (!tp->genParticles().empty() && std::abs(simInfo[i].extendedClass) >= 5) {
+          if (genParticles.id() != tp->genParticles().id()) {
+            throw cms::Exception("Configuration")
+                << "Product ID mismatch between the genParticle collection (" << genParticles_ << ", id "
+                << genParticles.id() << ") and the references in the TrackingParticles (id " << tp->genParticles().id()
+                << ")\n";
+          }
+          muToPrimary[i] = tp->genParticles()[0].key();
         } else {
-	  if ((trackType_ == reco::GlobalTk) && allMuons.at(i)->isGlobalMuon()) {
-	    // perform a second attempt, matching with the standalone muon
-	    r2s_it matchSta = updSTA_recSimColl.find(allMuons.at(i));
-	    if (matchSta != updSTA_recSimColl.end()) {
-	      tp    = matchSta->second.front().first;
-	      simInfo[i].tpId = tp.isNonnull() ? tp.key() : -1; // we check, even if null refs should not appear here at all
-	      simInfo[i].tpAssoQuality = matchSta->second.front().second;
-	      s2r_it matchback = updSTA_simRecColl.find(tp);
-	      if (matchback != updSTA_simRecColl.end()) {
-		muMatchBack = matchback->second.front().first;
-	      } else {
-		LogTrace("MuonSimClassifier") << 
-		  "\n***WARNING:  This I do NOT understand: why no match back in updSTA? *** \n";
-	      }
-	    }
-	  } else {
-	    LogTrace("MuonSimClassifier") <<"\t No matching TrackingParticle is found ";
-	  }
-	}
-	
-        if (tp.isNonnull()) {
-	  bool isGhost = muMatchBack != allMuons.at(i);
-	  if (isGhost) LogTrace("MuonSimClassifier") <<"\t *** This seems a Duplicate muon ! classif[i] will be < 0 ***";
-
-	  // identify signal and pileup TP
-	  simInfo[i].tpBX      = tp->eventId().bunchCrossing();
-	  simInfo[i].tpEvent   = tp->eventId().event();
-
-	  simInfo[i].pdgId = tp->pdgId();
-	  simInfo[i].vertex = tp->vertex();
-
-	  // added info on GEANT process producing the TrackingParticle
-	  const std::vector<SimVertex> & g4Vs = tp->parentVertex()->g4Vertices();
-	  simInfo[i].g4processType = g4Vs[0].processType();
-	  
-	  simInfo[i].charge = tp->charge();
-	  simInfo[i].p4 = tp->p4();
-
-	  // Try to extract mother and grand mother of this muon.
-	  // Unfortunately, SIM and GEN histories require diffent code :-(
-	  if (!tp->genParticles().empty()) { // Muon is in GEN
-	    reco::GenParticleRef genp   = tp->genParticles()[0];
-	    reco::GenParticleRef genMom = genp->numberOfMothers() > 0 ? genp->motherRef() : reco::GenParticleRef();
-	    reco::GenParticleRef mMom = genMom;
-	      
-	    if (genMom.isNonnull()) {
-	      if (genMom->pdgId() != tp->pdgId()) {
-		simInfo[i].motherPdgId  = genMom->pdgId();
-		simInfo[i].motherStatus = genMom->status();
-		simInfo[i].motherVertex = genMom->vertex(); 
-	      } else {
-		// if mother has the same identity look backwards for the real mother (it may happen in radiative decays) 
-		int jm = 0;
-		while (mMom->pdgId() == tp->pdgId()) {
-		  jm++;
-		  if (mMom->numberOfMothers() > 0) {
-		    mMom = mMom->motherRef();
-		  }
-		  LogTrace("MuonSimClassifier") 
-		    << "\t\t backtracking mother "<<jm<<", pdgId = "<<mMom->pdgId()<<", status= " <<mMom->status();
-		}
-		genMom = mMom; // redefine genMom
-		simInfo[i].motherPdgId  = genMom->pdgId();
-		simInfo[i].motherStatus = genMom->status();
-		simInfo[i].motherVertex = genMom->vertex(); 
-	      }
-	      dumpFormatedInfo(simInfo[i]);
-	      LogTrace("MuonSimClassifier") << 
-		"\t   has GEN mother pdgId = " << simInfo[i].motherPdgId << 
-		" (status = " << simInfo[i].motherStatus << ")";
-		
-	      reco::GenParticleRef genGMom = genMom->numberOfMothers() > 0 ? genMom->motherRef() : reco::GenParticleRef();
-	      
-	      if (genGMom.isNonnull()) {
-		simInfo[i].grandMotherPdgId = genGMom->pdgId();
-		LogTrace("MuonSimClassifier") << 
-		  "\t\t mother prod. vertex rho = " << simInfo[i].motherVertex.Rho() << ", z = " << simInfo[i].motherVertex.Z() << 
-		  ", grand-mom pdgId = " << simInfo[i].grandMotherPdgId;
-	      }
-	      // in this case, we might want to know the heaviest mom flavour
-	      for (reco::GenParticleRef nMom = genMom;
-		   nMom.isNonnull() && std::abs(nMom->pdgId()) >= 100; // stop when we're no longer looking at hadrons or mesons
-		   nMom = nMom->numberOfMothers() > 0 ? nMom->motherRef() : reco::GenParticleRef()) {
-		int flav = flavour(nMom->pdgId());
-		if (simInfo[i].heaviestMotherFlavour < flav) simInfo[i].heaviestMotherFlavour = flav;
-		LogTrace("MuonSimClassifier") 
-		  << "\t\t backtracking flavour: mom pdgId = " << nMom->pdgId()
-		  << ", flavour = " << flav << ", heaviest so far = " << simInfo[i].heaviestMotherFlavour;
-	      }
-	    } else {   // mother is null ??
-	      dumpFormatedInfo(simInfo[i]);
-	      LogTrace("MuonSimClassifier") <<"\t   has NO mother!";
-	    }
-	  } else { // Muon is in SIM Only
-	    TrackingParticleRef simMom = getTpMother(tp);
-	    if (simMom.isNonnull()) {
-	      simInfo[i].motherPdgId = simMom->pdgId();
-	      simInfo[i].motherVertex = simMom->vertex();
-	      dumpFormatedInfo(simInfo[i]);
-	      LogTrace("MuonSimClassifier") <<
-		"\t   has SIM mother pdgId = " << simInfo[i].motherPdgId << 
-		" produced at rho = " << simMom->vertex().Rho() << ", z = " << simMom->vertex().Z();
-	      
-	      if (!simMom->genParticles().empty()) {
-		simInfo[i].motherStatus = simMom->genParticles()[0]->status();
-		reco::GenParticleRef genGMom = (simMom->genParticles()[0]->numberOfMothers() > 0 ? 
-						simMom->genParticles()[0]->motherRef() : 
-						reco::GenParticleRef());
-		if (genGMom.isNonnull()) simInfo[i].grandMotherPdgId = genGMom->pdgId();
-		LogTrace("MuonSimClassifier") << 
-		  "\t\t SIM mother is in GEN (status " << simInfo[i].motherStatus << 
-		  "), grand-mom id = " << simInfo[i].grandMotherPdgId;
-	      } else {
-		simInfo[i].motherStatus = -1;
-		TrackingParticleRef simGMom = getTpMother(simMom);
-		if (simGMom.isNonnull()) simInfo[i].grandMotherPdgId = simGMom->pdgId();
-		LogTrace("MuonSimClassifier") << 
-		  "\t\t SIM mother is in SIM only, grand-mom id = " << simInfo[i].grandMotherPdgId;
-	      }
-	    } else {
-	      dumpFormatedInfo(simInfo[i]);
-	      LogTrace("MuonSimClassifier") <<"\t   has NO mother!";
-	    }
-	  }
-	  simInfo[i].motherFlavour = flavour(simInfo[i].motherPdgId);
-	  simInfo[i].grandMotherFlavour = flavour(simInfo[i].grandMotherPdgId);
-
-	  // Check first IF this is a muon at all
-	  if (std::abs(tp->pdgId()) != 13) {
-	    if (std::abs(tp->pdgId()) == 11) {
-	      simInfo[i].primaryClass  = isGhost ? reco::MuonSimType::GhostElectron : reco::MuonSimType::MatchedElectron;
-	      simInfo[i].extendedClass = isGhost ? reco::ExtendedMuonSimType::ExtGhostElectron : reco::ExtendedMuonSimType::ExtMatchedElectron;
-	      LogTrace("MuonSimClassifier") <<"\t This is electron/positron. classif[i] = " << simInfo[i].primaryClass;
-	    } else {
-	      simInfo[i].primaryClass  = isGhost ? reco::MuonSimType::GhostPunchthrough : reco::MuonSimType::MatchedPunchthrough;
-	      simInfo[i].extendedClass = isGhost ? reco::ExtendedMuonSimType::ExtGhostPunchthrough : reco::ExtendedMuonSimType::ExtMatchedPunchthrough;
-	      LogTrace("MuonSimClassifier") <<"\t This is not a muon. Sorry. classif[i] = " << simInfo[i].primaryClass;
-	    }
-	    continue;
-	  }
-
-	  // Is this SIM muon also a GEN muon, with a mother?
-	  if (!tp->genParticles().empty() && (simInfo[i].motherPdgId != 0)) {
-	    if (std::abs(simInfo[i].motherPdgId) < 100 && (std::abs(simInfo[i].motherPdgId) != 15)) {
-	      simInfo[i].primaryClass = isGhost ? 
-		reco::MuonSimType::GhostPrimaryMuon : 
-		reco::MuonSimType::MatchedPrimaryMuon;
-	      simInfo[i].flavour = 13;
-	      simInfo[i].extendedClass  = isGhost ?
-		reco::ExtendedMuonSimType::GhostMuonFromGaugeOrHiggsBoson :
-		reco::ExtendedMuonSimType::MatchedMuonFromGaugeOrHiggsBoson;
-	      LogTrace("MuonSimClassifier") <<"\t This seems PRIMARY MUON ! classif[i] = " << simInfo[i].primaryClass;
-	    } else if (simInfo[i].motherFlavour == 4 || simInfo[i].motherFlavour == 5 || simInfo[i].motherFlavour == 15) {
-	      simInfo[i].primaryClass = isGhost ? 
-		reco::MuonSimType::GhostMuonFromHeavyFlavour : 
-		reco::MuonSimType::MatchedMuonFromHeavyFlavour;
-	      simInfo[i].flavour    = simInfo[i].motherFlavour;
-	      if (simInfo[i].motherFlavour == 15)      
-		simInfo[i].extendedClass = isGhost ? 
-		  reco::ExtendedMuonSimType::GhostMuonFromTau :
-		  reco::ExtendedMuonSimType::MatchedMuonFromTau;
-	      else if (simInfo[i].motherFlavour == 5)  
-		simInfo[i].extendedClass = isGhost ? 
-		  reco::ExtendedMuonSimType::GhostMuonFromB :
-		  reco::ExtendedMuonSimType::MatchedMuonFromB;
-	      else if (simInfo[i].heaviestMotherFlavour == 5) 
-		simInfo[i].extendedClass = isGhost ? 
-		  reco::ExtendedMuonSimType::GhostMuonFromBtoC :
-		  reco::ExtendedMuonSimType::MatchedMuonFromBtoC;
-	      else 
-		simInfo[i].extendedClass = isGhost ? 
-		  reco::ExtendedMuonSimType::GhostMuonFromC :
-		  reco::ExtendedMuonSimType::MatchedMuonFromC;
-	      LogTrace("MuonSimClassifier") <<"\t This seems HEAVY FLAVOUR ! classif[i] = " << simInfo[i].primaryClass;
-	    } else {
-	      simInfo[i].primaryClass = isGhost ? 
-		reco::MuonSimType::GhostMuonFromLightFlavour : 
-		reco::MuonSimType::MatchedMuonFromLightFlavour;
-	      simInfo[i].flavour    = simInfo[i].motherFlavour;
-	      LogTrace("MuonSimClassifier") <<"\t This seems LIGHT FLAVOUR ! classif[i] = " << simInfo[i].primaryClass;
-	    }
-	  } else {
-	    simInfo[i].primaryClass = isGhost ? 
-	      reco::MuonSimType::GhostMuonFromLightFlavour : 
-	      reco::MuonSimType::MatchedMuonFromLightFlavour;
-	    simInfo[i].flavour    = simInfo[i].motherFlavour;
-	    LogTrace("MuonSimClassifier") <<"\t This seems LIGHT FLAVOUR ! classif[i] = " << simInfo[i].primaryClass;
-	  }
-	  
-	  // extended classification
-	  // don't we override previous decisions?
-	  if (simInfo[i].motherPdgId == 0)
-	    // if it has no mom, it's not a primary particle so it won't be in ppMuX 
-	    simInfo[i].extendedClass = isGhost ? 
-	      reco::ExtendedMuonSimType::GhostMuonFromNonPrimaryParticle : 
-	      reco::ExtendedMuonSimType::MatchedMuonFromNonPrimaryParticle; 
-	  else if (std::abs(simInfo[i].motherPdgId) < 100) {
-	    if (simInfo[i].motherFlavour == 15)
-		simInfo[i].extendedClass = isGhost ? 
-		  reco::ExtendedMuonSimType::GhostMuonFromTau :
-		  reco::ExtendedMuonSimType::MatchedMuonFromTau;
-	    else
-	      simInfo[i].extendedClass  = isGhost ?
-		reco::ExtendedMuonSimType::GhostMuonFromGaugeOrHiggsBoson :
-		reco::ExtendedMuonSimType::MatchedMuonFromGaugeOrHiggsBoson;
-	  }
-	  else if (simInfo[i].motherFlavour == 5) 
-	    simInfo[i].extendedClass = isGhost ? 
-	      reco::ExtendedMuonSimType::GhostMuonFromB :
-	      reco::ExtendedMuonSimType::MatchedMuonFromB;
-	  else if (simInfo[i].motherFlavour == 4) 
-	    {
-	      if (simInfo[i].heaviestMotherFlavour == 5) 
-		simInfo[i].extendedClass = isGhost ? 
-		  reco::ExtendedMuonSimType::GhostMuonFromBtoC :
-		  reco::ExtendedMuonSimType::MatchedMuonFromBtoC;
-	      else 
-		simInfo[i].extendedClass = isGhost ? 
-		  reco::ExtendedMuonSimType::GhostMuonFromC :
-		  reco::ExtendedMuonSimType::MatchedMuonFromC;
-	    }
-	  else if (simInfo[i].motherStatus != -1) { // primary light particle
-	    int id = std::abs(simInfo[i].motherPdgId);
-	    if (id != /*pi+*/211 && id != /*K+*/321 && id != 130 /*K0L*/)  
-	      // other light particle, possibly short-lived
-	      simInfo[i].extendedClass = isGhost ? 
-		reco::ExtendedMuonSimType::GhostMuonFromOtherLight :
-		reco::ExtendedMuonSimType::MatchedMuonFromOtherLight;
-	    else if (simInfo[i].vertex.Rho() < decayRho_ && std::abs(simInfo[i].vertex.Z()) < decayAbsZ_) 
-	      // decay a la ppMuX (primary pi/K within a cylinder)
-	      simInfo[i].extendedClass = isGhost ? 
-		reco::ExtendedMuonSimType::GhostMuonFromPiKppMuX :
-		reco::ExtendedMuonSimType::MatchedMuonFromPiKppMuX;
-	    else                                                           
-	      // late decay that wouldn't be in ppMuX
-	      simInfo[i].extendedClass = isGhost ? 
-		reco::ExtendedMuonSimType::GhostMuonFromPiKNotppMuX :
-		reco::ExtendedMuonSimType::MatchedMuonFromPiKNotppMuX;
-	  } else 
-	    // decay of non-primary particle, would not be in ppMuX
-	    simInfo[i].extendedClass = isGhost ? 
-		reco::ExtendedMuonSimType::GhostMuonFromNonPrimaryParticle :
-		reco::ExtendedMuonSimType::MatchedMuonFromNonPrimaryParticle;
-
-	  if (linkToGenParticles_ && std::abs(simInfo[i].extendedClass) >= 2) {
-	    // Link to the genParticle if possible, but not decays in flight (in ppMuX they're in GEN block, but they have wrong parameters)
-	    if (!tp->genParticles().empty() && std::abs(simInfo[i].extendedClass) >= 5) {
-	      if (genParticles.id() != tp->genParticles().id()) {
-		throw cms::Exception("Configuration") << "Product ID mismatch between the genParticle collection (" << 
-		  genParticles_ << ", id " << genParticles.id() << ") and the references in the TrackingParticles (id " << 
-		  tp->genParticles().id() << ")\n";
-	      }
-	      muToPrimary[i] = tp->genParticles()[0].key();
-	    } else {
-	      // Don't put the same trackingParticle twice!
-	      int &indexPlus1 = tpToSecondaries[tp]; // will create a 0 if the tp is not in the list already
-	      if (indexPlus1 == 0) indexPlus1 = convertAndPush(*tp, *secondaries, getTpMother(tp), genParticles) + 1;
-	      muToSecondary[i] = indexPlus1 - 1;
-	    }
-	  }
-	  LogTrace("MuonSimClassifier") <<"\t Extended classification code = " << simInfo[i].extendedClass;
-	} else { // if (tp.isNonnull())
-	  simInfo[i].primaryClass  = reco::MuonSimType::NotMatched;
-	  simInfo[i].extendedClass = reco::ExtendedMuonSimType::ExtNotMatched;
-	}
-    } // end loop on reco muons 
-
-    writeValueMap(iEvent, muons, simInfo,   "");
-
-    if (linkToGenParticles_) {
-        edm::OrphanHandle<reco::GenParticleCollection> secHandle = iEvent.put(std::move(secondaries), "secondaries");
-        edm::RefProd<reco::GenParticleCollection> priRP(genParticles);
-        edm::RefProd<reco::GenParticleCollection> secRP(secHandle);
-        std::unique_ptr<edm::Association<reco::GenParticleCollection> > outPri(new edm::Association<reco::GenParticleCollection>(priRP));
-        std::unique_ptr<edm::Association<reco::GenParticleCollection> > outSec(new edm::Association<reco::GenParticleCollection>(secRP));
-        edm::Association<reco::GenParticleCollection>::Filler fillPri(*outPri), fillSec(*outSec);
-        fillPri.insert(muons, muToPrimary.begin(),   muToPrimary.end());
-        fillSec.insert(muons, muToSecondary.begin(), muToSecondary.end());
-        fillPri.fill(); fillSec.fill();
-        iEvent.put(std::move(outPri), "toPrimaries");
-        iEvent.put(std::move(outSec), "toSecondaries");
+          // Don't put the same trackingParticle twice!
+          int &indexPlus1 = tpToSecondaries[tp];  // will create a 0 if the tp is
+                                                  // not in the list already
+          if (indexPlus1 == 0)
+            indexPlus1 = convertAndPush(*tp, *secondaries, getTpMother(tp), genParticles) + 1;
+          muToSecondary[i] = indexPlus1 - 1;
+        }
+      }
+      LogTrace("MuonSimClassifier") << "\t Extended classification code = " << simInfo[i].extendedClass;
+    } else {  // if (tp.isNonnull())
+      simInfo[i].primaryClass = reco::MuonSimType::NotMatched;
+      simInfo[i].extendedClass = reco::ExtendedMuonSimType::ExtNotMatched;
     }
-
+  }  // end loop on reco muons
+
+  writeValueMap(iEvent, muons, simInfo, "");
+
+  if (linkToGenParticles_) {
+    edm::OrphanHandle<reco::GenParticleCollection> secHandle = iEvent.put(std::move(secondaries), "secondaries");
+    edm::RefProd<reco::GenParticleCollection> priRP(genParticles);
+    edm::RefProd<reco::GenParticleCollection> secRP(secHandle);
+    std::unique_ptr<edm::Association<reco::GenParticleCollection>> outPri(
+        new edm::Association<reco::GenParticleCollection>(priRP));
+    std::unique_ptr<edm::Association<reco::GenParticleCollection>> outSec(
+        new edm::Association<reco::GenParticleCollection>(secRP));
+    edm::Association<reco::GenParticleCollection>::Filler fillPri(*outPri), fillSec(*outSec);
+    fillPri.insert(muons, muToPrimary.begin(), muToPrimary.end());
+    fillSec.insert(muons, muToSecondary.begin(), muToSecondary.end());
+    fillPri.fill();
+    fillSec.fill();
+    iEvent.put(std::move(outPri), "toPrimaries");
+    iEvent.put(std::move(outSec), "toSecondaries");
+  }
 }
 
-template<typename T>
-void
-MuonSimClassifier::writeValueMap(edm::Event &iEvent,
-	const edm::Handle<edm::View<reco::Muon> > & handle,
-        const std::vector<T> & values,
-        const std::string    & label) const
-{
-    using namespace edm;
-    using namespace std;
-    unique_ptr<ValueMap<T> > valMap(new ValueMap<T>());
-    typename edm::ValueMap<T>::Filler filler(*valMap);
-    filler.insert(handle, values.begin(), values.end());
-    filler.fill();
-    iEvent.put(std::move(valMap), label);
+template <typename T>
+void MuonSimClassifier::writeValueMap(edm::Event &iEvent,
+                                      const edm::Handle<edm::View<reco::Muon>> &handle,
+                                      const std::vector<T> &values,
+                                      const std::string &label) const {
+  using namespace edm;
+  using namespace std;
+  unique_ptr<ValueMap<T>> valMap(new ValueMap<T>());
+  typename edm::ValueMap<T>::Filler filler(*valMap);
+  filler.insert(handle, values.begin(), values.end());
+  filler.fill();
+  iEvent.put(std::move(valMap), label);
 }
 
-int
-MuonSimClassifier::flavour(int pdgId) const {
-    int flav = std::abs(pdgId);
-    // for quarks, leptons and bosons except gluons, take their pdgId
-    // muons and taus have themselves as flavour
-    if (flav <= 37 && flav != 21) return flav;
-    // look for barions
-    int bflav = ((flav / 1000) % 10);
-    if (bflav != 0) return bflav;
-    // look for mesons
-    int mflav = ((flav / 100) % 10);
-    if (mflav != 0) return mflav;
-    return 0;
+int MuonSimClassifier::flavour(int pdgId) const {
+  int flav = std::abs(pdgId);
+  // for quarks, leptons and bosons except gluons, take their pdgId
+  // muons and taus have themselves as flavour
+  if (flav <= 37 && flav != 21)
+    return flav;
+  // look for barions
+  int bflav = ((flav / 1000) % 10);
+  if (bflav != 0)
+    return bflav;
+  // look for mesons
+  int mflav = ((flav / 100) % 10);
+  if (mflav != 0)
+    return mflav;
+  return 0;
 }
 
 // push secondary in collection.
 // if it has a primary mother link to it.
 int MuonSimClassifier::convertAndPush(const TrackingParticle &tp,
-                                     reco::GenParticleCollection &out,
-                                     const TrackingParticleRef & simMom,
-                                     const edm::Handle<reco::GenParticleCollection> & genParticles) const {
-    out.push_back(reco::GenParticle(tp.charge(), tp.p4(), tp.vertex(), tp.pdgId(), tp.status(), true));
-    if (simMom.isNonnull() && !simMom->genParticles().empty()) {
-         if (genParticles.id() != simMom->genParticles().id()) {
-            throw cms::Exception("Configuration") << "Product ID mismatch between the genParticle collection (" << genParticles_ << ", id " << genParticles.id() << ") and the references in the TrackingParticles (id " << simMom->genParticles().id() << ")\n";
-         }
-         out.back().addMother(simMom->genParticles()[0]);
+                                      reco::GenParticleCollection &out,
+                                      const TrackingParticleRef &simMom,
+                                      const edm::Handle<reco::GenParticleCollection> &genParticles) const {
+  out.push_back(reco::GenParticle(tp.charge(), tp.p4(), tp.vertex(), tp.pdgId(), tp.status(), true));
+  if (simMom.isNonnull() && !simMom->genParticles().empty()) {
+    if (genParticles.id() != simMom->genParticles().id()) {
+      throw cms::Exception("Configuration")
+          << "Product ID mismatch between the genParticle collection (" << genParticles_ << ", id " << genParticles.id()
+          << ") and the references in the TrackingParticles (id " << simMom->genParticles().id() << ")\n";
     }
-    return out.size()-1;
+    out.back().addMother(simMom->genParticles()[0]);
+  }
+  return out.size() - 1;
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(MuonSimClassifier);
diff --git a/SimMuon/MCTruth/plugins/MuonToTrackingParticleAssociatorByHitsImpl.cc b/SimMuon/MCTruth/plugins/MuonToTrackingParticleAssociatorByHitsImpl.cc
index 0ea7ea566e8e0..5a4b7b5b0a8af 100644
--- a/SimMuon/MCTruth/plugins/MuonToTrackingParticleAssociatorByHitsImpl.cc
+++ b/SimMuon/MCTruth/plugins/MuonToTrackingParticleAssociatorByHitsImpl.cc
@@ -2,7 +2,7 @@
 //
 // Package:     SimMuon/MCTruth
 // Class  :     MuonToTrackingParticleAssociatorByHitsImpl
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -16,7 +16,6 @@
 #include "MuonToTrackingParticleAssociatorByHitsImpl.h"
 #include "SimMuon/MCTruth/interface/TrackerMuonHitExtractor.h"
 
-
 //
 // constants, enums and typedefs
 //
@@ -28,15 +27,11 @@
 //
 // constructors and destructor
 //
-MuonToTrackingParticleAssociatorByHitsImpl::MuonToTrackingParticleAssociatorByHitsImpl(TrackerMuonHitExtractor const& iHitExtractor,
-									    MuonAssociatorByHitsHelper::Resources const& iResources,
-										          MuonAssociatorByHitsHelper const* iHelper):
-  m_hitExtractor(&iHitExtractor),
-  m_resources(iResources),
-  m_helper(iHelper)
-{
-}
-
+MuonToTrackingParticleAssociatorByHitsImpl::MuonToTrackingParticleAssociatorByHitsImpl(
+    TrackerMuonHitExtractor const &iHitExtractor,
+    MuonAssociatorByHitsHelper::Resources const &iResources,
+    MuonAssociatorByHitsHelper const *iHelper)
+    : m_hitExtractor(&iHitExtractor), m_resources(iResources), m_helper(iHelper) {}
 
 //
 // member functions
@@ -45,170 +40,170 @@ MuonToTrackingParticleAssociatorByHitsImpl::MuonToTrackingParticleAssociatorByHi
 //
 // const member functions
 //
-void 
-MuonToTrackingParticleAssociatorByHitsImpl::associateMuons(reco::MuonToSimCollection & recToSim, 
-                                                           reco::SimToMuonCollection & simToRec,
-                                                           const edm::RefToBaseVector<reco::Muon> & muons, 
-                                                           reco::MuonTrackType type,
-                                                           const edm::RefVector<TrackingParticleCollection>& tPC) const {
-    /// PART 1: Fill MuonToSimAssociatorByHits::TrackHitsCollection
-    MuonAssociatorByHitsHelper::TrackHitsCollection muonHitRefs;
-    edm::OwnVector<TrackingRecHit> allTMRecHits;  // this I will fill in only for tracker muon hits from segments
-
-    std::vector<edm::OwnVector<TrackingRecHit> > TMRecHits; // used for case GlbOrTrk
-    edm::OwnVector<TrackingRecHit> noTM;
-
-    switch (type) {
-        
-        case reco::InnerTk: 
-            for (edm::RefToBaseVector<reco::Muon>::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) {
-                edm::RefToBase<reco::Muon> mur = *it;
-                if (mur->track().isNonnull()) { 
-                    muonHitRefs.push_back(std::make_pair(mur->track()->recHitsBegin(), mur->track()->recHitsEnd()));
-                } else {
-		  muonHitRefs.push_back(std::make_pair(allTMRecHits.data().end(), allTMRecHits.data().end()));
-                }
-            }
-	    break;
-        case reco::OuterTk: 
-            for (edm::RefToBaseVector<reco::Muon>::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) {
-                edm::RefToBase<reco::Muon> mur = *it;
-                if (mur->outerTrack().isNonnull()) { 
-                    muonHitRefs.push_back(std::make_pair(mur->outerTrack()->recHitsBegin(), mur->outerTrack()->recHitsEnd()));
-                } else {
-		  muonHitRefs.push_back(std::make_pair(allTMRecHits.data().end(), allTMRecHits.data().end()));
-                }
-            }
-            break;
-        case reco::GlobalTk: 
-            for (edm::RefToBaseVector<reco::Muon>::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) {
-                edm::RefToBase<reco::Muon> mur = *it;
-                if (mur->globalTrack().isNonnull()) { 
-                    muonHitRefs.push_back(std::make_pair(mur->globalTrack()->recHitsBegin(), mur->globalTrack()->recHitsEnd()));
-                } else {
-		  muonHitRefs.push_back(std::make_pair(allTMRecHits.data().end(), allTMRecHits.data().end()));
-		}
-            }
-            break;
-        case reco::Segments: {
-                // puts hits in the vector, and record indices
-                std::vector<std::pair<size_t, size_t> >   muonHitIndices;
-                for (edm::RefToBaseVector<reco::Muon>::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) {
-                    edm::RefToBase<reco::Muon> mur = *it;
-                    std::pair<size_t, size_t> indices(allTMRecHits.size(), allTMRecHits.size());
-                    if (mur->isTrackerMuon()) {
-                        std::vector<const TrackingRecHit *> hits = m_hitExtractor->getMuonHits(*mur);
-                        for (std::vector<const TrackingRecHit *>::const_iterator ith = hits.begin(), edh = hits.end(); ith != edh; ++ith) {
-                            allTMRecHits.push_back(**ith);
-                        }
-                        indices.second += hits.size();
-                    }
-                    muonHitIndices.push_back(indices);  
-                }
-                // convert indices into pairs of iterators to references
-                typedef std::pair<size_t, size_t> index_pair;
-                trackingRecHit_iterator hitRefBegin = allTMRecHits.data().begin();
-                for (std::vector<std::pair<size_t, size_t> >::const_iterator idxs = muonHitIndices.begin(), idxend = muonHitIndices.end(); idxs != idxend; ++idxs) {
-                    muonHitRefs.push_back(std::make_pair(hitRefBegin+idxs->first, 
-                                                         hitRefBegin+idxs->second));
-                }
-                
-            }
-            break;
-        case reco::GlbOrTrk: {
-	   edm::LogVerbatim("MuonToTrackingParticleAssociatorByHitsImpl") 
-	     <<"\n"<<"There are "<<muons.size()<<" selected reco::Muons.";
-
-	   int isel = 0;
-	   for (edm::RefToBaseVector<reco::Muon>::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) {
-	     edm::RefToBase<reco::Muon> mur = *it;
-
-	    edm::LogVerbatim("MuonToTrackingParticleAssociatorByHitsImpl") 
-	      <<" #"<<isel<<", reco::Muon key = " <<mur.key()
-	      <<", q*p = "<<mur->charge()*mur->p()<<", pT = "<<mur->pt()<<", eta = "<<mur->eta()<<", phi = "<<mur->phi();
-
-	     // Global muon with valid muon hits
-	     if (mur->isGlobalMuon() && mur->globalTrack()->hitPattern().numberOfValidMuonHits()>0) {
-	       edm::LogVerbatim("MuonToTrackingParticleAssociatorByHitsImpl") 
-		 <<"\t this is a Global Muon with valid muon hits";
-	       muonHitRefs.push_back(std::make_pair(mur->globalTrack()->recHitsBegin(), mur->globalTrack()->recHitsEnd()));
-	     }
-
-	     // Tracker Muon
-	     else if (mur->isTrackerMuon()) {
-	       edm::LogVerbatim("MuonToTrackingParticleAssociatorByHitsImpl") 
-		 <<"\t this is a Tracker Muon";
-	       edm::OwnVector<TrackingRecHit> TMvec;
-
-	       std::vector<const TrackingRecHit *> hits = m_hitExtractor->getMuonHits(*mur); 
-	       for (std::vector<const TrackingRecHit *>::const_iterator ith = hits.begin(), edh = hits.end(); ith != edh; ++ith) {
-		 TMvec.push_back(**ith);
-	       }
-	       
-	       TMRecHits.push_back(TMvec);
-	       
-	       muonHitRefs.push_back(std::make_pair(TMRecHits.rbegin()->data().begin(), TMRecHits.rbegin()->data().end()));
-	     }
-
-	     // Standalone muon or Global without valid muon hits
-	     else if (mur->outerTrack().isNonnull()) {
-	       edm::LogVerbatim("MuonToTrackingParticleAssociatorByHitsImpl") 
-		 <<"\t this is a Standalone muon";
-	       muonHitRefs.push_back(std::make_pair(mur->outerTrack()->recHitsBegin(), mur->outerTrack()->recHitsEnd()));
-	     }
-
-	     else {
-	       edm::LogVerbatim("MuonToTrackingParticleAssociatorByHitsImpl") 
-		 <<"\t what muon is this ?";
-	       edm::LogVerbatim("MuonToTrackingParticleAssociatorByHitsImpl") 
-		 <<"isMuon : "<<mur->isMuon()<<", isPFMuon : "<<mur->isPFMuon()<<", isTrackerMuon : "<<mur->isTrackerMuon()
-		 <<", isStandAloneMuon : "<<mur->isStandAloneMuon()<<", isGlobalMuon : "<<mur->isGlobalMuon()
-		 <<", isRPCMuon : "<<mur->isRPCMuon()<<", isGEMMuon : "<<mur->isGEMMuon()<<", isME0Muon : "<<mur->isME0Muon();
-	       muonHitRefs.push_back(std::make_pair(noTM.data().end(), noTM.data().end()));
-	     }
-	     
-	     isel++;
-	   } // loop on muons
-	   
+void MuonToTrackingParticleAssociatorByHitsImpl::associateMuons(
+    reco::MuonToSimCollection &recToSim,
+    reco::SimToMuonCollection &simToRec,
+    const edm::RefToBaseVector<reco::Muon> &muons,
+    reco::MuonTrackType type,
+    const edm::RefVector<TrackingParticleCollection> &tPC) const {
+  /// PART 1: Fill MuonToSimAssociatorByHits::TrackHitsCollection
+  MuonAssociatorByHitsHelper::TrackHitsCollection muonHitRefs;
+  edm::OwnVector<TrackingRecHit> allTMRecHits;  // this I will fill in only for tracker muon hits from
+                                                // segments
+
+  std::vector<edm::OwnVector<TrackingRecHit>> TMRecHits;  // used for case GlbOrTrk
+  edm::OwnVector<TrackingRecHit> noTM;
+
+  switch (type) {
+    case reco::InnerTk:
+      for (edm::RefToBaseVector<reco::Muon>::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) {
+        edm::RefToBase<reco::Muon> mur = *it;
+        if (mur->track().isNonnull()) {
+          muonHitRefs.push_back(std::make_pair(mur->track()->recHitsBegin(), mur->track()->recHitsEnd()));
+        } else {
+          muonHitRefs.push_back(std::make_pair(allTMRecHits.data().end(), allTMRecHits.data().end()));
         }
-	break;
-    }
+      }
+      break;
+    case reco::OuterTk:
+      for (edm::RefToBaseVector<reco::Muon>::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) {
+        edm::RefToBase<reco::Muon> mur = *it;
+        if (mur->outerTrack().isNonnull()) {
+          muonHitRefs.push_back(std::make_pair(mur->outerTrack()->recHitsBegin(), mur->outerTrack()->recHitsEnd()));
+        } else {
+          muonHitRefs.push_back(std::make_pair(allTMRecHits.data().end(), allTMRecHits.data().end()));
+        }
+      }
+      break;
+    case reco::GlobalTk:
+      for (edm::RefToBaseVector<reco::Muon>::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) {
+        edm::RefToBase<reco::Muon> mur = *it;
+        if (mur->globalTrack().isNonnull()) {
+          muonHitRefs.push_back(std::make_pair(mur->globalTrack()->recHitsBegin(), mur->globalTrack()->recHitsEnd()));
+        } else {
+          muonHitRefs.push_back(std::make_pair(allTMRecHits.data().end(), allTMRecHits.data().end()));
+        }
+      }
+      break;
+    case reco::Segments: {
+      // puts hits in the vector, and record indices
+      std::vector<std::pair<size_t, size_t>> muonHitIndices;
+      for (edm::RefToBaseVector<reco::Muon>::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) {
+        edm::RefToBase<reco::Muon> mur = *it;
+        std::pair<size_t, size_t> indices(allTMRecHits.size(), allTMRecHits.size());
+        if (mur->isTrackerMuon()) {
+          std::vector<const TrackingRecHit *> hits = m_hitExtractor->getMuonHits(*mur);
+          for (std::vector<const TrackingRecHit *>::const_iterator ith = hits.begin(), edh = hits.end(); ith != edh;
+               ++ith) {
+            allTMRecHits.push_back(**ith);
+          }
+          indices.second += hits.size();
+        }
+        muonHitIndices.push_back(indices);
+      }
+      // convert indices into pairs of iterators to references
+      typedef std::pair<size_t, size_t> index_pair;
+      trackingRecHit_iterator hitRefBegin = allTMRecHits.data().begin();
+      for (std::vector<std::pair<size_t, size_t>>::const_iterator idxs = muonHitIndices.begin(),
+                                                                  idxend = muonHitIndices.end();
+           idxs != idxend;
+           ++idxs) {
+        muonHitRefs.push_back(std::make_pair(hitRefBegin + idxs->first, hitRefBegin + idxs->second));
+      }
+
+    } break;
+    case reco::GlbOrTrk: {
+      edm::LogVerbatim("MuonToTrackingParticleAssociatorByHitsImpl")
+          << "\n"
+          << "There are " << muons.size() << " selected reco::Muons.";
+
+      int isel = 0;
+      for (edm::RefToBaseVector<reco::Muon>::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) {
+        edm::RefToBase<reco::Muon> mur = *it;
+
+        edm::LogVerbatim("MuonToTrackingParticleAssociatorByHitsImpl")
+            << " #" << isel << ", reco::Muon key = " << mur.key() << ", q*p = " << mur->charge() * mur->p()
+            << ", pT = " << mur->pt() << ", eta = " << mur->eta() << ", phi = " << mur->phi();
+
+        // Global muon with valid muon hits
+        if (mur->isGlobalMuon() && mur->globalTrack()->hitPattern().numberOfValidMuonHits() > 0) {
+          edm::LogVerbatim("MuonToTrackingParticleAssociatorByHitsImpl")
+              << "\t this is a Global Muon with valid muon hits";
+          muonHitRefs.push_back(std::make_pair(mur->globalTrack()->recHitsBegin(), mur->globalTrack()->recHitsEnd()));
+        }
+
+        // Tracker Muon
+        else if (mur->isTrackerMuon()) {
+          edm::LogVerbatim("MuonToTrackingParticleAssociatorByHitsImpl") << "\t this is a Tracker Muon";
+          edm::OwnVector<TrackingRecHit> TMvec;
+
+          std::vector<const TrackingRecHit *> hits = m_hitExtractor->getMuonHits(*mur);
+          for (std::vector<const TrackingRecHit *>::const_iterator ith = hits.begin(), edh = hits.end(); ith != edh;
+               ++ith) {
+            TMvec.push_back(**ith);
+          }
 
-    /// PART 2: call the association routines 
-    auto recSimColl = m_helper->associateRecoToSimIndices(muonHitRefs,tPC, m_resources);
-    for (auto it = recSimColl.begin(), ed = recSimColl.end(); it != ed; ++it) {
-        edm::RefToBase<reco::Muon> rec = muons[it->first];
-        std::vector<std::pair<TrackingParticleRef, double> > & tpAss  = recToSim[rec];
-        for ( auto const & a : it->second) {
-            tpAss.push_back(std::make_pair(tPC[a.idx], a.quality));
+          TMRecHits.push_back(TMvec);
+
+          muonHitRefs.push_back(std::make_pair(TMRecHits.rbegin()->data().begin(), TMRecHits.rbegin()->data().end()));
         }
-    }
-    auto simRecColl = m_helper->associateSimToRecoIndices(muonHitRefs,tPC,m_resources);
-    for (auto it = simRecColl.begin(), ed = simRecColl.end(); it != ed; ++it) {
-        TrackingParticleRef sim = tPC[it->first];
-        std::vector<std::pair<edm::RefToBase<reco::Muon>, double> > & recAss = simToRec[sim];
-        for ( auto const & a: it->second ) {
-            recAss.push_back(std::make_pair(muons[a.idx], a.quality));
+
+        // Standalone muon or Global without valid muon hits
+        else if (mur->outerTrack().isNonnull()) {
+          edm::LogVerbatim("MuonToTrackingParticleAssociatorByHitsImpl") << "\t this is a Standalone muon";
+          muonHitRefs.push_back(std::make_pair(mur->outerTrack()->recHitsBegin(), mur->outerTrack()->recHitsEnd()));
+        }
+
+        else {
+          edm::LogVerbatim("MuonToTrackingParticleAssociatorByHitsImpl") << "\t what muon is this ?";
+          edm::LogVerbatim("MuonToTrackingParticleAssociatorByHitsImpl")
+              << "isMuon : " << mur->isMuon() << ", isPFMuon : " << mur->isPFMuon()
+              << ", isTrackerMuon : " << mur->isTrackerMuon() << ", isStandAloneMuon : " << mur->isStandAloneMuon()
+              << ", isGlobalMuon : " << mur->isGlobalMuon() << ", isRPCMuon : " << mur->isRPCMuon()
+              << ", isGEMMuon : " << mur->isGEMMuon() << ", isME0Muon : " << mur->isME0Muon();
+          muonHitRefs.push_back(std::make_pair(noTM.data().end(), noTM.data().end()));
         }
+
+        isel++;
+      }  // loop on muons
+
+    } break;
+  }
+
+  /// PART 2: call the association routines
+  auto recSimColl = m_helper->associateRecoToSimIndices(muonHitRefs, tPC, m_resources);
+  for (auto it = recSimColl.begin(), ed = recSimColl.end(); it != ed; ++it) {
+    edm::RefToBase<reco::Muon> rec = muons[it->first];
+    std::vector<std::pair<TrackingParticleRef, double>> &tpAss = recToSim[rec];
+    for (auto const &a : it->second) {
+      tpAss.push_back(std::make_pair(tPC[a.idx], a.quality));
     }
+  }
+  auto simRecColl = m_helper->associateSimToRecoIndices(muonHitRefs, tPC, m_resources);
+  for (auto it = simRecColl.begin(), ed = simRecColl.end(); it != ed; ++it) {
+    TrackingParticleRef sim = tPC[it->first];
+    std::vector<std::pair<edm::RefToBase<reco::Muon>, double>> &recAss = simToRec[sim];
+    for (auto const &a : it->second) {
+      recAss.push_back(std::make_pair(muons[a.idx], a.quality));
+    }
+  }
 }
-   
-void
-MuonToTrackingParticleAssociatorByHitsImpl::associateMuons(reco::MuonToSimCollection & recToSim, 
-                                                           reco::SimToMuonCollection & simToRec,
-                                                           const edm::Handle<edm::View<reco::Muon> > & tCH, 
-                                                           reco::MuonTrackType type, 
-                                                           const edm::Handle<TrackingParticleCollection>& tPCH) const {
-
-    edm::RefVector<TrackingParticleCollection> tpc(tPCH.id());
-    for (unsigned int j=0; j<tPCH->size();j++)
-      tpc.push_back(edm::Ref<TrackingParticleCollection>(tPCH,j));
-    
-    edm::RefToBaseVector<reco::Muon> muonBaseRefVector;
-    for (size_t i = 0; i < tCH->size(); ++i)
-      muonBaseRefVector.push_back(tCH->refAt(i));
-
-    associateMuons(recToSim, simToRec, muonBaseRefVector,type,tpc);
+
+void MuonToTrackingParticleAssociatorByHitsImpl::associateMuons(
+    reco::MuonToSimCollection &recToSim,
+    reco::SimToMuonCollection &simToRec,
+    const edm::Handle<edm::View<reco::Muon>> &tCH,
+    reco::MuonTrackType type,
+    const edm::Handle<TrackingParticleCollection> &tPCH) const {
+  edm::RefVector<TrackingParticleCollection> tpc(tPCH.id());
+  for (unsigned int j = 0; j < tPCH->size(); j++)
+    tpc.push_back(edm::Ref<TrackingParticleCollection>(tPCH, j));
+
+  edm::RefToBaseVector<reco::Muon> muonBaseRefVector;
+  for (size_t i = 0; i < tCH->size(); ++i)
+    muonBaseRefVector.push_back(tCH->refAt(i));
+
+  associateMuons(recToSim, simToRec, muonBaseRefVector, type, tpc);
 }
 
 //
diff --git a/SimMuon/MCTruth/plugins/MuonToTrackingParticleAssociatorByHitsImpl.h b/SimMuon/MCTruth/plugins/MuonToTrackingParticleAssociatorByHitsImpl.h
index 54eb0c48319cd..117d9acc837c6 100644
--- a/SimMuon/MCTruth/plugins/MuonToTrackingParticleAssociatorByHitsImpl.h
+++ b/SimMuon/MCTruth/plugins/MuonToTrackingParticleAssociatorByHitsImpl.h
@@ -4,8 +4,10 @@
 //
 // Package:     SimMuon/MCTruth
 // Class  :     MuonToTrackingParticleAssociatorByHitsImpl
-// 
-/**\class MuonToTrackingParticleAssociatorByHitsImpl MuonToTrackingParticleAssociatorByHitsImpl.h "MuonToTrackingParticleAssociatorByHitsImpl.h"
+//
+/**\class MuonToTrackingParticleAssociatorByHitsImpl
+ MuonToTrackingParticleAssociatorByHitsImpl.h
+ "MuonToTrackingParticleAssociatorByHitsImpl.h"
 
  Description: [one line class summary]
 
@@ -27,37 +29,40 @@
 // forward declarations
 class TrackerMuonHitExtractor;
 
-class MuonToTrackingParticleAssociatorByHitsImpl: public reco::MuonToTrackingParticleAssociatorBaseImpl
-{
-
-   public:
-   MuonToTrackingParticleAssociatorByHitsImpl(TrackerMuonHitExtractor const& iHitExtractor,
-                                              MuonAssociatorByHitsHelper::Resources const& iResources,
-                                              MuonAssociatorByHitsHelper const* iHelper);
-
-   // ---------- const member functions ---------------------
-   void associateMuons(reco::MuonToSimCollection & recoToSim, reco::SimToMuonCollection & simToReco,
-                       const edm::RefToBaseVector<reco::Muon> & muons, reco::MuonTrackType type,
-                       const edm::RefVector<TrackingParticleCollection>& tpColl) const override;
-   
-   void associateMuons(reco::MuonToSimCollection & recoToSim, reco::SimToMuonCollection & simToReco,
-                       const edm::Handle<edm::View<reco::Muon> > & muons, reco::MuonTrackType type, 
-                       const edm::Handle<TrackingParticleCollection>& tpColl) const override;
-   
-   // ---------- static member functions --------------------
-   
-   // ---------- member functions ---------------------------
-   
- private:
-   MuonToTrackingParticleAssociatorByHitsImpl(const MuonToTrackingParticleAssociatorByHitsImpl&) = delete; // stop default
-   
-   const MuonToTrackingParticleAssociatorByHitsImpl& operator=(const MuonToTrackingParticleAssociatorByHitsImpl&) = delete; // stop default
-   
-      // ---------- member data --------------------------------
-   TrackerMuonHitExtractor const* m_hitExtractor;
-   MuonAssociatorByHitsHelper::Resources m_resources;
-   MuonAssociatorByHitsHelper const* m_helper;
-};
+class MuonToTrackingParticleAssociatorByHitsImpl : public reco::MuonToTrackingParticleAssociatorBaseImpl {
+public:
+  MuonToTrackingParticleAssociatorByHitsImpl(TrackerMuonHitExtractor const &iHitExtractor,
+                                             MuonAssociatorByHitsHelper::Resources const &iResources,
+                                             MuonAssociatorByHitsHelper const *iHelper);
+
+  // ---------- const member functions ---------------------
+  void associateMuons(reco::MuonToSimCollection &recoToSim,
+                      reco::SimToMuonCollection &simToReco,
+                      const edm::RefToBaseVector<reco::Muon> &muons,
+                      reco::MuonTrackType type,
+                      const edm::RefVector<TrackingParticleCollection> &tpColl) const override;
+
+  void associateMuons(reco::MuonToSimCollection &recoToSim,
+                      reco::SimToMuonCollection &simToReco,
+                      const edm::Handle<edm::View<reco::Muon>> &muons,
+                      reco::MuonTrackType type,
+                      const edm::Handle<TrackingParticleCollection> &tpColl) const override;
+
+  // ---------- static member functions --------------------
 
+  // ---------- member functions ---------------------------
+
+private:
+  MuonToTrackingParticleAssociatorByHitsImpl(const MuonToTrackingParticleAssociatorByHitsImpl &) =
+      delete;  // stop default
+
+  const MuonToTrackingParticleAssociatorByHitsImpl &operator=(const MuonToTrackingParticleAssociatorByHitsImpl &) =
+      delete;  // stop default
+
+  // ---------- member data --------------------------------
+  TrackerMuonHitExtractor const *m_hitExtractor;
+  MuonAssociatorByHitsHelper::Resources m_resources;
+  MuonAssociatorByHitsHelper const *m_helper;
+};
 
 #endif
diff --git a/SimMuon/MCTruth/plugins/MuonToTrackingParticleAssociatorEDProducer.cc b/SimMuon/MCTruth/plugins/MuonToTrackingParticleAssociatorEDProducer.cc
index 94c0e1a85f7b4..fd89f6fbb3e51 100644
--- a/SimMuon/MCTruth/plugins/MuonToTrackingParticleAssociatorEDProducer.cc
+++ b/SimMuon/MCTruth/plugins/MuonToTrackingParticleAssociatorEDProducer.cc
@@ -2,8 +2,10 @@
 //
 // Package:    SimMuon/MCTruth
 // Class:      MuonToTrackingParticleAssociatorEDProducer
-// 
-/**\class MuonToTrackingParticleAssociatorEDProducer MuonToTrackingParticleAssociatorEDProducer.cc SimMuon/MCTruth/plugins/MuonToTrackingParticleAssociatorEDProducer.cc
+//
+/**\class MuonToTrackingParticleAssociatorEDProducer
+ MuonToTrackingParticleAssociatorEDProducer.cc
+ SimMuon/MCTruth/plugins/MuonToTrackingParticleAssociatorEDProducer.cc
 
  Description: [one line class summary]
 
@@ -16,7 +18,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -29,11 +30,11 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "SimMuon/MCTruth/interface/TrackerMuonHitExtractor.h"
-#include "SimDataFormats/Associations/interface/MuonToTrackingParticleAssociator.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "MuonToTrackingParticleAssociatorByHitsImpl.h"
+#include "SimDataFormats/Associations/interface/MuonToTrackingParticleAssociator.h"
+#include "SimMuon/MCTruth/interface/TrackerMuonHitExtractor.h"
 
 //
 // class declaration
@@ -43,30 +44,27 @@ namespace {
 
   class InputDumper {
   public:
-    
-    InputDumper(const edm::ParameterSet& conf, edm::ConsumesCollector && iC) :
-      simtracksTag(conf.getParameter<edm::InputTag>("simtracksTag")),
-      simtracksXFTag(conf.getParameter<edm::InputTag>("simtracksXFTag")),
-      crossingframe(conf.getParameter<bool>("crossingframe")) 
-    {
+    InputDumper(const edm::ParameterSet &conf, edm::ConsumesCollector &&iC)
+        : simtracksTag(conf.getParameter<edm::InputTag>("simtracksTag")),
+          simtracksXFTag(conf.getParameter<edm::InputTag>("simtracksXFTag")),
+          crossingframe(conf.getParameter<bool>("crossingframe")) {
       if (crossingframe) {
-        simtracksXFToken_ = iC.consumes<CrossingFrame<SimTrack> >(simtracksXFTag);
-        simvertsXFToken_ = iC.consumes<CrossingFrame<SimVertex> >(simtracksXFTag);
-      }
-      else{
+        simtracksXFToken_ = iC.consumes<CrossingFrame<SimTrack>>(simtracksXFTag);
+        simvertsXFToken_ = iC.consumes<CrossingFrame<SimVertex>>(simtracksXFTag);
+      } else {
         simtracksToken_ = iC.consumes<edm::SimTrackContainer>(simtracksTag);
         simvertsToken_ = iC.consumes<edm::SimVertexContainer>(simtracksTag);
       }
     }
 
-    void read(const edm::Event&);
-    void dump(const TrackHitsCollection&, const TrackingParticleCollection&) const;
+    void read(const edm::Event &);
+    void dump(const TrackHitsCollection &, const TrackingParticleCollection &) const;
 
   private:
     edm::InputTag simtracksTag;
     edm::InputTag simtracksXFTag;
-    edm::EDGetTokenT<CrossingFrame<SimTrack> > simtracksXFToken_;
-    edm::EDGetTokenT<CrossingFrame<SimVertex> > simvertsXFToken_;
+    edm::EDGetTokenT<CrossingFrame<SimTrack>> simtracksXFToken_;
+    edm::EDGetTokenT<CrossingFrame<SimVertex>> simvertsXFToken_;
     edm::EDGetTokenT<edm::SimTrackContainer> simtracksToken_;
     edm::EDGetTokenT<edm::SimVertexContainer> simvertsToken_;
 
@@ -76,109 +74,114 @@ namespace {
     edm::Handle<edm::SimVertexContainer> simverts_;
     bool const crossingframe;
   };
-  
-  void
-  InputDumper::read(const edm::Event& iEvent) {
-    if(crossingframe) {
+
+  void InputDumper::read(const edm::Event &iEvent) {
+    if (crossingframe) {
       iEvent.getByToken(simtracksXFToken_, simtracksXF_);
       iEvent.getByToken(simvertsXFToken_, simvertsXF_);
-    }else {
+    } else {
       iEvent.getByToken(simtracksToken_, simtracks_);
       iEvent.getByToken(simvertsToken_, simverts_);
     }
   }
 
-  void
-  InputDumper::dump(const TrackHitsCollection& tC, const TrackingParticleCollection& tPC) const {
+  void InputDumper::dump(const TrackHitsCollection &tC, const TrackingParticleCollection &tPC) const {
     using namespace std;
     // reco::Track collection
-    edm::LogVerbatim("MuonToTrackingParticleAssociatorEDProducer")<<"\n"<<"reco::Track collection --- size = "<<tC.size();
- 
+    edm::LogVerbatim("MuonToTrackingParticleAssociatorEDProducer") << "\n"
+                                                                   << "reco::Track collection --- size = " << tC.size();
+
     // TrackingParticle collection
-    edm::LogVerbatim("MuonToTrackingParticleAssociatorEDProducer")<<"\n"<<"TrackingParticle collection --- size = "<<tPC.size();
+    edm::LogVerbatim("MuonToTrackingParticleAssociatorEDProducer")
+        << "\n"
+        << "TrackingParticle collection --- size = " << tPC.size();
     int j = 0;
-    for(TrackingParticleCollection::const_iterator ITER=tPC.begin(); ITER!=tPC.end(); ITER++, j++) {
+    for (TrackingParticleCollection::const_iterator ITER = tPC.begin(); ITER != tPC.end(); ITER++, j++) {
       edm::LogVerbatim("MuonToTrackingParticleAssociatorEDProducer")
-        <<"TrackingParticle "<<j<<", q = "<<ITER->charge()<<", p = "<<ITER->p()
-        <<", pT = "<<ITER->pt()<<", eta = "<<ITER->eta()<<", phi = "<<ITER->phi();
-       
+          << "TrackingParticle " << j << ", q = " << ITER->charge() << ", p = " << ITER->p() << ", pT = " << ITER->pt()
+          << ", eta = " << ITER->eta() << ", phi = " << ITER->phi();
+
       edm::LogVerbatim("MuonToTrackingParticleAssociatorEDProducer")
-        <<"\t pdg code = "<<ITER->pdgId()<<", made of "<<ITER->numberOfHits()<<" PSimHit"
-        <<" (in "<<ITER->numberOfTrackerLayers()<<" layers)"
-        <<" from "<<ITER->g4Tracks().size()<<" SimTrack:";
-      for (TrackingParticle::g4t_iterator g4T=ITER->g4Track_begin(); g4T!=ITER->g4Track_end(); g4T++) {
+          << "\t pdg code = " << ITER->pdgId() << ", made of " << ITER->numberOfHits() << " PSimHit"
+          << " (in " << ITER->numberOfTrackerLayers() << " layers)"
+          << " from " << ITER->g4Tracks().size() << " SimTrack:";
+      for (TrackingParticle::g4t_iterator g4T = ITER->g4Track_begin(); g4T != ITER->g4Track_end(); g4T++) {
         edm::LogVerbatim("MuonToTrackingParticleAssociatorEDProducer")
-          <<"\t\t Id:"<<g4T->trackId()<<"/Evt:("<<g4T->eventId().event()<<","<<g4T->eventId().bunchCrossing()<<")";
-      }    
+            << "\t\t Id:" << g4T->trackId() << "/Evt:(" << g4T->eventId().event() << ","
+            << g4T->eventId().bunchCrossing() << ")";
+      }
     }
- 
+
     if (crossingframe) {
-      std:: unique_ptr<MixCollection<SimTrack> > SimTk( new MixCollection<SimTrack>(simtracksXF_.product()) );
+      std::unique_ptr<MixCollection<SimTrack>> SimTk(new MixCollection<SimTrack>(simtracksXF_.product()));
       edm::LogVerbatim("MuonToTrackingParticleAssociatorEDProducer")
-	<<"\n"<<"CrossingFrame<SimTrack> collection with InputTag = "<<simtracksXFTag<<" has size = "<<SimTk->size();
+          << "\n"
+          << "CrossingFrame<SimTrack> collection with InputTag = " << simtracksXFTag << " has size = " << SimTk->size();
       int k = 0;
-      for (MixCollection<SimTrack>::MixItr ITER=SimTk->begin(); ITER!=SimTk->end(); ITER++, k++) {
+      for (MixCollection<SimTrack>::MixItr ITER = SimTk->begin(); ITER != SimTk->end(); ITER++, k++) {
         edm::LogVerbatim("MuonToTrackingParticleAssociatorEDProducer")
-          <<"SimTrack "<<k
-          <<" - Id:"<<ITER->trackId()<<"/Evt:("<<ITER->eventId().event()<<","<<ITER->eventId().bunchCrossing()<<")"
-          <<", q = "<<ITER->charge()<<", p = "<<ITER->momentum().P()
-          <<", pT = "<<ITER->momentum().Pt()<<", eta = "<<ITER->momentum().Eta()<<", phi = "<<ITER->momentum().Phi()
-	  <<"\n\t pdgId = "<<ITER->type()<<", Vertex index = "<<ITER->vertIndex()
-	  <<", Gen Particle index = "<< (ITER->genpartIndex()>0 ? ITER->genpartIndex()-1 : ITER->genpartIndex()) <<endl;
+            << "SimTrack " << k << " - Id:" << ITER->trackId() << "/Evt:(" << ITER->eventId().event() << ","
+            << ITER->eventId().bunchCrossing() << ")"
+            << ", q = " << ITER->charge() << ", p = " << ITER->momentum().P() << ", pT = " << ITER->momentum().Pt()
+            << ", eta = " << ITER->momentum().Eta() << ", phi = " << ITER->momentum().Phi()
+            << "\n\t pdgId = " << ITER->type() << ", Vertex index = " << ITER->vertIndex()
+            << ", Gen Particle index = " << (ITER->genpartIndex() > 0 ? ITER->genpartIndex() - 1 : ITER->genpartIndex())
+            << endl;
       }
 
-      std::unique_ptr<MixCollection<SimVertex> > SimVtx( new MixCollection<SimVertex>(simvertsXF_.product()) );
+      std::unique_ptr<MixCollection<SimVertex>> SimVtx(new MixCollection<SimVertex>(simvertsXF_.product()));
       edm::LogVerbatim("MuonToTrackingParticleAssociatorEDProducer")
-	<<"\n"<<"CrossingFrame<SimVertex> collection with InputTag = "<<simtracksXFTag<<" has size = "<<SimVtx->size();
+          << "\n"
+          << "CrossingFrame<SimVertex> collection with InputTag = " << simtracksXFTag
+          << " has size = " << SimVtx->size();
       int kv = 0;
-      for (MixCollection<SimVertex>::MixItr VITER=SimVtx->begin(); VITER!=SimVtx->end(); VITER++, kv++){
+      for (MixCollection<SimVertex>::MixItr VITER = SimVtx->begin(); VITER != SimVtx->end(); VITER++, kv++) {
         edm::LogVerbatim("MuonToTrackingParticleAssociatorEDProducer")
-          <<"SimVertex "<<kv
-	  <<" - Id:"<<VITER->vertexId()<<", position = "<<VITER->position()<<", parent SimTrack Id = "<<VITER->parentIndex()
-	  <<", processType = "<<VITER->processType();
+            << "SimVertex " << kv << " - Id:" << VITER->vertexId() << ", position = " << VITER->position()
+            << ", parent SimTrack Id = " << VITER->parentIndex() << ", processType = " << VITER->processType();
       }
-    }
-    else {
+    } else {
       const edm::SimTrackContainer simTC = *(simtracks_.product());
-      edm::LogVerbatim("MuonToTrackingParticleAssociatorEDProducer")<<"\n"<<"SimTrack collection with InputTag = "<<simtracksTag
-                                              <<" has size = "<<simTC.size()<<endl;
+      edm::LogVerbatim("MuonToTrackingParticleAssociatorEDProducer")
+          << "\n"
+          << "SimTrack collection with InputTag = " << simtracksTag << " has size = " << simTC.size() << endl;
       int k = 0;
-      for(edm::SimTrackContainer::const_iterator ITER=simTC.begin(); ITER!=simTC.end(); ITER++, k++){
+      for (edm::SimTrackContainer::const_iterator ITER = simTC.begin(); ITER != simTC.end(); ITER++, k++) {
         edm::LogVerbatim("MuonToTrackingParticleAssociatorEDProducer")
-          <<"SimTrack "<<k
-          <<" - Id:"<<ITER->trackId()<<"/Evt:("<<ITER->eventId().event()<<","<<ITER->eventId().bunchCrossing()<<")"
-          <<", q = "<<ITER->charge()<<", p = "<<ITER->momentum().P()
-          <<", pT = "<<ITER->momentum().Pt()<<", eta = "<<ITER->momentum().Eta()<<", phi = "<<ITER->momentum().Phi()
-	  <<"\n\t pdgId = "<<ITER->type()<<", Vertex index = "<<ITER->vertIndex()
-	  <<", Gen Particle index = "<< (ITER->genpartIndex()>0 ? ITER->genpartIndex()-1 : ITER->genpartIndex()) <<endl;
+            << "SimTrack " << k << " - Id:" << ITER->trackId() << "/Evt:(" << ITER->eventId().event() << ","
+            << ITER->eventId().bunchCrossing() << ")"
+            << ", q = " << ITER->charge() << ", p = " << ITER->momentum().P() << ", pT = " << ITER->momentum().Pt()
+            << ", eta = " << ITER->momentum().Eta() << ", phi = " << ITER->momentum().Phi()
+            << "\n\t pdgId = " << ITER->type() << ", Vertex index = " << ITER->vertIndex()
+            << ", Gen Particle index = " << (ITER->genpartIndex() > 0 ? ITER->genpartIndex() - 1 : ITER->genpartIndex())
+            << endl;
       }
       const edm::SimVertexContainer simVC = *(simverts_.product());
-      edm::LogVerbatim("MuonToTrackingParticleAssociatorEDProducer")<<"\n"<<"SimVertex collection with InputTag = "<<"g4SimHits"
-                                              <<" has size = "<<simVC.size()<<endl;
+      edm::LogVerbatim("MuonToTrackingParticleAssociatorEDProducer") << "\n"
+                                                                     << "SimVertex collection with InputTag = "
+                                                                     << "g4SimHits"
+                                                                     << " has size = " << simVC.size() << endl;
       int kv = 0;
-      for (edm::SimVertexContainer::const_iterator VITER=simVC.begin(); VITER!=simVC.end(); VITER++, kv++){
+      for (edm::SimVertexContainer::const_iterator VITER = simVC.begin(); VITER != simVC.end(); VITER++, kv++) {
         edm::LogVerbatim("MuonToTrackingParticleAssociatorEDProducer")
-          <<"SimVertex "<<kv
-	  <<" - Id:"<<VITER->vertexId()<<", position = "<<VITER->position()<<", parent SimTrack Id = "<<VITER->parentIndex()
-	  <<", processType = "<<VITER->processType();
+            << "SimVertex " << kv << " - Id:" << VITER->vertexId() << ", position = " << VITER->position()
+            << ", parent SimTrack Id = " << VITER->parentIndex() << ", processType = " << VITER->processType();
       }
     }
-
   }
 
-}
-
+}  // namespace
 
 class MuonToTrackingParticleAssociatorEDProducer : public edm::stream::EDProducer<> {
 public:
-  explicit MuonToTrackingParticleAssociatorEDProducer(const edm::ParameterSet&);
+  explicit MuonToTrackingParticleAssociatorEDProducer(const edm::ParameterSet &);
   ~MuonToTrackingParticleAssociatorEDProducer() override;
-  
-  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-  
+
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
+
 private:
-  void produce(edm::Event&, const edm::EventSetup&) override;
-  
+  void produce(edm::Event &, const edm::EventSetup &) override;
+
   // ----------member data ---------------------------
   edm::ParameterSet const config_;
   MuonAssociatorByHitsHelper helper_;
@@ -197,7 +200,6 @@ class MuonToTrackingParticleAssociatorEDProducer : public edm::stream::EDProduce
 // constants, enums and typedefs
 //
 
-
 //
 // static data member definitions
 //
@@ -205,96 +207,92 @@ class MuonToTrackingParticleAssociatorEDProducer : public edm::stream::EDProduce
 //
 // constructors and destructor
 //
-MuonToTrackingParticleAssociatorEDProducer::MuonToTrackingParticleAssociatorEDProducer(const edm::ParameterSet& iConfig):
-  config_(iConfig),
-  helper_(iConfig),
-  trackerHitAssociatorConfig_(iConfig,consumesCollector()),
-  hitExtractor_(iConfig,consumesCollector())
-{
-   //register your products
-   produces<reco::MuonToTrackingParticleAssociator>();
-
-   //hack for consumes
-   RPCHitAssociator rpctruth(iConfig,consumesCollector());
-   GEMHitAssociator gemtruth(iConfig,consumesCollector());
-   DTHitAssociator dttruth(iConfig,consumesCollector());
-   CSCHitAssociator cscruth(iConfig,consumesCollector());
-
-  if( iConfig.getUntrackedParameter<bool>("dumpInputCollections") ) {
-    diagnostics_.reset( new InputDumper(iConfig, consumesCollector()) );
+MuonToTrackingParticleAssociatorEDProducer::MuonToTrackingParticleAssociatorEDProducer(const edm::ParameterSet &iConfig)
+    : config_(iConfig),
+      helper_(iConfig),
+      trackerHitAssociatorConfig_(iConfig, consumesCollector()),
+      hitExtractor_(iConfig, consumesCollector()) {
+  // register your products
+  produces<reco::MuonToTrackingParticleAssociator>();
+
+  // hack for consumes
+  RPCHitAssociator rpctruth(iConfig, consumesCollector());
+  GEMHitAssociator gemtruth(iConfig, consumesCollector());
+  DTHitAssociator dttruth(iConfig, consumesCollector());
+  CSCHitAssociator cscruth(iConfig, consumesCollector());
+
+  if (iConfig.getUntrackedParameter<bool>("dumpInputCollections")) {
+    diagnostics_.reset(new InputDumper(iConfig, consumesCollector()));
   }
 }
 
-
-MuonToTrackingParticleAssociatorEDProducer::~MuonToTrackingParticleAssociatorEDProducer()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+MuonToTrackingParticleAssociatorEDProducer::~MuonToTrackingParticleAssociatorEDProducer() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-MuonToTrackingParticleAssociatorEDProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace edm;
-
-   hitExtractor_.init(iEvent, iSetup);
-
-   //Retrieve tracker topology from geometry
-   edm::ESHandle<TrackerTopology> tTopoHand;
-   iSetup.get<TrackerTopologyRcd>().get(tTopoHand);
-   const TrackerTopology *tTopo=tTopoHand.product();
-   
-   bool printRtS = true;
-   
-   //NOTE: This assumes that produce will not be called until the edm::Event used in the previous call
-   // has been deleted. This is true for now. In the future, we may have to have the resources own
-   // the memory.
-
-   // Tracker hit association  
-   trackertruth_.reset(new TrackerHitAssociator(iEvent, trackerHitAssociatorConfig_));
-   // CSC hit association
-   csctruth_.reset(new CSCHitAssociator(iEvent,iSetup,config_));
-   // DT hit association
-   printRtS = false;
-   dttruth_.reset(new DTHitAssociator(iEvent,iSetup,config_,printRtS));
-   // RPC hit association
-   rpctruth_.reset( new RPCHitAssociator(iEvent,iSetup,config_) );
-   // GEM hit association
-   gemtruth_.reset( new GEMHitAssociator(iEvent,iSetup,config_) );
-   
-   MuonAssociatorByHitsHelper::Resources resources = {tTopo, trackertruth_.get(), csctruth_.get(), dttruth_.get(), rpctruth_.get(), gemtruth_.get()};
-
-   if(diagnostics_) {
-     diagnostics_->read(iEvent);
-     resources.diagnostics_ = [this](const TrackHitsCollection& hC, const TrackingParticleCollection& pC) {
-       diagnostics_->dump(hC,pC);
-     };
-   }
-
-   std::unique_ptr<reco::MuonToTrackingParticleAssociatorBaseImpl> impl{ 
-     new MuonToTrackingParticleAssociatorByHitsImpl(hitExtractor_,resources, &helper_) }; 
-   std::unique_ptr<reco::MuonToTrackingParticleAssociator> toPut( new reco::MuonToTrackingParticleAssociator(std::move(impl)));
-   iEvent.put(std::move(toPut));
+void MuonToTrackingParticleAssociatorEDProducer::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  using namespace edm;
+
+  hitExtractor_.init(iEvent, iSetup);
+
+  // Retrieve tracker topology from geometry
+  edm::ESHandle<TrackerTopology> tTopoHand;
+  iSetup.get<TrackerTopologyRcd>().get(tTopoHand);
+  const TrackerTopology *tTopo = tTopoHand.product();
+
+  bool printRtS = true;
+
+  // NOTE: This assumes that produce will not be called until the edm::Event
+  // used in the previous call
+  // has been deleted. This is true for now. In the future, we may have to have
+  // the resources own the memory.
+
+  // Tracker hit association
+  trackertruth_.reset(new TrackerHitAssociator(iEvent, trackerHitAssociatorConfig_));
+  // CSC hit association
+  csctruth_.reset(new CSCHitAssociator(iEvent, iSetup, config_));
+  // DT hit association
+  printRtS = false;
+  dttruth_.reset(new DTHitAssociator(iEvent, iSetup, config_, printRtS));
+  // RPC hit association
+  rpctruth_.reset(new RPCHitAssociator(iEvent, iSetup, config_));
+  // GEM hit association
+  gemtruth_.reset(new GEMHitAssociator(iEvent, iSetup, config_));
+
+  MuonAssociatorByHitsHelper::Resources resources = {
+      tTopo, trackertruth_.get(), csctruth_.get(), dttruth_.get(), rpctruth_.get(), gemtruth_.get()};
+
+  if (diagnostics_) {
+    diagnostics_->read(iEvent);
+    resources.diagnostics_ = [this](const TrackHitsCollection &hC, const TrackingParticleCollection &pC) {
+      diagnostics_->dump(hC, pC);
+    };
+  }
+
+  std::unique_ptr<reco::MuonToTrackingParticleAssociatorBaseImpl> impl{
+      new MuonToTrackingParticleAssociatorByHitsImpl(hitExtractor_, resources, &helper_)};
+  std::unique_ptr<reco::MuonToTrackingParticleAssociator> toPut(
+      new reco::MuonToTrackingParticleAssociator(std::move(impl)));
+  iEvent.put(std::move(toPut));
 }
 
- 
-// ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
-void
-MuonToTrackingParticleAssociatorEDProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-  //The following says we do not know what parameters are allowed so do no validation
-  // Please change this to state exactly what you do use, even if it is no parameters
+// ------------ method fills 'descriptions' with the allowed parameters for the
+// module  ------------
+void MuonToTrackingParticleAssociatorEDProducer::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
+  // The following says we do not know what parameters are allowed so do no
+  // validation
+  // Please change this to state exactly what you do use, even if it is no
+  // parameters
   edm::ParameterSetDescription desc;
   desc.setUnknown();
   descriptions.addDefault(desc);
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(MuonToTrackingParticleAssociatorEDProducer);
diff --git a/SimMuon/MCTruth/plugins/MuonTrackProducer.cc b/SimMuon/MCTruth/plugins/MuonTrackProducer.cc
index 91f0484da19de..09de1e63b1ee9 100644
--- a/SimMuon/MCTruth/plugins/MuonTrackProducer.cc
+++ b/SimMuon/MCTruth/plugins/MuonTrackProducer.cc
@@ -1,51 +1,51 @@
 //
 // modified & integrated by Giovanni Abbiendi
-// from code by Arun Luthra: UserCode/luthra/MuonTrackSelector/src/MuonTrackSelector.cc
+// from code by Arun Luthra:
+// UserCode/luthra/MuonTrackSelector/src/MuonTrackSelector.cc
 //
-#include "SimMuon/MCTruth/plugins/MuonTrackProducer.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
-#include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/MuonDetId/interface/CSCDetId.h"
 #include "DataFormats/MuonDetId/interface/DTChamberId.h"
 #include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
 #include "DataFormats/MuonReco/interface/MuonSelectors.h"
+#include "DataFormats/TrackReco/interface/Track.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimMuon/MCTruth/plugins/MuonTrackProducer.h"
 #include <sstream>
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
-MuonTrackProducer::MuonTrackProducer(const edm::ParameterSet& parset) :
-  muonsToken(consumes<reco::MuonCollection>(parset.getParameter< edm::InputTag >("muonsTag"))),
-  inputDTRecSegment4DToken_(consumes<DTRecSegment4DCollection>(parset.getParameter<edm::InputTag>("inputDTRecSegment4DCollection"))),
-  inputCSCSegmentToken_(consumes<CSCSegmentCollection>(parset.getParameter<edm::InputTag>("inputCSCSegmentCollection"))),
-  selectionTags(parset.getParameter< std::vector<std::string> >("selectionTags")),
-  trackType(parset.getParameter< std::string >("trackType")),
-  parset_(parset)
-{
+MuonTrackProducer::MuonTrackProducer(const edm::ParameterSet &parset)
+    : muonsToken(consumes<reco::MuonCollection>(parset.getParameter<edm::InputTag>("muonsTag"))),
+      inputDTRecSegment4DToken_(
+          consumes<DTRecSegment4DCollection>(parset.getParameter<edm::InputTag>("inputDTRecSegment4DCollection"))),
+      inputCSCSegmentToken_(
+          consumes<CSCSegmentCollection>(parset.getParameter<edm::InputTag>("inputCSCSegmentCollection"))),
+      selectionTags(parset.getParameter<std::vector<std::string>>("selectionTags")),
+      trackType(parset.getParameter<std::string>("trackType")),
+      parset_(parset) {
   edm::LogVerbatim("MuonTrackProducer") << "constructing  MuonTrackProducer" << parset_.dump();
   produces<reco::TrackCollection>();
   produces<reco::TrackExtraCollection>();
   produces<TrackingRecHitCollection>();
 }
 
-MuonTrackProducer::~MuonTrackProducer() {
-}
+MuonTrackProducer::~MuonTrackProducer() {}
 
-void MuonTrackProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) 
-{
-  iEvent.getByToken(muonsToken,muonCollectionH);
+void MuonTrackProducer::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  iEvent.getByToken(muonsToken, muonCollectionH);
   iEvent.getByToken(inputDTRecSegment4DToken_, dtSegmentCollectionH_);
   iEvent.getByToken(inputCSCSegmentToken_, cscSegmentCollectionH_);
 
   edm::ESHandle<TrackerTopology> httopo;
   iSetup.get<TrackerTopologyRcd>().get(httopo);
-  const TrackerTopology& ttopo = *httopo;
+  const TrackerTopology &ttopo = *httopo;
 
   std::unique_ptr<reco::TrackCollection> selectedTracks(new reco::TrackCollection);
-  std::unique_ptr<reco::TrackExtraCollection> selectedTrackExtras( new reco::TrackExtraCollection() );
-  std::unique_ptr<TrackingRecHitCollection> selectedTrackHits( new TrackingRecHitCollection() );
+  std::unique_ptr<reco::TrackExtraCollection> selectedTrackExtras(new reco::TrackExtraCollection());
+  std::unique_ptr<TrackingRecHitCollection> selectedTrackHits(new TrackingRecHitCollection());
 
   reco::TrackRefProd rTracks = iEvent.getRefBeforePut<reco::TrackCollection>();
   reco::TrackExtraRefProd rTrackExtras = iEvent.getRefBeforePut<reco::TrackExtraCollection>();
@@ -54,85 +54,90 @@ void MuonTrackProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetu
   edm::Ref<reco::TrackExtraCollection>::key_type idx = 0;
   edm::Ref<reco::TrackExtraCollection>::key_type hidx = 0;
 
-  edm::LogVerbatim("MuonTrackProducer") <<"\nThere are "<< dtSegmentCollectionH_->size()<<" DT segments.";
+  edm::LogVerbatim("MuonTrackProducer") << "\nThere are " << dtSegmentCollectionH_->size() << " DT segments.";
   unsigned int index_dt_segment = 0;
-  for(DTRecSegment4DCollection::const_iterator segment = dtSegmentCollectionH_->begin();
-      segment != dtSegmentCollectionH_->end(); ++segment , index_dt_segment++) {
-    LocalPoint  segmentLocalPosition       = segment->localPosition();
-    LocalVector segmentLocalDirection      = segment->localDirection();
-    LocalError  segmentLocalPositionError  = segment->localPositionError();
-    LocalError  segmentLocalDirectionError = segment->localDirectionError();
+  for (DTRecSegment4DCollection::const_iterator segment = dtSegmentCollectionH_->begin();
+       segment != dtSegmentCollectionH_->end();
+       ++segment, index_dt_segment++) {
+    LocalPoint segmentLocalPosition = segment->localPosition();
+    LocalVector segmentLocalDirection = segment->localDirection();
+    LocalError segmentLocalPositionError = segment->localPositionError();
+    LocalError segmentLocalDirectionError = segment->localDirectionError();
     DetId geoid = segment->geographicalId();
     DTChamberId dtdetid = DTChamberId(geoid);
     int wheel = dtdetid.wheel();
     int station = dtdetid.station();
     int sector = dtdetid.sector();
-    
+
     float segmentX = segmentLocalPosition.x();
     float segmentY = segmentLocalPosition.y();
-    float segmentdXdZ = segmentLocalDirection.x()/segmentLocalDirection.z();
-    float segmentdYdZ = segmentLocalDirection.y()/segmentLocalDirection.z();
+    float segmentdXdZ = segmentLocalDirection.x() / segmentLocalDirection.z();
+    float segmentdYdZ = segmentLocalDirection.y() / segmentLocalDirection.z();
     float segmentXerr = sqrt(segmentLocalPositionError.xx());
     float segmentYerr = sqrt(segmentLocalPositionError.yy());
     float segmentdXdZerr = sqrt(segmentLocalDirectionError.xx());
     float segmentdYdZerr = sqrt(segmentLocalDirectionError.yy());
 
-    edm::LogVerbatim("MuonTrackProducer") 
-      <<"\nDT segment index :"<<index_dt_segment
-      <<"\nchamber Wh:"<<wheel<<",St:"<<station<<",Se:"<<sector
-      <<"\nLocal Position (X,Y)=("<<segmentX<<","<<segmentY<<") +/- ("<<segmentXerr<<","<<segmentYerr<<"), " 
-      <<"Local Direction (dXdZ,dYdZ)=("<<segmentdXdZ<<","<<segmentdYdZ<<") +/- ("<<segmentdXdZerr<<","<<segmentdYdZerr<<")"; 
+    edm::LogVerbatim("MuonTrackProducer")
+        << "\nDT segment index :" << index_dt_segment << "\nchamber Wh:" << wheel << ",St:" << station
+        << ",Se:" << sector << "\nLocal Position (X,Y)=(" << segmentX << "," << segmentY << ") +/- (" << segmentXerr
+        << "," << segmentYerr << "), "
+        << "Local Direction (dXdZ,dYdZ)=(" << segmentdXdZ << "," << segmentdYdZ << ") +/- (" << segmentdXdZerr << ","
+        << segmentdYdZerr << ")";
   }
 
-  edm::LogVerbatim("MuonTrackProducer") <<"\nThere are "<< cscSegmentCollectionH_->size()<<" CSC segments.";
+  edm::LogVerbatim("MuonTrackProducer") << "\nThere are " << cscSegmentCollectionH_->size() << " CSC segments.";
   unsigned int index_csc_segment = 0;
-  for(CSCSegmentCollection::const_iterator segment = cscSegmentCollectionH_->begin();
-      segment != cscSegmentCollectionH_->end(); ++segment , index_csc_segment++) {
-    LocalPoint  segmentLocalPosition       = segment->localPosition();
-    LocalVector segmentLocalDirection      = segment->localDirection();
-    LocalError  segmentLocalPositionError  = segment->localPositionError();
-    LocalError  segmentLocalDirectionError = segment->localDirectionError();
+  for (CSCSegmentCollection::const_iterator segment = cscSegmentCollectionH_->begin();
+       segment != cscSegmentCollectionH_->end();
+       ++segment, index_csc_segment++) {
+    LocalPoint segmentLocalPosition = segment->localPosition();
+    LocalVector segmentLocalDirection = segment->localDirection();
+    LocalError segmentLocalPositionError = segment->localPositionError();
+    LocalError segmentLocalDirectionError = segment->localDirectionError();
 
     DetId geoid = segment->geographicalId();
     CSCDetId cscdetid = CSCDetId(geoid);
     int endcap = cscdetid.endcap();
     int station = cscdetid.station();
     int ring = cscdetid.ring();
-    int chamber = cscdetid.chamber(); 
-    
+    int chamber = cscdetid.chamber();
+
     float segmentX = segmentLocalPosition.x();
     float segmentY = segmentLocalPosition.y();
-    float segmentdXdZ = segmentLocalDirection.x()/segmentLocalDirection.z();
-    float segmentdYdZ = segmentLocalDirection.y()/segmentLocalDirection.z();
+    float segmentdXdZ = segmentLocalDirection.x() / segmentLocalDirection.z();
+    float segmentdYdZ = segmentLocalDirection.y() / segmentLocalDirection.z();
     float segmentXerr = sqrt(segmentLocalPositionError.xx());
     float segmentYerr = sqrt(segmentLocalPositionError.yy());
     float segmentdXdZerr = sqrt(segmentLocalDirectionError.xx());
     float segmentdYdZerr = sqrt(segmentLocalDirectionError.yy());
 
-    edm::LogVerbatim("MuonTrackProducer") 
-      <<"\nCSC segment index :"<<index_csc_segment
-      <<"\nchamber Endcap:"<<endcap<<",St:"<<station<<",Ri:"<<ring<<",Ch:"<<chamber
-      <<"\nLocal Position (X,Y)=("<<segmentX<<","<<segmentY<<") +/- ("<<segmentXerr<<","<<segmentYerr<<"), " 
-      <<"Local Direction (dXdZ,dYdZ)=("<<segmentdXdZ<<","<<segmentdYdZ<<") +/- ("<<segmentdXdZerr<<","<<segmentdYdZerr<<")"; 
+    edm::LogVerbatim("MuonTrackProducer")
+        << "\nCSC segment index :" << index_csc_segment << "\nchamber Endcap:" << endcap << ",St:" << station
+        << ",Ri:" << ring << ",Ch:" << chamber << "\nLocal Position (X,Y)=(" << segmentX << "," << segmentY << ") +/- ("
+        << segmentXerr << "," << segmentYerr << "), "
+        << "Local Direction (dXdZ,dYdZ)=(" << segmentdXdZ << "," << segmentdYdZ << ") +/- (" << segmentdXdZerr << ","
+        << segmentdYdZerr << ")";
   }
 
-  edm::LogVerbatim("MuonTrackProducer") <<"\nThere are "<< muonCollectionH->size() <<" reco::Muons.";
+  edm::LogVerbatim("MuonTrackProducer") << "\nThere are " << muonCollectionH->size() << " reco::Muons.";
   unsigned int muon_index = 0;
-  for(reco::MuonCollection::const_iterator muon = muonCollectionH->begin();
-       muon != muonCollectionH->end(); ++muon, muon_index++) {
-    edm::LogVerbatim("MuonTrackProducer") <<"\n******* muon index : "<<muon_index;
-    
-    std::vector<bool> isGood;    
-    for(unsigned int index=0; index<selectionTags.size(); ++index) {
+  for (reco::MuonCollection::const_iterator muon = muonCollectionH->begin(); muon != muonCollectionH->end();
+       ++muon, muon_index++) {
+    edm::LogVerbatim("MuonTrackProducer") << "\n******* muon index : " << muon_index;
+
+    std::vector<bool> isGood;
+    for (unsigned int index = 0; index < selectionTags.size(); ++index) {
       isGood.push_back(false);
 
       muon::SelectionType muonType = muon::selectionTypeFromString(selectionTags[index]);
       isGood[index] = muon::isGoodMuon(*muon, muonType);
     }
 
-    bool isGoodResult=true;
-    for(unsigned int index=0; index<isGood.size(); ++index) {
-      edm::LogVerbatim("MuonTrackProducer") << "selectionTag = "<<selectionTags[index]<< ": "<<isGood[index]<<"\n";
+    bool isGoodResult = true;
+    for (unsigned int index = 0; index < isGood.size(); ++index) {
+      edm::LogVerbatim("MuonTrackProducer")
+          << "selectionTag = " << selectionTags[index] << ": " << isGood[index] << "\n";
       isGoodResult *= isGood[index];
     }
 
@@ -140,209 +145,236 @@ void MuonTrackProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetu
       // new copy of Track
       reco::TrackRef trackref;
       if (trackType == "innerTrack") {
-        if (muon->innerTrack().isNonnull()) trackref = muon->innerTrack();
-        else continue;
-      } 
-      else if (trackType == "outerTrack") {
-        if (muon->outerTrack().isNonnull()) trackref = muon->outerTrack();
-        else continue;
-      } 
-      else if (trackType == "globalTrack") {
-        if (muon->globalTrack().isNonnull()) trackref = muon->globalTrack();
-        else continue;
-      }
-      else if (trackType == "innerTrackPlusSegments") {
-        if (muon->innerTrack().isNonnull()) trackref = muon->innerTrack();
-        else continue;
-      }
-      else if (trackType == "gemMuonTrack") {
-        if (muon->innerTrack().isNonnull() && muon->isGEMMuon()){
-            trackref = muon->innerTrack();
-        }
-        else continue;
-      }
-      else if (trackType == "me0MuonTrack") {
-        if (muon->innerTrack().isNonnull() && muon->isME0Muon()){
-            trackref = muon->innerTrack();
-        }
-        else continue;
+        if (muon->innerTrack().isNonnull())
+          trackref = muon->innerTrack();
+        else
+          continue;
+      } else if (trackType == "outerTrack") {
+        if (muon->outerTrack().isNonnull())
+          trackref = muon->outerTrack();
+        else
+          continue;
+      } else if (trackType == "globalTrack") {
+        if (muon->globalTrack().isNonnull())
+          trackref = muon->globalTrack();
+        else
+          continue;
+      } else if (trackType == "innerTrackPlusSegments") {
+        if (muon->innerTrack().isNonnull())
+          trackref = muon->innerTrack();
+        else
+          continue;
+      } else if (trackType == "gemMuonTrack") {
+        if (muon->innerTrack().isNonnull() && muon->isGEMMuon()) {
+          trackref = muon->innerTrack();
+        } else
+          continue;
+      } else if (trackType == "me0MuonTrack") {
+        if (muon->innerTrack().isNonnull() && muon->isME0Muon()) {
+          trackref = muon->innerTrack();
+        } else
+          continue;
       }
 
-      const reco::Track* trk = &(*trackref);
+      const reco::Track *trk = &(*trackref);
       // pointer to old track:
       std::unique_ptr<reco::Track> newTrk(new reco::Track(*trk));
 
-      newTrk->setExtra( reco::TrackExtraRef( rTrackExtras, idx++ ) );
+      newTrk->setExtra(reco::TrackExtraRef(rTrackExtras, idx++));
       PropagationDirection seedDir = trk->seedDirection();
       // new copy of track Extras
-      std::unique_ptr<reco::TrackExtra> newExtra(new reco::TrackExtra( trk->outerPosition(), trk->outerMomentum(), 
-								       trk->outerOk(), trk->innerPosition(), 
-								       trk->innerMomentum(), trk->innerOk(),
-								       trk->outerStateCovariance(), trk->outerDetId(),
-								       trk->innerStateCovariance(), trk->innerDetId() , seedDir )) ;
-
-      // new copy of the silicon hits; add hit refs to Extra and hits to hit collection
-      
-      //      edm::LogVerbatim("MuonTrackProducer")<<"\n printing initial hit_pattern";
-      //      trk->hitPattern().print();
+      std::unique_ptr<reco::TrackExtra> newExtra(new reco::TrackExtra(trk->outerPosition(),
+                                                                      trk->outerMomentum(),
+                                                                      trk->outerOk(),
+                                                                      trk->innerPosition(),
+                                                                      trk->innerMomentum(),
+                                                                      trk->innerOk(),
+                                                                      trk->outerStateCovariance(),
+                                                                      trk->outerDetId(),
+                                                                      trk->innerStateCovariance(),
+                                                                      trk->innerDetId(),
+                                                                      seedDir));
+
+      // new copy of the silicon hits; add hit refs to Extra and hits to hit
+      // collection
+
+      //      edm::LogVerbatim("MuonTrackProducer")<<"\n printing initial
+      //      hit_pattern"; trk->hitPattern().print();
       unsigned int nHitsToAdd = 0;
       for (trackingRecHit_iterator iHit = trk->recHitsBegin(); iHit != trk->recHitsEnd(); iHit++) {
-        TrackingRecHit* hit = (*iHit)->clone();
-        selectedTrackHits->push_back( hit );
+        TrackingRecHit *hit = (*iHit)->clone();
+        selectedTrackHits->push_back(hit);
         ++nHitsToAdd;
       }
-      newExtra->setHits( rHits, hidx, nHitsToAdd );
+      newExtra->setHits(rHits, hidx, nHitsToAdd);
       hidx += nHitsToAdd;
-      if (trackType == "innerTrackPlusSegments") { 
-	
-	int wheel, station, sector;
-	int endcap, /*station, */ ring, chamber;
-	
-	edm::LogVerbatim("MuonTrackProducer") <<"Number of chambers: "<<muon->matches().size()
-					      <<", arbitrated: "<<muon->numberOfMatches(reco::Muon::SegmentAndTrackArbitration);
-	unsigned int index_chamber = 0;
-	
-	for(std::vector<reco::MuonChamberMatch>::const_iterator chamberMatch = muon->matches().begin();
-	    chamberMatch != muon->matches().end(); ++chamberMatch, index_chamber++) {
-	  std::stringstream chamberStr;
-	  chamberStr <<"\nchamber index: "<<index_chamber; 
-	  
-	  int subdet = chamberMatch->detector();
-	  DetId did = chamberMatch->id;
-	  
-	  if (subdet == MuonSubdetId::DT) {
-	    DTChamberId dtdetid = DTChamberId(did);
-	    wheel = dtdetid.wheel();
-	    station = dtdetid.station();
-	    sector = dtdetid.sector();
-	    chamberStr << ", DT chamber Wh:"<<wheel<<",St:"<<station<<",Se:"<<sector;
-	  } 
-	  else if (subdet == MuonSubdetId::CSC) {
-	    CSCDetId cscdetid = CSCDetId(did);
-	    endcap = cscdetid.endcap();
-	    station = cscdetid.station();
-	    ring = cscdetid.ring();
-	    chamber = cscdetid.chamber();
-	    chamberStr << ", CSC chamber End:"<<endcap<<",St:"<<station<<",Ri:"<<ring<<",Ch:"<<chamber;
-	  }
-	  
-	  chamberStr << ", Number of segments: "<<chamberMatch->segmentMatches.size();
-	  edm::LogVerbatim("MuonTrackProducer") << chamberStr.str();
-
-	  unsigned int index_segment = 0;
-	  
-	  for(std::vector<reco::MuonSegmentMatch>::const_iterator segmentMatch = chamberMatch->segmentMatches.begin();
-	      segmentMatch != chamberMatch->segmentMatches.end(); ++segmentMatch, index_segment++) {
-	    
-	    float segmentX = segmentMatch->x;
-	    float segmentY = segmentMatch->y ;
-	    float segmentdXdZ = segmentMatch->dXdZ;
-	    float segmentdYdZ = segmentMatch->dYdZ;
-	    float segmentXerr = segmentMatch->xErr;
-	    float segmentYerr = segmentMatch->yErr;
-	    float segmentdXdZerr = segmentMatch->dXdZErr;
-	    float segmentdYdZerr = segmentMatch->dYdZErr;
-	    
-	    CSCSegmentRef segmentCSC = segmentMatch->cscSegmentRef;
-	    DTRecSegment4DRef segmentDT = segmentMatch->dtSegmentRef;
-	    
-	    bool segment_arbitrated_Ok = (segmentMatch->isMask(reco::MuonSegmentMatch::BestInChamberByDR) && 
-					  segmentMatch->isMask(reco::MuonSegmentMatch::BelongsToTrackByDR));
-	    
-	    std::string ARBITRATED(" ***Arbitrated Off*** ");
-	    if (segment_arbitrated_Ok) ARBITRATED = " ***ARBITRATED OK*** ";
-
-	    if (subdet == MuonSubdetId::DT) {	      
-	      edm::LogVerbatim("MuonTrackProducer")
-		<<"\n\t segment index: "<<index_segment << ARBITRATED
-		<<"\n\t  Local Position (X,Y)=("<<segmentX<<","<<segmentY<<") +/- ("<<segmentXerr<<","<<segmentYerr<<"), " 
-		<<"\n\t  Local Direction (dXdZ,dYdZ)=("<<segmentdXdZ<<","<<segmentdYdZ<<") +/- ("<<segmentdXdZerr<<","<<segmentdYdZerr<<")"; 
-	      
-	      if (!segment_arbitrated_Ok) continue;
-	      
-	      if (segmentDT.get() != nullptr) {
-		const DTRecSegment4D* segment = segmentDT.get();
-		
-		edm::LogVerbatim("MuonTrackProducer")<<"\t ===> MATCHING with DT segment with index = "<<segmentDT.key();
-		
-		if(segment->hasPhi()) {
-		  const DTChamberRecSegment2D* phiSeg = segment->phiSegment();
-		  std::vector<const TrackingRecHit*> phiHits = phiSeg->recHits();
+      if (trackType == "innerTrackPlusSegments") {
+        int wheel, station, sector;
+        int endcap, /*station, */ ring, chamber;
+
+        edm::LogVerbatim("MuonTrackProducer")
+            << "Number of chambers: " << muon->matches().size()
+            << ", arbitrated: " << muon->numberOfMatches(reco::Muon::SegmentAndTrackArbitration);
+        unsigned int index_chamber = 0;
+
+        for (std::vector<reco::MuonChamberMatch>::const_iterator chamberMatch = muon->matches().begin();
+             chamberMatch != muon->matches().end();
+             ++chamberMatch, index_chamber++) {
+          std::stringstream chamberStr;
+          chamberStr << "\nchamber index: " << index_chamber;
+
+          int subdet = chamberMatch->detector();
+          DetId did = chamberMatch->id;
+
+          if (subdet == MuonSubdetId::DT) {
+            DTChamberId dtdetid = DTChamberId(did);
+            wheel = dtdetid.wheel();
+            station = dtdetid.station();
+            sector = dtdetid.sector();
+            chamberStr << ", DT chamber Wh:" << wheel << ",St:" << station << ",Se:" << sector;
+          } else if (subdet == MuonSubdetId::CSC) {
+            CSCDetId cscdetid = CSCDetId(did);
+            endcap = cscdetid.endcap();
+            station = cscdetid.station();
+            ring = cscdetid.ring();
+            chamber = cscdetid.chamber();
+            chamberStr << ", CSC chamber End:" << endcap << ",St:" << station << ",Ri:" << ring << ",Ch:" << chamber;
+          }
+
+          chamberStr << ", Number of segments: " << chamberMatch->segmentMatches.size();
+          edm::LogVerbatim("MuonTrackProducer") << chamberStr.str();
+
+          unsigned int index_segment = 0;
+
+          for (std::vector<reco::MuonSegmentMatch>::const_iterator segmentMatch = chamberMatch->segmentMatches.begin();
+               segmentMatch != chamberMatch->segmentMatches.end();
+               ++segmentMatch, index_segment++) {
+            float segmentX = segmentMatch->x;
+            float segmentY = segmentMatch->y;
+            float segmentdXdZ = segmentMatch->dXdZ;
+            float segmentdYdZ = segmentMatch->dYdZ;
+            float segmentXerr = segmentMatch->xErr;
+            float segmentYerr = segmentMatch->yErr;
+            float segmentdXdZerr = segmentMatch->dXdZErr;
+            float segmentdYdZerr = segmentMatch->dYdZErr;
+
+            CSCSegmentRef segmentCSC = segmentMatch->cscSegmentRef;
+            DTRecSegment4DRef segmentDT = segmentMatch->dtSegmentRef;
+
+            bool segment_arbitrated_Ok = (segmentMatch->isMask(reco::MuonSegmentMatch::BestInChamberByDR) &&
+                                          segmentMatch->isMask(reco::MuonSegmentMatch::BelongsToTrackByDR));
+
+            std::string ARBITRATED(" ***Arbitrated Off*** ");
+            if (segment_arbitrated_Ok)
+              ARBITRATED = " ***ARBITRATED OK*** ";
+
+            if (subdet == MuonSubdetId::DT) {
+              edm::LogVerbatim("MuonTrackProducer")
+                  << "\n\t segment index: " << index_segment << ARBITRATED << "\n\t  Local Position (X,Y)=(" << segmentX
+                  << "," << segmentY << ") +/- (" << segmentXerr << "," << segmentYerr << "), "
+                  << "\n\t  Local Direction (dXdZ,dYdZ)=(" << segmentdXdZ << "," << segmentdYdZ << ") +/- ("
+                  << segmentdXdZerr << "," << segmentdYdZerr << ")";
+
+              if (!segment_arbitrated_Ok)
+                continue;
+
+              if (segmentDT.get() != nullptr) {
+                const DTRecSegment4D *segment = segmentDT.get();
+
+                edm::LogVerbatim("MuonTrackProducer")
+                    << "\t ===> MATCHING with DT segment with index = " << segmentDT.key();
+
+                if (segment->hasPhi()) {
+                  const DTChamberRecSegment2D *phiSeg = segment->phiSegment();
+                  std::vector<const TrackingRecHit *> phiHits = phiSeg->recHits();
                   unsigned int nHitsAdded = 0;
-		  for(std::vector<const TrackingRecHit*>::const_iterator ihit = phiHits.begin();
-		      ihit != phiHits.end(); ++ihit) {
-		    TrackingRecHit* seghit = (*ihit)->clone();
-		    newTrk->appendHitPattern(*seghit, ttopo);
-		    //		    edm::LogVerbatim("MuonTrackProducer")<<"hit pattern for position "<<index_hit<<" set to:";
-		    //		    newTrk->hitPattern().printHitPattern(index_hit, std::cout);
-		    selectedTrackHits->push_back( seghit );
+                  for (std::vector<const TrackingRecHit *>::const_iterator ihit = phiHits.begin();
+                       ihit != phiHits.end();
+                       ++ihit) {
+                    TrackingRecHit *seghit = (*ihit)->clone();
+                    newTrk->appendHitPattern(*seghit, ttopo);
+                    //		    edm::LogVerbatim("MuonTrackProducer")<<"hit
+                    // pattern for position "<<index_hit<<" set to:";
+                    //		    newTrk->hitPattern().printHitPattern(index_hit,
+                    // std::cout);
+                    selectedTrackHits->push_back(seghit);
                     ++nHitsAdded;
-		  }
-                  newExtra->setHits( rHits, hidx, nHitsAdded );
+                  }
+                  newExtra->setHits(rHits, hidx, nHitsAdded);
                   hidx += nHitsAdded;
-		}
-		
-		if(segment->hasZed()) {
-		  const DTSLRecSegment2D* zSeg = (*segment).zSegment();
-		  std::vector<const TrackingRecHit*> zedHits = zSeg->recHits();
+                }
+
+                if (segment->hasZed()) {
+                  const DTSLRecSegment2D *zSeg = (*segment).zSegment();
+                  std::vector<const TrackingRecHit *> zedHits = zSeg->recHits();
                   unsigned int nHitsAdded = 0;
-		  for(std::vector<const TrackingRecHit*>::const_iterator ihit = zedHits.begin();
-		      ihit != zedHits.end(); ++ihit) {
-		    TrackingRecHit* seghit = (*ihit)->clone();
-		    newTrk->appendHitPattern(*seghit, ttopo);
-		    //		    edm::LogVerbatim("MuonTrackProducer")<<"hit pattern for position "<<index_hit<<" set to:";
-		    //		    newTrk->hitPattern().printHitPattern(index_hit, std::cout);
-		    selectedTrackHits->push_back( seghit );
+                  for (std::vector<const TrackingRecHit *>::const_iterator ihit = zedHits.begin();
+                       ihit != zedHits.end();
+                       ++ihit) {
+                    TrackingRecHit *seghit = (*ihit)->clone();
+                    newTrk->appendHitPattern(*seghit, ttopo);
+                    //		    edm::LogVerbatim("MuonTrackProducer")<<"hit
+                    // pattern for position "<<index_hit<<" set to:";
+                    //		    newTrk->hitPattern().printHitPattern(index_hit,
+                    // std::cout);
+                    selectedTrackHits->push_back(seghit);
                     ++nHitsAdded;
-		  }
-                  newExtra->setHits( rHits, hidx, nHitsAdded );
+                  }
+                  newExtra->setHits(rHits, hidx, nHitsAdded);
                   hidx += nHitsAdded;
-		}
-	      } else edm::LogWarning("MuonTrackProducer")<<"\n***WARNING: UNMATCHED DT segment ! \n";
-	    } // if (subdet == MuonSubdetId::DT)
-
-	    else if (subdet == MuonSubdetId::CSC) {
-	      edm::LogVerbatim("MuonTrackProducer")
-		<<"\n\t segment index: "<<index_segment << ARBITRATED
-		<<"\n\t  Local Position (X,Y)=("<<segmentX<<","<<segmentY<<") +/- ("<<segmentXerr<<","<<segmentYerr<<"), " 
-		<<"\n\t  Local Direction (dXdZ,dYdZ)=("<<segmentdXdZ<<","<<segmentdYdZ<<") +/- ("<<segmentdXdZerr<<","<<segmentdYdZerr<<")"; 
-	      
-	      if (!segment_arbitrated_Ok) continue;
-	      
-	      if (segmentCSC.get() != nullptr) {
-		const CSCSegment* segment = segmentCSC.get();
-		
-		edm::LogVerbatim("MuonTrackProducer")<<"\t ===> MATCHING with CSC segment with index = "<<segmentCSC.key();
-		
-		std::vector<const TrackingRecHit*> hits = segment->recHits();
+                }
+              } else
+                edm::LogWarning("MuonTrackProducer") << "\n***WARNING: UNMATCHED DT segment ! \n";
+            }  // if (subdet == MuonSubdetId::DT)
+
+            else if (subdet == MuonSubdetId::CSC) {
+              edm::LogVerbatim("MuonTrackProducer")
+                  << "\n\t segment index: " << index_segment << ARBITRATED << "\n\t  Local Position (X,Y)=(" << segmentX
+                  << "," << segmentY << ") +/- (" << segmentXerr << "," << segmentYerr << "), "
+                  << "\n\t  Local Direction (dXdZ,dYdZ)=(" << segmentdXdZ << "," << segmentdYdZ << ") +/- ("
+                  << segmentdXdZerr << "," << segmentdYdZerr << ")";
+
+              if (!segment_arbitrated_Ok)
+                continue;
+
+              if (segmentCSC.get() != nullptr) {
+                const CSCSegment *segment = segmentCSC.get();
+
+                edm::LogVerbatim("MuonTrackProducer")
+                    << "\t ===> MATCHING with CSC segment with index = " << segmentCSC.key();
+
+                std::vector<const TrackingRecHit *> hits = segment->recHits();
                 unsigned int nHitsAdded = 0;
-		for(std::vector<const TrackingRecHit*>::const_iterator ihit = hits.begin();
-		    ihit != hits.end(); ++ihit) {
-		  TrackingRecHit* seghit = (*ihit)->clone();
-		  newTrk->appendHitPattern(*seghit, ttopo);
-		  //		    edm::LogVerbatim("MuonTrackProducer")<<"hit pattern for position "<<index_hit<<" set to:";
-		  //		    newTrk->hitPattern().printHitPattern(index_hit, std::cout);
-		  selectedTrackHits->push_back( seghit );
+                for (std::vector<const TrackingRecHit *>::const_iterator ihit = hits.begin(); ihit != hits.end();
+                     ++ihit) {
+                  TrackingRecHit *seghit = (*ihit)->clone();
+                  newTrk->appendHitPattern(*seghit, ttopo);
+                  //		    edm::LogVerbatim("MuonTrackProducer")<<"hit
+                  // pattern for position "<<index_hit<<" set to:";
+                  //		    newTrk->hitPattern().printHitPattern(index_hit,
+                  // std::cout);
+                  selectedTrackHits->push_back(seghit);
                   ++nHitsAdded;
-		}
-                newExtra->setHits( rHits, hidx, nHitsAdded );
+                }
+                newExtra->setHits(rHits, hidx, nHitsAdded);
                 hidx += nHitsAdded;
-	      } else edm::LogWarning("MuonTrackProducer")<<"\n***WARNING: UNMATCHED CSC segment ! \n";
-	    }  //  else if (subdet == MuonSubdetId::CSC)
-
-	  } // loop on vector<MuonSegmentMatch>	  
-	} // loop on vector<MuonChamberMatch>	
-      } // if (trackType == "innerTrackPlusSegments")
-      
-      //      edm::LogVerbatim("MuonTrackProducer")<<"\n printing final hit_pattern";
-      //      newTrk->hitPattern().print();
-      
-      selectedTracks->push_back( *newTrk );
-      selectedTrackExtras->push_back( *newExtra );
-
-    } // if (isGoodResult)
-  }  // loop on reco::MuonCollection
-  
+              } else
+                edm::LogWarning("MuonTrackProducer") << "\n***WARNING: UNMATCHED CSC segment ! \n";
+            }  //  else if (subdet == MuonSubdetId::CSC)
+
+          }  // loop on vector<MuonSegmentMatch>
+        }    // loop on vector<MuonChamberMatch>
+      }      // if (trackType == "innerTrackPlusSegments")
+
+      //      edm::LogVerbatim("MuonTrackProducer")<<"\n printing final
+      //      hit_pattern"; newTrk->hitPattern().print();
+
+      selectedTracks->push_back(*newTrk);
+      selectedTrackExtras->push_back(*newExtra);
+
+    }  // if (isGoodResult)
+  }    // loop on reco::MuonCollection
+
   iEvent.put(std::move(selectedTracks));
   iEvent.put(std::move(selectedTrackExtras));
   iEvent.put(std::move(selectedTrackHits));
diff --git a/SimMuon/MCTruth/plugins/MuonTrackProducer.h b/SimMuon/MCTruth/plugins/MuonTrackProducer.h
index 5e6d808435e50..35c288a23fdfe 100644
--- a/SimMuon/MCTruth/plugins/MuonTrackProducer.h
+++ b/SimMuon/MCTruth/plugins/MuonTrackProducer.h
@@ -1,38 +1,39 @@
 //
 // modified & integrated by Giovanni Abbiendi
-// from code by Arun Luthra: UserCode/luthra/MuonTrackSelector/src/MuonTrackSelector.cc
+// from code by Arun Luthra:
+// UserCode/luthra/MuonTrackSelector/src/MuonTrackSelector.cc
 //
 #ifndef MCTruth_MuonTrackProducer_h
 #define MCTruth_MuonTrackProducer_h
 
-#include <memory>
-#include "FWCore/Framework/interface/stream/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/MuonReco/interface/MuonFwd.h"
-#include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/CSCRecHit/interface/CSCSegmentCollection.h"
 #include "DataFormats/DTRecHit/interface/DTRecSegment4DCollection.h"
+#include "DataFormats/MuonReco/interface/Muon.h"
+#include "DataFormats/MuonReco/interface/MuonFwd.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <memory>
 
 class MuonTrackProducer : public edm::stream::EDProducer<> {
-  public:
-    explicit MuonTrackProducer(const edm::ParameterSet&);
-    ~MuonTrackProducer() override;
+public:
+  explicit MuonTrackProducer(const edm::ParameterSet &);
+  ~MuonTrackProducer() override;
+
+private:
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
-  private:
-    void produce(edm::Event&, const edm::EventSetup&) override;
-  
-    edm::Handle<reco::MuonCollection> muonCollectionH;
-    edm::Handle<DTRecSegment4DCollection> dtSegmentCollectionH_;
-    edm::Handle<CSCSegmentCollection> cscSegmentCollectionH_;
+  edm::Handle<reco::MuonCollection> muonCollectionH;
+  edm::Handle<DTRecSegment4DCollection> dtSegmentCollectionH_;
+  edm::Handle<CSCSegmentCollection> cscSegmentCollectionH_;
 
-    edm::EDGetTokenT<reco::MuonCollection> muonsToken;
-    edm::EDGetTokenT<DTRecSegment4DCollection> inputDTRecSegment4DToken_;
-    edm::EDGetTokenT<CSCSegmentCollection> inputCSCSegmentToken_;
+  edm::EDGetTokenT<reco::MuonCollection> muonsToken;
+  edm::EDGetTokenT<DTRecSegment4DCollection> inputDTRecSegment4DToken_;
+  edm::EDGetTokenT<CSCSegmentCollection> inputCSCSegmentToken_;
 
-    std::vector<std::string> selectionTags;
-    std::string trackType;
-    const edm::ParameterSet parset_;
+  std::vector<std::string> selectionTags;
+  std::string trackType;
+  const edm::ParameterSet parset_;
 };
 
 #endif
diff --git a/SimMuon/MCTruth/plugins/SealModule.cc b/SimMuon/MCTruth/plugins/SealModule.cc
index 24ec606f4b1ed..60ff67f97fb8c 100644
--- a/SimMuon/MCTruth/plugins/SealModule.cc
+++ b/SimMuon/MCTruth/plugins/SealModule.cc
@@ -1,9 +1,8 @@
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "SimMuon/MCTruth/interface/CSCTruthTest.h"
 #include "SimMuon/MCTruth/plugins/MuonAssociatorEDProducer.h"
 #include "SimMuon/MCTruth/plugins/MuonTrackProducer.h"
-#include "SimMuon/MCTruth/interface/CSCTruthTest.h"
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-
 
 DEFINE_FWK_MODULE(MuonAssociatorEDProducer);
 DEFINE_FWK_MODULE(MuonTrackProducer);
diff --git a/SimMuon/MCTruth/plugins/SeedToTrackProducer.cc b/SimMuon/MCTruth/plugins/SeedToTrackProducer.cc
index 3c51dc3656195..605319718855c 100644
--- a/SimMuon/MCTruth/plugins/SeedToTrackProducer.cc
+++ b/SimMuon/MCTruth/plugins/SeedToTrackProducer.cc
@@ -2,8 +2,9 @@
 //
 // Package:    SeedToTrackProducer
 // Class:      SeedToTrackProducer
-// 
-/**\class SeedToTrackProducer SeedToTrackProducer.cc hugues/SeedToTrackProducer/plugins/SeedToTrackProducer.cc
+//
+/**\class SeedToTrackProducer SeedToTrackProducer.cc
+ hugues/SeedToTrackProducer/plugins/SeedToTrackProducer.cc
 
  Description: [one line class summary]
 
@@ -25,138 +26,148 @@
 //
 // constructors and destructor
 //
-SeedToTrackProducer::SeedToTrackProducer(const edm::ParameterSet& iConfig)
-{
-    
+SeedToTrackProducer::SeedToTrackProducer(const edm::ParameterSet &iConfig) {
   L2seedsTagT_ = consumes<TrajectorySeedCollection>(iConfig.getParameter<edm::InputTag>("L2seedsCollection"));
-  L2seedsTagS_ = consumes<edm::View<TrajectorySeed> >(iConfig.getParameter<edm::InputTag>("L2seedsCollection"));
+  L2seedsTagS_ = consumes<edm::View<TrajectorySeed>>(iConfig.getParameter<edm::InputTag>("L2seedsCollection"));
 
-    produces<reco::TrackCollection>();
-    produces<reco::TrackExtraCollection>();
-    produces<TrackingRecHitCollection>();
+  produces<reco::TrackCollection>();
+  produces<reco::TrackExtraCollection>();
+  produces<TrackingRecHitCollection>();
 }
 
-SeedToTrackProducer::~SeedToTrackProducer()
-{
-}
+SeedToTrackProducer::~SeedToTrackProducer() {}
 
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-SeedToTrackProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-    using namespace edm;
-    using namespace std;
-
-    std::unique_ptr<reco::TrackCollection> selectedTracks(new reco::TrackCollection);
-    std::unique_ptr<reco::TrackExtraCollection> selectedTrackExtras( new reco::TrackExtraCollection() );
-    std::unique_ptr<TrackingRecHitCollection> selectedTrackHits( new TrackingRecHitCollection() );
-    
-    reco::TrackRefProd rTracks = iEvent.getRefBeforePut<reco::TrackCollection>();
-    reco::TrackExtraRefProd rTrackExtras = iEvent.getRefBeforePut<reco::TrackExtraCollection>();
-    TrackingRecHitRefProd rHits = iEvent.getRefBeforePut<TrackingRecHitCollection>();
-    
-    edm::Ref<reco::TrackExtraCollection>::key_type hidx = 0;
-    edm::Ref<reco::TrackExtraCollection>::key_type idx = 0;
-    
-    // magnetic fied and detector geometry
-    iSetup.get<IdealMagneticFieldRecord>().get(theMGField);
-    iSetup.get<GlobalTrackingGeometryRecord>().get(theTrackingGeometry);
-
-    edm::ESHandle<TrackerTopology> httopo;
-    iSetup.get<TrackerTopologyRcd>().get(httopo);
-    const TrackerTopology& ttopo = *httopo;
-
-    // now read the L2 seeds collection :
-    edm::Handle<TrajectorySeedCollection> L2seedsCollection;
-    iEvent.getByToken(L2seedsTagT_,L2seedsCollection);
-    const std::vector<TrajectorySeed>* L2seeds = nullptr;
-    if (L2seedsCollection.isValid()) L2seeds = L2seedsCollection.product();
-    else  edm::LogError("SeedToTrackProducer") << "L2 seeds collection not found !! " << endl;
-    
-    edm::Handle<edm::View<TrajectorySeed> > seedHandle;
-    iEvent.getByToken(L2seedsTagS_, seedHandle);
-    
-    
-    int countRH = 0;
-
-    // now  loop on the seeds :
-    for (unsigned int i = 0; i < L2seeds->size() ; i++){
-        
-        
-        //get the kinematic extrapolation from the seed
-        TrajectoryStateOnSurface theTrajectory = seedTransientState(L2seeds->at(i));
-        float seedEta =  theTrajectory.globalMomentum().eta();
-        float seedPhi =  theTrajectory.globalMomentum().phi();
-        float seedPt =  theTrajectory.globalMomentum().perp();
-        CovarianceMatrix matrixSeedErr = theTrajectory.curvilinearError().matrix();
-        edm::LogVerbatim("SeedToTrackProducer") <<  "seedPt=" << seedPt << " seedEta=" << seedEta << " seedPhi=" << seedPhi << endl;
-        /*AlgebraicSymMatrix66 errors = theTrajectory.cartesianError().matrix();
-        double partialPterror = errors(3,3)*pow(theTrajectory.globalMomentum().x(),2) + errors(4,4)*pow(theTrajectory.globalMomentum().y(),2);
-	edm::LogVerbatim("SeedToTrackProducer") <<  "seedPtError=" << sqrt(partialPterror)/theTrajectory.globalMomentum().perp() << "seedPhiError=" << theTrajectory.curvilinearError().matrix()(2,2) << endl;*/ 
-        //fill the track in a way that its pt, phi and eta will be the same as the seed
-        math::XYZPoint initPoint(0,0,0);
-        math::XYZVector initMom(seedPt*cos(seedPhi),seedPt*sin(seedPhi),seedPt*sinh(seedEta));
-        reco::Track theTrack(1, 1, //dummy Chi2 and ndof
-                             initPoint, initMom,
-                             1, matrixSeedErr,
-                             reco::TrackBase::TrackAlgorithm::globalMuon, reco::TrackBase::TrackQuality::tight);
-
-        //fill the extra track with dummy information
-        math::XYZPoint dummyFinalPoint(1,1,1);
-        math::XYZVector dummyFinalMom(0,0,10);
-        edm::RefToBase<TrajectorySeed> seed(seedHandle, i);
-        CovarianceMatrix matrixExtra = ROOT::Math::SMatrixIdentity();
-        reco::TrackExtra theTrackExtra(dummyFinalPoint, dummyFinalMom, true, initPoint, initMom, true,
-                                  matrixSeedErr, 1,
-                                  matrixExtra, 2,
-                                  (L2seeds->at(i)).direction(), seed);
-        theTrack.setExtra( reco::TrackExtraRef( rTrackExtras, idx++ ) );
-        edm::LogVerbatim("SeedToTrackProducer") << "trackPt=" << theTrack.pt() << " trackEta=" << theTrack.eta() << " trackPhi=" << theTrack.phi() << endl;
-        edm::LogVerbatim("SeedToTrackProducer") << "trackPtError=" << theTrack.ptError() << "trackPhiError=" << theTrack.phiError() << endl;
- 
-        //fill the seed segments in the track
-        unsigned int nHitsAdded = 0;
-        for(TrajectorySeed::recHitContainer::const_iterator itRecHits=(L2seeds->at(i)).recHits().first; itRecHits!=(L2seeds->at(i)).recHits().second; ++itRecHits, ++countRH) {
-            TrackingRecHit* hit = (itRecHits)->clone();
-            theTrack.appendHitPattern(*hit, ttopo);
-            selectedTrackHits->push_back(hit);
-            nHitsAdded++;
-        }
-        theTrackExtra.setHits( rHits, hidx, nHitsAdded );
-        hidx += nHitsAdded;
-        selectedTracks->push_back(theTrack);
-        selectedTrackExtras->push_back(theTrackExtra);
-
+void SeedToTrackProducer::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  using namespace edm;
+  using namespace std;
+
+  std::unique_ptr<reco::TrackCollection> selectedTracks(new reco::TrackCollection);
+  std::unique_ptr<reco::TrackExtraCollection> selectedTrackExtras(new reco::TrackExtraCollection());
+  std::unique_ptr<TrackingRecHitCollection> selectedTrackHits(new TrackingRecHitCollection());
+
+  reco::TrackRefProd rTracks = iEvent.getRefBeforePut<reco::TrackCollection>();
+  reco::TrackExtraRefProd rTrackExtras = iEvent.getRefBeforePut<reco::TrackExtraCollection>();
+  TrackingRecHitRefProd rHits = iEvent.getRefBeforePut<TrackingRecHitCollection>();
+
+  edm::Ref<reco::TrackExtraCollection>::key_type hidx = 0;
+  edm::Ref<reco::TrackExtraCollection>::key_type idx = 0;
+
+  // magnetic fied and detector geometry
+  iSetup.get<IdealMagneticFieldRecord>().get(theMGField);
+  iSetup.get<GlobalTrackingGeometryRecord>().get(theTrackingGeometry);
+
+  edm::ESHandle<TrackerTopology> httopo;
+  iSetup.get<TrackerTopologyRcd>().get(httopo);
+  const TrackerTopology &ttopo = *httopo;
+
+  // now read the L2 seeds collection :
+  edm::Handle<TrajectorySeedCollection> L2seedsCollection;
+  iEvent.getByToken(L2seedsTagT_, L2seedsCollection);
+  const std::vector<TrajectorySeed> *L2seeds = nullptr;
+  if (L2seedsCollection.isValid())
+    L2seeds = L2seedsCollection.product();
+  else
+    edm::LogError("SeedToTrackProducer") << "L2 seeds collection not found !! " << endl;
+
+  edm::Handle<edm::View<TrajectorySeed>> seedHandle;
+  iEvent.getByToken(L2seedsTagS_, seedHandle);
+
+  int countRH = 0;
+
+  // now  loop on the seeds :
+  for (unsigned int i = 0; i < L2seeds->size(); i++) {
+    // get the kinematic extrapolation from the seed
+    TrajectoryStateOnSurface theTrajectory = seedTransientState(L2seeds->at(i));
+    float seedEta = theTrajectory.globalMomentum().eta();
+    float seedPhi = theTrajectory.globalMomentum().phi();
+    float seedPt = theTrajectory.globalMomentum().perp();
+    CovarianceMatrix matrixSeedErr = theTrajectory.curvilinearError().matrix();
+    edm::LogVerbatim("SeedToTrackProducer")
+        << "seedPt=" << seedPt << " seedEta=" << seedEta << " seedPhi=" << seedPhi << endl;
+    /*AlgebraicSymMatrix66 errors = theTrajectory.cartesianError().matrix();
+    double partialPterror =
+    errors(3,3)*pow(theTrajectory.globalMomentum().x(),2) +
+    errors(4,4)*pow(theTrajectory.globalMomentum().y(),2);
+    edm::LogVerbatim("SeedToTrackProducer") <<  "seedPtError=" <<
+    sqrt(partialPterror)/theTrajectory.globalMomentum().perp() <<
+    "seedPhiError=" << theTrajectory.curvilinearError().matrix()(2,2) << endl;*/
+    // fill the track in a way that its pt, phi and eta will be the same as the
+    // seed
+    math::XYZPoint initPoint(0, 0, 0);
+    math::XYZVector initMom(seedPt * cos(seedPhi), seedPt * sin(seedPhi), seedPt * sinh(seedEta));
+    reco::Track theTrack(1,
+                         1,  // dummy Chi2 and ndof
+                         initPoint,
+                         initMom,
+                         1,
+                         matrixSeedErr,
+                         reco::TrackBase::TrackAlgorithm::globalMuon,
+                         reco::TrackBase::TrackQuality::tight);
+
+    // fill the extra track with dummy information
+    math::XYZPoint dummyFinalPoint(1, 1, 1);
+    math::XYZVector dummyFinalMom(0, 0, 10);
+    edm::RefToBase<TrajectorySeed> seed(seedHandle, i);
+    CovarianceMatrix matrixExtra = ROOT::Math::SMatrixIdentity();
+    reco::TrackExtra theTrackExtra(dummyFinalPoint,
+                                   dummyFinalMom,
+                                   true,
+                                   initPoint,
+                                   initMom,
+                                   true,
+                                   matrixSeedErr,
+                                   1,
+                                   matrixExtra,
+                                   2,
+                                   (L2seeds->at(i)).direction(),
+                                   seed);
+    theTrack.setExtra(reco::TrackExtraRef(rTrackExtras, idx++));
+    edm::LogVerbatim("SeedToTrackProducer")
+        << "trackPt=" << theTrack.pt() << " trackEta=" << theTrack.eta() << " trackPhi=" << theTrack.phi() << endl;
+    edm::LogVerbatim("SeedToTrackProducer")
+        << "trackPtError=" << theTrack.ptError() << "trackPhiError=" << theTrack.phiError() << endl;
+
+    // fill the seed segments in the track
+    unsigned int nHitsAdded = 0;
+    for (TrajectorySeed::recHitContainer::const_iterator itRecHits = (L2seeds->at(i)).recHits().first;
+         itRecHits != (L2seeds->at(i)).recHits().second;
+         ++itRecHits, ++countRH) {
+      TrackingRecHit *hit = (itRecHits)->clone();
+      theTrack.appendHitPattern(*hit, ttopo);
+      selectedTrackHits->push_back(hit);
+      nHitsAdded++;
     }
-    iEvent.put(std::move(selectedTracks));
-    iEvent.put(std::move(selectedTrackExtras));
-    iEvent.put(std::move(selectedTrackHits));
-    
+    theTrackExtra.setHits(rHits, hidx, nHitsAdded);
+    hidx += nHitsAdded;
+    selectedTracks->push_back(theTrack);
+    selectedTrackExtras->push_back(theTrackExtra);
+  }
+  iEvent.put(std::move(selectedTracks));
+  iEvent.put(std::move(selectedTrackExtras));
+  iEvent.put(std::move(selectedTrackHits));
 }
 
-TrajectoryStateOnSurface SeedToTrackProducer::seedTransientState(const TrajectorySeed& tmpSeed){
-    
-    PTrajectoryStateOnDet tmpTSOD = tmpSeed.startingState();
-    DetId tmpDetId(tmpTSOD.detId());
-    const GeomDet* tmpGeomDet = theTrackingGeometry->idToDet(tmpDetId);
-    TrajectoryStateOnSurface tmpTSOS = trajectoryStateTransform::transientState(tmpTSOD, &(tmpGeomDet->surface()), &(*theMGField));
-    return tmpTSOS;
+TrajectoryStateOnSurface SeedToTrackProducer::seedTransientState(const TrajectorySeed &tmpSeed) {
+  PTrajectoryStateOnDet tmpTSOD = tmpSeed.startingState();
+  DetId tmpDetId(tmpTSOD.detId());
+  const GeomDet *tmpGeomDet = theTrackingGeometry->idToDet(tmpDetId);
+  TrajectoryStateOnSurface tmpTSOS =
+      trajectoryStateTransform::transientState(tmpTSOD, &(tmpGeomDet->surface()), &(*theMGField));
+  return tmpTSOS;
 }
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-SeedToTrackProducer::beginJob()
-{
-}
+// ------------ method called once each job just before starting event loop
+// ------------
+void SeedToTrackProducer::beginJob() {}
 
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-SeedToTrackProducer::endJob() {
-}
+// ------------ method called once each job just after ending the event loop
+// ------------
+void SeedToTrackProducer::endJob() {}
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SeedToTrackProducer);
diff --git a/SimMuon/MCTruth/plugins/SeedToTrackProducer.h b/SimMuon/MCTruth/plugins/SeedToTrackProducer.h
index 71800c9665a79..e751e43c490aa 100644
--- a/SimMuon/MCTruth/plugins/SeedToTrackProducer.h
+++ b/SimMuon/MCTruth/plugins/SeedToTrackProducer.h
@@ -2,10 +2,11 @@
 //
 // Package:    SeedToTrackProducer
 // Class:      SeedToTrackProducer
-// 
-/**\class SeedToTrackProducer SeedToTrackProducer.cc hugues/SeedToTrackProducer/plugins/SeedToTrackProducer.cc
+//
+/**\class SeedToTrackProducer SeedToTrackProducer.cc
+ hugues/SeedToTrackProducer/plugins/SeedToTrackProducer.cc
 
- Description: 
+ Description:
 
 */
 //
@@ -18,27 +19,27 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/one/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/one/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 
-#include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
+#include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
 
-#include "TrackingTools/TransientTrack/interface/TransientTrack.h"
-#include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
 #include "TrackingTools/Records/interface/TransientRecHitRecord.h"
+#include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
+#include "TrackingTools/TransientTrack/interface/TransientTrack.h"
 #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHitBuilder.h"
 
-#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
+#include "DataFormats/TrajectorySeed/interface/TrajectorySeedCollection.h"
 
 //
 // class declaration
@@ -47,21 +48,20 @@
 typedef math::Error<5>::type CovarianceMatrix;
 
 class SeedToTrackProducer : public edm::one::EDProducer<> {
-   public:
-      explicit SeedToTrackProducer(const edm::ParameterSet&);
-      ~SeedToTrackProducer() override;
+public:
+  explicit SeedToTrackProducer(const edm::ParameterSet &);
+  ~SeedToTrackProducer() override;
 
-   private:
-      void beginJob() override;
-      void produce(edm::Event&, const edm::EventSetup&) override;
-      void endJob() override;
-      virtual TrajectoryStateOnSurface seedTransientState(const TrajectorySeed&);
-      // ----------member data ---------------------------
-    
-    edm::EDGetTokenT<TrajectorySeedCollection> L2seedsTagT_;
-    edm::EDGetTokenT<edm::View<TrajectorySeed> > L2seedsTagS_;
-    
-    edm::ESHandle<MagneticField> theMGField;
-    edm::ESHandle<GlobalTrackingGeometry> theTrackingGeometry;
-};
+private:
+  void beginJob() override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
+  virtual TrajectoryStateOnSurface seedTransientState(const TrajectorySeed &);
+  // ----------member data ---------------------------
 
+  edm::EDGetTokenT<TrajectorySeedCollection> L2seedsTagT_;
+  edm::EDGetTokenT<edm::View<TrajectorySeed>> L2seedsTagS_;
+
+  edm::ESHandle<MagneticField> theMGField;
+  edm::ESHandle<GlobalTrackingGeometry> theTrackingGeometry;
+};
diff --git a/SimMuon/MCTruth/plugins/SimMuFilter.cc b/SimMuon/MCTruth/plugins/SimMuFilter.cc
index 9fbf205475c36..062b7288936e3 100644
--- a/SimMuon/MCTruth/plugins/SimMuFilter.cc
+++ b/SimMuon/MCTruth/plugins/SimMuFilter.cc
@@ -1,113 +1,108 @@
-#include "FWCore/Framework/interface/stream/EDFilter.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/stream/EDFilter.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-class SimMuFilter : public edm::stream::EDFilter<>
-{
- public:
-
-   explicit SimMuFilter(const edm::ParameterSet&);
-   ~SimMuFilter() override;
-
- private:
-
-   virtual void beginJob();
-   virtual void endJob();
-   bool filter(edm::Event&, const edm::EventSetup&) override;
-   
- private:
-   
-   edm::EDGetTokenT<std::vector<SimTrack> > simTracksToken_;
-   edm::EDGetTokenT<edm::PSimHitContainer> simHitsMuonRPCToken_;
-   edm::EDGetTokenT<edm::PSimHitContainer> simHitsMuonCSCToken_;
-   edm::EDGetTokenT<edm::PSimHitContainer> simHitsMuonDTToken_;
-   
-   edm::Handle<std::vector<SimTrack> > simTracksHandle;
-   edm::Handle<edm::PSimHitContainer> simHitsMuonRPCHandle;
-   edm::Handle<edm::PSimHitContainer> simHitsMuonCSCHandle;
-   edm::Handle<edm::PSimHitContainer> simHitsMuonDTHandle;
-   
-   int nMuSel_;
+class SimMuFilter : public edm::stream::EDFilter<> {
+public:
+  explicit SimMuFilter(const edm::ParameterSet &);
+  ~SimMuFilter() override;
+
+private:
+  virtual void beginJob();
+  virtual void endJob();
+  bool filter(edm::Event &, const edm::EventSetup &) override;
+
+private:
+  edm::EDGetTokenT<std::vector<SimTrack>> simTracksToken_;
+  edm::EDGetTokenT<edm::PSimHitContainer> simHitsMuonRPCToken_;
+  edm::EDGetTokenT<edm::PSimHitContainer> simHitsMuonCSCToken_;
+  edm::EDGetTokenT<edm::PSimHitContainer> simHitsMuonDTToken_;
+
+  edm::Handle<std::vector<SimTrack>> simTracksHandle;
+  edm::Handle<edm::PSimHitContainer> simHitsMuonRPCHandle;
+  edm::Handle<edm::PSimHitContainer> simHitsMuonCSCHandle;
+  edm::Handle<edm::PSimHitContainer> simHitsMuonDTHandle;
+
+  int nMuSel_;
 };
 
-SimMuFilter::SimMuFilter(const edm::ParameterSet& iConfig)
-{
-   simTracksToken_    = consumes<std::vector<SimTrack> >(iConfig.getParameter<edm::InputTag>("simTracksInput"));
-   simHitsMuonRPCToken_ = consumes<edm::PSimHitContainer>(iConfig.getParameter<edm::InputTag>("simHitsMuonRPCInput"));
-   simHitsMuonCSCToken_ = consumes<edm::PSimHitContainer>(iConfig.getParameter<edm::InputTag>("simHitsMuonCSCInput"));
-   simHitsMuonDTToken_ = consumes<edm::PSimHitContainer>(iConfig.getParameter<edm::InputTag>("simHitsMuonDTInput"));
-   nMuSel_             = iConfig.getParameter<int>("nMuSel");
+SimMuFilter::SimMuFilter(const edm::ParameterSet &iConfig) {
+  simTracksToken_ = consumes<std::vector<SimTrack>>(iConfig.getParameter<edm::InputTag>("simTracksInput"));
+  simHitsMuonRPCToken_ = consumes<edm::PSimHitContainer>(iConfig.getParameter<edm::InputTag>("simHitsMuonRPCInput"));
+  simHitsMuonCSCToken_ = consumes<edm::PSimHitContainer>(iConfig.getParameter<edm::InputTag>("simHitsMuonCSCInput"));
+  simHitsMuonDTToken_ = consumes<edm::PSimHitContainer>(iConfig.getParameter<edm::InputTag>("simHitsMuonDTInput"));
+  nMuSel_ = iConfig.getParameter<int>("nMuSel");
 }
 
-SimMuFilter::~SimMuFilter()
-{
-}
+SimMuFilter::~SimMuFilter() {}
 
-bool SimMuFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace edm;
-
-   iEvent.getByToken(simTracksToken_,simTracksHandle);
-   iEvent.getByToken(simHitsMuonRPCToken_,simHitsMuonRPCHandle);
-   iEvent.getByToken(simHitsMuonCSCToken_,simHitsMuonCSCHandle);
-   iEvent.getByToken(simHitsMuonDTToken_,simHitsMuonDTHandle);
-      
-   const std::vector<SimTrack> &simTracks = *simTracksHandle.product();
-   
-   int nTracks = simTracks.size();
-
-   int nPass = 0;
-   
-   for(int it=0;it<nTracks;it++)
-     {
-	SimTrack simTrk = simTracks[it];
-	
-	int pdgId = simTrk.type();
-	float pt = simTrk.momentum().pt();
-	
-	if( abs(pdgId) != 13 ) continue;
-	if( pt < 3. ) continue;
-	
-	int nSimHitRPC = 0;
-	int nSimHitCSC = 0;
-	int nSimHitDT = 0;
-
-	for( PSimHitContainer::const_iterator simHitIt = simHitsMuonRPCHandle->begin();simHitIt!=simHitsMuonRPCHandle->end();simHitIt++ )
-	  {
-	     if( simHitIt->trackId() != simTrk.trackId() ) continue;
-	     
-	     nSimHitRPC++;
-	  }	     
-	
-	for( PSimHitContainer::const_iterator simHitIt = simHitsMuonCSCHandle->begin();simHitIt!=simHitsMuonCSCHandle->end();simHitIt++ )
-	  {
-	     if( simHitIt->trackId() != simTrk.trackId() ) continue;
-	     
-	     nSimHitCSC++;
-	  }
-	
-	for( PSimHitContainer::const_iterator simHitIt = simHitsMuonDTHandle->begin();simHitIt!=simHitsMuonDTHandle->end();simHitIt++ )
-	  {
-	     if( simHitIt->trackId() != simTrk.trackId() ) continue;
-	     
-	     nSimHitDT++;
-	  }
-	
-	if( nSimHitRPC+nSimHitCSC+nSimHitDT > 0 ) nPass++;
-     }   
-   
-   return (nPass >= nMuSel_);
-}
+bool SimMuFilter::filter(edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  using namespace edm;
 
-void SimMuFilter::beginJob()
-{
-}
+  iEvent.getByToken(simTracksToken_, simTracksHandle);
+  iEvent.getByToken(simHitsMuonRPCToken_, simHitsMuonRPCHandle);
+  iEvent.getByToken(simHitsMuonCSCToken_, simHitsMuonCSCHandle);
+  iEvent.getByToken(simHitsMuonDTToken_, simHitsMuonDTHandle);
+
+  const std::vector<SimTrack> &simTracks = *simTracksHandle.product();
+
+  int nTracks = simTracks.size();
+
+  int nPass = 0;
+
+  for (int it = 0; it < nTracks; it++) {
+    SimTrack simTrk = simTracks[it];
 
-void SimMuFilter::endJob()
-{
+    int pdgId = simTrk.type();
+    float pt = simTrk.momentum().pt();
+
+    if (abs(pdgId) != 13)
+      continue;
+    if (pt < 3.)
+      continue;
+
+    int nSimHitRPC = 0;
+    int nSimHitCSC = 0;
+    int nSimHitDT = 0;
+
+    for (PSimHitContainer::const_iterator simHitIt = simHitsMuonRPCHandle->begin();
+         simHitIt != simHitsMuonRPCHandle->end();
+         simHitIt++) {
+      if (simHitIt->trackId() != simTrk.trackId())
+        continue;
+
+      nSimHitRPC++;
+    }
+
+    for (PSimHitContainer::const_iterator simHitIt = simHitsMuonCSCHandle->begin();
+         simHitIt != simHitsMuonCSCHandle->end();
+         simHitIt++) {
+      if (simHitIt->trackId() != simTrk.trackId())
+        continue;
+
+      nSimHitCSC++;
+    }
+
+    for (PSimHitContainer::const_iterator simHitIt = simHitsMuonDTHandle->begin();
+         simHitIt != simHitsMuonDTHandle->end();
+         simHitIt++) {
+      if (simHitIt->trackId() != simTrk.trackId())
+        continue;
+
+      nSimHitDT++;
+    }
+
+    if (nSimHitRPC + nSimHitCSC + nSimHitDT > 0)
+      nPass++;
+  }
+
+  return (nPass >= nMuSel_);
 }
 
-//define this as a plug-in
-DEFINE_FWK_MODULE(SimMuFilter);
+void SimMuFilter::beginJob() {}
+
+void SimMuFilter::endJob() {}
 
+// define this as a plug-in
+DEFINE_FWK_MODULE(SimMuFilter);
diff --git a/SimMuon/MCTruth/src/CSCHitAssociator.cc b/SimMuon/MCTruth/src/CSCHitAssociator.cc
index 3a50fe7a158f8..049095a7721fe 100644
--- a/SimMuon/MCTruth/src/CSCHitAssociator.cc
+++ b/SimMuon/MCTruth/src/CSCHitAssociator.cc
@@ -1,108 +1,100 @@
-#include "SimMuon/MCTruth/interface/CSCHitAssociator.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "DataFormats/Common/interface/DetSetVector.h"
-#include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
+#include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h"
+#include "SimMuon/MCTruth/interface/CSCHitAssociator.h"
 
-CSCHitAssociator::CSCHitAssociator(const edm::Event& event, const edm::EventSetup& setup, const edm::ParameterSet& conf): 
-  theDigiSimLinks(nullptr),
-  linksTag(conf.getParameter<edm::InputTag>("CSClinksTag"))
-{
-  initEvent(event,setup);
+CSCHitAssociator::CSCHitAssociator(const edm::Event &event, const edm::EventSetup &setup, const edm::ParameterSet &conf)
+    : theDigiSimLinks(nullptr), linksTag(conf.getParameter<edm::InputTag>("CSClinksTag")) {
+  initEvent(event, setup);
 }
 
-CSCHitAssociator::CSCHitAssociator( const edm::ParameterSet& conf, edm::ConsumesCollector && iC ): 
-  theDigiSimLinks(nullptr),
-  linksTag(conf.getParameter<edm::InputTag>("CSClinksTag"))
-{
+CSCHitAssociator::CSCHitAssociator(const edm::ParameterSet &conf, edm::ConsumesCollector &&iC)
+    : theDigiSimLinks(nullptr), linksTag(conf.getParameter<edm::InputTag>("CSClinksTag")) {
   iC.consumes<DigiSimLinks>(linksTag);
 }
 
-void CSCHitAssociator::initEvent(const edm::Event& event, const edm::EventSetup& setup) {
-
+void CSCHitAssociator::initEvent(const edm::Event &event, const edm::EventSetup &setup) {
   edm::Handle<DigiSimLinks> digiSimLinks;
-  LogTrace("CSCHitAssociator") <<"getting CSC Strip DigiSimLink collection - "<<linksTag;
+  LogTrace("CSCHitAssociator") << "getting CSC Strip DigiSimLink collection - " << linksTag;
   event.getByLabel(linksTag, digiSimLinks);
   theDigiSimLinks = digiSimLinks.product();
 
   // get CSC Geometry to use CSCLayer methods
   edm::ESHandle<CSCGeometry> mugeom;
-  setup.get<MuonGeometryRecord>().get( mugeom );
+  setup.get<MuonGeometryRecord>().get(mugeom);
   cscgeom = &*mugeom;
 }
 
-std::vector<CSCHitAssociator::SimHitIdpr> CSCHitAssociator::associateCSCHitId(const CSCRecHit2D * cscrechit) const {
+std::vector<CSCHitAssociator::SimHitIdpr> CSCHitAssociator::associateCSCHitId(const CSCRecHit2D *cscrechit) const {
   std::vector<SimHitIdpr> simtrackids;
-  
+
   unsigned int detId = cscrechit->geographicalId().rawId();
   int nchannels = cscrechit->nStrips();
-  const CSCLayerGeometry * laygeom = cscgeom->layer(cscrechit->cscDetId())->geometry();
-  
-  DigiSimLinks::const_iterator layerLinks = theDigiSimLinks->find(detId);    
-  
+  const CSCLayerGeometry *laygeom = cscgeom->layer(cscrechit->cscDetId())->geometry();
+
+  DigiSimLinks::const_iterator layerLinks = theDigiSimLinks->find(detId);
+
   if (layerLinks != theDigiSimLinks->end()) {
-    
-    for(int idigi = 0; idigi < nchannels; ++idigi) {
+    for (int idigi = 0; idigi < nchannels; ++idigi) {
       // strip and readout channel numbers may differ in ME1/1A
       int istrip = cscrechit->channels(idigi);
       int channel = laygeom->channel(istrip);
-      
-      for (LayerLinks::const_iterator link=layerLinks->begin(); link!=layerLinks->end(); ++link) {
-	int ch = static_cast<int>(link->channel());
-	if (ch == channel) {
-	  SimHitIdpr currentId(link->SimTrackId(), link->eventId());
-	  if (find(simtrackids.begin(), simtrackids.end(), currentId) == simtrackids.end())
-	    simtrackids.push_back(currentId);
-	}
+
+      for (LayerLinks::const_iterator link = layerLinks->begin(); link != layerLinks->end(); ++link) {
+        int ch = static_cast<int>(link->channel());
+        if (ch == channel) {
+          SimHitIdpr currentId(link->SimTrackId(), link->eventId());
+          if (find(simtrackids.begin(), simtrackids.end(), currentId) == simtrackids.end())
+            simtrackids.push_back(currentId);
+        }
       }
     }
-    
-  } else LogTrace("CSCHitAssociator")
-    <<"*** WARNING in CSCHitAssociator::associateCSCHitId - CSC layer "<<detId<<" has no DigiSimLinks !"<<std::endl;   
-  
+
+  } else
+    LogTrace("CSCHitAssociator") << "*** WARNING in CSCHitAssociator::associateCSCHitId - CSC layer " << detId
+                                 << " has no DigiSimLinks !" << std::endl;
+
   return simtrackids;
 }
 
-
-std::vector<CSCHitAssociator::SimHitIdpr> CSCHitAssociator::associateHitId(const TrackingRecHit & hit) const
-{
+std::vector<CSCHitAssociator::SimHitIdpr> CSCHitAssociator::associateHitId(const TrackingRecHit &hit) const {
   std::vector<SimHitIdpr> simtrackids;
-  
-  const TrackingRecHit * hitp = &hit;
-  const CSCRecHit2D * cscrechit = dynamic_cast<const CSCRecHit2D *>(hitp);
+
+  const TrackingRecHit *hitp = &hit;
+  const CSCRecHit2D *cscrechit = dynamic_cast<const CSCRecHit2D *>(hitp);
 
   if (cscrechit) {
-    
     unsigned int detId = cscrechit->geographicalId().rawId();
     int nchannels = cscrechit->nStrips();
-    const CSCLayerGeometry * laygeom = cscgeom->layer(cscrechit->cscDetId())->geometry();
+    const CSCLayerGeometry *laygeom = cscgeom->layer(cscrechit->cscDetId())->geometry();
 
-    DigiSimLinks::const_iterator layerLinks = theDigiSimLinks->find(detId);    
+    DigiSimLinks::const_iterator layerLinks = theDigiSimLinks->find(detId);
 
     if (layerLinks != theDigiSimLinks->end()) {
-      
-      for(int idigi = 0; idigi < nchannels; ++idigi) {
-	// strip and readout channel numbers may differ in ME1/1A
-	int istrip = cscrechit->channels(idigi);
-	int channel = laygeom->channel(istrip);
-	
-	for (LayerLinks::const_iterator link=layerLinks->begin(); link!=layerLinks->end(); ++link) {
-	  int ch = static_cast<int>(link->channel());
-	  if (ch == channel) {
-	    SimHitIdpr currentId(link->SimTrackId(), link->eventId());
-	    if (find(simtrackids.begin(), simtrackids.end(), currentId) == simtrackids.end())
-	      simtrackids.push_back(currentId);
-	  }
-	}
+      for (int idigi = 0; idigi < nchannels; ++idigi) {
+        // strip and readout channel numbers may differ in ME1/1A
+        int istrip = cscrechit->channels(idigi);
+        int channel = laygeom->channel(istrip);
+
+        for (LayerLinks::const_iterator link = layerLinks->begin(); link != layerLinks->end(); ++link) {
+          int ch = static_cast<int>(link->channel());
+          if (ch == channel) {
+            SimHitIdpr currentId(link->SimTrackId(), link->eventId());
+            if (find(simtrackids.begin(), simtrackids.end(), currentId) == simtrackids.end())
+              simtrackids.push_back(currentId);
+          }
+        }
       }
-      
-    } else LogTrace("CSCHitAssociator")
-      <<"*** WARNING in CSCHitAssociator::associateHitId - CSC layer "<<detId<<" has no DigiSimLinks !"<<std::endl;   
-    
-  } else LogTrace("CSCHitAssociator")<<"*** WARNING in CSCHitAssociator::associateHitId, null dynamic_cast !";
-  
+
+    } else
+      LogTrace("CSCHitAssociator") << "*** WARNING in CSCHitAssociator::associateHitId - CSC layer " << detId
+                                   << " has no DigiSimLinks !" << std::endl;
+
+  } else
+    LogTrace("CSCHitAssociator") << "*** WARNING in CSCHitAssociator::associateHitId, null dynamic_cast "
+                                    "!";
+
   return simtrackids;
 }
-    
-
diff --git a/SimMuon/MCTruth/src/CSCTruthTest.cc b/SimMuon/MCTruth/src/CSCTruthTest.cc
index ede466218ec47..45f4d53c05c6f 100644
--- a/SimMuon/MCTruth/src/CSCTruthTest.cc
+++ b/SimMuon/MCTruth/src/CSCTruthTest.cc
@@ -1,35 +1,24 @@
-#include "SimMuon/MCTruth/interface/CSCTruthTest.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/CSCRecHit/interface/CSCRecHit2DCollection.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "SimMuon/MCTruth/interface/CSCTruthTest.h"
 
-CSCTruthTest::CSCTruthTest(const edm::ParameterSet& iConfig):
-  conf_(iConfig)
-{
-}
+CSCTruthTest::CSCTruthTest(const edm::ParameterSet &iConfig) : conf_(iConfig) {}
 
-CSCTruthTest::~CSCTruthTest()
-{
-}
+CSCTruthTest::~CSCTruthTest() {}
 
-void
-CSCTruthTest::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void CSCTruthTest::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace edm;
-  
+
   Handle<CSCRecHit2DCollection> cscRecHits;
-  iEvent.getByLabel("csc2DRecHits",cscRecHits);
+  iEvent.getByLabel("csc2DRecHits", cscRecHits);
 
-  MuonTruth theTruth(iEvent,iSetup,conf_);
+  MuonTruth theTruth(iEvent, iSetup, conf_);
 
-  for(CSCRecHit2DCollection::const_iterator recHitItr = cscRecHits->begin();
-      recHitItr != cscRecHits->end(); recHitItr++)
-  {
-     theTruth.analyze(*recHitItr);
-     edm::LogVerbatim("SimMuonCSCTruthTest") 
-       << theTruth.muonFraction() << " " << recHitItr->cscDetId();
+  for (CSCRecHit2DCollection::const_iterator recHitItr = cscRecHits->begin(); recHitItr != cscRecHits->end();
+       recHitItr++) {
+    theTruth.analyze(*recHitItr);
+    edm::LogVerbatim("SimMuonCSCTruthTest") << theTruth.muonFraction() << " " << recHitItr->cscDetId();
   }
 }
-
-
diff --git a/SimMuon/MCTruth/src/DTHitAssociator.cc b/SimMuon/MCTruth/src/DTHitAssociator.cc
index ecb4d77c7c7a3..d90f6da878693 100644
--- a/SimMuon/MCTruth/src/DTHitAssociator.cc
+++ b/SimMuon/MCTruth/src/DTHitAssociator.cc
@@ -1,468 +1,447 @@
-#include "SimMuon/MCTruth/interface/DTHitAssociator.h"
-#include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
-#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Geometry/DTGeometry/interface/DTLayer.h"
 #include "Geometry/DTGeometry/interface/DTTopology.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include <string>
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
+#include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
+#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
+#include "SimMuon/MCTruth/interface/DTHitAssociator.h"
 #include <sstream>
+#include <string>
 
 using namespace std;
 
 // Constructor
-DTHitAssociator::DTHitAssociator(const edm::ParameterSet& conf, 
-				 edm::ConsumesCollector && iC) :
-  DTsimhitsTag(conf.getParameter<edm::InputTag>("DTsimhitsTag")),
-  DTsimhitsXFTag(conf.getParameter<edm::InputTag>("DTsimhitsXFTag")),
-  DTdigiTag(conf.getParameter<edm::InputTag>("DTdigiTag")),
-  DTdigisimlinkTag(conf.getParameter<edm::InputTag>("DTdigisimlinkTag")),
-  DTrechitTag(conf.getParameter<edm::InputTag>("DTrechitTag")),
-
-  // nice printout of DT hits
-  dumpDT(conf.getParameter<bool>("dumpDT")),
-  // CrossingFrame used or not ?
-  crossingframe(conf.getParameter<bool>("crossingframe")),
-  // Event contain the DTDigiSimLink collection ?
-  links_exist(conf.getParameter<bool>("links_exist")),
-  // associatorByWire links to a RecHit all the "valid" SimHits on the same DT wire
-  associatorByWire(conf.getParameter<bool>("associatorByWire")),
-
-  printRtS(true)
-{
-
-  if ( crossingframe) {
-    iC.consumes<CrossingFrame<PSimHit> >(DTsimhitsXFTag);
-  }
-  else if (!DTsimhitsTag.label().empty()) {
+DTHitAssociator::DTHitAssociator(const edm::ParameterSet &conf, edm::ConsumesCollector &&iC)
+    : DTsimhitsTag(conf.getParameter<edm::InputTag>("DTsimhitsTag")),
+      DTsimhitsXFTag(conf.getParameter<edm::InputTag>("DTsimhitsXFTag")),
+      DTdigiTag(conf.getParameter<edm::InputTag>("DTdigiTag")),
+      DTdigisimlinkTag(conf.getParameter<edm::InputTag>("DTdigisimlinkTag")),
+      DTrechitTag(conf.getParameter<edm::InputTag>("DTrechitTag")),
+
+      // nice printout of DT hits
+      dumpDT(conf.getParameter<bool>("dumpDT")),
+      // CrossingFrame used or not ?
+      crossingframe(conf.getParameter<bool>("crossingframe")),
+      // Event contain the DTDigiSimLink collection ?
+      links_exist(conf.getParameter<bool>("links_exist")),
+      // associatorByWire links to a RecHit all the "valid" SimHits on the same
+      // DT wire
+      associatorByWire(conf.getParameter<bool>("associatorByWire")),
+
+      printRtS(true) {
+  if (crossingframe) {
+    iC.consumes<CrossingFrame<PSimHit>>(DTsimhitsXFTag);
+  } else if (!DTsimhitsTag.label().empty()) {
     iC.consumes<edm::PSimHitContainer>(DTsimhitsTag);
   }
   iC.consumes<DTDigiCollection>(DTdigiTag);
   iC.consumes<DTDigiSimLinkCollection>(DTdigisimlinkTag);
 
-  if ( dumpDT && printRtS ) {
+  if (dumpDT && printRtS) {
     iC.consumes<DTRecHitCollection>(DTrechitTag);
   }
-
 }
 
+DTHitAssociator::DTHitAssociator(const edm::Event &iEvent,
+                                 const edm::EventSetup &iSetup,
+                                 const edm::ParameterSet &conf,
+                                 bool printRtS)
+    :  // input collection labels
+      DTsimhitsTag(conf.getParameter<edm::InputTag>("DTsimhitsTag")),
+      DTsimhitsXFTag(conf.getParameter<edm::InputTag>("DTsimhitsXFTag")),
+      DTdigiTag(conf.getParameter<edm::InputTag>("DTdigiTag")),
+      DTdigisimlinkTag(conf.getParameter<edm::InputTag>("DTdigisimlinkTag")),
+      DTrechitTag(conf.getParameter<edm::InputTag>("DTrechitTag")),
+
+      // nice printout of DT hits
+      dumpDT(conf.getParameter<bool>("dumpDT")),
+      // CrossingFrame used or not ?
+      crossingframe(conf.getParameter<bool>("crossingframe")),
+      // Event contain the DTDigiSimLink collection ?
+      links_exist(conf.getParameter<bool>("links_exist")),
+      // associatorByWire links to a RecHit all the "valid" SimHits on the same
+      // DT wire
+      associatorByWire(conf.getParameter<bool>("associatorByWire")),
+
+      printRtS(true)
 
-DTHitAssociator::DTHitAssociator(const edm::Event& iEvent, const edm::EventSetup& iSetup, const edm::ParameterSet& conf, bool printRtS):
-  // input collection labels
-  DTsimhitsTag(conf.getParameter<edm::InputTag>("DTsimhitsTag")),
-  DTsimhitsXFTag(conf.getParameter<edm::InputTag>("DTsimhitsXFTag")),
-  DTdigiTag(conf.getParameter<edm::InputTag>("DTdigiTag")),
-  DTdigisimlinkTag(conf.getParameter<edm::InputTag>("DTdigisimlinkTag")),
-  DTrechitTag(conf.getParameter<edm::InputTag>("DTrechitTag")),
-
-  // nice printout of DT hits
-  dumpDT(conf.getParameter<bool>("dumpDT")),
-  // CrossingFrame used or not ?
-  crossingframe(conf.getParameter<bool>("crossingframe")),
-  // Event contain the DTDigiSimLink collection ?
-  links_exist(conf.getParameter<bool>("links_exist")),
-  // associatorByWire links to a RecHit all the "valid" SimHits on the same DT wire
-  associatorByWire(conf.getParameter<bool>("associatorByWire")),
-
-  printRtS(true)
-  
-{  
-  initEvent(iEvent,iSetup);
+{
+  initEvent(iEvent, iSetup);
 }
 
-void DTHitAssociator::initEvent(const edm::Event &iEvent, const edm::EventSetup& iSetup) {
+void DTHitAssociator::initEvent(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  LogTrace("DTHitAssociator") << "DTHitAssociator constructor: dumpDT = " << dumpDT
+                              << ", crossingframe = " << crossingframe << ", links_exist = " << links_exist
+                              << ", associatorByWire = " << associatorByWire;
 
-  LogTrace("DTHitAssociator") <<"DTHitAssociator constructor: dumpDT = "<<dumpDT
-                              <<", crossingframe = "<<crossingframe<<", links_exist = "<<links_exist
-                              <<", associatorByWire = "<<associatorByWire;
-  
   if (!links_exist && !associatorByWire) {
-    LogTrace("DTHitAssociator")<<"*** WARNING in DTHitAssociator::DTHitAssociator: associatorByWire reset to TRUE !"
-			       <<"    \t (missing DTDigiSimLinkCollection ?)";
+    LogTrace("DTHitAssociator") << "*** WARNING in DTHitAssociator::DTHitAssociator: associatorByWire "
+                                   "reset to TRUE !"
+                                << "    \t (missing DTDigiSimLinkCollection ?)";
     associatorByWire = true;
   }
-  
-  // need DT Geometry to discard hits for which the drift time parametrisation is not applicable
+
+  // need DT Geometry to discard hits for which the drift time parametrisation
+  // is not applicable
   edm::ESHandle<DTGeometry> muonGeom;
   iSetup.get<MuonGeometryRecord>().get(muonGeom);
-  
+
   // Get the DT SimHits from the event and map PSimHit by DTWireId
   mapOfSimHit.clear();
   bool takeHit(true);
- 
+
   if (crossingframe) {
-    edm::Handle<CrossingFrame<PSimHit> > xFrame;
-    LogTrace("DTHitAssociator") <<"getting CrossingFrame<PSimHit> collection - "<<DTsimhitsXFTag;
-    iEvent.getByLabel(DTsimhitsXFTag,xFrame);
-    unique_ptr<MixCollection<PSimHit> > 
-      DTsimhits( new MixCollection<PSimHit>(xFrame.product()) );
-    LogTrace("DTHitAssociator") <<"... size = "<<DTsimhits->size();
+    edm::Handle<CrossingFrame<PSimHit>> xFrame;
+    LogTrace("DTHitAssociator") << "getting CrossingFrame<PSimHit> collection - " << DTsimhitsXFTag;
+    iEvent.getByLabel(DTsimhitsXFTag, xFrame);
+    unique_ptr<MixCollection<PSimHit>> DTsimhits(new MixCollection<PSimHit>(xFrame.product()));
+    LogTrace("DTHitAssociator") << "... size = " << DTsimhits->size();
     MixCollection<PSimHit>::MixItr isimhit;
-    for (isimhit=DTsimhits->begin(); isimhit!= DTsimhits->end(); isimhit++) {
+    for (isimhit = DTsimhits->begin(); isimhit != DTsimhits->end(); isimhit++) {
       DTWireId wireid((*isimhit).detUnitId());
       takeHit = SimHitOK(muonGeom, *isimhit);
-      mapOfSimHit[wireid].push_back(make_pair(*isimhit,takeHit));
+      mapOfSimHit[wireid].push_back(make_pair(*isimhit, takeHit));
     }
-  }
-  else if (!DTsimhitsTag.label().empty()) {
+  } else if (!DTsimhitsTag.label().empty()) {
     edm::Handle<edm::PSimHitContainer> DTsimhits;
-    LogTrace("DTHitAssociator") <<"getting PSimHit collection - "<<DTsimhitsTag;
-    iEvent.getByLabel(DTsimhitsTag,DTsimhits);    
-    LogTrace("DTHitAssociator") <<"... size = "<<DTsimhits->size();
+    LogTrace("DTHitAssociator") << "getting PSimHit collection - " << DTsimhitsTag;
+    iEvent.getByLabel(DTsimhitsTag, DTsimhits);
+    LogTrace("DTHitAssociator") << "... size = " << DTsimhits->size();
     edm::PSimHitContainer::const_iterator isimhit;
-    for (isimhit=DTsimhits->begin(); isimhit!= DTsimhits->end(); isimhit++) {
+    for (isimhit = DTsimhits->begin(); isimhit != DTsimhits->end(); isimhit++) {
       DTWireId wireid((*isimhit).detUnitId());
       takeHit = SimHitOK(muonGeom, *isimhit);
-      mapOfSimHit[wireid].push_back(make_pair(*isimhit,takeHit));
-    }    
+      mapOfSimHit[wireid].push_back(make_pair(*isimhit, takeHit));
+    }
   }
 
   // Get the DT Digi collection from the event
   mapOfDigi.clear();
   edm::Handle<DTDigiCollection> digis;
-  LogTrace("DTHitAssociator") <<"getting DTDigi collection - "<<DTdigiTag;
-  iEvent.getByLabel(DTdigiTag,digis);
-  
+  LogTrace("DTHitAssociator") << "getting DTDigi collection - " << DTdigiTag;
+  iEvent.getByLabel(DTdigiTag, digis);
+
   if (digis.isValid()) {
     // Map DTDigi by DTWireId
-    for (DTDigiCollection::DigiRangeIterator detUnit=digis->begin(); detUnit !=digis->end(); ++detUnit) {
-      const DTLayerId& layerid = (*detUnit).first;
-      const DTDigiCollection::Range& range = (*detUnit).second;
-      
+    for (DTDigiCollection::DigiRangeIterator detUnit = digis->begin(); detUnit != digis->end(); ++detUnit) {
+      const DTLayerId &layerid = (*detUnit).first;
+      const DTDigiCollection::Range &range = (*detUnit).second;
+
       DTDigiCollection::const_iterator digi;
-      for (digi = range.first; digi != range.second; ++digi){
-	DTWireId wireid(layerid,(*digi).wire());
-	mapOfDigi[wireid].push_back(*digi);
+      for (digi = range.first; digi != range.second; ++digi) {
+        DTWireId wireid(layerid, (*digi).wire());
+        mapOfDigi[wireid].push_back(*digi);
       }
     }
   } else {
-    LogTrace("DTHitAssociator") <<"... NO DTDigi collection found !";
+    LogTrace("DTHitAssociator") << "... NO DTDigi collection found !";
   }
-  
+
   mapOfLinks.clear();
   if (links_exist) {
-  // Get the DT DigiSimLink collection from the event and map DTDigiSimLink by DTWireId
+    // Get the DT DigiSimLink collection from the event and map DTDigiSimLink by
+    // DTWireId
     edm::Handle<DTDigiSimLinkCollection> digisimlinks;
-    LogTrace("DTHitAssociator") <<"getting DTDigiSimLink collection - "<<DTdigisimlinkTag;
-    iEvent.getByLabel(DTdigisimlinkTag,digisimlinks);
-    
-    for (DTDigiSimLinkCollection::DigiRangeIterator detUnit=digisimlinks->begin(); 
-	 detUnit !=digisimlinks->end(); 
-	 ++detUnit) {
-      const DTLayerId& layerid = (*detUnit).first;
-      const DTDigiSimLinkCollection::Range& range = (*detUnit).second;
-      
+    LogTrace("DTHitAssociator") << "getting DTDigiSimLink collection - " << DTdigisimlinkTag;
+    iEvent.getByLabel(DTdigisimlinkTag, digisimlinks);
+
+    for (DTDigiSimLinkCollection::DigiRangeIterator detUnit = digisimlinks->begin(); detUnit != digisimlinks->end();
+         ++detUnit) {
+      const DTLayerId &layerid = (*detUnit).first;
+      const DTDigiSimLinkCollection::Range &range = (*detUnit).second;
+
       DTDigiSimLinkCollection::const_iterator link;
-      for (link=range.first; link!=range.second; ++link){
-	DTWireId wireid(layerid,(*link).wire());
-	mapOfLinks[wireid].push_back(*link);
+      for (link = range.first; link != range.second; ++link) {
+        DTWireId wireid(layerid, (*link).wire());
+        mapOfLinks[wireid].push_back(*link);
       }
     }
   }
 
-  if(dumpDT && printRtS) {
-    
+  if (dumpDT && printRtS) {
     // Get the DT rechits from the event
-    edm::Handle<DTRecHitCollection> DTrechits; 
-    LogTrace("DTHitAssociator") <<"getting DTRecHit1DPair collection - "<<DTrechitTag;
-    iEvent.getByLabel(DTrechitTag,DTrechits);
-    LogTrace("DTHitAssociator") <<"... size = "<<DTrechits->size();
-    
+    edm::Handle<DTRecHitCollection> DTrechits;
+    LogTrace("DTHitAssociator") << "getting DTRecHit1DPair collection - " << DTrechitTag;
+    iEvent.getByLabel(DTrechitTag, DTrechits);
+    LogTrace("DTHitAssociator") << "... size = " << DTrechits->size();
+
     // map DTRecHit1DPair by DTWireId
     mapOfRecHit.clear();
     DTRecHitCollection::const_iterator rechit;
-    for(rechit=DTrechits->begin(); rechit!=DTrechits->end(); ++rechit) {
+    for (rechit = DTrechits->begin(); rechit != DTrechits->end(); ++rechit) {
       DTWireId wireid = (*rechit).wireId();
       mapOfRecHit[wireid].push_back(*rechit);
     }
-    
+
     if (mapOfSimHit.end() != mapOfSimHit.begin()) {
-      LogTrace("DTHitAssociator")<<"\n *** Dump DT PSimHit's ***";
-      
+      LogTrace("DTHitAssociator") << "\n *** Dump DT PSimHit's ***";
+
       int jwire = 0;
       int ihit = 0;
-      
-      for(SimHitMap::const_iterator mapIT=mapOfSimHit.begin();
-	  mapIT!=mapOfSimHit.end();
-	  ++mapIT , jwire++) {
-	
-	DTWireId wireid = (*mapIT).first;
-	for (vector<PSimHit_withFlag>::const_iterator hitIT = mapOfSimHit[wireid].begin(); 
-	     hitIT != mapOfSimHit[wireid].end(); 
-	     hitIT++ , ihit++) {
-	  PSimHit hit = hitIT->first;
-	  LogTrace("DTHitAssociator")
-	    <<"PSimHit "<<ihit <<", wire "<<wireid //<<", detID = "<<hit.detUnitId()
-	    <<", SimTrack Id:"<<hit.trackId()<<"/Evt:(" <<hit.eventId().event()<<","<<hit.eventId().bunchCrossing()<<") "
-	    <<", pdg = "<<hit.particleType()<<", procs = "<<hit.processType();
-	}	
-      } 
+
+      for (SimHitMap::const_iterator mapIT = mapOfSimHit.begin(); mapIT != mapOfSimHit.end(); ++mapIT, jwire++) {
+        DTWireId wireid = (*mapIT).first;
+        for (vector<PSimHit_withFlag>::const_iterator hitIT = mapOfSimHit[wireid].begin();
+             hitIT != mapOfSimHit[wireid].end();
+             hitIT++, ihit++) {
+          PSimHit hit = hitIT->first;
+          LogTrace("DTHitAssociator") << "PSimHit " << ihit << ", wire " << wireid  //<<", detID = "<<hit.detUnitId()
+                                      << ", SimTrack Id:" << hit.trackId() << "/Evt:(" << hit.eventId().event() << ","
+                                      << hit.eventId().bunchCrossing() << ") "
+                                      << ", pdg = " << hit.particleType() << ", procs = " << hit.processType();
+        }
+      }
     } else {
-      LogTrace("DTHitAssociator")<<"\n *** There are NO DT PSimHit's ***";
+      LogTrace("DTHitAssociator") << "\n *** There are NO DT PSimHit's ***";
     }
 
-    if(mapOfDigi.end() != mapOfDigi.begin()) {
-      
+    if (mapOfDigi.end() != mapOfDigi.begin()) {
       int jwire = 0;
       int ihit = 0;
-      
-      for(DigiMap::const_iterator mapIT=mapOfDigi.begin(); mapIT!=mapOfDigi.end(); ++mapIT , jwire++) {
-	LogTrace("DTHitAssociator")<<"\n *** Dump DT digis ***";
-
-	DTWireId wireid = (*mapIT).first;
-	for (vector<DTDigi>::const_iterator hitIT = mapOfDigi[wireid].begin(); 
-	     hitIT != mapOfDigi[wireid].end(); 
-	     hitIT++ , ihit++) {
-	  LogTrace("DTHitAssociator")
-	    <<"DTDigi "<<ihit<<", wire "<<wireid<<", number = "<<hitIT->number()<<", TDC counts = "<<hitIT->countsTDC();
-	}	
+
+      for (DigiMap::const_iterator mapIT = mapOfDigi.begin(); mapIT != mapOfDigi.end(); ++mapIT, jwire++) {
+        LogTrace("DTHitAssociator") << "\n *** Dump DT digis ***";
+
+        DTWireId wireid = (*mapIT).first;
+        for (vector<DTDigi>::const_iterator hitIT = mapOfDigi[wireid].begin(); hitIT != mapOfDigi[wireid].end();
+             hitIT++, ihit++) {
+          LogTrace("DTHitAssociator") << "DTDigi " << ihit << ", wire " << wireid << ", number = " << hitIT->number()
+                                      << ", TDC counts = " << hitIT->countsTDC();
+        }
       }
     } else {
-      LogTrace("DTHitAssociator")<<"\n *** There are NO DTDigi's ***";
+      LogTrace("DTHitAssociator") << "\n *** There are NO DTDigi's ***";
     }
-    
-    if (mapOfRecHit.end() != mapOfRecHit.begin()) 
-      LogTrace("DTHitAssociator")<<"\n *** Analyze DTRecHitCollection by DTWireId ***";
-    
+
+    if (mapOfRecHit.end() != mapOfRecHit.begin())
+      LogTrace("DTHitAssociator") << "\n *** Analyze DTRecHitCollection by DTWireId ***";
+
     int iwire = 0;
-    for(RecHitMap::const_iterator mapIT=mapOfRecHit.begin(); 
-	mapIT!=mapOfRecHit.end(); 
-	++mapIT , iwire++) {
-      
+    for (RecHitMap::const_iterator mapIT = mapOfRecHit.begin(); mapIT != mapOfRecHit.end(); ++mapIT, iwire++) {
       DTWireId wireid = (*mapIT).first;
-      LogTrace("DTHitAssociator")<<"\n==================================================================="; 
-      LogTrace("DTHitAssociator")<<"wire index = "<<iwire<<"  *** DTWireId = "<<" ("<<wireid<<")";
-      
-      if(mapOfSimHit.find(wireid) != mapOfSimHit.end()) {
-	LogTrace("DTHitAssociator")<<"\n"<<mapOfSimHit[wireid].size()<<" SimHits (PSimHit):";
-	
-	for (vector<PSimHit_withFlag>::const_iterator hitIT = mapOfSimHit[wireid].begin(); 
-	     hitIT != mapOfSimHit[wireid].end(); 
-	     ++hitIT) {
-	  stringstream tId;
-	  tId << (hitIT->first).trackId();
-	  string simhitlog = "\t SimTrack Id = "+tId.str();
-	  if (hitIT->second) simhitlog = simhitlog + "\t -VALID HIT-";
-	  else simhitlog = simhitlog + "\t -not valid hit-";
-	  LogTrace("DTHitAssociator")<<simhitlog;
-	}
+      LogTrace("DTHitAssociator") << "\n======================================="
+                                     "============================";
+      LogTrace("DTHitAssociator") << "wire index = " << iwire << "  *** DTWireId = "
+                                  << " (" << wireid << ")";
+
+      if (mapOfSimHit.find(wireid) != mapOfSimHit.end()) {
+        LogTrace("DTHitAssociator") << "\n" << mapOfSimHit[wireid].size() << " SimHits (PSimHit):";
+
+        for (vector<PSimHit_withFlag>::const_iterator hitIT = mapOfSimHit[wireid].begin();
+             hitIT != mapOfSimHit[wireid].end();
+             ++hitIT) {
+          stringstream tId;
+          tId << (hitIT->first).trackId();
+          string simhitlog = "\t SimTrack Id = " + tId.str();
+          if (hitIT->second)
+            simhitlog = simhitlog + "\t -VALID HIT-";
+          else
+            simhitlog = simhitlog + "\t -not valid hit-";
+          LogTrace("DTHitAssociator") << simhitlog;
+        }
       }
-      
-      if(mapOfLinks.find(wireid) != mapOfLinks.end()) {
-	LogTrace("DTHitAssociator")<<"\n"<<mapOfLinks[wireid].size()<<" Links (DTDigiSimLink):";
-	
-	for (vector<DTDigiSimLink>::const_iterator hitIT = mapOfLinks[wireid].begin(); 
-	     hitIT != mapOfLinks[wireid].end(); 
-	     ++hitIT) {
-	  LogTrace("DTHitAssociator")
-	    <<"\t digi number = "<<hitIT->number()<<", time = "<<hitIT->time()<<", SimTrackId = "<<hitIT->SimTrackId();
-	}
+
+      if (mapOfLinks.find(wireid) != mapOfLinks.end()) {
+        LogTrace("DTHitAssociator") << "\n" << mapOfLinks[wireid].size() << " Links (DTDigiSimLink):";
+
+        for (vector<DTDigiSimLink>::const_iterator hitIT = mapOfLinks[wireid].begin();
+             hitIT != mapOfLinks[wireid].end();
+             ++hitIT) {
+          LogTrace("DTHitAssociator") << "\t digi number = " << hitIT->number() << ", time = " << hitIT->time()
+                                      << ", SimTrackId = " << hitIT->SimTrackId();
+        }
       }
-      
-      if(mapOfDigi.find(wireid) != mapOfDigi.end()) {
-	LogTrace("DTHitAssociator")<<"\n"<<mapOfDigi[wireid].size()<<" Digis (DTDigi):";
-	for (vector<DTDigi>::const_iterator hitIT = mapOfDigi[wireid].begin(); 
-	     hitIT != mapOfDigi[wireid].end(); 
-	     ++hitIT) {
-	  LogTrace("DTHitAssociator")<<"\t digi number = "<<hitIT->number()<<", time = "<<hitIT->time();
-	}
+
+      if (mapOfDigi.find(wireid) != mapOfDigi.end()) {
+        LogTrace("DTHitAssociator") << "\n" << mapOfDigi[wireid].size() << " Digis (DTDigi):";
+        for (vector<DTDigi>::const_iterator hitIT = mapOfDigi[wireid].begin(); hitIT != mapOfDigi[wireid].end();
+             ++hitIT) {
+          LogTrace("DTHitAssociator") << "\t digi number = " << hitIT->number() << ", time = " << hitIT->time();
+        }
       }
-      
-      LogTrace("DTHitAssociator")<<"\n"<<(*mapIT).second.size()<<" RecHits (DTRecHit1DPair):";    
-      for(vector<DTRecHit1DPair>::const_iterator vIT =(*mapIT).second.begin(); 
-	  vIT !=(*mapIT).second.end(); 
-	  ++vIT) {
-	LogTrace("DTHitAssociator")<<"\t digi time = "<<vIT->digiTime();
+
+      LogTrace("DTHitAssociator") << "\n" << (*mapIT).second.size() << " RecHits (DTRecHit1DPair):";
+      for (vector<DTRecHit1DPair>::const_iterator vIT = (*mapIT).second.begin(); vIT != (*mapIT).second.end(); ++vIT) {
+        LogTrace("DTHitAssociator") << "\t digi time = " << vIT->digiTime();
       }
     }
   }
 }
 // end of constructor
 
-std::vector<DTHitAssociator::SimHitIdpr> DTHitAssociator::associateHitId(const TrackingRecHit & hit) const {
-  
+std::vector<DTHitAssociator::SimHitIdpr> DTHitAssociator::associateHitId(const TrackingRecHit &hit) const {
   std::vector<SimHitIdpr> simtrackids;
-  const TrackingRecHit * hitp = &hit;
-  const DTRecHit1D * dtrechit = dynamic_cast<const DTRecHit1D *>(hitp);
-  
+  const TrackingRecHit *hitp = &hit;
+  const DTRecHit1D *dtrechit = dynamic_cast<const DTRecHit1D *>(hitp);
+
   if (dtrechit) {
     simtrackids = associateDTHitId(dtrechit);
   } else {
-    LogTrace("DTHitAssociator")<<"*** WARNING in DTHitAssociator::associateHitId, null dynamic_cast !";
+    LogTrace("DTHitAssociator") << "*** WARNING in DTHitAssociator::associateHitId, null dynamic_cast "
+                                   "!";
   }
   return simtrackids;
 }
 
-std::vector<DTHitAssociator::SimHitIdpr> DTHitAssociator::associateDTHitId(const DTRecHit1D * dtrechit) const {
-  
-  std::vector<SimHitIdpr> matched; 
+std::vector<DTHitAssociator::SimHitIdpr> DTHitAssociator::associateDTHitId(const DTRecHit1D *dtrechit) const {
+  std::vector<SimHitIdpr> matched;
 
   DTWireId wireid = dtrechit->wireId();
-  
-  if(associatorByWire) {
+
+  if (associatorByWire) {
     // matching based on DTWireId : take only "valid" SimHits on that wire
 
     auto found = mapOfSimHit.find(wireid);
-    if(found != mapOfSimHit.end()) {	
-      for (vector<PSimHit_withFlag>::const_iterator hitIT = found->second.begin(); 
-	   hitIT != found->second.end(); 
-	   ++hitIT) {
-	
-	bool valid_hit = hitIT->second;
-	PSimHit this_hit = hitIT->first;
-
-	if (valid_hit) {
-	  SimHitIdpr currentId(this_hit.trackId(), this_hit.eventId());
-	  matched.push_back(currentId);
-	}
+    if (found != mapOfSimHit.end()) {
+      for (vector<PSimHit_withFlag>::const_iterator hitIT = found->second.begin(); hitIT != found->second.end();
+           ++hitIT) {
+        bool valid_hit = hitIT->second;
+        PSimHit this_hit = hitIT->first;
+
+        if (valid_hit) {
+          SimHitIdpr currentId(this_hit.trackId(), this_hit.eventId());
+          matched.push_back(currentId);
+        }
       }
     }
   }
 
   else {
     // matching based on DTDigiSimLink
-    
+
     float theTime = dtrechit->digiTime();
     int theNumber(-1);
-    
+
     auto found = mapOfLinks.find(wireid);
 
     if (found != mapOfLinks.end()) {
-      // DTDigiSimLink::time() is set equal to DTDigi::time() only for the DTDigiSimLink corresponding to the digitizied PSimHit
-      // other DTDigiSimLinks associated to the same DTDigi are identified by having the same DTDigiSimLink::number()
-      
+      // DTDigiSimLink::time() is set equal to DTDigi::time() only for the
+      // DTDigiSimLink corresponding to the digitizied PSimHit other
+      // DTDigiSimLinks associated to the same DTDigi are identified by having
+      // the same DTDigiSimLink::number()
+
       // first find the associated digi Number
-      for (vector<DTDigiSimLink>::const_iterator linkIT = found->second.begin(); 
-	   linkIT != found->second.end(); 
-	   ++linkIT ) {
-	float digitime = linkIT->time();
-	if (fabs(digitime-theTime)<0.1) {
+      for (vector<DTDigiSimLink>::const_iterator linkIT = found->second.begin(); linkIT != found->second.end();
+           ++linkIT) {
+        float digitime = linkIT->time();
+        if (fabs(digitime - theTime) < 0.1) {
           theNumber = linkIT->number();
-	}	
+        }
       }
-      
-      // then get all the DTDigiSimLinks with that digi Number (corresponding to valid SimHits  
-      //  within a time window of the order of the time resolution, specified in the DTDigitizer)
-      for (vector<DTDigiSimLink>::const_iterator linkIT = found->second.begin(); 
-	   linkIT != found->second.end(); 
-	   ++linkIT ) {
-	
+
+      // then get all the DTDigiSimLinks with that digi Number (corresponding to
+      // valid SimHits
+      //  within a time window of the order of the time resolution, specified in
+      //  the DTDigitizer)
+      for (vector<DTDigiSimLink>::const_iterator linkIT = found->second.begin(); linkIT != found->second.end();
+           ++linkIT) {
         int digiNr = linkIT->number();
-	if (digiNr == theNumber) {
-	  SimHitIdpr currentId(linkIT->SimTrackId(), linkIT->eventId());
-	  matched.push_back(currentId);
-	}
+        if (digiNr == theNumber) {
+          SimHitIdpr currentId(linkIT->SimTrackId(), linkIT->eventId());
+          matched.push_back(currentId);
+        }
       }
 
     } else {
-      LogTrace("DTHitAssociator")<<"*** ERROR in DTHitAssociator::associateDTHitId - DTRecHit1D: "
-				 <<*dtrechit<<" has no associated DTDigiSimLink !"<<endl;
-      return matched; 
+      LogTrace("DTHitAssociator") << "*** ERROR in DTHitAssociator::associateDTHitId - DTRecHit1D: " << *dtrechit
+                                  << " has no associated DTDigiSimLink !" << endl;
+      return matched;
     }
   }
-  
+
   return matched;
 }
 
-std::vector<PSimHit> DTHitAssociator::associateHit(const TrackingRecHit & hit) const {
-  
-  std::vector<PSimHit> simhits;  
+std::vector<PSimHit> DTHitAssociator::associateHit(const TrackingRecHit &hit) const {
+  std::vector<PSimHit> simhits;
   std::vector<SimHitIdpr> simtrackids;
 
-  const TrackingRecHit * hitp = &hit;
-  const DTRecHit1D * dtrechit = dynamic_cast<const DTRecHit1D *>(hitp);
+  const TrackingRecHit *hitp = &hit;
+  const DTRecHit1D *dtrechit = dynamic_cast<const DTRecHit1D *>(hitp);
 
   if (dtrechit) {
     DTWireId wireid = dtrechit->wireId();
-    
+
     if (associatorByWire) {
-    // matching based on DTWireId : take only "valid" SimHits on that wire
+      // matching based on DTWireId : take only "valid" SimHits on that wire
 
       auto found = mapOfSimHit.find(wireid);
-      if(found != mapOfSimHit.end()) {	
-	for (vector<PSimHit_withFlag>::const_iterator hitIT = found->second.begin(); 
-	     hitIT != found->second.end(); 
-	     ++hitIT) {
-	  
-	  bool valid_hit = hitIT->second;
-	  if (valid_hit) simhits.push_back(hitIT->first);
-	}
+      if (found != mapOfSimHit.end()) {
+        for (vector<PSimHit_withFlag>::const_iterator hitIT = found->second.begin(); hitIT != found->second.end();
+             ++hitIT) {
+          bool valid_hit = hitIT->second;
+          if (valid_hit)
+            simhits.push_back(hitIT->first);
+        }
       }
-    }
-    else {
+    } else {
       // matching based on DTDigiSimLink
 
       simtrackids = associateDTHitId(dtrechit);
 
-      for (vector<SimHitIdpr>::const_iterator idIT =  simtrackids.begin(); idIT != simtrackids.end(); ++idIT) {
-	uint32_t trId = idIT->first;
-	EncodedEventId evId = idIT->second;
-	
+      for (vector<SimHitIdpr>::const_iterator idIT = simtrackids.begin(); idIT != simtrackids.end(); ++idIT) {
+        uint32_t trId = idIT->first;
+        EncodedEventId evId = idIT->second;
+
         auto found = mapOfSimHit.find(wireid);
-	if(found != mapOfSimHit.end()) {	
-	  for (vector<PSimHit_withFlag>::const_iterator hitIT = found->second.begin(); 
-	       hitIT != found->second.end(); 
-	       ++hitIT) {
-	    
-	    if (hitIT->first.trackId() == trId  && 
-		hitIT->first.eventId() == evId) 
-	      simhits.push_back(hitIT->first);	    
-	  }
-	}	
+        if (found != mapOfSimHit.end()) {
+          for (vector<PSimHit_withFlag>::const_iterator hitIT = found->second.begin(); hitIT != found->second.end();
+               ++hitIT) {
+            if (hitIT->first.trackId() == trId && hitIT->first.eventId() == evId)
+              simhits.push_back(hitIT->first);
+          }
+        }
       }
     }
 
   } else {
-    LogTrace("DTHitAssociator")<<"*** WARNING in DTHitAssociator::associateHit, null dynamic_cast !";
+    LogTrace("DTHitAssociator") << "*** WARNING in DTHitAssociator::associateHit, null dynamic_cast !";
   }
   return simhits;
 }
 
-bool DTHitAssociator::SimHitOK(const edm::ESHandle<DTGeometry> & muongeom, 
-			       const PSimHit & simhit) {
+bool DTHitAssociator::SimHitOK(const edm::ESHandle<DTGeometry> &muongeom, const PSimHit &simhit) {
   bool result = true;
-  
+
   DTWireId wireid(simhit.detUnitId());
-  const DTLayer* dtlayer = muongeom->layer(wireid.layerId()); 
+  const DTLayer *dtlayer = muongeom->layer(wireid.layerId());
   LocalPoint entryP = simhit.entryPoint();
   LocalPoint exitP = simhit.exitPoint();
   const DTTopology &topo = dtlayer->specificTopology();
-  float xwire = topo.wirePosition(wireid.wire()); 
+  float xwire = topo.wirePosition(wireid.wire());
   float xEntry = entryP.x() - xwire;
-  float xExit  = exitP.x() - xwire;
-  DTTopology::Side entrySide = topo.onWhichBorder(xEntry,entryP.y(),entryP.z());
-  DTTopology::Side exitSide  = topo.onWhichBorder(xExit,exitP.y(),exitP.z());
-  
-  bool noParametrisation = 
-    (( entrySide == DTTopology::none || exitSide == DTTopology::none ) ||
-     (entrySide == exitSide) ||
-     ((entrySide == DTTopology::xMin && exitSide == DTTopology::xMax) || 
-      (entrySide == DTTopology::xMax && exitSide == DTTopology::xMin))   );
+  float xExit = exitP.x() - xwire;
+  DTTopology::Side entrySide = topo.onWhichBorder(xEntry, entryP.y(), entryP.z());
+  DTTopology::Side exitSide = topo.onWhichBorder(xExit, exitP.y(), exitP.z());
+
+  bool noParametrisation =
+      ((entrySide == DTTopology::none || exitSide == DTTopology::none) || (entrySide == exitSide) ||
+       ((entrySide == DTTopology::xMin && exitSide == DTTopology::xMax) ||
+        (entrySide == DTTopology::xMax && exitSide == DTTopology::xMin)));
 
   // discard hits where parametrization can not be used
-  if (noParametrisation) 
-    {
-      result = false;
-      return result;
-    }  
-    
+  if (noParametrisation) {
+    result = false;
+    return result;
+  }
+
   float x;
-  LocalPoint hitPos = simhit.localPosition(); 
-  
-  if(fabs(hitPos.z()) < 0.002) {
+  LocalPoint hitPos = simhit.localPosition();
+
+  if (fabs(hitPos.z()) < 0.002) {
     // hit center within 20 um from z=0, no need to extrapolate.
     x = hitPos.x() - xwire;
   } else {
-    x = xEntry - (entryP.z()*(xExit-xEntry))/(exitP.z()-entryP.z());
+    x = xEntry - (entryP.z() * (xExit - xEntry)) / (exitP.z() - entryP.z());
   }
-  
+
   // discard hits where x is out of range of the parametrization (|x|>2.1 cm)
-  x *= 10.;  //cm -> mm 
-  if (fabs(x) > 21.) 
+  x *= 10.;  // cm -> mm
+  if (fabs(x) > 21.)
     result = false;
-  
+
   return result;
 }
diff --git a/SimMuon/MCTruth/src/GEMHitAssociator.cc b/SimMuon/MCTruth/src/GEMHitAssociator.cc
index 07385cd1f64fe..04faaa8629b6e 100644
--- a/SimMuon/MCTruth/src/GEMHitAssociator.cc
+++ b/SimMuon/MCTruth/src/GEMHitAssociator.cc
@@ -3,121 +3,103 @@
 using namespace std;
 
 // Constructor
-GEMHitAssociator::GEMHitAssociator( const edm::ParameterSet& conf,
-				    edm::ConsumesCollector && iC):
-  GEMdigisimlinkTag(conf.getParameter<edm::InputTag>("GEMdigisimlinkTag")),
-  // CrossingFrame used or not ?
-  crossingframe(conf.getParameter<bool>("crossingframe")),
-  useGEMs_(conf.getParameter<bool>("useGEMs")),
-  GEMsimhitsTag(conf.getParameter<edm::InputTag>("GEMsimhitsTag")),
-  GEMsimhitsXFTag(conf.getParameter<edm::InputTag>("GEMsimhitsXFTag"))
-{
-  if (crossingframe){
-    GEMsimhitsXFToken_=iC.consumes<CrossingFrame<PSimHit> >(GEMsimhitsXFTag);
+GEMHitAssociator::GEMHitAssociator(const edm::ParameterSet &conf, edm::ConsumesCollector &&iC)
+    : GEMdigisimlinkTag(conf.getParameter<edm::InputTag>("GEMdigisimlinkTag")),
+      // CrossingFrame used or not ?
+      crossingframe(conf.getParameter<bool>("crossingframe")),
+      useGEMs_(conf.getParameter<bool>("useGEMs")),
+      GEMsimhitsTag(conf.getParameter<edm::InputTag>("GEMsimhitsTag")),
+      GEMsimhitsXFTag(conf.getParameter<edm::InputTag>("GEMsimhitsXFTag")) {
+  if (crossingframe) {
+    GEMsimhitsXFToken_ = iC.consumes<CrossingFrame<PSimHit>>(GEMsimhitsXFTag);
   } else if (!GEMsimhitsTag.label().empty()) {
-    GEMsimhitsToken_=iC.consumes<edm::PSimHitContainer>(GEMsimhitsTag);
+    GEMsimhitsToken_ = iC.consumes<edm::PSimHitContainer>(GEMsimhitsTag);
   }
 
-  GEMdigisimlinkToken_=iC.consumes< edm::DetSetVector<StripDigiSimLink> >(GEMdigisimlinkTag);
+  GEMdigisimlinkToken_ = iC.consumes<edm::DetSetVector<StripDigiSimLink>>(GEMdigisimlinkTag);
 }
 
-GEMHitAssociator::GEMHitAssociator(const edm::Event& e, const edm::EventSetup& eventSetup, const edm::ParameterSet& conf ):
-  GEMdigisimlinkTag(conf.getParameter<edm::InputTag>("GEMdigisimlinkTag")),
-  // CrossingFrame used or not ?
-  crossingframe(conf.getParameter<bool>("crossingframe")),
-  useGEMs_(conf.getParameter<bool>("useGEMs")),
-  GEMsimhitsTag(conf.getParameter<edm::InputTag>("GEMsimhitsTag")),
-  GEMsimhitsXFTag(conf.getParameter<edm::InputTag>("GEMsimhitsXFTag"))
-{
-  initEvent(e,eventSetup);
+GEMHitAssociator::GEMHitAssociator(const edm::Event &e,
+                                   const edm::EventSetup &eventSetup,
+                                   const edm::ParameterSet &conf)
+    : GEMdigisimlinkTag(conf.getParameter<edm::InputTag>("GEMdigisimlinkTag")),
+      // CrossingFrame used or not ?
+      crossingframe(conf.getParameter<bool>("crossingframe")),
+      useGEMs_(conf.getParameter<bool>("useGEMs")),
+      GEMsimhitsTag(conf.getParameter<edm::InputTag>("GEMsimhitsTag")),
+      GEMsimhitsXFTag(conf.getParameter<edm::InputTag>("GEMsimhitsXFTag")) {
+  initEvent(e, eventSetup);
 }
 
-void GEMHitAssociator::initEvent(const edm::Event& e, const edm::EventSetup& eventSetup)
-{
-
-  if(useGEMs_){
-
-	  if (crossingframe) {
-	    
-	    edm::Handle<CrossingFrame<PSimHit> > cf;
-	    LogTrace("GEMHitAssociator") <<"getting CrossingFrame<PSimHit> collection - "<<GEMsimhitsXFTag;
-	    e.getByLabel(GEMsimhitsXFTag, cf);
-	    
-	    std::unique_ptr<MixCollection<PSimHit> > 
-	      GEMsimhits( new MixCollection<PSimHit>(cf.product()) );
-	    LogTrace("GEMHitAssociator") <<"... size = "<<GEMsimhits->size();
-
-	    //   MixCollection<PSimHit> & simHits = *hits;
-	    
-	    for(MixCollection<PSimHit>::MixItr hitItr = GEMsimhits->begin();
-		hitItr != GEMsimhits->end(); ++hitItr) 
-	      {
-		_SimHitMap[hitItr->detUnitId()].push_back(*hitItr);
-	      }
-	    
-	  } else if (!GEMsimhitsTag.label().empty()) {
-	    edm::Handle<edm::PSimHitContainer> GEMsimhits;
-	    LogTrace("GEMHitAssociator") <<"getting PSimHit collection - "<<GEMsimhitsTag;
-	    e.getByLabel(GEMsimhitsTag, GEMsimhits);    
-	    LogTrace("GEMHitAssociator") <<"... size = "<<GEMsimhits->size();
-	    
-	    // arrange the hits by detUnit
-	    for(edm::PSimHitContainer::const_iterator hitItr = GEMsimhits->begin();
-		hitItr != GEMsimhits->end(); ++hitItr)
-	      {
-		_SimHitMap[hitItr->detUnitId()].push_back(*hitItr);
-	      }
-	  }
-
-	  edm::Handle<DigiSimLinks> digiSimLinks;
-	  LogTrace("GEMHitAssociator") <<"getting GEM Strip DigiSimLink collection - "<<GEMdigisimlinkTag;
-	  e.getByLabel(GEMdigisimlinkTag, digiSimLinks);
-	  theDigiSimLinks = digiSimLinks.product();
-
+void GEMHitAssociator::initEvent(const edm::Event &e, const edm::EventSetup &eventSetup) {
+  if (useGEMs_) {
+    if (crossingframe) {
+      edm::Handle<CrossingFrame<PSimHit>> cf;
+      LogTrace("GEMHitAssociator") << "getting CrossingFrame<PSimHit> collection - " << GEMsimhitsXFTag;
+      e.getByLabel(GEMsimhitsXFTag, cf);
+
+      std::unique_ptr<MixCollection<PSimHit>> GEMsimhits(new MixCollection<PSimHit>(cf.product()));
+      LogTrace("GEMHitAssociator") << "... size = " << GEMsimhits->size();
+
+      //   MixCollection<PSimHit> & simHits = *hits;
+
+      for (MixCollection<PSimHit>::MixItr hitItr = GEMsimhits->begin(); hitItr != GEMsimhits->end(); ++hitItr) {
+        _SimHitMap[hitItr->detUnitId()].push_back(*hitItr);
+      }
+
+    } else if (!GEMsimhitsTag.label().empty()) {
+      edm::Handle<edm::PSimHitContainer> GEMsimhits;
+      LogTrace("GEMHitAssociator") << "getting PSimHit collection - " << GEMsimhitsTag;
+      e.getByLabel(GEMsimhitsTag, GEMsimhits);
+      LogTrace("GEMHitAssociator") << "... size = " << GEMsimhits->size();
+
+      // arrange the hits by detUnit
+      for (edm::PSimHitContainer::const_iterator hitItr = GEMsimhits->begin(); hitItr != GEMsimhits->end(); ++hitItr) {
+        _SimHitMap[hitItr->detUnitId()].push_back(*hitItr);
+      }
+    }
+
+    edm::Handle<DigiSimLinks> digiSimLinks;
+    LogTrace("GEMHitAssociator") << "getting GEM Strip DigiSimLink collection - " << GEMdigisimlinkTag;
+    e.getByLabel(GEMdigisimlinkTag, digiSimLinks);
+    theDigiSimLinks = digiSimLinks.product();
   }
-
 }
 // end of constructor
 
-std::vector<GEMHitAssociator::SimHitIdpr> GEMHitAssociator::associateRecHit(const GEMRecHit * gemrechit) const {
-  
+std::vector<GEMHitAssociator::SimHitIdpr> GEMHitAssociator::associateRecHit(const GEMRecHit *gemrechit) const {
   std::vector<SimHitIdpr> matched;
 
-  if(useGEMs_){
+  if (useGEMs_) {
     if (gemrechit) {
-	    
-	    GEMDetId gemDetId = gemrechit->gemId();
-	    int fstrip = gemrechit->firstClusterStrip();
-	    int cls = gemrechit->clusterSize();
-	    //int bx = gemrechit->BunchX();
-
-	    DigiSimLinks::const_iterator layerLinks = theDigiSimLinks->find(gemDetId);
-
-	    if (layerLinks != theDigiSimLinks->end()) {
-	    
-		for(int i = fstrip; i < (fstrip+cls); ++i) {
-			      
-			for(LayerLinks::const_iterator itlink = layerLinks->begin(); itlink != layerLinks->end(); ++itlink) {
-
-		  		int ch = static_cast<int>(itlink->channel());
-				if(ch != i) continue;
-
-				SimHitIdpr currentId(itlink->SimTrackId(), itlink->eventId());
-				if(find(matched.begin(),matched.end(),currentId ) == matched.end())
-					matched.push_back(currentId);
-
-			}
-
-		}
-
-	    }else edm::LogWarning("GEMHitAssociator")
-	      <<"*** WARNING in GEMHitAssociator: GEM layer "<<gemDetId<<" has no DigiSimLinks !"<<std::endl;
-	    
-	  } else edm::LogWarning("GEMHitAssociator")<<"*** WARNING in GEMHitAssociator::associateRecHit, null dynamic_cast !";
-
+      GEMDetId gemDetId = gemrechit->gemId();
+      int fstrip = gemrechit->firstClusterStrip();
+      int cls = gemrechit->clusterSize();
+      // int bx = gemrechit->BunchX();
+
+      DigiSimLinks::const_iterator layerLinks = theDigiSimLinks->find(gemDetId);
+
+      if (layerLinks != theDigiSimLinks->end()) {
+        for (int i = fstrip; i < (fstrip + cls); ++i) {
+          for (LayerLinks::const_iterator itlink = layerLinks->begin(); itlink != layerLinks->end(); ++itlink) {
+            int ch = static_cast<int>(itlink->channel());
+            if (ch != i)
+              continue;
+
+            SimHitIdpr currentId(itlink->SimTrackId(), itlink->eventId());
+            if (find(matched.begin(), matched.end(), currentId) == matched.end())
+              matched.push_back(currentId);
+          }
+        }
+
+      } else
+        edm::LogWarning("GEMHitAssociator")
+            << "*** WARNING in GEMHitAssociator: GEM layer " << gemDetId << " has no DigiSimLinks !" << std::endl;
+
+    } else
+      edm::LogWarning("GEMHitAssociator") << "*** WARNING in GEMHitAssociator::associateRecHit, null "
+                                             "dynamic_cast !";
   }
-  
-  return  matched;
 
+  return matched;
 }
-
diff --git a/SimMuon/MCTruth/src/MuonAssociatorByHits.cc b/SimMuon/MCTruth/src/MuonAssociatorByHits.cc
index 7b9425eb595f9..0180cb44a5469 100644
--- a/SimMuon/MCTruth/src/MuonAssociatorByHits.cc
+++ b/SimMuon/MCTruth/src/MuonAssociatorByHits.cc
@@ -1,15 +1,15 @@
-#include "SimMuon/MCTruth/interface/MuonAssociatorByHits.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "DataFormats/CSCRecHit/interface/CSCSegment.h"
+#include "DataFormats/DTRecHit/interface/DTRecSegment4D.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
-#include "DataFormats/DTRecHit/interface/DTRecSegment4D.h"
-#include "DataFormats/CSCRecHit/interface/CSCSegment.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "SimMuon/MCTruth/interface/MuonAssociatorByHits.h"
 #include "SimMuon/MCTruth/interface/TrackerMuonHitExtractor.h"
 #include <sstream>
 
@@ -22,25 +22,22 @@ namespace muonAssociatorByHitsDiagnostics {
 
   class InputDumper {
   public:
-    InputDumper(const edm::ParameterSet& conf) :
-      simtracksTag(conf.getParameter<edm::InputTag>("simtracksTag")),
-      simtracksXFTag(conf.getParameter<edm::InputTag>("simtracksXFTag")),
-      crossingframe(conf.getParameter<bool>("crossingframe")) {}
-
-    InputDumper(const edm::ParameterSet& conf, edm::ConsumesCollector && iC) :
-      InputDumper(conf)
-    {
+    InputDumper(const edm::ParameterSet &conf)
+        : simtracksTag(conf.getParameter<edm::InputTag>("simtracksTag")),
+          simtracksXFTag(conf.getParameter<edm::InputTag>("simtracksXFTag")),
+          crossingframe(conf.getParameter<bool>("crossingframe")) {}
+
+    InputDumper(const edm::ParameterSet &conf, edm::ConsumesCollector &&iC) : InputDumper(conf) {
       if (crossingframe) {
-        iC.consumes<CrossingFrame<SimTrack> >(simtracksXFTag);
-        iC.consumes<CrossingFrame<SimVertex> >(simtracksXFTag);
-      }
-      else{
+        iC.consumes<CrossingFrame<SimTrack>>(simtracksXFTag);
+        iC.consumes<CrossingFrame<SimVertex>>(simtracksXFTag);
+      } else {
         iC.consumes<edm::SimTrackContainer>(simtracksTag);
         iC.consumes<edm::SimVertexContainer>(simtracksTag);
       }
     }
 
-    void dump(const TrackHitsCollection&, const TrackingParticleCollection&, const edm::Event&) const;
+    void dump(const TrackHitsCollection &, const TrackingParticleCollection &, const edm::Event &) const;
 
   private:
     edm::InputTag const simtracksTag;
@@ -48,200 +45,194 @@ namespace muonAssociatorByHitsDiagnostics {
     bool const crossingframe;
   };
 
-  void
-  InputDumper::dump(const TrackHitsCollection& tC, const TrackingParticleCollection& tPC, const edm::Event& event) const {
+  void InputDumper::dump(const TrackHitsCollection &tC,
+                         const TrackingParticleCollection &tPC,
+                         const edm::Event &event) const {
     // reco::Track collection
-    edm::LogVerbatim("MuonAssociatorByHits")<<"\n"<<"reco::Track collection --- size = "<<tC.size();
- 
- 
+    edm::LogVerbatim("MuonAssociatorByHits") << "\n"
+                                             << "reco::Track collection --- size = " << tC.size();
+
     // TrackingParticle collection
-    edm::LogVerbatim("MuonAssociatorByHits")<<"\n"<<"TrackingParticle collection --- size = "<<tPC.size();
+    edm::LogVerbatim("MuonAssociatorByHits") << "\n"
+                                             << "TrackingParticle collection --- size = " << tPC.size();
     int j = 0;
-    for(TrackingParticleCollection::const_iterator ITER=tPC.begin(); ITER!=tPC.end(); ITER++, j++) {
+    for (TrackingParticleCollection::const_iterator ITER = tPC.begin(); ITER != tPC.end(); ITER++, j++) {
       edm::LogVerbatim("MuonAssociatorByHits")
-        <<"TrackingParticle "<<j<<", q = "<<ITER->charge()<<", p = "<<ITER->p()
-        <<", pT = "<<ITER->pt()<<", eta = "<<ITER->eta()<<", phi = "<<ITER->phi();
-       
+          << "TrackingParticle " << j << ", q = " << ITER->charge() << ", p = " << ITER->p() << ", pT = " << ITER->pt()
+          << ", eta = " << ITER->eta() << ", phi = " << ITER->phi();
+
       edm::LogVerbatim("MuonAssociatorByHits")
-        <<"\t pdg code = "<<ITER->pdgId()<<", made of "<<ITER->numberOfHits()<<" PSimHit"
-        <<" (in "<<ITER->numberOfTrackerLayers()<<" layers)"
-        <<" from "<<ITER->g4Tracks().size()<<" SimTrack:";
-      for (TrackingParticle::g4t_iterator g4T=ITER->g4Track_begin(); g4T!=ITER->g4Track_end(); g4T++) {
-        edm::LogVerbatim("MuonAssociatorByHits")
-          <<"\t\t Id:"<<g4T->trackId()<<"/Evt:("<<g4T->eventId().event()<<","<<g4T->eventId().bunchCrossing()<<")";
-      }    
+          << "\t pdg code = " << ITER->pdgId() << ", made of " << ITER->numberOfHits() << " PSimHit"
+          << " (in " << ITER->numberOfTrackerLayers() << " layers)"
+          << " from " << ITER->g4Tracks().size() << " SimTrack:";
+      for (TrackingParticle::g4t_iterator g4T = ITER->g4Track_begin(); g4T != ITER->g4Track_end(); g4T++) {
+        edm::LogVerbatim("MuonAssociatorByHits") << "\t\t Id:" << g4T->trackId() << "/Evt:(" << g4T->eventId().event()
+                                                 << "," << g4T->eventId().bunchCrossing() << ")";
+      }
     }
- 
+
     // SimTrack collection
-    edm::Handle<CrossingFrame<SimTrack> > cf_simtracks;
+    edm::Handle<CrossingFrame<SimTrack>> cf_simtracks;
     edm::Handle<edm::SimTrackContainer> simTrackCollection;
- 
+
     // SimVertex collection
-    edm::Handle<CrossingFrame<SimVertex> > cf_simvertices;
+    edm::Handle<CrossingFrame<SimVertex>> cf_simvertices;
     edm::Handle<edm::SimVertexContainer> simVertexCollection;
-         
+
     if (crossingframe) {
-      event.getByLabel(simtracksXFTag,cf_simtracks);
-      unique_ptr<MixCollection<SimTrack> > SimTk( new MixCollection<SimTrack>(cf_simtracks.product()) );
-      edm::LogVerbatim("MuonAssociatorByHits")<<"\n"<<"CrossingFrame<SimTrack> collection with InputTag = "<<simtracksXFTag
-                                              <<" has size = "<<SimTk->size();
+      event.getByLabel(simtracksXFTag, cf_simtracks);
+      unique_ptr<MixCollection<SimTrack>> SimTk(new MixCollection<SimTrack>(cf_simtracks.product()));
+      edm::LogVerbatim("MuonAssociatorByHits")
+          << "\n"
+          << "CrossingFrame<SimTrack> collection with InputTag = " << simtracksXFTag << " has size = " << SimTk->size();
       int k = 0;
-      for (MixCollection<SimTrack>::MixItr ITER=SimTk->begin(); ITER!=SimTk->end(); ITER++, k++) {
+      for (MixCollection<SimTrack>::MixItr ITER = SimTk->begin(); ITER != SimTk->end(); ITER++, k++) {
         edm::LogVerbatim("MuonAssociatorByHits")
-          <<"SimTrack "<<k
-          <<" - Id:"<<ITER->trackId()<<"/Evt:("<<ITER->eventId().event()<<","<<ITER->eventId().bunchCrossing()<<")"
-          <<" pdgId = "<<ITER->type()<<", q = "<<ITER->charge()<<", p = "<<ITER->momentum().P()
-          <<", pT = "<<ITER->momentum().Pt()<<", eta = "<<ITER->momentum().Eta()<<", phi = "<<ITER->momentum().Phi()
-          <<"\n * "<<*ITER <<endl;
+            << "SimTrack " << k << " - Id:" << ITER->trackId() << "/Evt:(" << ITER->eventId().event() << ","
+            << ITER->eventId().bunchCrossing() << ")"
+            << " pdgId = " << ITER->type() << ", q = " << ITER->charge() << ", p = " << ITER->momentum().P()
+            << ", pT = " << ITER->momentum().Pt() << ", eta = " << ITER->momentum().Eta()
+            << ", phi = " << ITER->momentum().Phi() << "\n * " << *ITER << endl;
       }
-      event.getByLabel(simtracksXFTag,cf_simvertices);
-      unique_ptr<MixCollection<SimVertex> > SimVtx( new MixCollection<SimVertex>(cf_simvertices.product()) );
-      edm::LogVerbatim("MuonAssociatorByHits")<<"\n"<<"CrossingFrame<SimVertex> collection with InputTag = "<<simtracksXFTag
-                                              <<" has size = "<<SimVtx->size();
+      event.getByLabel(simtracksXFTag, cf_simvertices);
+      unique_ptr<MixCollection<SimVertex>> SimVtx(new MixCollection<SimVertex>(cf_simvertices.product()));
+      edm::LogVerbatim("MuonAssociatorByHits")
+          << "\n"
+          << "CrossingFrame<SimVertex> collection with InputTag = " << simtracksXFTag
+          << " has size = " << SimVtx->size();
       int kv = 0;
-      for (MixCollection<SimVertex>::MixItr VITER=SimVtx->begin(); VITER!=SimVtx->end(); VITER++, kv++){
-        edm::LogVerbatim("MuonAssociatorByHits")
-          <<"SimVertex "<<kv
-          << " : "<< *VITER <<endl;
+      for (MixCollection<SimVertex>::MixItr VITER = SimVtx->begin(); VITER != SimVtx->end(); VITER++, kv++) {
+        edm::LogVerbatim("MuonAssociatorByHits") << "SimVertex " << kv << " : " << *VITER << endl;
       }
-    }
-    else {
-      event.getByLabel(simtracksTag,simTrackCollection);
+    } else {
+      event.getByLabel(simtracksTag, simTrackCollection);
       const edm::SimTrackContainer simTC = *(simTrackCollection.product());
-      edm::LogVerbatim("MuonAssociatorByHits")<<"\n"<<"SimTrack collection with InputTag = "<<simtracksTag
-                                              <<" has size = "<<simTC.size()<<endl;
+      edm::LogVerbatim("MuonAssociatorByHits")
+          << "\n"
+          << "SimTrack collection with InputTag = " << simtracksTag << " has size = " << simTC.size() << endl;
       int k = 0;
-      for(edm::SimTrackContainer::const_iterator ITER=simTC.begin(); ITER!=simTC.end(); ITER++, k++){
+      for (edm::SimTrackContainer::const_iterator ITER = simTC.begin(); ITER != simTC.end(); ITER++, k++) {
         edm::LogVerbatim("MuonAssociatorByHits")
-          <<"SimTrack "<<k
-          <<" - Id:"<<ITER->trackId()<<"/Evt:("<<ITER->eventId().event()<<","<<ITER->eventId().bunchCrossing()<<")"
-          <<" pdgId = "<<ITER->type()<<", q = "<<ITER->charge()<<", p = "<<ITER->momentum().P()
-          <<", pT = "<<ITER->momentum().Pt()<<", eta = "<<ITER->momentum().Eta()<<", phi = "<<ITER->momentum().Phi()
-          <<"\n * "<<*ITER <<endl;
+            << "SimTrack " << k << " - Id:" << ITER->trackId() << "/Evt:(" << ITER->eventId().event() << ","
+            << ITER->eventId().bunchCrossing() << ")"
+            << " pdgId = " << ITER->type() << ", q = " << ITER->charge() << ", p = " << ITER->momentum().P()
+            << ", pT = " << ITER->momentum().Pt() << ", eta = " << ITER->momentum().Eta()
+            << ", phi = " << ITER->momentum().Phi() << "\n * " << *ITER << endl;
       }
-      event.getByLabel(simtracksTag,simVertexCollection);
+      event.getByLabel(simtracksTag, simVertexCollection);
       const edm::SimVertexContainer simVC = *(simVertexCollection.product());
-      edm::LogVerbatim("MuonAssociatorByHits")<<"\n"<<"SimVertex collection with InputTag = "<<"g4SimHits"
-                                              <<" has size = "<<simVC.size()<<endl;
+      edm::LogVerbatim("MuonAssociatorByHits") << "\n"
+                                               << "SimVertex collection with InputTag = "
+                                               << "g4SimHits"
+                                               << " has size = " << simVC.size() << endl;
       int kv = 0;
-      for (edm::SimVertexContainer::const_iterator VITER=simVC.begin(); VITER!=simVC.end(); VITER++, kv++){
-        edm::LogVerbatim("MuonAssociatorByHits")
-          <<"SimVertex "<<kv
-          << " : "<< *VITER <<endl;
+      for (edm::SimVertexContainer::const_iterator VITER = simVC.begin(); VITER != simVC.end(); VITER++, kv++) {
+        edm::LogVerbatim("MuonAssociatorByHits") << "SimVertex " << kv << " : " << *VITER << endl;
       }
     }
   }
 
-}
-
-
-MuonAssociatorByHits::MuonAssociatorByHits (const edm::ParameterSet& conf, edm::ConsumesCollector && iC) :  
-  helper_(conf),
-  conf_(conf),
-  trackerHitAssociatorConfig_(conf, std::move(iC))
-{
-  //hack for consumes
-  RPCHitAssociator rpctruth(conf,std::move(iC));
-  GEMHitAssociator gemtruth(conf,std::move(iC));
-  DTHitAssociator dttruth(conf,std::move(iC));
-  CSCHitAssociator muonTruth(conf,std::move(iC));
-  if( conf.getUntrackedParameter<bool>("dumpInputCollections") ) {
-    diagnostics_.reset( new InputDumper(conf, std::move(iC)) );
+}  // namespace muonAssociatorByHitsDiagnostics
+
+MuonAssociatorByHits::MuonAssociatorByHits(const edm::ParameterSet &conf, edm::ConsumesCollector &&iC)
+    : helper_(conf), conf_(conf), trackerHitAssociatorConfig_(conf, std::move(iC)) {
+  // hack for consumes
+  RPCHitAssociator rpctruth(conf, std::move(iC));
+  GEMHitAssociator gemtruth(conf, std::move(iC));
+  DTHitAssociator dttruth(conf, std::move(iC));
+  CSCHitAssociator muonTruth(conf, std::move(iC));
+  if (conf.getUntrackedParameter<bool>("dumpInputCollections")) {
+    diagnostics_.reset(new InputDumper(conf, std::move(iC)));
   }
 }
 
+MuonAssociatorByHits::~MuonAssociatorByHits() {}
 
-
-MuonAssociatorByHits::~MuonAssociatorByHits()
-{
-}
-
-RecoToSimCollection  
-MuonAssociatorByHits::associateRecoToSim( const edm::RefToBaseVector<reco::Track>& tC,
-					  const edm::RefVector<TrackingParticleCollection>& TPCollectionH,
-    					  const edm::Event * e, const edm::EventSetup * setup) const{
-  RecoToSimCollection  outputCollection(&e->productGetter());
+RecoToSimCollection MuonAssociatorByHits::associateRecoToSim(
+    const edm::RefToBaseVector<reco::Track> &tC,
+    const edm::RefVector<TrackingParticleCollection> &TPCollectionH,
+    const edm::Event *e,
+    const edm::EventSetup *setup) const {
+  RecoToSimCollection outputCollection(&e->productGetter());
 
   MuonAssociatorByHitsHelper::TrackHitsCollection tH;
   for (auto it = tC.begin(), ed = tC.end(); it != ed; ++it) {
     tH.push_back(std::make_pair((*it)->recHitsBegin(), (*it)->recHitsEnd()));
   }
 
-  //Retrieve tracker topology from geometry
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHand;
   setup->get<TrackerTopologyRcd>().get(tTopoHand);
-  const TrackerTopology *tTopo=tTopoHand.product();
+  const TrackerTopology *tTopo = tTopoHand.product();
 
-
-  // Tracker hit association  
+  // Tracker hit association
   TrackerHitAssociator trackertruth(*e, trackerHitAssociatorConfig_);
   // CSC hit association
-  CSCHitAssociator csctruth(*e,*setup,conf_);
+  CSCHitAssociator csctruth(*e, *setup, conf_);
   // DT hit association
   bool printRtS(true);
-  DTHitAssociator dttruth(*e,*setup,conf_,printRtS);  
+  DTHitAssociator dttruth(*e, *setup, conf_, printRtS);
   // RPC hit association
-  RPCHitAssociator rpctruth(*e,*setup,conf_);
+  RPCHitAssociator rpctruth(*e, *setup, conf_);
   // GEM hit association
-  GEMHitAssociator gemtruth(*e,*setup,conf_);
-   
+  GEMHitAssociator gemtruth(*e, *setup, conf_);
+
   MuonAssociatorByHitsHelper::Resources resources = {tTopo, &trackertruth, &csctruth, &dttruth, &rpctruth, &gemtruth};
 
-  if(diagnostics_) {
-    resources.diagnostics_ = [this, e](const TrackHitsCollection& hC, const TrackingParticleCollection& pC) {
-      diagnostics_->dump(hC,pC, *e);
+  if (diagnostics_) {
+    resources.diagnostics_ = [this, e](const TrackHitsCollection &hC, const TrackingParticleCollection &pC) {
+      diagnostics_->dump(hC, pC, *e);
     };
   }
 
   auto bareAssoc = helper_.associateRecoToSimIndices(tH, TPCollectionH, resources);
   for (auto it = bareAssoc.begin(), ed = bareAssoc.end(); it != ed; ++it) {
     for (auto itma = it->second.begin(), edma = it->second.end(); itma != edma; ++itma) {
-        outputCollection.insert(tC[it->first], std::make_pair(TPCollectionH[itma->idx], itma->quality));
+      outputCollection.insert(tC[it->first], std::make_pair(TPCollectionH[itma->idx], itma->quality));
     }
   }
 
-  outputCollection.post_insert(); // perhaps not even necessary
+  outputCollection.post_insert();  // perhaps not even necessary
   return outputCollection;
 }
 
-SimToRecoCollection  
-MuonAssociatorByHits::associateSimToReco( const edm::RefToBaseVector<reco::Track>& tC, 
-					  const edm::RefVector<TrackingParticleCollection>& TPCollectionH,
-					  const edm::Event * e, const edm::EventSetup * setup) const{
-
-  SimToRecoCollection  outputCollection(&e->productGetter());
+SimToRecoCollection MuonAssociatorByHits::associateSimToReco(
+    const edm::RefToBaseVector<reco::Track> &tC,
+    const edm::RefVector<TrackingParticleCollection> &TPCollectionH,
+    const edm::Event *e,
+    const edm::EventSetup *setup) const {
+  SimToRecoCollection outputCollection(&e->productGetter());
   MuonAssociatorByHitsHelper::TrackHitsCollection tH;
   for (auto it = tC.begin(), ed = tC.end(); it != ed; ++it) {
     tH.push_back(std::make_pair((*it)->recHitsBegin(), (*it)->recHitsEnd()));
   }
 
-  //Retrieve tracker topology from geometry
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHand;
   setup->get<TrackerTopologyRcd>().get(tTopoHand);
-  const TrackerTopology *tTopo=tTopoHand.product();
+  const TrackerTopology *tTopo = tTopoHand.product();
 
-  // Tracker hit association  
+  // Tracker hit association
   TrackerHitAssociator trackertruth(*e, trackerHitAssociatorConfig_);
   // CSC hit association
-  CSCHitAssociator csctruth(*e,*setup,conf_);
+  CSCHitAssociator csctruth(*e, *setup, conf_);
   // DT hit association
   bool printRtS = false;
-  DTHitAssociator dttruth(*e,*setup,conf_,printRtS);  
+  DTHitAssociator dttruth(*e, *setup, conf_, printRtS);
   // RPC hit association
-  RPCHitAssociator rpctruth(*e,*setup,conf_);
+  RPCHitAssociator rpctruth(*e, *setup, conf_);
   // GEM hit association
-  GEMHitAssociator gemtruth(*e,*setup,conf_);
-   
+  GEMHitAssociator gemtruth(*e, *setup, conf_);
+
   MuonAssociatorByHitsHelper::Resources resources = {tTopo, &trackertruth, &csctruth, &dttruth, &rpctruth, &gemtruth};
-  
+
   auto bareAssoc = helper_.associateSimToRecoIndices(tH, TPCollectionH, resources);
   for (auto it = bareAssoc.begin(), ed = bareAssoc.end(); it != ed; ++it) {
     for (auto itma = it->second.begin(), edma = it->second.end(); itma != edma; ++itma) {
-        outputCollection.insert(TPCollectionH[ it->first],
-                                std::make_pair(tC[itma->idx], itma->quality));
+      outputCollection.insert(TPCollectionH[it->first], std::make_pair(tC[itma->idx], itma->quality));
     }
   }
 
-  outputCollection.post_insert(); // perhaps not even necessary
+  outputCollection.post_insert();  // perhaps not even necessary
   return outputCollection;
 }
diff --git a/SimMuon/MCTruth/src/MuonAssociatorByHitsHelper.cc b/SimMuon/MCTruth/src/MuonAssociatorByHitsHelper.cc
index cfce2eeed456c..edba4e6c8c349 100644
--- a/SimMuon/MCTruth/src/MuonAssociatorByHitsHelper.cc
+++ b/SimMuon/MCTruth/src/MuonAssociatorByHitsHelper.cc
@@ -1,71 +1,77 @@
-#include "SimMuon/MCTruth/interface/MuonAssociatorByHitsHelper.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "DataFormats/CSCRecHit/interface/CSCSegment.h"
+#include "DataFormats/DTRecHit/interface/DTRecSegment4D.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "DataFormats/DTRecHit/interface/DTRecSegment4D.h"
-#include "DataFormats/CSCRecHit/interface/CSCSegment.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "SimMuon/MCTruth/interface/MuonAssociatorByHitsHelper.h"
 #include <sstream>
 
 using namespace reco;
 using namespace std;
 
-MuonAssociatorByHitsHelper::MuonAssociatorByHitsHelper (const edm::ParameterSet& conf) :  
-  includeZeroHitMuons(conf.getParameter<bool>("includeZeroHitMuons")),
-  acceptOneStubMatchings(conf.getParameter<bool>("acceptOneStubMatchings")),
-  UseTracker(conf.getParameter<bool>("UseTracker")),
-  UseMuon(conf.getParameter<bool>("UseMuon")),
-  AbsoluteNumberOfHits_track(conf.getParameter<bool>("AbsoluteNumberOfHits_track")),
-  NHitCut_track(conf.getParameter<unsigned int>("NHitCut_track")),
-  EfficiencyCut_track(conf.getParameter<double>("EfficiencyCut_track")),
-  PurityCut_track(conf.getParameter<double>("PurityCut_track")),
-  AbsoluteNumberOfHits_muon(conf.getParameter<bool>("AbsoluteNumberOfHits_muon")),
-  NHitCut_muon(conf.getParameter<unsigned int>("NHitCut_muon")),
-  EfficiencyCut_muon(conf.getParameter<double>("EfficiencyCut_muon")),
-  PurityCut_muon(conf.getParameter<double>("PurityCut_muon")),
-  UsePixels(conf.getParameter<bool>("UsePixels")),
-  UseGrouped(conf.getParameter<bool>("UseGrouped")),
-  UseSplitting(conf.getParameter<bool>("UseSplitting")),
-  ThreeHitTracksAreSpecial(conf.getParameter<bool>("ThreeHitTracksAreSpecial")),
-  dumpDT(conf.getParameter<bool>("dumpDT"))
-{
+MuonAssociatorByHitsHelper::MuonAssociatorByHitsHelper(const edm::ParameterSet &conf)
+    : includeZeroHitMuons(conf.getParameter<bool>("includeZeroHitMuons")),
+      acceptOneStubMatchings(conf.getParameter<bool>("acceptOneStubMatchings")),
+      UseTracker(conf.getParameter<bool>("UseTracker")),
+      UseMuon(conf.getParameter<bool>("UseMuon")),
+      AbsoluteNumberOfHits_track(conf.getParameter<bool>("AbsoluteNumberOfHits_track")),
+      NHitCut_track(conf.getParameter<unsigned int>("NHitCut_track")),
+      EfficiencyCut_track(conf.getParameter<double>("EfficiencyCut_track")),
+      PurityCut_track(conf.getParameter<double>("PurityCut_track")),
+      AbsoluteNumberOfHits_muon(conf.getParameter<bool>("AbsoluteNumberOfHits_muon")),
+      NHitCut_muon(conf.getParameter<unsigned int>("NHitCut_muon")),
+      EfficiencyCut_muon(conf.getParameter<double>("EfficiencyCut_muon")),
+      PurityCut_muon(conf.getParameter<double>("PurityCut_muon")),
+      UsePixels(conf.getParameter<bool>("UsePixels")),
+      UseGrouped(conf.getParameter<bool>("UseGrouped")),
+      UseSplitting(conf.getParameter<bool>("UseSplitting")),
+      ThreeHitTracksAreSpecial(conf.getParameter<bool>("ThreeHitTracksAreSpecial")),
+      dumpDT(conf.getParameter<bool>("dumpDT")) {
   edm::LogVerbatim("MuonAssociatorByHitsHelper") << "constructing  MuonAssociatorByHitsHelper" << conf.dump();
 
   // up to the user in the other cases - print a message
-  if (UseTracker) edm::LogVerbatim("MuonAssociatorByHitsHelper")<<"\n UseTracker = TRUE  : Tracker SimHits and RecHits WILL be counted";
-  else edm::LogVerbatim("MuonAssociatorByHitsHelper") <<"\n UseTracker = FALSE : Tracker SimHits and RecHits WILL NOT be counted";
-  
+  if (UseTracker)
+    edm::LogVerbatim("MuonAssociatorByHitsHelper") << "\n UseTracker = TRUE  : Tracker SimHits and RecHits WILL be "
+                                                      "counted";
+  else
+    edm::LogVerbatim("MuonAssociatorByHitsHelper") << "\n UseTracker = FALSE : Tracker SimHits and RecHits WILL NOT be "
+                                                      "counted";
+
   // up to the user in the other cases - print a message
-  if (UseMuon) edm::LogVerbatim("MuonAssociatorByHitsHelper")<<" UseMuon = TRUE  : Muon SimHits and RecHits WILL be counted";
-  else edm::LogVerbatim("MuonAssociatorByHitsHelper") <<" UseMuon = FALSE : Muon SimHits and RecHits WILL NOT be counted"<<endl;
-  
-  // check consistency of the configuration when allowing zero-hit muon matching (counting invalid hits)
+  if (UseMuon)
+    edm::LogVerbatim("MuonAssociatorByHitsHelper") << " UseMuon = TRUE  : Muon SimHits and RecHits WILL be counted";
+  else
+    edm::LogVerbatim("MuonAssociatorByHitsHelper")
+        << " UseMuon = FALSE : Muon SimHits and RecHits WILL NOT be counted" << endl;
+
+  // check consistency of the configuration when allowing zero-hit muon matching
+  // (counting invalid hits)
   if (includeZeroHitMuons) {
-    edm::LogVerbatim("MuonAssociatorByHitsHelper") 
-      <<"\n includeZeroHitMuons = TRUE"
-      <<"\n ==> (re)set NHitCut_muon = 0, PurityCut_muon = 0, EfficiencyCut_muon = 0"<<endl;
+    edm::LogVerbatim("MuonAssociatorByHitsHelper") << "\n includeZeroHitMuons = TRUE"
+                                                   << "\n ==> (re)set NHitCut_muon = 0, PurityCut_muon = 0, "
+                                                      "EfficiencyCut_muon = 0"
+                                                   << endl;
     NHitCut_muon = 0;
     PurityCut_muon = 0.;
     EfficiencyCut_muon = 0.;
   }
-
 }
 
-MuonAssociatorByHitsHelper::IndexAssociation
-MuonAssociatorByHitsHelper::associateRecoToSimIndices(const TrackHitsCollection & tC,
-                                                      const edm::RefVector<TrackingParticleCollection>& TPCollectionH,
-                                                      const Resources& resources) const {
-
+MuonAssociatorByHitsHelper::IndexAssociation MuonAssociatorByHitsHelper::associateRecoToSimIndices(
+    const TrackHitsCollection &tC,
+    const edm::RefVector<TrackingParticleCollection> &TPCollectionH,
+    const Resources &resources) const {
   auto tTopo = resources.tTopo_;
   auto trackertruth = resources.trackerHitAssoc_;
-  auto const & csctruth = *resources.cscHitAssoc_;
-  auto const& dttruth = *resources.dtHitAssoc_;
-  auto const& rpctruth = *resources.rpcHitAssoc_;
-  auto const& gemtruth = *resources.gemHitAssoc_;
+  auto const &csctruth = *resources.cscHitAssoc_;
+  auto const &dttruth = *resources.dtHitAssoc_;
+  auto const &rpctruth = *resources.rpcHitAssoc_;
+  auto const &gemtruth = *resources.gemHitAssoc_;
 
   int tracker_nshared = 0;
   int muon_nshared = 0;
@@ -73,37 +79,41 @@ MuonAssociatorByHitsHelper::associateRecoToSimIndices(const TrackHitsCollection
 
   double tracker_quality = 0;
   double tracker_quality_cut;
-  if (AbsoluteNumberOfHits_track) tracker_quality_cut = static_cast<double>(NHitCut_track); 
-  else tracker_quality_cut = PurityCut_track;
+  if (AbsoluteNumberOfHits_track)
+    tracker_quality_cut = static_cast<double>(NHitCut_track);
+  else
+    tracker_quality_cut = PurityCut_track;
 
   double muon_quality = 0;
   double muon_quality_cut;
-  if (AbsoluteNumberOfHits_muon) muon_quality_cut = static_cast<double>(NHitCut_muon); 
-  else muon_quality_cut = PurityCut_muon;
+  if (AbsoluteNumberOfHits_muon)
+    muon_quality_cut = static_cast<double>(NHitCut_muon);
+  else
+    muon_quality_cut = PurityCut_muon;
 
   double global_quality = 0;
-  
+
   MapOfMatchedIds tracker_matchedIds_valid, muon_matchedIds_valid;
   MapOfMatchedIds tracker_matchedIds_INVALID, muon_matchedIds_INVALID;
 
-  IndexAssociation     outputCollection;
+  IndexAssociation outputCollection;
   bool printRtS(true);
 
   TrackingParticleCollection tPC;
   tPC.reserve(TPCollectionH.size());
-  for(auto const& ref: TPCollectionH) {
+  for (auto const &ref : TPCollectionH) {
     tPC.push_back(*ref);
   }
 
-  if(resources.diagnostics_) {
-    resources.diagnostics_(tC,tPC);
+  if (resources.diagnostics_) {
+    resources.diagnostics_(tC, tPC);
   }
 
-  int tindex=0;
-  for (TrackHitsCollection::const_iterator track=tC.begin(); track!=tC.end(); track++, tindex++) {
+  int tindex = 0;
+  for (TrackHitsCollection::const_iterator track = tC.begin(); track != tC.end(); track++, tindex++) {
     edm::LogVerbatim("MuonAssociatorByHitsHelper")
-      <<"\n"<<"reco::Track "<<tindex
-      <<", number of RecHits = "<< (track->second - track->first) << "\n";
+        << "\n"
+        << "reco::Track " << tindex << ", number of RecHits = " << (track->second - track->first) << "\n";
     tracker_matchedIds_valid.clear();
     muon_matchedIds_valid.clear();
 
@@ -114,221 +124,278 @@ MuonAssociatorByHitsHelper::associateRecoToSimIndices(const TrackHitsCollection
     int n_matching_simhits = 0;
 
     // all hits = valid +INVALID
-    int n_all         = 0;        
+    int n_all = 0;
     int n_tracker_all = 0;
-    int n_dt_all      = 0;     
-    int n_csc_all     = 0;    
-    int n_rpc_all     = 0;
-    int n_gem_all     = 0;
+    int n_dt_all = 0;
+    int n_csc_all = 0;
+    int n_rpc_all = 0;
+    int n_gem_all = 0;
 
-    int n_valid         = 0;        
+    int n_valid = 0;
     int n_tracker_valid = 0;
-    int n_muon_valid    = 0;   
-    int n_dt_valid      = 0;     
-    int n_csc_valid     = 0;    
-    int n_rpc_valid     = 0;
-    int n_gem_valid     = 0;
+    int n_muon_valid = 0;
+    int n_dt_valid = 0;
+    int n_csc_valid = 0;
+    int n_rpc_valid = 0;
+    int n_gem_valid = 0;
 
     int n_tracker_matched_valid = 0;
-    int n_muon_matched_valid    = 0;   
-    int n_dt_matched_valid      = 0;     
-    int n_csc_matched_valid     = 0;    
-    int n_rpc_matched_valid     = 0;
-    int n_gem_matched_valid     = 0;
+    int n_muon_matched_valid = 0;
+    int n_dt_matched_valid = 0;
+    int n_csc_matched_valid = 0;
+    int n_rpc_matched_valid = 0;
+    int n_gem_matched_valid = 0;
 
-    int n_INVALID         = 0;        
+    int n_INVALID = 0;
     int n_tracker_INVALID = 0;
-    int n_muon_INVALID    = 0;   
-    int n_dt_INVALID      = 0;     
-    int n_csc_INVALID     = 0;    
-    int n_rpc_INVALID     = 0;
-    int n_gem_INVALID     = 0;
-    
+    int n_muon_INVALID = 0;
+    int n_dt_INVALID = 0;
+    int n_csc_INVALID = 0;
+    int n_rpc_INVALID = 0;
+    int n_gem_INVALID = 0;
+
     int n_tracker_matched_INVALID = 0;
-    int n_muon_matched_INVALID    = 0;     
-    int n_dt_matched_INVALID      = 0;     
-    int n_csc_matched_INVALID     = 0;    
-    int n_rpc_matched_INVALID     = 0;
-    int n_gem_matched_INVALID     = 0;
-    
+    int n_muon_matched_INVALID = 0;
+    int n_dt_matched_INVALID = 0;
+    int n_csc_matched_INVALID = 0;
+    int n_rpc_matched_INVALID = 0;
+    int n_gem_matched_INVALID = 0;
+
     printRtS = true;
-    getMatchedIds(tracker_matchedIds_valid, muon_matchedIds_valid,
-		  tracker_matchedIds_INVALID, muon_matchedIds_INVALID,       
-		  n_tracker_valid, n_dt_valid, n_csc_valid, n_rpc_valid, n_gem_valid,
-		  n_tracker_matched_valid, n_dt_matched_valid, n_csc_matched_valid, n_rpc_matched_valid, n_gem_matched_valid,
-		  n_tracker_INVALID, n_dt_INVALID, n_csc_INVALID, n_rpc_INVALID, n_gem_INVALID,
-		  n_tracker_matched_INVALID, n_dt_matched_INVALID, n_csc_matched_INVALID, n_rpc_matched_INVALID, n_gem_matched_INVALID,
-                  track->first, track->second,
-		  trackertruth, dttruth, csctruth, rpctruth, gemtruth,
-		  printRtS,tTopo);
-    
-    n_matching_simhits = tracker_matchedIds_valid.size() + muon_matchedIds_valid.size() + 
-                         tracker_matchedIds_INVALID.size() +muon_matchedIds_INVALID.size(); 
-
-    n_muon_valid   = n_dt_valid + n_csc_valid + n_rpc_valid + n_gem_valid;
-    n_valid        = n_tracker_valid + n_muon_valid;
+    getMatchedIds(tracker_matchedIds_valid,
+                  muon_matchedIds_valid,
+                  tracker_matchedIds_INVALID,
+                  muon_matchedIds_INVALID,
+                  n_tracker_valid,
+                  n_dt_valid,
+                  n_csc_valid,
+                  n_rpc_valid,
+                  n_gem_valid,
+                  n_tracker_matched_valid,
+                  n_dt_matched_valid,
+                  n_csc_matched_valid,
+                  n_rpc_matched_valid,
+                  n_gem_matched_valid,
+                  n_tracker_INVALID,
+                  n_dt_INVALID,
+                  n_csc_INVALID,
+                  n_rpc_INVALID,
+                  n_gem_INVALID,
+                  n_tracker_matched_INVALID,
+                  n_dt_matched_INVALID,
+                  n_csc_matched_INVALID,
+                  n_rpc_matched_INVALID,
+                  n_gem_matched_INVALID,
+                  track->first,
+                  track->second,
+                  trackertruth,
+                  dttruth,
+                  csctruth,
+                  rpctruth,
+                  gemtruth,
+                  printRtS,
+                  tTopo);
+
+    n_matching_simhits = tracker_matchedIds_valid.size() + muon_matchedIds_valid.size() +
+                         tracker_matchedIds_INVALID.size() + muon_matchedIds_INVALID.size();
+
+    n_muon_valid = n_dt_valid + n_csc_valid + n_rpc_valid + n_gem_valid;
+    n_valid = n_tracker_valid + n_muon_valid;
     n_muon_INVALID = n_dt_INVALID + n_csc_INVALID + n_rpc_INVALID + n_gem_INVALID;
-    n_INVALID      = n_tracker_INVALID + n_muon_INVALID;
+    n_INVALID = n_tracker_INVALID + n_muon_INVALID;
 
     // all used hits (valid+INVALID), defined by UseTracker, UseMuon
     n_tracker_all = n_tracker_valid + n_tracker_INVALID;
-    n_dt_all      = n_dt_valid  + n_dt_INVALID;
-    n_csc_all     = n_csc_valid + n_csc_INVALID;
-    n_rpc_all     = n_rpc_valid + n_rpc_INVALID;
-    n_gem_all     = n_gem_valid + n_gem_INVALID;
-    n_all         = n_valid + n_INVALID;
+    n_dt_all = n_dt_valid + n_dt_INVALID;
+    n_csc_all = n_csc_valid + n_csc_INVALID;
+    n_rpc_all = n_rpc_valid + n_rpc_INVALID;
+    n_gem_all = n_gem_valid + n_gem_INVALID;
+    n_all = n_valid + n_INVALID;
 
-    n_muon_matched_valid   = n_dt_matched_valid + n_csc_matched_valid + n_rpc_matched_valid + n_gem_matched_valid;
-    n_muon_matched_INVALID = n_dt_matched_INVALID + n_csc_matched_INVALID + n_rpc_matched_INVALID + n_gem_matched_INVALID;
+    n_muon_matched_valid = n_dt_matched_valid + n_csc_matched_valid + n_rpc_matched_valid + n_gem_matched_valid;
+    n_muon_matched_INVALID =
+        n_dt_matched_INVALID + n_csc_matched_INVALID + n_rpc_matched_INVALID + n_gem_matched_INVALID;
 
     // selected hits are set initially to valid hits
     int n_tracker_selected_hits = n_tracker_valid;
-    int n_muon_selected_hits    = n_muon_valid;
-    int n_dt_selected_hits      = n_dt_valid;
-    int n_csc_selected_hits     = n_csc_valid;
-    int n_rpc_selected_hits     = n_rpc_valid;
-    int n_gem_selected_hits     = n_gem_valid;
+    int n_muon_selected_hits = n_muon_valid;
+    int n_dt_selected_hits = n_dt_valid;
+    int n_csc_selected_hits = n_csc_valid;
+    int n_rpc_selected_hits = n_rpc_valid;
+    int n_gem_selected_hits = n_gem_valid;
 
     // matched hits are a subsample of the selected hits
     int n_tracker_matched = n_tracker_matched_valid;
-    int n_muon_matched    = n_muon_matched_valid;
-    int n_dt_matched      = n_dt_matched_valid;
-    int n_csc_matched     = n_csc_matched_valid;
-    int n_rpc_matched     = n_rpc_matched_valid;
-    int n_gem_matched     = n_gem_matched_valid;
+    int n_muon_matched = n_muon_matched_valid;
+    int n_dt_matched = n_dt_matched_valid;
+    int n_csc_matched = n_csc_matched_valid;
+    int n_rpc_matched = n_rpc_matched_valid;
+    int n_gem_matched = n_gem_matched_valid;
 
     std::string InvMuonHits, ZeroHitMuon;
-    
-    if (includeZeroHitMuons && n_muon_valid==0 && n_muon_INVALID!=0) {
-      // selected muon hits = INVALID when (useZeroHitMuons == True) and track has no valid muon hits
+
+    if (includeZeroHitMuons && n_muon_valid == 0 && n_muon_INVALID != 0) {
+      // selected muon hits = INVALID when (useZeroHitMuons == True) and track
+      // has no valid muon hits
 
       InvMuonHits = " ***INVALID MUON HITS***";
       ZeroHitMuon = " ***ZERO-HIT MUON***";
 
       n_muon_selected_hits = n_muon_INVALID;
-      n_dt_selected_hits   = n_dt_INVALID;
-      n_csc_selected_hits  = n_csc_INVALID;
-      n_rpc_selected_hits  = n_rpc_INVALID;
-      n_gem_selected_hits  = n_gem_INVALID;
+      n_dt_selected_hits = n_dt_INVALID;
+      n_csc_selected_hits = n_csc_INVALID;
+      n_rpc_selected_hits = n_rpc_INVALID;
+      n_gem_selected_hits = n_gem_INVALID;
 
       n_muon_matched = n_muon_matched_INVALID;
-      n_dt_matched   = n_dt_matched_INVALID;
-      n_csc_matched  = n_csc_matched_INVALID;
-      n_rpc_matched  = n_rpc_matched_INVALID;
-      n_gem_matched  = n_gem_matched_INVALID;
+      n_dt_matched = n_dt_matched_INVALID;
+      n_csc_matched = n_csc_matched_INVALID;
+      n_rpc_matched = n_rpc_matched_INVALID;
+      n_gem_matched = n_gem_matched_INVALID;
     }
 
     int n_selected_hits = n_tracker_selected_hits + n_muon_selected_hits;
     int n_matched = n_tracker_matched + n_muon_matched;
 
     edm::LogVerbatim("MuonAssociatorByHitsHelper")
-      <<"\n"<<"# TrackingRecHits: "<<(track->second - track->first) 
-      <<"\n"<< "# used RecHits     = " << n_all <<" ("<<n_tracker_all<<"/"
-      <<n_dt_all<<"/"<<n_csc_all<<"/"<<n_rpc_all<<"/"<<n_gem_all<<" in Tracker/DT/CSC/RPC/GEM)"<<", obtained from " << n_matching_simhits << " SimHits"
-      <<"\n"<< "# selected RecHits = " <<n_selected_hits <<" (" <<n_tracker_selected_hits<<"/"
-      <<n_dt_selected_hits<<"/"<<n_csc_selected_hits<<"/"<<n_rpc_selected_hits<<"/"<<n_gem_selected_hits<<" in Tracker/DT/CSC/RPC/GEM)"<<InvMuonHits
-      <<"\n"<< "# matched RecHits  = " <<n_matched<<" ("<<n_tracker_matched<<"/"
-      <<n_dt_matched<<"/"<<n_csc_matched<<"/"<<n_rpc_matched<<"/"<<n_gem_matched<<" in Tracker/DT/CSC/RPC/GEM)";
-
-    if (n_all>0 && n_matching_simhits == 0)
+        << "\n"
+        << "# TrackingRecHits: " << (track->second - track->first) << "\n"
+        << "# used RecHits     = " << n_all << " (" << n_tracker_all << "/" << n_dt_all << "/" << n_csc_all << "/"
+        << n_rpc_all << "/" << n_gem_all << " in Tracker/DT/CSC/RPC/GEM)"
+        << ", obtained from " << n_matching_simhits << " SimHits"
+        << "\n"
+        << "# selected RecHits = " << n_selected_hits << " (" << n_tracker_selected_hits << "/" << n_dt_selected_hits
+        << "/" << n_csc_selected_hits << "/" << n_rpc_selected_hits << "/" << n_gem_selected_hits
+        << " in Tracker/DT/CSC/RPC/GEM)" << InvMuonHits << "\n"
+        << "# matched RecHits  = " << n_matched << " (" << n_tracker_matched << "/" << n_dt_matched << "/"
+        << n_csc_matched << "/" << n_rpc_matched << "/" << n_gem_matched << " in Tracker/DT/CSC/RPC/GEM)";
+
+    if (n_all > 0 && n_matching_simhits == 0)
       edm::LogVerbatim("MuonAssociatorByHitsHelper")
-	<<"*** WARNING in MuonAssociatorByHitsHelper::associateRecoToSim: no matching PSimHit found for this reco::Track !";
+          << "*** WARNING in MuonAssociatorByHitsHelper::associateRecoToSim: "
+             "no matching PSimHit found for this reco::Track !";
 
     if (n_matching_simhits != 0) {
       edm::LogVerbatim("MuonAssociatorByHitsHelper")
-	<<"\n"<< "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
-	<<"\n"<< "reco::Track "<<tindex<<ZeroHitMuon
-	<<"\n\t"<< "made of "<<n_selected_hits<<" selected RecHits (tracker:"<<n_tracker_selected_hits<<"/muons:"<<n_muon_selected_hits<<")";
+          << "\n"
+          << "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
+             "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
+          << "\n"
+          << "reco::Track " << tindex << ZeroHitMuon << "\n\t"
+          << "made of " << n_selected_hits << " selected RecHits (tracker:" << n_tracker_selected_hits
+          << "/muons:" << n_muon_selected_hits << ")";
 
       int tpindex = 0;
       for (TrackingParticleCollection::const_iterator trpart = tPC.begin(); trpart != tPC.end(); ++trpart, ++tpindex) {
-	tracker_nshared = getShared(tracker_matchedIds_valid, trpart);
-	muon_nshared = getShared(muon_matchedIds_valid, trpart);
+        tracker_nshared = getShared(tracker_matchedIds_valid, trpart);
+        muon_nshared = getShared(muon_matchedIds_valid, trpart);
 
-	if (includeZeroHitMuons && n_muon_valid==0 && n_muon_INVALID!=0) 
-	  muon_nshared = getShared(muon_matchedIds_INVALID, trpart);
+        if (includeZeroHitMuons && n_muon_valid == 0 && n_muon_INVALID != 0)
+          muon_nshared = getShared(muon_matchedIds_INVALID, trpart);
 
         global_nshared = tracker_nshared + muon_nshared;
 
-	if (AbsoluteNumberOfHits_track) tracker_quality = static_cast<double>(tracker_nshared);
-	else if(n_tracker_selected_hits != 0) tracker_quality = (static_cast<double>(tracker_nshared)/static_cast<double>(n_tracker_selected_hits));
-	else tracker_quality = 0;
-
-	if (AbsoluteNumberOfHits_muon) muon_quality = static_cast<double>(muon_nshared);
-	else if(n_muon_selected_hits != 0) muon_quality = (static_cast<double>(muon_nshared)/static_cast<double>(n_muon_selected_hits));
-	else muon_quality = 0;
-
-	// global_quality used to order the matching TPs
-	if (n_selected_hits != 0) {
-            if (AbsoluteNumberOfHits_muon && AbsoluteNumberOfHits_track) 
-                global_quality = global_nshared;
-            else
-                global_quality = (static_cast<double>(global_nshared)/static_cast<double>(n_selected_hits));
-        } else global_quality = 0;
-
-	bool trackerOk = false;
-	if (n_tracker_selected_hits != 0) {
-	  if (tracker_quality > tracker_quality_cut) trackerOk = true;
-	  //if a track has just 3 hits in the Tracker we require that all 3 hits are shared
-	  if (ThreeHitTracksAreSpecial && n_tracker_selected_hits==3 && tracker_nshared<3) trackerOk = false;
-	}
-	
-	bool muonOk = false;
-	if (n_muon_selected_hits != 0) {
-	  if (muon_quality > muon_quality_cut) muonOk = true;
-	}
-	
-	// (matchOk) has to account for different track types (tracker-only, standalone muons, global muons)
-	bool matchOk = trackerOk || muonOk;
-
-	// only for global muons: match both tracker and muon stub unless (acceptOneStubMatchings==true)
-	if (!acceptOneStubMatchings && n_tracker_selected_hits!=0 && n_muon_selected_hits!=0)
-	  matchOk = trackerOk && muonOk;
-	
-	if (matchOk) {
-
+        if (AbsoluteNumberOfHits_track)
+          tracker_quality = static_cast<double>(tracker_nshared);
+        else if (n_tracker_selected_hits != 0)
+          tracker_quality = (static_cast<double>(tracker_nshared) / static_cast<double>(n_tracker_selected_hits));
+        else
+          tracker_quality = 0;
+
+        if (AbsoluteNumberOfHits_muon)
+          muon_quality = static_cast<double>(muon_nshared);
+        else if (n_muon_selected_hits != 0)
+          muon_quality = (static_cast<double>(muon_nshared) / static_cast<double>(n_muon_selected_hits));
+        else
+          muon_quality = 0;
+
+        // global_quality used to order the matching TPs
+        if (n_selected_hits != 0) {
+          if (AbsoluteNumberOfHits_muon && AbsoluteNumberOfHits_track)
+            global_quality = global_nshared;
+          else
+            global_quality = (static_cast<double>(global_nshared) / static_cast<double>(n_selected_hits));
+        } else
+          global_quality = 0;
+
+        bool trackerOk = false;
+        if (n_tracker_selected_hits != 0) {
+          if (tracker_quality > tracker_quality_cut)
+            trackerOk = true;
+          // if a track has just 3 hits in the Tracker we require that all 3
+          // hits are shared
+          if (ThreeHitTracksAreSpecial && n_tracker_selected_hits == 3 && tracker_nshared < 3)
+            trackerOk = false;
+        }
+
+        bool muonOk = false;
+        if (n_muon_selected_hits != 0) {
+          if (muon_quality > muon_quality_cut)
+            muonOk = true;
+        }
+
+        // (matchOk) has to account for different track types (tracker-only,
+        // standalone muons, global muons)
+        bool matchOk = trackerOk || muonOk;
+
+        // only for global muons: match both tracker and muon stub unless
+        // (acceptOneStubMatchings==true)
+        if (!acceptOneStubMatchings && n_tracker_selected_hits != 0 && n_muon_selected_hits != 0)
+          matchOk = trackerOk && muonOk;
+
+        if (matchOk) {
           outputCollection[tindex].push_back(IndexMatch(tpindex, global_quality));
-	  this_track_matched = true;
-
-	  edm::LogVerbatim("MuonAssociatorByHitsHelper")
-	    << "\n\t"<<" **MATCHED** with quality = "<<global_quality<<" (tracker: "<<tracker_quality<<" / muon: "<<muon_quality<<")"
-	    << "\n\t"<<"   N shared hits = "<<global_nshared<<" (tracker: "<<tracker_nshared<<" / muon: "<<muon_nshared<<")"
-	    <<"\n"<< "   to: TrackingParticle " <<tpindex<<", q = "<<(*trpart).charge()<<", p = "<<(*trpart).p()
-	    <<", pT = "<<(*trpart).pt()<<", eta = "<<(*trpart).eta()<<", phi = "<<(*trpart).phi()
-	    <<"\n\t"<< " pdg code = "<<(*trpart).pdgId()<<", made of "<<(*trpart).numberOfHits()<<" PSimHits"
-	    <<" from "<<(*trpart).g4Tracks().size()<<" SimTrack:";
-	  for(TrackingParticle::g4t_iterator g4T=(*trpart).g4Track_begin(); 
-	      g4T!=(*trpart).g4Track_end(); 
-	      ++g4T) {
-	    edm::LogVerbatim("MuonAssociatorByHitsHelper")
-	      <<"\t"<< " Id:"<<(*g4T).trackId()<<"/Evt:("<<(*g4T).eventId().event()<<","<<(*g4T).eventId().bunchCrossing()<<")";	    
-	  }
-	}
-	else {
-	  // print something only if this TrackingParticle shares some hits with the current reco::Track
-	  if (global_nshared != 0) 
-	    edm::LogVerbatim("MuonAssociatorByHitsHelper")
-	      <<"\n\t"<<" NOT matched to TrackingParticle "<<tpindex
-	      << " with quality = "<<global_quality<<" (tracker: "<<tracker_quality<<" / muon: "<<muon_quality<<")"
-	      << "\n"<< "   N shared hits = "<<global_nshared<<" (tracker: "<<tracker_nshared<<" / muon: "<<muon_nshared<<")";
-	}
-	
-      }    //  loop over TrackingParticle
+          this_track_matched = true;
+
+          edm::LogVerbatim("MuonAssociatorByHitsHelper")
+              << "\n\t"
+              << " **MATCHED** with quality = " << global_quality << " (tracker: " << tracker_quality
+              << " / muon: " << muon_quality << ")"
+              << "\n\t"
+              << "   N shared hits = " << global_nshared << " (tracker: " << tracker_nshared
+              << " / muon: " << muon_nshared << ")"
+              << "\n"
+              << "   to: TrackingParticle " << tpindex << ", q = " << (*trpart).charge() << ", p = " << (*trpart).p()
+              << ", pT = " << (*trpart).pt() << ", eta = " << (*trpart).eta() << ", phi = " << (*trpart).phi() << "\n\t"
+              << " pdg code = " << (*trpart).pdgId() << ", made of " << (*trpart).numberOfHits() << " PSimHits"
+              << " from " << (*trpart).g4Tracks().size() << " SimTrack:";
+          for (TrackingParticle::g4t_iterator g4T = (*trpart).g4Track_begin(); g4T != (*trpart).g4Track_end(); ++g4T) {
+            edm::LogVerbatim("MuonAssociatorByHitsHelper")
+                << "\t"
+                << " Id:" << (*g4T).trackId() << "/Evt:(" << (*g4T).eventId().event() << ","
+                << (*g4T).eventId().bunchCrossing() << ")";
+          }
+        } else {
+          // print something only if this TrackingParticle shares some hits with
+          // the current reco::Track
+          if (global_nshared != 0)
+            edm::LogVerbatim("MuonAssociatorByHitsHelper")
+                << "\n\t"
+                << " NOT matched to TrackingParticle " << tpindex << " with quality = " << global_quality
+                << " (tracker: " << tracker_quality << " / muon: " << muon_quality << ")"
+                << "\n"
+                << "   N shared hits = " << global_nshared << " (tracker: " << tracker_nshared
+                << " / muon: " << muon_nshared << ")";
+        }
+
+      }  //  loop over TrackingParticle
 
       if (!this_track_matched) {
-	edm::LogVerbatim("MuonAssociatorByHitsHelper")
-	  <<"\n"<<" NOT matched to any TrackingParticle";
+        edm::LogVerbatim("MuonAssociatorByHitsHelper") << "\n"
+                                                       << " NOT matched to any TrackingParticle";
       }
-      
+
       edm::LogVerbatim("MuonAssociatorByHitsHelper")
-	<<"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"<<"\n";
-     
-    }    //  if(n_matching_simhits != 0)
-    
-  }    // loop over reco::Track
+          << "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
+             "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
+          << "\n";
+
+    }  //  if(n_matching_simhits != 0)
+
+  }  // loop over reco::Track
 
-  if (tC.empty()) 
-    edm::LogVerbatim("MuonAssociatorByHitsHelper")<<"0 reconstructed tracks (-->> 0 associated !)";
+  if (tC.empty())
+    edm::LogVerbatim("MuonAssociatorByHitsHelper") << "0 reconstructed tracks (-->> 0 associated !)";
 
   for (IndexAssociation::iterator it = outputCollection.begin(), ed = outputCollection.end(); it != ed; ++it) {
     std::sort(it->second.begin(), it->second.end());
@@ -336,17 +403,16 @@ MuonAssociatorByHitsHelper::associateRecoToSimIndices(const TrackHitsCollection
   return outputCollection;
 }
 
-
-MuonAssociatorByHitsHelper::IndexAssociation
-MuonAssociatorByHitsHelper::associateSimToRecoIndices( const TrackHitsCollection & tC, 
-                                                       const edm::RefVector<TrackingParticleCollection>& TPCollectionH,
-                                                       const Resources& resources) const {
+MuonAssociatorByHitsHelper::IndexAssociation MuonAssociatorByHitsHelper::associateSimToRecoIndices(
+    const TrackHitsCollection &tC,
+    const edm::RefVector<TrackingParticleCollection> &TPCollectionH,
+    const Resources &resources) const {
   auto tTopo = resources.tTopo_;
   auto trackertruth = resources.trackerHitAssoc_;
-  auto const & csctruth = *resources.cscHitAssoc_;
-  auto const& dttruth = *resources.dtHitAssoc_;
-  auto const& rpctruth = *resources.rpcHitAssoc_;
-  auto const& gemtruth = *resources.gemHitAssoc_;
+  auto const &csctruth = *resources.cscHitAssoc_;
+  auto const &dttruth = *resources.dtHitAssoc_;
+  auto const &rpctruth = *resources.rpcHitAssoc_;
+  auto const &gemtruth = *resources.gemHitAssoc_;
 
   int tracker_nshared = 0;
   int muon_nshared = 0;
@@ -354,42 +420,46 @@ MuonAssociatorByHitsHelper::associateSimToRecoIndices( const TrackHitsCollection
 
   double tracker_quality = 0;
   double tracker_quality_cut;
-  if (AbsoluteNumberOfHits_track) tracker_quality_cut = static_cast<double>(NHitCut_track); 
-  else tracker_quality_cut = EfficiencyCut_track;
-  
+  if (AbsoluteNumberOfHits_track)
+    tracker_quality_cut = static_cast<double>(NHitCut_track);
+  else
+    tracker_quality_cut = EfficiencyCut_track;
+
   double muon_quality = 0;
   double muon_quality_cut;
-  if (AbsoluteNumberOfHits_muon) muon_quality_cut = static_cast<double>(NHitCut_muon); 
-  else muon_quality_cut = EfficiencyCut_muon;
+  if (AbsoluteNumberOfHits_muon)
+    muon_quality_cut = static_cast<double>(NHitCut_muon);
+  else
+    muon_quality_cut = EfficiencyCut_muon;
 
   double global_quality = 0;
 
   double tracker_purity = 0;
   double muon_purity = 0;
   double global_purity = 0;
-  
+
   MapOfMatchedIds tracker_matchedIds_valid, muon_matchedIds_valid;
   MapOfMatchedIds tracker_matchedIds_INVALID, muon_matchedIds_INVALID;
 
-  IndexAssociation  outputCollection;
-
+  IndexAssociation outputCollection;
 
   bool printRtS(true);
 
   TrackingParticleCollection tPC;
   tPC.reserve(TPCollectionH.size());
-  for(auto const& ref: TPCollectionH) {
+  for (auto const &ref : TPCollectionH) {
     tPC.push_back(*ref);
   }
 
   bool any_trackingParticle_matched = false;
-  
-  int tindex=0;
-  for (TrackHitsCollection::const_iterator track=tC.begin(); track!=tC.end(); track++, tindex++) {
-    if (printRtS) edm::LogVerbatim("MuonAssociatorByHitsHelper")
-      <<"\n"<<"reco::Track "<<tindex
-      <<", number of RecHits = "<< (track->second - track->first) << "\n";
-    
+
+  int tindex = 0;
+  for (TrackHitsCollection::const_iterator track = tC.begin(); track != tC.end(); track++, tindex++) {
+    if (printRtS)
+      edm::LogVerbatim("MuonAssociatorByHitsHelper")
+          << "\n"
+          << "reco::Track " << tindex << ", number of RecHits = " << (track->second - track->first) << "\n";
+
     tracker_matchedIds_valid.clear();
     muon_matchedIds_valid.clear();
 
@@ -399,385 +469,480 @@ MuonAssociatorByHitsHelper::associateSimToRecoIndices( const TrackHitsCollection
     int n_matching_simhits = 0;
 
     // all hits = valid +INVALID
-    int n_all         = 0;        
+    int n_all = 0;
     int n_tracker_all = 0;
-    int n_dt_all      = 0;     
-    int n_csc_all     = 0;    
-    int n_rpc_all     = 0;
-    int n_gem_all     = 0;
+    int n_dt_all = 0;
+    int n_csc_all = 0;
+    int n_rpc_all = 0;
+    int n_gem_all = 0;
 
-    int n_valid         = 0;        
+    int n_valid = 0;
     int n_tracker_valid = 0;
-    int n_muon_valid    = 0;   
-    int n_dt_valid      = 0;     
-    int n_csc_valid     = 0;    
-    int n_rpc_valid     = 0;
-    int n_gem_valid     = 0;
+    int n_muon_valid = 0;
+    int n_dt_valid = 0;
+    int n_csc_valid = 0;
+    int n_rpc_valid = 0;
+    int n_gem_valid = 0;
 
     int n_tracker_matched_valid = 0;
-    int n_muon_matched_valid    = 0;   
-    int n_dt_matched_valid      = 0;     
-    int n_csc_matched_valid     = 0;    
-    int n_rpc_matched_valid     = 0;
-    int n_gem_matched_valid     = 0;
+    int n_muon_matched_valid = 0;
+    int n_dt_matched_valid = 0;
+    int n_csc_matched_valid = 0;
+    int n_rpc_matched_valid = 0;
+    int n_gem_matched_valid = 0;
 
-    int n_INVALID         = 0;        
+    int n_INVALID = 0;
     int n_tracker_INVALID = 0;
-    int n_muon_INVALID    = 0;   
-    int n_dt_INVALID      = 0;     
-    int n_csc_INVALID     = 0;    
-    int n_rpc_INVALID     = 0;
-    int n_gem_INVALID     = 0;
-    
+    int n_muon_INVALID = 0;
+    int n_dt_INVALID = 0;
+    int n_csc_INVALID = 0;
+    int n_rpc_INVALID = 0;
+    int n_gem_INVALID = 0;
+
     int n_tracker_matched_INVALID = 0;
-    int n_muon_matched_INVALID    = 0;     
-    int n_dt_matched_INVALID      = 0;     
-    int n_csc_matched_INVALID     = 0;    
-    int n_rpc_matched_INVALID     = 0;
-    int n_gem_matched_INVALID     = 0;
-    
+    int n_muon_matched_INVALID = 0;
+    int n_dt_matched_INVALID = 0;
+    int n_csc_matched_INVALID = 0;
+    int n_rpc_matched_INVALID = 0;
+    int n_gem_matched_INVALID = 0;
+
     printRtS = false;
-    getMatchedIds(tracker_matchedIds_valid, muon_matchedIds_valid,
-		  tracker_matchedIds_INVALID, muon_matchedIds_INVALID,       
-		  n_tracker_valid, n_dt_valid, n_csc_valid, n_rpc_valid, n_gem_valid,
-		  n_tracker_matched_valid, n_dt_matched_valid, n_csc_matched_valid, n_rpc_matched_valid, n_gem_matched_valid,
-		  n_tracker_INVALID, n_dt_INVALID, n_csc_INVALID, n_rpc_INVALID, n_gem_INVALID,
-		  n_tracker_matched_INVALID, n_dt_matched_INVALID, n_csc_matched_INVALID, n_rpc_matched_INVALID, n_gem_matched_INVALID,
-                  track->first, track->second,
-		  trackertruth, dttruth, csctruth, rpctruth, gemtruth,
-		  printRtS,tTopo);
-    
-    n_matching_simhits = tracker_matchedIds_valid.size() + muon_matchedIds_valid.size() + 
-                         tracker_matchedIds_INVALID.size() +muon_matchedIds_INVALID.size(); 
-
-    n_muon_valid   = n_dt_valid + n_csc_valid + n_rpc_valid + n_gem_valid;
-    n_valid        = n_tracker_valid + n_muon_valid;
+    getMatchedIds(tracker_matchedIds_valid,
+                  muon_matchedIds_valid,
+                  tracker_matchedIds_INVALID,
+                  muon_matchedIds_INVALID,
+                  n_tracker_valid,
+                  n_dt_valid,
+                  n_csc_valid,
+                  n_rpc_valid,
+                  n_gem_valid,
+                  n_tracker_matched_valid,
+                  n_dt_matched_valid,
+                  n_csc_matched_valid,
+                  n_rpc_matched_valid,
+                  n_gem_matched_valid,
+                  n_tracker_INVALID,
+                  n_dt_INVALID,
+                  n_csc_INVALID,
+                  n_rpc_INVALID,
+                  n_gem_INVALID,
+                  n_tracker_matched_INVALID,
+                  n_dt_matched_INVALID,
+                  n_csc_matched_INVALID,
+                  n_rpc_matched_INVALID,
+                  n_gem_matched_INVALID,
+                  track->first,
+                  track->second,
+                  trackertruth,
+                  dttruth,
+                  csctruth,
+                  rpctruth,
+                  gemtruth,
+                  printRtS,
+                  tTopo);
+
+    n_matching_simhits = tracker_matchedIds_valid.size() + muon_matchedIds_valid.size() +
+                         tracker_matchedIds_INVALID.size() + muon_matchedIds_INVALID.size();
+
+    n_muon_valid = n_dt_valid + n_csc_valid + n_rpc_valid + n_gem_valid;
+    n_valid = n_tracker_valid + n_muon_valid;
     n_muon_INVALID = n_dt_INVALID + n_csc_INVALID + n_rpc_INVALID + n_gem_INVALID;
-    n_INVALID      = n_tracker_INVALID + n_muon_INVALID;
+    n_INVALID = n_tracker_INVALID + n_muon_INVALID;
 
     // all used hits (valid+INVALID), defined by UseTracker, UseMuon
     n_tracker_all = n_tracker_valid + n_tracker_INVALID;
-    n_dt_all      = n_dt_valid  + n_dt_INVALID;
-    n_csc_all     = n_csc_valid + n_csc_INVALID;
-    n_rpc_all     = n_rpc_valid + n_rpc_INVALID;
-    n_gem_all     = n_gem_valid + n_gem_INVALID;
-    n_all         = n_valid + n_INVALID;
+    n_dt_all = n_dt_valid + n_dt_INVALID;
+    n_csc_all = n_csc_valid + n_csc_INVALID;
+    n_rpc_all = n_rpc_valid + n_rpc_INVALID;
+    n_gem_all = n_gem_valid + n_gem_INVALID;
+    n_all = n_valid + n_INVALID;
 
-    n_muon_matched_valid   = n_dt_matched_valid + n_csc_matched_valid + n_rpc_matched_valid + n_gem_matched_valid;
-    n_muon_matched_INVALID = n_dt_matched_INVALID + n_csc_matched_INVALID + n_rpc_matched_INVALID + n_gem_matched_INVALID;
+    n_muon_matched_valid = n_dt_matched_valid + n_csc_matched_valid + n_rpc_matched_valid + n_gem_matched_valid;
+    n_muon_matched_INVALID =
+        n_dt_matched_INVALID + n_csc_matched_INVALID + n_rpc_matched_INVALID + n_gem_matched_INVALID;
 
-     // selected hits are set initially to valid hits
+    // selected hits are set initially to valid hits
     int n_tracker_selected_hits = n_tracker_valid;
-    int n_muon_selected_hits    = n_muon_valid;
-    int n_dt_selected_hits      = n_dt_valid;
-    int n_csc_selected_hits     = n_csc_valid;
-    int n_rpc_selected_hits     = n_rpc_valid;
-    int n_gem_selected_hits     = n_gem_valid;
+    int n_muon_selected_hits = n_muon_valid;
+    int n_dt_selected_hits = n_dt_valid;
+    int n_csc_selected_hits = n_csc_valid;
+    int n_rpc_selected_hits = n_rpc_valid;
+    int n_gem_selected_hits = n_gem_valid;
 
     // matched hits are a subsample of the selected hits
     int n_tracker_matched = n_tracker_matched_valid;
-    int n_muon_matched    = n_muon_matched_valid;
-    int n_dt_matched      = n_dt_matched_valid;
-    int n_csc_matched     = n_csc_matched_valid;
-    int n_rpc_matched     = n_rpc_matched_valid;
-    int n_gem_matched     = n_gem_matched_valid;
+    int n_muon_matched = n_muon_matched_valid;
+    int n_dt_matched = n_dt_matched_valid;
+    int n_csc_matched = n_csc_matched_valid;
+    int n_rpc_matched = n_rpc_matched_valid;
+    int n_gem_matched = n_gem_matched_valid;
 
     std::string InvMuonHits, ZeroHitMuon;
 
-    if (includeZeroHitMuons && n_muon_valid==0 && n_muon_INVALID!=0) {
-      // selected muon hits = INVALID when (useZeroHitMuons == True) and track has no valid muon hits
-      
+    if (includeZeroHitMuons && n_muon_valid == 0 && n_muon_INVALID != 0) {
+      // selected muon hits = INVALID when (useZeroHitMuons == True) and track
+      // has no valid muon hits
+
       InvMuonHits = " ***INVALID MUON HITS***";
       ZeroHitMuon = " ***ZERO-HIT MUON***";
 
       n_muon_selected_hits = n_muon_INVALID;
-      n_dt_selected_hits   = n_dt_INVALID;
-      n_csc_selected_hits  = n_csc_INVALID;
-      n_rpc_selected_hits  = n_rpc_INVALID;
-      n_gem_selected_hits  = n_gem_INVALID;
+      n_dt_selected_hits = n_dt_INVALID;
+      n_csc_selected_hits = n_csc_INVALID;
+      n_rpc_selected_hits = n_rpc_INVALID;
+      n_gem_selected_hits = n_gem_INVALID;
 
       n_muon_matched = n_muon_matched_INVALID;
-      n_dt_matched   = n_dt_matched_INVALID;
-      n_csc_matched  = n_csc_matched_INVALID;
-      n_rpc_matched  = n_rpc_matched_INVALID;
-      n_gem_matched  = n_gem_matched_INVALID;
+      n_dt_matched = n_dt_matched_INVALID;
+      n_csc_matched = n_csc_matched_INVALID;
+      n_rpc_matched = n_rpc_matched_INVALID;
+      n_gem_matched = n_gem_matched_INVALID;
     }
 
     int n_selected_hits = n_tracker_selected_hits + n_muon_selected_hits;
     int n_matched = n_tracker_matched + n_muon_matched;
 
-    if (printRtS) edm::LogVerbatim("MuonAssociatorByHitsHelper")
-      <<"\n"<<"# TrackingRecHits: "<<(track->second - track->first) 
-      <<"\n"<< "# used RecHits     = " <<n_all    <<" ("<<n_tracker_all<<"/"
-      <<n_dt_all<<"/"<<n_csc_all<<"/"<<n_rpc_all<<"/"<<n_gem_all<<" in Tracker/DT/CSC/RPC/GEM)"<<", obtained from " << n_matching_simhits << " SimHits"
-      <<"\n"<< "# selected RecHits = " <<n_selected_hits  <<" (" <<n_tracker_selected_hits<<"/"
-      <<n_dt_selected_hits<<"/"<<n_csc_selected_hits<<"/"<<n_rpc_selected_hits<<"/"<<n_gem_selected_hits<<" in Tracker/DT/CSC/RPC/GEM)"<<InvMuonHits
-      <<"\n"<< "# matched RecHits = " <<n_matched<<" ("<<n_tracker_matched<<"/"
-      <<n_dt_matched<<"/"<<n_csc_matched<<"/"<<n_rpc_matched<<"/"<<n_gem_matched<<" in Tracker/DT/CSC/RPC/GEM)";
-    
-    if (printRtS && n_all>0 && n_matching_simhits==0)
+    if (printRtS)
+      edm::LogVerbatim("MuonAssociatorByHitsHelper")
+          << "\n"
+          << "# TrackingRecHits: " << (track->second - track->first) << "\n"
+          << "# used RecHits     = " << n_all << " (" << n_tracker_all << "/" << n_dt_all << "/" << n_csc_all << "/"
+          << n_rpc_all << "/" << n_gem_all << " in Tracker/DT/CSC/RPC/GEM)"
+          << ", obtained from " << n_matching_simhits << " SimHits"
+          << "\n"
+          << "# selected RecHits = " << n_selected_hits << " (" << n_tracker_selected_hits << "/" << n_dt_selected_hits
+          << "/" << n_csc_selected_hits << "/" << n_rpc_selected_hits << "/" << n_gem_selected_hits
+          << " in Tracker/DT/CSC/RPC/GEM)" << InvMuonHits << "\n"
+          << "# matched RecHits = " << n_matched << " (" << n_tracker_matched << "/" << n_dt_matched << "/"
+          << n_csc_matched << "/" << n_rpc_matched << "/" << n_gem_matched << " in Tracker/DT/CSC/RPC/GEM)";
+
+    if (printRtS && n_all > 0 && n_matching_simhits == 0)
       edm::LogVerbatim("MuonAssociatorByHitsHelper")
-	<<"*** WARNING in MuonAssociatorByHitsHelper::associateSimToReco: no matching PSimHit found for this reco::Track !";
-    
+          << "*** WARNING in MuonAssociatorByHitsHelper::associateSimToReco: "
+             "no matching PSimHit found for this reco::Track !";
+
     if (n_matching_simhits != 0) {
-      int tpindex =0;
+      int tpindex = 0;
       for (TrackingParticleCollection::const_iterator trpart = tPC.begin(); trpart != tPC.end(); ++trpart, ++tpindex) {
+        //	int n_tracker_simhits = 0;
+        int n_tracker_recounted_simhits = 0;
+        int n_muon_simhits = 0;
+        int n_global_simhits = 0;
+        //	std::vector<PSimHit> tphits;
+
+        int n_tracker_selected_simhits = 0;
+        int n_muon_selected_simhits = 0;
+        int n_global_selected_simhits = 0;
+
+        // shared hits are counted over the selected ones
+        tracker_nshared = getShared(tracker_matchedIds_valid, trpart);
+        muon_nshared = getShared(muon_matchedIds_valid, trpart);
+
+        if (includeZeroHitMuons && n_muon_valid == 0 && n_muon_INVALID != 0)
+          muon_nshared = getShared(muon_matchedIds_INVALID, trpart);
 
-	//	int n_tracker_simhits = 0;
-	int n_tracker_recounted_simhits = 0; 
-	int n_muon_simhits = 0; 
-	int n_global_simhits = 0; 
-	//	std::vector<PSimHit> tphits;
-
-	int n_tracker_selected_simhits = 0;
-	int n_muon_selected_simhits = 0; 
-	int n_global_selected_simhits = 0; 
-
-	// shared hits are counted over the selected ones
-	tracker_nshared = getShared(tracker_matchedIds_valid, trpart);
-	muon_nshared = getShared(muon_matchedIds_valid, trpart);
-
-        if (includeZeroHitMuons && n_muon_valid==0 && n_muon_INVALID!=0)
-	  muon_nshared = getShared(muon_matchedIds_INVALID, trpart);
-	
-        global_nshared = tracker_nshared + muon_nshared;	
-        if (global_nshared == 0) continue; // if this TP shares no hits with the current reco::Track loop over 
-
-	// This does not work with the new TP interface 
-	/*
-	for(std::vector<PSimHit>::const_iterator TPhit = trpart->pSimHit_begin(); TPhit != trpart->pSimHit_end(); TPhit++) {
+        global_nshared = tracker_nshared + muon_nshared;
+        if (global_nshared == 0)
+          continue;  // if this TP shares no hits with the current reco::Track
+                     // loop over
+
+        // This does not work with the new TP interface
+        /*
+        for(std::vector<PSimHit>::const_iterator TPhit =
+        trpart->pSimHit_begin(); TPhit != trpart->pSimHit_end(); TPhit++) {
           DetId dId = DetId(TPhit->detUnitId());
-	  DetId::Detector detector = dId.det();
-	  
-	  if (detector == DetId::Tracker) {
-	    n_tracker_simhits++;
-
-	    unsigned int subdetId = static_cast<unsigned int>(dId.subdetId());
-	    if (!UsePixels && (subdetId==PixelSubdetector::PixelBarrel || subdetId==PixelSubdetector::PixelEndcap) )
-	      continue;
-
-	    SiStripDetId* stripDetId = 0;
-	    if (subdetId==SiStripDetId::TIB||subdetId==SiStripDetId::TOB||
-		subdetId==SiStripDetId::TID||subdetId==SiStripDetId::TEC)
-	      stripDetId= new SiStripDetId(dId);
-	    
-	    bool newhit = true;
-	    for(std::vector<PSimHit>::const_iterator TPhitOK = tphits.begin(); TPhitOK != tphits.end(); TPhitOK++) {
-	      DetId dIdOK = DetId(TPhitOK->detUnitId());
-	      //no grouped, no splitting
-	      if (!UseGrouped && !UseSplitting)
-		if (tTopo->layer(dId)==tTopo->layer(dIdOK) &&
-		    dId.subdetId()==dIdOK.subdetId()) newhit = false;
-	      //no grouped, splitting
-	      if (!UseGrouped && UseSplitting)
-		if (tTopo->layer(dId)==tTopo->layer(dIdOK) &&
-		    dId.subdetId()==dIdOK.subdetId() &&
-		    (stripDetId==0 || stripDetId->partnerDetId()!=dIdOK.rawId()))
-		  newhit = false;
-	      //grouped, no splitting
-	      if (UseGrouped && !UseSplitting)
-		if ( tTopo->layer(dId)== tTopo->layer(dIdOK) &&
-		    dId.subdetId()==dIdOK.subdetId() &&
-		    stripDetId!=0 && stripDetId->partnerDetId()==dIdOK.rawId())
-		  newhit = false;
-	      //grouped, splitting
-	      if (UseGrouped && UseSplitting)
-		newhit = true;
-	    }
-	    if (newhit) {
-	      tphits.push_back(*TPhit);
-	    }
-	    delete stripDetId;
-	  }
-	  else if (detector == DetId::Muon) {
-	    n_muon_simhits++;
-	    
-	    // discard BAD CSC chambers (ME4/2) from hit counting
-	    if (dId.subdetId() == MuonSubdetId::CSC) {
+          DetId::Detector detector = dId.det();
+
+          if (detector == DetId::Tracker) {
+            n_tracker_simhits++;
+
+            unsigned int subdetId = static_cast<unsigned int>(dId.subdetId());
+            if (!UsePixels && (subdetId==PixelSubdetector::PixelBarrel ||
+        subdetId==PixelSubdetector::PixelEndcap) ) continue;
+
+            SiStripDetId* stripDetId = 0;
+            if (subdetId==SiStripDetId::TIB||subdetId==SiStripDetId::TOB||
+                subdetId==SiStripDetId::TID||subdetId==SiStripDetId::TEC)
+              stripDetId= new SiStripDetId(dId);
+
+            bool newhit = true;
+            for(std::vector<PSimHit>::const_iterator TPhitOK = tphits.begin();
+        TPhitOK != tphits.end(); TPhitOK++) { DetId dIdOK =
+        DetId(TPhitOK->detUnitId());
+              //no grouped, no splitting
+              if (!UseGrouped && !UseSplitting)
+                if (tTopo->layer(dId)==tTopo->layer(dIdOK) &&
+                    dId.subdetId()==dIdOK.subdetId()) newhit = false;
+              //no grouped, splitting
+              if (!UseGrouped && UseSplitting)
+                if (tTopo->layer(dId)==tTopo->layer(dIdOK) &&
+                    dId.subdetId()==dIdOK.subdetId() &&
+                    (stripDetId==0 ||
+        stripDetId->partnerDetId()!=dIdOK.rawId())) newhit = false;
+              //grouped, no splitting
+              if (UseGrouped && !UseSplitting)
+                if ( tTopo->layer(dId)== tTopo->layer(dIdOK) &&
+                    dId.subdetId()==dIdOK.subdetId() &&
+                    stripDetId!=0 && stripDetId->partnerDetId()==dIdOK.rawId())
+                  newhit = false;
+              //grouped, splitting
+              if (UseGrouped && UseSplitting)
+                newhit = true;
+            }
+            if (newhit) {
+              tphits.push_back(*TPhit);
+            }
+            delete stripDetId;
+          }
+          else if (detector == DetId::Muon) {
+            n_muon_simhits++;
+
+            // discard BAD CSC chambers (ME4/2) from hit counting
+            if (dId.subdetId() == MuonSubdetId::CSC) {
               if (csctruth.cscBadChambers->isInBadChamber(CSCDetId(dId))) {
-		// edm::LogVerbatim("MuonAssociatorByHitsHelper")<<"This PSimHit is in a BAD CSC chamber, CSCDetId = "<<CSCDetId(dId);
-		n_muon_simhits--;
-	      }
-	    }
-	    
-	  }
-	}
-	*/
-	//	n_tracker_recounted_simhits = tphits.size();
-
-        // adapt to new TP interface: this gives the total number of hits in tracker
+                // edm::LogVerbatim("MuonAssociatorByHitsHelper")<<"This PSimHit
+        is in a BAD CSC chamber, CSCDetId = "<<CSCDetId(dId); n_muon_simhits--;
+              }
+            }
+
+          }
+        }
+        */
+        //	n_tracker_recounted_simhits = tphits.size();
+
+        // adapt to new TP interface: this gives the total number of hits in
+        // tracker
         //   should reproduce the behaviour of UseGrouped=UseSplitting=.true.
-	n_tracker_recounted_simhits = trpart->numberOfTrackerHits();
+        n_tracker_recounted_simhits = trpart->numberOfTrackerHits();
         //   numberOfHits() gives the total number of hits (tracker + muons)
         n_muon_simhits = trpart->numberOfHits() - trpart->numberOfTrackerHits();
 
-        // Handle the case of TrackingParticles that don't have PSimHits inside, e.g. because they were made on RECOSIM only.
-        if (trpart->numberOfHits()==0) {
-	  // FIXME this can be made better, counting the digiSimLinks associated to this TP, but perhaps it's not worth it
-	  //n_tracker_recounted_simhits = tracker_nshared;
-	  //n_muon_simhits = muon_nshared;
-	  // ---> on RECOSIM when the AbsoluteNumberOfHits_muon=True this always obtains quality=1, 
-	  //      hence no sorting is possible in case of duplicate matchings
-	  // ---> reset these variables to 1 so to keep the number of shared hits as ranking criterion
-	  n_tracker_recounted_simhits = 1;
-	  n_muon_simhits = 1;
-        }	
-	n_global_simhits = n_tracker_recounted_simhits + n_muon_simhits;
-
-	if (UseMuon) {
-	  n_muon_selected_simhits = n_muon_simhits;
-	  n_global_selected_simhits = n_muon_selected_simhits;
-	}
-	if (UseTracker) {
-	  n_tracker_selected_simhits = n_tracker_recounted_simhits;
-	  n_global_selected_simhits += n_tracker_selected_simhits;
-	}
-
-	if (AbsoluteNumberOfHits_track) tracker_quality = static_cast<double>(tracker_nshared);
-	else if (n_tracker_selected_simhits!=0) 
-	  tracker_quality = static_cast<double>(tracker_nshared)/static_cast<double>(n_tracker_selected_simhits);
-	else tracker_quality = 0;
-	
-	if (AbsoluteNumberOfHits_muon) muon_quality = static_cast<double>(muon_nshared);
-	else if (n_muon_selected_simhits!=0) 
-	  muon_quality = static_cast<double>(muon_nshared)/static_cast<double>(n_muon_selected_simhits);
-	else muon_quality = 0;
-
-	// global_quality used to order the matching tracks
-	if (n_global_selected_simhits != 0) {
-	  if (AbsoluteNumberOfHits_muon && AbsoluteNumberOfHits_track)
-	    global_quality = global_nshared;
-	  else 
-	    global_quality = static_cast<double>(global_nshared)/static_cast<double>(n_global_selected_simhits);
-	} 
-	else global_quality = 0;
-
-	// global purity
-	if (n_selected_hits != 0) {
-	  if (AbsoluteNumberOfHits_muon && AbsoluteNumberOfHits_track)
-	    global_purity = global_nshared;
-	  else
-	    global_purity = static_cast<double>(global_nshared)/static_cast<double>(n_selected_hits);
-	}
-	else global_purity = 0;
-	
-	bool trackerOk = false;
-	if (n_tracker_selected_hits != 0) {
-	  if (tracker_quality > tracker_quality_cut) trackerOk = true;
-	  
-	  tracker_purity = static_cast<double>(tracker_nshared)/static_cast<double>(n_tracker_selected_hits);
-	  if (AbsoluteNumberOfHits_track) tracker_purity = static_cast<double>(tracker_nshared);
-
-	  if ((!AbsoluteNumberOfHits_track) && tracker_purity <= PurityCut_track) trackerOk = false;
-	  
-	  //if a track has just 3 hits in the Tracker we require that all 3 hits are shared
-	  if (ThreeHitTracksAreSpecial && n_tracker_selected_hits==3 && tracker_nshared<3) trackerOk = false;
-	}
-	
-	bool muonOk = false;
-	if (n_muon_selected_hits != 0) {
-	  if (muon_quality > muon_quality_cut) muonOk = true;
-	  
-	  muon_purity = static_cast<double>(muon_nshared)/static_cast<double>(n_muon_selected_hits);
-	  if (AbsoluteNumberOfHits_muon) muon_purity = static_cast<double>(muon_nshared);
-
-	  if ((!AbsoluteNumberOfHits_muon) &&  muon_purity <= PurityCut_muon) muonOk = false;
-	}
-
-	// (matchOk) has to account for different track types (tracker-only, standalone muons, global muons)
-	bool matchOk = trackerOk || muonOk;
-
-	// only for global muons: match both tracker and muon stub unless (acceptOneStubMatchings==true)
-	if (!acceptOneStubMatchings && n_tracker_selected_hits!=0 && n_muon_selected_hits!=0)
-	  matchOk = trackerOk && muonOk;
-	
-	if (matchOk) {
-	  
-          outputCollection[tpindex].push_back(IndexMatch(tindex,global_quality));
-	  any_trackingParticle_matched = true;
-	  
-	  edm::LogVerbatim("MuonAssociatorByHitsHelper")
-	    <<"************************************************************************************************************************"  
-	    <<"\n"<< "TrackingParticle " << tpindex <<", q = "<<(*trpart).charge()<<", p = "<<(*trpart).p()
-	    <<", pT = "<<(*trpart).pt()<<", eta = "<<(*trpart).eta()<<", phi = "<<(*trpart).phi()
-	    <<"\n"<<" pdg code = "<<(*trpart).pdgId()
-	    <<", made of "<<(*trpart).numberOfHits()<<" PSimHits, recounted "<<n_global_simhits<<" PSimHits"
-	    <<" (tracker:"<<n_tracker_recounted_simhits<<"/muons:"<<n_muon_simhits<<")"
-	    <<", from "<<(*trpart).g4Tracks().size()<<" SimTrack:";
-	  for(TrackingParticle::g4t_iterator g4T=(*trpart).g4Track_begin(); 
-	      g4T!=(*trpart).g4Track_end(); 
-	      ++g4T) {
-	    edm::LogVerbatim("MuonAssociatorByHitsHelper")
-	      <<" Id:"<<(*g4T).trackId()<<"/Evt:("<<(*g4T).eventId().event()<<","<<(*g4T).eventId().bunchCrossing()<<")";
-	  }
-	  edm::LogVerbatim("MuonAssociatorByHitsHelper")
-	    <<"\t selected "<<n_global_selected_simhits<<" PSimHits"
-	    <<" (tracker:"<<n_tracker_selected_simhits<<"/muons:"<<n_muon_selected_simhits<<")"
-	    << "\n\t **MATCHED** with quality = "<<global_quality<<" (tracker: "<<tracker_quality<<" / muon: "<<muon_quality<<")"
-	    << "\n\t               and purity = "<<global_purity<<" (tracker: "<<tracker_purity<<" / muon: "<<muon_purity<<")"
-	    << "\n\t   N shared hits = "<<global_nshared<<" (tracker: "<<tracker_nshared<<" / muon: "<<muon_nshared<<")"
-	    <<"\n" <<"   to: reco::Track "<<tindex<<ZeroHitMuon
-	    <<"\n\t"<< " made of "<<n_selected_hits<<" RecHits (tracker:"<<n_tracker_valid<<"/muons:"<<n_muon_selected_hits<<")";
-	}
-	else {
-	  // print something only if this TrackingParticle shares some hits with the current reco::Track
-	  if (global_nshared != 0) {
-	    if (printRtS) edm::LogVerbatim("MuonAssociatorByHitsHelper")
-	      <<"************************************************************************************************************************"  
-	      <<"\n"<<"TrackingParticle " << tpindex <<", q = "<<(*trpart).charge()<<", p = "<<(*trpart).p()
-	      <<", pT = "<<(*trpart).pt()<<", eta = "<<(*trpart).eta()<<", phi = "<<(*trpart).phi()
-	      <<"\n"<<" pdg code = "<<(*trpart).pdgId()
-	      <<", made of "<<(*trpart).numberOfHits()<<" PSimHits, recounted "<<n_global_simhits<<" PSimHits"
-	      <<" (tracker:"<<n_tracker_recounted_simhits<<"/muons:"<<n_muon_simhits<<")"
-	      <<", from "<<(*trpart).g4Tracks().size()<<" SimTrack:";
-	    for(TrackingParticle::g4t_iterator g4T=(*trpart).g4Track_begin(); 
-		g4T!=(*trpart).g4Track_end(); 
-		++g4T) {
-	      if (printRtS) edm::LogVerbatim("MuonAssociatorByHitsHelper")
-		<<" Id:"<<(*g4T).trackId()<<"/Evt:("<<(*g4T).eventId().event()<<","<<(*g4T).eventId().bunchCrossing()<<")";
-	    }
-	    if (printRtS) edm::LogVerbatim("MuonAssociatorByHitsHelper")
-	      <<"\t selected "<<n_global_selected_simhits<<" PSimHits"
-	      <<" (tracker:"<<n_tracker_selected_simhits<<"/muons:"<<n_muon_selected_simhits<<")"
-	      <<"\n\t NOT matched  to reco::Track "<<tindex<<ZeroHitMuon
-	      <<" with quality = "<<global_quality<<" (tracker: "<<tracker_quality<<" / muon: "<<muon_quality<<")"
-	      <<"\n\t and purity = "<<global_purity<<" (tracker: "<<tracker_purity<<" / muon: "<<muon_purity<<")"
-	      <<"\n\t     N shared hits = "<<global_nshared<<" (tracker: "<<tracker_nshared<<" / muon: "<<muon_nshared<<")";
-	  }
-	}
+        // Handle the case of TrackingParticles that don't have PSimHits inside,
+        // e.g. because they were made on RECOSIM only.
+        if (trpart->numberOfHits() == 0) {
+          // FIXME this can be made better, counting the digiSimLinks associated
+          // to this TP, but perhaps it's not worth it
+          // n_tracker_recounted_simhits = tracker_nshared;
+          // n_muon_simhits = muon_nshared;
+          // ---> on RECOSIM when the AbsoluteNumberOfHits_muon=True this always
+          // obtains quality=1,
+          //      hence no sorting is possible in case of duplicate matchings
+          // ---> reset these variables to 1 so to keep the number of shared
+          // hits as ranking criterion
+          n_tracker_recounted_simhits = 1;
+          n_muon_simhits = 1;
+        }
+        n_global_simhits = n_tracker_recounted_simhits + n_muon_simhits;
+
+        if (UseMuon) {
+          n_muon_selected_simhits = n_muon_simhits;
+          n_global_selected_simhits = n_muon_selected_simhits;
+        }
+        if (UseTracker) {
+          n_tracker_selected_simhits = n_tracker_recounted_simhits;
+          n_global_selected_simhits += n_tracker_selected_simhits;
+        }
+
+        if (AbsoluteNumberOfHits_track)
+          tracker_quality = static_cast<double>(tracker_nshared);
+        else if (n_tracker_selected_simhits != 0)
+          tracker_quality = static_cast<double>(tracker_nshared) / static_cast<double>(n_tracker_selected_simhits);
+        else
+          tracker_quality = 0;
+
+        if (AbsoluteNumberOfHits_muon)
+          muon_quality = static_cast<double>(muon_nshared);
+        else if (n_muon_selected_simhits != 0)
+          muon_quality = static_cast<double>(muon_nshared) / static_cast<double>(n_muon_selected_simhits);
+        else
+          muon_quality = 0;
+
+        // global_quality used to order the matching tracks
+        if (n_global_selected_simhits != 0) {
+          if (AbsoluteNumberOfHits_muon && AbsoluteNumberOfHits_track)
+            global_quality = global_nshared;
+          else
+            global_quality = static_cast<double>(global_nshared) / static_cast<double>(n_global_selected_simhits);
+        } else
+          global_quality = 0;
+
+        // global purity
+        if (n_selected_hits != 0) {
+          if (AbsoluteNumberOfHits_muon && AbsoluteNumberOfHits_track)
+            global_purity = global_nshared;
+          else
+            global_purity = static_cast<double>(global_nshared) / static_cast<double>(n_selected_hits);
+        } else
+          global_purity = 0;
+
+        bool trackerOk = false;
+        if (n_tracker_selected_hits != 0) {
+          if (tracker_quality > tracker_quality_cut)
+            trackerOk = true;
+
+          tracker_purity = static_cast<double>(tracker_nshared) / static_cast<double>(n_tracker_selected_hits);
+          if (AbsoluteNumberOfHits_track)
+            tracker_purity = static_cast<double>(tracker_nshared);
+
+          if ((!AbsoluteNumberOfHits_track) && tracker_purity <= PurityCut_track)
+            trackerOk = false;
+
+          // if a track has just 3 hits in the Tracker we require that all 3
+          // hits are shared
+          if (ThreeHitTracksAreSpecial && n_tracker_selected_hits == 3 && tracker_nshared < 3)
+            trackerOk = false;
+        }
+
+        bool muonOk = false;
+        if (n_muon_selected_hits != 0) {
+          if (muon_quality > muon_quality_cut)
+            muonOk = true;
+
+          muon_purity = static_cast<double>(muon_nshared) / static_cast<double>(n_muon_selected_hits);
+          if (AbsoluteNumberOfHits_muon)
+            muon_purity = static_cast<double>(muon_nshared);
+
+          if ((!AbsoluteNumberOfHits_muon) && muon_purity <= PurityCut_muon)
+            muonOk = false;
+        }
+
+        // (matchOk) has to account for different track types (tracker-only,
+        // standalone muons, global muons)
+        bool matchOk = trackerOk || muonOk;
+
+        // only for global muons: match both tracker and muon stub unless
+        // (acceptOneStubMatchings==true)
+        if (!acceptOneStubMatchings && n_tracker_selected_hits != 0 && n_muon_selected_hits != 0)
+          matchOk = trackerOk && muonOk;
+
+        if (matchOk) {
+          outputCollection[tpindex].push_back(IndexMatch(tindex, global_quality));
+          any_trackingParticle_matched = true;
+
+          edm::LogVerbatim("MuonAssociatorByHitsHelper")
+              << "*************************************************************"
+                 "***********************************************************"
+              << "\n"
+              << "TrackingParticle " << tpindex << ", q = " << (*trpart).charge() << ", p = " << (*trpart).p()
+              << ", pT = " << (*trpart).pt() << ", eta = " << (*trpart).eta() << ", phi = " << (*trpart).phi() << "\n"
+              << " pdg code = " << (*trpart).pdgId() << ", made of " << (*trpart).numberOfHits()
+              << " PSimHits, recounted " << n_global_simhits << " PSimHits"
+              << " (tracker:" << n_tracker_recounted_simhits << "/muons:" << n_muon_simhits << ")"
+              << ", from " << (*trpart).g4Tracks().size() << " SimTrack:";
+          for (TrackingParticle::g4t_iterator g4T = (*trpart).g4Track_begin(); g4T != (*trpart).g4Track_end(); ++g4T) {
+            edm::LogVerbatim("MuonAssociatorByHitsHelper")
+                << " Id:" << (*g4T).trackId() << "/Evt:(" << (*g4T).eventId().event() << ","
+                << (*g4T).eventId().bunchCrossing() << ")";
+          }
+          edm::LogVerbatim("MuonAssociatorByHitsHelper")
+              << "\t selected " << n_global_selected_simhits << " PSimHits"
+              << " (tracker:" << n_tracker_selected_simhits << "/muons:" << n_muon_selected_simhits << ")"
+              << "\n\t **MATCHED** with quality = " << global_quality << " (tracker: " << tracker_quality
+              << " / muon: " << muon_quality << ")"
+              << "\n\t               and purity = " << global_purity << " (tracker: " << tracker_purity
+              << " / muon: " << muon_purity << ")"
+              << "\n\t   N shared hits = " << global_nshared << " (tracker: " << tracker_nshared
+              << " / muon: " << muon_nshared << ")"
+              << "\n"
+              << "   to: reco::Track " << tindex << ZeroHitMuon << "\n\t"
+              << " made of " << n_selected_hits << " RecHits (tracker:" << n_tracker_valid
+              << "/muons:" << n_muon_selected_hits << ")";
+        } else {
+          // print something only if this TrackingParticle shares some hits with
+          // the current reco::Track
+          if (global_nshared != 0) {
+            if (printRtS)
+              edm::LogVerbatim("MuonAssociatorByHitsHelper")
+                  << "*********************************************************"
+                     "*********************************************************"
+                     "******"
+                  << "\n"
+                  << "TrackingParticle " << tpindex << ", q = " << (*trpart).charge() << ", p = " << (*trpart).p()
+                  << ", pT = " << (*trpart).pt() << ", eta = " << (*trpart).eta() << ", phi = " << (*trpart).phi()
+                  << "\n"
+                  << " pdg code = " << (*trpart).pdgId() << ", made of " << (*trpart).numberOfHits()
+                  << " PSimHits, recounted " << n_global_simhits << " PSimHits"
+                  << " (tracker:" << n_tracker_recounted_simhits << "/muons:" << n_muon_simhits << ")"
+                  << ", from " << (*trpart).g4Tracks().size() << " SimTrack:";
+            for (TrackingParticle::g4t_iterator g4T = (*trpart).g4Track_begin(); g4T != (*trpart).g4Track_end();
+                 ++g4T) {
+              if (printRtS)
+                edm::LogVerbatim("MuonAssociatorByHitsHelper")
+                    << " Id:" << (*g4T).trackId() << "/Evt:(" << (*g4T).eventId().event() << ","
+                    << (*g4T).eventId().bunchCrossing() << ")";
+            }
+            if (printRtS)
+              edm::LogVerbatim("MuonAssociatorByHitsHelper")
+                  << "\t selected " << n_global_selected_simhits << " PSimHits"
+                  << " (tracker:" << n_tracker_selected_simhits << "/muons:" << n_muon_selected_simhits << ")"
+                  << "\n\t NOT matched  to reco::Track " << tindex << ZeroHitMuon
+                  << " with quality = " << global_quality << " (tracker: " << tracker_quality
+                  << " / muon: " << muon_quality << ")"
+                  << "\n\t and purity = " << global_purity << " (tracker: " << tracker_purity
+                  << " / muon: " << muon_purity << ")"
+                  << "\n\t     N shared hits = " << global_nshared << " (tracker: " << tracker_nshared
+                  << " / muon: " << muon_nshared << ")";
+          }
+        }
       }  // loop over TrackingParticle's
-    }   // if(n_matching_simhits != 0)
-  }    // loop over reco Tracks
-  
+    }    // if(n_matching_simhits != 0)
+  }      // loop over reco Tracks
+
   if (!any_trackingParticle_matched) {
     edm::LogVerbatim("MuonAssociatorByHitsHelper")
-      <<"\n"
-      <<"************************************************************************************************************************"
-      << "\n NO TrackingParticle associated to ANY input reco::Track ! \n"
-      <<"************************************************************************************************************************"<<"\n";  
+        << "\n"
+        << "*******************************************************************"
+           "*****************************************************"
+        << "\n NO TrackingParticle associated to ANY input reco::Track ! \n"
+        << "*******************************************************************"
+           "*****************************************************"
+        << "\n";
   } else {
     edm::LogVerbatim("MuonAssociatorByHitsHelper")
-      <<"************************************************************************************************************************"<<"\n";  
+        << "*******************************************************************"
+           "*****************************************************"
+        << "\n";
   }
-  
+
   for (IndexAssociation::iterator it = outputCollection.begin(), ed = outputCollection.end(); it != ed; ++it) {
     std::sort(it->second.begin(), it->second.end());
   }
   return outputCollection;
 }
 
-
-void MuonAssociatorByHitsHelper::getMatchedIds
-(MapOfMatchedIds & tracker_matchedIds_valid, MapOfMatchedIds & muon_matchedIds_valid,
- MapOfMatchedIds & tracker_matchedIds_INVALID, MapOfMatchedIds & muon_matchedIds_INVALID,       
- int& n_tracker_valid, int& n_dt_valid, int& n_csc_valid, int& n_rpc_valid, int& n_gem_valid,
- int& n_tracker_matched_valid, int& n_dt_matched_valid, int& n_csc_matched_valid, int& n_rpc_matched_valid, int& n_gem_matched_valid,
- int& n_tracker_INVALID, int& n_dt_INVALID, int& n_csc_INVALID, int& n_rpc_INVALID, int& n_gem_INVALID,
- int& n_tracker_matched_INVALID, int& n_dt_matched_INVALID, int& n_csc_matched_INVALID, int& n_rpc_matched_INVALID, int& n_gem_matched_INVALID,
- trackingRecHit_iterator begin, trackingRecHit_iterator end,
- const TrackerHitAssociator* trackertruth, 
- const DTHitAssociator& dttruth, const CSCHitAssociator& csctruth, const RPCHitAssociator& rpctruth, const GEMHitAssociator& gemtruth, bool printRtS,
- const TrackerTopology *tTopo) const
+void MuonAssociatorByHitsHelper::getMatchedIds(MapOfMatchedIds &tracker_matchedIds_valid,
+                                               MapOfMatchedIds &muon_matchedIds_valid,
+                                               MapOfMatchedIds &tracker_matchedIds_INVALID,
+                                               MapOfMatchedIds &muon_matchedIds_INVALID,
+                                               int &n_tracker_valid,
+                                               int &n_dt_valid,
+                                               int &n_csc_valid,
+                                               int &n_rpc_valid,
+                                               int &n_gem_valid,
+                                               int &n_tracker_matched_valid,
+                                               int &n_dt_matched_valid,
+                                               int &n_csc_matched_valid,
+                                               int &n_rpc_matched_valid,
+                                               int &n_gem_matched_valid,
+                                               int &n_tracker_INVALID,
+                                               int &n_dt_INVALID,
+                                               int &n_csc_INVALID,
+                                               int &n_rpc_INVALID,
+                                               int &n_gem_INVALID,
+                                               int &n_tracker_matched_INVALID,
+                                               int &n_dt_matched_INVALID,
+                                               int &n_csc_matched_INVALID,
+                                               int &n_rpc_matched_INVALID,
+                                               int &n_gem_matched_INVALID,
+                                               trackingRecHit_iterator begin,
+                                               trackingRecHit_iterator end,
+                                               const TrackerHitAssociator *trackertruth,
+                                               const DTHitAssociator &dttruth,
+                                               const CSCHitAssociator &csctruth,
+                                               const RPCHitAssociator &rpctruth,
+                                               const GEMHitAssociator &gemtruth,
+                                               bool printRtS,
+                                               const TrackerTopology *tTopo) const
 
 {
   tracker_matchedIds_valid.clear();
@@ -787,507 +952,534 @@ void MuonAssociatorByHitsHelper::getMatchedIds
   muon_matchedIds_INVALID.clear();
 
   n_tracker_valid = 0;
-  n_dt_valid  = 0;
+  n_dt_valid = 0;
   n_csc_valid = 0;
   n_rpc_valid = 0;
   n_gem_valid = 0;
 
   n_tracker_matched_valid = 0;
-  n_dt_matched_valid  = 0;
+  n_dt_matched_valid = 0;
   n_csc_matched_valid = 0;
   n_rpc_matched_valid = 0;
   n_gem_matched_valid = 0;
-  
+
   n_tracker_INVALID = 0;
-  n_dt_INVALID  = 0;
+  n_dt_INVALID = 0;
   n_csc_INVALID = 0;
   n_rpc_INVALID = 0;
   n_gem_INVALID = 0;
-  
+
   n_tracker_matched_INVALID = 0;
-  n_dt_matched_INVALID  = 0;
+  n_dt_matched_INVALID = 0;
   n_csc_matched_INVALID = 0;
   n_rpc_matched_INVALID = 0;
   n_gem_matched_INVALID = 0;
-  
+
   std::vector<SimHitIdpr> SimTrackIds;
 
   // main loop on TrackingRecHits
   int iloop = 0;
   int iH = -1;
-  for (trackingRecHit_iterator it = begin;  it != end; it++, iloop++) {
-    stringstream hit_index;     
-    hit_index<<iloop;
+  for (trackingRecHit_iterator it = begin; it != end; it++, iloop++) {
+    stringstream hit_index;
+    hit_index << iloop;
 
-    const TrackingRecHit * hitp = getHitPtr(it);
-    DetId geoid = hitp->geographicalId();    
+    const TrackingRecHit *hitp = getHitPtr(it);
+    DetId geoid = hitp->geographicalId();
 
-    unsigned int detid = geoid.rawId();    
+    unsigned int detid = geoid.rawId();
     stringstream detector_id;
-    detector_id<<detid;
+    detector_id << detid;
 
-    string hitlog = "TrackingRecHit "+hit_index.str();
+    string hitlog = "TrackingRecHit " + hit_index.str();
     string wireidlog;
     std::vector<string> DTSimHits;
-    
+
     DetId::Detector det = geoid.det();
     int subdet = geoid.subdetId();
-    
+
     bool valid_Hit = hitp->isValid();
-    
+
     // Si-Tracker Hits
     if (det == DetId::Tracker && UseTracker) {
       stringstream detector_id;
-      detector_id<< tTopo->print(detid);
-      
-      if (valid_Hit) hitlog = hitlog+" -Tracker - detID = "+detector_id.str();
-      else hitlog = hitlog+" *** INVALID ***"+" -Tracker - detID = "+detector_id.str();
-      
+      detector_id << tTopo->print(detid);
+
+      if (valid_Hit)
+        hitlog = hitlog + " -Tracker - detID = " + detector_id.str();
+      else
+        hitlog = hitlog + " *** INVALID ***" + " -Tracker - detID = " + detector_id.str();
+
       iH++;
       SimTrackIds = trackertruth->associateHitId(*hitp);
 
       if (valid_Hit) {
-	n_tracker_valid++;
-	
-	if(!SimTrackIds.empty()) {
-	  n_tracker_matched_valid++;
-	  //tracker_matchedIds_valid[iH] = SimTrackIds;
-          tracker_matchedIds_valid.push_back( new uint_SimHitIdpr_pair(iH, SimTrackIds));
-	}
+        n_tracker_valid++;
+
+        if (!SimTrackIds.empty()) {
+          n_tracker_matched_valid++;
+          // tracker_matchedIds_valid[iH] = SimTrackIds;
+          tracker_matchedIds_valid.push_back(new uint_SimHitIdpr_pair(iH, SimTrackIds));
+        }
       } else {
-	n_tracker_INVALID++;
+        n_tracker_INVALID++;
 
-	if(!SimTrackIds.empty()) {
-	  n_tracker_matched_INVALID++;
-	  //tracker_matchedIds_INVALID[iH] = SimTrackIds;
-          tracker_matchedIds_INVALID.push_back( new uint_SimHitIdpr_pair(iH, SimTrackIds));
-	}
+        if (!SimTrackIds.empty()) {
+          n_tracker_matched_INVALID++;
+          // tracker_matchedIds_INVALID[iH] = SimTrackIds;
+          tracker_matchedIds_INVALID.push_back(new uint_SimHitIdpr_pair(iH, SimTrackIds));
+        }
       }
-    }  
-    // Muon detector Hits    
+    }
+    // Muon detector Hits
     else if (det == DetId::Muon && UseMuon) {
+      // DT Hits
+      if (subdet == MuonSubdetId::DT) {
+        DTWireId dtdetid = DTWireId(detid);
+        stringstream dt_detector_id;
+        dt_detector_id << dtdetid;
+        if (valid_Hit)
+          hitlog = hitlog + " -Muon DT - detID = " + dt_detector_id.str();
+        else
+          hitlog = hitlog + " *** INVALID ***" + " -Muon DT - detID = " + dt_detector_id.str();
+
+        const DTRecHit1D *dtrechit = dynamic_cast<const DTRecHit1D *>(hitp);
+
+        // single DT hits
+        if (dtrechit) {
+          iH++;
+          SimTrackIds = dttruth.associateDTHitId(dtrechit);
+
+          if (valid_Hit) {
+            n_dt_valid++;
+
+            if (!SimTrackIds.empty()) {
+              n_dt_matched_valid++;
+              // muon_matchedIds_valid[iH] = SimTrackIds;
+              muon_matchedIds_valid.push_back(new uint_SimHitIdpr_pair(iH, SimTrackIds));
+            }
+          } else {
+            n_dt_INVALID++;
+
+            if (!SimTrackIds.empty()) {
+              n_dt_matched_INVALID++;
+              // muon_matchedIds_INVALID[iH] = SimTrackIds;
+              muon_matchedIds_INVALID.push_back(new uint_SimHitIdpr_pair(iH, SimTrackIds));
+            }
+          }
 
-      // DT Hits      
-      if (subdet == MuonSubdetId::DT) {    
-	DTWireId dtdetid = DTWireId(detid);
-	stringstream dt_detector_id;
-	dt_detector_id << dtdetid;
-	if (valid_Hit) hitlog = hitlog+" -Muon DT - detID = "+dt_detector_id.str();	  
-	else hitlog = hitlog+" *** INVALID ***"+" -Muon DT - detID = "+dt_detector_id.str();	  
-	
-	const DTRecHit1D * dtrechit = dynamic_cast<const DTRecHit1D *>(hitp);
-	
-	// single DT hits
-	if (dtrechit) {
-	  iH++;
-	  SimTrackIds = dttruth.associateDTHitId(dtrechit);  
-	  
-	  if (valid_Hit) {
-	    n_dt_valid++;
-
-	    if (!SimTrackIds.empty()) {
-	      n_dt_matched_valid++;
-	      //muon_matchedIds_valid[iH] = SimTrackIds;
-              muon_matchedIds_valid.push_back (new uint_SimHitIdpr_pair(iH,SimTrackIds));
-	    }
-	  } else {
-	    n_dt_INVALID++;
-	    
-	    if (!SimTrackIds.empty()) {
-	      n_dt_matched_INVALID++;
-	      //muon_matchedIds_INVALID[iH] = SimTrackIds;
-              muon_matchedIds_INVALID.push_back (new uint_SimHitIdpr_pair(iH,SimTrackIds));
-	    }
-	  }
-
-	  if (dumpDT) {
-	    DTWireId wireid = dtrechit->wireId();
-	    stringstream wid; 
-	    wid<<wireid;
-	    std::vector<PSimHit> dtSimHits = dttruth.associateHit(*hitp);
-	    
-	    stringstream ndthits;
-	    ndthits<<dtSimHits.size();
-	    wireidlog = "\t DTWireId :"+wid.str()+", "+ndthits.str()+" associated PSimHit :";
-	    
-	    for (unsigned int j=0; j<dtSimHits.size(); j++) {
-	      stringstream index;
-	      index<<j;
-	      stringstream simhit;
-	      simhit<<dtSimHits[j];
-	      string simhitlog = "\t\t PSimHit "+index.str()+": "+simhit.str();
-	      DTSimHits.push_back(simhitlog);
-	    }
-	  }  // if (dumpDT)
-	}
-
-	// DT segments	
-	else {
-	  const DTRecSegment4D * dtsegment = dynamic_cast<const DTRecSegment4D *>(hitp);
-	  
-	  if (dtsegment) {
-	    
-	    std::vector<const TrackingRecHit *> componentHits, phiHits, zHits;
-	    if (dtsegment->hasPhi()) {
-	      phiHits = dtsegment->phiSegment()->recHits();
-	      componentHits.insert(componentHits.end(),phiHits.begin(),phiHits.end());
-	    }
-	    if (dtsegment->hasZed()) {
-	      zHits = dtsegment->zSegment()->recHits();
-	      componentHits.insert(componentHits.end(),zHits.begin(),zHits.end());
-	    }
-	    if (printRtS) edm::LogVerbatim("MuonAssociatorByHitsHelper")
-	      <<"\n\t this TrackingRecHit is a DTRecSegment4D with "
-	      <<componentHits.size()<<" hits (phi:"<<phiHits.size()<<", z:"<<zHits.size()<<")";
-	    
-	    SimTrackIds.clear();
-	    std::vector<SimHitIdpr> i_SimTrackIds;
-	    int i_compHit = 0;
-	    for (std::vector<const TrackingRecHit *>::const_iterator ithit =componentHits.begin(); 
-		 ithit != componentHits.end(); ++ithit) {
-	      i_compHit++;
-	      
-	      const DTRecHit1D * dtrechit1D = dynamic_cast<const DTRecHit1D *>(*ithit);
-	      
-	      i_SimTrackIds.clear();
-	      if (dtrechit1D) {
-		iH++;
-		i_SimTrackIds = dttruth.associateDTHitId(dtrechit1D);  
-		
-		if (valid_Hit) {
-		  // validity check is on the segment, but hits are counted one-by-one
-		  n_dt_valid++; 
-
-		  if (!i_SimTrackIds.empty()) {
-		    n_dt_matched_valid++;
-		    //muon_matchedIds_valid[iH] = i_SimTrackIds;
-                    muon_matchedIds_valid.push_back (new uint_SimHitIdpr_pair(iH,i_SimTrackIds));
-		  }
-		} else {
-		  n_dt_INVALID++;
-		  
-		  if (!i_SimTrackIds.empty()) {
-		    n_dt_matched_INVALID++;
-		    //muon_matchedIds_INVALID[iH] = i_SimTrackIds;
-                    muon_matchedIds_INVALID.push_back (new uint_SimHitIdpr_pair(iH,i_SimTrackIds));
-                    
-		  } 
-		}
-	      } else if (printRtS) edm::LogVerbatim("MuonAssociatorByHitsHelper")
-		<<"*** WARNING in MuonAssociatorByHitsHelper::getMatchedIds, null dynamic_cast of a DT TrackingRecHit !";
-	      
-	      unsigned int i_detid = (*ithit)->geographicalId().rawId();
-	      DTWireId i_dtdetid = DTWireId(i_detid);
-
-	      stringstream i_dt_detector_id;
-	      i_dt_detector_id << i_dtdetid;
-
-	      stringstream i_ss;
-	      i_ss<<"\t\t hit "<<i_compHit<<" -Muon DT - detID = "<<i_dt_detector_id.str();
-
-	      string i_hitlog = i_ss.str();
-	      i_hitlog = i_hitlog + write_matched_simtracks(i_SimTrackIds);
-	      if (printRtS) edm::LogVerbatim("MuonAssociatorByHitsHelper") << i_hitlog;
-	      
-	      SimTrackIds.insert(SimTrackIds.end(),i_SimTrackIds.begin(),i_SimTrackIds.end());
-	    }	      
-	  }  // if (dtsegment)
-
-	  else if (printRtS) edm::LogVerbatim("MuonAssociatorByHitsHelper")
-	    <<"*** WARNING in MuonAssociatorByHitsHelper::getMatchedIds, DT TrackingRecHit is neither DTRecHit1D nor DTRecSegment4D ! ";	    
-	}
+          if (dumpDT) {
+            DTWireId wireid = dtrechit->wireId();
+            stringstream wid;
+            wid << wireid;
+            std::vector<PSimHit> dtSimHits = dttruth.associateHit(*hitp);
+
+            stringstream ndthits;
+            ndthits << dtSimHits.size();
+            wireidlog = "\t DTWireId :" + wid.str() + ", " + ndthits.str() + " associated PSimHit :";
+
+            for (unsigned int j = 0; j < dtSimHits.size(); j++) {
+              stringstream index;
+              index << j;
+              stringstream simhit;
+              simhit << dtSimHits[j];
+              string simhitlog = "\t\t PSimHit " + index.str() + ": " + simhit.str();
+              DTSimHits.push_back(simhitlog);
+            }
+          }  // if (dumpDT)
+        }
+
+        // DT segments
+        else {
+          const DTRecSegment4D *dtsegment = dynamic_cast<const DTRecSegment4D *>(hitp);
+
+          if (dtsegment) {
+            std::vector<const TrackingRecHit *> componentHits, phiHits, zHits;
+            if (dtsegment->hasPhi()) {
+              phiHits = dtsegment->phiSegment()->recHits();
+              componentHits.insert(componentHits.end(), phiHits.begin(), phiHits.end());
+            }
+            if (dtsegment->hasZed()) {
+              zHits = dtsegment->zSegment()->recHits();
+              componentHits.insert(componentHits.end(), zHits.begin(), zHits.end());
+            }
+            if (printRtS)
+              edm::LogVerbatim("MuonAssociatorByHitsHelper")
+                  << "\n\t this TrackingRecHit is a DTRecSegment4D with " << componentHits.size()
+                  << " hits (phi:" << phiHits.size() << ", z:" << zHits.size() << ")";
+
+            SimTrackIds.clear();
+            std::vector<SimHitIdpr> i_SimTrackIds;
+            int i_compHit = 0;
+            for (std::vector<const TrackingRecHit *>::const_iterator ithit = componentHits.begin();
+                 ithit != componentHits.end();
+                 ++ithit) {
+              i_compHit++;
+
+              const DTRecHit1D *dtrechit1D = dynamic_cast<const DTRecHit1D *>(*ithit);
+
+              i_SimTrackIds.clear();
+              if (dtrechit1D) {
+                iH++;
+                i_SimTrackIds = dttruth.associateDTHitId(dtrechit1D);
+
+                if (valid_Hit) {
+                  // validity check is on the segment, but hits are counted
+                  // one-by-one
+                  n_dt_valid++;
+
+                  if (!i_SimTrackIds.empty()) {
+                    n_dt_matched_valid++;
+                    // muon_matchedIds_valid[iH] = i_SimTrackIds;
+                    muon_matchedIds_valid.push_back(new uint_SimHitIdpr_pair(iH, i_SimTrackIds));
+                  }
+                } else {
+                  n_dt_INVALID++;
+
+                  if (!i_SimTrackIds.empty()) {
+                    n_dt_matched_INVALID++;
+                    // muon_matchedIds_INVALID[iH] = i_SimTrackIds;
+                    muon_matchedIds_INVALID.push_back(new uint_SimHitIdpr_pair(iH, i_SimTrackIds));
+                  }
+                }
+              } else if (printRtS)
+                edm::LogVerbatim("MuonAssociatorByHitsHelper") << "*** WARNING in "
+                                                                  "MuonAssociatorByHitsHelper::getMatchedIds, null "
+                                                                  "dynamic_cast of a DT TrackingRecHit !";
+
+              unsigned int i_detid = (*ithit)->geographicalId().rawId();
+              DTWireId i_dtdetid = DTWireId(i_detid);
+
+              stringstream i_dt_detector_id;
+              i_dt_detector_id << i_dtdetid;
+
+              stringstream i_ss;
+              i_ss << "\t\t hit " << i_compHit << " -Muon DT - detID = " << i_dt_detector_id.str();
+
+              string i_hitlog = i_ss.str();
+              i_hitlog = i_hitlog + write_matched_simtracks(i_SimTrackIds);
+              if (printRtS)
+                edm::LogVerbatim("MuonAssociatorByHitsHelper") << i_hitlog;
+
+              SimTrackIds.insert(SimTrackIds.end(), i_SimTrackIds.begin(), i_SimTrackIds.end());
+            }
+          }  // if (dtsegment)
+
+          else if (printRtS)
+            edm::LogVerbatim("MuonAssociatorByHitsHelper")
+                << "*** WARNING in MuonAssociatorByHitsHelper::getMatchedIds, "
+                   "DT TrackingRecHit is neither DTRecHit1D nor DTRecSegment4D "
+                   "! ";
+        }
       }
-      
+
       // CSC Hits
       else if (subdet == MuonSubdetId::CSC) {
-	CSCDetId cscdetid = CSCDetId(detid);
-	stringstream csc_detector_id;
-	csc_detector_id << cscdetid;
-	if (valid_Hit) hitlog = hitlog+" -Muon CSC- detID = "+csc_detector_id.str();	  
-	else hitlog = hitlog+" *** INVALID ***"+" -Muon CSC- detID = "+csc_detector_id.str();	  
-	
-	const CSCRecHit2D * cscrechit = dynamic_cast<const CSCRecHit2D *>(hitp);
-	
-	// single CSC hits
-	if (cscrechit) {
-	  iH++;
-	  SimTrackIds = csctruth.associateCSCHitId(cscrechit);
-	  
-	  if (valid_Hit) {
-	    n_csc_valid++;
-	    
-	    if (!SimTrackIds.empty()) {
-	      n_csc_matched_valid++;
-	      //muon_matchedIds_valid[iH] = SimTrackIds;
-              muon_matchedIds_valid.push_back (new uint_SimHitIdpr_pair(iH,SimTrackIds));
-	    }
-	  } else {
-	    n_csc_INVALID++;
-	    
-	    if (!SimTrackIds.empty()) {
-	      n_csc_matched_INVALID++;
-	      //muon_matchedIds_INVALID[iH] = SimTrackIds;
-              muon_matchedIds_INVALID.push_back (new uint_SimHitIdpr_pair(iH,SimTrackIds));
-	    }
-	  }
-	}
-	
-	// CSC segments
-	else {
-	  const CSCSegment * cscsegment = dynamic_cast<const CSCSegment *>(hitp);
-	  
-	  if (cscsegment) {
-	    
-	    std::vector<const TrackingRecHit *> componentHits = cscsegment->recHits();
-	    if (printRtS) edm::LogVerbatim("MuonAssociatorByHitsHelper")
-	      <<"\n\t this TrackingRecHit is a CSCSegment with "<<componentHits.size()<<" hits";
-	    
-	    SimTrackIds.clear();
-	    std::vector<SimHitIdpr> i_SimTrackIds;
-	    int i_compHit = 0;
-	    for (std::vector<const TrackingRecHit *>::const_iterator ithit =componentHits.begin(); 
-		 ithit != componentHits.end(); ++ithit) {
-	      i_compHit++;
-	      
-	      const CSCRecHit2D * cscrechit2D = dynamic_cast<const CSCRecHit2D *>(*ithit);
-	      
-	      i_SimTrackIds.clear();
-	      if (cscrechit2D) {
-		iH++;
-		i_SimTrackIds = csctruth.associateCSCHitId(cscrechit2D);
-
-		if (valid_Hit) {
-		  // validity check is on the segment, but hits are counted one-by-one
-		  n_csc_valid++;
-
-		  if (!i_SimTrackIds.empty()) {
-		    n_csc_matched_valid++;
-		    //muon_matchedIds_valid[iH] =  i_SimTrackIds;
-                    muon_matchedIds_valid.push_back (new uint_SimHitIdpr_pair(iH,i_SimTrackIds));
-		  }
-		} else {
-		  n_csc_INVALID++;
-		  
-		  if (!i_SimTrackIds.empty()) {
-		    n_csc_matched_INVALID++;
-		    //muon_matchedIds_INVALID[iH] =  i_SimTrackIds;
-                    muon_matchedIds_INVALID.push_back (new uint_SimHitIdpr_pair(iH,i_SimTrackIds));
-		  }
-		}
-	      } else if (printRtS) edm::LogVerbatim("MuonAssociatorByHitsHelper")
-		<<"*** WARNING in MuonAssociatorByHitsHelper::getMatchedIds, null dynamic_cast of a CSC TrackingRecHit !";
-	      
-	      unsigned int i_detid = (*ithit)->geographicalId().rawId();
-	      CSCDetId i_cscdetid = CSCDetId(i_detid);
-
-	      stringstream i_csc_detector_id;
-	      i_csc_detector_id << i_cscdetid;
-
-	      stringstream i_ss;
-	      i_ss<<"\t\t hit "<<i_compHit<<" -Muon CSC- detID = "<<i_csc_detector_id.str();
-
-	      string i_hitlog = i_ss.str();
-	      i_hitlog = i_hitlog + write_matched_simtracks(i_SimTrackIds);
-	      if (printRtS) edm::LogVerbatim("MuonAssociatorByHitsHelper") << i_hitlog;
-	      
-	      SimTrackIds.insert(SimTrackIds.end(),i_SimTrackIds.begin(),i_SimTrackIds.end());
-	    }	    
-	  }  // if (cscsegment)
-
-	  else if (printRtS) edm::LogVerbatim("MuonAssociatorByHitsHelper")
-	    <<"*** WARNING in MuonAssociatorByHitsHelper::getMatchedIds, CSC TrackingRecHit is neither CSCRecHit2D nor CSCSegment ! ";
-	}
+        CSCDetId cscdetid = CSCDetId(detid);
+        stringstream csc_detector_id;
+        csc_detector_id << cscdetid;
+        if (valid_Hit)
+          hitlog = hitlog + " -Muon CSC- detID = " + csc_detector_id.str();
+        else
+          hitlog = hitlog + " *** INVALID ***" + " -Muon CSC- detID = " + csc_detector_id.str();
+
+        const CSCRecHit2D *cscrechit = dynamic_cast<const CSCRecHit2D *>(hitp);
+
+        // single CSC hits
+        if (cscrechit) {
+          iH++;
+          SimTrackIds = csctruth.associateCSCHitId(cscrechit);
+
+          if (valid_Hit) {
+            n_csc_valid++;
+
+            if (!SimTrackIds.empty()) {
+              n_csc_matched_valid++;
+              // muon_matchedIds_valid[iH] = SimTrackIds;
+              muon_matchedIds_valid.push_back(new uint_SimHitIdpr_pair(iH, SimTrackIds));
+            }
+          } else {
+            n_csc_INVALID++;
+
+            if (!SimTrackIds.empty()) {
+              n_csc_matched_INVALID++;
+              // muon_matchedIds_INVALID[iH] = SimTrackIds;
+              muon_matchedIds_INVALID.push_back(new uint_SimHitIdpr_pair(iH, SimTrackIds));
+            }
+          }
+        }
+
+        // CSC segments
+        else {
+          const CSCSegment *cscsegment = dynamic_cast<const CSCSegment *>(hitp);
+
+          if (cscsegment) {
+            std::vector<const TrackingRecHit *> componentHits = cscsegment->recHits();
+            if (printRtS)
+              edm::LogVerbatim("MuonAssociatorByHitsHelper")
+                  << "\n\t this TrackingRecHit is a CSCSegment with " << componentHits.size() << " hits";
+
+            SimTrackIds.clear();
+            std::vector<SimHitIdpr> i_SimTrackIds;
+            int i_compHit = 0;
+            for (std::vector<const TrackingRecHit *>::const_iterator ithit = componentHits.begin();
+                 ithit != componentHits.end();
+                 ++ithit) {
+              i_compHit++;
+
+              const CSCRecHit2D *cscrechit2D = dynamic_cast<const CSCRecHit2D *>(*ithit);
+
+              i_SimTrackIds.clear();
+              if (cscrechit2D) {
+                iH++;
+                i_SimTrackIds = csctruth.associateCSCHitId(cscrechit2D);
+
+                if (valid_Hit) {
+                  // validity check is on the segment, but hits are counted
+                  // one-by-one
+                  n_csc_valid++;
+
+                  if (!i_SimTrackIds.empty()) {
+                    n_csc_matched_valid++;
+                    // muon_matchedIds_valid[iH] =  i_SimTrackIds;
+                    muon_matchedIds_valid.push_back(new uint_SimHitIdpr_pair(iH, i_SimTrackIds));
+                  }
+                } else {
+                  n_csc_INVALID++;
+
+                  if (!i_SimTrackIds.empty()) {
+                    n_csc_matched_INVALID++;
+                    // muon_matchedIds_INVALID[iH] =  i_SimTrackIds;
+                    muon_matchedIds_INVALID.push_back(new uint_SimHitIdpr_pair(iH, i_SimTrackIds));
+                  }
+                }
+              } else if (printRtS)
+                edm::LogVerbatim("MuonAssociatorByHitsHelper") << "*** WARNING in "
+                                                                  "MuonAssociatorByHitsHelper::getMatchedIds, null "
+                                                                  "dynamic_cast of a CSC TrackingRecHit !";
+
+              unsigned int i_detid = (*ithit)->geographicalId().rawId();
+              CSCDetId i_cscdetid = CSCDetId(i_detid);
+
+              stringstream i_csc_detector_id;
+              i_csc_detector_id << i_cscdetid;
+
+              stringstream i_ss;
+              i_ss << "\t\t hit " << i_compHit << " -Muon CSC- detID = " << i_csc_detector_id.str();
+
+              string i_hitlog = i_ss.str();
+              i_hitlog = i_hitlog + write_matched_simtracks(i_SimTrackIds);
+              if (printRtS)
+                edm::LogVerbatim("MuonAssociatorByHitsHelper") << i_hitlog;
+
+              SimTrackIds.insert(SimTrackIds.end(), i_SimTrackIds.begin(), i_SimTrackIds.end());
+            }
+          }  // if (cscsegment)
+
+          else if (printRtS)
+            edm::LogVerbatim("MuonAssociatorByHitsHelper")
+                << "*** WARNING in MuonAssociatorByHitsHelper::getMatchedIds, "
+                   "CSC TrackingRecHit is neither CSCRecHit2D nor CSCSegment "
+                   "! ";
+        }
       }
-      
+
       // RPC Hits
       else if (subdet == MuonSubdetId::RPC) {
-	RPCDetId rpcdetid = RPCDetId(detid);
-	stringstream rpc_detector_id;
-	rpc_detector_id << rpcdetid;
-	if (valid_Hit) hitlog = hitlog+" -Muon RPC- detID = "+rpc_detector_id.str();	  
-	else hitlog = hitlog+" *** INVALID ***"+" -Muon RPC- detID = "+rpc_detector_id.str();	  
-	
-	iH++;
-	SimTrackIds = rpctruth.associateRecHit(*hitp);
-	
-	if (valid_Hit) {
-	  n_rpc_valid++;
-
-	  if (!SimTrackIds.empty()) {
-	    n_rpc_matched_valid++;
-	    //muon_matchedIds_valid[iH] = SimTrackIds;
-            muon_matchedIds_valid.push_back (new uint_SimHitIdpr_pair(iH,SimTrackIds));
-            
-	  }
-	} else {
-	  n_rpc_INVALID++;
-	  
-	  if (!SimTrackIds.empty()) {
-	    n_rpc_matched_INVALID++;
-	    //muon_matchedIds_INVALID[iH] = SimTrackIds;
-            muon_matchedIds_INVALID.push_back (new uint_SimHitIdpr_pair(iH,SimTrackIds));
-	  }
-	}
+        RPCDetId rpcdetid = RPCDetId(detid);
+        stringstream rpc_detector_id;
+        rpc_detector_id << rpcdetid;
+        if (valid_Hit)
+          hitlog = hitlog + " -Muon RPC- detID = " + rpc_detector_id.str();
+        else
+          hitlog = hitlog + " *** INVALID ***" + " -Muon RPC- detID = " + rpc_detector_id.str();
+
+        iH++;
+        SimTrackIds = rpctruth.associateRecHit(*hitp);
+
+        if (valid_Hit) {
+          n_rpc_valid++;
+
+          if (!SimTrackIds.empty()) {
+            n_rpc_matched_valid++;
+            // muon_matchedIds_valid[iH] = SimTrackIds;
+            muon_matchedIds_valid.push_back(new uint_SimHitIdpr_pair(iH, SimTrackIds));
+          }
+        } else {
+          n_rpc_INVALID++;
+
+          if (!SimTrackIds.empty()) {
+            n_rpc_matched_INVALID++;
+            // muon_matchedIds_INVALID[iH] = SimTrackIds;
+            muon_matchedIds_INVALID.push_back(new uint_SimHitIdpr_pair(iH, SimTrackIds));
+          }
+        }
       }
-          
+
       // GEM Hits
       else if (subdet == MuonSubdetId::GEM) {
-	GEMDetId gemdetid = GEMDetId(detid);
-	stringstream gem_detector_id;
-	gem_detector_id << gemdetid;
-	if (valid_Hit) hitlog = hitlog+" -Muon GEM- detID = "+gem_detector_id.str();	  
-	else hitlog = hitlog+" *** INVALID ***"+" -Muon GEM- detID = "+gem_detector_id.str();	  
-
-	const GEMRecHit * gemrechit = dynamic_cast<const GEMRecHit *>(hitp);
-	if (gemrechit){
-	  iH++;
-	  SimTrackIds = gemtruth.associateRecHit(gemrechit);
-	
-	  if (valid_Hit) {
-	    n_gem_valid++;
-
-	    if (!SimTrackIds.empty()) {
-	      n_gem_matched_valid++;
-	      //muon_matchedIds_valid[iH] = SimTrackIds;
-	      muon_matchedIds_valid.push_back (new uint_SimHitIdpr_pair(iH,SimTrackIds));
-            
-	    }
-	  } else {
-	    n_gem_INVALID++;
-	  
-	    if (!SimTrackIds.empty()) {
-	      n_gem_matched_INVALID++;
-	      //muon_matchedIds_INVALID[iH] = SimTrackIds;
-	      muon_matchedIds_INVALID.push_back (new uint_SimHitIdpr_pair(iH,SimTrackIds));
-	    }
-	  }
-	}
-	else {
-	  const GEMSegment * gemsegment = dynamic_cast<const GEMSegment *>(hitp);
-	  if (gemsegment) {
-	    
-	    std::vector<const TrackingRecHit *> componentHits = gemsegment->recHits();
-	    if (printRtS) edm::LogVerbatim("MuonAssociatorByHitsHelper")
-	      <<"\n\t this TrackingRecHit is a GEMSegment with "<<componentHits.size()<<" hits";
-	    
-	    SimTrackIds.clear();
-	    std::vector<SimHitIdpr> i_SimTrackIds;
-	    int i_compHit = 0;
-
-	    for ( auto const & ithit : componentHits) {
-	      
-	      i_compHit++;
-	      
-	      const GEMRecHit * gemrechitseg = dynamic_cast<const GEMRecHit *>(ithit);
-	      
-	      i_SimTrackIds.clear();
-	      if (gemrechitseg) {
-		iH++;
-		i_SimTrackIds = gemtruth.associateRecHit(gemrechitseg);
-
-		if (valid_Hit) {
-		  // validity check is on the segment, but hits are counted one-by-one
-		  n_gem_valid++;
-
-		  if (!i_SimTrackIds.empty()) {
-		    n_gem_matched_valid++;
-		    //muon_matchedIds_valid[iH] =  i_SimTrackIds;
-                    muon_matchedIds_valid.push_back (new uint_SimHitIdpr_pair(iH,i_SimTrackIds));
-		  }
-		} else {
-		  n_gem_INVALID++;
-		  
-		  if (!i_SimTrackIds.empty()) {
-		    n_gem_matched_INVALID++;
-		    //muon_matchedIds_INVALID[iH] =  i_SimTrackIds;
-                    muon_matchedIds_INVALID.push_back (new uint_SimHitIdpr_pair(iH,i_SimTrackIds));
-		  }
-		}
-	      } else if (printRtS) edm::LogVerbatim("MuonAssociatorByHitsHelper")
-		<<"*** WARNING in MuonAssociatorByHitsHelper::getMatchedIds, null dynamic_cast of a GEM TrackingRecHit !";
-	      
-	      if (printRtS){
-		unsigned int i_detid = ithit->geographicalId().rawId();
-		GEMDetId i_gemdetid = GEMDetId(i_detid);
-
-		string i_hitlog = std::to_string(i_gemdetid);
-		i_hitlog = i_hitlog + write_matched_simtracks(i_SimTrackIds);
-		edm::LogVerbatim("MuonAssociatorByHitsHelper") << i_hitlog;
-	      }
-
-	      SimTrackIds.insert(SimTrackIds.end(),i_SimTrackIds.begin(),i_SimTrackIds.end());
-	    }	    
-	  }  // if (gemsegment)	  
-          
-	} // if (gemrechit
-      }
-      else if (printRtS) edm::LogVerbatim("MuonAssociatorByHitsHelper")
-			   <<"TrackingRecHit "<<iloop<<"  *** WARNING *** Unexpected Hit from Detector = "<<det;
-    } // end if (det == DetId::Muon && UseMuon)
-    else continue;
-    
+        GEMDetId gemdetid = GEMDetId(detid);
+        stringstream gem_detector_id;
+        gem_detector_id << gemdetid;
+        if (valid_Hit)
+          hitlog = hitlog + " -Muon GEM- detID = " + gem_detector_id.str();
+        else
+          hitlog = hitlog + " *** INVALID ***" + " -Muon GEM- detID = " + gem_detector_id.str();
+
+        const GEMRecHit *gemrechit = dynamic_cast<const GEMRecHit *>(hitp);
+        if (gemrechit) {
+          iH++;
+          SimTrackIds = gemtruth.associateRecHit(gemrechit);
+
+          if (valid_Hit) {
+            n_gem_valid++;
+
+            if (!SimTrackIds.empty()) {
+              n_gem_matched_valid++;
+              // muon_matchedIds_valid[iH] = SimTrackIds;
+              muon_matchedIds_valid.push_back(new uint_SimHitIdpr_pair(iH, SimTrackIds));
+            }
+          } else {
+            n_gem_INVALID++;
+
+            if (!SimTrackIds.empty()) {
+              n_gem_matched_INVALID++;
+              // muon_matchedIds_INVALID[iH] = SimTrackIds;
+              muon_matchedIds_INVALID.push_back(new uint_SimHitIdpr_pair(iH, SimTrackIds));
+            }
+          }
+        } else {
+          const GEMSegment *gemsegment = dynamic_cast<const GEMSegment *>(hitp);
+          if (gemsegment) {
+            std::vector<const TrackingRecHit *> componentHits = gemsegment->recHits();
+            if (printRtS)
+              edm::LogVerbatim("MuonAssociatorByHitsHelper")
+                  << "\n\t this TrackingRecHit is a GEMSegment with " << componentHits.size() << " hits";
+
+            SimTrackIds.clear();
+            std::vector<SimHitIdpr> i_SimTrackIds;
+            int i_compHit = 0;
+
+            for (auto const &ithit : componentHits) {
+              i_compHit++;
+
+              const GEMRecHit *gemrechitseg = dynamic_cast<const GEMRecHit *>(ithit);
+
+              i_SimTrackIds.clear();
+              if (gemrechitseg) {
+                iH++;
+                i_SimTrackIds = gemtruth.associateRecHit(gemrechitseg);
+
+                if (valid_Hit) {
+                  // validity check is on the segment, but hits are counted
+                  // one-by-one
+                  n_gem_valid++;
+
+                  if (!i_SimTrackIds.empty()) {
+                    n_gem_matched_valid++;
+                    // muon_matchedIds_valid[iH] =  i_SimTrackIds;
+                    muon_matchedIds_valid.push_back(new uint_SimHitIdpr_pair(iH, i_SimTrackIds));
+                  }
+                } else {
+                  n_gem_INVALID++;
+
+                  if (!i_SimTrackIds.empty()) {
+                    n_gem_matched_INVALID++;
+                    // muon_matchedIds_INVALID[iH] =  i_SimTrackIds;
+                    muon_matchedIds_INVALID.push_back(new uint_SimHitIdpr_pair(iH, i_SimTrackIds));
+                  }
+                }
+              } else if (printRtS)
+                edm::LogVerbatim("MuonAssociatorByHitsHelper") << "*** WARNING in "
+                                                                  "MuonAssociatorByHitsHelper::getMatchedIds, null "
+                                                                  "dynamic_cast of a GEM TrackingRecHit !";
+
+              if (printRtS) {
+                unsigned int i_detid = ithit->geographicalId().rawId();
+                GEMDetId i_gemdetid = GEMDetId(i_detid);
+
+                string i_hitlog = std::to_string(i_gemdetid);
+                i_hitlog = i_hitlog + write_matched_simtracks(i_SimTrackIds);
+                edm::LogVerbatim("MuonAssociatorByHitsHelper") << i_hitlog;
+              }
+
+              SimTrackIds.insert(SimTrackIds.end(), i_SimTrackIds.begin(), i_SimTrackIds.end());
+            }
+          }  // if (gemsegment)
+
+        }  // if (gemrechit
+      } else if (printRtS)
+        edm::LogVerbatim("MuonAssociatorByHitsHelper")
+            << "TrackingRecHit " << iloop << "  *** WARNING *** Unexpected Hit from Detector = " << det;
+    }  // end if (det == DetId::Muon && UseMuon)
+    else
+      continue;
+
     hitlog = hitlog + write_matched_simtracks(SimTrackIds);
-    
-    if (printRtS) edm::LogVerbatim("MuonAssociatorByHitsHelper") << hitlog;
-    if (printRtS && dumpDT && det==DetId::Muon && subdet==MuonSubdetId::DT) {
-      edm::LogVerbatim("MuonAssociatorByHitsHelper") <<wireidlog;
-      for (unsigned int j=0; j<DTSimHits.size(); j++) {
-	edm::LogVerbatim("MuonAssociatorByHitsHelper") <<DTSimHits[j];
+
+    if (printRtS)
+      edm::LogVerbatim("MuonAssociatorByHitsHelper") << hitlog;
+    if (printRtS && dumpDT && det == DetId::Muon && subdet == MuonSubdetId::DT) {
+      edm::LogVerbatim("MuonAssociatorByHitsHelper") << wireidlog;
+      for (unsigned int j = 0; j < DTSimHits.size(); j++) {
+        edm::LogVerbatim("MuonAssociatorByHitsHelper") << DTSimHits[j];
       }
     }
-    
-  } //trackingRecHit loop
+
+  }  // trackingRecHit loop
 }
 
-int MuonAssociatorByHitsHelper::getShared(MapOfMatchedIds & matchedIds, TrackingParticleCollection::const_iterator trpart) const {
-    
+int MuonAssociatorByHitsHelper::getShared(MapOfMatchedIds &matchedIds,
+                                          TrackingParticleCollection::const_iterator trpart) const {
   int nshared = 0;
-  const std::vector<SimTrack>& g4Tracks = trpart->g4Tracks();
-
-  // map is indexed over the rechits of the reco::Track (no double-countings allowed)
-  for (MapOfMatchedIds::const_iterator iRecH=matchedIds.begin(); iRecH!=matchedIds.end(); ++iRecH) {
+  const std::vector<SimTrack> &g4Tracks = trpart->g4Tracks();
 
+  // map is indexed over the rechits of the reco::Track (no double-countings
+  // allowed)
+  for (MapOfMatchedIds::const_iterator iRecH = matchedIds.begin(); iRecH != matchedIds.end(); ++iRecH) {
     // vector of associated simhits associated to the current rechit
-    std::vector<SimHitIdpr> const & SimTrackIds = (*iRecH).second;
-    
+    std::vector<SimHitIdpr> const &SimTrackIds = (*iRecH).second;
+
     bool found = false;
-    
-    for (const auto& iSimH : SimTrackIds) {
-        
+
+    for (const auto &iSimH : SimTrackIds) {
       uint32_t simtrackId = iSimH.first;
       EncodedEventId evtId = iSimH.second;
-      
-      // look for shared hits with the given TrackingParticle (looping over component SimTracks)
-      for (const auto& simtrack : g4Tracks) {
-          
-          if (simtrack.trackId() == simtrackId  &&  simtrack.eventId() == evtId) {
-            found = true;
-              break;
-          }
+
+      // look for shared hits with the given TrackingParticle (looping over
+      // component SimTracks)
+      for (const auto &simtrack : g4Tracks) {
+        if (simtrack.trackId() == simtrackId && simtrack.eventId() == evtId) {
+          found = true;
+          break;
+        }
       }
-      
+
       if (found) {
-          nshared++;
-          break;
+        nshared++;
+        break;
       }
     }
   }
-  
+
   return nshared;
 }
 
-std::string MuonAssociatorByHitsHelper::write_matched_simtracks(const std::vector<SimHitIdpr>& SimTrackIds) const {
+std::string MuonAssociatorByHitsHelper::write_matched_simtracks(const std::vector<SimHitIdpr> &SimTrackIds) const {
   if (SimTrackIds.empty())
     return "  *** UNMATCHED ***";
 
   string hitlog(" matched to SimTrack");
-  
-  for(size_t j=0; j<SimTrackIds.size(); j++)
-  {
+
+  for (size_t j = 0; j < SimTrackIds.size(); j++) {
     char buf[64];
-    snprintf(buf, 64, " Id:%i/Evt:(%i,%i) ", SimTrackIds[j].first, SimTrackIds[j].second.event(), SimTrackIds[j].second.bunchCrossing());
+    snprintf(buf,
+             64,
+             " Id:%i/Evt:(%i,%i) ",
+             SimTrackIds[j].first,
+             SimTrackIds[j].second.event(),
+             SimTrackIds[j].second.bunchCrossing());
     hitlog += buf;
   }
   return hitlog;
 }
-
diff --git a/SimMuon/MCTruth/src/MuonToSimAssociatorBase.cc b/SimMuon/MCTruth/src/MuonToSimAssociatorBase.cc
index edac1150560ac..e823d4c04f713 100644
--- a/SimMuon/MCTruth/src/MuonToSimAssociatorBase.cc
+++ b/SimMuon/MCTruth/src/MuonToSimAssociatorBase.cc
@@ -2,7 +2,7 @@
 //
 // Package:     SimMuon/MCTruth
 // Class  :     MuonToSimAssociatorBase
-// 
+//
 // Implementation:
 //     [Notes on implementation]
 //
@@ -13,9 +13,8 @@
 // system include files
 
 // user include files
-#include "SimMuon/MCTruth/interface/MuonToSimAssociatorBase.h"
 #include "FWCore/Utilities/interface/typelookup.h"
-
+#include "SimMuon/MCTruth/interface/MuonToSimAssociatorBase.h"
 
 //
 // constants, enums and typedefs
@@ -28,12 +27,8 @@
 //
 // constructors and destructor
 //
-MuonToSimAssociatorBase::MuonToSimAssociatorBase()
-{
-}
+MuonToSimAssociatorBase::MuonToSimAssociatorBase() {}
 
-MuonToSimAssociatorBase::~MuonToSimAssociatorBase()
-{
-}
+MuonToSimAssociatorBase::~MuonToSimAssociatorBase() {}
 
 TYPELOOKUP_DATA_REG(MuonToSimAssociatorBase);
diff --git a/SimMuon/MCTruth/src/MuonToSimAssociatorByHits.cc b/SimMuon/MCTruth/src/MuonToSimAssociatorByHits.cc
index 26dc274a4acb2..a4dfda8116ebc 100644
--- a/SimMuon/MCTruth/src/MuonToSimAssociatorByHits.cc
+++ b/SimMuon/MCTruth/src/MuonToSimAssociatorByHits.cc
@@ -1,162 +1,159 @@
-#include "SimMuon/MCTruth/interface/MuonToSimAssociatorByHits.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "DataFormats/CSCRecHit/interface/CSCSegment.h"
+#include "DataFormats/DTRecHit/interface/DTRecSegment4D.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
-#include "DataFormats/DTRecHit/interface/DTRecSegment4D.h"
-#include "DataFormats/CSCRecHit/interface/CSCSegment.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "SimMuon/MCTruth/interface/MuonToSimAssociatorByHits.h"
 #include "SimMuon/MCTruth/interface/TrackerMuonHitExtractor.h"
 #include <sstream>
 
 using namespace reco;
 using namespace std;
 
-MuonToSimAssociatorByHits::MuonToSimAssociatorByHits (const edm::ParameterSet& conf, edm::ConsumesCollector && iC) :
-  helper_(conf),
-  conf_(conf),
-  trackerHitAssociatorConfig_(conf,std::move(iC))
-{
-  TrackerMuonHitExtractor hitExtractor(conf_,std::move(iC)); 
+MuonToSimAssociatorByHits::MuonToSimAssociatorByHits(const edm::ParameterSet &conf, edm::ConsumesCollector &&iC)
+    : helper_(conf), conf_(conf), trackerHitAssociatorConfig_(conf, std::move(iC)) {
+  TrackerMuonHitExtractor hitExtractor(conf_, std::move(iC));
 
-  //hack for consumes
-  RPCHitAssociator rpctruth(conf,std::move(iC));
-  GEMHitAssociator gemtruth(conf,std::move(iC));
-  DTHitAssociator dttruth(conf,std::move(iC));
-  CSCHitAssociator muonTruth(conf,std::move(iC));
+  // hack for consumes
+  RPCHitAssociator rpctruth(conf, std::move(iC));
+  GEMHitAssociator gemtruth(conf, std::move(iC));
+  DTHitAssociator dttruth(conf, std::move(iC));
+  CSCHitAssociator muonTruth(conf, std::move(iC));
 }
 
+MuonToSimAssociatorByHits::~MuonToSimAssociatorByHits() {}
 
-MuonToSimAssociatorByHits::~MuonToSimAssociatorByHits()
-{
-}
-
+void MuonToSimAssociatorByHits::associateMuons(MuonToSimCollection &recToSim,
+                                               SimToMuonCollection &simToRec,
+                                               const edm::Handle<edm::View<reco::Muon>> &tCH,
+                                               MuonTrackType type,
+                                               const edm::Handle<TrackingParticleCollection> &tPCH,
+                                               const edm::Event *event,
+                                               const edm::EventSetup *setup) const {
+  edm::RefVector<TrackingParticleCollection> tpc(tPCH.id());
+  for (unsigned int j = 0; j < tPCH->size(); j++)
+    tpc.push_back(edm::Ref<TrackingParticleCollection>(tPCH, j));
 
+  edm::RefToBaseVector<reco::Muon> muonBaseRefVector;
+  for (size_t i = 0; i < tCH->size(); ++i)
+    muonBaseRefVector.push_back(tCH->refAt(i));
 
-void MuonToSimAssociatorByHits::associateMuons(MuonToSimCollection & recToSim, SimToMuonCollection & simToRec,
-                                          const edm::Handle<edm::View<reco::Muon> > &tCH, MuonTrackType type,
-                                          const edm::Handle<TrackingParticleCollection>&tPCH,
-                                          const edm::Event * event, const edm::EventSetup * setup) const  {
+  associateMuons(recToSim, simToRec, muonBaseRefVector, type, tpc, event, setup);
+}
 
-    edm::RefVector<TrackingParticleCollection> tpc(tPCH.id());
-    for (unsigned int j=0; j<tPCH->size();j++)
-      tpc.push_back(edm::Ref<TrackingParticleCollection>(tPCH,j));
-    
-    edm::RefToBaseVector<reco::Muon> muonBaseRefVector;
-    for (size_t i = 0; i < tCH->size(); ++i)
-      muonBaseRefVector.push_back(tCH->refAt(i));
+void MuonToSimAssociatorByHits::associateMuons(MuonToSimCollection &recToSim,
+                                               SimToMuonCollection &simToRec,
+                                               const edm::RefToBaseVector<reco::Muon> &muons,
+                                               MuonTrackType trackType,
+                                               const edm::RefVector<TrackingParticleCollection> &tPC,
+                                               const edm::Event *event,
+                                               const edm::EventSetup *setup) const {
+  /// PART 1: Fill MuonToSimAssociatorByHits::TrackHitsCollection
+  MuonAssociatorByHitsHelper::TrackHitsCollection muonHitRefs;
+  edm::OwnVector<TrackingRecHit> allTMRecHits;  // this I will fill in only for tracker muon hits from
+                                                // segments
+  switch (trackType) {
+    case InnerTk:
+      for (edm::RefToBaseVector<reco::Muon>::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) {
+        edm::RefToBase<reco::Muon> mur = *it;
+        if (mur->track().isNonnull()) {
+          muonHitRefs.push_back(std::make_pair(mur->track()->recHitsBegin(), mur->track()->recHitsEnd()));
+        } else {
+          muonHitRefs.push_back(std::make_pair(allTMRecHits.data().end(), allTMRecHits.data().end()));
+        }
+      }
+      break;
+    case OuterTk:
+      for (edm::RefToBaseVector<reco::Muon>::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) {
+        edm::RefToBase<reco::Muon> mur = *it;
+        if (mur->outerTrack().isNonnull()) {
+          muonHitRefs.push_back(std::make_pair(mur->outerTrack()->recHitsBegin(), mur->outerTrack()->recHitsEnd()));
+        } else {
+          muonHitRefs.push_back(std::make_pair(allTMRecHits.data().end(), allTMRecHits.data().end()));
+        }
+      }
+      break;
+    case GlobalTk:
+      for (edm::RefToBaseVector<reco::Muon>::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) {
+        edm::RefToBase<reco::Muon> mur = *it;
+        if (mur->globalTrack().isNonnull()) {
+          muonHitRefs.push_back(std::make_pair(mur->globalTrack()->recHitsBegin(), mur->globalTrack()->recHitsEnd()));
+        } else {
+          muonHitRefs.push_back(std::make_pair(allTMRecHits.data().end(), allTMRecHits.data().end()));
+        }
+      }
+      break;
+    case Segments: {
+      TrackerMuonHitExtractor hitExtractor(conf_);
+      hitExtractor.init(*event, *setup);
+      // puts hits in the vector, and record indices
+      std::vector<std::pair<size_t, size_t>> muonHitIndices;
+      for (edm::RefToBaseVector<reco::Muon>::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) {
+        edm::RefToBase<reco::Muon> mur = *it;
+        std::pair<size_t, size_t> indices(allTMRecHits.size(), allTMRecHits.size());
+        if (mur->isTrackerMuon()) {
+          std::vector<const TrackingRecHit *> hits = hitExtractor.getMuonHits(*mur);
+          for (std::vector<const TrackingRecHit *>::const_iterator ith = hits.begin(), edh = hits.end(); ith != edh;
+               ++ith) {
+            allTMRecHits.push_back(**ith);
+          }
+          indices.second += hits.size();
+        }
+        muonHitIndices.push_back(indices);
+      }
+      // convert indices into pairs of iterators to references
+      typedef std::pair<size_t, size_t> index_pair;
+      trackingRecHit_iterator hitRefBegin = allTMRecHits.data().begin();
+      for (std::vector<std::pair<size_t, size_t>>::const_iterator idxs = muonHitIndices.begin(),
+                                                                  idxend = muonHitIndices.end();
+           idxs != idxend;
+           ++idxs) {
+        muonHitRefs.push_back(std::make_pair(hitRefBegin + idxs->first, hitRefBegin + idxs->second));
+      }
 
-    associateMuons(recToSim, simToRec, muonBaseRefVector,type,tpc,event,setup);
-}
+    } break;
+  }
 
-void MuonToSimAssociatorByHits::associateMuons(MuonToSimCollection & recToSim, SimToMuonCollection & simToRec,
-                      const edm::RefToBaseVector<reco::Muon> & muons, MuonTrackType trackType,
-                      const edm::RefVector<TrackingParticleCollection>& tPC,
-                      const edm::Event * event, const edm::EventSetup * setup) const {
+  /// PART 2: call the association routines
+  // Retrieve tracker topology from geometry
+  edm::ESHandle<TrackerTopology> tTopoHand;
+  setup->get<TrackerTopologyRcd>().get(tTopoHand);
+  const TrackerTopology *tTopo = tTopoHand.product();
 
-    /// PART 1: Fill MuonToSimAssociatorByHits::TrackHitsCollection
-    MuonAssociatorByHitsHelper::TrackHitsCollection muonHitRefs;
-    edm::OwnVector<TrackingRecHit> allTMRecHits;  // this I will fill in only for tracker muon hits from segments
-    switch (trackType) {
-        case InnerTk: 
-            for (edm::RefToBaseVector<reco::Muon>::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) {
-                edm::RefToBase<reco::Muon> mur = *it;
-                if (mur->track().isNonnull()) { 
-                    muonHitRefs.push_back(std::make_pair(mur->track()->recHitsBegin(), mur->track()->recHitsEnd()));
-                } else {
-                    muonHitRefs.push_back(std::make_pair(allTMRecHits.data().end(), allTMRecHits.data().end()));
-                }
-            }
-            break;
-        case OuterTk: 
-            for (edm::RefToBaseVector<reco::Muon>::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) {
-                edm::RefToBase<reco::Muon> mur = *it;
-                if (mur->outerTrack().isNonnull()) { 
-                    muonHitRefs.push_back(std::make_pair(mur->outerTrack()->recHitsBegin(), mur->outerTrack()->recHitsEnd()));
-                } else {
-                    muonHitRefs.push_back(std::make_pair(allTMRecHits.data().end(), allTMRecHits.data().end()));
-                }
-            }
-            break;
-        case GlobalTk: 
-            for (edm::RefToBaseVector<reco::Muon>::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) {
-                edm::RefToBase<reco::Muon> mur = *it;
-                if (mur->globalTrack().isNonnull()) { 
-                    muonHitRefs.push_back(std::make_pair(mur->globalTrack()->recHitsBegin(), mur->globalTrack()->recHitsEnd()));
-                } else {
-                    muonHitRefs.push_back(std::make_pair(allTMRecHits.data().end(), allTMRecHits.data().end()));
-               }
-            }
-            break;
-        case Segments: {
-                TrackerMuonHitExtractor hitExtractor(conf_); 
-                hitExtractor.init(*event, *setup);
-                // puts hits in the vector, and record indices
-                std::vector<std::pair<size_t, size_t> >   muonHitIndices;
-                for (edm::RefToBaseVector<reco::Muon>::const_iterator it = muons.begin(), ed = muons.end(); it != ed; ++it) {
-                    edm::RefToBase<reco::Muon> mur = *it;
-                    std::pair<size_t, size_t> indices(allTMRecHits.size(), allTMRecHits.size());
-                    if (mur->isTrackerMuon()) {
-                        std::vector<const TrackingRecHit *> hits = hitExtractor.getMuonHits(*mur);
-                        for (std::vector<const TrackingRecHit *>::const_iterator ith = hits.begin(), edh = hits.end(); ith != edh; ++ith) {
-                            allTMRecHits.push_back(**ith);
-                        }
-                        indices.second += hits.size();
-                    }
-                    muonHitIndices.push_back(indices);  
-                }
-                // convert indices into pairs of iterators to references
-                typedef std::pair<size_t, size_t> index_pair;
-                trackingRecHit_iterator hitRefBegin = allTMRecHits.data().begin();
-                for (std::vector<std::pair<size_t, size_t> >::const_iterator idxs = muonHitIndices.begin(), idxend = muonHitIndices.end(); idxs != idxend; ++idxs) {
-                    muonHitRefs.push_back(std::make_pair(hitRefBegin+idxs->first, 
-                                                         hitRefBegin+idxs->second));
-                }
-                
-            }
-            break;
-    }
+  // Tracker hit association
+  TrackerHitAssociator trackertruth(*event, trackerHitAssociatorConfig_);
+  // CSC hit association
+  CSCHitAssociator csctruth(*event, *setup, conf_);
+  // DT hit association
+  bool printRtS = true;
+  DTHitAssociator dttruth(*event, *setup, conf_, printRtS);
+  // RPC hit association
+  RPCHitAssociator rpctruth(*event, *setup, conf_);
+  // GEM hit association
+  GEMHitAssociator gemtruth(*event, *setup, conf_);
 
-    /// PART 2: call the association routines 
-    //Retrieve tracker topology from geometry
-    edm::ESHandle<TrackerTopology> tTopoHand;
-    setup->get<TrackerTopologyRcd>().get(tTopoHand);
-    const TrackerTopology *tTopo=tTopoHand.product();
-    
-    
-    // Tracker hit association  
-    TrackerHitAssociator trackertruth(*event, trackerHitAssociatorConfig_);
-    // CSC hit association
-    CSCHitAssociator csctruth(*event,*setup,conf_);
-    // DT hit association
-    bool printRtS = true;
-    DTHitAssociator dttruth(*event,*setup,conf_,printRtS);  
-    // RPC hit association
-    RPCHitAssociator rpctruth(*event,*setup,conf_);
-    // GEM hit association
-    GEMHitAssociator gemtruth(*event,*setup,conf_);
-   
-    MuonAssociatorByHitsHelper::Resources resources = {tTopo, &trackertruth, &csctruth, &dttruth, &rpctruth, &gemtruth};
+  MuonAssociatorByHitsHelper::Resources resources = {tTopo, &trackertruth, &csctruth, &dttruth, &rpctruth, &gemtruth};
 
-    auto recSimColl = helper_.associateRecoToSimIndices(muonHitRefs,tPC,resources);
-    for (auto it = recSimColl.begin(), ed = recSimColl.end(); it != ed; ++it) {
-        edm::RefToBase<reco::Muon> rec = muons[it->first];
-        std::vector<std::pair<TrackingParticleRef, double> > & tpAss  = recToSim[rec];
-        for ( auto const & a : it->second) {
-            tpAss.push_back(std::make_pair(tPC[a.idx], a.quality));
-        }
+  auto recSimColl = helper_.associateRecoToSimIndices(muonHitRefs, tPC, resources);
+  for (auto it = recSimColl.begin(), ed = recSimColl.end(); it != ed; ++it) {
+    edm::RefToBase<reco::Muon> rec = muons[it->first];
+    std::vector<std::pair<TrackingParticleRef, double>> &tpAss = recToSim[rec];
+    for (auto const &a : it->second) {
+      tpAss.push_back(std::make_pair(tPC[a.idx], a.quality));
     }
-    auto simRecColl = helper_.associateSimToRecoIndices(muonHitRefs,tPC,resources);
-    for (auto it = simRecColl.begin(), ed = simRecColl.end(); it != ed; ++it) {
-        TrackingParticleRef sim = tPC[it->first];
-        std::vector<std::pair<edm::RefToBase<reco::Muon>, double> > & recAss = simToRec[sim];
-        for ( auto const & a: it->second ) {
-            recAss.push_back(std::make_pair(muons[a.idx], a.quality));
-        }
+  }
+  auto simRecColl = helper_.associateSimToRecoIndices(muonHitRefs, tPC, resources);
+  for (auto it = simRecColl.begin(), ed = simRecColl.end(); it != ed; ++it) {
+    TrackingParticleRef sim = tPC[it->first];
+    std::vector<std::pair<edm::RefToBase<reco::Muon>, double>> &recAss = simToRec[sim];
+    for (auto const &a : it->second) {
+      recAss.push_back(std::make_pair(muons[a.idx], a.quality));
     }
-
+  }
 }
diff --git a/SimMuon/MCTruth/src/MuonTruth.cc b/SimMuon/MCTruth/src/MuonTruth.cc
index 20782a630dfaf..40c8927c316cf 100644
--- a/SimMuon/MCTruth/src/MuonTruth.cc
+++ b/SimMuon/MCTruth/src/MuonTruth.cc
@@ -1,60 +1,58 @@
-#include "SimMuon/MCTruth/interface/MuonTruth.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "DataFormats/Common/interface/DetSetVector.h"
-#include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
+#include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h"
+#include "SimMuon/MCTruth/interface/MuonTruth.h"
 
-MuonTruth::MuonTruth(const edm::Event& event, const edm::EventSetup& setup, const edm::ParameterSet& conf): 
-  theDigiSimLinks(nullptr),
-  theWireDigiSimLinks(nullptr),
-  linksTag(conf.getParameter<edm::InputTag>("CSClinksTag")),
-  wireLinksTag(conf.getParameter<edm::InputTag>("CSCwireLinksTag")),
-  // CrossingFrame used or not ?
-  crossingframe(conf.getParameter<bool>("crossingframe")),
-  CSCsimHitsTag(conf.getParameter<edm::InputTag>("CSCsimHitsTag")),
-  CSCsimHitsXFTag(conf.getParameter<edm::InputTag>("CSCsimHitsXFTag"))
+MuonTruth::MuonTruth(const edm::Event &event, const edm::EventSetup &setup, const edm::ParameterSet &conf)
+    : theDigiSimLinks(nullptr),
+      theWireDigiSimLinks(nullptr),
+      linksTag(conf.getParameter<edm::InputTag>("CSClinksTag")),
+      wireLinksTag(conf.getParameter<edm::InputTag>("CSCwireLinksTag")),
+      // CrossingFrame used or not ?
+      crossingframe(conf.getParameter<bool>("crossingframe")),
+      CSCsimHitsTag(conf.getParameter<edm::InputTag>("CSCsimHitsTag")),
+      CSCsimHitsXFTag(conf.getParameter<edm::InputTag>("CSCsimHitsXFTag"))
 
 {
-  initEvent(event,setup);
+  initEvent(event, setup);
 }
 
-MuonTruth::MuonTruth( const edm::ParameterSet& conf, edm::ConsumesCollector && iC ): 
-  theDigiSimLinks(nullptr),
-  theWireDigiSimLinks(nullptr),
-  linksTag(conf.getParameter<edm::InputTag>("CSClinksTag")),
-  wireLinksTag(conf.getParameter<edm::InputTag>("CSCwireLinksTag")),
-  // CrossingFrame used or not ?
-  crossingframe(conf.getParameter<bool>("crossingframe")),
-  CSCsimHitsTag(conf.getParameter<edm::InputTag>("CSCsimHitsTag")),
-  CSCsimHitsXFTag(conf.getParameter<edm::InputTag>("CSCsimHitsXFTag"))
+MuonTruth::MuonTruth(const edm::ParameterSet &conf, edm::ConsumesCollector &&iC)
+    : theDigiSimLinks(nullptr),
+      theWireDigiSimLinks(nullptr),
+      linksTag(conf.getParameter<edm::InputTag>("CSClinksTag")),
+      wireLinksTag(conf.getParameter<edm::InputTag>("CSCwireLinksTag")),
+      // CrossingFrame used or not ?
+      crossingframe(conf.getParameter<bool>("crossingframe")),
+      CSCsimHitsTag(conf.getParameter<edm::InputTag>("CSCsimHitsTag")),
+      CSCsimHitsXFTag(conf.getParameter<edm::InputTag>("CSCsimHitsXFTag"))
 
 {
   iC.consumes<DigiSimLinks>(linksTag);
   iC.consumes<DigiSimLinks>(wireLinksTag);
-  if ( crossingframe ) {
-    iC.consumes<CrossingFrame<PSimHit> >(CSCsimHitsXFTag);
-  } else if (!CSCsimHitsTag.label().empty()){
+  if (crossingframe) {
+    iC.consumes<CrossingFrame<PSimHit>>(CSCsimHitsXFTag);
+  } else if (!CSCsimHitsTag.label().empty()) {
     iC.consumes<edm::PSimHitContainer>(CSCsimHitsTag);
   }
-
 }
 
-void MuonTruth::initEvent(const edm::Event& event, const edm::EventSetup& setup) {
-
+void MuonTruth::initEvent(const edm::Event &event, const edm::EventSetup &setup) {
   edm::Handle<DigiSimLinks> digiSimLinks;
-  LogTrace("MuonTruth") <<"getting CSC Strip DigiSimLink collection - "<<linksTag;
+  LogTrace("MuonTruth") << "getting CSC Strip DigiSimLink collection - " << linksTag;
   event.getByLabel(linksTag, digiSimLinks);
   theDigiSimLinks = digiSimLinks.product();
 
   edm::Handle<DigiSimLinks> wireDigiSimLinks;
-  LogTrace("MuonTruth") <<"getting CSC Wire DigiSimLink collection - "<<wireLinksTag;
+  LogTrace("MuonTruth") << "getting CSC Wire DigiSimLink collection - " << wireLinksTag;
   event.getByLabel(wireLinksTag, wireDigiSimLinks);
   theWireDigiSimLinks = wireDigiSimLinks.product();
 
   // get CSC Geometry to use CSCLayer methods
   edm::ESHandle<CSCGeometry> mugeom;
-  setup.get<MuonGeometryRecord>().get( mugeom );
+  setup.get<MuonGeometryRecord>().get(mugeom);
   cscgeom = &*mugeom;
 
   // get CSC Bad Chambers (ME4/2)
@@ -65,46 +63,38 @@ void MuonTruth::initEvent(const edm::Event& event, const edm::EventSetup& setup)
   theSimHitMap.clear();
 
   if (crossingframe) {
-    
-    edm::Handle<CrossingFrame<PSimHit> > cf;
-    LogTrace("MuonTruth") <<"getting CrossingFrame<PSimHit> collection - "<<CSCsimHitsXFTag;
+    edm::Handle<CrossingFrame<PSimHit>> cf;
+    LogTrace("MuonTruth") << "getting CrossingFrame<PSimHit> collection - " << CSCsimHitsXFTag;
     event.getByLabel(CSCsimHitsXFTag, cf);
-    
-    std::unique_ptr<MixCollection<PSimHit> > 
-      CSCsimhits( new MixCollection<PSimHit>(cf.product()) );
-    LogTrace("MuonTruth") <<"... size = "<<CSCsimhits->size();
-
-    for(MixCollection<PSimHit>::MixItr hitItr = CSCsimhits->begin();
-	hitItr != CSCsimhits->end(); ++hitItr) 
-      {
-	theSimHitMap[hitItr->detUnitId()].push_back(*hitItr);
-      }
-    
-  } else if (!CSCsimHitsTag.label().empty()){
 
+    std::unique_ptr<MixCollection<PSimHit>> CSCsimhits(new MixCollection<PSimHit>(cf.product()));
+    LogTrace("MuonTruth") << "... size = " << CSCsimhits->size();
+
+    for (MixCollection<PSimHit>::MixItr hitItr = CSCsimhits->begin(); hitItr != CSCsimhits->end(); ++hitItr) {
+      theSimHitMap[hitItr->detUnitId()].push_back(*hitItr);
+    }
+
+  } else if (!CSCsimHitsTag.label().empty()) {
     edm::Handle<edm::PSimHitContainer> CSCsimhits;
-    LogTrace("MuonTruth") <<"getting PSimHit collection - "<<CSCsimHitsTag;
-    event.getByLabel(CSCsimHitsTag, CSCsimhits);    
-    LogTrace("MuonTruth") <<"... size = "<<CSCsimhits->size();
-    
-    for(edm::PSimHitContainer::const_iterator hitItr = CSCsimhits->begin();
-	hitItr != CSCsimhits->end(); ++hitItr)
-      {
-	theSimHitMap[hitItr->detUnitId()].push_back(*hitItr);
-      }
+    LogTrace("MuonTruth") << "getting PSimHit collection - " << CSCsimHitsTag;
+    event.getByLabel(CSCsimHitsTag, CSCsimhits);
+    LogTrace("MuonTruth") << "... size = " << CSCsimhits->size();
+
+    for (edm::PSimHitContainer::const_iterator hitItr = CSCsimhits->begin(); hitItr != CSCsimhits->end(); ++hitItr) {
+      theSimHitMap[hitItr->detUnitId()].push_back(*hitItr);
+    }
   }
 }
 
-float MuonTruth::muonFraction()
-{
-  if(theChargeMap.empty()) return 0.;
+float MuonTruth::muonFraction() {
+  if (theChargeMap.empty())
+    return 0.;
 
   float muonCharge = 0.;
-  for(std::map<SimHitIdpr, float>::const_iterator chargeMapItr = theChargeMap.begin();
-      chargeMapItr != theChargeMap.end(); ++chargeMapItr)
-  {
-    if( abs(particleType(chargeMapItr->first)) == 13)
-    {
+  for (std::map<SimHitIdpr, float>::const_iterator chargeMapItr = theChargeMap.begin();
+       chargeMapItr != theChargeMap.end();
+       ++chargeMapItr) {
+    if (abs(particleType(chargeMapItr->first)) == 13) {
       muonCharge += chargeMapItr->second;
     }
   }
@@ -112,156 +102,123 @@ float MuonTruth::muonFraction()
   return muonCharge / theTotalCharge;
 }
 
-
-std::vector<PSimHit> MuonTruth::simHits()
-{
+std::vector<PSimHit> MuonTruth::simHits() {
   std::vector<PSimHit> result;
-  for(std::map<SimHitIdpr, float>::const_iterator chargeMapItr = theChargeMap.begin();
-      chargeMapItr != theChargeMap.end(); ++chargeMapItr)
-  {
+  for (std::map<SimHitIdpr, float>::const_iterator chargeMapItr = theChargeMap.begin();
+       chargeMapItr != theChargeMap.end();
+       ++chargeMapItr) {
     std::vector<PSimHit> trackHits = hitsFromSimTrack(chargeMapItr->first);
     result.insert(result.end(), trackHits.begin(), trackHits.end());
   }
-  
+
   return result;
 }
 
-
-std::vector<PSimHit> MuonTruth::muonHits()
-{
+std::vector<PSimHit> MuonTruth::muonHits() {
   std::vector<PSimHit> result;
   std::vector<PSimHit> allHits = simHits();
   std::vector<PSimHit>::const_iterator hitItr = allHits.begin(), lastHit = allHits.end();
 
-  for( ; hitItr != lastHit; ++hitItr)
-  {
-    if(abs((*hitItr).particleType()) == 13)
-    {
+  for (; hitItr != lastHit; ++hitItr) {
+    if (abs((*hitItr).particleType()) == 13) {
       result.push_back(*hitItr);
     }
   }
   return result;
 }
 
-
-
-std::vector<PSimHit> MuonTruth::hitsFromSimTrack(MuonTruth::SimHitIdpr truthId)
-{
+std::vector<PSimHit> MuonTruth::hitsFromSimTrack(MuonTruth::SimHitIdpr truthId) {
   std::vector<PSimHit> result;
 
   auto found = theSimHitMap.find(theDetId);
   if (found != theSimHitMap.end()) {
+    for (auto const &hit : found->second) {
+      unsigned int hitTrack = hit.trackId();
+      EncodedEventId hitEvId = hit.eventId();
 
-    for(auto const& hit: found->second)
-      {
-        unsigned int hitTrack = hit.trackId();
-        EncodedEventId hitEvId = hit.eventId();
-        
-        if(hitTrack == truthId.first && hitEvId == truthId.second) 
-          {
-            result.push_back(hit);
-          }
+      if (hitTrack == truthId.first && hitEvId == truthId.second) {
+        result.push_back(hit);
       }
+    }
   }
   return result;
 }
 
-
-int MuonTruth::particleType(MuonTruth::SimHitIdpr truthId)
-{
+int MuonTruth::particleType(MuonTruth::SimHitIdpr truthId) {
   int result = 0;
-  const std::vector<PSimHit>& hits = hitsFromSimTrack(truthId);
-  if(!hits.empty())
-  {
+  const std::vector<PSimHit> &hits = hitsFromSimTrack(truthId);
+  if (!hits.empty()) {
     result = hits[0].particleType();
   }
   return result;
 }
 
-
-void MuonTruth::analyze(const CSCRecHit2D & recHit)
-{
+void MuonTruth::analyze(const CSCRecHit2D &recHit) {
   theChargeMap.clear();
   theTotalCharge = 0.;
   theDetId = recHit.geographicalId().rawId();
 
   int nchannels = recHit.nStrips();
-  const CSCLayerGeometry * laygeom = cscgeom->layer(recHit.cscDetId())->geometry();
+  const CSCLayerGeometry *laygeom = cscgeom->layer(recHit.cscDetId())->geometry();
 
-  for(int idigi = 0; idigi < nchannels; ++idigi)
-  {
+  for (int idigi = 0; idigi < nchannels; ++idigi) {
     // strip and readout channel numbers may differ in ME1/1A
     int istrip = recHit.channels(idigi);
     int channel = laygeom->channel(istrip);
-    float weight = recHit.adcs(idigi,0);//DL: I think this is wrong before and after...seems to assume one time binadcContainer[idigi];
+    float weight = recHit.adcs(idigi, 0);  // DL: I think this is wrong before and after...seems to
+                                           // assume one time binadcContainer[idigi];
 
     DigiSimLinks::const_iterator layerLinks = theDigiSimLinks->find(theDetId);
 
-    if(layerLinks != theDigiSimLinks->end())
-    {
+    if (layerLinks != theDigiSimLinks->end()) {
       addChannel(*layerLinks, channel, weight);
     }
   }
 }
 
-
-void MuonTruth::analyze(const CSCStripDigi & stripDigi, int rawDetIdCorrespondingToCSCLayer)
-{
+void MuonTruth::analyze(const CSCStripDigi &stripDigi, int rawDetIdCorrespondingToCSCLayer) {
   theDetId = rawDetIdCorrespondingToCSCLayer;
   theChargeMap.clear();
   theTotalCharge = 0.;
 
   DigiSimLinks::const_iterator layerLinks = theDigiSimLinks->find(theDetId);
-  if(layerLinks != theDigiSimLinks->end())
-  {
+  if (layerLinks != theDigiSimLinks->end()) {
     addChannel(*layerLinks, stripDigi.getStrip(), 1.);
   }
 }
 
-
-void MuonTruth::analyze(const CSCWireDigi & wireDigi, int rawDetIdCorrespondingToCSCLayer) 
-{
+void MuonTruth::analyze(const CSCWireDigi &wireDigi, int rawDetIdCorrespondingToCSCLayer) {
   theDetId = rawDetIdCorrespondingToCSCLayer;
   theChargeMap.clear();
   theTotalCharge = 0.;
 
   WireDigiSimLinks::const_iterator layerLinks = theWireDigiSimLinks->find(theDetId);
 
-  if(layerLinks != theDigiSimLinks->end()) 
-  {
-    // In the simulation digis, the channel labels for wires and strips must be distinct, therefore:
+  if (layerLinks != theDigiSimLinks->end()) {
+    // In the simulation digis, the channel labels for wires and strips must be
+    // distinct, therefore:
     int wireDigiInSimulation = wireDigi.getWireGroup() + 100;
     //
     addChannel(*layerLinks, wireDigiInSimulation, 1.);
   }
 }
 
+void MuonTruth::addChannel(const LayerLinks &layerLinks, int channel, float weight) {
+  LayerLinks::const_iterator linkItr = layerLinks.begin(), lastLayerLink = layerLinks.end();
 
-void MuonTruth::addChannel(const LayerLinks &layerLinks, int channel, float weight)
-{
-  LayerLinks::const_iterator linkItr = layerLinks.begin(), 
-                             lastLayerLink = layerLinks.end();
-
-  for ( ; linkItr != lastLayerLink; ++linkItr)
-  {
+  for (; linkItr != lastLayerLink; ++linkItr) {
     int linkChannel = linkItr->channel();
-    if(linkChannel == channel)
-    {
+    if (linkChannel == channel) {
       float charge = linkItr->fraction() * weight;
       theTotalCharge += charge;
       // see if it's in the map
-      SimHitIdpr truthId(linkItr->SimTrackId(),linkItr->eventId());
+      SimHitIdpr truthId(linkItr->SimTrackId(), linkItr->eventId());
       std::map<SimHitIdpr, float>::const_iterator chargeMapItr = theChargeMap.find(truthId);
-      if(chargeMapItr == theChargeMap.end())
-      {
-	theChargeMap[truthId] = charge;
-      }
-      else
-      {
-	theChargeMap[truthId] += charge;
+      if (chargeMapItr == theChargeMap.end()) {
+        theChargeMap[truthId] = charge;
+      } else {
+        theChargeMap[truthId] += charge;
       }
     }
   }
 }
-    
-
diff --git a/SimMuon/MCTruth/src/PSimHitMap.cc b/SimMuon/MCTruth/src/PSimHitMap.cc
index 6499d8123c84b..80141302df0a6 100644
--- a/SimMuon/MCTruth/src/PSimHitMap.cc
+++ b/SimMuon/MCTruth/src/PSimHitMap.cc
@@ -1,49 +1,37 @@
-#include "SimMuon/MCTruth/interface/PSimHitMap.h"
 #include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
+#include "SimMuon/MCTruth/interface/PSimHitMap.h"
 
-void PSimHitMap::fill(const edm::Event & e)
-{
+void PSimHitMap::fill(const edm::Event &e) {
   theMap.clear();
-  edm::Handle<CrossingFrame<PSimHit> > cf;
+  edm::Handle<CrossingFrame<PSimHit>> cf;
   LogTrace("PSimHitMap") << "getting CrossingFrame<PSimHit> collection ";
   e.getByToken(sh_token, cf);
 
   MixCollection<PSimHit> simHits(cf.product());
-  LogTrace("PSimHitMap") <<"... size = "<<simHits.size();
+  LogTrace("PSimHitMap") << "... size = " << simHits.size();
 
-  // arrange the hits by detUnit                                                                          
-  for(MixCollection<PSimHit>::MixItr hitItr = simHits.begin();
-      hitItr != simHits.end(); ++hitItr)
-    {
-      theMap[hitItr->detUnitId()].push_back(*hitItr);
-    }
+  // arrange the hits by detUnit
+  for (MixCollection<PSimHit>::MixItr hitItr = simHits.begin(); hitItr != simHits.end(); ++hitItr) {
+    theMap[hitItr->detUnitId()].push_back(*hitItr);
+  }
 }
 
-const edm::PSimHitContainer & PSimHitMap::hits(int detId) const
-{
-  std::map<int, edm::PSimHitContainer>::const_iterator mapItr
-    = theMap.find(detId);
-  if(mapItr != theMap.end())
-    {
-      return mapItr->second;
-    }
-  else
-    {
-      return theEmptyContainer;
-    }
+const edm::PSimHitContainer &PSimHitMap::hits(int detId) const {
+  std::map<int, edm::PSimHitContainer>::const_iterator mapItr = theMap.find(detId);
+  if (mapItr != theMap.end()) {
+    return mapItr->second;
+  } else {
+    return theEmptyContainer;
+  }
 }
 
-
-std::vector<int> PSimHitMap::detsWithHits() const 
-{
+std::vector<int> PSimHitMap::detsWithHits() const {
   std::vector<int> result;
   result.reserve(theMap.size());
-  for(std::map<int, edm::PSimHitContainer>::const_iterator mapItr = theMap.begin(),
-	mapEnd = theMap.end();
-      mapItr != mapEnd;
-      ++mapItr)
-    {
-      result.push_back(mapItr->first);
-    }
+  for (std::map<int, edm::PSimHitContainer>::const_iterator mapItr = theMap.begin(), mapEnd = theMap.end();
+       mapItr != mapEnd;
+       ++mapItr) {
+    result.push_back(mapItr->first);
+  }
   return result;
-} 
+}
diff --git a/SimMuon/MCTruth/src/RPCHitAssociator.cc b/SimMuon/MCTruth/src/RPCHitAssociator.cc
index 5f1a2e0c81034..4b95e9cfa35b0 100644
--- a/SimMuon/MCTruth/src/RPCHitAssociator.cc
+++ b/SimMuon/MCTruth/src/RPCHitAssociator.cc
@@ -2,131 +2,119 @@
 
 using namespace std;
 
-
-
 // Constructor
-RPCHitAssociator::RPCHitAssociator( const edm::ParameterSet& conf, 
-				    edm::ConsumesCollector && iC):
-  RPCdigisimlinkTag(conf.getParameter<edm::InputTag>("RPCdigisimlinkTag")),
-  // CrossingFrame used or not ?
-  crossingframe(conf.getParameter<bool>("crossingframe")),
-  RPCsimhitsTag(conf.getParameter<edm::InputTag>("RPCsimhitsTag")),
-  RPCsimhitsXFTag(conf.getParameter<edm::InputTag>("RPCsimhitsXFTag"))
-{
-  if (crossingframe){
-    RPCsimhitsXFToken_=iC.consumes<CrossingFrame<PSimHit> >(RPCsimhitsXFTag);
+RPCHitAssociator::RPCHitAssociator(const edm::ParameterSet &conf, edm::ConsumesCollector &&iC)
+    : RPCdigisimlinkTag(conf.getParameter<edm::InputTag>("RPCdigisimlinkTag")),
+      // CrossingFrame used or not ?
+      crossingframe(conf.getParameter<bool>("crossingframe")),
+      RPCsimhitsTag(conf.getParameter<edm::InputTag>("RPCsimhitsTag")),
+      RPCsimhitsXFTag(conf.getParameter<edm::InputTag>("RPCsimhitsXFTag")) {
+  if (crossingframe) {
+    RPCsimhitsXFToken_ = iC.consumes<CrossingFrame<PSimHit>>(RPCsimhitsXFTag);
   } else if (!RPCsimhitsTag.label().empty()) {
-    RPCsimhitsToken_=iC.consumes<edm::PSimHitContainer>(RPCsimhitsTag);
+    RPCsimhitsToken_ = iC.consumes<edm::PSimHitContainer>(RPCsimhitsTag);
   }
 
-  RPCdigisimlinkToken_=iC.consumes< edm::DetSetVector<RPCDigiSimLink> >(RPCdigisimlinkTag); 
+  RPCdigisimlinkToken_ = iC.consumes<edm::DetSetVector<RPCDigiSimLink>>(RPCdigisimlinkTag);
 }
 
-RPCHitAssociator::RPCHitAssociator(const edm::Event& e, const edm::EventSetup& eventSetup, const edm::ParameterSet& conf ):
-  RPCdigisimlinkTag(conf.getParameter<edm::InputTag>("RPCdigisimlinkTag")),
-  // CrossingFrame used or not ?
-  crossingframe(conf.getParameter<bool>("crossingframe")),
-  RPCsimhitsTag(conf.getParameter<edm::InputTag>("RPCsimhitsTag")),
-  RPCsimhitsXFTag(conf.getParameter<edm::InputTag>("RPCsimhitsXFTag"))
-{
-  initEvent(e,eventSetup);
+RPCHitAssociator::RPCHitAssociator(const edm::Event &e,
+                                   const edm::EventSetup &eventSetup,
+                                   const edm::ParameterSet &conf)
+    : RPCdigisimlinkTag(conf.getParameter<edm::InputTag>("RPCdigisimlinkTag")),
+      // CrossingFrame used or not ?
+      crossingframe(conf.getParameter<bool>("crossingframe")),
+      RPCsimhitsTag(conf.getParameter<edm::InputTag>("RPCsimhitsTag")),
+      RPCsimhitsXFTag(conf.getParameter<edm::InputTag>("RPCsimhitsXFTag")) {
+  initEvent(e, eventSetup);
 }
 
-
-void RPCHitAssociator::initEvent(const edm::Event& e, const edm::EventSetup& eventSetup)
-
+void RPCHitAssociator::initEvent(const edm::Event &e, const edm::EventSetup &eventSetup)
 
 {
   if (crossingframe) {
-    
-    edm::Handle<CrossingFrame<PSimHit> > cf;
-    LogTrace("RPCHitAssociator") <<"getting CrossingFrame<PSimHit> collection - "<<RPCsimhitsXFTag;
+    edm::Handle<CrossingFrame<PSimHit>> cf;
+    LogTrace("RPCHitAssociator") << "getting CrossingFrame<PSimHit> collection - " << RPCsimhitsXFTag;
     e.getByLabel(RPCsimhitsXFTag, cf);
-    
-    std::unique_ptr<MixCollection<PSimHit> > 
-      RPCsimhits( new MixCollection<PSimHit>(cf.product()) );
-    LogTrace("RPCHitAssociator") <<"... size = "<<RPCsimhits->size();
+
+    std::unique_ptr<MixCollection<PSimHit>> RPCsimhits(new MixCollection<PSimHit>(cf.product()));
+    LogTrace("RPCHitAssociator") << "... size = " << RPCsimhits->size();
 
     //   MixCollection<PSimHit> & simHits = *hits;
-    
-    for(MixCollection<PSimHit>::MixItr hitItr = RPCsimhits->begin();
-	hitItr != RPCsimhits->end(); ++hitItr) 
-      {
-	_SimHitMap[hitItr->detUnitId()].push_back(*hitItr);
-      }
-    
+
+    for (MixCollection<PSimHit>::MixItr hitItr = RPCsimhits->begin(); hitItr != RPCsimhits->end(); ++hitItr) {
+      _SimHitMap[hitItr->detUnitId()].push_back(*hitItr);
+    }
+
   } else if (!RPCsimhitsTag.label().empty()) {
     edm::Handle<edm::PSimHitContainer> RPCsimhits;
-    LogTrace("RPCHitAssociator") <<"getting PSimHit collection - "<<RPCsimhitsTag;
-    e.getByLabel(RPCsimhitsTag, RPCsimhits);    
-    LogTrace("RPCHitAssociator") <<"... size = "<<RPCsimhits->size();
-    
+    LogTrace("RPCHitAssociator") << "getting PSimHit collection - " << RPCsimhitsTag;
+    e.getByLabel(RPCsimhitsTag, RPCsimhits);
+    LogTrace("RPCHitAssociator") << "... size = " << RPCsimhits->size();
+
     // arrange the hits by detUnit
-    for(edm::PSimHitContainer::const_iterator hitItr = RPCsimhits->begin();
-	hitItr != RPCsimhits->end(); ++hitItr)
-      {
-	_SimHitMap[hitItr->detUnitId()].push_back(*hitItr);
-      }
+    for (edm::PSimHitContainer::const_iterator hitItr = RPCsimhits->begin(); hitItr != RPCsimhits->end(); ++hitItr) {
+      _SimHitMap[hitItr->detUnitId()].push_back(*hitItr);
+    }
   }
 
-  edm::Handle< edm::DetSetVector<RPCDigiSimLink> > thelinkDigis;
-  LogTrace("RPCHitAssociator") <<"getting RPCDigiSimLink collection - "<<RPCdigisimlinkTag;
+  edm::Handle<edm::DetSetVector<RPCDigiSimLink>> thelinkDigis;
+  LogTrace("RPCHitAssociator") << "getting RPCDigiSimLink collection - " << RPCdigisimlinkTag;
   e.getByLabel(RPCdigisimlinkTag, thelinkDigis);
   _thelinkDigis = thelinkDigis;
 }
 // end of constructor
 
-std::vector<RPCHitAssociator::SimHitIdpr> RPCHitAssociator::associateRecHit(const TrackingRecHit & hit) const {
-  
+std::vector<RPCHitAssociator::SimHitIdpr> RPCHitAssociator::associateRecHit(const TrackingRecHit &hit) const {
   std::vector<SimHitIdpr> matched;
 
-  const TrackingRecHit * hitp = &hit;
-  const RPCRecHit * rpcrechit = dynamic_cast<const RPCRecHit *>(hitp);
+  const TrackingRecHit *hitp = &hit;
+  const RPCRecHit *rpcrechit = dynamic_cast<const RPCRecHit *>(hitp);
 
   if (rpcrechit) {
-    
     RPCDetId rpcDetId = rpcrechit->rpcId();
     int fstrip = rpcrechit->firstClusterStrip();
     int cls = rpcrechit->clusterSize();
     int bx = rpcrechit->BunchX();
-    
-    for(int i = fstrip; i < fstrip+cls; ++i) {
-      std::set<RPCDigiSimLink> links = findRPCDigiSimLink(rpcDetId.rawId(),i,bx);
-      
-      if (links.empty()) LogTrace("RPCHitAssociator")
-	<<"*** WARNING in RPCHitAssociator::associateRecHit, RPCRecHit "<<*rpcrechit<<", strip "<<i<<" has no associated RPCDigiSimLink !"<<endl;
-      
-      for(std::set<RPCDigiSimLink>::iterator itlink = links.begin(); itlink != links.end(); ++itlink) {
-	SimHitIdpr currentId(itlink->getTrackId(),itlink->getEventId());
-	if(find(matched.begin(),matched.end(),currentId ) == matched.end())
-	  matched.push_back(currentId);
+
+    for (int i = fstrip; i < fstrip + cls; ++i) {
+      std::set<RPCDigiSimLink> links = findRPCDigiSimLink(rpcDetId.rawId(), i, bx);
+
+      if (links.empty())
+        LogTrace("RPCHitAssociator") << "*** WARNING in RPCHitAssociator::associateRecHit, RPCRecHit " << *rpcrechit
+                                     << ", strip " << i << " has no associated RPCDigiSimLink !" << endl;
+
+      for (std::set<RPCDigiSimLink>::iterator itlink = links.begin(); itlink != links.end(); ++itlink) {
+        SimHitIdpr currentId(itlink->getTrackId(), itlink->getEventId());
+        if (find(matched.begin(), matched.end(), currentId) == matched.end())
+          matched.push_back(currentId);
       }
     }
-    
-  } else LogTrace("RPCHitAssociator")<<"*** WARNING in RPCHitAssociator::associateRecHit, null dynamic_cast !";
-  
-  return  matched;
+
+  } else
+    LogTrace("RPCHitAssociator") << "*** WARNING in RPCHitAssociator::associateRecHit, null "
+                                    "dynamic_cast !";
+
+  return matched;
 }
-  
-std::set<RPCDigiSimLink>  RPCHitAssociator::findRPCDigiSimLink(uint32_t rpcDetId, int strip, int bx) const {
 
+std::set<RPCDigiSimLink> RPCHitAssociator::findRPCDigiSimLink(uint32_t rpcDetId, int strip, int bx) const {
   std::set<RPCDigiSimLink> links;
 
-  for (edm::DetSetVector<RPCDigiSimLink>::const_iterator itlink = _thelinkDigis->begin(); itlink != _thelinkDigis->end(); itlink++){
-    for(edm::DetSet<RPCDigiSimLink>::const_iterator digi_iter=itlink->data.begin();digi_iter != itlink->data.end();++digi_iter){
-
+  for (edm::DetSetVector<RPCDigiSimLink>::const_iterator itlink = _thelinkDigis->begin();
+       itlink != _thelinkDigis->end();
+       itlink++) {
+    for (edm::DetSet<RPCDigiSimLink>::const_iterator digi_iter = itlink->data.begin(); digi_iter != itlink->data.end();
+         ++digi_iter) {
       uint32_t detid = digi_iter->getDetUnitId();
       int str = digi_iter->getStrip();
       int bunchx = digi_iter->getBx();
 
-      if(detid == rpcDetId && str == strip && bunchx == bx){
+      if (detid == rpcDetId && str == strip && bunchx == bx) {
         links.insert(*digi_iter);
       }
-
     }
   }
 
   return links;
 }
-
-
diff --git a/SimMuon/MCTruth/src/TrackerMuonHitExtractor.cc b/SimMuon/MCTruth/src/TrackerMuonHitExtractor.cc
index 4bb6ac5a8f1c7..49b8f287e3a4c 100644
--- a/SimMuon/MCTruth/src/TrackerMuonHitExtractor.cc
+++ b/SimMuon/MCTruth/src/TrackerMuonHitExtractor.cc
@@ -1,228 +1,236 @@
 //
 // modified & integrated by Giovanni Abbiendi
-// from code by Arun Luthra: UserCode/luthra/MuonTrackSelector/src/MuonTrackSelector.cc
+// from code by Arun Luthra:
+// UserCode/luthra/MuonTrackSelector/src/MuonTrackSelector.cc
 //
-#include "SimMuon/MCTruth/interface/TrackerMuonHitExtractor.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
-#include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/MuonDetId/interface/CSCDetId.h"
 #include "DataFormats/MuonDetId/interface/DTChamberId.h"
 #include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
 #include "DataFormats/MuonReco/interface/MuonSelectors.h"
+#include "DataFormats/TrackReco/interface/Track.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimMuon/MCTruth/interface/TrackerMuonHitExtractor.h"
 #include <sstream>
 
-TrackerMuonHitExtractor::TrackerMuonHitExtractor(const edm::ParameterSet& parset,
-						 edm::ConsumesCollector && ic) :
-  inputDTRecSegment4DToken_(ic.consumes<DTRecSegment4DCollection>(parset.getParameter<edm::InputTag>("inputDTRecSegment4DCollection"))),
-  inputCSCSegmentToken_(ic.consumes<CSCSegmentCollection>(parset.getParameter<edm::InputTag>("inputCSCSegmentCollection"))),
-  inputDTRecSegment4DCollection_(parset.getParameter<edm::InputTag>("inputDTRecSegment4DCollection")),
-  inputCSCSegmentCollection_(parset.getParameter<edm::InputTag>("inputCSCSegmentCollection"))
-{
-}
+TrackerMuonHitExtractor::TrackerMuonHitExtractor(const edm::ParameterSet &parset, edm::ConsumesCollector &&ic)
+    : inputDTRecSegment4DToken_(
+          ic.consumes<DTRecSegment4DCollection>(parset.getParameter<edm::InputTag>("inputDTRecSegment4DCollection"))),
+      inputCSCSegmentToken_(
+          ic.consumes<CSCSegmentCollection>(parset.getParameter<edm::InputTag>("inputCSCSegmentCollection"))),
+      inputDTRecSegment4DCollection_(parset.getParameter<edm::InputTag>("inputDTRecSegment4DCollection")),
+      inputCSCSegmentCollection_(parset.getParameter<edm::InputTag>("inputCSCSegmentCollection")) {}
 
-TrackerMuonHitExtractor::TrackerMuonHitExtractor(const edm::ParameterSet& parset ) :
-  inputDTRecSegment4DCollection_(parset.getParameter<edm::InputTag>("inputDTRecSegment4DCollection")),
-  inputCSCSegmentCollection_(parset.getParameter<edm::InputTag>("inputCSCSegmentCollection"))
-{
-}
+TrackerMuonHitExtractor::TrackerMuonHitExtractor(const edm::ParameterSet &parset)
+    : inputDTRecSegment4DCollection_(parset.getParameter<edm::InputTag>("inputDTRecSegment4DCollection")),
+      inputCSCSegmentCollection_(parset.getParameter<edm::InputTag>("inputCSCSegmentCollection")) {}
 
-TrackerMuonHitExtractor::~TrackerMuonHitExtractor() {
-}
+TrackerMuonHitExtractor::~TrackerMuonHitExtractor() {}
 
-void TrackerMuonHitExtractor::init(const edm::Event& iEvent, const edm::EventSetup& iSetup) 
-{
+void TrackerMuonHitExtractor::init(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   iEvent.getByLabel(inputDTRecSegment4DCollection_, dtSegmentCollectionH_);
   iEvent.getByLabel(inputCSCSegmentCollection_, cscSegmentCollectionH_);
 
-  edm::LogVerbatim("TrackerMuonHitExtractor") <<"\nThere are "<< dtSegmentCollectionH_->size()<<" DT segments.";
+  edm::LogVerbatim("TrackerMuonHitExtractor") << "\nThere are " << dtSegmentCollectionH_->size() << " DT segments.";
   unsigned int index_dt_segment = 0;
-  for(DTRecSegment4DCollection::const_iterator segment = dtSegmentCollectionH_->begin();
-      segment != dtSegmentCollectionH_->end(); ++segment , index_dt_segment++) {
-    LocalPoint  segmentLocalPosition       = segment->localPosition();
-    LocalVector segmentLocalDirection      = segment->localDirection();
-    LocalError  segmentLocalPositionError  = segment->localPositionError();
-    LocalError  segmentLocalDirectionError = segment->localDirectionError();
+  for (DTRecSegment4DCollection::const_iterator segment = dtSegmentCollectionH_->begin();
+       segment != dtSegmentCollectionH_->end();
+       ++segment, index_dt_segment++) {
+    LocalPoint segmentLocalPosition = segment->localPosition();
+    LocalVector segmentLocalDirection = segment->localDirection();
+    LocalError segmentLocalPositionError = segment->localPositionError();
+    LocalError segmentLocalDirectionError = segment->localDirectionError();
     DetId geoid = segment->geographicalId();
     DTChamberId dtdetid = DTChamberId(geoid);
     int wheel = dtdetid.wheel();
     int station = dtdetid.station();
     int sector = dtdetid.sector();
-    
+
     float segmentX = segmentLocalPosition.x();
     float segmentY = segmentLocalPosition.y();
-    float segmentdXdZ = segmentLocalDirection.x()/segmentLocalDirection.z();
-    float segmentdYdZ = segmentLocalDirection.y()/segmentLocalDirection.z();
+    float segmentdXdZ = segmentLocalDirection.x() / segmentLocalDirection.z();
+    float segmentdYdZ = segmentLocalDirection.y() / segmentLocalDirection.z();
     float segmentXerr = sqrt(segmentLocalPositionError.xx());
     float segmentYerr = sqrt(segmentLocalPositionError.yy());
     float segmentdXdZerr = sqrt(segmentLocalDirectionError.xx());
     float segmentdYdZerr = sqrt(segmentLocalDirectionError.yy());
 
-    edm::LogVerbatim("TrackerMuonHitExtractor") 
-      <<"\nDT segment index :"<<index_dt_segment
-      <<"\nchamber Wh:"<<wheel<<",St:"<<station<<",Se:"<<sector
-      <<"\nLocal Position (X,Y)=("<<segmentX<<","<<segmentY<<") +/- ("<<segmentXerr<<","<<segmentYerr<<"), " 
-      <<"Local Direction (dXdZ,dYdZ)=("<<segmentdXdZ<<","<<segmentdYdZ<<") +/- ("<<segmentdXdZerr<<","<<segmentdYdZerr<<")"; 
+    edm::LogVerbatim("TrackerMuonHitExtractor")
+        << "\nDT segment index :" << index_dt_segment << "\nchamber Wh:" << wheel << ",St:" << station
+        << ",Se:" << sector << "\nLocal Position (X,Y)=(" << segmentX << "," << segmentY << ") +/- (" << segmentXerr
+        << "," << segmentYerr << "), "
+        << "Local Direction (dXdZ,dYdZ)=(" << segmentdXdZ << "," << segmentdYdZ << ") +/- (" << segmentdXdZerr << ","
+        << segmentdYdZerr << ")";
   }
 
-  edm::LogVerbatim("TrackerMuonHitExtractor") <<"\nThere are "<< cscSegmentCollectionH_->size()<<" CSC segments.";
+  edm::LogVerbatim("TrackerMuonHitExtractor") << "\nThere are " << cscSegmentCollectionH_->size() << " CSC segments.";
   unsigned int index_csc_segment = 0;
-  for(CSCSegmentCollection::const_iterator segment = cscSegmentCollectionH_->begin();
-      segment != cscSegmentCollectionH_->end(); ++segment , index_csc_segment++) {
-    LocalPoint  segmentLocalPosition       = segment->localPosition();
-    LocalVector segmentLocalDirection      = segment->localDirection();
-    LocalError  segmentLocalPositionError  = segment->localPositionError();
-    LocalError  segmentLocalDirectionError = segment->localDirectionError();
+  for (CSCSegmentCollection::const_iterator segment = cscSegmentCollectionH_->begin();
+       segment != cscSegmentCollectionH_->end();
+       ++segment, index_csc_segment++) {
+    LocalPoint segmentLocalPosition = segment->localPosition();
+    LocalVector segmentLocalDirection = segment->localDirection();
+    LocalError segmentLocalPositionError = segment->localPositionError();
+    LocalError segmentLocalDirectionError = segment->localDirectionError();
 
     DetId geoid = segment->geographicalId();
     CSCDetId cscdetid = CSCDetId(geoid);
     int endcap = cscdetid.endcap();
     int station = cscdetid.station();
     int ring = cscdetid.ring();
-    int chamber = cscdetid.chamber(); 
-    
+    int chamber = cscdetid.chamber();
+
     float segmentX = segmentLocalPosition.x();
     float segmentY = segmentLocalPosition.y();
-    float segmentdXdZ = segmentLocalDirection.x()/segmentLocalDirection.z();
-    float segmentdYdZ = segmentLocalDirection.y()/segmentLocalDirection.z();
+    float segmentdXdZ = segmentLocalDirection.x() / segmentLocalDirection.z();
+    float segmentdYdZ = segmentLocalDirection.y() / segmentLocalDirection.z();
     float segmentXerr = sqrt(segmentLocalPositionError.xx());
     float segmentYerr = sqrt(segmentLocalPositionError.yy());
     float segmentdXdZerr = sqrt(segmentLocalDirectionError.xx());
     float segmentdYdZerr = sqrt(segmentLocalDirectionError.yy());
 
-    edm::LogVerbatim("TrackerMuonHitExtractor") 
-      <<"\nCSC segment index :"<<index_csc_segment
-      <<"\nchamber Endcap:"<<endcap<<",St:"<<station<<",Ri:"<<ring<<",Ch:"<<chamber
-      <<"\nLocal Position (X,Y)=("<<segmentX<<","<<segmentY<<") +/- ("<<segmentXerr<<","<<segmentYerr<<"), " 
-      <<"Local Direction (dXdZ,dYdZ)=("<<segmentdXdZ<<","<<segmentdYdZ<<") +/- ("<<segmentdXdZerr<<","<<segmentdYdZerr<<")"; 
+    edm::LogVerbatim("TrackerMuonHitExtractor")
+        << "\nCSC segment index :" << index_csc_segment << "\nchamber Endcap:" << endcap << ",St:" << station
+        << ",Ri:" << ring << ",Ch:" << chamber << "\nLocal Position (X,Y)=(" << segmentX << "," << segmentY << ") +/- ("
+        << segmentXerr << "," << segmentYerr << "), "
+        << "Local Direction (dXdZ,dYdZ)=(" << segmentdXdZ << "," << segmentdYdZ << ") +/- (" << segmentdXdZerr << ","
+        << segmentdYdZerr << ")";
   }
-
 }
-std::vector<const TrackingRecHit *>
-TrackerMuonHitExtractor::getMuonHits(const reco::Muon &mu) const {
-        std::vector<const TrackingRecHit *> ret;
-
-	int wheel, station, sector;
-	int endcap, /*station, */ ring, chamber;
-	
-	edm::LogVerbatim("TrackerMuonHitExtractor") <<"Number of chambers: "<<mu.matches().size()
-					      <<", arbitrated: "<<mu.numberOfMatches(reco::Muon::SegmentAndTrackArbitration)
-					      <<", tot (no arbitration): "<<mu.numberOfMatches(reco::Muon::NoArbitration);
-	unsigned int index_chamber = 0;
-	int n_segments_noArb = 0;
-	
-	for(std::vector<reco::MuonChamberMatch>::const_iterator chamberMatch = mu.matches().begin();
-	    chamberMatch != mu.matches().end(); ++chamberMatch, index_chamber++) {
-	  std::stringstream chamberStr;
-	  chamberStr <<"\nchamber index: "<<index_chamber; 
-	  
-	  int subdet = chamberMatch->detector();
-	  DetId did = chamberMatch->id;
-	  
-	  if (subdet == MuonSubdetId::DT) {
-	    DTChamberId dtdetid = DTChamberId(did);
-	    wheel = dtdetid.wheel();
-	    station = dtdetid.station();
-	    sector = dtdetid.sector();
-	    chamberStr << ", DT chamber Wh:"<<wheel<<",St:"<<station<<",Se:"<<sector;
-	  } 
-	  else if (subdet == MuonSubdetId::CSC) {
-	    CSCDetId cscdetid = CSCDetId(did);
-	    endcap = cscdetid.endcap();
-	    station = cscdetid.station();
-	    ring = cscdetid.ring();
-	    chamber = cscdetid.chamber();
-	    chamberStr << ", CSC chamber End:"<<endcap<<",St:"<<station<<",Ri:"<<ring<<",Ch:"<<chamber;
-	  }
-	  
-	  chamberStr << ", Number of segments: "<<chamberMatch->segmentMatches.size();
-	  edm::LogVerbatim("TrackerMuonHitExtractor") << chamberStr.str();
-	  n_segments_noArb = n_segments_noArb + chamberMatch->segmentMatches.size();
-
-	  unsigned int index_segment = 0;
-	  
-	  for(std::vector<reco::MuonSegmentMatch>::const_iterator segmentMatch = chamberMatch->segmentMatches.begin();
-	      segmentMatch != chamberMatch->segmentMatches.end(); ++segmentMatch, index_segment++) {
-	    
-	    float segmentX = segmentMatch->x;
-	    float segmentY = segmentMatch->y ;
-	    float segmentdXdZ = segmentMatch->dXdZ;
-	    float segmentdYdZ = segmentMatch->dYdZ;
-	    float segmentXerr = segmentMatch->xErr;
-	    float segmentYerr = segmentMatch->yErr;
-	    float segmentdXdZerr = segmentMatch->dXdZErr;
-	    float segmentdYdZerr = segmentMatch->dYdZErr;
-	    
-	    CSCSegmentRef segmentCSC = segmentMatch->cscSegmentRef;
-	    DTRecSegment4DRef segmentDT = segmentMatch->dtSegmentRef;
-	    
-	    bool segment_arbitrated_Ok = (segmentMatch->isMask(reco::MuonSegmentMatch::BestInChamberByDR) && 
-					  segmentMatch->isMask(reco::MuonSegmentMatch::BelongsToTrackByDR));
-	    
-	    std::string ARBITRATED(" ***Arbitrated Off*** ");
-	    if (segment_arbitrated_Ok) ARBITRATED = " ***ARBITRATED OK*** ";
-
-	    if (subdet == MuonSubdetId::DT) {	      
-	      edm::LogVerbatim("TrackerMuonHitExtractor")
-		<<"\n\t segment index: "<<index_segment << ARBITRATED
-		<<"\n\t  Local Position (X,Y)=("<<segmentX<<","<<segmentY<<") +/- ("<<segmentXerr<<","<<segmentYerr<<"), " 
-		<<"\n\t  Local Direction (dXdZ,dYdZ)=("<<segmentdXdZ<<","<<segmentdYdZ<<") +/- ("<<segmentdXdZerr<<","<<segmentdYdZerr<<")"; 
-	      
-	      // with the following line the DT segments failing standard arbitration are skipped 
-	      if (!segment_arbitrated_Ok) continue;
-
-              if (segmentDT.get() != nullptr) {
-		const DTRecSegment4D* segment = segmentDT.get();
-		
-		edm::LogVerbatim("TrackerMuonHitExtractor")<<"\t ===> MATCHING with DT segment with index = "<<segmentDT.key();
-		
-		if(segment->hasPhi()) {
-		  const DTChamberRecSegment2D* phiSeg = segment->phiSegment();
-		  std::vector<const TrackingRecHit*> phiHits = phiSeg->recHits();
-		  for(std::vector<const TrackingRecHit*>::const_iterator ihit = phiHits.begin();
-		      ihit != phiHits.end(); ++ihit) {
-                    ret.push_back(*ihit);
-		  }
-		}
-		
-		if(segment->hasZed()) {
-		  const DTSLRecSegment2D* zSeg = (*segment).zSegment();
-		  std::vector<const TrackingRecHit*> zedHits = zSeg->recHits();
-		  for(std::vector<const TrackingRecHit*>::const_iterator ihit = zedHits.begin();
-		      ihit != zedHits.end(); ++ihit) {
-                    ret.push_back(*ihit);
-		  }
-		}
-	      } else edm::LogWarning("TrackerMuonHitExtractor")<<"\n***WARNING: UNMATCHED DT segment ! \n";
-            } // if (subdet == MuonSubdetId::DT)
-	    
-	    else if (subdet == MuonSubdetId::CSC) {
-	      edm::LogVerbatim("TrackerMuonHitExtractor")
-		<<"\n\t segment index: "<<index_segment << ARBITRATED
-		<<"\n\t  Local Position (X,Y)=("<<segmentX<<","<<segmentY<<") +/- ("<<segmentXerr<<","<<segmentYerr<<"), " 
-		<<"\n\t  Local Direction (dXdZ,dYdZ)=("<<segmentdXdZ<<","<<segmentdYdZ<<") +/- ("<<segmentdXdZerr<<","<<segmentdYdZerr<<")"; 
-	      
-	      // with the following line the CSC segments failing standard arbitration are skipped 
-	      if (!segment_arbitrated_Ok) continue;
-
-              if (segmentCSC.get() != nullptr) {
-		const CSCSegment* segment = segmentCSC.get();
-		
-		edm::LogVerbatim("TrackerMuonHitExtractor")<<"\t ===> MATCHING with CSC segment with index = "<<segmentCSC.key();
-		
-		std::vector<const TrackingRecHit*> hits = segment->recHits();
-		for(std::vector<const TrackingRecHit*>::const_iterator ihit = hits.begin();
-		    ihit != hits.end(); ++ihit) {
-                  ret.push_back(*ihit);
-		}
-	      } else edm::LogWarning("TrackerMuonHitExtractor")<<"\n***WARNING: UNMATCHED CSC segment ! \n";
-	    }   // else if (subdet == MuonSubdetId::CSC)
-	    
-	  } // loop on vector<MuonSegmentMatch>	  
-	}  // loop on vector<MuonChamberMatch>	
-
-	edm::LogVerbatim("TrackerMuonHitExtractor")<<"\n N. matched Segments before arbitration = "<<n_segments_noArb;
-
-        return ret;
+std::vector<const TrackingRecHit *> TrackerMuonHitExtractor::getMuonHits(const reco::Muon &mu) const {
+  std::vector<const TrackingRecHit *> ret;
+
+  int wheel, station, sector;
+  int endcap, /*station, */ ring, chamber;
+
+  edm::LogVerbatim("TrackerMuonHitExtractor")
+      << "Number of chambers: " << mu.matches().size()
+      << ", arbitrated: " << mu.numberOfMatches(reco::Muon::SegmentAndTrackArbitration)
+      << ", tot (no arbitration): " << mu.numberOfMatches(reco::Muon::NoArbitration);
+  unsigned int index_chamber = 0;
+  int n_segments_noArb = 0;
+
+  for (std::vector<reco::MuonChamberMatch>::const_iterator chamberMatch = mu.matches().begin();
+       chamberMatch != mu.matches().end();
+       ++chamberMatch, index_chamber++) {
+    std::stringstream chamberStr;
+    chamberStr << "\nchamber index: " << index_chamber;
+
+    int subdet = chamberMatch->detector();
+    DetId did = chamberMatch->id;
+
+    if (subdet == MuonSubdetId::DT) {
+      DTChamberId dtdetid = DTChamberId(did);
+      wheel = dtdetid.wheel();
+      station = dtdetid.station();
+      sector = dtdetid.sector();
+      chamberStr << ", DT chamber Wh:" << wheel << ",St:" << station << ",Se:" << sector;
+    } else if (subdet == MuonSubdetId::CSC) {
+      CSCDetId cscdetid = CSCDetId(did);
+      endcap = cscdetid.endcap();
+      station = cscdetid.station();
+      ring = cscdetid.ring();
+      chamber = cscdetid.chamber();
+      chamberStr << ", CSC chamber End:" << endcap << ",St:" << station << ",Ri:" << ring << ",Ch:" << chamber;
+    }
+
+    chamberStr << ", Number of segments: " << chamberMatch->segmentMatches.size();
+    edm::LogVerbatim("TrackerMuonHitExtractor") << chamberStr.str();
+    n_segments_noArb = n_segments_noArb + chamberMatch->segmentMatches.size();
+
+    unsigned int index_segment = 0;
+
+    for (std::vector<reco::MuonSegmentMatch>::const_iterator segmentMatch = chamberMatch->segmentMatches.begin();
+         segmentMatch != chamberMatch->segmentMatches.end();
+         ++segmentMatch, index_segment++) {
+      float segmentX = segmentMatch->x;
+      float segmentY = segmentMatch->y;
+      float segmentdXdZ = segmentMatch->dXdZ;
+      float segmentdYdZ = segmentMatch->dYdZ;
+      float segmentXerr = segmentMatch->xErr;
+      float segmentYerr = segmentMatch->yErr;
+      float segmentdXdZerr = segmentMatch->dXdZErr;
+      float segmentdYdZerr = segmentMatch->dYdZErr;
+
+      CSCSegmentRef segmentCSC = segmentMatch->cscSegmentRef;
+      DTRecSegment4DRef segmentDT = segmentMatch->dtSegmentRef;
+
+      bool segment_arbitrated_Ok = (segmentMatch->isMask(reco::MuonSegmentMatch::BestInChamberByDR) &&
+                                    segmentMatch->isMask(reco::MuonSegmentMatch::BelongsToTrackByDR));
+
+      std::string ARBITRATED(" ***Arbitrated Off*** ");
+      if (segment_arbitrated_Ok)
+        ARBITRATED = " ***ARBITRATED OK*** ";
+
+      if (subdet == MuonSubdetId::DT) {
+        edm::LogVerbatim("TrackerMuonHitExtractor")
+            << "\n\t segment index: " << index_segment << ARBITRATED << "\n\t  Local Position (X,Y)=(" << segmentX
+            << "," << segmentY << ") +/- (" << segmentXerr << "," << segmentYerr << "), "
+            << "\n\t  Local Direction (dXdZ,dYdZ)=(" << segmentdXdZ << "," << segmentdYdZ << ") +/- (" << segmentdXdZerr
+            << "," << segmentdYdZerr << ")";
+
+        // with the following line the DT segments failing standard arbitration
+        // are skipped
+        if (!segment_arbitrated_Ok)
+          continue;
+
+        if (segmentDT.get() != nullptr) {
+          const DTRecSegment4D *segment = segmentDT.get();
+
+          edm::LogVerbatim("TrackerMuonHitExtractor")
+              << "\t ===> MATCHING with DT segment with index = " << segmentDT.key();
+
+          if (segment->hasPhi()) {
+            const DTChamberRecSegment2D *phiSeg = segment->phiSegment();
+            std::vector<const TrackingRecHit *> phiHits = phiSeg->recHits();
+            for (std::vector<const TrackingRecHit *>::const_iterator ihit = phiHits.begin(); ihit != phiHits.end();
+                 ++ihit) {
+              ret.push_back(*ihit);
+            }
+          }
+
+          if (segment->hasZed()) {
+            const DTSLRecSegment2D *zSeg = (*segment).zSegment();
+            std::vector<const TrackingRecHit *> zedHits = zSeg->recHits();
+            for (std::vector<const TrackingRecHit *>::const_iterator ihit = zedHits.begin(); ihit != zedHits.end();
+                 ++ihit) {
+              ret.push_back(*ihit);
+            }
+          }
+        } else
+          edm::LogWarning("TrackerMuonHitExtractor") << "\n***WARNING: UNMATCHED DT segment ! \n";
+      }  // if (subdet == MuonSubdetId::DT)
+
+      else if (subdet == MuonSubdetId::CSC) {
+        edm::LogVerbatim("TrackerMuonHitExtractor")
+            << "\n\t segment index: " << index_segment << ARBITRATED << "\n\t  Local Position (X,Y)=(" << segmentX
+            << "," << segmentY << ") +/- (" << segmentXerr << "," << segmentYerr << "), "
+            << "\n\t  Local Direction (dXdZ,dYdZ)=(" << segmentdXdZ << "," << segmentdYdZ << ") +/- (" << segmentdXdZerr
+            << "," << segmentdYdZerr << ")";
+
+        // with the following line the CSC segments failing standard arbitration
+        // are skipped
+        if (!segment_arbitrated_Ok)
+          continue;
+
+        if (segmentCSC.get() != nullptr) {
+          const CSCSegment *segment = segmentCSC.get();
+
+          edm::LogVerbatim("TrackerMuonHitExtractor")
+              << "\t ===> MATCHING with CSC segment with index = " << segmentCSC.key();
+
+          std::vector<const TrackingRecHit *> hits = segment->recHits();
+          for (std::vector<const TrackingRecHit *>::const_iterator ihit = hits.begin(); ihit != hits.end(); ++ihit) {
+            ret.push_back(*ihit);
+          }
+        } else
+          edm::LogWarning("TrackerMuonHitExtractor") << "\n***WARNING: UNMATCHED CSC segment ! \n";
+      }  // else if (subdet == MuonSubdetId::CSC)
+
+    }  // loop on vector<MuonSegmentMatch>
+  }    // loop on vector<MuonChamberMatch>
+
+  edm::LogVerbatim("TrackerMuonHitExtractor") << "\n N. matched Segments before arbitration = " << n_segments_noArb;
+
+  return ret;
 }
-
diff --git a/SimMuon/MCTruth/test/testAssociatorRecoMuon.cc b/SimMuon/MCTruth/test/testAssociatorRecoMuon.cc
index c7d8b99aa196b..3d51f85ab2c6f 100644
--- a/SimMuon/MCTruth/test/testAssociatorRecoMuon.cc
+++ b/SimMuon/MCTruth/test/testAssociatorRecoMuon.cc
@@ -1,156 +1,164 @@
-#include <memory>
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
+#include <memory>
 
 #include "SimMuon/MCTruth/interface/MuonToSimAssociatorBase.h"
 #include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 
 #include <iostream>
-#include <string>
 #include <map>
+#include <string>
 
 class testAssociatorRecoMuon : public edm::EDAnalyzer {
-  
- public:
-  testAssociatorRecoMuon(const edm::ParameterSet&);
+public:
+  testAssociatorRecoMuon(const edm::ParameterSet &);
   ~testAssociatorRecoMuon() override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  
- private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+
+private:
   edm::InputTag muonsTag;
   edm::InputTag tpTag;
 
   std::string associatorLabel_;
- 
+
   MuonToSimAssociatorBase::MuonTrackType trackType_;
 };
 
+#include "DataFormats/MuonReco/interface/Muon.h"
+#include "DataFormats/TrackReco/interface/Track.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
-#include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/MuonReco/interface/Muon.h"
 
-testAssociatorRecoMuon::testAssociatorRecoMuon(const edm::ParameterSet& parset) :
-  muonsTag(parset.getParameter< edm::InputTag >("muonsTag")),
-  tpTag(parset.getParameter< edm::InputTag >("tpTag")),
-  associatorLabel_(parset.getParameter< std::string >("associatorLabel"))
-{
-    std::string trackType = parset.getParameter< std::string >("trackType");
-    if (trackType == "inner") trackType_ = MuonToSimAssociatorBase::InnerTk;
-    else if (trackType == "outer") trackType_ = MuonToSimAssociatorBase::OuterTk;
-    else if (trackType == "global") trackType_ = MuonToSimAssociatorBase::GlobalTk;
-    else if (trackType == "segments") trackType_ = MuonToSimAssociatorBase::Segments;
-    else throw cms::Exception("Configuration") << "Track type '" << trackType << "' not supported.\n";
+testAssociatorRecoMuon::testAssociatorRecoMuon(const edm::ParameterSet &parset)
+    : muonsTag(parset.getParameter<edm::InputTag>("muonsTag")),
+      tpTag(parset.getParameter<edm::InputTag>("tpTag")),
+      associatorLabel_(parset.getParameter<std::string>("associatorLabel")) {
+  std::string trackType = parset.getParameter<std::string>("trackType");
+  if (trackType == "inner")
+    trackType_ = MuonToSimAssociatorBase::InnerTk;
+  else if (trackType == "outer")
+    trackType_ = MuonToSimAssociatorBase::OuterTk;
+  else if (trackType == "global")
+    trackType_ = MuonToSimAssociatorBase::GlobalTk;
+  else if (trackType == "segments")
+    trackType_ = MuonToSimAssociatorBase::Segments;
+  else
+    throw cms::Exception("Configuration") << "Track type '" << trackType << "' not supported.\n";
 }
 
-testAssociatorRecoMuon::~testAssociatorRecoMuon() {
-}
+testAssociatorRecoMuon::~testAssociatorRecoMuon() {}
 
-void testAssociatorRecoMuon::analyze(const edm::Event& event, const edm::EventSetup& setup)
-{  
+void testAssociatorRecoMuon::analyze(const edm::Event &event, const edm::EventSetup &setup) {
   edm::ESHandle<MuonToSimAssociatorBase> associatorBase;
   setup.get<TrackAssociatorRecord>().get(associatorLabel_, associatorBase);
-  const MuonToSimAssociatorBase* assoByHits = associatorBase.product();
-  if (assoByHits == nullptr) throw cms::Exception("Configuration") << "The Track Associator with label '" << associatorLabel_ << "' is not a MuonAssociatorByHits.\n";
+  const MuonToSimAssociatorBase *assoByHits = associatorBase.product();
+  if (assoByHits == nullptr)
+    throw cms::Exception("Configuration")
+        << "The Track Associator with label '" << associatorLabel_ << "' is not a MuonAssociatorByHits.\n";
+
+  edm::Handle<edm::View<reco::Muon>> muonCollectionH;
+  LogTrace("testAssociatorRecoMuon") << "getting reco::Track collection " << muonsTag;
+  event.getByLabel(muonsTag, muonCollectionH);
 
-  edm::Handle<edm::View<reco::Muon> > muonCollectionH;
-  LogTrace("testAssociatorRecoMuon") << "getting reco::Track collection "<<muonsTag;
-  event.getByLabel(muonsTag,muonCollectionH);
+  const edm::View<reco::Muon> muonCollection = *(muonCollectionH.product());
+  LogTrace("testAssociatorRecoMuon") << "...size = " << muonCollection.size();
 
-  const edm::View<reco::Muon>  muonCollection = *(muonCollectionH.product()); 
-  LogTrace("testAssociatorRecoMuon") << "...size = "<<muonCollection.size();
+  edm::Handle<TrackingParticleCollection> TPCollectionH;
+  LogTrace("testAssociatorRecoMuon") << "getting TrackingParticle collection " << tpTag;
+  event.getByLabel(tpTag, TPCollectionH);
 
-  edm::Handle<TrackingParticleCollection>  TPCollectionH ;
-  LogTrace("testAssociatorRecoMuon") << "getting TrackingParticle collection "<<tpTag;
-  event.getByLabel(tpTag,TPCollectionH);
+  LogTrace("testAssociatorRecoMuon") << "...size = " << TPCollectionH->size();
 
-  LogTrace("testAssociatorRecoMuon") << "...size = "<< TPCollectionH->size();
+  edm::LogVerbatim("testAssociatorRecoMuon") << "\n === Event ID = " << event.id() << " ===";
 
-  edm::LogVerbatim("testAssociatorRecoMuon") <<"\n === Event ID = "<< event.id()<<" ===";
-    
-  //RECOTOSIM 
-  edm::LogVerbatim("testAssociatorRecoMuon") 
-    << "\n                      ****************** Reco To Sim ****************** ";
+  // RECOTOSIM
+  edm::LogVerbatim("testAssociatorRecoMuon") << "\n                      ****************** Reco To Sim "
+                                                "****************** ";
 
   MuonToSimAssociatorBase::MuonToSimCollection recSimColl;
   MuonToSimAssociatorBase::SimToMuonCollection simRecColl;
 
   assoByHits->associateMuons(recSimColl, simRecColl, muonCollectionH, trackType_, TPCollectionH, &event, &setup);
 
+  edm::LogVerbatim("testAssociatorRecoMuon") << "\n There are " << muonCollection.size() << " reco::Muon "
+                                             << "(" << recSimColl.size() << " matched) \n";
 
-  edm::LogVerbatim("testAssociatorRecoMuon")
-    << "\n There are " << muonCollection.size() << " reco::Muon "<< "("<<recSimColl.size()<<" matched) \n";
-
-  for(edm::View<reco::Muon>::size_type i=0; i<muonCollection.size(); ++i) {
+  for (edm::View<reco::Muon>::size_type i = 0; i < muonCollection.size(); ++i) {
     edm::RefToBase<reco::Muon> track(muonCollectionH, i);
-    
-    if(recSimColl.find(track) != recSimColl.end()) {
-      std::vector<std::pair<TrackingParticleRef, double> > recSimAsso = recSimColl[track];
-      
-      for (std::vector<std::pair<TrackingParticleRef, double> >::const_iterator IT = recSimAsso.begin(); 
-	   IT != recSimAsso.end(); ++IT) {
-	TrackingParticleRef trpart = IT->first;
-	double purity = IT->second;
-	edm::LogVerbatim("testAssociatorRecoMuon") <<"reco::Muon #" << int(i) << " with pt = " << track->pt()
-					     << " associated to TrackingParticle #" << trpart.key()
-					     << " (pdgId = " << trpart->pdgId() << ", pt = " << trpart->pt() << ") with Quality = " << purity;
+
+    if (recSimColl.find(track) != recSimColl.end()) {
+      std::vector<std::pair<TrackingParticleRef, double>> recSimAsso = recSimColl[track];
+
+      for (std::vector<std::pair<TrackingParticleRef, double>>::const_iterator IT = recSimAsso.begin();
+           IT != recSimAsso.end();
+           ++IT) {
+        TrackingParticleRef trpart = IT->first;
+        double purity = IT->second;
+        edm::LogVerbatim("testAssociatorRecoMuon")
+            << "reco::Muon #" << int(i) << " with pt = " << track->pt() << " associated to TrackingParticle #"
+            << trpart.key() << " (pdgId = " << trpart->pdgId() << ", pt = " << trpart->pt()
+            << ") with Quality = " << purity;
       }
     } else {
-      edm::LogVerbatim("testAssociatorRecoMuon") << "reco::Muon #" << int(i) << " with pt = " << track->pt()
-					   << " NOT associated to any TrackingParticle" << "\n";		   
-    } 
+      edm::LogVerbatim("testAssociatorRecoMuon")
+          << "reco::Muon #" << int(i) << " with pt = " << track->pt() << " NOT associated to any TrackingParticle"
+          << "\n";
+    }
   }
 
-  //SIMTORECO
-  edm::LogVerbatim("testAssociatorRecoMuon") 
-    << "\n                      ****************** Sim To Reco ****************** ";
+  // SIMTORECO
+  edm::LogVerbatim("testAssociatorRecoMuon") << "\n                      ****************** Sim To Reco "
+                                                "****************** ";
 
-  edm::LogVerbatim("testAssociatorRecoMuon")
-    << "\n There are " << TPCollectionH->size() << " TrackingParticles "<<"("<<simRecColl.size()<<" matched) \n";
+  edm::LogVerbatim("testAssociatorRecoMuon") << "\n There are " << TPCollectionH->size() << " TrackingParticles "
+                                             << "(" << simRecColl.size() << " matched) \n";
 
   bool any_trackingParticle_matched = false;
 
   for (TrackingParticleCollection::size_type i = 0; i < TPCollectionH->size(); i++) {
     TrackingParticleRef trpart(TPCollectionH, i);
 
-    std::vector<std::pair<edm::RefToBase<reco::Muon>, double> > simRecAsso;
-    if(simRecColl.find(trpart) != simRecColl.end()) { 
+    std::vector<std::pair<edm::RefToBase<reco::Muon>, double>> simRecAsso;
+    if (simRecColl.find(trpart) != simRecColl.end()) {
       simRecAsso = simRecColl[trpart];
-      
-      for (std::vector<std::pair<edm::RefToBase<reco::Muon>, double> >::const_iterator IT = simRecAsso.begin(); 
-	   IT != simRecAsso.end(); ++IT) {
-	edm::RefToBase<reco::Muon> track = IT->first;
-	double quality = IT->second;
-	any_trackingParticle_matched = true;
-
-	// find the purity from RecoToSim association (set purity = -1 for unmatched recoToSim)
-	double purity = -1.;
-	if(recSimColl.find(track) != recSimColl.end()) {
-          std::vector<std::pair<TrackingParticleRef, double> > recSimAsso = recSimColl[track];
-	  for (std::vector<std::pair<TrackingParticleRef, double> >::const_iterator ITS = recSimAsso.begin(); 
-	       ITS != recSimAsso.end(); ++ITS) {
-	    TrackingParticleRef tp(ITS->first);
-	    if (tp == trpart) purity = ITS->second;
-	  }
-	}
-
-	edm::LogVerbatim("testAssociatorRecoMuon") <<"TrackingParticle #" << int(i)<< " with pdgId = " << trpart->pdgId() << ", pt = " << trpart->pt()
-					     << " associated to reco::Muon #" <<track.key()
-					     << " (pt = " << track->pt() << ") with Quality = " << quality
-	                                     << " and Purity = "<< purity;
+
+      for (std::vector<std::pair<edm::RefToBase<reco::Muon>, double>>::const_iterator IT = simRecAsso.begin();
+           IT != simRecAsso.end();
+           ++IT) {
+        edm::RefToBase<reco::Muon> track = IT->first;
+        double quality = IT->second;
+        any_trackingParticle_matched = true;
+
+        // find the purity from RecoToSim association (set purity = -1 for
+        // unmatched recoToSim)
+        double purity = -1.;
+        if (recSimColl.find(track) != recSimColl.end()) {
+          std::vector<std::pair<TrackingParticleRef, double>> recSimAsso = recSimColl[track];
+          for (std::vector<std::pair<TrackingParticleRef, double>>::const_iterator ITS = recSimAsso.begin();
+               ITS != recSimAsso.end();
+               ++ITS) {
+            TrackingParticleRef tp(ITS->first);
+            if (tp == trpart)
+              purity = ITS->second;
+          }
+        }
+
+        edm::LogVerbatim("testAssociatorRecoMuon")
+            << "TrackingParticle #" << int(i) << " with pdgId = " << trpart->pdgId() << ", pt = " << trpart->pt()
+            << " associated to reco::Muon #" << track.key() << " (pt = " << track->pt()
+            << ") with Quality = " << quality << " and Purity = " << purity;
       }
-    } 
-    
+    }
   }
   if (!any_trackingParticle_matched) {
-    edm::LogVerbatim("testAssociatorRecoMuon") << "NO TrackingParticle associated to ANY input reco::Muon !" << "\n";
+    edm::LogVerbatim("testAssociatorRecoMuon") << "NO TrackingParticle associated to ANY input reco::Muon !"
+                                               << "\n";
   }
-  
 }
 #include "FWCore/Framework/interface/MakerMacros.h"
 DEFINE_FWK_MODULE(testAssociatorRecoMuon);
diff --git a/SimMuon/MCTruth/test/testReader.cc b/SimMuon/MCTruth/test/testReader.cc
index 7303b975cc2d5..33a21d73f9322 100644
--- a/SimMuon/MCTruth/test/testReader.cc
+++ b/SimMuon/MCTruth/test/testReader.cc
@@ -1,151 +1,151 @@
+#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "SimMuon/MCTruth/test/testReader.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
-#include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimMuon/MCTruth/test/testReader.h"
 
-testReader::testReader(const edm::ParameterSet& parset) :
-  tracksTag(parset.getParameter< edm::InputTag >("tracksTag")),
-  tpTag(parset.getParameter< edm::InputTag >("tpTag")),
-  assoMapsTag(parset.getParameter< edm::InputTag >("assoMapsTag"))
-{
-}
+testReader::testReader(const edm::ParameterSet &parset)
+    : tracksTag(parset.getParameter<edm::InputTag>("tracksTag")),
+      tpTag(parset.getParameter<edm::InputTag>("tpTag")),
+      assoMapsTag(parset.getParameter<edm::InputTag>("assoMapsTag")) {}
 
-testReader::~testReader() {
-}
+testReader::~testReader() {}
 
-void testReader::analyze(const edm::Event& event, const edm::EventSetup& setup)
-{  
-  edm::Handle<edm::View<reco::Track> > trackCollectionH;
+void testReader::analyze(const edm::Event &event, const edm::EventSetup &setup) {
+  edm::Handle<edm::View<reco::Track>> trackCollectionH;
   edm::View<reco::Track> trackCollection;
-  LogTrace("testReader") << "testReader::analyze : getting reco::Track collection, "<<tracksTag;
-  event.getByLabel(tracksTag,trackCollectionH);
-  if (trackCollectionH.isValid()) { 
-    trackCollection = *(trackCollectionH.product()); 
-    LogTrace("testReader") << "... size = "<<trackCollection.size();
-  }
-  else LogTrace("testReader") << "... NOT FOUND.";
+  LogTrace("testReader") << "testReader::analyze : getting reco::Track collection, " << tracksTag;
+  event.getByLabel(tracksTag, trackCollectionH);
+  if (trackCollectionH.isValid()) {
+    trackCollection = *(trackCollectionH.product());
+    LogTrace("testReader") << "... size = " << trackCollection.size();
+  } else
+    LogTrace("testReader") << "... NOT FOUND.";
 
-  edm::Handle<TrackingParticleCollection>  TPCollectionH ;
+  edm::Handle<TrackingParticleCollection> TPCollectionH;
   TrackingParticleCollection tPC;
-  LogTrace("testReader") << "testReader::analyze : getting TrackingParticle collection, "<<tpTag;
-  event.getByLabel(tpTag,TPCollectionH);
+  LogTrace("testReader") << "testReader::analyze : getting TrackingParticle collection, " << tpTag;
+  event.getByLabel(tpTag, TPCollectionH);
   if (TPCollectionH.isValid()) {
-    tPC   = *(TPCollectionH.product());
-    LogTrace("testReader") << "... size = "<<tPC.size();
-  }
-  else LogTrace("testReader") << "... NOT FOUND.";
-  
+    tPC = *(TPCollectionH.product());
+    LogTrace("testReader") << "... size = " << tPC.size();
+  } else
+    LogTrace("testReader") << "... NOT FOUND.";
+
   edm::Handle<reco::RecoToSimCollection> recSimH;
   reco::RecoToSimCollection recSimColl;
-  LogTrace("testReader") << "testReader::analyze : getting  RecoToSimCollection - "<<assoMapsTag;
-  event.getByLabel(assoMapsTag,recSimH);
+  LogTrace("testReader") << "testReader::analyze : getting  RecoToSimCollection - " << assoMapsTag;
+  event.getByLabel(assoMapsTag, recSimH);
   if (recSimH.isValid()) {
     recSimColl = *(recSimH.product());
-    LogTrace("testReader") << "... size = "<<recSimColl.size();
+    LogTrace("testReader") << "... size = " << recSimColl.size();
   } else {
     LogTrace("testReader") << "... NOT FOUND.";
   }
 
   edm::Handle<reco::SimToRecoCollection> simRecH;
   reco::SimToRecoCollection simRecColl;
-  LogTrace("testReader") << "testReader::analyze : getting  SimToRecoCollection - "<<assoMapsTag;
-  event.getByLabel(assoMapsTag,simRecH);
+  LogTrace("testReader") << "testReader::analyze : getting  SimToRecoCollection - " << assoMapsTag;
+  event.getByLabel(assoMapsTag, simRecH);
   if (simRecH.isValid()) {
     simRecColl = *(simRecH.product());
-    LogTrace("testReader") << "... size = "<<simRecColl.size();
+    LogTrace("testReader") << "... size = " << simRecColl.size();
   } else {
     LogTrace("testReader") << "... NOT FOUND.";
   }
 
-  edm::LogVerbatim("testReader") <<"\n === Event ID = "<< event.id()<<" ===";
-  
-  //RECOTOSIM 
-  edm::LogVerbatim("testReader") 
-    << "\n                      ****************** Reco To Sim ****************** ";
+  edm::LogVerbatim("testReader") << "\n === Event ID = " << event.id() << " ===";
+
+  // RECOTOSIM
+  edm::LogVerbatim("testReader") << "\n                      ****************** Reco To Sim "
+                                    "****************** ";
   if (recSimH.isValid()) {
-    
-  edm::LogVerbatim("testReader")
-    << "\n There are " << trackCollection.size() << " reco::Tracks "<< "("<<recSimColl.size()<<" matched) \n";
-
-  for(edm::View<reco::Track>::size_type i=0; i<trackCollection.size(); ++i) {
-    edm::RefToBase<reco::Track> track(trackCollectionH, i);
-    
-    if(recSimColl.find(track) != recSimColl.end()) {
-      std::vector<std::pair<TrackingParticleRef, double> > recSimAsso = recSimColl[track];
-      
-      for (std::vector<std::pair<TrackingParticleRef, double> >::const_iterator IT = recSimAsso.begin(); 
-	   IT != recSimAsso.end(); ++IT) {
-	TrackingParticleRef trpart = IT->first;
-	double purity = IT->second;
-	edm::LogVerbatim("testReader") <<"reco::Track #" << int(i) << " with pt = " << track->pt()
-				       << " associated to TrackingParticle #" <<trpart.key()
-				       << " (pt = " << trpart->pt() << ") with Quality = " << purity;
+    edm::LogVerbatim("testReader") << "\n There are " << trackCollection.size() << " reco::Tracks "
+                                   << "(" << recSimColl.size() << " matched) \n";
+
+    for (edm::View<reco::Track>::size_type i = 0; i < trackCollection.size(); ++i) {
+      edm::RefToBase<reco::Track> track(trackCollectionH, i);
+
+      if (recSimColl.find(track) != recSimColl.end()) {
+        std::vector<std::pair<TrackingParticleRef, double>> recSimAsso = recSimColl[track];
+
+        for (std::vector<std::pair<TrackingParticleRef, double>>::const_iterator IT = recSimAsso.begin();
+             IT != recSimAsso.end();
+             ++IT) {
+          TrackingParticleRef trpart = IT->first;
+          double purity = IT->second;
+          edm::LogVerbatim("testReader") << "reco::Track #" << int(i) << " with pt = " << track->pt()
+                                         << " associated to TrackingParticle #" << trpart.key()
+                                         << " (pt = " << trpart->pt() << ") with Quality = " << purity;
+        }
+      } else {
+        edm::LogVerbatim("testReader") << "reco::Track #" << int(i) << " with pt = " << track->pt()
+                                       << " NOT associated to any TrackingParticle"
+                                       << "\n";
       }
-    } else {
-      edm::LogVerbatim("testReader") << "reco::Track #" << int(i) << " with pt = " << track->pt()
-				     << " NOT associated to any TrackingParticle" << "\n";		   
-    } 
-  }
+    }
 
-  } else  edm::LogVerbatim("testReader") << "\n RtS map not found in the Event.";
+  } else
+    edm::LogVerbatim("testReader") << "\n RtS map not found in the Event.";
 
-  //SIMTORECO
-  edm::LogVerbatim("testReader") 
-    << "\n                      ****************** Sim To Reco ****************** ";
+  // SIMTORECO
+  edm::LogVerbatim("testReader") << "\n                      ****************** Sim To Reco "
+                                    "****************** ";
   if (simRecH.isValid()) {
+    edm::LogVerbatim("testReader") << "\n There are " << tPC.size() << " TrackingParticles "
+                                   << "(" << simRecColl.size() << " matched) \n";
+    bool any_trackingParticle_matched = false;
+
+    for (TrackingParticleCollection::size_type i = 0; i < tPC.size(); i++) {
+      TrackingParticleRef trpart(TPCollectionH, i);
+
+      std::vector<std::pair<edm::RefToBase<reco::Track>, double>> simRecAsso;
+
+      if (simRecColl.find(trpart) != simRecColl.end()) {
+        simRecAsso = (std::vector<std::pair<edm::RefToBase<reco::Track>, double>>)simRecColl[trpart];
+
+        for (std::vector<std::pair<edm::RefToBase<reco::Track>, double>>::const_iterator IT = simRecAsso.begin();
+             IT != simRecAsso.end();
+             ++IT) {
+          edm::RefToBase<reco::Track> track = IT->first;
+          double quality = IT->second;
+          any_trackingParticle_matched = true;
+
+          // find the purity from RecoToSim association (set purity = -1 for
+          // unmatched recoToSim)
+          double purity = -1.;
+          if (recSimColl.find(track) != recSimColl.end()) {
+            std::vector<std::pair<TrackingParticleRef, double>> recSimAsso = recSimColl[track];
+            for (std::vector<std::pair<TrackingParticleRef, double>>::const_iterator ITS = recSimAsso.begin();
+                 ITS != recSimAsso.end();
+                 ++ITS) {
+              TrackingParticleRef tp = ITS->first;
+              if (tp == trpart)
+                purity = ITS->second;
+            }
+          }
 
-  edm::LogVerbatim("testReader")
-    << "\n There are " << tPC.size() << " TrackingParticles "<<"("<<simRecColl.size()<<" matched) \n";
-  bool any_trackingParticle_matched = false;
- 
-  for (TrackingParticleCollection::size_type i=0; i<tPC.size(); i++) {
-    TrackingParticleRef trpart(TPCollectionH, i);
-    
-    std::vector<std::pair<edm::RefToBase<reco::Track>, double> > simRecAsso;
-    
-    if(simRecColl.find(trpart) != simRecColl.end()) { 
-      simRecAsso = (std::vector<std::pair<edm::RefToBase<reco::Track>, double> >) simRecColl[trpart];
-      
-      for (std::vector<std::pair<edm::RefToBase<reco::Track>, double> >::const_iterator IT = simRecAsso.begin(); 
-	   IT != simRecAsso.end(); ++IT) {
-	edm::RefToBase<reco::Track> track = IT->first;
-	double quality = IT->second;
-	any_trackingParticle_matched = true;
-	
-	// find the purity from RecoToSim association (set purity = -1 for unmatched recoToSim)
-	double purity = -1.;
-	if(recSimColl.find(track) != recSimColl.end()) {
-	  std::vector<std::pair<TrackingParticleRef, double> > recSimAsso = recSimColl[track];
-	  for (std::vector<std::pair<TrackingParticleRef, double> >::const_iterator ITS = recSimAsso.begin(); 
-	       ITS != recSimAsso.end(); ++ITS) {
-	    TrackingParticleRef tp = ITS->first;
-	    if (tp == trpart) purity = ITS->second;
-	  }
-	}
-	
-	edm::LogVerbatim("testReader") <<"TrackingParticle #" << int(i)<< " with pt = " << trpart->pt()
-				       << " associated to reco::Track #" <<track.key()
-				       << " (pt = " << track->pt() << ") with Quality = " << quality
-	                               << " and Purity = "<< purity;
+          edm::LogVerbatim("testReader") << "TrackingParticle #" << int(i) << " with pt = " << trpart->pt()
+                                         << " associated to reco::Track #" << track.key() << " (pt = " << track->pt()
+                                         << ") with Quality = " << quality << " and Purity = " << purity;
+        }
       }
+
+      //    else
+      //      {
+      //	LogTrace("testReader") << "TrackingParticle #" << int(i)<< "
+      // with pt = " << trpart->pt()
+      //			       << " NOT associated to any reco::Track" ;
+      //      }
     }
-    
-    //    else 
-    //      {
-    //	LogTrace("testReader") << "TrackingParticle #" << int(i)<< " with pt = " << trpart->pt() 
-    //			       << " NOT associated to any reco::Track" ;
-    //      }    
-  }
-  
-  if (!any_trackingParticle_matched) {
-    edm::LogVerbatim("testReader") << "NO TrackingParticle associated to ANY input reco::Track !" << "\n";
-  }
 
-  } else edm::LogVerbatim("testReader") <<"\n StR map not found in the Event.";
-  
+    if (!any_trackingParticle_matched) {
+      edm::LogVerbatim("testReader") << "NO TrackingParticle associated to ANY input reco::Track !"
+                                     << "\n";
+    }
+
+  } else
+    edm::LogVerbatim("testReader") << "\n StR map not found in the Event.";
 }
 #include "FWCore/Framework/interface/MakerMacros.h"
 DEFINE_FWK_MODULE(testReader);
-
-
diff --git a/SimMuon/MCTruth/test/testReader.h b/SimMuon/MCTruth/test/testReader.h
index ea077dbde2296..6d359a5596f2e 100644
--- a/SimMuon/MCTruth/test/testReader.h
+++ b/SimMuon/MCTruth/test/testReader.h
@@ -1,22 +1,21 @@
 #ifndef testReader_h
 #define testReader_h
 
-#include <memory>
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
+#include <memory>
 
 class testReader : public edm::EDAnalyzer {
-  
- public:
-  testReader(const edm::ParameterSet&);
+public:
+  testReader(const edm::ParameterSet &);
   ~testReader() override;
-  void beginJob() override {}  
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  
- private:
+  void beginJob() override {}
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+
+private:
   edm::InputTag tracksTag;
   edm::InputTag tpTag;
   edm::InputTag assoMapsTag;
diff --git a/SimMuon/Neutron/interface/SubsystemNeutronReader.h b/SimMuon/Neutron/interface/SubsystemNeutronReader.h
index c25d6454079de..b840ab35704a8 100644
--- a/SimMuon/Neutron/interface/SubsystemNeutronReader.h
+++ b/SimMuon/Neutron/interface/SubsystemNeutronReader.h
@@ -9,7 +9,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-#include<vector>
+#include <vector>
 
 class NeutronReader;
 
@@ -17,36 +17,31 @@ namespace CLHEP {
   class HepRandomEngine;
 }
 
-class SubsystemNeutronReader 
-{
-public:  
+class SubsystemNeutronReader {
+public:
   /// the hits will be distributed flat in time between startTime and endTime
   /// eventOccupancy is the expected chamber occupancy from a single
   /// min bias event for each chamber type
-  SubsystemNeutronReader(const edm::ParameterSet & pset);
+  SubsystemNeutronReader(const edm::ParameterSet& pset);
   virtual ~SubsystemNeutronReader();
 
   /// this class makes sure the same chamberIndex isn't called twice
   /// for an event
-  void generateChamberNoise(int chamberType, int chamberIndex, edm::PSimHitContainer & result,
-                            CLHEP::HepRandomEngine*);
+  void generateChamberNoise(int chamberType, int chamberIndex, edm::PSimHitContainer& result, CLHEP::HepRandomEngine*);
 
-  void clear() {theChambersDone.clear();}
+  void clear() { theChambersDone.clear(); }
 
 protected:
   /// detector-specific way to get the global detector
   /// ID, given the local one.
-  virtual int detId(int chamberIndex, int localDetId ) = 0;
-  
+  virtual int detId(int chamberIndex, int localDetId) = 0;
 
 private:
-
-  NeutronReader * theHitReader;
+  NeutronReader* theHitReader;
 
   /// just makes sure chambers aren't done twice
   std::vector<int> theChambersDone;
 
- 
   /// in units of 10**34, set by Muon:NeutronLuminosity
   float theLuminosity;
   float theStartTime;
@@ -54,9 +49,7 @@ class SubsystemNeutronReader
   /// how many collsions happened between theStartTime and theEndTime
   float theEventsInWindow;
 
-  std::vector<double> theEventOccupancy; // Placed here so ctor init list order OK
-
+  std::vector<double> theEventOccupancy;  // Placed here so ctor init list order OK
 };
 
 #endif
-
diff --git a/SimMuon/Neutron/interface/SubsystemNeutronWriter.h b/SimMuon/Neutron/interface/SubsystemNeutronWriter.h
index e0552a6ccd7f5..af4302641ea46 100644
--- a/SimMuon/Neutron/interface/SubsystemNeutronWriter.h
+++ b/SimMuon/Neutron/interface/SubsystemNeutronWriter.h
@@ -11,7 +11,7 @@
  * signal event to define something as a Neutron Event
  * with the configurable Muon:NeutronTimeCut
  */
- 
+
 #include <vector>
 #include <map>
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
@@ -25,10 +25,8 @@ namespace CLHEP {
 class NeutronWriter;
 
 /// doesn't have to be a producer.  Can act as an analyzer, too.
-class SubsystemNeutronWriter : public edm::stream::EDProducer<>
-{
+class SubsystemNeutronWriter : public edm::stream::EDProducer<> {
 public:
-
   explicit SubsystemNeutronWriter(edm::ParameterSet const& pset);
 
   /// destructor prints statistics on number of events written
@@ -36,7 +34,7 @@ class SubsystemNeutronWriter : public edm::stream::EDProducer<>
 
   void printStats();
 
-  void produce(edm::Event & e, edm::EventSetup const& c) override;
+  void produce(edm::Event& e, edm::EventSetup const& c) override;
 
   virtual int localDetId(int globalDetId) const = 0;
 
@@ -45,25 +43,24 @@ class SubsystemNeutronWriter : public edm::stream::EDProducer<>
   virtual int chamberId(int globalDetId) const = 0;
 
   /// decides whether this cluster is good enough to be included
-  virtual bool accept(const edm::PSimHitContainer & cluster) const = 0;
+  virtual bool accept(const edm::PSimHitContainer& cluster) const = 0;
 
   /// good practice to do once for each chamber type
   void initialize(int chamberType);
 
 protected:
+  virtual void writeHits(int chamberType, edm::PSimHitContainer& chamberHits, CLHEP::HepRandomEngine*);
 
-  virtual void writeHits(int chamberType, edm::PSimHitContainer & chamberHits, CLHEP::HepRandomEngine*);
-
-  void writeCluster(int chamberType, const edm::PSimHitContainer & cluster);
+  void writeCluster(int chamberType, const edm::PSimHitContainer& cluster);
 
   /// helper to add time offsets and local det ID
-  void adjust(PSimHit & h, float timeOffset, float smearing);
+  void adjust(PSimHit& h, float timeOffset, float smearing);
 
   /// updates the counter
   void updateCount(int chamberType);
 
 private:
-  NeutronWriter * theHitWriter;
+  NeutronWriter* theHitWriter;
   bool useRandFlat;
   edm::InputTag theInputTag;
   double theNeutronTimeCut;
@@ -77,4 +74,3 @@ class SubsystemNeutronWriter : public edm::stream::EDProducer<>
 };
 
 #endif
-
diff --git a/SimMuon/Neutron/plugins/EmptyHepMCProducer.cc b/SimMuon/Neutron/plugins/EmptyHepMCProducer.cc
index cefe653506a75..62269376f5811 100644
--- a/SimMuon/Neutron/plugins/EmptyHepMCProducer.cc
+++ b/SimMuon/Neutron/plugins/EmptyHepMCProducer.cc
@@ -28,28 +28,20 @@
 
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 
-
-class EmptyHepMCProducer : public edm::stream::EDProducer<>
-{
+class EmptyHepMCProducer : public edm::stream::EDProducer<> {
 public:
   explicit EmptyHepMCProducer(const edm::ParameterSet&);
-  ~EmptyHepMCProducer() override {};
+  ~EmptyHepMCProducer() override{};
 
 private:
   virtual void beginJob();
   void produce(edm::Event&, const edm::EventSetup&) override;
   virtual void endJob();
-
 };
 
-EmptyHepMCProducer::EmptyHepMCProducer(const edm::ParameterSet& iConfig)
-{
-  produces<edm::HepMCProduct>();
-}
+EmptyHepMCProducer::EmptyHepMCProducer(const edm::ParameterSet& iConfig) { produces<edm::HepMCProduct>(); }
 
-void
-EmptyHepMCProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void EmptyHepMCProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   // create an empty output collection
   std::unique_ptr<edm::HepMCProduct> theOutput(new edm::HepMCProduct());
   //theOutput->addHepMCData(theEvent);
diff --git a/SimMuon/Neutron/plugins/NeutronHitsCollector.cc b/SimMuon/Neutron/plugins/NeutronHitsCollector.cc
index 38dfe02b3717a..d2c6ac0dcf0d3 100644
--- a/SimMuon/Neutron/plugins/NeutronHitsCollector.cc
+++ b/SimMuon/Neutron/plugins/NeutronHitsCollector.cc
@@ -33,13 +33,10 @@
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
-
-
-class NeutronHitsCollector : public edm::stream::EDProducer<>
-{
+class NeutronHitsCollector : public edm::stream::EDProducer<> {
 public:
   explicit NeutronHitsCollector(const edm::ParameterSet&);
-  ~NeutronHitsCollector() override {};
+  ~NeutronHitsCollector() override{};
 
 private:
   virtual void beginJob();
@@ -51,13 +48,10 @@ class NeutronHitsCollector : public edm::stream::EDProducer<>
   std::string neutron_label_rpc;
 };
 
-
-
-NeutronHitsCollector::NeutronHitsCollector(const edm::ParameterSet& iConfig)
-{
-  neutron_label_csc = iConfig.getUntrackedParameter<std::string>("neutronLabelCSC","");
-  neutron_label_dt  = iConfig.getUntrackedParameter<std::string>("neutronLabelDT","");
-  neutron_label_rpc = iConfig.getUntrackedParameter<std::string>("neutronLabelRPC","");
+NeutronHitsCollector::NeutronHitsCollector(const edm::ParameterSet& iConfig) {
+  neutron_label_csc = iConfig.getUntrackedParameter<std::string>("neutronLabelCSC", "");
+  neutron_label_dt = iConfig.getUntrackedParameter<std::string>("neutronLabelDT", "");
+  neutron_label_rpc = iConfig.getUntrackedParameter<std::string>("neutronLabelRPC", "");
 
   // The following list duplicates
   // http://cmslxr.fnal.gov/lxr/source/SimG4Core/Application/plugins/OscarProducer.cc
@@ -103,44 +97,41 @@ NeutronHitsCollector::NeutronHitsCollector(const edm::ParameterSet& iConfig)
   //produces<edm::PCaloHitContainer>("ChamberHits");
   //produces<edm::PCaloHitContainer>("FibreHits");
   //produces<edm::PCaloHitContainer>("WedgeHits");
-
 }
 
-
-void NeutronHitsCollector::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void NeutronHitsCollector::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   edm::PSimHitContainer::const_iterator hit;
 
   // ----- MuonCSCHits -----
   //
   std::unique_ptr<edm::PSimHitContainer> simCSC(new edm::PSimHitContainer);
-  if (neutron_label_csc.length()>0)
-  {
+  if (neutron_label_csc.length() > 0) {
     edm::Handle<edm::PSimHitContainer> MuonCSCHits;
-    iEvent.getByLabel(neutron_label_csc,MuonCSCHits);
-    for (hit = MuonCSCHits->begin();  hit != MuonCSCHits->end();  ++hit) simCSC->push_back(*hit);
+    iEvent.getByLabel(neutron_label_csc, MuonCSCHits);
+    for (hit = MuonCSCHits->begin(); hit != MuonCSCHits->end(); ++hit)
+      simCSC->push_back(*hit);
   }
   iEvent.put(std::move(simCSC), "MuonCSCHits");
 
   // ----- MuonDTHits -----
   //
   std::unique_ptr<edm::PSimHitContainer> simDT(new edm::PSimHitContainer);
-  if (neutron_label_dt.length()>0)
-  {
+  if (neutron_label_dt.length() > 0) {
     edm::Handle<edm::PSimHitContainer> MuonDTHits;
-    iEvent.getByLabel(neutron_label_dt,MuonDTHits);
-    for (hit = MuonDTHits->begin();  hit != MuonDTHits->end();  ++hit) simDT->push_back(*hit);
+    iEvent.getByLabel(neutron_label_dt, MuonDTHits);
+    for (hit = MuonDTHits->begin(); hit != MuonDTHits->end(); ++hit)
+      simDT->push_back(*hit);
   }
   iEvent.put(std::move(simDT), "MuonDTHits");
 
   // ----- MuonRPCHits -----
   //
   std::unique_ptr<edm::PSimHitContainer> simRPC(new edm::PSimHitContainer);
-  if (neutron_label_rpc.length()>0)
-  {
+  if (neutron_label_rpc.length() > 0) {
     edm::Handle<edm::PSimHitContainer> MuonRPCHits;
-    iEvent.getByLabel(neutron_label_rpc,MuonRPCHits);
-    for (hit = MuonRPCHits->begin();  hit != MuonRPCHits->end();  ++hit) simRPC->push_back(*hit);
+    iEvent.getByLabel(neutron_label_rpc, MuonRPCHits);
+    for (hit = MuonRPCHits->begin(); hit != MuonRPCHits->end(); ++hit)
+      simRPC->push_back(*hit);
   }
   iEvent.put(std::move(simRPC), "MuonRPCHits");
 
@@ -225,16 +216,11 @@ void NeutronHitsCollector::produce(edm::Event& iEvent, const edm::EventSetup& iS
   iEvent.put(std::move(simTr));
   std::unique_ptr<edm::SimVertexContainer> simVe(new edm::SimVertexContainer);
   iEvent.put(std::move(simVe));
-
-
 }
 
-
 void NeutronHitsCollector::beginJob() {}
 
-
 void NeutronHitsCollector::endJob() {}
 
-
 //define this as a plug-in
 DEFINE_FWK_MODULE(NeutronHitsCollector);
diff --git a/SimMuon/Neutron/src/AsciiNeutronReader.cc b/SimMuon/Neutron/src/AsciiNeutronReader.cc
index f176cd592afef..ed27add9ec7d2 100644
--- a/SimMuon/Neutron/src/AsciiNeutronReader.cc
+++ b/SimMuon/Neutron/src/AsciiNeutronReader.cc
@@ -3,56 +3,49 @@
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
 #include <sstream>
-#include<iostream>
+#include <iostream>
 
 using namespace std;
 
-AsciiNeutronReader::AsciiNeutronReader(string fileNameBase) :
-  theFileNameBase(fileNameBase),
-  //theStreamPos(nChamberTypes+1, 0) //TODO WON"T WORK!  replace with a map 
-  theStreamPos(11,0)
-{
-}
-
+AsciiNeutronReader::AsciiNeutronReader(string fileNameBase)
+    : theFileNameBase(fileNameBase),
+      //theStreamPos(nChamberTypes+1, 0) //TODO WON"T WORK!  replace with a map
+      theStreamPos(11, 0) {}
 
-void AsciiNeutronReader::readNextEvent(int chamberType, edm::PSimHitContainer & result) {
+void AsciiNeutronReader::readNextEvent(int chamberType, edm::PSimHitContainer& result) {
   stringstream fileName;
   fileName << theFileNameBase << chamberType;
   ifstream fin(fileName.str().c_str(), ios::in);
-  if(!fin.is_open()) {
-    throw cms::Exception("NeutronReader") 
-      << "Muon neutron noise file missing " << fileName.str();
+  if (!fin.is_open()) {
+    throw cms::Exception("NeutronReader") << "Muon neutron noise file missing " << fileName.str();
   }
 
   int nhits = read_nhits(fin, chamberType);
-  for(int ihit = 0; ihit < nhits; ++ihit) {
+  for (int ihit = 0; ihit < nhits; ++ihit) {
     float entryX, entryY, entryZ, exitX, exitY, exitZ;
     float p, tof, eloss, theta, phi;
     int type, layer, track;
 
-    fin >> entryX >> entryY >> entryZ
-        >> exitX  >> exitY  >> exitZ
-        >> p >> tof >> eloss >> type >> layer >> track >> theta >> phi;
+    fin >> entryX >> entryY >> entryZ >> exitX >> exitY >> exitZ >> p >> tof >> eloss >> type >> layer >> track >>
+        theta >> phi;
     LocalPoint entry(entryX, entryY, entryZ);
-    LocalPoint exit (exitX,  exitY,  exitZ);
+    LocalPoint exit(exitX, exitY, exitZ);
     PSimHit phit(entry, exit, p, tof, eloss, type, layer, track, theta, phi);
     result.push_back(phit);
   }
   theStreamPos[chamberType] = fin.tellg();
 }
 
-
-int AsciiNeutronReader::read_nhits(ifstream & fin, int chamberType) {
+int AsciiNeutronReader::read_nhits(ifstream& fin, int chamberType) {
   int nhits = 0;
-    // go to the last saved place
+  // go to the last saved place
   fin.seekg(theStreamPos[chamberType]);
-  if(fin.eof()) {
+  if (fin.eof()) {
     resetStreampos(fin, chamberType);
   }
-  LogDebug("NeutronReader") << "starting from pos " << theStreamPos[chamberType] 
-                  << " EOF " << fin.eof();
+  LogDebug("NeutronReader") << "starting from pos " << theStreamPos[chamberType] << " EOF " << fin.eof();
   fin >> nhits;
-  if(fin.eof()) {
+  if (fin.eof()) {
     resetStreampos(fin, chamberType);
     fin >> nhits;
   }
@@ -60,11 +53,9 @@ int AsciiNeutronReader::read_nhits(ifstream & fin, int chamberType) {
   return nhits;
 }
 
-
-void AsciiNeutronReader::resetStreampos(ifstream & fin, int chamberType) {
+void AsciiNeutronReader::resetStreampos(ifstream& fin, int chamberType) {
   LogDebug("NeutronReader") << "reached EOF, resetting streampos ";
   theStreamPos[chamberType] = 0;
   fin.clear();
   fin.seekg(0, ios::beg);
 }
-
diff --git a/SimMuon/Neutron/src/AsciiNeutronReader.h b/SimMuon/Neutron/src/AsciiNeutronReader.h
old mode 100755
new mode 100644
index f093e4473a0b1..52525c04633a4
--- a/SimMuon/Neutron/src/AsciiNeutronReader.h
+++ b/SimMuon/Neutron/src/AsciiNeutronReader.h
@@ -14,21 +14,18 @@
  * back to the beginning when it reaches EOF
  */
 
-class AsciiNeutronReader : public NeutronReader
-{
+class AsciiNeutronReader : public NeutronReader {
 public:
   AsciiNeutronReader(std::string fileNameBase);
 
-  void  readNextEvent(int chamberType, edm::PSimHitContainer & result) override;
+  void readNextEvent(int chamberType, edm::PSimHitContainer& result) override;
 
 private:
-
-  int read_nhits(std::ifstream & fin, int chamberType);
-  void resetStreampos(std::ifstream & fin, int chamberType);
+  int read_nhits(std::ifstream& fin, int chamberType);
+  void resetStreampos(std::ifstream& fin, int chamberType);
 
   std::string theFileNameBase;
   std::vector<std::streampos> theStreamPos;
 };
 
 #endif
-
diff --git a/SimMuon/Neutron/src/AsciiNeutronWriter.cc b/SimMuon/Neutron/src/AsciiNeutronWriter.cc
index 461184ccc68d7..8be81758783ca 100644
--- a/SimMuon/Neutron/src/AsciiNeutronWriter.cc
+++ b/SimMuon/Neutron/src/AsciiNeutronWriter.cc
@@ -5,17 +5,11 @@
 
 using namespace std;
 
-AsciiNeutronWriter::AsciiNeutronWriter(string fileNameBase) :
-  theFileNameBase(fileNameBase)  {
-}
-
+AsciiNeutronWriter::AsciiNeutronWriter(string fileNameBase) : theFileNameBase(fileNameBase) {}
 
-AsciiNeutronWriter::~AsciiNeutronWriter() {
-}
+AsciiNeutronWriter::~AsciiNeutronWriter() {}
 
-
-void AsciiNeutronWriter::writeCluster(int chamberType, const edm::PSimHitContainer & hits) 
-{
+void AsciiNeutronWriter::writeCluster(int chamberType, const edm::PSimHitContainer& hits) {
   // open the correct file
   stringstream s;
   s << theFileNameBase << chamberType;
@@ -23,15 +17,11 @@ void AsciiNeutronWriter::writeCluster(int chamberType, const edm::PSimHitContain
   ofstream os;
   os.open(s.str().c_str(), ofstream::app);
   os << hits.size() << endl;
-  for(size_t i = 0; i < hits.size(); ++i) {
+  for (size_t i = 0; i < hits.size(); ++i) {
     PSimHit h = hits[i];
-    os << h.entryPoint().x() << " " << h.entryPoint().y() << " " 
-       << h.entryPoint().z() << " " << h.exitPoint().x() << " " 
-       << h.exitPoint().y() << " " << h.exitPoint().z() << " "
-       << h.pabs() << " " << " " << h.timeOfFlight() << " " 
-       << h.energyLoss() << " " <<h.particleType() << " " 
-       << h.detUnitId() << " " << h.trackId() << " " 
-       << h.momentumAtEntry().theta() << " " << h.momentumAtEntry().phi() << endl;
+    os << h.entryPoint().x() << " " << h.entryPoint().y() << " " << h.entryPoint().z() << " " << h.exitPoint().x()
+       << " " << h.exitPoint().y() << " " << h.exitPoint().z() << " " << h.pabs() << " "
+       << " " << h.timeOfFlight() << " " << h.energyLoss() << " " << h.particleType() << " " << h.detUnitId() << " "
+       << h.trackId() << " " << h.momentumAtEntry().theta() << " " << h.momentumAtEntry().phi() << endl;
   }
 }
-
diff --git a/SimMuon/Neutron/src/AsciiNeutronWriter.h b/SimMuon/Neutron/src/AsciiNeutronWriter.h
old mode 100755
new mode 100644
index 2658eeba90657..5f416dc652216
--- a/SimMuon/Neutron/src/AsciiNeutronWriter.h
+++ b/SimMuon/Neutron/src/AsciiNeutronWriter.h
@@ -8,19 +8,16 @@
  *   hits to a muon chamber
  */
 
-
-class AsciiNeutronWriter : public NeutronWriter
-{
+class AsciiNeutronWriter : public NeutronWriter {
 public:
   AsciiNeutronWriter(std::string fileNameBase);
   ~AsciiNeutronWriter() override;
 
 protected:
-  void writeCluster(int chamberType, const edm::PSimHitContainer & hits) override;
+  void writeCluster(int chamberType, const edm::PSimHitContainer& hits) override;
 
 private:
   std::string theFileNameBase;
 };
 
 #endif
-
diff --git a/SimMuon/Neutron/src/EDMNeutronWriter.cc b/SimMuon/Neutron/src/EDMNeutronWriter.cc
index b7845b3a0ecf0..18788f717e25f 100644
--- a/SimMuon/Neutron/src/EDMNeutronWriter.cc
+++ b/SimMuon/Neutron/src/EDMNeutronWriter.cc
@@ -1,31 +1,17 @@
 #include "SimMuon/Neutron/src/EDMNeutronWriter.h"
 #include "FWCore/Framework/interface/Event.h"
 
-EDMNeutronWriter::EDMNeutronWriter()
-: theEvent(nullptr),
-  theHits(nullptr)
-{
-}
-
+EDMNeutronWriter::EDMNeutronWriter() : theEvent(nullptr), theHits(nullptr) {}
 
 EDMNeutronWriter::~EDMNeutronWriter() {}
 
-
-void EDMNeutronWriter::writeCluster(int detType, const edm::PSimHitContainer & simHits)
-{
+void EDMNeutronWriter::writeCluster(int detType, const edm::PSimHitContainer& simHits) {
   theHits->insert(theHits->end(), simHits.begin(), simHits.end());
 }
 
-
-void EDMNeutronWriter::beginEvent(edm::Event & e, const edm::EventSetup & es)
-{
+void EDMNeutronWriter::beginEvent(edm::Event& e, const edm::EventSetup& es) {
   theEvent = &e;
   theHits = std::unique_ptr<edm::PSimHitContainer>(new edm::PSimHitContainer());
 }
 
-void EDMNeutronWriter::endEvent()
-{
-  theEvent->put(std::move(theHits));
-}
-
-
+void EDMNeutronWriter::endEvent() { theEvent->put(std::move(theHits)); }
diff --git a/SimMuon/Neutron/src/EDMNeutronWriter.h b/SimMuon/Neutron/src/EDMNeutronWriter.h
index afcc78cb3c6e2..8c309f738a5e6 100644
--- a/SimMuon/Neutron/src/EDMNeutronWriter.h
+++ b/SimMuon/Neutron/src/EDMNeutronWriter.h
@@ -6,21 +6,20 @@
 
 #include "SimMuon/Neutron/src/NeutronWriter.h"
 
-class EDMNeutronWriter: public NeutronWriter {
+class EDMNeutronWriter : public NeutronWriter {
 public:
   EDMNeutronWriter();
   ~EDMNeutronWriter() override;
 
-  ///  writes out a list of SimHits. 
-  void writeCluster(int detType, const edm::PSimHitContainer & simHits) override;
-  void beginEvent(edm::Event & e, const edm::EventSetup & es) override;
+  ///  writes out a list of SimHits.
+  void writeCluster(int detType, const edm::PSimHitContainer& simHits) override;
+  void beginEvent(edm::Event& e, const edm::EventSetup& es) override;
   void endEvent() override;
   void initialize(int detType) override {}
 
 private:
-  edm::Event * theEvent;
+  edm::Event* theEvent;
   std::unique_ptr<edm::PSimHitContainer> theHits;
 };
 
 #endif
-
diff --git a/SimMuon/Neutron/src/NeutronReader.h b/SimMuon/Neutron/src/NeutronReader.h
index 1fd5f01c04c38..040c0bf774795 100644
--- a/SimMuon/Neutron/src/NeutronReader.h
+++ b/SimMuon/Neutron/src/NeutronReader.h
@@ -6,16 +6,14 @@
  */
 
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include<vector>
+#include <vector>
 
-class NeutronReader
-{
-public:  
-  NeutronReader() {};
-  virtual ~NeutronReader() {};
+class NeutronReader {
+public:
+  NeutronReader(){};
+  virtual ~NeutronReader(){};
 
-  virtual void readNextEvent(int chamberType, edm::PSimHitContainer & result) = 0;
+  virtual void readNextEvent(int chamberType, edm::PSimHitContainer& result) = 0;
 };
 
 #endif
-
diff --git a/SimMuon/Neutron/src/NeutronWriter.h b/SimMuon/Neutron/src/NeutronWriter.h
index 8f67d941e0911..bbd5734ccee01 100644
--- a/SimMuon/Neutron/src/NeutronWriter.h
+++ b/SimMuon/Neutron/src/NeutronWriter.h
@@ -8,20 +8,18 @@
  * int muon chambers.
  *
  */
- 
+
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 
 class NeutronWriter {
 public:
-  ///  writes out a list of SimHits. 
-  virtual void writeCluster(int detType, const edm::PSimHitContainer & simHits) = 0;
+  ///  writes out a list of SimHits.
+  virtual void writeCluster(int detType, const edm::PSimHitContainer& simHits) = 0;
   virtual void initialize(int detType) {}
-  virtual void beginEvent(edm::Event & e, const edm::EventSetup & es) {}
+  virtual void beginEvent(edm::Event& e, const edm::EventSetup& es) {}
   virtual void endEvent() {}
   virtual ~NeutronWriter() {}
-
 };
 
 #endif
-
diff --git a/SimMuon/Neutron/src/RootChamberReader.cc b/SimMuon/Neutron/src/RootChamberReader.cc
index 885c0c702b05a..81a2502d4d6ad 100644
--- a/SimMuon/Neutron/src/RootChamberReader.cc
+++ b/SimMuon/Neutron/src/RootChamberReader.cc
@@ -4,55 +4,38 @@
 #include "TClonesArray.h"
 using namespace std;
 
-RootChamberReader::RootChamberReader()
-: theTree(nullptr),
-  theHits(nullptr),
-  thePosition(0),
-  theSize(0)
-{
-}
-
-
-RootChamberReader::RootChamberReader(TFile * file, const std::string & treeName)
-: theTree( (TTree *) file->Get(treeName.c_str()) ),
-  theHits(new TClonesArray("RootSimHit")),
-  thePosition(-1),
-  theSize(0)
-{
-  if(theTree != nullptr) 
-  {
+RootChamberReader::RootChamberReader() : theTree(nullptr), theHits(nullptr), thePosition(0), theSize(0) {}
+
+RootChamberReader::RootChamberReader(TFile *file, const std::string &treeName)
+    : theTree((TTree *)file->Get(treeName.c_str())),
+      theHits(new TClonesArray("RootSimHit")),
+      thePosition(-1),
+      theSize(0) {
+  if (theTree != nullptr) {
     theTree->SetBranchAddress("Hits", &theHits);
     theSize = theTree->GetEntries();
   }
 }
 
-
-RootChamberReader::~RootChamberReader()
-{
-//  delete theHits;
-//  delete theTree;
+RootChamberReader::~RootChamberReader() {
+  //  delete theHits;
+  //  delete theTree;
 }
 
-
-void RootChamberReader::read(edm::PSimHitContainer & hits)
-{
+void RootChamberReader::read(edm::PSimHitContainer &hits) {
   // if there's no tree, make no events
-  if(theTree != nullptr && theSize != 0)
-  {
+  if (theTree != nullptr && theSize != 0) {
     ++thePosition;
     // start again from the beginning, if needed
-    if(thePosition >= theSize) thePosition = 0;
+    if (thePosition >= theSize)
+      thePosition = 0;
     theTree->GetEntry(thePosition);
 
     TIter next(theHits);
-    RootSimHit * rootHit;
-    while( (rootHit = (RootSimHit *) next()) )
-    {
+    RootSimHit *rootHit;
+    while ((rootHit = (RootSimHit *)next())) {
       hits.push_back(rootHit->get());
     }
-    LogTrace("Neutrons") << "Event " << thePosition << " OF " << theSize 
-         << " has " << hits.size() << " hits ";
+    LogTrace("Neutrons") << "Event " << thePosition << " OF " << theSize << " has " << hits.size() << " hits ";
   }
 }
-
-
diff --git a/SimMuon/Neutron/src/RootChamberReader.h b/SimMuon/Neutron/src/RootChamberReader.h
index 175fed5f5186b..b93ca281daf3d 100644
--- a/SimMuon/Neutron/src/RootChamberReader.h
+++ b/SimMuon/Neutron/src/RootChamberReader.h
@@ -5,23 +5,21 @@
 #include <TTree.h>
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-class RootChamberReader
-{
+class RootChamberReader {
 public:
   /// default ctor, for STL
   RootChamberReader();
-  RootChamberReader(TFile * file, const std::string & treeName);
+  RootChamberReader(TFile* file, const std::string& treeName);
   /// writes the tree, and deletes everything
   ~RootChamberReader();
 
-  void read(edm::PSimHitContainer & hits);
+  void read(edm::PSimHitContainer& hits);
 
 private:
-  TTree * theTree;
-  TClonesArray * theHits;
+  TTree* theTree;
+  TClonesArray* theHits;
   int thePosition;
   int theSize;
 };
 
 #endif
-
diff --git a/SimMuon/Neutron/src/RootChamberWriter.cc b/SimMuon/Neutron/src/RootChamberWriter.cc
index c42a2f150f4b1..663204a5e6c07 100644
--- a/SimMuon/Neutron/src/RootChamberWriter.cc
+++ b/SimMuon/Neutron/src/RootChamberWriter.cc
@@ -4,34 +4,26 @@
 #include <iostream>
 using namespace std;
 
-
-RootChamberWriter::RootChamberWriter(const std::string & treeName)
-{
+RootChamberWriter::RootChamberWriter(const std::string& treeName) {
   theHits = new TClonesArray("RootSimHit");
   theTree = new TTree(treeName.c_str(), "Neutron Background");
   theTree->Bronch("Hits", "TClonesArray", &theHits);
 }
 
-
-RootChamberWriter::~RootChamberWriter()
-{
-//std::cout << "WRITING " << theTree->GetEntries() << std::endl;
-//  theTree->Write();
+RootChamberWriter::~RootChamberWriter() {
+  //std::cout << "WRITING " << theTree->GetEntries() << std::endl;
+  //  theTree->Write();
   //delete theHits;
   //delete theTree;
 }
 
-
-void RootChamberWriter::write(const edm::PSimHitContainer & hits)
-{
-std::cout << "ENTRIES BEFORE " << theTree->GetEntries() << std::endl;
+void RootChamberWriter::write(const edm::PSimHitContainer& hits) {
+  std::cout << "ENTRIES BEFORE " << theTree->GetEntries() << std::endl;
   theHits->Delete();
   theHits->Expand(hits.size());
-  for(unsigned int i = 0; i < hits.size(); ++i)
-  {
-    new((*theHits)[i]) RootSimHit(hits[i]);
+  for (unsigned int i = 0; i < hits.size(); ++i) {
+    new ((*theHits)[i]) RootSimHit(hits[i]);
   }
   theTree->Fill();
-std::cout << "ENTRIES AFTER " << theTree->GetEntries() << std::endl;
+  std::cout << "ENTRIES AFTER " << theTree->GetEntries() << std::endl;
 }
-
diff --git a/SimMuon/Neutron/src/RootChamberWriter.h b/SimMuon/Neutron/src/RootChamberWriter.h
index 7a1d54fe2c364..3fa4cb54ecf69 100644
--- a/SimMuon/Neutron/src/RootChamberWriter.h
+++ b/SimMuon/Neutron/src/RootChamberWriter.h
@@ -5,24 +5,22 @@
 #include <TClonesArray.h>
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-class RootChamberWriter
-{
+class RootChamberWriter {
 public:
   /// default ctor, for STL
   RootChamberWriter() : theTree(nullptr), theHits(nullptr) {}
-  RootChamberWriter(const std::string & treeName);
+  RootChamberWriter(const std::string& treeName);
 
   /// writes the tree, and deletes everything
   ~RootChamberWriter();
 
-  void write(const edm::PSimHitContainer & hits);
+  void write(const edm::PSimHitContainer& hits);
 
-  TTree * tree() {return theTree;}
+  TTree* tree() { return theTree; }
 
 private:
-  TTree * theTree;
-  TClonesArray * theHits;
+  TTree* theTree;
+  TClonesArray* theHits;
 };
 
 #endif
-
diff --git a/SimMuon/Neutron/src/RootNeutronReader.cc b/SimMuon/Neutron/src/RootNeutronReader.cc
index 04b302b7de11d..74d8cb571d4a5 100644
--- a/SimMuon/Neutron/src/RootNeutronReader.cc
+++ b/SimMuon/Neutron/src/RootNeutronReader.cc
@@ -1,23 +1,14 @@
 #include "SimMuon/Neutron/src/RootNeutronReader.h"
 #include <sstream>
 
-RootNeutronReader::RootNeutronReader(const std::string & fileName)
-: theFile(new TFile(fileName.c_str()))
-{
-}
-
+RootNeutronReader::RootNeutronReader(const std::string& fileName) : theFile(new TFile(fileName.c_str())) {}
 
-RootChamberReader & RootNeutronReader::chamberReader(int chamberType)
-{
-  std::map<int, RootChamberReader>::iterator mapItr
-    = theChamberReaders.find(chamberType);
+RootChamberReader& RootNeutronReader::chamberReader(int chamberType) {
+  std::map<int, RootChamberReader>::iterator mapItr = theChamberReaders.find(chamberType);
 
-  if(mapItr != theChamberReaders.end())
-  {
+  if (mapItr != theChamberReaders.end()) {
     return mapItr->second;
-  }
-  else
-  {
+  } else {
     // make a new one
     std::ostringstream treeName;
     treeName << "ChamberType" << chamberType;
@@ -26,10 +17,6 @@ RootChamberReader & RootNeutronReader::chamberReader(int chamberType)
   }
 }
 
-
-void RootNeutronReader::readNextEvent(int chamberType, edm::PSimHitContainer & result)
-{
-   chamberReader(chamberType).read(result);
+void RootNeutronReader::readNextEvent(int chamberType, edm::PSimHitContainer& result) {
+  chamberReader(chamberType).read(result);
 }
-
-
diff --git a/SimMuon/Neutron/src/RootNeutronReader.h b/SimMuon/Neutron/src/RootNeutronReader.h
index fccd10862c821..2ed2f9e50148b 100644
--- a/SimMuon/Neutron/src/RootNeutronReader.h
+++ b/SimMuon/Neutron/src/RootNeutronReader.h
@@ -12,19 +12,17 @@
  * back to the beginning when it reaches EOF
  */
 
-class RootNeutronReader : public NeutronReader
-{
+class RootNeutronReader : public NeutronReader {
 public:
-  RootNeutronReader(const std::string & fileName);
+  RootNeutronReader(const std::string& fileName);
 
-  void readNextEvent(int chamberType, edm::PSimHitContainer & result) override;
+  void readNextEvent(int chamberType, edm::PSimHitContainer& result) override;
 
-  RootChamberReader & chamberReader(int chamberType);
+  RootChamberReader& chamberReader(int chamberType);
 
 private:
-  TFile * theFile;
+  TFile* theFile;
   std::map<int, RootChamberReader> theChamberReaders;
 };
 
 #endif
-
diff --git a/SimMuon/Neutron/src/RootNeutronWriter.cc b/SimMuon/Neutron/src/RootNeutronWriter.cc
index 32d29857188b3..019bf0197ab55 100644
--- a/SimMuon/Neutron/src/RootNeutronWriter.cc
+++ b/SimMuon/Neutron/src/RootNeutronWriter.cc
@@ -3,55 +3,40 @@
 
 using namespace std;
 #include <iostream>
-RootNeutronWriter::RootNeutronWriter(const string & fileName) 
-{
-  theFile = new TFile(fileName.c_str(),"update");
-}
-
+RootNeutronWriter::RootNeutronWriter(const string& fileName) { theFile = new TFile(fileName.c_str(), "update"); }
 
-RootNeutronWriter::~RootNeutronWriter() 
-{
-  for(std::map<int, RootChamberWriter>::iterator mapItr = theChamberWriters.begin();
-      mapItr != theChamberWriters.end(); ++mapItr)
-  {
+RootNeutronWriter::~RootNeutronWriter() {
+  for (std::map<int, RootChamberWriter>::iterator mapItr = theChamberWriters.begin(); mapItr != theChamberWriters.end();
+       ++mapItr) {
     mapItr->second.tree()->Print();
     // the tree will remember which file it's from
     theFile = mapItr->second.tree()->GetCurrentFile();
   }
   theFile->Write();
-//  theFile->Close();
+  //  theFile->Close();
 }
 
-
-void RootNeutronWriter::initialize(int chamberType)
-{
-    ostringstream treeName;
-    treeName << "ChamberType" << chamberType;
-    theChamberWriters[chamberType] = RootChamberWriter(treeName.str());
+void RootNeutronWriter::initialize(int chamberType) {
+  ostringstream treeName;
+  treeName << "ChamberType" << chamberType;
+  theChamberWriters[chamberType] = RootChamberWriter(treeName.str());
 }
 
-RootChamberWriter & RootNeutronWriter::chamberWriter(int chamberType)
-{
+RootChamberWriter& RootNeutronWriter::chamberWriter(int chamberType) {
   std::map<int, RootChamberWriter>::iterator mapItr = theChamberWriters.find(chamberType);
-  if(mapItr != theChamberWriters.end())
-  {
+  if (mapItr != theChamberWriters.end()) {
     return mapItr->second;
-  }
-  else
-  {
+  } else {
     throw cms::Exception("NeutronWriter") << "It's dangerous to create ROOT chamber "
-      << "writers during processing.  The global file may change";
-      
+                                          << "writers during processing.  The global file may change";
+
     // make a new one
     initialize(chamberType);
     return theChamberWriters[chamberType];
   }
 }
 
-
-void RootNeutronWriter::writeCluster(int chamberType, const edm::PSimHitContainer & hits) 
-{
-std::cout << "ROOTNEUTRONWRITER " << chamberType << " HITS SIZE " << hits.size() <<std::endl;
+void RootNeutronWriter::writeCluster(int chamberType, const edm::PSimHitContainer& hits) {
+  std::cout << "ROOTNEUTRONWRITER " << chamberType << " HITS SIZE " << hits.size() << std::endl;
   chamberWriter(chamberType).write(hits);
 }
-
diff --git a/SimMuon/Neutron/src/RootNeutronWriter.h b/SimMuon/Neutron/src/RootNeutronWriter.h
index 5e031286f4c5a..ce23da502f408 100644
--- a/SimMuon/Neutron/src/RootNeutronWriter.h
+++ b/SimMuon/Neutron/src/RootNeutronWriter.h
@@ -10,25 +10,22 @@
  *   hits to a muon chamber
  */
 
-
-class RootNeutronWriter : public NeutronWriter
-{
+class RootNeutronWriter : public NeutronWriter {
 public:
-  RootNeutronWriter(const std::string & fileName);
+  RootNeutronWriter(const std::string& fileName);
   ~RootNeutronWriter() override;
 
   /// users should use this to create chamberwriters
   /// for each chamber type just after creation
   void initialize(int detType) override;
 
-  RootChamberWriter & chamberWriter(int chamberType);
+  RootChamberWriter& chamberWriter(int chamberType);
 
-  void writeCluster(int chamberType, const edm::PSimHitContainer & hits) override;
+  void writeCluster(int chamberType, const edm::PSimHitContainer& hits) override;
 
 private:
   std::map<int, RootChamberWriter> theChamberWriters;
-  TFile * theFile;
+  TFile* theFile;
 };
 
 #endif
-
diff --git a/SimMuon/Neutron/src/RootSimHit.cc b/SimMuon/Neutron/src/RootSimHit.cc
index 844a434c4bc23..40d75ebe03086 100644
--- a/SimMuon/Neutron/src/RootSimHit.cc
+++ b/SimMuon/Neutron/src/RootSimHit.cc
@@ -1,32 +1,33 @@
 #include "SimMuon/Neutron/src/RootSimHit.h"
 ClassImp(RootSimHit);
 
+RootSimHit::RootSimHit(const PSimHit& hit)
+    : theEntryX(hit.entryPoint().x()),
+      theEntryY(hit.entryPoint().y()),
+      theEntryZ(hit.entryPoint().z()),
+      theExitX(hit.exitPoint().x()),
+      theExitY(hit.exitPoint().y()),
+      theExitZ(hit.exitPoint().z()),
+      thePabs(hit.pabs()),
+      theEnergyLoss(hit.energyLoss()),
+      theThetaAtEntry(hit.thetaAtEntry()),
+      thePhiAtEntry(hit.phiAtEntry()),
+      theTof(hit.tof()),
+      theParticleType(hit.particleType()),
+      theProcessType(hit.processType()),
+      theDetUnitId(hit.detUnitId()),
+      theTrackId(hit.trackId()) {}
 
-RootSimHit::RootSimHit(const PSimHit & hit)
-: theEntryX(hit.entryPoint().x()),
-  theEntryY(hit.entryPoint().y()),
-  theEntryZ(hit.entryPoint().z()),
-  theExitX(hit.exitPoint().x()),
-  theExitY(hit.exitPoint().y()),
-  theExitZ(hit.exitPoint().z()),
-  thePabs(hit.pabs()),
-  theEnergyLoss(hit.energyLoss()),
-  theThetaAtEntry(hit.thetaAtEntry()), thePhiAtEntry(hit.phiAtEntry()),
-  theTof(hit.tof()),
-  theParticleType(hit.particleType()), theProcessType(hit.processType()),
-  theDetUnitId( hit.detUnitId()), theTrackId( hit.trackId())
-{
+PSimHit RootSimHit::get() const {
+  return PSimHit(Local3DPoint(theEntryX, theEntryY, theEntryZ),
+                 Local3DPoint(theExitX, theExitY, theExitZ),
+                 thePabs,
+                 theTof,
+                 theEnergyLoss,
+                 theParticleType,
+                 theDetUnitId,
+                 theTrackId,
+                 theThetaAtEntry,
+                 thePhiAtEntry,
+                 theProcessType);
 }
-
-
-PSimHit RootSimHit::get() const
-{
- return PSimHit(Local3DPoint(theEntryX, theEntryY, theEntryZ),
-                Local3DPoint(theExitX, theExitY, theExitZ),
-                thePabs, theTof,
-                theEnergyLoss, theParticleType, theDetUnitId, theTrackId,
-                theThetaAtEntry,  thePhiAtEntry, theProcessType);
-}
-
-
-
diff --git a/SimMuon/Neutron/src/RootSimHit.h b/SimMuon/Neutron/src/RootSimHit.h
index 4242db289cf7b..d838d81283e6d 100644
--- a/SimMuon/Neutron/src/RootSimHit.h
+++ b/SimMuon/Neutron/src/RootSimHit.h
@@ -4,37 +4,36 @@
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include <TObject.h>
 
-class RootSimHit : public TObject
-{
+class RootSimHit : public TObject {
 public:
   RootSimHit() {}
-  RootSimHit(const PSimHit & hit);
+  RootSimHit(const PSimHit& hit);
   PSimHit get() const;
+
 private:
   // properties
-//  Local3DPoint    theEntryPoint;    // position at entry
-//  Local3DPoint   theExitPoint;     // exitPos 
-  float           theEntryX;
-  float           theEntryY;
-  float           theEntryZ;
-  float           theExitX;
-  float           theExitY;
-  float           theExitZ;
-  float           thePabs;          // momentum
-  float           theEnergyLoss;    // Energy loss
-  float           theThetaAtEntry;
-  float           thePhiAtEntry;
+  //  Local3DPoint    theEntryPoint;    // position at entry
+  //  Local3DPoint   theExitPoint;     // exitPos
+  float theEntryX;
+  float theEntryY;
+  float theEntryZ;
+  float theExitX;
+  float theExitY;
+  float theExitZ;
+  float thePabs;        // momentum
+  float theEnergyLoss;  // Energy loss
+  float theThetaAtEntry;
+  float thePhiAtEntry;
 
-  float           theTof;           // Time Of Flight
-  short           theParticleType;
-  unsigned short  theProcessType;   // ID of the process which created the track
-                                    // which created the PSimHit
+  float theTof;  // Time Of Flight
+  short theParticleType;
+  unsigned short theProcessType;  // ID of the process which created the track
+                                  // which created the PSimHit
 
   // association
-  unsigned int    theDetUnitId;
-  unsigned int    theTrackId;
+  unsigned int theDetUnitId;
+  unsigned int theTrackId;
   ClassDef(RootSimHit, 1)
 };
 
 #endif
-
diff --git a/SimMuon/Neutron/src/SubsystemNeutronReader.cc b/SimMuon/Neutron/src/SubsystemNeutronReader.cc
index dde3decedaf57..a524b9c2e4ab1 100644
--- a/SimMuon/Neutron/src/SubsystemNeutronReader.cc
+++ b/SimMuon/Neutron/src/SubsystemNeutronReader.cc
@@ -10,76 +10,68 @@
 
 using namespace std;
 
-SubsystemNeutronReader::SubsystemNeutronReader(const edm::ParameterSet & pset)
-: theHitReader(nullptr),
-  theLuminosity(pset.getParameter<double>("luminosity")), // in units of 10^34
-  theStartTime(pset.getParameter<double>("startTime")), 
-  theEndTime(pset.getParameter<double>("endTime")),
-  theEventOccupancy(pset.getParameter<vector<double> >("eventOccupancy")) // TODO make map
+SubsystemNeutronReader::SubsystemNeutronReader(const edm::ParameterSet& pset)
+    : theHitReader(nullptr),
+      theLuminosity(pset.getParameter<double>("luminosity")),  // in units of 10^34
+      theStartTime(pset.getParameter<double>("startTime")),
+      theEndTime(pset.getParameter<double>("endTime")),
+      theEventOccupancy(pset.getParameter<vector<double> >("eventOccupancy"))  // TODO make map
 {
   // 17.3 collisions per live bx, 79.5% of bx live
   float collisionsPerCrossing = 13.75 * theLuminosity;
-  int windowSize = (int)((theEndTime-theStartTime)/25.);
+  int windowSize = (int)((theEndTime - theStartTime) / 25.);
   theEventsInWindow = collisionsPerCrossing * windowSize;
   string reader = pset.getParameter<string>("reader");
   edm::FileInPath input = pset.getParameter<edm::FileInPath>("input");
-  if(reader == "ASCII")
-  {
+  if (reader == "ASCII") {
     theHitReader = new AsciiNeutronReader(input.fullPath());
-  }
-  else if (reader == "ROOT")
-  {
+  } else if (reader == "ROOT") {
     theHitReader = new RootNeutronReader(input.fullPath());
   }
 }
 
+SubsystemNeutronReader::~SubsystemNeutronReader() { delete theHitReader; }
 
-SubsystemNeutronReader::~SubsystemNeutronReader() {
-  delete theHitReader;
-}
-
-
-void
-SubsystemNeutronReader::generateChamberNoise(int chamberType, int chamberIndex, 
-                                             edm::PSimHitContainer & result,
-                                             CLHEP::HepRandomEngine* engine)
-{
+void SubsystemNeutronReader::generateChamberNoise(int chamberType,
+                                                  int chamberIndex,
+                                                  edm::PSimHitContainer& result,
+                                                  CLHEP::HepRandomEngine* engine) {
   // make sure this chamber hasn't been done before
-  if(find(theChambersDone.begin(), theChambersDone.end(), chamberIndex) 
-     == theChambersDone.end()) 
-  {
-    float meanNumberOfEvents = theEventOccupancy[chamberType-1] 
-                             * theEventsInWindow;
+  if (find(theChambersDone.begin(), theChambersDone.end(), chamberIndex) == theChambersDone.end()) {
+    float meanNumberOfEvents = theEventOccupancy[chamberType - 1] * theEventsInWindow;
     CLHEP::RandPoissonQ randPoissonQ(*engine, meanNumberOfEvents);
     int nEventsToAdd = randPoissonQ.fire();
-//    LogDebug("NeutronReader") << "Number of neutron events to add: " 
-//std::cout << "Number of neutron events to add for chamber type " << chamberType << " : " 
-// << nEventsToAdd <<  " mean " << meanNumberOfEvents << std::endl;
-//                   << nEventsToAdd <<  " mean " << meanNumberOfEvents;
+    //    LogDebug("NeutronReader") << "Number of neutron events to add: "
+    //std::cout << "Number of neutron events to add for chamber type " << chamberType << " : "
+    // << nEventsToAdd <<  " mean " << meanNumberOfEvents << std::endl;
+    //                   << nEventsToAdd <<  " mean " << meanNumberOfEvents;
 
-    for(int i = 0; i < nEventsToAdd; ++i) {
+    for (int i = 0; i < nEventsToAdd; ++i) {
       // find the time for this event
       float timeOffset = CLHEP::RandFlat::shoot(engine, theStartTime, theEndTime);
       vector<PSimHit> neutronHits;
       theHitReader->readNextEvent(chamberType, neutronHits);
 
-      for( vector<PSimHit>::const_iterator neutronHitItr = neutronHits.begin();
-           neutronHitItr != neutronHits.end(); ++neutronHitItr)
-      {
-         const PSimHit & rawHit = *neutronHitItr;
-         // do the time offset and local det id
-         int det = detId(chamberIndex, rawHit.detUnitId());
-         PSimHit hit(rawHit.entryPoint(), rawHit.exitPoint(), rawHit.pabs(),
-                     rawHit.tof()+timeOffset,
-                     rawHit.energyLoss(), rawHit.particleType(),
-                     det, rawHit.trackId(),
-                     rawHit.thetaAtEntry(),  rawHit.phiAtEntry(), rawHit.processType());
-//std::cout << "NEWHIT " << hit << std::endl;
-         result.push_back(hit);
+      for (vector<PSimHit>::const_iterator neutronHitItr = neutronHits.begin(); neutronHitItr != neutronHits.end();
+           ++neutronHitItr) {
+        const PSimHit& rawHit = *neutronHitItr;
+        // do the time offset and local det id
+        int det = detId(chamberIndex, rawHit.detUnitId());
+        PSimHit hit(rawHit.entryPoint(),
+                    rawHit.exitPoint(),
+                    rawHit.pabs(),
+                    rawHit.tof() + timeOffset,
+                    rawHit.energyLoss(),
+                    rawHit.particleType(),
+                    det,
+                    rawHit.trackId(),
+                    rawHit.thetaAtEntry(),
+                    rawHit.phiAtEntry(),
+                    rawHit.processType());
+        //std::cout << "NEWHIT " << hit << std::endl;
+        result.push_back(hit);
       }
-
     }
     theChambersDone.push_back(chamberIndex);
   }
 }
-
diff --git a/SimMuon/Neutron/src/SubsystemNeutronWriter.cc b/SimMuon/Neutron/src/SubsystemNeutronWriter.cc
index 07c13d52636be..85f0b2d76dbfe 100644
--- a/SimMuon/Neutron/src/SubsystemNeutronWriter.cc
+++ b/SimMuon/Neutron/src/SubsystemNeutronWriter.cc
@@ -18,184 +18,162 @@ using namespace std;
 
 class SortByTime {
 public:
-  bool operator()(const PSimHit & h1, const PSimHit & h2) {
-   return (h1.tof() < h2.tof());
-  }
+  bool operator()(const PSimHit& h1, const PSimHit& h2) { return (h1.tof() < h2.tof()); }
 };
 
-SubsystemNeutronWriter::SubsystemNeutronWriter(edm::ParameterSet const& pset) 
-: theHitWriter(nullptr),
-  useRandFlat(false),
-  theInputTag(pset.getParameter<edm::InputTag>("input")),
-  theNeutronTimeCut(pset.getParameter<double>("neutronTimeCut")),
-  theTimeWindow(pset.getParameter<double>("timeWindow")),
-  theT0(pset.getParameter<double>("t0")),
-  theNEvents(0),
-  initialized(false),
-  useLocalDetId_(true)
-{
+SubsystemNeutronWriter::SubsystemNeutronWriter(edm::ParameterSet const& pset)
+    : theHitWriter(nullptr),
+      useRandFlat(false),
+      theInputTag(pset.getParameter<edm::InputTag>("input")),
+      theNeutronTimeCut(pset.getParameter<double>("neutronTimeCut")),
+      theTimeWindow(pset.getParameter<double>("timeWindow")),
+      theT0(pset.getParameter<double>("t0")),
+      theNEvents(0),
+      initialized(false),
+      useLocalDetId_(true) {
   string writer = pset.getParameter<string>("writer");
   string output = pset.getParameter<string>("output");
-  if(writer == "ASCII")
-  {
+  if (writer == "ASCII") {
     theHitWriter = new AsciiNeutronWriter(output);
-  }
-  else if (writer == "ROOT")
-  {
+  } else if (writer == "ROOT") {
     theHitWriter = new RootNeutronWriter(output);
-  }
-  else if (writer == "EDM")
-  {
+  } else if (writer == "EDM") {
     produces<edm::PSimHitContainer>();
     theHitWriter = new EDMNeutronWriter();
     // write out the real DetId, not the local one
     useLocalDetId_ = false;
     // smear the times
     edm::Service<edm::RandomNumberGenerator> rng;
-    if ( ! rng.isAvailable()) {
-     throw cms::Exception("Configuration")
-       << "SubsystemNeutronWriter requires the RandomNumberGeneratorService\n"
-          "which is not present in the configuration file.  You must add the service\n"
-          "in the configuration file or remove the modules that require it.";
+    if (!rng.isAvailable()) {
+      throw cms::Exception("Configuration")
+          << "SubsystemNeutronWriter requires the RandomNumberGeneratorService\n"
+             "which is not present in the configuration file.  You must add the service\n"
+             "in the configuration file or remove the modules that require it.";
     }
     useRandFlat = true;
+  } else {
+    throw cms::Exception("NeutronWriter") << "Bad writer: " << writer;
   }
-  else 
-  {
-    throw cms::Exception("NeutronWriter") << "Bad writer: "
-      << writer;
-  } 
 }
 
-SubsystemNeutronWriter::~SubsystemNeutronWriter()
-{
+SubsystemNeutronWriter::~SubsystemNeutronWriter() {
   printStats();
   delete theHitWriter;
 }
 
 void SubsystemNeutronWriter::printStats() {
   edm::LogInfo("SubsystemNeutronWriter") << "SubsystemNeutronWriter Statistics:\n";
-  for(map<int,int>::iterator mapItr = theCountPerChamberType.begin();
-      mapItr != theCountPerChamberType.end();  ++mapItr) {
-     edm::LogInfo("SubsystemNeutronWriter") << "   theEventOccupancy[" << mapItr->first << "] = "
-         << mapItr->second << " / " << theNEvents << " / NCT \n";
+  for (map<int, int>::iterator mapItr = theCountPerChamberType.begin(); mapItr != theCountPerChamberType.end();
+       ++mapItr) {
+    edm::LogInfo("SubsystemNeutronWriter")
+        << "   theEventOccupancy[" << mapItr->first << "] = " << mapItr->second << " / " << theNEvents << " / NCT \n";
   }
 }
 
-void SubsystemNeutronWriter::produce(edm::Event & e, edm::EventSetup const& c)
-{
+void SubsystemNeutronWriter::produce(edm::Event& e, edm::EventSetup const& c) {
   CLHEP::HepRandomEngine* engine = nullptr;
-  if(useRandFlat) {
+  if (useRandFlat) {
     edm::Service<edm::RandomNumberGenerator> rng;
     engine = &rng->getEngine(e.streamID());
   }
-  theHitWriter->beginEvent(e,c);
+  theHitWriter->beginEvent(e, c);
   ++theNEvents;
   edm::Handle<edm::PSimHitContainer> hits;
   e.getByLabel(theInputTag, hits);
 
   // sort hits by chamber
   map<int, edm::PSimHitContainer> hitsByChamber;
-  for(edm::PSimHitContainer::const_iterator hitItr = hits->begin();
-      hitItr != hits->end(); ++hitItr)
-  {
+  for (edm::PSimHitContainer::const_iterator hitItr = hits->begin(); hitItr != hits->end(); ++hitItr) {
     int chamberIndex = chamberId(hitItr->detUnitId());
     hitsByChamber[chamberIndex].push_back(*hitItr);
   }
 
   // now write out each chamber's contents
-  for(map<int, edm::PSimHitContainer>::iterator hitsByChamberItr = hitsByChamber.begin();
-      hitsByChamberItr != hitsByChamber.end(); ++hitsByChamberItr)
-  {
+  for (map<int, edm::PSimHitContainer>::iterator hitsByChamberItr = hitsByChamber.begin();
+       hitsByChamberItr != hitsByChamber.end();
+       ++hitsByChamberItr) {
     int chambertype = chamberType(hitsByChamberItr->first);
     writeHits(chambertype, hitsByChamberItr->second, engine);
   }
   theHitWriter->endEvent();
 }
 
-
-void SubsystemNeutronWriter::initialize(int chamberType)
-{
+void SubsystemNeutronWriter::initialize(int chamberType) {
   // should instantiate one of every chamber type, just so
   // ROOT knows what file to associate them with
   theHitWriter->initialize(chamberType);
 }
 
-
-void SubsystemNeutronWriter::writeHits(int chamberType, edm::PSimHitContainer & chamberHits,
-                                       CLHEP::HepRandomEngine* engine)
-{
-
+void SubsystemNeutronWriter::writeHits(int chamberType,
+                                       edm::PSimHitContainer& chamberHits,
+                                       CLHEP::HepRandomEngine* engine) {
   sort(chamberHits.begin(), chamberHits.end(), SortByTime());
   edm::PSimHitContainer cluster;
   float startTime = -1000.;
   float smearing = 0.;
-  for(size_t i = 0; i < chamberHits.size(); ++i) {
+  for (size_t i = 0; i < chamberHits.size(); ++i) {
     PSimHit hit = chamberHits[i];
     float tof = hit.tof();
-    LogDebug("SubsystemNeutronWriter") << "found hit from part type " << hit.particleType()
-                   << " at tof " << tof << " p " << hit.pabs() 
-                   << " on det " << hit.detUnitId() 
-                   << " chamber type " << chamberType;
-    if(tof > theNeutronTimeCut) {
-      if(tof > (startTime + theTimeWindow) ) { // 1st in cluster
+    LogDebug("SubsystemNeutronWriter") << "found hit from part type " << hit.particleType() << " at tof " << tof
+                                       << " p " << hit.pabs() << " on det " << hit.detUnitId() << " chamber type "
+                                       << chamberType;
+    if (tof > theNeutronTimeCut) {
+      if (tof > (startTime + theTimeWindow)) {  // 1st in cluster
         startTime = tof;
         // set the time to be [t0, t0+25] at start of event
         smearing = theT0;
-        if(useRandFlat) {
+        if (useRandFlat) {
           smearing += CLHEP::RandFlat::shoot(engine, 25.);
         }
-        if(!cluster.empty()) {
+        if (!cluster.empty()) {
           LogDebug("SubsystemNeutronWriter") << "filling old cluster";
           writeCluster(chamberType, cluster);
           cluster.clear();
         }
-        LogDebug("SubsystemNeutronWriter") << "starting neutron cluster at time " << startTime 
-          << " on detType " << chamberType;
+        LogDebug("SubsystemNeutronWriter")
+            << "starting neutron cluster at time " << startTime << " on detType " << chamberType;
       }
-      adjust(hit, -1.*startTime, smearing);
-      cluster.push_back( hit );
+      adjust(hit, -1. * startTime, smearing);
+      cluster.push_back(hit);
     }
   }
   // get any leftover cluster
-  if(!cluster.empty()) {
+  if (!cluster.empty()) {
     writeCluster(chamberType, cluster);
   }
 }
 
-
-void SubsystemNeutronWriter::writeCluster(int chamberType, const edm::PSimHitContainer & cluster)
-{
-  if(accept(cluster))
-  {
+void SubsystemNeutronWriter::writeCluster(int chamberType, const edm::PSimHitContainer& cluster) {
+  if (accept(cluster)) {
     theHitWriter->writeCluster(chamberType, cluster);
     updateCount(chamberType);
   }
 }
 
-
-void SubsystemNeutronWriter::adjust(PSimHit & h, float timeOffset, float smearing) {
+void SubsystemNeutronWriter::adjust(PSimHit& h, float timeOffset, float smearing) {
   unsigned int detId = useLocalDetId_ ? localDetId(h.detUnitId()) : h.detUnitId();
   float htime = h.timeOfFlight() + timeOffset + smearing;
   // prevent float precision loss
   if (h.timeOfFlight() > 1.E+6) {
     htime = smearing;
   }
-  h = PSimHit( h.entryPoint(), h.exitPoint(), h.pabs(), htime,
-               h.energyLoss(), h.particleType(), 
-               detId, h.trackId(),
-               h.momentumAtEntry().theta(),
-               h.momentumAtEntry().phi() );
+  h = PSimHit(h.entryPoint(),
+              h.exitPoint(),
+              h.pabs(),
+              htime,
+              h.energyLoss(),
+              h.particleType(),
+              detId,
+              h.trackId(),
+              h.momentumAtEntry().theta(),
+              h.momentumAtEntry().phi());
 }
 
-
 void SubsystemNeutronWriter::updateCount(int chamberType) {
-  map<int,int>::iterator entry = theCountPerChamberType.find(chamberType);
-  if(entry == theCountPerChamberType.end()) {
-    theCountPerChamberType.insert( pair<int,int>(chamberType, 1) );
+  map<int, int>::iterator entry = theCountPerChamberType.find(chamberType);
+  if (entry == theCountPerChamberType.end()) {
+    theCountPerChamberType.insert(pair<int, int>(chamberType, 1));
   } else {
     ++(entry->second);
   }
 }
-
-
diff --git a/SimMuon/Neutron/src/classes.h b/SimMuon/Neutron/src/classes.h
index 1ce138e491c50..7d131dd9f41af 100644
--- a/SimMuon/Neutron/src/classes.h
+++ b/SimMuon/Neutron/src/classes.h
@@ -1,6 +1,5 @@
 #include "SimMuon/Neutron/src/RootSimHit.h"
 
 namespace SimMuon_Neutron {
-  struct dictionary {
-  };
-}
+  struct dictionary {};
+}  // namespace SimMuon_Neutron
diff --git a/SimMuon/RPCDigitizer/test/runRPCDigiProducer_cfg.py b/SimMuon/RPCDigitizer/test/runRPCDigiProducer_cfg.py
index e69fa74457e9e..15efdb3ad8815 100644
--- a/SimMuon/RPCDigitizer/test/runRPCDigiProducer_cfg.py
+++ b/SimMuon/RPCDigitizer/test/runRPCDigiProducer_cfg.py
@@ -38,23 +38,23 @@
 # process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff')
 #############################
 
-### 2019 Geometry w/ GEM ###
+### 2021 Geometry w/ GEM ###
 ############################
-# process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase1_2019_design', '')
-# from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads import fixRPCConditions # RPC Conditions for Phase2 Detector (2019)
-# process = fixRPCConditions(process)                                                           # RPC Conditions for Phase2 Detector (2019)
+# process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase1_2021_design', '')
+# from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads import fixRPCConditions # RPC Conditions for Phase2 Detector (2021)
+# process = fixRPCConditions(process)                                                           # RPC Conditions for Phase2 Detector (2021)
 ### Info:
 ### conditions for RPC in 2023 are not updated for higher noises or lower efficiency
-### conditions for RPC in 2019 loaded by the global tag are the same as he 2023 conditions
+### conditions for RPC in 2021 loaded by the global tag are the same as he 2023 conditions
 ### by default it will not work because it uses the previous RPC Simulation Model (RPCSimAverageNoiseEffCls)
 ### while the newer RPC Simulation Model (RPCSimAsymmetricCls) is loaded in CMSSW 
 ### by loading the fixRPCConditions the previous RPC Simulation Model will be loaded
-### in future we ll have to give different conditions payload to the 2019 geometry
+### in future we ll have to give different conditions payload to the 2021 geometry
 ### such that the newest RPC Simulation Model (RPCSimAsymmetricCls.h) can be used.
 # from SimMuon.GEMDigitizer.customizeGEMDigi import customize_digi_addGEM_muon_only   # Customize for CSC + DT + GEM + RPC
 # process = customize_digi_addGEM_muon_only(process)                                  # Digi only Muon Detectors
-# process.load('Configuration.Geometry.GeometryExtended2019Reco_cff')
-# process.load('Configuration.Geometry.GeometryExtended2019_cff')
+# process.load('Configuration.Geometry.GeometryExtended2021Reco_cff')
+# process.load('Configuration.Geometry.GeometryExtended2021_cff')
 # process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff')
 ############################
 
diff --git a/SimPPS/PPSSimTrackProducer/plugins/PPSSimTrackProducer.cc b/SimPPS/PPSSimTrackProducer/plugins/PPSSimTrackProducer.cc
index 77ad0d84a2ff4..bf5472c506f8b 100644
--- a/SimPPS/PPSSimTrackProducer/plugins/PPSSimTrackProducer.cc
+++ b/SimPPS/PPSSimTrackProducer/plugins/PPSSimTrackProducer.cc
@@ -2,7 +2,7 @@
 //
 // Package:    SimPPS/PPSSimTrackProducer
 // Class:      PPSSimTrackProducer
-// 
+//
 /**\class PPSSimTrackProducer PPSSimTrackProducer.cc SimPPS/PPSSimTrackProducer/plugins/PPSSimTrackProducer.cc
 
  Description: [one line class summary]
@@ -16,7 +16,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -44,33 +43,31 @@
 //
 
 class PPSSimTrackProducer : public edm::stream::EDProducer<> {
-   public:
-      explicit PPSSimTrackProducer(const edm::ParameterSet&);
-      ~PPSSimTrackProducer() override;
-
-      static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-
-   private:
-      void beginStream(edm::StreamID) override;
-      void produce(edm::Event&, const edm::EventSetup&) override;
-      void endStream() override;
-
-      // ----------member data ---------------------------
-             bool m_verbosity;
-             ProtonTransport* theTransporter = nullptr;
-             edm::InputTag  m_InTag;
-             edm::EDGetTokenT<edm::HepMCProduct> m_InTagToken;
-
-             std::string m_transportMethod;
-             int m_eventsAnalysed; //!< just to count events that have been analysed
-    
+public:
+  explicit PPSSimTrackProducer(const edm::ParameterSet&);
+  ~PPSSimTrackProducer() override;
+
+  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+
+private:
+  void beginStream(edm::StreamID) override;
+  void produce(edm::Event&, const edm::EventSetup&) override;
+  void endStream() override;
+
+  // ----------member data ---------------------------
+  bool m_verbosity;
+  ProtonTransport* theTransporter = nullptr;
+  edm::InputTag m_InTag;
+  edm::EDGetTokenT<edm::HepMCProduct> m_InTagToken;
+
+  std::string m_transportMethod;
+  int m_eventsAnalysed;  //!< just to count events that have been analysed
 };
 
 //
 // constants, enums and typedefs
 //
 
-
 //
 // static data member definitions
 //
@@ -78,122 +75,113 @@ class PPSSimTrackProducer : public edm::stream::EDProducer<> {
 //
 // constructors and destructor
 //
-PPSSimTrackProducer::PPSSimTrackProducer(const edm::ParameterSet& iConfig)
-{
-   //now do what ever other initialization is needed
-    // TransportHector
-    m_InTag          = iConfig.getParameter<edm::InputTag>("HepMCProductLabel") ;
-    m_InTagToken     = consumes<edm::HepMCProduct>(m_InTag);
-
-    m_verbosity      = iConfig.getParameter<bool>("Verbosity");
-    m_transportMethod = iConfig.getParameter<std::string>("TransportMethod");
-
-    produces<edm::HepMCProduct>();
-    produces<edm::LHCTransportLinkContainer>();
-
-    theTransporter = nullptr;
-
-    if (m_transportMethod=="Totem")       {theTransporter = new TotemTransport(iConfig, m_verbosity);}
-    else if (m_transportMethod=="Hector") {theTransporter = new HectorTransport(iConfig, m_verbosity);}
-    else {
-         throw cms::Exception("Configuration")
-               << "LHCTransport (ProtonTransport) requires a Method (Hector or Totem) \n"
-                  "which is not present in the configuration file. You should add one of the method\n"
-                  "above in the configuration file or remove the module that requires it.";
-    }
-
-    edm::Service<edm::RandomNumberGenerator> rng;
-    if ( ! rng.isAvailable() ) {
-        throw cms::Exception("Configuration")
-            << "LHCTransport (ProtonTransport) requires the RandomNumberGeneratorService\n"
-            "which is not present in the configuration file.  You must add the service\n"
-            "in the configuration file or remove the modules that require it.";
-    }
-  
+PPSSimTrackProducer::PPSSimTrackProducer(const edm::ParameterSet& iConfig) {
+  //now do what ever other initialization is needed
+  // TransportHector
+  m_InTag = iConfig.getParameter<edm::InputTag>("HepMCProductLabel");
+  m_InTagToken = consumes<edm::HepMCProduct>(m_InTag);
+
+  m_verbosity = iConfig.getParameter<bool>("Verbosity");
+  m_transportMethod = iConfig.getParameter<std::string>("TransportMethod");
+
+  produces<edm::HepMCProduct>();
+  produces<edm::LHCTransportLinkContainer>();
+
+  theTransporter = nullptr;
+
+  if (m_transportMethod == "Totem") {
+    theTransporter = new TotemTransport(iConfig, m_verbosity);
+  } else if (m_transportMethod == "Hector") {
+    theTransporter = new HectorTransport(iConfig, m_verbosity);
+  } else {
+    throw cms::Exception("Configuration")
+        << "LHCTransport (ProtonTransport) requires a Method (Hector or Totem) \n"
+           "which is not present in the configuration file. You should add one of the method\n"
+           "above in the configuration file or remove the module that requires it.";
+  }
+
+  edm::Service<edm::RandomNumberGenerator> rng;
+  if (!rng.isAvailable()) {
+    throw cms::Exception("Configuration")
+        << "LHCTransport (ProtonTransport) requires the RandomNumberGeneratorService\n"
+           "which is not present in the configuration file.  You must add the service\n"
+           "in the configuration file or remove the modules that require it.";
+  }
 }
 
-
-PPSSimTrackProducer::~PPSSimTrackProducer()
-{
- 
-   // do anything here that needs to be done at destruction time
-   // (e.g. close files, deallocate resources etc.)
-   if (theTransporter) { 
-      delete theTransporter; 
-      theTransporter = nullptr;
-   } 
-
+PPSSimTrackProducer::~PPSSimTrackProducer() {
+  // do anything here that needs to be done at destruction time
+  // (e.g. close files, deallocate resources etc.)
+  if (theTransporter) {
+    delete theTransporter;
+    theTransporter = nullptr;
+  }
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-PPSSimTrackProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-    using namespace edm;
-    using namespace std;
-    HepMC::GenEvent * evt;
-    edm::Service<edm::RandomNumberGenerator> rng;
-    CLHEP::HepRandomEngine* engine = &rng->getEngine(iEvent.streamID());
-    if ( engine->name() != "TRandom3" ) {
-        throw cms::Exception("Configuration")
-            << "The TRandom3 engine type must be used with ProtonTransport, Random Number Generator Service not correctly configured!";
-    }
-
-    m_eventsAnalysed++;
-    Handle<HepMCProduct>  HepMCEvt;   
-    iEvent.getByToken( m_InTagToken, HepMCEvt ) ;
-
-    if ( !HepMCEvt.isValid() ){
-        throw cms::Exception("InvalidReference")
-            << "Invalid reference to HepMCProduct\n";
-    }
-
-    if ( HepMCEvt.provenance()->moduleLabel() == "LHCTransport" ){
-        throw cms::Exception("LogicError")
-            << "HectorTrasported HepMCProduce already exists\n";
-    }
-
-    evt = new HepMC::GenEvent( *HepMCEvt->GetEvent() );
-
-    theTransporter->clear();
-    theTransporter->process( evt ,iSetup ,engine);
-
-    if (m_verbosity)  evt->print();
-
-    unique_ptr<HepMCProduct> newProduct(new edm::HepMCProduct()) ;
-    newProduct->addHepMCData( evt ) ;
-
-    iEvent.put(std::move(newProduct)) ;
-
-    unique_ptr<LHCTransportLinkContainer> NewCorrespondenceMap(new edm::LHCTransportLinkContainer() );
-    edm::LHCTransportLinkContainer thisLink(theTransporter->getCorrespondenceMap());
-    (*NewCorrespondenceMap).swap(thisLink);
-
-    if ( m_verbosity ) {
-        for ( unsigned int i = 0; i < (*NewCorrespondenceMap).size(); i++) 
-            LogDebug("HectorEventProcessing") << "Hector correspondence table: " << (*NewCorrespondenceMap)[i];
-    }
-
-    iEvent.put(std::move(NewCorrespondenceMap));
-    // There is no need to delete the pointer to the event, since it is deleted in HepMCProduct,
-    // in fact, it MUST NOT be delete here, as a protection is missing in above package
+void PPSSimTrackProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
+  using namespace edm;
+  using namespace std;
+  HepMC::GenEvent* evt;
+  edm::Service<edm::RandomNumberGenerator> rng;
+  CLHEP::HepRandomEngine* engine = &rng->getEngine(iEvent.streamID());
+  if (engine->name() != "TRandom3") {
+    throw cms::Exception("Configuration") << "The TRandom3 engine type must be used with ProtonTransport, Random "
+                                             "Number Generator Service not correctly configured!";
+  }
+
+  m_eventsAnalysed++;
+  Handle<HepMCProduct> HepMCEvt;
+  iEvent.getByToken(m_InTagToken, HepMCEvt);
+
+  if (!HepMCEvt.isValid()) {
+    throw cms::Exception("InvalidReference") << "Invalid reference to HepMCProduct\n";
+  }
+
+  if (HepMCEvt.provenance()->moduleLabel() == "LHCTransport") {
+    throw cms::Exception("LogicError") << "HectorTrasported HepMCProduce already exists\n";
+  }
+
+  evt = new HepMC::GenEvent(*HepMCEvt->GetEvent());
+
+  theTransporter->clear();
+  theTransporter->process(evt, iSetup, engine);
+
+  if (m_verbosity)
+    evt->print();
+
+  unique_ptr<HepMCProduct> newProduct(new edm::HepMCProduct());
+  newProduct->addHepMCData(evt);
+
+  iEvent.put(std::move(newProduct));
+
+  unique_ptr<LHCTransportLinkContainer> NewCorrespondenceMap(new edm::LHCTransportLinkContainer());
+  edm::LHCTransportLinkContainer thisLink(theTransporter->getCorrespondenceMap());
+  (*NewCorrespondenceMap).swap(thisLink);
+
+  if (m_verbosity) {
+    for (unsigned int i = 0; i < (*NewCorrespondenceMap).size(); i++)
+      LogDebug("HectorEventProcessing") << "Hector correspondence table: " << (*NewCorrespondenceMap)[i];
+  }
+
+  iEvent.put(std::move(NewCorrespondenceMap));
+  // There is no need to delete the pointer to the event, since it is deleted in HepMCProduct,
+  // in fact, it MUST NOT be delete here, as a protection is missing in above package
 }
 // The methods below are pure virtual, so it needs to be implemented even if not used
 //
 // ------------ method called once each stream before processing any runs, lumis or events  ------------
-void PPSSimTrackProducer::beginStream(edm::StreamID) { }
+void PPSSimTrackProducer::beginStream(edm::StreamID) {}
 
 // ------------ method called once each stream after processing all runs, lumis and events  ------------
-void PPSSimTrackProducer::endStream() { } 
+void PPSSimTrackProducer::endStream() {}
 
 // ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
-void
-PPSSimTrackProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+void PPSSimTrackProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
   //The following says we do not know what parameters are allowed so do no validation
   // Please change this to state exactly what you do use, even if it is no parameters
   edm::ParameterSetDescription desc;
diff --git a/SimRomanPot/SimFP420/interface/AmplitudeSegmentFP420.h b/SimRomanPot/SimFP420/interface/AmplitudeSegmentFP420.h
index 4c4ed73157326..abace4d6dbc2e 100644
--- a/SimRomanPot/SimFP420/interface/AmplitudeSegmentFP420.h
+++ b/SimRomanPot/SimFP420/interface/AmplitudeSegmentFP420.h
@@ -1,32 +1,31 @@
 #ifndef AmplitudeSegmentFP420_h
 #define AmplitudeSegmentFP420_h
 
-
 //#include "G4StepPoint.hh"
 
-
-#include<vector>
 #include "G4ThreeVector.hh"
+#include <vector>
 
 class AmplitudeSegmentFP420 {
- public:
-  AmplitudeSegmentFP420() : _pos(0,0,0), _sigma(0), _amplitude(0) {}
-  
-  AmplitudeSegmentFP420( float x, float y, float z, float s,float a=1.0) : 
-    _pos(x,y,z), _sigma(s), _amplitude(a) {}
-  
-  const G4ThreeVector& position() const { return _pos;}
-  float x()         const { return _pos.x();}
-  float y()         const { return _pos.y();}
-  float z()         const { return _pos.z();}
-  float sigma()     const { return _sigma;}
-  float amplitude() const { return _amplitude;}
-  AmplitudeSegmentFP420& set_amplitude( float amp) { _amplitude = amp; return *this;} 
+public:
+  AmplitudeSegmentFP420() : _pos(0, 0, 0), _sigma(0), _amplitude(0) {}
+
+  AmplitudeSegmentFP420(float x, float y, float z, float s, float a = 1.0) : _pos(x, y, z), _sigma(s), _amplitude(a) {}
 
- private:
+  const G4ThreeVector &position() const { return _pos; }
+  float x() const { return _pos.x(); }
+  float y() const { return _pos.y(); }
+  float z() const { return _pos.z(); }
+  float sigma() const { return _sigma; }
+  float amplitude() const { return _amplitude; }
+  AmplitudeSegmentFP420 &set_amplitude(float amp) {
+    _amplitude = amp;
+    return *this;
+  }
 
-  G4ThreeVector      _pos;
-  float           _sigma;
-  float           _amplitude;
-  };
+private:
+  G4ThreeVector _pos;
+  float _sigma;
+  float _amplitude;
+};
 #endif
diff --git a/SimRomanPot/SimFP420/interface/CDividerFP420.h b/SimRomanPot/SimFP420/interface/CDividerFP420.h
index 1d98e4651d50d..3a424eed83c40 100644
--- a/SimRomanPot/SimFP420/interface/CDividerFP420.h
+++ b/SimRomanPot/SimFP420/interface/CDividerFP420.h
@@ -7,19 +7,15 @@
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-
 #include <vector>
 
-class CDividerFP420{
- public:
-  
-  typedef std::vector< EnergySegmentFP420 > ionization_type;
-  
-  virtual ~CDividerFP420() { }
-  //  virtual ionization_type divide(const PSimHit, const StripDet& det) = 0;
-  virtual ionization_type divide(const PSimHit&, const double&) = 0;
+class CDividerFP420 {
+public:
+  typedef std::vector<EnergySegmentFP420> ionization_type;
 
+  virtual ~CDividerFP420() {}
+  //  virtual ionization_type divide(const PSimHit, const StripDet& det) = 0;
+  virtual ionization_type divide(const PSimHit &, const double &) = 0;
 };
 
-
 #endif
diff --git a/SimRomanPot/SimFP420/interface/CDrifterFP420.h b/SimRomanPot/SimFP420/interface/CDrifterFP420.h
index b93787ff34f0a..2c6ea5b58c1ac 100644
--- a/SimRomanPot/SimFP420/interface/CDrifterFP420.h
+++ b/SimRomanPot/SimFP420/interface/CDrifterFP420.h
@@ -1,25 +1,23 @@
 #ifndef CDrifterFP420_h
 #define CDrifterFP420_h
 
-#include "SimRomanPot/SimFP420/interface/EnergySegmentFP420.h"
 #include "SimRomanPot/SimFP420/interface/AmplitudeSegmentFP420.h"
+#include "SimRomanPot/SimFP420/interface/EnergySegmentFP420.h"
 //#include "ClassReuse/GeomVector/interface/LocalVector.h"
 #include "G4StepPoint.hh"
 
+#include <vector>
 
-#include<vector>
-
-class CDrifterFP420{
- public:  
-  typedef std::vector <AmplitudeSegmentFP420> collection_type;
-  typedef std::vector <EnergySegmentFP420> ionization_type;
+class CDrifterFP420 {
+public:
+  typedef std::vector<AmplitudeSegmentFP420> collection_type;
+  typedef std::vector<EnergySegmentFP420> ionization_type;
 
-  virtual ~CDrifterFP420() { }
-
-  virtual collection_type drift (const ionization_type&, const G4ThreeVector&, const int&) = 0;
-//  virtual collection_type drift (const ionization_type, const G4ThreeVector&) = 0;
+  virtual ~CDrifterFP420() {}
 
+  virtual collection_type drift(const ionization_type &, const G4ThreeVector &, const int &) = 0;
+  //  virtual collection_type drift (const ionization_type, const
+  //  G4ThreeVector&) = 0;
 };
 
 #endif
-
diff --git a/SimRomanPot/SimFP420/interface/ChargeDividerFP420.h b/SimRomanPot/SimFP420/interface/ChargeDividerFP420.h
index ce76674d25f83..2ab52cdca83aa 100644
--- a/SimRomanPot/SimFP420/interface/ChargeDividerFP420.h
+++ b/SimRomanPot/SimFP420/interface/ChargeDividerFP420.h
@@ -10,41 +10,39 @@
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-class ChargeDividerFP420 : public CDividerFP420{
- public:
-  
+class ChargeDividerFP420 : public CDividerFP420 {
+public:
   explicit ChargeDividerFP420(double pit, double az420, double azD2, double azD3, int);
-  
-  
+
   ~ChargeDividerFP420() override;
-  
+
   //  CDividerFP420::ionization_type divide(const SimHit&, const StripDet& det);
-  CDividerFP420::ionization_type divide(const PSimHit&, const double&) override;
-  
- private:
-  
-  double pitchcur; // is really moduleThickness here !!!
-  double z420;  // dist between centers of 1st and 2nd stations
-  double zD2;  // dist between centers of 1st and 2nd stations
-  double zD3;  // dist between centers of 1st and 3rd stations
-  
-  float PeakShape(const PSimHit&);
-  float DeconvolutionShape( const PSimHit&);
-  float TimeResponse( const PSimHit&) ; 
-  void fluctuateEloss(int particleId, float momentum, float eloss, float length, int NumberOfSegmentation, float elossVector[]);   
+  CDividerFP420::ionization_type divide(const PSimHit &, const double &) override;
+
+private:
+  double pitchcur;  // is really moduleThickness here !!!
+  double z420;      // dist between centers of 1st and 2nd stations
+  double zD2;       // dist between centers of 1st and 2nd stations
+  double zD3;       // dist between centers of 1st and 3rd stations
+
+  float PeakShape(const PSimHit &);
+  float DeconvolutionShape(const PSimHit &);
+  float TimeResponse(const PSimHit &);
+  void fluctuateEloss(
+      int particleId, float momentum, float eloss, float length, int NumberOfSegmentation, float elossVector[]);
   //  static SimpleConfigurable<bool> peakMode;
   bool peakMode;
   bool decoMode;
   //  static SimpleConfigurable<bool> fluctuateCharge;
   bool fluctuateCharge;
   //  static SimpleConfigurable<int>  chargeDivisionsPerStrip;
-  int  chargedivisionsPerHit;
+  int chargedivisionsPerHit;
   float zStationBegPos[4];
   //  static SimpleConfigurable<double> deltaCut ;
-  double deltaCut ;
-  LandauFP420 fluctuate; 
+  double deltaCut;
+  LandauFP420 fluctuate;
   //  HepPDTable * particleTable;
-  int  verbosity;
+  int verbosity;
 };
 
 #endif
diff --git a/SimRomanPot/SimFP420/interface/ChargeDrifterFP420.h b/SimRomanPot/SimFP420/interface/ChargeDrifterFP420.h
index ce693c352dea4..e38818def437b 100644
--- a/SimRomanPot/SimFP420/interface/ChargeDrifterFP420.h
+++ b/SimRomanPot/SimFP420/interface/ChargeDrifterFP420.h
@@ -4,15 +4,16 @@
 #include "SimRomanPot/SimFP420/interface/CDrifterFP420.h"
 #include "SimRomanPot/SimFP420/interface/EnergySegmentFP420.h"
 
-class ChargeDrifterFP420 : public CDrifterFP420{
- public:
-  ChargeDrifterFP420(double,double,double,double,double,double,double,double,double,int);
-  CDrifterFP420::collection_type drift (const CDrifterFP420::ionization_type&, const G4ThreeVector&, const int&) override;
+class ChargeDrifterFP420 : public CDrifterFP420 {
+public:
+  ChargeDrifterFP420(double, double, double, double, double, double, double, double, double, int);
+  CDrifterFP420::collection_type drift(const CDrifterFP420::ionization_type &,
+                                       const G4ThreeVector &,
+                                       const int &) override;
+
+private:
+  AmplitudeSegmentFP420 drift(const EnergySegmentFP420 &, const G4ThreeVector &, const int &);
 
- private:
-  
-  AmplitudeSegmentFP420 drift(const EnergySegmentFP420&, const G4ThreeVector&, const int&);
-  
   double modulePath;
   double constTe;
   double constDe;
@@ -23,9 +24,6 @@ class ChargeDrifterFP420 : public CDrifterFP420{
   double ldriftcurrX;
   double ldriftcurrY;
   int verbo;
-  
 };
 
-
 #endif
-
diff --git a/SimRomanPot/SimFP420/interface/DConverterFP420.h b/SimRomanPot/SimFP420/interface/DConverterFP420.h
index ae0b938b4d75f..5c4d83f0fe488 100644
--- a/SimRomanPot/SimFP420/interface/DConverterFP420.h
+++ b/SimRomanPot/SimFP420/interface/DConverterFP420.h
@@ -2,14 +2,13 @@
 #define DConverterFP420_h
 
 #include "SimRomanPot/SimFP420/interface/PileUpFP420.h"
-class DConverterFP420{
+class DConverterFP420 {
   // ADC simulation
- public:
-   
-  typedef std::map<int, int, std::less<int> >         DigitalMapType;
-  typedef PileUpFP420::signal_map_type   signal_map_type;
-  
-  virtual ~DConverterFP420() { }
+public:
+  typedef std::map<int, int, std::less<int>> DigitalMapType;
+  typedef PileUpFP420::signal_map_type signal_map_type;
+
+  virtual ~DConverterFP420() {}
   virtual DigitalMapType convert(const signal_map_type &) = 0;
 };
 
diff --git a/SimRomanPot/SimFP420/interface/DigiConverterFP420.h b/SimRomanPot/SimFP420/interface/DigiConverterFP420.h
index 2172165521335..655060726842f 100644
--- a/SimRomanPot/SimFP420/interface/DigiConverterFP420.h
+++ b/SimRomanPot/SimFP420/interface/DigiConverterFP420.h
@@ -3,22 +3,20 @@
 
 #include "SimRomanPot/SimFP420/interface/DConverterFP420.h"
 
-class DigiConverterFP420: public DConverterFP420{
- public:
+class DigiConverterFP420 : public DConverterFP420 {
+public:
+  DigiConverterFP420(float in, int);
 
-  DigiConverterFP420(float in,int);
-  
-  DigitalMapType convert(const signal_map_type&) override;
-    
- private:
+  DigitalMapType convert(const signal_map_type &) override;
 
-  int convert(float in){return truncate(in/electronperADC);}
+private:
+  int convert(float in) { return truncate(in / electronperADC); }
   int truncate(float in_adc);
-  
+
   float electronperADC;
   int theMaxADC;
   int adcBits;
   int verbos;
 };
- 
+
 #endif
diff --git a/SimRomanPot/SimFP420/interface/DigitizerFP420.h b/SimRomanPot/SimFP420/interface/DigitizerFP420.h
index 3988d70c1fd82..e0cb6c9fd783d 100644
--- a/SimRomanPot/SimFP420/interface/DigitizerFP420.h
+++ b/SimRomanPot/SimFP420/interface/DigitizerFP420.h
@@ -4,18 +4,18 @@
 ///////////////////////////////////////////////////////////////////////
 #include "boost/shared_ptr.hpp"
 
-#include "FWCore/Framework/interface/one/EDProducer.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/one/EDProducer.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "Geometry/CommonDetUnit/interface/GeomDetType.h"
-#include "SimG4CMS/FP420/interface/FP420NumberingScheme.h"
+#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
+#include "SimG4CMS/FP420/interface/FP420NumberingScheme.h"
 
 #include "SimRomanPot/SimFP420/interface/FP420DigiMain.h"
 
@@ -23,39 +23,36 @@
 #include "DataFormats/FP420Digi/interface/HDigiFP420.h"
 
 #include <CLHEP/Vector/ThreeVector.h>
-#include <string>
-#include<vector>
 #include <iostream>
 #include <map>
+#include <string>
+#include <vector>
 
-namespace cms
-{
-  class DigitizerFP420: public edm::one::EDProducer<>
-  {
+namespace cms {
+  class DigitizerFP420 : public edm::one::EDProducer<> {
   public:
-    
-    explicit DigitizerFP420(const edm::ParameterSet& conf);
-    
+    explicit DigitizerFP420(const edm::ParameterSet &conf);
+
     ~DigitizerFP420() override;
-    
-    void produce(edm::Event& e, const edm::EventSetup& c) override;
+
+    void produce(edm::Event &e, const edm::EventSetup &c) override;
 
   private:
     typedef std::vector<std::string> vstring;
-    typedef std::map<unsigned int, std::vector<PSimHit>,std::less<unsigned int> > simhit_map;
+    typedef std::map<unsigned int, std::vector<PSimHit>, std::less<unsigned int>> simhit_map;
     typedef simhit_map::iterator simhit_map_iterator;
     simhit_map SimHitMap;
-    
+
     edm::ParameterSet conf_;
     vstring trackerContainers;
-    
-    FP420DigiMain* stripDigitizer_;
-    int numStrips;    // number of strips in the module
-    
+
+    FP420DigiMain *stripDigitizer_;
+    int numStrips;  // number of strips in the module
+
     int dn0, sn0, pn0, rn0, verbosity;
-        
+
     std::vector<HDigiFP420> collector;
   };
-}
+}  // namespace cms
 
 #endif
diff --git a/SimRomanPot/SimFP420/interface/EnergySegmentFP420.h b/SimRomanPot/SimFP420/interface/EnergySegmentFP420.h
index c87fe90e9122e..d15aec6c69361 100644
--- a/SimRomanPot/SimFP420/interface/EnergySegmentFP420.h
+++ b/SimRomanPot/SimFP420/interface/EnergySegmentFP420.h
@@ -1,35 +1,32 @@
 #ifndef EnergySegmentFP420_h
 #define EnergySegmentFP420_h
 
+#include <vector>
 
-#include<vector>
-
-#include "G4StepPoint.hh"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
+#include "G4StepPoint.hh"
 
 // define a quantum of energy and position.
-class EnergySegmentFP420{
- public:
-  EnergySegmentFP420(): _energy(0),_position(0,0,0){}
-
-    EnergySegmentFP420(float energy,float x, float y, float z):
-      _energy(energy),_position(x,y,z){}
-
-      //      EnergySegmentFP420(float energy, G4ThreeVector position):
-      //	_energy(energy),_position(position){}
-
-      EnergySegmentFP420(float energy, Local3DPoint position):
-	_energy(energy),_position(position){}
-
-	float x() const{return _position.x();}
-	float y() const{return _position.y();}
-	float z() const{return _position.z();}
-	float energy() const { return _energy;}
- private:
-	float _energy;
-	//	G4ThreeVector  _position;
-	Local3DPoint  _position;
-};
+class EnergySegmentFP420 {
+public:
+  EnergySegmentFP420() : _energy(0), _position(0, 0, 0) {}
+
+  EnergySegmentFP420(float energy, float x, float y, float z) : _energy(energy), _position(x, y, z) {}
 
+  //      EnergySegmentFP420(float energy, G4ThreeVector position):
+  //	_energy(energy),_position(position){}
+
+  EnergySegmentFP420(float energy, Local3DPoint position) : _energy(energy), _position(position) {}
+
+  float x() const { return _position.x(); }
+  float y() const { return _position.y(); }
+  float z() const { return _position.z(); }
+  float energy() const { return _energy; }
+
+private:
+  float _energy;
+  //	G4ThreeVector  _position;
+  Local3DPoint _position;
+};
 
 #endif
diff --git a/SimRomanPot/SimFP420/interface/FP420DigiMain.h b/SimRomanPot/SimFP420/interface/FP420DigiMain.h
index ecdc998056dbd..8b7fad4a50c6c 100644
--- a/SimRomanPot/SimFP420/interface/FP420DigiMain.h
+++ b/SimRomanPot/SimFP420/interface/FP420DigiMain.h
@@ -1,8 +1,8 @@
 #ifndef FP420DigiMain_h
 #define FP420DigiMain_h
 
-#include <string>
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <string>
 
 #include "DataFormats/FP420Digi/interface/DigiCollectionFP420.h"
 #include "DataFormats/FP420Digi/interface/HDigiFP420.h"
@@ -12,63 +12,62 @@
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 //#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-#include "SimRomanPot/SimFP420/interface/ChargeDrifterFP420.h"
 #include "SimRomanPot/SimFP420/interface/CDividerFP420.h"
 #include "SimRomanPot/SimFP420/interface/ChargeDividerFP420.h"
+#include "SimRomanPot/SimFP420/interface/ChargeDrifterFP420.h"
 
-#include "SimRomanPot/SimFP420/interface/GaussNoiseProducerFP420.h"
 #include "SimRomanPot/SimFP420/interface/GaussNoiseFP420.h"
+#include "SimRomanPot/SimFP420/interface/GaussNoiseProducerFP420.h"
 
-#include "SimRomanPot/SimFP420/interface/ZeroSuppressFP420.h"
 #include "SimRomanPot/SimFP420/interface/DigiConverterFP420.h"
+#include "SimRomanPot/SimFP420/interface/ZeroSuppressFP420.h"
 //#include "SimRomanPot/SimFP420/interface/HDigiFP420.h"
 #include "SimG4CMS/FP420/interface/FP420NumberingScheme.h"
 #include <iostream>
 #include <vector>
 
-
-
-  ////////////////////////////////////////////////////////////////////
-class FP420DigiMain { 
+////////////////////////////////////////////////////////////////////
+class FP420DigiMain {
   //       interface   interface    interface:
 public:
-
-  typedef std::map<int, float, std::less<int> > hit_map_type;
+  typedef std::map<int, float, std::less<int>> hit_map_type;
   typedef float Amplitude;
 
-  typedef  DConverterFP420::DigitalMapType DigitalMapType;
-  typedef  PileUpFP420::HitToDigisMapType HitToDigisMapType;
+  typedef DConverterFP420::DigitalMapType DigitalMapType;
+  typedef PileUpFP420::HitToDigisMapType HitToDigisMapType;
 
-  FP420DigiMain(const edm::ParameterSet& conf);
+  FP420DigiMain(const edm::ParameterSet &conf);
   // FP420DigiMain();
   ~FP420DigiMain();
 
-
   // Runs the algorithm
-  //  void run(const std::vector<PSimHit*> &input, DigiCollectionFP420 &output,StripGeomDetUnit *det,GlobalVector);
-  std::vector <HDigiFP420>  run(const std::vector<PSimHit> &input, const G4ThreeVector&, unsigned int);
-  //vector <HDigiFP420>  run(const std::vector<PSimHit> &input, G4ThreeVector, unsigned int, int);
-
- private:
-  int ndigis; 
+  //  void run(const std::vector<PSimHit*> &input, DigiCollectionFP420
+  //  &output,StripGeomDetUnit *det,GlobalVector);
+  std::vector<HDigiFP420> run(const std::vector<PSimHit> &input, const G4ThreeVector &, unsigned int);
+  // vector <HDigiFP420>  run(const std::vector<PSimHit> &input, G4ThreeVector,
+  // unsigned int, int);
+
+private:
+  int ndigis;
   std::vector<short int> adcVec;
 
   edm::ParameterSet conf_;
   // Const Parameters needed by:
   //-- primary ionization
-  int    NumberOfSegments, verbosity, xytype; // 
+  int NumberOfSegments, verbosity, xytype;  //
   // go from Geant energy GeV to number of electrons
 
   //-- drift
-  float Sigma0; //=0.0007  // Charge diffusion in microns for 300 micron Si
-  float Thick300;  //=0.0300cm     or = 0.300 mm  - define 300microns for normalization 
+  float Sigma0;    //=0.0007  // Charge diffusion in microns for 300 micron Si
+  float Thick300;  //=0.0300cm     or = 0.300 mm  - define 300microns for
+                   // normalization
 
   //-- induce_signal
-  float ClusterWidth;       // Gaussian charge cutoff width in sigma units
+  float ClusterWidth;  // Gaussian charge cutoff width in sigma units
   // Should be rather called CutoffWidth?
 
-  //-- make_digis 
-  float theElectronPerADC;     // Gain, number of electrons per adc count.   =  3600 
+  //-- make_digis
+  float theElectronPerADC;  // Gain, number of electrons per adc count.   =  3600
   double thez420;
   double thezD2;
   double thezD3;
@@ -78,137 +77,127 @@ class FP420DigiMain {
   float theStripThreshold;     // Strip threshold in units of noise.  = 5
   float theStripThresholdInE;  // Strip noise in electorns.  = 2500
   //  bool peakMode; //  = false;
-  bool noNoise; //  = false; 
-  bool addNoisyPixels;//  = true ;
+  bool noNoise;         //  = false;
+  bool addNoisyPixels;  //  = true ;
   bool theApplyTofCut;
 
-  float elossCut;            
-  double tofCut;             
-  float theThreshold;          // ADC threshold   = 2
-
-  double pitchX;          // pitchX
-  double pitchY;          // pitchY
-  double pitch;          // pitch automatic
-  double pitchXW;          // pitchX
-  double pitchYW;          // pitchY
-  double pitchW;          // pitch automatic
-
-  double ldriftX;          // ldriftX
-  double ldriftY;          // ldriftY
-  double ldrift;          // ldrift automatic
-
-
-
-  double depletionVoltage; //  =   25.0       !depletion voltage [V]
-  double appliedVoltage; //  =   45.0       !bias voltage      [V]
-  double chargeMobility; //  = 480.0  !holes    mobility [cm**2/V/sec] p-side;   = 1350.0 !electron mobility - n-side
-  double temperature; //  =   
-  bool noDiffusion; //  =   true
-  double chargeDistributionRMS; //  =  5
+  float elossCut;
+  double tofCut;
+  float theThreshold;  // ADC threshold   = 2
+
+  double pitchX;   // pitchX
+  double pitchY;   // pitchY
+  double pitch;    // pitch automatic
+  double pitchXW;  // pitchX
+  double pitchYW;  // pitchY
+  double pitchW;   // pitch automatic
+
+  double ldriftX;  // ldriftX
+  double ldriftY;  // ldriftY
+  double ldrift;   // ldrift automatic
+
+  double depletionVoltage;       //  =   25.0       !depletion voltage [V]
+  double appliedVoltage;         //  =   45.0       !bias voltage      [V]
+  double chargeMobility;         //  = 480.0  !holes    mobility [cm**2/V/sec] p-side;
+                                 //  = 1350.0 !electron mobility - n-side
+  double temperature;            //  =
+  bool noDiffusion;              //  =   true
+  double chargeDistributionRMS;  //  =  5
+                                 /*
+                                    DH     =   12.3       !diffusion const for holes     [cm**2/sec]
+                                    DE     =   34.6       !diffusion const for electrons [cm**2/sec]
+                              
+                                    TGAP   = MUH*BFIELD   !tangent of Lorentz angle for holes
+                                    TGAN   = MUE*BFIELD   !tangent of Lorentz angle for electrons
+                                    W      =    0.0036    !average deposited energy per e-h pair [keV]
+                                    CMB    =    1.6E-19   !electron charge [Coulombs]
+                                    CAP    =   10.0E-15
+                                    GAINP  = 3588.7
+                                    GAINN  = 3594.8
+                              */
+  ChargeDrifterFP420 *theCDrifterFP420;
+  /*
+            interface/
+    ChargeDrifterFP420.h
+    CDrifterFP420.h
+    EnergySegmentFP420.h
+    AmplitudeSegmentFP420.h
+            src/
+    ChargeDrifterFP420.cc
+  */
+  CDividerFP420 *theCDividerFP420;
+  /*
+            interface/
+            CDividerFP420.h
+            EnergySegmentFP420.h
+  */
+  ///////////	      ChargeDividerFP420* theChargeDividerFP420;
+  /*
+            interface/
+            ChargeDividerFP420.h
+            LandauFP420.h
+            src/
+            ChargeDividerFP420.cc
+            LandauFP420.cc
+  */
+  ///////////	        IChargeFP420* theIChargeFP420;
   /*
-      DH     =   12.3       !diffusion const for holes     [cm**2/sec]
-      DE     =   34.6       !diffusion const for electrons [cm**2/sec]
-
-      TGAP   = MUH*BFIELD   !tangent of Lorentz angle for holes
-      TGAN   = MUE*BFIELD   !tangent of Lorentz angle for electrons
-      W      =    0.0036    !average deposited energy per e-h pair [keV]
-      CMB    =    1.6E-19   !electron charge [Coulombs]
-      CAP    =   10.0E-15
-      GAINP  = 3588.7
-      GAINN  = 3594.8
-*/
-              ChargeDrifterFP420* theCDrifterFP420;
-	      /*
-		        interface/
-		ChargeDrifterFP420.h
-		CDrifterFP420.h
-		EnergySegmentFP420.h
-		AmplitudeSegmentFP420.h
-	   	        src/
-		ChargeDrifterFP420.cc
-	      */
-              CDividerFP420* theCDividerFP420;
-	      /*
-		        interface/
-			CDividerFP420.h
-			EnergySegmentFP420.h
-	      */
-///////////	      ChargeDividerFP420* theChargeDividerFP420;
-	      /*
-		        interface/
-			ChargeDividerFP420.h
-			LandauFP420.h
-	   	        src/
-			ChargeDividerFP420.cc
-			LandauFP420.cc
-	      */
-///////////	        IChargeFP420* theIChargeFP420;
-	      /*
-		          interface/
-			  IChargeFP420.h            
-			  InduceChargeFP420.h
-			  src/
-			  InduceChargeFP420.cc
-	      */
-
-  GaussNoiseFP420* theGNoiseFP420;
-  PileUpFP420* thePileUpFP420;
-  HitDigitizerFP420* theHitDigitizerFP420;
-  ZeroSuppressFP420* theZSuppressFP420;
-  DigiConverterFP420* theDConverterFP420;
-
-  int theStripsInChip;           // num of columns per APV (for strip ineff.)
-
-  int numStripsX;    // number of Xstrips in the module
-  int numStripsY;    // number of Ystrips in the module
+              interface/
+              IChargeFP420.h
+              InduceChargeFP420.h
+              src/
+              InduceChargeFP420.cc
+  */
+
+  GaussNoiseFP420 *theGNoiseFP420;
+  PileUpFP420 *thePileUpFP420;
+  HitDigitizerFP420 *theHitDigitizerFP420;
+  ZeroSuppressFP420 *theZSuppressFP420;
+  DigiConverterFP420 *theDConverterFP420;
+
+  int theStripsInChip;  // num of columns per APV (for strip ineff.)
+
+  int numStripsX;   // number of Xstrips in the module
+  int numStripsY;   // number of Ystrips in the module
   int numStrips;    // number of strips in the module
-  int numStripsXW;    // number of Xstrips in the module
-  int numStripsYW;    // number of Ystrips in the module
-  int numStripsW;    // number of strips in the module
+  int numStripsXW;  // number of Xstrips in the module
+  int numStripsYW;  // number of Ystrips in the module
+  int numStripsW;   // number of strips in the module
 
   //  int numStripsMax;    // max number of strips in the module
-  float moduleThickness; // plate thickness 
+  float moduleThickness;  // plate thickness
+
+  void push_digis(const DigitalMapType &, const HitToDigisMapType &, const PileUpFP420::signal_map_type &);
 
-  void push_digis(const DigitalMapType&,
-                  const HitToDigisMapType&,
-                  const PileUpFP420::signal_map_type&
-                  );
-                                                                                                  
   //-- calibration smearing
-  bool doMissCalibrate;         // Switch on the calibration smearing
-  float theGainSmearing;        // The sigma of the gain fluctuation (around 1)
-  float theOffsetSmearing;      // The sigma of the offset fluct. (around 0)
-                                                                                                  
+  bool doMissCalibrate;     // Switch on the calibration smearing
+  float theGainSmearing;    // The sigma of the gain fluctuation (around 1)
+  float theOffsetSmearing;  // The sigma of the offset fluct. (around 0)
+
   // The PDTable
-//  HepPDTable *particleTable;
-                                                                                                  
+  //  HepPDTable *particleTable;
+
   //-- charge fluctuation
   double tMax;  // The delta production cut, should be as in OSCAR = 30keV
                 //                                           cmsim = 100keV
   // The eloss fluctuation class from G4. Is the right place?
-  LandauFP420 fluctuate; //
-  GaussNoiseProducerFP420* theNoiser; //
-  std::vector<const PSimHit*> ss;  // ss - pointers to hit info of PSimHit
-                                                                                                  
-  void fluctuateEloss(int particleId, float momentum, float eloss,
-                      float length, int NumberOfSegments,
-                      float elossVector[]);
-                                                                                                  
-//  std::vector<HDigiFP420> internal_coll; //empty vector of HDigiFP420 used in digitize // AZ
+  LandauFP420 fluctuate;               //
+  GaussNoiseProducerFP420 *theNoiser;  //
+  std::vector<const PSimHit *> ss;     // ss - pointers to hit info of PSimHit
 
+  void fluctuateEloss(
+      int particleId, float momentum, float eloss, float length, int NumberOfSegments, float elossVector[]);
 
-  std::vector<HDigiFP420> digis;
+  //  std::vector<HDigiFP420> internal_coll; //empty vector of HDigiFP420 used
+  //  in digitize // AZ
 
+  std::vector<HDigiFP420> digis;
 
-//  std::vector<HDigiFP420> digitize(StripGeomDetUnit *det);    // AZ
-//  int rn0,pn0,sn0;                                                                                          
-                                                                                                  
+  //  std::vector<HDigiFP420> digitize(StripGeomDetUnit *det);    // AZ
+  //  int rn0,pn0,sn0;
 };
-                                                                                                  
-
 
 // end of interface
-  ////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////
 
 #endif
-
diff --git a/SimRomanPot/SimFP420/interface/GNoiseFP420.h b/SimRomanPot/SimFP420/interface/GNoiseFP420.h
index c51318800a34c..fe99bddf83149 100644
--- a/SimRomanPot/SimFP420/interface/GNoiseFP420.h
+++ b/SimRomanPot/SimFP420/interface/GNoiseFP420.h
@@ -4,11 +4,11 @@
 #include "SimRomanPot/SimFP420/interface/PileUpFP420.h"
 
 // add noise
-class GNoiseFP420{
- public:
-//GNoiseFP420(int,float,float);
-  virtual ~GNoiseFP420() { }
-  
-  virtual PileUpFP420::signal_map_type addNoise(const PileUpFP420::signal_map_type&) = 0;
+class GNoiseFP420 {
+public:
+  // GNoiseFP420(int,float,float);
+  virtual ~GNoiseFP420() {}
+
+  virtual PileUpFP420::signal_map_type addNoise(const PileUpFP420::signal_map_type &) = 0;
 };
 #endif
diff --git a/SimRomanPot/SimFP420/interface/GaussNoiseFP420.h b/SimRomanPot/SimFP420/interface/GaussNoiseFP420.h
index 082fe4e63d973..4ff968565c143 100644
--- a/SimRomanPot/SimFP420/interface/GaussNoiseFP420.h
+++ b/SimRomanPot/SimFP420/interface/GaussNoiseFP420.h
@@ -4,15 +4,15 @@
 #include "SimRomanPot/SimFP420/interface/GNoiseFP420.h"
 
 // add noise for channels only with amplitudes greater  threshold
-class GaussNoiseFP420 : public GNoiseFP420{
- public:
+class GaussNoiseFP420 : public GNoiseFP420 {
+public:
   // GaussNoiseFP420(int,float,float,bool);
   GaussNoiseFP420(int ns, float nrms, float th, bool aNpixel, int verbosity);
-  PileUpFP420::signal_map_type addNoise(const PileUpFP420::signal_map_type&) override;
-  void setNumPixels(int in){numPixels = in;}
-  void setThreshold(float in){threshold = in;}
+  PileUpFP420::signal_map_type addNoise(const PileUpFP420::signal_map_type &) override;
+  void setNumPixels(int in) { numPixels = in; }
+  void setThreshold(float in) { threshold = in; }
 
- private:
+private:
   int numPixels;
   float noiseRMS;
   float threshold;
diff --git a/SimRomanPot/SimFP420/interface/GaussNoiseProducerFP420.h b/SimRomanPot/SimFP420/interface/GaussNoiseProducerFP420.h
index ca8b152b7479a..87e5ded45e547 100644
--- a/SimRomanPot/SimFP420/interface/GaussNoiseProducerFP420.h
+++ b/SimRomanPot/SimFP420/interface/GaussNoiseProducerFP420.h
@@ -4,16 +4,11 @@
 #include <map>
 
 class GaussNoiseProducerFP420 {
+public:
+  GaussNoiseProducerFP420() {}
+  ~GaussNoiseProducerFP420() {}
 
-  public:
-     
-      GaussNoiseProducerFP420(){}
-     ~GaussNoiseProducerFP420(){}
-
-      void generate(int NumberOfchannels, 
-		    float threshold,
-		    float noiseRMS, 
-		    std::map<int,float, std::less<int> >& theMap );
+  void generate(int NumberOfchannels, float threshold, float noiseRMS, std::map<int, float, std::less<int>> &theMap);
 };
 
 #endif
diff --git a/SimRomanPot/SimFP420/interface/HitDigitizerFP420.h b/SimRomanPot/SimFP420/interface/HitDigitizerFP420.h
index 6d661edb737a1..b8944ef84e040 100644
--- a/SimRomanPot/SimFP420/interface/HitDigitizerFP420.h
+++ b/SimRomanPot/SimFP420/interface/HitDigitizerFP420.h
@@ -1,56 +1,58 @@
 #ifndef HitDigitizerFP420_h
 #define HitDigitizerFP420_h
- 
+
 //#include "SimG4CMS/FP420/interface/FP420G4HitCollection.h"
 //#include "SimG4CMS/FP420/interface/FP420G4Hit.h"
-#include "SimRomanPot/SimFP420/interface/CDrifterFP420.h"
-#include "SimRomanPot/SimFP420/interface/CDividerFP420.h"
-#include "SimRomanPot/SimFP420/interface/IChargeFP420.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
+#include "SimRomanPot/SimFP420/interface/CDividerFP420.h"
+#include "SimRomanPot/SimFP420/interface/CDrifterFP420.h"
+#include "SimRomanPot/SimFP420/interface/IChargeFP420.h"
 
-
-#include<vector>
 #include <map>
+#include <vector>
 
 // Digitizes the response for a single FP420Hit
-class HitDigitizerFP420{
- public:
+class HitDigitizerFP420 {
+public:
+  typedef std::map<int, float, std::less<int>> hit_map_type;
 
-  typedef std::map<int, float, std::less<int> > hit_map_type;
-  
-  //HitDigitizerFP420(const edm::ParameterSet& conf, const ElectrodGeomDetUnit *det);
-  //HitDigitizerFP420(float in, float inp, float inpx, float inpy,float ild,float ildx,float ildy);
+  // HitDigitizerFP420(const edm::ParameterSet& conf, const ElectrodGeomDetUnit
+  // *det); HitDigitizerFP420(float in, float inp, float inpx, float inpy,float
+  // ild,float ildx,float ildy);
   HitDigitizerFP420(float in, float ild, float ildx, float ildy, float in0, float in2, float in3, int verbosity);
-  //HitDigitizerFP420(float in, float inp, float inpx, float inpy);
-  
+  // HitDigitizerFP420(float in, float inp, float inpx, float inpy);
+
   ~HitDigitizerFP420();
-  
-  void setChargeDivider(CDividerFP420* cd){
-    if (theCDividerFP420) delete theCDividerFP420;
+
+  void setChargeDivider(CDividerFP420 *cd) {
+    if (theCDividerFP420)
+      delete theCDividerFP420;
     theCDividerFP420 = cd;
   }
-  void setChargeCollectionDrifter(CDrifterFP420* cd){
-    if (theCDrifterFP420) delete theCDrifterFP420;
+  void setChargeCollectionDrifter(CDrifterFP420 *cd) {
+    if (theCDrifterFP420)
+      delete theCDrifterFP420;
     theCDrifterFP420 = cd;
   }
-  void setInduceChargeOnElectrods(IChargeFP420* cd){
-    if (theIChargeFP420) delete theIChargeFP420;
+  void setInduceChargeOnElectrods(IChargeFP420 *cd) {
+    if (theIChargeFP420)
+      delete theIChargeFP420;
     theIChargeFP420 = cd;
   }
-  
-  //CDividerFP420* getChargeDivider(){return theCDividerFP420;}
-  //CDrifterFP420* getChargeCollectionDrifter(){return theCDrifterFP420;}
-  //IChargeFP420* getInduceChargeOnElectrods(){return theIChargeFP420;}
-  
+
+  // CDividerFP420* getChargeDivider(){return theCDividerFP420;}
+  // CDrifterFP420* getChargeCollectionDrifter(){return theCDrifterFP420;}
+  // IChargeFP420* getInduceChargeOnElectrods(){return theIChargeFP420;}
+
   //  hit_map_type processHit(const PSimHit&, G4ThreeVector, int, int, double);
-  hit_map_type processHit(const PSimHit&, const G4ThreeVector&, int, int, double, int, double, double, int);
-  
- private:
-  CDividerFP420* theCDividerFP420;
-  CDrifterFP420* theCDrifterFP420;
-  IChargeFP420* theIChargeFP420;
-  
+  hit_map_type processHit(const PSimHit &, const G4ThreeVector &, int, int, double, int, double, double, int);
+
+private:
+  CDividerFP420 *theCDividerFP420;
+  CDrifterFP420 *theCDrifterFP420;
+  IChargeFP420 *theIChargeFP420;
+
   double moduleThickness;
   //  double pitch;
   // double pitchX;
@@ -62,13 +64,12 @@ class HitDigitizerFP420{
   bool noDiffusion;
   double chargeDistributionRMS;
   double gevperelectron;
-  
-  G4ThreeVector DriftDirection(const G4ThreeVector&,int,int);
-  
+
+  G4ThreeVector DriftDirection(const G4ThreeVector &, int, int);
+
   //  typedef GloballyPositioned<double>      Frame;  //  AZ
-  
-  float tanLorentzAnglePerTesla;   //Lorentz angle tangent per Tesla
-  
+
+  float tanLorentzAnglePerTesla;  // Lorentz angle tangent per Tesla
 };
 
 #endif
diff --git a/SimRomanPot/SimFP420/interface/IChargeFP420.h b/SimRomanPot/SimFP420/interface/IChargeFP420.h
index b171fbee843fb..16bcbdc670ea0 100644
--- a/SimRomanPot/SimFP420/interface/IChargeFP420.h
+++ b/SimRomanPot/SimFP420/interface/IChargeFP420.h
@@ -3,16 +3,14 @@
 
 #include "SimRomanPot/SimFP420/interface/CDrifterFP420.h"
 
-#include<map>
+#include <map>
 
 // induce signal on electrods
-class IChargeFP420{
- public:
-  
-  typedef std::map<int, float, std::less<int> > hit_map_type;
-  
-  
-  virtual ~IChargeFP420() { }
-  virtual hit_map_type induce(const CDrifterFP420::collection_type&, int, double, int, double, int, int) = 0 ;
+class IChargeFP420 {
+public:
+  typedef std::map<int, float, std::less<int>> hit_map_type;
+
+  virtual ~IChargeFP420() {}
+  virtual hit_map_type induce(const CDrifterFP420::collection_type &, int, double, int, double, int, int) = 0;
 };
 #endif
diff --git a/SimRomanPot/SimFP420/interface/InduceChargeFP420.h b/SimRomanPot/SimFP420/interface/InduceChargeFP420.h
index 3ebf68e0f1bad..2b99aec10a021 100644
--- a/SimRomanPot/SimFP420/interface/InduceChargeFP420.h
+++ b/SimRomanPot/SimFP420/interface/InduceChargeFP420.h
@@ -4,25 +4,31 @@
 #include "SimRomanPot/SimFP420/interface/IChargeFP420.h"
 //
 //
-class InduceChargeFP420: public IChargeFP420{
-//
-//
- public:
-  
-  InduceChargeFP420(double w,double g){clusterWidth=w; geVperElectron = g;}
+class InduceChargeFP420 : public IChargeFP420 {
+  //
+  //
+public:
+  InduceChargeFP420(double w, double g) {
+    clusterWidth = w;
+    geVperElectron = g;
+  }
   ~InduceChargeFP420() override {}
-//
-//
-  IChargeFP420::hit_map_type induce(const CDrifterFP420::collection_type&, int numStrips, double localPitch, int numStripsW, double localPitchW, int xytype, int verbosity) override;
-//
-//
- private:
-
-  std::vector<float> signalCoupling; 
+  //
+  //
+  IChargeFP420::hit_map_type induce(const CDrifterFP420::collection_type &,
+                                    int numStrips,
+                                    double localPitch,
+                                    int numStripsW,
+                                    double localPitchW,
+                                    int xytype,
+                                    int verbosity) override;
+  //
+  //
+private:
+  std::vector<float> signalCoupling;
 
   double clusterWidth;
   double geVperElectron;
 };
 
-
 #endif
diff --git a/SimRomanPot/SimFP420/interface/LandauFP420.h b/SimRomanPot/SimFP420/interface/LandauFP420.h
index 59646e8f81b45..fba46708f3de1 100644
--- a/SimRomanPot/SimFP420/interface/LandauFP420.h
+++ b/SimRomanPot/SimFP420/interface/LandauFP420.h
@@ -28,7 +28,7 @@
 // File name:     G4UniversalFluctuation
 //
 // Author:        Vladimir Ivanchenko
-// 
+//
 // Creation date: 03.01.2002
 //
 // Modifications:
@@ -44,42 +44,35 @@
 //
 
 #ifndef LandauFP420_h
-#define LandauFP420_h 
+#define LandauFP420_h
 
 //#include "G4VEmFluctuationModel.hh"
 
-
 class LandauFP420 {
 public:
-
   LandauFP420();
 
   ~LandauFP420();
 
-  // momentum in MeV/c, mass in MeV, tmax (delta cut) in MeV, 
+  // momentum in MeV/c, mass in MeV, tmax (delta cut) in MeV,
   // length in mm, meanLoss eloss in MeV.
-  double SampleFluctuations(const double momentum,
-			    const double mass,
-			    double& tmax,
-			    const double length,
-			    const double meanLoss);
-  
-  //G4double Dispersion(    const G4Material*,
+  double SampleFluctuations(
+      const double momentum, const double mass, double &tmax, const double length, const double meanLoss);
+
+  // G4double Dispersion(    const G4Material*,
   //                        const G4DynamicParticle*,
   //			    G4double&,
   //                        G4double&);
-  //void Initialise(const G4ParticleDefinition*);
+  // void Initialise(const G4ParticleDefinition*);
 
 protected:
-
 private:
-
   // hide assignment operator
-  //G4UniversalFluctuation & operator=(const  G4UniversalFluctuation &right);
-  //G4UniversalFluctuation(const  G4UniversalFluctuation&);
+  // G4UniversalFluctuation & operator=(const  G4UniversalFluctuation &right);
+  // G4UniversalFluctuation(const  G4UniversalFluctuation&);
 
-  //const G4ParticleDefinition* particle;
-  //const G4Material* lastMaterial;
+  // const G4ParticleDefinition* particle;
+  // const G4Material* lastMaterial;
 
   double particleMass;
   double chargeSquare;
@@ -88,7 +81,7 @@ class LandauFP420 {
   double ipotFluct;
   double electronDensity;
   //  G4double zeff;
-  
+
   double f1Fluct;
   double f2Fluct;
   double e1Fluct;
@@ -105,12 +98,10 @@ class LandauFP420 {
   double problim;
   double sumalim;
   double alim;
-  int    nmaxCont1;
-  int    nmaxCont2;
-
+  int nmaxCont1;
+  int nmaxCont2;
 };
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 
 #endif
-
diff --git a/SimRomanPot/SimFP420/interface/PileUpFP420.h b/SimRomanPot/SimFP420/interface/PileUpFP420.h
index a4849cf1dfd78..18091b43cabec 100644
--- a/SimRomanPot/SimFP420/interface/PileUpFP420.h
+++ b/SimRomanPot/SimFP420/interface/PileUpFP420.h
@@ -4,29 +4,30 @@
 #include "SimRomanPot/SimFP420/interface/HitDigitizerFP420.h"
 #include <map>
 
-class  SimHit;
+class SimHit;
 
 // Class which takes the responses from each SimHit and piles-up them.
-class PileUpFP420{
+class PileUpFP420 {
+public:
+  typedef float Amplitude;
+  typedef std::map<int, Amplitude, std::less<int>> signal_map_type;
+  typedef std::map<int, std::vector<std::pair<const PSimHit *, Amplitude>>, std::less<int>> HitToDigisMapType;
 
- public:
+  virtual ~PileUpFP420() {}
 
-  typedef float Amplitude;
-  typedef std::map< int, Amplitude, std::less<int> >  signal_map_type;
-  typedef std::map< int , std::vector < std::pair < const PSimHit*, Amplitude > >, std::less<int> >  HitToDigisMapType;
+  PileUpFP420() { reset(); }
+  virtual void add(const HitDigitizerFP420::hit_map_type &, const PSimHit &hit, int);
+  void reset() {
+    resetLink();
+    resetSignal();
+  }
+  signal_map_type dumpSignal() { return theMap; }
+  HitToDigisMapType dumpLink() { return theMapLink; }
 
-  virtual ~PileUpFP420(){}
-  
-  PileUpFP420(){reset();}
-  virtual void add(const HitDigitizerFP420::hit_map_type&, const PSimHit& hit, int);
-  void reset(){resetLink();resetSignal();}
-  signal_map_type dumpSignal() {return theMap;}
-  HitToDigisMapType dumpLink() {return theMapLink;}
- private:
+private:
   void resetLink();
   void resetSignal();
   HitToDigisMapType theMapLink;
   signal_map_type theMap;
-
 };
 #endif
diff --git a/SimRomanPot/SimFP420/interface/ZSuppressFP420.h b/SimRomanPot/SimFP420/interface/ZSuppressFP420.h
index 96470e6814777..d155ea3828634 100644
--- a/SimRomanPot/SimFP420/interface/ZSuppressFP420.h
+++ b/SimRomanPot/SimFP420/interface/ZSuppressFP420.h
@@ -3,14 +3,12 @@
 
 #include "SimRomanPot/SimFP420/interface/DConverterFP420.h"
 
+class ZSuppressFP420 {
+public:
+  typedef DConverterFP420::DigitalMapType DigitalMapType;
 
-class ZSuppressFP420{
- public:
-  
-  typedef  DConverterFP420::DigitalMapType DigitalMapType;
-    
-  virtual ~ZSuppressFP420() {  }
-  virtual DigitalMapType zeroSuppress(const DigitalMapType&, int) = 0;
+  virtual ~ZSuppressFP420() {}
+  virtual DigitalMapType zeroSuppress(const DigitalMapType &, int) = 0;
 };
- 
+
 #endif
diff --git a/SimRomanPot/SimFP420/interface/ZeroSuppressFP420.h b/SimRomanPot/SimFP420/interface/ZeroSuppressFP420.h
index ac175843aeff2..9add21fc97c48 100644
--- a/SimRomanPot/SimFP420/interface/ZeroSuppressFP420.h
+++ b/SimRomanPot/SimFP420/interface/ZeroSuppressFP420.h
@@ -1,24 +1,23 @@
 #ifndef ZeroSuppressFP420_h
 #define ZeroSuppressFP420_h
 
-#include "SimRomanPot/SimFP420/interface/ZSuppressFP420.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "SimRomanPot/SimFP420/interface/ZSuppressFP420.h"
 
-class ZeroSuppressFP420 : public ZSuppressFP420{
- public:
-   
+class ZeroSuppressFP420 : public ZSuppressFP420 {
+public:
   /* Read  the noise in the channels.*/
-  ZeroSuppressFP420(const edm::ParameterSet& conf, float noise);
+  ZeroSuppressFP420(const edm::ParameterSet &conf, float noise);
   ~ZeroSuppressFP420() override {}
 
   /* calculates the lower and high signal thresholds using the noise */
-  void initParams(const edm::ParameterSet& conf_);
- 
-  ZSuppressFP420::DigitalMapType zeroSuppress(const DigitalMapType&,int) override;
-  
-  ZSuppressFP420::DigitalMapType trkFEDclusterizer(const DigitalMapType&,int); 
-  
- private:
+  void initParams(const edm::ParameterSet &conf_);
+
+  ZSuppressFP420::DigitalMapType zeroSuppress(const DigitalMapType &, int) override;
+
+  ZSuppressFP420::DigitalMapType trkFEDclusterizer(const DigitalMapType &, int);
+
+private:
   float noiseInAdc;
   short theFEDalgorithm;
   float theFEDlowThresh;
@@ -30,5 +29,5 @@ class ZeroSuppressFP420 : public ZSuppressFP420{
   double lowthreshConf;
   double highthreshConf;
 };
- 
+
 #endif
diff --git a/SimRomanPot/SimFP420/plugins/DigitizerFP420.cc b/SimRomanPot/SimFP420/plugins/DigitizerFP420.cc
index ee20e76656a6a..fce6d98b2bcfb 100644
--- a/SimRomanPot/SimFP420/plugins/DigitizerFP420.cc
+++ b/SimRomanPot/SimFP420/plugins/DigitizerFP420.cc
@@ -2,7 +2,7 @@
 // File: DigitizerFP420.cc
 // Date: 12.2006
 // Description: DigitizerFP420 for FP420
-// Modifications: 
+// Modifications:
 ///////////////////////////////////////////////////////////////////////////////
 //
 // system include files
@@ -11,413 +11,438 @@
 #include "DataFormats/Common/interface/DetSetVector.h"
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
 #include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 ///////////////////////////////////////////////////////////////////////////
 #include "SimRomanPot/SimFP420/interface/DigitizerFP420.h"
 
 #include "DataFormats/FP420Digi/interface/DigiCollectionFP420.h"
 #include "DataFormats/FP420Digi/interface/HDigiFP420.h"
 
-//needed for the geometry:
-#include "FWCore/Framework/interface/EventSetup.h"
+// needed for the geometry:
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 #include "Geometry/CommonDetUnit/interface/GeomDetType.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
 
-//Random Number
+// Random Number
+#include "CLHEP/Random/RandomEngine.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include "CLHEP/Random/RandomEngine.h"
+#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 
 // G4 stuff
+#include "G4HCofThisEvent.hh"
+#include "G4ProcessManager.hh"
 #include "G4SDManager.hh"
 #include "G4Step.hh"
 #include "G4Track.hh"
-#include "G4VProcess.hh"
-#include "G4HCofThisEvent.hh"
-#include "G4UserEventAction.hh"
 #include "G4TransportationManager.hh"
-#include "G4ProcessManager.hh"
+#include "G4UserEventAction.hh"
+#include "G4VProcess.hh"
 
-#include <cstdlib> 
+#include <cstdlib>
 #include <vector>
 
 using namespace std;
 
-namespace cms
-{
-  DigitizerFP420::DigitizerFP420(const edm::ParameterSet& conf):conf_(conf),stripDigitizer_(new FP420DigiMain(conf)) {
-    
-    std::string alias ( conf.getParameter<std::string>("@module_label") );
-    
+namespace cms {
+  DigitizerFP420::DigitizerFP420(const edm::ParameterSet &conf)
+      : conf_(conf), stripDigitizer_(new FP420DigiMain(conf)) {
+    std::string alias(conf.getParameter<std::string>("@module_label"));
+
     //  produces<edm::DetSetVector<HDigiFP420> >().setBranchAlias( alias );
-    //  produces<edm::DetSetVector<HDigiFP420SimLink> >().setBranchAlias ( alias + "hDigiFP420SimLink");
-    produces<DigiCollectionFP420>().setBranchAlias( alias );
-    
+    //  produces<edm::DetSetVector<HDigiFP420SimLink> >().setBranchAlias ( alias +
+    //  "hDigiFP420SimLink");
+    produces<DigiCollectionFP420>().setBranchAlias(alias);
+
     trackerContainers.clear();
-    trackerContainers = conf.getParameter<std::vector<std::string> >("ROUList");
-    
+    trackerContainers = conf.getParameter<std::vector<std::string>>("ROUList");
+
     verbosity = conf_.getUntrackedParameter<int>("VerbosityLevel");
-    dn0   = conf_.getParameter<int>("NumberFP420Detectors");
-    sn0   = conf_.getParameter<int>("NumberFP420Stations");
+    dn0 = conf_.getParameter<int>("NumberFP420Detectors");
+    sn0 = conf_.getParameter<int>("NumberFP420Stations");
     pn0 = conf_.getParameter<int>("NumberFP420SPlanes");
-      rn0 = 7;
-    //rn0 = 3;
-    
+    rn0 = 7;
+    // rn0 = 3;
+
     //  produces<DigiCollectionFP420>();
-    
+
     //  produces<StripDigiCollection>();
     //   produces<HDigiFP420>();
-    //  produces<edm::DetSetVector<HDigiFP420> >().setBranchAlias( alias );  
-    
+    //  produces<edm::DetSetVector<HDigiFP420> >().setBranchAlias( alias );
+
     //  produces<DigiCollectionFP420>();
     // produces<DigiCollectionFP420>("HDigiFP420");
-    
+
     //  produces<edm::DigiCollectionFP420>();
-    
+
     //   produces<edm::DetSetVector<DigiCollectionFP420> >();
-    
-    if(verbosity>0) {
+
+    if (verbosity > 0) {
       std::cout << "Creating a DigitizerFP420" << std::endl;
-      std::cout << "DigitizerFP420: dn0=" << dn0 << " sn0=" << sn0 << " pn0=" << pn0 <<  " rn0=" << rn0 << std::endl;
-      std::cout << "DigitizerFP420:trackerContainers.size()=" << trackerContainers.size() << std::endl;      
+      std::cout << "DigitizerFP420: dn0=" << dn0 << " sn0=" << sn0 << " pn0=" << pn0 << " rn0=" << rn0 << std::endl;
+      std::cout << "DigitizerFP420:trackerContainers.size()=" << trackerContainers.size() << std::endl;
     }
   }
-  
+
   // Virtual destructor needed.
-  DigitizerFP420::~DigitizerFP420() { 
-    if(verbosity>0) {
+  DigitizerFP420::~DigitizerFP420() {
+    if (verbosity > 0) {
       std::cout << "Destroying a DigitizerFP420" << std::endl;
     }
     delete stripDigitizer_;
-  }  
-  //  void DigitizerFP420::produce(PSimHitCollection *   theCAFI, DigiCollectionFP420 & output) {
-  void DigitizerFP420::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)  {
+  }
+  //  void DigitizerFP420::produce(PSimHitCollection *   theCAFI,
+  //  DigiCollectionFP420 & output) {
+  void DigitizerFP420::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
     // be lazy and include the appropriate namespaces
-    using namespace edm; 
-    using namespace std;   
-    
-    if(verbosity>0) {
-      std::cout <<" ===" << std::endl;
-      std::cout <<" ============== DigitizerFP420: start   produce= " << std::endl;
-      std::cout <<" ===" << std::endl;
+    using namespace edm;
+    using namespace std;
+
+    if (verbosity > 0) {
+      std::cout << " ===" << std::endl;
+      std::cout << " ============== DigitizerFP420: start   produce= " << std::endl;
+      std::cout << " ===" << std::endl;
     }
     // Get input
     //    std::cout << "DigitizerFP420 start produce" << std::endl;
     //  edm::ESHandle < ParticleDataTable > pdt;
     //  iSetup.getData( pdt );
-    
+
     // Step A: Get Inputs for allTrackerHits
-    
-    edm::Handle<CrossingFrame<PSimHit> > cf_simhit;
+
+    edm::Handle<CrossingFrame<PSimHit>> cf_simhit;
     std::vector<const CrossingFrame<PSimHit> *> cf_simhitvec;
-    for(uint32_t i = 0; i< trackerContainers.size();i++){
-      iEvent.getByLabel("mix",trackerContainers[i],cf_simhit);
-      cf_simhitvec.push_back(cf_simhit.product());   }
-    std::unique_ptr<MixCollection<PSimHit> > allTrackerHits(new MixCollection<PSimHit>(cf_simhitvec));
-    
+    for (uint32_t i = 0; i < trackerContainers.size(); i++) {
+      iEvent.getByLabel("mix", trackerContainers[i], cf_simhit);
+      cf_simhitvec.push_back(cf_simhit.product());
+    }
+    std::unique_ptr<MixCollection<PSimHit>> allTrackerHits(new MixCollection<PSimHit>(cf_simhitvec));
+
     // use instead of the previous
-    /*    
-	  std::cout <<" ============== DigitizerFP420: start loop           1   " << std::endl;
-	  edm::Handle<CrossingFrame<PSimHit> > xFrame;
-	  std::cout <<" ============== DigitizerFP420: start loop           2   " << std::endl;
-	  iEvent.getByLabel("mix","FP420SI",xFrame);
-	  std::cout <<" ============== DigitizerFP420: start loop           3   " << std::endl;
-	  std::unique_ptr<MixCollection<PSimHit> > allTrackerHits( new MixCollection<PSimHit>(xFrame.product()) );
-	  std::cout <<" ============== DigitizerFP420: start loop           4   " << std::endl;
-    */
-        
-    //Loop on PSimHit
-    
-    
+    /*
+        std::cout <<" ============== DigitizerFP420: start loop           1   "
+     << std::endl; edm::Handle<CrossingFrame<PSimHit> > xFrame; std::cout <<"
+     ============== DigitizerFP420: start loop           2   " << std::endl;
+        iEvent.getByLabel("mix","FP420SI",xFrame);
+        std::cout <<" ============== DigitizerFP420: start loop           3   "
+     << std::endl; std::unique_ptr<MixCollection<PSimHit> > allTrackerHits( new
+     MixCollection<PSimHit>(xFrame.product()) ); std::cout <<" ==============
+     DigitizerFP420: start loop           4   " << std::endl;
+  */
+
+    // Loop on PSimHit
+
     ///////////////////////////////////////////////////////////////////////
-      // Step C: create empty output collection
-      std::unique_ptr<DigiCollectionFP420> output(new DigiCollectionFP420);
-      //  std::unique_ptr<edm::DetSetVector<HDigiFP420> > outputfinal(new edm::DetSetVector<HDigiFP420>(output) );
-      //  std::unique_ptr<edm::DetSetVector<HDigiFP420> > outputfinal(new edm::DetSetVector<HDigiFP420>(output) );
-      //  std::unique_ptr<edm::DetSetVector<HDigiFP420SimLink> > outputlink(new edm::DetSetVector<HDigiFP420SimLink>(output) );
-      
-      SimHitMap.clear();
-      
-      // ==================================
-      if(verbosity>0) {
-	std::cout <<" ===" << std::endl;
-	std::cout <<" ============== DigitizerFP420: MixCollection treatment= " << std::endl;
-	std::cout <<" ===" << std::endl;
-      }
-      
-      MixCollection<PSimHit>::iterator isim;
-      for (isim=allTrackerHits->begin(); isim!= allTrackerHits->end();isim++) {
-	unsigned int unitID = (*isim).detUnitId();
-	int det, zside, sector, zmodule; 
-	FP420NumberingScheme::unpackFP420Index(unitID, det, zside, sector, zmodule);
-	// below, the continues plane index should be (for even different sensor index zside)
-	//	unsigned int intindex = packMYIndex(rn0, pn0, sn0, det, zside, sector, zmodule);
-	unsigned int intindex = FP420NumberingScheme::packMYIndex(rn0, pn0, sn0, det, zside, sector, zmodule);
-	//	int zScale=(rn0-1), sScale = (rn0-1)*(pn0-1), dScale = (rn0-1)*(pn0-1)*(sn0-1);
-	//	unsigned int intindex = dScale*(det - 1)+sScale*(sector - 1)+zScale*(zmodule - 1)+zside;
-
-	if(verbosity>0) {
-	  double  losenergy = (*isim).energyLoss();
-	  std::cout <<" ===" << std::endl;
-	  std::cout <<" ============== DigitizerFP420:  losenergy= " << losenergy << std::endl;
-	  std::cout <<" === for intindex = " << intindex << std::endl;
-	}
-	// does not matter which index is used: intindex or unitID - mainly to collect hits under every index	
-	SimHitMap[intindex].push_back((*isim));
-	// for development later one( cal be used another index):
-	//	SimHitMap[unitID].push_back((*isim));
-      }
-      //============================================================================================================================
-      
-      if(verbosity>0) {
-	std::cout <<" ===" << std::endl;
-	std::cout <<" ============== DigitizerFP420: put zero to container " << std::endl;
-	std::cout <<" ===" << std::endl;
-      }
-      //    put zero to container info from the beginning (important! because not any detID is updated with coming of new event     !!!!!!   
-      // clean info of container from previous event
-      for (int det=1; det<dn0; det++) {
-	for (int sector=1; sector<sn0; sector++) {
-	  for (int zmodule=1; zmodule<pn0; zmodule++) {
-	    for (int zside=1; zside<rn0; zside++) {
-	      // intindex is a continues numbering of FP420
-	      unsigned int detID = FP420NumberingScheme::packMYIndex(rn0, pn0, sn0, det, zside, sector, zmodule);
-	      // int zScale=(rn0-1), sScale = (rn0-1)*(pn0-1), dScale = (rn0-1)*(pn0-1)*(sn0-1);
-	      // unsigned int detID = dScale*(det - 1)+sScale*(sector - 1)+zScale*(zmodule - 1)+zside;
-	      std::vector<HDigiFP420> collector;
-	      collector.clear();
-	      DigiCollectionFP420::Range inputRange;
-	      inputRange.first = collector.begin();
-	      inputRange.second = collector.end();
-	      output->putclear(inputRange,detID);
-	    }//for
-	  }//for
-	}//for
-      }//for
-      //                                                                                                                      !!!!!!   
-      // if we want to keep Digi container/Collection for one event uncomment the line below and vice versa
-      output->clear();   //container_.clear() --> start from the beginning of the container
-      
-      //============================================================================================================================================
-      
-      
-      if(verbosity>0) {
-	std::cout <<" ===" << std::endl;
-	std::cout <<" ============== DigitizerFP420: start loop over det iu " << std::endl;
-	std::cout <<" ============== DigitizerFP420: SimHitMap.size()= " << SimHitMap.size() << std::endl;
-	std::cout <<" ===" << std::endl;
-      }
-      bool first = true;
-
-      /////for development later one
-      /*      
-      if(verbosity>0) std::cout <<"=======  DigitizerFP420:  SimHitMap size = " << SimHitMap.size() << std::endl;
-      for(unsigned int i = 0; i < SimHitMap.size(); i++ ) {
-	//	  std::cout <<" ====== DigitizerFP420:                                                      i= " << i << std::endl;
-	vector<PSimHit>::const_iterator simHitIter = SimHitMap[i].begin();
-	vector<PSimHit>::const_iterator simHitIterEnd = SimHitMap[i].end();
-	for (;simHitIter != simHitIterEnd; ++simHitIter) {
-	  const PSimHit ihit = *simHitIter;
-	  unsigned int unitID = ihit.detUnitId();
-	  if(verbosity>0) std::cout <<" ====== DigitizerFP420: unitID= " << unitID << " i=  " << i << std::endl;
-	  int det, zside, sector, zmodule; 
-	  FP420NumberingScheme::unpackFP420Index(unitID, det, zside, sector, zmodule);
-	  int zScale=(rn0-1), sScale = (rn0-1)*(pn0-1), dScale = (rn0-1)*(pn0-1)*(sn0-1);
-	  unsigned int iu = dScale*(det - 1)+sScale*(sector - 1)+zScale*(zmodule - 1)+zside;
-	}
+    // Step C: create empty output collection
+    std::unique_ptr<DigiCollectionFP420> output(new DigiCollectionFP420);
+    //  std::unique_ptr<edm::DetSetVector<HDigiFP420> > outputfinal(new
+    //  edm::DetSetVector<HDigiFP420>(output) );
+    //  std::unique_ptr<edm::DetSetVector<HDigiFP420> > outputfinal(new
+    //  edm::DetSetVector<HDigiFP420>(output) );
+    //  std::unique_ptr<edm::DetSetVector<HDigiFP420SimLink> > outputlink(new
+    //  edm::DetSetVector<HDigiFP420SimLink>(output) );
+
+    SimHitMap.clear();
+
+    // ==================================
+    if (verbosity > 0) {
+      std::cout << " ===" << std::endl;
+      std::cout << " ============== DigitizerFP420: MixCollection treatment= " << std::endl;
+      std::cout << " ===" << std::endl;
+    }
+
+    MixCollection<PSimHit>::iterator isim;
+    for (isim = allTrackerHits->begin(); isim != allTrackerHits->end(); isim++) {
+      unsigned int unitID = (*isim).detUnitId();
+      int det, zside, sector, zmodule;
+      FP420NumberingScheme::unpackFP420Index(unitID, det, zside, sector, zmodule);
+      // below, the continues plane index should be (for even different sensor
+      // index zside)
+      //	unsigned int intindex = packMYIndex(rn0, pn0, sn0, det, zside, sector,
+      // zmodule);
+      unsigned int intindex = FP420NumberingScheme::packMYIndex(rn0, pn0, sn0, det, zside, sector, zmodule);
+      //	int zScale=(rn0-1), sScale = (rn0-1)*(pn0-1), dScale =
+      //(rn0-1)*(pn0-1)*(sn0-1); 	unsigned int intindex = dScale*(det -
+      // 1)+sScale*(sector - 1)+zScale*(zmodule - 1)+zside;
+
+      if (verbosity > 0) {
+        double losenergy = (*isim).energyLoss();
+        std::cout << " ===" << std::endl;
+        std::cout << " ============== DigitizerFP420:  losenergy= " << losenergy << std::endl;
+        std::cout << " === for intindex = " << intindex << std::endl;
       }
+      // does not matter which index is used: intindex or unitID - mainly to
+      // collect hits under every index
+      SimHitMap[intindex].push_back((*isim));
+      // for development later one( cal be used another index):
+      //	SimHitMap[unitID].push_back((*isim));
+    }
+    //============================================================================================================================
+
+    if (verbosity > 0) {
+      std::cout << " ===" << std::endl;
+      std::cout << " ============== DigitizerFP420: put zero to container " << std::endl;
+      std::cout << " ===" << std::endl;
+    }
+    //    put zero to container info from the beginning (important! because not
+    //    any detID is updated with coming of new event     !!!!!!
+    // clean info of container from previous event
+    for (int det = 1; det < dn0; det++) {
+      for (int sector = 1; sector < sn0; sector++) {
+        for (int zmodule = 1; zmodule < pn0; zmodule++) {
+          for (int zside = 1; zside < rn0; zside++) {
+            // intindex is a continues numbering of FP420
+            unsigned int detID = FP420NumberingScheme::packMYIndex(rn0, pn0, sn0, det, zside, sector, zmodule);
+            // int zScale=(rn0-1), sScale = (rn0-1)*(pn0-1), dScale =
+            // (rn0-1)*(pn0-1)*(sn0-1); unsigned int detID = dScale*(det -
+            // 1)+sScale*(sector - 1)+zScale*(zmodule - 1)+zside;
+            std::vector<HDigiFP420> collector;
+            collector.clear();
+            DigiCollectionFP420::Range inputRange;
+            inputRange.first = collector.begin();
+            inputRange.second = collector.end();
+            output->putclear(inputRange, detID);
+          }  // for
+        }    // for
+      }      // for
+    }        // for
+    //                                                                                                                      !!!!!!
+    // if we want to keep Digi container/Collection for one event uncomment the
+    // line below and vice versa
+    output->clear();  // container_.clear() --> start from the beginning of the
+                      // container
+
+    //============================================================================================================================================
+
+    if (verbosity > 0) {
+      std::cout << " ===" << std::endl;
+      std::cout << " ============== DigitizerFP420: start loop over det iu " << std::endl;
+      std::cout << " ============== DigitizerFP420: SimHitMap.size()= " << SimHitMap.size() << std::endl;
+      std::cout << " ===" << std::endl;
+    }
+    bool first = true;
+
+    /////for development later one
+    /*
+  if(verbosity>0) std::cout <<"=======  DigitizerFP420:  SimHitMap size = " <<
+  SimHitMap.size() << std::endl; for(unsigned int i = 0; i < SimHitMap.size();
+  i++ ) {
+    //	  std::cout <<" ====== DigitizerFP420: i= " << i << std::endl;
+    vector<PSimHit>::const_iterator simHitIter = SimHitMap[i].begin();
+    vector<PSimHit>::const_iterator simHitIterEnd = SimHitMap[i].end();
+    for (;simHitIter != simHitIterEnd; ++simHitIter) {
+      const PSimHit ihit = *simHitIter;
+      unsigned int unitID = ihit.detUnitId();
+      if(verbosity>0) std::cout <<" ====== DigitizerFP420: unitID= " << unitID
+  << " i=  " << i << std::endl; int det, zside, sector, zmodule;
+      FP420NumberingScheme::unpackFP420Index(unitID, det, zside, sector,
+  zmodule); int zScale=(rn0-1), sScale = (rn0-1)*(pn0-1), dScale =
+  (rn0-1)*(pn0-1)*(sn0-1); unsigned int iu = dScale*(det - 1)+sScale*(sector -
+  1)+zScale*(zmodule - 1)+zside;
+    }
+  }
 */
-      ////////////////////////
-      //============================================================================================================================================
-      // new:   <------
-      for(unsigned int i = 0; i < SimHitMap.size(); i++ ) {
-	vector<PSimHit>::const_iterator simHitIter = SimHitMap[i].begin();
-	vector<PSimHit>::const_iterator simHitIterEnd = SimHitMap[i].end();
-	for (;simHitIter != simHitIterEnd; ++simHitIter) {
-	  const PSimHit ihit = *simHitIter;
-	  unsigned int unitID = ihit.detUnitId();
-	  if(verbosity>0 || verbosity==-50) std::cout <<" ====== DigitizerFP420: unitID= " << unitID << "Hit number i=  " << i << std::endl;
-	  int det, zside, sector, zmodule; 
-	  FP420NumberingScheme::unpackFP420Index(unitID, det, zside, sector, zmodule);
-	  
-	  unsigned int iu = FP420NumberingScheme::packMYIndex(rn0, pn0, sn0, det, zside, sector, zmodule);
-	  if(verbosity>0 || verbosity==-50) std::cout <<"for Hits iu = " << iu <<" sector = " << sector <<" zmodule = " << zmodule <<" zside = " << zside << "  det=" << det << std::endl;
-	  //   int zScale=(rn0-1), sScale = (rn0-1)*(pn0-1), dScale = (rn0-1)*(pn0-1)*(sn0-1);
-	  //  unsigned int iu = dScale*(det - 1)+sScale*(sector - 1)+zScale*(zmodule - 1)+zside;
-
-	  if(verbosity>0) {
-	    unsigned int index = FP420NumberingScheme::packFP420Index(det, zside, sector, zmodule);
-	    std::cout << " DigitizerFP420:       index = " <<  index <<  " iu = " << iu  << std::endl;
-	  }
-	  
-	  //    GlobalVector bfield=pSetup->inTesla((*iu)->surface().position());
-	  //      CLHEP::Hep3Vector Bfieldloc=bfield();
-	  G4ThreeVector bfield(  0.,  0.,  0.0  );
-	  //	G4ThreeVector bfield(  0.5,  0.5,  1.0  );
-	  
-	  
-	  if(verbosity>0) {
-	    std::cout <<" ===" << std::endl;
-	    std::cout <<" ============== DigitizerFP420:  call run for iu= " << iu << std::endl;
-	    std::cout <<" ===" << std::endl;
-	  }
-	  collector.clear();
-	  
-	  collector= stripDigitizer_->run( SimHitMap[iu],
-					   bfield,
-					   iu
-					   ); // stripDigitizer_.run...  return 
-	  //						 ,sScale
-	  
-	  
-	  
-	  if(verbosity>0) {
-	    std::cout <<" ===" << std::endl;
-	    std::cout <<" ===" << std::endl;
-	    std::cout <<"=======  DigitizerFP420:  collector size = " << collector.size() << std::endl;
-	    std::cout <<" ===" << std::endl;
-	    std::cout <<" ===" << std::endl;
-	  }	      
-	  /*		
-	    
-	  std::vector<HDigiFP420> collector;
-	  collector.clear();
-	  DigiCollectionFP420::Range inputRange;
-	  inputRange.first = collector.begin();
-	  inputRange.second = collector.end();
-	  output->putclear(inputRange,detID);
-	  */
-	  if (!collector.empty()){
-	    if(verbosity>0) {
-	      std::cout <<"         ============= DigitizerFP420:collector start!!!!!!!!!!!!!!" << std::endl;
-	    }
-	    DigiCollectionFP420::Range outputRange;
-	    outputRange.first = collector.begin();
-	    outputRange.second = collector.end();
-	    
-	    if ( first ) {
-	      // use it only if ClusterCollectionFP420 is the ClusterCollection of one event, otherwise, do not use (loose 1st cl. of 1st event only)
-	      first = false;
-	      unsigned int  detID0= 0;
-	      output->put(outputRange,detID0); // !!! put into adress 0 for detID which will not be used never
-	    } //if ( first ) 
-	    
-	    // put !!!
-	    output->put(outputRange,iu);
-	    
-	  } // if(collector.size()>0
-	  
-	  //   }   // for
-	  // }   // for
-	  //	}   // for
-	  // }   // for
-	  
-	}//for
-      }//for
-      
-      // END
-      
-      /*      
-      if(verbosity>0) {
-	std::vector<HDigiFP420> theAllDigis;
-	theAllDigis.clear();
-	DigiCollectionFP420::Range outputRange;
-	DigiCollectionFP420::ContainerIterator sort_begin = outputRange.first;
-	DigiCollectionFP420::ContainerIterator sort_end = outputRange.second;
-	theAllDigis.insert(theAllDigis.end(), sort_begin, sort_end);
-	std::cout <<"======  theAllDigis size = " << theAllDigis.size() << std::endl;
-	for (std::vector<HDigiFP420>::iterator isim = theAllDigis.begin();
-	     isim != theAllDigis.end(); ++isim){
-	  const HDigiFP420 istrip = *isim;
-	  std::cout << "*******************************************DigitizerFP420:check1" << std::endl;
-	  std::cout << " strip number=" << istrip.strip() << "  adc=" << istrip.adc() << std::endl;
-	  std::cout <<" channel =" << istrip.channel() <<" V " << istrip.stripV() <<" VW " << istrip.stripVW() << std::endl;
-	  std::cout <<" ===" << std::endl;
-	  std::cout <<" ===" << std::endl;
-	  std::cout <<" =======================" << std::endl;
-	}// for
-      }
+    ////////////////////////
+    //============================================================================================================================================
+    // new:   <------
+    for (unsigned int i = 0; i < SimHitMap.size(); i++) {
+      vector<PSimHit>::const_iterator simHitIter = SimHitMap[i].begin();
+      vector<PSimHit>::const_iterator simHitIterEnd = SimHitMap[i].end();
+      for (; simHitIter != simHitIterEnd; ++simHitIter) {
+        const PSimHit ihit = *simHitIter;
+        unsigned int unitID = ihit.detUnitId();
+        if (verbosity > 0 || verbosity == -50)
+          std::cout << " ====== DigitizerFP420: unitID= " << unitID << "Hit number i=  " << i << std::endl;
+        int det, zside, sector, zmodule;
+        FP420NumberingScheme::unpackFP420Index(unitID, det, zside, sector, zmodule);
+
+        unsigned int iu = FP420NumberingScheme::packMYIndex(rn0, pn0, sn0, det, zside, sector, zmodule);
+        if (verbosity > 0 || verbosity == -50)
+          std::cout << "for Hits iu = " << iu << " sector = " << sector << " zmodule = " << zmodule
+                    << " zside = " << zside << "  det=" << det << std::endl;
+        //   int zScale=(rn0-1), sScale = (rn0-1)*(pn0-1), dScale =
+        //   (rn0-1)*(pn0-1)*(sn0-1);
+        //  unsigned int iu = dScale*(det - 1)+sScale*(sector - 1)+zScale*(zmodule
+        //  - 1)+zside;
+
+        if (verbosity > 0) {
+          unsigned int index = FP420NumberingScheme::packFP420Index(det, zside, sector, zmodule);
+          std::cout << " DigitizerFP420:       index = " << index << " iu = " << iu << std::endl;
+        }
+
+        //    GlobalVector bfield=pSetup->inTesla((*iu)->surface().position());
+        //      CLHEP::Hep3Vector Bfieldloc=bfield();
+        G4ThreeVector bfield(0., 0., 0.0);
+        //	G4ThreeVector bfield(  0.5,  0.5,  1.0  );
+
+        if (verbosity > 0) {
+          std::cout << " ===" << std::endl;
+          std::cout << " ============== DigitizerFP420:  call run for iu= " << iu << std::endl;
+          std::cout << " ===" << std::endl;
+        }
+        collector.clear();
+
+        collector = stripDigitizer_->run(SimHitMap[iu], bfield,
+                                         iu);  // stripDigitizer_.run...  return
+        //						 ,sScale
+
+        if (verbosity > 0) {
+          std::cout << " ===" << std::endl;
+          std::cout << " ===" << std::endl;
+          std::cout << "=======  DigitizerFP420:  collector size = " << collector.size() << std::endl;
+          std::cout << " ===" << std::endl;
+          std::cout << " ===" << std::endl;
+        }
+        /*
+
+      std::vector<HDigiFP420> collector;
+      collector.clear();
+      DigiCollectionFP420::Range inputRange;
+      inputRange.first = collector.begin();
+      inputRange.second = collector.end();
+      output->putclear(inputRange,detID);
+      */
+        if (!collector.empty()) {
+          if (verbosity > 0) {
+            std::cout << "         ============= DigitizerFP420:collector "
+                         "start!!!!!!!!!!!!!!"
+                      << std::endl;
+          }
+          DigiCollectionFP420::Range outputRange;
+          outputRange.first = collector.begin();
+          outputRange.second = collector.end();
+
+          if (first) {
+            // use it only if ClusterCollectionFP420 is the ClusterCollection of
+            // one event, otherwise, do not use (loose 1st cl. of 1st event only)
+            first = false;
+            unsigned int detID0 = 0;
+            output->put(outputRange, detID0);  // !!! put into adress 0 for detID
+                                               // which will not be used never
+          }                                    // if ( first )
+
+          // put !!!
+          output->put(outputRange, iu);
+
+        }  // if(collector.size()>0
+
+        //   }   // for
+        // }   // for
+        //	}   // for
+        // }   // for
+
+      }  // for
+    }    // for
+
+    // END
+
+    /*
+  if(verbosity>0) {
+    std::vector<HDigiFP420> theAllDigis;
+    theAllDigis.clear();
+    DigiCollectionFP420::Range outputRange;
+    DigiCollectionFP420::ContainerIterator sort_begin = outputRange.first;
+    DigiCollectionFP420::ContainerIterator sort_end = outputRange.second;
+    theAllDigis.insert(theAllDigis.end(), sort_begin, sort_end);
+    std::cout <<"======  theAllDigis size = " << theAllDigis.size() <<
+  std::endl; for (std::vector<HDigiFP420>::iterator isim = theAllDigis.begin();
+         isim != theAllDigis.end(); ++isim){
+      const HDigiFP420 istrip = *isim;
+      std::cout <<
+  "*******************************************DigitizerFP420:check1" <<
+  std::endl; std::cout << " strip number=" << istrip.strip() << "  adc=" <<
+  istrip.adc() << std::endl; std::cout <<" channel =" << istrip.channel() <<" V
+  " << istrip.stripV() <<" VW " << istrip.stripVW() << std::endl; std::cout <<"
+  ===" << std::endl; std::cout <<" ===" << std::endl; std::cout <<"
+  =======================" << std::endl;
+    }// for
+  }
 */
-      if(verbosity==-50) {
-	//     check of access to the collector:
-	for (int det=1; det<dn0; det++) {
-	  for (int sector=1; sector<sn0; sector++) {
-	    for (int zmodule=1; zmodule<pn0; zmodule++) {
-	      for (int zside=1; zside<rn0; zside++) {
-		unsigned int iu = FP420NumberingScheme::packMYIndex(rn0, pn0, sn0, det, zside, sector, zmodule);
-		int layer = FP420NumberingScheme::unpackLayerIndex(rn0,zside);
-		int orient = FP420NumberingScheme::unpackOrientation(rn0,zside);
-		std::cout << "****DigitizerFP420:check2" << std::endl;
-		//	std::cout <<" iu = " << iu <<" sector = " << sector <<" zmodule = " << zmodule <<" zside = " << zside << "  det=" << det << std::endl;
-		//	std::cout <<" layer = " << layer <<" orient = " << orient << std::endl;
-		int newdet, newzside, newsector, newzmodule;
-		FP420NumberingScheme::unpackMYIndex(iu, rn0, pn0, sn0, newdet, newzside, newsector, newzmodule);
-		std::cout <<" newdet = " << newdet <<" newsector = " << newsector <<" newzmodule = " << newzmodule <<" newzside = " << newzside << std::endl;
-		
-		collector.clear();
-		DigiCollectionFP420::Range outputRange;
-		//	outputRange = output->get(iu);
-		outputRange = output->get(iu);
-		
-		// fill output in collector vector (for may be sorting? or other checks)
-		std::vector<HDigiFP420> collector;
-		//  collector.clear();
-		DigiCollectionFP420::ContainerIterator sort_begin = outputRange.first;
-		DigiCollectionFP420::ContainerIterator sort_end = outputRange.second;
-		for ( ;sort_begin != sort_end; ++sort_begin ) {
-		  collector.push_back(*sort_begin);
-		} // for
-		  //  std::sort(collector.begin(),collector.end());
-		std::cout <<" ===" << std::endl;
-		std::cout <<"======  collector size = " << collector.size() << std::endl;
-		if(!collector.empty()) {
-		  std::cout <<" iu = " << iu <<" sector = " << sector <<" zmodule = " << zmodule <<" zside = " << zside << "  det=" << det <<" layer = " << layer <<" orient = " << orient << std::endl;
-		  std::cout <<" ===" << std::endl;
-		}
-		vector<HDigiFP420>::const_iterator simHitIter = collector.begin();
-		vector<HDigiFP420>::const_iterator simHitIterEnd = collector.end();
-		for (;simHitIter != simHitIterEnd; ++simHitIter) {
-		  const HDigiFP420 istrip = *simHitIter;
-		  std::cout << " strip number=" << istrip.strip() << "  adc=" << istrip.adc() << std::endl;
-		  std::cout <<" channel =" << istrip.channel() <<" V " << istrip.stripV() <<" VW " << istrip.stripVW() << std::endl;
-		  std::cout <<" ===" << std::endl;
-		  std::cout <<" ===" << std::endl;
-		  std::cout <<" ===================================================" << std::endl;
-		}
-		
-		//==================================
-		
-	      }   // for
-	    }   // for
-	  }   // for
-	}   // for
-	
-	//     end of check of access to the strip collection
-	
-      }// if(verbosity	
-      
-      // Step D: write output to file
-      if(verbosity>0) {
-	std::cout << "DigitizerFP420 recoutput" << std::endl;
-      }
-      // Step D: write output to file
-      iEvent.put(std::move(output));
-  }//produce
-  
-} // namespace cms
+    if (verbosity == -50) {
+      //     check of access to the collector:
+      for (int det = 1; det < dn0; det++) {
+        for (int sector = 1; sector < sn0; sector++) {
+          for (int zmodule = 1; zmodule < pn0; zmodule++) {
+            for (int zside = 1; zside < rn0; zside++) {
+              unsigned int iu = FP420NumberingScheme::packMYIndex(rn0, pn0, sn0, det, zside, sector, zmodule);
+              int layer = FP420NumberingScheme::unpackLayerIndex(rn0, zside);
+              int orient = FP420NumberingScheme::unpackOrientation(rn0, zside);
+              std::cout << "****DigitizerFP420:check2" << std::endl;
+              //	std::cout <<" iu = " << iu <<" sector = " << sector <<" zmodule
+              //= " << zmodule <<" zside = " << zside << "  det=" << det <<
+              // std::endl; 	std::cout <<" layer = " << layer <<" orient = "
+              // << orient << std::endl;
+              int newdet, newzside, newsector, newzmodule;
+              FP420NumberingScheme::unpackMYIndex(iu, rn0, pn0, sn0, newdet, newzside, newsector, newzmodule);
+              std::cout << " newdet = " << newdet << " newsector = " << newsector << " newzmodule = " << newzmodule
+                        << " newzside = " << newzside << std::endl;
+
+              collector.clear();
+              DigiCollectionFP420::Range outputRange;
+              //	outputRange = output->get(iu);
+              outputRange = output->get(iu);
+
+              // fill output in collector vector (for may be sorting? or other
+              // checks)
+              std::vector<HDigiFP420> collector;
+              //  collector.clear();
+              DigiCollectionFP420::ContainerIterator sort_begin = outputRange.first;
+              DigiCollectionFP420::ContainerIterator sort_end = outputRange.second;
+              for (; sort_begin != sort_end; ++sort_begin) {
+                collector.push_back(*sort_begin);
+              }  // for
+              //  std::sort(collector.begin(),collector.end());
+              std::cout << " ===" << std::endl;
+              std::cout << "======  collector size = " << collector.size() << std::endl;
+              if (!collector.empty()) {
+                std::cout << " iu = " << iu << " sector = " << sector << " zmodule = " << zmodule
+                          << " zside = " << zside << "  det=" << det << " layer = " << layer << " orient = " << orient
+                          << std::endl;
+                std::cout << " ===" << std::endl;
+              }
+              vector<HDigiFP420>::const_iterator simHitIter = collector.begin();
+              vector<HDigiFP420>::const_iterator simHitIterEnd = collector.end();
+              for (; simHitIter != simHitIterEnd; ++simHitIter) {
+                const HDigiFP420 istrip = *simHitIter;
+                std::cout << " strip number=" << istrip.strip() << "  adc=" << istrip.adc() << std::endl;
+                std::cout << " channel =" << istrip.channel() << " V " << istrip.stripV() << " VW " << istrip.stripVW()
+                          << std::endl;
+                std::cout << " ===" << std::endl;
+                std::cout << " ===" << std::endl;
+                std::cout << " ===================================================" << std::endl;
+              }
+
+              //==================================
+
+            }  // for
+          }    // for
+        }      // for
+      }        // for
+
+      //     end of check of access to the strip collection
+
+    }  // if(verbosity
+
+    // Step D: write output to file
+    if (verbosity > 0) {
+      std::cout << "DigitizerFP420 recoutput" << std::endl;
+    }
+    // Step D: write output to file
+    iEvent.put(std::move(output));
+  }  // produce
 
+}  // namespace cms
diff --git a/SimRomanPot/SimFP420/src/ChargeDividerFP420.cc b/SimRomanPot/SimFP420/src/ChargeDividerFP420.cc
index fa48c1a69dd8a..7fa88a77e5287 100644
--- a/SimRomanPot/SimFP420/src/ChargeDividerFP420.cc
+++ b/SimRomanPot/SimFP420/src/ChargeDividerFP420.cc
@@ -4,394 +4,412 @@
 // Description: ChargeDividerFP420  for FP420
 // Modifications: std::
 ///////////////////////////////////////////////////////////////////////////////
-#include "SimRomanPot/SimFP420/interface/ChargeDividerFP420.h"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "DataFormats/GeometryVector/interface/LocalVector.h"
+#include "SimRomanPot/SimFP420/interface/ChargeDividerFP420.h"
 
 //#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 //#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
 using namespace std;
-#include<vector>
+#include <vector>
 
 // unpacking variable - zside - Left or Right planes
 
-//DigitizerFP420::DigitizerFP420(const edm::ParameterSet& conf):conf_(conf),stripDigitizer_(new FP420DigiMain(conf)) 
-ChargeDividerFP420::ChargeDividerFP420(double pit, double az420, double azD2, double azD3,int ver){
-
-  verbosity=ver;
+// DigitizerFP420::DigitizerFP420(const edm::ParameterSet&
+// conf):conf_(conf),stripDigitizer_(new FP420DigiMain(conf))
+ChargeDividerFP420::ChargeDividerFP420(double pit, double az420, double azD2, double azD3, int ver) {
+  verbosity = ver;
   //                           pit - is really moduleThickness here !!!
-  if(verbosity>0) {
+  if (verbosity > 0) {
     std::cout << "ChargeDividerFP420.h: constructor" << std::endl;
-    std::cout << "peakMode = " << peakMode << "fluctuateCharge=   "<< fluctuateCharge <<  "chargedivisionsPerHit = "  << chargedivisionsPerHit << "deltaCut=   "<< deltaCut << std::endl;
+    std::cout << "peakMode = " << peakMode << "fluctuateCharge=   " << fluctuateCharge
+              << "chargedivisionsPerHit = " << chargedivisionsPerHit << "deltaCut=   " << deltaCut << std::endl;
   }
-  
-  // Run APV in peak instead of deconvolution mode, which degrades the time resolution
+
+  // Run APV in peak instead of deconvolution mode, which degrades the time
+  // resolution
   //  peakMode=true ; //     APVpeakmode
-  peakMode=false; //  peakMode=true -->  APVconvolutionmode
-  decoMode=false;//  decoMode=true -->  deconvolution mode
+  peakMode = false;  //  peakMode=true -->  APVconvolutionmode
+  decoMode = false;  //  decoMode=true -->  deconvolution mode
   // Enable interstrip Landau fluctuations within a cluster.
-  fluctuateCharge=true;   
-  
-  // Number of segments per strip into which charge is divided during simulation.
-  // If large the precision of simulation improves.
-  chargedivisionsPerHit=10; // = or =20
-  
-  // delta cutoff in MeV, has to be same as in OSCAR (0.120425 MeV corresponding // to 100um range for electrons)
-  //SimpleConfigurable<double>  ChargeDividerFP420::deltaCut(0.120425,
-  deltaCut=0.120425;  //  DeltaProductionCut
-  
-  pitchcur= pit;// pitchcur - is really moduleThickness here !!!
-  
+  fluctuateCharge = true;
+
+  // Number of segments per strip into which charge is divided during
+  // simulation. If large the precision of simulation improves.
+  chargedivisionsPerHit = 10;  // = or =20
+
+  // delta cutoff in MeV, has to be same as in OSCAR (0.120425 MeV corresponding
+  // // to 100um range for electrons)
+  // SimpleConfigurable<double>  ChargeDividerFP420::deltaCut(0.120425,
+  deltaCut = 0.120425;  //  DeltaProductionCut
+
+  pitchcur = pit;  // pitchcur - is really moduleThickness here !!!
+
   // but position before Stations:
   z420 = az420;  // dist between centers of 1st and 2nd stations
-  zD2 = azD2;  // dist between centers of 1st and 2nd stations
-  zD3 = azD3;  // dist between centers of 1st and 3rd stations
-  
-  
-  
+  zD2 = azD2;    // dist between centers of 1st and 2nd stations
+  zD3 = azD3;    // dist between centers of 1st and 3rd stations
+
   //                                                                                                                           .
   //                                                                                                                           .
-  //  -300     -209.2             -150              -90.8                        0                                           +300
+  //  -300     -209.2             -150              -90.8 0 +300
   //                                                                                                                           .
-  //            X  | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | X                        station                                          .
-  //                   8*13.3+ 2*6 = 118.4                                    center                                           .
+  //            X  | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | X station .
+  //                   8*13.3+ 2*6 = 118.4 center .
   //                                                                                                                           .
-  //zStationBegPos[0] = -150. - (118.4+10.)/2 + z420; // 10. -arbitrary
-  zStationBegPos[0] = -40. + z420; // 5 superplanes per station 79.7mm: -40.- left edge of Station
-  zStationBegPos[1] = zStationBegPos[0]+zD2;
-  zStationBegPos[2] = zStationBegPos[0]+zD3;
-  zStationBegPos[3] = zStationBegPos[0]+2*zD3;
-  
+  // zStationBegPos[0] = -150. - (118.4+10.)/2 + z420; // 10. -arbitrary
+  zStationBegPos[0] = -40. + z420;  // 5 superplanes per station 79.7mm: -40.- left edge of Station
+  zStationBegPos[1] = zStationBegPos[0] + zD2;
+  zStationBegPos[2] = zStationBegPos[0] + zD3;
+  zStationBegPos[3] = zStationBegPos[0] + 2 * zD3;
 }
 
 // Virtual destructor needed.
-ChargeDividerFP420::~ChargeDividerFP420() { 
+ChargeDividerFP420::~ChargeDividerFP420() {
   //  if(verbosity>0) {
   //    std::cout << "Destroying a ChargeDividerFP420" << std::endl;
   //  }
-  
-}  
-CDividerFP420::ionization_type 
-ChargeDividerFP420::divide(
-			   const PSimHit& hit, const double& pitchcur) {
+}
+CDividerFP420::ionization_type ChargeDividerFP420::divide(const PSimHit &hit, const double &pitchcur) {
   // !!!
-  //                                       pitchcur - is really moduleThickness here !!!
+  //                                       pitchcur - is really moduleThickness
+  //                                       here !!!
   // !!!
-  
-  
-  
+
   // sign "-" mean not the same as "+" for middle point !!!
   //  G4ThreeVector direction = hit.getExitLocalP() - hit.getEntryLocalP();
   LocalVector direction = hit.exitPoint() - hit.entryPoint();
   //   G4ThreeVector direction = hit.exitPoint() - hit.entryPoint();
-  
+
   //  LocalVector direction = hit.exitPoint() - hit.entryPoint();
-  // direction.mag() - length or (size of path) of the hit; direction/direction.mag() - cosines of direction
-  
-  if(verbosity>0) {
+  // direction.mag() - length or (size of path) of the hit;
+  // direction/direction.mag() - cosines of direction
+
+  if (verbosity > 0) {
     std::cout << " CDividerFP420::ChargeDividerFP420:divide: direction= " << direction << std::endl;
     std::cout << " CDividerFP420::ChargeDividerFP420:divide: direction.mag = " << direction.mag() << std::endl;
-    std::cout << " obtained as ExitLocalP = " << hit.exitPoint() << "  -  "<<  "  EntryLocalP = "  << hit.entryPoint() << std::endl;
+    std::cout << " obtained as ExitLocalP = " << hit.exitPoint() << "  -  "
+              << "  EntryLocalP = " << hit.entryPoint() << std::endl;
     std::cout << "  pitchcur= " << pitchcur << std::endl;
-    std::cout << "  peakMode = " << peakMode << "  decoMode = " << decoMode << "  fluctuateCharge=   "<< fluctuateCharge <<  "  chargedivisionsPerHit = "  << chargedivisionsPerHit << "  deltaCut=   "<< deltaCut << std::endl;
+    std::cout << "  peakMode = " << peakMode << "  decoMode = " << decoMode
+              << "  fluctuateCharge=   " << fluctuateCharge << "  chargedivisionsPerHit = " << chargedivisionsPerHit
+              << "  deltaCut=   " << deltaCut << std::endl;
   }
-  
-  int NumberOfSegmentation =  
-    
-    //     (int)(1+chargedivisionsPerHit*fabs(direction.x())/pitchcur); // equidistant in X
-    //    (int)(1+chargedivisionsPerHit*fabs(direction.z())/pitchcur); // equidistant in Z, but why?
-    
-    (int)(1+chargedivisionsPerHit*direction.mag()/pitchcur); // equidistant over hit path
-  
-  
-  if(verbosity>0) {
+
+  int NumberOfSegmentation =
+
+      //     (int)(1+chargedivisionsPerHit*fabs(direction.x())/pitchcur); //
+      //     equidistant in X
+      //    (int)(1+chargedivisionsPerHit*fabs(direction.z())/pitchcur); //
+      //    equidistant in Z, but why?
+
+      (int)(1 + chargedivisionsPerHit * direction.mag() / pitchcur);  // equidistant over hit path
+
+  if (verbosity > 0) {
     std::cout << "NumberOfSegmentation= " << NumberOfSegmentation << std::endl;
   }
-  
+
   float eLoss = hit.energyLoss();  // Eloss in GeV
   //  float eLoss = hit.getEnergyLoss();  // Eloss in GeV
-  
-  if(verbosity>0) {
+
+  if (verbosity > 0) {
     std::cout << "CDividerFP420::ChargeDividerFP420:divide: eLoss=  " << eLoss << std::endl;
   }
-  
+
   //
   //     return the energyLoss weighted CR-RC shape peaked at t0.(PeakShape)
-  //     return the energyLoss weighted with a gaussian centered at t0 (DeconvolutionShape)
+  //     return the energyLoss weighted with a gaussian centered at t0
+  //     (DeconvolutionShape)
   float decSignal = TimeResponse(hit);
-  if(verbosity>0) {
+  if (verbosity > 0) {
     std::cout << "CDividerFP420::ChargeDividerFP420:divide: decSignal=  " << decSignal << std::endl;
   }
-  
+
   ionization_type _ionization_points;
-  
+
   _ionization_points.resize(NumberOfSegmentation);
-  
+
   float energy;
-  
+
   // Fluctuate charge in track subsegments
-  float* eLossVector = new float[NumberOfSegmentation];
-  
-  
-  if(verbosity>0) {
-    std::cout << "CDividerFP420::ChargeDividerFP420:divide:  resize done; then, fluctuateCharge ? = " << fluctuateCharge << std::endl;
+  float *eLossVector = new float[NumberOfSegmentation];
+
+  if (verbosity > 0) {
+    std::cout << "CDividerFP420::ChargeDividerFP420:divide:  resize done; "
+                 "then, fluctuateCharge ? = "
+              << fluctuateCharge << std::endl;
   }
-  if( fluctuateCharge ) {
+  if (fluctuateCharge) {
     //    int pid = hit.getParticleType();
     //    float momentum = hit.getPabs();
     int pid = hit.particleType();
     float momentum = hit.pabs();
     float length = direction.mag();  // length or (size of path) of the hit;
-    
-    if(verbosity>0) {
-      std::cout << "pid= " << pid << "momentum= " << momentum << "eLoss= " << eLoss << "length= " << length << std::endl;
+
+    if (verbosity > 0) {
+      std::cout << "pid= " << pid << "momentum= " << momentum << "eLoss= " << eLoss << "length= " << length
+                << std::endl;
     }
-    fluctuateEloss(pid, momentum, eLoss, length, NumberOfSegmentation, eLossVector);   
+    fluctuateEloss(pid, momentum, eLoss, length, NumberOfSegmentation, eLossVector);
   }
-  
-  for ( int i = 0; i != NumberOfSegmentation; ++i) {
-    if( fluctuateCharge ) {
-      energy=eLossVector[i]*decSignal/eLoss;
-      EnergySegmentFP420 edu(energy,hit.entryPoint()+float((i+0.5)/NumberOfSegmentation)*direction);//take energy value from vector eLossVector  
-      //   EnergySegmentFP420 edu(energy,hit.getEntryLocalP()+float((i+0.5)/NumberOfSegmentation)*direction);//take energy value from vector eLossVector  
-      _ionization_points[i] = edu; //save
-    }else{
-      energy=decSignal/float(NumberOfSegmentation);
-      EnergySegmentFP420 edu(energy,hit.entryPoint()+float((i+0.5)/NumberOfSegmentation)*direction);//take energy value from eLoss average over n.segments 
-      // EnergySegmentFP420 edu(energy,hit.getEntryLocalP()+float((i+0.5)/NumberOfSegmentation)*direction);//take energy value from eLoss average over n.segments 
-      _ionization_points[i] = edu; //save
+
+  for (int i = 0; i != NumberOfSegmentation; ++i) {
+    if (fluctuateCharge) {
+      energy = eLossVector[i] * decSignal / eLoss;
+      EnergySegmentFP420 edu(energy,
+                             hit.entryPoint() + float((i + 0.5) / NumberOfSegmentation) *
+                                                    direction);  // take energy value from vector eLossVector
+      //   EnergySegmentFP420
+      //   edu(energy,hit.getEntryLocalP()+float((i+0.5)/NumberOfSegmentation)*direction);//take
+      //   energy value from vector eLossVector
+      _ionization_points[i] = edu;  // save
+    } else {
+      energy = decSignal / float(NumberOfSegmentation);
+      EnergySegmentFP420 edu(
+          energy,
+          hit.entryPoint() + float((i + 0.5) / NumberOfSegmentation) * direction);  // take energy value from eLoss
+                                                                                    // average over n.segments
+      // EnergySegmentFP420
+      // edu(energy,hit.getEntryLocalP()+float((i+0.5)/NumberOfSegmentation)*direction);//take
+      // energy value from eLoss average over n.segments
+      _ionization_points[i] = edu;  // save
     }
   }
-  
-  if(verbosity>0) {
+
+  if (verbosity > 0) {
     std::cout << "CDividerFP420::ChargeDividerFP420:divide:  !!!  RESULT !!!" << std::endl;
-    std::cout <<  " _ionization_points size = " << _ionization_points.size() << std::endl;
-    for(unsigned int i = 0; i < _ionization_points.size(); ++i ) {
-      std::cout <<  " eLossVector[i] i = " << i << eLossVector[i] << std::endl;
+    std::cout << " _ionization_points size = " << _ionization_points.size() << std::endl;
+    for (unsigned int i = 0; i < _ionization_points.size(); ++i) {
+      std::cout << " eLossVector[i] i = " << i << eLossVector[i] << std::endl;
     }
   }
-  
+
   delete[] eLossVector;
   return _ionization_points;
 }
 
-void ChargeDividerFP420::fluctuateEloss(int pid, float particleMomentum, 
-					float eloss, float length, 
-					int NumberOfSegs,float elossVector[]) {
-  
-  if(verbosity>0) {
-    std::cout << "fluctuateEloss: eloss=  " << eloss << "length=  " << length << "NumberOfSegs=  " << NumberOfSegs << std::endl;
+void ChargeDividerFP420::fluctuateEloss(
+    int pid, float particleMomentum, float eloss, float length, int NumberOfSegs, float elossVector[]) {
+  if (verbosity > 0) {
+    std::cout << "fluctuateEloss: eloss=  " << eloss << "length=  " << length << "NumberOfSegs=  " << NumberOfSegs
+              << std::endl;
   }
-  
+
   //  double particleMass = 139.57; // Mass in MeV, Assume pion
-  double particleMass = 938.271; // Mass in MeV, Assume proton   ----  AZ
+  double particleMass = 938.271;  // Mass in MeV, Assume proton   ----  AZ
   //  if( particleTable->getParticleData(pid) ) {  // Get mass from the PDTable
-  //    particleMass = 1000. * particleTable->getParticleData(pid)->mass(); //Conv. GeV to MeV
+  //    particleMass = 1000. * particleTable->getParticleData(pid)->mass();
+  //    //Conv. GeV to MeV
   //  }
   pid = abs(pid);
-  if(pid==11) particleMass = 0.511;         // Mass in MeV
-  else if(pid==13) particleMass = 105.658;
-  else if(pid==211) particleMass = 139.570;
+  if (pid == 11)
+    particleMass = 0.511;  // Mass in MeV
+  else if (pid == 13)
+    particleMass = 105.658;
+  else if (pid == 211)
+    particleMass = 139.570;
   //  else if(pid==2212) particleMass = 938.271;
-  
-  float segmentLength = length/NumberOfSegs;
-  
+
+  float segmentLength = length / NumberOfSegs;
+
   // Generate charge fluctuations.
-  float de=0.;
-  float sum=0.;
-  double segmentEloss = (1000.*eloss)/NumberOfSegs; //eloss in MeV
-  if(verbosity>0) {
+  float de = 0.;
+  float sum = 0.;
+  double segmentEloss = (1000. * eloss) / NumberOfSegs;  // eloss in MeV
+  if (verbosity > 0) {
     std::cout << "segmentLength=  " << segmentLength << "segmentEloss=  " << segmentEloss << std::endl;
   }
-  
-  for (int i=0;i<NumberOfSegs;++i) {
+
+  for (int i = 0; i < NumberOfSegs; ++i) {
     // The G4 routine needs momentum in MeV, mass in Mev, delta-cut in MeV,
-    // track segment length in mm(!!!), segment eloss in MeV 
+    // track segment length in mm(!!!), segment eloss in MeV
     // Returns fluctuated eloss in MeV
-    //    double deltaCutoff = deltaCut.value(); // the cutoff is sometimes redefined inside, so fix it.
+    //    double deltaCutoff = deltaCut.value(); // the cutoff is sometimes
+    //    redefined inside, so fix it.
     double deltaCutoff = deltaCut;
-    de = fluctuate.SampleFluctuations(double(particleMomentum*1000.),
-				      particleMass, deltaCutoff, 
-				      double(segmentLength),
-				      segmentEloss )/1000.; //convert to GeV
-    elossVector[i]=de;
-    sum +=de;
+    de = fluctuate.SampleFluctuations(double(particleMomentum * 1000.),
+                                      particleMass,
+                                      deltaCutoff,
+                                      double(segmentLength),
+                                      segmentEloss) /
+         1000.;  // convert to GeV
+    elossVector[i] = de;
+    sum += de;
   }
-  
-  if(verbosity>0) {
+
+  if (verbosity > 0) {
     std::cout << "sum=  " << sum << std::endl;
   }
-  if(sum>0.) {  // If fluctuations give eloss>0.
+  if (sum > 0.) {  // If fluctuations give eloss>0.
     // Rescale to the same total eloss
-    float ratio = eloss/sum;
-    for (int ii=0;ii<NumberOfSegs;++ii) elossVector[ii]= ratio*elossVector[ii];
+    float ratio = eloss / sum;
+    for (int ii = 0; ii < NumberOfSegs; ++ii)
+      elossVector[ii] = ratio * elossVector[ii];
   } else {  // If fluctuations gives 0 eloss
-    float averageEloss = eloss/NumberOfSegs;
-    for (int ii=0;ii<NumberOfSegs;++ii) elossVector[ii]= averageEloss; 
+    float averageEloss = eloss / NumberOfSegs;
+    for (int ii = 0; ii < NumberOfSegs; ++ii)
+      elossVector[ii] = averageEloss;
   }
   return;
 }
 
-float ChargeDividerFP420::TimeResponse( const PSimHit& hit ) {
+float ChargeDividerFP420::TimeResponse(const PSimHit &hit) {
   if (peakMode) {
-    
-    if(verbosity>0) {
+    if (verbosity > 0) {
       std::cout << "ChargeDividerFP420:TimeResponse: call of PeakShape" << std::endl;
     }
-    return this->PeakShape( hit );
+    return this->PeakShape(hit);
   } else if (decoMode) {
-    
-    if(verbosity>0) {
+    if (verbosity > 0) {
       std::cout << "ChargeDividerFP420:TimeResponse: call of DeconvolutionShape" << std::endl;
     }
-    return this->DeconvolutionShape( hit );
+    return this->DeconvolutionShape(hit);
   } else {
-    
-    if(verbosity>0) {
+    if (verbosity > 0) {
       std::cout << "ChargeDividerFP420:TimeResponse: no any  Shape" << std::endl;
     }
     //    return hit.getEnergyLoss();
     return hit.energyLoss();
-    
   }
 }
-float ChargeDividerFP420::PeakShape(const PSimHit& hit){
-  // 
+float ChargeDividerFP420::PeakShape(const PSimHit &hit) {
+  //
   // Aim:     return the energyLoss weighted CR-RC shape peaked at t0.
-  // 
-  
+  //
+
   //   float xEntry = hit.getX() - hit.getVx();
   //  float yEntry = hit.getY() - hit.getVy();
   //  float zEntry = hit.getZ() - hit.getVz();
   float xEntry = 0.5;
   float yEntry = 0.5;
   float zEntry = 1000.;
-  
+
   // unsigned int unitID = hit.getUnitID();
   unsigned int unitID = hit.detUnitId();
   //      int sScale = 20;
   int det, zside, sector, zmodule;
   FP420NumberingScheme::unpackFP420Index(unitID, det, zside, sector, zmodule);
   // intindex is a continues numbering of FP420
-  //	  int zScale=2;  unsigned int intindex = sScale*(sector - 1)+zScale*(zmodule - 1)+zside;
-  //	 int zScale=10;	unsigned int intindex = sScale*(sector - 1)+zScale*(zside - 1)+zmodule;
-  
-  float RRR      = sqrt(xEntry*xEntry + yEntry*yEntry + zEntry*zEntry);
-  float costheta = zEntry / RRR ;
+  //	  int zScale=2;  unsigned int intindex = sScale*(sector -
+  // 1)+zScale*(zmodule - 1)+zside; 	 int zScale=10;	unsigned int intindex =
+  // sScale*(sector - 1)+zScale*(zside - 1)+zmodule;
+
+  float RRR = sqrt(xEntry * xEntry + yEntry * yEntry + zEntry * zEntry);
+  float costheta = zEntry / RRR;
   //  float theta    = acos(min(max(costheta,float(-1.)),float(1.)));
   //  float dist = hit.det().position().mag();
   //  float dist = hit.localPosition().mag();//AZ
   //  float dist = hit.getEntry().mag();
   //  float dist = hit.getEntryLocalP().mag();
-  float dist     = (zStationBegPos[sector-1] - 420000.) / costheta;
+  float dist = (zStationBegPos[sector - 1] - 420000.) / costheta;
   //  float dist     = (zStationBegPos[sector-1] - hit.getVz()) / costheta;
-  dist     = dist/10.;// mm  --> cm as light velocity = 30 cm/ns
-  
-  if(verbosity>0) {
+  dist = dist / 10.;  // mm  --> cm as light velocity = 30 cm/ns
+
+  if (verbosity > 0) {
     std::cout << "sector=" << sector << std::endl;
     std::cout << "zmodule=" << zmodule << std::endl;
-    std::cout << "zStationBegPos[sector-1]=" << zStationBegPos[sector-1] << std::endl;
+    std::cout << "zStationBegPos[sector-1]=" << zStationBegPos[sector - 1] << std::endl;
     std::cout << "RRR=" << RRR << std::endl;
     std::cout << "costheta=" << costheta << std::endl;
     std::cout << "unitID=" << unitID << std::endl;
-    //std::cout << "thetaEntry=" << thetaEntry << std::endl;
-    //std::cout << "my theta=" << theta*180./3.1415927 << std::endl;
+    // std::cout << "thetaEntry=" << thetaEntry << std::endl;
+    // std::cout << "my theta=" << theta*180./3.1415927 << std::endl;
     std::cout << "dist found =" << dist << std::endl;
   }
-  
+
   // Time when read out relative to time hit produced.
-  float t0 = dist/30.;  // light velocity = 30 cm/ns
-  float SigmaShape = 52.17; 
+  float t0 = dist / 30.;  // light velocity = 30 cm/ns
+  float SigmaShape = 52.17;
   //  float tofNorm = (hit.getTof() - t0)/SigmaShape;
-  float tofNorm = (hit.tof() - t0)/SigmaShape;
-  
+  float tofNorm = (hit.tof() - t0) / SigmaShape;
+
   float readTimeNorm = -tofNorm;
   // return the energyLoss weighted with CR-RC shape peaked at t0.
-  
-  if(verbosity>0) {
+
+  if (verbosity > 0) {
     std::cout << "ChargeDividerFP420:PeakShape::dist=" << dist << std::endl;
-    std::cout << "t0=" <<t0  << std::endl;
+    std::cout << "t0=" << t0 << std::endl;
     std::cout << "hit.getTof()=" << hit.tof() << std::endl;
     std::cout << "tofNorm=" << tofNorm << std::endl;
     std::cout << "1 + readTimeNorm=" << 1 + readTimeNorm << std::endl;
-    std::cout << "hit.getEnergyLoss()=" << hit.energyLoss()  << std::endl;
-    std::cout << "(1 + readTimeNorm)*exp(-readTimeNorm)=" << (1 + readTimeNorm)*exp(-readTimeNorm)  << std::endl;
-    std::cout << "return=" << hit.energyLoss()*(1 + readTimeNorm)*exp(-readTimeNorm)  << std::endl;
+    std::cout << "hit.getEnergyLoss()=" << hit.energyLoss() << std::endl;
+    std::cout << "(1 + readTimeNorm)*exp(-readTimeNorm)=" << (1 + readTimeNorm) * exp(-readTimeNorm) << std::endl;
+    std::cout << "return=" << hit.energyLoss() * (1 + readTimeNorm) * exp(-readTimeNorm) << std::endl;
   }
   if (1 + readTimeNorm > 0) {
     //    return hit.energyLoss()*(1 + readTimeNorm)*exp(-readTimeNorm);
-    return hit.energyLoss()*(1 + readTimeNorm)*exp(-readTimeNorm);
+    return hit.energyLoss() * (1 + readTimeNorm) * exp(-readTimeNorm);
     //  return hit.getEnergyLoss()*(1 + readTimeNorm)*exp(-readTimeNorm);
   } else {
     return 0.;
   }
 }
 
-float ChargeDividerFP420::DeconvolutionShape(const PSimHit& hit){
-  // 
-  // Aim:     return the energyLoss weighted with a gaussian centered at t0 
-  // 
+float ChargeDividerFP420::DeconvolutionShape(const PSimHit &hit) {
+  //
+  // Aim:     return the energyLoss weighted with a gaussian centered at t0
+  //
   //   float xEntry = hit.getX() - hit.getVx();
   //  float yEntry = hit.getY() - hit.getVy();
   //  float zEntry = hit.getZ() - hit.getVz();
   float xEntry = 0.5;
   float yEntry = 0.5;
   float zEntry = 1000.;
-  
+
   // unsigned int unitID = hit.getUnitID();
   unsigned int unitID = hit.detUnitId();
   //      int sScale = 20;
   int det, zside, sector, zmodule;
   FP420NumberingScheme::unpackFP420Index(unitID, det, zside, sector, zmodule);
   // intindex is a continues numbering of FP420
-  //	  int zScale=2;  unsigned int intindex = sScale*(sector - 1)+zScale*(zmodule - 1)+zside;
-  //	 int zScale=10;	unsigned int intindex = sScale*(sector - 1)+zScale*(zside - 1)+zmodule;
-  
-  float RRR      = sqrt(xEntry*xEntry + yEntry*yEntry + zEntry*zEntry);
-  float costheta = zEntry / RRR ;
+  //	  int zScale=2;  unsigned int intindex = sScale*(sector -
+  // 1)+zScale*(zmodule - 1)+zside; 	 int zScale=10;	unsigned int intindex =
+  // sScale*(sector - 1)+zScale*(zside - 1)+zmodule;
+
+  float RRR = sqrt(xEntry * xEntry + yEntry * yEntry + zEntry * zEntry);
+  float costheta = zEntry / RRR;
   //  float theta    = acos(min(max(costheta,float(-1.)),float(1.)));
   //  float dist = hit.det().position().mag();
   //  float dist = hit.localPosition().mag();//AZ
   //  float dist = hit.getEntry().mag();
   //  float dist = hit.getEntryLocalP().mag();
-  float dist     = (zStationBegPos[sector-1] - 420000.) / costheta;
+  float dist = (zStationBegPos[sector - 1] - 420000.) / costheta;
   //  float dist     = (zStationBegPos[sector-1] - hit.getVz()) / costheta;
-  dist     = dist/10.;// mm  --> cm as light velocity = 30 cm/ns
-  
-  if(verbosity>0) {
+  dist = dist / 10.;  // mm  --> cm as light velocity = 30 cm/ns
+
+  if (verbosity > 0) {
     std::cout << "sector=" << sector << std::endl;
     std::cout << "zmodule=" << zmodule << std::endl;
-    std::cout << "zStationBegPos[sector-1]=" << zStationBegPos[sector-1] << std::endl;
+    std::cout << "zStationBegPos[sector-1]=" << zStationBegPos[sector - 1] << std::endl;
     std::cout << "RRR=" << RRR << std::endl;
     std::cout << "costheta=" << costheta << std::endl;
     std::cout << "unitID=" << unitID << std::endl;
-    //std::cout << "thetaEntry=" << thetaEntry << std::endl;
-    //std::cout << "my theta=" << theta*180./3.1415927 << std::endl;
+    // std::cout << "thetaEntry=" << thetaEntry << std::endl;
+    // std::cout << "my theta=" << theta*180./3.1415927 << std::endl;
     std::cout << "dist found =" << dist << std::endl;
   }
-  
-  float t0 = dist/30.;  // light velocity = 30 cm/ns
-  float SigmaShape = 12.; 
-  //fun/pl 1*exp(-0.5*((0.1/30-x)/0.1)**2) 0. 0.08
-  //  float SigmaShape = 22.; 
+
+  float t0 = dist / 30.;  // light velocity = 30 cm/ns
+  float SigmaShape = 12.;
+  // fun/pl 1*exp(-0.5*((0.1/30-x)/0.1)**2) 0. 0.08
+  //  float SigmaShape = 22.;
   //  float tofNorm = (hit.tof() - t0)/SigmaShape;
-  float tofNorm = (hit.tof() - t0)/SigmaShape;
+  float tofNorm = (hit.tof() - t0) / SigmaShape;
   // Time when read out relative to time hit produced.
   float readTimeNorm = -tofNorm;
-  // return the energyLoss weighted with a gaussian centered at t0 
+  // return the energyLoss weighted with a gaussian centered at t0
   //  return hit.energyLoss()*exp(-0.5*readTimeNorm*readTimeNorm);
-  
-  if(verbosity>0) {
+
+  if (verbosity > 0) {
     std::cout << "ChargeDividerFP420:DeconvolutionShape::dist=" << dist << std::endl;
-    std::cout << "t0=" <<t0  << std::endl;
+    std::cout << "t0=" << t0 << std::endl;
     std::cout << "hit.getTof()=" << hit.tof() << std::endl;
     std::cout << "tofNorm=" << tofNorm << std::endl;
-    std::cout << "hit.getEnergyLoss()=" << hit.energyLoss()  << std::endl;
-    std::cout << "exp(-0.5*readTimeNorm*readTimeNorm)=" << exp(-0.5*readTimeNorm*readTimeNorm)  << std::endl;
-    std::cout << "return=" << hit.energyLoss()*exp(-0.5*readTimeNorm*readTimeNorm)  << std::endl;
+    std::cout << "hit.getEnergyLoss()=" << hit.energyLoss() << std::endl;
+    std::cout << "exp(-0.5*readTimeNorm*readTimeNorm)=" << exp(-0.5 * readTimeNorm * readTimeNorm) << std::endl;
+    std::cout << "return=" << hit.energyLoss() * exp(-0.5 * readTimeNorm * readTimeNorm) << std::endl;
   }
-  return hit.energyLoss()*exp(-0.5*readTimeNorm*readTimeNorm);
+  return hit.energyLoss() * exp(-0.5 * readTimeNorm * readTimeNorm);
   //  return hit.getEnergyLoss();
 }
-
diff --git a/SimRomanPot/SimFP420/src/ChargeDrifterFP420.cc b/SimRomanPot/SimFP420/src/ChargeDrifterFP420.cc
index 848db4607870b..aea01ccfbedc0 100644
--- a/SimRomanPot/SimFP420/src/ChargeDrifterFP420.cc
+++ b/SimRomanPot/SimFP420/src/ChargeDrifterFP420.cc
@@ -2,40 +2,31 @@
 // File: ChargeDrifterFP420
 // Date: 08.2008
 // Description: ChargeDrifterFP420 for FP420
-// Modifications: 
+// Modifications:
 ///////////////////////////////////////////////////////////////////////////////
 #include "SimRomanPot/SimFP420/interface/ChargeDrifterFP420.h"
 using namespace std;
 
-ChargeDrifterFP420::ChargeDrifterFP420(                              double mt,
-								     double tn,
-								     double dc,
-								     double tm,
-								     double cdr,
-								     double dv,
-								     double av,
-								     double ptx,
-								     double pty, int verbosity) {
+ChargeDrifterFP420::ChargeDrifterFP420(
+    double mt, double tn, double dc, double tm, double cdr, double dv, double av, double ptx, double pty, int verbosity) {
   //
   //
-  verbo=verbosity; 
+  verbo = verbosity;
   modulePath = mt;
   constTe = tn;
   constDe = dc;
-  temperature = tm;// keep just in case
+  temperature = tm;  // keep just in case
   startT0 = cdr;
   depV = dv;
   appV = av;
-  
+
   ldriftcurrX = ptx;
   ldriftcurrY = pty;
   //
   //
-  
-  
-  
+
   //      edm::LogInfo("ChargeDrifterFP420") << "call constructor";
-  if(verbo>0) {
+  if (verbo > 0) {
     std::cout << "ChargeDrifterFP420: call constructor" << std::endl;
     std::cout << "ldriftcurrX= " << ldriftcurrX << "ldriftcurrY= " << ldriftcurrY << std::endl;
     std::cout << "modulePath= " << modulePath << "constTe= " << constTe << std::endl;
@@ -43,167 +34,186 @@ ChargeDrifterFP420::ChargeDrifterFP420(                              double mt,
   }
 }
 
-
-
-CDrifterFP420::collection_type ChargeDrifterFP420::drift(const CDrifterFP420::ionization_type& ion, const G4ThreeVector& driftDir,const int& xytype){
+CDrifterFP420::collection_type ChargeDrifterFP420::drift(const CDrifterFP420::ionization_type &ion,
+                                                         const G4ThreeVector &driftDir,
+                                                         const int &xytype) {
   //
   //
-  if(verbo>0) {
+  if (verbo > 0) {
     std::cout << "ChargeDrifterFP420: collection_type call drift" << std::endl;
   }
   //
   //
   collection_type _temp;
   _temp.resize(ion.size());
-  
-  for (unsigned int i=0; i<ion.size(); i++){
+
+  for (unsigned int i = 0; i < ion.size(); i++) {
     _temp[i] = drift(ion[i], driftDir, xytype);
   }
   return _temp;
 }
 
-AmplitudeSegmentFP420 ChargeDrifterFP420::drift
-(const EnergySegmentFP420& edu, const G4ThreeVector& drift, const int& xytype){
+AmplitudeSegmentFP420 ChargeDrifterFP420::drift(const EnergySegmentFP420 &edu,
+                                                const G4ThreeVector &drift,
+                                                const int &xytype) {
   //
   //
-  //    sliX sliY sliZ are LOCALl(!) coordinates coming from ...hit.getEntryLocalP()...  
+  //    sliX sliY sliZ are LOCALl(!) coordinates coming from
+  //    ...hit.getEntryLocalP()...
   //
   //
   //                Exchange xytype 1 <-> 2
   double sliX = (edu).x();
   double sliY = (edu).y();
   double sliZ = (edu).z();
-  
+
   double currX = sliX;
   double currY = sliY;
   double currZ = sliZ;
-  
-  double pathFraction=0., pathValue=0.;
-  double tanShiftAngleX=0.,tanShiftAngleY=0.,tanShiftAngleZ=0.;
-  double xDriftDueToField=0.,yDriftDueToField=0.,zDriftDueToField=0.;
-  if(verbo>0) {
-    std::cout << "=================================================================== " << std::endl;
+
+  double pathFraction = 0., pathValue = 0.;
+  double tanShiftAngleX = 0., tanShiftAngleY = 0., tanShiftAngleZ = 0.;
+  double xDriftDueToField = 0., yDriftDueToField = 0., zDriftDueToField = 0.;
+  if (verbo > 0) {
+    std::cout << "============================================================="
+                 "====== "
+              << std::endl;
     std::cout << "ChargeDrifterFP420: xytype= " << xytype << std::endl;
-    std::cout << "constTe= " <<  constTe << "ldriftcurrX= " <<  ldriftcurrX << "ldriftcurrY= " <<  ldriftcurrY << std::endl;
-    std::cout << "1currX = " << currX  << "  1currY = " << currY  << "  1currZ = " << currZ  << std::endl;
-    std::cout << "drift.x() = " << drift.x()  << "  drift.y() = " << drift.y()  << "  drift.z() = " << drift.z()  << std::endl;
+    std::cout << "constTe= " << constTe << "ldriftcurrX= " << ldriftcurrX << "ldriftcurrY= " << ldriftcurrY
+              << std::endl;
+    std::cout << "1currX = " << currX << "  1currY = " << currY << "  1currZ = " << currZ << std::endl;
+    std::cout << "drift.x() = " << drift.x() << "  drift.y() = " << drift.y() << "  drift.z() = " << drift.z()
+              << std::endl;
   }
-  
+
   // Yglobal Xlocal:
   //
   //
-  // will define drift time of electrons along Xlocal or Ygobal with ldriftcurrY from Yglobal
-  // change of ldriftcurrX to ldriftcurrY is done in intialization of ChargeDrifterFP420, so use old names for ldriftcurres
-  if(xytype == 2) {
-    tanShiftAngleY = drift.y()/drift.x();
-    tanShiftAngleZ = drift.z()/drift.x();
-    
+  // will define drift time of electrons along Xlocal or Ygobal with ldriftcurrY
+  // from Yglobal change of ldriftcurrX to ldriftcurrY is done in intialization
+  // of ChargeDrifterFP420, so use old names for ldriftcurres
+  if (xytype == 2) {
+    tanShiftAngleY = drift.y() / drift.x();
+    tanShiftAngleZ = drift.z() / drift.x();
+
     //    pathValue = fabs(sliX-ldriftcurrX*int(sliX/ldriftcurrX));
-    pathValue = fabs(sliX)-int(fabs(sliX/(2*ldriftcurrX))+0.5)*(2*ldriftcurrX);
+    pathValue = fabs(sliX) - int(fabs(sliX / (2 * ldriftcurrX)) + 0.5) * (2 * ldriftcurrX);
     pathValue = fabs(pathValue);
-    pathFraction = pathValue/ldriftcurrX; 
-    if(verbo>0) {
+    pathFraction = pathValue / ldriftcurrX;
+    if (verbo > 0) {
       std::cout << "==================================" << std::endl;
       std::cout << "fabs(sliX)= " << fabs(sliX) << "ldriftcurrX= " << ldriftcurrX << std::endl;
-      std::cout << "fabs(sliX/(2*ldriftcurrX))+0.5= " << fabs(sliX/(2*ldriftcurrX))+0.5 << std::endl;
-      std::cout << "int(fabs(sliX/(2*ldriftcurrX))+0.5)*(2*ldriftcurrX)= " << int(fabs(sliX/(2*ldriftcurrX))+0.5)*(2*ldriftcurrX) << std::endl;
+      std::cout << "fabs(sliX/(2*ldriftcurrX))+0.5= " << fabs(sliX / (2 * ldriftcurrX)) + 0.5 << std::endl;
+      std::cout << "int(fabs(sliX/(2*ldriftcurrX))+0.5)*(2*ldriftcurrX)= "
+                << int(fabs(sliX / (2 * ldriftcurrX)) + 0.5) * (2 * ldriftcurrX) << std::endl;
       std::cout << "pathValue= " << pathValue << std::endl;
       std::cout << "pathFraction= " << pathFraction << std::endl;
       std::cout << "==================================" << std::endl;
     }
-    
-    pathFraction = pathFraction>0. ? pathFraction : 0. ;
-    pathFraction = pathFraction<1. ? pathFraction : 1. ;
-    
-    yDriftDueToField // Drift along Y due to BField
-      = pathValue*tanShiftAngleY;
-    zDriftDueToField // Drift along Z due to BField
-      = pathValue*tanShiftAngleZ;
+
+    pathFraction = pathFraction > 0. ? pathFraction : 0.;
+    pathFraction = pathFraction < 1. ? pathFraction : 1.;
+
+    yDriftDueToField  // Drift along Y due to BField
+        = pathValue * tanShiftAngleY;
+    zDriftDueToField  // Drift along Z due to BField
+        = pathValue * tanShiftAngleZ;
     // will define Y and Z ccordinates (E along X)
     currY = sliY + yDriftDueToField;
     currZ = sliZ + zDriftDueToField;
   }
-  
+
   // Xglobal Ylocal:
   // will define drift time of electrons along Ylocal
-  else if(xytype == 1) {
-    tanShiftAngleX = drift.x()/drift.y();
-    tanShiftAngleZ = drift.z()/drift.y();
-    
-    //pathValue = fabs(sliY-ldriftcurrY*int(sliY/ldriftcurrY));
-    pathValue = fabs(sliY)-int(fabs(sliY/(2*ldriftcurrY))+0.5)*(2*ldriftcurrY);
+  else if (xytype == 1) {
+    tanShiftAngleX = drift.x() / drift.y();
+    tanShiftAngleZ = drift.z() / drift.y();
+
+    // pathValue = fabs(sliY-ldriftcurrY*int(sliY/ldriftcurrY));
+    pathValue = fabs(sliY) - int(fabs(sliY / (2 * ldriftcurrY)) + 0.5) * (2 * ldriftcurrY);
     pathValue = fabs(pathValue);
-    pathFraction = pathValue/ldriftcurrY; 
+    pathFraction = pathValue / ldriftcurrY;
     //
     //
-    
-    if(verbo>0) {
+
+    if (verbo > 0) {
       std::cout << "==================================" << std::endl;
       std::cout << "fabs(sliY)= " << fabs(sliY) << "ldriftcurrY= " << ldriftcurrY << std::endl;
-      std::cout << "fabs(sliY/(2*ldriftcurrY))+0.5= " << fabs(sliY/(2*ldriftcurrY))+0.5 << std::endl;
-      std::cout << "int(fabs(sliY/(2*ldriftcurrY))+0.5)*(2*ldriftcurrY)= " << int(fabs(sliY/(2*ldriftcurrY))+0.5)*(2*ldriftcurrY) << std::endl;
+      std::cout << "fabs(sliY/(2*ldriftcurrY))+0.5= " << fabs(sliY / (2 * ldriftcurrY)) + 0.5 << std::endl;
+      std::cout << "int(fabs(sliY/(2*ldriftcurrY))+0.5)*(2*ldriftcurrY)= "
+                << int(fabs(sliY / (2 * ldriftcurrY)) + 0.5) * (2 * ldriftcurrY) << std::endl;
       std::cout << "pathValue= " << pathValue << std::endl;
       std::cout << "pathFraction= " << pathFraction << std::endl;
       std::cout << "==================================" << std::endl;
     }
-    
-    if(pathFraction<0. || pathFraction>1.) std::cout << "ChargeDrifterFP420: ERROR:pathFraction=" << pathFraction << std::endl;
-    pathFraction = pathFraction>0. ? pathFraction : 0. ;
-    pathFraction = pathFraction<1. ? pathFraction : 1. ;
-    xDriftDueToField // Drift along X due to BField
-      = pathValue*tanShiftAngleX;
+
+    if (pathFraction < 0. || pathFraction > 1.)
+      std::cout << "ChargeDrifterFP420: ERROR:pathFraction=" << pathFraction << std::endl;
+    pathFraction = pathFraction > 0. ? pathFraction : 0.;
+    pathFraction = pathFraction < 1. ? pathFraction : 1.;
+    xDriftDueToField  // Drift along X due to BField
+        = pathValue * tanShiftAngleX;
     //      = (ldriftcurrY-sliY)*tanShiftAngleX;
-    zDriftDueToField // Drift along Z due to BField
-      = pathValue*tanShiftAngleZ;
+    zDriftDueToField  // Drift along Z due to BField
+        = pathValue * tanShiftAngleZ;
     // will define X and Z ccordinates (E along Y)
     currX = sliX + xDriftDueToField;
     currZ = sliZ + zDriftDueToField;
   }
   //  double tanShiftAngleX = drift.x()/drift.z();
   //  double tanShiftAngleY = drift.y()/drift.z();
-  // double pathFraction = (modulePath/2.-sliZ)/modulePath ; 
+  // double pathFraction = (modulePath/2.-sliZ)/modulePath ;
   // pathFraction = pathFraction>0. ? pathFraction : 0. ;
   // pathFraction = pathFraction<1. ? pathFraction : 1. ;
-  
-  //uble xDriftDueToField // Drift along X due to BField
+
+  // uble xDriftDueToField // Drift along X due to BField
   //= (modulePath/2. - sliZ)*tanShiftAngleX;
-  //uble yDriftDueToField // Drift along Y due to BField
+  // uble yDriftDueToField // Drift along Y due to BField
   //= (modulePath/2. - sliZ)*tanShiftAngleY;
-  //uble currX = sliX + xDriftDueToField;
-  //uble currY = sliY + yDriftDueToField;
-  //  
-  //  
-  // log is a ln 
-  //  std::cout << "ChargeDrifterFP420: depV=" <<depV  << "  appV=" << appV << " startT0 =" <<startT0  << " 1.-2*depV*pathFraction/(depV+appV) =" <<1.-2*depV*pathFraction/(depV+appV)  << " log(1.-2*depV*pathFraction/(depV+appV)) =" <<log(1.-2*depV*pathFraction/(depV+appV))  << std::endl;
-  double bbb = 1.-2*depV*pathFraction/(depV+appV);
-  if(bbb<0.) std::cout << "ChargeDrifterFP420:ERROR: check your Voltage for log(bbb) bbb=" << bbb << std::endl;
-  double driftTime = -constTe*log(bbb) + startT0;  
-  //    log(1.-2*depV*pathFraction/(depV+appV)) + startT0;  
-  // since no magnetic field the Sigma_x, Sigma_y are the same =  sigma  !!!!!!!!!!!!!!!!! 
-  double sigma = sqrt(2.*constDe*driftTime*100.);  //  * 100.  - since constDe is [cm2/sec], but i want [mm2/sec]
-  
-  //  std::cout << "ChargeDrifterFP420: driftTime=  " << driftTime << "  pathFraction=  " << pathFraction << "  constTe=  " << constTe << "  sigma=  " << sigma << std::endl;
-  if(verbo>0) {
+  // uble currX = sliX + xDriftDueToField;
+  // uble currY = sliY + yDriftDueToField;
+  //
+  //
+  // log is a ln
+  //  std::cout << "ChargeDrifterFP420: depV=" <<depV  << "  appV=" << appV << "
+  //  startT0 =" <<startT0  << " 1.-2*depV*pathFraction/(depV+appV) ="
+  //  <<1.-2*depV*pathFraction/(depV+appV)  << "
+  //  log(1.-2*depV*pathFraction/(depV+appV)) ="
+  //  <<log(1.-2*depV*pathFraction/(depV+appV))  << std::endl;
+  double bbb = 1. - 2 * depV * pathFraction / (depV + appV);
+  if (bbb < 0.)
+    std::cout << "ChargeDrifterFP420:ERROR: check your Voltage for log(bbb) bbb=" << bbb << std::endl;
+  double driftTime = -constTe * log(bbb) + startT0;
+  //    log(1.-2*depV*pathFraction/(depV+appV)) + startT0;
+  // since no magnetic field the Sigma_x, Sigma_y are the same =  sigma
+  // !!!!!!!!!!!!!!!!!
+  double sigma = sqrt(2. * constDe * driftTime * 100.);  //  * 100.  - since constDe is [cm2/sec], but i want [mm2/sec]
+
+  //  std::cout << "ChargeDrifterFP420: driftTime=  " << driftTime << "
+  //  pathFraction=  " << pathFraction << "  constTe=  " << constTe << "  sigma=
+  //  " << sigma << std::endl;
+  if (verbo > 0) {
     std::cout << "ChargeDrifterFP420: drift: xytype=" << xytype << "pathFraction=" << pathFraction << std::endl;
-    std::cout << "  constTe= " << constTe  << "  driftTime = " << driftTime << " startT0  = " << startT0 <<  std::endl;
-    std::cout << " log = " << log(1.-2*depV*pathFraction/(depV+appV))  << std::endl;
-    std::cout << " negativ inside log = " << -2*depV*pathFraction/(depV+appV)  << std::endl;
-    std::cout << " constDe = " << constDe  << "  sigma = " << sigma << std::endl;
-    
+    std::cout << "  constTe= " << constTe << "  driftTime = " << driftTime << " startT0  = " << startT0 << std::endl;
+    std::cout << " log = " << log(1. - 2 * depV * pathFraction / (depV + appV)) << std::endl;
+    std::cout << " negativ inside log = " << -2 * depV * pathFraction / (depV + appV) << std::endl;
+    std::cout << " constDe = " << constDe << "  sigma = " << sigma << std::endl;
+
     std::cout << "ChargeDrifterFP420: drift: xytype=" << xytype << "pathValue=" << pathValue << std::endl;
-    std::cout << " tanShiftAngleX = " << tanShiftAngleX  << "  tanShiftAngleY = " << tanShiftAngleY  << "  tanShiftAngleZ = " << tanShiftAngleZ  << std::endl;
-    std::cout << "sliX = " << sliX  << "  sliY = " << sliY  << "  sliZ = " << sliZ  << std::endl;
-    std::cout << "pathFraction = " << pathFraction  << "  driftTime = " << driftTime  << std::endl;
-    std::cout << "sigma = " << sigma  << std::endl;
-    std::cout << "xDriftDueToField = " << xDriftDueToField  << "  yDriftDueToField = " << yDriftDueToField  << "  zDriftDueToField = " << zDriftDueToField  << std::endl;
-    std::cout << "2currX = " << currX  << "  2currY = " << currY  << "  2currZ = " << currZ  << std::endl;
+    std::cout << " tanShiftAngleX = " << tanShiftAngleX << "  tanShiftAngleY = " << tanShiftAngleY
+              << "  tanShiftAngleZ = " << tanShiftAngleZ << std::endl;
+    std::cout << "sliX = " << sliX << "  sliY = " << sliY << "  sliZ = " << sliZ << std::endl;
+    std::cout << "pathFraction = " << pathFraction << "  driftTime = " << driftTime << std::endl;
+    std::cout << "sigma = " << sigma << std::endl;
+    std::cout << "xDriftDueToField = " << xDriftDueToField << "  yDriftDueToField = " << yDriftDueToField
+              << "  zDriftDueToField = " << zDriftDueToField << std::endl;
+    std::cout << "2currX = " << currX << "  2currY = " << currY << "  2currZ = " << currZ << std::endl;
     std::cout << "ChargeDrifterFP420: drift; finally, rETURN AmplitudeSlimentFP420" << std::endl;
     std::cout << "===================================================================" << std::endl;
     std::cout << " (edu).energy()= " << (edu).energy() << std::endl;
     std::cout << "==" << std::endl;
   }
-  //  std::cout << "ChargeDrifterFP420: (edu).energy()= " << (edu).energy() << std::endl;
-  return AmplitudeSegmentFP420(currX,currY,currZ,sigma,
-			       (edu).energy());  
+  //  std::cout << "ChargeDrifterFP420: (edu).energy()= " << (edu).energy() <<
+  //  std::endl;
+  return AmplitudeSegmentFP420(currX, currY, currZ, sigma, (edu).energy());
 }
-
diff --git a/SimRomanPot/SimFP420/src/DigiConverterFP420.cc b/SimRomanPot/SimFP420/src/DigiConverterFP420.cc
index a4d8679607c1d..91304903d0eab 100644
--- a/SimRomanPot/SimFP420/src/DigiConverterFP420.cc
+++ b/SimRomanPot/SimFP420/src/DigiConverterFP420.cc
@@ -2,65 +2,63 @@
 // File: DigiConverterFP420.cc
 // Date: 12.2006
 // Description: DigiConverterFP420 for FP420
-// Modifications: 
+// Modifications:
 ///////////////////////////////////////////////////////////////////////////////
 #include "SimRomanPot/SimFP420/interface/DigiConverterFP420.h"
 
-DigiConverterFP420::DigiConverterFP420(float in,int verbosity){
-
+DigiConverterFP420::DigiConverterFP420(float in, int verbosity) {
   electronperADC = in;
   verbos = verbosity;
-  
+
   const int defaultBits = 10;
   const int largestBits = 30;
-  
+
   // example is in SiStrips:
-  // static SimpleConfigurable<int> 
+  // static SimpleConfigurable<int>
   //    adcBits(defaultBits, "DigiConverterFP420:rawDataAdcBits");
-  adcBits=defaultBits;
-  
-  if (adcBits > largestBits || adcBits < 1) adcBits = largestBits;
-  
+  adcBits = defaultBits;
+
+  if (adcBits > largestBits || adcBits < 1)
+    adcBits = largestBits;
+
   theMaxADC = ~(~0 << adcBits);
   //      std::cout << "theMaxADC= "<< theMaxADC  << std::endl; // = 1023
-  if(verbos>0) {
+  if (verbos > 0) {
     std::cout << " ***DigiConverterFP420: constructor" << std::endl;
-    std::cout << "with known electronperADC =  " << electronperADC << "the adcBits =  " << adcBits << "  theMaxADC=  " << theMaxADC << "for known defaultBits=  " << defaultBits << " largestBits=  " << largestBits << std::endl;
+    std::cout << "with known electronperADC =  " << electronperADC << "the adcBits =  " << adcBits
+              << "  theMaxADC=  " << theMaxADC << "for known defaultBits=  " << defaultBits
+              << " largestBits=  " << largestBits << std::endl;
   }
 }
 
-DConverterFP420::DigitalMapType
-DigiConverterFP420::convert(const signal_map_type& analogSignal){
-  
+DConverterFP420::DigitalMapType DigiConverterFP420::convert(const signal_map_type &analogSignal) {
   DConverterFP420::DigitalMapType _temp;
-  
-  for ( signal_map_type::const_iterator i=analogSignal.begin(); i!=analogSignal.end(); i++) {
-    
-    // convert analog amplitude to digital, means integer number simulating ADC digitization!
-    //with truncation check
+
+  for (signal_map_type::const_iterator i = analogSignal.begin(); i != analogSignal.end(); i++) {
+    // convert analog amplitude to digital, means integer number simulating ADC
+    // digitization!
+    // with truncation check
     int adc = convert((*i).second);
-    
-    if(verbos>0) {
+
+    if (verbos > 0) {
       std::cout << " ***DigiConverterFP420: convert: after truncation " << std::endl;
       std::cout << "adc =  " << adc << " (*i).first =  " << (*i).first << std::endl;
     }
-    if ( adc > 0) _temp.insert( _temp.end(),
-				DigitalMapType::value_type((*i).first, adc));
+    if (adc > 0)
+      _temp.insert(_temp.end(), DigitalMapType::value_type((*i).first, adc));
   }
-  
+
   return _temp;
-  
 }
 
-
 int DigiConverterFP420::truncate(float in_adc) {
-  
   int adc = int(in_adc);
-  if(verbos>0) {
+  if (verbos > 0) {
     std::cout << " ***DigiConverterFP420: truncate" << std::endl;
-    std::cout << "if adc =  " << adc << "bigger theMaxADC =  " << theMaxADC << " adc=theMaxADC !!!"  << std::endl;
+    std::cout << "if adc =  " << adc << "bigger theMaxADC =  " << theMaxADC << " adc=theMaxADC !!!" << std::endl;
   }
-  if (adc > theMaxADC) adc = theMaxADC;
-  
+  if (adc > theMaxADC)
+    adc = theMaxADC;
+
   return adc;
 }
diff --git a/SimRomanPot/SimFP420/src/FP420DigiMain.cc b/SimRomanPot/SimFP420/src/FP420DigiMain.cc
index 190686f7596e4..1016b9c7e038a 100644
--- a/SimRomanPot/SimFP420/src/FP420DigiMain.cc
+++ b/SimRomanPot/SimFP420/src/FP420DigiMain.cc
@@ -2,182 +2,200 @@
 // File: FP420DigiMain.cc
 // Date: 12.2006
 // Description: FP420DigiMain for FP420
-// Modifications: 
+// Modifications:
 ///////////////////////////////////////////////////////////////////////////////
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include "SimRomanPot/SimFP420/interface/FP420DigiMain.h"
 
-#include "SimRomanPot/SimFP420/interface/ChargeDrifterFP420.h"
 #include "SimRomanPot/SimFP420/interface/ChargeDividerFP420.h"
+#include "SimRomanPot/SimFP420/interface/ChargeDrifterFP420.h"
 
 #include "DataFormats/FP420Digi/interface/HDigiFP420.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include <gsl/gsl_sf_erf.h>
-#include "CLHEP/Random/RandGauss.h"
 #include "CLHEP/Random/RandFlat.h"
+#include "CLHEP/Random/RandGauss.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include <gsl/gsl_sf_erf.h>
 
-#include <vector>
 #include <iostream>
+#include <vector>
 using namespace std;
 
 //#define CBOLTZ (1.38E-23)
 //#define e_SI (1.6E-19)
 
-FP420DigiMain::FP420DigiMain(const edm::ParameterSet& conf):conf_(conf){
+FP420DigiMain::FP420DigiMain(const edm::ParameterSet &conf) : conf_(conf) {
   edm::LogInfo("SimRomanPotSimFP420") << "Creating a FP420DigiMain";
-  ndigis=0;
-  verbosity        = conf_.getUntrackedParameter<int>("VerbosityLevel");
-  theElectronPerADC= conf_.getParameter<double>("ElectronFP420PerAdc");
-  theThreshold     = conf_.getParameter<double>("AdcFP420Threshold");
-  noNoise          = conf_.getParameter<bool>("NoFP420Noise");
-  addNoisyPixels   = conf_.getParameter<bool>("AddNoisyPixels");
-  thez420          = conf_.getParameter<double>("z420");
-  thezD2           = conf_.getParameter<double>("zD2");
-  thezD3           = conf_.getParameter<double>("zD3");
-  theApplyTofCut   = conf_.getParameter<bool>("ApplyTofCut");
-  tofCut           = conf_.getParameter<double>("LowtofCutAndTo200ns");
+  ndigis = 0;
+  verbosity = conf_.getUntrackedParameter<int>("VerbosityLevel");
+  theElectronPerADC = conf_.getParameter<double>("ElectronFP420PerAdc");
+  theThreshold = conf_.getParameter<double>("AdcFP420Threshold");
+  noNoise = conf_.getParameter<bool>("NoFP420Noise");
+  addNoisyPixels = conf_.getParameter<bool>("AddNoisyPixels");
+  thez420 = conf_.getParameter<double>("z420");
+  thezD2 = conf_.getParameter<double>("zD2");
+  thezD3 = conf_.getParameter<double>("zD3");
+  theApplyTofCut = conf_.getParameter<bool>("ApplyTofCut");
+  tofCut = conf_.getParameter<double>("LowtofCutAndTo200ns");
   //  sn0              = 3;// number of stations
   // pn0              = 6;// number of superplanes
   // rn0              = 3; // number of sensors in superlayer
-  xytype           = 2;
+  xytype = 2;
 
-  edm::LogInfo("SimRomanPotSimFP420") 
-    << "theApplyTofCut=" << theApplyTofCut << " tofCut=" << tofCut << "\n"
-    << "FP420DigiMain theElectronPerADC=" << theElectronPerADC << " theThreshold=" << theThreshold << " noNoise=" << noNoise;
+  edm::LogInfo("SimRomanPotSimFP420") << "theApplyTofCut=" << theApplyTofCut << " tofCut=" << tofCut << "\n"
+                                      << "FP420DigiMain theElectronPerADC=" << theElectronPerADC
+                                      << " theThreshold=" << theThreshold << " noNoise=" << noNoise;
 
   // X (or Y)define type of sensor (xytype=1 or 2 used to derive it: 1-Y, 2-X)
   // for every type there is normal pixel size=0.05 and Wide 0.400 mm
-  Thick300 = 0.300;       // = 0.300 mm  normalized to 300micron Silicon
-  //ENC= 2160.;             //          EquivalentNoiseCharge300um = 2160. + other sources of noise
-  ENC= 960.;             //          EquivalentNoiseCharge300um = 2160. + other sources of noise
-  
-  ldriftX = 0.050;        // in mm(xytype=1)
-  ldriftY = 0.050;        // in mm(xytype=2)
-  moduleThickness = 0.250; // mm(xytype=1)(xytype=2)
-  
-  pitchY= 0.050;          // in mm(xytype=1)
-  pitchX= 0.050;          // in mm(xytype=2)
-  //numStripsY = 200;        // Y plate number of strips:200*0.050=10mm (xytype=1)
-  //numStripsX = 400;        // X plate number of strips:400*0.050=20mm (xytype=2)
-  numStripsY = 144;        // Y plate number of strips:144*0.050=7.2mm (xytype=1)
-  numStripsX = 160;        // X plate number of strips:160*0.050=8.0mm (xytype=2)
-  
-  pitchYW= 0.400;          // in mm(xytype=1)
-  pitchXW= 0.400;          // in mm(xytype=2)
-  //numStripsYW = 50;        // Y plate number of W strips:50 *0.400=20mm (xytype=1) - W have ortogonal projection
-  //numStripsXW = 25;        // X plate number of W strips:25 *0.400=10mm (xytype=2) - W have ortogonal projection
-  numStripsYW = 20;        // Y plate number of W strips:20 *0.400=8.0mm (xytype=1) - W have ortogonal projection
-  numStripsXW = 18;        // X plate number of W strips:18 *0.400=7.2mm (xytype=2) - W have ortogonal projection
-  
+  Thick300 = 0.300;  // = 0.300 mm  normalized to 300micron Silicon
+  // ENC= 2160.;             //          EquivalentNoiseCharge300um = 2160. +
+  // other sources of noise
+  ENC = 960.;  //          EquivalentNoiseCharge300um = 2160. + other sources of
+               //          noise
+
+  ldriftX = 0.050;          // in mm(xytype=1)
+  ldriftY = 0.050;          // in mm(xytype=2)
+  moduleThickness = 0.250;  // mm(xytype=1)(xytype=2)
+
+  pitchY = 0.050;  // in mm(xytype=1)
+  pitchX = 0.050;  // in mm(xytype=2)
+  // numStripsY = 200;        // Y plate number of strips:200*0.050=10mm
+  // (xytype=1) numStripsX = 400;        // X plate number of
+  // strips:400*0.050=20mm (xytype=2)
+  numStripsY = 144;  // Y plate number of strips:144*0.050=7.2mm (xytype=1)
+  numStripsX = 160;  // X plate number of strips:160*0.050=8.0mm (xytype=2)
+
+  pitchYW = 0.400;  // in mm(xytype=1)
+  pitchXW = 0.400;  // in mm(xytype=2)
+  // numStripsYW = 50;        // Y plate number of W strips:50 *0.400=20mm
+  // (xytype=1) - W have ortogonal projection numStripsXW = 25;        // X
+  // plate number of W strips:25 *0.400=10mm (xytype=2) - W have ortogonal
+  // projection
+  numStripsYW = 20;  // Y plate number of W strips:20 *0.400=8.0mm (xytype=1) - W
+                     // have ortogonal projection
+  numStripsXW = 18;  // X plate number of W strips:18 *0.400=7.2mm (xytype=2) - W
+                     // have ortogonal projection
+
   //  tofCut = 1350.;           // Cut on the particle TOF range  = 1380 - 1500
-  elossCut = 0.00003;           // Cut on the particle TOF   = 100 or 50
-  
+  elossCut = 0.00003;  // Cut on the particle TOF   = 100 or 50
+
   edm::LogInfo("SimRomanPotSimFP420") << "FP420DigiMain moduleThickness=" << moduleThickness;
-  
-  float noiseRMS = ENC*moduleThickness/Thick300;
 
-  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////  
+  float noiseRMS = ENC * moduleThickness / Thick300;
+
+  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
   // Y:
-  if (xytype ==1) {
-    numStrips = numStripsY;  // Y plate number of strips:200*0.050=10mm --> 100*0.100=10mm
-    pitch= pitchY;
-    ldrift = ldriftX; // because drift is in local coordinates which 90 degree rotated ( for correct timeNormalization & noiseRMS calculations)
-    numStripsW = numStripsYW;  // Y plate number of strips:200*0.050=10mm --> 100*0.100=10mm
-    pitchW= pitchYW;
+  if (xytype == 1) {
+    numStrips = numStripsY;  // Y plate number of strips:200*0.050=10mm -->
+                             // 100*0.100=10mm
+    pitch = pitchY;
+    ldrift = ldriftX;          // because drift is in local coordinates which 90 degree
+                               // rotated ( for correct timeNormalization & noiseRMS
+                               // calculations)
+    numStripsW = numStripsYW;  // Y plate number of strips:200*0.050=10mm -->
+                               // 100*0.100=10mm
+    pitchW = pitchYW;
   }
   // X:
-  if (xytype ==2) {
-    numStrips = numStripsX;  // X plate number of strips:400*0.050=20mm --> 200*0.100=20mm
-    pitch= pitchX;
-    ldrift = ldriftY; // because drift is in local coordinates which 90 degree rotated ( for correct timeNormalization & noiseRMS calculations)
-    numStripsW = numStripsXW;  // X plate number of strips:400*0.050=20mm --> 200*0.100=20mm
-    pitchW= pitchXW;
+  if (xytype == 2) {
+    numStrips = numStripsX;  // X plate number of strips:400*0.050=20mm -->
+                             // 200*0.100=20mm
+    pitch = pitchX;
+    ldrift = ldriftY;          // because drift is in local coordinates which 90 degree
+                               // rotated ( for correct timeNormalization & noiseRMS
+                               // calculations)
+    numStripsW = numStripsXW;  // X plate number of strips:400*0.050=20mm -->
+                               // 200*0.100=20mm
+    pitchW = pitchXW;
   }
-  
-  theHitDigitizerFP420 = new HitDigitizerFP420(moduleThickness,ldrift,ldriftY,ldriftX,thez420,thezD2,thezD3,verbosity);
-  int numPixels = numStrips*numStripsW;
-  theGNoiseFP420 = new GaussNoiseFP420(numPixels,noiseRMS,theThreshold,addNoisyPixels,verbosity);
-  theZSuppressFP420 = new ZeroSuppressFP420(conf_,noiseRMS/theElectronPerADC); 
+
+  theHitDigitizerFP420 =
+      new HitDigitizerFP420(moduleThickness, ldrift, ldriftY, ldriftX, thez420, thezD2, thezD3, verbosity);
+  int numPixels = numStrips * numStripsW;
+  theGNoiseFP420 = new GaussNoiseFP420(numPixels, noiseRMS, theThreshold, addNoisyPixels, verbosity);
+  theZSuppressFP420 = new ZeroSuppressFP420(conf_, noiseRMS / theElectronPerADC);
   thePileUpFP420 = new PileUpFP420();
-  theDConverterFP420 = new DigiConverterFP420(theElectronPerADC,verbosity);
-  
+  theDConverterFP420 = new DigiConverterFP420(theElectronPerADC, verbosity);
+
   edm::LogInfo("SimRomanPotSimFP420") << "FP420DigiMain end of constructor";
 }
 
-FP420DigiMain::~FP420DigiMain(){
+FP420DigiMain::~FP420DigiMain() {
   delete theGNoiseFP420;
   delete theZSuppressFP420;
   delete theHitDigitizerFP420;
   delete thePileUpFP420;
-  delete theDConverterFP420;  
+  delete theDConverterFP420;
 }
 
 //  Run the algorithm
 //  ------------------
 
-vector <HDigiFP420> FP420DigiMain::run(const std::vector<PSimHit> &input,
-				       const G4ThreeVector& bfield, unsigned int iu )  {
-
+vector<HDigiFP420> FP420DigiMain::run(const std::vector<PSimHit> &input, const G4ThreeVector &bfield, unsigned int iu) {
   thePileUpFP420->reset();
   bool first = true;
-  
-  // main loop 
+
+  // main loop
   //
   // First: loop on the SimHits
   //
   std::vector<PSimHit>::const_iterator simHitIter = input.begin();
   std::vector<PSimHit>::const_iterator simHitIterEnd = input.end();
-  for (;simHitIter != simHitIterEnd; ++simHitIter) {
-    
+  for (; simHitIter != simHitIterEnd; ++simHitIter) {
     const PSimHit ihit = *simHitIter;
 
-    if ( first ) {
+    if (first) {
       //       detID = ihit.detUnitId();
       first = false;
     }
 
     // main part here:
-    double  losenergy = ihit.energyLoss();
-    float   tof = ihit.tof();
+    double losenergy = ihit.energyLoss();
+    float tof = ihit.tof();
 
-    if(verbosity>1) {
+    if (verbosity > 1) {
       unsigned int unitID = ihit.detUnitId();
       std::cout << " *******FP420DigiMain:                           intindex= " << iu << std::endl;
-      std::cout << " tof= " << tof << "  EnergyLoss= " << losenergy  << "  pabs= " <<  ihit.pabs() << std::endl;
-      std::cout << " EntryLocalP x= " << ihit.entryPoint().x() << " EntryLocalP y= " << ihit.entryPoint().y() << std::endl;
+      std::cout << " tof= " << tof << "  EnergyLoss= " << losenergy << "  pabs= " << ihit.pabs() << std::endl;
+      std::cout << " EntryLocalP x= " << ihit.entryPoint().x() << " EntryLocalP y= " << ihit.entryPoint().y()
+                << std::endl;
       std::cout << " ExitLocalP x= " << ihit.exitPoint().x() << " ExitLocalP y= " << ihit.exitPoint().y() << std::endl;
-      std::cout << " EntryLocalP z= " << ihit.entryPoint().z() << " ExitLocalP z= " << ihit.exitPoint().z() << std::endl;
-      std::cout << " unitID= " << unitID << "  xytype= " << xytype << " particleType= " << ihit.particleType() << " trackId= " << ihit.trackId() << std::endl;
-      //    std::cout << " det= " << det << " sector= " << sector << "  zmodule= " << zmodule << std::endl;
+      std::cout << " EntryLocalP z= " << ihit.entryPoint().z() << " ExitLocalP z= " << ihit.exitPoint().z()
+                << std::endl;
+      std::cout << " unitID= " << unitID << "  xytype= " << xytype << " particleType= " << ihit.particleType()
+                << " trackId= " << ihit.trackId() << std::endl;
+      //    std::cout << " det= " << det << " sector= " << sector << "  zmodule=
+      //    " << zmodule << std::endl;
       std::cout << "  bfield= " << bfield << std::endl;
     }
-  if(verbosity>0) {
+    if (verbosity > 0) {
       std::cout << " *******FP420DigiMain:                           theApplyTofCut= " << theApplyTofCut << std::endl;
-      std::cout << " tof= " << tof << "  EnergyLoss= " << losenergy  << "  pabs= " <<  ihit.pabs() << std::endl;
+      std::cout << " tof= " << tof << "  EnergyLoss= " << losenergy << "  pabs= " << ihit.pabs() << std::endl;
       std::cout << " particleType= " << ihit.particleType() << std::endl;
-  }
+    }
+
+    if ((!(theApplyTofCut) || (theApplyTofCut && abs(tof) > tofCut && abs(tof) < (tofCut + 200.))) &&
+        losenergy > elossCut) {
+      if (verbosity > 0)
+        std::cout << " inside tof: OK " << std::endl;
 
-    if ( ( !(theApplyTofCut)  ||  ( theApplyTofCut &&   abs(tof) > tofCut && abs(tof) < (tofCut+200.)) ) && losenergy > elossCut) {
-      if(verbosity>0) std::cout << " inside tof: OK " << std::endl;
-      
-      HitDigitizerFP420::hit_map_type _temp = theHitDigitizerFP420->processHit(ihit,bfield,xytype,numStrips,pitch,numStripsW,pitchW,moduleThickness,verbosity); 
-      
-      thePileUpFP420->add(_temp,ihit,verbosity);
-      
+      HitDigitizerFP420::hit_map_type _temp = theHitDigitizerFP420->processHit(
+          ihit, bfield, xytype, numStrips, pitch, numStripsW, pitchW, moduleThickness, verbosity);
+
+      thePileUpFP420->add(_temp, ihit, verbosity);
     }
-    // main part end (AZ) 
-  } //for
-  // main loop end (AZ) 
-  
+    // main part end (AZ)
+  }  // for
+  // main loop end (AZ)
+
   PileUpFP420::signal_map_type theSignal = thePileUpFP420->dumpSignal();
-  PileUpFP420::HitToDigisMapType theLink = thePileUpFP420->dumpLink();  
-  
-  
+  PileUpFP420::HitToDigisMapType theLink = thePileUpFP420->dumpLink();
+
   PileUpFP420::signal_map_type afterNoise;
-  
+
   if (noNoise) {
     afterNoise = theSignal;
   } else {
@@ -185,77 +203,77 @@ vector <HDigiFP420> FP420DigiMain::run(const std::vector<PSimHit> &input,
     //    add_noise();
   }
   digis.clear();
-  
-  push_digis(theZSuppressFP420->zeroSuppress(theDConverterFP420->convert(afterNoise),verbosity),
-	     theLink,afterNoise);
-  
-  return digis; // to HDigiFP420
+
+  push_digis(theZSuppressFP420->zeroSuppress(theDConverterFP420->convert(afterNoise), verbosity), theLink, afterNoise);
+
+  return digis;  // to HDigiFP420
 }
 
-void FP420DigiMain::push_digis(const DigitalMapType& dm,
-			       const HitToDigisMapType& htd,
-			       const PileUpFP420::signal_map_type& afterNoise
-			       )        {
-  //  
-  if(verbosity>0) {
-    std::cout << " ****FP420DigiMain: push_digis start: do for loop dm.size()=" <<  dm.size() << std::endl;
+void FP420DigiMain::push_digis(const DigitalMapType &dm,
+                               const HitToDigisMapType &htd,
+                               const PileUpFP420::signal_map_type &afterNoise) {
+  //
+  if (verbosity > 0) {
+    std::cout << " ****FP420DigiMain: push_digis start: do for loop dm.size()=" << dm.size() << std::endl;
   }
-  
-  digis.reserve(50); 
+
+  digis.reserve(50);
   digis.clear();
   //   link_coll.clear();
-  for ( DigitalMapType::const_iterator i=dm.begin(); i!=dm.end(); i++) {
-    
+  for (DigitalMapType::const_iterator i = dm.begin(); i != dm.end(); i++) {
     // Load digis
-    // push to digis the content of first and second words of HDigiFP420 vector for every strip pointer (*i)
-    digis.push_back( HDigiFP420( (*i).first, (*i).second));
-    ndigis++; 
+    // push to digis the content of first and second words of HDigiFP420 vector
+    // for every strip pointer (*i)
+    digis.push_back(HDigiFP420((*i).first, (*i).second));
+    ndigis++;
     // very useful check:
-    if(verbosity>0) {
+    if (verbosity > 0) {
       std::cout << " ****FP420DigiMain:push_digis:  ndigis = " << ndigis << std::endl;
       std::cout << "push_digis: strip  = " << (*i).first << "  adc = " << (*i).second << std::endl;
-    }    
-    
+    }
   }
-    
+
   /////////////////////////////////////////////////////////////////////////////////////////////
-    
-    // reworked to access the fraction of amplitude per simhit
-    
-    for ( HitToDigisMapType::const_iterator mi=htd.begin(); mi!=htd.end(); mi++) {
-      //      
-      if (dm.find((*mi).first) != dm.end() ){
-	// --- For each channel, sum up the signals from a simtrack
-	//
-	map<const PSimHit *, Amplitude> totalAmplitudePerSimHit;
-	for (std::vector < std::pair < const PSimHit*, Amplitude > >::const_iterator simul =
-	       (*mi).second.begin() ; simul != (*mi).second.end(); simul ++){
-	  totalAmplitudePerSimHit[(*simul).first] += (*simul).second;
-	}
-	/*	
-	//--- include the noise as well
-	
-	PileUpFP420::signal_map_type& temp1 = const_cast<PileUpFP420::signal_map_type&>(afterNoise);
-	float totalAmplitude1 = temp1[(*mi).first];
-	
-	//--- digisimlink
-	for (std::map<const PSimHit *, Amplitude>::const_iterator iter = totalAmplitudePerSimHit.begin();
-	iter != totalAmplitudePerSimHit.end(); iter++){
-	
-	float threshold = 0.;
-	if (totalAmplitudePerSimHit[(*iter).first]/totalAmplitude1 >= threshold) {
-	float fraction = totalAmplitudePerSimHit[(*iter).first]/totalAmplitude1;
-	
-	//Noise fluctuation could make fraction>1. Unphysical, set it by hand.
-	if(fraction >1.) fraction = 1.;
-	
-	link_coll.push_back(StripDigiSimLink( (*mi).first,   //channel
-	((*iter).first)->trackId(), //simhit
-	fraction));    //fraction
-	}//if
-	}//for
-	*/
-	//
+
+  // reworked to access the fraction of amplitude per simhit
+
+  for (HitToDigisMapType::const_iterator mi = htd.begin(); mi != htd.end(); mi++) {
+    //
+    if (dm.find((*mi).first) != dm.end()) {
+      // --- For each channel, sum up the signals from a simtrack
+      //
+      map<const PSimHit *, Amplitude> totalAmplitudePerSimHit;
+      for (std::vector<std::pair<const PSimHit *, Amplitude>>::const_iterator simul = (*mi).second.begin();
+           simul != (*mi).second.end();
+           simul++) {
+        totalAmplitudePerSimHit[(*simul).first] += (*simul).second;
+      }
+      /*
+      //--- include the noise as well
+
+      PileUpFP420::signal_map_type& temp1 =
+      const_cast<PileUpFP420::signal_map_type&>(afterNoise); float
+      totalAmplitude1 = temp1[(*mi).first];
+
+      //--- digisimlink
+      for (std::map<const PSimHit *, Amplitude>::const_iterator iter =
+      totalAmplitudePerSimHit.begin(); iter != totalAmplitudePerSimHit.end();
+      iter++){
+
+      float threshold = 0.;
+      if (totalAmplitudePerSimHit[(*iter).first]/totalAmplitude1 >= threshold) {
+      float fraction = totalAmplitudePerSimHit[(*iter).first]/totalAmplitude1;
+
+      //Noise fluctuation could make fraction>1. Unphysical, set it by hand.
+      if(fraction >1.) fraction = 1.;
+
+      link_coll.push_back(StripDigiSimLink( (*mi).first,   //channel
+      ((*iter).first)->trackId(), //simhit
+      fraction));    //fraction
       }//if
-    }//for
+      }//for
+      */
+      //
+    }  // if
+  }    // for
 }
diff --git a/SimRomanPot/SimFP420/src/GaussNoiseFP420.cc b/SimRomanPot/SimFP420/src/GaussNoiseFP420.cc
index 27fcb4675cbf9..f7b3db9920f67 100644
--- a/SimRomanPot/SimFP420/src/GaussNoiseFP420.cc
+++ b/SimRomanPot/SimFP420/src/GaussNoiseFP420.cc
@@ -2,63 +2,59 @@
 // File: GaussNoiseFP420.cc
 // Date: 12.2006
 // Description: GaussNoiseFP420 for FP420
-// Modifications: 
+// Modifications:
 ///////////////////////////////////////////////////////////////////////////////
+#include "CLHEP/Random/RandGauss.h"
 #include "SimRomanPot/SimFP420/interface/GaussNoiseFP420.h"
 #include "SimRomanPot/SimFP420/interface/GaussNoiseProducerFP420.h"
-#include "CLHEP/Random/RandGauss.h"
 
-GaussNoiseFP420::GaussNoiseFP420(int ns, float nrms, float th, bool aNpixel, int verbosity):
-  numPixels(ns), noiseRMS(nrms), threshold(th), addNoisyPixels(aNpixel), verbosi(verbosity){}
+GaussNoiseFP420::GaussNoiseFP420(int ns, float nrms, float th, bool aNpixel, int verbosity)
+    : numPixels(ns), noiseRMS(nrms), threshold(th), addNoisyPixels(aNpixel), verbosi(verbosity) {}
 
+PileUpFP420::signal_map_type GaussNoiseFP420::addNoise(const PileUpFP420::signal_map_type &in) {
+  PileUpFP420::signal_map_type _signal;
 
-PileUpFP420::signal_map_type 
-GaussNoiseFP420::addNoise(const PileUpFP420::signal_map_type& in){
-  
-  PileUpFP420::signal_map_type _signal;  
-  
   // Add noise on non-hit pixels
-  std::map<int,float,std::less<int> > generatedNoise;
-  
+  std::map<int, float, std::less<int>> generatedNoise;
+
   //  int numberOfPixels = (numRows * numColumns);// numPixels=numberOfPixels
-  
-  
+
   GaussNoiseProducerFP420 gen;
-  gen.generate(numPixels,threshold,noiseRMS,generatedNoise);// threshold is thePixelThreshold
-  
+  gen.generate(numPixels, threshold, noiseRMS,
+               generatedNoise);  // threshold is thePixelThreshold
+
   // noise for channels with signal:
   // ----------------------------
-  
-  for (PileUpFP420::signal_map_type::const_iterator si  = in.begin();
-       si != in.end()  ; si++){
-    
-    if(verbosi>0) {
+
+  for (PileUpFP420::signal_map_type::const_iterator si = in.begin(); si != in.end(); si++) {
+    if (verbosi > 0) {
       std::cout << " ***GaussNoiseFP420:  before noise:" << std::endl;
-      std::cout << " for si->first=  " << si->first  << "    _signal[si->first]=  " << _signal[si->first] << "        si->second=      " << si->second  << std::endl;
+      std::cout << " for si->first=  " << si->first << "    _signal[si->first]=  " << _signal[si->first]
+                << "        si->second=      " << si->second << std::endl;
     }
     // define Gaussian noise centered at 0. with sigma = noiseRMS:
-    float noise( CLHEP::RandGauss::shoot(0.,noiseRMS) );           
+    float noise(CLHEP::RandGauss::shoot(0., noiseRMS));
     //    float noise  = CLHEP::RandGaussQ::shoot(0.,theNoiseInElectrons) ;
     // add noise to each channel with signal:
     _signal[si->first] = si->second + noise;
-    
-    if(verbosi>0) {
-      std::cout << " ***GaussNoiseFP420: after noise added  = " << noise  << std::endl;
+
+    if (verbosi > 0) {
+      std::cout << " ***GaussNoiseFP420: after noise added  = " << noise << std::endl;
       std::cout << "after noise added the _signal[si->first]=  " << _signal[si->first] << std::endl;
     }
   }
-  
+
   //                                                                                                    //
-  if(addNoisyPixels){  // Option to skip noise in non-hit pixels
+  if (addNoisyPixels) {  // Option to skip noise in non-hit pixels
     // Noise on the other channels:
-    typedef std::map<int,float,std::less<int> >::iterator MI;
-    for(MI p = generatedNoise.begin(); p != generatedNoise.end(); p++){
-      if(_signal[(*p).first] == 0) {
-	_signal[(*p).first] += (*p).second;
+    typedef std::map<int, float, std::less<int>>::iterator MI;
+    for (MI p = generatedNoise.begin(); p != generatedNoise.end(); p++) {
+      if (_signal[(*p).first] == 0) {
+        _signal[(*p).first] += (*p).second;
       }
-    }//for(MI
+    }  // for(MI
   }
-  
+
   // or:
   //                                                                        //
   /*
@@ -69,29 +65,25 @@ GaussNoiseFP420::addNoise(const PileUpFP420::signal_map_type& in){
     int iy = ((*p).first) / numRows;
     int ix = ((*p).first) - (iy*numRows);
     // Keep for a while for testing.
-    if( iy < 0 || iy > (numColumns-1) ) 
+    if( iy < 0 || iy > (numColumns-1) )
     LogWarning ("Pixel Geometry") << " error in iy " << iy ;
     if( ix < 0 || ix > (numRows-1) )
     LogWarning ("Pixel Geometry")  << " error in ix " << ix ;
     int chan = PixelDigi::pixelToChannel(ix, iy);
-    LogDebug ("Pixel Digitizer")<<" Storing noise = " << (*mapI).first << " " << (*mapI).second 
+    LogDebug ("Pixel Digitizer")<<" Storing noise = " << (*mapI).first << " " <<
+    (*mapI).second
     << " " << ix << " " << iy << " " << chan ;
     if(_signal[chan] == 0){
     _signal[(*p).first] += (*p).second;
     }//if
     }//for(MI
     }
-  */    
+  */
   //                                                                        //
   //                                                                                                    //
-  
-  
+
   //
   return _signal;
   //
 }
 //
-
-
-
-
diff --git a/SimRomanPot/SimFP420/src/GaussNoiseProducerFP420.cc b/SimRomanPot/SimFP420/src/GaussNoiseProducerFP420.cc
index a5f49bbf0734c..033e8d74addda 100644
--- a/SimRomanPot/SimFP420/src/GaussNoiseProducerFP420.cc
+++ b/SimRomanPot/SimFP420/src/GaussNoiseProducerFP420.cc
@@ -2,56 +2,58 @@
 // File: GaussNoiseProducerFP420.cc
 // Date: 12.2006
 // Description: GaussNoiseFP420 for FP420
-// Modifications: 
+// Modifications:
 ///////////////////////////////////////////////////////////////////////////////
-#include "SimRomanPot/SimFP420/interface/GaussNoiseProducerFP420.h"
-#include "CLHEP/Random/RandPoisson.h"
 #include "CLHEP/Random/RandFlat.h"
-#include <gsl/gsl_sf_erf.h>
-#include <gsl/gsl_sf_result.h>
+#include "CLHEP/Random/RandPoisson.h"
+#include "SimRomanPot/SimFP420/interface/GaussNoiseProducerFP420.h"
 #include <gsl/gsl_randist.h>
 #include <gsl/gsl_rng.h>
+#include <gsl/gsl_sf_erf.h>
+#include <gsl/gsl_sf_result.h>
 
-extern "C"   float freq_(const float& x);   
-extern "C"   float gausin_(const float& x);
+extern "C" float freq_(const float &x);
+extern "C" float gausin_(const float &x);
 
-void GaussNoiseProducerFP420::generate(int NumberOfchannels, 
-				       float threshold, 
-				       float noiseRMS, 
-				       std::map<int,float, std::less<int> >& theMap )
-{
-  
+void GaussNoiseProducerFP420::generate(int NumberOfchannels,
+                                       float threshold,
+                                       float noiseRMS,
+                                       std::map<int, float, std::less<int>> &theMap) {
   // estimale mean number of noisy channels with amplidudes above $AdcThreshold$
-  
+
   // Gauss is centered at 0 with sigma=1
   // Gaussian tail probability higher threshold(=5sigma for instance):
   gsl_sf_result result;
   int status = gsl_sf_erf_Q_e(threshold, &result);
-  //MP 
-  //  if (status != 0) throw DetLogicError("GaussNoiseProducerFP420::could not compute gaussian tail probability for the threshold chosen");
-  if (status != 0) std::cerr<<"GaussNoiseProducerFP420::could not compute gaussian tail probability for the threshold chosen"<<std::endl;
+  // MP
+  //  if (status != 0) throw DetLogicError("GaussNoiseProducerFP420::could not
+  //  compute gaussian tail probability for the threshold chosen");
+  if (status != 0)
+    std::cerr << "GaussNoiseProducerFP420::could not compute gaussian tail "
+                 "probability for the threshold chosen"
+              << std::endl;
   float probabilityLeft = result.val;
-  
-  // with known probability higher threshold compute number of noisy channels distributed in Poisson:
+
+  // with known probability higher threshold compute number of noisy channels
+  // distributed in Poisson:
   float meanNumberOfNoisyChannels = probabilityLeft * NumberOfchannels;
   int numberOfNoisyChannels = CLHEP::RandPoisson::shoot(meanNumberOfNoisyChannels);
-  
+
   // draw noise at random according to Gaussian tail
-  
+
   // initialise default gsl uniform generator engine
-  static gsl_rng const * const mt19937 = gsl_rng_alloc (gsl_rng_mt19937);
-  
+  static gsl_rng const *const mt19937 = gsl_rng_alloc(gsl_rng_mt19937);
+
   float lowLimit = threshold * noiseRMS;
   for (int i = 0; i < numberOfNoisyChannels; i++) {
-    
-    // Find a random channel number    
-    int theChannelNumber = (int) CLHEP::RandFlat::shootInt(NumberOfchannels);
-    
-    // Find random noise value: random mt19937 over Gaussian tail above threshold:
+    // Find a random channel number
+    int theChannelNumber = (int)CLHEP::RandFlat::shootInt(NumberOfchannels);
+
+    // Find random noise value: random mt19937 over Gaussian tail above
+    // threshold:
     float noise = gsl_ran_gaussian_tail(mt19937, lowLimit, noiseRMS);
-    
+
     // Fill in map
     theMap[theChannelNumber] = noise;
-    
   }
 }
diff --git a/SimRomanPot/SimFP420/src/HitDigitizerFP420.cc b/SimRomanPot/SimFP420/src/HitDigitizerFP420.cc
index 0bfa1bc700c99..d6ece1a4d78f0 100644
--- a/SimRomanPot/SimFP420/src/HitDigitizerFP420.cc
+++ b/SimRomanPot/SimFP420/src/HitDigitizerFP420.cc
@@ -2,202 +2,241 @@
 // File: HitDigitizerFP420.cc
 // Date: 08.2008
 // Description: HitDigitizerFP420 for FP420
-// Modifications: 
+// Modifications:
 ///////////////////////////////////////////////////////////////////////////////
 #include "SimRomanPot/SimFP420/interface/HitDigitizerFP420.h"
 //#include "SimG4CMS/FP420/interface/FP420G4HitCollection.h"
 //#include "SimG4CMS/FP420/interface/FP420G4Hit.h"
 
-#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
-#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "DataFormats/GeometryVector/interface/LocalVector.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-#include "SimRomanPot/SimFP420/interface/ChargeDrifterFP420.h"
 #include "SimRomanPot/SimFP420/interface/ChargeDividerFP420.h"
+#include "SimRomanPot/SimFP420/interface/ChargeDrifterFP420.h"
 #include "SimRomanPot/SimFP420/interface/InduceChargeFP420.h"
 
 using namespace std;
-#include<vector>
+#include <vector>
 
 #define CBOLTZ (1.38E-23)
 #define e_SI (1.6E-19)
 
-//HitDigitizerFP420::HitDigitizerFP420(float in,float inp,float inpx,float inpy){
-//HitDigitizerFP420::HitDigitizerFP420(float in,float inp,float inpx,float inpy,float ild,float ildx,float ildy){
-HitDigitizerFP420::HitDigitizerFP420(float in,float ild,float ildx,float ildy,float in0,float in2,float in3,int verbosity){
-  moduleThickness =in; 
-  double bz420 = in0; 
-  double bzD2 =  in2; 
-  double bzD3 =  in3;
-  //  double pitch =inp; 
-  //  double pitchX =inpx; 
-  //  double pitchY =inpy; 
-  double ldrift =ild; 
-  double ldriftX =ildx; 
-  double ldriftY =ildy; 
+// HitDigitizerFP420::HitDigitizerFP420(float in,float inp,float inpx,float
+// inpy){ HitDigitizerFP420::HitDigitizerFP420(float in,float inp,float
+// inpx,float inpy,float ild,float ildx,float ildy){
+HitDigitizerFP420::HitDigitizerFP420(
+    float in, float ild, float ildx, float ildy, float in0, float in2, float in3, int verbosity) {
+  moduleThickness = in;
+  double bz420 = in0;
+  double bzD2 = in2;
+  double bzD3 = in3;
+  //  double pitch =inp;
+  //  double pitchX =inpx;
+  //  double pitchY =inpy;
+  double ldrift = ild;
+  double ldriftX = ildx;
+  double ldriftY = ildy;
   //
   // Construct default classes
   //
-  
-  //theCDividerFP420 = new ChargeDividerFP420(pitch);
+
+  // theCDividerFP420 = new ChargeDividerFP420(pitch);
   theCDividerFP420 = new ChargeDividerFP420(moduleThickness, bz420, bzD2, bzD3, verbosity);
-  
-  depletionVoltage=20.0; //
-  appliedVoltage=25.0;  //  a bit bigger than depletionVoltage to have positive value A for logA, A=1-2*Tfract.*Vd/(Vd+Vb)
-  
-  //  chargeMobility=480.0;//  = 480.0  !holes    mobility [cm**2/V/sec] p-side;   = 1350.0 !electron mobility - n-side
-  chargeMobility=1350.0;//  = 480.0  !holes    mobility [cm**2/V/sec] p-side;   = 1350.0 !electron mobility - n-side
-  //temperature=297.; // 24 C degree +273 = 297 ---->diffusion const for electrons= (1.38E-23/1.6E-19)*1350.0*297=34.6
+
+  depletionVoltage = 20.0;  //
+  appliedVoltage = 25.0;    //  a bit bigger than depletionVoltage to have positive
+                            //  value A for logA, A=1-2*Tfract.*Vd/(Vd+Vb)
+
+  //  chargeMobility=480.0;//  = 480.0  !holes    mobility [cm**2/V/sec] p-side;
+  //  = 1350.0 !electron mobility - n-side
+  chargeMobility = 1350.0;  //  = 480.0  !holes    mobility [cm**2/V/sec] p-side;
+                            //  = 1350.0 !electron mobility - n-side
+  // temperature=297.; // 24 C degree +273 = 297 ---->diffusion const for
+  // electrons= (1.38E-23/1.6E-19)*1350.0*297=34.6
   //  diffusion const for holes  =   12.3   [cm**2/sec]
-  temperature=263.; // -10  C degree +273 = 263 ---->diffusion const for electrons= (1.38E-23/1.6E-19)*1350.0*263=30.6
-  double diffusionConstant = CBOLTZ/e_SI * chargeMobility * temperature;
+  temperature = 263.;  // -10  C degree +273 = 263 ---->diffusion const for
+                       // electrons= (1.38E-23/1.6E-19)*1350.0*263=30.6
+  double diffusionConstant = CBOLTZ / e_SI * chargeMobility * temperature;
   // noDiffusion=true; // true if no Diffusion
-  noDiffusion=false; // false if Diffusion
-  if (noDiffusion) diffusionConstant *= 1.0e-3;
-  
-  chargeDistributionRMS=6.5e-10;
-  
+  noDiffusion = false;  // false if Diffusion
+  if (noDiffusion)
+    diffusionConstant *= 1.0e-3;
+
+  chargeDistributionRMS = 6.5e-10;
+
   // arbitrary:
-  tanLorentzAnglePerTesla = 0. ;       //  try =0.106 if B field exist
-  
-  //    double timeNormalisation = pow(moduleThickness,2)/(2.*depletionVoltage*chargeMobility);
-  //    double timeNormalisation = pow(pitch,2)/(2.*depletionVoltage*chargeMobility);
-  
-  double timeNormalisation = pow(ldrift,2)/(2.*depletionVoltage*chargeMobility);// 
-  // double timeNormalisation = pow(ldrift,2)/(2.*depletionVoltage*chargeMobility);// 
-  timeNormalisation = timeNormalisation*0.01; // because ldrift in [mm] but mu_e in [cm2/V/sec 
-  
-  //      double timeNormalisation = pow(pitch/2.,2)/(2.*depletionVoltage*chargeMobility);// i entered pitch as a distance between 2 read-out strips, not real distance between any (p or n) electrods which will be in 2 times less. But in expression for timeNormalisation the real distance of charge collection must be, so use pitch/2.   !
-  
-  
-  double clusterWidth=5.;// was = 3
-  gevperelectron= 3.61e-09; //     double GevPerElectron = 3.61e-09
-  
+  tanLorentzAnglePerTesla = 0.;  //  try =0.106 if B field exist
+
+  //    double timeNormalisation =
+  //    pow(moduleThickness,2)/(2.*depletionVoltage*chargeMobility); double
+  //    timeNormalisation = pow(pitch,2)/(2.*depletionVoltage*chargeMobility);
+
+  double timeNormalisation = pow(ldrift, 2) / (2. * depletionVoltage * chargeMobility);  //
+  // double timeNormalisation =
+  // pow(ldrift,2)/(2.*depletionVoltage*chargeMobility);//
+  timeNormalisation = timeNormalisation * 0.01;  // because ldrift in [mm] but mu_e in [cm2/V/sec
+
+  //      double timeNormalisation =
+  //      pow(pitch/2.,2)/(2.*depletionVoltage*chargeMobility);// i entered
+  //      pitch as a distance between 2 read-out strips, not real distance
+  //      between any (p or n) electrods which will be in 2 times less. But in
+  //      expression for timeNormalisation the real distance of charge
+  //      collection must be, so use pitch/2.   !
+
+  double clusterWidth = 5.;   // was = 3
+  gevperelectron = 3.61e-09;  //     double GevPerElectron = 3.61e-09
+
   // GevPerElectron AZ:average deposited energy per e-h pair [keV]??? =0.0036
-  if(verbosity>0) {
+  if (verbosity > 0) {
     std::cout << "HitDigitizerFP420: constructor ldrift= " << ldrift << std::endl;
-    std::cout << "ldriftY= " <<ldriftY  << "ldriftX= " <<ldriftX  << std::endl;
-    std::cout << "depletionVoltage" <<  depletionVoltage    << "appliedVoltage" <<  appliedVoltage    << "chargeMobility" <<  chargeMobility    << "temperature" <<  temperature    << "diffusionConstant" <<  diffusionConstant    << "chargeDistributionRMS" <<   chargeDistributionRMS   << "moduleThickness" <<   moduleThickness   << "timeNormalisation" <<  timeNormalisation    << "gevperelectron" <<  gevperelectron    << std::endl;
+    std::cout << "ldriftY= " << ldriftY << "ldriftX= " << ldriftX << std::endl;
+    std::cout << "depletionVoltage" << depletionVoltage << "appliedVoltage" << appliedVoltage << "chargeMobility"
+              << chargeMobility << "temperature" << temperature << "diffusionConstant" << diffusionConstant
+              << "chargeDistributionRMS" << chargeDistributionRMS << "moduleThickness" << moduleThickness
+              << "timeNormalisation" << timeNormalisation << "gevperelectron" << gevperelectron << std::endl;
   }
-  //ndif
-  
-  theCDrifterFP420 = 
-    new ChargeDrifterFP420(moduleThickness,
-			   timeNormalisation,
-			   diffusionConstant,
-			   temperature,
-			   chargeDistributionRMS,
-			   depletionVoltage,
-			   appliedVoltage,
-			   ldriftX,
-			   ldriftY, verbosity);
+  // ndif
+
+  theCDrifterFP420 = new ChargeDrifterFP420(moduleThickness,
+                                            timeNormalisation,
+                                            diffusionConstant,
+                                            temperature,
+                                            chargeDistributionRMS,
+                                            depletionVoltage,
+                                            appliedVoltage,
+                                            ldriftX,
+                                            ldriftY,
+                                            verbosity);
   //					pitchX,
   //					pitchY);
-  
-  theIChargeFP420 = new InduceChargeFP420(clusterWidth,gevperelectron);
-}
 
+  theIChargeFP420 = new InduceChargeFP420(clusterWidth, gevperelectron);
+}
 
-HitDigitizerFP420::~HitDigitizerFP420(){
+HitDigitizerFP420::~HitDigitizerFP420() {
   delete theCDividerFP420;
   delete theCDrifterFP420;
   delete theIChargeFP420;
 }
 
-
-//HitDigitizerFP420::hit_map_type HitDigitizerFP420::processHit(const PSimHit& hit, G4ThreeVector bfield, int xytype,int numStrips, double pitch){
-HitDigitizerFP420::hit_map_type HitDigitizerFP420::processHit(const PSimHit& hit, const G4ThreeVector& bfield, int xytype,int numStrips, double pitch, int numStripsW, double pitchW, double moduleThickness, int verbosity){
-  
+// HitDigitizerFP420::hit_map_type HitDigitizerFP420::processHit(const PSimHit&
+// hit, G4ThreeVector bfield, int xytype,int numStrips, double pitch){
+HitDigitizerFP420::hit_map_type HitDigitizerFP420::processHit(const PSimHit &hit,
+                                                              const G4ThreeVector &bfield,
+                                                              int xytype,
+                                                              int numStrips,
+                                                              double pitch,
+                                                              int numStripsW,
+                                                              double pitchW,
+                                                              double moduleThickness,
+                                                              int verbosity) {
   // use chargePosition just for cross-check in "induce" method
   // hit center in 3D-detector r.f.
-  
-  float middlex = (hit.exitPoint().x() + hit.entryPoint().x() )/2.;
-  float middley = (hit.exitPoint().y() + hit.entryPoint().y() )/2.;
-  
-  
-  float chargePosition= -100.;
-  // Y: 
-  if(xytype == 1) {
-    //     chargePosition  = fabs(-numStrips/2. - ( int(middle.x()/pitch) +1.) );
-    //chargePosition  = fabs(int(middle.x()/pitch+0.5*(numStrips+1)) + 1.);
-    //      chargePosition  = fabs(int(middle.y()/pitch+0.5*(numStrips+1)) + 1.);
-    // local and global reference frames are rotated in 90 degree, so global X and local Y are collinear
-    //     chargePosition  = int(fabs(middle.x()/pitch + 0.5*numStrips + 1.));// charge in strip coord 
-    chargePosition = 0.5*(numStrips) + middlex/pitch ;// charge in strip coord 0 - numStrips-1
-    
-    
+
+  float middlex = (hit.exitPoint().x() + hit.entryPoint().x()) / 2.;
+  float middley = (hit.exitPoint().y() + hit.entryPoint().y()) / 2.;
+
+  float chargePosition = -100.;
+  // Y:
+  if (xytype == 1) {
+    //     chargePosition  = fabs(-numStrips/2. - ( int(middle.x()/pitch) +1.)
+    //     );
+    // chargePosition  = fabs(int(middle.x()/pitch+0.5*(numStrips+1)) + 1.);
+    //      chargePosition  = fabs(int(middle.y()/pitch+0.5*(numStrips+1))
+    //      + 1.);
+    // local and global reference frames are rotated in 90 degree, so global X
+    // and local Y are collinear
+    //     chargePosition  = int(fabs(middle.x()/pitch + 0.5*numStrips + 1.));//
+    //     charge in strip coord
+    chargePosition = 0.5 * (numStrips) + middlex / pitch;  // charge in strip coord 0 - numStrips-1
+
   }
   // X:
-  else if(xytype == 2) {
-    //     chargePosition  = fabs(-numStrips/2. - ( int(middle.y()/pitch) +1.) );
-    //chargePosition  = fabs(int(middle.y()/pitch+0.5*(numStrips+1)) + 1.);
-    //      chargePosition  = fabs(int(middle.x()/pitch+0.5*(numStrips+1)) + 1.);
-    // local and global reference frames are rotated in 90 degree, so global X and local Y are collinear
+  else if (xytype == 2) {
+    //     chargePosition  = fabs(-numStrips/2. - ( int(middle.y()/pitch) +1.)
+    //     );
+    // chargePosition  = fabs(int(middle.y()/pitch+0.5*(numStrips+1)) + 1.);
+    //      chargePosition  = fabs(int(middle.x()/pitch+0.5*(numStrips+1))
+    //      + 1.);
+    // local and global reference frames are rotated in 90 degree, so global X
+    // and local Y are collinear
     //     chargePosition  = int(fabs(middle.y()/pitch + 0.5*numStrips + 1.));
-    chargePosition = 0.5*(numStrips) + middley/pitch ;// charge in strip coord 0 - numStrips-1
-    
-    //  std::cout << " chargePosition    SiHitDi... = " << chargePosition                       << std::endl;
-  }
-  else {
-    std::cout <<"================================================================"<<std::endl;
-    std::cout << "****   HitDigitizerFP420:  !!!  ERROR: you have not to be here !!!  xytype=" << xytype << std::endl;
-    // std::cout << "****   HitDigitizerFP420:  !!!  ERROR: you have not to be here !!!  xytype=" << xytype << std::endl;
-    
-    
+    chargePosition = 0.5 * (numStrips) + middley / pitch;  // charge in strip coord 0 - numStrips-1
+
+    //  std::cout << " chargePosition    SiHitDi... = " << chargePosition <<
+    //  std::endl;
+  } else {
+    std::cout << "================================================================" << std::endl;
+    std::cout << "****   HitDigitizerFP420:  !!!  ERROR: you have not to be "
+                 "here !!!  xytype="
+              << xytype << std::endl;
+    // std::cout << "****   HitDigitizerFP420:  !!!  ERROR: you have not to be
+    // here !!!  xytype=" << xytype << std::endl;
+
     //     break;
   }
   //   if(chargePosition > numStrips || chargePosition<1) {
-  if(chargePosition > numStrips || chargePosition < 0) {
-    std::cout << "****   HitDigitizerFP420:  !!!  ERROR: check correspondence of XY detector dimensions in XML and here !!! chargePosition = " << chargePosition << std::endl;
+  if (chargePosition > numStrips || chargePosition < 0) {
+    std::cout << "****   HitDigitizerFP420:  !!!  ERROR: check correspondence of XY "
+                 "detector dimensions in XML and here !!! chargePosition = "
+              << chargePosition << std::endl;
     //     break;
   }
-  
-  if(verbosity>0) {
-    std::cout << " ======   ****   HitDigitizerFP420:  !!!  processHit  !!!  : input: xytype=" << xytype << " numStrips=  " << numStrips << " pitch=  " << pitch << " Calculated chargePosition=  " << chargePosition << std::endl;
+
+  if (verbosity > 0) {
+    std::cout << " ======   ****   HitDigitizerFP420:  !!!  processHit  !!!  : "
+                 "input: xytype="
+              << xytype << " numStrips=  " << numStrips << " pitch=  " << pitch
+              << " Calculated chargePosition=  " << chargePosition << std::endl;
     std::cout << "The middle of hit point on input was: middlex =  " << middlex << std::endl;
     std::cout << "The middle of hit point on input was: middley =  " << middley << std::endl;
-    //  std::cout << "For checks: hit point Entry =  " << hit.getEntry() << std::endl;
-    std::cout << " ======   ****   HitDigitizerFP420:processHit:   start  CDrifterFP420 divide" << std::endl;
+    //  std::cout << "For checks: hit point Entry =  " << hit.getEntry() <<
+    //  std::endl;
+    std::cout << " ======   ****   HitDigitizerFP420:processHit:   start  "
+                 "CDrifterFP420 divide"
+              << std::endl;
   }
   //
   // Fully process one SimHit
   //
-  
+
   //   CDrifterFP420::ionization_type ion = theCDividerFP420->divide(hit,pitch);
-  CDrifterFP420::ionization_type ion = theCDividerFP420->divide(hit,moduleThickness);
+  CDrifterFP420::ionization_type ion = theCDividerFP420->divide(hit, moduleThickness);
   //
   // Compute the drift direction for this det
   //
-  
+
   //  G4ThreeVector driftDir = DriftDirection(&det,bfield);
-  G4ThreeVector driftDir = DriftDirection(bfield,xytype,verbosity);
-  if(verbosity>0) {
+  G4ThreeVector driftDir = DriftDirection(bfield, xytype, verbosity);
+  if (verbosity > 0) {
     std::cout << " ======   ****   HitDigitizerFP420:processHit: driftDir= " << driftDir << std::endl;
-    std::cout << " ======   ****   HitDigitizerFP420:processHit:  start   induce , CDrifterFP420   drift   " << std::endl;
+    std::cout << " ======   ****   HitDigitizerFP420:processHit:  start   "
+                 "induce , CDrifterFP420   drift   "
+              << std::endl;
   }
-  
+
   //  if(driftDir.z() ==0.) {
-  //    std::cout << " pxlx: drift in z is zero " << std::endl; 
-  //  }  else  
+  //    std::cout << " pxlx: drift in z is zero " << std::endl;
+  //  }  else
   //
 
-  return theIChargeFP420->induce(theCDrifterFP420->drift(ion,driftDir,xytype), numStrips, pitch, numStripsW, pitchW, xytype, verbosity);
-  
+  return theIChargeFP420->induce(
+      theCDrifterFP420->drift(ion, driftDir, xytype), numStrips, pitch, numStripsW, pitchW, xytype, verbosity);
+
   //
 }
 
-
-
-G4ThreeVector HitDigitizerFP420::DriftDirection(const G4ThreeVector& _bfield, int xytype, int verbosity){
-  
+G4ThreeVector HitDigitizerFP420::DriftDirection(const G4ThreeVector &_bfield, int xytype, int verbosity) {
   // LOCAL hit: exchange xytype:  1 <-> 2
-  
+
   //  Frame detFrame(_detp->surface().position(),_detp->surface().rotation());
   //  G4ThreeVector Bfield=detFrame.toLocal(_bfield);
-  const G4ThreeVector& Bfield=_bfield;
-  float dir_x, dir_y, dir_z; 
-  // this lines with dir_... have to be specified(sign?) in dependence of field direction: 
+  const G4ThreeVector &Bfield = _bfield;
+  float dir_x, dir_y, dir_z;
+  // this lines with dir_... have to be specified(sign?) in dependence of field
+  // direction:
   /*
     float dir_x = tanLorentzAnglePerTesla * Bfield.y();
     float dir_y = -tanLorentzAnglePerTesla * Bfield.x();
@@ -205,37 +244,37 @@ G4ThreeVector HitDigitizerFP420::DriftDirection(const G4ThreeVector& _bfield, in
   */
   // for electrons:
   // E field is either in X or Y direction with change vector to opposite
-  
+
   // global Y or localX
   // E field is in Xlocal direction with change vector to opposite
-  if(xytype == 2) {
-    dir_x = 1.; // E field in Xlocal direction
+  if (xytype == 2) {
+    dir_x = 1.;  // E field in Xlocal direction
     dir_y = +tanLorentzAnglePerTesla * Bfield.z();
     dir_z = -tanLorentzAnglePerTesla * Bfield.y();
   }
   // global X
   // E field is in Ylocal direction with change vector to opposite
-  else if(xytype == 1) {
+  else if (xytype == 1) {
     dir_x = +tanLorentzAnglePerTesla * Bfield.z();
-    dir_y = 1.; // E field in Ylocal direction
+    dir_y = 1.;  // E field in Ylocal direction
     dir_z = -tanLorentzAnglePerTesla * Bfield.x();
-  }
-  else{
+  } else {
     dir_x = 0.;
     dir_y = 0.;
     dir_z = 0.;
-    std::cout << "HitDigitizerFP420: ERROR - wrong xytype=" <<  xytype   << std::endl;
+    std::cout << "HitDigitizerFP420: ERROR - wrong xytype=" << xytype << std::endl;
   }
-  
-  
+
   //  G4ThreeVector theDriftDirection = LocalVector(dir_x,dir_y,dir_z);
-  G4ThreeVector theDriftDirection(dir_x,dir_y,dir_z);
-  // Local3DPoint EntryPo(aHit->getEntry().x(),aHit->getEntry().y(),aHit->getEntry().z());
-  if(verbosity>0) {
-    std::cout << "HitDigitizerFP420:DriftDirection tanLorentzAnglePerTesla= " << tanLorentzAnglePerTesla    << std::endl;
-    std::cout << "HitDigitizerFP420:DriftDirection The drift direction in local coordinate is " <<  theDriftDirection    << std::endl;
+  G4ThreeVector theDriftDirection(dir_x, dir_y, dir_z);
+  // Local3DPoint
+  // EntryPo(aHit->getEntry().x(),aHit->getEntry().y(),aHit->getEntry().z());
+  if (verbosity > 0) {
+    std::cout << "HitDigitizerFP420:DriftDirection tanLorentzAnglePerTesla= " << tanLorentzAnglePerTesla << std::endl;
+    std::cout << "HitDigitizerFP420:DriftDirection The drift direction in "
+                 "local coordinate is "
+              << theDriftDirection << std::endl;
   }
-  
+
   return theDriftDirection;
-  
 }
diff --git a/SimRomanPot/SimFP420/src/InduceChargeFP420.cc b/SimRomanPot/SimFP420/src/InduceChargeFP420.cc
index 90d45f57e657c..8339d7baa8083 100644
--- a/SimRomanPot/SimFP420/src/InduceChargeFP420.cc
+++ b/SimRomanPot/SimFP420/src/InduceChargeFP420.cc
@@ -2,264 +2,299 @@
 // File: InduceChargeFP420
 // Date: 08.2008
 // Description: InduceChargeFP420 for FP420
-// Modifications:  
+// Modifications:
 ///////////////////////////////////////////////////////////////////////////////
 //#include "SimRomanPot/SimFP420/interface/SimRPUtil.h"
 #include "SimRomanPot/SimFP420/interface/InduceChargeFP420.h"
 #include <gsl/gsl_sf_erf.h>
-#include<iostream>
+#include <iostream>
 using namespace std;
 
-static const float capacitive_coupling[2] =  {.80,.10};
-static const float FiducialXYZ[3] =  {3.6,4.,0.250};// dX/2, dY/2,dZ -- mm fiducial dimension of Si plate
+static const float capacitive_coupling[2] = {.80, .10};
+static const float FiducialXYZ[3] = {3.6, 4., 0.250};  // dX/2, dY/2,dZ -- mm fiducial dimension of Si plate
 
-IChargeFP420::hit_map_type InduceChargeFP420::induce(const CDrifterFP420::collection_type& _collection_points, int numStrips, double localPitch, int numStripsW, double localPitchW, int xytype, int verbosity){
+IChargeFP420::hit_map_type InduceChargeFP420::induce(const CDrifterFP420::collection_type &_collection_points,
+                                                     int numStrips,
+                                                     double localPitch,
+                                                     int numStripsW,
+                                                     double localPitchW,
+                                                     int xytype,
+                                                     int verbosity) {
   signalCoupling.clear();
   signalCoupling.push_back(capacitive_coupling[0]);
   signalCoupling.push_back(capacitive_coupling[1]);
-  
+
   // in mm local coordinates   (temporarily)
   // float FiducialX = 5., FiducialY = 10., FiducialZ = 0.250;
   int stripLeft, stripRight, stripLeftW, stripRightW;
   double upperBound, lowerBound, upperBoundW, lowerBoundW;
-  
-  
+
   hit_map_type hit_signal;
-  
+
   // map to store pixel integrals in the x and in the y directions
-  std::map<int, float, less<int> > x,y; 
-  
-  
-  for (CDrifterFP420::collection_type::const_iterator sp=_collection_points.begin();  sp != _collection_points.end(); sp++ ){
-    
-    float chargePositionW=-1.; // charge in strip coord in Wide pixel
-    float chargePosition=-1.; // charge in strip coord
-    
+  std::map<int, float, less<int>> x, y;
+
+  for (CDrifterFP420::collection_type::const_iterator sp = _collection_points.begin(); sp != _collection_points.end();
+       sp++) {
+    float chargePositionW = -1.;  // charge in strip coord in Wide pixel
+    float chargePosition = -1.;   // charge in strip coord
+
     // define chargePosition
-    G4ThreeVector Position3D = (*sp).position(); // charge in strip coord
-    
-    if(verbosity>0) {
-      std::cout << " =============================*InduceChargeFP420:induce:Position3D= " << Position3D << std::endl;
+    G4ThreeVector Position3D = (*sp).position();  // charge in strip coord
+
+    if (verbosity > 0) {
+      std::cout << " =============================*InduceChargeFP420:induce:"
+                   "Position3D= "
+                << Position3D << std::endl;
       std::cout << " localPitch= " << localPitch << std::endl;
       std::cout << " xytype= " << xytype << " numStrips= " << numStrips << std::endl;
     }
-    
-    
-    
-    // is slice still inside fiducial volume of the plate? if not ->  put slice energy to zero.
-    if( abs(Position3D.x())<FiducialXYZ[0] && 
-        abs(Position3D.y())<FiducialXYZ[1] ) {
-      if( abs(Position3D.z())<FiducialXYZ[2] ) {
-      }
-      else{
+
+    // is slice still inside fiducial volume of the plate? if not ->  put slice
+    // energy to zero.
+    if (abs(Position3D.x()) < FiducialXYZ[0] && abs(Position3D.y()) < FiducialXYZ[1]) {
+      if (abs(Position3D.z()) < FiducialXYZ[2]) {
+      } else {
         //	(*sp).amplitude() == 0.;
-	std::cout << " *InduceChargeFP420:Z slice outside the plate: Position3D= " << Position3D << std::endl;
+        std::cout << " *InduceChargeFP420:Z slice outside the plate: Position3D= " << Position3D << std::endl;
       }
-    }
-    else{
+    } else {
       //      (*sp).amplitude() == 0.;
       std::cout << " *InduceChargeFP420:XY slice outside the plate: Position3D= " << Position3D << std::endl;
     }
-    
-    // chargePosition - still local coordinates, so exchange x and y due to 90 degree rotation
-    // Yglobal::
-    if(xytype == 1) {
-      // = 
-      chargePosition = 0.5*numStrips + Position3D.x()/localPitch ;// charge in strip coord. in l.r.f starting at edge of plate
-      chargePositionW = 0.5*numStripsW + Position3D.y()/localPitchW ;// charge in strip coord. in l.r.f starting at edge of plate
-    }
-    //X:
-    else if(xytype == 2) {
-      // = 
-      chargePosition = 0.5*numStrips + Position3D.y()/localPitch ;// charge in strip coord. in l.r.f starting at edge of plate
-      chargePositionW = 0.5*numStripsW + Position3D.x()/localPitchW ;// charge in strip coord. in l.r.f starting at edge of plate
+
+    // chargePosition - still local coordinates, so exchange x and y due to 90
+    // degree rotation Yglobal::
+    if (xytype == 1) {
+      // =
+      chargePosition = 0.5 * numStrips + Position3D.x() / localPitch;     // charge in strip coord. in l.r.f
+                                                                          // starting at edge of plate
+      chargePositionW = 0.5 * numStripsW + Position3D.y() / localPitchW;  // charge in strip coord. in l.r.f
+                                                                          // starting at edge of plate
     }
-    else {
-      std::cout << "**** InduceChargeFP420:  !!!  ERROR: you have not to be here !!!  xytype=" << xytype << std::endl;
+    // X:
+    else if (xytype == 2) {
+      // =
+      chargePosition = 0.5 * numStrips + Position3D.y() / localPitch;     // charge in strip coord. in l.r.f
+                                                                          // starting at edge of plate
+      chargePositionW = 0.5 * numStripsW + Position3D.x() / localPitchW;  // charge in strip coord. in l.r.f
+                                                                          // starting at edge of plate
+    } else {
+      std::cout << "**** InduceChargeFP420:  !!!  ERROR: you have not to be "
+                   "here !!!  xytype="
+                << xytype << std::endl;
       //     break;
     }
-    
-    if(verbosity>0) {
-      if(xytype==2){
-	std::cout << "===================================**** InduceChargeFP420: xytype= " << xytype << std::endl;
-	std::cout << "  chargePositionW= " << chargePositionW << "  chargePosition= " << chargePosition << std::endl;
-	std::cout << "Position3D= " << Position3D << std::endl;
+
+    if (verbosity > 0) {
+      if (xytype == 2) {
+        std::cout << "===================================**** "
+                     "InduceChargeFP420: xytype= "
+                  << xytype << std::endl;
+        std::cout << "  chargePositionW= " << chargePositionW << "  chargePosition= " << chargePosition << std::endl;
+        std::cout << "Position3D= " << Position3D << std::endl;
       }
     }
-    
-    float chargeSpread = (*sp).sigma()/localPitch ;  // sigma in strip pitches
-    float chargeSpreadW = (*sp).sigma()/localPitchW ;  // sigma in strip pitches
-    
+
+    float chargeSpread = (*sp).sigma() / localPitch;    // sigma in strip pitches
+    float chargeSpreadW = (*sp).sigma() / localPitchW;  // sigma in strip pitches
+
     // Define strips intervals along x: check edge condition
-    
-    stripLeft  = int( chargePosition-clusterWidth*chargeSpread);
-    stripRight = int( chargePosition+clusterWidth*chargeSpread);
-    stripLeft  = (0<stripLeft ? stripLeft : 0);
-    stripRight = (numStrips >stripRight ? stripRight : numStrips-1);
-    
-    stripLeftW  = int( chargePositionW-clusterWidth*chargeSpreadW);
-    stripRightW = int( chargePositionW+clusterWidth*chargeSpreadW);
-    stripLeftW  = (0<stripLeftW ? stripLeftW : 0);
-    stripRightW = (numStripsW >stripRightW ? stripRightW : numStripsW-1);
-    
-    if(verbosity>1) {
+
+    stripLeft = int(chargePosition - clusterWidth * chargeSpread);
+    stripRight = int(chargePosition + clusterWidth * chargeSpread);
+    stripLeft = (0 < stripLeft ? stripLeft : 0);
+    stripRight = (numStrips > stripRight ? stripRight : numStrips - 1);
+
+    stripLeftW = int(chargePositionW - clusterWidth * chargeSpreadW);
+    stripRightW = int(chargePositionW + clusterWidth * chargeSpreadW);
+    stripLeftW = (0 < stripLeftW ? stripLeftW : 0);
+    stripRightW = (numStripsW > stripRightW ? stripRightW : numStripsW - 1);
+
+    if (verbosity > 1) {
       std::cout << " Position3D =  " << Position3D << "amplitude=" << (*sp).amplitude() << std::endl;
-      std::cout << " MaxChargeSpread= " << clusterWidth*chargeSpread << " sigma= " << (*sp).sigma() << std::endl;
+      std::cout << " MaxChargeSpread= " << clusterWidth * chargeSpread << " sigma= " << (*sp).sigma() << std::endl;
       std::cout << "*** numStrips= " << numStrips << " localPitch= " << localPitch << "xytype=" << xytype << std::endl;
       std::cout << " chargePosition= " << chargePosition << " chargeSpread= " << chargeSpread << std::endl;
       std::cout << " stripLeft= " << stripLeft << " stripRight= " << stripRight << std::endl;
       std::cout << " chargePositionW= " << chargePositionW << " chargeSpreadW= " << chargeSpreadW << std::endl;
       std::cout << " stripLeftW= " << stripLeftW << " stripRightW= " << stripRightW << std::endl;
     }
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// X
-    for (int i=stripLeft; i<=stripRight; i++){
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /// X
+    for (int i = stripLeft; i <= stripRight; i++) {
       /* Definition of the integration borns */
       // go to "left"
-      if (i == 0) lowerBound = 0. ;
+      if (i == 0)
+        lowerBound = 0.;
       else {
-	gsl_sf_result result;
-	int status = gsl_sf_erf_Q_e((i-chargePosition)/chargeSpread, &result);
-	if (status != 0) std::cerr<<"InduceChargeFP420::could not compute gaussian tail probability for the threshold chosen"<<std::endl;
-	lowerBound = 1. - result.val;
-	if(verbosity>0) {
-	  std::cout << "go to left: i=  " << i << "lowerBound=" << lowerBound << std::endl;
-	}
+        gsl_sf_result result;
+        int status = gsl_sf_erf_Q_e((i - chargePosition) / chargeSpread, &result);
+        if (status != 0)
+          std::cerr << "InduceChargeFP420::could not compute gaussian tail "
+                       "probability for the threshold chosen"
+                    << std::endl;
+        lowerBound = 1. - result.val;
+        if (verbosity > 0) {
+          std::cout << "go to left: i=  " << i << "lowerBound=" << lowerBound << std::endl;
+        }
       }
-      
+
       // go to "right"
-      if (i == numStrips-1) upperBound = 1.;
+      if (i == numStrips - 1)
+        upperBound = 1.;
       else {
-	gsl_sf_result result;
-	int status = gsl_sf_erf_Q_e((i-chargePosition+1)/chargeSpread, &result);
-	if (status != 0) std::cerr<<"InduceChargeFP420::could not compute gaussian tail probability for the threshold chosen"<<std::endl;
-	upperBound = 1. - result.val;
-	
-	if(verbosity>0) {
-	  std::cout << "go to right: i=  " << i << "upperBound=" << upperBound << std::endl;
-	}
+        gsl_sf_result result;
+        int status = gsl_sf_erf_Q_e((i - chargePosition + 1) / chargeSpread, &result);
+        if (status != 0)
+          std::cerr << "InduceChargeFP420::could not compute gaussian tail "
+                       "probability for the threshold chosen"
+                    << std::endl;
+        upperBound = 1. - result.val;
+
+        if (verbosity > 0) {
+          std::cout << "go to right: i=  " << i << "upperBound=" << upperBound << std::endl;
+        }
       }
-      
+
       double totalIntegrationRange = upperBound - lowerBound;
-      x[i] = totalIntegrationRange; // save strip integral 
-      
-      if(totalIntegrationRange<=0.) std::cout << " upperBound= " << upperBound << " lowerBound= " << lowerBound << std::endl;
-      if(verbosity==-30) {
-	std::cout << " *InduceChargeFP420:====================================X i =  " << i << std::endl;
-	std::cout << " upperBound= " << upperBound << " lowerBound= " << lowerBound << std::endl;
-	std::cout << " totalIntegrationRange= " << totalIntegrationRange << std::endl;
-	std::cout << " *InduceChargeFP420:==================================== " << std::endl;
+      x[i] = totalIntegrationRange;  // save strip integral
+
+      if (totalIntegrationRange <= 0.)
+        std::cout << " upperBound= " << upperBound << " lowerBound= " << lowerBound << std::endl;
+      if (verbosity == -30) {
+        std::cout << " *InduceChargeFP420:====================================X i =  " << i << std::endl;
+        std::cout << " upperBound= " << upperBound << " lowerBound= " << lowerBound << std::endl;
+        std::cout << " totalIntegrationRange= " << totalIntegrationRange << std::endl;
+        std::cout << " *InduceChargeFP420:==================================== " << std::endl;
       }
-      
-    }// for
-    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// XW=Y
-    for (int i=stripLeftW; i<=stripRightW; i++){
+
+    }  // for
+    //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /// XW=Y
+    for (int i = stripLeftW; i <= stripRightW; i++) {
       /* Definition of the integration borns */
       // go to "left"
-      if (i == 0) lowerBoundW = 0. ;
+      if (i == 0)
+        lowerBoundW = 0.;
       else {
-	gsl_sf_result result;
-	int status = gsl_sf_erf_Q_e((i-chargePositionW)/chargeSpreadW, &result);
-	if (status != 0) std::cerr<<"InduceChargeFP420::W could not compute gaussian tail probability for the threshold chosen"<<std::endl;
-	lowerBoundW = 1. - result.val;
-	
-	
-	if(verbosity>0) {
-	  std::cout << "go to left: i=  " << i << "lowerBoundW=" << lowerBoundW << std::endl;
-	}
+        gsl_sf_result result;
+        int status = gsl_sf_erf_Q_e((i - chargePositionW) / chargeSpreadW, &result);
+        if (status != 0)
+          std::cerr << "InduceChargeFP420::W could not compute gaussian tail "
+                       "probability for the threshold chosen"
+                    << std::endl;
+        lowerBoundW = 1. - result.val;
+
+        if (verbosity > 0) {
+          std::cout << "go to left: i=  " << i << "lowerBoundW=" << lowerBoundW << std::endl;
+        }
       }
-      
+
       // go to "right"
-      if (i == numStripsW-1) upperBoundW = 1.;
+      if (i == numStripsW - 1)
+        upperBoundW = 1.;
       else {
-	gsl_sf_result result;
-	int status = gsl_sf_erf_Q_e((i-chargePositionW+1)/chargeSpreadW, &result);
-	if (status != 0) std::cerr<<"InduceChargeFP420::W could not compute gaussian tail probability for the threshold chosen"<<std::endl;
-	upperBoundW = 1. - result.val;
-	
-	if(verbosity>0) {
-	  std::cout << "go to right: i=  " << i << "upperBoundW=" << upperBoundW << std::endl;
-	}
+        gsl_sf_result result;
+        int status = gsl_sf_erf_Q_e((i - chargePositionW + 1) / chargeSpreadW, &result);
+        if (status != 0)
+          std::cerr << "InduceChargeFP420::W could not compute gaussian tail "
+                       "probability for the threshold chosen"
+                    << std::endl;
+        upperBoundW = 1. - result.val;
+
+        if (verbosity > 0) {
+          std::cout << "go to right: i=  " << i << "upperBoundW=" << upperBoundW << std::endl;
+        }
       }
-      
+
       double totalIntegrationRange = upperBoundW - lowerBoundW;
-      y[i] = totalIntegrationRange; // save W strip integral 
-      
-      if(totalIntegrationRange<=0.) std::cout << " upperBoundW= " << upperBoundW << " lowerBoundW= " << lowerBoundW << std::endl;
-      
-      if(verbosity==-30) {
-	std::cout << " *InduceChargeFP420:====================================XW  i= " << i << std::endl;
-	std::cout << " upperBoundW= " << upperBoundW << " lowerBoundW= " << lowerBoundW << std::endl;
-	std::cout << " totalIntegrationRange= " << totalIntegrationRange << std::endl;
-	std::cout << " *InduceChargeFP420:==================================== " << std::endl;
+      y[i] = totalIntegrationRange;  // save W strip integral
+
+      if (totalIntegrationRange <= 0.)
+        std::cout << " upperBoundW= " << upperBoundW << " lowerBoundW= " << lowerBoundW << std::endl;
+
+      if (verbosity == -30) {
+        std::cout << " *InduceChargeFP420:====================================XW  i= " << i << std::endl;
+        std::cout << " upperBoundW= " << upperBoundW << " lowerBoundW= " << lowerBoundW << std::endl;
+        std::cout << " totalIntegrationRange= " << totalIntegrationRange << std::endl;
+        std::cout << " *InduceChargeFP420:==================================== " << std::endl;
       }
     }
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    //calculate signal on x strips with including capacitive coupling
+    // calculate signal on x strips with including capacitive coupling
     int nSignalCoupling = signalCoupling.size();
-    
+
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     /*
     int lll,copyinlll;
     lll = unpackLayerIndex(rn0,zside);
     if(lll==1) {copyinlll=  lll/2;}
     else if(lll==2) {copyinlll=  (lll-1)/2;}
-    else{std::cout << " InduceChargeFP420:WARNING plane number in superlayer= " << lll << std::endl;}
-*/    
+    else{std::cout << " InduceChargeFP420:WARNING plane number in superlayer= "
+    << lll << std::endl;}
+*/
     //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    if(verbosity>1) {
-      std::cout << "InduceChargeFP420:   *************************************************************** " << std::endl;
+    if (verbosity > 1) {
+      std::cout << "InduceChargeFP420:   "
+                   "*************************************************************** "
+                << std::endl;
       std::cout << " numStripsW= " << numStripsW << " numStrips= " << numStrips << std::endl;
       std::cout << " nSignalCoupling= " << nSignalCoupling << " xytype= " << xytype << std::endl;
       std::cout << " stripLeftW= " << stripLeftW << " stripRightW= " << stripRightW << std::endl;
       std::cout << " stripLeft= " << stripLeft << " stripRight= " << stripRight << std::endl;
     }
     // Get the 2D charge integrals by folding x and y strips
-    for (int iy=stripLeftW; iy<=stripRightW; iy++){ // loop over Wide y index
-      for (int ix=stripLeft; ix<=stripRight; ix++){ // loop over x index
-	for (int k = -nSignalCoupling+1 ; k<=nSignalCoupling-1 ; k++) {
-	  if (ix+k >= 0 && ix+k < numStrips ) { 
-	    float ChargeFraction = signalCoupling[abs(k)]*(x[ix]*y[iy]/geVperElectron)*(*sp).amplitude();
-	    if( ChargeFraction > 0. ) {
-	      //  int chan = PixelDigi::pixelToChannel( ix, iy);  // Get index 
-	      int chan = iy*numStrips + (ix+k) ;  // Get index 
-	      
-	      //    if(k==0 ){
-	      // 	std::cout << "InduceChargeFP420:                                              chan= " << chan << std::endl;
-	      // 	std::cout << "ix= " << ix << "iy= " << iy << std::endl;
-	      //  }
-	      if(verbosity>0) {
-		if(k==0 && xytype==2){
-		  std::cout << "InduceChargeFP420:                                              chan= " << chan << std::endl;
-		  std::cout << "ix= " << ix << "iy= " << iy << "k= " << k << "ChargeFraction= " << ChargeFraction << std::endl;
-		  std::cout << "hit_signal[chan]= " << hit_signal[chan] << "geVperElectron= " << geVperElectron << std::endl;
-		  std::cout << "signalCoupling[abs(k)]= " << signalCoupling[abs(k)] << "x[ix]= " << x[ix] << "y[iy]= " << y[iy] << "(*sp).amplitude()= " << (*sp).amplitude() << std::endl;
-		}
-	      }
-	      // Load the amplitude:
-	      hit_signal[chan] += ChargeFraction;
-	    } // endif ChargeFraction
-	  } // endif ix+k
-	  else{
-	    //std::cout << "WARNING:                         ix+k =" << ix+k << std::endl;
-	  }// endif ix+k
-	} // endfor k
-      } //endfor ix
-    } //endfor iy
-    
-    if(verbosity>0) {
-      std::cout << "================================================================================= " << std::endl;
+    for (int iy = stripLeftW; iy <= stripRightW; iy++) {  // loop over Wide y index
+      for (int ix = stripLeft; ix <= stripRight; ix++) {  // loop over x index
+        for (int k = -nSignalCoupling + 1; k <= nSignalCoupling - 1; k++) {
+          if (ix + k >= 0 && ix + k < numStrips) {
+            float ChargeFraction = signalCoupling[abs(k)] * (x[ix] * y[iy] / geVperElectron) * (*sp).amplitude();
+            if (ChargeFraction > 0.) {
+              //  int chan = PixelDigi::pixelToChannel( ix, iy);  // Get index
+              int chan = iy * numStrips + (ix + k);  // Get index
+
+              //    if(k==0 ){
+              // 	std::cout << "InduceChargeFP420: chan= " << chan <<
+              // std::endl; 	std::cout << "ix= " << ix << "iy= " << iy <<
+              // std::endl;
+              //  }
+              if (verbosity > 0) {
+                if (k == 0 && xytype == 2) {
+                  std::cout << "InduceChargeFP420:                             "
+                               "                 chan= "
+                            << chan << std::endl;
+                  std::cout << "ix= " << ix << "iy= " << iy << "k= " << k << "ChargeFraction= " << ChargeFraction
+                            << std::endl;
+                  std::cout << "hit_signal[chan]= " << hit_signal[chan] << "geVperElectron= " << geVperElectron
+                            << std::endl;
+                  std::cout << "signalCoupling[abs(k)]= " << signalCoupling[abs(k)] << "x[ix]= " << x[ix]
+                            << "y[iy]= " << y[iy] << "(*sp).amplitude()= " << (*sp).amplitude() << std::endl;
+                }
+              }
+              // Load the amplitude:
+              hit_signal[chan] += ChargeFraction;
+            }  // endif ChargeFraction
+          }    // endif ix+k
+          else {
+            // std::cout << "WARNING:                         ix+k =" << ix+k <<
+            // std::endl;
+          }  // endif ix+k
+        }    // endfor k
+      }      // endfor ix
+    }        // endfor iy
+
+    if (verbosity > 0) {
+      std::cout << "==========================================================="
+                   "====================== "
+                << std::endl;
     }
-    
-    
-    
-  } //for loop on ions (*sp)
-  
-  if(verbosity>0) {
+
+  }  // for loop on ions (*sp)
+
+  if (verbosity > 0) {
     std::cout << "end of InduceChargeFP420============================= " << std::endl;
   }
-  
-  
+
   return hit_signal;
-  
-  
 }
diff --git a/SimRomanPot/SimFP420/src/LandauFP420.cc b/SimRomanPot/SimFP420/src/LandauFP420.cc
index fb3f3d3f56b47..8d04a8d6614a8 100644
--- a/SimRomanPot/SimFP420/src/LandauFP420.cc
+++ b/SimRomanPot/SimFP420/src/LandauFP420.cc
@@ -27,11 +27,11 @@
 //
 // File name:     G4UniversalFluctuation
 //
-// Author:        Vladimir Ivanchenko 
-// 
+// Author:        Vladimir Ivanchenko
+//
 // Creation date: 03.01.2002
 //
-// Modifications: 
+// Modifications:
 //
 // 28-12-02 add method Dispersion (V.Ivanchenko)
 // 07-02-03 change signature (V.Ivanchenko)
@@ -39,18 +39,18 @@
 // Modified for standalone use in ORCA. d.k. 6/04
 //
 // -------------------------------------------------------------------
- 
-#include "SimRomanPot/SimFP420/interface/LandauFP420.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
-#include "CLHEP/Units/GlobalPhysicalConstants.h"
+
+#include "CLHEP/Random/RandFlat.h"
 #include "CLHEP/Random/RandGaussQ.h"
 #include "CLHEP/Random/RandPoisson.h"
-#include "CLHEP/Random/RandFlat.h"
+#include "CLHEP/Units/GlobalPhysicalConstants.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "SimRomanPot/SimFP420/interface/LandauFP420.h"
 
+#include <cmath>
 #include <cstdio>
 #include <gsl/gsl_fit.h>
-#include <cmath>
-#include<vector>
+#include <vector>
 
 //#include "Randomize.hh"
 //#include "G4Poisson.hh"
@@ -62,241 +62,215 @@ using namespace std;
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 // The constructor setups various constants pluc eloss parameters
-// for silicon.   
+// for silicon.
 LandauFP420::LandauFP420()
- :minNumberInteractionsBohr(10.0),
-  theBohrBeta2(50.0*keV/proton_mass_c2),
-  minLoss(0.000001*eV),
-  problim(0.01),
-  alim(10.),
-  nmaxCont1(4),
-  nmaxCont2(16)
-{
+    : minNumberInteractionsBohr(10.0),
+      theBohrBeta2(50.0 * keV / proton_mass_c2),
+      minLoss(0.000001 * eV),
+      problim(0.01),
+      alim(10.),
+      nmaxCont1(4),
+      nmaxCont2(16) {
   sumalim = -log(problim);
 
-  chargeSquare   = 1.;  //Assume all particles have charge 1
+  chargeSquare = 1.;  // Assume all particles have charge 1
   // Taken from Geant4 printout, HARDWIRED for Silicon.
-  ipotFluct = 0.0001736; //material->GetIonisation()->GetMeanExcitationEnergy();
-  electronDensity = 6.797E+20; // material->GetElectronDensity();
-  f1Fluct      = 0.8571; // material->GetIonisation()->GetF1fluct();
-  f2Fluct      = 0.1429; //material->GetIonisation()->GetF2fluct();
-  e1Fluct      = 0.000116;// material->GetIonisation()->GetEnergy1fluct();
-  e2Fluct      = 0.00196; //material->GetIonisation()->GetEnergy2fluct();
-  e1LogFluct   = -9.063;  //material->GetIonisation()->GetLogEnergy1fluct();
-  e2LogFluct   = -6.235;  //material->GetIonisation()->GetLogEnergy2fluct();
-  rateFluct    = 0.4;     //material->GetIonisation()->GetRateionexcfluct();
-  ipotLogFluct = -8.659;  //material->GetIonisation()->GetLogMeanExcEnergy();
-  e0 = 1.E-5;             //material->GetIonisation()->GetEnergy0fluct();
-
+  ipotFluct = 0.0001736;        // material->GetIonisation()->GetMeanExcitationEnergy();
+  electronDensity = 6.797E+20;  // material->GetElectronDensity();
+  f1Fluct = 0.8571;             // material->GetIonisation()->GetF1fluct();
+  f2Fluct = 0.1429;             // material->GetIonisation()->GetF2fluct();
+  e1Fluct = 0.000116;           // material->GetIonisation()->GetEnergy1fluct();
+  e2Fluct = 0.00196;            // material->GetIonisation()->GetEnergy2fluct();
+  e1LogFluct = -9.063;          // material->GetIonisation()->GetLogEnergy1fluct();
+  e2LogFluct = -6.235;          // material->GetIonisation()->GetLogEnergy2fluct();
+  rateFluct = 0.4;              // material->GetIonisation()->GetRateionexcfluct();
+  ipotLogFluct = -8.659;        // material->GetIonisation()->GetLogMeanExcEnergy();
+  e0 = 1.E-5;                   // material->GetIonisation()->GetEnergy0fluct();
 }
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
-LandauFP420::~LandauFP420()
-{}
+LandauFP420::~LandauFP420() {}
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
 // The main dedx fluctuation routine.
 // Arguments: momentum in MeV/c, mass in MeV, delta ray cut (tmax) in
-// MeV, silicon thickness in mm, mean eloss in MeV. 
-double LandauFP420::SampleFluctuations(const double momentum,
-							 const double mass,
-							 double& tmax,
-							 const double length,
-							 const double meanLoss)
-{
-//  calculate actual loss from the mean loss
-//  The model used to get the fluctuation is essentially the same
-// as in Glandz in Geant3.
-  
-  // shortcut for very very small loss 
-  if(meanLoss < minLoss) return meanLoss;
-
-  //if(dp->GetDefinition() != particle) {
-  particleMass   = mass; // dp->GetMass();
-  //G4double q     = dp->GetCharge(); 
-  //chargeSquare   = q*q;
+// MeV, silicon thickness in mm, mean eloss in MeV.
+double LandauFP420::SampleFluctuations(
+    const double momentum, const double mass, double &tmax, const double length, const double meanLoss) {
+  //  calculate actual loss from the mean loss
+  //  The model used to get the fluctuation is essentially the same
+  // as in Glandz in Geant3.
+
+  // shortcut for very very small loss
+  if (meanLoss < minLoss)
+    return meanLoss;
+
+  // if(dp->GetDefinition() != particle) {
+  particleMass = mass;  // dp->GetMass();
+  // G4double q     = dp->GetCharge();
+  // chargeSquare   = q*q;
   //}
 
-  //double gam   = (dp->GetKineticEnergy())/particleMass + 1.0;
-  //double gam2  = gam*gam; 
-  double gam2   = (momentum*momentum)/(particleMass*particleMass) + 1.0;
-  double beta2 = 1.0 - 1.0/gam2;
- 
+  // double gam   = (dp->GetKineticEnergy())/particleMass + 1.0;
+  // double gam2  = gam*gam;
+  double gam2 = (momentum * momentum) / (particleMass * particleMass) + 1.0;
+  double beta2 = 1.0 - 1.0 / gam2;
+
   // Validity range for delta electron cross section
   double loss, siga;
-  // Gaussian fluctuation 
-  if(meanLoss >= minNumberInteractionsBohr*tmax || 
-     tmax <= ipotFluct*minNumberInteractionsBohr)
-  {
-    siga  = (1.0/beta2 - 0.5) * twopi_mc2_rcl2 * tmax * length 
-                              * electronDensity * chargeSquare ;
+  // Gaussian fluctuation
+  if (meanLoss >= minNumberInteractionsBohr * tmax || tmax <= ipotFluct * minNumberInteractionsBohr) {
+    siga = (1.0 / beta2 - 0.5) * twopi_mc2_rcl2 * tmax * length * electronDensity * chargeSquare;
     siga = sqrt(siga);
     do {
-     //loss = G4RandGauss::shoot(meanLoss,siga);
-     loss = CLHEP::RandGaussQ::shoot(meanLoss,siga);
-    } while (loss < 0. || loss > 2.*meanLoss);
+      // loss = G4RandGauss::shoot(meanLoss,siga);
+      loss = CLHEP::RandGaussQ::shoot(meanLoss, siga);
+    } while (loss < 0. || loss > 2. * meanLoss);
 
     return loss;
   }
 
-  // Non Gaussian fluctuation 
-  double suma,w1,w2,C,lossc,w;
-  double a1,a2,a3;
-  int p1,p2,p3;
+  // Non Gaussian fluctuation
+  double suma, w1, w2, C, lossc, w;
+  double a1, a2, a3;
+  int p1, p2, p3;
   int nb;
-  double corrfac, na,alfa,rfac,namean,sa,alfa1,ea,sea;
+  double corrfac, na, alfa, rfac, namean, sa, alfa1, ea, sea;
   double dp3;
 
-  w1 = tmax/ipotFluct;
-  w2 = log(2.*electron_mass_c2*(gam2 - 1.0));
+  w1 = tmax / ipotFluct;
+  w2 = log(2. * electron_mass_c2 * (gam2 - 1.0));
 
-  C = meanLoss*(1.-rateFluct)/(w2-ipotLogFluct-beta2);
+  C = meanLoss * (1. - rateFluct) / (w2 - ipotLogFluct - beta2);
 
-  a1 = C*f1Fluct*(w2-e1LogFluct-beta2)/e1Fluct;
-  a2 = C*f2Fluct*(w2-e2LogFluct-beta2)/e2Fluct;
-  a3 = rateFluct*meanLoss*(tmax-ipotFluct)/(ipotFluct*tmax*log(w1));
-  if(a1 < 0.) a1 = 0.;
-  if(a2 < 0.) a2 = 0.;
-  if(a3 < 0.) a3 = 0.;
+  a1 = C * f1Fluct * (w2 - e1LogFluct - beta2) / e1Fluct;
+  a2 = C * f2Fluct * (w2 - e2LogFluct - beta2) / e2Fluct;
+  a3 = rateFluct * meanLoss * (tmax - ipotFluct) / (ipotFluct * tmax * log(w1));
+  if (a1 < 0.)
+    a1 = 0.;
+  if (a2 < 0.)
+    a2 = 0.;
+  if (a3 < 0.)
+    a3 = 0.;
 
-  suma = a1+a2+a3;
+  suma = a1 + a2 + a3;
 
-  loss = 0. ;
+  loss = 0.;
 
-  if(suma < sumalim)             // very small Step
-    {
-      //e0 = material->GetIonisation()->GetEnergy0fluct();//Hardwired in const
-      if(tmax == ipotFluct)
-      {
-        a3 = meanLoss/e0;
+  if (suma < sumalim)  // very small Step
+  {
+    // e0 = material->GetIonisation()->GetEnergy0fluct();//Hardwired in const
+    if (tmax == ipotFluct) {
+      a3 = meanLoss / e0;
 
-        if(a3>alim)
-        {
-          siga=sqrt(a3) ;
-          //p3 = G4std::max(0,int(G4RandGauss::shoot(a3,siga)+0.5));
-          p3 = std::max(0,int(CLHEP::RandGaussQ::shoot(a3,siga)+0.5));
-        }
-        else
-          p3 = CLHEP::RandPoisson::shoot(a3);
-	//p3 = G4Poisson(a3);
+      if (a3 > alim) {
+        siga = sqrt(a3);
+        // p3 = G4std::max(0,int(G4RandGauss::shoot(a3,siga)+0.5));
+        p3 = std::max(0, int(CLHEP::RandGaussQ::shoot(a3, siga) + 0.5));
+      } else
+        p3 = CLHEP::RandPoisson::shoot(a3);
+      // p3 = G4Poisson(a3);
 
-        loss = p3*e0 ;
+      loss = p3 * e0;
 
-        if(p3 > 0)
-          //loss += (1.-2.*G4UniformRand())*e0 ;
-          loss += (1.-2.*CLHEP::RandFlat::shoot())*e0 ;
+      if (p3 > 0)
+        // loss += (1.-2.*G4UniformRand())*e0 ;
+        loss += (1. - 2. * CLHEP::RandFlat::shoot()) * e0;
 
-      }
-      else
-      {
-        tmax = tmax-ipotFluct+e0 ;
-        a3 = meanLoss*(tmax-e0)/(tmax*e0*log(tmax/e0));
-
-        if(a3>alim)
-        {
-          siga=sqrt(a3) ;
-          //p3 = G4std::max(0,int(G4RandGauss::shoot(a3,siga)+0.5));
-          p3 = std::max(0,int(CLHEP::RandGaussQ::shoot(a3,siga)+0.5));
-        }
-        else
-          p3 = CLHEP::RandPoisson::shoot(a3);
-	//p3 = G4Poisson(a3);
-
-        if(p3 > 0)
-        {
-          w = (tmax-e0)/tmax ;
-          if(p3 > nmaxCont2)
-          {
-            dp3 = float(p3) ;
-            corrfac = dp3/float(nmaxCont2) ;
-            p3 = nmaxCont2 ;
-          }
-          else
-            corrfac = 1. ;
+    } else {
+      tmax = tmax - ipotFluct + e0;
+      a3 = meanLoss * (tmax - e0) / (tmax * e0 * log(tmax / e0));
+
+      if (a3 > alim) {
+        siga = sqrt(a3);
+        // p3 = G4std::max(0,int(G4RandGauss::shoot(a3,siga)+0.5));
+        p3 = std::max(0, int(CLHEP::RandGaussQ::shoot(a3, siga) + 0.5));
+      } else
+        p3 = CLHEP::RandPoisson::shoot(a3);
+      // p3 = G4Poisson(a3);
 
-          //for(int i=0; i<p3; i++) loss += 1./(1.-w*G4UniformRand()) ;
-          for(int i=0; i<p3; i++) loss += 1./(1.-w*CLHEP::RandFlat::shoot()) ;
-          loss *= e0*corrfac ;  
-        }        
+      if (p3 > 0) {
+        w = (tmax - e0) / tmax;
+        if (p3 > nmaxCont2) {
+          dp3 = float(p3);
+          corrfac = dp3 / float(nmaxCont2);
+          p3 = nmaxCont2;
+        } else
+          corrfac = 1.;
+
+        // for(int i=0; i<p3; i++) loss += 1./(1.-w*G4UniformRand()) ;
+        for (int i = 0; i < p3; i++)
+          loss += 1. / (1. - w * CLHEP::RandFlat::shoot());
+        loss *= e0 * corrfac;
       }
     }
-    
-  else                              // not so small Step
-    {
-      // excitation type 1
-      if(a1>alim)
-      {
-        siga=sqrt(a1) ;
-        //p1 = std::max(0,int(G4RandGauss::shoot(a1,siga)+0.5));
-        p1 = std::max(0,int(CLHEP::RandGaussQ::shoot(a1,siga)+0.5));
-      }
-      else
-       p1 = CLHEP::RandPoisson::shoot(a1);
-      //p1 = G4Poisson(a1);
-
-      // excitation type 2
-      if(a2>alim)
-      {
-        siga=sqrt(a2) ;
-        //p2 = std::max(0,int(G4RandGauss::shoot(a2,siga)+0.5));
-        p2 = std::max(0,int(CLHEP::RandGaussQ::shoot(a2,siga)+0.5));
-      }
-      else
-        p2 = CLHEP::RandPoisson::shoot(a2);
-      //p2 = G4Poisson(a2);
-
-      loss = p1*e1Fluct+p2*e2Fluct;
- 
-      // smearing to avoid unphysical peaks
-      if(p2 > 0)
-        //loss += (1.-2.*G4UniformRand())*e2Fluct;   
-        loss += (1.-2.*CLHEP::RandFlat::shoot())*e2Fluct;   
-      else if (loss>0.)
-        loss += (1.-2.*CLHEP::RandFlat::shoot())*e1Fluct;   
-
-      // ionisation .......................................
-     if(a3 > 0.)
-     {
-      if(a3>alim)
-      {
-        siga=sqrt(a3) ;
-        p3 = std::max(0,int(CLHEP::RandGaussQ::shoot(a3,siga)+0.5));
-      }
-      else
+  }
+
+  else  // not so small Step
+  {
+    // excitation type 1
+    if (a1 > alim) {
+      siga = sqrt(a1);
+      // p1 = std::max(0,int(G4RandGauss::shoot(a1,siga)+0.5));
+      p1 = std::max(0, int(CLHEP::RandGaussQ::shoot(a1, siga) + 0.5));
+    } else
+      p1 = CLHEP::RandPoisson::shoot(a1);
+    // p1 = G4Poisson(a1);
+
+    // excitation type 2
+    if (a2 > alim) {
+      siga = sqrt(a2);
+      // p2 = std::max(0,int(G4RandGauss::shoot(a2,siga)+0.5));
+      p2 = std::max(0, int(CLHEP::RandGaussQ::shoot(a2, siga) + 0.5));
+    } else
+      p2 = CLHEP::RandPoisson::shoot(a2);
+    // p2 = G4Poisson(a2);
+
+    loss = p1 * e1Fluct + p2 * e2Fluct;
+
+    // smearing to avoid unphysical peaks
+    if (p2 > 0)
+      // loss += (1.-2.*G4UniformRand())*e2Fluct;
+      loss += (1. - 2. * CLHEP::RandFlat::shoot()) * e2Fluct;
+    else if (loss > 0.)
+      loss += (1. - 2. * CLHEP::RandFlat::shoot()) * e1Fluct;
+
+    // ionisation .......................................
+    if (a3 > 0.) {
+      if (a3 > alim) {
+        siga = sqrt(a3);
+        p3 = std::max(0, int(CLHEP::RandGaussQ::shoot(a3, siga) + 0.5));
+      } else
         p3 = CLHEP::RandPoisson::shoot(a3);
 
       lossc = 0.;
-      if(p3 > 0)
-      {
-        na = 0.; 
+      if (p3 > 0) {
+        na = 0.;
         alfa = 1.;
-        if (p3 > nmaxCont2)
-        {
-          dp3        = float(p3);
-          rfac       = dp3/(float(nmaxCont2)+dp3);
-          namean     = float(p3)*rfac;
-          sa         = float(nmaxCont1)*rfac;
-          na         = CLHEP::RandGaussQ::shoot(namean,sa);
-          if (na > 0.)
-          {
-            alfa   = w1*float(nmaxCont2+p3)/
-                    (w1*float(nmaxCont2)+float(p3));
-            alfa1  = alfa*log(alfa)/(alfa-1.);
-            ea     = na*ipotFluct*alfa1;
-            sea    = ipotFluct*sqrt(na*(alfa-alfa1*alfa1));
-            lossc += CLHEP::RandGaussQ::shoot(ea,sea);
+        if (p3 > nmaxCont2) {
+          dp3 = float(p3);
+          rfac = dp3 / (float(nmaxCont2) + dp3);
+          namean = float(p3) * rfac;
+          sa = float(nmaxCont1) * rfac;
+          na = CLHEP::RandGaussQ::shoot(namean, sa);
+          if (na > 0.) {
+            alfa = w1 * float(nmaxCont2 + p3) / (w1 * float(nmaxCont2) + float(p3));
+            alfa1 = alfa * log(alfa) / (alfa - 1.);
+            ea = na * ipotFluct * alfa1;
+            sea = ipotFluct * sqrt(na * (alfa - alfa1 * alfa1));
+            lossc += CLHEP::RandGaussQ::shoot(ea, sea);
           }
         }
 
-        nb = int(float(p3)-na);
-        if (nb > 0)
-        {
-          w2 = alfa*ipotFluct;
-          w  = (tmax-w2)/tmax;      
-          for (int k=0; k<nb; k++) lossc += w2/(1.-w*CLHEP::RandFlat::shoot());
+        nb = int(float(p3) - na);
+        if (nb > 0) {
+          w2 = alfa * ipotFluct;
+          w = (tmax - w2) / tmax;
+          for (int k = 0; k < nb; k++)
+            lossc += w2 / (1. - w * CLHEP::RandFlat::shoot());
         }
-      }        
-      loss += lossc;  
-     }
-    } 
+      }
+      loss += lossc;
+    }
+  }
 
   return loss;
 }
diff --git a/SimRomanPot/SimFP420/src/PileUpFP420.cc b/SimRomanPot/SimFP420/src/PileUpFP420.cc
index 9649cc027f84d..e9ed706b8b74b 100644
--- a/SimRomanPot/SimFP420/src/PileUpFP420.cc
+++ b/SimRomanPot/SimFP420/src/PileUpFP420.cc
@@ -2,39 +2,32 @@
 // File: PileUpFP420.cc
 // Date: 12.2006
 // Description: PileUpFP420 for FP420
-// Modifications: 
+// Modifications:
 ///////////////////////////////////////////////////////////////////////////////
 //#include "SimG4CMS/FP420/interface/FP420G4HitCollection.h"
 //#include "SimG4CMS/FP420/interface/FP420G4Hit.h"
-#include "SimRomanPot/SimFP420/interface/PileUpFP420.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
+#include "SimRomanPot/SimFP420/interface/PileUpFP420.h"
 //#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-void PileUpFP420::add(const HitDigitizerFP420::hit_map_type& in, const PSimHit& hit, int verbosity){
-  
-  
-  if(verbosity>0) {
+void PileUpFP420::add(const HitDigitizerFP420::hit_map_type &in, const PSimHit &hit, int verbosity) {
+  if (verbosity > 0) {
     std::cout << " ==========================****PileUpFP420: add start       = " << std::endl;
   }
-  for (HitDigitizerFP420::hit_map_type::const_iterator im = in.begin(); im!=in.end(); im++ ){
-    
+  for (HitDigitizerFP420::hit_map_type::const_iterator im = in.begin(); im != in.end(); im++) {
     theMap[(*im).first] += Amplitude((*im).second);
-    
-    theMapLink[(*im).first].push_back( std::pair < const PSimHit*, Amplitude >                                                     (  &hit,  Amplitude((*im).second)   )              );
-    
-    if(verbosity>0) {
-      std::cout << "*********** Amplitude((*im).first)  = " << Amplitude((*im).first)  << std::endl;
-      std::cout << " Amplitude((*im).second)  = " << Amplitude((*im).second)  << std::endl;
+
+    theMapLink[(*im).first].push_back(std::pair<const PSimHit *, Amplitude>(&hit, Amplitude((*im).second)));
+
+    if (verbosity > 0) {
+      std::cout << "*********** Amplitude((*im).first)  = " << Amplitude((*im).first) << std::endl;
+      std::cout << " Amplitude((*im).second)  = " << Amplitude((*im).second) << std::endl;
     }
-  } // for loop
-  
-  if(verbosity>0) {
+  }  // for loop
+
+  if (verbosity > 0) {
     std::cout << " ==========================****PileUpFP420: add end       = " << std::endl;
   }
 }
-void PileUpFP420::resetSignal(){
-  theMap.clear();
-}
-void PileUpFP420::resetLink(){
-  theMapLink.clear();
-}
+void PileUpFP420::resetSignal() { theMap.clear(); }
+void PileUpFP420::resetLink() { theMapLink.clear(); }
diff --git a/SimRomanPot/SimFP420/src/ZeroSuppressFP420.cc b/SimRomanPot/SimFP420/src/ZeroSuppressFP420.cc
index b6a7f26343c68..b140b00174824 100644
--- a/SimRomanPot/SimFP420/src/ZeroSuppressFP420.cc
+++ b/SimRomanPot/SimFP420/src/ZeroSuppressFP420.cc
@@ -2,35 +2,33 @@
 // File: ZeroSuppressFP420.cc
 // Date: 12.2006
 // Description: ZeroSuppressFP420 for FP420
-// Modifications: 
+// Modifications:
 ///////////////////////////////////////////////////////////////////////////////
-#include "SimRomanPot/SimFP420/interface/ZeroSuppressFP420.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimRomanPot/SimFP420/interface/ZeroSuppressFP420.h"
 
-ZeroSuppressFP420::ZeroSuppressFP420(const edm::ParameterSet& conf, float noise) : conf_(conf), theNumFEDalgos(4)
-{
-  noiseInAdc=noise;
+ZeroSuppressFP420::ZeroSuppressFP420(const edm::ParameterSet &conf, float noise) : conf_(conf), theNumFEDalgos(4) {
+  noiseInAdc = noise;
   initParams(conf_);
   verbosity = conf_.getUntrackedParameter<int>("VerbosityLevel");
-  //initParams();
-  if(verbosity>0) {
+  // initParams();
+  if (verbosity > 0) {
     std::cout << "ZeroSuppressFP420: constructor: noiseInAdc=  " << noiseInAdc << std::endl;
   }
 }
 
 /*
  * The zero suppression algorithm, implemented in the trkFEDclusterizer method.
- * The class publically inherits from the ZSuppressFP420 class, which requires 
+ * The class publically inherits from the ZSuppressFP420 class, which requires
  * the use of a method named zeroSuppress.
  */
 
-void ZeroSuppressFP420::initParams(edm::ParameterSet const& conf_)
-{
+void ZeroSuppressFP420::initParams(edm::ParameterSet const &conf_) {
   verbosity = conf_.getUntrackedParameter<int>("VerbosityLevel");
-  algoConf      = conf_.getParameter<int>("FedFP420Algorithm"); //FedFP420Algorithm: =1  (,2,3,4)
-  lowthreshConf      = conf_.getParameter<double>("FedFP420LowThreshold"); // FedFP420LowThreshold  =3.
-  highthreshConf      = conf_.getParameter<double>("FedFP420HighThreshold"); // FedFP420HighThreshold  =4.
-  
+  algoConf = conf_.getParameter<int>("FedFP420Algorithm");               // FedFP420Algorithm: =1  (,2,3,4)
+  lowthreshConf = conf_.getParameter<double>("FedFP420LowThreshold");    // FedFP420LowThreshold  =3.
+  highthreshConf = conf_.getParameter<double>("FedFP420HighThreshold");  // FedFP420HighThreshold  =4.
+
   /*
    * There are four possible algorithms, the default of which (4)
    * has different thresholds for isolated channels and ones in clusters.
@@ -38,144 +36,151 @@ void ZeroSuppressFP420::initParams(edm::ParameterSet const& conf_)
    * by one hole. This channel is selected as signal even though it is below
    * both thresholds.
    */
-  
-  theFEDalgorithm  = algoConf;
-  theFEDlowThresh  = lowthreshConf * noiseInAdc;
+
+  theFEDalgorithm = algoConf;
+  theFEDlowThresh = lowthreshConf * noiseInAdc;
   theFEDhighThresh = highthreshConf * noiseInAdc;
-  
-  if(verbosity>0) {
+
+  if (verbosity > 0) {
     std::cout << "ZeroSuppressFP420: initParams: !!!  theFEDalgorithm=  " << theFEDalgorithm << std::endl;
-    std::cout << " lowthreshConf=  " << lowthreshConf << " highthreshConf=  " << highthreshConf << " theFEDlowThresh=  " << theFEDlowThresh << " theFEDhighThresh=  " << theFEDhighThresh << std::endl;
+    std::cout << " lowthreshConf=  " << lowthreshConf << " highthreshConf=  " << highthreshConf
+              << " theFEDlowThresh=  " << theFEDlowThresh << " theFEDhighThresh=  " << theFEDhighThresh << std::endl;
   }
-  
-  //Check zero suppress algorithm
+
+  // Check zero suppress algorithm
   if (theFEDalgorithm < 1 || theFEDalgorithm > theNumFEDalgos) {
-    edm::LogError("FP420DigiInfo")<<"ZeroSuppressFP420 FATAL ERROR: Unknown zero suppress algorithm "<<theFEDalgorithm;
+    edm::LogError("FP420DigiInfo") << "ZeroSuppressFP420 FATAL ERROR: Unknown zero suppress algorithm "
+                                   << theFEDalgorithm;
     exit(1);
   }
-  
-  //Check thresholds
+
+  // Check thresholds
   if (theFEDlowThresh > theFEDhighThresh) {
-    edm::LogError("FP420DigiInfo")<<"ZeroSuppressFP420 FATAL ERROR: Low threshold exceeds high threshold: "<<theFEDlowThresh<<" > "<<theFEDhighThresh;
+    edm::LogError("FP420DigiInfo") << "ZeroSuppressFP420 FATAL ERROR: Low threshold exceeds high "
+                                      "threshold: "
+                                   << theFEDlowThresh << " > " << theFEDhighThresh;
     exit(2);
   }
 }
 
-ZSuppressFP420::DigitalMapType ZeroSuppressFP420::zeroSuppress(const DigitalMapType& notZeroSuppressedMap,int vrb)
-{
-  return trkFEDclusterizer(notZeroSuppressedMap, vrb); 
-  if(vrb>0) {
+ZSuppressFP420::DigitalMapType ZeroSuppressFP420::zeroSuppress(const DigitalMapType &notZeroSuppressedMap, int vrb) {
+  return trkFEDclusterizer(notZeroSuppressedMap, vrb);
+  if (vrb > 0) {
     std::cout << "zeroSuppress: return trkFEDclusterizer(notZeroSuppressedMap)" << std::endl;
   }
 }
 
-//This performs the zero suppression
-ZSuppressFP420::DigitalMapType ZeroSuppressFP420::trkFEDclusterizer(const DigitalMapType &in, int vrb) 
-{
+// This performs the zero suppression
+ZSuppressFP420::DigitalMapType ZeroSuppressFP420::trkFEDclusterizer(const DigitalMapType &in, int vrb) {
   const std::string s2("ZeroSuppressFP420::trkFEDclusterizer1");
-  
+
   DigitalMapType selectedSignal;
   DigitalMapType::const_iterator i, iPrev, iNext, iPrev2, iNext2;
-  
-  if(vrb>0) {
+
+  if (vrb > 0) {
     std::cout << "Before For loop" << std::endl;
   }
-  
+
   for (i = in.begin(); i != in.end(); i++) {
-    
-    //Find adc values for neighbouring strips
+    // Find adc values for neighbouring strips
     int strip = i->first;
-    int adc   = i->second;
-    iPrev  = in.find(strip - 1);
-    iNext  = in.find(strip + 1);
-    if(vrb>0) {
+    int adc = i->second;
+    iPrev = in.find(strip - 1);
+    iNext = in.find(strip + 1);
+    if (vrb > 0) {
       std::cout << "Inside For loop trkFEDclusterizer: strip= " << strip << " adc= " << adc << std::endl;
     }
-    //Set values for channels just outside module to infinity.
-    //This is to avoid losing channels at the edges, 
-    //which otherwise would pass cuts if strips were next to each other.
+    // Set values for channels just outside module to infinity.
+    // This is to avoid losing channels at the edges,
+    // which otherwise would pass cuts if strips were next to each other.
     int adcPrev = -99999;
     int adcNext = -99999;
-    if ( ((strip)%128) == 127) adcNext = 99999;
-    if ( ((strip)%128) == 0)   adcPrev = 99999;
-    //Otherwise if channel was found then find it's ADC count.
-    if ( iPrev  != in.end() ) adcPrev  = iPrev->second;
-    if ( iNext  != in.end() ) adcNext  = iNext->second;
+    if (((strip) % 128) == 127)
+      adcNext = 99999;
+    if (((strip) % 128) == 0)
+      adcPrev = 99999;
+    // Otherwise if channel was found then find it's ADC count.
+    if (iPrev != in.end())
+      adcPrev = iPrev->second;
+    if (iNext != in.end())
+      adcNext = iNext->second;
     int adcMaxNeigh = std::max(adcPrev, adcNext);
-    if(vrb>0) {
+    if (vrb > 0) {
       std::cout << "adcPrev= " << adcPrev << " adcNext= " << adcNext << " adcMaxNeigh= " << adcMaxNeigh << std::endl;
     }
-    
-    //Find adc values for next neighbouring channes
-    iPrev2 = in.find(strip - 2); 
+
+    // Find adc values for next neighbouring channes
+    iPrev2 = in.find(strip - 2);
     iNext2 = in.find(strip + 2);
-    //See above 
+    // See above
     int adcPrev2 = -99999;
     int adcNext2 = -99999;
-    if ( ((strip)%128) == 126) adcNext2 = 99999;
-    if ( ((strip)%128) == 1)   adcPrev2 = 99999; 
-    if ( iPrev2 != in.end() ) adcPrev2 = iPrev2->second; 
-    if ( iNext2 != in.end() ) adcNext2 = iNext2->second; 
-    
-    if(vrb>0) {
+    if (((strip) % 128) == 126)
+      adcNext2 = 99999;
+    if (((strip) % 128) == 1)
+      adcPrev2 = 99999;
+    if (iPrev2 != in.end())
+      adcPrev2 = iPrev2->second;
+    if (iNext2 != in.end())
+      adcNext2 = iNext2->second;
+
+    if (vrb > 0) {
       std::cout << "adcPrev2= " << adcPrev2 << " adcNext2= " << adcNext2 << std::endl;
       std::cout << "To be accepted or not?  adc= " << adc << " >= theFEDlowThresh=" << theFEDlowThresh << std::endl;
     }
     // Decide if this channel should be accepted.
     bool accept = false;
     switch (theFEDalgorithm) {
-      
-    case 1: 
-      accept = (adc >= theFEDlowThresh);
-      break;
-      
-    case 2:
-      accept = (adc >= theFEDhighThresh || (adc >= theFEDlowThresh && 
-					    adcMaxNeigh >= theFEDlowThresh));
-      break;
-      
-    case 3:
-      accept = (adc >= theFEDhighThresh || (adc >= theFEDlowThresh && 
-					    adcMaxNeigh >= theFEDhighThresh));
-      break;
-      
-    case 4:
-      accept = ((adc >= theFEDhighThresh) ||           //Test for adc>highThresh (same as algorithm 2)
-                ((adc >= theFEDlowThresh) &&           //Test for adc>lowThresh, with neighbour adc>lowThresh (same as algorithm 2)
-		 (adcMaxNeigh >= theFEDlowThresh)) || 
-		((adc < theFEDlowThresh) &&            //Test for adc<lowThresh
-		 (((adcPrev  >= theFEDhighThresh) &&   //with both neighbours>highThresh
-		   (adcNext  >= theFEDhighThresh)) ||    
-		  ((adcPrev  >= theFEDhighThresh) &&   //OR with previous neighbour>highThresh and
-		   (adcNext  >= theFEDlowThresh)  &&   //both the next neighbours>lowThresh
-		   (adcNext2 >= theFEDlowThresh))  ||    
-		  ((adcNext  >= theFEDhighThresh) &&   //OR with next neighbour>highThresh and
-		   (adcPrev  >= theFEDlowThresh)  &&   //both the previous neighbours>lowThresh
-		   (adcPrev2 >= theFEDlowThresh))  ||
-		  ((adcNext  >= theFEDlowThresh)  &&   //OR with both next neighbours>lowThresh and
-		   (adcNext2 >= theFEDlowThresh)  &&   //both the previous neighbours>lowThresh
-		   (adcPrev  >= theFEDlowThresh)  && 
-		   (adcPrev2 >= theFEDlowThresh)))));
-      break;
+      case 1:
+        accept = (adc >= theFEDlowThresh);
+        break;
+
+      case 2:
+        accept = (adc >= theFEDhighThresh || (adc >= theFEDlowThresh && adcMaxNeigh >= theFEDlowThresh));
+        break;
+
+      case 3:
+        accept = (adc >= theFEDhighThresh || (adc >= theFEDlowThresh && adcMaxNeigh >= theFEDhighThresh));
+        break;
+
+      case 4:
+        accept = ((adc >= theFEDhighThresh) ||  // Test for adc>highThresh (same as
+                                                // algorithm 2)
+                  ((adc >= theFEDlowThresh) &&  // Test for adc>lowThresh, with neighbour
+                                                // adc>lowThresh (same as algorithm 2)
+                   (adcMaxNeigh >= theFEDlowThresh)) ||
+                  ((adc < theFEDlowThresh) &&          // Test for adc<lowThresh
+                   (((adcPrev >= theFEDhighThresh) &&  // with both neighbours>highThresh
+                     (adcNext >= theFEDhighThresh)) ||
+                    ((adcPrev >= theFEDhighThresh) &&  // OR with previous neighbour>highThresh and
+                     (adcNext >= theFEDlowThresh) &&   // both the next neighbours>lowThresh
+                     (adcNext2 >= theFEDlowThresh)) ||
+                    ((adcNext >= theFEDhighThresh) &&  // OR with next neighbour>highThresh and
+                     (adcPrev >= theFEDlowThresh) &&   // both the previous neighbours>lowThresh
+                     (adcPrev2 >= theFEDlowThresh)) ||
+                    ((adcNext >= theFEDlowThresh) &&   // OR with both next neighbours>lowThresh and
+                     (adcNext2 >= theFEDlowThresh) &&  // both the previous neighbours>lowThresh
+                     (adcPrev >= theFEDlowThresh) && (adcPrev2 >= theFEDlowThresh)))));
+        break;
     }
-    
+
     /*
-     * When a channel satisfying only the lower threshold is at the edge of an APV or module, 
-     * the trkFEDclusterizer method assumes that every channel just outside an APV or module has a hit on it.
-     * This is to avoid channel inefficiencies at the edges of APVs and modules.   
+     * When a channel satisfying only the lower threshold is at the edge of an
+     * APV or module, the trkFEDclusterizer method assumes that every channel
+     * just outside an APV or module has a hit on it. This is to avoid channel
+     * inefficiencies at the edges of APVs and modules.
      */
-    if (accept) {   
+    if (accept) {
       selectedSignal[strip] = adc;
-      
-      if(vrb>0) {
-	std::cout << "selected strips = " << strip << " adc= " << adc << std::endl;
+
+      if (vrb > 0) {
+        std::cout << "selected strips = " << strip << " adc= " << adc << std::endl;
       }
-    }  
+    }
   }
-  
-  if(vrb>0) {
+
+  if (vrb > 0) {
     std::cout << "last line of trkFEDclusterizer: return selectedSignal" << std::endl;
   }
   return selectedSignal;
 }
-
diff --git a/SimTracker/Common/interface/SiG4UniversalFluctuation.h b/SimTracker/Common/interface/SiG4UniversalFluctuation.h
index 3d0159cac1904..f96a896dc3e90 100644
--- a/SimTracker/Common/interface/SiG4UniversalFluctuation.h
+++ b/SimTracker/Common/interface/SiG4UniversalFluctuation.h
@@ -2,7 +2,7 @@
 // GEANT4 Class header file
 //
 //
-// File name:   SiG4UniversalFluctuation 
+// File name:   SiG4UniversalFluctuation
 //
 // Author: Vladimir Ivanchenko make a class for Laszlo Urban model
 //
@@ -10,21 +10,20 @@
 //
 // Class Description:
 //
-// Implementation of energy loss fluctuations in Silicon 
+// Implementation of energy loss fluctuations in Silicon
 
 // -------------------------------------------------------------------
 //
 
 #ifndef SiG4UniversalFluctuation_h
-#define SiG4UniversalFluctuation_h 
+#define SiG4UniversalFluctuation_h
 
-namespace CLHEP{
+namespace CLHEP {
   class HepRandomEngine;
 }
 
 class SiG4UniversalFluctuation {
 public:
-
   explicit SiG4UniversalFluctuation();
 
   ~SiG4UniversalFluctuation();
@@ -33,16 +32,15 @@ class SiG4UniversalFluctuation {
   // length in mm, meanLoss eloss in MeV.
   double SampleFluctuations(const double momentum,
                             const double mass,
-                            double& tmax,
+                            double &tmax,
                             const double length,
                             const double meanLoss,
-                            CLHEP::HepRandomEngine*);
-   
-private:
+                            CLHEP::HepRandomEngine *);
 
+private:
   // hide assignment operator
-  SiG4UniversalFluctuation & operator=(const SiG4UniversalFluctuation &right) = delete;
-  SiG4UniversalFluctuation(const SiG4UniversalFluctuation&) = delete;
+  SiG4UniversalFluctuation &operator=(const SiG4UniversalFluctuation &right) = delete;
+  SiG4UniversalFluctuation(const SiG4UniversalFluctuation &) = delete;
 
   double particleMass;
   double chargeSquare;
@@ -50,7 +48,7 @@ class SiG4UniversalFluctuation {
   // data members to speed up the fluctuation calculation
   double ipotFluct;
   double electronDensity;
-  
+
   double f1Fluct;
   double f2Fluct;
   double e1Fluct;
@@ -74,4 +72,3 @@ class SiG4UniversalFluctuation {
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 #endif
-
diff --git a/SimTracker/Common/interface/SimHitInfoForLinks.h b/SimTracker/Common/interface/SimHitInfoForLinks.h
index c0aa585c6caae..266a6494205b6 100644
--- a/SimTracker/Common/interface/SimHitInfoForLinks.h
+++ b/SimTracker/Common/interface/SimHitInfoForLinks.h
@@ -1,30 +1,30 @@
 #ifndef SimTracker_Common_SimHitInfoForLinks
 #define SimTracker_Common_SimHitInfoForLinks
 
-#include <vector>
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
+#include <vector>
 
 // A stripped down version of PSimHit used to save memory.
 // Contains only the information needed to be make DigiSimLinks.
-// Include the simHit's index in the source collection, collection name suffix index.
+// Include the simHit's index in the source collection, collection name suffix
+// index.
 
-  class SimHitInfoForLinks {
-  public:
-    explicit SimHitInfoForLinks(PSimHit const* hitp, size_t hitindex, unsigned int tofbin) :
-      eventId_(hitp->eventId()), trackIds_(1, hitp->trackId()), hitIndex_(hitindex), tofBin_(tofbin) {
-    }
+class SimHitInfoForLinks {
+public:
+  explicit SimHitInfoForLinks(PSimHit const *hitp, size_t hitindex, unsigned int tofbin)
+      : eventId_(hitp->eventId()), trackIds_(1, hitp->trackId()), hitIndex_(hitindex), tofBin_(tofbin) {}
 
-    const EncodedEventId& eventId() const { return eventId_; }
-    const std::vector<unsigned int>& trackIds() const { return trackIds_; }
-    std::vector<unsigned int>& trackIds() { return trackIds_; } // needed ATM in phase2 digitizer
-    unsigned int trackId() const { return trackIds_[0]; }
-    size_t hitIndex() const { return hitIndex_; }
-    unsigned int tofBin() const { return tofBin_; }
+  const EncodedEventId &eventId() const { return eventId_; }
+  const std::vector<unsigned int> &trackIds() const { return trackIds_; }
+  std::vector<unsigned int> &trackIds() { return trackIds_; }  // needed ATM in phase2 digitizer
+  unsigned int trackId() const { return trackIds_[0]; }
+  size_t hitIndex() const { return hitIndex_; }
+  unsigned int tofBin() const { return tofBin_; }
 
-  private:
-    EncodedEventId eventId_;
-    std::vector<unsigned int> trackIds_;
-    size_t hitIndex_;
-    unsigned int tofBin_;
-  };
+private:
+  EncodedEventId eventId_;
+  std::vector<unsigned int> trackIds_;
+  size_t hitIndex_;
+  unsigned int tofBin_;
+};
 #endif
diff --git a/SimTracker/Common/interface/SimHitSelectorFromDB.h b/SimTracker/Common/interface/SimHitSelectorFromDB.h
index 85478df9660b8..244303ba10d28 100644
--- a/SimTracker/Common/interface/SimHitSelectorFromDB.h
+++ b/SimTracker/Common/interface/SimHitSelectorFromDB.h
@@ -1,25 +1,26 @@
 #ifndef SimTracker_SimHitSelectorFromDB_H
 #define SimTracker_SimHitSelectorFromDB_H
 
-//Data
-#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
+// Data
 #include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 
-#include<map>
-#include<vector>
+#include <map>
+#include <vector>
 
 class SimHitSelectorFromDB {
-
 public:
   SimHitSelectorFromDB();
   ~SimHitSelectorFromDB(){};
-  
-  //  std::vector<PSimHit> getSimHit(std::unique_ptr<MixCollection<PSimHit> >&,std::map<uint32_t, std::vector<int> >& );
-  std::vector<std::pair<const PSimHit*,int > > getSimHit(std::unique_ptr<MixCollection<PSimHit> >&,std::map<uint32_t, std::vector<int> >& );
+
+  //  std::vector<PSimHit> getSimHit(std::unique_ptr<MixCollection<PSimHit>
+  //  >&,std::map<uint32_t, std::vector<int> >& );
+  std::vector<std::pair<const PSimHit *, int>> getSimHit(std::unique_ptr<MixCollection<PSimHit>> &,
+                                                         std::map<uint32_t, std::vector<int>> &);
+
 private:
   //  std::vector<PSimHit> theNewSimHitList;
-  std::vector<std::pair<const PSimHit*, int > > theNewSimHitList;
-
+  std::vector<std::pair<const PSimHit *, int>> theNewSimHitList;
 };
 
 #endif
diff --git a/SimTracker/Common/interface/TrackingParticleSelector.h b/SimTracker/Common/interface/TrackingParticleSelector.h
old mode 100755
new mode 100644
index 6f9a1fc0f984e..25d8df0756780
--- a/SimTracker/Common/interface/TrackingParticleSelector.h
+++ b/SimTracker/Common/interface/TrackingParticleSelector.h
@@ -8,77 +8,115 @@
  *  $Revision: 1.5.4.2 $
  *
  */
-#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
 #include "DataFormats/Math/interface/PtEtaPhiMass.h"
 #include "DataFormats/Math/interface/deltaPhi.h"
+#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 
 class TrackingParticleSelector {
-
 public:
-  TrackingParticleSelector(){}
-  TrackingParticleSelector ( double ptMin, double ptMax, double minRapidity,double maxRapidity,
-			     double tip,double lip,int minHit, bool signalOnly, bool intimeOnly, bool chargedOnly, bool stableOnly,
-			     const std::vector<int>& pdgId = std::vector<int>(),
-			     double minPhi=-3.2, double maxPhi=3.2) :
-    ptMin2_( ptMin*ptMin ), ptMax2_( ptMax*ptMax ), minRapidity_( minRapidity ), maxRapidity_( maxRapidity ),
-    meanPhi_((minPhi+maxPhi)/2.), rangePhi_((maxPhi-minPhi)/2.),
-    tip2_( tip*tip ), lip_( lip ), minHit_( minHit ), signalOnly_(signalOnly), intimeOnly_(intimeOnly), chargedOnly_(chargedOnly), stableOnly_(stableOnly), pdgId_( pdgId ) {
-    if(minPhi >= maxPhi) {
-      throw cms::Exception("Configuration") << "TrackingParticleSelector: minPhi (" << minPhi << ") must be smaller than maxPhi (" << maxPhi << "). The range is constructed from minPhi to maxPhi around their average.";
+  TrackingParticleSelector() {}
+  TrackingParticleSelector(double ptMin,
+                           double ptMax,
+                           double minRapidity,
+                           double maxRapidity,
+                           double tip,
+                           double lip,
+                           int minHit,
+                           bool signalOnly,
+                           bool intimeOnly,
+                           bool chargedOnly,
+                           bool stableOnly,
+                           const std::vector<int> &pdgId = std::vector<int>(),
+                           double minPhi = -3.2,
+                           double maxPhi = 3.2)
+      : ptMin2_(ptMin * ptMin),
+        ptMax2_(ptMax * ptMax),
+        minRapidity_(minRapidity),
+        maxRapidity_(maxRapidity),
+        meanPhi_((minPhi + maxPhi) / 2.),
+        rangePhi_((maxPhi - minPhi) / 2.),
+        tip2_(tip * tip),
+        lip_(lip),
+        minHit_(minHit),
+        signalOnly_(signalOnly),
+        intimeOnly_(intimeOnly),
+        chargedOnly_(chargedOnly),
+        stableOnly_(stableOnly),
+        pdgId_(pdgId) {
+    if (minPhi >= maxPhi) {
+      throw cms::Exception("Configuration")
+          << "TrackingParticleSelector: minPhi (" << minPhi << ") must be smaller than maxPhi (" << maxPhi
+          << "). The range is constructed from minPhi to maxPhi around their "
+             "average.";
     }
-    if(minPhi >= M_PI) {
-      throw cms::Exception("Configuration") << "TrackingParticleSelector: minPhi (" << minPhi << ") must be smaller than PI. The range is constructed from minPhi to maxPhi around their average.";
+    if (minPhi >= M_PI) {
+      throw cms::Exception("Configuration") << "TrackingParticleSelector: minPhi (" << minPhi
+                                            << ") must be smaller than PI. The range is constructed from minPhi "
+                                               "to maxPhi around their average.";
     }
-    if(maxPhi <= -M_PI) {
-      throw cms::Exception("Configuration") << "TrackingParticleSelector: maxPhi (" << maxPhi << ") must be larger than -PI. The range is constructed from minPhi to maxPhi around their average.";
+    if (maxPhi <= -M_PI) {
+      throw cms::Exception("Configuration") << "TrackingParticleSelector: maxPhi (" << maxPhi
+                                            << ") must be larger than -PI. The range is constructed from minPhi "
+                                               "to maxPhi around their average.";
     }
   }
 
   /// Operator() performs the selection: e.g. if (tPSelector(tp)) {...}
-  bool operator()( const TrackingParticle & tp ) const {
+  bool operator()(const TrackingParticle &tp) const {
     // signal only means no PU particles
-    if (signalOnly_ && !(tp.eventId().bunchCrossing()== 0 && tp.eventId().event() == 0)) return false;
+    if (signalOnly_ && !(tp.eventId().bunchCrossing() == 0 && tp.eventId().event() == 0))
+      return false;
     // intime only means no OOT PU particles
-    if (intimeOnly_ && !(tp.eventId().bunchCrossing()==0)) return false;
+    if (intimeOnly_ && !(tp.eventId().bunchCrossing() == 0))
+      return false;
 
     auto pdgid = tp.pdgId();
-    if(!pdgId_.empty()) {
+    if (!pdgId_.empty()) {
       bool testId = false;
-      for(auto id: pdgId_) {
-        if(id == pdgid) { testId = true; break;}
+      for (auto id : pdgId_) {
+        if (id == pdgid) {
+          testId = true;
+          break;
+        }
       }
-      if(!testId) return false;
+      if (!testId)
+        return false;
     }
 
-    if (chargedOnly_ && tp.charge()==0) return false;//select only if charge!=0
+    if (chargedOnly_ && tp.charge() == 0)
+      return false;  // select only if charge!=0
 
     // select only stable particles
     if (stableOnly_) {
-      for( TrackingParticle::genp_iterator j = tp.genParticle_begin(); j != tp.genParticle_end(); ++ j ) {
-        if (j->get()==nullptr || j->get()->status() != 1) {
+      for (TrackingParticle::genp_iterator j = tp.genParticle_begin(); j != tp.genParticle_end(); ++j) {
+        if (j->get() == nullptr || j->get()->status() != 1) {
           return false;
         }
       }
       // test for remaining unstabled due to lack of genparticle pointer
-      if( tp.status() == -99 &&
-          (std::abs(pdgid) != 11 && std::abs(pdgid) != 13 && std::abs(pdgid) != 211 &&
-           std::abs(pdgid) != 321 && std::abs(pdgid) != 2212 && std::abs(pdgid) != 3112 &&
-           std::abs(pdgid) != 3222 && std::abs(pdgid) != 3312 && std::abs(pdgid) != 3334))
+      if (tp.status() == -99 && (std::abs(pdgid) != 11 && std::abs(pdgid) != 13 && std::abs(pdgid) != 211 &&
+                                 std::abs(pdgid) != 321 && std::abs(pdgid) != 2212 && std::abs(pdgid) != 3112 &&
+                                 std::abs(pdgid) != 3222 && std::abs(pdgid) != 3312 && std::abs(pdgid) != 3334))
         return false;
     }
 
-    auto etaOk = [&](const TrackingParticle& p)->bool{ float eta= etaFromXYZ(p.px(),p.py(),p.pz()); return (eta>= minRapidity_) & (eta<=maxRapidity_);};
-    auto phiOk = [&](const TrackingParticle& p) { float dphi = deltaPhi(atan2f(p.py(),p.px()), meanPhi_); return dphi >= -rangePhi_ && dphi <= rangePhi_; };
-    auto ptOk = [&](const TrackingParticle& p) { double pt2 = tp.p4().perp2(); return pt2 >= ptMin2_ && pt2 <= ptMax2_; };
-    return (
- 	    tp.numberOfTrackerLayers() >= minHit_ &&
-            ptOk(tp) &&
-            etaOk(tp) &&
-            phiOk(tp) &&
-            std::abs(tp.vertex().z()) <= lip_ &&   // vertex last to avoid to load it if not striclty necessary...
-	    tp.vertex().perp2() <= tip2_
-	    );
+    auto etaOk = [&](const TrackingParticle &p) -> bool {
+      float eta = etaFromXYZ(p.px(), p.py(), p.pz());
+      return (eta >= minRapidity_) & (eta <= maxRapidity_);
+    };
+    auto phiOk = [&](const TrackingParticle &p) {
+      float dphi = deltaPhi(atan2f(p.py(), p.px()), meanPhi_);
+      return dphi >= -rangePhi_ && dphi <= rangePhi_;
+    };
+    auto ptOk = [&](const TrackingParticle &p) {
+      double pt2 = tp.p4().perp2();
+      return pt2 >= ptMin2_ && pt2 <= ptMax2_;
+    };
+    return (tp.numberOfTrackerLayers() >= minHit_ && ptOk(tp) && etaOk(tp) && phiOk(tp) &&
+            std::abs(tp.vertex().z()) <= lip_ &&  // vertex last to avoid to load it if not striclty
+                                                  // necessary...
+            tp.vertex().perp2() <= tip2_);
   }
 
 private:
@@ -90,47 +128,45 @@ class TrackingParticleSelector {
   float rangePhi_;
   double tip2_;
   double lip_;
-  int    minHit_;
+  int minHit_;
   bool signalOnly_;
   bool intimeOnly_;
   bool chargedOnly_;
   bool stableOnly_;
   std::vector<int> pdgId_;
-
 };
 
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "CommonTools/UtilAlgos/interface/ParameterAdapter.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 
 namespace reco {
   namespace modules {
 
-    template<>
+    template <>
     struct ParameterAdapter<TrackingParticleSelector> {
-      static TrackingParticleSelector make( const edm::ParameterSet & cfg, edm::ConsumesCollector & iC ) {
+      static TrackingParticleSelector make(const edm::ParameterSet &cfg, edm::ConsumesCollector &iC) {
         return make(cfg);
       }
 
-      static TrackingParticleSelector make( const edm::ParameterSet & cfg) {
-	return TrackingParticleSelector(
- 	  cfg.getParameter<double>( "ptMin" ),
- 	  cfg.getParameter<double>( "ptMax" ),
-	  cfg.getParameter<double>( "minRapidity" ),
-	  cfg.getParameter<double>( "maxRapidity" ),
-	  cfg.getParameter<double>( "tip" ),
-	  cfg.getParameter<double>( "lip" ),
-	  cfg.getParameter<int>( "minHit" ),
-	  cfg.getParameter<bool>( "signalOnly" ),
-          cfg.getParameter<bool>( "intimeOnly" ),
-	  cfg.getParameter<bool>( "chargedOnly" ),
-	  cfg.getParameter<bool>( "stableOnly" ),
-	  cfg.getParameter<std::vector<int> >( "pdgId" ),
-	  cfg.getParameter<double>( "minPhi" ),
-	  cfg.getParameter<double>( "maxPhi" ));
+      static TrackingParticleSelector make(const edm::ParameterSet &cfg) {
+        return TrackingParticleSelector(cfg.getParameter<double>("ptMin"),
+                                        cfg.getParameter<double>("ptMax"),
+                                        cfg.getParameter<double>("minRapidity"),
+                                        cfg.getParameter<double>("maxRapidity"),
+                                        cfg.getParameter<double>("tip"),
+                                        cfg.getParameter<double>("lip"),
+                                        cfg.getParameter<int>("minHit"),
+                                        cfg.getParameter<bool>("signalOnly"),
+                                        cfg.getParameter<bool>("intimeOnly"),
+                                        cfg.getParameter<bool>("chargedOnly"),
+                                        cfg.getParameter<bool>("stableOnly"),
+                                        cfg.getParameter<std::vector<int>>("pdgId"),
+                                        cfg.getParameter<double>("minPhi"),
+                                        cfg.getParameter<double>("maxPhi"));
       }
     };
 
-  }
-}
+  }  // namespace modules
+}  // namespace reco
 
 #endif
diff --git a/SimTracker/Common/src/SiG4UniversalFluctuation.cc b/SimTracker/Common/src/SiG4UniversalFluctuation.cc
index 7992b54601ba6..a493eec9e4a31 100644
--- a/SimTracker/Common/src/SiG4UniversalFluctuation.cc
+++ b/SimTracker/Common/src/SiG4UniversalFluctuation.cc
@@ -2,46 +2,45 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-#include "SimTracker/Common/interface/SiG4UniversalFluctuation.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
-#include "CLHEP/Units/GlobalPhysicalConstants.h"
+#include "CLHEP/Random/RandFlat.h"
 #include "CLHEP/Random/RandGaussQ.h"
 #include "CLHEP/Random/RandPoissonQ.h"
-#include "CLHEP/Random/RandFlat.h"
-#include <cmath>
+#include "CLHEP/Units/GlobalPhysicalConstants.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "SimTracker/Common/interface/SiG4UniversalFluctuation.h"
 #include "vdt/log.h"
+#include <cmath>
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
 using namespace std;
 
 SiG4UniversalFluctuation::SiG4UniversalFluctuation()
-  :minNumberInteractionsBohr(10.0),
-   theBohrBeta2(50.0*keV/proton_mass_c2),
-   minLoss(10.*eV),
-   problim(5.e-3),  
-   alim(10.),
-   nmaxCont1(4.),
-   nmaxCont2(16.)
-{
+    : minNumberInteractionsBohr(10.0),
+      theBohrBeta2(50.0 * keV / proton_mass_c2),
+      minLoss(10. * eV),
+      problim(5.e-3),
+      alim(10.),
+      nmaxCont1(4.),
+      nmaxCont2(16.) {
   sumalim = -log(problim);
-  
+
   // Add these definitions d.k.
-  chargeSquare   = 1.;  //Assume all particles have charge 1
+  chargeSquare = 1.;  // Assume all particles have charge 1
   // Taken from Geant4 printout, HARDWIRED for Silicon.
-  ipotFluct = 0.0001736; //material->GetIonisation()->GetMeanExcitationEnergy();  
-  electronDensity = 6.797E+20; // material->GetElectronDensity();
-  f1Fluct      = 0.8571; // material->GetIonisation()->GetF1fluct();
-  f2Fluct      = 0.1429; //material->GetIonisation()->GetF2fluct();
-  e1Fluct      = 0.000116;// material->GetIonisation()->GetEnergy1fluct();
-  e2Fluct      = 0.00196; //material->GetIonisation()->GetEnergy2fluct();
-  e1LogFluct   = -9.063;  //material->GetIonisation()->GetLogEnergy1fluct();
-  e2LogFluct   = -6.235;  //material->GetIonisation()->GetLogEnergy2fluct();
-  rateFluct    = 0.4;     //material->GetIonisation()->GetRateionexcfluct();
-  ipotLogFluct = -8.659;  //material->GetIonisation()->GetLogMeanExcEnergy();
-  e0 = 1.E-5;             //material->GetIonisation()->GetEnergy0fluct();
-  
-  //cout << " init new fluct +++++++++++++++++++++++++++++++++++++++++"<<endl;
+  ipotFluct = 0.0001736;        // material->GetIonisation()->GetMeanExcitationEnergy();
+  electronDensity = 6.797E+20;  // material->GetElectronDensity();
+  f1Fluct = 0.8571;             // material->GetIonisation()->GetF1fluct();
+  f2Fluct = 0.1429;             // material->GetIonisation()->GetF2fluct();
+  e1Fluct = 0.000116;           // material->GetIonisation()->GetEnergy1fluct();
+  e2Fluct = 0.00196;            // material->GetIonisation()->GetEnergy2fluct();
+  e1LogFluct = -9.063;          // material->GetIonisation()->GetLogEnergy1fluct();
+  e2LogFluct = -6.235;          // material->GetIonisation()->GetLogEnergy2fluct();
+  rateFluct = 0.4;              // material->GetIonisation()->GetRateionexcfluct();
+  ipotLogFluct = -8.659;        // material->GetIonisation()->GetLogMeanExcEnergy();
+  e0 = 1.E-5;                   // material->GetIonisation()->GetEnergy0fluct();
+
+  // cout << " init new fluct +++++++++++++++++++++++++++++++++++++++++"<<endl;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -49,55 +48,48 @@ SiG4UniversalFluctuation::SiG4UniversalFluctuation()
 // Arguments: momentum in MeV/c, mass in MeV, delta ray cut (tmax) in
 // MeV, silicon thickness in mm, mean eloss in MeV.
 
-SiG4UniversalFluctuation::~SiG4UniversalFluctuation()
-{
-}
+SiG4UniversalFluctuation::~SiG4UniversalFluctuation() {}
 
 double SiG4UniversalFluctuation::SampleFluctuations(const double momentum,
-						    const double mass,
-						    double& tmax,
-						    const double length,
-						    const double meanLoss,
-                                                    CLHEP::HepRandomEngine* engine)
-{
-// Calculate actual loss from the mean loss.
-// The model used to get the fluctuations is essentially the same
-// as in Glandz in Geant3 (Cern program library W5013, phys332).
-// L. Urban et al. NIM A362, p.416 (1995) and Geant4 Physics Reference Manual
+                                                    const double mass,
+                                                    double &tmax,
+                                                    const double length,
+                                                    const double meanLoss,
+                                                    CLHEP::HepRandomEngine *engine) {
+  // Calculate actual loss from the mean loss.
+  // The model used to get the fluctuations is essentially the same
+  // as in Glandz in Geant3 (Cern program library W5013, phys332).
+  // L. Urban et al. NIM A362, p.416 (1995) and Geant4 Physics Reference Manual
 
   // shortcut for very very small loss (out of validity of the model)
   //
-  if (meanLoss < minLoss) return meanLoss;
+  if (meanLoss < minLoss)
+    return meanLoss;
 
-  particleMass   = mass; 
-  double gam2   = (momentum*momentum)/(particleMass*particleMass) + 1.0;
-  double beta2 = 1.0 - 1.0/gam2;
+  particleMass = mass;
+  double gam2 = (momentum * momentum) / (particleMass * particleMass) + 1.0;
+  double beta2 = 1.0 - 1.0 / gam2;
   double gam = sqrt(gam2);
 
   double loss(0.), siga(0.);
-  
+
   // Gaussian regime
   // for heavy particles only and conditions
-  // for Gauusian fluct. has been changed 
+  // for Gauusian fluct. has been changed
   //
-  if ((particleMass > electron_mass_c2) &&
-      (meanLoss >= minNumberInteractionsBohr*tmax))
-  {
-    double massrate = electron_mass_c2/particleMass ;
-    double tmaxkine = 2.*electron_mass_c2*beta2*gam2/
-      (1.+massrate*(2.*gam+massrate)) ;
-    if (tmaxkine <= 2.*tmax)   
-    {
-      siga  = (1.0/beta2 - 0.5) * twopi_mc2_rcl2 * tmax * length
-                                * electronDensity * chargeSquare;
+  if ((particleMass > electron_mass_c2) && (meanLoss >= minNumberInteractionsBohr * tmax)) {
+    double massrate = electron_mass_c2 / particleMass;
+    double tmaxkine = 2. * electron_mass_c2 * beta2 * gam2 / (1. + massrate * (2. * gam + massrate));
+    if (tmaxkine <= 2. * tmax) {
+      siga = (1.0 / beta2 - 0.5) * twopi_mc2_rcl2 * tmax * length * electronDensity * chargeSquare;
       siga = sqrt(siga);
       double twomeanLoss = meanLoss + meanLoss;
       if (twomeanLoss < siga) {
         double x;
         do {
-          loss = twomeanLoss*CLHEP::RandFlat::shoot(engine);
-       	  x = (loss - meanLoss)/siga;
-        } while (1.0 - 0.5*x*x < CLHEP::RandFlat::shoot(engine));
+          loss = twomeanLoss * CLHEP::RandFlat::shoot(engine);
+          x = (loss - meanLoss) / siga;
+        } while (1.0 - 0.5 * x * x < CLHEP::RandFlat::shoot(engine));
       } else {
         do {
           loss = CLHEP::RandGaussQ::shoot(engine, meanLoss, siga);
@@ -109,129 +101,124 @@ double SiG4UniversalFluctuation::SampleFluctuations(const double momentum,
 
   double a1 = 0., a2 = 0., a3 = 0.;
   double p3;
-  double rate = rateFluct ;
-
-  double w1 = tmax/ipotFluct;
-  double w2 = vdt::fast_log(2.*electron_mass_c2*beta2*gam2)-beta2;
-
-  if(w2 > ipotLogFluct)
-  {
-    double C = meanLoss*(1.-rateFluct)/(w2-ipotLogFluct);
-    a1 = C*f1Fluct*(w2-e1LogFluct)/e1Fluct;
-    a2 = C*f2Fluct*(w2-e2LogFluct)/e2Fluct;
-    if(a2 < 0.)
-    {
-      a1 = 0. ;
-      a2 = 0. ;
-      rate = 1. ;  
+  double rate = rateFluct;
+
+  double w1 = tmax / ipotFluct;
+  double w2 = vdt::fast_log(2. * electron_mass_c2 * beta2 * gam2) - beta2;
+
+  if (w2 > ipotLogFluct) {
+    double C = meanLoss * (1. - rateFluct) / (w2 - ipotLogFluct);
+    a1 = C * f1Fluct * (w2 - e1LogFluct) / e1Fluct;
+    a2 = C * f2Fluct * (w2 - e2LogFluct) / e2Fluct;
+    if (a2 < 0.) {
+      a1 = 0.;
+      a2 = 0.;
+      rate = 1.;
     }
-  }
-  else
-  {
-    rate = 1. ;
+  } else {
+    rate = 1.;
   }
 
   // added
-  if(tmax > ipotFluct) {
-    a3 = rate*meanLoss*(tmax-ipotFluct)/(ipotFluct*tmax*vdt::fast_log(w1));
+  if (tmax > ipotFluct) {
+    a3 = rate * meanLoss * (tmax - ipotFluct) / (ipotFluct * tmax * vdt::fast_log(w1));
   }
-  double suma = a1+a2+a3;
-  
+  double suma = a1 + a2 + a3;
+
   // Glandz regime
   //
-  if (suma > sumalim)
-  {
-    if((a1+a2) > 0.)
-    {
+  if (suma > sumalim) {
+    if ((a1 + a2) > 0.) {
       double p1, p2;
       // excitation type 1
-      if (a1>alim) {
-        siga=sqrt(a1) ;
+      if (a1 > alim) {
+        siga = sqrt(a1);
         p1 = max(0., CLHEP::RandGaussQ::shoot(engine, a1, siga) + 0.5);
       } else {
-	p1 = double(CLHEP::RandPoissonQ::shoot(engine,a1));
+        p1 = double(CLHEP::RandPoissonQ::shoot(engine, a1));
       }
-    
+
       // excitation type 2
-      if (a2>alim) {
-        siga=sqrt(a2) ;
+      if (a2 > alim) {
+        siga = sqrt(a2);
         p2 = max(0., CLHEP::RandGaussQ::shoot(engine, a2, siga) + 0.5);
       } else {
-	p2 = double(CLHEP::RandPoissonQ::shoot(engine,a2));
+        p2 = double(CLHEP::RandPoissonQ::shoot(engine, a2));
       }
-    
-      loss = p1*e1Fluct+p2*e2Fluct;
- 
+
+      loss = p1 * e1Fluct + p2 * e2Fluct;
+
       // smearing to avoid unphysical peaks
       if (p2 > 0.)
-        loss += (1.-2.*CLHEP::RandFlat::shoot(engine))*e2Fluct;
-      else if (loss>0.)
-        loss += (1.-2.*CLHEP::RandFlat::shoot(engine))*e1Fluct;
-      if (loss < 0.) loss = 0.0;
+        loss += (1. - 2. * CLHEP::RandFlat::shoot(engine)) * e2Fluct;
+      else if (loss > 0.)
+        loss += (1. - 2. * CLHEP::RandFlat::shoot(engine)) * e1Fluct;
+      if (loss < 0.)
+        loss = 0.0;
     }
 
     // ionisation
     if (a3 > 0.) {
-      if (a3>alim) {
-        siga=sqrt(a3) ;
+      if (a3 > alim) {
+        siga = sqrt(a3);
         p3 = max(0., CLHEP::RandGaussQ::shoot(engine, a3, siga) + 0.5);
       } else {
-	p3 = double(CLHEP::RandPoissonQ::shoot(engine,a3));
+        p3 = double(CLHEP::RandPoissonQ::shoot(engine, a3));
       }
       double lossc = 0.;
       if (p3 > 0) {
-        double na = 0.; 
+        double na = 0.;
         double alfa = 1.;
         if (p3 > nmaxCont2) {
-          double rfac   = p3/(nmaxCont2+p3);
-          double namean = p3*rfac;
-          double sa     = nmaxCont1*rfac;
-          na              = CLHEP::RandGaussQ::shoot(engine, namean, sa);
+          double rfac = p3 / (nmaxCont2 + p3);
+          double namean = p3 * rfac;
+          double sa = nmaxCont1 * rfac;
+          na = CLHEP::RandGaussQ::shoot(engine, namean, sa);
           if (na > 0.) {
-            alfa   = w1*(nmaxCont2+p3)/(w1*nmaxCont2+p3);
-            double alfa1  = alfa*vdt::fast_log(alfa)/(alfa-1.);
-            double ea     = na*ipotFluct*alfa1;
-            double sea    = ipotFluct*sqrt(na*(alfa-alfa1*alfa1));
+            alfa = w1 * (nmaxCont2 + p3) / (w1 * nmaxCont2 + p3);
+            double alfa1 = alfa * vdt::fast_log(alfa) / (alfa - 1.);
+            double ea = na * ipotFluct * alfa1;
+            double sea = ipotFluct * sqrt(na * (alfa - alfa1 * alfa1));
             lossc += CLHEP::RandGaussQ::shoot(engine, ea, sea);
           }
         }
 
         if (p3 > na) {
-          w2 = alfa*ipotFluct;
-          double w  = (tmax-w2)/tmax;
-          int    nb = int(p3-na);
-          for (int k=0; k<nb; k++) lossc += w2/(1.-w*CLHEP::RandFlat::shoot(engine));
+          w2 = alfa * ipotFluct;
+          double w = (tmax - w2) / tmax;
+          int nb = int(p3 - na);
+          for (int k = 0; k < nb; k++)
+            lossc += w2 / (1. - w * CLHEP::RandFlat::shoot(engine));
         }
-      }        
-      loss += lossc;  
+      }
+      loss += lossc;
     }
     return loss;
   }
-  
-  // suma < sumalim;  very small energy loss;  
-  a3 = meanLoss*(tmax-e0)/(tmax*e0*vdt::fast_log(tmax/e0));
-  if (a3 > alim)
-  {
-    siga=sqrt(a3);
+
+  // suma < sumalim;  very small energy loss;
+  a3 = meanLoss * (tmax - e0) / (tmax * e0 * vdt::fast_log(tmax / e0));
+  if (a3 > alim) {
+    siga = sqrt(a3);
     p3 = max(0., CLHEP::RandGaussQ::shoot(engine, a3, siga) + 0.5);
   } else {
-    p3 = double(CLHEP::RandPoissonQ::shoot(engine,a3));
+    p3 = double(CLHEP::RandPoissonQ::shoot(engine, a3));
   }
   if (p3 > 0.) {
-    double w = (tmax-e0)/tmax;
+    double w = (tmax - e0) / tmax;
     double corrfac = 1.;
     if (p3 > nmaxCont2) {
-      corrfac = p3/nmaxCont2;
+      corrfac = p3 / nmaxCont2;
       p3 = nmaxCont2;
-    } 
+    }
     int ip3 = (int)p3;
-    for (int i=0; i<ip3; i++) loss += 1./(1.-w*CLHEP::RandFlat::shoot(engine));
-    loss *= e0*corrfac;
+    for (int i = 0; i < ip3; i++)
+      loss += 1. / (1. - w * CLHEP::RandFlat::shoot(engine));
+    loss *= e0 * corrfac;
     // smearing for losses near to e0
-    if(p3 <= 2.)
-      loss += e0*(1.-2.*CLHEP::RandFlat::shoot(engine)) ;
-   }
-    
-   return loss;
-}
+    if (p3 <= 2.)
+      loss += e0 * (1. - 2. * CLHEP::RandFlat::shoot(engine));
+  }
 
+  return loss;
+}
diff --git a/SimTracker/Common/src/SimHitSelectorFromDB.cc b/SimTracker/Common/src/SimHitSelectorFromDB.cc
index e240c6deb1254..c6e1a555f7112 100644
--- a/SimTracker/Common/src/SimHitSelectorFromDB.cc
+++ b/SimTracker/Common/src/SimHitSelectorFromDB.cc
@@ -1,25 +1,27 @@
 #include "SimTracker/Common/interface/SimHitSelectorFromDB.h"
 
-SimHitSelectorFromDB::SimHitSelectorFromDB():theNewSimHitList(0){}
+SimHitSelectorFromDB::SimHitSelectorFromDB() : theNewSimHitList(0) {}
 
-//std::vector<PSimHit> SimHitSelectorFromDB::getSimHit(std::unique_ptr<MixCollection<PSimHit> >& simhit, 
-std::vector<std::pair<const PSimHit*,int> > SimHitSelectorFromDB::getSimHit(std::unique_ptr<MixCollection<PSimHit> >& simhit, 
-						     std::map<uint32_t, std::vector<int> >& detId){
+// std::vector<PSimHit>
+// SimHitSelectorFromDB::getSimHit(std::unique_ptr<MixCollection<PSimHit> >&
+// simhit,
+std::vector<std::pair<const PSimHit *, int>> SimHitSelectorFromDB::getSimHit(
+    std::unique_ptr<MixCollection<PSimHit>> &simhit, std::map<uint32_t, std::vector<int>> &detId) {
   theNewSimHitList.clear();
-  int counter =0;
-  for(MixCollection<PSimHit>::iterator it = simhit->begin(); it!= simhit->end();it++){
+  int counter = 0;
+  for (MixCollection<PSimHit>::iterator it = simhit->begin(); it != simhit->end(); it++) {
     counter++;
-    if(!detId.empty()){
+    if (!detId.empty()) {
       uint32_t tkid = (*it).detUnitId();
-      if (detId.find(tkid) != detId.end()){
-	//	theNewSimHitList.push_back((*it));
-	//	std::cout << "Hit in the MAP " << counter << std::endl;
-	theNewSimHitList.push_back(std::make_pair(&(*it), counter));
+      if (detId.find(tkid) != detId.end()) {
+        //	theNewSimHitList.push_back((*it));
+        //	std::cout << "Hit in the MAP " << counter << std::endl;
+        theNewSimHitList.push_back(std::make_pair(&(*it), counter));
       }
-    }else{
+    } else {
       //      theNewSimHitList.push_back((*it));
       //      std::cout << "Hit NOT in the MAP " << counter << std::endl;
-      theNewSimHitList.push_back(std::make_pair(&(*it),counter));
+      theNewSimHitList.push_back(std::make_pair(&(*it), counter));
     }
   }
   return theNewSimHitList;
diff --git a/SimTracker/Records/interface/TrackAssociatorRecord.h b/SimTracker/Records/interface/TrackAssociatorRecord.h
index 81f853f6893b3..d7fd5afc0e9f4 100644
--- a/SimTracker/Records/interface/TrackAssociatorRecord.h
+++ b/SimTracker/Records/interface/TrackAssociatorRecord.h
@@ -7,18 +7,17 @@
  *  \author cerati
  */
 
-#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
 #include "FWCore/Framework/interface/DependentRecordImplementation.h"
+#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
+#include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 #include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
-#include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
 
 #include "boost/mpl/vector.hpp"
 
-class TrackAssociatorRecord : public edm::eventsetup::DependentRecordImplementation<TrackAssociatorRecord,
-  boost::mpl::vector<IdealMagneticFieldRecord,
-  TrackingComponentsRecord,
-GlobalTrackingGeometryRecord
-> > {};
+class TrackAssociatorRecord
+    : public edm::eventsetup::DependentRecordImplementation<
+          TrackAssociatorRecord,
+          boost::mpl::vector<IdealMagneticFieldRecord, TrackingComponentsRecord, GlobalTrackingGeometryRecord>> {};
 
 #endif
diff --git a/SimTracker/Records/src/TrackAssociatorRecord.cc b/SimTracker/Records/src/TrackAssociatorRecord.cc
index d36d1e4878c2b..624331aa332ea 100644
--- a/SimTracker/Records/src/TrackAssociatorRecord.cc
+++ b/SimTracker/Records/src/TrackAssociatorRecord.cc
@@ -2,14 +2,14 @@
 //
 // Package:     Records
 // Class  :     TrackAssociatorRecord
-// 
+//
 // Implementation:
 //     <Notes on implementation>
 //
-// Author:      
+// Author:
 // Created:     Mon Sep 11 17:54:35 CEST 2006
 
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 #include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
+#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 
 EVENTSETUP_RECORD_REG(TrackAssociatorRecord);
diff --git a/SimTracker/SiPhase2Digitizer/test/DigiTest_cfg.py b/SimTracker/SiPhase2Digitizer/test/DigiTest_cfg.py
index e49b8a89e4eee..32cb7e27090a9 100644
--- a/SimTracker/SiPhase2Digitizer/test/DigiTest_cfg.py
+++ b/SimTracker/SiPhase2Digitizer/test/DigiTest_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process('digiTest',eras.Phase2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('digiTest',Phase2)
 process.maxEvents = cms.untracked.PSet(
     input = cms.untracked.int32(-1)
 )
diff --git a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc
index 3120793ed198b..03b5575e44ae2 100644
--- a/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc
+++ b/SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc
@@ -117,7 +117,8 @@ namespace cms
     }
     
     _pixeldigialgo.reset(new SiPixelDigitizerAlgorithm(iConfig));
-    mixMod.produces<PixelFEDChannelCollection>();
+    if (NumberOfEndcapDisks != 2)
+      mixMod.produces<PixelFEDChannelCollection>();
   }
   
   SiPixelDigitizer::~SiPixelDigitizer(){  
diff --git a/SimTracker/SiStripDigitizer/interface/SiDigitalConverter.h b/SimTracker/SiStripDigitizer/interface/SiDigitalConverter.h
index a1f40ecfc3ca3..47bac0f3ab904 100644
--- a/SimTracker/SiStripDigitizer/interface/SiDigitalConverter.h
+++ b/SimTracker/SiStripDigitizer/interface/SiDigitalConverter.h
@@ -10,13 +10,13 @@
  * Base class for ADC simulation.
  */
 class SiDigitalConverter {
- public:
-  typedef std::vector<SiStripDigi>         DigitalVecType;
-  typedef std::vector<SiStripRawDigi>      DigitalRawVecType;
-  
-  virtual ~SiDigitalConverter() { }
-  virtual DigitalVecType    convert(const std::vector<float> &,  edm::ESHandle<SiStripGain>& ,unsigned int detid) = 0;
-  virtual DigitalRawVecType convertRaw(const std::vector<float> &,  edm::ESHandle<SiStripGain>& ,unsigned int detid) = 0;  
+public:
+  typedef std::vector<SiStripDigi> DigitalVecType;
+  typedef std::vector<SiStripRawDigi> DigitalRawVecType;
+
+  virtual ~SiDigitalConverter() {}
+  virtual DigitalVecType convert(const std::vector<float>&, edm::ESHandle<SiStripGain>&, unsigned int detid) = 0;
+  virtual DigitalRawVecType convertRaw(const std::vector<float>&, edm::ESHandle<SiStripGain>&, unsigned int detid) = 0;
 };
 
 #endif
diff --git a/SimTracker/SiStripDigitizer/interface/SiGaussianTailNoiseAdder.h b/SimTracker/SiStripDigitizer/interface/SiGaussianTailNoiseAdder.h
index f271bd100af71..b38036c6dcc4e 100644
--- a/SimTracker/SiStripDigitizer/interface/SiGaussianTailNoiseAdder.h
+++ b/SimTracker/SiStripDigitizer/interface/SiGaussianTailNoiseAdder.h
@@ -14,20 +14,19 @@ namespace CLHEP {
   class HepRandomEngine;
 }
 
-class SiGaussianTailNoiseAdder : public SiNoiseAdder{
- public:
+class SiGaussianTailNoiseAdder : public SiNoiseAdder {
+public:
   SiGaussianTailNoiseAdder(float);
   ~SiGaussianTailNoiseAdder() override;
-  void addNoise(std::vector<float>&, size_t&, size_t&, int, float, CLHEP::HepRandomEngine*) const override;
-  
-  void addNoiseVR(std::vector<float> &, std::vector<float> &, CLHEP::HepRandomEngine*) const override;
+  void addNoise(std::vector<float> &, size_t &, size_t &, int, float, CLHEP::HepRandomEngine *) const override;
+
+  void addNoiseVR(std::vector<float> &, std::vector<float> &, CLHEP::HepRandomEngine *) const override;
   void addPedestals(std::vector<float> &, std::vector<float> &) const override;
-  void addCMNoise(std::vector<float> &, float, std::vector<bool> &, CLHEP::HepRandomEngine*) const override;
+  void addCMNoise(std::vector<float> &, float, std::vector<bool> &, CLHEP::HepRandomEngine *) const override;
   void addBaselineShift(std::vector<float> &, std::vector<bool> &) const override;
-  
- private:
+
+private:
   const float threshold;
   std::unique_ptr<GaussianTailNoiseGenerator> genNoise;
 };
 #endif
- 
diff --git a/SimTracker/SiStripDigitizer/interface/SiNoiseAdder.h b/SimTracker/SiStripDigitizer/interface/SiNoiseAdder.h
index 10e6e2a754fce..ab3edd28e2e54 100644
--- a/SimTracker/SiStripDigitizer/interface/SiNoiseAdder.h
+++ b/SimTracker/SiStripDigitizer/interface/SiNoiseAdder.h
@@ -4,23 +4,23 @@
 #include "SimTracker/SiStripDigitizer/interface/SiPileUpSignals.h"
 
 namespace CLHEP {
-   class HepRandomEngine;
+  class HepRandomEngine;
 }
 
 /**
  * Base class to add noise to the strips.
  */
-class SiNoiseAdder{
- public:
-  virtual ~SiNoiseAdder() { }
-  virtual void addNoise(std::vector<float>&,size_t&,size_t&,int,float, CLHEP::HepRandomEngine*) const = 0;
+class SiNoiseAdder {
+public:
+  virtual ~SiNoiseAdder() {}
+  virtual void addNoise(std::vector<float> &, size_t &, size_t &, int, float, CLHEP::HepRandomEngine *) const = 0;
   //virtual void createRaw(std::vector<float>&,size_t&,size_t&,int,float,float) const = 0;
-  
-  virtual void addNoiseVR(std::vector<float> &, std::vector<float> &, CLHEP::HepRandomEngine*) const=0;
-  virtual void addPedestals(std::vector<float> &, std::vector<float> &) const=0;
-  virtual void addCMNoise(std::vector<float> &, float,  std::vector<bool> &, CLHEP::HepRandomEngine*) const=0;
-  virtual void addBaselineShift(std::vector<float> &, std::vector<bool> &) const=0;
- 
+
+  virtual void addNoiseVR(std::vector<float> &, std::vector<float> &, CLHEP::HepRandomEngine *) const = 0;
+  virtual void addPedestals(std::vector<float> &, std::vector<float> &) const = 0;
+  virtual void addCMNoise(std::vector<float> &, float, std::vector<bool> &, CLHEP::HepRandomEngine *) const = 0;
+  virtual void addBaselineShift(std::vector<float> &, std::vector<bool> &) const = 0;
+
   //virtual void addNoiseVR(std::vector<float> &, std::vector<std::pair<int, float> > &) const=0;
   //virtual void addPedestals(std::vector<float> &, std::vector<std::pair<int, float> > &) const=0;
   //virtual void addConstNoise(std::vector<float> &, float) const=0;
@@ -29,6 +29,5 @@ class SiNoiseAdder{
   //virtual void addRealPed(std::vector<float> &, std::vector<float> &) const=0;
   //virtual void addCMNoise(std::vector<float> &, std::vector<std::pair<int, float> > &) const=0;
   //virtual void addBaselineShift(std::vector<float> &, std::vector<std::pair<int, float> > &) const=0;
- 
 };
 #endif
diff --git a/SimTracker/SiStripDigitizer/interface/SiPileUpSignals.h b/SimTracker/SiStripDigitizer/interface/SiPileUpSignals.h
index 5d7db2319686f..057485cfdf675 100644
--- a/SimTracker/SiStripDigitizer/interface/SiPileUpSignals.h
+++ b/SimTracker/SiStripDigitizer/interface/SiPileUpSignals.h
@@ -11,34 +11,35 @@ class SimHit;
  * Class which takes the responses from each SimHit and piles-up them, within a given module.
  * More precisely, it keeps for each strip the link to each individual measurement.
  */
-class SiPileUpSignals{ 
- public:
+class SiPileUpSignals {
+public:
   // type used to describe the amplitude on a strip
   typedef float Amplitude;
-  // associates to each strip a vector of amplitudes. 
+  // associates to each strip a vector of amplitudes.
   // That allows later to comput the fraction of the contribution of each simhit to the ADC value
-  typedef std::map<int, Amplitude>  SignalMapType;
-  typedef std::map<uint32_t, SignalMapType>  signalMaps;
-  
+  typedef std::map<int, Amplitude> SignalMapType;
+  typedef std::map<uint32_t, SignalMapType> signalMaps;
+
   SiPileUpSignals() { reset(); }
 
-  virtual ~SiPileUpSignals() { }
-  
+  virtual ~SiPileUpSignals() {}
+
   virtual void add(uint32_t detID,
                    const std::vector<float>& locAmpl,
-                   const size_t& firstChannelWithSignal, const size_t& lastChannelWithSignal);
+                   const size_t& firstChannelWithSignal,
+                   const size_t& lastChannelWithSignal);
+
+  void reset() { resetSignals(); }
 
-  void reset(){ resetSignals(); }
-  
   const SignalMapType* getSignal(uint32_t detID) const {
     auto where = signal_.find(detID);
-    if(where == signal_.end()) {
+    if (where == signal_.end()) {
       return nullptr;
     }
     return &where->second;
   }
-  
- private:
+
+private:
   void resetSignals();
   signalMaps signal_;
 };
diff --git a/SimTracker/SiStripDigitizer/interface/SiTrivialDigitalConverter.h b/SimTracker/SiStripDigitizer/interface/SiTrivialDigitalConverter.h
index a997bf7b12d3f..4c5388c668813 100644
--- a/SimTracker/SiStripDigitizer/interface/SiTrivialDigitalConverter.h
+++ b/SimTracker/SiStripDigitizer/interface/SiTrivialDigitalConverter.h
@@ -5,26 +5,23 @@
 /**
  * Concrete implementation of SiDigitalConverter.
  */
-class SiTrivialDigitalConverter: public SiDigitalConverter{
- public:
-
+class SiTrivialDigitalConverter : public SiDigitalConverter {
+public:
   SiTrivialDigitalConverter(float in, bool PreMix);
-  
-  DigitalVecType    convert(const std::vector<float>&,  edm::ESHandle<SiStripGain>& ,unsigned int detid) override;
-  DigitalRawVecType convertRaw(const std::vector<float>&,  edm::ESHandle<SiStripGain>& ,unsigned int detid) override;  
 
- private:
+  DigitalVecType convert(const std::vector<float>&, edm::ESHandle<SiStripGain>&, unsigned int detid) override;
+  DigitalRawVecType convertRaw(const std::vector<float>&, edm::ESHandle<SiStripGain>&, unsigned int detid) override;
 
-  int convert(float in){return truncate(in/electronperADC);}
-  int convertRaw(float in){return truncateRaw(in/electronperADC);}
+private:
+  int convert(float in) { return truncate(in / electronperADC); }
+  int convertRaw(float in) { return truncateRaw(in / electronperADC); }
   int truncate(float in_adc) const;
   int truncateRaw(float in_adc) const;
-  
+
   const float electronperADC;
   SiDigitalConverter::DigitalVecType _temp;
   SiDigitalConverter::DigitalRawVecType _tempRaw;
   bool PreMixing_;
-
 };
- 
+
 #endif
diff --git a/SimTracker/SiStripDigitizer/plugins/DigiSimLinkAlgorithm.cc b/SimTracker/SiStripDigitizer/plugins/DigiSimLinkAlgorithm.cc
index 393e579854707..76c559300241c 100644
--- a/SimTracker/SiStripDigitizer/plugins/DigiSimLinkAlgorithm.cc
+++ b/SimTracker/SiStripDigitizer/plugins/DigiSimLinkAlgorithm.cc
@@ -17,38 +17,37 @@
 #define CBOLTZ (1.38E-23)
 #define e_SI (1.6E-19)
 
-DigiSimLinkAlgorithm::DigiSimLinkAlgorithm(const edm::ParameterSet& conf):
-  conf_(conf) {
-  theThreshold              = conf_.getParameter<double>("NoiseSigmaThreshold");
-  theFedAlgo                = conf_.getParameter<int>("FedAlgorithm");
-  peakMode                  = conf_.getParameter<bool>("APVpeakmode");
-  theElectronPerADC         = conf_.getParameter<double>( peakMode ? "electronPerAdcPeak" : "electronPerAdcDec" );
-  noise                     = conf_.getParameter<bool>("Noise");
-  zeroSuppression           = conf_.getParameter<bool>("ZeroSuppression");
-  theTOFCutForPeak          = conf_.getParameter<double>("TOFCutForPeak");
+DigiSimLinkAlgorithm::DigiSimLinkAlgorithm(const edm::ParameterSet& conf) : conf_(conf) {
+  theThreshold = conf_.getParameter<double>("NoiseSigmaThreshold");
+  theFedAlgo = conf_.getParameter<int>("FedAlgorithm");
+  peakMode = conf_.getParameter<bool>("APVpeakmode");
+  theElectronPerADC = conf_.getParameter<double>(peakMode ? "electronPerAdcPeak" : "electronPerAdcDec");
+  noise = conf_.getParameter<bool>("Noise");
+  zeroSuppression = conf_.getParameter<bool>("ZeroSuppression");
+  theTOFCutForPeak = conf_.getParameter<double>("TOFCutForPeak");
   theTOFCutForDeconvolution = conf_.getParameter<double>("TOFCutForDeconvolution");
-  cosmicShift               = conf_.getUntrackedParameter<double>("CosmicDelayShift");
-  inefficiency              = conf_.getParameter<double>("Inefficiency");
-  RealPedestals             = conf_.getParameter<bool>("RealPedestals"); 
-  SingleStripNoise          = conf_.getParameter<bool>("SingleStripNoise");
-  CommonModeNoise           = conf_.getParameter<bool>("CommonModeNoise");
-  BaselineShift             = conf_.getParameter<bool>("BaselineShift");
-  APVSaturationFromHIP      = conf_.getParameter<bool>("APVSaturationFromHIP");
-  APVSaturationProb         = conf_.getParameter<double>("APVSaturationProb");
-  cmnRMStib                 = conf_.getParameter<double>("cmnRMStib");
-  cmnRMStob                 = conf_.getParameter<double>("cmnRMStob");
-  cmnRMStid                 = conf_.getParameter<double>("cmnRMStid");
-  cmnRMStec                 = conf_.getParameter<double>("cmnRMStec");
-  pedOffset                 = (unsigned int)conf_.getParameter<double>("PedestalsOffset");
-  PreMixing_                = conf_.getParameter<bool>("PreMixingMode");
+  cosmicShift = conf_.getUntrackedParameter<double>("CosmicDelayShift");
+  inefficiency = conf_.getParameter<double>("Inefficiency");
+  RealPedestals = conf_.getParameter<bool>("RealPedestals");
+  SingleStripNoise = conf_.getParameter<bool>("SingleStripNoise");
+  CommonModeNoise = conf_.getParameter<bool>("CommonModeNoise");
+  BaselineShift = conf_.getParameter<bool>("BaselineShift");
+  APVSaturationFromHIP = conf_.getParameter<bool>("APVSaturationFromHIP");
+  APVSaturationProb = conf_.getParameter<double>("APVSaturationProb");
+  cmnRMStib = conf_.getParameter<double>("cmnRMStib");
+  cmnRMStob = conf_.getParameter<double>("cmnRMStob");
+  cmnRMStid = conf_.getParameter<double>("cmnRMStid");
+  cmnRMStec = conf_.getParameter<double>("cmnRMStec");
+  pedOffset = (unsigned int)conf_.getParameter<double>("PedestalsOffset");
+  PreMixing_ = conf_.getParameter<bool>("PreMixingMode");
   if (peakMode) {
-    tofCut=theTOFCutForPeak;
-    LogDebug("StripDigiInfo")<<"APVs running in peak mode (poor time resolution)";
+    tofCut = theTOFCutForPeak;
+    LogDebug("StripDigiInfo") << "APVs running in peak mode (poor time resolution)";
   } else {
-    tofCut=theTOFCutForDeconvolution;
-    LogDebug("StripDigiInfo")<<"APVs running in deconvolution mode (good time resolution)";
+    tofCut = theTOFCutForDeconvolution;
+    LogDebug("StripDigiInfo") << "APVs running in deconvolution mode (good time resolution)";
   };
-  
+
   theSiHitDigitizer = new SiHitDigitizer(conf_);
   theDigiSimLinkPileUpSignals = new DigiSimLinkPileUpSignals();
   theSiNoiseAdder = new SiGaussianTailNoiseAdder(theThreshold);
@@ -56,7 +55,7 @@ DigiSimLinkAlgorithm::DigiSimLinkAlgorithm(const edm::ParameterSet& conf):
   theSiZeroSuppress = new SiStripFedZeroSuppression(theFedAlgo);
 }
 
-DigiSimLinkAlgorithm::~DigiSimLinkAlgorithm(){
+DigiSimLinkAlgorithm::~DigiSimLinkAlgorithm() {
   delete theSiHitDigitizer;
   delete theDigiSimLinkPileUpSignals;
   delete theSiNoiseAdder;
@@ -70,16 +69,17 @@ DigiSimLinkAlgorithm::~DigiSimLinkAlgorithm(){
 //  ------------------------------------
 
 void DigiSimLinkAlgorithm::run(edm::DetSet<SiStripDigi>& outdigi,
-			       edm::DetSet<SiStripRawDigi>& outrawdigi,
-			       const std::vector<std::pair<const PSimHit*, int > > &input,
-			       StripGeomDetUnit const *det,
-			       GlobalVector bfield,float langle, 
-			       edm::ESHandle<SiStripGain> & gainHandle,
-			       edm::ESHandle<SiStripThreshold> & thresholdHandle,
-			       edm::ESHandle<SiStripNoises> & noiseHandle,
-			       edm::ESHandle<SiStripPedestals> & pedestalHandle,
-			       edm::ESHandle<SiStripBadStrip> & deadChannelHandle,
-			       const TrackerTopology *tTopo,
+                               edm::DetSet<SiStripRawDigi>& outrawdigi,
+                               const std::vector<std::pair<const PSimHit*, int> >& input,
+                               StripGeomDetUnit const* det,
+                               GlobalVector bfield,
+                               float langle,
+                               edm::ESHandle<SiStripGain>& gainHandle,
+                               edm::ESHandle<SiStripThreshold>& thresholdHandle,
+                               edm::ESHandle<SiStripNoises>& noiseHandle,
+                               edm::ESHandle<SiStripPedestals>& pedestalHandle,
+                               edm::ESHandle<SiStripBadStrip>& deadChannelHandle,
+                               const TrackerTopology* tTopo,
                                CLHEP::HepRandomEngine* engine) {
   theDigiSimLinkPileUpSignals->reset();
   unsigned int detID = det->geographicalId().rawId();
@@ -87,299 +87,327 @@ void DigiSimLinkAlgorithm::run(edm::DetSet<SiStripDigi>& outdigi,
   SiStripApvGain::Range detGainRange = gainHandle->getRange(detID);
   SiStripPedestals::Range detPedestalRange = pedestalHandle->getRange(detID);
   SiStripBadStrip::Range detBadStripRange = deadChannelHandle->getRange(detID);
-  numStrips = (det->specificTopology()).nstrips();  
-  
+  numStrips = (det->specificTopology()).nstrips();
+
   //stroing the bad stip of the the module. the module is not removed but just signal put to 0
   std::vector<bool> badChannels;
   badChannels.clear();
-  badChannels.insert(badChannels.begin(),numStrips,false);
+  badChannels.insert(badChannels.begin(), numStrips, false);
   SiStripBadStrip::data fs;
-  for(SiStripBadStrip::ContainerIterator it=detBadStripRange.first;it!=detBadStripRange.second;++it){
-  	fs=deadChannelHandle->decode(*it);
-    for(int strip = fs.firstStrip; strip <fs.firstStrip+fs.range; ++strip )badChannels[strip] = true;
+  for (SiStripBadStrip::ContainerIterator it = detBadStripRange.first; it != detBadStripRange.second; ++it) {
+    fs = deadChannelHandle->decode(*it);
+    for (int strip = fs.firstStrip; strip < fs.firstStrip + fs.range; ++strip)
+      badChannels[strip] = true;
   }
 
-     
   // local amplitude of detector channels (from processed PSimHit)
-//  locAmpl.clear();
+  //  locAmpl.clear();
   detAmpl.clear();
-//  locAmpl.insert(locAmpl.begin(),numStrips,0.);
+  //  locAmpl.insert(locAmpl.begin(),numStrips,0.);
   // total amplitude of detector channels
-  detAmpl.insert(detAmpl.begin(),numStrips,0.);
+  detAmpl.insert(detAmpl.begin(), numStrips, 0.);
 
   firstChannelWithSignal = numStrips;
-  lastChannelWithSignal  = 0;
+  lastChannelWithSignal = 0;
 
   // First: loop on the SimHits
-  std::vector<std::pair<const PSimHit*, int > >::const_iterator simHitIter = input.begin();
-  std::vector<std::pair<const PSimHit*, int > >::const_iterator simHitIterEnd = input.end();
-  if(CLHEP::RandFlat::shoot(engine) > inefficiency) {
-    for (;simHitIter != simHitIterEnd; ++simHitIter) {
+  std::vector<std::pair<const PSimHit*, int> >::const_iterator simHitIter = input.begin();
+  std::vector<std::pair<const PSimHit*, int> >::const_iterator simHitIterEnd = input.end();
+  if (CLHEP::RandFlat::shoot(engine) > inefficiency) {
+    for (; simHitIter != simHitIterEnd; ++simHitIter) {
       locAmpl.clear();
-      locAmpl.insert(locAmpl.begin(),numStrips,0.);
+      locAmpl.insert(locAmpl.begin(), numStrips, 0.);
       // check TOF
-      if ( std::fabs( ((*simHitIter).first)->tof() - cosmicShift - det->surface().toGlobal(((*simHitIter).first)->localPosition()).mag()/30.) < tofCut && ((*simHitIter).first)->energyLoss()>0) {
+      if (std::fabs(((*simHitIter).first)->tof() - cosmicShift -
+                    det->surface().toGlobal(((*simHitIter).first)->localPosition()).mag() / 30.) < tofCut &&
+          ((*simHitIter).first)->energyLoss() > 0) {
         localFirstChannel = numStrips;
-        localLastChannel  = 0;
+        localLastChannel = 0;
         // process the hit
-        theSiHitDigitizer->processHit(((*simHitIter).first),*det,bfield,langle, locAmpl, localFirstChannel, localLastChannel, tTopo, engine);
-          
-		  //APV Killer to simulate HIP effect
-		  //------------------------------------------------------
-		  
-		  if(APVSaturationFromHIP&&!zeroSuppression){
-		    int pdg_id = ((*simHitIter).first)->particleType();
-			particle = pdt->particle(pdg_id);
-			if(particle != nullptr){
-				float charge = particle->charge();
-				bool isHadron = particle->isHadron();
-			    if(charge!=0 && isHadron){
-					if(CLHEP::RandFlat::shoot(engine) < APVSaturationProb){
-			 	   	 	int FirstAPV = localFirstChannel/128;
-				 		int LastAPV = localLastChannel/128;
-						std::cout << "-------------------HIP--------------" << std::endl;
-						std::cout << "Killing APVs " << FirstAPV << " - " <<LastAPV << " " << detID <<std::endl;
-				 		for(int strip = FirstAPV*128; strip < LastAPV*128 +128; ++strip) badChannels[strip] = true; //doing like that I remove the signal information only after the 
-																													//stip that got the HIP but it remains the signal of the previous
-																													//one. I'll make a further loop to remove all signal																										
-						
-			  		}
-				}
-			}
-	      }             
-		
-		
-		theDigiSimLinkPileUpSignals->add(locAmpl, localFirstChannel, localLastChannel, ((*simHitIter).first), (*simHitIter).second);
-    
-		// sum signal on strips
-        for (size_t iChannel=localFirstChannel; iChannel<localLastChannel; iChannel++) {
-          if(locAmpl[iChannel]>0.) {
-		    //if(!badChannels[iChannel]) detAmpl[iChannel]+=locAmpl[iChannel];
-			//locAmpl[iChannel]=0;
-			detAmpl[iChannel]+=locAmpl[iChannel];
-           }
+        theSiHitDigitizer->processHit(
+            ((*simHitIter).first), *det, bfield, langle, locAmpl, localFirstChannel, localLastChannel, tTopo, engine);
+
+        //APV Killer to simulate HIP effect
+        //------------------------------------------------------
+
+        if (APVSaturationFromHIP && !zeroSuppression) {
+          int pdg_id = ((*simHitIter).first)->particleType();
+          particle = pdt->particle(pdg_id);
+          if (particle != nullptr) {
+            float charge = particle->charge();
+            bool isHadron = particle->isHadron();
+            if (charge != 0 && isHadron) {
+              if (CLHEP::RandFlat::shoot(engine) < APVSaturationProb) {
+                int FirstAPV = localFirstChannel / 128;
+                int LastAPV = localLastChannel / 128;
+                std::cout << "-------------------HIP--------------" << std::endl;
+                std::cout << "Killing APVs " << FirstAPV << " - " << LastAPV << " " << detID << std::endl;
+                for (int strip = FirstAPV * 128; strip < LastAPV * 128 + 128; ++strip)
+                  badChannels[strip] = true;  //doing like that I remove the signal information only after the
+                                              //stip that got the HIP but it remains the signal of the previous
+                                              //one. I'll make a further loop to remove all signal
+              }
+            }
+          }
         }
-        if(firstChannelWithSignal>localFirstChannel) firstChannelWithSignal=localFirstChannel;
-        if(lastChannelWithSignal<localLastChannel) lastChannelWithSignal=localLastChannel;
+
+        theDigiSimLinkPileUpSignals->add(
+            locAmpl, localFirstChannel, localLastChannel, ((*simHitIter).first), (*simHitIter).second);
+
+        // sum signal on strips
+        for (size_t iChannel = localFirstChannel; iChannel < localLastChannel; iChannel++) {
+          if (locAmpl[iChannel] > 0.) {
+            //if(!badChannels[iChannel]) detAmpl[iChannel]+=locAmpl[iChannel];
+            //locAmpl[iChannel]=0;
+            detAmpl[iChannel] += locAmpl[iChannel];
+          }
+        }
+        if (firstChannelWithSignal > localFirstChannel)
+          firstChannelWithSignal = localFirstChannel;
+        if (lastChannelWithSignal < localLastChannel)
+          lastChannelWithSignal = localLastChannel;
       }
-	}
+    }
   }
-  
+
   //removing signal from the dead (and HIP effected) strips
-  for(int strip =0; strip < numStrips; ++strip) if(badChannels[strip]) detAmpl[strip] =0;
-  
-  const DigiSimLinkPileUpSignals::HitToDigisMapType& theLink(theDigiSimLinkPileUpSignals->dumpLink());  
-  const DigiSimLinkPileUpSignals::HitCounterToDigisMapType& theCounterLink(theDigiSimLinkPileUpSignals->dumpCounterLink());  
-  
-  if(zeroSuppression){
-    if(noise){
-	  int RefStrip = int(numStrips/2.);
-	  while(RefStrip<numStrips&&badChannels[RefStrip]){ //if the refstrip is bad, I move up to when I don't find it
-	  	RefStrip++;
-	  }
-	  if(RefStrip<numStrips){
-	 	float noiseRMS = noiseHandle->getNoise(RefStrip,detNoiseRange);
-		float gainValue = gainHandle->getStripGain(RefStrip, detGainRange);
-		theSiNoiseAdder->addNoise(detAmpl,firstChannelWithSignal,lastChannelWithSignal,numStrips,noiseRMS*theElectronPerADC/gainValue, engine);
-	  }
-	}
+  for (int strip = 0; strip < numStrips; ++strip)
+    if (badChannels[strip])
+      detAmpl[strip] = 0;
+
+  const DigiSimLinkPileUpSignals::HitToDigisMapType& theLink(theDigiSimLinkPileUpSignals->dumpLink());
+  const DigiSimLinkPileUpSignals::HitCounterToDigisMapType& theCounterLink(
+      theDigiSimLinkPileUpSignals->dumpCounterLink());
+
+  if (zeroSuppression) {
+    if (noise) {
+      int RefStrip = int(numStrips / 2.);
+      while (RefStrip < numStrips &&
+             badChannels[RefStrip]) {  //if the refstrip is bad, I move up to when I don't find it
+        RefStrip++;
+      }
+      if (RefStrip < numStrips) {
+        float noiseRMS = noiseHandle->getNoise(RefStrip, detNoiseRange);
+        float gainValue = gainHandle->getStripGain(RefStrip, detGainRange);
+        theSiNoiseAdder->addNoise(detAmpl,
+                                  firstChannelWithSignal,
+                                  lastChannelWithSignal,
+                                  numStrips,
+                                  noiseRMS * theElectronPerADC / gainValue,
+                                  engine);
+      }
+    }
     digis.clear();
-    theSiZeroSuppress->suppress(theSiDigitalConverter->convert(detAmpl, gainHandle, detID), digis, detID,noiseHandle,thresholdHandle);
-    push_link(digis, theLink, theCounterLink, detAmpl,detID);
+    theSiZeroSuppress->suppress(
+        theSiDigitalConverter->convert(detAmpl, gainHandle, detID), digis, detID, noiseHandle, thresholdHandle);
+    push_link(digis, theLink, theCounterLink, detAmpl, detID);
     outdigi.data = digis;
   }
-  
-  
-  if(!zeroSuppression){
+
+  if (!zeroSuppression) {
     //if(noise){
-      // the constant pedestal offset is needed because
-      //   negative adc counts are not allowed in case
-      //   Pedestal and CMN subtraction is performed.
-      //   The pedestal value read from the conditions
-      //   is pedValue and after the pedestal subtraction
-      //   the baseline is zero. The Common Mode Noise
-      //   is not subtracted from the negative adc counts
-      //   channels. Adding pedOffset the baseline is set
-      //   to pedOffset after pedestal subtraction and CMN
-      //   is subtracted to all the channels since none of
-      //   them has negative adc value. The pedOffset is
-      //   treated as a constant component in the CMN
-      //   estimation and subtracted as CMN.
-      
-         
-		//calculating the charge deposited on each APV and subtracting the shift
-		//------------------------------------------------------
-		if(BaselineShift){
-		   theSiNoiseAdder->addBaselineShift(detAmpl, badChannels);
-		}
-		
-		//Adding the strip noise
-		//------------------------------------------------------						 
-		if(noise){
-		    std::vector<float> noiseRMSv;
-			noiseRMSv.clear();
-		    noiseRMSv.insert(noiseRMSv.begin(),numStrips,0.);
-			
-		    if(SingleStripNoise){
-			    for(int strip=0; strip< numStrips; ++strip){
-			  		if(!badChannels[strip]) noiseRMSv[strip] = (noiseHandle->getNoise(strip,detNoiseRange))* theElectronPerADC;
-			  	}
-			
-	    	} else {
-			    int RefStrip = 0; //int(numStrips/2.);
-		    	    while(RefStrip<numStrips&&badChannels[RefStrip]){ //if the refstrip is bad, I move up to when I don't find it
-					RefStrip++;
-				}
-				if(RefStrip<numStrips){
-					float noiseRMS = noiseHandle->getNoise(RefStrip,detNoiseRange) *theElectronPerADC;
-					for(int strip=0; strip< numStrips; ++strip){
-			       		if(!badChannels[strip]) noiseRMSv[strip] = noiseRMS;
-			  		}
-				}
-			}
-			
-                    theSiNoiseAdder->addNoiseVR(detAmpl, noiseRMSv, engine);
-		}			
-		
-		//adding the CMN
-		//------------------------------------------------------
-        if(CommonModeNoise){
-		  float cmnRMS = 0.;
-		  DetId  detId(detID);
-		  uint32_t SubDet = detId.subdetId();
-		  if(SubDet==3){
-		    cmnRMS = cmnRMStib;
-		  }else if(SubDet==4){
-		    cmnRMS = cmnRMStid;
-		  }else if(SubDet==5){
-		    cmnRMS = cmnRMStob;
-		  }else if(SubDet==6){
-		    cmnRMS = cmnRMStec;
-		  }
-		  cmnRMS *= theElectronPerADC;
-                  theSiNoiseAdder->addCMNoise(detAmpl, cmnRMS, badChannels, engine);
-		}
-		
-        		
-		//Adding the pedestals
-		//------------------------------------------------------
-		
-		std::vector<float> vPeds;
-		vPeds.clear();
-		vPeds.insert(vPeds.begin(),numStrips,0.);
-		
-		if(RealPedestals){
-		    for(int strip=0; strip< numStrips; ++strip){
-			   if(!badChannels[strip]) vPeds[strip] = (pedestalHandle->getPed(strip,detPedestalRange)+pedOffset)* theElectronPerADC;
-		    }
-        } else {
-		    for(int strip=0; strip< numStrips; ++strip){
-			  if(!badChannels[strip]) vPeds[strip] = pedOffset* theElectronPerADC;
-			}
-		}
-		
-		theSiNoiseAdder->addPedestals(detAmpl, vPeds);	
-		
-		 
-	//if(!RealPedestals&&!CommonModeNoise&&!noise&&!BaselineShift&&!APVSaturationFromHIP){
+    // the constant pedestal offset is needed because
+    //   negative adc counts are not allowed in case
+    //   Pedestal and CMN subtraction is performed.
+    //   The pedestal value read from the conditions
+    //   is pedValue and after the pedestal subtraction
+    //   the baseline is zero. The Common Mode Noise
+    //   is not subtracted from the negative adc counts
+    //   channels. Adding pedOffset the baseline is set
+    //   to pedOffset after pedestal subtraction and CMN
+    //   is subtracted to all the channels since none of
+    //   them has negative adc value. The pedOffset is
+    //   treated as a constant component in the CMN
+    //   estimation and subtracted as CMN.
+
+    //calculating the charge deposited on each APV and subtracting the shift
+    //------------------------------------------------------
+    if (BaselineShift) {
+      theSiNoiseAdder->addBaselineShift(detAmpl, badChannels);
+    }
+
+    //Adding the strip noise
+    //------------------------------------------------------
+    if (noise) {
+      std::vector<float> noiseRMSv;
+      noiseRMSv.clear();
+      noiseRMSv.insert(noiseRMSv.begin(), numStrips, 0.);
+
+      if (SingleStripNoise) {
+        for (int strip = 0; strip < numStrips; ++strip) {
+          if (!badChannels[strip])
+            noiseRMSv[strip] = (noiseHandle->getNoise(strip, detNoiseRange)) * theElectronPerADC;
+        }
+
+      } else {
+        int RefStrip = 0;  //int(numStrips/2.);
+        while (RefStrip < numStrips &&
+               badChannels[RefStrip]) {  //if the refstrip is bad, I move up to when I don't find it
+          RefStrip++;
+        }
+        if (RefStrip < numStrips) {
+          float noiseRMS = noiseHandle->getNoise(RefStrip, detNoiseRange) * theElectronPerADC;
+          for (int strip = 0; strip < numStrips; ++strip) {
+            if (!badChannels[strip])
+              noiseRMSv[strip] = noiseRMS;
+          }
+        }
+      }
+
+      theSiNoiseAdder->addNoiseVR(detAmpl, noiseRMSv, engine);
+    }
+
+    //adding the CMN
+    //------------------------------------------------------
+    if (CommonModeNoise) {
+      float cmnRMS = 0.;
+      DetId detId(detID);
+      uint32_t SubDet = detId.subdetId();
+      if (SubDet == 3) {
+        cmnRMS = cmnRMStib;
+      } else if (SubDet == 4) {
+        cmnRMS = cmnRMStid;
+      } else if (SubDet == 5) {
+        cmnRMS = cmnRMStob;
+      } else if (SubDet == 6) {
+        cmnRMS = cmnRMStec;
+      }
+      cmnRMS *= theElectronPerADC;
+      theSiNoiseAdder->addCMNoise(detAmpl, cmnRMS, badChannels, engine);
+    }
+
+    //Adding the pedestals
+    //------------------------------------------------------
+
+    std::vector<float> vPeds;
+    vPeds.clear();
+    vPeds.insert(vPeds.begin(), numStrips, 0.);
+
+    if (RealPedestals) {
+      for (int strip = 0; strip < numStrips; ++strip) {
+        if (!badChannels[strip])
+          vPeds[strip] = (pedestalHandle->getPed(strip, detPedestalRange) + pedOffset) * theElectronPerADC;
+      }
+    } else {
+      for (int strip = 0; strip < numStrips; ++strip) {
+        if (!badChannels[strip])
+          vPeds[strip] = pedOffset * theElectronPerADC;
+      }
+    }
+
+    theSiNoiseAdder->addPedestals(detAmpl, vPeds);
+
+    //if(!RealPedestals&&!CommonModeNoise&&!noise&&!BaselineShift&&!APVSaturationFromHIP){
     //  edm::LogWarning("DigiSimLinkAlgorithm")<<"You are running the digitizer without Noise generation and without applying Zero Suppression. ARE YOU SURE???";
-    //}else{							 
-    
-	rawdigis.clear();
+    //}else{
+
+    rawdigis.clear();
     rawdigis = theSiDigitalConverter->convertRaw(detAmpl, gainHandle, detID);
-    push_link_raw(rawdigis, theLink, theCounterLink, detAmpl,detID);
+    push_link_raw(rawdigis, theLink, theCounterLink, detAmpl, detID);
     outrawdigi.data = rawdigis;
-	
-	//}
+
+    //}
   }
 }
 
-void DigiSimLinkAlgorithm::push_link(const DigitalVecType &digis,
-					  const HitToDigisMapType& htd,
-					  const HitCounterToDigisMapType& hctd,
-					  const std::vector<float>& afterNoise,
-					  unsigned int detID) {
-  link_coll.clear();  
-  for ( DigitalVecType::const_iterator i=digis.begin(); i!=digis.end(); i++) {
+void DigiSimLinkAlgorithm::push_link(const DigitalVecType& digis,
+                                     const HitToDigisMapType& htd,
+                                     const HitCounterToDigisMapType& hctd,
+                                     const std::vector<float>& afterNoise,
+                                     unsigned int detID) {
+  link_coll.clear();
+  for (DigitalVecType::const_iterator i = digis.begin(); i != digis.end(); i++) {
     // Instead of checking the validity of the links against the digis,
     //  let's loop over digis and push the corresponding link
-    HitToDigisMapType::const_iterator mi(htd.find(i->strip()));  
-    if (mi == htd.end()) continue;
-    HitCounterToDigisMapType::const_iterator cmi(hctd.find(i->strip()));  
-    std::map<const PSimHit *, Amplitude> totalAmplitudePerSimHit;
-    for (std::vector < std::pair < const PSimHit*, Amplitude > >::const_iterator simul = 
-	   (*mi).second.begin() ; simul != (*mi).second.end(); simul ++){
+    HitToDigisMapType::const_iterator mi(htd.find(i->strip()));
+    if (mi == htd.end())
+      continue;
+    HitCounterToDigisMapType::const_iterator cmi(hctd.find(i->strip()));
+    std::map<const PSimHit*, Amplitude> totalAmplitudePerSimHit;
+    for (std::vector<std::pair<const PSimHit*, Amplitude> >::const_iterator simul = (*mi).second.begin();
+         simul != (*mi).second.end();
+         simul++) {
       totalAmplitudePerSimHit[(*simul).first] += (*simul).second;
     }
-    
+
     //--- include the noise as well
     double totalAmplitude1 = afterNoise[(*mi).first];
-    
+
     //--- digisimlink
-    int sim_counter=0;
-    for (std::map<const PSimHit *, Amplitude>::const_iterator iter = totalAmplitudePerSimHit.begin(); 
-	 iter != totalAmplitudePerSimHit.end(); iter++){
+    int sim_counter = 0;
+    for (std::map<const PSimHit*, Amplitude>::const_iterator iter = totalAmplitudePerSimHit.begin();
+         iter != totalAmplitudePerSimHit.end();
+         iter++) {
       float threshold = 0.;
-      float fraction = (*iter).second/totalAmplitude1;
+      float fraction = (*iter).second / totalAmplitude1;
       if (fraction >= threshold) {
-	// Noise fluctuation could make fraction>1. Unphysical, set it by hand = 1.
-	if(fraction > 1.) fraction = 1.;
-        for (std::vector<std::pair<const PSimHit*, int > >::const_iterator
-               simcount = (*cmi).second.begin() ; simcount != (*cmi).second.end(); ++simcount){
-          if((*iter).first == (*simcount).first) sim_counter = (*simcount).second;
+        // Noise fluctuation could make fraction>1. Unphysical, set it by hand = 1.
+        if (fraction > 1.)
+          fraction = 1.;
+        for (std::vector<std::pair<const PSimHit*, int> >::const_iterator simcount = (*cmi).second.begin();
+             simcount != (*cmi).second.end();
+             ++simcount) {
+          if ((*iter).first == (*simcount).first)
+            sim_counter = (*simcount).second;
         }
-	link_coll.push_back(StripDigiSimLink( (*mi).first, //channel
-					      ((*iter).first)->trackId(), //simhit trackId
-                                              sim_counter, //simhit counter
-					      ((*iter).first)->eventId(), //simhit eventId
-                                              fraction)); //fraction 
+        link_coll.push_back(StripDigiSimLink((*mi).first,                 //channel
+                                             ((*iter).first)->trackId(),  //simhit trackId
+                                             sim_counter,                 //simhit counter
+                                             ((*iter).first)->eventId(),  //simhit eventId
+                                             fraction));                  //fraction
       }
     }
   }
 }
 
-void DigiSimLinkAlgorithm::push_link_raw(const DigitalRawVecType &digis,
-					      const HitToDigisMapType& htd,
-					      const HitCounterToDigisMapType& hctd,
-					      const std::vector<float>& afterNoise,
-					      unsigned int detID) {
-  link_coll.clear();  
+void DigiSimLinkAlgorithm::push_link_raw(const DigitalRawVecType& digis,
+                                         const HitToDigisMapType& htd,
+                                         const HitCounterToDigisMapType& hctd,
+                                         const std::vector<float>& afterNoise,
+                                         unsigned int detID) {
+  link_coll.clear();
   int nstrip = -1;
-  for ( DigitalRawVecType::const_iterator i=digis.begin(); i!=digis.end(); i++) {
+  for (DigitalRawVecType::const_iterator i = digis.begin(); i != digis.end(); i++) {
     nstrip++;
     // Instead of checking the validity of the links against the digis,
     //  let's loop over digis and push the corresponding link
-    HitToDigisMapType::const_iterator mi(htd.find(nstrip));  
-    HitCounterToDigisMapType::const_iterator cmi(hctd.find(nstrip));  
-    if (mi == htd.end()) continue;
-    std::map<const PSimHit *, Amplitude> totalAmplitudePerSimHit;
-    for (std::vector < std::pair < const PSimHit*, Amplitude > >::const_iterator simul = 
-	   (*mi).second.begin() ; simul != (*mi).second.end(); simul ++){
+    HitToDigisMapType::const_iterator mi(htd.find(nstrip));
+    HitCounterToDigisMapType::const_iterator cmi(hctd.find(nstrip));
+    if (mi == htd.end())
+      continue;
+    std::map<const PSimHit*, Amplitude> totalAmplitudePerSimHit;
+    for (std::vector<std::pair<const PSimHit*, Amplitude> >::const_iterator simul = (*mi).second.begin();
+         simul != (*mi).second.end();
+         simul++) {
       totalAmplitudePerSimHit[(*simul).first] += (*simul).second;
     }
-    
+
     //--- include the noise as well
     double totalAmplitude1 = afterNoise[(*mi).first];
-    
+
     //--- digisimlink
-    int sim_counter_raw=0;
-    for (std::map<const PSimHit *, Amplitude>::const_iterator iter = totalAmplitudePerSimHit.begin(); 
-	 iter != totalAmplitudePerSimHit.end(); iter++){
+    int sim_counter_raw = 0;
+    for (std::map<const PSimHit*, Amplitude>::const_iterator iter = totalAmplitudePerSimHit.begin();
+         iter != totalAmplitudePerSimHit.end();
+         iter++) {
       float threshold = 0.;
-      float fraction = (*iter).second/totalAmplitude1;
+      float fraction = (*iter).second / totalAmplitude1;
       if (fraction >= threshold) {
-	//Noise fluctuation could make fraction>1. Unphysical, set it by hand.
-	if(fraction >1.) fraction = 1.;
+        //Noise fluctuation could make fraction>1. Unphysical, set it by hand.
+        if (fraction > 1.)
+          fraction = 1.;
         //add counter information
-        for (std::vector<std::pair<const PSimHit*, int > >::const_iterator
-               simcount = (*cmi).second.begin() ; simcount != (*cmi).second.end(); ++simcount){
-          if((*iter).first == (*simcount).first) sim_counter_raw = (*simcount).second;
+        for (std::vector<std::pair<const PSimHit*, int> >::const_iterator simcount = (*cmi).second.begin();
+             simcount != (*cmi).second.end();
+             ++simcount) {
+          if ((*iter).first == (*simcount).first)
+            sim_counter_raw = (*simcount).second;
         }
-	link_coll.push_back(StripDigiSimLink( (*mi).first, //channel
-					      ((*iter).first)->trackId(), //simhit trackId
-                                              sim_counter_raw, //simhit counter
-					      ((*iter).first)->eventId(), //simhit eventId
-                                              fraction)); //fraction
+        link_coll.push_back(StripDigiSimLink((*mi).first,                 //channel
+                                             ((*iter).first)->trackId(),  //simhit trackId
+                                             sim_counter_raw,             //simhit counter
+                                             ((*iter).first)->eventId(),  //simhit eventId
+                                             fraction));                  //fraction
       }
     }
   }
diff --git a/SimTracker/SiStripDigitizer/plugins/DigiSimLinkAlgorithm.h b/SimTracker/SiStripDigitizer/plugins/DigiSimLinkAlgorithm.h
index c8d1766a08cc3..d027b0036b9a9 100644
--- a/SimTracker/SiStripDigitizer/plugins/DigiSimLinkAlgorithm.h
+++ b/SimTracker/SiStripDigitizer/plugins/DigiSimLinkAlgorithm.h
@@ -39,39 +39,45 @@ namespace CLHEP {
 class TrackerTopolgoy;
 
 class DigiSimLinkAlgorithm {
- public:
+public:
   typedef SiDigitalConverter::DigitalVecType DigitalVecType;
   typedef SiDigitalConverter::DigitalRawVecType DigitalRawVecType;
   typedef DigiSimLinkPileUpSignals::HitToDigisMapType HitToDigisMapType;
   typedef DigiSimLinkPileUpSignals::HitCounterToDigisMapType HitCounterToDigisMapType;
-  typedef std::map< int, float, std::less<int> > hit_map_type;
+  typedef std::map<int, float, std::less<int> > hit_map_type;
   typedef float Amplitude;
-  
+
   // Constructor
-  DigiSimLinkAlgorithm(const edm::ParameterSet& conf);
+  DigiSimLinkAlgorithm(const edm::ParameterSet &conf);
 
   // Destructor
   ~DigiSimLinkAlgorithm();
 
   // Runs the algorithm
-  void  run(edm::DetSet<SiStripDigi>&, edm::DetSet<SiStripRawDigi>&,
-            const std::vector<std::pair<const PSimHit*, int > >  &, 
-            StripGeomDetUnit const *, GlobalVector, float, 
-            edm::ESHandle<SiStripGain> &, edm::ESHandle<SiStripThreshold> &, 
-            edm::ESHandle<SiStripNoises> &, edm::ESHandle<SiStripPedestals> &, edm::ESHandle<SiStripBadStrip> &,
-	    const TrackerTopology *tTopo,
-            CLHEP::HepRandomEngine*);
+  void run(edm::DetSet<SiStripDigi> &,
+           edm::DetSet<SiStripRawDigi> &,
+           const std::vector<std::pair<const PSimHit *, int> > &,
+           StripGeomDetUnit const *,
+           GlobalVector,
+           float,
+           edm::ESHandle<SiStripGain> &,
+           edm::ESHandle<SiStripThreshold> &,
+           edm::ESHandle<SiStripNoises> &,
+           edm::ESHandle<SiStripPedestals> &,
+           edm::ESHandle<SiStripBadStrip> &,
+           const TrackerTopology *tTopo,
+           CLHEP::HepRandomEngine *);
 
   // digisimlink
   std::vector<StripDigiSimLink> make_link() { return link_coll; }
 
   // ParticleDataTable
-  void setParticleDataTable(const ParticleDataTable * pardt) {
-  	theSiHitDigitizer->setParticleDataTable(pardt); 
-  	pdt= pardt; 
+  void setParticleDataTable(const ParticleDataTable *pardt) {
+    theSiHitDigitizer->setParticleDataTable(pardt);
+    pdt = pardt;
   }
-  
- private:
+
+private:
   edm::ParameterSet conf_;
   double theElectronPerADC;
   double theThreshold;
@@ -79,22 +85,22 @@ class DigiSimLinkAlgorithm {
   double cmnRMStob;
   double cmnRMStid;
   double cmnRMStec;
-  double APVSaturationProb;          
+  double APVSaturationProb;
   bool peakMode;
   bool noise;
-  bool RealPedestals;              
-  bool SingleStripNoise;          
-  bool CommonModeNoise;           
-  bool BaselineShift;             
+  bool RealPedestals;
+  bool SingleStripNoise;
+  bool CommonModeNoise;
+  bool BaselineShift;
   bool APVSaturationFromHIP;
-  
+
   int theFedAlgo;
   bool zeroSuppression;
   double theTOFCutForPeak;
   double theTOFCutForDeconvolution;
   double tofCut;
-  int numStrips; 
-  int strip;     
+  int numStrips;
+  int strip;
   //double noiseRMS;
   //double pedValue;
   double cosmicShift;
@@ -102,7 +108,6 @@ class DigiSimLinkAlgorithm {
   double pedOffset;
   bool PreMixing_;
 
-
   size_t firstChannelWithSignal;
   size_t lastChannelWithSignal;
   size_t localFirstChannel;
@@ -113,30 +118,30 @@ class DigiSimLinkAlgorithm {
   // total amplitude of detector channels
   std::vector<float> detAmpl;
 
-  const ParticleDataTable * pdt;
-  const ParticleData * particle;
-  
-  SiHitDigitizer* theSiHitDigitizer;
-  DigiSimLinkPileUpSignals* theDigiSimLinkPileUpSignals;
-  SiGaussianTailNoiseAdder* theSiNoiseAdder;
-  SiTrivialDigitalConverter* theSiDigitalConverter;
-  SiStripFedZeroSuppression* theSiZeroSuppress;
+  const ParticleDataTable *pdt;
+  const ParticleData *particle;
+
+  SiHitDigitizer *theSiHitDigitizer;
+  DigiSimLinkPileUpSignals *theDigiSimLinkPileUpSignals;
+  SiGaussianTailNoiseAdder *theSiNoiseAdder;
+  SiTrivialDigitalConverter *theSiDigitalConverter;
+  SiStripFedZeroSuppression *theSiZeroSuppress;
 
   DigitalVecType digis;
   DigitalRawVecType rawdigis;
   std::vector<StripDigiSimLink> link_coll;
 
-  void push_link(const DigitalVecType&,
-		 const HitToDigisMapType&,
-		 const HitCounterToDigisMapType&,
-		 const std::vector<float>&,
-		 unsigned int);
-  
-  void push_link_raw(const DigitalRawVecType&,
-		     const HitToDigisMapType&,
-		     const HitCounterToDigisMapType&,
-		     const std::vector<float>&,
-		     unsigned int);
+  void push_link(const DigitalVecType &,
+                 const HitToDigisMapType &,
+                 const HitCounterToDigisMapType &,
+                 const std::vector<float> &,
+                 unsigned int);
+
+  void push_link_raw(const DigitalRawVecType &,
+                     const HitToDigisMapType &,
+                     const HitCounterToDigisMapType &,
+                     const std::vector<float> &,
+                     unsigned int);
 };
 
 #endif
diff --git a/SimTracker/SiStripDigitizer/plugins/DigiSimLinkPileUpSignals.cc b/SimTracker/SiStripDigitizer/plugins/DigiSimLinkPileUpSignals.cc
index 90523bf65fa16..72434a5d3ea43 100644
--- a/SimTracker/SiStripDigitizer/plugins/DigiSimLinkPileUpSignals.cc
+++ b/SimTracker/SiStripDigitizer/plugins/DigiSimLinkPileUpSignals.cc
@@ -1,17 +1,18 @@
 #include "DigiSimLinkPileUpSignals.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 
-void DigiSimLinkPileUpSignals::resetLink(){
+void DigiSimLinkPileUpSignals::resetLink() {
   theMapLink.clear();
   theCounterMapLink.clear();
 }
 
 void DigiSimLinkPileUpSignals::add(const std::vector<float>& locAmpl,
-			  const size_t& firstChannelWithSignal, const size_t& lastChannelWithSignal,
-			  const PSimHit* hit,const int& counter){
-  for (size_t iChannel=firstChannelWithSignal; iChannel<lastChannelWithSignal; ++iChannel) {
-    theMapLink[iChannel].push_back(std::pair < const PSimHit*, Amplitude >(hit,Amplitude(locAmpl[iChannel])));
+                                   const size_t& firstChannelWithSignal,
+                                   const size_t& lastChannelWithSignal,
+                                   const PSimHit* hit,
+                                   const int& counter) {
+  for (size_t iChannel = firstChannelWithSignal; iChannel < lastChannelWithSignal; ++iChannel) {
+    theMapLink[iChannel].push_back(std::pair<const PSimHit*, Amplitude>(hit, Amplitude(locAmpl[iChannel])));
     theCounterMapLink[iChannel].push_back(std::make_pair(hit, counter));
   }
 }
-
diff --git a/SimTracker/SiStripDigitizer/plugins/DigiSimLinkPileUpSignals.h b/SimTracker/SiStripDigitizer/plugins/DigiSimLinkPileUpSignals.h
index 8f773d5cdf019..f860c7660deba 100644
--- a/SimTracker/SiStripDigitizer/plugins/DigiSimLinkPileUpSignals.h
+++ b/SimTracker/SiStripDigitizer/plugins/DigiSimLinkPileUpSignals.h
@@ -10,32 +10,34 @@ class SimHit;
  * Class which takes the responses from each SimHit and piles-up them, within a given module.
  * More precisely, it keeps for each strip the link to each individual measurement.
  */
-class DigiSimLinkPileUpSignals{ 
- public:
+class DigiSimLinkPileUpSignals {
+public:
   // type used to describe the amplitude on a strip
   typedef float Amplitude;
-  // associates to each strip a vector of pairs {simhit,amplitude}. 
+  // associates to each strip a vector of pairs {simhit,amplitude}.
   // That allows later to comput the fraction of the contribution of each simhit to the ADC value
-  typedef std::map< int , std::vector < std::pair < const PSimHit*, Amplitude > >, std::less<int> >  HitToDigisMapType;
+  typedef std::map<int, std::vector<std::pair<const PSimHit*, Amplitude> >, std::less<int> > HitToDigisMapType;
   // associates to each strip a vector of pairs {simhit,index_in_the_allhit_collection}
   // That allows to build the links properly
-  typedef std::map< int , std::vector < std::pair < const PSimHit*, int > >, std::less<int> >  HitCounterToDigisMapType;
-  
+  typedef std::map<int, std::vector<std::pair<const PSimHit*, int> >, std::less<int> > HitCounterToDigisMapType;
+
   DigiSimLinkPileUpSignals() { reset(); }
 
-  virtual ~DigiSimLinkPileUpSignals() { }
-  
+  virtual ~DigiSimLinkPileUpSignals() {}
+
   virtual void add(const std::vector<float>& locAmpl,
-		   const size_t& firstChannelWithSignal, const size_t& lastChannelWithSignal,
-		   const PSimHit* hit,const int& counter);
-		   
-  void reset(){ resetLink(); }
-  
+                   const size_t& firstChannelWithSignal,
+                   const size_t& lastChannelWithSignal,
+                   const PSimHit* hit,
+                   const int& counter);
+
+  void reset() { resetLink(); }
+
   const HitToDigisMapType& dumpLink() const { return theMapLink; }
-  
+
   const HitCounterToDigisMapType& dumpCounterLink() const { return theCounterMapLink; }
-  
- private:
+
+private:
   void resetLink();
   HitToDigisMapType theMapLink;
   HitCounterToDigisMapType theCounterMapLink;
diff --git a/SimTracker/SiStripDigitizer/plugins/EnergyDepositUnit.h b/SimTracker/SiStripDigitizer/plugins/EnergyDepositUnit.h
index 7b89df4bb1a28..499dfe17a8ff3 100644
--- a/SimTracker/SiStripDigitizer/plugins/EnergyDepositUnit.h
+++ b/SimTracker/SiStripDigitizer/plugins/EnergyDepositUnit.h
@@ -7,21 +7,19 @@
  * Class which allows to "follow" an elementary charge in the silicon.
  * It basically defines a quantum of energy in the bulk, with a 3D position.
  */
-class EnergyDepositUnit{
- public:
-  EnergyDepositUnit(): _energy(0),_position(0,0,0){}
-  EnergyDepositUnit(float energy,float x, float y, float z):
-    _energy(energy),_position(x,y,z){}
-  EnergyDepositUnit(float energy, const Local3DPoint& position):
-    _energy(energy),_position(position){}
-  float x() const{return _position.x();}
-  float y() const{return _position.y();}
-  float z() const{return _position.z();}
-  float energy() const { return _energy;}
- private:
+class EnergyDepositUnit {
+public:
+  EnergyDepositUnit() : _energy(0), _position(0, 0, 0) {}
+  EnergyDepositUnit(float energy, float x, float y, float z) : _energy(energy), _position(x, y, z) {}
+  EnergyDepositUnit(float energy, const Local3DPoint& position) : _energy(energy), _position(position) {}
+  float x() const { return _position.x(); }
+  float y() const { return _position.y(); }
+  float z() const { return _position.z(); }
+  float energy() const { return _energy; }
+
+private:
   float _energy;
-  Local3DPoint _position;  
+  Local3DPoint _position;
 };
 
-
 #endif
diff --git a/SimTracker/SiStripDigitizer/plugins/PreMixingSiStripWorker.cc b/SimTracker/SiStripDigitizer/plugins/PreMixingSiStripWorker.cc
index e6d9591f99d92..8c89bfb12de27 100644
--- a/SimTracker/SiStripDigitizer/plugins/PreMixingSiStripWorker.cc
+++ b/SimTracker/SiStripDigitizer/plugins/PreMixingSiStripWorker.cc
@@ -39,38 +39,37 @@
 #include <map>
 #include <memory>
 
-class PreMixingSiStripWorker: public PreMixingWorker {
+class PreMixingSiStripWorker : public PreMixingWorker {
 public:
-  PreMixingSiStripWorker(const edm::ParameterSet& ps, edm::ProducerBase& producer, edm::ConsumesCollector && iC);
+  PreMixingSiStripWorker(const edm::ParameterSet& ps, edm::ProducerBase& producer, edm::ConsumesCollector&& iC);
   ~PreMixingSiStripWorker() override = default;
 
   void initializeEvent(edm::Event const& e, edm::EventSetup const& c) override;
   void addSignals(edm::Event const& e, edm::EventSetup const& es) override;
   void addPileups(PileUpEventPrincipal const& pep, edm::EventSetup const& es) override;
-  void put(edm::Event &e, edm::EventSetup const& iSetup, std::vector<PileupSummaryInfo> const& ps, int bs) override;
+  void put(edm::Event& e, edm::EventSetup const& iSetup, std::vector<PileupSummaryInfo> const& ps, int bs) override;
 
 private:
-  void DMinitializeDetUnit(StripGeomDetUnit const * det, const edm::EventSetup& iSetup );
+  void DMinitializeDetUnit(StripGeomDetUnit const* det, const edm::EventSetup& iSetup);
 
   // data specifiers
 
-  edm::InputTag SistripLabelSig_ ;        // name given to collection of SiStrip digis
-  edm::InputTag SiStripPileInputTag_ ;    // InputTag for pileup strips
-  std::string SiStripDigiCollectionDM_  ; // secondary name to be given to new SiStrip digis
+  edm::InputTag SistripLabelSig_;        // name given to collection of SiStrip digis
+  edm::InputTag SiStripPileInputTag_;    // InputTag for pileup strips
+  std::string SiStripDigiCollectionDM_;  // secondary name to be given to new SiStrip digis
 
-  edm::InputTag SistripAPVLabelSig_;      // where to find vector of dead APVs
+  edm::InputTag SistripAPVLabelSig_;  // where to find vector of dead APVs
   edm::InputTag SiStripAPVPileInputTag_;
-  std::string SistripAPVListDM_;          // output tag
+  std::string SistripAPVListDM_;  // output tag
 
-
-  // 
+  //
 
   typedef float Amplitude;
   typedef std::pair<uint16_t, Amplitude> RawDigi;  // Replacement for SiStripDigi with pulse height instead of integer ADC
-  typedef std::vector<SiStripDigi> OneDetectorMap;   // maps by strip ID for later combination - can have duplicate strips
-  typedef std::vector<RawDigi> OneDetectorRawMap;   // maps by strip ID for later combination - can have duplicate strips
-  typedef std::map<uint32_t, OneDetectorMap> SiGlobalIndex; // map to all data for each detector ID
-  typedef std::map<uint32_t, OneDetectorRawMap> SiGlobalRawIndex; // map to all data for each detector ID
+  typedef std::vector<SiStripDigi> OneDetectorMap;  // maps by strip ID for later combination - can have duplicate strips
+  typedef std::vector<RawDigi> OneDetectorRawMap;  // maps by strip ID for later combination - can have duplicate strips
+  typedef std::map<uint32_t, OneDetectorMap> SiGlobalIndex;        // map to all data for each detector ID
+  typedef std::map<uint32_t, OneDetectorRawMap> SiGlobalRawIndex;  // map to all data for each detector ID
 
   typedef SiDigitalConverter::DigitalVecType DigitalVecType;
 
@@ -78,12 +77,12 @@ class PreMixingSiStripWorker: public PreMixingWorker {
   SiGlobalRawIndex SiRawDigis_;
 
   // variables for temporary storage of mixed hits:
-  typedef std::map<int, Amplitude>  SignalMapType;
-  typedef std::map<uint32_t, SignalMapType>  signalMaps;
+  typedef std::map<int, Amplitude> SignalMapType;
+  typedef std::map<uint32_t, SignalMapType> signalMaps;
 
   const SignalMapType* getSignal(uint32_t detID) const {
     auto where = signals_.find(detID);
-    if(where == signals_.end()) {
+    if (where == signals_.end()) {
       return nullptr;
     }
     return &where->second;
@@ -92,7 +91,7 @@ class PreMixingSiStripWorker: public PreMixingWorker {
   signalMaps signals_;
 
   // to keep track of dead APVs from HIP interactions
-  typedef std::multimap< uint32_t, std::bitset<6> > APVMap;
+  typedef std::multimap<uint32_t, std::bitset<6>> APVMap;
 
   APVMap theAffectedAPVmap_;
 
@@ -114,84 +113,81 @@ class PreMixingSiStripWorker: public PreMixingWorker {
   edm::ESHandle<TrackerGeometry> pDD;
 
   // bad channels for each detector ID
-  std::map<unsigned int, std::vector<bool> > allBadChannels;
+  std::map<unsigned int, std::vector<bool>> allBadChannels;
   // channels killed by HIP interactions for each detector ID
-  std::map<unsigned int, std::vector<bool> > allHIPChannels;
+  std::map<unsigned int, std::vector<bool>> allHIPChannels;
   // first and last channel wit signal for each detector ID
   std::map<unsigned int, size_t> firstChannelsWithSignal;
   std::map<unsigned int, size_t> lastChannelsWithSignal;
 
   //----------------------------
 
-  class StrictWeakOrdering{
+  class StrictWeakOrdering {
   public:
-    bool operator() (SiStripDigi i,SiStripDigi j) const {return i.strip() < j.strip();}
+    bool operator()(SiStripDigi i, SiStripDigi j) const { return i.strip() < j.strip(); }
   };
 
-  class StrictWeakRawOrdering{
+  class StrictWeakRawOrdering {
   public:
-    bool operator() (RawDigi i,RawDigi j) const {return i.first < j.first;}
+    bool operator()(RawDigi i, RawDigi j) const { return i.first < j.first; }
   };
-
 };
 
-PreMixingSiStripWorker::PreMixingSiStripWorker(const edm::ParameterSet& ps, edm::ProducerBase& producer, edm::ConsumesCollector && iC): 
-  gainLabel(ps.getParameter<std::string>("Gain")),
-  SingleStripNoise(ps.getParameter<bool>("SingleStripNoise")),
-  peakMode(ps.getParameter<bool>("APVpeakmode")),
-  theThreshold(ps.getParameter<double>("NoiseSigmaThreshold")),
-  theElectronPerADC(ps.getParameter<double>( peakMode ? "electronPerAdcPeak" : "electronPerAdcDec" )),
-  APVSaturationFromHIP_(ps.getParameter<bool>("APVSaturationFromHIP")),
-  theFedAlgo(ps.getParameter<int>("FedAlgorithm_PM")),
-  geometryType(ps.getParameter<std::string>("GeometryType")),
-  theSiZeroSuppress(new SiStripFedZeroSuppression(theFedAlgo)),
-  theSiDigitalConverter(new SiTrivialDigitalConverter(theElectronPerADC, false)) // no premixing
-
-{                                                         
+PreMixingSiStripWorker::PreMixingSiStripWorker(const edm::ParameterSet& ps,
+                                               edm::ProducerBase& producer,
+                                               edm::ConsumesCollector&& iC)
+    : gainLabel(ps.getParameter<std::string>("Gain")),
+      SingleStripNoise(ps.getParameter<bool>("SingleStripNoise")),
+      peakMode(ps.getParameter<bool>("APVpeakmode")),
+      theThreshold(ps.getParameter<double>("NoiseSigmaThreshold")),
+      theElectronPerADC(ps.getParameter<double>(peakMode ? "electronPerAdcPeak" : "electronPerAdcDec")),
+      APVSaturationFromHIP_(ps.getParameter<bool>("APVSaturationFromHIP")),
+      theFedAlgo(ps.getParameter<int>("FedAlgorithm_PM")),
+      geometryType(ps.getParameter<std::string>("GeometryType")),
+      theSiZeroSuppress(new SiStripFedZeroSuppression(theFedAlgo)),
+      theSiDigitalConverter(new SiTrivialDigitalConverter(theElectronPerADC, false))  // no premixing
+
+{
   // declare the products to produce
 
-  SistripLabelSig_   = ps.getParameter<edm::InputTag>("SistripLabelSig");
+  SistripLabelSig_ = ps.getParameter<edm::InputTag>("SistripLabelSig");
   SiStripPileInputTag_ = ps.getParameter<edm::InputTag>("SiStripPileInputTag");
 
-  SiStripDigiCollectionDM_  = ps.getParameter<std::string>("SiStripDigiCollectionDM");
-  SistripAPVListDM_= ps.getParameter<std::string>("SiStripAPVListDM");
+  SiStripDigiCollectionDM_ = ps.getParameter<std::string>("SiStripDigiCollectionDM");
+  SistripAPVListDM_ = ps.getParameter<std::string>("SiStripAPVListDM");
 
-  producer.produces< edm::DetSetVector<SiStripDigi> > (SiStripDigiCollectionDM_);
+  producer.produces<edm::DetSetVector<SiStripDigi>>(SiStripDigiCollectionDM_);
 
-  if(APVSaturationFromHIP_) { 
+  if (APVSaturationFromHIP_) {
     SistripAPVLabelSig_ = ps.getParameter<edm::InputTag>("SistripAPVLabelSig");
     SiStripAPVPileInputTag_ = ps.getParameter<edm::InputTag>("SistripAPVPileInputTag");
-    iC.consumes< std::vector<std::pair<int,std::bitset<6>> > >(SistripAPVLabelSig_);
+    iC.consumes<std::vector<std::pair<int, std::bitset<6>>>>(SistripAPVLabelSig_);
   }
   iC.consumes<edm::DetSetVector<SiStripDigi>>(SistripLabelSig_);
-  // clear local storage for this event                                                                     
+  // clear local storage for this event
   SiHitStorage_.clear();
 
   edm::Service<edm::RandomNumberGenerator> rng;
-  if ( ! rng.isAvailable()) {
-    throw cms::Exception("Psiguration")
-      << "SiStripDigitizer requires the RandomNumberGeneratorService\n"
-      "which is not present in the psiguration file.  You must add the service\n"
-      "in the configuration file or remove the modules that require it.";
+  if (!rng.isAvailable()) {
+    throw cms::Exception("Psiguration") << "SiStripDigitizer requires the RandomNumberGeneratorService\n"
+                                           "which is not present in the psiguration file.  You must add the service\n"
+                                           "in the configuration file or remove the modules that require it.";
   }
-  
+
   theSiNoiseAdder.reset(new SiGaussianTailNoiseAdder(theThreshold));
 }
-	       
-void PreMixingSiStripWorker::initializeEvent(const edm::Event &e, edm::EventSetup const& iSetup) {
+
+void PreMixingSiStripWorker::initializeEvent(const edm::Event& e, edm::EventSetup const& iSetup) {
   // initialize individual detectors so we can copy real digitization code:
 
-  iSetup.get<TrackerDigiGeometryRecord>().get(geometryType,pDD);
+  iSetup.get<TrackerDigiGeometryRecord>().get(geometryType, pDD);
 
-  for(auto iu = pDD->detUnits().begin(); iu != pDD->detUnits().end(); ++iu) {
+  for (auto iu = pDD->detUnits().begin(); iu != pDD->detUnits().end(); ++iu) {
     unsigned int detId = (*iu)->geographicalId().rawId();
-    DetId idet=DetId(detId);
-    unsigned int isub=idet.subdetId();
-    if((isub == StripSubdetector::TIB) ||
-       (isub == StripSubdetector::TID) ||
-       (isub == StripSubdetector::TOB) ||
-       (isub == StripSubdetector::TEC)) {
-
+    DetId idet = DetId(detId);
+    unsigned int isub = idet.subdetId();
+    if ((isub == StripSubdetector::TIB) || (isub == StripSubdetector::TID) || (isub == StripSubdetector::TOB) ||
+        (isub == StripSubdetector::TEC)) {
       auto stripdet = dynamic_cast<StripGeomDetUnit const*>((*iu));
       assert(stripdet != nullptr);
       DMinitializeDetUnit(stripdet, iSetup);
@@ -199,14 +195,12 @@ void PreMixingSiStripWorker::initializeEvent(const edm::Event &e, edm::EventSetu
   }
 }
 
-
-void PreMixingSiStripWorker::DMinitializeDetUnit(StripGeomDetUnit const * det, const edm::EventSetup& iSetup ) { 
-
+void PreMixingSiStripWorker::DMinitializeDetUnit(StripGeomDetUnit const* det, const edm::EventSetup& iSetup) {
   edm::ESHandle<SiStripBadStrip> deadChannelHandle;
   iSetup.get<SiStripBadChannelRcd>().get(deadChannelHandle);
 
   unsigned int detId = det->geographicalId().rawId();
-  int numStrips = (det->specificTopology()).nstrips();  
+  int numStrips = (det->specificTopology()).nstrips();
 
   SiStripBadStrip::Range detBadStripRange = deadChannelHandle->getRange(detId);
   //storing the bad strip of the the module. the module is not removed but just signal put to 0
@@ -217,38 +211,36 @@ void PreMixingSiStripWorker::DMinitializeDetUnit(StripGeomDetUnit const * det, c
   hipChannels.clear();
   hipChannels.insert(hipChannels.begin(), numStrips, false);
 
-  for(SiStripBadStrip::ContainerIterator it = detBadStripRange.first; it != detBadStripRange.second; ++it) {
+  for (SiStripBadStrip::ContainerIterator it = detBadStripRange.first; it != detBadStripRange.second; ++it) {
     SiStripBadStrip::data fs = deadChannelHandle->decode(*it);
-    for(int strip = fs.firstStrip; strip < fs.firstStrip + fs.range; ++strip) badChannels[strip] = true;
+    for (int strip = fs.firstStrip; strip < fs.firstStrip + fs.range; ++strip)
+      badChannels[strip] = true;
   }
   firstChannelsWithSignal[detId] = numStrips;
-  lastChannelsWithSignal[detId]= 0;
+  lastChannelsWithSignal[detId] = 0;
 }
 
-
-void PreMixingSiStripWorker::addSignals(const edm::Event &e, edm::EventSetup const& es) { 
+void PreMixingSiStripWorker::addSignals(const edm::Event& e, edm::EventSetup const& es) {
   // fill in maps of hits
 
-  edm::Handle< edm::DetSetVector<SiStripDigi> >  input;
+  edm::Handle<edm::DetSetVector<SiStripDigi>> input;
 
-  if( e.getByLabel(SistripLabelSig_,input) ) {
+  if (e.getByLabel(SistripLabelSig_, input)) {
     OneDetectorMap LocalMap;
 
     //loop on all detsets (detectorIDs) inside the input collection
-    edm::DetSetVector<SiStripDigi>::const_iterator DSViter=input->begin();
-    for (; DSViter!=input->end();DSViter++){
-
+    edm::DetSetVector<SiStripDigi>::const_iterator DSViter = input->begin();
+    for (; DSViter != input->end(); DSViter++) {
 #ifdef DEBUG
-      LogDebug("PreMixingSiStripWorker")  << "Processing DetID " << DSViter->id;
+      LogDebug("PreMixingSiStripWorker") << "Processing DetID " << DSViter->id;
 #endif
 
       LocalMap.clear();
       LocalMap.reserve((DSViter->data).size());
-      LocalMap.insert(LocalMap.end(),(DSViter->data).begin(),(DSViter->data).end());	
-	
-      SiHitStorage_.insert( SiGlobalIndex::value_type( DSViter->id, LocalMap ) );
+      LocalMap.insert(LocalMap.end(), (DSViter->data).begin(), (DSViter->data).end());
+
+      SiHitStorage_.insert(SiGlobalIndex::value_type(DSViter->id, LocalMap));
     }
- 
   }
 
   // keep here for future reference.  In current implementation, HIP killing is done once in PU file
@@ -264,29 +256,27 @@ void PreMixingSiStripWorker::addSignals(const edm::Event &e, edm::EventSetup con
       }
       } */
 
-} // end of addSiStripSignals
-
-
+}  // end of addSiStripSignals
 
 void PreMixingSiStripWorker::addPileups(PileUpEventPrincipal const& pep, edm::EventSetup const& es) {
-  LogDebug("PreMixingSiStripWorker") <<"\n===============> adding pileups from event  "<<pep.principal().id()<<" for bunchcrossing "<<pep.bunchCrossing();
+  LogDebug("PreMixingSiStripWorker") << "\n===============> adding pileups from event  " << pep.principal().id()
+                                     << " for bunchcrossing " << pep.bunchCrossing();
 
   // fill in maps of hits; same code as addSignals, except now applied to the pileup events
 
   edm::Handle<edm::DetSetVector<SiStripDigi>> inputHandle;
   pep.getByLabel(SiStripPileInputTag_, inputHandle);
 
-  if(inputHandle.isValid()) {
+  if (inputHandle.isValid()) {
     const auto& input = *inputHandle;
 
     OneDetectorMap LocalMap;
 
     //loop on all detsets (detectorIDs) inside the input collection
-    edm::DetSetVector<SiStripDigi>::const_iterator DSViter=input.begin();
-    for (; DSViter!=input.end();DSViter++){
-
+    edm::DetSetVector<SiStripDigi>::const_iterator DSViter = input.begin();
+    for (; DSViter != input.end(); DSViter++) {
 #ifdef DEBUG
-      LogDebug("PreMixingSiStripWorker")  << "Pileups: Processing DetID " << DSViter->id;
+      LogDebug("PreMixingSiStripWorker") << "Pileups: Processing DetID " << DSViter->id;
 #endif
 
       // find correct local map (or new one) for this detector ID
@@ -295,54 +285,52 @@ void PreMixingSiStripWorker::addPileups(PileUpEventPrincipal const& pep, edm::Ev
 
       itest = SiHitStorage_.find(DSViter->id);
 
-      if(itest!=SiHitStorage_.end()) {  // this detID already has hits, add to existing map
+      if (itest != SiHitStorage_.end()) {  // this detID already has hits, add to existing map
 
         LocalMap = itest->second;
 
         // fill in local map with extra channels
-        LocalMap.insert(LocalMap.end(),(DSViter->data).begin(),(DSViter->data).end());
-        std::stable_sort(LocalMap.begin(),LocalMap.end(),PreMixingSiStripWorker::StrictWeakOrdering());
-        SiHitStorage_[DSViter->id]=LocalMap;
-	  
-      }
-      else{ // fill local storage with this information, put in global collection
+        LocalMap.insert(LocalMap.end(), (DSViter->data).begin(), (DSViter->data).end());
+        std::stable_sort(LocalMap.begin(), LocalMap.end(), PreMixingSiStripWorker::StrictWeakOrdering());
+        SiHitStorage_[DSViter->id] = LocalMap;
+
+      } else {  // fill local storage with this information, put in global collection
 
         LocalMap.clear();
         LocalMap.reserve((DSViter->data).size());
-        LocalMap.insert(LocalMap.end(),(DSViter->data).begin(),(DSViter->data).end());
+        LocalMap.insert(LocalMap.end(), (DSViter->data).begin(), (DSViter->data).end());
 
-        SiHitStorage_.insert( SiGlobalIndex::value_type( DSViter->id, LocalMap ) );
+        SiHitStorage_.insert(SiGlobalIndex::value_type(DSViter->id, LocalMap));
       }
     }
 
-    if(APVSaturationFromHIP_) {
-      edm::Handle<std::vector<std::pair<int,std::bitset<6>>>> inputAPVHandle;
+    if (APVSaturationFromHIP_) {
+      edm::Handle<std::vector<std::pair<int, std::bitset<6>>>> inputAPVHandle;
       pep.getByLabel(SiStripAPVPileInputTag_, inputAPVHandle);
 
-      if(inputAPVHandle.isValid()) {
+      if (inputAPVHandle.isValid()) {
+        const auto& APVinput = inputAPVHandle;
 
-        const auto &APVinput = inputAPVHandle;
-
-        std::vector<std::pair<int,std::bitset<6>> >::const_iterator entry = APVinput->begin();
-        for( ; entry != APVinput->end(); entry++) {
-          theAffectedAPVmap_.insert( APVMap::value_type(entry->first, entry->second ));
+        std::vector<std::pair<int, std::bitset<6>>>::const_iterator entry = APVinput->begin();
+        for (; entry != APVinput->end(); entry++) {
+          theAffectedAPVmap_.insert(APVMap::value_type(entry->first, entry->second));
         }
       }
     }
   }
 }
 
-
- 
-void PreMixingSiStripWorker::put(edm::Event &e, edm::EventSetup const& iSetup, std::vector<PileupSummaryInfo> const& ps, int bs) {
-
+void PreMixingSiStripWorker::put(edm::Event& e,
+                                 edm::EventSetup const& iSetup,
+                                 std::vector<PileupSummaryInfo> const& ps,
+                                 int bs) {
   // set up machinery to do proper noise adding:
   edm::ESHandle<SiStripGain> gainHandle;
   edm::ESHandle<SiStripNoises> noiseHandle;
   edm::ESHandle<SiStripThreshold> thresholdHandle;
   edm::ESHandle<SiStripPedestals> pedestalHandle;
   edm::ESHandle<SiStripBadStrip> deadChannelHandle;
-  iSetup.get<SiStripGainSimRcd>().get(gainLabel,gainHandle);
+  iSetup.get<SiStripGainSimRcd>().get(gainLabel, gainHandle);
   iSetup.get<SiStripNoisesRcd>().get(noiseHandle);
   iSetup.get<SiStripThresholdRcd>().get(thresholdHandle);
   iSetup.get<SiStripPedestalsRcd>().get(pedestalHandle);
@@ -350,21 +338,20 @@ void PreMixingSiStripWorker::put(edm::Event &e, edm::EventSetup const& iSetup, s
   edm::Service<edm::RandomNumberGenerator> rng;
   CLHEP::HepRandomEngine* engine = &rng->getEngine(e.streamID());
 
-  std::map< int,std::bitset<6>>  DeadAPVList;
+  std::map<int, std::bitset<6>> DeadAPVList;
   DeadAPVList.clear();
 
-
   // First, have to convert all ADC counts to raw pulse heights so that values can be added properly
-  // In PreMixing, pulse heights are saved with ADC = sqrt(9.0*PulseHeight) - have to undo. 
+  // In PreMixing, pulse heights are saved with ADC = sqrt(9.0*PulseHeight) - have to undo.
 
-  // This is done here because it's the only place we have access to EventSetup 
-  // Simultaneously, merge lists of hit channels in each DetId.                
+  // This is done here because it's the only place we have access to EventSetup
+  // Simultaneously, merge lists of hit channels in each DetId.
   // Signal Digis are in the list first, have to merge lists of hit strips on the fly,
-  // add signals on duplicates later                                                       
+  // add signals on duplicates later
 
   OneDetectorRawMap LocalRawMap;
 
-  // Now, loop over hits and add them to the map in the proper sorted order        
+  // Now, loop over hits and add them to the map in the proper sorted order
   // Note: We are assuming that the hits from the Signal events have been created in
   // "PreMix" mode, rather than in the standard ADC conversion routines.  If not, this
   // doesn't work at all.
@@ -372,11 +359,9 @@ void PreMixingSiStripWorker::put(edm::Event &e, edm::EventSetup const& iSetup, s
   // At the moment, both Signal and Reconstituted PU hits have the same compression algorithm.
   // If this were different, and one needed gains, the conversion back to pulse height can only
   // be done in this routine.  So, yes, there is an extra loop over hits here in the current code,
-  // because, in principle, one could convert to pulse height during the read/store phase.    
-
-  for(SiGlobalIndex::const_iterator IDet = SiHitStorage_.begin();
-      IDet != SiHitStorage_.end(); IDet++) {
+  // because, in principle, one could convert to pulse height during the read/store phase.
 
+  for (SiGlobalIndex::const_iterator IDet = SiHitStorage_.begin(); IDet != SiHitStorage_.end(); IDet++) {
     uint32_t detID = IDet->first;
 
     OneDetectorMap LocalMap = IDet->second;
@@ -385,43 +370,42 @@ void PreMixingSiStripWorker::put(edm::Event &e, edm::EventSetup const& iSetup, s
 
     LocalRawMap.clear();
 
-    OneDetectorMap::const_iterator iLocal  = LocalMap.begin();
-    for(;iLocal != LocalMap.end(); ++iLocal) {
-
+    OneDetectorMap::const_iterator iLocal = LocalMap.begin();
+    for (; iLocal != LocalMap.end(); ++iLocal) {
       uint16_t currentStrip = iLocal->strip();
       float signal = float(iLocal->adc());
-      if(iLocal->adc() == 1022) signal = 1500.;  // average values for overflows
-      if(iLocal->adc() == 1023) signal = 3000.;
+      if (iLocal->adc() == 1022)
+        signal = 1500.;  // average values for overflows
+      if (iLocal->adc() == 1023)
+        signal = 3000.;
 
-      //convert signals back to raw counts 
+      //convert signals back to raw counts
 
-      float ReSignal = signal*signal/9.0;  // The PreMixing conversion is adc = sqrt(9.0*pulseHeight)
+      float ReSignal = signal * signal / 9.0;  // The PreMixing conversion is adc = sqrt(9.0*pulseHeight)
 
-      RawDigi NewRawDigi = std::make_pair(currentStrip,ReSignal);
+      RawDigi NewRawDigi = std::make_pair(currentStrip, ReSignal);
 
       LocalRawMap.push_back(NewRawDigi);
-
     }
 
     // save information for this detiD into global map
-    SiRawDigis_.insert( SiGlobalRawIndex::value_type( detID, LocalRawMap ) );
+    SiRawDigis_.insert(SiGlobalRawIndex::value_type(detID, LocalRawMap));
   }
 
   // If we are killing APVs, merge list of dead ones before we digitize
 
-  int NumberOfBxBetweenHIPandEvent=1e3;
-
-  if(APVSaturationFromHIP_) { 
+  int NumberOfBxBetweenHIPandEvent = 1e3;
 
+  if (APVSaturationFromHIP_) {
     // calculate affected BX parameter
 
-    bool HasAtleastOneAffectedAPV=false;
-    while(!HasAtleastOneAffectedAPV){
-      for(int bx=floor(300.0/25.0);bx>0;bx--){ //Reminder: make these numbers not hard coded!!
-        float temp=CLHEP::RandFlat::shoot(engine)<0.5?1:0;
-        if(temp==1 && bx<NumberOfBxBetweenHIPandEvent){
-          NumberOfBxBetweenHIPandEvent=bx;
-          HasAtleastOneAffectedAPV=true;
+    bool HasAtleastOneAffectedAPV = false;
+    while (!HasAtleastOneAffectedAPV) {
+      for (int bx = floor(300.0 / 25.0); bx > 0; bx--) {  //Reminder: make these numbers not hard coded!!
+        float temp = CLHEP::RandFlat::shoot(engine) < 0.5 ? 1 : 0;
+        if (temp == 1 && bx < NumberOfBxBetweenHIPandEvent) {
+          NumberOfBxBetweenHIPandEvent = bx;
+          HasAtleastOneAffectedAPV = true;
         }
       }
     }
@@ -431,36 +415,32 @@ void PreMixingSiStripWorker::put(edm::Event &e, edm::EventSetup const& iSetup, s
     uint32_t currentID;
     std::bitset<6> NewAPVBits;
 
-    for(APVMap::const_iterator iAPV  = theAffectedAPVmap_.begin();
-        iAPV != theAffectedAPVmap_.end(); ++iAPV) {
-
+    for (APVMap::const_iterator iAPV = theAffectedAPVmap_.begin(); iAPV != theAffectedAPVmap_.end(); ++iAPV) {
       currentID = iAPV->first;
 
-      if (currentID == formerID) { // we have to OR these
-        for( int ibit=0; ibit<6; ++ibit){
-          NewAPVBits[ibit] = NewAPVBits[ibit]||(iAPV->second)[ibit];
+      if (currentID == formerID) {  // we have to OR these
+        for (int ibit = 0; ibit < 6; ++ibit) {
+          NewAPVBits[ibit] = NewAPVBits[ibit] || (iAPV->second)[ibit];
         }
-      }
-      else {
-        DeadAPVList[currentID]=NewAPVBits;          
-        //save pointers for next iteration                                 
+      } else {
+        DeadAPVList[currentID] = NewAPVBits;
+        //save pointers for next iteration
         formerID = currentID;
         NewAPVBits = iAPV->second;
       }
 
       iAPVchk = iAPV;
-      if((++iAPVchk) == theAffectedAPVmap_.end()) {  //make sure not to lose the last one 
-        DeadAPVList[currentID]=NewAPVBits;          
+      if ((++iAPVchk) == theAffectedAPVmap_.end()) {  //make sure not to lose the last one
+        DeadAPVList[currentID] = NewAPVBits;
       }
     }
-
   }
-  // 
+  //
 
-  //  Ok, done with merging raw signals and APVs - now add signals on duplicate strips 
+  //  Ok, done with merging raw signals and APVs - now add signals on duplicate strips
 
   // collection of Digis to put in the event
-  std::vector< edm::DetSet<SiStripDigi> > vSiStripDigi;
+  std::vector<edm::DetSet<SiStripDigi>> vSiStripDigi;
 
   // loop through our collection of detectors, merging hits and making a new list of "signal" digis
 
@@ -469,9 +449,7 @@ void PreMixingSiStripWorker::put(edm::Event &e, edm::EventSetup const& iSetup, s
   signals_.clear();
 
   // big loop over Detector IDs:
-  for(SiGlobalRawIndex::const_iterator IDet = SiRawDigis_.begin();
-      IDet != SiRawDigis_.end(); IDet++) {
-
+  for (SiGlobalRawIndex::const_iterator IDet = SiRawDigis_.begin(); IDet != SiRawDigis_.end(); IDet++) {
     uint32_t detID = IDet->first;
 
     SignalMapType Signals;
@@ -484,47 +462,43 @@ void PreMixingSiStripWorker::put(edm::Event &e, edm::EventSetup const& iSetup, s
     int currentStrip;
     float ADCSum = 0;
 
-    //loop over hit strips for this DetId, add duplicates 
+    //loop over hit strips for this DetId, add duplicates
 
     OneDetectorRawMap::const_iterator iLocalchk;
-    OneDetectorRawMap::const_iterator iLocal  = LocalMap.begin();
-    for(;iLocal != LocalMap.end(); ++iLocal) {
+    OneDetectorRawMap::const_iterator iLocal = LocalMap.begin();
+    for (; iLocal != LocalMap.end(); ++iLocal) {
+      currentStrip = iLocal->first;  // strip is first element
 
-      currentStrip = iLocal->first;  // strip is first element 
+      if (currentStrip == formerStrip) {  // we have to add these digis together
 
-      if (currentStrip == formerStrip) { // we have to add these digis together 
-
-        ADCSum+=iLocal->second ;          // raw pulse height is second element. 
-      }
-      else{
-        if(formerStrip!=-1){
-          Signals.insert( std::make_pair(formerStrip, ADCSum));
+        ADCSum += iLocal->second;  // raw pulse height is second element.
+      } else {
+        if (formerStrip != -1) {
+          Signals.insert(std::make_pair(formerStrip, ADCSum));
         }
-        // save pointers for next iteration 
+        // save pointers for next iteration
         formerStrip = currentStrip;
-        ADCSum = iLocal->second; // lone ADC  
+        ADCSum = iLocal->second;  // lone ADC
       }
 
       iLocalchk = iLocal;
-      if((++iLocalchk) == LocalMap.end()) {  //make sure not to lose the last one  
-        Signals.insert( std::make_pair(formerStrip, ADCSum));
+      if ((++iLocalchk) == LocalMap.end()) {  //make sure not to lose the last one
+        Signals.insert(std::make_pair(formerStrip, ADCSum));
       }
     }
-    // save merged map: 
-    signals_.insert( std::make_pair( detID, Signals));
+    // save merged map:
+    signals_.insert(std::make_pair(detID, Signals));
   }
 
   //Now, do noise, zero suppression, take into account bad channels, etc.
   // This section stolen from SiStripDigitizerAlgorithm
   // must loop over all detIds in the tracker to get all of the noise added properly.
-  for( const auto& iu : pDD->detUnits()) {
-
+  for (const auto& iu : pDD->detUnits()) {
     const StripGeomDetUnit* sgd = dynamic_cast<const StripGeomDetUnit*>(iu);
-    if (sgd != nullptr){
-
+    if (sgd != nullptr) {
       uint32_t detID = sgd->geographicalId().rawId();
 
-      edm::DetSet<SiStripDigi> SSD(detID); // Make empty collection with this detector ID
+      edm::DetSet<SiStripDigi> SSD(detID);  // Make empty collection with this detector ID
 
       int numStrips = (sgd->specificTopology()).nstrips();
 
@@ -533,8 +507,8 @@ void PreMixingSiStripWorker::put(edm::Event &e, edm::EventSetup const& iSetup, s
       const SignalMapType* theSignal(getSignal(detID));
 
       std::vector<float> detAmpl(numStrips, 0.);
-      if(theSignal) {
-        for(const auto& amp : *theSignal) {
+      if (theSignal) {
+        for (const auto& amp : *theSignal) {
           detAmpl[amp.first] = amp.second;
         }
       }
@@ -542,23 +516,25 @@ void PreMixingSiStripWorker::put(edm::Event &e, edm::EventSetup const& iSetup, s
       //removing signal from the dead (and HIP effected) strips
       std::vector<bool>& badChannels = allBadChannels[detID];
 
-      for(int strip =0; strip < numStrips; ++strip) {
-        if(badChannels[strip]) detAmpl[strip] = 0.;
+      for (int strip = 0; strip < numStrips; ++strip) {
+        if (badChannels[strip])
+          detAmpl[strip] = 0.;
       }
-         
-      if(APVSaturationFromHIP_) {
-        std::bitset<6> & bs=DeadAPVList[detID];
 
-        if(bs.any()){
+      if (APVSaturationFromHIP_) {
+        std::bitset<6>& bs = DeadAPVList[detID];
+
+        if (bs.any()) {
           // Here below is the scaling function which describes the evolution of the baseline (i.e. how the charge is suppressed).
           // This must be replaced as soon as we have a proper modeling of the baseline evolution from VR runs
-          float Shift=1-NumberOfBxBetweenHIPandEvent/floor(300.0/25.0); //Reminder: make these numbers not hardcoded!! 
-          float randomX=CLHEP::RandFlat::shoot(engine);
-          float scalingValue=(randomX-Shift)*10.0/7.0-3.0/7.0;
-
-          for(int strip =0; strip < numStrips; ++strip) {
-            if(!badChannels[strip] &&  bs[strip/128]==1){
-              detAmpl[strip] *=scalingValue>0?scalingValue:0.0;
+          float Shift =
+              1 - NumberOfBxBetweenHIPandEvent / floor(300.0 / 25.0);  //Reminder: make these numbers not hardcoded!!
+          float randomX = CLHEP::RandFlat::shoot(engine);
+          float scalingValue = (randomX - Shift) * 10.0 / 7.0 - 3.0 / 7.0;
+
+          for (int strip = 0; strip < numStrips; ++strip) {
+            if (!badChannels[strip] && bs[strip / 128] == 1) {
+              detAmpl[strip] *= scalingValue > 0 ? scalingValue : 0.0;
             }
           }
         }
@@ -582,7 +558,7 @@ void PreMixingSiStripWorker::put(edm::Event &e, edm::EventSetup const& iSetup, s
         }
         }
       */
-	
+
       //SiStripPedestals::Range detPedestalRange = pedestalHandle->getRange(detID);
 
       // -----------------------------------------------------------
@@ -590,53 +566,55 @@ void PreMixingSiStripWorker::put(edm::Event &e, edm::EventSetup const& iSetup, s
       size_t firstChannelWithSignal = 0;
       size_t lastChannelWithSignal = numStrips;
 
-      if(SingleStripNoise){
+      if (SingleStripNoise) {
         std::vector<float> noiseRMSv;
         noiseRMSv.clear();
-        noiseRMSv.insert(noiseRMSv.begin(),numStrips,0.);
-        for(int strip=0; strip< numStrips; ++strip){
-          if(!badChannels[strip]){
+        noiseRMSv.insert(noiseRMSv.begin(), numStrips, 0.);
+        for (int strip = 0; strip < numStrips; ++strip) {
+          if (!badChannels[strip]) {
             float gainValue = gainHandle->getStripGain(strip, detGainRange);
-            noiseRMSv[strip] = (noiseHandle->getNoise(strip,detNoiseRange))* theElectronPerADC/gainValue;
+            noiseRMSv[strip] = (noiseHandle->getNoise(strip, detNoiseRange)) * theElectronPerADC / gainValue;
           }
         }
         theSiNoiseAdder->addNoiseVR(detAmpl, noiseRMSv, engine);
       } else {
-        int RefStrip = int(numStrips/2.);
-        while(RefStrip<numStrips&&badChannels[RefStrip]){ //if the refstrip is bad, I move up to when I don't find it                                            
+        int RefStrip = int(numStrips / 2.);
+        while (RefStrip < numStrips &&
+               badChannels[RefStrip]) {  //if the refstrip is bad, I move up to when I don't find it
           RefStrip++;
         }
-        if(RefStrip<numStrips){
+        if (RefStrip < numStrips) {
           float RefgainValue = gainHandle->getStripGain(RefStrip, detGainRange);
-          float RefnoiseRMS = noiseHandle->getNoise(RefStrip,detNoiseRange) *theElectronPerADC/RefgainValue;
+          float RefnoiseRMS = noiseHandle->getNoise(RefStrip, detNoiseRange) * theElectronPerADC / RefgainValue;
 
-          theSiNoiseAdder->addNoise(detAmpl,firstChannelWithSignal,lastChannelWithSignal,numStrips,RefnoiseRMS, engine);
+          theSiNoiseAdder->addNoise(
+              detAmpl, firstChannelWithSignal, lastChannelWithSignal, numStrips, RefnoiseRMS, engine);
         }
       }
-	
-      DigitalVecType digis;
-      theSiZeroSuppress->suppress(theSiDigitalConverter->convert(detAmpl, gainHandle, detID), digis, detID,noiseHandle,thresholdHandle);
 
+      DigitalVecType digis;
+      theSiZeroSuppress->suppress(
+          theSiDigitalConverter->convert(detAmpl, gainHandle, detID), digis, detID, noiseHandle, thresholdHandle);
 
       SSD.data = digis;
 
       // stick this into the global vector of detector info
       vSiStripDigi.push_back(SSD);
-	
-    } // end of loop over one detector
 
-  } // end of big loop over all detector IDs
+    }  // end of loop over one detector
 
-    // put the collection of digis in the event   
-  edm::LogInfo("PreMixingSiStripWorker") << "total # Merged strips: " << vSiStripDigi.size() ;
+  }  // end of big loop over all detector IDs
+
+  // put the collection of digis in the event
+  edm::LogInfo("PreMixingSiStripWorker") << "total # Merged strips: " << vSiStripDigi.size();
 
   // make new digi collection
-    
-  std::unique_ptr< edm::DetSetVector<SiStripDigi> > MySiStripDigis(new edm::DetSetVector<SiStripDigi>(vSiStripDigi) );
+
+  std::unique_ptr<edm::DetSetVector<SiStripDigi>> MySiStripDigis(new edm::DetSetVector<SiStripDigi>(vSiStripDigi));
 
   // put collection
 
-  e.put(std::move(MySiStripDigis), SiStripDigiCollectionDM_ );
+  e.put(std::move(MySiStripDigis), SiStripDigiCollectionDM_);
 
   // clear local storage for this event
   SiHitStorage_.clear();
diff --git a/SimTracker/SiStripDigitizer/plugins/SiChargeCollectionDrifter.h b/SimTracker/SiStripDigitizer/plugins/SiChargeCollectionDrifter.h
index 65c75d4bce0c9..2a876541c0064 100644
--- a/SimTracker/SiStripDigitizer/plugins/SiChargeCollectionDrifter.h
+++ b/SimTracker/SiStripDigitizer/plugins/SiChargeCollectionDrifter.h
@@ -5,18 +5,17 @@
 #include "SignalPoint.h"
 #include "EnergyDepositUnit.h"
 
-#include<vector>
+#include <vector>
 /**
  * Base class for the drifting of charges in the silicon.
  */
-class SiChargeCollectionDrifter{
- public:  
-  typedef std::vector <SignalPoint> collection_type;
-  typedef std::vector <EnergyDepositUnit> ionization_type;
+class SiChargeCollectionDrifter {
+public:
+  typedef std::vector<SignalPoint> collection_type;
+  typedef std::vector<EnergyDepositUnit> ionization_type;
 
-  virtual ~SiChargeCollectionDrifter() { }
-  virtual collection_type drift (const ionization_type&, const LocalVector&,double,double) = 0;
+  virtual ~SiChargeCollectionDrifter() {}
+  virtual collection_type drift(const ionization_type&, const LocalVector&, double, double) = 0;
 };
 
 #endif
-
diff --git a/SimTracker/SiStripDigitizer/plugins/SiChargeDivider.h b/SimTracker/SiStripDigitizer/plugins/SiChargeDivider.h
index 00758a0960944..573d987dbf930 100644
--- a/SimTracker/SiStripDigitizer/plugins/SiChargeDivider.h
+++ b/SimTracker/SiStripDigitizer/plugins/SiChargeDivider.h
@@ -9,20 +9,20 @@
 
 #include <vector>
 
-namespace CLHEP{
+namespace CLHEP {
   class HepRandomEngine;
 }
 
 /**
  * Base class for the division of a Geant energy deposit in smaller elementary charges inside the silicon
  */
-class SiChargeDivider{
- public:
-  typedef std::vector< EnergyDepositUnit > ionization_type;
-  virtual ~SiChargeDivider() { }
-  virtual ionization_type divide(const PSimHit*, const LocalVector&, double, const StripGeomDetUnit& det, CLHEP::HepRandomEngine* engine ) = 0;
-  virtual void setParticleDataTable(const ParticleDataTable * pdt) = 0;
+class SiChargeDivider {
+public:
+  typedef std::vector<EnergyDepositUnit> ionization_type;
+  virtual ~SiChargeDivider() {}
+  virtual ionization_type divide(
+      const PSimHit*, const LocalVector&, double, const StripGeomDetUnit& det, CLHEP::HepRandomEngine* engine) = 0;
+  virtual void setParticleDataTable(const ParticleDataTable* pdt) = 0;
 };
 
-
 #endif
diff --git a/SimTracker/SiStripDigitizer/plugins/SiHitDigitizer.cc b/SimTracker/SiStripDigitizer/plugins/SiHitDigitizer.cc
index 2088ec4e458ce..7ac9512f4eb04 100644
--- a/SimTracker/SiStripDigitizer/plugins/SiHitDigitizer.cc
+++ b/SimTracker/SiStripDigitizer/plugins/SiHitDigitizer.cc
@@ -10,38 +10,46 @@
 
 //#define CBOLTZ (1.38E-23)
 //#define e_SI (1.6E-19)
-static const double CBOLTZ_over_e_SI = 1.38E-23/1.6E-19;
+static const double CBOLTZ_over_e_SI = 1.38E-23 / 1.6E-19;
 static const double noDiffusionMultiplier = 1.0e-3;
 
-SiHitDigitizer::SiHitDigitizer(const edm::ParameterSet& conf) :
-  depletionVoltage(conf.getParameter<double>("DepletionVoltage")),
-  chargeMobility(conf.getParameter<double>("ChargeMobility")),
-  theSiChargeDivider(new SiLinearChargeDivider(conf)),
-  theSiChargeCollectionDrifter(new SiLinearChargeCollectionDrifter(
-         CBOLTZ_over_e_SI * chargeMobility * conf.getParameter<double>("Temperature") * (conf.getParameter<bool>("noDiffusion") ? noDiffusionMultiplier : 1.0),
-         conf.getParameter<double>("ChargeDistributionRMS"),
-         depletionVoltage,
-         conf.getParameter<double>("AppliedVoltage"))),
-  theSiInduceChargeOnStrips(new SiTrivialInduceChargeOnStrips(conf, conf.getParameter<double>("GevPerElectron"))) {
-}
+SiHitDigitizer::SiHitDigitizer(const edm::ParameterSet& conf)
+    : depletionVoltage(conf.getParameter<double>("DepletionVoltage")),
+      chargeMobility(conf.getParameter<double>("ChargeMobility")),
+      theSiChargeDivider(new SiLinearChargeDivider(conf)),
+      theSiChargeCollectionDrifter(new SiLinearChargeCollectionDrifter(
+          CBOLTZ_over_e_SI * chargeMobility * conf.getParameter<double>("Temperature") *
+              (conf.getParameter<bool>("noDiffusion") ? noDiffusionMultiplier : 1.0),
+          conf.getParameter<double>("ChargeDistributionRMS"),
+          depletionVoltage,
+          conf.getParameter<double>("AppliedVoltage"))),
+      theSiInduceChargeOnStrips(new SiTrivialInduceChargeOnStrips(conf, conf.getParameter<double>("GevPerElectron"))) {}
 
-SiHitDigitizer::~SiHitDigitizer(){
-}
+SiHitDigitizer::~SiHitDigitizer() {}
 
-void 
-SiHitDigitizer::processHit(const PSimHit* hit, const StripGeomDetUnit& det, GlobalVector bfield,float langle,
-			   std::vector<float>& locAmpl, size_t& firstChannelWithSignal, size_t& lastChannelWithSignal,
-			   const TrackerTopology *tTopo, CLHEP::HepRandomEngine* engine){
-  
+void SiHitDigitizer::processHit(const PSimHit* hit,
+                                const StripGeomDetUnit& det,
+                                GlobalVector bfield,
+                                float langle,
+                                std::vector<float>& locAmpl,
+                                size_t& firstChannelWithSignal,
+                                size_t& lastChannelWithSignal,
+                                const TrackerTopology* tTopo,
+                                CLHEP::HepRandomEngine* engine) {
   // Compute the drift direction for this det
-  double moduleThickness = det.specificSurface().bounds().thickness(); // active detector thicness
-  double timeNormalisation = (moduleThickness*moduleThickness)/(2.*depletionVoltage*chargeMobility);
-  LocalVector driftDir = DriftDirection(&det,bfield,langle);
-  
+  double moduleThickness = det.specificSurface().bounds().thickness();  // active detector thicness
+  double timeNormalisation = (moduleThickness * moduleThickness) / (2. * depletionVoltage * chargeMobility);
+  LocalVector driftDir = DriftDirection(&det, bfield, langle);
+
   // Fully process one SimHit
   theSiInduceChargeOnStrips->induce(
-      theSiChargeCollectionDrifter->drift(
-                                          theSiChargeDivider->divide(hit, driftDir, moduleThickness, det, engine),
-          driftDir,moduleThickness,timeNormalisation),
-      det,locAmpl,firstChannelWithSignal,lastChannelWithSignal,tTopo);
+      theSiChargeCollectionDrifter->drift(theSiChargeDivider->divide(hit, driftDir, moduleThickness, det, engine),
+                                          driftDir,
+                                          moduleThickness,
+                                          timeNormalisation),
+      det,
+      locAmpl,
+      firstChannelWithSignal,
+      lastChannelWithSignal,
+      tTopo);
 }
diff --git a/SimTracker/SiStripDigitizer/plugins/SiHitDigitizer.h b/SimTracker/SiStripDigitizer/plugins/SiHitDigitizer.h
index 75a334a993a4f..9b89e9cc3ad3c 100644
--- a/SimTracker/SiStripDigitizer/plugins/SiHitDigitizer.h
+++ b/SimTracker/SiStripDigitizer/plugins/SiHitDigitizer.h
@@ -1,6 +1,6 @@
 #ifndef _TRACKER_SiHitDigitizer_H_
 #define _TRACKER_SiHitDigitizer_H_
- 
+
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
@@ -21,7 +21,7 @@ class TrackerTopology;
 
 class SiStripDetType;
 
-namespace CLHEP{
+namespace CLHEP {
   class HepRandomEngine;
 }
 
@@ -29,33 +29,30 @@ namespace CLHEP{
 * Digitizes the response for a single SimHit.
 */
 class SiHitDigitizer {
- public:
-
+public:
   SiHitDigitizer(const edm::ParameterSet& conf);
 
   ~SiHitDigitizer();
 
-  void setChargeDivider(SiChargeDivider* cd) {
-    theSiChargeDivider.reset(cd);
-  }
+  void setChargeDivider(SiChargeDivider* cd) { theSiChargeDivider.reset(cd); }
 
-  void setChargeCollectionDrifter(SiChargeCollectionDrifter* cd) {
-    theSiChargeCollectionDrifter.reset(cd);
-  }
+  void setChargeCollectionDrifter(SiChargeCollectionDrifter* cd) { theSiChargeCollectionDrifter.reset(cd); }
 
-  void setInduceChargeOnStrips(SiInduceChargeOnStrips* cd) {
-    theSiInduceChargeOnStrips.reset(cd);
-  }
-  
-  void setParticleDataTable(const ParticleDataTable * pdt) { 
-    theSiChargeDivider->setParticleDataTable(pdt); 
-  }
+  void setInduceChargeOnStrips(SiInduceChargeOnStrips* cd) { theSiInduceChargeOnStrips.reset(cd); }
+
+  void setParticleDataTable(const ParticleDataTable* pdt) { theSiChargeDivider->setParticleDataTable(pdt); }
+
+  void processHit(const PSimHit*,
+                  const StripGeomDetUnit&,
+                  GlobalVector,
+                  float,
+                  std::vector<float>&,
+                  size_t&,
+                  size_t&,
+                  const TrackerTopology* tTopo,
+                  CLHEP::HepRandomEngine*);
 
-  void processHit(const PSimHit*, const StripGeomDetUnit&, GlobalVector,float,
-		  std::vector<float>&, size_t&, size_t&,
-		  const TrackerTopology *tTopo, CLHEP::HepRandomEngine*);
-  
- private:
+private:
   const double depletionVoltage;
   const double chargeMobility;
   std::unique_ptr<SiChargeDivider> theSiChargeDivider;
@@ -63,12 +60,11 @@ class SiHitDigitizer {
   std::unique_ptr<const SiInduceChargeOnStrips> theSiInduceChargeOnStrips;
 
   typedef GloballyPositioned<double> Frame;
-  
+
   LocalVector DriftDirection(const StripGeomDetUnit* _detp, GlobalVector _bfield, float langle) {
-    LocalVector Bfield=Frame(_detp->surface().position(),_detp->surface().rotation()).toLocal(_bfield);
-    return LocalVector(-langle * Bfield.y(),langle * Bfield.x(),1.);
+    LocalVector Bfield = Frame(_detp->surface().position(), _detp->surface().rotation()).toLocal(_bfield);
+    return LocalVector(-langle * Bfield.y(), langle * Bfield.x(), 1.);
   }
-
 };
 
 #endif
diff --git a/SimTracker/SiStripDigitizer/plugins/SiInduceChargeOnStrips.h b/SimTracker/SiStripDigitizer/plugins/SiInduceChargeOnStrips.h
index b29b1a01286d8..cd018a339f037 100644
--- a/SimTracker/SiStripDigitizer/plugins/SiInduceChargeOnStrips.h
+++ b/SimTracker/SiStripDigitizer/plugins/SiInduceChargeOnStrips.h
@@ -5,7 +5,7 @@
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
 #include "SimTracker/SiStripDigitizer/interface/SiPileUpSignals.h"
 
-#include<map>
+#include <map>
 
 class TrackerTopology;
 class StripDet;
@@ -14,14 +14,14 @@ class StripDet;
  * Given a SignalPoint, computes the charge on each strip.
  */
 
-
-class SiInduceChargeOnStrips{
+class SiInduceChargeOnStrips {
 public:
-  
-  virtual ~SiInduceChargeOnStrips() { }
-  virtual void induce(const SiChargeCollectionDrifter::collection_type&, const StripGeomDetUnit&, 
-		      std::vector<float>&, size_t&, size_t&,
-		      const TrackerTopology *tTopo) const=0;
-
+  virtual ~SiInduceChargeOnStrips() {}
+  virtual void induce(const SiChargeCollectionDrifter::collection_type &,
+                      const StripGeomDetUnit &,
+                      std::vector<float> &,
+                      size_t &,
+                      size_t &,
+                      const TrackerTopology *tTopo) const = 0;
 };
 #endif
diff --git a/SimTracker/SiStripDigitizer/plugins/SiLinearChargeCollectionDrifter.cc b/SimTracker/SiStripDigitizer/plugins/SiLinearChargeCollectionDrifter.cc
index 87e08829afa69..fd0a18babd43b 100644
--- a/SimTracker/SiStripDigitizer/plugins/SiLinearChargeCollectionDrifter.cc
+++ b/SimTracker/SiStripDigitizer/plugins/SiLinearChargeCollectionDrifter.cc
@@ -1,49 +1,44 @@
 #include "SiLinearChargeCollectionDrifter.h"
 #include "vdt/log.h"
 
-SiLinearChargeCollectionDrifter::SiLinearChargeCollectionDrifter(double dc,
-								 double cdr,
-								 double dv,
-								 double av) :
-  // Everything which does not depend on the specific det
-  diffusionConstant(dc),
-  chargeDistributionRMS(cdr),
-  depletionVoltage(dv),
-  appliedVoltage(av)
-{
-}
+SiLinearChargeCollectionDrifter::SiLinearChargeCollectionDrifter(double dc, double cdr, double dv, double av)
+    :  // Everything which does not depend on the specific det
+      diffusionConstant(dc),
+      chargeDistributionRMS(cdr),
+      depletionVoltage(dv),
+      appliedVoltage(av) {}
 
-SiChargeCollectionDrifter::collection_type SiLinearChargeCollectionDrifter::drift(const SiChargeCollectionDrifter::ionization_type& ion, 
-										  const LocalVector& driftDir,double mt, double tn) {
+SiChargeCollectionDrifter::collection_type SiLinearChargeCollectionDrifter::drift(
+    const SiChargeCollectionDrifter::ionization_type& ion, const LocalVector& driftDir, double mt, double tn) {
   // prepare output
   collection_type _temp;
   _temp.resize(ion.size());
   // call the drift method for each deposit
-  for (size_t i=0; i<ion.size(); i++){
+  for (size_t i = 0; i < ion.size(); i++) {
     _temp[i] = drift(ion[i], driftDir, mt, tn);
   }
   return _temp;
 }
 
-SignalPoint SiLinearChargeCollectionDrifter::drift
-(const EnergyDepositUnit& edu, const LocalVector& drift, double moduleThickness, double timeNormalisation) {
+SignalPoint SiLinearChargeCollectionDrifter::drift(const EnergyDepositUnit& edu,
+                                                   const LocalVector& drift,
+                                                   double moduleThickness,
+                                                   double timeNormalisation) {
   // computes the fraction of the module the charge has to drift through,
   // ensuring it is bounded in [0,1]
-  double depth = (moduleThickness/2.-edu.z());
-  double thicknessFraction = depth/moduleThickness ; 
-  thicknessFraction = thicknessFraction>0. ? thicknessFraction : 0. ;
-  thicknessFraction = thicknessFraction<1. ? thicknessFraction : 1. ;
-  
+  double depth = (moduleThickness / 2. - edu.z());
+  double thicknessFraction = depth / moduleThickness;
+  thicknessFraction = thicknessFraction > 0. ? thicknessFraction : 0.;
+  thicknessFraction = thicknessFraction < 1. ? thicknessFraction : 1.;
+
   // computes the drift time in the sensor
-  double driftTime = -timeNormalisation*
-    vdt::fast_log(1.-2*depletionVoltage*thicknessFraction/
-	(depletionVoltage+appliedVoltage))
-    +chargeDistributionRMS;  
-  
+  double driftTime = -timeNormalisation * vdt::fast_log(1. - 2 * depletionVoltage * thicknessFraction /
+                                                                 (depletionVoltage + appliedVoltage)) +
+                     chargeDistributionRMS;
+
   // returns the signal: an energy on the surface, with a size due to diffusion.
-  return SignalPoint(edu.x() + depth*drift.x()/drift.z(),
-                     edu.y() + depth*drift.y()/drift.z(),
-                     sqrt(2.*diffusionConstant*driftTime),
+  return SignalPoint(edu.x() + depth * drift.x() / drift.z(),
+                     edu.y() + depth * drift.y() / drift.z(),
+                     sqrt(2. * diffusionConstant * driftTime),
                      edu.energy());
 }
-
diff --git a/SimTracker/SiStripDigitizer/plugins/SiLinearChargeCollectionDrifter.h b/SimTracker/SiStripDigitizer/plugins/SiLinearChargeCollectionDrifter.h
index 534da956d4aa4..2b2e0b7566af7 100644
--- a/SimTracker/SiStripDigitizer/plugins/SiLinearChargeCollectionDrifter.h
+++ b/SimTracker/SiStripDigitizer/plugins/SiLinearChargeCollectionDrifter.h
@@ -9,18 +9,21 @@
  * The resulting position depends on the Lorentz angle, and a sigma is computed                                        
  * that describes the diffusion.               
  */
-class SiLinearChargeCollectionDrifter : public SiChargeCollectionDrifter{
- public:
-  SiLinearChargeCollectionDrifter(double,double,double,double);
-  SiChargeCollectionDrifter::collection_type drift(const SiChargeCollectionDrifter::ionization_type&, 
-                                                   const LocalVector&,double,double) override;
- private:
-  SignalPoint drift(const EnergyDepositUnit&, const LocalVector&,double,double);
- private:
+class SiLinearChargeCollectionDrifter : public SiChargeCollectionDrifter {
+public:
+  SiLinearChargeCollectionDrifter(double, double, double, double);
+  SiChargeCollectionDrifter::collection_type drift(const SiChargeCollectionDrifter::ionization_type&,
+                                                   const LocalVector&,
+                                                   double,
+                                                   double) override;
+
+private:
+  SignalPoint drift(const EnergyDepositUnit&, const LocalVector&, double, double);
+
+private:
   const double diffusionConstant;
   const double chargeDistributionRMS;
   const double depletionVoltage;
   const double appliedVoltage;
 };
 #endif
-
diff --git a/SimTracker/SiStripDigitizer/plugins/SiLinearChargeDivider.cc b/SimTracker/SiStripDigitizer/plugins/SiLinearChargeDivider.cc
index 0096b57e90d2d..9b930a7479ae0 100644
--- a/SimTracker/SiStripDigitizer/plugins/SiLinearChargeDivider.cc
+++ b/SimTracker/SiStripDigitizer/plugins/SiLinearChargeDivider.cc
@@ -6,172 +6,181 @@
 #include <fstream>
 #include <string>
 
-SiLinearChargeDivider::SiLinearChargeDivider(const edm::ParameterSet& conf) :
-  // Run APV in peak instead of deconvolution mode, which degrades the time resolution.
-  peakMode(conf.getParameter<bool>("APVpeakmode")),
-  // Enable interstrip Landau fluctuations within a cluster.
-  fluctuateCharge(conf.getParameter<bool>("LandauFluctuations")),
-  // Number of segments per strip into which charge is divided during
-  // simulation. If large, precision of simulation improves.
-  chargedivisionsPerStrip(conf.getParameter<int>("chargeDivisionsPerStrip")),
-  // delta cutoff in MeV, has to be same as in Geant (0.120425 MeV corresponding to 100um range for electrons)
-  deltaCut(conf.getParameter<double>("DeltaProductionCut")),
-  //Offset for digitization during the MTCC and in general for taking cosmic particle
-  //The value to be used it must be evaluated and depend on the volume defnition used
-  //for the cosimc generation (Considering only the tracker the value is 11 ns)
-  cosmicShift(conf.getUntrackedParameter<double>("CosmicDelayShift")),
-  theParticleDataTable(nullptr),
-  // Geant4 engine used to fluctuate the charge from segment to segment
-  fluctuate(new SiG4UniversalFluctuation())
+SiLinearChargeDivider::SiLinearChargeDivider(const edm::ParameterSet& conf)
+    :  // Run APV in peak instead of deconvolution mode, which degrades the time resolution.
+      peakMode(conf.getParameter<bool>("APVpeakmode")),
+      // Enable interstrip Landau fluctuations within a cluster.
+      fluctuateCharge(conf.getParameter<bool>("LandauFluctuations")),
+      // Number of segments per strip into which charge is divided during
+      // simulation. If large, precision of simulation improves.
+      chargedivisionsPerStrip(conf.getParameter<int>("chargeDivisionsPerStrip")),
+      // delta cutoff in MeV, has to be same as in Geant (0.120425 MeV corresponding to 100um range for electrons)
+      deltaCut(conf.getParameter<double>("DeltaProductionCut")),
+      //Offset for digitization during the MTCC and in general for taking cosmic particle
+      //The value to be used it must be evaluated and depend on the volume defnition used
+      //for the cosimc generation (Considering only the tracker the value is 11 ns)
+      cosmicShift(conf.getUntrackedParameter<double>("CosmicDelayShift")),
+      theParticleDataTable(nullptr),
+      // Geant4 engine used to fluctuate the charge from segment to segment
+      fluctuate(new SiG4UniversalFluctuation())
 
 {
   readPulseShape(conf.getParameter<edm::FileInPath>(peakMode ? "APVShapePeakFile" : "APVShapeDecoFile").fullPath());
 }
 
+SiLinearChargeDivider::~SiLinearChargeDivider() {}
 
-SiLinearChargeDivider::~SiLinearChargeDivider(){
-}
-
-void SiLinearChargeDivider::readPulseShape(const std::string& pulseShapeFileName)
-{
+void SiLinearChargeDivider::readPulseShape(const std::string& pulseShapeFileName) {
   // Pulse shape file format: empty lines and comments (lines starting with '#') are ignored
   // one line "resolution: value" is interpreted as the resolution
   // all other lines are read as consecutive values of the shape
   std::ifstream shapeFile(pulseShapeFileName.c_str());
-  if ( ! shapeFile.good() ) {
+  if (!shapeFile.good()) {
     throw cms::Exception("FileError") << "Problem opening APV Shape file: " << pulseShapeFileName;
   }
   pulseResolution = -1.;
   std::string line;
   const std::string resoPrefix{"resolution: "};
-  while ( std::getline(shapeFile, line) ) {
-    if ( ( ! line.empty() ) && ( line.substr(1) != "#" ) ) {
+  while (std::getline(shapeFile, line)) {
+    if ((!line.empty()) && (line.substr(1) != "#")) {
       std::istringstream lStr{line};
-      if ( line.substr(0,resoPrefix.size()) == resoPrefix) {
-	lStr.seekg(resoPrefix.size());
-	lStr >> pulseResolution;
+      if (line.substr(0, resoPrefix.size()) == resoPrefix) {
+        lStr.seekg(resoPrefix.size());
+        lStr >> pulseResolution;
       } else {
-	double value;
-	while ( lStr >> value ) {
-	  pulseValues.push_back(value);
-	}
+        double value;
+        while (lStr >> value) {
+          pulseValues.push_back(value);
+        }
       }
     }
   }
-  if ( pulseValues.empty() || ( pulseResolution == -1. ) ) {
-    throw cms::Exception("WrongAPVPulseShape") << "Problem reading from APV pulse shape file " << pulseShapeFileName << ": " << (pulseValues.empty() ? "no values" : "no resolution");
+  if (pulseValues.empty() || (pulseResolution == -1.)) {
+    throw cms::Exception("WrongAPVPulseShape") << "Problem reading from APV pulse shape file " << pulseShapeFileName
+                                               << ": " << (pulseValues.empty() ? "no values" : "no resolution");
   }
   const auto maxIt = std::max_element(pulseValues.begin(), pulseValues.end());
-  if ( std::abs((*maxIt)-1.) > std::numeric_limits<double>::epsilon() ) {
-    throw cms::Exception("WrongAPVPulseShape") << "The max value of the APV pulse shape stored in the text file used in SimGeneral/MixingModule/python/SiStripSimParameters_cfi.py is not equal to 1. Need to be fixed.";
+  if (std::abs((*maxIt) - 1.) > std::numeric_limits<double>::epsilon()) {
+    throw cms::Exception("WrongAPVPulseShape")
+        << "The max value of the APV pulse shape stored in the text file used in "
+           "SimGeneral/MixingModule/python/SiStripSimParameters_cfi.py is not equal to 1. Need to be fixed.";
   }
   pulset0Idx = std::distance(pulseValues.begin(), maxIt);
 }
 
-SiChargeDivider::ionization_type 
-SiLinearChargeDivider::divide(const PSimHit* hit, const LocalVector& driftdir, double moduleThickness, const StripGeomDetUnit& det, CLHEP::HepRandomEngine* engine) {
-
+SiChargeDivider::ionization_type SiLinearChargeDivider::divide(const PSimHit* hit,
+                                                               const LocalVector& driftdir,
+                                                               double moduleThickness,
+                                                               const StripGeomDetUnit& det,
+                                                               CLHEP::HepRandomEngine* engine) {
   // signal after pulse shape correction
   float const decSignal = TimeResponse(hit, det);
 
   // if out of time go home!
-  if (0==decSignal) return ionization_type();
+  if (0 == decSignal)
+    return ionization_type();
 
   // Get the nass if the particle, in MeV.
   // Protect from particles with Mass = 0, assuming then the pion mass
   assert(theParticleDataTable != nullptr);
-  ParticleData const * particle = theParticleDataTable->particle( hit->particleType() );
-  double const particleMass = particle ? particle->mass()*1000 : 139.57;
+  ParticleData const* particle = theParticleDataTable->particle(hit->particleType());
+  double const particleMass = particle ? particle->mass() * 1000 : 139.57;
   double const particleCharge = particle ? particle->charge() : 1.;
 
-  if(!particle) {
-    LogDebug("SiLinearChargeDivider") << "Cannot find particle of type "<< hit->particleType() 
+  if (!particle) {
+    LogDebug("SiLinearChargeDivider") << "Cannot find particle of type " << hit->particleType()
                                       << " in the PDT we assign to this particle the mass and charge of the Pion";
   }
 
-  int NumberOfSegmentation = 
-    // if neutral: just one deposit....
-    (fabs(particleMass)<1.e-6 || particleCharge==0) ? 1 :
-    // computes the number of segments from number of segments per strip times number of strips.
-    (int)(1 + chargedivisionsPerStrip*fabs(driftXPos(hit->exitPoint(), driftdir, moduleThickness)-
-					   driftXPos(hit->entryPoint(), driftdir, moduleThickness) )
-	  /det.specificTopology().localPitch(hit->localPosition())         ); 
- 
+  int NumberOfSegmentation =
+      // if neutral: just one deposit....
+      (fabs(particleMass) < 1.e-6 || particleCharge == 0)
+          ? 1
+          :
+          // computes the number of segments from number of segments per strip times number of strips.
+          (int)(1 + chargedivisionsPerStrip *
+                        fabs(driftXPos(hit->exitPoint(), driftdir, moduleThickness) -
+                             driftXPos(hit->entryPoint(), driftdir, moduleThickness)) /
+                        det.specificTopology().localPitch(hit->localPosition()));
 
   // Eloss in GeV
   float eLoss = hit->energyLoss();
 
-
   // Prepare output
   ionization_type _ionization_points;
   _ionization_points.resize(NumberOfSegmentation);
 
   // Fluctuate charge in track subsegments
   LocalVector direction = hit->exitPoint() - hit->entryPoint();
-  if (NumberOfSegmentation <=1) {
+  if (NumberOfSegmentation <= 1) {
     // here I need a random... not 0.5
-    _ionization_points[0] = EnergyDepositUnit(eLoss*decSignal/eLoss,
-					      hit->entryPoint()+0.5f*direction);
-  }else {
+    _ionization_points[0] = EnergyDepositUnit(eLoss * decSignal / eLoss, hit->entryPoint() + 0.5f * direction);
+  } else {
     float eLossVector[NumberOfSegmentation];
-    if( fluctuateCharge ) {
+    if (fluctuateCharge) {
       fluctuateEloss(particleMass, hit->pabs(), eLoss, direction.mag(), NumberOfSegmentation, eLossVector, engine);
       // Save the energy of each segment
-      for ( int i = 0; i != NumberOfSegmentation; i++) {
-	// take energy value from vector eLossVector, 
-	_ionization_points[i] = EnergyDepositUnit(eLossVector[i]*decSignal/eLoss,
-						  hit->entryPoint()+float((i+0.5)/NumberOfSegmentation)*direction);
+      for (int i = 0; i != NumberOfSegmentation; i++) {
+        // take energy value from vector eLossVector,
+        _ionization_points[i] =
+            EnergyDepositUnit(eLossVector[i] * decSignal / eLoss,
+                              hit->entryPoint() + float((i + 0.5) / NumberOfSegmentation) * direction);
       }
     } else {
       // Save the energy of each segment
-      for ( int i = 0; i != NumberOfSegmentation; i++) {
-	// take energy value from eLoss average over n.segments.
-	_ionization_points[i] = EnergyDepositUnit(decSignal/float(NumberOfSegmentation),
-						  hit->entryPoint()+float((i+0.5)/NumberOfSegmentation)*direction);
+      for (int i = 0; i != NumberOfSegmentation; i++) {
+        // take energy value from eLoss average over n.segments.
+        _ionization_points[i] =
+            EnergyDepositUnit(decSignal / float(NumberOfSegmentation),
+                              hit->entryPoint() + float((i + 0.5) / NumberOfSegmentation) * direction);
       }
     }
   }
   return _ionization_points;
 }
 
-void SiLinearChargeDivider::fluctuateEloss(double particleMass, float particleMomentum, 
-                                           float eloss, float length, 
-                                           int NumberOfSegs,float elossVector[],
+void SiLinearChargeDivider::fluctuateEloss(double particleMass,
+                                           float particleMomentum,
+                                           float eloss,
+                                           float length,
+                                           int NumberOfSegs,
+                                           float elossVector[],
                                            CLHEP::HepRandomEngine* engine) {
-
-
   // Generate charge fluctuations.
-  float sum=0.;
+  float sum = 0.;
   double deltaCutoff;
-  double mom = particleMomentum*1000.;
-  double seglen = length/NumberOfSegs*10.;
-  double segeloss = (1000.*eloss)/NumberOfSegs;
-  for (int i=0;i<NumberOfSegs;i++) {
+  double mom = particleMomentum * 1000.;
+  double seglen = length / NumberOfSegs * 10.;
+  double segeloss = (1000. * eloss) / NumberOfSegs;
+  for (int i = 0; i < NumberOfSegs; i++) {
     // The G4 routine needs momentum in MeV, mass in MeV, delta-cut in MeV,
-    // track segment length in mm, segment eloss in MeV 
+    // track segment length in mm, segment eloss in MeV
     // Returns fluctuated eloss in MeV
     // the cutoff is sometimes redefined inside, so fix it.
     deltaCutoff = deltaCut;
-    sum += (elossVector[i] = fluctuate->SampleFluctuations(mom,particleMass,deltaCutoff,seglen,segeloss, engine)/1000.);
+    sum += (elossVector[i] =
+                fluctuate->SampleFluctuations(mom, particleMass, deltaCutoff, seglen, segeloss, engine) / 1000.);
   }
-  
-  if(sum>0.) {  // If fluctuations give eloss>0.
+
+  if (sum > 0.) {  // If fluctuations give eloss>0.
     // Rescale to the same total eloss
-    float ratio = eloss/sum;
-    for (int ii=0;ii<NumberOfSegs;ii++) elossVector[ii]= ratio*elossVector[ii];
+    float ratio = eloss / sum;
+    for (int ii = 0; ii < NumberOfSegs; ii++)
+      elossVector[ii] = ratio * elossVector[ii];
   } else {  // If fluctuations gives 0 eloss
-    float averageEloss = eloss/NumberOfSegs;
-    for (int ii=0;ii<NumberOfSegs;ii++) elossVector[ii]= averageEloss; 
+    float averageEloss = eloss / NumberOfSegs;
+    for (int ii = 0; ii < NumberOfSegs; ii++)
+      elossVector[ii] = averageEloss;
   }
   return;
 }
 
-float SiLinearChargeDivider::TimeResponse( const PSimHit* hit, const StripGeomDetUnit& det)
-{
+float SiLinearChargeDivider::TimeResponse(const PSimHit* hit, const StripGeomDetUnit& det) {
   // x is difference between the tof and the tof for a photon (reference)
   // converted into a bin number
-  const auto dTOF = det.surface().toGlobal(hit->localPosition()).mag()/30. + cosmicShift - hit->tof();
-  const int x= int(dTOF/pulseResolution) + pulset0Idx;
-  if(x < 0 || x >= int(pulseValues.size())) return 0;
-  return hit->energyLoss()*pulseValues[std::size_t(x)];
+  const auto dTOF = det.surface().toGlobal(hit->localPosition()).mag() / 30. + cosmicShift - hit->tof();
+  const int x = int(dTOF / pulseResolution) + pulset0Idx;
+  if (x < 0 || x >= int(pulseValues.size()))
+    return 0;
+  return hit->energyLoss() * pulseValues[std::size_t(x)];
 }
diff --git a/SimTracker/SiStripDigitizer/plugins/SiLinearChargeDivider.h b/SimTracker/SiStripDigitizer/plugins/SiLinearChargeDivider.h
index 6ad56f018e01a..007875b2ce491 100644
--- a/SimTracker/SiStripDigitizer/plugins/SiLinearChargeDivider.h
+++ b/SimTracker/SiStripDigitizer/plugins/SiLinearChargeDivider.h
@@ -13,7 +13,7 @@
 
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
 
-namespace CLHEP{
+namespace CLHEP {
   class HepRandomEngine;
 }
 
@@ -24,9 +24,8 @@ namespace CLHEP{
  * - fluctuations of the charge deposit fronm segment to segment
  * - pulse shape ( in peak of deconvolution mode)
  */
-class SiLinearChargeDivider : public SiChargeDivider{
- public:
-
+class SiLinearChargeDivider : public SiChargeDivider {
+public:
   // constructor
   SiLinearChargeDivider(const edm::ParameterSet& conf);
 
@@ -34,35 +33,41 @@ class SiLinearChargeDivider : public SiChargeDivider{
   ~SiLinearChargeDivider() override;
 
   // main method: divide the charge (from the PSimHit) into several energy deposits in the bulk
-  SiChargeDivider::ionization_type divide(const PSimHit*, const LocalVector&, double, const StripGeomDetUnit& det, CLHEP::HepRandomEngine*) override;
+  SiChargeDivider::ionization_type divide(
+      const PSimHit*, const LocalVector&, double, const StripGeomDetUnit& det, CLHEP::HepRandomEngine*) override;
 
   // set the ParticleDataTable (used to fluctuate the charge properly)
-  void setParticleDataTable(const ParticleDataTable * pdt) override { theParticleDataTable = pdt; }
-  
- private:
+  void setParticleDataTable(const ParticleDataTable* pdt) override { theParticleDataTable = pdt; }
+
+private:
   // configuration data
-  const bool   peakMode;
-  const bool   fluctuateCharge;
-  const int    chargedivisionsPerStrip;
-  const double deltaCut ;
+  const bool peakMode;
+  const bool fluctuateCharge;
+  const int chargedivisionsPerStrip;
+  const double deltaCut;
   const double cosmicShift;
-  const ParticleDataTable * theParticleDataTable;
+  const ParticleDataTable* theParticleDataTable;
   double pulseResolution;
   unsigned int pulset0Idx;
   std::vector<double> pulseValues;
-  
+
   // Geant4 engine used by fluctuateEloss()
-  std::unique_ptr<SiG4UniversalFluctuation> fluctuate; 
+  std::unique_ptr<SiG4UniversalFluctuation> fluctuate;
   // utility: drifts the charge to the surface to estimate the number of relevant strips
-  inline float driftXPos(const Local3DPoint& pos, const LocalVector& drift, double thickness) { 
-    return pos.x()+(thickness/2.-pos.z())*drift.x()/drift.z();
+  inline float driftXPos(const Local3DPoint& pos, const LocalVector& drift, double thickness) {
+    return pos.x() + (thickness / 2. - pos.z()) * drift.x() / drift.z();
   }
   // fluctuate the Eloss
-  void fluctuateEloss(double const particleMass, float momentum, float eloss, float length, int NumberOfSegmentation, float elossVector[], CLHEP::HepRandomEngine*);
+  void fluctuateEloss(double const particleMass,
+                      float momentum,
+                      float eloss,
+                      float length,
+                      int NumberOfSegmentation,
+                      float elossVector[],
+                      CLHEP::HepRandomEngine*);
   // time response (from the pulse shape)
-  float TimeResponse( const PSimHit* hit, const StripGeomDetUnit& det);
+  float TimeResponse(const PSimHit* hit, const StripGeomDetUnit& det);
   void readPulseShape(const std::string& pulseShapeFileName);
-
 };
 
 #endif
diff --git a/SimTracker/SiStripDigitizer/plugins/SiPileUpSignals.cc b/SimTracker/SiStripDigitizer/plugins/SiPileUpSignals.cc
index 77f73d638d8c4..163dd08984c29 100644
--- a/SimTracker/SiStripDigitizer/plugins/SiPileUpSignals.cc
+++ b/SimTracker/SiStripDigitizer/plugins/SiPileUpSignals.cc
@@ -1,16 +1,16 @@
 #include "SimTracker/SiStripDigitizer/interface/SiPileUpSignals.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 
-void SiPileUpSignals::resetSignals(){
-  signal_.clear();
-}
+void SiPileUpSignals::resetSignals() { signal_.clear(); }
 
-void SiPileUpSignals::add(uint32_t detID, const std::vector<float>& locAmpl,
-                          const size_t& firstChannelWithSignal, const size_t& lastChannelWithSignal) {
+void SiPileUpSignals::add(uint32_t detID,
+                          const std::vector<float>& locAmpl,
+                          const size_t& firstChannelWithSignal,
+                          const size_t& lastChannelWithSignal) {
   SignalMapType& theSignal = signal_[detID];
-  for (size_t iChannel=firstChannelWithSignal; iChannel<lastChannelWithSignal; ++iChannel) {
-    if(locAmpl[iChannel] != 0.0) {
-      if(theSignal.find(iChannel) == theSignal.end()) {
+  for (size_t iChannel = firstChannelWithSignal; iChannel < lastChannelWithSignal; ++iChannel) {
+    if (locAmpl[iChannel] != 0.0) {
+      if (theSignal.find(iChannel) == theSignal.end()) {
         theSignal.insert(std::make_pair(iChannel, locAmpl[iChannel]));
       } else {
         theSignal[iChannel] += locAmpl[iChannel];
diff --git a/SimTracker/SiStripDigitizer/plugins/SiStripDigitizer.cc b/SimTracker/SiStripDigitizer/plugins/SiStripDigitizer.cc
index 55ad02f23a8d5..7036d39135c8d 100644
--- a/SimTracker/SiStripDigitizer/plugins/SiStripDigitizer.cc
+++ b/SimTracker/SiStripDigitizer/plugins/SiStripDigitizer.cc
@@ -55,124 +55,127 @@
 #include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
-SiStripDigitizer::SiStripDigitizer(const edm::ParameterSet& conf, edm::ProducerBase& mixMod, edm::ConsumesCollector& iC) : 
-  gainLabel(conf.getParameter<std::string>("Gain")),
-  hitsProducer(conf.getParameter<std::string>("hitsProducer")),
-  trackerContainers(conf.getParameter<std::vector<std::string> >("ROUList")),
-  ZSDigi(conf.getParameter<edm::ParameterSet>("DigiModeList").getParameter<std::string>("ZSDigi")),
-  SCDigi(conf.getParameter<edm::ParameterSet>("DigiModeList").getParameter<std::string>("SCDigi")),
-  VRDigi(conf.getParameter<edm::ParameterSet>("DigiModeList").getParameter<std::string>("VRDigi")),
-  PRDigi(conf.getParameter<edm::ParameterSet>("DigiModeList").getParameter<std::string>("PRDigi")),
-  geometryType(conf.getParameter<std::string>("GeometryType")),
-  useConfFromDB(conf.getParameter<bool>("TrackerConfigurationFromDB")),
-  zeroSuppression(conf.getParameter<bool>("ZeroSuppression")),
-  makeDigiSimLinks_(conf.getUntrackedParameter<bool>("makeDigiSimLinks", false))
-{ 
+SiStripDigitizer::SiStripDigitizer(const edm::ParameterSet& conf, edm::ProducerBase& mixMod, edm::ConsumesCollector& iC)
+    : gainLabel(conf.getParameter<std::string>("Gain")),
+      hitsProducer(conf.getParameter<std::string>("hitsProducer")),
+      trackerContainers(conf.getParameter<std::vector<std::string>>("ROUList")),
+      ZSDigi(conf.getParameter<edm::ParameterSet>("DigiModeList").getParameter<std::string>("ZSDigi")),
+      SCDigi(conf.getParameter<edm::ParameterSet>("DigiModeList").getParameter<std::string>("SCDigi")),
+      VRDigi(conf.getParameter<edm::ParameterSet>("DigiModeList").getParameter<std::string>("VRDigi")),
+      PRDigi(conf.getParameter<edm::ParameterSet>("DigiModeList").getParameter<std::string>("PRDigi")),
+      geometryType(conf.getParameter<std::string>("GeometryType")),
+      useConfFromDB(conf.getParameter<bool>("TrackerConfigurationFromDB")),
+      zeroSuppression(conf.getParameter<bool>("ZeroSuppression")),
+      makeDigiSimLinks_(conf.getUntrackedParameter<bool>("makeDigiSimLinks", false)) {
   const std::string alias("simSiStripDigis");
-  
-  mixMod.produces<edm::DetSetVector<SiStripDigi> >(ZSDigi).setBranchAlias(ZSDigi);
-  mixMod.produces<edm::DetSetVector<SiStripRawDigi> >(SCDigi).setBranchAlias(alias + SCDigi);
-  mixMod.produces<edm::DetSetVector<SiStripRawDigi> >(VRDigi).setBranchAlias(alias + VRDigi);
-  mixMod.produces<edm::DetSetVector<SiStripRawDigi> >(PRDigi).setBranchAlias(alias + PRDigi);
-  mixMod.produces<edm::DetSetVector<StripDigiSimLink> >().setBranchAlias(alias + "siStripDigiSimLink");
-  mixMod.produces<std::vector<std::pair<int,std::bitset<6>>>>("AffectedAPVList").setBranchAlias(alias + "AffectedAPV");
-  for(auto const& trackerContainer : trackerContainers) {
+
+  mixMod.produces<edm::DetSetVector<SiStripDigi>>(ZSDigi).setBranchAlias(ZSDigi);
+  mixMod.produces<edm::DetSetVector<SiStripRawDigi>>(SCDigi).setBranchAlias(alias + SCDigi);
+  mixMod.produces<edm::DetSetVector<SiStripRawDigi>>(VRDigi).setBranchAlias(alias + VRDigi);
+  mixMod.produces<edm::DetSetVector<SiStripRawDigi>>(PRDigi).setBranchAlias(alias + PRDigi);
+  mixMod.produces<edm::DetSetVector<StripDigiSimLink>>().setBranchAlias(alias + "siStripDigiSimLink");
+  mixMod.produces<std::vector<std::pair<int, std::bitset<6>>>>("AffectedAPVList").setBranchAlias(alias + "AffectedAPV");
+  for (auto const& trackerContainer : trackerContainers) {
     edm::InputTag tag(hitsProducer, trackerContainer);
-    iC.consumes<std::vector<PSimHit> >(edm::InputTag(hitsProducer, trackerContainer));  
+    iC.consumes<std::vector<PSimHit>>(edm::InputTag(hitsProducer, trackerContainer));
   }
   edm::Service<edm::RandomNumberGenerator> rng;
-  if ( ! rng.isAvailable()) {
+  if (!rng.isAvailable()) {
     throw cms::Exception("Configuration")
-      << "SiStripDigitizer requires the RandomNumberGeneratorService\n"
-      "which is not present in the configuration file.  You must add the service\n"
-      "in the configuration file or remove the modules that require it.";
+        << "SiStripDigitizer requires the RandomNumberGeneratorService\n"
+           "which is not present in the configuration file.  You must add the service\n"
+           "in the configuration file or remove the modules that require it.";
   }
   theDigiAlgo.reset(new SiStripDigitizerAlgorithm(conf));
 }
 
 // Virtual destructor needed.
-SiStripDigitizer::~SiStripDigitizer() { 
-}  
+SiStripDigitizer::~SiStripDigitizer() {}
 
-void SiStripDigitizer::accumulateStripHits(edm::Handle<std::vector<PSimHit> > hSimHits,
-					   const TrackerTopology *tTopo, size_t globalSimHitIndex, const unsigned int tofBin) {
+void SiStripDigitizer::accumulateStripHits(edm::Handle<std::vector<PSimHit>> hSimHits,
+                                           const TrackerTopology* tTopo,
+                                           size_t globalSimHitIndex,
+                                           const unsigned int tofBin) {
   // globalSimHitIndex is the index the sim hit will have when it is put in a collection
   // of sim hits for all crossings. This is only used when creating digi-sim links if
   // configured to do so.
 
-  if(hSimHits.isValid()) {
+  if (hSimHits.isValid()) {
     std::set<unsigned int> detIds;
     std::vector<PSimHit> const& simHits = *hSimHits.product();
-    for(std::vector<PSimHit>::const_iterator it = simHits.begin(), itEnd = simHits.end(); it != itEnd; ++it, ++globalSimHitIndex ) {
+    for (std::vector<PSimHit>::const_iterator it = simHits.begin(), itEnd = simHits.end(); it != itEnd;
+         ++it, ++globalSimHitIndex) {
       unsigned int detId = (*it).detUnitId();
-      if(detIds.insert(detId).second) {
+      if (detIds.insert(detId).second) {
         // The insert succeeded, so this detector element has not yet been processed.
-	assert(detectorUnits[detId]);
-	if(detectorUnits[detId]->type().isTrackerStrip()) { // this test can be removed and replaced by stripdet!=0
-	  auto stripdet = detectorUnits[detId];
-	  //access to magnetic field in global coordinates
-	  GlobalVector bfield = pSetup->inTesla(stripdet->surface().position());
-	  LogDebug ("Digitizer ") << "B-field(T) at " << stripdet->surface().position() << "(cm): "
-				  << pSetup->inTesla(stripdet->surface().position());
-	  theDigiAlgo->accumulateSimHits(it, itEnd, globalSimHitIndex, tofBin, stripdet, bfield, tTopo, randomEngine_);
-	}
+        assert(detectorUnits[detId]);
+        if (detectorUnits[detId]->type().isTrackerStrip()) {  // this test can be removed and replaced by stripdet!=0
+          auto stripdet = detectorUnits[detId];
+          //access to magnetic field in global coordinates
+          GlobalVector bfield = pSetup->inTesla(stripdet->surface().position());
+          LogDebug("Digitizer ") << "B-field(T) at " << stripdet->surface().position()
+                                 << "(cm): " << pSetup->inTesla(stripdet->surface().position());
+          theDigiAlgo->accumulateSimHits(it, itEnd, globalSimHitIndex, tofBin, stripdet, bfield, tTopo, randomEngine_);
+        }
       }
-    } // end of loop over sim hits
+    }  // end of loop over sim hits
   }
 }
 
 // Functions that gets called by framework every event
-  void
-  SiStripDigitizer::accumulate(edm::Event const& iEvent, edm::EventSetup const& iSetup) {
-    //Retrieve tracker topology from geometry
-    edm::ESHandle<TrackerTopology> tTopoHand;
-    iSetup.get<TrackerTopologyRcd>().get(tTopoHand);
-    const TrackerTopology *tTopo=tTopoHand.product();
-
-    // Step A: Get Inputs
-    for(auto const& trackerContainer : trackerContainers) {
-      edm::Handle<std::vector<PSimHit> > simHits;
-      edm::InputTag tag(hitsProducer, trackerContainer);
-      unsigned int tofBin = StripDigiSimLink::LowTof;
-      if (trackerContainer.find(std::string("HighTof")) != std::string::npos) tofBin = StripDigiSimLink::HighTof;
-
-      iEvent.getByLabel(tag, simHits);
-      accumulateStripHits(simHits,tTopo,crossingSimHitIndexOffset_[tag.encode()], tofBin);
-      // Now that the hits have been processed, I'll add the amount of hits in this crossing on to
-      // the global counter. Next time accumulateStripHits() is called it will count the sim hits
-      // as though they were on the end of this collection.
-      // Note that this is only used for creating digi-sim links (if configured to do so).
-      if( simHits.isValid() ) crossingSimHitIndexOffset_[tag.encode()]+=simHits->size();
-    }
-  }
+void SiStripDigitizer::accumulate(edm::Event const& iEvent, edm::EventSetup const& iSetup) {
+  //Retrieve tracker topology from geometry
+  edm::ESHandle<TrackerTopology> tTopoHand;
+  iSetup.get<TrackerTopologyRcd>().get(tTopoHand);
+  const TrackerTopology* tTopo = tTopoHand.product();
 
-  void
-  SiStripDigitizer::accumulate(PileUpEventPrincipal const& iEvent, edm::EventSetup const& iSetup, edm::StreamID const& streamID) {
-
-    edm::ESHandle<TrackerTopology> tTopoHand;
-    iSetup.get<TrackerTopologyRcd>().get(tTopoHand);
-    const TrackerTopology *tTopo=tTopoHand.product();
-
-    //Re-compute luminosity for accumulation for HIP effects
-    theDigiAlgo->calculateInstlumiScale(PileupInfo_.get());
-
-    // Step A: Get Inputs
-    for(auto const& trackerContainer : trackerContainers) {
-      edm::Handle<std::vector<PSimHit> > simHits;
-      edm::InputTag tag(hitsProducer, trackerContainer);
-      unsigned int tofBin = StripDigiSimLink::LowTof;
-      if (trackerContainer.find(std::string("HighTof")) != std::string::npos) tofBin = StripDigiSimLink::HighTof; 
-
-      iEvent.getByLabel(tag, simHits);
-      accumulateStripHits(simHits,tTopo,crossingSimHitIndexOffset_[tag.encode()], tofBin);
-      // Now that the hits have been processed, I'll add the amount of hits in this crossing on to
-      // the global counter. Next time accumulateStripHits() is called it will count the sim hits
-      // as though they were on the end of this collection.
-      // Note that this is only used for creating digi-sim links (if configured to do so).
-      if( simHits.isValid() ) crossingSimHitIndexOffset_[tag.encode()]+=simHits->size();
-    }
+  // Step A: Get Inputs
+  for (auto const& trackerContainer : trackerContainers) {
+    edm::Handle<std::vector<PSimHit>> simHits;
+    edm::InputTag tag(hitsProducer, trackerContainer);
+    unsigned int tofBin = StripDigiSimLink::LowTof;
+    if (trackerContainer.find(std::string("HighTof")) != std::string::npos)
+      tofBin = StripDigiSimLink::HighTof;
+
+    iEvent.getByLabel(tag, simHits);
+    accumulateStripHits(simHits, tTopo, crossingSimHitIndexOffset_[tag.encode()], tofBin);
+    // Now that the hits have been processed, I'll add the amount of hits in this crossing on to
+    // the global counter. Next time accumulateStripHits() is called it will count the sim hits
+    // as though they were on the end of this collection.
+    // Note that this is only used for creating digi-sim links (if configured to do so).
+    if (simHits.isValid())
+      crossingSimHitIndexOffset_[tag.encode()] += simHits->size();
   }
+}
 
+void SiStripDigitizer::accumulate(PileUpEventPrincipal const& iEvent,
+                                  edm::EventSetup const& iSetup,
+                                  edm::StreamID const& streamID) {
+  edm::ESHandle<TrackerTopology> tTopoHand;
+  iSetup.get<TrackerTopologyRcd>().get(tTopoHand);
+  const TrackerTopology* tTopo = tTopoHand.product();
+
+  //Re-compute luminosity for accumulation for HIP effects
+  theDigiAlgo->calculateInstlumiScale(PileupInfo_.get());
+
+  // Step A: Get Inputs
+  for (auto const& trackerContainer : trackerContainers) {
+    edm::Handle<std::vector<PSimHit>> simHits;
+    edm::InputTag tag(hitsProducer, trackerContainer);
+    unsigned int tofBin = StripDigiSimLink::LowTof;
+    if (trackerContainer.find(std::string("HighTof")) != std::string::npos)
+      tofBin = StripDigiSimLink::HighTof;
+
+    iEvent.getByLabel(tag, simHits);
+    accumulateStripHits(simHits, tTopo, crossingSimHitIndexOffset_[tag.encode()], tofBin);
+    // Now that the hits have been processed, I'll add the amount of hits in this crossing on to
+    // the global counter. Next time accumulateStripHits() is called it will count the sim hits
+    // as though they were on the end of this collection.
+    // Note that this is only used for creating digi-sim links (if configured to do so).
+    if (simHits.isValid())
+      crossingSimHitIndexOffset_[tag.encode()] += simHits->size();
+  }
+}
 
 void SiStripDigitizer::initializeEvent(edm::Event const& iEvent, edm::EventSetup const& iSetup) {
   // Make sure that the first crossing processed starts indexing the sim hits from zero.
@@ -183,7 +186,7 @@ void SiStripDigitizer::initializeEvent(edm::Event const& iEvent, edm::EventSetup
   theAffectedAPVvector.clear();
   // Step A: Get Inputs
 
-  if(useConfFromDB){
+  if (useConfFromDB) {
     edm::ESHandle<SiStripDetCabling> detCabling;
     iSetup.get<SiStripDetCablingRcd>().get(detCabling);
     detCabling->addConnected(theDetIdList);
@@ -195,20 +198,20 @@ void SiStripDigitizer::initializeEvent(edm::Event const& iEvent, edm::EventSetup
 
   theDigiAlgo->initializeEvent(iSetup);
 
-  iSetup.get<TrackerDigiGeometryRecord>().get(geometryType,pDD);
+  iSetup.get<TrackerDigiGeometryRecord>().get(geometryType, pDD);
   iSetup.get<IdealMagneticFieldRecord>().get(pSetup);
 
   // FIX THIS! We only need to clear and (re)fill detectorUnits when the geometry type IOV changes.  Use ESWatcher to determine this.
   bool changes = true;
-  if(changes) { // Replace with ESWatcher
+  if (changes) {  // Replace with ESWatcher
     detectorUnits.clear();
   }
-  for( const auto& iu : pDD->detUnits()) {
+  for (const auto& iu : pDD->detUnits()) {
     unsigned int detId = iu->geographicalId().rawId();
-    if(iu->type().isTrackerStrip()) {
+    if (iu->type().isTrackerStrip()) {
       auto stripdet = dynamic_cast<StripGeomDetUnit const*>(iu);
       assert(stripdet != nullptr);
-      if(changes) { // Replace with ESWatcher
+      if (changes) {  // Replace with ESWatcher
         detectorUnits.insert(std::make_pair(detId, stripdet));
       }
       theDigiAlgo->initializeDetUnit(stripdet, iSetup);
@@ -221,72 +224,87 @@ void SiStripDigitizer::finalizeEvent(edm::Event& iEvent, edm::EventSetup const&
   edm::ESHandle<SiStripNoises> noiseHandle;
   edm::ESHandle<SiStripThreshold> thresholdHandle;
   edm::ESHandle<SiStripPedestals> pedestalHandle;
-  iSetup.get<SiStripGainSimRcd>().get(gainLabel,gainHandle);
+  iSetup.get<SiStripGainSimRcd>().get(gainLabel, gainHandle);
   iSetup.get<SiStripNoisesRcd>().get(noiseHandle);
   iSetup.get<SiStripThresholdRcd>().get(thresholdHandle);
   iSetup.get<SiStripPedestalsRcd>().get(pedestalHandle);
 
-  std::vector<edm::DetSet<SiStripDigi> > theDigiVector;
-  std::vector<edm::DetSet<SiStripRawDigi> > theRawDigiVector;
-  std::unique_ptr< edm::DetSetVector<StripDigiSimLink> > pOutputDigiSimLink( new edm::DetSetVector<StripDigiSimLink> );
- 
- 
+  std::vector<edm::DetSet<SiStripDigi>> theDigiVector;
+  std::vector<edm::DetSet<SiStripRawDigi>> theRawDigiVector;
+  std::unique_ptr<edm::DetSetVector<StripDigiSimLink>> pOutputDigiSimLink(new edm::DetSetVector<StripDigiSimLink>);
+
   // Step B: LOOP on StripGeomDetUnit
   theDigiVector.reserve(10000);
   theDigiVector.clear();
 
-  for( const auto& iu : pDD->detUnits()) {
-    if(useConfFromDB){
-      //apply the cable map _before_ digitization: consider only the detis that are connected 
-      if(theDetIdList.find(iu->geographicalId().rawId())==theDetIdList.end())
+  for (const auto& iu : pDD->detUnits()) {
+    if (useConfFromDB) {
+      //apply the cable map _before_ digitization: consider only the detis that are connected
+      if (theDetIdList.find(iu->geographicalId().rawId()) == theDetIdList.end())
         continue;
     }
     auto sgd = dynamic_cast<StripGeomDetUnit const*>(iu);
-    if (sgd != nullptr){
+    if (sgd != nullptr) {
       edm::DetSet<SiStripDigi> collectorZS(iu->geographicalId().rawId());
       edm::DetSet<SiStripRawDigi> collectorRaw(iu->geographicalId().rawId());
       edm::DetSet<StripDigiSimLink> collectorLink(iu->geographicalId().rawId());
-      theDigiAlgo->digitize(collectorZS,collectorRaw,collectorLink,sgd,
-                            gainHandle,thresholdHandle,noiseHandle,pedestalHandle,theAffectedAPVvector,randomEngine_);
-      if(zeroSuppression){
-        if(!collectorZS.data.empty()){
+      theDigiAlgo->digitize(collectorZS,
+                            collectorRaw,
+                            collectorLink,
+                            sgd,
+                            gainHandle,
+                            thresholdHandle,
+                            noiseHandle,
+                            pedestalHandle,
+                            theAffectedAPVvector,
+                            randomEngine_);
+      if (zeroSuppression) {
+        if (!collectorZS.data.empty()) {
           theDigiVector.push_back(collectorZS);
-          if( !collectorLink.data.empty() ) pOutputDigiSimLink->insert(collectorLink);
+          if (!collectorLink.data.empty())
+            pOutputDigiSimLink->insert(collectorLink);
         }
-      }else{
-        if(!collectorRaw.data.empty()){
+      } else {
+        if (!collectorRaw.data.empty()) {
           theRawDigiVector.push_back(collectorRaw);
-          if( !collectorLink.data.empty() ) pOutputDigiSimLink->insert(collectorLink);
+          if (!collectorLink.data.empty())
+            pOutputDigiSimLink->insert(collectorLink);
         }
       }
     }
   }
-  if(zeroSuppression){
+  if (zeroSuppression) {
     // Step C: create output collection
-    std::unique_ptr<edm::DetSetVector<SiStripRawDigi> > output_virginraw(new edm::DetSetVector<SiStripRawDigi>());
-    std::unique_ptr<edm::DetSetVector<SiStripRawDigi> > output_scopemode(new edm::DetSetVector<SiStripRawDigi>());
-    std::unique_ptr<edm::DetSetVector<SiStripRawDigi> > output_processedraw(new edm::DetSetVector<SiStripRawDigi>());
-    std::unique_ptr<edm::DetSetVector<SiStripDigi> > output(new edm::DetSetVector<SiStripDigi>(theDigiVector) );
-    std::unique_ptr<std::vector<std::pair<int,std::bitset<6>>> > AffectedAPVList(new std::vector<std::pair<int,std::bitset<6>>>(theAffectedAPVvector));
+    std::unique_ptr<edm::DetSetVector<SiStripRawDigi>> output_virginraw(new edm::DetSetVector<SiStripRawDigi>());
+    std::unique_ptr<edm::DetSetVector<SiStripRawDigi>> output_scopemode(new edm::DetSetVector<SiStripRawDigi>());
+    std::unique_ptr<edm::DetSetVector<SiStripRawDigi>> output_processedraw(new edm::DetSetVector<SiStripRawDigi>());
+    std::unique_ptr<edm::DetSetVector<SiStripDigi>> output(new edm::DetSetVector<SiStripDigi>(theDigiVector));
+    std::unique_ptr<std::vector<std::pair<int, std::bitset<6>>>> AffectedAPVList(
+        new std::vector<std::pair<int, std::bitset<6>>>(theAffectedAPVvector));
     // Step D: write output to file
     iEvent.put(std::move(output), ZSDigi);
     iEvent.put(std::move(output_scopemode), SCDigi);
     iEvent.put(std::move(output_virginraw), VRDigi);
     iEvent.put(std::move(output_processedraw), PRDigi);
-    iEvent.put(std::move(AffectedAPVList),"AffectedAPVList");
-    if( makeDigiSimLinks_ ) iEvent.put(std::move(pOutputDigiSimLink)); // The previous EDProducer didn't name this collection so I won't either
-  }else{
+    iEvent.put(std::move(AffectedAPVList), "AffectedAPVList");
+    if (makeDigiSimLinks_)
+      iEvent.put(
+          std::move(pOutputDigiSimLink));  // The previous EDProducer didn't name this collection so I won't either
+  } else {
     // Step C: create output collection
-    std::unique_ptr<edm::DetSetVector<SiStripRawDigi> > output_virginraw(new edm::DetSetVector<SiStripRawDigi>(theRawDigiVector));
-    std::unique_ptr<edm::DetSetVector<SiStripRawDigi> > output_scopemode(new edm::DetSetVector<SiStripRawDigi>());
-    std::unique_ptr<edm::DetSetVector<SiStripRawDigi> > output_processedraw(new edm::DetSetVector<SiStripRawDigi>());
-    std::unique_ptr<edm::DetSetVector<SiStripDigi> > output(new edm::DetSetVector<SiStripDigi>() );
+    std::unique_ptr<edm::DetSetVector<SiStripRawDigi>> output_virginraw(
+        new edm::DetSetVector<SiStripRawDigi>(theRawDigiVector));
+    std::unique_ptr<edm::DetSetVector<SiStripRawDigi>> output_scopemode(new edm::DetSetVector<SiStripRawDigi>());
+    std::unique_ptr<edm::DetSetVector<SiStripRawDigi>> output_processedraw(new edm::DetSetVector<SiStripRawDigi>());
+    std::unique_ptr<edm::DetSetVector<SiStripDigi>> output(new edm::DetSetVector<SiStripDigi>());
     // Step D: write output to file
     iEvent.put(std::move(output), ZSDigi);
     iEvent.put(std::move(output_scopemode), SCDigi);
     iEvent.put(std::move(output_virginraw), VRDigi);
     iEvent.put(std::move(output_processedraw), PRDigi);
-    if( makeDigiSimLinks_ ) iEvent.put(std::move(pOutputDigiSimLink)); // The previous EDProducer didn't name this collection so I won't either
+    if (makeDigiSimLinks_)
+      iEvent.put(
+          std::move(pOutputDigiSimLink));  // The previous EDProducer didn't name this collection so I won't either
   }
-  randomEngine_ = nullptr; // to prevent access outside event
+  randomEngine_ = nullptr;  // to prevent access outside event
 }
diff --git a/SimTracker/SiStripDigitizer/plugins/SiStripDigitizer.h b/SimTracker/SiStripDigitizer/plugins/SiStripDigitizer.h
index b5a616c72fed0..27f5a11373ed6 100644
--- a/SimTracker/SiStripDigitizer/plugins/SiStripDigitizer.h
+++ b/SimTracker/SiStripDigitizer/plugins/SiStripDigitizer.h
@@ -22,9 +22,10 @@ namespace edm {
   class Event;
   class EventSetup;
   class ParameterSet;
-  template<typename T> class Handle;
+  template <typename T>
+  class Handle;
   class StreamID;
-}
+}  // namespace edm
 
 class MagneticField;
 class PileUpEventPrincipal;
@@ -44,29 +45,33 @@ class TrackerGeometry;
 class SiStripDigitizer : public DigiAccumulatorMixMod {
 public:
   explicit SiStripDigitizer(const edm::ParameterSet& conf, edm::ProducerBase& mixMod, edm::ConsumesCollector& iC);
-  
+
   ~SiStripDigitizer() override;
-  
+
   void initializeEvent(edm::Event const& e, edm::EventSetup const& c) override;
   void accumulate(edm::Event const& e, edm::EventSetup const& c) override;
   void accumulate(PileUpEventPrincipal const& e, edm::EventSetup const& c, edm::StreamID const&) override;
   void finalizeEvent(edm::Event& e, edm::EventSetup const& c) override;
 
-  void StorePileupInformation( std::vector<int> &numInteractionList,
-				       std::vector<int> &bunchCrossingList,
-				       std::vector<float> &TrueInteractionList,
-				       std::vector<edm::EventID> &eventInfoList, int bunchSpacing) override{
-    PileupInfo_ = std::make_unique<PileupMixingContent>(numInteractionList, bunchCrossingList, TrueInteractionList, eventInfoList, bunchSpacing);
-  } 
+  void StorePileupInformation(std::vector<int>& numInteractionList,
+                              std::vector<int>& bunchCrossingList,
+                              std::vector<float>& TrueInteractionList,
+                              std::vector<edm::EventID>& eventInfoList,
+                              int bunchSpacing) override {
+    PileupInfo_ = std::make_unique<PileupMixingContent>(
+        numInteractionList, bunchCrossingList, TrueInteractionList, eventInfoList, bunchSpacing);
+  }
 
   PileupMixingContent* getEventPileupInfo() override { return PileupInfo_.get(); }
 
-  
 private:
-  void accumulateStripHits(edm::Handle<std::vector<PSimHit> >, const TrackerTopology *tTopo, size_t globalSimHitIndex, const unsigned int tofBin);
+  void accumulateStripHits(edm::Handle<std::vector<PSimHit>>,
+                           const TrackerTopology* tTopo,
+                           size_t globalSimHitIndex,
+                           const unsigned int tofBin);
 
   typedef std::vector<std::string> vstring;
-  typedef std::map<unsigned int, std::vector<std::pair<const PSimHit*, int> >,std::less<unsigned int> > simhit_map;
+  typedef std::map<unsigned int, std::vector<std::pair<const PSimHit*, int>>, std::less<unsigned int>> simhit_map;
   typedef simhit_map::iterator simhit_map_iterator;
 
   const std::string gainLabel;
@@ -79,7 +84,7 @@ class SiStripDigitizer : public DigiAccumulatorMixMod {
   const std::string geometryType;
   const bool useConfFromDB;
   const bool zeroSuppression;
-  const bool makeDigiSimLinks_; 
+  const bool makeDigiSimLinks_;
 
   ///< Whether or not to create the association to sim truth collection. Set in configuration.
   /** @brief Offset to add to the index of each sim hit to account for which crossing it's in.
@@ -90,18 +95,17 @@ class SiStripDigitizer : public DigiAccumulatorMixMod {
    * hit in a given crossing. This assumes that the crossings are processed in the same order here as they are
    * put into the crossing frame, which I'm pretty sure is true.<br/>
    * The key is the name of the sim hit collection. */
-  std::map<std::string,size_t> crossingSimHitIndexOffset_;
+  std::map<std::string, size_t> crossingSimHitIndexOffset_;
 
   std::unique_ptr<SiStripDigitizerAlgorithm> theDigiAlgo;
-  std::map<uint32_t, std::vector<int> > theDetIdList;
+  std::map<uint32_t, std::vector<int>> theDetIdList;
   edm::ESHandle<TrackerGeometry> pDD;
   edm::ESHandle<MagneticField> pSetup;
-  std::map<unsigned int, StripGeomDetUnit const *> detectorUnits;
+  std::map<unsigned int, StripGeomDetUnit const*> detectorUnits;
   CLHEP::HepRandomEngine* randomEngine_ = nullptr;
-  std::vector<std::pair<int,std::bitset<6>>> theAffectedAPVvector;
+  std::vector<std::pair<int, std::bitset<6>>> theAffectedAPVvector;
 
   std::unique_ptr<PileupMixingContent> PileupInfo_;
-
 };
 
 #endif
diff --git a/SimTracker/SiStripDigitizer/plugins/SiStripDigitizerAlgorithm.cc b/SimTracker/SiStripDigitizer/plugins/SiStripDigitizerAlgorithm.cc
index 599a1b1634b82..37336ddc45d77 100644
--- a/SimTracker/SiStripDigitizer/plugins/SiStripDigitizerAlgorithm.cc
+++ b/SimTracker/SiStripDigitizer/plugins/SiStripDigitizerAlgorithm.cc
@@ -35,90 +35,92 @@
 
 #include <boost/algorithm/string.hpp>
 
-SiStripDigitizerAlgorithm::SiStripDigitizerAlgorithm(const edm::ParameterSet& conf):
-  lorentzAngleName(conf.getParameter<std::string>("LorentzAngle")),
-  theThreshold(conf.getParameter<double>("NoiseSigmaThreshold")),
-  cmnRMStib(conf.getParameter<double>("cmnRMStib")),
-  cmnRMStob(conf.getParameter<double>("cmnRMStob")),
-  cmnRMStid(conf.getParameter<double>("cmnRMStid")),
-  cmnRMStec(conf.getParameter<double>("cmnRMStec")),
-  APVSaturationProbScaling_(conf.getParameter<double>("APVSaturationProbScaling")),
-  makeDigiSimLinks_(conf.getUntrackedParameter<bool>("makeDigiSimLinks", false)),
-  peakMode(conf.getParameter<bool>("APVpeakmode")),
-  noise(conf.getParameter<bool>("Noise")),
-  RealPedestals(conf.getParameter<bool>("RealPedestals")), 
-  SingleStripNoise(conf.getParameter<bool>("SingleStripNoise")),
-  CommonModeNoise(conf.getParameter<bool>("CommonModeNoise")),
-  BaselineShift(conf.getParameter<bool>("BaselineShift")),
-  APVSaturationFromHIP(conf.getParameter<bool>("APVSaturationFromHIP")),
-  theFedAlgo(conf.getParameter<int>("FedAlgorithm")),
-  zeroSuppression(conf.getParameter<bool>("ZeroSuppression")),
-  theElectronPerADC(conf.getParameter<double>( peakMode ? "electronPerAdcPeak" : "electronPerAdcDec" )),
-  theTOFCutForPeak(conf.getParameter<double>("TOFCutForPeak")),
-  theTOFCutForDeconvolution(conf.getParameter<double>("TOFCutForDeconvolution")),
-  tofCut(peakMode ? theTOFCutForPeak : theTOFCutForDeconvolution),
-  cosmicShift(conf.getUntrackedParameter<double>("CosmicDelayShift")),
-  inefficiency(conf.getParameter<double>("Inefficiency")),
-  pedOffset((unsigned int)conf.getParameter<double>("PedestalsOffset")),
-  PreMixing_(conf.getParameter<bool>("PreMixingMode")),
-  theSiHitDigitizer(new SiHitDigitizer(conf)),
-  theSiPileUpSignals(new SiPileUpSignals()),
-  theSiNoiseAdder(new SiGaussianTailNoiseAdder(theThreshold)),
-  theSiDigitalConverter(new SiTrivialDigitalConverter(theElectronPerADC, PreMixing_)),
-  theSiZeroSuppress(new SiStripFedZeroSuppression(theFedAlgo)),
-  APVProbabilityFile(conf.getParameter<edm::FileInPath>("APVProbabilityFile")) {
-
+SiStripDigitizerAlgorithm::SiStripDigitizerAlgorithm(const edm::ParameterSet& conf)
+    : lorentzAngleName(conf.getParameter<std::string>("LorentzAngle")),
+      theThreshold(conf.getParameter<double>("NoiseSigmaThreshold")),
+      cmnRMStib(conf.getParameter<double>("cmnRMStib")),
+      cmnRMStob(conf.getParameter<double>("cmnRMStob")),
+      cmnRMStid(conf.getParameter<double>("cmnRMStid")),
+      cmnRMStec(conf.getParameter<double>("cmnRMStec")),
+      APVSaturationProbScaling_(conf.getParameter<double>("APVSaturationProbScaling")),
+      makeDigiSimLinks_(conf.getUntrackedParameter<bool>("makeDigiSimLinks", false)),
+      peakMode(conf.getParameter<bool>("APVpeakmode")),
+      noise(conf.getParameter<bool>("Noise")),
+      RealPedestals(conf.getParameter<bool>("RealPedestals")),
+      SingleStripNoise(conf.getParameter<bool>("SingleStripNoise")),
+      CommonModeNoise(conf.getParameter<bool>("CommonModeNoise")),
+      BaselineShift(conf.getParameter<bool>("BaselineShift")),
+      APVSaturationFromHIP(conf.getParameter<bool>("APVSaturationFromHIP")),
+      theFedAlgo(conf.getParameter<int>("FedAlgorithm")),
+      zeroSuppression(conf.getParameter<bool>("ZeroSuppression")),
+      theElectronPerADC(conf.getParameter<double>(peakMode ? "electronPerAdcPeak" : "electronPerAdcDec")),
+      theTOFCutForPeak(conf.getParameter<double>("TOFCutForPeak")),
+      theTOFCutForDeconvolution(conf.getParameter<double>("TOFCutForDeconvolution")),
+      tofCut(peakMode ? theTOFCutForPeak : theTOFCutForDeconvolution),
+      cosmicShift(conf.getUntrackedParameter<double>("CosmicDelayShift")),
+      inefficiency(conf.getParameter<double>("Inefficiency")),
+      pedOffset((unsigned int)conf.getParameter<double>("PedestalsOffset")),
+      PreMixing_(conf.getParameter<bool>("PreMixingMode")),
+      theSiHitDigitizer(new SiHitDigitizer(conf)),
+      theSiPileUpSignals(new SiPileUpSignals()),
+      theSiNoiseAdder(new SiGaussianTailNoiseAdder(theThreshold)),
+      theSiDigitalConverter(new SiTrivialDigitalConverter(theElectronPerADC, PreMixing_)),
+      theSiZeroSuppress(new SiStripFedZeroSuppression(theFedAlgo)),
+      APVProbabilityFile(conf.getParameter<edm::FileInPath>("APVProbabilityFile")) {
   if (peakMode) {
-    LogDebug("StripDigiInfo")<<"APVs running in peak mode (poor time resolution)";
+    LogDebug("StripDigiInfo") << "APVs running in peak mode (poor time resolution)";
   } else {
-    LogDebug("StripDigiInfo")<<"APVs running in deconvolution mode (good time resolution)";
+    LogDebug("StripDigiInfo") << "APVs running in deconvolution mode (good time resolution)";
   };
-  if(SingleStripNoise) LogDebug("SiStripDigitizerAlgorithm")<<" SingleStripNoise: ON";
-  else LogDebug("SiStripDigitizerAlgorithm")<<" SingleStripNoise: OFF";
-  if(CommonModeNoise) LogDebug("SiStripDigitizerAlgorithm")<<" CommonModeNoise: ON";
-  else LogDebug("SiStripDigitizerAlgorithm")<<" CommonModeNoise: OFF";
-  if(PreMixing_ && APVSaturationFromHIP) throw cms::Exception("PreMixing does not work with HIP loss simulation yet");
-  if(APVSaturationFromHIP){  
-    std::string line; 
+  if (SingleStripNoise)
+    LogDebug("SiStripDigitizerAlgorithm") << " SingleStripNoise: ON";
+  else
+    LogDebug("SiStripDigitizerAlgorithm") << " SingleStripNoise: OFF";
+  if (CommonModeNoise)
+    LogDebug("SiStripDigitizerAlgorithm") << " CommonModeNoise: ON";
+  else
+    LogDebug("SiStripDigitizerAlgorithm") << " CommonModeNoise: OFF";
+  if (PreMixing_ && APVSaturationFromHIP)
+    throw cms::Exception("PreMixing does not work with HIP loss simulation yet");
+  if (APVSaturationFromHIP) {
+    std::string line;
     APVProbaFile.open((APVProbabilityFile.fullPath()).c_str());
-    if (APVProbaFile.is_open()){
-      while ( getline (APVProbaFile,line) ){
+    if (APVProbaFile.is_open()) {
+      while (getline(APVProbaFile, line)) {
         std::vector<std::string> strs;
-          boost::split(strs,line,boost::is_any_of(" "));
-          if(strs.size()==2){
-            mapOfAPVprobabilities[std::stoi(strs.at(0))]=std::stof(strs.at(1));
-          }
+        boost::split(strs, line, boost::is_any_of(" "));
+        if (strs.size() == 2) {
+          mapOfAPVprobabilities[std::stoi(strs.at(0))] = std::stof(strs.at(1));
+        }
       }
       APVProbaFile.close();
-    }else throw cms::Exception("MissingInput")
-         << "It seems that the APV probability list is missing\n";
+    } else
+      throw cms::Exception("MissingInput") << "It seems that the APV probability list is missing\n";
   }
 }
 
-SiStripDigitizerAlgorithm::~SiStripDigitizerAlgorithm(){
-}
+SiStripDigitizerAlgorithm::~SiStripDigitizerAlgorithm() {}
 
-void
-SiStripDigitizerAlgorithm::initializeDetUnit(StripGeomDetUnit const * det, const edm::EventSetup& iSetup){
+void SiStripDigitizerAlgorithm::initializeDetUnit(StripGeomDetUnit const* det, const edm::EventSetup& iSetup) {
   edm::ESHandle<SiStripBadStrip> deadChannelHandle;
   iSetup.get<SiStripBadChannelRcd>().get(deadChannelHandle);
 
   unsigned int detId = det->geographicalId().rawId();
-  int numStrips = (det->specificTopology()).nstrips();  
+  int numStrips = (det->specificTopology()).nstrips();
 
   SiStripBadStrip::Range detBadStripRange = deadChannelHandle->getRange(detId);
   //storing the bad strip of the the module. the module is not removed but just signal put to 0
   std::vector<bool>& badChannels = allBadChannels[detId];
   badChannels.clear();
   badChannels.insert(badChannels.begin(), numStrips, false);
-  for(SiStripBadStrip::ContainerIterator it = detBadStripRange.first; it != detBadStripRange.second; ++it) {
+  for (SiStripBadStrip::ContainerIterator it = detBadStripRange.first; it != detBadStripRange.second; ++it) {
     SiStripBadStrip::data fs = deadChannelHandle->decode(*it);
-    for(int strip = fs.firstStrip; strip < fs.firstStrip + fs.range; ++strip) {
-		badChannels[strip] = true;
-	}
+    for (int strip = fs.firstStrip; strip < fs.firstStrip + fs.range; ++strip) {
+      badChannels[strip] = true;
+    }
   }
   firstChannelsWithSignal[detId] = numStrips;
-  lastChannelsWithSignal[detId]= 0;
+  lastChannelsWithSignal[detId] = 0;
 
   //  if(APVSaturationFromHIP){
   //  std::bitset<6> &bs=SiStripTrackerAffectedAPVMap[detId];
@@ -126,8 +128,7 @@ SiStripDigitizerAlgorithm::initializeDetUnit(StripGeomDetUnit const * det, const
   //}
 }
 
-void
-SiStripDigitizerAlgorithm::initializeEvent(const edm::EventSetup& iSetup) {
+void SiStripDigitizerAlgorithm::initializeEvent(const edm::EventSetup& iSetup) {
   theSiPileUpSignals->reset();
   // This should be clear by after all calls to digitize(), but I might as well make sure
   associationInfoForDetId_.clear();
@@ -141,24 +142,23 @@ SiStripDigitizerAlgorithm::initializeEvent(const edm::EventSetup& iSetup) {
   edm::ESHandle<ParticleDataTable> pdt;
   iSetup.getData(pdt);
   setParticleDataTable(&*pdt);
-  iSetup.get<SiStripLorentzAngleSimRcd>().get(lorentzAngleName,lorentzAngleHandle);
+  iSetup.get<SiStripLorentzAngleSimRcd>().get(lorentzAngleName, lorentzAngleHandle);
 }
 
 //  Run the algorithm for a given module
 //  ------------------------------------
 
-void
-SiStripDigitizerAlgorithm::accumulateSimHits(std::vector<PSimHit>::const_iterator inputBegin,
-                                             std::vector<PSimHit>::const_iterator inputEnd,
-                                             size_t inputBeginGlobalIndex,
-					     unsigned int tofBin,
-                                             const StripGeomDetUnit* det,
-                                             const GlobalVector& bfield,
-					     const TrackerTopology *tTopo,
-                                             CLHEP::HepRandomEngine* engine) {
+void SiStripDigitizerAlgorithm::accumulateSimHits(std::vector<PSimHit>::const_iterator inputBegin,
+                                                  std::vector<PSimHit>::const_iterator inputEnd,
+                                                  size_t inputBeginGlobalIndex,
+                                                  unsigned int tofBin,
+                                                  const StripGeomDetUnit* det,
+                                                  const GlobalVector& bfield,
+                                                  const TrackerTopology* tTopo,
+                                                  CLHEP::HepRandomEngine* engine) {
   // produce SignalPoints for all SimHits in detector
   unsigned int detID = det->geographicalId().rawId();
-  int numStrips = (det->specificTopology()).nstrips();  
+  int numStrips = (det->specificTopology()).nstrips();
 
   size_t thisFirstChannelWithSignal = numStrips;
   size_t thisLastChannelWithSignal = 0;
@@ -171,381 +171,415 @@ SiStripDigitizerAlgorithm::accumulateSimHits(std::vector<PSimHit>::const_iterato
 
   uint32_t detId = det->geographicalId().rawId();
   // First: loop on the SimHits
-  if(CLHEP::RandFlat::shoot(engine) > inefficiency) {
-    AssociationInfoForChannel* pDetIDAssociationInfo; // I only need this if makeDigiSimLinks_ is true...
-    if( makeDigiSimLinks_ ) pDetIDAssociationInfo=&(associationInfoForDetId_[detId]); // ...so only search the map if that is the case
-    std::vector<float> previousLocalAmplitude; // Only used if makeDigiSimLinks_ is true. Needed to work out the change in amplitude.
-
-    size_t simHitGlobalIndex=inputBeginGlobalIndex; // This needs to stored to create the digi-sim link later
-    for (std::vector<PSimHit>::const_iterator simHitIter = inputBegin; simHitIter != inputEnd; ++simHitIter, ++simHitGlobalIndex ) {
+  if (CLHEP::RandFlat::shoot(engine) > inefficiency) {
+    AssociationInfoForChannel* pDetIDAssociationInfo;  // I only need this if makeDigiSimLinks_ is true...
+    if (makeDigiSimLinks_)
+      pDetIDAssociationInfo = &(associationInfoForDetId_[detId]);  // ...so only search the map if that is the case
+    std::vector<float>
+        previousLocalAmplitude;  // Only used if makeDigiSimLinks_ is true. Needed to work out the change in amplitude.
+
+    size_t simHitGlobalIndex = inputBeginGlobalIndex;  // This needs to stored to create the digi-sim link later
+    for (std::vector<PSimHit>::const_iterator simHitIter = inputBegin; simHitIter != inputEnd;
+         ++simHitIter, ++simHitGlobalIndex) {
       // skip hits not in this detector.
-      if((*simHitIter).detUnitId() != detId) {
+      if ((*simHitIter).detUnitId() != detId) {
         continue;
       }
       // check TOF
-      if (std::fabs(simHitIter->tof() - cosmicShift - det->surface().toGlobal(simHitIter->localPosition()).mag()/30.) < tofCut && simHitIter->energyLoss()>0) {
-        if( makeDigiSimLinks_ ) previousLocalAmplitude=locAmpl; // Not needed except to make the sim link association.
+      if (std::fabs(simHitIter->tof() - cosmicShift -
+                    det->surface().toGlobal(simHitIter->localPosition()).mag() / 30.) < tofCut &&
+          simHitIter->energyLoss() > 0) {
+        if (makeDigiSimLinks_)
+          previousLocalAmplitude = locAmpl;  // Not needed except to make the sim link association.
         size_t localFirstChannel = numStrips;
-        size_t localLastChannel  = 0;
+        size_t localLastChannel = 0;
         // process the hit
-        theSiHitDigitizer->processHit(&*simHitIter, *det, bfield, langle, locAmpl, localFirstChannel, localLastChannel, tTopo, engine);
- 
-        if(thisFirstChannelWithSignal > localFirstChannel) thisFirstChannelWithSignal = localFirstChannel;
-        if(thisLastChannelWithSignal < localLastChannel) thisLastChannelWithSignal = localLastChannel;
+        theSiHitDigitizer->processHit(
+            &*simHitIter, *det, bfield, langle, locAmpl, localFirstChannel, localLastChannel, tTopo, engine);
 
-        if( makeDigiSimLinks_ ) { // No need to do any of this if truth association was turned off in the configuration
-          for( size_t stripIndex=0; stripIndex<locAmpl.size(); ++stripIndex ) {
+        if (thisFirstChannelWithSignal > localFirstChannel)
+          thisFirstChannelWithSignal = localFirstChannel;
+        if (thisLastChannelWithSignal < localLastChannel)
+          thisLastChannelWithSignal = localLastChannel;
+
+        if (makeDigiSimLinks_) {  // No need to do any of this if truth association was turned off in the configuration
+          for (size_t stripIndex = 0; stripIndex < locAmpl.size(); ++stripIndex) {
             // Work out the amplitude from this SimHit from the difference of what it was before and what it is now
-            float signalFromThisSimHit=locAmpl[stripIndex]-previousLocalAmplitude[stripIndex];
-            if( signalFromThisSimHit!=0 ) { // If this SimHit had any contribution I need to record it.
-              auto& associationVector=(*pDetIDAssociationInfo)[stripIndex];
-              bool addNewEntry=true;
+            float signalFromThisSimHit = locAmpl[stripIndex] - previousLocalAmplitude[stripIndex];
+            if (signalFromThisSimHit != 0) {  // If this SimHit had any contribution I need to record it.
+              auto& associationVector = (*pDetIDAssociationInfo)[stripIndex];
+              bool addNewEntry = true;
               // Make sure the hit isn't in already. I've seen this a few times, it always seems to happen in pairs so I think
               // it's something to do with the stereo strips.
-              for( auto& associationInfo : associationVector ) {
-                if( associationInfo.trackID==simHitIter->trackId() && associationInfo.eventID==simHitIter->eventId() ) {
+              for (auto& associationInfo : associationVector) {
+                if (associationInfo.trackID == simHitIter->trackId() &&
+                    associationInfo.eventID == simHitIter->eventId()) {
                   // The hit is already in, so add this second contribution and move on
-                  associationInfo.contributionToADC+=signalFromThisSimHit;
-                  addNewEntry=false;
+                  associationInfo.contributionToADC += signalFromThisSimHit;
+                  addNewEntry = false;
                   break;
                 }
-              } // end of loop over associationVector
+              }  // end of loop over associationVector
               // If the hit wasn't already in create a new association info structure.
-              if( addNewEntry ) associationVector.push_back( AssociationInfo{ simHitIter->trackId(), simHitIter->eventId(), signalFromThisSimHit, simHitGlobalIndex, tofBin } );
-            } // end of "if( signalFromThisSimHit!=0 )"
-          } // end of loop over locAmpl strips
-        } // end of "if( makeDigiSimLinks_ )"
-      } // end of TOF check
-    } // end for
+              if (addNewEntry)
+                associationVector.push_back(AssociationInfo{
+                    simHitIter->trackId(), simHitIter->eventId(), signalFromThisSimHit, simHitGlobalIndex, tofBin});
+            }  // end of "if( signalFromThisSimHit!=0 )"
+          }    // end of loop over locAmpl strips
+        }      // end of "if( makeDigiSimLinks_ )"
+      }        // end of TOF check
+    }          // end for
   }
   theSiPileUpSignals->add(detID, locAmpl, thisFirstChannelWithSignal, thisLastChannelWithSignal);
 
-  if(firstChannelsWithSignal[detID] > thisFirstChannelWithSignal) firstChannelsWithSignal[detID] = thisFirstChannelWithSignal;
-  if(lastChannelsWithSignal[detID] < thisLastChannelWithSignal) lastChannelsWithSignal[detID] = thisLastChannelWithSignal;
+  if (firstChannelsWithSignal[detID] > thisFirstChannelWithSignal)
+    firstChannelsWithSignal[detID] = thisFirstChannelWithSignal;
+  if (lastChannelsWithSignal[detID] < thisLastChannelWithSignal)
+    lastChannelsWithSignal[detID] = thisLastChannelWithSignal;
 }
 
-//============================================================================                
-void SiStripDigitizerAlgorithm::calculateInstlumiScale(PileupMixingContent* puInfo){
-  //Instlumi scalefactor calculating for dynamic inefficiency                                 
+//============================================================================
+void SiStripDigitizerAlgorithm::calculateInstlumiScale(PileupMixingContent* puInfo) {
+  //Instlumi scalefactor calculating for dynamic inefficiency
 
   if (puInfo && FirstLumiCalc_) {
-
     const std::vector<int>& bunchCrossing = puInfo->getMix_bunchCrossing();
     const std::vector<float>& TrueInteractionList = puInfo->getMix_TrueInteractions();
-    const int bunchSpacing = puInfo->getMix_bunchSpacing();                                 
+    const int bunchSpacing = puInfo->getMix_bunchSpacing();
 
     double RevFreq = 11245.;
     double minBXsec = 70.0E-27;  // use 70mb as an approximation
     double Bunch = 2100.;        // 2016 value
-    if (bunchSpacing == 50) Bunch = Bunch/2.;
+    if (bunchSpacing == 50)
+      Bunch = Bunch / 2.;
 
     int pui = 0, p = 0;
     std::vector<int>::const_iterator pu;
     std::vector<int>::const_iterator pu0 = bunchCrossing.end();
 
-    for (pu=bunchCrossing.begin(); pu!=bunchCrossing.end(); ++pu) {
-      if (*pu==0) {
+    for (pu = bunchCrossing.begin(); pu != bunchCrossing.end(); ++pu) {
+      if (*pu == 0) {
         pu0 = pu;
         p = pui;
       }
       pui++;
     }
-    if (pu0!=bunchCrossing.end()) {  // found the in-time interaction
+    if (pu0 != bunchCrossing.end()) {  // found the in-time interaction
       double Tintr = TrueInteractionList.at(p);
-      double instLumi = Bunch*Tintr*RevFreq/minBXsec;
-      APVSaturationProb_ = instLumi/6.0E33;      
+      double instLumi = Bunch * Tintr * RevFreq / minBXsec;
+      APVSaturationProb_ = instLumi / 6.0E33;
     }
     FirstLumiCalc_ = false;
   }
 }
 
-//============================================================================                
-
-
-void
-SiStripDigitizerAlgorithm::digitize(
-			   edm::DetSet<SiStripDigi>& outdigi,
-			   edm::DetSet<SiStripRawDigi>& outrawdigi,
-			   edm::DetSet<StripDigiSimLink>& outLink,
-			   const StripGeomDetUnit *det,
-			   edm::ESHandle<SiStripGain> & gainHandle,
-			   edm::ESHandle<SiStripThreshold> & thresholdHandle,
-			   edm::ESHandle<SiStripNoises> & noiseHandle,
-			   edm::ESHandle<SiStripPedestals> & pedestalHandle,
-			   std::vector<std::pair<int,std::bitset<6>>> & theAffectedAPVvector,
-                           CLHEP::HepRandomEngine* engine) {
+//============================================================================
+
+void SiStripDigitizerAlgorithm::digitize(edm::DetSet<SiStripDigi>& outdigi,
+                                         edm::DetSet<SiStripRawDigi>& outrawdigi,
+                                         edm::DetSet<StripDigiSimLink>& outLink,
+                                         const StripGeomDetUnit* det,
+                                         edm::ESHandle<SiStripGain>& gainHandle,
+                                         edm::ESHandle<SiStripThreshold>& thresholdHandle,
+                                         edm::ESHandle<SiStripNoises>& noiseHandle,
+                                         edm::ESHandle<SiStripPedestals>& pedestalHandle,
+                                         std::vector<std::pair<int, std::bitset<6>>>& theAffectedAPVvector,
+                                         CLHEP::HepRandomEngine* engine) {
   unsigned int detID = det->geographicalId().rawId();
-  int numStrips = (det->specificTopology()).nstrips();  
+  int numStrips = (det->specificTopology()).nstrips();
 
-  const SiPileUpSignals::SignalMapType* theSignal(theSiPileUpSignals->getSignal(detID));  
+  const SiPileUpSignals::SignalMapType* theSignal(theSiPileUpSignals->getSignal(detID));
 
   std::vector<float> detAmpl(numStrips, 0.);
-  if(theSignal) {
-    for(const auto& amp : *theSignal) {
+  if (theSignal) {
+    for (const auto& amp : *theSignal) {
       detAmpl[amp.first] = amp.second;
     }
   }
 
   //removing signal from the dead (and HIP effected) strips
   std::vector<bool>& badChannels = allBadChannels[detID];
-  for(int strip =0; strip < numStrips; ++strip) {
-    if(badChannels[strip]) {detAmpl[strip] = 0.;}
-  } 
+  for (int strip = 0; strip < numStrips; ++strip) {
+    if (badChannels[strip]) {
+      detAmpl[strip] = 0.;
+    }
+  }
 
-  if(APVSaturationFromHIP){
+  if (APVSaturationFromHIP) {
     //Implementation of the proper charge scaling function. Need consider resaturation effect:
     //The probability map gives  the probability that at least one HIP happened during the last N bunch crossings (cfr APV recovery time).
     //The impact on the charge depends on the clostest HIP occurance (in terms of bunch crossing).
     //The function discribing the APV recovery is therefore the weighted average function which takes into account all possibilities of HIP occurances across the last bx's.
 
     // do this step here because we now have access to luminosity information
-    if(FirstDigitize_) {
-
-      for(std::map<int,float>::iterator iter = mapOfAPVprobabilities.begin(); iter != mapOfAPVprobabilities.end(); ++iter){
-	std::bitset<6> bs;
-	for(int Napv=0;Napv<6;Napv++){
-	  float cursor=CLHEP::RandFlat::shoot(engine);
-	  bs[Napv]=cursor < iter->second*APVSaturationProb_ ? true:false;  //APVSaturationProb has been scaled by PU luminosity
-	}
-	SiStripTrackerAffectedAPVMap[iter->first]=bs;
+    if (FirstDigitize_) {
+      for (std::map<int, float>::iterator iter = mapOfAPVprobabilities.begin(); iter != mapOfAPVprobabilities.end();
+           ++iter) {
+        std::bitset<6> bs;
+        for (int Napv = 0; Napv < 6; Napv++) {
+          float cursor = CLHEP::RandFlat::shoot(engine);
+          bs[Napv] = cursor < iter->second * APVSaturationProb_
+                         ? true
+                         : false;  //APVSaturationProb has been scaled by PU luminosity
+        }
+        SiStripTrackerAffectedAPVMap[iter->first] = bs;
       }
 
-      NumberOfBxBetweenHIPandEvent=1e3;
-      bool HasAtleastOneAffectedAPV=false;
-      while(!HasAtleastOneAffectedAPV){
-	for(int bx=floor(300.0/25.0);bx>0;bx--){ //Reminder: make these numbers not hard coded!!
-	  float temp=CLHEP::RandFlat::shoot(engine)<0.5?1:0;
-	  if(temp==1 && bx<NumberOfBxBetweenHIPandEvent){
-	    NumberOfBxBetweenHIPandEvent=bx;
-	    HasAtleastOneAffectedAPV=true;
-	  }
-	}
+      NumberOfBxBetweenHIPandEvent = 1e3;
+      bool HasAtleastOneAffectedAPV = false;
+      while (!HasAtleastOneAffectedAPV) {
+        for (int bx = floor(300.0 / 25.0); bx > 0; bx--) {  //Reminder: make these numbers not hard coded!!
+          float temp = CLHEP::RandFlat::shoot(engine) < 0.5 ? 1 : 0;
+          if (temp == 1 && bx < NumberOfBxBetweenHIPandEvent) {
+            NumberOfBxBetweenHIPandEvent = bx;
+            HasAtleastOneAffectedAPV = true;
+          }
+        }
       }
 
       FirstDigitize_ = false;
     }
 
-    std::bitset<6> & bs=SiStripTrackerAffectedAPVMap[detID];
+    std::bitset<6>& bs = SiStripTrackerAffectedAPVMap[detID];
 
-    if(bs.any()){
+    if (bs.any()) {
       // store this information so it can be saved to the event later
-      theAffectedAPVvector.push_back(std::make_pair(detID,bs));
-
-      if(!PreMixing_) {
-
-	// Here below is the scaling function which describes the evolution of the baseline (i.e. how the charge is suppressed).
-	// This must be replaced as soon as we have a proper modeling of the baseline evolution from VR runs
-	float Shift=1-NumberOfBxBetweenHIPandEvent/floor(300.0/25.0); //Reminder: make these numbers not hardcoded!! 
-	float randomX=CLHEP::RandFlat::shoot(engine);
-	float scalingValue=(randomX-Shift)*10.0/7.0-3.0/7.0;
-
-	for(int strip =0; strip < numStrips; ++strip) {
-	  if(!badChannels[strip] &&  bs[strip/128]==1){
-	    detAmpl[strip] *=scalingValue>0?scalingValue:0.0;
-	  }
-	}
+      theAffectedAPVvector.push_back(std::make_pair(detID, bs));
+
+      if (!PreMixing_) {
+        // Here below is the scaling function which describes the evolution of the baseline (i.e. how the charge is suppressed).
+        // This must be replaced as soon as we have a proper modeling of the baseline evolution from VR runs
+        float Shift =
+            1 - NumberOfBxBetweenHIPandEvent / floor(300.0 / 25.0);  //Reminder: make these numbers not hardcoded!!
+        float randomX = CLHEP::RandFlat::shoot(engine);
+        float scalingValue = (randomX - Shift) * 10.0 / 7.0 - 3.0 / 7.0;
+
+        for (int strip = 0; strip < numStrips; ++strip) {
+          if (!badChannels[strip] && bs[strip / 128] == 1) {
+            detAmpl[strip] *= scalingValue > 0 ? scalingValue : 0.0;
+          }
+        }
       }
     }
   }
 
-
   SiStripNoises::Range detNoiseRange = noiseHandle->getRange(detID);
   SiStripApvGain::Range detGainRange = gainHandle->getRange(detID);
   SiStripPedestals::Range detPedestalRange = pedestalHandle->getRange(detID);
 
-// -----------------------------------------------------------
+  // -----------------------------------------------------------
 
   auto& firstChannelWithSignal = firstChannelsWithSignal[detID];
   auto& lastChannelWithSignal = lastChannelsWithSignal[detID];
-  auto iAssociationInfoByChannel=associationInfoForDetId_.find(detID); // Use an iterator so that I can easily remove it once finished
-
-  if(zeroSuppression){
+  auto iAssociationInfoByChannel =
+      associationInfoForDetId_.find(detID);  // Use an iterator so that I can easily remove it once finished
 
+  if (zeroSuppression) {
     //Adding the strip noise
-    //------------------------------------------------------  
-    if(noise){ 
-                         
-      if(SingleStripNoise){
-//      std::cout<<"In SSN, detId="<<detID<<std::endl;
-	std::vector<float> noiseRMSv; 
-	noiseRMSv.clear(); 
-	noiseRMSv.insert(noiseRMSv.begin(),numStrips,0.); 
-	for(int strip=0; strip< numStrips; ++strip){ 
-	  if(!badChannels[strip]){
-	    float gainValue = gainHandle->getStripGain(strip, detGainRange); 
-	    noiseRMSv[strip] = (noiseHandle->getNoise(strip,detNoiseRange))* theElectronPerADC/gainValue;
-	    //std::cout<<"<SiStripDigitizerAlgorithm::digitize>: gainValue: "<<gainValue<<"\tnoiseRMSv["<<strip<<"]: "<<noiseRMSv[strip]<<std::endl;
-	  }
-	}
-	theSiNoiseAdder->addNoiseVR(detAmpl, noiseRMSv, engine);
+    //------------------------------------------------------
+    if (noise) {
+      if (SingleStripNoise) {
+        //      std::cout<<"In SSN, detId="<<detID<<std::endl;
+        std::vector<float> noiseRMSv;
+        noiseRMSv.clear();
+        noiseRMSv.insert(noiseRMSv.begin(), numStrips, 0.);
+        for (int strip = 0; strip < numStrips; ++strip) {
+          if (!badChannels[strip]) {
+            float gainValue = gainHandle->getStripGain(strip, detGainRange);
+            noiseRMSv[strip] = (noiseHandle->getNoise(strip, detNoiseRange)) * theElectronPerADC / gainValue;
+            //std::cout<<"<SiStripDigitizerAlgorithm::digitize>: gainValue: "<<gainValue<<"\tnoiseRMSv["<<strip<<"]: "<<noiseRMSv[strip]<<std::endl;
+          }
+        }
+        theSiNoiseAdder->addNoiseVR(detAmpl, noiseRMSv, engine);
       } else {
-	int RefStrip = int(numStrips/2.);
-	while(RefStrip<numStrips&&badChannels[RefStrip]){ //if the refstrip is bad, I move up to when I don't find it 
-	  RefStrip++;
-	} 
-	if(RefStrip<numStrips){
-	  float RefgainValue = gainHandle->getStripGain(RefStrip, detGainRange);
-	  float RefnoiseRMS = noiseHandle->getNoise(RefStrip,detNoiseRange) *theElectronPerADC/RefgainValue; 
-	
-	  theSiNoiseAdder->addNoise(detAmpl,firstChannelWithSignal,lastChannelWithSignal,numStrips,RefnoiseRMS, engine);
-	  //std::cout<<"<SiStripDigitizerAlgorithm::digitize>: RefgainValue: "<<RefgainValue<<"\tRefnoiseRMS: "<<RefnoiseRMS<<std::endl;
-	}
+        int RefStrip = int(numStrips / 2.);
+        while (RefStrip < numStrips &&
+               badChannels[RefStrip]) {  //if the refstrip is bad, I move up to when I don't find it
+          RefStrip++;
+        }
+        if (RefStrip < numStrips) {
+          float RefgainValue = gainHandle->getStripGain(RefStrip, detGainRange);
+          float RefnoiseRMS = noiseHandle->getNoise(RefStrip, detNoiseRange) * theElectronPerADC / RefgainValue;
+
+          theSiNoiseAdder->addNoise(
+              detAmpl, firstChannelWithSignal, lastChannelWithSignal, numStrips, RefnoiseRMS, engine);
+          //std::cout<<"<SiStripDigitizerAlgorithm::digitize>: RefgainValue: "<<RefgainValue<<"\tRefnoiseRMS: "<<RefnoiseRMS<<std::endl;
+        }
       }
-    }//if noise
+    }  //if noise
 
     DigitalVecType digis;
-    theSiZeroSuppress->suppress(theSiDigitalConverter->convert(detAmpl, gainHandle, detID), digis, detID,noiseHandle,thresholdHandle);
+    theSiZeroSuppress->suppress(
+        theSiDigitalConverter->convert(detAmpl, gainHandle, detID), digis, detID, noiseHandle, thresholdHandle);
     // Now do the association to truth. Note that if truth association was turned off in the configuration this map
     // will be empty and the iterator will always equal associationInfoForDetId_.end().
-    if( iAssociationInfoByChannel!=associationInfoForDetId_.end() ) { // make sure the readings for this DetID aren't completely from noise
-      for( const auto& iDigi : digis ) {
-        auto& associationInfoByChannel=iAssociationInfoByChannel->second;
-        const std::vector<AssociationInfo>& associationInfo=associationInfoByChannel[iDigi.channel()];
+    if (iAssociationInfoByChannel !=
+        associationInfoForDetId_.end()) {  // make sure the readings for this DetID aren't completely from noise
+      for (const auto& iDigi : digis) {
+        auto& associationInfoByChannel = iAssociationInfoByChannel->second;
+        const std::vector<AssociationInfo>& associationInfo = associationInfoByChannel[iDigi.channel()];
 
         // Need to find the total from all sim hits, because this might not be the same as the total
         // digitised due to noise or whatever.
-        float totalSimADC=0;
-        for( const auto& iAssociationInfo : associationInfo ) totalSimADC+=iAssociationInfo.contributionToADC;
+        float totalSimADC = 0;
+        for (const auto& iAssociationInfo : associationInfo)
+          totalSimADC += iAssociationInfo.contributionToADC;
         // Now I know that I can loop again and create the links
-        for( const auto& iAssociationInfo : associationInfo ) {
+        for (const auto& iAssociationInfo : associationInfo) {
           // Note simHitGlobalIndex used to have +1 because TrackerHitAssociator (the only place I can find this value being used)
           // expected counting to start at 1, not 0.  Now changed.
-          outLink.push_back( StripDigiSimLink( iDigi.channel(), iAssociationInfo.trackID, iAssociationInfo.simHitGlobalIndex, iAssociationInfo.tofBin, iAssociationInfo.eventID, iAssociationInfo.contributionToADC/totalSimADC ) );
-        } // end of loop over associationInfo
-      } // end of loop over the digis
-    } // end of check that iAssociationInfoByChannel is a valid iterator
+          outLink.push_back(StripDigiSimLink(iDigi.channel(),
+                                             iAssociationInfo.trackID,
+                                             iAssociationInfo.simHitGlobalIndex,
+                                             iAssociationInfo.tofBin,
+                                             iAssociationInfo.eventID,
+                                             iAssociationInfo.contributionToADC / totalSimADC));
+        }  // end of loop over associationInfo
+      }    // end of loop over the digis
+    }      // end of check that iAssociationInfoByChannel is a valid iterator
     outdigi.data = digis;
-  }//if zeroSuppression
+  }  //if zeroSuppression
 
-  if(!zeroSuppression){
+  if (!zeroSuppression) {
     //if(noise){
-      // the constant pedestal offset is needed because
-      //   negative adc counts are not allowed in case
-      //   Pedestal and CMN subtraction is performed.
-      //   The pedestal value read from the conditions
-      //   is pedValue and after the pedestal subtraction
-      //   the baseline is zero. The Common Mode Noise
-      //   is not subtracted from the negative adc counts
-      //   channels. Adding pedOffset the baseline is set
-      //   to pedOffset after pedestal subtraction and CMN
-      //   is subtracted to all the channels since none of
-      //   them has negative adc value. The pedOffset is
-      //   treated as a constant component in the CMN
-      //   estimation and subtracted as CMN.
-      
-         
-		//calculating the charge deposited on each APV and subtracting the shift
-		//------------------------------------------------------
-		if(BaselineShift){
-		   theSiNoiseAdder->addBaselineShift(detAmpl, badChannels);
-		}
-		
-		//Adding the strip noise
-		//------------------------------------------------------						 
-		if(noise){
-		    std::vector<float> noiseRMSv;
-			noiseRMSv.clear();
-		    noiseRMSv.insert(noiseRMSv.begin(),numStrips,0.);
-			
-		    if(SingleStripNoise){
-			    for(int strip=0; strip< numStrips; ++strip){
-			  		if(!badChannels[strip]) noiseRMSv[strip] = (noiseHandle->getNoise(strip,detNoiseRange))* theElectronPerADC;
-			  	}
-			
-	    	} else {
-			    int RefStrip = 0; //int(numStrips/2.);
-		    	    while(RefStrip<numStrips&&badChannels[RefStrip]){ //if the refstrip is bad, I move up to when I don't find it
-					RefStrip++;
-				}
-				if(RefStrip<numStrips){
-					float noiseRMS = noiseHandle->getNoise(RefStrip,detNoiseRange) *theElectronPerADC;
-					for(int strip=0; strip< numStrips; ++strip){
-			       		if(!badChannels[strip]) noiseRMSv[strip] = noiseRMS;
-			  		}
-				}
-			}
-			
-                    theSiNoiseAdder->addNoiseVR(detAmpl, noiseRMSv, engine);
-		}			
-		
-		//adding the CMN
-		//------------------------------------------------------
-        if(CommonModeNoise){
-		  float cmnRMS = 0.;
-		  DetId  detId(detID);
-		  uint32_t SubDet = detId.subdetId();
-		  if(SubDet==3){
-		    cmnRMS = cmnRMStib;
-		  }else if(SubDet==4){
-		    cmnRMS = cmnRMStid;
-		  }else if(SubDet==5){
-		    cmnRMS = cmnRMStob;
-		  }else if(SubDet==6){
-		    cmnRMS = cmnRMStec;
-		  }
-		  cmnRMS *= theElectronPerADC;
-                  theSiNoiseAdder->addCMNoise(detAmpl, cmnRMS, badChannels, engine);
-		}
-		
-        		
-		//Adding the pedestals
-		//------------------------------------------------------
-		
-		std::vector<float> vPeds;
-		vPeds.clear();
-		vPeds.insert(vPeds.begin(),numStrips,0.);
-		
-		if(RealPedestals){
-		    for(int strip=0; strip< numStrips; ++strip){
-			   if(!badChannels[strip]) vPeds[strip] = (pedestalHandle->getPed(strip,detPedestalRange)+pedOffset)* theElectronPerADC;
-		    }
-        } else {
-		    for(int strip=0; strip< numStrips; ++strip){
-			  if(!badChannels[strip]) vPeds[strip] = pedOffset* theElectronPerADC;
-			}
-		}
-		
-		theSiNoiseAdder->addPedestals(detAmpl, vPeds);	
-		
-		 
-	//if(!RealPedestals&&!CommonModeNoise&&!noise&&!BaselineShift&&!APVSaturationFromHIP){
+    // the constant pedestal offset is needed because
+    //   negative adc counts are not allowed in case
+    //   Pedestal and CMN subtraction is performed.
+    //   The pedestal value read from the conditions
+    //   is pedValue and after the pedestal subtraction
+    //   the baseline is zero. The Common Mode Noise
+    //   is not subtracted from the negative adc counts
+    //   channels. Adding pedOffset the baseline is set
+    //   to pedOffset after pedestal subtraction and CMN
+    //   is subtracted to all the channels since none of
+    //   them has negative adc value. The pedOffset is
+    //   treated as a constant component in the CMN
+    //   estimation and subtracted as CMN.
+
+    //calculating the charge deposited on each APV and subtracting the shift
+    //------------------------------------------------------
+    if (BaselineShift) {
+      theSiNoiseAdder->addBaselineShift(detAmpl, badChannels);
+    }
+
+    //Adding the strip noise
+    //------------------------------------------------------
+    if (noise) {
+      std::vector<float> noiseRMSv;
+      noiseRMSv.clear();
+      noiseRMSv.insert(noiseRMSv.begin(), numStrips, 0.);
+
+      if (SingleStripNoise) {
+        for (int strip = 0; strip < numStrips; ++strip) {
+          if (!badChannels[strip])
+            noiseRMSv[strip] = (noiseHandle->getNoise(strip, detNoiseRange)) * theElectronPerADC;
+        }
+
+      } else {
+        int RefStrip = 0;  //int(numStrips/2.);
+        while (RefStrip < numStrips &&
+               badChannels[RefStrip]) {  //if the refstrip is bad, I move up to when I don't find it
+          RefStrip++;
+        }
+        if (RefStrip < numStrips) {
+          float noiseRMS = noiseHandle->getNoise(RefStrip, detNoiseRange) * theElectronPerADC;
+          for (int strip = 0; strip < numStrips; ++strip) {
+            if (!badChannels[strip])
+              noiseRMSv[strip] = noiseRMS;
+          }
+        }
+      }
+
+      theSiNoiseAdder->addNoiseVR(detAmpl, noiseRMSv, engine);
+    }
+
+    //adding the CMN
+    //------------------------------------------------------
+    if (CommonModeNoise) {
+      float cmnRMS = 0.;
+      DetId detId(detID);
+      uint32_t SubDet = detId.subdetId();
+      if (SubDet == 3) {
+        cmnRMS = cmnRMStib;
+      } else if (SubDet == 4) {
+        cmnRMS = cmnRMStid;
+      } else if (SubDet == 5) {
+        cmnRMS = cmnRMStob;
+      } else if (SubDet == 6) {
+        cmnRMS = cmnRMStec;
+      }
+      cmnRMS *= theElectronPerADC;
+      theSiNoiseAdder->addCMNoise(detAmpl, cmnRMS, badChannels, engine);
+    }
+
+    //Adding the pedestals
+    //------------------------------------------------------
+
+    std::vector<float> vPeds;
+    vPeds.clear();
+    vPeds.insert(vPeds.begin(), numStrips, 0.);
+
+    if (RealPedestals) {
+      for (int strip = 0; strip < numStrips; ++strip) {
+        if (!badChannels[strip])
+          vPeds[strip] = (pedestalHandle->getPed(strip, detPedestalRange) + pedOffset) * theElectronPerADC;
+      }
+    } else {
+      for (int strip = 0; strip < numStrips; ++strip) {
+        if (!badChannels[strip])
+          vPeds[strip] = pedOffset * theElectronPerADC;
+      }
+    }
+
+    theSiNoiseAdder->addPedestals(detAmpl, vPeds);
+
+    //if(!RealPedestals&&!CommonModeNoise&&!noise&&!BaselineShift&&!APVSaturationFromHIP){
     //  edm::LogWarning("SiStripDigitizer")<<"You are running the digitizer without Noise generation and without applying Zero Suppression. ARE YOU SURE???";
-    //}else{							 
-    
+    //}else{
+
     DigitalRawVecType rawdigis = theSiDigitalConverter->convertRaw(detAmpl, gainHandle, detID);
 
     // Now do the association to truth. Note that if truth association was turned off in the configuration this map
     // will be empty and the iterator will always equal associationInfoForDetId_.end().
-    if( iAssociationInfoByChannel!=associationInfoForDetId_.end() ) { // make sure the readings for this DetID aren't completely from noise
+    if (iAssociationInfoByChannel !=
+        associationInfoForDetId_.end()) {  // make sure the readings for this DetID aren't completely from noise
       // N.B. For the raw digis the channel is inferred from the position in the vector.
       // I'VE NOT TESTED THIS YET!!!!!
       // ToDo Test this properly.
-      for( size_t channel=0; channel<rawdigis.size(); ++channel ) {
-        auto& associationInfoByChannel=iAssociationInfoByChannel->second;
-        const auto iAssociationInfo=associationInfoByChannel.find(channel);
-        if( iAssociationInfo==associationInfoByChannel.end() ) continue; // Skip if there is no sim information for this channel (i.e. it's all noise)
-        const std::vector<AssociationInfo>& associationInfo=iAssociationInfo->second;
+      for (size_t channel = 0; channel < rawdigis.size(); ++channel) {
+        auto& associationInfoByChannel = iAssociationInfoByChannel->second;
+        const auto iAssociationInfo = associationInfoByChannel.find(channel);
+        if (iAssociationInfo == associationInfoByChannel.end())
+          continue;  // Skip if there is no sim information for this channel (i.e. it's all noise)
+        const std::vector<AssociationInfo>& associationInfo = iAssociationInfo->second;
 
         // Need to find the total from all sim hits, because this might not be the same as the total
         // digitised due to noise or whatever.
-        float totalSimADC=0;
-        for( const auto& iAssociationInfo : associationInfo ) totalSimADC+=iAssociationInfo.contributionToADC;
+        float totalSimADC = 0;
+        for (const auto& iAssociationInfo : associationInfo)
+          totalSimADC += iAssociationInfo.contributionToADC;
         // Now I know that I can loop again and create the links
-        for( const auto& iAssociationInfo : associationInfo ) {
+        for (const auto& iAssociationInfo : associationInfo) {
           // Note simHitGlobalIndex used to have +1 because TrackerHitAssociator (the only place I can find this value being used)
           // expected counting to start at 1, not 0.  Now changed.
-          outLink.push_back( StripDigiSimLink( channel, iAssociationInfo.trackID, iAssociationInfo.simHitGlobalIndex, iAssociationInfo.tofBin, iAssociationInfo.eventID, iAssociationInfo.contributionToADC/totalSimADC ) );
-        } // end of loop over associationInfo
-      } // end of loop over the digis
-    } // end of check that iAssociationInfoByChannel is a valid iterator
+          outLink.push_back(StripDigiSimLink(channel,
+                                             iAssociationInfo.trackID,
+                                             iAssociationInfo.simHitGlobalIndex,
+                                             iAssociationInfo.tofBin,
+                                             iAssociationInfo.eventID,
+                                             iAssociationInfo.contributionToADC / totalSimADC));
+        }  // end of loop over associationInfo
+      }    // end of loop over the digis
+    }      // end of check that iAssociationInfoByChannel is a valid iterator
 
     outrawdigi.data = rawdigis;
-	
-	//}
+
+    //}
   }
 
   // Now that I've finished with this entry in the map of associations, I can remove it.
   // Note that there might not be an association if the ADC reading is from noise in which
   // case associationIsValid will be false.
-  if( iAssociationInfoByChannel!=associationInfoForDetId_.end() ) associationInfoForDetId_.erase(iAssociationInfoByChannel);
+  if (iAssociationInfoByChannel != associationInfoForDetId_.end())
+    associationInfoForDetId_.erase(iAssociationInfoByChannel);
 }
diff --git a/SimTracker/SiStripDigitizer/plugins/SiStripDigitizerAlgorithm.h b/SimTracker/SiStripDigitizer/plugins/SiStripDigitizerAlgorithm.h
index c32877e1b3984..cdbe10e89592a 100644
--- a/SimTracker/SiStripDigitizer/plugins/SiStripDigitizerAlgorithm.h
+++ b/SimTracker/SiStripDigitizer/plugins/SiStripDigitizerAlgorithm.h
@@ -51,20 +51,20 @@ namespace CLHEP {
 }
 
 class SiStripDigitizerAlgorithm {
- public:
+public:
   typedef SiDigitalConverter::DigitalVecType DigitalVecType;
   typedef SiDigitalConverter::DigitalRawVecType DigitalRawVecType;
   typedef SiPileUpSignals::SignalMapType SignalMapType;
-  typedef std::map< int, float, std::less<int> > hit_map_type;
+  typedef std::map<int, float, std::less<int>> hit_map_type;
   typedef float Amplitude;
-  
+
   // Constructor
   SiStripDigitizerAlgorithm(const edm::ParameterSet& conf);
 
   // Destructor
   ~SiStripDigitizerAlgorithm();
 
-  void initializeDetUnit(StripGeomDetUnit const * det, const edm::EventSetup& iSetup);
+  void initializeDetUnit(StripGeomDetUnit const* det, const edm::EventSetup& iSetup);
 
   void initializeEvent(const edm::EventSetup& iSetup);
 
@@ -72,49 +72,49 @@ class SiStripDigitizerAlgorithm {
   void accumulateSimHits(const std::vector<PSimHit>::const_iterator inputBegin,
                          const std::vector<PSimHit>::const_iterator inputEnd,
                          size_t inputBeginGlobalIndex,
-			 unsigned int tofBin,
-                         const StripGeomDetUnit *stripdet,
+                         unsigned int tofBin,
+                         const StripGeomDetUnit* stripdet,
                          const GlobalVector& bfield,
-			 const TrackerTopology *tTopo,
+                         const TrackerTopology* tTopo,
                          CLHEP::HepRandomEngine*);
 
-  void digitize(
-                edm::DetSet<SiStripDigi>& outDigis,
+  void digitize(edm::DetSet<SiStripDigi>& outDigis,
                 edm::DetSet<SiStripRawDigi>& outRawDigis,
                 edm::DetSet<StripDigiSimLink>& outLink,
                 const StripGeomDetUnit* stripdet,
                 edm::ESHandle<SiStripGain>&,
-                edm::ESHandle<SiStripThreshold>&, 
+                edm::ESHandle<SiStripThreshold>&,
                 edm::ESHandle<SiStripNoises>&,
                 edm::ESHandle<SiStripPedestals>&,
-		std::vector<std::pair<int,std::bitset<6>>> & theAffectedAPVvector,
+                std::vector<std::pair<int, std::bitset<6>>>& theAffectedAPVvector,
                 CLHEP::HepRandomEngine*);
 
   void calculateInstlumiScale(PileupMixingContent* puInfo);
 
   // ParticleDataTable
-  void setParticleDataTable(const ParticleDataTable * pardt) {
-  	theSiHitDigitizer->setParticleDataTable(pardt); 
-  	pdt= pardt; 
+  void setParticleDataTable(const ParticleDataTable* pardt) {
+    theSiHitDigitizer->setParticleDataTable(pardt);
+    pdt = pardt;
   }
-  
- private:
+
+private:
   const std::string lorentzAngleName;
   const double theThreshold;
   const double cmnRMStib;
   const double cmnRMStob;
   const double cmnRMStid;
   const double cmnRMStec;
-  const double APVSaturationProbScaling_;          
-  const bool makeDigiSimLinks_; //< Whether or not to create the association to sim truth collection. Set in configuration.
+  const double APVSaturationProbScaling_;
+  const bool
+      makeDigiSimLinks_;  //< Whether or not to create the association to sim truth collection. Set in configuration.
   const bool peakMode;
   const bool noise;
-  const bool RealPedestals;              
-  const bool SingleStripNoise;          
-  const bool CommonModeNoise;           
-  const bool BaselineShift;             
+  const bool RealPedestals;
+  const bool SingleStripNoise;
+  const bool CommonModeNoise;
+  const bool BaselineShift;
   const bool APVSaturationFromHIP;
-  
+
   const int theFedAlgo;
   const bool zeroSuppression;
   const double theElectronPerADC;
@@ -126,13 +126,13 @@ class SiStripDigitizerAlgorithm {
   const double pedOffset;
   const bool PreMixing_;
 
-  const ParticleDataTable * pdt;
-  const ParticleData * particle;
+  const ParticleDataTable* pdt;
+  const ParticleData* particle;
 
   double APVSaturationProb_;
   bool FirstLumiCalc_;
   bool FirstDigitize_;
-  
+
   const std::unique_ptr<SiHitDigitizer> theSiHitDigitizer;
   const std::unique_ptr<SiPileUpSignals> theSiPileUpSignals;
   const std::unique_ptr<const SiGaussianTailNoiseAdder> theSiNoiseAdder;
@@ -140,8 +140,8 @@ class SiStripDigitizerAlgorithm {
   const std::unique_ptr<SiStripFedZeroSuppression> theSiZeroSuppress;
 
   // bad channels for each detector ID
-  std::map<unsigned int, std::vector<bool> > allBadChannels;
-  std::map<unsigned int, std::vector<bool> > allHIPChannels;
+  std::map<unsigned int, std::vector<bool>> allBadChannels;
+  std::map<unsigned int, std::vector<bool>> allHIPChannels;
   // first and last channel wit signal for each detector ID
   std::map<unsigned int, size_t> firstChannelsWithSignal;
   std::map<unsigned int, size_t> lastChannelsWithSignal;
@@ -151,25 +151,24 @@ class SiStripDigitizerAlgorithm {
 
   /** This structure is used to keep track of the SimTrack that contributed to each digi
       so that the truth association can be created.*/
-  struct AssociationInfo
-  {
+  struct AssociationInfo {
     unsigned int trackID;
     EncodedEventId eventID;
     float contributionToADC;
-    size_t simHitGlobalIndex; ///< The array index of the sim hit, but in the array for all crossings
+    size_t simHitGlobalIndex;  ///< The array index of the sim hit, but in the array for all crossings
     unsigned int tofBin;  // Needed along with subDet to determine which PSimHit collection simHitGlobalIndex indexes
   };
 
-  typedef std::map<int, std::vector<AssociationInfo> >  AssociationInfoForChannel;
-  typedef std::map<uint32_t, AssociationInfoForChannel>  AssociationInfoForDetId;
+  typedef std::map<int, std::vector<AssociationInfo>> AssociationInfoForChannel;
+  typedef std::map<uint32_t, AssociationInfoForChannel> AssociationInfoForDetId;
   /// Structure that holds the information on the SimTrack contributions. Only filled if makeDigiSimLinks_ is true.
   AssociationInfoForDetId associationInfoForDetId_;
-  
+
   edm::FileInPath APVProbabilityFile;
 
   std::ifstream APVProbaFile;
-  std::map < int , float> mapOfAPVprobabilities;
-  std::map < int , std::bitset<6> > SiStripTrackerAffectedAPVMap;
+  std::map<int, float> mapOfAPVprobabilities;
+  std::map<int, std::bitset<6>> SiStripTrackerAffectedAPVMap;
   int NumberOfBxBetweenHIPandEvent;
 };
 
diff --git a/SimTracker/SiStripDigitizer/plugins/SiTrivialInduceChargeOnStrips.cc b/SimTracker/SiStripDigitizer/plugins/SiTrivialInduceChargeOnStrips.cc
index bdf41a7638e44..e23d1a6bc0f80 100644
--- a/SimTracker/SiStripDigitizer/plugins/SiTrivialInduceChargeOnStrips.cc
+++ b/SimTracker/SiStripDigitizer/plugins/SiTrivialInduceChargeOnStrips.cc
@@ -16,99 +16,117 @@ namespace {
     Count() {}
 #ifdef SISTRIP_COUNT
     // note: this code is not thread safe, counts will be inaccurate if run with multiple threads
-    double ncall=0;
-    double ndep=0, ndep2=0, maxdep=0;
-    double nstr=0, nstr2=0;
-    double ncv=0, nval=0, nval2=0, maxv=0;
-    double dzero=0;
-    void dep(double d) { ncall++; ndep+=d; ndep2+=d*d;maxdep=std::max(d,maxdep);}
-    void str(double d) { nstr+=d; nstr2+=d*d;}
-    void val(double d) { ncv++; nval+=d; nval2+=d*d; maxv=std::max(d,maxv);}
-    void zero() { dzero++;}    
+    double ncall = 0;
+    double ndep = 0, ndep2 = 0, maxdep = 0;
+    double nstr = 0, nstr2 = 0;
+    double ncv = 0, nval = 0, nval2 = 0, maxv = 0;
+    double dzero = 0;
+    void dep(double d) {
+      ncall++;
+      ndep += d;
+      ndep2 += d * d;
+      maxdep = std::max(d, maxdep);
+    }
+    void str(double d) {
+      nstr += d;
+      nstr2 += d * d;
+    }
+    void val(double d) {
+      ncv++;
+      nval += d;
+      nval2 += d * d;
+      maxv = std::max(d, maxv);
+    }
+    void zero() { dzero++; }
     ~Count() {
-      std::cout << "deposits " << ncall << " " << maxdep << " " << ndep/ncall << " " << std::sqrt(ndep2*ncall -ndep*ndep)/ncall << std::endl;
+      std::cout << "deposits " << ncall << " " << maxdep << " " << ndep / ncall << " "
+                << std::sqrt(ndep2 * ncall - ndep * ndep) / ncall << std::endl;
       std::cout << "zeros " << dzero << std::endl;
-      std::cout << "strips  " << nstr/ndep << " " << std::sqrt(nstr2*ndep -nstr*nstr)/ndep << std::endl;
-      std::cout << "vaules  " << ncv << " " << maxv << " " << nval/ncv << " " << std::sqrt(nval2*ncv -nval*nval)/ncv << std::endl;
+      std::cout << "strips  " << nstr / ndep << " " << std::sqrt(nstr2 * ndep - nstr * nstr) / ndep << std::endl;
+      std::cout << "vaules  " << ncv << " " << maxv << " " << nval / ncv << " "
+                << std::sqrt(nval2 * ncv - nval * nval) / ncv << std::endl;
     }
   };
- Count count;
+  Count count;
 #else
     void dep(double) const {}
     void str(double) const {}
     void val(double) const {}
-    void zero() const {}    
- };
- const Count count;
+    void zero() const {}
+  };
+  const Count count;
 #endif
-  
-}
 
+}  // namespace
 
 namespace {
   constexpr int Ntypes = 14;
   //                                   0     1      2     3     4    5      6     7
-  const std::string type[Ntypes] = { "IB1", "IB2","OB1","OB2","W1a","W2a","W3a","W1b","W2b","W3b","W4","W5","W6","W7"};
-  enum { indexOfIB1=0, indexOfIB2=1,  indexOfOB1=2, indexOfOB2=3, indexOfW1a=4, indexOfW1b=7}; 
+  const std::string type[Ntypes] = {
+      "IB1", "IB2", "OB1", "OB2", "W1a", "W2a", "W3a", "W1b", "W2b", "W3b", "W4", "W5", "W6", "W7"};
+  enum { indexOfIB1 = 0, indexOfIB2 = 1, indexOfOB1 = 2, indexOfOB2 = 3, indexOfW1a = 4, indexOfW1b = 7 };
 
-  inline
-  std::vector<std::vector<float> >
-  fillSignalCoupling(const edm::ParameterSet& conf, int nTypes, const std::string* typeArray) {
+  inline std::vector<std::vector<float> > fillSignalCoupling(const edm::ParameterSet& conf,
+                                                             int nTypes,
+                                                             const std::string* typeArray) {
     std::vector<std::vector<float> > signalCoupling;
     signalCoupling.reserve(nTypes);
     std::string mode = conf.getParameter<bool>("APVpeakmode") ? "Peak" : "Dec";
-    for(int i=0; i<nTypes; ++i) {
-
+    for (int i = 0; i < nTypes; ++i) {
       std::string version = "";
-      if( typeArray[i].find("W") != std::string::npos && mode == "Dec" )
-        version =  conf.getParameter<bool>("CouplingConstantsRunIIDecW") ? "RunII" : "";
-      else if( typeArray[i].find("B") != std::string::npos  && mode == "Dec")
-        version =  conf.getParameter<bool>("CouplingConstantsRunIIDecB") ? "RunII" : "";
+      if (typeArray[i].find("W") != std::string::npos && mode == "Dec")
+        version = conf.getParameter<bool>("CouplingConstantsRunIIDecW") ? "RunII" : "";
+      else if (typeArray[i].find("B") != std::string::npos && mode == "Dec")
+        version = conf.getParameter<bool>("CouplingConstantsRunIIDecB") ? "RunII" : "";
 
-      auto dc = conf.getParameter<std::vector<double> >("CouplingConstant"+version+mode+typeArray[i]);
-      signalCoupling.emplace_back(dc.begin(),dc.end());
+      auto dc = conf.getParameter<std::vector<double> >("CouplingConstant" + version + mode + typeArray[i]);
+      signalCoupling.emplace_back(dc.begin(), dc.end());
     }
     return signalCoupling;
   }
 
-  inline unsigned int typeOf(const StripGeomDetUnit& det, const TrackerTopology *tTopo) {
+  inline unsigned int typeOf(const StripGeomDetUnit& det, const TrackerTopology* tTopo) {
     DetId id = det.geographicalId();
     switch (det.specificType().subDetector()) {
-    case GeomDetEnumerators::TIB: {return (tTopo->tibLayer(id) < 3) ? indexOfIB1 : indexOfIB2;}
-    case GeomDetEnumerators::TOB: {return (tTopo->tobLayer(id) > 4) ? indexOfOB1 : indexOfOB2;}
-    case GeomDetEnumerators::TID: {return indexOfW1a -1 + tTopo->tidRing(id);} //fragile: relies on ordering of 'type'
-    case GeomDetEnumerators::TEC: {return indexOfW1b -1 + tTopo->tecRing(id);} //fragile: relies on ordering of 'type'
-    default: throw cms::Exception("Invalid subdetector") << id();
+      case GeomDetEnumerators::TIB: {
+        return (tTopo->tibLayer(id) < 3) ? indexOfIB1 : indexOfIB2;
+      }
+      case GeomDetEnumerators::TOB: {
+        return (tTopo->tobLayer(id) > 4) ? indexOfOB1 : indexOfOB2;
+      }
+      case GeomDetEnumerators::TID: {
+        return indexOfW1a - 1 + tTopo->tidRing(id);
+      }  //fragile: relies on ordering of 'type'
+      case GeomDetEnumerators::TEC: {
+        return indexOfW1b - 1 + tTopo->tecRing(id);
+      }  //fragile: relies on ordering of 'type'
+      default:
+        throw cms::Exception("Invalid subdetector") << id();
     }
   }
 
-  inline double
-  chargeDeposited(size_t strip, size_t Nstrips, double amplitude, double chargeSpread, double chargePosition)  {
-    double integralUpToStrip = (strip == 0)         ? 0. : ( approx_erf(   (strip-chargePosition)/chargeSpread/1.41421356237309515 ) );
-    double integralUpToNext  = (strip+1 == Nstrips) ? 1. : ( approx_erf(   (strip+1-chargePosition)/chargeSpread/1.41421356237309515 ) );
-    
-    return  0.5 * (integralUpToNext - integralUpToStrip) * amplitude;
-  }
-  
-}
-
+  inline double chargeDeposited(
+      size_t strip, size_t Nstrips, double amplitude, double chargeSpread, double chargePosition) {
+    double integralUpToStrip =
+        (strip == 0) ? 0. : (approx_erf((strip - chargePosition) / chargeSpread / 1.41421356237309515));
+    double integralUpToNext =
+        (strip + 1 == Nstrips) ? 1. : (approx_erf((strip + 1 - chargePosition) / chargeSpread / 1.41421356237309515));
 
-SiTrivialInduceChargeOnStrips::
-SiTrivialInduceChargeOnStrips(const edm::ParameterSet& conf,double g) 
-  : signalCoupling(fillSignalCoupling(conf, Ntypes, type)), Nsigma(3.), geVperElectron(g)  {
-}
+    return 0.5 * (integralUpToNext - integralUpToStrip) * amplitude;
+  }
 
-void 
-SiTrivialInduceChargeOnStrips::
-induce(const SiChargeCollectionDrifter::collection_type& collection_points, 
-       const StripGeomDetUnit& det, 
-       std::vector<float>& localAmplitudes,
-       size_t& recordMinAffectedStrip, 
-       size_t& recordMaxAffectedStrip,
-       const TrackerTopology *tTopo) const {
+}  // namespace
 
+SiTrivialInduceChargeOnStrips::SiTrivialInduceChargeOnStrips(const edm::ParameterSet& conf, double g)
+    : signalCoupling(fillSignalCoupling(conf, Ntypes, type)), Nsigma(3.), geVperElectron(g) {}
 
-   induceVector(collection_points, det, localAmplitudes, recordMinAffectedStrip, recordMaxAffectedStrip, tTopo);
+void SiTrivialInduceChargeOnStrips::induce(const SiChargeCollectionDrifter::collection_type& collection_points,
+                                           const StripGeomDetUnit& det,
+                                           std::vector<float>& localAmplitudes,
+                                           size_t& recordMinAffectedStrip,
+                                           size_t& recordMaxAffectedStrip,
+                                           const TrackerTopology* tTopo) const {
+  induceVector(collection_points, det, localAmplitudes, recordMinAffectedStrip, recordMaxAffectedStrip, tTopo);
 
   /*
   auto ominA=recordMinAffectedStrip, omaxA=recordMaxAffectedStrip;
@@ -143,33 +161,30 @@ induce(const SiChargeCollectionDrifter::collection_type& collection_points,
   recordMinAffectedStrip=minA;
   recordMaxAffectedStrip=maxA;
   */
-
 }
 
-void 
-SiTrivialInduceChargeOnStrips::
-induceVector(const SiChargeCollectionDrifter::collection_type& collection_points, 
-	       const StripGeomDetUnit& det, 
-	       std::vector<float>& localAmplitudes, 
-	       size_t& recordMinAffectedStrip, 
-	       size_t& recordMaxAffectedStrip,
-	       const TrackerTopology *tTopo) const {
-
-
-  auto const & coupling = signalCoupling[typeOf(det,tTopo)];
+void SiTrivialInduceChargeOnStrips::induceVector(const SiChargeCollectionDrifter::collection_type& collection_points,
+                                                 const StripGeomDetUnit& det,
+                                                 std::vector<float>& localAmplitudes,
+                                                 size_t& recordMinAffectedStrip,
+                                                 size_t& recordMaxAffectedStrip,
+                                                 const TrackerTopology* tTopo) const {
+  auto const& coupling = signalCoupling[typeOf(det, tTopo)];
   const StripTopology& topology = dynamic_cast<const StripTopology&>(det.specificTopology());
-  const int Nstrips =  topology.nstrips();
+  const int Nstrips = topology.nstrips();
 
-  if (Nstrips == 0) return;
+  if (Nstrips == 0)
+    return;
 
   const int NP = collection_points.size();
-  if(0==NP) return;
+  if (0 == NP)
+    return;
 
   constexpr int MaxN = 512;
   // if NP too large split...
 
-  for (int ip=0; ip<NP; ip+=MaxN) {
-    auto N = std::min(NP-ip,MaxN);
+  for (int ip = 0; ip < NP; ip += MaxN) {
+    auto N = std::min(NP - ip, MaxN);
 
     count.dep(N);
     float amplitude[N];
@@ -180,129 +195,132 @@ induceVector(const SiChargeCollectionDrifter::collection_type& collection_points
 
     // load not vectorize
     //In strip coordinates:
-    for (int i=0; i!=N;++i) {
-      auto j = ip+i;
-      if (0==collection_points[j].amplitude()) count.zero();
-      chargePosition[i]=topology.strip(collection_points[j].position());
-      chargeSpread[i]= collection_points[j].sigma() / topology.localPitch(collection_points[j].position());
-      amplitude[i]=0.5f*collection_points[j].amplitude() / geVperElectron;
+    for (int i = 0; i != N; ++i) {
+      auto j = ip + i;
+      if (0 == collection_points[j].amplitude())
+        count.zero();
+      chargePosition[i] = topology.strip(collection_points[j].position());
+      chargeSpread[i] = collection_points[j].sigma() / topology.localPitch(collection_points[j].position());
+      amplitude[i] = 0.5f * collection_points[j].amplitude() / geVperElectron;
     }
-    
+
     // this vectorize
-    for (int i=0; i!=N;++i) {
-      fromStrip[i]  = std::max( 0,  int(std::floor( chargePosition[i] - Nsigma*chargeSpread[i])) );
-      nStrip[i] = std::min( Nstrips, int(std::ceil( chargePosition[i] + Nsigma*chargeSpread[i])) ) - fromStrip[i];
+    for (int i = 0; i != N; ++i) {
+      fromStrip[i] = std::max(0, int(std::floor(chargePosition[i] - Nsigma * chargeSpread[i])));
+      nStrip[i] = std::min(Nstrips, int(std::ceil(chargePosition[i] + Nsigma * chargeSpread[i]))) - fromStrip[i];
     }
-    int tot=0;
-    for (int i=0; i!=N;++i) tot += nStrip[i];
-    tot+=N; // add last strip 
+    int tot = 0;
+    for (int i = 0; i != N; ++i)
+      tot += nStrip[i];
+    tot += N;  // add last strip
     count.val(tot);
     float value[tot];
-    
+
     // assign relative position (lower bound of strip) in value;
-    int kk=0;
-    for (int i=0; i!=N;++i) {
-      auto delta = 1.f/(std::sqrt(2.f)*chargeSpread[i]);
-      auto pos = delta*(float(fromStrip[i])-chargePosition[i]);
+    int kk = 0;
+    for (int i = 0; i != N; ++i) {
+      auto delta = 1.f / (std::sqrt(2.f) * chargeSpread[i]);
+      auto pos = delta * (float(fromStrip[i]) - chargePosition[i]);
 
       // VI: before value[0] was not defined and value[tot] was filled
       //     to fix this the loop below was changed
-      for (int j=0;j<=nStrip[i]; ++j) { /// include last strip
-	value[kk] = pos+float(j)*delta;
-        ++kk;  
+      for (int j = 0; j <= nStrip[i]; ++j) {  /// include last strip
+        value[kk] = pos + float(j) * delta;
+        ++kk;
       }
     }
-    assert(kk==tot);
-    
+    assert(kk == tot);
+
     // main loop fully vectorized
-    for (int k=0;k!=tot; ++k)
+    for (int k = 0; k != tot; ++k)
       value[k] = approx_erf(value[k]);
-    
+
     // saturate 0 & NStrips strip to 0 and 1???
-    kk=0;
-    for (int i=0; i!=N;++i) {
-      if (0 == fromStrip[i])  value[kk]=0;
-      kk+=nStrip[i];
-      if (Nstrips == fromStrip[i]+nStrip[i]) value[kk]=1.f;
+    kk = 0;
+    for (int i = 0; i != N; ++i) {
+      if (0 == fromStrip[i])
+        value[kk] = 0;
+      kk += nStrip[i];
+      if (Nstrips == fromStrip[i] + nStrip[i])
+        value[kk] = 1.f;
       ++kk;
     }
-    assert(kk==tot);
-    
+    assert(kk == tot);
+
     // compute integral over strip (lower bound becomes the value)
-    for (int k=0;k!=tot-1; ++k)
-      value[k]-=value[k+1];  // this is negative!
-    
-    
-    float charge[Nstrips]; for (int i=0;i!=Nstrips; ++i) charge[i]=0;
-    kk=0;
-    for (int i=0; i!=N;++i){ 
-      for (int j=0;j!=nStrip[i]; ++j)
-	charge[fromStrip[i]+j]-= amplitude[i]*value[kk++];
-      ++kk; // skip last "strip"
+    for (int k = 0; k != tot - 1; ++k)
+      value[k] -= value[k + 1];  // this is negative!
+
+    float charge[Nstrips];
+    for (int i = 0; i != Nstrips; ++i)
+      charge[i] = 0;
+    kk = 0;
+    for (int i = 0; i != N; ++i) {
+      for (int j = 0; j != nStrip[i]; ++j)
+        charge[fromStrip[i] + j] -= amplitude[i] * value[kk++];
+      ++kk;  // skip last "strip"
     }
-    assert(kk==tot);
-    
-    
+    assert(kk == tot);
+
     /// do crosstalk... (can be done better, most probably not worth)
-    int minA=recordMinAffectedStrip, maxA=recordMaxAffectedStrip;
+    int minA = recordMinAffectedStrip, maxA = recordMaxAffectedStrip;
     int sc = coupling.size();
-    for (int i=0;i!=Nstrips; ++i) {
+    for (int i = 0; i != Nstrips; ++i) {
       int strip = i;
-      if (0==charge[i]) continue;
-      auto affectedFromStrip  = std::max( 0, strip - sc + 1);
-      auto affectedUntilStrip = std::min(Nstrips, strip + sc);  
-      for (auto affectedStrip=affectedFromStrip;  affectedStrip < affectedUntilStrip;  ++affectedStrip)
-	localAmplitudes[affectedStrip] += charge[i] * coupling[std::abs(affectedStrip - strip)] ;
-      
-      if( affectedFromStrip  < minA ) minA = affectedFromStrip;
-      if( affectedUntilStrip > maxA ) maxA = affectedUntilStrip;
+      if (0 == charge[i])
+        continue;
+      auto affectedFromStrip = std::max(0, strip - sc + 1);
+      auto affectedUntilStrip = std::min(Nstrips, strip + sc);
+      for (auto affectedStrip = affectedFromStrip; affectedStrip < affectedUntilStrip; ++affectedStrip)
+        localAmplitudes[affectedStrip] += charge[i] * coupling[std::abs(affectedStrip - strip)];
+
+      if (affectedFromStrip < minA)
+        minA = affectedFromStrip;
+      if (affectedUntilStrip > maxA)
+        maxA = affectedUntilStrip;
     }
-    recordMinAffectedStrip=minA;
-    recordMaxAffectedStrip=maxA;
+    recordMinAffectedStrip = minA;
+    recordMaxAffectedStrip = maxA;
   }  // end loop ip
-
 }
 
-void 
-SiTrivialInduceChargeOnStrips::
-induceOriginal(const SiChargeCollectionDrifter::collection_type& collection_points, 
-	       const StripGeomDetUnit& det, 
-	       std::vector<float>& localAmplitudes, 
-	       size_t& recordMinAffectedStrip, 
-	       size_t& recordMaxAffectedStrip,
-	       const TrackerTopology *tTopo) const {
-
-
-  auto const & coupling = signalCoupling[typeOf(det,tTopo)];
+void SiTrivialInduceChargeOnStrips::induceOriginal(const SiChargeCollectionDrifter::collection_type& collection_points,
+                                                   const StripGeomDetUnit& det,
+                                                   std::vector<float>& localAmplitudes,
+                                                   size_t& recordMinAffectedStrip,
+                                                   size_t& recordMaxAffectedStrip,
+                                                   const TrackerTopology* tTopo) const {
+  auto const& coupling = signalCoupling[typeOf(det, tTopo)];
   const StripTopology& topology = dynamic_cast<const StripTopology&>(det.specificTopology());
-  size_t Nstrips =  topology.nstrips();
+  size_t Nstrips = topology.nstrips();
 
-  if (!collection_points.empty()) count.dep(collection_points.size());
+  if (!collection_points.empty())
+    count.dep(collection_points.size());
 
-  for (auto signalpoint = collection_points.begin();  signalpoint != collection_points.end();  signalpoint++ ) {
-    
+  for (auto signalpoint = collection_points.begin(); signalpoint != collection_points.end(); signalpoint++) {
     //In strip coordinates:
     double chargePosition = topology.strip(signalpoint->position());
     double chargeSpread = signalpoint->sigma() / topology.localPitch(signalpoint->position());
-    
-    size_t fromStrip  = size_t(std::max( 0,          int(std::floor( chargePosition - Nsigma*chargeSpread))));
-    size_t untilStrip = size_t(std::min( Nstrips, size_t(std::ceil( chargePosition + Nsigma*chargeSpread) )));
 
-    count.str(std::max(0,int(untilStrip)-int(fromStrip)));
-    for (size_t strip = fromStrip;  strip < untilStrip; strip++) {
+    size_t fromStrip = size_t(std::max(0, int(std::floor(chargePosition - Nsigma * chargeSpread))));
+    size_t untilStrip = size_t(std::min(Nstrips, size_t(std::ceil(chargePosition + Nsigma * chargeSpread))));
 
-      double chargeDepositedOnStrip = chargeDeposited( strip, Nstrips, signalpoint->amplitude() / geVperElectron, chargeSpread, chargePosition);
+    count.str(std::max(0, int(untilStrip) - int(fromStrip)));
+    for (size_t strip = fromStrip; strip < untilStrip; strip++) {
+      double chargeDepositedOnStrip =
+          chargeDeposited(strip, Nstrips, signalpoint->amplitude() / geVperElectron, chargeSpread, chargePosition);
 
-      size_t affectedFromStrip  = size_t(std::max( 0, int(strip - coupling.size() + 1)));
-      size_t affectedUntilStrip = size_t(std::min( Nstrips, strip + coupling.size())   );  
-      for (size_t affectedStrip = affectedFromStrip;  affectedStrip < affectedUntilStrip;  affectedStrip++) {
-	localAmplitudes.at( affectedStrip ) += chargeDepositedOnStrip * coupling.at((size_t)std::abs( (int)affectedStrip - (int)strip )) ;
+      size_t affectedFromStrip = size_t(std::max(0, int(strip - coupling.size() + 1)));
+      size_t affectedUntilStrip = size_t(std::min(Nstrips, strip + coupling.size()));
+      for (size_t affectedStrip = affectedFromStrip; affectedStrip < affectedUntilStrip; affectedStrip++) {
+        localAmplitudes.at(affectedStrip) +=
+            chargeDepositedOnStrip * coupling.at((size_t)std::abs((int)affectedStrip - (int)strip));
       }
 
-      if( affectedFromStrip  < recordMinAffectedStrip ) recordMinAffectedStrip = affectedFromStrip;
-      if( affectedUntilStrip > recordMaxAffectedStrip ) recordMaxAffectedStrip = affectedUntilStrip;
+      if (affectedFromStrip < recordMinAffectedStrip)
+        recordMinAffectedStrip = affectedFromStrip;
+      if (affectedUntilStrip > recordMaxAffectedStrip)
+        recordMaxAffectedStrip = affectedUntilStrip;
     }
   }
-
 }
-
diff --git a/SimTracker/SiStripDigitizer/plugins/SiTrivialInduceChargeOnStrips.h b/SimTracker/SiStripDigitizer/plugins/SiTrivialInduceChargeOnStrips.h
index 4b48dfeb2b9cf..af3bf60260d11 100644
--- a/SimTracker/SiStripDigitizer/plugins/SiTrivialInduceChargeOnStrips.h
+++ b/SimTracker/SiStripDigitizer/plugins/SiTrivialInduceChargeOnStrips.h
@@ -6,37 +6,34 @@
 
 class TrackerTopology;
 
-class SiTrivialInduceChargeOnStrips: public SiInduceChargeOnStrips {
- public:
-  SiTrivialInduceChargeOnStrips(const edm::ParameterSet& conf,double g);
+class SiTrivialInduceChargeOnStrips : public SiInduceChargeOnStrips {
+public:
+  SiTrivialInduceChargeOnStrips(const edm::ParameterSet& conf, double g);
   ~SiTrivialInduceChargeOnStrips() override {}
-  void  induce(const SiChargeCollectionDrifter::collection_type& collection_points,
-	       const StripGeomDetUnit& det,
-	       std::vector<float>& localAmplitudes,
-	       size_t& recordMinAffectedStrip,
-	       size_t& recordMaxAffectedStrip,
-	       const TrackerTopology *tTopo) const override;
-  
- private:
-
-  void  induceOriginal(const SiChargeCollectionDrifter::collection_type& collection_points,
-		  const StripGeomDetUnit& det,
-		  std::vector<float>& localAmplitudes,
-		  size_t& recordMinAffectedStrip,
-		  size_t& recordMaxAffectedStrip,
-		  const TrackerTopology *tTopo) const;
- 
-
-  void  induceVector(const SiChargeCollectionDrifter::collection_type& collection_points,
-		     const StripGeomDetUnit& det,
-		     std::vector<float>& localAmplitudes,
-		     size_t& recordMinAffectedStrip,
-		     size_t& recordMaxAffectedStrip,
-		     const TrackerTopology *tTopo) const;
-
-
-  const std::vector<std::vector<float> > signalCoupling; 
-  
+  void induce(const SiChargeCollectionDrifter::collection_type& collection_points,
+              const StripGeomDetUnit& det,
+              std::vector<float>& localAmplitudes,
+              size_t& recordMinAffectedStrip,
+              size_t& recordMaxAffectedStrip,
+              const TrackerTopology* tTopo) const override;
+
+private:
+  void induceOriginal(const SiChargeCollectionDrifter::collection_type& collection_points,
+                      const StripGeomDetUnit& det,
+                      std::vector<float>& localAmplitudes,
+                      size_t& recordMinAffectedStrip,
+                      size_t& recordMaxAffectedStrip,
+                      const TrackerTopology* tTopo) const;
+
+  void induceVector(const SiChargeCollectionDrifter::collection_type& collection_points,
+                    const StripGeomDetUnit& det,
+                    std::vector<float>& localAmplitudes,
+                    size_t& recordMinAffectedStrip,
+                    size_t& recordMaxAffectedStrip,
+                    const TrackerTopology* tTopo) const;
+
+  const std::vector<std::vector<float> > signalCoupling;
+
   const float Nsigma;
   const float geVperElectron;
 };
diff --git a/SimTracker/SiStripDigitizer/plugins/SignalPoint.h b/SimTracker/SiStripDigitizer/plugins/SignalPoint.h
index a2b953e22890d..09c9e32fe93d6 100644
--- a/SimTracker/SiStripDigitizer/plugins/SignalPoint.h
+++ b/SimTracker/SiStripDigitizer/plugins/SignalPoint.h
@@ -1,7 +1,6 @@
 #ifndef Tracker_SignalPoint_H
 #define Tracker_SignalPoint_H
 
-
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "DataFormats/GeometryVector/interface/LocalVector.h"
 
@@ -10,21 +9,24 @@
  * That describes the drifted charge seen on the surface of the sensors.
  */
 class SignalPoint {
- public:
-  SignalPoint() : _pos(0,0), _sigma(0), _amplitude(0) {}
-  
-  SignalPoint( float x, float y, float s,float a=1.0) : 
-    _pos(x,y), _sigma(s), _amplitude(a) {}
-  
-  const LocalPoint& position() const { return _pos;}
-  float x()         const { return _pos.x();}
-  float y()         const { return _pos.y();}
-  float sigma()     const { return _sigma;}
-  float amplitude() const { return _amplitude;}
-  SignalPoint& set_amplitude( float amp) { _amplitude = amp; return *this;} 
- private:
-  LocalPoint      _pos;
-  float           _sigma;
-  float           _amplitude;
-  };
+public:
+  SignalPoint() : _pos(0, 0), _sigma(0), _amplitude(0) {}
+
+  SignalPoint(float x, float y, float s, float a = 1.0) : _pos(x, y), _sigma(s), _amplitude(a) {}
+
+  const LocalPoint& position() const { return _pos; }
+  float x() const { return _pos.x(); }
+  float y() const { return _pos.y(); }
+  float sigma() const { return _sigma; }
+  float amplitude() const { return _amplitude; }
+  SignalPoint& set_amplitude(float amp) {
+    _amplitude = amp;
+    return *this;
+  }
+
+private:
+  LocalPoint _pos;
+  float _sigma;
+  float _amplitude;
+};
 #endif
diff --git a/SimTracker/SiStripDigitizer/src/SiGaussianTailNoiseAdder.cc b/SimTracker/SiStripDigitizer/src/SiGaussianTailNoiseAdder.cc
index 0f16f5819684c..2230cc1239ec2 100644
--- a/SimTracker/SiStripDigitizer/src/SiGaussianTailNoiseAdder.cc
+++ b/SimTracker/SiStripDigitizer/src/SiGaussianTailNoiseAdder.cc
@@ -1,86 +1,91 @@
 #include "SimTracker/SiStripDigitizer/interface/SiGaussianTailNoiseAdder.h"
 #include "CLHEP/Random/RandGaussQ.h"
 
-SiGaussianTailNoiseAdder::SiGaussianTailNoiseAdder(float th):
-  threshold(th),
-  genNoise(new GaussianTailNoiseGenerator())
-{
-}
+SiGaussianTailNoiseAdder::SiGaussianTailNoiseAdder(float th)
+    : threshold(th), genNoise(new GaussianTailNoiseGenerator()) {}
 
-SiGaussianTailNoiseAdder::~SiGaussianTailNoiseAdder(){
-}
+SiGaussianTailNoiseAdder::~SiGaussianTailNoiseAdder() {}
 
 void SiGaussianTailNoiseAdder::addNoise(std::vector<float> &in,
-					size_t& minChannel, size_t& maxChannel,
-					int numStrips, float noiseRMS,
-                                        CLHEP::HepRandomEngine* engine) const {
- 
-  std::vector<std::pair<int,float> > generatedNoise;
-  genNoise->generate(numStrips,threshold,noiseRMS,generatedNoise, engine);
-  
+                                        size_t &minChannel,
+                                        size_t &maxChannel,
+                                        int numStrips,
+                                        float noiseRMS,
+                                        CLHEP::HepRandomEngine *engine) const {
+  std::vector<std::pair<int, float> > generatedNoise;
+  genNoise->generate(numStrips, threshold, noiseRMS, generatedNoise, engine);
+
   // noise on strips with signal:
-  for (size_t iChannel=minChannel; iChannel<maxChannel; iChannel++) {
-    if(in[iChannel] != 0) {
+  for (size_t iChannel = minChannel; iChannel < maxChannel; iChannel++) {
+    if (in[iChannel] != 0) {
       in[iChannel] += CLHEP::RandGaussQ::shoot(engine, 0., noiseRMS);
     }
   }
 
   // Noise on the other strips
-  typedef std::vector<std::pair<int,float> >::const_iterator VI;  
-  for(VI p = generatedNoise.begin(); p != generatedNoise.end(); p++){
-    if(in[(*p).first] == 0) {
+  typedef std::vector<std::pair<int, float> >::const_iterator VI;
+  for (VI p = generatedNoise.begin(); p != generatedNoise.end(); p++) {
+    if (in[(*p).first] == 0) {
       in[(*p).first] += (*p).second;
     }
   }
 }
 
-void SiGaussianTailNoiseAdder::addNoiseVR(std::vector<float> &in, std::vector<float> &noiseRMS, CLHEP::HepRandomEngine* engine) const {
+void SiGaussianTailNoiseAdder::addNoiseVR(std::vector<float> &in,
+                                          std::vector<float> &noiseRMS,
+                                          CLHEP::HepRandomEngine *engine) const {
   // Add noise
   // Full Gaussian noise is added everywhere
-  for (size_t iChannel=0; iChannel!=in.size(); iChannel++) {
-    if(noiseRMS[iChannel] > 0.) in[iChannel] += CLHEP::RandGaussQ::shoot(engine, 0., noiseRMS[iChannel]);
+  for (size_t iChannel = 0; iChannel != in.size(); iChannel++) {
+    if (noiseRMS[iChannel] > 0.)
+      in[iChannel] += CLHEP::RandGaussQ::shoot(engine, 0., noiseRMS[iChannel]);
   }
 }
 
-void SiGaussianTailNoiseAdder::addPedestals(std::vector<float> &in,std::vector<float> & ped) const {
-	for (size_t iChannel=0; iChannel!=in.size(); iChannel++) {
-      if(ped[iChannel]>0.) in[iChannel] += ped[iChannel];      
-    }
+void SiGaussianTailNoiseAdder::addPedestals(std::vector<float> &in, std::vector<float> &ped) const {
+  for (size_t iChannel = 0; iChannel != in.size(); iChannel++) {
+    if (ped[iChannel] > 0.)
+      in[iChannel] += ped[iChannel];
+  }
 }
 
-void SiGaussianTailNoiseAdder::addCMNoise(std::vector<float> &in, float cmnRMS, std::vector<bool> &badChannels, CLHEP::HepRandomEngine* engine) const {
-  int nAPVs = in.size()/128;
+void SiGaussianTailNoiseAdder::addCMNoise(std::vector<float> &in,
+                                          float cmnRMS,
+                                          std::vector<bool> &badChannels,
+                                          CLHEP::HepRandomEngine *engine) const {
+  int nAPVs = in.size() / 128;
   std::vector<float> CMNv;
-  for(int APVn =0; APVn < nAPVs; ++APVn) CMNv.push_back(CLHEP::RandGaussQ::shoot(engine, 0., cmnRMS));
-  for (size_t iChannel=0; iChannel!=in.size(); iChannel++) {
-     if(!badChannels[iChannel]) in[iChannel] += CMNv[(int)(iChannel/128)];
+  for (int APVn = 0; APVn < nAPVs; ++APVn)
+    CMNv.push_back(CLHEP::RandGaussQ::shoot(engine, 0., cmnRMS));
+  for (size_t iChannel = 0; iChannel != in.size(); iChannel++) {
+    if (!badChannels[iChannel])
+      in[iChannel] += CMNv[(int)(iChannel / 128)];
   }
 }
 
 void SiGaussianTailNoiseAdder::addBaselineShift(std::vector<float> &in, std::vector<bool> &badChannels) const {
-  size_t nAPVs = in.size()/128;
+  size_t nAPVs = in.size() / 128;
   std::vector<float> vShift;
   double apvCharge, apvMult;
-  
+
   size_t iChannel;
-  for(size_t APVn =0; APVn < nAPVs; ++APVn){
-   	apvMult=0; apvCharge=0;
-	for(iChannel=APVn*128; iChannel!=APVn*128+128; ++iChannel) {
-  	   if(in[iChannel]>0){
-	   	 ++apvMult;
-	   	  apvCharge+= in[iChannel];
-	   }
-	   if(apvMult==0) vShift.push_back(0);
-	   else vShift.push_back(apvCharge/apvMult);
-  	}
+  for (size_t APVn = 0; APVn < nAPVs; ++APVn) {
+    apvMult = 0;
+    apvCharge = 0;
+    for (iChannel = APVn * 128; iChannel != APVn * 128 + 128; ++iChannel) {
+      if (in[iChannel] > 0) {
+        ++apvMult;
+        apvCharge += in[iChannel];
+      }
+      if (apvMult == 0)
+        vShift.push_back(0);
+      else
+        vShift.push_back(apvCharge / apvMult);
+    }
   }
-     
-  for (iChannel=0; iChannel!=in.size(); ++iChannel) {
-     if(!badChannels[iChannel]) in[iChannel] -= vShift[(int)(iChannel/128)];
+
+  for (iChannel = 0; iChannel != in.size(); ++iChannel) {
+    if (!badChannels[iChannel])
+      in[iChannel] -= vShift[(int)(iChannel / 128)];
   }
 }
-
-
-
-
-
diff --git a/SimTracker/SiStripDigitizer/src/SiTrivialDigitalConverter.cc b/SimTracker/SiStripDigitizer/src/SiTrivialDigitalConverter.cc
index 8ec33fc9c0d2e..215715c5f708c 100644
--- a/SimTracker/SiStripDigitizer/src/SiTrivialDigitalConverter.cc
+++ b/SimTracker/SiStripDigitizer/src/SiTrivialDigitalConverter.cc
@@ -2,63 +2,73 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-SiTrivialDigitalConverter::SiTrivialDigitalConverter(float in, bool PreMix) :
-  electronperADC(in), PreMixing_(PreMix) {
+SiTrivialDigitalConverter::SiTrivialDigitalConverter(float in, bool PreMix) : electronperADC(in), PreMixing_(PreMix) {
   _temp.reserve(800);
   _tempRaw.reserve(800);
 }
 
-SiDigitalConverter::DigitalVecType
-SiTrivialDigitalConverter::convert(const std::vector<float>& analogSignal, edm::ESHandle<SiStripGain> & gainHandle, unsigned int detid){
-  
+SiDigitalConverter::DigitalVecType SiTrivialDigitalConverter::convert(const std::vector<float>& analogSignal,
+                                                                      edm::ESHandle<SiStripGain>& gainHandle,
+                                                                      unsigned int detid) {
   _temp.clear();
 
-  if(PreMixing_) {
-    for ( size_t i=0; i<analogSignal.size(); i++) {
-      if (analogSignal[i]<=0) continue;
-      // convert analog amplitude to digital - special algorithm for PreMixing. 
+  if (PreMixing_) {
+    for (size_t i = 0; i < analogSignal.size(); i++) {
+      if (analogSignal[i] <= 0)
+        continue;
+      // convert analog amplitude to digital - special algorithm for PreMixing.
       // Need to keep all hits, including those at very low pulse heights.
-      int adc = truncate( sqrt(9.0*analogSignal[i]) );
-      if ( adc > 0) _temp.push_back(SiStripDigi(i, adc));
+      int adc = truncate(sqrt(9.0 * analogSignal[i]));
+      if (adc > 0)
+        _temp.push_back(SiStripDigi(i, adc));
     }
-  }
-  else if(gainHandle.isValid()) {
+  } else if (gainHandle.isValid()) {
     SiStripApvGain::Range detGainRange = gainHandle->getRange(detid);
-    for ( size_t i=0; i<analogSignal.size(); i++) {
-      if (analogSignal[i]<=0) continue;
+    for (size_t i = 0; i < analogSignal.size(); i++) {
+      if (analogSignal[i] <= 0)
+        continue;
       // convert analog amplitude to digital
-      int adc = convert( (gainHandle->getStripGain(i, detGainRange))*(analogSignal[i]) );
-      if ( adc > 0) _temp.push_back(SiStripDigi(i, adc));
+      int adc = convert((gainHandle->getStripGain(i, detGainRange)) * (analogSignal[i]));
+      if (adc > 0)
+        _temp.push_back(SiStripDigi(i, adc));
     }
   } else {
-    for ( size_t i=0; i<analogSignal.size(); i++) {
-      if (analogSignal[i]<=0) continue;
+    for (size_t i = 0; i < analogSignal.size(); i++) {
+      if (analogSignal[i] <= 0)
+        continue;
       // convert analog amplitude to digital
-      int adc = convert( analogSignal[i] );
-      if ( adc > 0) _temp.push_back(SiStripDigi(i, adc));
+      int adc = convert(analogSignal[i]);
+      if (adc > 0)
+        _temp.push_back(SiStripDigi(i, adc));
     }
   }
   return _temp;
 }
 
-SiDigitalConverter::DigitalRawVecType
-SiTrivialDigitalConverter::convertRaw(const std::vector<float>& analogSignal, edm::ESHandle<SiStripGain> & gainHandle, unsigned int detid){
-  
+SiDigitalConverter::DigitalRawVecType SiTrivialDigitalConverter::convertRaw(const std::vector<float>& analogSignal,
+                                                                            edm::ESHandle<SiStripGain>& gainHandle,
+                                                                            unsigned int detid) {
   _tempRaw.clear();
 
-  if(gainHandle.isValid()) {
+  if (gainHandle.isValid()) {
     SiStripApvGain::Range detGainRange = gainHandle->getRange(detid);
-    for ( size_t i=0; i<analogSignal.size(); i++) {
-      if (analogSignal[i]<=0) { _tempRaw.push_back(SiStripRawDigi(0)); continue; }
+    for (size_t i = 0; i < analogSignal.size(); i++) {
+      if (analogSignal[i] <= 0) {
+        _tempRaw.push_back(SiStripRawDigi(0));
+        continue;
+      }
       // convert analog amplitude to digital
-      int adc = convertRaw( (gainHandle->getStripGain(i, detGainRange))*(analogSignal[i]));
+      int adc = convertRaw((gainHandle->getStripGain(i, detGainRange)) * (analogSignal[i]));
       _tempRaw.push_back(SiStripRawDigi(adc));
     }
   } else {
-    for ( size_t i=0; i<analogSignal.size(); i++) {
-      if (analogSignal[i]<=0) { _tempRaw.push_back(SiStripRawDigi(0)); continue; }
+    for (size_t i = 0; i < analogSignal.size(); i++) {
+      if (analogSignal[i] <= 0) {
+        _tempRaw.push_back(SiStripRawDigi(0));
+        continue;
+      }
       // convert analog amplitude to digital
-      int adc = convertRaw( analogSignal[i] );
+      int adc = convertRaw(analogSignal[i]);
       _tempRaw.push_back(SiStripRawDigi(adc));
     }
   }
@@ -67,30 +77,35 @@ SiTrivialDigitalConverter::convertRaw(const std::vector<float>& analogSignal, ed
 
 int SiTrivialDigitalConverter::truncate(float in_adc) const {
   //Rounding the ADC number instead of truncating it
-  int adc = int(in_adc+0.5);
+  int adc = int(in_adc + 0.5);
   /*
     254 ADC: 254  <= raw charge < 1023
     255 ADC: raw charge >= 1023
   */
-  if(PreMixing_) {
-    if (adc > 2047 ) return 1023;
-    if (adc > 1022 ) return 1022;
-  }
-  else {
-    if (adc > 1022 ) return 255;
-    if (adc > 253) return 254;
+  if (PreMixing_) {
+    if (adc > 2047)
+      return 1023;
+    if (adc > 1022)
+      return 1022;
+  } else {
+    if (adc > 1022)
+      return 255;
+    if (adc > 253)
+      return 254;
   }
   //Protection
-  if (adc < 0) return 0;
+  if (adc < 0)
+    return 0;
   return adc;
 }
 
 int SiTrivialDigitalConverter::truncateRaw(float in_adc) const {
   //Rounding the ADC number
-  int adc = int(in_adc+0.5);
-  if (adc > 1023 ) return 1023;
+  int adc = int(in_adc + 0.5);
+  if (adc > 1023)
+    return 1023;
   //Protection
-  if (adc < 0) return 0;
+  if (adc < 0)
+    return 0;
   return adc;
 }
-
diff --git a/SimTracker/TrackAssociation/interface/CosmicParametersDefinerForTP.h b/SimTracker/TrackAssociation/interface/CosmicParametersDefinerForTP.h
index 270f8d3f9f66d..3fa2ba81517b1 100644
--- a/SimTracker/TrackAssociation/interface/CosmicParametersDefinerForTP.h
+++ b/SimTracker/TrackAssociation/interface/CosmicParametersDefinerForTP.h
@@ -7,36 +7,47 @@
  * \author Boris Mangano (UCSD)  5/7/2009
  */
 
-#include <SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h>
 #include "SimTracker/TrackAssociation/interface/ParametersDefinerForTP.h"
+#include <SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h>
 
 class CosmicParametersDefinerForTP : public ParametersDefinerForTP {
-
- public:
+public:
   CosmicParametersDefinerForTP(){};
-  ~CosmicParametersDefinerForTP() override {};
-
-  TrackingParticle::Vector momentum(const edm::Event& iEvent, const edm::EventSetup& iSetup, const TrackingParticleRef& tpr) const override;
-  TrackingParticle::Point vertex(const edm::Event& iEvent, const edm::EventSetup& iSetup, const TrackingParticleRef& tpr) const override;
-
-  TrackingParticle::Vector momentum(const edm::Event& iEvent, const edm::EventSetup& iSetup, 
-	const Charge ch, const Point & vertex, const LorentzVector& lv) const override {
+  ~CosmicParametersDefinerForTP() override{};
+
+  TrackingParticle::Vector momentum(const edm::Event &iEvent,
+                                    const edm::EventSetup &iSetup,
+                                    const TrackingParticleRef &tpr) const override;
+  TrackingParticle::Point vertex(const edm::Event &iEvent,
+                                 const edm::EventSetup &iSetup,
+                                 const TrackingParticleRef &tpr) const override;
+
+  TrackingParticle::Vector momentum(const edm::Event &iEvent,
+                                    const edm::EventSetup &iSetup,
+                                    const Charge ch,
+                                    const Point &vertex,
+                                    const LorentzVector &lv) const override {
     return TrackingParticle::Vector();
   }
 
-  TrackingParticle::Point vertex(const edm::Event& iEvent, const edm::EventSetup& iSetup,
-	const Charge ch, const Point & vertex, const LorentzVector& lv) const override {
+  TrackingParticle::Point vertex(const edm::Event &iEvent,
+                                 const edm::EventSetup &iSetup,
+                                 const Charge ch,
+                                 const Point &vertex,
+                                 const LorentzVector &lv) const override {
     return TrackingParticle::Point();
   }
 
-  void initEvent(edm::Handle<SimHitTPAssociationProducer::SimHitTPAssociationList> simHitsTPAssocToSet)  override {
+  void initEvent(edm::Handle<SimHitTPAssociationProducer::SimHitTPAssociationList> simHitsTPAssocToSet) override {
     simHitsTPAssoc = simHitsTPAssocToSet;
   }
 
-  std::unique_ptr<ParametersDefinerForTP> clone() const override { return std::unique_ptr<CosmicParametersDefinerForTP>( new CosmicParametersDefinerForTP(*this)); }
- private:
+  std::unique_ptr<ParametersDefinerForTP> clone() const override {
+    return std::unique_ptr<CosmicParametersDefinerForTP>(new CosmicParametersDefinerForTP(*this));
+  }
+
+private:
   edm::Handle<SimHitTPAssociationProducer::SimHitTPAssociationList> simHitsTPAssoc;
 };
 
-
 #endif
diff --git a/SimTracker/TrackAssociation/interface/ParametersDefinerForTP.h b/SimTracker/TrackAssociation/interface/ParametersDefinerForTP.h
index 584a8b6d3f379..d9eeb13e6e170 100644
--- a/SimTracker/TrackAssociation/interface/ParametersDefinerForTP.h
+++ b/SimTracker/TrackAssociation/interface/ParametersDefinerForTP.h
@@ -9,53 +9,66 @@
 
 #include <memory>
 
-#include <SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h>
-#include "SimGeneral/TrackingAnalysis/interface/SimHitTPAssociationProducer.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/ESHandle.h"      
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "SimGeneral/TrackingAnalysis/interface/SimHitTPAssociationProducer.h"
+#include <SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h>
 
 class ParametersDefinerForTP {
-
- public:
+public:
   ParametersDefinerForTP(){};
-  ParametersDefinerForTP(const edm::ParameterSet& iConfig);
-  virtual ~ParametersDefinerForTP() {};
-
-    typedef int Charge; ///< electric charge type
-    typedef math::XYZPointD Point; ///< point in the space
-    typedef math::XYZTLorentzVectorD LorentzVector; ///< Lorentz vector
-
-  virtual TrackingParticle::Vector momentum(const edm::Event& iEvent, const edm::EventSetup& iSetup, 
-	const Charge ch, const Point & vtx, const LorentzVector& lv) const;
-
-  virtual TrackingParticle::Vector momentum(const edm::Event& iEvent, const edm::EventSetup& iSetup, const TrackingParticleRef& tpr) const{
-    return momentum(iEvent, iSetup, tpr->charge(),tpr->vertex(),tpr->p4());
+  ParametersDefinerForTP(const edm::ParameterSet &iConfig);
+  virtual ~ParametersDefinerForTP(){};
+
+  typedef int Charge;                              ///< electric charge type
+  typedef math::XYZPointD Point;                   ///< point in the space
+  typedef math::XYZTLorentzVectorD LorentzVector;  ///< Lorentz vector
+
+  virtual TrackingParticle::Vector momentum(const edm::Event &iEvent,
+                                            const edm::EventSetup &iSetup,
+                                            const Charge ch,
+                                            const Point &vtx,
+                                            const LorentzVector &lv) const;
+
+  virtual TrackingParticle::Vector momentum(const edm::Event &iEvent,
+                                            const edm::EventSetup &iSetup,
+                                            const TrackingParticleRef &tpr) const {
+    return momentum(iEvent, iSetup, tpr->charge(), tpr->vertex(), tpr->p4());
   }
 
-  virtual TrackingParticle::Vector momentum(const edm::Event& iEvent, const edm::EventSetup& iSetup, const reco::Candidate& tp) const {
-    return momentum(iEvent, iSetup, tp.charge(),tp.vertex(),tp.p4());
+  virtual TrackingParticle::Vector momentum(const edm::Event &iEvent,
+                                            const edm::EventSetup &iSetup,
+                                            const reco::Candidate &tp) const {
+    return momentum(iEvent, iSetup, tp.charge(), tp.vertex(), tp.p4());
   }
 
-  virtual TrackingParticle::Point vertex(const edm::Event& iEvent, const edm::EventSetup& iSetup,
-	const Charge ch, const Point & vtx, const LorentzVector& lv) const;
- 
-  virtual TrackingParticle::Point vertex(const edm::Event& iEvent, const edm::EventSetup& iSetup, const TrackingParticleRef& tpr) const{
-    return vertex(iEvent, iSetup, tpr->charge(),tpr->vertex(),tpr->p4());
+  virtual TrackingParticle::Point vertex(const edm::Event &iEvent,
+                                         const edm::EventSetup &iSetup,
+                                         const Charge ch,
+                                         const Point &vtx,
+                                         const LorentzVector &lv) const;
+
+  virtual TrackingParticle::Point vertex(const edm::Event &iEvent,
+                                         const edm::EventSetup &iSetup,
+                                         const TrackingParticleRef &tpr) const {
+    return vertex(iEvent, iSetup, tpr->charge(), tpr->vertex(), tpr->p4());
   }
 
-  virtual TrackingParticle::Point vertex(const edm::Event& iEvent, const edm::EventSetup& iSetup, const reco::Candidate& tp) const {
-    return vertex(iEvent, iSetup, tp.charge(),tp.vertex(),tp.p4());
+  virtual TrackingParticle::Point vertex(const edm::Event &iEvent,
+                                         const edm::EventSetup &iSetup,
+                                         const reco::Candidate &tp) const {
+    return vertex(iEvent, iSetup, tp.charge(), tp.vertex(), tp.p4());
   }
 
-  virtual void initEvent(edm::Handle<SimHitTPAssociationProducer::SimHitTPAssociationList> simHitsTPAssocToSet) { }
+  virtual void initEvent(edm::Handle<SimHitTPAssociationProducer::SimHitTPAssociationList> simHitsTPAssocToSet) {}
 
-  virtual std::unique_ptr<ParametersDefinerForTP> clone() const { return std::unique_ptr<ParametersDefinerForTP>(new ParametersDefinerForTP(*this)); }
+  virtual std::unique_ptr<ParametersDefinerForTP> clone() const {
+    return std::unique_ptr<ParametersDefinerForTP>(new ParametersDefinerForTP(*this));
+  }
 
   edm::InputTag beamSpotInputTag_;
-
 };
 
-
 #endif
diff --git a/SimTracker/TrackAssociation/interface/ResolutionModel.h b/SimTracker/TrackAssociation/interface/ResolutionModel.h
index 3279d8b7f956e..0744575b109da 100644
--- a/SimTracker/TrackAssociation/interface/ResolutionModel.h
+++ b/SimTracker/TrackAssociation/interface/ResolutionModel.h
@@ -1,33 +1,31 @@
 #ifndef __SimTracker_TrackAssociation_ResolutionModel_h__
 #define __SimTracker_TrackAssociation_ResolutionModel_h__
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/ParticleFlowReco/interface/PFCluster.h"
+#include "DataFormats/TrackReco/interface/Track.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include <string>
 #include <iostream>
+#include <string>
 
 class ResolutionModel {
- public:
- ResolutionModel(const edm::ParameterSet& conf):    
-  _modelName(conf.getParameter<std::string>("modelName")) { 
-  }
-  virtual ~ResolutionModel() { }
+public:
+  ResolutionModel(const edm::ParameterSet &conf) : _modelName(conf.getParameter<std::string>("modelName")) {}
+  virtual ~ResolutionModel() {}
   // get rid of things we should never use...
-  ResolutionModel(const ResolutionModel&) = delete;
-  ResolutionModel& operator=(const ResolutionModel&) = delete;
+  ResolutionModel(const ResolutionModel &) = delete;
+  ResolutionModel &operator=(const ResolutionModel &) = delete;
+
+  virtual float getTimeResolution(const reco::Track &) const { return -1.f; }
+  virtual float getTimeResolution(const reco::PFCluster &) const { return -1.f; }
 
-  virtual float getTimeResolution(const reco::Track&)     const { return -1.f; }
-  virtual float getTimeResolution(const reco::PFCluster&) const { return -1.f; }
+  const std::string &name() const { return _modelName; }
 
-  const std::string& name() const { return _modelName; }
-  
- private:
-  const std::string _modelName;  
+private:
+  const std::string _modelName;
 };
 
 #include "FWCore/PluginManager/interface/PluginFactory.h"
-typedef edmplugin::PluginFactory< ResolutionModel* (const edm::ParameterSet&) > ResolutionModelFactory;
+typedef edmplugin::PluginFactory<ResolutionModel *(const edm::ParameterSet &)> ResolutionModelFactory;
 
 #endif
diff --git a/SimTracker/TrackAssociation/interface/TrackingParticleIP.h b/SimTracker/TrackAssociation/interface/TrackingParticleIP.h
index 4114c9c447117..c25ab2b1eb4aa 100644
--- a/SimTracker/TrackAssociation/interface/TrackingParticleIP.h
+++ b/SimTracker/TrackAssociation/interface/TrackingParticleIP.h
@@ -8,16 +8,16 @@
 namespace TrackingParticleIP {
   // As in TrackBase::dxy(Point) and dz(Point)
   template <typename T_Vertex, typename T_Momentum, typename T_Point>
-  inline auto dxy(const T_Vertex& vertex, const T_Momentum& momentum, const T_Point& point) {
-    return -(vertex.x()-point.x())*std::sin(momentum.phi()) + (vertex.y()-point.y())*std::cos(momentum.phi());
-
+  inline auto dxy(const T_Vertex &vertex, const T_Momentum &momentum, const T_Point &point) {
+    return -(vertex.x() - point.x()) * std::sin(momentum.phi()) + (vertex.y() - point.y()) * std::cos(momentum.phi());
   }
 
   template <typename T_Vertex, typename T_Momentum, typename T_Point>
-  inline auto dz(const T_Vertex& vertex, const T_Momentum& momentum, const T_Point& point) {
-    return vertex.z()-point.z() - ( (vertex.x()-point.x())*momentum.x() +
-                                    (vertex.y()-point.y())*momentum.y() ) * momentum.z()/momentum.perp2();
+  inline auto dz(const T_Vertex &vertex, const T_Momentum &momentum, const T_Point &point) {
+    return vertex.z() - point.z() -
+           ((vertex.x() - point.x()) * momentum.x() + (vertex.y() - point.y()) * momentum.y()) * momentum.z() /
+               momentum.perp2();
   }
-}
+}  // namespace TrackingParticleIP
 
 #endif
diff --git a/SimTracker/TrackAssociation/interface/trackAssociationChi2.h b/SimTracker/TrackAssociation/interface/trackAssociationChi2.h
index fd4e7831b0c79..bf1ef816c9280 100644
--- a/SimTracker/TrackAssociation/interface/trackAssociationChi2.h
+++ b/SimTracker/TrackAssociation/interface/trackAssociationChi2.h
@@ -1,32 +1,32 @@
 #ifndef SimTracker_TrackAssociation_trackAssociationChi2_h
 #define SimTracker_TrackAssociation_trackAssociationChi2_h
 
-#include "DataFormats/TrackReco/interface/TrackBase.h"
-#include "MagneticField/Engine/interface/MagneticField.h" 
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
 #include "DataFormats/GeometryVector/interface/Basic3DVector.h"
+#include "DataFormats/TrackReco/interface/TrackBase.h"
+#include "MagneticField/Engine/interface/MagneticField.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 
 namespace track_associator {
   /// basic method where chi2 is computed
-  double trackAssociationChi2(const reco::TrackBase::ParameterVector& rParameters,
-                              const reco::TrackBase::CovarianceMatrix& recoTrackCovMatrix,
-                              const Basic3DVector<double>& momAtVtx,
-                              const Basic3DVector<double>& vert,
+  double trackAssociationChi2(const reco::TrackBase::ParameterVector &rParameters,
+                              const reco::TrackBase::CovarianceMatrix &recoTrackCovMatrix,
+                              const Basic3DVector<double> &momAtVtx,
+                              const Basic3DVector<double> &vert,
                               int charge,
-                              const MagneticField& magfield,
-                              const reco::BeamSpot& bs) ;
+                              const MagneticField &magfield,
+                              const reco::BeamSpot &bs);
 
-  double trackAssociationChi2(const reco::TrackBase::ParameterVector& rParameters,
-                              const reco::TrackBase::CovarianceMatrix& recoTrackCovMatrix,
-                              const TrackingParticle& trackingParticle,
-                              const MagneticField& magfield,
-                              const reco::BeamSpot& bs);
+  double trackAssociationChi2(const reco::TrackBase::ParameterVector &rParameters,
+                              const reco::TrackBase::CovarianceMatrix &recoTrackCovMatrix,
+                              const TrackingParticle &trackingParticle,
+                              const MagneticField &magfield,
+                              const reco::BeamSpot &bs);
 
-  double trackAssociationChi2(const reco::TrackBase& track,
-                              const TrackingParticle& trackingParticle,
-                              const MagneticField& magfield,
-                              const reco::BeamSpot& bs);
-}
+  double trackAssociationChi2(const reco::TrackBase &track,
+                              const TrackingParticle &trackingParticle,
+                              const MagneticField &magfield,
+                              const reco::BeamSpot &bs);
+}  // namespace track_associator
 
 #endif
diff --git a/SimTracker/TrackAssociation/interface/trackHitsToClusterRefs.h b/SimTracker/TrackAssociation/interface/trackHitsToClusterRefs.h
index 60a8ff1b2bd7b..3a17d4ab3e874 100644
--- a/SimTracker/TrackAssociation/interface/trackHitsToClusterRefs.h
+++ b/SimTracker/TrackAssociation/interface/trackHitsToClusterRefs.h
@@ -1,79 +1,79 @@
 #ifndef SimTracker_TrackAssociation_trackHitsToClusterRefs_h
 #define SimTracker_TrackAssociation_trackHitsToClusterRefs_h
 
-#include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h"
+#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "DataFormats/SiStripDetId/interface/SiStripDetId.h"
+#include "DataFormats/TrackerRecHit2D/interface/Phase2TrackerRecHit1D.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2D.h"
-#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit1D.h"
-#include "DataFormats/TrackerRecHit2D/interface/Phase2TrackerRecHit1D.h"
-#include "DataFormats/SiStripDetId/interface/SiStripDetId.h"
-#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"
+#include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h"
 
 namespace track_associator {
-  const TrackingRecHit* getHitFromIter(trackingRecHit_iterator iter) {
-    return &(**iter);
-  }
-  
-  const TrackingRecHit* getHitFromIter(TrackingRecHitCollection::const_iterator iter) {
-    return &(*iter);
-  }
+  const TrackingRecHit *getHitFromIter(trackingRecHit_iterator iter) { return &(**iter); }
+
+  const TrackingRecHit *getHitFromIter(TrackingRecHitCollection::const_iterator iter) { return &(*iter); }
 
-  template<typename iter>
+  template <typename iter>
   std::vector<OmniClusterRef> hitsToClusterRefs(iter begin, iter end) {
     std::vector<OmniClusterRef> returnValue;
     for (iter iRecHit = begin; iRecHit != end; ++iRecHit) {
-      const TrackingRecHit* rhit = getHitFromIter(iRecHit);
-      if (trackerHitRTTI::isFromDet(*rhit) ) {
+      const TrackingRecHit *rhit = getHitFromIter(iRecHit);
+      if (trackerHitRTTI::isFromDet(*rhit)) {
         int subdetid = rhit->geographicalId().subdetId();
-        if (subdetid==PixelSubdetector::PixelBarrel||subdetid==PixelSubdetector::PixelEndcap) {
-          const SiPixelRecHit* pRHit = dynamic_cast<const SiPixelRecHit*>(rhit);
+        if (subdetid == PixelSubdetector::PixelBarrel || subdetid == PixelSubdetector::PixelEndcap) {
+          const SiPixelRecHit *pRHit = dynamic_cast<const SiPixelRecHit *>(rhit);
           if (pRHit && !pRHit->cluster().isNonnull())
-            edm::LogError("TrackAssociator") << ">>> RecHit does not have an associated cluster!" << " file: " << __FILE__ << " line: " << __LINE__;
+            edm::LogError("TrackAssociator") << ">>> RecHit does not have an associated cluster!"
+                                             << " file: " << __FILE__ << " line: " << __LINE__;
           returnValue.push_back(pRHit->omniClusterRef());
-        }
-        else if (subdetid==SiStripDetId::TIB||subdetid==SiStripDetId::TOB||subdetid==SiStripDetId::TID||subdetid==SiStripDetId::TEC) {
+        } else if (subdetid == SiStripDetId::TIB || subdetid == SiStripDetId::TOB || subdetid == SiStripDetId::TID ||
+                   subdetid == SiStripDetId::TEC) {
           const std::type_info &tid = typeid(*rhit);
           if (tid == typeid(SiStripMatchedRecHit2D)) {
-            const SiStripMatchedRecHit2D* sMatchedRHit = dynamic_cast<const SiStripMatchedRecHit2D*>(rhit);
+            const SiStripMatchedRecHit2D *sMatchedRHit = dynamic_cast<const SiStripMatchedRecHit2D *>(rhit);
             if (!sMatchedRHit->monoHit().cluster().isNonnull() || !sMatchedRHit->stereoHit().cluster().isNonnull())
-              edm::LogError("TrackAssociator") << ">>> RecHit does not have an associated cluster!" << " file: " << __FILE__ << " line: " << __LINE__;
+              edm::LogError("TrackAssociator") << ">>> RecHit does not have an associated cluster!"
+                                               << " file: " << __FILE__ << " line: " << __LINE__;
             returnValue.push_back(sMatchedRHit->monoClusterRef());
             returnValue.push_back(sMatchedRHit->stereoClusterRef());
-          }
-          else if (tid == typeid(SiStripRecHit2D)) {
-            const SiStripRecHit2D* sRHit = dynamic_cast<const SiStripRecHit2D*>(rhit);
+          } else if (tid == typeid(SiStripRecHit2D)) {
+            const SiStripRecHit2D *sRHit = dynamic_cast<const SiStripRecHit2D *>(rhit);
             if (!sRHit->cluster().isNonnull())
-              edm::LogError("TrackAssociator") << ">>> RecHit does not have an associated cluster!" << " file: " << __FILE__ << " line: " << __LINE__;
+              edm::LogError("TrackAssociator") << ">>> RecHit does not have an associated cluster!"
+                                               << " file: " << __FILE__ << " line: " << __LINE__;
             returnValue.push_back(sRHit->omniClusterRef());
-          }
-          else if (tid == typeid(SiStripRecHit1D)) {
-            const SiStripRecHit1D* sRHit = dynamic_cast<const SiStripRecHit1D*>(rhit);
+          } else if (tid == typeid(SiStripRecHit1D)) {
+            const SiStripRecHit1D *sRHit = dynamic_cast<const SiStripRecHit1D *>(rhit);
             if (!sRHit->cluster().isNonnull())
-              edm::LogError("TrackAssociator") << ">>> RecHit does not have an associated cluster!" << " file: " << __FILE__ << " line: " << __LINE__;
+              edm::LogError("TrackAssociator") << ">>> RecHit does not have an associated cluster!"
+                                               << " file: " << __FILE__ << " line: " << __LINE__;
             returnValue.push_back(sRHit->omniClusterRef());
-          }
-          else if (tid == typeid(Phase2TrackerRecHit1D)) {
-            const Phase2TrackerRecHit1D* ph2Hit = dynamic_cast<const Phase2TrackerRecHit1D*>(rhit);
-            if (!ph2Hit->cluster().isNonnull() )
-              edm::LogError("TrackAssociator") << ">>> RecHit does not have an associated cluster!" << " file: " << __FILE__ << " line: " << __LINE__;
+          } else if (tid == typeid(Phase2TrackerRecHit1D)) {
+            const Phase2TrackerRecHit1D *ph2Hit = dynamic_cast<const Phase2TrackerRecHit1D *>(rhit);
+            if (!ph2Hit->cluster().isNonnull())
+              edm::LogError("TrackAssociator") << ">>> RecHit does not have an associated cluster!"
+                                               << " file: " << __FILE__ << " line: " << __LINE__;
             returnValue.push_back(ph2Hit->omniClusterRef());
-          }
-          else {
-            auto const & thit = static_cast<BaseTrackerRecHit const&>(*rhit);
-            if ( thit.isProjected() ) {
+          } else {
+            auto const &thit = static_cast<BaseTrackerRecHit const &>(*rhit);
+            if (thit.isProjected()) {
             } else {
-              edm::LogError("TrackAssociator") << ">>> getMatchedClusters: TrackingRecHit not associated to any SiStripCluster! subdetid = " << subdetid;
+              edm::LogError("TrackAssociator") << ">>> getMatchedClusters: TrackingRecHit not associated to "
+                                                  "any SiStripCluster! subdetid = "
+                                               << subdetid;
             }
           }
-        }
-        else {
-          edm::LogError("TrackAssociator") << ">>> getMatchedClusters: TrackingRecHit not associated to any cluster! subdetid = " << subdetid;
+        } else {
+          edm::LogError("TrackAssociator") << ">>> getMatchedClusters: TrackingRecHit not associated to any "
+                                              "cluster! subdetid = "
+                                           << subdetid;
         }
       }
     }
     return returnValue;
   }
-}
+}  // namespace track_associator
 
 #endif
diff --git a/SimTracker/TrackAssociation/plugins/ConfigurableFlatResolutionModel.cc b/SimTracker/TrackAssociation/plugins/ConfigurableFlatResolutionModel.cc
index afb2746a61e21..2b15aa5f072af 100644
--- a/SimTracker/TrackAssociation/plugins/ConfigurableFlatResolutionModel.cc
+++ b/SimTracker/TrackAssociation/plugins/ConfigurableFlatResolutionModel.cc
@@ -2,18 +2,14 @@
 
 class ConfigurableFlatResolutionModel : public ResolutionModel {
 public:
-  ConfigurableFlatResolutionModel( const edm::ParameterSet& conf ) : 
-    ResolutionModel( conf ),
-    reso_( conf.getParameter<double>("resolutionInNs") ) {
-  }
-  
-  float getTimeResolution(const reco::Track&) const override { return reso_; }
-  float getTimeResolution(const reco::PFCluster&) const override { return reso_; }
-  
+  ConfigurableFlatResolutionModel(const edm::ParameterSet &conf)
+      : ResolutionModel(conf), reso_(conf.getParameter<double>("resolutionInNs")) {}
+
+  float getTimeResolution(const reco::Track &) const override { return reso_; }
+  float getTimeResolution(const reco::PFCluster &) const override { return reso_; }
+
 private:
   const float reso_;
 };
 
-DEFINE_EDM_PLUGIN(ResolutionModelFactory, 
-                  ConfigurableFlatResolutionModel,
-                  "ConfigurableFlatResolutionModel");
+DEFINE_EDM_PLUGIN(ResolutionModelFactory, ConfigurableFlatResolutionModel, "ConfigurableFlatResolutionModel");
diff --git a/SimTracker/TrackAssociation/plugins/CosmicParametersDefinerForTPESProducer.cc b/SimTracker/TrackAssociation/plugins/CosmicParametersDefinerForTPESProducer.cc
index 0bb5924abc78a..4f38cca4d9c6c 100644
--- a/SimTracker/TrackAssociation/plugins/CosmicParametersDefinerForTPESProducer.cc
+++ b/SimTracker/TrackAssociation/plugins/CosmicParametersDefinerForTPESProducer.cc
@@ -1,53 +1,42 @@
+#include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 #include "SimTracker/TrackAssociation/plugins/CosmicParametersDefinerForTPESProducer.h"
-#include "FWCore/Framework/interface/ESProducer.h"
 
 // system include files
 #include <memory>
-#include <memory>
 
-#include "FWCore/Framework/interface/ModuleFactory.h"
-#include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/ModuleFactory.h"
 
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 
-
-
-CosmicParametersDefinerForTPESProducer::CosmicParametersDefinerForTPESProducer(const edm::ParameterSet& iConfig)
-{
-  //the following line is needed to tell the framework what
+CosmicParametersDefinerForTPESProducer::CosmicParametersDefinerForTPESProducer(const edm::ParameterSet &iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
-  std::string myName=iConfig.getParameter<std::string>("ComponentName");
-  setWhatProduced(this,myName);
+  std::string myName = iConfig.getParameter<std::string>("ComponentName");
+  setWhatProduced(this, myName);
 
-   //now do what ever other initialization is needed
-   //conf_=iConfig;
+  // now do what ever other initialization is needed
+  // conf_=iConfig;
 }
 
-
-CosmicParametersDefinerForTPESProducer::~CosmicParametersDefinerForTPESProducer()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+CosmicParametersDefinerForTPESProducer::~CosmicParametersDefinerForTPESProducer() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-CosmicParametersDefinerForTPESProducer::ReturnType
-CosmicParametersDefinerForTPESProducer::produce(const TrackAssociatorRecord& iRecord)
-{
+CosmicParametersDefinerForTPESProducer::ReturnType CosmicParametersDefinerForTPESProducer::produce(
+    const TrackAssociatorRecord &iRecord) {
   return std::make_unique<CosmicParametersDefinerForTP>();
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_EVENTSETUP_MODULE(CosmicParametersDefinerForTPESProducer);
-
diff --git a/SimTracker/TrackAssociation/plugins/CosmicParametersDefinerForTPESProducer.h b/SimTracker/TrackAssociation/plugins/CosmicParametersDefinerForTPESProducer.h
index 807f55b08693b..a97da1c8f435e 100644
--- a/SimTracker/TrackAssociation/plugins/CosmicParametersDefinerForTPESProducer.h
+++ b/SimTracker/TrackAssociation/plugins/CosmicParametersDefinerForTPESProducer.h
@@ -1,25 +1,21 @@
 #ifndef TrackAssociation_CosmicParametersDefinerForTPESProducer_h
 #define TrackAssociation_CosmicParametersDefinerForTPESProducer_h
 
-
-#include "SimTracker/TrackAssociation/interface/CosmicParametersDefinerForTP.h"
 #include "SimTracker/Records/interface/TrackAssociatorRecord.h"
+#include "SimTracker/TrackAssociation/interface/CosmicParametersDefinerForTP.h"
 
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-
 #include <memory>
 
-class  CosmicParametersDefinerForTPESProducer: public edm::ESProducer{
+class CosmicParametersDefinerForTPESProducer : public edm::ESProducer {
   typedef std::unique_ptr<CosmicParametersDefinerForTP> ReturnType;
 
- public:
-  CosmicParametersDefinerForTPESProducer(const edm::ParameterSet & p);
-  ~CosmicParametersDefinerForTPESProducer() override; 
+public:
+  CosmicParametersDefinerForTPESProducer(const edm::ParameterSet &p);
+  ~CosmicParametersDefinerForTPESProducer() override;
   std::unique_ptr<CosmicParametersDefinerForTP> produce(const TrackAssociatorRecord &);
-
 };
 
-
 #endif
diff --git a/SimTracker/TrackAssociation/plugins/MCTrackMatcher.cc b/SimTracker/TrackAssociation/plugins/MCTrackMatcher.cc
index 7dbaa47ff9268..e09fa68f95faf 100644
--- a/SimTracker/TrackAssociation/plugins/MCTrackMatcher.cc
+++ b/SimTracker/TrackAssociation/plugins/MCTrackMatcher.cc
@@ -1,29 +1,31 @@
-/** \class MCTrackMatcher 
+/** \class MCTrackMatcher
  *
  * \author Luca Lista, INFN
  *
  *
  */
-#include "FWCore/Framework/interface/global/EDProducer.h"
-#include "FWCore/Utilities/interface/InputTag.h"
 #include "DataFormats/Common/interface/Association.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 
-namespace edm { class ParameterSet; }
+namespace edm {
+  class ParameterSet;
+}
 
 using namespace edm;
 using namespace std;
 using namespace reco;
 
 class MCTrackMatcher : public edm::global::EDProducer<> {
- public:
+public:
   /// constructor
-  MCTrackMatcher( const edm::ParameterSet & );
+  MCTrackMatcher(const edm::ParameterSet &);
 
- private:
-  void produce( edm::StreamID, edm::Event& evt, const edm::EventSetup& es ) const override;
+private:
+  void produce(edm::StreamID, edm::Event &evt, const edm::EventSetup &es) const override;
   edm::EDGetTokenT<reco::TrackToTrackingParticleAssociator> associator_;
   edm::EDGetTokenT<edm::View<reco::Track>> tracks_;
   edm::EDGetTokenT<GenParticleCollection> genParticles_;
@@ -35,47 +37,47 @@ class MCTrackMatcher : public edm::global::EDProducer<> {
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/EDMException.h"
 
-MCTrackMatcher::MCTrackMatcher(const ParameterSet & p) :
-  associator_(consumes<reco::TrackToTrackingParticleAssociator>(p.getParameter<string>("associator"))),
-  tracks_(consumes<edm::View<reco::Track>>(p.getParameter<InputTag>("tracks"))),
-  genParticles_(consumes<GenParticleCollection>(p.getParameter<InputTag>("genParticles"))),
-  genParticleInts_(consumes<std::vector<int>>(p.getParameter<InputTag>("genParticles"))),
-  trackingParticles_(consumes<TrackingParticleCollection>(p.getParameter<InputTag>("trackingParticles"))) {
+MCTrackMatcher::MCTrackMatcher(const ParameterSet &p)
+    : associator_(consumes<reco::TrackToTrackingParticleAssociator>(p.getParameter<string>("associator"))),
+      tracks_(consumes<edm::View<reco::Track>>(p.getParameter<InputTag>("tracks"))),
+      genParticles_(consumes<GenParticleCollection>(p.getParameter<InputTag>("genParticles"))),
+      genParticleInts_(consumes<std::vector<int>>(p.getParameter<InputTag>("genParticles"))),
+      trackingParticles_(consumes<TrackingParticleCollection>(p.getParameter<InputTag>("trackingParticles"))) {
   produces<GenParticleMatch>();
 }
 
-void MCTrackMatcher::produce(edm::StreamID, Event& evt, const EventSetup& es) const {
-  Handle<reco::TrackToTrackingParticleAssociator> assoc;  
-  evt.getByToken(associator_,assoc);
-  const reco::TrackToTrackingParticleAssociator * associator = assoc.product();
-  Handle<View<Track> > tracks;
+void MCTrackMatcher::produce(edm::StreamID, Event &evt, const EventSetup &es) const {
+  Handle<reco::TrackToTrackingParticleAssociator> assoc;
+  evt.getByToken(associator_, assoc);
+  const reco::TrackToTrackingParticleAssociator *associator = assoc.product();
+  Handle<View<Track>> tracks;
   evt.getByToken(tracks_, tracks);
   Handle<TrackingParticleCollection> trackingParticles;
-  evt.getByToken(trackingParticles_,trackingParticles);
-  Handle<vector<int> > barCodes;
-  evt.getByToken(genParticleInts_,barCodes );
+  evt.getByToken(trackingParticles_, trackingParticles);
+  Handle<vector<int>> barCodes;
+  evt.getByToken(genParticleInts_, barCodes);
   Handle<GenParticleCollection> genParticles;
-  evt.getByToken(genParticles_, genParticles );
-  RecoToSimCollection associations = associator->associateRecoToSim ( tracks, trackingParticles);
+  evt.getByToken(genParticles_, genParticles);
+  RecoToSimCollection associations = associator->associateRecoToSim(tracks, trackingParticles);
   unique_ptr<GenParticleMatch> match(new GenParticleMatch(GenParticleRefProd(genParticles)));
   GenParticleMatch::Filler filler(*match);
   size_t n = tracks->size();
-  vector<int> indices(n,-1);
-  for (size_t i = 0; i < n; ++ i ) {
+  vector<int> indices(n, -1);
+  for (size_t i = 0; i < n; ++i) {
     RefToBase<Track> track(tracks, i);
     RecoToSimCollection::const_iterator f = associations.find(track);
-    if ( f != associations.end() ) {
+    if (f != associations.end()) {
       TrackingParticleRef tp = f->val.front().first;
       TrackingParticle::genp_iterator j, b = tp->genParticle_begin(), e = tp->genParticle_end();
-      for( j = b; j != e; ++ j ) {
-	const reco::GenParticle * p = j->get();
-	if (p->status() == 1) {
-	  indices[i] = j->key();
-	  break;
-	}
+      for (j = b; j != e; ++j) {
+        const reco::GenParticle *p = j->get();
+        if (p->status() == 1) {
+          indices[i] = j->key();
+          break;
+        }
       }
     }
   }
@@ -86,5 +88,4 @@ void MCTrackMatcher::produce(edm::StreamID, Event& evt, const EventSetup& es) co
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-DEFINE_FWK_MODULE( MCTrackMatcher );
-
+DEFINE_FWK_MODULE(MCTrackMatcher);
diff --git a/SimTracker/TrackAssociation/plugins/ParametersDefinerForTPESProducer.cc b/SimTracker/TrackAssociation/plugins/ParametersDefinerForTPESProducer.cc
index 799b002a1806a..f2b7fbae166b1 100644
--- a/SimTracker/TrackAssociation/plugins/ParametersDefinerForTPESProducer.cc
+++ b/SimTracker/TrackAssociation/plugins/ParametersDefinerForTPESProducer.cc
@@ -1,54 +1,42 @@
+#include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 #include "SimTracker/TrackAssociation/plugins/ParametersDefinerForTPESProducer.h"
-#include "FWCore/Framework/interface/ESProducer.h"
 
 // system include files
 #include <memory>
-#include <memory>
 
-#include "FWCore/Framework/interface/ModuleFactory.h"
-#include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/ModuleFactory.h"
 
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 
-
-
-ParametersDefinerForTPESProducer::ParametersDefinerForTPESProducer(const edm::ParameterSet& iConfig)
-  : pset_(iConfig)
-{
-  //the following line is needed to tell the framework what
+ParametersDefinerForTPESProducer::ParametersDefinerForTPESProducer(const edm::ParameterSet &iConfig) : pset_(iConfig) {
+  // the following line is needed to tell the framework what
   // data is being produced
-  std::string myName=iConfig.getParameter<std::string>("ComponentName");
-  setWhatProduced(this,myName);
+  std::string myName = iConfig.getParameter<std::string>("ComponentName");
+  setWhatProduced(this, myName);
 
-   //now do what ever other initialization is needed
-   //conf_=iConfig;
+  // now do what ever other initialization is needed
+  // conf_=iConfig;
 }
 
-
-ParametersDefinerForTPESProducer::~ParametersDefinerForTPESProducer()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-
+ParametersDefinerForTPESProducer::~ParametersDefinerForTPESProducer() {
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-ParametersDefinerForTPESProducer::ReturnType
-ParametersDefinerForTPESProducer::produce(const TrackAssociatorRecord& iRecord)
-{
+ParametersDefinerForTPESProducer::ReturnType ParametersDefinerForTPESProducer::produce(
+    const TrackAssociatorRecord &iRecord) {
   return std::make_unique<ParametersDefinerForTP>(pset_);
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_EVENTSETUP_MODULE(ParametersDefinerForTPESProducer);
-
diff --git a/SimTracker/TrackAssociation/plugins/ParametersDefinerForTPESProducer.h b/SimTracker/TrackAssociation/plugins/ParametersDefinerForTPESProducer.h
index 99272ff857f97..8c3a9ca1e7463 100644
--- a/SimTracker/TrackAssociation/plugins/ParametersDefinerForTPESProducer.h
+++ b/SimTracker/TrackAssociation/plugins/ParametersDefinerForTPESProducer.h
@@ -1,27 +1,23 @@
 #ifndef TrackAssociation_ParametersDefinerForTPESProducer_h
 #define TrackAssociation_ParametersDefinerForTPESProducer_h
 
-
-#include "SimTracker/TrackAssociation/interface/ParametersDefinerForTP.h"
 #include "SimTracker/Records/interface/TrackAssociatorRecord.h"
+#include "SimTracker/TrackAssociation/interface/ParametersDefinerForTP.h"
 
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-
 #include <memory>
 
-class  ParametersDefinerForTPESProducer: public edm::ESProducer{
+class ParametersDefinerForTPESProducer : public edm::ESProducer {
   typedef std::unique_ptr<ParametersDefinerForTP> ReturnType;
 
- public:
-  ParametersDefinerForTPESProducer(const edm::ParameterSet & p);
-  ~ParametersDefinerForTPESProducer() override; 
+public:
+  ParametersDefinerForTPESProducer(const edm::ParameterSet &p);
+  ~ParametersDefinerForTPESProducer() override;
   std::unique_ptr<ParametersDefinerForTP> produce(const TrackAssociatorRecord &);
 
   edm::ParameterSet pset_;
-
 };
 
-
 #endif
diff --git a/SimTracker/TrackAssociation/plugins/PerfectResolutionModel.cc b/SimTracker/TrackAssociation/plugins/PerfectResolutionModel.cc
index b6b8cc536658e..975b6951c5a3c 100644
--- a/SimTracker/TrackAssociation/plugins/PerfectResolutionModel.cc
+++ b/SimTracker/TrackAssociation/plugins/PerfectResolutionModel.cc
@@ -2,13 +2,10 @@
 
 class PerfectResolutionModel : public ResolutionModel {
 public:
-  PerfectResolutionModel( const edm::ParameterSet& conf ) : ResolutionModel( conf ) {}
-  
-  float getTimeResolution(const reco::Track&) const override { return 1e-6; }
-  float getTimeResolution(const reco::PFCluster&) const override { return 1e-6; }
-  
+  PerfectResolutionModel(const edm::ParameterSet &conf) : ResolutionModel(conf) {}
+
+  float getTimeResolution(const reco::Track &) const override { return 1e-6; }
+  float getTimeResolution(const reco::PFCluster &) const override { return 1e-6; }
 };
 
-DEFINE_EDM_PLUGIN(ResolutionModelFactory, 
-                  PerfectResolutionModel,
-                  "PerfectResolutionModel");
+DEFINE_EDM_PLUGIN(ResolutionModelFactory, PerfectResolutionModel, "PerfectResolutionModel");
diff --git a/SimTracker/TrackAssociation/plugins/StripCompactDigiSimLinksProducer.cc b/SimTracker/TrackAssociation/plugins/StripCompactDigiSimLinksProducer.cc
index 7ba221b4a600e..3d65bc2a84269 100644
--- a/SimTracker/TrackAssociation/plugins/StripCompactDigiSimLinksProducer.cc
+++ b/SimTracker/TrackAssociation/plugins/StripCompactDigiSimLinksProducer.cc
@@ -10,110 +10,122 @@
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h"
 #include "DataFormats/Common/interface/DetSetVector.h"
 #include "SimDataFormats/TrackerDigiSimLink/interface/StripCompactDigiSimLinks.h"
+#include "SimDataFormats/TrackerDigiSimLink/interface/StripDigiSimLink.h"
 
 #ifdef SCDSL_DEBUG
-  #define DEBUG(X) X
+#define DEBUG(X) X
 #else
-  #define DEBUG(X)
+#define DEBUG(X)
 #endif
 
 class StripCompactDigiSimLinksProducer : public edm::one::EDProducer<> {
-    public:
-        StripCompactDigiSimLinksProducer(const edm::ParameterSet &iConfig) ;
-        ~StripCompactDigiSimLinksProducer() override;
+public:
+  StripCompactDigiSimLinksProducer(const edm::ParameterSet &iConfig);
+  ~StripCompactDigiSimLinksProducer() override;
 
-        void produce(edm::Event&, const edm::EventSetup&) override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
-    private:
-        edm::InputTag src_;
-        uint32_t      maxHoleSize_;
+private:
+  edm::InputTag src_;
+  uint32_t maxHoleSize_;
 };
 
-StripCompactDigiSimLinksProducer::StripCompactDigiSimLinksProducer(const edm::ParameterSet &iConfig) :
-    src_(iConfig.getParameter<edm::InputTag>("src")),
-    maxHoleSize_(iConfig.getParameter<uint32_t>("maxHoleSize"))
-{
-    produces<StripCompactDigiSimLinks>();
+StripCompactDigiSimLinksProducer::StripCompactDigiSimLinksProducer(const edm::ParameterSet &iConfig)
+    : src_(iConfig.getParameter<edm::InputTag>("src")), maxHoleSize_(iConfig.getParameter<uint32_t>("maxHoleSize")) {
+  produces<StripCompactDigiSimLinks>();
 }
 
-StripCompactDigiSimLinksProducer::~StripCompactDigiSimLinksProducer()
-{
-}
+StripCompactDigiSimLinksProducer::~StripCompactDigiSimLinksProducer() {}
 
-void
-StripCompactDigiSimLinksProducer::produce(edm::Event & iEvent, const edm::EventSetup&) 
-{
-    using namespace edm;
-    Handle<DetSetVector<StripDigiSimLink> > src;
-    iEvent.getByLabel(src_, src);
+void StripCompactDigiSimLinksProducer::produce(edm::Event &iEvent, const edm::EventSetup &) {
+  using namespace edm;
+  Handle<DetSetVector<StripDigiSimLink>> src;
+  iEvent.getByLabel(src_, src);
 
-    StripCompactDigiSimLinks::Filler output;
+  StripCompactDigiSimLinks::Filler output;
 
-    int previousStrip;     // previous strip with at least one link (might not be the strip of the previous link there are overlapping clusters)
-    int previousLinkStrip; // strip of the previous link (can be the same as the one of this link if there are overlapping clusters)
-    std::vector<StripCompactDigiSimLinks::key_type> thisStripSignals;      // particles on this strip
-    std::vector<StripCompactDigiSimLinks::key_type> previousStripSignals;  // particles on the previous strip
+  int previousStrip;      // previous strip with at least one link (might not be the
+                          // strip of the previous link there are overlapping
+                          // clusters)
+  int previousLinkStrip;  // strip of the previous link (can be the same as the
+                          // one of this link if there are overlapping clusters)
+  std::vector<StripCompactDigiSimLinks::key_type> thisStripSignals;      // particles on this strip
+  std::vector<StripCompactDigiSimLinks::key_type> previousStripSignals;  // particles on the previous strip
 
-    for(auto const& det : *src) {
-        DEBUG(std::cerr << "\n\nProcessing detset " << det.detId() << ", size = " << det.size() << std::endl;)
-        previousStrip     = -2; // previous strip with at least one link (might not be the strip of the previous link there are overlapping clusters)
-        previousLinkStrip = -2; // strip of the previous link (can be the same as the one of this link if there are overlapping clusters)
+  for (auto const &det : *src) {
+    DEBUG(std::cerr << "\n\nProcessing detset " << det.detId() << ", size = " << det.size() << std::endl;)
+    previousStrip = -2;      // previous strip with at least one link (might not be the strip of
+                             // the previous link there are overlapping clusters)
+    previousLinkStrip = -2;  // strip of the previous link (can be the same as the one of this
+                             // link if there are overlapping clusters)
+    thisStripSignals.clear();
+    previousStripSignals.clear();
+    for (DetSet<StripDigiSimLink>::const_iterator it = det.begin(), ed = det.end(); it != ed; ++it) {
+      DEBUG(std::cerr << "  processing digiSimLink on strip " << it->channel() << " left by particle "
+                      << it->SimTrackId() << ", event " << it->eventId().rawId() << std::endl;)
+      if (int(it->channel()) != previousLinkStrip) {
+        previousStrip = previousLinkStrip;
+        DEBUG(std::cerr << "   strip changed!" << std::endl;)
+        swap(thisStripSignals, previousStripSignals);
         thisStripSignals.clear();
-        previousStripSignals.clear();
-        for (DetSet<StripDigiSimLink>::const_iterator it = det.begin(), ed = det.end(); it != ed; ++it) {
-            DEBUG(std::cerr << "  processing digiSimLink on strip " << it->channel() << " left by particle " << it->SimTrackId() << ", event " << it->eventId().rawId() << std::endl;)
-            if (int(it->channel()) != previousLinkStrip) { 
-                previousStrip = previousLinkStrip;
-                DEBUG(std::cerr << "   strip changed!" << std::endl;)
-                swap(thisStripSignals, previousStripSignals); 
-                thisStripSignals.clear();
-            }
-            DEBUG(std::cerr << "    previous strip " << previousStrip << ", previous link strip " << previousLinkStrip << std::endl;)
-            //DEBUG(std::cerr << "    on previous strip: "; for(auto const& k : previousStripSignals) { std::cerr << "(ev " << k.first.rawId() << ", id " << k.second << ") "; } std::cerr << std::endl;)
-            //DEBUG(std::cerr << "    on this strip: ";     for(auto const& k :     thisStripSignals) { std::cerr << "(ev " << k.first.rawId() << ", id " << k.second << ") "; } std::cerr << std::endl;)
-            StripCompactDigiSimLinks::key_type key(it->eventId(), it->SimTrackId());
-            bool alreadyClusterized = false;
-            if (int(it->channel()) == previousStrip+1) {
-                DEBUG(std::cerr << "  on next strip" << std::endl;)
-                if (std::find(previousStripSignals.begin(), previousStripSignals.end(), key) != previousStripSignals.end()) {
-                    alreadyClusterized = true;
-                    DEBUG(std::cerr << "    and part of previous cluster" << std::endl;)
-                }
-            }
-            if (!alreadyClusterized) {
-                DEBUG(std::cerr << "   clusterize!" << std::endl;)
-                unsigned int size = 1;
-                int myLastStrip = it->channel(); // last known strip with signals from this particle
-                for (DetSet<StripDigiSimLink>::const_iterator it2 = it+1; it2 < ed; ++it2) {
-                    DEBUG(std::cerr << "     digiSimLink on strip " << it2->channel() << " left by particle " << it2->SimTrackId() << ", event " << it2->eventId().rawId() << std::endl;)
-                    if ((it2->channel() - myLastStrip) > maxHoleSize_+1) {
-                        DEBUG(std::cerr << "        found hole of size " << (it2->channel() - myLastStrip) << ", stopping." << std::endl;)
-                        break;
-                    }
-                    if ((it2->eventId() == key.first) && (it2->SimTrackId() == key.second)) {
-                        size++;
-                        DEBUG(std::cerr << "        extending cluster, now size = " << size << std::endl;)
-                        myLastStrip = it2->channel();
-                    }
-                }
-                output.insert(key, StripCompactDigiSimLinks::HitRecord(det.detId(), it->channel(), size));
-            }
-            if (int(it->channel()) != previousLinkStrip) {
-                previousLinkStrip = it->channel();
-            }
-            thisStripSignals.push_back(key);
-            DEBUG(std::cerr << "    ending state " << previousStrip << ", previous link strip " << previousLinkStrip << std::endl;)
-            //DEBUG(std::cerr << "    on previous strip: "; for(auto const& k : previousStripSignals) { std::cerr << "(ev " << k.first.rawId() << ", id " << k.second << ") "; } std::cerr << std::endl;)
-            //DEBUG(std::cerr << "    on this strip: ";     for(auto const& k :     thisStripSignals) { std::cerr << "(ev " << k.first.rawId() << ", id " << k.second << ") "; } std::cerr << std::endl;)
-            DEBUG(std::cerr << std::endl;)
+      }
+      DEBUG(std::cerr << "    previous strip " << previousStrip << ", previous link strip " << previousLinkStrip
+                      << std::endl;)
+      // DEBUG(std::cerr << "    on previous strip: "; for(auto const& k :
+      // previousStripSignals) { std::cerr << "(ev " << k.first.rawId() << ", id
+      // " << k.second << ") "; } std::cerr << std::endl;) DEBUG(std::cerr << "
+      // on this strip: ";     for(auto const& k :     thisStripSignals) {
+      // std::cerr << "(ev " << k.first.rawId() << ", id " << k.second << ") ";
+      // } std::cerr << std::endl;)
+      StripCompactDigiSimLinks::key_type key(it->eventId(), it->SimTrackId());
+      bool alreadyClusterized = false;
+      if (int(it->channel()) == previousStrip + 1) {
+        DEBUG(std::cerr << "  on next strip" << std::endl;)
+        if (std::find(previousStripSignals.begin(), previousStripSignals.end(), key) != previousStripSignals.end()) {
+          alreadyClusterized = true;
+          DEBUG(std::cerr << "    and part of previous cluster" << std::endl;)
         }
+      }
+      if (!alreadyClusterized) {
+        DEBUG(std::cerr << "   clusterize!" << std::endl;)
+        unsigned int size = 1;
+        int myLastStrip = it->channel();  // last known strip with signals from this particle
+        for (DetSet<StripDigiSimLink>::const_iterator it2 = it + 1; it2 < ed; ++it2) {
+          DEBUG(std::cerr << "     digiSimLink on strip " << it2->channel() << " left by particle " << it2->SimTrackId()
+                          << ", event " << it2->eventId().rawId() << std::endl;)
+          if ((it2->channel() - myLastStrip) > maxHoleSize_ + 1) {
+            DEBUG(std::cerr << "        found hole of size " << (it2->channel() - myLastStrip) << ", stopping."
+                            << std::endl;)
+            break;
+          }
+          if ((it2->eventId() == key.first) && (it2->SimTrackId() == key.second)) {
+            size++;
+            DEBUG(std::cerr << "        extending cluster, now size = " << size << std::endl;)
+            myLastStrip = it2->channel();
+          }
+        }
+        output.insert(key, StripCompactDigiSimLinks::HitRecord(det.detId(), it->channel(), size));
+      }
+      if (int(it->channel()) != previousLinkStrip) {
+        previousLinkStrip = it->channel();
+      }
+      thisStripSignals.push_back(key);
+      DEBUG(std::cerr << "    ending state " << previousStrip << ", previous link strip " << previousLinkStrip
+                      << std::endl;)
+      // DEBUG(std::cerr << "    on previous strip: "; for(auto const& k :
+      // previousStripSignals) { std::cerr << "(ev " << k.first.rawId() << ", id
+      // " << k.second << ") "; } std::cerr << std::endl;) DEBUG(std::cerr << "
+      // on this strip: ";     for(auto const& k :     thisStripSignals) {
+      // std::cerr << "(ev " << k.first.rawId() << ", id " << k.second << ") ";
+      // } std::cerr << std::endl;)
+      DEBUG(std::cerr << std::endl;)
     }
-   
-    std::unique_ptr< StripCompactDigiSimLinks > ptr(new StripCompactDigiSimLinks(output));
-    iEvent.put(std::move(ptr));
+  }
+
+  std::unique_ptr<StripCompactDigiSimLinks> ptr(new StripCompactDigiSimLinks(output));
+  iEvent.put(std::move(ptr));
 }
 
 DEFINE_FWK_MODULE(StripCompactDigiSimLinksProducer);
diff --git a/SimTracker/TrackAssociation/plugins/TrackAssociatorEDProducer.cc b/SimTracker/TrackAssociation/plugins/TrackAssociatorEDProducer.cc
index b11bcb1888bf0..c554557bb9c31 100644
--- a/SimTracker/TrackAssociation/plugins/TrackAssociatorEDProducer.cc
+++ b/SimTracker/TrackAssociation/plugins/TrackAssociatorEDProducer.cc
@@ -4,7 +4,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 #include <string>
@@ -21,92 +20,83 @@
 
 #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
 
-#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 
 #include "FWCore/Utilities/interface/EDGetToken.h"
 
-
-
 //
 // class decleration
 //
 
 class TrackAssociatorEDProducer : public edm::global::EDProducer<> {
 public:
-  explicit TrackAssociatorEDProducer(const edm::ParameterSet&);
+  explicit TrackAssociatorEDProducer(const edm::ParameterSet &);
   ~TrackAssociatorEDProducer() override;
-  
+
 private:
-  void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
-  
-  bool  theIgnoremissingtrackcollection;
+  void produce(edm::StreamID, edm::Event &, const edm::EventSetup &) const override;
+
+  bool theIgnoremissingtrackcollection;
 
   edm::EDGetTokenT<TrackingParticleCollection> TPCollectionToken_;
-  edm::EDGetTokenT<edm::View<reco::Track> > trackCollectionToken_;
+  edm::EDGetTokenT<edm::View<reco::Track>> trackCollectionToken_;
   edm::EDGetTokenT<reco::TrackToTrackingParticleAssociator> associatorToken_;
-
 };
 
-TrackAssociatorEDProducer::TrackAssociatorEDProducer(const edm::ParameterSet& pset):
-  theIgnoremissingtrackcollection(pset.getUntrackedParameter<bool>("ignoremissingtrackcollection",false))
-{
+TrackAssociatorEDProducer::TrackAssociatorEDProducer(const edm::ParameterSet &pset)
+    : theIgnoremissingtrackcollection(pset.getUntrackedParameter<bool>("ignoremissingtrackcollection", false)) {
   produces<reco::SimToRecoCollection>();
   produces<reco::RecoToSimCollection>();
 
-  TPCollectionToken_    = consumes<TrackingParticleCollection>(pset.getParameter< edm::InputTag >("label_tp"));
-  trackCollectionToken_ = consumes<edm::View<reco::Track> >(pset.getParameter< edm::InputTag >("label_tr")); 
-  associatorToken_      = consumes<reco::TrackToTrackingParticleAssociator>(pset.getParameter<edm::InputTag>("associator") );
-
-}
-
-
-TrackAssociatorEDProducer::~TrackAssociatorEDProducer() {
- 
+  TPCollectionToken_ = consumes<TrackingParticleCollection>(pset.getParameter<edm::InputTag>("label_tp"));
+  trackCollectionToken_ = consumes<edm::View<reco::Track>>(pset.getParameter<edm::InputTag>("label_tr"));
+  associatorToken_ = consumes<reco::TrackToTrackingParticleAssociator>(pset.getParameter<edm::InputTag>("associator"));
 }
 
+TrackAssociatorEDProducer::~TrackAssociatorEDProducer() {}
 
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-TrackAssociatorEDProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const {
-   using namespace edm;
-
-   edm::Handle<reco::TrackToTrackingParticleAssociator> theAssociator;
-   iEvent.getByToken(associatorToken_,theAssociator);
-
-   Handle<TrackingParticleCollection>  TPCollection ;
-   iEvent.getByToken(TPCollectionToken_,TPCollection);
-
-   Handle<edm::View<reco::Track> > trackCollection;
-   bool trackAvailable = iEvent.getByToken(trackCollectionToken_, trackCollection );
-
-   std::unique_ptr<reco::RecoToSimCollection> rts;
-   std::unique_ptr<reco::SimToRecoCollection> str;
-
-   if (theIgnoremissingtrackcollection && !trackAvailable){
-     //the track collection is not in the event and we're being told to ignore this.
-     //do not output anything to the event, other wise this would be considered as inefficiency.
-   } else {
-     //associate tracks
-     LogTrace("TrackValidator") << "Calling associateRecoToSim method" << "\n";
-     reco::RecoToSimCollection recSimColl=theAssociator->associateRecoToSim(trackCollection,
-									    TPCollection);
-
-     LogTrace("TrackValidator") << "Calling associateSimToReco method" << "\n";
-     reco::SimToRecoCollection simRecColl=theAssociator->associateSimToReco(trackCollection,
-									    TPCollection);
-     
-     rts.reset(new reco::RecoToSimCollection(recSimColl));
-     str.reset(new reco::SimToRecoCollection(simRecColl));
-
-     iEvent.put(std::move(rts));
-     iEvent.put(std::move(str));
-   }
+void TrackAssociatorEDProducer::produce(edm::StreamID, edm::Event &iEvent, const edm::EventSetup &iSetup) const {
+  using namespace edm;
+
+  edm::Handle<reco::TrackToTrackingParticleAssociator> theAssociator;
+  iEvent.getByToken(associatorToken_, theAssociator);
+
+  Handle<TrackingParticleCollection> TPCollection;
+  iEvent.getByToken(TPCollectionToken_, TPCollection);
+
+  Handle<edm::View<reco::Track>> trackCollection;
+  bool trackAvailable = iEvent.getByToken(trackCollectionToken_, trackCollection);
+
+  std::unique_ptr<reco::RecoToSimCollection> rts;
+  std::unique_ptr<reco::SimToRecoCollection> str;
+
+  if (theIgnoremissingtrackcollection && !trackAvailable) {
+    // the track collection is not in the event and we're being told to ignore
+    // this. do not output anything to the event, other wise this would be
+    // considered as inefficiency.
+  } else {
+    // associate tracks
+    LogTrace("TrackValidator") << "Calling associateRecoToSim method"
+                               << "\n";
+    reco::RecoToSimCollection recSimColl = theAssociator->associateRecoToSim(trackCollection, TPCollection);
+
+    LogTrace("TrackValidator") << "Calling associateSimToReco method"
+                               << "\n";
+    reco::SimToRecoCollection simRecColl = theAssociator->associateSimToReco(trackCollection, TPCollection);
+
+    rts.reset(new reco::RecoToSimCollection(recSimColl));
+    str.reset(new reco::SimToRecoCollection(simRecColl));
+
+    iEvent.put(std::move(rts));
+    iEvent.put(std::move(str));
+  }
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(TrackAssociatorEDProducer);
diff --git a/SimTracker/TrackAssociation/plugins/TrackMCQuality.cc b/SimTracker/TrackAssociation/plugins/TrackMCQuality.cc
index 4e13a310135a8..0665c663a4489 100644
--- a/SimTracker/TrackAssociation/plugins/TrackMCQuality.cc
+++ b/SimTracker/TrackAssociation/plugins/TrackMCQuality.cc
@@ -2,8 +2,9 @@
 //
 // Package:    TrackMCQuality
 // Class:      TrackMCQuality
-// 
-/**\class TrackMCQuality TrackMCQuality.cc SimTracker/TrackMCQuality/src/TrackMCQuality.cc
+//
+/**\class TrackMCQuality TrackMCQuality.cc
+ SimTracker/TrackMCQuality/src/TrackMCQuality.cc
 
  Description: <one line class summary>
 
@@ -16,7 +17,6 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
@@ -27,41 +27,39 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
 
-#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 #include "DataFormats/TrackReco/interface/Track.h"
+#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 
 //
 // class decleration
 //
 
 class TrackMCQuality final : public edm::global::EDProducer<> {
-   public:
-      explicit TrackMCQuality(const edm::ParameterSet&);
-      ~TrackMCQuality() override;
+public:
+  explicit TrackMCQuality(const edm::ParameterSet &);
+  ~TrackMCQuality() override;
 
-   private:
-      void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
-      
-      // ----------member data ---------------------------
+private:
+  void produce(edm::StreamID, edm::Event &, const edm::EventSetup &) const override;
+
+  // ----------member data ---------------------------
 
   edm::EDGetTokenT<reco::TrackToTrackingParticleAssociator> label_assoc;
   edm::EDGetTokenT<TrackingParticleCollection> label_tp;
-  edm::EDGetTokenT<edm::View<reco::Track> > label_tr;
+  edm::EDGetTokenT<edm::View<reco::Track>> label_tr;
 
-  using Product=std::vector<float>;  
- 
+  using Product = std::vector<float>;
 };
 
 //
 // constants, enums and typedefs
 //
 
-
 //
 // static data member definitions
 //
@@ -69,67 +67,58 @@ class TrackMCQuality final : public edm::global::EDProducer<> {
 //
 // constructors and destructor
 //
-TrackMCQuality::TrackMCQuality(const edm::ParameterSet& pset):
-  label_assoc(consumes<reco::TrackToTrackingParticleAssociator>(pset.getParameter< edm::InputTag >("associator"))),
-  label_tp(consumes<TrackingParticleCollection>(pset.getParameter< edm::InputTag >("trackingParticles"))),
-  label_tr(consumes<edm::View<reco::Track> >(pset.getParameter< edm::InputTag >("tracks")))
-{
+TrackMCQuality::TrackMCQuality(const edm::ParameterSet &pset)
+    : label_assoc(consumes<reco::TrackToTrackingParticleAssociator>(pset.getParameter<edm::InputTag>("associator"))),
+      label_tp(consumes<TrackingParticleCollection>(pset.getParameter<edm::InputTag>("trackingParticles"))),
+      label_tr(consumes<edm::View<reco::Track>>(pset.getParameter<edm::InputTag>("tracks"))) {
   produces<Product>();
 }
 
-
-TrackMCQuality::~TrackMCQuality()
-{
-}
-
+TrackMCQuality::~TrackMCQuality() {}
 
 //
 // member functions
 //
 
 // ------------ method called to produce the data  ------------
-void
-TrackMCQuality::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup& iSetup) const
-{
-
-   using namespace edm;
-   Handle<reco::TrackToTrackingParticleAssociator> associator;
-   iEvent.getByToken(label_assoc,associator);
-
-   Handle<TrackingParticleCollection>  TPCollection ;
-   iEvent.getByToken(label_tp, TPCollection);
-     
-   Handle<edm::View<reco::Track> > trackCollection;
-   iEvent.getByToken(label_tr, trackCollection );
-
-   reco::RecoToSimCollection recSimColl=associator->associateRecoToSim(trackCollection,
-                                                                       TPCollection);
-   
-   //then loop the track collection
-   std::unique_ptr<Product> product(new Product(trackCollection->size(),0));
-
-   
-   for (unsigned int iT=0;iT!=trackCollection->size();++iT){
-     auto & prod = (*product)[iT];
-
-     edm::RefToBase<reco::Track> track(trackCollection, iT);
-
-     //find it in the map
-     if (recSimColl.find(track)==recSimColl.end()) continue;
-       
-     auto const & tp = recSimColl[track];
-
-     if (tp.empty()) continue;  // can it be?
-     // nSimHits = tp[0].first->numberOfTrackerHits();
-     prod = tp[0].second;
-     // if (tp[0].first->charge() != track->charge()) isChargeMatched = false;
-     if ( (tp[0].first->eventId().event() != 0) || (tp[0].first->eventId().bunchCrossing() != 0) ) prod=-prod;
-
-       
-   }
-   
-   iEvent.put(std::move(product));
+void TrackMCQuality::produce(edm::StreamID, edm::Event &iEvent, const edm::EventSetup &iSetup) const {
+  using namespace edm;
+  Handle<reco::TrackToTrackingParticleAssociator> associator;
+  iEvent.getByToken(label_assoc, associator);
+
+  Handle<TrackingParticleCollection> TPCollection;
+  iEvent.getByToken(label_tp, TPCollection);
+
+  Handle<edm::View<reco::Track>> trackCollection;
+  iEvent.getByToken(label_tr, trackCollection);
+
+  reco::RecoToSimCollection recSimColl = associator->associateRecoToSim(trackCollection, TPCollection);
+
+  // then loop the track collection
+  std::unique_ptr<Product> product(new Product(trackCollection->size(), 0));
+
+  for (unsigned int iT = 0; iT != trackCollection->size(); ++iT) {
+    auto &prod = (*product)[iT];
+
+    edm::RefToBase<reco::Track> track(trackCollection, iT);
+
+    // find it in the map
+    if (recSimColl.find(track) == recSimColl.end())
+      continue;
+
+    auto const &tp = recSimColl[track];
+
+    if (tp.empty())
+      continue;  // can it be?
+    // nSimHits = tp[0].first->numberOfTrackerHits();
+    prod = tp[0].second;
+    // if (tp[0].first->charge() != track->charge()) isChargeMatched = false;
+    if ((tp[0].first->eventId().event() != 0) || (tp[0].first->eventId().bunchCrossing() != 0))
+      prod = -prod;
+  }
+
+  iEvent.put(std::move(product));
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(TrackMCQuality);
diff --git a/SimTracker/TrackAssociation/plugins/TrackTimeValueMapProducer.cc b/SimTracker/TrackAssociation/plugins/TrackTimeValueMapProducer.cc
index daeb8b7b86a89..ca3117120899b 100644
--- a/SimTracker/TrackAssociation/plugins/TrackTimeValueMapProducer.cc
+++ b/SimTracker/TrackAssociation/plugins/TrackTimeValueMapProducer.cc
@@ -1,6 +1,6 @@
 // This producer assigns vertex times (with a specified resolution) to tracks.
-// The times are produced as valuemaps associated to tracks, so the track dataformat doesn't
-// need to be modified.
+// The times are produced as valuemaps associated to tracks, so the track
+// dataformat doesn't need to be modified.
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/global/EDProducer.h"
@@ -14,52 +14,52 @@
 #include "DataFormats/Common/interface/View.h"
 #include "DataFormats/Math/interface/deltaPhi.h"
 
-#include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/GsfTrackReco/interface/GsfTrack.h"
 #include "DataFormats/GsfTrackReco/interface/GsfTrackFwd.h"
+#include "DataFormats/TrackReco/interface/Track.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
+#include "MagneticField/Engine/interface/MagneticField.h"
+#include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
+#include "SimDataFormats/PileupSummaryInfo/interface/PileupSummaryInfo.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
-#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
-#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertex.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertexContainer.h"
-#include "SimDataFormats/PileupSummaryInfo/interface/PileupSummaryInfo.h"
-#include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
-#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
+#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
+#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
 #include "TrackingTools/Records/interface/TransientTrackRecord.h"
-#include "MagneticField/Engine/interface/MagneticField.h"
+#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
 
-#include <random>
 #include <memory>
+#include <random>
 
-#include "SimTracker/TrackAssociation/interface/ResolutionModel.h"
 #include "CLHEP/Units/SystemOfUnits.h"
 #include "FWCore/Utilities/interface/isFinite.h"
 #include "FWCore/Utilities/interface/transform.h"
+#include "SimTracker/TrackAssociation/interface/ResolutionModel.h"
 
 class TrackTimeValueMapProducer : public edm::global::EDProducer<> {
-public:    
-  TrackTimeValueMapProducer(const edm::ParameterSet&);
-  ~TrackTimeValueMapProducer() override { }
-  
-  void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
-  
+public:
+  TrackTimeValueMapProducer(const edm::ParameterSet &);
+  ~TrackTimeValueMapProducer() override {}
+
+  void produce(edm::StreamID, edm::Event &, const edm::EventSetup &) const override;
+
 private:
   // inputs
-  const edm::EDGetTokenT<edm::View<reco::Track> > tracks_;
+  const edm::EDGetTokenT<edm::View<reco::Track>> tracks_;
   const std::string tracksName_;
   const edm::EDGetTokenT<TrackingParticleCollection> trackingParticles_;
   const edm::EDGetTokenT<TrackingVertexCollection> trackingVertices_;
-  const edm::EDGetTokenT<std::vector<PileupSummaryInfo> > pileupSummaryInfo_;
+  const edm::EDGetTokenT<std::vector<PileupSummaryInfo>> pileupSummaryInfo_;
   // tracking particle associators by order of preference
-  const std::vector<edm::EDGetTokenT<reco::TrackToTrackingParticleAssociator> > associators_;  
+  const std::vector<edm::EDGetTokenT<reco::TrackToTrackingParticleAssociator>> associators_;
   // eta bounds
   const float etaMin_, etaMax_, ptMin_, pMin_, etaMaxForPtThreshold_;
   // options
-  std::vector<std::unique_ptr<const ResolutionModel> > resolutions_;
+  std::vector<std::unique_ptr<const ResolutionModel>> resolutions_;
   // functions
-  float extractTrackVertexTime(const TrackingParticle&, const reco::TransientTrack&) const;
+  float extractTrackVertexTime(const TrackingParticle &, const reco::TransientTrack &) const;
 };
 
 DEFINE_FWK_MODULE(TrackTimeValueMapProducer);
@@ -68,77 +68,78 @@ namespace {
   constexpr float m_pion = 139.57061e-3;
   const std::string resolution("Resolution");
 
-  template<typename ParticleType, typename T>
+  template <typename ParticleType, typename T>
   void writeValueMap(edm::Event &iEvent,
-                     const edm::Handle<edm::View<ParticleType> > & handle,
-                     const std::vector<T> & values,
-                     const std::string    & label) {
-    std::unique_ptr<edm::ValueMap<T> > valMap(new edm::ValueMap<T>());
+                     const edm::Handle<edm::View<ParticleType>> &handle,
+                     const std::vector<T> &values,
+                     const std::string &label) {
+    std::unique_ptr<edm::ValueMap<T>> valMap(new edm::ValueMap<T>());
     typename edm::ValueMap<T>::Filler filler(*valMap);
     filler.insert(handle, values.begin(), values.end());
     filler.fill();
     iEvent.put(std::move(valMap), label);
   }
-}
+}  // namespace
 
-TrackTimeValueMapProducer::TrackTimeValueMapProducer(const edm::ParameterSet& conf) :
-  tracks_(consumes<edm::View<reco::Track> >( conf.getParameter<edm::InputTag>("trackSrc") ) ),
-  tracksName_(conf.getParameter<edm::InputTag>("trackSrc").label()),
-  trackingParticles_(consumes<TrackingParticleCollection>( conf.getParameter<edm::InputTag>("trackingParticleSrc") ) ),
-  trackingVertices_(consumes<TrackingVertexCollection>( conf.getParameter<edm::InputTag>("trackingVertexSrc") ) ),
-  pileupSummaryInfo_(consumes<std::vector<PileupSummaryInfo> >( conf.getParameter<edm::InputTag>("pileupSummaryInfo") ) ),
-  associators_( edm::vector_transform( conf.getParameter<std::vector<edm::InputTag> >("associators"), [this](const edm::InputTag& tag){ return this->consumes<reco::TrackToTrackingParticleAssociator>(tag); } ) ),
-  etaMin_( conf.getParameter<double>("etaMin") ),
-  etaMax_( conf.getParameter<double>("etaMax") ),
-  ptMin_( conf.getParameter<double>("ptMin") ),
-  pMin_( conf.getParameter<double>("pMin") ),
-  etaMaxForPtThreshold_( conf.getParameter<double>("etaMaxForPtThreshold") )
-{
+TrackTimeValueMapProducer::TrackTimeValueMapProducer(const edm::ParameterSet &conf)
+    : tracks_(consumes<edm::View<reco::Track>>(conf.getParameter<edm::InputTag>("trackSrc"))),
+      tracksName_(conf.getParameter<edm::InputTag>("trackSrc").label()),
+      trackingParticles_(consumes<TrackingParticleCollection>(conf.getParameter<edm::InputTag>("trackingParticleSrc"))),
+      trackingVertices_(consumes<TrackingVertexCollection>(conf.getParameter<edm::InputTag>("trackingVertexSrc"))),
+      pileupSummaryInfo_(
+          consumes<std::vector<PileupSummaryInfo>>(conf.getParameter<edm::InputTag>("pileupSummaryInfo"))),
+      associators_(edm::vector_transform(
+          conf.getParameter<std::vector<edm::InputTag>>("associators"),
+          [this](const edm::InputTag &tag) { return this->consumes<reco::TrackToTrackingParticleAssociator>(tag); })),
+      etaMin_(conf.getParameter<double>("etaMin")),
+      etaMax_(conf.getParameter<double>("etaMax")),
+      ptMin_(conf.getParameter<double>("ptMin")),
+      pMin_(conf.getParameter<double>("pMin")),
+      etaMaxForPtThreshold_(conf.getParameter<double>("etaMaxForPtThreshold")) {
   // setup resolution models
-  const std::vector<edm::ParameterSet>& resos = conf.getParameterSetVector("resolutionModels");
-  for( const auto& reso : resos ) {
-    const std::string& name = reso.getParameter<std::string>("modelName");
-    resolutions_.emplace_back( ResolutionModelFactory::get()->create(name,reso) );
+  const std::vector<edm::ParameterSet> &resos = conf.getParameterSetVector("resolutionModels");
+  for (const auto &reso : resos) {
+    const std::string &name = reso.getParameter<std::string>("modelName");
+    resolutions_.emplace_back(ResolutionModelFactory::get()->create(name, reso));
 
     // times and time resolutions for general tracks
-    produces<edm::ValueMap<float> >(tracksName_+name);
-    produces<edm::ValueMap<float> >(tracksName_+name+resolution);
+    produces<edm::ValueMap<float>>(tracksName_ + name);
+    produces<edm::ValueMap<float>>(tracksName_ + name + resolution);
   }
 }
 
-void TrackTimeValueMapProducer::produce(edm::StreamID sid, edm::Event& evt, const edm::EventSetup& es) const {
+void TrackTimeValueMapProducer::produce(edm::StreamID sid, edm::Event &evt, const edm::EventSetup &es) const {
   // get sim track associators
-  std::vector<edm::Handle<reco::TrackToTrackingParticleAssociator> > associators;
-  for( const auto& token : associators_ ) {
+  std::vector<edm::Handle<reco::TrackToTrackingParticleAssociator>> associators;
+  for (const auto &token : associators_) {
     associators.emplace_back();
-    auto& back = associators.back();
-    evt.getByToken(token,back);
+    auto &back = associators.back();
+    evt.getByToken(token, back);
   }
 
   std::vector<float> generalTrackTimes;
- 
-  //get track collections
-  edm::Handle<edm::View<reco::Track> > TrackCollectionH;
+
+  // get track collections
+  edm::Handle<edm::View<reco::Track>> TrackCollectionH;
   evt.getByToken(tracks_, TrackCollectionH);
-  const edm::View<reco::Track>& TrackCollection = *TrackCollectionH;
+  const edm::View<reco::Track> &TrackCollection = *TrackCollectionH;
 
-  //get tracking particle collections
-  edm::Handle<TrackingParticleCollection>  TPCollectionH;
+  // get tracking particle collections
+  edm::Handle<TrackingParticleCollection> TPCollectionH;
   evt.getByToken(trackingParticles_, TPCollectionH);
-  
-  edm::Handle<std::vector<PileupSummaryInfo> > pileupSummaryH;
+
+  edm::Handle<std::vector<PileupSummaryInfo>> pileupSummaryH;
   evt.getByToken(pileupSummaryInfo_, pileupSummaryH);
-  
-  //transient track builder
+
+  // transient track builder
   edm::ESHandle<TransientTrackBuilder> theB;
-  es.get<TransientTrackRecord>().get("TransientTrackBuilder",theB);
-  
+  es.get<TransientTrackRecord>().get("TransientTrackBuilder", theB);
+
   // associate the reco tracks / gsf Tracks
-  std::vector<reco::RecoToSimCollection> associatedTracks;  
-  for( auto associator : associators ) {
+  std::vector<reco::RecoToSimCollection> associatedTracks;
+  for (auto associator : associators) {
     associatedTracks.emplace_back(associator->associateRecoToSim(TrackCollectionH, TPCollectionH));
   }
-  
 
   double sumSimTime = 0.;
   double sumSimTimeSq = 0.;
@@ -148,110 +149,111 @@ void TrackTimeValueMapProducer::produce(edm::StreamID sid, edm::Event& evt, cons
       for (const float &time : puinfo.getPU_times()) {
         double simtime = time;
         sumSimTime += simtime;
-        sumSimTimeSq += simtime*simtime;
+        sumSimTimeSq += simtime * simtime;
         ++nsim;
       }
       break;
     }
   }
-  
-  double meanSimTime = sumSimTime/double(nsim);
-  double varSimTime = sumSimTimeSq/double(nsim) - meanSimTime*meanSimTime;
-  double rmsSimTime = std::sqrt(std::max(0.1*0.1,varSimTime));
+
+  double meanSimTime = sumSimTime / double(nsim);
+  double varSimTime = sumSimTimeSq / double(nsim) - meanSimTime * meanSimTime;
+  double rmsSimTime = std::sqrt(std::max(0.1 * 0.1, varSimTime));
   std::normal_distribution<float> gausSimTime(meanSimTime, rmsSimTime);
 
   // get event-based seed for RNG
-  unsigned int runNum_uint = static_cast <unsigned int> (evt.id().run());
-  unsigned int lumiNum_uint = static_cast <unsigned int> (evt.id().luminosityBlock());
-  unsigned int evNum_uint = static_cast <unsigned int> (evt.id().event());
-  unsigned int tkChi2_uint = uint32_t(TrackCollection.empty() ? 0 : TrackCollection.refAt(0)->chi2()/0.01);
-  std::uint32_t seed = tkChi2_uint + (lumiNum_uint<<10) + (runNum_uint<<20) + evNum_uint;
+  unsigned int runNum_uint = static_cast<unsigned int>(evt.id().run());
+  unsigned int lumiNum_uint = static_cast<unsigned int>(evt.id().luminosityBlock());
+  unsigned int evNum_uint = static_cast<unsigned int>(evt.id().event());
+  unsigned int tkChi2_uint = uint32_t(TrackCollection.empty() ? 0 : TrackCollection.refAt(0)->chi2() / 0.01);
+  std::uint32_t seed = tkChi2_uint + (lumiNum_uint << 10) + (runNum_uint << 20) + evNum_uint;
   std::mt19937 rng(seed);
 
-  for( unsigned itk = 0; itk < TrackCollection.size(); ++itk ) {
+  for (unsigned itk = 0; itk < TrackCollection.size(); ++itk) {
     const auto tkref = TrackCollection.refAt(itk);
     reco::RecoToSimCollection::const_iterator track_tps = associatedTracks.back().end();
 
-    for( const auto& association : associatedTracks ) {
+    for (const auto &association : associatedTracks) {
       track_tps = association.find(tkref);
-      if( track_tps != association.end() ) break;
+      if (track_tps != association.end())
+        break;
     }
 
     if (track_tps != associatedTracks.back().end() && track_tps->val.size() == 1) {
       reco::TransientTrack tt = theB->build(*tkref);
-      float time = extractTrackVertexTime(*track_tps->val[0].first,tt);
+      float time = extractTrackVertexTime(*track_tps->val[0].first, tt);
       generalTrackTimes.push_back(time);
-    }
-    else {
+    } else {
       float rndtime = gausSimTime(rng);
       generalTrackTimes.push_back(rndtime);
       if (track_tps != associatedTracks.back().end() && track_tps->val.size() > 1) {
-        LogDebug("TooManyTracks") << "track matched to " << track_tps->val.size() << " tracking particles!" << std::endl;
+        LogDebug("TooManyTracks") << "track matched to " << track_tps->val.size() << " tracking particles!"
+                                  << std::endl;
       }
     }
   }
-  
-  for( const auto& reso : resolutions_ ) {
-    const std::string& name = reso->name();
+
+  for (const auto &reso : resolutions_) {
+    const std::string &name = reso->name();
     std::vector<float> times, resos;
-    
+
     times.reserve(TrackCollection.size());
     resos.reserve(TrackCollection.size());
 
-    for( unsigned i = 0; i < TrackCollection.size(); ++i ) {
-      const reco::Track& tk = TrackCollection[i];
+    for (unsigned i = 0; i < TrackCollection.size(); ++i) {
+      const reco::Track &tk = TrackCollection[i];
       const float absEta = std::abs(tk.eta());
-      bool inAcceptance = absEta < etaMax_ && absEta >= etaMin_ && tk.p()>pMin_ && (absEta>etaMaxForPtThreshold_ || tk.pt()>ptMin_);
+      bool inAcceptance = absEta < etaMax_ && absEta >= etaMin_ && tk.p() > pMin_ &&
+                          (absEta > etaMaxForPtThreshold_ || tk.pt() > ptMin_);
       if (inAcceptance) {
         const float resolution = reso->getTimeResolution(tk);
         std::normal_distribution<float> gausGeneralTime(generalTrackTimes[i], resolution);
-        times.push_back( gausGeneralTime(rng) );
-        resos.push_back( resolution );
-      }
-      else {
+        times.push_back(gausGeneralTime(rng));
+        resos.push_back(resolution);
+      } else {
         times.push_back(0.0f);
         resos.push_back(-1.);
       }
     }
 
-    writeValueMap( evt, TrackCollectionH, times, tracksName_+name );
-    writeValueMap( evt, TrackCollectionH, resos, tracksName_+name+resolution );
+    writeValueMap(evt, TrackCollectionH, times, tracksName_ + name);
+    writeValueMap(evt, TrackCollectionH, resos, tracksName_ + name + resolution);
   }
 }
 
-float TrackTimeValueMapProducer::
-extractTrackVertexTime( const TrackingParticle &tp, const reco::TransientTrack &tt ) const {
+float TrackTimeValueMapProducer::extractTrackVertexTime(const TrackingParticle &tp,
+                                                        const reco::TransientTrack &tt) const {
   int pdgid = tp.pdgId();
-  const auto& tvertex = tp.parentVertex();
+  const auto &tvertex = tp.parentVertex();
   math::XYZTLorentzVectorD result = tvertex->position();
-  
+
   // account for secondary vertices...
-  if( tvertex->nSourceTracks() && tvertex->sourceTracks()[0]->pdgId()==pdgid ) {
+  if (tvertex->nSourceTracks() && tvertex->sourceTracks()[0]->pdgId() == pdgid) {
     auto pvertex = tvertex->sourceTracks()[0]->parentVertex();
     result = pvertex->position();
-    while( pvertex->nSourceTracks() && pvertex->sourceTracks()[0]->pdgId()==pdgid ) {
+    while (pvertex->nSourceTracks() && pvertex->sourceTracks()[0]->pdgId() == pdgid) {
       pvertex = pvertex->sourceTracks()[0]->parentVertex();
       result = pvertex->position();
     }
   }
-  
-  float time = result.T()*CLHEP::second;
-  //correct for time of flight from track reference position
-  GlobalPoint result_pos(result.x(),result.y(),result.z());
+
+  float time = result.T() * CLHEP::second;
+  // correct for time of flight from track reference position
+  GlobalPoint result_pos(result.x(), result.y(), result.z());
   const auto &tkstate = tt.trajectoryStateClosestToPoint(result_pos);
   float tkphi = tkstate.momentum().phi();
   float tkz = tkstate.position().z();
-  float dphi = reco::deltaPhi(tkphi,tt.track().phi());
+  float dphi = reco::deltaPhi(tkphi, tt.track().phi());
   float dz = tkz - tt.track().vz();
-  
-  float radius = 100.*tt.track().pt()/(0.3*tt.field()->inTesla(GlobalPoint(0,0,0)).z());
-  float pathlengthrphi = tt.track().charge()*dphi*radius;
-  
-  float pathlength = std::sqrt(pathlengthrphi*pathlengthrphi + dz*dz);
+
+  float radius = 100. * tt.track().pt() / (0.3 * tt.field()->inTesla(GlobalPoint(0, 0, 0)).z());
+  float pathlengthrphi = tt.track().charge() * dphi * radius;
+
+  float pathlength = std::sqrt(pathlengthrphi * pathlengthrphi + dz * dz);
   float p = tt.track().p();
-  
-  float speed = std::sqrt(1./(1.+m_pion/p))*CLHEP::c_light/CLHEP::cm;  //speed in cm/ns
-  float dt = pathlength/speed;
 
-  return time-dt;
+  float speed = std::sqrt(1. / (1. + m_pion / p)) * CLHEP::c_light / CLHEP::cm;  // speed in cm/ns
+  float dt = pathlength / speed;
+
+  return time - dt;
 }
diff --git a/SimTracker/TrackAssociation/src/CosmicParametersDefinerForTP.cc b/SimTracker/TrackAssociation/src/CosmicParametersDefinerForTP.cc
index 0e215bf6b8db1..a9db15efa708e 100644
--- a/SimTracker/TrackAssociation/src/CosmicParametersDefinerForTP.cc
+++ b/SimTracker/TrackAssociation/src/CosmicParametersDefinerForTP.cc
@@ -1,29 +1,30 @@
-#include "SimTracker/TrackAssociation/interface/CosmicParametersDefinerForTP.h"
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "DataFormats/GeometryVector/interface/GlobalVector.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
-#include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h"
-#include "TrackingTools/PatternTools/interface/TSCBLBuilderNoMaterial.h"
-#include "TrackingTools/PatternTools/interface/TSCPBuilderNoMaterial.h"
-#include "MagneticField/Engine/interface/MagneticField.h" 
-#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include <Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h>
+#include "DataFormats/GeometryVector/interface/GlobalVector.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/typelookup.h"
 #include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
 #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
-#include <DataFormats/GeometrySurface/interface/Surface.h>
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+#include "MagneticField/Engine/interface/MagneticField.h"
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
+#include "SimTracker/TrackAssociation/interface/CosmicParametersDefinerForTP.h"
+#include "TrackingTools/PatternTools/interface/TSCBLBuilderNoMaterial.h"
+#include "TrackingTools/PatternTools/interface/TSCPBuilderNoMaterial.h"
+#include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h"
 #include <DataFormats/GeometrySurface/interface/GloballyPositioned.h>
-#include <Geometry/CommonDetUnit/interface/GeomDet.h>
-#include "FWCore/Framework/interface/Event.h"
+#include <DataFormats/GeometrySurface/interface/Surface.h>
 #include <FWCore/Framework/interface/ESHandle.h>
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include <Geometry/CommonDetUnit/interface/GeomDet.h>
+#include <Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h>
 
 class TrajectoryStateClosestToBeamLineBuilder;
 
-
-TrackingParticle::Vector
- CosmicParametersDefinerForTP::momentum(const edm::Event& iEvent, const edm::EventSetup& iSetup, const TrackingParticleRef& tpr) const{
-  // to add a new implementation for cosmic. For the moment, it is just as for the base class:
+TrackingParticle::Vector CosmicParametersDefinerForTP::momentum(const edm::Event &iEvent,
+                                                                const edm::EventSetup &iSetup,
+                                                                const TrackingParticleRef &tpr) const {
+  // to add a new implementation for cosmic. For the moment, it is just as for
+  // the base class:
   using namespace edm;
   using namespace std;
   using namespace reco;
@@ -32,50 +33,58 @@ TrackingParticle::Vector
   iSetup.get<TrackerDigiGeometryRecord>().get(tracker);
   edm::ESHandle<GlobalTrackingGeometry> theGeometry;
   iSetup.get<GlobalTrackingGeometryRecord>().get(theGeometry);
-  
+
   edm::ESHandle<MagneticField> theMF;
   iSetup.get<IdealMagneticFieldRecord>().get(theMF);
-  
+
   edm::Handle<reco::BeamSpot> bs;
-  iEvent.getByLabel(InputTag("offlineBeamSpot"),bs);
+  iEvent.getByLabel(InputTag("offlineBeamSpot"), bs);
 
-  GlobalVector finalGV(0,0,0);
-  GlobalPoint finalGP(0,0,0);
+  GlobalVector finalGV(0, 0, 0);
+  GlobalPoint finalGP(0, 0, 0);
   double radius(9999);
   bool found(false);
-  TrackingParticle::Vector momentum(0,0,0);
+  TrackingParticle::Vector momentum(0, 0, 0);
 
-  edm::LogVerbatim("CosmicParametersDefinerForTP")<<"\t in CosmicParametersDefinerForTP::momentum"; 
+  edm::LogVerbatim("CosmicParametersDefinerForTP") << "\t in CosmicParametersDefinerForTP::momentum";
   edm::LogVerbatim("CosmicParametersDefinerForTP")
-    <<"\t \t Original TP state:          pt = "<<tpr->pt()<<", pz = "<<tpr->pz();
+      << "\t \t Original TP state:          pt = " << tpr->pt() << ", pz = " << tpr->pz();
 
-  if (simHitsTPAssoc.isValid()==0) {
+  if (simHitsTPAssoc.isValid() == 0) {
     LogError("TrackAssociation") << "Invalid handle!";
     return momentum;
   }
-  std::pair<TrackingParticleRef, TrackPSimHitRef> clusterTPpairWithDummyTP(tpr,TrackPSimHitRef());//SimHit is dummy: for simHitTPAssociationListGreater 
-                                                                                                 // sorting only the cluster is needed
-  auto range = std::equal_range(simHitsTPAssoc->begin(), simHitsTPAssoc->end(), 
-				clusterTPpairWithDummyTP, SimHitTPAssociationProducer::simHitTPAssociationListGreater);
-  for(auto ip = range.first; ip != range.second; ++ip) {
+  std::pair<TrackingParticleRef, TrackPSimHitRef> clusterTPpairWithDummyTP(
+      tpr,
+      TrackPSimHitRef());  // SimHit is dummy: for simHitTPAssociationListGreater
+                           // sorting only the cluster is needed
+  auto range = std::equal_range(simHitsTPAssoc->begin(),
+                                simHitsTPAssoc->end(),
+                                clusterTPpairWithDummyTP,
+                                SimHitTPAssociationProducer::simHitTPAssociationListGreater);
+  for (auto ip = range.first; ip != range.second; ++ip) {
     TrackPSimHitRef it = ip->second;
-    const GeomDet* tmpDet  = theGeometry->idToDet( DetId(it->detUnitId()) ) ;
+    const GeomDet *tmpDet = theGeometry->idToDet(DetId(it->detUnitId()));
     if (!tmpDet) {
       edm::LogVerbatim("CosmicParametersDefinerForTP")
-	<<"***WARNING in CosmicParametersDefinerForTP::momentum: no GeomDet for: "<<it->detUnitId()<<". Skipping it."<<"\n";
+          << "***WARNING in CosmicParametersDefinerForTP::momentum: no GeomDet "
+             "for: "
+          << it->detUnitId() << ". Skipping it."
+          << "\n";
       continue;
-    } 
+    }
 
-    LocalVector  lv = it->momentumAtEntry();
-    Local3DPoint lp = it->localPosition ();
-    GlobalVector gv = tmpDet->surface().toGlobal( lv );
-    GlobalPoint  gp = tmpDet->surface().toGlobal( lp );
+    LocalVector lv = it->momentumAtEntry();
+    Local3DPoint lp = it->localPosition();
+    GlobalVector gv = tmpDet->surface().toGlobal(lv);
+    GlobalPoint gp = tmpDet->surface().toGlobal(lp);
 
     // discard hits related to low energy debris from the primary particle
-    if (it->processType()!=0) continue;
+    if (it->processType() != 0)
+      continue;
 
-    if(gp.perp()<radius){
-      found=true;
+    if (gp.perp() < radius) {
+      found = true;
       radius = gp.perp();
       finalGV = gv;
       finalGP = gp;
@@ -83,40 +92,45 @@ TrackingParticle::Vector
   }
 
   edm::LogVerbatim("CosmicParametersDefinerForTP")
-    //   <<"\t FINAL State at InnerMost Hit: Radius = "<< finalGP.perp() << ", z = "<< finalGP.z() 
-    //  <<", pt = "<< finalGV.perp() << ", pz = "<< finalGV.z();
-    <<"\t \t FINAL State at InnerMost Hit:   pt = "<< finalGV.perp() << ", pz = "<< finalGV.z();
-
-  if(found) 
-    {
-      FreeTrajectoryState ftsAtProduction(finalGP,finalGV,TrackCharge(tpr->charge()),theMF.product());
-      TSCBLBuilderNoMaterial tscblBuilder;
-      TrajectoryStateClosestToBeamLine tsAtClosestApproach = tscblBuilder(ftsAtProduction,*bs);//as in TrackProducerAlgorithm
-
-      if(tsAtClosestApproach.isValid()){
-	GlobalVector p = tsAtClosestApproach.trackStateAtPCA().momentum();
-	momentum = TrackingParticle::Vector(p.x(), p.y(), p.z());
-      }
-      else {
-	edm::LogVerbatim("CosmicParametersDefinerForTP")
-	  <<"*** WARNING in CosmicParametersDefinerForTP::momentum: tsAtClosestApproach is not valid." <<"\n";
-      }
+      //   <<"\t FINAL State at InnerMost Hit: Radius = "<< finalGP.perp() << ",
+      //   z = "<< finalGP.z()
+      //  <<", pt = "<< finalGV.perp() << ", pz = "<< finalGV.z();
+      << "\t \t FINAL State at InnerMost Hit:   pt = " << finalGV.perp() << ", pz = " << finalGV.z();
+
+  if (found) {
+    FreeTrajectoryState ftsAtProduction(finalGP, finalGV, TrackCharge(tpr->charge()), theMF.product());
+    TSCBLBuilderNoMaterial tscblBuilder;
+    TrajectoryStateClosestToBeamLine tsAtClosestApproach =
+        tscblBuilder(ftsAtProduction, *bs);  // as in TrackProducerAlgorithm
+
+    if (tsAtClosestApproach.isValid()) {
+      GlobalVector p = tsAtClosestApproach.trackStateAtPCA().momentum();
+      momentum = TrackingParticle::Vector(p.x(), p.y(), p.z());
+    } else {
+      edm::LogVerbatim("CosmicParametersDefinerForTP") << "*** WARNING in CosmicParametersDefinerForTP::momentum: "
+                                                          "tsAtClosestApproach is not valid."
+                                                       << "\n";
+    }
 
-      edm::LogVerbatim("CosmicParametersDefinerForTP")
-	<<"\t \t FINAL State extrap. at PCA: pt = "<< sqrt(momentum.x()*momentum.x()+momentum.y()*momentum.y()) << ", pz = "<< momentum.z() <<"\n";
+    edm::LogVerbatim("CosmicParametersDefinerForTP")
+        << "\t \t FINAL State extrap. at PCA: pt = " << sqrt(momentum.x() * momentum.x() + momentum.y() * momentum.y())
+        << ", pz = " << momentum.z() << "\n";
 
-      return momentum;
-    }
+    return momentum;
+  }
 
   edm::LogVerbatim("CosmicParametersDefinerForTP")
-    <<"*** WARNING in CosmicParametersDefinerForTP::momentum: NOT found the innermost TP point" <<"\n";
+      << "*** WARNING in CosmicParametersDefinerForTP::momentum: NOT found the "
+         "innermost TP point"
+      << "\n";
   edm::LogVerbatim("CosmicParametersDefinerForTP")
-    <<"*** FINAL Reference MOMENTUM TP (px,py,pz) = "<<momentum.x()<<momentum.y()<<momentum.z()<<"\n";
+      << "*** FINAL Reference MOMENTUM TP (px,py,pz) = " << momentum.x() << momentum.y() << momentum.z() << "\n";
   return momentum;
 }
 
-TrackingParticle::Point CosmicParametersDefinerForTP::vertex(const edm::Event& iEvent, const edm::EventSetup& iSetup, const TrackingParticleRef& tpr) const{
-  
+TrackingParticle::Point CosmicParametersDefinerForTP::vertex(const edm::Event &iEvent,
+                                                             const edm::EventSetup &iSetup,
+                                                             const TrackingParticleRef &tpr) const {
   using namespace edm;
   using namespace std;
   using namespace reco;
@@ -124,90 +138,101 @@ TrackingParticle::Point CosmicParametersDefinerForTP::vertex(const edm::Event& i
   ESHandle<TrackerGeometry> tracker;
   iSetup.get<TrackerDigiGeometryRecord>().get(tracker);
   edm::ESHandle<GlobalTrackingGeometry> theGeometry;
-  iSetup.get<GlobalTrackingGeometryRecord>().get(theGeometry);    
-  
+  iSetup.get<GlobalTrackingGeometryRecord>().get(theGeometry);
+
   edm::ESHandle<MagneticField> theMF;
   iSetup.get<IdealMagneticFieldRecord>().get(theMF);
-  
+
   edm::Handle<reco::BeamSpot> bs;
-  iEvent.getByLabel(InputTag("offlineBeamSpot"),bs);
+  iEvent.getByLabel(InputTag("offlineBeamSpot"), bs);
 
-  GlobalVector finalGV(0,0,0);
-  GlobalPoint finalGP(0,0,0);
+  GlobalVector finalGV(0, 0, 0);
+  GlobalPoint finalGP(0, 0, 0);
   double radius(9999);
   bool found(false);
-  TrackingParticle::Point vertex(0,0,0);
+  TrackingParticle::Point vertex(0, 0, 0);
 
-  edm::LogVerbatim("CosmicParametersDefinerForTP")<<"\t in CosmicParametersDefinerForTP::vertex";
+  edm::LogVerbatim("CosmicParametersDefinerForTP") << "\t in CosmicParametersDefinerForTP::vertex";
   edm::LogVerbatim("CosmicParametersDefinerForTP")
-    <<"\t \t Original TP state:          radius = "<<sqrt(tpr->vertex().x()*tpr->vertex().x()+tpr->vertex().y()*tpr->vertex().y())<<", z = "<<tpr->vertex().z();
+      << "\t \t Original TP state:          radius = "
+      << sqrt(tpr->vertex().x() * tpr->vertex().x() + tpr->vertex().y() * tpr->vertex().y())
+      << ", z = " << tpr->vertex().z();
 
-  if (simHitsTPAssoc.isValid()==0) {
+  if (simHitsTPAssoc.isValid() == 0) {
     LogError("TrackAssociation") << "Invalid handle!";
     return vertex;
   }
-  std::pair<TrackingParticleRef, TrackPSimHitRef> clusterTPpairWithDummyTP(tpr,TrackPSimHitRef());//SimHit is dummy: for simHitTPAssociationListGreater 
-                                                                                                 // sorting only the cluster is needed
-  auto range = std::equal_range(simHitsTPAssoc->begin(), simHitsTPAssoc->end(), 
-				clusterTPpairWithDummyTP, SimHitTPAssociationProducer::simHitTPAssociationListGreater);
-  for(auto ip = range.first; ip != range.second; ++ip) {
+  std::pair<TrackingParticleRef, TrackPSimHitRef> clusterTPpairWithDummyTP(
+      tpr,
+      TrackPSimHitRef());  // SimHit is dummy: for simHitTPAssociationListGreater
+                           // sorting only the cluster is needed
+  auto range = std::equal_range(simHitsTPAssoc->begin(),
+                                simHitsTPAssoc->end(),
+                                clusterTPpairWithDummyTP,
+                                SimHitTPAssociationProducer::simHitTPAssociationListGreater);
+  for (auto ip = range.first; ip != range.second; ++ip) {
     TrackPSimHitRef it = ip->second;
-    const GeomDet* tmpDet  = theGeometry->idToDet( DetId(it->detUnitId()) ) ;
+    const GeomDet *tmpDet = theGeometry->idToDet(DetId(it->detUnitId()));
     if (!tmpDet) {
       edm::LogVerbatim("CosmicParametersDefinerForTP")
-	<<"***WARNING in CosmicParametersDefinerForTP::vertex: no GeomDet for: "<<it->detUnitId()<<". Skipping it."<<"\n";
+          << "***WARNING in CosmicParametersDefinerForTP::vertex: no GeomDet "
+             "for: "
+          << it->detUnitId() << ". Skipping it."
+          << "\n";
       continue;
     }
 
-    LocalVector  lv = it->momentumAtEntry();
-    Local3DPoint lp = it->localPosition ();
-    GlobalVector gv = tmpDet->surface().toGlobal( lv );
-    GlobalPoint  gp = tmpDet->surface().toGlobal( lp );
+    LocalVector lv = it->momentumAtEntry();
+    Local3DPoint lp = it->localPosition();
+    GlobalVector gv = tmpDet->surface().toGlobal(lv);
+    GlobalPoint gp = tmpDet->surface().toGlobal(lp);
 
     // discard hits related to low energy debris from the primary particle
-    if (it->processType()!=0) continue;
+    if (it->processType() != 0)
+      continue;
 
-    if(gp.perp()<radius){
-      found=true;
+    if (gp.perp() < radius) {
+      found = true;
       radius = gp.perp();
       finalGV = gv;
       finalGP = gp;
     }
   }
   edm::LogVerbatim("CosmicParametersDefinerForTP")
-    <<"\t \t FINAL State at InnerMost Hit:   radius = "<< finalGP.perp() << ", z = "<< finalGP.z();
-
-  if(found)
-    {
-      FreeTrajectoryState ftsAtProduction(finalGP,finalGV,TrackCharge(tpr->charge()),theMF.product());
-      TSCBLBuilderNoMaterial tscblBuilder;
-      TrajectoryStateClosestToBeamLine tsAtClosestApproach = tscblBuilder(ftsAtProduction,*bs);//as in TrackProducerAlgorithm
-
-      if(tsAtClosestApproach.isValid()){
-	GlobalPoint v = tsAtClosestApproach.trackStateAtPCA().position();
-	vertex = TrackingParticle::Point(v.x(), v.y(), v.z());
-      }
-      else {
-        // to preserve old behaviour
-        // would be better to flag this somehow to allow ignoring in downstream
-        vertex = TrackingParticle::Point(bs->x0(), bs->y0(), bs->z0());
-	edm::LogVerbatim("CosmicParametersDefinerForTP")
-	  <<"*** WARNING in CosmicParametersDefinerForTP::vertex: tsAtClosestApproach is not valid." <<"\n";
-      }
-      edm::LogVerbatim("CosmicParametersDefinerForTP")
-	<<"\t \t FINAL State extrap. at PCA: radius = "
-        <<sqrt(vertex.x()*vertex.x()+vertex.y()*vertex.y())<<", z = "<<vertex.z()<<"\n";
-
-      return vertex;
+      << "\t \t FINAL State at InnerMost Hit:   radius = " << finalGP.perp() << ", z = " << finalGP.z();
+
+  if (found) {
+    FreeTrajectoryState ftsAtProduction(finalGP, finalGV, TrackCharge(tpr->charge()), theMF.product());
+    TSCBLBuilderNoMaterial tscblBuilder;
+    TrajectoryStateClosestToBeamLine tsAtClosestApproach =
+        tscblBuilder(ftsAtProduction, *bs);  // as in TrackProducerAlgorithm
+
+    if (tsAtClosestApproach.isValid()) {
+      GlobalPoint v = tsAtClosestApproach.trackStateAtPCA().position();
+      vertex = TrackingParticle::Point(v.x(), v.y(), v.z());
+    } else {
+      // to preserve old behaviour
+      // would be better to flag this somehow to allow ignoring in downstream
+      vertex = TrackingParticle::Point(bs->x0(), bs->y0(), bs->z0());
+      edm::LogVerbatim("CosmicParametersDefinerForTP") << "*** WARNING in CosmicParametersDefinerForTP::vertex: "
+                                                          "tsAtClosestApproach is not valid."
+                                                       << "\n";
     }
+    edm::LogVerbatim("CosmicParametersDefinerForTP")
+        << "\t \t FINAL State extrap. at PCA: radius = " << sqrt(vertex.x() * vertex.x() + vertex.y() * vertex.y())
+        << ", z = " << vertex.z() << "\n";
+
+    return vertex;
+  }
 
   edm::LogVerbatim("CosmicParametersDefinerForTP")
-    <<"*** WARNING in CosmicParametersDefinerForTP::vertex: NOT found the innermost TP point" <<"\n";
+      << "*** WARNING in CosmicParametersDefinerForTP::vertex: NOT found the "
+         "innermost TP point"
+      << "\n";
   edm::LogVerbatim("CosmicParametersDefinerForTP")
-    <<"*** FINAL Reference VERTEX TP   V(x,y,z) = "<<vertex.x()<<vertex.y()<<vertex.z()<<"\n";
+      << "*** FINAL Reference VERTEX TP   V(x,y,z) = " << vertex.x() << vertex.y() << vertex.z() << "\n";
 
   return vertex;
 }
 
-
 TYPELOOKUP_DATA_REG(CosmicParametersDefinerForTP);
diff --git a/SimTracker/TrackAssociation/src/ParametersDefinerForTP.cc b/SimTracker/TrackAssociation/src/ParametersDefinerForTP.cc
index d4c8bdebc8966..b9e9870fd422d 100644
--- a/SimTracker/TrackAssociation/src/ParametersDefinerForTP.cc
+++ b/SimTracker/TrackAssociation/src/ParametersDefinerForTP.cc
@@ -1,77 +1,81 @@
-#include "SimTracker/TrackAssociation/interface/ParametersDefinerForTP.h"
-#include "FWCore/Utilities/interface/typelookup.h"
-#include "DataFormats/GeometryVector/interface/GlobalVector.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
-#include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h"
+#include "DataFormats/GeometryVector/interface/GlobalVector.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Utilities/interface/typelookup.h"
+#include "MagneticField/Engine/interface/MagneticField.h"
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
+#include "SimTracker/TrackAssociation/interface/ParametersDefinerForTP.h"
 #include "TrackingTools/PatternTools/interface/TSCBLBuilderNoMaterial.h"
 #include "TrackingTools/PatternTools/interface/TSCPBuilderNoMaterial.h"
-#include "MagneticField/Engine/interface/MagneticField.h" 
-#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
-#include "FWCore/Framework/interface/Event.h"
+#include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h"
 #include <FWCore/Framework/interface/ESHandle.h>
 class TrajectoryStateClosestToBeamLineBuilder;
 
+ParametersDefinerForTP::ParametersDefinerForTP(const edm::ParameterSet &iConfig)
+    : beamSpotInputTag_(iConfig.getUntrackedParameter<edm::InputTag>("beamSpot", edm::InputTag("offlineBeamSpot"))) {}
 
-ParametersDefinerForTP::ParametersDefinerForTP(const edm::ParameterSet& iConfig)
-  : beamSpotInputTag_ ( iConfig.getUntrackedParameter<edm::InputTag>("beamSpot", edm::InputTag("offlineBeamSpot")) )
-{
-}
-
-
-TrackingParticle::Vector
-ParametersDefinerForTP::momentum(const edm::Event& iEvent, const edm::EventSetup& iSetup,
-	const Charge charge, const Point & vtx, const LorentzVector& lv) const {
-  // to add a new implementation for cosmic. For the moment, it is just as for the base class:
+TrackingParticle::Vector ParametersDefinerForTP::momentum(const edm::Event &iEvent,
+                                                          const edm::EventSetup &iSetup,
+                                                          const Charge charge,
+                                                          const Point &vtx,
+                                                          const LorentzVector &lv) const {
+  // to add a new implementation for cosmic. For the moment, it is just as for
+  // the base class:
 
   using namespace edm;
 
   edm::ESHandle<MagneticField> theMF;
   iSetup.get<IdealMagneticFieldRecord>().get(theMF);
-  
+
   edm::Handle<reco::BeamSpot> bs;
-  iEvent.getByLabel(beamSpotInputTag_,bs);
+  iEvent.getByLabel(beamSpotInputTag_, bs);
+
+  TrackingParticle::Vector momentum(0, 0, 0);
 
-  TrackingParticle::Vector momentum(0, 0, 0); 
+  FreeTrajectoryState ftsAtProduction(GlobalPoint(vtx.x(), vtx.y(), vtx.z()),
+                                      GlobalVector(lv.x(), lv.y(), lv.z()),
+                                      TrackCharge(charge),
+                                      theMF.product());
 
-  FreeTrajectoryState ftsAtProduction(GlobalPoint(vtx.x(),vtx.y(),vtx.z()),
-				      GlobalVector(lv.x(),lv.y(),lv.z()),
-				      TrackCharge(charge),
-				      theMF.product());
-        
   TSCBLBuilderNoMaterial tscblBuilder;
-  TrajectoryStateClosestToBeamLine tsAtClosestApproach = tscblBuilder(ftsAtProduction,*bs);//as in TrackProducerAlgorithm
-  if(tsAtClosestApproach.isValid()){
+  TrajectoryStateClosestToBeamLine tsAtClosestApproach =
+      tscblBuilder(ftsAtProduction, *bs);  // as in TrackProducerAlgorithm
+  if (tsAtClosestApproach.isValid()) {
     GlobalVector p = tsAtClosestApproach.trackStateAtPCA().momentum();
     momentum = TrackingParticle::Vector(p.x(), p.y(), p.z());
   }
   return momentum;
 }
 
-TrackingParticle::Point ParametersDefinerForTP::vertex(const edm::Event& iEvent, const edm::EventSetup& iSetup,
-	const Charge charge, const Point & vtx, const LorentzVector& lv) const {
-  // to add a new implementation for cosmic. For the moment, it is just as for the base class:
+TrackingParticle::Point ParametersDefinerForTP::vertex(const edm::Event &iEvent,
+                                                       const edm::EventSetup &iSetup,
+                                                       const Charge charge,
+                                                       const Point &vtx,
+                                                       const LorentzVector &lv) const {
+  // to add a new implementation for cosmic. For the moment, it is just as for
+  // the base class:
   using namespace edm;
 
   edm::ESHandle<MagneticField> theMF;
   iSetup.get<IdealMagneticFieldRecord>().get(theMF);
-  
+
   edm::Handle<reco::BeamSpot> bs;
-  iEvent.getByLabel(beamSpotInputTag_,bs);
+  iEvent.getByLabel(beamSpotInputTag_, bs);
 
   TrackingParticle::Point vertex(0, 0, 0);
-  
-  FreeTrajectoryState ftsAtProduction(GlobalPoint(vtx.x(),vtx.y(),vtx.z()),
-				      GlobalVector(lv.x(),lv.y(),lv.z()),
-				      TrackCharge(charge),
-				      theMF.product());
-        
+
+  FreeTrajectoryState ftsAtProduction(GlobalPoint(vtx.x(), vtx.y(), vtx.z()),
+                                      GlobalVector(lv.x(), lv.y(), lv.z()),
+                                      TrackCharge(charge),
+                                      theMF.product());
+
   TSCBLBuilderNoMaterial tscblBuilder;
-  TrajectoryStateClosestToBeamLine tsAtClosestApproach = tscblBuilder(ftsAtProduction,*bs);//as in TrackProducerAlgorithm
-  if(tsAtClosestApproach.isValid()){
+  TrajectoryStateClosestToBeamLine tsAtClosestApproach =
+      tscblBuilder(ftsAtProduction, *bs);  // as in TrackProducerAlgorithm
+  if (tsAtClosestApproach.isValid()) {
     GlobalPoint v = tsAtClosestApproach.trackStateAtPCA().position();
-    vertex = TrackingParticle::Point(v.x(),v.y(),v.z());
-  }
-  else {
+    vertex = TrackingParticle::Point(v.x(), v.y(), v.z());
+  } else {
     // to preserve old behaviour
     // would be better to flag this somehow to allow ignoring in downstream
     vertex = TrackingParticle::Point(bs->x0(), bs->y0(), bs->z0());
@@ -79,5 +83,4 @@ TrackingParticle::Point ParametersDefinerForTP::vertex(const edm::Event& iEvent,
   return vertex;
 }
 
-
 TYPELOOKUP_DATA_REG(ParametersDefinerForTP);
diff --git a/SimTracker/TrackAssociation/src/ResolutionModel.cc b/SimTracker/TrackAssociation/src/ResolutionModel.cc
index 7cbb59697b84b..0a674c66863fa 100644
--- a/SimTracker/TrackAssociation/src/ResolutionModel.cc
+++ b/SimTracker/TrackAssociation/src/ResolutionModel.cc
@@ -1,4 +1,3 @@
 #include "SimTracker/TrackAssociation/interface/ResolutionModel.h"
 
-EDM_REGISTER_PLUGINFACTORY(ResolutionModelFactory,
-                           "ResolutionModelFactory");
+EDM_REGISTER_PLUGINFACTORY(ResolutionModelFactory, "ResolutionModelFactory");
diff --git a/SimTracker/TrackAssociation/src/trackAssociationChi2.cc b/SimTracker/TrackAssociation/src/trackAssociationChi2.cc
index 493a71fd5c8a9..4f111588e9f97 100644
--- a/SimTracker/TrackAssociation/src/trackAssociationChi2.cc
+++ b/SimTracker/TrackAssociation/src/trackAssociationChi2.cc
@@ -1,56 +1,56 @@
-#include "SimTracker/TrackAssociation/interface/trackAssociationChi2.h"
 #include "DataFormats/Math/interface/deltaPhi.h"
-#include "TrackingTools/PatternTools/interface/trackingParametersAtClosestApproachToBeamSpot.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimTracker/TrackAssociation/interface/trackAssociationChi2.h"
+#include "TrackingTools/PatternTools/interface/trackingParametersAtClosestApproachToBeamSpot.h"
 
 namespace track_associator {
   constexpr double invalidChi2 = 10000000000.;
 
-  double trackAssociationChi2(const reco::TrackBase::ParameterVector& rParameters,
-                              const reco::TrackBase::CovarianceMatrix& recoTrackCovMatrix,
-                              const Basic3DVector<double>& momAtVtx,
-                              const Basic3DVector<double>& vert,
+  double trackAssociationChi2(const reco::TrackBase::ParameterVector &rParameters,
+                              const reco::TrackBase::CovarianceMatrix &recoTrackCovMatrix,
+                              const Basic3DVector<double> &momAtVtx,
+                              const Basic3DVector<double> &vert,
                               int charge,
-                              const MagneticField& magfield,
-                              const reco::BeamSpot& bs) {
-    
+                              const MagneticField &magfield,
+                              const reco::BeamSpot &bs) {
     double chi2 = invalidChi2;
-    
-    std::pair<bool,reco::TrackBase::ParameterVector> params = reco::trackingParametersAtClosestApproachToBeamSpot(vert, momAtVtx, charge, magfield, bs);
-    if (params.first){
-      reco::TrackBase::ParameterVector sParameters=params.second;
-      
+
+    std::pair<bool, reco::TrackBase::ParameterVector> params =
+        reco::trackingParametersAtClosestApproachToBeamSpot(vert, momAtVtx, charge, magfield, bs);
+    if (params.first) {
+      reco::TrackBase::ParameterVector sParameters = params.second;
+
       reco::TrackBase::ParameterVector diffParameters = rParameters - sParameters;
-      diffParameters[2] = reco::deltaPhi(diffParameters[2],0.f);
+      diffParameters[2] = reco::deltaPhi(diffParameters[2], 0.f);
       chi2 = ROOT::Math::Dot(diffParameters * recoTrackCovMatrix, diffParameters);
       chi2 /= 5;
-      
-      LogDebug("TrackAssociator") << "====NEW RECO TRACK WITH PT=" << sin(rParameters[1])*float(charge)/rParameters[0] << "====\n" 
-                                  << "qoverp sim: " << sParameters[0] << "\n" 
-                                  << "lambda sim: " << sParameters[1] << "\n" 
-                                  << "phi    sim: " << sParameters[2] << "\n" 
-                                  << "dxy    sim: " << sParameters[3] << "\n" 
-                                  << "dsz    sim: " << sParameters[4] << "\n" 
-                                  << ": " /*<< */ << "\n" 
-                                  << "qoverp rec: " << rParameters[0] << "\n" 
-                                  << "lambda rec: " << rParameters[1] << "\n" 
-                                  << "phi    rec: " << rParameters[2] << "\n" 
-                                  << "dxy    rec: " << rParameters[3] << "\n" 
-                                  << "dsz    rec: " << rParameters[4] << "\n" 
-                                  << ": " /*<< */ << "\n" 
+
+      LogDebug("TrackAssociator") << "====NEW RECO TRACK WITH PT="
+                                  << sin(rParameters[1]) * float(charge) / rParameters[0] << "====\n"
+                                  << "qoverp sim: " << sParameters[0] << "\n"
+                                  << "lambda sim: " << sParameters[1] << "\n"
+                                  << "phi    sim: " << sParameters[2] << "\n"
+                                  << "dxy    sim: " << sParameters[3] << "\n"
+                                  << "dsz    sim: " << sParameters[4] << "\n"
+                                  << ": " /*<< */ << "\n"
+                                  << "qoverp rec: " << rParameters[0] << "\n"
+                                  << "lambda rec: " << rParameters[1] << "\n"
+                                  << "phi    rec: " << rParameters[2] << "\n"
+                                  << "dxy    rec: " << rParameters[3] << "\n"
+                                  << "dsz    rec: " << rParameters[4] << "\n"
+                                  << ": " /*<< */ << "\n"
                                   << "chi2: " << chi2 << "\n";
-      
     }
     return chi2;
   }
 
-  double trackAssociationChi2(const reco::TrackBase::ParameterVector& rParameters,
-                              const reco::TrackBase::CovarianceMatrix& recoTrackCovMatrix,
-                              const TrackingParticle& trackingParticle,
-                              const MagneticField& magfield,
-                              const reco::BeamSpot& bs) {
+  double trackAssociationChi2(const reco::TrackBase::ParameterVector &rParameters,
+                              const reco::TrackBase::CovarianceMatrix &recoTrackCovMatrix,
+                              const TrackingParticle &trackingParticle,
+                              const MagneticField &magfield,
+                              const reco::BeamSpot &bs) {
     const int charge = trackingParticle.charge();
-    if(charge==0)
+    if (charge == 0)
       return invalidChi2;
 
     const auto tpMom = trackingParticle.momentum();
@@ -60,14 +60,13 @@ namespace track_associator {
     return trackAssociationChi2(rParameters, recoTrackCovMatrix, momAtVtx, vert, charge, magfield, bs);
   }
 
-
-  double trackAssociationChi2(const reco::TrackBase& track,
-                              const TrackingParticle& trackingParticle,
-                              const MagneticField& magfield,
-                              const reco::BeamSpot& bs) {
+  double trackAssociationChi2(const reco::TrackBase &track,
+                              const TrackingParticle &trackingParticle,
+                              const MagneticField &magfield,
+                              const reco::BeamSpot &bs) {
     auto cov = track.covariance();
     cov.Invert();
 
     return trackAssociationChi2(track.parameters(), cov, trackingParticle, magfield, bs);
   }
-}
+}  // namespace track_associator
diff --git a/SimTracker/TrackAssociation/test/testTrackAssociator.cc b/SimTracker/TrackAssociation/test/testTrackAssociator.cc
index db84efa1c8a78..bb1f158d3e0ca 100644
--- a/SimTracker/TrackAssociation/test/testTrackAssociator.cc
+++ b/SimTracker/TrackAssociation/test/testTrackAssociator.cc
@@ -1,161 +1,144 @@
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 
-#include "SimTracker/TrackAssociation/test/testTrackAssociator.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
+#include "SimTracker/TrackAssociation/test/testTrackAssociator.h"
 
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
 
-#include <memory>
 #include <iostream>
+#include <memory>
 #include <string>
 
-//class TrackAssociator; 
-class TrackAssociatorByHits; 
-class TrackerHitAssociator; 
+// class TrackAssociator;
+class TrackAssociatorByHits;
+class TrackerHitAssociator;
 
 using namespace reco;
 using namespace std;
 using namespace edm;
 
-testTrackAssociator::testTrackAssociator(edm::ParameterSet const& conf) {
-  tracksTag = conf.getParameter< edm::InputTag >("tracksTag");
-  tpTag = conf.getParameter< edm::InputTag >("tpTag");
-  simtracksTag = conf.getParameter< edm::InputTag >("simtracksTag");
-  simvtxTag = conf.getParameter< edm::InputTag >("simvtxTag");
+testTrackAssociator::testTrackAssociator(edm::ParameterSet const &conf) {
+  tracksTag = conf.getParameter<edm::InputTag>("tracksTag");
+  tpTag = conf.getParameter<edm::InputTag>("tpTag");
+  simtracksTag = conf.getParameter<edm::InputTag>("simtracksTag");
+  simvtxTag = conf.getParameter<edm::InputTag>("simvtxTag");
 }
 
-testTrackAssociator::~testTrackAssociator() {
-}
+testTrackAssociator::~testTrackAssociator() {}
 
-void testTrackAssociator::analyze(const edm::Event& event, const edm::EventSetup& setup)
-{
-  
+void testTrackAssociator::analyze(const edm::Event &event, const edm::EventSetup &setup) {
   edm::ESHandle<MagneticField> theMF;
   setup.get<IdealMagneticFieldRecord>().get(theMF);
   edm::Handle<reco::TrackToTrackingParticleAssociator> theChiAssociator;
-  event.getByLabel("trackAssociatorByChi2",theChiAssociator);
+  event.getByLabel("trackAssociatorByChi2", theChiAssociator);
   associatorByChi2 = theChiAssociator.product();
   edm::Handle<reco::TrackToTrackingParticleAssociator> theHitsAssociator;
-  event.getByLabel("trackAssociatorByHits",theHitsAssociator);
+  event.getByLabel("trackAssociatorByHits", theHitsAssociator);
   associatorByHits = theHitsAssociator.product();
 
-  Handle<View<Track> > trackCollectionH;
-  event.getByLabel(tracksTag,trackCollectionH);
-  const View<Track>&  tC = *(trackCollectionH.product()); 
-  
+  Handle<View<Track>> trackCollectionH;
+  event.getByLabel(tracksTag, trackCollectionH);
+  const View<Track> &tC = *(trackCollectionH.product());
+
   Handle<SimTrackContainer> simTrackCollection;
   event.getByLabel(simtracksTag, simTrackCollection);
-  const SimTrackContainer& simTC = *(simTrackCollection.product());
-  
+  const SimTrackContainer &simTC = *(simTrackCollection.product());
+
   Handle<SimVertexContainer> simVertexCollection;
   event.getByLabel(simvtxTag, simVertexCollection);
 
-  edm::Handle<TrackingParticleCollection>  TPCollectionH ;
-  event.getByLabel(tpTag,TPCollectionH);
-
-  cout << "\nEvent ID = "<< event.id() << endl ;
+  edm::Handle<TrackingParticleCollection> TPCollectionH;
+  event.getByLabel(tpTag, TPCollectionH);
 
+  cout << "\nEvent ID = " << event.id() << endl;
 
-  //RECOTOSIM 
-  cout << "                      ****************** Reco To Sim ****************** " << endl;
-  cout << "-- Associator by hits --" << endl;  
-  reco::RecoToSimCollection p = 
-    associatorByHits->associateRecoToSim (trackCollectionH,TPCollectionH);
-  for(View<Track>::size_type i=0; i<tC.size(); ++i) {
+  // RECOTOSIM
+  cout << "                      ****************** Reco To Sim "
+          "****************** "
+       << endl;
+  cout << "-- Associator by hits --" << endl;
+  reco::RecoToSimCollection p = associatorByHits->associateRecoToSim(trackCollectionH, TPCollectionH);
+  for (View<Track>::size_type i = 0; i < tC.size(); ++i) {
     RefToBase<Track> track(trackCollectionH, i);
-    try{ 
-      std::vector<std::pair<TrackingParticleRef, double> > tp = p[track];
-	cout << "Reco Track pT: "  << setw(6) << track->pt() 
-	     <<  " matched to " << tp.size() << " MC Tracks" << std::endl;
-	for (std::vector<std::pair<TrackingParticleRef, double> >::const_iterator it = tp.begin(); 
-	     it != tp.end(); ++it) {
-	  TrackingParticleRef tpr = it->first;
-	  double assocChi2 = it->second;
-	  cout << "\t\tMCTrack " << setw(2) << tpr.index() << " pT: " << setw(6) << tpr->pt() << 
-	    " NShared: " << assocChi2 << endl;
-	}
-    } catch (Exception const&) {
-      cout << "->   Track pT: " 
-	   << setprecision(2) << setw(6) << track->pt() 
-	   <<  " matched to 0  MC Tracks" << endl;
+    try {
+      std::vector<std::pair<TrackingParticleRef, double>> tp = p[track];
+      cout << "Reco Track pT: " << setw(6) << track->pt() << " matched to " << tp.size() << " MC Tracks" << std::endl;
+      for (std::vector<std::pair<TrackingParticleRef, double>>::const_iterator it = tp.begin(); it != tp.end(); ++it) {
+        TrackingParticleRef tpr = it->first;
+        double assocChi2 = it->second;
+        cout << "\t\tMCTrack " << setw(2) << tpr.index() << " pT: " << setw(6) << tpr->pt() << " NShared: " << assocChi2
+             << endl;
+      }
+    } catch (Exception const &) {
+      cout << "->   Track pT: " << setprecision(2) << setw(6) << track->pt() << " matched to 0  MC Tracks" << endl;
     }
   }
-  cout << "-- Associator by chi2 --" << endl;  
-  p = associatorByChi2->associateRecoToSim (trackCollectionH,TPCollectionH);
-  for(View<Track>::size_type i=0; i<tC.size(); ++i) {
+  cout << "-- Associator by chi2 --" << endl;
+  p = associatorByChi2->associateRecoToSim(trackCollectionH, TPCollectionH);
+  for (View<Track>::size_type i = 0; i < tC.size(); ++i) {
     RefToBase<Track> track(trackCollectionH, i);
-    try{ 
-      std::vector<std::pair<TrackingParticleRef, double> > tp = p[track];
-      cout << "Reco Track pT: "  << setw(6) << track->pt() 
-	   <<  " matched to " << tp.size() << " MC Tracks" << std::endl;
-      for (std::vector<std::pair<TrackingParticleRef, double> >::const_iterator it = tp.begin(); 
-	   it != tp.end(); ++it) {
-	TrackingParticleRef tpr = it->first;
-	double assocChi2 = it->second;
-	cout << "\t\tMCTrack " << setw(2) << tpr.index() << " pT: " << setw(6) << tpr->pt() << 
-	  " chi2: " << assocChi2 << endl;
+    try {
+      std::vector<std::pair<TrackingParticleRef, double>> tp = p[track];
+      cout << "Reco Track pT: " << setw(6) << track->pt() << " matched to " << tp.size() << " MC Tracks" << std::endl;
+      for (std::vector<std::pair<TrackingParticleRef, double>>::const_iterator it = tp.begin(); it != tp.end(); ++it) {
+        TrackingParticleRef tpr = it->first;
+        double assocChi2 = it->second;
+        cout << "\t\tMCTrack " << setw(2) << tpr.index() << " pT: " << setw(6) << tpr->pt() << " chi2: " << assocChi2
+             << endl;
       }
-    } catch (Exception const&) {
-      cout << "->   Track pT: " 
-	   << setprecision(2) << setw(6) << track->pt() 
-	   <<  " matched to 0  MC Tracks" << endl;
+    } catch (Exception const &) {
+      cout << "->   Track pT: " << setprecision(2) << setw(6) << track->pt() << " matched to 0  MC Tracks" << endl;
     }
   }
-  //SIMTORECO
-  cout << "                      ****************** Sim To Reco ****************** " << endl;
-  cout << "-- Associator by hits --" << endl;  
-  reco::SimToRecoCollection q = 
-    associatorByHits->associateSimToReco(trackCollectionH,TPCollectionH);
-  for(SimTrackContainer::size_type i=0; i<simTC.size(); ++i){
-    TrackingParticleRef tp (TPCollectionH,i);
-    try{ 
-      std::vector<std::pair<RefToBase<Track>, double> > trackV = q[tp];
-	cout << "Sim Track " << setw(2) << tp.index() << " pT: "  << setw(6) << tp->pt() 
-	     <<  " matched to " << trackV.size() << " reco::Tracks" << std::endl;
-	for (std::vector<std::pair<RefToBase<Track>,double> >::const_iterator it=trackV.begin(); it != trackV.end(); ++it) {
-	  RefToBase<Track> tr = it->first;
-	  double assocChi2 = it->second;
-	  cout << "\t\treco::Track pT: " << setw(6) << tr->pt() << 
-	    " NShared: " << assocChi2 << endl;
-	}
-    } catch (Exception const&) {
-      cout << "->   TrackingParticle " << setw(2) << tp.index() << " pT: " 
-	   <<setprecision(2)<<setw(6)<<tp->pt() 
-	   <<  " matched to 0  reco::Tracks" << endl;
+  // SIMTORECO
+  cout << "                      ****************** Sim To Reco "
+          "****************** "
+       << endl;
+  cout << "-- Associator by hits --" << endl;
+  reco::SimToRecoCollection q = associatorByHits->associateSimToReco(trackCollectionH, TPCollectionH);
+  for (SimTrackContainer::size_type i = 0; i < simTC.size(); ++i) {
+    TrackingParticleRef tp(TPCollectionH, i);
+    try {
+      std::vector<std::pair<RefToBase<Track>, double>> trackV = q[tp];
+      cout << "Sim Track " << setw(2) << tp.index() << " pT: " << setw(6) << tp->pt() << " matched to " << trackV.size()
+           << " reco::Tracks" << std::endl;
+      for (std::vector<std::pair<RefToBase<Track>, double>>::const_iterator it = trackV.begin(); it != trackV.end();
+           ++it) {
+        RefToBase<Track> tr = it->first;
+        double assocChi2 = it->second;
+        cout << "\t\treco::Track pT: " << setw(6) << tr->pt() << " NShared: " << assocChi2 << endl;
+      }
+    } catch (Exception const &) {
+      cout << "->   TrackingParticle " << setw(2) << tp.index() << " pT: " << setprecision(2) << setw(6) << tp->pt()
+           << " matched to 0  reco::Tracks" << endl;
     }
   }
-  cout << "-- Associator by chi2 --" << endl;  
-  q = associatorByChi2->associateSimToReco(trackCollectionH,TPCollectionH);
-  for(SimTrackContainer::size_type i=0; i<simTC.size(); ++i){
-    TrackingParticleRef tp (TPCollectionH,i);
-    try{ 
-      std::vector<std::pair<RefToBase<Track>, double> > trackV = q[tp];
-      cout << "Sim Track " << setw(2) << tp.index() << " pT: "  << setw(6) << tp->pt() 
-	   <<  " matched to " << trackV.size() << " reco::Tracks" << std::endl;
-      for (std::vector<std::pair<RefToBase<Track>,double> >::const_iterator it=trackV.begin(); it != trackV.end(); ++it) {
-	RefToBase<Track> tr = it->first;
-	double assocChi2 = it->second;
-	cout << "\t\treco::Track pT: " << setw(6) << tr->pt() << 
-	  " chi2: " << assocChi2 << endl;
+  cout << "-- Associator by chi2 --" << endl;
+  q = associatorByChi2->associateSimToReco(trackCollectionH, TPCollectionH);
+  for (SimTrackContainer::size_type i = 0; i < simTC.size(); ++i) {
+    TrackingParticleRef tp(TPCollectionH, i);
+    try {
+      std::vector<std::pair<RefToBase<Track>, double>> trackV = q[tp];
+      cout << "Sim Track " << setw(2) << tp.index() << " pT: " << setw(6) << tp->pt() << " matched to " << trackV.size()
+           << " reco::Tracks" << std::endl;
+      for (std::vector<std::pair<RefToBase<Track>, double>>::const_iterator it = trackV.begin(); it != trackV.end();
+           ++it) {
+        RefToBase<Track> tr = it->first;
+        double assocChi2 = it->second;
+        cout << "\t\treco::Track pT: " << setw(6) << tr->pt() << " chi2: " << assocChi2 << endl;
       }
-    } catch (Exception const&) {
-      cout << "->   TrackingParticle " << setw(2) << tp.index() << " pT: " 
-	   <<setprecision(2)<<setw(6)<<tp->pt() 
-	   <<  " matched to 0  reco::Tracks" << endl;
+    } catch (Exception const &) {
+      cout << "->   TrackingParticle " << setw(2) << tp.index() << " pT: " << setprecision(2) << setw(6) << tp->pt()
+           << " matched to 0  reco::Tracks" << endl;
     }
   }
 }
 
-
-
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 
 DEFINE_FWK_MODULE(testTrackAssociator);
-
-
-
diff --git a/SimTracker/TrackAssociation/test/testTrackAssociator.h b/SimTracker/TrackAssociation/test/testTrackAssociator.h
index 5e06f20bf1b64..427339cde1290 100644
--- a/SimTracker/TrackAssociation/test/testTrackAssociator.h
+++ b/SimTracker/TrackAssociation/test/testTrackAssociator.h
@@ -9,25 +9,24 @@
 #include "FWCore/Utilities/interface/InputTag.h"
 
 #include <iostream>
-#include <string>
 #include <map>
 #include <set>
+#include <string>
 
 namespace reco {
   class TrackToTrackingParticleAssociator;
 }
 
 class testTrackAssociator : public edm::EDAnalyzer {
-  
- public:
-  testTrackAssociator(const edm::ParameterSet& conf);
+public:
+  testTrackAssociator(const edm::ParameterSet &conf);
   ~testTrackAssociator() override;
-  void beginJob() override {}  
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  
- private:
-  reco::TrackToTrackingParticleAssociator const * associatorByChi2;
-  reco::TrackToTrackingParticleAssociator const * associatorByHits;
+  void beginJob() override {}
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+
+private:
+  reco::TrackToTrackingParticleAssociator const *associatorByChi2;
+  reco::TrackToTrackingParticleAssociator const *associatorByHits;
   edm::InputTag tracksTag, tpTag, simtracksTag, simvtxTag;
 };
 
diff --git a/SimTracker/TrackAssociatorProducers/plugins/TrackAssociatorByHitsImpl.cc b/SimTracker/TrackAssociatorProducers/plugins/TrackAssociatorByHitsImpl.cc
index 57d8c343e60e4..62288ad359b84 100644
--- a/SimTracker/TrackAssociatorProducers/plugins/TrackAssociatorByHitsImpl.cc
+++ b/SimTracker/TrackAssociatorProducers/plugins/TrackAssociatorByHitsImpl.cc
@@ -224,7 +224,7 @@ TrackAssociatorByHitsImpl::associateSimToReco(const edm::RefToBaseVector<reco::T
 	//  unsigned int detid = TPhit->detUnitId();
 	//  DetId detId = DetId(TPhit->detUnitId());
 	//  LogTrace("TrackAssociator") <<  " hit trackId= " << TPhit->trackId() << " det ID = " << detid 
-	//				      << " SUBDET = " << detId.subdetId() << " layer = " << LayerFromDetid(detId); 
+	//                              << " SUBDET = " << detId.subdetId() << " layer = " << LayerFromDetid(detId); 
 	//}
 
 	if (nshared!=0) {//do not waste time recounting when it is not needed!!!!
@@ -504,10 +504,10 @@ int TrackAssociatorByHitsImpl::getShared(std::vector<SimHitIdpr>& matchedIds,
       
       for (TrackingParticle::g4t_iterator g4T = t . g4Track_begin(); g4T !=  t . g4Track_end(); ++g4T) {
 //	LogTrace("TrackAssociator") << " TP   (ID, Ev, BC) = " << (*g4T).trackId() 
-//				    << ", " << t.eventId().event() << ", "<< t.eventId().bunchCrossing()
-//				    << " Match(ID, Ev, BC) = " <<  matchedIds[j].first
-//				    << ", " << matchedIds[j].second.event() << ", "
-//				    << matchedIds[j].second.bunchCrossing() ;
+//                                  << ", " << t.eventId().event() << ", "<< t.eventId().bunchCrossing()
+//                                  << " Match(ID, Ev, BC) = " <<  matchedIds[j].first
+//                                  << ", " << matchedIds[j].second.event() << ", "
+//                                  << matchedIds[j].second.bunchCrossing() ;
 	                            //<< "\t G4  Track Momentum " << (*g4T).momentum() 
 	                            //<< " \t reco Track Momentum " << track->momentum();  	      
 	if((*g4T).trackId() == matchedIds[j].first && t.eventId() == matchedIds[j].second){
diff --git a/SimTracker/TrackHistory/interface/CMSProcessTypes.h b/SimTracker/TrackHistory/interface/CMSProcessTypes.h
index 2021fddd9a015..40c6870c2535b 100644
--- a/SimTracker/TrackHistory/interface/CMSProcessTypes.h
+++ b/SimTracker/TrackHistory/interface/CMSProcessTypes.h
@@ -2,28 +2,26 @@
 #define SimTracker_TrackHistory_CMSProcessTypes_h
 
 //! Struct holding legacy CMS convention for process types
-struct CMS
-{
-    enum Process
-    {
-        Undefined = 0,
-        Unknown,
-        Primary,
-        Hadronic,
-        Decay,
-        Compton,
-        Annihilation,
-        EIoni,
-        HIoni,
-        MuIoni,
-        Photon,
-        MuPairProd,
-        Conversions,
-        EBrem,
-        SynchrotronRadiation,
-        MuBrem,
-        MuNucl
-    };
+struct CMS {
+  enum Process {
+    Undefined = 0,
+    Unknown,
+    Primary,
+    Hadronic,
+    Decay,
+    Compton,
+    Annihilation,
+    EIoni,
+    HIoni,
+    MuIoni,
+    Photon,
+    MuPairProd,
+    Conversions,
+    EBrem,
+    SynchrotronRadiation,
+    MuBrem,
+    MuNucl
+  };
 };
 
 #endif
diff --git a/SimTracker/TrackHistory/interface/CategoryCriteria.h b/SimTracker/TrackHistory/interface/CategoryCriteria.h
index 76e64b871c638..6358407ca5ccf 100644
--- a/SimTracker/TrackHistory/interface/CategoryCriteria.h
+++ b/SimTracker/TrackHistory/interface/CategoryCriteria.h
@@ -1,88 +1,69 @@
 #ifndef CategoryCriteria_h
 #define CategoryCriteria_h
 
+#include "CommonTools/Utils/interface/StringCutObjectSelector.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
-#include "CommonTools/Utils/interface/StringCutObjectSelector.h"
 
 #include "DataFormats/Common/interface/Ref.h"
 
-
-//! Implement a selector given a track or vertex collection and track or vertex classifier.
+//! Implement a selector given a track or vertex collection and track or vertex
+//! classifier.
 template <typename Collection, typename Classifier>
-class CategoryCriteria
-{
-
+class CategoryCriteria {
 public:
+  // Input collection type
+  typedef Collection collection;
 
-    // Input collection type
-    typedef Collection collection;
-
-    // Type of the collection elements
-    typedef typename Collection::value_type type;
+  // Type of the collection elements
+  typedef typename Collection::value_type type;
 
-    // Oumemberut collection type
-    typedef std::vector<const type *> container;
+  // Oumemberut collection type
+  typedef std::vector<const type *> container;
 
-    // Iterator over result collection type.
-    typedef typename container::const_iterator const_iterator;
+  // Iterator over result collection type.
+  typedef typename container::const_iterator const_iterator;
 
-    // Constructor from parameter set configurability
-    CategoryCriteria(const edm::ParameterSet & config, edm::ConsumesCollector && iC) :
-            classifier_(config,std::move(iC)),
-            evaluate_( config.getParameter<std::string>("cut") ) {}
+  // Constructor from parameter set configurability
+  CategoryCriteria(const edm::ParameterSet &config, edm::ConsumesCollector &&iC)
+      : classifier_(config, std::move(iC)), evaluate_(config.getParameter<std::string>("cut")) {}
 
-    // Select object from a collection and possibly event content
-    void select(const edm::Handle<collection> & collectionHandler, const edm::Event & event, const edm::EventSetup & setup)
-    {
+  // Select object from a collection and possibly event content
+  void select(const edm::Handle<collection> &collectionHandler, const edm::Event &event, const edm::EventSetup &setup) {
+    selected_.clear();
 
-        selected_.clear();
+    // const collection & collectionPointer = *(collectionHandler.product());
 
-        // const collection & collectionPointer = *(collectionHandler.product());
+    classifier_.newEvent(event, setup);
 
-        classifier_.newEvent(event, setup);
+    for (typename collection::size_type i = 0; i < collectionHandler->size(); ++i) {
+      edm::Ref<Collection> member(collectionHandler, i);
 
-        for (typename collection::size_type i = 0; i < collectionHandler->size(); ++i)
-        {
-            edm::Ref<Collection> member(collectionHandler, i);
+      classifier_.evaluate(member);
 
-            classifier_.evaluate(member);
-
-            // Classifier is evaluated using StringCutObjectSelector
-            if ( evaluate_(classifier_) )
-                selected_.push_back( &(*member) );
-        }
+      // Classifier is evaluated using StringCutObjectSelector
+      if (evaluate_(classifier_))
+        selected_.push_back(&(*member));
     }
+  }
 
-    // Iterators over selected objects: collection begin
-    const_iterator begin() const
-    {
-        return selected_.begin();
-    }
+  // Iterators over selected objects: collection begin
+  const_iterator begin() const { return selected_.begin(); }
 
-    // Iterators over selected objects: collection end
-    const_iterator end() const
-    {
-        return selected_.end();
-    }
+  // Iterators over selected objects: collection end
+  const_iterator end() const { return selected_.end(); }
 
-    // True if no object has been selected
-    std::size_t size() const
-    {
-        return selected_.size();
-    }
+  // True if no object has been selected
+  std::size_t size() const { return selected_.size(); }
 
 private:
+  container selected_;
 
-    container selected_;
-
-    Classifier classifier_;
-
-    StringCutObjectSelector<typename Classifier::Categories> evaluate_;
+  Classifier classifier_;
 
+  StringCutObjectSelector<typename Classifier::Categories> evaluate_;
 };
 
-
 #endif
diff --git a/SimTracker/TrackHistory/interface/HistoryBase.h b/SimTracker/TrackHistory/interface/HistoryBase.h
index 44081eae32c79..fa324ba036b93 100644
--- a/SimTracker/TrackHistory/interface/HistoryBase.h
+++ b/SimTracker/TrackHistory/interface/HistoryBase.h
@@ -9,186 +9,157 @@
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertexContainer.h"
 
 //! Base class to all the history types.
-class HistoryBase
-{
-
+class HistoryBase {
 public:
-
-    //! HepMC::GenParticle trail type.
-    typedef std::vector<const HepMC::GenParticle *> GenParticleTrail;
-    
-    //! reco::GenParticle trail type.
-    typedef std::vector<const reco::GenParticle *> RecoGenParticleTrail;
-    
-    //!reco::GenParticle trail helper type.
-    typedef std::set<const reco::GenParticle *> RecoGenParticleTrailHelper;
-
-    //! GenVertex trail type.
-    typedef std::vector<const HepMC::GenVertex *> GenVertexTrail;
-
-    //! GenVertex trail helper type.
-    typedef std::set<const HepMC::GenVertex *> GenVertexTrailHelper;
-
-    //! SimParticle trail type.
-    typedef std::vector<TrackingParticleRef> SimParticleTrail;
-
-    //! SimVertex trail type.
-    typedef std::vector<TrackingVertexRef> SimVertexTrail;
-
-    // Default constructor
-    HistoryBase()
-    {
-        // Default depth
-        depth_ = -1;
-    }
-
-    //! Set the depth of the history.
-    /* Set TrackHistory to given depth. Positive values
-       constrain the number of TrackingVertex visit in the history.
-       Negatives values set the limit of the iteration over generated
-       information i.e. (-1 -> status 1 or -2 -> status 2 particles).
-
-       /param[in] depth the history
-    */
-    void depth(int d)
-    {
-        depth_ = d;
-    }
-
-    //! Return all the simulated vertices in the history.
-    SimVertexTrail const & simVertexTrail() const
-    {
-        return simVertexTrail_;
-    }
-
-    //! Return all the simulated particle in the history.
-    SimParticleTrail const & simParticleTrail() const
-    {
-        return simParticleTrail_;
-    }
-
-    //! Return all generated vertex in the history.
-    GenVertexTrail const & genVertexTrail() const
-    {
-        return genVertexTrail_;
-    }
-
-    //! Return all generated particle (HepMC::GenParticle) in the history.
-    GenParticleTrail const & genParticleTrail() const
-    {
-        return genParticleTrail_;
-    }
-    
-     //! Return all reco::GenParticle in the history.
-    RecoGenParticleTrail const & recoGenParticleTrail() const
-    {
-        return recoGenParticleTrail_;
-    }
-
-    //! Return the initial tracking particle from the history.
-    const TrackingParticleRef & simParticle() const
-    {
-        return simParticleTrail_[0];
-    }
-
-    //! Return the initial tracking vertex from the history.
-    const TrackingVertexRef & simVertex() const
-    {
-        return simVertexTrail_[0];
-    }
-
-    //! Returns a pointer to most primitive status 1 or 2 particle in the genParticleTrail_.
-    const HepMC::GenParticle * genParticle() const
-    {
-        if ( genParticleTrail_.empty() ) return nullptr;
-        return genParticleTrail_[genParticleTrail_.size()-1];
-    }
-    
-    //! Returns a pointer to most primitive status 1 or 2 particle in the recoGenParticleTrail_.
-    const reco::GenParticle * recoGenParticle() const
-    {
-        if ( recoGenParticleTrail_.empty() ) return nullptr;
-        return recoGenParticleTrail_[recoGenParticleTrail_.size()-1];
-    }
-
-    //! Evaluate track history using a TrackingParticleRef.
-    /* Return false when the history cannot be determined upto a given depth.
-       If not depth is pass to the function no restriction are apply to it.
-
-       /param[in] TrackingParticleRef of a simulated track
-       /param[in] depth of the track history
-       /param[out] boolean that is true when history can be determined
-    */
-    bool evaluate(TrackingParticleRef tpr)
-    {
-        resetTrails(tpr);
-        return traceSimHistory(tpr, depth_);
-    }
-
-    //! Evaluate track history using a TrackingParticleRef.
-    /* Return false when the history cannot be determined upto a given depth.
-       If not depth is pass to the function no restriction are apply to it.
-
-       /param[in] TrackingVertexRef of a simulated vertex
-       /param[in] depth of the track history
-       /param[out] boolean that is true when history can be determined
-    */
-    bool evaluate(TrackingVertexRef tvr)
-    {
-        resetTrails();
-        return traceSimHistory(tvr, depth_);
-    }
+  //! HepMC::GenParticle trail type.
+  typedef std::vector<const HepMC::GenParticle *> GenParticleTrail;
+
+  //! reco::GenParticle trail type.
+  typedef std::vector<const reco::GenParticle *> RecoGenParticleTrail;
+
+  //! reco::GenParticle trail helper type.
+  typedef std::set<const reco::GenParticle *> RecoGenParticleTrailHelper;
+
+  //! GenVertex trail type.
+  typedef std::vector<const HepMC::GenVertex *> GenVertexTrail;
+
+  //! GenVertex trail helper type.
+  typedef std::set<const HepMC::GenVertex *> GenVertexTrailHelper;
+
+  //! SimParticle trail type.
+  typedef std::vector<TrackingParticleRef> SimParticleTrail;
+
+  //! SimVertex trail type.
+  typedef std::vector<TrackingVertexRef> SimVertexTrail;
+
+  // Default constructor
+  HistoryBase() {
+    // Default depth
+    depth_ = -1;
+  }
+
+  //! Set the depth of the history.
+  /* Set TrackHistory to given depth. Positive values
+     constrain the number of TrackingVertex visit in the history.
+     Negatives values set the limit of the iteration over generated
+     information i.e. (-1 -> status 1 or -2 -> status 2 particles).
+
+     /param[in] depth the history
+  */
+  void depth(int d) { depth_ = d; }
+
+  //! Return all the simulated vertices in the history.
+  SimVertexTrail const &simVertexTrail() const { return simVertexTrail_; }
+
+  //! Return all the simulated particle in the history.
+  SimParticleTrail const &simParticleTrail() const { return simParticleTrail_; }
+
+  //! Return all generated vertex in the history.
+  GenVertexTrail const &genVertexTrail() const { return genVertexTrail_; }
+
+  //! Return all generated particle (HepMC::GenParticle) in the history.
+  GenParticleTrail const &genParticleTrail() const { return genParticleTrail_; }
+
+  //! Return all reco::GenParticle in the history.
+  RecoGenParticleTrail const &recoGenParticleTrail() const { return recoGenParticleTrail_; }
+
+  //! Return the initial tracking particle from the history.
+  const TrackingParticleRef &simParticle() const { return simParticleTrail_[0]; }
+
+  //! Return the initial tracking vertex from the history.
+  const TrackingVertexRef &simVertex() const { return simVertexTrail_[0]; }
+
+  //! Returns a pointer to most primitive status 1 or 2 particle in the
+  //! genParticleTrail_.
+  const HepMC::GenParticle *genParticle() const {
+    if (genParticleTrail_.empty())
+      return nullptr;
+    return genParticleTrail_[genParticleTrail_.size() - 1];
+  }
+
+  //! Returns a pointer to most primitive status 1 or 2 particle in the
+  //! recoGenParticleTrail_.
+  const reco::GenParticle *recoGenParticle() const {
+    if (recoGenParticleTrail_.empty())
+      return nullptr;
+    return recoGenParticleTrail_[recoGenParticleTrail_.size() - 1];
+  }
+
+  //! Evaluate track history using a TrackingParticleRef.
+  /* Return false when the history cannot be determined upto a given depth.
+     If not depth is pass to the function no restriction are apply to it.
+
+     /param[in] TrackingParticleRef of a simulated track
+     /param[in] depth of the track history
+     /param[out] boolean that is true when history can be determined
+  */
+  bool evaluate(TrackingParticleRef tpr) {
+    resetTrails(tpr);
+    return traceSimHistory(tpr, depth_);
+  }
+
+  //! Evaluate track history using a TrackingParticleRef.
+  /* Return false when the history cannot be determined upto a given depth.
+     If not depth is pass to the function no restriction are apply to it.
+
+     /param[in] TrackingVertexRef of a simulated vertex
+     /param[in] depth of the track history
+     /param[out] boolean that is true when history can be determined
+  */
+  bool evaluate(TrackingVertexRef tvr) {
+    resetTrails();
+    return traceSimHistory(tvr, depth_);
+  }
 
 protected:
+  // History cointainers
+  GenVertexTrail genVertexTrail_;
+  GenParticleTrail genParticleTrail_;
+  RecoGenParticleTrail recoGenParticleTrail_;
+  SimVertexTrail simVertexTrail_;
+  SimParticleTrail simParticleTrail_;
 
-    // History cointainers
-    GenVertexTrail genVertexTrail_;
-    GenParticleTrail genParticleTrail_;
-    RecoGenParticleTrail recoGenParticleTrail_;
-    SimVertexTrail simVertexTrail_;
-    SimParticleTrail simParticleTrail_;
-
-    // Helper function to speedup search
-    GenVertexTrailHelper genVertexTrailHelper_;
-    RecoGenParticleTrailHelper recoGenParticleTrailHelper_;
+  // Helper function to speedup search
+  GenVertexTrailHelper genVertexTrailHelper_;
+  RecoGenParticleTrailHelper recoGenParticleTrailHelper_;
 
 private:
-
-    int depth_;
-
-    //! Trace all the simulated information for a given reference to a TrackingParticle.
-    bool traceSimHistory (TrackingParticleRef const &, int);
-
-    //! Trace all the simulated information for a given reference to a TrackingVertex.
-    bool traceSimHistory (TrackingVertexRef const &, int);
-
-    //! Trace all the simulated information for a given pointer to a HepMC::GenParticle.
-    void traceGenHistory (HepMC::GenParticle const *);
-    
-    //! Trace all the simulated information for a given pointer to a reco::GenParticle.
-    void traceRecoGenHistory (reco::GenParticle const *);
-    
-
-    //! Trace all the simulated information for a given pointer to a GenVertex.
-    void traceGenHistory (HepMC::GenVertex const *);
-
-    //! Reset trail functions.
-    void resetTrails()
-    {
-        simParticleTrail_.clear();
-        simVertexTrail_.clear();
-        genVertexTrail_.clear();
-        genParticleTrail_.clear();
-        recoGenParticleTrail_.clear();
-        recoGenParticleTrailHelper_.clear();
-        genVertexTrailHelper_.clear();
-    }
-
-    void resetTrails(TrackingParticleRef tpr)
-    {
-        resetTrails();
-        simParticleTrail_.push_back(tpr);
-    }
+  int depth_;
+
+  //! Trace all the simulated information for a given reference to a
+  //! TrackingParticle.
+  bool traceSimHistory(TrackingParticleRef const &, int);
+
+  //! Trace all the simulated information for a given reference to a
+  //! TrackingVertex.
+  bool traceSimHistory(TrackingVertexRef const &, int);
+
+  //! Trace all the simulated information for a given pointer to a
+  //! HepMC::GenParticle.
+  void traceGenHistory(HepMC::GenParticle const *);
+
+  //! Trace all the simulated information for a given pointer to a
+  //! reco::GenParticle.
+  void traceRecoGenHistory(reco::GenParticle const *);
+
+  //! Trace all the simulated information for a given pointer to a GenVertex.
+  void traceGenHistory(HepMC::GenVertex const *);
+
+  //! Reset trail functions.
+  void resetTrails() {
+    simParticleTrail_.clear();
+    simVertexTrail_.clear();
+    genVertexTrail_.clear();
+    genParticleTrail_.clear();
+    recoGenParticleTrail_.clear();
+    recoGenParticleTrailHelper_.clear();
+    genVertexTrailHelper_.clear();
+  }
+
+  void resetTrails(TrackingParticleRef tpr) {
+    resetTrails();
+    simParticleTrail_.push_back(tpr);
+  }
 };
 
 #endif
diff --git a/SimTracker/TrackHistory/interface/JetVetoedTracksAssociatorDRVertex.h b/SimTracker/TrackHistory/interface/JetVetoedTracksAssociatorDRVertex.h
index 381a86968b099..c11c332148553 100644
--- a/SimTracker/TrackHistory/interface/JetVetoedTracksAssociatorDRVertex.h
+++ b/SimTracker/TrackHistory/interface/JetVetoedTracksAssociatorDRVertex.h
@@ -2,32 +2,27 @@
 #ifndef JetVetoedTracksAssociationDRVertex_h
 #define JetVetoedTracksAssociationDRVertex_h
 
-#include "DataFormats/Math/interface/deltaR.h"
-#include "DataFormats/Math/interface/Vector3D.h"
 #include "DataFormats/JetReco/interface/Jet.h"
 #include "DataFormats/JetReco/interface/JetTracksAssociation.h"
+#include "DataFormats/Math/interface/Vector3D.h"
+#include "DataFormats/Math/interface/deltaR.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 
 #include "SimTracker/TrackHistory/interface/TrackClassifier.h"
 
-class JetVetoedTracksAssociationDRVertex
-{
-
+class JetVetoedTracksAssociationDRVertex {
 public:
+  JetVetoedTracksAssociationDRVertex(double fDr);
+  ~JetVetoedTracksAssociationDRVertex() {}
 
-    JetVetoedTracksAssociationDRVertex (double fDr);
-    ~JetVetoedTracksAssociationDRVertex () {}
-
-    void produce (
-        reco::JetTracksAssociation::Container* fAssociation,
-        const std::vector<edm::RefToBase<reco::Jet> >& fJets,
-        const std::vector<reco::TrackRef>& fTracks,
-        TrackClassifier & classifier
-    ) const;
+  void produce(reco::JetTracksAssociation::Container *fAssociation,
+               const std::vector<edm::RefToBase<reco::Jet>> &fJets,
+               const std::vector<reco::TrackRef> &fTracks,
+               TrackClassifier &classifier) const;
 
 private:
-    /// fidutial dR between track in the vertex and jet's reference direction
-    double mDeltaR2Threshold;
+  /// fidutial dR between track in the vertex and jet's reference direction
+  double mDeltaR2Threshold;
 };
 
 #endif
diff --git a/SimTracker/TrackHistory/interface/TrackCategories.h b/SimTracker/TrackHistory/interface/TrackCategories.h
index 77d8ae54fbe93..4bf6c314f2820 100644
--- a/SimTracker/TrackHistory/interface/TrackCategories.h
+++ b/SimTracker/TrackHistory/interface/TrackCategories.h
@@ -5,109 +5,91 @@
 #include <ostream>
 #include <vector>
 
-class TrackCategories
-{
-
+class TrackCategories {
 public:
-
-    //! Categories available to vertex
-    enum Category
-    {
-        Fake = 0,
-        Reconstructed = Fake,
-        Bad,
-        BadInnerHits,
-        SharedInnerHits,
-        SignalEvent,
-        Bottom,
-        Charm,
-        Light,
-        Muon,
-        TrackerSimHits,
-        BWeakDecay,
-        CWeakDecay,
-        ChargePionDecay,
-        ChargeKaonDecay,
-        TauDecay,
-        KsDecay,
-        LambdaDecay,
-        JpsiDecay,
-        XiDecay,
-        OmegaDecay,
-        SigmaPlusDecay,
-        SigmaMinusDecay,
-        LongLivedDecay,
-        KnownProcess,
-        UndefinedProcess,
-        UnknownProcess,
-        PrimaryProcess,
-        HadronicProcess,
-        DecayProcess,
-        ComptonProcess,
-        AnnihilationProcess,
-        EIoniProcess,
-        HIoniProcess,
-        MuIoniProcess,
-        PhotonProcess,
-        MuPairProdProcess,
-        ConversionsProcess,
-        EBremProcess,
-        SynchrotronRadiationProcess,
-        MuBremProcess,
-        MuNuclProcess,
-        FromBWeakDecayMuon,
-        FromCWeakDecayMuon,
-        DecayOnFlightMuon,
-        FromChargePionMuon,
-        FromChargeKaonMuon,
-        PrimaryVertex,
-        SecondaryVertex,
-        TertiaryVertex,
-        TierciaryVertex = TertiaryVertex,
-        Unknown
-    };
-
-    //! Name of the different categories
-    static const char * const Names[];
-
-    //! Main types associated to the class
-    typedef std::vector<bool> Flags;
-
-    //! Void constructor
-    TrackCategories()
-    {
-        reset();
-    }
-
-    //! Returns track flag for a given category
-    bool is(Category category) const
-    {
-        return flags_[category];
-    }
-
-    //! Returns flags with the category descriptions
-    const Flags & flags() const
-    {
-        return flags_;
-    }
+  //! Categories available to vertex
+  enum Category {
+    Fake = 0,
+    Reconstructed = Fake,
+    Bad,
+    BadInnerHits,
+    SharedInnerHits,
+    SignalEvent,
+    Bottom,
+    Charm,
+    Light,
+    Muon,
+    TrackerSimHits,
+    BWeakDecay,
+    CWeakDecay,
+    ChargePionDecay,
+    ChargeKaonDecay,
+    TauDecay,
+    KsDecay,
+    LambdaDecay,
+    JpsiDecay,
+    XiDecay,
+    OmegaDecay,
+    SigmaPlusDecay,
+    SigmaMinusDecay,
+    LongLivedDecay,
+    KnownProcess,
+    UndefinedProcess,
+    UnknownProcess,
+    PrimaryProcess,
+    HadronicProcess,
+    DecayProcess,
+    ComptonProcess,
+    AnnihilationProcess,
+    EIoniProcess,
+    HIoniProcess,
+    MuIoniProcess,
+    PhotonProcess,
+    MuPairProdProcess,
+    ConversionsProcess,
+    EBremProcess,
+    SynchrotronRadiationProcess,
+    MuBremProcess,
+    MuNuclProcess,
+    FromBWeakDecayMuon,
+    FromCWeakDecayMuon,
+    DecayOnFlightMuon,
+    FromChargePionMuon,
+    FromChargeKaonMuon,
+    PrimaryVertex,
+    SecondaryVertex,
+    TertiaryVertex,
+    TierciaryVertex = TertiaryVertex,
+    Unknown
+  };
+
+  //! Name of the different categories
+  static const char *const Names[];
+
+  //! Main types associated to the class
+  typedef std::vector<bool> Flags;
+
+  //! Void constructor
+  TrackCategories() { reset(); }
+
+  //! Returns track flag for a given category
+  bool is(Category category) const { return flags_[category]; }
+
+  //! Returns flags with the category descriptions
+  const Flags &flags() const { return flags_; }
 
 protected:
+  //! Reset the categories flags
+  void reset() { flags_ = Flags(Unknown + 1, false); }
 
-    //! Reset the categories flags
-    void reset()
-    {
-        flags_ = Flags(Unknown + 1, false);
-    }
-
-    // Check for unkown classification
-    void unknownTrack();
-
-    //! Flag containers
-    Flags flags_;
+  // Check for unkown classification
+  void unknownTrack();
 
+  //! Flag containers
+  Flags flags_;
 };
 
 // Operation overload for printing the categories
-std::ostream & operator<< (std::ostream &, TrackCategories const &);
+std::ostream &operator<<(std::ostream &, TrackCategories const &);
 
 #endif
diff --git a/SimTracker/TrackHistory/interface/TrackClassifier.h b/SimTracker/TrackHistory/interface/TrackClassifier.h
index 32467f430d2df..e0ccfda7efd4d 100644
--- a/SimTracker/TrackHistory/interface/TrackClassifier.h
+++ b/SimTracker/TrackHistory/interface/TrackClassifier.h
@@ -6,8 +6,8 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"
 
@@ -23,128 +23,108 @@
 #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h"
 #include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
 
-
 class TrackTopology;
 
 //! Get track history and classify it in function of their .
-class TrackClassifier : public TrackCategories
-{
-
+class TrackClassifier : public TrackCategories {
 public:
+  //! Type to the associate category
+  typedef TrackCategories Categories;
 
-    //! Type to the associate category
-    typedef TrackCategories Categories;
+  //! Constructor by ParameterSet
+  TrackClassifier(edm::ParameterSet const &, edm::ConsumesCollector &&);
 
-    //! Constructor by ParameterSet
-    TrackClassifier(edm::ParameterSet const &,
-                    edm::ConsumesCollector&& );
+  //! Pre-process event information (for accessing reconstraction information)
+  void newEvent(edm::Event const &, edm::EventSetup const &);
 
-    //! Pre-process event information (for accessing reconstraction information)
-    void newEvent(edm::Event const &, edm::EventSetup const &);
+  //! Classify the RecoTrack in categories.
+  TrackClassifier const &evaluate(reco::TrackBaseRef const &);
 
-    //! Classify the RecoTrack in categories.
-    TrackClassifier const & evaluate (reco::TrackBaseRef const &);
+  //! Classify the TrackingParticle in categories.
+  TrackClassifier const &evaluate(TrackingParticleRef const &);
 
-    //! Classify the TrackingParticle in categories.
-    TrackClassifier const & evaluate (TrackingParticleRef const &);
+  //! Classify the RecoTrack in categories.
+  TrackClassifier const &evaluate(reco::TrackRef const &track) { return evaluate(reco::TrackBaseRef(track)); }
 
-    //! Classify the RecoTrack in categories.
-    TrackClassifier const & evaluate (reco::TrackRef const & track)
-    {
-      return evaluate( reco::TrackBaseRef(track));
-    }
+  //! Returns a reference to the track history used in the classification.
+  TrackHistory const &history() const { return tracer_; }
 
-    //! Returns a reference to the track history used in the classification.
-    TrackHistory const & history() const
-    {
-        return tracer_;
-    }
-
-    //! Returns a reference to the track quality used in the classification.
-    TrackQuality const & quality() const
-    {
-        return quality_;
-    }
+  //! Returns a reference to the track quality used in the classification.
+  TrackQuality const &quality() const { return quality_; }
 
 private:
+  const edm::InputTag hepMCLabel_;
+  const edm::InputTag beamSpotLabel_;
 
-    const edm::InputTag hepMCLabel_;
-    const edm::InputTag beamSpotLabel_;
-
-    double badPull_;
-    double longLivedDecayLength_;
-    double vertexClusteringSqDistance_;
-    unsigned int numberOfInnerLayers_;
-    unsigned int minTrackerSimHits_;
-
-    TrackHistory tracer_;
-
-    TrackQuality quality_;
+  double badPull_;
+  double longLivedDecayLength_;
+  double vertexClusteringSqDistance_;
+  unsigned int numberOfInnerLayers_;
+  unsigned int minTrackerSimHits_;
 
-    const G4toCMSLegacyProcTypeMap g4toCMSProcMap_;
+  TrackHistory tracer_;
 
-    edm::ESHandle<MagneticField> magneticField_;
+  TrackQuality quality_;
 
-    edm::Handle<edm::HepMCProduct> mcInformation_;
+  const G4toCMSLegacyProcTypeMap g4toCMSProcMap_;
 
-    edm::ESHandle<ParticleDataTable> particleDataTable_;
+  edm::ESHandle<MagneticField> magneticField_;
 
-    edm::ESHandle<TransientTrackBuilder> transientTrackBuilder_;
+  edm::Handle<edm::HepMCProduct> mcInformation_;
 
-    edm::Handle<reco::BeamSpot> beamSpot_;
+  edm::ESHandle<ParticleDataTable> particleDataTable_;
 
-    const TrackerTopology *tTopo_;
+  edm::ESHandle<TransientTrackBuilder> transientTrackBuilder_;
 
-    //! Classify all the tracks by their association and reconstruction information
-    void reconstructionInformation(reco::TrackBaseRef const &);
+  edm::Handle<reco::BeamSpot> beamSpot_;
 
-    //! Get all the information related to the simulation details
-    void simulationInformation();
+  const TrackerTopology *tTopo_;
 
-    //! Classify all the tracks by their reconstruction quality
-    void qualityInformation(reco::TrackBaseRef const &);
+  //! Classify all the tracks by their association and reconstruction
+  //! information
+  void reconstructionInformation(reco::TrackBaseRef const &);
 
-    //! Get hadron flavor of the initial hadron
-    void hadronFlavor();
+  //! Get all the information related to the simulation details
+  void simulationInformation();
 
-    //! Get all the information related to decay process
-    void processesAtGenerator();
+  //! Classify all the tracks by their reconstruction quality
+  void qualityInformation(reco::TrackBaseRef const &);
 
-    //! Get information about conversion and other interactions
-    void processesAtSimulation();
+  //! Get hadron flavor of the initial hadron
+  void hadronFlavor();
 
-    //! Get geometrical information about the vertices
-    void vertexInformation();
+  //! Get all the information related to decay process
+  void processesAtGenerator();
 
-    //! Auxiliary class holding simulated primary vertices
-    struct GeneratedPrimaryVertex
-    {
+  //! Get information about conversion and other interactions
+  void processesAtSimulation();
 
-        GeneratedPrimaryVertex(double x1,double y1,double z1): x(x1), y(y1), z(z1), ptsq(0), nGenTrk(0) {}
+  //! Get geometrical information about the vertices
+  void vertexInformation();
 
-        bool operator< ( GeneratedPrimaryVertex const & reference) const
-        {
-            return ptsq < reference.ptsq;
-        }
+  //! Auxiliary class holding simulated primary vertices
+  struct GeneratedPrimaryVertex {
+    GeneratedPrimaryVertex(double x1, double y1, double z1) : x(x1), y(y1), z(z1), ptsq(0), nGenTrk(0) {}
 
-        double x, y, z;
-        double ptsq;
-        int nGenTrk;
+    bool operator<(GeneratedPrimaryVertex const &reference) const { return ptsq < reference.ptsq; }
 
-        HepMC::FourVector ptot;
+    double x, y, z;
+    double ptsq;
+    int nGenTrk;
 
-        std::vector<int> finalstateParticles;
-        std::vector<int> simTrackIndex;
-        std::vector<int> genVertex;
-    };
+    HepMC::FourVector ptot;
 
-    std::vector<GeneratedPrimaryVertex> genpvs_;
+    std::vector<int> finalstateParticles;
+    std::vector<int> simTrackIndex;
+    std::vector<int> genVertex;
+  };
 
-    // Auxiliary function to get the generated primary vertex
-    bool isFinalstateParticle(const HepMC::GenParticle *);
-    bool isCharged(const HepMC::GenParticle *);
-    void genPrimaryVertices();
+  std::vector<GeneratedPrimaryVertex> genpvs_;
 
+  // Auxiliary function to get the generated primary vertex
+  bool isFinalstateParticle(const HepMC::GenParticle *);
+  bool isCharged(const HepMC::GenParticle *);
+  void genPrimaryVertices();
 };
 
 #endif
diff --git a/SimTracker/TrackHistory/interface/TrackHistory.h b/SimTracker/TrackHistory/interface/TrackHistory.h
index bc93faf604749..4c135d0dfb3c0 100644
--- a/SimTracker/TrackHistory/interface/TrackHistory.h
+++ b/SimTracker/TrackHistory/interface/TrackHistory.h
@@ -3,10 +3,10 @@
 
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 
-#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
@@ -14,95 +14,79 @@
 #include "SimTracker/TrackHistory/interface/Utils.h"
 
 //! This class traces the simulated and generated history of a given track.
-class TrackHistory : public HistoryBase
-{
-
+class TrackHistory : public HistoryBase {
 public:
-
-    //! Constructor by pset.
-    /* Creates a TrackHistory with association given by pset.
-
-       /param[in] pset with the configuration values
-    */
-    TrackHistory(const edm::ParameterSet &,
-                 edm::ConsumesCollector&& );
-
-    //! Pre-process event information (for accessing reconstruction information)
-    void newEvent(const edm::Event &, const edm::EventSetup &);
-
-    //! Evaluate track history using a TrackingParticleRef.
-    /* Return false when the history cannot be determined upto a given depth.
-       If not depth is pass to the function no restriction are apply to it.
-
-       /param[in] TrackingParticleRef of a simulated track
-       /param[in] depth of the track history
-       /param[out] boolean that is true when history can be determined
-    */
-    bool evaluate(TrackingParticleRef tpr)
-    {
-        if ( enableSimToReco_ )
-        {
-            std::pair<reco::TrackBaseRef, double> result =  match(tpr, simToReco_, bestMatchByMaxValue_);
-            recotrack_ = result.first;
-            quality_ =  result.second;
-        }
-        return HistoryBase::evaluate(tpr);
+  //! Constructor by pset.
+  /* Creates a TrackHistory with association given by pset.
+
+     /param[in] pset with the configuration values
+  */
+  TrackHistory(const edm::ParameterSet &, edm::ConsumesCollector &&);
+
+  //! Pre-process event information (for accessing reconstruction information)
+  void newEvent(const edm::Event &, const edm::EventSetup &);
+
+  //! Evaluate track history using a TrackingParticleRef.
+  /* Return false when the history cannot be determined upto a given depth.
+     If not depth is pass to the function no restriction are apply to it.
+
+     /param[in] TrackingParticleRef of a simulated track
+     /param[in] depth of the track history
+     /param[out] boolean that is true when history can be determined
+  */
+  bool evaluate(TrackingParticleRef tpr) {
+    if (enableSimToReco_) {
+      std::pair<reco::TrackBaseRef, double> result = match(tpr, simToReco_, bestMatchByMaxValue_);
+      recotrack_ = result.first;
+      quality_ = result.second;
     }
+    return HistoryBase::evaluate(tpr);
+  }
 
+  //! Evaluate reco::Track history using a given association.
+  /* Return false when the track association is not possible (fake track).
 
-    //! Evaluate reco::Track history using a given association.
-    /* Return false when the track association is not possible (fake track).
+     /param[in] TrackRef to a reco::track
+     /param[out] boolean that is false when a fake track is detected
+  */
+  bool evaluate(reco::TrackBaseRef);
 
-       /param[in] TrackRef to a reco::track
-       /param[out] boolean that is false when a fake track is detected
-    */
-    bool evaluate (reco::TrackBaseRef);
+  //! Return a reference to the reconstructed track.
+  const reco::TrackBaseRef &recoTrack() const { return recotrack_; }
 
-    //! Return a reference to the reconstructed track.
-    const reco::TrackBaseRef & recoTrack() const
-    {
-        return recotrack_;
-    }
-    
-    // return the TrackingParticle to which the Track was matched
-    const std::pair<TrackingParticleRef, double>  getMatchedTrackingParticle() const
-    {
-    	std::pair<TrackingParticleRef, double> result;
-    	result.first = trackingParticle_;
-    	result.second = quality_;
-    	
-    	return result;
-    }
+  // return the TrackingParticle to which the Track was matched
+  const std::pair<TrackingParticleRef, double> getMatchedTrackingParticle() const {
+    std::pair<TrackingParticleRef, double> result;
+    result.first = trackingParticle_;
+    result.second = quality_;
 
-    double quality() const
-    {
-        return quality_;
-    }
+    return result;
+  }
 
-private:
+  double quality() const { return quality_; }
 
-    bool newEvent_;
+private:
+  bool newEvent_;
 
-    bool bestMatchByMaxValue_;
+  bool bestMatchByMaxValue_;
 
-    bool enableRecoToSim_, enableSimToReco_;
+  bool enableRecoToSim_, enableSimToReco_;
 
-    double quality_;
+  double quality_;
 
-    edm::InputTag trackProducer_;
+  edm::InputTag trackProducer_;
 
-    edm::InputTag trackingTruth_;
+  edm::InputTag trackingTruth_;
 
-    edm::InputTag trackAssociator_;
+  edm::InputTag trackAssociator_;
 
-    reco::TrackBaseRef recotrack_;
-    
-    TrackingParticleRef trackingParticle_;
+  reco::TrackBaseRef recotrack_;
 
-    reco::RecoToSimCollection recoToSim_;
+  TrackingParticleRef trackingParticle_;
 
-    reco::SimToRecoCollection simToReco_;
+  reco::RecoToSimCollection recoToSim_;
 
+  reco::SimToRecoCollection simToReco_;
 };
 
 #endif
diff --git a/SimTracker/TrackHistory/interface/TrackQuality.h b/SimTracker/TrackHistory/interface/TrackQuality.h
index c640cde908b14..ae595b40f19a4 100644
--- a/SimTracker/TrackHistory/interface/TrackQuality.h
+++ b/SimTracker/TrackHistory/interface/TrackQuality.h
@@ -2,22 +2,22 @@
  *  TrackQuality.h
  *
  *  Created by Christophe Saout on 9/25/08.
- *  2007 __MyCompanyName__. 
+ *  2007 __MyCompanyName__.
  *
  */
 
 #ifndef TrackQuality_h
 #define TrackQuality_h
 
-#include <vector>
 #include <memory>
+#include <vector>
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 
-#include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/Common/interface/DetSetVector.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 
 #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
@@ -25,75 +25,62 @@
 class TrackerTopology;
 
 //! This class analyses the reconstruction quality for a given track
-class TrackQuality
-{
+class TrackQuality {
 public:
-    typedef std::vector<TrackingParticleRef> SimParticleTrail;
-
-    struct Layer
-    {
-        enum SubDet
-        {
-            Invalid = 0,
-            PixelBarrel, PixelForward,
-            StripTIB, StripTID, StripTOB, StripTEC,
-            MuonDT, MuonCSC, MuonRPCBarrel, MuonRPCEndcap
-        };
-
-        enum State
-        {
-            Unknown = 0,
-            Good,
-            Missed,
-            Noise,
-            Bad,
-            Dead,
-            Shared,
-            Misassoc
-        };
-
-        struct Hit
-        {
-            short int recHitId;
-            State state;
-        };
-
-        SubDet subDet;
-        short int layer;
-        std::vector<Hit> hits;
+  typedef std::vector<TrackingParticleRef> SimParticleTrail;
+
+  struct Layer {
+    enum SubDet {
+      Invalid = 0,
+      PixelBarrel,
+      PixelForward,
+      StripTIB,
+      StripTID,
+      StripTOB,
+      StripTEC,
+      MuonDT,
+      MuonCSC,
+      MuonRPCBarrel,
+      MuonRPCEndcap
     };
 
+    enum State { Unknown = 0, Good, Missed, Noise, Bad, Dead, Shared, Misassoc };
+
+    struct Hit {
+      short int recHitId;
+      State state;
+    };
+
+    SubDet subDet;
+    short int layer;
+    std::vector<Hit> hits;
+  };
+
 public:
-    //! Constructor by pset.
-    /* Creates a TrackQuality object from a pset.
+  //! Constructor by pset.
+  /* Creates a TrackQuality object from a pset.
 
-       /param[in] pset with the configuration values
-    */
-    TrackQuality(const edm::ParameterSet &, edm::ConsumesCollector& iC);
+     /param[in] pset with the configuration values
+  */
+  TrackQuality(const edm::ParameterSet &, edm::ConsumesCollector &iC);
 
-    //! Pre-process event information (for accessing reconstruction information)
-    void newEvent(const edm::Event &, const edm::EventSetup &);
+  //! Pre-process event information (for accessing reconstruction information)
+  void newEvent(const edm::Event &, const edm::EventSetup &);
 
-    //! Compute information about the track reconstruction quality
-    void evaluate(SimParticleTrail const &, reco::TrackBaseRef const &, const TrackerTopology *tTopo);
+  //! Compute information about the track reconstruction quality
+  void evaluate(SimParticleTrail const &, reco::TrackBaseRef const &, const TrackerTopology *tTopo);
 
-    //! Return the number of layers with simulated and/or reconstructed hits
-    unsigned int numberOfLayers() const
-    {
-        return layers_.size();
-    }
+  //! Return the number of layers with simulated and/or reconstructed hits
+  unsigned int numberOfLayers() const { return layers_.size(); }
 
-    //! Return information about the given layer by index
-    const Layer &layer(unsigned int index) const
-    {
-        return layers_[index];
-    }
+  //! Return information about the given layer by index
+  const Layer &layer(unsigned int index) const { return layers_[index]; }
 
 private:
-    TrackerHitAssociator::Config trackerHitAssociatorConfig_;
-    std::unique_ptr<TrackerHitAssociator> associator_;
+  TrackerHitAssociator::Config trackerHitAssociatorConfig_;
+  std::unique_ptr<TrackerHitAssociator> associator_;
 
-    std::vector<Layer> layers_;
+  std::vector<Layer> layers_;
 };
 
 #endif
diff --git a/SimTracker/TrackHistory/interface/Utils.h b/SimTracker/TrackHistory/interface/Utils.h
index 0d25112988f1f..809bf0c35f88c 100644
--- a/SimTracker/TrackHistory/interface/Utils.h
+++ b/SimTracker/TrackHistory/interface/Utils.h
@@ -6,40 +6,42 @@
 #include <vector>
 
 //! Generic matching function
-template<typename Reference, typename Association>
-std::pair<typename Association::data_type::first_type, double> match (Reference key, Association association, bool bestMatchByMaxValue)
-{
-    typename Association::data_type::first_type value;
+template <typename Reference, typename Association>
+std::pair<typename Association::data_type::first_type, double> match(Reference key,
+                                                                     Association association,
+                                                                     bool bestMatchByMaxValue) {
+  typename Association::data_type::first_type value;
 
-    typename Association::const_iterator pos = association.find(key);
+  typename Association::const_iterator pos = association.find(key);
 
-    if (pos == association.end()) return std::pair<typename Association::data_type::first_type, double> (value, 0);
+  if (pos == association.end())
+    return std::pair<typename Association::data_type::first_type, double>(value, 0);
 
-    const std::vector<typename Association::data_type> & matches = pos->val;
+  const std::vector<typename Association::data_type> &matches = pos->val;
 
-    double q = bestMatchByMaxValue ? -1e30 : 1e30;
+  double q = bestMatchByMaxValue ? -1e30 : 1e30;
 
-    for (std::size_t i = 0; i < matches.size(); ++i)
-        if (bestMatchByMaxValue ? (matches[i].second > q) : (matches[i].second < q))
-        {
-            value = matches[i].first;
-            q = matches[i].second;
-        }
+  for (std::size_t i = 0; i < matches.size(); ++i)
+    if (bestMatchByMaxValue ? (matches[i].second > q) : (matches[i].second < q)) {
+      value = matches[i].first;
+      q = matches[i].second;
+    }
 
-    return std::pair<typename Association::data_type::first_type, double> (value, q);
+  return std::pair<typename Association::data_type::first_type, double>(value, q);
 }
 
-//! Class that maps the native Geant4 process types to the legacy CMS process types
+//! Class that maps the native Geant4 process types to the legacy CMS process
+//! types
 class G4toCMSLegacyProcTypeMap {
-  public:
-    typedef std::map<unsigned int,unsigned int> MapType;
+public:
+  typedef std::map<unsigned int, unsigned int> MapType;
 
-    G4toCMSLegacyProcTypeMap();
+  G4toCMSLegacyProcTypeMap();
 
-    const unsigned int processId(unsigned int g4ProcessId) const;
+  const unsigned int processId(unsigned int g4ProcessId) const;
 
-  private:
-    MapType m_map;
+private:
+  MapType m_map;
 };
 
 #endif
diff --git a/SimTracker/TrackHistory/interface/VertexCategories.h b/SimTracker/TrackHistory/interface/VertexCategories.h
index ae12ca01dddfe..d41c337da81a8 100644
--- a/SimTracker/TrackHistory/interface/VertexCategories.h
+++ b/SimTracker/TrackHistory/interface/VertexCategories.h
@@ -2,97 +2,79 @@
 #ifndef VertexCategories_h
 #define VertexCategories_h
 
-#include <vector>
 #include <ostream>
+#include <vector>
 
-class VertexCategories
-{
-
+class VertexCategories {
 public:
-
-    //! Categories available to vertexes
-    enum Category
-    {
-        Fake = 0,
-        Reconstructed = Fake,
-        SignalEvent,
-        BWeakDecay,
-        CWeakDecay,
-        TauDecay,
-        KsDecay,
-        LambdaDecay,
-        JpsiDecay,
-        XiDecay,
-        OmegaDecay,
-        SigmaPlusDecay,
-        SigmaMinusDecay,
-        LongLivedDecay,
-        KnownProcess,
-        UndefinedProcess,
-        UnknownProcess,
-        PrimaryProcess,
-        HadronicProcess,
-        DecayProcess,
-        ComptonProcess,
-        AnnihilationProcess,
-        EIoniProcess,
-        HIoniProcess,
-        MuIoniProcess,
-        PhotonProcess,
-        MuPairProdProcess,
-        ConversionsProcess,
-        EBremProcess,
-        SynchrotronRadiationProcess,
-        MuBremProcess,
-        MuNuclProcess,
-        PrimaryVertex,
-        SecondaryVertex,
-        TertiaryVertex,
-        TierciaryVertex = TertiaryVertex,
-        Unknown
-    };
-
-    //! Name of the different categories
-    static const char * const Names[];
-
-    //! Main types associated to the class
-    typedef std::vector<bool> Flags;
-
-    //! Void constructor
-    VertexCategories()
-    {
-        reset();
-    }
-
-    //! Returns track flag for a given category
-    bool is(Category category) const
-    {
-        return flags_[category];
-    }
-
-    //! Returns flags with the category descriptions
-    const Flags & flags() const
-    {
-        return flags_;
-    }
+  //! Categories available to vertexes
+  enum Category {
+    Fake = 0,
+    Reconstructed = Fake,
+    SignalEvent,
+    BWeakDecay,
+    CWeakDecay,
+    TauDecay,
+    KsDecay,
+    LambdaDecay,
+    JpsiDecay,
+    XiDecay,
+    OmegaDecay,
+    SigmaPlusDecay,
+    SigmaMinusDecay,
+    LongLivedDecay,
+    KnownProcess,
+    UndefinedProcess,
+    UnknownProcess,
+    PrimaryProcess,
+    HadronicProcess,
+    DecayProcess,
+    ComptonProcess,
+    AnnihilationProcess,
+    EIoniProcess,
+    HIoniProcess,
+    MuIoniProcess,
+    PhotonProcess,
+    MuPairProdProcess,
+    ConversionsProcess,
+    EBremProcess,
+    SynchrotronRadiationProcess,
+    MuBremProcess,
+    MuNuclProcess,
+    PrimaryVertex,
+    SecondaryVertex,
+    TertiaryVertex,
+    TierciaryVertex = TertiaryVertex,
+    Unknown
+  };
+
+  //! Name of the different categories
+  static const char *const Names[];
+
+  //! Main types associated to the class
+  typedef std::vector<bool> Flags;
+
+  //! Void constructor
+  VertexCategories() { reset(); }
+
+  //! Returns track flag for a given category
+  bool is(Category category) const { return flags_[category]; }
+
+  //! Returns flags with the category descriptions
+  const Flags &flags() const { return flags_; }
 
 protected:
+  //! Reset the categories flags
+  void reset() { flags_ = Flags(Unknown + 1, false); }
 
-    //! Reset the categories flags
-    void reset()
-    {
-        flags_ = Flags(Unknown + 1, false);
-    }
-
-    // Check for unkown classification
-    void unknownVertex();
-
-    //! Flag containers
-    Flags flags_;
+  // Check for unkown classification
+  void unknownVertex();
 
+  //! Flag containers
+  Flags flags_;
 };
 
 // Operation overload for printing the categories
-std::ostream & operator<< (std::ostream &, VertexCategories const &);
+std::ostream &operator<<(std::ostream &, VertexCategories const &);
 
 #endif
diff --git a/SimTracker/TrackHistory/interface/VertexClassifier.h b/SimTracker/TrackHistory/interface/VertexClassifier.h
index c6ea55c90174a..c8a295bfde16a 100644
--- a/SimTracker/TrackHistory/interface/VertexClassifier.h
+++ b/SimTracker/TrackHistory/interface/VertexClassifier.h
@@ -15,99 +15,83 @@
 #include "SimTracker/TrackHistory/interface/VertexHistory.h"
 
 //! Get track history and classify it in function of their .
-class VertexClassifier : public VertexCategories
-{
-
+class VertexClassifier : public VertexCategories {
 public:
+  //! Type to the associate category
+  typedef VertexCategories Categories;
 
-    //! Type to the associate category
-    typedef VertexCategories Categories;
-
-    //! Constructor by ParameterSet
-    VertexClassifier(edm::ParameterSet const & pset,
-                     edm::ConsumesCollector&&);
+  //! Constructor by ParameterSet
+  VertexClassifier(edm::ParameterSet const &pset, edm::ConsumesCollector &&);
 
-    virtual ~VertexClassifier() {}
+  virtual ~VertexClassifier() {}
 
-    //! Pre-process event information (for accessing reconstraction information)
-    virtual void newEvent(edm::Event const &, edm::EventSetup const &);
+  //! Pre-process event information (for accessing reconstraction information)
+  virtual void newEvent(edm::Event const &, edm::EventSetup const &);
 
-    //! Classify the RecoVertex in categories.
-    VertexClassifier const & evaluate (reco::VertexBaseRef const &);
+  //! Classify the RecoVertex in categories.
+  VertexClassifier const &evaluate(reco::VertexBaseRef const &);
 
-    //! Classify the TrackingVertex in categories.
-    VertexClassifier const & evaluate (TrackingVertexRef const &);
+  //! Classify the TrackingVertex in categories.
+  VertexClassifier const &evaluate(TrackingVertexRef const &);
 
-    //! Classify the RecoVertex in categories.
-    VertexClassifier const & evaluate (reco::VertexRef const & vertex)
-    {
-        return evaluate( reco::VertexBaseRef(vertex) );
-    }
+  //! Classify the RecoVertex in categories.
+  VertexClassifier const &evaluate(reco::VertexRef const &vertex) { return evaluate(reco::VertexBaseRef(vertex)); }
 
-    //! Returns a reference to the vertex history used in the classification.
-    VertexHistory const & history() const
-    {
-        return tracer_;
-    }
+  //! Returns a reference to the vertex history used in the classification.
+  VertexHistory const &history() const { return tracer_; }
 
 private:
+  VertexHistory tracer_;
 
-    VertexHistory tracer_;
-
-    const G4toCMSLegacyProcTypeMap g4toCMSProcMap_;
-
-    const edm::InputTag hepMCLabel_;
+  const G4toCMSLegacyProcTypeMap g4toCMSProcMap_;
 
-    double longLivedDecayLength_;
-    double vertexClusteringDistance_;
+  const edm::InputTag hepMCLabel_;
 
-    edm::Handle<edm::HepMCProduct> mcInformation_;
+  double longLivedDecayLength_;
+  double vertexClusteringDistance_;
 
-    edm::ESHandle<ParticleDataTable> particleDataTable_;
+  edm::Handle<edm::HepMCProduct> mcInformation_;
 
-    //! Get reconstruction information
-    void reconstructionInformation(reco::TrackBaseRef const &);
+  edm::ESHandle<ParticleDataTable> particleDataTable_;
 
-    //! Get all the information related to the simulation details
-    void simulationInformation();
+  //! Get reconstruction information
+  void reconstructionInformation(reco::TrackBaseRef const &);
 
-    //! Get all the information related to decay process
-    void processesAtGenerator();
+  //! Get all the information related to the simulation details
+  void simulationInformation();
 
-    //! Get information about conversion and other interactions
-    void processesAtSimulation();
+  //! Get all the information related to decay process
+  void processesAtGenerator();
 
-    //! Get geometrical information about the vertices
-    void vertexInformation();
+  //! Get information about conversion and other interactions
+  void processesAtSimulation();
 
-    //! Auxiliary class holding simulated primary vertices
-    struct GeneratedPrimaryVertex
-    {
-        GeneratedPrimaryVertex(double x1,double y1,double z1): x(x1), y(y1), z(z1), ptsq(0), nGenTrk(0) {}
+  //! Get geometrical information about the vertices
+  void vertexInformation();
 
-        bool operator< ( GeneratedPrimaryVertex const & reference) const
-        {
-            return ptsq < reference.ptsq;
-        }
+  //! Auxiliary class holding simulated primary vertices
+  struct GeneratedPrimaryVertex {
+    GeneratedPrimaryVertex(double x1, double y1, double z1) : x(x1), y(y1), z(z1), ptsq(0), nGenTrk(0) {}
 
-        double x, y, z;
-        double ptsq;
-        int nGenTrk;
+    bool operator<(GeneratedPrimaryVertex const &reference) const { return ptsq < reference.ptsq; }
 
-        HepMC::FourVector ptot;
+    double x, y, z;
+    double ptsq;
+    int nGenTrk;
 
-        std::vector<int> finalstateParticles;
-        std::vector<int> simTrackIndex;
-        std::vector<int> genVertex;
-    };
+    HepMC::FourVector ptot;
 
-    std::vector<GeneratedPrimaryVertex> genpvs_;
+    std::vector<int> finalstateParticles;
+    std::vector<int> simTrackIndex;
+    std::vector<int> genVertex;
+  };
 
-    // Auxiliary function to get the generated primary vertex
-    bool isFinalstateParticle(const HepMC::GenParticle *);
-    bool isCharged(const HepMC::GenParticle *);
-    void genPrimaryVertices();
+  std::vector<GeneratedPrimaryVertex> genpvs_;
 
+  // Auxiliary function to get the generated primary vertex
+  bool isFinalstateParticle(const HepMC::GenParticle *);
+  bool isCharged(const HepMC::GenParticle *);
+  void genPrimaryVertices();
 };
 
 #endif
diff --git a/SimTracker/TrackHistory/interface/VertexClassifierByProxy.h b/SimTracker/TrackHistory/interface/VertexClassifierByProxy.h
index d150c8c756c77..e81edcabcaf6e 100644
--- a/SimTracker/TrackHistory/interface/VertexClassifierByProxy.h
+++ b/SimTracker/TrackHistory/interface/VertexClassifierByProxy.h
@@ -8,102 +8,86 @@
 
 //! Get track history and classification by proxy
 template <typename Collection>
-class VertexClassifierByProxy : public VertexClassifier
-{
-
+class VertexClassifierByProxy : public VertexClassifier {
 public:
+  //! Association type.
+  typedef edm::AssociationMap<edm::OneToMany<Collection, reco::VertexCollection>> Association;
+
+  //! Constructor by ParameterSet.
+  VertexClassifierByProxy(edm::ParameterSet const &config, edm::ConsumesCollector &&collector)
+      : VertexClassifier(config, std::move(collector)),
+        proxy_(config.getUntrackedParameter<edm::InputTag>("vertexProducer")) {
+    collector.consumes<Association>(proxy_);
+  }
+
+  //! Pre-process event information (for accessing reconstraction information).
+  void newEvent(edm::Event const &event, edm::EventSetup const &config) override {
+    // Get the association part of the proxy to the collection
+    event.getByLabel(proxy_, proxyHandler_);
+    // Call the previous new event
+    VertexClassifier::newEvent(event, config);
+  }
+
+  //! Classify the TrackingVertex in categories.
+  VertexClassifierByProxy<Collection> const &evaluate(TrackingVertexRef const &vertex) {
+    VertexClassifier::evaluate(vertex);
+    return *this;
+  }
+
+  //! Classify any vertexes in categories.
+  VertexClassifierByProxy<Collection> const &evaluate(edm::Ref<Collection> const &vertex, std::size_t index) {
+    const reco::VertexRefVector *vertexes = nullptr;
+
+    try {
+      // Get a reference to the vector of associated vertexes
+      vertexes = &(proxyHandler_->find(vertex)->val);
+    } catch (edm::Exception &e) {
+      // If association fails define the vertex as unknown
+      reset();
+      unknownVertex();
+      return *this;
+    }
 
-    //! Association type.
-    typedef edm::AssociationMap<edm::OneToMany<Collection, reco::VertexCollection> > Association;
+    // Evaluate the history for a given index
+    VertexClassifier::evaluate(vertexes->at(index));
 
-    //! Constructor by ParameterSet.
-    VertexClassifierByProxy(edm::ParameterSet const & config,
-                            edm::ConsumesCollector&& collector) : VertexClassifier(config,std::move(collector)),
-            proxy_( config.getUntrackedParameter<edm::InputTag>("vertexProducer") ) {
-      collector.consumes<Association>(proxy_);
-    }
+    return *this;
+  }
 
-    //! Pre-process event information (for accessing reconstraction information).
-    void newEvent(edm::Event const & event, edm::EventSetup const & config) override
-    {
-        // Get the association part of the proxy to the collection
-        event.getByLabel(proxy_, proxyHandler_);
-        // Call the previous new event
-        VertexClassifier::newEvent(event, config);
-    }
+  //! Classify any vertexes in categories.
+  VertexClassifierByProxy<Collection> const &evaluate(edm::Ref<Collection> const &vertex) {
+    const reco::VertexRefVector *vertexes = nullptr;
 
-    //! Classify the TrackingVertex in categories.
-    VertexClassifierByProxy<Collection> const & evaluate (TrackingVertexRef const & vertex)
-    {
-        VertexClassifier::evaluate(vertex);
-        return *this;
+    try {
+      // Get a reference to the vector of associated vertexes
+      vertexes = &(proxyHandler_->find(vertex)->val);
+    } catch (edm::Exception &e) {
+      // If association fails define the vertex as unknown
+      reset();
+      unknownVertex();
+      return *this;
     }
 
-    //! Classify any vertexes in categories.
-    VertexClassifierByProxy<Collection> const & evaluate (edm::Ref<Collection> const & vertex, std::size_t index)
-    {
-        const reco::VertexRefVector * vertexes = nullptr;
-
-        try
-        {
-            // Get a reference to the vector of associated vertexes
-            vertexes = &(proxyHandler_->find(vertex)->val);
-        }
-        catch (edm::Exception& e)
-        {
-            // If association fails define the vertex as unknown
-            reset();
-            unknownVertex();
-            return *this;
-        }
-
-        // Evaluate the history for a given index
-        VertexClassifier::evaluate( vertexes->at(index) );
-
-        return *this;
-    }
+    // Loop over all the associated vertexes
+    for (std::size_t index = 0; index < vertexes->size(); ++index) {
+      // Copy the last status for all the flags
+      Flags flags(flags_);
 
-    //! Classify any vertexes in categories.
-    VertexClassifierByProxy<Collection> const & evaluate (edm::Ref<Collection> const & vertex)
-    {
-        const reco::VertexRefVector * vertexes = nullptr;
-
-        try
-        {
-            // Get a reference to the vector of associated vertexes
-            vertexes = &(proxyHandler_->find(vertex)->val);
-        }
-        catch (edm::Exception& e)
-        {
-            // If association fails define the vertex as unknown
-            reset();
-            unknownVertex();
-            return *this;
-        }
-
-        // Loop over all the associated vertexes
-        for (std::size_t index = 0; index < vertexes->size(); ++index)
-        {
-            // Copy the last status for all the flags
-            Flags flags(flags_);
-
-            // Evaluate the history for a given index
-            VertexClassifier::evaluate( vertexes->at(index) );
-
-            // Combine OR the flag information
-            for (std::size_t i = 0; i < flags_.size(); ++i)
-                flags_[i] = flags_[i] | flags[i];
-        }
-
-        return *this;
-    }
+      // Evaluate the history for a given index
+      VertexClassifier::evaluate(vertexes->at(index));
 
-private:
+      // Combine OR the flag information
+      for (std::size_t i = 0; i < flags_.size(); ++i)
+        flags_[i] = flags_[i] | flags[i];
+    }
 
-    const edm::InputTag proxy_;
+    return *this;
+  }
 
-    edm::Handle<Association> proxyHandler_;
+private:
+  const edm::InputTag proxy_;
 
+  edm::Handle<Association> proxyHandler_;
 };
 
 #endif
diff --git a/SimTracker/TrackHistory/interface/VertexHistory.h b/SimTracker/TrackHistory/interface/VertexHistory.h
index 8cb72cf42ed4d..ae224e8e40ef9 100644
--- a/SimTracker/TrackHistory/interface/VertexHistory.h
+++ b/SimTracker/TrackHistory/interface/VertexHistory.h
@@ -4,94 +4,78 @@
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
 
-#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
+#include "SimDataFormats/Associations/interface/VertexAssociation.h"
 #include "SimTracker/TrackHistory/interface/HistoryBase.h"
 #include "SimTracker/TrackHistory/interface/Utils.h"
-#include "SimDataFormats/Associations/interface/VertexAssociation.h"
 
 //! This class traces the simulated and generated history of a given track.
-class VertexHistory : public HistoryBase
-{
-
+class VertexHistory : public HistoryBase {
 public:
-
-    //! Constructor by pset.
-    /* Creates a VertexHistory with association given by pset.
-
-       /param[in] config with the configuration values
-    */
-    VertexHistory(const edm::ParameterSet &,
-                  edm::ConsumesCollector&&);
-
-    //! Pre-process event information (for accessing reconstruction information)
-    void newEvent(const edm::Event &, const edm::EventSetup &);
-
-    //! Evaluate track history using a TrackingParticleRef.
-    /* Return false when the history cannot be determined upto a given depth.
-       If not depth is pass to the function no restriction are apply to it.
-
-       /param[in] trackingVertexRef of a simulated track
-       /param[in] depth of the vertex history
-       /param[out] boolean that is true when history can be determined
-    */
-    bool evaluate(TrackingVertexRef tvr)
-    {
-        if ( enableSimToReco_ )
-        {
-
-            std::pair<reco::VertexBaseRef, double> result =  match(tvr, simToReco_, bestMatchByMaxValue_);
-            recovertex_ = result.first;
-            quality_ =  result.second;
-        }
-        return HistoryBase::evaluate(tvr);
+  //! Constructor by pset.
+  /* Creates a VertexHistory with association given by pset.
+
+     /param[in] config with the configuration values
+  */
+  VertexHistory(const edm::ParameterSet &, edm::ConsumesCollector &&);
+
+  //! Pre-process event information (for accessing reconstruction information)
+  void newEvent(const edm::Event &, const edm::EventSetup &);
+
+  //! Evaluate track history using a TrackingParticleRef.
+  /* Return false when the history cannot be determined upto a given depth.
+     If not depth is pass to the function no restriction are apply to it.
+
+     /param[in] trackingVertexRef of a simulated track
+     /param[in] depth of the vertex history
+     /param[out] boolean that is true when history can be determined
+  */
+  bool evaluate(TrackingVertexRef tvr) {
+    if (enableSimToReco_) {
+      std::pair<reco::VertexBaseRef, double> result = match(tvr, simToReco_, bestMatchByMaxValue_);
+      recovertex_ = result.first;
+      quality_ = result.second;
     }
+    return HistoryBase::evaluate(tvr);
+  }
 
+  //! Evaluate reco::Vertex history using a given association.
+  /* Return false when the track association is not possible (fake track).
 
-    //! Evaluate reco::Vertex history using a given association.
-    /* Return false when the track association is not possible (fake track).
-
-       /param[in] VertexRef to a reco::track
-       /param[out] boolean that is false when a fake track is detected
-    */
-    bool evaluate (reco::VertexBaseRef);
-
-    //! Return a reference to the reconstructed track.
-    const reco::VertexBaseRef & recoVertex() const
-    {
-        return recovertex_;
-    }
+     /param[in] VertexRef to a reco::track
+     /param[out] boolean that is false when a fake track is detected
+  */
+  bool evaluate(reco::VertexBaseRef);
 
-    //! Return the quality of the match.
-    double quality() const
-    {
-        return quality_;
-    }
+  //! Return a reference to the reconstructed track.
+  const reco::VertexBaseRef &recoVertex() const { return recovertex_; }
 
+  //! Return the quality of the match.
+  double quality() const { return quality_; }
 
 private:
+  bool bestMatchByMaxValue_;
 
-    bool bestMatchByMaxValue_;
-
-    bool enableRecoToSim_, enableSimToReco_;
+  bool enableRecoToSim_, enableSimToReco_;
 
-    double quality_;
+  double quality_;
 
-    edm::InputTag vertexProducer_;
+  edm::InputTag vertexProducer_;
 
-    edm::InputTag trackingTruth_;
+  edm::InputTag trackingTruth_;
 
-    edm::InputTag vertexAssociator_;
+  edm::InputTag vertexAssociator_;
 
-    reco::VertexBaseRef recovertex_;
+  reco::VertexBaseRef recovertex_;
 
-    reco::VertexRecoToSimCollection recoToSim_;
+  reco::VertexRecoToSimCollection recoToSim_;
 
-    reco::VertexSimToRecoCollection simToReco_;
+  reco::VertexSimToRecoCollection simToReco_;
 };
 
 #endif
diff --git a/SimTracker/TrackHistory/plugins/CategorySelectors.cc b/SimTracker/TrackHistory/plugins/CategorySelectors.cc
index f3d33e963c25b..f3c546e8cd77e 100644
--- a/SimTracker/TrackHistory/plugins/CategorySelectors.cc
+++ b/SimTracker/TrackHistory/plugins/CategorySelectors.cc
@@ -4,7 +4,6 @@
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
-#include "DataFormats/VertexReco/interface/Vertex.h"
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
@@ -16,31 +15,30 @@
 #include "SimTracker/TrackHistory/interface/VertexClassifier.h"
 #include "SimTracker/TrackHistory/interface/VertexClassifierByProxy.h"
 
-namespace reco
-{
-namespace modules
-{
+namespace reco {
+  namespace modules {
 
-// Generic TrackCategory selector
+    // Generic TrackCategory selector
 
-typedef ObjectSelector<CategoryCriteria<TrackCollection, TrackClassifier> > TrackCategorySelector;
-DEFINE_FWK_MODULE(TrackCategorySelector);
+    typedef ObjectSelector<CategoryCriteria<TrackCollection, TrackClassifier>> TrackCategorySelector;
+    DEFINE_FWK_MODULE(TrackCategorySelector);
 
-typedef ObjectSelector<CategoryCriteria<TrackingParticleCollection, TrackClassifier> > TrackingParticleCategorySelector;
-DEFINE_FWK_MODULE(TrackingParticleCategorySelector);
+    typedef ObjectSelector<CategoryCriteria<TrackingParticleCollection, TrackClassifier>>
+        TrackingParticleCategorySelector;
+    DEFINE_FWK_MODULE(TrackingParticleCategorySelector);
 
-// Generic VertexCategory selector
+    // Generic VertexCategory selector
 
-typedef ObjectSelector<CategoryCriteria<VertexCollection, VertexClassifier> > VertexCategorySelector;
-DEFINE_FWK_MODULE(VertexCategorySelector);
+    typedef ObjectSelector<CategoryCriteria<VertexCollection, VertexClassifier>> VertexCategorySelector;
+    DEFINE_FWK_MODULE(VertexCategorySelector);
 
-typedef ObjectSelector<CategoryCriteria<TrackingVertexCollection, VertexClassifier> > TrackingVertexCategorySelector;
-DEFINE_FWK_MODULE(TrackingVertexCategorySelector);
+    typedef ObjectSelector<CategoryCriteria<TrackingVertexCollection, VertexClassifier>> TrackingVertexCategorySelector;
+    DEFINE_FWK_MODULE(TrackingVertexCategorySelector);
 
-typedef ObjectSelector<
-CategoryCriteria<SecondaryVertexTagInfoCollection, VertexClassifierByProxy<SecondaryVertexTagInfoCollection> >
-> SecondaryVertexTagInfoCategorySelector;
-DEFINE_FWK_MODULE(SecondaryVertexTagInfoCategorySelector);
+    typedef ObjectSelector<
+        CategoryCriteria<SecondaryVertexTagInfoCollection, VertexClassifierByProxy<SecondaryVertexTagInfoCollection>>>
+        SecondaryVertexTagInfoCategorySelector;
+    DEFINE_FWK_MODULE(SecondaryVertexTagInfoCategorySelector);
 
-}
-}
+  }  // namespace modules
+}  // namespace reco
diff --git a/SimTracker/TrackHistory/plugins/GenTrackMatcher.cc b/SimTracker/TrackHistory/plugins/GenTrackMatcher.cc
index c9e64f2395ce8..75fd521f7e696 100644
--- a/SimTracker/TrackHistory/plugins/GenTrackMatcher.cc
+++ b/SimTracker/TrackHistory/plugins/GenTrackMatcher.cc
@@ -6,91 +6,81 @@
  *
  */
 
-
-#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "DataFormats/Common/interface/Association.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "SimTracker/TrackHistory/interface/TrackHistory.h"
 
-namespace edm
-{
-class ParameterSet;
+namespace edm {
+  class ParameterSet;
 }
 
 using namespace edm;
 using namespace std;
 using namespace reco;
 
-class GenTrackMatcher : public edm::stream::EDProducer<>
-{
+class GenTrackMatcher : public edm::stream::EDProducer<> {
 public:
-    /// constructor
-    GenTrackMatcher( const edm::ParameterSet & );
+  /// constructor
+  GenTrackMatcher(const edm::ParameterSet &);
 
 private:
-    void produce( edm::Event& evt, const edm::EventSetup& es ) override;
-    TrackHistory tracer_;
-    edm::EDGetTokenT<View<Track>> tracks_;
-    edm::EDGetTokenT<GenParticleCollection> genParticles_;
-    edm::EDGetTokenT<vector<int>> genParticleInts_;
-    typedef edm::Association<reco::GenParticleCollection> GenParticleMatch;
+  void produce(edm::Event &evt, const edm::EventSetup &es) override;
+  TrackHistory tracer_;
+  edm::EDGetTokenT<View<Track>> tracks_;
+  edm::EDGetTokenT<GenParticleCollection> genParticles_;
+  edm::EDGetTokenT<vector<int>> genParticleInts_;
+  typedef edm::Association<reco::GenParticleCollection> GenParticleMatch;
 };
 
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/EDMException.h"
 
-GenTrackMatcher::GenTrackMatcher(const ParameterSet & p) :
-        tracer_(p,consumesCollector()),
-        tracks_(consumes<View<Track>>(p.getUntrackedParameter<edm::InputTag>("trackProducer"))),
-        genParticles_(consumes<GenParticleCollection>(p.getUntrackedParameter<edm::InputTag>("genParticles"))),
-        genParticleInts_(consumes<vector<int>>(p.getUntrackedParameter<edm::InputTag>("genParticles")))
-{
-    produces<GenParticleMatch>();
+GenTrackMatcher::GenTrackMatcher(const ParameterSet &p)
+    : tracer_(p, consumesCollector()),
+      tracks_(consumes<View<Track>>(p.getUntrackedParameter<edm::InputTag>("trackProducer"))),
+      genParticles_(consumes<GenParticleCollection>(p.getUntrackedParameter<edm::InputTag>("genParticles"))),
+      genParticleInts_(consumes<vector<int>>(p.getUntrackedParameter<edm::InputTag>("genParticles"))) {
+  produces<GenParticleMatch>();
 }
 
-void GenTrackMatcher::produce(Event& evt, const EventSetup& es)
-{
-    Handle<View<Track> > tracks;
-    evt.getByToken(tracks_, tracks);
-    Handle<vector<int> > barCodes;
-    evt.getByToken(genParticles_, barCodes);
-    Handle<GenParticleCollection> genParticles;
-    evt.getByToken(genParticles_, genParticles);
-    unique_ptr<GenParticleMatch> match(new GenParticleMatch(GenParticleRefProd(genParticles)));
-    GenParticleMatch::Filler filler(*match);
-    size_t n = tracks->size();
-    vector<int> indices(n,-1);
-    tracer_.newEvent(evt, es);
-    for (size_t i = 0; i < n; ++ i )
-    {
-        RefToBase<Track> track(tracks, i);
-        if (tracer_.evaluate(track))
-        {
-            const HepMC::GenParticle * particle = tracer_.genParticle();
-            if (particle)
-            {
-                int barCode = particle->barcode();
-                vector<int>::const_iterator b = barCodes->begin(), e = barCodes->end(), f = find( b, e, barCode );
-                if (f == e) {
-                  edm::EDConsumerBase::Labels labels;
-                  labelsForToken(genParticles_, labels);
-                  throw edm::Exception(errors::InvalidReference)
-                    << "found matching particle with barcode" << *f
-                    << " which has not been found in " << labels.module;
-                }
-                indices[i] = *f;
-            }
+void GenTrackMatcher::produce(Event &evt, const EventSetup &es) {
+  Handle<View<Track>> tracks;
+  evt.getByToken(tracks_, tracks);
+  Handle<vector<int>> barCodes;
+  evt.getByToken(genParticles_, barCodes);
+  Handle<GenParticleCollection> genParticles;
+  evt.getByToken(genParticles_, genParticles);
+  unique_ptr<GenParticleMatch> match(new GenParticleMatch(GenParticleRefProd(genParticles)));
+  GenParticleMatch::Filler filler(*match);
+  size_t n = tracks->size();
+  vector<int> indices(n, -1);
+  tracer_.newEvent(evt, es);
+  for (size_t i = 0; i < n; ++i) {
+    RefToBase<Track> track(tracks, i);
+    if (tracer_.evaluate(track)) {
+      const HepMC::GenParticle *particle = tracer_.genParticle();
+      if (particle) {
+        int barCode = particle->barcode();
+        vector<int>::const_iterator b = barCodes->begin(), e = barCodes->end(), f = find(b, e, barCode);
+        if (f == e) {
+          edm::EDConsumerBase::Labels labels;
+          labelsForToken(genParticles_, labels);
+          throw edm::Exception(errors::InvalidReference)
+              << "found matching particle with barcode" << *f << " which has not been found in " << labels.module;
         }
+        indices[i] = *f;
+      }
     }
-    filler.insert(tracks, indices.begin(), indices.end());
-    filler.fill();
-    evt.put(std::move(match));
+  }
+  filler.insert(tracks, indices.begin(), indices.end());
+  filler.fill();
+  evt.put(std::move(match));
 }
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-DEFINE_FWK_MODULE( GenTrackMatcher );
-
+DEFINE_FWK_MODULE(GenTrackMatcher);
diff --git a/SimTracker/TrackHistory/plugins/JetVetoedTracksAssociatorAtVertex.cc b/SimTracker/TrackHistory/plugins/JetVetoedTracksAssociatorAtVertex.cc
index 57af2c875cd17..7c09ef19f38db 100644
--- a/SimTracker/TrackHistory/plugins/JetVetoedTracksAssociatorAtVertex.cc
+++ b/SimTracker/TrackHistory/plugins/JetVetoedTracksAssociatorAtVertex.cc
@@ -9,66 +9,66 @@
 #include "DataFormats/Common/interface/EDProductfwd.h"
 #include "DataFormats/Common/interface/View.h"
 #include "DataFormats/JetReco/interface/Jet.h"
-#include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/JetReco/interface/JetTracksAssociation.h"
+#include "DataFormats/TrackReco/interface/Track.h"
 
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
 #include "SimTracker/TrackHistory/interface/JetVetoedTracksAssociatorDRVertex.h"
 
-class JetVetoedTracksAssociatorAtVertex : public edm::stream::EDProducer<>
-{
+class JetVetoedTracksAssociatorAtVertex : public edm::stream::EDProducer<> {
 public:
-    JetVetoedTracksAssociatorAtVertex(const edm::ParameterSet&);
-    ~JetVetoedTracksAssociatorAtVertex() override;
-    void produce(edm::Event&, const edm::EventSetup&) override;
+  JetVetoedTracksAssociatorAtVertex(const edm::ParameterSet &);
+  ~JetVetoedTracksAssociatorAtVertex() override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
+
 private:
-    edm::EDGetTokenT<edm::View<reco::Jet>> mJets;
-    edm::EDGetTokenT<reco::TrackCollection> mTracks;
-    JetVetoedTracksAssociationDRVertex mAssociator;
-    TrackClassifier classifier;
+  edm::EDGetTokenT<edm::View<reco::Jet>> mJets;
+  edm::EDGetTokenT<reco::TrackCollection> mTracks;
+  JetVetoedTracksAssociationDRVertex mAssociator;
+  TrackClassifier classifier;
 };
 
-JetVetoedTracksAssociatorAtVertex::JetVetoedTracksAssociatorAtVertex(const edm::ParameterSet& fConfig)
-        : mJets (consumes<edm::View<reco::Jet>>(fConfig.getParameter<edm::InputTag> ("jets"))),
-        mTracks (consumes<reco::TrackCollection>(fConfig.getParameter<edm::InputTag> ("tracks"))),
-        mAssociator (fConfig.getParameter<double> ("coneSize")),
-        classifier(fConfig,consumesCollector())
-{
-    produces<reco::JetTracksAssociation::Container> ();
+JetVetoedTracksAssociatorAtVertex::JetVetoedTracksAssociatorAtVertex(const edm::ParameterSet &fConfig)
+    : mJets(consumes<edm::View<reco::Jet>>(fConfig.getParameter<edm::InputTag>("jets"))),
+      mTracks(consumes<reco::TrackCollection>(fConfig.getParameter<edm::InputTag>("tracks"))),
+      mAssociator(fConfig.getParameter<double>("coneSize")),
+      classifier(fConfig, consumesCollector()) {
+  produces<reco::JetTracksAssociation::Container>();
 }
 
 JetVetoedTracksAssociatorAtVertex::~JetVetoedTracksAssociatorAtVertex() {}
 
-void JetVetoedTracksAssociatorAtVertex::produce(edm::Event& fEvent, const edm::EventSetup& fSetup)
-{
-    // Gather contextual information for TrackCategories
-    classifier.newEvent(fEvent, fSetup);
+void JetVetoedTracksAssociatorAtVertex::produce(edm::Event &fEvent, const edm::EventSetup &fSetup) {
+  // Gather contextual information for TrackCategories
+  classifier.newEvent(fEvent, fSetup);
 
-    edm::Handle <edm::View <reco::Jet> > jets_h;
-    fEvent.getByToken (mJets, jets_h);
-    edm::Handle <reco::TrackCollection> tracks_h;
-    fEvent.getByToken (mTracks, tracks_h);
+  edm::Handle<edm::View<reco::Jet>> jets_h;
+  fEvent.getByToken(mJets, jets_h);
+  edm::Handle<reco::TrackCollection> tracks_h;
+  fEvent.getByToken(mTracks, tracks_h);
 
-    std::unique_ptr<reco::JetTracksAssociation::Container> jetTracks (new reco::JetTracksAssociation::Container (reco::JetRefBaseProd(jets_h)));
+  std::unique_ptr<reco::JetTracksAssociation::Container> jetTracks(
+      new reco::JetTracksAssociation::Container(reco::JetRefBaseProd(jets_h)));
 
-    // format inputs
-    std::vector <edm::RefToBase<reco::Jet> > allJets;
-    allJets.reserve (jets_h->size());
-    for (unsigned i = 0; i < jets_h->size(); ++i) allJets.push_back (jets_h->refAt(i));
-    std::vector <reco::TrackRef> allTracks;
-    allTracks.reserve (tracks_h->size());
-    for (unsigned i = 0; i < tracks_h->size(); ++i) allTracks.push_back (reco::TrackRef (tracks_h, i));
-    // run algo
-    mAssociator.produce (&*jetTracks, allJets, allTracks, classifier);
-    // store output
-    fEvent.put(std::move(jetTracks));
+  // format inputs
+  std::vector<edm::RefToBase<reco::Jet>> allJets;
+  allJets.reserve(jets_h->size());
+  for (unsigned i = 0; i < jets_h->size(); ++i)
+    allJets.push_back(jets_h->refAt(i));
+  std::vector<reco::TrackRef> allTracks;
+  allTracks.reserve(tracks_h->size());
+  for (unsigned i = 0; i < tracks_h->size(); ++i)
+    allTracks.push_back(reco::TrackRef(tracks_h, i));
+  // run algo
+  mAssociator.produce(&*jetTracks, allJets, allTracks, classifier);
+  // store output
+  fEvent.put(std::move(jetTracks));
 }
 
 DEFINE_FWK_MODULE(JetVetoedTracksAssociatorAtVertex);
-
diff --git a/SimTracker/TrackHistory/plugins/QualityCutsAnalyzer.cc b/SimTracker/TrackHistory/plugins/QualityCutsAnalyzer.cc
index c4d0047ee6e3c..f6ff09781b4cf 100644
--- a/SimTracker/TrackHistory/plugins/QualityCutsAnalyzer.cc
+++ b/SimTracker/TrackHistory/plugins/QualityCutsAnalyzer.cc
@@ -15,10 +15,10 @@
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "TrackingTools/IPTools/interface/IPTools.h"
@@ -33,218 +33,199 @@
 // class decleration
 //
 
-class QualityCutsAnalyzer : public edm::one::EDAnalyzer<>
-{
-
+class QualityCutsAnalyzer : public edm::one::EDAnalyzer<> {
 public:
-
-    explicit QualityCutsAnalyzer(const edm::ParameterSet&);
-    ~QualityCutsAnalyzer() override;
+  explicit QualityCutsAnalyzer(const edm::ParameterSet &);
+  ~QualityCutsAnalyzer() override;
 
 private:
+  void beginJob() override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
+
+  // Member data
+
+  typedef std::vector<int> vint;
+  typedef std::vector<std::string> vstring;
+
+  edm::InputTag trackProducer_;
+  edm::InputTag primaryVertexProducer_;
+  edm::InputTag jetTracksAssociation_;
+
+  std::string rootFile_;
+
+  int minimumNumberOfHits_, minimumNumberOfPixelHits_;
+  double minimumTransverseMomentum_, maximumChiSquared_;
+
+  bool useAllQualities_;
+  reco::TrackBase::TrackQuality trackQuality_;
+
+  void LoopOverJetTracksAssociation(const edm::ESHandle<TransientTrackBuilder> &,
+                                    const edm::Handle<reco::VertexCollection> &,
+                                    const edm::Handle<reco::JetTracksAssociationCollection> &);
+
+  // Histograms for optimization
+
+  struct histogram_element_t {
+    double sdl;             // Signed decay length
+    double dta;             // Distance to jet axis
+    double tip;             // Transverse impact parameter
+    double lip;             // Longitudinal impact parameter
+    double ips;             // Impact parameter significance.
+    double pt;              // Transverse momentum
+    double chi2;            // Chi^2
+    std::size_t hits;       // Number of hits
+    std::size_t pixelhits;  // Number of hits
+
+    histogram_element_t(
+        double d, double a, double t, double l, double i, double p, double c, std::size_t h, std::size_t x) {
+      sdl = d;
+      dta = a;
+      tip = t;
+      lip = l;
+      ips = i;
+      pt = p;
+      chi2 = c;
+      hits = h;
+      pixelhits = x;
+    }
 
-    void beginJob() override ;
-    void analyze(const edm::Event&, const edm::EventSetup&) override;
-    void endJob() override;
-
-    // Member data
-
-    typedef std::vector<int> vint;
-    typedef std::vector<std::string> vstring;
-
-    edm::InputTag trackProducer_;
-    edm::InputTag primaryVertexProducer_;
-    edm::InputTag jetTracksAssociation_;
-
-    std::string rootFile_;
-
-    int minimumNumberOfHits_, minimumNumberOfPixelHits_;
-    double minimumTransverseMomentum_, maximumChiSquared_;
-
-    bool useAllQualities_;
-    reco::TrackBase::TrackQuality trackQuality_;
-
-    void
-    LoopOverJetTracksAssociation(
-        const edm::ESHandle<TransientTrackBuilder> &,
-        const edm::Handle<reco::VertexCollection> &,
-        const edm::Handle<reco::JetTracksAssociationCollection> &
-    );
-
-    // Histograms for optimization
-
-    struct histogram_element_t
-    {
-        double sdl;  // Signed decay length
-        double dta;  // Distance to jet axis
-        double tip;  // Transverse impact parameter
-        double lip;  // Longitudinal impact parameter
-        double ips;  // Impact parameter significance.
-        double pt;   // Transverse momentum
-        double chi2; // Chi^2
-        std::size_t hits;      // Number of hits
-        std::size_t pixelhits; // Number of hits
-
-        histogram_element_t(double d, double a, double t, double l, double i, double p, double c, std::size_t h, std::size_t x)
-        {
-            sdl = d;
-            dta = a;
-            tip = t;
-            lip = l;
-            ips = i;
-            pt = p;
-            chi2 = c;
-            hits = h;
-            pixelhits = x;
-        }
-
-        histogram_element_t(const histogram_element_t & orig)
-        {
-            sdl = orig.sdl;
-            dta = orig.dta;
-            tip = orig.tip;
-            lip = orig.lip;
-            ips = orig.ips;
-            pt = orig.pt;
-            chi2 = orig.chi2;
-            hits = orig.hits;
-            pixelhits = orig.pixelhits;
-        }
-    };
-
-    typedef std::vector<std::vector<histogram_element_t> > histogram_data_t;
-    histogram_data_t histogram_data_;
-
-    class histogram_t
-    {
-
-        TH1F* sdl;
-        TH1F* dta;
-        TH1F* tip;
-        TH1F* lip;
-        TH1F* ips;
-        TH1F* pixelhits;
-        TH1F* pt_1gev;
-        TH1F* chi2;
-        TH1F* hits;
-
-    public:
-
-        histogram_t(const std::string & particleType)
-        {
-            std::string name, title;
-            name = std::string("hits_") + particleType;
-            title = std::string("Hit distribution for ") + particleType;
-            hits = new TH1F(name.c_str(), title.c_str(), 19, -0.5, 18.5);
-
-            name = std::string("chi2_") + particleType;
-            title = std::string("Chi2 distribution for ") + particleType;
-            chi2 = new TH1F(name.c_str(), title.c_str(), 100, 0., 30.);
-
-            name = std::string("pixelhits_") + particleType;
-            title = std::string("Pixel hits distribution for ") + particleType;
-            pixelhits = new TH1F(name.c_str(), title.c_str(), 21, -0.5, 20.5);
-
-            name = std::string("pt_1Gev_") + particleType;
-            title = std::string("Pt distribution close 1Gev for ") + particleType;
-            pt_1gev = new TH1F(name.c_str(), title.c_str(), 100, 0., 2.);
-
-            name = std::string("tip_") + particleType;
-            title = std::string("Transverse impact parameter distribution for ") + particleType;
-            tip = new TH1F(name.c_str(), title.c_str(), 100, -0.3, 0.3);
-
-            name = std::string("lip_") + particleType;
-            title = std::string("Longitudinal impact parameter distribution for ") + particleType;
-            lip = new TH1F(name.c_str(), title.c_str(), 100, -1., 1.);
-
-            name = std::string("ips_") + particleType;
-            title = std::string("IPS distribution for ") + particleType;
-            ips = new TH1F(name.c_str(), title.c_str(), 100, -25.0, 25.0);
-
-            name = std::string("sdl_") + particleType;
-            title = std::string("Decay length distribution for ") + particleType;
-            sdl = new TH1F(name.c_str(), title.c_str(), 100, -5., 5.);
-
-            name = std::string("dta_") + particleType;
-            title = std::string("Distance to jet distribution for ") + particleType;
-            dta = new TH1F(name.c_str(), title.c_str(), 100, 0.0, 0.2);
-        }
-
-        ~histogram_t()
-        {
-            delete hits;
-            delete chi2;
-            delete pixelhits;
-            delete pt_1gev;
-            delete tip;
-            delete lip;
-            delete ips;
-            delete sdl;
-            delete dta;
-        }
-
-        void Fill(const histogram_element_t & data)
-        {
-            hits->Fill(data.hits);
-            chi2->Fill(data.chi2);
-            pixelhits->Fill(data.pt);
-            pt_1gev->Fill(data.pt);
-            ips->Fill(data.ips);
-            tip->Fill(data.tip);
-            lip->Fill(data.lip);
-            sdl->Fill(data.sdl);
-            dta->Fill(data.dta);
-        }
-
-        void Write()
-        {
-            hits->Write();
-            chi2->Write();
-            pixelhits->Write();
-            pt_1gev->Write();
-            ips->Write();
-            tip->Write();
-            lip->Write();
-            sdl->Write();
-            dta->Write();
-        }
-    };
-
-    // Track classification.
-    TrackClassifier classifier_;
+    histogram_element_t(const histogram_element_t &orig) {
+      sdl = orig.sdl;
+      dta = orig.dta;
+      tip = orig.tip;
+      lip = orig.lip;
+      ips = orig.ips;
+      pt = orig.pt;
+      chi2 = orig.chi2;
+      hits = orig.hits;
+      pixelhits = orig.pixelhits;
+    }
+  };
+
+  typedef std::vector<std::vector<histogram_element_t>> histogram_data_t;
+  histogram_data_t histogram_data_;
+
+  class histogram_t {
+    TH1F *sdl;
+    TH1F *dta;
+    TH1F *tip;
+    TH1F *lip;
+    TH1F *ips;
+    TH1F *pixelhits;
+    TH1F *pt_1gev;
+    TH1F *chi2;
+    TH1F *hits;
+
+  public:
+    histogram_t(const std::string &particleType) {
+      std::string name, title;
+      name = std::string("hits_") + particleType;
+      title = std::string("Hit distribution for ") + particleType;
+      hits = new TH1F(name.c_str(), title.c_str(), 19, -0.5, 18.5);
+
+      name = std::string("chi2_") + particleType;
+      title = std::string("Chi2 distribution for ") + particleType;
+      chi2 = new TH1F(name.c_str(), title.c_str(), 100, 0., 30.);
+
+      name = std::string("pixelhits_") + particleType;
+      title = std::string("Pixel hits distribution for ") + particleType;
+      pixelhits = new TH1F(name.c_str(), title.c_str(), 21, -0.5, 20.5);
+
+      name = std::string("pt_1Gev_") + particleType;
+      title = std::string("Pt distribution close 1Gev for ") + particleType;
+      pt_1gev = new TH1F(name.c_str(), title.c_str(), 100, 0., 2.);
+
+      name = std::string("tip_") + particleType;
+      title = std::string("Transverse impact parameter distribution for ") + particleType;
+      tip = new TH1F(name.c_str(), title.c_str(), 100, -0.3, 0.3);
+
+      name = std::string("lip_") + particleType;
+      title = std::string("Longitudinal impact parameter distribution for ") + particleType;
+      lip = new TH1F(name.c_str(), title.c_str(), 100, -1., 1.);
+
+      name = std::string("ips_") + particleType;
+      title = std::string("IPS distribution for ") + particleType;
+      ips = new TH1F(name.c_str(), title.c_str(), 100, -25.0, 25.0);
+
+      name = std::string("sdl_") + particleType;
+      title = std::string("Decay length distribution for ") + particleType;
+      sdl = new TH1F(name.c_str(), title.c_str(), 100, -5., 5.);
+
+      name = std::string("dta_") + particleType;
+      title = std::string("Distance to jet distribution for ") + particleType;
+      dta = new TH1F(name.c_str(), title.c_str(), 100, 0.0, 0.2);
+    }
 
-};
+    ~histogram_t() {
+      delete hits;
+      delete chi2;
+      delete pixelhits;
+      delete pt_1gev;
+      delete tip;
+      delete lip;
+      delete ips;
+      delete sdl;
+      delete dta;
+    }
 
+    void Fill(const histogram_element_t &data) {
+      hits->Fill(data.hits);
+      chi2->Fill(data.chi2);
+      pixelhits->Fill(data.pt);
+      pt_1gev->Fill(data.pt);
+      ips->Fill(data.ips);
+      tip->Fill(data.tip);
+      lip->Fill(data.lip);
+      sdl->Fill(data.sdl);
+      dta->Fill(data.dta);
+    }
+
+    void Write() {
+      hits->Write();
+      chi2->Write();
+      pixelhits->Write();
+      pt_1gev->Write();
+      ips->Write();
+      tip->Write();
+      lip->Write();
+      sdl->Write();
+      dta->Write();
+    }
+  };
+
+  // Track classification.
+  TrackClassifier classifier_;
+};
 
 //
 // constructors and destructor
 //
-QualityCutsAnalyzer::QualityCutsAnalyzer(const edm::ParameterSet& config) : classifier_(config,consumesCollector())
-{
-    trackProducer_         = config.getUntrackedParameter<edm::InputTag> ( "trackProducer" );
-    consumes<edm::View<reco::Track>>(trackProducer_);
-    primaryVertexProducer_ = config.getUntrackedParameter<edm::InputTag> ( "primaryVertexProducer" );
-    consumes<reco::VertexCollection>(primaryVertexProducer_);
-    jetTracksAssociation_  = config.getUntrackedParameter<edm::InputTag> ( "jetTracksAssociation" );
-    consumes<reco::JetTracksAssociationCollection>(jetTracksAssociation_);
-
-    rootFile_ = config.getUntrackedParameter<std::string> ( "rootFile" );
-
-    minimumNumberOfHits_       = config.getUntrackedParameter<int> ( "minimumNumberOfHits" );
-    minimumNumberOfPixelHits_  = config.getUntrackedParameter<int> ( "minimumNumberOfPixelHits" );
-    minimumTransverseMomentum_ = config.getUntrackedParameter<double> ( "minimumTransverseMomentum" );
-    maximumChiSquared_         = config.getUntrackedParameter<double> ( "maximumChiSquared" );
-
-    std::string trackQualityType = config.getUntrackedParameter<std::string>("trackQualityClass"); //used
-    trackQuality_ =  reco::TrackBase::qualityByName(trackQualityType);
-    useAllQualities_ = false;
-
-    std::transform(trackQualityType.begin(), trackQualityType.end(), trackQualityType.begin(), (int(*)(int)) std::tolower);
-    if (trackQualityType == "any")
-    {
-        std::cout << "Using any" << std::endl;
-        useAllQualities_ = true;
-    }
+QualityCutsAnalyzer::QualityCutsAnalyzer(const edm::ParameterSet &config) : classifier_(config, consumesCollector()) {
+  trackProducer_ = config.getUntrackedParameter<edm::InputTag>("trackProducer");
+  consumes<edm::View<reco::Track>>(trackProducer_);
+  primaryVertexProducer_ = config.getUntrackedParameter<edm::InputTag>("primaryVertexProducer");
+  consumes<reco::VertexCollection>(primaryVertexProducer_);
+  jetTracksAssociation_ = config.getUntrackedParameter<edm::InputTag>("jetTracksAssociation");
+  consumes<reco::JetTracksAssociationCollection>(jetTracksAssociation_);
+
+  rootFile_ = config.getUntrackedParameter<std::string>("rootFile");
+
+  minimumNumberOfHits_ = config.getUntrackedParameter<int>("minimumNumberOfHits");
+  minimumNumberOfPixelHits_ = config.getUntrackedParameter<int>("minimumNumberOfPixelHits");
+  minimumTransverseMomentum_ = config.getUntrackedParameter<double>("minimumTransverseMomentum");
+  maximumChiSquared_ = config.getUntrackedParameter<double>("maximumChiSquared");
+
+  std::string trackQualityType = config.getUntrackedParameter<std::string>("trackQualityClass");  // used
+  trackQuality_ = reco::TrackBase::qualityByName(trackQualityType);
+  useAllQualities_ = false;
+
+  std::transform(
+      trackQualityType.begin(), trackQualityType.end(), trackQualityType.begin(), (int (*)(int))std::tolower);
+  if (trackQualityType == "any") {
+    std::cout << "Using any" << std::endl;
+    useAllQualities_ = true;
+  }
 }
 
 QualityCutsAnalyzer::~QualityCutsAnalyzer() {}
@@ -254,167 +235,137 @@ QualityCutsAnalyzer::~QualityCutsAnalyzer() {}
 //
 
 // ------------ method called to for each event  ------------
-void
-QualityCutsAnalyzer::analyze(const edm::Event& event, const edm::EventSetup& setup)
-{
-    // Track collection
-    edm::Handle<edm::View<reco::Track> > trackCollection;
-    event.getByLabel(trackProducer_,trackCollection);
-    // Primary vertex
-    edm::Handle<reco::VertexCollection> primaryVertexCollection;
-    event.getByLabel(primaryVertexProducer_, primaryVertexCollection);
-    // Jet to tracks associator
-    edm::Handle<reco::JetTracksAssociationCollection> jetTracks;
-    event.getByLabel(jetTracksAssociation_, jetTracks);
-    // Trasient track builder
-    edm::ESHandle<TransientTrackBuilder> TTbuilder;
-    setup.get<TransientTrackRecord>().get("TransientTrackBuilder", TTbuilder);
-
-    // Setting up event information for the track categories.
-    classifier_.newEvent(event, setup);
-
-    LoopOverJetTracksAssociation(
-        TTbuilder,
-        primaryVertexCollection,
-        jetTracks
-    );
+void QualityCutsAnalyzer::analyze(const edm::Event &event, const edm::EventSetup &setup) {
+  // Track collection
+  edm::Handle<edm::View<reco::Track>> trackCollection;
+  event.getByLabel(trackProducer_, trackCollection);
+  // Primary vertex
+  edm::Handle<reco::VertexCollection> primaryVertexCollection;
+  event.getByLabel(primaryVertexProducer_, primaryVertexCollection);
+  // Jet to tracks associator
+  edm::Handle<reco::JetTracksAssociationCollection> jetTracks;
+  event.getByLabel(jetTracksAssociation_, jetTracks);
+  // Trasient track builder
+  edm::ESHandle<TransientTrackBuilder> TTbuilder;
+  setup.get<TransientTrackRecord>().get("TransientTrackBuilder", TTbuilder);
+
+  // Setting up event information for the track categories.
+  classifier_.newEvent(event, setup);
+
+  LoopOverJetTracksAssociation(TTbuilder, primaryVertexCollection, jetTracks);
 }
 
+// ------------ method called once each job just before starting event loop
+// ------------
+void QualityCutsAnalyzer::beginJob() { histogram_data_.resize(6); }
+
+// ------------ method called once each job just after ending the event loop
+// ------------
+void QualityCutsAnalyzer::endJob() {
+  TFile file(rootFile_.c_str(), "RECREATE");
+  file.cd();
+
+  // saving the histograms
+  for (std::size_t i = 0; i < 6; i++) {
+    std::string particle;
+    if (i == 0)
+      particle = std::string("B_tracks");
+    else if (i == 1)
+      particle = std::string("C_tracks");
+    else if (i == 2)
+      particle = std::string("nonB_tracks");
+    else if (i == 3)
+      particle = std::string("displaced_tracks");
+    else if (i == 4)
+      particle = std::string("bad_tracks");
+    else
+      particle = std::string("fake_tracks");
 
-// ------------ method called once each job just before starting event loop  ------------
-void
-QualityCutsAnalyzer::beginJob()
-{
-    histogram_data_.resize(6);
-}
+    histogram_t histogram(particle);
 
+    for (std::size_t j = 0; j < histogram_data_[i].size(); j++)
+      histogram.Fill(histogram_data_[i][j]);
 
-// ------------ method called once each job just after ending the event loop  ------------
-void
-QualityCutsAnalyzer::endJob()
-{
-    TFile file(rootFile_.c_str(), "RECREATE");
-    file.cd();
-
-    // saving the histograms
-    for (std::size_t i=0; i<6; i++)
-    {
-        std::string particle;
-        if (i == 0)
-            particle = std::string("B_tracks");
-        else if (i == 1)
-            particle = std::string("C_tracks");
-        else if (i == 2)
-            particle = std::string("nonB_tracks");
-        else if (i == 3)
-            particle = std::string("displaced_tracks");
-        else if (i == 4)
-            particle = std::string("bad_tracks");
-        else
-            particle = std::string("fake_tracks");
-
-        histogram_t histogram(particle);
-
-        for (std::size_t j=0; j<histogram_data_[i].size(); j++)
-            histogram.Fill(histogram_data_[i][j]);
-
-        histogram.Write();
-    }
+    histogram.Write();
+  }
 
-    file.Flush();
+  file.Flush();
 }
 
-
-void
-QualityCutsAnalyzer::LoopOverJetTracksAssociation(
-    const edm::ESHandle<TransientTrackBuilder> & TTbuilder,
-    const edm::Handle<reco::VertexCollection> & primaryVertexProducer_,
-    const edm::Handle<reco::JetTracksAssociationCollection> & jetTracksAssociation
-)
-{
-    const TransientTrackBuilder * bproduct = TTbuilder.product();
-
-    // getting the primary vertex
-    // use first pv of the collection
-    reco::Vertex pv;
-
-    if (!primaryVertexProducer_->empty())
-    {
-        PrimaryVertexSorter pvs;
-        std::vector<reco::Vertex> sortedList = pvs.sortedList(*(primaryVertexProducer_.product()));
-        pv = (sortedList.front());
-    }
-    else
-    { // create a dummy PV
-        // cout << "NO PV FOUND" << endl;
-        reco::Vertex::Error e;
-        e(0,0)=0.0015*0.0015;
-        e(1,1)=0.0015*0.0015;
-        e(2,2)=15.*15.;
-        reco::Vertex::Point p(0,0,0);
-        pv = reco::Vertex(p,e,1,1,1);
-    }
-
-    reco::JetTracksAssociationCollection::const_iterator it = jetTracksAssociation->begin();
-
-    int i=0;
-
-    for (; it != jetTracksAssociation->end(); it++, i++)
-    {
-        // get jetTracks object
-        reco::JetTracksAssociationRef jetTracks(jetTracksAssociation, i);
-
-        double pvZ = pv.z();
-        GlobalVector direction(jetTracks->first->px(), jetTracks->first->py(), jetTracks->first->pz());
-
-        // get the tracks associated to the jet
-        reco::TrackRefVector tracks = jetTracks->second;
-        for (std::size_t index = 0; index < tracks.size(); index++)
-        {
-            edm::RefToBase<reco::Track> track(tracks[index]);
-
-            double pt = tracks[index]->pt();
-            double chi2 = tracks[index]->normalizedChi2();
-            int hits = tracks[index]->hitPattern().numberOfValidHits();
-            int pixelHits = tracks[index]->hitPattern().numberOfValidPixelHits();
-
-            if (
-                hits < minimumNumberOfHits_ ||
-                pixelHits < minimumNumberOfPixelHits_ ||
-                pt < minimumTransverseMomentum_ ||
-                chi2 >  maximumChiSquared_ ||
-                (!useAllQualities_ && !tracks[index]->quality(trackQuality_))
-            ) continue;
-
-            const reco::TransientTrack transientTrack = bproduct->build(&(*tracks[index]));
-            double dta = - IPTools::jetTrackDistance(transientTrack, direction, pv).second.value();
-            double sdl = IPTools::signedDecayLength3D(transientTrack, direction, pv).second.value();
-            double ips = IPTools::signedImpactParameter3D(transientTrack, direction, pv).second.value();
-            double d0 = IPTools::signedTransverseImpactParameter(transientTrack, direction, pv).second.value();
-            double dz = tracks[index]->dz() - pvZ;
-
-            // Classify the reco track;
-            classifier_.evaluate( edm::RefToBase<reco::Track>(tracks[index]) );
-
-            // Check for the different categories
-            if ( classifier_.is(TrackClassifier::Fake) )
-                histogram_data_[5].push_back(histogram_element_t(sdl, dta, d0, dz, ips, pt, chi2, hits, pixelHits));
-            else if ( classifier_.is(TrackClassifier::BWeakDecay) )
-                histogram_data_[0].push_back(histogram_element_t(sdl, dta, d0, dz, ips, pt, chi2, hits, pixelHits));
-            else if ( classifier_.is(TrackClassifier::Bad) )
-                histogram_data_[4].push_back(histogram_element_t(sdl, dta, d0, dz, ips, pt, chi2, hits, pixelHits));
-            else if (
-                !classifier_.is(TrackClassifier::CWeakDecay) &&
-                !classifier_.is(TrackClassifier::PrimaryVertex)
-            )
-                histogram_data_[3].push_back(histogram_element_t(sdl, dta, d0, dz, ips, pt, chi2, hits, pixelHits));
-            else if ( classifier_.is(TrackClassifier::CWeakDecay) )
-                histogram_data_[1].push_back(histogram_element_t(sdl, dta, d0, dz, ips, pt, chi2, hits, pixelHits));
-            else
-                histogram_data_[2].push_back(histogram_element_t(sdl, dta, d0, dz, ips, pt, chi2, hits, pixelHits));
-
-        }
+void QualityCutsAnalyzer::LoopOverJetTracksAssociation(
+    const edm::ESHandle<TransientTrackBuilder> &TTbuilder,
+    const edm::Handle<reco::VertexCollection> &primaryVertexProducer_,
+    const edm::Handle<reco::JetTracksAssociationCollection> &jetTracksAssociation) {
+  const TransientTrackBuilder *bproduct = TTbuilder.product();
+
+  // getting the primary vertex
+  // use first pv of the collection
+  reco::Vertex pv;
+
+  if (!primaryVertexProducer_->empty()) {
+    PrimaryVertexSorter pvs;
+    std::vector<reco::Vertex> sortedList = pvs.sortedList(*(primaryVertexProducer_.product()));
+    pv = (sortedList.front());
+  } else {  // create a dummy PV
+    // cout << "NO PV FOUND" << endl;
+    reco::Vertex::Error e;
+    e(0, 0) = 0.0015 * 0.0015;
+    e(1, 1) = 0.0015 * 0.0015;
+    e(2, 2) = 15. * 15.;
+    reco::Vertex::Point p(0, 0, 0);
+    pv = reco::Vertex(p, e, 1, 1, 1);
+  }
+
+  reco::JetTracksAssociationCollection::const_iterator it = jetTracksAssociation->begin();
+
+  int i = 0;
+
+  for (; it != jetTracksAssociation->end(); it++, i++) {
+    // get jetTracks object
+    reco::JetTracksAssociationRef jetTracks(jetTracksAssociation, i);
+
+    double pvZ = pv.z();
+    GlobalVector direction(jetTracks->first->px(), jetTracks->first->py(), jetTracks->first->pz());
+
+    // get the tracks associated to the jet
+    reco::TrackRefVector tracks = jetTracks->second;
+    for (std::size_t index = 0; index < tracks.size(); index++) {
+      edm::RefToBase<reco::Track> track(tracks[index]);
+
+      double pt = tracks[index]->pt();
+      double chi2 = tracks[index]->normalizedChi2();
+      int hits = tracks[index]->hitPattern().numberOfValidHits();
+      int pixelHits = tracks[index]->hitPattern().numberOfValidPixelHits();
+
+      if (hits < minimumNumberOfHits_ || pixelHits < minimumNumberOfPixelHits_ || pt < minimumTransverseMomentum_ ||
+          chi2 > maximumChiSquared_ || (!useAllQualities_ && !tracks[index]->quality(trackQuality_)))
+        continue;
+
+      const reco::TransientTrack transientTrack = bproduct->build(&(*tracks[index]));
+      double dta = -IPTools::jetTrackDistance(transientTrack, direction, pv).second.value();
+      double sdl = IPTools::signedDecayLength3D(transientTrack, direction, pv).second.value();
+      double ips = IPTools::signedImpactParameter3D(transientTrack, direction, pv).second.value();
+      double d0 = IPTools::signedTransverseImpactParameter(transientTrack, direction, pv).second.value();
+      double dz = tracks[index]->dz() - pvZ;
+
+      // Classify the reco track;
+      classifier_.evaluate(edm::RefToBase<reco::Track>(tracks[index]));
+
+      // Check for the different categories
+      if (classifier_.is(TrackClassifier::Fake))
+        histogram_data_[5].push_back(histogram_element_t(sdl, dta, d0, dz, ips, pt, chi2, hits, pixelHits));
+      else if (classifier_.is(TrackClassifier::BWeakDecay))
+        histogram_data_[0].push_back(histogram_element_t(sdl, dta, d0, dz, ips, pt, chi2, hits, pixelHits));
+      else if (classifier_.is(TrackClassifier::Bad))
+        histogram_data_[4].push_back(histogram_element_t(sdl, dta, d0, dz, ips, pt, chi2, hits, pixelHits));
+      else if (!classifier_.is(TrackClassifier::CWeakDecay) && !classifier_.is(TrackClassifier::PrimaryVertex))
+        histogram_data_[3].push_back(histogram_element_t(sdl, dta, d0, dz, ips, pt, chi2, hits, pixelHits));
+      else if (classifier_.is(TrackClassifier::CWeakDecay))
+        histogram_data_[1].push_back(histogram_element_t(sdl, dta, d0, dz, ips, pt, chi2, hits, pixelHits));
+      else
+        histogram_data_[2].push_back(histogram_element_t(sdl, dta, d0, dz, ips, pt, chi2, hits, pixelHits));
     }
+  }
 }
 
 DEFINE_FWK_MODULE(QualityCutsAnalyzer);
diff --git a/SimTracker/TrackHistory/plugins/SVTagInfoValidationAnalyzer.cc b/SimTracker/TrackHistory/plugins/SVTagInfoValidationAnalyzer.cc
index 3e53085bafbe5..9464410d72257 100644
--- a/SimTracker/TrackHistory/plugins/SVTagInfoValidationAnalyzer.cc
+++ b/SimTracker/TrackHistory/plugins/SVTagInfoValidationAnalyzer.cc
@@ -1,32 +1,32 @@
-#include <map>
-#include <string>
-#include <cmath>
-#include <Math/Functions.h>
-#include <Math/SVector.h>
-#include <Math/SMatrix.h>
-#include "TH1F.h"
+#include "DataFormats/BTauReco/interface/SecondaryVertexTagInfo.h"
 #include "TH1D.h"
+#include "TH1F.h"
 #include "TH2D.h"
 #include "TMath.h"
-#include "DataFormats/BTauReco/interface/SecondaryVertexTagInfo.h"
+#include <Math/Functions.h>
+#include <Math/SMatrix.h>
+#include <Math/SVector.h>
+#include <cmath>
+#include <map>
+#include <string>
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
 
-#include "SimTracker/TrackHistory/interface/VertexClassifierByProxy.h"
 #include "CommonTools/Statistics/interface/ChiSquaredProbability.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 #include "DataFormats/Math/interface/Vector.h"
-#include "TROOT.h"
 #include "Math/VectorUtil.h"
-#include <TVector3.h>
+#include "SimTracker/TrackHistory/interface/VertexClassifierByProxy.h"
+#include "TROOT.h"
 #include <Math/GenVector/PxPyPzE4D.h>
 #include <Math/GenVector/PxPyPzM4D.h>
-#include "DataFormats/Math/interface/LorentzVector.h"
+#include <TVector3.h>
 //
 // class decleration
 //
@@ -34,168 +34,166 @@ using namespace reco;
 using namespace std;
 using namespace edm;
 
-class SVTagInfoValidationAnalyzer : public edm::one::EDAnalyzer<>
-{
-
+class SVTagInfoValidationAnalyzer : public edm::one::EDAnalyzer<> {
 public:
-
-    explicit SVTagInfoValidationAnalyzer(const edm::ParameterSet&);
+  explicit SVTagInfoValidationAnalyzer(const edm::ParameterSet &);
 
 private:
-
-    void analyze(const edm::Event&, const edm::EventSetup&) override;
-    void endJob() override ;
-    // Member data
-
-    VertexClassifierByProxy<reco::SecondaryVertexTagInfoCollection> classifier_;
-
-    Int_t numberVertexClassifier_;
-    edm::InputTag trackingTruth_;
-    edm::InputTag svTagInfoProducer_;
-
-    // Get the file service
-    edm::Service<TFileService> fs_;
-
-    Int_t n_event;
-    Int_t rs_total_nall ; 
-    Int_t rs_total_nsv ;
-    Int_t rs_total_nbv ;
-    Int_t rs_total_nbsv ;
-    Int_t rs_total_ncv ;
-    Int_t rs_total_nlv ;
-    Int_t total_nfake ;
-
-    Int_t sr_total_nall ; 
-    Int_t sr_total_nsv ;
-    Int_t sr_total_nbv ;
-    Int_t sr_total_nbsv ;
-    Int_t sr_total_ncv ;
-    Int_t sr_total_nlv ;
-    Int_t total_nmiss ;
-        
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
+  // Member data
+
+  VertexClassifierByProxy<reco::SecondaryVertexTagInfoCollection> classifier_;
+
+  Int_t numberVertexClassifier_;
+  edm::InputTag trackingTruth_;
+  edm::InputTag svTagInfoProducer_;
+
+  // Get the file service
+  edm::Service<TFileService> fs_;
+
+  Int_t n_event;
+  Int_t rs_total_nall;
+  Int_t rs_total_nsv;
+  Int_t rs_total_nbv;
+  Int_t rs_total_nbsv;
+  Int_t rs_total_ncv;
+  Int_t rs_total_nlv;
+  Int_t total_nfake;
+
+  Int_t sr_total_nall;
+  Int_t sr_total_nsv;
+  Int_t sr_total_nbv;
+  Int_t sr_total_nbsv;
+  Int_t sr_total_ncv;
+  Int_t sr_total_nlv;
+  Int_t total_nmiss;
 
   // Bookeeping of all the histograms per category
   void bookRecoToSim(std::string const &);
-    void bookSimToReco(std::string const &);
+  void bookSimToReco(std::string const &);
 
-    // Fill all histogram per category
-    void fillRecoToSim(std::string const &, reco::Vertex const &, TrackingVertexRef const &);
-    void fillSimToReco(std::string const &, reco::VertexBaseRef const &, TrackingVertexRef const &);
-
-    // Histogram handlers
-    std::map<std::string, TH1D *> TH1Index_;
+  // Fill all histogram per category
+  void fillRecoToSim(std::string const &, reco::Vertex const &, TrackingVertexRef const &);
+  void fillSimToReco(std::string const &, reco::VertexBaseRef const &, TrackingVertexRef const &);
 
+  // Histogram handlers
+  std::map<std::string, TH1D *> TH1Index_;
 };
 
+SVTagInfoValidationAnalyzer::SVTagInfoValidationAnalyzer(const edm::ParameterSet &config)
+    : classifier_(config, consumesCollector()) {
+  // Initialize counters
+  n_event = 0;
+  rs_total_nall = 0;
+  rs_total_nsv = 0;
+  rs_total_nbv = 0;
+  rs_total_nbsv = 0;
+  rs_total_ncv = 0;
+  rs_total_nlv = 0;
+  total_nfake = 0;
+
+  sr_total_nall = 0;
+  sr_total_nsv = 0;
+  sr_total_nbv = 0;
+  sr_total_nbsv = 0;
+  sr_total_ncv = 0;
+  sr_total_nlv = 0;
+  total_nmiss = 0;
+
+  // Get the track collection
+  svTagInfoProducer_ = config.getUntrackedParameter<edm::InputTag>("svTagInfoProducer");
+  consumes<reco::SecondaryVertexTagInfoCollection>(svTagInfoProducer_);
+
+  // Name of the traking pariticle collection
+  trackingTruth_ = config.getUntrackedParameter<edm::InputTag>("trackingTruth");
+  consumes<TrackingVertexCollection>(trackingTruth_);
+
+  // Number of track categories
+  numberVertexClassifier_ = VertexCategories::Unknown + 1;
+
+  // Define histogram for counting categories
+  TH1Index_["VertexClassifier"] = fs_->make<TH1D>("VertexClassifier",
+                                                  "Frequency for the different track categories",
+                                                  numberVertexClassifier_,
+                                                  -0.5,
+                                                  numberVertexClassifier_ - 0.5);
+
+  //--- RecoToSim
+  TH1Index_["rs_All_MatchQuality"] = fs_->make<TH1D>("rs_All_MatchQuality", "Quality of Match", 51, -0.01, 1.01);
+  TH1Index_["rs_All_FlightDistance2d"] =
+      fs_->make<TH1D>("rs_All_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5);
+  TH1Index_["rs_SecondaryVertex_FlightDistance2d"] =
+      fs_->make<TH1D>("rs_SecondaryVertex_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5);
+  TH1Index_["rs_BSV_FlightDistance2d"] =
+      fs_->make<TH1D>("rs_BSV_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5);
+  TH1Index_["rs_BWeakDecay_FlightDistance2d"] =
+      fs_->make<TH1D>("rs_BWeakDecay_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5);
+  TH1Index_["rs_CWeakDecay_FlightDistance2d"] =
+      fs_->make<TH1D>("rs_CWeakDecay_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5);
+  TH1Index_["rs_Light_FlightDistance2d"] =
+      fs_->make<TH1D>("rs_Light_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5);
+
+  TH1Index_["rs_All_nRecVtx"] = fs_->make<TH1D>("rs_All_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  TH1Index_["rs_SecondaryVertex_nRecVtx"] =
+      fs_->make<TH1D>("rs_SecondaryVertex_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  TH1Index_["rs_BSV_nRecVtx"] = fs_->make<TH1D>("rs_BSV_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  TH1Index_["rs_BWeakDecay_nRecVtx"] =
+      fs_->make<TH1D>("rs_BWeakDecay_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  TH1Index_["rs_CWeakDecay_nRecVtx"] =
+      fs_->make<TH1D>("rs_CWeakDecay_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  TH1Index_["rs_Light_nRecVtx"] = fs_->make<TH1D>("rs_Light_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+
+  //--- SimToReco
+  TH1Index_["sr_All_MatchQuality"] = fs_->make<TH1D>("sr_All_MatchQuality", "Quality of Match", 51, -0.01, 1.01);
+  TH1Index_["sr_All_nRecVtx"] = fs_->make<TH1D>("sr_All_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  TH1Index_["sr_SecondaryVertex_nRecVtx"] =
+      fs_->make<TH1D>("sr_SecondaryVertex_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  TH1Index_["sr_BSV_nRecVtx"] = fs_->make<TH1D>("sr_BSV_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  TH1Index_["sr_BWeakDecay_nRecVtx"] =
+      fs_->make<TH1D>("sr_BWeakDecay_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  TH1Index_["sr_CWeakDecay_nRecVtx"] =
+      fs_->make<TH1D>("sr_CWeakDecay_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  TH1Index_["sr_Light_nRecVtx"] = fs_->make<TH1D>("sr_Light_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+
+  // Set the proper categories names
+  for (Int_t i = 0; i < numberVertexClassifier_; ++i)
+    TH1Index_["VertexClassifier"]->GetXaxis()->SetBinLabel(i + 1, VertexCategories::Names[i]);
+
+  // book histograms
+  bookRecoToSim("rs_All");
+  bookRecoToSim("rs_SecondaryVertex");
+  bookRecoToSim("rs_BSV");
+  bookRecoToSim("rs_BWeakDecay");
+  bookRecoToSim("rs_CWeakDecay");
+  bookRecoToSim("rs_Light");
+
+  bookSimToReco("sr_All");
+  bookSimToReco("sr_SecondaryVertex");
+  bookSimToReco("sr_BSV");
+  bookSimToReco("sr_BWeakDecay");
+  bookSimToReco("sr_CWeakDecay");
+  bookSimToReco("sr_Light");
+}
 
-SVTagInfoValidationAnalyzer::SVTagInfoValidationAnalyzer(const edm::ParameterSet& config) : classifier_(config, consumesCollector())
-{
-  //Initialize counters
-    n_event = 0;
-    rs_total_nall = 0; 
-    rs_total_nsv = 0;
-    rs_total_nbv = 0;
-    rs_total_nbsv = 0;
-    rs_total_ncv = 0;
-    rs_total_nlv = 0;
-    total_nfake = 0;
-
-    sr_total_nall = 0; 
-    sr_total_nsv = 0;
-    sr_total_nbv = 0;
-    sr_total_nbsv = 0;
-    sr_total_ncv = 0;
-    sr_total_nlv = 0;
-    total_nmiss = 0;
-
-    // Get the track collection
-    svTagInfoProducer_ = config.getUntrackedParameter<edm::InputTag> ( "svTagInfoProducer" );
-    consumes<reco::SecondaryVertexTagInfoCollection>(svTagInfoProducer_);
-
-    // Name of the traking pariticle collection
-    trackingTruth_ = config.getUntrackedParameter<edm::InputTag> ( "trackingTruth" );
-    consumes<TrackingVertexCollection>(trackingTruth_);
-
-    // Number of track categories
-    numberVertexClassifier_ = VertexCategories::Unknown+1;
-
-    // Define histogram for counting categories
-    TH1Index_["VertexClassifier"] = fs_->make<TH1D>(
-                                        "VertexClassifier",
-                                        "Frequency for the different track categories",
-                                        numberVertexClassifier_,
-                                        -0.5,
-                                        numberVertexClassifier_ - 0.5
-                                    );
-    
-    //--- RecoToSim
-    TH1Index_["rs_All_MatchQuality"]= fs_->make<TH1D>( "rs_All_MatchQuality", "Quality of Match", 51, -0.01, 1.01 );
-    TH1Index_["rs_All_FlightDistance2d"]= fs_->make<TH1D>( "rs_All_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5 );
-    TH1Index_["rs_SecondaryVertex_FlightDistance2d"]= fs_->make<TH1D>( "rs_SecondaryVertex_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5 );
-    TH1Index_["rs_BSV_FlightDistance2d"]= fs_->make<TH1D>( "rs_BSV_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5 );
-    TH1Index_["rs_BWeakDecay_FlightDistance2d"]= fs_->make<TH1D>( "rs_BWeakDecay_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5 );
-    TH1Index_["rs_CWeakDecay_FlightDistance2d"]= fs_->make<TH1D>( "rs_CWeakDecay_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5 );
-    TH1Index_["rs_Light_FlightDistance2d"]= fs_->make<TH1D>( "rs_Light_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5 );
-
-    TH1Index_["rs_All_nRecVtx"]= fs_->make<TH1D>( "rs_All_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    TH1Index_["rs_SecondaryVertex_nRecVtx"]= fs_->make<TH1D>( "rs_SecondaryVertex_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    TH1Index_["rs_BSV_nRecVtx"]= fs_->make<TH1D>( "rs_BSV_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    TH1Index_["rs_BWeakDecay_nRecVtx"]= fs_->make<TH1D>( "rs_BWeakDecay_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    TH1Index_["rs_CWeakDecay_nRecVtx"]= fs_->make<TH1D>( "rs_CWeakDecay_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    TH1Index_["rs_Light_nRecVtx"]= fs_->make<TH1D>( "rs_Light_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-
-
-    //--- SimToReco
-    TH1Index_["sr_All_MatchQuality"]= fs_->make<TH1D>( "sr_All_MatchQuality", "Quality of Match", 51, -0.01, 1.01);
-    TH1Index_["sr_All_nRecVtx"]= fs_->make<TH1D>( "sr_All_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    TH1Index_["sr_SecondaryVertex_nRecVtx"]= fs_->make<TH1D>( "sr_SecondaryVertex_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    TH1Index_["sr_BSV_nRecVtx"]= fs_->make<TH1D>( "sr_BSV_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    TH1Index_["sr_BWeakDecay_nRecVtx"]= fs_->make<TH1D>( "sr_BWeakDecay_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    TH1Index_["sr_CWeakDecay_nRecVtx"]= fs_->make<TH1D>( "sr_CWeakDecay_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    TH1Index_["sr_Light_nRecVtx"]= fs_->make<TH1D>( "sr_Light_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );  
-
-
-    // Set the proper categories names
-    for (Int_t i = 0; i < numberVertexClassifier_; ++i)
-        TH1Index_["VertexClassifier"]->GetXaxis()->SetBinLabel(i+1, VertexCategories::Names[i]);
-
-    // book histograms
-    bookRecoToSim("rs_All");
-    bookRecoToSim("rs_SecondaryVertex");
-    bookRecoToSim("rs_BSV");
-    bookRecoToSim("rs_BWeakDecay");
-    bookRecoToSim("rs_CWeakDecay");
-    bookRecoToSim("rs_Light");
-
-    bookSimToReco("sr_All"); 
-    bookSimToReco("sr_SecondaryVertex");
-    bookSimToReco("sr_BSV");  
-    bookSimToReco("sr_BWeakDecay");  
-    bookSimToReco("sr_CWeakDecay");  
-    bookSimToReco("sr_Light");  
-}   
-
-
-void SVTagInfoValidationAnalyzer::analyze(const edm::Event& event, const edm::EventSetup& setup)
-{
+void SVTagInfoValidationAnalyzer::analyze(const edm::Event &event, const edm::EventSetup &setup) {
   ++n_event;
 
   std::cout << "*** Analyzing " << event.id() << " n_event = " << n_event << std::endl << std::endl;
 
   // Set the classifier for a new event
   classifier_.newEvent(event, setup);
-  
 
   // Vertex collection
   edm::Handle<reco::SecondaryVertexTagInfoCollection> svTagInfoCollection;
   event.getByLabel(svTagInfoProducer_, svTagInfoCollection);
 
   // Get a constant reference to the track history associated to the classifier
-  VertexHistory const & tracer = classifier_.history();
+  VertexHistory const &tracer = classifier_.history();
+
+  cout << "* Event " << n_event << " ; svTagInfoCollection->size() = " << svTagInfoCollection->size() << endl;
 
-  cout << "* Event " << n_event << " ; svTagInfoCollection->size() = " << svTagInfoCollection->size() << endl; 
-  
-  int rs_nall = 0; 
+  int rs_nall = 0;
   int rs_nsv = 0;
   int rs_nbv = 0;
   int rs_nbsv = 0;
@@ -203,7 +201,7 @@ void SVTagInfoValidationAnalyzer::analyze(const edm::Event& event, const edm::Ev
   int rs_nlv = 0;
   int nfake = 0;
 
-  int sr_nall = 0; 
+  int sr_nall = 0;
   int sr_nsv = 0;
   int sr_nbv = 0;
   int sr_nbsv = 0;
@@ -212,192 +210,174 @@ void SVTagInfoValidationAnalyzer::analyze(const edm::Event& event, const edm::Ev
   int nmiss = 0;
 
   // Loop over the svTagInfo collection.
-  for (std::size_t index = 0; index < svTagInfoCollection->size(); ++index){
-
+  for (std::size_t index = 0; index < svTagInfoCollection->size(); ++index) {
     reco::SecondaryVertexTagInfoRef svTagInfo(svTagInfoCollection, index);
 
     // Loop over the vertexes in svTagInfo
-    for ( std::size_t vindex = 0; vindex < svTagInfo->nVertices(); ++vindex ){
-
- 
+    for (std::size_t vindex = 0; vindex < svTagInfo->nVertices(); ++vindex) {
       // Classify the vertices
       classifier_.evaluate(svTagInfo, vindex);
 
-      //quality of the match
+      // quality of the match
       double rs_quality = tracer.quality();
- 
 
       // Fill the histogram with the categories
       for (Int_t i = 0; i != numberVertexClassifier_; ++i) {
-
-	if ( classifier_.is( (VertexCategories::Category) i ) ) {
-
-	  TH1Index_["VertexClassifier"]->Fill(i);
-	}
+        if (classifier_.is((VertexCategories::Category)i)) {
+          TH1Index_["VertexClassifier"]->Fill(i);
+        }
       }
-      if ( !classifier_.is(VertexCategories::Fake) ) {
-
+      if (!classifier_.is(VertexCategories::Fake)) {
         cout << "R2S: MatchQuality = " << rs_quality << endl;
 
-        TH1Index_["rs_All_MatchQuality"]->Fill( rs_quality );
-	fillRecoToSim("rs_All", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
-	TH1Index_["rs_All_FlightDistance2d"]->Fill( svTagInfo->flightDistance( vindex, true ).value() );
+        TH1Index_["rs_All_MatchQuality"]->Fill(rs_quality);
+        fillRecoToSim("rs_All", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
+        TH1Index_["rs_All_FlightDistance2d"]->Fill(svTagInfo->flightDistance(vindex, true).value());
         rs_nall++;
 
-	if ( classifier_.is(VertexCategories::SecondaryVertex) ) {
-
-	  //cout << "    R2S VertexCategories::SecondaryVertex" << endl;
-	  fillRecoToSim("rs_SecondaryVertex", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
-	  TH1Index_["rs_SecondaryVertex_FlightDistance2d"]->Fill( svTagInfo->flightDistance( vindex, true ).value() );
+        if (classifier_.is(VertexCategories::SecondaryVertex)) {
+          // cout << "    R2S VertexCategories::SecondaryVertex" << endl;
+          fillRecoToSim("rs_SecondaryVertex", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
+          TH1Index_["rs_SecondaryVertex_FlightDistance2d"]->Fill(svTagInfo->flightDistance(vindex, true).value());
           rs_nsv++;
-	}
-        
-	if ( classifier_.is(VertexCategories::BWeakDecay) ) {
+        }
 
-	  //cout << "    R2S VertexCategories::BWeakDecay" << endl;
-	  fillRecoToSim("rs_BWeakDecay", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
-	  TH1Index_["rs_BWeakDecay_FlightDistance2d"]->Fill( svTagInfo->flightDistance( vindex, true ).value() );
+        if (classifier_.is(VertexCategories::BWeakDecay)) {
+          // cout << "    R2S VertexCategories::BWeakDecay" << endl;
+          fillRecoToSim("rs_BWeakDecay", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
+          TH1Index_["rs_BWeakDecay_FlightDistance2d"]->Fill(svTagInfo->flightDistance(vindex, true).value());
           rs_nbv++;
 
-          if ( classifier_.is(VertexCategories::SecondaryVertex) ) {
-	    //cout << "    R2S VertexCategories::BWeakDecay SecondaryVertex" << endl;
-	    fillRecoToSim("rs_BSV", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
-            TH1Index_["rs_BSV_FlightDistance2d"]->Fill( svTagInfo->flightDistance( vindex, true ).value() );
-	    rs_nbsv++;	 
-
-          }          
-	}//BWeakDecay
-
-	else if ( classifier_.is(VertexCategories::CWeakDecay) ) {
-
-	  //cout << "    R2S VertexCategories::CWeakDecay" << endl;
-	  fillRecoToSim("rs_CWeakDecay", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
-	  TH1Index_["rs_CWeakDecay_FlightDistance2d"]->Fill( svTagInfo->flightDistance( vindex, true ).value() );
+          if (classifier_.is(VertexCategories::SecondaryVertex)) {
+            // cout << "    R2S VertexCategories::BWeakDecay SecondaryVertex" <<
+            // endl;
+            fillRecoToSim("rs_BSV", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
+            TH1Index_["rs_BSV_FlightDistance2d"]->Fill(svTagInfo->flightDistance(vindex, true).value());
+            rs_nbsv++;
+          }
+        }  // BWeakDecay
+
+        else if (classifier_.is(VertexCategories::CWeakDecay)) {
+          // cout << "    R2S VertexCategories::CWeakDecay" << endl;
+          fillRecoToSim("rs_CWeakDecay", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
+          TH1Index_["rs_CWeakDecay_FlightDistance2d"]->Fill(svTagInfo->flightDistance(vindex, true).value());
           rs_ncv++;
 
-	}                
-	else {
-	  //cout << "    R2S Light (rest of categories)" << endl;
-	  fillRecoToSim("rs_Light", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
-	  TH1Index_["rs_Light_FlightDistance2d"]->Fill( svTagInfo->flightDistance( vindex, true ).value() );
+        } else {
+          // cout << "    R2S Light (rest of categories)" << endl;
+          fillRecoToSim("rs_Light", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
+          TH1Index_["rs_Light_FlightDistance2d"]->Fill(svTagInfo->flightDistance(vindex, true).value());
           rs_nlv++;
-	}
-      }//end if classifier
+        }
+      }  // end if classifier
 
       else {
         cout << "    VertexCategories::Fake!!" << endl;
         nfake++;
       }
 
-   }//end loop over vertices in svTagInfo
+    }  // end loop over vertices in svTagInfo
 
-  }//loop over svTagInfo
+  }  // loop over svTagInfo
 
-  TH1Index_["rs_All_nRecVtx"]->Fill( rs_nall );
-  TH1Index_["rs_SecondaryVertex_nRecVtx"]->Fill( rs_nsv );
-  TH1Index_["rs_BWeakDecay_nRecVtx"]->Fill( rs_nbv );
-  TH1Index_["rs_BSV_nRecVtx"]->Fill( rs_nbsv );
-  TH1Index_["rs_CWeakDecay_nRecVtx"]->Fill( rs_ncv );  
-  TH1Index_["rs_Light_nRecVtx"]->Fill( rs_nlv );  
-  cout << endl;  
+  TH1Index_["rs_All_nRecVtx"]->Fill(rs_nall);
+  TH1Index_["rs_SecondaryVertex_nRecVtx"]->Fill(rs_nsv);
+  TH1Index_["rs_BWeakDecay_nRecVtx"]->Fill(rs_nbv);
+  TH1Index_["rs_BSV_nRecVtx"]->Fill(rs_nbsv);
+  TH1Index_["rs_CWeakDecay_nRecVtx"]->Fill(rs_ncv);
+  TH1Index_["rs_Light_nRecVtx"]->Fill(rs_nlv);
+  cout << endl;
 
   //----------------------------------------------------------------
   // SIM TO RECO!
 
   // Vertex collection
-  edm::Handle<TrackingVertexCollection>  TVCollection;
+  edm::Handle<TrackingVertexCollection> TVCollection;
   event.getByLabel(trackingTruth_, TVCollection);
-    
+
   // Loop over the TV collection.
-  for (std::size_t index = 0; index < TVCollection->size(); ++index){
-        
+  for (std::size_t index = 0; index < TVCollection->size(); ++index) {
     TrackingVertexRef trackingVertex(TVCollection, index);
 
     classifier_.evaluate(trackingVertex);
- 	
+
     double sr_quality = tracer.quality();
- 
-    if ( classifier_.is(VertexCategories::Reconstructed) ) {
 
+    if (classifier_.is(VertexCategories::Reconstructed)) {
       cout << "S2R: MatchQuality = " << sr_quality << endl;
 
-      //cout << "    S2R VertexCategories::Reconstructed" << endl;
-      TH1Index_["sr_All_MatchQuality"]->Fill( sr_quality );      
+      // cout << "    S2R VertexCategories::Reconstructed" << endl;
+      TH1Index_["sr_All_MatchQuality"]->Fill(sr_quality);
       fillSimToReco("sr_All", tracer.recoVertex(), trackingVertex);
       sr_nall++;
 
-      if ( classifier_.is(VertexCategories::SecondaryVertex) ) {
-
-	//cout << "    S2R VertexCategories::Reconstructed::SecondaryVertex" << endl;
+      if (classifier_.is(VertexCategories::SecondaryVertex)) {
+        // cout << "    S2R VertexCategories::Reconstructed::SecondaryVertex" <<
+        // endl;
         fillSimToReco("sr_SecondaryVertex", tracer.recoVertex(), trackingVertex);
         sr_nsv++;
       }
 
-      if ( classifier_.is(VertexCategories::BWeakDecay) ) {
-
-	//cout << "    S2R VertexCategories::Reconstructed::BWeakDecay" << endl;
+      if (classifier_.is(VertexCategories::BWeakDecay)) {
+        // cout << "    S2R VertexCategories::Reconstructed::BWeakDecay" <<
+        // endl;
         fillSimToReco("sr_BWeakDecay", tracer.recoVertex(), trackingVertex);
         sr_nbv++;
 
-        if ( classifier_.is(VertexCategories::SecondaryVertex) ) {
+        if (classifier_.is(VertexCategories::SecondaryVertex)) {
+          // cout << "    S2R VertexCategories::Reconstructed::BWeakDecay
+          // SecondaryVertex" << endl;
+          fillSimToReco("sr_BSV", tracer.recoVertex(), trackingVertex);
+          sr_nbsv++;
+        }
 
-	  //cout << "    S2R VertexCategories::Reconstructed::BWeakDecay SecondaryVertex" << endl;
-         fillSimToReco("sr_BSV", tracer.recoVertex(), trackingVertex);
-         sr_nbsv++;
-	}
-    
-      }//BWeakDecay
+      }  // BWeakDecay
 
-      else if ( classifier_.is(VertexCategories::CWeakDecay) ) {
-
-	//cout << "    S2R VertexCategories::CWeakDecay" << endl;
-	fillSimToReco("sr_CWeakDecay", tracer.recoVertex(), trackingVertex);
+      else if (classifier_.is(VertexCategories::CWeakDecay)) {
+        // cout << "    S2R VertexCategories::CWeakDecay" << endl;
+        fillSimToReco("sr_CWeakDecay", tracer.recoVertex(), trackingVertex);
         sr_ncv++;
       }
- 
-      else {
 
-	//cout << "    S2R Light (rest of categories)" << endl;
-	fillSimToReco("sr_Light", tracer.recoVertex(), trackingVertex);
+      else {
+        // cout << "    S2R Light (rest of categories)" << endl;
+        fillSimToReco("sr_Light", tracer.recoVertex(), trackingVertex);
         sr_nlv++;
       }
 
-    }//Reconstructed
+    }  // Reconstructed
     else {
-      //cout << "##### Not reconstructed!" << endl;
+      // cout << "##### Not reconstructed!" << endl;
       nmiss++;
     }
 
-  }//TVCollection.size()
+  }  // TVCollection.size()
 
-  TH1Index_["sr_All_nRecVtx"]->Fill( sr_nall );
-  TH1Index_["sr_SecondaryVertex_nRecVtx"]->Fill( sr_nsv );
-  TH1Index_["sr_BWeakDecay_nRecVtx"]->Fill( sr_nbv );
-  TH1Index_["sr_BSV_nRecVtx"]->Fill( sr_nbsv );
-  TH1Index_["sr_CWeakDecay_nRecVtx"]->Fill( sr_ncv );  
-  TH1Index_["sr_Light_nRecVtx"]->Fill( rs_nlv );  
+  TH1Index_["sr_All_nRecVtx"]->Fill(sr_nall);
+  TH1Index_["sr_SecondaryVertex_nRecVtx"]->Fill(sr_nsv);
+  TH1Index_["sr_BWeakDecay_nRecVtx"]->Fill(sr_nbv);
+  TH1Index_["sr_BSV_nRecVtx"]->Fill(sr_nbsv);
+  TH1Index_["sr_CWeakDecay_nRecVtx"]->Fill(sr_ncv);
+  TH1Index_["sr_Light_nRecVtx"]->Fill(rs_nlv);
 
-  rs_total_nall += rs_nall;  
+  rs_total_nall += rs_nall;
   rs_total_nsv += rs_nsv;
   rs_total_nbv += rs_nbv;
   rs_total_nbsv += rs_nbsv;
-  rs_total_ncv += rs_ncv ;
+  rs_total_ncv += rs_ncv;
   rs_total_nlv += rs_nlv;
   total_nfake += nfake;
 
-  sr_total_nall += sr_nall; 
+  sr_total_nall += sr_nall;
   sr_total_nsv += sr_nsv;
   sr_total_nbv += sr_nbv;
   sr_total_nbsv += sr_nbsv;
   sr_total_ncv += sr_ncv;
   sr_total_nlv += sr_nlv;
   total_nmiss += nmiss;
-
-
 }
 
-
-void SVTagInfoValidationAnalyzer::bookRecoToSim(std::string const & prefix){
+void SVTagInfoValidationAnalyzer::bookRecoToSim(std::string const &prefix) {
   // Book pull histograms
 
   std::string name = prefix + "_Pullx";
@@ -407,18 +387,18 @@ void SVTagInfoValidationAnalyzer::bookRecoToSim(std::string const & prefix){
   name = prefix + "_Pullz";
   TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, -10., 10.);
 
-   name = prefix + "_Resx";
+  name = prefix + "_Resx";
   TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, -0.05, 0.05);
   name = prefix + "_Resy";
-  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, -0.05, 0.05); 
+  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, -0.05, 0.05);
   name = prefix + "_Resz";
-  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, -0.05, 0.05); 
+  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, -0.05, 0.05);
 
   name = prefix + "_Chi2Norm";
-  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, 0, 10.); 
+  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, 0, 10.);
   name = prefix + "_Chi2Prob";
-  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, 0., 1.); 
- 
+  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, 0., 1.);
+
   name = prefix + "_nRecTrks";
   TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 501, -0.5, 500.5);
 
@@ -444,7 +424,7 @@ void SVTagInfoValidationAnalyzer::bookRecoToSim(std::string const & prefix){
   TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 200, -3., 3.);
 
   name = prefix + "_nSimTrks";
-  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 501, -0.5, 500.5); 
+  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 501, -0.5, 500.5);
 
   name = prefix + "_SimPt";
   TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 2000, 0., 1000.);
@@ -454,18 +434,15 @@ void SVTagInfoValidationAnalyzer::bookRecoToSim(std::string const & prefix){
 
   name = prefix + "_SimCharge";
   TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 21, -0.5, 20.5);
-  
+
   name = prefix + "_SimTrackPt";
   TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 500, 0., 500.);
 
   name = prefix + "_SimTrackEta";
   TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 200, -3., 3.);
-
-
 }
 
-
-void SVTagInfoValidationAnalyzer::bookSimToReco(std::string const & prefix){
+void SVTagInfoValidationAnalyzer::bookSimToReco(std::string const &prefix) {
   // Book pull histograms
 
   std::string name = prefix + "_Pullx";
@@ -475,18 +452,18 @@ void SVTagInfoValidationAnalyzer::bookSimToReco(std::string const & prefix){
   name = prefix + "_Pullz";
   TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, -10., 10.);
 
-   name = prefix + "_Resx";
+  name = prefix + "_Resx";
   TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, -0.05, 0.05);
   name = prefix + "_Resy";
-  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, -0.05, 0.05); 
+  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, -0.05, 0.05);
   name = prefix + "_Resz";
-  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, -0.05, 0.05); 
+  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, -0.05, 0.05);
 
   name = prefix + "_Chi2Norm";
-  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, 0, 10.); 
+  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, 0, 10.);
   name = prefix + "_Chi2Prob";
-  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, 0., 1.); 
- 
+  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 100, 0., 1.);
+
   name = prefix + "_nRecTrks";
   TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 501, -0.5, 500.5);
 
@@ -512,7 +489,7 @@ void SVTagInfoValidationAnalyzer::bookSimToReco(std::string const & prefix){
   TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 200, -3., 3.);
 
   name = prefix + "_nSimTrks";
-  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 501, -0.5, 500.5); 
+  TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 501, -0.5, 500.5);
 
   name = prefix + "_SimPt";
   TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 2000, 0., 1000.);
@@ -522,95 +499,96 @@ void SVTagInfoValidationAnalyzer::bookSimToReco(std::string const & prefix){
 
   name = prefix + "_SimCharge";
   TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 21, -0.5, 20.5);
-  
+
   name = prefix + "_SimTrackPt";
   TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 500, 0., 500.);
 
   name = prefix + "_SimTrackEta";
   TH1Index_[name] = fs_->make<TH1D>(name.c_str(), name.c_str(), 200, -3., 3.);
-
-
 }
 
-
-void SVTagInfoValidationAnalyzer::fillRecoToSim(std::string const & prefix, reco::Vertex const & vertex, TrackingVertexRef const & simVertex)
-{
- 
-  double pullx = (vertex.x() - simVertex->position().x())/vertex.xError();
-  double pully = (vertex.y() - simVertex->position().y())/vertex.yError();
-  double pullz = (vertex.z() - simVertex->position().z())/vertex.zError();
+void SVTagInfoValidationAnalyzer::fillRecoToSim(std::string const &prefix,
+                                                reco::Vertex const &vertex,
+                                                TrackingVertexRef const &simVertex) {
+  double pullx = (vertex.x() - simVertex->position().x()) / vertex.xError();
+  double pully = (vertex.y() - simVertex->position().y()) / vertex.yError();
+  double pullz = (vertex.z() - simVertex->position().z()) / vertex.zError();
 
   double resx = vertex.x() - simVertex->position().x();
   double resy = vertex.y() - simVertex->position().y();
   double resz = vertex.z() - simVertex->position().z();
 
   double chi2norm = vertex.normalizedChi2();
-  double chi2prob = ChiSquaredProbability( vertex.chi2(), vertex.ndof() ); 
-
- double sum_weight = 0.;
- double weight = 0.;
- double tracksize =  vertex.tracksSize();
- math::XYZVector momentum;
- math::XYZTLorentzVector sum;
- int charge = 0;
-  double thePiMass = 0.13957;
-  for ( reco::Vertex::trackRef_iterator recDaughter = vertex.tracks_begin() ; recDaughter != vertex.tracks_end(); ++recDaughter) {
+  double chi2prob = ChiSquaredProbability(vertex.chi2(), vertex.ndof());
 
-    ROOT::Math::LorentzVector<ROOT::Math::PxPyPzM4D<double> > vec;
+  double sum_weight = 0.;
+  double weight = 0.;
+  double tracksize = vertex.tracksSize();
+  math::XYZVector momentum;
+  math::XYZTLorentzVector sum;
+  int charge = 0;
+  double thePiMass = 0.13957;
+  for (reco::Vertex::trackRef_iterator recDaughter = vertex.tracks_begin(); recDaughter != vertex.tracks_end();
+       ++recDaughter) {
+    ROOT::Math::LorentzVector<ROOT::Math::PxPyPzM4D<double>> vec;
 
-    vec.SetPx( (**recDaughter).px() );
-    vec.SetPy( (**recDaughter).py() );
-    vec.SetPz( (**recDaughter).pz() );
-    vec.SetM(thePiMass); 
+    vec.SetPx((**recDaughter).px());
+    vec.SetPy((**recDaughter).py());
+    vec.SetPz((**recDaughter).pz());
+    vec.SetM(thePiMass);
 
     sum += vec;
-  
-    weight = vertex.trackWeight(*recDaughter); 
+
+    weight = vertex.trackWeight(*recDaughter);
     sum_weight += weight;
 
     math::XYZVector p;
     p = (**recDaughter).momentum();
-    momentum += p; 
+    momentum += p;
 
     charge += (*recDaughter)->charge();
 
-    TH1Index_[prefix + "_RecTrackPt"]->Fill( (*recDaughter)->pt() );
-    TH1Index_[prefix + "_RecTrackEta"]->Fill( (*recDaughter)->eta() );      
-  }//end loop to recDaughters
-  //cout << "                   average sum of weights = " << sum_weight/tracksize << endl; 
-  
+    TH1Index_[prefix + "_RecTrackPt"]->Fill((*recDaughter)->pt());
+    TH1Index_[prefix + "_RecTrackEta"]->Fill((*recDaughter)->eta());
+  }  // end loop to recDaughters
+  // cout << "                   average sum of weights = " <<
+  // sum_weight/tracksize << endl;
+
   double mass = sum.M();
-  double pt = sqrt( momentum.Perp2() );
+  double pt = sqrt(momentum.Perp2());
   double eta = momentum.Eta();
 
   math::XYZVector simmomentum;
   int simcharge = 0;
-  for ( TrackingVertex::tp_iterator simDaughter = simVertex->daughterTracks_begin(); simDaughter != simVertex->daughterTracks_end(); ++simDaughter ){
-
+  for (TrackingVertex::tp_iterator simDaughter = simVertex->daughterTracks_begin();
+       simDaughter != simVertex->daughterTracks_end();
+       ++simDaughter) {
     math::XYZVector p;
     p = (**simDaughter).momentum();
-    simmomentum += p; 
+    simmomentum += p;
 
     simcharge += (*simDaughter)->charge();
 
-    TH1Index_[prefix + "_SimTrackPt"]->Fill( (*simDaughter)->pt() );
-    TH1Index_[prefix + "_SimTrackEta"]->Fill( (*simDaughter)->eta() );   
+    TH1Index_[prefix + "_SimTrackPt"]->Fill((*simDaughter)->pt());
+    TH1Index_[prefix + "_SimTrackEta"]->Fill((*simDaughter)->eta());
   }
 
-  double simpt = sqrt( simmomentum.Perp2() );
+  double simpt = sqrt(simmomentum.Perp2());
   double simeta = simmomentum.Eta();
 
-  //cout << "[fillRecoToSim]  vertex.tracksSize() = " << vertex.tracksSize() << " ; simVertex->nDaughterTracks() = " << simVertex->nDaughterTracks() << endl;  
+  // cout << "[fillRecoToSim]  vertex.tracksSize() = " << vertex.tracksSize() <<
+  // " ; simVertex->nDaughterTracks() = " << simVertex->nDaughterTracks() <<
+  // endl;
 
-  TH1Index_[prefix + "_nRecTrks"]->Fill( vertex.tracksSize() );
-  TH1Index_[prefix + "_nSimTrks"]->Fill( simVertex->nDaughterTracks() );
+  TH1Index_[prefix + "_nRecTrks"]->Fill(vertex.tracksSize());
+  TH1Index_[prefix + "_nSimTrks"]->Fill(simVertex->nDaughterTracks());
   TH1Index_[prefix + "_Pullx"]->Fill(pullx);
   TH1Index_[prefix + "_Pully"]->Fill(pully);
   TH1Index_[prefix + "_Pullz"]->Fill(pullz);
   TH1Index_[prefix + "_Resx"]->Fill(resx);
   TH1Index_[prefix + "_Resy"]->Fill(resy);
   TH1Index_[prefix + "_Resz"]->Fill(resz);
-  TH1Index_[prefix + "_AverageTrackWeight"]->Fill( sum_weight/tracksize );   
+  TH1Index_[prefix + "_AverageTrackWeight"]->Fill(sum_weight / tracksize);
   TH1Index_[prefix + "_Chi2Norm"]->Fill(chi2norm);
   TH1Index_[prefix + "_Chi2Prob"]->Fill(chi2prob);
   TH1Index_[prefix + "_RecPt"]->Fill(pt);
@@ -619,89 +597,91 @@ void SVTagInfoValidationAnalyzer::fillRecoToSim(std::string const & prefix, reco
   TH1Index_[prefix + "_Mass"]->Fill(mass);
   TH1Index_[prefix + "_SimPt"]->Fill(simpt);
   TH1Index_[prefix + "_SimEta"]->Fill(simeta);
-  TH1Index_[prefix + "_SimCharge"]->Fill(simcharge);  
+  TH1Index_[prefix + "_SimCharge"]->Fill(simcharge);
 }
 
-
-void SVTagInfoValidationAnalyzer::fillSimToReco(std::string const & prefix, reco::VertexBaseRef const & vertex, TrackingVertexRef const & simVertex)
-{
-
-  double pullx = (vertex->x() - simVertex->position().x())/vertex->xError();
-  double pully = (vertex->y() - simVertex->position().y())/vertex->yError();
-  double pullz = (vertex->z() - simVertex->position().z())/vertex->zError();
+void SVTagInfoValidationAnalyzer::fillSimToReco(std::string const &prefix,
+                                                reco::VertexBaseRef const &vertex,
+                                                TrackingVertexRef const &simVertex) {
+  double pullx = (vertex->x() - simVertex->position().x()) / vertex->xError();
+  double pully = (vertex->y() - simVertex->position().y()) / vertex->yError();
+  double pullz = (vertex->z() - simVertex->position().z()) / vertex->zError();
 
   double resx = vertex->x() - simVertex->position().x();
   double resy = vertex->y() - simVertex->position().y();
   double resz = vertex->z() - simVertex->position().z();
 
   double chi2norm = vertex->normalizedChi2();
-  double chi2prob = ChiSquaredProbability(vertex->chi2(), vertex->ndof()); 
+  double chi2prob = ChiSquaredProbability(vertex->chi2(), vertex->ndof());
 
   double sum_weight = 0.;
   double weight = 0.;
-  double tracksize =  vertex->tracksSize();
+  double tracksize = vertex->tracksSize();
   math::XYZVector momentum;
   math::XYZTLorentzVector sum;
   int charge = 0;
   double thePiMass = 0.13957;
-  for ( reco::Vertex::trackRef_iterator recDaughter = vertex->tracks_begin() ; recDaughter != vertex->tracks_end(); ++recDaughter ) {
+  for (reco::Vertex::trackRef_iterator recDaughter = vertex->tracks_begin(); recDaughter != vertex->tracks_end();
+       ++recDaughter) {
+    ROOT::Math::LorentzVector<ROOT::Math::PxPyPzM4D<double>> vec;
 
-    ROOT::Math::LorentzVector<ROOT::Math::PxPyPzM4D<double> > vec;
-
-    vec.SetPx( (**recDaughter).px() );
-    vec.SetPy( (**recDaughter).py() );
-    vec.SetPz( (**recDaughter).pz() );
-    vec.SetM(thePiMass); 
+    vec.SetPx((**recDaughter).px());
+    vec.SetPy((**recDaughter).py());
+    vec.SetPz((**recDaughter).pz());
+    vec.SetM(thePiMass);
 
     sum += vec;
-  
-    weight = vertex->trackWeight(*recDaughter); 
+
+    weight = vertex->trackWeight(*recDaughter);
     sum_weight += weight;
 
     math::XYZVector p;
     p = (**recDaughter).momentum();
-    momentum += p; 
+    momentum += p;
 
     charge += (*recDaughter)->charge();
 
-    TH1Index_[prefix + "_RecTrackPt"]->Fill( (*recDaughter)->pt() );
-    TH1Index_[prefix + "_RecTrackEta"]->Fill( (*recDaughter)->eta() );  
-  
+    TH1Index_[prefix + "_RecTrackPt"]->Fill((*recDaughter)->pt());
+    TH1Index_[prefix + "_RecTrackEta"]->Fill((*recDaughter)->eta());
   }
-  //cout << "                   average sum of weights = " << sum_weight/tracksize << endl; 
+  // cout << "                   average sum of weights = " <<
+  // sum_weight/tracksize << endl;
 
   double mass = sum.M();
-  double pt = sqrt( momentum.Perp2() );
+  double pt = sqrt(momentum.Perp2());
   double eta = momentum.Eta();
 
-   math::XYZVector simmomentum;
+  math::XYZVector simmomentum;
   int simcharge = 0;
-  for ( TrackingVertex::tp_iterator simDaughter = simVertex->daughterTracks_begin(); simDaughter != simVertex->daughterTracks_end(); ++simDaughter ){
-
+  for (TrackingVertex::tp_iterator simDaughter = simVertex->daughterTracks_begin();
+       simDaughter != simVertex->daughterTracks_end();
+       ++simDaughter) {
     math::XYZVector p;
     p = (**simDaughter).momentum();
-    simmomentum += p; 
+    simmomentum += p;
 
     simcharge += (*simDaughter)->charge();
 
-    TH1Index_[prefix + "_SimTrackPt"]->Fill( (*simDaughter)->pt() );
-    TH1Index_[prefix + "_SimTrackEta"]->Fill( (*simDaughter)->eta() );   
+    TH1Index_[prefix + "_SimTrackPt"]->Fill((*simDaughter)->pt());
+    TH1Index_[prefix + "_SimTrackEta"]->Fill((*simDaughter)->eta());
   }
 
-  double simpt = sqrt( simmomentum.Perp2() );
+  double simpt = sqrt(simmomentum.Perp2());
   double simeta = simmomentum.Eta();
 
-  //cout << "[fillSimToReco]  vertex->tracksSize() = " << vertex->tracksSize() << " ; simVertex->nDaughterTracks() = " << simVertex->nDaughterTracks() << endl;  
+  // cout << "[fillSimToReco]  vertex->tracksSize() = " << vertex->tracksSize()
+  // << " ; simVertex->nDaughterTracks() = " << simVertex->nDaughterTracks() <<
+  // endl;
 
-  TH1Index_[prefix + "_nRecTrks"]->Fill( vertex->tracksSize() );
-  TH1Index_[prefix + "_nSimTrks"]->Fill( simVertex->nDaughterTracks() );
+  TH1Index_[prefix + "_nRecTrks"]->Fill(vertex->tracksSize());
+  TH1Index_[prefix + "_nSimTrks"]->Fill(simVertex->nDaughterTracks());
   TH1Index_[prefix + "_Pullx"]->Fill(pullx);
   TH1Index_[prefix + "_Pully"]->Fill(pully);
   TH1Index_[prefix + "_Pullz"]->Fill(pullz);
   TH1Index_[prefix + "_Resx"]->Fill(resx);
   TH1Index_[prefix + "_Resy"]->Fill(resy);
   TH1Index_[prefix + "_Resz"]->Fill(resz);
-  TH1Index_[prefix + "_AverageTrackWeight"]->Fill( sum_weight/tracksize );   
+  TH1Index_[prefix + "_AverageTrackWeight"]->Fill(sum_weight / tracksize);
   TH1Index_[prefix + "_Chi2Norm"]->Fill(chi2norm);
   TH1Index_[prefix + "_Chi2Prob"]->Fill(chi2prob);
   TH1Index_[prefix + "_RecPt"]->Fill(pt);
@@ -710,33 +690,27 @@ void SVTagInfoValidationAnalyzer::fillSimToReco(std::string const & prefix, reco
   TH1Index_[prefix + "_Mass"]->Fill(mass);
   TH1Index_[prefix + "_SimPt"]->Fill(simpt);
   TH1Index_[prefix + "_SimEta"]->Fill(simeta);
-  TH1Index_[prefix + "_SimCharge"]->Fill(simcharge);  
-
+  TH1Index_[prefix + "_SimCharge"]->Fill(simcharge);
 }
 
-
-void 
-SVTagInfoValidationAnalyzer::endJob() {
-
+void SVTagInfoValidationAnalyzer::endJob() {
   std::cout << std::endl;
   std::cout << " ====== Total Number of analyzed events: " << n_event << " ====== " << std::endl;
   std::cout << " ====== Total Number of R2S All:                         " << rs_total_nall << " ====== " << std::endl;
-  std::cout << " ====== Total Number of R2S SecondaryVertex:             " << rs_total_nsv  << " ====== " << std::endl;
-  std::cout << " ====== Total Number of R2S BWeakDecay:                  " << rs_total_nbv  << " ====== " << std::endl;
+  std::cout << " ====== Total Number of R2S SecondaryVertex:             " << rs_total_nsv << " ====== " << std::endl;
+  std::cout << " ====== Total Number of R2S BWeakDecay:                  " << rs_total_nbv << " ====== " << std::endl;
   std::cout << " ====== Total Number of R2S BWeakDecay::SecondaryVertex: " << rs_total_nbsv << " ====== " << std::endl;
-  std::cout << " ====== Total Number of R2S CWeakDecay:                  " << rs_total_ncv  << " ====== " << std::endl;
-  std::cout << " ====== Total Number of R2S Light:                       " << rs_total_nlv  << " ====== " << std::endl;
-  std::cout << std::endl; 
+  std::cout << " ====== Total Number of R2S CWeakDecay:                  " << rs_total_ncv << " ====== " << std::endl;
+  std::cout << " ====== Total Number of R2S Light:                       " << rs_total_nlv << " ====== " << std::endl;
+  std::cout << std::endl;
   std::cout << " ====== Total Number of S2R All:                         " << sr_total_nall << " ====== " << std::endl;
-  std::cout << " ====== Total Number of S2R SecondaryVertex:             " << sr_total_nsv  << " ====== " << std::endl;
-  std::cout << " ====== Total Number of S2R BWeakDecay:                  " << sr_total_nbv  << " ====== " << std::endl;
+  std::cout << " ====== Total Number of S2R SecondaryVertex:             " << sr_total_nsv << " ====== " << std::endl;
+  std::cout << " ====== Total Number of S2R BWeakDecay:                  " << sr_total_nbv << " ====== " << std::endl;
   std::cout << " ====== Total Number of S2R BWeakDecay::SecondaryVertex: " << sr_total_nbsv << " ====== " << std::endl;
-  std::cout << " ====== Total Number of S2R CWeakDecay:                  " << sr_total_ncv  << " ====== " << std::endl;
-  std::cout << " ====== Total Number of S2R Light:                       " << sr_total_nlv  << " ====== " << std::endl;
-  std::cout << std::endl; 
-  std::cout << " ====== Total Number of Fake Vertices:              " << total_nfake   << " ====== " << std::endl;
- 
-} 
-
+  std::cout << " ====== Total Number of S2R CWeakDecay:                  " << sr_total_ncv << " ====== " << std::endl;
+  std::cout << " ====== Total Number of S2R Light:                       " << sr_total_nlv << " ====== " << std::endl;
+  std::cout << std::endl;
+  std::cout << " ====== Total Number of Fake Vertices:              " << total_nfake << " ====== " << std::endl;
+}
 
 DEFINE_FWK_MODULE(SVTagInfoValidationAnalyzer);
diff --git a/SimTracker/TrackHistory/plugins/SecondaryVertexTagInfoProxy.cc b/SimTracker/TrackHistory/plugins/SecondaryVertexTagInfoProxy.cc
index a300e94a8b039..7e1d100d16a1d 100644
--- a/SimTracker/TrackHistory/plugins/SecondaryVertexTagInfoProxy.cc
+++ b/SimTracker/TrackHistory/plugins/SecondaryVertexTagInfoProxy.cc
@@ -8,80 +8,70 @@
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/global/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-
 //
 // class decleration
 //
 
-class SecondaryVertexTagInfoProxy : public edm::global::EDProducer<>
-{
+class SecondaryVertexTagInfoProxy : public edm::global::EDProducer<> {
 public:
-
-    explicit SecondaryVertexTagInfoProxy(const edm::ParameterSet&);
+  explicit SecondaryVertexTagInfoProxy(const edm::ParameterSet &);
 
 private:
+  void produce(edm::StreamID, edm::Event &, const edm::EventSetup &) const override;
 
-    void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
-
-    edm::EDGetTokenT<reco::SecondaryVertexTagInfoCollection> svTagInfoCollection_;
+  edm::EDGetTokenT<reco::SecondaryVertexTagInfoCollection> svTagInfoCollection_;
 };
 
+SecondaryVertexTagInfoProxy::SecondaryVertexTagInfoProxy(const edm::ParameterSet &config) {
+  // Get the cfg parameter
+  svTagInfoCollection_ = consumes<reco::SecondaryVertexTagInfoCollection>(
+      config.getUntrackedParameter<edm::InputTag>("svTagInfoProducer"));
 
-SecondaryVertexTagInfoProxy::SecondaryVertexTagInfoProxy(const edm::ParameterSet& config)
-{
-    // Get the cfg parameter
-    svTagInfoCollection_ = consumes<reco::SecondaryVertexTagInfoCollection>(config.getUntrackedParameter<edm::InputTag> ( "svTagInfoProducer" ));
-
-    // Declare the type of objects to be produced.
-    produces<reco::VertexCollection>();
-    produces<edm::AssociationMap<edm::OneToMany<reco::SecondaryVertexTagInfoCollection, reco::VertexCollection> > >();
+  // Declare the type of objects to be produced.
+  produces<reco::VertexCollection>();
+  produces<edm::AssociationMap<edm::OneToMany<reco::SecondaryVertexTagInfoCollection, reco::VertexCollection>>>();
 }
 
+void SecondaryVertexTagInfoProxy::produce(edm::StreamID, edm::Event &event, const edm::EventSetup &setup) const {
+  // Vertex collection
+  edm::Handle<reco::SecondaryVertexTagInfoCollection> svTagInfoCollection;
+  event.getByToken(svTagInfoCollection_, svTagInfoCollection);
+
+  // Auto pointers to the collection to be added to the event
+  std::unique_ptr<reco::VertexCollection> proxy(new reco::VertexCollection);
+  std::unique_ptr<edm::AssociationMap<edm::OneToMany<reco::SecondaryVertexTagInfoCollection, reco::VertexCollection>>>
+      assoc(new edm::AssociationMap<edm::OneToMany<reco::SecondaryVertexTagInfoCollection, reco::VertexCollection>>);
+
+  // Get a reference before to put in the event
+  reco::VertexRefProd vertexRefProd = event.getRefBeforePut<reco::VertexCollection>();
 
-void SecondaryVertexTagInfoProxy::produce(edm::StreamID, edm::Event& event, const edm::EventSetup& setup) const
-{
-    // Vertex collection
-    edm::Handle<reco::SecondaryVertexTagInfoCollection> svTagInfoCollection;
-    event.getByToken(svTagInfoCollection_, svTagInfoCollection);
-
-    // Auto pointers to the collection to be added to the event
-    std::unique_ptr<reco::VertexCollection> proxy (new reco::VertexCollection);
-    std::unique_ptr<edm::AssociationMap<edm::OneToMany<reco::SecondaryVertexTagInfoCollection, reco::VertexCollection> > >
-    assoc (new edm::AssociationMap<edm::OneToMany<reco::SecondaryVertexTagInfoCollection, reco::VertexCollection> >);
-
-    // Get a reference before to put in the event
-    reco::VertexRefProd vertexRefProd = event.getRefBeforePut<reco::VertexCollection>();
-
-    // General index
-    std::size_t index = 0;
-
-    // Loop over SecondaryVertexTagInfo collection
-    for (std::size_t svIndex = 0; svIndex < svTagInfoCollection->size(); ++svIndex)
-    {
-        // Reference to svTagInfo
-        reco::SecondaryVertexTagInfoRef svTagInfo(svTagInfoCollection, svIndex);
-
-        // Loop over the vertexes and add them to the new collection
-        for (unsigned int vIndex = 0; vIndex < svTagInfo->nVertices(); ++vIndex)
-        {
-            proxy->push_back(svTagInfo->secondaryVertex(vIndex));
-            assoc->insert(svTagInfo, reco::VertexRef(vertexRefProd, index));
-            ++index;
-        }
+  // General index
+  std::size_t index = 0;
+
+  // Loop over SecondaryVertexTagInfo collection
+  for (std::size_t svIndex = 0; svIndex < svTagInfoCollection->size(); ++svIndex) {
+    // Reference to svTagInfo
+    reco::SecondaryVertexTagInfoRef svTagInfo(svTagInfoCollection, svIndex);
+
+    // Loop over the vertexes and add them to the new collection
+    for (unsigned int vIndex = 0; vIndex < svTagInfo->nVertices(); ++vIndex) {
+      proxy->push_back(svTagInfo->secondaryVertex(vIndex));
+      assoc->insert(svTagInfo, reco::VertexRef(vertexRefProd, index));
+      ++index;
     }
+  }
 
-    // Adding the collection to the event
-    event.put(std::move(proxy));
-    event.put(std::move(assoc));
+  // Adding the collection to the event
+  event.put(std::move(proxy));
+  event.put(std::move(assoc));
 }
 
-
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(SecondaryVertexTagInfoProxy);
diff --git a/SimTracker/TrackHistory/plugins/TrackCategoriesAnalyzer.cc b/SimTracker/TrackHistory/plugins/TrackCategoriesAnalyzer.cc
index 062d8ca744f32..5245520f41575 100644
--- a/SimTracker/TrackHistory/plugins/TrackCategoriesAnalyzer.cc
+++ b/SimTracker/TrackHistory/plugins/TrackCategoriesAnalyzer.cc
@@ -8,8 +8,8 @@
 #include "TH1F.h"
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
@@ -21,90 +21,76 @@
 // class decleration
 //
 
-class TrackCategoriesAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResources>
-{
+class TrackCategoriesAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResources> {
 public:
-
-    explicit TrackCategoriesAnalyzer(const edm::ParameterSet&);
-    ~TrackCategoriesAnalyzer() override;
+  explicit TrackCategoriesAnalyzer(const edm::ParameterSet &);
+  ~TrackCategoriesAnalyzer() override;
 
 private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
-    void analyze(const edm::Event&, const edm::EventSetup&) override;
+  // Member data
 
-    // Member data
+  edm::EDGetTokenT<edm::View<reco::Track>> trackProducer_;
 
-    edm::EDGetTokenT<edm::View<reco::Track> > trackProducer_;
+  std::size_t totalTracks_;
 
-    std::size_t totalTracks_;
+  TrackClassifier classifier_;
 
-    TrackClassifier classifier_;
+  TH1F *trackCategories_;
 
-    TH1F * trackCategories_;
-
-    Int_t numberTrackCategories_;
+  Int_t numberTrackCategories_;
 };
 
+TrackCategoriesAnalyzer::TrackCategoriesAnalyzer(const edm::ParameterSet &config)
+    : classifier_(config, consumesCollector()) {
+  // Get the track collection
+  trackProducer_ = consumes<edm::View<reco::Track>>(config.getUntrackedParameter<edm::InputTag>("trackProducer"));
 
-TrackCategoriesAnalyzer::TrackCategoriesAnalyzer(const edm::ParameterSet& config) : classifier_(config,consumesCollector())
-{
-    // Get the track collection
-    trackProducer_ = consumes<edm::View<reco::Track>>(config.getUntrackedParameter<edm::InputTag> ( "trackProducer" ));
-
-    // Get the file service
-    usesResource("TFileService");
-    edm::Service<TFileService> fs;
+  // Get the file service
+  usesResource("TFileService");
+  edm::Service<TFileService> fs;
 
-    // Create a sub directory associated to the analyzer
-    TFileDirectory directory = fs->mkdir( "TrackCategoriesAnalyzer" );
+  // Create a sub directory associated to the analyzer
+  TFileDirectory directory = fs->mkdir("TrackCategoriesAnalyzer");
 
-    // Number of track categories
-    numberTrackCategories_ = TrackCategories::Unknown+1;
+  // Number of track categories
+  numberTrackCategories_ = TrackCategories::Unknown + 1;
 
-    // Define a new histograms
-    trackCategories_ = fs->make<TH1F>(
-                           "Frequency",
-                           "Frequency for the different track categories",
-                           numberTrackCategories_,
-                           -0.5,
-                           numberTrackCategories_ - 0.5
-                       );
+  // Define a new histograms
+  trackCategories_ = fs->make<TH1F>("Frequency",
+                                    "Frequency for the different track categories",
+                                    numberTrackCategories_,
+                                    -0.5,
+                                    numberTrackCategories_ - 0.5);
 
-    // Set the proper categories names
-    for (Int_t i = 0; i < numberTrackCategories_; ++i)
-        trackCategories_->GetXaxis()->SetBinLabel(i+1, TrackCategories::Names[i]);
+  // Set the proper categories names
+  for (Int_t i = 0; i < numberTrackCategories_; ++i)
+    trackCategories_->GetXaxis()->SetBinLabel(i + 1, TrackCategories::Names[i]);
 }
 
+TrackCategoriesAnalyzer::~TrackCategoriesAnalyzer() {}
 
-TrackCategoriesAnalyzer::~TrackCategoriesAnalyzer() { }
+void TrackCategoriesAnalyzer::analyze(const edm::Event &event, const edm::EventSetup &setup) {
+  // Track collection
+  edm::Handle<edm::View<reco::Track>> trackCollection;
+  event.getByToken(trackProducer_, trackCollection);
 
+  // Set the classifier for a new event
+  classifier_.newEvent(event, setup);
 
-void TrackCategoriesAnalyzer::analyze(const edm::Event& event, const edm::EventSetup& setup)
-{
-    // Track collection
-    edm::Handle<edm::View<reco::Track> > trackCollection;
-    event.getByToken(trackProducer_, trackCollection);
+  // Loop over the track collection.
+  for (std::size_t index = 0; index < trackCollection->size(); index++) {
+    edm::RefToBase<reco::Track> track(trackCollection, index);
 
-    // Set the classifier for a new event
-    classifier_.newEvent(event, setup);
+    // Classify the tracks
+    classifier_.evaluate(track);
 
-    // Loop over the track collection.
-    for (std::size_t index = 0; index < trackCollection->size(); index++)
-    {
-        edm::RefToBase<reco::Track> track(trackCollection, index);
-
-        // Classify the tracks
-        classifier_.evaluate(track);
-
-        // Fill the histogram with the categories
-        for (Int_t i = 0; i != numberTrackCategories_; ++i)
-            if (
-                classifier_.is( (TrackCategories::Category) i )
-            )
-                trackCategories_->Fill(i);
-    }
+    // Fill the histogram with the categories
+    for (Int_t i = 0; i != numberTrackCategories_; ++i)
+      if (classifier_.is((TrackCategories::Category)i))
+        trackCategories_->Fill(i);
+  }
 }
 
-
 DEFINE_FWK_MODULE(TrackCategoriesAnalyzer);
-
diff --git a/SimTracker/TrackHistory/plugins/TrackHistoryAnalyzer.cc b/SimTracker/TrackHistory/plugins/TrackHistoryAnalyzer.cc
index 58448b3e66dae..64344dc67057f 100644
--- a/SimTracker/TrackHistory/plugins/TrackHistoryAnalyzer.cc
+++ b/SimTracker/TrackHistory/plugins/TrackHistoryAnalyzer.cc
@@ -8,8 +8,8 @@
 // system include files
 #include <iostream>
 #include <memory>
-#include <string>
 #include <sstream>
+#include <string>
 #include <vector>
 
 // user include files
@@ -17,12 +17,12 @@
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/one/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
@@ -32,308 +32,257 @@
 // class decleration
 //
 
-class TrackHistoryAnalyzer : public edm::one::EDAnalyzer<>
-{
+class TrackHistoryAnalyzer : public edm::one::EDAnalyzer<> {
 public:
-
-    explicit TrackHistoryAnalyzer(const edm::ParameterSet&);
-    ~TrackHistoryAnalyzer() override;
+  explicit TrackHistoryAnalyzer(const edm::ParameterSet &);
+  ~TrackHistoryAnalyzer() override;
 
 private:
+  virtual void beginRun(const edm::Run &, const edm::EventSetup &);
+  void beginJob() override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
-    virtual void beginRun(const edm::Run&, const edm::EventSetup&);
-    void beginJob() override ;
-    void analyze(const edm::Event&, const edm::EventSetup&) override;
-
-    // Member data
+  // Member data
 
-    edm::InputTag trackProducer_;
+  edm::InputTag trackProducer_;
 
-    std::size_t totalTracks_;
+  std::size_t totalTracks_;
 
-    edm::ESHandle<ParticleDataTable> pdt_;
+  edm::ESHandle<ParticleDataTable> pdt_;
 
-    std::string particleString(int) const;
+  std::string particleString(int) const;
 
-    TrackClassifier classifier_;
+  TrackClassifier classifier_;
 
-    std::string vertexString(
-        const TrackingParticleRefVector&,
-        const TrackingParticleRefVector&
-    ) const;
+  std::string vertexString(const TrackingParticleRefVector &, const TrackingParticleRefVector &) const;
 
-    std::string vertexString(
-        HepMC::GenVertex::particles_in_const_iterator,
-        HepMC::GenVertex::particles_in_const_iterator,
-        HepMC::GenVertex::particles_out_const_iterator,
-        HepMC::GenVertex::particles_out_const_iterator
-    ) const;
+  std::string vertexString(HepMC::GenVertex::particles_in_const_iterator,
+                           HepMC::GenVertex::particles_in_const_iterator,
+                           HepMC::GenVertex::particles_out_const_iterator,
+                           HepMC::GenVertex::particles_out_const_iterator) const;
 };
 
-
-TrackHistoryAnalyzer::TrackHistoryAnalyzer(const edm::ParameterSet& config) : classifier_(config,consumesCollector())
-{
-    trackProducer_ = config.getUntrackedParameter<edm::InputTag> ( "trackProducer" );
-    consumes<edm::View<reco::Track>>(trackProducer_);
+TrackHistoryAnalyzer::TrackHistoryAnalyzer(const edm::ParameterSet &config) : classifier_(config, consumesCollector()) {
+  trackProducer_ = config.getUntrackedParameter<edm::InputTag>("trackProducer");
+  consumes<edm::View<reco::Track>>(trackProducer_);
 }
 
+TrackHistoryAnalyzer::~TrackHistoryAnalyzer() {}
 
-TrackHistoryAnalyzer::~TrackHistoryAnalyzer() { }
-
-
-void TrackHistoryAnalyzer::analyze(const edm::Event& event, const edm::EventSetup& setup)
-{
-    // Track collection
-    edm::Handle<edm::View<reco::Track> > trackCollection;
-    event.getByLabel(trackProducer_, trackCollection);
-
-    // Set the classifier for a new event
-    classifier_.newEvent(event, setup);
-
-    // Get a constant reference to the track history associated to the classifier
-    TrackHistory const & tracer = classifier_.history();
-
-    // Loop over the track collection.
-    for (std::size_t index = 0; index < trackCollection->size(); index++)
-    {
-        std::cout << std::endl << "History for track #" << index << " : " << std::endl;
-
-        // Classify the track and detect for fakes
-        if ( ! classifier_.evaluate( reco::TrackBaseRef(trackCollection, index) ).is(TrackClassifier::Fake) )
-        {
-            // Get the list of TrackingParticles associated to
-            TrackHistory::SimParticleTrail simParticles(tracer.simParticleTrail());
-
-            // Loop over all simParticles
-            for (std::size_t hindex=0; hindex<simParticles.size(); hindex++)
-            {
-                std::cout << "  simParticles [" << hindex << "] : "
-                          << particleString(simParticles[hindex]->pdgId())
-                          << std::endl;
-            }
-
-            // Get the list of TrackingVertexes associated to
-            TrackHistory::SimVertexTrail simVertexes(tracer.simVertexTrail());
-
-            // Loop over all simVertexes
-            if ( !simVertexes.empty() )
-            {
-                for (std::size_t hindex=0; hindex<simVertexes.size(); hindex++)
-                {
-                    std::cout << "  simVertex    [" << hindex << "] : "
-                              << vertexString(
-                                  simVertexes[hindex]->sourceTracks(),
-                                  simVertexes[hindex]->daughterTracks()
-                              )
-                              << std::endl;
-                }
-            }
-            else
-                std::cout << "  simVertex no found" << std::endl;
-
-            // Get the list of GenParticles associated to
-            TrackHistory::GenParticleTrail genParticles(tracer.genParticleTrail());
-
-            // Loop over all genParticles
-            for (std::size_t hindex=0; hindex<genParticles.size(); hindex++)
-            {
-                std::cout << "  genParticles [" << hindex << "] : "
-                          << particleString(genParticles[hindex]->pdg_id())
-                          << std::endl;
-            }
-
-            // Get the list of TrackingVertexes associated to
-            TrackHistory::GenVertexTrail genVertexes(tracer.genVertexTrail());
-
-            // Loop over all simVertexes
-            if ( !genVertexes.empty() )
-            {
-                for (std::size_t hindex=0; hindex<genVertexes.size(); hindex++)
-                {
-                    std::cout << "  genVertex    [" << hindex << "] : "
-                              << vertexString(
-                                  genVertexes[hindex]->particles_in_const_begin(),
-                                  genVertexes[hindex]->particles_in_const_end(),
-                                  genVertexes[hindex]->particles_out_const_begin(),
-                                  genVertexes[hindex]->particles_out_const_end()
-                              )
-                              << std::endl;
-                }
-            }
-            else
-                std::cout << "  genVertex no found" << std::endl;
-        }
-        else
-            std::cout << "  fake track" << std::endl;
+void TrackHistoryAnalyzer::analyze(const edm::Event &event, const edm::EventSetup &setup) {
+  // Track collection
+  edm::Handle<edm::View<reco::Track>> trackCollection;
+  event.getByLabel(trackProducer_, trackCollection);
 
-        std::cout << "  track categories : " << classifier_;
-        std::cout << std::endl;
-    }
-}
+  // Set the classifier for a new event
+  classifier_.newEvent(event, setup);
+
+  // Get a constant reference to the track history associated to the classifier
+  TrackHistory const &tracer = classifier_.history();
+
+  // Loop over the track collection.
+  for (std::size_t index = 0; index < trackCollection->size(); index++) {
+    std::cout << std::endl << "History for track #" << index << " : " << std::endl;
 
+    // Classify the track and detect for fakes
+    if (!classifier_.evaluate(reco::TrackBaseRef(trackCollection, index)).is(TrackClassifier::Fake)) {
+      // Get the list of TrackingParticles associated to
+      TrackHistory::SimParticleTrail simParticles(tracer.simParticleTrail());
 
-void
-TrackHistoryAnalyzer::beginRun(const edm::Run& run, const edm::EventSetup& setup)
-{
-    // Get the particles table.
-    setup.getData( pdt_ );
+      // Loop over all simParticles
+      for (std::size_t hindex = 0; hindex < simParticles.size(); hindex++) {
+        std::cout << "  simParticles [" << hindex << "] : " << particleString(simParticles[hindex]->pdgId())
+                  << std::endl;
+      }
+
+      // Get the list of TrackingVertexes associated to
+      TrackHistory::SimVertexTrail simVertexes(tracer.simVertexTrail());
+
+      // Loop over all simVertexes
+      if (!simVertexes.empty()) {
+        for (std::size_t hindex = 0; hindex < simVertexes.size(); hindex++) {
+          std::cout << "  simVertex    [" << hindex << "] : "
+                    << vertexString(simVertexes[hindex]->sourceTracks(), simVertexes[hindex]->daughterTracks())
+                    << std::endl;
+        }
+      } else
+        std::cout << "  simVertex no found" << std::endl;
+
+      // Get the list of GenParticles associated to
+      TrackHistory::GenParticleTrail genParticles(tracer.genParticleTrail());
+
+      // Loop over all genParticles
+      for (std::size_t hindex = 0; hindex < genParticles.size(); hindex++) {
+        std::cout << "  genParticles [" << hindex << "] : " << particleString(genParticles[hindex]->pdg_id())
+                  << std::endl;
+      }
+
+      // Get the list of TrackingVertexes associated to
+      TrackHistory::GenVertexTrail genVertexes(tracer.genVertexTrail());
+
+      // Loop over all simVertexes
+      if (!genVertexes.empty()) {
+        for (std::size_t hindex = 0; hindex < genVertexes.size(); hindex++) {
+          std::cout << "  genVertex    [" << hindex << "] : "
+                    << vertexString(genVertexes[hindex]->particles_in_const_begin(),
+                                    genVertexes[hindex]->particles_in_const_end(),
+                                    genVertexes[hindex]->particles_out_const_begin(),
+                                    genVertexes[hindex]->particles_out_const_end())
+                    << std::endl;
+        }
+      } else
+        std::cout << "  genVertex no found" << std::endl;
+    } else
+      std::cout << "  fake track" << std::endl;
+
+    std::cout << "  track categories : " << classifier_;
+    std::cout << std::endl;
+  }
 }
 
-void
-TrackHistoryAnalyzer::beginJob()
-{
-    totalTracks_ = 0;
+void TrackHistoryAnalyzer::beginRun(const edm::Run &run, const edm::EventSetup &setup) {
+  // Get the particles table.
+  setup.getData(pdt_);
 }
 
+void TrackHistoryAnalyzer::beginJob() { totalTracks_ = 0; }
 
-std::string TrackHistoryAnalyzer::particleString(int pdgId) const
-{
-    ParticleData const * pid;
+std::string TrackHistoryAnalyzer::particleString(int pdgId) const {
+  ParticleData const *pid;
 
-    std::ostringstream vDescription;
+  std::ostringstream vDescription;
 
-    HepPDT::ParticleID particleType(pdgId);
+  HepPDT::ParticleID particleType(pdgId);
 
-    if (particleType.isValid())
-    {
-        pid = pdt_->particle(particleType);
-        if (pid)
-            vDescription << pid->name();
-        else
-            vDescription << pdgId;
-    }
+  if (particleType.isValid()) {
+    pid = pdt_->particle(particleType);
+    if (pid)
+      vDescription << pid->name();
     else
-        vDescription << pdgId;
+      vDescription << pdgId;
+  } else
+    vDescription << pdgId;
 
-    return vDescription.str();
+  return vDescription.str();
 }
 
+std::string TrackHistoryAnalyzer::vertexString(const TrackingParticleRefVector &in,
+                                               const TrackingParticleRefVector &out) const {
+  ParticleData const *pid;
 
-std::string TrackHistoryAnalyzer::vertexString(
-    const TrackingParticleRefVector& in,
-    const TrackingParticleRefVector& out
-) const
-{
-    ParticleData const * pid;
+  std::ostringstream vDescription;
 
-    std::ostringstream vDescription;
+  for (std::size_t j = 0; j < in.size(); j++) {
+    if (!j)
+      vDescription << "(";
 
-    for (std::size_t j = 0; j < in.size(); j++)
-    {
-        if (!j) vDescription << "(";
+    HepPDT::ParticleID particleType(in[j]->pdgId());
 
-        HepPDT::ParticleID particleType(in[j]->pdgId());
+    if (particleType.isValid()) {
+      pid = pdt_->particle(particleType);
+      if (pid)
+        vDescription << pid->name();
+      else
+        vDescription << in[j]->pdgId();
+    } else
+      vDescription << in[j]->pdgId();
 
-        if (particleType.isValid())
-        {
-            pid = pdt_->particle(particleType);
-            if (pid)
-                vDescription << pid->name();
-            else
-                vDescription << in[j]->pdgId();
-        }
-        else
-            vDescription << in[j]->pdgId();
-
-        if (j == in.size() - 1) vDescription << ")";
-        else vDescription << ",";
-    }
+    if (j == in.size() - 1)
+      vDescription << ")";
+    else
+      vDescription << ",";
+  }
 
-    vDescription << "->";
+  vDescription << "->";
 
-    for (std::size_t j = 0; j < out.size(); j++)
-    {
-        if (!j) vDescription << "(";
+  for (std::size_t j = 0; j < out.size(); j++) {
+    if (!j)
+      vDescription << "(";
 
-        HepPDT::ParticleID particleType(out[j]->pdgId());
+    HepPDT::ParticleID particleType(out[j]->pdgId());
 
-        if (particleType.isValid())
-        {
-            pid = pdt_->particle(particleType);
-            if (pid)
-                vDescription << pid->name();
-            else
-                vDescription << out[j]->pdgId();
-        }
-        else
-            vDescription << out[j]->pdgId();
+    if (particleType.isValid()) {
+      pid = pdt_->particle(particleType);
+      if (pid)
+        vDescription << pid->name();
+      else
+        vDescription << out[j]->pdgId();
+    } else
+      vDescription << out[j]->pdgId();
 
-        if (j == out.size() - 1) vDescription << ")";
-        else vDescription << ",";
-    }
+    if (j == out.size() - 1)
+      vDescription << ")";
+    else
+      vDescription << ",";
+  }
 
-    return vDescription.str();
+  return vDescription.str();
 }
 
+std::string TrackHistoryAnalyzer::vertexString(HepMC::GenVertex::particles_in_const_iterator in_begin,
+                                               HepMC::GenVertex::particles_in_const_iterator in_end,
+                                               HepMC::GenVertex::particles_out_const_iterator out_begin,
+                                               HepMC::GenVertex::particles_out_const_iterator out_end) const {
+  ParticleData const *pid;
 
-std::string TrackHistoryAnalyzer::vertexString(
-    HepMC::GenVertex::particles_in_const_iterator in_begin,
-    HepMC::GenVertex::particles_in_const_iterator in_end,
-    HepMC::GenVertex::particles_out_const_iterator out_begin,
-    HepMC::GenVertex::particles_out_const_iterator out_end
-) const
-{
-    ParticleData const * pid;
+  std::ostringstream vDescription;
 
-    std::ostringstream vDescription;
+  std::size_t j = 0;
 
-    std::size_t j = 0;
+  HepMC::GenVertex::particles_in_const_iterator in, itmp;
 
-    HepMC::GenVertex::particles_in_const_iterator in, itmp;
+  for (in = in_begin; in != in_end; in++, j++) {
+    if (!j)
+      vDescription << "(";
 
-    for (in = in_begin; in != in_end; in++, j++)
-    {
-        if (!j) vDescription << "(";
+    HepPDT::ParticleID particleType((*in)->pdg_id());
 
-        HepPDT::ParticleID particleType((*in)->pdg_id());
+    if (particleType.isValid()) {
+      pid = pdt_->particle(particleType);
+      if (pid)
+        vDescription << pid->name();
+      else
+        vDescription << (*in)->pdg_id();
+    } else
+      vDescription << (*in)->pdg_id();
 
-        if (particleType.isValid())
-        {
-            pid = pdt_->particle(particleType);
-            if (pid)
-                vDescription << pid->name();
-            else
-                vDescription << (*in)->pdg_id();
-        }
-        else
-            vDescription << (*in)->pdg_id();
+    itmp = in;
 
-        itmp = in;
+    if (++itmp == in_end)
+      vDescription << ")";
+    else
+      vDescription << ",";
+  }
 
-        if (++itmp == in_end) vDescription << ")";
-        else vDescription << ",";
-    }
+  vDescription << "->";
+  j = 0;
 
-    vDescription << "->";
-    j = 0;
+  HepMC::GenVertex::particles_out_const_iterator out, otmp;
 
-    HepMC::GenVertex::particles_out_const_iterator out, otmp;
+  for (out = out_begin; out != out_end; out++, j++) {
+    if (!j)
+      vDescription << "(";
 
-    for (out = out_begin; out != out_end; out++, j++)
-    {
-        if (!j) vDescription << "(";
+    HepPDT::ParticleID particleType((*out)->pdg_id());
 
-        HepPDT::ParticleID particleType((*out)->pdg_id());
+    if (particleType.isValid()) {
+      pid = pdt_->particle(particleType);
+      if (pid)
+        vDescription << pid->name();
+      else
+        vDescription << (*out)->pdg_id();
+    } else
+      vDescription << (*out)->pdg_id();
 
-        if (particleType.isValid())
-        {
-            pid = pdt_->particle(particleType);
-            if (pid)
-                vDescription << pid->name();
-            else
-                vDescription << (*out)->pdg_id();
-        }
-        else
-            vDescription << (*out)->pdg_id();
+    otmp = out;
 
-        otmp = out;
-
-        if (++otmp == out_end) vDescription << ")";
-        else vDescription << ",";
-    }
+    if (++otmp == out_end)
+      vDescription << ")";
+    else
+      vDescription << ",";
+  }
 
-    return vDescription.str();
+  return vDescription.str();
 }
 
-
 DEFINE_FWK_MODULE(TrackHistoryAnalyzer);
diff --git a/SimTracker/TrackHistory/plugins/TrackingParticleBHadronRefSelector.cc b/SimTracker/TrackHistory/plugins/TrackingParticleBHadronRefSelector.cc
index 96da6ca9e1450..8c8d1174571fe 100644
--- a/SimTracker/TrackHistory/plugins/TrackingParticleBHadronRefSelector.cc
+++ b/SimTracker/TrackHistory/plugins/TrackingParticleBHadronRefSelector.cc
@@ -1,8 +1,8 @@
-#include "FWCore/Framework/interface/stream/EDProducer.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 
 #include "DataFormats/Common/interface/EDProductfwd.h"
@@ -13,13 +13,13 @@
 
 #include "HepPDT/ParticleID.hh"
 
-class TrackingParticleBHadronRefSelector: public edm::stream::EDProducer<> {
+class TrackingParticleBHadronRefSelector : public edm::stream::EDProducer<> {
 public:
-  TrackingParticleBHadronRefSelector(const edm::ParameterSet& iConfig);
+  TrackingParticleBHadronRefSelector(const edm::ParameterSet &iConfig);
 
-  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 
-  void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override;
+  void produce(edm::Event &iEvent, const edm::EventSetup &iSetup) override;
 
 private:
   edm::EDGetTokenT<TrackingParticleCollection> tpToken_;
@@ -27,36 +27,34 @@ class TrackingParticleBHadronRefSelector: public edm::stream::EDProducer<> {
   HistoryBase tracer_;
 };
 
-
-TrackingParticleBHadronRefSelector::TrackingParticleBHadronRefSelector(const edm::ParameterSet& iConfig):
-  tpToken_(consumes<TrackingParticleCollection>(iConfig.getParameter<edm::InputTag>("src")))
-{
-  tracer_.depth(-2); // as in SimTracker/TrackHistory/src/TrackClassifier.cc
+TrackingParticleBHadronRefSelector::TrackingParticleBHadronRefSelector(const edm::ParameterSet &iConfig)
+    : tpToken_(consumes<TrackingParticleCollection>(iConfig.getParameter<edm::InputTag>("src"))) {
+  tracer_.depth(-2);  // as in SimTracker/TrackHistory/src/TrackClassifier.cc
 
   produces<TrackingParticleRefVector>();
 }
 
-void TrackingParticleBHadronRefSelector::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+void TrackingParticleBHadronRefSelector::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
   edm::ParameterSetDescription desc;
   desc.add<edm::InputTag>("src", edm::InputTag("mix", "MergedTrackTruth"));
   descriptions.add("trackingParticleBHadronRefSelectorDefault", desc);
 }
 
-void TrackingParticleBHadronRefSelector::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
+void TrackingParticleBHadronRefSelector::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   edm::Handle<TrackingParticleCollection> h_tps;
   iEvent.getByToken(tpToken_, h_tps);
 
   auto ret = std::make_unique<TrackingParticleRefVector>();
 
   // Logic is similar to SimTracker/TrackHistory
-  for(size_t i=0, end=h_tps->size(); i<end; ++i) {
+  for (size_t i = 0, end = h_tps->size(); i < end; ++i) {
     auto tpRef = TrackingParticleRef(h_tps, i);
-    if(tracer_.evaluate(tpRef)) { // ignore TP if history can not be traced
+    if (tracer_.evaluate(tpRef)) {  // ignore TP if history can not be traced
       // following is from TrackClassifier::processesAtGenerator()
-      HistoryBase::RecoGenParticleTrail const & recoGenParticleTrail = tracer_.recoGenParticleTrail();
-      for(const auto& particle: recoGenParticleTrail) {
+      HistoryBase::RecoGenParticleTrail const &recoGenParticleTrail = tracer_.recoGenParticleTrail();
+      for (const auto &particle : recoGenParticleTrail) {
         HepPDT::ParticleID particleID(particle->pdgId());
-        if(particleID.hasBottom()) {
+        if (particleID.hasBottom()) {
           ret->push_back(tpRef);
           break;
         }
diff --git a/SimTracker/TrackHistory/plugins/TrackingParticleCategoriesAnalyser.cc b/SimTracker/TrackHistory/plugins/TrackingParticleCategoriesAnalyser.cc
index 4503d2512ec0f..0122c219b2318 100644
--- a/SimTracker/TrackHistory/plugins/TrackingParticleCategoriesAnalyser.cc
+++ b/SimTracker/TrackHistory/plugins/TrackingParticleCategoriesAnalyser.cc
@@ -8,8 +8,8 @@
 #include "TH1F.h"
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
@@ -21,89 +21,76 @@
 // class decleration
 //
 
-class TrackingParticleCategoriesAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResources>
-{
+class TrackingParticleCategoriesAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResources> {
 public:
-
-    explicit TrackingParticleCategoriesAnalyzer(const edm::ParameterSet&);
-    ~TrackingParticleCategoriesAnalyzer() override;
+  explicit TrackingParticleCategoriesAnalyzer(const edm::ParameterSet &);
+  ~TrackingParticleCategoriesAnalyzer() override;
 
 private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
-    void analyze(const edm::Event&, const edm::EventSetup&) override;
-
-    // Member data
+  // Member data
 
-    edm::EDGetTokenT<TrackingParticleCollection> trackingTruth_;
+  edm::EDGetTokenT<TrackingParticleCollection> trackingTruth_;
 
-    std::size_t totalTrakingParticles_;
+  std::size_t totalTrakingParticles_;
 
-    TrackClassifier classifier_;
+  TrackClassifier classifier_;
 
-    TH1F * trackingParticleCategories_;
+  TH1F *trackingParticleCategories_;
 
-    Int_t numberTrackingParticleCategories_;
+  Int_t numberTrackingParticleCategories_;
 };
 
+TrackingParticleCategoriesAnalyzer::TrackingParticleCategoriesAnalyzer(const edm::ParameterSet &config)
+    : classifier_(config, consumesCollector()) {
+  // Get the track collection
+  trackingTruth_ = consumes<TrackingParticleCollection>(config.getUntrackedParameter<edm::InputTag>("trackingTruth"));
 
-TrackingParticleCategoriesAnalyzer::TrackingParticleCategoriesAnalyzer(const edm::ParameterSet& config) : classifier_(config,consumesCollector())
-{
-    // Get the track collection
-    trackingTruth_ = consumes<TrackingParticleCollection>(config.getUntrackedParameter<edm::InputTag> ( "trackingTruth" ));
+  // Get the file service
+  usesResource("TFileService");
+  edm::Service<TFileService> fs;
 
-    // Get the file service
-    usesResource("TFileService");
-    edm::Service<TFileService> fs;
+  // Create a sub directory associated to the analyzer
+  TFileDirectory directory = fs->mkdir("TrackingParticleCategoriesAnalyzer");
 
-    // Create a sub directory associated to the analyzer
-    TFileDirectory directory = fs->mkdir( "TrackingParticleCategoriesAnalyzer" );
+  // Number of track categories
+  numberTrackingParticleCategories_ = TrackCategories::Unknown + 1;
 
-    // Number of track categories
-    numberTrackingParticleCategories_ = TrackCategories::Unknown+1;
+  // Define a new histograms
+  trackingParticleCategories_ = fs->make<TH1F>("Frequency",
+                                               "Frequency for the different track categories",
+                                               numberTrackingParticleCategories_,
+                                               -0.5,
+                                               numberTrackingParticleCategories_ - 0.5);
 
-    // Define a new histograms
-    trackingParticleCategories_ = fs->make<TH1F>(
-                           "Frequency",
-                           "Frequency for the different track categories",
-                           numberTrackingParticleCategories_,
-                           -0.5,
-                           numberTrackingParticleCategories_ - 0.5
-                       );
-
-    // Set the proper categories names
-    for (Int_t i = 0; i < numberTrackingParticleCategories_; ++i)
-        trackingParticleCategories_->GetXaxis()->SetBinLabel(i+1, TrackCategories::Names[i]);
+  // Set the proper categories names
+  for (Int_t i = 0; i < numberTrackingParticleCategories_; ++i)
+    trackingParticleCategories_->GetXaxis()->SetBinLabel(i + 1, TrackCategories::Names[i]);
 }
 
+TrackingParticleCategoriesAnalyzer::~TrackingParticleCategoriesAnalyzer() {}
 
-TrackingParticleCategoriesAnalyzer::~TrackingParticleCategoriesAnalyzer() { }
-
+void TrackingParticleCategoriesAnalyzer::analyze(const edm::Event &event, const edm::EventSetup &setup) {
+  // Track collection
+  edm::Handle<TrackingParticleCollection> TPCollection;
+  event.getByToken(trackingTruth_, TPCollection);
 
-void TrackingParticleCategoriesAnalyzer::analyze(const edm::Event& event, const edm::EventSetup& setup)
-{
-    // Track collection
-    edm::Handle<TrackingParticleCollection> TPCollection;
-    event.getByToken(trackingTruth_, TPCollection);
+  // Set the classifier for a new event
+  classifier_.newEvent(event, setup);
 
-    // Set the classifier for a new event
-    classifier_.newEvent(event, setup);
+  // Loop over the track collection.
+  for (std::size_t index = 0; index < TPCollection->size(); index++) {
+    TrackingParticleRef trackingParticle(TPCollection, index);
 
-    // Loop over the track collection.
-    for (std::size_t index = 0; index < TPCollection->size(); index++)
-    {
-        TrackingParticleRef trackingParticle(TPCollection, index);
+    // Classify the tracks
+    classifier_.evaluate(trackingParticle);
 
-        // Classify the tracks
-        classifier_.evaluate(trackingParticle);
-
-        // Fill the histogram with the categories
-        for (Int_t i = 0; i != numberTrackingParticleCategories_; ++i)
-            if (
-                classifier_.is( (TrackCategories::Category) i )
-            )
-                trackingParticleCategories_->Fill(i);
-    }
+    // Fill the histogram with the categories
+    for (Int_t i = 0; i != numberTrackingParticleCategories_; ++i)
+      if (classifier_.is((TrackCategories::Category)i))
+        trackingParticleCategories_->Fill(i);
+  }
 }
 
-
 DEFINE_FWK_MODULE(TrackingParticleCategoriesAnalyzer);
diff --git a/SimTracker/TrackHistory/plugins/VertexHistoryAnalyzer.cc b/SimTracker/TrackHistory/plugins/VertexHistoryAnalyzer.cc
index 88cfca171ce3a..e4a992704888d 100644
--- a/SimTracker/TrackHistory/plugins/VertexHistoryAnalyzer.cc
+++ b/SimTracker/TrackHistory/plugins/VertexHistoryAnalyzer.cc
@@ -8,20 +8,20 @@
 // system include files
 #include <iostream>
 #include <memory>
-#include <string>
 #include <sstream>
+#include <string>
 #include <vector>
 
 // user include files
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/one/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
@@ -31,302 +31,253 @@
 // class decleration
 //
 
-class VertexHistoryAnalyzer : public edm::one::EDAnalyzer<>
-{
+class VertexHistoryAnalyzer : public edm::one::EDAnalyzer<> {
 public:
-
-    explicit VertexHistoryAnalyzer(const edm::ParameterSet&);
+  explicit VertexHistoryAnalyzer(const edm::ParameterSet &);
 
 private:
+  virtual void beginRun(const edm::Run &, const edm::EventSetup &);
+  void beginJob() override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
-    virtual void beginRun(const edm::Run&,const edm::EventSetup&);
-    void beginJob() override ;
-    void analyze(const edm::Event&, const edm::EventSetup&) override;
-
-    // Member data
+  // Member data
 
-    VertexClassifier classifier_;
+  VertexClassifier classifier_;
 
-    edm::InputTag vertexProducer_;
+  edm::InputTag vertexProducer_;
 
-    edm::ESHandle<ParticleDataTable> pdt_;
+  edm::ESHandle<ParticleDataTable> pdt_;
 
-    std::string particleString(int) const;
+  std::string particleString(int) const;
 
-    std::string vertexString(
-        const TrackingParticleRefVector&,
-        const TrackingParticleRefVector&
-    ) const;
+  std::string vertexString(const TrackingParticleRefVector &, const TrackingParticleRefVector &) const;
 
-    std::string vertexString(
-        HepMC::GenVertex::particles_in_const_iterator,
-        HepMC::GenVertex::particles_in_const_iterator,
-        HepMC::GenVertex::particles_out_const_iterator,
-        HepMC::GenVertex::particles_out_const_iterator
-    ) const;
+  std::string vertexString(HepMC::GenVertex::particles_in_const_iterator,
+                           HepMC::GenVertex::particles_in_const_iterator,
+                           HepMC::GenVertex::particles_out_const_iterator,
+                           HepMC::GenVertex::particles_out_const_iterator) const;
 };
 
-
-VertexHistoryAnalyzer::VertexHistoryAnalyzer(const edm::ParameterSet& config) : classifier_(config,consumesCollector())
-{
-    vertexProducer_ = config.getUntrackedParameter<edm::InputTag> ("vertexProducer");
-    consumes<edm::View<reco::Vertex>>(vertexProducer_);
+VertexHistoryAnalyzer::VertexHistoryAnalyzer(const edm::ParameterSet &config)
+    : classifier_(config, consumesCollector()) {
+  vertexProducer_ = config.getUntrackedParameter<edm::InputTag>("vertexProducer");
+  consumes<edm::View<reco::Vertex>>(vertexProducer_);
 }
 
-
-void VertexHistoryAnalyzer::analyze(const edm::Event& event, const edm::EventSetup& setup)
-{
-    // Set the classifier for a new event
-    classifier_.newEvent(event, setup);
-
-    // Vertex collection
-    edm::Handle<edm::View<reco::Vertex> > vertexCollection;
-    event.getByLabel(vertexProducer_, vertexCollection);
-
-    // Get a constant reference to the track history associated to the classifier
-    VertexHistory const & tracer = classifier_.history();
-
-    // Loop over the track collection.
-    for (std::size_t index = 0; index < vertexCollection->size(); index++)
-    {
-        std::cout << std::endl << "History for vertex #" << index << " : " << std::endl;
-
-        // Classify the track and detect for fakes
-        if ( !classifier_.evaluate( reco::VertexBaseRef(vertexCollection, index) ).is(VertexClassifier::Fake) )
-        {
-            // Get the list of TrackingParticles associated to
-            VertexHistory::SimParticleTrail simParticles(tracer.simParticleTrail());
-
-            // Loop over all simParticles
-            for (std::size_t hindex=0; hindex<simParticles.size(); hindex++)
-            {
-                std::cout << "  simParticles [" << hindex << "] : "
-                          << particleString(simParticles[hindex]->pdgId())
-                          << std::endl;
-            }
-
-            // Get the list of TrackingVertexes associated to
-            VertexHistory::SimVertexTrail simVertexes(tracer.simVertexTrail());
-
-            // Loop over all simVertexes
-            if ( !simVertexes.empty() )
-            {
-                for (std::size_t hindex=0; hindex<simVertexes.size(); hindex++)
-                {
-                    std::cout << "  simVertex    [" << hindex << "] : "
-                              << vertexString(
-                                  simVertexes[hindex]->sourceTracks(),
-                                  simVertexes[hindex]->daughterTracks()
-                              )
-                              << std::endl;
-                }
-            }
-            else
-                std::cout << "  simVertex no found" << std::endl;
-
-            // Get the list of GenParticles associated to
-            VertexHistory::GenParticleTrail genParticles(tracer.genParticleTrail());
-
-            // Loop over all genParticles
-            for (std::size_t hindex=0; hindex<genParticles.size(); hindex++)
-            {
-                std::cout << "  genParticles [" << hindex << "] : "
-                          << particleString(genParticles[hindex]->pdg_id())
-                          << std::endl;
-            }
-
-            // Get the list of TrackingVertexes associated to
-            VertexHistory::GenVertexTrail genVertexes(tracer.genVertexTrail());
-
-            // Loop over all simVertexes
-            if ( !genVertexes.empty() )
-            {
-                for (std::size_t hindex=0; hindex<genVertexes.size(); hindex++)
-                {
-                    std::cout << "  genVertex    [" << hindex << "] : "
-                              << vertexString(
-                                  genVertexes[hindex]->particles_in_const_begin(),
-                                  genVertexes[hindex]->particles_in_const_end(),
-                                  genVertexes[hindex]->particles_out_const_begin(),
-                                  genVertexes[hindex]->particles_out_const_end()
-                              )
-                              << std::endl;
-                }
-            }
-            else
-                std::cout << "  genVertex no found" << std::endl;
+void VertexHistoryAnalyzer::analyze(const edm::Event &event, const edm::EventSetup &setup) {
+  // Set the classifier for a new event
+  classifier_.newEvent(event, setup);
+
+  // Vertex collection
+  edm::Handle<edm::View<reco::Vertex>> vertexCollection;
+  event.getByLabel(vertexProducer_, vertexCollection);
+
+  // Get a constant reference to the track history associated to the classifier
+  VertexHistory const &tracer = classifier_.history();
+
+  // Loop over the track collection.
+  for (std::size_t index = 0; index < vertexCollection->size(); index++) {
+    std::cout << std::endl << "History for vertex #" << index << " : " << std::endl;
+
+    // Classify the track and detect for fakes
+    if (!classifier_.evaluate(reco::VertexBaseRef(vertexCollection, index)).is(VertexClassifier::Fake)) {
+      // Get the list of TrackingParticles associated to
+      VertexHistory::SimParticleTrail simParticles(tracer.simParticleTrail());
+
+      // Loop over all simParticles
+      for (std::size_t hindex = 0; hindex < simParticles.size(); hindex++) {
+        std::cout << "  simParticles [" << hindex << "] : " << particleString(simParticles[hindex]->pdgId())
+                  << std::endl;
+      }
+
+      // Get the list of TrackingVertexes associated to
+      VertexHistory::SimVertexTrail simVertexes(tracer.simVertexTrail());
+
+      // Loop over all simVertexes
+      if (!simVertexes.empty()) {
+        for (std::size_t hindex = 0; hindex < simVertexes.size(); hindex++) {
+          std::cout << "  simVertex    [" << hindex << "] : "
+                    << vertexString(simVertexes[hindex]->sourceTracks(), simVertexes[hindex]->daughterTracks())
+                    << std::endl;
         }
-        else
-            std::cout << "  fake vertex" << std::endl;
-
-        std::cout << "  vertex categories : " << classifier_;
-        std::cout << std::endl;
-    }
-}
-
-
-void
-VertexHistoryAnalyzer::beginRun(const edm::Run& run, const edm::EventSetup& setup)
-{
-    // Get the particles table.
-    setup.getData( pdt_ );
+      } else
+        std::cout << "  simVertex no found" << std::endl;
+
+      // Get the list of GenParticles associated to
+      VertexHistory::GenParticleTrail genParticles(tracer.genParticleTrail());
+
+      // Loop over all genParticles
+      for (std::size_t hindex = 0; hindex < genParticles.size(); hindex++) {
+        std::cout << "  genParticles [" << hindex << "] : " << particleString(genParticles[hindex]->pdg_id())
+                  << std::endl;
+      }
+
+      // Get the list of TrackingVertexes associated to
+      VertexHistory::GenVertexTrail genVertexes(tracer.genVertexTrail());
+
+      // Loop over all simVertexes
+      if (!genVertexes.empty()) {
+        for (std::size_t hindex = 0; hindex < genVertexes.size(); hindex++) {
+          std::cout << "  genVertex    [" << hindex << "] : "
+                    << vertexString(genVertexes[hindex]->particles_in_const_begin(),
+                                    genVertexes[hindex]->particles_in_const_end(),
+                                    genVertexes[hindex]->particles_out_const_begin(),
+                                    genVertexes[hindex]->particles_out_const_end())
+                    << std::endl;
+        }
+      } else
+        std::cout << "  genVertex no found" << std::endl;
+    } else
+      std::cout << "  fake vertex" << std::endl;
+
+    std::cout << "  vertex categories : " << classifier_;
+    std::cout << std::endl;
+  }
 }
 
-void
-VertexHistoryAnalyzer::beginJob()
-{
-
+void VertexHistoryAnalyzer::beginRun(const edm::Run &run, const edm::EventSetup &setup) {
+  // Get the particles table.
+  setup.getData(pdt_);
 }
 
+void VertexHistoryAnalyzer::beginJob() {}
 
-std::string VertexHistoryAnalyzer::particleString(int pdgId) const
-{
-    ParticleData const * pid;
+std::string VertexHistoryAnalyzer::particleString(int pdgId) const {
+  ParticleData const *pid;
 
-    std::ostringstream vDescription;
+  std::ostringstream vDescription;
 
-    HepPDT::ParticleID particleType(pdgId);
+  HepPDT::ParticleID particleType(pdgId);
 
-    if (particleType.isValid())
-    {
-        pid = pdt_->particle(particleType);
-        if (pid)
-            vDescription << pid->name();
-        else
-            vDescription << pdgId;
-    }
+  if (particleType.isValid()) {
+    pid = pdt_->particle(particleType);
+    if (pid)
+      vDescription << pid->name();
     else
-        vDescription << pdgId;
+      vDescription << pdgId;
+  } else
+    vDescription << pdgId;
 
-    return vDescription.str();
+  return vDescription.str();
 }
 
+std::string VertexHistoryAnalyzer::vertexString(const TrackingParticleRefVector &in,
+                                                const TrackingParticleRefVector &out) const {
+  ParticleData const *pid;
 
-std::string VertexHistoryAnalyzer::vertexString(
-    const TrackingParticleRefVector& in,
-    const TrackingParticleRefVector& out
-) const
-{
-    ParticleData const * pid;
+  std::ostringstream vDescription;
 
-    std::ostringstream vDescription;
+  for (std::size_t j = 0; j < in.size(); j++) {
+    if (!j)
+      vDescription << "(";
 
-    for (std::size_t j = 0; j < in.size(); j++)
-    {
-        if (!j) vDescription << "(";
+    HepPDT::ParticleID particleType(in[j]->pdgId());
 
-        HepPDT::ParticleID particleType(in[j]->pdgId());
+    if (particleType.isValid()) {
+      pid = pdt_->particle(particleType);
+      if (pid)
+        vDescription << pid->name();
+      else
+        vDescription << in[j]->pdgId();
+    } else
+      vDescription << in[j]->pdgId();
 
-        if (particleType.isValid())
-        {
-            pid = pdt_->particle(particleType);
-            if (pid)
-                vDescription << pid->name();
-            else
-                vDescription << in[j]->pdgId();
-        }
-        else
-            vDescription << in[j]->pdgId();
-
-        if (j == in.size() - 1) vDescription << ")";
-        else vDescription << ",";
-    }
+    if (j == in.size() - 1)
+      vDescription << ")";
+    else
+      vDescription << ",";
+  }
 
-    vDescription << "->";
+  vDescription << "->";
 
-    for (std::size_t j = 0; j < out.size(); j++)
-    {
-        if (!j) vDescription << "(";
+  for (std::size_t j = 0; j < out.size(); j++) {
+    if (!j)
+      vDescription << "(";
 
-        HepPDT::ParticleID particleType(out[j]->pdgId());
+    HepPDT::ParticleID particleType(out[j]->pdgId());
 
-        if (particleType.isValid())
-        {
-            pid = pdt_->particle(particleType);
-            if (pid)
-                vDescription << pid->name();
-            else
-                vDescription << out[j]->pdgId();
-        }
-        else
-            vDescription << out[j]->pdgId();
+    if (particleType.isValid()) {
+      pid = pdt_->particle(particleType);
+      if (pid)
+        vDescription << pid->name();
+      else
+        vDescription << out[j]->pdgId();
+    } else
+      vDescription << out[j]->pdgId();
 
-        if (j == out.size() - 1) vDescription << ")";
-        else vDescription << ",";
-    }
+    if (j == out.size() - 1)
+      vDescription << ")";
+    else
+      vDescription << ",";
+  }
 
-    return vDescription.str();
+  return vDescription.str();
 }
 
+std::string VertexHistoryAnalyzer::vertexString(HepMC::GenVertex::particles_in_const_iterator in_begin,
+                                                HepMC::GenVertex::particles_in_const_iterator in_end,
+                                                HepMC::GenVertex::particles_out_const_iterator out_begin,
+                                                HepMC::GenVertex::particles_out_const_iterator out_end) const {
+  ParticleData const *pid;
 
-std::string VertexHistoryAnalyzer::vertexString(
-    HepMC::GenVertex::particles_in_const_iterator in_begin,
-    HepMC::GenVertex::particles_in_const_iterator in_end,
-    HepMC::GenVertex::particles_out_const_iterator out_begin,
-    HepMC::GenVertex::particles_out_const_iterator out_end
-) const
-{
-    ParticleData const * pid;
+  std::ostringstream vDescription;
 
-    std::ostringstream vDescription;
+  std::size_t j = 0;
 
-    std::size_t j = 0;
+  HepMC::GenVertex::particles_in_const_iterator in, itmp;
 
-    HepMC::GenVertex::particles_in_const_iterator in, itmp;
+  for (in = in_begin; in != in_end; in++, j++) {
+    if (!j)
+      vDescription << "(";
 
-    for (in = in_begin; in != in_end; in++, j++)
-    {
-        if (!j) vDescription << "(";
+    HepPDT::ParticleID particleType((*in)->pdg_id());
 
-        HepPDT::ParticleID particleType((*in)->pdg_id());
+    if (particleType.isValid()) {
+      pid = pdt_->particle(particleType);
+      if (pid)
+        vDescription << pid->name();
+      else
+        vDescription << (*in)->pdg_id();
+    } else
+      vDescription << (*in)->pdg_id();
 
-        if (particleType.isValid())
-        {
-            pid = pdt_->particle(particleType);
-            if (pid)
-                vDescription << pid->name();
-            else
-                vDescription << (*in)->pdg_id();
-        }
-        else
-            vDescription << (*in)->pdg_id();
+    itmp = in;
 
-        itmp = in;
+    if (++itmp == in_end)
+      vDescription << ")";
+    else
+      vDescription << ",";
+  }
 
-        if (++itmp == in_end) vDescription << ")";
-        else vDescription << ",";
-    }
+  vDescription << "->";
+  j = 0;
 
-    vDescription << "->";
-    j = 0;
+  HepMC::GenVertex::particles_out_const_iterator out, otmp;
 
-    HepMC::GenVertex::particles_out_const_iterator out, otmp;
+  for (out = out_begin; out != out_end; out++, j++) {
+    if (!j)
+      vDescription << "(";
 
-    for (out = out_begin; out != out_end; out++, j++)
-    {
-        if (!j) vDescription << "(";
+    HepPDT::ParticleID particleType((*out)->pdg_id());
 
-        HepPDT::ParticleID particleType((*out)->pdg_id());
+    if (particleType.isValid()) {
+      pid = pdt_->particle(particleType);
+      if (pid)
+        vDescription << pid->name();
+      else
+        vDescription << (*out)->pdg_id();
+    } else
+      vDescription << (*out)->pdg_id();
 
-        if (particleType.isValid())
-        {
-            pid = pdt_->particle(particleType);
-            if (pid)
-                vDescription << pid->name();
-            else
-                vDescription << (*out)->pdg_id();
-        }
-        else
-            vDescription << (*out)->pdg_id();
+    otmp = out;
 
-        otmp = out;
-
-        if (++otmp == out_end) vDescription << ")";
-        else vDescription << ",";
-    }
+    if (++otmp == out_end)
+      vDescription << ")";
+    else
+      vDescription << ",";
+  }
 
-    return vDescription.str();
+  return vDescription.str();
 }
 
-
 DEFINE_FWK_MODULE(VertexHistoryAnalyzer);
diff --git a/SimTracker/TrackHistory/src/HistoryBase.cc b/SimTracker/TrackHistory/src/HistoryBase.cc
index 982c70bdb8ca3..d844112bab3db 100644
--- a/SimTracker/TrackHistory/src/HistoryBase.cc
+++ b/SimTracker/TrackHistory/src/HistoryBase.cc
@@ -4,154 +4,125 @@
 
 #include "SimTracker/TrackHistory/interface/HistoryBase.h"
 
-
-void HistoryBase::traceRecoGenHistory(reco::GenParticle const * genParticle)
-{
-    // fill the trace of reco::GenParticle for correct reading of the History flags etc.
-    // This is called from the TrackingParticle->genParticle_begin() which is a reco::GenParticle
-    
-    // Take onlt genParticles with a status() smaller than "depth_". Typically depth is 2 and so you trace back untill you reach the hard partons
-    // see for status(): https://twiki.cern.ch/twiki/bin/view/CMSPublic/WorkBookGenParticleCandidate#GenPCand
-    if ( genParticle->status() <= abs(depth_) && (genParticle->pdgId() < 88 || genParticle->pdgId() > 99) )
-    {
-        //If the particle is already in the history, it is looping and you should stop
-        if ( recoGenParticleTrailHelper_.find(genParticle) != recoGenParticleTrailHelper_.end() ){
-           return;
-        }
-        recoGenParticleTrail_.push_back(genParticle);
-        recoGenParticleTrailHelper_.insert(genParticle);
-        // Get the genParticle's mother and trace its history
-        if (genParticle->mother() != nullptr){
-        	traceRecoGenHistory( (const reco::GenParticle *)genParticle->mother() );
-        }
+void HistoryBase::traceRecoGenHistory(reco::GenParticle const *genParticle) {
+  // fill the trace of reco::GenParticle for correct reading of the History
+  // flags etc. This is called from the TrackingParticle->genParticle_begin()
+  // which is a reco::GenParticle
+
+  // Take onlt genParticles with a status() smaller than "depth_". Typically
+  // depth is 2 and so you trace back untill you reach the hard partons see for
+  // status():
+  // https://twiki.cern.ch/twiki/bin/view/CMSPublic/WorkBookGenParticleCandidate#GenPCand
+  if (genParticle->status() <= abs(depth_) && (genParticle->pdgId() < 88 || genParticle->pdgId() > 99)) {
+    // If the particle is already in the history, it is looping and you should
+    // stop
+    if (recoGenParticleTrailHelper_.find(genParticle) != recoGenParticleTrailHelper_.end()) {
+      return;
     }
-}
-
-
-void HistoryBase::traceGenHistory(HepMC::GenParticle const * genParticle)
-{
-    // Third stop criteria: status abs(depth_) particles after the hadronization.
-    // The after hadronization is done by detecting the pdg_id pythia code from 88 to 99
-    if ( genParticle->status() <= abs(depth_) && (genParticle->pdg_id() < 88 || genParticle->pdg_id() > 99) )
-    {
-        genParticleTrail_.push_back(genParticle);
-        // Get the producer vertex and trace it history
-        traceGenHistory( genParticle->production_vertex() );
+    recoGenParticleTrail_.push_back(genParticle);
+    recoGenParticleTrailHelper_.insert(genParticle);
+    // Get the genParticle's mother and trace its history
+    if (genParticle->mother() != nullptr) {
+      traceRecoGenHistory((const reco::GenParticle *)genParticle->mother());
     }
+  }
 }
 
-
-void HistoryBase::traceGenHistory(HepMC::GenVertex const * genVertex)
-{
-    // Verify if has a vertex associated
-    if (genVertex)
-    {
-        // Skip if already exist in the collection
-        if ( genVertexTrailHelper_.find(genVertex) != genVertexTrailHelper_.end() )
-            return;
-        // Add vertex to the history
-        genVertexTrail_.push_back(genVertex);
-        genVertexTrailHelper_.insert(genVertex);
-        // Verify if the vertex has incoming particles
-        if ( genVertex->particles_in_size() )
-            traceGenHistory( *(genVertex->particles_in_const_begin()) );
-    }
+void HistoryBase::traceGenHistory(HepMC::GenParticle const *genParticle) {
+  // Third stop criteria: status abs(depth_) particles after the hadronization.
+  // The after hadronization is done by detecting the pdg_id pythia code from 88
+  // to 99
+  if (genParticle->status() <= abs(depth_) && (genParticle->pdg_id() < 88 || genParticle->pdg_id() > 99)) {
+    genParticleTrail_.push_back(genParticle);
+    // Get the producer vertex and trace it history
+    traceGenHistory(genParticle->production_vertex());
+  }
 }
 
+void HistoryBase::traceGenHistory(HepMC::GenVertex const *genVertex) {
+  // Verify if has a vertex associated
+  if (genVertex) {
+    // Skip if already exist in the collection
+    if (genVertexTrailHelper_.find(genVertex) != genVertexTrailHelper_.end())
+      return;
+    // Add vertex to the history
+    genVertexTrail_.push_back(genVertex);
+    genVertexTrailHelper_.insert(genVertex);
+    // Verify if the vertex has incoming particles
+    if (genVertex->particles_in_size())
+      traceGenHistory(*(genVertex->particles_in_const_begin()));
+  }
+}
 
-bool HistoryBase::traceSimHistory(TrackingParticleRef const & trackingParticle, int depth)
-{
-    // first stop condition: if the required depth is reached
-    if ( depth == depth_ && depth_ >= 0 ) return true;
-
-    // second stop condition: if a gen particle is associated to the TP
-    if ( !trackingParticle->genParticles().empty() )
-    {
-        LogDebug("TrackHistory") << "Particle " << trackingParticle->pdgId() << " has a GenParicle image." 
-				 << std::endl;
-
-	traceRecoGenHistory(&(**(trackingParticle->genParticle_begin()))); 
+bool HistoryBase::traceSimHistory(TrackingParticleRef const &trackingParticle, int depth) {
+  // first stop condition: if the required depth is reached
+  if (depth == depth_ && depth_ >= 0)
+    return true;
 
+  // second stop condition: if a gen particle is associated to the TP
+  if (!trackingParticle->genParticles().empty()) {
+    LogDebug("TrackHistory") << "Particle " << trackingParticle->pdgId() << " has a GenParicle image." << std::endl;
 
-    }
+    traceRecoGenHistory(&(**(trackingParticle->genParticle_begin())));
+  }
 
-    LogDebug("TrackHistory") << "No GenParticle image for " << trackingParticle->pdgId() << std::endl;
+  LogDebug("TrackHistory") << "No GenParticle image for " << trackingParticle->pdgId() << std::endl;
 
-    // if no association between TP and genParticles is found: get a reference to the TP's parent vertex and trace its history
-    return traceSimHistory( trackingParticle->parentVertex(), depth );
+  // if no association between TP and genParticles is found: get a reference to
+  // the TP's parent vertex and trace its history
+  return traceSimHistory(trackingParticle->parentVertex(), depth);
 }
 
-
-bool HistoryBase::traceSimHistory(TrackingVertexRef const & trackingVertex, int depth)
-{
-    // verify if the parent vertex exists
-    if ( trackingVertex.isNonnull() )
-    {
-        // save the vertex in the trail
-        simVertexTrail_.push_back(trackingVertex);
-
-        if ( !trackingVertex->sourceTracks().empty() )
-        {
-            LogDebug("TrackHistory") << "Moving on to the parent particle." << std::endl;
-
-            // select the original source in case of combined vertices
-            bool flag = false;
-            TrackingVertex::tp_iterator itd, its;
-
-            for (its = trackingVertex->sourceTracks_begin(); its != trackingVertex->sourceTracks_end(); its++)
-            {
-                for (itd = trackingVertex->daughterTracks_begin(); itd != trackingVertex->daughterTracks_end(); itd++)
-                    if (itd != its)
-                    {
-                        flag = true;
-                        break;
-                    }
-                if (flag)
-                    break;
-            }
-
-	    if(!flag)
-	      return false;
-
-            // verify if the new particle is not in the trail (looping partiles)
-            if (
-                std::find(
-                    simParticleTrail_.begin(),
-                    simParticleTrail_.end(),
-                    *its
-                ) != simParticleTrail_.end()
-            )
-            {
-                LogDebug("TrackHistory") <<  "WARNING: Looping track found." << std::endl;
-                return false;
-            }
-
-            // save particle in the trail
-            simParticleTrail_.push_back(*its);
-            return traceSimHistory (*its, --depth);
-        }
-        else if ( !trackingVertex->genVertices().empty() )
-        {
-            // navigate over all the associated generated vertexes
-            LogDebug("TrackHistory") << "Vertex has " << trackingVertex->genVertices().size() << "GenVertex image." << std::endl;
-            for (
-                TrackingVertex::genv_iterator ivertex = trackingVertex->genVertices_begin();
-                ivertex != trackingVertex->genVertices_end();
-                ++ivertex
-            )
-                traceGenHistory(&(**(ivertex)));
-            return true;
-        }
-        else
-        {
-            LogDebug("TrackHistory") <<  "WARNING: Source track for tracking vertex cannot be found." << std::endl;
-        }
-    }
-    else
-    {
-        LogDebug("TrackHistory") << " WARNING: Vertex cannot be found.";
+bool HistoryBase::traceSimHistory(TrackingVertexRef const &trackingVertex, int depth) {
+  // verify if the parent vertex exists
+  if (trackingVertex.isNonnull()) {
+    // save the vertex in the trail
+    simVertexTrail_.push_back(trackingVertex);
+
+    if (!trackingVertex->sourceTracks().empty()) {
+      LogDebug("TrackHistory") << "Moving on to the parent particle." << std::endl;
+
+      // select the original source in case of combined vertices
+      bool flag = false;
+      TrackingVertex::tp_iterator itd, its;
+
+      for (its = trackingVertex->sourceTracks_begin(); its != trackingVertex->sourceTracks_end(); its++) {
+        for (itd = trackingVertex->daughterTracks_begin(); itd != trackingVertex->daughterTracks_end(); itd++)
+          if (itd != its) {
+            flag = true;
+            break;
+          }
+        if (flag)
+          break;
+      }
+
+      if (!flag)
+        return false;
+
+      // verify if the new particle is not in the trail (looping partiles)
+      if (std::find(simParticleTrail_.begin(), simParticleTrail_.end(), *its) != simParticleTrail_.end()) {
+        LogDebug("TrackHistory") << "WARNING: Looping track found." << std::endl;
+        return false;
+      }
+
+      // save particle in the trail
+      simParticleTrail_.push_back(*its);
+      return traceSimHistory(*its, --depth);
+    } else if (!trackingVertex->genVertices().empty()) {
+      // navigate over all the associated generated vertexes
+      LogDebug("TrackHistory") << "Vertex has " << trackingVertex->genVertices().size() << "GenVertex image."
+                               << std::endl;
+      for (TrackingVertex::genv_iterator ivertex = trackingVertex->genVertices_begin();
+           ivertex != trackingVertex->genVertices_end();
+           ++ivertex)
+        traceGenHistory(&(**(ivertex)));
+      return true;
+    } else {
+      LogDebug("TrackHistory") << "WARNING: Source track for tracking vertex cannot be found." << std::endl;
     }
+  } else {
+    LogDebug("TrackHistory") << " WARNING: Vertex cannot be found.";
+  }
 
-    return false;
+  return false;
 }
-
diff --git a/SimTracker/TrackHistory/src/JetVetoedTracksAssociatorDRVertex.cc b/SimTracker/TrackHistory/src/JetVetoedTracksAssociatorDRVertex.cc
index 56538f69c681f..35b6b41d7535d 100644
--- a/SimTracker/TrackHistory/src/JetVetoedTracksAssociatorDRVertex.cc
+++ b/SimTracker/TrackHistory/src/JetVetoedTracksAssociatorDRVertex.cc
@@ -1,47 +1,33 @@
 
 #include "SimTracker/TrackHistory/interface/JetVetoedTracksAssociatorDRVertex.h"
 
+JetVetoedTracksAssociationDRVertex::JetVetoedTracksAssociationDRVertex(double dr) : mDeltaR2Threshold(dr * dr) {}
 
-JetVetoedTracksAssociationDRVertex::JetVetoedTracksAssociationDRVertex (double dr) : mDeltaR2Threshold(dr*dr) {}
-
-
-void JetVetoedTracksAssociationDRVertex::produce (
-    reco::JetTracksAssociation::Container* fAssociation,
-    const std::vector<edm::RefToBase<reco::Jet> >& fJets,
-    const std::vector<reco::TrackRef>& fTracks,
-    TrackClassifier & classifier
-) const
-{
-    // cache tracks kinematics
-    std::vector <math::RhoEtaPhiVector> trackP3s;
-    trackP3s.reserve (fTracks.size());
-    for (unsigned i = 0; i < fTracks.size(); ++i)
-    {
-        const reco::Track* track = &*(fTracks[i]);
-        trackP3s.push_back (math::RhoEtaPhiVector (track->p(),track->eta(), track->phi()));
-    }
-    //loop on jets and associate
-    for (unsigned j = 0; j < fJets.size(); ++j)
-    {
-        reco::TrackRefVector assoTracks;
-        const reco::Jet* jet = &*(fJets[j]);
-        double jetEta = jet->eta();
-        double jetPhi = jet->phi();
-        for (unsigned t = 0; t < fTracks.size(); ++t)
-        {
-            double dR2 = deltaR2 (jetEta, jetPhi, trackP3s[t].eta(), trackP3s[t].phi());
-            classifier.evaluate( reco::TrackBaseRef(fTracks[t]) );
-            if (
-                dR2 < mDeltaR2Threshold &&
-                (
-                    classifier.is(TrackClassifier::BWeakDecay) ||
-                    classifier.is(TrackClassifier::CWeakDecay) ||
-                    classifier.is(TrackClassifier::PrimaryVertex)
-                )
-            ) assoTracks.push_back (fTracks[t]);
-        }
-        reco::JetTracksAssociation::setValue (fAssociation, fJets[j], assoTracks);
+void JetVetoedTracksAssociationDRVertex::produce(reco::JetTracksAssociation::Container *fAssociation,
+                                                 const std::vector<edm::RefToBase<reco::Jet>> &fJets,
+                                                 const std::vector<reco::TrackRef> &fTracks,
+                                                 TrackClassifier &classifier) const {
+  // cache tracks kinematics
+  std::vector<math::RhoEtaPhiVector> trackP3s;
+  trackP3s.reserve(fTracks.size());
+  for (unsigned i = 0; i < fTracks.size(); ++i) {
+    const reco::Track *track = &*(fTracks[i]);
+    trackP3s.push_back(math::RhoEtaPhiVector(track->p(), track->eta(), track->phi()));
+  }
+  // loop on jets and associate
+  for (unsigned j = 0; j < fJets.size(); ++j) {
+    reco::TrackRefVector assoTracks;
+    const reco::Jet *jet = &*(fJets[j]);
+    double jetEta = jet->eta();
+    double jetPhi = jet->phi();
+    for (unsigned t = 0; t < fTracks.size(); ++t) {
+      double dR2 = deltaR2(jetEta, jetPhi, trackP3s[t].eta(), trackP3s[t].phi());
+      classifier.evaluate(reco::TrackBaseRef(fTracks[t]));
+      if (dR2 < mDeltaR2Threshold &&
+          (classifier.is(TrackClassifier::BWeakDecay) || classifier.is(TrackClassifier::CWeakDecay) ||
+           classifier.is(TrackClassifier::PrimaryVertex)))
+        assoTracks.push_back(fTracks[t]);
     }
+    reco::JetTracksAssociation::setValue(fAssociation, fJets[j], assoTracks);
+  }
 }
-
-
diff --git a/SimTracker/TrackHistory/src/TrackCategories.cc b/SimTracker/TrackHistory/src/TrackCategories.cc
index 5773c65cd3c8c..6b0e9e847ee66 100644
--- a/SimTracker/TrackHistory/src/TrackCategories.cc
+++ b/SimTracker/TrackHistory/src/TrackCategories.cc
@@ -3,92 +3,82 @@
 
 #include "SimTracker/TrackHistory/interface/TrackCategories.h"
 
-const char * const TrackCategories::Names[] =
-{
-    "Fake",
-    "Bad",
-    "BadInnerHits",
-    "SharedInnerHits",
-    "SignalEvent",
-    "Bottom",
-    "Charm",
-    "Light",
-    "Muon",
-    "TrackerSimHits",
-    "BWeakDecay",
-    "CWeakDecay",
-    "ChargePionDecay",
-    "ChargeKaonDecay",
-    "TauDecay",
-    "KsDecay",
-    "LambdaDecay",
-    "JpsiDecay",
-    "XiDecay",
-    "OmegaDecay",
-    "SigmaPlusDecay",
-    "SigmaMinusDecay",
-    "LongLivedDecay",
-    "KnownProcess",
-    "UndefinedProcess",
-    "UnknownProcess",
-    "PrimaryProcess",
-    "HadronicProcess",
-    "DecayProcess",
-    "ComptonProcess",
-    "AnnihilationProcess",
-    "EIoniProcess",
-    "HIoniProcess",
-    "MuIoniProcess",
-    "PhotonProcess",
-    "MuPairProdProcess",
-    "ConversionsProcess",
-    "EBremProcess",
-    "SynchrotronRadiationProcess",
-    "MuBremProcess",
-    "MuNuclProcess",
-    "FromBWeakDecayMuon",
-    "FromCWeakDecayMuon",
-    "DecayOnFlightMuon",
-    "FromChargePionMuon",
-    "FromChargeKaonMuon",
-    "PrimaryVertex",
-    "SecondaryVertex",
-    "TertiaryVertex",
-    "Unknown"
-};
+const char *const TrackCategories::Names[] = {"Fake",
+                                              "Bad",
+                                              "BadInnerHits",
+                                              "SharedInnerHits",
+                                              "SignalEvent",
+                                              "Bottom",
+                                              "Charm",
+                                              "Light",
+                                              "Muon",
+                                              "TrackerSimHits",
+                                              "BWeakDecay",
+                                              "CWeakDecay",
+                                              "ChargePionDecay",
+                                              "ChargeKaonDecay",
+                                              "TauDecay",
+                                              "KsDecay",
+                                              "LambdaDecay",
+                                              "JpsiDecay",
+                                              "XiDecay",
+                                              "OmegaDecay",
+                                              "SigmaPlusDecay",
+                                              "SigmaMinusDecay",
+                                              "LongLivedDecay",
+                                              "KnownProcess",
+                                              "UndefinedProcess",
+                                              "UnknownProcess",
+                                              "PrimaryProcess",
+                                              "HadronicProcess",
+                                              "DecayProcess",
+                                              "ComptonProcess",
+                                              "AnnihilationProcess",
+                                              "EIoniProcess",
+                                              "HIoniProcess",
+                                              "MuIoniProcess",
+                                              "PhotonProcess",
+                                              "MuPairProdProcess",
+                                              "ConversionsProcess",
+                                              "EBremProcess",
+                                              "SynchrotronRadiationProcess",
+                                              "MuBremProcess",
+                                              "MuNuclProcess",
+                                              "FromBWeakDecayMuon",
+                                              "FromCWeakDecayMuon",
+                                              "DecayOnFlightMuon",
+                                              "FromChargePionMuon",
+                                              "FromChargeKaonMuon",
+                                              "PrimaryVertex",
+                                              "SecondaryVertex",
+                                              "TertiaryVertex",
+                                              "Unknown"};
 
-
-void TrackCategories::unknownTrack()
-{
-    // Check for all flags down
-    for (std::size_t index = 0; index < flags_.size() - 1; ++index)
-        if (flags_[index]) return;
-    // If all of them are down then it is a unkown track.
-    flags_[Unknown] = true;
+void TrackCategories::unknownTrack() {
+  // Check for all flags down
+  for (std::size_t index = 0; index < flags_.size() - 1; ++index)
+    if (flags_[index])
+      return;
+  // If all of them are down then it is a unkown track.
+  flags_[Unknown] = true;
 }
 
+std::ostream &operator<<(std::ostream &os, TrackCategories const &classifier) {
+  bool init = true;
 
-std::ostream & operator<< (std::ostream & os, TrackCategories const & classifier)
-{
-    bool init = true;
-
-    const TrackCategories::Flags & flags = classifier.flags();
+  const TrackCategories::Flags &flags = classifier.flags();
 
-    // Print out the classification for the track
-    for (std::size_t index = 0; index < flags.size(); ++index)
-    {
-        if (flags[index])
-        {
-            if (init)
-            {
-                os << TrackCategories::Names[index];
-                init = false;
-            }
-            else
-                os << "::" << TrackCategories::Names[index];
-        }
+  // Print out the classification for the track
+  for (std::size_t index = 0; index < flags.size(); ++index) {
+    if (flags[index]) {
+      if (init) {
+        os << TrackCategories::Names[index];
+        init = false;
+      } else
+        os << "::" << TrackCategories::Names[index];
     }
-    os << std::endl;
+  }
+  os << std::endl;
 
-    return os;
+  return os;
 }
diff --git a/SimTracker/TrackHistory/src/TrackClassifier.cc b/SimTracker/TrackHistory/src/TrackClassifier.cc
index 3c5bfd380ec97..a3878a3b11399 100644
--- a/SimTracker/TrackHistory/src/TrackClassifier.cc
+++ b/SimTracker/TrackHistory/src/TrackClassifier.cc
@@ -7,639 +7,570 @@
 
 #include "SimTracker/TrackHistory/interface/TrackClassifier.h"
 
-#define update(a, b) do { (a) = (a) | (b); } while(0)
+#define update(a, b) \
+  do {               \
+    (a) = (a) | (b); \
+  } while (0)
+
+TrackClassifier::TrackClassifier(edm::ParameterSet const &config, edm::ConsumesCollector &&collector)
+    : TrackCategories(),
+      hepMCLabel_(config.getUntrackedParameter<edm::InputTag>("hepMC")),
+      beamSpotLabel_(config.getUntrackedParameter<edm::InputTag>("beamSpot")),
+      tracer_(config, std::move(collector)),
+      quality_(config, collector) {
+  collector.consumes<edm::HepMCProduct>(hepMCLabel_);
+  collector.consumes<reco::BeamSpot>(beamSpotLabel_);
+
+  // Set the history depth after hadronization
+  tracer_.depth(-2);
+
+  // Set the maximum d0pull for the bad category
+  badPull_ = config.getUntrackedParameter<double>("badPull");
+
+  // Set the minimum decay length for detecting long decays
+  longLivedDecayLength_ = config.getUntrackedParameter<double>("longLivedDecayLength");
+
+  // Set the distance for clustering vertices
+  float vertexClusteringDistance = config.getUntrackedParameter<double>("vertexClusteringDistance");
+  vertexClusteringSqDistance_ = vertexClusteringDistance * vertexClusteringDistance;
+
+  // Set the number of innermost layers to check for bad hits
+  numberOfInnerLayers_ = config.getUntrackedParameter<unsigned int>("numberOfInnerLayers");
+
+  // Set the minimum number of simhits in the tracker
+  minTrackerSimHits_ = config.getUntrackedParameter<unsigned int>("minTrackerSimHits");
+}
+
+void TrackClassifier::newEvent(edm::Event const &event, edm::EventSetup const &setup) {
+  // Get the new event information for the tracer
+  tracer_.newEvent(event, setup);
 
-TrackClassifier::TrackClassifier(edm::ParameterSet const & config,
-                                 edm::ConsumesCollector&& collector) : TrackCategories(),
-        hepMCLabel_( config.getUntrackedParameter<edm::InputTag>("hepMC") ),
-        beamSpotLabel_( config.getUntrackedParameter<edm::InputTag>("beamSpot") ),
-        tracer_(config,std::move(collector)),
-        quality_(config, collector)
-{
-    collector.consumes<edm::HepMCProduct>(hepMCLabel_);
-    collector.consumes<reco::BeamSpot>(beamSpotLabel_);
+  // Get the new event information for the track quality analyser
+  quality_.newEvent(event, setup);
 
-    // Set the history depth after hadronization
-    tracer_.depth(-2);
+  // Get hepmc of the event
+  event.getByLabel(hepMCLabel_, mcInformation_);
 
-    // Set the maximum d0pull for the bad category
-    badPull_ = config.getUntrackedParameter<double>("badPull");
+  // Magnetic field
+  setup.get<IdealMagneticFieldRecord>().get(magneticField_);
 
-    // Set the minimum decay length for detecting long decays
-    longLivedDecayLength_ = config.getUntrackedParameter<double>("longLivedDecayLength");
+  // Get the partivle data table
+  setup.getData(particleDataTable_);
 
-    // Set the distance for clustering vertices
-    float vertexClusteringDistance = config.getUntrackedParameter<double>("vertexClusteringDistance");
-    vertexClusteringSqDistance_ = vertexClusteringDistance * vertexClusteringDistance;
+  // get the beam spot
+  event.getByLabel(beamSpotLabel_, beamSpot_);
 
-    // Set the number of innermost layers to check for bad hits
-    numberOfInnerLayers_ = config.getUntrackedParameter<unsigned int>("numberOfInnerLayers");
+  // Transient track builder
+  setup.get<TransientTrackRecord>().get("TransientTrackBuilder", transientTrackBuilder_);
 
-    // Set the minimum number of simhits in the tracker
-    minTrackerSimHits_ = config.getUntrackedParameter<unsigned int>("minTrackerSimHits");
+  // Create the list of primary vertices associated to the event
+  genPrimaryVertices();
+
+  // Retrieve tracker topology from geometry
+  edm::ESHandle<TrackerTopology> tTopoHand;
+  setup.get<TrackerTopologyRcd>().get(tTopoHand);
+  tTopo_ = tTopoHand.product();
 }
 
+TrackClassifier const &TrackClassifier::evaluate(reco::TrackBaseRef const &track) {
+  // Initializing the category vector
+  reset();
 
-void TrackClassifier::newEvent ( edm::Event const & event, edm::EventSetup const & setup )
-{
-    // Get the new event information for the tracer
-    tracer_.newEvent(event, setup);
+  // Associate and evaluate the track history (check for fakes)
+  if (tracer_.evaluate(track)) {
+    // Classify all the tracks by their association and reconstruction
+    // information
+    reconstructionInformation(track);
 
-    // Get the new event information for the track quality analyser
-    quality_.newEvent(event, setup);
+    // Get all the information related to the simulation details
+    simulationInformation();
 
-    // Get hepmc of the event
-    event.getByLabel(hepMCLabel_, mcInformation_);
+    // Analyse the track reconstruction quality
+    qualityInformation(track);
 
-    // Magnetic field
-    setup.get<IdealMagneticFieldRecord>().get(magneticField_);
+    // Get hadron flavor of the initial hadron
+    hadronFlavor();
 
-    // Get the partivle data table
-    setup.getData(particleDataTable_);
+    // Get all the information related to decay process
+    processesAtGenerator();
 
-    // get the beam spot
-    event.getByLabel(beamSpotLabel_, beamSpot_);
+    // Get information about conversion and other interactions
+    processesAtSimulation();
 
-    // Transient track builder
-    setup.get<TransientTrackRecord>().get("TransientTrackBuilder", transientTrackBuilder_);
+    // Get geometrical information about the vertices
+    vertexInformation();
 
-    // Create the list of primary vertices associated to the event
-    genPrimaryVertices();
+    // Check for unkown classification
+    unknownTrack();
+  } else
+    flags_[Fake] = true;
 
-    //Retrieve tracker topology from geometry
-    edm::ESHandle<TrackerTopology> tTopoHand;
-    setup.get<TrackerTopologyRcd>().get(tTopoHand);
-    tTopo_=tTopoHand.product();
+  return *this;
 }
 
+TrackClassifier const &TrackClassifier::evaluate(TrackingParticleRef const &track) {
+  // Initializing the category vector
+  reset();
 
-TrackClassifier const & TrackClassifier::evaluate (reco::TrackBaseRef const & track)
-{
-    // Initializing the category vector
-    reset();
+  // Trace the history for the given TP
+  tracer_.evaluate(track);
 
-    // Associate and evaluate the track history (check for fakes)
-    if ( tracer_.evaluate(track) )
-    {
-        // Classify all the tracks by their association and reconstruction information
-        reconstructionInformation(track);
+  // Collect the associated reco track
+  const reco::TrackBaseRef &recotrack = tracer_.recoTrack();
 
-        // Get all the information related to the simulation details
-        simulationInformation();
+  // If there is a reco truck then evaluate the simulated history
+  if (recotrack.isNonnull()) {
+    flags_[Reconstructed] = true;
+    // Classify all the tracks by their association and reconstruction
+    // information
+    reconstructionInformation(recotrack);
+    // Analyse the track reconstruction quality
+    qualityInformation(recotrack);
+  } else
+    flags_[Reconstructed] = false;
 
-        // Analyse the track reconstruction quality
-        qualityInformation(track);
+  // Get all the information related to the simulation details
+  simulationInformation();
 
-        // Get hadron flavor of the initial hadron
-        hadronFlavor();
+  // Get hadron flavor of the initial hadron
+  hadronFlavor();
 
-        // Get all the information related to decay process
-        processesAtGenerator();
+  // Get all the information related to decay process
+  processesAtGenerator();
 
-        // Get information about conversion and other interactions
-        processesAtSimulation();
+  // Get information about conversion and other interactions
+  processesAtSimulation();
 
-        // Get geometrical information about the vertices
-        vertexInformation();
+  // Get geometrical information about the vertices
+  vertexInformation();
 
-        // Check for unkown classification
-        unknownTrack();
-    }
-    else
-        flags_[Fake] = true;
+  // Check for unkown classification
+  unknownTrack();
 
-    return *this;
+  return *this;
 }
 
+void TrackClassifier::reconstructionInformation(reco::TrackBaseRef const &track) {
+  TrackingParticleRef tpr = tracer_.simParticle();
 
-TrackClassifier const & TrackClassifier::evaluate (TrackingParticleRef const & track)
-{
-    // Initializing the category vector
-    reset();
+  // Compute tracking particle parameters at point of closest approach to the
+  // beamline
 
-    // Trace the history for the given TP
-    tracer_.evaluate(track);
+  const SimTrack *assocTrack = &(*tpr->g4Track_begin());
 
-    // Collect the associated reco track
-    const reco::TrackBaseRef & recotrack = tracer_.recoTrack();
+  FreeTrajectoryState ftsAtProduction(
+      GlobalPoint(tpr->vertex().x(), tpr->vertex().y(), tpr->vertex().z()),
+      GlobalVector(assocTrack->momentum().x(), assocTrack->momentum().y(), assocTrack->momentum().z()),
+      TrackCharge(track->charge()),
+      magneticField_.product());
 
-    // If there is a reco truck then evaluate the simulated history
-    if ( recotrack.isNonnull() )
-    {
-        flags_[Reconstructed] = true;
-        // Classify all the tracks by their association and reconstruction information
-        reconstructionInformation(recotrack);
-        // Analyse the track reconstruction quality
-        qualityInformation(recotrack);
-    }
-    else
-        flags_[Reconstructed] = false;
+  try {
+    TSCPBuilderNoMaterial tscpBuilder;
+    TrajectoryStateClosestToPoint tsAtClosestApproach =
+        tscpBuilder(ftsAtProduction, GlobalPoint(beamSpot_->x0(), beamSpot_->y0(), beamSpot_->z0()));
 
-    // Get all the information related to the simulation details
-    simulationInformation();
+    GlobalVector v =
+        tsAtClosestApproach.theState().position() - GlobalPoint(beamSpot_->x0(), beamSpot_->y0(), beamSpot_->z0());
+    GlobalVector p = tsAtClosestApproach.theState().momentum();
 
-    // Get hadron flavor of the initial hadron
-    hadronFlavor();
+    // Simulated dxy
+    double dxySim = -v.x() * sin(p.phi()) + v.y() * cos(p.phi());
 
-    // Get all the information related to decay process
-    processesAtGenerator();
+    // Simulated dz
+    double dzSim = v.z() - (v.x() * p.x() + v.y() * p.y()) * p.z() / p.perp2();
 
-    // Get information about conversion and other interactions
-    processesAtSimulation();
+    // Calculate the dxy pull
+    double dxyPull =
+        std::abs(track->dxy(reco::TrackBase::Point(beamSpot_->x0(), beamSpot_->y0(), beamSpot_->z0())) - dxySim) /
+        track->dxyError();
 
-    // Get geometrical information about the vertices
-    vertexInformation();
+    // Calculate the dx pull
+    double dzPull =
+        std::abs(track->dz(reco::TrackBase::Point(beamSpot_->x0(), beamSpot_->y0(), beamSpot_->z0())) - dzSim) /
+        track->dzError();
 
-    // Check for unkown classification
-    unknownTrack();
+    // Return true if d0Pull > badD0Pull sigmas
+    flags_[Bad] = (dxyPull > badPull_ || dzPull > badPull_);
 
-    return *this;
+  } catch (cms::Exception const &) {
+    flags_[Bad] = true;
+  }
 }
 
-
-void TrackClassifier::reconstructionInformation(reco::TrackBaseRef const & track)
-{
-    TrackingParticleRef tpr = tracer_.simParticle();
-
-    // Compute tracking particle parameters at point of closest approach to the beamline
-
-    const SimTrack * assocTrack = &(*tpr->g4Track_begin());
-
-    FreeTrajectoryState ftsAtProduction(
-        GlobalPoint(
-            tpr->vertex().x(),
-            tpr->vertex().y(),
-            tpr->vertex().z()
-        ),
-        GlobalVector(
-            assocTrack->momentum().x(),
-            assocTrack->momentum().y(),
-            assocTrack->momentum().z()
-        ),
-        TrackCharge(track->charge()),
-        magneticField_.product()
-    );
-
-    try
-    {
-        TSCPBuilderNoMaterial tscpBuilder;
-        TrajectoryStateClosestToPoint tsAtClosestApproach = tscpBuilder(
-                    ftsAtProduction,
-                    GlobalPoint(beamSpot_->x0(), beamSpot_->y0(), beamSpot_->z0())
-                );
-
-        GlobalVector v = tsAtClosestApproach.theState().position()
-                         - GlobalPoint(beamSpot_->x0(), beamSpot_->y0(), beamSpot_->z0());
-        GlobalVector p = tsAtClosestApproach.theState().momentum();
-
-        // Simulated dxy
-        double dxySim = -v.x()*sin(p.phi()) + v.y()*cos(p.phi());
-
-        // Simulated dz
-        double dzSim = v.z() - (v.x()*p.x() + v.y()*p.y())*p.z()/p.perp2();
-
-        // Calculate the dxy pull
-        double dxyPull = std::abs(
-                             track->dxy( reco::TrackBase::Point(beamSpot_->x0(), beamSpot_->y0(), beamSpot_->z0()) ) - dxySim
-                         ) / track->dxyError();
-
-        // Calculate the dx pull
-        double dzPull = std::abs(
-                            track->dz( reco::TrackBase::Point(beamSpot_->x0(), beamSpot_->y0(), beamSpot_->z0()) ) - dzSim
-                        ) / track->dzError();
-
-        // Return true if d0Pull > badD0Pull sigmas
-        flags_[Bad] = (dxyPull > badPull_ || dzPull > badPull_);
-
-    }
-    catch (cms::Exception const&)
-    {
-        flags_[Bad] = true;
-    }
+void TrackClassifier::simulationInformation() {
+  // Get the event id for the initial TP.
+  EncodedEventId eventId = tracer_.simParticle()->eventId();
+  // Check for signal events
+  flags_[SignalEvent] = !eventId.bunchCrossing() && !eventId.event();
+  // Check for muons
+  flags_[Muon] = (abs(tracer_.simParticle()->pdgId()) == 13);
+  // Check for the number of psimhit in tracker
+  flags_[TrackerSimHits] = tracer_.simParticle()->numberOfTrackerLayers() >= (int)minTrackerSimHits_;
 }
 
-
-void TrackClassifier::simulationInformation()
-{
-    // Get the event id for the initial TP.
-    EncodedEventId eventId = tracer_.simParticle()->eventId();
-    // Check for signal events
-    flags_[SignalEvent] = !eventId.bunchCrossing() && !eventId.event();
-    // Check for muons
-    flags_[Muon] = (abs(tracer_.simParticle()->pdgId()) == 13);
-    // Check for the number of psimhit in tracker
-    flags_[TrackerSimHits] = tracer_.simParticle()->numberOfTrackerLayers() >= (int)minTrackerSimHits_;
-}
-
-
-void TrackClassifier::qualityInformation(reco::TrackBaseRef const & track)
-{
-    // run the hit-by-hit reconstruction quality analysis
+void TrackClassifier::qualityInformation(reco::TrackBaseRef const &track) {
+  // run the hit-by-hit reconstruction quality analysis
   quality_.evaluate(tracer_.simParticleTrail(), track, tTopo_);
 
-    unsigned int maxLayers = std::min(numberOfInnerLayers_, quality_.numberOfLayers());
+  unsigned int maxLayers = std::min(numberOfInnerLayers_, quality_.numberOfLayers());
 
-    // check the innermost layers for bad hits
-    for (unsigned int i = 0; i < maxLayers; i++)
-    {
-        const TrackQuality::Layer &layer = quality_.layer(i);
+  // check the innermost layers for bad hits
+  for (unsigned int i = 0; i < maxLayers; i++) {
+    const TrackQuality::Layer &layer = quality_.layer(i);
 
-        // check all hits in that layer
-        for (unsigned int j = 0; j < layer.hits.size(); j++)
-        {
-            const TrackQuality::Layer::Hit &hit = layer.hits[j];
+    // check all hits in that layer
+    for (unsigned int j = 0; j < layer.hits.size(); j++) {
+      const TrackQuality::Layer::Hit &hit = layer.hits[j];
 
-            // In those cases the bad hit was used by track reconstruction
-            if (hit.state == TrackQuality::Layer::Noise ||
-                    hit.state == TrackQuality::Layer::Misassoc)
-                flags_[BadInnerHits] = true;
-            else if (hit.state == TrackQuality::Layer::Shared)
-                flags_[SharedInnerHits] = true;
-        }
+      // In those cases the bad hit was used by track reconstruction
+      if (hit.state == TrackQuality::Layer::Noise || hit.state == TrackQuality::Layer::Misassoc)
+        flags_[BadInnerHits] = true;
+      else if (hit.state == TrackQuality::Layer::Shared)
+        flags_[SharedInnerHits] = true;
     }
+  }
 }
 
+void TrackClassifier::hadronFlavor() {
+  // Get the initial hadron from the recoGenParticleTrail
+  const reco::GenParticle *particle = tracer_.recoGenParticle();
+
+  // Check for the initial hadron
+  if (particle) {
+    HepPDT::ParticleID pid(particle->pdgId());
+    flags_[Bottom] = pid.hasBottom();
+    flags_[Charm] = pid.hasCharm();
+    flags_[Light] = !pid.hasCharm() && !pid.hasBottom();
+  }
+}
 
-void TrackClassifier::hadronFlavor()
-{
-    // Get the initial hadron from the recoGenParticleTrail
-    const reco::GenParticle * particle = tracer_.recoGenParticle();
-
-    // Check for the initial hadron
-    if (particle)
-    {
-        HepPDT::ParticleID pid(particle->pdgId());
-        flags_[Bottom] = pid.hasBottom();
-        flags_[Charm] =  pid.hasCharm();
-        flags_[Light] = !pid.hasCharm() && !pid.hasBottom();
+void TrackClassifier::processesAtGenerator() {
+  // pdgid of the "in" particle to the production vertex
+  int pdgid = 0;
+
+  // Get the generated particles from track history (reco::GenParticle in the
+  // recoGenParticleTrail)
+  TrackHistory::RecoGenParticleTrail const &recoGenParticleTrail = tracer_.recoGenParticleTrail();
+
+  // Loop over the generated particles (reco::GenParticle in the
+  // recoGenParticleTrail)
+  for (TrackHistory::RecoGenParticleTrail::const_iterator iparticle = recoGenParticleTrail.begin();
+       iparticle != recoGenParticleTrail.end();
+       ++iparticle) {
+    pdgid = std::abs((*iparticle)->pdgId());
+    // Get particle type
+    HepPDT::ParticleID particleID(pdgid);
+
+    // Check if the particle type is valid one
+    if (particleID.isValid()) {
+      // Get particle data
+      ParticleData const *particleData = particleDataTable_->particle(particleID);
+      // Check if the particle exist in the table
+      if (particleData) {
+        // Check if their life time is bigger than longLivedDecayLength_
+        if (particleData->lifetime() > longLivedDecayLength_)
+          update(flags_[LongLivedDecay], true);
+        // Check for B and C weak decays
+        update(flags_[BWeakDecay], particleID.hasBottom());
+        update(flags_[CWeakDecay], particleID.hasCharm());
+        // Check for B and C pure leptonic decay
+        std::set<int> daughterIds;
+        size_t ndau = (*iparticle)->numberOfDaughters();
+        for (size_t i = 0; i < ndau; ++i) {
+          daughterIds.insert((*iparticle)->daughter(i)->pdgId());
+        }
+        update(flags_[FromBWeakDecayMuon], particleID.hasBottom() && (daughterIds.find(13) != daughterIds.end()));
+        update(flags_[FromCWeakDecayMuon], particleID.hasCharm() && (daughterIds.find(13) != daughterIds.end()));
+      }
+      // Check Tau, Ks and Lambda decay
+      update(flags_[ChargePionDecay], pdgid == 211);
+      update(flags_[ChargeKaonDecay], pdgid == 321);
+      update(flags_[TauDecay], pdgid == 15);
+      update(flags_[KsDecay], pdgid == 310);
+      update(flags_[LambdaDecay], pdgid == 3122);
+      update(flags_[JpsiDecay], pdgid == 443);
+      update(flags_[XiDecay], pdgid == 3312);
+      update(flags_[SigmaPlusDecay], pdgid == 3222);
+      update(flags_[SigmaMinusDecay], pdgid == 3112);
     }
+  }
+  // Decays in flight
+  update(flags_[FromChargePionMuon], flags_[Muon] && flags_[ChargePionDecay]);
+  update(flags_[FromChargeKaonMuon], flags_[Muon] && flags_[ChargeKaonDecay]);
+  update(flags_[DecayOnFlightMuon], (flags_[FromChargePionMuon] || flags_[FromChargeKaonMuon]));
 }
 
+void TrackClassifier::processesAtSimulation() {
+  TrackHistory::SimParticleTrail const &simParticleTrail = tracer_.simParticleTrail();
 
-void TrackClassifier::processesAtGenerator()
-{
-    // pdgid of the "in" particle to the production vertex
+  // Loop over the simulated particles
+  for (TrackHistory::SimParticleTrail::const_iterator iparticle = simParticleTrail.begin();
+       iparticle != simParticleTrail.end();
+       ++iparticle) {
+    // pdgid of the real source parent vertex
     int pdgid = 0;
 
-    // Get the generated particles from track history (reco::GenParticle in the recoGenParticleTrail)
-    TrackHistory::RecoGenParticleTrail const & recoGenParticleTrail = tracer_.recoGenParticleTrail();
-
-    // Loop over the generated particles (reco::GenParticle in the recoGenParticleTrail)
-    for (TrackHistory::RecoGenParticleTrail::const_iterator iparticle = recoGenParticleTrail.begin(); iparticle != recoGenParticleTrail.end(); ++iparticle)
-    {
-                pdgid = std::abs((*iparticle)->pdgId());
-                // Get particle type
-                HepPDT::ParticleID particleID(pdgid);
-
-                // Check if the particle type is valid one
-                if (particleID.isValid())
-                {
-                    // Get particle data
-                    ParticleData const * particleData = particleDataTable_->particle(particleID);
-                    // Check if the particle exist in the table
-                    if (particleData)
-                    {
-                        // Check if their life time is bigger than longLivedDecayLength_
-                        if ( particleData->lifetime() > longLivedDecayLength_ )
-                            update(flags_[LongLivedDecay], true);
-                        // Check for B and C weak decays
-                        update(flags_[BWeakDecay], particleID.hasBottom());
-                        update(flags_[CWeakDecay], particleID.hasCharm());
-                        // Check for B and C pure leptonic decay
-                        std::set<int> daughterIds;
-                        size_t ndau = (*iparticle)->numberOfDaughters();
-                        for( size_t i = 0; i < ndau; ++ i ){
-    						daughterIds.insert((*iparticle)->daughter(i)->pdgId());
-    					}
-                        update(flags_[FromBWeakDecayMuon], particleID.hasBottom() && (daughterIds.find(13) != daughterIds.end()));
-                        update(flags_[FromCWeakDecayMuon], particleID.hasCharm() && (daughterIds.find(13) != daughterIds.end()));
-                    }
-                    // Check Tau, Ks and Lambda decay
-                    update(flags_[ChargePionDecay], pdgid == 211);
-                    update(flags_[ChargeKaonDecay], pdgid == 321);
-                    update(flags_[TauDecay], pdgid == 15);
-                    update(flags_[KsDecay], pdgid == 310);
-                    update(flags_[LambdaDecay], pdgid == 3122);
-                    update(flags_[JpsiDecay], pdgid == 443);
-                    update(flags_[XiDecay], pdgid == 3312);
-                    update(flags_[SigmaPlusDecay], pdgid == 3222);
-                    update(flags_[SigmaMinusDecay], pdgid == 3112);
-                }            
+    // Get a reference to the TP's parent vertex
+    TrackingVertexRef const &parentVertex = (*iparticle)->parentVertex();
+
+    // Look for the original source track
+    if (parentVertex.isNonnull()) {
+      // select the original source in case of combined vertices
+      bool flag = false;
+      TrackingVertex::tp_iterator itd, its;
+
+      for (its = parentVertex->sourceTracks_begin(); its != parentVertex->sourceTracks_end(); ++its) {
+        for (itd = parentVertex->daughterTracks_begin(); itd != parentVertex->daughterTracks_end(); ++itd)
+          if (itd != its) {
+            flag = true;
+            break;
+          }
+        if (flag)
+          break;
+      }
+
+      // Collect the pdgid of the original source track
+      if (its != parentVertex->sourceTracks_end())
+        pdgid = std::abs((*its)->pdgId());
+      else
+        pdgid = 0;
     }
-    // Decays in flight
-    update(flags_[FromChargePionMuon], flags_[Muon] && flags_[ChargePionDecay]);
-    update(flags_[FromChargeKaonMuon], flags_[Muon] && flags_[ChargeKaonDecay]);
-    update(flags_[DecayOnFlightMuon], (flags_[FromChargePionMuon] || flags_[FromChargeKaonMuon]));
-}
 
+    unsigned int processG4 = 0;
 
-void TrackClassifier::processesAtSimulation()
-{
-    TrackHistory::SimParticleTrail const & simParticleTrail = tracer_.simParticleTrail();
-
-    // Loop over the simulated particles
-    for (
-        TrackHistory::SimParticleTrail::const_iterator iparticle = simParticleTrail.begin();
-        iparticle != simParticleTrail.end();
-        ++iparticle
-    )
-    {
-        // pdgid of the real source parent vertex
-        int pdgid = 0;
-
-        // Get a reference to the TP's parent vertex
-        TrackingVertexRef const & parentVertex = (*iparticle)->parentVertex();
-
-        // Look for the original source track
-        if ( parentVertex.isNonnull() )
-        {
-            // select the original source in case of combined vertices
-            bool flag = false;
-            TrackingVertex::tp_iterator itd, its;
-
-            for (its = parentVertex->sourceTracks_begin(); its != parentVertex->sourceTracks_end(); ++its)
-            {
-                for (itd = parentVertex->daughterTracks_begin(); itd != parentVertex->daughterTracks_end(); ++itd)
-                    if (itd != its)
-                    {
-                        flag = true;
-                        break;
-                    }
-                if (flag)
-                    break;
-            }
-
-            // Collect the pdgid of the original source track
-            if ( its != parentVertex->sourceTracks_end() )
-                pdgid = std::abs((*its)->pdgId());
-            else
-                pdgid = 0;
-        }
+    // Check existence of SimVerteces assigned
+    if (parentVertex->nG4Vertices() > 0) {
+      processG4 = (*(parentVertex->g4Vertices_begin())).processType();
+    }
 
-        unsigned int processG4 = 0;
-
-	// Check existence of SimVerteces assigned
-        if(parentVertex->nG4Vertices() > 0) {
-	  processG4 = (*(parentVertex->g4Vertices_begin())).processType();
-	}
-	
-	unsigned int process = g4toCMSProcMap_.processId(processG4);
-
-        // Flagging all the different processes
-        update(
-            flags_[KnownProcess],
-            process != CMS::Undefined &&
-            process != CMS::Unknown &&
-            process != CMS::Primary
-        );
-
-        update(flags_[UndefinedProcess], process == CMS::Undefined);
-        update(flags_[UnknownProcess], process == CMS::Unknown);
-        update(flags_[PrimaryProcess], process == CMS::Primary);
-        update(flags_[HadronicProcess], process == CMS::Hadronic);
-        update(flags_[DecayProcess], process == CMS::Decay);
-        update(flags_[ComptonProcess], process == CMS::Compton);
-        update(flags_[AnnihilationProcess], process == CMS::Annihilation);
-        update(flags_[EIoniProcess], process == CMS::EIoni);
-        update(flags_[HIoniProcess], process == CMS::HIoni);
-        update(flags_[MuIoniProcess], process == CMS::MuIoni);
-        update(flags_[PhotonProcess], process == CMS::Photon);
-        update(flags_[MuPairProdProcess], process == CMS::MuPairProd);
-        update(flags_[ConversionsProcess], process == CMS::Conversions);
-        update(flags_[EBremProcess], process == CMS::EBrem);
-        update(flags_[SynchrotronRadiationProcess], process == CMS::SynchrotronRadiation);
-        update(flags_[MuBremProcess], process == CMS::MuBrem);
-        update(flags_[MuNuclProcess], process == CMS::MuNucl);
-
-        // Get particle type
-        HepPDT::ParticleID particleID(pdgid);
-
-        // Check if the particle type is valid one
-        if (particleID.isValid())
-        {
-            // Get particle data
-            ParticleData const * particleData = particleDataTable_->particle(particleID);
-            // Special treatment for decays
-            if (process == CMS::Decay)
-            {
-                // Check if the particle exist in the table
-                if (particleData)
-                {
-                    // Check if their life time is bigger than 1e-14
-                    if ( particleDataTable_->particle(particleID)->lifetime() > longLivedDecayLength_ )
-                        update(flags_[LongLivedDecay], true);
-
-                    // Check for B and C weak decays
-                    update(flags_[BWeakDecay], particleID.hasBottom());
-                    update(flags_[CWeakDecay], particleID.hasCharm());
-
-                    // Check for B or C pure leptonic decays
-                    int daughtId = abs((*iparticle)->pdgId());
-                    update(flags_[FromBWeakDecayMuon], particleID.hasBottom() && daughtId == 13);
-                    update(flags_[FromCWeakDecayMuon], particleID.hasCharm() && daughtId == 13);
-                }
-                // Check decays
-                update(flags_[ChargePionDecay], pdgid == 211);
-                update(flags_[ChargeKaonDecay], pdgid == 321);
-                update(flags_[TauDecay], pdgid == 15);
-                update(flags_[KsDecay], pdgid == 310);
-                update(flags_[LambdaDecay], pdgid == 3122);
-                update(flags_[JpsiDecay], pdgid == 443);
-                update(flags_[XiDecay], pdgid == 3312);
-                update(flags_[OmegaDecay], pdgid == 3334);
-                update(flags_[SigmaPlusDecay], pdgid == 3222);
-                update(flags_[SigmaMinusDecay], pdgid == 3112);
-            }
+    unsigned int process = g4toCMSProcMap_.processId(processG4);
+
+    // Flagging all the different processes
+    update(flags_[KnownProcess], process != CMS::Undefined && process != CMS::Unknown && process != CMS::Primary);
+
+    update(flags_[UndefinedProcess], process == CMS::Undefined);
+    update(flags_[UnknownProcess], process == CMS::Unknown);
+    update(flags_[PrimaryProcess], process == CMS::Primary);
+    update(flags_[HadronicProcess], process == CMS::Hadronic);
+    update(flags_[DecayProcess], process == CMS::Decay);
+    update(flags_[ComptonProcess], process == CMS::Compton);
+    update(flags_[AnnihilationProcess], process == CMS::Annihilation);
+    update(flags_[EIoniProcess], process == CMS::EIoni);
+    update(flags_[HIoniProcess], process == CMS::HIoni);
+    update(flags_[MuIoniProcess], process == CMS::MuIoni);
+    update(flags_[PhotonProcess], process == CMS::Photon);
+    update(flags_[MuPairProdProcess], process == CMS::MuPairProd);
+    update(flags_[ConversionsProcess], process == CMS::Conversions);
+    update(flags_[EBremProcess], process == CMS::EBrem);
+    update(flags_[SynchrotronRadiationProcess], process == CMS::SynchrotronRadiation);
+    update(flags_[MuBremProcess], process == CMS::MuBrem);
+    update(flags_[MuNuclProcess], process == CMS::MuNucl);
+
+    // Get particle type
+    HepPDT::ParticleID particleID(pdgid);
+
+    // Check if the particle type is valid one
+    if (particleID.isValid()) {
+      // Get particle data
+      ParticleData const *particleData = particleDataTable_->particle(particleID);
+      // Special treatment for decays
+      if (process == CMS::Decay) {
+        // Check if the particle exist in the table
+        if (particleData) {
+          // Check if their life time is bigger than 1e-14
+          if (particleDataTable_->particle(particleID)->lifetime() > longLivedDecayLength_)
+            update(flags_[LongLivedDecay], true);
+
+          // Check for B and C weak decays
+          update(flags_[BWeakDecay], particleID.hasBottom());
+          update(flags_[CWeakDecay], particleID.hasCharm());
+
+          // Check for B or C pure leptonic decays
+          int daughtId = abs((*iparticle)->pdgId());
+          update(flags_[FromBWeakDecayMuon], particleID.hasBottom() && daughtId == 13);
+          update(flags_[FromCWeakDecayMuon], particleID.hasCharm() && daughtId == 13);
         }
+        // Check decays
+        update(flags_[ChargePionDecay], pdgid == 211);
+        update(flags_[ChargeKaonDecay], pdgid == 321);
+        update(flags_[TauDecay], pdgid == 15);
+        update(flags_[KsDecay], pdgid == 310);
+        update(flags_[LambdaDecay], pdgid == 3122);
+        update(flags_[JpsiDecay], pdgid == 443);
+        update(flags_[XiDecay], pdgid == 3312);
+        update(flags_[OmegaDecay], pdgid == 3334);
+        update(flags_[SigmaPlusDecay], pdgid == 3222);
+        update(flags_[SigmaMinusDecay], pdgid == 3112);
+      }
     }
-    // Decays in flight
-    update(flags_[FromChargePionMuon], flags_[Muon] && flags_[ChargePionDecay]);
-    update(flags_[FromChargeKaonMuon], flags_[Muon] && flags_[ChargeKaonDecay]);
-    update(flags_[DecayOnFlightMuon], flags_[FromChargePionMuon] || flags_[FromChargeKaonMuon]);
+  }
+  // Decays in flight
+  update(flags_[FromChargePionMuon], flags_[Muon] && flags_[ChargePionDecay]);
+  update(flags_[FromChargeKaonMuon], flags_[Muon] && flags_[ChargeKaonDecay]);
+  update(flags_[DecayOnFlightMuon], flags_[FromChargePionMuon] || flags_[FromChargeKaonMuon]);
 }
 
-
-void TrackClassifier::vertexInformation()
-{
-    // Get the main primary vertex from the list
-    GeneratedPrimaryVertex const & genpv = genpvs_.back();
-
-    // Get the generated history of the tracks
-    const TrackHistory::GenParticleTrail & genParticleTrail = tracer_.genParticleTrail();
-
-    // Vertex counter
-    int counter = 0;
-
-    // Unit transformation from mm to cm
-    double const mm = 0.1;
-
-    double oldX = genpv.x;
-    double oldY = genpv.y;
-    double oldZ = genpv.z;
-
-    // Loop over the generated particles
-    for (
-        TrackHistory::GenParticleTrail::const_reverse_iterator iparticle = genParticleTrail.rbegin();
-        iparticle != genParticleTrail.rend();
-        ++iparticle
-    )
-    {
-        // Look for those with production vertex
-        HepMC::GenVertex * parent = (*iparticle)->production_vertex();
-        if (parent)
-        {
-            HepMC::ThreeVector p = parent->point3d();
-
-            double distance2   = pow(p.x() * mm - genpv.x, 2) + pow(p.y() * mm - genpv.y, 2) + pow(p.z() * mm - genpv.z, 2);
-            double difference2 = pow(p.x() * mm - oldX, 2)    + pow(p.y() * mm - oldY, 2)    + pow(p.z() * mm - oldZ, 2);
-
-            // std::cout << "Distance2 : " << distance2 << " (" << p.x() * mm << "," << p.y() * mm << "," << p.z() * mm << ")" << std::endl;
-            // std::cout << "Difference2 : " << difference2 << std::endl;
-
-            if ( difference2 > vertexClusteringSqDistance_ )
-            {
-                if ( distance2 > vertexClusteringSqDistance_ ) counter++;
-                oldX = p.x() * mm;
-                oldY = p.y() * mm;
-                oldZ = p.z() * mm;
-            }
-        }
+void TrackClassifier::vertexInformation() {
+  // Get the main primary vertex from the list
+  GeneratedPrimaryVertex const &genpv = genpvs_.back();
+
+  // Get the generated history of the tracks
+  const TrackHistory::GenParticleTrail &genParticleTrail = tracer_.genParticleTrail();
+
+  // Vertex counter
+  int counter = 0;
+
+  // Unit transformation from mm to cm
+  double const mm = 0.1;
+
+  double oldX = genpv.x;
+  double oldY = genpv.y;
+  double oldZ = genpv.z;
+
+  // Loop over the generated particles
+  for (TrackHistory::GenParticleTrail::const_reverse_iterator iparticle = genParticleTrail.rbegin();
+       iparticle != genParticleTrail.rend();
+       ++iparticle) {
+    // Look for those with production vertex
+    HepMC::GenVertex *parent = (*iparticle)->production_vertex();
+    if (parent) {
+      HepMC::ThreeVector p = parent->point3d();
+
+      double distance2 = pow(p.x() * mm - genpv.x, 2) + pow(p.y() * mm - genpv.y, 2) + pow(p.z() * mm - genpv.z, 2);
+      double difference2 = pow(p.x() * mm - oldX, 2) + pow(p.y() * mm - oldY, 2) + pow(p.z() * mm - oldZ, 2);
+
+      // std::cout << "Distance2 : " << distance2 << " (" << p.x() * mm << ","
+      // << p.y() * mm << "," << p.z() * mm << ")" << std::endl; std::cout <<
+      // "Difference2 : " << difference2 << std::endl;
+
+      if (difference2 > vertexClusteringSqDistance_) {
+        if (distance2 > vertexClusteringSqDistance_)
+          counter++;
+        oldX = p.x() * mm;
+        oldY = p.y() * mm;
+        oldZ = p.z() * mm;
+      }
     }
-
-    const TrackHistory::SimParticleTrail & simParticleTrail = tracer_.simParticleTrail();
-
-    // Loop over the generated particles
-    for (
-        TrackHistory::SimParticleTrail::const_reverse_iterator iparticle = simParticleTrail.rbegin();
-        iparticle != simParticleTrail.rend();
-        ++iparticle
-    )
-    {
-        // Look for those with production vertex
-        TrackingParticle::Point p = (*iparticle)->vertex();
-
-        double distance2   = pow(p.x() - genpv.x, 2) + pow(p.y() - genpv.y, 2) + pow(p.z() - genpv.z, 2);
-        double difference2 = pow(p.x() - oldX, 2)    + pow(p.y() - oldY, 2)    + pow(p.z() - oldZ, 2);
-
-        // std::cout << "Distance2 : " << distance2 << " (" << p.x() << "," << p.y() << "," << p.z() << ")" << std::endl;
-        // std::cout << "Difference2 : " << difference2 << std::endl;
-
-        if ( difference2 > vertexClusteringSqDistance_ )
-        {
-            if ( distance2 > vertexClusteringSqDistance_ ) counter++;
-            oldX = p.x();
-            oldY = p.y();
-            oldZ = p.z();
-        }
+  }
+
+  const TrackHistory::SimParticleTrail &simParticleTrail = tracer_.simParticleTrail();
+
+  // Loop over the generated particles
+  for (TrackHistory::SimParticleTrail::const_reverse_iterator iparticle = simParticleTrail.rbegin();
+       iparticle != simParticleTrail.rend();
+       ++iparticle) {
+    // Look for those with production vertex
+    TrackingParticle::Point p = (*iparticle)->vertex();
+
+    double distance2 = pow(p.x() - genpv.x, 2) + pow(p.y() - genpv.y, 2) + pow(p.z() - genpv.z, 2);
+    double difference2 = pow(p.x() - oldX, 2) + pow(p.y() - oldY, 2) + pow(p.z() - oldZ, 2);
+
+    // std::cout << "Distance2 : " << distance2 << " (" << p.x() << "," << p.y()
+    // << "," << p.z() << ")" << std::endl; std::cout << "Difference2 : " <<
+    // difference2 << std::endl;
+
+    if (difference2 > vertexClusteringSqDistance_) {
+      if (distance2 > vertexClusteringSqDistance_)
+        counter++;
+      oldX = p.x();
+      oldY = p.y();
+      oldZ = p.z();
     }
-
-    if ( !counter )
-        flags_[PrimaryVertex] = true;
-    else if ( counter == 1 )
-        flags_[SecondaryVertex] = true;
-    else
-        flags_[TertiaryVertex] = true;
+  }
+
+  if (!counter)
+    flags_[PrimaryVertex] = true;
+  else if (counter == 1)
+    flags_[SecondaryVertex] = true;
+  else
+    flags_[TertiaryVertex] = true;
 }
 
+bool TrackClassifier::isFinalstateParticle(const HepMC::GenParticle *p) { return !p->end_vertex() && p->status() == 1; }
 
-bool TrackClassifier::isFinalstateParticle(const HepMC::GenParticle * p)
-{
-    return !p->end_vertex() && p->status() == 1;
+bool TrackClassifier::isCharged(const HepMC::GenParticle *p) {
+  const ParticleData *part = particleDataTable_->particle(p->pdg_id());
+  if (part)
+    return part->charge() != 0;
+  else {
+    // the new/improved particle table doesn't know anti-particles
+    return particleDataTable_->particle(-p->pdg_id()) != nullptr;
+  }
 }
 
+void TrackClassifier::genPrimaryVertices() {
+  genpvs_.clear();
 
-bool TrackClassifier::isCharged(const HepMC::GenParticle * p)
-{
-    const ParticleData * part = particleDataTable_->particle( p->pdg_id() );
-    if (part)
-        return part->charge()!=0;
-    else
-    {
-        // the new/improved particle table doesn't know anti-particles
-        return  particleDataTable_->particle( -p->pdg_id() ) != nullptr;
-    }
-}
+  const HepMC::GenEvent *event = mcInformation_->GetEvent();
+
+  if (event) {
+    int idx = 0;
 
+    // Loop over the different GenVertex
+    for (HepMC::GenEvent::vertex_const_iterator ivertex = event->vertices_begin(); ivertex != event->vertices_end();
+         ++ivertex) {
+      bool hasParentVertex = false;
 
-void TrackClassifier::genPrimaryVertices()
-{
-    genpvs_.clear();
-
-    const HepMC::GenEvent * event = mcInformation_->GetEvent();
-
-    if (event)
-    {
-        int idx = 0;
-
-        // Loop over the different GenVertex
-        for ( HepMC::GenEvent::vertex_const_iterator ivertex = event->vertices_begin(); ivertex != event->vertices_end(); ++ivertex )
-        {
-            bool hasParentVertex = false;
-
-            // Loop over the parents looking to see if they are coming from a production vertex
-            for (
-                HepMC::GenVertex::particle_iterator iparent = (*ivertex)->particles_begin(HepMC::parents);
-                iparent != (*ivertex)->particles_end(HepMC::parents);
-                ++iparent
-            )
-                if ( (*iparent)->production_vertex() )
-                {
-                    hasParentVertex = true;
-                    break;
-                }
-
-            // Reject those vertices with parent vertices
-            if (hasParentVertex) continue;
-
-            // Get the position of the vertex
-            HepMC::FourVector pos = (*ivertex)->position();
-
-            double const mm = 0.1;
-
-            GeneratedPrimaryVertex pv(pos.x()*mm, pos.y()*mm, pos.z()*mm);
-
-            std::vector<GeneratedPrimaryVertex>::iterator ientry = genpvs_.begin();
-
-            // Search for a VERY close vertex in the list
-            for (; ientry != genpvs_.end(); ++ientry)
-            {
-                double distance2 = pow(pv.x - ientry->x, 2) + pow(pv.y - ientry->y, 2) + pow(pv.z - ientry->z, 2);
-                if ( distance2 < vertexClusteringSqDistance_ )
-                    break;
-            }
-
-            // Check if there is not a VERY close vertex and added to the list
-            if (ientry == genpvs_.end())
-                ientry = genpvs_.insert(ientry,pv);
-
-            // Add the vertex barcodes to the new or existent vertices
-            ientry->genVertex.push_back((*ivertex)->barcode());
-
-            // Collect final state descendants
-            for (
-                HepMC::GenVertex::particle_iterator idecendants  = (*ivertex)->particles_begin(HepMC::descendants);
-                idecendants != (*ivertex)->particles_end(HepMC::descendants);
-                ++idecendants
-            )
-            {
-                if (isFinalstateParticle(*idecendants))
-                    if ( find(ientry->finalstateParticles.begin(), ientry->finalstateParticles.end(), (*idecendants)->barcode()) == ientry->finalstateParticles.end() )
-                    {
-                        ientry->finalstateParticles.push_back((*idecendants)->barcode());
-                        HepMC::FourVector m = (*idecendants)->momentum();
-
-                        ientry->ptot.setPx(ientry->ptot.px() + m.px());
-                        ientry->ptot.setPy(ientry->ptot.py() + m.py());
-                        ientry->ptot.setPz(ientry->ptot.pz() + m.pz());
-                        ientry->ptot.setE(ientry->ptot.e() + m.e());
-                        ientry->ptsq += m.perp() * m.perp();
-
-                        if ( m.perp() > 0.8 && std::abs(m.pseudoRapidity()) < 2.5 && isCharged(*idecendants) ) ientry->nGenTrk++;
-                    }
-            }
-            idx++;
+      // Loop over the parents looking to see if they are coming from a
+      // production vertex
+      for (HepMC::GenVertex::particle_iterator iparent = (*ivertex)->particles_begin(HepMC::parents);
+           iparent != (*ivertex)->particles_end(HepMC::parents);
+           ++iparent)
+        if ((*iparent)->production_vertex()) {
+          hasParentVertex = true;
+          break;
         }
+
+      // Reject those vertices with parent vertices
+      if (hasParentVertex)
+        continue;
+
+      // Get the position of the vertex
+      HepMC::FourVector pos = (*ivertex)->position();
+
+      double const mm = 0.1;
+
+      GeneratedPrimaryVertex pv(pos.x() * mm, pos.y() * mm, pos.z() * mm);
+
+      std::vector<GeneratedPrimaryVertex>::iterator ientry = genpvs_.begin();
+
+      // Search for a VERY close vertex in the list
+      for (; ientry != genpvs_.end(); ++ientry) {
+        double distance2 = pow(pv.x - ientry->x, 2) + pow(pv.y - ientry->y, 2) + pow(pv.z - ientry->z, 2);
+        if (distance2 < vertexClusteringSqDistance_)
+          break;
+      }
+
+      // Check if there is not a VERY close vertex and added to the list
+      if (ientry == genpvs_.end())
+        ientry = genpvs_.insert(ientry, pv);
+
+      // Add the vertex barcodes to the new or existent vertices
+      ientry->genVertex.push_back((*ivertex)->barcode());
+
+      // Collect final state descendants
+      for (HepMC::GenVertex::particle_iterator idecendants = (*ivertex)->particles_begin(HepMC::descendants);
+           idecendants != (*ivertex)->particles_end(HepMC::descendants);
+           ++idecendants) {
+        if (isFinalstateParticle(*idecendants))
+          if (find(ientry->finalstateParticles.begin(), ientry->finalstateParticles.end(), (*idecendants)->barcode()) ==
+              ientry->finalstateParticles.end()) {
+            ientry->finalstateParticles.push_back((*idecendants)->barcode());
+            HepMC::FourVector m = (*idecendants)->momentum();
+
+            ientry->ptot.setPx(ientry->ptot.px() + m.px());
+            ientry->ptot.setPy(ientry->ptot.py() + m.py());
+            ientry->ptot.setPz(ientry->ptot.pz() + m.pz());
+            ientry->ptot.setE(ientry->ptot.e() + m.e());
+            ientry->ptsq += m.perp() * m.perp();
+
+            if (m.perp() > 0.8 && std::abs(m.pseudoRapidity()) < 2.5 && isCharged(*idecendants))
+              ientry->nGenTrk++;
+          }
+      }
+      idx++;
     }
+  }
 
-    std::sort(genpvs_.begin(), genpvs_.end());
+  std::sort(genpvs_.begin(), genpvs_.end());
 }
diff --git a/SimTracker/TrackHistory/src/TrackHistory.cc b/SimTracker/TrackHistory/src/TrackHistory.cc
index 46d08dab76be9..f52862a2b75d0 100644
--- a/SimTracker/TrackHistory/src/TrackHistory.cc
+++ b/SimTracker/TrackHistory/src/TrackHistory.cc
@@ -2,87 +2,75 @@
 #include "SimTracker/Records/interface/TrackAssociatorRecord.h"
 #include "SimTracker/TrackHistory/interface/TrackHistory.h"
 
+TrackHistory::TrackHistory(const edm::ParameterSet &config, edm::ConsumesCollector &&collector) : HistoryBase() {
+  // Name of the track collection
+  trackProducer_ = config.getUntrackedParameter<edm::InputTag>("trackProducer");
+  collector.consumes<edm::View<reco::Track>>(trackProducer_);
 
-TrackHistory::TrackHistory (
-  const edm::ParameterSet & config,
-  edm::ConsumesCollector&& collector
-) : HistoryBase()
-{
-    // Name of the track collection
-    trackProducer_ = config.getUntrackedParameter<edm::InputTag> ( "trackProducer" );
-    collector.consumes<edm::View<reco::Track> >(trackProducer_);
+  // Name of the traking pariticle collection
+  trackingTruth_ = config.getUntrackedParameter<edm::InputTag>("trackingTruth");
+  collector.consumes<TrackingParticleCollection>(trackingTruth_);
 
-    // Name of the traking pariticle collection
-    trackingTruth_ = config.getUntrackedParameter<edm::InputTag> ( "trackingTruth" );
-    collector.consumes<TrackingParticleCollection>(trackingTruth_);
+  // Track association record
+  trackAssociator_ = config.getUntrackedParameter<edm::InputTag>("trackAssociator");
 
-    // Track association record
-    trackAssociator_ = config.getUntrackedParameter<edm::InputTag> ( "trackAssociator" );
+  // Association by max. value
+  bestMatchByMaxValue_ = config.getUntrackedParameter<bool>("bestMatchByMaxValue");
 
-    // Association by max. value
-    bestMatchByMaxValue_ = config.getUntrackedParameter<bool> ( "bestMatchByMaxValue" );
+  // Enable RecoToSim association
+  enableRecoToSim_ = config.getUntrackedParameter<bool>("enableRecoToSim");
 
-    // Enable RecoToSim association
-    enableRecoToSim_ = config.getUntrackedParameter<bool> ( "enableRecoToSim" );
+  // Enable SimToReco association
+  enableSimToReco_ = config.getUntrackedParameter<bool>("enableSimToReco");
 
-    // Enable SimToReco association
-    enableSimToReco_ = config.getUntrackedParameter<bool> ( "enableSimToReco" );
+  if (enableRecoToSim_ or enableSimToReco_) {
+    collector.consumes<reco::TrackToTrackingParticleAssociator>(trackAssociator_);
+  }
 
-    if(enableRecoToSim_ or enableSimToReco_) {
-      collector.consumes<reco::TrackToTrackingParticleAssociator>(trackAssociator_);
-    }
-
-    quality_ = 0.;
+  quality_ = 0.;
 }
 
+void TrackHistory::newEvent(const edm::Event &event, const edm::EventSetup &setup) {
+  if (enableRecoToSim_ || enableSimToReco_) {
+    // Track collection
+    edm::Handle<edm::View<reco::Track>> trackCollection;
+    event.getByLabel(trackProducer_, trackCollection);
 
-void TrackHistory::newEvent (
-    const edm::Event & event, const edm::EventSetup & setup
-)
-{
-    if ( enableRecoToSim_ || enableSimToReco_ )
-    {
-        // Track collection
-        edm::Handle<edm::View<reco::Track> > trackCollection;
-        event.getByLabel(trackProducer_, trackCollection);
-
-        // Tracking particle information
-        edm::Handle<TrackingParticleCollection>  TPCollection;
-        event.getByLabel(trackingTruth_, TPCollection);
+    // Tracking particle information
+    edm::Handle<TrackingParticleCollection> TPCollection;
+    event.getByLabel(trackingTruth_, TPCollection);
 
-        // Get the track associator
-        edm::Handle<reco::TrackToTrackingParticleAssociator> associator;
-        event.getByLabel(trackAssociator_, associator);
+    // Get the track associator
+    edm::Handle<reco::TrackToTrackingParticleAssociator> associator;
+    event.getByLabel(trackAssociator_, associator);
 
-        // Calculate the map between recotracks -> tp
-        if ( enableRecoToSim_ ) recoToSim_ = associator->associateRecoToSim(trackCollection, TPCollection);
+    // Calculate the map between recotracks -> tp
+    if (enableRecoToSim_)
+      recoToSim_ = associator->associateRecoToSim(trackCollection, TPCollection);
 
-        // Calculate the map between recotracks <- tp
-        if ( enableSimToReco_ ) simToReco_ = associator->associateSimToReco(trackCollection, TPCollection );
-    }
+    // Calculate the map between recotracks <- tp
+    if (enableSimToReco_)
+      simToReco_ = associator->associateSimToReco(trackCollection, TPCollection);
+  }
 }
 
+bool TrackHistory::evaluate(reco::TrackBaseRef tr) {
+  if (!enableRecoToSim_)
+    return false;
 
-bool TrackHistory::evaluate ( reco::TrackBaseRef tr )
-{
-    if ( !enableRecoToSim_ ) return false;
-
-    std::pair<TrackingParticleRef, double> result =  match(tr, recoToSim_, bestMatchByMaxValue_);
+  std::pair<TrackingParticleRef, double> result = match(tr, recoToSim_, bestMatchByMaxValue_);
 
-    TrackingParticleRef tpr( result.first );
-    quality_ = result.second;
-    trackingParticle_ = tpr;
+  TrackingParticleRef tpr(result.first);
+  quality_ = result.second;
+  trackingParticle_ = tpr;
 
-    if ( !tpr.isNull() )
-    {
-        HistoryBase::evaluate(tpr);
+  if (!tpr.isNull()) {
+    HistoryBase::evaluate(tpr);
 
-        recotrack_ = tr;
+    recotrack_ = tr;
 
-        return true;
-    }
+    return true;
+  }
 
-    return false;
+  return false;
 }
-
-
diff --git a/SimTracker/TrackHistory/src/TrackQuality.cc b/SimTracker/TrackHistory/src/TrackQuality.cc
index 3120ba5fb38ba..a7e57c62ed1ee 100644
--- a/SimTracker/TrackHistory/src/TrackQuality.cc
+++ b/SimTracker/TrackHistory/src/TrackQuality.cc
@@ -2,7 +2,7 @@
  *  TrackQuality.cc
  *
  *  Created by Christophe Saout on 9/25/08.
- *  2007 __MyCompanyName__. 
+ *  2007 __MyCompanyName__.
  *
  */
 
@@ -15,19 +15,19 @@
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
 #include "DataFormats/DetId/interface/DetId.h"
+#include "DataFormats/MuonDetId/interface/CSCDetId.h"
+#include "DataFormats/MuonDetId/interface/DTLayerId.h"
+#include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
+#include "DataFormats/MuonDetId/interface/RPCDetId.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
-#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
-#include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
-#include "DataFormats/MuonDetId/interface/DTLayerId.h"
-#include "DataFormats/MuonDetId/interface/CSCDetId.h"
-#include "DataFormats/MuonDetId/interface/RPCDetId.h"
 
-#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
-#include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
+#include "DataFormats/TrackingRecHit/interface/TrackingRecHit.h"
+#include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h"
 
 #include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
 
@@ -35,271 +35,231 @@
 
 // #define DEBUG_TRACK_QUALITY
 
-namespace
-{
-const uint32_t NonMatchedTrackId = (uint32_t)-1;
+namespace {
+  const uint32_t NonMatchedTrackId = (uint32_t)-1;
 
-struct MatchedHit
-{
+  struct MatchedHit {
     DetId detId;
     uint32_t simTrackId;
     EncodedEventId collision;
     int recHitId;
     TrackQuality::Layer::State state;
 
-    bool operator < (const MatchedHit &other) const
-    {
-        if (detId < other.detId)
-            return true;
-        else if (detId > other.detId)
-            return false;
-        else if (collision < other.collision)
-            return true;
-        else if (other.collision < collision)
-            return false;
-        else
-            return simTrackId < other.simTrackId;
+    bool operator<(const MatchedHit &other) const {
+      if (detId < other.detId)
+        return true;
+      else if (detId > other.detId)
+        return false;
+      else if (collision < other.collision)
+        return true;
+      else if (other.collision < collision)
+        return false;
+      else
+        return simTrackId < other.simTrackId;
     }
 
-    bool operator == (const MatchedHit &other) const
-    {
-        return detId == other.detId &&
-               collision == other.collision &&
-               simTrackId == other.simTrackId;
+    bool operator==(const MatchedHit &other) const {
+      return detId == other.detId && collision == other.collision && simTrackId == other.simTrackId;
     }
-};
+  };
   /*
 static bool operator < (const MatchedHit &hit, DetId detId)
 {
-    return hit.detId < detId;
+  return hit.detId < detId;
 }
 static bool operator < (DetId detId, const MatchedHit &hit)
 {
-    return detId < hit.detId;
-}
-  */
+  return detId < hit.detId;
 }
+*/
+}  // namespace
 
 typedef std::pair<TrackQuality::Layer::SubDet, short int> DetLayer;
 
 // in case multiple hits were found, figure out the highest priority
-static const int statePriorities[] =
-{
-    /* Unknown */  3,
-    /* Good */     5,
-    /* Missed */   0,
-    /* Noise */    7,
-    /* Bad */      2,
-    /* Dead */     4,
-    /* Shared */   6,
-    /* Misassoc */ 1
-};
-
-DetLayer getDetLayer(DetId detId, const TrackerTopology *tTopo)
-{
-    TrackQuality::Layer::SubDet det = TrackQuality::Layer::Invalid;
-    short int layer = 0;
-
-    switch (detId.det())
-    {
+static const int statePriorities[] = {
+    /* Unknown */ 3,
+    /* Good */ 5,
+    /* Missed */ 0,
+    /* Noise */ 7,
+    /* Bad */ 2,
+    /* Dead */ 4,
+    /* Shared */ 6,
+    /* Misassoc */ 1};
+
+DetLayer getDetLayer(DetId detId, const TrackerTopology *tTopo) {
+  TrackQuality::Layer::SubDet det = TrackQuality::Layer::Invalid;
+  short int layer = 0;
+
+  switch (detId.det()) {
     case DetId::Tracker:
-      layer=tTopo->layer(detId);
+      layer = tTopo->layer(detId);
       break;
 
     case DetId::Muon:
-        switch (detId.subdetId())
-        {
+      switch (detId.subdetId()) {
         case MuonSubdetId::DT:
-            det = TrackQuality::Layer::MuonDT;
-            layer = DTLayerId(detId).layer();
-            break;
+          det = TrackQuality::Layer::MuonDT;
+          layer = DTLayerId(detId).layer();
+          break;
 
         case MuonSubdetId::CSC:
-            det = TrackQuality::Layer::MuonCSC;
-            layer = CSCDetId(detId).layer();
-            break;
+          det = TrackQuality::Layer::MuonCSC;
+          layer = CSCDetId(detId).layer();
+          break;
 
         case MuonSubdetId::RPC:
-            if (RPCDetId(detId).region())
-                det = TrackQuality::Layer::MuonRPCEndcap;
-            else
-                det = TrackQuality::Layer::MuonRPCBarrel;
-            layer = RPCDetId(detId).layer();
-            break;
+          if (RPCDetId(detId).region())
+            det = TrackQuality::Layer::MuonRPCEndcap;
+          else
+            det = TrackQuality::Layer::MuonRPCBarrel;
+          layer = RPCDetId(detId).layer();
+          break;
 
         default:
             /* should not get here */
             ;
-        }
-        break;
+      }
+      break;
 
     default:
         /* should not get here */
         ;
-    }
+  }
 
-    return DetLayer(det, layer);
+  return DetLayer(det, layer);
 }
 
-TrackQuality::TrackQuality(const edm::ParameterSet &config,  edm::ConsumesCollector& iC) :
-        trackerHitAssociatorConfig_(config.getParameter<edm::ParameterSet>("hitAssociator"), std::move(iC))
-{
-}
+TrackQuality::TrackQuality(const edm::ParameterSet &config, edm::ConsumesCollector &iC)
+    : trackerHitAssociatorConfig_(config.getParameter<edm::ParameterSet>("hitAssociator"), std::move(iC)) {}
 
-void TrackQuality::newEvent(const edm::Event &ev, const edm::EventSetup &es)
-{
-    associator_.reset(new TrackerHitAssociator(ev, trackerHitAssociatorConfig_));
+void TrackQuality::newEvent(const edm::Event &ev, const edm::EventSetup &es) {
+  associator_.reset(new TrackerHitAssociator(ev, trackerHitAssociatorConfig_));
 }
 
-void TrackQuality::evaluate(SimParticleTrail const &spt,
-                            reco::TrackBaseRef const &tr,
-			    const TrackerTopology *tTopo)
-{
-    std::vector<MatchedHit> matchedHits;
-
-    // iterate over reconstructed hits
-    for (trackingRecHit_iterator hit = tr->recHitsBegin();
-            hit != tr->recHitsEnd(); ++hit)
-    {
-        // on which module the hit lies
-        DetId detId = (*hit)->geographicalId();
-
-        // FIXME: check for double-sided modules?
-
-        // didn't find a hit on that module
-        if (!(*hit)->isValid())
-        {
-            MatchedHit matchedHit;
-            matchedHit.detId = detId;
-            matchedHit.simTrackId = NonMatchedTrackId;
-            // check why hit wasn't valid and propagate information
-            switch ((*hit)->getType())
-            {
-            case TrackingRecHit::inactive:
-                matchedHit.state = Layer::Dead;
-                break;
-
-            case TrackingRecHit::bad:
-                matchedHit.state = Layer::Bad;
-                break;
-
-            default:
-                matchedHit.state = Layer::Missed;
-            }
-            matchedHit.recHitId = hit - tr->recHitsBegin();
-            matchedHits.push_back(matchedHit);
-            continue;
-        }
-
-        // find simulated tracks causing hit that was reconstructed
-        std::vector<SimHitIdpr> simIds = associator_->associateHitId(**hit);
-
-        // must be noise or so
-        if (simIds.empty())
-        {
-            MatchedHit matchedHit;
-            matchedHit.detId = detId;
-            matchedHit.simTrackId = NonMatchedTrackId;
-            matchedHit.state = Layer::Noise;
-            matchedHit.recHitId = hit - tr->recHitsBegin();
-            matchedHits.push_back(matchedHit);
-            continue;
-        }
-
-        // register all simulated tracks contributing
-        for (std::vector<SimHitIdpr>::const_iterator i = simIds.begin();
-                i != simIds.end(); ++i)
-        {
-            MatchedHit matchedHit;
-            matchedHit.detId = detId;
-            matchedHit.simTrackId = i->first;
-            matchedHit.collision = i->second;
-            // RecHit <-> SimHit matcher currently doesn't support muon system
-            if (detId.det() == DetId::Muon)
-                matchedHit.state = Layer::Unknown;
-            else
-                // assume hit was mismatched (until possible confirmation)
-                matchedHit.state = Layer::Misassoc;
-            matchedHit.recHitId = hit - tr->recHitsBegin();
-            matchedHits.push_back(matchedHit);
-        }
+void TrackQuality::evaluate(SimParticleTrail const &spt, reco::TrackBaseRef const &tr, const TrackerTopology *tTopo) {
+  std::vector<MatchedHit> matchedHits;
+
+  // iterate over reconstructed hits
+  for (trackingRecHit_iterator hit = tr->recHitsBegin(); hit != tr->recHitsEnd(); ++hit) {
+    // on which module the hit lies
+    DetId detId = (*hit)->geographicalId();
+
+    // FIXME: check for double-sided modules?
+
+    // didn't find a hit on that module
+    if (!(*hit)->isValid()) {
+      MatchedHit matchedHit;
+      matchedHit.detId = detId;
+      matchedHit.simTrackId = NonMatchedTrackId;
+      // check why hit wasn't valid and propagate information
+      switch ((*hit)->getType()) {
+        case TrackingRecHit::inactive:
+          matchedHit.state = Layer::Dead;
+          break;
+
+        case TrackingRecHit::bad:
+          matchedHit.state = Layer::Bad;
+          break;
+
+        default:
+          matchedHit.state = Layer::Missed;
+      }
+      matchedHit.recHitId = hit - tr->recHitsBegin();
+      matchedHits.push_back(matchedHit);
+      continue;
     }
 
-    // sort hits found so far by module id
-    std::stable_sort(matchedHits.begin(), matchedHits.end());
-
-    // in case we added missed modules, re-sort
-    std::stable_sort(matchedHits.begin(), matchedHits.end());
-
-    // prepare for ordering results by layer enum and layer/disk number
-    typedef std::multimap<DetLayer, const MatchedHit*> LayerHitMap;
-    LayerHitMap layerHitMap;
-
-    // iterate over all simulated/reconstructed hits again
-    for (std::vector<MatchedHit>::const_iterator hit = matchedHits.begin();
-            hit != matchedHits.end();)
-    {
-        // we can have multiple reco-to-sim matches per module, find best one
-        const MatchedHit *best = nullptr;
-
-        // this loop iterates over all subsequent hits in the same module
-        do
-        {
-            // update our best hit pointer
-            if (!best ||
-                    statePriorities[hit->state] > statePriorities[best->state] ||
-                    best->simTrackId == NonMatchedTrackId)
-            {
-                best = &*hit;
-            }
-            ++hit;
-        }
-        while (hit != matchedHits.end() &&
-                hit->detId == best->detId);
-
-        // ignore hit in case track reco was looking at the wrong module
-        if (best->simTrackId != NonMatchedTrackId ||
-                best->state != Layer::Missed)
-        {
-            layerHitMap.insert(std::make_pair(
-					      getDetLayer(best->detId,tTopo), best));
-        }
+    // find simulated tracks causing hit that was reconstructed
+    std::vector<SimHitIdpr> simIds = associator_->associateHitId(**hit);
+
+    // must be noise or so
+    if (simIds.empty()) {
+      MatchedHit matchedHit;
+      matchedHit.detId = detId;
+      matchedHit.simTrackId = NonMatchedTrackId;
+      matchedHit.state = Layer::Noise;
+      matchedHit.recHitId = hit - tr->recHitsBegin();
+      matchedHits.push_back(matchedHit);
+      continue;
     }
 
-    layers_.clear();
+    // register all simulated tracks contributing
+    for (std::vector<SimHitIdpr>::const_iterator i = simIds.begin(); i != simIds.end(); ++i) {
+      MatchedHit matchedHit;
+      matchedHit.detId = detId;
+      matchedHit.simTrackId = i->first;
+      matchedHit.collision = i->second;
+      // RecHit <-> SimHit matcher currently doesn't support muon system
+      if (detId.det() == DetId::Muon)
+        matchedHit.state = Layer::Unknown;
+      else
+        // assume hit was mismatched (until possible confirmation)
+        matchedHit.state = Layer::Misassoc;
+      matchedHit.recHitId = hit - tr->recHitsBegin();
+      matchedHits.push_back(matchedHit);
+    }
+  }
+
+  // sort hits found so far by module id
+  std::stable_sort(matchedHits.begin(), matchedHits.end());
+
+  // in case we added missed modules, re-sort
+  std::stable_sort(matchedHits.begin(), matchedHits.end());
+
+  // prepare for ordering results by layer enum and layer/disk number
+  typedef std::multimap<DetLayer, const MatchedHit *> LayerHitMap;
+  LayerHitMap layerHitMap;
+
+  // iterate over all simulated/reconstructed hits again
+  for (std::vector<MatchedHit>::const_iterator hit = matchedHits.begin(); hit != matchedHits.end();) {
+    // we can have multiple reco-to-sim matches per module, find best one
+    const MatchedHit *best = nullptr;
+
+    // this loop iterates over all subsequent hits in the same module
+    do {
+      // update our best hit pointer
+      if (!best || statePriorities[hit->state] > statePriorities[best->state] ||
+          best->simTrackId == NonMatchedTrackId) {
+        best = &*hit;
+      }
+      ++hit;
+    } while (hit != matchedHits.end() && hit->detId == best->detId);
+
+    // ignore hit in case track reco was looking at the wrong module
+    if (best->simTrackId != NonMatchedTrackId || best->state != Layer::Missed) {
+      layerHitMap.insert(std::make_pair(getDetLayer(best->detId, tTopo), best));
+    }
+  }
+
+  layers_.clear();
 
 #ifdef DEBUG_TRACK_QUALITY
-    std::cout << "---------------------" << std::endl;
+  std::cout << "---------------------" << std::endl;
 #endif
-    // now prepare final collection
-    for (LayerHitMap::const_iterator hit = layerHitMap.begin();
-            hit != layerHitMap.end(); ++hit)
-    {
+  // now prepare final collection
+  for (LayerHitMap::const_iterator hit = layerHitMap.begin(); hit != layerHitMap.end(); ++hit) {
 #ifdef DEBUG_TRACK_QUALITY
-        std::cout
-            << "detLayer (" << hit->first.first << ", " << hit->first.second << ")"
-            << " [" << (uint32_t)hit->second->detId << "] sim(" << (int)hit->second->simTrackId << ")"
-            << " hit(" << hit->second->recHitId << ") -> " << hit->second->state << std::endl;
+    std::cout << "detLayer (" << hit->first.first << ", " << hit->first.second << ")"
+              << " [" << (uint32_t)hit->second->detId << "] sim(" << (int)hit->second->simTrackId << ")"
+              << " hit(" << hit->second->recHitId << ") -> " << hit->second->state << std::endl;
 #endif
 
-        // find out if we need to start a new layer
-        Layer *layer = layers_.empty() ? nullptr : &layers_.back();
-        if (!layer ||
-                hit->first.first != layer->subDet ||
-                hit->first.second != layer->layer)
-        {
-            Layer newLayer;
-            newLayer.subDet = hit->first.first;
-            newLayer.layer = hit->first.second;
-            layers_.push_back(newLayer);
-            layer = &layers_.back();
-        }
-
-        // create hit and add it to layer
-        Layer::Hit newHit;
-        newHit.recHitId = hit->second->recHitId;
-        newHit.state = hit->second->state;
-
-        layer->hits.push_back(newHit);
+    // find out if we need to start a new layer
+    Layer *layer = layers_.empty() ? nullptr : &layers_.back();
+    if (!layer || hit->first.first != layer->subDet || hit->first.second != layer->layer) {
+      Layer newLayer;
+      newLayer.subDet = hit->first.first;
+      newLayer.layer = hit->first.second;
+      layers_.push_back(newLayer);
+      layer = &layers_.back();
     }
+
+    // create hit and add it to layer
+    Layer::Hit newHit;
+    newHit.recHitId = hit->second->recHitId;
+    newHit.state = hit->second->state;
+
+    layer->hits.push_back(newHit);
+  }
 }
diff --git a/SimTracker/TrackHistory/src/Utils.cc b/SimTracker/TrackHistory/src/Utils.cc
index 78391427adb67..18497734a1c59 100644
--- a/SimTracker/TrackHistory/src/Utils.cc
+++ b/SimTracker/TrackHistory/src/Utils.cc
@@ -2,42 +2,42 @@
 #include "SimTracker/TrackHistory/interface/CMSProcessTypes.h"
 #include "SimTracker/TrackHistory/interface/Utils.h"
 
-G4toCMSLegacyProcTypeMap::G4toCMSLegacyProcTypeMap()
-{
+G4toCMSLegacyProcTypeMap::G4toCMSLegacyProcTypeMap() {
   // Geant4Process -> CmsProcess
-  m_map[0]   = CMS::Primary;              // "Primary"         -> "Primary"
-  m_map[91]  = CMS::Unknown;              // "Transportation"  -> "Unknown"
-  m_map[92]  = CMS::Unknown;              // "CoupleTrans"     -> "Unknown" => DOUBLE-CHECK THIS
-  m_map[1]   = CMS::Unknown;              // "CoulombScat"     -> "Unknown" => DOUBLE-CHECK THIS
-  m_map[2]   = CMS::EIoni;                // "Ionisation"      -> "EIoni" => WHAT ABOUT MuIoni?
-  m_map[3]   = CMS::EBrem;                // "Brems"           -> "EBrem" => WHAT ABOUT MuBrem?
-  m_map[4]   = CMS::MuPairProd;           // "PairProdCharged" -> "MuPairProd" => DOUBLE-CHECK THIS
-  m_map[5]   = CMS::Annihilation;         // "Annih"           -> "Annihilation"
-  m_map[6]   = CMS::Annihilation;         // "AnnihToMuMu"     -> "Annihilation"
-  m_map[7]   = CMS::Annihilation;         // "AnnihToHad"      -> "Annihilation"
-  m_map[8]   = CMS::Hadronic;             // "NuclearStopp"    -> "Hadronic" => DOUBLE-CHECK THIS
-  m_map[10]  = CMS::Unknown;              // "Msc"             -> "Unknown" => DOUBLE-CHECK THIS
-  m_map[11]  = CMS::Unknown;              // "Rayleigh"        -> "Unknown" => DOUBLE-CHECK THIS
-  m_map[12]  = CMS::Photon;               // "PhotoElectric"   -> "Photon"
-  m_map[13]  = CMS::Compton;              // "Compton"         -> "Compton"
-  m_map[14]  = CMS::Conversions;          // "Conv"            -> "Conversions"
-  m_map[15]  = CMS::Conversions;          // "ConvToMuMu"      -> "Conversions"
-  m_map[21]  = CMS::Unknown;              // "Cerenkov"        -> "Unknown" => DOUBLE-CHECK THIS
-  m_map[22]  = CMS::Unknown;              // "Scintillation"   -> "Unknown" => DOUBLE-CHECK THIS
-  m_map[23]  = CMS::SynchrotronRadiation; // "SynchRad"        -> "SynchrotronRadiation"
-  m_map[24]  = CMS::SynchrotronRadiation; // "TransRad"        -> "SynchrotronRadiation" => DOUBLE-CHECK THIS
-  m_map[31]  = CMS::Unknown;              // "OpAbsorp"        -> "Unknown" => NOT USED IN CMS
-  m_map[32]  = CMS::Unknown;              // "OpBoundary"      -> "Unknown" => NOT USED IN CMS
-  m_map[33]  = CMS::Unknown;              // "OpRayleigh"      -> "Unknown" => NOT USED IN CMS
-  m_map[34]  = CMS::Unknown;              // "OpWLS"           -> "Unknown" => NOT USED IN CMS
-  m_map[35]  = CMS::Unknown;              // "OpMieHG"         -> "Unknown" => NOT USED IN CMS
-  m_map[51]  = CMS::Unknown;              // "DNAElastic"      -> "Unknown" => NOT USED IN CMS
-  m_map[52]  = CMS::Unknown;              // "DNAExcit"        -> "Unknown" => NOT USED IN CMS
-  m_map[53]  = CMS::Unknown;              // "DNAIonisation"   -> "Unknown" => NOT USED IN CMS
-  m_map[54]  = CMS::Unknown;              // "DNAVibExcit"     -> "Unknown" => NOT USED IN CMS
-  m_map[55]  = CMS::Unknown;              // "DNAAttachment"   -> "Unknown" => NOT USED IN CMS
-  m_map[56]  = CMS::Unknown;              // "DNAChargeDec"    -> "Unknown" => NOT USED IN CMS
-  m_map[57]  = CMS::Unknown;              // "DNAChargeInc"    -> "Unknown" => NOT USED IN CMS
+  m_map[0] = CMS::Primary;                // "Primary"         -> "Primary"
+  m_map[91] = CMS::Unknown;               // "Transportation"  -> "Unknown"
+  m_map[92] = CMS::Unknown;               // "CoupleTrans"     -> "Unknown" => DOUBLE-CHECK THIS
+  m_map[1] = CMS::Unknown;                // "CoulombScat"     -> "Unknown" => DOUBLE-CHECK THIS
+  m_map[2] = CMS::EIoni;                  // "Ionisation"      -> "EIoni" => WHAT ABOUT MuIoni?
+  m_map[3] = CMS::EBrem;                  // "Brems"           -> "EBrem" => WHAT ABOUT MuBrem?
+  m_map[4] = CMS::MuPairProd;             // "PairProdCharged" -> "MuPairProd" => DOUBLE-CHECK THIS
+  m_map[5] = CMS::Annihilation;           // "Annih"           -> "Annihilation"
+  m_map[6] = CMS::Annihilation;           // "AnnihToMuMu"     -> "Annihilation"
+  m_map[7] = CMS::Annihilation;           // "AnnihToHad"      -> "Annihilation"
+  m_map[8] = CMS::Hadronic;               // "NuclearStopp"    -> "Hadronic" => DOUBLE-CHECK THIS
+  m_map[10] = CMS::Unknown;               // "Msc"             -> "Unknown" => DOUBLE-CHECK THIS
+  m_map[11] = CMS::Unknown;               // "Rayleigh"        -> "Unknown" => DOUBLE-CHECK THIS
+  m_map[12] = CMS::Photon;                // "PhotoElectric"   -> "Photon"
+  m_map[13] = CMS::Compton;               // "Compton"         -> "Compton"
+  m_map[14] = CMS::Conversions;           // "Conv"            -> "Conversions"
+  m_map[15] = CMS::Conversions;           // "ConvToMuMu"      -> "Conversions"
+  m_map[21] = CMS::Unknown;               // "Cerenkov"        -> "Unknown" => DOUBLE-CHECK THIS
+  m_map[22] = CMS::Unknown;               // "Scintillation"   -> "Unknown" => DOUBLE-CHECK THIS
+  m_map[23] = CMS::SynchrotronRadiation;  // "SynchRad"        -> "SynchrotronRadiation"
+  m_map[24] = CMS::SynchrotronRadiation;  // "TransRad"        -> "SynchrotronRadiation"
+                                          // => DOUBLE-CHECK THIS
+  m_map[31] = CMS::Unknown;               // "OpAbsorp"        -> "Unknown" => NOT USED IN CMS
+  m_map[32] = CMS::Unknown;               // "OpBoundary"      -> "Unknown" => NOT USED IN CMS
+  m_map[33] = CMS::Unknown;               // "OpRayleigh"      -> "Unknown" => NOT USED IN CMS
+  m_map[34] = CMS::Unknown;               // "OpWLS"           -> "Unknown" => NOT USED IN CMS
+  m_map[35] = CMS::Unknown;               // "OpMieHG"         -> "Unknown" => NOT USED IN CMS
+  m_map[51] = CMS::Unknown;               // "DNAElastic"      -> "Unknown" => NOT USED IN CMS
+  m_map[52] = CMS::Unknown;               // "DNAExcit"        -> "Unknown" => NOT USED IN CMS
+  m_map[53] = CMS::Unknown;               // "DNAIonisation"   -> "Unknown" => NOT USED IN CMS
+  m_map[54] = CMS::Unknown;               // "DNAVibExcit"     -> "Unknown" => NOT USED IN CMS
+  m_map[55] = CMS::Unknown;               // "DNAAttachment"   -> "Unknown" => NOT USED IN CMS
+  m_map[56] = CMS::Unknown;               // "DNAChargeDec"    -> "Unknown" => NOT USED IN CMS
+  m_map[57] = CMS::Unknown;               // "DNAChargeInc"    -> "Unknown" => NOT USED IN CMS
   m_map[111] = CMS::Hadronic;             // "HadElastic"      -> "Hadronic"
   m_map[121] = CMS::Hadronic;             // "HadInelastic"    -> "Hadronic"
   m_map[131] = CMS::Hadronic;             // "HadCapture"      -> "Hadronic"
@@ -56,15 +56,13 @@ G4toCMSLegacyProcTypeMap::G4toCMSLegacyProcTypeMap()
   m_map[403] = CMS::Unknown;              // "NeutronKiller"   -> "Unknown"
 }
 
-const unsigned int G4toCMSLegacyProcTypeMap::processId(unsigned int g4ProcessId) const
-{
+const unsigned int G4toCMSLegacyProcTypeMap::processId(unsigned int g4ProcessId) const {
   MapType::const_iterator it = m_map.find(g4ProcessId);
 
-  if( it == m_map.end() )
-  {
-    edm::LogError("UnknownProcessType") << "Encountered an unknown process type: " << g4ProcessId << ". Mapping it to 'Undefined'.";
+  if (it == m_map.end()) {
+    edm::LogError("UnknownProcessType") << "Encountered an unknown process type: " << g4ProcessId
+                                        << ". Mapping it to 'Undefined'.";
     return CMS::Undefined;
-  }
-  else
+  } else
     return it->second;
 }
diff --git a/SimTracker/TrackHistory/src/VertexCategories.cc b/SimTracker/TrackHistory/src/VertexCategories.cc
index b721087a8d5ea..9ba996773913b 100644
--- a/SimTracker/TrackHistory/src/VertexCategories.cc
+++ b/SimTracker/TrackHistory/src/VertexCategories.cc
@@ -3,77 +3,67 @@
 
 #include "SimTracker/TrackHistory/interface/VertexCategories.h"
 
-const char * const VertexCategories::Names[] =
-{
-    "Fake",
-    "SignalEvent",
-    "BWeakDecay",
-    "CWeakDecay",
-    "TauDecay",
-    "KsDecay",
-    "LambdaDecay",
-    "JpsiDecay",
-    "XiDecay",
-    "OmegaDecay",
-    "SigmaPlusDecay",
-    "SigmaMinusDecay",
-    "LongLivedDecay",
-    "KnownProcess",
-    "UndefinedProcess",
-    "UnknownProcess",
-    "PrimaryProcess",
-    "HadronicProcess",
-    "DecayProcess",
-    "ComptonProcess",
-    "AnnihilationProcess",
-    "EIoniProcess",
-    "HIoniProcess",
-    "MuIoniProcess",
-    "PhotonProcess",
-    "MuPairProdProcess",
-    "ConversionsProcess",
-    "EBremProcess",
-    "SynchrotronRadiationProcess",
-    "MuBremProcess",
-    "MuNuclProcess",
-    "PrimaryVertex",
-    "SecondaryVertex",
-    "TertiaryVertex",
-    "Unknown"
-};
+const char *const VertexCategories::Names[] = {"Fake",
+                                               "SignalEvent",
+                                               "BWeakDecay",
+                                               "CWeakDecay",
+                                               "TauDecay",
+                                               "KsDecay",
+                                               "LambdaDecay",
+                                               "JpsiDecay",
+                                               "XiDecay",
+                                               "OmegaDecay",
+                                               "SigmaPlusDecay",
+                                               "SigmaMinusDecay",
+                                               "LongLivedDecay",
+                                               "KnownProcess",
+                                               "UndefinedProcess",
+                                               "UnknownProcess",
+                                               "PrimaryProcess",
+                                               "HadronicProcess",
+                                               "DecayProcess",
+                                               "ComptonProcess",
+                                               "AnnihilationProcess",
+                                               "EIoniProcess",
+                                               "HIoniProcess",
+                                               "MuIoniProcess",
+                                               "PhotonProcess",
+                                               "MuPairProdProcess",
+                                               "ConversionsProcess",
+                                               "EBremProcess",
+                                               "SynchrotronRadiationProcess",
+                                               "MuBremProcess",
+                                               "MuNuclProcess",
+                                               "PrimaryVertex",
+                                               "SecondaryVertex",
+                                               "TertiaryVertex",
+                                               "Unknown"};
 
-
-void VertexCategories::unknownVertex()
-{
-    // Check for all flags down
-    for (std::size_t index = 0; index < flags_.size() - 1; ++index)
-        if (flags_[index]) return;
-    // If all of them are down then it is a unkown track.
-    flags_[Unknown] = true;
+void VertexCategories::unknownVertex() {
+  // Check for all flags down
+  for (std::size_t index = 0; index < flags_.size() - 1; ++index)
+    if (flags_[index])
+      return;
+  // If all of them are down then it is a unkown track.
+  flags_[Unknown] = true;
 }
 
+std::ostream &operator<<(std::ostream &os, VertexCategories const &classifier) {
+  bool init = true;
 
-std::ostream & operator<< (std::ostream & os, VertexCategories const & classifier)
-{
-    bool init = true;
-
-    const VertexCategories::Flags & flags = classifier.flags();
+  const VertexCategories::Flags &flags = classifier.flags();
 
-    // Print out the classification for the track
-    for (std::size_t index = 0; index < flags.size(); ++index)
-    {
-        if (flags[index])
-        {
-            if (init)
-            {
-                os << VertexCategories::Names[index];
-                init = false;
-            }
-            else
-                os << "::" << VertexCategories::Names[index];
-        }
+  // Print out the classification for the track
+  for (std::size_t index = 0; index < flags.size(); ++index) {
+    if (flags[index]) {
+      if (init) {
+        os << VertexCategories::Names[index];
+        init = false;
+      } else
+        os << "::" << VertexCategories::Names[index];
     }
-    os << std::endl;
+  }
+  os << std::endl;
 
-    return os;
+  return os;
 }
diff --git a/SimTracker/TrackHistory/src/VertexClassifier.cc b/SimTracker/TrackHistory/src/VertexClassifier.cc
index fb852636156c1..c4b134f78d179 100644
--- a/SimTracker/TrackHistory/src/VertexClassifier.cc
+++ b/SimTracker/TrackHistory/src/VertexClassifier.cc
@@ -10,88 +10,46 @@
 
 #include "SimTracker/TrackHistory/interface/VertexClassifier.h"
 
-
-#define update(a, b) do { (a) = (a) | (b); } while(0)
-
-
-VertexClassifier::VertexClassifier(edm::ParameterSet const & config,
-                                   edm::ConsumesCollector&& collector) : 
-        VertexCategories(), 
-        tracer_(config,std::move(collector)),
-        hepMCLabel_( config.getUntrackedParameter<edm::InputTag>("hepMC") )
-{
-    collector.consumes<edm::HepMCProduct>(hepMCLabel_);
-    // Set the history depth after hadronization
-    tracer_.depth(-2);
-
-    // Set the minimum decay length for detecting long decays
-    longLivedDecayLength_ = config.getUntrackedParameter<double>("longLivedDecayLength");
-
-    // Set the distance for clustering vertices
-    vertexClusteringDistance_ = config.getUntrackedParameter<double>("vertexClusteringDistance");
+#define update(a, b) \
+  do {               \
+    (a) = (a) | (b); \
+  } while (0)
+
+VertexClassifier::VertexClassifier(edm::ParameterSet const &config, edm::ConsumesCollector &&collector)
+    : VertexCategories(),
+      tracer_(config, std::move(collector)),
+      hepMCLabel_(config.getUntrackedParameter<edm::InputTag>("hepMC")) {
+  collector.consumes<edm::HepMCProduct>(hepMCLabel_);
+  // Set the history depth after hadronization
+  tracer_.depth(-2);
+
+  // Set the minimum decay length for detecting long decays
+  longLivedDecayLength_ = config.getUntrackedParameter<double>("longLivedDecayLength");
+
+  // Set the distance for clustering vertices
+  vertexClusteringDistance_ = config.getUntrackedParameter<double>("vertexClusteringDistance");
 }
 
+void VertexClassifier::newEvent(edm::Event const &event, edm::EventSetup const &setup) {
+  // Get the new event information for the tracer
+  tracer_.newEvent(event, setup);
 
-void VertexClassifier::newEvent(edm::Event const & event, edm::EventSetup const & setup)
-{
-    // Get the new event information for the tracer
-    tracer_.newEvent(event, setup);
-
-    // Get hepmc of the event
-    event.getByLabel(hepMCLabel_, mcInformation_);
-
-    // Get the partivle data table
-    setup.getData(particleDataTable_);
-
-    // Create the list of primary vertices associated to the event
-    genPrimaryVertices();
-}
-
-
-VertexClassifier const & VertexClassifier::evaluate (reco::VertexBaseRef const & vertex)
-{
-    // Initializing the category vector
-    reset();
-
-    // Associate and evaluate the vertex history (check for fakes)
-    if ( tracer_.evaluate(vertex) )
-    {
-        // Get all the information related to the simulation details
-        simulationInformation();
-
-        // Get all the information related to decay process
-        processesAtGenerator();
-
-        // Get information about conversion and other interactions
-        processesAtSimulation();
-
-        // Get geometrical information about the vertices
-        vertexInformation();
+  // Get hepmc of the event
+  event.getByLabel(hepMCLabel_, mcInformation_);
 
-        // Check for unkown classification
-        unknownVertex();
-    }
-    else
-        flags_[Fake] = true;
+  // Get the partivle data table
+  setup.getData(particleDataTable_);
 
-    return *this;
+  // Create the list of primary vertices associated to the event
+  genPrimaryVertices();
 }
 
+VertexClassifier const &VertexClassifier::evaluate(reco::VertexBaseRef const &vertex) {
+  // Initializing the category vector
+  reset();
 
-VertexClassifier const & VertexClassifier::evaluate (TrackingVertexRef const & vertex)
-{
-    // Initializing the category vector
-    reset();
-
-    // Trace the history for the given TP
-    tracer_.evaluate(vertex);
-
-    // Check for a reconstructed track
-    if ( tracer_.recoVertex().isNonnull() )
-        flags_[Reconstructed] = true;
-    else
-        flags_[Reconstructed] = false;
-
+  // Associate and evaluate the vertex history (check for fakes)
+  if (tracer_.evaluate(vertex)) {
     // Get all the information related to the simulation details
     simulationInformation();
 
@@ -106,433 +64,393 @@ VertexClassifier const & VertexClassifier::evaluate (TrackingVertexRef const & v
 
     // Check for unkown classification
     unknownVertex();
+  } else
+    flags_[Fake] = true;
 
-    return *this;
+  return *this;
 }
 
+VertexClassifier const &VertexClassifier::evaluate(TrackingVertexRef const &vertex) {
+  // Initializing the category vector
+  reset();
 
-void VertexClassifier::simulationInformation()
-{
-    // Get the event id for the initial TP.
-    EncodedEventId eventId = tracer_.simVertex()->eventId();
-    // Check for signal events
-    flags_[SignalEvent] = !eventId.bunchCrossing() && !eventId.event();
-}
+  // Trace the history for the given TP
+  tracer_.evaluate(vertex);
 
+  // Check for a reconstructed track
+  if (tracer_.recoVertex().isNonnull())
+    flags_[Reconstructed] = true;
+  else
+    flags_[Reconstructed] = false;
 
-void VertexClassifier::processesAtGenerator()
-{
-    // Get the generated vetices from track history
-    VertexHistory::GenVertexTrail const & genVertexTrail = tracer_.genVertexTrail();
-
-    // Loop over the generated vertices
-    for (
-        VertexHistory::GenVertexTrail::const_iterator ivertex = genVertexTrail.begin();
-        ivertex != genVertexTrail.end();
-        ++ivertex
-    )
-    {
-        // Get the pointer to the vertex by removing the const-ness (no const methos in HepMC::GenVertex)
-        HepMC::GenVertex * vertex = const_cast<HepMC::GenVertex *>(*ivertex);
-
-        // Loop over the sources looking for specific decays
-        for (
-            HepMC::GenVertex::particle_iterator iparent = vertex->particles_begin(HepMC::parents);
-            iparent != vertex->particles_end(HepMC::parents);
-            ++iparent
-        )
-        {
-            // Collect the pdgid of the parent
-            int pdgid = std::abs((*iparent)->pdg_id());
-            // Get particle type
-            HepPDT::ParticleID particleID(pdgid);
-
-            // Check if the particle type is valid one
-            if (particleID.isValid())
-            {
-                // Get particle data
-                ParticleData const * particleData = particleDataTable_->particle(particleID);
-                // Check if the particle exist in the table
-                if (particleData)
-                {
-                    // Check if their life time is bigger than longLivedDecayLength_
-                    if ( particleData->lifetime() > longLivedDecayLength_ )
-                    {
-                        // Check for B, C weak decays and long lived decays
-                        update(flags_[BWeakDecay], particleID.hasBottom());
-                        update(flags_[CWeakDecay], particleID.hasCharm());
-                        update(flags_[LongLivedDecay], true);
-                    }
-                    // Check Tau, Ks and Lambda decay
-                    update(flags_[TauDecay], pdgid == 15);
-                    update(flags_[KsDecay], pdgid == 310);
-                    update(flags_[LambdaDecay], pdgid == 3122);
-                    update(flags_[JpsiDecay], pdgid == 443);
-                    update(flags_[XiDecay], pdgid == 3312);
-                    update(flags_[OmegaDecay], pdgid == 3334);
-                    update(flags_[SigmaPlusDecay], pdgid == 3222);
-                    update(flags_[SigmaMinusDecay], pdgid == 3112);
-                }
-            }
-        }
-    }
+  // Get all the information related to the simulation details
+  simulationInformation();
+
+  // Get all the information related to decay process
+  processesAtGenerator();
+
+  // Get information about conversion and other interactions
+  processesAtSimulation();
+
+  // Get geometrical information about the vertices
+  vertexInformation();
+
+  // Check for unkown classification
+  unknownVertex();
+
+  return *this;
 }
 
+void VertexClassifier::simulationInformation() {
+  // Get the event id for the initial TP.
+  EncodedEventId eventId = tracer_.simVertex()->eventId();
+  // Check for signal events
+  flags_[SignalEvent] = !eventId.bunchCrossing() && !eventId.event();
+}
 
-void VertexClassifier::processesAtSimulation()
-{
-    VertexHistory::SimVertexTrail const & simVertexTrail = tracer_.simVertexTrail();
-
-    for (
-        VertexHistory::SimVertexTrail::const_iterator ivertex = simVertexTrail.begin();
-        ivertex != simVertexTrail.end();
-        ++ivertex
-    )
-    {
-        // pdgid of the real source parent vertex
-        int pdgid = 0;
-
-        // select the original source in case of combined vertices
-        bool flag = false;
-        TrackingVertex::tp_iterator itd, its;
-
-        for (its = (*ivertex)->sourceTracks_begin(); its != (*ivertex)->sourceTracks_end(); ++its)
-        {
-            for (itd = (*ivertex)->daughterTracks_begin(); itd != (*ivertex)->daughterTracks_end(); ++itd)
-                if (itd != its)
-                {
-                    flag = true;
-                    break;
-                }
-            if (flag)
-                break;
-        }
-        // Collect the pdgid of the original source track
-        if ( its != (*ivertex)->sourceTracks_end() )
-            pdgid = std::abs((*its)->pdgId());
-        else
-            pdgid = 0;
-
-	// Geant4 process type is selected using first Geant4 vertex assigned to 
-        // the TrackingVertex
-	unsigned int processG4 = 0;
-	
-        if((*ivertex)->nG4Vertices() > 0) {
-	  processG4 = (*(*ivertex)->g4Vertices_begin()).processType();
-	}
-	
-	unsigned int process = g4toCMSProcMap_.processId(processG4);
-	
-	// Flagging all the different processes
-	update(
-	       flags_[KnownProcess],
-	       process != CMS::Undefined &&
-	       process != CMS::Unknown &&
-	       process != CMS::Primary
-	       );
-
-	update(flags_[UndefinedProcess], process == CMS::Undefined);
-	update(flags_[UnknownProcess], process == CMS::Unknown);
-	update(flags_[PrimaryProcess], process == CMS::Primary);
-	update(flags_[HadronicProcess], process == CMS::Hadronic);
-	update(flags_[DecayProcess], process == CMS::Decay);
-	update(flags_[ComptonProcess], process == CMS::Compton);
-	update(flags_[AnnihilationProcess], process == CMS::Annihilation);
-	update(flags_[EIoniProcess], process == CMS::EIoni);
-	update(flags_[HIoniProcess], process == CMS::HIoni);
-	update(flags_[MuIoniProcess], process == CMS::MuIoni);
-	update(flags_[PhotonProcess], process == CMS::Photon);
-	update(flags_[MuPairProdProcess], process == CMS::MuPairProd);
-	update(flags_[ConversionsProcess], process == CMS::Conversions);
-	update(flags_[EBremProcess], process == CMS::EBrem);
-	update(flags_[SynchrotronRadiationProcess], process == CMS::SynchrotronRadiation);
-	update(flags_[MuBremProcess], process == CMS::MuBrem);
-	update(flags_[MuNuclProcess], process == CMS::MuNucl);
-
-
-        // Loop over the simulated particles
-        for (
-            TrackingVertex::tp_iterator iparticle = (*ivertex)->daughterTracks_begin();
-            iparticle != (*ivertex)->daughterTracks_end();
-            ++iparticle
-        )
-        {
-
-            if ( (*iparticle)->numberOfTrackerLayers() )
-            {
-
-                // Special treatment for decays
-                if (process == CMS::Decay)
-                {
-                    // Get particle type
-                    HepPDT::ParticleID particleID(pdgid);
-                    // Check if the particle type is valid one
-                    if (particleID.isValid())
-                    {
-                        // Get particle data
-                        ParticleData const * particleData = particleDataTable_->particle(particleID);
-                        // Check if the particle exist in the table
-                        if (particleData)
-                        {
-                            // Check if their life time is bigger than 1e-14
-                            if ( particleDataTable_->particle(particleID)->lifetime() > longLivedDecayLength_ )
-                            {
-                                // Check for B, C weak decays and long lived decays
-                                update(flags_[BWeakDecay], particleID.hasBottom());
-                                update(flags_[CWeakDecay], particleID.hasCharm());
-                                update(flags_[LongLivedDecay], true);
-                            }
-                            // Check Tau, Ks and Lambda decay
-                            update(flags_[TauDecay], pdgid == 15);
-                            update(flags_[KsDecay], pdgid == 310);
-                            update(flags_[LambdaDecay], pdgid == 3122);
-                            update(flags_[JpsiDecay], pdgid == 443);
-                            update(flags_[XiDecay], pdgid == 3312);
-                            update(flags_[OmegaDecay], pdgid == 3334);
-                            update(flags_[SigmaPlusDecay], pdgid == 3222);
-                            update(flags_[SigmaMinusDecay], pdgid == 3112);
-                        }
-                    }
-                }
-            }
+void VertexClassifier::processesAtGenerator() {
+  // Get the generated vetices from track history
+  VertexHistory::GenVertexTrail const &genVertexTrail = tracer_.genVertexTrail();
+
+  // Loop over the generated vertices
+  for (VertexHistory::GenVertexTrail::const_iterator ivertex = genVertexTrail.begin(); ivertex != genVertexTrail.end();
+       ++ivertex) {
+    // Get the pointer to the vertex by removing the const-ness (no const methos
+    // in HepMC::GenVertex)
+    HepMC::GenVertex *vertex = const_cast<HepMC::GenVertex *>(*ivertex);
+
+    // Loop over the sources looking for specific decays
+    for (HepMC::GenVertex::particle_iterator iparent = vertex->particles_begin(HepMC::parents);
+         iparent != vertex->particles_end(HepMC::parents);
+         ++iparent) {
+      // Collect the pdgid of the parent
+      int pdgid = std::abs((*iparent)->pdg_id());
+      // Get particle type
+      HepPDT::ParticleID particleID(pdgid);
+
+      // Check if the particle type is valid one
+      if (particleID.isValid()) {
+        // Get particle data
+        ParticleData const *particleData = particleDataTable_->particle(particleID);
+        // Check if the particle exist in the table
+        if (particleData) {
+          // Check if their life time is bigger than longLivedDecayLength_
+          if (particleData->lifetime() > longLivedDecayLength_) {
+            // Check for B, C weak decays and long lived decays
+            update(flags_[BWeakDecay], particleID.hasBottom());
+            update(flags_[CWeakDecay], particleID.hasCharm());
+            update(flags_[LongLivedDecay], true);
+          }
+          // Check Tau, Ks and Lambda decay
+          update(flags_[TauDecay], pdgid == 15);
+          update(flags_[KsDecay], pdgid == 310);
+          update(flags_[LambdaDecay], pdgid == 3122);
+          update(flags_[JpsiDecay], pdgid == 443);
+          update(flags_[XiDecay], pdgid == 3312);
+          update(flags_[OmegaDecay], pdgid == 3334);
+          update(flags_[SigmaPlusDecay], pdgid == 3222);
+          update(flags_[SigmaMinusDecay], pdgid == 3112);
         }
+      }
     }
+  }
 }
 
+void VertexClassifier::processesAtSimulation() {
+  VertexHistory::SimVertexTrail const &simVertexTrail = tracer_.simVertexTrail();
 
-void VertexClassifier::vertexInformation()
-{
-    // Helper class for clusterization
-    typedef std::multimap<double, HepMC::ThreeVector> Clusters;
-    typedef std::pair<double, HepMC::ThreeVector> ClusterPair;
-
-    Clusters clusters;
-
-    // Get the main primary vertex from the list
-    GeneratedPrimaryVertex const & genpv = genpvs_.back();
-
-    // Get the generated history of the tracks
-    const VertexHistory::GenVertexTrail & genVertexTrail = tracer_.genVertexTrail();
-
-    // Unit transformation from mm to cm
-    double const mm = 0.1;
-
-    // Loop over the generated vertexes
-    for (
-        VertexHistory::GenVertexTrail::const_iterator ivertex = genVertexTrail.begin();
-        ivertex != genVertexTrail.end();
-        ++ivertex
-    )
-    {
-        // Check vertex exist
-        if (*ivertex)
-        {
-            // Measure the distance2 respecto the primary vertex
-            HepMC::ThreeVector p = (*ivertex)->point3d();
-            double distance = sqrt( pow(p.x() * mm - genpv.x, 2) + pow(p.y() * mm - genpv.y, 2) + pow(p.z() * mm - genpv.z, 2) );
-
-            // If there is not any clusters add the first vertex.
-            if ( clusters.empty() )
-            {
-                clusters.insert( ClusterPair(distance, HepMC::ThreeVector(p.x() * mm, p.y() * mm, p.z() * mm)) );
-                continue;
-            }
-
-            // Check if there is already a cluster in the given distance from primary vertex
-            Clusters::const_iterator icluster = clusters.lower_bound(distance - vertexClusteringDistance_);
-
-            if ( icluster == clusters.upper_bound(distance + vertexClusteringDistance_) )
-            {
-                clusters.insert ( ClusterPair(distance, HepMC::ThreeVector(p.x() * mm, p.y() * mm, p.z() * mm)) );
-                continue;
-            }
+  for (VertexHistory::SimVertexTrail::const_iterator ivertex = simVertexTrail.begin(); ivertex != simVertexTrail.end();
+       ++ivertex) {
+    // pdgid of the real source parent vertex
+    int pdgid = 0;
 
-            bool cluster = false;
-
-            // Looping over the vertex clusters of a given distance from primary vertex
-            for (;
-                    icluster != clusters.upper_bound(distance + vertexClusteringDistance_);
-                    ++icluster
-                )
-            {
-                double difference = sqrt (
-                                        pow(p.x() * mm - icluster->second.x(), 2) +
-                                        pow(p.y() * mm - icluster->second.y(), 2) +
-                                        pow(p.z() * mm - icluster->second.z(), 2)
-                                    );
-
-                if ( difference < vertexClusteringDistance_ )
-                {
-                    cluster = true;
-                    break;
-                }
-            }
+    // select the original source in case of combined vertices
+    bool flag = false;
+    TrackingVertex::tp_iterator itd, its;
 
-            if (!cluster) clusters.insert ( ClusterPair(distance, HepMC::ThreeVector(p.x() * mm, p.y() * mm, p.z() * mm)) );
+    for (its = (*ivertex)->sourceTracks_begin(); its != (*ivertex)->sourceTracks_end(); ++its) {
+      for (itd = (*ivertex)->daughterTracks_begin(); itd != (*ivertex)->daughterTracks_end(); ++itd)
+        if (itd != its) {
+          flag = true;
+          break;
         }
+      if (flag)
+        break;
     }
+    // Collect the pdgid of the original source track
+    if (its != (*ivertex)->sourceTracks_end())
+      pdgid = std::abs((*its)->pdgId());
+    else
+      pdgid = 0;
 
-    const VertexHistory::SimVertexTrail & simVertexTrail = tracer_.simVertexTrail();
-
-    // Loop over the generated particles
-    for (
-        VertexHistory::SimVertexTrail::const_reverse_iterator ivertex = simVertexTrail.rbegin();
-        ivertex != simVertexTrail.rend();
-        ++ivertex
-    )
-    {
-        // Look for those with production vertex
-        TrackingVertex::LorentzVector p = (*ivertex)->position();
-
-        double distance = sqrt( pow(p.x() - genpv.x, 2) + pow(p.y() - genpv.y, 2) + pow(p.z() - genpv.z, 2) );
-
-        // If there is not any clusters add the first vertex.
-        if ( clusters.empty() )
-        {
-            clusters.insert( ClusterPair(distance, HepMC::ThreeVector(p.x(), p.y(), p.z())) );
-            continue;
-        }
+    // Geant4 process type is selected using first Geant4 vertex assigned to
+    // the TrackingVertex
+    unsigned int processG4 = 0;
 
-        // Check if there is already a cluster in the given distance from primary vertex
-        Clusters::const_iterator icluster = clusters.lower_bound(distance - vertexClusteringDistance_);
+    if ((*ivertex)->nG4Vertices() > 0) {
+      processG4 = (*(*ivertex)->g4Vertices_begin()).processType();
+    }
 
-        if ( icluster == clusters.upper_bound(distance + vertexClusteringDistance_) )
-        {
-            clusters.insert ( ClusterPair(distance, HepMC::ThreeVector(p.x(), p.y(), p.z())) );
-            continue;
+    unsigned int process = g4toCMSProcMap_.processId(processG4);
+
+    // Flagging all the different processes
+    update(flags_[KnownProcess], process != CMS::Undefined && process != CMS::Unknown && process != CMS::Primary);
+
+    update(flags_[UndefinedProcess], process == CMS::Undefined);
+    update(flags_[UnknownProcess], process == CMS::Unknown);
+    update(flags_[PrimaryProcess], process == CMS::Primary);
+    update(flags_[HadronicProcess], process == CMS::Hadronic);
+    update(flags_[DecayProcess], process == CMS::Decay);
+    update(flags_[ComptonProcess], process == CMS::Compton);
+    update(flags_[AnnihilationProcess], process == CMS::Annihilation);
+    update(flags_[EIoniProcess], process == CMS::EIoni);
+    update(flags_[HIoniProcess], process == CMS::HIoni);
+    update(flags_[MuIoniProcess], process == CMS::MuIoni);
+    update(flags_[PhotonProcess], process == CMS::Photon);
+    update(flags_[MuPairProdProcess], process == CMS::MuPairProd);
+    update(flags_[ConversionsProcess], process == CMS::Conversions);
+    update(flags_[EBremProcess], process == CMS::EBrem);
+    update(flags_[SynchrotronRadiationProcess], process == CMS::SynchrotronRadiation);
+    update(flags_[MuBremProcess], process == CMS::MuBrem);
+    update(flags_[MuNuclProcess], process == CMS::MuNucl);
+
+    // Loop over the simulated particles
+    for (TrackingVertex::tp_iterator iparticle = (*ivertex)->daughterTracks_begin();
+         iparticle != (*ivertex)->daughterTracks_end();
+         ++iparticle) {
+      if ((*iparticle)->numberOfTrackerLayers()) {
+        // Special treatment for decays
+        if (process == CMS::Decay) {
+          // Get particle type
+          HepPDT::ParticleID particleID(pdgid);
+          // Check if the particle type is valid one
+          if (particleID.isValid()) {
+            // Get particle data
+            ParticleData const *particleData = particleDataTable_->particle(particleID);
+            // Check if the particle exist in the table
+            if (particleData) {
+              // Check if their life time is bigger than 1e-14
+              if (particleDataTable_->particle(particleID)->lifetime() > longLivedDecayLength_) {
+                // Check for B, C weak decays and long lived decays
+                update(flags_[BWeakDecay], particleID.hasBottom());
+                update(flags_[CWeakDecay], particleID.hasCharm());
+                update(flags_[LongLivedDecay], true);
+              }
+              // Check Tau, Ks and Lambda decay
+              update(flags_[TauDecay], pdgid == 15);
+              update(flags_[KsDecay], pdgid == 310);
+              update(flags_[LambdaDecay], pdgid == 3122);
+              update(flags_[JpsiDecay], pdgid == 443);
+              update(flags_[XiDecay], pdgid == 3312);
+              update(flags_[OmegaDecay], pdgid == 3334);
+              update(flags_[SigmaPlusDecay], pdgid == 3222);
+              update(flags_[SigmaMinusDecay], pdgid == 3112);
+            }
+          }
         }
+      }
+    }
+  }
+}
 
-        bool cluster = false;
-
-        // Looping over the vertex clusters of a given distance from primary vertex
-        for (;
-                icluster != clusters.upper_bound(distance + vertexClusteringDistance_);
-                ++icluster
-            )
-        {
-            double difference = sqrt (
-                                    pow(p.x() - icluster->second.x(), 2) +
-                                    pow(p.y() - icluster->second.y(), 2) +
-                                    pow(p.z() - icluster->second.z(), 2)
-                                );
-
-            if ( difference < vertexClusteringDistance_ )
-            {
-                cluster = true;
-                break;
-            }
+void VertexClassifier::vertexInformation() {
+  // Helper class for clusterization
+  typedef std::multimap<double, HepMC::ThreeVector> Clusters;
+  typedef std::pair<double, HepMC::ThreeVector> ClusterPair;
+
+  Clusters clusters;
+
+  // Get the main primary vertex from the list
+  GeneratedPrimaryVertex const &genpv = genpvs_.back();
+
+  // Get the generated history of the tracks
+  const VertexHistory::GenVertexTrail &genVertexTrail = tracer_.genVertexTrail();
+
+  // Unit transformation from mm to cm
+  double const mm = 0.1;
+
+  // Loop over the generated vertexes
+  for (VertexHistory::GenVertexTrail::const_iterator ivertex = genVertexTrail.begin(); ivertex != genVertexTrail.end();
+       ++ivertex) {
+    // Check vertex exist
+    if (*ivertex) {
+      // Measure the distance2 respecto the primary vertex
+      HepMC::ThreeVector p = (*ivertex)->point3d();
+      double distance =
+          sqrt(pow(p.x() * mm - genpv.x, 2) + pow(p.y() * mm - genpv.y, 2) + pow(p.z() * mm - genpv.z, 2));
+
+      // If there is not any clusters add the first vertex.
+      if (clusters.empty()) {
+        clusters.insert(ClusterPair(distance, HepMC::ThreeVector(p.x() * mm, p.y() * mm, p.z() * mm)));
+        continue;
+      }
+
+      // Check if there is already a cluster in the given distance from primary
+      // vertex
+      Clusters::const_iterator icluster = clusters.lower_bound(distance - vertexClusteringDistance_);
+
+      if (icluster == clusters.upper_bound(distance + vertexClusteringDistance_)) {
+        clusters.insert(ClusterPair(distance, HepMC::ThreeVector(p.x() * mm, p.y() * mm, p.z() * mm)));
+        continue;
+      }
+
+      bool cluster = false;
+
+      // Looping over the vertex clusters of a given distance from primary
+      // vertex
+      for (; icluster != clusters.upper_bound(distance + vertexClusteringDistance_); ++icluster) {
+        double difference = sqrt(pow(p.x() * mm - icluster->second.x(), 2) + pow(p.y() * mm - icluster->second.y(), 2) +
+                                 pow(p.z() * mm - icluster->second.z(), 2));
+
+        if (difference < vertexClusteringDistance_) {
+          cluster = true;
+          break;
         }
+      }
 
-        if (!cluster) clusters.insert ( ClusterPair(distance, HepMC::ThreeVector(p.x(), p.y(), p.z())) );
+      if (!cluster)
+        clusters.insert(ClusterPair(distance, HepMC::ThreeVector(p.x() * mm, p.y() * mm, p.z() * mm)));
     }
+  }
 
-    if ( clusters.size() == 1 )
-        flags_[PrimaryVertex] = true;
-    else if ( clusters.size() == 2 )
-        flags_[SecondaryVertex] = true;
-    else
-        flags_[TertiaryVertex] = true;
-}
+  const VertexHistory::SimVertexTrail &simVertexTrail = tracer_.simVertexTrail();
 
+  // Loop over the generated particles
+  for (VertexHistory::SimVertexTrail::const_reverse_iterator ivertex = simVertexTrail.rbegin();
+       ivertex != simVertexTrail.rend();
+       ++ivertex) {
+    // Look for those with production vertex
+    TrackingVertex::LorentzVector p = (*ivertex)->position();
 
-bool VertexClassifier::isFinalstateParticle(const HepMC::GenParticle * p)
-{
-    return !p->end_vertex() && p->status() == 1;
-}
-
+    double distance = sqrt(pow(p.x() - genpv.x, 2) + pow(p.y() - genpv.y, 2) + pow(p.z() - genpv.z, 2));
 
-bool VertexClassifier::isCharged(const HepMC::GenParticle * p)
-{
-    const ParticleData * part = particleDataTable_->particle( p->pdg_id() );
-    if (part)
-        return part->charge()!=0;
-    else
-    {
-        // the new/improved particle table doesn't know anti-particles
-        return  particleDataTable_->particle( -p->pdg_id() ) != nullptr;
+    // If there is not any clusters add the first vertex.
+    if (clusters.empty()) {
+      clusters.insert(ClusterPair(distance, HepMC::ThreeVector(p.x(), p.y(), p.z())));
+      continue;
     }
-}
 
+    // Check if there is already a cluster in the given distance from primary
+    // vertex
+    Clusters::const_iterator icluster = clusters.lower_bound(distance - vertexClusteringDistance_);
 
-void VertexClassifier::genPrimaryVertices()
-{
-    genpvs_.clear();
+    if (icluster == clusters.upper_bound(distance + vertexClusteringDistance_)) {
+      clusters.insert(ClusterPair(distance, HepMC::ThreeVector(p.x(), p.y(), p.z())));
+      continue;
+    }
 
-    const HepMC::GenEvent * event = mcInformation_->GetEvent();
+    bool cluster = false;
 
-    if (event)
-    {
-        int idx = 0;
+    // Looping over the vertex clusters of a given distance from primary vertex
+    for (; icluster != clusters.upper_bound(distance + vertexClusteringDistance_); ++icluster) {
+      double difference = sqrt(pow(p.x() - icluster->second.x(), 2) + pow(p.y() - icluster->second.y(), 2) +
+                               pow(p.z() - icluster->second.z(), 2));
 
-        // Loop over the different GenVertex
-        for ( HepMC::GenEvent::vertex_const_iterator ivertex = event->vertices_begin(); ivertex != event->vertices_end(); ++ivertex )
-        {
-            bool hasParentVertex = false;
+      if (difference < vertexClusteringDistance_) {
+        cluster = true;
+        break;
+      }
+    }
 
-            // Loop over the parents looking to see if they are coming from a production vertex
-            for (
-                HepMC::GenVertex::particle_iterator iparent = (*ivertex)->particles_begin(HepMC::parents);
-                iparent != (*ivertex)->particles_end(HepMC::parents);
-                ++iparent
-            )
-                if ( (*iparent)->production_vertex() )
-                {
-                    hasParentVertex = true;
-                    break;
-                }
+    if (!cluster)
+      clusters.insert(ClusterPair(distance, HepMC::ThreeVector(p.x(), p.y(), p.z())));
+  }
 
-            // Reject those vertices with parent vertices
-            if (hasParentVertex) continue;
+  if (clusters.size() == 1)
+    flags_[PrimaryVertex] = true;
+  else if (clusters.size() == 2)
+    flags_[SecondaryVertex] = true;
+  else
+    flags_[TertiaryVertex] = true;
+}
 
-            // Get the position of the vertex
-            HepMC::FourVector pos = (*ivertex)->position();
+bool VertexClassifier::isFinalstateParticle(const HepMC::GenParticle *p) {
+  return !p->end_vertex() && p->status() == 1;
+}
 
-            double const mm = 0.1;
+bool VertexClassifier::isCharged(const HepMC::GenParticle *p) {
+  const ParticleData *part = particleDataTable_->particle(p->pdg_id());
+  if (part)
+    return part->charge() != 0;
+  else {
+    // the new/improved particle table doesn't know anti-particles
+    return particleDataTable_->particle(-p->pdg_id()) != nullptr;
+  }
+}
 
-            GeneratedPrimaryVertex pv(pos.x()*mm, pos.y()*mm, pos.z()*mm);
+void VertexClassifier::genPrimaryVertices() {
+  genpvs_.clear();
 
-            std::vector<GeneratedPrimaryVertex>::iterator ientry = genpvs_.begin();
+  const HepMC::GenEvent *event = mcInformation_->GetEvent();
 
-            // Search for a VERY close vertex in the list
-            for (; ientry != genpvs_.end(); ++ientry)
-            {
-                double distance = sqrt( pow(pv.x - ientry->x, 2) + pow(pv.y - ientry->y, 2) + pow(pv.z - ientry->z, 2) );
-                if ( distance < vertexClusteringDistance_ )
-                    break;
-            }
+  if (event) {
+    int idx = 0;
 
-            // Check if there is not a VERY close vertex and added to the list
-            if (ientry == genpvs_.end())
-                ientry = genpvs_.insert(ientry,pv);
-
-            // Add the vertex barcodes to the new or existent vertices
-            ientry->genVertex.push_back((*ivertex)->barcode());
-
-            // Collect final state descendants
-            for (
-                HepMC::GenVertex::particle_iterator idecendants  = (*ivertex)->particles_begin(HepMC::descendants);
-                idecendants != (*ivertex)->particles_end(HepMC::descendants);
-                ++idecendants
-            )
-            {
-                if (isFinalstateParticle(*idecendants))
-                    if ( find(ientry->finalstateParticles.begin(), ientry->finalstateParticles.end(), (*idecendants)->barcode()) == ientry->finalstateParticles.end() )
-                    {
-                        ientry->finalstateParticles.push_back((*idecendants)->barcode());
-                        HepMC::FourVector m = (*idecendants)->momentum();
-
-                        ientry->ptot.setPx(ientry->ptot.px() + m.px());
-                        ientry->ptot.setPy(ientry->ptot.py() + m.py());
-                        ientry->ptot.setPz(ientry->ptot.pz() + m.pz());
-                        ientry->ptot.setE(ientry->ptot.e() + m.e());
-                        ientry->ptsq += m.perp() * m.perp();
-
-                        if ( m.perp() > 0.8 && std::abs(m.pseudoRapidity()) < 2.5 && isCharged(*idecendants) ) ientry->nGenTrk++;
-                    }
-            }
-            idx++;
+    // Loop over the different GenVertex
+    for (HepMC::GenEvent::vertex_const_iterator ivertex = event->vertices_begin(); ivertex != event->vertices_end();
+         ++ivertex) {
+      bool hasParentVertex = false;
+
+      // Loop over the parents looking to see if they are coming from a
+      // production vertex
+      for (HepMC::GenVertex::particle_iterator iparent = (*ivertex)->particles_begin(HepMC::parents);
+           iparent != (*ivertex)->particles_end(HepMC::parents);
+           ++iparent)
+        if ((*iparent)->production_vertex()) {
+          hasParentVertex = true;
+          break;
         }
+
+      // Reject those vertices with parent vertices
+      if (hasParentVertex)
+        continue;
+
+      // Get the position of the vertex
+      HepMC::FourVector pos = (*ivertex)->position();
+
+      double const mm = 0.1;
+
+      GeneratedPrimaryVertex pv(pos.x() * mm, pos.y() * mm, pos.z() * mm);
+
+      std::vector<GeneratedPrimaryVertex>::iterator ientry = genpvs_.begin();
+
+      // Search for a VERY close vertex in the list
+      for (; ientry != genpvs_.end(); ++ientry) {
+        double distance = sqrt(pow(pv.x - ientry->x, 2) + pow(pv.y - ientry->y, 2) + pow(pv.z - ientry->z, 2));
+        if (distance < vertexClusteringDistance_)
+          break;
+      }
+
+      // Check if there is not a VERY close vertex and added to the list
+      if (ientry == genpvs_.end())
+        ientry = genpvs_.insert(ientry, pv);
+
+      // Add the vertex barcodes to the new or existent vertices
+      ientry->genVertex.push_back((*ivertex)->barcode());
+
+      // Collect final state descendants
+      for (HepMC::GenVertex::particle_iterator idecendants = (*ivertex)->particles_begin(HepMC::descendants);
+           idecendants != (*ivertex)->particles_end(HepMC::descendants);
+           ++idecendants) {
+        if (isFinalstateParticle(*idecendants))
+          if (find(ientry->finalstateParticles.begin(), ientry->finalstateParticles.end(), (*idecendants)->barcode()) ==
+              ientry->finalstateParticles.end()) {
+            ientry->finalstateParticles.push_back((*idecendants)->barcode());
+            HepMC::FourVector m = (*idecendants)->momentum();
+
+            ientry->ptot.setPx(ientry->ptot.px() + m.px());
+            ientry->ptot.setPy(ientry->ptot.py() + m.py());
+            ientry->ptot.setPz(ientry->ptot.pz() + m.pz());
+            ientry->ptot.setE(ientry->ptot.e() + m.e());
+            ientry->ptsq += m.perp() * m.perp();
+
+            if (m.perp() > 0.8 && std::abs(m.pseudoRapidity()) < 2.5 && isCharged(*idecendants))
+              ientry->nGenTrk++;
+          }
+      }
+      idx++;
     }
+  }
 
-    std::sort(genpvs_.begin(), genpvs_.end());
+  std::sort(genpvs_.begin(), genpvs_.end());
 }
diff --git a/SimTracker/TrackHistory/src/VertexHistory.cc b/SimTracker/TrackHistory/src/VertexHistory.cc
index 135c1cce009fa..ff9ed6cabf9fa 100644
--- a/SimTracker/TrackHistory/src/VertexHistory.cc
+++ b/SimTracker/TrackHistory/src/VertexHistory.cc
@@ -1,94 +1,78 @@
 
-#include "SimTracker/TrackHistory/interface/VertexHistory.h"
 #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
 #include "SimDataFormats/Associations/interface/VertexToTrackingVertexAssociator.h"
+#include "SimTracker/TrackHistory/interface/VertexHistory.h"
 
-VertexHistory::VertexHistory (
-  const edm::ParameterSet & config,
-  edm::ConsumesCollector&& collector
-) : HistoryBase()
-{
-    // Name of the track collection
-    vertexProducer_ = config.getUntrackedParameter<edm::InputTag> ( "vertexProducer" );
+VertexHistory::VertexHistory(const edm::ParameterSet &config, edm::ConsumesCollector &&collector) : HistoryBase() {
+  // Name of the track collection
+  vertexProducer_ = config.getUntrackedParameter<edm::InputTag>("vertexProducer");
 
-    // Name of the traking pariticle collection
-    trackingTruth_ = config.getUntrackedParameter<edm::InputTag> ( "trackingTruth" );
+  // Name of the traking pariticle collection
+  trackingTruth_ = config.getUntrackedParameter<edm::InputTag>("trackingTruth");
 
-    // Vertex association record
-    vertexAssociator_ = config.getUntrackedParameter<edm::InputTag> ( "vertexAssociator" );
+  // Vertex association record
+  vertexAssociator_ = config.getUntrackedParameter<edm::InputTag>("vertexAssociator");
 
-    // Association by max. value
-    bestMatchByMaxValue_ = config.getUntrackedParameter<bool> ( "bestMatchByMaxValue" );
+  // Association by max. value
+  bestMatchByMaxValue_ = config.getUntrackedParameter<bool>("bestMatchByMaxValue");
 
-    // Enable RecoToSim association
-    enableRecoToSim_ = config.getUntrackedParameter<bool> ( "enableRecoToSim" );
+  // Enable RecoToSim association
+  enableRecoToSim_ = config.getUntrackedParameter<bool>("enableRecoToSim");
 
-    // Enable SimToReco association
-    enableSimToReco_ = config.getUntrackedParameter<bool> ( "enableSimToReco" );
+  // Enable SimToReco association
+  enableSimToReco_ = config.getUntrackedParameter<bool>("enableSimToReco");
 
-    if(enableRecoToSim_ or enableSimToReco_) {
-      collector.consumes<edm::View<reco::Vertex>>(vertexProducer_);
-      collector.consumes<TrackingVertexCollection>(trackingTruth_);
-      collector.consumes<reco::VertexToTrackingVertexAssociator>(vertexAssociator_);
-    }
+  if (enableRecoToSim_ or enableSimToReco_) {
+    collector.consumes<edm::View<reco::Vertex>>(vertexProducer_);
+    collector.consumes<TrackingVertexCollection>(trackingTruth_);
+    collector.consumes<reco::VertexToTrackingVertexAssociator>(vertexAssociator_);
+  }
 
-    quality_ = 0.;
+  quality_ = 0.;
 }
 
+void VertexHistory::newEvent(const edm::Event &event, const edm::EventSetup &setup) {
+  if (enableRecoToSim_ || enableSimToReco_) {
+    // Vertex collection
+    edm::Handle<edm::View<reco::Vertex>> vertexCollection;
+    event.getByLabel(vertexProducer_, vertexCollection);
 
-void VertexHistory::newEvent (
-    const edm::Event & event, const edm::EventSetup & setup
-)
-{
-    if ( enableRecoToSim_ || enableSimToReco_ )
-    {
-        // Vertex collection
-        edm::Handle<edm::View<reco::Vertex> > vertexCollection;
-        event.getByLabel(vertexProducer_, vertexCollection);
-
-        // Tracking particle information
-        edm::Handle<TrackingVertexCollection>  TVCollection;
-        event.getByLabel(trackingTruth_, TVCollection);
-
-        // Get the track associator
-        edm::Handle<reco::VertexToTrackingVertexAssociator> vertexAssociator;
-        event.getByLabel(vertexAssociator_, vertexAssociator);
-
-        if ( enableRecoToSim_ )
-        {
-            // Calculate the map between recovertex -> simvertex
-            recoToSim_ = vertexAssociator->associateRecoToSim(vertexCollection, TVCollection);
-        }
-
-        if ( enableSimToReco_ )
-        {
-            // Calculate the map between recovertex <- simvertex
-            simToReco_ = vertexAssociator->associateSimToReco(vertexCollection, TVCollection);
-        }
+    // Tracking particle information
+    edm::Handle<TrackingVertexCollection> TVCollection;
+    event.getByLabel(trackingTruth_, TVCollection);
 
-    }
-}
+    // Get the track associator
+    edm::Handle<reco::VertexToTrackingVertexAssociator> vertexAssociator;
+    event.getByLabel(vertexAssociator_, vertexAssociator);
 
+    if (enableRecoToSim_) {
+      // Calculate the map between recovertex -> simvertex
+      recoToSim_ = vertexAssociator->associateRecoToSim(vertexCollection, TVCollection);
+    }
 
-bool VertexHistory::evaluate (reco::VertexBaseRef tv)
-{
+    if (enableSimToReco_) {
+      // Calculate the map between recovertex <- simvertex
+      simToReco_ = vertexAssociator->associateSimToReco(vertexCollection, TVCollection);
+    }
+  }
+}
 
-    if ( !enableRecoToSim_ ) return false;
+bool VertexHistory::evaluate(reco::VertexBaseRef tv) {
+  if (!enableRecoToSim_)
+    return false;
 
-    std::pair<TrackingVertexRef, double> result =  match(tv, recoToSim_, bestMatchByMaxValue_);
+  std::pair<TrackingVertexRef, double> result = match(tv, recoToSim_, bestMatchByMaxValue_);
 
-    TrackingVertexRef tvr( result.first );
-    quality_ = result.second;
+  TrackingVertexRef tvr(result.first);
+  quality_ = result.second;
 
-    if ( !tvr.isNull() )
-    {
-        HistoryBase::evaluate(tvr);
+  if (!tvr.isNull()) {
+    HistoryBase::evaluate(tvr);
 
-        recovertex_ = tv;
+    recovertex_ = tv;
 
-        return true;
-    }
+    return true;
+  }
 
-    return false;
+  return false;
 }
-
diff --git a/SimTracker/TrackHistory/src/classes.h b/SimTracker/TrackHistory/src/classes.h
index b5cbae634772a..a416c559bab96 100644
--- a/SimTracker/TrackHistory/src/classes.h
+++ b/SimTracker/TrackHistory/src/classes.h
@@ -5,14 +5,13 @@
 #include "SimTracker/TrackHistory/interface/TrackCategories.h"
 #include "SimTracker/TrackHistory/interface/VertexCategories.h"
 
-
 namespace SimTracker_TrackHistory {
   struct dictionary {
     // Dictionaires for Track and Vertex categories
 
     std::vector<TrackCategories> dummy01;
     std::vector<VertexCategories> dummy02;
-    edm::Wrapper<std::vector<TrackCategories> > dummy03;
-    edm::Wrapper<std::vector<VertexCategories> > dummy04;
+    edm::Wrapper<std::vector<TrackCategories>> dummy03;
+    edm::Wrapper<std::vector<VertexCategories>> dummy04;
   };
-}
+}  // namespace SimTracker_TrackHistory
diff --git a/SimTracker/TrackerFilters/interface/CosmicTIFTrigFilter.h b/SimTracker/TrackerFilters/interface/CosmicTIFTrigFilter.h
index f0be0ae9c9409..2dce0238a2ac7 100644
--- a/SimTracker/TrackerFilters/interface/CosmicTIFTrigFilter.h
+++ b/SimTracker/TrackerFilters/interface/CosmicTIFTrigFilter.h
@@ -2,32 +2,31 @@
 #ifndef COSMICTIFTRIGFILTER_H
 #define COSMICTIFTRIGFILTER_H
 
-
-#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
-#include "FWCore/Framework/interface/stream/EDFilter.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/stream/EDFilter.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
+#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 
-namespace cms{
+namespace cms {
 
   class CosmicTIFTrigFilter : public edm::stream::EDFilter<> {
   public:
-  CosmicTIFTrigFilter(const edm::ParameterSet& conf);
-  ~CosmicTIFTrigFilter() override {}
-  bool filter(edm::Event & iEvent, edm::EventSetup const& c) override;
-  bool Sci_trig(const HepMC::FourVector&, const  HepMC::FourVector&,const  HepMC::FourVector&);
+    CosmicTIFTrigFilter(const edm::ParameterSet &conf);
+    ~CosmicTIFTrigFilter() override {}
+    bool filter(edm::Event &iEvent, edm::EventSetup const &c) override;
+    bool Sci_trig(const HepMC::FourVector &, const HepMC::FourVector &, const HepMC::FourVector &);
 
- private:
-  edm::ParameterSet conf_;
+  private:
+    edm::ParameterSet conf_;
 
-  bool inTK;
-  int trigconf;
-  int tottrig;
-  int trig1, trig2, trig3;
-  std::vector<double> trigS1, trigS2, trigS3, trigS4;
-  edm::EDGetTokenT<edm::HepMCProduct> m_Token;
+    bool inTK;
+    int trigconf;
+    int tottrig;
+    int trig1, trig2, trig3;
+    std::vector<double> trigS1, trigS2, trigS3, trigS4;
+    edm::EDGetTokenT<edm::HepMCProduct> m_Token;
   };
-}
-#endif 
+}  // namespace cms
+#endif
diff --git a/SimTracker/TrackerFilters/plugins/CosmicTIFTrigFilter.cc b/SimTracker/TrackerFilters/plugins/CosmicTIFTrigFilter.cc
index e242d9fcb88b6..1f84930336807 100644
--- a/SimTracker/TrackerFilters/plugins/CosmicTIFTrigFilter.cc
+++ b/SimTracker/TrackerFilters/plugins/CosmicTIFTrigFilter.cc
@@ -1,9 +1,9 @@
 // livio.fano@cern.ch
 
-#include "SimTracker/TrackerFilters/interface/CosmicTIFTrigFilter.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "SimTracker/TrackerFilters/interface/CosmicTIFTrigFilter.h"
 //#include "MagneticField/Engine/interface/MagneticField.h"
 //#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 #include "HepMC/GenVertex.h"
@@ -14,165 +14,154 @@ using namespace std;
 namespace cms
 
 {
-  CosmicTIFTrigFilter::CosmicTIFTrigFilter(const edm::ParameterSet& conf): 
-    m_Token(consumes<edm::HepMCProduct>(conf.getParameter<edm::ParameterSet>("Generator").getParameter<std::string>("HepMCProductLabel")))
-  {
-    trigconf  = conf.getParameter<int>("trig_conf");
-    trigS1  = conf.getParameter<std::vector<double> >("PosScint1");
-    trigS2  = conf.getParameter<std::vector<double> >("PosScint2");
-    trigS3  = conf.getParameter<std::vector<double> >("PosScint3");
-    trigS4  = conf.getParameter<std::vector<double> >("PosScint4");
+  CosmicTIFTrigFilter::CosmicTIFTrigFilter(const edm::ParameterSet &conf)
+      : m_Token(consumes<edm::HepMCProduct>(
+            conf.getParameter<edm::ParameterSet>("Generator").getParameter<std::string>("HepMCProductLabel"))) {
+    trigconf = conf.getParameter<int>("trig_conf");
+    trigS1 = conf.getParameter<std::vector<double>>("PosScint1");
+    trigS2 = conf.getParameter<std::vector<double>>("PosScint2");
+    trigS3 = conf.getParameter<std::vector<double>>("PosScint3");
+    trigS4 = conf.getParameter<std::vector<double>>("PosScint4");
 
     /*
-    std::cout << "S1 = " << trigS1[0] << ", " <<  trigS1[1] << ", " <<trigS1[2]
-	      << "\nS2 = " << trigS2[0] << ", " <<  trigS2[1] << ", " <<trigS2[2]
-	      << "\nS3 = " << trigS3[0] << ", " <<  trigS3[1] << ", " <<trigS3[2]  
-	      << "\nS4 = " << trigS4[0] << ", " <<  trigS4[1] << ", " <<trigS4[2]  
-	      << std::endl;  
-    */
+  std::cout << "S1 = " << trigS1[0] << ", " <<  trigS1[1] << ", " <<trigS1[2]
+            << "\nS2 = " << trigS2[0] << ", " <<  trigS2[1] << ", " <<trigS2[2]
+            << "\nS3 = " << trigS3[0] << ", " <<  trigS3[1] << ", " <<trigS3[2]
+            << "\nS4 = " << trigS4[0] << ", " <<  trigS4[1] << ", " <<trigS4[2]
+            << std::endl;
+  */
   }
-  
-  bool CosmicTIFTrigFilter::filter(edm::Event& iEvent, const edm::EventSetup& iSetup)
-  {
-        
+
+  bool CosmicTIFTrigFilter::filter(edm::Event &iEvent, const edm::EventSetup &iSetup) {
     edm::Handle<edm::HepMCProduct> HepMCEvt;
     iEvent.getByToken(m_Token, HepMCEvt);
 
-    const HepMC::GenEvent* MCEvt = HepMCEvt->GetEvent();
-    
-    bool hit1=false;
-    bool hit2=false;
-    bool hit3=false;
-    bool hit4=false;
-    
-    for(HepMC::GenEvent::particle_const_iterator i=MCEvt->particles_begin(); i != MCEvt->particles_end();++i)
-      {
-	int myId = (*i)->pdg_id();
-	if (abs(myId)==13)
-	  {	    
-	    // Get the muon position and momentum
-	    HepMC::GenVertex* pv = (*i)->production_vertex();
-	    const HepMC::FourVector& vertex = pv->position();
-	    
-	    HepMC::FourVector  momentum=(*i)->momentum();
-
-	    //std::cout << "\t vertex for cut = " << vertex << std::endl; 
-	    //std::cout << "\t momentum  = " << momentum << std::endl; 
-	    
-	    if(trigconf==1){
-
-	      HepMC::FourVector S1(trigS1[0],trigS1[1],trigS1[2],0.);
-	      HepMC::FourVector S2(trigS2[0],trigS2[1],trigS2[2],0.);
-	      HepMC::FourVector S3(trigS3[0],trigS3[1],trigS3[2],0.);
-	      
-	      hit1=Sci_trig(vertex, momentum, S1);
-	      hit2=Sci_trig(vertex, momentum, S2);
-	      hit3=Sci_trig(vertex, momentum, S3);
-	      
-	      // trigger conditions
-	      
-	      if((hit1&&hit2) || (hit3&&hit2))
-		{
-		  /*
-		  cout << "\tGot a trigger in configuration A " << endl; 
-		  if(hit1)cout << "hit1 " << endl;
-		  if(hit2)cout << "hit2 " << endl;
-		  if(hit3)cout << "hit3 " << endl;
-		  */
-		  trig1++;
-		  return true;
-		}
-	    }else if(trigconf ==2) {
-
-	      HepMC::FourVector S1(trigS1[0],trigS1[1],trigS1[2],0.);
-	      HepMC::FourVector S2(trigS2[0],trigS2[1],trigS2[2],0.);
-	      HepMC::FourVector S3(trigS3[0],trigS3[1],trigS3[2],0.);
-	      
-	      hit1=Sci_trig(vertex, momentum, S1);
-	      hit2=Sci_trig(vertex, momentum, S2);
-	      hit3=Sci_trig(vertex, momentum, S3);
-	      
-	      // trigger conditions
-	      
-	      if((hit1&&hit2) || (hit3&&hit2))
-		{
-		  /*
-		  cout << "\tGot a trigger in configuration B " << endl; 
-		  if(hit1)cout << "hit1 " << endl;
-		  if(hit2)cout << "hit2 " << endl;
-		  if(hit3)cout << "hit3 " << endl;
-		  */
-		  trig2++;
-		  return true;
-		}
-
-	    }else if(trigconf ==3) {
-	      HepMC::FourVector S1(trigS1[0],trigS1[1],trigS1[2],0.);
-	      HepMC::FourVector S2(trigS2[0],trigS2[1],trigS2[2],0.);
-	      HepMC::FourVector S3(trigS3[0],trigS3[1],trigS3[2],0.);
-	      HepMC::FourVector S4(trigS4[0],trigS4[1],trigS4[2],0.);
-	      
-	      /*	      std::cout << "S1 = " << S1.x() << "," << S1.y() << ", " << S1.z()  
-			<< "\nS2 = " << S2.x() << "," << S2.y() << ", " << S2.z()  
-			<< "\nS3 = " << S3.x() << "," << S3.y() << ", " << S3.z()  
-			<< "\nS4 = " << S4.x() << "," << S4.y() << ", " << S4.z() 
-			<< std::endl;  
-	      */
-
-	      hit1=Sci_trig(vertex, momentum, S1);
-	      hit2=Sci_trig(vertex, momentum, S2);
-	      hit3=Sci_trig(vertex, momentum, S3);
-	      hit4=Sci_trig(vertex, momentum, S4);
-	      
-	      // trigger conditions
-	      if((hit1&&hit2) || (hit3&&hit2) || (hit1&&hit4) || (hit3&&hit4))
-		{
-
-		  /*
-		  cout << "\tGot a trigger in configuration C " << endl; 
-		  if(hit1)cout << "hit1 " << endl;
-		  if(hit2)cout << "hit2 " << endl;
-		  if(hit3)cout << "hit3 " << endl;
-		  if(hit4)cout << "hit4 " << endl;
-		  */
-
-		  trig3++;
-		  return true;
-		}
-	    }
-	  }
+    const HepMC::GenEvent *MCEvt = HepMCEvt->GetEvent();
+
+    bool hit1 = false;
+    bool hit2 = false;
+    bool hit3 = false;
+    bool hit4 = false;
+
+    for (HepMC::GenEvent::particle_const_iterator i = MCEvt->particles_begin(); i != MCEvt->particles_end(); ++i) {
+      int myId = (*i)->pdg_id();
+      if (abs(myId) == 13) {
+        // Get the muon position and momentum
+        HepMC::GenVertex *pv = (*i)->production_vertex();
+        const HepMC::FourVector &vertex = pv->position();
+
+        HepMC::FourVector momentum = (*i)->momentum();
+
+        // std::cout << "\t vertex for cut = " << vertex << std::endl;
+        // std::cout << "\t momentum  = " << momentum << std::endl;
+
+        if (trigconf == 1) {
+          HepMC::FourVector S1(trigS1[0], trigS1[1], trigS1[2], 0.);
+          HepMC::FourVector S2(trigS2[0], trigS2[1], trigS2[2], 0.);
+          HepMC::FourVector S3(trigS3[0], trigS3[1], trigS3[2], 0.);
+
+          hit1 = Sci_trig(vertex, momentum, S1);
+          hit2 = Sci_trig(vertex, momentum, S2);
+          hit3 = Sci_trig(vertex, momentum, S3);
+
+          // trigger conditions
+
+          if ((hit1 && hit2) || (hit3 && hit2)) {
+            /*
+          cout << "\tGot a trigger in configuration A " << endl;
+          if(hit1)cout << "hit1 " << endl;
+          if(hit2)cout << "hit2 " << endl;
+          if(hit3)cout << "hit3 " << endl;
+          */
+            trig1++;
+            return true;
+          }
+        } else if (trigconf == 2) {
+          HepMC::FourVector S1(trigS1[0], trigS1[1], trigS1[2], 0.);
+          HepMC::FourVector S2(trigS2[0], trigS2[1], trigS2[2], 0.);
+          HepMC::FourVector S3(trigS3[0], trigS3[1], trigS3[2], 0.);
+
+          hit1 = Sci_trig(vertex, momentum, S1);
+          hit2 = Sci_trig(vertex, momentum, S2);
+          hit3 = Sci_trig(vertex, momentum, S3);
+
+          // trigger conditions
+
+          if ((hit1 && hit2) || (hit3 && hit2)) {
+            /*
+          cout << "\tGot a trigger in configuration B " << endl;
+          if(hit1)cout << "hit1 " << endl;
+          if(hit2)cout << "hit2 " << endl;
+          if(hit3)cout << "hit3 " << endl;
+          */
+            trig2++;
+            return true;
+          }
+
+        } else if (trigconf == 3) {
+          HepMC::FourVector S1(trigS1[0], trigS1[1], trigS1[2], 0.);
+          HepMC::FourVector S2(trigS2[0], trigS2[1], trigS2[2], 0.);
+          HepMC::FourVector S3(trigS3[0], trigS3[1], trigS3[2], 0.);
+          HepMC::FourVector S4(trigS4[0], trigS4[1], trigS4[2], 0.);
+
+          /*	      std::cout << "S1 = " << S1.x() << "," << S1.y() << ", " <<
+           S1.z()
+                  << "\nS2 = " << S2.x() << "," << S2.y() << ", " << S2.z()
+                  << "\nS3 = " << S3.x() << "," << S3.y() << ", " << S3.z()
+                  << "\nS4 = " << S4.x() << "," << S4.y() << ", " << S4.z()
+                  << std::endl;
+        */
+
+          hit1 = Sci_trig(vertex, momentum, S1);
+          hit2 = Sci_trig(vertex, momentum, S2);
+          hit3 = Sci_trig(vertex, momentum, S3);
+          hit4 = Sci_trig(vertex, momentum, S4);
+
+          // trigger conditions
+          if ((hit1 && hit2) || (hit3 && hit2) || (hit1 && hit4) || (hit3 && hit4)) {
+            /*
+          cout << "\tGot a trigger in configuration C " << endl;
+          if(hit1)cout << "hit1 " << endl;
+          if(hit2)cout << "hit2 " << endl;
+          if(hit3)cout << "hit3 " << endl;
+          if(hit4)cout << "hit4 " << endl;
+          */
+
+            trig3++;
+            return true;
+          }
+        }
       }
-    
+    }
+
     return false;
   }
-  
-  bool CosmicTIFTrigFilter::Sci_trig(const HepMC::FourVector& vertex, const HepMC::FourVector& momentum, const HepMC::FourVector& S)
-  {
-    float x0= vertex.x();
-    float y0= vertex.y();
-    float z0= vertex.z();
-    float px0=momentum.x();
-    float py0=momentum.y();
-    float pz0=momentum.z();
-    float Sx=S.x();
-    float Sy=S.y();
-    float Sz=S.z();
-    
-    float zs=(Sy-y0)*(pz0/py0)+z0;
-    float xs=(Sy-y0)*(px0/py0)+x0;
-    
+
+  bool CosmicTIFTrigFilter::Sci_trig(const HepMC::FourVector &vertex,
+                                     const HepMC::FourVector &momentum,
+                                     const HepMC::FourVector &S) {
+    float x0 = vertex.x();
+    float y0 = vertex.y();
+    float z0 = vertex.z();
+    float px0 = momentum.x();
+    float py0 = momentum.y();
+    float pz0 = momentum.z();
+    float Sx = S.x();
+    float Sy = S.y();
+    float Sz = S.z();
+
+    float zs = (Sy - y0) * (pz0 / py0) + z0;
+    float xs = (Sy - y0) * (px0 / py0) + x0;
+
     //    std::cout << Sx << " " << Sz << " " << xs << " " << zs << std::endl;
-    //std::cout << x0 << " " << z0 << " " << px0 << " " << py0 << " " << pz0 << endl;
-    
-    if((xs<Sx+500 && xs>Sx-500) && (zs<Sz+500 && zs>Sz-500) )
-      {
-	//std::cout << "PASSED" << std::endl;
-	return true;
-      }
-    else
-      {
-	return false;
-      }
-  }
-}
+    // std::cout << x0 << " " << z0 << " " << px0 << " " << py0 << " " << pz0 <<
+    // endl;
 
+    if ((xs < Sx + 500 && xs > Sx - 500) && (zs < Sz + 500 && zs > Sz - 500)) {
+      // std::cout << "PASSED" << std::endl;
+      return true;
+    } else {
+      return false;
+    }
+  }
+}  // namespace cms
diff --git a/SimTracker/TrackerFilters/plugins/SealModules.cc b/SimTracker/TrackerFilters/plugins/SealModules.cc
index baa64fbf2ad5d..7a9687d08758d 100644
--- a/SimTracker/TrackerFilters/plugins/SealModules.cc
+++ b/SimTracker/TrackerFilters/plugins/SealModules.cc
@@ -1,7 +1,6 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "SimTracker/TrackerFilters/interface/CosmicTIFTrigFilter.h"
 using cms::CosmicTIFTrigFilter;
 
-
 DEFINE_FWK_MODULE(CosmicTIFTrigFilter);
diff --git a/SimTracker/TrackerHitAssociation/test/TestAssoc_Phase0-1_cfg.py b/SimTracker/TrackerHitAssociation/test/TestAssoc_Phase0-1_cfg.py
index 239018929c9e3..7165ef8c4a9ca 100644
--- a/SimTracker/TrackerHitAssociation/test/TestAssoc_Phase0-1_cfg.py
+++ b/SimTracker/TrackerHitAssociation/test/TestAssoc_Phase0-1_cfg.py
@@ -3,8 +3,8 @@
 import os 
 
 # Create a new CMS process
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process('assocTest',eras.Run2_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process('assocTest',Run2_2017)
 
 # Import all the necessary files
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/SimTracker/TrackerHitAssociation/test/TestAssoc_Phase2_cfg.py b/SimTracker/TrackerHitAssociation/test/TestAssoc_Phase2_cfg.py
index 3744bed85f5c6..c1d605d516c8a 100644
--- a/SimTracker/TrackerHitAssociation/test/TestAssoc_Phase2_cfg.py
+++ b/SimTracker/TrackerHitAssociation/test/TestAssoc_Phase2_cfg.py
@@ -3,8 +3,8 @@
 import os 
 
 # Create a new CMS process
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process('assocTest',eras.Phase2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('assocTest',Phase2)
 
 # Import all the necessary files
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/SimTracker/TrackerMaterialAnalysis/plugins/ListGroups.cc b/SimTracker/TrackerMaterialAnalysis/plugins/ListGroups.cc
index dfcd20d40ef53..613c591f0f8e8 100644
--- a/SimTracker/TrackerMaterialAnalysis/plugins/ListGroups.cc
+++ b/SimTracker/TrackerMaterialAnalysis/plugins/ListGroups.cc
@@ -37,18 +37,17 @@
 #include "MaterialAccountingGroup.h"
 #include "TrackingMaterialPlotter.h"
 
-static
-bool dddGetStringRaw(const DDFilteredView & view, const std::string & name, std::string & value) {
+static bool dddGetStringRaw(const DDFilteredView &view, const std::string &name, std::string &value) {
   std::vector<const DDsvalues_type *> result;
   view.specificsV(result);
-  for (std::vector<const DDsvalues_type *>::iterator it = result.begin(); it != result.end(); ++it)   {
+  for (std::vector<const DDsvalues_type *>::iterator it = result.begin(); it != result.end(); ++it) {
     DDValue parameter(name);
     if (DDfetch(*it, parameter)) {
       if (parameter.strings().size() == 1) {
         value = parameter.strings().front();
         return true;
       } else {
-        throw cms::Exception("Configuration")<< " ERROR: multiple " << name << " tags encountered";
+        throw cms::Exception("Configuration") << " ERROR: multiple " << name << " tags encountered";
         return false;
       }
     }
@@ -67,8 +66,7 @@ double dddGetDouble(const std::string & s, DDFilteredView const & view) {
 }
 */
 
-static inline
-std::string dddGetString(const std::string & s, DDFilteredView const & view) {
+static inline std::string dddGetString(const std::string &s, DDFilteredView const &view) {
   std::string value;
   if (dddGetStringRaw(view, s, value))
     return value;
@@ -76,8 +74,7 @@ std::string dddGetString(const std::string & s, DDFilteredView const & view) {
     return std::string();
 }
 
-class ListGroups : public edm::one::EDAnalyzer<>
-{
+class ListGroups : public edm::one::EDAnalyzer<> {
 public:
   ListGroups(const edm::ParameterSet &);
   ~ListGroups() override;
@@ -94,7 +91,7 @@ class ListGroups : public edm::one::EDAnalyzer<>
   bool m_saveSummaryPlot;
   std::vector<TH2F *> m_plots;
   std::set<std::string> m_group_names;
-  std::vector<MaterialAccountingGroup *>    m_groups;
+  std::vector<MaterialAccountingGroup *> m_groups;
   std::vector<unsigned int> m_color;
   std::vector<int> m_gradient;
 
@@ -111,7 +108,7 @@ class ListGroups : public edm::one::EDAnalyzer<>
   std::map<std::string, std::pair<float, float> > m_values;
 };
 
-ListGroups::ListGroups(const edm::ParameterSet & iPSet) {
+ListGroups::ListGroups(const edm::ParameterSet &iPSet) {
   m_saveSummaryPlot = iPSet.getUntrackedParameter<bool>("SaveSummaryPlot");
   m_plots.clear();
   m_groups.clear();
@@ -261,15 +258,13 @@ void ListGroups::fillMaterialDifferences() {
   m_values["TrackerRecMaterialPixelEndcapDisk1Fw_Inner"] = std::make_pair<float, float>(0.039127, 0.000086);
   m_values["TrackerRecMaterialTECDisk0_R40"] = std::make_pair<float, float>(0.084231, 0.000209);
   m_values["TrackerRecMaterialTIDDisk2_R30"] = std::make_pair<float, float>(0.065109, 0.000143);
-
 }
 
-void ListGroups::fillGradient(void)
-{
+void ListGroups::fillGradient(void) {
   m_gradient.reserve(200);
   unsigned int steps = 100;
   // if no index was given, find the highest used one and start from that plus one
-  unsigned int index = ((TObjArray*) gROOT->GetListOfColors())->GetLast() + 1;
+  unsigned int index = ((TObjArray *)gROOT->GetListOfColors())->GetLast() + 1;
 
   float r1, g1, b1, r2, g2, b2;
   static_cast<TColor *>(gROOT->GetListOfColors()->At(kBlue + 1))->GetRGB(r1, g1, b1);
@@ -278,14 +273,14 @@ void ListGroups::fillGradient(void)
   float delta_g = (g2 - g1) / (steps - 1);
   float delta_b = (b2 - b1) / (steps - 1);
 
-  m_gradient.push_back(kBlue + 4); // Underflow lowest bin
+  m_gradient.push_back(kBlue + 4);  // Underflow lowest bin
   unsigned int ii = 0;
   for (unsigned int i = 0; i < steps; ++i, ++ii) {
     new TColor(static_cast<Int_t>(index + ii), r1 + delta_r * i, g1 + delta_g * i, b1 + delta_b * i);
     m_gradient.push_back(index + ii);
   }
 
-  m_gradient.push_back(kWhite); // 0 level perfectly white
+  m_gradient.push_back(kWhite);  // 0 level perfectly white
 
   static_cast<TColor *>(gROOT->GetListOfColors()->At(kOrange))->GetRGB(r1, g1, b1);
   static_cast<TColor *>(gROOT->GetListOfColors()->At(kOrange + 7))->GetRGB(r2, g2, b2);
@@ -296,7 +291,7 @@ void ListGroups::fillGradient(void)
     new TColor(static_cast<Int_t>(index + ii), r1 + delta_r * i, g1 + delta_g * i, b1 + delta_b * i);
     m_gradient.push_back(index + ii);
   }
-  m_gradient.push_back(kRed); // Overflow highest bin
+  m_gradient.push_back(kRed);  // Overflow highest bin
 }
 
 void ListGroups::fillColor(void) {
@@ -306,93 +301,92 @@ void ListGroups::fillColor(void) {
   // define some reasonable set and loop over it in case the number of grouping
   // is larger than the number of colors.
 
-  m_color.push_back(kBlack);          // unassigned
-
-  m_color.push_back(kAzure);          // PixelBarrelLayer0_Z0
-  m_color.push_back(kAzure - 1);      // PixelBarrelLayer0_Z20
-  m_color.push_back(kAzure + 1) ;     // Layer1_Z0
-  m_color.push_back(kAzure + 2) ;     // Layer1_Z20
-
-  m_color.push_back(kGreen);          // EndCapDisk1_R0
-  m_color.push_back(kGreen + 2);      // EndcapDisk1_R11
-  m_color.push_back(kGreen + 4);      // EndcapDisk1_R7
-  m_color.push_back(kSpring + 9);     // EndcapDisk2_R0
-  m_color.push_back(kSpring + 4);     // EndcapDisk2_R7
-  m_color.push_back(kSpring    );     // EndcapDisk2_R7
-
-  m_color.push_back(kRed);            // TECDisk0_R20
-  m_color.push_back(kRed + 2);        // TECDisk0_R40
-  m_color.push_back(kRed - 7);        // TECDisk0_R50
-  m_color.push_back(kRed - 5);        // TECDisk0_R60
-  m_color.push_back(kRed - 10);       // TECDisk0_R90
-  m_color.push_back(kRed - 1);        // TECDisk1_Inner
-  m_color.push_back(kRed - 2);        // TECDisk1_Outer
-  m_color.push_back(kRed - 3);        // TECDisk1_R20
-  m_color.push_back(kPink - 2);       // TECDisk2_Inner
-  m_color.push_back(kPink - 3);       // TECDisk2_Outer
-  m_color.push_back(kPink - 4);       // TECDisk2_R20
-  m_color.push_back(kPink + 9);       // TECDisk3_Inner
-  m_color.push_back(kPink + 8);       // TECDisk3_Outer
-  m_color.push_back(kPink + 7);       // TECDisk3
-  m_color.push_back(kMagenta - 2);    // TECDisk4_Inner
-  m_color.push_back(kMagenta - 3);    // TECDisk4_Outer
-  m_color.push_back(kMagenta - 4);    // TECDisk4_R33
-  m_color.push_back(kMagenta - 5);    // TECDisk5_Inner
-  m_color.push_back(kMagenta - 6);    // TECDisk5_Outer
-  m_color.push_back(kMagenta - 7);    // TECDisk5_R33
-  m_color.push_back(kRed);            // TECDisk6
-  m_color.push_back(kMagenta - 9);    // TECDisk7_R40
-  m_color.push_back(kViolet);         // TECDisk8
-
-  m_color.push_back(kOrange + 9);     // TIBLayer0_Z0
-  m_color.push_back(kOrange + 7);     // TIBLayer0_Z20
-  m_color.push_back(kOrange + 5);     // TIBLayer0_Z40
-  m_color.push_back(kOrange - 2);     // TIBLayer1_Z0
-  m_color.push_back(kOrange - 3);     // TIBLayer1_Z30
-  m_color.push_back(kOrange - 6);     // TIBLayer1_Z60
-  m_color.push_back(kOrange + 4);     // TIBLayer2_Z0
-  m_color.push_back(kOrange - 7);     // TIBLayer2_Z40
-  m_color.push_back(kOrange);         // TIBLayer3_Z0
-  m_color.push_back(kOrange + 10);    // TIBLayer3_Z50
-
-  m_color.push_back(kViolet + 10);    // TIDDisk1_R0
-  m_color.push_back(kViolet + 6);     // TIDDisk1_R30
-  m_color.push_back(kViolet + 3);     // TIDDisk1_R40
-  m_color.push_back(kViolet - 7);     // TIDDisk2_R25
-  m_color.push_back(kViolet - 1);     // TIDDisk2_R30
-  m_color.push_back(kViolet + 9);     // TIDDisk2_R40
-  m_color.push_back(kViolet - 5);     // TIDDisk3_R24
-  m_color.push_back(kViolet - 3);     // TIDDisk3_R30
-  m_color.push_back(kViolet);         // TIDDisk3_R40
-
-  m_color.push_back(kAzure    );    // TOBLayer0_Z0
-  m_color.push_back(kAzure + 8);    // TOBLayer0_Z20
-  m_color.push_back(kAzure + 2);    // TOBLayer0_Z70
-  m_color.push_back(kAzure + 4);    // TOBLayer0_Z80
-  m_color.push_back(kCyan + 1);     // TOBLayer1_Z0
-  m_color.push_back(kCyan - 9);     // TOBLayer1_Z20
-  m_color.push_back(kCyan + 3);     // TOBLayer1_Z80
-  m_color.push_back(kCyan + 4);     // TOBLayer1_Z90
-  m_color.push_back(kAzure    );    // TOBLayer2_Z0
-  m_color.push_back(kAzure + 8);    // TOBLayer2_Z25
-  m_color.push_back(kAzure + 2);    // TOBLayer2_Z80
-  m_color.push_back(kAzure + 5);    // TOBLayer2_Z90
-  m_color.push_back(kCyan + 1);     // TOBLayer3_Z0
-  m_color.push_back(kCyan - 9);     // TOBLayer3_Z25
-  m_color.push_back(kCyan + 3);     // TOBLayer3_Z80
-  m_color.push_back(kCyan + 4);     // TOBLayer3_Z90
-  m_color.push_back(kAzure    );    // TOBLayer4_Z0
-  m_color.push_back(kAzure + 8);    // TOBLayer4_Z25
-  m_color.push_back(kAzure + 2);    // TOBLayer4_Z80
-  m_color.push_back(kAzure + 5);    // TOBLayer4_Z90
-  m_color.push_back(kCyan + 1);     // TOBLayer5_Z0
-  m_color.push_back(kCyan - 9);     // TOBLayer5_Z25
-  m_color.push_back(kCyan + 3);     // TOBLayer5_Z80
-  m_color.push_back(kCyan + 4);     // TOBLayer5_Z90
+  m_color.push_back(kBlack);  // unassigned
+
+  m_color.push_back(kAzure);      // PixelBarrelLayer0_Z0
+  m_color.push_back(kAzure - 1);  // PixelBarrelLayer0_Z20
+  m_color.push_back(kAzure + 1);  // Layer1_Z0
+  m_color.push_back(kAzure + 2);  // Layer1_Z20
+
+  m_color.push_back(kGreen);       // EndCapDisk1_R0
+  m_color.push_back(kGreen + 2);   // EndcapDisk1_R11
+  m_color.push_back(kGreen + 4);   // EndcapDisk1_R7
+  m_color.push_back(kSpring + 9);  // EndcapDisk2_R0
+  m_color.push_back(kSpring + 4);  // EndcapDisk2_R7
+  m_color.push_back(kSpring);      // EndcapDisk2_R7
+
+  m_color.push_back(kRed);          // TECDisk0_R20
+  m_color.push_back(kRed + 2);      // TECDisk0_R40
+  m_color.push_back(kRed - 7);      // TECDisk0_R50
+  m_color.push_back(kRed - 5);      // TECDisk0_R60
+  m_color.push_back(kRed - 10);     // TECDisk0_R90
+  m_color.push_back(kRed - 1);      // TECDisk1_Inner
+  m_color.push_back(kRed - 2);      // TECDisk1_Outer
+  m_color.push_back(kRed - 3);      // TECDisk1_R20
+  m_color.push_back(kPink - 2);     // TECDisk2_Inner
+  m_color.push_back(kPink - 3);     // TECDisk2_Outer
+  m_color.push_back(kPink - 4);     // TECDisk2_R20
+  m_color.push_back(kPink + 9);     // TECDisk3_Inner
+  m_color.push_back(kPink + 8);     // TECDisk3_Outer
+  m_color.push_back(kPink + 7);     // TECDisk3
+  m_color.push_back(kMagenta - 2);  // TECDisk4_Inner
+  m_color.push_back(kMagenta - 3);  // TECDisk4_Outer
+  m_color.push_back(kMagenta - 4);  // TECDisk4_R33
+  m_color.push_back(kMagenta - 5);  // TECDisk5_Inner
+  m_color.push_back(kMagenta - 6);  // TECDisk5_Outer
+  m_color.push_back(kMagenta - 7);  // TECDisk5_R33
+  m_color.push_back(kRed);          // TECDisk6
+  m_color.push_back(kMagenta - 9);  // TECDisk7_R40
+  m_color.push_back(kViolet);       // TECDisk8
+
+  m_color.push_back(kOrange + 9);   // TIBLayer0_Z0
+  m_color.push_back(kOrange + 7);   // TIBLayer0_Z20
+  m_color.push_back(kOrange + 5);   // TIBLayer0_Z40
+  m_color.push_back(kOrange - 2);   // TIBLayer1_Z0
+  m_color.push_back(kOrange - 3);   // TIBLayer1_Z30
+  m_color.push_back(kOrange - 6);   // TIBLayer1_Z60
+  m_color.push_back(kOrange + 4);   // TIBLayer2_Z0
+  m_color.push_back(kOrange - 7);   // TIBLayer2_Z40
+  m_color.push_back(kOrange);       // TIBLayer3_Z0
+  m_color.push_back(kOrange + 10);  // TIBLayer3_Z50
+
+  m_color.push_back(kViolet + 10);  // TIDDisk1_R0
+  m_color.push_back(kViolet + 6);   // TIDDisk1_R30
+  m_color.push_back(kViolet + 3);   // TIDDisk1_R40
+  m_color.push_back(kViolet - 7);   // TIDDisk2_R25
+  m_color.push_back(kViolet - 1);   // TIDDisk2_R30
+  m_color.push_back(kViolet + 9);   // TIDDisk2_R40
+  m_color.push_back(kViolet - 5);   // TIDDisk3_R24
+  m_color.push_back(kViolet - 3);   // TIDDisk3_R30
+  m_color.push_back(kViolet);       // TIDDisk3_R40
+
+  m_color.push_back(kAzure);      // TOBLayer0_Z0
+  m_color.push_back(kAzure + 8);  // TOBLayer0_Z20
+  m_color.push_back(kAzure + 2);  // TOBLayer0_Z70
+  m_color.push_back(kAzure + 4);  // TOBLayer0_Z80
+  m_color.push_back(kCyan + 1);   // TOBLayer1_Z0
+  m_color.push_back(kCyan - 9);   // TOBLayer1_Z20
+  m_color.push_back(kCyan + 3);   // TOBLayer1_Z80
+  m_color.push_back(kCyan + 4);   // TOBLayer1_Z90
+  m_color.push_back(kAzure);      // TOBLayer2_Z0
+  m_color.push_back(kAzure + 8);  // TOBLayer2_Z25
+  m_color.push_back(kAzure + 2);  // TOBLayer2_Z80
+  m_color.push_back(kAzure + 5);  // TOBLayer2_Z90
+  m_color.push_back(kCyan + 1);   // TOBLayer3_Z0
+  m_color.push_back(kCyan - 9);   // TOBLayer3_Z25
+  m_color.push_back(kCyan + 3);   // TOBLayer3_Z80
+  m_color.push_back(kCyan + 4);   // TOBLayer3_Z90
+  m_color.push_back(kAzure);      // TOBLayer4_Z0
+  m_color.push_back(kAzure + 8);  // TOBLayer4_Z25
+  m_color.push_back(kAzure + 2);  // TOBLayer4_Z80
+  m_color.push_back(kAzure + 5);  // TOBLayer4_Z90
+  m_color.push_back(kCyan + 1);   // TOBLayer5_Z0
+  m_color.push_back(kCyan - 9);   // TOBLayer5_Z25
+  m_color.push_back(kCyan + 3);   // TOBLayer5_Z80
+  m_color.push_back(kCyan + 4);   // TOBLayer5_Z90
 }
 
-std::vector<std::pair<std::shared_ptr<TLine>, std::shared_ptr<TText> > >
-ListGroups::overlayEtaReferences() {
+std::vector<std::pair<std::shared_ptr<TLine>, std::shared_ptr<TText> > > ListGroups::overlayEtaReferences() {
   std::vector<std::pair<std::shared_ptr<TLine>, std::shared_ptr<TText> > > lines;
 
   lines.reserve(40);
@@ -401,43 +395,34 @@ ListGroups::overlayEtaReferences() {
   float text_size = 0.033;
 
   for (float eta = 0.; eta <= 3.8; eta += 0.2) {
-    float theta = 2. * atan (exp(-eta));
+    float theta = 2. * atan(exp(-eta));
     if (eta >= 1.8) {
-      lines.push_back(
-          std::make_pair<std::shared_ptr<TLine>, std::shared_ptr<TText> > (
-              std::make_shared<TLine>(
-                  deltaZ.first, deltaZ.first * tan(theta), deltaZ.second, deltaZ.second * tan(theta)),
-              std::make_shared<TText>(
-                  deltaZ.first, deltaZ.first * tan(theta), str(boost::format("%2.1f") % eta).c_str())));
+      lines.push_back(std::make_pair<std::shared_ptr<TLine>, std::shared_ptr<TText> >(
+          std::make_shared<TLine>(deltaZ.first, deltaZ.first * tan(theta), deltaZ.second, deltaZ.second * tan(theta)),
+          std::make_shared<TText>(deltaZ.first, deltaZ.first * tan(theta), str(boost::format("%2.1f") % eta).c_str())));
       lines.back().second->SetTextFont(42);
       lines.back().second->SetTextSize(text_size);
       lines.back().second->SetTextAlign(33);
-      lines.push_back(
-          std::make_pair<std::shared_ptr<TLine>, std::shared_ptr<TText> > (
-              std::make_shared<TLine>(
-                  -deltaZ.first, deltaZ.first * tan(theta), -deltaZ.second, deltaZ.second * tan(theta)),
-              std::make_shared<TText>(
-                  -deltaZ.first, deltaZ.first * tan(theta), str(boost::format("-%2.1f") % eta).c_str())));
+      lines.push_back(std::make_pair<std::shared_ptr<TLine>, std::shared_ptr<TText> >(
+          std::make_shared<TLine>(-deltaZ.first, deltaZ.first * tan(theta), -deltaZ.second, deltaZ.second * tan(theta)),
+          std::make_shared<TText>(
+              -deltaZ.first, deltaZ.first * tan(theta), str(boost::format("-%2.1f") % eta).c_str())));
       lines.back().second->SetTextFont(42);
       lines.back().second->SetTextSize(text_size);
       lines.back().second->SetTextAlign(13);
     } else {
-      lines.push_back(
-          std::make_pair<std::shared_ptr<TLine>, std::shared_ptr<TText> > (
-              std::make_shared<TLine>(
-                  deltaR.first / tan(theta), deltaR.first, deltaR.second / tan(theta), deltaR.second),
-              std::make_shared<TText>(
-                  deltaR.first / tan(theta), deltaR.first, str(boost::format("%2.1f") % eta).c_str())));
+      lines.push_back(std::make_pair<std::shared_ptr<TLine>, std::shared_ptr<TText> >(
+          std::make_shared<TLine>(deltaR.first / tan(theta), deltaR.first, deltaR.second / tan(theta), deltaR.second),
+          std::make_shared<TText>(deltaR.first / tan(theta), deltaR.first, str(boost::format("%2.1f") % eta).c_str())));
       lines.back().second->SetTextFont(42);
       lines.back().second->SetTextSize(text_size);
       lines.back().second->SetTextAlign(23);
       if (eta != 0) {
-        lines.push_back(
-            std::make_pair<std::shared_ptr<TLine>, std::shared_ptr<TText> > (
-                std::make_shared<TLine>(
-                    - deltaR.first / tan(theta), deltaR.first, - deltaR.second / tan(theta), deltaR.second),
-                std::make_shared<TText>(
-                    - deltaR.first / tan(theta), deltaR.first, str(boost::format("-%2.1f") % eta).c_str())));
+        lines.push_back(std::make_pair<std::shared_ptr<TLine>, std::shared_ptr<TText> >(
+            std::make_shared<TLine>(
+                -deltaR.first / tan(theta), deltaR.first, -deltaR.second / tan(theta), deltaR.second),
+            std::make_shared<TText>(
+                -deltaR.first / tan(theta), deltaR.first, str(boost::format("-%2.1f") % eta).c_str())));
         lines.back().second->SetTextFont(42);
         lines.back().second->SetTextSize(text_size);
         lines.back().second->SetTextAlign(23);
@@ -447,52 +432,54 @@ ListGroups::overlayEtaReferences() {
   return lines;
 }
 
-
 void ListGroups::produceAndSaveSummaryPlot(const edm::EventSetup &setup) {
   const double scale = 10.;
   std::vector<TText *> nukem_text;
-  static int markerStyles[10] = {kFullCircle, kFullSquare, kFullTriangleUp, kFullTriangleDown, kOpenCircle, kOpenSquare, kOpenTriangleUp, kOpenDiamond, kOpenCross, kFullStar};
+  static int markerStyles[10] = {kFullCircle,
+                                 kFullSquare,
+                                 kFullTriangleUp,
+                                 kFullTriangleDown,
+                                 kOpenCircle,
+                                 kOpenSquare,
+                                 kOpenTriangleUp,
+                                 kOpenDiamond,
+                                 kOpenCross,
+                                 kFullStar};
 
   edm::ESTransientHandle<DDCompactView> hDdd;
-  setup.get<IdealGeometryRecord>().get( hDdd );
+  setup.get<IdealGeometryRecord>().get(hDdd);
 
   for (auto n : m_group_names) {
-    m_groups.push_back( new MaterialAccountingGroup(n, *hDdd) );
+    m_groups.push_back(new MaterialAccountingGroup(n, *hDdd));
   };
 
   std::unique_ptr<TCanvas> canvas(
-      new TCanvas("Grouping_rz", "Grouping - RZ view",
-                  (int) (600 * scale * 1.25),  (int) (120 * scale * 1.50)));
+      new TCanvas("Grouping_rz", "Grouping - RZ view", (int)(600 * scale * 1.25), (int)(120 * scale * 1.50)));
   canvas->GetFrame()->SetFillColor(kWhite);
   gStyle->SetOptStat(0);
 
   unsigned int color_index = 1;
   // Setup the legend
-  std::unique_ptr<TLegend> leg(new TLegend(0.1,0.1,0.23,0.34));
+  std::unique_ptr<TLegend> leg(new TLegend(0.1, 0.1, 0.23, 0.34));
   leg->SetHeader("Tracker Material Grouping");
   leg->SetTextFont(42);
   leg->SetTextSize(0.008);
   leg->SetNColumns(3);
   std::unique_ptr<TProfile2D> radlen(
-      new TProfile2D( "OverallRadLen", "OverallRadLen",
-                      600., -300., 300, 120., 0., 120.));
+      new TProfile2D("OverallRadLen", "OverallRadLen", 600., -300., 300, 120., 0., 120.));
   std::unique_ptr<TProfile2D> eneloss(
-      new TProfile2D( "OverallEnergyLoss", "OverallEnergyLoss",
-                      600., -300., 300, 120., 0., 120.));
+      new TProfile2D("OverallEnergyLoss", "OverallEnergyLoss", 600., -300., 300, 120., 0., 120.));
   std::unique_ptr<TProfile2D> radlen_diff(
-      new TProfile2D( "OverallDifferencesRadLen", "OverallDifferencesRadLen",
-                      600., -300., 300, 120., 0., 120.));
+      new TProfile2D("OverallDifferencesRadLen", "OverallDifferencesRadLen", 600., -300., 300, 120., 0., 120.));
   std::unique_ptr<TProfile2D> eneloss_diff(
-      new TProfile2D( "OverallDifferencesEnergyLoss", "OverallDifferencesEnergyLoss",
-                      600., -300., 300, 120., 0., 120.));
+      new TProfile2D("OverallDifferencesEnergyLoss", "OverallDifferencesEnergyLoss", 600., -300., 300, 120., 0., 120.));
 
   for (auto g : m_groups) {
     m_plots.push_back(
-        new TH2F( g->name().c_str(), g->name().c_str(),
-                  6000., -300., 300, 1200., 0., 120.)); // 10x10 points per cm2
+        new TH2F(g->name().c_str(), g->name().c_str(), 6000., -300., 300, 1200., 0., 120.));  // 10x10 points per cm2
     TH2F &current = *m_plots.back();
     current.SetMarkerColor(m_color[color_index]);
-    current.SetMarkerStyle(markerStyles[color_index%10]);
+    current.SetMarkerStyle(markerStyles[color_index % 10]);
     current.SetMarkerSize(0.8);
     current.SetLineWidth(1);
     for (auto element : g->elements()) {
@@ -508,12 +495,12 @@ void ListGroups::produceAndSaveSummaryPlot(const edm::EventSetup &setup) {
     else
       current.Draw("SAME");
 
-    leg->AddEntry(&current , g->name().c_str(), "lp")->SetTextColor(m_color[color_index]);
+    leg->AddEntry(&current, g->name().c_str(), "lp")->SetTextColor(m_color[color_index]);
     color_index++;
 
     // Loop over the same chromatic scale in case the number of
     // allocated colors is not big enough.
-    color_index  = color_index%m_color.size();
+    color_index = color_index % m_color.size();
   }
   leg->Draw();
   canvas->SaveAs("Grouping.png");
@@ -543,8 +530,8 @@ void ListGroups::produceAndSaveSummaryPlot(const edm::EventSetup &setup) {
   canvas->SaveAs("EnergyLossValues.png");
 
   canvas->Clear();
-  gStyle->SetPalette( m_gradient.size(), & m_gradient.front() );
-  gStyle->SetNumberContours( m_gradient.size() );
+  gStyle->SetPalette(m_gradient.size(), &m_gradient.front());
+  gStyle->SetNumberContours(m_gradient.size());
   radlen_diff->SetMinimum(-100);
   radlen_diff->SetMaximum(100);
   radlen_diff->Draw("COLZ");
@@ -568,17 +555,14 @@ void ListGroups::produceAndSaveSummaryPlot(const edm::EventSetup &setup) {
 
   for (auto g : nukem_text)
     delete g;
-
 }
 
-
-void
-ListGroups::analyze(const edm::Event& evt, const edm::EventSetup& setup) {
+void ListGroups::analyze(const edm::Event &evt, const edm::EventSetup &setup) {
   edm::ESTransientHandle<DDCompactView> hDdd;
-  setup.get<IdealGeometryRecord>().get( hDdd );
+  setup.get<IdealGeometryRecord>().get(hDdd);
 
   DDSpecificsHasNamedValueFilter filter{"TrackingMaterialGroup"};
-  DDFilteredView fv(*hDdd,filter);
+  DDFilteredView fv(*hDdd, filter);
 
   while (fv.next()) {
     // print the group name and full hierarchy of all items
@@ -586,16 +570,14 @@ ListGroups::analyze(const edm::Event& evt, const edm::EventSetup& setup) {
     m_group_names.insert(dddGetString("TrackingMaterialGroup", fv));
 
     // start from 2 to skip the leading /OCMS[0]/CMSE[1] part
-    const DDGeoHistory & history = fv.geoHistory();
+    const DDGeoHistory &history = fv.geoHistory();
     std::cout << '/';
     for (unsigned int h = 2; h < history.size(); ++h)
       std::cout << '/' << history[h].logicalPart().name().name() << '[' << history[h].copyno() << ']';
 
     // DD3Vector and DDTranslation are the same type as math::XYZVector
     math::XYZVector position = fv.translation() / 10.;  // mm -> cm
-    std::cout << "\t(" << position.x()
-              << ", " << position.y()
-              << ", " << position.z() << ") "
+    std::cout << "\t(" << position.x() << ", " << position.y() << ", " << position.z() << ") "
               << "[rho] " << position.Rho() << std::endl;
   };
   std::cout << std::endl;
@@ -604,9 +586,7 @@ ListGroups::analyze(const edm::Event& evt, const edm::EventSetup& setup) {
     produceAndSaveSummaryPlot(setup);
 }
 
-void
-ListGroups::endJob() {
-}
+void ListGroups::endJob() {}
 
 //-------------------------------------------------------------------------
 // define as a plugin
diff --git a/SimTracker/TrackerMaterialAnalysis/plugins/ListIds.cc b/SimTracker/TrackerMaterialAnalysis/plugins/ListIds.cc
index 6a5bd24c8a509..355958b40e76c 100644
--- a/SimTracker/TrackerMaterialAnalysis/plugins/ListIds.cc
+++ b/SimTracker/TrackerMaterialAnalysis/plugins/ListIds.cc
@@ -25,13 +25,12 @@
 #include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 
-static
-bool dddGetStringRaw(const DDFilteredView & view, const std::string & name, std::string & value) {
+static bool dddGetStringRaw(const DDFilteredView &view, const std::string &name, std::string &value) {
   DDValue parameter(name);
   std::vector<const DDsvalues_type *> result;
   view.specificsV(result);
   for (std::vector<const DDsvalues_type *>::iterator it = result.begin(); it != result.end(); ++it) {
-    if (DDfetch(*it,parameter)) {
+    if (DDfetch(*it, parameter)) {
       if (parameter.strings().size() == 1) {
         value = parameter.strings().front();
         return true;
@@ -54,8 +53,7 @@ double dddGetDouble(const std::string & s, const DDFilteredView & view) {
 }
 */
 
-static inline
-std::string dddGetString(const std::string & s, const DDFilteredView & view) {
+static inline std::string dddGetString(const std::string &s, const DDFilteredView &view) {
   std::string value;
   if (dddGetStringRaw(view, s, value))
     return value;
@@ -63,13 +61,11 @@ std::string dddGetString(const std::string & s, const DDFilteredView & view) {
     return std::string();
 }
 
-static inline
-std::ostream & operator<<(std::ostream & out, const math::XYZVector & v) {
+static inline std::ostream &operator<<(std::ostream &out, const math::XYZVector &v) {
   return out << "(" << v.rho() << ", " << v.z() << ", " << v.phi() << ")";
 }
 
-class ListIds : public edm::one::EDAnalyzer<>
-{
+class ListIds : public edm::one::EDAnalyzer<> {
 public:
   ListIds(const edm::ParameterSet &);
   ~ListIds() override;
@@ -86,24 +82,21 @@ class ListIds : public edm::one::EDAnalyzer<>
   std::vector<std::string> materials_;
 };
 
-ListIds::ListIds(const edm::ParameterSet & pset)
- : printMaterial_(pset.getUntrackedParameter<bool>("printMaterial")),
-   materials_(pset.getUntrackedParameter<std::vector<std::string> >("materials")) {
-}
+ListIds::ListIds(const edm::ParameterSet &pset)
+    : printMaterial_(pset.getUntrackedParameter<bool>("printMaterial")),
+      materials_(pset.getUntrackedParameter<std::vector<std::string> >("materials")) {}
 
-ListIds::~ListIds() {
-}
+ListIds::~ListIds() {}
 
-void
-ListIds::analyze(const edm::Event& evt, const edm::EventSetup& setup){
+void ListIds::analyze(const edm::Event &evt, const edm::EventSetup &setup) {
   std::cout << "______________________________ DDD ______________________________" << std::endl;
   edm::ESTransientHandle<DDCompactView> hDdd;
-  setup.get<IdealGeometryRecord>().get( hDdd );
+  setup.get<IdealGeometryRecord>().get(hDdd);
 
   std::string attribute = "TkDDDStructure";
   CmsTrackerStringToEnum theCmsTrackerStringToEnum;
   DDSpecificsHasNamedValueFilter filter{attribute};
-  DDFilteredView fv(*hDdd,filter);
+  DDFilteredView fv(*hDdd, filter);
   if (theCmsTrackerStringToEnum.type(dddGetString(attribute, fv)) != GeometricDet::Tracker) {
     fv.firstChild();
     if (theCmsTrackerStringToEnum.type(dddGetString(attribute, fv)) != GeometricDet::Tracker)
@@ -120,16 +113,14 @@ ListIds::analyze(const edm::Event& evt, const edm::EventSetup& setup){
     // keyword ANY (in any location of the vector)
     // will select all elements.
     if (printAnyMaterial ||
-        (std::find(materials_.begin(),
-                   materials_.end(),
-                   fv.logicalPart().material().name().fullname()) != materials_.end())) {
-
+        (std::find(materials_.begin(), materials_.end(), fv.logicalPart().material().name().fullname()) !=
+         materials_.end())) {
       // start from 2 to skip the leading /OCMS[0]/CMSE[1] part
-      const DDGeoHistory & history = fv.geoHistory();
+      const DDGeoHistory &history = fv.geoHistory();
       std::cout << '/';
       for (unsigned int h = 2; h < history.size(); ++h) {
-        std::cout << '/' << history[h].logicalPart().name().ns()
-                  << ":" << history[h].logicalPart().name().name() << '[' << history[h].copyno() << ']';
+        std::cout << '/' << history[h].logicalPart().name().ns() << ":" << history[h].logicalPart().name().name() << '['
+                  << history[h].copyno() << ']';
       }
       if (printMaterial_)
         std::cout << " Material: |" << fv.logicalPart().material().name() << "|";
@@ -140,25 +131,24 @@ ListIds::analyze(const edm::Event& evt, const edm::EventSetup& setup){
   } while (fv.next());
   std::cout << std::endl;
 
-  std::cout << "______________________________ std::vector<GeomDet*> from TrackerGeometry::dets() ______________________________" << std::endl;
+  std::cout << "______________________________ std::vector<GeomDet*> from TrackerGeometry::dets() "
+               "______________________________"
+            << std::endl;
   edm::ESHandle<TrackerGeometry> hGeo;
-  setup.get<TrackerDigiGeometryRecord>().get( hGeo );
+  setup.get<TrackerDigiGeometryRecord>().get(hGeo);
 
   std::cout << std::fixed << std::setprecision(3);
-  auto const & dets = hGeo->dets();
+  auto const &dets = hGeo->dets();
   for (unsigned int i = 0; i < dets.size(); ++i) {
-    const GeomDet & det = *dets[i];
+    const GeomDet &det = *dets[i];
 
     // Surface::PositionType is a typedef for Point3DBase<float,GlobalTag> a.k.a. GlobalPoint
-    const Surface::PositionType & p = det.position();
+    const Surface::PositionType &p = det.position();
     math::XYZVector position(p.x(), p.y(), p.z());
 
-    std::cout << det.subDetector() << '\t'
-              << det.geographicalId().det() << '\t'
-              << det.geographicalId().subdetId() << '\t'
-              << det.geographicalId().rawId() << "\t"
-              << position;
-    const std::vector<const GeomDet*> & parts = det.components();
+    std::cout << det.subDetector() << '\t' << det.geographicalId().det() << '\t' << det.geographicalId().subdetId()
+              << '\t' << det.geographicalId().rawId() << "\t" << position;
+    const std::vector<const GeomDet *> &parts = det.components();
     if (!parts.empty()) {
       std::cout << "\t[" << parts[0]->geographicalId().rawId();
       for (unsigned int j = 1; j < parts.size(); ++j)
@@ -167,12 +157,9 @@ ListIds::analyze(const edm::Event& evt, const edm::EventSetup& setup){
     }
     std::cout << std::endl;
   }
-
 }
 
-void
-ListIds::endJob() {
-}
+void ListIds::endJob() {}
 
 //-------------------------------------------------------------------------
 // define as a plugin
diff --git a/SimTracker/TrackerMaterialAnalysis/plugins/MaterialAccountingGroup.cc b/SimTracker/TrackerMaterialAnalysis/plugins/MaterialAccountingGroup.cc
index 3e6c0074c4664..85fa3f516047a 100644
--- a/SimTracker/TrackerMaterialAnalysis/plugins/MaterialAccountingGroup.cc
+++ b/SimTracker/TrackerMaterialAnalysis/plugins/MaterialAccountingGroup.cc
@@ -17,32 +17,31 @@
 #include "SimDataFormats/ValidationFormats/interface/MaterialAccountingDetector.h"
 #include "MaterialAccountingGroup.h"
 
-double const MaterialAccountingGroup::s_tolerance = 0.01; // 100um should be small enough that no elements from different layers/groups are so close
-
-MaterialAccountingGroup::MaterialAccountingGroup( const std::string & name, const DDCompactView & geometry ) :
-  m_name( name ),
-  m_elements(),
-  m_boundingbox(),
-  m_accounting(),
-  m_errors(),
-  m_tracks( 0 ),
-  m_counted( false ),
-  m_file( nullptr )
-{
+double const MaterialAccountingGroup::s_tolerance =
+    0.01;  // 100um should be small enough that no elements from different layers/groups are so close
+
+MaterialAccountingGroup::MaterialAccountingGroup(const std::string& name, const DDCompactView& geometry)
+    : m_name(name),
+      m_elements(),
+      m_boundingbox(),
+      m_accounting(),
+      m_errors(),
+      m_tracks(0),
+      m_counted(false),
+      m_file(nullptr) {
   // retrieve the elements from DDD
   DDSpecificsMatchesValueFilter filter{DDValue("TrackingMaterialGroup", name)};
-  DDFilteredView fv( geometry,filter );
+  DDFilteredView fv(geometry, filter);
   LogTrace("MaterialAccountingGroup") << "Elements within: " << name << std::endl;
   while (fv.next()) {
     // DD3Vector and DDTranslation are the same type as math::XYZVector
     math::XYZVector position = fv.translation() / 10.;  // mm -> cm
     LogTrace("MaterialAccountingGroup") << "Adding element at(r,z): ("
-              << GlobalPoint(position.x(), position.y(), position.z()).perp()
-              << ", " << GlobalPoint(position.x(), position.y(), position.z()).z()
-              << ") cm" << std::endl;
-    LogTrace("MaterialAccountingGroup") << "Name of added element: "
-                                        << fv.logicalPart().toString() << std::endl;
-    m_elements.push_back( GlobalPoint(position.x(), position.y(), position.z()) );
+                                        << GlobalPoint(position.x(), position.y(), position.z()).perp() << ", "
+                                        << GlobalPoint(position.x(), position.y(), position.z()).z() << ") cm"
+                                        << std::endl;
+    LogTrace("MaterialAccountingGroup") << "Name of added element: " << fv.logicalPart().toString() << std::endl;
+    m_elements.push_back(GlobalPoint(position.x(), position.y(), position.z()));
   }
 
   // grow the bounding box
@@ -50,34 +49,31 @@ MaterialAccountingGroup::MaterialAccountingGroup( const std::string & name, cons
     m_boundingbox.grow(m_elements[i].perp(), m_elements[i].z());
   }
   m_boundingbox.grow(s_tolerance);
-  LogTrace("MaterialAccountingGroup") << "Final BBox r_range: "
-            << m_boundingbox.range_r().first << ", " << m_boundingbox.range_r().second
-            << std::endl
-            << "Final BBox z_range: "
-            << m_boundingbox.range_z().first << ", " << m_boundingbox.range_z().second
-            << std::endl;
+  LogTrace("MaterialAccountingGroup") << "Final BBox r_range: " << m_boundingbox.range_r().first << ", "
+                                      << m_boundingbox.range_r().second << std::endl
+                                      << "Final BBox z_range: " << m_boundingbox.range_z().first << ", "
+                                      << m_boundingbox.range_z().second << std::endl;
 
   // initialize the histograms
-  m_dedx_spectrum   = new TH1F((m_name + "_dedx_spectrum").c_str(),     "Energy loss spectrum",       1000,    0,   1);
-  m_radlen_spectrum = new TH1F((m_name + "_radlen_spectrum").c_str(),   "Radiation lengths spectrum", 1000,    0,   1);
-  m_dedx_vs_eta     = new TProfile((m_name + "_dedx_vs_eta").c_str(),   "Energy loss vs. eta",         600,   -3,   3);
-  m_dedx_vs_z       = new TProfile((m_name + "_dedx_vs_z").c_str(),     "Energy loss vs. Z",          6000, -300, 300);
-  m_dedx_vs_r       = new TProfile((m_name + "_dedx_vs_r").c_str(),     "Energy loss vs. R",          1200,    0, 120);
-  m_radlen_vs_eta   = new TProfile((m_name + "_radlen_vs_eta").c_str(), "Radiation lengths vs. eta",   600,   -3,   3);
-  m_radlen_vs_z     = new TProfile((m_name + "_radlen_vs_z").c_str(),   "Radiation lengths vs. Z",    6000, -300, 300);
-  m_radlen_vs_r     = new TProfile((m_name + "_radlen_vs_r").c_str(),   "Radiation lengths vs. R",    1200,    0, 120);
-  m_dedx_spectrum->SetDirectory( nullptr );
-  m_radlen_spectrum->SetDirectory( nullptr );
-  m_dedx_vs_eta->SetDirectory( nullptr );
-  m_dedx_vs_z->SetDirectory( nullptr );
-  m_dedx_vs_r->SetDirectory( nullptr );
-  m_radlen_vs_eta->SetDirectory( nullptr );
-  m_radlen_vs_z->SetDirectory( nullptr );
-  m_radlen_vs_r->SetDirectory( nullptr );
+  m_dedx_spectrum = new TH1F((m_name + "_dedx_spectrum").c_str(), "Energy loss spectrum", 1000, 0, 1);
+  m_radlen_spectrum = new TH1F((m_name + "_radlen_spectrum").c_str(), "Radiation lengths spectrum", 1000, 0, 1);
+  m_dedx_vs_eta = new TProfile((m_name + "_dedx_vs_eta").c_str(), "Energy loss vs. eta", 600, -3, 3);
+  m_dedx_vs_z = new TProfile((m_name + "_dedx_vs_z").c_str(), "Energy loss vs. Z", 6000, -300, 300);
+  m_dedx_vs_r = new TProfile((m_name + "_dedx_vs_r").c_str(), "Energy loss vs. R", 1200, 0, 120);
+  m_radlen_vs_eta = new TProfile((m_name + "_radlen_vs_eta").c_str(), "Radiation lengths vs. eta", 600, -3, 3);
+  m_radlen_vs_z = new TProfile((m_name + "_radlen_vs_z").c_str(), "Radiation lengths vs. Z", 6000, -300, 300);
+  m_radlen_vs_r = new TProfile((m_name + "_radlen_vs_r").c_str(), "Radiation lengths vs. R", 1200, 0, 120);
+  m_dedx_spectrum->SetDirectory(nullptr);
+  m_radlen_spectrum->SetDirectory(nullptr);
+  m_dedx_vs_eta->SetDirectory(nullptr);
+  m_dedx_vs_z->SetDirectory(nullptr);
+  m_dedx_vs_r->SetDirectory(nullptr);
+  m_radlen_vs_eta->SetDirectory(nullptr);
+  m_radlen_vs_z->SetDirectory(nullptr);
+  m_radlen_vs_r->SetDirectory(nullptr);
 }
 
-MaterialAccountingGroup::~MaterialAccountingGroup(void)
-{
+MaterialAccountingGroup::~MaterialAccountingGroup(void) {
   delete m_dedx_spectrum;
   delete m_dedx_vs_eta;
   delete m_dedx_vs_z;
@@ -92,37 +88,28 @@ MaterialAccountingGroup::~MaterialAccountingGroup(void)
 // (sorting the m_elements, partitioning the bounding box, ...)
 // but is it worth?
 // especially with the segmentation of the layers ?
-bool MaterialAccountingGroup::inside( const MaterialAccountingDetector& detector ) const
-{
-  const GlobalPoint & position = detector.position();
+bool MaterialAccountingGroup::inside(const MaterialAccountingDetector& detector) const {
+  const GlobalPoint& position = detector.position();
   // first check to see if the point is inside the bounding box
-  LogTrace("MaterialAccountingGroup") << "Testing position: (x, y, z, r) = "
-            << position.x() << ", " << position.y()
-            << ", " << position.z() << ", " << position.perp()
-            << std::endl;
+  LogTrace("MaterialAccountingGroup") << "Testing position: (x, y, z, r) = " << position.x() << ", " << position.y()
+                                      << ", " << position.z() << ", " << position.perp() << std::endl;
   if (not m_boundingbox.inside(position.perp(), position.z())) {
-    LogTrace("MaterialAccountingGroup") << "r outside of: ("
-              << m_boundingbox.range_r().first << ", "
-              << m_boundingbox.range_r().second
-              << "), Z ouside of: ("
-              << m_boundingbox.range_z().first << ", "
-              << m_boundingbox.range_z().second << ")" << std::endl;
+    LogTrace("MaterialAccountingGroup") << "r outside of: (" << m_boundingbox.range_r().first << ", "
+                                        << m_boundingbox.range_r().second << "), Z ouside of: ("
+                                        << m_boundingbox.range_z().first << ", " << m_boundingbox.range_z().second
+                                        << ")" << std::endl;
     return false;
   } else {
     // now check if the point is actually close enough to any element
-    LogTrace("MaterialAccountingGroup") << "r within: ("
-              << m_boundingbox.range_r().first << ", "
-              << m_boundingbox.range_r().second
-              << "), Z within: ("
-              << m_boundingbox.range_z().first << ", "
-              << m_boundingbox.range_z().second << ")" << std::endl;
+    LogTrace("MaterialAccountingGroup") << "r within: (" << m_boundingbox.range_r().first << ", "
+                                        << m_boundingbox.range_r().second << "), Z within: ("
+                                        << m_boundingbox.range_z().first << ", " << m_boundingbox.range_z().second
+                                        << ")" << std::endl;
     for (unsigned int i = 0; i < m_elements.size(); ++i) {
-      LogTrace("MaterialAccountingGroup") << "Closest testing agains(x, y, z, r): ("
-                << m_elements[i].x() << ", " << m_elements[i].y()
-                << ", " << m_elements[i].z() << ", " << m_elements[i].perp() << ") --> "
-                << (position - m_elements[i]).mag()
-                << " vs tolerance: " << s_tolerance
-                << std::endl;
+      LogTrace("MaterialAccountingGroup")
+          << "Closest testing agains(x, y, z, r): (" << m_elements[i].x() << ", " << m_elements[i].y() << ", "
+          << m_elements[i].z() << ", " << m_elements[i].perp() << ") --> " << (position - m_elements[i]).mag()
+          << " vs tolerance: " << s_tolerance << std::endl;
       if ((position - m_elements[i]).mag2() < (s_tolerance * s_tolerance))
         return true;
     }
@@ -130,8 +117,7 @@ bool MaterialAccountingGroup::inside( const MaterialAccountingDetector& detector
   }
 }
 
-bool MaterialAccountingGroup::addDetector( const MaterialAccountingDetector& detector )
-{
+bool MaterialAccountingGroup::addDetector(const MaterialAccountingDetector& detector) {
   if (not inside(detector))
     return false;
 
@@ -147,30 +133,29 @@ void MaterialAccountingGroup::endOfTrack(void) {
   // add a detector
   if (m_counted) {
     m_accounting += m_buffer;
-    m_errors     += m_buffer * m_buffer;
+    m_errors += m_buffer * m_buffer;
     ++m_tracks;
 
-    GlobalPoint average( (m_buffer.in().x() + m_buffer.out().x()) / 2.,
-                         (m_buffer.in().y() + m_buffer.out().y()) / 2.,
-                         (m_buffer.in().z() + m_buffer.out().z()) / 2. );
-    m_dedx_spectrum->Fill(   m_buffer.energyLoss() );
-    m_radlen_spectrum->Fill( m_buffer.radiationLengths() );
-    m_dedx_vs_eta->Fill(   average.eta(),  m_buffer.energyLoss(),       1. );
-    m_dedx_vs_z->Fill(     average.z(),    m_buffer.energyLoss(),       1. );
-    m_dedx_vs_r->Fill(     average.perp(), m_buffer.energyLoss(),       1. );
-    m_radlen_vs_eta->Fill( average.eta(),  m_buffer.radiationLengths(), 1. );
-    m_radlen_vs_z->Fill(   average.z(),    m_buffer.radiationLengths(), 1. );
-    m_radlen_vs_r->Fill(   average.perp(), m_buffer.radiationLengths(), 1. );
+    GlobalPoint average((m_buffer.in().x() + m_buffer.out().x()) / 2.,
+                        (m_buffer.in().y() + m_buffer.out().y()) / 2.,
+                        (m_buffer.in().z() + m_buffer.out().z()) / 2.);
+    m_dedx_spectrum->Fill(m_buffer.energyLoss());
+    m_radlen_spectrum->Fill(m_buffer.radiationLengths());
+    m_dedx_vs_eta->Fill(average.eta(), m_buffer.energyLoss(), 1.);
+    m_dedx_vs_z->Fill(average.z(), m_buffer.energyLoss(), 1.);
+    m_dedx_vs_r->Fill(average.perp(), m_buffer.energyLoss(), 1.);
+    m_radlen_vs_eta->Fill(average.eta(), m_buffer.radiationLengths(), 1.);
+    m_radlen_vs_z->Fill(average.z(), m_buffer.radiationLengths(), 1.);
+    m_radlen_vs_r->Fill(average.perp(), m_buffer.radiationLengths(), 1.);
   }
   m_counted = false;
-  m_buffer  = MaterialAccountingStep();
+  m_buffer = MaterialAccountingStep();
 }
 
-void MaterialAccountingGroup::savePlot(TH1F * plot, const std::string & name)
-{
+void MaterialAccountingGroup::savePlot(TH1F* plot, const std::string& name) {
   TCanvas canvas(name.c_str(), plot->GetTitle(), 1280, 1024);
-  plot->SetFillColor(15);       // grey
-  plot->SetLineColor(1);        // black
+  plot->SetFillColor(15);  // grey
+  plot->SetLineColor(1);   // black
   plot->Draw("c e");
   canvas.GetFrame()->SetFillColor(kWhite);
   canvas.Draw();
@@ -180,22 +165,22 @@ void MaterialAccountingGroup::savePlot(TH1F * plot, const std::string & name)
   plot->SetDirectory(m_file);
 }
 
-void MaterialAccountingGroup::savePlot(TProfile * plot, float average, const std::string & name)
-{
+void MaterialAccountingGroup::savePlot(TProfile* plot, float average, const std::string& name) {
   // Nota Bene:
   // these "line" plots are not deleted explicitly since
   //   - deleting them before saving them to a TFile will not save them
   //   - deleting them after the TFile they're stored into results in a SEGV
   // ROOT is probably "taking care" (read: messing things up) somehow...
-  TH1F * line = new TH1F((name + "_par").c_str(), "Parametrization", 1, plot->GetXaxis()->GetXmin(), plot->GetXaxis()->GetXmax());
+  TH1F* line =
+      new TH1F((name + "_par").c_str(), "Parametrization", 1, plot->GetXaxis()->GetXmin(), plot->GetXaxis()->GetXmax());
   line->SetBinContent(1, average);
 
   TCanvas canvas(name.c_str(), plot->GetTitle(), 1280, 1024);
-  plot->SetFillColor(15);       // grey
-  plot->SetLineColor(1);        // black
+  plot->SetFillColor(15);  // grey
+  plot->SetLineColor(1);   // black
   plot->SetLineWidth(2);
   plot->Draw("c e6");
-  line->SetLineColor(2);        // red
+  line->SetLineColor(2);  // red
   line->SetLineWidth(2);
   line->Draw("same");
   canvas.GetFrame()->SetFillColor(kWhite);
@@ -208,28 +193,28 @@ void MaterialAccountingGroup::savePlot(TProfile * plot, float average, const std
 }
 
 /// get some infos
-std::string MaterialAccountingGroup::info(void) const
-{
+std::string MaterialAccountingGroup::info(void) const {
   std::stringstream out;
-  out << std::setw(48) << std::left << m_name << std::right << std::fixed;;
-  out << "BBox: " << std::setprecision(1) << std::setw(6) << m_boundingbox.range_z().first << " < Z < " << std::setprecision(1) << std::setw(6) << m_boundingbox.range_z().second;
-  out << ", "     << std::setprecision(1) << std::setw(5) << m_boundingbox.range_r().first << " < R < " << std::setprecision(1) << std::setw(5) << m_boundingbox.range_r().second;
+  out << std::setw(48) << std::left << m_name << std::right << std::fixed;
+  ;
+  out << "BBox: " << std::setprecision(1) << std::setw(6) << m_boundingbox.range_z().first << " < Z < "
+      << std::setprecision(1) << std::setw(6) << m_boundingbox.range_z().second;
+  out << ", " << std::setprecision(1) << std::setw(5) << m_boundingbox.range_r().first << " < R < "
+      << std::setprecision(1) << std::setw(5) << m_boundingbox.range_r().second;
   out << "   Elements: " << std::setw(6) << m_elements.size();
   return out.str();
 }
 
-
-void MaterialAccountingGroup::savePlots(void)
-{
+void MaterialAccountingGroup::savePlots(void) {
   m_file = new TFile((m_name + ".root").c_str(), "RECREATE");
-  savePlot(m_dedx_spectrum,   m_name + "_dedx_spectrum");
+  savePlot(m_dedx_spectrum, m_name + "_dedx_spectrum");
   savePlot(m_radlen_spectrum, m_name + "_radlen_spectrum");
-  savePlot(m_dedx_vs_eta,     averageEnergyLoss(),       m_name + "_dedx_vs_eta");
-  savePlot(m_dedx_vs_z,       averageEnergyLoss(),       m_name + "_dedx_vs_z");
-  savePlot(m_dedx_vs_r,       averageEnergyLoss(),       m_name + "_dedx_vs_r");
-  savePlot(m_radlen_vs_eta,   averageRadiationLengths(), m_name + "_radlen_vs_eta");
-  savePlot(m_radlen_vs_z,     averageRadiationLengths(), m_name + "_radlen_vs_z");
-  savePlot(m_radlen_vs_r,     averageRadiationLengths(), m_name + "_radlen_vs_r");
+  savePlot(m_dedx_vs_eta, averageEnergyLoss(), m_name + "_dedx_vs_eta");
+  savePlot(m_dedx_vs_z, averageEnergyLoss(), m_name + "_dedx_vs_z");
+  savePlot(m_dedx_vs_r, averageEnergyLoss(), m_name + "_dedx_vs_r");
+  savePlot(m_radlen_vs_eta, averageRadiationLengths(), m_name + "_radlen_vs_eta");
+  savePlot(m_radlen_vs_z, averageRadiationLengths(), m_name + "_radlen_vs_z");
+  savePlot(m_radlen_vs_r, averageRadiationLengths(), m_name + "_radlen_vs_r");
   m_file->Write();
   m_file->Close();
 
diff --git a/SimTracker/TrackerMaterialAnalysis/plugins/MaterialAccountingGroup.h b/SimTracker/TrackerMaterialAnalysis/plugins/MaterialAccountingGroup.h
index 8b153e93dc116..5d31e9943f2ca 100644
--- a/SimTracker/TrackerMaterialAnalysis/plugins/MaterialAccountingGroup.h
+++ b/SimTracker/TrackerMaterialAnalysis/plugins/MaterialAccountingGroup.h
@@ -18,50 +18,37 @@ class DDCompactView;
 
 class MaterialAccountingGroup {
 private:
-
   // quick implementation of a bounding cilinder
   class BoundingBox {
   public:
+    BoundingBox(double min_r, double max_r, double min_z, double max_z)
+        : r_min(min_r), r_max(max_r), z_min(min_z), z_max(max_z) {}
 
-    BoundingBox(double min_r, double max_r, double min_z, double max_z) :
-      r_min(min_r),
-      r_max(max_r),
-      z_min(min_z),
-      z_max(max_z)
-    { }
-
-    BoundingBox() :
-      r_min(0.),
-      r_max(0.),
-      z_min(0.),
-      z_max(0.)
-    { }
+    BoundingBox() : r_min(0.), r_max(0.), z_min(0.), z_max(0.) {}
 
     void grow(double r, double z) {
-      if (r < r_min) r_min = r;
-      if (r > r_max) r_max = r;
-      if (z < z_min) z_min = z;
-      if (z > z_max) z_max = z;
+      if (r < r_min)
+        r_min = r;
+      if (r > r_max)
+        r_max = r;
+      if (z < z_min)
+        z_min = z;
+      if (z > z_max)
+        z_max = z;
     }
 
     void grow(double skin) {
-      r_min -= skin;    // yes, we allow r_min to go negative
+      r_min -= skin;  // yes, we allow r_min to go negative
       r_max += skin;
       z_min -= skin;
       z_max += skin;
     }
 
-    bool inside(double r, double z) const {
-      return (r >= r_min and r <= r_max and z >= z_min and z <= z_max);
-    }
+    bool inside(double r, double z) const { return (r >= r_min and r <= r_max and z >= z_min and z <= z_max); }
 
-    std::pair<double, double> range_r() const {
-      return std::make_pair(r_min, r_max);
-    }
+    std::pair<double, double> range_r() const { return std::make_pair(r_min, r_max); }
 
-    std::pair<double, double> range_z() const {
-      return std::make_pair(z_min, z_max);
-    }
+    std::pair<double, double> range_z() const { return std::make_pair(z_min, z_max); }
 
   private:
     double r_min;
@@ -69,91 +56,72 @@ class MaterialAccountingGroup {
     double z_min;
     double z_max;
   };
-  
+
 public:
   /// explicit constructors
-  MaterialAccountingGroup( const std::string & name, const DDCompactView & geometry );
-    
+  MaterialAccountingGroup(const std::string& name, const DDCompactView& geometry);
+
   /// destructor
-  ~MaterialAccountingGroup( void );
+  ~MaterialAccountingGroup(void);
 
 private:
   /// stop default copy ctor
-  MaterialAccountingGroup(const MaterialAccountingGroup & layer) = delete;
+  MaterialAccountingGroup(const MaterialAccountingGroup& layer) = delete;
 
   /// stop default assignment operator
-  MaterialAccountingGroup& operator=( const MaterialAccountingGroup & layer) = delete;
+  MaterialAccountingGroup& operator=(const MaterialAccountingGroup& layer) = delete;
 
 public:
   /// buffer material from a detector, if the detector is inside the DetLayer bounds
-  bool addDetector( const MaterialAccountingDetector& detector );
- 
+  bool addDetector(const MaterialAccountingDetector& detector);
+
   /// commit the buffer and reset the "already hit by this track" flag
-  void endOfTrack( void );
-  
-  /// check if detector is inside any part of this layer 
-  bool inside( const MaterialAccountingDetector& detector ) const;
+  void endOfTrack(void);
+
+  /// check if detector is inside any part of this layer
+  bool inside(const MaterialAccountingDetector& detector) const;
 
   /// Return the bouding limit in R for the hosted Group
-  std::pair<double, double> getBoundingR() const {return m_boundingbox.range_r();};
+  std::pair<double, double> getBoundingR() const { return m_boundingbox.range_r(); };
 
   /// Return the bouding limit in Z for the hosted Group
-  std::pair<double, double> getBoundingZ() const {return m_boundingbox.range_z();};
+  std::pair<double, double> getBoundingZ() const { return m_boundingbox.range_z(); };
 
   /// return the average normalized material accounting informations
-  MaterialAccountingStep average(void) const 
-  {
-    return m_tracks ? m_accounting / m_tracks : MaterialAccountingStep();
-  }
+  MaterialAccountingStep average(void) const { return m_tracks ? m_accounting / m_tracks : MaterialAccountingStep(); }
 
   /// return the average normalized layer thickness
-  double averageLength(void) const 
-  {
-    return m_tracks ? m_accounting.length() / m_tracks : 0.;
-  }
-  
+  double averageLength(void) const { return m_tracks ? m_accounting.length() / m_tracks : 0.; }
+
   /// return the average normalized number of radiation lengths
-  double averageRadiationLengths(void) const 
-  {
-    return m_tracks ? m_accounting.radiationLengths() / m_tracks : 0.;
-  }
-  
+  double averageRadiationLengths(void) const { return m_tracks ? m_accounting.radiationLengths() / m_tracks : 0.; }
+
   /// return the average normalized energy loss density factor for Bethe-Bloch
-  double averageEnergyLoss(void) const 
-  {
-    return m_tracks ? m_accounting.energyLoss() / m_tracks : 0.;
-  }
- 
+  double averageEnergyLoss(void) const { return m_tracks ? m_accounting.energyLoss() / m_tracks : 0.; }
+
   /// return the sigma of the normalized layer thickness
-  double sigmaLength(void) const 
-  {
-    return m_tracks ? std::sqrt(m_errors.length() / m_tracks - averageLength()*averageLength()) : 0.;
+  double sigmaLength(void) const {
+    return m_tracks ? std::sqrt(m_errors.length() / m_tracks - averageLength() * averageLength()) : 0.;
   }
-  
+
   /// return the sigma of the normalized number of radiation lengths
-  double sigmaRadiationLengths(void) const 
-  {
-    return m_tracks ? std::sqrt(m_errors.radiationLengths() / m_tracks - averageRadiationLengths()*averageRadiationLengths()) : 0.;
+  double sigmaRadiationLengths(void) const {
+    return m_tracks ? std::sqrt(m_errors.radiationLengths() / m_tracks -
+                                averageRadiationLengths() * averageRadiationLengths())
+                    : 0.;
   }
-  
+
   /// return the sigma of the normalized energy loss density factor for Bethe-Bloch
-  double sigmaEnergyLoss(void) const 
-  {
-    return m_tracks ? std::sqrt(m_errors.energyLoss() / m_tracks - averageEnergyLoss()*averageEnergyLoss()) : 0.;
-  }
- 
-  /// return the number of tracks that hit this layer 
-  unsigned int tracks(void) const 
-  {
-    return m_tracks;
-  }
- 
-  /// get the layer name 
-  const std::string & name(void) const
-  {
-    return m_name;
+  double sigmaEnergyLoss(void) const {
+    return m_tracks ? std::sqrt(m_errors.energyLoss() / m_tracks - averageEnergyLoss() * averageEnergyLoss()) : 0.;
   }
 
+  /// return the number of tracks that hit this layer
+  unsigned int tracks(void) const { return m_tracks; }
+
+  /// get the layer name
+  const std::string& name(void) const { return m_name; }
+
   /// get some infos
   std::string info(void) const;
 
@@ -164,39 +132,37 @@ class MaterialAccountingGroup {
   // correspond, roughly, to the center of each subcomponent of this
   // group.
 
-  const std::vector<GlobalPoint> & elements(void) const {
-    return m_elements;
-  }
+  const std::vector<GlobalPoint>& elements(void) const { return m_elements; }
 
 private:
-  void savePlot(TH1F * plot, const std::string & name);
-  void savePlot(TProfile * plot, float average, const std::string & name);
- 
-  std::string                   m_name;
-  std::vector<GlobalPoint>      m_elements;
-  BoundingBox                   m_boundingbox;
-  MaterialAccountingStep        m_accounting;
-  MaterialAccountingStep        m_errors;
-  unsigned int                  m_tracks;
-  bool                          m_counted;
-  MaterialAccountingStep        m_buffer;
-  
+  void savePlot(TH1F* plot, const std::string& name);
+  void savePlot(TProfile* plot, float average, const std::string& name);
+
+  std::string m_name;
+  std::vector<GlobalPoint> m_elements;
+  BoundingBox m_boundingbox;
+  MaterialAccountingStep m_accounting;
+  MaterialAccountingStep m_errors;
+  unsigned int m_tracks;
+  bool m_counted;
+  MaterialAccountingStep m_buffer;
+
   // plots of material effects distribution
-  TH1F * m_dedx_spectrum;
-  TH1F * m_radlen_spectrum;
+  TH1F* m_dedx_spectrum;
+  TH1F* m_radlen_spectrum;
   // plots of material effects vs. η / Z / R
-  TProfile * m_dedx_vs_eta;
-  TProfile * m_dedx_vs_z;
-  TProfile * m_dedx_vs_r;
-  TProfile * m_radlen_vs_eta;
-  TProfile * m_radlen_vs_z;
-  TProfile * m_radlen_vs_r;
+  TProfile* m_dedx_vs_eta;
+  TProfile* m_dedx_vs_z;
+  TProfile* m_dedx_vs_r;
+  TProfile* m_radlen_vs_eta;
+  TProfile* m_radlen_vs_z;
+  TProfile* m_radlen_vs_r;
 
   // file to store plots into
-  mutable TFile * m_file;
+  mutable TFile* m_file;
 
   // 100um should be small enough that no elements from different layers/groups are so close
   static double const s_tolerance;
 };
 
-#endif // MaterialAccountingGroup_h
+#endif  // MaterialAccountingGroup_h
diff --git a/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialAnalyser.cc b/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialAnalyser.cc
index e7146e135593d..e9035114ad18a 100644
--- a/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialAnalyser.cc
+++ b/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialAnalyser.cc
@@ -1,4 +1,4 @@
-#include <iostream>     // FIXME: switch to MessagLogger & friends
+#include <iostream>  // FIXME: switch to MessagLogger & friends
 #include <fstream>
 #include <sstream>
 #include <vector>
@@ -26,12 +26,11 @@
 #include "TrackingMaterialPlotter.h"
 
 //-------------------------------------------------------------------------
-TrackingMaterialAnalyser::TrackingMaterialAnalyser(const edm::ParameterSet& iPSet)
-{
-  m_materialToken           = consumes<std::vector<MaterialAccountingTrack> >(
-      iPSet.getParameter<edm::InputTag>("MaterialAccounting"));
-  m_groupNames              = iPSet.getParameter<std::vector<std::string> >("Groups");
-  const std::string & splitmode = iPSet.getParameter<std::string>("SplitMode");
+TrackingMaterialAnalyser::TrackingMaterialAnalyser(const edm::ParameterSet& iPSet) {
+  m_materialToken =
+      consumes<std::vector<MaterialAccountingTrack> >(iPSet.getParameter<edm::InputTag>("MaterialAccounting"));
+  m_groupNames = iPSet.getParameter<std::vector<std::string> >("Groups");
+  const std::string& splitmode = iPSet.getParameter<std::string>("SplitMode");
   if (strcasecmp(splitmode.c_str(), "NearestLayer") == 0) {
     m_splitMode = NEAREST_LAYER;
   } else if (strcasecmp(splitmode.c_str(), "InnerLayer") == 0) {
@@ -40,45 +39,49 @@ TrackingMaterialAnalyser::TrackingMaterialAnalyser(const edm::ParameterSet& iPSe
     m_splitMode = OUTER_LAYER;
   } else {
     m_splitMode = UNDEFINED;
-    throw edm::Exception(edm::errors::LogicError) << "Invalid SplitMode \"" << splitmode << "\". Acceptable values are \"NearestLayer\", \"InnerLayer\", \"OuterLayer\".";
+    throw edm::Exception(edm::errors::LogicError)
+        << "Invalid SplitMode \"" << splitmode
+        << "\". Acceptable values are \"NearestLayer\", \"InnerLayer\", \"OuterLayer\".";
   }
-  m_skipAfterLastDetector   = iPSet.getParameter<bool>("SkipAfterLastDetector");
+  m_skipAfterLastDetector = iPSet.getParameter<bool>("SkipAfterLastDetector");
   m_skipBeforeFirstDetector = iPSet.getParameter<bool>("SkipBeforeFirstDetector");
-  m_saveSummaryPlot         = iPSet.getParameter<bool>("SaveSummaryPlot");
-  m_saveDetailedPlots       = iPSet.getParameter<bool>("SaveDetailedPlots");
-  m_saveParameters          = iPSet.getParameter<bool>("SaveParameters");
-  m_saveXml                 = iPSet.getParameter<bool>("SaveXML");
+  m_saveSummaryPlot = iPSet.getParameter<bool>("SaveSummaryPlot");
+  m_saveDetailedPlots = iPSet.getParameter<bool>("SaveDetailedPlots");
+  m_saveParameters = iPSet.getParameter<bool>("SaveParameters");
+  m_saveXml = iPSet.getParameter<bool>("SaveXML");
   if (m_saveSummaryPlot)
-    m_plotter               = new TrackingMaterialPlotter( 300., 120., 10 );      // 10x10 points per cm2
+    m_plotter = new TrackingMaterialPlotter(300., 120., 10);  // 10x10 points per cm2
   else
-    m_plotter               = nullptr;
+    m_plotter = nullptr;
 }
 
 //-------------------------------------------------------------------------
-TrackingMaterialAnalyser::~TrackingMaterialAnalyser(void)
-{
+TrackingMaterialAnalyser::~TrackingMaterialAnalyser(void) {
   if (m_plotter)
     delete m_plotter;
 }
 
 //-------------------------------------------------------------------------
-void TrackingMaterialAnalyser::saveParameters(const char* name)
-{
+void TrackingMaterialAnalyser::saveParameters(const char* name) {
   std::ofstream parameters(name);
   std::cout << std::endl;
   for (unsigned int i = 0; i < m_groups.size(); ++i) {
-    MaterialAccountingGroup & layer = *(m_groups[i]);
+    MaterialAccountingGroup& layer = *(m_groups[i]);
     std::cout << layer.name() << std::endl;
     std::cout << boost::format("\tnumber of hits:               %9d") % layer.tracks() << std::endl;
-    std::cout << boost::format("\tnormalized segment length:    %9.1f ± %9.1f cm")  % layer.averageLength()           % layer.sigmaLength()           << std::endl;
-    std::cout << boost::format("\tnormalized radiation lengths: %9.3f ± %9.3f")     % layer.averageRadiationLengths() % layer.sigmaRadiationLengths() << std::endl;
-    std::cout << boost::format("\tnormalized energy loss:       %6.5fe-03 ± %6.5fe-03 GeV") % layer.averageEnergyLoss()       % layer.sigmaEnergyLoss()       << std::endl;
-    parameters << boost::format("%-20s\t%7d\t%5.1f ± %5.1f cm\t%6.4f ± %6.4f \t%6.4fe-03 ± %6.4fe-03 GeV")
-                                % layer.name()
-                                % layer.tracks()
-                                % layer.averageLength()               % layer.sigmaLength()
-                                % layer.averageRadiationLengths()     % layer.sigmaRadiationLengths()
-                                % layer.averageEnergyLoss()           % layer.sigmaEnergyLoss()
+    std::cout << boost::format("\tnormalized segment length:    %9.1f ± %9.1f cm") % layer.averageLength() %
+                     layer.sigmaLength()
+              << std::endl;
+    std::cout << boost::format("\tnormalized radiation lengths: %9.3f ± %9.3f") % layer.averageRadiationLengths() %
+                     layer.sigmaRadiationLengths()
+              << std::endl;
+    std::cout << boost::format("\tnormalized energy loss:       %6.5fe-03 ± %6.5fe-03 GeV") %
+                     layer.averageEnergyLoss() % layer.sigmaEnergyLoss()
+              << std::endl;
+    parameters << boost::format("%-20s\t%7d\t%5.1f ± %5.1f cm\t%6.4f ± %6.4f \t%6.4fe-03 ± %6.4fe-03 GeV") %
+                      layer.name() % layer.tracks() % layer.averageLength() % layer.sigmaLength() %
+                      layer.averageRadiationLengths() % layer.sigmaRadiationLengths() % layer.averageEnergyLoss() %
+                      layer.sigmaEnergyLoss()
                << std::endl;
   }
   std::cout << std::endl;
@@ -87,13 +90,12 @@ void TrackingMaterialAnalyser::saveParameters(const char* name)
 }
 
 //-------------------------------------------------------------------------
-void TrackingMaterialAnalyser::saveXml(const char* name)
-{
+void TrackingMaterialAnalyser::saveXml(const char* name) {
   std::ofstream xml(name);
   xml << "<?xml version=\"1.0\" encoding=\"utf-8\"?>" << std::endl;
   xml << "<Groups>" << std::endl;
   for (unsigned int i = 0; i < m_groups.size(); ++i) {
-    MaterialAccountingGroup & layer = *(m_groups[i]);
+    MaterialAccountingGroup& layer = *(m_groups[i]);
     xml << "  <Group name=\"" << layer.name() << "\">\n"
         << "    <Parameter name=\"TrackerRadLength\" value=\"" << layer.averageRadiationLengths() << "\"/>\n"
         << "    <Parameter name=\"TrackerXi\" value=\"" << layer.averageEnergyLoss() << "\"/>\n"
@@ -104,17 +106,15 @@ void TrackingMaterialAnalyser::saveXml(const char* name)
 }
 
 //-------------------------------------------------------------------------
-void TrackingMaterialAnalyser::saveLayerPlots()
-{
+void TrackingMaterialAnalyser::saveLayerPlots() {
   for (unsigned int i = 0; i < m_groups.size(); ++i) {
-    MaterialAccountingGroup & layer = *(m_groups[i]);
+    MaterialAccountingGroup& layer = *(m_groups[i]);
     layer.savePlots();
   }
 }
 
 //-------------------------------------------------------------------------
-void TrackingMaterialAnalyser::endJob(void)
-{
+void TrackingMaterialAnalyser::endJob(void) {
   if (m_saveParameters)
     saveParameters("parameters");
 
@@ -133,32 +133,30 @@ void TrackingMaterialAnalyser::endJob(void)
 //-------------------------------------------------------------------------
 
 //-------------------------------------------------------------------------
-void TrackingMaterialAnalyser::analyze(const edm::Event& event, const edm::EventSetup& setup)
-{
+void TrackingMaterialAnalyser::analyze(const edm::Event& event, const edm::EventSetup& setup) {
   using namespace edm;
   ESTransientHandle<DDCompactView> hDDD;
-  setup.get<IdealGeometryRecord>().get( hDDD );
+  setup.get<IdealGeometryRecord>().get(hDDD);
 
-  m_groups.reserve( m_groupNames.size() );
+  m_groups.reserve(m_groupNames.size());
   // Initialize m_groups iff it has size equal to zero, so that we are
   // sure it will never be repopulated with the same entries over and
   // over again in the eventloop, at each call of the analyze method.
   if (m_groups.empty()) {
     for (unsigned int i = 0; i < m_groupNames.size(); ++i)
-      m_groups.push_back( new MaterialAccountingGroup( m_groupNames[i], * hDDD) );
+      m_groups.push_back(new MaterialAccountingGroup(m_groupNames[i], *hDDD));
 
-    LogInfo("TrackingMaterialAnalyser")
-        << "TrackingMaterialAnalyser: List of the tracker groups: " << std::endl;
+    LogInfo("TrackingMaterialAnalyser") << "TrackingMaterialAnalyser: List of the tracker groups: " << std::endl;
     for (unsigned int i = 0; i < m_groups.size(); ++i)
-      LogInfo("TrackingMaterialAnalyser")
-        << i << " TrackingMaterialAnalyser:\t" << m_groups[i]->info() << std::endl;
+      LogInfo("TrackingMaterialAnalyser") << i << " TrackingMaterialAnalyser:\t" << m_groups[i]->info() << std::endl;
   }
-  Handle< std::vector<MaterialAccountingTrack> > h_tracks;
+  Handle<std::vector<MaterialAccountingTrack> > h_tracks;
   event.getByToken(m_materialToken, h_tracks);
 
-  for (std::vector<MaterialAccountingTrack>::const_iterator t = h_tracks->begin(), end = h_tracks->end(); t != end; ++t) {
+  for (std::vector<MaterialAccountingTrack>::const_iterator t = h_tracks->begin(), end = h_tracks->end(); t != end;
+       ++t) {
     MaterialAccountingTrack track(*t);
-    split( track );
+    split(track);
   }
 }
 
@@ -171,24 +169,20 @@ void TrackingMaterialAnalyser::analyze(const edm::Event& event, const edm::Event
 // each track are consecutive and adjacent, and that no step can span
 // across 3 layers, since all steps should split at layer boundaries
 
-void TrackingMaterialAnalyser::split( MaterialAccountingTrack & track )
-{
+void TrackingMaterialAnalyser::split(MaterialAccountingTrack& track) {
   using namespace edm;
   // group sensitive detectors by their DetLayer
-  std::vector<int> group( track.detectors().size() );
+  std::vector<int> group(track.detectors().size());
   for (unsigned int i = 0; i < track.detectors().size(); ++i)
-    group[i] = findLayer( track.detectors()[i] );
+    group[i] = findLayer(track.detectors()[i]);
 
   for (unsigned int i = 0; i < group.size(); ++i)
     if (group[i] > 0)
-      LogInfo("TrackingMaterialAnalyser") << "For detector i: " << i << " index: "
-                                          << group[i] << " R-ranges: "
-                                          << m_groups[group[i]-1]->getBoundingR().first
-                                          << ", " << m_groups[group[i]-1]->getBoundingR().second
-                                          << group[i] << " Z-ranges: "
-                                          << m_groups[group[i]-1]->getBoundingZ().first
-                                          << ", " << m_groups[group[i]-1]->getBoundingZ().second
-                                          << std::endl;
+      LogInfo("TrackingMaterialAnalyser") << "For detector i: " << i << " index: " << group[i]
+                                          << " R-ranges: " << m_groups[group[i] - 1]->getBoundingR().first << ", "
+                                          << m_groups[group[i] - 1]->getBoundingR().second << group[i]
+                                          << " Z-ranges: " << m_groups[group[i] - 1]->getBoundingZ().first << ", "
+                                          << m_groups[group[i] - 1]->getBoundingZ().second << std::endl;
 
   unsigned int detectors = track.detectors().size();
   if (detectors == 0) {
@@ -196,21 +190,21 @@ void TrackingMaterialAnalyser::split( MaterialAccountingTrack & track )
     // keep al material as unassigned
     if (m_plotter)
       for (unsigned int i = 1; i < track.steps().size(); ++i)
-        m_plotter->plotSegmentUnassigned( track.steps()[i] );
+        m_plotter->plotSegmentUnassigned(track.steps()[i]);
   } else {
-    const double TOLERANCE = 0.0001;    // 1 um tolerance
+    const double TOLERANCE = 0.0001;  // 1 um tolerance
     std::vector<double> limits(detectors + 2);
 
     // define the trivial limits
     if (m_skipBeforeFirstDetector)
       limits[0] = track.detectors()[0].m_curvilinearIn - TOLERANCE;
     else
-      limits[0] = - TOLERANCE;
+      limits[0] = -TOLERANCE;
     if (m_skipAfterLastDetector)
-      limits[detectors] = track.detectors()[detectors-1].m_curvilinearOut + TOLERANCE;
+      limits[detectors] = track.detectors()[detectors - 1].m_curvilinearOut + TOLERANCE;
     else
       limits[detectors] = track.summary().length() + TOLERANCE;
-    limits[detectors+1] = INFINITY;     // this is probably no more needed, but doesn't harm...
+    limits[detectors + 1] = INFINITY;  // this is probably no more needed, but doesn't harm...
 
     // pick the algorithm to define the non-trivial limits
     switch (m_splitMode) {
@@ -218,7 +212,7 @@ void TrackingMaterialAnalyser::split( MaterialAccountingTrack & track )
       // e.g. the material between pixel barrel 3 and TIB 1 will be split among the two
       case NEAREST_LAYER:
         for (unsigned int i = 1; i < detectors; ++i) {
-          limits[i] = (track.detectors()[i-1].m_curvilinearOut + track.detectors()[i].m_curvilinearIn) / 2.;
+          limits[i] = (track.detectors()[i - 1].m_curvilinearOut + track.detectors()[i].m_curvilinearIn) / 2.;
         }
         break;
 
@@ -233,7 +227,7 @@ void TrackingMaterialAnalyser::split( MaterialAccountingTrack & track )
       // e.g. all material between pixel barrel 3 and TIB 1 will go into the TIB
       case OUTER_LAYER:
         for (unsigned int i = 1; i < detectors; ++i)
-          limits[i] = track.detectors()[i-1].m_curvilinearOut + TOLERANCE;
+          limits[i] = track.detectors()[i - 1].m_curvilinearOut + TOLERANCE;
         break;
 
       case UNDEFINED:
@@ -242,33 +236,32 @@ void TrackingMaterialAnalyser::split( MaterialAccountingTrack & track )
         throw edm::Exception(edm::errors::LogicError) << "Invalid SplitMode";
     }
 
-
-    double begin = 0.;          // beginning of step, along the track
-    double end   = 0.;          // end of step, along the track
-    unsigned int i = 1;         // step conter
+    double begin = 0.;   // beginning of step, along the track
+    double end = 0.;     // end of step, along the track
+    unsigned int i = 1;  // step conter
 
     // skip the material before the first layer
     while (end < limits[0]) {
-      const MaterialAccountingStep & step = track.steps()[i++];
+      const MaterialAccountingStep& step = track.steps()[i++];
       end = begin + step.length();
 
       // do not account material before the first layer
       if (m_plotter)
-        m_plotter->plotSegmentUnassigned( step );
+        m_plotter->plotSegmentUnassigned(step);
 
       begin = end;
     }
 
-    unsigned int index = 0;     // which detector
+    unsigned int index = 0;  // which detector
     while (i < track.steps().size()) {
-      const MaterialAccountingStep & step = track.steps()[i++];
+      const MaterialAccountingStep& step = track.steps()[i++];
 
       end = begin + step.length();
 
       if (begin > limits[detectors]) {
         // segment after last layer and skipping requested in configuation
         if (m_plotter)
-          m_plotter->plotSegmentUnassigned( step );
+          m_plotter->plotSegmentUnassigned(step);
         begin = end;
         continue;
       }
@@ -277,51 +270,51 @@ void TrackingMaterialAnalyser::split( MaterialAccountingTrack & track )
       //   limits[index] <= begin < end <= limits[index+1]
       // or possibly split between 2 layers
       //   limits[index] < begin < limits[index+1] < end <  limits[index+2]
-      if (begin < limits[index] or end > limits[index+2]) {
+      if (begin < limits[index] or end > limits[index + 2]) {
         // sanity check
-        std::cerr << "MaterialAccountingTrack::split(): ERROR: internal logic error, expected " << limits[index] << " < " << begin << " < " << limits[index+1] << std::endl;
+        std::cerr << "MaterialAccountingTrack::split(): ERROR: internal logic error, expected " << limits[index]
+                  << " < " << begin << " < " << limits[index + 1] << std::endl;
         break;
       }
 
-      if (limits[index] <= begin and end <= limits[index+1]) {
+      if (limits[index] <= begin and end <= limits[index + 1]) {
         // step completely inside current detector range
-        track.detectors()[index].account( step, begin, end );
+        track.detectors()[index].account(step, begin, end);
         if (m_plotter)
-          m_plotter->plotSegmentInLayer( step, group[index] );
+          m_plotter->plotSegmentInLayer(step, group[index]);
       } else {
         // step shared beteewn two detectors, transition at limits[index+1]
-        double fraction = (limits[index+1] - begin) / (end - begin);
+        double fraction = (limits[index + 1] - begin) / (end - begin);
         assert(fraction < 1.);
         std::pair<MaterialAccountingStep, MaterialAccountingStep> parts = step.split(fraction);
 
         if (m_plotter) {
           if (index > 0)
-            m_plotter->plotSegmentInLayer( parts.first, group[index] );
+            m_plotter->plotSegmentInLayer(parts.first, group[index]);
           else
             // track outside acceptance, keep as unassocated
-            m_plotter->plotSegmentUnassigned( parts.first );
+            m_plotter->plotSegmentUnassigned(parts.first);
 
-          if (index+1 < detectors)
-            m_plotter->plotSegmentInLayer( parts.second,  group[index+1] );
+          if (index + 1 < detectors)
+            m_plotter->plotSegmentInLayer(parts.second, group[index + 1]);
           else
             // track outside acceptance, keep as unassocated
-            m_plotter->plotSegmentUnassigned( parts.second );
+            m_plotter->plotSegmentUnassigned(parts.second);
         }
 
-        track.detectors()[index].account( parts.first, begin, limits[index+1] );
-        ++index;          // next layer
+        track.detectors()[index].account(parts.first, begin, limits[index + 1]);
+        ++index;  // next layer
         if (index < detectors)
-          track.detectors()[index].account( parts.second, limits[index+1], end );
+          track.detectors()[index].account(parts.second, limits[index + 1], end);
       }
       begin = end;
     }
-
   }
 
   // add the material from each detector to its layer (if there is one and only one)
   for (unsigned int i = 0; i < track.detectors().size(); ++i)
     if (group[i] != 0)
-      m_groups[group[i]-1]->addDetector( track.detectors()[i] );
+      m_groups[group[i] - 1]->addDetector(track.detectors()[i]);
 
   // end of track: commit internal buffers and reset the m_groups internal state for a new track
   for (unsigned int i = 0; i < m_groups.size(); ++i)
@@ -332,32 +325,31 @@ void TrackingMaterialAnalyser::split( MaterialAccountingTrack & track )
 // find the layer index (0: none, 1-3: PixelBarrel,
 //                       4-7: TID, 8-13: TOB, 14-15,28-29: PixelEndcap,
 //                       16-18,30-32: TID, 19-27,33-41: TEC)
-int TrackingMaterialAnalyser::findLayer( const MaterialAccountingDetector & detector )
-{
-  int    index  = 0;
+int TrackingMaterialAnalyser::findLayer(const MaterialAccountingDetector& detector) {
+  int index = 0;
   size_t inside = 0;
   for (size_t i = 0; i < m_groups.size(); ++i)
     if (m_groups[i]->inside(detector)) {
       ++inside;
-      index = i+1;
+      index = i + 1;
     }
   if (inside == 0) {
     index = 0;
-    std::cerr << "TrackingMaterialAnalyser::findLayer(...): ERROR: detector does not belong to any DetLayer" << std::endl;
+    std::cerr << "TrackingMaterialAnalyser::findLayer(...): ERROR: detector does not belong to any DetLayer"
+              << std::endl;
     std::cerr << "TrackingMaterialAnalyser::findLayer(...): detector position: " << std::fixed
               << " (r: " << std::setprecision(1) << std::setw(5) << detector.position().perp()
               << ", z: " << std::setprecision(1) << std::setw(6) << detector.position().z()
-              << ", phi: " << std::setprecision(3) << std::setw(6) << detector.position().phi() << ")"
-              << std::endl;
+              << ", phi: " << std::setprecision(3) << std::setw(6) << detector.position().phi() << ")" << std::endl;
   }
   if (inside > 1) {
     index = 0;
-    std::cerr << "TrackingMaterialAnalyser::findLayer(...): ERROR: detector belongs to " << inside << " DetLayers" << std::endl;
+    std::cerr << "TrackingMaterialAnalyser::findLayer(...): ERROR: detector belongs to " << inside << " DetLayers"
+              << std::endl;
     std::cerr << "TrackingMaterialAnalyser::findLayer(...): detector position: " << std::fixed
               << " (r: " << std::setprecision(1) << std::setw(5) << detector.position().perp()
               << ", z: " << std::setprecision(1) << std::setw(6) << detector.position().z()
-              << ", phi: " << std::setprecision(3) << std::setw(6) << detector.position().phi() << ")"
-              << std::endl;
+              << ", phi: " << std::setprecision(3) << std::setw(6) << detector.position().phi() << ")" << std::endl;
   }
 
   return index;
diff --git a/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialAnalyser.h b/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialAnalyser.h
index 70071c4d07722..e51dfb1f63757 100644
--- a/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialAnalyser.h
+++ b/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialAnalyser.h
@@ -13,42 +13,36 @@
 #include "MaterialAccountingGroup.h"
 #include "TrackingMaterialPlotter.h"
 
-class TrackingMaterialAnalyser : public edm::one::EDAnalyzer<>
-{
+class TrackingMaterialAnalyser : public edm::one::EDAnalyzer<> {
 public:
   explicit TrackingMaterialAnalyser(const edm::ParameterSet &);
   ~TrackingMaterialAnalyser() override;
-  
+
 private:
-  enum SplitMode {
-    NEAREST_LAYER,
-    INNER_LAYER,
-    OUTER_LAYER,
-    UNDEFINED
-  };
-  
+  enum SplitMode { NEAREST_LAYER, INNER_LAYER, OUTER_LAYER, UNDEFINED };
+
   void analyze(const edm::Event &, const edm::EventSetup &) override;
   void beginJob() override {}
   void endJob() override;
 
-  void split( MaterialAccountingTrack & track );
-  int  findLayer( const MaterialAccountingDetector & detector );
+  void split(MaterialAccountingTrack &track);
+  int findLayer(const MaterialAccountingDetector &detector);
 
-  void saveParameters(const char* name);
-  void saveXml(const char* name);
+  void saveParameters(const char *name);
+  void saveXml(const char *name);
   void saveLayerPlots();
-  
+
   edm::EDGetTokenT<std::vector<MaterialAccountingTrack> > m_materialToken;
-  SplitMode                                 m_splitMode;
-  bool                                      m_skipAfterLastDetector;
-  bool                                      m_skipBeforeFirstDetector;
-  bool                                      m_saveSummaryPlot;
-  bool                                      m_saveDetailedPlots;
-  bool                                      m_saveParameters;
-  bool                                      m_saveXml;
-  std::vector<MaterialAccountingGroup *>    m_groups;
-  std::vector<std::string>                  m_groupNames;
-  TrackingMaterialPlotter *                 m_plotter;
+  SplitMode m_splitMode;
+  bool m_skipAfterLastDetector;
+  bool m_skipBeforeFirstDetector;
+  bool m_saveSummaryPlot;
+  bool m_saveDetailedPlots;
+  bool m_saveParameters;
+  bool m_saveXml;
+  std::vector<MaterialAccountingGroup *> m_groups;
+  std::vector<std::string> m_groupNames;
+  TrackingMaterialPlotter *m_plotter;
 };
 
-#endif // TrackingMaterialAnalyser_h
+#endif  // TrackingMaterialAnalyser_h
diff --git a/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialPlotter.cc b/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialPlotter.cc
index 79c01c64b5569..8adbcfae1d516 100644
--- a/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialPlotter.cc
+++ b/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialPlotter.cc
@@ -11,72 +11,72 @@
 
 #include "SimDataFormats/ValidationFormats/interface/MaterialAccountingStep.h"
 
-void TrackingMaterialPlotter::fill_color(void)
-{
-  m_color.push_back(kBlack);          // unassigned
-  m_color.push_back(kAzure);          // PixelBarrel
-  m_color.push_back(kAzure + 1) ;     //
-  m_color.push_back(kAzure + 1) ;     //
-  m_color.push_back(kAzure + 3) ;     //
-  m_color.push_back(kAzure + 3) ;     //
-  m_color.push_back(kGreen);          // TIB
-  m_color.push_back(kGreen);      //
-  m_color.push_back(kGreen + 2);      //
-  m_color.push_back(kGreen + 2);      //
-  m_color.push_back(kGreen - 3);      //
-  m_color.push_back(kGreen - 3);      //
-  m_color.push_back(kGreen - 1);      //
-  m_color.push_back(kGreen - 1);      //
-  m_color.push_back(kRed);            // TOB
-  m_color.push_back(kRed);      //
-  m_color.push_back(kRed);      //
+void TrackingMaterialPlotter::fill_color(void) {
+  m_color.push_back(kBlack);        // unassigned
+  m_color.push_back(kAzure);        // PixelBarrel
+  m_color.push_back(kAzure + 1);    //
+  m_color.push_back(kAzure + 1);    //
+  m_color.push_back(kAzure + 3);    //
+  m_color.push_back(kAzure + 3);    //
+  m_color.push_back(kGreen);        // TIB
+  m_color.push_back(kGreen);        //
+  m_color.push_back(kGreen + 2);    //
+  m_color.push_back(kGreen + 2);    //
+  m_color.push_back(kGreen - 3);    //
+  m_color.push_back(kGreen - 3);    //
+  m_color.push_back(kGreen - 1);    //
+  m_color.push_back(kGreen - 1);    //
+  m_color.push_back(kRed);          // TOB
+  m_color.push_back(kRed);          //
+  m_color.push_back(kRed);          //
   m_color.push_back(kRed + 3);      //
   m_color.push_back(kRed + 3);      //
   m_color.push_back(kRed + 3);      //
   m_color.push_back(kRed - 3);      //
   m_color.push_back(kRed - 3);      //
-  m_color.push_back(kRed - 3);    //
-  m_color.push_back(kOrange + 9);     //
-  m_color.push_back(kOrange + 9);     //
-  m_color.push_back(kOrange + 9);     //
-  m_color.push_back(kOrange + 7);     //
-  m_color.push_back(kOrange + 7);     //
-  m_color.push_back(kOrange + 7);     //
-  m_color.push_back(kOrange + 5);     //
-  m_color.push_back(kOrange + 5);     //
-  m_color.push_back(kOrange + 5);     //
-  m_color.push_back(kOrange + 8);         // PixelEndcap Z-
-  m_color.push_back(kOrange + 10);         //
-  m_color.push_back(kOrange - 3);         //
-  m_color.push_back(kOrange - 1);     // PixelEndcap Z+
-  m_color.push_back(kOrange - 8);     //
-  m_color.push_back(kYellow);         // TID Z-
-  m_color.push_back(kYellow);         //
-  m_color.push_back(kYellow + 2);     //
-  m_color.push_back(kYellow + 2);     //
-  m_color.push_back(kYellow + 2);     //
-  m_color.push_back(kYellow + 3);     //
-  m_color.push_back(kMagenta);            //
-  m_color.push_back(kMagenta);            //
-  m_color.push_back(kMagenta);            //
-  m_color.push_back(kMagenta);            //
-  m_color.push_back(kMagenta);            //
-  m_color.push_back(kMagenta + 1);        //
-  m_color.push_back(kMagenta + 2);        //
-  m_color.push_back(kMagenta + 3);        //
-  m_color.push_back(kMagenta + 4);        //
-  m_color.push_back(kMagenta + 5);        //
-  m_color.push_back(kMagenta + 6);        //
-  m_color.push_back(kMagenta + 7);        //
-  m_color.push_back(kMagenta + 8);        //
+  m_color.push_back(kRed - 3);      //
+  m_color.push_back(kOrange + 9);   //
+  m_color.push_back(kOrange + 9);   //
+  m_color.push_back(kOrange + 9);   //
+  m_color.push_back(kOrange + 7);   //
+  m_color.push_back(kOrange + 7);   //
+  m_color.push_back(kOrange + 7);   //
+  m_color.push_back(kOrange + 5);   //
+  m_color.push_back(kOrange + 5);   //
+  m_color.push_back(kOrange + 5);   //
+  m_color.push_back(kOrange + 8);   // PixelEndcap Z-
+  m_color.push_back(kOrange + 10);  //
+  m_color.push_back(kOrange - 3);   //
+  m_color.push_back(kOrange - 1);   // PixelEndcap Z+
+  m_color.push_back(kOrange - 8);   //
+  m_color.push_back(kYellow);       // TID Z-
+  m_color.push_back(kYellow);       //
+  m_color.push_back(kYellow + 2);   //
+  m_color.push_back(kYellow + 2);   //
+  m_color.push_back(kYellow + 2);   //
+  m_color.push_back(kYellow + 3);   //
+  m_color.push_back(kMagenta);      //
+  m_color.push_back(kMagenta);      //
+  m_color.push_back(kMagenta);      //
+  m_color.push_back(kMagenta);      //
+  m_color.push_back(kMagenta);      //
+  m_color.push_back(kMagenta + 1);  //
+  m_color.push_back(kMagenta + 2);  //
+  m_color.push_back(kMagenta + 3);  //
+  m_color.push_back(kMagenta + 4);  //
+  m_color.push_back(kMagenta + 5);  //
+  m_color.push_back(kMagenta + 6);  //
+  m_color.push_back(kMagenta + 7);  //
+  m_color.push_back(kMagenta + 8);  //
 }
 
-
-unsigned int TrackingMaterialPlotter::fill_gradient(const TColor & first, const TColor & last, unsigned int steps /*= 100*/, unsigned int index /* = 0*/)
-{
+unsigned int TrackingMaterialPlotter::fill_gradient(const TColor& first,
+                                                    const TColor& last,
+                                                    unsigned int steps /*= 100*/,
+                                                    unsigned int index /* = 0*/) {
   if (index == 0) {
     // if no index was given, find the highest used one and start from that plus one
-    index = ((TObjArray*) gROOT->GetListOfColors())->GetLast() + 1;
+    index = ((TObjArray*)gROOT->GetListOfColors())->GetLast() + 1;
   }
 
   float r1, g1, b1, r2, g2, b2;
@@ -95,61 +95,64 @@ unsigned int TrackingMaterialPlotter::fill_gradient(const TColor & first, const
   return index;
 }
 
-unsigned int TrackingMaterialPlotter::fill_gradient(unsigned int first, unsigned int last, unsigned int steps /*= 100*/, unsigned int index /* = 0*/)
-{
-  return fill_gradient(* (TColor *) gROOT->GetListOfColors()->At(first), * (TColor *) gROOT->GetListOfColors()->At(last), steps, index);
+unsigned int TrackingMaterialPlotter::fill_gradient(unsigned int first,
+                                                    unsigned int last,
+                                                    unsigned int steps /*= 100*/,
+                                                    unsigned int index /* = 0*/) {
+  return fill_gradient(
+      *(TColor*)gROOT->GetListOfColors()->At(first), *(TColor*)gROOT->GetListOfColors()->At(last), steps, index);
 }
 
-TrackingMaterialPlotter::TrackingMaterialPlotter( float maxZ, float maxR, float resolution )
-{
-  const float rzMinZ  = -maxZ;
-  const float rzMaxZ  =  maxZ;
-  const float rzMinR  =    0.;
-  const float rzMaxR  =  maxR;
-  const int   rzBinsZ = (int) (2. * maxZ * resolution);
-  const int   rzBinsR = (int) (     maxR * resolution);
+TrackingMaterialPlotter::TrackingMaterialPlotter(float maxZ, float maxR, float resolution) {
+  const float rzMinZ = -maxZ;
+  const float rzMaxZ = maxZ;
+  const float rzMinR = 0.;
+  const float rzMaxR = maxR;
+  const int rzBinsZ = (int)(2. * maxZ * resolution);
+  const int rzBinsR = (int)(maxR * resolution);
 
   std::vector<double> max;
-  max.push_back( 0.08 );
-  max.push_back( 0.00016 );
-  m_tracker = XHistogram( 2, rzBinsZ, rzBinsR, std::make_pair(rzMinZ, rzMaxZ), std::make_pair(rzMinR, rzMaxR), m_color.size(), max);
+  max.push_back(0.08);
+  max.push_back(0.00016);
+  m_tracker = XHistogram(
+      2, rzBinsZ, rzBinsR, std::make_pair(rzMinZ, rzMaxZ), std::make_pair(rzMinR, rzMaxR), m_color.size(), max);
 
   TColor::InitializeColors();
   fill_color();
-  fill_gradient( kWhite, kBlack, 100);              // 100-steps gradient from white to black
+  fill_gradient(kWhite, kBlack, 100);  // 100-steps gradient from white to black
 }
 
-void TrackingMaterialPlotter::plotSegmentUnassigned( const MaterialAccountingStep & step )
-{
+void TrackingMaterialPlotter::plotSegmentUnassigned(const MaterialAccountingStep& step) {
   std::vector<double> w(2);
   w[0] = step.radiationLengths();
   w[1] = step.energyLoss();
-  m_tracker.fill( std::make_pair(step.in().z(), step.out().z()),
-                  std::make_pair(step.in().perp(), step.out().perp()),
-                  w, step.length(), 1 );             // 0 is empty, 1 is unassigned
+  m_tracker.fill(std::make_pair(step.in().z(), step.out().z()),
+                 std::make_pair(step.in().perp(), step.out().perp()),
+                 w,
+                 step.length(),
+                 1);  // 0 is empty, 1 is unassigned
 }
 
-void TrackingMaterialPlotter::plotSegmentInLayer( const MaterialAccountingStep & step, int layer )
-{
+void TrackingMaterialPlotter::plotSegmentInLayer(const MaterialAccountingStep& step, int layer) {
   std::vector<double> w(2);
   w[0] = step.radiationLengths();
   w[1] = step.energyLoss();
-  m_tracker.fill( std::make_pair(step.in().z(), step.out().z()),
-                  std::make_pair(step.in().perp(), step.out().perp()),
-                  w, step.length(), layer+1 );       // layer is 1-based, but plot uses: 0 is empty, 1 is unassigned
+  m_tracker.fill(std::make_pair(step.in().z(), step.out().z()),
+                 std::make_pair(step.in().perp(), step.out().perp()),
+                 w,
+                 step.length(),
+                 layer + 1);  // layer is 1-based, but plot uses: 0 is empty, 1 is unassigned
 }
 
-
-void TrackingMaterialPlotter::draw( void )
-{
+void TrackingMaterialPlotter::draw(void) {
   const double scale = 10.;
   TCanvas* canvas;
 
   XHistogram::Histogram* radlen = m_tracker.get(0);
-  canvas = new TCanvas("radlen_rz", "RadiationLengths - RZ view", (int) (600 * scale * 1.25),  (int) (120 * scale * 1.50));
+  canvas = new TCanvas("radlen_rz", "RadiationLengths - RZ view", (int)(600 * scale * 1.25), (int)(120 * scale * 1.50));
   gStyle->SetOptStat(0);
-  gStyle->SetPalette( m_gradient.size(), & m_gradient.front() );
-  gStyle->SetNumberContours( m_gradient.size() );
+  gStyle->SetPalette(m_gradient.size(), &m_gradient.front());
+  gStyle->SetNumberContours(m_gradient.size());
   canvas->GetFrame()->SetFillColor(kWhite);
   radlen->Draw("colz");
   radlen->Draw("same axis y+");
@@ -159,16 +162,21 @@ void TrackingMaterialPlotter::draw( void )
   // positions
   int white_slots = 1;
   int MyPalette[100];
-  double stops[9] = { 0.0000, 0.1250, 0.2500, 0.3750, 0.5000, 0.6250, 0.7500, 0.8750, 1.0000};
-  double red[9]   = { 0./255.,   5./255.,  15./255.,  35./255., 102./255., 196./255., 208./255., 199./255., 110./255.};
-  double green[9] = { 0./255.,  48./255., 124./255., 192./255., 206./255., 226./255.,  97./255.,  16./255.,   0./255.};
-  double blue[9]  = { 99./255., 142./255., 198./255., 201./255.,  90./255.,  22./255.,  13./255.,   8./255.,   2./255.};
+  double stops[9] = {0.0000, 0.1250, 0.2500, 0.3750, 0.5000, 0.6250, 0.7500, 0.8750, 1.0000};
+  double red[9] = {
+      0. / 255., 5. / 255., 15. / 255., 35. / 255., 102. / 255., 196. / 255., 208. / 255., 199. / 255., 110. / 255.};
+  double green[9] = {
+      0. / 255., 48. / 255., 124. / 255., 192. / 255., 206. / 255., 226. / 255., 97. / 255., 16. / 255., 0. / 255.};
+  double blue[9] = {
+      99. / 255., 142. / 255., 198. / 255., 201. / 255., 90. / 255., 22. / 255., 13. / 255., 8. / 255., 2. / 255.};
   int palette_index = TColor::CreateGradientColorTable(9, stops, red, green, blue, 100 - white_slots);
-  for (int i=0; i<white_slots; i++) MyPalette[i] = kWhite;
-  for (int i=0; i<100-white_slots; i++) MyPalette[i + white_slots] = palette_index + i;
+  for (int i = 0; i < white_slots; i++)
+    MyPalette[i] = kWhite;
+  for (int i = 0; i < 100 - white_slots; i++)
+    MyPalette[i + white_slots] = palette_index + i;
   canvas->Clear();
-  gStyle->SetNumberContours( 100 );
-  gStyle->SetPalette(100, MyPalette); // ROOT Rainbow color palette
+  gStyle->SetNumberContours(100);
+  gStyle->SetPalette(100, MyPalette);  // ROOT Rainbow color palette
   radlen->Draw("colz");
   radlen->Draw("same axis y+");
   canvas->SaveAs("radlenColor.png");
@@ -176,35 +184,34 @@ void TrackingMaterialPlotter::draw( void )
   delete canvas;
 
   XHistogram::Histogram* dedx = m_tracker.get(1);
-  canvas = new TCanvas("dedx_rz", "-dE/dx term - RZ view", (int) (600 * scale * 1.25),  (int) (120 * scale * 1.50));
+  canvas = new TCanvas("dedx_rz", "-dE/dx term - RZ view", (int)(600 * scale * 1.25), (int)(120 * scale * 1.50));
   canvas->GetFrame()->SetFillColor(kWhite);
   gStyle->SetOptStat(0);
-  gStyle->SetPalette( m_gradient.size(), & m_gradient.front() );
-  gStyle->SetNumberContours( m_gradient.size() );
+  gStyle->SetPalette(m_gradient.size(), &m_gradient.front());
+  gStyle->SetNumberContours(m_gradient.size());
   dedx->Draw("colz");
   dedx->Draw("same axis y+");
   dedx->SaveAs("dedx.root");
   canvas->SaveAs("dedx.png");
   canvas->Clear();
-  gStyle->SetNumberContours( 100 );
-  gStyle->SetPalette(100, MyPalette); // ROOT Rainbow color palette
+  gStyle->SetNumberContours(100);
+  gStyle->SetPalette(100, MyPalette);  // ROOT Rainbow color palette
   dedx->Draw("colz");
   dedx->Draw("same axis y+");
   canvas->SaveAs("dedxColor.png");
   delete canvas;
 
   XHistogram::ColorMap* colormap = m_tracker.colormap();
-  canvas = new TCanvas("layer_rz", "Layers - RZ view", (int) (600 * scale * 1.25),  (int) (120 * scale * 1.50));
+  canvas = new TCanvas("layer_rz", "Layers - RZ view", (int)(600 * scale * 1.25), (int)(120 * scale * 1.50));
   canvas->GetFrame()->SetFillColor(kWhite);
   gStyle->SetOptStat(0);
-  gStyle->SetPalette( m_color.size(), & m_color.front() );
-  gStyle->SetNumberContours( m_color.size() );
-  colormap->SetMinimum( 1 );
-  colormap->SetMaximum( m_color.size() );
+  gStyle->SetPalette(m_color.size(), &m_color.front());
+  gStyle->SetNumberContours(m_color.size());
+  colormap->SetMinimum(1);
+  colormap->SetMaximum(m_color.size());
   colormap->Draw("col");
   colormap->Draw("same axis y+");
   colormap->SaveAs("layers.root");
   canvas->SaveAs("layers.png");
   delete canvas;
 }
-
diff --git a/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialPlotter.h b/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialPlotter.h
index 7c2f4f44bf767..99e99c564a50e 100644
--- a/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialPlotter.h
+++ b/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialPlotter.h
@@ -15,18 +15,15 @@ class MaterialAccountingStep;
 
 class TrackingMaterialPlotter {
 public:
-  
   typedef std::pair<double, double> Range;
 
-  TrackingMaterialPlotter( float maxZ, float maxR, float resolution );
-  void plotSegmentUnassigned( const MaterialAccountingStep & step );
-  void plotSegmentInLayer( const MaterialAccountingStep & step, int layer );
+  TrackingMaterialPlotter(float maxZ, float maxR, float resolution);
+  void plotSegmentUnassigned(const MaterialAccountingStep& step);
+  void plotSegmentInLayer(const MaterialAccountingStep& step, int layer);
 
-  void normalize( void ) {
-    m_tracker.normalize();
-  }
+  void normalize(void) { m_tracker.normalize(); }
 
-  void draw( void );
+  void draw(void);
 
 private:
   XHistogram m_tracker;
@@ -35,9 +32,8 @@ class TrackingMaterialPlotter {
   std::vector<int> m_gradient;
 
   void fill_color();
-  unsigned int fill_gradient(const TColor & first, const TColor & last, unsigned int steps = 100, unsigned int index = 0);
+  unsigned int fill_gradient(const TColor& first, const TColor& last, unsigned int steps = 100, unsigned int index = 0);
   unsigned int fill_gradient(unsigned int first, unsigned int last, unsigned int steps = 100, unsigned int index = 0);
-
 };
 
-#endif // TrackingMaterialPlotter_h
+#endif  // TrackingMaterialPlotter_h
diff --git a/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialProducer.cc b/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialProducer.cc
index ef28e2ec7c83a..ce0d2c5eefa0b 100644
--- a/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialProducer.cc
+++ b/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialProducer.cc
@@ -1,4 +1,4 @@
-#include <iostream>     // FIXME: switch to MessagLogger & friends
+#include <iostream>  // FIXME: switch to MessagLogger & friends
 #include <vector>
 #include <string>
 #include <cassert>
@@ -38,28 +38,25 @@ using namespace CLHEP;
 using edm::LogInfo;
 
 // missing from GEANT4 < 9.0 : G4LogicalVolumeStore::GetVolume( name )
-static
-const G4LogicalVolume* GetVolume(const std::string& name) {
+static const G4LogicalVolume* GetVolume(const std::string& name) {
   const G4LogicalVolumeStore* lvs = G4LogicalVolumeStore::GetInstance();
 
 #ifdef DEBUG_G4_VOLUMES
   for (G4LogicalVolumeStore::const_iterator volume = lvs->begin(); volume != lvs->end(); ++volume)
-    LogInfo("TrackingMaterialProducer") << "TrackingMaterialProducer: G4 registered volumes "
-                                         << (*volume)->GetName() << std::endl;
+    LogInfo("TrackingMaterialProducer") << "TrackingMaterialProducer: G4 registered volumes " << (*volume)->GetName()
+                                        << std::endl;
 #endif
 
   for (G4LogicalVolumeStore::const_iterator volume = lvs->begin(); volume != lvs->end(); ++volume) {
-    if ((const std::string&) (*volume)->GetName() == name)
+    if ((const std::string&)(*volume)->GetName() == name)
       return (*volume);
   }
   return nullptr;
 }
 
 // missing from GEANT4 : G4TouchableHistory::GetTransform( depth )
-static inline
-const G4AffineTransform& GetTransform(const G4TouchableHistory* touchable, int depth)
-{
-  return touchable->GetHistory()->GetTransform( touchable->GetHistory()->GetDepth() - depth );
+static inline const G4AffineTransform& GetTransform(const G4TouchableHistory* touchable, int depth) {
+  return touchable->GetHistory()->GetTransform(touchable->GetHistory()->GetDepth() - depth);
 }
 
 // navigate up the hierarchy of volumes until one with an attached sensitive detector is found
@@ -68,10 +65,9 @@ const G4AffineTransform& GetTransform(const G4TouchableHistory* touchable, int d
 //   - how may steps up in the hierarchy it is (0 is the starting volume)
 // if no sensitive detector is found, return a NULL pointer and 0
 
-std::tuple<const G4VPhysicalVolume*, int> GetSensitiveVolume( const G4VTouchable* touchable )
-{
+std::tuple<const G4VPhysicalVolume*, int> GetSensitiveVolume(const G4VTouchable* touchable) {
   int depth = touchable->GetHistoryDepth();
-  for (int level = 0; level < depth; ++level) {      // 0 is self
+  for (int level = 0; level < depth; ++level) {  // 0 is self
     const G4VPhysicalVolume* volume = touchable->GetVolume(level);
     if (volume->GetLogicalVolume()->GetSensitiveDetector() != nullptr) {
       return std::make_tuple(volume, level);
@@ -81,59 +77,52 @@ std::tuple<const G4VPhysicalVolume*, int> GetSensitiveVolume( const G4VTouchable
 }
 
 //-------------------------------------------------------------------------
-TrackingMaterialProducer::TrackingMaterialProducer(const edm::ParameterSet& iPSet)
-{
+TrackingMaterialProducer::TrackingMaterialProducer(const edm::ParameterSet& iPSet) {
   edm::ParameterSet config = iPSet.getParameter<edm::ParameterSet>("TrackingMaterialProducer");
-  m_selectedNames       = config.getParameter< std::vector<std::string> >("SelectedVolumes");
-  m_primaryTracks       = config.getParameter<bool>("PrimaryTracksOnly");
-  m_tracks              = nullptr;
+  m_selectedNames = config.getParameter<std::vector<std::string> >("SelectedVolumes");
+  m_primaryTracks = config.getParameter<bool>("PrimaryTracksOnly");
+  m_tracks = nullptr;
 
-  produces< std::vector<MaterialAccountingTrack> >();
+  produces<std::vector<MaterialAccountingTrack> >();
   output_file_ = new TFile("radLen_vs_eta_fromProducer.root", "RECREATE");
   output_file_->cd();
   radLen_vs_eta_ = new TProfile("radLen", "radLen", 250., -5., 5., 0, 10.);
 }
 
 //-------------------------------------------------------------------------
-TrackingMaterialProducer::~TrackingMaterialProducer(void)
-{
-}
+TrackingMaterialProducer::~TrackingMaterialProducer(void) {}
 
 //-------------------------------------------------------------------------
-void TrackingMaterialProducer::update(const EndOfJob* event)
-{
+void TrackingMaterialProducer::update(const EndOfJob* event) {
   radLen_vs_eta_->Write();
   output_file_->Close();
 }
 //-------------------------------------------------------------------------
-void TrackingMaterialProducer::update(const BeginOfJob* event)
-{
+void TrackingMaterialProducer::update(const BeginOfJob* event) {
   // INFO
   LogInfo("TrackingMaterialProducer") << "TrackingMaterialProducer: List of the selected volumes: " << std::endl;
   for (std::vector<std::string>::const_iterator volume_name = m_selectedNames.begin();
-       volume_name != m_selectedNames.end(); ++volume_name) {
+       volume_name != m_selectedNames.end();
+       ++volume_name) {
     const G4LogicalVolume* volume = GetVolume(*volume_name);
     if (volume) {
       LogInfo("TrackingMaterialProducer") << "TrackingMaterialProducer: " << *volume_name << std::endl;
-      m_selectedVolumes.push_back( volume );
+      m_selectedVolumes.push_back(volume);
     } else {
       // FIXME: throw an exception ?
-      std::cerr << "TrackingMaterialProducer::update(const BeginOfJob*): WARNING: selected volume \"" << *volume_name << "\" not found in geometry " << std::endl;
+      std::cerr << "TrackingMaterialProducer::update(const BeginOfJob*): WARNING: selected volume \"" << *volume_name
+                << "\" not found in geometry " << std::endl;
     }
   }
 }
 
-
 //-------------------------------------------------------------------------
-void TrackingMaterialProducer::update(const BeginOfEvent* event)
-{
+void TrackingMaterialProducer::update(const BeginOfEvent* event) {
   m_tracks = new std::vector<MaterialAccountingTrack>();
 }
 
-
 //-------------------------------------------------------------------------
-void TrackingMaterialProducer::update(const BeginOfTrack* event)
-{
+void TrackingMaterialProducer::update(const BeginOfTrack* event) {
   m_track.reset();
 
   // prevent secondary tracks from propagating
@@ -144,119 +133,105 @@ void TrackingMaterialProducer::update(const BeginOfTrack* event)
 }
 
 bool TrackingMaterialProducer::isSelectedFast(const G4TouchableHistory* touchable) {
-  for (int d = touchable->GetHistoryDepth() -1; d >=0;  --d) {
-      if (
-           std::find(
-                     m_selectedNames.begin(),
-                     m_selectedNames.end(),
-                     touchable->GetVolume(d)->GetName())
-        != m_selectedNames.end())
-        return true;
-    }
+  for (int d = touchable->GetHistoryDepth() - 1; d >= 0; --d) {
+    if (std::find(m_selectedNames.begin(), m_selectedNames.end(), touchable->GetVolume(d)->GetName()) !=
+        m_selectedNames.end())
+      return true;
+  }
   return false;
 }
 
 //-------------------------------------------------------------------------
-void TrackingMaterialProducer::update(const G4Step* step)
-{
+void TrackingMaterialProducer::update(const G4Step* step) {
   const G4TouchableHistory* touchable = static_cast<const G4TouchableHistory*>(step->GetTrack()->GetTouchable());
-  if (not isSelectedFast( touchable )) {
+  if (not isSelectedFast(touchable)) {
     LogInfo("TrackingMaterialProducer") << "TrackingMaterialProducer:\t[...] skipping "
-                                         << touchable->GetVolume()->GetName() << std::endl;
+                                        << touchable->GetVolume()->GetName() << std::endl;
     return;
   }
 
   // material and step proterties
   const G4Material* material = touchable->GetVolume()->GetLogicalVolume()->GetMaterial();
-  double length = step->GetStepLength() / cm;          // mm -> cm
-  double X0 = material->GetRadlen() / cm;              // mm -> cm
-  double Ne = material->GetElectronDensity() * cm3;    // 1/mm3 -> 1/cm3
-  double Xi = Ne / 6.0221415e23 * 0.307075 / 2;        // MeV / cm
-  double radiationLengths = length / X0;               //
-  double energyLoss       = length * Xi / 1000.;       // GeV
+  double length = step->GetStepLength() / cm;        // mm -> cm
+  double X0 = material->GetRadlen() / cm;            // mm -> cm
+  double Ne = material->GetElectronDensity() * cm3;  // 1/mm3 -> 1/cm3
+  double Xi = Ne / 6.0221415e23 * 0.307075 / 2;      // MeV / cm
+  double radiationLengths = length / X0;             //
+  double energyLoss = length * Xi / 1000.;           // GeV
   //double energyLoss = step->GetDeltaEnergy()/MeV;  should we use this??
 
-  G4ThreeVector globalPosPre  = step->GetPreStepPoint()->GetPosition();
+  G4ThreeVector globalPosPre = step->GetPreStepPoint()->GetPosition();
   G4ThreeVector globalPosPost = step->GetPostStepPoint()->GetPosition();
-  GlobalPoint globalPositionIn(  globalPosPre.x()  / cm, globalPosPre.y()  / cm, globalPosPre.z() / cm );    // mm -> cm
-  GlobalPoint globalPositionOut( globalPosPost.x() / cm, globalPosPost.y() / cm, globalPosPost.z() / cm );   // mm -> cm
+  GlobalPoint globalPositionIn(globalPosPre.x() / cm, globalPosPre.y() / cm, globalPosPre.z() / cm);      // mm -> cm
+  GlobalPoint globalPositionOut(globalPosPost.x() / cm, globalPosPost.y() / cm, globalPosPost.z() / cm);  // mm -> cm
 
   // check for a sensitive detector
   bool enter_sensitive = false;
   bool leave_sensitive = false;
-  double cosThetaPre  = 0.0;
+  double cosThetaPre = 0.0;
   double cosThetaPost = 0.0;
   int level = 0;
   const G4VPhysicalVolume* sensitive = nullptr;
   GlobalPoint position;
   std::tie(sensitive, level) = GetSensitiveVolume(touchable);
   if (sensitive) {
-    const G4VSolid &          solid     = *touchable->GetSolid( level );
-    const G4AffineTransform & transform = GetTransform( touchable, level );
-    G4ThreeVector pos = transform.Inverse().TransformPoint( G4ThreeVector( 0., 0., 0. ) );
-    position = GlobalPoint( pos.x() / cm, pos.y() / cm, pos.z() / cm );  // mm -> cm
+    const G4VSolid& solid = *touchable->GetSolid(level);
+    const G4AffineTransform& transform = GetTransform(touchable, level);
+    G4ThreeVector pos = transform.Inverse().TransformPoint(G4ThreeVector(0., 0., 0.));
+    position = GlobalPoint(pos.x() / cm, pos.y() / cm, pos.z() / cm);  // mm -> cm
 
-    G4ThreeVector localPosPre   = transform.TransformPoint( globalPosPre );
-    EInside       statusPre     = solid.Inside( localPosPre );
+    G4ThreeVector localPosPre = transform.TransformPoint(globalPosPre);
+    EInside statusPre = solid.Inside(localPosPre);
     if (statusPre == kSurface) {
       enter_sensitive = true;
-      G4ThreeVector globalDirPre  = step->GetPreStepPoint()->GetMomentumDirection();
-      G4ThreeVector localDirPre   = transform.TransformAxis( globalDirPre );
-      G4ThreeVector normalPre     = solid.SurfaceNormal( localPosPre );
-      cosThetaPre  = normalPre.cosTheta( -localDirPre );
+      G4ThreeVector globalDirPre = step->GetPreStepPoint()->GetMomentumDirection();
+      G4ThreeVector localDirPre = transform.TransformAxis(globalDirPre);
+      G4ThreeVector normalPre = solid.SurfaceNormal(localPosPre);
+      cosThetaPre = normalPre.cosTheta(-localDirPre);
     }
 
-    G4ThreeVector localPosPost  = transform.TransformPoint( globalPosPost );
-    EInside       statusPost    = solid.Inside( localPosPost );
+    G4ThreeVector localPosPost = transform.TransformPoint(globalPosPost);
+    EInside statusPost = solid.Inside(localPosPost);
     if (statusPost == kSurface) {
       leave_sensitive = true;
       G4ThreeVector globalDirPost = step->GetPostStepPoint()->GetMomentumDirection();
-      G4ThreeVector localDirPost  = transform.TransformAxis( globalDirPost );
-      G4ThreeVector normalPost    = solid.SurfaceNormal( localPosPost );
-      cosThetaPost = normalPost.cosTheta( localDirPost );
+      G4ThreeVector localDirPost = transform.TransformAxis(globalDirPost);
+      G4ThreeVector normalPost = solid.SurfaceNormal(localPosPost);
+      cosThetaPost = normalPost.cosTheta(localDirPost);
     }
   }
 
   // update track accounting
   if (enter_sensitive)
-    m_track.enterDetector( sensitive, position, cosThetaPre );
-  m_track.step(MaterialAccountingStep( length, radiationLengths, energyLoss, globalPositionIn, globalPositionOut ));
+    m_track.enterDetector(sensitive, position, cosThetaPre);
+  m_track.step(MaterialAccountingStep(length, radiationLengths, energyLoss, globalPositionIn, globalPositionOut));
   if (leave_sensitive)
-    m_track.leaveDetector( sensitive, cosThetaPost );
+    m_track.leaveDetector(sensitive, cosThetaPost);
 
   if (sensitive)
-    LogInfo("TrackingMaterialProducer") << "Track was near sensitive     volume "
-                                         << sensitive->GetName() << std::endl;
+    LogInfo("TrackingMaterialProducer") << "Track was near sensitive     volume " << sensitive->GetName() << std::endl;
   else
-    LogInfo("TrackingMaterialProducer") << "Track was near non-sensitive volume "
-                                         << touchable->GetVolume()->GetName() << std::endl;
-  LogInfo("TrackingMaterialProducer")  << "Step length:             "
-                                       << length << " cm\n"
-                                       << "globalPreStep(r,z): (" << globalPositionIn.perp()
-                                       << ", " << globalPositionIn.z() << ") cm\n"
-                                       << "globalPostStep(r,z): (" << globalPositionOut.perp()
-                                       << ", " << globalPositionOut.z() << ") cm\n"
-                                       << "position(r,z): ("
-                                       << position.perp()
-                                       << ", " << position.z() << ") cm\n"
-                                       << "Radiation lengths:       "
-                                       << radiationLengths << " \t\t(X0: "
-                                       << X0 << " cm)\n"
-                                       << "Energy loss:             "
-                                       << energyLoss << " MeV  \t(Xi: "
-                                       << Xi << " MeV/cm)\n"
-                                       << "Track was " << (enter_sensitive ? "entering " : "in none ")
-                                       << "sensitive volume\n"
-                                       << "Track was " << (leave_sensitive ? "leaving  " : "in none ")
-                                       << "sensitive volume\n";
-
+    LogInfo("TrackingMaterialProducer") << "Track was near non-sensitive volume " << touchable->GetVolume()->GetName()
+                                        << std::endl;
+  LogInfo("TrackingMaterialProducer") << "Step length:             " << length << " cm\n"
+                                      << "globalPreStep(r,z): (" << globalPositionIn.perp() << ", "
+                                      << globalPositionIn.z() << ") cm\n"
+                                      << "globalPostStep(r,z): (" << globalPositionOut.perp() << ", "
+                                      << globalPositionOut.z() << ") cm\n"
+                                      << "position(r,z): (" << position.perp() << ", " << position.z() << ") cm\n"
+                                      << "Radiation lengths:       " << radiationLengths << " \t\t(X0: " << X0
+                                      << " cm)\n"
+                                      << "Energy loss:             " << energyLoss << " MeV  \t(Xi: " << Xi
+                                      << " MeV/cm)\n"
+                                      << "Track was " << (enter_sensitive ? "entering " : "in none ")
+                                      << "sensitive volume\n"
+                                      << "Track was " << (leave_sensitive ? "leaving  " : "in none ")
+                                      << "sensitive volume\n";
 }
 
-
 //-------------------------------------------------------------------------
-void TrackingMaterialProducer::update(const EndOfTrack* event)
-{
-  const G4Track * track = (*event)();
+void TrackingMaterialProducer::update(const EndOfTrack* event) {
+  const G4Track* track = (*event)();
   if (m_primaryTracks and track->GetParentID() != 0)
     return;
 
@@ -264,36 +239,30 @@ void TrackingMaterialProducer::update(const EndOfTrack* event)
   m_tracks->push_back(m_track);
 
   // LogInfo
-  LogInfo("TrackingMaterialProducer") << "TrackingMaterialProducer: this track took "
-                                       << m_track.steps().size()
-                                       << " steps, and passed through "
-                                       << m_track.detectors().size()
-                                       << " sensitive detectors" << std::endl;
-  LogInfo("TrackingMaterialProducer") << "TrackingMaterialProducer: track length:       "
-                                       << m_track.summary().length()
-                                       << " cm" << std::endl;
+  LogInfo("TrackingMaterialProducer") << "TrackingMaterialProducer: this track took " << m_track.steps().size()
+                                      << " steps, and passed through " << m_track.detectors().size()
+                                      << " sensitive detectors" << std::endl;
+  LogInfo("TrackingMaterialProducer") << "TrackingMaterialProducer: track length:       " << m_track.summary().length()
+                                      << " cm" << std::endl;
   LogInfo("TrackingMaterialProducer") << "TrackingMaterialProducer: radiation lengths: "
-                                       << m_track.summary().radiationLengths() << std::endl;
+                                      << m_track.summary().radiationLengths() << std::endl;
   LogInfo("TrackingMaterialProducer") << "TrackingMaterialProducer: energy loss:        "
-                                       << m_track.summary().energyLoss()
-                                       << " MeV" << std::endl;
+                                      << m_track.summary().energyLoss() << " MeV" << std::endl;
 }
 
 //-------------------------------------------------------------------------
-void TrackingMaterialProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void TrackingMaterialProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSetup) {
   // transfer ownership to the Event
-  std::unique_ptr<std::vector<MaterialAccountingTrack> > tracks( m_tracks );
+  std::unique_ptr<std::vector<MaterialAccountingTrack> > tracks(m_tracks);
   iEvent.put(std::move(tracks));
   m_tracks = nullptr;
 }
 
 //-------------------------------------------------------------------------
-bool TrackingMaterialProducer::isSelected( const G4VTouchable* touchable )
-{
+bool TrackingMaterialProducer::isSelected(const G4VTouchable* touchable) {
   for (size_t i = 0; i < m_selectedVolumes.size(); ++i)
-    if (m_selectedVolumes[i]->IsAncestor( touchable->GetVolume() )
-        or m_selectedVolumes[i] == touchable->GetVolume()->GetLogicalVolume())
+    if (m_selectedVolumes[i]->IsAncestor(touchable->GetVolume()) or
+        m_selectedVolumes[i] == touchable->GetVolume()->GetLogicalVolume())
       return true;
 
   return false;
diff --git a/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialProducer.h b/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialProducer.h
index f52a87fb267b6..3fa51715884e4 100644
--- a/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialProducer.h
+++ b/SimTracker/TrackerMaterialAnalysis/plugins/TrackingMaterialProducer.h
@@ -2,7 +2,7 @@
 #define TrackingMaterialProducer_h
 #include <string>
 #include <vector>
- 
+
 #include "SimG4Core/Watcher/interface/SimProducer.h"
 #include "SimG4Core/Notification/interface/Observer.h"
 
@@ -25,7 +25,9 @@ class G4VTouchable;
 class G4VPhysicalVolume;
 class G4LogicalVolume;
 class G4TouchableHistory;
-namespace edm {class ParameterSet;}
+namespace edm {
+  class ParameterSet;
+}
 
 class TrackingMaterialProducer : public SimProducer,
                                  public Observer<const BeginOfJob*>,
@@ -33,12 +35,11 @@ class TrackingMaterialProducer : public SimProducer,
                                  public Observer<const BeginOfEvent*>,
                                  public Observer<const BeginOfTrack*>,
                                  public Observer<const G4Step*>,
-                                 public Observer<const EndOfTrack*>
-{
+                                 public Observer<const EndOfTrack*> {
 public:
   TrackingMaterialProducer(const edm::ParameterSet&);
   ~TrackingMaterialProducer() override;
-  
+
 private:
   void update(const BeginOfJob*) override;
   void update(const BeginOfEvent*) override;
@@ -47,18 +48,18 @@ class TrackingMaterialProducer : public SimProducer,
   void update(const EndOfTrack*) override;
   void update(const EndOfJob*) override;
   void produce(edm::Event&, const edm::EventSetup&) override;
- 
-  bool isSelected( const G4VTouchable* touch );
-  bool isSelectedFast( const G4TouchableHistory* touch );
+
+  bool isSelected(const G4VTouchable* touch);
+  bool isSelectedFast(const G4TouchableHistory* touch);
 
 private:
-  bool                                  m_primaryTracks;
-  std::vector<std::string>              m_selectedNames; 
-  std::vector<const G4LogicalVolume *>  m_selectedVolumes;
-  MaterialAccountingTrack               m_track;
-  std::vector<MaterialAccountingTrack>* m_tracks;  
-  TFile * output_file_;
-  TProfile *  radLen_vs_eta_;
+  bool m_primaryTracks;
+  std::vector<std::string> m_selectedNames;
+  std::vector<const G4LogicalVolume*> m_selectedVolumes;
+  MaterialAccountingTrack m_track;
+  std::vector<MaterialAccountingTrack>* m_tracks;
+  TFile* output_file_;
+  TProfile* radLen_vs_eta_;
 };
 
-#endif // TrackingMaterialProducer_h
+#endif  // TrackingMaterialProducer_h
diff --git a/SimTracker/TrackerMaterialAnalysis/plugins/XHistogram.cc b/SimTracker/TrackerMaterialAnalysis/plugins/XHistogram.cc
index 89b5cc4651f9e..886d61c3a703f 100644
--- a/SimTracker/TrackerMaterialAnalysis/plugins/XHistogram.cc
+++ b/SimTracker/TrackerMaterialAnalysis/plugins/XHistogram.cc
@@ -4,8 +4,7 @@
 
 #include "XHistogram.h"
 
-std::vector<XHistogram::position> XHistogram::splitSegment( Range rangeX, Range rangeY ) const
-{
+std::vector<XHistogram::position> XHistogram::splitSegment(Range rangeX, Range rangeY) const {
   double deltaX = rangeX.second - rangeX.first;
   double deltaY = rangeY.second - rangeY.first;
   double length = hypot(deltaX, deltaY);
@@ -14,115 +13,111 @@ std::vector<XHistogram::position> XHistogram::splitSegment( Range rangeX, Range
 
   int min_i, max_i, min_j, max_j;
   if (rangeX.first < rangeX.second) {
-    min_i = (int) ceil(rangeX.first / stepX);            // included
-    max_i = (int) floor(rangeX.second / stepX) + 1;      // excluded
+    min_i = (int)ceil(rangeX.first / stepX);        // included
+    max_i = (int)floor(rangeX.second / stepX) + 1;  // excluded
   } else {
-    min_i = (int) ceil(rangeX.second / stepX);
-    max_i = (int) floor(rangeX.first / stepX) + 1;
+    min_i = (int)ceil(rangeX.second / stepX);
+    max_i = (int)floor(rangeX.first / stepX) + 1;
   }
   if (rangeY.first < rangeY.second) {
-    min_j = (int) ceil(rangeY.first / stepY);
-    max_j = (int) floor(rangeY.second / stepY) + 1;
+    min_j = (int)ceil(rangeY.first / stepY);
+    max_j = (int)floor(rangeY.second / stepY) + 1;
   } else {
-    min_j = (int) ceil(rangeY.second / stepY);
-    max_j = (int) floor(rangeY.first / stepY) + 1;
+    min_j = (int)ceil(rangeY.second / stepY);
+    max_j = (int)floor(rangeY.first / stepY) + 1;
   }
 
-  int steps = max_i-min_i + max_j-min_j + 2;
+  int steps = max_i - min_i + max_j - min_j + 2;
   std::vector<position> v;
   v.clear();
   v.reserve(steps);
 
-  v.push_back( position(0., rangeX.first, rangeY.first) );
+  v.push_back(position(0., rangeX.first, rangeY.first));
   double x, y, f;
   for (int i = min_i; i < max_i; ++i) {
     x = i * stepX;
     y = rangeY.first + (x - rangeX.first) * deltaY / deltaX;
-    f = std::fabs( (x - rangeX.first) / deltaX );
-    v.push_back( position(f, x, y) );
+    f = std::fabs((x - rangeX.first) / deltaX);
+    v.push_back(position(f, x, y));
   }
   for (int i = min_j; i < max_j; ++i) {
     y = i * stepY;
     x = rangeX.first + (y - rangeY.first) * deltaX / deltaY;
-    f = std::fabs( (y - rangeY.first) / deltaY );
-    v.push_back( position(f, x, y) );
+    f = std::fabs((y - rangeY.first) / deltaY);
+    v.push_back(position(f, x, y));
   }
-  v.push_back( position(1., rangeX.second, rangeY.second) );
+  v.push_back(position(1., rangeX.second, rangeY.second));
 
   // sort by distance from the start of the segment
   std::sort(v.begin(), v.end());
 
   // filter away the fragments shorter than m_minDl, and save the center of each fragment along with its fractionary length
   std::vector<position> result;
-  result.push_back( v.front() );
+  result.push_back(v.front());
   for (int i = 1, s = v.size(); i < s; ++i) {
-    double mx = (v[i].x + v[i-1].x) / 2.;
-    double my = (v[i].y + v[i-1].y) / 2.;
-    double df = (v[i].f - v[i-1].f);
+    double mx = (v[i].x + v[i - 1].x) / 2.;
+    double my = (v[i].y + v[i - 1].y) / 2.;
+    double df = (v[i].f - v[i - 1].f);
     if (df * length < m_minDl)
       continue;
-    result.push_back( position( df, mx, my ) );
+    result.push_back(position(df, mx, my));
   }
 
   return result;
 }
 
 /// fill one point
-void XHistogram::fill( double x, double y, const std::vector<double> & weight, double norm )
-{
-  check_weight( weight );
+void XHistogram::fill(double x, double y, const std::vector<double>& weight, double norm) {
+  check_weight(weight);
 
   for (size_t h = 0; h < m_size; ++h)
-    m_histograms[h]->Fill( x, y, weight[h] );
-  m_normalization->Fill( x, y, norm );
+    m_histograms[h]->Fill(x, y, weight[h]);
+  m_normalization->Fill(x, y, norm);
 }
 
 /// fill one point and set its color
-void XHistogram::fill( double x, double y, const std::vector<double> & weight, double norm, unsigned int colour )
-{
-  check_weight( weight );
+void XHistogram::fill(double x, double y, const std::vector<double>& weight, double norm, unsigned int colour) {
+  check_weight(weight);
 
   for (size_t h = 0; h < m_size; ++h)
-    m_histograms[h]->Fill( x, y, weight[h] );
-  m_normalization->Fill( x, y, norm );
-  m_colormap->SetBinContent( m_colormap->FindBin(x, y), (float) colour );
+    m_histograms[h]->Fill(x, y, weight[h]);
+  m_normalization->Fill(x, y, norm);
+  m_colormap->SetBinContent(m_colormap->FindBin(x, y), (float)colour);
 }
-  
+
 /// fill one segment, normalizing each bin's weight to the fraction of the segment it contains
-void XHistogram::fill( const Range& x, const Range& y, const std::vector<double> & weight, double norm )
-{
-  check_weight( weight );
+void XHistogram::fill(const Range& x, const Range& y, const std::vector<double>& weight, double norm) {
+  check_weight(weight);
 
-  std::vector<position> v = splitSegment( x, y );
+  std::vector<position> v = splitSegment(x, y);
   for (size_t i = 0, s = v.size(); i < s; ++i) {
     for (size_t h = 0; h < m_size; ++h)
-      m_histograms[h]->Fill( v[i].x, v[i].y, v[i].f * weight[h] );
-    m_normalization->Fill( v[i].x, v[i].y, v[i].f * norm );
+      m_histograms[h]->Fill(v[i].x, v[i].y, v[i].f * weight[h]);
+    m_normalization->Fill(v[i].x, v[i].y, v[i].f * norm);
   }
 }
-  
+
 /// fill one segment and set its color, normalizing each bin's weight to the fraction of the segment it contains
-void XHistogram::fill( const Range& x, const Range& y, const std::vector<double> & weight, double norm, unsigned int colour )
-{
-  check_weight( weight );
+void XHistogram::fill(
+    const Range& x, const Range& y, const std::vector<double>& weight, double norm, unsigned int colour) {
+  check_weight(weight);
 
-  std::vector<position> v = splitSegment( x, y );
+  std::vector<position> v = splitSegment(x, y);
   for (size_t i = 0, s = v.size(); i < s; ++i) {
     for (size_t h = 0; h < m_size; ++h)
-      m_histograms[h]->Fill( v[i].x, v[i].y, v[i].f * weight[h] );
-    m_normalization->Fill( v[i].x, v[i].y, v[i].f * norm );
-    m_colormap->SetBinContent( m_colormap->FindBin(v[i].x, v[i].y), (float) colour );
+      m_histograms[h]->Fill(v[i].x, v[i].y, v[i].f * weight[h]);
+    m_normalization->Fill(v[i].x, v[i].y, v[i].f * norm);
+    m_colormap->SetBinContent(m_colormap->FindBin(v[i].x, v[i].y), (float)colour);
   }
 }
 
 /// normalize the histograms
-void XHistogram::normalize(void)
-{
+void XHistogram::normalize(void) {
   for (int i = 0; i < m_normalization->GetSize(); ++i) {
     if ((*m_normalization)[i] > 0.) {
       for (size_t h = 0; h < m_size; ++h)
         (*m_histograms[h])[i] /= (*m_normalization)[i];
       (*m_normalization)[i] = 1.;
-    } 
+    }
   }
 }
diff --git a/SimTracker/TrackerMaterialAnalysis/plugins/XHistogram.h b/SimTracker/TrackerMaterialAnalysis/plugins/XHistogram.h
index afdd41de57543..09a4b5e43950a 100644
--- a/SimTracker/TrackerMaterialAnalysis/plugins/XHistogram.h
+++ b/SimTracker/TrackerMaterialAnalysis/plugins/XHistogram.h
@@ -10,135 +10,118 @@
 #include <TH2F.h>
 #include <TH2I.h>
 
-class XHistogram 
-{
+class XHistogram {
 public:
-  typedef TH2I                      ColorMap;
-  typedef TH2F                      Histogram;
+  typedef TH2I ColorMap;
+  typedef TH2F Histogram;
   typedef std::pair<double, double> Range;
 
 protected:
   double m_minDl;
-  Range  m_xRange;
-  Range  m_yRange;
+  Range m_xRange;
+  Range m_yRange;
   size_t m_xBins;
   size_t m_yBins;
   size_t m_size;
 
-  std::vector< std::shared_ptr<Histogram> > m_histograms;
+  std::vector<std::shared_ptr<Histogram> > m_histograms;
   std::shared_ptr<Histogram> m_normalization;
-  std::shared_ptr<ColorMap>  m_colormap;
+  std::shared_ptr<ColorMap> m_colormap;
   std::shared_ptr<Histogram> m_dummy;
 
 public:
-  /// default CTOR 
-  XHistogram(void) :
-    m_minDl( 0.000001 ),
-    m_xRange(),
-    m_yRange(),
-    m_xBins(),
-    m_yBins(),
-    m_size(),
-    m_histograms(),
-    m_normalization(),
-    m_colormap(),
-    m_dummy()
-  { }
- 
+  /// default CTOR
+  XHistogram(void)
+      : m_minDl(0.000001),
+        m_xRange(),
+        m_yRange(),
+        m_xBins(),
+        m_yBins(),
+        m_size(),
+        m_histograms(),
+        m_normalization(),
+        m_colormap(),
+        m_dummy() {}
+
   // explicit CTOR
-  XHistogram( size_t size, size_t bins_x, size_t bins_y, Range x, Range y, size_t zones, const std::vector<double>& max ) :
-    m_minDl( 0.000001 ),
-    m_xRange( x ),
-    m_yRange( y ),
-    m_xBins( bins_x ),
-    m_yBins( bins_y ),
-    m_size( size ),
-    m_histograms( m_size ),
-    m_normalization(),
-    m_colormap()
-  {
+  XHistogram(size_t size, size_t bins_x, size_t bins_y, Range x, Range y, size_t zones, const std::vector<double>& max)
+      : m_minDl(0.000001),
+        m_xRange(x),
+        m_yRange(y),
+        m_xBins(bins_x),
+        m_yBins(bins_y),
+        m_size(size),
+        m_histograms(m_size),
+        m_normalization(),
+        m_colormap() {
     // setup unnamed ROOT histograms
     for (size_t i = 0; i < m_size; ++i) {
-      m_histograms[i].reset(new Histogram( nullptr, nullptr, bins_x, x.first, x.second, bins_y, y.first, y.second ));
-      m_histograms[i]->SetMinimum( 0. );
-      m_histograms[i]->SetMaximum( max[i] );
+      m_histograms[i].reset(new Histogram(nullptr, nullptr, bins_x, x.first, x.second, bins_y, y.first, y.second));
+      m_histograms[i]->SetMinimum(0.);
+      m_histograms[i]->SetMaximum(max[i]);
     }
-    m_normalization.reset(new Histogram( nullptr, nullptr, bins_x, x.first, x.second, bins_y, y.first, y.second ));
-    m_colormap.reset(new ColorMap( nullptr, nullptr, bins_x, x.first, x.second, bins_y, y.first, y.second ));
-    m_colormap->SetMinimum( 0 );
-    m_colormap->SetMaximum( zones );
-    Histogram( nullptr, nullptr, 0, 0., 0., 0, 0., 0. );        // make ROOT "forget" about unnamed histograms
+    m_normalization.reset(new Histogram(nullptr, nullptr, bins_x, x.first, x.second, bins_y, y.first, y.second));
+    m_colormap.reset(new ColorMap(nullptr, nullptr, bins_x, x.first, x.second, bins_y, y.first, y.second));
+    m_colormap->SetMinimum(0);
+    m_colormap->SetMaximum(zones);
+    Histogram(nullptr, nullptr, 0, 0., 0., 0, 0., 0.);  // make ROOT "forget" about unnamed histograms
   }
 
   /// fill one point
-  void fill( double x, double y, const std::vector<double> & weight, double norm );
- 
+  void fill(double x, double y, const std::vector<double>& weight, double norm);
+
   /// fill one point and set its color
-  void fill( double x, double y, const std::vector<double> & weight, double norm, unsigned int colour );
-    
+  void fill(double x, double y, const std::vector<double>& weight, double norm, unsigned int colour);
+
   /// fill one segment, normalizing each bin's weight to the fraction of the segment it contains
-  void fill( const Range& x, const Range& y, const std::vector<double> & weight, double norm );
-    
+  void fill(const Range& x, const Range& y, const std::vector<double>& weight, double norm);
+
   /// fill one segment and set its color, normalizing each bin's weight to the fraction of the segment it contains
-  void fill( const Range& x, const Range& y, const std::vector<double> & weight, double norm, unsigned int colour );
+  void fill(const Range& x, const Range& y, const std::vector<double>& weight, double norm, unsigned int colour);
 
   /// normalize the histograms
   void normalize(void);
 
   /// access one of the histograms
-  Histogram * get(size_t h = 0) const
-  {
+  Histogram* get(size_t h = 0) const {
     if (h < m_size)
-      return (Histogram *) m_histograms[h]->Clone(nullptr);
+      return (Histogram*)m_histograms[h]->Clone(nullptr);
     else
       return nullptr;
   }
 
   /// access the normalization
-  Histogram * normalization(void) const
-  {
-    return (Histogram *) m_normalization->Clone(nullptr);
-  }
+  Histogram* normalization(void) const { return (Histogram*)m_normalization->Clone(nullptr); }
 
   /// access the colormap
-  ColorMap * colormap(void) const
-  {
-    return (ColorMap *) m_colormap->Clone(nullptr);
-  }
+  ColorMap* colormap(void) const { return (ColorMap*)m_colormap->Clone(nullptr); }
 
   /// set the minimum length of sub-segment a segment should be split into:
   /// when splitting across bin boundaries with splitSegment(...), sub-segments shorter than this are skipped
-  void setMinDl( double dl )
-  {
-    m_minDl = dl;
-  }
- 
+  void setMinDl(double dl) { m_minDl = dl; }
+
 protected:
   struct position {
     double f;
     double x;
     double y;
 
-    position() : f(0), x(0), y(0) { }
+    position() : f(0), x(0), y(0) {}
 
-    position(double f_, double x_, double y_) : f(f_), x(x_), y(y_) { }
+    position(double f_, double x_, double y_) : f(f_), x(x_), y(y_) {}
 
-    bool operator<(const position& other) const {
-      return f < other.f;
-    }
+    bool operator<(const position& other) const { return f < other.f; }
   };
 
   /// split a segment into a vector of points
-  std::vector<position> splitSegment( Range x, Range y ) const;
+  std::vector<position> splitSegment(Range x, Range y) const;
 
   /// check the weights passed as an std::vector have the correct size
-  void check_weight(const std::vector<double> & weight) noexcept(false)
-  {
+  void check_weight(const std::vector<double>& weight) noexcept(false) {
     // run time check for vector size
     if (weight.size() != m_size)
-       throw std::invalid_argument("weight: wrong number of elements");
+      throw std::invalid_argument("weight: wrong number of elements");
   }
-
 };
 
-#endif // XHistogram_h
+#endif  // XHistogram_h
diff --git a/SimTracker/VertexAssociation/interface/VertexAssociatorByPositionAndTracks.h b/SimTracker/VertexAssociation/interface/VertexAssociatorByPositionAndTracks.h
index c721fe55f5aed..486fc7f637f7a 100644
--- a/SimTracker/VertexAssociation/interface/VertexAssociatorByPositionAndTracks.h
+++ b/SimTracker/VertexAssociation/interface/VertexAssociatorByPositionAndTracks.h
@@ -1,8 +1,8 @@
 #ifndef SimTracker_VertexAssociation_VertexAssociatorByPositionAndTracks_h
 #define SimTracker_VertexAssociation_VertexAssociatorByPositionAndTracks_h
 
-#include "SimDataFormats/Associations/interface/VertexToTrackingVertexAssociatorBaseImpl.h"
 #include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/VertexToTrackingVertexAssociatorBaseImpl.h"
 
 /**
  * This class associates reco::Vertices and TrackingVertices by their
@@ -19,9 +19,9 @@ class VertexAssociatorByPositionAndTracks : public reco::VertexToTrackingVertexA
                                       double absZ,
                                       double sigmaZ,
                                       double maxRecoZ,
-				      double absT,
-				      double sigmaT,
-				      double maxRecoT,
+                                      double absT,
+                                      double sigmaT,
+                                      double maxRecoT,
                                       double sharedTrackFraction,
                                       const reco::RecoToSimCollection *trackRecoToSimAssociation,
                                       const reco::SimToRecoCollection *trackSimToRecoAssociation);
@@ -37,15 +37,15 @@ class VertexAssociatorByPositionAndTracks : public reco::VertexToTrackingVertexA
   ~VertexAssociatorByPositionAndTracks() override;
 
   /* Associate TrackingVertex to RecoVertex By Hits */
-  reco::VertexRecoToSimCollection associateRecoToSim(const edm::Handle<edm::View<reco::Vertex> >& vCH, 
-                                                             const edm::Handle<TrackingVertexCollection>& tVCH) const override;
+  reco::VertexRecoToSimCollection associateRecoToSim(const edm::Handle<edm::View<reco::Vertex>> &vCH,
+                                                     const edm::Handle<TrackingVertexCollection> &tVCH) const override;
 
-  reco::VertexSimToRecoCollection associateSimToReco(const edm::Handle<edm::View<reco::Vertex> >& vCH, 
-                                                             const edm::Handle<TrackingVertexCollection>& tVCH) const override;
+  reco::VertexSimToRecoCollection associateSimToReco(const edm::Handle<edm::View<reco::Vertex>> &vCH,
+                                                     const edm::Handle<TrackingVertexCollection> &tVCH) const override;
 
 private:
   // ----- member data
-  const edm::EDProductGetter * productGetter_;
+  const edm::EDProductGetter *productGetter_;
 
   const double absZ_;
   const double sigmaZ_;
diff --git a/SimTracker/VertexAssociation/interface/VertexAssociatorByTracks.h b/SimTracker/VertexAssociation/interface/VertexAssociatorByTracks.h
index b1fe2e78184e8..891852fe68fcc 100644
--- a/SimTracker/VertexAssociation/interface/VertexAssociatorByTracks.h
+++ b/SimTracker/VertexAssociation/interface/VertexAssociatorByTracks.h
@@ -1,14 +1,13 @@
 #ifndef VertexAssociatorByTracks_h
 #define VertexAssociatorByTracks_h
 
-#include "SimDataFormats/Associations/interface/VertexToTrackingVertexAssociatorBaseImpl.h"
 #include "DataFormats/RecoCandidate/interface/TrackAssociation.h"
+#include "SimDataFormats/Associations/interface/VertexToTrackingVertexAssociatorBaseImpl.h"
 
 class TrackingParticleSelector;
 
 class VertexAssociatorByTracks : public reco::VertexToTrackingVertexAssociatorBaseImpl {
 public:
-
   VertexAssociatorByTracks(const edm::EDProductGetter *productGetter,
                            double R2SMatchedSimRatio,
                            double R2SMatchedRecoRatio,
@@ -22,23 +21,22 @@ class VertexAssociatorByTracks : public reco::VertexToTrackingVertexAssociatorBa
   ~VertexAssociatorByTracks() override;
 
   /* Associate TrackingVertex to RecoVertex By Hits */
-  reco::VertexRecoToSimCollection associateRecoToSim(const edm::Handle<edm::View<reco::Vertex> >& vCH, 
-                                                             const edm::Handle<TrackingVertexCollection>& tVCH) const override;
+  reco::VertexRecoToSimCollection associateRecoToSim(const edm::Handle<edm::View<reco::Vertex>> &vCH,
+                                                     const edm::Handle<TrackingVertexCollection> &tVCH) const override;
 
-  reco::VertexSimToRecoCollection associateSimToReco(const edm::Handle<edm::View<reco::Vertex> >& vCH, 
-                                                             const edm::Handle<TrackingVertexCollection>& tVCH) const override;
+  reco::VertexSimToRecoCollection associateSimToReco(const edm::Handle<edm::View<reco::Vertex>> &vCH,
+                                                     const edm::Handle<TrackingVertexCollection> &tVCH) const override;
 
 private:
-
   // ----- member data
-  const edm::EDProductGetter * productGetter_;
+  const edm::EDProductGetter *productGetter_;
 
   const double R2SMatchedSimRatio_;
   const double R2SMatchedRecoRatio_;
   const double S2RMatchedSimRatio_;
   const double S2RMatchedRecoRatio_;
 
-  const TrackingParticleSelector *selector_; // Owned by VertexAssociatorByTracksProducer
+  const TrackingParticleSelector *selector_;  // Owned by VertexAssociatorByTracksProducer
   const reco::TrackBase::TrackQuality trackQuality_;
 
   const reco::RecoToSimCollection *trackRecoToSimAssociation_;
diff --git a/SimTracker/VertexAssociation/interface/calculateVertexSharedTracks.h b/SimTracker/VertexAssociation/interface/calculateVertexSharedTracks.h
index 4864958d527a4..bed39eabe9284 100644
--- a/SimTracker/VertexAssociation/interface/calculateVertexSharedTracks.h
+++ b/SimTracker/VertexAssociation/interface/calculateVertexSharedTracks.h
@@ -5,7 +5,11 @@
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertex.h"
 
-unsigned int calculateVertexSharedTracks(const reco::Vertex& recoV, const TrackingVertex& simV, const reco::RecoToSimCollection& trackRecoToSimAssociation);
-unsigned int calculateVertexSharedTracks(const TrackingVertex& simV, const reco::Vertex& recoV, const reco::SimToRecoCollection& trackSimToRecoAssociation);
+unsigned int calculateVertexSharedTracks(const reco::Vertex &recoV,
+                                         const TrackingVertex &simV,
+                                         const reco::RecoToSimCollection &trackRecoToSimAssociation);
+unsigned int calculateVertexSharedTracks(const TrackingVertex &simV,
+                                         const reco::Vertex &recoV,
+                                         const reco::SimToRecoCollection &trackSimToRecoAssociation);
 
 #endif
diff --git a/SimTracker/VertexAssociation/plugins/VertexAssociatorByPositionAndTracksProducer.cc b/SimTracker/VertexAssociation/plugins/VertexAssociatorByPositionAndTracksProducer.cc
index e0003b52033cd..58fd92b8b37a1 100644
--- a/SimTracker/VertexAssociation/plugins/VertexAssociatorByPositionAndTracksProducer.cc
+++ b/SimTracker/VertexAssociation/plugins/VertexAssociatorByPositionAndTracksProducer.cc
@@ -1,12 +1,12 @@
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/global/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "DataFormats/Common/interface/Handle.h"
 
@@ -15,16 +15,16 @@
 
 #include "SimDataFormats/Associations/interface/VertexToTrackingVertexAssociator.h"
 
-class VertexAssociatorByPositionAndTracksProducer: public edm::global::EDProducer<> {
+class VertexAssociatorByPositionAndTracksProducer : public edm::global::EDProducer<> {
 public:
-  explicit VertexAssociatorByPositionAndTracksProducer(const edm::ParameterSet&);
+  explicit VertexAssociatorByPositionAndTracksProducer(const edm::ParameterSet &);
   ~VertexAssociatorByPositionAndTracksProducer() override;
 
-  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);      
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 
 private:
-  void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
-      
+  void produce(edm::StreamID, edm::Event &, const edm::EventSetup &) const override;
+
   // ----------member data ---------------------------
   const double absZ_;
   const double sigmaZ_;
@@ -38,25 +38,26 @@ class VertexAssociatorByPositionAndTracksProducer: public edm::global::EDProduce
   edm::EDGetTokenT<reco::SimToRecoCollection> trackSimToRecoAssociationToken_;
 };
 
-VertexAssociatorByPositionAndTracksProducer::VertexAssociatorByPositionAndTracksProducer(const edm::ParameterSet& config):
-  absZ_(config.getParameter<double>("absZ")),
-  sigmaZ_(config.getParameter<double>("sigmaZ")),
-  maxRecoZ_(config.getParameter<double>("maxRecoZ")),
-  absT_(config.getParameter<double>("absT")),
-  sigmaT_(config.getParameter<double>("sigmaT")),
-  maxRecoT_(config.getParameter<double>("maxRecoT")),
-  sharedTrackFraction_(config.getParameter<double>("sharedTrackFraction")),
-  trackRecoToSimAssociationToken_(consumes<reco::RecoToSimCollection>(config.getParameter<edm::InputTag>("trackAssociation"))),
-  trackSimToRecoAssociationToken_(consumes<reco::SimToRecoCollection>(config.getParameter<edm::InputTag>("trackAssociation")))
-{
+VertexAssociatorByPositionAndTracksProducer::VertexAssociatorByPositionAndTracksProducer(const edm::ParameterSet &config)
+    : absZ_(config.getParameter<double>("absZ")),
+      sigmaZ_(config.getParameter<double>("sigmaZ")),
+      maxRecoZ_(config.getParameter<double>("maxRecoZ")),
+      absT_(config.getParameter<double>("absT")),
+      sigmaT_(config.getParameter<double>("sigmaT")),
+      maxRecoT_(config.getParameter<double>("maxRecoT")),
+      sharedTrackFraction_(config.getParameter<double>("sharedTrackFraction")),
+      trackRecoToSimAssociationToken_(
+          consumes<reco::RecoToSimCollection>(config.getParameter<edm::InputTag>("trackAssociation"))),
+      trackSimToRecoAssociationToken_(
+          consumes<reco::SimToRecoCollection>(config.getParameter<edm::InputTag>("trackAssociation"))) {
   produces<reco::VertexToTrackingVertexAssociator>();
 }
 
 VertexAssociatorByPositionAndTracksProducer::~VertexAssociatorByPositionAndTracksProducer() {}
 
-void VertexAssociatorByPositionAndTracksProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+void VertexAssociatorByPositionAndTracksProducer::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
   edm::ParameterSetDescription desc;
-  
+
   // Matching conditions
   desc.add<double>("absZ", 0.1);
   desc.add<double>("sigmaZ", 3.0);
@@ -72,38 +73,38 @@ void VertexAssociatorByPositionAndTracksProducer::fillDescriptions(edm::Configur
   descriptions.add("VertexAssociatorByPositionAndTracks", desc);
 }
 
-void VertexAssociatorByPositionAndTracksProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup&) const {
-  edm::Handle<reco::RecoToSimCollection > recotosimCollectionH;
+void VertexAssociatorByPositionAndTracksProducer::produce(edm::StreamID,
+                                                          edm::Event &iEvent,
+                                                          const edm::EventSetup &) const {
+  edm::Handle<reco::RecoToSimCollection> recotosimCollectionH;
   iEvent.getByToken(trackRecoToSimAssociationToken_, recotosimCollectionH);
 
-  edm::Handle<reco::SimToRecoCollection > simtorecoCollectionH;
+  edm::Handle<reco::SimToRecoCollection> simtorecoCollectionH;
   iEvent.getByToken(trackSimToRecoAssociationToken_, simtorecoCollectionH);
 
   std::unique_ptr<VertexAssociatorByPositionAndTracks> impl;
 
   if (!recotosimCollectionH.isValid() || !simtorecoCollectionH.isValid()) {
     if (!recotosimCollectionH.isValid())
-      edm::LogWarning("PrimaryVertexAnalyzer4PUSlimmed")
-	<< "trackRecoToSimAssociation is not available in the event";
+      edm::LogWarning("PrimaryVertexAnalyzer4PUSlimmed") << "trackRecoToSimAssociation is not available in the event";
     if (!simtorecoCollectionH.isValid())
-      edm::LogWarning("PrimaryVertexAnalyzer4PUSlimmed")
-	<< "trackSimToRecoAssociation is not available in the event";
+      edm::LogWarning("PrimaryVertexAnalyzer4PUSlimmed") << "trackSimToRecoAssociation is not available in the event";
     return;
-  } 
-  if( sigmaT_ < 0.0 ) {
+  }
+  if (sigmaT_ < 0.0) {
     impl = std::make_unique<VertexAssociatorByPositionAndTracks>(&(iEvent.productGetter()),
-								 absZ_,
-								 sigmaZ_,
-								 maxRecoZ_,
-								 sharedTrackFraction_,
-								 recotosimCollectionH.product(),
-								 simtorecoCollectionH.product());
+                                                                 absZ_,
+                                                                 sigmaZ_,
+                                                                 maxRecoZ_,
+                                                                 sharedTrackFraction_,
+                                                                 recotosimCollectionH.product(),
+                                                                 simtorecoCollectionH.product());
   } else {
     impl = std::make_unique<VertexAssociatorByPositionAndTracks>(&(iEvent.productGetter()),
                                                                  absZ_,
                                                                  sigmaZ_,
                                                                  maxRecoZ_,
-								 absT_,
+                                                                 absT_,
                                                                  sigmaT_,
                                                                  maxRecoT_,
                                                                  sharedTrackFraction_,
diff --git a/SimTracker/VertexAssociation/plugins/VertexAssociatorByTracksProducer.cc b/SimTracker/VertexAssociation/plugins/VertexAssociatorByTracksProducer.cc
index 9361e19020322..760807a9f5cd1 100644
--- a/SimTracker/VertexAssociation/plugins/VertexAssociatorByTracksProducer.cc
+++ b/SimTracker/VertexAssociation/plugins/VertexAssociatorByTracksProducer.cc
@@ -1,27 +1,27 @@
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/global/EDProducer.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
-#include "DataFormats/Common/interface/Handle.h"
 
 #include "SimTracker/Common/interface/TrackingParticleSelector.h"
 
-#include "SimTracker/VertexAssociation/interface/VertexAssociatorByTracks.h"
 #include "SimDataFormats/Associations/interface/VertexToTrackingVertexAssociator.h"
+#include "SimTracker/VertexAssociation/interface/VertexAssociatorByTracks.h"
 
-class VertexAssociatorByTracksProducer: public edm::global::EDProducer<> {
+class VertexAssociatorByTracksProducer : public edm::global::EDProducer<> {
 public:
-  explicit VertexAssociatorByTracksProducer(const edm::ParameterSet&);
+  explicit VertexAssociatorByTracksProducer(const edm::ParameterSet &);
   ~VertexAssociatorByTracksProducer() override;
 
-  static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 
 private:
-  void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
+  void produce(edm::StreamID, edm::Event &, const edm::EventSetup &) const override;
 
   // ----------member data ---------------------------
   const double R2SMatchedSimRatio_;
@@ -37,40 +37,39 @@ class VertexAssociatorByTracksProducer: public edm::global::EDProducer<> {
 };
 
 namespace {
-  TrackingParticleSelector makeSelector(const edm::ParameterSet& param) {
-    return TrackingParticleSelector(
-                    param.getParameter<double>("ptMinTP"),
-                    param.getParameter<double>("ptMaxTP"),
-                    param.getParameter<double>("minRapidityTP"),
-                    param.getParameter<double>("maxRapidityTP"),
-                    param.getParameter<double>("tipTP"),
-                    param.getParameter<double>("lipTP"),
-                    param.getParameter<int>("minHitTP"),
-                    param.getParameter<bool>("signalOnlyTP"),
-                    param.getParameter<bool>("intimeOnlyTP"),
-                    param.getParameter<bool>("chargedOnlyTP"),
-		    param.getParameter<bool>("stableOnlyTP"),
-                    param.getParameter<std::vector<int> >("pdgIdTP")
-                );
+  TrackingParticleSelector makeSelector(const edm::ParameterSet &param) {
+    return TrackingParticleSelector(param.getParameter<double>("ptMinTP"),
+                                    param.getParameter<double>("ptMaxTP"),
+                                    param.getParameter<double>("minRapidityTP"),
+                                    param.getParameter<double>("maxRapidityTP"),
+                                    param.getParameter<double>("tipTP"),
+                                    param.getParameter<double>("lipTP"),
+                                    param.getParameter<int>("minHitTP"),
+                                    param.getParameter<bool>("signalOnlyTP"),
+                                    param.getParameter<bool>("intimeOnlyTP"),
+                                    param.getParameter<bool>("chargedOnlyTP"),
+                                    param.getParameter<bool>("stableOnlyTP"),
+                                    param.getParameter<std::vector<int>>("pdgIdTP"));
   }
-}
-
-VertexAssociatorByTracksProducer::VertexAssociatorByTracksProducer(const edm::ParameterSet& config):
-  R2SMatchedSimRatio_(config.getParameter<double>("R2SMatchedSimRatio")),
-  R2SMatchedRecoRatio_(config.getParameter<double>("R2SMatchedRecoRatio")),
-  S2RMatchedSimRatio_(config.getParameter<double>("S2RMatchedSimRatio")),
-  S2RMatchedRecoRatio_(config.getParameter<double>("S2RMatchedRecoRatio")),
-  selector_(makeSelector(config.getParameter<edm::ParameterSet>("trackingParticleSelector"))),
-  trackQuality_(reco::TrackBase::qualityByName(config.getParameter<std::string>("trackQuality"))),
-  trackRecoToSimAssociationToken_(consumes<reco::RecoToSimCollection>(config.getParameter<edm::InputTag>("trackAssociation"))),
-  trackSimToRecoAssociationToken_(consumes<reco::SimToRecoCollection>(config.getParameter<edm::InputTag>("trackAssociation")))
-{
+}  // namespace
+
+VertexAssociatorByTracksProducer::VertexAssociatorByTracksProducer(const edm::ParameterSet &config)
+    : R2SMatchedSimRatio_(config.getParameter<double>("R2SMatchedSimRatio")),
+      R2SMatchedRecoRatio_(config.getParameter<double>("R2SMatchedRecoRatio")),
+      S2RMatchedSimRatio_(config.getParameter<double>("S2RMatchedSimRatio")),
+      S2RMatchedRecoRatio_(config.getParameter<double>("S2RMatchedRecoRatio")),
+      selector_(makeSelector(config.getParameter<edm::ParameterSet>("trackingParticleSelector"))),
+      trackQuality_(reco::TrackBase::qualityByName(config.getParameter<std::string>("trackQuality"))),
+      trackRecoToSimAssociationToken_(
+          consumes<reco::RecoToSimCollection>(config.getParameter<edm::InputTag>("trackAssociation"))),
+      trackSimToRecoAssociationToken_(
+          consumes<reco::SimToRecoCollection>(config.getParameter<edm::InputTag>("trackAssociation"))) {
   produces<reco::VertexToTrackingVertexAssociator>();
 }
 
 VertexAssociatorByTracksProducer::~VertexAssociatorByTracksProducer() {}
 
-void VertexAssociatorByTracksProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
+void VertexAssociatorByTracksProducer::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
   edm::ParameterSetDescription desc;
 
   // Matching conditions
@@ -79,7 +78,7 @@ void VertexAssociatorByTracksProducer::fillDescriptions(edm::ConfigurationDescri
   desc.add<double>("S2RMatchedSimRatio", 0.0);
   desc.add<double>("S2RMatchedRecoRatio", 0.3);
 
-  //RecoTrack selection
+  // RecoTrack selection
   desc.add<std::string>("trackQuality", "highPurity");
 
   // TrackingParticle selection
@@ -87,7 +86,7 @@ void VertexAssociatorByTracksProducer::fillDescriptions(edm::ConfigurationDescri
 
   descTp.add<double>("lipTP", 30.0);
   descTp.add<bool>("chargedOnlyTP", true);
-  descTp.add<std::vector<int>>("pdgIdTP",  std::vector<int>());
+  descTp.add<std::vector<int>>("pdgIdTP", std::vector<int>());
   descTp.add<bool>("signalOnlyTP", true);
   descTp.add<double>("minRapidityTP", -2.4);
   descTp.add<int>("minHitTP", 0);
@@ -103,11 +102,11 @@ void VertexAssociatorByTracksProducer::fillDescriptions(edm::ConfigurationDescri
   descriptions.add("VertexAssociatorByTracks", desc);
 }
 
-void VertexAssociatorByTracksProducer::produce(edm::StreamID, edm::Event& iEvent, const edm::EventSetup&) const {
-  edm::Handle<reco::RecoToSimCollection > recotosimCollectionH;
+void VertexAssociatorByTracksProducer::produce(edm::StreamID, edm::Event &iEvent, const edm::EventSetup &) const {
+  edm::Handle<reco::RecoToSimCollection> recotosimCollectionH;
   iEvent.getByToken(trackRecoToSimAssociationToken_, recotosimCollectionH);
 
-  edm::Handle<reco::SimToRecoCollection > simtorecoCollectionH;
+  edm::Handle<reco::SimToRecoCollection> simtorecoCollectionH;
   iEvent.getByToken(trackSimToRecoAssociationToken_, simtorecoCollectionH);
 
   auto impl = std::make_unique<VertexAssociatorByTracks>(&(iEvent.productGetter()),
diff --git a/SimTracker/VertexAssociation/src/VertexAssociatorByPositionAndTracks.cc b/SimTracker/VertexAssociation/src/VertexAssociatorByPositionAndTracks.cc
index d8f9b78ea97eb..4baf2d7890e41 100644
--- a/SimTracker/VertexAssociation/src/VertexAssociatorByPositionAndTracks.cc
+++ b/SimTracker/VertexAssociation/src/VertexAssociatorByPositionAndTracks.cc
@@ -1,109 +1,115 @@
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "SimTracker/VertexAssociation/interface/VertexAssociatorByPositionAndTracks.h"
 #include "SimTracker/VertexAssociation/interface/calculateVertexSharedTracks.h"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-VertexAssociatorByPositionAndTracks::VertexAssociatorByPositionAndTracks(const edm::EDProductGetter *productGetter,
-                                                                         double absZ,
-                                                                         double sigmaZ,
-                                                                         double maxRecoZ,
-									 double absT,
-                                                                         double sigmaT,
-                                                                         double maxRecoT,
-                                                                         double sharedTrackFraction,
-                                                                         const reco::RecoToSimCollection *trackRecoToSimAssociation,
-                                                                         const reco::SimToRecoCollection *trackSimToRecoAssociation):
-  productGetter_(productGetter),
-  absZ_(absZ),
-  sigmaZ_(sigmaZ),
-  maxRecoZ_(maxRecoZ),
-  absT_(absT),
-  sigmaT_(sigmaT),
-  maxRecoT_(maxRecoT),
-  sharedTrackFraction_(sharedTrackFraction),
-  trackRecoToSimAssociation_(trackRecoToSimAssociation),
-  trackSimToRecoAssociation_(trackSimToRecoAssociation)
-{}
-
-VertexAssociatorByPositionAndTracks::VertexAssociatorByPositionAndTracks(const edm::EDProductGetter *productGetter,
-                                                                         double absZ,
-                                                                         double sigmaZ,
-                                                                         double maxRecoZ,
-                                                                         double sharedTrackFraction,
-                                                                         const reco::RecoToSimCollection *trackRecoToSimAssociation,
-                                                                         const reco::SimToRecoCollection *trackSimToRecoAssociation):
-  productGetter_(productGetter),
-  absZ_(absZ),
-  sigmaZ_(sigmaZ),
-  maxRecoZ_(maxRecoZ),
-  absT_(std::numeric_limits<double>::max()),
-  sigmaT_(std::numeric_limits<double>::max()),
-  maxRecoT_(std::numeric_limits<double>::max()),
-  sharedTrackFraction_(sharedTrackFraction),
-  trackRecoToSimAssociation_(trackRecoToSimAssociation),
-  trackSimToRecoAssociation_(trackSimToRecoAssociation)
-{}
+VertexAssociatorByPositionAndTracks::VertexAssociatorByPositionAndTracks(
+    const edm::EDProductGetter *productGetter,
+    double absZ,
+    double sigmaZ,
+    double maxRecoZ,
+    double absT,
+    double sigmaT,
+    double maxRecoT,
+    double sharedTrackFraction,
+    const reco::RecoToSimCollection *trackRecoToSimAssociation,
+    const reco::SimToRecoCollection *trackSimToRecoAssociation)
+    : productGetter_(productGetter),
+      absZ_(absZ),
+      sigmaZ_(sigmaZ),
+      maxRecoZ_(maxRecoZ),
+      absT_(absT),
+      sigmaT_(sigmaT),
+      maxRecoT_(maxRecoT),
+      sharedTrackFraction_(sharedTrackFraction),
+      trackRecoToSimAssociation_(trackRecoToSimAssociation),
+      trackSimToRecoAssociation_(trackSimToRecoAssociation) {}
+
+VertexAssociatorByPositionAndTracks::VertexAssociatorByPositionAndTracks(
+    const edm::EDProductGetter *productGetter,
+    double absZ,
+    double sigmaZ,
+    double maxRecoZ,
+    double sharedTrackFraction,
+    const reco::RecoToSimCollection *trackRecoToSimAssociation,
+    const reco::SimToRecoCollection *trackSimToRecoAssociation)
+    : productGetter_(productGetter),
+      absZ_(absZ),
+      sigmaZ_(sigmaZ),
+      maxRecoZ_(maxRecoZ),
+      absT_(std::numeric_limits<double>::max()),
+      sigmaT_(std::numeric_limits<double>::max()),
+      maxRecoT_(std::numeric_limits<double>::max()),
+      sharedTrackFraction_(sharedTrackFraction),
+      trackRecoToSimAssociation_(trackRecoToSimAssociation),
+      trackSimToRecoAssociation_(trackSimToRecoAssociation) {}
 
 VertexAssociatorByPositionAndTracks::~VertexAssociatorByPositionAndTracks() {}
 
-reco::VertexRecoToSimCollection VertexAssociatorByPositionAndTracks::associateRecoToSim(const edm::Handle<edm::View<reco::Vertex> >& vCH, 
-                                                                                        const edm::Handle<TrackingVertexCollection>& tVCH) const {
+reco::VertexRecoToSimCollection VertexAssociatorByPositionAndTracks::associateRecoToSim(
+    const edm::Handle<edm::View<reco::Vertex>> &vCH, const edm::Handle<TrackingVertexCollection> &tVCH) const {
   reco::VertexRecoToSimCollection ret(productGetter_);
 
-  const edm::View<reco::Vertex>& recoVertices = *vCH;
-  const TrackingVertexCollection& simVertices = *tVCH;
+  const edm::View<reco::Vertex> &recoVertices = *vCH;
+  const TrackingVertexCollection &simVertices = *tVCH;
 
-  LogDebug("VertexAssociation") << "VertexAssociatorByPositionAndTracks::associateRecoToSim(): associating "
-                                << recoVertices.size() << " reco::Vertices to" << simVertices.size() << " TrackingVertices";
+  LogDebug("VertexAssociation") << "VertexAssociatorByPositionAndTracks::"
+                                   "associateRecoToSim(): associating "
+                                << recoVertices.size() << " reco::Vertices to" << simVertices.size()
+                                << " TrackingVertices";
 
   // filter sim PVs
   std::vector<size_t> simPVindices;
   simPVindices.reserve(recoVertices.size());
   {
     int current_event = -1;
-    for(size_t iSim=0; iSim != simVertices.size(); ++iSim) {
-      const TrackingVertex& simVertex = simVertices[iSim];
+    for (size_t iSim = 0; iSim != simVertices.size(); ++iSim) {
+      const TrackingVertex &simVertex = simVertices[iSim];
 
       // Associate only to primary vertices of the in-time pileup
       // events (BX=0, first vertex in each of the events)
-      if(simVertex.eventId().bunchCrossing() != 0) continue;
-      if(simVertex.eventId().event() != current_event) {
+      if (simVertex.eventId().bunchCrossing() != 0)
+        continue;
+      if (simVertex.eventId().event() != current_event) {
         current_event = simVertex.eventId().event();
         simPVindices.push_back(iSim);
       }
     }
   }
 
-  for(size_t iReco=0; iReco != recoVertices.size(); ++iReco) {
-    const reco::Vertex& recoVertex = recoVertices[iReco];
+  for (size_t iReco = 0; iReco != recoVertices.size(); ++iReco) {
+    const reco::Vertex &recoVertex = recoVertices[iReco];
 
     // skip fake vertices
-    if(std::abs(recoVertex.z()) > maxRecoZ_ || recoVertex.isFake() || !recoVertex.isValid() || recoVertex.ndof() < 0.)
+    if (std::abs(recoVertex.z()) > maxRecoZ_ || recoVertex.isFake() || !recoVertex.isValid() || recoVertex.ndof() < 0.)
       continue;
 
     LogTrace("VertexAssociation") << " reco::Vertex at Z " << recoVertex.z();
 
-    for(const size_t iSim: simPVindices) {
-      const TrackingVertex& simVertex = simVertices[iSim];
+    for (const size_t iSim : simPVindices) {
+      const TrackingVertex &simVertex = simVertices[iSim];
       LogTrace("VertexAssociation") << "  Considering TrackingVertex at Z " << simVertex.position().z();
 
       //  recoVertex.t() == 0.  is a special value
-      // need to change this to std::numeric_limits<double>::max() or something more clear
-      const bool useTiming = ( absT_ != std::numeric_limits<double>::max() && recoVertex.t() != 0. );
-      if( useTiming ) {
-	LogTrace("VertexAssociation") << " and T " << recoVertex.t()*CLHEP::second << std::endl;
+      // need to change this to std::numeric_limits<double>::max() or something
+      // more clear
+      const bool useTiming = (absT_ != std::numeric_limits<double>::max() && recoVertex.t() != 0.);
+      if (useTiming) {
+        LogTrace("VertexAssociation") << " and T " << recoVertex.t() * CLHEP::second << std::endl;
       }
 
-      const double tdiff = std::abs(recoVertex.t() - simVertex.position().t()*CLHEP::second);
+      const double tdiff = std::abs(recoVertex.t() - simVertex.position().t() * CLHEP::second);
       const double zdiff = std::abs(recoVertex.z() - simVertex.position().z());
-      if( zdiff < absZ_ && zdiff / recoVertex.zError() < sigmaZ_ &&
-	  ( !useTiming || ( tdiff < absT_ && tdiff / recoVertex.tError() < sigmaT_ ) ) ) {
+      if (zdiff < absZ_ && zdiff / recoVertex.zError() < sigmaZ_ &&
+          (!useTiming || (tdiff < absT_ && tdiff / recoVertex.tError() < sigmaT_))) {
         auto sharedTracks = calculateVertexSharedTracks(recoVertex, simVertex, *trackRecoToSimAssociation_);
-        auto fraction = double(sharedTracks)/recoVertex.tracksSize();
-        if(sharedTrackFraction_ < 0 || fraction > sharedTrackFraction_) {
-          LogTrace("VertexAssociation") << "   Matched with significance " << zdiff/recoVertex.zError() << " " << tdiff/recoVertex.tError()
-                                        << " shared tracks " << sharedTracks << " reco Tracks " << recoVertex.tracksSize() << " TrackingParticles " << simVertex.nDaughterTracks();
+        auto fraction = double(sharedTracks) / recoVertex.tracksSize();
+        if (sharedTrackFraction_ < 0 || fraction > sharedTrackFraction_) {
+          LogTrace("VertexAssociation") << "   Matched with significance " << zdiff / recoVertex.zError() << " "
+                                        << tdiff / recoVertex.tError() << " shared tracks " << sharedTracks
+                                        << " reco Tracks " << recoVertex.tracksSize() << " TrackingParticles "
+                                        << simVertex.nDaughterTracks();
 
           ret.insert(reco::VertexBaseRef(vCH, iReco), std::make_pair(TrackingVertexRef(tVCH, iSim), sharedTracks));
         }
@@ -118,54 +124,59 @@ reco::VertexRecoToSimCollection VertexAssociatorByPositionAndTracks::associateRe
   return ret;
 }
 
-reco::VertexSimToRecoCollection VertexAssociatorByPositionAndTracks::associateSimToReco(const edm::Handle<edm::View<reco::Vertex> >& vCH, 
-                                                                                        const edm::Handle<TrackingVertexCollection>& tVCH) const {
+reco::VertexSimToRecoCollection VertexAssociatorByPositionAndTracks::associateSimToReco(
+    const edm::Handle<edm::View<reco::Vertex>> &vCH, const edm::Handle<TrackingVertexCollection> &tVCH) const {
   reco::VertexSimToRecoCollection ret(productGetter_);
 
-  const edm::View<reco::Vertex>& recoVertices = *vCH;
-  const TrackingVertexCollection& simVertices = *tVCH;
+  const edm::View<reco::Vertex> &recoVertices = *vCH;
+  const TrackingVertexCollection &simVertices = *tVCH;
 
-  LogDebug("VertexAssociation") << "VertexAssociatorByPositionAndTracks::associateSimToReco(): associating "
-                                << simVertices.size() << " TrackingVertices to " << recoVertices.size() << " reco::Vertices";
+  LogDebug("VertexAssociation") << "VertexAssociatorByPositionAndTracks::"
+                                   "associateSimToReco(): associating "
+                                << simVertices.size() << " TrackingVertices to " << recoVertices.size()
+                                << " reco::Vertices";
 
   int current_event = -1;
-  for(size_t iSim=0; iSim != simVertices.size(); ++iSim) {
-    const TrackingVertex& simVertex = simVertices[iSim];
+  for (size_t iSim = 0; iSim != simVertices.size(); ++iSim) {
+    const TrackingVertex &simVertex = simVertices[iSim];
 
     // Associate only primary vertices of the in-time pileup
     // events (BX=0, first vertex in each of the events)
-    if(simVertex.eventId().bunchCrossing() != 0) continue;
-    if(simVertex.eventId().event() != current_event) {
+    if (simVertex.eventId().bunchCrossing() != 0)
+      continue;
+    if (simVertex.eventId().event() != current_event) {
       current_event = simVertex.eventId().event();
-    }
-    else {
+    } else {
       continue;
     }
 
     LogTrace("VertexAssociation") << " TrackingVertex at Z " << simVertex.position().z();
 
-    for(size_t iReco=0; iReco != recoVertices.size(); ++iReco) {
-      const reco::Vertex& recoVertex = recoVertices[iReco];
+    for (size_t iReco = 0; iReco != recoVertices.size(); ++iReco) {
+      const reco::Vertex &recoVertex = recoVertices[iReco];
 
       // skip fake vertices
-      if(std::abs(recoVertex.z()) > maxRecoZ_ || recoVertex.isFake() || !recoVertex.isValid() || recoVertex.ndof() < 0.)
+      if (std::abs(recoVertex.z()) > maxRecoZ_ || recoVertex.isFake() || !recoVertex.isValid() ||
+          recoVertex.ndof() < 0.)
         continue;
 
       LogTrace("VertexAssociation") << "  Considering reco::Vertex at Z " << recoVertex.z();
-      const bool useTiming = ( absT_ != std::numeric_limits<double>::max() && recoVertex.t() != 0. );
-      if( useTiming ) {
-	LogTrace("VertexAssociation") << " and T " << recoVertex.t()*CLHEP::second << std::endl;
+      const bool useTiming = (absT_ != std::numeric_limits<double>::max() && recoVertex.t() != 0.);
+      if (useTiming) {
+        LogTrace("VertexAssociation") << " and T " << recoVertex.t() * CLHEP::second << std::endl;
       }
 
-      const double tdiff = std::abs(recoVertex.t() - simVertex.position().t()*CLHEP::second);
+      const double tdiff = std::abs(recoVertex.t() - simVertex.position().t() * CLHEP::second);
       const double zdiff = std::abs(recoVertex.z() - simVertex.position().z());
-      if( zdiff < absZ_ && zdiff / recoVertex.zError() < sigmaZ_ &&
-	  ( !useTiming || ( tdiff < absT_ && tdiff / recoVertex.tError() < sigmaT_ ) ) ) {
+      if (zdiff < absZ_ && zdiff / recoVertex.zError() < sigmaZ_ &&
+          (!useTiming || (tdiff < absT_ && tdiff / recoVertex.tError() < sigmaT_))) {
         auto sharedTracks = calculateVertexSharedTracks(simVertex, recoVertex, *trackSimToRecoAssociation_);
-        auto fraction = double(sharedTracks)/recoVertex.tracksSize();
-        if(sharedTrackFraction_ < 0 || fraction > sharedTrackFraction_) {
-          LogTrace("VertexAssociation") << "   Matched with significance " << zdiff/recoVertex.zError() << " " << tdiff/recoVertex.tError()
-                                        << " shared tracks " << sharedTracks << " reco Tracks " << recoVertex.tracksSize() << " TrackingParticles " << simVertex.nDaughterTracks();
+        auto fraction = double(sharedTracks) / recoVertex.tracksSize();
+        if (sharedTrackFraction_ < 0 || fraction > sharedTrackFraction_) {
+          LogTrace("VertexAssociation") << "   Matched with significance " << zdiff / recoVertex.zError() << " "
+                                        << tdiff / recoVertex.tError() << " shared tracks " << sharedTracks
+                                        << " reco Tracks " << recoVertex.tracksSize() << " TrackingParticles "
+                                        << simVertex.nDaughterTracks();
 
           ret.insert(TrackingVertexRef(tVCH, iSim), std::make_pair(reco::VertexBaseRef(vCH, iReco), sharedTracks));
         }
diff --git a/SimTracker/VertexAssociation/src/VertexAssociatorByTracks.cc b/SimTracker/VertexAssociation/src/VertexAssociatorByTracks.cc
index 3935f94f64502..e6b2fc7d0bbfa 100644
--- a/SimTracker/VertexAssociation/src/VertexAssociatorByTracks.cc
+++ b/SimTracker/VertexAssociation/src/VertexAssociatorByTracks.cc
@@ -1,17 +1,17 @@
 #include "SimTracker/VertexAssociation/interface/VertexAssociatorByTracks.h"
 
+#include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/Common/interface/Ref.h"
 #include "DataFormats/Common/interface/RefToBase.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/VertexReco/interface/VertexFwd.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
+#include "DataFormats/VertexReco/interface/VertexFwd.h"
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
-#include "SimDataFormats/TrackingAnalysis/interface/TrackingVertexContainer.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingVertex.h"
+#include "SimDataFormats/TrackingAnalysis/interface/TrackingVertexContainer.h"
 
 #include "SimTracker/Common/interface/TrackingParticleSelector.h"
 
@@ -26,253 +26,220 @@ VertexAssociatorByTracks::VertexAssociatorByTracks(const edm::EDProductGetter *p
                                                    const TrackingParticleSelector *selector,
                                                    reco::TrackBase::TrackQuality trackQuality,
                                                    const reco::RecoToSimCollection *trackRecoToSimAssociation,
-                                                   const reco::SimToRecoCollection *trackSimToRecoAssociation):
-  productGetter_(productGetter),
-  R2SMatchedSimRatio_(R2SMatchedSimRatio),
-  R2SMatchedRecoRatio_(R2SMatchedRecoRatio),
-  S2RMatchedSimRatio_(S2RMatchedSimRatio),
-  S2RMatchedRecoRatio_(S2RMatchedRecoRatio),
-  selector_(selector),
-  trackQuality_(trackQuality),
-  trackRecoToSimAssociation_(trackRecoToSimAssociation),
-  trackSimToRecoAssociation_(trackSimToRecoAssociation)
-{}
+                                                   const reco::SimToRecoCollection *trackSimToRecoAssociation)
+    : productGetter_(productGetter),
+      R2SMatchedSimRatio_(R2SMatchedSimRatio),
+      R2SMatchedRecoRatio_(R2SMatchedRecoRatio),
+      S2RMatchedSimRatio_(S2RMatchedSimRatio),
+      S2RMatchedRecoRatio_(S2RMatchedRecoRatio),
+      selector_(selector),
+      trackQuality_(trackQuality),
+      trackRecoToSimAssociation_(trackRecoToSimAssociation),
+      trackSimToRecoAssociation_(trackSimToRecoAssociation) {}
 
 /* Destructor */
 VertexAssociatorByTracks::~VertexAssociatorByTracks() {}
 
 reco::VertexRecoToSimCollection VertexAssociatorByTracks::associateRecoToSim(
-    const edm::Handle<edm::View<reco::Vertex> > & recoVertexes,
-    const edm::Handle<TrackingVertexCollection> & trackingVertexes
-) const
-{
-    reco::VertexRecoToSimCollection  outputCollection(productGetter_);
-
-    std::map<TrackingVertexRef,std::pair<double, std::size_t> > matches;
-
-    LogDebug("VertexAssociation") << "reco::VertexCollection size = " << recoVertexes->size()
-                                  << " ; TrackingVertexCollection size = " << trackingVertexes->size() << std::endl;
-
-    // Loop over RecoVertex
-    for (std::size_t recoIndex = 0; recoIndex < recoVertexes->size(); ++recoIndex)
-    {
-        reco::VertexBaseRef recoVertex(recoVertexes, recoIndex); 
-
-        matches.clear();
-
-        double recoDaughterWeight = 0.;
-
-        // Loop over daughter tracks of RecoVertex
-        for (
-            reco::Vertex::trackRef_iterator recoDaughter = recoVertex->tracks_begin();
-            recoDaughter != recoVertex->tracks_end();
-            ++recoDaughter
-        )
-        {
-            // Check the quality of the RecoDoughters
-            if ( !(*recoDaughter)->quality(trackQuality_) ) continue;
-
-            // Check for association for the given RecoDaughter
-            if ( trackRecoToSimAssociation_->numberOfAssociations(*recoDaughter) > 0 )
-            {
-                std::vector<std::pair<TrackingParticleRef,double> > associations = (*trackRecoToSimAssociation_)[*recoDaughter];
-
-                // Loop over TrackingParticles associated with RecoDaughter
-                for (
-                    std::vector<std::pair<TrackingParticleRef,double> >::const_iterator association = associations.begin();
-                    association != associations.end();
-                    ++association
-                )
-                {
-                    // Get a reference to parent vertex of TrackingParticle associated to the RecoDaughter
-                    TrackingVertexRef trackingVertex = association->first->parentVertex();
-                    // Store matched RecoDaughter to the trackingVertex
-                    matches[trackingVertex].first += recoVertex->trackWeight(*recoDaughter);
-                    matches[trackingVertex].second++;
-                }
-            }
+    const edm::Handle<edm::View<reco::Vertex>> &recoVertexes,
+    const edm::Handle<TrackingVertexCollection> &trackingVertexes) const {
+  reco::VertexRecoToSimCollection outputCollection(productGetter_);
+
+  std::map<TrackingVertexRef, std::pair<double, std::size_t>> matches;
+
+  LogDebug("VertexAssociation") << "reco::VertexCollection size = " << recoVertexes->size()
+                                << " ; TrackingVertexCollection size = " << trackingVertexes->size() << std::endl;
+
+  // Loop over RecoVertex
+  for (std::size_t recoIndex = 0; recoIndex < recoVertexes->size(); ++recoIndex) {
+    reco::VertexBaseRef recoVertex(recoVertexes, recoIndex);
+
+    matches.clear();
+
+    double recoDaughterWeight = 0.;
+
+    // Loop over daughter tracks of RecoVertex
+    for (reco::Vertex::trackRef_iterator recoDaughter = recoVertex->tracks_begin();
+         recoDaughter != recoVertex->tracks_end();
+         ++recoDaughter) {
+      // Check the quality of the RecoDoughters
+      if (!(*recoDaughter)->quality(trackQuality_))
+        continue;
+
+      // Check for association for the given RecoDaughter
+      if (trackRecoToSimAssociation_->numberOfAssociations(*recoDaughter) > 0) {
+        std::vector<std::pair<TrackingParticleRef, double>> associations = (*trackRecoToSimAssociation_)[*recoDaughter];
+
+        // Loop over TrackingParticles associated with RecoDaughter
+        for (std::vector<std::pair<TrackingParticleRef, double>>::const_iterator association = associations.begin();
+             association != associations.end();
+             ++association) {
+          // Get a reference to parent vertex of TrackingParticle associated to
+          // the RecoDaughter
+          TrackingVertexRef trackingVertex = association->first->parentVertex();
+          // Store matched RecoDaughter to the trackingVertex
+          matches[trackingVertex].first += recoVertex->trackWeight(*recoDaughter);
+          matches[trackingVertex].second++;
+        }
+      }
 
-            recoDaughterWeight += recoVertex->trackWeight(*recoDaughter);
-        } //loop over daughter tracks of RecoVertex
+      recoDaughterWeight += recoVertex->trackWeight(*recoDaughter);
+    }  // loop over daughter tracks of RecoVertex
 
-        std::size_t assoIndex = 0;
+    std::size_t assoIndex = 0;
 
-        // Loop over map between TrackingVertexes and matched RecoDaugther
-        for (
-            std::map<TrackingVertexRef,std::pair<double, std::size_t> >::const_iterator match = matches.begin();
-            match != matches.end();
-            ++match
-        )
-        {
-            // Getting the TrackingVertex information
-            TrackingVertexRef trackingVertex = match->first;
-            double matchedDaughterWeight = match->second.first;
-            std::size_t matchedDaughterCounter = match->second.second;
+    // Loop over map between TrackingVertexes and matched RecoDaugther
+    for (std::map<TrackingVertexRef, std::pair<double, std::size_t>>::const_iterator match = matches.begin();
+         match != matches.end();
+         ++match) {
+      // Getting the TrackingVertex information
+      TrackingVertexRef trackingVertex = match->first;
+      double matchedDaughterWeight = match->second.first;
+      std::size_t matchedDaughterCounter = match->second.second;
 
-            // Count for only reconstructible SimDaughters           
-            std::size_t simDaughterCounter = 0;
+      // Count for only reconstructible SimDaughters
+      std::size_t simDaughterCounter = 0;
 
-            for (
-                TrackingVertex::tp_iterator simDaughter = trackingVertex->daughterTracks_begin();
-                simDaughter != trackingVertex->daughterTracks_end();
-                ++simDaughter
-            )
-                if ( (*selector_)(**simDaughter) ) simDaughterCounter++;
+      for (TrackingVertex::tp_iterator simDaughter = trackingVertex->daughterTracks_begin();
+           simDaughter != trackingVertex->daughterTracks_end();
+           ++simDaughter)
+        if ((*selector_)(**simDaughter))
+          simDaughterCounter++;
 
-            // Sanity condition in case that reconstructable condition is too tight
-            if ( simDaughterCounter < matchedDaughterCounter )
-                simDaughterCounter = matchedDaughterCounter;
+      // Sanity condition in case that reconstructable condition is too tight
+      if (simDaughterCounter < matchedDaughterCounter)
+        simDaughterCounter = matchedDaughterCounter;
 
-            // Condition over S2RMatchedSimRatio
-            if ( (double)matchedDaughterCounter/simDaughterCounter < R2SMatchedSimRatio_ ) continue;
+      // Condition over S2RMatchedSimRatio
+      if ((double)matchedDaughterCounter / simDaughterCounter < R2SMatchedSimRatio_)
+        continue;
 
-            double quality = (double)matchedDaughterWeight/recoDaughterWeight;
+      double quality = (double)matchedDaughterWeight / recoDaughterWeight;
 
-            // Condition over R2SMatchedRecoRatio
-            if (quality < R2SMatchedRecoRatio_) continue;
+      // Condition over R2SMatchedRecoRatio
+      if (quality < R2SMatchedRecoRatio_)
+        continue;
 
-            outputCollection.insert(recoVertex, std::make_pair(trackingVertex, quality));
+      outputCollection.insert(recoVertex, std::make_pair(trackingVertex, quality));
 
-            LogTrace("VertexAssociation") << "R2S: INDEX " << assoIndex
-                                          << " ; SimDaughterCounter = " << simDaughterCounter
-                                          << " ; RecoDaughterWeight = " << recoDaughterWeight
-                                          << " ; MatchedDaughterCounter = " << matchedDaughterCounter
-                                          << " ; MatchedDaughterWeight = " << matchedDaughterWeight
-                                          << " ; quality = " << quality;
+      LogTrace("VertexAssociation") << "R2S: INDEX " << assoIndex << " ; SimDaughterCounter = " << simDaughterCounter
+                                    << " ; RecoDaughterWeight = " << recoDaughterWeight
+                                    << " ; MatchedDaughterCounter = " << matchedDaughterCounter
+                                    << " ; MatchedDaughterWeight = " << matchedDaughterWeight
+                                    << " ; quality = " << quality;
 
-            assoIndex++;
-        }
-    } // Loop on RecoVertex
+      assoIndex++;
+    }
+  }  // Loop on RecoVertex
 
-    LogTrace("VertexAssociation") << "\nRecoToSim OUTPUT COLLECTION: outputCollection.size() = " << outputCollection.size() << std::endl;
+  LogTrace("VertexAssociation") << "\nRecoToSim OUTPUT COLLECTION: outputCollection.size() = "
+                                << outputCollection.size() << std::endl;
 
-    return outputCollection;
+  return outputCollection;
 }
 
-
-
 reco::VertexSimToRecoCollection VertexAssociatorByTracks::associateSimToReco(
-    const edm::Handle<edm::View<reco::Vertex> > & recoVertexes,
-    const edm::Handle<TrackingVertexCollection> & trackingVertexes
-) const
-{
-    reco::VertexSimToRecoCollection  outputCollection(productGetter_);
-
-    // Loop over TrackingVertexes
-    std::map<std::size_t,std::pair<double, std::size_t> > matches;
-
-    // Loop over TrackingVertexes
-    for (std::size_t simIndex = 0; simIndex < trackingVertexes->size(); ++simIndex)
-    {
-        TrackingVertexRef trackingVertex(trackingVertexes, simIndex);
-
-        matches.clear();
-
-        std::size_t simDaughterCounter = 0;
-
-        // Loop over daughter tracks of TrackingVertex
-        for (
-            TrackingVertex::tp_iterator simDaughter = trackingVertex->daughterTracks_begin();
-            simDaughter != trackingVertex->daughterTracks_end();
-            ++simDaughter
-        )
-        {
-            // Select only reconstructible SimDaughters
-            if ( !(*selector_)(**simDaughter) ) continue;
-
-            // Check for association for the given RecoDaughter
-            if ( trackSimToRecoAssociation_->numberOfAssociations(*simDaughter) > 0 )
-            {
-                std::vector<std::pair<reco::TrackBaseRef, double> > associations = (*trackSimToRecoAssociation_)[*simDaughter];
-
-                // Loop over RecoTracks associated with TrackingParticle
-                for (
-                    std::vector<std::pair<reco::TrackBaseRef,double> >::const_iterator association = associations.begin();
-                    association != associations.end();
-                    ++association
-                )
-                {
-                    reco::TrackBaseRef recoTrack = association->first;
-
-                    for (std::size_t recoIndex = 0; recoIndex < recoVertexes->size(); ++recoIndex)
-                    {
-                        reco::VertexBaseRef recoVertex(recoVertexes, recoIndex);
-
-                        for (
-                            reco::Vertex::trackRef_iterator recoDaughter = recoVertex->tracks_begin();
-                            recoDaughter != recoVertex->tracks_end();
-                            ++recoDaughter
-                        )
-                        {
-                            // Store matched RecoDaughter to the RecoVertex
-                            if (
-                                recoDaughter->id() == recoTrack.id() &&
-                                recoDaughter->key() == recoTrack.key()
-                            )
-                            {
-                                matches[recoIndex].first += recoVertex->trackWeight(*recoDaughter);
-                                matches[recoIndex].second++; 
-                            }
-                        }
-                    }
-                } // loop a recotracks
+    const edm::Handle<edm::View<reco::Vertex>> &recoVertexes,
+    const edm::Handle<TrackingVertexCollection> &trackingVertexes) const {
+  reco::VertexSimToRecoCollection outputCollection(productGetter_);
+
+  // Loop over TrackingVertexes
+  std::map<std::size_t, std::pair<double, std::size_t>> matches;
+
+  // Loop over TrackingVertexes
+  for (std::size_t simIndex = 0; simIndex < trackingVertexes->size(); ++simIndex) {
+    TrackingVertexRef trackingVertex(trackingVertexes, simIndex);
+
+    matches.clear();
+
+    std::size_t simDaughterCounter = 0;
+
+    // Loop over daughter tracks of TrackingVertex
+    for (TrackingVertex::tp_iterator simDaughter = trackingVertex->daughterTracks_begin();
+         simDaughter != trackingVertex->daughterTracks_end();
+         ++simDaughter) {
+      // Select only reconstructible SimDaughters
+      if (!(*selector_)(**simDaughter))
+        continue;
+
+      // Check for association for the given RecoDaughter
+      if (trackSimToRecoAssociation_->numberOfAssociations(*simDaughter) > 0) {
+        std::vector<std::pair<reco::TrackBaseRef, double>> associations = (*trackSimToRecoAssociation_)[*simDaughter];
+
+        // Loop over RecoTracks associated with TrackingParticle
+        for (std::vector<std::pair<reco::TrackBaseRef, double>>::const_iterator association = associations.begin();
+             association != associations.end();
+             ++association) {
+          reco::TrackBaseRef recoTrack = association->first;
+
+          for (std::size_t recoIndex = 0; recoIndex < recoVertexes->size(); ++recoIndex) {
+            reco::VertexBaseRef recoVertex(recoVertexes, recoIndex);
+
+            for (reco::Vertex::trackRef_iterator recoDaughter = recoVertex->tracks_begin();
+                 recoDaughter != recoVertex->tracks_end();
+                 ++recoDaughter) {
+              // Store matched RecoDaughter to the RecoVertex
+              if (recoDaughter->id() == recoTrack.id() && recoDaughter->key() == recoTrack.key()) {
+                matches[recoIndex].first += recoVertex->trackWeight(*recoDaughter);
+                matches[recoIndex].second++;
+              }
             }
+          }
+        }  // loop a recotracks
+      }
 
-            simDaughterCounter++;
-        } // loop a simDaughter
+      simDaughterCounter++;
+    }  // loop a simDaughter
 
-        std::size_t assoIndex = 0;
+    std::size_t assoIndex = 0;
 
-        // Loop over map, set score, add to outputCollection
-        for (
-            std::map<std::size_t,std::pair<double,std::size_t> >::const_iterator match = matches.begin();
-            match != matches.end();
-            ++match
-        )
-        {
-            // Getting the TrackingVertex information
-            reco::VertexBaseRef recoVertex(recoVertexes, match->first);
-            double matchedDaughterWeight = match->second.first;
-            std::size_t matchedDaughterCounter = match->second.second;
+    // Loop over map, set score, add to outputCollection
+    for (std::map<std::size_t, std::pair<double, std::size_t>>::const_iterator match = matches.begin();
+         match != matches.end();
+         ++match) {
+      // Getting the TrackingVertex information
+      reco::VertexBaseRef recoVertex(recoVertexes, match->first);
+      double matchedDaughterWeight = match->second.first;
+      std::size_t matchedDaughterCounter = match->second.second;
 
-            double recoDaughterWeight = 0.;
+      double recoDaughterWeight = 0.;
 
-            // Weighted count of those tracks with a given quality of the RecoDoughters
-            for (
-                reco::Vertex::trackRef_iterator recoDaughter = recoVertex->tracks_begin();
-                recoDaughter != recoVertex->tracks_end();
-                ++recoDaughter
-            )
-                if ( (*recoDaughter)->quality(trackQuality_) ) 
-                    recoDaughterWeight += recoVertex->trackWeight(*recoDaughter);
+      // Weighted count of those tracks with a given quality of the
+      // RecoDoughters
+      for (reco::Vertex::trackRef_iterator recoDaughter = recoVertex->tracks_begin();
+           recoDaughter != recoVertex->tracks_end();
+           ++recoDaughter)
+        if ((*recoDaughter)->quality(trackQuality_))
+          recoDaughterWeight += recoVertex->trackWeight(*recoDaughter);
 
-            // Sanity condition in case that track quality condition is too tight
-            if ( recoDaughterWeight < matchedDaughterWeight )
-                recoDaughterWeight = matchedDaughterWeight;
+      // Sanity condition in case that track quality condition is too tight
+      if (recoDaughterWeight < matchedDaughterWeight)
+        recoDaughterWeight = matchedDaughterWeight;
 
-            // Condition over S2RMatchedRecoRatio
-            if ( matchedDaughterWeight/recoDaughterWeight < S2RMatchedRecoRatio_ ) continue;
+      // Condition over S2RMatchedRecoRatio
+      if (matchedDaughterWeight / recoDaughterWeight < S2RMatchedRecoRatio_)
+        continue;
 
-            double quality = (double)matchedDaughterCounter/simDaughterCounter;
+      double quality = (double)matchedDaughterCounter / simDaughterCounter;
 
-            // Condition over S2RMatchedSimRatio
-            if (quality < S2RMatchedSimRatio_) continue;
+      // Condition over S2RMatchedSimRatio
+      if (quality < S2RMatchedSimRatio_)
+        continue;
 
-            outputCollection.insert(trackingVertex, std::make_pair(recoVertex, quality));
+      outputCollection.insert(trackingVertex, std::make_pair(recoVertex, quality));
 
-            LogTrace("VertexAssociation") << "R2S: INDEX " << assoIndex
-                                          << " ; SimDaughterCounter = " << simDaughterCounter
-                                          << " ; RecoDaughterWeight = " << recoDaughterWeight
-                                          << " ; MatchedDaughterCounter = " << matchedDaughterCounter
-                                          << " ; MatchedDaughterWeight = " << matchedDaughterWeight
-                                          << " ; quality = " << quality;
+      LogTrace("VertexAssociation") << "R2S: INDEX " << assoIndex << " ; SimDaughterCounter = " << simDaughterCounter
+                                    << " ; RecoDaughterWeight = " << recoDaughterWeight
+                                    << " ; MatchedDaughterCounter = " << matchedDaughterCounter
+                                    << " ; MatchedDaughterWeight = " << matchedDaughterWeight
+                                    << " ; quality = " << quality;
 
-            assoIndex++;
-        }
-    } // loop over TrackingVertexes
+      assoIndex++;
+    }
+  }  // loop over TrackingVertexes
 
-    LogTrace("VertexAssociation") << "SimToReco OUTPUT COLLECTION: outputCollection.size() = " << outputCollection.size() << std::endl;
+  LogTrace("VertexAssociation") << "SimToReco OUTPUT COLLECTION: outputCollection.size() = " << outputCollection.size()
+                                << std::endl;
 
-    return outputCollection;
+  return outputCollection;
 }
-
diff --git a/SimTracker/VertexAssociation/src/calculateVertexSharedTracks.cc b/SimTracker/VertexAssociation/src/calculateVertexSharedTracks.cc
index 70263a1281f91..390ce8167ed57 100644
--- a/SimTracker/VertexAssociation/src/calculateVertexSharedTracks.cc
+++ b/SimTracker/VertexAssociation/src/calculateVertexSharedTracks.cc
@@ -1,16 +1,18 @@
 #include "SimTracker/VertexAssociation/interface/calculateVertexSharedTracks.h"
 
-unsigned int calculateVertexSharedTracks(const reco::Vertex& recoV, const TrackingVertex& simV, const reco::RecoToSimCollection& trackRecoToSimAssociation) {
+unsigned int calculateVertexSharedTracks(const reco::Vertex &recoV,
+                                         const TrackingVertex &simV,
+                                         const reco::RecoToSimCollection &trackRecoToSimAssociation) {
   unsigned int sharedTracks = 0;
-  for(auto iTrack = recoV.tracks_begin(); iTrack != recoV.tracks_end(); ++iTrack) {
+  for (auto iTrack = recoV.tracks_begin(); iTrack != recoV.tracks_end(); ++iTrack) {
     auto found = trackRecoToSimAssociation.find(*iTrack);
 
-    if(found == trackRecoToSimAssociation.end())
+    if (found == trackRecoToSimAssociation.end())
       continue;
 
     // matched TP equal to any TP of sim vertex => increase counter
-    for(const auto& tp: found->val) {
-      if(std::find_if(simV.daughterTracks_begin(), simV.daughterTracks_end(), [&](const TrackingParticleRef& vtp) {
+    for (const auto &tp : found->val) {
+      if (std::find_if(simV.daughterTracks_begin(), simV.daughterTracks_end(), [&](const TrackingParticleRef &vtp) {
             return tp.first == vtp;
           }) != simV.daughterTracks_end()) {
         sharedTracks += 1;
@@ -22,17 +24,19 @@ unsigned int calculateVertexSharedTracks(const reco::Vertex& recoV, const Tracki
   return sharedTracks;
 }
 
-unsigned int calculateVertexSharedTracks(const TrackingVertex& simV, const reco::Vertex& recoV, const reco::SimToRecoCollection& trackSimToRecoAssociation) {
+unsigned int calculateVertexSharedTracks(const TrackingVertex &simV,
+                                         const reco::Vertex &recoV,
+                                         const reco::SimToRecoCollection &trackSimToRecoAssociation) {
   unsigned int sharedTracks = 0;
-  for(auto iTP = simV.daughterTracks_begin(); iTP != simV.daughterTracks_end(); ++iTP) {
+  for (auto iTP = simV.daughterTracks_begin(); iTP != simV.daughterTracks_end(); ++iTP) {
     auto found = trackSimToRecoAssociation.find(*iTP);
 
-    if(found == trackSimToRecoAssociation.end())
+    if (found == trackSimToRecoAssociation.end())
       continue;
 
     // matched track equal to any track of reco vertex => increase counter
-    for(const auto& tk: found->val) {
-      if(std::find_if(recoV.tracks_begin(), recoV.tracks_end(), [&](const reco::TrackBaseRef& vtk) {
+    for (const auto &tk : found->val) {
+      if (std::find_if(recoV.tracks_begin(), recoV.tracks_end(), [&](const reco::TrackBaseRef &vtk) {
             return tk.first == vtk;
           }) != recoV.tracks_end()) {
         sharedTracks += 1;
diff --git a/SimTracker/VertexAssociation/test/testVertexAssociator.cc b/SimTracker/VertexAssociation/test/testVertexAssociator.cc
index 3e2e39df42025..b238910f4254c 100644
--- a/SimTracker/VertexAssociation/test/testVertexAssociator.cc
+++ b/SimTracker/VertexAssociation/test/testVertexAssociator.cc
@@ -1,25 +1,25 @@
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 
-#include "SimTracker/VertexAssociation/test/testVertexAssociator.h"
-#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
-#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
-#include "SimDataFormats/TrackingAnalysis/interface/TrackingVertexContainer.h"
+#include "CommonTools/UtilAlgos/interface/TFileService.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
 #include "SimDataFormats/Associations/interface/VertexToTrackingVertexAssociator.h"
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
-#include "CommonTools/UtilAlgos/interface/TFileService.h"
-#include "FWCore/ServiceRegistry/interface/Service.h" 
+#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
+#include "SimDataFormats/TrackingAnalysis/interface/TrackingVertexContainer.h"
+#include "SimTracker/Records/interface/TrackAssociatorRecord.h"
+#include "SimTracker/VertexAssociation/test/testVertexAssociator.h"
 
 #include "CommonTools/Statistics/interface/ChiSquaredProbability.h"
 #include "DataFormats/Math/interface/Vector.h"
 
-#include <memory>
 #include <iostream>
+#include <memory>
 #include <string>
 
-//class TrackAssociator;
+// class TrackAssociator;
 class TrackAssociatorByHits;
 class TrackerHitAssociator;
 
@@ -27,81 +27,68 @@ using namespace reco;
 using namespace std;
 using namespace edm;
 
-
-testVertexAssociator::testVertexAssociator(edm::ParameterSet const& conf) :
-  associatorByTracksToken(consumes<reco::VertexToTrackingVertexAssociator>(conf.getUntrackedParameter<edm::InputTag>("vertexAssociation")))
-{
-
-  vertexCollection_ = conf.getUntrackedParameter<edm::InputTag>( "vertexCollection" );
+testVertexAssociator::testVertexAssociator(edm::ParameterSet const &conf)
+    : associatorByTracksToken(consumes<reco::VertexToTrackingVertexAssociator>(
+          conf.getUntrackedParameter<edm::InputTag>("vertexAssociation"))) {
+  vertexCollection_ = conf.getUntrackedParameter<edm::InputTag>("vertexCollection");
 
   n_event_ = 0;
   n_rs_vertices_ = 0;
   n_rs_vtxassocs_ = 0;
   n_sr_vertices_ = 0;
   n_sr_vtxassocs_ = 0;
-
 }
 
-testVertexAssociator::~testVertexAssociator() {
-
-
-}
+testVertexAssociator::~testVertexAssociator() {}
 
 void testVertexAssociator::beginJob() {
-
-
-  edm::Service<TFileService> fs; 
-  
-   //RecoToSim Histos
-
-  rs_dist = fs->make<TH1F>("rs_dist","r Miss Distance (cm)",100,0,0.1);
-  rs_recz = fs->make<TH1F>("rs_recz","z, Reconstructed Vertex (cm)", 200, -25.0,25.0);
-  rs_simz = fs->make<TH1F>("rs_simz","z, Simulated Vertex (cm)",     200, -25.0,25.0);
-  rs_nsimtrk = fs->make<TH1F>("rs_nsimtrk","# of tracks, Simulated",    501,-0.5,500.5);  
-  rs_nrectrk = fs->make<TH1F>("rs_nrectrk","# of tracks, Reconstructed",501,-0.5,500.5);
-  rs_qual = fs->make<TH1F>("rs_qual","Quality of Match",51,-0.01,1.01);
-  rs_chi2norm = fs->make<TH1F>("rs_chi2norm","Vertex Normalized Chi2",100, 0, 10.);
-  rs_chi2prob = fs->make<TH1F>("rs_chi2prob","Vertex Chi2 Probability",100, 0, 1.);
-  rs_resx = fs->make<TH1F>("rs_resx","rec - sim Distance (cm)",100,-0.05,0.05);  
-  rs_resy = fs->make<TH1F>("rs_resy","rec - sim Distance (cm)",100,-0.05,0.05);  
-  rs_resz = fs->make<TH1F>("rs_resz","rec - sim Distance (cm)",100,-0.05,0.05);  
-  rs_pullx = fs->make<TH1F>("rs_pullx","(rec - sim)/err_rec ",100,-10.,10.);  
-  rs_pully = fs->make<TH1F>("rs_pully","(rec - sim)/err_rec ",100,-10.,10.); 
-  rs_pullz = fs->make<TH1F>("rs_pullz","(rec - sim)/err_rec ",100,-10.,10.); 
-
-  //SimToReco Histos
-
-  sr_dist = fs->make<TH1F>("sr_dist","r Miss Distance (cm)",100,0,0.1);
-  sr_recz = fs->make<TH1F>("sr_recz","z, Reconstructed Vertex (cm)", 200, -25.0,25.0);
-  sr_simz = fs->make<TH1F>("sr_simz","z, Simulated Vertex (cm)",     200, -25.0,25.0);
-  sr_nsimtrk = fs->make<TH1F>("sr_nsimtrk","# of tracks, Simulated",    501,-0.5,500.5);  
-  sr_nrectrk = fs->make<TH1F>("sr_nrectrk","# of tracks, Reconstructed",501,-0.5,500.5);
-  sr_qual = fs->make<TH1F>("sr_qual","Quality of Match",51,-0.01,1.01);
-  sr_chi2norm = fs->make<TH1F>("sr_chi2norm","Vertex Normalized Chi2",100, 0, 10.);
-  sr_chi2prob = fs->make<TH1F>("sr_chi2prob","Vertex Chi2 Probability",100, 0, 1.);
-  sr_resx = fs->make<TH1F>("sr_resx","rec - sim Distance (cm)",100,-0.05,0.05);  
-  sr_resy = fs->make<TH1F>("sr_resy","rec - sim Distance (cm)",100,-0.05,0.05);  
-  sr_resz = fs->make<TH1F>("sr_resz","rec - sim Distance (cm)",100,-0.05,0.05);  
-  sr_pullx = fs->make<TH1F>("sr_pullx","(rec - sim)/err_rec ",100,-10.,10.);  
-  sr_pully = fs->make<TH1F>("sr_pully","(rec - sim)/err_rec ",100,-10.,10.); 
-  sr_pullz = fs->make<TH1F>("sr_pullz","(rec - sim)/err_rec ",100,-10.,10.); 
-
-
+  edm::Service<TFileService> fs;
+
+  // RecoToSim Histos
+
+  rs_dist = fs->make<TH1F>("rs_dist", "r Miss Distance (cm)", 100, 0, 0.1);
+  rs_recz = fs->make<TH1F>("rs_recz", "z, Reconstructed Vertex (cm)", 200, -25.0, 25.0);
+  rs_simz = fs->make<TH1F>("rs_simz", "z, Simulated Vertex (cm)", 200, -25.0, 25.0);
+  rs_nsimtrk = fs->make<TH1F>("rs_nsimtrk", "# of tracks, Simulated", 501, -0.5, 500.5);
+  rs_nrectrk = fs->make<TH1F>("rs_nrectrk", "# of tracks, Reconstructed", 501, -0.5, 500.5);
+  rs_qual = fs->make<TH1F>("rs_qual", "Quality of Match", 51, -0.01, 1.01);
+  rs_chi2norm = fs->make<TH1F>("rs_chi2norm", "Vertex Normalized Chi2", 100, 0, 10.);
+  rs_chi2prob = fs->make<TH1F>("rs_chi2prob", "Vertex Chi2 Probability", 100, 0, 1.);
+  rs_resx = fs->make<TH1F>("rs_resx", "rec - sim Distance (cm)", 100, -0.05, 0.05);
+  rs_resy = fs->make<TH1F>("rs_resy", "rec - sim Distance (cm)", 100, -0.05, 0.05);
+  rs_resz = fs->make<TH1F>("rs_resz", "rec - sim Distance (cm)", 100, -0.05, 0.05);
+  rs_pullx = fs->make<TH1F>("rs_pullx", "(rec - sim)/err_rec ", 100, -10., 10.);
+  rs_pully = fs->make<TH1F>("rs_pully", "(rec - sim)/err_rec ", 100, -10., 10.);
+  rs_pullz = fs->make<TH1F>("rs_pullz", "(rec - sim)/err_rec ", 100, -10., 10.);
+
+  // SimToReco Histos
+
+  sr_dist = fs->make<TH1F>("sr_dist", "r Miss Distance (cm)", 100, 0, 0.1);
+  sr_recz = fs->make<TH1F>("sr_recz", "z, Reconstructed Vertex (cm)", 200, -25.0, 25.0);
+  sr_simz = fs->make<TH1F>("sr_simz", "z, Simulated Vertex (cm)", 200, -25.0, 25.0);
+  sr_nsimtrk = fs->make<TH1F>("sr_nsimtrk", "# of tracks, Simulated", 501, -0.5, 500.5);
+  sr_nrectrk = fs->make<TH1F>("sr_nrectrk", "# of tracks, Reconstructed", 501, -0.5, 500.5);
+  sr_qual = fs->make<TH1F>("sr_qual", "Quality of Match", 51, -0.01, 1.01);
+  sr_chi2norm = fs->make<TH1F>("sr_chi2norm", "Vertex Normalized Chi2", 100, 0, 10.);
+  sr_chi2prob = fs->make<TH1F>("sr_chi2prob", "Vertex Chi2 Probability", 100, 0, 1.);
+  sr_resx = fs->make<TH1F>("sr_resx", "rec - sim Distance (cm)", 100, -0.05, 0.05);
+  sr_resy = fs->make<TH1F>("sr_resy", "rec - sim Distance (cm)", 100, -0.05, 0.05);
+  sr_resz = fs->make<TH1F>("sr_resz", "rec - sim Distance (cm)", 100, -0.05, 0.05);
+  sr_pullx = fs->make<TH1F>("sr_pullx", "(rec - sim)/err_rec ", 100, -10., 10.);
+  sr_pully = fs->make<TH1F>("sr_pully", "(rec - sim)/err_rec ", 100, -10., 10.);
+  sr_pullz = fs->make<TH1F>("sr_pullz", "(rec - sim)/err_rec ", 100, -10., 10.);
 }
 
 void testVertexAssociator::endJob() {
- 
   std::cout << std::endl;
-  std::cout << " ====== Total Number of analyzed events: " << n_event_        << " ====== " << std::endl;
-  std::cout << " ====== Total Number of R2S vertices:    " << n_rs_vertices_  << " ====== " << std::endl;
+  std::cout << " ====== Total Number of analyzed events: " << n_event_ << " ====== " << std::endl;
+  std::cout << " ====== Total Number of R2S vertices:    " << n_rs_vertices_ << " ====== " << std::endl;
   std::cout << " ====== Total Number of R2S vtx assocs:  " << n_rs_vtxassocs_ << " ====== " << std::endl;
-  std::cout << " ====== Total Number of S2R vertices:    " << n_sr_vertices_  << " ====== " << std::endl;
+  std::cout << " ====== Total Number of S2R vertices:    " << n_sr_vertices_ << " ====== " << std::endl;
   std::cout << " ====== Total Number of S2R vtx assocs:  " << n_sr_vtxassocs_ << " ====== " << std::endl;
 }
 
-void testVertexAssociator::analyze(const edm::Event& event, const edm::EventSetup& setup)
-{
-
+void testVertexAssociator::analyze(const edm::Event &event, const edm::EventSetup &setup) {
   using namespace edm;
   using namespace reco;
 
@@ -116,39 +103,45 @@ void testVertexAssociator::analyze(const edm::Event& event, const edm::EventSetu
 
   std::cout << "*** Analyzing " << event.id() << " n_event = " << n_event_ << std::endl << std::endl;
 
-  edm::Handle<TrackingVertexCollection>  TVCollection;
-  event.getByLabel("mix","MergedTrackTruth",TVCollection);
-  const TrackingVertexCollection tVC   = *(TVCollection.product());
+  edm::Handle<TrackingVertexCollection> TVCollection;
+  event.getByLabel("mix", "MergedTrackTruth", TVCollection);
+  const TrackingVertexCollection tVC = *(TVCollection.product());
 
-  //Vertex Collection
-  edm::Handle<edm::View<reco::Vertex> > vertexCollection;
+  // Vertex Collection
+  edm::Handle<edm::View<reco::Vertex>> vertexCollection;
   event.getByLabel(vertexCollection_, vertexCollection);
   const edm::View<reco::Vertex> vC = *(vertexCollection.product());
 
   cout << endl;
-  cout << "                      ****************** Before Assocs ****************** " << endl << endl;  
+  cout << "                      ****************** Before Assocs "
+          "****************** "
+       << endl
+       << endl;
 
   cout << "vertexCollection.size() = " << vC.size() << endl;
   cout << "TVCollection.size()     = " << tVC.size() << endl;
-  
+
   cout << endl;
-  cout << "                      ****************** Reco To Sim ****************** " << endl << endl;
+  cout << "                      ****************** Reco To Sim "
+          "****************** "
+       << endl
+       << endl;
 
-  //cout << "-- Associator by hits --" << endl;
-  reco::VertexRecoToSimCollection r2sVertices = associatorByTracks->associateRecoToSim(vertexCollection,TVCollection);
+  // cout << "-- Associator by hits --" << endl;
+  reco::VertexRecoToSimCollection r2sVertices = associatorByTracks->associateRecoToSim(vertexCollection, TVCollection);
 
-  reco::VertexSimToRecoCollection s2rVertices = associatorByTracks->associateSimToReco(vertexCollection,TVCollection);
+  reco::VertexSimToRecoCollection s2rVertices = associatorByTracks->associateSimToReco(vertexCollection, TVCollection);
 
   cout << endl;
-  cout << "VertexRecoToSim size           = " <<  r2sVertices.size() << " ; VertexSimToReco size           = " << r2sVertices.size() << " " << endl;
- 
- 
+  cout << "VertexRecoToSim size           = " << r2sVertices.size()
+       << " ; VertexSimToReco size           = " << r2sVertices.size() << " " << endl;
+
   cout << endl << " [testVertexAssociator] Analyzing Reco To Sim" << endl;
 
   int cont_recvR2S = 0;
 
-  for (reco::VertexRecoToSimCollection::const_iterator iR2S = r2sVertices.begin(); iR2S != r2sVertices.end(); ++iR2S, ++cont_recvR2S) {
-
+  for (reco::VertexRecoToSimCollection::const_iterator iR2S = r2sVertices.begin(); iR2S != r2sVertices.end();
+       ++iR2S, ++cont_recvR2S) {
     ++n_rs_vertices_;
 
     reco::VertexBaseRef recVertex = iR2S->key;
@@ -156,36 +149,33 @@ void testVertexAssociator::analyze(const edm::Event& event, const edm::EventSetu
 
     double nrectrk = recVertex->tracksSize();
 
-    std::vector<std::pair<TrackingVertexRef, double> > simVertices = iR2S->val;
+    std::vector<std::pair<TrackingVertexRef, double>> simVertices = iR2S->val;
 
     int cont_simvR2S = 0;
-    for (
-        std::vector<std::pair<TrackingVertexRef, double> >::const_iterator iMatch = simVertices.begin();
-        iMatch != simVertices.end(); 
-        ++iMatch, ++cont_simvR2S
-    ) {
-
-      TrackingVertexRef simVertex =  iMatch->first;
+    for (std::vector<std::pair<TrackingVertexRef, double>>::const_iterator iMatch = simVertices.begin();
+         iMatch != simVertices.end();
+         ++iMatch, ++cont_simvR2S) {
+      TrackingVertexRef simVertex = iMatch->first;
       math::XYZTLorentzVectorD simVec = (iMatch->first)->position();
-      math::XYZPoint simPos = math::XYZPoint(simVec.x(),simVec.y(),simVec.z());
+      math::XYZPoint simPos = math::XYZPoint(simVec.x(), simVec.y(), simVec.z());
 
       ++n_rs_vtxassocs_;
 
       cout << "rec vertex " << cont_recvR2S << " has associated sim vertex " << cont_simvR2S << endl;
- 
+
       double nsimtrk = simVertex->daughterTracks().size();
-      double qual  = iMatch->second;
+      double qual = iMatch->second;
 
       double chi2norm = recVertex->normalizedChi2();
-      double chi2prob = ChiSquaredProbability( recVertex->chi2(), recVertex->ndof() ); 
-        
+      double chi2prob = ChiSquaredProbability(recVertex->chi2(), recVertex->ndof());
+
       double resx = recVertex->x() - simVertex->position().x();
       double resy = recVertex->y() - simVertex->position().y();
-      double resz = recVertex->z() - simVertex->position().z();	
-      double pullx = (recVertex->x() - simVertex->position().x())/recVertex->xError();
-      double pully = (recVertex->y() - simVertex->position().y())/recVertex->yError();
-      double pullz = (recVertex->z() - simVertex->position().z())/recVertex->zError();
-      double dist = sqrt(resx*resx+resy*resy+resz*resz);
+      double resz = recVertex->z() - simVertex->position().z();
+      double pullx = (recVertex->x() - simVertex->position().x()) / recVertex->xError();
+      double pully = (recVertex->y() - simVertex->position().y()) / recVertex->yError();
+      double pullz = (recVertex->z() - simVertex->position().z()) / recVertex->zError();
+      double dist = sqrt(resx * resx + resy * resy + resz * resz);
 
       cout << "            R2S: recPos = " << recPos << " ; simPos = " << simPos << endl;
 
@@ -202,38 +192,38 @@ void testVertexAssociator::analyze(const edm::Event& event, const edm::EventSetu
       rs_nrectrk->Fill(nrectrk);
       rs_qual->Fill(qual);
       rs_chi2norm->Fill(chi2norm);
-      rs_chi2prob->Fill(chi2prob);	
+      rs_chi2prob->Fill(chi2prob);
 
-    }//end simVertices
-    
-  }//end iR2S
+    }  // end simVertices
 
+  }  // end iR2S
 
-  cout << endl << "                      ****************** Sim To Reco ****************** " << endl << endl;
+  cout << endl
+       << "                      ****************** Sim To Reco "
+          "****************** "
+       << endl
+       << endl;
 
   cout << endl << "[testVertexAssociator] Analyzing Sim To Reco" << endl;
 
   int cont_simvS2R = 0;
-  for (reco::VertexSimToRecoCollection::const_iterator iS2R = s2rVertices.begin(); iS2R != s2rVertices.end(); ++iS2R, ++cont_simvS2R) {
-
+  for (reco::VertexSimToRecoCollection::const_iterator iS2R = s2rVertices.begin(); iS2R != s2rVertices.end();
+       ++iS2R, ++cont_simvS2R) {
     ++n_sr_vertices_;
 
     TrackingVertexRef simVertex = iS2R->key;
     math::XYZTLorentzVectorD simVec = simVertex->position();
-    math::XYZPoint   simPos = math::XYZPoint(simVec.x(),simVec.y(),simVec.z());
+    math::XYZPoint simPos = math::XYZPoint(simVec.x(), simVec.y(), simVec.z());
 
     double nsimtrk = simVertex->daughterTracks().size();
 
-    std::vector<std::pair<VertexBaseRef, double> > recoVertices = iS2R->val;
+    std::vector<std::pair<VertexBaseRef, double>> recoVertices = iS2R->val;
 
     int cont_recvS2R = 0;
 
-    for (
-      std::vector<std::pair<VertexBaseRef, double> >::const_iterator iMatch = recoVertices.begin();
-      iMatch != recoVertices.end();
-      ++iMatch, ++cont_recvS2R
-     ) {
-
+    for (std::vector<std::pair<VertexBaseRef, double>>::const_iterator iMatch = recoVertices.begin();
+         iMatch != recoVertices.end();
+         ++iMatch, ++cont_recvS2R) {
       VertexBaseRef recVertex = iMatch->first;
       math::XYZPoint recPos = recVertex->position();
 
@@ -242,19 +232,18 @@ void testVertexAssociator::analyze(const edm::Event& event, const edm::EventSetu
       cout << "sim vertex " << cont_simvS2R << " has associated rec vertex " << cont_recvS2R << endl;
 
       double nrectrk = recVertex->tracksSize();
-      double qual  = iMatch->second;
+      double qual = iMatch->second;
 
       double chi2norm = recVertex->normalizedChi2();
-      double chi2prob = ChiSquaredProbability( recVertex->chi2(), recVertex->ndof() ); 
-         
-      double resx = recVertex->x() - simVertex->position().x();
-      double resy = recVertex->y() - simVertex->position().y(); 
-      double resz = recVertex->z() - simVertex->position().z(); 	
-      double pullx = ( recVertex->x() - simVertex->position().x() )/recVertex->xError();
-      double pully = ( recVertex->y() - simVertex->position().y() )/recVertex->yError();
-      double pullz = ( recVertex->z() - simVertex->position().z() )/recVertex->zError();
-      double dist = sqrt(resx*resx+resy*resy+resz*resz);
+      double chi2prob = ChiSquaredProbability(recVertex->chi2(), recVertex->ndof());
 
+      double resx = recVertex->x() - simVertex->position().x();
+      double resy = recVertex->y() - simVertex->position().y();
+      double resz = recVertex->z() - simVertex->position().z();
+      double pullx = (recVertex->x() - simVertex->position().x()) / recVertex->xError();
+      double pully = (recVertex->y() - simVertex->position().y()) / recVertex->yError();
+      double pullz = (recVertex->z() - simVertex->position().z()) / recVertex->zError();
+      double dist = sqrt(resx * resx + resy * resy + resz * resz);
 
       cout << "            S2R: simPos = " << simPos << " ; recPos = " << recPos << endl;
 
@@ -271,17 +260,15 @@ void testVertexAssociator::analyze(const edm::Event& event, const edm::EventSetu
       sr_nrectrk->Fill(nrectrk);
       sr_qual->Fill(qual);
       sr_chi2norm->Fill(chi2norm);
-      sr_chi2prob->Fill(chi2prob);	
-  
-    }//end recoVertices
+      sr_chi2prob->Fill(chi2prob);
 
-  }//end iS2R
+    }  // end recoVertices
 
-  cout << endl;
+  }  // end iS2R
 
+  cout << endl;
 }
 
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 DEFINE_FWK_MODULE(testVertexAssociator);
-
diff --git a/SimTracker/VertexAssociation/test/testVertexAssociator.h b/SimTracker/VertexAssociation/test/testVertexAssociator.h
index 6978ca5ddf0dc..8191b5f7e82b4 100644
--- a/SimTracker/VertexAssociation/test/testVertexAssociator.h
+++ b/SimTracker/VertexAssociation/test/testVertexAssociator.h
@@ -8,42 +8,41 @@
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "TH1F.h"
 #include "TFile.h"
+#include "TH1F.h"
 
 #include <iostream>
-#include <string>
 #include <map>
 #include <set>
+#include <string>
 
-#include "TTree.h"
 #include "TMath.h"
-#include <vector>
 #include "TROOT.h"
+#include "TTree.h"
+#include <vector>
 
+#include "DataFormats/Math/interface/LorentzVector.h"
 #include <Math/GenVector/PxPyPzE4D.h>
 #include <Math/GenVector/PxPyPzM4D.h>
-#include "DataFormats/Math/interface/LorentzVector.h"
 #include <cmath>
 
 namespace reco {
   class TrackToTrackingParticleAssociator;
   class VertexToTrackingVertexAssociator;
-}
+}  // namespace reco
 
 class testVertexAssociator : public edm::EDAnalyzer {
-
- public:
-  testVertexAssociator(const edm::ParameterSet& conf);
+public:
+  testVertexAssociator(const edm::ParameterSet &conf);
   ~testVertexAssociator() override;
   void beginJob() override;
   void endJob() override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
- private:
-  const reco::TrackToTrackingParticleAssociator*  associatorByChi2;
-  const reco::TrackToTrackingParticleAssociator*  associatorByHits;
-  const reco::VertexToTrackingVertexAssociator* associatorByTracks;
+private:
+  const reco::TrackToTrackingParticleAssociator *associatorByChi2;
+  const reco::TrackToTrackingParticleAssociator *associatorByHits;
+  const reco::VertexToTrackingVertexAssociator *associatorByTracks;
 
   edm::InputTag vertexCollection_;
   edm::EDGetTokenT<reco::VertexToTrackingVertexAssociator> associatorByTracksToken;
@@ -55,39 +54,38 @@ class testVertexAssociator : public edm::EDAnalyzer {
   int n_sr_vtxassocs_;
 
   //--------- RecoToSim Histos -----
- 
-  TH1F*  rs_resx;
-  TH1F*  rs_resy;
-  TH1F*  rs_resz;  
-  TH1F*  rs_pullx;
-  TH1F*  rs_pully;
-  TH1F*  rs_pullz; 
-  TH1F*  rs_dist;
-  TH1F*  rs_simz;
-  TH1F*  rs_recz;
-  TH1F*  rs_nrectrk;
-  TH1F*  rs_nsimtrk;
-  TH1F*  rs_qual;
-  TH1F*  rs_chi2norm;
-  TH1F*  rs_chi2prob;
 
-  //--------- SimToReco Histos -----
+  TH1F *rs_resx;
+  TH1F *rs_resy;
+  TH1F *rs_resz;
+  TH1F *rs_pullx;
+  TH1F *rs_pully;
+  TH1F *rs_pullz;
+  TH1F *rs_dist;
+  TH1F *rs_simz;
+  TH1F *rs_recz;
+  TH1F *rs_nrectrk;
+  TH1F *rs_nsimtrk;
+  TH1F *rs_qual;
+  TH1F *rs_chi2norm;
+  TH1F *rs_chi2prob;
 
-  TH1F*  sr_resx;
-  TH1F*  sr_resy;
-  TH1F*  sr_resz;  
-  TH1F*  sr_pullx;
-  TH1F*  sr_pully;
-  TH1F*  sr_pullz; 
-  TH1F*  sr_dist;
-  TH1F*  sr_simz;
-  TH1F*  sr_recz;
-  TH1F*  sr_nrectrk;
-  TH1F*  sr_nsimtrk;
-  TH1F*  sr_qual;
-  TH1F*  sr_chi2norm;
-  TH1F*  sr_chi2prob;
+  //--------- SimToReco Histos -----
 
+  TH1F *sr_resx;
+  TH1F *sr_resy;
+  TH1F *sr_resz;
+  TH1F *sr_pullx;
+  TH1F *sr_pully;
+  TH1F *sr_pullz;
+  TH1F *sr_dist;
+  TH1F *sr_simz;
+  TH1F *sr_recz;
+  TH1F *sr_nrectrk;
+  TH1F *sr_nsimtrk;
+  TH1F *sr_qual;
+  TH1F *sr_chi2norm;
+  TH1F *sr_chi2prob;
 };
 
 #endif
diff --git a/SimTransport/HectorProducer/interface/Hector.h b/SimTransport/HectorProducer/interface/Hector.h
index 47ef0d3079283..3544acf9ad9c3 100644
--- a/SimTransport/HectorProducer/interface/Hector.h
+++ b/SimTransport/HectorProducer/interface/Hector.h
@@ -2,11 +2,11 @@
 #define SimTransport_Hector_h
 
 // user include files
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/EventSetup.h"
 /*
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -18,8 +18,8 @@
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
 
 #include "HepMC/GenEvent.h"
-#include "HepMC/GenVertex.h"
 #include "HepMC/GenParticle.h"
+#include "HepMC/GenVertex.h"
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 
 #include "SimDataFormats/Forward/interface/LHCTransportLink.h"
@@ -28,110 +28,109 @@
 // SimpleConfigurable replacement
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-//Hector headers
+// Hector headers
 #include "H_BeamLine.h"
-#include "H_RecRPObject.h"
 #include "H_BeamParticle.h"
-#include <string>
+#include "H_RecRPObject.h"
 #include <map>
+#include <string>
 
 class TRandom3;
 
 class Hector {
-  
- public:
+public:
   //  Hector(const edm::ParameterSet & ps);
-  Hector(const edm::ParameterSet & ps, bool verbosity, bool FP420Transport,bool ZDCTransport);
+  Hector(const edm::ParameterSet &ps, bool verbosity, bool FP420Transport, bool ZDCTransport);
   //  Hector();
   virtual ~Hector();
-  
+
   /*!Clears ApertureFlags, prepares Hector for a next event*/
   void clearApertureFlags();
-  /*!Clears BeamParticle, prepares Hector for a next Aperture check or/and a next event*/
+  /*!Clears BeamParticle, prepares Hector for a next Aperture check or/and a
+   * next event*/
   void clear();
   /*!Adds the stable protons from the event \a ev to a beamline*/
-  void add( const HepMC::GenEvent * ev , const edm::EventSetup & es);
+  void add(const HepMC::GenEvent *ev, const edm::EventSetup &es);
   /*!propagate the particles through a beamline to FP420*/
-  void filterFP420(TRandom3*);
+  void filterFP420(TRandom3 *);
   /*!propagate the particles through a beamline to ZDC*/
-  void filterZDC(TRandom3*);
+  void filterZDC(TRandom3 *);
   /*!propagate the particles through a beamline to ZDC*/
-  void filterD1(TRandom3*);
-  
-  int getDirect( unsigned int part_n ) const;
+  void filterD1(TRandom3 *);
+
+  int getDirect(unsigned int part_n) const;
 
   /*!Prints properties of all particles in a beamline*/
-    void print() const;
-  /*!Return vector of the particle lines (HepMC::GenParticle::barcode()) in a beamline*/
+  void print() const;
+  /*!Return vector of the particle lines (HepMC::GenParticle::barcode()) in a
+   * beamline*/
   // std::vector<unsigned int> part_list() const;
-    
-    //    bool isCharged(const HepMC::GenParticle * p);
-    
-    HepMC::GenEvent * addPartToHepMC( HepMC::GenEvent * event );
-
-    std::vector<LHCTransportLink> & getCorrespondenceMap() { return theCorrespondenceMap; }
-    
-    /*  
-	private:
-	//  edm::ParameterSet m_pBeamLine;
-	*/
- private:
-    
-    
-    // Defaults
-    double lengthfp420 ;
-    double lengthzdc ;
-    double lengthd1 ;
-    
-    double etacut;
-    bool m_smearAng;
-    double m_sig_e;
-    bool m_smearE;
-    double m_sigmaSTX;
-    double m_sigmaSTY;
-   
-    float m_rpp420_f;
-    float m_rpp420_b;
-    float m_rppzdc;
-    float m_rppd1;
-    
-    edm::ESHandle < ParticleDataTable > pdt;
-    
-    // Hector
-    H_BeamLine * m_beamlineFP4201;
-    H_BeamLine * m_beamlineFP4202;
-    H_BeamLine * m_beamlineZDC1;
-    H_BeamLine * m_beamlineZDC2;
-    H_BeamLine * m_beamlineD11;
-    H_BeamLine * m_beamlineD12;
-    //
-    
-    H_RecRPObject * m_rp420_f;
-    H_RecRPObject * m_rp420_b;
-    
-    std::map<unsigned int, H_BeamParticle*> m_beamPart;
-    std::map<unsigned int, int> m_direct;
-    std::map<unsigned int, bool> m_isStoppedfp420;
-    std::map<unsigned int, bool> m_isStoppedzdc;
-    std::map<unsigned int, bool> m_isStoppedd1;
-    std::map<unsigned int, double> m_xAtTrPoint;
-    std::map<unsigned int, double> m_yAtTrPoint;
-    std::map<unsigned int, double> m_TxAtTrPoint;
-    std::map<unsigned int, double> m_TyAtTrPoint;
-    std::map<unsigned int, double> m_eAtTrPoint;
-    
-    std::map<unsigned int, double> m_eta;
-    std::map<unsigned int, int> m_pdg;
-    std::map<unsigned int, double> m_pz;
-    std::map<unsigned int, bool> m_isCharged;
-    
-    string beam1filename;
-    string beam2filename;
-    
-    bool m_verbosity;
-    bool m_FP420Transport;
-    bool m_ZDCTransport;
-
-    std::vector<LHCTransportLink> theCorrespondenceMap;
+
+  //    bool isCharged(const HepMC::GenParticle * p);
+
+  HepMC::GenEvent *addPartToHepMC(HepMC::GenEvent *event);
+
+  std::vector<LHCTransportLink> &getCorrespondenceMap() { return theCorrespondenceMap; }
+
+  /*
+      private:
+      //  edm::ParameterSet m_pBeamLine;
+      */
+private:
+  // Defaults
+  double lengthfp420;
+  double lengthzdc;
+  double lengthd1;
+
+  double etacut;
+  bool m_smearAng;
+  double m_sig_e;
+  bool m_smearE;
+  double m_sigmaSTX;
+  double m_sigmaSTY;
+
+  float m_rpp420_f;
+  float m_rpp420_b;
+  float m_rppzdc;
+  float m_rppd1;
+
+  edm::ESHandle<ParticleDataTable> pdt;
+
+  // Hector
+  H_BeamLine *m_beamlineFP4201;
+  H_BeamLine *m_beamlineFP4202;
+  H_BeamLine *m_beamlineZDC1;
+  H_BeamLine *m_beamlineZDC2;
+  H_BeamLine *m_beamlineD11;
+  H_BeamLine *m_beamlineD12;
+  //
+
+  H_RecRPObject *m_rp420_f;
+  H_RecRPObject *m_rp420_b;
+
+  std::map<unsigned int, H_BeamParticle *> m_beamPart;
+  std::map<unsigned int, int> m_direct;
+  std::map<unsigned int, bool> m_isStoppedfp420;
+  std::map<unsigned int, bool> m_isStoppedzdc;
+  std::map<unsigned int, bool> m_isStoppedd1;
+  std::map<unsigned int, double> m_xAtTrPoint;
+  std::map<unsigned int, double> m_yAtTrPoint;
+  std::map<unsigned int, double> m_TxAtTrPoint;
+  std::map<unsigned int, double> m_TyAtTrPoint;
+  std::map<unsigned int, double> m_eAtTrPoint;
+
+  std::map<unsigned int, double> m_eta;
+  std::map<unsigned int, int> m_pdg;
+  std::map<unsigned int, double> m_pz;
+  std::map<unsigned int, bool> m_isCharged;
+
+  string beam1filename;
+  string beam2filename;
+
+  bool m_verbosity;
+  bool m_FP420Transport;
+  bool m_ZDCTransport;
+
+  std::vector<LHCTransportLink> theCorrespondenceMap;
 };
 #endif
diff --git a/SimTransport/HectorProducer/interface/HectorProducer.h b/SimTransport/HectorProducer/interface/HectorProducer.h
index afdc6fb9a0970..a4e6db1af825e 100644
--- a/SimTransport/HectorProducer/interface/HectorProducer.h
+++ b/SimTransport/HectorProducer/interface/HectorProducer.h
@@ -1,11 +1,11 @@
 #ifndef SimTransport_HectorProducer_H
 #define SimTransport_HectorProducer_H
- 
-#include "FWCore/Framework/interface/one/EDProducer.h"
+
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/one/EDProducer.h"
 
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
 
@@ -15,7 +15,7 @@ namespace edm {
   class EventSetup;
   class ConsumesCollector;
   class HepMCProduct;
-}
+}  // namespace edm
 
 class HectorManager;
 
@@ -24,26 +24,23 @@ class Hector;
 namespace HepMC {
   class GenEvent;
 }
-class HectorProducer : public edm::one::EDProducer<edm::one::SharedResources, edm::one::WatchRuns>
-{
- public:
-  explicit HectorProducer(edm::ParameterSet const & p);  
-  ~HectorProducer() override;  
-  void beginRun(const edm::Run & r,const edm::EventSetup& c) override;
-  void endRun(const edm::Run & r,const edm::EventSetup& c) override;
-  void produce(edm::Event & e, const edm::EventSetup& c) override;
-
- private:
-
-  HepMC::GenEvent * evt_;
-  Hector* m_Hector;
-  
+class HectorProducer : public edm::one::EDProducer<edm::one::SharedResources, edm::one::WatchRuns> {
+public:
+  explicit HectorProducer(edm::ParameterSet const &p);
+  ~HectorProducer() override;
+  void beginRun(const edm::Run &r, const edm::EventSetup &c) override;
+  void endRun(const edm::Run &r, const edm::EventSetup &c) override;
+  void produce(edm::Event &e, const edm::EventSetup &c) override;
+
+private:
+  HepMC::GenEvent *evt_;
+  Hector *m_Hector;
+
   edm::EDGetTokenT<edm::HepMCProduct> m_HepMC;
   bool m_verbosity;
   bool m_FP420Transport;
   bool m_ZDCTransport;
-  int  m_evtAnalysed; //!< just to count events that have been analysed
+  int m_evtAnalysed;  //!< just to count events that have been analysed
 };
 
 #endif
-
diff --git a/SimTransport/HectorProducer/src/Hector.cc b/SimTransport/HectorProducer/src/Hector.cc
index 6c58bb85a0302..df39322dc1318 100644
--- a/SimTransport/HectorProducer/src/Hector.cc
+++ b/SimTransport/HectorProducer/src/Hector.cc
@@ -3,124 +3,135 @@
 
 #include "SimTransport/HectorProducer/interface/Hector.h"
 
+#include "HepMC/SimpleVector.h"
 #include "SimGeneral/HepPDTRecord/interface/ParticleDataTable.h"
 #include <CLHEP/Units/GlobalSystemOfUnits.h>
-#include "HepMC/SimpleVector.h"
 
-#include "TRandom3.h"
 #include "TMath.h"
+#include "TRandom3.h"
 
 #include "H_Parameters.h"
 
 #include <cmath>
 
-Hector::Hector(const edm::ParameterSet & param, bool verbosity, bool FP420Transport,bool ZDCTransport) : 
-  m_verbosity(verbosity), 
-  m_FP420Transport(FP420Transport),
-  m_ZDCTransport(ZDCTransport)
-{
-  
+Hector::Hector(const edm::ParameterSet &param, bool verbosity, bool FP420Transport, bool ZDCTransport)
+    : m_verbosity(verbosity), m_FP420Transport(FP420Transport), m_ZDCTransport(ZDCTransport) {
   // Create LHC beam line
   edm::ParameterSet hector_par = param.getParameter<edm::ParameterSet>("Hector");
-  
+
   // User definitons
-  lengthfp420    = hector_par.getParameter<double>("BeamLineLengthFP420" );
-  m_rpp420_f     = (float) hector_par.getParameter<double>("RP420f");
-  m_rpp420_b     = (float) hector_par.getParameter<double>("RP420b");
-  lengthzdc      = hector_par.getParameter<double>("BeamLineLengthZDC" );
-  lengthd1       = hector_par.getParameter<double>("BeamLineLengthD1" );
-  beam1filename  = hector_par.getParameter<string>("Beam1");
-  beam2filename  = hector_par.getParameter<string>("Beam2");  
-  m_rppzdc       = (float) lengthzdc ;
-  m_rppd1        = (float) lengthd1 ;
-  m_smearAng     = hector_par.getParameter<bool>("smearAng");
-  m_sigmaSTX     = hector_par.getParameter<double>("sigmaSTX" );
-  m_sigmaSTY     = hector_par.getParameter<double>("sigmaSTY" );
-  m_smearE       = hector_par.getParameter<bool>("smearEnergy");
-  m_sig_e        = hector_par.getParameter<double>("sigmaEnergy");
-  etacut         = hector_par.getParameter<double>("EtaCutForHector" );
+  lengthfp420 = hector_par.getParameter<double>("BeamLineLengthFP420");
+  m_rpp420_f = (float)hector_par.getParameter<double>("RP420f");
+  m_rpp420_b = (float)hector_par.getParameter<double>("RP420b");
+  lengthzdc = hector_par.getParameter<double>("BeamLineLengthZDC");
+  lengthd1 = hector_par.getParameter<double>("BeamLineLengthD1");
+  beam1filename = hector_par.getParameter<string>("Beam1");
+  beam2filename = hector_par.getParameter<string>("Beam2");
+  m_rppzdc = (float)lengthzdc;
+  m_rppd1 = (float)lengthd1;
+  m_smearAng = hector_par.getParameter<bool>("smearAng");
+  m_sigmaSTX = hector_par.getParameter<double>("sigmaSTX");
+  m_sigmaSTY = hector_par.getParameter<double>("sigmaSTY");
+  m_smearE = hector_par.getParameter<bool>("smearEnergy");
+  m_sig_e = hector_par.getParameter<double>("sigmaEnergy");
+  etacut = hector_par.getParameter<double>("EtaCutForHector");
 
   theCorrespondenceMap.clear();
 
-  if(m_verbosity) {
-    edm::LogInfo("HectorSetup") << "===================================================================\n"  
-                                << " * * * * * * * * * * * * * * * * * * * * * * * * * * * *           \n"  
-                                << " *                                                         *       \n"  
-                                << " *                   --<--<--  A fast simulator --<--<--     *     \n"  
-                                << " *                 | --<--<--     of particle   --<--<--     *     \n"  
-                                << " *  ----HECTOR----<                                          *     \n"  
-                                << " *                 | -->-->-- transport through-->-->--      *     \n"   
-                                << " *                   -->-->-- generic beamlines -->-->--     *     \n"  
-                                << " *                                                           *     \n"   
-                                << " * JINST 2:P09005 (2007)                                     *     \n"  
-                                << " *      X Rouby, J de Favereau, K Piotrzkowski (CP3)         *     \n"  
-                                << " *       http://www.fynu.ucl.ac.be/hector.html               *     \n"  
-                                << " *                                                           *     \n"  
-                                << " * Center for Cosmology, Particle Physics and Phenomenology  *     \n"  
-                                << " *              Universite catholique de Louvain             *     \n"  
-                                << " *                 Louvain-la-Neuve, Belgium                 *     \n"  
-                                << " *                                                         *       \n"  
-                                << " * * * * * * * * * * * * * * * * * * * * * * * * * * * *           \n"   
-                                << " Hector configuration: \n" 
-                                << " m_FP420Transport = " << m_FP420Transport << "\n" 
-                                << " m_ZDCTransport   = " << m_ZDCTransport << "\n" 
-                                << " lengthfp420      = " << lengthfp420 << "\n" 
-                                << " m_rpp420_f       = " << m_rpp420_f << "\n" 
-                                << " m_rpp420_b       = " << m_rpp420_b << "\n" 
-                                << " lengthzdc        = " << lengthzdc << "\n" 
-                                << " lengthd1         = " << lengthd1 << "\n" 
-                                << "===================================================================\n";
-  }  
+  if (m_verbosity) {
+    edm::LogInfo("HectorSetup") << "==================================================================="
+                                   "\n"
+                                << " * * * * * * * * * * * * * * * * * * * * * * * * * * * *           "
+                                   "\n"
+                                << " *                                                         *       "
+                                   "\n"
+                                << " *                   --<--<--  A fast simulator --<--<--     *     "
+                                   "\n"
+                                << " *                 | --<--<--     of particle   --<--<--     *     "
+                                   "\n"
+                                << " *  ----HECTOR----<                                          *     "
+                                   "\n"
+                                << " *                 | -->-->-- transport through-->-->--      *     "
+                                   "\n"
+                                << " *                   -->-->-- generic beamlines -->-->--     *     "
+                                   "\n"
+                                << " *                                                           *     "
+                                   "\n"
+                                << " * JINST 2:P09005 (2007)                                     *     "
+                                   "\n"
+                                << " *      X Rouby, J de Favereau, K Piotrzkowski (CP3)         *     "
+                                   "\n"
+                                << " *       http://www.fynu.ucl.ac.be/hector.html               *     "
+                                   "\n"
+                                << " *                                                           *     "
+                                   "\n"
+                                << " * Center for Cosmology, Particle Physics and Phenomenology  *     "
+                                   "\n"
+                                << " *              Universite catholique de Louvain             *     "
+                                   "\n"
+                                << " *                 Louvain-la-Neuve, Belgium                 *     "
+                                   "\n"
+                                << " *                                                         *       "
+                                   "\n"
+                                << " * * * * * * * * * * * * * * * * * * * * * * * * * * * *           "
+                                   "\n"
+                                << " Hector configuration: \n"
+                                << " m_FP420Transport = " << m_FP420Transport << "\n"
+                                << " m_ZDCTransport   = " << m_ZDCTransport << "\n"
+                                << " lengthfp420      = " << lengthfp420 << "\n"
+                                << " m_rpp420_f       = " << m_rpp420_f << "\n"
+                                << " m_rpp420_b       = " << m_rpp420_b << "\n"
+                                << " lengthzdc        = " << lengthzdc << "\n"
+                                << " lengthd1         = " << lengthd1 << "\n"
+                                << "==================================================================="
+                                   "\n";
+  }
   edm::FileInPath b1(beam1filename.c_str());
   edm::FileInPath b2(beam2filename.c_str());
-  
-  // construct beam line for FP420:                                                                                           .
-  if(m_FP420Transport && lengthfp420>0. ) {
-    m_beamlineFP4201 = new H_BeamLine(  1, lengthfp420 + 0.1 ); // (direction, length)
-    m_beamlineFP4202 = new H_BeamLine( -1, lengthfp420 + 0.1 ); //
-    m_beamlineFP4201->fill( b1.fullPath(),  1, "IP5" );
-    m_beamlineFP4202->fill( b2.fullPath(), -1, "IP5" );
-    m_beamlineFP4201->offsetElements( 120, -0.097 );
-    m_beamlineFP4202->offsetElements( 120, +0.097 );
+
+  // construct beam line for FP420: .
+  if (m_FP420Transport && lengthfp420 > 0.) {
+    m_beamlineFP4201 = new H_BeamLine(1, lengthfp420 + 0.1);   // (direction, length)
+    m_beamlineFP4202 = new H_BeamLine(-1, lengthfp420 + 0.1);  //
+    m_beamlineFP4201->fill(b1.fullPath(), 1, "IP5");
+    m_beamlineFP4202->fill(b2.fullPath(), -1, "IP5");
+    m_beamlineFP4201->offsetElements(120, -0.097);
+    m_beamlineFP4202->offsetElements(120, +0.097);
     m_beamlineFP4201->calcMatrix();
     m_beamlineFP4202->calcMatrix();
-  }  
-  else{
-    if ( m_verbosity ) LogDebug("HectorSetup") << "Hector: WARNING: lengthfp420=  " << lengthfp420;
+  } else {
+    if (m_verbosity)
+      LogDebug("HectorSetup") << "Hector: WARNING: lengthfp420=  " << lengthfp420;
   }
-  
-  
-  if (m_ZDCTransport && lengthzdc>0. && lengthd1>0.) {
-    // construct beam line for ZDC:                                                                                           .
-    m_beamlineZDC1 = new H_BeamLine(  1, lengthzdc + 0.1 ); // (direction, length)
-    m_beamlineZDC2 = new H_BeamLine( -1, lengthzdc + 0.1 ); //
-    m_beamlineZDC1->fill( b1.fullPath(),  1, "IP5" );
-    m_beamlineZDC2->fill( b2.fullPath(), -1, "IP5" );
-    m_beamlineZDC1->offsetElements( 120, -0.097 );
-    m_beamlineZDC2->offsetElements( 120, +0.097 );
+
+  if (m_ZDCTransport && lengthzdc > 0. && lengthd1 > 0.) {
+    // construct beam line for ZDC: .
+    m_beamlineZDC1 = new H_BeamLine(1, lengthzdc + 0.1);   // (direction, length)
+    m_beamlineZDC2 = new H_BeamLine(-1, lengthzdc + 0.1);  //
+    m_beamlineZDC1->fill(b1.fullPath(), 1, "IP5");
+    m_beamlineZDC2->fill(b2.fullPath(), -1, "IP5");
+    m_beamlineZDC1->offsetElements(120, -0.097);
+    m_beamlineZDC2->offsetElements(120, +0.097);
     m_beamlineZDC1->calcMatrix();
     m_beamlineZDC2->calcMatrix();
-    
-    
-    // construct beam line for D1:                                                                                           .
-    m_beamlineD11 = new H_BeamLine(  1, lengthd1 + 0.1 ); // (direction, length)
-    m_beamlineD12 = new H_BeamLine( -1, lengthd1 + 0.1 ); //
-    m_beamlineD11->fill( b1.fullPath(),  1, "IP5" );
-    m_beamlineD12->fill( b2.fullPath(), -1, "IP5" );
-    m_beamlineD11->offsetElements( 120, -0.097 );
-    m_beamlineD12->offsetElements( 120, +0.097 );
+
+    // construct beam line for D1: .
+    m_beamlineD11 = new H_BeamLine(1, lengthd1 + 0.1);   // (direction, length)
+    m_beamlineD12 = new H_BeamLine(-1, lengthd1 + 0.1);  //
+    m_beamlineD11->fill(b1.fullPath(), 1, "IP5");
+    m_beamlineD12->fill(b2.fullPath(), -1, "IP5");
+    m_beamlineD11->offsetElements(120, -0.097);
+    m_beamlineD12->offsetElements(120, +0.097);
     m_beamlineD11->calcMatrix();
     m_beamlineD12->calcMatrix();
-  }  
-  else{
-    if ( m_verbosity ) LogDebug("HectorSetup") << "Hector: WARNING: lengthzdc=  " << lengthzdc << "lengthd1=  " << lengthd1;
+  } else {
+    if (m_verbosity)
+      LogDebug("HectorSetup") << "Hector: WARNING: lengthzdc=  " << lengthzdc << "lengthd1=  " << lengthd1;
   }
-  
 }
 
-Hector::~Hector(){
-  
-  for (std::map<unsigned int,H_BeamParticle*>::iterator it = m_beamPart.begin(); it != m_beamPart.end(); ++it ) {
+Hector::~Hector() {
+  for (std::map<unsigned int, H_BeamParticle *>::iterator it = m_beamPart.begin(); it != m_beamPart.end(); ++it) {
     delete (*it).second;
   }
 
@@ -130,17 +141,16 @@ Hector::~Hector(){
   delete m_beamlineZDC2;
   delete m_beamlineD11;
   delete m_beamlineD12;
-  
 }
 
-void Hector::clearApertureFlags(){
+void Hector::clearApertureFlags() {
   m_isStoppedfp420.clear();
   m_isStoppedzdc.clear();
   m_isStoppedd1.clear();
 }
 
-void Hector::clear(){
-  for ( std::map<unsigned int,H_BeamParticle*>::iterator it = m_beamPart.begin(); it != m_beamPart.end(); ++it ) {
+void Hector::clear() {
+  for (std::map<unsigned int, H_BeamParticle *>::iterator it = m_beamPart.begin(); it != m_beamPart.end(); ++it) {
     delete (*it).second;
   };
   m_beamPart.clear();
@@ -148,7 +158,7 @@ void Hector::clear(){
   m_eta.clear();
   m_pdg.clear();
   m_pz.clear();
-  m_isCharged.clear();  
+  m_isCharged.clear();
 }
 
 /*
@@ -162,418 +172,451 @@ void Hector::clear(){
   }
   }
 */
-void Hector::add( const HepMC::GenEvent * evt ,const edm::EventSetup & iSetup) {
-  
-  H_BeamParticle * h_p;
+void Hector::add(const HepMC::GenEvent *evt, const edm::EventSetup &iSetup) {
+  H_BeamParticle *h_p;
   unsigned int line;
-  
-  for (HepMC::GenEvent::particle_const_iterator eventParticle =evt->particles_begin();
+
+  for (HepMC::GenEvent::particle_const_iterator eventParticle = evt->particles_begin();
        eventParticle != evt->particles_end();
-       ++eventParticle ) {
-    if ( (*eventParticle)->status() == 1 ) {
-      if ( abs( (*eventParticle)->momentum().eta())>etacut){
+       ++eventParticle) {
+    if ((*eventParticle)->status() == 1) {
+      if (abs((*eventParticle)->momentum().eta()) > etacut) {
         line = (*eventParticle)->barcode();
-        if ( m_beamPart.find(line) == m_beamPart.end() ) {
-          double charge=1.;
-          m_isCharged[line] = false;// neutrals
-          HepMC::GenParticle * g = (*eventParticle);	
-          iSetup.getData( pdt );
-          const ParticleData * part = pdt->particle( g->pdg_id() );
-          if (part){
+        if (m_beamPart.find(line) == m_beamPart.end()) {
+          double charge = 1.;
+          m_isCharged[line] = false;  // neutrals
+          HepMC::GenParticle *g = (*eventParticle);
+          iSetup.getData(pdt);
+          const ParticleData *part = pdt->particle(g->pdg_id());
+          if (part) {
             charge = part->charge();
           }
-          if(charge !=0) m_isCharged[line] = true;//charged
+          if (charge != 0)
+            m_isCharged[line] = true;  // charged
           double mass = (*eventParticle)->generatedMass();
-          
-          h_p = new H_BeamParticle(mass,charge);
-          
-          double px,py,pz;
-          px = (*eventParticle)->momentum().px();	  
-          py = (*eventParticle)->momentum().py();	  
-          pz = (*eventParticle)->momentum().pz();	  
-	  
-          h_p->set4Momentum( px, py, pz, (*eventParticle)->momentum().e() );
-          
-          // from mm to um	  
-          double XforPosition = (*eventParticle)->production_vertex()->position().x()/micrometer;//um
-          double YforPosition = (*eventParticle)->production_vertex()->position().y()/micrometer;//um
-          double ZforPosition = (*eventParticle)->production_vertex()->position().z()/meter;//m
-          // crossing angle (beam tilt) is not known a priory; keep now 0.0 but, in principle, can be entered as parameters
-          double TXforPosition=0.0, TYforPosition=0.0;//urad
-          
+
+          h_p = new H_BeamParticle(mass, charge);
+
+          double px, py, pz;
+          px = (*eventParticle)->momentum().px();
+          py = (*eventParticle)->momentum().py();
+          pz = (*eventParticle)->momentum().pz();
+
+          h_p->set4Momentum(px, py, pz, (*eventParticle)->momentum().e());
+
+          // from mm to um
+          double XforPosition = (*eventParticle)->production_vertex()->position().x() / micrometer;  // um
+          double YforPosition = (*eventParticle)->production_vertex()->position().y() / micrometer;  // um
+          double ZforPosition = (*eventParticle)->production_vertex()->position().z() / meter;       // m
+          // crossing angle (beam tilt) is not known a priory; keep now 0.0 but,
+          // in principle, can be entered as parameters
+          double TXforPosition = 0.0, TYforPosition = 0.0;  // urad
+
           // Clears H_BeamParticle::positions and sets the initial one
-          h_p->setPosition(XforPosition, YforPosition, TXforPosition, TYforPosition, ZforPosition );
-          
+          h_p->setPosition(XforPosition, YforPosition, TXforPosition, TYforPosition, ZforPosition);
+
           m_beamPart[line] = h_p;
           m_direct[line] = 0;
-          m_direct[line] = ( pz > 0 ) ? 1 : -1;
-          
+          m_direct[line] = (pz > 0) ? 1 : -1;
+
           m_eta[line] = (*eventParticle)->momentum().eta();
           m_pdg[line] = (*eventParticle)->pdg_id();
-          m_pz[line]  = (*eventParticle)->momentum().pz();
-          
-          if(m_verbosity) { 
-            LogDebug("HectorEventProcessing") << "Hector:add: barcode = " << line 
-                                              << " status = " << g->status() 
-                                              << " PDG Id = " << g->pdg_id() 
-                                              << " mass = " << mass 
-                                              << " pz = " << pz 
-                                              << " charge = " << charge 
-                                              << " m_isCharged[line] = " << m_isCharged[line];
-          } 
-        }// if find line
-      }// if eta > 8.2
-    }// if status
-  }// for loop
-  
+          m_pz[line] = (*eventParticle)->momentum().pz();
+
+          if (m_verbosity) {
+            LogDebug("HectorEventProcessing") << "Hector:add: barcode = " << line << " status = " << g->status()
+                                              << " PDG Id = " << g->pdg_id() << " mass = " << mass << " pz = " << pz
+                                              << " charge = " << charge << " m_isCharged[line] = " << m_isCharged[line];
+          }
+        }  // if find line
+      }    // if eta > 8.2
+    }      // if status
+  }        // for loop
 }
 
-void Hector::filterFP420(TRandom3* rootEngine){
+void Hector::filterFP420(TRandom3 *rootEngine) {
   unsigned int line;
-  H_BeamParticle * part;
-  std::map< unsigned int, H_BeamParticle* >::iterator it;
-  
+  H_BeamParticle *part;
+  std::map<unsigned int, H_BeamParticle *>::iterator it;
+
   bool is_stop;
   int direction;
-  
+
   float x1_420;
   float y1_420;
-  
-  if ( !m_beamPart.empty() && lengthfp420>0. ) {
-    
-    for (it = m_beamPart.begin(); it != m_beamPart.end(); ++it ) {
+
+  if (!m_beamPart.empty() && lengthfp420 > 0.) {
+    for (it = m_beamPart.begin(); it != m_beamPart.end(); ++it) {
       line = (*it).first;
       part = (*it).second;
-      
-      if(m_verbosity) {
+
+      if (m_verbosity) {
         LogDebug("HectorEventProcessing") << "Hector:filterFP420: barcode = " << line;
       }
-      if ( (*m_isCharged.find( line )).second ) {
-        direction = (*m_direct.find( line )).second;
+      if ((*m_isCharged.find(line)).second) {
+        direction = (*m_direct.find(line)).second;
         if (m_smearAng) {
-          // the beam transverse direction is centered on (TXforPosition, TYforPosition) at IP
-          if ( m_sigmaSTX>0. && m_sigmaSTY>0.) {
-            part->smearAng(m_sigmaSTX,m_sigmaSTY,rootEngine);
-          }
-          else {
+          // the beam transverse direction is centered on (TXforPosition,
+          // TYforPosition) at IP
+          if (m_sigmaSTX > 0. && m_sigmaSTY > 0.) {
+            part->smearAng(m_sigmaSTX, m_sigmaSTY, rootEngine);
+          } else {
             // for smearAng() in urad, default are (STX=30.23, STY=30.23)
-            part->smearAng(STX,STY,rootEngine);
+            part->smearAng(STX, STY, rootEngine);
           }
         }
         if (m_smearE) {
-          if ( m_sig_e ) {
-            part->smearE(m_sig_e,rootEngine);
-          }
-          else {
-            part->smearE(SBE,rootEngine);  // in GeV, default is SBE=0.79
+          if (m_sig_e) {
+            part->smearE(m_sig_e, rootEngine);
+          } else {
+            part->smearE(SBE, rootEngine);  // in GeV, default is SBE=0.79
           }
         }
-        if ( direction == 1 && m_beamlineFP4201 != nullptr ) {
-          part->computePath( m_beamlineFP4201 );
-          is_stop = part->stopped( m_beamlineFP4201 );
-          if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterFP420: barcode = " << line << " positive is_stop=  "<< is_stop;
-        }
-        else if ( direction == -1 && m_beamlineFP4202 != nullptr ){
-          part->computePath( m_beamlineFP4202 );
-          is_stop = part->stopped( m_beamlineFP4202 );
-          if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterFP420: barcode = " << line << " negative is_stop=  "<< is_stop;
-        }
-        else {
+        if (direction == 1 && m_beamlineFP4201 != nullptr) {
+          part->computePath(m_beamlineFP4201);
+          is_stop = part->stopped(m_beamlineFP4201);
+          if (m_verbosity)
+            LogDebug("HectorEventProcessing")
+                << "Hector:filterFP420: barcode = " << line << " positive is_stop=  " << is_stop;
+        } else if (direction == -1 && m_beamlineFP4202 != nullptr) {
+          part->computePath(m_beamlineFP4202);
+          is_stop = part->stopped(m_beamlineFP4202);
+          if (m_verbosity)
+            LogDebug("HectorEventProcessing")
+                << "Hector:filterFP420: barcode = " << line << " negative is_stop=  " << is_stop;
+        } else {
           is_stop = true;
-          if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterFP420: barcode = " << line << " 0        is_stop=  "<< is_stop;
+          if (m_verbosity)
+            LogDebug("HectorEventProcessing")
+                << "Hector:filterFP420: barcode = " << line << " 0        is_stop=  " << is_stop;
         }
-        
-        //propagating
+
+        // propagating
         m_isStoppedfp420[line] = is_stop;
-        if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterFP420: barcode = " << line << " isStopped=" << (*m_isStoppedfp420.find(line)).second;
-        
+        if (m_verbosity)
+          LogDebug("HectorEventProcessing")
+              << "Hector:filterFP420: barcode = " << line << " isStopped=" << (*m_isStoppedfp420.find(line)).second;
+
         if (!is_stop) {
-          if ( direction == 1 ) part->propagate( m_rpp420_f );
-          if ( direction == -1 ) part->propagate( m_rpp420_b );
+          if (direction == 1)
+            part->propagate(m_rpp420_f);
+          if (direction == -1)
+            part->propagate(m_rpp420_b);
           x1_420 = part->getX();
           y1_420 = part->getY();
-          if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterFP420: barcode = " << line << " x=  "<< x1_420 <<" y= " << y1_420;
-          
-          m_xAtTrPoint[line]  = x1_420;
-          m_yAtTrPoint[line]  = y1_420;
+          if (m_verbosity)
+            LogDebug("HectorEventProcessing")
+                << "Hector:filterFP420: barcode = " << line << " x=  " << x1_420 << " y= " << y1_420;
+
+          m_xAtTrPoint[line] = x1_420;
+          m_yAtTrPoint[line] = y1_420;
           m_TxAtTrPoint[line] = part->getTX();
           m_TyAtTrPoint[line] = part->getTY();
-          m_eAtTrPoint[line]  = part->getE();
-          
+          m_eAtTrPoint[line] = part->getE();
         }
-      }// if isCharged
+      }  // if isCharged
       else {
-        m_isStoppedfp420[line] = true;// imply that neutral particles stopped to reach 420m
-        if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterFP420: barcode = " << line << " isStopped=" << (*m_isStoppedfp420.find(line)).second;
+        m_isStoppedfp420[line] = true;  // imply that neutral particles stopped to reach 420m
+        if (m_verbosity)
+          LogDebug("HectorEventProcessing")
+              << "Hector:filterFP420: barcode = " << line << " isStopped=" << (*m_isStoppedfp420.find(line)).second;
       }
-      
-    } // for (it = m_beamPart.begin(); it != m_beamPart.end(); it++ ) 
-  } // if ( m_beamPart.size() )
-  
+
+    }  // for (it = m_beamPart.begin(); it != m_beamPart.end(); it++ )
+  }    // if ( m_beamPart.size() )
 }
 
-void Hector::filterZDC(TRandom3* rootEngine){
+void Hector::filterZDC(TRandom3 *rootEngine) {
   unsigned int line;
-  H_BeamParticle * part;
-  std::map< unsigned int, H_BeamParticle* >::iterator it;
-  
+  H_BeamParticle *part;
+  std::map<unsigned int, H_BeamParticle *>::iterator it;
+
   bool is_stop_zdc = false;
   int direction;
-  
-  if ( !m_beamPart.empty() && lengthzdc>0. ) {
-    
-    for (it = m_beamPart.begin(); it != m_beamPart.end(); ++it ) {
+
+  if (!m_beamPart.empty() && lengthzdc > 0.) {
+    for (it = m_beamPart.begin(); it != m_beamPart.end(); ++it) {
       line = (*it).first;
       part = (*it).second;
-      if(m_verbosity) {
-	LogDebug("HectorEventProcessing") << "Hector:filterZDC: barcode = " << line << " charge  = " << (*m_isCharged.find(line)).second;
-	if (m_FP420Transport) LogDebug("HectorEventProcessing") << " isStoppedFP420 =" << (*m_isStoppedfp420.find(line)).second;
+      if (m_verbosity) {
+        LogDebug("HectorEventProcessing")
+            << "Hector:filterZDC: barcode = " << line << " charge  = " << (*m_isCharged.find(line)).second;
+        if (m_FP420Transport)
+          LogDebug("HectorEventProcessing") << " isStoppedFP420 =" << (*m_isStoppedfp420.find(line)).second;
       }
-      //      if ( ((*m_isStoppedfp420.find(line)).second) && ((*m_isCharged.find(line)).second) ) {
-      if ( ((*m_isCharged.find(line)).second) ) {
-	
-	if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterZDC: barcode = " << line << " propagated ";
-	
-        direction = (*m_direct.find( line )).second;
-        if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterZDC: barcode = " << line << " direction = " << direction;
+      //      if ( ((*m_isStoppedfp420.find(line)).second) &&
+      //      ((*m_isCharged.find(line)).second) ) {
+      if (((*m_isCharged.find(line)).second)) {
+        if (m_verbosity)
+          LogDebug("HectorEventProcessing") << "Hector:filterZDC: barcode = " << line << " propagated ";
+
+        direction = (*m_direct.find(line)).second;
+        if (m_verbosity)
+          LogDebug("HectorEventProcessing") << "Hector:filterZDC: barcode = " << line << " direction = " << direction;
         if (m_smearAng) {
-          if ( m_sigmaSTX>0. && m_sigmaSTY>0.) {
-            // the beam transverse direction is centered on (TXforPosition, TYforPosition) at IP
-            part->smearAng(m_sigmaSTX,m_sigmaSTY,rootEngine);
+          if (m_sigmaSTX > 0. && m_sigmaSTY > 0.) {
+            // the beam transverse direction is centered on (TXforPosition,
+            // TYforPosition) at IP
+            part->smearAng(m_sigmaSTX, m_sigmaSTY, rootEngine);
           } else {
             // for smearAng() in urad, default are (STX=30.23, STY=30.23)
-            part->smearAng(STX,STY,rootEngine);
+            part->smearAng(STX, STY, rootEngine);
           }
         }
         if (m_smearE) {
-          if ( m_sig_e ) {
-            part->smearE(m_sig_e,rootEngine);
+          if (m_sig_e) {
+            part->smearE(m_sig_e, rootEngine);
           } else {
-            part->smearE(SBE,rootEngine);  // in GeV, default is SBE=0.79
+            part->smearE(SBE, rootEngine);  // in GeV, default is SBE=0.79
           }
         }
-        if ( direction == 1 && m_beamlineZDC1 != nullptr ){
-          part->computePath( m_beamlineZDC1 );
-          is_stop_zdc = part->stopped( m_beamlineZDC1 );
+        if (direction == 1 && m_beamlineZDC1 != nullptr) {
+          part->computePath(m_beamlineZDC1);
+          is_stop_zdc = part->stopped(m_beamlineZDC1);
           m_isStoppedzdc[line] = is_stop_zdc;
-          if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterZDC: barcode " << line << " positive is_stop_zdc=  "<< is_stop_zdc;
-        } else if ( direction == -1 && m_beamlineZDC2 != nullptr ){
-          part->computePath( m_beamlineZDC2 );
-          is_stop_zdc = part->stopped( m_beamlineZDC2 );
+          if (m_verbosity)
+            LogDebug("HectorEventProcessing")
+                << "Hector:filterZDC: barcode " << line << " positive is_stop_zdc=  " << is_stop_zdc;
+        } else if (direction == -1 && m_beamlineZDC2 != nullptr) {
+          part->computePath(m_beamlineZDC2);
+          is_stop_zdc = part->stopped(m_beamlineZDC2);
           m_isStoppedzdc[line] = is_stop_zdc;
-          if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterZDC: barcode " << line << " negative is_stop_zdc=  "<< is_stop_zdc;
+          if (m_verbosity)
+            LogDebug("HectorEventProcessing")
+                << "Hector:filterZDC: barcode " << line << " negative is_stop_zdc=  " << is_stop_zdc;
         } else {
           m_isStoppedzdc[line] = true;
-          if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterZDC: barcode " << line << " 0         is_stop_zdc=  "<< is_stop_zdc;
+          if (m_verbosity)
+            LogDebug("HectorEventProcessing")
+                << "Hector:filterZDC: barcode " << line << " 0         is_stop_zdc=  " << is_stop_zdc;
         }
       }
       // if stopfp420 charged particles
       /*
-	else if ( ((*m_isCharged.find(line)).second) ){
-        m_isStoppedzdc[line] = false;// not stopped in propagating to FP420 and therefore in  propagation to ZDC too.
-        if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterZDC: barcode = " << line << " isStopped=" << (*m_isStoppedzdc.find(line)).second;
-	} */
+        else if ( ((*m_isCharged.find(line)).second) ){
+        m_isStoppedzdc[line] = false;// not stopped in propagating to FP420 and
+        therefore in  propagation to ZDC too. if(m_verbosity)
+        LogDebug("HectorEventProcessing") << "Hector:filterZDC: barcode = " <<
+        line << " isStopped=" << (*m_isStoppedzdc.find(line)).second;
+        } */
       else {
-        m_isStoppedzdc[line] = true;// neutrals particles considered as stopped in propagating to ZDC
-        if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterZDC: barcode = " << line << " isStopped=" << (*m_isStoppedzdc.find(line)).second;
+        m_isStoppedzdc[line] = true;  // neutrals particles considered as stopped
+                                      // in propagating to ZDC
+        if (m_verbosity)
+          LogDebug("HectorEventProcessing")
+              << "Hector:filterZDC: barcode = " << line << " isStopped=" << (*m_isStoppedzdc.find(line)).second;
       }
-      
-    } // for (it = m_beamPart.begin(); it != m_beamPart.end(); it++ ) 
-  } // if ( m_beamPart.size() )
-  
+
+    }  // for (it = m_beamPart.begin(); it != m_beamPart.end(); it++ )
+  }    // if ( m_beamPart.size() )
 }
 
-void Hector::filterD1(TRandom3* rootEngine){
+void Hector::filterD1(TRandom3 *rootEngine) {
   unsigned int line;
-  H_BeamParticle * part;
-  std::map< unsigned int, H_BeamParticle* >::iterator it;
-  
+  H_BeamParticle *part;
+  std::map<unsigned int, H_BeamParticle *>::iterator it;
+
   bool is_stop_d1;
   int direction;
-  
+
   float x1_d1;
   float y1_d1;
-  
-  if ( !m_beamPart.empty() && lengthd1>0.) {
-    
-    for (it = m_beamPart.begin(); it != m_beamPart.end(); ++it ) {
+
+  if (!m_beamPart.empty() && lengthd1 > 0.) {
+    for (it = m_beamPart.begin(); it != m_beamPart.end(); ++it) {
       line = (*it).first;
       part = (*it).second;
-      if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterD1: barcode = " << line << " isStoppedZDC =" << (*m_isStoppedzdc.find(line)).second;
-      if ( ((*m_isStoppedzdc.find(line)).second) || !((*m_isCharged.find( line )).second) ) {
-	
-        if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterD1: barcode = " << line << " propagated ";
-	
-        direction = (*m_direct.find( line )).second;
-        if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterD1:direction=" << direction;
+      if (m_verbosity)
+        LogDebug("HectorEventProcessing")
+            << "Hector:filterD1: barcode = " << line << " isStoppedZDC =" << (*m_isStoppedzdc.find(line)).second;
+      if (((*m_isStoppedzdc.find(line)).second) || !((*m_isCharged.find(line)).second)) {
+        if (m_verbosity)
+          LogDebug("HectorEventProcessing") << "Hector:filterD1: barcode = " << line << " propagated ";
+
+        direction = (*m_direct.find(line)).second;
+        if (m_verbosity)
+          LogDebug("HectorEventProcessing") << "Hector:filterD1:direction=" << direction;
         if (m_smearAng) {
-          if ( m_sigmaSTX>0. && m_sigmaSTY>0.) {
-            // the beam transverse direction is centered on (TXforPosition, TYforPosition) at IP
-            part->smearAng(m_sigmaSTX,m_sigmaSTY,rootEngine);
+          if (m_sigmaSTX > 0. && m_sigmaSTY > 0.) {
+            // the beam transverse direction is centered on (TXforPosition,
+            // TYforPosition) at IP
+            part->smearAng(m_sigmaSTX, m_sigmaSTY, rootEngine);
           } else {
             // for smearAng() in urad, default are (STX=30.23, STY=30.23)
-            part->smearAng(STX,STY,rootEngine);
+            part->smearAng(STX, STY, rootEngine);
           }
         }
         if (m_smearE) {
-          if ( m_sig_e ) {
-            part->smearE(m_sig_e,rootEngine);
+          if (m_sig_e) {
+            part->smearE(m_sig_e, rootEngine);
           } else {
-            part->smearE(SBE,rootEngine);  // in GeV, default is SBE=0.79
+            part->smearE(SBE, rootEngine);  // in GeV, default is SBE=0.79
           }
         }
-        if ( direction == 1 && m_beamlineD11 != nullptr ) {
-          part->computePath( m_beamlineD11 );
-          is_stop_d1 = part->stopped( m_beamlineD11 );
+        if (direction == 1 && m_beamlineD11 != nullptr) {
+          part->computePath(m_beamlineD11);
+          is_stop_d1 = part->stopped(m_beamlineD11);
           m_isStoppedd1[line] = is_stop_d1;
-          if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterD1 barcode " << line << " positive is_stop_d1 =  "<< is_stop_d1;
-        } else  if ( direction == -1 && m_beamlineD12 != nullptr ){
-          part->computePath( m_beamlineD12 );
-          is_stop_d1 = part->stopped( m_beamlineD12 );
+          if (m_verbosity)
+            LogDebug("HectorEventProcessing")
+                << "Hector:filterD1 barcode " << line << " positive is_stop_d1 =  " << is_stop_d1;
+        } else if (direction == -1 && m_beamlineD12 != nullptr) {
+          part->computePath(m_beamlineD12);
+          is_stop_d1 = part->stopped(m_beamlineD12);
           m_isStoppedd1[line] = is_stop_d1;
-          if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterD1 barcode " << line << " negative is_stop_d1 =  "<< is_stop_d1;
+          if (m_verbosity)
+            LogDebug("HectorEventProcessing")
+                << "Hector:filterD1 barcode " << line << " negative is_stop_d1 =  " << is_stop_d1;
         } else {
           is_stop_d1 = true;
           m_isStoppedd1[line] = is_stop_d1;
-          if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterD1 barcode " << line << " 0        is_stop_d1 =  "<< is_stop_d1;
+          if (m_verbosity)
+            LogDebug("HectorEventProcessing")
+                << "Hector:filterD1 barcode " << line << " 0        is_stop_d1 =  " << is_stop_d1;
         }
-        //propagating
-        if (!is_stop_d1 ) {
-          part->propagate( lengthd1 );
+        // propagating
+        if (!is_stop_d1) {
+          part->propagate(lengthd1);
           x1_d1 = part->getX();
           y1_d1 = part->getY();
-          m_xAtTrPoint[line]  = x1_d1;
-          m_yAtTrPoint[line]  = y1_d1;
+          m_xAtTrPoint[line] = x1_d1;
+          m_yAtTrPoint[line] = y1_d1;
           m_TxAtTrPoint[line] = part->getTX();
           m_TyAtTrPoint[line] = part->getTY();
-          m_eAtTrPoint[line]  = part->getE();
+          m_eAtTrPoint[line] = part->getE();
         }
-      }// if stopzdc
+      }  // if stopzdc
       else {
-        m_isStoppedd1[line] = false;// not stopped in propagating to ZDC and therefore in  propagation to D1 too.
-        if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector:filterD1: barcode = " << line << " isStopped=" << (*m_isStoppedd1.find(line)).second;
+        m_isStoppedd1[line] = false;  // not stopped in propagating to ZDC and
+                                      // therefore in  propagation to D1 too.
+        if (m_verbosity)
+          LogDebug("HectorEventProcessing")
+              << "Hector:filterD1: barcode = " << line << " isStopped=" << (*m_isStoppedd1.find(line)).second;
       }
-      
-    } // for (it = m_beamPart.begin(); it != m_beamPart.end(); it++ ) 
-  } // if ( m_beamPart.size() )
-  
+
+    }  // for (it = m_beamPart.begin(); it != m_beamPart.end(); it++ )
+  }    // if ( m_beamPart.size() )
 }
 
-int  Hector::getDirect( unsigned int part_n ) const {
-  std::map<unsigned int, int>::const_iterator it = m_direct.find( part_n );
-  if ( it != m_direct.end() ){
+int Hector::getDirect(unsigned int part_n) const {
+  std::map<unsigned int, int>::const_iterator it = m_direct.find(part_n);
+  if (it != m_direct.end()) {
     return (*it).second;
   }
   return 0;
 }
 
 void Hector::print() const {
-  for (std::map<unsigned int,H_BeamParticle*>::const_iterator it = m_beamPart.begin(); it != m_beamPart.end(); ++it ) {
+  for (std::map<unsigned int, H_BeamParticle *>::const_iterator it = m_beamPart.begin(); it != m_beamPart.end(); ++it) {
     (*it).second->printProperties();
   };
 }
 
-
-HepMC::GenEvent * Hector::addPartToHepMC( HepMC::GenEvent * evt ){
-
+HepMC::GenEvent *Hector::addPartToHepMC(HepMC::GenEvent *evt) {
   theCorrespondenceMap.clear();
-  
+
   unsigned int line;
 
-  HepMC::GenParticle * gpart;
-  long double tx,ty,theta,fi,energy,time = 0;
-  std::map< unsigned int, H_BeamParticle* >::iterator it;
-  
-  
-  for (it = m_beamPart.begin(); it != m_beamPart.end(); ++it ) {
+  HepMC::GenParticle *gpart;
+  long double tx, ty, theta, fi, energy, time = 0;
+  std::map<unsigned int, H_BeamParticle *>::iterator it;
+
+  for (it = m_beamPart.begin(); it != m_beamPart.end(); ++it) {
     line = (*it).first;
-    if(!m_FP420Transport) m_isStoppedfp420[line] = true;
-    if(!m_ZDCTransport) {m_isStoppedzdc[line] = false;m_isStoppedd1[line] = true;}
-    if(m_verbosity) {
+    if (!m_FP420Transport)
+      m_isStoppedfp420[line] = true;
+    if (!m_ZDCTransport) {
+      m_isStoppedzdc[line] = false;
+      m_isStoppedd1[line] = true;
+    }
+    if (m_verbosity) {
       LogDebug("HectorEventProcessing") << "Hector:addPartToHepMC: barcode = " << line << "\n"
-                                        << "Hector:addPartToHepMC: isStoppedfp420=" << (*m_isStoppedfp420.find(line)).second << "\n"
-                                        << "Hector:addPartToHepMC: isStoppedzdc=" << (*m_isStoppedzdc.find(line)).second << "\n"
+                                        << "Hector:addPartToHepMC: isStoppedfp420="
+                                        << (*m_isStoppedfp420.find(line)).second << "\n"
+                                        << "Hector:addPartToHepMC: isStoppedzdc=" << (*m_isStoppedzdc.find(line)).second
+                                        << "\n"
                                         << "Hector:addPartToHepMC: isStoppedd1=" << (*m_isStoppedd1.find(line)).second;
     }
-    if (!((*m_isStoppedfp420.find(line)).second) || (!((*m_isStoppedd1.find(line)).second) && ((*m_isStoppedzdc.find(line)).second))){
-
-      gpart = evt->barcode_to_particle( line );
-      if ( gpart ) {
-        tx     = (*m_TxAtTrPoint.find(line)).second / 1000000.;
-        ty     = (*m_TyAtTrPoint.find(line)).second / 1000000.;
-        theta  = sqrt((tx*tx) + (ty*ty));
+    if (!((*m_isStoppedfp420.find(line)).second) ||
+        (!((*m_isStoppedd1.find(line)).second) && ((*m_isStoppedzdc.find(line)).second))) {
+      gpart = evt->barcode_to_particle(line);
+      if (gpart) {
+        tx = (*m_TxAtTrPoint.find(line)).second / 1000000.;
+        ty = (*m_TyAtTrPoint.find(line)).second / 1000000.;
+        theta = sqrt((tx * tx) + (ty * ty));
         double ddd = 0.;
-        if ( !((*m_isStoppedfp420.find(line)).second)) {
-          if( (*m_direct.find( line )).second >0 ) {
+        if (!((*m_isStoppedfp420.find(line)).second)) {
+          if ((*m_direct.find(line)).second > 0) {
             ddd = m_rpp420_f;
-          }
-          else if((*m_direct.find( line )).second <0 ) {
+          } else if ((*m_direct.find(line)).second < 0) {
             ddd = m_rpp420_b;
-            theta= TMath::Pi()-theta;
+            theta = TMath::Pi() - theta;
           }
-        }
-        else {
+        } else {
           ddd = lengthd1;
-          if((*m_direct.find( line )).second <0 ) theta= TMath::Pi()-theta;
+          if ((*m_direct.find(line)).second < 0)
+            theta = TMath::Pi() - theta;
         }
-	
-        fi     = std::atan2(tx,ty); // tx, ty never == 0?
+
+        fi = std::atan2(tx, ty);  // tx, ty never == 0?
         energy = (*m_eAtTrPoint.find(line)).second;
-	
-        time = ( ddd*meter - gpart->production_vertex()->position().z()*mm ); // mm
-
-        if(ddd != 0.) {
-          if(m_verbosity) {
-            LogDebug("HectorEventProcessing") <<"Hector:: x= "<< (*(m_xAtTrPoint.find(line))).second*0.001<< "\n"
-                                              <<"Hector:: y= "<< (*(m_yAtTrPoint.find(line))).second*0.001<< "\n"
-                                              <<"Hector:: z= "<< ddd * (*(m_direct.find( line ))).second*1000. << "\n"
-                                              <<"Hector:: t= "<< time;
+
+        time = (ddd * meter - gpart->production_vertex()->position().z() * mm);  // mm
+
+        if (ddd != 0.) {
+          if (m_verbosity) {
+            LogDebug("HectorEventProcessing") << "Hector:: x= " << (*(m_xAtTrPoint.find(line))).second * 0.001 << "\n"
+                                              << "Hector:: y= " << (*(m_yAtTrPoint.find(line))).second * 0.001 << "\n"
+                                              << "Hector:: z= " << ddd * (*(m_direct.find(line))).second * 1000. << "\n"
+                                              << "Hector:: t= " << time;
           }
-	  
-          HepMC::GenVertex * vert = new HepMC::GenVertex( HepMC::FourVector( (*(m_xAtTrPoint.find(line))).second*0.001,
-                                                                             (*(m_yAtTrPoint.find(line))).second*0.001,
-                                                                             ddd * (*(m_direct.find( line ))).second*1000.,
-                                                                             time + .001*time ) );
-	  
-          gpart->set_status( 2 );
-          vert->add_particle_in( gpart );
-          vert->add_particle_out( new HepMC::GenParticle( HepMC::FourVector(energy*std::sin(theta)*std::sin(fi),
-                                                                            energy*std::sin(theta)*std::cos(fi),
-                                                                            energy*std::cos(theta),
-                                                                            energy ),
-                                                          gpart->pdg_id(), 1, gpart->flow() ) );
-          evt->add_vertex( vert );
+
+          HepMC::GenVertex *vert = new HepMC::GenVertex(HepMC::FourVector((*(m_xAtTrPoint.find(line))).second * 0.001,
+                                                                          (*(m_yAtTrPoint.find(line))).second * 0.001,
+                                                                          ddd * (*(m_direct.find(line))).second * 1000.,
+                                                                          time + .001 * time));
+
+          gpart->set_status(2);
+          vert->add_particle_in(gpart);
+          vert->add_particle_out(new HepMC::GenParticle(HepMC::FourVector(energy * std::sin(theta) * std::sin(fi),
+                                                                          energy * std::sin(theta) * std::cos(fi),
+                                                                          energy * std::cos(theta),
+                                                                          energy),
+                                                        gpart->pdg_id(),
+                                                        1,
+                                                        gpart->flow()));
+          evt->add_vertex(vert);
 
           int ingoing = (*vert->particles_in_const_begin())->barcode();
           int outgoing = (*vert->particles_out_const_begin())->barcode();
-          LHCTransportLink theLink(ingoing,outgoing);
-          if (m_verbosity) LogDebug("HectorEventProcessing") << "Hector:addPartToHepMC: LHCTransportLink " << theLink;
+          LHCTransportLink theLink(ingoing, outgoing);
+          if (m_verbosity)
+            LogDebug("HectorEventProcessing") << "Hector:addPartToHepMC: LHCTransportLink " << theLink;
           theCorrespondenceMap.push_back(theLink);
 
-          if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector::TRANSPORTED pz= " << gpart->momentum().pz()  
-                                                                 << " eta= "<< gpart->momentum().eta()  
-                                                                 << " status= "<< gpart->status();
-	  
-	  
-        }// ddd
-      }// if gpart
-    }// if !isStopped
-    
+          if (m_verbosity)
+            LogDebug("HectorEventProcessing") << "Hector::TRANSPORTED pz= " << gpart->momentum().pz()
+                                              << " eta= " << gpart->momentum().eta() << " status= " << gpart->status();
+
+        }  // ddd
+      }    // if gpart
+    }      // if !isStopped
+
     else {
-      gpart = evt->barcode_to_particle( line );
-      if ( gpart ) {
+      gpart = evt->barcode_to_particle(line);
+      if (gpart) {
         //        HepMC::GenVertex * vert= new HepMC::GenVertex();
-        gpart->set_status( 2 );
+        gpart->set_status(2);
         //        vert->add_particle_in( gpart );
         //        vert->add_particle_out( gpart );
         //        evt->add_vertex( vert );
-        if(m_verbosity) LogDebug("HectorEventProcessing") << "Hector::NON-transp. pz= " << gpart->momentum().pz()  
-                                                               << " eta= "<< gpart->momentum().eta()  
-                                                               << " status= "<< gpart->status();
+        if (m_verbosity)
+          LogDebug("HectorEventProcessing") << "Hector::NON-transp. pz= " << gpart->momentum().pz()
+                                            << " eta= " << gpart->momentum().eta() << " status= " << gpart->status();
       }
     }
 
-  }//for 
-  
+  }  // for
+
   return evt;
-} 
+}
diff --git a/SimTransport/HectorProducer/src/HectorProducer.cc b/SimTransport/HectorProducer/src/HectorProducer.cc
index ae86764770bf4..00305673d4ecf 100644
--- a/SimTransport/HectorProducer/src/HectorProducer.cc
+++ b/SimTransport/HectorProducer/src/HectorProducer.cc
@@ -1,11 +1,11 @@
 // Framework headers
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 #include "FWCore/Utilities/interface/InputTag.h"
+#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
 #include "IOMC/RandomEngine/src/TRandomAdaptor.h"
 
 // SimpleConfigurable replacement
@@ -15,12 +15,12 @@
 #include "HepMC/GenEvent.h"
 
 // Hector headers
-#include "SimTransport/HectorProducer/interface/HectorProducer.h"
 #include "SimTransport/HectorProducer/interface/Hector.h"
+#include "SimTransport/HectorProducer/interface/HectorProducer.h"
 
 // SimDataFormats headers
-#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "SimDataFormats/Forward/interface/LHCTransportLinkContainer.h"
+#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 
 #include <CLHEP/Random/RandomEngine.h>
 
@@ -30,106 +30,99 @@
 
 class TRandom3;
 
-HectorProducer::HectorProducer(edm::ParameterSet const & p):
-  m_HepMC(consumes<edm::HepMCProduct>(p.getParameter<edm::InputTag>("HepMCProductLabel")))
-{
-  m_verbosity      = p.getParameter<bool>("Verbosity");
+HectorProducer::HectorProducer(edm::ParameterSet const &p)
+    : m_HepMC(consumes<edm::HepMCProduct>(p.getParameter<edm::InputTag>("HepMCProductLabel"))) {
+  m_verbosity = p.getParameter<bool>("Verbosity");
   m_FP420Transport = p.getParameter<bool>("FP420Transport");
-  m_ZDCTransport   = p.getParameter<bool>("ZDCTransport");
-  m_evtAnalysed    = 0;
+  m_ZDCTransport = p.getParameter<bool>("ZDCTransport");
+  m_evtAnalysed = 0;
 
   produces<edm::HepMCProduct>();
   produces<edm::LHCTransportLinkContainer>();
 
   m_Hector = new Hector(p, m_verbosity, m_FP420Transport, m_ZDCTransport);
-  
+
   edm::Service<edm::RandomNumberGenerator> rng;
-  if ( ! rng.isAvailable() ) {
-    throw cms::Exception("Configuration")
-      << "LHCTransport (HectorProducer) requires the RandomNumberGeneratorService\n"
-         "which is not present in the configuration file.  You must add the service\n"
-         "in the configuration file or remove the modules that require it.";
+  if (!rng.isAvailable()) {
+    throw cms::Exception("Configuration") << "LHCTransport (HectorProducer) requires the "
+                                             "RandomNumberGeneratorService\n"
+                                             "which is not present in the configuration file.  You must add the "
+                                             "service\n"
+                                             "in the configuration file or remove the modules that require it.";
   }
-  edm::LogInfo("SimTransportHectorProducer") << "Hector is created"; 
+  edm::LogInfo("SimTransportHectorProducer") << "Hector is created";
 }
 
 HectorProducer::~HectorProducer() {}
 
-void HectorProducer::beginRun(const edm::Run & r,const edm::EventSetup& c) {}
-
-void HectorProducer::endRun(const edm::Run & r,const edm::EventSetup& c) {}
+void HectorProducer::beginRun(const edm::Run &r, const edm::EventSetup &c) {}
 
-void HectorProducer::produce(edm::Event & iEvent, const edm::EventSetup & es){
+void HectorProducer::endRun(const edm::Run &r, const edm::EventSetup &c) {}
 
+void HectorProducer::produce(edm::Event &iEvent, const edm::EventSetup &es) {
   edm::Service<edm::RandomNumberGenerator> rng;
-  CLHEP::HepRandomEngine* engine = &rng->getEngine(iEvent.streamID());
-  if ( engine->name() != "TRandom3" ) {
-    throw cms::Exception("Configuration")
-      << "The TRandom3 engine type must be used with HectorProducer, "
-      << "Random Number Generator Service not correctly configured!";
+  CLHEP::HepRandomEngine *engine = &rng->getEngine(iEvent.streamID());
+  if (engine->name() != "TRandom3") {
+    throw cms::Exception("Configuration") << "The TRandom3 engine type must be used with HectorProducer, "
+                                          << "Random Number Generator Service not correctly configured!";
   }
-  TRandom3* rootEngine = ( (edm::TRandomAdaptor*) engine )->getRootEngine();
+  TRandom3 *rootEngine = ((edm::TRandomAdaptor *)engine)->getRootEngine();
 
   ++m_evtAnalysed;
 
-  edm::LogInfo("SimTransportHectorProducer") << "produce evt " << m_evtAnalysed; 
-  
-  edm::Handle<edm::HepMCProduct>  HepMCEvt;   
+  edm::LogInfo("SimTransportHectorProducer") << "produce evt " << m_evtAnalysed;
+
+  edm::Handle<edm::HepMCProduct> HepMCEvt;
   iEvent.getByToken(m_HepMC, HepMCEvt);
-  
-  if ( !HepMCEvt.isValid() )
-    {
-      throw cms::Exception("InvalidReference")
-        << "Invalid reference to HepMCProduct\n";
-    }
-  
-  if ( HepMCEvt.provenance()->moduleLabel() == "LHCTransport" )
-    {
-      throw cms::Exception("LogicError")
-        << "HectorTrasported HepMCProduce already exists\n";
-    }
-
-  evt_ = new HepMC::GenEvent( *HepMCEvt->GetEvent() );
+
+  if (!HepMCEvt.isValid()) {
+    throw cms::Exception("InvalidReference") << "Invalid reference to HepMCProduct\n";
+  }
+
+  if (HepMCEvt.provenance()->moduleLabel() == "LHCTransport") {
+    throw cms::Exception("LogicError") << "HectorTrasported HepMCProduce already exists\n";
+  }
+
+  evt_ = new HepMC::GenEvent(*HepMCEvt->GetEvent());
   m_Hector->clearApertureFlags();
-  if(m_FP420Transport) {
+  if (m_FP420Transport) {
     m_Hector->clear();
-    m_Hector->add( evt_ ,es);
+    m_Hector->add(evt_, es);
     m_Hector->filterFP420(rootEngine);
   }
-  if(m_ZDCTransport) {
+  if (m_ZDCTransport) {
     m_Hector->clear();
-    m_Hector->add( evt_ ,es);
+    m_Hector->add(evt_, es);
     m_Hector->filterZDC(rootEngine);
-    
+
     m_Hector->clear();
-    m_Hector->add( evt_ ,es);
+    m_Hector->add(evt_, es);
     m_Hector->filterD1(rootEngine);
   }
-  evt_ = m_Hector->addPartToHepMC( evt_ );
+  evt_ = m_Hector->addPartToHepMC(evt_);
   if (m_verbosity) {
     evt_->print();
   }
 
-  edm::LogInfo("SimTransportHectorProducer") << "new HepMC product "; 
-  
+  edm::LogInfo("SimTransportHectorProducer") << "new HepMC product ";
+
   unique_ptr<edm::HepMCProduct> NewProduct(new edm::HepMCProduct());
-  NewProduct->addHepMCData( evt_ ) ;
-  
+  NewProduct->addHepMCData(evt_);
+
   iEvent.put(std::move(NewProduct));
 
-  edm::LogInfo("SimTransportHectorProducer") << "new LHCTransportLinkContainer "; 
+  edm::LogInfo("SimTransportHectorProducer") << "new LHCTransportLinkContainer ";
   unique_ptr<edm::LHCTransportLinkContainer> NewCorrespondenceMap(new edm::LHCTransportLinkContainer());
   edm::LHCTransportLinkContainer thisLink(m_Hector->getCorrespondenceMap());
   (*NewCorrespondenceMap).swap(thisLink);
 
-  if ( m_verbosity ) {
-    for ( unsigned int i = 0; i < (*NewCorrespondenceMap).size(); i++) 
+  if (m_verbosity) {
+    for (unsigned int i = 0; i < (*NewCorrespondenceMap).size(); i++)
       LogDebug("HectorEventProcessing") << "Hector correspondence table: " << (*NewCorrespondenceMap)[i];
   }
 
   iEvent.put(std::move(NewCorrespondenceMap));
-  edm::LogInfo("SimTransportHectorProducer") << "produce end "; 
-
+  edm::LogInfo("SimTransportHectorProducer") << "produce end ";
 }
 
-DEFINE_FWK_MODULE (HectorProducer);
+DEFINE_FWK_MODULE(HectorProducer);
diff --git a/SimTransport/PPSProtonTransport/interface/ProtonTransport.h b/SimTransport/PPSProtonTransport/interface/ProtonTransport.h
index 74b72e1113373..30c6e626783fc 100644
--- a/SimTransport/PPSProtonTransport/interface/ProtonTransport.h
+++ b/SimTransport/PPSProtonTransport/interface/ProtonTransport.h
@@ -38,7 +38,7 @@ class ProtonTransport {
             double fCrossingAngle_56;
 
             std::vector<LHCTransportLink> m_CorrespondenceMap;
-            std::map<unsigned int, TLorentzVector*> m_beamPart;
+            std::map<unsigned int, TLorentzVector> m_beamPart;
             std::map<unsigned int, double> m_xAtTrPoint;
             std::map<unsigned int, double> m_yAtTrPoint;
 
diff --git a/SimTransport/PPSProtonTransport/src/HectorTransport.cc b/SimTransport/PPSProtonTransport/src/HectorTransport.cc
index 0f1aaf34b0e11..4483c7ec03b38 100644
--- a/SimTransport/PPSProtonTransport/src/HectorTransport.cc
+++ b/SimTransport/PPSProtonTransport/src/HectorTransport.cc
@@ -47,10 +47,6 @@ HectorTransport::HectorTransport(const edm::ParameterSet & param, bool verbosity
          <<"             Bulding LHC Proton transporter based on HECTOR model\n"
          <<"=============================================================================\n";
     setBeamLine();
-    PPSTools::fBeamMomentum=fBeamMomentum;
-    PPSTools::fBeamEnergy=fBeamEnergy;
-    PPSTools::fCrossingAngleBeam1=fCrossingAngle_56;
-    PPSTools::fCrossingAngleBeam2=fCrossingAngle_45;
     fPPSRegionStart_56=m_b_ctpps_b;
     fPPSRegionStart_45=m_f_ctpps_f;
 }
@@ -69,7 +65,6 @@ void HectorTransport::process( const HepMC::GenEvent * ev , const edm::EventSetu
 bool HectorTransport::transportProton(const HepMC::GenParticle* gpart)
 {
      edm::LogInfo("ProtonTransport")<<"Starting proton transport using HECTOR method\n";
-     H_BeamParticle* h_p  = nullptr;
 
      double px,py,pz,e;
      unsigned int line = (gpart)->barcode();
@@ -87,18 +82,20 @@ bool HectorTransport::transportProton(const HepMC::GenParticle* gpart)
      int direction = (pz>0)?1:-1;
 
      // Apply Beam and Crossing Angle Corrections
-     TLorentzVector* p_out = new TLorentzVector(px,py,pz,e);
-     PPSTools::LorentzBoost(*p_out,"LAB");
+     TLorentzVector p_out(px,py,pz,e);
+     PPSTools::LorentzBoost(p_out,"LAB", {fCrossingAngle_56 ,//Beam1
+           fCrossingAngle_45, //Beam2
+           fBeamMomentum,fBeamEnergy});
 
-     ApplyBeamCorrection(*p_out);
+     ApplyBeamCorrection(p_out);
 
      // from mm to cm        
      double XforPosition = gpart->production_vertex()->position().x()/cm;//cm
      double YforPosition = gpart->production_vertex()->position().y()/cm;//cm
      double ZforPosition = gpart->production_vertex()->position().z()/cm;//cm
 
-     h_p = new H_BeamParticle(mass,charge);
-     h_p->set4Momentum(-direction*p_out->Px(), p_out->Py(), fabs(p_out->Pz()), p_out->E());
+     H_BeamParticle h_p(mass,charge);
+     h_p.set4Momentum(-direction*p_out.Px(), p_out.Py(), fabs(p_out.Pz()), p_out.E());
 // shift the beam position to the given beam position at IP (in cm)
      XforPosition=(XforPosition-fVtxMeanX)+fBeamXatIP*mm_to_cm;
      YforPosition=(YforPosition-fVtxMeanY)+fBeamYatIP*mm_to_cm;
@@ -106,15 +103,15 @@ bool HectorTransport::transportProton(const HepMC::GenParticle* gpart)
 //
 // shift the starting position of the track to Z=0 if configured so (all the variables below are still in cm)
      if (bApplyZShift) {
-        double fCrossingAngle = (p_out->Pz()>0)?fCrossingAngle_45:-fCrossingAngle_56;
-        XforPosition = XforPosition+(tan((long double)fCrossingAngle*urad)-((long double)p_out->Px())/((long double)p_out->Pz()))*ZforPosition;
-        YforPosition = YforPosition-((long double)p_out->Py())/((long double)p_out->Pz())*ZforPosition;
+        double fCrossingAngle = (p_out.Pz()>0)?fCrossingAngle_45:-fCrossingAngle_56;
+        XforPosition = XforPosition+(tan((long double)fCrossingAngle*urad)-((long double)p_out.Px())/((long double)p_out.Pz()))*ZforPosition;
+        YforPosition = YforPosition-((long double)p_out.Py())/((long double)p_out.Pz())*ZforPosition;
         ZforPosition = 0.;
      }
 
 //
 // set position, but do not invert the coordinate for the angles (TX,TY) because it is done by set4Momentum
-     h_p->setPosition(-direction*XforPosition*cm_to_um,YforPosition*cm_to_um,h_p->getTX(),h_p->getTY(),-direction*ZforPosition*cm_to_m);
+     h_p.setPosition(-direction*XforPosition*cm_to_um,YforPosition*cm_to_um,h_p.getTX(),h_p.getTY(),-direction*ZforPosition*cm_to_m);
      bool is_stop;
      float x1_ctpps;
      float y1_ctpps;
@@ -130,29 +127,23 @@ bool HectorTransport::transportProton(const HepMC::GenParticle* gpart)
                       break;
      }
      // insert protection for NULL beamlines here
-     h_p->computePath(&*_beamline);
-     is_stop = h_p->stopped(&*_beamline);
+     h_p.computePath(&*_beamline);
+     is_stop = h_p.stopped(&*_beamline);
      if(m_verbosity) LogDebug("HectorTransportEventProcessing") << "HectorTransport:filterPPS: barcode = "
              << line << " is_stop=  "<< is_stop;
-     if (p_out) {
-       delete p_out;
-       p_out = nullptr;
-     } 
      if (is_stop) {
-       delete h_p;
-       h_p=nullptr;
        return false;
      }
      //
      //propagating
      //
-     h_p->propagate( _targetZ );
+     h_p.propagate( _targetZ );
 
-     p_out = new TLorentzVector(PPSTools::HectorParticle2LorentzVector(*h_p,direction));
+     p_out = PPSTools::HectorParticle2LorentzVector(h_p,direction);
 
-     p_out->SetPx(direction*p_out->Px());
-     x1_ctpps = direction*h_p->getX()*um_to_mm; 
-     y1_ctpps = h_p->getY()*um_to_mm;
+     p_out.SetPx(direction*p_out.Px());
+     x1_ctpps = direction*h_p.getX()*um_to_mm; 
+     y1_ctpps = h_p.getY()*um_to_mm;
 
      if(m_verbosity) LogDebug("HectorTransportEventProcessing") <<
              "HectorTransport:filterPPS: barcode = " << line << " x=  "<< x1_ctpps <<" y= " << y1_ctpps;
@@ -160,8 +151,6 @@ bool HectorTransport::transportProton(const HepMC::GenParticle* gpart)
      m_beamPart[line]    = p_out;
      m_xAtTrPoint[line]  = x1_ctpps;
      m_yAtTrPoint[line]  = y1_ctpps;
-     delete p_out; p_out = nullptr;
-     delete h_p; h_p = nullptr;
      return true;
 }
 void HectorTransport::genProtonsLoop( const HepMC::GenEvent * evt ,const edm::EventSetup & iSetup)
diff --git a/SimTransport/PPSProtonTransport/src/ProtonTransport.cc b/SimTransport/PPSProtonTransport/src/ProtonTransport.cc
index 9e251fd9c374f..838e74feca791 100644
--- a/SimTransport/PPSProtonTransport/src/ProtonTransport.cc
+++ b/SimTransport/PPSProtonTransport/src/ProtonTransport.cc
@@ -8,7 +8,6 @@ ProtonTransport::ProtonTransport() {};
 ProtonTransport::~ProtonTransport() {};
 void ProtonTransport::clear()
 {
-     for (std::map<unsigned int,TLorentzVector* >::iterator it = m_beamPart.begin(); it != m_beamPart.end(); ++it ) delete (*it).second;
      m_beamPart.clear(); m_xAtTrPoint.clear(); m_yAtTrPoint.clear();
 };
 
@@ -16,14 +15,13 @@ void ProtonTransport::addPartToHepMC( HepMC::GenEvent * evt )
 {
     NEvent++;
     m_CorrespondenceMap.clear();
-    std::map< unsigned int, TLorentzVector* >::iterator it;
 
     int direction=0;
     HepMC::GenParticle * gpart;
 
     unsigned int line;
 
-    for( auto it : m_beamPart ) {
+    for( auto const& it : m_beamPart ) {
         line = (it ).first;
         gpart = evt->barcode_to_particle( line );
 
@@ -43,7 +41,7 @@ void ProtonTransport::addPartToHepMC( HepMC::GenEvent * evt )
                         <<"ProtonTransport:: z= "<< ddd * direction*m_to_mm << "\n"
                         <<"ProtonTransport:: t= "<< time;
         }
-        TLorentzVector* p_out = (it).second;
+        TLorentzVector const& p_out = (it).second;
 
         HepMC::GenVertex * vert = new HepMC::GenVertex(
                         HepMC::FourVector( (*(m_xAtTrPoint.find(line))).second,
@@ -52,7 +50,7 @@ void ProtonTransport::addPartToHepMC( HepMC::GenEvent * evt )
 
         gpart->set_status( 2 );
         vert->add_particle_in( gpart );
-        vert->add_particle_out( new HepMC::GenParticle( HepMC::FourVector(p_out->Px(),p_out->Py(),p_out->Pz(),p_out->E()), gpart->pdg_id(), 1, gpart->flow() )) ;
+        vert->add_particle_out( new HepMC::GenParticle( HepMC::FourVector(p_out.Px(),p_out.Py(),p_out.Pz(),p_out.E()), gpart->pdg_id(), 1, gpart->flow() )) ;
         evt->add_vertex( vert );
 
         int ingoing = (*vert->particles_in_const_begin())->barcode();
diff --git a/SimTransport/PPSProtonTransport/src/TotemTransport.cc b/SimTransport/PPSProtonTransport/src/TotemTransport.cc
index e385686af719d..e302a25df53a0 100644
--- a/SimTransport/PPSProtonTransport/src/TotemTransport.cc
+++ b/SimTransport/PPSProtonTransport/src/TotemTransport.cc
@@ -134,7 +134,7 @@ bool TotemTransport::transportProton( const HepMC::GenParticle* in_trk)
      double py = out_momentum[1];  // this need to be checked again, since it seems an invertion is occuring in  the prop.
      double pz = out_momentum[2];
      double e = sqrt(px*px+py*py+pz*pz+ProtonMassSQ);
-     TLorentzVector* p_out = new TLorentzVector(px,py,pz,e);
+     TLorentzVector p_out(px,py,pz,e);
      double x1_ctpps = -out_position[0]*meter; // Totem parameterization uses meter, one need it in millimeter
      double y1_ctpps = -out_position[1]*meter;
 
diff --git a/SimTransport/TotemRPProtonTransportParametrization/interface/LHCOpticsApproximator.h b/SimTransport/TotemRPProtonTransportParametrization/interface/LHCOpticsApproximator.h
index 848a7c6e87d06..3d80ec5f0cb19 100644
--- a/SimTransport/TotemRPProtonTransportParametrization/interface/LHCOpticsApproximator.h
+++ b/SimTransport/TotemRPProtonTransportParametrization/interface/LHCOpticsApproximator.h
@@ -11,13 +11,12 @@
 
 #include "SimTransport/TotemRPProtonTransportParametrization/interface/TMultiDimFet.h"
 
-struct MadKinematicDescriptor
-{
-	double x;         ///< m
-	double theta_x;   ///< rad
-	double y;         ///< m
-	double theta_y;   ///< rad
-	double ksi;       ///< 1
+struct MadKinematicDescriptor {
+  double x;        ///< m
+  double theta_x;  ///< rad
+  double y;        ///< m
+  double theta_y;  ///< rad
+  double ksi;      ///< 1
 };
 
 class LHCApertureApproximator;
@@ -27,138 +26,207 @@ class LHCApertureApproximator;
  * 5 phase space variables are taken in to configuration: x, y, theta_x, theta_y, xi
  * xi < 0 for momentum losses (that is for diffractive protons)
 **/
-class LHCOpticsApproximator : public TNamed
-{
+class LHCOpticsApproximator : public TNamed {
 public:
-	LHCOpticsApproximator();
-	/// begin and end position along the beam of the particle to transport, training_tree, prefix of data branch in the tree
-	LHCOpticsApproximator(std::string name, std::string title, TMultiDimFet::EMDFPolyType polynom_type,
-						  std::string beam_direction, double nominal_beam_momentum);
-	LHCOpticsApproximator(const LHCOpticsApproximator &org);
-	const LHCOpticsApproximator & operator=(const LHCOpticsApproximator &org);
-
-	enum polynomials_selection{AUTOMATIC, PREDEFINED};
-	enum beam_type{lhcb1, lhcb2};
-	void Train(TTree *inp_tree, std::string data_prefix = std::string("def"), polynomials_selection mode = PREDEFINED, int max_degree_x = 10, int max_degree_tx = 10, int max_degree_y = 10, int max_degree_ty = 10, bool common_terms = false, double *prec=nullptr);
-	void Test(TTree *inp_tree, TFile *f_out, std::string data_prefix = std::string("def"), std::string base_out_dir = std::string(""));
-	void TestAperture(TTree *in_tree, TTree *out_tree);  ///< x, theta_x, y, theta_y, ksi, mad_accepted, parametriz_accepted
-
-	double ParameterOutOfRangePenalty(double par_m[], bool invert_beam_coord_sytems=true) const;
-
-	/// Basic 3D transport method
-	/// MADX canonical variables
-	/// IN/OUT: (x, theta_x, y, theta_y, xi) [m, rad, m, rad, 1]
-	/// returns true if transport possible
-	/// if theta is calculated from momentum p, use theta_x = p.x() / p.mag() and theta_y = p.y() / p.mag()
-	bool Transport(const double *in, double *out, bool check_apertures=false, bool invert_beam_coord_sytems=true) const;
-	bool Transport(const MadKinematicDescriptor *in, MadKinematicDescriptor *out, bool check_apertures=false, bool invert_beam_coord_sytems=true) const;  //return true if transport possible
-
-	/// Basic 2D transport method
-	/// MADX canonical variables
-	/// IN : (x, theta_x, y, theta_y, xi) [m, rad, m, rad, 1]
-	/// OUT : (x, y) [m, m]
-	/// returns true if transport possible
-	bool Transport2D(const double *in, double *out, bool check_apertures=false, bool invert_beam_coord_sytems=true) const;
-
-	bool Transport_m_GeV(double in_pos[3], double in_momentum[3], double out_pos[3], double out_momentum[3],
-						 bool check_apertures, double z2_z1_dist) const;  ///< pos, momentum: x,y,z;  pos in m, momentum in GeV/c
-
-	void PrintInputRange();
-	bool CheckInputRange(const double *in, bool invert_beam_coord_sytems=true) const;
-	void AddRectEllipseAperture(const LHCOpticsApproximator &in, double rect_x, double rect_y, double r_el_x, double r_el_y);
-	void PrintOpticalFunctions();
-	void PrintCoordinateOpticalFunctions(TMultiDimFet &parametrization, const std::string &coord_name, const std::vector<std::string> &input_vars);
-
-	/**
+  LHCOpticsApproximator();
+  /// begin and end position along the beam of the particle to transport, training_tree, prefix of data branch in the tree
+  LHCOpticsApproximator(std::string name,
+                        std::string title,
+                        TMultiDimFet::EMDFPolyType polynom_type,
+                        std::string beam_direction,
+                        double nominal_beam_momentum);
+  LHCOpticsApproximator(const LHCOpticsApproximator &org);
+  const LHCOpticsApproximator &operator=(const LHCOpticsApproximator &org);
+
+  enum polynomials_selection { AUTOMATIC, PREDEFINED };
+  enum beam_type { lhcb1, lhcb2 };
+  void Train(TTree *inp_tree,
+             std::string data_prefix = std::string("def"),
+             polynomials_selection mode = PREDEFINED,
+             int max_degree_x = 10,
+             int max_degree_tx = 10,
+             int max_degree_y = 10,
+             int max_degree_ty = 10,
+             bool common_terms = false,
+             double *prec = nullptr);
+  void Test(TTree *inp_tree,
+            TFile *f_out,
+            std::string data_prefix = std::string("def"),
+            std::string base_out_dir = std::string(""));
+  void TestAperture(TTree *in_tree,
+                    TTree *out_tree);  ///< x, theta_x, y, theta_y, ksi, mad_accepted, parametriz_accepted
+
+  double ParameterOutOfRangePenalty(double par_m[], bool invert_beam_coord_sytems = true) const;
+
+  /// Basic 3D transport method
+  /// MADX canonical variables
+  /// IN/OUT: (x, theta_x, y, theta_y, xi) [m, rad, m, rad, 1]
+  /// returns true if transport possible
+  /// if theta is calculated from momentum p, use theta_x = p.x() / p.mag() and theta_y = p.y() / p.mag()
+  bool Transport(const double *in,
+                 double *out,
+                 bool check_apertures = false,
+                 bool invert_beam_coord_sytems = true) const;
+  bool Transport(const MadKinematicDescriptor *in,
+                 MadKinematicDescriptor *out,
+                 bool check_apertures = false,
+                 bool invert_beam_coord_sytems = true) const;  //return true if transport possible
+
+  /// Basic 2D transport method
+  /// MADX canonical variables
+  /// IN : (x, theta_x, y, theta_y, xi) [m, rad, m, rad, 1]
+  /// OUT : (x, y) [m, m]
+  /// returns true if transport possible
+  bool Transport2D(const double *in,
+                   double *out,
+                   bool check_apertures = false,
+                   bool invert_beam_coord_sytems = true) const;
+
+  bool Transport_m_GeV(double in_pos[3],
+                       double in_momentum[3],
+                       double out_pos[3],
+                       double out_momentum[3],
+                       bool check_apertures,
+                       double z2_z1_dist) const;  ///< pos, momentum: x,y,z;  pos in m, momentum in GeV/c
+
+  void PrintInputRange();
+  bool CheckInputRange(const double *in, bool invert_beam_coord_sytems = true) const;
+  void AddRectEllipseAperture(
+      const LHCOpticsApproximator &in, double rect_x, double rect_y, double r_el_x, double r_el_y);
+  void PrintOpticalFunctions();
+  void PrintCoordinateOpticalFunctions(TMultiDimFet &parametrization,
+                                       const std::string &coord_name,
+                                       const std::vector<std::string> &input_vars);
+
+  /**
      *\brief returns linearised transport matrix for x projection
      * |  dx_out/dx_in    dx_out/dthx_in   |
      * | dthx_out/dx_in  dthx_out/dthx_in  |
      *
      * input:  [m], [rad], xi:-1...0
      */
-	void GetLineariasedTransportMatrixX(double mad_init_x, double mad_init_thx, double mad_init_y, double mad_init_thy,
-										double mad_init_xi, TMatrixD &tr_matrix, double d_mad_x=10e-6, double d_mad_thx=10e-6);
-
-	/**
+  void GetLineariasedTransportMatrixX(double mad_init_x,
+                                      double mad_init_thx,
+                                      double mad_init_y,
+                                      double mad_init_thy,
+                                      double mad_init_xi,
+                                      TMatrixD &tr_matrix,
+                                      double d_mad_x = 10e-6,
+                                      double d_mad_thx = 10e-6);
+
+  /**
      *\brief returns linearised transport matrix for y projection
      * |  dy_out/dy_in    dy_out/dthy_in   |
      * | dthy_out/dy_in  dthy_out/dthy_in  |
      *
      * input:  [m], [rad], xi:-1...0
      */
-	void GetLineariasedTransportMatrixY(
-			double mad_init_x, double mad_init_thx, double mad_init_y, double mad_init_thy,
-			double mad_init_xi, TMatrixD &tr_matrix, double d_mad_y=10e-6, double d_mad_thy=10e-6);
-
-	double GetDx(double mad_init_x, double mad_init_thx, double mad_init_y,
-				 double mad_init_thy, double mad_init_xi, double d_mad_xi=0.001);
-	double GetDxds(double mad_init_x, double mad_init_thx, double mad_init_y,
-				   double mad_init_thy, double mad_init_xi, double d_mad_xi=0.001);
-	inline beam_type GetBeamType() const {return beam;}
-
-	/// returns linear approximation of the transport parameterization
-	/// takes numerical derivatives (see parameter ep) around point `atPoint' (this array has the same structure as `in' parameter in Transport method)
-	/// the linearized transport: x = Cx + Lx*theta_x + vx*x_star
-	void GetLinearApproximation(double atPoint[], double &Cx, double &Lx, double &vx, double &Cy, double &Ly, double &vy, double &D, double ep = 1E-5);
+  void GetLineariasedTransportMatrixY(double mad_init_x,
+                                      double mad_init_thx,
+                                      double mad_init_y,
+                                      double mad_init_thy,
+                                      double mad_init_xi,
+                                      TMatrixD &tr_matrix,
+                                      double d_mad_y = 10e-6,
+                                      double d_mad_thy = 10e-6);
+
+  double GetDx(double mad_init_x,
+               double mad_init_thx,
+               double mad_init_y,
+               double mad_init_thy,
+               double mad_init_xi,
+               double d_mad_xi = 0.001);
+  double GetDxds(double mad_init_x,
+                 double mad_init_thx,
+                 double mad_init_y,
+                 double mad_init_thy,
+                 double mad_init_xi,
+                 double d_mad_xi = 0.001);
+  inline beam_type GetBeamType() const { return beam; }
+
+  /// returns linear approximation of the transport parameterization
+  /// takes numerical derivatives (see parameter ep) around point `atPoint' (this array has the same structure as `in' parameter in Transport method)
+  /// the linearized transport: x = Cx + Lx*theta_x + vx*x_star
+  void GetLinearApproximation(double atPoint[],
+                              double &Cx,
+                              double &Lx,
+                              double &vx,
+                              double &Cy,
+                              double &Ly,
+                              double &vy,
+                              double &D,
+                              double ep = 1E-5);
 
 private:
-	void Init();
-	double s_begin_;                                  ///< begin of transport along the reference orbit
-	double s_end_;                                    ///< end of transport along the reference orbit
-	beam_type beam;
-	double nominal_beam_energy_;                      ///< GeV
-	double nominal_beam_momentum_;                    ///< GeV/c
-	bool trained_;                                    ///< trained polynomials
-	std::vector<TMultiDimFet*> out_polynomials;       //! pointers to polynomials
-	std::vector<std::string> coord_names;
-	std::vector<LHCApertureApproximator> apertures_;  ///< apertures on the way
-
-	#ifndef __CINT_
-	friend class ProtonTransportFunctionsESSource;
-	#endif // __CINT__
-
-	TMultiDimFet x_parametrisation;                   ///< polynomial approximation for x
-	TMultiDimFet theta_x_parametrisation;             ///< polynomial approximation for theta_x
-	TMultiDimFet y_parametrisation;                   ///< polynomial approximation for y
-	TMultiDimFet theta_y_parametrisation;             ///< polynomial approximation for theta_y
-
-	//train_mode mode_;  //polynomial selection mode - selection done by fitting function or selection from the list according to the specified order
-	enum class VariableType {X, THETA_X, Y, THETA_Y};
-	//internal methods
-	void InitializeApproximators(polynomials_selection mode, int max_degree_x, int max_degree_tx, int max_degree_y, int max_degree_ty, bool common_terms);
-	void SetDefaultAproximatorSettings(TMultiDimFet &approximator, VariableType var_type, int max_degree);
-	void SetTermsManually(TMultiDimFet &approximator, VariableType variable, int max_degree, bool common_terms);
-
-	void AllocateErrorHists(TH1D *err_hists[4]);
-	void AllocateErrorInputCorHists(TH2D *err_inp_cor_hists[4][5]);
-	void AllocateErrorOutputCorHists(TH2D *err_out_cor_hists[4][5]);
-
-	void DeleteErrorHists(TH1D *err_hists[4]);
-	void DeleteErrorCorHistograms(TH2D *err_cor_hists[4][5]);
-
-	void FillErrorHistograms(double errors[4], TH1D *err_hists[4]);
-	void FillErrorDataCorHistograms(double errors[4], double var[5], TH2D *err_cor_hists[4][5]);
-
-	void WriteHistograms(TH1D *err_hists[4], TH2D *err_inp_cor_hists[4][5], TH2D *err_out_cor_hists[4][5], TFile *f_out, std::string base_out_dir);
-
-	ClassDef(LHCOpticsApproximator,1) // Proton transport approximator
+  void Init();
+  double s_begin_;  ///< begin of transport along the reference orbit
+  double s_end_;    ///< end of transport along the reference orbit
+  beam_type beam;
+  double nominal_beam_energy_;                  ///< GeV
+  double nominal_beam_momentum_;                ///< GeV/c
+  bool trained_;                                ///< trained polynomials
+  std::vector<TMultiDimFet *> out_polynomials;  //! pointers to polynomials
+  std::vector<std::string> coord_names;
+  std::vector<LHCApertureApproximator> apertures_;  ///< apertures on the way
+
+#ifndef __CINT_
+  friend class ProtonTransportFunctionsESSource;
+#endif  // __CINT__
+
+  TMultiDimFet x_parametrisation;        ///< polynomial approximation for x
+  TMultiDimFet theta_x_parametrisation;  ///< polynomial approximation for theta_x
+  TMultiDimFet y_parametrisation;        ///< polynomial approximation for y
+  TMultiDimFet theta_y_parametrisation;  ///< polynomial approximation for theta_y
+
+  //train_mode mode_;  //polynomial selection mode - selection done by fitting function or selection from the list according to the specified order
+  enum class VariableType { X, THETA_X, Y, THETA_Y };
+  //internal methods
+  void InitializeApproximators(polynomials_selection mode,
+                               int max_degree_x,
+                               int max_degree_tx,
+                               int max_degree_y,
+                               int max_degree_ty,
+                               bool common_terms);
+  void SetDefaultAproximatorSettings(TMultiDimFet &approximator, VariableType var_type, int max_degree);
+  void SetTermsManually(TMultiDimFet &approximator, VariableType variable, int max_degree, bool common_terms);
+
+  void AllocateErrorHists(TH1D *err_hists[4]);
+  void AllocateErrorInputCorHists(TH2D *err_inp_cor_hists[4][5]);
+  void AllocateErrorOutputCorHists(TH2D *err_out_cor_hists[4][5]);
+
+  void DeleteErrorHists(TH1D *err_hists[4]);
+  void DeleteErrorCorHistograms(TH2D *err_cor_hists[4][5]);
+
+  void FillErrorHistograms(double errors[4], TH1D *err_hists[4]);
+  void FillErrorDataCorHistograms(double errors[4], double var[5], TH2D *err_cor_hists[4][5]);
+
+  void WriteHistograms(TH1D *err_hists[4],
+                       TH2D *err_inp_cor_hists[4][5],
+                       TH2D *err_out_cor_hists[4][5],
+                       TFile *f_out,
+                       std::string base_out_dir);
+
+  ClassDef(LHCOpticsApproximator, 1)  // Proton transport approximator
 };
 
-class LHCApertureApproximator : public LHCOpticsApproximator
-{
+class LHCApertureApproximator : public LHCOpticsApproximator {
 public:
-	enum class ApertureType {NO_APERTURE, RECTELLIPSE};
-
-	LHCApertureApproximator();
-	LHCApertureApproximator(const LHCOpticsApproximator &in, double rect_x, double rect_y, double r_el_x, double r_el_y,
-							ApertureType type = ApertureType::RECTELLIPSE);
-
-	bool CheckAperture(const double *in, bool invert_beam_coord_sytems=true) const;  //x, thx. y, thy, ksi
-	//bool CheckAperture(MadKinematicDescriptor *in);  //x, thx. y, thy, ksi
+  enum class ApertureType { NO_APERTURE, RECTELLIPSE };
+
+  LHCApertureApproximator();
+  LHCApertureApproximator(const LHCOpticsApproximator &in,
+                          double rect_x,
+                          double rect_y,
+                          double r_el_x,
+                          double r_el_y,
+                          ApertureType type = ApertureType::RECTELLIPSE);
+
+  bool CheckAperture(const double *in, bool invert_beam_coord_sytems = true) const;  //x, thx. y, thy, ksi
+  //bool CheckAperture(MadKinematicDescriptor *in);  //x, thx. y, thy, ksi
 private:
-	double rect_x_, rect_y_, r_el_x_, r_el_y_;
-	ApertureType ap_type_;
+  double rect_x_, rect_y_, r_el_x_, r_el_y_;
+  ApertureType ap_type_;
 
-	ClassDef(LHCApertureApproximator,1) // Aperture approximator
+  ClassDef(LHCApertureApproximator, 1)  // Aperture approximator
 };
 #endif  //TotemRPProtonTransportParametrization_LHC_OPTICS_APPROXIMATOR_H
diff --git a/SimTransport/TotemRPProtonTransportParametrization/interface/TMultiDimFet.h b/SimTransport/TotemRPProtonTransportParametrization/interface/TMultiDimFet.h
index 251e9f45b0214..a3249bdbce460 100644
--- a/SimTransport/TotemRPProtonTransportParametrization/interface/TMultiDimFet.h
+++ b/SimTransport/TotemRPProtonTransportParametrization/interface/TMultiDimFet.h
@@ -34,198 +34,184 @@
 //class TBrowser;
 
 class TMultiDimFet : public TNamed {
-
 public:
-   enum EMDFPolyType {
-      kMonomials,
-      kChebyshev,
-      kLegendre
-   };
+  enum EMDFPolyType { kMonomials, kChebyshev, kLegendre };
 
 protected:
-
-   TVectorD     fQuantity;             //! Training sample, dependent quantity
-   TVectorD     fSqError;              //! Training sample, error in quantity
-   Double_t     fMeanQuantity;         // Mean of dependent quantity
-   Double_t     fMaxQuantity;          //! Max value of dependent quantity
-   Double_t     fMinQuantity;          //! Min value of dependent quantity
-   Double_t     fSumSqQuantity;        //! SumSquare of dependent quantity
-   Double_t     fSumSqAvgQuantity;     //! Sum of squares away from mean
-
-   TVectorD     fVariables;            //! Training sample, independent variables
-   Int_t        fNVariables;           // Number of independent variables
-   TVectorD     fMeanVariables;        //! mean value of independent variables
-   TVectorD     fMaxVariables;         // max value of independent variables
-   TVectorD     fMinVariables;         // min value of independent variables
-
-   Int_t        fSampleSize;           //! Size of training sample
-
-   TVectorD     fTestQuantity;         //! Test sample, dependent quantity
-   TVectorD     fTestSqError;          //! Test sample, Error in quantity
-   TVectorD     fTestVariables;        //! Test sample, independent variables
-
-   Int_t        fTestSampleSize;       //! Size of test sample
-
-   Double_t     fMinAngle;             //! Min angle for acepting new function
-   Double_t     fMaxAngle;             //! Max angle for acepting new function
-   Int_t        fMaxTerms;             // Max terms expected in final expr.
-   Double_t     fMinRelativeError;     //! Min relative error accepted
-   std::vector<Int_t> fMaxPowers;     //! maximum powers, ex-array
-   Double_t     fPowerLimit;           //! Control parameter
-
-
-   TMatrixD     fFunctions;            //! Functions evaluated over sample
-   Int_t        fMaxFunctions;         // max number of functions
-   std::vector<Int_t> fFunctionCodes;  //! acceptance code, ex-array
-   Int_t        fMaxStudy;             //! max functions to study
-
-   TMatrixD     fOrthFunctions;        //! As above, but orthogonalised
-   TVectorD     fOrthFunctionNorms;    //! Norm of the evaluated functions
-
-
-   std::vector<Int_t> fMaxPowersFinal; //! maximum powers from fit, ex-array
-   Int_t  fMaxFunctionsTimesNVariables; // fMaxFunctionsTimesNVariables
-   std::vector<Int_t> fPowers;         // ex-array
-   std::vector<Int_t> fPowerIndex;     // Index of accepted powers, ex-array
-
-   TVectorD     fResiduals;            //! Vector of the final residuals
-   Double_t     fMaxResidual;          //! Max redsidual value
-   Double_t     fMinResidual;          //! Min redsidual value
-   Int_t        fMaxResidualRow;       //! Row giving max residual
-   Int_t        fMinResidualRow;       //! Row giving min residual
-   Double_t     fSumSqResidual;        //! Sum of Square residuals
-
-   Int_t        fNCoefficients;        // Dimension of model coefficients
-   TVectorD     fOrthCoefficients;     //! The model coefficients
-   TMatrixD     fOrthCurvatureMatrix;  //! Model matrix
-   TVectorD     fCoefficients;         // Vector of the final coefficients
-   TVectorD     fCoefficientsRMS;      //! Vector of RMS of coefficients
-   Double_t     fRMS;                  //! Root mean square of fit
-   Double_t     fChi2;                 //! Chi square of fit
-   Int_t        fParameterisationCode; //! Exit code of parameterisation
-
-   Double_t     fError;                //! Error from parameterization
-   Double_t     fTestError;            //! Error from test
-   Double_t     fPrecision;            //! Relative precision of param
-   Double_t     fTestPrecision;        //! Relative precision of test
-   Double_t     fCorrelationCoeff;     //! Multi Correlation coefficient
-   TMatrixD     fCorrelationMatrix;    //! Correlation matrix
-   Double_t     fTestCorrelationCoeff; //! Multi Correlation coefficient
-
-   TList*       fHistograms;           //! List of histograms
-   Byte_t       fHistogramMask;        //! Bit pattern of hisograms used
-
-   //TVirtualFitter* fFitter;            //! Fit object (MINUIT)
-
-   EMDFPolyType fPolyType;             // Type of polynomials to use
-   Bool_t       fShowCorrelation;      // print correlation matrix
-   Bool_t       fIsUserFunction;       // Flag for user defined function
-   Bool_t       fIsVerbose;            //
-
-   virtual Double_t EvalFactor(Int_t p, Double_t x) const;
-   virtual Double_t EvalControl(const Int_t *powers);
-   virtual void     MakeCoefficientErrors();
-   virtual void     MakeCorrelation();
-   virtual Double_t MakeGramSchmidt(Int_t function);
-   virtual void     MakeCoefficients();
-   virtual void     MakeCandidates();
-   virtual void     MakeNormalized();
-   virtual void     MakeParameterization();
-   virtual void     MakeRealCode(const char *filename,
-                                 const char *classname,
-                                 Option_t   *option="");
-   virtual Bool_t   Select(const Int_t *iv);
-   virtual Bool_t   TestFunction(Double_t squareResidual,
-                                 Double_t dResidur);
+  TVectorD fQuantity;          //! Training sample, dependent quantity
+  TVectorD fSqError;           //! Training sample, error in quantity
+  Double_t fMeanQuantity;      // Mean of dependent quantity
+  Double_t fMaxQuantity;       //! Max value of dependent quantity
+  Double_t fMinQuantity;       //! Min value of dependent quantity
+  Double_t fSumSqQuantity;     //! SumSquare of dependent quantity
+  Double_t fSumSqAvgQuantity;  //! Sum of squares away from mean
+
+  TVectorD fVariables;      //! Training sample, independent variables
+  Int_t fNVariables;        // Number of independent variables
+  TVectorD fMeanVariables;  //! mean value of independent variables
+  TVectorD fMaxVariables;   // max value of independent variables
+  TVectorD fMinVariables;   // min value of independent variables
+
+  Int_t fSampleSize;  //! Size of training sample
+
+  TVectorD fTestQuantity;   //! Test sample, dependent quantity
+  TVectorD fTestSqError;    //! Test sample, Error in quantity
+  TVectorD fTestVariables;  //! Test sample, independent variables
+
+  Int_t fTestSampleSize;  //! Size of test sample
+
+  Double_t fMinAngle;             //! Min angle for acepting new function
+  Double_t fMaxAngle;             //! Max angle for acepting new function
+  Int_t fMaxTerms;                // Max terms expected in final expr.
+  Double_t fMinRelativeError;     //! Min relative error accepted
+  std::vector<Int_t> fMaxPowers;  //! maximum powers, ex-array
+  Double_t fPowerLimit;           //! Control parameter
+
+  TMatrixD fFunctions;                //! Functions evaluated over sample
+  Int_t fMaxFunctions;                // max number of functions
+  std::vector<Int_t> fFunctionCodes;  //! acceptance code, ex-array
+  Int_t fMaxStudy;                    //! max functions to study
+
+  TMatrixD fOrthFunctions;      //! As above, but orthogonalised
+  TVectorD fOrthFunctionNorms;  //! Norm of the evaluated functions
+
+  std::vector<Int_t> fMaxPowersFinal;  //! maximum powers from fit, ex-array
+  Int_t fMaxFunctionsTimesNVariables;  // fMaxFunctionsTimesNVariables
+  std::vector<Int_t> fPowers;          // ex-array
+  std::vector<Int_t> fPowerIndex;      // Index of accepted powers, ex-array
+
+  TVectorD fResiduals;      //! Vector of the final residuals
+  Double_t fMaxResidual;    //! Max redsidual value
+  Double_t fMinResidual;    //! Min redsidual value
+  Int_t fMaxResidualRow;    //! Row giving max residual
+  Int_t fMinResidualRow;    //! Row giving min residual
+  Double_t fSumSqResidual;  //! Sum of Square residuals
+
+  Int_t fNCoefficients;           // Dimension of model coefficients
+  TVectorD fOrthCoefficients;     //! The model coefficients
+  TMatrixD fOrthCurvatureMatrix;  //! Model matrix
+  TVectorD fCoefficients;         // Vector of the final coefficients
+  TVectorD fCoefficientsRMS;      //! Vector of RMS of coefficients
+  Double_t fRMS;                  //! Root mean square of fit
+  Double_t fChi2;                 //! Chi square of fit
+  Int_t fParameterisationCode;    //! Exit code of parameterisation
+
+  Double_t fError;                 //! Error from parameterization
+  Double_t fTestError;             //! Error from test
+  Double_t fPrecision;             //! Relative precision of param
+  Double_t fTestPrecision;         //! Relative precision of test
+  Double_t fCorrelationCoeff;      //! Multi Correlation coefficient
+  TMatrixD fCorrelationMatrix;     //! Correlation matrix
+  Double_t fTestCorrelationCoeff;  //! Multi Correlation coefficient
+
+  TList *fHistograms;     //! List of histograms
+  Byte_t fHistogramMask;  //! Bit pattern of hisograms used
+
+  //TVirtualFitter* fFitter;            //! Fit object (MINUIT)
+
+  EMDFPolyType fPolyType;   // Type of polynomials to use
+  Bool_t fShowCorrelation;  // print correlation matrix
+  Bool_t fIsUserFunction;   // Flag for user defined function
+  Bool_t fIsVerbose;        //
+
+  virtual Double_t EvalFactor(Int_t p, Double_t x) const;
+  virtual Double_t EvalControl(const Int_t *powers);
+  virtual void MakeCoefficientErrors();
+  virtual void MakeCorrelation();
+  virtual Double_t MakeGramSchmidt(Int_t function);
+  virtual void MakeCoefficients();
+  virtual void MakeCandidates();
+  virtual void MakeNormalized();
+  virtual void MakeParameterization();
+  virtual void MakeRealCode(const char *filename, const char *classname, Option_t *option = "");
+  virtual Bool_t Select(const Int_t *iv);
+  virtual Bool_t TestFunction(Double_t squareResidual, Double_t dResidur);
 
 public:
-   TMultiDimFet();
-//   TMultiDimFet(const TMultiDimFet &in);
-   const TMultiDimFet &operator=(const TMultiDimFet &in);
-
-   TMultiDimFet(Int_t dimension,
-                EMDFPolyType type=kMonomials,
-                Option_t *option="");
-   ~TMultiDimFet() override;
-
-   virtual void     AddRow(const Double_t *x, Double_t D, Double_t E=0);
-   virtual void     AddTestRow(const Double_t *x, Double_t D, Double_t E=0);
-   //void     Browse(TBrowser* b) override;
-   void     Clear(Option_t *option="") override; // *MENU*
-   //void     Draw(Option_t * ="d") override { }
-   virtual Double_t Eval(const Double_t *x, const Double_t *coeff=nullptr) const;
-   virtual void     FindParameterization(double precision); // *MENU*
-   //virtual void     Fit(Option_t *option=""); // *MENU*
-
-   Double_t         GetChi2()              const { return fChi2; }
-   const TMatrixD*  GetCorrelationMatrix() const { return &fCorrelationMatrix; }
-   const TVectorD*  GetCoefficients()      const { return &fCoefficients; }
-   Double_t         GetError()             const { return fError; }
-   std::vector<Int_t> GetFunctionCodes()     const { return fFunctionCodes; }
-   const TMatrixD*  GetFunctions()         const { return &fFunctions; }
-   virtual TList*   GetHistograms()        const { return fHistograms; }
-   Double_t         GetMaxAngle()          const { return fMaxAngle; }
-   Int_t            GetMaxFunctions()      const { return fMaxFunctions; }
-   std::vector<Int_t> GetMaxPowers()         const { return fMaxPowers; }
-   Double_t         GetMaxQuantity()       const { return fMaxQuantity; }
-   Int_t            GetMaxStudy()          const { return fMaxStudy; }
-   Int_t            GetMaxTerms()          const { return fMaxTerms; }
-   const TVectorD*  GetMaxVariables()      const { return &fMaxVariables; }
-   Double_t         GetMeanQuantity()      const { return fMeanQuantity; }
-   const TVectorD*  GetMeanVariables()     const { return &fMeanVariables; }
-   Double_t         GetMinAngle()          const { return fMinAngle; }
-   Double_t         GetMinQuantity()       const { return fMinQuantity; }
-   Double_t         GetMinRelativeError()  const { return fMinRelativeError; }
-   const TVectorD*  GetMinVariables()      const { return &fMinVariables; }
-   Int_t            GetNVariables()        const { return fNVariables; }
-   Int_t            GetNCoefficients()     const { return fNCoefficients; }
-   Int_t            GetPolyType()          const { return fPolyType; }
-   std::vector<Int_t> GetPowerIndex()        const { return fPowerIndex; }
-   Double_t         GetPowerLimit()        const { return fPowerLimit; }
-   std::vector<Int_t> GetPowers()            const { return fPowers; }
-   Double_t         GetPrecision()         const { return fPrecision; }
-   const TVectorD*  GetQuantity()          const { return &fQuantity; }
-   Double_t         GetResidualMax()       const { return fMaxResidual; }
-   Double_t         GetResidualMin()       const { return fMinResidual; }
-   Int_t            GetResidualMaxRow()    const { return fMaxResidualRow; }
-   Int_t            GetResidualMinRow()    const { return fMinResidualRow; }
-   Double_t         GetResidualSumSq()     const { return fSumSqResidual; }
-   Double_t         GetRMS()               const { return fRMS; }
-   Int_t            GetSampleSize()        const { return fSampleSize; }
-   const TVectorD*  GetSqError()           const { return &fSqError; }
-   Double_t         GetSumSqAvgQuantity()  const { return fSumSqAvgQuantity; }
-   Double_t         GetSumSqQuantity()     const { return fSumSqQuantity; }
-   Double_t         GetTestError()         const { return fTestError; }
-   Double_t         GetTestPrecision()     const { return fTestPrecision; }
-   const TVectorD*  GetTestQuantity()      const { return &fTestQuantity; }
-   Int_t            GetTestSampleSize()    const { return fTestSampleSize; }
-   const TVectorD*  GetTestSqError()       const { return &fTestSqError; }
-   const TVectorD*  GetTestVariables()     const { return &fTestVariables; }
-   const TVectorD*  GetVariables()         const { return &fVariables; }
-
-   //static TMultiDimFet* Instance()               { return fgInstance; }
-   Bool_t   IsFolder()             const override { return kTRUE; }
-   virtual Double_t MakeChi2(const Double_t* coeff=nullptr);
-   virtual void     MakeCode(const char *functionName="MDF", Option_t *option=""); // *MENU*
-   virtual void     MakeHistograms(Option_t* option="A"); // *MENU*
-   virtual void     MakeMethod(const Char_t* className="MDF", Option_t* option=""); // *MENU*
-   void     Print(Option_t *option="ps") const override; // *MENU*
-   virtual void     PrintPolynomialsSpecial(Option_t *option="m") const; // *MENU*
-
-   void             SetMaxAngle(Double_t angle=0);
-   void             SetMaxFunctions(Int_t n) { fMaxFunctions = n; }
-   void             SetMaxPowers(const Int_t *powers);
-   void             SetMaxStudy(Int_t n) { fMaxStudy  = n; }
-   void             SetMaxTerms(Int_t terms) { fMaxTerms = terms; }
-   void             SetMinRelativeError(Double_t error);
-   void             SetMinAngle(Double_t angle=1);
-   void             SetPowerLimit(Double_t limit=1e-3);
-   virtual void     SetPowers(const Int_t *powers, Int_t terms);
-
-   void ReducePolynomial(double error);
-   void ZeroDoubiousCoefficients(double error);
-
-   ClassDefOverride(TMultiDimFet,1) // Multi dimensional fit class
+  TMultiDimFet();
+  //   TMultiDimFet(const TMultiDimFet &in);
+  const TMultiDimFet &operator=(const TMultiDimFet &in);
+
+  TMultiDimFet(Int_t dimension, EMDFPolyType type = kMonomials, Option_t *option = "");
+  ~TMultiDimFet() override;
+
+  virtual void AddRow(const Double_t *x, Double_t D, Double_t E = 0);
+  virtual void AddTestRow(const Double_t *x, Double_t D, Double_t E = 0);
+  //void     Browse(TBrowser* b) override;
+  void Clear(Option_t *option = "") override;  // *MENU*
+  //void     Draw(Option_t * ="d") override { }
+  virtual Double_t Eval(const Double_t *x, const Double_t *coeff = nullptr) const;
+  virtual void FindParameterization(double precision);  // *MENU*
+  //virtual void     Fit(Option_t *option=""); // *MENU*
+
+  Double_t GetChi2() const { return fChi2; }
+  const TMatrixD *GetCorrelationMatrix() const { return &fCorrelationMatrix; }
+  const TVectorD *GetCoefficients() const { return &fCoefficients; }
+  Double_t GetError() const { return fError; }
+  std::vector<Int_t> GetFunctionCodes() const { return fFunctionCodes; }
+  const TMatrixD *GetFunctions() const { return &fFunctions; }
+  virtual TList *GetHistograms() const { return fHistograms; }
+  Double_t GetMaxAngle() const { return fMaxAngle; }
+  Int_t GetMaxFunctions() const { return fMaxFunctions; }
+  std::vector<Int_t> GetMaxPowers() const { return fMaxPowers; }
+  Double_t GetMaxQuantity() const { return fMaxQuantity; }
+  Int_t GetMaxStudy() const { return fMaxStudy; }
+  Int_t GetMaxTerms() const { return fMaxTerms; }
+  const TVectorD *GetMaxVariables() const { return &fMaxVariables; }
+  Double_t GetMeanQuantity() const { return fMeanQuantity; }
+  const TVectorD *GetMeanVariables() const { return &fMeanVariables; }
+  Double_t GetMinAngle() const { return fMinAngle; }
+  Double_t GetMinQuantity() const { return fMinQuantity; }
+  Double_t GetMinRelativeError() const { return fMinRelativeError; }
+  const TVectorD *GetMinVariables() const { return &fMinVariables; }
+  Int_t GetNVariables() const { return fNVariables; }
+  Int_t GetNCoefficients() const { return fNCoefficients; }
+  Int_t GetPolyType() const { return fPolyType; }
+  std::vector<Int_t> GetPowerIndex() const { return fPowerIndex; }
+  Double_t GetPowerLimit() const { return fPowerLimit; }
+  std::vector<Int_t> GetPowers() const { return fPowers; }
+  Double_t GetPrecision() const { return fPrecision; }
+  const TVectorD *GetQuantity() const { return &fQuantity; }
+  Double_t GetResidualMax() const { return fMaxResidual; }
+  Double_t GetResidualMin() const { return fMinResidual; }
+  Int_t GetResidualMaxRow() const { return fMaxResidualRow; }
+  Int_t GetResidualMinRow() const { return fMinResidualRow; }
+  Double_t GetResidualSumSq() const { return fSumSqResidual; }
+  Double_t GetRMS() const { return fRMS; }
+  Int_t GetSampleSize() const { return fSampleSize; }
+  const TVectorD *GetSqError() const { return &fSqError; }
+  Double_t GetSumSqAvgQuantity() const { return fSumSqAvgQuantity; }
+  Double_t GetSumSqQuantity() const { return fSumSqQuantity; }
+  Double_t GetTestError() const { return fTestError; }
+  Double_t GetTestPrecision() const { return fTestPrecision; }
+  const TVectorD *GetTestQuantity() const { return &fTestQuantity; }
+  Int_t GetTestSampleSize() const { return fTestSampleSize; }
+  const TVectorD *GetTestSqError() const { return &fTestSqError; }
+  const TVectorD *GetTestVariables() const { return &fTestVariables; }
+  const TVectorD *GetVariables() const { return &fVariables; }
+
+  //static TMultiDimFet* Instance()               { return fgInstance; }
+  Bool_t IsFolder() const override { return kTRUE; }
+  virtual Double_t MakeChi2(const Double_t *coeff = nullptr);
+  virtual void MakeCode(const char *functionName = "MDF", Option_t *option = "");   // *MENU*
+  virtual void MakeHistograms(Option_t *option = "A");                              // *MENU*
+  virtual void MakeMethod(const Char_t *className = "MDF", Option_t *option = "");  // *MENU*
+  void Print(Option_t *option = "ps") const override;                               // *MENU*
+  virtual void PrintPolynomialsSpecial(Option_t *option = "m") const;               // *MENU*
+
+  void SetMaxAngle(Double_t angle = 0);
+  void SetMaxFunctions(Int_t n) { fMaxFunctions = n; }
+  void SetMaxPowers(const Int_t *powers);
+  void SetMaxStudy(Int_t n) { fMaxStudy = n; }
+  void SetMaxTerms(Int_t terms) { fMaxTerms = terms; }
+  void SetMinRelativeError(Double_t error);
+  void SetMinAngle(Double_t angle = 1);
+  void SetPowerLimit(Double_t limit = 1e-3);
+  virtual void SetPowers(const Int_t *powers, Int_t terms);
+
+  void ReducePolynomial(double error);
+  void ZeroDoubiousCoefficients(double error);
+
+  ClassDefOverride(TMultiDimFet, 1)  // Multi dimensional fit class
 };
 #endif  //SimG4Core_TotemRPProtonTransportParametrization_TMultiDimFet_H
-
diff --git a/SimTransport/TotemRPProtonTransportParametrization/src/LHCOpticsApproximator.cc b/SimTransport/TotemRPProtonTransportParametrization/src/LHCOpticsApproximator.cc
index 81c0ec6ab48b2..3ac0e19e3694c 100644
--- a/SimTransport/TotemRPProtonTransportParametrization/src/LHCOpticsApproximator.cc
+++ b/SimTransport/TotemRPProtonTransportParametrization/src/LHCOpticsApproximator.cc
@@ -12,9 +12,7 @@
 ClassImp(LHCOpticsApproximator);
 ClassImp(LHCApertureApproximator);
 
-
-void LHCOpticsApproximator::Init()
-{
+void LHCOpticsApproximator::Init() {
   out_polynomials.clear();
   apertures_.clear();
   out_polynomials.push_back(&x_parametrisation);
@@ -34,54 +32,48 @@ void LHCOpticsApproximator::Init()
   trained_ = false;
 }
 
-
-LHCOpticsApproximator::LHCOpticsApproximator(std::string name, std::string title, TMultiDimFet::EMDFPolyType polynom_type, std::string beam_direction, double nominal_beam_momentum)
-: x_parametrisation(5, polynom_type, "k"),
-  theta_x_parametrisation(5, polynom_type, "k"),
-  y_parametrisation(5, polynom_type, "k"),
-  theta_y_parametrisation(5, polynom_type, "k")
-{
+LHCOpticsApproximator::LHCOpticsApproximator(std::string name,
+                                             std::string title,
+                                             TMultiDimFet::EMDFPolyType polynom_type,
+                                             std::string beam_direction,
+                                             double nominal_beam_momentum)
+    : x_parametrisation(5, polynom_type, "k"),
+      theta_x_parametrisation(5, polynom_type, "k"),
+      y_parametrisation(5, polynom_type, "k"),
+      theta_y_parametrisation(5, polynom_type, "k") {
   this->SetName(name.c_str());
   this->SetTitle(title.c_str());
   Init();
 
-  if(beam_direction == "lhcb1")
+  if (beam_direction == "lhcb1")
     beam = lhcb1;
-  else if(beam_direction == "lhcb2")
+  else if (beam_direction == "lhcb2")
     beam = lhcb2;
   else
     beam = lhcb1;
 
   nominal_beam_momentum_ = nominal_beam_momentum;
-  nominal_beam_energy_ = TMath::Sqrt(nominal_beam_momentum_*nominal_beam_momentum_ + 0.938272029*0.938272029);
+  nominal_beam_energy_ = TMath::Sqrt(nominal_beam_momentum_ * nominal_beam_momentum_ + 0.938272029 * 0.938272029);
 }
 
-
-LHCOpticsApproximator::LHCOpticsApproximator()
-{
+LHCOpticsApproximator::LHCOpticsApproximator() {
   Init();
   beam = lhcb1;
   nominal_beam_momentum_ = 7000;
-  nominal_beam_energy_ = TMath::Sqrt(nominal_beam_momentum_*nominal_beam_momentum_ + 0.938272029*0.938272029);
+  nominal_beam_energy_ = TMath::Sqrt(nominal_beam_momentum_ * nominal_beam_momentum_ + 0.938272029 * 0.938272029);
 }
 
-
 //MADX canonical variables
 //(x, theta_x, y, theta_y, ksi) [m, rad, m, rad, -1..0]
-double LHCOpticsApproximator::ParameterOutOfRangePenalty(double in[],
-    bool invert_beam_coord_sytems) const
-{
+double LHCOpticsApproximator::ParameterOutOfRangePenalty(double in[], bool invert_beam_coord_sytems) const {
   double in_corrected[5];
-  if(beam==lhcb1 || !invert_beam_coord_sytems)
-  {
+  if (beam == lhcb1 || !invert_beam_coord_sytems) {
     in_corrected[0] = in[0];
     in_corrected[1] = in[1];
     in_corrected[2] = in[2];
     in_corrected[3] = in[3];
     in_corrected[4] = in[4];
-  }
-  else
-  {
+  } else {
     in_corrected[0] = -in[0];
     in_corrected[1] = -in[1];
     in_corrected[2] = in[2];
@@ -89,39 +81,35 @@ double LHCOpticsApproximator::ParameterOutOfRangePenalty(double in[],
     in_corrected[4] = in[4];
   }
 
-  const TVectorD* min_var = x_parametrisation.GetMinVariables();
-  const TVectorD* max_var = x_parametrisation.GetMaxVariables();
+  const TVectorD *min_var = x_parametrisation.GetMinVariables();
+  const TVectorD *max_var = x_parametrisation.GetMaxVariables();
   double res = 0.;
 
-  for(int i=0; i<5; i++)
-  {
-    if(in_corrected[i]<(*min_var)(i))
-    {
-      double dist = TMath::Abs( ((*min_var)(i)-in_corrected[i])/((*max_var)(i)-(*min_var)(i)) );
-      res += 8*(TMath::Exp(dist)-1.0);
+  for (int i = 0; i < 5; i++) {
+    if (in_corrected[i] < (*min_var)(i)) {
+      double dist = TMath::Abs(((*min_var)(i)-in_corrected[i]) / ((*max_var)(i) - (*min_var)(i)));
+      res += 8 * (TMath::Exp(dist) - 1.0);
       in_corrected[i] = (*min_var)(i);
-    }
-    else if(in_corrected[i]>(*max_var)(i))
-    {
-      double dist = TMath::Abs( ( in_corrected[i]-(*max_var)(i) )/((*max_var)(i)-(*min_var)(i)) );
-      res += 8*(TMath::Exp(dist)-1.0);
+    } else if (in_corrected[i] > (*max_var)(i)) {
+      double dist = TMath::Abs((in_corrected[i] - (*max_var)(i)) / ((*max_var)(i) - (*min_var)(i)));
+      res += 8 * (TMath::Exp(dist) - 1.0);
       in_corrected[i] = (*max_var)(i);
     }
   }
   return res;
 }
 
-bool LHCOpticsApproximator::Transport(const double *in, double *out,
-    bool check_apertures, bool invert_beam_coord_sytems) const
-{
-  if(in==nullptr || out==nullptr || !trained_)
+bool LHCOpticsApproximator::Transport(const double *in,
+                                      double *out,
+                                      bool check_apertures,
+                                      bool invert_beam_coord_sytems) const {
+  if (in == nullptr || out == nullptr || !trained_)
     return false;
 
   bool res = CheckInputRange(in);
   double in_corrected[5];
 
-  if(beam==lhcb1 || !invert_beam_coord_sytems)
-  {
+  if (beam == lhcb1 || !invert_beam_coord_sytems) {
     in_corrected[0] = in[0];
     in_corrected[1] = in[1];
     in_corrected[2] = in[2];
@@ -132,9 +120,7 @@ bool LHCOpticsApproximator::Transport(const double *in, double *out,
     out[2] = y_parametrisation.Eval(in_corrected);
     out[3] = theta_y_parametrisation.Eval(in_corrected);
     out[4] = in[4];
-  }
-  else
-  {
+  } else {
     in_corrected[0] = -in[0];
     in_corrected[1] = -in[1];
     in_corrected[2] = in[2];
@@ -147,29 +133,27 @@ bool LHCOpticsApproximator::Transport(const double *in, double *out,
     out[4] = in[4];
   }
 
-  if(check_apertures)
-  {
-    for(unsigned int i=0; i<apertures_.size(); i++)
-    {
+  if (check_apertures) {
+    for (unsigned int i = 0; i < apertures_.size(); i++) {
       res = res && apertures_[i].CheckAperture(in);
     }
   }
   return res;
 }
 
-
-bool LHCOpticsApproximator::Transport2D(const double *in, double *out,
-    bool check_apertures, bool invert_beam_coord_sytems) const
-    //return true if transport possible, double x, y
+bool LHCOpticsApproximator::Transport2D(const double *in,
+                                        double *out,
+                                        bool check_apertures,
+                                        bool invert_beam_coord_sytems) const
+//return true if transport possible, double x, y
 {
-  if(in==nullptr || out==nullptr || !trained_)
+  if (in == nullptr || out == nullptr || !trained_)
     return false;
 
   bool res = CheckInputRange(in);
   double in_corrected[5];
 
-  if(beam==lhcb1 || !invert_beam_coord_sytems)
-  {
+  if (beam == lhcb1 || !invert_beam_coord_sytems) {
     in_corrected[0] = in[0];
     in_corrected[1] = in[1];
     in_corrected[2] = in[2];
@@ -177,9 +161,7 @@ bool LHCOpticsApproximator::Transport2D(const double *in, double *out,
     in_corrected[4] = in[4];
     out[0] = x_parametrisation.Eval(in_corrected);
     out[1] = y_parametrisation.Eval(in_corrected);
-  }
-  else
-  {
+  } else {
     in_corrected[0] = -in[0];
     in_corrected[1] = -in[1];
     in_corrected[2] = in[2];
@@ -189,34 +171,33 @@ bool LHCOpticsApproximator::Transport2D(const double *in, double *out,
     out[1] = y_parametrisation.Eval(in_corrected);
   }
 
-  if(check_apertures)
-  {
-    for(unsigned int i=0; i<apertures_.size(); i++)
-    {
+  if (check_apertures) {
+    for (unsigned int i = 0; i < apertures_.size(); i++) {
       res = res && apertures_[i].CheckAperture(in);
     }
   }
   return res;
 }
 
-
-bool LHCOpticsApproximator::Transport_m_GeV(double in_pos[3], double in_momentum[3],
-    double out_pos[3], double out_momentum[3],
-    bool check_apertures, double z2_z1_dist) const
-{
+bool LHCOpticsApproximator::Transport_m_GeV(double in_pos[3],
+                                            double in_momentum[3],
+                                            double out_pos[3],
+                                            double out_momentum[3],
+                                            bool check_apertures,
+                                            double z2_z1_dist) const {
   double in[5];
   double out[5];
   double part_mom = 0.0;
-  for(int i=0; i<3; i++)
-    part_mom += in_momentum[i]*in_momentum[i];
+  for (int i = 0; i < 3; i++)
+    part_mom += in_momentum[i] * in_momentum[i];
 
   part_mom = TMath::Sqrt(part_mom);
 
   in[0] = in_pos[0];
-  in[1] = in_momentum[0]/nominal_beam_momentum_;
+  in[1] = in_momentum[0] / nominal_beam_momentum_;
   in[2] = in_pos[1];
-  in[3] = in_momentum[1]/nominal_beam_momentum_;
-  in[4] = (part_mom-nominal_beam_momentum_)/nominal_beam_momentum_;
+  in[3] = in_momentum[1] / nominal_beam_momentum_;
+  in[4] = (part_mom - nominal_beam_momentum_) / nominal_beam_momentum_;
 
   bool res = Transport(in, out, check_apertures, true);
 
@@ -224,22 +205,21 @@ bool LHCOpticsApproximator::Transport_m_GeV(double in_pos[3], double in_momentum
   out_pos[1] = out[2];
   out_pos[2] = in_pos[2] + z2_z1_dist;
 
-  out_momentum[0] = out[1]*nominal_beam_momentum_;
-  out_momentum[1] = out[3]*nominal_beam_momentum_;
-  double part_out_total_mom = (out[4]+1)*nominal_beam_momentum_;
-  out_momentum[2] = TMath::Sqrt(part_out_total_mom*part_out_total_mom - out_momentum[0]*out_momentum[0] - out_momentum[1]*out_momentum[1]);
+  out_momentum[0] = out[1] * nominal_beam_momentum_;
+  out_momentum[1] = out[3] * nominal_beam_momentum_;
+  double part_out_total_mom = (out[4] + 1) * nominal_beam_momentum_;
+  out_momentum[2] = TMath::Sqrt(part_out_total_mom * part_out_total_mom - out_momentum[0] * out_momentum[0] -
+                                out_momentum[1] * out_momentum[1]);
   out_momentum[2] = TMath::Sign(out_momentum[2], in_momentum[2]);
 
   return res;
 }
 
-
-
 bool LHCOpticsApproximator::Transport(const MadKinematicDescriptor *in,
-    MadKinematicDescriptor *out, bool check_apertures,
-    bool invert_beam_coord_sytems) const
-{
-  if(in==nullptr || out==nullptr || !trained_)
+                                      MadKinematicDescriptor *out,
+                                      bool check_apertures,
+                                      bool invert_beam_coord_sytems) const {
+  if (in == nullptr || out == nullptr || !trained_)
     return false;
 
   Double_t input[5];
@@ -262,24 +242,24 @@ bool LHCOpticsApproximator::Transport(const MadKinematicDescriptor *in,
   return res;
 }
 
-
-LHCOpticsApproximator::LHCOpticsApproximator(const LHCOpticsApproximator &org) : TNamed(org), x_parametrisation(org.x_parametrisation), theta_x_parametrisation(org.theta_x_parametrisation), y_parametrisation(org.y_parametrisation), theta_y_parametrisation(org.theta_y_parametrisation)
-{
-    Init();
-    s_begin_ = org.s_begin_;
-    s_end_ = org.s_end_;
-    trained_ = org.trained_;
-    apertures_ = org.apertures_;
-    beam = org.beam;
-    nominal_beam_energy_ = org.nominal_beam_energy_;
-    nominal_beam_momentum_ = org.nominal_beam_momentum_;
+LHCOpticsApproximator::LHCOpticsApproximator(const LHCOpticsApproximator &org)
+    : TNamed(org),
+      x_parametrisation(org.x_parametrisation),
+      theta_x_parametrisation(org.theta_x_parametrisation),
+      y_parametrisation(org.y_parametrisation),
+      theta_y_parametrisation(org.theta_y_parametrisation) {
+  Init();
+  s_begin_ = org.s_begin_;
+  s_end_ = org.s_end_;
+  trained_ = org.trained_;
+  apertures_ = org.apertures_;
+  beam = org.beam;
+  nominal_beam_energy_ = org.nominal_beam_energy_;
+  nominal_beam_momentum_ = org.nominal_beam_momentum_;
 }
 
-
-const LHCOpticsApproximator & LHCOpticsApproximator::operator=(const LHCOpticsApproximator &org)
-{
-  if(this!=&org)
-  {
+const LHCOpticsApproximator &LHCOpticsApproximator::operator=(const LHCOpticsApproximator &org) {
+  if (this != &org) {
     x_parametrisation = org.x_parametrisation;
     theta_x_parametrisation = org.theta_x_parametrisation;
     y_parametrisation = org.y_parametrisation;
@@ -299,10 +279,16 @@ const LHCOpticsApproximator & LHCOpticsApproximator::operator=(const LHCOpticsAp
   return org;
 }
 
-
-void LHCOpticsApproximator::Train(TTree *inp_tree, std::string data_prefix, polynomials_selection mode, int max_degree_x, int max_degree_tx, int max_degree_y, int max_degree_ty, bool common_terms, double *prec)
-{
-  if(inp_tree==nullptr)
+void LHCOpticsApproximator::Train(TTree *inp_tree,
+                                  std::string data_prefix,
+                                  polynomials_selection mode,
+                                  int max_degree_x,
+                                  int max_degree_tx,
+                                  int max_degree_y,
+                                  int max_degree_ty,
+                                  bool common_terms,
+                                  double *prec) {
+  if (inp_tree == nullptr)
     return;
 
   InitializeApproximators(mode, max_degree_x, max_degree_tx, max_degree_y, max_degree_ty, common_terms);
@@ -332,53 +318,51 @@ void LHCOpticsApproximator::Train(TTree *inp_tree, std::string data_prefix, poly
   std::string valid_out_lab = data_prefix + "_valid_out";
 
   //disable not needed branches to speed up the readin
-  inp_tree->SetBranchStatus("*",false);  //disable all branches
-  inp_tree->SetBranchStatus(x_in_lab.c_str(),true);
-  inp_tree->SetBranchStatus(theta_x_in_lab.c_str(),true);
-  inp_tree->SetBranchStatus(y_in_lab.c_str(),true);
-  inp_tree->SetBranchStatus(theta_y_in_lab.c_str(),true);
-  inp_tree->SetBranchStatus(ksi_in_lab.c_str(),true);
-  inp_tree->SetBranchStatus(x_out_lab.c_str(),true);
-  inp_tree->SetBranchStatus(theta_x_out_lab.c_str(),true);
-  inp_tree->SetBranchStatus(y_out_lab.c_str(),true);
-  inp_tree->SetBranchStatus(theta_y_out_lab.c_str(),true);
-  inp_tree->SetBranchStatus(ksi_out_lab.c_str(),true);
-  inp_tree->SetBranchStatus(valid_out_lab.c_str(),true);
+  inp_tree->SetBranchStatus("*", false);  //disable all branches
+  inp_tree->SetBranchStatus(x_in_lab.c_str(), true);
+  inp_tree->SetBranchStatus(theta_x_in_lab.c_str(), true);
+  inp_tree->SetBranchStatus(y_in_lab.c_str(), true);
+  inp_tree->SetBranchStatus(theta_y_in_lab.c_str(), true);
+  inp_tree->SetBranchStatus(ksi_in_lab.c_str(), true);
+  inp_tree->SetBranchStatus(x_out_lab.c_str(), true);
+  inp_tree->SetBranchStatus(theta_x_out_lab.c_str(), true);
+  inp_tree->SetBranchStatus(y_out_lab.c_str(), true);
+  inp_tree->SetBranchStatus(theta_y_out_lab.c_str(), true);
+  inp_tree->SetBranchStatus(ksi_out_lab.c_str(), true);
+  inp_tree->SetBranchStatus(valid_out_lab.c_str(), true);
 
   //set input data adresses
-  inp_tree->SetBranchAddress(x_in_lab.c_str(), &(in_var[0]) );
-  inp_tree->SetBranchAddress(theta_x_in_lab.c_str(), &(in_var[1]) );
-  inp_tree->SetBranchAddress(y_in_lab.c_str(), &(in_var[2]) );
-  inp_tree->SetBranchAddress(theta_y_in_lab.c_str(), &(in_var[3]) );
-  inp_tree->SetBranchAddress(ksi_in_lab.c_str(), &(in_var[4]) );
-  inp_tree->SetBranchAddress(s_in_lab.c_str(), &(in_var[5]) );
+  inp_tree->SetBranchAddress(x_in_lab.c_str(), &(in_var[0]));
+  inp_tree->SetBranchAddress(theta_x_in_lab.c_str(), &(in_var[1]));
+  inp_tree->SetBranchAddress(y_in_lab.c_str(), &(in_var[2]));
+  inp_tree->SetBranchAddress(theta_y_in_lab.c_str(), &(in_var[3]));
+  inp_tree->SetBranchAddress(ksi_in_lab.c_str(), &(in_var[4]));
+  inp_tree->SetBranchAddress(s_in_lab.c_str(), &(in_var[5]));
 
   //set output data adresses
-  inp_tree->SetBranchAddress(x_out_lab.c_str(), &(out_var[0]) );
-  inp_tree->SetBranchAddress(theta_x_out_lab.c_str(), &(out_var[1]) );
-  inp_tree->SetBranchAddress(y_out_lab.c_str(), &(out_var[2]) );
-  inp_tree->SetBranchAddress(theta_y_out_lab.c_str(), &(out_var[3]) );
-  inp_tree->SetBranchAddress(ksi_out_lab.c_str(), &(out_var[4]) );
-  inp_tree->SetBranchAddress(s_out_lab.c_str(), &(out_var[5]) );
-  inp_tree->SetBranchAddress(valid_out_lab.c_str(), &(out_var[6]) );
+  inp_tree->SetBranchAddress(x_out_lab.c_str(), &(out_var[0]));
+  inp_tree->SetBranchAddress(theta_x_out_lab.c_str(), &(out_var[1]));
+  inp_tree->SetBranchAddress(y_out_lab.c_str(), &(out_var[2]));
+  inp_tree->SetBranchAddress(theta_y_out_lab.c_str(), &(out_var[3]));
+  inp_tree->SetBranchAddress(ksi_out_lab.c_str(), &(out_var[4]));
+  inp_tree->SetBranchAddress(s_out_lab.c_str(), &(out_var[5]));
+  inp_tree->SetBranchAddress(valid_out_lab.c_str(), &(out_var[6]));
 
   Long64_t entries = inp_tree->GetEntries();
-  if(entries>0)
-  {
-    inp_tree->SetBranchStatus(s_in_lab.c_str(),true);
-    inp_tree->SetBranchStatus(s_out_lab.c_str(),true);
+  if (entries > 0) {
+    inp_tree->SetBranchStatus(s_in_lab.c_str(), true);
+    inp_tree->SetBranchStatus(s_out_lab.c_str(), true);
     inp_tree->GetEntry(0);
     s_begin_ = in_var[5];
     s_end_ = out_var[5];
-    inp_tree->SetBranchStatus(s_in_lab.c_str(),false);
-    inp_tree->SetBranchStatus(s_out_lab.c_str(),false);
+    inp_tree->SetBranchStatus(s_in_lab.c_str(), false);
+    inp_tree->SetBranchStatus(s_out_lab.c_str(), false);
   }
 
   //set input and output variables for fitting
-  for(Long64_t i=0; i<entries; ++i)
-  {
+  for (Long64_t i = 0; i < entries; ++i) {
     inp_tree->GetEntry(i);
-    if(out_var[6] != 0)  //if out data valid
+    if (out_var[6] != 0)  //if out data valid
     {
       x_parametrisation.AddRow(in_var, out_var[0], 0);
       theta_x_parametrisation.AddRow(in_var, out_var[1], 0);
@@ -387,32 +371,35 @@ void LHCOpticsApproximator::Train(TTree *inp_tree, std::string data_prefix, poly
     }
   }
 
-  edm::LogInfo("LHCOpticsApproximator")<<"Optical functions parametrizations from "<<s_begin_<<" to "<<s_end_<<"\n";
+  edm::LogInfo("LHCOpticsApproximator") << "Optical functions parametrizations from " << s_begin_ << " to " << s_end_
+                                        << "\n";
   PrintInputRange();
-  for(int i=0; i<4; i++)
-  {
-    double best_precision=0.0;
-    if(prec)
+  for (int i = 0; i < 4; i++) {
+    double best_precision = 0.0;
+    if (prec)
       best_precision = prec[i];
     out_polynomials[i]->FindParameterization(best_precision);
-    edm::LogInfo("LHCOpticsApproximator")<<"Out variable "<<coord_names[i]<<" polynomial"<<"\n";
+    edm::LogInfo("LHCOpticsApproximator") << "Out variable " << coord_names[i] << " polynomial"
+                                          << "\n";
     out_polynomials[i]->PrintPolynomialsSpecial("M");
-    edm::LogInfo("LHCOpticsApproximator")<<"\n";
+    edm::LogInfo("LHCOpticsApproximator") << "\n";
   }
 
   trained_ = true;
 }
 
-
-void LHCOpticsApproximator::InitializeApproximators(polynomials_selection mode, int max_degree_x, int max_degree_tx, int max_degree_y, int max_degree_ty, bool common_terms)
-{
+void LHCOpticsApproximator::InitializeApproximators(polynomials_selection mode,
+                                                    int max_degree_x,
+                                                    int max_degree_tx,
+                                                    int max_degree_y,
+                                                    int max_degree_ty,
+                                                    bool common_terms) {
   SetDefaultAproximatorSettings(x_parametrisation, VariableType::X, max_degree_x);
   SetDefaultAproximatorSettings(theta_x_parametrisation, VariableType::THETA_X, max_degree_tx);
   SetDefaultAproximatorSettings(y_parametrisation, VariableType::Y, max_degree_y);
   SetDefaultAproximatorSettings(theta_y_parametrisation, VariableType::THETA_Y, max_degree_ty);
 
-  if(mode == PREDEFINED)
-  {
+  if (mode == PREDEFINED) {
     SetTermsManually(x_parametrisation, VariableType::X, max_degree_x, common_terms);
     SetTermsManually(theta_x_parametrisation, VariableType::THETA_X, max_degree_tx, common_terms);
     SetTermsManually(y_parametrisation, VariableType::Y, max_degree_y, common_terms);
@@ -420,43 +407,42 @@ void LHCOpticsApproximator::InitializeApproximators(polynomials_selection mode,
   }
 }
 
-
-void LHCOpticsApproximator::SetDefaultAproximatorSettings(TMultiDimFet &approximator, VariableType var_type, int max_degree)
-{
-  if(max_degree<1 || max_degree>20)
+void LHCOpticsApproximator::SetDefaultAproximatorSettings(TMultiDimFet &approximator,
+                                                          VariableType var_type,
+                                                          int max_degree) {
+  if (max_degree < 1 || max_degree > 20)
     max_degree = 10;
 
-  if(var_type == VariableType::X || var_type == VariableType::THETA_X)
-  {
-    Int_t mPowers[] = { 1, 1, 0, 0, max_degree };
-    approximator.SetMaxPowers (mPowers);
-    approximator.SetMaxFunctions (900);
-    approximator.SetMaxStudy (1000);
-    approximator.SetMaxTerms (900);
-    approximator.SetPowerLimit (1.50);
-    approximator.SetMinAngle (10);
-    approximator.SetMaxAngle (10);
-    approximator.SetMinRelativeError (1e-13);
+  if (var_type == VariableType::X || var_type == VariableType::THETA_X) {
+    Int_t mPowers[] = {1, 1, 0, 0, max_degree};
+    approximator.SetMaxPowers(mPowers);
+    approximator.SetMaxFunctions(900);
+    approximator.SetMaxStudy(1000);
+    approximator.SetMaxTerms(900);
+    approximator.SetPowerLimit(1.50);
+    approximator.SetMinAngle(10);
+    approximator.SetMaxAngle(10);
+    approximator.SetMinRelativeError(1e-13);
   }
 
-  if(var_type == VariableType::Y || var_type == VariableType::THETA_Y)
-  {
-    Int_t mPowers[] = { 0, 0, 1, 1, max_degree };
-    approximator.SetMaxPowers (mPowers);
-    approximator.SetMaxFunctions (900);
-    approximator.SetMaxStudy (1000);
-    approximator.SetMaxTerms (900);
-    approximator.SetPowerLimit (1.50);
-    approximator.SetMinAngle (10);
-    approximator.SetMaxAngle (10);
-    approximator.SetMinRelativeError (1e-13);
+  if (var_type == VariableType::Y || var_type == VariableType::THETA_Y) {
+    Int_t mPowers[] = {0, 0, 1, 1, max_degree};
+    approximator.SetMaxPowers(mPowers);
+    approximator.SetMaxFunctions(900);
+    approximator.SetMaxStudy(1000);
+    approximator.SetMaxTerms(900);
+    approximator.SetPowerLimit(1.50);
+    approximator.SetMinAngle(10);
+    approximator.SetMaxAngle(10);
+    approximator.SetMinRelativeError(1e-13);
   }
 }
 
-
-void LHCOpticsApproximator::SetTermsManually(TMultiDimFet &approximator, VariableType variable, int max_degree, bool common_terms)
-{
-  if(max_degree<1 || max_degree>20)
+void LHCOpticsApproximator::SetTermsManually(TMultiDimFet &approximator,
+                                             VariableType variable,
+                                             int max_degree,
+                                             bool common_terms) {
+  if (max_degree < 1 || max_degree > 20)
     max_degree = 10;
 
   //put terms of shape:
@@ -466,11 +452,9 @@ void LHCOpticsApproximator::SetTermsManually(TMultiDimFet &approximator, Variabl
   std::vector<Int_t> term_literals;
   term_literals.reserve(5000);
 
-  if(variable == VariableType::X || variable == VariableType::THETA_X)
-  {
+  if (variable == VariableType::X || variable == VariableType::THETA_X) {
     //1,0,0,0,t
-    for(int i=0; i<=max_degree; ++i)
-    {
+    for (int i = 0; i <= max_degree; ++i) {
       term_literals.push_back(1);
       term_literals.push_back(0);
       term_literals.push_back(0);
@@ -478,8 +462,7 @@ void LHCOpticsApproximator::SetTermsManually(TMultiDimFet &approximator, Variabl
       term_literals.push_back(i);
     }
     //0,1,0,0,t
-    for(int i=0; i<=max_degree; ++i)
-    {
+    for (int i = 0; i <= max_degree; ++i) {
       term_literals.push_back(0);
       term_literals.push_back(1);
       term_literals.push_back(0);
@@ -487,8 +470,7 @@ void LHCOpticsApproximator::SetTermsManually(TMultiDimFet &approximator, Variabl
       term_literals.push_back(i);
     }
     //0,2,0,0,t
-    for(int i=0; i<=max_degree; ++i)
-    {
+    for (int i = 0; i <= max_degree; ++i) {
       term_literals.push_back(0);
       term_literals.push_back(2);
       term_literals.push_back(0);
@@ -496,8 +478,7 @@ void LHCOpticsApproximator::SetTermsManually(TMultiDimFet &approximator, Variabl
       term_literals.push_back(i);
     }
     //0,3,0,0,t
-    for(int i=0; i<=max_degree; ++i)
-    {
+    for (int i = 0; i <= max_degree; ++i) {
       term_literals.push_back(0);
       term_literals.push_back(3);
       term_literals.push_back(0);
@@ -505,8 +486,7 @@ void LHCOpticsApproximator::SetTermsManually(TMultiDimFet &approximator, Variabl
       term_literals.push_back(i);
     }
     //0,0,0,0,t
-    for(int i=0; i<=max_degree; ++i)
-    {
+    for (int i = 0; i <= max_degree; ++i) {
       term_literals.push_back(0);
       term_literals.push_back(0);
       term_literals.push_back(0);
@@ -515,11 +495,9 @@ void LHCOpticsApproximator::SetTermsManually(TMultiDimFet &approximator, Variabl
     }
   }
 
-  if(variable == VariableType::Y || variable == VariableType::THETA_Y)
-  {
+  if (variable == VariableType::Y || variable == VariableType::THETA_Y) {
     //0,0,1,0,t
-    for(int i=0; i<=max_degree; ++i)
-    {
+    for (int i = 0; i <= max_degree; ++i) {
       term_literals.push_back(0);
       term_literals.push_back(0);
       term_literals.push_back(1);
@@ -527,8 +505,7 @@ void LHCOpticsApproximator::SetTermsManually(TMultiDimFet &approximator, Variabl
       term_literals.push_back(i);
     }
     //0,0,0,1,t
-    for(int i=0; i<=max_degree; ++i)
-    {
+    for (int i = 0; i <= max_degree; ++i) {
       term_literals.push_back(0);
       term_literals.push_back(0);
       term_literals.push_back(0);
@@ -536,8 +513,7 @@ void LHCOpticsApproximator::SetTermsManually(TMultiDimFet &approximator, Variabl
       term_literals.push_back(i);
     }
     //0,0,0,2,t
-    for(int i=0; i<=max_degree; ++i)
-    {
+    for (int i = 0; i <= max_degree; ++i) {
       term_literals.push_back(0);
       term_literals.push_back(0);
       term_literals.push_back(0);
@@ -545,8 +521,7 @@ void LHCOpticsApproximator::SetTermsManually(TMultiDimFet &approximator, Variabl
       term_literals.push_back(i);
     }
     //0,0,0,3,t
-    for(int i=0; i<=max_degree; ++i)
-    {
+    for (int i = 0; i <= max_degree; ++i) {
       term_literals.push_back(0);
       term_literals.push_back(0);
       term_literals.push_back(0);
@@ -554,8 +529,7 @@ void LHCOpticsApproximator::SetTermsManually(TMultiDimFet &approximator, Variabl
       term_literals.push_back(i);
     }
     //0,0,0,0,t
-    for(int i=0; i<=max_degree; ++i)
-    {
+    for (int i = 0; i <= max_degree; ++i) {
       term_literals.push_back(0);
       term_literals.push_back(0);
       term_literals.push_back(0);
@@ -565,63 +539,95 @@ void LHCOpticsApproximator::SetTermsManually(TMultiDimFet &approximator, Variabl
   }
 
   //push common terms
-  if(common_terms)
-  {
-    term_literals.push_back(1), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(0);
-    term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0);
-    term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0);
-    term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0);
-    term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0);
-    term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(1), term_literals.push_back(0);
-
-    term_literals.push_back(1), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1);
-    term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(1);
-    term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(1);
-    term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(1);
-    term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(1);
-    term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(1), term_literals.push_back(1);
-
-    term_literals.push_back(1), term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(0);
-    term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(0);
-    term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(0);
-    term_literals.push_back(2), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(0);
-    term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(0);
-    term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(0);
-    term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0);
-    term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0);
-    term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(2), term_literals.push_back(0);
-    term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0);
-    term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0);
-    term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(1), term_literals.push_back(0);
-
-    term_literals.push_back(1), term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1);
-    term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(1);
-    term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(1);
-    term_literals.push_back(2), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1);
-    term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(1);
-    term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(1);
-    term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(1);
-    term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(1);
-    term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(2), term_literals.push_back(1);
-    term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(1);
-    term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(1);
-    term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(1), term_literals.push_back(1);
+  if (common_terms) {
+    term_literals.push_back(1), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0),
+        term_literals.push_back(0);
+    term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0),
+        term_literals.push_back(0);
+    term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1),
+        term_literals.push_back(0);
+    term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(1), term_literals.push_back(0),
+        term_literals.push_back(0);
+    term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(1),
+        term_literals.push_back(0);
+    term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(1),
+        term_literals.push_back(0);
+
+    term_literals.push_back(1), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0),
+        term_literals.push_back(1);
+    term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0),
+        term_literals.push_back(1);
+    term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1),
+        term_literals.push_back(1);
+    term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(1), term_literals.push_back(0),
+        term_literals.push_back(1);
+    term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(1),
+        term_literals.push_back(1);
+    term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(1),
+        term_literals.push_back(1);
+
+    term_literals.push_back(1), term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(0),
+        term_literals.push_back(0);
+    term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(0),
+        term_literals.push_back(0);
+    term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(2),
+        term_literals.push_back(0);
+    term_literals.push_back(2), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0),
+        term_literals.push_back(0);
+    term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(2), term_literals.push_back(0),
+        term_literals.push_back(0);
+    term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(2),
+        term_literals.push_back(0);
+    term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0),
+        term_literals.push_back(0);
+    term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(1), term_literals.push_back(0),
+        term_literals.push_back(0);
+    term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(2),
+        term_literals.push_back(0);
+    term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1),
+        term_literals.push_back(0);
+    term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(1),
+        term_literals.push_back(0);
+    term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(1),
+        term_literals.push_back(0);
+
+    term_literals.push_back(1), term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(0),
+        term_literals.push_back(1);
+    term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(0),
+        term_literals.push_back(1);
+    term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(2),
+        term_literals.push_back(1);
+    term_literals.push_back(2), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(0),
+        term_literals.push_back(1);
+    term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(2), term_literals.push_back(0),
+        term_literals.push_back(1);
+    term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0), term_literals.push_back(2),
+        term_literals.push_back(1);
+    term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(0),
+        term_literals.push_back(1);
+    term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(1), term_literals.push_back(0),
+        term_literals.push_back(1);
+    term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1), term_literals.push_back(2),
+        term_literals.push_back(1);
+    term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(1),
+        term_literals.push_back(1);
+    term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(0), term_literals.push_back(1),
+        term_literals.push_back(1);
+    term_literals.push_back(0), term_literals.push_back(0), term_literals.push_back(2), term_literals.push_back(1),
+        term_literals.push_back(1);
   }
 
   std::vector<Int_t> powers;
   powers.resize(term_literals.size());
 
-  for(unsigned int i=0; i<term_literals.size(); ++i)
-  {
+  for (unsigned int i = 0; i < term_literals.size(); ++i) {
     powers[i] = term_literals[i];
   }
-  approximator.SetPowers(&powers[0], term_literals.size()/5);
+  approximator.SetPowers(&powers[0], term_literals.size() / 5);
 }
 
-
-void LHCOpticsApproximator::Test(TTree *inp_tree, TFile *f_out, std::string data_prefix, std::string base_out_dir)
-{
-  if(inp_tree==nullptr || f_out==nullptr)
+void LHCOpticsApproximator::Test(TTree *inp_tree, TFile *f_out, std::string data_prefix, std::string base_out_dir) {
+  if (inp_tree == nullptr || f_out == nullptr)
     return;
 
   //in-variables
@@ -649,35 +655,35 @@ void LHCOpticsApproximator::Test(TTree *inp_tree, TFile *f_out, std::string data
   std::string valid_out_lab = data_prefix + "_valid_out";
 
   //disable not needed branches to speed up the readin
-  inp_tree->SetBranchStatus("*",false);  //disable all branches
-  inp_tree->SetBranchStatus(x_in_lab.c_str(),true);
-  inp_tree->SetBranchStatus(theta_x_in_lab.c_str(),true);
-  inp_tree->SetBranchStatus(y_in_lab.c_str(),true);
-  inp_tree->SetBranchStatus(theta_y_in_lab.c_str(),true);
-  inp_tree->SetBranchStatus(ksi_in_lab.c_str(),true);
-  inp_tree->SetBranchStatus(x_out_lab.c_str(),true);
-  inp_tree->SetBranchStatus(theta_x_out_lab.c_str(),true);
-  inp_tree->SetBranchStatus(y_out_lab.c_str(),true);
-  inp_tree->SetBranchStatus(theta_y_out_lab.c_str(),true);
-  inp_tree->SetBranchStatus(ksi_out_lab.c_str(),true);
-  inp_tree->SetBranchStatus(valid_out_lab.c_str(),true);
+  inp_tree->SetBranchStatus("*", false);  //disable all branches
+  inp_tree->SetBranchStatus(x_in_lab.c_str(), true);
+  inp_tree->SetBranchStatus(theta_x_in_lab.c_str(), true);
+  inp_tree->SetBranchStatus(y_in_lab.c_str(), true);
+  inp_tree->SetBranchStatus(theta_y_in_lab.c_str(), true);
+  inp_tree->SetBranchStatus(ksi_in_lab.c_str(), true);
+  inp_tree->SetBranchStatus(x_out_lab.c_str(), true);
+  inp_tree->SetBranchStatus(theta_x_out_lab.c_str(), true);
+  inp_tree->SetBranchStatus(y_out_lab.c_str(), true);
+  inp_tree->SetBranchStatus(theta_y_out_lab.c_str(), true);
+  inp_tree->SetBranchStatus(ksi_out_lab.c_str(), true);
+  inp_tree->SetBranchStatus(valid_out_lab.c_str(), true);
 
   //set input data adresses
-  inp_tree->SetBranchAddress(x_in_lab.c_str(), &(in_var[0]) );
-  inp_tree->SetBranchAddress(theta_x_in_lab.c_str(), &(in_var[1]) );
-  inp_tree->SetBranchAddress(y_in_lab.c_str(), &(in_var[2]) );
-  inp_tree->SetBranchAddress(theta_y_in_lab.c_str(), &(in_var[3]) );
-  inp_tree->SetBranchAddress(ksi_in_lab.c_str(), &(in_var[4]) );
-  inp_tree->SetBranchAddress(s_in_lab.c_str(), &(in_var[5]) );
+  inp_tree->SetBranchAddress(x_in_lab.c_str(), &(in_var[0]));
+  inp_tree->SetBranchAddress(theta_x_in_lab.c_str(), &(in_var[1]));
+  inp_tree->SetBranchAddress(y_in_lab.c_str(), &(in_var[2]));
+  inp_tree->SetBranchAddress(theta_y_in_lab.c_str(), &(in_var[3]));
+  inp_tree->SetBranchAddress(ksi_in_lab.c_str(), &(in_var[4]));
+  inp_tree->SetBranchAddress(s_in_lab.c_str(), &(in_var[5]));
 
   //set output data adresses
-  inp_tree->SetBranchAddress(x_out_lab.c_str(), &(out_var[0]) );
-  inp_tree->SetBranchAddress(theta_x_out_lab.c_str(), &(out_var[1]) );
-  inp_tree->SetBranchAddress(y_out_lab.c_str(), &(out_var[2]) );
-  inp_tree->SetBranchAddress(theta_y_out_lab.c_str(), &(out_var[3]) );
-  inp_tree->SetBranchAddress(ksi_out_lab.c_str(), &(out_var[4]) );
-  inp_tree->SetBranchAddress(s_out_lab.c_str(), &(out_var[5]) );
-  inp_tree->SetBranchAddress(valid_out_lab.c_str(), &(out_var[6]) );
+  inp_tree->SetBranchAddress(x_out_lab.c_str(), &(out_var[0]));
+  inp_tree->SetBranchAddress(theta_x_out_lab.c_str(), &(out_var[1]));
+  inp_tree->SetBranchAddress(y_out_lab.c_str(), &(out_var[2]));
+  inp_tree->SetBranchAddress(theta_y_out_lab.c_str(), &(out_var[3]));
+  inp_tree->SetBranchAddress(ksi_out_lab.c_str(), &(out_var[4]));
+  inp_tree->SetBranchAddress(s_out_lab.c_str(), &(out_var[5]));
+  inp_tree->SetBranchAddress(valid_out_lab.c_str(), &(out_var[6]));
 
   //test histogramms
   TH1D *err_hists[4];
@@ -690,8 +696,7 @@ void LHCOpticsApproximator::Test(TTree *inp_tree, TFile *f_out, std::string data
 
   Long64_t entries = inp_tree->GetEntries();
   //set input and output variables for fitting
-  for(Long64_t i=0; i<entries; ++i)
-  {
+  for (Long64_t i = 0; i < entries; ++i) {
     double errors[4];
     inp_tree->GetEntry(i);
 
@@ -712,17 +717,14 @@ void LHCOpticsApproximator::Test(TTree *inp_tree, TFile *f_out, std::string data
   DeleteErrorCorHistograms(err_out_cor_hists);
 }
 
-
-void LHCOpticsApproximator::AllocateErrorHists(TH1D *err_hists[4])
-{
+void LHCOpticsApproximator::AllocateErrorHists(TH1D *err_hists[4]) {
   std::vector<std::string> error_labels;
   error_labels.push_back("x error");
   error_labels.push_back("theta_x error");
   error_labels.push_back("y error");
   error_labels.push_back("theta_y error");
 
-  for(int i=0; i<4; ++i)
-  {
+  for (int i = 0; i < 4; ++i) {
     err_hists[i] = new TH1D(error_labels[i].c_str(), error_labels[i].c_str(), 100, -0.0000000001, 0.0000000001);
     err_hists[i]->SetXTitle(error_labels[i].c_str());
     err_hists[i]->SetYTitle("counts");
@@ -731,42 +733,41 @@ void LHCOpticsApproximator::AllocateErrorHists(TH1D *err_hists[4])
   }
 }
 
-
-void LHCOpticsApproximator::TestAperture(TTree *inp_tree, TTree *out_tree)  //x, theta_x, y, theta_y, ksi, mad_accepted, parametriz_accepted
+void LHCOpticsApproximator::TestAperture(
+    TTree *inp_tree, TTree *out_tree)  //x, theta_x, y, theta_y, ksi, mad_accepted, parametriz_accepted
 {
-  if(inp_tree==nullptr || out_tree==nullptr)
+  if (inp_tree == nullptr || out_tree == nullptr)
     return;
 
   Long64_t entries = inp_tree->GetEntries();
   double entry[7];
   double parametrization_out[5];
 
-  inp_tree->SetBranchAddress("x", &(entry[0]) );
-  inp_tree->SetBranchAddress("theta_x", &(entry[1]) );
-  inp_tree->SetBranchAddress("y", &(entry[2]) );
-  inp_tree->SetBranchAddress("theta_y", &(entry[3]) );
-  inp_tree->SetBranchAddress("ksi", &(entry[4]) );
-  inp_tree->SetBranchAddress("mad_accept", &(entry[5]) );
-  inp_tree->SetBranchAddress("par_accept", &(entry[6]) );
-
-  out_tree->SetBranchAddress("x", &(entry[0]) );
-  out_tree->SetBranchAddress("theta_x", &(entry[1]) );
-  out_tree->SetBranchAddress("y", &(entry[2]) );
-  out_tree->SetBranchAddress("theta_y", &(entry[3]) );
-  out_tree->SetBranchAddress("ksi", &(entry[4]) );
-  out_tree->SetBranchAddress("mad_accept", &(entry[5]) );
-  out_tree->SetBranchAddress("par_accept", &(entry[6]) );
-
-//  int ind=0;
-  for(Long64_t i=0; i<entries; i++)
-  {
+  inp_tree->SetBranchAddress("x", &(entry[0]));
+  inp_tree->SetBranchAddress("theta_x", &(entry[1]));
+  inp_tree->SetBranchAddress("y", &(entry[2]));
+  inp_tree->SetBranchAddress("theta_y", &(entry[3]));
+  inp_tree->SetBranchAddress("ksi", &(entry[4]));
+  inp_tree->SetBranchAddress("mad_accept", &(entry[5]));
+  inp_tree->SetBranchAddress("par_accept", &(entry[6]));
+
+  out_tree->SetBranchAddress("x", &(entry[0]));
+  out_tree->SetBranchAddress("theta_x", &(entry[1]));
+  out_tree->SetBranchAddress("y", &(entry[2]));
+  out_tree->SetBranchAddress("theta_y", &(entry[3]));
+  out_tree->SetBranchAddress("ksi", &(entry[4]));
+  out_tree->SetBranchAddress("mad_accept", &(entry[5]));
+  out_tree->SetBranchAddress("par_accept", &(entry[6]));
+
+  //  int ind=0;
+  for (Long64_t i = 0; i < entries; i++) {
     inp_tree->GetEntry(i);
 
     //Don't invert the coordinate systems, appertures are defined in the
     //coordinate system of the beam - perhaps to be changed
     bool res = Transport(entry, parametrization_out, true, false);
 
-    if( res )
+    if (res)
       entry[6] = 1.0;
     else
       entry[6] = 0.0;
@@ -775,9 +776,7 @@ void LHCOpticsApproximator::TestAperture(TTree *inp_tree, TTree *out_tree)  //x,
   }
 }
 
-
-void LHCOpticsApproximator::AllocateErrorInputCorHists(TH2D *err_inp_cor_hists[4][5])
-{
+void LHCOpticsApproximator::AllocateErrorInputCorHists(TH2D *err_inp_cor_hists[4][5]) {
   std::vector<std::string> error_labels;
   std::vector<std::string> data_labels;
 
@@ -792,13 +791,12 @@ void LHCOpticsApproximator::AllocateErrorInputCorHists(TH2D *err_inp_cor_hists[4
   data_labels.push_back("theta_y input");
   data_labels.push_back("ksi input");
 
-  for(int eri=0; eri<4; ++eri)
-  {
-    for(int dati=0; dati<5; ++dati)
-    {
+  for (int eri = 0; eri < 4; ++eri) {
+    for (int dati = 0; dati < 5; ++dati) {
       std::string name = error_labels[eri] + " vs. " + data_labels[dati];
-      const std::string& title = name;
-      err_inp_cor_hists[eri][dati] = new TH2D(name.c_str(), title.c_str(), 100,-0.0000000001,0.0000000001,100,-0.0000000001,0.0000000001);
+      const std::string &title = name;
+      err_inp_cor_hists[eri][dati] =
+          new TH2D(name.c_str(), title.c_str(), 100, -0.0000000001, 0.0000000001, 100, -0.0000000001, 0.0000000001);
       err_inp_cor_hists[eri][dati]->SetXTitle(error_labels[eri].c_str());
       err_inp_cor_hists[eri][dati]->SetYTitle(data_labels[dati].c_str());
       err_inp_cor_hists[eri][dati]->SetDirectory(nullptr);
@@ -807,8 +805,7 @@ void LHCOpticsApproximator::AllocateErrorInputCorHists(TH2D *err_inp_cor_hists[4
   }
 }
 
-void LHCOpticsApproximator::AllocateErrorOutputCorHists(TH2D *err_out_cor_hists[4][5])
-{
+void LHCOpticsApproximator::AllocateErrorOutputCorHists(TH2D *err_out_cor_hists[4][5]) {
   std::vector<std::string> error_labels;
   std::vector<std::string> data_labels;
 
@@ -823,13 +820,12 @@ void LHCOpticsApproximator::AllocateErrorOutputCorHists(TH2D *err_out_cor_hists[
   data_labels.push_back("theta_y output");
   data_labels.push_back("ksi output");
 
-  for(int eri=0; eri<4; ++eri)
-  {
-    for(int dati=0; dati<5; ++dati)
-    {
+  for (int eri = 0; eri < 4; ++eri) {
+    for (int dati = 0; dati < 5; ++dati) {
       std::string name = error_labels[eri] + " vs. " + data_labels[dati];
-      const std::string& title = name;
-      err_out_cor_hists[eri][dati] = new TH2D(name.c_str(), title.c_str(), 100,-0.0000000001,0.0000000001,100,-0.0000000001,0.0000000001);
+      const std::string &title = name;
+      err_out_cor_hists[eri][dati] =
+          new TH2D(name.c_str(), title.c_str(), 100, -0.0000000001, 0.0000000001, 100, -0.0000000001, 0.0000000001);
       err_out_cor_hists[eri][dati]->SetXTitle(error_labels[eri].c_str());
       err_out_cor_hists[eri][dati]->SetYTitle(data_labels[dati].c_str());
       err_out_cor_hists[eri][dati]->SetDirectory(nullptr);
@@ -838,55 +834,44 @@ void LHCOpticsApproximator::AllocateErrorOutputCorHists(TH2D *err_out_cor_hists[
   }
 }
 
-
-void LHCOpticsApproximator::FillErrorHistograms(double errors[4], TH1D *err_hists[4])
-{
-  for(int i=0; i<4; ++i)
-  {
+void LHCOpticsApproximator::FillErrorHistograms(double errors[4], TH1D *err_hists[4]) {
+  for (int i = 0; i < 4; ++i) {
     err_hists[i]->Fill(errors[i]);
   }
 }
 
-
-void LHCOpticsApproximator::FillErrorDataCorHistograms(double errors[4], double var[5], TH2D *err_cor_hists[4][5])
-{
-  for(int eri=0; eri<4; ++eri)
-  {
-    for(int dati=0; dati<5; ++dati)
-    {
+void LHCOpticsApproximator::FillErrorDataCorHistograms(double errors[4], double var[5], TH2D *err_cor_hists[4][5]) {
+  for (int eri = 0; eri < 4; ++eri) {
+    for (int dati = 0; dati < 5; ++dati) {
       err_cor_hists[eri][dati]->Fill(errors[eri], var[dati]);
     }
   }
 }
 
-
-void LHCOpticsApproximator::DeleteErrorHists(TH1D *err_hists[4])
-{
-  for(int i=0; i<4; ++i)
-  {
+void LHCOpticsApproximator::DeleteErrorHists(TH1D *err_hists[4]) {
+  for (int i = 0; i < 4; ++i) {
     delete err_hists[i];
   }
 }
 
-void LHCOpticsApproximator::DeleteErrorCorHistograms(TH2D *err_cor_hists[4][5])
-{
-  for(int eri=0; eri<4; ++eri)
-  {
-    for(int dati=0; dati<5; ++dati)
-    {
+void LHCOpticsApproximator::DeleteErrorCorHistograms(TH2D *err_cor_hists[4][5]) {
+  for (int eri = 0; eri < 4; ++eri) {
+    for (int dati = 0; dati < 5; ++dati) {
       delete err_cor_hists[eri][dati];
     }
   }
 }
 
-
-void LHCOpticsApproximator::WriteHistograms(TH1D *err_hists[4], TH2D *err_inp_cor_hists[4][5], TH2D *err_out_cor_hists[4][5], TFile *f_out, std::string base_out_dir)
-{
-  if(f_out==nullptr)
+void LHCOpticsApproximator::WriteHistograms(TH1D *err_hists[4],
+                                            TH2D *err_inp_cor_hists[4][5],
+                                            TH2D *err_out_cor_hists[4][5],
+                                            TFile *f_out,
+                                            std::string base_out_dir) {
+  if (f_out == nullptr)
     return;
 
   f_out->cd();
-  if(!gDirectory->cd(base_out_dir.c_str()))
+  if (!gDirectory->cd(base_out_dir.c_str()))
     gDirectory->mkdir(base_out_dir.c_str());
 
   gDirectory->cd(base_out_dir.c_str());
@@ -899,8 +884,7 @@ void LHCOpticsApproximator::WriteHistograms(TH1D *err_hists[4], TH2D *err_inp_co
 
   gDirectory->cd("x");
   err_hists[0]->Write("", TObject::kWriteDelete);
-  for(int i=0; i<5; i++)
-  {
+  for (int i = 0; i < 5; i++) {
     err_inp_cor_hists[0][i]->Write("", TObject::kWriteDelete);
     err_out_cor_hists[0][i]->Write("", TObject::kWriteDelete);
   }
@@ -908,8 +892,7 @@ void LHCOpticsApproximator::WriteHistograms(TH1D *err_hists[4], TH2D *err_inp_co
   gDirectory->cd("..");
   gDirectory->cd("theta_x");
   err_hists[1]->Write("", TObject::kWriteDelete);
-  for(int i=0; i<5; i++)
-  {
+  for (int i = 0; i < 5; i++) {
     err_inp_cor_hists[1][i]->Write("", TObject::kWriteDelete);
     err_out_cor_hists[1][i]->Write("", TObject::kWriteDelete);
   }
@@ -917,8 +900,7 @@ void LHCOpticsApproximator::WriteHistograms(TH1D *err_hists[4], TH2D *err_inp_co
   gDirectory->cd("..");
   gDirectory->cd("y");
   err_hists[2]->Write("", TObject::kWriteDelete);
-  for(int i=0; i<5; i++)
-  {
+  for (int i = 0; i < 5; i++) {
     err_inp_cor_hists[2][i]->Write("", TObject::kWriteDelete);
     err_out_cor_hists[2][i]->Write("", TObject::kWriteDelete);
   }
@@ -926,8 +908,7 @@ void LHCOpticsApproximator::WriteHistograms(TH1D *err_hists[4], TH2D *err_inp_co
   gDirectory->cd("..");
   gDirectory->cd("theta_y");
   err_hists[3]->Write("", TObject::kWriteDelete);
-  for(int i=0; i<5; i++)
-  {
+  for (int i = 0; i < 5; i++) {
     err_inp_cor_hists[3][i]->Write("", TObject::kWriteDelete);
     err_out_cor_hists[3][i]->Write("", TObject::kWriteDelete);
   }
@@ -935,33 +916,29 @@ void LHCOpticsApproximator::WriteHistograms(TH1D *err_hists[4], TH2D *err_inp_co
   gDirectory->cd("..");
 }
 
-void LHCOpticsApproximator::PrintInputRange()
-{
-  const TVectorD* min_var = x_parametrisation.GetMinVariables();
-  const TVectorD* max_var = x_parametrisation.GetMaxVariables();
+void LHCOpticsApproximator::PrintInputRange() {
+  const TVectorD *min_var = x_parametrisation.GetMinVariables();
+  const TVectorD *max_var = x_parametrisation.GetMaxVariables();
 
-  edm::LogInfo("LHCOpticsApproximator")<<"Covered input parameters range:"<<"\n";
-  for(int i=0; i<5; i++)
-  {
-    edm::LogInfo("LHCOpticsApproximator")<<(*min_var)(i)<<" < "<<coord_names[i]<<" < "<<(*max_var)(i)<<"\n";
+  edm::LogInfo("LHCOpticsApproximator") << "Covered input parameters range:"
+                                        << "\n";
+  for (int i = 0; i < 5; i++) {
+    edm::LogInfo("LHCOpticsApproximator") << (*min_var)(i) << " < " << coord_names[i] << " < " << (*max_var)(i) << "\n";
   }
-  edm::LogInfo("LHCOpticsApproximator")<<"\n";
+  edm::LogInfo("LHCOpticsApproximator") << "\n";
 }
 
-
-bool LHCOpticsApproximator::CheckInputRange(const double *in, bool invert_beam_coord_sytems) const //x, thx, y, thy, ksi
+bool LHCOpticsApproximator::CheckInputRange(const double *in,
+                                            bool invert_beam_coord_sytems) const  //x, thx, y, thy, ksi
 {
   double in_corrected[5];
-  if(beam==lhcb1 || !invert_beam_coord_sytems)
-  {
+  if (beam == lhcb1 || !invert_beam_coord_sytems) {
     in_corrected[0] = in[0];
     in_corrected[1] = in[1];
     in_corrected[2] = in[2];
     in_corrected[3] = in[3];
     in_corrected[4] = in[4];
-  }
-  else
-  {
+  } else {
     in_corrected[0] = -in[0];
     in_corrected[1] = -in[1];
     in_corrected[2] = in[2];
@@ -969,34 +946,30 @@ bool LHCOpticsApproximator::CheckInputRange(const double *in, bool invert_beam_c
     in_corrected[4] = in[4];
   }
 
-  const TVectorD* min_var = x_parametrisation.GetMinVariables();
-  const TVectorD* max_var = x_parametrisation.GetMaxVariables();
+  const TVectorD *min_var = x_parametrisation.GetMinVariables();
+  const TVectorD *max_var = x_parametrisation.GetMaxVariables();
   bool res = true;
 
-  for(int i=0; i<5; i++)
-  {
-    res = res && in_corrected[i]>=(*min_var)(i) && in_corrected[i]<=(*max_var)(i);
+  for (int i = 0; i < 5; i++) {
+    res = res && in_corrected[i] >= (*min_var)(i) && in_corrected[i] <= (*max_var)(i);
   }
   return res;
 }
 
-
-void LHCOpticsApproximator::AddRectEllipseAperture(const LHCOpticsApproximator &in, double rect_x, double rect_y, double r_el_x, double r_el_y)
-{
-  apertures_.push_back(LHCApertureApproximator(in, rect_x, rect_y, r_el_x, r_el_y, LHCApertureApproximator::ApertureType::RECTELLIPSE));
+void LHCOpticsApproximator::AddRectEllipseAperture(
+    const LHCOpticsApproximator &in, double rect_x, double rect_y, double r_el_x, double r_el_y) {
+  apertures_.push_back(
+      LHCApertureApproximator(in, rect_x, rect_y, r_el_x, r_el_y, LHCApertureApproximator::ApertureType::RECTELLIPSE));
 }
 
-
-LHCApertureApproximator::LHCApertureApproximator()
-{
+LHCApertureApproximator::LHCApertureApproximator() {
   rect_x_ = rect_y_ = r_el_x_ = r_el_y_ = 0.0;
   ap_type_ = ApertureType::NO_APERTURE;
 }
 
-
-LHCApertureApproximator::LHCApertureApproximator(const LHCOpticsApproximator &in, double rect_x, double rect_y, double r_el_x, double r_el_y,
-        ApertureType type) : LHCOpticsApproximator(in)
-{
+LHCApertureApproximator::LHCApertureApproximator(
+    const LHCOpticsApproximator &in, double rect_x, double rect_y, double r_el_x, double r_el_y, ApertureType type)
+    : LHCOpticsApproximator(in) {
   rect_x_ = rect_x;
   rect_y_ = rect_y;
   r_el_x_ = r_el_x;
@@ -1004,88 +977,101 @@ LHCApertureApproximator::LHCApertureApproximator(const LHCOpticsApproximator &in
   ap_type_ = type;
 }
 
-bool LHCApertureApproximator::CheckAperture(const double *in, bool invert_beam_coord_sytems) const //x, thx. y, thy, ksi
+bool LHCApertureApproximator::CheckAperture(const double *in,
+                                            bool invert_beam_coord_sytems) const  //x, thx. y, thy, ksi
 {
   double out[5];
   bool result = Transport(in, out, false, invert_beam_coord_sytems);
 
-  if(ap_type_==ApertureType::RECTELLIPSE)
-  {
-    result = result && out[0]<rect_x_ && out[0]>-rect_x_ && out[2]<rect_y_ && out[2]>-rect_y_ &&
-        ( out[0]*out[0]/(r_el_x_*r_el_x_) + out[2]*out[2]/(r_el_y_*r_el_y_) < 1 );
+  if (ap_type_ == ApertureType::RECTELLIPSE) {
+    result = result && out[0] < rect_x_ && out[0] > -rect_x_ && out[2] < rect_y_ && out[2] > -rect_y_ &&
+             (out[0] * out[0] / (r_el_x_ * r_el_x_) + out[2] * out[2] / (r_el_y_ * r_el_y_) < 1);
   }
   return result;
 }
 
-void LHCOpticsApproximator::PrintOpticalFunctions()
-{
-  edm::LogInfo("LHCOpticsApproximator")<<std::endl<<"Linear terms of optical functions:"<<"\n";
-  for(int i=0; i<4; i++)
-  {
+void LHCOpticsApproximator::PrintOpticalFunctions() {
+  edm::LogInfo("LHCOpticsApproximator") << std::endl
+                                        << "Linear terms of optical functions:"
+                                        << "\n";
+  for (int i = 0; i < 4; i++) {
     PrintCoordinateOpticalFunctions(*out_polynomials[i], coord_names[i], coord_names);
   }
 }
 
-void LHCOpticsApproximator::PrintCoordinateOpticalFunctions(TMultiDimFet &parametrization, const std::string &coord_name, const std::vector<std::string> &input_vars)
-{
+void LHCOpticsApproximator::PrintCoordinateOpticalFunctions(TMultiDimFet &parametrization,
+                                                            const std::string &coord_name,
+                                                            const std::vector<std::string> &input_vars) {
   double in[5];
-//  double out;
+  //  double out;
   double d_out_d_in[5];
   double d_par = 1e-5;
   double bias = 0;
 
-  for(int j=0; j<5; j++)
-      in[j]=0.0;
+  for (int j = 0; j < 5; j++)
+    in[j] = 0.0;
 
   bias = parametrization.Eval(in);
 
-  for(int i=0; i<5; i++)
-  {
-    for(int j=0; j<5; j++)
-      in[j]=0.0;
+  for (int i = 0; i < 5; i++) {
+    for (int j = 0; j < 5; j++)
+      in[j] = 0.0;
 
     in[i] = d_par;
     d_out_d_in[i] = parametrization.Eval(in);
     in[i] = 0.0;
     d_out_d_in[i] = d_out_d_in[i] - parametrization.Eval(in);
-    d_out_d_in[i] = d_out_d_in[i]/d_par;
+    d_out_d_in[i] = d_out_d_in[i] / d_par;
   }
-  edm::LogInfo("LHCOpticsApproximator")<<coord_name<<" = "<<bias;
-  for(int i=0; i<5; i++)
-  {
-    edm::LogInfo("LHCOpticsApproximator")<<" + "<<d_out_d_in[i]<<"*"<<input_vars[i];
+  edm::LogInfo("LHCOpticsApproximator") << coord_name << " = " << bias;
+  for (int i = 0; i < 5; i++) {
+    edm::LogInfo("LHCOpticsApproximator") << " + " << d_out_d_in[i] << "*" << input_vars[i];
   }
-  edm::LogInfo("LHCOpticsApproximator")<<"\n";
+  edm::LogInfo("LHCOpticsApproximator") << "\n";
 }
 
-void LHCOpticsApproximator::GetLinearApproximation(double atPoint[], double &Cx, double &Lx, double &vx, double &Cy, double &Ly, double &vy, double &D, double ep)
-{
-	double out[2];
-	Transport2D(atPoint, out);
-	Cx = out[0];
-	Cy = out[1];
-
-	for (int i = 0; i < 5; i++) {
-		atPoint[i] += ep;
-		Transport2D(atPoint, out);
-		switch (i) {
-			case 0: vx = (out[0] - Cx) / ep; break;
-			case 1: Lx = (out[0] - Cx) / ep; break;
-			case 2: vy = (out[1] - Cy) / ep; break;
-			case 3: Ly = (out[1] - Cy) / ep; break;
-			case 4: D = (out[0] - Cx) / ep; break;
-		}
-		atPoint[i] -= ep;
-	}
+void LHCOpticsApproximator::GetLinearApproximation(
+    double atPoint[], double &Cx, double &Lx, double &vx, double &Cy, double &Ly, double &vy, double &D, double ep) {
+  double out[2];
+  Transport2D(atPoint, out);
+  Cx = out[0];
+  Cy = out[1];
+
+  for (int i = 0; i < 5; i++) {
+    atPoint[i] += ep;
+    Transport2D(atPoint, out);
+    switch (i) {
+      case 0:
+        vx = (out[0] - Cx) / ep;
+        break;
+      case 1:
+        Lx = (out[0] - Cx) / ep;
+        break;
+      case 2:
+        vy = (out[1] - Cy) / ep;
+        break;
+      case 3:
+        Ly = (out[1] - Cy) / ep;
+        break;
+      case 4:
+        D = (out[0] - Cx) / ep;
+        break;
+    }
+    atPoint[i] -= ep;
+  }
 }
 
 //real angles in the matrix, MADX convention used only for input
-void LHCOpticsApproximator::GetLineariasedTransportMatrixX(
-    double mad_init_x, double mad_init_thx, double mad_init_y, double mad_init_thy,
-    double mad_init_xi, TMatrixD &transp_matrix, double d_mad_x, double d_mad_thx)
-{
+void LHCOpticsApproximator::GetLineariasedTransportMatrixX(double mad_init_x,
+                                                           double mad_init_thx,
+                                                           double mad_init_y,
+                                                           double mad_init_thy,
+                                                           double mad_init_xi,
+                                                           TMatrixD &transp_matrix,
+                                                           double d_mad_x,
+                                                           double d_mad_thx) {
   double MADX_momentum_correction_factor = 1.0 + mad_init_xi;
-  transp_matrix.ResizeTo(2,2);
+  transp_matrix.ResizeTo(2, 2);
   double in[5];
   in[0] = mad_init_x;
   in[1] = mad_init_thx;
@@ -1110,22 +1096,26 @@ void LHCOpticsApproximator::GetLineariasedTransportMatrixX(
   double x2_dthx = out[0];
   double thx2_dthx = out[1];
 
-//  | dx/dx,   dx/dthx    |
-//  | dthx/dx, dtchx/dthx |
+  //  | dx/dx,   dx/dthx    |
+  //  | dthx/dx, dtchx/dthx |
 
-  transp_matrix(0,0) = (x2_dx-x1)/d_mad_x;
-  transp_matrix(1,0) = (thx2_dx-thx1)/(d_mad_x*MADX_momentum_correction_factor);
-  transp_matrix(0,1) = MADX_momentum_correction_factor*(x2_dthx-x1)/d_mad_thx;
-  transp_matrix(1,1) = (thx2_dthx-thx1)/d_mad_thx;
+  transp_matrix(0, 0) = (x2_dx - x1) / d_mad_x;
+  transp_matrix(1, 0) = (thx2_dx - thx1) / (d_mad_x * MADX_momentum_correction_factor);
+  transp_matrix(0, 1) = MADX_momentum_correction_factor * (x2_dthx - x1) / d_mad_thx;
+  transp_matrix(1, 1) = (thx2_dthx - thx1) / d_mad_thx;
 }
 
 //real angles in the matrix, MADX convention used only for input
-void LHCOpticsApproximator::GetLineariasedTransportMatrixY(
-    double mad_init_x, double mad_init_thx, double mad_init_y, double mad_init_thy,
-    double mad_init_xi, TMatrixD &transp_matrix, double d_mad_y, double d_mad_thy)
-{
+void LHCOpticsApproximator::GetLineariasedTransportMatrixY(double mad_init_x,
+                                                           double mad_init_thx,
+                                                           double mad_init_y,
+                                                           double mad_init_thy,
+                                                           double mad_init_xi,
+                                                           TMatrixD &transp_matrix,
+                                                           double d_mad_y,
+                                                           double d_mad_thy) {
   double MADX_momentum_correction_factor = 1.0 + mad_init_xi;
-  transp_matrix.ResizeTo(2,2);
+  transp_matrix.ResizeTo(2, 2);
   double in[5];
   in[0] = mad_init_x;
   in[1] = mad_init_thx;
@@ -1150,21 +1140,22 @@ void LHCOpticsApproximator::GetLineariasedTransportMatrixY(
   double y2_dthy = out[2];
   double thy2_dthy = out[3];
 
-//  | dy/dy,   dy/dthy    |
-//  | dthy/dy, dtchy/dthy |
+  //  | dy/dy,   dy/dthy    |
+  //  | dthy/dy, dtchy/dthy |
 
-  transp_matrix(0,0) = (y2_dy-y1)/d_mad_y;
-  transp_matrix(1,0) = (thy2_dy-thy1)/(d_mad_y*MADX_momentum_correction_factor);
-  transp_matrix(0,1) = MADX_momentum_correction_factor*(y2_dthy-y1)/d_mad_thy;
-  transp_matrix(1,1) = (thy2_dthy-thy1)/d_mad_thy;
+  transp_matrix(0, 0) = (y2_dy - y1) / d_mad_y;
+  transp_matrix(1, 0) = (thy2_dy - thy1) / (d_mad_y * MADX_momentum_correction_factor);
+  transp_matrix(0, 1) = MADX_momentum_correction_factor * (y2_dthy - y1) / d_mad_thy;
+  transp_matrix(1, 1) = (thy2_dthy - thy1) / d_mad_thy;
 }
 
-
 //MADX convention used only for input
-double LHCOpticsApproximator::GetDx(
-    double mad_init_x, double mad_init_thx, double mad_init_y, double mad_init_thy,
-    double mad_init_xi, double d_mad_xi)
-{
+double LHCOpticsApproximator::GetDx(double mad_init_x,
+                                    double mad_init_thx,
+                                    double mad_init_y,
+                                    double mad_init_thy,
+                                    double mad_init_xi,
+                                    double d_mad_xi) {
   double in[5];
   in[0] = mad_init_x;
   in[1] = mad_init_thx;
@@ -1180,18 +1171,19 @@ double LHCOpticsApproximator::GetDx(
   in[4] = mad_init_xi + d_mad_xi;
   Transport(in, out);
   double x2_dxi = out[0];
-  double dispersion = (x2_dxi-x1)/d_mad_xi;
+  double dispersion = (x2_dxi - x1) / d_mad_xi;
 
   return dispersion;
 }
 
-
 //MADX convention used only for input
 //angular dispersion
-double LHCOpticsApproximator::GetDxds(
-    double mad_init_x, double mad_init_thx, double mad_init_y, double mad_init_thy,
-    double mad_init_xi, double d_mad_xi)
-{
+double LHCOpticsApproximator::GetDxds(double mad_init_x,
+                                      double mad_init_thx,
+                                      double mad_init_y,
+                                      double mad_init_thy,
+                                      double mad_init_xi,
+                                      double d_mad_xi) {
   double MADX_momentum_correction_factor = 1.0 + mad_init_xi;
   double in[5];
   in[0] = mad_init_x;
@@ -1203,12 +1195,12 @@ double LHCOpticsApproximator::GetDxds(
   double out[5];
 
   Transport(in, out);
-  double thx1 = out[1]/MADX_momentum_correction_factor;
+  double thx1 = out[1] / MADX_momentum_correction_factor;
 
   in[4] = mad_init_xi + d_mad_xi;
   Transport(in, out);
-  double thx2_dxi = out[1]/MADX_momentum_correction_factor;
-  double dispersion = (thx2_dxi-thx1)/d_mad_xi;
+  double thx2_dxi = out[1] / MADX_momentum_correction_factor;
+  double dispersion = (thx2_dxi - thx1) / d_mad_xi;
 
   return dispersion;
 }
diff --git a/SimTransport/TotemRPProtonTransportParametrization/src/SimTransportTotemRPProtTranspParLinkDef.h b/SimTransport/TotemRPProtonTransportParametrization/src/SimTransportTotemRPProtTranspParLinkDef.h
index d222d2716cde6..f1585e1fa74df 100644
--- a/SimTransport/TotemRPProtonTransportParametrization/src/SimTransportTotemRPProtTranspParLinkDef.h
+++ b/SimTransport/TotemRPProtonTransportParametrization/src/SimTransportTotemRPProtTranspParLinkDef.h
@@ -2,18 +2,16 @@
 #include "SimTransport/TotemRPProtonTransportParametrization/interface/LHCOpticsApproximator.h"
 #include <vector>
 
-
 #ifdef __CINT__
 
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
 
-#pragma link C++ class TMultiDimFet+;
-#pragma link C++ class LHCOpticsApproximator+;
-#pragma link C++ class LHCApertureApproximator+;
-#pragma link C++ class vector<LHCOpticsApproximator>+;
-#pragma link C++ class vector<LHCApertureApproximator>+;
-
+#pragma link C++ class TMultiDimFet + ;
+#pragma link C++ class LHCOpticsApproximator + ;
+#pragma link C++ class LHCApertureApproximator + ;
+#pragma link C++ class vector < LHCOpticsApproximator> + ;
+#pragma link C++ class vector < LHCApertureApproximator> + ;
 
 #endif
diff --git a/SimTransport/TotemRPProtonTransportParametrization/src/TMultiDimFet.cc b/SimTransport/TotemRPProtonTransportParametrization/src/TMultiDimFet.cc
index be8e1037b1284..a96c6cc0a2aae 100644
--- a/SimTransport/TotemRPProtonTransportParametrization/src/TMultiDimFet.cc
+++ b/SimTransport/TotemRPProtonTransportParametrization/src/TMultiDimFet.cc
@@ -10,7 +10,6 @@
 *
 ****************************************************************************/
 
-
 #include "Riostream.h"
 #include "SimTransport/TotemRPProtonTransportParametrization/interface/TMultiDimFet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -24,20 +23,19 @@
 
 #define RADDEG (180. / TMath::Pi())
 #define DEGRAD (TMath::Pi() / 180.)
-#define HIST_XORIG     0
-#define HIST_DORIG     1
-#define HIST_XNORM     2
-#define HIST_DSHIF     3
-#define HIST_RX        4
-#define HIST_RD        5
-#define HIST_RTRAI     6
-#define HIST_RTEST     7
+#define HIST_XORIG 0
+#define HIST_DORIG 1
+#define HIST_XNORM 2
+#define HIST_DSHIF 3
+#define HIST_RX 4
+#define HIST_RD 5
+#define HIST_RTRAI 6
+#define HIST_RTEST 7
 #define PARAM_MAXSTUDY 1
-#define PARAM_SEVERAL  2
-#define PARAM_RELERR   3
+#define PARAM_SEVERAL 2
+#define PARAM_RELERR 3
 #define PARAM_MAXTERMS 4
 
-
 //____________________________________________________________________
 //static void mdfHelper(int&, double*, double&, double*, int);
 
@@ -48,488 +46,458 @@ ClassImp(TMultiDimFet);
 // Static instance. Used with mdfHelper and TMinuit
 //TMultiDimFet* TMultiDimFet::fgInstance = nullptr;
 
-
 //____________________________________________________________________
-TMultiDimFet::TMultiDimFet()
-{
-   // Empty CTOR. Do not use
-   fMeanQuantity            = 0;
-   fMaxQuantity             = 0;
-   fMinQuantity             = 0;
-   fSumSqQuantity           = 0;
-   fSumSqAvgQuantity        = 0;
-   fPowerLimit              = 1;
+TMultiDimFet::TMultiDimFet() {
+  // Empty CTOR. Do not use
+  fMeanQuantity = 0;
+  fMaxQuantity = 0;
+  fMinQuantity = 0;
+  fSumSqQuantity = 0;
+  fSumSqAvgQuantity = 0;
+  fPowerLimit = 1;
 
-   fMaxAngle                = 0;
-   fMinAngle                = 1;
+  fMaxAngle = 0;
+  fMinAngle = 1;
 
-   fNVariables              = 0;
-   fMaxVariables            = 0;
-   fMinVariables            = 0;
-   fSampleSize              = 0;
+  fNVariables = 0;
+  fMaxVariables = 0;
+  fMinVariables = 0;
+  fSampleSize = 0;
 
-   fMaxAngle                = 0;
-   fMinAngle                = 0;
+  fMaxAngle = 0;
+  fMinAngle = 0;
 
-   fPolyType                = kMonomials;
-   fShowCorrelation         = kFALSE;
+  fPolyType = kMonomials;
+  fShowCorrelation = kFALSE;
 
-   fIsUserFunction          = kFALSE;
+  fIsUserFunction = kFALSE;
 
-   fHistograms              = nullptr;
-   fHistogramMask           = 0;
+  fHistograms = nullptr;
+  fHistogramMask = 0;
 
-   //fFitter                  = nullptr;
-   //fgInstance               = nullptr;
+  //fFitter                  = nullptr;
+  //fgInstance               = nullptr;
 }
 
-const TMultiDimFet &TMultiDimFet::operator=(const TMultiDimFet &in)
-{
-   if(this==&in)
-   {
-     return in;
-   }
+const TMultiDimFet &TMultiDimFet::operator=(const TMultiDimFet &in) {
+  if (this == &in) {
+    return in;
+  }
 
-   fMeanQuantity = in.fMeanQuantity;         // Mean of dependent quantity
+  fMeanQuantity = in.fMeanQuantity;  // Mean of dependent quantity
 
-   fMaxQuantity = 0.0;          //! Max value of dependent quantity
-   fMinQuantity = 0.0;          //! Min value of dependent quantity
-   fSumSqQuantity = 0.0;        //! SumSquare of dependent quantity
-   fSumSqAvgQuantity = 0.0;     //! Sum of squares away from mean
+  fMaxQuantity = 0.0;       //! Max value of dependent quantity
+  fMinQuantity = 0.0;       //! Min value of dependent quantity
+  fSumSqQuantity = 0.0;     //! SumSquare of dependent quantity
+  fSumSqAvgQuantity = 0.0;  //! Sum of squares away from mean
 
-   fNVariables = in.fNVariables;           // Number of independent variables
+  fNVariables = in.fNVariables;  // Number of independent variables
 
-   fMaxVariables.ResizeTo(in.fMaxVariables.GetLwb(), in.fMaxVariables.GetUpb());
-   fMaxVariables = in.fMaxVariables;         // max value of independent variables
+  fMaxVariables.ResizeTo(in.fMaxVariables.GetLwb(), in.fMaxVariables.GetUpb());
+  fMaxVariables = in.fMaxVariables;  // max value of independent variables
 
-   fMinVariables.ResizeTo(in.fMinVariables.GetLwb(), in.fMinVariables.GetUpb());
-   fMinVariables = in.fMinVariables;         // min value of independent variables
+  fMinVariables.ResizeTo(in.fMinVariables.GetLwb(), in.fMinVariables.GetUpb());
+  fMinVariables = in.fMinVariables;  // min value of independent variables
 
-   fSampleSize = 0;           //! Size of training sample
-   fTestSampleSize = 0;       //! Size of test sample
-   fMinAngle = 1;             //! Min angle for acepting new function
-   fMaxAngle = 0.0;             //! Max angle for acepting new function
+  fSampleSize = 0;      //! Size of training sample
+  fTestSampleSize = 0;  //! Size of test sample
+  fMinAngle = 1;        //! Min angle for acepting new function
+  fMaxAngle = 0.0;      //! Max angle for acepting new function
 
-   fMaxTerms = in.fMaxTerms;             // Max terms expected in final expr.
+  fMaxTerms = in.fMaxTerms;  // Max terms expected in final expr.
 
-   fMinRelativeError = 0.0;     //! Min relative error accepted
+  fMinRelativeError = 0.0;  //! Min relative error accepted
 
-   fMaxPowers.clear();            //! [fNVariables] maximum powers
-   fPowerLimit = 1;           //! Control parameter
+  fMaxPowers.clear();  //! [fNVariables] maximum powers
+  fPowerLimit = 1;     //! Control parameter
 
-   fMaxFunctions = in.fMaxFunctions;         // max number of functions
+  fMaxFunctions = in.fMaxFunctions;  // max number of functions
 
-   fFunctionCodes.clear();        //! [fMaxFunctions] acceptance code
-   fMaxStudy = 0;             //! max functions to study
+  fFunctionCodes.clear();  //! [fMaxFunctions] acceptance code
+  fMaxStudy = 0;           //! max functions to study
 
-   fMaxPowersFinal.clear();       //! [fNVariables] maximum powers from fit;
+  fMaxPowersFinal.clear();  //! [fNVariables] maximum powers from fit;
 
-   fMaxFunctionsTimesNVariables = in.fMaxFunctionsTimesNVariables;  // fMaxFunctionsTimesNVariables
-   fPowers = in.fPowers;
+  fMaxFunctionsTimesNVariables = in.fMaxFunctionsTimesNVariables;  // fMaxFunctionsTimesNVariables
+  fPowers = in.fPowers;
 
-   fPowerIndex = in.fPowerIndex;           // [fMaxTerms] Index of accepted powers
+  fPowerIndex = in.fPowerIndex;  // [fMaxTerms] Index of accepted powers
 
-   fMaxResidual = 0.0;          //! Max redsidual value
-   fMinResidual = 0.0;          //! Min redsidual value
-   fMaxResidualRow = 0;       //! Row giving max residual
-   fMinResidualRow = 0;       //! Row giving min residual
-   fSumSqResidual = 0.0;        //! Sum of Square residuals
+  fMaxResidual = 0.0;    //! Max redsidual value
+  fMinResidual = 0.0;    //! Min redsidual value
+  fMaxResidualRow = 0;   //! Row giving max residual
+  fMinResidualRow = 0;   //! Row giving min residual
+  fSumSqResidual = 0.0;  //! Sum of Square residuals
 
-   fNCoefficients = in.fNCoefficients;        // Dimension of model coefficients
+  fNCoefficients = in.fNCoefficients;  // Dimension of model coefficients
 
-   fCoefficients.ResizeTo(in.fCoefficients.GetLwb(), in.fCoefficients.GetUpb());
-   fCoefficients = in.fCoefficients;         // Vector of the final coefficients
+  fCoefficients.ResizeTo(in.fCoefficients.GetLwb(), in.fCoefficients.GetUpb());
+  fCoefficients = in.fCoefficients;  // Vector of the final coefficients
 
-   fRMS = 0.0;                  //! Root mean square of fit
-   fChi2 = 0.0;                 //! Chi square of fit
-   fParameterisationCode = 0; //! Exit code of parameterisation
-   fError = 0.0;                //! Error from parameterization
-   fTestError = 0.0;            //! Error from test
-   fPrecision = 0.0;            //! Relative precision of param
-   fTestPrecision = 0.0;        //! Relative precision of test
-   fCorrelationCoeff = 0.0;     //! Multi Correlation coefficient
-   fTestCorrelationCoeff = 0.0; //! Multi Correlation coefficient
-   fHistograms = nullptr;           //! List of histograms
-   fHistogramMask = 0;        //! Bit pattern of hisograms used
-   //fFitter = nullptr;            //! Fit object (MINUIT)
+  fRMS = 0.0;                   //! Root mean square of fit
+  fChi2 = 0.0;                  //! Chi square of fit
+  fParameterisationCode = 0;    //! Exit code of parameterisation
+  fError = 0.0;                 //! Error from parameterization
+  fTestError = 0.0;             //! Error from test
+  fPrecision = 0.0;             //! Relative precision of param
+  fTestPrecision = 0.0;         //! Relative precision of test
+  fCorrelationCoeff = 0.0;      //! Multi Correlation coefficient
+  fTestCorrelationCoeff = 0.0;  //! Multi Correlation coefficient
+  fHistograms = nullptr;        //! List of histograms
+  fHistogramMask = 0;           //! Bit pattern of hisograms used
+  //fFitter = nullptr;            //! Fit object (MINUIT)
 
-   fPolyType = in.fPolyType;             // Type of polynomials to use
-   fShowCorrelation = in.fShowCorrelation;      // print correlation matrix
-   fIsUserFunction = in.fIsUserFunction;       // Flag for user defined function
-   fIsVerbose = in.fIsVerbose;            //
-   return in;
+  fPolyType = in.fPolyType;                // Type of polynomials to use
+  fShowCorrelation = in.fShowCorrelation;  // print correlation matrix
+  fIsUserFunction = in.fIsUserFunction;    // Flag for user defined function
+  fIsVerbose = in.fIsVerbose;              //
+  return in;
 }
 
-
 //____________________________________________________________________
-TMultiDimFet::TMultiDimFet(Int_t dimension,
-                           EMDFPolyType type,
-                           Option_t *option)
-  : TNamed("multidimfit","Multi-dimensional fit object"),
-    fQuantity(dimension),
-    fSqError(dimension),
-    fVariables(dimension*100),
-    fMeanVariables(dimension),
-    fMaxVariables(dimension),
-    fMinVariables(dimension)
-{
-   // Constructor
-   // Second argument is the type of polynomials to use in
-   // parameterisation, one of:
-   //      TMultiDimFet::kMonomials
-   //      TMultiDimFet::kChebyshev
-   //      TMultiDimFet::kLegendre
-   //
-   // Options:
-   //   K      Compute (k)correlation matrix
-   //   V      Be verbose
-   //
-   // Default is no options.
-   //
-
-   //fgInstance = this;
-
-   fMeanQuantity           = 0;
-   fMaxQuantity            = 0;
-   fMinQuantity            = 0;
-   fSumSqQuantity          = 0;
-   fSumSqAvgQuantity       = 0;
-   fPowerLimit             = 1;
-
-   fMaxAngle               = 0;
-   fMinAngle               = 1;
-
-   fNVariables             = dimension;
-   fMaxVariables           = 0;
-   fMaxFunctionsTimesNVariables = fMaxFunctions * fNVariables;
-   fMinVariables           = 0;
-   fSampleSize             = 0;
-   fTestSampleSize         = 0;
-   fMinRelativeError       = 0.01;
-   fError                  = 0;
-   fTestError              = 0;
-   fPrecision              = 0;
-   fTestPrecision          = 0;
-   fParameterisationCode   = 0;
-
-   fPolyType               = type;
-   fShowCorrelation        = kFALSE;
-   fIsVerbose              = kFALSE;
-
-   TString opt             = option;
-   opt.ToLower();
-
-   if (opt.Contains("k")) fShowCorrelation = kTRUE;
-   if (opt.Contains("v")) fIsVerbose       = kTRUE;
-
-   fIsUserFunction         = kFALSE;
-
-   fHistograms             = nullptr;
-   fHistogramMask          = 0;
-
-   fMaxPowers.resize(dimension);
-   fMaxPowersFinal.resize(dimension);
-   //fFitter                 = nullptr;
+TMultiDimFet::TMultiDimFet(Int_t dimension, EMDFPolyType type, Option_t *option)
+    : TNamed("multidimfit", "Multi-dimensional fit object"),
+      fQuantity(dimension),
+      fSqError(dimension),
+      fVariables(dimension * 100),
+      fMeanVariables(dimension),
+      fMaxVariables(dimension),
+      fMinVariables(dimension) {
+  // Constructor
+  // Second argument is the type of polynomials to use in
+  // parameterisation, one of:
+  //      TMultiDimFet::kMonomials
+  //      TMultiDimFet::kChebyshev
+  //      TMultiDimFet::kLegendre
+  //
+  // Options:
+  //   K      Compute (k)correlation matrix
+  //   V      Be verbose
+  //
+  // Default is no options.
+  //
+
+  //fgInstance = this;
+
+  fMeanQuantity = 0;
+  fMaxQuantity = 0;
+  fMinQuantity = 0;
+  fSumSqQuantity = 0;
+  fSumSqAvgQuantity = 0;
+  fPowerLimit = 1;
+
+  fMaxAngle = 0;
+  fMinAngle = 1;
+
+  fNVariables = dimension;
+  fMaxVariables = 0;
+  fMaxFunctionsTimesNVariables = fMaxFunctions * fNVariables;
+  fMinVariables = 0;
+  fSampleSize = 0;
+  fTestSampleSize = 0;
+  fMinRelativeError = 0.01;
+  fError = 0;
+  fTestError = 0;
+  fPrecision = 0;
+  fTestPrecision = 0;
+  fParameterisationCode = 0;
+
+  fPolyType = type;
+  fShowCorrelation = kFALSE;
+  fIsVerbose = kFALSE;
+
+  TString opt = option;
+  opt.ToLower();
+
+  if (opt.Contains("k"))
+    fShowCorrelation = kTRUE;
+  if (opt.Contains("v"))
+    fIsVerbose = kTRUE;
+
+  fIsUserFunction = kFALSE;
+
+  fHistograms = nullptr;
+  fHistogramMask = 0;
+
+  fMaxPowers.resize(dimension);
+  fMaxPowersFinal.resize(dimension);
+  //fFitter                 = nullptr;
 }
 
-
 //____________________________________________________________________
-TMultiDimFet::~TMultiDimFet()
-{
-   if (fHistograms) fHistograms->Clear("nodelete");
-     delete fHistograms;
+TMultiDimFet::~TMultiDimFet() {
+  if (fHistograms)
+    fHistograms->Clear("nodelete");
+  delete fHistograms;
 }
 
-
 //____________________________________________________________________
-void TMultiDimFet::AddRow(const Double_t *x, Double_t D, Double_t E)
-{
-   // Add a row consisting of fNVariables independent variables, the
-   // known, dependent quantity, and optionally, the square error in
-   // the dependent quantity, to the training sample to be used for the
-   // parameterization.
-   // The mean of the variables and quantity is calculated on the fly,
-   // as outlined in TPrincipal::AddRow.
-   // This sample should be representive of the problem at hand.
-   // Please note, that if no error is given Poisson statistics is
-   // assumed and the square error is set to the value of dependent
-   // quantity.  See also the
-   // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
-   if (!x)
-      return;
-
-   if (++fSampleSize == 1) {
-      fMeanQuantity  = D;
-      fMaxQuantity   = D;
-      fMinQuantity   = D;
-   }
-   else {
-      fMeanQuantity  *= 1 - 1./Double_t(fSampleSize);
-      fMeanQuantity  += D / Double_t(fSampleSize);
-      fSumSqQuantity += D * D;
-
-      if (D >= fMaxQuantity) fMaxQuantity = D;
-      if (D <= fMinQuantity) fMinQuantity = D;
-   }
-
-
-   // If the vector isn't big enough to hold the new data, then
-   // expand the vector by half it's size.
-   Int_t size = fQuantity.GetNrows();
-   if (fSampleSize > size) {
-      fQuantity.ResizeTo(size + size/2);
-      fSqError.ResizeTo(size + size/2);
-   }
-
-   // Store the value
-   fQuantity(fSampleSize-1) = D;
-   fSqError(fSampleSize-1) = (E == 0 ? D : E);
-
-   // Store data point in internal vector
-   // If the vector isn't big enough to hold the new data, then
-   // expand the vector by half it's size
-   size = fVariables.GetNrows();
-   if (fSampleSize * fNVariables > size)
-      fVariables.ResizeTo(size + size/2);
-
-
-   // Increment the data point counter
-   Int_t i,j;
-   for (i = 0; i < fNVariables; i++) {
-      if (fSampleSize == 1) {
-         fMeanVariables(i) = x[i];
-         fMaxVariables(i)  = x[i];
-         fMinVariables(i)  = x[i];
-      }
-      else {
-         fMeanVariables(i) *= 1 - 1./Double_t(fSampleSize);
-         fMeanVariables(i) += x[i] / Double_t(fSampleSize);
+void TMultiDimFet::AddRow(const Double_t *x, Double_t D, Double_t E) {
+  // Add a row consisting of fNVariables independent variables, the
+  // known, dependent quantity, and optionally, the square error in
+  // the dependent quantity, to the training sample to be used for the
+  // parameterization.
+  // The mean of the variables and quantity is calculated on the fly,
+  // as outlined in TPrincipal::AddRow.
+  // This sample should be representive of the problem at hand.
+  // Please note, that if no error is given Poisson statistics is
+  // assumed and the square error is set to the value of dependent
+  // quantity.  See also the
+  // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
+  if (!x)
+    return;
 
-         // Update the maximum value for this component
-         if (x[i] >= fMaxVariables(i)) fMaxVariables(i)  = x[i];
+  if (++fSampleSize == 1) {
+    fMeanQuantity = D;
+    fMaxQuantity = D;
+    fMinQuantity = D;
+  } else {
+    fMeanQuantity *= 1 - 1. / Double_t(fSampleSize);
+    fMeanQuantity += D / Double_t(fSampleSize);
+    fSumSqQuantity += D * D;
+
+    if (D >= fMaxQuantity)
+      fMaxQuantity = D;
+    if (D <= fMinQuantity)
+      fMinQuantity = D;
+  }
 
-         // Update the minimum value for this component
-         if (x[i] <= fMinVariables(i)) fMinVariables(i)  = x[i];
+  // If the vector isn't big enough to hold the new data, then
+  // expand the vector by half it's size.
+  Int_t size = fQuantity.GetNrows();
+  if (fSampleSize > size) {
+    fQuantity.ResizeTo(size + size / 2);
+    fSqError.ResizeTo(size + size / 2);
+  }
 
-      }
+  // Store the value
+  fQuantity(fSampleSize - 1) = D;
+  fSqError(fSampleSize - 1) = (E == 0 ? D : E);
+
+  // Store data point in internal vector
+  // If the vector isn't big enough to hold the new data, then
+  // expand the vector by half it's size
+  size = fVariables.GetNrows();
+  if (fSampleSize * fNVariables > size)
+    fVariables.ResizeTo(size + size / 2);
+
+  // Increment the data point counter
+  Int_t i, j;
+  for (i = 0; i < fNVariables; i++) {
+    if (fSampleSize == 1) {
+      fMeanVariables(i) = x[i];
+      fMaxVariables(i) = x[i];
+      fMinVariables(i) = x[i];
+    } else {
+      fMeanVariables(i) *= 1 - 1. / Double_t(fSampleSize);
+      fMeanVariables(i) += x[i] / Double_t(fSampleSize);
+
+      // Update the maximum value for this component
+      if (x[i] >= fMaxVariables(i))
+        fMaxVariables(i) = x[i];
+
+      // Update the minimum value for this component
+      if (x[i] <= fMinVariables(i))
+        fMinVariables(i) = x[i];
+    }
 
-      // Store the data.
-      j = (fSampleSize-1) * fNVariables + i;
-      fVariables(j) = x[i];
-   }
+    // Store the data.
+    j = (fSampleSize - 1) * fNVariables + i;
+    fVariables(j) = x[i];
+  }
 }
 
-
 //____________________________________________________________________
-void TMultiDimFet::AddTestRow(const Double_t *x, Double_t D, Double_t E)
-{
-   // Add a row consisting of fNVariables independent variables, the
-   // known, dependent quantity, and optionally, the square error in
-   // the dependent quantity, to the test sample to be used for the
-   // test of the parameterization.
-   // This sample needn't be representive of the problem at hand.
-   // Please note, that if no error is given Poisson statistics is
-   // assumed and the square error is set to the value of dependent
-   // quantity.  See also the
-   // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
-   if (fTestSampleSize++ == 0) {
-      fTestQuantity.ResizeTo(fNVariables);
-      fTestSqError.ResizeTo(fNVariables);
-      fTestVariables.ResizeTo(fNVariables * 100);
-   }
+void TMultiDimFet::AddTestRow(const Double_t *x, Double_t D, Double_t E) {
+  // Add a row consisting of fNVariables independent variables, the
+  // known, dependent quantity, and optionally, the square error in
+  // the dependent quantity, to the test sample to be used for the
+  // test of the parameterization.
+  // This sample needn't be representive of the problem at hand.
+  // Please note, that if no error is given Poisson statistics is
+  // assumed and the square error is set to the value of dependent
+  // quantity.  See also the
+  // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
+  if (fTestSampleSize++ == 0) {
+    fTestQuantity.ResizeTo(fNVariables);
+    fTestSqError.ResizeTo(fNVariables);
+    fTestVariables.ResizeTo(fNVariables * 100);
+  }
 
-   // If the vector isn't big enough to hold the new data, then
-   // expand the vector by half it's size.
-   Int_t size = fTestQuantity.GetNrows();
-   if (fTestSampleSize > size) {
-      fTestQuantity.ResizeTo(size + size/2);
-      fTestSqError.ResizeTo(size + size/2);
-   }
+  // If the vector isn't big enough to hold the new data, then
+  // expand the vector by half it's size.
+  Int_t size = fTestQuantity.GetNrows();
+  if (fTestSampleSize > size) {
+    fTestQuantity.ResizeTo(size + size / 2);
+    fTestSqError.ResizeTo(size + size / 2);
+  }
 
-   // Store the value
-   fTestQuantity(fTestSampleSize-1) = D;
-   fTestSqError(fTestSampleSize-1) = (E == 0 ? D : E);
-
-   // Store data point in internal vector
-   // If the vector isn't big enough to hold the new data, then
-   // expand the vector by half it's size
-   size = fTestVariables.GetNrows();
-   if (fTestSampleSize * fNVariables > size)
-      fTestVariables.ResizeTo(size + size/2);
-
-
-   // Increment the data point counter
-   Int_t i,j;
-   for (i = 0; i < fNVariables; i++) {
-      j = fNVariables * (fTestSampleSize - 1) + i;
-      fTestVariables(j) = x[i];
-
-      if (x[i] > fMaxVariables(i))
-         Warning("AddTestRow", "variable %d (row: %d) too large: %f > %f",
-         i, fTestSampleSize, x[i], fMaxVariables(i));
-      if (x[i] < fMinVariables(i))
-         Warning("AddTestRow", "variable %d (row: %d) too small: %f < %f",
-         i, fTestSampleSize, x[i], fMinVariables(i));
-   }
+  // Store the value
+  fTestQuantity(fTestSampleSize - 1) = D;
+  fTestSqError(fTestSampleSize - 1) = (E == 0 ? D : E);
+
+  // Store data point in internal vector
+  // If the vector isn't big enough to hold the new data, then
+  // expand the vector by half it's size
+  size = fTestVariables.GetNrows();
+  if (fTestSampleSize * fNVariables > size)
+    fTestVariables.ResizeTo(size + size / 2);
+
+  // Increment the data point counter
+  Int_t i, j;
+  for (i = 0; i < fNVariables; i++) {
+    j = fNVariables * (fTestSampleSize - 1) + i;
+    fTestVariables(j) = x[i];
+
+    if (x[i] > fMaxVariables(i))
+      Warning("AddTestRow", "variable %d (row: %d) too large: %f > %f", i, fTestSampleSize, x[i], fMaxVariables(i));
+    if (x[i] < fMinVariables(i))
+      Warning("AddTestRow", "variable %d (row: %d) too small: %f < %f", i, fTestSampleSize, x[i], fMinVariables(i));
+  }
 }
 
-
 //____________________________________________________________________
-void TMultiDimFet::Clear(Option_t *option)
-{
-   // Clear internal structures and variables
-   Int_t i, j, n = fNVariables, m = fMaxFunctions;
-
-   // Training sample, dependent quantity
-   fQuantity.Zero();
-   fSqError.Zero();
-   fMeanQuantity                 = 0;
-   fMaxQuantity                  = 0;
-   fMinQuantity                  = 0;
-   fSumSqQuantity                = 0;
-   fSumSqAvgQuantity             = 0;
-
-   // Training sample, independent variables
-   fVariables.Zero();
-   fNVariables                   = 0;
-   fSampleSize                   = 0;
-   fMeanVariables.Zero();
-   fMaxVariables.Zero();
-   fMinVariables.Zero();
-
-   // Test sample
-   fTestQuantity.Zero();
-   fTestSqError.Zero();
-   fTestVariables.Zero();
-   fTestSampleSize               = 0;
-
-   // Functions
-   fFunctions.Zero();
-   fMaxFunctions                 = 0;
-   fMaxStudy                     = 0;
-   fMaxFunctionsTimesNVariables  = 0;
-   fOrthFunctions.Zero();
-   fOrthFunctionNorms.Zero();
-
-   // Control parameters
-   fMinRelativeError             = 0;
-   fMinAngle                     = 0;
-   fMaxAngle                     = 0;
-   fMaxTerms                     = 0;
-
-   // Powers
-   for (i = 0; i < n; i++) {
-      fMaxPowers[i]               = 0;
-      fMaxPowersFinal[i]          = 0;
-      for (j = 0; j < m; j++)
-         fPowers[i * n + j]        = 0;
-   }
-   fPowerLimit                   = 0;
-
-   // Residuals
-   fMaxResidual                  = 0;
-   fMinResidual                  = 0;
-   fMaxResidualRow               = 0;
-   fMinResidualRow               = 0;
-   fSumSqResidual                = 0;
-
-   // Fit
-   fNCoefficients                = 0;
-   fOrthCoefficients             = 0;
-   fOrthCurvatureMatrix          = 0;
-   fRMS                          = 0;
-   fCorrelationMatrix.Zero();
-   fError                        = 0;
-   fTestError                    = 0;
-   fPrecision                    = 0;
-   fTestPrecision                = 0;
-
-   // Coefficients
-   fCoefficients.Zero();
-   fCoefficientsRMS.Zero();
-   fResiduals.Zero();
-   fHistograms->Clear(option);
-
-   // Options
-   fPolyType                     = kMonomials;
-   fShowCorrelation              = kFALSE;
-   fIsUserFunction               = kFALSE;
+void TMultiDimFet::Clear(Option_t *option) {
+  // Clear internal structures and variables
+  Int_t i, j, n = fNVariables, m = fMaxFunctions;
+
+  // Training sample, dependent quantity
+  fQuantity.Zero();
+  fSqError.Zero();
+  fMeanQuantity = 0;
+  fMaxQuantity = 0;
+  fMinQuantity = 0;
+  fSumSqQuantity = 0;
+  fSumSqAvgQuantity = 0;
+
+  // Training sample, independent variables
+  fVariables.Zero();
+  fNVariables = 0;
+  fSampleSize = 0;
+  fMeanVariables.Zero();
+  fMaxVariables.Zero();
+  fMinVariables.Zero();
+
+  // Test sample
+  fTestQuantity.Zero();
+  fTestSqError.Zero();
+  fTestVariables.Zero();
+  fTestSampleSize = 0;
+
+  // Functions
+  fFunctions.Zero();
+  fMaxFunctions = 0;
+  fMaxStudy = 0;
+  fMaxFunctionsTimesNVariables = 0;
+  fOrthFunctions.Zero();
+  fOrthFunctionNorms.Zero();
+
+  // Control parameters
+  fMinRelativeError = 0;
+  fMinAngle = 0;
+  fMaxAngle = 0;
+  fMaxTerms = 0;
+
+  // Powers
+  for (i = 0; i < n; i++) {
+    fMaxPowers[i] = 0;
+    fMaxPowersFinal[i] = 0;
+    for (j = 0; j < m; j++)
+      fPowers[i * n + j] = 0;
+  }
+  fPowerLimit = 0;
+
+  // Residuals
+  fMaxResidual = 0;
+  fMinResidual = 0;
+  fMaxResidualRow = 0;
+  fMinResidualRow = 0;
+  fSumSqResidual = 0;
+
+  // Fit
+  fNCoefficients = 0;
+  fOrthCoefficients = 0;
+  fOrthCurvatureMatrix = 0;
+  fRMS = 0;
+  fCorrelationMatrix.Zero();
+  fError = 0;
+  fTestError = 0;
+  fPrecision = 0;
+  fTestPrecision = 0;
+
+  // Coefficients
+  fCoefficients.Zero();
+  fCoefficientsRMS.Zero();
+  fResiduals.Zero();
+  fHistograms->Clear(option);
+
+  // Options
+  fPolyType = kMonomials;
+  fShowCorrelation = kFALSE;
+  fIsUserFunction = kFALSE;
 }
 
-
 //____________________________________________________________________
-Double_t TMultiDimFet::Eval(const Double_t *x, const Double_t* coeff) const
-{
-   // Evaluate parameterization at point x. Optional argument coeff is
-   // a vector of coefficients for the parameterisation, fNCoefficients
-   // elements long.
-//   int fMaxFunctionsTimesNVariables = fMaxFunctions * fNVariables;
-   Double_t returnValue = fMeanQuantity;
-   Double_t term        = 0;
-   Int_t    i, j;
-
-   for (i = 0; i < fNCoefficients; i++) {
-      // Evaluate the ith term in the expansion
-      term = (coeff ? coeff[i] : fCoefficients(i));
-      for (j = 0; j < fNVariables; j++) {
-         // Evaluate the factor (polynomial) in the j-th variable.
-         Int_t    p  =  fPowers[fPowerIndex[i] * fNVariables + j];
-         Double_t y  =  1 + 2. / (fMaxVariables(j) - fMinVariables(j))
-            * (x[j] - fMaxVariables(j));
-         term        *= EvalFactor(p,y);
-      }
-      // Add this term to the final result
-      returnValue += term;
-   }
-   return returnValue;
+Double_t TMultiDimFet::Eval(const Double_t *x, const Double_t *coeff) const {
+  // Evaluate parameterization at point x. Optional argument coeff is
+  // a vector of coefficients for the parameterisation, fNCoefficients
+  // elements long.
+  //   int fMaxFunctionsTimesNVariables = fMaxFunctions * fNVariables;
+  Double_t returnValue = fMeanQuantity;
+  Double_t term = 0;
+  Int_t i, j;
+
+  for (i = 0; i < fNCoefficients; i++) {
+    // Evaluate the ith term in the expansion
+    term = (coeff ? coeff[i] : fCoefficients(i));
+    for (j = 0; j < fNVariables; j++) {
+      // Evaluate the factor (polynomial) in the j-th variable.
+      Int_t p = fPowers[fPowerIndex[i] * fNVariables + j];
+      Double_t y = 1 + 2. / (fMaxVariables(j) - fMinVariables(j)) * (x[j] - fMaxVariables(j));
+      term *= EvalFactor(p, y);
+    }
+    // Add this term to the final result
+    returnValue += term;
+  }
+  return returnValue;
 }
 
-
-void TMultiDimFet::ReducePolynomial(double error)
-{
-  if(error == 0.0)
+void TMultiDimFet::ReducePolynomial(double error) {
+  if (error == 0.0)
     return;
-  else
-  {
+  else {
     ZeroDoubiousCoefficients(error);
   }
 }
 
-void TMultiDimFet::ZeroDoubiousCoefficients(double error)
-{
+void TMultiDimFet::ZeroDoubiousCoefficients(double error) {
   typedef std::multimap<double, int> cmt;
   cmt m;
 
-  for (int i = 0; i < fNCoefficients; i++)
-  {
+  for (int i = 0; i < fNCoefficients; i++) {
     m.insert(std::pair<double, int>(TMath::Abs(fCoefficients(i)), i));
   }
 
-  double del_error_abs=0;
-  int deleted_terms_count=0;
+  double del_error_abs = 0;
+  int deleted_terms_count = 0;
 
-  for(cmt::iterator it = m.begin(); it!=m.end() && del_error_abs<error; ++it)
-  {
-    if(TMath::Abs(it->first)+del_error_abs<error)
-    {
-      fCoefficients(it->second)=0.0;
-      del_error_abs = TMath::Abs(it->first)+del_error_abs;
+  for (cmt::iterator it = m.begin(); it != m.end() && del_error_abs < error; ++it) {
+    if (TMath::Abs(it->first) + del_error_abs < error) {
+      fCoefficients(it->second) = 0.0;
+      del_error_abs = TMath::Abs(it->first) + del_error_abs;
       deleted_terms_count++;
-    }
-    else
+    } else
       break;
   }
 
-  int fNCoefficients_new = fNCoefficients-deleted_terms_count;
+  int fNCoefficients_new = fNCoefficients - deleted_terms_count;
   TVectorD fCoefficients_new(fNCoefficients_new);
   std::vector<Int_t> fPowerIndex_new;
 
-  int ind=0;
-  for(int i = 0; i < fNCoefficients; i++)
-  {
-    if(fCoefficients(i)!=0.0)
-    {
-      fCoefficients_new(ind)=fCoefficients(i);
+  int ind = 0;
+  for (int i = 0; i < fNCoefficients; i++) {
+    if (fCoefficients(i) != 0.0) {
+      fCoefficients_new(ind) = fCoefficients(i);
       fPowerIndex_new.push_back(fPowerIndex[i]);
       ind++;
     }
@@ -538,75 +506,71 @@ void TMultiDimFet::ZeroDoubiousCoefficients(double error)
   fCoefficients.ResizeTo(fNCoefficients);
   fCoefficients = fCoefficients_new;
   fPowerIndex = fPowerIndex_new;
-  edm::LogInfo("TMultiDimFet")<<deleted_terms_count<<" terms removed"<<"\n";
+  edm::LogInfo("TMultiDimFet") << deleted_terms_count << " terms removed"
+                               << "\n";
 }
 
-
 //____________________________________________________________________
-Double_t TMultiDimFet::EvalControl(const Int_t *iv)
-{
-   // PRIVATE METHOD:
-   // Calculate the control parameter from the passed powers
-   Double_t s = 0;
-   Double_t epsilon = 1e-6; // a small number
-   for (Int_t i = 0; i < fNVariables; i++) {
-      if (fMaxPowers[i] != 1)
-         s += (epsilon + iv[i] - 1) / (epsilon + fMaxPowers[i] - 1);
-   }
-   return s;
+Double_t TMultiDimFet::EvalControl(const Int_t *iv) {
+  // PRIVATE METHOD:
+  // Calculate the control parameter from the passed powers
+  Double_t s = 0;
+  Double_t epsilon = 1e-6;  // a small number
+  for (Int_t i = 0; i < fNVariables; i++) {
+    if (fMaxPowers[i] != 1)
+      s += (epsilon + iv[i] - 1) / (epsilon + fMaxPowers[i] - 1);
+  }
+  return s;
 }
 
 //____________________________________________________________________
-Double_t TMultiDimFet::EvalFactor(Int_t p, Double_t x) const
-{
-   // PRIVATE METHOD:
-   // Evaluate function with power p at variable value x
-   Int_t    i   = 0;
-   Double_t p1  = 1;
-   Double_t p2  = 0;
-   Double_t p3  = 0;
-   Double_t r   = 0;
-
-   switch(p) {
-      case 1:
-         r = 1;
-         break;
-      case 2:
-         r =  x;
-         break;
-      default:
-         p2 = x;
-         for (i = 3; i <= p; i++) {
-            p3 = p2 * x;
-            if (fPolyType == kLegendre)
-            p3 = ((2 * i - 3) * p2 * x - (i - 2) * p1) / (i - 1);
-            else if (fPolyType == kChebyshev)
-            p3 = 2 * x * p2 - p1;
-            p1 = p2;
-            p2 = p3;
-         }
-         r = p3;
-   }
+Double_t TMultiDimFet::EvalFactor(Int_t p, Double_t x) const {
+  // PRIVATE METHOD:
+  // Evaluate function with power p at variable value x
+  Int_t i = 0;
+  Double_t p1 = 1;
+  Double_t p2 = 0;
+  Double_t p3 = 0;
+  Double_t r = 0;
+
+  switch (p) {
+    case 1:
+      r = 1;
+      break;
+    case 2:
+      r = x;
+      break;
+    default:
+      p2 = x;
+      for (i = 3; i <= p; i++) {
+        p3 = p2 * x;
+        if (fPolyType == kLegendre)
+          p3 = ((2 * i - 3) * p2 * x - (i - 2) * p1) / (i - 1);
+        else if (fPolyType == kChebyshev)
+          p3 = 2 * x * p2 - p1;
+        p1 = p2;
+        p2 = p3;
+      }
+      r = p3;
+  }
 
-   return r;
+  return r;
 }
 
-
 //____________________________________________________________________
-void TMultiDimFet::FindParameterization(double precision)
-{
-   // Find the parameterization
-   //
-   // Options:
-   //     None so far
-   //
-   // For detailed description of what this entails, please refer to the
-   // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
-   MakeNormalized();
-   MakeCandidates();
-   MakeParameterization();
-   MakeCoefficients();
-   ReducePolynomial(precision);
+void TMultiDimFet::FindParameterization(double precision) {
+  // Find the parameterization
+  //
+  // Options:
+  //     None so far
+  //
+  // For detailed description of what this entails, please refer to the
+  // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
+  MakeNormalized();
+  MakeCandidates();
+  MakeParameterization();
+  MakeCoefficients();
+  ReducePolynomial(precision);
 }
 
 //____________________________________________________________________
@@ -690,1427 +654,1450 @@ void TMultiDimFet::Fit(Option_t *option)
 */
 
 //____________________________________________________________________
-void TMultiDimFet::MakeCandidates()
-{
-   // PRIVATE METHOD:
-   // Create list of candidate functions for the parameterisation. See
-   // also
-   // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
-   Int_t i = 0;
-   Int_t j = 0;
-   Int_t k = 0;
-
-   // The temporary array to store the powers in. We don't need to
-   // initialize this array however.
-   Int_t *powers = new Int_t[fNVariables * fMaxFunctions];
-
-   // store of `control variables'
-   Double_t* control  = new Double_t[fMaxFunctions];
-
-   // We've better initialize the variables
-   Int_t *iv = new Int_t[fNVariables];
-   for (i = 0; i < fNVariables; i++)
-      iv[i] = 1;
+void TMultiDimFet::MakeCandidates() {
+  // PRIVATE METHOD:
+  // Create list of candidate functions for the parameterisation. See
+  // also
+  // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
+  Int_t i = 0;
+  Int_t j = 0;
+  Int_t k = 0;
+
+  // The temporary array to store the powers in. We don't need to
+  // initialize this array however.
+  Int_t *powers = new Int_t[fNVariables * fMaxFunctions];
+
+  // store of `control variables'
+  Double_t *control = new Double_t[fMaxFunctions];
+
+  // We've better initialize the variables
+  Int_t *iv = new Int_t[fNVariables];
+  for (i = 0; i < fNVariables; i++)
+    iv[i] = 1;
+
+  if (!fIsUserFunction) {
+    // Number of funcs selected
+    Int_t numberFunctions = 0;
+
+    // Absolute max number of functions
+    Int_t maxNumberFunctions = 1;
+    for (i = 0; i < fNVariables; i++)
+      maxNumberFunctions *= fMaxPowers[i];
+
+    while (kTRUE) {
+      // Get the control value for this function
+      Double_t s = EvalControl(iv);
+
+      if (s <= fPowerLimit) {
+        // Call over-loadable method Select, as to allow the user to
+        // interfere with the selection of functions.
+        if (Select(iv)) {
+          numberFunctions++;
+
+          // If we've reached the user defined limit of how many
+          // functions we can consider, break out of the loop
+          if (numberFunctions > fMaxFunctions)
+            break;
 
-   if (!fIsUserFunction) {
+          // Store the control value, so we can sort array of powers
+          // later on
+          control[numberFunctions - 1] = Int_t(1.0e+6 * s);
 
-      // Number of funcs selected
-      Int_t     numberFunctions = 0;
+          // Store the powers in powers array.
+          for (i = 0; i < fNVariables; i++) {
+            j = (numberFunctions - 1) * fNVariables + i;
+            powers[j] = iv[i];
+          }
+        }  // if (Select())
+      }    // if (s <= fPowerLimit)
 
-      // Absolute max number of functions
-      Int_t maxNumberFunctions = 1;
       for (i = 0; i < fNVariables; i++)
-         maxNumberFunctions *= fMaxPowers[i];
-
-      while (kTRUE) {
-         // Get the control value for this function
-         Double_t s = EvalControl(iv);
-
-         if (s <= fPowerLimit) {
-
-            // Call over-loadable method Select, as to allow the user to
-            // interfere with the selection of functions.
-            if (Select(iv)) {
-               numberFunctions++;
-
-               // If we've reached the user defined limit of how many
-               // functions we can consider, break out of the loop
-               if (numberFunctions > fMaxFunctions)
-                  break;
-
-               // Store the control value, so we can sort array of powers
-               // later on
-               control[numberFunctions-1] = Int_t(1.0e+6*s);
-
-               // Store the powers in powers array.
-               for (i = 0; i < fNVariables; i++) {
-                  j = (numberFunctions - 1) * fNVariables + i;
-                  powers[j] = iv[i];
-               }
-            } // if (Select())
-         } // if (s <= fPowerLimit)
-
-         for (i = 0; i < fNVariables; i++)
-            if (iv[i] < fMaxPowers[i])
-               break;
-
-         // If all variables have reached their maximum power, then we
-         // break out of the loop
-         if (i == fNVariables) {
-            fMaxFunctions = numberFunctions;
-            fMaxFunctionsTimesNVariables = fMaxFunctions * fNVariables;
-            break;
-         }
-
-         // Next power in variable i
-         iv[i]++;
-
-         for (j = 0; j < i; j++)
-            iv[j] = 1;
-      } // while (kTRUE)
-   }
-   else {
-      // In case the user gave an explicit function
-      for (i = 0; i < fMaxFunctions; i++) {
-         // Copy the powers to working arrays
-         for (j = 0; j < fNVariables; j++) {
-            powers[i * fNVariables + j] = fPowers[i * fNVariables + j];
-            iv[j]                 = fPowers[i * fNVariables + j];
-         }
-
-         control[i] = Int_t(1.0e+6*EvalControl(iv));
+        if (iv[i] < fMaxPowers[i])
+          break;
+
+      // If all variables have reached their maximum power, then we
+      // break out of the loop
+      if (i == fNVariables) {
+        fMaxFunctions = numberFunctions;
+        fMaxFunctionsTimesNVariables = fMaxFunctions * fNVariables;
+        break;
       }
-   }
 
-   // Now we need to sort the powers according to least `control
-   // variable'
-   Int_t *order = new Int_t[fMaxFunctions];
-   for (i = 0; i < fMaxFunctions; i++)
-      order[i] = i;
-   fPowers.resize(fMaxFunctions * fNVariables);
-
-   for (i = 0; i < fMaxFunctions; i++) {
-      Double_t x = control[i];
-      Int_t    l = order[i];
-      k = i;
-
-      for (j = i; j < fMaxFunctions; j++) {
-         if (control[j] <= x) {
-            x = control[j];
-            l = order[j];
-            k = j;
-         }
-      }
+      // Next power in variable i
+      iv[i]++;
 
-      if (k != i) {
-         control[k] = control[i];
-         control[i] = x;
-         order[k]   = order[i];
-         order[i]   = l;
+      for (j = 0; j < i; j++)
+        iv[j] = 1;
+    }  // while (kTRUE)
+  } else {
+    // In case the user gave an explicit function
+    for (i = 0; i < fMaxFunctions; i++) {
+      // Copy the powers to working arrays
+      for (j = 0; j < fNVariables; j++) {
+        powers[i * fNVariables + j] = fPowers[i * fNVariables + j];
+        iv[j] = fPowers[i * fNVariables + j];
       }
-   }
 
-   for (i = 0; i < fMaxFunctions; i++)
-      for (j = 0; j < fNVariables; j++)
-         fPowers[i * fNVariables + j] = powers[order[i] * fNVariables + j];
+      control[i] = Int_t(1.0e+6 * EvalControl(iv));
+    }
+  }
 
-   delete [] control;
-   delete [] powers;
-   delete [] order;
-   delete [] iv;
-}
+  // Now we need to sort the powers according to least `control
+  // variable'
+  Int_t *order = new Int_t[fMaxFunctions];
+  for (i = 0; i < fMaxFunctions; i++)
+    order[i] = i;
+  fPowers.resize(fMaxFunctions * fNVariables);
+
+  for (i = 0; i < fMaxFunctions; i++) {
+    Double_t x = control[i];
+    Int_t l = order[i];
+    k = i;
+
+    for (j = i; j < fMaxFunctions; j++) {
+      if (control[j] <= x) {
+        x = control[j];
+        l = order[j];
+        k = j;
+      }
+    }
 
+    if (k != i) {
+      control[k] = control[i];
+      control[i] = x;
+      order[k] = order[i];
+      order[i] = l;
+    }
+  }
 
-Double_t TMultiDimFet::MakeChi2(const Double_t* coeff)
-{
-   // Calculate Chi square over either the test sample. The optional
-   // argument coeff is a vector of coefficients to use in the
-   // evaluation of the parameterisation. If coeff == 0, then the found
-   // coefficients is used.
-   // Used my MINUIT for fit (see TMultDimFit::Fit)
-   fChi2 = 0;
-   Int_t i, j;
-   Double_t* x = new Double_t[fNVariables];
-   for (i = 0; i < fTestSampleSize; i++) {
-      // Get the stored point
-      for (j = 0; j < fNVariables; j++)
-         x[j] = fTestVariables(i * fNVariables + j);
+  for (i = 0; i < fMaxFunctions; i++)
+    for (j = 0; j < fNVariables; j++)
+      fPowers[i * fNVariables + j] = powers[order[i] * fNVariables + j];
 
-      // Evaluate function. Scale to shifted values
-      Double_t f = Eval(x,coeff);
+  delete[] control;
+  delete[] powers;
+  delete[] order;
+  delete[] iv;
+}
 
-      // Calculate contribution to Chic square
-      fChi2 += 1. / TMath::Max(fTestSqError(i),1e-20)
-         * (fTestQuantity(i) - f) * (fTestQuantity(i) - f);
-   }
+Double_t TMultiDimFet::MakeChi2(const Double_t *coeff) {
+  // Calculate Chi square over either the test sample. The optional
+  // argument coeff is a vector of coefficients to use in the
+  // evaluation of the parameterisation. If coeff == 0, then the found
+  // coefficients is used.
+  // Used my MINUIT for fit (see TMultDimFit::Fit)
+  fChi2 = 0;
+  Int_t i, j;
+  Double_t *x = new Double_t[fNVariables];
+  for (i = 0; i < fTestSampleSize; i++) {
+    // Get the stored point
+    for (j = 0; j < fNVariables; j++)
+      x[j] = fTestVariables(i * fNVariables + j);
+
+    // Evaluate function. Scale to shifted values
+    Double_t f = Eval(x, coeff);
+
+    // Calculate contribution to Chic square
+    fChi2 += 1. / TMath::Max(fTestSqError(i), 1e-20) * (fTestQuantity(i) - f) * (fTestQuantity(i) - f);
+  }
 
-   // Clean up
-   delete [] x;
+  // Clean up
+  delete[] x;
 
-   return fChi2;
+  return fChi2;
 }
 
-
 //____________________________________________________________________
-void TMultiDimFet::MakeCode(const char* filename, Option_t *option)
-{
-   // Generate the file <filename> with .C appended if argument doesn't
-   // end in .cxx or .C. The contains the implementation of the
-   // function:
-   //
-   //   Double_t <funcname>(Double_t *x)
-   //
-   // which does the same as TMultiDimFet::Eval. Please refer to this
-   // method.
-   //
-   // Further, the static variables:
-   //
-   //     Int_t    gNVariables
-   //     Int_t    gNCoefficients
-   //     Double_t gDMean
-   //     Double_t gXMean[]
-   //     Double_t gXMin[]
-   //     Double_t gXMax[]
-   //     Double_t gCoefficient[]
-   //     Int_t    gPower[]
-   //
-   // are initialized. The only ROOT header file needed is Rtypes.h
-   //
-   // See TMultiDimFet::MakeRealCode for a list of options
-
-
-   TString outName(filename);
-   if (!outName.EndsWith(".C") && !outName.EndsWith(".cxx"))
-      outName += ".C";
-
-   MakeRealCode(outName.Data(),"",option);
+void TMultiDimFet::MakeCode(const char *filename, Option_t *option) {
+  // Generate the file <filename> with .C appended if argument doesn't
+  // end in .cxx or .C. The contains the implementation of the
+  // function:
+  //
+  //   Double_t <funcname>(Double_t *x)
+  //
+  // which does the same as TMultiDimFet::Eval. Please refer to this
+  // method.
+  //
+  // Further, the static variables:
+  //
+  //     Int_t    gNVariables
+  //     Int_t    gNCoefficients
+  //     Double_t gDMean
+  //     Double_t gXMean[]
+  //     Double_t gXMin[]
+  //     Double_t gXMax[]
+  //     Double_t gCoefficient[]
+  //     Int_t    gPower[]
+  //
+  // are initialized. The only ROOT header file needed is Rtypes.h
+  //
+  // See TMultiDimFet::MakeRealCode for a list of options
+
+  TString outName(filename);
+  if (!outName.EndsWith(".C") && !outName.EndsWith(".cxx"))
+    outName += ".C";
+
+  MakeRealCode(outName.Data(), "", option);
 }
 
+void TMultiDimFet::MakeCoefficientErrors() {
+  // PRIVATE METHOD:
+  // Compute the errors on the coefficients. For this to be done, the
+  // curvature matrix of the non-orthogonal functions, is computed.
+  Int_t i = 0;
+  Int_t j = 0;
+  Int_t k = 0;
+  TVectorD iF(fSampleSize);
+  TVectorD jF(fSampleSize);
+  fCoefficientsRMS.ResizeTo(fNCoefficients);
+
+  TMatrixDSym curvatureMatrix(fNCoefficients);
+
+  // Build the curvature matrix
+  for (i = 0; i < fNCoefficients; i++) {
+    iF = TMatrixDRow(fFunctions, i);
+    for (j = 0; j <= i; j++) {
+      jF = TMatrixDRow(fFunctions, j);
+      for (k = 0; k < fSampleSize; k++)
+        curvatureMatrix(i, j) += 1 / TMath::Max(fSqError(k), 1e-20) * iF(k) * jF(k);
+      curvatureMatrix(j, i) = curvatureMatrix(i, j);
+    }
+  }
 
-void TMultiDimFet::MakeCoefficientErrors()
-{
-   // PRIVATE METHOD:
-   // Compute the errors on the coefficients. For this to be done, the
-   // curvature matrix of the non-orthogonal functions, is computed.
-   Int_t    i = 0;
-   Int_t    j = 0;
-   Int_t    k = 0;
-   TVectorD iF(fSampleSize);
-   TVectorD jF(fSampleSize);
-   fCoefficientsRMS.ResizeTo(fNCoefficients);
-
-   TMatrixDSym curvatureMatrix(fNCoefficients);
-
-   // Build the curvature matrix
-   for (i = 0; i < fNCoefficients; i++) {
-      iF = TMatrixDRow(fFunctions,i);
-      for (j = 0; j <= i; j++) {
-         jF = TMatrixDRow(fFunctions,j);
-         for (k = 0; k < fSampleSize; k++)
-            curvatureMatrix(i,j) +=
-            1 / TMath::Max(fSqError(k), 1e-20) * iF(k) * jF(k);
-         curvatureMatrix(j,i) = curvatureMatrix(i,j);
-      }
-   }
-
-   // Calculate Chi Square
-   fChi2 = 0;
-   for (i = 0; i < fSampleSize; i++) {
-      Double_t f = 0;
-      for (j = 0; j < fNCoefficients; j++)
-         f += fCoefficients(j) * fFunctions(j,i);
-      fChi2 += 1. / TMath::Max(fSqError(i),1e-20) * (fQuantity(i) - f)
-         * (fQuantity(i) - f);
-   }
+  // Calculate Chi Square
+  fChi2 = 0;
+  for (i = 0; i < fSampleSize; i++) {
+    Double_t f = 0;
+    for (j = 0; j < fNCoefficients; j++)
+      f += fCoefficients(j) * fFunctions(j, i);
+    fChi2 += 1. / TMath::Max(fSqError(i), 1e-20) * (fQuantity(i) - f) * (fQuantity(i) - f);
+  }
 
-   // Invert the curvature matrix
-   const TVectorD diag = TMatrixDDiag_const(curvatureMatrix);
-   curvatureMatrix.NormByDiag(diag);
+  // Invert the curvature matrix
+  const TVectorD diag = TMatrixDDiag_const(curvatureMatrix);
+  curvatureMatrix.NormByDiag(diag);
 
-   TDecompChol chol(curvatureMatrix);
-   if (!chol.Decompose())
-      Error("MakeCoefficientErrors", "curvature matrix is singular");
-   chol.Invert(curvatureMatrix);
+  TDecompChol chol(curvatureMatrix);
+  if (!chol.Decompose())
+    Error("MakeCoefficientErrors", "curvature matrix is singular");
+  chol.Invert(curvatureMatrix);
 
-   curvatureMatrix.NormByDiag(diag);
+  curvatureMatrix.NormByDiag(diag);
 
-   for (i = 0; i < fNCoefficients; i++)
-      fCoefficientsRMS(i) = TMath::Sqrt(curvatureMatrix(i,i));
+  for (i = 0; i < fNCoefficients; i++)
+    fCoefficientsRMS(i) = TMath::Sqrt(curvatureMatrix(i, i));
 }
 
-
 //____________________________________________________________________
-void TMultiDimFet::MakeCoefficients()
-{
-   // PRIVATE METHOD:
-   // Invert the model matrix B, and compute final coefficients. For a
-   // more thorough discussion of what this means, please refer to the
-   // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
-   //
-   // First we invert the lower triangle matrix fOrthCurvatureMatrix
-   // and store the inverted matrix in the upper triangle.
-
-   Int_t i = 0, j = 0;
-   Int_t col = 0, row = 0;
-
-   // Invert the B matrix
-   for (col = 1; col < fNCoefficients; col++) {
-      for (row = col - 1; row > -1; row--) {
-         fOrthCurvatureMatrix(row,col) = 0;
-         for (i = row; i <= col ; i++)
-            fOrthCurvatureMatrix(row,col) -=
-            fOrthCurvatureMatrix(i,row)
-            * fOrthCurvatureMatrix(i,col);
-      }
-   }
+void TMultiDimFet::MakeCoefficients() {
+  // PRIVATE METHOD:
+  // Invert the model matrix B, and compute final coefficients. For a
+  // more thorough discussion of what this means, please refer to the
+  // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
+  //
+  // First we invert the lower triangle matrix fOrthCurvatureMatrix
+  // and store the inverted matrix in the upper triangle.
+
+  Int_t i = 0, j = 0;
+  Int_t col = 0, row = 0;
+
+  // Invert the B matrix
+  for (col = 1; col < fNCoefficients; col++) {
+    for (row = col - 1; row > -1; row--) {
+      fOrthCurvatureMatrix(row, col) = 0;
+      for (i = row; i <= col; i++)
+        fOrthCurvatureMatrix(row, col) -= fOrthCurvatureMatrix(i, row) * fOrthCurvatureMatrix(i, col);
+    }
+  }
 
-   // Compute the final coefficients
-   fCoefficients.ResizeTo(fNCoefficients);
+  // Compute the final coefficients
+  fCoefficients.ResizeTo(fNCoefficients);
 
-   for (i = 0; i < fNCoefficients; i++) {
-      Double_t sum = 0;
-      for (j = i; j < fNCoefficients; j++)
-         sum += fOrthCurvatureMatrix(i,j) * fOrthCoefficients(j);
-      fCoefficients(i) = sum;
-   }
+  for (i = 0; i < fNCoefficients; i++) {
+    Double_t sum = 0;
+    for (j = i; j < fNCoefficients; j++)
+      sum += fOrthCurvatureMatrix(i, j) * fOrthCoefficients(j);
+    fCoefficients(i) = sum;
+  }
 
-   // Compute the final residuals
-   fResiduals.ResizeTo(fSampleSize);
-   for (i = 0; i < fSampleSize; i++)
-      fResiduals(i) = fQuantity(i);
-
-   for (i = 0; i < fNCoefficients; i++)
-      for (j = 0; j < fSampleSize; j++)
-         fResiduals(j) -= fCoefficients(i) * fFunctions(i,j);
-
-   // Compute the max and minimum, and squared sum of the evaluated
-   // residuals
-   fMinResidual = 10e10;
-   fMaxResidual = -10e10;
-   Double_t sqRes  = 0;
-   for (i = 0; i < fSampleSize; i++){
-      sqRes += fResiduals(i) * fResiduals(i);
-      if (fResiduals(i) <= fMinResidual) {
-         fMinResidual     = fResiduals(i);
-         fMinResidualRow  = i;
-      }
-      if (fResiduals(i) >= fMaxResidual) {
-         fMaxResidual     = fResiduals(i);
-         fMaxResidualRow  = i;
-      }
-   }
+  // Compute the final residuals
+  fResiduals.ResizeTo(fSampleSize);
+  for (i = 0; i < fSampleSize; i++)
+    fResiduals(i) = fQuantity(i);
+
+  for (i = 0; i < fNCoefficients; i++)
+    for (j = 0; j < fSampleSize; j++)
+      fResiduals(j) -= fCoefficients(i) * fFunctions(i, j);
+
+  // Compute the max and minimum, and squared sum of the evaluated
+  // residuals
+  fMinResidual = 10e10;
+  fMaxResidual = -10e10;
+  Double_t sqRes = 0;
+  for (i = 0; i < fSampleSize; i++) {
+    sqRes += fResiduals(i) * fResiduals(i);
+    if (fResiduals(i) <= fMinResidual) {
+      fMinResidual = fResiduals(i);
+      fMinResidualRow = i;
+    }
+    if (fResiduals(i) >= fMaxResidual) {
+      fMaxResidual = fResiduals(i);
+      fMaxResidualRow = i;
+    }
+  }
 
-   fCorrelationCoeff = fSumSqResidual / fSumSqAvgQuantity;
-   fPrecision        = TMath::Sqrt(sqRes / fSumSqQuantity);
-
-   // If we use histograms, fill some more
-   if (TESTBIT(fHistogramMask,HIST_RD) ||
-      TESTBIT(fHistogramMask,HIST_RTRAI) ||
-      TESTBIT(fHistogramMask,HIST_RX)) {
-         for (i = 0; i < fSampleSize; i++) {
-            if (TESTBIT(fHistogramMask,HIST_RD))
-               ((TH2D*)fHistograms->FindObject("res_d"))->Fill(fQuantity(i),
-               fResiduals(i));
-            if (TESTBIT(fHistogramMask,HIST_RTRAI))
-               ((TH1D*)fHistograms->FindObject("res_train"))->Fill(fResiduals(i));
-
-            if (TESTBIT(fHistogramMask,HIST_RX))
-               for (j = 0; j < fNVariables; j++)
-                  ((TH2D*)fHistograms->FindObject(Form("res_x_%d",j)))
-                  ->Fill(fVariables(i * fNVariables + j),fResiduals(i));
-         }
-   } // If histograms
+  fCorrelationCoeff = fSumSqResidual / fSumSqAvgQuantity;
+  fPrecision = TMath::Sqrt(sqRes / fSumSqQuantity);
 
-}
+  // If we use histograms, fill some more
+  if (TESTBIT(fHistogramMask, HIST_RD) || TESTBIT(fHistogramMask, HIST_RTRAI) || TESTBIT(fHistogramMask, HIST_RX)) {
+    for (i = 0; i < fSampleSize; i++) {
+      if (TESTBIT(fHistogramMask, HIST_RD))
+        ((TH2D *)fHistograms->FindObject("res_d"))->Fill(fQuantity(i), fResiduals(i));
+      if (TESTBIT(fHistogramMask, HIST_RTRAI))
+        ((TH1D *)fHistograms->FindObject("res_train"))->Fill(fResiduals(i));
 
+      if (TESTBIT(fHistogramMask, HIST_RX))
+        for (j = 0; j < fNVariables; j++)
+          ((TH2D *)fHistograms->FindObject(Form("res_x_%d", j)))->Fill(fVariables(i * fNVariables + j), fResiduals(i));
+    }
+  }  // If histograms
+}
 
 //____________________________________________________________________
-void TMultiDimFet::MakeCorrelation()
-{
-   // PRIVATE METHOD:
-   // Compute the correlation matrix
-   if (!fShowCorrelation)
-      return;
+void TMultiDimFet::MakeCorrelation() {
+  // PRIVATE METHOD:
+  // Compute the correlation matrix
+  if (!fShowCorrelation)
+    return;
 
-   fCorrelationMatrix.ResizeTo(fNVariables,fNVariables+1);
-
-   Double_t d2      = 0;
-   Double_t ddotXi  = 0; // G.Q. needs to be reinitialized in the loop over i fNVariables
-   Double_t xiNorm  = 0; // G.Q. needs to be reinitialized in the loop over i fNVariables
-   Double_t xidotXj = 0; // G.Q. needs to be reinitialized in the loop over j fNVariables
-   Double_t xjNorm  = 0; // G.Q. needs to be reinitialized in the loop over j fNVariables
-
-   Int_t i, j, k, l, m;  // G.Q. added m variable
-   for (i = 0; i < fSampleSize; i++)
-      d2 += fQuantity(i) * fQuantity(i);
-
-   for (i = 0; i < fNVariables; i++) {
-      ddotXi = 0.; // G.Q. reinitialisation
-      xiNorm = 0.; // G.Q. reinitialisation
-      for (j = 0; j< fSampleSize; j++) {
-         // Index of sample j of variable i
-         k =  j * fNVariables + i;
-         ddotXi += fQuantity(j) * (fVariables(k) - fMeanVariables(i));
-         xiNorm += (fVariables(k) - fMeanVariables(i))
-            * (fVariables(k) - fMeanVariables(i));
-      }
-      fCorrelationMatrix(i,0) = ddotXi / TMath::Sqrt(d2 * xiNorm);
-
-      for (j = 0; j < i; j++) {
-         xidotXj = 0.; // G.Q. reinitialisation
-         xjNorm = 0.; // G.Q. reinitialisation
-         for (k = 0; k < fSampleSize; k++) {
-            // Index of sample j of variable i
-            // l =  j * fNVariables + k;  // G.Q.
-            l =  k * fNVariables + j; // G.Q.
-            m =  k * fNVariables + i; // G.Q.
-            // G.Q.        xidotXj += (fVariables(i) - fMeanVariables(i))
-            // G.Q.          * (fVariables(l) - fMeanVariables(j));
-            xidotXj += (fVariables(m) - fMeanVariables(i))
-               * (fVariables(l) - fMeanVariables(j));  // G.Q. modified index for Xi
-            xjNorm  += (fVariables(l) - fMeanVariables(j))
-               * (fVariables(l) - fMeanVariables(j));
-         }
-         fCorrelationMatrix(i,j+1) = xidotXj / TMath::Sqrt(xiNorm * xjNorm);
+  fCorrelationMatrix.ResizeTo(fNVariables, fNVariables + 1);
+
+  Double_t d2 = 0;
+  Double_t ddotXi = 0;   // G.Q. needs to be reinitialized in the loop over i fNVariables
+  Double_t xiNorm = 0;   // G.Q. needs to be reinitialized in the loop over i fNVariables
+  Double_t xidotXj = 0;  // G.Q. needs to be reinitialized in the loop over j fNVariables
+  Double_t xjNorm = 0;   // G.Q. needs to be reinitialized in the loop over j fNVariables
+
+  Int_t i, j, k, l, m;  // G.Q. added m variable
+  for (i = 0; i < fSampleSize; i++)
+    d2 += fQuantity(i) * fQuantity(i);
+
+  for (i = 0; i < fNVariables; i++) {
+    ddotXi = 0.;  // G.Q. reinitialisation
+    xiNorm = 0.;  // G.Q. reinitialisation
+    for (j = 0; j < fSampleSize; j++) {
+      // Index of sample j of variable i
+      k = j * fNVariables + i;
+      ddotXi += fQuantity(j) * (fVariables(k) - fMeanVariables(i));
+      xiNorm += (fVariables(k) - fMeanVariables(i)) * (fVariables(k) - fMeanVariables(i));
+    }
+    fCorrelationMatrix(i, 0) = ddotXi / TMath::Sqrt(d2 * xiNorm);
+
+    for (j = 0; j < i; j++) {
+      xidotXj = 0.;  // G.Q. reinitialisation
+      xjNorm = 0.;   // G.Q. reinitialisation
+      for (k = 0; k < fSampleSize; k++) {
+        // Index of sample j of variable i
+        // l =  j * fNVariables + k;  // G.Q.
+        l = k * fNVariables + j;  // G.Q.
+        m = k * fNVariables + i;  // G.Q.
+        // G.Q.        xidotXj += (fVariables(i) - fMeanVariables(i))
+        // G.Q.          * (fVariables(l) - fMeanVariables(j));
+        xidotXj +=
+            (fVariables(m) - fMeanVariables(i)) * (fVariables(l) - fMeanVariables(j));  // G.Q. modified index for Xi
+        xjNorm += (fVariables(l) - fMeanVariables(j)) * (fVariables(l) - fMeanVariables(j));
       }
-   }
+      fCorrelationMatrix(i, j + 1) = xidotXj / TMath::Sqrt(xiNorm * xjNorm);
+    }
+  }
 }
 
-
-
 //____________________________________________________________________
-Double_t TMultiDimFet::MakeGramSchmidt(Int_t function)
-{
-   // PRIVATE METHOD:
-   // Make Gram-Schmidt orthogonalisation. The class description gives
-   // a thorough account of this algorithm, as well as
-   // references. Please refer to the
-   // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
-
-
-   // calculate w_i, that is, evaluate the current function at data
-   // point i
-   Double_t f2                        = 0;
-   fOrthCoefficients(fNCoefficients)      = 0;
-   fOrthFunctionNorms(fNCoefficients)  = 0;
-   Int_t j        = 0;
-   Int_t k        = 0;
-
-   for (j = 0; j < fSampleSize; j++) {
-      fFunctions(fNCoefficients, j) = 1;
-      fOrthFunctions(fNCoefficients, j) = 0;
-      // First, however, we need to calculate f_fNCoefficients
-      for (k = 0; k < fNVariables; k++) {
-         Int_t    p   =  fPowers[function * fNVariables + k];
-         Double_t x   =  fVariables(j * fNVariables + k);
-         fFunctions(fNCoefficients, j) *= EvalFactor(p,x);
-      }
+Double_t TMultiDimFet::MakeGramSchmidt(Int_t function) {
+  // PRIVATE METHOD:
+  // Make Gram-Schmidt orthogonalisation. The class description gives
+  // a thorough account of this algorithm, as well as
+  // references. Please refer to the
+  // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
+
+  // calculate w_i, that is, evaluate the current function at data
+  // point i
+  Double_t f2 = 0;
+  fOrthCoefficients(fNCoefficients) = 0;
+  fOrthFunctionNorms(fNCoefficients) = 0;
+  Int_t j = 0;
+  Int_t k = 0;
+
+  for (j = 0; j < fSampleSize; j++) {
+    fFunctions(fNCoefficients, j) = 1;
+    fOrthFunctions(fNCoefficients, j) = 0;
+    // First, however, we need to calculate f_fNCoefficients
+    for (k = 0; k < fNVariables; k++) {
+      Int_t p = fPowers[function * fNVariables + k];
+      Double_t x = fVariables(j * fNVariables + k);
+      fFunctions(fNCoefficients, j) *= EvalFactor(p, x);
+    }
 
-      // Calculate f dot f in f2
-      f2 += fFunctions(fNCoefficients,j) *  fFunctions(fNCoefficients,j);
-      // Assign to w_fNCoefficients f_fNCoefficients
-      fOrthFunctions(fNCoefficients, j) = fFunctions(fNCoefficients, j);
-   }
+    // Calculate f dot f in f2
+    f2 += fFunctions(fNCoefficients, j) * fFunctions(fNCoefficients, j);
+    // Assign to w_fNCoefficients f_fNCoefficients
+    fOrthFunctions(fNCoefficients, j) = fFunctions(fNCoefficients, j);
+  }
 
-   // the first column of w is equal to f
-   for (j = 0; j < fNCoefficients; j++) {
-      Double_t fdw = 0;
-      // Calculate (f_fNCoefficients dot w_j) / w_j^2
-      for (k = 0; k < fSampleSize; k++) {
-         fdw += fFunctions(fNCoefficients, k) * fOrthFunctions(j,k)
-            / fOrthFunctionNorms(j);
-      }
+  // the first column of w is equal to f
+  for (j = 0; j < fNCoefficients; j++) {
+    Double_t fdw = 0;
+    // Calculate (f_fNCoefficients dot w_j) / w_j^2
+    for (k = 0; k < fSampleSize; k++) {
+      fdw += fFunctions(fNCoefficients, k) * fOrthFunctions(j, k) / fOrthFunctionNorms(j);
+    }
 
-      fOrthCurvatureMatrix(fNCoefficients,j) = fdw;
-      // and subtract it from the current value of w_ij
-      for (k = 0; k < fSampleSize; k++)
-         fOrthFunctions(fNCoefficients,k) -= fdw * fOrthFunctions(j,k);
-   }
+    fOrthCurvatureMatrix(fNCoefficients, j) = fdw;
+    // and subtract it from the current value of w_ij
+    for (k = 0; k < fSampleSize; k++)
+      fOrthFunctions(fNCoefficients, k) -= fdw * fOrthFunctions(j, k);
+  }
 
-   for (j = 0; j < fSampleSize; j++) {
-      // calculate squared length of w_fNCoefficients
-      fOrthFunctionNorms(fNCoefficients) +=
-         fOrthFunctions(fNCoefficients,j)
-         * fOrthFunctions(fNCoefficients,j);
+  for (j = 0; j < fSampleSize; j++) {
+    // calculate squared length of w_fNCoefficients
+    fOrthFunctionNorms(fNCoefficients) += fOrthFunctions(fNCoefficients, j) * fOrthFunctions(fNCoefficients, j);
 
-      // calculate D dot w_fNCoefficients in A
-      fOrthCoefficients(fNCoefficients) += fQuantity(j)
-         * fOrthFunctions(fNCoefficients, j);
-   }
+    // calculate D dot w_fNCoefficients in A
+    fOrthCoefficients(fNCoefficients) += fQuantity(j) * fOrthFunctions(fNCoefficients, j);
+  }
 
-   // First test, but only if didn't user specify
-   if (!fIsUserFunction)
-      if (TMath::Sqrt(fOrthFunctionNorms(fNCoefficients) / (f2 + 1e-10))
-         < TMath::Sin(fMinAngle*DEGRAD))
-         return 0;
+  // First test, but only if didn't user specify
+  if (!fIsUserFunction)
+    if (TMath::Sqrt(fOrthFunctionNorms(fNCoefficients) / (f2 + 1e-10)) < TMath::Sin(fMinAngle * DEGRAD))
+      return 0;
 
-   // The result found by this code for the first residual is always
-   // much less then the one found be MUDIFI. That's because it's
-   // supposed to be. The cause is the improved precision of Double_t
-   // over DOUBLE PRECISION!
-   fOrthCurvatureMatrix(fNCoefficients,fNCoefficients) = 1;
-   Double_t b = fOrthCoefficients(fNCoefficients);
-   fOrthCoefficients(fNCoefficients) /= fOrthFunctionNorms(fNCoefficients);
+  // The result found by this code for the first residual is always
+  // much less then the one found be MUDIFI. That's because it's
+  // supposed to be. The cause is the improved precision of Double_t
+  // over DOUBLE PRECISION!
+  fOrthCurvatureMatrix(fNCoefficients, fNCoefficients) = 1;
+  Double_t b = fOrthCoefficients(fNCoefficients);
+  fOrthCoefficients(fNCoefficients) /= fOrthFunctionNorms(fNCoefficients);
 
-   // Calculate the residual from including this fNCoefficients.
-   Double_t dResidur = fOrthCoefficients(fNCoefficients) * b;
+  // Calculate the residual from including this fNCoefficients.
+  Double_t dResidur = fOrthCoefficients(fNCoefficients) * b;
 
-   return dResidur;
+  return dResidur;
 }
 
-
 //____________________________________________________________________
-void TMultiDimFet::MakeHistograms(Option_t *option)
-{
-   // Make histograms of the result of the analysis. This message
-   // should be sent after having read all data points, but before
-   // finding the parameterization
-   //
-   // Options:
-   //     A         All the below
-   //     X         Original independent variables
-   //     D         Original dependent variables
-   //     N         Normalised independent variables
-   //     S         Shifted dependent variables
-   //     R1        Residuals versus normalised independent variables
-   //     R2        Residuals versus dependent variable
-   //     R3        Residuals computed on training sample
-   //     R4        Residuals computed on test sample
-   //
-   // For a description of these quantities, refer to
-   // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
-   TString opt(option);
-   opt.ToLower();
-
-   if (opt.Length() < 1)
-      return;
-
-   if (!fHistograms)
-      fHistograms = new TList;
+void TMultiDimFet::MakeHistograms(Option_t *option) {
+  // Make histograms of the result of the analysis. This message
+  // should be sent after having read all data points, but before
+  // finding the parameterization
+  //
+  // Options:
+  //     A         All the below
+  //     X         Original independent variables
+  //     D         Original dependent variables
+  //     N         Normalised independent variables
+  //     S         Shifted dependent variables
+  //     R1        Residuals versus normalised independent variables
+  //     R2        Residuals versus dependent variable
+  //     R3        Residuals computed on training sample
+  //     R4        Residuals computed on test sample
+  //
+  // For a description of these quantities, refer to
+  // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
+  TString opt(option);
+  opt.ToLower();
+
+  if (opt.Length() < 1)
+    return;
 
-   // Counter variable
-   Int_t i = 0;
+  if (!fHistograms)
+    fHistograms = new TList;
 
-   // Histogram of original variables
-   if (opt.Contains("x") || opt.Contains("a")) {
-      SETBIT(fHistogramMask,HIST_XORIG);
-      for (i = 0; i < fNVariables; i++)
-         if (!fHistograms->FindObject(Form("x_%d_orig",i)))
-            fHistograms->Add(new TH1D(Form("x_%d_orig",i),
-            Form("Original variable # %d",i),
-            100, fMinVariables(i),
-            fMaxVariables(i)));
-   }
+  // Counter variable
+  Int_t i = 0;
 
-   // Histogram of original dependent variable
-   if (opt.Contains("d") || opt.Contains("a")) {
-      SETBIT(fHistogramMask,HIST_DORIG);
-      if (!fHistograms->FindObject("d_orig"))
-         fHistograms->Add(new TH1D("d_orig", "Original Quantity",
-         100, fMinQuantity, fMaxQuantity));
-   }
+  // Histogram of original variables
+  if (opt.Contains("x") || opt.Contains("a")) {
+    SETBIT(fHistogramMask, HIST_XORIG);
+    for (i = 0; i < fNVariables; i++)
+      if (!fHistograms->FindObject(Form("x_%d_orig", i)))
+        fHistograms->Add(
+            new TH1D(Form("x_%d_orig", i), Form("Original variable # %d", i), 100, fMinVariables(i), fMaxVariables(i)));
+  }
 
-   // Histograms of normalized variables
-   if (opt.Contains("n") || opt.Contains("a")) {
-      SETBIT(fHistogramMask,HIST_XNORM);
-      for (i = 0; i < fNVariables; i++)
-         if (!fHistograms->FindObject(Form("x_%d_norm",i)))
-            fHistograms->Add(new TH1D(Form("x_%d_norm",i),
-            Form("Normalized variable # %d",i),
-            100, -1,1));
-   }
+  // Histogram of original dependent variable
+  if (opt.Contains("d") || opt.Contains("a")) {
+    SETBIT(fHistogramMask, HIST_DORIG);
+    if (!fHistograms->FindObject("d_orig"))
+      fHistograms->Add(new TH1D("d_orig", "Original Quantity", 100, fMinQuantity, fMaxQuantity));
+  }
 
-   // Histogram of shifted dependent variable
-   if (opt.Contains("s") || opt.Contains("a")) {
-      SETBIT(fHistogramMask,HIST_DSHIF);
-      if (!fHistograms->FindObject("d_shifted"))
-         fHistograms->Add(new TH1D("d_shifted", "Shifted Quantity",
-         100, fMinQuantity - fMeanQuantity,
-         fMaxQuantity - fMeanQuantity));
-   }
+  // Histograms of normalized variables
+  if (opt.Contains("n") || opt.Contains("a")) {
+    SETBIT(fHistogramMask, HIST_XNORM);
+    for (i = 0; i < fNVariables; i++)
+      if (!fHistograms->FindObject(Form("x_%d_norm", i)))
+        fHistograms->Add(new TH1D(Form("x_%d_norm", i), Form("Normalized variable # %d", i), 100, -1, 1));
+  }
 
-   // Residual from training sample versus independent variables
-   if (opt.Contains("r1") || opt.Contains("a")) {
-      SETBIT(fHistogramMask,HIST_RX);
-      for (i = 0; i < fNVariables; i++)
-         if (!fHistograms->FindObject(Form("res_x_%d",i)))
-            fHistograms->Add(new TH2D(Form("res_x_%d",i),
-            Form("Computed residual versus x_%d", i),
-            100, -1,    1,
-            35,
-            fMinQuantity - fMeanQuantity,
-            fMaxQuantity - fMeanQuantity));
-   }
+  // Histogram of shifted dependent variable
+  if (opt.Contains("s") || opt.Contains("a")) {
+    SETBIT(fHistogramMask, HIST_DSHIF);
+    if (!fHistograms->FindObject("d_shifted"))
+      fHistograms->Add(
+          new TH1D("d_shifted", "Shifted Quantity", 100, fMinQuantity - fMeanQuantity, fMaxQuantity - fMeanQuantity));
+  }
 
-   // Residual from training sample versus. dependent variable
-   if (opt.Contains("r2") || opt.Contains("a")) {
-      SETBIT(fHistogramMask,HIST_RD);
-      if (!fHistograms->FindObject("res_d"))
-         fHistograms->Add(new TH2D("res_d",
-         "Computed residuals vs Quantity",
-         100,
-         fMinQuantity - fMeanQuantity,
-         fMaxQuantity - fMeanQuantity,
-         35,
-         fMinQuantity - fMeanQuantity,
-         fMaxQuantity - fMeanQuantity));
-   }
+  // Residual from training sample versus independent variables
+  if (opt.Contains("r1") || opt.Contains("a")) {
+    SETBIT(fHistogramMask, HIST_RX);
+    for (i = 0; i < fNVariables; i++)
+      if (!fHistograms->FindObject(Form("res_x_%d", i)))
+        fHistograms->Add(new TH2D(Form("res_x_%d", i),
+                                  Form("Computed residual versus x_%d", i),
+                                  100,
+                                  -1,
+                                  1,
+                                  35,
+                                  fMinQuantity - fMeanQuantity,
+                                  fMaxQuantity - fMeanQuantity));
+  }
 
-   // Residual from training sample
-   if (opt.Contains("r3") || opt.Contains("a")) {
-      SETBIT(fHistogramMask,HIST_RTRAI);
-      if (!fHistograms->FindObject("res_train"))
-         fHistograms->Add(new TH1D("res_train",
-         "Computed residuals over training sample",
-         100, fMinQuantity - fMeanQuantity,
-         fMaxQuantity - fMeanQuantity));
+  // Residual from training sample versus. dependent variable
+  if (opt.Contains("r2") || opt.Contains("a")) {
+    SETBIT(fHistogramMask, HIST_RD);
+    if (!fHistograms->FindObject("res_d"))
+      fHistograms->Add(new TH2D("res_d",
+                                "Computed residuals vs Quantity",
+                                100,
+                                fMinQuantity - fMeanQuantity,
+                                fMaxQuantity - fMeanQuantity,
+                                35,
+                                fMinQuantity - fMeanQuantity,
+                                fMaxQuantity - fMeanQuantity));
+  }
 
-   }
-   if (opt.Contains("r4") || opt.Contains("a")) {
-      SETBIT(fHistogramMask,HIST_RTEST);
-      if (!fHistograms->FindObject("res_test"))
-         fHistograms->Add(new TH1D("res_test",
-         "Distribution of residuals from test",
-         100,fMinQuantity - fMeanQuantity,
-         fMaxQuantity - fMeanQuantity));
-   }
+  // Residual from training sample
+  if (opt.Contains("r3") || opt.Contains("a")) {
+    SETBIT(fHistogramMask, HIST_RTRAI);
+    if (!fHistograms->FindObject("res_train"))
+      fHistograms->Add(new TH1D("res_train",
+                                "Computed residuals over training sample",
+                                100,
+                                fMinQuantity - fMeanQuantity,
+                                fMaxQuantity - fMeanQuantity));
+  }
+  if (opt.Contains("r4") || opt.Contains("a")) {
+    SETBIT(fHistogramMask, HIST_RTEST);
+    if (!fHistograms->FindObject("res_test"))
+      fHistograms->Add(new TH1D("res_test",
+                                "Distribution of residuals from test",
+                                100,
+                                fMinQuantity - fMeanQuantity,
+                                fMaxQuantity - fMeanQuantity));
+  }
 }
 
-
 //____________________________________________________________________
-void TMultiDimFet::MakeMethod(const Char_t* classname, Option_t* option)
-{
-   // Generate the file <classname>MDF.cxx which contains the
-   // implementation of the method:
-   //
-   //   Double_t <classname>::MDF(Double_t *x)
-   //
-   // which does the same as  TMultiDimFet::Eval. Please refer to this
-   // method.
-   //
-   // Further, the public static members:
-   //
-   //   Int_t    <classname>::fgNVariables
-   //   Int_t    <classname>::fgNCoefficients
-   //   Double_t <classname>::fgDMean
-   //   Double_t <classname>::fgXMean[]       //[fgNVariables]
-   //   Double_t <classname>::fgXMin[]        //[fgNVariables]
-   //   Double_t <classname>::fgXMax[]        //[fgNVariables]
-   //   Double_t <classname>::fgCoefficient[] //[fgNCoeffficents]
-   //   Int_t    <classname>::fgPower[]       //[fgNCoeffficents*fgNVariables]
-   //
-   // are initialized, and assumed to exist. The class declaration is
-   // assumed to be in <classname>.h and assumed to be provided by the
-   // user.
-   //
-   // See TMultiDimFet::MakeRealCode for a list of options
-   //
-   // The minimal class definition is:
-   //
-   //   class <classname> {
-   //   public:
-   //     Int_t    <classname>::fgNVariables;     // Number of variables
-   //     Int_t    <classname>::fgNCoefficients;  // Number of terms
-   //     Double_t <classname>::fgDMean;          // Mean from training sample
-   //     Double_t <classname>::fgXMean[];        // Mean from training sample
-   //     Double_t <classname>::fgXMin[];         // Min from training sample
-   //     Double_t <classname>::fgXMax[];         // Max from training sample
-   //     Double_t <classname>::fgCoefficient[];  // Coefficients
-   //     Int_t    <classname>::fgPower[];        // Function powers
-   //
-   //     Double_t Eval(Double_t *x);
-   //   };
-   //
-   // Whether the method <classname>::Eval should be static or not, is
-   // up to the user.
-
-   MakeRealCode(Form("%sMDF.cxx", classname), classname, option);
+void TMultiDimFet::MakeMethod(const Char_t *classname, Option_t *option) {
+  // Generate the file <classname>MDF.cxx which contains the
+  // implementation of the method:
+  //
+  //   Double_t <classname>::MDF(Double_t *x)
+  //
+  // which does the same as  TMultiDimFet::Eval. Please refer to this
+  // method.
+  //
+  // Further, the public static members:
+  //
+  //   Int_t    <classname>::fgNVariables
+  //   Int_t    <classname>::fgNCoefficients
+  //   Double_t <classname>::fgDMean
+  //   Double_t <classname>::fgXMean[]       //[fgNVariables]
+  //   Double_t <classname>::fgXMin[]        //[fgNVariables]
+  //   Double_t <classname>::fgXMax[]        //[fgNVariables]
+  //   Double_t <classname>::fgCoefficient[] //[fgNCoeffficents]
+  //   Int_t    <classname>::fgPower[]       //[fgNCoeffficents*fgNVariables]
+  //
+  // are initialized, and assumed to exist. The class declaration is
+  // assumed to be in <classname>.h and assumed to be provided by the
+  // user.
+  //
+  // See TMultiDimFet::MakeRealCode for a list of options
+  //
+  // The minimal class definition is:
+  //
+  //   class <classname> {
+  //   public:
+  //     Int_t    <classname>::fgNVariables;     // Number of variables
+  //     Int_t    <classname>::fgNCoefficients;  // Number of terms
+  //     Double_t <classname>::fgDMean;          // Mean from training sample
+  //     Double_t <classname>::fgXMean[];        // Mean from training sample
+  //     Double_t <classname>::fgXMin[];         // Min from training sample
+  //     Double_t <classname>::fgXMax[];         // Max from training sample
+  //     Double_t <classname>::fgCoefficient[];  // Coefficients
+  //     Int_t    <classname>::fgPower[];        // Function powers
+  //
+  //     Double_t Eval(Double_t *x);
+  //   };
+  //
+  // Whether the method <classname>::Eval should be static or not, is
+  // up to the user.
+
+  MakeRealCode(Form("%sMDF.cxx", classname), classname, option);
 }
 
-
-
 //____________________________________________________________________
-void TMultiDimFet::MakeNormalized()
-{
-   // PRIVATE METHOD:
-   // Normalize data to the interval [-1;1]. This is needed for the
-   // classes method to work.
-
-   Int_t i = 0;
-   Int_t j = 0;
-   Int_t k = 0;
+void TMultiDimFet::MakeNormalized() {
+  // PRIVATE METHOD:
+  // Normalize data to the interval [-1;1]. This is needed for the
+  // classes method to work.
 
-   for (i = 0; i < fSampleSize; i++) {
-      if (TESTBIT(fHistogramMask,HIST_DORIG))
-         ((TH1D*)fHistograms->FindObject("d_orig"))->Fill(fQuantity(i));
+  Int_t i = 0;
+  Int_t j = 0;
+  Int_t k = 0;
 
-      fQuantity(i) -= fMeanQuantity;
-      fSumSqAvgQuantity  += fQuantity(i) * fQuantity(i);
+  for (i = 0; i < fSampleSize; i++) {
+    if (TESTBIT(fHistogramMask, HIST_DORIG))
+      ((TH1D *)fHistograms->FindObject("d_orig"))->Fill(fQuantity(i));
 
-      if (TESTBIT(fHistogramMask,HIST_DSHIF))
-         ((TH1D*)fHistograms->FindObject("d_shifted"))->Fill(fQuantity(i));
+    fQuantity(i) -= fMeanQuantity;
+    fSumSqAvgQuantity += fQuantity(i) * fQuantity(i);
 
-      for (j = 0; j < fNVariables; j++) {
-         Double_t range = 1. / (fMaxVariables(j) - fMinVariables(j));
-         k              = i * fNVariables + j;
+    if (TESTBIT(fHistogramMask, HIST_DSHIF))
+      ((TH1D *)fHistograms->FindObject("d_shifted"))->Fill(fQuantity(i));
 
-         // Fill histograms of original independent variables
-         if (TESTBIT(fHistogramMask,HIST_XORIG))
-            ((TH1D*)fHistograms->FindObject(Form("x_%d_orig",j)))
-            ->Fill(fVariables(k));
+    for (j = 0; j < fNVariables; j++) {
+      Double_t range = 1. / (fMaxVariables(j) - fMinVariables(j));
+      k = i * fNVariables + j;
 
-         // Normalise independent variables
-         fVariables(k) = 1 + 2 * range * (fVariables(k) - fMaxVariables(j));
+      // Fill histograms of original independent variables
+      if (TESTBIT(fHistogramMask, HIST_XORIG))
+        ((TH1D *)fHistograms->FindObject(Form("x_%d_orig", j)))->Fill(fVariables(k));
 
-         // Fill histograms of normalised independent variables
-         if (TESTBIT(fHistogramMask,HIST_XNORM))
-            ((TH1D*)fHistograms->FindObject(Form("x_%d_norm",j)))
-            ->Fill(fVariables(k));
+      // Normalise independent variables
+      fVariables(k) = 1 + 2 * range * (fVariables(k) - fMaxVariables(j));
 
-      }
-   }
-   // Shift min and max of dependent variable
-   fMaxQuantity -= fMeanQuantity;
-   fMinQuantity -= fMeanQuantity;
-
-   // Shift mean of independent variables
-   for (i = 0; i < fNVariables; i++) {
-      Double_t range = 1. / (fMaxVariables(i) - fMinVariables(i));
-      fMeanVariables(i) = 1 + 2 * range * (fMeanVariables(i)
-         - fMaxVariables(i));
-   }
+      // Fill histograms of normalised independent variables
+      if (TESTBIT(fHistogramMask, HIST_XNORM))
+        ((TH1D *)fHistograms->FindObject(Form("x_%d_norm", j)))->Fill(fVariables(k));
+    }
+  }
+  // Shift min and max of dependent variable
+  fMaxQuantity -= fMeanQuantity;
+  fMinQuantity -= fMeanQuantity;
+
+  // Shift mean of independent variables
+  for (i = 0; i < fNVariables; i++) {
+    Double_t range = 1. / (fMaxVariables(i) - fMinVariables(i));
+    fMeanVariables(i) = 1 + 2 * range * (fMeanVariables(i) - fMaxVariables(i));
+  }
 }
 
-
 //____________________________________________________________________
-void TMultiDimFet::MakeParameterization()
-{
-   // PRIVATE METHOD:
-   // Find the parameterization over the training sample. A full account
-   // of the algorithm is given in the
-   // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
-
-   Int_t     i              = -1;
-   Int_t     j              = 0;
-   Int_t     k              = 0;
-   Int_t     maxPass        = 3;
-   Int_t     studied        = 0;
-   Double_t  squareResidual = fSumSqAvgQuantity;
-   fNCoefficients            = 0;
-   fSumSqResidual           = fSumSqAvgQuantity;
-   fFunctions.ResizeTo(fMaxTerms,fSampleSize);
-   fOrthFunctions.ResizeTo(fMaxTerms,fSampleSize);
-   fOrthFunctionNorms.ResizeTo(fMaxTerms);
-   fOrthCoefficients.ResizeTo(fMaxTerms);
-   fOrthCurvatureMatrix.ResizeTo(fMaxTerms,fMaxTerms);
-   fFunctions = 1;
-
-   fFunctionCodes.resize(fMaxFunctions);
-   fPowerIndex.resize(fMaxTerms);
-   Int_t l;
-   for (l=0;l<fMaxFunctions;l++) fFunctionCodes[l] = 0;
-   for (l=0;l<fMaxTerms;l++)     fPowerIndex[l]    = 0;
-
-   if (fMaxAngle != 0)  maxPass = 100;
-   if (fIsUserFunction) maxPass = 1;
-
-   // Loop over the number of functions we want to study.
-   // increment inspection counter
-   while(kTRUE) {
-
-      // Reach user defined limit of studies
-      if (studied++ >= fMaxStudy) {
-         fParameterisationCode = PARAM_MAXSTUDY;
-         break;
-      }
-
-      // Considered all functions several times
-      if (k >= maxPass) {
-         fParameterisationCode = PARAM_SEVERAL;
-         break;
-      }
-
-      // increment function counter
-      i++;
-
-      // If we've reached the end of the functions, restart pass
-      if (i == fMaxFunctions) {
-         if (fMaxAngle != 0)
-            fMaxAngle += (90 - fMaxAngle) / 2;
-         i = 0;
-         studied--;
-         k++;
-         continue;
-      }
-      if (studied == 1)
-         fFunctionCodes[i] = 0;
-      else if (fFunctionCodes[i] >= 2)
-         continue;
-
-      // Print a happy message
-      if (fIsVerbose && studied == 1)
-         edm::LogInfo("TMultiDimFet") << "Coeff   SumSqRes    Contrib   Angle      QM   Func"
-         << "     Value        W^2  Powers" << "\n";
-
-      // Make the Gram-Schmidt
-      Double_t dResidur = MakeGramSchmidt(i);
-
-      if (dResidur == 0) {
-         // This function is no good!
-         // First test is in MakeGramSchmidt
-         fFunctionCodes[i] = 1;
-         continue;
-      }
-
-      // If user specified function, assume she/he knows what he's doing
-      if (!fIsUserFunction) {
-         // Flag this function as considered
-         fFunctionCodes[i] = 2;
-
-         // Test if this function contributes to the fit
-         if (!TestFunction(squareResidual, dResidur)) {
-            fFunctionCodes[i] = 1;
-            continue;
-         }
-      }
+void TMultiDimFet::MakeParameterization() {
+  // PRIVATE METHOD:
+  // Find the parameterization over the training sample. A full account
+  // of the algorithm is given in the
+  // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
+
+  Int_t i = -1;
+  Int_t j = 0;
+  Int_t k = 0;
+  Int_t maxPass = 3;
+  Int_t studied = 0;
+  Double_t squareResidual = fSumSqAvgQuantity;
+  fNCoefficients = 0;
+  fSumSqResidual = fSumSqAvgQuantity;
+  fFunctions.ResizeTo(fMaxTerms, fSampleSize);
+  fOrthFunctions.ResizeTo(fMaxTerms, fSampleSize);
+  fOrthFunctionNorms.ResizeTo(fMaxTerms);
+  fOrthCoefficients.ResizeTo(fMaxTerms);
+  fOrthCurvatureMatrix.ResizeTo(fMaxTerms, fMaxTerms);
+  fFunctions = 1;
+
+  fFunctionCodes.resize(fMaxFunctions);
+  fPowerIndex.resize(fMaxTerms);
+  Int_t l;
+  for (l = 0; l < fMaxFunctions; l++)
+    fFunctionCodes[l] = 0;
+  for (l = 0; l < fMaxTerms; l++)
+    fPowerIndex[l] = 0;
+
+  if (fMaxAngle != 0)
+    maxPass = 100;
+  if (fIsUserFunction)
+    maxPass = 1;
+
+  // Loop over the number of functions we want to study.
+  // increment inspection counter
+  while (kTRUE) {
+    // Reach user defined limit of studies
+    if (studied++ >= fMaxStudy) {
+      fParameterisationCode = PARAM_MAXSTUDY;
+      break;
+    }
 
-      // If we get to here, the function currently considered is
-      // fNCoefficients, so we increment the counter
-      // Flag this function as OK, and store and the number in the
-      // index.
-      fFunctionCodes[i]          = 3;
-      fPowerIndex[fNCoefficients] = i;
-      fNCoefficients++;
+    // Considered all functions several times
+    if (k >= maxPass) {
+      fParameterisationCode = PARAM_SEVERAL;
+      break;
+    }
 
-      // We add the current contribution to the sum of square of
-      // residuals;
-      squareResidual -= dResidur;
+    // increment function counter
+    i++;
+
+    // If we've reached the end of the functions, restart pass
+    if (i == fMaxFunctions) {
+      if (fMaxAngle != 0)
+        fMaxAngle += (90 - fMaxAngle) / 2;
+      i = 0;
+      studied--;
+      k++;
+      continue;
+    }
+    if (studied == 1)
+      fFunctionCodes[i] = 0;
+    else if (fFunctionCodes[i] >= 2)
+      continue;
+
+    // Print a happy message
+    if (fIsVerbose && studied == 1)
+      edm::LogInfo("TMultiDimFet") << "Coeff   SumSqRes    Contrib   Angle      QM   Func"
+                                   << "     Value        W^2  Powers"
+                                   << "\n";
+
+    // Make the Gram-Schmidt
+    Double_t dResidur = MakeGramSchmidt(i);
+
+    if (dResidur == 0) {
+      // This function is no good!
+      // First test is in MakeGramSchmidt
+      fFunctionCodes[i] = 1;
+      continue;
+    }
 
+    // If user specified function, assume she/he knows what he's doing
+    if (!fIsUserFunction) {
+      // Flag this function as considered
+      fFunctionCodes[i] = 2;
 
-      // Calculate control parameter from this function
-      for (j = 0; j < fNVariables; j++) {
-         if (fNCoefficients == 1
-            || fMaxPowersFinal[j] <= fPowers[i * fNVariables + j] - 1)
-            fMaxPowersFinal[j] = fPowers[i * fNVariables + j] - 1;
-      }
-      Double_t s = EvalControl(&fPowers[i * fNVariables]);
-
-      // Print the statistics about this function
-      if (fIsVerbose) {
-         edm::LogVerbatim("TMultiDimFet") << std::setw(5)  << fNCoefficients << " "
-            << std::setw(10) << std::setprecision(4) << squareResidual << " "
-            << std::setw(10) << std::setprecision(4) << dResidur << " "
-            << std::setw(7)  << std::setprecision(3) << fMaxAngle << " "
-            << std::setw(7)  << std::setprecision(3) << s << " "
-            << std::setw(5)  << i << " "
-            << std::setw(10) << std::setprecision(4)
-            << fOrthCoefficients(fNCoefficients-1) << " "
-            << std::setw(10) << std::setprecision(4)
-            << fOrthFunctionNorms(fNCoefficients-1) << " "
-            << std::flush;
-         for (j = 0; j < fNVariables; j++)
-            edm::LogInfo("TMultiDimFet") << " " << fPowers[i * fNVariables + j] - 1 << std::flush;
-         edm::LogInfo("TMultiDimFet") << "\n";
+      // Test if this function contributes to the fit
+      if (!TestFunction(squareResidual, dResidur)) {
+        fFunctionCodes[i] = 1;
+        continue;
       }
+    }
 
-      if (fNCoefficients >= fMaxTerms /* && fIsVerbose */) {
-         fParameterisationCode = PARAM_MAXTERMS;
-         break;
-      }
+    // If we get to here, the function currently considered is
+    // fNCoefficients, so we increment the counter
+    // Flag this function as OK, and store and the number in the
+    // index.
+    fFunctionCodes[i] = 3;
+    fPowerIndex[fNCoefficients] = i;
+    fNCoefficients++;
+
+    // We add the current contribution to the sum of square of
+    // residuals;
+    squareResidual -= dResidur;
+
+    // Calculate control parameter from this function
+    for (j = 0; j < fNVariables; j++) {
+      if (fNCoefficients == 1 || fMaxPowersFinal[j] <= fPowers[i * fNVariables + j] - 1)
+        fMaxPowersFinal[j] = fPowers[i * fNVariables + j] - 1;
+    }
+    Double_t s = EvalControl(&fPowers[i * fNVariables]);
+
+    // Print the statistics about this function
+    if (fIsVerbose) {
+      edm::LogVerbatim("TMultiDimFet") << std::setw(5) << fNCoefficients << " " << std::setw(10) << std::setprecision(4)
+                                       << squareResidual << " " << std::setw(10) << std::setprecision(4) << dResidur
+                                       << " " << std::setw(7) << std::setprecision(3) << fMaxAngle << " "
+                                       << std::setw(7) << std::setprecision(3) << s << " " << std::setw(5) << i << " "
+                                       << std::setw(10) << std::setprecision(4) << fOrthCoefficients(fNCoefficients - 1)
+                                       << " " << std::setw(10) << std::setprecision(4)
+                                       << fOrthFunctionNorms(fNCoefficients - 1) << " " << std::flush;
+      for (j = 0; j < fNVariables; j++)
+        edm::LogInfo("TMultiDimFet") << " " << fPowers[i * fNVariables + j] - 1 << std::flush;
+      edm::LogInfo("TMultiDimFet") << "\n";
+    }
 
-      Double_t err  = TMath::Sqrt(TMath::Max(1e-20,squareResidual) /
-         fSumSqAvgQuantity);
-      if (err < fMinRelativeError) {
-         fParameterisationCode = PARAM_RELERR;
-         break;
-      }
+    if (fNCoefficients >= fMaxTerms /* && fIsVerbose */) {
+      fParameterisationCode = PARAM_MAXTERMS;
+      break;
+    }
 
-   }
+    Double_t err = TMath::Sqrt(TMath::Max(1e-20, squareResidual) / fSumSqAvgQuantity);
+    if (err < fMinRelativeError) {
+      fParameterisationCode = PARAM_RELERR;
+      break;
+    }
+  }
 
-   fError          = TMath::Max(1e-20,squareResidual);
-   fSumSqResidual -= fError;
-   fRMS = TMath::Sqrt(fError / fSampleSize);
+  fError = TMath::Max(1e-20, squareResidual);
+  fSumSqResidual -= fError;
+  fRMS = TMath::Sqrt(fError / fSampleSize);
 }
 
-
 //____________________________________________________________________
-void TMultiDimFet::MakeRealCode(const char *filename,
-                                const char *classname,
-                                Option_t *)
-{
-   // PRIVATE METHOD:
-   // This is the method that actually generates the code for the
-   // evaluation the parameterization on some point.
-   // It's called by TMultiDimFet::MakeCode and TMultiDimFet::MakeMethod.
-   //
-   // The options are: NONE so far
-   Int_t i, j;
-
-   Bool_t  isMethod     = (classname[0] == '\0' ? kFALSE : kTRUE);
-   const char *prefix   = (isMethod ? Form("%s::", classname) : "");
-   const char *cv_qual  = (isMethod ? "" : "static ");
-
-   std::ofstream outFile(filename,std::ios::out|std::ios::trunc);
-   if (!outFile) {
-      Error("MakeRealCode","couldn't open output file '%s'",filename);
-      return;
-   }
-
-   if (fIsVerbose)
-      edm::LogInfo("TMultiDimFet") << "Writing on file \"" << filename << "\" ... " << std::flush;
-   //
-   // Write header of file
-   //
-   // Emacs mode line ;-)
-   outFile << "// -*- mode: c++ -*-" << "\n";
-   // Info about creator
-   outFile << "// " << "\n"
-      << "// File " << filename
-      << " generated by TMultiDimFet::MakeRealCode" << "\n";
-   // Time stamp
-   TDatime date;
-   outFile << "// on " << date.AsString() << "\n";
-   // ROOT version info
-   outFile << "// ROOT version " << gROOT->GetVersion()
-      << "\n" << "//" << "\n";
-   // General information on the code
-   outFile << "// This file contains the function " << "\n"
-      << "//" << "\n"
-      << "//    double  " << prefix << "MDF(double *x); " << "\n"
-      << "//" << "\n"
-      << "// For evaluating the parameterization obtained" << "\n"
-      << "// from TMultiDimFet and the point x" << "\n"
-      << "// " << "\n"
-      << "// See TMultiDimFet class documentation for more "
-      << "information " << "\n" << "// " << "\n";
-   // Header files
-   if (isMethod)
-      // If these are methods, we need the class header
-      outFile << "#include \"" << classname << ".h\"" << "\n";
-
-   //
-   // Now for the data
-   //
-   outFile << "//" << "\n"
-      << "// Static data variables"  << "\n"
-      << "//" << "\n";
-   outFile << cv_qual << "int    " << prefix << "gNVariables    = "
-      << fNVariables << ";" << "\n";
-   outFile << cv_qual << "int    " << prefix << "gNCoefficients = "
-      << fNCoefficients << ";" << "\n";
-   outFile << cv_qual << "double " << prefix << "gDMean         = "
-      << fMeanQuantity << ";" << "\n";
-
-   // Assignment to mean vector.
-   outFile << "// Assignment to mean vector." << "\n";
-   outFile << cv_qual << "double " << prefix
-      << "gXMean[] = {" << "\n";
-   for (i = 0; i < fNVariables; i++)
-      outFile << (i != 0 ? ", " : "  ") << fMeanVariables(i) << std::flush;
-   outFile << " };" << "\n" << "\n";
-
-   // Assignment to minimum vector.
-   outFile << "// Assignment to minimum vector." << "\n";
-   outFile << cv_qual << "double " << prefix
-      << "gXMin[] = {" << "\n";
-   for (i = 0; i < fNVariables; i++)
-      outFile << (i != 0 ? ", " : "  ") << fMinVariables(i) << std::flush;
-   outFile << " };" << "\n" << "\n";
-
-   // Assignment to maximum vector.
-   outFile << "// Assignment to maximum vector." << "\n";
-   outFile << cv_qual << "double " << prefix
-      << "gXMax[] = {" << "\n";
-   for (i = 0; i < fNVariables; i++)
-      outFile << (i != 0 ? ", " : "  ") << fMaxVariables(i) << std::flush;
-   outFile << " };" << "\n" << "\n";
-
-   // Assignment to coefficients vector.
-   outFile << "// Assignment to coefficients vector." << "\n";
-   outFile << cv_qual << "double " << prefix
-      << "gCoefficient[] = {" << std::flush;
-   for (i = 0; i < fNCoefficients; i++)
-      outFile << (i != 0 ? "," : "") << "\n"
-      << "  " << fCoefficients(i) << std::flush;
-   outFile << "\n" << " };" << "\n" << "\n";
-
-   // Assignment to powers vector.
-   outFile << "// Assignment to powers vector." << "\n"
-      << "// The powers are stored row-wise, that is" << "\n"
-      << "//  p_ij = " << prefix
-      << "gPower[i * NVariables + j];" << "\n";
-   outFile << cv_qual << "int    " << prefix
-      << "gPower[] = {" << std::flush;
-   for (i = 0; i < fNCoefficients; i++) {
-      for (j = 0; j < fNVariables; j++) {
-         if (j != 0) outFile << std::flush << "  ";
-         else        outFile << "\n" << "  ";
-         outFile << fPowers[fPowerIndex[i] * fNVariables + j]
-         << (i == fNCoefficients - 1 && j == fNVariables - 1 ? "" : ",")
-            << std::flush;
-      }
-   }
-   outFile << "\n" << "};" << "\n" << "\n";
-
+void TMultiDimFet::MakeRealCode(const char *filename, const char *classname, Option_t *) {
+  // PRIVATE METHOD:
+  // This is the method that actually generates the code for the
+  // evaluation the parameterization on some point.
+  // It's called by TMultiDimFet::MakeCode and TMultiDimFet::MakeMethod.
+  //
+  // The options are: NONE so far
+  Int_t i, j;
+
+  Bool_t isMethod = (classname[0] == '\0' ? kFALSE : kTRUE);
+  const char *prefix = (isMethod ? Form("%s::", classname) : "");
+  const char *cv_qual = (isMethod ? "" : "static ");
+
+  std::ofstream outFile(filename, std::ios::out | std::ios::trunc);
+  if (!outFile) {
+    Error("MakeRealCode", "couldn't open output file '%s'", filename);
+    return;
+  }
 
-   //
-   // Finally we reach the function itself
-   //
-   outFile << "// " << "\n"
-      << "// The "
-      << (isMethod ? "method " : "function ")
-      << "  double " << prefix
-      << "MDF(double *x)"
-      << "\n" << "// " << "\n";
-   outFile << "double " << prefix
-      << "MDF(double *x) {" << "\n"
-      << "  double returnValue = " << prefix << "gDMean;" << "\n"
-      << "  int    i = 0, j = 0, k = 0;" << "\n"
-      << "  for (i = 0; i < " << prefix << "gNCoefficients ; i++) {"
-      << "\n"
-      << "    // Evaluate the ith term in the expansion" << "\n"
-      << "    double term = " << prefix << "gCoefficient[i];"
-      << "\n"
-      << "    for (j = 0; j < " << prefix << "gNVariables; j++) {"
-      << "\n"
-      << "      // Evaluate the polynomial in the jth variable." << "\n"
-      << "      int power = "<< prefix << "gPower["
-      << prefix << "gNVariables * i + j]; " << "\n"
-      << "      double p1 = 1, p2 = 0, p3 = 0, r = 0;" << "\n"
-      << "      double v =  1 + 2. / ("
-      << prefix << "gXMax[j] - " << prefix
-      << "gXMin[j]) * (x[j] - " << prefix << "gXMax[j]);" << "\n"
-      << "      // what is the power to use!" << "\n"
-      << "      switch(power) {" << "\n"
-      << "      case 1: r = 1; break; " << "\n"
-      << "      case 2: r = v; break; " << "\n"
-      << "      default: " << "\n"
-      << "        p2 = v; " << "\n"
-      << "        for (k = 3; k <= power; k++) { " << "\n"
-      << "          p3 = p2 * v;" << "\n";
-   if (fPolyType == kLegendre)
-      outFile << "          p3 = ((2 * i - 3) * p2 * v - (i - 2) * p1)"
-      << " / (i - 1);" << "\n";
-   if (fPolyType == kChebyshev)
-      outFile << "          p3 = 2 * v * p2 - p1; " << "\n";
-   outFile << "          p1 = p2; p2 = p3; " << "\n" << "        }" << "\n"
-      << "        r = p3;" << "\n" << "      }" << "\n"
-      << "      // multiply this term by the poly in the jth var" << "\n"
-      << "      term *= r; " << "\n" << "    }" << "\n"
-      << "    // Add this term to the final result" << "\n"
-      << "    returnValue += term;" << "\n" << "  }" << "\n"
-      << "  return returnValue;" << "\n" << "}" << "\n" << "\n";
-
-   // EOF
-   outFile << "// EOF for " << filename << "\n";
-
-   // Close the file
-   outFile.close();
-
-   if (fIsVerbose)
-      edm::LogInfo("TMultiDimFet") << "done" << "\n";
+  if (fIsVerbose)
+    edm::LogInfo("TMultiDimFet") << "Writing on file \"" << filename << "\" ... " << std::flush;
+  //
+  // Write header of file
+  //
+  // Emacs mode line ;-)
+  outFile << "// -*- mode: c++ -*-"
+          << "\n";
+  // Info about creator
+  outFile << "// "
+          << "\n"
+          << "// File " << filename << " generated by TMultiDimFet::MakeRealCode"
+          << "\n";
+  // Time stamp
+  TDatime date;
+  outFile << "// on " << date.AsString() << "\n";
+  // ROOT version info
+  outFile << "// ROOT version " << gROOT->GetVersion() << "\n"
+          << "//"
+          << "\n";
+  // General information on the code
+  outFile << "// This file contains the function "
+          << "\n"
+          << "//"
+          << "\n"
+          << "//    double  " << prefix << "MDF(double *x); "
+          << "\n"
+          << "//"
+          << "\n"
+          << "// For evaluating the parameterization obtained"
+          << "\n"
+          << "// from TMultiDimFet and the point x"
+          << "\n"
+          << "// "
+          << "\n"
+          << "// See TMultiDimFet class documentation for more "
+          << "information "
+          << "\n"
+          << "// "
+          << "\n";
+  // Header files
+  if (isMethod)
+    // If these are methods, we need the class header
+    outFile << "#include \"" << classname << ".h\""
+            << "\n";
+
+  //
+  // Now for the data
+  //
+  outFile << "//"
+          << "\n"
+          << "// Static data variables"
+          << "\n"
+          << "//"
+          << "\n";
+  outFile << cv_qual << "int    " << prefix << "gNVariables    = " << fNVariables << ";"
+          << "\n";
+  outFile << cv_qual << "int    " << prefix << "gNCoefficients = " << fNCoefficients << ";"
+          << "\n";
+  outFile << cv_qual << "double " << prefix << "gDMean         = " << fMeanQuantity << ";"
+          << "\n";
+
+  // Assignment to mean vector.
+  outFile << "// Assignment to mean vector."
+          << "\n";
+  outFile << cv_qual << "double " << prefix << "gXMean[] = {"
+          << "\n";
+  for (i = 0; i < fNVariables; i++)
+    outFile << (i != 0 ? ", " : "  ") << fMeanVariables(i) << std::flush;
+  outFile << " };"
+          << "\n"
+          << "\n";
+
+  // Assignment to minimum vector.
+  outFile << "// Assignment to minimum vector."
+          << "\n";
+  outFile << cv_qual << "double " << prefix << "gXMin[] = {"
+          << "\n";
+  for (i = 0; i < fNVariables; i++)
+    outFile << (i != 0 ? ", " : "  ") << fMinVariables(i) << std::flush;
+  outFile << " };"
+          << "\n"
+          << "\n";
+
+  // Assignment to maximum vector.
+  outFile << "// Assignment to maximum vector."
+          << "\n";
+  outFile << cv_qual << "double " << prefix << "gXMax[] = {"
+          << "\n";
+  for (i = 0; i < fNVariables; i++)
+    outFile << (i != 0 ? ", " : "  ") << fMaxVariables(i) << std::flush;
+  outFile << " };"
+          << "\n"
+          << "\n";
+
+  // Assignment to coefficients vector.
+  outFile << "// Assignment to coefficients vector."
+          << "\n";
+  outFile << cv_qual << "double " << prefix << "gCoefficient[] = {" << std::flush;
+  for (i = 0; i < fNCoefficients; i++)
+    outFile << (i != 0 ? "," : "") << "\n"
+            << "  " << fCoefficients(i) << std::flush;
+  outFile << "\n"
+          << " };"
+          << "\n"
+          << "\n";
+
+  // Assignment to powers vector.
+  outFile << "// Assignment to powers vector."
+          << "\n"
+          << "// The powers are stored row-wise, that is"
+          << "\n"
+          << "//  p_ij = " << prefix << "gPower[i * NVariables + j];"
+          << "\n";
+  outFile << cv_qual << "int    " << prefix << "gPower[] = {" << std::flush;
+  for (i = 0; i < fNCoefficients; i++) {
+    for (j = 0; j < fNVariables; j++) {
+      if (j != 0)
+        outFile << std::flush << "  ";
+      else
+        outFile << "\n"
+                << "  ";
+      outFile << fPowers[fPowerIndex[i] * fNVariables + j]
+              << (i == fNCoefficients - 1 && j == fNVariables - 1 ? "" : ",") << std::flush;
+    }
+  }
+  outFile << "\n"
+          << "};"
+          << "\n"
+          << "\n";
+
+  //
+  // Finally we reach the function itself
+  //
+  outFile << "// "
+          << "\n"
+          << "// The " << (isMethod ? "method " : "function ") << "  double " << prefix << "MDF(double *x)"
+          << "\n"
+          << "// "
+          << "\n";
+  outFile << "double " << prefix << "MDF(double *x) {"
+          << "\n"
+          << "  double returnValue = " << prefix << "gDMean;"
+          << "\n"
+          << "  int    i = 0, j = 0, k = 0;"
+          << "\n"
+          << "  for (i = 0; i < " << prefix << "gNCoefficients ; i++) {"
+          << "\n"
+          << "    // Evaluate the ith term in the expansion"
+          << "\n"
+          << "    double term = " << prefix << "gCoefficient[i];"
+          << "\n"
+          << "    for (j = 0; j < " << prefix << "gNVariables; j++) {"
+          << "\n"
+          << "      // Evaluate the polynomial in the jth variable."
+          << "\n"
+          << "      int power = " << prefix << "gPower[" << prefix << "gNVariables * i + j]; "
+          << "\n"
+          << "      double p1 = 1, p2 = 0, p3 = 0, r = 0;"
+          << "\n"
+          << "      double v =  1 + 2. / (" << prefix << "gXMax[j] - " << prefix << "gXMin[j]) * (x[j] - " << prefix
+          << "gXMax[j]);"
+          << "\n"
+          << "      // what is the power to use!"
+          << "\n"
+          << "      switch(power) {"
+          << "\n"
+          << "      case 1: r = 1; break; "
+          << "\n"
+          << "      case 2: r = v; break; "
+          << "\n"
+          << "      default: "
+          << "\n"
+          << "        p2 = v; "
+          << "\n"
+          << "        for (k = 3; k <= power; k++) { "
+          << "\n"
+          << "          p3 = p2 * v;"
+          << "\n";
+  if (fPolyType == kLegendre)
+    outFile << "          p3 = ((2 * i - 3) * p2 * v - (i - 2) * p1)"
+            << " / (i - 1);"
+            << "\n";
+  if (fPolyType == kChebyshev)
+    outFile << "          p3 = 2 * v * p2 - p1; "
+            << "\n";
+  outFile << "          p1 = p2; p2 = p3; "
+          << "\n"
+          << "        }"
+          << "\n"
+          << "        r = p3;"
+          << "\n"
+          << "      }"
+          << "\n"
+          << "      // multiply this term by the poly in the jth var"
+          << "\n"
+          << "      term *= r; "
+          << "\n"
+          << "    }"
+          << "\n"
+          << "    // Add this term to the final result"
+          << "\n"
+          << "    returnValue += term;"
+          << "\n"
+          << "  }"
+          << "\n"
+          << "  return returnValue;"
+          << "\n"
+          << "}"
+          << "\n"
+          << "\n";
+
+  // EOF
+  outFile << "// EOF for " << filename << "\n";
+
+  // Close the file
+  outFile.close();
+
+  if (fIsVerbose)
+    edm::LogInfo("TMultiDimFet") << "done"
+                                 << "\n";
 }
 
-
 //____________________________________________________________________
-void TMultiDimFet::Print(Option_t *option) const
-{
-   // Print statistics etc.
-   // Options are
-   //   P        Parameters
-   //   S        Statistics
-   //   C        Coefficients
-   //   R        Result of parameterisation
-   //   F        Result of fit
-   //   K        Correlation Matrix
-   //   M        Pretty print formula
-   //
-   Int_t i = 0;
-   Int_t j = 0;
-
-   TString opt(option);
-   opt.ToLower();
-
-   if (opt.Contains("p")) {
-      // Print basic parameters for this object
-      edm::LogInfo("TMultiDimFet") << "User parameters:" << "\n"
-         << "----------------" << "\n"
-         << " Variables:                    " << fNVariables << "\n"
-         << " Data points:                  " << fSampleSize << "\n"
-         << " Max Terms:                    " << fMaxTerms << "\n"
-         << " Power Limit Parameter:        " << fPowerLimit << "\n"
-         << " Max functions:                " << fMaxFunctions << "\n"
-         << " Max functions to study:       " << fMaxStudy << "\n"
-         << " Max angle (optional):         " << fMaxAngle << "\n"
-         << " Min angle:                    " << fMinAngle << "\n"
-         << " Relative Error accepted:      " << fMinRelativeError << "\n"
-         << " Maximum Powers:               " << std::flush;
-      for (i = 0; i < fNVariables; i++)
-         edm::LogInfo("TMultiDimFet") << " " << fMaxPowers[i] - 1 << std::flush;
-      edm::LogInfo("TMultiDimFet") << "\n" << "\n"
-         << " Parameterisation will be done using " << std::flush;
-      if (fPolyType == kChebyshev)
-         edm::LogInfo("TMultiDimFet") << "Chebyshev polynomials" << "\n";
-      else if (fPolyType == kLegendre)
-         edm::LogInfo("TMultiDimFet") << "Legendre polynomials" << "\n";
-      else
-         edm::LogInfo("TMultiDimFet") << "Monomials" << "\n";
-      edm::LogInfo("TMultiDimFet") << "\n";
-   }
+void TMultiDimFet::Print(Option_t *option) const {
+  // Print statistics etc.
+  // Options are
+  //   P        Parameters
+  //   S        Statistics
+  //   C        Coefficients
+  //   R        Result of parameterisation
+  //   F        Result of fit
+  //   K        Correlation Matrix
+  //   M        Pretty print formula
+  //
+  Int_t i = 0;
+  Int_t j = 0;
+
+  TString opt(option);
+  opt.ToLower();
+
+  if (opt.Contains("p")) {
+    // Print basic parameters for this object
+    edm::LogInfo("TMultiDimFet") << "User parameters:"
+                                 << "\n"
+                                 << "----------------"
+                                 << "\n"
+                                 << " Variables:                    " << fNVariables << "\n"
+                                 << " Data points:                  " << fSampleSize << "\n"
+                                 << " Max Terms:                    " << fMaxTerms << "\n"
+                                 << " Power Limit Parameter:        " << fPowerLimit << "\n"
+                                 << " Max functions:                " << fMaxFunctions << "\n"
+                                 << " Max functions to study:       " << fMaxStudy << "\n"
+                                 << " Max angle (optional):         " << fMaxAngle << "\n"
+                                 << " Min angle:                    " << fMinAngle << "\n"
+                                 << " Relative Error accepted:      " << fMinRelativeError << "\n"
+                                 << " Maximum Powers:               " << std::flush;
+    for (i = 0; i < fNVariables; i++)
+      edm::LogInfo("TMultiDimFet") << " " << fMaxPowers[i] - 1 << std::flush;
+    edm::LogInfo("TMultiDimFet") << "\n"
+                                 << "\n"
+                                 << " Parameterisation will be done using " << std::flush;
+    if (fPolyType == kChebyshev)
+      edm::LogInfo("TMultiDimFet") << "Chebyshev polynomials"
+                                   << "\n";
+    else if (fPolyType == kLegendre)
+      edm::LogInfo("TMultiDimFet") << "Legendre polynomials"
+                                   << "\n";
+    else
+      edm::LogInfo("TMultiDimFet") << "Monomials"
+                                   << "\n";
+    edm::LogInfo("TMultiDimFet") << "\n";
+  }
 
-   if (opt.Contains("s")) {
-      // Print statistics for read data
-      edm::LogInfo("TMultiDimFet") << "Sample statistics:" << "\n"
-         << "------------------" << "\n"
-         << "                 D"  << std::flush;
-      for (i = 0; i < fNVariables; i++)
-         edm::LogInfo("TMultiDimFet") << " " << std::setw(10) << i+1 << std::flush;
-      edm::LogInfo("TMultiDimFet") << "\n" << " Max:   " << std::setw(10) << std::setprecision(7)
-         << fMaxQuantity << std::flush;
-      for (i = 0; i < fNVariables; i++)
-         edm::LogInfo("TMultiDimFet") << " " << std::setw(10) << std::setprecision(4)
-         << fMaxVariables(i) << std::flush;
-      edm::LogInfo("TMultiDimFet") << "\n" << " Min:   " << std::setw(10) << std::setprecision(7)
-         << fMinQuantity << std::flush;
-      for (i = 0; i < fNVariables; i++)
-         edm::LogInfo("TMultiDimFet") << " " << std::setw(10) << std::setprecision(4)
-         << fMinVariables(i) << std::flush;
-      edm::LogInfo("TMultiDimFet") << "\n" << " Mean:  " << std::setw(10) << std::setprecision(7)
-         << fMeanQuantity << std::flush;
-      for (i = 0; i < fNVariables; i++)
-         edm::LogInfo("TMultiDimFet") << " " << std::setw(10) << std::setprecision(4)
-         << fMeanVariables(i) << std::flush;
-      edm::LogInfo("TMultiDimFet") << "\n" << " Function Sum Squares:         " << fSumSqQuantity
-         << "\n" << "\n";
-   }
+  if (opt.Contains("s")) {
+    // Print statistics for read data
+    edm::LogInfo("TMultiDimFet") << "Sample statistics:"
+                                 << "\n"
+                                 << "------------------"
+                                 << "\n"
+                                 << "                 D" << std::flush;
+    for (i = 0; i < fNVariables; i++)
+      edm::LogInfo("TMultiDimFet") << " " << std::setw(10) << i + 1 << std::flush;
+    edm::LogInfo("TMultiDimFet") << "\n"
+                                 << " Max:   " << std::setw(10) << std::setprecision(7) << fMaxQuantity << std::flush;
+    for (i = 0; i < fNVariables; i++)
+      edm::LogInfo("TMultiDimFet") << " " << std::setw(10) << std::setprecision(4) << fMaxVariables(i) << std::flush;
+    edm::LogInfo("TMultiDimFet") << "\n"
+                                 << " Min:   " << std::setw(10) << std::setprecision(7) << fMinQuantity << std::flush;
+    for (i = 0; i < fNVariables; i++)
+      edm::LogInfo("TMultiDimFet") << " " << std::setw(10) << std::setprecision(4) << fMinVariables(i) << std::flush;
+    edm::LogInfo("TMultiDimFet") << "\n"
+                                 << " Mean:  " << std::setw(10) << std::setprecision(7) << fMeanQuantity << std::flush;
+    for (i = 0; i < fNVariables; i++)
+      edm::LogInfo("TMultiDimFet") << " " << std::setw(10) << std::setprecision(4) << fMeanVariables(i) << std::flush;
+    edm::LogInfo("TMultiDimFet") << "\n"
+                                 << " Function Sum Squares:         " << fSumSqQuantity << "\n"
+                                 << "\n";
+  }
 
-   if (opt.Contains("r")) {
-      edm::LogInfo("TMultiDimFet") << "Results of Parameterisation:" << "\n"
-         << "----------------------------" << "\n"
-         << " Total reduction of square residuals    "
-         << fSumSqResidual << "\n"
-         << " Relative precision obtained:           "
-         << fPrecision   << "\n"
-         << " Error obtained:                        "
-         << fError << "\n"
-         << " Multiple correlation coefficient:      "
-         << fCorrelationCoeff   << "\n"
-         << " Reduced Chi square over sample:        "
-         << fChi2 / (fSampleSize - fNCoefficients) << "\n"
-         << " Maximum residual value:                "
-         << fMaxResidual << "\n"
-         << " Minimum residual value:                "
-         << fMinResidual << "\n"
-         << " Estimated root mean square:            "
-         << fRMS << "\n"
-         << " Maximum powers used:                   " << std::flush;
-      for (j = 0; j < fNVariables; j++)
-         edm::LogInfo("TMultiDimFet") << fMaxPowersFinal[j] << " " << std::flush;
-      edm::LogInfo("TMultiDimFet") << "\n"
-         << " Function codes of candidate functions." << "\n"
-         << "  1: considered,"
-         << "  2: too little contribution,"
-         << "  3: accepted." << std::flush;
-      for (i = 0; i < fMaxFunctions; i++) {
-         if (i % 60 == 0)
-            edm::LogInfo("TMultiDimFet") << "\n" << " " << std::flush;
-         else if (i % 10 == 0)
-            edm::LogInfo("TMultiDimFet") << " " << std::flush;
-         edm::LogInfo("TMultiDimFet") << fFunctionCodes[i];
-      }
-      edm::LogInfo("TMultiDimFet") << "\n" << " Loop over candidates stopped because " << std::flush;
-      switch(fParameterisationCode){
-         case PARAM_MAXSTUDY:
-            edm::LogInfo("TMultiDimFet") << "max allowed studies reached" << "\n"; break;
-         case PARAM_SEVERAL:
-            edm::LogInfo("TMultiDimFet") << "all candidates considered several times" << "\n"; break;
-         case PARAM_RELERR:
-            edm::LogInfo("TMultiDimFet") << "wanted relative error obtained" << "\n"; break;
-         case PARAM_MAXTERMS:
-            edm::LogInfo("TMultiDimFet") << "max number of terms reached" << "\n"; break;
-         default:
-            edm::LogInfo("TMultiDimFet") << "some unknown reason" << "\n";
-            break;
-      }
-      edm::LogInfo("TMultiDimFet") << "\n";
-   }
+  if (opt.Contains("r")) {
+    edm::LogInfo("TMultiDimFet") << "Results of Parameterisation:"
+                                 << "\n"
+                                 << "----------------------------"
+                                 << "\n"
+                                 << " Total reduction of square residuals    " << fSumSqResidual << "\n"
+                                 << " Relative precision obtained:           " << fPrecision << "\n"
+                                 << " Error obtained:                        " << fError << "\n"
+                                 << " Multiple correlation coefficient:      " << fCorrelationCoeff << "\n"
+                                 << " Reduced Chi square over sample:        " << fChi2 / (fSampleSize - fNCoefficients)
+                                 << "\n"
+                                 << " Maximum residual value:                " << fMaxResidual << "\n"
+                                 << " Minimum residual value:                " << fMinResidual << "\n"
+                                 << " Estimated root mean square:            " << fRMS << "\n"
+                                 << " Maximum powers used:                   " << std::flush;
+    for (j = 0; j < fNVariables; j++)
+      edm::LogInfo("TMultiDimFet") << fMaxPowersFinal[j] << " " << std::flush;
+    edm::LogInfo("TMultiDimFet") << "\n"
+                                 << " Function codes of candidate functions."
+                                 << "\n"
+                                 << "  1: considered,"
+                                 << "  2: too little contribution,"
+                                 << "  3: accepted." << std::flush;
+    for (i = 0; i < fMaxFunctions; i++) {
+      if (i % 60 == 0)
+        edm::LogInfo("TMultiDimFet") << "\n"
+                                     << " " << std::flush;
+      else if (i % 10 == 0)
+        edm::LogInfo("TMultiDimFet") << " " << std::flush;
+      edm::LogInfo("TMultiDimFet") << fFunctionCodes[i];
+    }
+    edm::LogInfo("TMultiDimFet") << "\n"
+                                 << " Loop over candidates stopped because " << std::flush;
+    switch (fParameterisationCode) {
+      case PARAM_MAXSTUDY:
+        edm::LogInfo("TMultiDimFet") << "max allowed studies reached"
+                                     << "\n";
+        break;
+      case PARAM_SEVERAL:
+        edm::LogInfo("TMultiDimFet") << "all candidates considered several times"
+                                     << "\n";
+        break;
+      case PARAM_RELERR:
+        edm::LogInfo("TMultiDimFet") << "wanted relative error obtained"
+                                     << "\n";
+        break;
+      case PARAM_MAXTERMS:
+        edm::LogInfo("TMultiDimFet") << "max number of terms reached"
+                                     << "\n";
+        break;
+      default:
+        edm::LogInfo("TMultiDimFet") << "some unknown reason"
+                                     << "\n";
+        break;
+    }
+    edm::LogInfo("TMultiDimFet") << "\n";
+  }
 
-   if (opt.Contains("f")) {
-      edm::LogInfo("TMultiDimFet") << "Results of Fit:" << "\n"
-         << "---------------" << "\n"
-         << " Test sample size:                      "
-         << fTestSampleSize << "\n"
-         << " Multiple correlation coefficient:      "
-         << fTestCorrelationCoeff << "\n"
-         << " Relative precision obtained:           "
-         << fTestPrecision   << "\n"
-         << " Error obtained:                        "
-         << fTestError << "\n"
-         << " Reduced Chi square over sample:        "
-         << fChi2 / (fSampleSize - fNCoefficients) << "\n"
-         << "\n";
-/*
+  if (opt.Contains("f")) {
+    edm::LogInfo("TMultiDimFet") << "Results of Fit:"
+                                 << "\n"
+                                 << "---------------"
+                                 << "\n"
+                                 << " Test sample size:                      " << fTestSampleSize << "\n"
+                                 << " Multiple correlation coefficient:      " << fTestCorrelationCoeff << "\n"
+                                 << " Relative precision obtained:           " << fTestPrecision << "\n"
+                                 << " Error obtained:                        " << fTestError << "\n"
+                                 << " Reduced Chi square over sample:        " << fChi2 / (fSampleSize - fNCoefficients)
+                                 << "\n"
+                                 << "\n";
+    /*
       if (fFitter) {
          fFitter->PrintResults(1,1);
          edm::LogInfo("TMultiDimFet") << "\n";
       }
 */
-   }
+  }
 
-   if (opt.Contains("c")){
-      edm::LogInfo("TMultiDimFet") << "Coefficients:" << "\n"
-         << "-------------" << "\n"
-         << "   #         Value        Error   Powers" << "\n"
-         << " ---------------------------------------" << "\n";
-      for (i = 0; i < fNCoefficients; i++) {
-         edm::LogInfo("TMultiDimFet") << " " << std::setw(3) << i << "  "
-            << std::setw(12) << fCoefficients(i) << "  "
-            << std::setw(12) << fCoefficientsRMS(i) << "  " << std::flush;
-         for (j = 0; j < fNVariables; j++)
-            edm::LogInfo("TMultiDimFet") << " " << std::setw(3)
-            << fPowers[fPowerIndex[i] * fNVariables + j] - 1 << std::flush;
-         edm::LogInfo("TMultiDimFet") << "\n";
-      }
+  if (opt.Contains("c")) {
+    edm::LogInfo("TMultiDimFet") << "Coefficients:"
+                                 << "\n"
+                                 << "-------------"
+                                 << "\n"
+                                 << "   #         Value        Error   Powers"
+                                 << "\n"
+                                 << " ---------------------------------------"
+                                 << "\n";
+    for (i = 0; i < fNCoefficients; i++) {
+      edm::LogInfo("TMultiDimFet") << " " << std::setw(3) << i << "  " << std::setw(12) << fCoefficients(i) << "  "
+                                   << std::setw(12) << fCoefficientsRMS(i) << "  " << std::flush;
+      for (j = 0; j < fNVariables; j++)
+        edm::LogInfo("TMultiDimFet") << " " << std::setw(3) << fPowers[fPowerIndex[i] * fNVariables + j] - 1
+                                     << std::flush;
       edm::LogInfo("TMultiDimFet") << "\n";
-   }
-   if (opt.Contains("k") && fCorrelationMatrix.IsValid()) {
-      edm::LogInfo("TMultiDimFet") << "Correlation Matrix:" << "\n"
-         << "-------------------";
-      fCorrelationMatrix.Print();
-   }
+    }
+    edm::LogInfo("TMultiDimFet") << "\n";
+  }
+  if (opt.Contains("k") && fCorrelationMatrix.IsValid()) {
+    edm::LogInfo("TMultiDimFet") << "Correlation Matrix:"
+                                 << "\n"
+                                 << "-------------------";
+    fCorrelationMatrix.Print();
+  }
 
-   if (opt.Contains("m")) {
-      edm::LogInfo("TMultiDimFet")<<std::setprecision(25);
-      edm::LogInfo("TMultiDimFet") << "Parameterization:" << "\n"
-         << "-----------------" << "\n"
-         << "  Normalised variables: " << "\n";
-      for (i = 0; i < fNVariables; i++)
-         edm::LogInfo("TMultiDimFet") << "\ty" << i << "\t:= 1 + 2 * (x" << i << " - "
-         << fMaxVariables(i) << ") / (" 
-         << fMaxVariables(i) << " - " << fMinVariables(i) << ")" 
-         << "\n";
-      edm::LogInfo("TMultiDimFet") << "\n"
-         << "  f[";
-      for (i = 0; i < fNVariables; i++) {
-         edm::LogInfo("TMultiDimFet") << "y" << i;
-         if (i != fNVariables-1) edm::LogInfo("TMultiDimFet") << ", ";
-      }
-      edm::LogInfo("TMultiDimFet") << "] := ";
-      for (Int_t i = 0; i < fNCoefficients; i++) {
-         if (i != 0)
-            edm::LogInfo("TMultiDimFet") << " " << (fCoefficients(i) < 0 ? "- " : "+ ")
-            << TMath::Abs(fCoefficients(i));
-         else 
-            edm::LogInfo("TMultiDimFet") << fCoefficients(i);
-         for (Int_t j = 0; j < fNVariables; j++) {
-            Int_t p = fPowers[fPowerIndex[i] * fNVariables + j];
-            switch (p) { 
-               case 1: break;
-               case 2: edm::LogInfo("TMultiDimFet") << " * y" << j; break;
-               default:
-                  switch(fPolyType) {
-                     case kLegendre:  edm::LogInfo("TMultiDimFet") << " * L" << p-1 << "(y" << j << ")"; break;
-                     case kChebyshev: edm::LogInfo("TMultiDimFet") << " * C" << p-1 << "(y" << j << ")"; break;
-                     default:         edm::LogInfo("TMultiDimFet") << " * y" << j << "^" << p-1; break;
-                  }
+  if (opt.Contains("m")) {
+    edm::LogInfo("TMultiDimFet") << std::setprecision(25);
+    edm::LogInfo("TMultiDimFet") << "Parameterization:"
+                                 << "\n"
+                                 << "-----------------"
+                                 << "\n"
+                                 << "  Normalised variables: "
+                                 << "\n";
+    for (i = 0; i < fNVariables; i++)
+      edm::LogInfo("TMultiDimFet") << "\ty" << i << "\t:= 1 + 2 * (x" << i << " - " << fMaxVariables(i) << ") / ("
+                                   << fMaxVariables(i) << " - " << fMinVariables(i) << ")"
+                                   << "\n";
+    edm::LogInfo("TMultiDimFet") << "\n"
+                                 << "  f[";
+    for (i = 0; i < fNVariables; i++) {
+      edm::LogInfo("TMultiDimFet") << "y" << i;
+      if (i != fNVariables - 1)
+        edm::LogInfo("TMultiDimFet") << ", ";
+    }
+    edm::LogInfo("TMultiDimFet") << "] := ";
+    for (Int_t i = 0; i < fNCoefficients; i++) {
+      if (i != 0)
+        edm::LogInfo("TMultiDimFet") << " " << (fCoefficients(i) < 0 ? "- " : "+ ") << TMath::Abs(fCoefficients(i));
+      else
+        edm::LogInfo("TMultiDimFet") << fCoefficients(i);
+      for (Int_t j = 0; j < fNVariables; j++) {
+        Int_t p = fPowers[fPowerIndex[i] * fNVariables + j];
+        switch (p) {
+          case 1:
+            break;
+          case 2:
+            edm::LogInfo("TMultiDimFet") << " * y" << j;
+            break;
+          default:
+            switch (fPolyType) {
+              case kLegendre:
+                edm::LogInfo("TMultiDimFet") << " * L" << p - 1 << "(y" << j << ")";
+                break;
+              case kChebyshev:
+                edm::LogInfo("TMultiDimFet") << " * C" << p - 1 << "(y" << j << ")";
+                break;
+              default:
+                edm::LogInfo("TMultiDimFet") << " * y" << j << "^" << p - 1;
+                break;
             }
-
-         }
+        }
       }
-      edm::LogInfo("TMultiDimFet") << "\n";
-   }
+    }
+    edm::LogInfo("TMultiDimFet") << "\n";
+  }
 }
 
 //____________________________________________________________________
-void TMultiDimFet::PrintPolynomialsSpecial(Option_t *option) const
-{
-   //   M        Pretty print formula
-   //
-   Int_t i = 0;
-//   Int_t j = 0;
-
-   TString opt(option);
-   opt.ToLower();
-
-   if (opt.Contains("m")) {
-      edm::LogInfo("TMultiDimFet")<<std::setprecision(25);
-      edm::LogInfo("TMultiDimFet") << "Parameterization:" << "\n"
-         << "-----------------" << "\n"
-         << "  Normalised variables: " << "\n";
-      for (i = 0; i < fNVariables; i++)
-         edm::LogInfo("TMultiDimFet") << "\tdouble y" << i << "\t=1+2*(x" << i << "-"
-         << fMaxVariables(i) << ")/("
-         << fMaxVariables(i) << "-" << fMinVariables(i) <<");"
-         << "\n";
-      edm::LogInfo("TMultiDimFet") << "\n"
-         << "  f[";
-      for (i = 0; i < fNVariables; i++) {
-         edm::LogInfo("TMultiDimFet") << "y" << i;
-         if (i != fNVariables-1) edm::LogInfo("TMultiDimFet") << ", ";
-      }
-      edm::LogInfo("TMultiDimFet") << "] := "<<fMeanQuantity<<" + ";
-      for (Int_t i = 0; i < fNCoefficients; i++) {
-         if (i != 0)
-            edm::LogInfo("TMultiDimFet") << " " << (fCoefficients(i) < 0 ? "-" : "+")
-            << TMath::Abs(fCoefficients(i));
-         else
-            edm::LogInfo("TMultiDimFet") << fCoefficients(i);
-         for (Int_t j = 0; j < fNVariables; j++) {
-            Int_t p = fPowers[fPowerIndex[i] * fNVariables + j];
-            switch (p) {
-               case 1: break;
-               case 2: edm::LogInfo("TMultiDimFet") << "*y" << j; break;
-               default:
-                  switch(fPolyType) {
-                     case kLegendre:  edm::LogInfo("TMultiDimFet") << "*Leg(" << p-1 << ",y" << j << ")"; break;
-                     case kChebyshev: edm::LogInfo("TMultiDimFet") << "*C" << p-1 << "(y" << j << ")"; break;
-                     default:         edm::LogInfo("TMultiDimFet") << "*y" << j << "**" << p-1; break;
-                  }
+void TMultiDimFet::PrintPolynomialsSpecial(Option_t *option) const {
+  //   M        Pretty print formula
+  //
+  Int_t i = 0;
+  //   Int_t j = 0;
+
+  TString opt(option);
+  opt.ToLower();
+
+  if (opt.Contains("m")) {
+    edm::LogInfo("TMultiDimFet") << std::setprecision(25);
+    edm::LogInfo("TMultiDimFet") << "Parameterization:"
+                                 << "\n"
+                                 << "-----------------"
+                                 << "\n"
+                                 << "  Normalised variables: "
+                                 << "\n";
+    for (i = 0; i < fNVariables; i++)
+      edm::LogInfo("TMultiDimFet") << "\tdouble y" << i << "\t=1+2*(x" << i << "-" << fMaxVariables(i) << ")/("
+                                   << fMaxVariables(i) << "-" << fMinVariables(i) << ");"
+                                   << "\n";
+    edm::LogInfo("TMultiDimFet") << "\n"
+                                 << "  f[";
+    for (i = 0; i < fNVariables; i++) {
+      edm::LogInfo("TMultiDimFet") << "y" << i;
+      if (i != fNVariables - 1)
+        edm::LogInfo("TMultiDimFet") << ", ";
+    }
+    edm::LogInfo("TMultiDimFet") << "] := " << fMeanQuantity << " + ";
+    for (Int_t i = 0; i < fNCoefficients; i++) {
+      if (i != 0)
+        edm::LogInfo("TMultiDimFet") << " " << (fCoefficients(i) < 0 ? "-" : "+") << TMath::Abs(fCoefficients(i));
+      else
+        edm::LogInfo("TMultiDimFet") << fCoefficients(i);
+      for (Int_t j = 0; j < fNVariables; j++) {
+        Int_t p = fPowers[fPowerIndex[i] * fNVariables + j];
+        switch (p) {
+          case 1:
+            break;
+          case 2:
+            edm::LogInfo("TMultiDimFet") << "*y" << j;
+            break;
+          default:
+            switch (fPolyType) {
+              case kLegendre:
+                edm::LogInfo("TMultiDimFet") << "*Leg(" << p - 1 << ",y" << j << ")";
+                break;
+              case kChebyshev:
+                edm::LogInfo("TMultiDimFet") << "*C" << p - 1 << "(y" << j << ")";
+                break;
+              default:
+                edm::LogInfo("TMultiDimFet") << "*y" << j << "**" << p - 1;
+                break;
             }
-
-         }
-   edm::LogInfo("TMultiDimFet")<<"\n";
+        }
       }
       edm::LogInfo("TMultiDimFet") << "\n";
-   }
+    }
+    edm::LogInfo("TMultiDimFet") << "\n";
+  }
 }
 
-
 //____________________________________________________________________
-Bool_t TMultiDimFet::Select(const Int_t *)
-{
-   // Selection method. User can override this method for specialized
-   // selection of acceptable functions in fit. Default is to select
-   // all. This message is sent during the build-up of the function
-   // candidates table once for each set of powers in
-   // variables. Notice, that the argument array contains the powers
-   // PLUS ONE. For example, to De select the function
-   //     f = x1^2 * x2^4 * x3^5,
-   // this method should return kFALSE if given the argument
-   //     { 3, 4, 6 }
-   return kTRUE;
+Bool_t TMultiDimFet::Select(const Int_t *) {
+  // Selection method. User can override this method for specialized
+  // selection of acceptable functions in fit. Default is to select
+  // all. This message is sent during the build-up of the function
+  // candidates table once for each set of powers in
+  // variables. Notice, that the argument array contains the powers
+  // PLUS ONE. For example, to De select the function
+  //     f = x1^2 * x2^4 * x3^5,
+  // this method should return kFALSE if given the argument
+  //     { 3, 4, 6 }
+  return kTRUE;
 }
 
 //____________________________________________________________________
-void TMultiDimFet::SetMaxAngle(Double_t ang)
-{
-   // Set the max angle (in degrees) between the initial data vector to
-   // be fitted, and the new candidate function to be included in the
-   // fit.  By default it is 0, which automatically chooses another
-   // selection criteria. See also
-   // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
-   if (ang >= 90 || ang < 0) {
-      Warning("SetMaxAngle", "angle must be in [0,90)");
-      return;
-   }
+void TMultiDimFet::SetMaxAngle(Double_t ang) {
+  // Set the max angle (in degrees) between the initial data vector to
+  // be fitted, and the new candidate function to be included in the
+  // fit.  By default it is 0, which automatically chooses another
+  // selection criteria. See also
+  // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
+  if (ang >= 90 || ang < 0) {
+    Warning("SetMaxAngle", "angle must be in [0,90)");
+    return;
+  }
 
-   fMaxAngle = ang;
+  fMaxAngle = ang;
 }
 
 //____________________________________________________________________
-void TMultiDimFet::SetMinAngle(Double_t ang)
-{
-   // Set the min angle (in degrees) between a new candidate function
-   // and the subspace spanned by the previously accepted
-   // functions. See also
-   // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
-   if (ang > 90 || ang <= 0) {
-      Warning("SetMinAngle", "angle must be in [0,90)");
-      return;
-   }
-
-   fMinAngle = ang;
+void TMultiDimFet::SetMinAngle(Double_t ang) {
+  // Set the min angle (in degrees) between a new candidate function
+  // and the subspace spanned by the previously accepted
+  // functions. See also
+  // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
+  if (ang > 90 || ang <= 0) {
+    Warning("SetMinAngle", "angle must be in [0,90)");
+    return;
+  }
 
+  fMinAngle = ang;
 }
 
-
 //____________________________________________________________________
-void TMultiDimFet::SetPowers(const Int_t* powers, Int_t terms)
-{
-   // Define a user function. The input array must be of the form
-   // (p11, ..., p1N, ... ,pL1, ..., pLN)
-   // Where N is the dimension of the data sample, L is the number of
-   // terms (given in terms) and the first number, labels the term, the
-   // second the variable.  More information is given in the
-   // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
-   fIsUserFunction = kTRUE;
-   fMaxFunctions   = terms;
-   fMaxTerms       = terms;
-   fMaxStudy       = terms;
-   fMaxFunctionsTimesNVariables = fMaxFunctions * fNVariables;
-   fPowers.resize(fMaxFunctions * fNVariables);
-   Int_t i, j;
-   for (i = 0; i < fMaxFunctions; i++)
-      for(j = 0; j < fNVariables; j++)
-         fPowers[i * fNVariables + j] = powers[i * fNVariables + j]  + 1;
+void TMultiDimFet::SetPowers(const Int_t *powers, Int_t terms) {
+  // Define a user function. The input array must be of the form
+  // (p11, ..., p1N, ... ,pL1, ..., pLN)
+  // Where N is the dimension of the data sample, L is the number of
+  // terms (given in terms) and the first number, labels the term, the
+  // second the variable.  More information is given in the
+  // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
+  fIsUserFunction = kTRUE;
+  fMaxFunctions = terms;
+  fMaxTerms = terms;
+  fMaxStudy = terms;
+  fMaxFunctionsTimesNVariables = fMaxFunctions * fNVariables;
+  fPowers.resize(fMaxFunctions * fNVariables);
+  Int_t i, j;
+  for (i = 0; i < fMaxFunctions; i++)
+    for (j = 0; j < fNVariables; j++)
+      fPowers[i * fNVariables + j] = powers[i * fNVariables + j] + 1;
 }
 
 //____________________________________________________________________
-void TMultiDimFet::SetPowerLimit(Double_t limit)
-{
-   // Set the user parameter for the function selection. The bigger the
-   // limit, the more functions are used. The meaning of this variable
-   // is defined in the
-   // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
-   fPowerLimit = limit;
+void TMultiDimFet::SetPowerLimit(Double_t limit) {
+  // Set the user parameter for the function selection. The bigger the
+  // limit, the more functions are used. The meaning of this variable
+  // is defined in the
+  // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
+  fPowerLimit = limit;
 }
 
 //____________________________________________________________________
-void TMultiDimFet::SetMaxPowers(const Int_t* powers)
-{
-   // Set the maximum power to be considered in the fit for each
-   // variable. See also
-   // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
-   if (!powers)
-      return;
+void TMultiDimFet::SetMaxPowers(const Int_t *powers) {
+  // Set the maximum power to be considered in the fit for each
+  // variable. See also
+  // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
+  if (!powers)
+    return;
 
-   for (Int_t i = 0; i < fNVariables; i++)
-      fMaxPowers[i] = powers[i]+1;
+  for (Int_t i = 0; i < fNVariables; i++)
+    fMaxPowers[i] = powers[i] + 1;
 }
 
 //____________________________________________________________________
-void TMultiDimFet::SetMinRelativeError(Double_t error)
-{
-   // Set the acceptable relative error for when sum of square
-   // residuals is considered minimized. For a full account, refer to
-   // the
-   // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
-   fMinRelativeError = error;
+void TMultiDimFet::SetMinRelativeError(Double_t error) {
+  // Set the acceptable relative error for when sum of square
+  // residuals is considered minimized. For a full account, refer to
+  // the
+  // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
+  fMinRelativeError = error;
 }
 
-
 //____________________________________________________________________
-Bool_t TMultiDimFet::TestFunction(Double_t squareResidual,
-                                  Double_t dResidur)
-{
-   // PRIVATE METHOD:
-   // Test whether the currently considered function contributes to the
-   // fit. See also
-   // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
-
-   if (fNCoefficients != 0) {
-      // Now for the second test:
-      if (fMaxAngle == 0) {
-         // If the user hasn't supplied a max angle do the test as,
-         if (dResidur <
-            squareResidual / (fMaxTerms - fNCoefficients + 1 + 1E-10)) {
-               return kFALSE;
-         }
+Bool_t TMultiDimFet::TestFunction(Double_t squareResidual, Double_t dResidur) {
+  // PRIVATE METHOD:
+  // Test whether the currently considered function contributes to the
+  // fit. See also
+  // Begin_Html<a href="#TMultiDimFet:description">class description</a>End_Html
+
+  if (fNCoefficients != 0) {
+    // Now for the second test:
+    if (fMaxAngle == 0) {
+      // If the user hasn't supplied a max angle do the test as,
+      if (dResidur < squareResidual / (fMaxTerms - fNCoefficients + 1 + 1E-10)) {
+        return kFALSE;
       }
-      else {
-         // If the user has provided a max angle, test if the calculated
-         // angle is less then the max angle.
-         if (TMath::Sqrt(dResidur/fSumSqAvgQuantity) <
-            TMath::Cos(fMaxAngle*DEGRAD)) {
-               return kFALSE;
-         }
+    } else {
+      // If the user has provided a max angle, test if the calculated
+      // angle is less then the max angle.
+      if (TMath::Sqrt(dResidur / fSumSqAvgQuantity) < TMath::Cos(fMaxAngle * DEGRAD)) {
+        return kFALSE;
       }
-   }
-   // If we get here, the function is OK
-   return kTRUE;
+    }
+  }
+  // If we get here, the function is OK
+  return kTRUE;
 }
 
-
 //____________________________________________________________________
 //void mdfHelper(int& /*npar*/, double* /*divs*/, double& chi2,
 //               double* coeffs, int /*flag*/)
diff --git a/TBDataFormats/EcalTBObjects/interface/EcalTBTDCRawInfo.h b/TBDataFormats/EcalTBObjects/interface/EcalTBTDCRawInfo.h
index c1b119e02fb1e..21d63dec12586 100644
--- a/TBDataFormats/EcalTBObjects/interface/EcalTBTDCRawInfo.h
+++ b/TBDataFormats/EcalTBObjects/interface/EcalTBTDCRawInfo.h
@@ -6,7 +6,7 @@
 #include "TBDataFormats/EcalTBObjects/interface/EcalTBTDCSample.h"
 
 /** \class EcalTBTDCRawInfo
-      
+
 $Id: EcalTBTDCRawInfo.h,v 1.2 2006/04/21 09:30:56 meridian Exp $
 */
 
diff --git a/TrackPropagation/Geant4e/interface/ConvertFromToCLHEP.h b/TrackPropagation/Geant4e/interface/ConvertFromToCLHEP.h
index d81f291ab010f..a76b5d3dc5c66 100644
--- a/TrackPropagation/Geant4e/interface/ConvertFromToCLHEP.h
+++ b/TrackPropagation/Geant4e/interface/ConvertFromToCLHEP.h
@@ -1,167 +1,143 @@
 #ifndef TrackPropagation_ConvertFromToCLHEP_h
 #define TrackPropagation_ConvertFromToCLHEP_h
 
-//CLHEP
+// CLHEP
+#include "CLHEP/Geometry/Normal3D.h"
 #include "CLHEP/Geometry/Point3D.h"
-#include "CLHEP/Geometry/Normal3D.h" 
-#include "CLHEP/Vector/ThreeVector.h"
-#include "CLHEP/Vector/Rotation.h"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "CLHEP/Vector/Rotation.h"
+#include "CLHEP/Vector/ThreeVector.h"
 
-//CMS
+// CMS
+#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
+#include "DataFormats/GeometrySurface/interface/TkRotation.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 #include "DataFormats/GeometryVector/interface/GlobalVector.h"
-#include "DataFormats/GeometrySurface/interface/TkRotation.h"
-#include "DataFormats/CLHEP/interface/AlgebraicObjects.h"
 
-//Geant4
+// Geant4
 #include "G4ErrorFreeTrajState.hh"
 
 /** Utilities to convert among CLHEP and CMS points and vectors
  */
 
-namespace TrackPropagation
-{
-/**
+namespace TrackPropagation {
+  /**
  Convert a CMS GlobalPoint to a CLHEP HepGeom::Point3D<double>
  CMS uses cm while Geant4 uses mm. This is taken into account in the
  conversion.
  */
 
-inline HepGeom::Point3D<double> globalPointToHepPoint3D(const GlobalPoint& r)
-{
-	return HepGeom::Point3D<double>(r.x() * cm, r.y() * cm, r.z() * cm);
-}
+  inline HepGeom::Point3D<double> globalPointToHepPoint3D(const GlobalPoint &r) {
+    return HepGeom::Point3D<double>(r.x() * cm, r.y() * cm, r.z() * cm);
+  }
 
-/** Convert a CLHEP HepGeom::Point3D<double>  to a CMS GlobalPoint
+  /** Convert a CLHEP HepGeom::Point3D<double>  to a CMS GlobalPoint
  CMS uses cms while Geant4 uses mm. This is taken into account in the
  conversion.
  */
-inline GlobalPoint hepPoint3DToGlobalPoint(const HepGeom::Point3D<double> & r)
-{
-	return GlobalPoint(r.x() / cm, r.y() / cm, r.z() / cm);
-}
+  inline GlobalPoint hepPoint3DToGlobalPoint(const HepGeom::Point3D<double> &r) {
+    return GlobalPoint(r.x() / cm, r.y() / cm, r.z() / cm);
+  }
 
-/** Convert a G4double representing a scaler measure ( e.g. Track length ) to the
- CMS convention, which is using mm
+  /** Convert a G4double representing a scaler measure ( e.g. Track length ) to
+ the CMS convention, which is using mm
  */
-inline double g4doubleToCmsDouble(const G4double & d)
-{
-	return d / cm;
-}
+  inline double g4doubleToCmsDouble(const G4double &d) { return d / cm; }
 
-/** Convert a CMS GlobalVector to a CLHEP HepGeom::Normal3D<double>
+  /** Convert a CMS GlobalVector to a CLHEP HepGeom::Normal3D<double>
  CMS uses GeV while G4 uses MeV
  */
-inline HepGeom::Normal3D<double> globalVectorToHepNormal3D(
-		const GlobalVector& p)
-{
-	return HepGeom::Normal3D<double>(p.x(), p.y(), p.z());
-}
+  inline HepGeom::Normal3D<double> globalVectorToHepNormal3D(const GlobalVector &p) {
+    return HepGeom::Normal3D<double>(p.x(), p.y(), p.z());
+  }
 
-/** Convert a CLHEP HepGeom::Normal3D<double>  to a CMS GlobalVector
+  /** Convert a CLHEP HepGeom::Normal3D<double>  to a CMS GlobalVector
  CMS uses GeV while G4 uses MeV
  */
-inline GlobalVector hepNormal3DToGlobalVector(
-		const HepGeom::Normal3D<double> & p)
-{
-	return GlobalVector(p.x(), p.y(), p.z());
-}
+  inline GlobalVector hepNormal3DToGlobalVector(const HepGeom::Normal3D<double> &p) {
+    return GlobalVector(p.x(), p.y(), p.z());
+  }
 
-/** Convert a CMS GlobalVector to a CLHEP CLHEP::Hep3Vector
+  /** Convert a CMS GlobalVector to a CLHEP CLHEP::Hep3Vector
  */
-inline CLHEP::Hep3Vector globalVectorToHep3Vector(const GlobalVector& p)
-{
-	return CLHEP::Hep3Vector(p.x(), p.y(), p.z());
-}
+  inline CLHEP::Hep3Vector globalVectorToHep3Vector(const GlobalVector &p) {
+    return CLHEP::Hep3Vector(p.x(), p.y(), p.z());
+  }
 
-/** Convert a CLHEP CLHEP::Hep3Vector to a CMS GlobalVector
+  /** Convert a CLHEP CLHEP::Hep3Vector to a CMS GlobalVector
  */
-inline GlobalVector hep3VectorToGlobalVector(const CLHEP::Hep3Vector& p)
-{
-	return GlobalVector(p.x(), p.y(), p.z());
-}
+  inline GlobalVector hep3VectorToGlobalVector(const CLHEP::Hep3Vector &p) { return GlobalVector(p.x(), p.y(), p.z()); }
 
-/** Convert a CMS GlobalPoint to a CLHEP CLHEP::Hep3Vector
+  /** Convert a CMS GlobalPoint to a CLHEP CLHEP::Hep3Vector
  CMS uses cm while Geant4 uses mm. This is taken into account in the
  conversion.
  */
-inline CLHEP::Hep3Vector globalPointToHep3Vector(const GlobalPoint& r)
-{
-	return CLHEP::Hep3Vector(r.x() * cm, r.y() * cm, r.z() * cm);
-}
+  inline CLHEP::Hep3Vector globalPointToHep3Vector(const GlobalPoint &r) {
+    return CLHEP::Hep3Vector(r.x() * cm, r.y() * cm, r.z() * cm);
+  }
 
-/** Convert a CLHEP CLHEP::Hep3Vector to a CMS GlobalPoint
+  /** Convert a CLHEP CLHEP::Hep3Vector to a CMS GlobalPoint
  CMS uses cm while Geant4 uses mm. This is taken into account in the
  conversion.
  */
-inline GlobalPoint hep3VectorToGlobalPoint(const CLHEP::Hep3Vector& v)
-{
-	return GlobalPoint(v.x() / cm, v.y() / cm, v.z() / cm);
-}
+  inline GlobalPoint hep3VectorToGlobalPoint(const CLHEP::Hep3Vector &v) {
+    return GlobalPoint(v.x() / cm, v.y() / cm, v.z() / cm);
+  }
 
-/** Convert a CMS TkRotation<float> to a CLHEP CLHEP::HepRotation=G4RotationMatrix
+  /** Convert a CMS TkRotation<float> to a CLHEP
+ * CLHEP::HepRotation=G4RotationMatrix
  */
-inline CLHEP::HepRotation tkRotationFToHepRotation(const TkRotation<float>& tkr)
-{
-	return CLHEP::HepRotation(CLHEP::Hep3Vector(tkr.xx(), tkr.yx(), tkr.zx()),
-			CLHEP::Hep3Vector(tkr.xy(), tkr.yy(), tkr.zy()),
-			CLHEP::Hep3Vector(tkr.xz(), tkr.yz(), tkr.zz()));
-}
-
-/** Convert a CLHEP CLHEP::Hep3Vector to a CMS GlobalPoint
+  inline CLHEP::HepRotation tkRotationFToHepRotation(const TkRotation<float> &tkr) {
+    return CLHEP::HepRotation(CLHEP::Hep3Vector(tkr.xx(), tkr.yx(), tkr.zx()),
+                              CLHEP::Hep3Vector(tkr.xy(), tkr.yy(), tkr.zy()),
+                              CLHEP::Hep3Vector(tkr.xz(), tkr.yz(), tkr.zz()));
+  }
+
+  /** Convert a CLHEP CLHEP::Hep3Vector to a CMS GlobalPoint
  */
-inline TkRotation<float> hepRotationToTkRotationF(const CLHEP::HepRotation& r)
-{
-	return TkRotation<float>(r.xx(), r.xy(), r.xz(), r.yx(), r.yy(), r.yz(),
-			r.zx(), r.zy(), r.zz());
-}
+  inline TkRotation<float> hepRotationToTkRotationF(const CLHEP::HepRotation &r) {
+    return TkRotation<float>(r.xx(), r.xy(), r.xz(), r.yx(), r.yy(), r.yz(), r.zx(), r.zy(), r.zz());
+  }
 
-/** Convert a G4 Trajectory Error Matrix to the CMS Algebraic Sym Matrix
+  /** Convert a G4 Trajectory Error Matrix to the CMS Algebraic Sym Matrix
  CMS uses q/p as first parameter, G4 uses 1/p
  */
 
-inline AlgebraicSymMatrix55 g4ErrorTrajErrToAlgebraicSymMatrix55(
-		const G4ErrorTrajErr& e, const int q)
-{
-	assert(q != 0);
-	//From DataFormats/CLHEP/interface/Migration.h
-	//typedef ROOT::Math::SMatrix<double,5,5,ROOT::Math::MatRepSym<double,5> > AlgebraicSymMatrix55;
-	AlgebraicSymMatrix55 m55;
-	for (unsigned int i = 0; i < 5; i++)
-		for (unsigned int j = 0; j < 5; j++)
-		{
-			m55(i, j) = e(i + 1, j + 1);
-			if (i == 0)
-				m55(i, j) = double(q) * m55(i, j);
-			if (j == 0)
-				m55(i, j) = double(q) * m55(i, j);
-
-		}
-	return m55;
-}
-
-/** Convert a CMS Algebraic Sym Matrix (for curv error) to a G4 Trajectory Error Matrix
+  inline AlgebraicSymMatrix55 g4ErrorTrajErrToAlgebraicSymMatrix55(const G4ErrorTrajErr &e, const int q) {
+    assert(q != 0);
+    // From DataFormats/CLHEP/interface/Migration.h
+    // typedef ROOT::Math::SMatrix<double,5,5,ROOT::Math::MatRepSym<double,5> >
+    // AlgebraicSymMatrix55;
+    AlgebraicSymMatrix55 m55;
+    for (unsigned int i = 0; i < 5; i++)
+      for (unsigned int j = 0; j < 5; j++) {
+        m55(i, j) = e(i + 1, j + 1);
+        if (i == 0)
+          m55(i, j) = double(q) * m55(i, j);
+        if (j == 0)
+          m55(i, j) = double(q) * m55(i, j);
+      }
+    return m55;
+  }
+
+  /** Convert a CMS Algebraic Sym Matrix (for curv error) to a G4 Trajectory Error
+ * Matrix
  */
-inline G4ErrorTrajErr algebraicSymMatrix55ToG4ErrorTrajErr(
-		const AlgebraicSymMatrix55& e, const int q)
-{
-	assert(q != 0);
-	G4ErrorTrajErr g4err(5, 1);
-	for (unsigned int i = 0; i < 5; i++)
-		for (unsigned int j = 0; j < 5; j++)
-		{
-			g4err(i + 1, j + 1) = e(i, j);
-
-			if (i == 0)
-				g4err(i + 1, j + 1) = g4err(i + 1, j + 1) * double(q);
-			if (j == 0)
-				g4err(i + 1, j + 1) = g4err(i + 1, j + 1) * double(q);
-
-		}
-	return g4err;
-}
-
-}
+  inline G4ErrorTrajErr algebraicSymMatrix55ToG4ErrorTrajErr(const AlgebraicSymMatrix55 &e, const int q) {
+    assert(q != 0);
+    G4ErrorTrajErr g4err(5, 1);
+    for (unsigned int i = 0; i < 5; i++)
+      for (unsigned int j = 0; j < 5; j++) {
+        g4err(i + 1, j + 1) = e(i, j);
+
+        if (i == 0)
+          g4err(i + 1, j + 1) = g4err(i + 1, j + 1) * double(q);
+        if (j == 0)
+          g4err(i + 1, j + 1) = g4err(i + 1, j + 1) * double(q);
+      }
+    return g4err;
+  }
+
+}  // namespace TrackPropagation
 
 #endif
diff --git a/TrackPropagation/Geant4e/interface/Geant4ePropagator.h b/TrackPropagation/Geant4e/interface/Geant4ePropagator.h
index 6fa308ea2c702..d665b8beae61f 100644
--- a/TrackPropagation/Geant4e/interface/Geant4ePropagator.h
+++ b/TrackPropagation/Geant4e/interface/Geant4ePropagator.h
@@ -3,151 +3,160 @@
 
 #include <memory>
 
-//CMS includes
+// CMS includes
 // - Propagator
 #include "TrackingTools/GeomPropagators/interface/Propagator.h"
 
 // - Geant4e
+#include "G4ErrorPropagatorData.hh"
 #include "G4ErrorPropagatorManager.hh"
 #include "G4ErrorSurfaceTarget.hh"
-#include "G4ErrorPropagatorData.hh"
 
 /** Propagator based on the Geant4e package. Uses the Propagator class
  *  in the TrackingTools/GeomPropagators package to define the interface.
  *  See that class for more details.
  */
 
-class Geant4ePropagator: public Propagator {
-
+class Geant4ePropagator : public Propagator {
 public:
-	/** Constructor. Takes as arguments:
-	 *  * The magnetic field
-	 *  * The particle name whose properties will be used in the propagation. Without the charge, i.e. "mu", "pi", ...
-	 *  * The propagation direction. It may be: alongMomentum, oppositeToMomentum
-	 */
-	Geant4ePropagator(const MagneticField* field = nullptr, std::string particleName =
-			"mu", PropagationDirection dir = alongMomentum);
-
-	~Geant4ePropagator() override;
-
-	/** Propagate from a free state (e.g. position and momentum in
-	 *  in global cartesian coordinates) to a surface.
-	 */
-/*
-	virtual TrajectoryStateOnSurface
-	propagate(const FreeTrajectoryState& ftsStart, const Plane& pDest) const override;
-
-	virtual TrajectoryStateOnSurface
-	propagate(const FreeTrajectoryState& ftsStart, const Cylinder& cDest) const override;
-*/
-	/** Propagate from a state on surface (e.g. position and momentum in
-	 *  in global cartesian coordinates associated with a layer) to a surface.
-	 */
-/*        
-	virtual TrajectoryStateOnSurface
-	propagate(const TrajectoryStateOnSurface& tsos, const Plane& plane) const override;
-
-	virtual TrajectoryStateOnSurface
-	propagate(const TrajectoryStateOnSurface& tsos, const Cylinder& cyl) const override;
-*/
-	/** The methods propagateWithPath() are identical to the corresponding
-	 *  methods propagate() in what concerns the resulting
-	 *  TrajectoryStateOnSurface, but they provide in addition the
-	 *  exact path length along the trajectory.
-	 *  All of these method calls are internally mapped to
-	 */
-
-	std::pair<TrajectoryStateOnSurface, double>
-	propagateWithPath(const FreeTrajectoryState&, const Plane&) const override;
-
-	std::pair<TrajectoryStateOnSurface, double>
-	propagateWithPath(const FreeTrajectoryState&, const Cylinder&) const override;
-
-	std::pair<TrajectoryStateOnSurface, double>
-	propagateWithPath(const TrajectoryStateOnSurface&, const Plane&) const override;
-
-	std::pair<TrajectoryStateOnSurface, double>
-	propagateWithPath(const TrajectoryStateOnSurface&, const Cylinder&) const override;
-
-	Geant4ePropagator* clone() const override {
-		return new Geant4ePropagator(*this);
-	}
-
-	const MagneticField* magneticField() const override {
-		return theField;
-	}
+  /** Constructor. Takes as arguments:
+   *  * The magnetic field
+   *  * The particle name whose properties will be used in the propagation.
+   * Without the charge, i.e. "mu", "pi", ...
+   *  * The propagation direction. It may be: alongMomentum, oppositeToMomentum
+   */
+  Geant4ePropagator(const MagneticField *field = nullptr,
+                    std::string particleName = "mu",
+                    PropagationDirection dir = alongMomentum);
+
+  ~Geant4ePropagator() override;
+
+  /** Propagate from a free state (e.g. position and momentum in
+   *  in global cartesian coordinates) to a surface.
+   */
+  /*
+          virtual TrajectoryStateOnSurface
+          propagate(const FreeTrajectoryState& ftsStart, const Plane& pDest)
+     const override;
+
+          virtual TrajectoryStateOnSurface
+          propagate(const FreeTrajectoryState& ftsStart, const Cylinder& cDest)
+     const override;
+  */
+  /** Propagate from a state on surface (e.g. position and momentum in
+   *  in global cartesian coordinates associated with a layer) to a surface.
+   */
+  /*
+          virtual TrajectoryStateOnSurface
+          propagate(const TrajectoryStateOnSurface& tsos, const Plane& plane)
+     const override;
+
+          virtual TrajectoryStateOnSurface
+          propagate(const TrajectoryStateOnSurface& tsos, const Cylinder& cyl)
+     const override;
+  */
+  /** The methods propagateWithPath() are identical to the corresponding
+   *  methods propagate() in what concerns the resulting
+   *  TrajectoryStateOnSurface, but they provide in addition the
+   *  exact path length along the trajectory.
+   *  All of these method calls are internally mapped to
+   */
+
+  std::pair<TrajectoryStateOnSurface, double> propagateWithPath(const FreeTrajectoryState &,
+                                                                const Plane &) const override;
+
+  std::pair<TrajectoryStateOnSurface, double> propagateWithPath(const FreeTrajectoryState &,
+                                                                const Cylinder &) const override;
+
+  std::pair<TrajectoryStateOnSurface, double> propagateWithPath(const TrajectoryStateOnSurface &,
+                                                                const Plane &) const override;
+
+  std::pair<TrajectoryStateOnSurface, double> propagateWithPath(const TrajectoryStateOnSurface &,
+                                                                const Cylinder &) const override;
+
+  Geant4ePropagator *clone() const override { return new Geant4ePropagator(*this); }
+
+  const MagneticField *magneticField() const override { return theField; }
 
 private:
-
-	typedef std::pair<TrajectoryStateOnSurface, double> TsosPP;
-	typedef std::pair< bool, std::shared_ptr< G4ErrorTarget > > ErrorTargetPair;
-
-	//Magnetic field
-	const MagneticField* theField;
-
-	//Name of the particle whose properties will be used in the propagation
-	std::string theParticleName;
-
-	//The Geant4e manager. Does the real propagation
-	G4ErrorPropagatorManager* theG4eManager;
-	G4ErrorPropagatorData* theG4eData;
-
-	// Transform a CMS Reco detector surface into a Geant4 Target for the error propagation
-	template <class SurfaceType>
-	ErrorTargetPair transformToG4SurfaceTarget( const SurfaceType& pDest, bool moveTargetToEndOfSurface ) const;
-
-	// generates the Geant4 name for a particle from the
-	// string stored in theParticleName ( set via constructor )
-	// and the particle charge.
-	// 'mu' as a basis for muon becomes 'mu+' or 'mu-', depening on the charge
-	// This method only supports neutral and +/- 1e charges so far
-	//
-	// returns the generated string
-	std::string generateParticleName ( int charge ) const;
-
-	// flexible method which performs the actual propagation either for a plane or cylinder
-	// surface type
-	//
-	// returns TSOS after the propagation and the path length
-	template <class SurfaceType>
-	std::pair<TrajectoryStateOnSurface, double>
-	propagateGeneric(const FreeTrajectoryState& ftsStart, const SurfaceType& pDest) const;
-
-	// saves the Geant4 propagation direction (Forward or Backward) in the provided variable
-	// reference mode and returns true if the propagation direction could be set
-	template <class SurfaceType>
-	bool configurePropagation ( G4ErrorMode & mode, SurfaceType const& pDest,
-								GlobalPoint const& cmsInitPos,GlobalVector const& cmsInitMom ) const;
-
-	// special case to determine the propagation direction if the CMS propagation direction 'anyDirection'
-	// was set.
-	// This method is called by configurePropagation and provides specific implementations for Plane
-	// and Cylinder classes
-	template <class SurfaceType>
-	bool configureAnyPropagation ( G4ErrorMode & mode, SurfaceType const& pDest,
-								   GlobalPoint const& cmsInitPos,
-								   GlobalVector const& cmsInitMom  ) const;
-
-	// Ensure Geant4 Error propagation is initialized, if not done so, yet
-	// if the forceInit parameter is set to true, the initialization is performed,
-	// even if already done before.
-	// This can be necessary, when Geant4 needs to read in a new MagneticField object,
-	// which changed during lumi section crossing
-	void ensureGeant4eIsInitilized( bool forceInit ) const;
-
-	// returns the name of the SurfaceType. Mostly for debug outputs
-	template < class SurfaceType >
-	std::string getSurfaceType ( SurfaceType const& surface) const;
-
-	void debugReportPlaneSetup ( GlobalPoint const& posPlane, HepGeom::Point3D<double> const& surfPos,
-								 GlobalVector const& normalPlane, HepGeom::Normal3D<double> const& surfNorm,
-								 const Plane& pDest ) const;
-
-	template <class SurfaceType>
-	void  debugReportTrackState ( std::string const& currentContext, GlobalPoint const& cmsInitPos,
-								  CLHEP::Hep3Vector const& g4InitPos,
-								  GlobalVector const& cmsInitMom, CLHEP::Hep3Vector const& g4InitMom,
-								  const SurfaceType& pDest) const;
+  typedef std::pair<TrajectoryStateOnSurface, double> TsosPP;
+  typedef std::pair<bool, std::shared_ptr<G4ErrorTarget>> ErrorTargetPair;
+
+  // Magnetic field
+  const MagneticField *theField;
+
+  // Name of the particle whose properties will be used in the propagation
+  std::string theParticleName;
+
+  // The Geant4e manager. Does the real propagation
+  G4ErrorPropagatorManager *theG4eManager;
+  G4ErrorPropagatorData *theG4eData;
+
+  // Transform a CMS Reco detector surface into a Geant4 Target for the error
+  // propagation
+  template <class SurfaceType>
+  ErrorTargetPair transformToG4SurfaceTarget(const SurfaceType &pDest, bool moveTargetToEndOfSurface) const;
+
+  // generates the Geant4 name for a particle from the
+  // string stored in theParticleName ( set via constructor )
+  // and the particle charge.
+  // 'mu' as a basis for muon becomes 'mu+' or 'mu-', depening on the charge
+  // This method only supports neutral and +/- 1e charges so far
+  //
+  // returns the generated string
+  std::string generateParticleName(int charge) const;
+
+  // flexible method which performs the actual propagation either for a plane or
+  // cylinder surface type
+  //
+  // returns TSOS after the propagation and the path length
+  template <class SurfaceType>
+  std::pair<TrajectoryStateOnSurface, double> propagateGeneric(const FreeTrajectoryState &ftsStart,
+                                                               const SurfaceType &pDest) const;
+
+  // saves the Geant4 propagation direction (Forward or Backward) in the
+  // provided variable reference mode and returns true if the propagation
+  // direction could be set
+  template <class SurfaceType>
+  bool configurePropagation(G4ErrorMode &mode,
+                            SurfaceType const &pDest,
+                            GlobalPoint const &cmsInitPos,
+                            GlobalVector const &cmsInitMom) const;
+
+  // special case to determine the propagation direction if the CMS propagation
+  // direction 'anyDirection' was set. This method is called by
+  // configurePropagation and provides specific implementations for Plane and
+  // Cylinder classes
+  template <class SurfaceType>
+  bool configureAnyPropagation(G4ErrorMode &mode,
+                               SurfaceType const &pDest,
+                               GlobalPoint const &cmsInitPos,
+                               GlobalVector const &cmsInitMom) const;
+
+  // Ensure Geant4 Error propagation is initialized, if not done so, yet
+  // if the forceInit parameter is set to true, the initialization is performed,
+  // even if already done before.
+  // This can be necessary, when Geant4 needs to read in a new MagneticField
+  // object, which changed during lumi section crossing
+  void ensureGeant4eIsInitilized(bool forceInit) const;
+
+  // returns the name of the SurfaceType. Mostly for debug outputs
+  template <class SurfaceType>
+  std::string getSurfaceType(SurfaceType const &surface) const;
+
+  void debugReportPlaneSetup(GlobalPoint const &posPlane,
+                             HepGeom::Point3D<double> const &surfPos,
+                             GlobalVector const &normalPlane,
+                             HepGeom::Normal3D<double> const &surfNorm,
+                             const Plane &pDest) const;
+
+  template <class SurfaceType>
+  void debugReportTrackState(std::string const &currentContext,
+                             GlobalPoint const &cmsInitPos,
+                             CLHEP::Hep3Vector const &g4InitPos,
+                             GlobalVector const &cmsInitMom,
+                             CLHEP::Hep3Vector const &g4InitMom,
+                             const SurfaceType &pDest) const;
 };
 
 #endif
diff --git a/TrackPropagation/Geant4e/plugins/GeantPropagatorESProducer.cc b/TrackPropagation/Geant4e/plugins/GeantPropagatorESProducer.cc
index 8ece64fab06c9..44c960fabdbbe 100644
--- a/TrackPropagation/Geant4e/plugins/GeantPropagatorESProducer.cc
+++ b/TrackPropagation/Geant4e/plugins/GeantPropagatorESProducer.cc
@@ -1,43 +1,41 @@
 #include "GeantPropagatorESProducer.h"
-#include "TrackPropagation/Geant4e/interface/Geant4ePropagator.h"
 #include "MagneticField/Engine/interface/MagneticField.h"
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
+#include "TrackPropagation/Geant4e/interface/Geant4ePropagator.h"
 
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ModuleFactory.h"
 
-#include <string>
 #include <memory>
+#include <string>
 
 using namespace edm;
 
-GeantPropagatorESProducer::GeantPropagatorESProducer(const edm::ParameterSet & p) 
-{
+GeantPropagatorESProducer::GeantPropagatorESProducer(const edm::ParameterSet &p) {
   std::string myname = p.getParameter<std::string>("ComponentName");
   pset_ = p;
-  setWhatProduced(this,myname);
+  setWhatProduced(this, myname);
 }
 
 GeantPropagatorESProducer::~GeantPropagatorESProducer() {}
 
-std::unique_ptr<Propagator> 
-GeantPropagatorESProducer::produce(const TrackingComponentsRecord & iRecord){ 
-
+std::unique_ptr<Propagator> GeantPropagatorESProducer::produce(const TrackingComponentsRecord &iRecord) {
   ESHandle<MagneticField> magfield;
-  iRecord.getRecord<IdealMagneticFieldRecord>().get(magfield );
+  iRecord.getRecord<IdealMagneticFieldRecord>().get(magfield);
 
   std::string pdir = pset_.getParameter<std::string>("PropagationDirection");
   std::string particleName = pset_.getParameter<std::string>("ParticleName");
 
   PropagationDirection dir = alongMomentum;
-  
-  if (pdir == "oppositeToMomentum") dir = oppositeToMomentum;
-  if (pdir == "alongMomentum") dir = alongMomentum;
-  if (pdir == "anyDirection") dir = anyDirection;
-  
-  return std::make_unique<Geant4ePropagator>(&(*magfield),particleName,dir);
-}
 
+  if (pdir == "oppositeToMomentum")
+    dir = oppositeToMomentum;
+  if (pdir == "alongMomentum")
+    dir = alongMomentum;
+  if (pdir == "anyDirection")
+    dir = anyDirection;
 
+  return std::make_unique<Geant4ePropagator>(&(*magfield), particleName, dir);
+}
diff --git a/TrackPropagation/Geant4e/plugins/GeantPropagatorESProducer.h b/TrackPropagation/Geant4e/plugins/GeantPropagatorESProducer.h
index b97ff36111863..1b41fdd4680a0 100644
--- a/TrackPropagation/Geant4e/plugins/GeantPropagatorESProducer.h
+++ b/TrackPropagation/Geant4e/plugins/GeantPropagatorESProducer.h
@@ -3,8 +3,8 @@
 
 #include "FWCore/Framework/interface/ESProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
 #include "TrackingTools/GeomPropagators/interface/Propagator.h"
+#include "TrackingTools/Records/interface/TrackingComponentsRecord.h"
 #include <memory>
 
 /*
@@ -14,20 +14,15 @@
  *
  */
 
-class GeantPropagatorESProducer: public edm::ESProducer{
- public:
-  GeantPropagatorESProducer(const edm::ParameterSet & p);
-  ~GeantPropagatorESProducer() override; 
+class GeantPropagatorESProducer : public edm::ESProducer {
+public:
+  GeantPropagatorESProducer(const edm::ParameterSet &p);
+  ~GeantPropagatorESProducer() override;
 
   std::unique_ptr<Propagator> produce(const TrackingComponentsRecord &);
 
- private:
+private:
   edm::ParameterSet pset_;
 };
 
-
 #endif
-
-
-
-
diff --git a/TrackPropagation/Geant4e/plugins/module.cc b/TrackPropagation/Geant4e/plugins/module.cc
index 8db5e601293ec..d8b7511ccac9a 100644
--- a/TrackPropagation/Geant4e/plugins/module.cc
+++ b/TrackPropagation/Geant4e/plugins/module.cc
@@ -1,10 +1,9 @@
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/ModuleFactory.h"
 #include "FWCore/Framework/interface/ESProducer.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ModuleFactory.h"
 #include "GeantPropagatorESProducer.h"
 
 #include "FWCore/Utilities/interface/typelookup.h"
 
 DEFINE_FWK_EVENTSETUP_MODULE(GeantPropagatorESProducer);
-
diff --git a/TrackPropagation/Geant4e/src/Geant4ePropagator.cc b/TrackPropagation/Geant4e/src/Geant4ePropagator.cc
index 95c57125f76bf..e3d4db5fc58c4 100644
--- a/TrackPropagation/Geant4e/src/Geant4ePropagator.cc
+++ b/TrackPropagation/Geant4e/src/Geant4ePropagator.cc
@@ -1,465 +1,401 @@
 #include <sstream>
 
-//Geant4e
-#include "TrackPropagation/Geant4e/interface/Geant4ePropagator.h"
+// Geant4e
 #include "TrackPropagation/Geant4e/interface/ConvertFromToCLHEP.h"
+#include "TrackPropagation/Geant4e/interface/Geant4ePropagator.h"
 
-//CMSSW
-#include "MagneticField/Engine/interface/MagneticField.h"
+// CMSSW
 #include "DataFormats/TrajectorySeed/interface/PropagationDirection.h"
-#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
+#include "MagneticField/Engine/interface/MagneticField.h"
 #include "TrackingTools/TrajectoryState/interface/SurfaceSideDefinition.h"
+#include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 
 #include "DataFormats/GeometrySurface/interface/Cylinder.h"
 #include "DataFormats/GeometrySurface/interface/Plane.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "TrackingTools/AnalyticalJacobians/interface/AnalyticalCurvilinearJacobian.h"
 
-//Geant4
-#include "G4ErrorRunManagerHelper.hh"
+// Geant4
+#include "G4Box.hh"
+#include "G4ErrorCylSurfaceTarget.hh"
 #include "G4ErrorFreeTrajState.hh"
 #include "G4ErrorPlaneSurfaceTarget.hh"
-#include "G4ErrorCylSurfaceTarget.hh"
 #include "G4ErrorPropagatorData.hh"
+#include "G4ErrorRunManagerHelper.hh"
 #include "G4EventManager.hh"
+#include "G4Field.hh"
+#include "G4FieldManager.hh"
+#include "G4GeometryTolerance.hh"
 #include "G4SteppingControl.hh"
 #include "G4TransportationManager.hh"
-#include "G4Box.hh"
 #include "G4Tubs.hh"
 #include "G4UImanager.hh"
-#include "G4GeometryTolerance.hh"
-#include "G4TransportationManager.hh"
-#include "G4Field.hh"
-#include "G4FieldManager.hh"
 
-//CLHEP
+// CLHEP
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 
-/** Constructor. 
+/** Constructor.
  */
-Geant4ePropagator::Geant4ePropagator(const MagneticField* field,
-		std::string particleName, PropagationDirection dir) :
-		Propagator(dir), theField(field), theParticleName(
-				particleName), theG4eManager(
-				G4ErrorPropagatorManager::GetErrorPropagatorManager()), theG4eData(
-				G4ErrorPropagatorData::GetErrorPropagatorData())
-{
-	LogDebug("Geant4e") << "Geant4e Propagator initialized";
-
-	// has to be called here, doing it later will not load the G4 physics list properly when using
-	// the G4 ES Producer. Reason: unclear
-	ensureGeant4eIsInitilized( true );
+Geant4ePropagator::Geant4ePropagator(const MagneticField *field, std::string particleName, PropagationDirection dir)
+    : Propagator(dir),
+      theField(field),
+      theParticleName(particleName),
+      theG4eManager(G4ErrorPropagatorManager::GetErrorPropagatorManager()),
+      theG4eData(G4ErrorPropagatorData::GetErrorPropagatorData()) {
+  LogDebug("Geant4e") << "Geant4e Propagator initialized";
+
+  // has to be called here, doing it later will not load the G4 physics list
+  // properly when using the G4 ES Producer. Reason: unclear
+  ensureGeant4eIsInitilized(true);
 }
 
-/** Destructor. 
+/** Destructor.
  */
-Geant4ePropagator::~Geant4ePropagator()
-{
-    LogDebug("Geant4e") << "Geant4ePropagator::~Geant4ePropagator()" << std::endl;
+Geant4ePropagator::~Geant4ePropagator() {
+  LogDebug("Geant4e") << "Geant4ePropagator::~Geant4ePropagator()" << std::endl;
 
-	// don't close the g4 Geometry here, because the propagator might have been cloned
-    // but there is only one, globally-shared Geometry
+  // don't close the g4 Geometry here, because the propagator might have been
+  // cloned
+  // but there is only one, globally-shared Geometry
 }
 
 //
 ////////////////////////////////////////////////////////////////////////////
 //
 
-/** Propagate from a free state (e.g. position and momentum in 
+/** Propagate from a free state (e.g. position and momentum in
  *  in global cartesian coordinates) to a plane.
  */
 
-void Geant4ePropagator::ensureGeant4eIsInitilized( bool forceInit ) const
-{
-	LogDebug("Geant4e") << "ensureGeant4eIsInitilized called" << std::endl;
-	if ( (G4ErrorPropagatorData::GetErrorPropagatorData()->GetState()
-			== G4ErrorState_PreInit) || forceInit )
-	{
-		LogDebug("Geant4e")  << "Initializing G4 propagator" << std::endl;
-
-		G4UImanager::GetUIpointer()->ApplyCommand(
-				"/exerror/setField -10. kilogauss");
-
-		theG4eManager->InitGeant4e();
-
-		const G4Field* field =
-				G4TransportationManager::GetTransportationManager()->GetFieldManager()->GetDetectorField();
-		if (field == nullptr)
-		{
-			edm::LogError("Geant4e") << "No G4 magnetic field defined";
-		}
-		LogDebug("Geant4e") << "G4 propagator initialized" << std::endl;
-	}
-    else {
-        LogDebug("Geant4e") << "G4 not in preinit state: " << G4ErrorPropagatorData::GetErrorPropagatorData()->GetState() << std::endl;
-    }
+void Geant4ePropagator::ensureGeant4eIsInitilized(bool forceInit) const {
+  LogDebug("Geant4e") << "ensureGeant4eIsInitilized called" << std::endl;
+  if ((G4ErrorPropagatorData::GetErrorPropagatorData()->GetState() == G4ErrorState_PreInit) || forceInit) {
+    LogDebug("Geant4e") << "Initializing G4 propagator" << std::endl;
+
+    G4UImanager::GetUIpointer()->ApplyCommand("/exerror/setField -10. kilogauss");
 
-    // example code uses
-    // G4UImanager::GetUIpointer()->ApplyCommand("/geant4e/limits/stepLength 100 mm");
-	G4UImanager::GetUIpointer()->ApplyCommand(
-			"/geant4e/limits/stepLength 10.0 mm");
+    theG4eManager->InitGeant4e();
+
+    const G4Field *field = G4TransportationManager::GetTransportationManager()->GetFieldManager()->GetDetectorField();
+    if (field == nullptr) {
+      edm::LogError("Geant4e") << "No G4 magnetic field defined";
+    }
+    LogDebug("Geant4e") << "G4 propagator initialized" << std::endl;
+  } else {
+    LogDebug("Geant4e") << "G4 not in preinit state: " << G4ErrorPropagatorData::GetErrorPropagatorData()->GetState()
+                        << std::endl;
+  }
+
+  // example code uses
+  // G4UImanager::GetUIpointer()->ApplyCommand("/geant4e/limits/stepLength 100
+  // mm");
+  G4UImanager::GetUIpointer()->ApplyCommand("/geant4e/limits/stepLength 10.0 mm");
 }
 
-template<>
-Geant4ePropagator::ErrorTargetPair Geant4ePropagator::transformToG4SurfaceTarget(
-		const Plane& pDest, bool moveTargetToEndOfSurface) const
-{
-	//* Get position and normal (orientation) of the destination plane
-	GlobalPoint posPlane = pDest.toGlobal(LocalPoint(0, 0, 0));
-	GlobalVector normalPlane = pDest.toGlobal(LocalVector(0, 0, 1.));
-	normalPlane = normalPlane.unit();
-
-	//* Transform this into HepGeom::Point3D<double>  and HepGeom::Normal3D<double>  that define a plane for
-	//  Geant4e.
-	//  CMS uses cm and GeV while Geant4 uses mm and MeV
-	HepGeom::Point3D<double> surfPos =
-			TrackPropagation::globalPointToHepPoint3D(posPlane);
-	HepGeom::Normal3D<double> surfNorm =
-			TrackPropagation::globalVectorToHepNormal3D(normalPlane);
-
-	//* Set the target surface
-	return ErrorTargetPair(false,
-			std::make_shared < G4ErrorPlaneSurfaceTarget > (surfNorm, surfPos));
+template <>
+Geant4ePropagator::ErrorTargetPair Geant4ePropagator::transformToG4SurfaceTarget(const Plane &pDest,
+                                                                                 bool moveTargetToEndOfSurface) const {
+  //* Get position and normal (orientation) of the destination plane
+  GlobalPoint posPlane = pDest.toGlobal(LocalPoint(0, 0, 0));
+  GlobalVector normalPlane = pDest.toGlobal(LocalVector(0, 0, 1.));
+  normalPlane = normalPlane.unit();
+
+  //* Transform this into HepGeom::Point3D<double>  and
+  // HepGeom::Normal3D<double>  that define a plane for
+  //  Geant4e.
+  //  CMS uses cm and GeV while Geant4 uses mm and MeV
+  HepGeom::Point3D<double> surfPos = TrackPropagation::globalPointToHepPoint3D(posPlane);
+  HepGeom::Normal3D<double> surfNorm = TrackPropagation::globalVectorToHepNormal3D(normalPlane);
+
+  //* Set the target surface
+  return ErrorTargetPair(false, std::make_shared<G4ErrorPlaneSurfaceTarget>(surfNorm, surfPos));
 }
 
-template<>
-Geant4ePropagator::ErrorTargetPair Geant4ePropagator::transformToG4SurfaceTarget(
-		const Cylinder& pDest, bool moveTargetToEndOfSurface) const
-{
-	//Get Cylinder parameters.
-	//CMS uses cm and GeV while Geant4 uses mm and MeV.
-	// - Radius
-	G4float radCyl = pDest.radius() * cm;
-	// - Position: PositionType & GlobalPoint are Basic3DPoint<float,GlobalTag>
-	G4ThreeVector posCyl = TrackPropagation::globalPointToHep3Vector(
-			pDest.position());
-	// - Rotation: Type in CMSSW is RotationType == TkRotation<T>, T=float
-	G4RotationMatrix rotCyl = TrackPropagation::tkRotationFToHepRotation(
-			pDest.rotation());
-
-	//DEBUG
-	TkRotation<float> rotation = pDest.rotation();
-	LogDebug("Geant4e") << "G4e -  TkRotation" << rotation;
-	LogDebug("Geant4e") << "G4e -  G4Rotation" << rotCyl << "mm";
-
-	return ErrorTargetPair(!moveTargetToEndOfSurface,
-			std::make_shared < G4ErrorCylSurfaceTarget
-					> (radCyl, posCyl, rotCyl));
+template <>
+Geant4ePropagator::ErrorTargetPair Geant4ePropagator::transformToG4SurfaceTarget(const Cylinder &pDest,
+                                                                                 bool moveTargetToEndOfSurface) const {
+  // Get Cylinder parameters.
+  // CMS uses cm and GeV while Geant4 uses mm and MeV.
+  // - Radius
+  G4float radCyl = pDest.radius() * cm;
+  // - Position: PositionType & GlobalPoint are Basic3DPoint<float,GlobalTag>
+  G4ThreeVector posCyl = TrackPropagation::globalPointToHep3Vector(pDest.position());
+  // - Rotation: Type in CMSSW is RotationType == TkRotation<T>, T=float
+  G4RotationMatrix rotCyl = TrackPropagation::tkRotationFToHepRotation(pDest.rotation());
+
+  // DEBUG
+  TkRotation<float> rotation = pDest.rotation();
+  LogDebug("Geant4e") << "G4e -  TkRotation" << rotation;
+  LogDebug("Geant4e") << "G4e -  G4Rotation" << rotCyl << "mm";
+
+  return ErrorTargetPair(!moveTargetToEndOfSurface, std::make_shared<G4ErrorCylSurfaceTarget>(radCyl, posCyl, rotCyl));
 }
 
-template<>
-std::string Geant4ePropagator::getSurfaceType(Cylinder const& c) const
-{
-	return "Cylinder";
+template <>
+std::string Geant4ePropagator::getSurfaceType(Cylinder const &c) const {
+  return "Cylinder";
 }
 
-template<>
-std::string Geant4ePropagator::getSurfaceType(Plane const& c) const
-{
-	return "Plane";
+template <>
+std::string Geant4ePropagator::getSurfaceType(Plane const &c) const {
+  return "Plane";
 }
 
-std::string Geant4ePropagator::generateParticleName(int charge) const
-{
-	std::string particleName = theParticleName;
+std::string Geant4ePropagator::generateParticleName(int charge) const {
+  std::string particleName = theParticleName;
 
-	if (charge > 0)
-	{
-		particleName += "+";
-	}
-	if ( charge < 0)
-	{
-		particleName += "-";
-	}
+  if (charge > 0) {
+    particleName += "+";
+  }
+  if (charge < 0) {
+    particleName += "-";
+  }
 
-	LogDebug("Geant4e") << "G4e -  Particle name: " << particleName;
+  LogDebug("Geant4e") << "G4e -  Particle name: " << particleName;
 
-	return particleName;
+  return particleName;
 }
 
-template<>
-bool Geant4ePropagator::configureAnyPropagation(G4ErrorMode & mode,
-		Plane const& pDest, GlobalPoint const& cmsInitPos,
-		GlobalVector const& cmsInitMom) const
-{
-	if (pDest.localZ(cmsInitPos) * pDest.localZ(cmsInitMom) < 0)
-	{
-		mode = G4ErrorMode_PropForwards;
-		LogDebug("Geant4e") << "G4e -  Propagator mode is \'forwards\' indirect via the Any direction" << std::endl;
-	}
-	else
-	{
-		mode = G4ErrorMode_PropBackwards;
-		LogDebug("Geant4e") << "G4e -  Propagator mode is \'backwards\' indirect via the Any direction" << std::endl;
-	}
-
-	return true;
+template <>
+bool Geant4ePropagator::configureAnyPropagation(G4ErrorMode &mode,
+                                                Plane const &pDest,
+                                                GlobalPoint const &cmsInitPos,
+                                                GlobalVector const &cmsInitMom) const {
+  if (pDest.localZ(cmsInitPos) * pDest.localZ(cmsInitMom) < 0) {
+    mode = G4ErrorMode_PropForwards;
+    LogDebug("Geant4e") << "G4e -  Propagator mode is \'forwards\' indirect "
+                           "via the Any direction"
+                        << std::endl;
+  } else {
+    mode = G4ErrorMode_PropBackwards;
+    LogDebug("Geant4e") << "G4e -  Propagator mode is \'backwards\' indirect "
+                           "via the Any direction"
+                        << std::endl;
+  }
+
+  return true;
 }
 
-template<>
-bool Geant4ePropagator::configureAnyPropagation(G4ErrorMode & mode,
-		Cylinder const& pDest, GlobalPoint const& cmsInitPos,
-		GlobalVector const& cmsInitMom) const
-{
-	//------------------------------------
-	//For cylinder assume outside is backwards, inside is along
-	//General use for particles from collisions
-	LocalPoint lpos = pDest.toLocal(cmsInitPos);
-	Surface::Side theSide = pDest.side(lpos, 0);
-	if (theSide == SurfaceOrientation::positiveSide)
-	{ //outside cylinder
-		mode = G4ErrorMode_PropBackwards;
-		LogDebug("Geant4e") << "G4e -  Propagator mode is \'backwards\' indirect via the Any direction";
-	}
-	else
-	{ //inside cylinder
-		mode = G4ErrorMode_PropForwards;
-		LogDebug("Geant4e") << "G4e -  Propagator mode is \'forwards\' indirect via the Any direction";
-	}
-
-	return true;
+template <>
+bool Geant4ePropagator::configureAnyPropagation(G4ErrorMode &mode,
+                                                Cylinder const &pDest,
+                                                GlobalPoint const &cmsInitPos,
+                                                GlobalVector const &cmsInitMom) const {
+  //------------------------------------
+  // For cylinder assume outside is backwards, inside is along
+  // General use for particles from collisions
+  LocalPoint lpos = pDest.toLocal(cmsInitPos);
+  Surface::Side theSide = pDest.side(lpos, 0);
+  if (theSide == SurfaceOrientation::positiveSide) {  // outside cylinder
+    mode = G4ErrorMode_PropBackwards;
+    LogDebug("Geant4e") << "G4e -  Propagator mode is \'backwards\' indirect "
+                           "via the Any direction";
+  } else {  // inside cylinder
+    mode = G4ErrorMode_PropForwards;
+    LogDebug("Geant4e") << "G4e -  Propagator mode is \'forwards\' indirect "
+                           "via the Any direction";
+  }
+
+  return true;
 }
 
-template<class SurfaceType>
-bool Geant4ePropagator::configurePropagation(G4ErrorMode & mode,
-		SurfaceType const& pDest, GlobalPoint const& cmsInitPos,
-		GlobalVector const& cmsInitMom) const
-{
-	if (propagationDirection() == oppositeToMomentum)
-	{
-		mode = G4ErrorMode_PropBackwards;
-		LogDebug("Geant4e") << "G4e -  Propagator mode is \'backwards\' " << std::endl;
-	}
-	else if (propagationDirection() == alongMomentum)
-	{
-		mode = G4ErrorMode_PropForwards;
-		LogDebug("Geant4e") << "G4e -  Propagator mode is \'forwards\'" << std::endl;
-	}
-	else if (propagationDirection() == anyDirection)
-	{
-		if (configureAnyPropagation(mode, pDest, cmsInitPos, cmsInitMom)
-				== false)
-			return false;
-	}
-	else
-	{
-		edm::LogError("Geant4e") << "G4e - Unsupported propagation mode";
-		return false;
-	}
-	return true;
+template <class SurfaceType>
+bool Geant4ePropagator::configurePropagation(G4ErrorMode &mode,
+                                             SurfaceType const &pDest,
+                                             GlobalPoint const &cmsInitPos,
+                                             GlobalVector const &cmsInitMom) const {
+  if (propagationDirection() == oppositeToMomentum) {
+    mode = G4ErrorMode_PropBackwards;
+    LogDebug("Geant4e") << "G4e -  Propagator mode is \'backwards\' " << std::endl;
+  } else if (propagationDirection() == alongMomentum) {
+    mode = G4ErrorMode_PropForwards;
+    LogDebug("Geant4e") << "G4e -  Propagator mode is \'forwards\'" << std::endl;
+  } else if (propagationDirection() == anyDirection) {
+    if (configureAnyPropagation(mode, pDest, cmsInitPos, cmsInitMom) == false)
+      return false;
+  } else {
+    edm::LogError("Geant4e") << "G4e - Unsupported propagation mode";
+    return false;
+  }
+  return true;
 }
 
-template<class SurfaceType>
-std::pair<TrajectoryStateOnSurface, double> Geant4ePropagator::propagateGeneric(
-		const FreeTrajectoryState& ftsStart, const SurfaceType& pDest) const
-{
-	///////////////////////////////
-	// Construct the target surface
-	//
-	//* Set the target surface
-
-	ErrorTargetPair g4eTarget_center = transformToG4SurfaceTarget(pDest, false);
-
-	// * Get the starting point and direction and convert them to CLHEP::Hep3Vector
-	//   for G4. CMS uses cm and GeV while Geant4 uses mm and MeV
-	GlobalPoint cmsInitPos = ftsStart.position();
-	GlobalVector cmsInitMom = ftsStart.momentum();
-        bool flipped=false;
-	if (propagationDirection() == oppositeToMomentum)
-	{
-        // flip the momentum vector as Geant4 will not do this 
-        // on it's own in a backward propagation
-		cmsInitMom = -cmsInitMom;
-                flipped = true;
-	}
-
-        //Set the mode of propagation according to the propagation direction
-        G4ErrorMode mode = G4ErrorMode_PropForwards;
-        if (!configurePropagation(mode, pDest, cmsInitPos, cmsInitMom))
-          return TsosPP(TrajectoryStateOnSurface(), 0.0f);
-        
-        //re-check propagation direction chosen in case of AnyDirection
-        if (mode == G4ErrorMode_PropBackwards && !flipped)
-          cmsInitMom = -cmsInitMom;
-
-	CLHEP::Hep3Vector g4InitPos = TrackPropagation::globalPointToHep3Vector(
-			cmsInitPos);
-	CLHEP::Hep3Vector g4InitMom = TrackPropagation::globalVectorToHep3Vector(
-			cmsInitMom * GeV);
-
-	debugReportTrackState("intitial", cmsInitPos, g4InitPos, cmsInitMom,
-			g4InitMom, pDest);
-
-	//Set the mode of propagation according to the propagation direction
-	//G4ErrorMode mode = G4ErrorMode_PropForwards;
-
-	//if (!configurePropagation(mode, pDest, cmsInitPos, cmsInitMom))
-	//	return TsosPP(TrajectoryStateOnSurface(), 0.0f);
-
-
-	///////////////////////////////
-	//Set the error and trajectories, and finally propagate
-	//
-	G4ErrorTrajErr g4error(5, 1);
-	if (ftsStart.hasError())
-	{
-		CurvilinearTrajectoryError initErr;
-		initErr = ftsStart.curvilinearError();
-		g4error = TrackPropagation::algebraicSymMatrix55ToG4ErrorTrajErr(
-				initErr, ftsStart.charge());
-		LogDebug("Geant4e") << "CMS -  Error matrix: " << std::endl
-									<< initErr.matrix();
-	} else
-    {
-        LogDebug("Geant4e") << "No error matrix available" << std::endl;
-        return TsosPP(TrajectoryStateOnSurface(), 0.0f);
+template <class SurfaceType>
+std::pair<TrajectoryStateOnSurface, double> Geant4ePropagator::propagateGeneric(const FreeTrajectoryState &ftsStart,
+                                                                                const SurfaceType &pDest) const {
+  ///////////////////////////////
+  // Construct the target surface
+  //
+  //* Set the target surface
+
+  ErrorTargetPair g4eTarget_center = transformToG4SurfaceTarget(pDest, false);
+
+  // * Get the starting point and direction and convert them to
+  // CLHEP::Hep3Vector
+  //   for G4. CMS uses cm and GeV while Geant4 uses mm and MeV
+  GlobalPoint cmsInitPos = ftsStart.position();
+  GlobalVector cmsInitMom = ftsStart.momentum();
+  bool flipped = false;
+  if (propagationDirection() == oppositeToMomentum) {
+    // flip the momentum vector as Geant4 will not do this
+    // on it's own in a backward propagation
+    cmsInitMom = -cmsInitMom;
+    flipped = true;
+  }
+
+  // Set the mode of propagation according to the propagation direction
+  G4ErrorMode mode = G4ErrorMode_PropForwards;
+  if (!configurePropagation(mode, pDest, cmsInitPos, cmsInitMom))
+    return TsosPP(TrajectoryStateOnSurface(), 0.0f);
+
+  // re-check propagation direction chosen in case of AnyDirection
+  if (mode == G4ErrorMode_PropBackwards && !flipped)
+    cmsInitMom = -cmsInitMom;
+
+  CLHEP::Hep3Vector g4InitPos = TrackPropagation::globalPointToHep3Vector(cmsInitPos);
+  CLHEP::Hep3Vector g4InitMom = TrackPropagation::globalVectorToHep3Vector(cmsInitMom * GeV);
+
+  debugReportTrackState("intitial", cmsInitPos, g4InitPos, cmsInitMom, g4InitMom, pDest);
+
+  // Set the mode of propagation according to the propagation direction
+  // G4ErrorMode mode = G4ErrorMode_PropForwards;
+
+  // if (!configurePropagation(mode, pDest, cmsInitPos, cmsInitMom))
+  //	return TsosPP(TrajectoryStateOnSurface(), 0.0f);
+
+  ///////////////////////////////
+  // Set the error and trajectories, and finally propagate
+  //
+  G4ErrorTrajErr g4error(5, 1);
+  if (ftsStart.hasError()) {
+    CurvilinearTrajectoryError initErr;
+    initErr = ftsStart.curvilinearError();
+    g4error = TrackPropagation::algebraicSymMatrix55ToG4ErrorTrajErr(initErr, ftsStart.charge());
+    LogDebug("Geant4e") << "CMS -  Error matrix: " << std::endl << initErr.matrix();
+  } else {
+    LogDebug("Geant4e") << "No error matrix available" << std::endl;
+    return TsosPP(TrajectoryStateOnSurface(), 0.0f);
+  }
+
+  LogDebug("Geant4e") << "G4e -  Error matrix: " << std::endl << g4error;
+
+  // in CMSSW, the state errors are deflated when performing the backward
+  // propagation
+  if (mode == G4ErrorMode_PropForwards) {
+    G4ErrorPropagatorData::GetErrorPropagatorData()->SetStage(G4ErrorStage_Inflation);
+  } else if (mode == G4ErrorMode_PropBackwards) {
+    G4ErrorPropagatorData::GetErrorPropagatorData()->SetStage(G4ErrorStage_Deflation);
+  }
+
+  G4ErrorFreeTrajState g4eTrajState(generateParticleName(ftsStart.charge()), g4InitPos, g4InitMom, g4error);
+  LogDebug("Geant4e") << "G4e -  Traj. State: " << (g4eTrajState);
+
+  //////////////////////////////
+  // Propagate
+  int iterations = 0;
+  double finalPathLength = 0;
+
+  HepGeom::Point3D<double> finalRecoPos;
+
+  G4ErrorPropagatorData::GetErrorPropagatorData()->SetMode(mode);
+
+  theG4eData->SetTarget(g4eTarget_center.second.get());
+  LogDebug("Geant4e") << "Running Propagation to the RECO surface" << std::endl;
+
+  theG4eManager->InitTrackPropagation();
+
+  bool continuePropagation = true;
+  while (continuePropagation) {
+    iterations++;
+    LogDebug("Geant4e") << std::endl << "step count " << iterations << " step length " << finalPathLength;
+
+    const int ierr = theG4eManager->PropagateOneStep(&g4eTrajState, mode);
+
+    if (ierr != 0) {
+      // propagation failed, return invalid track state
+      return TsosPP(TrajectoryStateOnSurface(), 0.0f);
     }
 
-	LogDebug("Geant4e") << "G4e -  Error matrix: " << std::endl << g4error;
-
-	// in CMSSW, the state errors are deflated when performing the backward propagation
-	if (mode == G4ErrorMode_PropForwards)
-	{
-		G4ErrorPropagatorData::GetErrorPropagatorData()->SetStage(
-				G4ErrorStage_Inflation);
-	}
-	else if (mode == G4ErrorMode_PropBackwards)
-	{
-		G4ErrorPropagatorData::GetErrorPropagatorData()->SetStage(
-				G4ErrorStage_Deflation);
-	}
-
-	G4ErrorFreeTrajState g4eTrajState(generateParticleName(ftsStart.charge()),
-			g4InitPos, g4InitMom, g4error);
-	LogDebug("Geant4e")  << "G4e -  Traj. State: " << (g4eTrajState);
-
-	//////////////////////////////
-	// Propagate
-	int iterations = 0;
-	double finalPathLength = 0;
-
-	HepGeom::Point3D<double> finalRecoPos;
-
-	G4ErrorPropagatorData::GetErrorPropagatorData()->SetMode(mode);
-
-	theG4eData->SetTarget(g4eTarget_center.second.get());
-	LogDebug("Geant4e") << "Running Propagation to the RECO surface" << std::endl;
-
-	theG4eManager->InitTrackPropagation();
-
-	bool continuePropagation = true;
-	while (continuePropagation)
-	{
-		iterations++;
-		LogDebug("Geant4e") << std::endl << "step count " << iterations << " step length " << finalPathLength;
-
-		const int ierr = theG4eManager->PropagateOneStep(&g4eTrajState, mode);
-
-		if (ierr != 0)
-		{
-			// propagation failed, return invalid track state
-			return TsosPP(TrajectoryStateOnSurface(), 0.0f);
-		}
-
-		const float thisPathLength = TrackPropagation::g4doubleToCmsDouble(
-				g4eTrajState.GetG4Track()->GetStepLength());
-
-		LogDebug("Geant4e") << "step Length was " << thisPathLength << " cm, current global position: " << TrackPropagation::hepPoint3DToGlobalPoint( g4eTrajState.GetPosition() ) << std::endl;
-
-		finalPathLength += thisPathLength;
-
-		//if (std::fabs(finalPathLength) > 10000.0f)
-		if (std::fabs(finalPathLength) > 200.0f)
-		{
-			LogDebug("Geant4e")
-			<< "ERROR: Quitting propagation: path length mega large"
-			<< std::endl;
-			theG4eManager->GetPropagator()->InvokePostUserTrackingAction(
-					g4eTrajState.GetG4Track());
-			continuePropagation = false;
-			LogDebug("Geant4e")
-					<< "WARNING: Quitting propagation: max path length exceeded, returning invalid state"
-					<< std::endl;
-
-			// reached maximum path length, bail out
-			return TsosPP(TrajectoryStateOnSurface(), 0.0f);
-		}
-
-		if (theG4eManager->GetPropagator()->CheckIfLastStep(
-				g4eTrajState.GetG4Track()))
-		{
-			theG4eManager->GetPropagator()->InvokePostUserTrackingAction(
-					g4eTrajState.GetG4Track());
-			continuePropagation = false;
-		}
-	}
-
-    // CMSSW Tracking convention, backward propagations have negative path length
-	if (propagationDirection() == oppositeToMomentum)
-		finalPathLength = -finalPathLength;
-
-	// store the correct location for the hit on the RECO surface
-	LogDebug("Geant4e") << "Position on the RECO surface"
-	 << g4eTrajState.GetPosition() << std::endl;
-	finalRecoPos = g4eTrajState.GetPosition();
-
-	theG4eManager->EventTermination();
-
-	LogDebug("Geant4e") << "Final position of the Track :" << g4eTrajState.GetPosition()
-	 << std::endl;
-
-    //////////////////////////////
-    // Retrieve the state in the end from Geant4e, convert them to CMS vectors
-    // and points, and build global trajectory parameters.
-    // CMS uses cm and GeV while Geant4 uses mm and MeV
-    //
-	const HepGeom::Vector3D<double> momEnd = g4eTrajState.GetMomentum();
-
-    // use the hit on the the RECO plane as the final position to be d'accor with the
-    // RecHit measurements
-	const GlobalPoint posEndGV = TrackPropagation::hepPoint3DToGlobalPoint(
-			finalRecoPos);
-	GlobalVector momEndGV = TrackPropagation::hep3VectorToGlobalVector(momEnd)
-			/ GeV;
-
-	debugReportTrackState("final", posEndGV, finalRecoPos, momEndGV, momEnd,
-			pDest);
-
-    // Get the error covariance matrix from Geant4e. It comes in curvilinear
-    // coordinates so use the appropiate CMS class
-	G4ErrorTrajErr g4errorEnd = g4eTrajState.GetError();
-
-	CurvilinearTrajectoryError curvError(
-			TrackPropagation::g4ErrorTrajErrToAlgebraicSymMatrix55(g4errorEnd,
-					ftsStart.charge()));
-
-	if (mode == G4ErrorMode_PropBackwards)
-	{
-		GlobalTrajectoryParameters endParm(posEndGV, momEndGV,
-				ftsStart.parameters().charge(),
-				&ftsStart.parameters().magneticField());
-
-        // flip the momentum direction because it has been flipped before running G4's backwards prop
-		momEndGV = -momEndGV;
-	}
-
-	LogDebug("Geant4e") << "G4e -  Error matrix after propagation: "
-								<< std::endl << g4errorEnd;
-
-	LogDebug("Geant4e") << "CMS -  Error matrix after propagation: "
-								<< std::endl << curvError.matrix();
-
-	GlobalTrajectoryParameters tParsDest(posEndGV, momEndGV, ftsStart.charge(),
-			theField);
-
-	SurfaceSideDefinition::SurfaceSide side;
-
-	side = propagationDirection() == alongMomentum ?
-			SurfaceSideDefinition::afterSurface :
-			SurfaceSideDefinition::beforeSurface;
-
-	return TsosPP(TrajectoryStateOnSurface(tParsDest, curvError, pDest, side),
-			finalPathLength);
+    const float thisPathLength = TrackPropagation::g4doubleToCmsDouble(g4eTrajState.GetG4Track()->GetStepLength());
+
+    LogDebug("Geant4e") << "step Length was " << thisPathLength << " cm, current global position: "
+                        << TrackPropagation::hepPoint3DToGlobalPoint(g4eTrajState.GetPosition()) << std::endl;
+
+    finalPathLength += thisPathLength;
+
+    // if (std::fabs(finalPathLength) > 10000.0f)
+    if (std::fabs(finalPathLength) > 200.0f) {
+      LogDebug("Geant4e") << "ERROR: Quitting propagation: path length mega large" << std::endl;
+      theG4eManager->GetPropagator()->InvokePostUserTrackingAction(g4eTrajState.GetG4Track());
+      continuePropagation = false;
+      LogDebug("Geant4e") << "WARNING: Quitting propagation: max path length "
+                             "exceeded, returning invalid state"
+                          << std::endl;
+
+      // reached maximum path length, bail out
+      return TsosPP(TrajectoryStateOnSurface(), 0.0f);
+    }
+
+    if (theG4eManager->GetPropagator()->CheckIfLastStep(g4eTrajState.GetG4Track())) {
+      theG4eManager->GetPropagator()->InvokePostUserTrackingAction(g4eTrajState.GetG4Track());
+      continuePropagation = false;
+    }
+  }
+
+  // CMSSW Tracking convention, backward propagations have negative path length
+  if (propagationDirection() == oppositeToMomentum)
+    finalPathLength = -finalPathLength;
+
+  // store the correct location for the hit on the RECO surface
+  LogDebug("Geant4e") << "Position on the RECO surface" << g4eTrajState.GetPosition() << std::endl;
+  finalRecoPos = g4eTrajState.GetPosition();
+
+  theG4eManager->EventTermination();
+
+  LogDebug("Geant4e") << "Final position of the Track :" << g4eTrajState.GetPosition() << std::endl;
+
+  //////////////////////////////
+  // Retrieve the state in the end from Geant4e, convert them to CMS vectors
+  // and points, and build global trajectory parameters.
+  // CMS uses cm and GeV while Geant4 uses mm and MeV
+  //
+  const HepGeom::Vector3D<double> momEnd = g4eTrajState.GetMomentum();
+
+  // use the hit on the the RECO plane as the final position to be d'accor with
+  // the RecHit measurements
+  const GlobalPoint posEndGV = TrackPropagation::hepPoint3DToGlobalPoint(finalRecoPos);
+  GlobalVector momEndGV = TrackPropagation::hep3VectorToGlobalVector(momEnd) / GeV;
+
+  debugReportTrackState("final", posEndGV, finalRecoPos, momEndGV, momEnd, pDest);
+
+  // Get the error covariance matrix from Geant4e. It comes in curvilinear
+  // coordinates so use the appropiate CMS class
+  G4ErrorTrajErr g4errorEnd = g4eTrajState.GetError();
+
+  CurvilinearTrajectoryError curvError(
+      TrackPropagation::g4ErrorTrajErrToAlgebraicSymMatrix55(g4errorEnd, ftsStart.charge()));
+
+  if (mode == G4ErrorMode_PropBackwards) {
+    GlobalTrajectoryParameters endParm(
+        posEndGV, momEndGV, ftsStart.parameters().charge(), &ftsStart.parameters().magneticField());
+
+    // flip the momentum direction because it has been flipped before running
+    // G4's backwards prop
+    momEndGV = -momEndGV;
+  }
+
+  LogDebug("Geant4e") << "G4e -  Error matrix after propagation: " << std::endl << g4errorEnd;
+
+  LogDebug("Geant4e") << "CMS -  Error matrix after propagation: " << std::endl << curvError.matrix();
+
+  GlobalTrajectoryParameters tParsDest(posEndGV, momEndGV, ftsStart.charge(), theField);
+
+  SurfaceSideDefinition::SurfaceSide side;
+
+  side = propagationDirection() == alongMomentum ? SurfaceSideDefinition::afterSurface
+                                                 : SurfaceSideDefinition::beforeSurface;
+
+  return TsosPP(TrajectoryStateOnSurface(tParsDest, curvError, pDest, side), finalPathLength);
 }
 
 //
@@ -467,87 +403,69 @@ std::pair<TrajectoryStateOnSurface, double> Geant4ePropagator::propagateGeneric(
 //
 
 /** The methods propagateWithPath() are identical to the corresponding
- *  methods propagate() in what concerns the resulting 
+ *  methods propagate() in what concerns the resulting
  *  TrajectoryStateOnSurface, but they provide in addition the
  *  exact path length along the trajectory.
  */
 
-std::pair<TrajectoryStateOnSurface, double> Geant4ePropagator::propagateWithPath(
-		const FreeTrajectoryState& ftsStart, const Plane& pDest) const
-{
-    //Finally build the pair<...> that needs to be returned where the second
-    //parameter is the exact path length. Currently calculated with a stepping
-    //action that adds up the length of every step
-	return propagateGeneric(ftsStart, pDest);
-
+std::pair<TrajectoryStateOnSurface, double> Geant4ePropagator::propagateWithPath(const FreeTrajectoryState &ftsStart,
+                                                                                 const Plane &pDest) const {
+  // Finally build the pair<...> that needs to be returned where the second
+  // parameter is the exact path length. Currently calculated with a stepping
+  // action that adds up the length of every step
+  return propagateGeneric(ftsStart, pDest);
 }
 
-std::pair<TrajectoryStateOnSurface, double> Geant4ePropagator::propagateWithPath(
-		const FreeTrajectoryState& ftsStart, const Cylinder& cDest) const
-{
-    //Finally build the pair<...> that needs to be returned where the second
-    //parameter is the exact path length.
-	return propagateGeneric(ftsStart, cDest);
+std::pair<TrajectoryStateOnSurface, double> Geant4ePropagator::propagateWithPath(const FreeTrajectoryState &ftsStart,
+                                                                                 const Cylinder &cDest) const {
+  // Finally build the pair<...> that needs to be returned where the second
+  // parameter is the exact path length.
+  return propagateGeneric(ftsStart, cDest);
 }
 
 std::pair<TrajectoryStateOnSurface, double> Geant4ePropagator::propagateWithPath(
-		const TrajectoryStateOnSurface& tsosStart, const Plane& pDest) const
-{
-    //Finally build the pair<...> that needs to be returned where the second
-    //parameter is the exact path length.
-	const FreeTrajectoryState ftsStart = *tsosStart.freeState();
-	return propagateGeneric(ftsStart, pDest);
-
+    const TrajectoryStateOnSurface &tsosStart, const Plane &pDest) const {
+  // Finally build the pair<...> that needs to be returned where the second
+  // parameter is the exact path length.
+  const FreeTrajectoryState ftsStart = *tsosStart.freeState();
+  return propagateGeneric(ftsStart, pDest);
 }
 
 std::pair<TrajectoryStateOnSurface, double> Geant4ePropagator::propagateWithPath(
-		const TrajectoryStateOnSurface& tsosStart, const Cylinder& cDest) const
-{
-	const FreeTrajectoryState ftsStart = *tsosStart.freeState();
-    //Finally build the pair<...> that needs to be returned where the second
-    //parameter is the exact path length.
-	return propagateGeneric(ftsStart, cDest);
-
+    const TrajectoryStateOnSurface &tsosStart, const Cylinder &cDest) const {
+  const FreeTrajectoryState ftsStart = *tsosStart.freeState();
+  // Finally build the pair<...> that needs to be returned where the second
+  // parameter is the exact path length.
+  return propagateGeneric(ftsStart, cDest);
 }
 
-void Geant4ePropagator::debugReportPlaneSetup(GlobalPoint const& posPlane,
-		HepGeom::Point3D<double> const& surfPos,
-		GlobalVector const& normalPlane,
-		HepGeom::Normal3D<double> const& surfNorm, const Plane& pDest) const
-{
-	LogDebug("Geant4e") << "G4e -  Destination CMS plane position:" << posPlane
-								<< "cm\n"
-								<< "G4e -                  (Ro, eta, phi): ("
-								<< posPlane.perp() << " cm, " << posPlane.eta()
-								<< ", " << posPlane.phi().degrees() << " deg)\n"
-								<< "G4e -  Destination G4  plane position: "
-								<< surfPos << " mm, Ro = " << surfPos.perp()
-								<< " mm";
-	LogDebug("Geant4e") << "G4e -  Destination CMS plane normal  : "
-								<< normalPlane << "\n"
-								<< "G4e -  Destination G4  plane normal  : "
-								<< normalPlane;
-	LogDebug("Geant4e") << "G4e -  Distance from plane position to plane: "
-								<< pDest.localZ(posPlane) << " cm";
+void Geant4ePropagator::debugReportPlaneSetup(GlobalPoint const &posPlane,
+                                              HepGeom::Point3D<double> const &surfPos,
+                                              GlobalVector const &normalPlane,
+                                              HepGeom::Normal3D<double> const &surfNorm,
+                                              const Plane &pDest) const {
+  LogDebug("Geant4e") << "G4e -  Destination CMS plane position:" << posPlane << "cm\n"
+                      << "G4e -                  (Ro, eta, phi): (" << posPlane.perp() << " cm, " << posPlane.eta()
+                      << ", " << posPlane.phi().degrees() << " deg)\n"
+                      << "G4e -  Destination G4  plane position: " << surfPos << " mm, Ro = " << surfPos.perp()
+                      << " mm";
+  LogDebug("Geant4e") << "G4e -  Destination CMS plane normal  : " << normalPlane << "\n"
+                      << "G4e -  Destination G4  plane normal  : " << normalPlane;
+  LogDebug("Geant4e") << "G4e -  Distance from plane position to plane: " << pDest.localZ(posPlane) << " cm";
 }
 
-template<class SurfaceType>
-void Geant4ePropagator::debugReportTrackState(std::string const& currentContext,
-		GlobalPoint const& cmsInitPos, CLHEP::Hep3Vector const& g4InitPos,
-		GlobalVector const& cmsInitMom, CLHEP::Hep3Vector const& g4InitMom,
-		const SurfaceType& pDest) const
-{
-	LogDebug("Geant4e") << "G3 -- Current Context: " << currentContext;
-	LogDebug("Geant4e") << "G4e -  CMS point position:" << cmsInitPos << "cm\n"
-								<< "G4e -              (Ro, eta, phi): ("
-								<< cmsInitPos.perp() << " cm, "
-								<< cmsInitPos.eta() << ", "
-								<< cmsInitPos.phi().degrees() << " deg)\n"
-								<< "G4e -   G4  point position: " << g4InitPos
-								<< " mm, Ro = " << g4InitPos.perp() << " mm";
-	LogDebug("Geant4e") << "G4e -   CMS momentum      :" << cmsInitMom
-								<< "GeV\n" << " pt: " << cmsInitMom.perp() 
-                                                                << "G4e -  G4  momentum      : "
-								<< g4InitMom << " MeV";
+template <class SurfaceType>
+void Geant4ePropagator::debugReportTrackState(std::string const &currentContext,
+                                              GlobalPoint const &cmsInitPos,
+                                              CLHEP::Hep3Vector const &g4InitPos,
+                                              GlobalVector const &cmsInitMom,
+                                              CLHEP::Hep3Vector const &g4InitMom,
+                                              const SurfaceType &pDest) const {
+  LogDebug("Geant4e") << "G3 -- Current Context: " << currentContext;
+  LogDebug("Geant4e") << "G4e -  CMS point position:" << cmsInitPos << "cm\n"
+                      << "G4e -              (Ro, eta, phi): (" << cmsInitPos.perp() << " cm, " << cmsInitPos.eta()
+                      << ", " << cmsInitPos.phi().degrees() << " deg)\n"
+                      << "G4e -   G4  point position: " << g4InitPos << " mm, Ro = " << g4InitPos.perp() << " mm";
+  LogDebug("Geant4e") << "G4e -   CMS momentum      :" << cmsInitMom << "GeV\n"
+                      << " pt: " << cmsInitMom.perp() << "G4e -  G4  momentum      : " << g4InitMom << " MeV";
 }
-
diff --git a/TrackPropagation/Geant4e/test/Geant4ePropagatorAnalyzer.cc b/TrackPropagation/Geant4e/test/Geant4ePropagatorAnalyzer.cc
index 09f6c808da919..a4a27af07453a 100644
--- a/TrackPropagation/Geant4e/test/Geant4ePropagatorAnalyzer.cc
+++ b/TrackPropagation/Geant4e/test/Geant4ePropagatorAnalyzer.cc
@@ -1,27 +1,27 @@
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h" //For define_fwk_module
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"  //For define_fwk_module
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
 //- Timing
 //#include "Utilities/Timing/interface/TimingReport.h"
 
 //- Geometry
+#include "DataFormats/MuonDetId/interface/CSCDetId.h"
+#include "DataFormats/MuonDetId/interface/DTWireId.h"
+#include "DataFormats/MuonDetId/interface/RPCDetId.h"
 #include "DetectorDescription/Core/interface/DDCompactView.h"
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
-#include "SimG4Core/Geometry/interface/DDDWorld.h"
-#include "Geometry/DTGeometry/interface/DTGeometry.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
+#include "Geometry/DTGeometry/interface/DTGeometry.h"
 #include "Geometry/RPCGeometry/interface/RPCGeometry.h"
+#include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
-#include "DataFormats/MuonDetId/interface/DTWireId.h"
-#include "DataFormats/MuonDetId/interface/RPCDetId.h"
-#include "DataFormats/MuonDetId/interface/CSCDetId.h"
+#include "SimG4Core/Geometry/interface/DDDWorld.h"
 
 //- Magnetic field
 #include "MagneticField/Engine/interface/MagneticField.h"
@@ -30,17 +30,16 @@
 #include "SimG4Core/MagneticField/interface/FieldBuilder.h"
 
 //- Propagator
-#include "TrackPropagation/Geant4e/interface/Geant4ePropagator.h"
 #include "TrackPropagation/Geant4e/interface/ConvertFromToCLHEP.h"
+#include "TrackPropagation/Geant4e/interface/Geant4ePropagator.h"
 #include "TrackingTools/TrajectoryState/interface/FreeTrajectoryState.h"
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 
-
 //- SimHits, Tracks and Vertices
-#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
-#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include "SimDataFormats/Track/interface/SimTrack.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHit.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include "SimDataFormats/Vertex/interface/SimVertex.h"
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
@@ -54,211 +53,183 @@
 
 using namespace std;
 
-enum testMuChamberType {DT, RPC, CSC};
-
-class Geant4ePropagatorAnalyzer: public edm::EDAnalyzer {
+enum testMuChamberType { DT, RPC, CSC };
 
+class Geant4ePropagatorAnalyzer : public edm::EDAnalyzer {
 public:
-  explicit Geant4ePropagatorAnalyzer(const edm::ParameterSet&);
-  virtual ~Geant4ePropagatorAnalyzer() {}
+  explicit Geant4ePropagatorAnalyzer(const edm::ParameterSet &);
+  ~Geant4ePropagatorAnalyzer() override {}
 
-  virtual void analyze(const edm::Event&, const edm::EventSetup&);
-  virtual void endJob();
-  virtual void beginJob();
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
+  void beginJob() override;
   void iterateOverHits(edm::Handle<edm::PSimHitContainer> simHits,
-		       testMuChamberType muonChamberType,
-		       unsigned int trkIndex,
-		       const FreeTrajectoryState& ftsTrack);
-
+                       testMuChamberType muonChamberType,
+                       unsigned int trkIndex,
+                       const FreeTrajectoryState &ftsTrack);
 
 protected:
-
   int theRun;
   int theEvent;
 
-  Propagator* thePropagator;
-  //std::auto_ptr<sim::FieldBuilder> theFieldBuilder;
+  Propagator *thePropagator;
+  // std::auto_ptr<sim::FieldBuilder> theFieldBuilder;
 
-  //Geometry
-  edm::ESHandle<DTGeometry> theDTGeomESH; //DTs
-  edm::ESHandle<RPCGeometry> theRPCGeomESH; //RPC
-  edm::ESHandle<CSCGeometry> theCSCGeomESH; //CSC
+  // Geometry
+  edm::ESHandle<DTGeometry> theDTGeomESH;    // DTs
+  edm::ESHandle<RPCGeometry> theRPCGeomESH;  // RPC
+  edm::ESHandle<CSCGeometry> theCSCGeomESH;  // CSC
 
-  //Station that we want to study. -1 for all
+  // Station that we want to study. -1 for all
   int fStudyStation;
 
   // Single muons Beam direction (phi) and interval to plot simhits
   float fBeamCenter;
   float fBeamInterval;
 
-  // Histograms and ROOT stuff  
-  TFile* theRootFile;
+  // Histograms and ROOT stuff
+  TFile *theRootFile;
 
-  TH1F* fDistanceSHLayer;
+  TH1F *fDistanceSHLayer;
 
-  TH1F*  fDistance;
-  TH1F*  fDistanceSt[4];
+  TH1F *fDistance;
+  TH1F *fDistanceSt[4];
 
-  TH1F*  fHitR;
-  TH1F*  fHitRho;
-  TH1F*  fHitEta;
-  TH1F*  fHitPhi;
-  TH1F*  fHitPhi1L;
-  TH2F*  fHitRVsPhi;
+  TH1F *fHitR;
+  TH1F *fHitRho;
+  TH1F *fHitEta;
+  TH1F *fHitPhi;
+  TH1F *fHitPhi1L;
+  TH2F *fHitRVsPhi;
 
+  TH1F *fLayerR;
+  TH1F *fLayerRho;
+  TH1F *fLayerEta;
+  TH1F *fLayerPhi;
+  TH2F *fLayerRVsPhi;
 
-  TH1F*  fLayerR;
-  TH1F*  fLayerRho;
-  TH1F*  fLayerEta;
-  TH1F*  fLayerPhi;
-  TH2F*  fLayerRVsPhi;
+  TH1F *fExtrapR;
+  TH1F *fExtrapRho;
+  TH1F *fExtrapEta;
+  TH1F *fExtrapPhi;
+  TH2F *fExtrapRVsPhi;
 
-  TH1F*  fExtrapR;
-  TH1F*  fExtrapRho;
-  TH1F*  fExtrapEta;
-  TH1F*  fExtrapPhi;
-  TH2F*  fExtrapRVsPhi;
+  TH1F *fDeltaRo;
+  TH1F *fDeltaEta;
+  TH1F *fDeltaPhi;
 
-  TH1F*  fDeltaRo;
-  TH1F*  fDeltaEta;
-  TH1F*  fDeltaPhi;
+  // Studies on Phi distribution
+  TH1F *fStationPosPhi;
+  TH1F *fSectorPosPhi;
+  TH1F *fSLayerPosPhi;
+  TH1F *fLayerPosPhi;
 
-  //Studies on Phi distribution
-  TH1F* fStationPosPhi;
-  TH1F* fSectorPosPhi;
-  TH1F* fSLayerPosPhi;
-  TH1F* fLayerPosPhi;
-
-  TH1F* fStationNegPhi;
-  TH1F* fSectorNegPhi;
-  TH1F* fSLayerNegPhi;
-  TH1F* fLayerNegPhi;
+  TH1F *fStationNegPhi;
+  TH1F *fSectorNegPhi;
+  TH1F *fSLayerNegPhi;
+  TH1F *fLayerNegPhi;
 
   edm::InputTag G4VtxSrc_;
   edm::InputTag G4TrkSrc_;
 };
 
-
-Geant4ePropagatorAnalyzer::Geant4ePropagatorAnalyzer(const edm::ParameterSet& iConfig):
-  theRun(-1),
-  theEvent(-1),
-  thePropagator(0),
-  G4VtxSrc_(iConfig.getParameter<edm::InputTag>("G4VtxSrc")),
-  G4TrkSrc_(iConfig.getParameter<edm::InputTag>("G4TrkSrc")) {
-
-  //debug_ = iConfig.getParameter<bool>("debug");
+Geant4ePropagatorAnalyzer::Geant4ePropagatorAnalyzer(const edm::ParameterSet &iConfig)
+    : theRun(-1),
+      theEvent(-1),
+      thePropagator(nullptr),
+      G4VtxSrc_(iConfig.getParameter<edm::InputTag>("G4VtxSrc")),
+      G4TrkSrc_(iConfig.getParameter<edm::InputTag>("G4TrkSrc")) {
+  // debug_ = iConfig.getParameter<bool>("debug");
   fStudyStation = iConfig.getParameter<int>("StudyStation");
 
-  fBeamCenter   = iConfig.getParameter<double>("BeamCenter");
+  fBeamCenter = iConfig.getParameter<double>("BeamCenter");
   fBeamInterval = iConfig.getParameter<double>("BeamInterval");
 
-
   ///////////////////////////////////////////////////////////////////////////////////
   // Histograms
   //
 
   // Output ROOT file
-  theRootFile = 
-    new TFile(iConfig.getParameter<std::string>("RootFile").c_str(), "recreate");
+  theRootFile = new TFile(iConfig.getParameter<std::string>("RootFile").c_str(), "recreate");
 
-  // Distance between Sim Hit and associated Layer   
-  fDistanceSHLayer = new TH1F("fDistanceSHLayer", 
-			      "Distance(sim hit - layer)", 
-			      200, -1, 1);
+  // Distance between Sim Hit and associated Layer
+  fDistanceSHLayer = new TH1F("fDistanceSHLayer", "Distance(sim hit - layer)", 200, -1, 1);
 
   // Distance between simhit and extrapolation
-  fDistance = new TH1F("fDistance", 
-		       "Distance(sim hit - extrap)", 
-		       150, 0, 300);
+  fDistance = new TH1F("fDistance", "Distance(sim hit - extrap)", 150, 0, 300);
   // Distance between simhit and extrapolation
-  fDistanceSt[0] = new TH1F("fDistance_St1", 
-			    "Distance(sim hit - extrap) for station 1", 
-			    150, 0, 300);
-  fDistanceSt[1] = new TH1F("fDistance_St2", 
-			    "Distance(sim hit - extrap) for station 2", 
-			    150, 0, 300);
-  fDistanceSt[2] = new TH1F("fDistance_St3", 
-			    "Distance(sim hit - extrap) for station 3", 
-			    150, 0, 300);
-  fDistanceSt[3] = new TH1F("fDistance_St4", 
-			    "Distance(sim hit - extrap) for station 4", 
-			    150, 0, 300);
+  fDistanceSt[0] = new TH1F("fDistance_St1", "Distance(sim hit - extrap) for station 1", 150, 0, 300);
+  fDistanceSt[1] = new TH1F("fDistance_St2", "Distance(sim hit - extrap) for station 2", 150, 0, 300);
+  fDistanceSt[2] = new TH1F("fDistance_St3", "Distance(sim hit - extrap) for station 3", 150, 0, 300);
+  fDistanceSt[3] = new TH1F("fDistance_St4", "Distance(sim hit - extrap) for station 4", 150, 0, 300);
 
   // Simulated hits
-  fHitR     = new TH1F("fHitR",     "R^{sim hit}",       300, 400, 1000);
-  fHitRho   = new TH1F("fHitRho",   "#rho^{sim hit}",    300, 400, 1000);
-  fHitEta   = new TH1F("fHitEta",   "#eta^{sim hit}",    100, -0.1, 0.1);
-  fHitPhi   = new TH1F("fHitPhi",   "#varphi^{sim hit}", 
-		       160, fBeamCenter-fBeamInterval, fBeamCenter+fBeamInterval);
-  fHitPhi1L = new TH1F("fHitPhi1L", "#varphi^{sim hit} for 1st layer", 
-		       160, fBeamCenter-fBeamInterval, fBeamCenter+fBeamInterval);
-  
-  fHitRVsPhi = new TH2F("fHitRVsPhi", "R vs. #varphi for sim hits",
-			60, 400, 1000, 
-			80, fBeamCenter-fBeamInterval, fBeamCenter+fBeamInterval);
-  
+  fHitR = new TH1F("fHitR", "R^{sim hit}", 300, 400, 1000);
+  fHitRho = new TH1F("fHitRho", "#rho^{sim hit}", 300, 400, 1000);
+  fHitEta = new TH1F("fHitEta", "#eta^{sim hit}", 100, -0.1, 0.1);
+  fHitPhi = new TH1F("fHitPhi", "#varphi^{sim hit}", 160, fBeamCenter - fBeamInterval, fBeamCenter + fBeamInterval);
+  fHitPhi1L = new TH1F(
+      "fHitPhi1L", "#varphi^{sim hit} for 1st layer", 160, fBeamCenter - fBeamInterval, fBeamCenter + fBeamInterval);
+
+  fHitRVsPhi = new TH2F("fHitRVsPhi",
+                        "R vs. #varphi for sim hits",
+                        60,
+                        400,
+                        1000,
+                        80,
+                        fBeamCenter - fBeamInterval,
+                        fBeamCenter + fBeamInterval);
+
   // Position of layers
-  fLayerR    = new TH1F("fLayerR", "R^{layer}", 300, 400, 1000);
-  fLayerRho  = new TH1F("fLayerRho", "#rho^{layer}", 300, 400, 1000);
-  fLayerEta  = new TH1F("fLayerEta", "#eta^{layer}", 100, -0.1, 0.1);
-  fLayerPhi  = new TH1F("fLayerPhi", "#varphi^{layer}", 
-			160, fBeamCenter-fBeamInterval, fBeamCenter+fBeamInterval);
-  fLayerRVsPhi = new TH2F("fLayerRVsPhi", "R vs. #varphi for layers",
-			60, 400, 1000, 
-			80, fBeamCenter-fBeamInterval, fBeamCenter+fBeamInterval);
-  
+  fLayerR = new TH1F("fLayerR", "R^{layer}", 300, 400, 1000);
+  fLayerRho = new TH1F("fLayerRho", "#rho^{layer}", 300, 400, 1000);
+  fLayerEta = new TH1F("fLayerEta", "#eta^{layer}", 100, -0.1, 0.1);
+  fLayerPhi = new TH1F("fLayerPhi", "#varphi^{layer}", 160, fBeamCenter - fBeamInterval, fBeamCenter + fBeamInterval);
+  fLayerRVsPhi = new TH2F("fLayerRVsPhi",
+                          "R vs. #varphi for layers",
+                          60,
+                          400,
+                          1000,
+                          80,
+                          fBeamCenter - fBeamInterval,
+                          fBeamCenter + fBeamInterval);
+
   // Extrapolated hits
-  fExtrapR    = new TH1F("fExtrapR",   "R^{extrap. hit}", 300, 400, 1000);
-  fExtrapRho  = new TH1F("fExtrapRho", "#rho^{extrap. hit}", 300, 400, 1000);
-  fExtrapEta  = new TH1F("fExtrapEta", "#eta^{extrap. hit}", 100, -0.1, 0.1);
-  fExtrapPhi  = new TH1F("fExtrapPhi", "#varphi^{extrap. hit}", 
-			 160, fBeamCenter-fBeamInterval, fBeamCenter+fBeamInterval);
-  
-  fExtrapRVsPhi = new TH2F("fExtrapRVsPhi", "R vs. #varphi for extrap. hits",
-			   60, 400, 1000, 
-			   80, fBeamCenter-fBeamInterval, fBeamCenter+fBeamInterval);
+  fExtrapR = new TH1F("fExtrapR", "R^{extrap. hit}", 300, 400, 1000);
+  fExtrapRho = new TH1F("fExtrapRho", "#rho^{extrap. hit}", 300, 400, 1000);
+  fExtrapEta = new TH1F("fExtrapEta", "#eta^{extrap. hit}", 100, -0.1, 0.1);
+  fExtrapPhi =
+      new TH1F("fExtrapPhi", "#varphi^{extrap. hit}", 160, fBeamCenter - fBeamInterval, fBeamCenter + fBeamInterval);
+
+  fExtrapRVsPhi = new TH2F("fExtrapRVsPhi",
+                           "R vs. #varphi for extrap. hits",
+                           60,
+                           400,
+                           1000,
+                           80,
+                           fBeamCenter - fBeamInterval,
+                           fBeamCenter + fBeamInterval);
 
   // Distances
-  fDeltaRo  = new TH1F("fDeltaRo", "#Delta(#rho^{sim}, #rho^{extrap})",
-		       100, 0, 200);
-  fDeltaEta = new TH1F("fDeltaEta", "#Delta(#eta^{sim}, #eta^{extrap})", 
-		       100, -1, 1);
-  fDeltaPhi = new TH1F("fDeltaPhi", "#Delta(#varphi^{sim}, #varphi^{extrap})", 
-		       120, -30, 30);
+  fDeltaRo = new TH1F("fDeltaRo", "#Delta(#rho^{sim}, #rho^{extrap})", 100, 0, 200);
+  fDeltaEta = new TH1F("fDeltaEta", "#Delta(#eta^{sim}, #eta^{extrap})", 100, -1, 1);
+  fDeltaPhi = new TH1F("fDeltaPhi", "#Delta(#varphi^{sim}, #varphi^{extrap})", 120, -30, 30);
 
   // Studies on Phi
-  fStationPosPhi = new TH1F("fStationPosPhi", 
-			    "Station with positive #varphi", 
-			    6, -0.5, 5.5);
-  fSectorPosPhi  = new TH1F("fSectorPosPhi",  
-			    "Sector with positive #varphi", 
-			    6, -0.5, 5.5);
-  fSLayerPosPhi  = new TH1F("fSLayerPosPhi",  
-			    "Superlayer with positive #varphi", 
-			    6, -0.5, 5.5);
-  fLayerPosPhi   = new TH1F("fLayerPosPhi",   
-			    "Layer with positive #varphi", 
-			    6, -0.5, 5.5);
-  fStationNegPhi = new TH1F("fStationNegPhi", 
-			    "Station with negative #varphi", 
-			    6, -0.5, 5.5);
-  fSectorNegPhi  = new TH1F("fSectorNegPhi",  
-			    "Sector with negative #varphi", 
-			    6, -0.5, 5.5);
-  fSLayerNegPhi  = new TH1F("fSLayerNegPhi",  
-			    "Superlayer with negative #varphi", 
-			    6, -0.5, 5.5);
-  fLayerNegPhi   = new TH1F("fLayerNegPhi",   
-			    "Layer with negative #varphi", 
-			    6, -0.5, 5.5);
+  fStationPosPhi = new TH1F("fStationPosPhi", "Station with positive #varphi", 6, -0.5, 5.5);
+  fSectorPosPhi = new TH1F("fSectorPosPhi", "Sector with positive #varphi", 6, -0.5, 5.5);
+  fSLayerPosPhi = new TH1F("fSLayerPosPhi", "Superlayer with positive #varphi", 6, -0.5, 5.5);
+  fLayerPosPhi = new TH1F("fLayerPosPhi", "Layer with positive #varphi", 6, -0.5, 5.5);
+  fStationNegPhi = new TH1F("fStationNegPhi", "Station with negative #varphi", 6, -0.5, 5.5);
+  fSectorNegPhi = new TH1F("fSectorNegPhi", "Sector with negative #varphi", 6, -0.5, 5.5);
+  fSLayerNegPhi = new TH1F("fSLayerNegPhi", "Superlayer with negative #varphi", 6, -0.5, 5.5);
+  fLayerNegPhi = new TH1F("fLayerNegPhi", "Layer with negative #varphi", 6, -0.5, 5.5);
 
   //
   ///////////////////////////////////////////////////////////////////////////////////
 }
 
-void Geant4ePropagatorAnalyzer::beginJob() {
-  LogDebug("Geant4e") << "Nothing done in beginJob...";
-}
+void Geant4ePropagatorAnalyzer::beginJob() { LogDebug("Geant4e") << "Nothing done in beginJob..."; }
 
 void Geant4ePropagatorAnalyzer::endJob() {
   fDistanceSHLayer->Write();
@@ -289,7 +260,7 @@ void Geant4ePropagatorAnalyzer::endJob() {
   fDeltaEta->Write();
   fDeltaPhi->Write();
 
-  //Phi studies
+  // Phi studies
   fStationPosPhi->Write();
   fSectorPosPhi->Write();
   fSLayerPosPhi->Write();
@@ -299,33 +270,27 @@ void Geant4ePropagatorAnalyzer::endJob() {
   fSLayerNegPhi->Write();
   fLayerNegPhi->Write();
 
-
   theRootFile->Close();
-//  TimingReport::current()->dump(std::cout);
+  //  TimingReport::current()->dump(std::cout);
 }
 
-void Geant4ePropagatorAnalyzer::analyze(const edm::Event& iEvent, 
-					const edm::EventSetup& iSetup) {
-
+void Geant4ePropagatorAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace edm;
 
   LogDebug("Geant4e") << "Starting analyze...";
 
   ///////////////////////////////////////
-  //Construct Magnetic Field
+  // Construct Magnetic Field
   ESHandle<MagneticField> bField;
   iSetup.get<IdealMagneticFieldRecord>().get(bField);
   if (bField.isValid())
     LogDebug("Geant4e") << "G4e -- Magnetic field is valid. Value in (0,0,0): "
-			<< bField->inTesla(GlobalPoint(0,0,0)).mag() 
-			<< " Tesla";
+                        << bField->inTesla(GlobalPoint(0, 0, 0)).mag() << " Tesla";
   else
-     LogError("Geant4e") << "G4e -- NO valid Magnetic field";
- 
-  
+    LogError("Geant4e") << "G4e -- NO valid Magnetic field";
 
   ///////////////////////////////////////
-  //Build geometry
+  // Build geometry
 
   //- DT...
   iSetup.get<MuonGeometryRecord>().get(theDTGeomESH);
@@ -339,19 +304,16 @@ void Geant4ePropagatorAnalyzer::analyze(const edm::Event& iEvent,
   iSetup.get<MuonGeometryRecord>().get(theRPCGeomESH);
   LogDebug("Geant4e") << "Got RPCGeometry";
 
-
   ///////////////////////////////////////
-  //Run/Event information
+  // Run/Event information
   theRun = (int)iEvent.id().run();
   theEvent = (int)iEvent.id().event();
-  LogDebug("Geant4e") << "G4e -- Begin for run/event ==" << theRun 
-		      << "/" << theEvent 
-		      << " ---------------------------------";
-
+  LogDebug("Geant4e") << "G4e -- Begin for run/event ==" << theRun << "/" << theEvent
+                      << " ---------------------------------";
 
   ///////////////////////////////////////
-  //Initialise the propagator
-  if (! thePropagator) 
+  // Initialise the propagator
+  if (!thePropagator)
     thePropagator = new Geant4ePropagator(&*bField);
 
   if (thePropagator)
@@ -359,15 +321,11 @@ void Geant4ePropagatorAnalyzer::analyze(const edm::Event& iEvent,
   else
     LogError("Geant4e") << "Could not build propagator!";
 
-
-
-
-
   ///////////////////////////////////////
-  //Get the sim tracks & vertices 
+  // Get the sim tracks & vertices
   Handle<SimTrackContainer> simTracks;
   iEvent.getByLabel<SimTrackContainer>(G4TrkSrc_, simTracks);
-  if (! simTracks.isValid() ){
+  if (!simTracks.isValid()) {
     LogWarning("Geant4e") << "No tracks found" << std::endl;
     return;
   }
@@ -375,18 +333,17 @@ void Geant4ePropagatorAnalyzer::analyze(const edm::Event& iEvent,
 
   Handle<SimVertexContainer> simVertices;
   iEvent.getByLabel<SimVertexContainer>(G4VtxSrc_, simVertices);
-  if (! simVertices.isValid() ){
+  if (!simVertices.isValid()) {
     LogWarning("Geant4e") << "No tracks found" << std::endl;
     return;
   }
   LogDebug("Geant4e") << "Got simVertices of size " << simVertices->size();
 
-
   ///////////////////////////////////////
-  //Get the sim hits for the different muon parts
+  // Get the sim hits for the different muon parts
   Handle<PSimHitContainer> simHitsDT;
   iEvent.getByLabel("g4SimHits", "MuonDTHits", simHitsDT);
-  if (! simHitsDT.isValid() ){
+  if (!simHitsDT.isValid()) {
     LogWarning("Geant4e") << "No hits found" << std::endl;
     return;
   }
@@ -394,111 +351,90 @@ void Geant4ePropagatorAnalyzer::analyze(const edm::Event& iEvent,
 
   Handle<PSimHitContainer> simHitsCSC;
   iEvent.getByLabel("g4SimHits", "MuonCSCHits", simHitsCSC);
-  if (! simHitsCSC.isValid() ){
+  if (!simHitsCSC.isValid()) {
     LogWarning("Geant4e") << "No hits found" << std::endl;
     return;
   }
   LogDebug("Geant4e") << "Got MuonCSCHits of size " << simHitsCSC->size();
 
-
   Handle<PSimHitContainer> simHitsRPC;
   iEvent.getByLabel("g4SimHits", "MuonRPCHits", simHitsRPC);
-  if (! simHitsRPC.isValid() ){
+  if (!simHitsRPC.isValid()) {
     LogWarning("Geant4e") << "No hits found" << std::endl;
     return;
   }
   LogDebug("Geant4e") << "Got MuonRPCHits of size " << simHitsRPC->size();
 
-
-
   ///////////////////////////////////////
   // Iterate over sim tracks to build the FreeTrajectoryState for
   // for the initial position.
-  //DEBUG
+  // DEBUG
   unsigned int counter = 0;
-  //DEBUG
-  for(SimTrackContainer::const_iterator simTracksIt = simTracks->begin(); 
-      simTracksIt != simTracks->end(); 
-      simTracksIt++){
-
-    //DEBUG
+  // DEBUG
+  for (SimTrackContainer::const_iterator simTracksIt = simTracks->begin(); simTracksIt != simTracks->end();
+       simTracksIt++) {
+    // DEBUG
     counter++;
-    LogDebug("Geant4e") << "G4e -- Iterating over " << counter 
-			<< "rd track. Number: " 
-			<< simTracksIt->genpartIndex() 
-			<< "------------------";
-    //DEBUG
+    LogDebug("Geant4e") << "G4e -- Iterating over " << counter << "rd track. Number: " << simTracksIt->genpartIndex()
+                        << "------------------";
+    // DEBUG
 
     int simTrackPDG = simTracksIt->type();
-    if (abs(simTrackPDG) != 13 ) {
+    if (abs(simTrackPDG) != 13) {
       continue;
     }
     LogDebug("Geant4e") << "G4e -- Track PDG " << simTrackPDG;
 
     //- Timing
-//    TimeMe tProp("Geant4ePropagatorAnalyzer::analyze::propagate");
-   
+    //    TimeMe tProp("Geant4ePropagatorAnalyzer::analyze::propagate");
+
     //- Check if the track corresponds to a muon
     int trkPDG = simTracksIt->type();
-    if (abs(trkPDG) != 13 ) {
+    if (abs(trkPDG) != 13) {
       LogDebug("Geant4e") << "Track is not a muon: " << trkPDG;
       continue;
-    }
-    else
+    } else
       LogDebug("Geant4e") << "Found a muon track " << trkPDG;
-      
-    
+
     //- Get momentum, but only use tracks with P > 2 GeV
-    GlobalVector p3T = 
-      TrackPropagation::hep3VectorToGlobalVector(CLHEP::Hep3Vector(simTracksIt->momentum().x(),
-                                                            simTracksIt->momentum().y(),
-                                                            simTracksIt->momentum().z()));
+    GlobalVector p3T = TrackPropagation::hep3VectorToGlobalVector(
+        CLHEP::Hep3Vector(simTracksIt->momentum().x(), simTracksIt->momentum().y(), simTracksIt->momentum().z()));
     if (p3T.perp() < 2.) {
       LogDebug("Geant4e") << "Track PT is too low: " << p3T.perp();
       continue;
-    }
-    else {
-      LogDebug("Geant4e") << "*** Phi (rad): " << p3T.phi() << " - Phi(deg)" 
-			  << p3T.phi().degrees();
+    } else {
+      LogDebug("Geant4e") << "*** Phi (rad): " << p3T.phi() << " - Phi(deg)" << p3T.phi().degrees();
       LogDebug("Geant4e") << "Track PT is enough.";
-      LogDebug("Geant4e") << "Track P.: " << p3T
-			  << "\nTrack P.: PT=" << p3T.perp()
-			  << "\tEta=" << p3T.eta()
-			  << "\tPhi=" << p3T.phi().degrees()
-			  << "--> Rad: Phi=" << p3T.phi();
-
+      LogDebug("Geant4e") << "Track P.: " << p3T << "\nTrack P.: PT=" << p3T.perp() << "\tEta=" << p3T.eta()
+                          << "\tPhi=" << p3T.phi().degrees() << "--> Rad: Phi=" << p3T.phi();
     }
-      
 
     //- Vertex fixes the starting point
     int vtxInd = simTracksIt->vertIndex();
-    GlobalPoint r3T(0.,0.,0.);
+    GlobalPoint r3T(0., 0., 0.);
     if (vtxInd < 0)
       LogDebug("Geant4e") << "Track with no vertex, defaulting to (0,0,0)";
     else
-      //seems to be stored in mm --> convert to cm
+      // seems to be stored in mm --> convert to cm
       r3T = TrackPropagation::hep3VectorToGlobalPoint(CLHEP::Hep3Vector((*simVertices)[vtxInd].position().x(),
-                                                                 (*simVertices)[vtxInd].position().y(),
-                                                                 (*simVertices)[vtxInd].position().z()));
-
-    LogDebug("Geant4e") << "Init point: " << r3T
-			<< "\nInit point Ro=" << r3T.perp()
-			<< "\tEta=" << r3T.eta()
-			<< "\tPhi=" << r3T.phi().degrees() ;
-    
+                                                                        (*simVertices)[vtxInd].position().y(),
+                                                                        (*simVertices)[vtxInd].position().z()));
+
+    LogDebug("Geant4e") << "Init point: " << r3T << "\nInit point Ro=" << r3T.perp() << "\tEta=" << r3T.eta()
+                        << "\tPhi=" << r3T.phi().degrees();
+
     //- Charge
     int charge = trkPDG > 0 ? -1 : 1;
     LogDebug("Geant4e") << "Track charge = " << charge;
 
     //- Initial covariance matrix is unity 10-6
     CurvilinearTrajectoryError covT;
-    //covT *= 1E-6;
+    // covT *= 1E-6;
 
     //- Build FreeTrajectoryState
     GlobalTrajectoryParameters trackPars(r3T, p3T, charge, &*bField);
     FreeTrajectoryState ftsTrack(trackPars, covT);
 
-
     //- Get index of generated particle. Used further down
     unsigned int trkInd = simTracksIt->genpartIndex();
 
@@ -507,23 +443,18 @@ void Geant4ePropagatorAnalyzer::analyze(const edm::Event& iEvent,
     iterateOverHits(simHitsDT, DT, trkInd, ftsTrack);
     ////////////////////////////////////////////////
     //- Iterate over Sim Hits in RPC and check propagation
-    //iterateOverHits(simHitsRPC, RPC, trkInd, ftsTrack);
+    // iterateOverHits(simHitsRPC, RPC, trkInd, ftsTrack);
     ////////////////////////////////////////////////
     //- Iterate over Sim Hits in CSC and check propagation
-    //iterateOverHits(simHitsCSC, CSC, trkInd, ftsTrack);
+    // iterateOverHits(simHitsCSC, CSC, trkInd, ftsTrack);
 
-
-
-  } // <-- for over sim tracks
+  }  // <-- for over sim tracks
 }
 
-
-void
-Geant4ePropagatorAnalyzer::iterateOverHits(edm::Handle<edm::PSimHitContainer> simHits, 
-					   testMuChamberType muonChamberType,
-					   unsigned int trkIndex,
-					   const FreeTrajectoryState& ftsTrack) {
-
+void Geant4ePropagatorAnalyzer::iterateOverHits(edm::Handle<edm::PSimHitContainer> simHits,
+                                                testMuChamberType muonChamberType,
+                                                unsigned int trkIndex,
+                                                const FreeTrajectoryState &ftsTrack) {
   using namespace edm;
 
   if (muonChamberType == DT)
@@ -532,21 +463,17 @@ Geant4ePropagatorAnalyzer::iterateOverHits(edm::Handle<edm::PSimHitContainer> si
     LogDebug("Geant4e") << "G4e -- Iterating over RPC hits...";
   else if (muonChamberType == CSC)
     LogDebug("Geant4e") << "G4e -- Iterating over CSC hits...";
-  
-  for (PSimHitContainer::const_iterator simHitIt = simHits->begin(); 
-       simHitIt != simHits->end(); 
-       simHitIt++){
 
+  for (PSimHitContainer::const_iterator simHitIt = simHits->begin(); simHitIt != simHits->end(); simHitIt++) {
     ///////////////
     // Skip if this hit does not belong to the track
-    if (simHitIt->trackId() != trkIndex ) {
-      LogDebug("Geant4e") << "Hit (in tr " << simHitIt->trackId()
-			  << ") does not belong to track "<< trkIndex;
+    if (simHitIt->trackId() != trkIndex) {
+      LogDebug("Geant4e") << "Hit (in tr " << simHitIt->trackId() << ") does not belong to track " << trkIndex;
       continue;
     }
-    
+
     LogDebug("Geant4e") << "G4e -- Hit belongs to track " << trkIndex;
-    
+
     //////////////
     // Skip if it is not a muon (this is checked before also)
     int trkPDG = simHitIt->particleType();
@@ -555,135 +482,115 @@ Geant4ePropagatorAnalyzer::iterateOverHits(edm::Handle<edm::PSimHitContainer> si
       continue;
     }
     LogDebug("Geant4e") << "G4e -- Found a hit corresponding to a muon " << trkPDG;
-    
+
     //////////////////////////////////////////////////////////
     // Build the surface. This is different for DT, RPC, CSC
-    //const GeomDetUnit* layer = 0;
-    const GeomDet* layer = 0;
+    // const GeomDetUnit* layer = 0;
+    const GeomDet *layer = nullptr;
     // * DT
-    DTWireId* wIdDT = 0; //For DT holds the information about the chamber
+    DTWireId *wIdDT = nullptr;  // For DT holds the information about the chamber
     if (muonChamberType == DT) {
       wIdDT = new DTWireId(simHitIt->detUnitId());
-      int station =  wIdDT->station();
-      LogDebug("Geant4e") << "G4e -- DT Chamber. Station: " << station
-			  << ". DetId: " << wIdDT->layerId();
+      int station = wIdDT->station();
+      LogDebug("Geant4e") << "G4e -- DT Chamber. Station: " << station << ". DetId: " << wIdDT->layerId();
 
-      
-      if (fStudyStation != -1 && fStudyStation != station) 
-	continue;
+      if (fStudyStation != -1 && fStudyStation != station)
+        continue;
 
       layer = theDTGeomESH->layer(*wIdDT);
-      if (layer == 0){
-	LogDebug("Geant4e") << "Failed to get detector unit";
-	continue;
+      if (layer == nullptr) {
+        LogDebug("Geant4e") << "Failed to get detector unit";
+        continue;
       }
     }
     // * RPC
     else if (muonChamberType == RPC) {
       RPCDetId rpcId(simHitIt->detUnitId());
       layer = theRPCGeomESH->idToDet(rpcId);
-      if (layer == 0){
-	LogDebug("Geant4e") << "Failed to get detector unit";
-	continue;
+      if (layer == nullptr) {
+        LogDebug("Geant4e") << "Failed to get detector unit";
+        continue;
       }
     }
 
     // * CSC
-    else if (muonChamberType ==CSC) {
+    else if (muonChamberType == CSC) {
       CSCDetId cscId(simHitIt->detUnitId());
       layer = theCSCGeomESH->idToDet(cscId);
-      if (layer == 0){
-	LogDebug("Geant4e") << "Failed to get detector unit";
-	continue;
+      if (layer == nullptr) {
+        LogDebug("Geant4e") << "Failed to get detector unit";
+        continue;
       }
-
     }
 
-    const Surface& surf = layer->surface();
-    if (layer->geographicalId()!=DTLayerId(simHitIt->detUnitId()))
+    const Surface &surf = layer->surface();
+    if (layer->geographicalId() != DTLayerId(simHitIt->detUnitId()))
       LogError("Geant4e") << "ERROR: wrong DetId";
 
-    
     //==>DEBUG
-    //const BoundPlane& bp = layer->surface();
-    //const Bounds& bounds = bp.bounds();
-    //LogDebug("Geant4e") << "Surface: length = " << bounds.length() 
-    //		  << ", thickness = " << bounds.thickness() 
+    // const BoundPlane& bp = layer->surface();
+    // const Bounds& bounds = bp.bounds();
+    // LogDebug("Geant4e") << "Surface: length = " << bounds.length()
+    //		  << ", thickness = " << bounds.thickness()
     //		<< ", width = " << bounds.width();
     //<==DEBUG
-    
+
     ////////////
     // Discard hits with very low momentum ???
     GlobalVector p3Hit = surf.toGlobal(simHitIt->momentumAtEntry());
-    if (p3Hit.perp() < 0.5 ) 
+    if (p3Hit.perp() < 0.5)
       continue;
     GlobalPoint posHit = surf.toGlobal(simHitIt->localPosition());
-    Point3DBase< float, GlobalTag > surfpos = surf.position();
+    Point3DBase<float, GlobalTag> surfpos = surf.position();
     LogDebug("Geant4e") << "G4e -- Layer position: " << surfpos << " cm"
-			<< "\nG4e --                   Ro=" << surfpos.perp()
-			<< "\tEta=" << surfpos.eta()
-			<< "\tPhi=" << surfpos.phi().degrees() <<"deg";
+                        << "\nG4e --                   Ro=" << surfpos.perp() << "\tEta=" << surfpos.eta()
+                        << "\tPhi=" << surfpos.phi().degrees() << "deg";
     LogDebug("Geant4e") << "G4e -- Sim Hit position: " << posHit << " cm"
-			<< "\nG4e --                   Ro=" << posHit.perp()
-			<< "\tEta=" << posHit.eta()
-			<< "\tPhi=" << posHit.phi().degrees() << "deg"
-			<< "\t localpos=" << simHitIt->localPosition();
+                        << "\nG4e --                   Ro=" << posHit.perp() << "\tEta=" << posHit.eta()
+                        << "\tPhi=" << posHit.phi().degrees() << "deg"
+                        << "\t localpos=" << simHitIt->localPosition();
 
-
-    const Plane* bp = dynamic_cast<const Plane*>(&surf);
-    if (bp != 0) {
+    const Plane *bp = dynamic_cast<const Plane *>(&surf);
+    if (bp != nullptr) {
       Float_t distance = bp->localZ(posHit);
-      LogDebug("Geant4e") << "\nG4e -- Distance from plane to sim hit: " 
-			  << distance << "cm";
+      LogDebug("Geant4e") << "\nG4e -- Distance from plane to sim hit: " << distance << "cm";
       fDistanceSHLayer->Fill(distance);
-    }
-    else {
+    } else {
       LogWarning("Geant4e") << "G4e -- Layer is not a Plane!!!";
       fDistanceSHLayer->Fill(-1);
     }
 
+    LogDebug("Geant4e") << "Sim Hit Momentum PT=" << p3Hit.perp() << "\tEta=" << p3Hit.eta()
+                        << "\tPhi=" << p3Hit.phi().degrees() << "deg";
 
-    LogDebug("Geant4e") << "Sim Hit Momentum PT=" << p3Hit.perp()
-			<< "\tEta=" << p3Hit.eta()
-			<< "\tPhi=" << p3Hit.phi().degrees() << "deg";
-    
-   
     /////////////////////////////////////////
     // Propagate: Need to explicetely
-    TrajectoryStateOnSurface tSOSDest = 
-      thePropagator->propagate(ftsTrack, surf);
-    
+    TrajectoryStateOnSurface tSOSDest = thePropagator->propagate(ftsTrack, surf);
+
     /////////////////////
     // Get hit position and extrapolation position to compare
     GlobalPoint posExtrap = tSOSDest.freeState()->position();
-    //     GlobalPoint posExtrap(posExtrap_prov.theta(), 
+    //     GlobalPoint posExtrap(posExtrap_prov.theta(),
     // 			  posExtrap_prov.phi()*12,
     // 			  posExtrap_prov.mag());
-    
+
     GlobalVector posDistance = posExtrap - posHit;
     float distance = posDistance.mag();
     float simhitphi = posHit.phi().degrees();
-    float layerphi  = surfpos.phi().degrees();
+    float layerphi = surfpos.phi().degrees();
     float extrapphi = posExtrap.phi().degrees();
-    LogDebug("Geant4e") << "G4e -- Difference between hit and final position: " 
-			<< distance << " cm\n"
-			<< "G4e -- Transversal difference between hit and final position: "
-			<< posDistance.perp() << " cm.";
-    LogDebug("Geant4e") << "G4e -- Extrapolated position:" << posExtrap 
-			<< " cm\n"
-			<< "G4e --       (Rho, eta, phi): (" << posExtrap.perp()
-			<< " cm, " << posExtrap.eta() << ", " << extrapphi
-			<< " deg)";
-    LogDebug("Geant4e") << "G4e --          Hit position: " << posHit 
-			<< " cm\n"
-                        << "G4e --       (Rho, eta, phi): (" << posHit.perp()
-                        << " cm, " << posHit.eta() << ", " << simhitphi
-                        << " deg)";
- 
-    
+    LogDebug("Geant4e") << "G4e -- Difference between hit and final position: " << distance << " cm\n"
+                        << "G4e -- Transversal difference between hit and final position: " << posDistance.perp()
+                        << " cm.";
+    LogDebug("Geant4e") << "G4e -- Extrapolated position:" << posExtrap << " cm\n"
+                        << "G4e --       (Rho, eta, phi): (" << posExtrap.perp() << " cm, " << posExtrap.eta() << ", "
+                        << extrapphi << " deg)";
+    LogDebug("Geant4e") << "G4e --          Hit position: " << posHit << " cm\n"
+                        << "G4e --       (Rho, eta, phi): (" << posHit.perp() << " cm, " << posHit.eta() << ", "
+                        << simhitphi << " deg)";
+
     fDistance->Fill(distance);
-    fDistanceSt[wIdDT->station()-1]->Fill(distance);
-      
+    fDistanceSt[wIdDT->station() - 1]->Fill(distance);
 
     fHitR->Fill(posHit.mag());
     fHitRho->Fill(posHit.perp());
@@ -709,28 +616,24 @@ Geant4ePropagatorAnalyzer::iterateOverHits(edm::Handle<edm::PSimHitContainer> si
     fDeltaEta->Fill(posExtrap.eta() - posHit.eta());
     fDeltaPhi->Fill(extrapphi - simhitphi);
 
-
     if (wIdDT) {
       if (simhitphi > 0) {
-	fStationPosPhi->Fill(wIdDT->station());
-	fSectorPosPhi->Fill(wIdDT->sector());
-	fSLayerPosPhi->Fill(wIdDT->superlayer());
-	fLayerPosPhi->Fill(wIdDT->layer());
-      }
-      else {
-	fStationNegPhi->Fill(wIdDT->station());
-	fSectorNegPhi->Fill(wIdDT->sector());
-	fSLayerNegPhi->Fill(wIdDT->superlayer());
-	fLayerNegPhi->Fill(wIdDT->layer());
+        fStationPosPhi->Fill(wIdDT->station());
+        fSectorPosPhi->Fill(wIdDT->sector());
+        fSLayerPosPhi->Fill(wIdDT->superlayer());
+        fLayerPosPhi->Fill(wIdDT->layer());
+      } else {
+        fStationNegPhi->Fill(wIdDT->station());
+        fSectorNegPhi->Fill(wIdDT->sector());
+        fSLayerNegPhi->Fill(wIdDT->superlayer());
+        fLayerNegPhi->Fill(wIdDT->layer());
       }
-      //Some cleaning...
+      // Some cleaning...
       delete wIdDT;
     }
 
-
-  } //<== For over simhits
-
+  }  //<== For over simhits
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(Geant4ePropagatorAnalyzer);
diff --git a/TrackingTools/GsfTools/interface/KeepingNonZeroWeightsMerger.h b/TrackingTools/GsfTools/interface/KeepingNonZeroWeightsMerger.h
deleted file mode 100644
index aff43e0427262..0000000000000
--- a/TrackingTools/GsfTools/interface/KeepingNonZeroWeightsMerger.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef KeepingNonZeroWeightsMerger_H
-#define KeepingNonZeroWeightsMerger_H
-
-#include "TrackingTools/GsfTools/interface/MultiGaussianStateMerger.h"
-
-/** Merging of a Gaussian mixture by keeping
- *  the components with weights larger than a cut value.
- */
-
-class  KeepingNonZeroWeightsMerger : public MultiGaussianStateMerger {
-
- public:
-
-  KeepingNonZeroWeightsMerger() : cut(1.e-7) {}
-  
-  KeepingNonZeroWeightsMerger(const double& value) : cut(value) {}
-
-  virtual KeepingNonZeroWeightsMerger* clone() const
-  {  
-    return new KeepingNonZeroWeightsMerger(*this);
-  }
-  
-  /** Method which does the actual merging. Returns a trimmed MultiGaussianState
-   */
-
-  virtual RCMultiGaussianState merge(const RCMultiGaussianState& mgs) const;
-
- private:
-  
-  double cut;
-
-};  
-
-#endif // KeepingNonZeroWeightsMerger_H
diff --git a/TrackingTools/GsfTools/interface/LargestWeightsStateMerger.h b/TrackingTools/GsfTools/interface/LargestWeightsStateMerger.h
deleted file mode 100644
index f108dcf4cb78e..0000000000000
--- a/TrackingTools/GsfTools/interface/LargestWeightsStateMerger.h
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef LargestWeightsStateMerger_H
-#define LargestWeightsStateMerger_H
-
-#include "TrackingTools/GsfTools/interface/MultiGaussianStateMerger.h"
-
-/** Merging of a Gaussian mixture by keeping
- *  the number Nmax components with the largest weights.
- */
-
-class LargestWeightsStateMerger : public MultiGaussianStateMerger {
-
- public:
-
-  LargestWeightsStateMerger(int n) : Nmax(n), theSmallestWeightsMerging(true) {
-//     initConfigurables();
-  }
-
-  virtual LargestWeightsStateMerger* clone() const
-  {  
-    return new LargestWeightsStateMerger(*this);
-  }
-  
-  /** Method which does the actual merging. Returns a trimmed MultiGaussianState.
-   */
-
-  virtual RCMultiGaussianState merge(const RCMultiGaussianState& mgs) const;
-  
- private:
-
-//   void initConfigurables();
-  
-  int Nmax;
-  bool theSmallestWeightsMerging;
-
-};  
-
-#endif
diff --git a/TrackingTools/GsfTools/interface/MahalanobisDistance.h b/TrackingTools/GsfTools/interface/MahalanobisDistance.h
deleted file mode 100644
index fce313b993b06..0000000000000
--- a/TrackingTools/GsfTools/interface/MahalanobisDistance.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef MahalanobisDistance_H
-#define MahalanobisDistance_H
-
-#include "TrackingTools/GsfTools/interface/DistanceBetweenComponents.h"
-
-class TrajectoryStateOnSurface;
-
-/** Calculation of Mahalanobis distance between two Gaussian components.
- */
-
-class MahalanobisDistance : public DistanceBetweenComponents {
-
- public:
-
-  /** Method which calculates the actual Mahalanobis distance.
-   */
-
-  virtual double operator() (const RCSingleGaussianState&, 
-			     const RCSingleGaussianState&) const;
-
-  virtual MahalanobisDistance* clone() const
-  {  
-    return new MahalanobisDistance(*this);
-  }
-  
-};  
-
-#endif // MahalanobisDistance_H
diff --git a/TrackingTools/GsfTools/interface/RCMultiGaussianState.h b/TrackingTools/GsfTools/interface/RCMultiGaussianState.h
deleted file mode 100644
index 89c1fd39fdec2..0000000000000
--- a/TrackingTools/GsfTools/interface/RCMultiGaussianState.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef RefCountedMultiGaussianState_H
-#define RefCountedMultiGaussianState_H
-
-#include "DataFormats/GeometrySurface/interface/ReferenceCounted.h"
-#include "TrackingTools/GsfTools/interface/MultiGaussianState.h"
-
-typedef ReferenceCountingPointer<MultiGaussianState> RCMultiGaussianState;
-
-#endif
diff --git a/TrackingTools/MeasurementDet/interface/GeometricSearchDetMeasurements.h b/TrackingTools/MeasurementDet/interface/GeometricSearchDetMeasurements.h
deleted file mode 100644
index 5c68b1c52619c..0000000000000
--- a/TrackingTools/MeasurementDet/interface/GeometricSearchDetMeasurements.h
+++ /dev/null
@@ -1 +0,0 @@
-#error "removed"
diff --git a/TrackingTools/TrajectoryFiltering/interface/BaseCkfTrajectoryFilter.h b/TrackingTools/TrajectoryFiltering/interface/BaseCkfTrajectoryFilter.h
deleted file mode 100644
index 50aed6f82f867..0000000000000
--- a/TrackingTools/TrajectoryFiltering/interface/BaseCkfTrajectoryFilter.h
+++ /dev/null
@@ -1 +0,0 @@
-#error class removed
diff --git a/Utilities/General/test/BuildFile.xml b/Utilities/General/test/BuildFile.xml
index 1a0005cdf5637..7d6096e4ea265 100644
--- a/Utilities/General/test/BuildFile.xml
+++ b/Utilities/General/test/BuildFile.xml
@@ -12,5 +12,5 @@
 <iftool name="cuda-gcc-support">
     <test name="CudaGCCSupport" command="echo Supported GCC version"/>
 <else/>
-    <test name="CudaGCCSupport" command="echo ERROR: Unsupported GCC version && exit 1"/>
+    <test name="CudaGCCSupport" command="echo ERROR: Unsupported GCC version; exit 1"/>
 </iftool>
diff --git a/Utilities/PPS/interface/PPSUtilities.h b/Utilities/PPS/interface/PPSUtilities.h
index fdf94aec32c3c..6983815f553a7 100644
--- a/Utilities/PPS/interface/PPSUtilities.h
+++ b/Utilities/PPS/interface/PPSUtilities.h
@@ -16,10 +16,18 @@ namespace HepMC
 
 namespace PPSTools {
 
-double fCrossingAngleBeam1;
-double fCrossingAngleBeam2;
-double fBeamMomentum;
-double fBeamEnergy;
+  struct FullBeamInfo {
+    double fCrossingAngleBeam1;
+    double fCrossingAngleBeam2;
+    double fBeamMomentum;
+    double fBeamEnergy;
+  };
+
+  struct LimitedBeamInfo {
+    double fBeamMomentum;
+    double fBeamEnergy;
+  };
+
 const double   urad     = 1./1000000.; 
 const double ProtonMass=CLHEP::proton_mass_c2/GeV;
 const double ProtonMassSQ=pow(ProtonMass,2);
@@ -28,13 +36,13 @@ TLorentzVector HectorParticle2LorentzVector(H_BeamParticle hp,int );
 
 H_BeamParticle LorentzVector2HectorParticle(TLorentzVector p);
 
-void LorentzBoost(H_BeamParticle& h_p,int dir, const std::string& frame);
+void LorentzBoost(H_BeamParticle& h_p,int dir, const std::string& frame, FullBeamInfo const& bi);
 
-void LorentzBoost(TLorentzVector& p_out, const std::string& frame);
+void LorentzBoost(TLorentzVector& p_out, const std::string& frame, FullBeamInfo const& bi);
 
-void LorentzBoost(HepMC::GenParticle& p_out, const std::string& frame);
+void LorentzBoost(HepMC::GenParticle& p_out, const std::string& frame, FullBeamInfo const& bi);
 
-void Get_t_and_xi(const TLorentzVector* proton,double& t,double& xi) ;
+void Get_t_and_xi(const TLorentzVector* proton,double& t,double& xi, LimitedBeamInfo const& bi) ;
 
 };
 #endif
diff --git a/Utilities/PPS/src/PPSUtilities.cc b/Utilities/PPS/src/PPSUtilities.cc
index 7c75b8143fb07..8047a8fea5339 100644
--- a/Utilities/PPS/src/PPSUtilities.cc
+++ b/Utilities/PPS/src/PPSUtilities.cc
@@ -20,22 +20,22 @@ H_BeamParticle PPSTools::LorentzVector2HectorParticle(TLorentzVector p)
      h_p.set4Momentum(p.Px(),p.Py(),abs(p.Pz()),p.E());
      return h_p;
 }
-void PPSTools::LorentzBoost(HepMC::GenParticle& p, const string& frame)
+void PPSTools::LorentzBoost(HepMC::GenParticle& p, const string& frame, FullBeamInfo const& bi)
 {
      TLorentzVector p_out;
      p_out.SetPx(p.momentum().px());
      p_out.SetPy(p.momentum().py());
      p_out.SetPz(p.momentum().pz());
-     LorentzBoost(p_out,frame);
+     LorentzBoost(p_out,frame, bi);
      p.set_momentum(HepMC::FourVector(p_out.Px(),p_out.Py(),p_out.Pz(),p_out.E()));
 }
-void PPSTools::LorentzBoost(H_BeamParticle& h_p, int dir , const string& frame)
+void PPSTools::LorentzBoost(H_BeamParticle& h_p, int dir , const string& frame, FullBeamInfo const& bi)
 {
      TLorentzVector p_out=HectorParticle2LorentzVector(h_p,dir);
-     LorentzBoost(p_out,frame);
+     LorentzBoost(p_out,frame, bi);
      h_p=LorentzVector2HectorParticle(p_out);
 }
-void PPSTools::LorentzBoost(TLorentzVector& p_out, const string& frame)
+void PPSTools::LorentzBoost(TLorentzVector& p_out, const string& frame, FullBeamInfo const& bi)
 {
     const long double microrad = 1.e-6;
     //
@@ -43,18 +43,18 @@ void PPSTools::LorentzBoost(TLorentzVector& p_out, const string& frame)
     double px_N, py_N,pz_N;
     double fBoostAngle1=0.;
     double fBoostAngle2=0.;
-    if (frame=="LAB") {fBoostAngle1=fCrossingAngleBeam1;fBoostAngle2=fCrossingAngleBeam2;}
-    if (frame=="MC")  {fBoostAngle1=-fCrossingAngleBeam1;fBoostAngle2=-fCrossingAngleBeam2;}
-    px_P = fBeamMomentum*sin(fBoostAngle2*microrad);
-    px_N = fBeamMomentum*sin(fBoostAngle1*microrad);
-    pz_P = fBeamMomentum*cos(fBoostAngle2*microrad);
-    pz_N = fBeamMomentum*cos(fBoostAngle1*microrad);
+    if (frame=="LAB") {fBoostAngle1=bi.fCrossingAngleBeam1;fBoostAngle2=bi.fCrossingAngleBeam2;}
+    if (frame=="MC")  {fBoostAngle1=-bi.fCrossingAngleBeam1;fBoostAngle2=-bi.fCrossingAngleBeam2;}
+    px_P = bi.fBeamMomentum*sin(fBoostAngle2*microrad);
+    px_N = bi.fBeamMomentum*sin(fBoostAngle1*microrad);
+    pz_P = bi.fBeamMomentum*cos(fBoostAngle2*microrad);
+    pz_N = bi.fBeamMomentum*cos(fBoostAngle1*microrad);
     py_P = 0.;
     py_N = 0.;
 
     TLorentzVector BeamP, BeamN, projVect;
-    BeamP.SetPx(px_P);BeamP.SetPy(py_P);BeamP.SetPz(pz_P);BeamP.SetE(fBeamEnergy);
-    BeamN.SetPx(px_N);BeamN.SetPy(py_N);BeamN.SetPz(-pz_N);BeamN.SetE(fBeamEnergy);
+    BeamP.SetPx(px_P);BeamP.SetPy(py_P);BeamP.SetPz(pz_P);BeamP.SetE(bi.fBeamEnergy);
+    BeamN.SetPx(px_N);BeamN.SetPy(py_N);BeamN.SetPz(-pz_N);BeamN.SetE(bi.fBeamEnergy);
     projVect = BeamP + BeamN;
     TVector3 beta;
     TLorentzVector boosted = p_out;
@@ -62,14 +62,14 @@ void PPSTools::LorentzBoost(TLorentzVector& p_out, const string& frame)
     boosted.Boost(beta);
     p_out=boosted;
 }
-void PPSTools::Get_t_and_xi(const TLorentzVector* proton,double& t,double& xi) {
+void PPSTools::Get_t_and_xi(const TLorentzVector* proton,double& t,double& xi, LimitedBeamInfo const& bi) {
     t = 0.;
     xi = -1.;
     if (!proton) return;
     double mom = sqrt((proton->Px())*(proton->Px())+(proton->Py())*(proton->Py())+(proton->Pz())*(proton->Pz()));
-    if (mom>fBeamMomentum) mom=fBeamMomentum;
+    if (mom>bi.fBeamMomentum) mom=bi.fBeamMomentum;
     double energy = proton->E();
     double theta  = (proton->Pz()>0)?proton->Theta():TMath::Pi()-proton->Theta();
-    t      = -2.*(ProtonMassSQ-fBeamEnergy*energy+fBeamMomentum*mom*cos(theta));
-    xi     = (1.0-energy/fBeamEnergy);
+    t      = -2.*(ProtonMassSQ-bi.fBeamEnergy*energy+bi.fBeamMomentum*mom*cos(theta));
+    xi     = (1.0-energy/bi.fBeamEnergy);
 }
diff --git a/Utilities/RelMon/python/utils.py b/Utilities/RelMon/python/utils.py
index ad421b50a7883..e68592dd4d6db 100755
--- a/Utilities/RelMon/python/utils.py
+++ b/Utilities/RelMon/python/utils.py
@@ -90,11 +90,18 @@ def literal2root (literal,rootType):
 #-------------------------------------------------------------------------------
 
 def getNbins(h):
+  """
+  To be used in loops on bin number with range()
+  For each dimension there are GetNbinsX()+2 bins including underflow 
+  and overflow, and range() loops starts from 0. So the total number
+  of bins as upper limit of a range() loop already includes the next 
+  to last value needed.
+  """
   biny=h.GetNbinsY()
-  if biny>1:biny+=1
+  if biny>1: biny+=2
   binz=h.GetNbinsZ()
-  if binz>1:binz+=1
-  return (h.GetNbinsX()+1)*(biny)*(binz)
+  if binz>1:binz+=2
+  return (h.GetNbinsX()+2)*(biny)*(binz)
 
 #-------------------------------------------------------------------------------
 
@@ -168,7 +175,7 @@ def do_test(self):
 #-------------------------------------------------------------------------------
 
 def is_empty(h):
-  for i in range(1,getNbins(h)):
+  for i in range(0,getNbins(h)):
     if h.GetBinContent(i)!=0: return False
   return True
   #return h.GetSumOfWeights()==0
@@ -178,7 +185,7 @@ def is_empty(h):
 def is_sparse(h):
   filled_bins=0.
   nbins=h.GetNbinsX()
-  for ibin in range(nbins):
+  for ibin in range(0,nbins+2):
     if h.GetBinContent(ibin)>0:
       filled_bins+=1
   #print "%s %s --> %s" %(filled_bins,nbins,filled_bins/nbins)
@@ -227,7 +234,7 @@ def profile2histo(profile):
     bin_low_edges.append(profile.GetBinLowEdge(ibin))
   bin_low_edges=array.array('f',bin_low_edges)
   histo=TH1F(profile.GetName(),profile.GetTitle(),n_bins,bin_low_edges)
-  for ibin in range(0,n_bins+1):
+  for ibin in range(0,n_bins+2):
     histo.SetBinContent(ibin,profile.GetBinContent(ibin))
     histo.SetBinError(ibin,profile.GetBinError(ibin))    
   
@@ -244,7 +251,7 @@ def check_filled_bins(self,min_filled):
     n_filled_l=[]
     for h in self.h1,self.h2:
       nfilled=0.
-      for ibin in range(1,nbins+1):
+      for ibin in range(0,nbins+2):
         if h.GetBinContent(ibin)>0:
           nfilled+=1
       n_filled_l.append(nfilled)
@@ -253,7 +260,7 @@ def check_filled_bins(self,min_filled):
   def absval(self):
     nbins=getNbins(self.h1)
     binc=0
-    for i in range(1,nbins):
+    for i in range(0,nbins):
       for h in self.h1,self.h2:
         binc=h.GetBinContent(i)
         if binc<0:
@@ -329,7 +336,7 @@ def do_test(self):
     equal = 1
     nbins = getNbins(self.h1)
     n_ok_bins=0.0
-    for ibin in range(0, nbins+2):
+    for ibin in range(0, nbins):
       h1bin=self.h1.GetBinContent(ibin)
       h2bin=self.h2.GetBinContent(ibin)
       bindiff=h1bin-h2bin
@@ -338,7 +345,7 @@ def do_test(self):
 
       if binavg==0 or abs(bindiff) < self.epsilon:
         n_ok_bins+=1
-        #print "Bin %ibin: bindiff %s" %(ibin,bindiff)
+        #print("Bin %ibin: bindiff %s" %(ibin,bindiff))
       else:
         print("Bin %ibin: bindiff %s" %(ibin,bindiff))
 
diff --git a/Utilities/ReleaseScripts/scripts/git-publish b/Utilities/ReleaseScripts/scripts/git-publish
index ece144397f1fa..a53e4421e2428 100755
--- a/Utilities/ReleaseScripts/scripts/git-publish
+++ b/Utilities/ReleaseScripts/scripts/git-publish
@@ -401,13 +401,12 @@ CMSSW_CATEGORIES={"Operations": ["Configuration/Applications",
   "CommonTools/RecoUtils", "CommonTools/Statistics", "CommonTools/TriggerUtils",
   "CommonTools/UtilAlgos", "CommonTools/Utils",
   "AnalysisAlgos/SiStripClusterInfoProducer", "AnalysisAlgos/TrackInfoProducer",
-  "AnalysisDataFormats/EWK", "AnalysisDataFormats/Egamma",
-  "AnalysisDataFormats/SUSYBSMObjects", "AnalysisDataFormats/SiStripClusterInfo",
+  "AnalysisDataFormats/EWK",
+  "AnalysisDataFormats/SUSYBSMObjects",
   "AnalysisDataFormats/TopObjects", "AnalysisDataFormats/TrackInfo",
   "DiffractiveForwardAnalysis/Configuration",
-  "DiffractiveForwardAnalysis/Skimming", "EgammaAnalysis/CSA07Skims",
-  "EgammaAnalysis/Configuration", "EgammaAnalysis/ElectronIDESSources",
-  "EgammaAnalysis/PhotonIDProducers", "ElectroWeakAnalysis/Configuration",
+  "DiffractiveForwardAnalysis/Skimming",
+  "ElectroWeakAnalysis/Configuration",
   "ElectroWeakAnalysis/Skimming", "ElectroWeakAnalysis/Utilities",
   "ElectroWeakAnalysis/WENu", "ElectroWeakAnalysis/WMuNu",
   "ElectroWeakAnalysis/ZEE", "ElectroWeakAnalysis/ZMuMu",
diff --git a/Utilities/StaticAnalyzers/src/ArgSizeChecker.cpp b/Utilities/StaticAnalyzers/src/ArgSizeChecker.cpp
index 41ec0a6aaae8a..58c70bff62618 100644
--- a/Utilities/StaticAnalyzers/src/ArgSizeChecker.cpp
+++ b/Utilities/StaticAnalyzers/src/ArgSizeChecker.cpp
@@ -78,12 +78,12 @@ void ArgSizeChecker::checkPreStmt(const CXXConstructExpr *E, CheckerContext &ctx
 				std::string cepname = "const class edm::Ref<";
 				std::string erviname = "class edm::RefVectorIterator<";
 				const CXXMethodDecl * MD = llvm::dyn_cast_or_null<CXXMethodDecl>(ctx.getCurrentAnalysisDeclContext()->getDecl()) ;
-//				if ( pname.substr(0,bpname.length()) == bpname || pname.substr(0,cbpname.length()) == cbpname 
-//					|| pname.substr(0,ehname.length()) == ehname || pname.substr(0,cehname.length()) == cehname
-//					|| pname.substr(0,epname.length()) == epname || pname.substr(0,cepname.length()) == cepname
-//					|| pname.substr(0,ername.length()) == ername || pname.substr(0,cername.length()) == cername
-//					|| pname.substr(0,sfname.length()) == sfname || pname.substr(0,xname.length()) == xname 
-//					|| pname.substr(0,erviname.length()) == erviname ) continue;
+//                              if ( pname.substr(0,bpname.length()) == bpname || pname.substr(0,cbpname.length()) == cbpname 
+//                                      || pname.substr(0,ehname.length()) == ehname || pname.substr(0,cehname.length()) == cehname
+//                                      || pname.substr(0,epname.length()) == epname || pname.substr(0,cepname.length()) == cepname
+//                                      || pname.substr(0,ername.length()) == ername || pname.substr(0,cername.length()) == cername
+//                                      || pname.substr(0,sfname.length()) == sfname || pname.substr(0,xname.length()) == xname 
+//                                      || pname.substr(0,erviname.length()) == erviname ) continue;
 				os<<"Function parameter copied by value with size '"<<size_param
 					<<"' bits > max size '"<<max_bits
 					<<"' bits parameter type '"<<pname
@@ -93,7 +93,7 @@ void ArgSizeChecker::checkPreStmt(const CXXConstructExpr *E, CheckerContext &ctx
 				os << "'\n";
 
 				std::string oname = "operator"; 
-//				if ( fname.substr(0,oname.length()) == oname ) continue;
+//                              if ( fname.substr(0,oname.length()) == oname ) continue;
 
 				const clang::ento::PathDiagnosticLocation DLoc =
 			   		clang::ento::PathDiagnosticLocation::createBegin(PVD, ctx.getSourceManager());
@@ -145,11 +145,11 @@ void ArgSizeChecker::checkASTDecl(const CXXMethodDecl *MD, AnalysisManager& mgr,
 		std::string erviname = "class edm::RefVectorIterator<";
 
 //		if ( pname.substr(0,bpname.length()) == bpname || pname.substr(0,cbpname.length()) == cbpname 
-//			|| pname.substr(0,ehname.length()) == ehname || pname.substr(0,cehname.length()) == cehname
-//			|| pname.substr(0,epname.length()) == epname || pname.substr(0,cepname.length()) == cepname
-//			|| pname.substr(0,ername.length()) == ername || pname.substr(0,cername.length()) == cername
-//			|| pname.substr(0,sfname.length()) == sfname || pname.substr(0,xname.length()) == xname
-//			|| pname.substr(0,erviname.length()) == erviname ) continue;
+//                      || pname.substr(0,ehname.length()) == ehname || pname.substr(0,cehname.length()) == cehname
+//                      || pname.substr(0,epname.length()) == epname || pname.substr(0,cepname.length()) == cepname
+//                      || pname.substr(0,ername.length()) == ername || pname.substr(0,cername.length()) == cername
+//                      || pname.substr(0,sfname.length()) == sfname || pname.substr(0,xname.length()) == xname
+//                      || pname.substr(0,erviname.length()) == erviname ) continue;
 		std::string fname = MD->getNameAsString();
 	  	os<<"Function parameter passed by value with size of parameter '"<<size_param
 			<<"' bits > max size '"<<max_bits
@@ -161,7 +161,7 @@ void ArgSizeChecker::checkASTDecl(const CXXMethodDecl *MD, AnalysisManager& mgr,
 	  		<<"' class '"<<MD->getParent()->getNameAsString()
 			<<"'\n";
 		std::string oname = "operator"; 
-//		if ( fname.substr(0,oname.length()) == oname ) continue;
+//             if ( fname.substr(0,oname.length()) == oname ) continue;
 
 		BugType * BT = new BugType(this,"Function parameter with size > max", "ArgSize");
 	  	std::unique_ptr<BugReport> report = llvm::make_unique<BugReport>(*BT, os.str() , DLoc);
diff --git a/Validation/CSCRecHits/plugins/Module.cc b/Validation/CSCRecHits/plugins/Module.cc
index cf368b2cdaeae..ae27c4a347b2d 100644
--- a/Validation/CSCRecHits/plugins/Module.cc
+++ b/Validation/CSCRecHits/plugins/Module.cc
@@ -1,8 +1,5 @@
-#include "Validation/CSCRecHits/src/CSCRecHitValidation.h"
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "Validation/CSCRecHits/src/CSCRecHitValidation.h"
 
-
-DEFINE_FWK_MODULE (CSCRecHitValidation) ;
-
-
+DEFINE_FWK_MODULE(CSCRecHitValidation);
diff --git a/Validation/CSCRecHits/src/CSCRecHit2DValidation.cc b/Validation/CSCRecHits/src/CSCRecHit2DValidation.cc
index 9902b7813d0ef..2a8d4c046e11a 100644
--- a/Validation/CSCRecHits/src/CSCRecHit2DValidation.cc
+++ b/Validation/CSCRecHits/src/CSCRecHit2DValidation.cc
@@ -1,130 +1,116 @@
-#include "Validation/CSCRecHits/src/CSCRecHit2DValidation.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "Validation/CSCRecHits/src/CSCRecHit2DValidation.h"
 
-
-
-CSCRecHit2DValidation::CSCRecHit2DValidation(
-                                const edm::InputTag & inputTag,
-                                edm::ConsumesCollector && iC)
-: CSCBaseValidation(inputTag),
-  theNPerEventPlot(nullptr)
-{
+CSCRecHit2DValidation::CSCRecHit2DValidation(const edm::InputTag &inputTag, edm::ConsumesCollector &&iC)
+    : CSCBaseValidation(inputTag), theNPerEventPlot(nullptr) {
   rechits_Token_ = iC.consumes<CSCRecHit2DCollection>(inputTag);
 }
 
-CSCRecHit2DValidation::~CSCRecHit2DValidation()
-{
-  for(int i = 0; i < 10; ++i)
-  {
-    edm::LogInfo("CSCRecHitValidation") << "Resolution of " << theResolutionPlots[i]->getName() << " is " << theResolutionPlots[i]->getRMS();
+CSCRecHit2DValidation::~CSCRecHit2DValidation() {
+  for (int i = 0; i < 10; ++i) {
+    edm::LogInfo("CSCRecHitValidation") << "Resolution of " << theResolutionPlots[i]->getName() << " is "
+                                        << theResolutionPlots[i]->getRMS();
     edm::LogInfo("CSCRecHitValidation") << "Peak Time is " << theTPeaks[i]->getMean();
   }
 }
 
-void CSCRecHit2DValidation::bookHistograms(DQMStore::IBooker & iBooker)
-{
+void CSCRecHit2DValidation::bookHistograms(DQMStore::IBooker &iBooker) {
   theNPerEventPlot = iBooker.book1D("CSCRecHitsPerEvent", "Number of CSC Rec Hits per event", 100, 0, 500);
-  for(int i = 0; i < 10; ++i)
-  {
-    char title1[200], title2[200], title3[200], title4[200], title5[200], title6[200], title7[200], title8[200], title9[200];
-    sprintf(title1, "CSCRecHitResolution%d", i+1);
-    sprintf(title2, "CSCRecHitPull%d", i+1);
-    sprintf(title3, "CSCRecHitYResolution%d", i+1);
-    sprintf(title4, "CSCRecHitYPull%d", i+1);
-    sprintf(title5, "CSCRecHitPosInStrip%d", i+1);
-    sprintf(title6, "CSCSimHitPosInStrip%d", i+1);
-    sprintf(title7, "CSCRecHit%d", i+1);
-    sprintf(title8, "CSCSimHit%d", i+1);
-    sprintf(title9, "CSCTPeak%d", i+1);
+  for (int i = 0; i < 10; ++i) {
+    char title1[200], title2[200], title3[200], title4[200], title5[200], title6[200], title7[200], title8[200],
+        title9[200];
+    sprintf(title1, "CSCRecHitResolution%d", i + 1);
+    sprintf(title2, "CSCRecHitPull%d", i + 1);
+    sprintf(title3, "CSCRecHitYResolution%d", i + 1);
+    sprintf(title4, "CSCRecHitYPull%d", i + 1);
+    sprintf(title5, "CSCRecHitPosInStrip%d", i + 1);
+    sprintf(title6, "CSCSimHitPosInStrip%d", i + 1);
+    sprintf(title7, "CSCRecHit%d", i + 1);
+    sprintf(title8, "CSCSimHit%d", i + 1);
+    sprintf(title9, "CSCTPeak%d", i + 1);
 
-    theResolutionPlots[i] =    iBooker.book1D(title1, title1, 100, -0.2, 0.2);
-    thePullPlots[i] =          iBooker.book1D(title2, title2, 100, -3, 3);
-    theYResolutionPlots[i] =   iBooker.book1D(title3, title3, 100, -5, 5);
-    theYPullPlots[i] =         iBooker.book1D(title4, title4, 100, -3, 3);
-    theRecHitPosInStrip[i] =   iBooker.book1D(title5, title5, 100, -2, 2);
-    theSimHitPosInStrip[i] =   iBooker.book1D(title6, title6, 100, -2, 2);
-    theScatterPlots[i] =       iBooker.book2D(title7, title7, 200, -20, 20, 200, -250, 250);
+    theResolutionPlots[i] = iBooker.book1D(title1, title1, 100, -0.2, 0.2);
+    thePullPlots[i] = iBooker.book1D(title2, title2, 100, -3, 3);
+    theYResolutionPlots[i] = iBooker.book1D(title3, title3, 100, -5, 5);
+    theYPullPlots[i] = iBooker.book1D(title4, title4, 100, -3, 3);
+    theRecHitPosInStrip[i] = iBooker.book1D(title5, title5, 100, -2, 2);
+    theSimHitPosInStrip[i] = iBooker.book1D(title6, title6, 100, -2, 2);
+    theScatterPlots[i] = iBooker.book2D(title7, title7, 200, -20, 20, 200, -250, 250);
     theSimHitScatterPlots[i] = iBooker.book2D(title8, title8, 200, -20, 20, 200, -250, 250);
-    theTPeaks[i] =             iBooker.book1D(title9, title9, 200, 0, 400);
+    theTPeaks[i] = iBooker.book1D(title9, title9, 200, 0, 400);
   }
 }
 
-void CSCRecHit2DValidation::analyze(const edm::Event&e, const edm::EventSetup& eventSetup)
-{
+void CSCRecHit2DValidation::analyze(const edm::Event &e, const edm::EventSetup &eventSetup) {
   // get the collection of CSCRecHrecHitItrD
   edm::Handle<CSCRecHit2DCollection> hRecHits;
   e.getByToken(rechits_Token_, hRecHits);
-  const CSCRecHit2DCollection * cscRecHits = hRecHits.product();
+  const CSCRecHit2DCollection *cscRecHits = hRecHits.product();
 
   unsigned nPerEvent = 0;
 
-  for(CSCRecHit2DCollection::const_iterator recHitItr = cscRecHits->begin(); 
-      recHitItr != cscRecHits->end(); recHitItr++) 
-  {
+  for (CSCRecHit2DCollection::const_iterator recHitItr = cscRecHits->begin(); recHitItr != cscRecHits->end();
+       recHitItr++) {
     ++nPerEvent;
     int detId = (*recHitItr).cscDetId().rawId();
     edm::PSimHitContainer simHits = theSimHitMap->hits(detId);
-    const CSCLayer * layer = findLayer(detId);
+    const CSCLayer *layer = findLayer(detId);
     int chamberType = layer->chamber()->specs()->chamberType();
-    theTPeaks[chamberType-1]->Fill(recHitItr->tpeak());
-    if(simHits.size() == 1)
-    {
+    theTPeaks[chamberType - 1]->Fill(recHitItr->tpeak());
+    if (simHits.size() == 1) {
       plotResolution(simHits[0], *recHitItr, layer, chamberType);
     }
     float localX = recHitItr->localPosition().x();
     float localY = recHitItr->localPosition().y();
-    //theYPlots[chamberType-1]->Fill(localY);
+    // theYPlots[chamberType-1]->Fill(localY);
     // find a local phi
-    float globalR = layer->toGlobal(LocalPoint(0.,0.,0.)).perp();
-    GlobalPoint axisThruChamber(globalR+localY, localX, 0.);
+    float globalR = layer->toGlobal(LocalPoint(0., 0., 0.)).perp();
+    GlobalPoint axisThruChamber(globalR + localY, localX, 0.);
     float localPhi = axisThruChamber.phi().degrees();
-    //thePhiPlots[chamberType-1]->Fill(axisThruChamber.phi().degrees());
-    theScatterPlots[chamberType-1]->Fill( localPhi, localY);
-  }    
+    // thePhiPlots[chamberType-1]->Fill(axisThruChamber.phi().degrees());
+    theScatterPlots[chamberType - 1]->Fill(localPhi, localY);
+  }
   theNPerEventPlot->Fill(nPerEvent);
-return;
+  return;
   // fill sim hits
   std::vector<int> layersWithSimHits = theSimHitMap->detsWithHits();
-  for(unsigned i = 0; i < layersWithSimHits.size(); ++i)
-   {
+  for (unsigned i = 0; i < layersWithSimHits.size(); ++i) {
     edm::PSimHitContainer simHits = theSimHitMap->hits(layersWithSimHits[i]);
-    for(edm::PSimHitContainer::const_iterator hitItr = simHits.begin(); hitItr != simHits.end(); ++hitItr)
-    {
-    const CSCLayer * layer = findLayer(layersWithSimHits[i]);
-    int chamberType = layer->chamber()->specs()->chamberType();
+    for (edm::PSimHitContainer::const_iterator hitItr = simHits.begin(); hitItr != simHits.end(); ++hitItr) {
+      const CSCLayer *layer = findLayer(layersWithSimHits[i]);
+      int chamberType = layer->chamber()->specs()->chamberType();
       float localX = hitItr->localPosition().x();
       float localY = hitItr->localPosition().y();
-      //theYPlots[chamberType-1]->Fill(localY);
+      // theYPlots[chamberType-1]->Fill(localY);
       // find a local phi
-      float globalR = layer->toGlobal(LocalPoint(0.,0.,0.)).perp();
-      GlobalPoint axisThruChamber(globalR+localY, localX, 0.);
+      float globalR = layer->toGlobal(LocalPoint(0., 0., 0.)).perp();
+      GlobalPoint axisThruChamber(globalR + localY, localX, 0.);
       float localPhi = axisThruChamber.phi().degrees();
-      //thePhiPlots[chamberType-1]->Fill(axisThruChamber.phi().degrees());
-      theSimHitScatterPlots[chamberType-1]->Fill( localPhi, localY);
+      // thePhiPlots[chamberType-1]->Fill(axisThruChamber.phi().degrees());
+      theSimHitScatterPlots[chamberType - 1]->Fill(localPhi, localY);
     }
   }
-
 }
 
-void CSCRecHit2DValidation::plotResolution(const PSimHit & simHit, const CSCRecHit2D & recHit,
-                                         const CSCLayer * layer, int chamberType)
-{
+void CSCRecHit2DValidation::plotResolution(const PSimHit &simHit,
+                                           const CSCRecHit2D &recHit,
+                                           const CSCLayer *layer,
+                                           int chamberType) {
   GlobalPoint simHitPos = layer->toGlobal(simHit.localPosition());
   GlobalPoint recHitPos = layer->toGlobal(recHit.localPosition());
 
   double dphi = recHitPos.phi() - simHitPos.phi();
   double rdphi = recHitPos.perp() * dphi;
-  theResolutionPlots[chamberType-1]->Fill( rdphi );
-  thePullPlots[chamberType-1]->Fill( rdphi/ sqrt(recHit.localPositionError().xx()) );
+  theResolutionPlots[chamberType - 1]->Fill(rdphi);
+  thePullPlots[chamberType - 1]->Fill(rdphi / sqrt(recHit.localPositionError().xx()));
   double dy = recHit.localPosition().y() - simHit.localPosition().y();
-  theYResolutionPlots[chamberType-1]->Fill( dy );
-  theYPullPlots[chamberType-1]->Fill( dy/ sqrt(recHit.localPositionError().yy()) );
+  theYResolutionPlots[chamberType - 1]->Fill(dy);
+  theYPullPlots[chamberType - 1]->Fill(dy / sqrt(recHit.localPositionError().yy()));
 
-  const CSCLayerGeometry * layerGeometry = layer->geometry();
+  const CSCLayerGeometry *layerGeometry = layer->geometry();
   float recStrip = layerGeometry->strip(recHit.localPosition());
   float simStrip = layerGeometry->strip(simHit.localPosition());
-  theRecHitPosInStrip[chamberType-1]->Fill( recStrip - int(recStrip) );
-  theSimHitPosInStrip[chamberType-1]->Fill( simStrip - int(simStrip) );
+  theRecHitPosInStrip[chamberType - 1]->Fill(recStrip - int(recStrip));
+  theSimHitPosInStrip[chamberType - 1]->Fill(simStrip - int(simStrip));
 }
-
diff --git a/Validation/CSCRecHits/src/CSCRecHit2DValidation.h b/Validation/CSCRecHits/src/CSCRecHit2DValidation.h
index c52b2e37da382..c22f7ab7377e2 100644
--- a/Validation/CSCRecHits/src/CSCRecHit2DValidation.h
+++ b/Validation/CSCRecHits/src/CSCRecHit2DValidation.h
@@ -1,41 +1,36 @@
 #ifndef CSCRecHit2DValidation_h
 #define CSCRecHit2DValidation_h
 
-#include "Validation/MuonCSCDigis/interface/CSCBaseValidation.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/CSCRecHit/interface/CSCRecHit2D.h"
 #include "DataFormats/CSCRecHit/interface/CSCRecHit2DCollection.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "Geometry/CSCGeometry/interface/CSCLayer.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
+#include "Validation/MuonCSCDigis/interface/CSCBaseValidation.h"
 
-class CSCRecHit2DValidation : public CSCBaseValidation
-{
+class CSCRecHit2DValidation : public CSCBaseValidation {
 public:
-  CSCRecHit2DValidation(const edm::InputTag & inputTag,
-                        edm::ConsumesCollector && iC);
+  CSCRecHit2DValidation(const edm::InputTag &inputTag, edm::ConsumesCollector &&iC);
   ~CSCRecHit2DValidation() override;
   void bookHistograms(DQMStore::IBooker &);
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-
- private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
+private:
   edm::EDGetTokenT<CSCRecHit2DCollection> rechits_Token_;
 
-  void plotResolution(const PSimHit & simHit, const CSCRecHit2D & recHit,
-                      const CSCLayer * layer, int chamberType);
-
-  MonitorElement* theNPerEventPlot;
-  MonitorElement* theResolutionPlots[10];
-  MonitorElement* thePullPlots[10];
-  MonitorElement* theYResolutionPlots[10];
-  MonitorElement* theYPullPlots[10];
-  MonitorElement* theScatterPlots[10];
-  MonitorElement* theSimHitScatterPlots[10];
-  MonitorElement* theRecHitPosInStrip[10];
-  MonitorElement* theSimHitPosInStrip[10];
-  MonitorElement* theTPeaks[10];
+  void plotResolution(const PSimHit &simHit, const CSCRecHit2D &recHit, const CSCLayer *layer, int chamberType);
+
+  MonitorElement *theNPerEventPlot;
+  MonitorElement *theResolutionPlots[10];
+  MonitorElement *thePullPlots[10];
+  MonitorElement *theYResolutionPlots[10];
+  MonitorElement *theYPullPlots[10];
+  MonitorElement *theScatterPlots[10];
+  MonitorElement *theSimHitScatterPlots[10];
+  MonitorElement *theRecHitPosInStrip[10];
+  MonitorElement *theSimHitPosInStrip[10];
+  MonitorElement *theTPeaks[10];
 };
 
 #endif
-
diff --git a/Validation/CSCRecHits/src/CSCRecHitValidation.cc b/Validation/CSCRecHits/src/CSCRecHitValidation.cc
index c00e4ac9c0a9d..f342e754a4d46 100644
--- a/Validation/CSCRecHits/src/CSCRecHitValidation.cc
+++ b/Validation/CSCRecHits/src/CSCRecHitValidation.cc
@@ -1,47 +1,38 @@
-#include "Validation/CSCRecHits/src/CSCRecHitValidation.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
+#include "Validation/CSCRecHits/src/CSCRecHitValidation.h"
 #include <DataFormats/CSCRecHit/interface/CSCRecHit2DCollection.h>
-#include "DQMServices/Core/interface/DQMStore.h"
-
 
-CSCRecHitValidation::CSCRecHitValidation(const edm::ParameterSet & ps)
-: theSimHitMap(ps.getParameter<edm::InputTag>("simHitsTag"), consumesCollector() ),
-  theCSCGeometry(nullptr),
-  the2DValidation(nullptr),
-  theSegmentValidation(nullptr)
-{
-  the2DValidation = new CSCRecHit2DValidation(
-                                ps.getParameter<edm::InputTag>("recHitLabel"),
-                                consumesCollector() );
-  theSegmentValidation = new CSCSegmentValidation(
-                                ps.getParameter<edm::InputTag>("segmentLabel"),
-                                consumesCollector() );
+CSCRecHitValidation::CSCRecHitValidation(const edm::ParameterSet &ps)
+    : theSimHitMap(ps.getParameter<edm::InputTag>("simHitsTag"), consumesCollector()),
+      theCSCGeometry(nullptr),
+      the2DValidation(nullptr),
+      theSegmentValidation(nullptr) {
+  the2DValidation = new CSCRecHit2DValidation(ps.getParameter<edm::InputTag>("recHitLabel"), consumesCollector());
+  theSegmentValidation = new CSCSegmentValidation(ps.getParameter<edm::InputTag>("segmentLabel"), consumesCollector());
 }
 
-CSCRecHitValidation::~CSCRecHitValidation()
-{
+CSCRecHitValidation::~CSCRecHitValidation() {
   delete the2DValidation;
   delete theSegmentValidation;
 }
 
-void CSCRecHitValidation::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const & iRun, edm::EventSetup const &)
-{
+void CSCRecHitValidation::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &iRun, edm::EventSetup const &) {
   iBooker.setCurrentFolder("CSCRecHitsV/CSCRecHitTask");
-  
+
   the2DValidation->bookHistograms(iBooker);
   theSegmentValidation->bookHistograms(iBooker);
 }
 
-void CSCRecHitValidation::analyze(const edm::Event&e, const edm::EventSetup& eventSetup)
-{
+void CSCRecHitValidation::analyze(const edm::Event &e, const edm::EventSetup &eventSetup) {
   theSimHitMap.fill(e);
 
   // find the geometry & conditions for this event
   edm::ESHandle<CSCGeometry> hGeom;
-  eventSetup.get<MuonGeometryRecord>().get( hGeom );
+  eventSetup.get<MuonGeometryRecord>().get(hGeom);
   theCSCGeometry = &*hGeom;
 
   the2DValidation->setGeometry(theCSCGeometry);
diff --git a/Validation/CSCRecHits/src/CSCRecHitValidation.h b/Validation/CSCRecHits/src/CSCRecHitValidation.h
index 122f7f7dc4451..0f4ecdac7208b 100644
--- a/Validation/CSCRecHits/src/CSCRecHitValidation.h
+++ b/Validation/CSCRecHits/src/CSCRecHitValidation.h
@@ -3,35 +3,32 @@
 
 // user include files
 
-#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
+#include <DQMServices/Core/interface/DQMEDAnalyzer.h>
 #include <DQMServices/Core/interface/DQMStore.h>
 #include <DQMServices/Core/interface/MonitorElement.h>
-#include <DQMServices/Core/interface/DQMEDAnalyzer.h>
 
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 #include "SimMuon/MCTruth/interface/PSimHitMap.h"
 #include "Validation/CSCRecHits/src/CSCRecHit2DValidation.h"
 #include "Validation/CSCRecHits/src/CSCSegmentValidation.h"
 
-
-
 class CSCRecHitValidation : public DQMEDAnalyzer {
 public:
-  explicit CSCRecHitValidation(const edm::ParameterSet&);
+  explicit CSCRecHitValidation(const edm::ParameterSet &);
   ~CSCRecHitValidation() override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
- private:
+private:
   PSimHitMap theSimHitMap;
-  const CSCGeometry * theCSCGeometry;
+  const CSCGeometry *theCSCGeometry;
 
-  CSCRecHit2DValidation * the2DValidation;
-  CSCSegmentValidation * theSegmentValidation;
+  CSCRecHit2DValidation *the2DValidation;
+  CSCSegmentValidation *theSegmentValidation;
 };
 
 #endif
-
diff --git a/Validation/CSCRecHits/src/CSCSegmentValidation.cc b/Validation/CSCRecHits/src/CSCSegmentValidation.cc
index c1c605b26f0e2..ef204b107459c 100644
--- a/Validation/CSCRecHits/src/CSCSegmentValidation.cc
+++ b/Validation/CSCRecHits/src/CSCSegmentValidation.cc
@@ -1,74 +1,63 @@
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "Validation/CSCRecHits/src/CSCSegmentValidation.h"
 #include <algorithm>
-#include "DQMServices/Core/interface/DQMStore.h"
-
 
-CSCSegmentValidation::CSCSegmentValidation(const edm::InputTag & inputTag, edm::ConsumesCollector && iC)
-: CSCBaseValidation(inputTag),
-  theLayerHitsPerChamber(),
-  theChamberSegmentMap(),
-  theShowerThreshold(10)
-{
-   segments_Token_ = iC.consumes<CSCSegmentCollection>(inputTag);
+CSCSegmentValidation::CSCSegmentValidation(const edm::InputTag &inputTag, edm::ConsumesCollector &&iC)
+    : CSCBaseValidation(inputTag), theLayerHitsPerChamber(), theChamberSegmentMap(), theShowerThreshold(10) {
+  segments_Token_ = iC.consumes<CSCSegmentCollection>(inputTag);
 }
 
-CSCSegmentValidation::~CSCSegmentValidation()
-{
-}
+CSCSegmentValidation::~CSCSegmentValidation() {}
 
-void CSCSegmentValidation::bookHistograms(DQMStore::IBooker & iBooker)
-{
-  theNPerEventPlot =            iBooker.book1D("CSCSegmentsPerEvent", "Number of CSC segments per event", 100, 0, 50);
-  theNRecHitsPlot =             iBooker.book1D("CSCRecHitsPerSegment", "Number of CSC rec hits per segment" , 8, 0, 7);
-  theNPerChamberTypePlot =      iBooker.book1D("CSCSegmentsPerChamberType", "Number of CSC segments per chamber type", 11, 0, 10);
-  theTypePlot4HitsNoShower =    iBooker.book1D("CSCSegments4HitsNoShower", "", 100, 0, 10);
+void CSCSegmentValidation::bookHistograms(DQMStore::IBooker &iBooker) {
+  theNPerEventPlot = iBooker.book1D("CSCSegmentsPerEvent", "Number of CSC segments per event", 100, 0, 50);
+  theNRecHitsPlot = iBooker.book1D("CSCRecHitsPerSegment", "Number of CSC rec hits per segment", 8, 0, 7);
+  theNPerChamberTypePlot =
+      iBooker.book1D("CSCSegmentsPerChamberType", "Number of CSC segments per chamber type", 11, 0, 10);
+  theTypePlot4HitsNoShower = iBooker.book1D("CSCSegments4HitsNoShower", "", 100, 0, 10);
   theTypePlot4HitsNoShowerSeg = iBooker.book1D("CSCSegments4HitsNoShowerSeg", "", 100, 0, 10);
-  theTypePlot4HitsShower =      iBooker.book1D("CSCSegments4HitsShower", "", 100, 0, 10);
-  theTypePlot4HitsShowerSeg =   iBooker.book1D("CSCSegments4HitsShowerSeg", "", 100, 0, 10);
-  theTypePlot5HitsNoShower =    iBooker.book1D("CSCSegments5HitsNoShower", "", 100, 0, 10);
+  theTypePlot4HitsShower = iBooker.book1D("CSCSegments4HitsShower", "", 100, 0, 10);
+  theTypePlot4HitsShowerSeg = iBooker.book1D("CSCSegments4HitsShowerSeg", "", 100, 0, 10);
+  theTypePlot5HitsNoShower = iBooker.book1D("CSCSegments5HitsNoShower", "", 100, 0, 10);
   theTypePlot5HitsNoShowerSeg = iBooker.book1D("CSCSegments5HitsNoShowerSeg", "", 100, 0, 10);
-  theTypePlot5HitsShower =      iBooker.book1D("CSCSegments5HitsShower", "", 100, 0, 10);
-  theTypePlot5HitsShowerSeg =   iBooker.book1D("CSCSegments5HitsShowerSeg", "", 100, 0, 10);
-  theTypePlot6HitsNoShower =    iBooker.book1D("CSCSegments6HitsNoShower", "", 100, 0, 10);
+  theTypePlot5HitsShower = iBooker.book1D("CSCSegments5HitsShower", "", 100, 0, 10);
+  theTypePlot5HitsShowerSeg = iBooker.book1D("CSCSegments5HitsShowerSeg", "", 100, 0, 10);
+  theTypePlot6HitsNoShower = iBooker.book1D("CSCSegments6HitsNoShower", "", 100, 0, 10);
   theTypePlot6HitsNoShowerSeg = iBooker.book1D("CSCSegments6HitsNoShowerSeg", "", 100, 0, 10);
-  theTypePlot6HitsShower =      iBooker.book1D("CSCSegments6HitsShower", "", 100, 0, 10);
-  theTypePlot6HitsShowerSeg =   iBooker.book1D("CSCSegments6HitsShowerSeg", "", 100, 0, 10);
-  for(int i = 0; i < 10; ++i)
-  {
-    char title1[200], title2[200], title3[200], title4[200],  
-         title5[200], title6[200], title7[200], title8[200];
-    sprintf(title1, "CSCSegmentRdPhiResolution%d", i+1);
-    sprintf(title2, "CSCSegmentRdPhiPull%d", i+1);
-    sprintf(title3, "CSCSegmentThetaResolution%d", i+1);
-    sprintf(title4, "CSCSegmentThetaPull%d", i+1);
-    sprintf(title5, "CSCSegmentdXdZResolution%d", i+1);
-    sprintf(title6, "CSCSegmentdXdZPull%d", i+1);
-    sprintf(title7, "CSCSegmentdYdZResolution%d", i+1);
-    sprintf(title8, "CSCSegmentdYdZPull%d", i+1);
+  theTypePlot6HitsShower = iBooker.book1D("CSCSegments6HitsShower", "", 100, 0, 10);
+  theTypePlot6HitsShowerSeg = iBooker.book1D("CSCSegments6HitsShowerSeg", "", 100, 0, 10);
+  for (int i = 0; i < 10; ++i) {
+    char title1[200], title2[200], title3[200], title4[200], title5[200], title6[200], title7[200], title8[200];
+    sprintf(title1, "CSCSegmentRdPhiResolution%d", i + 1);
+    sprintf(title2, "CSCSegmentRdPhiPull%d", i + 1);
+    sprintf(title3, "CSCSegmentThetaResolution%d", i + 1);
+    sprintf(title4, "CSCSegmentThetaPull%d", i + 1);
+    sprintf(title5, "CSCSegmentdXdZResolution%d", i + 1);
+    sprintf(title6, "CSCSegmentdXdZPull%d", i + 1);
+    sprintf(title7, "CSCSegmentdYdZResolution%d", i + 1);
+    sprintf(title8, "CSCSegmentdYdZPull%d", i + 1);
 
     theRdPhiResolutionPlots[i] = iBooker.book1D(title1, title1, 100, -0.4, 0.4);
-    theRdPhiPullPlots[i] =       iBooker.book1D(title2, title2, 100, -5, 5);
+    theRdPhiPullPlots[i] = iBooker.book1D(title2, title2, 100, -5, 5);
     theThetaResolutionPlots[i] = iBooker.book1D(title3, title3, 100, -1, 1);
-    theThetaPullPlots[i] =       iBooker.book1D(title4, title4, 100, -5, 5);
-    thedXdZResolutionPlots[i] =  iBooker.book1D(title5, title5, 100, -1, 1);
-    thedXdZPullPlots[i] =        iBooker.book1D(title6, title6, 100, -5, 5);
-    thedYdZResolutionPlots[i] =  iBooker.book1D(title7, title7, 100, -1, 1);
-    thedYdZPullPlots[i] =        iBooker.book1D(title8, title8, 100, -5, 5);
+    theThetaPullPlots[i] = iBooker.book1D(title4, title4, 100, -5, 5);
+    thedXdZResolutionPlots[i] = iBooker.book1D(title5, title5, 100, -1, 1);
+    thedXdZPullPlots[i] = iBooker.book1D(title6, title6, 100, -5, 5);
+    thedYdZResolutionPlots[i] = iBooker.book1D(title7, title7, 100, -1, 1);
+    thedYdZPullPlots[i] = iBooker.book1D(title8, title8, 100, -5, 5);
   }
 }
 
-void CSCSegmentValidation::analyze(const edm::Event&e, const edm::EventSetup& eventSetup)
-{
+void CSCSegmentValidation::analyze(const edm::Event &e, const edm::EventSetup &eventSetup) {
   // get the collection of CSCRecHsegmentItrD
   edm::Handle<CSCSegmentCollection> hRecHits;
   e.getByToken(segments_Token_, hRecHits);
-  const CSCSegmentCollection * cscRecHits = hRecHits.product();
+  const CSCSegmentCollection *cscRecHits = hRecHits.product();
 
   theChamberSegmentMap.clear();
   unsigned nPerEvent = 0;
-  for(CSCSegmentCollection::const_iterator segmentItr = cscRecHits->begin(); 
-      segmentItr != cscRecHits->end(); segmentItr++) 
-  {
+  for (CSCSegmentCollection::const_iterator segmentItr = cscRecHits->begin(); segmentItr != cscRecHits->end();
+       segmentItr++) {
     ++nPerEvent;
     int detId = segmentItr->geographicalId().rawId();
     int chamberType = whatChamberType(detId);
@@ -78,12 +67,11 @@ void CSCSegmentValidation::analyze(const edm::Event&e, const edm::EventSetup& ev
     theChamberSegmentMap[detId].push_back(*segmentItr);
 
     // do the resolution plots
-    const PSimHit * hit = keyHit(detId);
-    if(hit != nullptr) 
-    {
-      const CSCLayer * layer = findLayer(hit->detUnitId());
+    const PSimHit *hit = keyHit(detId);
+    if (hit != nullptr) {
+      const CSCLayer *layer = findLayer(hit->detUnitId());
       plotResolution(*hit, *segmentItr, layer, chamberType);
-    }  
+    }
   }
 
   theNPerEventPlot->Fill(nPerEvent);
@@ -92,14 +80,11 @@ void CSCSegmentValidation::analyze(const edm::Event&e, const edm::EventSetup& ev
   fillEfficiencyPlots();
 }
 
-void CSCSegmentValidation::fillEfficiencyPlots()
-{
-    // now plot efficiency by looping over all chambers with hits
-  for(ChamberHitMap::const_iterator mapItr = theLayerHitsPerChamber.begin(),
-      mapEnd = theLayerHitsPerChamber.end();
-      mapItr != mapEnd;
-      ++mapItr)
-  {
+void CSCSegmentValidation::fillEfficiencyPlots() {
+  // now plot efficiency by looping over all chambers with hits
+  for (ChamberHitMap::const_iterator mapItr = theLayerHitsPerChamber.begin(), mapEnd = theLayerHitsPerChamber.end();
+       mapItr != mapEnd;
+       ++mapItr) {
     int chamberId = mapItr->first;
     int nHitsInChamber = mapItr->second.size();
     bool isShower = (nHitsInChamber > theShowerThreshold);
@@ -112,65 +97,63 @@ void CSCSegmentValidation::fillEfficiencyPlots()
     v.erase(std::unique(v.begin(), v.end()), v.end());
     int nLayersHit = v.size();
 
-    if(nLayersHit == 4)
-    {
-
-      if(isShower) theTypePlot4HitsShower->Fill(chamberType);
-      else         theTypePlot4HitsNoShower->Fill(chamberType);
-
-      if(hasSeg) 
-      {
-        if(isShower) theTypePlot4HitsShowerSeg->Fill(chamberType);
-        else         theTypePlot4HitsNoShowerSeg->Fill(chamberType);
-      } 
+    if (nLayersHit == 4) {
+      if (isShower)
+        theTypePlot4HitsShower->Fill(chamberType);
+      else
+        theTypePlot4HitsNoShower->Fill(chamberType);
+
+      if (hasSeg) {
+        if (isShower)
+          theTypePlot4HitsShowerSeg->Fill(chamberType);
+        else
+          theTypePlot4HitsNoShowerSeg->Fill(chamberType);
+      }
     }
 
-    if(nLayersHit == 5)
-    {
-
-      if(isShower) theTypePlot5HitsShower->Fill(chamberType);
-      else         theTypePlot5HitsNoShower->Fill(chamberType);
-
-      if(hasSeg)
-      {
-        if(isShower) theTypePlot5HitsShowerSeg->Fill(chamberType);
-        else         theTypePlot5HitsNoShowerSeg->Fill(chamberType);
+    if (nLayersHit == 5) {
+      if (isShower)
+        theTypePlot5HitsShower->Fill(chamberType);
+      else
+        theTypePlot5HitsNoShower->Fill(chamberType);
+
+      if (hasSeg) {
+        if (isShower)
+          theTypePlot5HitsShowerSeg->Fill(chamberType);
+        else
+          theTypePlot5HitsNoShowerSeg->Fill(chamberType);
       }
     }
 
-    if(nLayersHit == 6)
-    {
-
-      if(isShower) theTypePlot6HitsShower->Fill(chamberType);
-      else         theTypePlot6HitsNoShower->Fill(chamberType);
-
-      if(hasSeg)
-      {
-        if(isShower) theTypePlot6HitsShowerSeg->Fill(chamberType);
-        else         theTypePlot6HitsNoShowerSeg->Fill(chamberType);
+    if (nLayersHit == 6) {
+      if (isShower)
+        theTypePlot6HitsShower->Fill(chamberType);
+      else
+        theTypePlot6HitsNoShower->Fill(chamberType);
+
+      if (hasSeg) {
+        if (isShower)
+          theTypePlot6HitsShowerSeg->Fill(chamberType);
+        else
+          theTypePlot6HitsNoShowerSeg->Fill(chamberType);
       }
     }
-
-
   }
 }
 
-bool CSCSegmentValidation::hasSegment(int chamberId) const
-{
+bool CSCSegmentValidation::hasSegment(int chamberId) const {
   return (theChamberSegmentMap.find(chamberId) != theChamberSegmentMap.end());
 }
 
-
-int CSCSegmentValidation::whatChamberType(int detId)
-{
+int CSCSegmentValidation::whatChamberType(int detId) {
   CSCDetId cscDetId(detId);
   return CSCChamberSpecs::whatChamberType(cscDetId.station(), cscDetId.ring());
 }
 
-
-void CSCSegmentValidation::plotResolution(const PSimHit & simHit, const CSCSegment & segment,
-                                         const CSCLayer * layer, int chamberType)
-{
+void CSCSegmentValidation::plotResolution(const PSimHit &simHit,
+                                          const CSCSegment &segment,
+                                          const CSCLayer *layer,
+                                          int chamberType) {
   GlobalPoint simHitPos = layer->toGlobal(simHit.localPosition());
   GlobalPoint segmentPos = layer->toGlobal(segment.localPosition());
   LocalVector simHitDir = simHit.localDirection();
@@ -181,65 +164,54 @@ void CSCSegmentValidation::plotResolution(const PSimHit & simHit, const CSCSegme
   double dtheta = segmentPos.theta() - simHitPos.theta();
 
   double sigmax = sqrt(segment.localPositionError().xx());
-  //double sigmay = sqrt(segment.localPositionError().yy());
+  // double sigmay = sqrt(segment.localPositionError().yy());
 
-  double ddxdz = segmentDir.x()/segmentDir.z() - simHitDir.x()/simHitDir.z();
-  double ddydz = segmentDir.y()/segmentDir.z() - simHitDir.y()/simHitDir.z();
+  double ddxdz = segmentDir.x() / segmentDir.z() - simHitDir.x() / simHitDir.z();
+  double ddydz = segmentDir.y() / segmentDir.z() - simHitDir.y() / simHitDir.z();
   double sigmadxdz = sqrt(segment.localDirectionError().xx());
-  double sigmadydz = sqrt(segment.localDirectionError().yy()); 
+  double sigmadydz = sqrt(segment.localDirectionError().yy());
 
-  theRdPhiResolutionPlots[chamberType-1]->Fill( rdphi );
-  theRdPhiPullPlots[chamberType-1]->Fill( rdphi/sigmax );
-  theThetaResolutionPlots[chamberType-1]->Fill( dtheta );
-  //theThetaPullPlots[chamberType-1]->Fill( dy/sigmay );
+  theRdPhiResolutionPlots[chamberType - 1]->Fill(rdphi);
+  theRdPhiPullPlots[chamberType - 1]->Fill(rdphi / sigmax);
+  theThetaResolutionPlots[chamberType - 1]->Fill(dtheta);
+  // theThetaPullPlots[chamberType-1]->Fill( dy/sigmay );
 
-  thedXdZResolutionPlots[chamberType-1]->Fill( ddxdz );
-  thedXdZPullPlots[chamberType-1]->Fill( ddxdz/sigmadxdz );
-  thedYdZResolutionPlots[chamberType-1]->Fill( ddydz );
-  thedYdZPullPlots[chamberType-1]->Fill( ddydz/sigmadydz );
+  thedXdZResolutionPlots[chamberType - 1]->Fill(ddxdz);
+  thedXdZPullPlots[chamberType - 1]->Fill(ddxdz / sigmadxdz);
+  thedYdZResolutionPlots[chamberType - 1]->Fill(ddydz);
+  thedYdZPullPlots[chamberType - 1]->Fill(ddydz / sigmadydz);
 }
 
-
-void CSCSegmentValidation::fillLayerHitsPerChamber()
-{
+void CSCSegmentValidation::fillLayerHitsPerChamber() {
   theLayerHitsPerChamber.clear();
   std::vector<int> layersHit = theSimHitMap->detsWithHits();
-  for(std::vector<int>::const_iterator layerItr = layersHit.begin(), 
-      layersHitEnd = layersHit.end();
-      layerItr != layersHitEnd;
-      ++layerItr)
-  {
+  for (std::vector<int>::const_iterator layerItr = layersHit.begin(), layersHitEnd = layersHit.end();
+       layerItr != layersHitEnd;
+       ++layerItr) {
     CSCDetId layerId(*layerItr);
     CSCDetId chamberId = layerId.chamberId();
     int nhits = theSimHitMap->hits(*layerItr).size();
     // multiple entries, so we can see showers
-    for(int i = 0; i < nhits; ++i) {
+    for (int i = 0; i < nhits; ++i) {
       theLayerHitsPerChamber[chamberId.rawId()].push_back(*layerItr);
     }
   }
-
 }
 
 namespace CSCSegmentValidationUtils {
-  bool SimHitPabsLessThan(const PSimHit & p1, const PSimHit & p2)
-  {
-    return p1.pabs() < p2.pabs();
-  }
-}
+  bool SimHitPabsLessThan(const PSimHit &p1, const PSimHit &p2) { return p1.pabs() < p2.pabs(); }
+}  // namespace CSCSegmentValidationUtils
 
-
-const PSimHit * CSCSegmentValidation::keyHit(int chamberId) const
-{
-  const PSimHit * result = nullptr;
+const PSimHit *CSCSegmentValidation::keyHit(int chamberId) const {
+  const PSimHit *result = nullptr;
   int layerId = chamberId + 3;
-  const edm::PSimHitContainer & layerHits = theSimHitMap->hits(layerId);
+  const edm::PSimHitContainer &layerHits = theSimHitMap->hits(layerId);
 
-  if(!layerHits.empty())
-  {
+  if (!layerHits.empty()) {
     // pick the hit with maximum energy
-    edm::PSimHitContainer::const_iterator hitItr = std::max_element(layerHits.begin(), layerHits.end(),
-                                                    CSCSegmentValidationUtils::SimHitPabsLessThan);
+    edm::PSimHitContainer::const_iterator hitItr =
+        std::max_element(layerHits.begin(), layerHits.end(), CSCSegmentValidationUtils::SimHitPabsLessThan);
     result = &(*hitItr);
   }
   return result;
-}   
+}
diff --git a/Validation/CSCRecHits/src/CSCSegmentValidation.h b/Validation/CSCRecHits/src/CSCSegmentValidation.h
index e1bfaf062ef75..e2e1a5ead57eb 100644
--- a/Validation/CSCRecHits/src/CSCSegmentValidation.h
+++ b/Validation/CSCRecHits/src/CSCSegmentValidation.h
@@ -1,71 +1,67 @@
 #ifndef CSCSegmentValidation_h
 #define CSCSegmentValidation_h
 
-#include "Validation/MuonCSCDigis/interface/CSCBaseValidation.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/CSCRecHit/interface/CSCSegment.h"
 #include "DataFormats/CSCRecHit/interface/CSCSegmentCollection.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "Geometry/CSCGeometry/interface/CSCLayer.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
+#include "Validation/MuonCSCDigis/interface/CSCBaseValidation.h"
 
-class CSCSegmentValidation : public CSCBaseValidation
-{
+class CSCSegmentValidation : public CSCBaseValidation {
 public:
-  CSCSegmentValidation(const edm::InputTag & inputTag,
-                       edm::ConsumesCollector && iC);
+  CSCSegmentValidation(const edm::InputTag &inputTag, edm::ConsumesCollector &&iC);
   ~CSCSegmentValidation() override;
   void bookHistograms(DQMStore::IBooker &);
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
- private:
-  void plotResolution(const PSimHit & simHit, const CSCSegment & recHit,
-                      const CSCLayer * layer, int chamberType);
+private:
+  void plotResolution(const PSimHit &simHit, const CSCSegment &recHit, const CSCLayer *layer, int chamberType);
 
   bool hasSegment(int chamberId) const;
   static int whatChamberType(int detId);
 
   edm::EDGetTokenT<CSCSegmentCollection> segments_Token_;
 
-  // map to count how many layers are hit.  First index is chamber detId, second is layers
-  // that have hits
-  typedef std::map<int, std::vector<int> > ChamberHitMap;
+  // map to count how many layers are hit.  First index is chamber detId, second
+  // is layers that have hits
+  typedef std::map<int, std::vector<int>> ChamberHitMap;
   ChamberHitMap theLayerHitsPerChamber;
   void fillLayerHitsPerChamber();
   void fillEfficiencyPlots();
   // decide which SimHit to use for the direction
-  const PSimHit * keyHit(int chamberId) const;
+  const PSimHit *keyHit(int chamberId) const;
 
-  typedef std::map<int, std::vector<CSCSegment> > ChamberSegmentMap;
+  typedef std::map<int, std::vector<CSCSegment>> ChamberSegmentMap;
   ChamberSegmentMap theChamberSegmentMap;
   // the number of hits in a chamber to make it a shower
   int theShowerThreshold;
 
-  MonitorElement* theNPerEventPlot;
-  MonitorElement* theNRecHitsPlot;
-  MonitorElement* theNPerChamberTypePlot;
-  MonitorElement* theRdPhiResolutionPlots[10];
-  MonitorElement* theRdPhiPullPlots[10];
-  MonitorElement* theThetaResolutionPlots[10];
-  MonitorElement* theThetaPullPlots[10];
-  MonitorElement* thedXdZResolutionPlots[10];
-  MonitorElement* thedXdZPullPlots[10];
-  MonitorElement* thedYdZResolutionPlots[10];
-  MonitorElement* thedYdZPullPlots[10];
+  MonitorElement *theNPerEventPlot;
+  MonitorElement *theNRecHitsPlot;
+  MonitorElement *theNPerChamberTypePlot;
+  MonitorElement *theRdPhiResolutionPlots[10];
+  MonitorElement *theRdPhiPullPlots[10];
+  MonitorElement *theThetaResolutionPlots[10];
+  MonitorElement *theThetaPullPlots[10];
+  MonitorElement *thedXdZResolutionPlots[10];
+  MonitorElement *thedXdZPullPlots[10];
+  MonitorElement *thedYdZResolutionPlots[10];
+  MonitorElement *thedYdZPullPlots[10];
 
-  MonitorElement* theTypePlot4HitsNoShower;
-  MonitorElement* theTypePlot4HitsNoShowerSeg;
-  MonitorElement* theTypePlot4HitsShower;
-  MonitorElement* theTypePlot4HitsShowerSeg;
-  MonitorElement* theTypePlot5HitsNoShower;
-  MonitorElement* theTypePlot5HitsNoShowerSeg;
-  MonitorElement* theTypePlot5HitsShower;
-  MonitorElement* theTypePlot5HitsShowerSeg;
-  MonitorElement* theTypePlot6HitsNoShower;
-  MonitorElement* theTypePlot6HitsNoShowerSeg;
-  MonitorElement* theTypePlot6HitsShower;
-  MonitorElement* theTypePlot6HitsShowerSeg;
+  MonitorElement *theTypePlot4HitsNoShower;
+  MonitorElement *theTypePlot4HitsNoShowerSeg;
+  MonitorElement *theTypePlot4HitsShower;
+  MonitorElement *theTypePlot4HitsShowerSeg;
+  MonitorElement *theTypePlot5HitsNoShower;
+  MonitorElement *theTypePlot5HitsNoShowerSeg;
+  MonitorElement *theTypePlot5HitsShower;
+  MonitorElement *theTypePlot5HitsShowerSeg;
+  MonitorElement *theTypePlot6HitsNoShower;
+  MonitorElement *theTypePlot6HitsNoShowerSeg;
+  MonitorElement *theTypePlot6HitsShower;
+  MonitorElement *theTypePlot6HitsShowerSeg;
 };
 
 #endif
-
diff --git a/Validation/CTPPS/test/year_2016/beam_smearing_validation/test_beam_smearing_cfg.py b/Validation/CTPPS/test/year_2016/beam_smearing_validation/test_beam_smearing_cfg.py
index 3b7d651922bd3..fdaa7fc709cde 100644
--- a/Validation/CTPPS/test/year_2016/beam_smearing_validation/test_beam_smearing_cfg.py
+++ b/Validation/CTPPS/test/year_2016/beam_smearing_validation/test_beam_smearing_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process('CTPPSTestBeamSmearing', eras.ctpps_2016)
+from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
+process = cms.Process('CTPPSTestBeamSmearing', ctpps_2016)
 
 # minimal logger settings
 process.MessageLogger = cms.Service("MessageLogger",
diff --git a/Validation/CTPPS/test/year_2016/direct_simulation_validation/test_acceptance_cfg.py b/Validation/CTPPS/test/year_2016/direct_simulation_validation/test_acceptance_cfg.py
index 3f3de6e596435..1407ff0c03f72 100644
--- a/Validation/CTPPS/test/year_2016/direct_simulation_validation/test_acceptance_cfg.py
+++ b/Validation/CTPPS/test/year_2016/direct_simulation_validation/test_acceptance_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process('CTPPSTestAcceptance', eras.ctpps_2016)
+from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
+process = cms.Process('CTPPSTestAcceptance', ctpps_2016)
 
 # minimal logger settings
 process.MessageLogger = cms.Service("MessageLogger",
diff --git a/Validation/CTPPS/test/year_2016/direct_simulation_validation/test_smearing_effects_cfg.py b/Validation/CTPPS/test/year_2016/direct_simulation_validation/test_smearing_effects_cfg.py
index 318e0360450ca..229237c26c949 100644
--- a/Validation/CTPPS/test/year_2016/direct_simulation_validation/test_smearing_effects_cfg.py
+++ b/Validation/CTPPS/test/year_2016/direct_simulation_validation/test_smearing_effects_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process('CTPPSTestAcceptance', eras.ctpps_2016)
+from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
+process = cms.Process('CTPPSTestAcceptance', ctpps_2016)
 
 # minimal logger settings
 process.MessageLogger = cms.Service("MessageLogger",
diff --git a/Validation/CTPPS/test/year_2016/direct_simulation_validation/test_xy_pattern_cfg.py b/Validation/CTPPS/test/year_2016/direct_simulation_validation/test_xy_pattern_cfg.py
index 56deec1684b90..68226949c068b 100644
--- a/Validation/CTPPS/test/year_2016/direct_simulation_validation/test_xy_pattern_cfg.py
+++ b/Validation/CTPPS/test/year_2016/direct_simulation_validation/test_xy_pattern_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process('CTPPSFastSimulation', eras.ctpps_2016)
+from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
+process = cms.Process('CTPPSFastSimulation', ctpps_2016)
 
 # minimal logger settings
 process.MessageLogger = cms.Service("MessageLogger",
diff --git a/Validation/CTPPS/test/year_2016/proton_gun_validation/test_proton_gun_cfg.py b/Validation/CTPPS/test/year_2016/proton_gun_validation/test_proton_gun_cfg.py
index 53f998bd52e0e..b3f4bef7da47c 100644
--- a/Validation/CTPPS/test/year_2016/proton_gun_validation/test_proton_gun_cfg.py
+++ b/Validation/CTPPS/test/year_2016/proton_gun_validation/test_proton_gun_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process('CTPPSFastSimulation', eras.ctpps_2016)
+from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
+process = cms.Process('CTPPSFastSimulation', ctpps_2016)
 
 # minimal logger settings
 process.MessageLogger = cms.Service("MessageLogger",
diff --git a/Validation/CTPPS/test/year_2016/proton_reconstruction_LHC_data/test_reconstruction_cfg.py b/Validation/CTPPS/test/year_2016/proton_reconstruction_LHC_data/test_reconstruction_cfg.py
index bc011305742b7..dc767010735a6 100644
--- a/Validation/CTPPS/test/year_2016/proton_reconstruction_LHC_data/test_reconstruction_cfg.py
+++ b/Validation/CTPPS/test/year_2016/proton_reconstruction_LHC_data/test_reconstruction_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("CTPPSTestProtonReconstruction", eras.ctpps_2016)
+from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
+process = cms.Process("CTPPSTestProtonReconstruction", ctpps_2016)
 
 # declare global tag
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
diff --git a/Validation/CTPPS/test/year_2016/proton_reconstruction_MC/misalignment/template_cfg.py b/Validation/CTPPS/test/year_2016/proton_reconstruction_MC/misalignment/template_cfg.py
index 5a8940d93e4ae..05e71c7cb1bfe 100644
--- a/Validation/CTPPS/test/year_2016/proton_reconstruction_MC/misalignment/template_cfg.py
+++ b/Validation/CTPPS/test/year_2016/proton_reconstruction_MC/misalignment/template_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process('CTPPSProtonReconstructionTest', eras.ctpps_2016)
+from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
+process = cms.Process('CTPPSProtonReconstructionTest', ctpps_2016)
 
 # minimal logger settings
 process.MessageLogger = cms.Service("MessageLogger",
diff --git a/Validation/CTPPS/test/year_2016/proton_reconstruction_MC/resolution/template_cfg.py b/Validation/CTPPS/test/year_2016/proton_reconstruction_MC/resolution/template_cfg.py
index 5071bff810342..b1eb8fe0d2eb5 100644
--- a/Validation/CTPPS/test/year_2016/proton_reconstruction_MC/resolution/template_cfg.py
+++ b/Validation/CTPPS/test/year_2016/proton_reconstruction_MC/resolution/template_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process('CTPPSProtonReconstructionTest', eras.ctpps_2016)
+from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
+process = cms.Process('CTPPSProtonReconstructionTest', ctpps_2016)
 
 # minimal logger settings
 process.MessageLogger = cms.Service("MessageLogger",
diff --git a/Validation/CaloTowers/test/CaloScan/template_2017.py b/Validation/CaloTowers/test/CaloScan/template_2017.py
index 9cce44822a912..034a0bbae400a 100644
--- a/Validation/CaloTowers/test/CaloScan/template_2017.py
+++ b/Validation/CaloTowers/test/CaloScan/template_2017.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('TEST',eras.Run2_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process('TEST',Run2_2017)
 
 ### RANDOM setting (change last digit(s) to make runs different !)
 process.load("Configuration.StandardSequences.SimulationRandomNumberGeneratorSeeds_cff")
diff --git a/Validation/CaloTowers/test/CaloScan/template_2018_since_1010pre2.py b/Validation/CaloTowers/test/CaloScan/template_2018_since_1010pre2.py
index 407e0b6236863..e1a22e8cfe273 100644
--- a/Validation/CaloTowers/test/CaloScan/template_2018_since_1010pre2.py
+++ b/Validation/CaloTowers/test/CaloScan/template_2018_since_1010pre2.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
-process = cms.Process('TEST',eras.Run2_2018)
+from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
+process = cms.Process('TEST',Run2_2018)
 
 ### RANDOM setting (change last digit(s) to make runs different !)
 process.load("Configuration.StandardSequences.SimulationRandomNumberGeneratorSeeds_cff")
diff --git a/Validation/DTRecHits/interface/DTHitQualityUtils.h b/Validation/DTRecHits/interface/DTHitQualityUtils.h
index 712d5cbe6b5b8..55c4c9425d657 100644
--- a/Validation/DTRecHits/interface/DTHitQualityUtils.h
+++ b/Validation/DTRecHits/interface/DTHitQualityUtils.h
@@ -2,21 +2,21 @@
 #define Validation_DTRecHits_DTHitQualityUtils_h
 
 /** \class DTHitQualityUtils
- *  
- *  Define some basic tools and utilities for 1D DT Rec Hit and 
+ *
+ *  Define some basic tools and utilities for 1D DT Rec Hit and
  *  2D, 4D DT Segment analysis
  *
  *  \author S. Bolognesi and G. Cerminara - INFN Torino
  */
 
-#include "DataFormats/GeometryVector/interface/LocalVector.h"
-#include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "DataFormats/DetId/interface/DetId.h"
+#include "DataFormats/GeometryVector/interface/LocalPoint.h"
+#include "DataFormats/GeometryVector/interface/LocalVector.h"
 #include "DataFormats/MuonDetId/interface/DTWireId.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-#include <map>
 #include <atomic>
+#include <map>
 
 class PSimHit;
 class DTGeometry;
@@ -24,27 +24,33 @@ class DTGeometry;
 namespace DTHitQualityUtils {
 
   /// Operations
-  /// Create a map between the SimHits in a chamber and the corrisponding MuBarWireId
-  std::map<DTWireId, edm::PSimHitContainer > mapSimHitsPerWire(const edm::PSimHitContainer& simhits) ;
+  /// Create a map between the SimHits in a chamber and the corrisponding
+  /// MuBarWireId
+  std::map<DTWireId, edm::PSimHitContainer> mapSimHitsPerWire(const edm::PSimHitContainer &simhits);
   /// Create a map between the Mu SimHits and corresponding MuBarWireId ;
-  std::map<DTWireId, const PSimHit*> mapMuSimHitsPerWire(const std::map<DTWireId, edm::PSimHitContainer>& simHitWireMap) ;
+  std::map<DTWireId, const PSimHit *> mapMuSimHitsPerWire(
+      const std::map<DTWireId, edm::PSimHitContainer> &simHitWireMap);
   /// Select the SimHit from a muon in a vector of SimHits
-  const PSimHit* findMuSimHit(const edm::PSimHitContainer& hits); 
-  /// Find Innermost and outermost SimHit from Mu in a SL (they identify a simulated segment)
-  std::pair<const PSimHit*, const PSimHit*> findMuSimSegment(const std::map<DTWireId, const PSimHit*>& mapWireAndMuSimHit) ;
-  /// Find direction and position of a segment (in local RF) from outer and inner mu SimHit in the RF of object Det
-  std::pair<LocalVector, LocalPoint> findMuSimSegmentDirAndPos(const std::pair<const PSimHit*, const PSimHit*>& inAndOutSimHit, 
-								      const DetId detId, const DTGeometry *muonGeom);
+  const PSimHit *findMuSimHit(const edm::PSimHitContainer &hits);
+  /// Find Innermost and outermost SimHit from Mu in a SL (they identify a
+  /// simulated segment)
+  std::pair<const PSimHit *, const PSimHit *> findMuSimSegment(
+      const std::map<DTWireId, const PSimHit *> &mapWireAndMuSimHit);
+  /// Find direction and position of a segment (in local RF) from outer and inner
+  /// mu SimHit in the RF of object Det
+  std::pair<LocalVector, LocalPoint> findMuSimSegmentDirAndPos(
+      const std::pair<const PSimHit *, const PSimHit *> &inAndOutSimHit, const DetId detId, const DTGeometry *muonGeom);
   /// Find the angles from a segment direction:
   /// atan(dx/dz) = "phi"   angle in the chamber RF
-  /// atan(dy/dz) = "theta" angle in the chamber RF (note: this has opposite sign in the SLZ RF!)
-  std::pair<double, double> findSegmentAlphaAndBeta(const LocalVector& direction);
+  /// atan(dy/dz) = "theta" angle in the chamber RF (note: this has opposite sign
+  /// in the SLZ RF!)
+  std::pair<double, double> findSegmentAlphaAndBeta(const LocalVector &direction);
 
   // Set the verbosity level
-  extern std::atomic<bool> debug; 
+  extern std::atomic<bool> debug;
 
-  //Find angle error
+  // Find angle error
   double sigmaAngle(double Angle, double sigma2TanAngle);
 
-}
+}  // namespace DTHitQualityUtils
 #endif
diff --git a/Validation/DTRecHits/interface/utils.h b/Validation/DTRecHits/interface/utils.h
index 18e8909de61f1..a3c45fead1edc 100644
--- a/Validation/DTRecHits/interface/utils.h
+++ b/Validation/DTRecHits/interface/utils.h
@@ -1,22 +1,22 @@
 #ifndef utils_h
 #define utils_h
+#include "TFile.h"
 #include "TH1F.h"
 #include "TH2F.h"
-#include "TFile.h"
-#include "TString.h"
 #include "TMath.h"
+#include "TString.h"
 #include "TStyle.h"
 class Tutils {
- public:
-  void drawGFit(TH1 * h1, float nsigmas, float min, float max);
-  void drawGFit(TH1 * h1, float min, float max);
-  void drawGFit(TH1 * h1, float min, float max, float minfit, float maxfit);
+public:
+  void drawGFit(TH1 *h1, float nsigmas, float min, float max);
+  void drawGFit(TH1 *h1, float min, float max);
+  void drawGFit(TH1 *h1, float min, float max, float minfit, float maxfit);
   void setStyle(TH1 *histo);
   void setStyle(TH2 *histo);
-  void plotAndProfileX (TH2* h2, float min, float max, bool profile=false);
- private:
-  TStyle * getStyle(const TString& name);
-  TStyle * mystyle;
-  
+  void plotAndProfileX(TH2 *h2, float min, float max, bool profile = false);
+
+private:
+  TStyle *getStyle(const TString &name);
+  TStyle *mystyle;
 };
 #endif
diff --git a/Validation/DTRecHits/plugins/DT2DSegmentClients.cc b/Validation/DTRecHits/plugins/DT2DSegmentClients.cc
index 625da36025011..e380532391adc 100644
--- a/Validation/DTRecHits/plugins/DT2DSegmentClients.cc
+++ b/Validation/DTRecHits/plugins/DT2DSegmentClients.cc
@@ -9,22 +9,18 @@
 using namespace std;
 using namespace edm;
 
-DT2DSegmentClients::DT2DSegmentClients(edm::ParameterSet const& pset)
-{
-  do2D_    = pset.getUntrackedParameter<bool>("do2D", false);
+DT2DSegmentClients::DT2DSegmentClients(edm::ParameterSet const &pset) {
+  do2D_ = pset.getUntrackedParameter<bool>("do2D", false);
   doSLPhi_ = pset.getUntrackedParameter<bool>("doSLPhi", false);
 }
 
-DT2DSegmentClients::~DT2DSegmentClients()
-{
-}
+DT2DSegmentClients::~DT2DSegmentClients() {}
 
-void DT2DSegmentClients::dqmEndJob(DQMStore::IBooker & booker, DQMStore::IGetter & getter)
-{
-  MonitorElement * hResPos    = getter.get("DT/2DSegments/Res/2D_SuperPhi_hResPos");
-  MonitorElement * hResAngle  = getter.get("DT/2DSegments/Res/2D_SuperPhi_hResAngle");
-  MonitorElement * hPullPos   = getter.get("DT/2DSegments/Pull/2D_SuperPhi_hPullPos");
-  MonitorElement * hPullAngle = getter.get("DT/2DSegments/Pull/2D_SuperPhi_hPullAngle");
+void DT2DSegmentClients::dqmEndJob(DQMStore::IBooker &booker, DQMStore::IGetter &getter) {
+  MonitorElement *hResPos = getter.get("DT/2DSegments/Res/2D_SuperPhi_hResPos");
+  MonitorElement *hResAngle = getter.get("DT/2DSegments/Res/2D_SuperPhi_hResAngle");
+  MonitorElement *hPullPos = getter.get("DT/2DSegments/Pull/2D_SuperPhi_hPullPos");
+  MonitorElement *hPullAngle = getter.get("DT/2DSegments/Pull/2D_SuperPhi_hPullAngle");
 
   Tutils util;
   util.drawGFit(hResPos->getTH1(), -0.1, 0.1, -0.1, 0.1);
@@ -33,14 +29,14 @@ void DT2DSegmentClients::dqmEndJob(DQMStore::IBooker & booker, DQMStore::IGetter
   util.drawGFit(hPullAngle->getTH1(), -5, 5, -5, 5);
 
   if (do2D_) {
-    HEff2DHitHarvest hEff_RPhi("RPhi", booker, getter);  
-    HEff2DHitHarvest hEff_RZ("RZ", booker, getter);    
-    HEff2DHitHarvest hEff_RZ_W0("RZ_W0", booker, getter); 
-    HEff2DHitHarvest hEff_RZ_W1("RZ_W1", booker, getter); 
-    HEff2DHitHarvest hEff_RZ_W2("RZ_W2", booker, getter); 
+    HEff2DHitHarvest hEff_RPhi("RPhi", booker, getter);
+    HEff2DHitHarvest hEff_RZ("RZ", booker, getter);
+    HEff2DHitHarvest hEff_RZ_W0("RZ_W0", booker, getter);
+    HEff2DHitHarvest hEff_RZ_W1("RZ_W1", booker, getter);
+    HEff2DHitHarvest hEff_RZ_W2("RZ_W2", booker, getter);
   }
   if (doSLPhi_) {
-    HEff2DHitHarvest hEff_SuperPhi("SuperPhi", booker, getter);  
+    HEff2DHitHarvest hEff_SuperPhi("SuperPhi", booker, getter);
   }
 }
 
diff --git a/Validation/DTRecHits/plugins/DT2DSegmentClients.h b/Validation/DTRecHits/plugins/DT2DSegmentClients.h
index 4fc3b598108d1..a84534ac67820 100644
--- a/Validation/DTRecHits/plugins/DT2DSegmentClients.h
+++ b/Validation/DTRecHits/plugins/DT2DSegmentClients.h
@@ -6,17 +6,16 @@
  *  DQM Client to check the data integrity
  *
  *  \author S. Bolognesi - INFN TO
- *   
+ *
  */
 
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class DT2DSegmentClients: public DQMEDHarvester {
-
-public: 
+class DT2DSegmentClients : public DQMEDHarvester {
+public:
   /// Constructor
-  DT2DSegmentClients(const edm::ParameterSet& ps);
+  DT2DSegmentClients(const edm::ParameterSet &ps);
 
   /// Destructor
   ~DT2DSegmentClients() override;
@@ -28,7 +27,6 @@ class DT2DSegmentClients: public DQMEDHarvester {
 private:
   bool do2D_;
   bool doSLPhi_;
-
 };
 
-#endif // Validation_DTRecHits_DT2DSegmentClients_h
+#endif  // Validation_DTRecHits_DT2DSegmentClients_h
diff --git a/Validation/DTRecHits/plugins/DT4DSegmentClients.cc b/Validation/DTRecHits/plugins/DT4DSegmentClients.cc
index ab6bace29f95a..892a184c9e059 100644
--- a/Validation/DTRecHits/plugins/DT4DSegmentClients.cc
+++ b/Validation/DTRecHits/plugins/DT4DSegmentClients.cc
@@ -12,138 +12,132 @@
 using namespace std;
 using namespace edm;
 
-DT4DSegmentClients::DT4DSegmentClients(edm::ParameterSet const& pset)
-{
+DT4DSegmentClients::DT4DSegmentClients(edm::ParameterSet const &pset) {
   doall_ = pset.getUntrackedParameter<bool>("doall", false);
 }
 
-DT4DSegmentClients::~DT4DSegmentClients()
-{
-}
+DT4DSegmentClients::~DT4DSegmentClients() {}
+
+void DT4DSegmentClients::dqmEndJob(DQMStore::IBooker &booker, DQMStore::IGetter &getter) {
+  MonitorElement *hResAlpha = getter.get("DT/4DSegments/Res/4D_All_hResAlpha");
+  MonitorElement *hResBeta = getter.get("DT/4DSegments/Res/4D_All_hResBeta");
+  MonitorElement *hResX = getter.get("DT/4DSegments/Res/4D_All_hResX");
+  MonitorElement *hResY = getter.get("DT/4DSegments/Res/4D_All_hResY");
+  MonitorElement *hResBetaRZ = getter.get("DT/4DSegments/Res/4D_All_hResBetaRZ");
+  MonitorElement *hResYRZ = getter.get("DT/4DSegments/Res/4D_All_hResYRZ");
+
+  MonitorElement *hResAlpha_W0 = getter.get("DT/4DSegments/Res/4D_W0_hResAlpha");
+  MonitorElement *hResBeta_W0 = getter.get("DT/4DSegments/Res/4D_W0_hResBeta");
+  MonitorElement *hResX_W0 = getter.get("DT/4DSegments/Res/4D_W0_hResX");
+  MonitorElement *hResY_W0 = getter.get("DT/4DSegments/Res/4D_W0_hResY");
+  MonitorElement *hResBetaRZ_W0 = getter.get("DT/4DSegments/Res/4D_W0_hResBetaRZ");
+  MonitorElement *hResYRZ_W0 = getter.get("DT/4DSegments/Res/4D_W0_hResYRZ");
+
+  MonitorElement *hResAlpha_W1 = getter.get("DT/4DSegments/Res/4D_W1_hResAlpha");
+  MonitorElement *hResBeta_W1 = getter.get("DT/4DSegments/Res/4D_W1_hResBeta");
+  MonitorElement *hResX_W1 = getter.get("DT/4DSegments/Res/4D_W1_hResX");
+  MonitorElement *hResY_W1 = getter.get("DT/4DSegments/Res/4D_W1_hResY");
+  MonitorElement *hResBetaRZ_W1 = getter.get("DT/4DSegments/Res/4D_W1_hResBetaRZ");
+  MonitorElement *hResYRZ_W1 = getter.get("DT/4DSegments/Res/4D_W1_hResYRZ");
+
+  MonitorElement *hResAlpha_W2 = getter.get("DT/4DSegments/Res/4D_W2_hResAlpha");
+  MonitorElement *hResBeta_W2 = getter.get("DT/4DSegments/Res/4D_W2_hResBeta");
+  MonitorElement *hResX_W2 = getter.get("DT/4DSegments/Res/4D_W2_hResX");
+  MonitorElement *hResY_W2 = getter.get("DT/4DSegments/Res/4D_W2_hResY");
+  MonitorElement *hResBetaRZ_W2 = getter.get("DT/4DSegments/Res/4D_W2_hResBetaRZ");
+  MonitorElement *hResYRZ_W2 = getter.get("DT/4DSegments/Res/4D_W2_hResYRZ");
+
+  MonitorElement *hPullAlpha = getter.get("DT/4DSegments/Pull/4D_All_hPullAlpha");
+  MonitorElement *hPullBeta = getter.get("DT/4DSegments/Pull/4D_All_hPullBeta");
+  MonitorElement *hPullX = getter.get("DT/4DSegments/Pull/4D_All_hPullX");
+  MonitorElement *hPullY = getter.get("DT/4DSegments/Pull/4D_All_hPullY");
+  MonitorElement *hPullBetaRZ = getter.get("DT/4DSegments/Pull/4D_All_hPullBetaRZ");
+  MonitorElement *hPullYRZ = getter.get("DT/4DSegments/Pull/4D_All_hPullYRZ");
+
+  MonitorElement *hPullAlpha_W0 = getter.get("DT/4DSegments/Pull/4D_W0_hPullAlpha");
+  MonitorElement *hPullBeta_W0 = getter.get("DT/4DSegments/Pull/4D_W0_hPullBeta");
+  MonitorElement *hPullX_W0 = getter.get("DT/4DSegments/Pull/4D_W0_hPullX");
+  MonitorElement *hPullY_W0 = getter.get("DT/4DSegments/Pull/4D_W0_hPullY");
+  MonitorElement *hPullBetaRZ_W0 = getter.get("DT/4DSegments/Pull/4D_W0_hPullBetaRZ");
+  MonitorElement *hPullYRZ_W0 = getter.get("DT/4DSegments/Pull/4D_W0_hPullYRZ");
+
+  MonitorElement *hPullAlpha_W1 = getter.get("DT/4DSegments/Pull/4D_W1_hPullAlpha");
+  MonitorElement *hPullBeta_W1 = getter.get("DT/4DSegments/Pull/4D_W1_hPullBeta");
+  MonitorElement *hPullX_W1 = getter.get("DT/4DSegments/Pull/4D_W1_hPullX");
+  MonitorElement *hPullY_W1 = getter.get("DT/4DSegments/Pull/4D_W1_hPullY");
+  MonitorElement *hPullBetaRZ_W1 = getter.get("DT/4DSegments/Pull/4D_W1_hPullBetaRZ");
+  MonitorElement *hPullYRZ_W1 = getter.get("DT/4DSegments/Pull/4D_W1_hPullYRZ");
+
+  MonitorElement *hPullAlpha_W2 = getter.get("DT/4DSegments/Pull/4D_W2_hPullAlpha");
+  MonitorElement *hPullBeta_W2 = getter.get("DT/4DSegments/Pull/4D_W2_hPullBeta");
+  MonitorElement *hPullX_W2 = getter.get("DT/4DSegments/Pull/4D_W2_hPullX");
+  MonitorElement *hPullY_W2 = getter.get("DT/4DSegments/Pull/4D_W2_hPullY");
+  MonitorElement *hPullBetaRZ_W2 = getter.get("DT/4DSegments/Pull/4D_W2_hPullBetaRZ");
+  MonitorElement *hPullYRZ_W2 = getter.get("DT/4DSegments/Pull/4D_W2_hPullYRZ");
 
-void DT4DSegmentClients::dqmEndJob(DQMStore::IBooker & booker, DQMStore::IGetter & getter)
-{
-
-  MonitorElement * hResAlpha = getter.get("DT/4DSegments/Res/4D_All_hResAlpha");
-  MonitorElement * hResBeta = getter.get("DT/4DSegments/Res/4D_All_hResBeta");
-  MonitorElement * hResX = getter.get("DT/4DSegments/Res/4D_All_hResX");
-  MonitorElement * hResY = getter.get("DT/4DSegments/Res/4D_All_hResY");
-  MonitorElement * hResBetaRZ = getter.get("DT/4DSegments/Res/4D_All_hResBetaRZ");
-  MonitorElement * hResYRZ = getter.get("DT/4DSegments/Res/4D_All_hResYRZ");
-
-  MonitorElement * hResAlpha_W0 = getter.get("DT/4DSegments/Res/4D_W0_hResAlpha");
-  MonitorElement * hResBeta_W0 = getter.get("DT/4DSegments/Res/4D_W0_hResBeta");
-  MonitorElement * hResX_W0 = getter.get("DT/4DSegments/Res/4D_W0_hResX");
-  MonitorElement * hResY_W0 = getter.get("DT/4DSegments/Res/4D_W0_hResY");
-  MonitorElement * hResBetaRZ_W0 = getter.get("DT/4DSegments/Res/4D_W0_hResBetaRZ");
-  MonitorElement * hResYRZ_W0 = getter.get("DT/4DSegments/Res/4D_W0_hResYRZ");
-
-  MonitorElement * hResAlpha_W1 = getter.get("DT/4DSegments/Res/4D_W1_hResAlpha");
-  MonitorElement * hResBeta_W1 = getter.get("DT/4DSegments/Res/4D_W1_hResBeta");
-  MonitorElement * hResX_W1 = getter.get("DT/4DSegments/Res/4D_W1_hResX");
-  MonitorElement * hResY_W1 = getter.get("DT/4DSegments/Res/4D_W1_hResY");
-  MonitorElement * hResBetaRZ_W1 = getter.get("DT/4DSegments/Res/4D_W1_hResBetaRZ");
-  MonitorElement * hResYRZ_W1 = getter.get("DT/4DSegments/Res/4D_W1_hResYRZ");
-
-  MonitorElement * hResAlpha_W2 = getter.get("DT/4DSegments/Res/4D_W2_hResAlpha");
-  MonitorElement * hResBeta_W2 = getter.get("DT/4DSegments/Res/4D_W2_hResBeta");
-  MonitorElement * hResX_W2 = getter.get("DT/4DSegments/Res/4D_W2_hResX");
-  MonitorElement * hResY_W2 = getter.get("DT/4DSegments/Res/4D_W2_hResY");
-  MonitorElement * hResBetaRZ_W2 = getter.get("DT/4DSegments/Res/4D_W2_hResBetaRZ");
-  MonitorElement * hResYRZ_W2 = getter.get("DT/4DSegments/Res/4D_W2_hResYRZ");
-
-  MonitorElement * hPullAlpha = getter.get("DT/4DSegments/Pull/4D_All_hPullAlpha");
-  MonitorElement * hPullBeta = getter.get("DT/4DSegments/Pull/4D_All_hPullBeta");
-  MonitorElement * hPullX = getter.get("DT/4DSegments/Pull/4D_All_hPullX");
-  MonitorElement * hPullY = getter.get("DT/4DSegments/Pull/4D_All_hPullY");
-  MonitorElement * hPullBetaRZ = getter.get("DT/4DSegments/Pull/4D_All_hPullBetaRZ");
-  MonitorElement * hPullYRZ = getter.get("DT/4DSegments/Pull/4D_All_hPullYRZ");
-
-  MonitorElement * hPullAlpha_W0 = getter.get("DT/4DSegments/Pull/4D_W0_hPullAlpha");
-  MonitorElement * hPullBeta_W0 = getter.get("DT/4DSegments/Pull/4D_W0_hPullBeta");
-  MonitorElement * hPullX_W0 = getter.get("DT/4DSegments/Pull/4D_W0_hPullX");
-  MonitorElement * hPullY_W0 = getter.get("DT/4DSegments/Pull/4D_W0_hPullY");
-  MonitorElement * hPullBetaRZ_W0 = getter.get("DT/4DSegments/Pull/4D_W0_hPullBetaRZ");
-  MonitorElement * hPullYRZ_W0 = getter.get("DT/4DSegments/Pull/4D_W0_hPullYRZ");
-
-  MonitorElement * hPullAlpha_W1 = getter.get("DT/4DSegments/Pull/4D_W1_hPullAlpha");
-  MonitorElement * hPullBeta_W1 = getter.get("DT/4DSegments/Pull/4D_W1_hPullBeta");
-  MonitorElement * hPullX_W1 = getter.get("DT/4DSegments/Pull/4D_W1_hPullX");
-  MonitorElement * hPullY_W1 = getter.get("DT/4DSegments/Pull/4D_W1_hPullY");
-  MonitorElement * hPullBetaRZ_W1 = getter.get("DT/4DSegments/Pull/4D_W1_hPullBetaRZ");
-  MonitorElement * hPullYRZ_W1 = getter.get("DT/4DSegments/Pull/4D_W1_hPullYRZ");
-
-  MonitorElement * hPullAlpha_W2 = getter.get("DT/4DSegments/Pull/4D_W2_hPullAlpha");
-  MonitorElement * hPullBeta_W2 = getter.get("DT/4DSegments/Pull/4D_W2_hPullBeta");
-  MonitorElement * hPullX_W2 = getter.get("DT/4DSegments/Pull/4D_W2_hPullX");
-  MonitorElement * hPullY_W2 = getter.get("DT/4DSegments/Pull/4D_W2_hPullY");
-  MonitorElement * hPullBetaRZ_W2 = getter.get("DT/4DSegments/Pull/4D_W2_hPullBetaRZ");
-  MonitorElement * hPullYRZ_W2 = getter.get("DT/4DSegments/Pull/4D_W2_hPullYRZ");
-  
   Tutils util;
-  util.drawGFit(hResAlpha->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResBeta->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResX->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResY->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResBetaRZ->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResYRZ->getTH1(),-0.2,0.2,-0.1,0.1);
-
-  util.drawGFit(hResAlpha_W0->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResBeta_W0->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResX_W0->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResY_W0->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResBetaRZ_W0->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResYRZ_W0->getTH1(),-0.2,0.2,-0.1,0.1);
-
-  util.drawGFit(hResAlpha_W1->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResBeta_W1->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResX_W1->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResY_W1->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResBetaRZ_W1->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResYRZ_W1->getTH1(),-0.2,0.2,-0.1,0.1);
-
-  util.drawGFit(hResAlpha_W2->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResBeta_W2->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResX_W2->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResY_W2->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResBetaRZ_W2->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hResYRZ_W2->getTH1(),-0.2,0.2,-0.1,0.1);
-
-  util.drawGFit(hPullAlpha->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullBeta->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullX->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullY->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullBetaRZ->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullYRZ->getTH1(),-0.2,0.2,-0.1,0.1);
-
-  util.drawGFit(hPullAlpha_W0->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullBeta_W0->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullX_W0->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullY_W0->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullBetaRZ_W0->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullYRZ_W0->getTH1(),-0.2,0.2,-0.1,0.1);
-
-  util.drawGFit(hPullAlpha_W1->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullBeta_W1->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullX_W1->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullY_W1->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullBetaRZ_W1->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullYRZ_W1->getTH1(),-0.2,0.2,-0.1,0.1);
-
-  util.drawGFit(hPullAlpha_W2->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullBeta_W2->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullX_W2->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullY_W2->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullBetaRZ_W2->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hPullYRZ_W2->getTH1(),-0.2,0.2,-0.1,0.1);
+  util.drawGFit(hResAlpha->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResBeta->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResX->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResY->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResBetaRZ->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResYRZ->getTH1(), -0.2, 0.2, -0.1, 0.1);
+
+  util.drawGFit(hResAlpha_W0->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResBeta_W0->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResX_W0->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResY_W0->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResBetaRZ_W0->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResYRZ_W0->getTH1(), -0.2, 0.2, -0.1, 0.1);
+
+  util.drawGFit(hResAlpha_W1->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResBeta_W1->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResX_W1->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResY_W1->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResBetaRZ_W1->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResYRZ_W1->getTH1(), -0.2, 0.2, -0.1, 0.1);
+
+  util.drawGFit(hResAlpha_W2->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResBeta_W2->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResX_W2->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResY_W2->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResBetaRZ_W2->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hResYRZ_W2->getTH1(), -0.2, 0.2, -0.1, 0.1);
+
+  util.drawGFit(hPullAlpha->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullBeta->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullX->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullY->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullBetaRZ->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullYRZ->getTH1(), -0.2, 0.2, -0.1, 0.1);
+
+  util.drawGFit(hPullAlpha_W0->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullBeta_W0->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullX_W0->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullY_W0->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullBetaRZ_W0->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullYRZ_W0->getTH1(), -0.2, 0.2, -0.1, 0.1);
+
+  util.drawGFit(hPullAlpha_W1->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullBeta_W1->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullX_W1->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullY_W1->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullBetaRZ_W1->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullYRZ_W1->getTH1(), -0.2, 0.2, -0.1, 0.1);
+
+  util.drawGFit(hPullAlpha_W2->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullBeta_W2->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullX_W2->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullY_W2->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullBetaRZ_W2->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hPullYRZ_W2->getTH1(), -0.2, 0.2, -0.1, 0.1);
 
   if (doall_) {
-    HEff4DHitHarvest hEff_S3RPhi("All", booker, getter);  
-    HEff4DHitHarvest hEff_S3RZ_W0("W0", booker, getter); 
-    HEff4DHitHarvest hEff_S3RZ_W1("W1", booker, getter); 
-    HEff4DHitHarvest hEff_S3RZ_W2("W2", booker, getter); 
+    HEff4DHitHarvest hEff_S3RPhi("All", booker, getter);
+    HEff4DHitHarvest hEff_S3RZ_W0("W0", booker, getter);
+    HEff4DHitHarvest hEff_S3RZ_W1("W1", booker, getter);
+    HEff4DHitHarvest hEff_S3RZ_W2("W2", booker, getter);
   }
-
 }
 
 // declare this as a framework plugin
diff --git a/Validation/DTRecHits/plugins/DT4DSegmentClients.h b/Validation/DTRecHits/plugins/DT4DSegmentClients.h
index caf6a9ef42677..32fd378cc0506 100644
--- a/Validation/DTRecHits/plugins/DT4DSegmentClients.h
+++ b/Validation/DTRecHits/plugins/DT4DSegmentClients.h
@@ -6,17 +6,16 @@
  *  DQM Client to check the data integrity
  *
  *  \author S. Bolognesi - INFN TO
- *   
+ *
  */
 
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class DT4DSegmentClients: public DQMEDHarvester {
-
+class DT4DSegmentClients : public DQMEDHarvester {
 public:
   /// Constructor
-  DT4DSegmentClients(const edm::ParameterSet& ps);
+  DT4DSegmentClients(const edm::ParameterSet &ps);
   /// Destructor
   ~DT4DSegmentClients() override;
 
@@ -26,7 +25,6 @@ class DT4DSegmentClients: public DQMEDHarvester {
 
 private:
   bool doall_;
-
 };
 
-#endif // Validation_DTRecHits_DT4DSegmentClients_h
+#endif  // Validation_DTRecHits_DT4DSegmentClients_h
diff --git a/Validation/DTRecHits/plugins/DTRecHitClients.cc b/Validation/DTRecHits/plugins/DTRecHitClients.cc
index 50ba029a60071..57c514a6dadcd 100644
--- a/Validation/DTRecHits/plugins/DTRecHitClients.cc
+++ b/Validation/DTRecHits/plugins/DTRecHitClients.cc
@@ -9,8 +9,7 @@
 using namespace std;
 using namespace edm;
 
-DTRecHitClients::DTRecHitClients(edm::ParameterSet const& pset)
-{
+DTRecHitClients::DTRecHitClients(edm::ParameterSet const &pset) {
   // Switches for analysis at various steps
   doStep1_ = pset.getUntrackedParameter<bool>("doStep1", false);
   doStep2_ = pset.getUntrackedParameter<bool>("doStep2", false);
@@ -19,58 +18,55 @@ DTRecHitClients::DTRecHitClients(edm::ParameterSet const& pset)
   local_ = pset.getUntrackedParameter<bool>("local", true);
 }
 
-DTRecHitClients::~DTRecHitClients()
-{
-}
+DTRecHitClients::~DTRecHitClients() {}
 
-void DTRecHitClients::dqmEndJob(DQMStore::IBooker & booker, DQMStore::IGetter & getter)
-{
-  MonitorElement * hRes_S3RPhi = getter.get("DT/1DRecHits/Res/1D_S3RPhi_hRes");
-  MonitorElement * hRes_S3RZ = getter.get("DT/1DRecHits/Res/1D_S3RZ_hRes");
-  MonitorElement * hRes_S3RZ_W0 = getter.get("DT/1DRecHits/Res/1D_S3RZ_W0_hRes");
-  MonitorElement * hRes_S3RZ_W1 = getter.get("DT/1DRecHits/Res/1D_S3RZ_W1_hRes");
-  MonitorElement * hRes_S3RZ_W2 = getter.get("DT/1DRecHits/Res/1D_S3RZ_W2_hRes");
+void DTRecHitClients::dqmEndJob(DQMStore::IBooker &booker, DQMStore::IGetter &getter) {
+  MonitorElement *hRes_S3RPhi = getter.get("DT/1DRecHits/Res/1D_S3RPhi_hRes");
+  MonitorElement *hRes_S3RZ = getter.get("DT/1DRecHits/Res/1D_S3RZ_hRes");
+  MonitorElement *hRes_S3RZ_W0 = getter.get("DT/1DRecHits/Res/1D_S3RZ_W0_hRes");
+  MonitorElement *hRes_S3RZ_W1 = getter.get("DT/1DRecHits/Res/1D_S3RZ_W1_hRes");
+  MonitorElement *hRes_S3RZ_W2 = getter.get("DT/1DRecHits/Res/1D_S3RZ_W2_hRes");
 
-  MonitorElement * hPull_S3RPhi = getter.get("DT/1DRecHits/Pull/1D_S3RPhi_hPull");
-  MonitorElement * hPull_S3RZ = getter.get("DT/1DRecHits/Pull/1D_S3RZ_hPull");
-  MonitorElement * hPull_S3RZ_W0 = getter.get("DT/1DRecHits/Pull/1D_S3RZ_W0_hPull");
-  MonitorElement * hPull_S3RZ_W1 = getter.get("DT/1DRecHits/Pull/1D_S3RZ_W1_hPull");
-  MonitorElement * hPull_S3RZ_W2 = getter.get("DT/1DRecHits/Pull/1D_S3RZ_W2_hPull");
+  MonitorElement *hPull_S3RPhi = getter.get("DT/1DRecHits/Pull/1D_S3RPhi_hPull");
+  MonitorElement *hPull_S3RZ = getter.get("DT/1DRecHits/Pull/1D_S3RZ_hPull");
+  MonitorElement *hPull_S3RZ_W0 = getter.get("DT/1DRecHits/Pull/1D_S3RZ_W0_hPull");
+  MonitorElement *hPull_S3RZ_W1 = getter.get("DT/1DRecHits/Pull/1D_S3RZ_W1_hPull");
+  MonitorElement *hPull_S3RZ_W2 = getter.get("DT/1DRecHits/Pull/1D_S3RZ_W2_hPull");
 
   Tutils util;
-  util.drawGFit(hRes_S3RPhi->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hRes_S3RZ->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hRes_S3RZ_W0->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hRes_S3RZ_W1->getTH1(),-0.2,0.2,-0.1,0.1);
-  util.drawGFit(hRes_S3RZ_W2->getTH1(),-0.2,0.2,-0.1,0.1);
+  util.drawGFit(hRes_S3RPhi->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hRes_S3RZ->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hRes_S3RZ_W0->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hRes_S3RZ_W1->getTH1(), -0.2, 0.2, -0.1, 0.1);
+  util.drawGFit(hRes_S3RZ_W2->getTH1(), -0.2, 0.2, -0.1, 0.1);
 
-  util.drawGFit(hPull_S3RPhi->getTH1(),-5,5,-5,5);
-  util.drawGFit(hPull_S3RZ->getTH1(),-5,5,-5,5);
-  util.drawGFit(hPull_S3RZ_W0->getTH1(),-5,5,-5,5);
-  util.drawGFit(hPull_S3RZ_W1->getTH1(),-5,5,-5,5);
-  util.drawGFit(hPull_S3RZ_W2->getTH1(),-5,5,-5,5);
+  util.drawGFit(hPull_S3RPhi->getTH1(), -5, 5, -5, 5);
+  util.drawGFit(hPull_S3RZ->getTH1(), -5, 5, -5, 5);
+  util.drawGFit(hPull_S3RZ_W0->getTH1(), -5, 5, -5, 5);
+  util.drawGFit(hPull_S3RZ_W1->getTH1(), -5, 5, -5, 5);
+  util.drawGFit(hPull_S3RZ_W2->getTH1(), -5, 5, -5, 5);
 
   if (doall_) {
-    HEff1DHitHarvest hEff_S3RPhi("S3RPhi", booker, getter);  
-    HEff1DHitHarvest hEff_S3RZ("S3RZ", booker, getter);    
-    HEff1DHitHarvest hEff_S3RZ_W0("S3RZ_W0", booker, getter); 
-    HEff1DHitHarvest hEff_S3RZ_W1("S3RZ_W1", booker, getter); 
-    HEff1DHitHarvest hEff_S3RZ_W2("S3RZ_W2", booker, getter); 
+    HEff1DHitHarvest hEff_S3RPhi("S3RPhi", booker, getter);
+    HEff1DHitHarvest hEff_S3RZ("S3RZ", booker, getter);
+    HEff1DHitHarvest hEff_S3RZ_W0("S3RZ_W0", booker, getter);
+    HEff1DHitHarvest hEff_S3RZ_W1("S3RZ_W1", booker, getter);
+    HEff1DHitHarvest hEff_S3RZ_W2("S3RZ_W2", booker, getter);
 
     if (doStep1_) {
-      HEff1DHitHarvest hEff_S1RPhi("S1RPhi", booker, getter); 
-      HEff1DHitHarvest hEff_S1RZ("S1RZ", booker, getter);   
+      HEff1DHitHarvest hEff_S1RPhi("S1RPhi", booker, getter);
+      HEff1DHitHarvest hEff_S1RZ("S1RZ", booker, getter);
       HEff1DHitHarvest hEff_S1RZ_W0("S1RZ_W0", booker, getter);
       HEff1DHitHarvest hEff_S1RZ_W1("S1RZ_W1", booker, getter);
       HEff1DHitHarvest hEff_S1RZ_W2("S1RZ_W2", booker, getter);
     }
 
     if (doStep2_) {
-      HEff1DHitHarvest hEff_S2RPhi("S2RPhi", booker, getter); 
+      HEff1DHitHarvest hEff_S2RPhi("S2RPhi", booker, getter);
       HEff1DHitHarvest hEff_S2RZ_W0("S2RZ_W0", booker, getter);
       HEff1DHitHarvest hEff_S2RZ_W1("S2RZ_W1", booker, getter);
       HEff1DHitHarvest hEff_S2RZ_W2("S2RZ_W2", booker, getter);
-      HEff1DHitHarvest hEff_S2RZ("S2RZ", booker, getter);   
+      HEff1DHitHarvest hEff_S2RZ("S2RZ", booker, getter);
     }
   }
 
@@ -79,13 +75,13 @@ void DTRecHitClients::dqmEndJob(DQMStore::IBooker & booker, DQMStore::IGetter &
     TString name1 = "RPhi_W";
     TString name2 = "RZ_W";
     for (long w = 0; w <= 2; ++w) {
-      for (long s = 1;s <= 4; ++s) {
-	HEff1DHitHarvest hEff_S1RPhiWS(("S1"+name1+w+"_St"+s).Data(), booker, getter);
-	HEff1DHitHarvest hEff_S3RPhiWS(("S3"+name1+w+"_St"+s).Data(), booker, getter);
-	if (s != 4) {
-	  HEff1DHitHarvest hEff_S1RZWS(("S1"+name2+w+"_St"+s).Data(), booker, getter);
-	  HEff1DHitHarvest hEff_S3RZWS(("S3"+name2+w+"_St"+s).Data(), booker, getter);
-	}
+      for (long s = 1; s <= 4; ++s) {
+        HEff1DHitHarvest hEff_S1RPhiWS(("S1" + name1 + w + "_St" + s).Data(), booker, getter);
+        HEff1DHitHarvest hEff_S3RPhiWS(("S3" + name1 + w + "_St" + s).Data(), booker, getter);
+        if (s != 4) {
+          HEff1DHitHarvest hEff_S1RZWS(("S1" + name2 + w + "_St" + s).Data(), booker, getter);
+          HEff1DHitHarvest hEff_S3RZWS(("S3" + name2 + w + "_St" + s).Data(), booker, getter);
+        }
       }
     }
   }
diff --git a/Validation/DTRecHits/plugins/DTRecHitClients.h b/Validation/DTRecHits/plugins/DTRecHitClients.h
index 8c24c1ca02bd1..ec908f1e9c4c0 100644
--- a/Validation/DTRecHits/plugins/DTRecHitClients.h
+++ b/Validation/DTRecHits/plugins/DTRecHitClients.h
@@ -6,17 +6,16 @@
  *  DQM Client to check the data integrity
  *
  *  \author S. Bolognesi - INFN TO
- *   
+ *
  */
 
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-class DTRecHitClients: public DQMEDHarvester {
-
+class DTRecHitClients : public DQMEDHarvester {
 public:
   /// Constructor
-  DTRecHitClients(const edm::ParameterSet& ps);
+  DTRecHitClients(const edm::ParameterSet &ps);
   /// Destructor
   ~DTRecHitClients() override;
 
@@ -31,7 +30,6 @@ class DTRecHitClients: public DQMEDHarvester {
   bool doStep3_;
   bool local_;
   bool doall_;
-
 };
 
-#endif // Validation_DTRecHits_DTRecHitClients_h
+#endif  // Validation_DTRecHits_DTRecHitClients_h
diff --git a/Validation/DTRecHits/plugins/DTRecHitQuality.cc b/Validation/DTRecHits/plugins/DTRecHitQuality.cc
index 614f16cbf7cdd..d48de735e8177 100644
--- a/Validation/DTRecHits/plugins/DTRecHitQuality.cc
+++ b/Validation/DTRecHits/plugins/DTRecHitQuality.cc
@@ -22,55 +22,55 @@ using namespace std;
 using namespace edm;
 
 namespace dtrechit {
-struct Histograms{
-  std::unique_ptr<HRes1DHit> hRes_S1RPhi;           // RecHits, 1. step, RPh
-  std::unique_ptr<HRes1DHit> hRes_S2RPhi;           // RecHits, 2. step, RPhi
-  std::unique_ptr<HRes1DHit> hRes_S3RPhi;           // RecHits, 3. step, RPhi
-  std::unique_ptr<HRes1DHit> hRes_S1RZ;             // RecHits, 1. step, RZ
-  std::unique_ptr<HRes1DHit> hRes_S2RZ;             // RecHits, 2. step, RZ
-  std::unique_ptr<HRes1DHit> hRes_S3RZ;             // RecHits, 3. step, RZ
-  std::unique_ptr<HRes1DHit> hRes_S1RZ_W0;          // RecHits, 1. step, RZ, wheel 0
-  std::unique_ptr<HRes1DHit> hRes_S2RZ_W0;          // RecHits, 2. step, RZ, wheel 0
-  std::unique_ptr<HRes1DHit> hRes_S3RZ_W0;          // RecHits, 3. step, RZ, wheel 0
-  std::unique_ptr<HRes1DHit> hRes_S1RZ_W1;          // RecHits, 1. step, RZ, wheel +-1
-  std::unique_ptr<HRes1DHit> hRes_S2RZ_W1;          // RecHits, 2. step, RZ, wheel +-1
-  std::unique_ptr<HRes1DHit> hRes_S3RZ_W1;          // RecHits, 3. step, RZ, wheel +-1
-  std::unique_ptr<HRes1DHit> hRes_S1RZ_W2;          // RecHits, 1. step, RZ, wheel +-2
-  std::unique_ptr<HRes1DHit> hRes_S2RZ_W2;          // RecHits, 2. step, RZ, wheel +-2
-  std::unique_ptr<HRes1DHit> hRes_S3RZ_W2;          // RecHits, 3. step, RZ, wheel +-2
-  std::unique_ptr<HRes1DHit> hRes_S1RPhi_W0;        // RecHits, 1. step, RPhi, wheel 0
-  std::unique_ptr<HRes1DHit> hRes_S2RPhi_W0;        // RecHits, 2. step, RPhi, wheel 0
-  std::unique_ptr<HRes1DHit> hRes_S3RPhi_W0;        // RecHits, 3. step, RPhi, wheel 0
-  std::unique_ptr<HRes1DHit> hRes_S1RPhi_W1;        // RecHits, 1. step, RPhi, wheel +-1
-  std::unique_ptr<HRes1DHit> hRes_S2RPhi_W1;        // RecHits, 2. step, RPhi, wheel +-1
-  std::unique_ptr<HRes1DHit> hRes_S3RPhi_W1;        // RecHits, 3. step, RPhi, wheel +-1
-  std::unique_ptr<HRes1DHit> hRes_S1RPhi_W2;        // RecHits, 1. step, RPhi, wheel +-2
-  std::unique_ptr<HRes1DHit> hRes_S2RPhi_W2;        // RecHits, 2. step, RPhi, wheel +-2
-  std::unique_ptr<HRes1DHit> hRes_S3RPhi_W2;        // RecHits, 3. step, RPhi, wheel +-2
-  std::unique_ptr<HRes1DHit> hRes_S3RPhiWS[3][4];   // RecHits, 3. step, by wheel/station
-  std::unique_ptr<HRes1DHit> hRes_S3RZWS[3][4];     // RecHits, 3. step, by wheel/station
-  
-  std::unique_ptr<HEff1DHit> hEff_S1RPhi;           // RecHits, 1. step, RPhi
-  std::unique_ptr<HEff1DHit> hEff_S2RPhi;           // RecHits, 2. step, RPhi
-  std::unique_ptr<HEff1DHit> hEff_S3RPhi;           // RecHits, 3. step, RPhi
-  std::unique_ptr<HEff1DHit> hEff_S1RZ;             // RecHits, 1. step, RZ
-  std::unique_ptr<HEff1DHit> hEff_S2RZ;             // RecHits, 2. step, RZ
-  std::unique_ptr<HEff1DHit> hEff_S3RZ;             // RecHits, 3. step, RZ
-  std::unique_ptr<HEff1DHit> hEff_S1RZ_W0;          // RecHits, 1. step, RZ, wheel 0
-  std::unique_ptr<HEff1DHit> hEff_S2RZ_W0;          // RecHits, 2. step, RZ, wheel 0
-  std::unique_ptr<HEff1DHit> hEff_S3RZ_W0;          // RecHits, 3. step, RZ, wheel 0
-  std::unique_ptr<HEff1DHit> hEff_S1RZ_W1;          // RecHits, 1. step, RZ, wheel +-1
-  std::unique_ptr<HEff1DHit> hEff_S2RZ_W1;          // RecHits, 2. step, RZ, wheel +-1
-  std::unique_ptr<HEff1DHit> hEff_S3RZ_W1;          // RecHits, 3. step, RZ, wheel +-1
-  std::unique_ptr<HEff1DHit> hEff_S1RZ_W2;          // RecHits, 1. step, RZ, wheel +-2
-  std::unique_ptr<HEff1DHit> hEff_S2RZ_W2;          // RecHits, 2. step, RZ, wheel +-2
-  std::unique_ptr<HEff1DHit> hEff_S3RZ_W2;          // RecHits, 3. step, RZ, wheel +-2
-  std::unique_ptr<HEff1DHit> hEff_S1RPhiWS[3][4];   // RecHits, 3. step, by wheel/station
-  std::unique_ptr<HEff1DHit> hEff_S3RPhiWS[3][4];   // RecHits, 3. step, by wheel/station
-  std::unique_ptr<HEff1DHit> hEff_S1RZWS[3][4];     // RecHits, 3. step, by wheel/station
-  std::unique_ptr<HEff1DHit> hEff_S3RZWS[3][4];     // RecHits, 3. step, by wheel/station
-};
-}
+  struct Histograms {
+    std::unique_ptr<HRes1DHit> hRes_S1RPhi;          // RecHits, 1. step, RPh
+    std::unique_ptr<HRes1DHit> hRes_S2RPhi;          // RecHits, 2. step, RPhi
+    std::unique_ptr<HRes1DHit> hRes_S3RPhi;          // RecHits, 3. step, RPhi
+    std::unique_ptr<HRes1DHit> hRes_S1RZ;            // RecHits, 1. step, RZ
+    std::unique_ptr<HRes1DHit> hRes_S2RZ;            // RecHits, 2. step, RZ
+    std::unique_ptr<HRes1DHit> hRes_S3RZ;            // RecHits, 3. step, RZ
+    std::unique_ptr<HRes1DHit> hRes_S1RZ_W0;         // RecHits, 1. step, RZ, wheel 0
+    std::unique_ptr<HRes1DHit> hRes_S2RZ_W0;         // RecHits, 2. step, RZ, wheel 0
+    std::unique_ptr<HRes1DHit> hRes_S3RZ_W0;         // RecHits, 3. step, RZ, wheel 0
+    std::unique_ptr<HRes1DHit> hRes_S1RZ_W1;         // RecHits, 1. step, RZ, wheel +-1
+    std::unique_ptr<HRes1DHit> hRes_S2RZ_W1;         // RecHits, 2. step, RZ, wheel +-1
+    std::unique_ptr<HRes1DHit> hRes_S3RZ_W1;         // RecHits, 3. step, RZ, wheel +-1
+    std::unique_ptr<HRes1DHit> hRes_S1RZ_W2;         // RecHits, 1. step, RZ, wheel +-2
+    std::unique_ptr<HRes1DHit> hRes_S2RZ_W2;         // RecHits, 2. step, RZ, wheel +-2
+    std::unique_ptr<HRes1DHit> hRes_S3RZ_W2;         // RecHits, 3. step, RZ, wheel +-2
+    std::unique_ptr<HRes1DHit> hRes_S1RPhi_W0;       // RecHits, 1. step, RPhi, wheel 0
+    std::unique_ptr<HRes1DHit> hRes_S2RPhi_W0;       // RecHits, 2. step, RPhi, wheel 0
+    std::unique_ptr<HRes1DHit> hRes_S3RPhi_W0;       // RecHits, 3. step, RPhi, wheel 0
+    std::unique_ptr<HRes1DHit> hRes_S1RPhi_W1;       // RecHits, 1. step, RPhi, wheel +-1
+    std::unique_ptr<HRes1DHit> hRes_S2RPhi_W1;       // RecHits, 2. step, RPhi, wheel +-1
+    std::unique_ptr<HRes1DHit> hRes_S3RPhi_W1;       // RecHits, 3. step, RPhi, wheel +-1
+    std::unique_ptr<HRes1DHit> hRes_S1RPhi_W2;       // RecHits, 1. step, RPhi, wheel +-2
+    std::unique_ptr<HRes1DHit> hRes_S2RPhi_W2;       // RecHits, 2. step, RPhi, wheel +-2
+    std::unique_ptr<HRes1DHit> hRes_S3RPhi_W2;       // RecHits, 3. step, RPhi, wheel +-2
+    std::unique_ptr<HRes1DHit> hRes_S3RPhiWS[3][4];  // RecHits, 3. step, by wheel/station
+    std::unique_ptr<HRes1DHit> hRes_S3RZWS[3][4];    // RecHits, 3. step, by wheel/station
+
+    std::unique_ptr<HEff1DHit> hEff_S1RPhi;          // RecHits, 1. step, RPhi
+    std::unique_ptr<HEff1DHit> hEff_S2RPhi;          // RecHits, 2. step, RPhi
+    std::unique_ptr<HEff1DHit> hEff_S3RPhi;          // RecHits, 3. step, RPhi
+    std::unique_ptr<HEff1DHit> hEff_S1RZ;            // RecHits, 1. step, RZ
+    std::unique_ptr<HEff1DHit> hEff_S2RZ;            // RecHits, 2. step, RZ
+    std::unique_ptr<HEff1DHit> hEff_S3RZ;            // RecHits, 3. step, RZ
+    std::unique_ptr<HEff1DHit> hEff_S1RZ_W0;         // RecHits, 1. step, RZ, wheel 0
+    std::unique_ptr<HEff1DHit> hEff_S2RZ_W0;         // RecHits, 2. step, RZ, wheel 0
+    std::unique_ptr<HEff1DHit> hEff_S3RZ_W0;         // RecHits, 3. step, RZ, wheel 0
+    std::unique_ptr<HEff1DHit> hEff_S1RZ_W1;         // RecHits, 1. step, RZ, wheel +-1
+    std::unique_ptr<HEff1DHit> hEff_S2RZ_W1;         // RecHits, 2. step, RZ, wheel +-1
+    std::unique_ptr<HEff1DHit> hEff_S3RZ_W1;         // RecHits, 3. step, RZ, wheel +-1
+    std::unique_ptr<HEff1DHit> hEff_S1RZ_W2;         // RecHits, 1. step, RZ, wheel +-2
+    std::unique_ptr<HEff1DHit> hEff_S2RZ_W2;         // RecHits, 2. step, RZ, wheel +-2
+    std::unique_ptr<HEff1DHit> hEff_S3RZ_W2;         // RecHits, 3. step, RZ, wheel +-2
+    std::unique_ptr<HEff1DHit> hEff_S1RPhiWS[3][4];  // RecHits, 3. step, by wheel/station
+    std::unique_ptr<HEff1DHit> hEff_S3RPhiWS[3][4];  // RecHits, 3. step, by wheel/station
+    std::unique_ptr<HEff1DHit> hEff_S1RZWS[3][4];    // RecHits, 3. step, by wheel/station
+    std::unique_ptr<HEff1DHit> hEff_S3RZWS[3][4];    // RecHits, 3. step, by wheel/station
+  };
+}  // namespace dtrechit
 
 using namespace dtrechit;
 
@@ -85,7 +85,7 @@ namespace {
 }
 
 // Constructor
-DTRecHitQuality::DTRecHitQuality(const ParameterSet& pset) {
+DTRecHitQuality::DTRecHitQuality(const ParameterSet &pset) {
   // Get the debug parameter for verbose output
   debug_ = pset.getUntrackedParameter<bool>("debug");
   // the name of the simhit collection
@@ -108,81 +108,114 @@ DTRecHitQuality::DTRecHitQuality(const ParameterSet& pset) {
   local_ = pset.getUntrackedParameter<bool>("local", true);
 }
 
-void DTRecHitQuality::bookHistograms(DQMStore::ConcurrentBooker & booker, edm::Run const& run, edm::EventSetup const& setup, Histograms & histograms) const {
+void DTRecHitQuality::bookHistograms(DQMStore::ConcurrentBooker &booker,
+                                     edm::Run const &run,
+                                     edm::EventSetup const &setup,
+                                     Histograms &histograms) const {
   if (doall_ && doStep1_) {
-    histograms.hRes_S1RPhi    = std::make_unique<HRes1DHit>("S1RPhi", booker, true, local_);      // RecHits, 1. step, RPhi
-    histograms.hRes_S1RPhi_W0 = std::make_unique<HRes1DHit>("S1RPhi_W0", booker, true, local_);   // RecHits, 1. step, RZ, wheel 0
-    histograms.hRes_S1RPhi_W1 = std::make_unique<HRes1DHit>("S1RPhi_W1", booker, true, local_);   // RecHits, 1. step, RZ, wheel +-1
-    histograms.hRes_S1RPhi_W2 = std::make_unique<HRes1DHit>("S1RPhi_W2", booker, true, local_);   // RecHits, 1. step, RZ, wheel +-2
-    histograms.hRes_S1RZ      = std::make_unique<HRes1DHit>("S1RZ", booker, true, local_);        // RecHits, 1. step, RZ
-    histograms.hRes_S1RZ_W0   = std::make_unique<HRes1DHit>("S1RZ_W0", booker, true, local_);     // RecHits, 1. step, RZ, wheel 0
-    histograms.hRes_S1RZ_W1   = std::make_unique<HRes1DHit>("S1RZ_W1", booker, true, local_);     // RecHits, 1. step, RZ, wheel +-1
-    histograms.hRes_S1RZ_W2   = std::make_unique<HRes1DHit>("S1RZ_W2", booker, true, local_);     // RecHits, 1. step, RZ, wheel +-2
-    histograms.hEff_S1RPhi    = std::make_unique<HEff1DHit>("S1RPhi", booker);                    // RecHits, 1. step, RPhi
-    histograms.hEff_S1RZ      = std::make_unique<HEff1DHit>("S1RZ", booker);                      // RecHits, 1. step, RZ
-    histograms.hEff_S1RZ_W0   = std::make_unique<HEff1DHit>("S1RZ_W0", booker);                   // RecHits, 1. step, RZ, wheel 0
-    histograms.hEff_S1RZ_W1   = std::make_unique<HEff1DHit>("S1RZ_W1", booker);                   // RecHits, 1. step, RZ, wheel +-1
-    histograms.hEff_S1RZ_W2   = std::make_unique<HEff1DHit>("S1RZ_W2", booker);                   // RecHits, 1. step, RZ, wheel +-2
+    histograms.hRes_S1RPhi = std::make_unique<HRes1DHit>("S1RPhi", booker, true, local_);  // RecHits, 1. step, RPhi
+    histograms.hRes_S1RPhi_W0 =
+        std::make_unique<HRes1DHit>("S1RPhi_W0", booker, true, local_);  // RecHits, 1. step, RZ, wheel 0
+    histograms.hRes_S1RPhi_W1 =
+        std::make_unique<HRes1DHit>("S1RPhi_W1", booker, true, local_);  // RecHits, 1. step, RZ, wheel +-1
+    histograms.hRes_S1RPhi_W2 =
+        std::make_unique<HRes1DHit>("S1RPhi_W2", booker, true, local_);  // RecHits, 1. step, RZ, wheel +-2
+    histograms.hRes_S1RZ = std::make_unique<HRes1DHit>("S1RZ", booker, true, local_);  // RecHits, 1. step, RZ
+    histograms.hRes_S1RZ_W0 =
+        std::make_unique<HRes1DHit>("S1RZ_W0", booker, true, local_);  // RecHits, 1. step, RZ, wheel 0
+    histograms.hRes_S1RZ_W1 =
+        std::make_unique<HRes1DHit>("S1RZ_W1", booker, true, local_);  // RecHits, 1. step, RZ, wheel +-1
+    histograms.hRes_S1RZ_W2 =
+        std::make_unique<HRes1DHit>("S1RZ_W2", booker, true, local_);          // RecHits, 1. step, RZ, wheel +-2
+    histograms.hEff_S1RPhi = std::make_unique<HEff1DHit>("S1RPhi", booker);    // RecHits, 1. step, RPhi
+    histograms.hEff_S1RZ = std::make_unique<HEff1DHit>("S1RZ", booker);        // RecHits, 1. step, RZ
+    histograms.hEff_S1RZ_W0 = std::make_unique<HEff1DHit>("S1RZ_W0", booker);  // RecHits, 1. step, RZ, wheel 0
+    histograms.hEff_S1RZ_W1 = std::make_unique<HEff1DHit>("S1RZ_W1", booker);  // RecHits, 1. step, RZ, wheel +-1
+    histograms.hEff_S1RZ_W2 = std::make_unique<HEff1DHit>("S1RZ_W2", booker);  // RecHits, 1. step, RZ, wheel +-2
   }
   if (doall_ && doStep2_) {
-    histograms.hRes_S2RPhi    = std::make_unique<HRes1DHit>("S2RPhi", booker, true, local_);      // RecHits, 2. step, RPhi
-    histograms.hRes_S2RPhi_W0 = std::make_unique<HRes1DHit>("S2RPhi_W0", booker, true, local_);   // RecHits, 2. step, RPhi, wheel 0
-    histograms.hRes_S2RPhi_W1 = std::make_unique<HRes1DHit>("S2RPhi_W1", booker, true, local_);   // RecHits, 2. step, RPhi, wheel +-1
-    histograms.hRes_S2RPhi_W2 = std::make_unique<HRes1DHit>("S2RPhi_W2", booker, true, local_);   // RecHits, 2. step, RPhi, wheel +-2
-    histograms.hRes_S2RZ      = std::make_unique<HRes1DHit>("S2RZ", booker, true, local_);        // RecHits, 2. step, RZ
-    histograms.hRes_S2RZ_W0   = std::make_unique<HRes1DHit>("S2RZ_W0", booker, true, local_);     // RecHits, 2. step, RZ, wheel 0
-    histograms.hRes_S2RZ_W1   = std::make_unique<HRes1DHit>("S2RZ_W1", booker, true, local_);     // RecHits, 2. step, RZ, wheel +-1
-    histograms.hRes_S2RZ_W2   = std::make_unique<HRes1DHit>("S2RZ_W2", booker, true, local_);     // RecHits, 2. step, RZ, wheel +-2
-    histograms.hEff_S2RPhi    = std::make_unique<HEff1DHit>("S2RPhi", booker);                    // RecHits, 2. step, RPhi
-    histograms.hEff_S2RZ_W0   = std::make_unique<HEff1DHit>("S2RZ_W0", booker);                   // RecHits, 2. step, RZ, wheel 0
-    histograms.hEff_S2RZ_W1   = std::make_unique<HEff1DHit>("S2RZ_W1", booker);                   // RecHits, 2. step, RZ, wheel +-1
-    histograms.hEff_S2RZ_W2   = std::make_unique<HEff1DHit>("S2RZ_W2", booker);                   // RecHits, 2. step, RZ, wheel +-2
-    histograms.hEff_S2RZ      = std::make_unique<HEff1DHit>("S2RZ", booker);                      // RecHits, 2. step, RZ
+    histograms.hRes_S2RPhi = std::make_unique<HRes1DHit>("S2RPhi", booker, true, local_);  // RecHits, 2. step, RPhi
+    histograms.hRes_S2RPhi_W0 =
+        std::make_unique<HRes1DHit>("S2RPhi_W0", booker, true, local_);  // RecHits, 2. step, RPhi, wheel 0
+    histograms.hRes_S2RPhi_W1 =
+        std::make_unique<HRes1DHit>("S2RPhi_W1", booker, true, local_);  // RecHits, 2. step, RPhi, wheel +-1
+    histograms.hRes_S2RPhi_W2 =
+        std::make_unique<HRes1DHit>("S2RPhi_W2", booker, true, local_);  // RecHits, 2. step, RPhi, wheel +-2
+    histograms.hRes_S2RZ = std::make_unique<HRes1DHit>("S2RZ", booker, true, local_);  // RecHits, 2. step, RZ
+    histograms.hRes_S2RZ_W0 =
+        std::make_unique<HRes1DHit>("S2RZ_W0", booker, true, local_);  // RecHits, 2. step, RZ, wheel 0
+    histograms.hRes_S2RZ_W1 =
+        std::make_unique<HRes1DHit>("S2RZ_W1", booker, true, local_);  // RecHits, 2. step, RZ, wheel +-1
+    histograms.hRes_S2RZ_W2 =
+        std::make_unique<HRes1DHit>("S2RZ_W2", booker, true, local_);          // RecHits, 2. step, RZ, wheel +-2
+    histograms.hEff_S2RPhi = std::make_unique<HEff1DHit>("S2RPhi", booker);    // RecHits, 2. step, RPhi
+    histograms.hEff_S2RZ_W0 = std::make_unique<HEff1DHit>("S2RZ_W0", booker);  // RecHits, 2. step, RZ, wheel 0
+    histograms.hEff_S2RZ_W1 = std::make_unique<HEff1DHit>("S2RZ_W1", booker);  // RecHits, 2. step, RZ, wheel +-1
+    histograms.hEff_S2RZ_W2 = std::make_unique<HEff1DHit>("S2RZ_W2", booker);  // RecHits, 2. step, RZ, wheel +-2
+    histograms.hEff_S2RZ = std::make_unique<HEff1DHit>("S2RZ", booker);        // RecHits, 2. step, RZ
   }
   if (doStep3_) {
-    histograms.hRes_S3RPhi    = std::make_unique<HRes1DHit>("S3RPhi", booker, doall_, local_);    // RecHits, 3. step, RPhi
-    histograms.hRes_S3RPhi_W0 = std::make_unique<HRes1DHit>("S3RPhi_W0", booker, doall_, local_); // RecHits, 3. step, RPhi, wheel 0
-    histograms.hRes_S3RPhi_W1 = std::make_unique<HRes1DHit>("S3RPhi_W1", booker, doall_, local_); // RecHits, 3. step, RPhi, wheel +-1
-    histograms.hRes_S3RPhi_W2 = std::make_unique<HRes1DHit>("S3RPhi_W2", booker, doall_, local_); // RecHits, 3. step, RPhi, wheel +-2
-    histograms.hRes_S3RZ      = std::make_unique<HRes1DHit>("S3RZ", booker, doall_, local_);      // RecHits, 3. step, RZ
-    histograms.hRes_S3RZ_W0   = std::make_unique<HRes1DHit>("S3RZ_W0", booker, doall_, local_);   // RecHits, 3. step, RZ, wheel 0
-    histograms.hRes_S3RZ_W1   = std::make_unique<HRes1DHit>("S3RZ_W1", booker, doall_, local_);   // RecHits, 3. step, RZ, wheel +-1
-    histograms.hRes_S3RZ_W2   = std::make_unique<HRes1DHit>("S3RZ_W2", booker, doall_, local_);   // RecHits, 3. step, RZ, wheel +-2
+    histograms.hRes_S3RPhi = std::make_unique<HRes1DHit>("S3RPhi", booker, doall_, local_);  // RecHits, 3. step, RPhi
+    histograms.hRes_S3RPhi_W0 =
+        std::make_unique<HRes1DHit>("S3RPhi_W0", booker, doall_, local_);  // RecHits, 3. step, RPhi, wheel 0
+    histograms.hRes_S3RPhi_W1 = std::make_unique<HRes1DHit>("S3RPhi_W1",
+                                                            booker,
+                                                            doall_,
+                                                            local_);  // RecHits, 3. step, RPhi, wheel +-1
+    histograms.hRes_S3RPhi_W2 = std::make_unique<HRes1DHit>("S3RPhi_W2",
+                                                            booker,
+                                                            doall_,
+                                                            local_);  // RecHits, 3. step, RPhi, wheel +-2
+    histograms.hRes_S3RZ = std::make_unique<HRes1DHit>("S3RZ", booker, doall_, local_);  // RecHits, 3. step, RZ
+    histograms.hRes_S3RZ_W0 =
+        std::make_unique<HRes1DHit>("S3RZ_W0", booker, doall_, local_);  // RecHits, 3. step, RZ, wheel 0
+    histograms.hRes_S3RZ_W1 =
+        std::make_unique<HRes1DHit>("S3RZ_W1", booker, doall_, local_);  // RecHits, 3. step, RZ, wheel +-1
+    histograms.hRes_S3RZ_W2 =
+        std::make_unique<HRes1DHit>("S3RZ_W2", booker, doall_, local_);  // RecHits, 3. step, RZ, wheel +-2
 
     if (local_) {
       // Plots with finer granularity, not to be included in DQM
       TString name1 = "RPhi_W";
       TString name2 = "RZ_W";
       for (long w = 0; w <= 2; ++w) {
-        for (long s = 1;s <= 4; ++s) {
-          histograms.hRes_S3RPhiWS[w][s-1] = std::make_unique<HRes1DHit>(("S3"+name1+w+"_St"+s).Data(), booker, doall_, local_);
-          histograms.hEff_S1RPhiWS[w][s-1] = std::make_unique<HEff1DHit>(("S1"+name1+w+"_St"+s).Data(), booker);
-          histograms.hEff_S3RPhiWS[w][s-1] = std::make_unique<HEff1DHit>(("S3"+name1+w+"_St"+s).Data(), booker);
+        for (long s = 1; s <= 4; ++s) {
+          histograms.hRes_S3RPhiWS[w][s - 1] =
+              std::make_unique<HRes1DHit>(("S3" + name1 + w + "_St" + s).Data(), booker, doall_, local_);
+          histograms.hEff_S1RPhiWS[w][s - 1] =
+              std::make_unique<HEff1DHit>(("S1" + name1 + w + "_St" + s).Data(), booker);
+          histograms.hEff_S3RPhiWS[w][s - 1] =
+              std::make_unique<HEff1DHit>(("S3" + name1 + w + "_St" + s).Data(), booker);
           if (s != 4) {
-            histograms.hRes_S3RZWS[w][s-1] = std::make_unique<HRes1DHit>(("S3"+name2+w+"_St"+s).Data(), booker, doall_, local_);
-            histograms.hEff_S1RZWS[w][s-1] = std::make_unique<HEff1DHit>(("S1"+name2+w+"_St"+s).Data(), booker);
-            histograms.hEff_S3RZWS[w][s-1] = std::make_unique<HEff1DHit>(("S3"+name2+w+"_St"+s).Data(), booker);
+            histograms.hRes_S3RZWS[w][s - 1] =
+                std::make_unique<HRes1DHit>(("S3" + name2 + w + "_St" + s).Data(), booker, doall_, local_);
+            histograms.hEff_S1RZWS[w][s - 1] =
+                std::make_unique<HEff1DHit>(("S1" + name2 + w + "_St" + s).Data(), booker);
+            histograms.hEff_S3RZWS[w][s - 1] =
+                std::make_unique<HEff1DHit>(("S3" + name2 + w + "_St" + s).Data(), booker);
           }
         }
       }
     }
 
     if (doall_) {
-      histograms.hEff_S3RPhi  = std::make_unique<HEff1DHit>("S3RPhi", booker);                    // RecHits, 3. step, RPhi
-      histograms.hEff_S3RZ    = std::make_unique<HEff1DHit>("S3RZ", booker);                      // RecHits, 3. step, RZ
-      histograms.hEff_S3RZ_W0 = std::make_unique<HEff1DHit>("S3RZ_W0", booker);                   // RecHits, 3. step, RZ, wheel 0
-      histograms.hEff_S3RZ_W1 = std::make_unique<HEff1DHit>("S3RZ_W1", booker);                   // RecHits, 3. step, RZ, wheel +-1
-      histograms.hEff_S3RZ_W2 = std::make_unique<HEff1DHit>("S3RZ_W2", booker);                   // RecHits, 3. step, RZ, wheel +-2
+      histograms.hEff_S3RPhi = std::make_unique<HEff1DHit>("S3RPhi", booker);    // RecHits, 3. step, RPhi
+      histograms.hEff_S3RZ = std::make_unique<HEff1DHit>("S3RZ", booker);        // RecHits, 3. step, RZ
+      histograms.hEff_S3RZ_W0 = std::make_unique<HEff1DHit>("S3RZ_W0", booker);  // RecHits, 3. step, RZ, wheel 0
+      histograms.hEff_S3RZ_W1 = std::make_unique<HEff1DHit>("S3RZ_W1", booker);  // RecHits, 3. step, RZ, wheel +-1
+      histograms.hEff_S3RZ_W2 = std::make_unique<HEff1DHit>("S3RZ_W2", booker);  // RecHits, 3. step, RZ, wheel +-2
     }
   }
 }
 
 // The real analysis
-void DTRecHitQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup const& setup, Histograms const& histograms) const {
+void DTRecHitQuality::dqmAnalyze(edm::Event const &event,
+                                 edm::EventSetup const &setup,
+                                 Histograms const &histograms) const {
   if (debug_) {
-    cout << "--- [DTRecHitQuality] Analysing Event: #Run: " << event.id().run()
-         << " #Event: " << event.id().event() << endl;
-}
+    cout << "--- [DTRecHitQuality] Analysing Event: #Run: " << event.id().run() << " #Event: " << event.id().event()
+         << endl;
+  }
 
   // Get the DT Geometry
   ESHandle<DTGeometry> dtGeom;
@@ -193,27 +226,28 @@ void DTRecHitQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup const&
   event.getByToken(simHitToken_, simHits);
 
   // Map simhits per wire
-  map<DTWireId, PSimHitContainer > simHitsPerWire =
-    DTHitQualityUtils::mapSimHitsPerWire(*(simHits.product()));
+  map<DTWireId, PSimHitContainer> simHitsPerWire = DTHitQualityUtils::mapSimHitsPerWire(*(simHits.product()));
 
   //=======================================================================================
   // RecHit analysis at Step 1
   if (doStep1_ && doall_) {
     if (debug_) {
       cout << "  -- DTRecHit S1: begin analysis:" << endl;
-}
+    }
     // Get the rechit collection from the event
     Handle<DTRecHitCollection> dtRecHits;
     event.getByToken(recHitToken_, dtRecHits);
 
     if (!dtRecHits.isValid()) {
-      if (debug_) { cout << "[DTRecHitQuality]**Warning: no 1DRechits with label: " << recHitLabel_ << " in this event, skipping!" << endl;
-}
+      if (debug_) {
+        cout << "[DTRecHitQuality]**Warning: no 1DRechits with label: " << recHitLabel_ << " in this event, skipping!"
+             << endl;
+      }
       return;
     }
 
     // Map rechits per wire
-    auto const& recHitsPerWire = map1DRecHitsPerWire(dtRecHits.product());
+    auto const &recHitsPerWire = map1DRecHitsPerWire(dtRecHits.product());
     compute(dtGeom.product(), simHitsPerWire, recHitsPerWire, histograms, 1);
   }
 
@@ -222,7 +256,7 @@ void DTRecHitQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup const&
   if (doStep2_ && doall_) {
     if (debug_) {
       cout << "  -- DTRecHit S2: begin analysis:" << endl;
-}
+    }
 
     // Get the 2D rechits from the event
     Handle<DTRecSegment2DCollection> segment2Ds;
@@ -232,12 +266,11 @@ void DTRecHitQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup const&
       if (debug_) {
         cout << "[DTRecHitQuality]**Warning: no 2DSegments with label: " << segment2DLabel_
              << " in this event, skipping!" << endl;
-}
+      }
 
-    }
-    else{
+    } else {
       // Map rechits per wire
-      auto const& recHitsPerWire = map1DRecHitsPerWire(segment2Ds.product());
+      auto const &recHitsPerWire = map1DRecHitsPerWire(segment2Ds.product());
       compute(dtGeom.product(), simHitsPerWire, recHitsPerWire, histograms, 2);
     }
   }
@@ -247,48 +280,48 @@ void DTRecHitQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup const&
   if (doStep3_) {
     if (debug_) {
       cout << "  -- DTRecHit S3: begin analysis:" << endl;
-}
+    }
 
     // Get the 4D rechits from the event
     Handle<DTRecSegment4DCollection> segment4Ds;
     event.getByToken(segment4DToken_, segment4Ds);
 
     if (!segment4Ds.isValid()) {
-      if (debug_) { cout << "[DTRecHitQuality]**Warning: no 4D Segments with label: " << segment4DLabel_
-        << " in this event, skipping!" << endl;
-}
+      if (debug_) {
+        cout << "[DTRecHitQuality]**Warning: no 4D Segments with label: " << segment4DLabel_
+             << " in this event, skipping!" << endl;
+      }
       return;
     }
 
     // Map rechits per wire
-    auto const& recHitsPerWire = map1DRecHitsPerWire(segment4Ds.product());
+    auto const &recHitsPerWire = map1DRecHitsPerWire(segment4Ds.product());
     compute(dtGeom.product(), simHitsPerWire, recHitsPerWire, histograms, 3);
   }
 }
 
 // Return a map between DTRecHit1DPair and wireId
-map<DTWireId, vector<DTRecHit1DPair>>
-DTRecHitQuality::map1DRecHitsPerWire(const DTRecHitCollection* dt1DRecHitPairs) const {
+map<DTWireId, vector<DTRecHit1DPair>> DTRecHitQuality::map1DRecHitsPerWire(
+    const DTRecHitCollection *dt1DRecHitPairs) const {
   map<DTWireId, vector<DTRecHit1DPair>> ret;
 
-  for (const auto & dt1DRecHitPair : *dt1DRecHitPairs) {
+  for (const auto &dt1DRecHitPair : *dt1DRecHitPairs) {
     ret[dt1DRecHitPair.wireId()].push_back(dt1DRecHitPair);
   }
 
   return ret;
 }
 
-
 // Return a map between DTRecHit1D at S2 and wireId
-map<DTWireId, vector<DTRecHit1D>>
-DTRecHitQuality::map1DRecHitsPerWire(const DTRecSegment2DCollection* segment2Ds) const {
+map<DTWireId, vector<DTRecHit1D>> DTRecHitQuality::map1DRecHitsPerWire(
+    const DTRecSegment2DCollection *segment2Ds) const {
   map<DTWireId, vector<DTRecHit1D>> ret;
 
   // Loop over all 2D segments
-  for (const auto & segment2D : *segment2Ds) {
+  for (const auto &segment2D : *segment2Ds) {
     vector<DTRecHit1D> component1DHits = segment2D.specificRecHits();
     // Loop over all component 1D hits
-    for (auto & component1DHit : component1DHits) {
+    for (auto &component1DHit : component1DHits) {
       ret[component1DHit.wireId()].push_back(component1DHit);
     }
   }
@@ -296,20 +329,20 @@ DTRecHitQuality::map1DRecHitsPerWire(const DTRecSegment2DCollection* segment2Ds)
 }
 
 // Return a map between DTRecHit1D at S3 and wireId
-map<DTWireId, std::vector<DTRecHit1D>>
-DTRecHitQuality::map1DRecHitsPerWire(const DTRecSegment4DCollection* segment4Ds) const {
+map<DTWireId, std::vector<DTRecHit1D>> DTRecHitQuality::map1DRecHitsPerWire(
+    const DTRecSegment4DCollection *segment4Ds) const {
   map<DTWireId, vector<DTRecHit1D>> ret;
   // Loop over all 4D segments
-  for (const auto & segment4D : *segment4Ds) {
+  for (const auto &segment4D : *segment4Ds) {
     // Get component 2D segments
-    vector<const TrackingRecHit*> segment2Ds = segment4D.recHits();
+    vector<const TrackingRecHit *> segment2Ds = segment4D.recHits();
     // Loop over 2D segments:
-    for (auto & segment2D : segment2Ds) {
+    for (auto &segment2D : segment2Ds) {
       // Get 1D component rechits
-      vector<const TrackingRecHit*> hits = segment2D->recHits();
+      vector<const TrackingRecHit *> hits = segment2D->recHits();
       // Loop over them
-      for (auto & hit : hits) {
-        const auto* hit1D = dynamic_cast<const DTRecHit1D*>(hit);
+      for (auto &hit : hits) {
+        const auto *hit1D = dynamic_cast<const DTRecHit1D *>(hit);
         ret[hit1D->wireId()].push_back(*hit1D);
       }
     }
@@ -319,90 +352,74 @@ DTRecHitQuality::map1DRecHitsPerWire(const DTRecSegment4DCollection* segment4Ds)
 }
 
 // Compute SimHit distance from wire (cm)
-float DTRecHitQuality::simHitDistFromWire(const DTLayer* layer,
-                                          const DTWireId& wireId,
-                                          const PSimHit& hit) const {
+float DTRecHitQuality::simHitDistFromWire(const DTLayer *layer, const DTWireId &wireId, const PSimHit &hit) const {
   float xwire = layer->specificTopology().wirePosition(wireId.wire());
   LocalPoint entryP = hit.entryPoint();
   LocalPoint exitP = hit.exitPoint();
   float xEntry = entryP.x() - xwire;
-  float xExit  = exitP.x() - xwire;
+  float xExit = exitP.x() - xwire;
 
-  return fabs(xEntry - (entryP.z()*(xExit-xEntry))/(exitP.z()-entryP.z())); // FIXME: check...
+  return fabs(xEntry - (entryP.z() * (xExit - xEntry)) / (exitP.z() - entryP.z()));  // FIXME: check...
 }
 
 // Compute SimHit impact angle (in direction perp to wire), in the SL RF
-float DTRecHitQuality::simHitImpactAngle(const DTLayer* layer,
-                                         const DTWireId& wireId,
-                                         const PSimHit& hit) const {
+float DTRecHitQuality::simHitImpactAngle(const DTLayer *layer, const DTWireId &wireId, const PSimHit &hit) const {
   LocalPoint entryP = hit.entryPoint();
   LocalPoint exitP = hit.exitPoint();
-  float theta =(exitP.x()-entryP.x())/(exitP.z()-entryP.z());
+  float theta = (exitP.x() - entryP.x()) / (exitP.z() - entryP.z());
   return atan(theta);
 }
 
 // Compute SimHit distance from FrontEnd
-float DTRecHitQuality::simHitDistFromFE(const DTLayer* layer,
-                                        const DTWireId& wireId,
-                                        const PSimHit& hit) const {
+float DTRecHitQuality::simHitDistFromFE(const DTLayer *layer, const DTWireId &wireId, const PSimHit &hit) const {
   LocalPoint entryP = hit.entryPoint();
   LocalPoint exitP = hit.exitPoint();
   float wireLenght = layer->specificTopology().cellLenght();
   // FIXME: should take only wireLenght/2.;
   // moreover, pos+cellLenght/2. is shorter than the distance from FE.
   // In fact it would make more sense to make plots vs y.
-  return (entryP.y()+exitP.y())/2.+wireLenght;
+  return (entryP.y() + exitP.y()) / 2. + wireLenght;
 }
 
-
 // Find the RecHit closest to the muon SimHit
-template  <typename type>
-const type*
-DTRecHitQuality::findBestRecHit(const DTLayer* layer,
-                                const DTWireId& wireId,
-                                const vector<type>& recHits,
-                                const float simHitDist) const {
+template <typename type>
+const type *DTRecHitQuality::findBestRecHit(const DTLayer *layer,
+                                            const DTWireId &wireId,
+                                            const vector<type> &recHits,
+                                            const float simHitDist) const {
   float res = 99999;
-  const type* theBestRecHit = nullptr;
+  const type *theBestRecHit = nullptr;
   // Loop over RecHits within the cell
-  for (auto recHit = recHits.begin();
-      recHit != recHits.end();
-      recHit++) {
+  for (auto recHit = recHits.begin(); recHit != recHits.end(); recHit++) {
     float distTmp = recHitDistFromWire(*recHit, layer);
-    if (fabs(distTmp-simHitDist) < res) {
-      res = fabs(distTmp-simHitDist);
+    if (fabs(distTmp - simHitDist) < res) {
+      res = fabs(distTmp - simHitDist);
       theBestRecHit = &(*recHit);
     }
-  } // End of loop over RecHits within the cell
+  }  // End of loop over RecHits within the cell
 
   return theBestRecHit;
 }
 
-
 // Compute the distance from wire (cm) of a hits in a DTRecHit1DPair
-float
-DTRecHitQuality::recHitDistFromWire(const DTRecHit1DPair& hitPair, const DTLayer* layer) const {
+float DTRecHitQuality::recHitDistFromWire(const DTRecHit1DPair &hitPair, const DTLayer *layer) const {
   // Compute the rechit distance from wire
-  return fabs(hitPair.localPosition(DTEnums::Left).x() -
-              hitPair.localPosition(DTEnums::Right).x())/2.;
+  return fabs(hitPair.localPosition(DTEnums::Left).x() - hitPair.localPosition(DTEnums::Right).x()) / 2.;
 }
 
-
-
 // Compute the distance from wire (cm) of a hits in a DTRecHit1D
-float
-DTRecHitQuality::recHitDistFromWire(const DTRecHit1D& recHit, const DTLayer* layer) const {
+float DTRecHitQuality::recHitDistFromWire(const DTRecHit1D &recHit, const DTLayer *layer) const {
   return fabs(recHit.localPosition().x() - layer->specificTopology().wirePosition(recHit.wireId().wire()));
 }
 
-
-template  <typename type>
+template <typename type>
 void DTRecHitQuality::compute(const DTGeometry *dtGeom,
-                              const std::map<DTWireId, std::vector<PSimHit>>& simHitsPerWire,
-                              const std::map<DTWireId, std::vector<type>>& recHitsPerWire,
-                              Histograms const& histograms, int step) const {
+                              const std::map<DTWireId, std::vector<PSimHit>> &simHitsPerWire,
+                              const std::map<DTWireId, std::vector<type>> &recHitsPerWire,
+                              Histograms const &histograms,
+                              int step) const {
   // Loop over cells with a muon SimHit
-  for (const auto & wireAndSHits : simHitsPerWire) {
+  for (const auto &wireAndSHits : simHitsPerWire) {
     DTWireId wireId = wireAndSHits.first;
     int wheel = wireId.wheel();
     int sl = wireId.superLayer();
@@ -410,25 +427,27 @@ void DTRecHitQuality::compute(const DTGeometry *dtGeom,
     vector<PSimHit> simHitsInCell = wireAndSHits.second;
 
     // Get the layer
-    const DTLayer* layer = dtGeom->layer(wireId);
+    const DTLayer *layer = dtGeom->layer(wireId);
 
     // Look for a mu hit in the cell
-    const PSimHit* muSimHit = DTHitQualityUtils::findMuSimHit(simHitsInCell);
+    const PSimHit *muSimHit = DTHitQualityUtils::findMuSimHit(simHitsInCell);
     if (muSimHit == nullptr) {
       if (debug_) {
         cout << "   No mu SimHit in channel: " << wireId << ", skipping! " << endl;
-}
-      continue; // Skip this cell
+      }
+      continue;  // Skip this cell
     }
 
     // Find the distance of the simhit from the wire
     float simHitWireDist = simHitDistFromWire(layer, wireId, *muSimHit);
     // Skip simhits out of the cell
-    if (simHitWireDist>2.1) {
+    if (simHitWireDist > 2.1) {
       if (debug_) {
-        cout << "  [DTRecHitQuality]###Warning: The mu SimHit in out of the cell, skipping!" << endl;
-}
-      continue; // Skip this cell
+        cout << "  [DTRecHitQuality]###Warning: The mu SimHit in out of the "
+                "cell, skipping!"
+             << endl;
+      }
+      continue;  // Skip this cell
     }
     GlobalPoint simHitGlobalPos = layer->toGlobal(muSimHit->localPosition());
 
@@ -445,32 +464,31 @@ void DTRecHitQuality::compute(const DTGeometry *dtGeom,
       // No RecHit found in this cell
       if (debug_) {
         cout << "   No RecHit found at Step: " << step << " in cell: " << wireId << endl;
-}
+      }
     } else {
       recHitReconstructed = true;
       // vector<type> recHits = (*wireAndRecHits).second;
-      const vector<type>& recHits = recHitsPerWire.at(wireId);
+      const vector<type> &recHits = recHitsPerWire.at(wireId);
       if (debug_) {
         cout << "   " << recHits.size() << " RecHits, Step " << step << " in channel: " << wireId << endl;
-}
+      }
 
       // Find the best RecHit
-      const type* theBestRecHit = findBestRecHit(layer, wireId, recHits, simHitWireDist);
-
+      const type *theBestRecHit = findBestRecHit(layer, wireId, recHits, simHitWireDist);
 
-      float recHitWireDist =  recHitDistFromWire(*theBestRecHit, layer);
+      float recHitWireDist = recHitDistFromWire(*theBestRecHit, layer);
       if (debug_) {
         cout << "    SimHit distance from wire: " << simHitWireDist << endl
              << "    SimHit distance from FE:   " << simHitFEDist << endl
              << "    SimHit angle in layer RF:  " << simHitTheta << endl
              << "    RecHit distance from wire: " << recHitWireDist << endl;
-}
+      }
       float recHitErr = recHitPositionError(*theBestRecHit);
       HRes1DHit *hRes = nullptr;
       HRes1DHit *hResTot = nullptr;
 
       // Mirror angle in phi so that + and - wheels can be plotted together
-      if (mirrorMinusWheels && wheel<0 && sl!= 2) {
+      if (mirrorMinusWheels && wheel < 0 && sl != 2) {
         simHitTheta *= -1.;
         // Note: local X, if used, would have to be mirrored as well
       }
@@ -483,24 +501,24 @@ void DTRecHitQuality::compute(const DTGeometry *dtGeom,
           hResTot = histograms.hRes_S1RPhi.get();
           if (wheel == 0) {
             hRes = histograms.hRes_S1RPhi_W0.get();
-}
+          }
           if (abs(wheel) == 1) {
             hRes = histograms.hRes_S1RPhi_W1.get();
-}
+          }
           if (abs(wheel) == 2) {
             hRes = histograms.hRes_S1RPhi_W2.get();
-}
+          }
         } else {
           hResTot = histograms.hRes_S1RZ.get();
           if (wheel == 0) {
             hRes = histograms.hRes_S1RZ_W0.get();
-}
+          }
           if (abs(wheel) == 1) {
             hRes = histograms.hRes_S1RZ_W1.get();
-}
+          }
           if (abs(wheel) == 2) {
             hRes = histograms.hRes_S1RZ_W2.get();
-}
+          }
         }
 
       } else if (step == 2) {
@@ -509,24 +527,24 @@ void DTRecHitQuality::compute(const DTGeometry *dtGeom,
           hRes = histograms.hRes_S2RPhi.get();
           if (wheel == 0) {
             hRes = histograms.hRes_S2RPhi_W0.get();
-}
+          }
           if (abs(wheel) == 1) {
             hRes = histograms.hRes_S2RPhi_W1.get();
-}
+          }
           if (abs(wheel) == 2) {
             hRes = histograms.hRes_S2RPhi_W2.get();
-}
+          }
         } else {
           hResTot = histograms.hRes_S2RZ.get();
           if (wheel == 0) {
             hRes = histograms.hRes_S2RZ_W0.get();
-}
+          }
           if (abs(wheel) == 1) {
             hRes = histograms.hRes_S2RZ_W1.get();
-}
+          }
           if (abs(wheel) == 2) {
             hRes = histograms.hRes_S2RZ_W2.get();
-}
+          }
         }
 
       } else if (step == 3) {
@@ -535,40 +553,66 @@ void DTRecHitQuality::compute(const DTGeometry *dtGeom,
           hResTot = histograms.hRes_S3RPhi.get();
           if (wheel == 0) {
             hRes = histograms.hRes_S3RPhi_W0.get();
-}
+          }
           if (abs(wheel) == 1) {
             hRes = histograms.hRes_S3RPhi_W1.get();
-}
+          }
           if (abs(wheel) == 2) {
             hRes = histograms.hRes_S3RPhi_W2.get();
-}
+          }
           if (local_) {
-            histograms.hRes_S3RPhiWS[abs(wheel)][wireId.station()-1]->fill(simHitWireDist, simHitTheta, simHitFEDist, recHitWireDist, simHitGlobalPos.eta(), simHitGlobalPos.phi(), recHitErr, wireId.station());
-}
+            histograms.hRes_S3RPhiWS[abs(wheel)][wireId.station() - 1]->fill(simHitWireDist,
+                                                                             simHitTheta,
+                                                                             simHitFEDist,
+                                                                             recHitWireDist,
+                                                                             simHitGlobalPos.eta(),
+                                                                             simHitGlobalPos.phi(),
+                                                                             recHitErr,
+                                                                             wireId.station());
+          }
         } else {
           hResTot = histograms.hRes_S3RZ.get();
           if (wheel == 0) {
             hRes = histograms.hRes_S3RZ_W0.get();
-}
+          }
           if (abs(wheel) == 1) {
             hRes = histograms.hRes_S3RZ_W1.get();
-}
+          }
           if (abs(wheel) == 2) {
             hRes = histograms.hRes_S3RZ_W2.get();
-}
+          }
           if (local_) {
-            histograms.hRes_S3RZWS[abs(wheel)][wireId.station()-1]->fill(simHitWireDist, simHitTheta, simHitFEDist, recHitWireDist, simHitGlobalPos.eta(), simHitGlobalPos.phi(), recHitErr, wireId.station());
-}
+            histograms.hRes_S3RZWS[abs(wheel)][wireId.station() - 1]->fill(simHitWireDist,
+                                                                           simHitTheta,
+                                                                           simHitFEDist,
+                                                                           recHitWireDist,
+                                                                           simHitGlobalPos.eta(),
+                                                                           simHitGlobalPos.phi(),
+                                                                           recHitErr,
+                                                                           wireId.station());
+          }
         }
       }
 
       // Fill
-      hRes->fill(simHitWireDist, simHitTheta, simHitFEDist, recHitWireDist, simHitGlobalPos.eta(),
-                 simHitGlobalPos.phi(), recHitErr, wireId.station());
+      hRes->fill(simHitWireDist,
+                 simHitTheta,
+                 simHitFEDist,
+                 recHitWireDist,
+                 simHitGlobalPos.eta(),
+                 simHitGlobalPos.phi(),
+                 recHitErr,
+                 wireId.station());
       if (hResTot != nullptr) {
-        hResTot->fill(simHitWireDist, simHitTheta, simHitFEDist, recHitWireDist, simHitGlobalPos.eta(),
-                      simHitGlobalPos.phi(), recHitErr, wireId.station());
-}
+        hResTot->fill(simHitWireDist,
+                      simHitTheta,
+                      simHitFEDist,
+                      recHitWireDist,
+                      simHitGlobalPos.eta(),
+                      simHitGlobalPos.phi(),
+                      recHitErr,
+                      wireId.station());
+      }
     }
 
     // Fill Efficiencies
@@ -579,21 +623,25 @@ void DTRecHitQuality::compute(const DTGeometry *dtGeom,
         // Step 1
         if (sl != 2) {
           hEff = histograms.hEff_S1RPhi.get();
-          if (local_) { histograms.hEff_S1RPhiWS[abs(wheel)][wireId.station()-1]->fill(simHitWireDist, simHitGlobalPos.eta(), simHitGlobalPos.phi(), recHitReconstructed);
-}
+          if (local_) {
+            histograms.hEff_S1RPhiWS[abs(wheel)][wireId.station() - 1]->fill(
+                simHitWireDist, simHitGlobalPos.eta(), simHitGlobalPos.phi(), recHitReconstructed);
+          }
         } else {
           hEffTot = histograms.hEff_S1RZ.get();
           if (wheel == 0) {
             hEff = histograms.hEff_S1RZ_W0.get();
-}
+          }
           if (abs(wheel) == 1) {
             hEff = histograms.hEff_S1RZ_W1.get();
-}
+          }
           if (abs(wheel) == 2) {
             hEff = histograms.hEff_S1RZ_W2.get();
-}
-          if (local_) { histograms.hEff_S1RZWS[abs(wheel)][wireId.station()-1]->fill(simHitWireDist, simHitGlobalPos.eta(), simHitGlobalPos.phi(), recHitReconstructed);
-}
+          }
+          if (local_) {
+            histograms.hEff_S1RZWS[abs(wheel)][wireId.station() - 1]->fill(
+                simHitWireDist, simHitGlobalPos.eta(), simHitGlobalPos.phi(), recHitReconstructed);
+          }
         }
 
       } else if (step == 2) {
@@ -604,53 +652,56 @@ void DTRecHitQuality::compute(const DTGeometry *dtGeom,
           hEffTot = histograms.hEff_S2RZ.get();
           if (wheel == 0) {
             hEff = histograms.hEff_S2RZ_W0.get();
-}
+          }
           if (abs(wheel) == 1) {
             hEff = histograms.hEff_S2RZ_W1.get();
-}
+          }
           if (abs(wheel) == 2) {
             hEff = histograms.hEff_S2RZ_W2.get();
-}
+          }
         }
 
       } else if (step == 3) {
         // Step 3
         if (sl != 2) {
           hEff = histograms.hEff_S3RPhi.get();
-          if (local_) { histograms.hEff_S3RPhiWS[abs(wheel)][wireId.station()-1]->fill(simHitWireDist, simHitGlobalPos.eta(), simHitGlobalPos.phi(), recHitReconstructed);
-}
+          if (local_) {
+            histograms.hEff_S3RPhiWS[abs(wheel)][wireId.station() - 1]->fill(
+                simHitWireDist, simHitGlobalPos.eta(), simHitGlobalPos.phi(), recHitReconstructed);
+          }
         } else {
           hEffTot = histograms.hEff_S3RZ.get();
           if (wheel == 0) {
             hEff = histograms.hEff_S3RZ_W0.get();
-}
+          }
           if (abs(wheel) == 1) {
             hEff = histograms.hEff_S3RZ_W1.get();
-}
+          }
           if (abs(wheel) == 2) {
             hEff = histograms.hEff_S3RZ_W2.get();
-}
-          if (local_) { histograms.hEff_S3RZWS[abs(wheel)][wireId.station()-1]->fill(simHitWireDist, simHitGlobalPos.eta(), simHitGlobalPos.phi(), recHitReconstructed);
-}
+          }
+          if (local_) {
+            histograms.hEff_S3RZWS[abs(wheel)][wireId.station() - 1]->fill(
+                simHitWireDist, simHitGlobalPos.eta(), simHitGlobalPos.phi(), recHitReconstructed);
+          }
         }
-
       }
       // Fill
       hEff->fill(simHitWireDist, simHitGlobalPos.eta(), simHitGlobalPos.phi(), recHitReconstructed);
       if (hEffTot != nullptr) {
         hEffTot->fill(simHitWireDist, simHitGlobalPos.eta(), simHitGlobalPos.phi(), recHitReconstructed);
-}
+      }
     }
   }
 }
 
 // Return the error on the measured (cm) coordinate
-float DTRecHitQuality::recHitPositionError(const DTRecHit1DPair& recHit) const {
+float DTRecHitQuality::recHitPositionError(const DTRecHit1DPair &recHit) const {
   return sqrt(recHit.localPositionError(DTEnums::Left).xx());
 }
 
 // Return the error on the measured (cm) coordinate
-float DTRecHitQuality::recHitPositionError(const DTRecHit1D& recHit) const {
+float DTRecHitQuality::recHitPositionError(const DTRecHit1D &recHit) const {
   return sqrt(recHit.localPositionError().xx());
 }
 
diff --git a/Validation/DTRecHits/plugins/DTRecHitQuality.h b/Validation/DTRecHits/plugins/DTRecHitQuality.h
index 129b02c95d9d5..c8f40262fb0c9 100644
--- a/Validation/DTRecHits/plugins/DTRecHitQuality.h
+++ b/Validation/DTRecHits/plugins/DTRecHitQuality.h
@@ -32,7 +32,7 @@ namespace edm {
   class ParameterSet;
   class Event;
   class EventSetup;
-}
+}  // namespace edm
 
 class PSimHit;
 class DTLayer;
@@ -47,15 +47,17 @@ namespace dtrechit {
 class DTRecHitQuality : public DQMGlobalEDAnalyzer<dtrechit::Histograms> {
 public:
   /// Constructor
-  DTRecHitQuality(const edm::ParameterSet& pset);
+  DTRecHitQuality(const edm::ParameterSet &pset);
 
 private:
   /// Book the DQM plots
-  void bookHistograms(DQMStore::ConcurrentBooker &, edm::Run const&, edm::EventSetup const&, dtrechit::Histograms &) const override;
+  void bookHistograms(DQMStore::ConcurrentBooker &,
+                      edm::Run const &,
+                      edm::EventSetup const &,
+                      dtrechit::Histograms &) const override;
 
   /// Perform the real analysis
-  void dqmAnalyze(edm::Event const&, edm::EventSetup const&, dtrechit::Histograms const&) const override;
-
+  void dqmAnalyze(edm::Event const &, edm::EventSetup const &, dtrechit::Histograms const &) const override;
 
 private:
   // Switch for debug output
@@ -65,7 +67,8 @@ class DTRecHitQuality : public DQMGlobalEDAnalyzer<dtrechit::Histograms> {
   edm::EDGetTokenT<edm::PSimHitContainer> simHitToken_;
   edm::EDGetTokenT<DTRecHitCollection> recHitToken_;
   edm::EDGetTokenT<DTRecSegment2DCollection> segment2DToken_;
-  edm::EDGetTokenT<DTRecSegment4DCollection> segment4DToken_;;
+  edm::EDGetTokenT<DTRecSegment4DCollection> segment4DToken_;
+  ;
 
   edm::InputTag simHitLabel_;
   edm::InputTag recHitLabel_;
@@ -80,61 +83,51 @@ class DTRecHitQuality : public DQMGlobalEDAnalyzer<dtrechit::Histograms> {
   bool doall_;
 
   // Return a map between DTRecHit1DPair and wireId
-  std::map<DTWireId, std::vector<DTRecHit1DPair>>
-  map1DRecHitsPerWire(const DTRecHitCollection* dt1DRecHitPairs) const;
+  std::map<DTWireId, std::vector<DTRecHit1DPair>> map1DRecHitsPerWire(const DTRecHitCollection *dt1DRecHitPairs) const;
 
   // Return a map between DTRecHit1D and wireId
-  std::map<DTWireId, std::vector<DTRecHit1D>>
-  map1DRecHitsPerWire(const DTRecSegment2DCollection* segment2Ds) const;
+  std::map<DTWireId, std::vector<DTRecHit1D>> map1DRecHitsPerWire(const DTRecSegment2DCollection *segment2Ds) const;
 
   // Return a map between DTRecHit1D and wireId
-  std::map<DTWireId, std::vector<DTRecHit1D>>
-  map1DRecHitsPerWire(const DTRecSegment4DCollection* segment4Ds) const;
+  std::map<DTWireId, std::vector<DTRecHit1D>> map1DRecHitsPerWire(const DTRecSegment4DCollection *segment4Ds) const;
 
   // Compute SimHit distance from wire (cm)
-  float simHitDistFromWire(const DTLayer* layer,
-                           const DTWireId& wireId,
-                           const PSimHit& hit) const;
+  float simHitDistFromWire(const DTLayer *layer, const DTWireId &wireId, const PSimHit &hit) const;
 
   // Compute SimHit impact angle (in direction perp to wire)
-  float simHitImpactAngle(const DTLayer* layer,
-                           const DTWireId& wireId,
-                           const PSimHit& hit) const;
+  float simHitImpactAngle(const DTLayer *layer, const DTWireId &wireId, const PSimHit &hit) const;
 
   // Compute SimHit distance from FrontEnd
-  float simHitDistFromFE(const DTLayer* layer,
-                           const DTWireId& wireId,
-                           const PSimHit& hit) const;
+  float simHitDistFromFE(const DTLayer *layer, const DTWireId &wireId, const PSimHit &hit) const;
 
   // Find the RecHit closest to the muon SimHit
-//   const DTRecHit1DPair*
-//   findBestRecHit(const DTLayer* layer,
-//               DTWireId wireId,
-//               const std::vector<DTRecHit1DPair>& recHits,
-//               const float simHitDist) const;
+  //   const DTRecHit1DPair*
+  //   findBestRecHit(const DTLayer* layer,
+  //               DTWireId wireId,
+  //               const std::vector<DTRecHit1DPair>& recHits,
+  //               const float simHitDist) const;
   template <typename type>
-  const type*
-  findBestRecHit(const DTLayer* layer,
-                 const DTWireId& wireId,
-                 const std::vector<type>& recHits,
-                 float simHitDist) const;
+  const type *findBestRecHit(const DTLayer *layer,
+                             const DTWireId &wireId,
+                             const std::vector<type> &recHits,
+                             float simHitDist) const;
 
   // Compute the distance from wire (cm) of a hits in a DTRecHit1DPair
-  float recHitDistFromWire(const DTRecHit1DPair& hitPair, const DTLayer* layer) const;
+  float recHitDistFromWire(const DTRecHit1DPair &hitPair, const DTLayer *layer) const;
   // Compute the distance from wire (cm) of a hits in a DTRecHit1D
-  float recHitDistFromWire(const DTRecHit1D& recHit, const DTLayer* layer) const;
+  float recHitDistFromWire(const DTRecHit1D &recHit, const DTLayer *layer) const;
 
   // Return the error on the measured (cm) coordinate
-  float recHitPositionError(const DTRecHit1DPair& recHit) const;
-  float recHitPositionError(const DTRecHit1D& recHit) const;
+  float recHitPositionError(const DTRecHit1DPair &recHit) const;
+  float recHitPositionError(const DTRecHit1D &recHit) const;
 
   // Does the real job
   template <typename type>
   void compute(const DTGeometry *dtGeom,
-               const std::map<DTWireId, std::vector<PSimHit>>& simHitsPerWire,
-               const std::map<DTWireId, std::vector<type>>& recHitsPerWire,
-               dtrechit::Histograms const& histograms, int step) const;
-
+               const std::map<DTWireId, std::vector<PSimHit>> &simHitsPerWire,
+               const std::map<DTWireId, std::vector<type>> &recHitsPerWire,
+               dtrechit::Histograms const &histograms,
+               int step) const;
 };
 
-#endif // Validation_DTRecHits_DTRecHitQuality_h
+#endif  // Validation_DTRecHits_DTRecHitQuality_h
diff --git a/Validation/DTRecHits/plugins/DTSegment2DQuality.cc b/Validation/DTRecHits/plugins/DTSegment2DQuality.cc
index 4425d01bb0d5a..e22539fbbb1a4 100644
--- a/Validation/DTRecHits/plugins/DTSegment2DQuality.cc
+++ b/Validation/DTRecHits/plugins/DTSegment2DQuality.cc
@@ -26,25 +26,25 @@ using namespace std;
 using namespace edm;
 
 namespace dtsegment2d {
-struct Histograms {
-  std::unique_ptr<HRes2DHit> h2DHitRPhi;
-  std::unique_ptr<HRes2DHit> h2DHitRZ;
-  std::unique_ptr<HRes2DHit> h2DHitRZ_W0;
-  std::unique_ptr<HRes2DHit> h2DHitRZ_W1;
-  std::unique_ptr<HRes2DHit> h2DHitRZ_W2;
-
-  std::unique_ptr<HEff2DHit> h2DHitEff_RPhi;
-  std::unique_ptr<HEff2DHit> h2DHitEff_RZ;
-  std::unique_ptr<HEff2DHit> h2DHitEff_RZ_W0;
-  std::unique_ptr<HEff2DHit> h2DHitEff_RZ_W1;
-  std::unique_ptr<HEff2DHit> h2DHitEff_RZ_W2;
-};
-}
+  struct Histograms {
+    std::unique_ptr<HRes2DHit> h2DHitRPhi;
+    std::unique_ptr<HRes2DHit> h2DHitRZ;
+    std::unique_ptr<HRes2DHit> h2DHitRZ_W0;
+    std::unique_ptr<HRes2DHit> h2DHitRZ_W1;
+    std::unique_ptr<HRes2DHit> h2DHitRZ_W2;
+
+    std::unique_ptr<HEff2DHit> h2DHitEff_RPhi;
+    std::unique_ptr<HEff2DHit> h2DHitEff_RZ;
+    std::unique_ptr<HEff2DHit> h2DHitEff_RZ_W0;
+    std::unique_ptr<HEff2DHit> h2DHitEff_RZ_W1;
+    std::unique_ptr<HEff2DHit> h2DHitEff_RZ_W2;
+  };
+}  // namespace dtsegment2d
 
 using namespace dtsegment2d;
 
 // Constructor
-DTSegment2DQuality::DTSegment2DQuality(const ParameterSet& pset)  {
+DTSegment2DQuality::DTSegment2DQuality(const ParameterSet &pset) {
   // get the debug parameter for verbose output
   debug_ = pset.getUntrackedParameter<bool>("debug");
   DTHitQualityUtils::debug = debug_;
@@ -62,39 +62,44 @@ DTSegment2DQuality::DTSegment2DQuality(const ParameterSet& pset)  {
 
   if (debug_) {
     cout << "[DTSegment2DQuality] Constructor called " << endl;
-}
+  }
 }
 
-void DTSegment2DQuality::bookHistograms(DQMStore::ConcurrentBooker & booker, edm::Run const& run, edm::EventSetup const& setup, Histograms & histograms) const {
-  histograms.h2DHitRPhi = std::make_unique<HRes2DHit> ("RPhi", booker, true, true);
-  histograms.h2DHitRZ = std::make_unique<HRes2DHit> ("RZ", booker, true, true);
-  histograms.h2DHitRZ_W0 = std::make_unique<HRes2DHit> ("RZ_W0", booker, true, true);
-  histograms.h2DHitRZ_W1 = std::make_unique<HRes2DHit> ("RZ_W1", booker, true, true);
-  histograms.h2DHitRZ_W2 = std::make_unique<HRes2DHit> ("RZ_W2", booker, true, true);
-
-  histograms.h2DHitEff_RPhi = std::make_unique<HEff2DHit> ("RPhi", booker);
-  histograms.h2DHitEff_RZ = std::make_unique<HEff2DHit> ("RZ", booker);
-  histograms.h2DHitEff_RZ_W0 = std::make_unique<HEff2DHit> ("RZ_W0", booker);
-  histograms.h2DHitEff_RZ_W1 = std::make_unique<HEff2DHit> ("RZ_W1", booker);
-  histograms.h2DHitEff_RZ_W2 = std::make_unique<HEff2DHit> ("RZ_W2", booker);
+void DTSegment2DQuality::bookHistograms(DQMStore::ConcurrentBooker &booker,
+                                        edm::Run const &run,
+                                        edm::EventSetup const &setup,
+                                        Histograms &histograms) const {
+  histograms.h2DHitRPhi = std::make_unique<HRes2DHit>("RPhi", booker, true, true);
+  histograms.h2DHitRZ = std::make_unique<HRes2DHit>("RZ", booker, true, true);
+  histograms.h2DHitRZ_W0 = std::make_unique<HRes2DHit>("RZ_W0", booker, true, true);
+  histograms.h2DHitRZ_W1 = std::make_unique<HRes2DHit>("RZ_W1", booker, true, true);
+  histograms.h2DHitRZ_W2 = std::make_unique<HRes2DHit>("RZ_W2", booker, true, true);
+
+  histograms.h2DHitEff_RPhi = std::make_unique<HEff2DHit>("RPhi", booker);
+  histograms.h2DHitEff_RZ = std::make_unique<HEff2DHit>("RZ", booker);
+  histograms.h2DHitEff_RZ_W0 = std::make_unique<HEff2DHit>("RZ_W0", booker);
+  histograms.h2DHitEff_RZ_W1 = std::make_unique<HEff2DHit>("RZ_W1", booker);
+  histograms.h2DHitEff_RZ_W2 = std::make_unique<HEff2DHit>("RZ_W2", booker);
   if (debug_) {
     cout << "[DTSegment2DQuality] hitsos created " << endl;
   }
 }
 
 // The real analysis
-void DTSegment2DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup const& setup, Histograms const& histograms) const {
+void DTSegment2DQuality::dqmAnalyze(edm::Event const &event,
+                                    edm::EventSetup const &setup,
+                                    Histograms const &histograms) const {
   // Get the DT Geometry
   ESHandle<DTGeometry> dtGeom;
   setup.get<MuonGeometryRecord>().get(dtGeom);
 
   // Get the SimHit collection from the event
   edm::Handle<PSimHitContainer> simHits;
-  event.getByToken(simHitToken_, simHits); // FIXME: second string to be removed
+  event.getByToken(simHitToken_, simHits);  // FIXME: second string to be removed
 
   // Map simHits by sl
-  map<DTSuperLayerId, PSimHitContainer > simHitsPerSl;
-  for (const auto & simHit : *simHits) {
+  map<DTSuperLayerId, PSimHitContainer> simHitsPerSl;
+  for (const auto &simHit : *simHits) {
     // Create the id of the sl (the simHits in the DT known their wireId)
     DTSuperLayerId slId = ((DTWireId(simHit.detUnitId())).layerId()).superlayerId();
     // Fill the map
@@ -106,55 +111,55 @@ void DTSegment2DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup con
   event.getByToken(segment2DToken_, segment2Ds);
 
   if (not segment2Ds.isValid()) {
-    if (debug_) { cout << "[DTSegment2DQuality]**Warning: no 2DSegments with label: " << segment2DLabel_
-      << " in this event, skipping !" << endl;
-}
+    if (debug_) {
+      cout << "[DTSegment2DQuality]**Warning: no 2DSegments with label: " << segment2DLabel_
+           << " in this event, skipping !" << endl;
+    }
     return;
   }
 
   // Loop over all superlayers containing a segment
   DTRecSegment2DCollection::id_iterator slId;
-  for (slId = segment2Ds->id_begin();
-      slId != segment2Ds->id_end();
-      ++slId) {
-
+  for (slId = segment2Ds->id_begin(); slId != segment2Ds->id_end(); ++slId) {
     //------------------------- simHits ---------------------------//
     // Get simHits of each superlayer
-    PSimHitContainer simHits =  simHitsPerSl[(*slId)];
+    PSimHitContainer simHits = simHitsPerSl[(*slId)];
 
     // Map simhits per wire
     map<DTWireId, PSimHitContainer> simHitsPerWire = DTHitQualityUtils::mapSimHitsPerWire(simHits);
-    map<DTWireId, const PSimHit*> muSimHitPerWire = DTHitQualityUtils::mapMuSimHitsPerWire(simHitsPerWire);
+    map<DTWireId, const PSimHit *> muSimHitPerWire = DTHitQualityUtils::mapMuSimHitsPerWire(simHitsPerWire);
     int nMuSimHit = muSimHitPerWire.size();
     if (nMuSimHit == 0 or nMuSimHit == 1) {
       if (debug_ and nMuSimHit == 1) {
         cout << "[DTSegment2DQuality] Only " << nMuSimHit << " mu SimHit in this SL, skipping !" << endl;
-}
-      continue; // If no or only one mu SimHit is found skip this SL
+      }
+      continue;  // If no or only one mu SimHit is found skip this SL
     }
     if (debug_) {
       cout << "=== SL " << (*slId) << " has " << nMuSimHit << " SimHits" << endl;
-}
+    }
 
     // Find outer and inner mu SimHit to build a segment
-    pair<const PSimHit*, const PSimHit*> inAndOutSimHit = DTHitQualityUtils::findMuSimSegment(muSimHitPerWire);
+    pair<const PSimHit *, const PSimHit *> inAndOutSimHit = DTHitQualityUtils::findMuSimSegment(muSimHitPerWire);
     // Check that outermost and innermost SimHit are not the same
-    if (inAndOutSimHit.first == inAndOutSimHit.second ) {
-      cout << "[DTHitQualityUtils]***Warning: outermost and innermost SimHit are the same !" << endl;
+    if (inAndOutSimHit.first == inAndOutSimHit.second) {
+      cout << "[DTHitQualityUtils]***Warning: outermost and innermost SimHit "
+              "are the same !"
+           << endl;
       continue;
     }
 
     // Find direction and position of the sim Segment in SL RF
-    pair<LocalVector, LocalPoint> dirAndPosSimSegm = DTHitQualityUtils::findMuSimSegmentDirAndPos(inAndOutSimHit,
-        (*slId),&(*dtGeom));
+    pair<LocalVector, LocalPoint> dirAndPosSimSegm =
+        DTHitQualityUtils::findMuSimSegmentDirAndPos(inAndOutSimHit, (*slId), &(*dtGeom));
 
     LocalVector simSegmLocalDir = dirAndPosSimSegm.first;
     LocalPoint simSegmLocalPos = dirAndPosSimSegm.second;
     if (debug_) {
       cout << "  Simulated segment:  local direction " << simSegmLocalDir << endl
            << "                      local position  " << simSegmLocalPos << endl;
-}
-    const DTSuperLayer* superLayer = dtGeom->superLayer(*slId);
+    }
+    const DTSuperLayer *superLayer = dtGeom->superLayer(*slId);
     GlobalPoint simSegmGlobalPos = superLayer->toGlobal(simSegmLocalPos);
 
     // Atan(x/z) angle and x position in SL RF
@@ -170,9 +175,8 @@ void DTSegment2DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup con
     DTRecSegment2DCollection::range range = segment2Ds->get(*slId);
     int nsegm = distance(range.first, range.second);
     if (debug_) {
-      cout << "   Sl: " << *slId << " has " << nsegm
-           << " 2D segments" << endl;
-}
+      cout << "   Sl: " << *slId << " has " << nsegm << " 2D segments" << endl;
+    }
 
     if (nsegm != 0) {
       // Find the best RecHit: look for the 2D RecHit with the angle closest
@@ -180,18 +184,17 @@ void DTSegment2DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup con
       // RecHits must have delta alpha and delta position within 5 sigma of
       // the residual distribution (we are looking for residuals of segments
       // usefull to the track fit) for efficency purpose
-      const DTRecSegment2D* bestRecHit = nullptr;
+      const DTRecSegment2D *bestRecHit = nullptr;
       bool bestRecHitFound = false;
       double deltaAlpha = 99999;
 
       // Loop over the recHits of this slId
-      for (DTRecSegment2DCollection::const_iterator segment2D = range.first;
-          segment2D != range.second;
-          ++segment2D) {
+      for (DTRecSegment2DCollection::const_iterator segment2D = range.first; segment2D != range.second; ++segment2D) {
         // Check the dimension
         if ((*segment2D).dimension() != 2) {
-          if (debug_) { cout << "[DTSegment2DQuality]***Error: This is not 2D segment !!!" << endl;
-}
+          if (debug_) {
+            cout << "[DTSegment2DQuality]***Error: This is not 2D segment !!!" << endl;
+          }
           abort();
         }
         // Segment Local Direction and position (in SL RF)
@@ -203,7 +206,7 @@ void DTSegment2DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup con
           cout << "  RecSegment direction: " << recSegDirection << endl
                << "             position : " << recSegPosition << endl
                << "             alpha    : " << recSegAlpha << endl;
-}
+        }
 
         if (fabs(recSegAlpha - angleSimSeg) < deltaAlpha) {
           deltaAlpha = fabs(recSegAlpha - angleSimSeg);
@@ -222,50 +225,48 @@ void DTSegment2DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup con
 
         float angleBestRHit = DTHitQualityUtils::findSegmentAlphaAndBeta(bestRecHitLocalDir).first;
 
-        if (fabs(angleBestRHit - angleSimSeg) < 5*sigmaResAngle_ and
-            fabs(bestRecHitLocalPos.x() - posSimSeg) < 5*sigmaResPos_) {
+        if (fabs(angleBestRHit - angleSimSeg) < 5 * sigmaResAngle_ and
+            fabs(bestRecHitLocalPos.x() - posSimSeg) < 5 * sigmaResPos_) {
           recHitFound = true;
         }
 
         // Fill Residual histos
         HRes2DHit *hRes = nullptr;
-        if ((*slId).superlayer() == 1 or (*slId).superlayer() == 3) { // RPhi SL
+        if ((*slId).superlayer() == 1 or (*slId).superlayer() == 3) {  // RPhi SL
           hRes = histograms.h2DHitRPhi.get();
-        } else if ((*slId).superlayer() == 2) { // RZ SL
+        } else if ((*slId).superlayer() == 2) {  // RZ SL
           histograms.h2DHitRZ->fill(angleSimSeg,
-              angleBestRHit,
-              posSimSeg,
-              bestRecHitLocalPos.x(),
-              etaSimSeg,
-              phiSimSeg,
-              sqrt(bestRecHitLocalPosErr.xx()),
-              sqrt(bestRecHitLocalDirErr.xx())
-              );
+                                    angleBestRHit,
+                                    posSimSeg,
+                                    bestRecHitLocalPos.x(),
+                                    etaSimSeg,
+                                    phiSimSeg,
+                                    sqrt(bestRecHitLocalPosErr.xx()),
+                                    sqrt(bestRecHitLocalDirErr.xx()));
           if (abs((*slId).wheel()) == 0) {
             hRes = histograms.h2DHitRZ_W0.get();
           } else if (abs((*slId).wheel()) == 1) {
             hRes = histograms.h2DHitRZ_W1.get();
           } else if (abs((*slId).wheel()) == 2) {
             hRes = histograms.h2DHitRZ_W2.get();
-}
+          }
         }
         hRes->fill(angleSimSeg,
-            angleBestRHit,
-            posSimSeg,
-            bestRecHitLocalPos.x(),
-            etaSimSeg,
-            phiSimSeg,
-            sqrt(bestRecHitLocalPosErr.xx()),
-            sqrt(bestRecHitLocalDirErr.xx())
-            );
+                   angleBestRHit,
+                   posSimSeg,
+                   bestRecHitLocalPos.x(),
+                   etaSimSeg,
+                   phiSimSeg,
+                   sqrt(bestRecHitLocalPosErr.xx()),
+                   sqrt(bestRecHitLocalDirErr.xx()));
       }
-    } // end of if (nsegm != 0)
+    }  // end of if (nsegm != 0)
 
     // Fill Efficiency plot
     HEff2DHit *hEff = nullptr;
-    if ((*slId).superlayer() == 1 or (*slId).superlayer() == 3) { // RPhi SL
+    if ((*slId).superlayer() == 1 or (*slId).superlayer() == 3) {  // RPhi SL
       hEff = histograms.h2DHitEff_RPhi.get();
-    } else if ((*slId).superlayer() == 2) { // RZ SL
+    } else if ((*slId).superlayer() == 2) {  // RZ SL
       histograms.h2DHitEff_RZ->fill(etaSimSeg, phiSimSeg, posSimSeg, angleSimSeg, recHitFound);
       if (abs((*slId).wheel()) == 0) {
         hEff = histograms.h2DHitEff_RZ_W0.get();
@@ -276,7 +277,7 @@ void DTSegment2DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup con
       }
     }
     hEff->fill(etaSimSeg, phiSimSeg, posSimSeg, angleSimSeg, recHitFound);
-  } // End of loop over superlayers
+  }  // End of loop over superlayers
 }
 
 // declare this as a framework plugin
diff --git a/Validation/DTRecHits/plugins/DTSegment2DQuality.h b/Validation/DTRecHits/plugins/DTSegment2DQuality.h
index bdceacef62ad8..5b52cf4b7dfe0 100644
--- a/Validation/DTRecHits/plugins/DTSegment2DQuality.h
+++ b/Validation/DTRecHits/plugins/DTSegment2DQuality.h
@@ -22,7 +22,7 @@ namespace edm {
   class ParameterSet;
   class Event;
   class EventSetup;
-}
+}  // namespace edm
 
 class HRes2DHit;
 class HEff2DHit;
@@ -33,14 +33,17 @@ namespace dtsegment2d {
 class DTSegment2DQuality : public DQMGlobalEDAnalyzer<dtsegment2d::Histograms> {
 public:
   /// Constructor
-  DTSegment2DQuality(const edm::ParameterSet& pset);
+  DTSegment2DQuality(const edm::ParameterSet &pset);
 
 private:
   /// Book the DQM plots
-  void bookHistograms(DQMStore::ConcurrentBooker &, edm::Run const&, edm::EventSetup const&, dtsegment2d::Histograms &) const override;
+  void bookHistograms(DQMStore::ConcurrentBooker &,
+                      edm::Run const &,
+                      edm::EventSetup const &,
+                      dtsegment2d::Histograms &) const override;
 
   /// Perform the real analysis
-  void dqmAnalyze(edm::Event const&, edm::EventSetup const&, dtsegment2d::Histograms const&) const override;
+  void dqmAnalyze(edm::Event const &, edm::EventSetup const &, dtsegment2d::Histograms const &) const override;
 
 private:
   // Labels to read from event
@@ -59,4 +62,4 @@ class DTSegment2DQuality : public DQMGlobalEDAnalyzer<dtsegment2d::Histograms> {
   bool debug_;
 };
 
-#endif // Validation_DTRecHits_DTSegment2DQuality_h
+#endif  // Validation_DTRecHits_DTSegment2DQuality_h
diff --git a/Validation/DTRecHits/plugins/DTSegment2DSLPhiQuality.cc b/Validation/DTRecHits/plugins/DTSegment2DSLPhiQuality.cc
index 11fa69c4678ee..b19aedb2358a1 100644
--- a/Validation/DTRecHits/plugins/DTSegment2DSLPhiQuality.cc
+++ b/Validation/DTRecHits/plugins/DTSegment2DSLPhiQuality.cc
@@ -26,16 +26,16 @@ using namespace std;
 using namespace edm;
 
 namespace dtsegment2dsl {
-struct Histograms {
-  std::unique_ptr<HRes2DHit> h2DHitSuperPhi;
-  std::unique_ptr<HEff2DHit> h2DHitEff_SuperPhi;
-};
-}
+  struct Histograms {
+    std::unique_ptr<HRes2DHit> h2DHitSuperPhi;
+    std::unique_ptr<HEff2DHit> h2DHitEff_SuperPhi;
+  };
+}  // namespace dtsegment2dsl
 
 using namespace dtsegment2dsl;
 
 // Constructor
-DTSegment2DSLPhiQuality::DTSegment2DSLPhiQuality(const ParameterSet& pset)  {
+DTSegment2DSLPhiQuality::DTSegment2DSLPhiQuality(const ParameterSet &pset) {
   // Get the debug parameter for verbose output
   debug_ = pset.getUntrackedParameter<bool>("debug");
   DTHitQualityUtils::debug = debug_;
@@ -55,26 +55,32 @@ DTSegment2DSLPhiQuality::DTSegment2DSLPhiQuality(const ParameterSet& pset)  {
   local_ = pset.getUntrackedParameter<bool>("local", false);
 }
 
-void DTSegment2DSLPhiQuality::bookHistograms(DQMStore::ConcurrentBooker & booker, edm::Run const& run, edm::EventSetup const& setup, Histograms & histograms) const {
+void DTSegment2DSLPhiQuality::bookHistograms(DQMStore::ConcurrentBooker &booker,
+                                             edm::Run const &run,
+                                             edm::EventSetup const &setup,
+                                             Histograms &histograms) const {
   // Book the histos
-  histograms.h2DHitSuperPhi = std::make_unique<HRes2DHit> ("SuperPhi", booker, doall_, local_);
-  if (doall_) { histograms.h2DHitEff_SuperPhi = std::make_unique<HEff2DHit> ("SuperPhi", booker);
-}
+  histograms.h2DHitSuperPhi = std::make_unique<HRes2DHit>("SuperPhi", booker, doall_, local_);
+  if (doall_) {
+    histograms.h2DHitEff_SuperPhi = std::make_unique<HEff2DHit>("SuperPhi", booker);
+  }
 }
 
 // The real analysis
-void DTSegment2DSLPhiQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup const& setup, Histograms const& histograms) const {
+void DTSegment2DSLPhiQuality::dqmAnalyze(edm::Event const &event,
+                                         edm::EventSetup const &setup,
+                                         Histograms const &histograms) const {
   // Get the DT Geometry
   ESHandle<DTGeometry> dtGeom;
   setup.get<MuonGeometryRecord>().get(dtGeom);
 
   // Get the SimHit collection from the event
   edm::Handle<PSimHitContainer> simHits;
-  event.getByToken(simHitToken_, simHits); // FIXME: second string to be removed
+  event.getByToken(simHitToken_, simHits);  // FIXME: second string to be removed
 
   // Map simHits by chamber
-  map<DTChamberId, PSimHitContainer > simHitsPerCh;
-  for (const auto & simHit : *simHits) {
+  map<DTChamberId, PSimHitContainer> simHitsPerCh;
+  for (const auto &simHit : *simHits) {
     // Create the id of the chamber (the simHits in the DT known their wireId)
     DTChamberId chamberId = (((DTWireId(simHit.detUnitId())).layerId()).superlayerId()).chamberId();
     // Fill the map
@@ -89,44 +95,41 @@ void DTSegment2DSLPhiQuality::dqmAnalyze(edm::Event const& event, edm::EventSetu
     if (debug_) {
       cout << "[DTSegment2DSLPhiQuality]**Warning: no 4D Segments with label: " << segment4DLabel_
            << " in this event, skipping!" << endl;
-}
+    }
     return;
   }
 
   // Loop over all chambers containing a segment
   DTRecSegment4DCollection::id_iterator chamberId;
-  for (chamberId = segment4Ds->id_begin();
-      chamberId != segment4Ds->id_end();
-      ++chamberId) {
-
+  for (chamberId = segment4Ds->id_begin(); chamberId != segment4Ds->id_end(); ++chamberId) {
     //------------------------- simHits ---------------------------//
     // Get simHits of each chamber
-    PSimHitContainer simHits =  simHitsPerCh[(*chamberId)];
+    PSimHitContainer simHits = simHitsPerCh[(*chamberId)];
 
     // Map simhits per wire
-    map<DTWireId, PSimHitContainer > simHitsPerWire = DTHitQualityUtils::mapSimHitsPerWire(simHits);
-    map<DTWireId, const PSimHit*> muSimHitPerWire = DTHitQualityUtils::mapMuSimHitsPerWire(simHitsPerWire);
+    map<DTWireId, PSimHitContainer> simHitsPerWire = DTHitQualityUtils::mapSimHitsPerWire(simHits);
+    map<DTWireId, const PSimHit *> muSimHitPerWire = DTHitQualityUtils::mapMuSimHitsPerWire(simHitsPerWire);
     int nMuSimHit = muSimHitPerWire.size();
     if (nMuSimHit == 0 || nMuSimHit == 1) {
       if (debug_ && nMuSimHit == 1) {
         cout << "[DTSegment2DSLPhiQuality] Only " << nMuSimHit << " mu SimHit in this chamber, skipping!" << endl;
-}
-      continue; // If no or only one mu SimHit is found skip this chamber
+      }
+      continue;  // If no or only one mu SimHit is found skip this chamber
     }
     if (debug_) {
       cout << "=== Chamber " << (*chamberId) << " has " << nMuSimHit << " SimHits" << endl;
-}
+    }
 
     // Find outer and inner mu SimHit to build a segment
-    pair<const PSimHit*, const PSimHit*> inAndOutSimHit = DTHitQualityUtils::findMuSimSegment(muSimHitPerWire);
+    pair<const PSimHit *, const PSimHit *> inAndOutSimHit = DTHitQualityUtils::findMuSimSegment(muSimHitPerWire);
 
     // Find direction and position of the sim Segment in Chamber RF
-    pair<LocalVector, LocalPoint> dirAndPosSimSegm = DTHitQualityUtils::findMuSimSegmentDirAndPos(inAndOutSimHit,
-        (*chamberId),&(*dtGeom));
+    pair<LocalVector, LocalPoint> dirAndPosSimSegm =
+        DTHitQualityUtils::findMuSimSegmentDirAndPos(inAndOutSimHit, (*chamberId), &(*dtGeom));
 
     LocalVector simSegmLocalDir = dirAndPosSimSegm.first;
     LocalPoint simSegmLocalPos = dirAndPosSimSegm.second;
-    const DTChamber* chamber = dtGeom->chamber(*chamberId);
+    const DTChamber *chamber = dtGeom->chamber(*chamberId);
     GlobalPoint simSegmGlobalPos = chamber->toGlobal(simSegmLocalPos);
 
     // Atan(x/z) angle and x position in SL RF
@@ -140,7 +143,7 @@ void DTSegment2DSLPhiQuality::dqmAnalyze(edm::Event const& event, edm::EventSetu
       cout << "  Simulated segment:  local direction " << simSegmLocalDir << endl
            << "                      local position  " << simSegmLocalPos << endl
            << "                      angle           " << angleSimSeg << endl;
-}
+    }
 
     //---------------------------- recHits --------------------------//
     // Get the range of rechit for the corresponding chamberId
@@ -148,36 +151,37 @@ void DTSegment2DSLPhiQuality::dqmAnalyze(edm::Event const& event, edm::EventSetu
     DTRecSegment4DCollection::range range = segment4Ds->get(*chamberId);
     int nsegm = distance(range.first, range.second);
     if (debug_) {
-      cout << "   Chamber: " << *chamberId << " has " << nsegm
-           << " 4D segments" << endl;
-}
+      cout << "   Chamber: " << *chamberId << " has " << nsegm << " 4D segments" << endl;
+    }
 
-    if (nsegm!= 0) {
+    if (nsegm != 0) {
       // Find the best RecHit: look for the 4D RecHit with the phi angle closest
       // to that of segment made of SimHits.
       // RecHits must have delta alpha and delta position within 5 sigma of
       // the residual distribution (we are looking for residuals of segments
       // usefull to the track fit) for efficency purpose
-      const DTRecSegment2D* bestRecHit = nullptr;
+      const DTRecSegment2D *bestRecHit = nullptr;
       bool bestRecHitFound = false;
       double deltaAlpha = 99999;
 
       // Loop over the recHits of this chamberId
-      for (DTRecSegment4DCollection::const_iterator segment4D = range.first;
-          segment4D!= range.second;
-          ++segment4D) {
+      for (DTRecSegment4DCollection::const_iterator segment4D = range.first; segment4D != range.second; ++segment4D) {
         // Check the dimension
         if ((*segment4D).dimension() != 4) {
-          if (debug_) { cout << "[DTSegment2DSLPhiQuality]***Error: This is not 4D segment!!!" << endl;
-}
+          if (debug_) {
+            cout << "[DTSegment2DSLPhiQuality]***Error: This is not 4D "
+                    "segment!!!"
+                 << endl;
+          }
           continue;
         }
 
         // Get 2D superPhi segments from 4D segments
-        const DTChamberRecSegment2D* phiSegment2D = (*segment4D).phiSegment();
+        const DTChamberRecSegment2D *phiSegment2D = (*segment4D).phiSegment();
         if ((*phiSegment2D).dimension() != 2) {
-          if (debug_) { cout << "[DTSegment2DQuality]***Error: This is not 2D segment!!!" << endl;
-}
+          if (debug_) {
+            cout << "[DTSegment2DQuality]***Error: This is not 2D segment!!!" << endl;
+          }
           abort();
         }
 
@@ -187,9 +191,9 @@ void DTSegment2DSLPhiQuality::dqmAnalyze(edm::Event const& event, edm::EventSetu
         float recSegAlpha = DTHitQualityUtils::findSegmentAlphaAndBeta(recSegDirection).first;
         if (debug_) {
           cout << "  RecSegment direction: " << recSegDirection << endl
-               << "             position : " <<  (*phiSegment2D).localPosition() << endl
+               << "             position : " << (*phiSegment2D).localPosition() << endl
                << "             alpha    : " << recSegAlpha << endl;
-}
+        }
 
         if (fabs(recSegAlpha - angleSimSeg) < deltaAlpha) {
           deltaAlpha = fabs(recSegAlpha - angleSimSeg);
@@ -207,33 +211,28 @@ void DTSegment2DSLPhiQuality::dqmAnalyze(edm::Event const& event, edm::EventSetu
         LocalError bestRecHitLocalDirErr = bestRecHit->localDirectionError();
 
         float angleBestRHit = DTHitQualityUtils::findSegmentAlphaAndBeta(bestRecHitLocalDir).first;
-        if (fabs(angleBestRHit - angleSimSeg) < 5*sigmaResAngle_ &&
-            fabs(bestRecHitLocalPos.x() - posSimSeg) < 5*sigmaResPos_) {
+        if (fabs(angleBestRHit - angleSimSeg) < 5 * sigmaResAngle_ &&
+            fabs(bestRecHitLocalPos.x() - posSimSeg) < 5 * sigmaResPos_) {
           recHitFound = true;
         }
 
         // Fill Residual histos
         histograms.h2DHitSuperPhi->fill(angleSimSeg,
-            angleBestRHit,
-            posSimSeg,
-            bestRecHitLocalPos.x(),
-            etaSimSeg,
-            phiSimSeg,
-            sqrt(bestRecHitLocalPosErr.xx()),
-            sqrt(bestRecHitLocalDirErr.xx())
-            );
+                                        angleBestRHit,
+                                        posSimSeg,
+                                        bestRecHitLocalPos.x(),
+                                        etaSimSeg,
+                                        phiSimSeg,
+                                        sqrt(bestRecHitLocalPosErr.xx()),
+                                        sqrt(bestRecHitLocalDirErr.xx()));
       }
-    } // end of if (nsegm!= 0)
+    }  // end of if (nsegm!= 0)
 
     // Fill Efficiency plot
     if (doall_) {
-      histograms.h2DHitEff_SuperPhi->fill(etaSimSeg,
-          phiSimSeg,
-          posSimSeg,
-          angleSimSeg,
-          recHitFound);
+      histograms.h2DHitEff_SuperPhi->fill(etaSimSeg, phiSimSeg, posSimSeg, angleSimSeg, recHitFound);
     }
-  } // End of loop over chambers
+  }  // End of loop over chambers
 }
 
 // declare this as a framework plugin
diff --git a/Validation/DTRecHits/plugins/DTSegment2DSLPhiQuality.h b/Validation/DTRecHits/plugins/DTSegment2DSLPhiQuality.h
index f5e66373129e6..d0e3d532cf25e 100644
--- a/Validation/DTRecHits/plugins/DTSegment2DSLPhiQuality.h
+++ b/Validation/DTRecHits/plugins/DTSegment2DSLPhiQuality.h
@@ -2,8 +2,8 @@
 #define Validation_DTRecHits_DTSegment2DSLPhiQuality_h
 
 /** \class DTSegment2DSLPhiQuality
- *  Basic analyzer class which accesses 2D DTSegments reconstructed with both SL Phi
- *  and plot resolution comparing reconstructed and simulated quantities
+ *  Basic analyzer class which accesses 2D DTSegments reconstructed with both SL
+ * Phi and plot resolution comparing reconstructed and simulated quantities
  *
  *  \author S. Bolognesi and G. Cerminara - INFN Torino
  */
@@ -22,7 +22,7 @@ namespace edm {
   class ParameterSet;
   class Event;
   class EventSetup;
-}
+}  // namespace edm
 
 class HRes2DHit;
 class HEff2DHit;
@@ -33,14 +33,17 @@ namespace dtsegment2dsl {
 class DTSegment2DSLPhiQuality : public DQMGlobalEDAnalyzer<dtsegment2dsl::Histograms> {
 public:
   /// Constructor
-  DTSegment2DSLPhiQuality(const edm::ParameterSet& pset);
+  DTSegment2DSLPhiQuality(const edm::ParameterSet &pset);
 
 private:
   /// Book the DQM plots
-  void bookHistograms(DQMStore::ConcurrentBooker &, edm::Run const&, edm::EventSetup const&, dtsegment2dsl::Histograms &) const override;
+  void bookHistograms(DQMStore::ConcurrentBooker &,
+                      edm::Run const &,
+                      edm::EventSetup const &,
+                      dtsegment2dsl::Histograms &) const override;
 
   /// Perform the real analysis
-  void dqmAnalyze(edm::Event const&, edm::EventSetup const&, dtsegment2dsl::Histograms const&) const override;
+  void dqmAnalyze(edm::Event const &, edm::EventSetup const &, dtsegment2dsl::Histograms const &) const override;
 
 private:
   // Labels to read from event
@@ -62,4 +65,4 @@ class DTSegment2DSLPhiQuality : public DQMGlobalEDAnalyzer<dtsegment2dsl::Histog
   bool debug_;
 };
 
-#endif // Validation_DTRecHits_DTSegment2DSLPhiQuality_h
+#endif  // Validation_DTRecHits_DTSegment2DSLPhiQuality_h
diff --git a/Validation/DTRecHits/plugins/DTSegment4DQuality.cc b/Validation/DTRecHits/plugins/DTSegment4DQuality.cc
index 9c1bfd529eca5..ae3b4e6be8d7c 100644
--- a/Validation/DTRecHits/plugins/DTSegment4DQuality.cc
+++ b/Validation/DTRecHits/plugins/DTSegment4DQuality.cc
@@ -22,25 +22,24 @@
 #include "DTSegment4DQuality.h"
 #include "Histograms.h"
 
-
 using namespace std;
 using namespace edm;
 
 namespace dtsegment4d {
-struct Histograms {
-  std::unique_ptr<HRes4DHit> h4DHit;
-  std::unique_ptr<HRes4DHit> h4DHit_W0;
-  std::unique_ptr<HRes4DHit> h4DHit_W1;
-  std::unique_ptr<HRes4DHit> h4DHit_W2;
-  std::unique_ptr<HRes4DHit> h4DHitWS[3][4];
-
-  std::unique_ptr<HEff4DHit> hEff_All;
-  std::unique_ptr<HEff4DHit> hEff_W0;
-  std::unique_ptr<HEff4DHit> hEff_W1;
-  std::unique_ptr<HEff4DHit> hEff_W2;
-  std::unique_ptr<HEff4DHit> hEffWS[3][4];
-};
-}
+  struct Histograms {
+    std::unique_ptr<HRes4DHit> h4DHit;
+    std::unique_ptr<HRes4DHit> h4DHit_W0;
+    std::unique_ptr<HRes4DHit> h4DHit_W1;
+    std::unique_ptr<HRes4DHit> h4DHit_W2;
+    std::unique_ptr<HRes4DHit> h4DHitWS[3][4];
+
+    std::unique_ptr<HEff4DHit> hEff_All;
+    std::unique_ptr<HEff4DHit> hEff_W0;
+    std::unique_ptr<HEff4DHit> hEff_W1;
+    std::unique_ptr<HEff4DHit> hEff_W2;
+    std::unique_ptr<HEff4DHit> hEffWS[3][4];
+  };
+}  // namespace dtsegment4d
 using namespace dtsegment4d;
 
 // In phi SLs, The dependency on X and angle is specular in positive
@@ -54,7 +53,7 @@ namespace {
 }
 
 // Constructor
-DTSegment4DQuality::DTSegment4DQuality(const ParameterSet& pset)  {
+DTSegment4DQuality::DTSegment4DQuality(const ParameterSet &pset) {
   // Get the debug parameter for verbose output
   debug_ = pset.getUntrackedParameter<bool>("debug");
   DTHitQualityUtils::debug = debug_;
@@ -76,36 +75,41 @@ DTSegment4DQuality::DTSegment4DQuality(const ParameterSet& pset)  {
   local_ = pset.getUntrackedParameter<bool>("local", false);
 }
 
-void DTSegment4DQuality::bookHistograms(DQMStore::ConcurrentBooker & booker, edm::Run const& run, edm::EventSetup const& setup, Histograms & histograms) const {
-  histograms.h4DHit     = std::make_unique<HRes4DHit>("All", booker, doall_, local_);
-  histograms.h4DHit_W0  = std::make_unique<HRes4DHit>("W0", booker, doall_, local_);
-  histograms.h4DHit_W1  = std::make_unique<HRes4DHit>("W1", booker, doall_, local_);
-  histograms.h4DHit_W2  = std::make_unique<HRes4DHit>("W2", booker, doall_, local_);
+void DTSegment4DQuality::bookHistograms(DQMStore::ConcurrentBooker &booker,
+                                        edm::Run const &run,
+                                        edm::EventSetup const &setup,
+                                        Histograms &histograms) const {
+  histograms.h4DHit = std::make_unique<HRes4DHit>("All", booker, doall_, local_);
+  histograms.h4DHit_W0 = std::make_unique<HRes4DHit>("W0", booker, doall_, local_);
+  histograms.h4DHit_W1 = std::make_unique<HRes4DHit>("W1", booker, doall_, local_);
+  histograms.h4DHit_W2 = std::make_unique<HRes4DHit>("W2", booker, doall_, local_);
 
   if (doall_) {
     histograms.hEff_All = std::make_unique<HEff4DHit>("All", booker);
-    histograms.hEff_W0  = std::make_unique<HEff4DHit>("W0", booker);
-    histograms.hEff_W1  = std::make_unique<HEff4DHit>("W1", booker);
-    histograms.hEff_W2  = std::make_unique<HEff4DHit>("W2", booker);
+    histograms.hEff_W0 = std::make_unique<HEff4DHit>("W0", booker);
+    histograms.hEff_W1 = std::make_unique<HEff4DHit>("W1", booker);
+    histograms.hEff_W2 = std::make_unique<HEff4DHit>("W2", booker);
   }
 
   if (local_) {
     // Plots with finer granularity, not to be included in DQM
-    TString name ="W";
-    for (long w = 0;w<= 2;++w) {
-      for (long s = 1;s<= 4;++s) {
-	// FIXME station 4 is not filled
-	TString nameWS =(name+w+"_St"+s);
-	histograms.h4DHitWS[w][s-1] = std::make_unique<HRes4DHit>(nameWS.Data(), booker, doall_, local_);
-	histograms.hEffWS[w][s-1]   = std::make_unique<HEff4DHit>(nameWS.Data(), booker);
+    TString name = "W";
+    for (long w = 0; w <= 2; ++w) {
+      for (long s = 1; s <= 4; ++s) {
+        // FIXME station 4 is not filled
+        TString nameWS = (name + w + "_St" + s);
+        histograms.h4DHitWS[w][s - 1] = std::make_unique<HRes4DHit>(nameWS.Data(), booker, doall_, local_);
+        histograms.hEffWS[w][s - 1] = std::make_unique<HEff4DHit>(nameWS.Data(), booker);
       }
     }
   }
 };
 
 // The real analysis
-void DTSegment4DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup const& setup, Histograms const& histograms) const {
-  const float epsilon = 5e-5; // numerical accuracy on angles [rad}
+void DTSegment4DQuality::dqmAnalyze(edm::Event const &event,
+                                    edm::EventSetup const &setup,
+                                    Histograms const &histograms) const {
+  const float epsilon = 5e-5;  // numerical accuracy on angles [rad}
 
   // Get the DT Geometry
   ESHandle<DTGeometry> dtGeom;
@@ -113,14 +117,14 @@ void DTSegment4DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup con
 
   // Get the SimHit collection from the event
   edm::Handle<PSimHitContainer> simHits;
-  event.getByToken(simHitToken_, simHits); // FIXME: second string to be removed
+  event.getByToken(simHitToken_, simHits);  // FIXME: second string to be removed
 
   // Map simHits by chamber
-  map<DTChamberId, PSimHitContainer > simHitsPerCh;
-  for (const auto & simHit : *simHits) {
-
-    // Consider only muon simhits; the others are not considered elsewhere in this class!
-    if (abs(simHit.particleType())== 13) {
+  map<DTChamberId, PSimHitContainer> simHitsPerCh;
+  for (const auto &simHit : *simHits) {
+    // Consider only muon simhits; the others are not considered elsewhere in
+    // this class!
+    if (abs(simHit.particleType()) == 13) {
       // Create the id of the chamber (the simHits in the DT known their wireId)
       DTChamberId chamberId = (((DTWireId(simHit.detUnitId())).layerId()).superlayerId()).chamberId();
       // Fill the map
@@ -134,49 +138,52 @@ void DTSegment4DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup con
 
   if (!segment4Ds.isValid()) {
     if (debug_) {
-      cout << "[DTSegment4DQuality]**Warning: no 4D Segments with label: " << segment4DLabel_ << " in this event, skipping!" << endl;
-}
+      cout << "[DTSegment4DQuality]**Warning: no 4D Segments with label: " << segment4DLabel_
+           << " in this event, skipping!" << endl;
+    }
     return;
   }
 
   // Loop over all chambers containing a (muon) simhit
-  for (auto & simHitsInChamber : simHitsPerCh) {
-
+  for (auto &simHitsInChamber : simHitsPerCh) {
     DTChamberId chamberId = simHitsInChamber.first;
     int station = chamberId.station();
-    if (station == 4 && !(local_) ) { continue; // use DTSegment2DSLPhiQuality to analyze MB4 performaces in DQM
-}
+    if (station == 4 && !(local_)) {
+      continue;  // use DTSegment2DSLPhiQuality to analyze MB4 performaces in DQM
+    }
     int wheel = chamberId.wheel();
 
     //------------------------- simHits ---------------------------//
     // Get simHits of this chamber
-    const PSimHitContainer& simHits = simHitsInChamber.second;
+    const PSimHitContainer &simHits = simHitsInChamber.second;
 
     // Map simhits per wire
-    auto const& simHitsPerWire = DTHitQualityUtils::mapSimHitsPerWire(simHits);
-    auto const& muSimHitPerWire = DTHitQualityUtils::mapMuSimHitsPerWire(simHitsPerWire);
+    auto const &simHitsPerWire = DTHitQualityUtils::mapSimHitsPerWire(simHits);
+    auto const &muSimHitPerWire = DTHitQualityUtils::mapMuSimHitsPerWire(simHitsPerWire);
     int nMuSimHit = muSimHitPerWire.size();
-    if (nMuSimHit <2) { // Skip chamber with less than 2 cells with mu hits
+    if (nMuSimHit < 2) {  // Skip chamber with less than 2 cells with mu hits
       continue;
     }
     if (debug_) {
       cout << "=== Chamber " << chamberId << " has " << nMuSimHit << " SimHits" << endl;
-}
+    }
 
     // Find outer and inner mu SimHit to build a segment
-    pair<const PSimHit*, const PSimHit*> inAndOutSimHit = DTHitQualityUtils::findMuSimSegment(muSimHitPerWire);
+    pair<const PSimHit *, const PSimHit *> inAndOutSimHit = DTHitQualityUtils::findMuSimSegment(muSimHitPerWire);
 
     // Consider only sim segments crossing at least 2 SLs
-    if ((DTWireId(inAndOutSimHit.first->detUnitId())).superlayer() == (DTWireId(inAndOutSimHit.second->detUnitId())).superLayer()) { continue;
-}
+    if ((DTWireId(inAndOutSimHit.first->detUnitId())).superlayer() ==
+        (DTWireId(inAndOutSimHit.second->detUnitId())).superLayer()) {
+      continue;
+    }
 
     // Find direction and position of the sim Segment in Chamber RF
-    pair<LocalVector, LocalPoint> dirAndPosSimSegm = DTHitQualityUtils::findMuSimSegmentDirAndPos(inAndOutSimHit,
-        chamberId,&(*dtGeom));
+    pair<LocalVector, LocalPoint> dirAndPosSimSegm =
+        DTHitQualityUtils::findMuSimSegmentDirAndPos(inAndOutSimHit, chamberId, &(*dtGeom));
 
     LocalVector simSegmLocalDir = dirAndPosSimSegm.first;
     LocalPoint simSegmLocalPos = dirAndPosSimSegm.second;
-    const DTChamber* chamber = dtGeom->chamber(chamberId);
+    const DTChamber *chamber = dtGeom->chamber(chamberId);
     GlobalPoint simSegmGlobalPos = chamber->toGlobal(simSegmLocalPos);
     GlobalVector simSegmGlobalDir = chamber->toGlobal(simSegmLocalDir);
 
@@ -197,7 +204,7 @@ void DTSegment4DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup con
            << "                      local position  " << simSegmLocalPos << endl
            << "                      alpha           " << alphaSimSeg << endl
            << "                      beta            " << betaSimSeg << endl;
-}
+    }
 
     //---------------------------- recHits --------------------------//
     // Get the range of rechit for the corresponding chamberId
@@ -205,27 +212,23 @@ void DTSegment4DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup con
     DTRecSegment4DCollection::range range = segment4Ds->get(chamberId);
     int nsegm = distance(range.first, range.second);
     if (debug_) {
-      cout << "   Chamber: " << chamberId << " has " << nsegm
-           << " 4D segments" << endl;
-}
+      cout << "   Chamber: " << chamberId << " has " << nsegm << " 4D segments" << endl;
+    }
 
-    if (nsegm!= 0) {
+    if (nsegm != 0) {
       // Find the best RecHit: look for the 4D RecHit with the phi angle closest
       // to that of segment made of SimHits.
       // RecHits must have delta alpha and delta position within 5 sigma of
       // the residual distribution (we are looking for residuals of segments
       // usefull to the track fit) for efficency purpose
-      const DTRecSegment4D* bestRecHit = nullptr;
+      const DTRecSegment4D *bestRecHit = nullptr;
       double deltaAlpha = 99999;
-      double deltaBeta  = 99999;
+      double deltaBeta = 99999;
 
       // Loop over the recHits of this chamberId
-      for (DTRecSegment4DCollection::const_iterator segment4D = range.first;
-          segment4D!= range.second;
-          ++segment4D) {
-
+      for (DTRecSegment4DCollection::const_iterator segment4D = range.first; segment4D != range.second; ++segment4D) {
         // Consider only segments with both projections
-        if (station!= 4 && (*segment4D).dimension() != 4) {
+        if (station != 4 && (*segment4D).dimension() != 4) {
           continue;
         }
         // Segment Local Direction and position (in Chamber RF)
@@ -234,37 +237,36 @@ void DTSegment4DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup con
 
         pair<double, double> ab = DTHitQualityUtils::findSegmentAlphaAndBeta(recSegDirection);
         float recSegAlpha = ab.first;
-        float recSegBeta  = ab.second;
+        float recSegBeta = ab.second;
 
         if (debug_) {
-          cout << &(*segment4D)
-               << "  RecSegment direction: " << recSegDirection << endl
+          cout << &(*segment4D) << "  RecSegment direction: " << recSegDirection << endl
                << "             position : " << (*segment4D).localPosition() << endl
                << "             alpha    : " << recSegAlpha << endl
                << "             beta     : " << recSegBeta << endl
-               << "             nhits    : " << (*segment4D).phiSegment()->recHits().size() << " " << (((*segment4D).zSegment()!= nullptr)?(*segment4D).zSegment()->recHits().size():0)
-               << endl;
-}
-
+               << "             nhits    : " << (*segment4D).phiSegment()->recHits().size() << " "
+               << (((*segment4D).zSegment() != nullptr) ? (*segment4D).zSegment()->recHits().size() : 0) << endl;
+        }
 
         float dAlphaRecSim = fabs(recSegAlpha - alphaSimSeg);
         float dBetaRecSim = fabs(recSegBeta - betaSimSeg);
 
-
-        if ((fabs(recSegPosition.x()-simSegmLocalPos.x())<4)       // require rec and sim segments to be ~in the same cell in x
-            && ((fabs(recSegPosition.y()-simSegmLocalPos.y())<4)||(*segment4D).dimension()<4)) { // ~in the same cell in y, if segment has the theta view
+        if ((fabs(recSegPosition.x() - simSegmLocalPos.x()) <
+             4)  // require rec and sim segments to be ~in the same cell in x
+            && ((fabs(recSegPosition.y() - simSegmLocalPos.y()) < 4) ||
+                (*segment4D).dimension() < 4)) {  // ~in the same cell in y, if segment has the theta view
           ++count_seg;
 
-          if (fabs(dAlphaRecSim-deltaAlpha) < epsilon) { // Numerically equivalent alphas, choose based on beta	
+          if (fabs(dAlphaRecSim - deltaAlpha) < epsilon) {  // Numerically equivalent alphas, choose based on beta
             if (dBetaRecSim < deltaBeta) {
               deltaAlpha = dAlphaRecSim;
-              deltaBeta  = dBetaRecSim;
-              bestRecHit = &(*segment4D);		
+              deltaBeta = dBetaRecSim;
+              bestRecHit = &(*segment4D);
             }
 
           } else if (dAlphaRecSim < deltaAlpha) {
             deltaAlpha = dAlphaRecSim;
-            deltaBeta  = dBetaRecSim;
+            deltaBeta = dBetaRecSim;
             bestRecHit = &(*segment4D);
           }
         }
@@ -274,7 +276,7 @@ void DTSegment4DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup con
       if (bestRecHit) {
         if (debug_) {
           cout << endl << "Chosen: " << bestRecHit << endl;
-}
+        }
         // Best rechit direction and position in Chamber RF
         LocalPoint bestRecHitLocalPos = bestRecHit->localPosition();
         LocalVector bestRecHitLocalDir = bestRecHit->localDirection();
@@ -284,20 +286,21 @@ void DTSegment4DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup con
 
         pair<double, double> ab = DTHitQualityUtils::findSegmentAlphaAndBeta(bestRecHitLocalDir);
         float alphaBestRHit = ab.first;
-        float betaBestRHit  = ab.second;
+        float betaBestRHit = ab.second;
         // Errors on alpha and beta
 
         // Get position and direction using the rx projection (so in SL
         // reference frame). Note that x (and y) are swapped wrt to Chamber
         // frame
         // if (bestRecHit->hasZed()) //
-        const DTSLRecSegment2D * zedRecSeg = bestRecHit->zSegment();
+        const DTSLRecSegment2D *zedRecSeg = bestRecHit->zSegment();
         LocalPoint bestRecHitLocalPosRZ;
         LocalVector bestRecHitLocalDirRZ;
         LocalError bestRecHitLocalPosErrRZ;
         LocalError bestRecHitLocalDirErrRZ;
-        LocalPoint simSegLocalPosRZ; // FIXME: this is not set for segments with only the phi view.
-        float alphaBestRHitRZ = 0; // angle measured in the RZ SL, in its own frame
+        LocalPoint simSegLocalPosRZ;  // FIXME: this is not set for segments with
+                                      // only the phi view.
+        float alphaBestRHitRZ = 0;    // angle measured in the RZ SL, in its own frame
         float alphaSimSegRZ = betaSimSeg;
         if (zedRecSeg) {
           bestRecHitLocalPosRZ = zedRecSeg->localPosition();
@@ -310,30 +313,27 @@ void DTSegment4DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup con
           alphaBestRHitRZ = DTHitQualityUtils::findSegmentAlphaAndBeta(bestRecHitLocalDirRZ).first;
 
           // Get SimSeg position and Direction in rZ SL frame
-          const DTSuperLayer* sl = dtGeom->superLayer(zedRecSeg->superLayerId());
+          const DTSuperLayer *sl = dtGeom->superLayer(zedRecSeg->superLayerId());
           LocalPoint simSegLocalPosRZTmp = sl->toLocal(simSegmGlobalPos);
           LocalVector simSegLocalDirRZ = sl->toLocal(simSegmGlobalDir);
           simSegLocalPosRZ =
-            simSegLocalPosRZTmp + simSegLocalDirRZ*(-simSegLocalPosRZTmp.z()/(cos(simSegLocalDirRZ.theta())));
+              simSegLocalPosRZTmp + simSegLocalDirRZ * (-simSegLocalPosRZTmp.z() / (cos(simSegLocalDirRZ.theta())));
           alphaSimSegRZ = DTHitQualityUtils::findSegmentAlphaAndBeta(simSegLocalDirRZ).first;
 
           if (debug_) {
-            cout <<
-              "RZ SL: recPos " << bestRecHitLocalPosRZ <<
-              "recDir " << bestRecHitLocalDirRZ <<
-              "recAlpha " << alphaBestRHitRZ << endl <<
-              "RZ SL: simPos " << simSegLocalPosRZ <<
-              "simDir " << simSegLocalDirRZ <<
-              "simAlpha " << alphaSimSegRZ << endl ;
-}
+            cout << "RZ SL: recPos " << bestRecHitLocalPosRZ << "recDir " << bestRecHitLocalDirRZ << "recAlpha "
+                 << alphaBestRHitRZ << endl
+                 << "RZ SL: simPos " << simSegLocalPosRZ << "simDir " << simSegLocalDirRZ << "simAlpha "
+                 << alphaSimSegRZ << endl;
+          }
         }
 
         // get nhits and t0
-        const DTChamberRecSegment2D* phiSeg = bestRecHit->phiSegment();
+        const DTChamberRecSegment2D *phiSeg = bestRecHit->phiSegment();
 
-        float t0phi   = -999;
+        float t0phi = -999;
         float t0theta = -999;
-        int nHitPhi   = 0;
+        int nHitPhi = 0;
         int nHitTheta = 0;
 
         if (phiSeg) {
@@ -348,12 +348,14 @@ void DTSegment4DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup con
 
         recHitFound = true;
 
-        // Mirror alpha in phi SLs so that + and - wheels can be plotted together
-        if (mirrorMinusWheels && wheel<0) {
-          alphaSimSeg*=-1.;
-          alphaBestRHit*=-1.;
-          // Note: local X (xSimSeg, bestRecHitLocalPos.x() would have to be mirrored as well;
-          // but at the moment there is no plot of dependency vs X, except for efficiency.
+        // Mirror alpha in phi SLs so that + and - wheels can be plotted
+        // together
+        if (mirrorMinusWheels && wheel < 0) {
+          alphaSimSeg *= -1.;
+          alphaBestRHit *= -1.;
+          // Note: local X (xSimSeg, bestRecHitLocalPos.x() would have to be
+          // mirrored as well; but at the moment there is no plot of dependency
+          // vs X, except for efficiency.
         }
 
         // Fill Residual histos
@@ -365,82 +367,95 @@ void DTSegment4DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup con
           histo = histograms.h4DHit_W1.get();
         } else if (abs(wheel) == 2) {
           histo = histograms.h4DHit_W2.get();
-}
+        }
 
         float sigmaAlphaBestRhit = sqrt(DTHitQualityUtils::sigmaAngle(alphaBestRHit, bestRecHitLocalDirErr.xx()));
-        float sigmaBetaBestRhit  = sqrt(DTHitQualityUtils::sigmaAngle(betaBestRHit, bestRecHitLocalDirErr.yy())); // FIXME this misses the contribution from uncertainty in extrapolation!
+        float sigmaBetaBestRhit =
+            sqrt(DTHitQualityUtils::sigmaAngle(betaBestRHit,
+                                               bestRecHitLocalDirErr.yy()));  // FIXME this misses the contribution
+                                                                              // from uncertainty in extrapolation!
         float sigmaAlphaBestRhitRZ = sqrt(DTHitQualityUtils::sigmaAngle(alphaBestRHitRZ, bestRecHitLocalDirErrRZ.xx()));
 
         histo->fill(alphaSimSeg,
-            alphaBestRHit,
-            betaSimSeg,
-            betaBestRHit,
-            xSimSeg,
-            bestRecHitLocalPos.x(),
-            ySimSeg,
-            bestRecHitLocalPos.y(),
-            etaSimSeg,
-            phiSimSeg,
-            bestRecHitLocalPosRZ.x(),
-            simSegLocalPosRZ.x(),
-            alphaBestRHitRZ,
-            alphaSimSegRZ,
-            sigmaAlphaBestRhit,
-            sigmaBetaBestRhit,
-            sqrt(bestRecHitLocalPosErr.xx()),
-            sqrt(bestRecHitLocalPosErr.yy()),
-            sigmaAlphaBestRhitRZ,
-            sqrt(bestRecHitLocalPosErrRZ.xx()),
-            nHitPhi, nHitTheta, t0phi, t0theta);
+                    alphaBestRHit,
+                    betaSimSeg,
+                    betaBestRHit,
+                    xSimSeg,
+                    bestRecHitLocalPos.x(),
+                    ySimSeg,
+                    bestRecHitLocalPos.y(),
+                    etaSimSeg,
+                    phiSimSeg,
+                    bestRecHitLocalPosRZ.x(),
+                    simSegLocalPosRZ.x(),
+                    alphaBestRHitRZ,
+                    alphaSimSegRZ,
+                    sigmaAlphaBestRhit,
+                    sigmaBetaBestRhit,
+                    sqrt(bestRecHitLocalPosErr.xx()),
+                    sqrt(bestRecHitLocalPosErr.yy()),
+                    sigmaAlphaBestRhitRZ,
+                    sqrt(bestRecHitLocalPosErrRZ.xx()),
+                    nHitPhi,
+                    nHitTheta,
+                    t0phi,
+                    t0theta);
 
         histograms.h4DHit->fill(alphaSimSeg,
-            alphaBestRHit,
-            betaSimSeg,
-            betaBestRHit,
-            xSimSeg,
-            bestRecHitLocalPos.x(),
-            ySimSeg,
-            bestRecHitLocalPos.y(),
-            etaSimSeg,
-            phiSimSeg,
-            bestRecHitLocalPosRZ.x(),
-            simSegLocalPosRZ.x(),
-            alphaBestRHitRZ,
-            alphaSimSegRZ,
-            sigmaAlphaBestRhit,
-            sigmaBetaBestRhit,
-            sqrt(bestRecHitLocalPosErr.xx()),
-            sqrt(bestRecHitLocalPosErr.yy()),
-            sigmaAlphaBestRhitRZ,
-            sqrt(bestRecHitLocalPosErrRZ.xx()),
-            nHitPhi, nHitTheta, t0phi, t0theta);
-
-        if (local_) { histograms.h4DHitWS[abs(wheel)][station-1]->fill(alphaSimSeg,
-            alphaBestRHit,
-            betaSimSeg,
-            betaBestRHit,
-            xSimSeg,
-            bestRecHitLocalPos.x(),
-            ySimSeg,
-            bestRecHitLocalPos.y(),
-            etaSimSeg,
-            phiSimSeg,
-            bestRecHitLocalPosRZ.x(),
-            simSegLocalPosRZ.x(),
-            alphaBestRHitRZ,
-            alphaSimSegRZ,
-            sigmaAlphaBestRhit,
-            sigmaBetaBestRhit,
-            sqrt(bestRecHitLocalPosErr.xx()),
-            sqrt(bestRecHitLocalPosErr.yy()),
-            sigmaAlphaBestRhitRZ,
-            sqrt(bestRecHitLocalPosErrRZ.xx()),
-            nHitPhi, nHitTheta, t0phi, t0theta);
-}
+                                alphaBestRHit,
+                                betaSimSeg,
+                                betaBestRHit,
+                                xSimSeg,
+                                bestRecHitLocalPos.x(),
+                                ySimSeg,
+                                bestRecHitLocalPos.y(),
+                                etaSimSeg,
+                                phiSimSeg,
+                                bestRecHitLocalPosRZ.x(),
+                                simSegLocalPosRZ.x(),
+                                alphaBestRHitRZ,
+                                alphaSimSegRZ,
+                                sigmaAlphaBestRhit,
+                                sigmaBetaBestRhit,
+                                sqrt(bestRecHitLocalPosErr.xx()),
+                                sqrt(bestRecHitLocalPosErr.yy()),
+                                sigmaAlphaBestRhitRZ,
+                                sqrt(bestRecHitLocalPosErrRZ.xx()),
+                                nHitPhi,
+                                nHitTheta,
+                                t0phi,
+                                t0theta);
+
+        if (local_) {
+          histograms.h4DHitWS[abs(wheel)][station - 1]->fill(alphaSimSeg,
+                                                             alphaBestRHit,
+                                                             betaSimSeg,
+                                                             betaBestRHit,
+                                                             xSimSeg,
+                                                             bestRecHitLocalPos.x(),
+                                                             ySimSeg,
+                                                             bestRecHitLocalPos.y(),
+                                                             etaSimSeg,
+                                                             phiSimSeg,
+                                                             bestRecHitLocalPosRZ.x(),
+                                                             simSegLocalPosRZ.x(),
+                                                             alphaBestRHitRZ,
+                                                             alphaSimSegRZ,
+                                                             sigmaAlphaBestRhit,
+                                                             sigmaBetaBestRhit,
+                                                             sqrt(bestRecHitLocalPosErr.xx()),
+                                                             sqrt(bestRecHitLocalPosErr.yy()),
+                                                             sigmaAlphaBestRhitRZ,
+                                                             sqrt(bestRecHitLocalPosErrRZ.xx()),
+                                                             nHitPhi,
+                                                             nHitTheta,
+                                                             t0phi,
+                                                             t0theta);
+        }
 
-      } // end of if (bestRecHit)
+      }  // end of if (bestRecHit)
 
-    } // end of if (nsegm!= 0)
+    }  // end of if (nsegm!= 0)
 
     // Fill Efficiency plot
     if (doall_) {
@@ -452,14 +467,16 @@ void DTSegment4DQuality::dqmAnalyze(edm::Event const& event, edm::EventSetup con
         heff = histograms.hEff_W1.get();
       } else if (abs(wheel) == 2) {
         heff = histograms.hEff_W2.get();
-}
+      }
       heff->fill(etaSimSeg, phiSimSeg, xSimSeg, ySimSeg, alphaSimSeg, betaSimSeg, recHitFound, count_seg);
-      histograms.hEff_All->fill(etaSimSeg, phiSimSeg, xSimSeg, ySimSeg, alphaSimSeg, betaSimSeg, recHitFound, count_seg);
+      histograms.hEff_All->fill(
+          etaSimSeg, phiSimSeg, xSimSeg, ySimSeg, alphaSimSeg, betaSimSeg, recHitFound, count_seg);
       if (local_) {
-        histograms.hEffWS[abs(wheel)][station-1]->fill(etaSimSeg, phiSimSeg, xSimSeg, ySimSeg, alphaSimSeg, betaSimSeg, recHitFound, count_seg);
-}
+        histograms.hEffWS[abs(wheel)][station - 1]->fill(
+            etaSimSeg, phiSimSeg, xSimSeg, ySimSeg, alphaSimSeg, betaSimSeg, recHitFound, count_seg);
+      }
     }
-  } // End of loop over chambers
+  }  // End of loop over chambers
 }
 
 // declare this as a framework plugin
diff --git a/Validation/DTRecHits/plugins/DTSegment4DQuality.h b/Validation/DTRecHits/plugins/DTSegment4DQuality.h
index ebee4e8980193..e30980b13634e 100644
--- a/Validation/DTRecHits/plugins/DTSegment4DQuality.h
+++ b/Validation/DTRecHits/plugins/DTSegment4DQuality.h
@@ -13,9 +13,10 @@
  *  Residual/pull plots are filled for the reco segment with alpha closest
  *  to the simulated muon direction (defined from muon simhits in the chamber).
  *
- *  Efficiencies are defined as reconstructed 4D segments with alpha, beta, x, y,
- *  within 5 sigma relative to the sim muon, with sigmas specified in the config.
- *  Note that loss of even only one of the two views is considered as inefficiency!
+ *  Efficiencies are defined as reconstructed 4D segments with alpha, beta, x,
+ * y, within 5 sigma relative to the sim muon, with sigmas specified in the
+ * config. Note that loss of even only one of the two views is considered as
+ * inefficiency!
  *
  *  \author S. Bolognesi and G. Cerminara - INFN Torino
  */
@@ -34,7 +35,7 @@ namespace edm {
   class ParameterSet;
   class Event;
   class EventSetup;
-}
+}  // namespace edm
 
 class HRes4DHit;
 class HEff4DHit;
@@ -45,14 +46,17 @@ namespace dtsegment4d {
 class DTSegment4DQuality : public DQMGlobalEDAnalyzer<dtsegment4d::Histograms> {
 public:
   /// Constructor
-  DTSegment4DQuality(const edm::ParameterSet& pset);
+  DTSegment4DQuality(const edm::ParameterSet &pset);
 
 private:
   /// Book the DQM plots
-  void bookHistograms(DQMStore::ConcurrentBooker &, edm::Run const&, edm::EventSetup const&, dtsegment4d::Histograms &) const override;
+  void bookHistograms(DQMStore::ConcurrentBooker &,
+                      edm::Run const &,
+                      edm::EventSetup const &,
+                      dtsegment4d::Histograms &) const override;
 
   /// Perform the real analysis
-  void dqmAnalyze(edm::Event const&, edm::EventSetup const&, dtsegment4d::Histograms const&) const override;
+  void dqmAnalyze(edm::Event const &, edm::EventSetup const &, dtsegment4d::Histograms const &) const override;
 
 private:
   // Labels to read from event
diff --git a/Validation/DTRecHits/plugins/Histograms.h b/Validation/DTRecHits/plugins/Histograms.h
index fef766712286a..f8b17ac7ff84c 100644
--- a/Validation/DTRecHits/plugins/Histograms.h
+++ b/Validation/DTRecHits/plugins/Histograms.h
@@ -13,19 +13,17 @@
 
 #include <TH1F.h>
 
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/ConcurrentMonitorElement.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
 //---------------------------------------------------------------------------------------
 /// Function to fill an efficiency histograms with binomial errors
-inline
-void divide(MonitorElement* eff, const MonitorElement * numerator, const MonitorElement * denominator)
-{
-  TH1 * effH = eff->getTH1();
-  TH1 * numH = numerator->getTH1();
-  TH1 * denH = denominator->getTH1();
-  effH->Divide(numH,denH);
+inline void divide(MonitorElement *eff, const MonitorElement *numerator, const MonitorElement *denominator) {
+  TH1 *effH = eff->getTH1();
+  TH1 *numH = numerator->getTH1();
+  TH1 *denH = denominator->getTH1();
+  effH->Divide(numH, denH);
 
   // Set the error accordingly to binomial statistics
   int bins = effH->GetNbinsX();
@@ -34,7 +32,7 @@ void divide(MonitorElement* eff, const MonitorElement * numerator, const Monitor
     float eff = effH->GetBinContent(bin);
     float err = 0;
     if (den != 0) {
-      err = sqrt(eff*(1-eff)/den);
+      err = sqrt(eff * (1 - eff) / den);
     }
     effH->SetBinError(bin, err);
   }
@@ -44,775 +42,1000 @@ void divide(MonitorElement* eff, const MonitorElement * numerator, const Monitor
 //---------------------------------------------------------------------------------------
 /// A set of histograms of residuals and pulls for 1D RecHits
 class HRes1DHit {
-  public:
-    HRes1DHit(const std::string& name, DQMStore::ConcurrentBooker & booker, bool doall=true, bool local=true) {
-      std::string pre ="1D_";
-      pre += name;
-      doall_ = doall;
-      booker.setCurrentFolder("DT/1DRecHits/Res/");
-      if (doall) {
-        hDist         = booker.book1D(pre + "_hDist", "1D RHit distance from wire", 100, 0, 2.5);
-        hResVsAngle   = booker.book2D(pre + "_hResVsAngle", "1D RHit residual vs impact angle", 100, -1.2, 1.2, 100, -0.2, 0.2);
-        hResVsDistFE  = booker.book2D(pre + "_hResVsDistFE", "1D RHit residual vs FE distance", 100, 0., 400., 150, -0.5, 0.5);
-        booker.setCurrentFolder("DT/1DRecHits/Pull/");
-        hPullVsPos    = booker.book2D(pre + "_hPullVsPos", "1D RHit pull vs position", 100, 0, 2.5, 100, -5, 5);
-        hPullVsAngle  = booker.book2D(pre + "_hPullVsAngle", "1D RHit pull vs impact angle", 100, -1.2, 1.2, 100, -5, 5);
-        hPullVsDistFE = booker.book2D(pre + "_hPullVsDistFE", "1D RHit pull vs FE distance", 100, 0., 400., 100, -5, 5);
-      }
-      booker.setCurrentFolder("DT/1DRecHits/Res/");
-      hRes      = booker.book1D(pre + "_hRes", "1D RHit residual", 300, -0.5, 0.5);
-      hResSt[0] = booker.book1D(pre + "_hResMB1", "1D RHit residual", 300, -0.5, 0.5);
-      hResSt[1] = booker.book1D(pre + "_hResMB2", "1D RHit residual", 300, -0.5, 0.5);
-      hResSt[2] = booker.book1D(pre + "_hResMB3", "1D RHit residual", 300, -0.5, 0.5);
-      hResSt[3] = booker.book1D(pre + "_hResMB4", "1D RHit residual", 300, -0.5, 0.5);
-      hResVsEta = booker.book2D(pre + "_hResVsEta", "1D RHit residual vs eta", 50, -1.25, 1.25, 150,-0.5, 0.5);
-      hResVsPhi = booker.book2D(pre + "_hResVsPhi", "1D RHit residual vs phi", 100, -3.2, 3.2, 150, -0.5, 0.5);
-      hResVsPos = booker.book2D(pre + "_hResVsPos", "1D RHit residual vs position", 100, 0, 2.5, 150, -0.5, 0.5);
-
+public:
+  HRes1DHit(const std::string &name, DQMStore::ConcurrentBooker &booker, bool doall = true, bool local = true) {
+    std::string pre = "1D_";
+    pre += name;
+    doall_ = doall;
+    booker.setCurrentFolder("DT/1DRecHits/Res/");
+    if (doall) {
+      hDist = booker.book1D(pre + "_hDist", "1D RHit distance from wire", 100, 0, 2.5);
+      hResVsAngle =
+          booker.book2D(pre + "_hResVsAngle", "1D RHit residual vs impact angle", 100, -1.2, 1.2, 100, -0.2, 0.2);
+      hResVsDistFE =
+          booker.book2D(pre + "_hResVsDistFE", "1D RHit residual vs FE distance", 100, 0., 400., 150, -0.5, 0.5);
       booker.setCurrentFolder("DT/1DRecHits/Pull/");
-      hPull      = booker.book1D(pre + "_hPull", "1D RHit pull", 100, -5, 5);
-      hPullSt[0] = booker.book1D(pre + "_hPullMB1", "1D RHit residual", 100, -5, 5);
-      hPullSt[1] = booker.book1D(pre + "_hPullMB2", "1D RHit residual", 100, -5, 5);
-      hPullSt[2] = booker.book1D(pre + "_hPullMB3", "1D RHit residual", 100, -5, 5);
-      hPullSt[3] = booker.book1D(pre + "_hPullMB4", "1D RHit residual", 100, -5, 5);
+      hPullVsPos = booker.book2D(pre + "_hPullVsPos", "1D RHit pull vs position", 100, 0, 2.5, 100, -5, 5);
+      hPullVsAngle = booker.book2D(pre + "_hPullVsAngle", "1D RHit pull vs impact angle", 100, -1.2, 1.2, 100, -5, 5);
+      hPullVsDistFE = booker.book2D(pre + "_hPullVsDistFE", "1D RHit pull vs FE distance", 100, 0., 400., 100, -5, 5);
     }
+    booker.setCurrentFolder("DT/1DRecHits/Res/");
+    hRes = booker.book1D(pre + "_hRes", "1D RHit residual", 300, -0.5, 0.5);
+    hResSt[0] = booker.book1D(pre + "_hResMB1", "1D RHit residual", 300, -0.5, 0.5);
+    hResSt[1] = booker.book1D(pre + "_hResMB2", "1D RHit residual", 300, -0.5, 0.5);
+    hResSt[2] = booker.book1D(pre + "_hResMB3", "1D RHit residual", 300, -0.5, 0.5);
+    hResSt[3] = booker.book1D(pre + "_hResMB4", "1D RHit residual", 300, -0.5, 0.5);
+    hResVsEta = booker.book2D(pre + "_hResVsEta", "1D RHit residual vs eta", 50, -1.25, 1.25, 150, -0.5, 0.5);
+    hResVsPhi = booker.book2D(pre + "_hResVsPhi", "1D RHit residual vs phi", 100, -3.2, 3.2, 150, -0.5, 0.5);
+    hResVsPos = booker.book2D(pre + "_hResVsPos", "1D RHit residual vs position", 100, 0, 2.5, 150, -0.5, 0.5);
+
+    booker.setCurrentFolder("DT/1DRecHits/Pull/");
+    hPull = booker.book1D(pre + "_hPull", "1D RHit pull", 100, -5, 5);
+    hPullSt[0] = booker.book1D(pre + "_hPullMB1", "1D RHit residual", 100, -5, 5);
+    hPullSt[1] = booker.book1D(pre + "_hPullMB2", "1D RHit residual", 100, -5, 5);
+    hPullSt[2] = booker.book1D(pre + "_hPullMB3", "1D RHit residual", 100, -5, 5);
+    hPullSt[3] = booker.book1D(pre + "_hPullMB4", "1D RHit residual", 100, -5, 5);
+  }
 
-    void fill(float distSimHit,
-              float thetaSimHit,
-              float distFESimHit,
-              float distRecHit,
-              float etaSimHit,
-              float phiSimHit,
-              float errRecHit,
-              int station) {
-      // Reso, pull
-      float res = distRecHit-distSimHit;
+  void fill(float distSimHit,
+            float thetaSimHit,
+            float distFESimHit,
+            float distRecHit,
+            float etaSimHit,
+            float phiSimHit,
+            float errRecHit,
+            int station) {
+    // Reso, pull
+    float res = distRecHit - distSimHit;
+    if (doall_) {
+      hDist.fill(distRecHit);
+      hResVsAngle.fill(thetaSimHit, res);
+      hResVsDistFE.fill(distFESimHit, res);
+    }
+    hRes.fill(res);
+    hResSt[station - 1].fill(res);
+    hResVsEta.fill(etaSimHit, res);
+    hResVsPhi.fill(phiSimHit, res);
+    hResVsPos.fill(distSimHit, res);
+    if (errRecHit != 0) {
+      float pull = res / errRecHit;
+      hPull.fill(pull);
+      hPullSt[station - 1].fill(pull);
       if (doall_) {
-        hDist.fill(distRecHit);
-        hResVsAngle.fill(thetaSimHit, res);
-        hResVsDistFE.fill(distFESimHit, res);
-      }
-      hRes.fill(res); hResSt[station-1].fill(res);
-      hResVsEta.fill(etaSimHit, res);
-      hResVsPhi.fill(phiSimHit, res);
-      hResVsPos.fill(distSimHit, res);
-      if (errRecHit != 0) {
-        float pull=res/errRecHit;
-        hPull.fill(pull);hPullSt[station-1].fill(pull);
-        if (doall_) {
-          hPullVsPos.fill(distSimHit, pull);
-          hPullVsAngle.fill(thetaSimHit, pull);
-          hPullVsDistFE.fill(distFESimHit, pull);
-        }
-      } else {
-        std::cout << "Error: RecHit error = 0" << std::endl;
+        hPullVsPos.fill(distSimHit, pull);
+        hPullVsAngle.fill(thetaSimHit, pull);
+        hPullVsDistFE.fill(distFESimHit, pull);
       }
+    } else {
+      std::cout << "Error: RecHit error = 0" << std::endl;
     }
+  }
 
-  private:
-    ConcurrentMonitorElement hDist;
-    ConcurrentMonitorElement hRes;
-    ConcurrentMonitorElement hResSt[4];
-    ConcurrentMonitorElement hResVsEta;
-    ConcurrentMonitorElement hResVsPhi;
-    ConcurrentMonitorElement hResVsPos;
-    ConcurrentMonitorElement hResVsAngle;
-    ConcurrentMonitorElement hResVsDistFE;
-
-    ConcurrentMonitorElement hPull;
-    ConcurrentMonitorElement hPullSt[4];
-    ConcurrentMonitorElement hPullVsPos;
-    ConcurrentMonitorElement hPullVsAngle;
-    ConcurrentMonitorElement hPullVsDistFE;
-    bool doall_;
-    std::string name_;
+private:
+  ConcurrentMonitorElement hDist;
+  ConcurrentMonitorElement hRes;
+  ConcurrentMonitorElement hResSt[4];
+  ConcurrentMonitorElement hResVsEta;
+  ConcurrentMonitorElement hResVsPhi;
+  ConcurrentMonitorElement hResVsPos;
+  ConcurrentMonitorElement hResVsAngle;
+  ConcurrentMonitorElement hResVsDistFE;
+
+  ConcurrentMonitorElement hPull;
+  ConcurrentMonitorElement hPullSt[4];
+  ConcurrentMonitorElement hPullVsPos;
+  ConcurrentMonitorElement hPullVsAngle;
+  ConcurrentMonitorElement hPullVsDistFE;
+  bool doall_;
+  std::string name_;
 };
 
 //---------------------------------------------------------------------------------------
 /// A set of histograms fo efficiency computation for 1D RecHits (producer)
 class HEff1DHit {
-  public:
-    HEff1DHit(const std::string& name, DQMStore::ConcurrentBooker & booker) {
-      std::string pre ="1D_";
-      pre += name;
-      name_ = pre;
-      booker.setCurrentFolder("DT/1DRecHits/");
-      hEtaMuSimHit  = booker.book1D(pre + "_hEtaMuSimHit", "SimHit Eta distribution", 100, -1.5, 1.5);
-      hEtaRecHit    = booker.book1D(pre + "_hEtaRecHit", "SimHit Eta distribution with 1D RecHit", 100, -1.5, 1.5);
-      hPhiMuSimHit  = booker.book1D(pre + "_hPhiMuSimHit", "SimHit Phi distribution", 100, -M_PI, M_PI);
-      hPhiRecHit    = booker.book1D(pre + "_hPhiRecHit", "SimHit Phi distribution with 1D RecHit", 100, -M_PI, M_PI);
-      hDistMuSimHit = booker.book1D(pre + "_hDistMuSimHit", "SimHit Distance from wire distribution", 100, 0, 2.5);
-      hDistRecHit   = booker.book1D(pre + "_hDistRecHit", "SimHit Distance from wire distribution with 1D RecHit", 100, 0, 2.5);
-    }
+public:
+  HEff1DHit(const std::string &name, DQMStore::ConcurrentBooker &booker) {
+    std::string pre = "1D_";
+    pre += name;
+    name_ = pre;
+    booker.setCurrentFolder("DT/1DRecHits/");
+    hEtaMuSimHit = booker.book1D(pre + "_hEtaMuSimHit", "SimHit Eta distribution", 100, -1.5, 1.5);
+    hEtaRecHit = booker.book1D(pre + "_hEtaRecHit", "SimHit Eta distribution with 1D RecHit", 100, -1.5, 1.5);
+    hPhiMuSimHit = booker.book1D(pre + "_hPhiMuSimHit", "SimHit Phi distribution", 100, -M_PI, M_PI);
+    hPhiRecHit = booker.book1D(pre + "_hPhiRecHit", "SimHit Phi distribution with 1D RecHit", 100, -M_PI, M_PI);
+    hDistMuSimHit = booker.book1D(pre + "_hDistMuSimHit", "SimHit Distance from wire distribution", 100, 0, 2.5);
+    hDistRecHit =
+        booker.book1D(pre + "_hDistRecHit", "SimHit Distance from wire distribution with 1D RecHit", 100, 0, 2.5);
+  }
 
-    void fill(float distSimHit,
-              float etaSimHit,
-              float phiSimHit,
-              bool fillRecHit) {
-
-      hEtaMuSimHit.fill(etaSimHit);
-      hPhiMuSimHit.fill(phiSimHit);
-      hDistMuSimHit.fill(distSimHit);
-      if (fillRecHit) {
-        hEtaRecHit.fill(etaSimHit);
-        hPhiRecHit.fill(phiSimHit);
-        hDistRecHit.fill(distSimHit);
-      }
+  void fill(float distSimHit, float etaSimHit, float phiSimHit, bool fillRecHit) {
+    hEtaMuSimHit.fill(etaSimHit);
+    hPhiMuSimHit.fill(phiSimHit);
+    hDistMuSimHit.fill(distSimHit);
+    if (fillRecHit) {
+      hEtaRecHit.fill(etaSimHit);
+      hPhiRecHit.fill(phiSimHit);
+      hDistRecHit.fill(distSimHit);
     }
+  }
 
-  private:
-    ConcurrentMonitorElement hEtaMuSimHit;
-    ConcurrentMonitorElement hEtaRecHit;
+private:
+  ConcurrentMonitorElement hEtaMuSimHit;
+  ConcurrentMonitorElement hEtaRecHit;
 
-    ConcurrentMonitorElement hPhiMuSimHit;
-    ConcurrentMonitorElement hPhiRecHit;
+  ConcurrentMonitorElement hPhiMuSimHit;
+  ConcurrentMonitorElement hPhiRecHit;
 
-    ConcurrentMonitorElement hDistMuSimHit;
-    ConcurrentMonitorElement hDistRecHit;
+  ConcurrentMonitorElement hDistMuSimHit;
+  ConcurrentMonitorElement hDistRecHit;
 
-    std::string name_;
+  std::string name_;
 };
 
 //---------------------------------------------------------------------------------------
 /// A set of histograms fo efficiency computation for 1D RecHits (harvesting)
 class HEff1DHitHarvest {
- public:
-    HEff1DHitHarvest(const std::string & name, 
-		     DQMStore::IBooker & booker, 
-		     DQMStore::IGetter & getter) {
-      std::string pre ="1D_";
-      pre += name;
-      name_ = pre;
-      booker.setCurrentFolder("DT/1DRecHits/");
-      hEffVsEta  = booker.book1D(pre + "_hEffVsEta",  "1D RecHit Efficiency as a function of Eta",  100, -1.5, 1.5);
-      hEffVsPhi  = booker.book1D(pre + "_hEffVsPhi",  "1D RecHit Efficiency as a function of Phi",  100, -M_PI, M_PI);
-      hEffVsDist = booker.book1D(pre + "_hEffVsDist", "1D RecHit Efficiency as a function of Dist", 100, 0, 2.5); 
-
-      computeEfficiency(getter);
-    }
+public:
+  HEff1DHitHarvest(const std::string &name, DQMStore::IBooker &booker, DQMStore::IGetter &getter) {
+    std::string pre = "1D_";
+    pre += name;
+    name_ = pre;
+    booker.setCurrentFolder("DT/1DRecHits/");
+    hEffVsEta = booker.book1D(pre + "_hEffVsEta", "1D RecHit Efficiency as a function of Eta", 100, -1.5, 1.5);
+    hEffVsPhi = booker.book1D(pre + "_hEffVsPhi", "1D RecHit Efficiency as a function of Phi", 100, -M_PI, M_PI);
+    hEffVsDist = booker.book1D(pre + "_hEffVsDist", "1D RecHit Efficiency as a function of Dist", 100, 0, 2.5);
+
+    computeEfficiency(getter);
+  }
 
-    void computeEfficiency(DQMStore::IGetter& getter) {
-      std::string pre = "DT/1DRecHits/" + name_;
-      divide(hEffVsEta,  getter.get(pre + "_hEtaMuRecHit"),  getter.get(pre + "_hEtaMuSimHit"));
-      divide(hEffVsPhi,  getter.get(pre + "_hPhiMuRecHit"),  getter.get(pre + "_hPhiMuSimHit"));
-      divide(hEffVsDist, getter.get(pre + "_hDistMuRecHit"), getter.get(pre + "_hDistMuSimHit"));
-    }
-    
- private:
-    MonitorElement* hEffVsEta;
-    MonitorElement* hEffVsPhi;
-    MonitorElement* hEffVsDist;
+  void computeEfficiency(DQMStore::IGetter &getter) {
+    std::string pre = "DT/1DRecHits/" + name_;
+    divide(hEffVsEta, getter.get(pre + "_hEtaMuRecHit"), getter.get(pre + "_hEtaMuSimHit"));
+    divide(hEffVsPhi, getter.get(pre + "_hPhiMuRecHit"), getter.get(pre + "_hPhiMuSimHit"));
+    divide(hEffVsDist, getter.get(pre + "_hDistMuRecHit"), getter.get(pre + "_hDistMuSimHit"));
+  }
 
-    std::string name_;
+private:
+  MonitorElement *hEffVsEta;
+  MonitorElement *hEffVsPhi;
+  MonitorElement *hEffVsDist;
+
+  std::string name_;
 };
 
 //---------------------------------------------------------------------------------------
 // Histos of residuals for 2D rechits
 class HRes2DHit {
-  public:
-    HRes2DHit(const std::string& name, DQMStore::ConcurrentBooker & booker, bool doall=true, bool local=true) {
-      doall_ = doall;
-      std::string pre = "2D_";
-      pre += name;
-      booker.setCurrentFolder("DT/2DSegments/Res/");
-      if (doall) {
-        hRecAngle         = booker.book1D(pre + "_hRecAngle", "Distribution of Rec segment angles;angle (rad)",
-                                          100, -1.5, 1.5);
-        hSimAngle         = booker.book1D(pre + "_hSimAngle", "Distribution of segment angles from SimHits;angle (rad)",
-                                          100, -1.5, 1.5);
-        hRecVsSimAngle    = booker.book2D(pre + "_hRecVsSimAngle", "Rec angle vs sim angle;angle (rad)",
-                                          100, -1.5, 1.5, 100, -1.5, 1.5);
-        hResAngleVsEta    = booker.book2D(pre + "_hResAngleVsEta", "Residual on 2D segment angle vs Eta; #eta; res (rad)",
-                                          100, -2.5, 2.5, 200, -0.2, 0.2);
-        hResAngleVsPhi    = booker.book2D(pre + "_hResAngleVsPhi", "Residual on 2D segment angle vs Phi; #phi (rad);res (rad)",
-                                          100, -3.2, 3.2, 150, -0.2, 0.2);
-        hResPosVsEta      = booker.book2D(pre + "_hResPosVsEta", "Residual on 2D segment position vs Eta;#eta;res (cm)",
-                                          100, -2.5, 2.5, 150, -0.2, 0.2);
-        hResPosVsPhi      = booker.book2D(pre + "_hResPosVsPhi", "Residual on 2D segment position vs Phi;#phi (rad);res (cm)",
-                                          100, -3.2, 3.2, 150, -0.2, 0.2);
-        hResPosVsResAngle = booker.book2D(pre + "_hResPosVsResAngle",
-                                          "Residual on 2D segment position vs Residual on 2D segment angle;angle (rad);res (cm)",
-                                          100, -0.3, 0.3, 150, -0.2, 0.2);
-      }
-      hResAngle  = booker.book1D(pre + "_hResAngle", "Residual on 2D segment angle;angle_{rec}-angle_{sim} (rad)", 50, -0.01, 0.01);
-      hResPos    = booker.book1D(pre + "_hResPos", "Residual on 2D segment position (x at SL center);x_{rec}-x_{sim} (cm)", 150, -0.2, 0.2);
-
-      booker.setCurrentFolder("DT/2DSegments/Pull/");
-      hPullAngle = booker.book1D(pre + "_hPullAngle", "Pull on 2D segment angle;(angle_{rec}-angle_{sim})/#sigma (rad)", 150, -5, 5);
-      hPullPos   = booker.book1D(pre + "_hPullPos", "Pull on 2D segment position (x at SL center);(x_{rec}-x_{sim} (cm))/#sigma", 150, -5, 5);
+public:
+  HRes2DHit(const std::string &name, DQMStore::ConcurrentBooker &booker, bool doall = true, bool local = true) {
+    doall_ = doall;
+    std::string pre = "2D_";
+    pre += name;
+    booker.setCurrentFolder("DT/2DSegments/Res/");
+    if (doall) {
+      hRecAngle = booker.book1D(pre + "_hRecAngle", "Distribution of Rec segment angles;angle (rad)", 100, -1.5, 1.5);
+      hSimAngle =
+          booker.book1D(pre + "_hSimAngle", "Distribution of segment angles from SimHits;angle (rad)", 100, -1.5, 1.5);
+      hRecVsSimAngle =
+          booker.book2D(pre + "_hRecVsSimAngle", "Rec angle vs sim angle;angle (rad)", 100, -1.5, 1.5, 100, -1.5, 1.5);
+      hResAngleVsEta = booker.book2D(pre + "_hResAngleVsEta",
+                                     "Residual on 2D segment angle vs Eta; #eta; res (rad)",
+                                     100,
+                                     -2.5,
+                                     2.5,
+                                     200,
+                                     -0.2,
+                                     0.2);
+      hResAngleVsPhi = booker.book2D(pre + "_hResAngleVsPhi",
+                                     "Residual on 2D segment angle vs Phi; #phi (rad);res (rad)",
+                                     100,
+                                     -3.2,
+                                     3.2,
+                                     150,
+                                     -0.2,
+                                     0.2);
+      hResPosVsEta = booker.book2D(
+          pre + "_hResPosVsEta", "Residual on 2D segment position vs Eta;#eta;res (cm)", 100, -2.5, 2.5, 150, -0.2, 0.2);
+      hResPosVsPhi = booker.book2D(pre + "_hResPosVsPhi",
+                                   "Residual on 2D segment position vs Phi;#phi (rad);res (cm)",
+                                   100,
+                                   -3.2,
+                                   3.2,
+                                   150,
+                                   -0.2,
+                                   0.2);
+      hResPosVsResAngle = booker.book2D(pre + "_hResPosVsResAngle",
+                                        "Residual on 2D segment position vs Residual on 2D "
+                                        "segment angle;angle (rad);res (cm)",
+                                        100,
+                                        -0.3,
+                                        0.3,
+                                        150,
+                                        -0.2,
+                                        0.2);
     }
+    hResAngle = booker.book1D(
+        pre + "_hResAngle", "Residual on 2D segment angle;angle_{rec}-angle_{sim} (rad)", 50, -0.01, 0.01);
+    hResPos = booker.book1D(
+        pre + "_hResPos", "Residual on 2D segment position (x at SL center);x_{rec}-x_{sim} (cm)", 150, -0.2, 0.2);
+
+    booker.setCurrentFolder("DT/2DSegments/Pull/");
+    hPullAngle = booker.book1D(
+        pre + "_hPullAngle", "Pull on 2D segment angle;(angle_{rec}-angle_{sim})/#sigma (rad)", 150, -5, 5);
+    hPullPos = booker.book1D(pre + "_hPullPos",
+                             "Pull on 2D segment position (x at SL "
+                             "center);(x_{rec}-x_{sim} (cm))/#sigma",
+                             150,
+                             -5,
+                             5);
+  }
 
-    void fill(float angleSimSegment,
-              float angleRecSegment,
-              float posSimSegment,
-              float posRecSegment,
-              float etaSimSegment,
-              float phiSimSegment,
-              float sigmaPos,
-              float sigmaAngle)
-    {
-      float resAngle = angleRecSegment-angleSimSegment;
-      hResAngle.fill(resAngle);
-      float resPos = posRecSegment-posSimSegment;
-      hResPos.fill(resPos);
-      hPullAngle.fill(resAngle/sigmaAngle);
-      hPullPos.fill(resPos/sigmaPos);
-      if (doall_) {
-        hRecAngle.fill(angleRecSegment);
-        hSimAngle.fill(angleSimSegment);
-        hRecVsSimAngle.fill(angleSimSegment, angleRecSegment);
-        hResAngleVsEta.fill(etaSimSegment, resAngle);
-        hResAngleVsPhi.fill(phiSimSegment, resAngle);
-        hResPosVsEta.fill(etaSimSegment, resPos);
-        hResPosVsPhi.fill(phiSimSegment, resPos);
-        hResPosVsResAngle.fill(resAngle, resPos);
-      }
+  void fill(float angleSimSegment,
+            float angleRecSegment,
+            float posSimSegment,
+            float posRecSegment,
+            float etaSimSegment,
+            float phiSimSegment,
+            float sigmaPos,
+            float sigmaAngle) {
+    float resAngle = angleRecSegment - angleSimSegment;
+    hResAngle.fill(resAngle);
+    float resPos = posRecSegment - posSimSegment;
+    hResPos.fill(resPos);
+    hPullAngle.fill(resAngle / sigmaAngle);
+    hPullPos.fill(resPos / sigmaPos);
+    if (doall_) {
+      hRecAngle.fill(angleRecSegment);
+      hSimAngle.fill(angleSimSegment);
+      hRecVsSimAngle.fill(angleSimSegment, angleRecSegment);
+      hResAngleVsEta.fill(etaSimSegment, resAngle);
+      hResAngleVsPhi.fill(phiSimSegment, resAngle);
+      hResPosVsEta.fill(etaSimSegment, resPos);
+      hResPosVsPhi.fill(phiSimSegment, resPos);
+      hResPosVsResAngle.fill(resAngle, resPos);
     }
+  }
 
-  private:
-    ConcurrentMonitorElement hRecAngle;
-    ConcurrentMonitorElement hSimAngle;
-    ConcurrentMonitorElement hRecVsSimAngle;
-    ConcurrentMonitorElement hResAngle;
-    ConcurrentMonitorElement hResAngleVsEta;
-    ConcurrentMonitorElement hResAngleVsPhi;
-    ConcurrentMonitorElement hResPos;
-    ConcurrentMonitorElement hResPosVsEta;
-    ConcurrentMonitorElement hResPosVsPhi;
-    ConcurrentMonitorElement hResPosVsResAngle;
-    ConcurrentMonitorElement hPullAngle;
-    ConcurrentMonitorElement hPullPos;
-
-    std::string name_;
-    bool doall_;
+private:
+  ConcurrentMonitorElement hRecAngle;
+  ConcurrentMonitorElement hSimAngle;
+  ConcurrentMonitorElement hRecVsSimAngle;
+  ConcurrentMonitorElement hResAngle;
+  ConcurrentMonitorElement hResAngleVsEta;
+  ConcurrentMonitorElement hResAngleVsPhi;
+  ConcurrentMonitorElement hResPos;
+  ConcurrentMonitorElement hResPosVsEta;
+  ConcurrentMonitorElement hResPosVsPhi;
+  ConcurrentMonitorElement hResPosVsResAngle;
+  ConcurrentMonitorElement hPullAngle;
+  ConcurrentMonitorElement hPullPos;
+
+  std::string name_;
+  bool doall_;
 };
 
 //---------------------------------------------------------------------------------------
 // Histos for 2D RecHit efficiency (producer)
 class HEff2DHit {
-  public:
-    HEff2DHit(const std::string& name, DQMStore::ConcurrentBooker & booker) {
-      std::string pre ="2D_";
-      pre += name;
-      name_ = pre;
-      booker.setCurrentFolder("DT/2DSegments/");
-      hEtaSimSegm = booker.book1D(pre + "_hEtaSimSegm", "Eta of SimHit segment", 100, -1.5, 1.5);
-      hEtaRecHit = booker.book1D(pre + "_hEtaRecHit", "Eta distribution of SimHit segment with 2D RecHit", 100, -1.5, 1.5);
-      hPhiSimSegm = booker.book1D(pre + "_hPhiSimSegm", "Phi of SimHit segment", 100, -M_PI, M_PI);
-      hPhiRecHit = booker.book1D(pre + "_hPhiRecHit", "Phi distribution of SimHit segment with 2D RecHit", 100, -M_PI, M_PI);
-      hPosSimSegm = booker.book1D(pre + "_hPosSimSegm", "Position in SL of SimHit segment (cm)", 100, -250, 250);
-      hPosRecHit = booker.book1D(pre + "_hPosRecHit", "Position in SL of SimHit segment with 2D RecHit (cm)", 100, -250, 250);
-      hAngleSimSegm = booker.book1D(pre + "_hAngleSimSegm", "Angle of SimHit segment (rad)", 100, -2, 2);
-      hAngleRecHit = booker.book1D(pre + "_hAngleRecHit", "Angle of SimHit segment with 2D RecHit (rad)", 100, -2, 2);
-    }
+public:
+  HEff2DHit(const std::string &name, DQMStore::ConcurrentBooker &booker) {
+    std::string pre = "2D_";
+    pre += name;
+    name_ = pre;
+    booker.setCurrentFolder("DT/2DSegments/");
+    hEtaSimSegm = booker.book1D(pre + "_hEtaSimSegm", "Eta of SimHit segment", 100, -1.5, 1.5);
+    hEtaRecHit =
+        booker.book1D(pre + "_hEtaRecHit", "Eta distribution of SimHit segment with 2D RecHit", 100, -1.5, 1.5);
+    hPhiSimSegm = booker.book1D(pre + "_hPhiSimSegm", "Phi of SimHit segment", 100, -M_PI, M_PI);
+    hPhiRecHit =
+        booker.book1D(pre + "_hPhiRecHit", "Phi distribution of SimHit segment with 2D RecHit", 100, -M_PI, M_PI);
+    hPosSimSegm = booker.book1D(pre + "_hPosSimSegm", "Position in SL of SimHit segment (cm)", 100, -250, 250);
+    hPosRecHit =
+        booker.book1D(pre + "_hPosRecHit", "Position in SL of SimHit segment with 2D RecHit (cm)", 100, -250, 250);
+    hAngleSimSegm = booker.book1D(pre + "_hAngleSimSegm", "Angle of SimHit segment (rad)", 100, -2, 2);
+    hAngleRecHit = booker.book1D(pre + "_hAngleRecHit", "Angle of SimHit segment with 2D RecHit (rad)", 100, -2, 2);
+  }
 
-    void fill(float etaSimSegm,
-              float phiSimSegm,
-              float posSimSegm,
-              float angleSimSegm,
-              bool fillRecHit) {
-
-      hEtaSimSegm.fill(etaSimSegm);
-      hPhiSimSegm.fill(phiSimSegm);
-      hPosSimSegm.fill(posSimSegm);
-      hAngleSimSegm.fill(angleSimSegm);
-
-      if (fillRecHit) {
-        hEtaRecHit.fill(etaSimSegm);
-        hPhiRecHit.fill(phiSimSegm);
-        hPosRecHit.fill(posSimSegm);
-        hAngleRecHit.fill(angleSimSegm);
-      }
+  void fill(float etaSimSegm, float phiSimSegm, float posSimSegm, float angleSimSegm, bool fillRecHit) {
+    hEtaSimSegm.fill(etaSimSegm);
+    hPhiSimSegm.fill(phiSimSegm);
+    hPosSimSegm.fill(posSimSegm);
+    hAngleSimSegm.fill(angleSimSegm);
+
+    if (fillRecHit) {
+      hEtaRecHit.fill(etaSimSegm);
+      hPhiRecHit.fill(phiSimSegm);
+      hPosRecHit.fill(posSimSegm);
+      hAngleRecHit.fill(angleSimSegm);
     }
+  }
 
-  private:
-    ConcurrentMonitorElement hEtaSimSegm;
-    ConcurrentMonitorElement hEtaRecHit;
-    ConcurrentMonitorElement hPhiSimSegm;
-    ConcurrentMonitorElement hPhiRecHit;
-    ConcurrentMonitorElement hPosSimSegm;
-    ConcurrentMonitorElement hPosRecHit;
-    ConcurrentMonitorElement hAngleSimSegm;
-    ConcurrentMonitorElement hAngleRecHit;
-
-    std::string name_;
+private:
+  ConcurrentMonitorElement hEtaSimSegm;
+  ConcurrentMonitorElement hEtaRecHit;
+  ConcurrentMonitorElement hPhiSimSegm;
+  ConcurrentMonitorElement hPhiRecHit;
+  ConcurrentMonitorElement hPosSimSegm;
+  ConcurrentMonitorElement hPosRecHit;
+  ConcurrentMonitorElement hAngleSimSegm;
+  ConcurrentMonitorElement hAngleRecHit;
+
+  std::string name_;
 };
 
 //---------------------------------------------------------------------------------------
 // Histos for 2D RecHit efficiency (harvesting)
 class HEff2DHitHarvest {
- public:
-    HEff2DHitHarvest(const std::string & name, 
-		     DQMStore::IBooker & booker, 
-		     DQMStore::IGetter & getter) {
-      std::string pre ="2D_";
-      pre += name;
-      name_ = pre;
-      booker.setCurrentFolder("DT/2DSegments/");
-      hEffVsEta   = booker.book1D(pre + "_hEffVsEta", "2D RecHit Efficiency as a function of Eta",  100, -1.5, 1.5);
-      hEffVsPhi   = booker.book1D(pre + "_hEffVsPhi", "2D RecHit Efficiency as a function of Phi",  100, -M_PI, M_PI);
-      hEffVsPos   = booker.book1D(pre + "_hEffVsPos", "2D RecHit Efficiency as a function of position in SL", 100, -250, 250); 
-      hEffVsAngle = booker.book1D(pre + "_hEffVsAngle", "2D RecHit Efficiency as a function of angle", 100, -2, 2); 
-
-      computeEfficiency(getter);
-    }
+public:
+  HEff2DHitHarvest(const std::string &name, DQMStore::IBooker &booker, DQMStore::IGetter &getter) {
+    std::string pre = "2D_";
+    pre += name;
+    name_ = pre;
+    booker.setCurrentFolder("DT/2DSegments/");
+    hEffVsEta = booker.book1D(pre + "_hEffVsEta", "2D RecHit Efficiency as a function of Eta", 100, -1.5, 1.5);
+    hEffVsPhi = booker.book1D(pre + "_hEffVsPhi", "2D RecHit Efficiency as a function of Phi", 100, -M_PI, M_PI);
+    hEffVsPos =
+        booker.book1D(pre + "_hEffVsPos", "2D RecHit Efficiency as a function of position in SL", 100, -250, 250);
+    hEffVsAngle = booker.book1D(pre + "_hEffVsAngle", "2D RecHit Efficiency as a function of angle", 100, -2, 2);
+
+    computeEfficiency(getter);
+  }
 
-    void computeEfficiency(DQMStore::IGetter& getter) {
-      std::string pre = "DT/2DSegments/" + name_;
-      divide(hEffVsEta,   getter.get(pre + "_hEtaRecHit"),   getter.get(pre + "_hEtaSimSegm"));
-      divide(hEffVsPhi,   getter.get(pre + "_hPhiRecHit"),   getter.get(pre + "_hPhiSimSegm"));
-      divide(hEffVsPos,   getter.get(pre + "_hPosRecHit"),   getter.get(pre + "_hPosSimSegm"));
-      divide(hEffVsAngle, getter.get(pre + "_hAngleRecHit"), getter.get(pre + "_hAngleSimSegm"));
-    }
-    
- private:
-    MonitorElement* hEffVsEta;
-    MonitorElement* hEffVsPhi;
-    MonitorElement* hEffVsPos;
-    MonitorElement* hEffVsAngle;
-
-    std::string name_;
+  void computeEfficiency(DQMStore::IGetter &getter) {
+    std::string pre = "DT/2DSegments/" + name_;
+    divide(hEffVsEta, getter.get(pre + "_hEtaRecHit"), getter.get(pre + "_hEtaSimSegm"));
+    divide(hEffVsPhi, getter.get(pre + "_hPhiRecHit"), getter.get(pre + "_hPhiSimSegm"));
+    divide(hEffVsPos, getter.get(pre + "_hPosRecHit"), getter.get(pre + "_hPosSimSegm"));
+    divide(hEffVsAngle, getter.get(pre + "_hAngleRecHit"), getter.get(pre + "_hAngleSimSegm"));
+  }
+
+private:
+  MonitorElement *hEffVsEta;
+  MonitorElement *hEffVsPhi;
+  MonitorElement *hEffVsPos;
+  MonitorElement *hEffVsAngle;
+
+  std::string name_;
 };
 
 //---------------------------------------------------------------------------------------
 // Histos of residuals for 4D rechits
 class HRes4DHit {
-  public:
-  HRes4DHit(const std::string& name, DQMStore::ConcurrentBooker & booker, bool doall=true, bool local=true) : local_(local) {
-      std::string pre ="4D_";
-      pre += name;
-      doall_ = doall;
-
-      booker.setCurrentFolder("DT/4DSegments/Res/");
-      if (doall) {
-        hRecAlpha = booker.book1D(pre + "_hRecAlpha", "4D RecHit alpha (RPhi) distribution;#alpha^{x} (rad)", 100, -1.5, 1.5);
-        hRecBeta = booker.book1D(pre + "_hRecBeta", "4D RecHit beta distribution:#alpha^{y} (rad)", 100, -1.5, 1.5);
-        
-        hSimAlpha = booker.book1D(pre + "_hSimAlpha", "4D segment from SimHit alpha (RPhi) distribution;i#alpha^{x} (rad)",
-            100, -1.5, 1.5);
-        hSimBeta = booker.book1D(pre + "_hSimBeta", "4D segment from SimHit beta distribution;#alpha^{y} (rad)",
-            100, -1.5, 1.5);
-        hRecVsSimAlpha = booker.book2D(pre + "_hRecVsSimAlpha", "4D segment rec alpha {v}s sim alpha (RPhi);#alpha^{x} (rad)",
-            100, -1.5, 1.5, 100, -1.5, 1.5);
-        hRecVsSimBeta = booker.book2D(pre + "_hRecVsSimBeta", "4D segment rec beta vs sim beta (RZ);#alpha^{y} (rad)",
-            100, -1.5, 1.5, 100, -1.5, 1.5);
-        
-        hResAlphaVsEta = booker.book2D(pre + "_hResAlphaVsEta",
-            "4D RecHit residual on #alpha_x direction vs eta;#eta;#alpha^{x}_{rec}-#alpha^{x}_{sim} (rad)",
-            100, -2.5, 2.5, 100, -0.025, 0.025);
-        hResAlphaVsPhi = booker.book2D(pre + "_hResAlphaVsPhi",
-            "4D RecHit residual on #alpha_x direction vs phi (rad);#phi (rad);#alpha^{x}_{rec}-#alpha^{x}_{sim} (rad)",
-            100, -3.2, 3.2, 100, -0.025, 0.025);
-        hResBetaVsEta = booker.book2D(pre + "_hResBetaVsEta",
-            "4D RecHit residual on beta direction vs eta;#eta;#alpha^{y}_{rec}-#alpha^{y}_{sim} (rad)",
-            100, -2.5, 2.5, 200, -0.2, 0.2);
-        hResBetaVsPhi = booker.book2D(pre + "_hResBetaVsPhi",
-            "4D RecHit residual on beta direction vs phi;#phi (rad);#alpha^{y}_{rec}-#alpha^{y}_{sim} (rad)",
-            100, -3.2, 3.2, 200, -0.2, 0.2);
-        
-        hResXVsEta = booker.book2D(pre + "_hResXVsEta", "4D RecHit residual on position (x) in chamber vs eta;#eta;x_{rec}-x_{sim} (cm)",
-            100, -2.5, 2.5, 150, -0.3, 0.3);
-        hResXVsPhi = booker.book2D(pre + "_hResXVsPhi", "4D RecHit residual on position (x) in chamber vs phi;#phi (rad);x_{rec}-x_{sim} (cm)",
-            100, -3.2, 3.2, 150, -0.3, 0.3);
-        
-        hResYVsEta = booker.book2D(pre + "_hResYVsEta", "4D RecHit residual on position (y) in chamber vs eta;#eta;y_{rec}-y_{sim} (cm)",
-            100, -2.5, 2.5, 150, -0.6, 0.6);
-        hResYVsPhi = booker.book2D(pre + "_hResYVsPhi", "4D RecHit residual on position (y) in chamber vs phi;#phi (rad);y_{rec}-y_{sim} (cm)",
-            100, -3.2, 3.2, 150, -0.6, 0.6);
-        
-        hResAlphaVsResBeta = booker.book2D(pre + "_hResAlphaVsResBeta", "4D RecHit residual on alpha vs residual on beta",
-            200, -0.3, 0.3, 500, -0.15, 0.15);
-        hResXVsResY = booker.book2D(pre + "_hResXVsResY", "4D RecHit residual on X vs residual on Y",
-            150, -0.6, 0.6, 50, -0.3, 0.3);
-        hResAlphaVsResX = booker.book2D(pre + "_hResAlphaVsResX", "4D RecHit residual on alpha vs residual on x",
-            150, -0.3, 0.3, 500, -0.15, 0.15);
-        
-        hResAlphaVsResY = booker.book2D(pre + "_hResAlphaVsResY", "4D RecHit residual on alpha vs residual on y",
-            150, -0.6, 0.6, 500, -0.15, 0.15);
-        
-        hRecBetaRZ = booker.book1D(pre + "_hRecBetaRZ", "4D RecHit beta distribution:#alpha^{y} (rad)", 100, -1.5, 1.5);
-        
-        hSimBetaRZ = booker.book1D(pre + "_hSimBetaRZ", "4D segment from SimHit beta distribution in RZ SL;#alpha^{y} (rad)",
-            100, -1.5, 1.5);
-        hRecVsSimBetaRZ = booker.book2D(pre + "_hRecVsSimBetaRZ", "4D segment rec beta vs sim beta (RZ) in RZ SL;#alpha^{y} (rad)",
-            100, -1.5, 1.5, 100, -1.5, 1.5);
-        
-        hResBetaVsEtaRZ = booker.book2D(pre + "_hResBetaVsEtaRZ",
-            "4D RecHit residual on beta direction vs eta;#eta in RZ SL;#alpha^{y}_{rec}-#alpha^{y}_{sim} (rad)",
-            100, -2.5, 2.5, 200, -0.2, 0.2);
-        hResBetaVsPhiRZ = booker.book2D(pre + "_hResBetaVsPhiRZ",
-            "4D RecHit residual on beta direction vs phi in RZ SL;#phi (rad);#alpha^{y}_{rec}-#alpha^{y}_{sim} (rad)",
-            100, -3.2, 3.2, 200, -0.2, 0.2);
-        hResYVsEtaRZ = booker.book2D(pre + "_hResYVsEtaRZ",
-            "4D RecHit residual on position (y) in chamber vs eta in RZ SL;#eta;y_{rec}-y_{sim} (cm)",
-            100, -2.5, 2.5, 150, -0.6, 0.6);
-        hResYVsPhiRZ = booker.book2D(pre + "_hResYVsPhiRZ",
-            "4D RecHit residual on position (y) in chamber vs phi in RZ SL;#phi (rad);y_{rec}-y_{sim} (cm)",
-            100, -3.2, 3.2, 150, -0.6, 0.6);
-
-        booker.setCurrentFolder("DT/4DSegments/Pull/");
-        hPullAlphaVsEta = booker.book2D(pre + "_hPullAlphaVsEta",
-            "4D RecHit pull on #alpha_x direction vs eta;#eta;(#alpha^{x}_{rec}-#alpha^{x}_{sim})/#sigma",
-            100, -2.5, 2.5, 100, -5, 5);
-        hPullAlphaVsPhi = booker.book2D(pre + "_hPullAlphaVsPhi",
-            "4D RecHit pull on #alpha_x direction vs phi (rad);#phi (rad);(#alpha^{x}_{rec}-#alpha^{x}_{sim})/#sigma",
-            100, -3.2, 3.2, 100, -5, 5);
-        hPullBetaVsEta = booker.book2D(pre + "_hPullBetaVsEta",
-            "4D RecHit pull on beta direction vs eta;#eta;(#alpha^{y}_{rec}-#alpha^{y}_{sim})/#sigma",
-            100, -2.5, 2.5, 200, -5, 5);
-        hPullBetaVsPhi = booker.book2D(pre + "_hPullBetaVsPhi",
-            "4D RecHit pull on beta direction vs phi;#phi (rad);(#alpha^{y}_{rec}-#alpha^{y}_{sim})/#sigma",
-            100, -3.2, 3.2, 200, -5, 5);
-        hPullXVsEta = booker.book2D(pre + "_hPullXVsEta",
-            "4D RecHit pull on position (x) in chamber vs eta;#eta;(x_{rec}-x_{sim})#sigma",
-            100, -2.5, 2.5, 150, -5, 5);
-        hPullXVsPhi = booker.book2D(pre + "_hPullXVsPhi",
-            "4D RecHit pull on position (x) in chamber vs phi;#phi (rad);(x_{rec}-x_{sim})/#sigma",
-            100, -3.2, 3.2, 150, -5, 5);
-        hPullYVsEta = booker.book2D(pre + "_hPullYVsEta",
-            "4D RecHit pull on position (y) in chamber vs eta;#eta;(y_{rec}-y_{sim})/#sigma",
-            100, -2.5, 2.5, 150, -5, 5);
-        hPullYVsPhi = booker.book2D(pre + "_hPullYVsPhi",
-            "4D RecHit pull on position (y) in chamber vs phi;#phi (rad);(y_{rec}-y_{sim})/#sigma",
-            100, -3.2, 3.2, 150, -5, 5);
-        hPullBetaVsEtaRZ = booker.book2D(pre + "_hPullBetaVsEtaRZ",
-            "4D RecHit pull on beta direction vs eta;#eta in RZ SL;(#alpha^{y}_{rec}-#alpha^{y}_{sim})/#sigma",
-            100, -2.5, 2.5, 200, -5, 5);
-        hPullBetaVsPhiRZ = booker.book2D(pre + "_hPullBetaVsPhiRZ",
-            "4D RecHit pull on beta direction vs phi in RZ SL;#phi (rad);(#alpha^{y}_{rec}-#alpha^{y}_{sim})/#sigma",
-            100, -3.2, 3.2, 200, -5, 5);
-        hPullYVsEtaRZ = booker.book2D(pre + "_hPullYVsEtaRZ",
-            "4D RecHit pull on position (y) in chamber vs eta in RZ SL;#eta;(y_{rec}-y_{sim})/#sigma",
-            100, -2.5, 2.5, 150, -5, 5);
-        hPullYVsPhiRZ = booker.book2D(pre + "_hPullYVsPhiRZ",
-            "4D RecHit pull on position (y) in chamber vs phi in RZ SL;#phi (rad);(y_{rec}-y_{sim})/#sigma", 100, -3.2, 3.2, 150, -5, 5);
+public:
+  HRes4DHit(const std::string &name, DQMStore::ConcurrentBooker &booker, bool doall = true, bool local = true)
+      : local_(local) {
+    std::string pre = "4D_";
+    pre += name;
+    doall_ = doall;
+
+    booker.setCurrentFolder("DT/4DSegments/Res/");
+    if (doall) {
+      hRecAlpha =
+          booker.book1D(pre + "_hRecAlpha", "4D RecHit alpha (RPhi) distribution;#alpha^{x} (rad)", 100, -1.5, 1.5);
+      hRecBeta = booker.book1D(pre + "_hRecBeta", "4D RecHit beta distribution:#alpha^{y} (rad)", 100, -1.5, 1.5);
+
+      hSimAlpha = booker.book1D(
+          pre + "_hSimAlpha", "4D segment from SimHit alpha (RPhi) distribution;i#alpha^{x} (rad)", 100, -1.5, 1.5);
+      hSimBeta =
+          booker.book1D(pre + "_hSimBeta", "4D segment from SimHit beta distribution;#alpha^{y} (rad)", 100, -1.5, 1.5);
+      hRecVsSimAlpha = booker.book2D(pre + "_hRecVsSimAlpha",
+                                     "4D segment rec alpha {v}s sim alpha (RPhi);#alpha^{x} (rad)",
+                                     100,
+                                     -1.5,
+                                     1.5,
+                                     100,
+                                     -1.5,
+                                     1.5);
+      hRecVsSimBeta = booker.book2D(pre + "_hRecVsSimBeta",
+                                    "4D segment rec beta vs sim beta (RZ);#alpha^{y} (rad)",
+                                    100,
+                                    -1.5,
+                                    1.5,
+                                    100,
+                                    -1.5,
+                                    1.5);
+
+      hResAlphaVsEta = booker.book2D(pre + "_hResAlphaVsEta",
+                                     "4D RecHit residual on #alpha_x direction vs "
+                                     "eta;#eta;#alpha^{x}_{rec}-#alpha^{x}_{sim} (rad)",
+                                     100,
+                                     -2.5,
+                                     2.5,
+                                     100,
+                                     -0.025,
+                                     0.025);
+      hResAlphaVsPhi = booker.book2D(pre + "_hResAlphaVsPhi",
+                                     "4D RecHit residual on #alpha_x direction vs phi (rad);#phi "
+                                     "(rad);#alpha^{x}_{rec}-#alpha^{x}_{sim} (rad)",
+                                     100,
+                                     -3.2,
+                                     3.2,
+                                     100,
+                                     -0.025,
+                                     0.025);
+      hResBetaVsEta = booker.book2D(pre + "_hResBetaVsEta",
+                                    "4D RecHit residual on beta direction vs "
+                                    "eta;#eta;#alpha^{y}_{rec}-#alpha^{y}_{sim} (rad)",
+                                    100,
+                                    -2.5,
+                                    2.5,
+                                    200,
+                                    -0.2,
+                                    0.2);
+      hResBetaVsPhi = booker.book2D(pre + "_hResBetaVsPhi",
+                                    "4D RecHit residual on beta direction vs phi;#phi "
+                                    "(rad);#alpha^{y}_{rec}-#alpha^{y}_{sim} (rad)",
+                                    100,
+                                    -3.2,
+                                    3.2,
+                                    200,
+                                    -0.2,
+                                    0.2);
+
+      hResXVsEta = booker.book2D(pre + "_hResXVsEta",
+                                 "4D RecHit residual on position (x) in "
+                                 "chamber vs eta;#eta;x_{rec}-x_{sim} (cm)",
+                                 100,
+                                 -2.5,
+                                 2.5,
+                                 150,
+                                 -0.3,
+                                 0.3);
+      hResXVsPhi = booker.book2D(pre + "_hResXVsPhi",
+                                 "4D RecHit residual on position (x) in chamber vs "
+                                 "phi;#phi (rad);x_{rec}-x_{sim} (cm)",
+                                 100,
+                                 -3.2,
+                                 3.2,
+                                 150,
+                                 -0.3,
+                                 0.3);
+
+      hResYVsEta = booker.book2D(pre + "_hResYVsEta",
+                                 "4D RecHit residual on position (y) in "
+                                 "chamber vs eta;#eta;y_{rec}-y_{sim} (cm)",
+                                 100,
+                                 -2.5,
+                                 2.5,
+                                 150,
+                                 -0.6,
+                                 0.6);
+      hResYVsPhi = booker.book2D(pre + "_hResYVsPhi",
+                                 "4D RecHit residual on position (y) in chamber vs "
+                                 "phi;#phi (rad);y_{rec}-y_{sim} (cm)",
+                                 100,
+                                 -3.2,
+                                 3.2,
+                                 150,
+                                 -0.6,
+                                 0.6);
+
+      hResAlphaVsResBeta = booker.book2D(pre + "_hResAlphaVsResBeta",
+                                         "4D RecHit residual on alpha vs residual on beta",
+                                         200,
+                                         -0.3,
+                                         0.3,
+                                         500,
+                                         -0.15,
+                                         0.15);
+      hResXVsResY = booker.book2D(
+          pre + "_hResXVsResY", "4D RecHit residual on X vs residual on Y", 150, -0.6, 0.6, 50, -0.3, 0.3);
+      hResAlphaVsResX = booker.book2D(
+          pre + "_hResAlphaVsResX", "4D RecHit residual on alpha vs residual on x", 150, -0.3, 0.3, 500, -0.15, 0.15);
+
+      hResAlphaVsResY = booker.book2D(
+          pre + "_hResAlphaVsResY", "4D RecHit residual on alpha vs residual on y", 150, -0.6, 0.6, 500, -0.15, 0.15);
+
+      hRecBetaRZ = booker.book1D(pre + "_hRecBetaRZ", "4D RecHit beta distribution:#alpha^{y} (rad)", 100, -1.5, 1.5);
+
+      hSimBetaRZ = booker.book1D(
+          pre + "_hSimBetaRZ", "4D segment from SimHit beta distribution in RZ SL;#alpha^{y} (rad)", 100, -1.5, 1.5);
+      hRecVsSimBetaRZ = booker.book2D(pre + "_hRecVsSimBetaRZ",
+                                      "4D segment rec beta vs sim beta (RZ) in RZ SL;#alpha^{y} (rad)",
+                                      100,
+                                      -1.5,
+                                      1.5,
+                                      100,
+                                      -1.5,
+                                      1.5);
+
+      hResBetaVsEtaRZ = booker.book2D(pre + "_hResBetaVsEtaRZ",
+                                      "4D RecHit residual on beta direction vs eta;#eta in "
+                                      "RZ SL;#alpha^{y}_{rec}-#alpha^{y}_{sim} (rad)",
+                                      100,
+                                      -2.5,
+                                      2.5,
+                                      200,
+                                      -0.2,
+                                      0.2);
+      hResBetaVsPhiRZ = booker.book2D(pre + "_hResBetaVsPhiRZ",
+                                      "4D RecHit residual on beta direction vs phi in RZ "
+                                      "SL;#phi (rad);#alpha^{y}_{rec}-#alpha^{y}_{sim} (rad)",
+                                      100,
+                                      -3.2,
+                                      3.2,
+                                      200,
+                                      -0.2,
+                                      0.2);
+      hResYVsEtaRZ = booker.book2D(pre + "_hResYVsEtaRZ",
+                                   "4D RecHit residual on position (y) in chamber vs eta "
+                                   "in RZ SL;#eta;y_{rec}-y_{sim} (cm)",
+                                   100,
+                                   -2.5,
+                                   2.5,
+                                   150,
+                                   -0.6,
+                                   0.6);
+      hResYVsPhiRZ = booker.book2D(pre + "_hResYVsPhiRZ",
+                                   "4D RecHit residual on position (y) in chamber vs phi "
+                                   "in RZ SL;#phi (rad);y_{rec}-y_{sim} (cm)",
+                                   100,
+                                   -3.2,
+                                   3.2,
+                                   150,
+                                   -0.6,
+                                   0.6);
 
-      }
-      booker.setCurrentFolder("DT/4DSegments/Res/");
-      hResAlpha = booker.book1D(pre + "_hResAlpha",
-            "4D RecHit residual on #alpha_x direction;#alpha^{x}_{rec}-#alpha^{x}_{sim} (rad)",
-            200, -0.015, 0.015);
-
-      hResBeta = booker.book1D(pre + "_hResBeta",
-            "4D RecHit residual on beta direction;#alpha^{y}_{rec}-#alpha^{y}_{sim} (rad)",
-            200, -0.1, 0.1);
-      hResX = booker.book1D(pre + "_hResX", "4D RecHit residual on position (x) in chamber;x_{rec}-x_{sim} (cm)",
-            150, -0.15, 0.15);
-      hResY = booker.book1D(pre + "_hResY", "4D RecHit residual on position (y) in chamber;y_{rec}-y_{sim} (cm)", 150, -0.6, 0.6);
-
-      // histo in rz SL reference frame.
-      hResBetaRZ = booker.book1D(pre + "_hResBetaRZ",
-            "4D RecHit residual on beta direction in RZ SL;#alpha^{y}_{rec}-#alpha^{y}_{sim} (rad)",
-            200, -0.1, 0.1);
-
-      hResYRZ = booker.book1D(pre + "_hResYRZ",
-            "4D RecHit residual on position (y) in chamber in RZ SL;y_{rec}-y_{sim} (cm)",
-            150, -0.15, 0.15);
-
-      // Pulls
       booker.setCurrentFolder("DT/4DSegments/Pull/");
-
-      hPullAlpha = booker.book1D(pre + "_hPullAlpha",
-            "4D RecHit pull on #alpha_x direction;(#alpha^{x}_{rec}-#alpha^{x}_{sim})/#sigma",
-            200, -5, 5);
-      hPullBeta = booker.book1D(pre + "_hPullBeta",
-            "4D RecHit pull on beta direction;(#alpha^{y}_{rec}-#alpha^{y}_{sim})/#sigma",
-            200, -5, 5);
-
-      hPullX = booker.book1D(pre + "_hPullX",
-            "4D RecHit pull on position (x) in chamber;(x_{rec}-x_{sim})#sigma",
-            150, -5, 5);
-
-      hPullY = booker.book1D(pre + "_hPullY",
-            "4D RecHit pull on position (y) in chamber;(y_{rec}-y_{sim})/#sigma", 150, -5, 5);
-
-      hPullBetaRZ = booker.book1D(pre + "_hPullBetaRZ",
-            "4D RecHit pull on beta direction in RZ SL;(#alpha^{y}_{rec}-#alpha^{y}_{sim})/#sigma",
-            200, -5, 5);
-
-      hPullYRZ = booker.book1D(pre + "_hPullYRZ",
-            "4D RecHit pull on position (y) in chamber in RZ SL;(y_{rec}-y_{sim})/#sigma",
-            150, -5, 5);
-
-      // NHits, t0
-      if (local_) {
-        booker.setCurrentFolder("DT/4DSegments/");
-        hHitMult = booker.book2D(pre + "_hNHits", "NHits", 12, 0, 12, 6, 0, 6);
-        ht0      = booker.book2D(pre + "_ht0",    "t0",    200,-25, 25, 200,-25, 25);
-      }
+      hPullAlphaVsEta = booker.book2D(pre + "_hPullAlphaVsEta",
+                                      "4D RecHit pull on #alpha_x direction vs "
+                                      "eta;#eta;(#alpha^{x}_{rec}-#alpha^{x}_{sim})/#sigma",
+                                      100,
+                                      -2.5,
+                                      2.5,
+                                      100,
+                                      -5,
+                                      5);
+      hPullAlphaVsPhi = booker.book2D(pre + "_hPullAlphaVsPhi",
+                                      "4D RecHit pull on #alpha_x direction vs phi (rad);#phi "
+                                      "(rad);(#alpha^{x}_{rec}-#alpha^{x}_{sim})/#sigma",
+                                      100,
+                                      -3.2,
+                                      3.2,
+                                      100,
+                                      -5,
+                                      5);
+      hPullBetaVsEta = booker.book2D(pre + "_hPullBetaVsEta",
+                                     "4D RecHit pull on beta direction vs "
+                                     "eta;#eta;(#alpha^{y}_{rec}-#alpha^{y}_{sim})/#sigma",
+                                     100,
+                                     -2.5,
+                                     2.5,
+                                     200,
+                                     -5,
+                                     5);
+      hPullBetaVsPhi = booker.book2D(pre + "_hPullBetaVsPhi",
+                                     "4D RecHit pull on beta direction vs phi;#phi "
+                                     "(rad);(#alpha^{y}_{rec}-#alpha^{y}_{sim})/#sigma",
+                                     100,
+                                     -3.2,
+                                     3.2,
+                                     200,
+                                     -5,
+                                     5);
+      hPullXVsEta = booker.book2D(pre + "_hPullXVsEta",
+                                  "4D RecHit pull on position (x) in chamber "
+                                  "vs eta;#eta;(x_{rec}-x_{sim})#sigma",
+                                  100,
+                                  -2.5,
+                                  2.5,
+                                  150,
+                                  -5,
+                                  5);
+      hPullXVsPhi = booker.book2D(pre + "_hPullXVsPhi",
+                                  "4D RecHit pull on position (x) in chamber "
+                                  "vs phi;#phi (rad);(x_{rec}-x_{sim})/#sigma",
+                                  100,
+                                  -3.2,
+                                  3.2,
+                                  150,
+                                  -5,
+                                  5);
+      hPullYVsEta = booker.book2D(pre + "_hPullYVsEta",
+                                  "4D RecHit pull on position (y) in chamber "
+                                  "vs eta;#eta;(y_{rec}-y_{sim})/#sigma",
+                                  100,
+                                  -2.5,
+                                  2.5,
+                                  150,
+                                  -5,
+                                  5);
+      hPullYVsPhi = booker.book2D(pre + "_hPullYVsPhi",
+                                  "4D RecHit pull on position (y) in chamber "
+                                  "vs phi;#phi (rad);(y_{rec}-y_{sim})/#sigma",
+                                  100,
+                                  -3.2,
+                                  3.2,
+                                  150,
+                                  -5,
+                                  5);
+      hPullBetaVsEtaRZ = booker.book2D(pre + "_hPullBetaVsEtaRZ",
+                                       "4D RecHit pull on beta direction vs eta;#eta in RZ "
+                                       "SL;(#alpha^{y}_{rec}-#alpha^{y}_{sim})/#sigma",
+                                       100,
+                                       -2.5,
+                                       2.5,
+                                       200,
+                                       -5,
+                                       5);
+      hPullBetaVsPhiRZ = booker.book2D(pre + "_hPullBetaVsPhiRZ",
+                                       "4D RecHit pull on beta direction vs phi in RZ SL;#phi "
+                                       "(rad);(#alpha^{y}_{rec}-#alpha^{y}_{sim})/#sigma",
+                                       100,
+                                       -3.2,
+                                       3.2,
+                                       200,
+                                       -5,
+                                       5);
+      hPullYVsEtaRZ = booker.book2D(pre + "_hPullYVsEtaRZ",
+                                    "4D RecHit pull on position (y) in chamber vs eta in "
+                                    "RZ SL;#eta;(y_{rec}-y_{sim})/#sigma",
+                                    100,
+                                    -2.5,
+                                    2.5,
+                                    150,
+                                    -5,
+                                    5);
+      hPullYVsPhiRZ = booker.book2D(pre + "_hPullYVsPhiRZ",
+                                    "4D RecHit pull on position (y) in chamber vs phi in "
+                                    "RZ SL;#phi (rad);(y_{rec}-y_{sim})/#sigma",
+                                    100,
+                                    -3.2,
+                                    3.2,
+                                    150,
+                                    -5,
+                                    5);
+    }
+    booker.setCurrentFolder("DT/4DSegments/Res/");
+    hResAlpha = booker.book1D(pre + "_hResAlpha",
+                              "4D RecHit residual on #alpha_x "
+                              "direction;#alpha^{x}_{rec}-#alpha^{x}_{sim} (rad)",
+                              200,
+                              -0.015,
+                              0.015);
+
+    hResBeta = booker.book1D(pre + "_hResBeta",
+                             "4D RecHit residual on beta "
+                             "direction;#alpha^{y}_{rec}-#alpha^{y}_{sim} (rad)",
+                             200,
+                             -0.1,
+                             0.1);
+    hResX = booker.book1D(
+        pre + "_hResX", "4D RecHit residual on position (x) in chamber;x_{rec}-x_{sim} (cm)", 150, -0.15, 0.15);
+    hResY = booker.book1D(
+        pre + "_hResY", "4D RecHit residual on position (y) in chamber;y_{rec}-y_{sim} (cm)", 150, -0.6, 0.6);
+
+    // histo in rz SL reference frame.
+    hResBetaRZ = booker.book1D(pre + "_hResBetaRZ",
+                               "4D RecHit residual on beta direction in RZ "
+                               "SL;#alpha^{y}_{rec}-#alpha^{y}_{sim} (rad)",
+                               200,
+                               -0.1,
+                               0.1);
+
+    hResYRZ = booker.book1D(pre + "_hResYRZ",
+                            "4D RecHit residual on position (y) in chamber in "
+                            "RZ SL;y_{rec}-y_{sim} (cm)",
+                            150,
+                            -0.15,
+                            0.15);
+
+    // Pulls
+    booker.setCurrentFolder("DT/4DSegments/Pull/");
+
+    hPullAlpha = booker.book1D(pre + "_hPullAlpha",
+                               "4D RecHit pull on #alpha_x "
+                               "direction;(#alpha^{x}_{rec}-#alpha^{x}_{sim})/#sigma",
+                               200,
+                               -5,
+                               5);
+    hPullBeta = booker.book1D(pre + "_hPullBeta",
+                              "4D RecHit pull on beta "
+                              "direction;(#alpha^{y}_{rec}-#alpha^{y}_{sim})/#sigma",
+                              200,
+                              -5,
+                              5);
+
+    hPullX =
+        booker.book1D(pre + "_hPullX", "4D RecHit pull on position (x) in chamber;(x_{rec}-x_{sim})#sigma", 150, -5, 5);
+
+    hPullY = booker.book1D(
+        pre + "_hPullY", "4D RecHit pull on position (y) in chamber;(y_{rec}-y_{sim})/#sigma", 150, -5, 5);
+
+    hPullBetaRZ = booker.book1D(pre + "_hPullBetaRZ",
+                                "4D RecHit pull on beta direction in RZ "
+                                "SL;(#alpha^{y}_{rec}-#alpha^{y}_{sim})/#sigma",
+                                200,
+                                -5,
+                                5);
+
+    hPullYRZ = booker.book1D(pre + "_hPullYRZ",
+                             "4D RecHit pull on position (y) in chamber in RZ "
+                             "SL;(y_{rec}-y_{sim})/#sigma",
+                             150,
+                             -5,
+                             5);
+
+    // NHits, t0
+    if (local_) {
+      booker.setCurrentFolder("DT/4DSegments/");
+      hHitMult = booker.book2D(pre + "_hNHits", "NHits", 12, 0, 12, 6, 0, 6);
+      ht0 = booker.book2D(pre + "_ht0", "t0", 200, -25, 25, 200, -25, 25);
     }
+  }
 
-    void fill(float simDirectionAlpha,
-              float recDirectionAlpha,
-              float simDirectionBeta,
-              float recDirectionBeta,
-              float simX,
-              float recX,
-              float simY,
-              float recY,
-              float simEta,
-              float simPhi,
-              float recYRZ,
-              float simYRZ,
-              float recBetaRZ,
-              float simBetaRZ,
-              float sigmaAlpha,
-              float sigmaBeta,
-              float sigmaX,
-              float sigmaY,
-              float sigmaBetaRZ,
-              float sigmaYRZ,
-              int nHitsPhi,
-              int nHitsTheta,
-              float t0Phi,
-              float t0Theta)
-    {
-      float resAlpha = recDirectionAlpha - simDirectionAlpha;
-      hResAlpha.fill(resAlpha);
-      hPullAlpha.fill(resAlpha/sigmaAlpha);
-      float resBeta = recDirectionBeta - simDirectionBeta;
-      hResBeta.fill(resBeta);
-      hPullBeta.fill(resBeta/sigmaBeta);
-      float resX = recX - simX;
-      hResX.fill(resX);
-      hPullX.fill(resX/sigmaX);
-      float resY = recY - simY;
-      hResY.fill(resY);
-      hPullY.fill(resY/sigmaY);
-
-      float resBetaRZ = recBetaRZ - simBetaRZ;
-      hResBetaRZ.fill(resBetaRZ);
-      hPullBetaRZ.fill(resBetaRZ/sigmaBetaRZ);
-      float resYRZ = recYRZ - simYRZ;
-      hResYRZ.fill(resYRZ);
-      hPullYRZ.fill(resYRZ/sigmaYRZ);
-      if (doall_) {
-        hRecAlpha.fill(recDirectionAlpha);
-        hRecBeta.fill(recDirectionBeta);
-        hSimAlpha.fill(simDirectionAlpha);
-        hSimBeta.fill(simDirectionBeta);
-        hRecVsSimAlpha.fill(simDirectionAlpha, recDirectionAlpha);
-        hRecVsSimBeta.fill(simDirectionBeta, recDirectionBeta);
-        hResAlphaVsEta.fill(simEta, resAlpha);
-        hResAlphaVsPhi.fill(simPhi, resAlpha);
-        hPullAlphaVsEta.fill(simEta, resAlpha/sigmaAlpha);
-        hPullAlphaVsPhi.fill(simPhi, resAlpha/sigmaAlpha);
-        hResBetaVsEta.fill(simEta, resBeta);
-        hResBetaVsPhi.fill(simPhi, resBeta);
-        hPullBetaVsEta.fill(simEta, resBeta/sigmaBeta);
-        hPullBetaVsPhi.fill(simPhi, resBeta/sigmaBeta);
-        hResXVsEta.fill(simEta, resX);
-        hResXVsPhi.fill(simPhi, resX);
-        hPullXVsEta.fill(simEta, resX/sigmaX);
-        hPullXVsPhi.fill(simPhi, resX/sigmaX);
-        hResYVsEta.fill(simEta, resY);
-        hResYVsPhi.fill(simPhi, resY);
-        hPullYVsEta.fill(simEta, resY/sigmaY);
-        hPullYVsPhi.fill(simPhi, resY/sigmaY);
-        hResAlphaVsResBeta.fill(resBeta, resAlpha);
-        hResXVsResY.fill(resY, resX);
-        hResAlphaVsResX.fill(resX, resAlpha);
-        hResAlphaVsResY.fill(resY, resAlpha);
-
-        // RZ SuperLayer
-        hRecBetaRZ.fill(recBetaRZ);
-        hSimBetaRZ.fill(simBetaRZ);
-        hRecVsSimBetaRZ.fill(simBetaRZ, recBetaRZ);
-        hResBetaVsEtaRZ.fill(simEta, resBetaRZ);
-        hResBetaVsPhiRZ.fill(simPhi, resBetaRZ);
-        hPullBetaVsEtaRZ.fill(simEta, resBetaRZ/sigmaBetaRZ);
-        hPullBetaVsPhiRZ.fill(simPhi, resBetaRZ/sigmaBetaRZ);
-        hResYVsEtaRZ.fill(simEta, resYRZ);
-        hResYVsPhiRZ.fill(simPhi, resYRZ);
-        hPullYVsEtaRZ.fill(simEta, resYRZ/sigmaYRZ);
-        hPullYVsPhiRZ.fill(simPhi, resYRZ/sigmaYRZ);
-      }
-      if (local_) {
-        hHitMult.fill(nHitsPhi, nHitsTheta);
-        ht0.fill(t0Phi, t0Theta);
-      }
+  void fill(float simDirectionAlpha,
+            float recDirectionAlpha,
+            float simDirectionBeta,
+            float recDirectionBeta,
+            float simX,
+            float recX,
+            float simY,
+            float recY,
+            float simEta,
+            float simPhi,
+            float recYRZ,
+            float simYRZ,
+            float recBetaRZ,
+            float simBetaRZ,
+            float sigmaAlpha,
+            float sigmaBeta,
+            float sigmaX,
+            float sigmaY,
+            float sigmaBetaRZ,
+            float sigmaYRZ,
+            int nHitsPhi,
+            int nHitsTheta,
+            float t0Phi,
+            float t0Theta) {
+    float resAlpha = recDirectionAlpha - simDirectionAlpha;
+    hResAlpha.fill(resAlpha);
+    hPullAlpha.fill(resAlpha / sigmaAlpha);
+    float resBeta = recDirectionBeta - simDirectionBeta;
+    hResBeta.fill(resBeta);
+    hPullBeta.fill(resBeta / sigmaBeta);
+    float resX = recX - simX;
+    hResX.fill(resX);
+    hPullX.fill(resX / sigmaX);
+    float resY = recY - simY;
+    hResY.fill(resY);
+    hPullY.fill(resY / sigmaY);
+
+    float resBetaRZ = recBetaRZ - simBetaRZ;
+    hResBetaRZ.fill(resBetaRZ);
+    hPullBetaRZ.fill(resBetaRZ / sigmaBetaRZ);
+    float resYRZ = recYRZ - simYRZ;
+    hResYRZ.fill(resYRZ);
+    hPullYRZ.fill(resYRZ / sigmaYRZ);
+    if (doall_) {
+      hRecAlpha.fill(recDirectionAlpha);
+      hRecBeta.fill(recDirectionBeta);
+      hSimAlpha.fill(simDirectionAlpha);
+      hSimBeta.fill(simDirectionBeta);
+      hRecVsSimAlpha.fill(simDirectionAlpha, recDirectionAlpha);
+      hRecVsSimBeta.fill(simDirectionBeta, recDirectionBeta);
+      hResAlphaVsEta.fill(simEta, resAlpha);
+      hResAlphaVsPhi.fill(simPhi, resAlpha);
+      hPullAlphaVsEta.fill(simEta, resAlpha / sigmaAlpha);
+      hPullAlphaVsPhi.fill(simPhi, resAlpha / sigmaAlpha);
+      hResBetaVsEta.fill(simEta, resBeta);
+      hResBetaVsPhi.fill(simPhi, resBeta);
+      hPullBetaVsEta.fill(simEta, resBeta / sigmaBeta);
+      hPullBetaVsPhi.fill(simPhi, resBeta / sigmaBeta);
+      hResXVsEta.fill(simEta, resX);
+      hResXVsPhi.fill(simPhi, resX);
+      hPullXVsEta.fill(simEta, resX / sigmaX);
+      hPullXVsPhi.fill(simPhi, resX / sigmaX);
+      hResYVsEta.fill(simEta, resY);
+      hResYVsPhi.fill(simPhi, resY);
+      hPullYVsEta.fill(simEta, resY / sigmaY);
+      hPullYVsPhi.fill(simPhi, resY / sigmaY);
+      hResAlphaVsResBeta.fill(resBeta, resAlpha);
+      hResXVsResY.fill(resY, resX);
+      hResAlphaVsResX.fill(resX, resAlpha);
+      hResAlphaVsResY.fill(resY, resAlpha);
+
+      // RZ SuperLayer
+      hRecBetaRZ.fill(recBetaRZ);
+      hSimBetaRZ.fill(simBetaRZ);
+      hRecVsSimBetaRZ.fill(simBetaRZ, recBetaRZ);
+      hResBetaVsEtaRZ.fill(simEta, resBetaRZ);
+      hResBetaVsPhiRZ.fill(simPhi, resBetaRZ);
+      hPullBetaVsEtaRZ.fill(simEta, resBetaRZ / sigmaBetaRZ);
+      hPullBetaVsPhiRZ.fill(simPhi, resBetaRZ / sigmaBetaRZ);
+      hResYVsEtaRZ.fill(simEta, resYRZ);
+      hResYVsPhiRZ.fill(simPhi, resYRZ);
+      hPullYVsEtaRZ.fill(simEta, resYRZ / sigmaYRZ);
+      hPullYVsPhiRZ.fill(simPhi, resYRZ / sigmaYRZ);
+    }
+    if (local_) {
+      hHitMult.fill(nHitsPhi, nHitsTheta);
+      ht0.fill(t0Phi, t0Theta);
     }
+  }
 
-  private:
-    ConcurrentMonitorElement hRecAlpha;
-    ConcurrentMonitorElement hRecBeta;
-    ConcurrentMonitorElement hSimAlpha;
-    ConcurrentMonitorElement hSimBeta;
-    ConcurrentMonitorElement hRecVsSimAlpha;
-    ConcurrentMonitorElement hRecVsSimBeta;
-    ConcurrentMonitorElement hResAlpha;
-    ConcurrentMonitorElement hResAlphaVsEta;
-    ConcurrentMonitorElement hResAlphaVsPhi;
-    ConcurrentMonitorElement hResBeta;
-    ConcurrentMonitorElement hResBetaVsEta;
-    ConcurrentMonitorElement hResBetaVsPhi;
-    ConcurrentMonitorElement hResX;
-    ConcurrentMonitorElement hResXVsEta;
-    ConcurrentMonitorElement hResXVsPhi;
-    ConcurrentMonitorElement hResY;
-    ConcurrentMonitorElement hResYVsEta;
-    ConcurrentMonitorElement hResYVsPhi;
-    ConcurrentMonitorElement hResAlphaVsResBeta;
-    ConcurrentMonitorElement hResXVsResY;
-    ConcurrentMonitorElement hResAlphaVsResX;
-    ConcurrentMonitorElement hResAlphaVsResY;
-    ConcurrentMonitorElement hPullAlpha;
-    ConcurrentMonitorElement hPullAlphaVsEta;
-    ConcurrentMonitorElement hPullAlphaVsPhi;
-    ConcurrentMonitorElement hPullBeta;
-    ConcurrentMonitorElement hPullBetaVsEta;
-    ConcurrentMonitorElement hPullBetaVsPhi;
-    ConcurrentMonitorElement hPullX;
-    ConcurrentMonitorElement hPullXVsEta;
-    ConcurrentMonitorElement hPullXVsPhi;
-    ConcurrentMonitorElement hPullY;
-    ConcurrentMonitorElement hPullYVsEta;
-    ConcurrentMonitorElement hPullYVsPhi;
-
-    // RZ SL
-    ConcurrentMonitorElement hRecBetaRZ;
-    ConcurrentMonitorElement hSimBetaRZ;
-    ConcurrentMonitorElement hRecVsSimBetaRZ;
-    ConcurrentMonitorElement hResBetaRZ;
-    ConcurrentMonitorElement hResBetaVsEtaRZ;
-    ConcurrentMonitorElement hResBetaVsPhiRZ;
-    ConcurrentMonitorElement hResYRZ;
-    ConcurrentMonitorElement hResYVsEtaRZ;
-    ConcurrentMonitorElement hResYVsPhiRZ;
-    ConcurrentMonitorElement hPullBetaRZ;
-    ConcurrentMonitorElement hPullBetaVsEtaRZ;
-    ConcurrentMonitorElement hPullBetaVsPhiRZ;
-    ConcurrentMonitorElement hPullYRZ;
-    ConcurrentMonitorElement hPullYVsEtaRZ;
-    ConcurrentMonitorElement hPullYVsPhiRZ;
-
-    ConcurrentMonitorElement hHitMult;
-    ConcurrentMonitorElement ht0;
-
-    bool doall_;
-    bool local_;
-    std::string name_;
+private:
+  ConcurrentMonitorElement hRecAlpha;
+  ConcurrentMonitorElement hRecBeta;
+  ConcurrentMonitorElement hSimAlpha;
+  ConcurrentMonitorElement hSimBeta;
+  ConcurrentMonitorElement hRecVsSimAlpha;
+  ConcurrentMonitorElement hRecVsSimBeta;
+  ConcurrentMonitorElement hResAlpha;
+  ConcurrentMonitorElement hResAlphaVsEta;
+  ConcurrentMonitorElement hResAlphaVsPhi;
+  ConcurrentMonitorElement hResBeta;
+  ConcurrentMonitorElement hResBetaVsEta;
+  ConcurrentMonitorElement hResBetaVsPhi;
+  ConcurrentMonitorElement hResX;
+  ConcurrentMonitorElement hResXVsEta;
+  ConcurrentMonitorElement hResXVsPhi;
+  ConcurrentMonitorElement hResY;
+  ConcurrentMonitorElement hResYVsEta;
+  ConcurrentMonitorElement hResYVsPhi;
+  ConcurrentMonitorElement hResAlphaVsResBeta;
+  ConcurrentMonitorElement hResXVsResY;
+  ConcurrentMonitorElement hResAlphaVsResX;
+  ConcurrentMonitorElement hResAlphaVsResY;
+  ConcurrentMonitorElement hPullAlpha;
+  ConcurrentMonitorElement hPullAlphaVsEta;
+  ConcurrentMonitorElement hPullAlphaVsPhi;
+  ConcurrentMonitorElement hPullBeta;
+  ConcurrentMonitorElement hPullBetaVsEta;
+  ConcurrentMonitorElement hPullBetaVsPhi;
+  ConcurrentMonitorElement hPullX;
+  ConcurrentMonitorElement hPullXVsEta;
+  ConcurrentMonitorElement hPullXVsPhi;
+  ConcurrentMonitorElement hPullY;
+  ConcurrentMonitorElement hPullYVsEta;
+  ConcurrentMonitorElement hPullYVsPhi;
+
+  // RZ SL
+  ConcurrentMonitorElement hRecBetaRZ;
+  ConcurrentMonitorElement hSimBetaRZ;
+  ConcurrentMonitorElement hRecVsSimBetaRZ;
+  ConcurrentMonitorElement hResBetaRZ;
+  ConcurrentMonitorElement hResBetaVsEtaRZ;
+  ConcurrentMonitorElement hResBetaVsPhiRZ;
+  ConcurrentMonitorElement hResYRZ;
+  ConcurrentMonitorElement hResYVsEtaRZ;
+  ConcurrentMonitorElement hResYVsPhiRZ;
+  ConcurrentMonitorElement hPullBetaRZ;
+  ConcurrentMonitorElement hPullBetaVsEtaRZ;
+  ConcurrentMonitorElement hPullBetaVsPhiRZ;
+  ConcurrentMonitorElement hPullYRZ;
+  ConcurrentMonitorElement hPullYVsEtaRZ;
+  ConcurrentMonitorElement hPullYVsPhiRZ;
+
+  ConcurrentMonitorElement hHitMult;
+  ConcurrentMonitorElement ht0;
+
+  bool doall_;
+  bool local_;
+  std::string name_;
 };
 
 //---------------------------------------------------------------------------------------
 /// A set of histograms for efficiency 4D RecHits (producer)
 class HEff4DHit {
-  public:
-    HEff4DHit(const std::string& name, DQMStore::ConcurrentBooker & booker) {
-      std::string pre ="4D_";
-      pre += name;
-      name_ = pre;
-      booker.setCurrentFolder("DT/4DSegments/");
-      hEtaSimSegm   = booker.book1D(pre + "_hEtaSimSegm", "Eta of SimHit segment", 100, -1.5, 1.5);
-      hEtaRecHit    = booker.book1D(pre + "_hEtaRecHit", "Eta distribution of SimHit segment with 4D RecHit", 100, -1.5, 1.5);
-
-      hPhiSimSegm   = booker.book1D(pre + "_hPhiSimSegm", "Phi of SimHit segment", 100, -M_PI, M_PI);
-      hPhiRecHit    = booker.book1D(pre + "_hPhiRecHit", "Phi distribution of SimHit segment with 4D RecHit", 100, -M_PI, M_PI);
-
-      hXSimSegm     = booker.book1D(pre + "_hXSimSegm", "X position in Chamber of SimHit segment (cm)", 100, -200, 200);
-      hXRecHit      = booker.book1D(pre + "_hXRecHit", "X position in Chamber of SimHit segment with 4D RecHit (cm)", 100, -200, 200);
-
-      hYSimSegm     = booker.book1D(pre + "_hYSimSegm", "Y position in Chamber of SimHit segment (cm)", 100, -200, 200);
-      hYRecHit      = booker.book1D(pre + "_hYRecHit", "Y position in Chamber of SimHit segment with 4D RecHit (cm)", 100, -200, 200);
-
-      hAlphaSimSegm = booker.book1D(pre + "_hAlphaSimSegm", "Alpha of SimHit segment (rad)", 100, -1.5, 1.5);
-      hAlphaRecHit  = booker.book1D(pre + "_hAlphaRecHit", "Alpha of SimHit segment with 4D RecHit (rad)", 100, -1.5, 1.5);
-
-      hBetaSimSegm  = booker.book1D(pre + "_hBetaSimSegm", "Beta of SimHit segment (rad)", 100, -2, 2);
-      hBetaRecHit   = booker.book1D(pre + "_hBetaRecHit", "Beta of SimHit segment with 4D RecHit (rad)", 100, -2, 2);
-
-      hNSeg         = booker.book1D(pre + "_hNSeg", "Number of rec segment per sim seg", 20, 0, 20);
-
-    }
+public:
+  HEff4DHit(const std::string &name, DQMStore::ConcurrentBooker &booker) {
+    std::string pre = "4D_";
+    pre += name;
+    name_ = pre;
+    booker.setCurrentFolder("DT/4DSegments/");
+    hEtaSimSegm = booker.book1D(pre + "_hEtaSimSegm", "Eta of SimHit segment", 100, -1.5, 1.5);
+    hEtaRecHit =
+        booker.book1D(pre + "_hEtaRecHit", "Eta distribution of SimHit segment with 4D RecHit", 100, -1.5, 1.5);
+
+    hPhiSimSegm = booker.book1D(pre + "_hPhiSimSegm", "Phi of SimHit segment", 100, -M_PI, M_PI);
+    hPhiRecHit =
+        booker.book1D(pre + "_hPhiRecHit", "Phi distribution of SimHit segment with 4D RecHit", 100, -M_PI, M_PI);
+
+    hXSimSegm = booker.book1D(pre + "_hXSimSegm", "X position in Chamber of SimHit segment (cm)", 100, -200, 200);
+    hXRecHit =
+        booker.book1D(pre + "_hXRecHit", "X position in Chamber of SimHit segment with 4D RecHit (cm)", 100, -200, 200);
+
+    hYSimSegm = booker.book1D(pre + "_hYSimSegm", "Y position in Chamber of SimHit segment (cm)", 100, -200, 200);
+    hYRecHit =
+        booker.book1D(pre + "_hYRecHit", "Y position in Chamber of SimHit segment with 4D RecHit (cm)", 100, -200, 200);
+
+    hAlphaSimSegm = booker.book1D(pre + "_hAlphaSimSegm", "Alpha of SimHit segment (rad)", 100, -1.5, 1.5);
+    hAlphaRecHit = booker.book1D(pre + "_hAlphaRecHit", "Alpha of SimHit segment with 4D RecHit (rad)", 100, -1.5, 1.5);
+
+    hBetaSimSegm = booker.book1D(pre + "_hBetaSimSegm", "Beta of SimHit segment (rad)", 100, -2, 2);
+    hBetaRecHit = booker.book1D(pre + "_hBetaRecHit", "Beta of SimHit segment with 4D RecHit (rad)", 100, -2, 2);
+
+    hNSeg = booker.book1D(pre + "_hNSeg", "Number of rec segment per sim seg", 20, 0, 20);
+  }
 
-    void fill(float etaSimSegm,
-              float phiSimSegm,
-              float xSimSegm,
-              float ySimSegm,
-              float alphaSimSegm,
-              float betaSimSegm,
-              bool fillRecHit,
-              int nSeg)
-    {
-      hEtaSimSegm.fill(etaSimSegm);
-      hPhiSimSegm.fill(phiSimSegm);
-      hXSimSegm.fill(xSimSegm);
-      hYSimSegm.fill(ySimSegm);
-      hAlphaSimSegm.fill(alphaSimSegm);
-      hBetaSimSegm.fill(betaSimSegm);
-      hNSeg.fill(nSeg);
-
-      if (fillRecHit) {
-        hEtaRecHit.fill(etaSimSegm);
-        hPhiRecHit.fill(phiSimSegm);
-        hXRecHit.fill(xSimSegm);
-        hYRecHit.fill(ySimSegm);
-        hAlphaRecHit.fill(alphaSimSegm);
-        hBetaRecHit.fill(betaSimSegm);
-      }
+  void fill(float etaSimSegm,
+            float phiSimSegm,
+            float xSimSegm,
+            float ySimSegm,
+            float alphaSimSegm,
+            float betaSimSegm,
+            bool fillRecHit,
+            int nSeg) {
+    hEtaSimSegm.fill(etaSimSegm);
+    hPhiSimSegm.fill(phiSimSegm);
+    hXSimSegm.fill(xSimSegm);
+    hYSimSegm.fill(ySimSegm);
+    hAlphaSimSegm.fill(alphaSimSegm);
+    hBetaSimSegm.fill(betaSimSegm);
+    hNSeg.fill(nSeg);
+
+    if (fillRecHit) {
+      hEtaRecHit.fill(etaSimSegm);
+      hPhiRecHit.fill(phiSimSegm);
+      hXRecHit.fill(xSimSegm);
+      hYRecHit.fill(ySimSegm);
+      hAlphaRecHit.fill(alphaSimSegm);
+      hBetaRecHit.fill(betaSimSegm);
     }
+  }
 
-  private:
-    ConcurrentMonitorElement hEtaSimSegm;
-    ConcurrentMonitorElement hEtaRecHit;
-    ConcurrentMonitorElement hPhiSimSegm;
-    ConcurrentMonitorElement hPhiRecHit;
-    ConcurrentMonitorElement hXSimSegm;
-    ConcurrentMonitorElement hXRecHit;
-    ConcurrentMonitorElement hYSimSegm;
-    ConcurrentMonitorElement hYRecHit;
-    ConcurrentMonitorElement hAlphaSimSegm;
-    ConcurrentMonitorElement hAlphaRecHit;
-    ConcurrentMonitorElement hBetaSimSegm;
-    ConcurrentMonitorElement hBetaRecHit;
-
-    ConcurrentMonitorElement hNSeg;
-
-    std::string name_;
+private:
+  ConcurrentMonitorElement hEtaSimSegm;
+  ConcurrentMonitorElement hEtaRecHit;
+  ConcurrentMonitorElement hPhiSimSegm;
+  ConcurrentMonitorElement hPhiRecHit;
+  ConcurrentMonitorElement hXSimSegm;
+  ConcurrentMonitorElement hXRecHit;
+  ConcurrentMonitorElement hYSimSegm;
+  ConcurrentMonitorElement hYRecHit;
+  ConcurrentMonitorElement hAlphaSimSegm;
+  ConcurrentMonitorElement hAlphaRecHit;
+  ConcurrentMonitorElement hBetaSimSegm;
+  ConcurrentMonitorElement hBetaRecHit;
+
+  ConcurrentMonitorElement hNSeg;
+
+  std::string name_;
 };
 
 //---------------------------------------------------------------------------------------
 /// A set of histograms for efficiency 4D RecHits (harvesting)
 class HEff4DHitHarvest {
- public:
-    HEff4DHitHarvest(const std::string & name, 
-		     DQMStore::IBooker & booker, 
-		     DQMStore::IGetter & getter) {
-      std::string pre ="4D_";
-      pre += name;
-      name_ = pre;
-      booker.setCurrentFolder("DT/4DSegments/");
-      hEffVsEta  = booker.book1D(pre + "_hEffVsEta",  "4D RecHit Efficiency as a function of Eta",  100, -1.5, 1.5);
-      hEffVsPhi  = booker.book1D(pre + "_hEffVsPhi",  "4D RecHit Efficiency as a function of Phi",  100, -M_PI, M_PI);
-      hEffVsX = booker.book1D(pre + "_hEffVsX", "4D RecHit Efficiency as a function of x position in Chamber", 100, -200, 200); 
-      hEffVsY = booker.book1D(pre + "_hEffVsY", "4D RecHit Efficiency as a function of y position in Chamber", 100, -200, 200); 
-      hEffVsAlpha = booker.book1D(pre + "_hEffVsAlpha", "4D RecHit Efficiency as a function of alpha", 100, -1.5, 1.5); 
-      hEffVsBeta = booker.book1D(pre + "_hEffVsBeta", "4D RecHit Efficiency as a function of beta", 100, -2, 2); 
-
-      computeEfficiency(getter);
-    }
+public:
+  HEff4DHitHarvest(const std::string &name, DQMStore::IBooker &booker, DQMStore::IGetter &getter) {
+    std::string pre = "4D_";
+    pre += name;
+    name_ = pre;
+    booker.setCurrentFolder("DT/4DSegments/");
+    hEffVsEta = booker.book1D(pre + "_hEffVsEta", "4D RecHit Efficiency as a function of Eta", 100, -1.5, 1.5);
+    hEffVsPhi = booker.book1D(pre + "_hEffVsPhi", "4D RecHit Efficiency as a function of Phi", 100, -M_PI, M_PI);
+    hEffVsX =
+        booker.book1D(pre + "_hEffVsX", "4D RecHit Efficiency as a function of x position in Chamber", 100, -200, 200);
+    hEffVsY =
+        booker.book1D(pre + "_hEffVsY", "4D RecHit Efficiency as a function of y position in Chamber", 100, -200, 200);
+    hEffVsAlpha = booker.book1D(pre + "_hEffVsAlpha", "4D RecHit Efficiency as a function of alpha", 100, -1.5, 1.5);
+    hEffVsBeta = booker.book1D(pre + "_hEffVsBeta", "4D RecHit Efficiency as a function of beta", 100, -2, 2);
+
+    computeEfficiency(getter);
+  }
 
-    void computeEfficiency(DQMStore::IGetter& getter) {
-      std::string pre = "DT/4DSegments/" + name_;
-      divide(hEffVsEta,   getter.get(pre + "_hEtaRecHit"),   getter.get(pre + "_hEtaSimSegm"));
-      divide(hEffVsPhi,   getter.get(pre + "_hPhiRecHit"),   getter.get(pre + "_hPhiSimSegm"));
-      divide(hEffVsX,     getter.get(pre + "_hXRecHit"),     getter.get(pre + "_hXSimSegm"));
-      divide(hEffVsY,     getter.get(pre + "_hYRecHit"),     getter.get(pre + "_hYSimSegm"));
-      divide(hEffVsAlpha, getter.get(pre + "_hAlphaRecHit"), getter.get(pre + "_hAlphaSimSegm"));
-      divide(hEffVsBeta,  getter.get(pre + "_hBetaRecHit"),  getter.get(pre + "_hBetaSimSegm"));
-    }
-    
- private:
-    MonitorElement* hEffVsEta;
-    MonitorElement* hEffVsPhi;
+  void computeEfficiency(DQMStore::IGetter &getter) {
+    std::string pre = "DT/4DSegments/" + name_;
+    divide(hEffVsEta, getter.get(pre + "_hEtaRecHit"), getter.get(pre + "_hEtaSimSegm"));
+    divide(hEffVsPhi, getter.get(pre + "_hPhiRecHit"), getter.get(pre + "_hPhiSimSegm"));
+    divide(hEffVsX, getter.get(pre + "_hXRecHit"), getter.get(pre + "_hXSimSegm"));
+    divide(hEffVsY, getter.get(pre + "_hYRecHit"), getter.get(pre + "_hYSimSegm"));
+    divide(hEffVsAlpha, getter.get(pre + "_hAlphaRecHit"), getter.get(pre + "_hAlphaSimSegm"));
+    divide(hEffVsBeta, getter.get(pre + "_hBetaRecHit"), getter.get(pre + "_hBetaSimSegm"));
+  }
+
+private:
+  MonitorElement *hEffVsEta;
+  MonitorElement *hEffVsPhi;
 
-    MonitorElement* hEffVsX;
-    MonitorElement* hEffVsY;
+  MonitorElement *hEffVsX;
+  MonitorElement *hEffVsY;
 
-    MonitorElement* hEffVsAlpha;
-    MonitorElement* hEffVsBeta;
+  MonitorElement *hEffVsAlpha;
+  MonitorElement *hEffVsBeta;
 
-    std::string name_;
+  std::string name_;
 };
 
-#endif // Validation_DTRecHits_Histograms_h
+#endif  // Validation_DTRecHits_Histograms_h
diff --git a/Validation/DTRecHits/src/DTHitQualityUtils.cc b/Validation/DTRecHits/src/DTHitQualityUtils.cc
index 8ca43188e60b0..efefb804e6434 100644
--- a/Validation/DTRecHits/src/DTHitQualityUtils.cc
+++ b/Validation/DTRecHits/src/DTHitQualityUtils.cc
@@ -5,12 +5,11 @@
  *  \author S. Bolognesi and G. Cerminara - INFN Torino
  */
 
-
-#include "Validation/DTRecHits/interface/DTHitQualityUtils.h"
 #include "DataFormats/DetId/interface/DetId.h"
-#include "Geometry/DTGeometry/interface/DTGeometry.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
+#include "Geometry/DTGeometry/interface/DTGeometry.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
+#include "Validation/DTRecHits/interface/DTHitQualityUtils.h"
 
 #include <iostream>
 
@@ -19,65 +18,59 @@ using namespace edm;
 
 std::atomic<bool> DTHitQualityUtils::debug{false};
 
-// Return a map between simhits of a layer,superlayer or chamber and the wireId of their cell
-map<DTWireId, PSimHitContainer >
-DTHitQualityUtils::mapSimHitsPerWire(const PSimHitContainer& simhits) {
-  map<DTWireId, PSimHitContainer > hitWireMapResult;
-   
-  for(PSimHitContainer::const_iterator simhit = simhits.begin();
-      simhit != simhits.end();
-      simhit++) {
+// Return a map between simhits of a layer,superlayer or chamber and the wireId
+// of their cell
+map<DTWireId, PSimHitContainer> DTHitQualityUtils::mapSimHitsPerWire(const PSimHitContainer &simhits) {
+  map<DTWireId, PSimHitContainer> hitWireMapResult;
+
+  for (PSimHitContainer::const_iterator simhit = simhits.begin(); simhit != simhits.end(); simhit++) {
     hitWireMapResult[DTWireId((*simhit).detUnitId())].push_back(*simhit);
   }
-   
+
   return hitWireMapResult;
 }
 
 // Extract mu simhits from a map of simhits by wire and map them by wire
-map<DTWireId, const PSimHit*>
-DTHitQualityUtils::mapMuSimHitsPerWire(const map<DTWireId, PSimHitContainer>& simHitWireMap) {
-
-  map<DTWireId, const PSimHit*> ret;
-  
-  for(map<DTWireId, PSimHitContainer>::const_iterator wireAndSimHit = simHitWireMap.begin();
-      wireAndSimHit != simHitWireMap.end();
-      wireAndSimHit++) {
-
-    const PSimHit* muHit = findMuSimHit((*wireAndSimHit).second);
-    if(muHit != nullptr) {
-      ret[(*wireAndSimHit).first]=(muHit);
+map<DTWireId, const PSimHit *> DTHitQualityUtils::mapMuSimHitsPerWire(
+    const map<DTWireId, PSimHitContainer> &simHitWireMap) {
+  map<DTWireId, const PSimHit *> ret;
+
+  for (map<DTWireId, PSimHitContainer>::const_iterator wireAndSimHit = simHitWireMap.begin();
+       wireAndSimHit != simHitWireMap.end();
+       wireAndSimHit++) {
+    const PSimHit *muHit = findMuSimHit((*wireAndSimHit).second);
+    if (muHit != nullptr) {
+      ret[(*wireAndSimHit).first] = (muHit);
     }
   }
   return ret;
 }
 
-
 // Find the sim hit from muon track in a vector of simhits
 // If no mu sim hit is found then it returns a null pointer
-const PSimHit* DTHitQualityUtils::findMuSimHit(const PSimHitContainer& hits) {
-  //PSimHitContainer muHits;
-  vector<const PSimHit*> muHits;
- 
-   // Loop over simhits
-  for (PSimHitContainer::const_iterator hit=hits.begin();
-       hit != hits.end(); hit++) {
-    if (abs((*hit).particleType())==13) muHits.push_back(&(*hit));
+const PSimHit *DTHitQualityUtils::findMuSimHit(const PSimHitContainer &hits) {
+  // PSimHitContainer muHits;
+  vector<const PSimHit *> muHits;
+
+  // Loop over simhits
+  for (PSimHitContainer::const_iterator hit = hits.begin(); hit != hits.end(); hit++) {
+    if (abs((*hit).particleType()) == 13)
+      muHits.push_back(&(*hit));
   }
 
   if (muHits.empty())
-    return nullptr; //FIXME: Throw of exception???
-  else if (muHits.size()>1)
-    if(debug)
+    return nullptr;  // FIXME: Throw of exception???
+  else if (muHits.size() > 1)
+    if (debug)
       cout << "[DTHitQualityUtils]***WARNING: # muSimHits in a wire = " << muHits.size() << endl;
 
   return (muHits.front());
 }
 
-
-// Find Innermost and outermost SimHit from Mu in a SL (they identify a simulated segment)
-pair<const PSimHit*, const PSimHit*>
-DTHitQualityUtils::findMuSimSegment(const map<DTWireId, const PSimHit*>& mapWireAndMuSimHit) {
-
+// Find Innermost and outermost SimHit from Mu in a SL (they identify a
+// simulated segment)
+pair<const PSimHit *, const PSimHit *> DTHitQualityUtils::findMuSimSegment(
+    const map<DTWireId, const PSimHit *> &mapWireAndMuSimHit) {
   int outSL = 0;
   int inSL = 4;
   int outLayer = 0;
@@ -85,50 +78,49 @@ DTHitQualityUtils::findMuSimSegment(const map<DTWireId, const PSimHit*>& mapWire
   const PSimHit *inSimHit = nullptr;
   const PSimHit *outSimHit = nullptr;
 
-  for(map<DTWireId, const PSimHit*>::const_iterator wireAndMuSimHit = mapWireAndMuSimHit.begin();
-      wireAndMuSimHit != mapWireAndMuSimHit.end();
-      wireAndMuSimHit++) {
-    
+  for (map<DTWireId, const PSimHit *>::const_iterator wireAndMuSimHit = mapWireAndMuSimHit.begin();
+       wireAndMuSimHit != mapWireAndMuSimHit.end();
+       wireAndMuSimHit++) {
     const DTWireId wireId = (*wireAndMuSimHit).first;
     const PSimHit *theMuHit = (*wireAndMuSimHit).second;
 
     int sl = ((wireId.layerId()).superlayerId()).superLayer();
     int layer = (wireId.layerId()).layer();
 
-    if(sl == outSL) {
-      if(layer > outLayer) {
-	outLayer = layer;
-	outSimHit = theMuHit;
+    if (sl == outSL) {
+      if (layer > outLayer) {
+        outLayer = layer;
+        outSimHit = theMuHit;
       }
     }
-    if(sl > outSL) {
+    if (sl > outSL) {
       outSL = sl;
       outLayer = layer;
       outSimHit = theMuHit;
     }
-    if(sl == inSL) {
-      if(layer < inLayer) {
-	inLayer = layer;
-	inSimHit = theMuHit;
+    if (sl == inSL) {
+      if (layer < inLayer) {
+        inLayer = layer;
+        inSimHit = theMuHit;
       }
     }
-    if(sl < inSL) {
+    if (sl < inSL) {
       inSL = sl;
       inLayer = layer;
       inSimHit = theMuHit;
     }
   }
 
-  if(inSimHit != nullptr) {
-    if(debug)
+  if (inSimHit != nullptr) {
+    if (debug)
       cout << "Innermost SimHit on SL: " << inSL << " layer: " << inLayer << endl;
   } else {
     cout << "[DTHitQualityUtils]***Error: No Innermost SimHit found!!!" << endl;
     abort();
   }
 
-  if(outSimHit != nullptr) {
-    if(debug)
+  if (outSimHit != nullptr) {
+    if (debug)
       cout << "Outermost SimHit on SL: " << outSL << " layer: " << outLayer << endl;
   } else {
     cout << "[DTHitQualityUtils]***Error: No Outermost SimHit found!!!" << endl;
@@ -137,62 +129,52 @@ DTHitQualityUtils::findMuSimSegment(const map<DTWireId, const PSimHit*>& mapWire
 
   // //Check that outermost and innermost SimHit are not the same
   // if(outSimHit == inSimHit) {
-  //   cout << "[DTHitQualityUtils]***Warning: outermost and innermost SimHit are the same!" << endl;
-  //   abort();
+  //   cout << "[DTHitQualityUtils]***Warning: outermost and innermost SimHit
+  //   are the same!" << endl; abort();
   //     }
   return make_pair(inSimHit, outSimHit);
 }
 
-
-
-// Find direction and position of a segment (in local RF) from outer and inner mu SimHit in the RF of object Det
-// (Concrete implementation of Det are MuBarSL and MuBarChamber)
-pair<LocalVector, LocalPoint>
-DTHitQualityUtils::findMuSimSegmentDirAndPos(const pair<const PSimHit*, const PSimHit*>& inAndOutSimHit,
-					     const DetId detId, const DTGeometry *muonGeom) {
-
-  //FIXME: What should happen if outSimHit = inSimHit???? Now, this case is not considered
-  const PSimHit* innermostMuSimHit = inAndOutSimHit.first;
-  const PSimHit* outermostMuSimHit = inAndOutSimHit.second;
-
-  //Find simulated segment direction from SimHits position
-  const DTLayer* layerIn = muonGeom->layer((DTWireId(innermostMuSimHit->detUnitId())).layerId()); 
-  const DTLayer* layerOut = muonGeom->layer((DTWireId(outermostMuSimHit->detUnitId())).layerId()); 
+// Find direction and position of a segment (in local RF) from outer and inner
+// mu SimHit in the RF of object Det (Concrete implementation of Det are MuBarSL
+// and MuBarChamber)
+pair<LocalVector, LocalPoint> DTHitQualityUtils::findMuSimSegmentDirAndPos(
+    const pair<const PSimHit *, const PSimHit *> &inAndOutSimHit, const DetId detId, const DTGeometry *muonGeom) {
+  // FIXME: What should happen if outSimHit = inSimHit???? Now, this case is not
+  // considered
+  const PSimHit *innermostMuSimHit = inAndOutSimHit.first;
+  const PSimHit *outermostMuSimHit = inAndOutSimHit.second;
+
+  // Find simulated segment direction from SimHits position
+  const DTLayer *layerIn = muonGeom->layer((DTWireId(innermostMuSimHit->detUnitId())).layerId());
+  const DTLayer *layerOut = muonGeom->layer((DTWireId(outermostMuSimHit->detUnitId())).layerId());
   GlobalPoint inGlobalPos = layerIn->toGlobal(innermostMuSimHit->localPosition());
   GlobalPoint outGlobalPos = layerOut->toGlobal(outermostMuSimHit->localPosition());
   LocalVector simHitDirection = (muonGeom->idToDet(detId))->toLocal(inGlobalPos - outGlobalPos);
   simHitDirection = -simHitDirection.unit();
 
-  //SimHit position extrapolated at z=0 in the Det RF
+  // SimHit position extrapolated at z=0 in the Det RF
   LocalPoint outLocalPos = (muonGeom->idToDet(detId))->toLocal(outGlobalPos);
   LocalPoint simSegLocalPosition =
-    outLocalPos + simHitDirection*(-outLocalPos.z()/(simHitDirection.mag()*cos(simHitDirection.theta())));
+      outLocalPos + simHitDirection * (-outLocalPos.z() / (simHitDirection.mag() * cos(simHitDirection.theta())));
 
   return make_pair(simHitDirection, simSegLocalPosition);
 }
 
 // Find the angles from a segment direction:
 // atan(dx/dz) = "phi"   angle in the chamber RF
-// atan(dy/dz) = "theta" angle in the chamber RF (note: this has opposite sign in the SLZ RF!)
-pair<double, double> DTHitQualityUtils::findSegmentAlphaAndBeta(const LocalVector& direction) {
-  return make_pair(atan(direction.x()/direction.z()), atan(direction.y()/direction.z()));
+// atan(dy/dz) = "theta" angle in the chamber RF (note: this has opposite sign
+// in the SLZ RF!)
+pair<double, double> DTHitQualityUtils::findSegmentAlphaAndBeta(const LocalVector &direction) {
+  return make_pair(atan(direction.x() / direction.z()), atan(direction.y() / direction.z()));
 }
 
-//Find error on angle (squared) from localDirectionError, which is the error on tan(Angle) 
+// Find error on angle (squared) from localDirectionError, which is the error on
+// tan(Angle)
 double DTHitQualityUtils::sigmaAngle(double Angle, double sigma2TanAngle) {
-
   double XdivZ = tan(Angle);
-  double sigma2Angle = 1/(1+XdivZ*XdivZ);
-  sigma2Angle *= sigma2Angle*sigma2TanAngle;
+  double sigma2Angle = 1 / (1 + XdivZ * XdivZ);
+  sigma2Angle *= sigma2Angle * sigma2TanAngle;
 
   return sigma2Angle;
 }
-
-
-
-
-
-
-
-
-
diff --git a/Validation/DTRecHits/src/utils.cc b/Validation/DTRecHits/src/utils.cc
index 8e919e88336a1..6e3e8c56fed3a 100644
--- a/Validation/DTRecHits/src/utils.cc
+++ b/Validation/DTRecHits/src/utils.cc
@@ -1,24 +1,25 @@
-#include "Validation/DTRecHits/interface/utils.h"
 #include "TF1.h"
 #include "TProfile.h"
+#include "Validation/DTRecHits/interface/utils.h"
 //#include "TLine.h"
-void Tutils::drawGFit(TH1 * h1, float min, float max, float minfit, float maxfit) {
+void Tutils::drawGFit(TH1 *h1, float min, float max, float minfit, float maxfit) {
   setStyle(h1);
   static int i = 0;
   i++;
-  //h1->SetGrid(1,1);
-  //h1->SetGridColor(15);
-  h1->GetXaxis()->SetRangeUser(min,max);
-  TString  fitName = "g";
+  // h1->SetGrid(1,1);
+  // h1->SetGridColor(15);
+  h1->GetXaxis()->SetRangeUser(min, max);
+  TString fitName = "g";
   fitName += i;
-    TF1* g1 = new TF1(fitName.Data(),"gaus",minfit,maxfit);
+  TF1 *g1 = new TF1(fitName.Data(), "gaus", minfit, maxfit);
   g1->SetLineColor(2);
   g1->SetLineWidth(2);
-  h1->Fit(g1,"RQ");
+  h1->Fit(g1, "RQ");
   h1->Draw();
-//   TPaveStats *st = (TPaveStats*)h1->GetListOfFunctions()->FindObject("stats");
-//   st->SetX2NDC(0.905);
-//   st->SetY2NDC(0.905);
+  //   TPaveStats *st =
+  //   (TPaveStats*)h1->GetListOfFunctions()->FindObject("stats");
+  //   st->SetX2NDC(0.905);
+  //   st->SetY2NDC(0.905);
 }
 void Tutils::setStyle(TH1 *histo) {
   mystyle = getStyle("tdr");
@@ -46,10 +47,9 @@ void Tutils::setStyle(TH2 *histo) {
   histo->GetYaxis()->SetLabelSize(mystyle->GetLabelSize());
 }
 
-TStyle * Tutils::getStyle(const TString& name)
-{
+TStyle *Tutils::getStyle(const TString &name) {
   TStyle *theStyle;
-  if ( name == "mstyle" ) {
+  if (name == "mstyle") {
     theStyle = new TStyle("mstyle", "mstyle");
     //    theStyle->SetOptStat(0);
     theStyle->SetPadBorderMode(0);
@@ -65,15 +65,15 @@ TStyle * Tutils::getStyle(const TString& name)
     theStyle->SetTitleBorderSize(1);
     theStyle->SetPalette(1);
 
-  } else if( name == "tdr" ) {
-    theStyle = new TStyle("tdrStyle","Style for P-TDR");
+  } else if (name == "tdr") {
+    theStyle = new TStyle("tdrStyle", "Style for P-TDR");
 
     // For the canvas:
     theStyle->SetCanvasBorderMode(0);
     theStyle->SetCanvasColor(kWhite);
-    theStyle->SetCanvasDefH(600); //Height of canvas
-    theStyle->SetCanvasDefW(600); //Width of canvas
-    theStyle->SetCanvasDefX(0);   //POsition on screen
+    theStyle->SetCanvasDefH(600);  // Height of canvas
+    theStyle->SetCanvasDefW(600);  // Width of canvas
+    theStyle->SetCanvasDefX(0);    // POsition on screen
     theStyle->SetCanvasDefY(0);
 
     // For the Pad:
@@ -105,26 +105,27 @@ TStyle * Tutils::getStyle(const TString& name)
     // theStyle->SetNumberContours(Int_t number = 20);
 
     theStyle->SetEndErrorSize(2);
-//     theStyle->SetErrorMarker(20);
+    //     theStyle->SetErrorMarker(20);
     theStyle->SetErrorX(0.);
-  
+
     theStyle->SetMarkerStyle(20);
 
-    //For the fit/function:
+    // For the fit/function:
     theStyle->SetOptFit(1);
     theStyle->SetFitFormat("5.4g");
     theStyle->SetFuncColor(2);
     theStyle->SetFuncStyle(1);
     theStyle->SetFuncWidth(1);
 
-    //For the date:
+    // For the date:
     theStyle->SetOptDate(0);
     // theStyle->SetDateX(Float_t x = 0.01);
     // theStyle->SetDateY(Float_t y = 0.01);
 
     // For the statistics box:
     theStyle->SetOptFile(0);
-//     theStyle->SetOptStat(0); // To display the mean and RMS:   SetOptStat("mr");
+    //     theStyle->SetOptStat(0); // To display the mean and RMS:
+    //     SetOptStat("mr");
     theStyle->SetOptStat(10);
     theStyle->SetStatColor(kWhite);
     theStyle->SetStatFont(42);
@@ -164,8 +165,8 @@ TStyle * Tutils::getStyle(const TString& name)
     theStyle->SetTitleColor(1, "XYZ");
     theStyle->SetTitleFont(42, "XYZ");
     theStyle->SetTitleSize(0.06, "XYZ");
-    // theStyle->SetTitleXSize(Float_t size = 0.02); // Another way to set the size?
-    // theStyle->SetTitleYSize(Float_t size = 0.02);
+    // theStyle->SetTitleXSize(Float_t size = 0.02); // Another way to set the
+    // size? theStyle->SetTitleYSize(Float_t size = 0.02);
     theStyle->SetTitleXOffset(0.9);
     theStyle->SetTitleYOffset(1.25);
     // theStyle->SetTitleOffset(1.1, "Y"); // Another way to set the Offset
@@ -192,7 +193,7 @@ TStyle * Tutils::getStyle(const TString& name)
     theStyle->SetOptLogz(0);
 
     // Postscript options:
-    theStyle->SetPaperSize(20.,20.);
+    theStyle->SetPaperSize(20., 20.);
     // theStyle->SetLineScalePS(Float_t scale = 3);
     // theStyle->SetLineStyleString(Int_t i, const char* text);
     // theStyle->SetHeaderPS(const char* header);
@@ -205,9 +206,8 @@ TStyle * Tutils::getStyle(const TString& name)
     // theStyle->SetTimeOffset(Double_t toffset);
     // theStyle->SetHistMinimumZero(kTRUE);
 
-
     //   style->SetOptFit(101);
-    //   style->SetOptStat(1111111); 
+    //   style->SetOptStat(1111111);
 
   } else {
     // Avoid modifying the default style!
@@ -216,19 +216,20 @@ TStyle * Tutils::getStyle(const TString& name)
   return theStyle;
 }
 
-void Tutils::plotAndProfileX (TH2* h2, float min, float max,bool profile) {
+void Tutils::plotAndProfileX(TH2 *h2, float min, float max, bool profile) {
   setStyle(h2);
   //  gPad->SetGrid(1,1);
-  //gStyle->SetGridColor(15);
-  h2->GetYaxis()->SetRangeUser(min,max);
+  // gStyle->SetGridColor(15);
+  h2->GetYaxis()->SetRangeUser(min, max);
   h2->Draw();
   if (profile) {
-    TProfile* prof = h2->ProfileX();
+    TProfile *prof = h2->ProfileX();
     prof->SetMarkerColor(2);
     prof->SetLineColor(2);
     prof->Draw("same");
   }
-  //TLine * l = new TLine(h2->GetXaxis()->GetXmin(),0,h2->GetXaxis()->GetXmax(),0);
-  //l->SetLineColor(3);
-  //l->Draw();
+  // TLine * l = new
+  // TLine(h2->GetXaxis()->GetXmin(),0,h2->GetXaxis()->GetXmax(),0);
+  // l->SetLineColor(3);
+  // l->Draw();
 }
diff --git a/Validation/EcalClusters/interface/AnglesUtil.h b/Validation/EcalClusters/interface/AnglesUtil.h
index b3a20bc523404..09f8f21d11722 100644
--- a/Validation/EcalClusters/interface/AnglesUtil.h
+++ b/Validation/EcalClusters/interface/AnglesUtil.h
@@ -2,11 +2,11 @@
 #define INC_ANGLESUTIL
 ///////////////////////////////////////////////////////////////////////////////
 // File: AnglesUtil.hpp
-// 
+//
 // Purpose:  Provide useful functions for calculating angles and eta
 //
 // Created:   4-NOV-1998  Serban Protopopescu
-// History:   replaced old KinemUtil  
+// History:   replaced old KinemUtil
 // Modified:  23-July-2000 Add rapidity calculation
 //            14-Aug-2003 converted all functions to double precision
 ///////////////////////////////////////////////////////////////////////////////
@@ -15,12 +15,11 @@
 #include <cmath>
 #include <cstdlib>
 
-
-namespace kinem{
-  const double PI=2.0*acos(0.);
-  const double TWOPI=2.0*PI;
-  const float ETA_LIMIT=15.0;
-  const float EPSILON=1.E-10;
+namespace kinem {
+  const double PI = 2.0 * acos(0.);
+  const double TWOPI = 2.0 * PI;
+  const float ETA_LIMIT = 15.0;
+  const float EPSILON = 1.E-10;
 
   //  calculate phi from x, y
   inline double phi(double x, double y);
@@ -62,165 +61,126 @@ namespace kinem{
   inline void uvectors(float u[3], float xyz1[3], float xyz2[3]);
 
   inline double tanl_from_theta(double theta);
-  inline double theta_from_tanl(double tanl); 
-}
+  inline double theta_from_tanl(double tanl);
+}  // namespace kinem
 
-inline
-double kinem::phi(double x, double y)
-{
-  double PHI=atan2(y, x);
-  return (PHI>=0)? PHI : kinem::TWOPI+PHI;
+inline double kinem::phi(double x, double y) {
+  double PHI = atan2(y, x);
+  return (PHI >= 0) ? PHI : kinem::TWOPI + PHI;
 }
 
-inline 
-double kinem::phi(float xy1[2], float xy2[2]){
-    double dxy1[2]={xy1[0],xy1[1]};
-    double dxy2[2]={xy2[0],xy2[1]};
-    return phi(dxy1,dxy2);
-  }
+inline double kinem::phi(float xy1[2], float xy2[2]) {
+  double dxy1[2] = {xy1[0], xy1[1]};
+  double dxy2[2] = {xy2[0], xy2[1]};
+  return phi(dxy1, dxy2);
+}
 
-inline
-double kinem::phi(double xy1[2], double xy2[2])
-{
-  double x=xy2[0]-xy1[0];
-  double y=xy2[1]-xy1[1];
+inline double kinem::phi(double xy1[2], double xy2[2]) {
+  double x = xy2[0] - xy1[0];
+  double y = xy2[1] - xy1[1];
   return phi(x, y);
 }
 
-inline
-double kinem::delta_phi(double phi1, double phi2)
-{
-  double PHI=fabs(phi1-phi2);
-  return (PHI<=PI)? PHI : kinem::TWOPI-PHI;
+inline double kinem::delta_phi(double phi1, double phi2) {
+  double PHI = fabs(phi1 - phi2);
+  return (PHI <= PI) ? PHI : kinem::TWOPI - PHI;
 }
 
-inline
-double kinem::delta_eta(double eta1, double eta2)
-{
-  return eta1 - eta2;
-}
+inline double kinem::delta_eta(double eta1, double eta2) { return eta1 - eta2; }
 
-inline
-double kinem::signed_delta_phi(double phi1, double phi2)
-{
-  double phia=phi1;
-  if(phi1>PI) phia=phi1-kinem::TWOPI;
-  double phib=phi2;
-  if(phi2>PI) phib=phi2-kinem::TWOPI;
-  double dphi=phia-phib;
-  if(dphi>PI) dphi-=kinem::TWOPI;
-  if(dphi<-PI) dphi+=kinem::TWOPI;
+inline double kinem::signed_delta_phi(double phi1, double phi2) {
+  double phia = phi1;
+  if (phi1 > PI)
+    phia = phi1 - kinem::TWOPI;
+  double phib = phi2;
+  if (phi2 > PI)
+    phib = phi2 - kinem::TWOPI;
+  double dphi = phia - phib;
+  if (dphi > PI)
+    dphi -= kinem::TWOPI;
+  if (dphi < -PI)
+    dphi += kinem::TWOPI;
   return dphi;
 }
 
-inline double kinem::delta_R(double eta1, double phi1, double eta2, double phi2)
-{
-   double deta = eta1-eta2;
-   double dphi = kinem::delta_phi(phi1,phi2);
-   return sqrt(deta*deta + dphi*dphi);
+inline double kinem::delta_R(double eta1, double phi1, double eta2, double phi2) {
+  double deta = eta1 - eta2;
+  double dphi = kinem::delta_phi(phi1, phi2);
+  return sqrt(deta * deta + dphi * dphi);
 }
 
-inline
-double kinem::theta(double xyz1[3], double xyz2[3])
-{
-  double x=xyz2[0]-xyz1[0];
-  double y=xyz2[1]-xyz1[1];
-  double z=xyz2[2]-xyz1[2];
+inline double kinem::theta(double xyz1[3], double xyz2[3]) {
+  double x = xyz2[0] - xyz1[0];
+  double y = xyz2[1] - xyz1[1];
+  double z = xyz2[2] - xyz1[2];
   return theta(x, y, z);
 }
 
-inline 
-double kinem::theta(float xyz1[3], float xyz2[3]){
-    double dxyz1[3]={xyz1[0],xyz1[1],xyz1[2]};
-    double dxyz2[3]={xyz2[0],xyz2[1],xyz2[2]};
-    return theta(dxyz1,dxyz2);
+inline double kinem::theta(float xyz1[3], float xyz2[3]) {
+  double dxyz1[3] = {xyz1[0], xyz1[1], xyz1[2]};
+  double dxyz2[3] = {xyz2[0], xyz2[1], xyz2[2]};
+  return theta(dxyz1, dxyz2);
 }
 
-inline 
-double kinem::theta(double x, double y, double z)
-{
-  return atan2(sqrt(x*x + y*y), z);
-}
+inline double kinem::theta(double x, double y, double z) { return atan2(sqrt(x * x + y * y), z); }
 
-inline 
-double kinem::theta(double etap)
-{
-  return 2.0*atan(exp(-etap));
-}
+inline double kinem::theta(double etap) { return 2.0 * atan(exp(-etap)); }
 
-inline
-double kinem::eta(double xyz1[3], double xyz2[3])
-{
-  double x=xyz2[0]-xyz1[0];
-  double y=xyz2[1]-xyz1[1];
-  double z=xyz2[2]-xyz1[2];
+inline double kinem::eta(double xyz1[3], double xyz2[3]) {
+  double x = xyz2[0] - xyz1[0];
+  double y = xyz2[1] - xyz1[1];
+  double z = xyz2[2] - xyz1[2];
   return eta(x, y, z);
 }
 
-inline
-double kinem::eta(float xyz1[3], float xyz2[3]){
-    double dxyz1[3]={xyz1[0],xyz1[1],xyz1[2]};
-    double dxyz2[3]={xyz2[0],xyz2[1],xyz2[2]};
-    return eta(dxyz1,dxyz2);
+inline double kinem::eta(float xyz1[3], float xyz2[3]) {
+  double dxyz1[3] = {xyz1[0], xyz1[1], xyz1[2]};
+  double dxyz2[3] = {xyz2[0], xyz2[1], xyz2[2]};
+  return eta(dxyz1, dxyz2);
 }
 
-inline
-double kinem::eta(double x, double y, double z)
-{
-  return 0.5*log((sqrt(x*x + y*y + z*z) + z + EPSILON) / 
-                 (sqrt(x*x + y*y + z*z) - z + EPSILON));
+inline double kinem::eta(double x, double y, double z) {
+  return 0.5 * log((sqrt(x * x + y * y + z * z) + z + EPSILON) / (sqrt(x * x + y * y + z * z) - z + EPSILON));
 }
 
-inline
-double kinem::eta(double th)
-{
-  if(th == 0) return ETA_LIMIT;
-  if(th >= PI-0.0001) return -ETA_LIMIT;
-  return -log(tan(th/2.0));
+inline double kinem::eta(double th) {
+  if (th == 0)
+    return ETA_LIMIT;
+  if (th >= PI - 0.0001)
+    return -ETA_LIMIT;
+  return -log(tan(th / 2.0));
 }
 
-inline 
-double kinem::y(double E, double pz)
-{
-  return 0.5 * log ((E+pz+EPSILON)/(E-pz+EPSILON));
-}
+inline double kinem::y(double E, double pz) { return 0.5 * log((E + pz + EPSILON) / (E - pz + EPSILON)); }
 
-inline
-void kinem::uvectors(double u[3], double xyz1[3], double xyz2[3]){
-  double xdiff=xyz2[0]-xyz1[0];
-  double ydiff=xyz2[1]-xyz1[1];
-  double zdiff=xyz2[2]-xyz1[2];
-  double s=sqrt(xdiff*xdiff+ydiff*ydiff+zdiff*zdiff);
-  if(s > 0) {
-    u[0]=xdiff/s;
-    u[1]=ydiff/s;
-    u[2]=zdiff/s;
-  }else{
-    u[0]=0;
-    u[1]=0;
-    u[2]=0;
+inline void kinem::uvectors(double u[3], double xyz1[3], double xyz2[3]) {
+  double xdiff = xyz2[0] - xyz1[0];
+  double ydiff = xyz2[1] - xyz1[1];
+  double zdiff = xyz2[2] - xyz1[2];
+  double s = sqrt(xdiff * xdiff + ydiff * ydiff + zdiff * zdiff);
+  if (s > 0) {
+    u[0] = xdiff / s;
+    u[1] = ydiff / s;
+    u[2] = zdiff / s;
+  } else {
+    u[0] = 0;
+    u[1] = 0;
+    u[2] = 0;
   }
 }
 
-inline 
-void kinem::uvectors(float u[3], float xyz1[3], float xyz2[3]){
-    double du[3];
-    double dxyz1[3]={xyz1[0],xyz1[1],xyz1[2]};
-    double dxyz2[3]={xyz2[0],xyz2[1],xyz2[2]};
-    uvectors(du,dxyz1,dxyz2);
-    u[0]=du[0];
-    u[1]=du[1];
-    u[2]=du[2];
+inline void kinem::uvectors(float u[3], float xyz1[3], float xyz2[3]) {
+  double du[3];
+  double dxyz1[3] = {xyz1[0], xyz1[1], xyz1[2]};
+  double dxyz2[3] = {xyz2[0], xyz2[1], xyz2[2]};
+  uvectors(du, dxyz1, dxyz2);
+  u[0] = du[0];
+  u[1] = du[1];
+  u[2] = du[2];
 }
 
-inline
-double kinem::tanl_from_theta(double theta){
-  return tan(PI/2.0 - theta);
-}
+inline double kinem::tanl_from_theta(double theta) { return tan(PI / 2.0 - theta); }
 
-inline
-double kinem::theta_from_tanl(double tanl){
-  return PI/2.0 - atan(tanl);
-}
+inline double kinem::theta_from_tanl(double tanl) { return PI / 2.0 - atan(tanl); }
 
-#endif // INC_ANGLESUTIL
+#endif  // INC_ANGLESUTIL
diff --git a/Validation/EcalClusters/interface/ContainmentCorrectionAnalyzer.h b/Validation/EcalClusters/interface/ContainmentCorrectionAnalyzer.h
index ef28114534c85..9e15664c782df 100644
--- a/Validation/EcalClusters/interface/ContainmentCorrectionAnalyzer.h
+++ b/Validation/EcalClusters/interface/ContainmentCorrectionAnalyzer.h
@@ -5,60 +5,60 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Utilities/interface/Exception.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "FWCore/Utilities/interface/Exception.h"
 //
-#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticleFwd.h"
-#include "SimDataFormats/TrackingAnalysis/interface/TrackingVertexContainer.h"
-#include "SimDataFormats/Track/interface/SimTrackContainer.h"
-#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 #include "DataFormats/EgammaReco/interface/BasicCluster.h"
 #include "DataFormats/EgammaReco/interface/SuperCluster.h"
 #include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
-#include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h"
 #include "Geometry/CaloEventSetup/interface/CaloTopologyRecord.h"
+#include "RecoEcal/EgammaCoreTools/interface/EcalClusterTools.h"
+#include "SimDataFormats/Track/interface/SimTrackContainer.h"
+#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticleFwd.h"
+#include "SimDataFormats/TrackingAnalysis/interface/TrackingVertexContainer.h"
+#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 //
+#include "CommonTools/UtilAlgos/interface/TFileService.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
-#include "CommonTools/UtilAlgos/interface/TFileService.h"
 //
 #include "Validation/EcalClusters/interface/EcalSimPhotonMCTruth.h"
 //
-#include <algorithm>
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
-#include <vector>
-#include <map>
-#include <iostream>
-#include <string>
-#include "TFile.h"
 #include "TF1.h"
+#include "TFile.h"
 #include "TH1.h"
+#include <algorithm>
+#include <iostream>
+#include <map>
+#include <string>
+#include <vector>
 class TFile;
 
 class EcalSimPhotonMCTruth;
 
 class ContainmentCorrectionAnalyzer : public edm::EDAnalyzer {
- public:
-  explicit ContainmentCorrectionAnalyzer( const edm::ParameterSet& );
+public:
+  explicit ContainmentCorrectionAnalyzer(const edm::ParameterSet &);
   ~ContainmentCorrectionAnalyzer() override;
-    
-  void analyze( const edm::Event&, const edm::EventSetup& ) override;
+
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
   void beginJob() override;
   void endJob() override;
 
- private:
-  
-  float ecalEta(float EtaParticle , float Zvertex, float plane_Radius);
-  std::vector<EcalSimPhotonMCTruth> findMcTruth(std::vector<SimTrack>& theSimTracks, std::vector<SimVertex>& theSimVertices);
-  void fillMcTruth(std::vector<SimTrack>& theSimTracks, std::vector<SimVertex>& theSimVertices);  
+private:
+  float ecalEta(float EtaParticle, float Zvertex, float plane_Radius);
+  std::vector<EcalSimPhotonMCTruth> findMcTruth(std::vector<SimTrack> &theSimTracks,
+                                                std::vector<SimVertex> &theSimVertices);
+  void fillMcTruth(std::vector<SimTrack> &theSimTracks, std::vector<SimVertex> &theSimVertices);
 
   edm::EDGetTokenT<edm::SimTrackContainer> SimTrackCollection_;
   edm::EDGetTokenT<edm::SimVertexContainer> SimVertexCollection_;
@@ -66,30 +66,28 @@ class ContainmentCorrectionAnalyzer : public edm::EDAnalyzer {
   edm::EDGetTokenT<reco::SuperClusterCollection> EndcapSuperClusterCollection_;
   edm::EDGetTokenT<EcalRecHitCollection> reducedBarrelRecHitCollection_;
   edm::EDGetTokenT<EcalRecHitCollection> reducedEndcapRecHitCollection_;
-  
+
   int nMCphotons;
   std::vector<float> mcEnergy, mcEta, mcPhi, mcPt;
   std::vector<int> isConverted;
-  std::vector<float> x_vtx,y_vtx,z_vtx;
+  std::vector<float> x_vtx, y_vtx, z_vtx;
   int nRECOphotons;
   std::vector<float> superClusterEnergy, superClusterEta, superClusterPhi, superClusterEt;
-  std::vector<float> e1,e9,e25;
+  std::vector<float> e1, e9, e25;
   std::vector<int> seedXtal;
   std::vector<int> iMC;
 
   std::map<unsigned, unsigned> geantToIndex_;
-  
-  TH1F* h_EB_eRecoEtrueReference;
-  TH1F* h_EB_e9EtrueReference;
-  TH1F* h_EB_e25EtrueReference;
-  TH1F* h_EE_eRecoEtrueReference;
-  TH1F* h_EE_e9EtrueReference;
-  TH1F* h_EE_e25EtrueReference;
+
+  TH1F *h_EB_eRecoEtrueReference;
+  TH1F *h_EB_e9EtrueReference;
+  TH1F *h_EB_e25EtrueReference;
+  TH1F *h_EE_eRecoEtrueReference;
+  TH1F *h_EE_e9EtrueReference;
+  TH1F *h_EE_e25EtrueReference;
   TH1F *h_EB_eTrue;
   TH1F *h_EE_eTrue;
   TH1F *h_EB_converted;
-  TH1F *h_EE_converted; 
-
+  TH1F *h_EE_converted;
 };
 #endif
-
diff --git a/Validation/EcalClusters/interface/EcalSimPhotonMCTruth.h b/Validation/EcalClusters/interface/EcalSimPhotonMCTruth.h
index 75535618fece9..2e130f06f6bb4 100644
--- a/Validation/EcalClusters/interface/EcalSimPhotonMCTruth.h
+++ b/Validation/EcalClusters/interface/EcalSimPhotonMCTruth.h
@@ -6,7 +6,7 @@
 #include <vector>
 
 /** \class EcalSimPhotonMCTruth
- *       
+ *
  *  This class stores all the MC truth information needed about the
  *  conversion for containment correction
  *  original code: PhotonMCTruth (N.Marinelli)
@@ -14,25 +14,29 @@
  */
 
 class EcalSimPhotonMCTruth {
- public:
-  EcalSimPhotonMCTruth() : isAConversion_(0),thePhoton_(0.,0.,0.,0.), theR_(0.), theZ_(0.), 
-    theConvVertex_(0.,0.,0.,0.) {};
-  
-  EcalSimPhotonMCTruth(const math::XYZTLorentzVectorD& v) : thePhoton_(v) {};
-  
-  EcalSimPhotonMCTruth(int isAConversion,const math::XYZTLorentzVectorD& v, float rconv, float zconv,
-		       const math::XYZTLorentzVectorD& convVertex, const math::XYZTLorentzVectorD& pV, const std::vector<const SimTrack *>& tracks );
-  
-  math::XYZTLorentzVectorD primaryVertex() const {return thePrimaryVertex_;}
-  int isAConversion() const { return isAConversion_;}
-  float radius() const {return theR_;}
-  float z() const {return theZ_;}
-  math::XYZTLorentzVectorD fourMomentum() const {return thePhoton_;}
-  math::XYZTLorentzVectorD vertex() const {return theConvVertex_;}
-  std::vector<const SimTrack *> simTracks() const {return tracks_;} 
-  
- private:
-  
+public:
+  EcalSimPhotonMCTruth()
+      : isAConversion_(0), thePhoton_(0., 0., 0., 0.), theR_(0.), theZ_(0.), theConvVertex_(0., 0., 0., 0.){};
+
+  EcalSimPhotonMCTruth(const math::XYZTLorentzVectorD &v) : thePhoton_(v){};
+
+  EcalSimPhotonMCTruth(int isAConversion,
+                       const math::XYZTLorentzVectorD &v,
+                       float rconv,
+                       float zconv,
+                       const math::XYZTLorentzVectorD &convVertex,
+                       const math::XYZTLorentzVectorD &pV,
+                       const std::vector<const SimTrack *> &tracks);
+
+  math::XYZTLorentzVectorD primaryVertex() const { return thePrimaryVertex_; }
+  int isAConversion() const { return isAConversion_; }
+  float radius() const { return theR_; }
+  float z() const { return theZ_; }
+  math::XYZTLorentzVectorD fourMomentum() const { return thePhoton_; }
+  math::XYZTLorentzVectorD vertex() const { return theConvVertex_; }
+  std::vector<const SimTrack *> simTracks() const { return tracks_; }
+
+private:
   int isAConversion_;
   math::XYZTLorentzVectorD thePhoton_;
   float theR_;
@@ -40,8 +44,6 @@ class EcalSimPhotonMCTruth {
   math::XYZTLorentzVectorD theConvVertex_;
   math::XYZTLorentzVectorD thePrimaryVertex_;
   std::vector<const SimTrack *> tracks_;
-
 };
 
 #endif
-
diff --git a/Validation/EcalClusters/interface/EgammaBasicClusters.h b/Validation/EcalClusters/interface/EgammaBasicClusters.h
index eb27091c759d4..629cf2852fca2 100644
--- a/Validation/EcalClusters/interface/EgammaBasicClusters.h
+++ b/Validation/EcalClusters/interface/EgammaBasicClusters.h
@@ -21,19 +21,18 @@
 
 class MonitorElement;
 
-class EgammaBasicClusters : public DQMEDAnalyzer
-{
- public:
-  explicit EgammaBasicClusters( const edm::ParameterSet& );
+class EgammaBasicClusters : public DQMEDAnalyzer {
+public:
+  explicit EgammaBasicClusters(const edm::ParameterSet &);
   ~EgammaBasicClusters() override;
 
-  void analyze( const edm::Event&, const edm::EventSetup& ) override;
-  void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
- private:
+private:
   edm::EDGetTokenT<reco::BasicClusterCollection> barrelBasicClusterCollection_;
   edm::EDGetTokenT<reco::BasicClusterCollection> endcapBasicClusterCollection_;
- 
+
   HistSpec hsSize_;
   HistSpec hsNumRecHits_;
   HistSpec hsET_;
@@ -41,21 +40,21 @@ class EgammaBasicClusters : public DQMEDAnalyzer
   HistSpec hsPhi_;
   HistSpec hsR_;
 
-  MonitorElement* hist_EB_BC_Size_;
-  MonitorElement* hist_EE_BC_Size_;
-  MonitorElement* hist_EB_BC_NumRecHits_;
-  MonitorElement* hist_EE_BC_NumRecHits_;
-  MonitorElement* hist_EB_BC_ET_;
-  MonitorElement* hist_EE_BC_ET_;
-  MonitorElement* hist_EB_BC_Eta_;
-  MonitorElement* hist_EE_BC_Eta_;
-  MonitorElement* hist_EB_BC_Phi_;
-  MonitorElement* hist_EE_BC_Phi_;
-  MonitorElement* hist_EB_BC_ET_vs_Eta_;
-  MonitorElement* hist_EB_BC_ET_vs_Phi_;
-  MonitorElement* hist_EE_BC_ET_vs_Eta_;
-  MonitorElement* hist_EE_BC_ET_vs_Phi_;
-  MonitorElement* hist_EE_BC_ET_vs_R_;
+  MonitorElement *hist_EB_BC_Size_;
+  MonitorElement *hist_EE_BC_Size_;
+  MonitorElement *hist_EB_BC_NumRecHits_;
+  MonitorElement *hist_EE_BC_NumRecHits_;
+  MonitorElement *hist_EB_BC_ET_;
+  MonitorElement *hist_EE_BC_ET_;
+  MonitorElement *hist_EB_BC_Eta_;
+  MonitorElement *hist_EE_BC_Eta_;
+  MonitorElement *hist_EB_BC_Phi_;
+  MonitorElement *hist_EE_BC_Phi_;
+  MonitorElement *hist_EB_BC_ET_vs_Eta_;
+  MonitorElement *hist_EB_BC_ET_vs_Phi_;
+  MonitorElement *hist_EE_BC_ET_vs_Eta_;
+  MonitorElement *hist_EE_BC_ET_vs_Phi_;
+  MonitorElement *hist_EE_BC_ET_vs_R_;
 };
 
 #endif
diff --git a/Validation/EcalClusters/interface/EgammaSuperClusters.h b/Validation/EcalClusters/interface/EgammaSuperClusters.h
index 6295aa41079ec..da4a4fdd28bba 100644
--- a/Validation/EcalClusters/interface/EgammaSuperClusters.h
+++ b/Validation/EcalClusters/interface/EgammaSuperClusters.h
@@ -13,9 +13,9 @@
 
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
-#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
-#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
+#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
+#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 
 #include "HistSpec.h"
 
@@ -23,28 +23,27 @@
 
 class MonitorElement;
 
-class EgammaSuperClusters : public DQMEDAnalyzer
-{
- public:
-  explicit EgammaSuperClusters( const edm::ParameterSet& );
+class EgammaSuperClusters : public DQMEDAnalyzer {
+public:
+  explicit EgammaSuperClusters(const edm::ParameterSet &);
   ~EgammaSuperClusters() override;
-  
-  void analyze( const edm::Event&, const edm::EventSetup& ) override;
-  void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
-  
- private:
+
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+
+private:
   // mc truth
   edm::EDGetTokenT<edm::HepMCProduct> MCTruthCollectionToken_;
-  
+
   // barrel clusters
   edm::EDGetTokenT<reco::SuperClusterCollection> barrelRawSuperClusterCollectionToken_;
   edm::EDGetTokenT<reco::SuperClusterCollection> barrelCorSuperClusterCollectionToken_;
-  
+
   // endcap clusters
   edm::EDGetTokenT<reco::SuperClusterCollection> endcapRawSuperClusterCollectionToken_;
   edm::EDGetTokenT<reco::SuperClusterCollection> endcapPreSuperClusterCollectionToken_;
   edm::EDGetTokenT<reco::SuperClusterCollection> endcapCorSuperClusterCollectionToken_;
-  
+
   // collections of hits
   edm::EDGetTokenT<EcalRecHitCollection> barrelRecHitCollectionToken_;
   edm::EDGetTokenT<EcalRecHitCollection> endcapRecHitCollectionToken_;
@@ -63,68 +62,66 @@ class EgammaSuperClusters : public DQMEDAnalyzer
   HistSpec hspreshowerE_;
   HistSpec hsR_;
 
-  MonitorElement* hist_EB_RawSC_Size_;
-  MonitorElement* hist_EE_RawSC_Size_;
-  MonitorElement* hist_EB_CorSC_Size_;
-  MonitorElement* hist_EE_CorSC_Size_;
-  MonitorElement* hist_EE_PreSC_Size_;
-  MonitorElement* hist_EB_RawSC_NumBC_;
-  MonitorElement* hist_EE_RawSC_NumBC_;
-  MonitorElement* hist_EB_CorSC_NumBC_;
-  MonitorElement* hist_EE_CorSC_NumBC_;
-  MonitorElement* hist_EE_PreSC_NumBC_;
-  MonitorElement* hist_EB_RawSC_ET_;
-  MonitorElement* hist_EE_RawSC_ET_;
-  MonitorElement* hist_EB_CorSC_ET_;
-  MonitorElement* hist_EE_CorSC_ET_;
-  MonitorElement* hist_EE_PreSC_ET_;
-  MonitorElement* hist_EB_RawSC_Eta_;
-  MonitorElement* hist_EE_RawSC_Eta_;
-  MonitorElement* hist_EB_CorSC_Eta_;
-  MonitorElement* hist_EE_CorSC_Eta_;
-  MonitorElement* hist_EE_PreSC_Eta_;
-  MonitorElement* hist_EB_RawSC_Phi_;
-  MonitorElement* hist_EE_RawSC_Phi_;
-  MonitorElement* hist_EB_CorSC_Phi_;
-  MonitorElement* hist_EE_CorSC_Phi_;
-  MonitorElement* hist_EE_PreSC_Phi_;
-  MonitorElement* hist_EB_RawSC_S1toS9_;
-  MonitorElement* hist_EE_RawSC_S1toS9_;
-  MonitorElement* hist_EB_CorSC_S1toS9_;
-  MonitorElement* hist_EE_CorSC_S1toS9_;
-  MonitorElement* hist_EE_PreSC_S1toS9_;
-  MonitorElement* hist_EB_RawSC_S25toE_;
-  MonitorElement* hist_EE_RawSC_S25toE_;
-  MonitorElement* hist_EB_CorSC_S25toE_;
-  MonitorElement* hist_EE_CorSC_S25toE_;
-  MonitorElement* hist_EE_PreSC_S25toE_;
-  MonitorElement* hist_EB_RawSC_EoverTruth_;
-  MonitorElement* hist_EE_RawSC_EoverTruth_;
-  MonitorElement* hist_EB_CorSC_EoverTruth_;
-  MonitorElement* hist_EE_CorSC_EoverTruth_;
-  MonitorElement* hist_EE_PreSC_EoverTruth_;
-  MonitorElement* hist_EB_RawSC_deltaR_;
-  MonitorElement* hist_EE_RawSC_deltaR_;
-  MonitorElement* hist_EB_CorSC_deltaR_;
-  MonitorElement* hist_EE_CorSC_deltaR_;
-  MonitorElement* hist_EE_PreSC_deltaR_;
-  MonitorElement* hist_EE_PreSC_preshowerE_;
-  MonitorElement* hist_EE_CorSC_preshowerE_;
-  MonitorElement* hist_EE_CorSC_phiWidth_;
-  MonitorElement* hist_EB_CorSC_phiWidth_;
-  MonitorElement* hist_EE_CorSC_etaWidth_;
-  MonitorElement* hist_EB_CorSC_etaWidth_;
-  MonitorElement* hist_EB_CorSC_ET_vs_Eta_;
-  MonitorElement* hist_EB_CorSC_ET_vs_Phi_;
-  MonitorElement* hist_EE_CorSC_ET_vs_Eta_;
-  MonitorElement* hist_EE_CorSC_ET_vs_Phi_;
-  MonitorElement* hist_EE_CorSC_ET_vs_R_;
-
-  void closestMCParticle(HepMC::GenEvent const*, reco::SuperCluster const&,
-                         double&, double&) const;
+  MonitorElement *hist_EB_RawSC_Size_;
+  MonitorElement *hist_EE_RawSC_Size_;
+  MonitorElement *hist_EB_CorSC_Size_;
+  MonitorElement *hist_EE_CorSC_Size_;
+  MonitorElement *hist_EE_PreSC_Size_;
+  MonitorElement *hist_EB_RawSC_NumBC_;
+  MonitorElement *hist_EE_RawSC_NumBC_;
+  MonitorElement *hist_EB_CorSC_NumBC_;
+  MonitorElement *hist_EE_CorSC_NumBC_;
+  MonitorElement *hist_EE_PreSC_NumBC_;
+  MonitorElement *hist_EB_RawSC_ET_;
+  MonitorElement *hist_EE_RawSC_ET_;
+  MonitorElement *hist_EB_CorSC_ET_;
+  MonitorElement *hist_EE_CorSC_ET_;
+  MonitorElement *hist_EE_PreSC_ET_;
+  MonitorElement *hist_EB_RawSC_Eta_;
+  MonitorElement *hist_EE_RawSC_Eta_;
+  MonitorElement *hist_EB_CorSC_Eta_;
+  MonitorElement *hist_EE_CorSC_Eta_;
+  MonitorElement *hist_EE_PreSC_Eta_;
+  MonitorElement *hist_EB_RawSC_Phi_;
+  MonitorElement *hist_EE_RawSC_Phi_;
+  MonitorElement *hist_EB_CorSC_Phi_;
+  MonitorElement *hist_EE_CorSC_Phi_;
+  MonitorElement *hist_EE_PreSC_Phi_;
+  MonitorElement *hist_EB_RawSC_S1toS9_;
+  MonitorElement *hist_EE_RawSC_S1toS9_;
+  MonitorElement *hist_EB_CorSC_S1toS9_;
+  MonitorElement *hist_EE_CorSC_S1toS9_;
+  MonitorElement *hist_EE_PreSC_S1toS9_;
+  MonitorElement *hist_EB_RawSC_S25toE_;
+  MonitorElement *hist_EE_RawSC_S25toE_;
+  MonitorElement *hist_EB_CorSC_S25toE_;
+  MonitorElement *hist_EE_CorSC_S25toE_;
+  MonitorElement *hist_EE_PreSC_S25toE_;
+  MonitorElement *hist_EB_RawSC_EoverTruth_;
+  MonitorElement *hist_EE_RawSC_EoverTruth_;
+  MonitorElement *hist_EB_CorSC_EoverTruth_;
+  MonitorElement *hist_EE_CorSC_EoverTruth_;
+  MonitorElement *hist_EE_PreSC_EoverTruth_;
+  MonitorElement *hist_EB_RawSC_deltaR_;
+  MonitorElement *hist_EE_RawSC_deltaR_;
+  MonitorElement *hist_EB_CorSC_deltaR_;
+  MonitorElement *hist_EE_CorSC_deltaR_;
+  MonitorElement *hist_EE_PreSC_deltaR_;
+  MonitorElement *hist_EE_PreSC_preshowerE_;
+  MonitorElement *hist_EE_CorSC_preshowerE_;
+  MonitorElement *hist_EE_CorSC_phiWidth_;
+  MonitorElement *hist_EB_CorSC_phiWidth_;
+  MonitorElement *hist_EE_CorSC_etaWidth_;
+  MonitorElement *hist_EB_CorSC_etaWidth_;
+  MonitorElement *hist_EB_CorSC_ET_vs_Eta_;
+  MonitorElement *hist_EB_CorSC_ET_vs_Phi_;
+  MonitorElement *hist_EE_CorSC_ET_vs_Eta_;
+  MonitorElement *hist_EE_CorSC_ET_vs_Phi_;
+  MonitorElement *hist_EE_CorSC_ET_vs_R_;
+
+  void closestMCParticle(HepMC::GenEvent const *, reco::SuperCluster const &, double &, double &) const;
 
   float ecalEta(float, float, float) const;
 };
 
 #endif
-
diff --git a/Validation/EcalClusters/interface/EnergyScaleAnalyzer.h b/Validation/EcalClusters/interface/EnergyScaleAnalyzer.h
index b519595f04302..984d0b8c4e286 100644
--- a/Validation/EcalClusters/interface/EnergyScaleAnalyzer.h
+++ b/Validation/EcalClusters/interface/EnergyScaleAnalyzer.h
@@ -2,7 +2,8 @@
 #define RecoEcal_EgammaClusterProducers_EnergyScaleAnalyzer_h
 /**\class EnergyScaleAnalyzerx
 
- Description: Analyzer to fetch collection of objects from event and make simple plots
+ Description: Analyzer to fetch collection of objects from event and make simple
+ plots
 
  Implementation:
      \\\author: Keti Kaadze, June 2007
@@ -10,35 +11,34 @@
 //
 //
 
-
 // system include files
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "DataFormats/EgammaReco/interface/BasicCluster.h"
-#include "DataFormats/EgammaReco/interface/SuperCluster.h"
-#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
+#include "DataFormats/EcalDetId/interface/EBDetId.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHit.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
-#include "DataFormats/EcalDetId/interface/EBDetId.h"
+#include "DataFormats/EgammaReco/interface/BasicCluster.h"
 #include "DataFormats/EgammaReco/interface/BasicClusterFwd.h"
 #include "DataFormats/EgammaReco/interface/PreshowerCluster.h"
+#include "DataFormats/EgammaReco/interface/SuperCluster.h"
+#include "DataFormats/EgammaReco/interface/SuperClusterFwd.h"
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 
-#include <string>
 #include "TH1.h"
 #include "TH2.h"
-#include "TTree.h"
 #include "TNtuple.h"
+#include "TTree.h"
+#include <string>
 class TFile;
 
 //
@@ -46,113 +46,115 @@ class TFile;
 //
 
 class EnergyScaleAnalyzer : public edm::EDAnalyzer {
-   public:
-      explicit EnergyScaleAnalyzer( const edm::ParameterSet& );
-      ~EnergyScaleAnalyzer() override;
-
-
-      void analyze( const edm::Event&, const edm::EventSetup& ) override;
-      void beginJob() override;
-      void endJob() override;
-
-      
- private:
-      
-      std::string outputFile_; // output file
-  
-      edm::EDGetTokenT<edm::HepMCProduct> hepMCLabel_;
-      edm::EDGetTokenT<reco::SuperClusterCollection> hybridSuperClusters_token;
-      edm::EDGetTokenT<reco::SuperClusterCollection> dynamicHybridSuperClusters_token;
-      edm::EDGetTokenT<reco::SuperClusterCollection> correctedHybridSuperClusters_token;
-      edm::EDGetTokenT<reco::SuperClusterCollection> correctedDynamicHybridSuperClusters_token;
-      edm::EDGetTokenT<reco::SuperClusterCollection> correctedFixedMatrixSuperClustersWithPreshower_token;
-      edm::EDGetTokenT<reco::SuperClusterCollection> fixedMatrixSuperClustersWithPreshower_token;
-
-       // root file to store histograms
-      TFile*  rootFile_;
-
-      //Tree
-      TTree* mytree_;
-      struct tree_structure_ {
-	// MC information
-	int   mc_npar;
-	int   parID;
-	float mc_sep;
-	float mc_e;
-	float mc_et;
-	float mc_phi;
-	float mc_eta;
-	float mc_theta;
-
-	// MC-EM matching info
-	float em_dR;
-	
-	// EM SC info (uncorrected)
-	int   em_isInCrack;
-	int   em_scType;
-	float em_e;
-	float em_et;
-	float em_phi;
-	float em_eta;
-	float em_theta;
-	int   em_nCell;
-	int   em_nBC;
-	
-	// physics variables
-	float em_pet;
-	float em_pe;
-	float em_peta;
-	float em_ptheta;
-
-	// corrected collectin
-	float emCorr_e;
-	float emCorr_et;
-	float emCorr_eta;
-	float emCorr_phi;
-	float emCorr_theta;
-	float emCorr_pet;
-	float emCorr_peta;
-	float emCorr_ptheta;
-
-	// EM widths, pw -- phiWidth, ew -- etaWidth
-	float em_pw;
-	float em_ew;
-	// ratios of widths pw/ew
-	float em_br;
-      };
-      tree_structure_ tree_;
-
-      //
-      float xVtx_;
-      float yVtx_;
-      float zVtx_;
-      //
-      float xClust_zero_;
-      float yClust_zero_;
-      float zClust_zero_;
-      //
-      float xClust_vtx_;
-      float yClust_vtx_;
-      float zClust_vtx_;
-      //
-      float rClust_vtx_;
-      //
-      float energyMax_;
-      float eTMax_;
-      float eTMaxVtx_;
-      float etaMax_;
-      float etaMaxVtx_;
-      float phiMax_;
-      float phiMaxVtx_;
-      float thetaMax_;
-      float thetaMaxVtx_;
-      //
-
-      int evtN;
-
-      //Function
-      void fillTree ( const reco::SuperClusterCollection* scColl, const reco::SuperClusterCollection* corrSCColl,
-		      HepMC::GenParticle* mc,  tree_structure_& tree_, float xV, float yV, float zV, int scType);
+public:
+  explicit EnergyScaleAnalyzer(const edm::ParameterSet &);
+  ~EnergyScaleAnalyzer() override;
+
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void beginJob() override;
+  void endJob() override;
+
+private:
+  std::string outputFile_;  // output file
+
+  edm::EDGetTokenT<edm::HepMCProduct> hepMCLabel_;
+  edm::EDGetTokenT<reco::SuperClusterCollection> hybridSuperClusters_token;
+  edm::EDGetTokenT<reco::SuperClusterCollection> dynamicHybridSuperClusters_token;
+  edm::EDGetTokenT<reco::SuperClusterCollection> correctedHybridSuperClusters_token;
+  edm::EDGetTokenT<reco::SuperClusterCollection> correctedDynamicHybridSuperClusters_token;
+  edm::EDGetTokenT<reco::SuperClusterCollection> correctedFixedMatrixSuperClustersWithPreshower_token;
+  edm::EDGetTokenT<reco::SuperClusterCollection> fixedMatrixSuperClustersWithPreshower_token;
+
+  // root file to store histograms
+  TFile *rootFile_;
+
+  // Tree
+  TTree *mytree_;
+  struct tree_structure_ {
+    // MC information
+    int mc_npar;
+    int parID;
+    float mc_sep;
+    float mc_e;
+    float mc_et;
+    float mc_phi;
+    float mc_eta;
+    float mc_theta;
+
+    // MC-EM matching info
+    float em_dR;
+
+    // EM SC info (uncorrected)
+    int em_isInCrack;
+    int em_scType;
+    float em_e;
+    float em_et;
+    float em_phi;
+    float em_eta;
+    float em_theta;
+    int em_nCell;
+    int em_nBC;
+
+    // physics variables
+    float em_pet;
+    float em_pe;
+    float em_peta;
+    float em_ptheta;
+
+    // corrected collectin
+    float emCorr_e;
+    float emCorr_et;
+    float emCorr_eta;
+    float emCorr_phi;
+    float emCorr_theta;
+    float emCorr_pet;
+    float emCorr_peta;
+    float emCorr_ptheta;
+
+    // EM widths, pw -- phiWidth, ew -- etaWidth
+    float em_pw;
+    float em_ew;
+    // ratios of widths pw/ew
+    float em_br;
+  };
+  tree_structure_ tree_;
+
+  //
+  float xVtx_;
+  float yVtx_;
+  float zVtx_;
+  //
+  float xClust_zero_;
+  float yClust_zero_;
+  float zClust_zero_;
+  //
+  float xClust_vtx_;
+  float yClust_vtx_;
+  float zClust_vtx_;
+  //
+  float rClust_vtx_;
+  //
+  float energyMax_;
+  float eTMax_;
+  float eTMaxVtx_;
+  float etaMax_;
+  float etaMaxVtx_;
+  float phiMax_;
+  float phiMaxVtx_;
+  float thetaMax_;
+  float thetaMaxVtx_;
+  //
+
+  int evtN;
+
+  // Function
+  void fillTree(const reco::SuperClusterCollection *scColl,
+                const reco::SuperClusterCollection *corrSCColl,
+                HepMC::GenParticle *mc,
+                tree_structure_ &tree_,
+                float xV,
+                float yV,
+                float zV,
+                int scType);
 };
 #endif
-
diff --git a/Validation/EcalClusters/interface/HistSpec.h b/Validation/EcalClusters/interface/HistSpec.h
index 867ef7934fa53..9f7c20307e8e2 100644
--- a/Validation/EcalClusters/interface/HistSpec.h
+++ b/Validation/EcalClusters/interface/HistSpec.h
@@ -8,8 +8,7 @@ struct HistSpec {
   double max;
   int bins;
 
-  HistSpec(edm::ParameterSet const& _ps, std::string const& _suffix)
-  {
+  HistSpec(edm::ParameterSet const &_ps, std::string const &_suffix) {
     min = _ps.getParameter<double>("hist_min_" + _suffix);
     max = _ps.getParameter<double>("hist_max_" + _suffix);
     bins = _ps.getParameter<int>("hist_bins_" + _suffix);
diff --git a/Validation/EcalClusters/src/ContainmentCorrectionAnalyzer.cc b/Validation/EcalClusters/src/ContainmentCorrectionAnalyzer.cc
index 2c6e36c7cc151..23cb747c440a7 100644
--- a/Validation/EcalClusters/src/ContainmentCorrectionAnalyzer.cc
+++ b/Validation/EcalClusters/src/ContainmentCorrectionAnalyzer.cc
@@ -1,107 +1,126 @@
 /*\class to compute not containment parameter */
 
-#include "Validation/EcalClusters/interface/ContainmentCorrectionAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "Validation/EcalClusters/interface/ContainmentCorrectionAnalyzer.h"
 
 using namespace cms;
 using namespace edm;
 using namespace std;
 using namespace reco;
 
-ContainmentCorrectionAnalyzer::ContainmentCorrectionAnalyzer( const ParameterSet& ps ) {
-
-  BarrelSuperClusterCollection_  = consumes<reco::SuperClusterCollection>(ps.getParameter<InputTag>("BarrelSuperClusterCollection"));
-  EndcapSuperClusterCollection_  = consumes<reco::SuperClusterCollection>(ps.getParameter<InputTag>("EndcapSuperClusterCollection"));
-  reducedBarrelRecHitCollection_ = consumes<EcalRecHitCollection>(ps.getParameter<InputTag>("reducedBarrelRecHitCollection"));
-  reducedEndcapRecHitCollection_ = consumes<EcalRecHitCollection>(ps.getParameter<InputTag>("reducedEndcapRecHitCollection"));
-  SimTrackCollection_            = consumes<SimTrackContainer>(ps.getParameter<InputTag>("simTrackCollection"));
-  SimVertexCollection_           = consumes<SimVertexContainer>(ps.getParameter<InputTag>("simVertexCollection"));
+ContainmentCorrectionAnalyzer::ContainmentCorrectionAnalyzer(const ParameterSet &ps) {
+  BarrelSuperClusterCollection_ =
+      consumes<reco::SuperClusterCollection>(ps.getParameter<InputTag>("BarrelSuperClusterCollection"));
+  EndcapSuperClusterCollection_ =
+      consumes<reco::SuperClusterCollection>(ps.getParameter<InputTag>("EndcapSuperClusterCollection"));
+  reducedBarrelRecHitCollection_ =
+      consumes<EcalRecHitCollection>(ps.getParameter<InputTag>("reducedBarrelRecHitCollection"));
+  reducedEndcapRecHitCollection_ =
+      consumes<EcalRecHitCollection>(ps.getParameter<InputTag>("reducedEndcapRecHitCollection"));
+  SimTrackCollection_ = consumes<SimTrackContainer>(ps.getParameter<InputTag>("simTrackCollection"));
+  SimVertexCollection_ = consumes<SimVertexContainer>(ps.getParameter<InputTag>("simVertexCollection"));
 }
 
-ContainmentCorrectionAnalyzer::~ContainmentCorrectionAnalyzer() { }
+ContainmentCorrectionAnalyzer::~ContainmentCorrectionAnalyzer() {}
 
 void ContainmentCorrectionAnalyzer::beginJob() {
-
-  Service<TFileService> fs;  
+  Service<TFileService> fs;
 
   // Define reference histograms
-  h_EB_eRecoEtrueReference = fs->make<TH1F>("EB_eRecoEtrueReference","EB_eRecoEtrueReference",440,0.,1.1);
-  h_EB_e9EtrueReference    = fs->make<TH1F>("EB_e9EtrueReference",   "EB_e9EtrueReference",   440,0.,1.1);
-  h_EB_e25EtrueReference   = fs->make<TH1F>("EB_e25EtrueReference",  "EB_e25EtrueReference",  440,0.,1.1);
-  h_EE_eRecoEtrueReference = fs->make<TH1F>("EE_eRecoEtrueReference","EE_eRecoEtrueReference",440,0.,1.1);
-  h_EE_e9EtrueReference    = fs->make<TH1F>("EE_e9EtrueReference",   "EE_e9EtrueReference",   440,0.,1.1);
-  h_EE_e25EtrueReference   = fs->make<TH1F>("EE_e25EtrueReference",  "EE_e25EtrueReference",  440,0.,1.1);
-  h_EB_eTrue               = fs->make<TH1F>("EB_eTrue",              "EB_eTrue",              41,40.,60.);
-  h_EE_eTrue               = fs->make<TH1F>("EE_eTrue",              "EE_eTrue",              41,40.,60.);
-  h_EB_converted           = fs->make<TH1F>("EB_converted",          "EB_converted",          2,0.,2.);
-  h_EE_converted           = fs->make<TH1F>("EE_converted",          "EE_converted",          2,0.,2.);
+  h_EB_eRecoEtrueReference = fs->make<TH1F>("EB_eRecoEtrueReference", "EB_eRecoEtrueReference", 440, 0., 1.1);
+  h_EB_e9EtrueReference = fs->make<TH1F>("EB_e9EtrueReference", "EB_e9EtrueReference", 440, 0., 1.1);
+  h_EB_e25EtrueReference = fs->make<TH1F>("EB_e25EtrueReference", "EB_e25EtrueReference", 440, 0., 1.1);
+  h_EE_eRecoEtrueReference = fs->make<TH1F>("EE_eRecoEtrueReference", "EE_eRecoEtrueReference", 440, 0., 1.1);
+  h_EE_e9EtrueReference = fs->make<TH1F>("EE_e9EtrueReference", "EE_e9EtrueReference", 440, 0., 1.1);
+  h_EE_e25EtrueReference = fs->make<TH1F>("EE_e25EtrueReference", "EE_e25EtrueReference", 440, 0., 1.1);
+  h_EB_eTrue = fs->make<TH1F>("EB_eTrue", "EB_eTrue", 41, 40., 60.);
+  h_EE_eTrue = fs->make<TH1F>("EE_eTrue", "EE_eTrue", 41, 40., 60.);
+  h_EB_converted = fs->make<TH1F>("EB_converted", "EB_converted", 2, 0., 2.);
+  h_EE_converted = fs->make<TH1F>("EE_converted", "EE_converted", 2, 0., 2.);
 }
 
-void ContainmentCorrectionAnalyzer::analyze( const Event& evt, const EventSetup& es ) {
-  
+void ContainmentCorrectionAnalyzer::analyze(const Event &evt, const EventSetup &es) {
   LogInfo("ContainmentCorrectionAnalyzer") << "Analyzing event " << evt.id() << "\n";
-  
+
   // taking the needed collections
   std::vector<SimTrack> theSimTracks;
   Handle<SimTrackContainer> SimTk;
-  evt.getByToken(SimTrackCollection_,SimTk);
+  evt.getByToken(SimTrackCollection_, SimTk);
   Labels l;
   labelsForToken(SimTrackCollection_, l);
 
-  if (SimTk.isValid() ) theSimTracks.insert(theSimTracks.end(),SimTk->begin(),SimTk->end());  
-  else { LogError("ContainmentCorrectionAnalyzer") << "Error! can't get collection with label " << l.module; }
+  if (SimTk.isValid())
+    theSimTracks.insert(theSimTracks.end(), SimTk->begin(), SimTk->end());
+  else {
+    LogError("ContainmentCorrectionAnalyzer") << "Error! can't get collection with label " << l.module;
+  }
 
-  std::vector<SimVertex> theSimVertexes;  
+  std::vector<SimVertex> theSimVertexes;
   Handle<SimVertexContainer> SimVtx;
-  evt.getByToken(SimVertexCollection_,SimVtx);
+  evt.getByToken(SimVertexCollection_, SimVtx);
   labelsForToken(SimVertexCollection_, l);
 
+  if (SimVtx.isValid())
+    theSimVertexes.insert(theSimVertexes.end(), SimVtx->begin(), SimVtx->end());
+  else {
+    LogError("ContainmentCorrectionAnalyzer") << "Error! can't get collection with label " << l.module;
+  }
 
-  if (SimVtx.isValid()) theSimVertexes.insert(theSimVertexes.end(),SimVtx->begin(),SimVtx->end());
-  else {LogError("ContainmentCorrectionAnalyzer") << "Error! can't get collection with label " << l.module; }
-  
-  const reco::SuperClusterCollection* BarrelSuperClusters = nullptr;
+  const reco::SuperClusterCollection *BarrelSuperClusters = nullptr;
   Handle<reco::SuperClusterCollection> pHybridBarrelSuperClusters;
   evt.getByToken(BarrelSuperClusterCollection_, pHybridBarrelSuperClusters);
   labelsForToken(BarrelSuperClusterCollection_, l);
 
-  if (pHybridBarrelSuperClusters.isValid()) { BarrelSuperClusters = pHybridBarrelSuperClusters.product(); } 
-  else {LogError("ContainmentCorrectionAnalyzer") << "Error! can't get collection with label " << l.module; }
+  if (pHybridBarrelSuperClusters.isValid()) {
+    BarrelSuperClusters = pHybridBarrelSuperClusters.product();
+  } else {
+    LogError("ContainmentCorrectionAnalyzer") << "Error! can't get collection with label " << l.module;
+  }
 
-  const reco::SuperClusterCollection* EndcapSuperClusters = nullptr;
+  const reco::SuperClusterCollection *EndcapSuperClusters = nullptr;
   Handle<reco::SuperClusterCollection> pMulti5x5EndcapSuperClusters;
   evt.getByToken(EndcapSuperClusterCollection_, pMulti5x5EndcapSuperClusters);
   labelsForToken(EndcapSuperClusterCollection_, l);
 
-  if (pMulti5x5EndcapSuperClusters.isValid()) EndcapSuperClusters = pMulti5x5EndcapSuperClusters.product();
-  else {LogError("ContainmentCorrectionAnalyzer") << "Error! can't get collection with label " << l.module; }
-  
+  if (pMulti5x5EndcapSuperClusters.isValid())
+    EndcapSuperClusters = pMulti5x5EndcapSuperClusters.product();
+  else {
+    LogError("ContainmentCorrectionAnalyzer") << "Error! can't get collection with label " << l.module;
+  }
+
   const EcalRecHitCollection *ebRecHits = nullptr;
-  Handle< EcalRecHitCollection > pEBRecHits;
-  evt.getByToken( reducedBarrelRecHitCollection_, pEBRecHits );
+  Handle<EcalRecHitCollection> pEBRecHits;
+  evt.getByToken(reducedBarrelRecHitCollection_, pEBRecHits);
   labelsForToken(reducedBarrelRecHitCollection_, l);
 
-  if (pEBRecHits.isValid()) ebRecHits = pEBRecHits.product();
-  else {LogError("ContainmentCorrectionAnalyzer") << "Error! can't get collection with label " << l.module; }
-  
+  if (pEBRecHits.isValid())
+    ebRecHits = pEBRecHits.product();
+  else {
+    LogError("ContainmentCorrectionAnalyzer") << "Error! can't get collection with label " << l.module;
+  }
+
   const EcalRecHitCollection *eeRecHits = nullptr;
-  Handle< EcalRecHitCollection > pEERecHits;
-  evt.getByToken( reducedEndcapRecHitCollection_, pEERecHits );
+  Handle<EcalRecHitCollection> pEERecHits;
+  evt.getByToken(reducedEndcapRecHitCollection_, pEERecHits);
   labelsForToken(reducedEndcapRecHitCollection_, l);
 
-  if (pEERecHits.isValid()) eeRecHits = pEERecHits.product();
-  else {LogError("ContainmentCorrectionAnalyzer") << "Error! can't get collection with label " << l.module; }
-  
+  if (pEERecHits.isValid())
+    eeRecHits = pEERecHits.product();
+  else {
+    LogError("ContainmentCorrectionAnalyzer") << "Error! can't get collection with label " << l.module;
+  }
+
   const CaloTopology *topology = nullptr;
   ESHandle<CaloTopology> pTopology;
   es.get<CaloTopologyRecord>().get(pTopology);
-  if(pTopology.isValid()) topology = pTopology.product();
-  
-  std::vector<EcalSimPhotonMCTruth> photons=findMcTruth(theSimTracks,theSimVertexes);
-  
+  if (pTopology.isValid())
+    topology = pTopology.product();
+
+  std::vector<EcalSimPhotonMCTruth> photons = findMcTruth(theSimTracks, theSimVertexes);
+
   nMCphotons = 0;
   nRECOphotons = 0;
-  
+
   int mc_size = photons.size();
   mcEnergy.resize(mc_size);
   mcEta.resize(mc_size);
@@ -111,7 +130,7 @@ void ContainmentCorrectionAnalyzer::analyze( const Event& evt, const EventSetup&
   x_vtx.resize(mc_size);
   y_vtx.resize(mc_size);
   z_vtx.resize(mc_size);
-  
+
   superClusterEnergy.resize(mc_size);
   superClusterEta.resize(mc_size);
   superClusterPhi.resize(mc_size);
@@ -122,327 +141,349 @@ void ContainmentCorrectionAnalyzer::analyze( const Event& evt, const EventSetup&
   seedXtal.resize(mc_size);
   iMC.resize(mc_size);
 
-
   // loop over MC truth photons
-  for (unsigned int ipho=0;ipho<photons.size();ipho++) {
-
+  for (unsigned int ipho = 0; ipho < photons.size(); ipho++) {
     math::XYZTLorentzVectorD vtx = photons[ipho].primaryVertex();
     double phiTrue = photons[ipho].fourMomentum().phi();
-    double vtxPerp = sqrt(vtx.x()*vtx.x() + vtx.y()*vtx.y()); 
+    double vtxPerp = sqrt(vtx.x() * vtx.x() + vtx.y() * vtx.y());
     double etaTrue = ecalEta(photons[ipho].fourMomentum().eta(), vtx.z(), vtxPerp);
-    double etTrue  = photons[ipho].fourMomentum().e()/cosh(etaTrue);
+    double etTrue = photons[ipho].fourMomentum().e() / cosh(etaTrue);
     nMCphotons++;
-    mcEnergy[nMCphotons-1]=photons[ipho].fourMomentum().e();
-    mcEta[nMCphotons-1]=etaTrue;
-    mcPhi[nMCphotons-1]=phiTrue;
-    mcPt[nMCphotons-1]=etTrue;      
-    isConverted[nMCphotons-1]=photons[ipho].isAConversion();
-    x_vtx[nMCphotons-1]=vtx.x();
-    y_vtx[nMCphotons-1]=vtx.y();
-    z_vtx[nMCphotons-1]=vtx.z();
+    mcEnergy[nMCphotons - 1] = photons[ipho].fourMomentum().e();
+    mcEta[nMCphotons - 1] = etaTrue;
+    mcPhi[nMCphotons - 1] = phiTrue;
+    mcPt[nMCphotons - 1] = etTrue;
+    isConverted[nMCphotons - 1] = photons[ipho].isAConversion();
+    x_vtx[nMCphotons - 1] = vtx.x();
+    y_vtx[nMCphotons - 1] = vtx.y();
+    z_vtx[nMCphotons - 1] = vtx.z();
 
     // check histos for MC truth
-    if(std::fabs(etaTrue) < 1.479) {
-      h_EB_eTrue     ->Fill(photons[ipho].fourMomentum().e());
-      h_EB_converted ->Fill(photons[ipho].isAConversion());
-    }         
-    if(std::fabs(etaTrue) >= 1.6) {
-      h_EE_eTrue     ->Fill(photons[ipho].fourMomentum().e());
-      h_EE_converted ->Fill(photons[ipho].isAConversion());
-    }         
+    if (std::fabs(etaTrue) < 1.479) {
+      h_EB_eTrue->Fill(photons[ipho].fourMomentum().e());
+      h_EB_converted->Fill(photons[ipho].isAConversion());
+    }
+    if (std::fabs(etaTrue) >= 1.6) {
+      h_EE_eTrue->Fill(photons[ipho].fourMomentum().e());
+      h_EE_converted->Fill(photons[ipho].isAConversion());
+    }
 
     // barrel
-    if(std::fabs(etaTrue) < 1.479) {
-      double etaCurrent; // , etaFound = 0; // UNUSED
+    if (std::fabs(etaTrue) < 1.479) {
+      double etaCurrent;  // , etaFound = 0; // UNUSED
       double phiCurrent;
       // double etCurrent,  etFound  = 0; // UNUSED
-      const reco::SuperCluster* nearSC = nullptr;
-      
-      double closestParticleDistance = 999;      
-      for(reco::SuperClusterCollection::const_iterator aClus = BarrelSuperClusters->begin(); 
-	  aClus != BarrelSuperClusters->end(); aClus++) {	    
-	etaCurrent = aClus->position().eta();
-	phiCurrent = aClus->position().phi();
-	// etCurrent  = aClus->energy()/std::cosh(etaCurrent); // UNUSED
-	double deltaR = std::sqrt(std::pow(etaCurrent-etaTrue,2)+std::pow(phiCurrent-phiTrue,2));
-	if(deltaR < closestParticleDistance) {
-	  // etFound  = etCurrent; // UNUSED
-	  // etaFound = etaCurrent; // UNUSED
-	  closestParticleDistance = deltaR;
-	  nearSC=&(*aClus);
-	}
+      const reco::SuperCluster *nearSC = nullptr;
+
+      double closestParticleDistance = 999;
+      for (reco::SuperClusterCollection::const_iterator aClus = BarrelSuperClusters->begin();
+           aClus != BarrelSuperClusters->end();
+           aClus++) {
+        etaCurrent = aClus->position().eta();
+        phiCurrent = aClus->position().phi();
+        // etCurrent  = aClus->energy()/std::cosh(etaCurrent); // UNUSED
+        double deltaR = std::sqrt(std::pow(etaCurrent - etaTrue, 2) + std::pow(phiCurrent - phiTrue, 2));
+        if (deltaR < closestParticleDistance) {
+          // etFound  = etCurrent; // UNUSED
+          // etaFound = etaCurrent; // UNUSED
+          closestParticleDistance = deltaR;
+          nearSC = &(*aClus);
+        }
       }
 
-      if(closestParticleDistance < 0.3) {
-	// Is a matched particle dumping informations
-	nRECOphotons++;
-	superClusterEnergy[nRECOphotons-1]=nearSC->rawEnergy();
-	superClusterEta[nRECOphotons-1]=nearSC->position().eta();
-	superClusterPhi[nRECOphotons-1]=nearSC->position().phi();
-	superClusterEt[nRECOphotons-1]=nearSC->rawEnergy()/std::cosh(nearSC->position().eta());
-	iMC[nRECOphotons-1]=nMCphotons-1;
-
-	const reco::CaloClusterPtr& theSeed = nearSC->seed();
-	seedXtal[nRECOphotons-1] = EcalClusterTools::getMaximum(*theSeed, ebRecHits).first;
-	e1[nRECOphotons-1]       = EcalClusterTools::eMax(*theSeed, ebRecHits);
-	e9[nRECOphotons-1]       = EcalClusterTools::e3x3(*theSeed, ebRecHits, topology ); 
-	e25[nRECOphotons-1]      = EcalClusterTools::e5x5(*theSeed, ebRecHits, topology ); 
+      if (closestParticleDistance < 0.3) {
+        // Is a matched particle dumping informations
+        nRECOphotons++;
+        superClusterEnergy[nRECOphotons - 1] = nearSC->rawEnergy();
+        superClusterEta[nRECOphotons - 1] = nearSC->position().eta();
+        superClusterPhi[nRECOphotons - 1] = nearSC->position().phi();
+        superClusterEt[nRECOphotons - 1] = nearSC->rawEnergy() / std::cosh(nearSC->position().eta());
+        iMC[nRECOphotons - 1] = nMCphotons - 1;
+
+        const reco::CaloClusterPtr &theSeed = nearSC->seed();
+        seedXtal[nRECOphotons - 1] = EcalClusterTools::getMaximum(*theSeed, ebRecHits).first;
+        e1[nRECOphotons - 1] = EcalClusterTools::eMax(*theSeed, ebRecHits);
+        e9[nRECOphotons - 1] = EcalClusterTools::e3x3(*theSeed, ebRecHits, topology);
+        e25[nRECOphotons - 1] = EcalClusterTools::e5x5(*theSeed, ebRecHits, topology);
       }
     }
-    
+
     // endcap
-    if(std::fabs(etaTrue) >= 1.6) {
-      double etaCurrent; // , etaFound = 0; // UNUSED
+    if (std::fabs(etaTrue) >= 1.6) {
+      double etaCurrent;  // , etaFound = 0; // UNUSED
       double phiCurrent;
       // double etCurrent,  etFound  = 0; // UNUSED
-      const reco::SuperCluster* nearSC = nullptr;
-      
-      double closestParticleDistance = 999; 
-      for(reco::SuperClusterCollection::const_iterator aClus = EndcapSuperClusters->begin(); 
-	  aClus != EndcapSuperClusters->end(); aClus++) {
-	etaCurrent = aClus->position().eta();
-	phiCurrent = aClus->position().phi();
-	// etCurrent  =  aClus->energy()/std::cosh(etaCurrent);
-	double deltaR = std::sqrt(std::pow(etaCurrent-etaTrue,2)+std::pow(phiCurrent-phiTrue,2));
-	if(deltaR < closestParticleDistance) {
-	  // etFound  = etCurrent; // UNUSED
-	  // etaFound = etaCurrent; // UNUSED
-	  closestParticleDistance = deltaR;
-	  nearSC=&(*aClus);
-	}
+      const reco::SuperCluster *nearSC = nullptr;
+
+      double closestParticleDistance = 999;
+      for (reco::SuperClusterCollection::const_iterator aClus = EndcapSuperClusters->begin();
+           aClus != EndcapSuperClusters->end();
+           aClus++) {
+        etaCurrent = aClus->position().eta();
+        phiCurrent = aClus->position().phi();
+        // etCurrent  =  aClus->energy()/std::cosh(etaCurrent);
+        double deltaR = std::sqrt(std::pow(etaCurrent - etaTrue, 2) + std::pow(phiCurrent - phiTrue, 2));
+        if (deltaR < closestParticleDistance) {
+          // etFound  = etCurrent; // UNUSED
+          // etaFound = etaCurrent; // UNUSED
+          closestParticleDistance = deltaR;
+          nearSC = &(*aClus);
+        }
       }
-      
-      if(closestParticleDistance < 0.3) {
-	//Is a matched particle dumping informations
-	nRECOphotons++;
-	float psEnergy = nearSC->preshowerEnergy();
-	superClusterEnergy[nRECOphotons-1]=nearSC->rawEnergy() + psEnergy;
-	superClusterEta[nRECOphotons-1]=nearSC->position().eta();
-	superClusterPhi[nRECOphotons-1]=nearSC->position().phi();
-	superClusterEt[nRECOphotons-1]=(nearSC->rawEnergy() + psEnergy)/std::cosh(nearSC->position().eta());
-	iMC[nRECOphotons-1]=nMCphotons-1;
-
-	const reco::CaloClusterPtr& theSeed = nearSC->seed();
-	seedXtal[nRECOphotons-1] = EcalClusterTools::getMaximum(*theSeed, eeRecHits).first;
-	e1[nRECOphotons-1]       = EcalClusterTools::eMax(*theSeed, eeRecHits) + psEnergy;
-	e9[nRECOphotons-1]       = EcalClusterTools::e3x3(*theSeed, eeRecHits, topology ) + psEnergy; 
-	e25[nRECOphotons-1]      = EcalClusterTools::e5x5(*theSeed, eeRecHits, topology ) + psEnergy; 
-      }
-    }  
-  }  
 
+      if (closestParticleDistance < 0.3) {
+        // Is a matched particle dumping informations
+        nRECOphotons++;
+        float psEnergy = nearSC->preshowerEnergy();
+        superClusterEnergy[nRECOphotons - 1] = nearSC->rawEnergy() + psEnergy;
+        superClusterEta[nRECOphotons - 1] = nearSC->position().eta();
+        superClusterPhi[nRECOphotons - 1] = nearSC->position().phi();
+        superClusterEt[nRECOphotons - 1] = (nearSC->rawEnergy() + psEnergy) / std::cosh(nearSC->position().eta());
+        iMC[nRECOphotons - 1] = nMCphotons - 1;
+
+        const reco::CaloClusterPtr &theSeed = nearSC->seed();
+        seedXtal[nRECOphotons - 1] = EcalClusterTools::getMaximum(*theSeed, eeRecHits).first;
+        e1[nRECOphotons - 1] = EcalClusterTools::eMax(*theSeed, eeRecHits) + psEnergy;
+        e9[nRECOphotons - 1] = EcalClusterTools::e3x3(*theSeed, eeRecHits, topology) + psEnergy;
+        e25[nRECOphotons - 1] = EcalClusterTools::e5x5(*theSeed, eeRecHits, topology) + psEnergy;
+      }
+    }
+  }
 
   // containment analysis for unconverted photons in the reference region only
-  for (int i=0;i<nRECOphotons;i++) {
-
+  for (int i = 0; i < nRECOphotons; i++) {
     // barrel
-    if (fabs(superClusterEta[i]) < 1.479 ) {
-      if (isConverted[iMC[i]] != 1){
-	int ietaAbs = (seedXtal[i]>>9)&0x7F;
-	int iphi    = seedXtal[i]&0x1FF;
-	if (ietaAbs > 5 && ietaAbs < 21 && ((iphi % 20) > 5) && ((iphi % 20) < 16) ) {
-	  h_EB_eRecoEtrueReference -> Fill(superClusterEnergy[i]/mcEnergy[iMC[i]]);
-	  h_EB_e9EtrueReference    -> Fill(e9[i]/mcEnergy[iMC[i]]);
-	  h_EB_e25EtrueReference   -> Fill(e25[i]/mcEnergy[iMC[i]]);
-	}
+    if (fabs(superClusterEta[i]) < 1.479) {
+      if (isConverted[iMC[i]] != 1) {
+        int ietaAbs = (seedXtal[i] >> 9) & 0x7F;
+        int iphi = seedXtal[i] & 0x1FF;
+        if (ietaAbs > 5 && ietaAbs < 21 && ((iphi % 20) > 5) && ((iphi % 20) < 16)) {
+          h_EB_eRecoEtrueReference->Fill(superClusterEnergy[i] / mcEnergy[iMC[i]]);
+          h_EB_e9EtrueReference->Fill(e9[i] / mcEnergy[iMC[i]]);
+          h_EB_e25EtrueReference->Fill(e25[i] / mcEnergy[iMC[i]]);
+        }
       }
-    }    
-  
+    }
+
     // endcap
-    if (fabs(superClusterEta[i]) > 1.6 ) {
+    if (fabs(superClusterEta[i]) > 1.6) {
       if (isConverted[iMC[i]] != 1) {
-	if ( fabs(superClusterEta[i]) > 1.7 && fabs(superClusterEta[i] < 2.3)  &&
-	     ((superClusterPhi[i] > -CLHEP::pi/2. + 0.1 && superClusterPhi[i] < CLHEP::pi/2. - 0.1) ||
-	      (superClusterPhi[i] > CLHEP::pi/2. + 0.1) ||
-	      (superClusterPhi[i] < -CLHEP::pi/2. - 0.1) 
-	      ))
-	  {
-	    h_EE_eRecoEtrueReference -> Fill(superClusterEnergy[i]/mcEnergy[iMC[i]]);
-	    h_EE_e9EtrueReference    -> Fill(e9[i]/mcEnergy[iMC[i]]);
-	    h_EE_e25EtrueReference   -> Fill(e25[i]/mcEnergy[iMC[i]]);
-	  }
+        if (fabs(superClusterEta[i]) > 1.7 && fabs(superClusterEta[i] < 2.3) &&
+            ((superClusterPhi[i] > -CLHEP::pi / 2. + 0.1 && superClusterPhi[i] < CLHEP::pi / 2. - 0.1) ||
+             (superClusterPhi[i] > CLHEP::pi / 2. + 0.1) || (superClusterPhi[i] < -CLHEP::pi / 2. - 0.1))) {
+          h_EE_eRecoEtrueReference->Fill(superClusterEnergy[i] / mcEnergy[iMC[i]]);
+          h_EE_e9EtrueReference->Fill(e9[i] / mcEnergy[iMC[i]]);
+          h_EE_e25EtrueReference->Fill(e25[i] / mcEnergy[iMC[i]]);
+        }
       }
     }
-    
-  } // loop over reco photons
+
+  }  // loop over reco photons
 }
 
-void ContainmentCorrectionAnalyzer::endJob() { }
-
-float ContainmentCorrectionAnalyzer::ecalEta(float EtaParticle , float Zvertex, float plane_Radius) {  
-
-  const float R_ECAL           = 136.5;
-  const float Z_Endcap         = 328.0;
-  const float etaBarrelEndcap  = 1.479;
-
-  if(EtaParticle != 0.) {
-    float Theta = 0.0  ;
-    float ZEcal = (R_ECAL-plane_Radius)*sinh(EtaParticle)+Zvertex;
-    
-    if(ZEcal != 0.0) Theta = atan(R_ECAL/ZEcal);
-    if(Theta<0.0) Theta = Theta+Geom::pi() ;
-    
-    float ETA = - log(tan(0.5*Theta));
-    
-    if( fabs(ETA) > etaBarrelEndcap ) {
-      float Zend = Z_Endcap ;
-      if(EtaParticle<0.0 )  Zend = -Zend ;
-      float Zlen = Zend - Zvertex ;
-      float RR = Zlen/sinh(EtaParticle);
-      Theta = atan((RR+plane_Radius)/Zend);
-      if(Theta<0.0) Theta = Theta+Geom::pi() ;
-      ETA = - log(tan(0.5*Theta));
+void ContainmentCorrectionAnalyzer::endJob() {}
+
+float ContainmentCorrectionAnalyzer::ecalEta(float EtaParticle, float Zvertex, float plane_Radius) {
+  const float R_ECAL = 136.5;
+  const float Z_Endcap = 328.0;
+  const float etaBarrelEndcap = 1.479;
+
+  if (EtaParticle != 0.) {
+    float Theta = 0.0;
+    float ZEcal = (R_ECAL - plane_Radius) * sinh(EtaParticle) + Zvertex;
+
+    if (ZEcal != 0.0)
+      Theta = atan(R_ECAL / ZEcal);
+    if (Theta < 0.0)
+      Theta = Theta + Geom::pi();
+
+    float ETA = -log(tan(0.5 * Theta));
+
+    if (fabs(ETA) > etaBarrelEndcap) {
+      float Zend = Z_Endcap;
+      if (EtaParticle < 0.0)
+        Zend = -Zend;
+      float Zlen = Zend - Zvertex;
+      float RR = Zlen / sinh(EtaParticle);
+      Theta = atan((RR + plane_Radius) / Zend);
+      if (Theta < 0.0)
+        Theta = Theta + Geom::pi();
+      ETA = -log(tan(0.5 * Theta));
     }
-    
+
     return ETA;
-  }
-  else {
-    LogWarning("")  << "[ContainmentCorrectionAnalyzer::ecalEta] Warning: Eta equals to zero, not correcting" ;
+  } else {
+    LogWarning("") << "[ContainmentCorrectionAnalyzer::ecalEta] Warning: Eta "
+                      "equals to zero, not correcting";
     return EtaParticle;
   }
 }
 
 // taken from an old version of RecoEgamma/EgammaMCTools/src/PhotonMCTruthFinder
-std::vector<EcalSimPhotonMCTruth> ContainmentCorrectionAnalyzer::findMcTruth(std::vector<SimTrack>& theSimTracks, std::vector<SimVertex>& theSimVertices ) {
-
+std::vector<EcalSimPhotonMCTruth> ContainmentCorrectionAnalyzer::findMcTruth(std::vector<SimTrack> &theSimTracks,
+                                                                             std::vector<SimVertex> &theSimVertices) {
   std::vector<EcalSimPhotonMCTruth> result;
 
   geantToIndex_.clear();
   // int   idTrk1_[10]; // UNUSED
   // int   idTrk2_[10]; // UNUSED
-  
-  // Local variables  
+
+  // Local variables
   // const int SINGLE=1; // UNUSED
   // const int DOUBLE=2; // UNUSED
   // const int PYTHIA=3; // UNUSED
-  const int ELECTRON_FLAV=1;
-  const int PIZERO_FLAV=2;
-  const int PHOTON_FLAV=3;
-  
+  const int ELECTRON_FLAV = 1;
+  const int PIZERO_FLAV = 2;
+  const int PHOTON_FLAV = 3;
+
   // int ievtype=0; // UNUSED
-  int ievflav=0;
-  std::vector<SimTrack*> photonTracks;
-  std::vector<SimTrack*> pizeroTracks;
+  int ievflav = 0;
+  std::vector<SimTrack *> photonTracks;
+  std::vector<SimTrack *> pizeroTracks;
   std::vector<const SimTrack *> trkFromConversion;
-  SimVertex primVtx;   
+  SimVertex primVtx;
   std::vector<int> convInd;
 
-  fillMcTruth(theSimTracks,  theSimVertices);
-  int iPV=-1;   
-  int partType1=0;
-  int partType2=0;
+  fillMcTruth(theSimTracks, theSimVertices);
+  int iPV = -1;
+  int partType1 = 0;
+  int partType2 = 0;
   std::vector<SimTrack>::iterator iFirstSimTk = theSimTracks.begin();
-  if (  !(*iFirstSimTk).noVertex() ) {
-    iPV =  (*iFirstSimTk).vertIndex();
-    int vtxId =   (*iFirstSimTk).vertIndex();
-    primVtx = theSimVertices[vtxId];  
+  if (!(*iFirstSimTk).noVertex()) {
+    iPV = (*iFirstSimTk).vertIndex();
+    int vtxId = (*iFirstSimTk).vertIndex();
+    primVtx = theSimVertices[vtxId];
     partType1 = (*iFirstSimTk).type();
   }
-  
+
   // Look at a second track
   iFirstSimTk++;
-  if ( iFirstSimTk!=  theSimTracks.end() ) {    
-    if (  (*iFirstSimTk).vertIndex() == iPV) {
-      partType2 = (*iFirstSimTk).type();  
+  if (iFirstSimTk != theSimTracks.end()) {
+    if ((*iFirstSimTk).vertIndex() == iPV) {
+      partType2 = (*iFirstSimTk).type();
     }
   }
-  int npv=0;
-  int iPho=0;
-  for (std::vector<SimTrack>::iterator iSimTk = theSimTracks.begin(); iSimTk != theSimTracks.end(); ++iSimTk){
-    if (  (*iSimTk).noVertex() ) continue;
+  int npv = 0;
+  int iPho = 0;
+  for (std::vector<SimTrack>::iterator iSimTk = theSimTracks.begin(); iSimTk != theSimTracks.end(); ++iSimTk) {
+    if ((*iSimTk).noVertex())
+      continue;
     // int vertexId = (*iSimTk).vertIndex(); // UNUSED
     // SimVertex vertex = theSimVertices[vertexId]; // UNUSED
-    if ( (*iSimTk).vertIndex() == iPV ) {
+    if ((*iSimTk).vertIndex() == iPV) {
       npv++;
-      if ( (*iSimTk).type() == 22) {
-	convInd.push_back(0);
-	photonTracks.push_back( &(*iSimTk) );
-	// math::XYZTLorentzVectorD momentum = (*iSimTk).momentum(); // UNUSED
-      } 
+      if ((*iSimTk).type() == 22) {
+        convInd.push_back(0);
+        photonTracks.push_back(&(*iSimTk));
+        // math::XYZTLorentzVectorD momentum = (*iSimTk).momentum(); // UNUSED
+      }
     }
-  } 
-  
-  if(npv > 4) { // ievtype = PYTHIA; // UNUSED
-  } else if(npv == 1) {
-    if( abs(partType1) == 11 ) { /* ievtype = SINGLE; ==UNUSED== */ ievflav = ELECTRON_FLAV; } 
-    else if(partType1 == 111)  { /* ievtype = SINGLE; ==UNUSED== */ ievflav = PIZERO_FLAV; } 
-    else if(partType1 == 22)   { /* ievtype = SINGLE; ==UNUSED== */ ievflav = PHOTON_FLAV; }
-  } else if(npv == 2) {
-    if (  abs(partType1) == 11 && abs(partType2) == 11 ) { /* ievtype = DOUBLE; ==UNUSED== */ ievflav = ELECTRON_FLAV; } 
-    else if(partType1 == 111 && partType2 == 111)        { /* ievtype = DOUBLE; ==UNUSED== */ ievflav = PIZERO_FLAV; } 
-    else if(partType1 == 22 && partType2 == 22)          { /* ievtype = DOUBLE; ==UNUSED== */ ievflav = PHOTON_FLAV; }
-  }      
-  
-  //  Look into converted photons  
-  int isAconversion=0;   
-  if(ievflav == PHOTON_FLAV) {
-
-    int nConv=0;
-    int iConv=0;
-    iPho=0;
-    for (std::vector<SimTrack*>::iterator iPhoTk = photonTracks.begin(); iPhoTk != photonTracks.end(); ++iPhoTk){
-      trkFromConversion.clear();           
-      for (std::vector<SimTrack>::iterator iSimTk = theSimTracks.begin(); iSimTk != theSimTracks.end(); ++iSimTk){
-	if (  (*iSimTk).noVertex() )                    continue;
-	if ( (*iSimTk).vertIndex() == iPV )             continue; 
-	if ( abs((*iSimTk).type()) != 11  )             continue;
-	int vertexId = (*iSimTk).vertIndex();
-	SimVertex vertex = theSimVertices[vertexId];
-	int motherId=-1;
-	if ( vertex.parentIndex()  ) {
-	  unsigned  motherGeantId = vertex.parentIndex(); 
-	  std::map<unsigned, unsigned >::iterator association = geantToIndex_.find( motherGeantId );
-	  if(association != geantToIndex_.end() )
-	    motherId = association->second;
-	  //int motherType = motherId == -1 ? 0 : theSimTracks[motherId].type();
-	  
-	  if ( theSimTracks[motherId].trackId() == (*iPhoTk)->trackId() ) {
-	    /// store this electron since it's from a converted photon
-	    trkFromConversion.push_back(&(*iSimTk ) );
-	  }
-	} 	 
-      } // loop over the SimTracks      
-       
-      if ( !trkFromConversion.empty() ) {
-	isAconversion=1;
-	nConv++;
-	convInd[iPho]=nConv;         
-	int convVtxId =  trkFromConversion[0]->vertIndex();
-	SimVertex convVtx = theSimVertices[convVtxId];
-	const math::XYZTLorentzVectorD& vtxPosition = convVtx.position();
-	// math::XYZTLorentzVectorD momentum = (*iPhoTk)->momentum(); // UNUSED
-	if ( nConv <= 10) {         
-	  if ( trkFromConversion.size() > 1) {
-	    // idTrk1_[iConv]= trkFromConversion[0]->trackId(); // UNUSED
-	    // idTrk2_[iConv]= trkFromConversion[1]->trackId(); // UNUSED
-	  } else {
-	    // idTrk1_[iConv]=trkFromConversion[0]->trackId(); // UNUSED
-	    // idTrk2_[iConv]=-1; // UNUSED
-	  }
-	}
-	iConv++;
-	   
-	result.push_back( EcalSimPhotonMCTruth(isAconversion, (*iPhoTk)->momentum(),   vtxPosition.pt(),  vtxPosition.z() , vtxPosition,   primVtx.position(), trkFromConversion ));
-       } else {
-         isAconversion=0;
-	 math::XYZTLorentzVectorD vtxPosition(0.,0.,0.,0.);
-         result.push_back( EcalSimPhotonMCTruth(isAconversion, (*iPhoTk)->momentum(),   vtxPosition.pt(),  vtxPosition.z() , vtxPosition,   primVtx.position(), trkFromConversion ));
-       }
-      iPho++;   
-    } // loop over the primary photons
-  }   // Event with one or two photons 
+  }
+
+  if (npv > 4) {  // ievtype = PYTHIA; // UNUSED
+  } else if (npv == 1) {
+    if (abs(partType1) == 11) { /* ievtype = SINGLE; ==UNUSED== */
+      ievflav = ELECTRON_FLAV;
+    } else if (partType1 == 111) { /* ievtype = SINGLE; ==UNUSED== */
+      ievflav = PIZERO_FLAV;
+    } else if (partType1 == 22) { /* ievtype = SINGLE; ==UNUSED== */
+      ievflav = PHOTON_FLAV;
+    }
+  } else if (npv == 2) {
+    if (abs(partType1) == 11 && abs(partType2) == 11) { /* ievtype = DOUBLE; ==UNUSED== */
+      ievflav = ELECTRON_FLAV;
+    } else if (partType1 == 111 && partType2 == 111) { /* ievtype = DOUBLE; ==UNUSED== */
+      ievflav = PIZERO_FLAV;
+    } else if (partType1 == 22 && partType2 == 22) { /* ievtype = DOUBLE; ==UNUSED== */
+      ievflav = PHOTON_FLAV;
+    }
+  }
+
+  //  Look into converted photons
+  int isAconversion = 0;
+  if (ievflav == PHOTON_FLAV) {
+    int nConv = 0;
+    int iConv = 0;
+    iPho = 0;
+    for (std::vector<SimTrack *>::iterator iPhoTk = photonTracks.begin(); iPhoTk != photonTracks.end(); ++iPhoTk) {
+      trkFromConversion.clear();
+      for (std::vector<SimTrack>::iterator iSimTk = theSimTracks.begin(); iSimTk != theSimTracks.end(); ++iSimTk) {
+        if ((*iSimTk).noVertex())
+          continue;
+        if ((*iSimTk).vertIndex() == iPV)
+          continue;
+        if (abs((*iSimTk).type()) != 11)
+          continue;
+        int vertexId = (*iSimTk).vertIndex();
+        SimVertex vertex = theSimVertices[vertexId];
+        int motherId = -1;
+        if (vertex.parentIndex()) {
+          unsigned motherGeantId = vertex.parentIndex();
+          std::map<unsigned, unsigned>::iterator association = geantToIndex_.find(motherGeantId);
+          if (association != geantToIndex_.end())
+            motherId = association->second;
+          // int motherType = motherId == -1 ? 0 :
+          // theSimTracks[motherId].type();
+
+          if (theSimTracks[motherId].trackId() == (*iPhoTk)->trackId()) {
+            /// store this electron since it's from a converted photon
+            trkFromConversion.push_back(&(*iSimTk));
+          }
+        }
+      }  // loop over the SimTracks
+
+      if (!trkFromConversion.empty()) {
+        isAconversion = 1;
+        nConv++;
+        convInd[iPho] = nConv;
+        int convVtxId = trkFromConversion[0]->vertIndex();
+        SimVertex convVtx = theSimVertices[convVtxId];
+        const math::XYZTLorentzVectorD &vtxPosition = convVtx.position();
+        // math::XYZTLorentzVectorD momentum = (*iPhoTk)->momentum(); // UNUSED
+        if (nConv <= 10) {
+          if (trkFromConversion.size() > 1) {
+            // idTrk1_[iConv]= trkFromConversion[0]->trackId(); // UNUSED
+            // idTrk2_[iConv]= trkFromConversion[1]->trackId(); // UNUSED
+          } else {
+            // idTrk1_[iConv]=trkFromConversion[0]->trackId(); // UNUSED
+            // idTrk2_[iConv]=-1; // UNUSED
+          }
+        }
+        iConv++;
+
+        result.push_back(EcalSimPhotonMCTruth(isAconversion,
+                                              (*iPhoTk)->momentum(),
+                                              vtxPosition.pt(),
+                                              vtxPosition.z(),
+                                              vtxPosition,
+                                              primVtx.position(),
+                                              trkFromConversion));
+      } else {
+        isAconversion = 0;
+        math::XYZTLorentzVectorD vtxPosition(0., 0., 0., 0.);
+        result.push_back(EcalSimPhotonMCTruth(isAconversion,
+                                              (*iPhoTk)->momentum(),
+                                              vtxPosition.pt(),
+                                              vtxPosition.z(),
+                                              vtxPosition,
+                                              primVtx.position(),
+                                              trkFromConversion));
+      }
+      iPho++;
+    }  // loop over the primary photons
+  }    // Event with one or two photons
 
   return result;
 }
 
-void ContainmentCorrectionAnalyzer::fillMcTruth(std::vector<SimTrack>& simTracks, std::vector<SimVertex>& simVertices ) {
-
+void ContainmentCorrectionAnalyzer::fillMcTruth(std::vector<SimTrack> &simTracks, std::vector<SimVertex> &simVertices) {
   unsigned nVtx = simVertices.size();
   unsigned nTks = simTracks.size();
-  if ( nVtx == 0 ) return;
-  // create a map associating geant particle id and position in the event SimTrack vector
-  for( unsigned it=0; it<nTks; ++it ) {
-    geantToIndex_[ simTracks[it].trackId() ] = it;
-  }  
+  if (nVtx == 0)
+    return;
+  // create a map associating geant particle id and position in the event
+  // SimTrack vector
+  for (unsigned it = 0; it < nTks; ++it) {
+    geantToIndex_[simTracks[it].trackId()] = it;
+  }
 }
-
diff --git a/Validation/EcalClusters/src/EcalSimPhotonMCTruth.cc b/Validation/EcalClusters/src/EcalSimPhotonMCTruth.cc
index 6b9c600b08cf4..38c3b7dae393f 100644
--- a/Validation/EcalClusters/src/EcalSimPhotonMCTruth.cc
+++ b/Validation/EcalClusters/src/EcalSimPhotonMCTruth.cc
@@ -2,14 +2,17 @@
 
 #include <iostream>
 
-EcalSimPhotonMCTruth::EcalSimPhotonMCTruth(int isAConversion,const math::XYZTLorentzVectorD& v, float rconv, float zconv,
-					   const math::XYZTLorentzVectorD& convVertex,  
-					   const math::XYZTLorentzVectorD& pV,  const std::vector<const SimTrack *>& tracks  ) :
-  isAConversion_(isAConversion),
-  thePhoton_(v), theR_(rconv), theZ_(zconv), theConvVertex_(convVertex), 
-  thePrimaryVertex_(pV), tracks_(tracks)  {
-}
-
-
-
-
+EcalSimPhotonMCTruth::EcalSimPhotonMCTruth(int isAConversion,
+                                           const math::XYZTLorentzVectorD &v,
+                                           float rconv,
+                                           float zconv,
+                                           const math::XYZTLorentzVectorD &convVertex,
+                                           const math::XYZTLorentzVectorD &pV,
+                                           const std::vector<const SimTrack *> &tracks)
+    : isAConversion_(isAConversion),
+      thePhoton_(v),
+      theR_(rconv),
+      theZ_(zconv),
+      theConvVertex_(convVertex),
+      thePrimaryVertex_(pV),
+      tracks_(tracks) {}
diff --git a/Validation/EcalClusters/src/EgammaBasicClusters.cc b/Validation/EcalClusters/src/EgammaBasicClusters.cc
index f80b6cf1985c7..1bce4fc381425 100644
--- a/Validation/EcalClusters/src/EgammaBasicClusters.cc
+++ b/Validation/EcalClusters/src/EgammaBasicClusters.cc
@@ -3,165 +3,169 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "DataFormats/EgammaReco/interface/BasicCluster.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/EgammaReco/interface/BasicCluster.h"
 
 #include "DQMServices/Core/interface/MonitorElement.h"
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-EgammaBasicClusters::EgammaBasicClusters( const edm::ParameterSet& ps ) :
-  barrelBasicClusterCollection_(consumes<reco::BasicClusterCollection>(ps.getParameter<edm::InputTag>("barrelBasicClusterCollection"))),
-  endcapBasicClusterCollection_(consumes<reco::BasicClusterCollection>(ps.getParameter<edm::InputTag>("endcapBasicClusterCollection"))),
-  hsSize_(ps, "Size"),
-  hsNumRecHits_(ps, "NumRecHits"),
-  hsET_(ps, "ET"),
-  hsEta_(ps, "Eta"),
-  hsPhi_(ps, "Phi"),
-  hsR_(ps, "R"),
-  hist_EB_BC_Size_(nullptr),
-  hist_EE_BC_Size_(nullptr),
-  hist_EB_BC_NumRecHits_(nullptr),
-  hist_EE_BC_NumRecHits_(nullptr),
-  hist_EB_BC_ET_(nullptr),
-  hist_EE_BC_ET_(nullptr),
-  hist_EB_BC_Eta_(nullptr),
-  hist_EE_BC_Eta_(nullptr),
-  hist_EB_BC_Phi_(nullptr),
-  hist_EE_BC_Phi_(nullptr),
-  hist_EB_BC_ET_vs_Eta_(nullptr),
-  hist_EB_BC_ET_vs_Phi_(nullptr),
-  hist_EE_BC_ET_vs_Eta_(nullptr),
-  hist_EE_BC_ET_vs_Phi_(nullptr),
-  hist_EE_BC_ET_vs_R_(nullptr)
-{
-}
-
-EgammaBasicClusters::~EgammaBasicClusters()
-{
-}
-
-void
-EgammaBasicClusters::bookHistograms(DQMStore::IBooker& _ibooker, edm::Run const&, edm::EventSetup const&)
-{
+EgammaBasicClusters::EgammaBasicClusters(const edm::ParameterSet &ps)
+    : barrelBasicClusterCollection_(
+          consumes<reco::BasicClusterCollection>(ps.getParameter<edm::InputTag>("barrelBasicClusterCollection"))),
+      endcapBasicClusterCollection_(
+          consumes<reco::BasicClusterCollection>(ps.getParameter<edm::InputTag>("endcapBasicClusterCollection"))),
+      hsSize_(ps, "Size"),
+      hsNumRecHits_(ps, "NumRecHits"),
+      hsET_(ps, "ET"),
+      hsEta_(ps, "Eta"),
+      hsPhi_(ps, "Phi"),
+      hsR_(ps, "R"),
+      hist_EB_BC_Size_(nullptr),
+      hist_EE_BC_Size_(nullptr),
+      hist_EB_BC_NumRecHits_(nullptr),
+      hist_EE_BC_NumRecHits_(nullptr),
+      hist_EB_BC_ET_(nullptr),
+      hist_EE_BC_ET_(nullptr),
+      hist_EB_BC_Eta_(nullptr),
+      hist_EE_BC_Eta_(nullptr),
+      hist_EB_BC_Phi_(nullptr),
+      hist_EE_BC_Phi_(nullptr),
+      hist_EB_BC_ET_vs_Eta_(nullptr),
+      hist_EB_BC_ET_vs_Phi_(nullptr),
+      hist_EE_BC_ET_vs_Eta_(nullptr),
+      hist_EE_BC_ET_vs_Phi_(nullptr),
+      hist_EE_BC_ET_vs_R_(nullptr) {}
+
+EgammaBasicClusters::~EgammaBasicClusters() {}
+
+void EgammaBasicClusters::bookHistograms(DQMStore::IBooker &_ibooker, edm::Run const &, edm::EventSetup const &) {
   _ibooker.setCurrentFolder("EcalClusterV/EcalBasicClusters/");
 
-  hist_EB_BC_Size_ 
-    = _ibooker.book1D("hist_EB_BC_Size_","# Basic Clusters in Barrel",
-                      hsSize_.bins, hsSize_.min, hsSize_.max);
-  hist_EE_BC_Size_ 
-    = _ibooker.book1D("hist_EE_BC_Size_","# Basic Clusters in Endcap",
-                      hsSize_.bins, hsSize_.min, hsSize_.max);
-
-  hist_EB_BC_NumRecHits_ 
-    = _ibooker.book1D("hist_EB_BC_NumRecHits_","# of RecHits in Basic Clusters in Barrel",
-                      hsNumRecHits_.bins, hsNumRecHits_.min, hsNumRecHits_.max);
-  hist_EE_BC_NumRecHits_ 
-    = _ibooker.book1D("hist_EE_BC_NumRecHits_","# of RecHits in Basic Clusters in Endcap",
-                      hsNumRecHits_.bins, hsNumRecHits_.min, hsNumRecHits_.max);
-
-  hist_EB_BC_ET_ 
-    = _ibooker.book1D("hist_EB_BC_ET_","ET of Basic Clusters in Barrel",
-                      hsET_.bins, hsET_.min, hsET_.max);
-  hist_EE_BC_ET_ 
-    = _ibooker.book1D("hist_EE_BC_ET_","ET of Basic Clusters in Endcap",
-                      hsET_.bins, hsET_.min, hsET_.max);
-
-  hist_EB_BC_Eta_ 
-    = _ibooker.book1D("hist_EB_BC_Eta_","Eta of Basic Clusters in Barrel",
-                      hsEta_.bins, hsEta_.min, hsEta_.max);
-  hist_EE_BC_Eta_ 
-    = _ibooker.book1D("hist_EE_BC_Eta_","Eta of Basic Clusters in Endcap",
-                      hsEta_.bins, hsEta_.min, hsEta_.max);
-
-  hist_EB_BC_Phi_
-    = _ibooker.book1D("hist_EB_BC_Phi_","Phi of Basic Clusters in Barrel",
-                      hsPhi_.bins, hsPhi_.min, hsPhi_.max);
-  hist_EE_BC_Phi_ 
-    = _ibooker.book1D("hist_EE_BC_Phi_","Phi of Basic Clusters in Endcap",
-                      hsPhi_.bins, hsPhi_.min, hsPhi_.max);
-
-	
-  hist_EB_BC_ET_vs_Eta_
-    = _ibooker.book2D( "hist_EB_BC_ET_vs_Eta_", "Basic Cluster ET versus Eta in Barrel", 
-                       hsET_.bins, hsET_.min, hsET_.max,
-                       hsEta_.bins, hsEta_.min, hsEta_.max );
-
-  hist_EB_BC_ET_vs_Phi_
-    = _ibooker.book2D( "hist_EB_BC_ET_vs_Phi_", "Basic Cluster ET versus Phi in Barrel", 
-                       hsET_.bins, hsET_.min, hsET_.max,
-                       hsPhi_.bins, hsPhi_.min, hsPhi_.max );
-
-  hist_EE_BC_ET_vs_Eta_
-    = _ibooker.book2D( "hist_EE_BC_ET_vs_Eta_", "Basic Cluster ET versus Eta in Endcap", 
-                       hsET_.bins, hsET_.min, hsET_.max,
-                       hsEta_.bins, hsEta_.min, hsEta_.max );
-
-  hist_EE_BC_ET_vs_Phi_
-    = _ibooker.book2D( "hist_EE_BC_ET_vs_Phi_", "Basic Cluster ET versus Phi in Endcap", 
-                       hsET_.bins, hsET_.min, hsET_.max,
-                       hsPhi_.bins, hsPhi_.min, hsPhi_.max );
-
-  hist_EE_BC_ET_vs_R_
-    = _ibooker.book2D( "hist_EE_BC_ET_vs_R_", "Basic Cluster ET versus Radius in Endcap", 
-                       hsET_.bins, hsET_.min, hsET_.max,
-                       hsR_.bins, hsR_.min, hsR_.max );
+  hist_EB_BC_Size_ =
+      _ibooker.book1D("hist_EB_BC_Size_", "# Basic Clusters in Barrel", hsSize_.bins, hsSize_.min, hsSize_.max);
+  hist_EE_BC_Size_ =
+      _ibooker.book1D("hist_EE_BC_Size_", "# Basic Clusters in Endcap", hsSize_.bins, hsSize_.min, hsSize_.max);
+
+  hist_EB_BC_NumRecHits_ = _ibooker.book1D("hist_EB_BC_NumRecHits_",
+                                           "# of RecHits in Basic Clusters in Barrel",
+                                           hsNumRecHits_.bins,
+                                           hsNumRecHits_.min,
+                                           hsNumRecHits_.max);
+  hist_EE_BC_NumRecHits_ = _ibooker.book1D("hist_EE_BC_NumRecHits_",
+                                           "# of RecHits in Basic Clusters in Endcap",
+                                           hsNumRecHits_.bins,
+                                           hsNumRecHits_.min,
+                                           hsNumRecHits_.max);
+
+  hist_EB_BC_ET_ =
+      _ibooker.book1D("hist_EB_BC_ET_", "ET of Basic Clusters in Barrel", hsET_.bins, hsET_.min, hsET_.max);
+  hist_EE_BC_ET_ =
+      _ibooker.book1D("hist_EE_BC_ET_", "ET of Basic Clusters in Endcap", hsET_.bins, hsET_.min, hsET_.max);
+
+  hist_EB_BC_Eta_ =
+      _ibooker.book1D("hist_EB_BC_Eta_", "Eta of Basic Clusters in Barrel", hsEta_.bins, hsEta_.min, hsEta_.max);
+  hist_EE_BC_Eta_ =
+      _ibooker.book1D("hist_EE_BC_Eta_", "Eta of Basic Clusters in Endcap", hsEta_.bins, hsEta_.min, hsEta_.max);
+
+  hist_EB_BC_Phi_ =
+      _ibooker.book1D("hist_EB_BC_Phi_", "Phi of Basic Clusters in Barrel", hsPhi_.bins, hsPhi_.min, hsPhi_.max);
+  hist_EE_BC_Phi_ =
+      _ibooker.book1D("hist_EE_BC_Phi_", "Phi of Basic Clusters in Endcap", hsPhi_.bins, hsPhi_.min, hsPhi_.max);
+
+  hist_EB_BC_ET_vs_Eta_ = _ibooker.book2D("hist_EB_BC_ET_vs_Eta_",
+                                          "Basic Cluster ET versus Eta in Barrel",
+                                          hsET_.bins,
+                                          hsET_.min,
+                                          hsET_.max,
+                                          hsEta_.bins,
+                                          hsEta_.min,
+                                          hsEta_.max);
+
+  hist_EB_BC_ET_vs_Phi_ = _ibooker.book2D("hist_EB_BC_ET_vs_Phi_",
+                                          "Basic Cluster ET versus Phi in Barrel",
+                                          hsET_.bins,
+                                          hsET_.min,
+                                          hsET_.max,
+                                          hsPhi_.bins,
+                                          hsPhi_.min,
+                                          hsPhi_.max);
+
+  hist_EE_BC_ET_vs_Eta_ = _ibooker.book2D("hist_EE_BC_ET_vs_Eta_",
+                                          "Basic Cluster ET versus Eta in Endcap",
+                                          hsET_.bins,
+                                          hsET_.min,
+                                          hsET_.max,
+                                          hsEta_.bins,
+                                          hsEta_.min,
+                                          hsEta_.max);
+
+  hist_EE_BC_ET_vs_Phi_ = _ibooker.book2D("hist_EE_BC_ET_vs_Phi_",
+                                          "Basic Cluster ET versus Phi in Endcap",
+                                          hsET_.bins,
+                                          hsET_.min,
+                                          hsET_.max,
+                                          hsPhi_.bins,
+                                          hsPhi_.min,
+                                          hsPhi_.max);
+
+  hist_EE_BC_ET_vs_R_ = _ibooker.book2D("hist_EE_BC_ET_vs_R_",
+                                        "Basic Cluster ET versus Radius in Endcap",
+                                        hsET_.bins,
+                                        hsET_.min,
+                                        hsET_.max,
+                                        hsR_.bins,
+                                        hsR_.min,
+                                        hsR_.max);
 }
 
-void
-EgammaBasicClusters::analyze( const edm::Event& evt, const edm::EventSetup&)
-{
+void EgammaBasicClusters::analyze(const edm::Event &evt, const edm::EventSetup &) {
   edm::Handle<reco::BasicClusterCollection> pBarrelBasicClusters;
   evt.getByToken(barrelBasicClusterCollection_, pBarrelBasicClusters);
   if (!pBarrelBasicClusters.isValid()) {
-
     Labels l;
-    labelsForToken(barrelBasicClusterCollection_,l);
-    edm::LogError("EgammaBasicClusters") << "Error! can't get collection with label " 
-                                         << l.module;
+    labelsForToken(barrelBasicClusterCollection_, l);
+    edm::LogError("EgammaBasicClusters") << "Error! can't get collection with label " << l.module;
   }
 
-  const reco::BasicClusterCollection* barrelBasicClusters = pBarrelBasicClusters.product();
+  const reco::BasicClusterCollection *barrelBasicClusters = pBarrelBasicClusters.product();
   hist_EB_BC_Size_->Fill(barrelBasicClusters->size());
 
-  for(reco::BasicClusterCollection::const_iterator aClus = barrelBasicClusters->begin(); 
-      aClus != barrelBasicClusters->end(); aClus++)
-    {
-      hist_EB_BC_NumRecHits_->Fill(aClus->size());
-      hist_EB_BC_ET_->Fill(aClus->energy()/std::cosh(aClus->position().eta()));
-      hist_EB_BC_Eta_->Fill(aClus->position().eta());
-      hist_EB_BC_Phi_->Fill(aClus->position().phi());
-		
-      hist_EB_BC_ET_vs_Eta_->Fill( aClus->energy()/std::cosh(aClus->position().eta()), aClus->eta() );
-      hist_EB_BC_ET_vs_Phi_->Fill( aClus->energy()/std::cosh(aClus->position().eta()), aClus->phi() );
-    }
+  for (reco::BasicClusterCollection::const_iterator aClus = barrelBasicClusters->begin();
+       aClus != barrelBasicClusters->end();
+       aClus++) {
+    hist_EB_BC_NumRecHits_->Fill(aClus->size());
+    hist_EB_BC_ET_->Fill(aClus->energy() / std::cosh(aClus->position().eta()));
+    hist_EB_BC_Eta_->Fill(aClus->position().eta());
+    hist_EB_BC_Phi_->Fill(aClus->position().phi());
+
+    hist_EB_BC_ET_vs_Eta_->Fill(aClus->energy() / std::cosh(aClus->position().eta()), aClus->eta());
+    hist_EB_BC_ET_vs_Phi_->Fill(aClus->energy() / std::cosh(aClus->position().eta()), aClus->phi());
+  }
 
   edm::Handle<reco::BasicClusterCollection> pEndcapBasicClusters;
 
   evt.getByToken(endcapBasicClusterCollection_, pEndcapBasicClusters);
   if (!pEndcapBasicClusters.isValid()) {
-
     Labels l;
-    labelsForToken(endcapBasicClusterCollection_,l);
-    edm::LogError("EgammaBasicClusters") << "Error! can't get collection with label " 
-                                         << l.module;
+    labelsForToken(endcapBasicClusterCollection_, l);
+    edm::LogError("EgammaBasicClusters") << "Error! can't get collection with label " << l.module;
   }
 
-  const reco::BasicClusterCollection* endcapBasicClusters = pEndcapBasicClusters.product();
+  const reco::BasicClusterCollection *endcapBasicClusters = pEndcapBasicClusters.product();
   hist_EE_BC_Size_->Fill(endcapBasicClusters->size());
 
-  for(reco::BasicClusterCollection::const_iterator aClus = endcapBasicClusters->begin(); 
-      aClus != endcapBasicClusters->end(); aClus++)
-    {
-      hist_EE_BC_NumRecHits_->Fill(aClus->size());
-      hist_EE_BC_ET_->Fill(aClus->energy()/std::cosh(aClus->position().eta()));
-      hist_EE_BC_Eta_->Fill(aClus->position().eta());
-      hist_EE_BC_Phi_->Fill(aClus->position().phi());
-
-      hist_EE_BC_ET_vs_Eta_->Fill( aClus->energy()/std::cosh(aClus->position().eta()), aClus->eta() );
-      hist_EE_BC_ET_vs_Phi_->Fill( aClus->energy()/std::cosh(aClus->position().eta()), aClus->phi() );
-      hist_EE_BC_ET_vs_R_->Fill( aClus->energy()/std::cosh(aClus->position().eta()), 
-                                 std::sqrt( std::pow(aClus->x(),2) + std::pow(aClus->y(),2) ) );
-
-    }
+  for (reco::BasicClusterCollection::const_iterator aClus = endcapBasicClusters->begin();
+       aClus != endcapBasicClusters->end();
+       aClus++) {
+    hist_EE_BC_NumRecHits_->Fill(aClus->size());
+    hist_EE_BC_ET_->Fill(aClus->energy() / std::cosh(aClus->position().eta()));
+    hist_EE_BC_Eta_->Fill(aClus->position().eta());
+    hist_EE_BC_Phi_->Fill(aClus->position().phi());
+
+    hist_EE_BC_ET_vs_Eta_->Fill(aClus->energy() / std::cosh(aClus->position().eta()), aClus->eta());
+    hist_EE_BC_ET_vs_Phi_->Fill(aClus->energy() / std::cosh(aClus->position().eta()), aClus->phi());
+    hist_EE_BC_ET_vs_R_->Fill(aClus->energy() / std::cosh(aClus->position().eta()),
+                              std::sqrt(std::pow(aClus->x(), 2) + std::pow(aClus->y(), 2)));
+  }
 }
diff --git a/Validation/EcalClusters/src/EgammaSuperClusters.cc b/Validation/EcalClusters/src/EgammaSuperClusters.cc
index d2543b66e36e4..62df96bbba7dc 100644
--- a/Validation/EcalClusters/src/EgammaSuperClusters.cc
+++ b/Validation/EcalClusters/src/EgammaSuperClusters.cc
@@ -7,343 +7,389 @@
 #include "RecoEcal/EgammaCoreTools/interface/EcalClusterLazyTools.h"
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/EgammaReco/interface/SuperCluster.h"
 #include "DataFormats/EgammaReco/interface/BasicCluster.h"
+#include "DataFormats/EgammaReco/interface/SuperCluster.h"
 #include "DataFormats/Math/interface/deltaPhi.h"
 
 #include "DQMServices/Core/interface/MonitorElement.h"
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-EgammaSuperClusters::EgammaSuperClusters( const edm::ParameterSet& ps ) :
-  MCTruthCollectionToken_(consumes<edm::HepMCProduct>(ps.getParameter<edm::InputTag>("MCTruthCollection"))),
-  barrelRawSuperClusterCollectionToken_(consumes<reco::SuperClusterCollection>(ps.getParameter<edm::InputTag>("barrelRawSuperClusterCollection"))),
-  barrelCorSuperClusterCollectionToken_(consumes<reco::SuperClusterCollection>(ps.getParameter<edm::InputTag>("barrelCorSuperClusterCollection"))),
-  endcapRawSuperClusterCollectionToken_(consumes<reco::SuperClusterCollection>(ps.getParameter<edm::InputTag>("endcapRawSuperClusterCollection"))),
-  endcapPreSuperClusterCollectionToken_(consumes<reco::SuperClusterCollection>(ps.getParameter<edm::InputTag>("endcapPreSuperClusterCollection"))),
-  endcapCorSuperClusterCollectionToken_(consumes<reco::SuperClusterCollection>(ps.getParameter<edm::InputTag>("endcapCorSuperClusterCollection"))),
-  barrelRecHitCollectionToken_(consumes<EcalRecHitCollection>(ps.getParameter<edm::InputTag>("barrelRecHitCollection"))),
-  endcapRecHitCollectionToken_(consumes<EcalRecHitCollection>(ps.getParameter<edm::InputTag>("endcapRecHitCollection"))),
-  hsSize_(ps, "Size"),
-  hsNumBC_(ps, "NumBC"),
-  hsET_(ps, "ET"),
-  hsEta_(ps, "Eta"),
-  hsPhi_(ps, "Phi"),
-  hsS1toS9_(ps, "S1toS9"),
-  hsS25toE_(ps, "S25toE"),
-  hsEoverTruth_(ps, "EoverTruth"),
-  hsdeltaR_(ps, "deltaR"),
-  hsphiWidth_(ps, "phiWidth"),
-  hsetaWidth_(ps, "etaWidth"),
-  hspreshowerE_(ps, "preshowerE"),
-  hsR_(ps, "R"),
-  hist_EB_RawSC_Size_(nullptr),
-  hist_EE_RawSC_Size_(nullptr),
-  hist_EB_CorSC_Size_(nullptr),
-  hist_EE_CorSC_Size_(nullptr),
-  hist_EE_PreSC_Size_(nullptr),
-  hist_EB_RawSC_NumBC_(nullptr),
-  hist_EE_RawSC_NumBC_(nullptr),
-  hist_EB_CorSC_NumBC_(nullptr),
-  hist_EE_CorSC_NumBC_(nullptr),
-  hist_EE_PreSC_NumBC_(nullptr),
-  hist_EB_RawSC_ET_(nullptr),
-  hist_EE_RawSC_ET_(nullptr),
-  hist_EB_CorSC_ET_(nullptr),
-  hist_EE_CorSC_ET_(nullptr),
-  hist_EE_PreSC_ET_(nullptr),
-  hist_EB_RawSC_Eta_(nullptr),
-  hist_EE_RawSC_Eta_(nullptr),
-  hist_EB_CorSC_Eta_(nullptr),
-  hist_EE_CorSC_Eta_(nullptr),
-  hist_EE_PreSC_Eta_(nullptr),
-  hist_EB_RawSC_Phi_(nullptr),
-  hist_EE_RawSC_Phi_(nullptr),
-  hist_EB_CorSC_Phi_(nullptr),
-  hist_EE_CorSC_Phi_(nullptr),
-  hist_EE_PreSC_Phi_(nullptr),
-  hist_EB_RawSC_S1toS9_(nullptr),
-  hist_EE_RawSC_S1toS9_(nullptr),
-  hist_EB_CorSC_S1toS9_(nullptr),
-  hist_EE_CorSC_S1toS9_(nullptr),
-  hist_EE_PreSC_S1toS9_(nullptr),
-  hist_EB_RawSC_S25toE_(nullptr),
-  hist_EE_RawSC_S25toE_(nullptr),
-  hist_EB_CorSC_S25toE_(nullptr),
-  hist_EE_CorSC_S25toE_(nullptr),
-  hist_EE_PreSC_S25toE_(nullptr),
-  hist_EB_RawSC_EoverTruth_(nullptr),
-  hist_EE_RawSC_EoverTruth_(nullptr),
-  hist_EB_CorSC_EoverTruth_(nullptr),
-  hist_EE_CorSC_EoverTruth_(nullptr),
-  hist_EE_PreSC_EoverTruth_(nullptr),
-  hist_EB_RawSC_deltaR_(nullptr),
-  hist_EE_RawSC_deltaR_(nullptr),
-  hist_EB_CorSC_deltaR_(nullptr),
-  hist_EE_CorSC_deltaR_(nullptr),
-  hist_EE_PreSC_deltaR_(nullptr),
-  hist_EE_PreSC_preshowerE_(nullptr),
-  hist_EE_CorSC_preshowerE_(nullptr),
-  hist_EE_CorSC_phiWidth_(nullptr),
-  hist_EB_CorSC_phiWidth_(nullptr),
-  hist_EE_CorSC_etaWidth_(nullptr),
-  hist_EB_CorSC_etaWidth_(nullptr),
-  hist_EB_CorSC_ET_vs_Eta_(nullptr),
-  hist_EB_CorSC_ET_vs_Phi_(nullptr),
-  hist_EE_CorSC_ET_vs_Eta_(nullptr),
-  hist_EE_CorSC_ET_vs_Phi_(nullptr),
-  hist_EE_CorSC_ET_vs_R_(nullptr)
-{
-}
+EgammaSuperClusters::EgammaSuperClusters(const edm::ParameterSet &ps)
+    : MCTruthCollectionToken_(consumes<edm::HepMCProduct>(ps.getParameter<edm::InputTag>("MCTruthCollection"))),
+      barrelRawSuperClusterCollectionToken_(
+          consumes<reco::SuperClusterCollection>(ps.getParameter<edm::InputTag>("barrelRawSuperClusterCollection"))),
+      barrelCorSuperClusterCollectionToken_(
+          consumes<reco::SuperClusterCollection>(ps.getParameter<edm::InputTag>("barrelCorSuperClusterCollection"))),
+      endcapRawSuperClusterCollectionToken_(
+          consumes<reco::SuperClusterCollection>(ps.getParameter<edm::InputTag>("endcapRawSuperClusterCollection"))),
+      endcapPreSuperClusterCollectionToken_(
+          consumes<reco::SuperClusterCollection>(ps.getParameter<edm::InputTag>("endcapPreSuperClusterCollection"))),
+      endcapCorSuperClusterCollectionToken_(
+          consumes<reco::SuperClusterCollection>(ps.getParameter<edm::InputTag>("endcapCorSuperClusterCollection"))),
+      barrelRecHitCollectionToken_(
+          consumes<EcalRecHitCollection>(ps.getParameter<edm::InputTag>("barrelRecHitCollection"))),
+      endcapRecHitCollectionToken_(
+          consumes<EcalRecHitCollection>(ps.getParameter<edm::InputTag>("endcapRecHitCollection"))),
+      hsSize_(ps, "Size"),
+      hsNumBC_(ps, "NumBC"),
+      hsET_(ps, "ET"),
+      hsEta_(ps, "Eta"),
+      hsPhi_(ps, "Phi"),
+      hsS1toS9_(ps, "S1toS9"),
+      hsS25toE_(ps, "S25toE"),
+      hsEoverTruth_(ps, "EoverTruth"),
+      hsdeltaR_(ps, "deltaR"),
+      hsphiWidth_(ps, "phiWidth"),
+      hsetaWidth_(ps, "etaWidth"),
+      hspreshowerE_(ps, "preshowerE"),
+      hsR_(ps, "R"),
+      hist_EB_RawSC_Size_(nullptr),
+      hist_EE_RawSC_Size_(nullptr),
+      hist_EB_CorSC_Size_(nullptr),
+      hist_EE_CorSC_Size_(nullptr),
+      hist_EE_PreSC_Size_(nullptr),
+      hist_EB_RawSC_NumBC_(nullptr),
+      hist_EE_RawSC_NumBC_(nullptr),
+      hist_EB_CorSC_NumBC_(nullptr),
+      hist_EE_CorSC_NumBC_(nullptr),
+      hist_EE_PreSC_NumBC_(nullptr),
+      hist_EB_RawSC_ET_(nullptr),
+      hist_EE_RawSC_ET_(nullptr),
+      hist_EB_CorSC_ET_(nullptr),
+      hist_EE_CorSC_ET_(nullptr),
+      hist_EE_PreSC_ET_(nullptr),
+      hist_EB_RawSC_Eta_(nullptr),
+      hist_EE_RawSC_Eta_(nullptr),
+      hist_EB_CorSC_Eta_(nullptr),
+      hist_EE_CorSC_Eta_(nullptr),
+      hist_EE_PreSC_Eta_(nullptr),
+      hist_EB_RawSC_Phi_(nullptr),
+      hist_EE_RawSC_Phi_(nullptr),
+      hist_EB_CorSC_Phi_(nullptr),
+      hist_EE_CorSC_Phi_(nullptr),
+      hist_EE_PreSC_Phi_(nullptr),
+      hist_EB_RawSC_S1toS9_(nullptr),
+      hist_EE_RawSC_S1toS9_(nullptr),
+      hist_EB_CorSC_S1toS9_(nullptr),
+      hist_EE_CorSC_S1toS9_(nullptr),
+      hist_EE_PreSC_S1toS9_(nullptr),
+      hist_EB_RawSC_S25toE_(nullptr),
+      hist_EE_RawSC_S25toE_(nullptr),
+      hist_EB_CorSC_S25toE_(nullptr),
+      hist_EE_CorSC_S25toE_(nullptr),
+      hist_EE_PreSC_S25toE_(nullptr),
+      hist_EB_RawSC_EoverTruth_(nullptr),
+      hist_EE_RawSC_EoverTruth_(nullptr),
+      hist_EB_CorSC_EoverTruth_(nullptr),
+      hist_EE_CorSC_EoverTruth_(nullptr),
+      hist_EE_PreSC_EoverTruth_(nullptr),
+      hist_EB_RawSC_deltaR_(nullptr),
+      hist_EE_RawSC_deltaR_(nullptr),
+      hist_EB_CorSC_deltaR_(nullptr),
+      hist_EE_CorSC_deltaR_(nullptr),
+      hist_EE_PreSC_deltaR_(nullptr),
+      hist_EE_PreSC_preshowerE_(nullptr),
+      hist_EE_CorSC_preshowerE_(nullptr),
+      hist_EE_CorSC_phiWidth_(nullptr),
+      hist_EB_CorSC_phiWidth_(nullptr),
+      hist_EE_CorSC_etaWidth_(nullptr),
+      hist_EB_CorSC_etaWidth_(nullptr),
+      hist_EB_CorSC_ET_vs_Eta_(nullptr),
+      hist_EB_CorSC_ET_vs_Phi_(nullptr),
+      hist_EE_CorSC_ET_vs_Eta_(nullptr),
+      hist_EE_CorSC_ET_vs_Phi_(nullptr),
+      hist_EE_CorSC_ET_vs_R_(nullptr) {}
 
-EgammaSuperClusters::~EgammaSuperClusters()
-{
-}
+EgammaSuperClusters::~EgammaSuperClusters() {}
 
-void
-EgammaSuperClusters::bookHistograms(DQMStore::IBooker& _ibooker, edm::Run const&, edm::EventSetup const&)
-{
+void EgammaSuperClusters::bookHistograms(DQMStore::IBooker &_ibooker, edm::Run const &, edm::EventSetup const &) {
   _ibooker.setCurrentFolder("EcalClusterV/EcalSuperClusters/");
 
   // Number of SuperClusters
   //
-  hist_EB_RawSC_Size_ 
-    = _ibooker.book1D("hist_EB_RawSC_Size_","# Raw SuperClusters in Barrel",
-                      hsSize_.bins, hsSize_.min, hsSize_.max);
-  hist_EE_RawSC_Size_ 
-    = _ibooker.book1D("hist_EE_RawSC_Size_","# Raw SuperClusters in Endcap",
-                      hsSize_.bins, hsSize_.min, hsSize_.max);
-  hist_EB_CorSC_Size_
-    = _ibooker.book1D("hist_EB_CorSC_Size_","# Corrected SuperClusters in Barrel",
-                      hsSize_.bins, hsSize_.min, hsSize_.max);
-  hist_EE_CorSC_Size_
-    = _ibooker.book1D("hist_EE_CorSC_Size_","# Corrected SuperClusters in Endcap",
-                      hsSize_.bins, hsSize_.min, hsSize_.max);
-  hist_EE_PreSC_Size_
-    = _ibooker.book1D("hist_EE_PreSC_Size_","# SuperClusters with Preshower in Endcap",
-                      hsSize_.bins, hsSize_.min, hsSize_.max);
-  
+  hist_EB_RawSC_Size_ =
+      _ibooker.book1D("hist_EB_RawSC_Size_", "# Raw SuperClusters in Barrel", hsSize_.bins, hsSize_.min, hsSize_.max);
+  hist_EE_RawSC_Size_ =
+      _ibooker.book1D("hist_EE_RawSC_Size_", "# Raw SuperClusters in Endcap", hsSize_.bins, hsSize_.min, hsSize_.max);
+  hist_EB_CorSC_Size_ = _ibooker.book1D(
+      "hist_EB_CorSC_Size_", "# Corrected SuperClusters in Barrel", hsSize_.bins, hsSize_.min, hsSize_.max);
+  hist_EE_CorSC_Size_ = _ibooker.book1D(
+      "hist_EE_CorSC_Size_", "# Corrected SuperClusters in Endcap", hsSize_.bins, hsSize_.min, hsSize_.max);
+  hist_EE_PreSC_Size_ = _ibooker.book1D(
+      "hist_EE_PreSC_Size_", "# SuperClusters with Preshower in Endcap", hsSize_.bins, hsSize_.min, hsSize_.max);
+
   // Number of BasicClusters in SuperCluster
   //
-  hist_EB_RawSC_NumBC_ 
-    = _ibooker.book1D("hist_EB_RawSC_NumBC_","# of Basic Clusters in Raw Super Clusters in Barrel",
-                      hsNumBC_.bins, hsNumBC_.min, hsNumBC_.max);
-  hist_EE_RawSC_NumBC_ 
-    = _ibooker.book1D("hist_EE_RawSC_NumBC_","# of Basic Clusters in Raw Super Clusters in Endcap",
-                      hsNumBC_.bins, hsNumBC_.min, hsNumBC_.max);
-  hist_EB_CorSC_NumBC_
-    = _ibooker.book1D("hist_EB_CorSC_NumBC_","# of Basic Clusters in Corrected SuperClusters in Barrel",
-                      hsNumBC_.bins, hsNumBC_.min, hsNumBC_.max);
-  hist_EE_CorSC_NumBC_
-    = _ibooker.book1D("hist_EE_CorSC_NumBC_","# of Basic Clusters in Corrected SuperClusters in Endcap",
-                      hsNumBC_.bins, hsNumBC_.min, hsNumBC_.max);
-  hist_EE_PreSC_NumBC_
-    = _ibooker.book1D("hist_EE_PreSC_NumBC_","# of Basic Clusters in SuperClusters with Preshower in Endcap",
-                      hsNumBC_.bins, hsNumBC_.min, hsNumBC_.max);
-  
+  hist_EB_RawSC_NumBC_ = _ibooker.book1D("hist_EB_RawSC_NumBC_",
+                                         "# of Basic Clusters in Raw Super Clusters in Barrel",
+                                         hsNumBC_.bins,
+                                         hsNumBC_.min,
+                                         hsNumBC_.max);
+  hist_EE_RawSC_NumBC_ = _ibooker.book1D("hist_EE_RawSC_NumBC_",
+                                         "# of Basic Clusters in Raw Super Clusters in Endcap",
+                                         hsNumBC_.bins,
+                                         hsNumBC_.min,
+                                         hsNumBC_.max);
+  hist_EB_CorSC_NumBC_ = _ibooker.book1D("hist_EB_CorSC_NumBC_",
+                                         "# of Basic Clusters in Corrected SuperClusters in Barrel",
+                                         hsNumBC_.bins,
+                                         hsNumBC_.min,
+                                         hsNumBC_.max);
+  hist_EE_CorSC_NumBC_ = _ibooker.book1D("hist_EE_CorSC_NumBC_",
+                                         "# of Basic Clusters in Corrected SuperClusters in Endcap",
+                                         hsNumBC_.bins,
+                                         hsNumBC_.min,
+                                         hsNumBC_.max);
+  hist_EE_PreSC_NumBC_ = _ibooker.book1D("hist_EE_PreSC_NumBC_",
+                                         "# of Basic Clusters in SuperClusters with Preshower in Endcap",
+                                         hsNumBC_.bins,
+                                         hsNumBC_.min,
+                                         hsNumBC_.max);
+
   // ET distribution of SuperClusters
   //
-  hist_EB_RawSC_ET_ 
-    = _ibooker.book1D("hist_EB_RawSC_ET_","ET of Raw SuperClusters in Barrel",
-                      hsET_.bins, hsET_.min, hsET_.max);
-  hist_EE_RawSC_ET_ 
-    = _ibooker.book1D("hist_EE_RawSC_ET_","ET of Raw SuperClusters in Endcap",
-                      hsET_.bins, hsET_.min, hsET_.max);
-  hist_EB_CorSC_ET_
-    = _ibooker.book1D("hist_EB_CorSC_ET_","ET of Corrected SuperClusters in Barrel",
-                      hsET_.bins, hsET_.min, hsET_.max);
-  hist_EE_CorSC_ET_
-    = _ibooker.book1D("hist_EE_CorSC_ET_","ET of Corrected SuperClusters in Endcap",
-                      hsET_.bins, hsET_.min, hsET_.max);
-  hist_EE_PreSC_ET_
-    = _ibooker.book1D("hist_EE_PreSC_ET_","ET of SuperClusters with Preshower in Endcap",
-                      hsET_.bins, hsET_.min, hsET_.max);
-  
+  hist_EB_RawSC_ET_ =
+      _ibooker.book1D("hist_EB_RawSC_ET_", "ET of Raw SuperClusters in Barrel", hsET_.bins, hsET_.min, hsET_.max);
+  hist_EE_RawSC_ET_ =
+      _ibooker.book1D("hist_EE_RawSC_ET_", "ET of Raw SuperClusters in Endcap", hsET_.bins, hsET_.min, hsET_.max);
+  hist_EB_CorSC_ET_ =
+      _ibooker.book1D("hist_EB_CorSC_ET_", "ET of Corrected SuperClusters in Barrel", hsET_.bins, hsET_.min, hsET_.max);
+  hist_EE_CorSC_ET_ =
+      _ibooker.book1D("hist_EE_CorSC_ET_", "ET of Corrected SuperClusters in Endcap", hsET_.bins, hsET_.min, hsET_.max);
+  hist_EE_PreSC_ET_ = _ibooker.book1D(
+      "hist_EE_PreSC_ET_", "ET of SuperClusters with Preshower in Endcap", hsET_.bins, hsET_.min, hsET_.max);
+
   // Eta distribution of SuperClusters
   //
-  hist_EB_RawSC_Eta_ 
-    = _ibooker.book1D("hist_EB_RawSC_Eta_","Eta of Raw SuperClusters in Barrel",
-                      hsEta_.bins, hsEta_.min, hsEta_.max);
-  hist_EE_RawSC_Eta_ 
-    = _ibooker.book1D("hist_EE_RawSC_Eta_","Eta of Raw SuperClusters in Endcap",
-                      hsEta_.bins, hsEta_.min, hsEta_.max);
-  hist_EB_CorSC_Eta_
-    = _ibooker.book1D("hist_EB_CorSC_Eta_","Eta of Corrected SuperClusters in Barrel",
-                      hsEta_.bins, hsEta_.min, hsEta_.max);
-  hist_EE_CorSC_Eta_
-    = _ibooker.book1D("hist_EE_CorSC_Eta_","Eta of Corrected SuperClusters in Endcap",
-                      hsEta_.bins, hsEta_.min, hsEta_.max);
-  hist_EE_PreSC_Eta_
-    = _ibooker.book1D("hist_EE_PreSC_Eta_","Eta of SuperClusters with Preshower in Endcap",
-                      hsEta_.bins, hsEta_.min, hsEta_.max);
-  
+  hist_EB_RawSC_Eta_ =
+      _ibooker.book1D("hist_EB_RawSC_Eta_", "Eta of Raw SuperClusters in Barrel", hsEta_.bins, hsEta_.min, hsEta_.max);
+  hist_EE_RawSC_Eta_ =
+      _ibooker.book1D("hist_EE_RawSC_Eta_", "Eta of Raw SuperClusters in Endcap", hsEta_.bins, hsEta_.min, hsEta_.max);
+  hist_EB_CorSC_Eta_ = _ibooker.book1D(
+      "hist_EB_CorSC_Eta_", "Eta of Corrected SuperClusters in Barrel", hsEta_.bins, hsEta_.min, hsEta_.max);
+  hist_EE_CorSC_Eta_ = _ibooker.book1D(
+      "hist_EE_CorSC_Eta_", "Eta of Corrected SuperClusters in Endcap", hsEta_.bins, hsEta_.min, hsEta_.max);
+  hist_EE_PreSC_Eta_ = _ibooker.book1D(
+      "hist_EE_PreSC_Eta_", "Eta of SuperClusters with Preshower in Endcap", hsEta_.bins, hsEta_.min, hsEta_.max);
+
   // Phi distribution of SuperClusters
   //
-  hist_EB_RawSC_Phi_
-    = _ibooker.book1D("hist_EB_RawSC_Phi_","Phi of Raw SuperClusters in Barrel",
-                      hsPhi_.bins, hsPhi_.min, hsPhi_.max);
-  hist_EE_RawSC_Phi_
-    = _ibooker.book1D("hist_EE_RawSC_Phi_","Phi of Raw SuperClusters in Endcap",
-                      hsPhi_.bins, hsPhi_.min, hsPhi_.max);
-  hist_EB_CorSC_Phi_
-    = _ibooker.book1D("hist_EB_CorSC_Phi_","Phi of Corrected SuperClusters in Barrel",
-                      hsPhi_.bins, hsPhi_.min, hsPhi_.max);
-  hist_EE_CorSC_Phi_
-    = _ibooker.book1D("hist_EE_CorSC_Phi_","Phi of Corrected SuperClusters in Endcap",
-                      hsPhi_.bins, hsPhi_.min, hsPhi_.max);
-  hist_EE_PreSC_Phi_
-    = _ibooker.book1D("hist_EE_PreSC_Phi_","Phi of SuperClusters with Preshower in Endcap",
-                      hsPhi_.bins, hsPhi_.min, hsPhi_.max);
-  
+  hist_EB_RawSC_Phi_ =
+      _ibooker.book1D("hist_EB_RawSC_Phi_", "Phi of Raw SuperClusters in Barrel", hsPhi_.bins, hsPhi_.min, hsPhi_.max);
+  hist_EE_RawSC_Phi_ =
+      _ibooker.book1D("hist_EE_RawSC_Phi_", "Phi of Raw SuperClusters in Endcap", hsPhi_.bins, hsPhi_.min, hsPhi_.max);
+  hist_EB_CorSC_Phi_ = _ibooker.book1D(
+      "hist_EB_CorSC_Phi_", "Phi of Corrected SuperClusters in Barrel", hsPhi_.bins, hsPhi_.min, hsPhi_.max);
+  hist_EE_CorSC_Phi_ = _ibooker.book1D(
+      "hist_EE_CorSC_Phi_", "Phi of Corrected SuperClusters in Endcap", hsPhi_.bins, hsPhi_.min, hsPhi_.max);
+  hist_EE_PreSC_Phi_ = _ibooker.book1D(
+      "hist_EE_PreSC_Phi_", "Phi of SuperClusters with Preshower in Endcap", hsPhi_.bins, hsPhi_.min, hsPhi_.max);
+
   // S1/S9 distribution of SuperClusters
   //
-  hist_EB_RawSC_S1toS9_ 
-    = _ibooker.book1D("hist_EB_RawSC_S1toS9_","S1/S9 of Raw Super Clusters in Barrel",
-                      hsS1toS9_.bins, hsS1toS9_.min, hsS1toS9_.max);
-  hist_EE_RawSC_S1toS9_ 
-    = _ibooker.book1D("hist_EE_RawSC_S1toS9_","S1/S9 of Raw Super Clusters in Endcap",
-                      hsS1toS9_.bins, hsS1toS9_.min, hsS1toS9_.max);
-  hist_EB_CorSC_S1toS9_
-    = _ibooker.book1D("hist_EB_CorSC_S1toS9_","S1/S9 of Corrected SuperClusters in Barrel",
-                      hsS1toS9_.bins, hsS1toS9_.min, hsS1toS9_.max);
-  hist_EE_CorSC_S1toS9_
-    = _ibooker.book1D("hist_EE_CorSC_S1toS9_","S1/S9 of Corrected SuperClusters in Endcap",
-                      hsS1toS9_.bins, hsS1toS9_.min, hsS1toS9_.max);
-  hist_EE_PreSC_S1toS9_
-    = _ibooker.book1D("hist_EE_PreSC_S1toS9_","S1/S9 of SuperClusters with Preshower in Endcap",
-                      hsS1toS9_.bins, hsS1toS9_.min, hsS1toS9_.max);
-  
+  hist_EB_RawSC_S1toS9_ = _ibooker.book1D(
+      "hist_EB_RawSC_S1toS9_", "S1/S9 of Raw Super Clusters in Barrel", hsS1toS9_.bins, hsS1toS9_.min, hsS1toS9_.max);
+  hist_EE_RawSC_S1toS9_ = _ibooker.book1D(
+      "hist_EE_RawSC_S1toS9_", "S1/S9 of Raw Super Clusters in Endcap", hsS1toS9_.bins, hsS1toS9_.min, hsS1toS9_.max);
+  hist_EB_CorSC_S1toS9_ = _ibooker.book1D("hist_EB_CorSC_S1toS9_",
+                                          "S1/S9 of Corrected SuperClusters in Barrel",
+                                          hsS1toS9_.bins,
+                                          hsS1toS9_.min,
+                                          hsS1toS9_.max);
+  hist_EE_CorSC_S1toS9_ = _ibooker.book1D("hist_EE_CorSC_S1toS9_",
+                                          "S1/S9 of Corrected SuperClusters in Endcap",
+                                          hsS1toS9_.bins,
+                                          hsS1toS9_.min,
+                                          hsS1toS9_.max);
+  hist_EE_PreSC_S1toS9_ = _ibooker.book1D("hist_EE_PreSC_S1toS9_",
+                                          "S1/S9 of SuperClusters with Preshower in Endcap",
+                                          hsS1toS9_.bins,
+                                          hsS1toS9_.min,
+                                          hsS1toS9_.max);
+
   // S25/E distribution of SuperClusters
   //
-  hist_EB_RawSC_S25toE_ 
-    = _ibooker.book1D("hist_EB_RawSC_S25toE_","S25/E of Raw Super Clusters in Barrel",
-                      hsS25toE_.bins, hsS25toE_.min, hsS25toE_.max);
-  hist_EE_RawSC_S25toE_ 
-    = _ibooker.book1D("hist_EE_RawSC_S25toE_","S25/E of Raw Super Clusters in Endcap",
-                      hsS25toE_.bins, hsS25toE_.min, hsS25toE_.max);
-  hist_EB_CorSC_S25toE_
-    = _ibooker.book1D("hist_EB_CorSC_S25toE_","S25/E of Corrected SuperClusters in Barrel",
-                      hsS25toE_.bins, hsS25toE_.min, hsS25toE_.max);
-  hist_EE_CorSC_S25toE_
-    = _ibooker.book1D("hist_EE_CorSC_S25toE_","S25/E of Corrected SuperClusters in Endcap",
-                      hsS25toE_.bins, hsS25toE_.min, hsS25toE_.max);
-  hist_EE_PreSC_S25toE_
-    = _ibooker.book1D("hist_EE_PreSC_S25toE_","S25/E of SuperClusters with Preshower in Endcap",
-                      hsS25toE_.bins, hsS25toE_.min, hsS25toE_.max);
-  
+  hist_EB_RawSC_S25toE_ = _ibooker.book1D(
+      "hist_EB_RawSC_S25toE_", "S25/E of Raw Super Clusters in Barrel", hsS25toE_.bins, hsS25toE_.min, hsS25toE_.max);
+  hist_EE_RawSC_S25toE_ = _ibooker.book1D(
+      "hist_EE_RawSC_S25toE_", "S25/E of Raw Super Clusters in Endcap", hsS25toE_.bins, hsS25toE_.min, hsS25toE_.max);
+  hist_EB_CorSC_S25toE_ = _ibooker.book1D("hist_EB_CorSC_S25toE_",
+                                          "S25/E of Corrected SuperClusters in Barrel",
+                                          hsS25toE_.bins,
+                                          hsS25toE_.min,
+                                          hsS25toE_.max);
+  hist_EE_CorSC_S25toE_ = _ibooker.book1D("hist_EE_CorSC_S25toE_",
+                                          "S25/E of Corrected SuperClusters in Endcap",
+                                          hsS25toE_.bins,
+                                          hsS25toE_.min,
+                                          hsS25toE_.max);
+  hist_EE_PreSC_S25toE_ = _ibooker.book1D("hist_EE_PreSC_S25toE_",
+                                          "S25/E of SuperClusters with Preshower in Endcap",
+                                          hsS25toE_.bins,
+                                          hsS25toE_.min,
+                                          hsS25toE_.max);
+
   // E/E(true) distribution of SuperClusters
   //
-  hist_EB_RawSC_EoverTruth_ 
-    = _ibooker.book1D("hist_EB_RawSC_EoverTruth_","E/True E of Raw SuperClusters in Barrel",	
-                      hsEoverTruth_.bins, hsEoverTruth_.min, hsEoverTruth_.max);
-  hist_EE_RawSC_EoverTruth_ 
-    = _ibooker.book1D("hist_EE_RawSC_EoverTruth_","E/True E of Raw SuperClusters in Endcap",
-                      hsEoverTruth_.bins, hsEoverTruth_.min, hsEoverTruth_.max);
-  hist_EB_CorSC_EoverTruth_
-    = _ibooker.book1D("hist_EB_CorSC_EoverTruth_","E/True E of Corrected SuperClusters in Barrel",
-                      hsEoverTruth_.bins, hsEoverTruth_.min, hsEoverTruth_.max);
-  hist_EE_CorSC_EoverTruth_
-    = _ibooker.book1D("hist_EE_CorSC_EoverTruth_","E/True E of Corrected SuperClusters in Endcap",
-                      hsEoverTruth_.bins, hsEoverTruth_.min, hsEoverTruth_.max);
-  hist_EE_PreSC_EoverTruth_
-    = _ibooker.book1D("hist_EE_PreSC_EoverTruth_","E/True E of SuperClusters with Preshower in Endcap",
-                      hsEoverTruth_.bins, hsEoverTruth_.min, hsEoverTruth_.max);
-  
+  hist_EB_RawSC_EoverTruth_ = _ibooker.book1D("hist_EB_RawSC_EoverTruth_",
+                                              "E/True E of Raw SuperClusters in Barrel",
+                                              hsEoverTruth_.bins,
+                                              hsEoverTruth_.min,
+                                              hsEoverTruth_.max);
+  hist_EE_RawSC_EoverTruth_ = _ibooker.book1D("hist_EE_RawSC_EoverTruth_",
+                                              "E/True E of Raw SuperClusters in Endcap",
+                                              hsEoverTruth_.bins,
+                                              hsEoverTruth_.min,
+                                              hsEoverTruth_.max);
+  hist_EB_CorSC_EoverTruth_ = _ibooker.book1D("hist_EB_CorSC_EoverTruth_",
+                                              "E/True E of Corrected SuperClusters in Barrel",
+                                              hsEoverTruth_.bins,
+                                              hsEoverTruth_.min,
+                                              hsEoverTruth_.max);
+  hist_EE_CorSC_EoverTruth_ = _ibooker.book1D("hist_EE_CorSC_EoverTruth_",
+                                              "E/True E of Corrected SuperClusters in Endcap",
+                                              hsEoverTruth_.bins,
+                                              hsEoverTruth_.min,
+                                              hsEoverTruth_.max);
+  hist_EE_PreSC_EoverTruth_ = _ibooker.book1D("hist_EE_PreSC_EoverTruth_",
+                                              "E/True E of SuperClusters with Preshower in Endcap",
+                                              hsEoverTruth_.bins,
+                                              hsEoverTruth_.min,
+                                              hsEoverTruth_.max);
+
   // dR distribution of SuperClusters from truth
   //
-  hist_EB_RawSC_deltaR_ 
-    = _ibooker.book1D("hist_EB_RawSC_deltaR_","dR to MC truth of Raw Super Clusters in Barrel",
-                      hsdeltaR_.bins, hsdeltaR_.min, hsdeltaR_.max);
-  hist_EE_RawSC_deltaR_ 
-    = _ibooker.book1D("hist_EE_RawSC_deltaR_","dR to MC truth of Raw Super Clusters in Endcap",
-                      hsdeltaR_.bins, hsdeltaR_.min, hsdeltaR_.max);
-  hist_EB_CorSC_deltaR_
-    = _ibooker.book1D("hist_EB_CorSC_deltaR_","dR to MC truth of Corrected SuperClusters in Barrel",
-                      hsdeltaR_.bins, hsdeltaR_.min, hsdeltaR_.max);
-  hist_EE_CorSC_deltaR_
-    = _ibooker.book1D("hist_EE_CorSC_deltaR_","dR to MC truth of Corrected SuperClusters in Endcap",
-                      hsdeltaR_.bins, hsdeltaR_.min, hsdeltaR_.max);
-  hist_EE_PreSC_deltaR_
-    = _ibooker.book1D("hist_EE_PreSC_deltaR_","dR to MC truth of SuperClusters with Preshower in Endcap",
-                      hsdeltaR_.bins, hsdeltaR_.min, hsdeltaR_.max);
-  
+  hist_EB_RawSC_deltaR_ = _ibooker.book1D("hist_EB_RawSC_deltaR_",
+                                          "dR to MC truth of Raw Super Clusters in Barrel",
+                                          hsdeltaR_.bins,
+                                          hsdeltaR_.min,
+                                          hsdeltaR_.max);
+  hist_EE_RawSC_deltaR_ = _ibooker.book1D("hist_EE_RawSC_deltaR_",
+                                          "dR to MC truth of Raw Super Clusters in Endcap",
+                                          hsdeltaR_.bins,
+                                          hsdeltaR_.min,
+                                          hsdeltaR_.max);
+  hist_EB_CorSC_deltaR_ = _ibooker.book1D("hist_EB_CorSC_deltaR_",
+                                          "dR to MC truth of Corrected SuperClusters in Barrel",
+                                          hsdeltaR_.bins,
+                                          hsdeltaR_.min,
+                                          hsdeltaR_.max);
+  hist_EE_CorSC_deltaR_ = _ibooker.book1D("hist_EE_CorSC_deltaR_",
+                                          "dR to MC truth of Corrected SuperClusters in Endcap",
+                                          hsdeltaR_.bins,
+                                          hsdeltaR_.min,
+                                          hsdeltaR_.max);
+  hist_EE_PreSC_deltaR_ = _ibooker.book1D("hist_EE_PreSC_deltaR_",
+                                          "dR to MC truth of SuperClusters with Preshower in Endcap",
+                                          hsdeltaR_.bins,
+                                          hsdeltaR_.min,
+                                          hsdeltaR_.max);
+
   // phi width stored in corrected SuperClusters
-  hist_EB_CorSC_phiWidth_
-    = _ibooker.book1D("hist_EB_CorSC_phiWidth_","phiWidth of Corrected Super Clusters in Barrel",
-                      hsphiWidth_.bins, hsphiWidth_.min, hsphiWidth_.max);
-  hist_EE_CorSC_phiWidth_
-    = _ibooker.book1D("hist_EE_CorSC_phiWidth_","phiWidth of Corrected Super Clusters in Endcap",
-                      hsphiWidth_.bins, hsphiWidth_.min, hsphiWidth_.max);
-  
+  hist_EB_CorSC_phiWidth_ = _ibooker.book1D("hist_EB_CorSC_phiWidth_",
+                                            "phiWidth of Corrected Super Clusters in Barrel",
+                                            hsphiWidth_.bins,
+                                            hsphiWidth_.min,
+                                            hsphiWidth_.max);
+  hist_EE_CorSC_phiWidth_ = _ibooker.book1D("hist_EE_CorSC_phiWidth_",
+                                            "phiWidth of Corrected Super Clusters in Endcap",
+                                            hsphiWidth_.bins,
+                                            hsphiWidth_.min,
+                                            hsphiWidth_.max);
+
   // eta width stored in corrected SuperClusters
-  hist_EB_CorSC_etaWidth_
-    = _ibooker.book1D("hist_EB_CorSC_etaWidth_","etaWidth of Corrected Super Clusters in Barrel",
-                      hsetaWidth_.bins, hsetaWidth_.min, hsetaWidth_.max);
-  hist_EE_CorSC_etaWidth_
-    = _ibooker.book1D("hist_EE_CorSC_etaWidth_","etaWidth of Corrected Super Clusters in Endcap",
-                      hsetaWidth_.bins, hsetaWidth_.min, hsetaWidth_.max);
-  
-  
+  hist_EB_CorSC_etaWidth_ = _ibooker.book1D("hist_EB_CorSC_etaWidth_",
+                                            "etaWidth of Corrected Super Clusters in Barrel",
+                                            hsetaWidth_.bins,
+                                            hsetaWidth_.min,
+                                            hsetaWidth_.max);
+  hist_EE_CorSC_etaWidth_ = _ibooker.book1D("hist_EE_CorSC_etaWidth_",
+                                            "etaWidth of Corrected Super Clusters in Endcap",
+                                            hsetaWidth_.bins,
+                                            hsetaWidth_.min,
+                                            hsetaWidth_.max);
+
   // preshower energy
-  hist_EE_PreSC_preshowerE_
-    = _ibooker.book1D("hist_EE_PreSC_preshowerE_","preshower energy in Super Clusters with Preshower in Endcap",
-                      hspreshowerE_.bins, hspreshowerE_.min, hspreshowerE_.max);
-  hist_EE_CorSC_preshowerE_
-    = _ibooker.book1D("hist_EE_CorSC_preshowerE_","preshower energy in Corrected Super Clusters with Preshower in Endcap",
-                      hspreshowerE_.bins, hspreshowerE_.min, hspreshowerE_.max);
-  
-  
+  hist_EE_PreSC_preshowerE_ = _ibooker.book1D("hist_EE_PreSC_preshowerE_",
+                                              "preshower energy in Super Clusters with Preshower in Endcap",
+                                              hspreshowerE_.bins,
+                                              hspreshowerE_.min,
+                                              hspreshowerE_.max);
+  hist_EE_CorSC_preshowerE_ = _ibooker.book1D("hist_EE_CorSC_preshowerE_",
+                                              "preshower energy in Corrected Super Clusters with Preshower in Endcap",
+                                              hspreshowerE_.bins,
+                                              hspreshowerE_.min,
+                                              hspreshowerE_.max);
+
   //
-  hist_EB_CorSC_ET_vs_Eta_
-    = _ibooker.book2D( "hist_EB_CorSC_ET_vs_Eta_", "Corr Super Cluster ET versus Eta in Barrel", 
-                       hsET_.bins, hsET_.min, hsET_.max,
-                       hsEta_.bins, hsEta_.min, hsEta_.max);
-  
-  hist_EB_CorSC_ET_vs_Phi_
-    = _ibooker.book2D( "hist_EB_CorSC_ET_vs_Phi_", "Corr Super Cluster ET versus Phi in Barrel", 
-                       hsET_.bins, hsET_.min, hsET_.max,
-                       hsPhi_.bins, hsPhi_.min, hsPhi_.max);
-  
-  hist_EE_CorSC_ET_vs_Eta_
-    = _ibooker.book2D( "hist_EE_CorSC_ET_vs_Eta_", "Corr Super Cluster ET versus Eta in Endcap", 
-                       hsET_.bins, hsET_.min, hsET_.max,
-                       hsEta_.bins, hsEta_.min, hsEta_.max);
-  
-  hist_EE_CorSC_ET_vs_Phi_
-    = _ibooker.book2D( "hist_EE_CorSC_ET_vs_Phi_", "Corr Super Cluster ET versus Phi in Endcap", 
-                       hsET_.bins, hsET_.min, hsET_.max,
-                       hsPhi_.bins, hsPhi_.min, hsPhi_.max);
-  
-  hist_EE_CorSC_ET_vs_R_
-    = _ibooker.book2D( "hist_EE_CorSC_ET_vs_R_", "Corr Super Cluster ET versus Radius in Endcap", 
-                       hsET_.bins, hsET_.min, hsET_.max,
-                       hsR_.bins, hsR_.min, hsR_.max);
-  
+  hist_EB_CorSC_ET_vs_Eta_ = _ibooker.book2D("hist_EB_CorSC_ET_vs_Eta_",
+                                             "Corr Super Cluster ET versus Eta in Barrel",
+                                             hsET_.bins,
+                                             hsET_.min,
+                                             hsET_.max,
+                                             hsEta_.bins,
+                                             hsEta_.min,
+                                             hsEta_.max);
+
+  hist_EB_CorSC_ET_vs_Phi_ = _ibooker.book2D("hist_EB_CorSC_ET_vs_Phi_",
+                                             "Corr Super Cluster ET versus Phi in Barrel",
+                                             hsET_.bins,
+                                             hsET_.min,
+                                             hsET_.max,
+                                             hsPhi_.bins,
+                                             hsPhi_.min,
+                                             hsPhi_.max);
+
+  hist_EE_CorSC_ET_vs_Eta_ = _ibooker.book2D("hist_EE_CorSC_ET_vs_Eta_",
+                                             "Corr Super Cluster ET versus Eta in Endcap",
+                                             hsET_.bins,
+                                             hsET_.min,
+                                             hsET_.max,
+                                             hsEta_.bins,
+                                             hsEta_.min,
+                                             hsEta_.max);
+
+  hist_EE_CorSC_ET_vs_Phi_ = _ibooker.book2D("hist_EE_CorSC_ET_vs_Phi_",
+                                             "Corr Super Cluster ET versus Phi in Endcap",
+                                             hsET_.bins,
+                                             hsET_.min,
+                                             hsET_.max,
+                                             hsPhi_.bins,
+                                             hsPhi_.min,
+                                             hsPhi_.max);
+
+  hist_EE_CorSC_ET_vs_R_ = _ibooker.book2D("hist_EE_CorSC_ET_vs_R_",
+                                           "Corr Super Cluster ET versus Radius in Endcap",
+                                           hsET_.bins,
+                                           hsET_.min,
+                                           hsET_.max,
+                                           hsR_.bins,
+                                           hsR_.min,
+                                           hsR_.max);
 }
 
-void
-EgammaSuperClusters::analyze( const edm::Event& evt, const edm::EventSetup& es )
-{
-  
+void EgammaSuperClusters::analyze(const edm::Event &evt, const edm::EventSetup &es) {
   bool skipMC = false;
   bool skipBarrel = false;
   bool skipEndcap = false;
-  
+
   //
   // Get MCTRUTH
   //
-  edm::Handle<edm::HepMCProduct> pMCTruth ;
+  edm::Handle<edm::HepMCProduct> pMCTruth;
   evt.getByToken(MCTruthCollectionToken_, pMCTruth);
   if (!pMCTruth.isValid()) {
     edm::LogError("EgammaSuperClusters") << "Error! can't get MC collection ";
     skipMC = true;
   }
-  const HepMC::GenEvent* genEvent = pMCTruth->GetEvent();
-  
-  if( skipMC ) return;
-  
+  const HepMC::GenEvent *genEvent = pMCTruth->GetEvent();
+
+  if (skipMC)
+    return;
+
   //
-  // Get the BARREL products 
+  // Get the BARREL products
   //
   edm::Handle<reco::SuperClusterCollection> pBarrelRawSuperClusters;
   evt.getByToken(barrelRawSuperClusterCollectionToken_, pBarrelRawSuperClusters);
@@ -351,103 +397,97 @@ EgammaSuperClusters::analyze( const edm::Event& evt, const edm::EventSetup& es )
     edm::LogError("EgammaSuperClusters") << "Error! can't get collection Raw SC";
     skipBarrel = true;
   }
-  
+
   edm::Handle<reco::SuperClusterCollection> pBarrelCorSuperClusters;
   evt.getByToken(barrelCorSuperClusterCollectionToken_, pBarrelCorSuperClusters);
   if (!pBarrelCorSuperClusters.isValid()) {
     edm::LogError("EgammaSuperClusters") << "Error! can't get collection Cor SC";
     skipBarrel = true;
   }
-  
-  edm::Handle< EBRecHitCollection > pBarrelRecHitCollection;
-  evt.getByToken( barrelRecHitCollectionToken_, pBarrelRecHitCollection );
-  if ( ! pBarrelRecHitCollection.isValid() ) {
+
+  edm::Handle<EBRecHitCollection> pBarrelRecHitCollection;
+  evt.getByToken(barrelRecHitCollectionToken_, pBarrelRecHitCollection);
+  if (!pBarrelRecHitCollection.isValid()) {
     skipBarrel = true;
   }
-  edm::Handle< EERecHitCollection > pEndcapRecHitCollection;
-  evt.getByToken( endcapRecHitCollectionToken_, pEndcapRecHitCollection );
-  if ( ! pEndcapRecHitCollection.isValid() ) {
+  edm::Handle<EERecHitCollection> pEndcapRecHitCollection;
+  evt.getByToken(endcapRecHitCollectionToken_, pEndcapRecHitCollection);
+  if (!pEndcapRecHitCollection.isValid()) {
     skipEndcap = true;
   }
-  
-  if( skipBarrel || skipEndcap ) return;
-  
-  EcalClusterLazyTools lazyTool( evt, es, barrelRecHitCollectionToken_, endcapRecHitCollectionToken_ );
-  
-  // Get the BARREL collections        
-  const reco::SuperClusterCollection* barrelRawSuperClusters = pBarrelRawSuperClusters.product();
-  const reco::SuperClusterCollection* barrelCorSuperClusters = pBarrelCorSuperClusters.product();
-  
+
+  if (skipBarrel || skipEndcap)
+    return;
+
+  EcalClusterLazyTools lazyTool(evt, es, barrelRecHitCollectionToken_, endcapRecHitCollectionToken_);
+
+  // Get the BARREL collections
+  const reco::SuperClusterCollection *barrelRawSuperClusters = pBarrelRawSuperClusters.product();
+  const reco::SuperClusterCollection *barrelCorSuperClusters = pBarrelCorSuperClusters.product();
+
   // Number of entries in collections
   hist_EB_RawSC_Size_->Fill(barrelRawSuperClusters->size());
   hist_EB_CorSC_Size_->Fill(barrelCorSuperClusters->size());
-  
+
   // Do RAW BARREL SuperClusters
-  for(reco::SuperClusterCollection::const_iterator aClus = barrelRawSuperClusters->begin(); 
-      aClus != barrelRawSuperClusters->end(); aClus++)
-    {
-      // kinematics
-      hist_EB_RawSC_NumBC_->Fill(aClus->clustersSize());
-      hist_EB_RawSC_ET_->Fill(aClus->energy()/std::cosh(aClus->position().eta()));
-      hist_EB_RawSC_Eta_->Fill(aClus->position().eta());
-      hist_EB_RawSC_Phi_->Fill(aClus->position().phi());
-      
-      // cluster shape
-      const reco::CaloClusterPtr seed = aClus->seed();
-      hist_EB_RawSC_S1toS9_->Fill( lazyTool.eMax( *seed ) / lazyTool.e3x3( *seed ) );
-      hist_EB_RawSC_S25toE_->Fill( lazyTool.e5x5( *seed ) / aClus->energy() );
-      
-      // truth
-      double dRClosest = 999.9;
-      double energyClosest = 0;
-      closestMCParticle(genEvent, *aClus, dRClosest, energyClosest);
-      
-      if (dRClosest < 0.1)
-	{
-	  hist_EB_RawSC_EoverTruth_->Fill(aClus->energy()/energyClosest);		
-	  hist_EB_RawSC_deltaR_->Fill(dRClosest);
-	  
-	}
-      
+  for (reco::SuperClusterCollection::const_iterator aClus = barrelRawSuperClusters->begin();
+       aClus != barrelRawSuperClusters->end();
+       aClus++) {
+    // kinematics
+    hist_EB_RawSC_NumBC_->Fill(aClus->clustersSize());
+    hist_EB_RawSC_ET_->Fill(aClus->energy() / std::cosh(aClus->position().eta()));
+    hist_EB_RawSC_Eta_->Fill(aClus->position().eta());
+    hist_EB_RawSC_Phi_->Fill(aClus->position().phi());
+
+    // cluster shape
+    const reco::CaloClusterPtr seed = aClus->seed();
+    hist_EB_RawSC_S1toS9_->Fill(lazyTool.eMax(*seed) / lazyTool.e3x3(*seed));
+    hist_EB_RawSC_S25toE_->Fill(lazyTool.e5x5(*seed) / aClus->energy());
+
+    // truth
+    double dRClosest = 999.9;
+    double energyClosest = 0;
+    closestMCParticle(genEvent, *aClus, dRClosest, energyClosest);
+
+    if (dRClosest < 0.1) {
+      hist_EB_RawSC_EoverTruth_->Fill(aClus->energy() / energyClosest);
+      hist_EB_RawSC_deltaR_->Fill(dRClosest);
     }
-  
+  }
+
   // Do CORRECTED BARREL SuperClusters
-  for(reco::SuperClusterCollection::const_iterator aClus = barrelCorSuperClusters->begin();
-      aClus != barrelCorSuperClusters->end(); aClus++)
-    {
-      // kinematics
-      hist_EB_CorSC_NumBC_->Fill(aClus->clustersSize());
-      hist_EB_CorSC_ET_->Fill(aClus->energy()/std::cosh(aClus->position().eta()));
-      hist_EB_CorSC_Eta_->Fill(aClus->position().eta());
-      hist_EB_CorSC_Phi_->Fill(aClus->position().phi());
-      
-      hist_EB_CorSC_ET_vs_Eta_->Fill( aClus->energy()/std::cosh(aClus->position().eta()), aClus->eta() );
-      hist_EB_CorSC_ET_vs_Phi_->Fill( aClus->energy()/std::cosh(aClus->position().eta()), aClus->phi() );
-      
-      
-      // cluster shape
-      const reco::CaloClusterPtr seed = aClus->seed();
-      hist_EB_CorSC_S1toS9_->Fill( lazyTool.eMax( *seed ) / lazyTool.e3x3( *seed ) );
-      hist_EB_CorSC_S25toE_->Fill( lazyTool.e5x5( *seed ) / aClus->energy() );
-      
-      // correction variables
-      hist_EB_CorSC_phiWidth_->Fill(aClus->phiWidth());
-      hist_EB_CorSC_etaWidth_->Fill(aClus->etaWidth());
-      
-      // truth
-      double dRClosest = 999.9;
-      double energyClosest = 0;
-      closestMCParticle(genEvent, *aClus, dRClosest, energyClosest);
-      
-      if (dRClosest < 0.1)
-	{
-	  hist_EB_CorSC_EoverTruth_->Fill(aClus->energy()/energyClosest);
-	  hist_EB_CorSC_deltaR_->Fill(dRClosest);
-	  
-	}
-      
+  for (reco::SuperClusterCollection::const_iterator aClus = barrelCorSuperClusters->begin();
+       aClus != barrelCorSuperClusters->end();
+       aClus++) {
+    // kinematics
+    hist_EB_CorSC_NumBC_->Fill(aClus->clustersSize());
+    hist_EB_CorSC_ET_->Fill(aClus->energy() / std::cosh(aClus->position().eta()));
+    hist_EB_CorSC_Eta_->Fill(aClus->position().eta());
+    hist_EB_CorSC_Phi_->Fill(aClus->position().phi());
+
+    hist_EB_CorSC_ET_vs_Eta_->Fill(aClus->energy() / std::cosh(aClus->position().eta()), aClus->eta());
+    hist_EB_CorSC_ET_vs_Phi_->Fill(aClus->energy() / std::cosh(aClus->position().eta()), aClus->phi());
+
+    // cluster shape
+    const reco::CaloClusterPtr seed = aClus->seed();
+    hist_EB_CorSC_S1toS9_->Fill(lazyTool.eMax(*seed) / lazyTool.e3x3(*seed));
+    hist_EB_CorSC_S25toE_->Fill(lazyTool.e5x5(*seed) / aClus->energy());
+
+    // correction variables
+    hist_EB_CorSC_phiWidth_->Fill(aClus->phiWidth());
+    hist_EB_CorSC_etaWidth_->Fill(aClus->etaWidth());
+
+    // truth
+    double dRClosest = 999.9;
+    double energyClosest = 0;
+    closestMCParticle(genEvent, *aClus, dRClosest, energyClosest);
+
+    if (dRClosest < 0.1) {
+      hist_EB_CorSC_EoverTruth_->Fill(aClus->energy() / energyClosest);
+      hist_EB_CorSC_deltaR_->Fill(dRClosest);
     }
-  
+  }
+
   //
   // Get the ENDCAP products
   //
@@ -456,202 +496,187 @@ EgammaSuperClusters::analyze( const edm::Event& evt, const edm::EventSetup& es )
   if (!pEndcapRawSuperClusters.isValid()) {
     edm::LogError("EgammaSuperClusters") << "Error! can't get collection Raw EE SC";
   }
-  
+
   edm::Handle<reco::SuperClusterCollection> pEndcapPreSuperClusters;
   evt.getByToken(endcapPreSuperClusterCollectionToken_, pEndcapPreSuperClusters);
   if (!pEndcapPreSuperClusters.isValid()) {
     edm::LogError("EgammaSuperClusters") << "Error! can't get collection Pre EE SC";
   }
-  
+
   edm::Handle<reco::SuperClusterCollection> pEndcapCorSuperClusters;
   evt.getByToken(endcapCorSuperClusterCollectionToken_, pEndcapCorSuperClusters);
   if (!pEndcapCorSuperClusters.isValid()) {
     edm::LogError("EgammaSuperClusters") << "Error! can't get collection Cor EE SC";
   }
-  
+
   // Get the ENDCAP collections
-  const reco::SuperClusterCollection* endcapRawSuperClusters = pEndcapRawSuperClusters.product();
-  const reco::SuperClusterCollection* endcapPreSuperClusters = pEndcapPreSuperClusters.product();
-  const reco::SuperClusterCollection* endcapCorSuperClusters = pEndcapCorSuperClusters.product();
-  
+  const reco::SuperClusterCollection *endcapRawSuperClusters = pEndcapRawSuperClusters.product();
+  const reco::SuperClusterCollection *endcapPreSuperClusters = pEndcapPreSuperClusters.product();
+  const reco::SuperClusterCollection *endcapCorSuperClusters = pEndcapCorSuperClusters.product();
+
   // Number of entries in collections
   hist_EE_RawSC_Size_->Fill(endcapRawSuperClusters->size());
   hist_EE_PreSC_Size_->Fill(endcapPreSuperClusters->size());
   hist_EE_CorSC_Size_->Fill(endcapCorSuperClusters->size());
-  
+
   // Do RAW ENDCAP SuperClusters
-  for(reco::SuperClusterCollection::const_iterator aClus = endcapRawSuperClusters->begin(); 
-      aClus != endcapRawSuperClusters->end(); aClus++)
-    {
-      hist_EE_RawSC_NumBC_->Fill(aClus->clustersSize());
-      hist_EE_RawSC_ET_->Fill(aClus->energy()/std::cosh(aClus->position().eta()));
-      hist_EE_RawSC_Eta_->Fill(aClus->position().eta());
-      hist_EE_RawSC_Phi_->Fill(aClus->position().phi());
-      
-      const reco::CaloClusterPtr seed = aClus->seed();
-      hist_EE_RawSC_S1toS9_->Fill( lazyTool.eMax( *seed ) / lazyTool.e3x3( *seed ) );
-      hist_EE_RawSC_S25toE_->Fill( lazyTool.e5x5( *seed ) / aClus->energy() );
-      
-      // truth
-      double dRClosest = 999.9;
-      double energyClosest = 0;
-      closestMCParticle(genEvent, *aClus, dRClosest, energyClosest);
-      
-      if (dRClosest < 0.1)
-	{
-	  hist_EE_RawSC_EoverTruth_->Fill(aClus->energy()/energyClosest);
-	  hist_EE_RawSC_deltaR_->Fill(dRClosest);
-	}
-      
+  for (reco::SuperClusterCollection::const_iterator aClus = endcapRawSuperClusters->begin();
+       aClus != endcapRawSuperClusters->end();
+       aClus++) {
+    hist_EE_RawSC_NumBC_->Fill(aClus->clustersSize());
+    hist_EE_RawSC_ET_->Fill(aClus->energy() / std::cosh(aClus->position().eta()));
+    hist_EE_RawSC_Eta_->Fill(aClus->position().eta());
+    hist_EE_RawSC_Phi_->Fill(aClus->position().phi());
+
+    const reco::CaloClusterPtr seed = aClus->seed();
+    hist_EE_RawSC_S1toS9_->Fill(lazyTool.eMax(*seed) / lazyTool.e3x3(*seed));
+    hist_EE_RawSC_S25toE_->Fill(lazyTool.e5x5(*seed) / aClus->energy());
+
+    // truth
+    double dRClosest = 999.9;
+    double energyClosest = 0;
+    closestMCParticle(genEvent, *aClus, dRClosest, energyClosest);
+
+    if (dRClosest < 0.1) {
+      hist_EE_RawSC_EoverTruth_->Fill(aClus->energy() / energyClosest);
+      hist_EE_RawSC_deltaR_->Fill(dRClosest);
     }
-  
+  }
+
   // Do ENDCAP SuperClusters with PRESHOWER
-  for(reco::SuperClusterCollection::const_iterator aClus = endcapPreSuperClusters->begin();
-      aClus != endcapPreSuperClusters->end(); aClus++)
-    {
-      hist_EE_PreSC_NumBC_->Fill(aClus->clustersSize());
-      hist_EE_PreSC_ET_->Fill(aClus->energy()/std::cosh(aClus->position().eta()));
-      hist_EE_PreSC_Eta_->Fill(aClus->position().eta());
-      hist_EE_PreSC_Phi_->Fill(aClus->position().phi());
-      hist_EE_PreSC_preshowerE_->Fill(aClus->preshowerEnergy());
-      
-      const reco::CaloClusterPtr seed = aClus->seed();
-      hist_EE_PreSC_S1toS9_->Fill( lazyTool.eMax( *seed ) / lazyTool.e3x3( *seed ) );
-      hist_EE_PreSC_S25toE_->Fill( lazyTool.e5x5( *seed ) / aClus->energy() );
-      
-      // truth
-      double dRClosest = 999.9;
-      double energyClosest = 0;
-      closestMCParticle(genEvent, *aClus, dRClosest, energyClosest);
-      
-      if (dRClosest < 0.1)
-	{
-	  hist_EE_PreSC_EoverTruth_->Fill(aClus->energy()/energyClosest);
-	  hist_EE_PreSC_deltaR_->Fill(dRClosest);
-	}
-      
+  for (reco::SuperClusterCollection::const_iterator aClus = endcapPreSuperClusters->begin();
+       aClus != endcapPreSuperClusters->end();
+       aClus++) {
+    hist_EE_PreSC_NumBC_->Fill(aClus->clustersSize());
+    hist_EE_PreSC_ET_->Fill(aClus->energy() / std::cosh(aClus->position().eta()));
+    hist_EE_PreSC_Eta_->Fill(aClus->position().eta());
+    hist_EE_PreSC_Phi_->Fill(aClus->position().phi());
+    hist_EE_PreSC_preshowerE_->Fill(aClus->preshowerEnergy());
+
+    const reco::CaloClusterPtr seed = aClus->seed();
+    hist_EE_PreSC_S1toS9_->Fill(lazyTool.eMax(*seed) / lazyTool.e3x3(*seed));
+    hist_EE_PreSC_S25toE_->Fill(lazyTool.e5x5(*seed) / aClus->energy());
+
+    // truth
+    double dRClosest = 999.9;
+    double energyClosest = 0;
+    closestMCParticle(genEvent, *aClus, dRClosest, energyClosest);
+
+    if (dRClosest < 0.1) {
+      hist_EE_PreSC_EoverTruth_->Fill(aClus->energy() / energyClosest);
+      hist_EE_PreSC_deltaR_->Fill(dRClosest);
     }
-  
+  }
+
   // Do CORRECTED ENDCAP SuperClusters
-  for(reco::SuperClusterCollection::const_iterator aClus = endcapCorSuperClusters->begin();
-      aClus != endcapCorSuperClusters->end(); aClus++)
-    {
-      hist_EE_CorSC_NumBC_->Fill(aClus->clustersSize());
-      hist_EE_CorSC_ET_->Fill(aClus->energy()/std::cosh(aClus->position().eta()));
-      hist_EE_CorSC_Eta_->Fill(aClus->position().eta());
-      hist_EE_CorSC_Phi_->Fill(aClus->position().phi());
-      hist_EE_CorSC_preshowerE_->Fill(aClus->preshowerEnergy());
-      
-      hist_EE_CorSC_ET_vs_Eta_->Fill( aClus->energy()/std::cosh(aClus->position().eta()), aClus->eta() );
-      hist_EE_CorSC_ET_vs_Phi_->Fill( aClus->energy()/std::cosh(aClus->position().eta()), aClus->phi() );
-      hist_EE_CorSC_ET_vs_R_->Fill( aClus->energy()/std::cosh(aClus->position().eta()), 
-				    std::sqrt( std::pow(aClus->x(),2) + std::pow(aClus->y(),2) ) );
-      
-      
-      // correction variables
-      hist_EE_CorSC_phiWidth_->Fill(aClus->phiWidth());
-      hist_EE_CorSC_etaWidth_->Fill(aClus->etaWidth());
-      
-      const reco::CaloClusterPtr seed = aClus->seed();
-      hist_EE_CorSC_S1toS9_->Fill( lazyTool.eMax( *seed ) / lazyTool.e3x3( *seed ) );
-      hist_EE_CorSC_S25toE_->Fill( lazyTool.e5x5( *seed ) / aClus->energy() );
-      
-      // truth
-      double dRClosest = 999.9;
-      double energyClosest = 0;
-      closestMCParticle(genEvent, *aClus, dRClosest, energyClosest);
-      
-      if (dRClosest < 0.1)
-	{
-	  hist_EE_CorSC_EoverTruth_->Fill(aClus->energy()/energyClosest);
-	  hist_EE_CorSC_deltaR_->Fill(dRClosest);
-	}
-      
+  for (reco::SuperClusterCollection::const_iterator aClus = endcapCorSuperClusters->begin();
+       aClus != endcapCorSuperClusters->end();
+       aClus++) {
+    hist_EE_CorSC_NumBC_->Fill(aClus->clustersSize());
+    hist_EE_CorSC_ET_->Fill(aClus->energy() / std::cosh(aClus->position().eta()));
+    hist_EE_CorSC_Eta_->Fill(aClus->position().eta());
+    hist_EE_CorSC_Phi_->Fill(aClus->position().phi());
+    hist_EE_CorSC_preshowerE_->Fill(aClus->preshowerEnergy());
+
+    hist_EE_CorSC_ET_vs_Eta_->Fill(aClus->energy() / std::cosh(aClus->position().eta()), aClus->eta());
+    hist_EE_CorSC_ET_vs_Phi_->Fill(aClus->energy() / std::cosh(aClus->position().eta()), aClus->phi());
+    hist_EE_CorSC_ET_vs_R_->Fill(aClus->energy() / std::cosh(aClus->position().eta()),
+                                 std::sqrt(std::pow(aClus->x(), 2) + std::pow(aClus->y(), 2)));
+
+    // correction variables
+    hist_EE_CorSC_phiWidth_->Fill(aClus->phiWidth());
+    hist_EE_CorSC_etaWidth_->Fill(aClus->etaWidth());
+
+    const reco::CaloClusterPtr seed = aClus->seed();
+    hist_EE_CorSC_S1toS9_->Fill(lazyTool.eMax(*seed) / lazyTool.e3x3(*seed));
+    hist_EE_CorSC_S25toE_->Fill(lazyTool.e5x5(*seed) / aClus->energy());
+
+    // truth
+    double dRClosest = 999.9;
+    double energyClosest = 0;
+    closestMCParticle(genEvent, *aClus, dRClosest, energyClosest);
+
+    if (dRClosest < 0.1) {
+      hist_EE_CorSC_EoverTruth_->Fill(aClus->energy() / energyClosest);
+      hist_EE_CorSC_deltaR_->Fill(dRClosest);
     }
-  
+  }
 }
 
 //
 // Closest MC Particle
 //
-void
-EgammaSuperClusters::closestMCParticle(const HepMC::GenEvent *genEvent, const reco::SuperCluster &sc, 
-                                       double &dRClosest, double &energyClosest) const
-{
-  
+void EgammaSuperClusters::closestMCParticle(const HepMC::GenEvent *genEvent,
+                                            const reco::SuperCluster &sc,
+                                            double &dRClosest,
+                                            double &energyClosest) const {
   // SuperCluster eta, phi
   double scEta = sc.eta();
   double scPhi = sc.phi();
-  
+
   // initialize dRClosest to a large number
   dRClosest = 999.9;
-  
+
   // loop over the MC truth particles to find the
   // closest to the superCluster in dR space
-  for(HepMC::GenEvent::particle_const_iterator currentParticle = genEvent->particles_begin();
-      currentParticle != genEvent->particles_end(); currentParticle++ )
-    {
-      if((*currentParticle)->status() == 1)
-	{
-	  // need GenParticle in ECAL co-ordinates
-	  HepMC::FourVector vtx = (*currentParticle)->production_vertex()->position();
-	  double phiTrue = (*currentParticle)->momentum().phi();
-	  double etaTrue = ecalEta((*currentParticle)->momentum().eta(), vtx.z()/10., vtx.perp()/10.);
-	  
-	  double dPhi = reco::deltaPhi(phiTrue, scPhi);
-	  double dEta = scEta - etaTrue;
-	  double deltaR = std::sqrt(dPhi*dPhi + dEta*dEta);
-	  
-	  if(deltaR < dRClosest)
-	    {
-	      dRClosest = deltaR;
-	      energyClosest = (*currentParticle)->momentum().e();
-	    }
-	  
-	} // end if stable particle	
-      
-    } // end loop on get particles
-  
-}
+  for (HepMC::GenEvent::particle_const_iterator currentParticle = genEvent->particles_begin();
+       currentParticle != genEvent->particles_end();
+       currentParticle++) {
+    if ((*currentParticle)->status() == 1) {
+      // need GenParticle in ECAL co-ordinates
+      HepMC::FourVector vtx = (*currentParticle)->production_vertex()->position();
+      double phiTrue = (*currentParticle)->momentum().phi();
+      double etaTrue = ecalEta((*currentParticle)->momentum().eta(), vtx.z() / 10., vtx.perp() / 10.);
+
+      double dPhi = reco::deltaPhi(phiTrue, scPhi);
+      double dEta = scEta - etaTrue;
+      double deltaR = std::sqrt(dPhi * dPhi + dEta * dEta);
 
+      if (deltaR < dRClosest) {
+        dRClosest = deltaR;
+        energyClosest = (*currentParticle)->momentum().e();
+      }
+
+    }  // end if stable particle
+
+  }  // end loop on get particles
+}
 
 //
 // Compute Eta in the ECAL co-ordinate system
 //
-float
-EgammaSuperClusters::ecalEta(float EtaParticle , float Zvertex, float plane_Radius) const
-{  
-  const float R_ECAL           = 136.5;
-  const float Z_Endcap         = 328.0;
-  const float etaBarrelEndcap  = 1.479;
-  
-  if(EtaParticle != 0.)
-    {
-      float Theta = 0.0  ;
-      float ZEcal = (R_ECAL-plane_Radius)*sinh(EtaParticle)+Zvertex;
-      
-      if(ZEcal != 0.0) Theta = atan(R_ECAL/ZEcal);
-      if(Theta<0.0) Theta = Theta+Geom::pi() ;
-      
-      float ETA = - log(tan(0.5*Theta));
-      
-      if( fabs(ETA) > etaBarrelEndcap )
-	{
-	  float Zend = Z_Endcap ;
-	  if(EtaParticle<0.0 )  Zend = -Zend ;
-	  float Zlen = Zend - Zvertex ;
-	  float RR = Zlen/sinh(EtaParticle);
-	  Theta = atan((RR+plane_Radius)/Zend);
-	  if(Theta<0.0) Theta = Theta+Geom::pi() ;
-	  ETA = - log(tan(0.5*Theta));
-	}
-      
-      return ETA;
-    }
-  else
-    {
-      edm::LogWarning("")  << "[EgammaSuperClusters::ecalEta] Warning: Eta equals to zero, not correcting" ;
-      return EtaParticle;
+float EgammaSuperClusters::ecalEta(float EtaParticle, float Zvertex, float plane_Radius) const {
+  const float R_ECAL = 136.5;
+  const float Z_Endcap = 328.0;
+  const float etaBarrelEndcap = 1.479;
+
+  if (EtaParticle != 0.) {
+    float Theta = 0.0;
+    float ZEcal = (R_ECAL - plane_Radius) * sinh(EtaParticle) + Zvertex;
+
+    if (ZEcal != 0.0)
+      Theta = atan(R_ECAL / ZEcal);
+    if (Theta < 0.0)
+      Theta = Theta + Geom::pi();
+
+    float ETA = -log(tan(0.5 * Theta));
+
+    if (fabs(ETA) > etaBarrelEndcap) {
+      float Zend = Z_Endcap;
+      if (EtaParticle < 0.0)
+        Zend = -Zend;
+      float Zlen = Zend - Zvertex;
+      float RR = Zlen / sinh(EtaParticle);
+      Theta = atan((RR + plane_Radius) / Zend);
+      if (Theta < 0.0)
+        Theta = Theta + Geom::pi();
+      ETA = -log(tan(0.5 * Theta));
     }
-}
 
+    return ETA;
+  } else {
+    edm::LogWarning("") << "[EgammaSuperClusters::ecalEta] Warning: Eta equals "
+                           "to zero, not correcting";
+    return EtaParticle;
+  }
+}
diff --git a/Validation/EcalClusters/src/EnergyScaleAnalyzer.cc b/Validation/EcalClusters/src/EnergyScaleAnalyzer.cc
index e004e11e73a7d..c15259ed81384 100644
--- a/Validation/EcalClusters/src/EnergyScaleAnalyzer.cc
+++ b/Validation/EcalClusters/src/EnergyScaleAnalyzer.cc
@@ -2,8 +2,9 @@
 //
 // Package:    EnergyScaleAnalyzer
 // Class:      EnergyScaleAnalyzer
-// 
-/**\class EnergyScaleAnalyzer EnergyScaleAnalyzer.cc Validation/EcalClusters/src/EnergyScaleAnalyzer.cc
+//
+/**\class EnergyScaleAnalyzer EnergyScaleAnalyzer.cc
+ Validation/EcalClusters/src/EnergyScaleAnalyzer.cc
 
  Description: <one line class summary>
 
@@ -15,80 +16,88 @@
 //
 
 //#include "RecoEcal/EnergyScaleAnalyzer/interface/EnergyScaleAnalyzer.h"
-#include "Validation/EcalClusters/interface/EnergyScaleAnalyzer.h"
 #include "RecoEcal/EgammaClusterProducers/interface/PreshowerClusterProducer.h"
+#include "Validation/EcalClusters/interface/EnergyScaleAnalyzer.h"
 
-//Framework
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Utilities/interface/Exception.h"
+// Framework
 #include "DataFormats/Common/interface/Handle.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
-//Geometry
+// Geometry
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 #include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
+#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 #include "Geometry/CaloTopology/interface/EcalBarrelHardcodedTopology.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
-#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 
 #include "TFile.h"
-//Reconstruction classes
-#include "DataFormats/EgammaReco/interface/BasicCluster.h"
-#include "DataFormats/EgammaReco/interface/SuperCluster.h"
+// Reconstruction classes
+#include "DataFormats/EcalDetId/interface/EBDetId.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHit.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
-#include "DataFormats/EcalDetId/interface/EBDetId.h"
+#include "DataFormats/EgammaReco/interface/BasicCluster.h"
 #include "DataFormats/EgammaReco/interface/BasicClusterFwd.h"
 #include "DataFormats/EgammaReco/interface/PreshowerCluster.h"
+#include "DataFormats/EgammaReco/interface/SuperCluster.h"
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 
 #include "DataFormats/EgammaReco/interface/BasicClusterShapeAssociation.h"
-#include "RecoEcal/EgammaCoreTools/interface/PositionCalc.h"
 #include "DataFormats/Math/interface/LorentzVector.h"
+#include "RecoEcal/EgammaCoreTools/interface/PositionCalc.h"
 
 //// Class header file
-#include "RecoEcal/EgammaClusterProducers/interface/HybridClusterProducer.h"
-#include "RecoEcal/EgammaCoreTools/interface/ClusterShapeAlgo.h"
+#include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
 #include "DataFormats/EgammaReco/interface/ClusterShape.h"
 #include "DataFormats/EgammaReco/interface/ClusterShapeFwd.h"
+#include "RecoEcal/EgammaClusterProducers/interface/HybridClusterProducer.h"
+#include "RecoEcal/EgammaCoreTools/interface/ClusterShapeAlgo.h"
 #include "RecoEcal/EgammaCoreTools/interface/PositionCalc.h"
-#include "DataFormats/EgammaCandidates/interface/GsfElectronFwd.h"
 
-#include <iostream>
+#include "TString.h"
+#include "Validation/EcalClusters/interface/AnglesUtil.h"
 #include <fstream>
 #include <iomanip>
 #include <ios>
+#include <iostream>
 #include <map>
-#include "TString.h"
-#include "Validation/EcalClusters/interface/AnglesUtil.h"
 
 //========================================================================
-EnergyScaleAnalyzer::EnergyScaleAnalyzer( const edm::ParameterSet& ps )
+EnergyScaleAnalyzer::EnergyScaleAnalyzer(const edm::ParameterSet &ps)
 //========================================================================
 {
-  
   hepMCLabel_ = consumes<edm::HepMCProduct>(ps.getParameter<std::string>("hepMCLabel"));
-  hybridSuperClusters_token = consumes<reco::SuperClusterCollection>(ps.getUntrackedParameter<edm::InputTag>("hybridSuperClusters",edm::InputTag("hybridSuperClusters")));
-  dynamicHybridSuperClusters_token = consumes<reco::SuperClusterCollection>(ps.getUntrackedParameter<edm::InputTag>("dynamicHybridSuperClusters",edm::InputTag("dynamicHybridSuperClusters")));
-  correctedHybridSuperClusters_token = consumes<reco::SuperClusterCollection>(ps.getUntrackedParameter<edm::InputTag>("correctedHybridSuperClusters",edm::InputTag("correctedHybridSuperClusters")));
-  correctedDynamicHybridSuperClusters_token = consumes<reco::SuperClusterCollection>(ps.getUntrackedParameter<edm::InputTag>("correctedDynamicHybridSuperClusters",edm::InputTag("correctedDynamicHybridSuperClusters")));
-  correctedFixedMatrixSuperClustersWithPreshower_token = consumes<reco::SuperClusterCollection>(ps.getUntrackedParameter<edm::InputTag>("correctedFixedMatrixSuperClustersWithPreshower",edm::InputTag("correctedFixedMatrixSuperClustersWithPreshower")));
-  fixedMatrixSuperClustersWithPreshower_token = consumes<reco::SuperClusterCollection>(ps.getUntrackedParameter<edm::InputTag>("fixedMatrixSuperClustersWithPreshower",edm::InputTag("fixedMatrixSuperClustersWithPreshower")));
-
-  outputFile_   = ps.getParameter<std::string>("outputFile");
-  rootFile_ = TFile::Open(outputFile_.c_str(),"RECREATE"); // open output file to store histograms
-  
+  hybridSuperClusters_token = consumes<reco::SuperClusterCollection>(
+      ps.getUntrackedParameter<edm::InputTag>("hybridSuperClusters", edm::InputTag("hybridSuperClusters")));
+  dynamicHybridSuperClusters_token = consumes<reco::SuperClusterCollection>(ps.getUntrackedParameter<edm::InputTag>(
+      "dynamicHybridSuperClusters", edm::InputTag("dynamicHybridSuperClusters")));
+  correctedHybridSuperClusters_token = consumes<reco::SuperClusterCollection>(ps.getUntrackedParameter<edm::InputTag>(
+      "correctedHybridSuperClusters", edm::InputTag("correctedHybridSuperClusters")));
+  correctedDynamicHybridSuperClusters_token =
+      consumes<reco::SuperClusterCollection>(ps.getUntrackedParameter<edm::InputTag>(
+          "correctedDynamicHybridSuperClusters", edm::InputTag("correctedDynamicHybridSuperClusters")));
+  correctedFixedMatrixSuperClustersWithPreshower_token = consumes<reco::SuperClusterCollection>(
+      ps.getUntrackedParameter<edm::InputTag>("correctedFixedMatrixSuperClustersWithPreshower",
+                                              edm::InputTag("correctedFixedMatrixSuperClustersWithPreshower")));
+  fixedMatrixSuperClustersWithPreshower_token =
+      consumes<reco::SuperClusterCollection>(ps.getUntrackedParameter<edm::InputTag>(
+          "fixedMatrixSuperClustersWithPreshower", edm::InputTag("fixedMatrixSuperClustersWithPreshower")));
+
+  outputFile_ = ps.getParameter<std::string>("outputFile");
+  rootFile_ = TFile::Open(outputFile_.c_str(),
+                          "RECREATE");  // open output file to store histograms
+
   evtN = 0;
 }
 
-
 //========================================================================
 EnergyScaleAnalyzer::~EnergyScaleAnalyzer()
 //========================================================================
@@ -97,359 +106,372 @@ EnergyScaleAnalyzer::~EnergyScaleAnalyzer()
 }
 
 //========================================================================
-void
-EnergyScaleAnalyzer::beginJob() {
-//========================================================================
+void EnergyScaleAnalyzer::beginJob() {
+  //========================================================================
 
-  mytree_ = new TTree("energyScale","");
-  TString treeVariables = "mc_npar/I:parID:mc_sep/F:mc_e:mc_et:mc_phi:mc_eta:mc_theta:";    // MC information
+  mytree_ = new TTree("energyScale", "");
+  TString treeVariables =
+      "mc_npar/I:parID:mc_sep/"
+      "F:mc_e:mc_et:mc_phi:mc_eta:mc_theta:";  // MC information
   treeVariables += "em_dR/F:";                 // MC <-> EM matching information
-  treeVariables += "em_isInCrack/I:em_scType:em_e/F:em_et:em_phi:em_eta:em_theta:em_nCell/I:em_nBC:";  // EM SC info    
-  treeVariables += "em_pet/F:em_pe:em_peta:em_ptheta:"                     ;  // EM SC physics (eta corrected information)
+  treeVariables +=
+      "em_isInCrack/I:em_scType:em_e/F:em_et:em_phi:em_eta:em_theta:em_nCell/"
+      "I:em_nBC:";                                       // EM SC info
+  treeVariables += "em_pet/F:em_pe:em_peta:em_ptheta:";  // EM SC physics (eta corrected
+                                                         // information)
 
-  treeVariables += "emCorr_e/F:emCorr_et:emCorr_eta:emCorr_phi:emCorr_theta:";// CMSSW standard corrections
-  treeVariables += "emCorr_pet/F:emCorr_peta:emCorr_ptheta:"                 ;// CMSSW standard physics  
+  treeVariables += "emCorr_e/F:emCorr_et:emCorr_eta:emCorr_phi:emCorr_theta:";  // CMSSW
+                                                                                // standard
+                                                                                // corrections
+  treeVariables += "emCorr_pet/F:emCorr_peta:emCorr_ptheta:";                   // CMSSW standard physics
 
-  treeVariables += "em_pw/F:em_ew:em_br"                                     ;  // EM widths pw -- phiWidth, ew -- etaWidth, ratios of pw/ew
+  treeVariables += "em_pw/F:em_ew:em_br";  // EM widths pw -- phiWidth, ew --
+                                           // etaWidth, ratios of pw/ew
 
-  mytree_->Branch("energyScale",&(tree_.mc_npar),treeVariables);
-      
+  mytree_->Branch("energyScale", &(tree_.mc_npar), treeVariables);
 }
 
 //========================================================================
-void
-EnergyScaleAnalyzer::analyze( const edm::Event& evt, const edm::EventSetup& es ) {
-  using namespace edm; // needed for all fwk related classes
+void EnergyScaleAnalyzer::analyze(const edm::Event &evt, const edm::EventSetup &es) {
+  using namespace edm;  // needed for all fwk related classes
   using namespace std;
 
   //  std::cout << "Proceccing event # " << ++evtN << std::endl;
-  
-  //Get containers for MC truth, SC etc. ===================================================
+
+  // Get containers for MC truth, SC etc.
+  // ===================================================
   // =======================================================================================
   // =======================================================================================
   Handle<HepMCProduct> hepMC;
-  evt.getByToken( hepMCLabel_, hepMC ) ;
-  
+  evt.getByToken(hepMCLabel_, hepMC);
+
   Labels l;
   labelsForToken(hepMCLabel_, l);
 
-  const HepMC::GenEvent* genEvent = hepMC->GetEvent();
-  if ( !(hepMC.isValid())) {
+  const HepMC::GenEvent *genEvent = hepMC->GetEvent();
+  if (!(hepMC.isValid())) {
     LogInfo("EnergyScaleAnalyzer") << "Could not get MC Product!";
     return;
   }
-  
 
   //=======================For Vertex correction
-  std::vector< Handle< HepMCProduct > > evtHandles ;
-  evt.getManyByType( evtHandles ) ;
-  
-  for ( unsigned int i=0; i<evtHandles.size(); ++i) {
-    if ( evtHandles[i].isValid() ) {
-      const HepMC::GenEvent* evt = evtHandles[i]->GetEvent() ;
-      
+  std::vector<Handle<HepMCProduct>> evtHandles;
+  evt.getManyByType(evtHandles);
+
+  for (unsigned int i = 0; i < evtHandles.size(); ++i) {
+    if (evtHandles[i].isValid()) {
+      const HepMC::GenEvent *evt = evtHandles[i]->GetEvent();
+
       // take only 1st vertex for now - it's been tested only of PGuns...
       //
-      HepMC::GenEvent::vertex_const_iterator vtx = evt->vertices_begin() ;
-      if ( evtHandles[i].provenance()->moduleLabel() == std::string(l.module) ) {
-	//Corrdinates of Vertex w.r.o. the point (0,0,0)
-	xVtx_ = 0.1*(*vtx)->position().x();      
-	yVtx_ = 0.1*(*vtx)->position().y();
-	zVtx_ = 0.1*(*vtx)->position().z();  
+      HepMC::GenEvent::vertex_const_iterator vtx = evt->vertices_begin();
+      if (evtHandles[i].provenance()->moduleLabel() == std::string(l.module)) {
+        // Corrdinates of Vertex w.r.o. the point (0,0,0)
+        xVtx_ = 0.1 * (*vtx)->position().x();
+        yVtx_ = 0.1 * (*vtx)->position().y();
+        zVtx_ = 0.1 * (*vtx)->position().z();
       }
     }
   }
   //==============================================================================
-  //Get handle to SC collections
+  // Get handle to SC collections
 
   Handle<reco::SuperClusterCollection> hybridSuperClusters;
   try {
-    evt.getByToken(hybridSuperClusters_token,hybridSuperClusters);
-  }catch (cms::Exception& ex) {
+    evt.getByToken(hybridSuperClusters_token, hybridSuperClusters);
+  } catch (cms::Exception &ex) {
     edm::LogError("EnergyScaleAnalyzer") << "Can't get collection with producer hybridSuperClusters.";
   }
 
   Handle<reco::SuperClusterCollection> dynamicHybridSuperClusters;
   try {
-    evt.getByToken(dynamicHybridSuperClusters_token,dynamicHybridSuperClusters);
-  }catch (cms::Exception& ex) {
+    evt.getByToken(dynamicHybridSuperClusters_token, dynamicHybridSuperClusters);
+  } catch (cms::Exception &ex) {
     edm::LogError("EnergyScaleAnalyzer") << "Can't get collection with producer dynamicHybridSuperClusters.";
   }
 
   Handle<reco::SuperClusterCollection> fixedMatrixSuperClustersWithPS;
   try {
-    evt.getByToken(fixedMatrixSuperClustersWithPreshower_token,fixedMatrixSuperClustersWithPS);
-  }catch (cms::Exception& ex) {
-    edm::LogError("EnergyScaleAnalyzer") << "Can't get collection with producer fixedMatrixSuperClustersWithPreshower.";
+    evt.getByToken(fixedMatrixSuperClustersWithPreshower_token, fixedMatrixSuperClustersWithPS);
+  } catch (cms::Exception &ex) {
+    edm::LogError("EnergyScaleAnalyzer") << "Can't get collection with producer "
+                                            "fixedMatrixSuperClustersWithPreshower.";
   }
 
-  //Corrected collections
+  // Corrected collections
   Handle<reco::SuperClusterCollection> correctedHybridSC;
   try {
-    evt.getByToken(correctedHybridSuperClusters_token,correctedHybridSC);
-  }catch (cms::Exception& ex) {
+    evt.getByToken(correctedHybridSuperClusters_token, correctedHybridSC);
+  } catch (cms::Exception &ex) {
     edm::LogError("EnergyScaleAnalyzer") << "Can't get collection with producer correctedHybridSuperClusters.";
   }
 
   Handle<reco::SuperClusterCollection> correctedDynamicHybridSC;
-  try{
-    evt.getByToken(correctedDynamicHybridSuperClusters_token,correctedDynamicHybridSC);
-  }catch (cms::Exception& ex) {
-    edm::LogError("EnergyScaleAnalyzer") << "Can't get collection with producer correctedDynamicHybridSuperClusters.";
+  try {
+    evt.getByToken(correctedDynamicHybridSuperClusters_token, correctedDynamicHybridSC);
+  } catch (cms::Exception &ex) {
+    edm::LogError("EnergyScaleAnalyzer") << "Can't get collection with producer "
+                                            "correctedDynamicHybridSuperClusters.";
   }
-  
+
   Handle<reco::SuperClusterCollection> correctedFixedMatrixSCWithPS;
   try {
-    evt.getByToken(correctedFixedMatrixSuperClustersWithPreshower_token,correctedFixedMatrixSCWithPS);
-  }catch (cms::Exception& ex ) {
-    edm::LogError("EnergyScaleAnalyzer") << "Can't get collection with producer correctedFixedMatrixSuperClustersWithPreshower.";
+    evt.getByToken(correctedFixedMatrixSuperClustersWithPreshower_token, correctedFixedMatrixSCWithPS);
+  } catch (cms::Exception &ex) {
+    edm::LogError("EnergyScaleAnalyzer") << "Can't get collection with producer "
+                                            "correctedFixedMatrixSuperClustersWithPreshower.";
   }
 
-  const reco::SuperClusterCollection*  dSC  = dynamicHybridSuperClusters.product();
-  const reco::SuperClusterCollection*  hSC  = hybridSuperClusters.product();
-  const reco::SuperClusterCollection* fmSC  = fixedMatrixSuperClustersWithPS.product();
-  const reco::SuperClusterCollection* chSC  = correctedHybridSC.product();
-  const reco::SuperClusterCollection* cdSC  = correctedDynamicHybridSC.product();
-  const reco::SuperClusterCollection* cfmSC = correctedFixedMatrixSCWithPS.product();
- 
+  const reco::SuperClusterCollection *dSC = dynamicHybridSuperClusters.product();
+  const reco::SuperClusterCollection *hSC = hybridSuperClusters.product();
+  const reco::SuperClusterCollection *fmSC = fixedMatrixSuperClustersWithPS.product();
+  const reco::SuperClusterCollection *chSC = correctedHybridSC.product();
+  const reco::SuperClusterCollection *cdSC = correctedDynamicHybridSC.product();
+  const reco::SuperClusterCollection *cfmSC = correctedFixedMatrixSCWithPS.product();
+
   // -----------------------  Print outs for debugging
   /*
   std::cout << "MC truth" << std::endl;
   int counterI = 0;
-  for(  HepMC::GenEvent::particle_const_iterator p = genEvent->particles_begin();
-	p != genEvent->particles_end(); ++p ) {
-    if ( fabs((*p)->momentum().eta()) < 1.5 ) {
-      std::cout << ++counterI << " " << (*p)->momentum().e() << " " 
-		<< (*p)->momentum().phi() << " " << (*p)->momentum().eta() << std::endl;
+  for(  HepMC::GenEvent::particle_const_iterator p =
+  genEvent->particles_begin(); p != genEvent->particles_end(); ++p ) { if (
+  fabs((*p)->momentum().eta()) < 1.5 ) { std::cout << ++counterI << " " <<
+  (*p)->momentum().e() << " "
+                << (*p)->momentum().phi() << " " << (*p)->momentum().eta() <<
+  std::endl;
     }
   }
 
   std::cout << "Standard clusters" << std::endl;
   counterI = 0;
   for(reco::SuperClusterCollection::const_iterator em = hSC->begin();
-      em != hSC->end(); ++em ) 
-    std::cout << ++counterI << " " << em->energy() << " " << em->position().phi() << " " << em->position().eta() << std::endl;
+      em != hSC->end(); ++em )
+    std::cout << ++counterI << " " << em->energy() << " " <<
+  em->position().phi() << " " << em->position().eta() << std::endl;
 
   std::cout << "Dynamic clusters" << std::endl;
   counterI = 0;
   for(reco::SuperClusterCollection::const_iterator em = dSC->begin();
-      em != dSC->end(); ++em ) 
-    std::cout << ++counterI << " " << em->energy() << " " << em->position().phi() << " " << em->position().eta() << std::endl;
+      em != dSC->end(); ++em )
+    std::cout << ++counterI << " " << em->energy() << " " <<
+  em->position().phi() << " " << em->position().eta() << std::endl;
 
   std::cout << "FixedMatrix clusters with PS" << std::endl;
   counterI = 0;
   for(reco::SuperClusterCollection::const_iterator em = fmSC->begin();
       em != fmSC->end(); ++em )
-    std::cout << ++counterI << " " << em->energy() << " " << em->position().phi() << " " << em->position().eta() << std::endl;
+    std::cout << ++counterI << " " << em->energy() << " " <<
+  em->position().phi() << " " << em->position().eta() << std::endl;
   */
   // -----------------------------
-  //=====================================================================  
-  // All containers are loaded, perform the analysis 
+  //=====================================================================
+  // All containers are loaded, perform the analysis
   //====================================================================
 
   // --------------------------- Store MC particles
   HepMC::GenEvent::particle_const_iterator p = genEvent->particles_begin();
-  
+
   // Search for MC electrons or photons that satisfy the criteria
   float min_eT = 5;
   float max_eta = 2.5;
-  
-  std::vector<HepMC::GenParticle* > mcParticles;
-  //int counter = 0;
-  for ( HepMC::GenEvent::particle_const_iterator p = genEvent->particles_begin(); 
-	p != genEvent->particles_end(); 
-	++p ) {
-    //LogInfo("EnergyScaleAnalyzer") << "Particle " << ++counter 
+
+  std::vector<HepMC::GenParticle *> mcParticles;
+  // int counter = 0;
+  for (HepMC::GenEvent::particle_const_iterator p = genEvent->particles_begin(); p != genEvent->particles_end(); ++p) {
+    // LogInfo("EnergyScaleAnalyzer") << "Particle " << ++counter
     //<< " PDG ID = " << (*p)->pdg_id() << " pT = " << (*p)->momentum().perp();
     // require photon or electron
-    if ( (*p)->pdg_id() != 22 && abs((*p)->pdg_id()) != 11 ) continue;
-    
+    if ((*p)->pdg_id() != 22 && abs((*p)->pdg_id()) != 11)
+      continue;
+
     // require selection criteria
-    bool satisfySelectionCriteria = 
-      (*p)->momentum().perp() > min_eT &&
-      fabs((*p)->momentum().eta()) < max_eta;
-    
-    if ( ! satisfySelectionCriteria ) continue;
-    
+    bool satisfySelectionCriteria = (*p)->momentum().perp() > min_eT && fabs((*p)->momentum().eta()) < max_eta;
+
+    if (!satisfySelectionCriteria)
+      continue;
+
     // EM MC particle is found, save it in the vector
     mcParticles.push_back(*p);
   }
   // separation in dR between 2 first MC particles
   // should not be used for MC samples with > 2 em objects generated!
-  if ( mcParticles.size() == 2 ) {
-      HepMC::GenParticle* mc1 = mcParticles[0];
-      HepMC::GenParticle* mc2 = mcParticles[1];
-      tree_.mc_sep = kinem::delta_R(mc1->momentum().eta(), mc1->momentum().phi(),
-				    mc2->momentum().eta(), mc2->momentum().phi());
+  if (mcParticles.size() == 2) {
+    HepMC::GenParticle *mc1 = mcParticles[0];
+    HepMC::GenParticle *mc2 = mcParticles[1];
+    tree_.mc_sep =
+        kinem::delta_R(mc1->momentum().eta(), mc1->momentum().phi(), mc2->momentum().eta(), mc2->momentum().phi());
   } else
     tree_.mc_sep = -100;
 
-  
-  // now loop over MC particles, find the match with SC and do everything we need
-  // then save info in the tree for every MC particle
-  for(std::vector<HepMC::GenParticle* >::const_iterator p = mcParticles.begin();
-      p != mcParticles.end(); ++p) {
-    HepMC::GenParticle* mc = *p;
-    
+  // now loop over MC particles, find the match with SC and do everything we
+  // need then save info in the tree for every MC particle
+  for (std::vector<HepMC::GenParticle *>::const_iterator p = mcParticles.begin(); p != mcParticles.end(); ++p) {
+    HepMC::GenParticle *mc = *p;
+
     // Fill MC information
-    tree_.mc_npar  = mcParticles.size();
-    tree_.parID    = mc->pdg_id();
-    tree_.mc_e     = mc->momentum().e();
-    tree_.mc_et    = mc->momentum().e()*sin(mc->momentum().theta());
-    tree_.mc_phi   = mc->momentum().phi();
-    tree_.mc_eta   = mc->momentum().eta();
+    tree_.mc_npar = mcParticles.size();
+    tree_.parID = mc->pdg_id();
+    tree_.mc_e = mc->momentum().e();
+    tree_.mc_et = mc->momentum().e() * sin(mc->momentum().theta());
+    tree_.mc_phi = mc->momentum().phi();
+    tree_.mc_eta = mc->momentum().eta();
     tree_.mc_theta = mc->momentum().theta();
 
-
-    //Call function to fill tree
+    // Call function to fill tree
     // scType coprreponds:
     // HybridSuperCluster                     -- 1
     // DynamicHybridSuperCluster              -- 2
     // FixedMatrixSuperClustersWithPreshower  -- 3
 
-    fillTree( hSC, chSC, mc, tree_, xVtx_, yVtx_, zVtx_, 1);
-    //    std::cout << " TYPE " << 1 << " : " << tree_.em_e << " : " << tree_.em_phi << " : " << tree_.em_eta << std::endl;
+    fillTree(hSC, chSC, mc, tree_, xVtx_, yVtx_, zVtx_, 1);
+    //    std::cout << " TYPE " << 1 << " : " << tree_.em_e << " : " <<
+    //    tree_.em_phi << " : " << tree_.em_eta << std::endl;
 
-    fillTree( dSC, cdSC, mc, tree_, xVtx_, yVtx_, zVtx_, 2);
-    //    std::cout << " TYPE " << 2 << " : " << tree_.em_e << " : " << tree_.em_phi << " : " << tree_.em_eta << std::endl;
+    fillTree(dSC, cdSC, mc, tree_, xVtx_, yVtx_, zVtx_, 2);
+    //    std::cout << " TYPE " << 2 << " : " << tree_.em_e << " : " <<
+    //    tree_.em_phi << " : " << tree_.em_eta << std::endl;
 
-    fillTree( fmSC, cfmSC, mc, tree_, xVtx_, yVtx_, zVtx_, 3);
-    //    std::cout << " TYPE " << 3 << " : " << tree_.em_e << " : " << tree_.em_phi << " : " << tree_.em_eta << std::endl;
+    fillTree(fmSC, cfmSC, mc, tree_, xVtx_, yVtx_, zVtx_, 3);
+    //    std::cout << " TYPE " << 3 << " : " << tree_.em_e << " : " <<
+    //    tree_.em_phi << " : " << tree_.em_eta << std::endl;
 
     //   mytree_->Fill();
-  } // loop over particles  
+  }  // loop over particles
 }
 
-
-void EnergyScaleAnalyzer::fillTree ( const reco::SuperClusterCollection* scColl, const reco::SuperClusterCollection* corrSCColl, 
-				     HepMC::GenParticle* mc, tree_structure_& tree_, float xV, float yV, float zV, int scType) {
-  
+void EnergyScaleAnalyzer::fillTree(const reco::SuperClusterCollection *scColl,
+                                   const reco::SuperClusterCollection *corrSCColl,
+                                   HepMC::GenParticle *mc,
+                                   tree_structure_ &tree_,
+                                   float xV,
+                                   float yV,
+                                   float zV,
+                                   int scType) {
   // -----------------------------  SuperClusters before energy correction
   reco::SuperClusterCollection::const_iterator em = scColl->end();
-  float energyMax = -100.0; // dummy energy of the matched SC
-  for(reco::SuperClusterCollection::const_iterator aClus = scColl->begin();
-      aClus != scColl->end(); ++aClus) {
+  float energyMax = -100.0;  // dummy energy of the matched SC
+  for (reco::SuperClusterCollection::const_iterator aClus = scColl->begin(); aClus != scColl->end(); ++aClus) {
     // check the matching
-    float dR = kinem::delta_R(mc   ->momentum().eta(), mc   ->momentum().phi(), 
-			      aClus->position().eta(), aClus->position().phi());
-    if (dR <  0.4) { // a rather loose matching cut
+    float dR =
+        kinem::delta_R(mc->momentum().eta(), mc->momentum().phi(), aClus->position().eta(), aClus->position().phi());
+    if (dR < 0.4) {  // a rather loose matching cut
       float energy = aClus->energy();
-      if ( energy < energyMax ) continue;
+      if (energy < energyMax)
+        continue;
       energyMax = energy;
       em = aClus;
     }
   }
-  
-  if (em == scColl->end() ) {
-    //    std::cout << "No matching SC with type " << scType << " was found for MC particle! "  << std::endl;
-    //    std::cout << "Going to next type of SC. " << std::endl;
-    return; 
+
+  if (em == scColl->end()) {
+    //    std::cout << "No matching SC with type " << scType << " was found for
+    //    MC particle! "  << std::endl; std::cout << "Going to next type of SC.
+    //    " << std::endl;
+    return;
   }
-  //  ------------  
+  //  ------------
 
   tree_.em_scType = scType;
 
   tree_.em_isInCrack = 0;
   double emAbsEta = fabs(em->position().eta());
-  // copied from RecoEgama/EgammaElectronAlgos/src/EgammaElectronClassification.cc
-  if ( emAbsEta < 0.018 ||
-       (emAbsEta > 0.423 && emAbsEta < 0.461) || 
-       (emAbsEta > 0.770 && emAbsEta < 0.806) || 
-       (emAbsEta > 1.127 && emAbsEta < 1.163) || 
-       (emAbsEta > 1.460 && emAbsEta < 1.558) )
+  // copied from
+  // RecoEgama/EgammaElectronAlgos/src/EgammaElectronClassification.cc
+  if (emAbsEta < 0.018 || (emAbsEta > 0.423 && emAbsEta < 0.461) || (emAbsEta > 0.770 && emAbsEta < 0.806) ||
+      (emAbsEta > 1.127 && emAbsEta < 1.163) || (emAbsEta > 1.460 && emAbsEta < 1.558))
     tree_.em_isInCrack = 1;
-  
-  tree_.em_dR = kinem::delta_R(mc->momentum().eta(), mc->momentum().phi(), 
-			      em->position().eta(), em->position().phi());
-  tree_.em_e     = em->energy();
-  tree_.em_et    = em->energy() * sin(em->position().theta());
-  tree_.em_phi   = em->position().phi();
-  tree_.em_eta   = em->position().eta();
+
+  tree_.em_dR = kinem::delta_R(mc->momentum().eta(), mc->momentum().phi(), em->position().eta(), em->position().phi());
+  tree_.em_e = em->energy();
+  tree_.em_et = em->energy() * sin(em->position().theta());
+  tree_.em_phi = em->position().phi();
+  tree_.em_eta = em->position().eta();
   tree_.em_theta = em->position().theta();
   tree_.em_nCell = em->size();
-  tree_.em_nBC   = em->clustersSize();
-  
-  //Get physics e, et etc:
-  //Coordinates of EM object with respect of the point (0,0,0)
+  tree_.em_nBC = em->clustersSize();
+
+  // Get physics e, et etc:
+  // Coordinates of EM object with respect of the point (0,0,0)
   xClust_zero_ = em->position().x();
   yClust_zero_ = em->position().y();
   zClust_zero_ = em->position().z();
-  //Coordinates of EM object w.r.o. the Vertex position
+  // Coordinates of EM object w.r.o. the Vertex position
   xClust_vtx_ = xClust_zero_ - xV;
   yClust_vtx_ = yClust_zero_ - yV;
   zClust_vtx_ = zClust_zero_ - zV;
-    
+
   energyMax_ = em->energy();
   thetaMax_ = em->position().theta();
   etaMax_ = em->position().eta();
   phiMax_ = em->position().phi();
   eTMax_ = energyMax_ * sin(thetaMax_);
-  if ( phiMax_ < 0) phiMax_ += 2*3.14159;
-  
-  rClust_vtx_ = sqrt (xClust_vtx_*xClust_vtx_ + yClust_vtx_*yClust_vtx_ + zClust_vtx_*zClust_vtx_);
-  thetaMaxVtx_ = acos(zClust_vtx_/rClust_vtx_);
-  etaMaxVtx_   = - log(tan(thetaMaxVtx_/2));
-  eTMaxVtx_    = energyMax_ * sin(thetaMaxVtx_); 
-  phiMaxVtx_   = atan2(yClust_vtx_,xClust_vtx_); 
-  if ( phiMaxVtx_ < 0) phiMaxVtx_ += 2*3.14159;
+  if (phiMax_ < 0)
+    phiMax_ += 2 * 3.14159;
+
+  rClust_vtx_ = sqrt(xClust_vtx_ * xClust_vtx_ + yClust_vtx_ * yClust_vtx_ + zClust_vtx_ * zClust_vtx_);
+  thetaMaxVtx_ = acos(zClust_vtx_ / rClust_vtx_);
+  etaMaxVtx_ = -log(tan(thetaMaxVtx_ / 2));
+  eTMaxVtx_ = energyMax_ * sin(thetaMaxVtx_);
+  phiMaxVtx_ = atan2(yClust_vtx_, xClust_vtx_);
+  if (phiMaxVtx_ < 0)
+    phiMaxVtx_ += 2 * 3.14159;
   //=============================
-  //parametres of EM object after vertex correction
-  tree_.em_pet    = eTMaxVtx_;
-  tree_.em_pe     = tree_.em_pet/sin(thetaMaxVtx_);
-  tree_.em_peta   = etaMaxVtx_;
+  // parametres of EM object after vertex correction
+  tree_.em_pet = eTMaxVtx_;
+  tree_.em_pe = tree_.em_pet / sin(thetaMaxVtx_);
+  tree_.em_peta = etaMaxVtx_;
   tree_.em_ptheta = thetaMaxVtx_;
-  
-  
-  //-------------------------------   Get SC after energy correction 
+
+  //-------------------------------   Get SC after energy correction
   em = corrSCColl->end();
-  energyMax = -100.0; // dummy energy of the matched SC
-  for(reco::SuperClusterCollection::const_iterator aClus = corrSCColl->begin();
-      aClus != corrSCColl->end(); ++aClus) {
+  energyMax = -100.0;  // dummy energy of the matched SC
+  for (reco::SuperClusterCollection::const_iterator aClus = corrSCColl->begin(); aClus != corrSCColl->end(); ++aClus) {
     // check the matching
-    float dR = kinem::delta_R(mc   ->momentum().eta(), mc   ->momentum().phi(), 
-			      aClus->position().eta(), aClus->position().phi());
-    if (dR <  0.4) {
+    float dR =
+        kinem::delta_R(mc->momentum().eta(), mc->momentum().phi(), aClus->position().eta(), aClus->position().phi());
+    if (dR < 0.4) {
       float energy = aClus->energy();
-      if ( energy < energyMax ) continue;
+      if (energy < energyMax)
+        continue;
       energyMax = energy;
       em = aClus;
     }
   }
-  
-  if (em == corrSCColl->end() ) {
-    //    std::cout << "No matching corrected SC with type " << scType << " was found for MC particle! "  << std::endl;
-    //    std::cout << "Going to next type of SC. " << std::endl;
-    return; 
+
+  if (em == corrSCColl->end()) {
+    //    std::cout << "No matching corrected SC with type " << scType << " was
+    //    found for MC particle! "  << std::endl; std::cout << "Going to next
+    //    type of SC. " << std::endl;
+    return;
   }
-  //  ------------  
-  
-  ///fill tree with kinematic variables of corrected Super Cluster
-    tree_.emCorr_e     = em->energy();
-    tree_.emCorr_et    = em->energy() * sin(em->position().theta());
-    tree_.emCorr_phi   = em->position().phi();
-    tree_.emCorr_eta   = em->position().eta();
-    tree_.emCorr_theta = em->position().theta();
-      
-    // =========== Eta and Theta wrt Vertex does not change after energy corrections are applied
-    // =========== So, no need to calculate them again
-    
-    tree_.emCorr_peta   = tree_.em_peta;
-    tree_.emCorr_ptheta = tree_.em_ptheta;
-    tree_.emCorr_pet    = tree_.emCorr_e/cosh(tree_.emCorr_peta);
-
-    tree_.em_pw = em->phiWidth();
-    tree_.em_ew = em->etaWidth();
-    tree_.em_br = tree_.em_pw/tree_.em_ew;
-        
-    mytree_->Fill();
-    
+  //  ------------
+
+  /// fill tree with kinematic variables of corrected Super Cluster
+  tree_.emCorr_e = em->energy();
+  tree_.emCorr_et = em->energy() * sin(em->position().theta());
+  tree_.emCorr_phi = em->position().phi();
+  tree_.emCorr_eta = em->position().eta();
+  tree_.emCorr_theta = em->position().theta();
+
+  // =========== Eta and Theta wrt Vertex does not change after energy
+  // corrections are applied
+  // =========== So, no need to calculate them again
+
+  tree_.emCorr_peta = tree_.em_peta;
+  tree_.emCorr_ptheta = tree_.em_ptheta;
+  tree_.emCorr_pet = tree_.emCorr_e / cosh(tree_.emCorr_peta);
+
+  tree_.em_pw = em->phiWidth();
+  tree_.em_ew = em->etaWidth();
+  tree_.em_br = tree_.em_pw / tree_.em_ew;
+
+  mytree_->Fill();
 }
 
 //==========================================================================
-void
-EnergyScaleAnalyzer::endJob() {
+void EnergyScaleAnalyzer::endJob() {
   //========================================================================
-  //Fill ROOT tree
+  // Fill ROOT tree
   rootFile_->Write();
 }
 
diff --git a/Validation/EcalClusters/src/SealModule.cc b/Validation/EcalClusters/src/SealModule.cc
index 0bfbb0e072e7a..d49b4186060ba 100644
--- a/Validation/EcalClusters/src/SealModule.cc
+++ b/Validation/EcalClusters/src/SealModule.cc
@@ -1,12 +1,9 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "Validation/EcalClusters/interface/ContainmentCorrectionAnalyzer.h"
 #include "Validation/EcalClusters/interface/EgammaBasicClusters.h"
 #include "Validation/EcalClusters/interface/EgammaSuperClusters.h"
-#include "Validation/EcalClusters/interface/ContainmentCorrectionAnalyzer.h"
-
-
 
 DEFINE_FWK_MODULE(EgammaBasicClusters);
 DEFINE_FWK_MODULE(EgammaSuperClusters);
 DEFINE_FWK_MODULE(ContainmentCorrectionAnalyzer);
-
diff --git a/Validation/EcalDigis/interface/EcalMixingModuleValidation.h b/Validation/EcalDigis/interface/EcalMixingModuleValidation.h
index 6b987aa938fc7..1c09efc34c07f 100644
--- a/Validation/EcalDigis/interface/EcalMixingModuleValidation.h
+++ b/Validation/EcalDigis/interface/EcalMixingModuleValidation.h
@@ -107,7 +107,6 @@ void endRun(const edm::Run& r, const edm::EventSetup& c) override;
  
  bool verbose_;
 
- DQMStore* dbe_;
  
  std::string outputFile_;
  
diff --git a/Validation/EcalHits/interface/EcalBarrelSimHitsValidation.h b/Validation/EcalHits/interface/EcalBarrelSimHitsValidation.h
index 3d0fa7250f296..4c33245e949bf 100644
--- a/Validation/EcalHits/interface/EcalBarrelSimHitsValidation.h
+++ b/Validation/EcalHits/interface/EcalBarrelSimHitsValidation.h
@@ -6,127 +6,118 @@
  *
  * \author C.Rovelli
  *
-*/
+ */
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 #include "SimDataFormats/ValidationFormats/interface/PValidationFormats.h"
 
-#include <iostream>
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include <fstream>
-#include <vector>
+#include <iostream>
 #include <map>
-#include "DQMServices/Core/interface/MonitorElement.h"
-
-
-class EcalBarrelSimHitsValidation: public edm::EDAnalyzer{
+#include <vector>
 
-    typedef std::map<uint32_t,float,std::less<uint32_t> >  MapType;
+class EcalBarrelSimHitsValidation : public edm::EDAnalyzer {
+  typedef std::map<uint32_t, float, std::less<uint32_t>> MapType;
 
 public:
+  /// Constructor
+  EcalBarrelSimHitsValidation(const edm::ParameterSet &ps);
 
-/// Constructor
-EcalBarrelSimHitsValidation(const edm::ParameterSet& ps);
-
-/// Destructor
-~EcalBarrelSimHitsValidation() override;
+  /// Destructor
+  ~EcalBarrelSimHitsValidation() override;
 
 protected:
+  /// Analyze
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
-/// Analyze
-void analyze(const edm::Event& e, const edm::EventSetup& c) override;
-
-// BeginJob
-void beginJob() override;
+  // BeginJob
+  void beginJob() override;
 
-// EndJob
-void endJob(void) override;
+  // EndJob
+  void endJob(void) override;
 
 private:
+  uint32_t getUnitWithMaxEnergy(MapType &themap);
+
+  virtual float energyInMatrixEB(
+      int nCellInEta, int nCellInPhi, int centralEta, int centralPhi, int centralZ, MapType &themap);
+
+  std::vector<uint32_t> getIdsAroundMax(
+      int nCellInEta, int nCellInPhi, int centralEta, int centralPhi, int centralZ, MapType &themap);
 
- uint32_t getUnitWithMaxEnergy(MapType& themap);
+  bool fillEBMatrix(
+      int nCellInEta, int nCellInPhi, int CentralEta, int CentralPhi, int CentralZ, MapType &fillmap, MapType &themap);
 
- virtual float energyInMatrixEB(int nCellInEta, int nCellInPhi, 
-                                int centralEta, int centralPhi, int centralZ,
-                                MapType& themap); 
+  float eCluster2x2(MapType &themap);
+  float eCluster4x4(float e33, MapType &themap);
 
- std::vector<uint32_t> getIdsAroundMax(int nCellInEta, int nCellInPhi, 
-                                int centralEta, int centralPhi, int centralZ,
-                                MapType& themap); 
+  std::string g4InfoLabel;
+  std::string EBHitsCollection;
+  std::string ValidationCollection;
 
- 
- bool  fillEBMatrix(int nCellInEta, int nCellInPhi,
-                    int CentralEta, int CentralPhi,int CentralZ,
-                    MapType& fillmap, MapType&  themap);
- 
- float eCluster2x2( MapType& themap);
- float eCluster4x4(float e33,MapType& themap);
+  edm::EDGetTokenT<edm::PCaloHitContainer> EBHitsToken;
+  edm::EDGetTokenT<PEcalValidInfo> ValidationCollectionToken;
 
- std::string g4InfoLabel;
- std::string EBHitsCollection;
- std::string ValidationCollection;
+  bool verbose_;
 
- edm::EDGetTokenT<edm::PCaloHitContainer> EBHitsToken;
- edm::EDGetTokenT<PEcalValidInfo> ValidationCollectionToken;
+  DQMStore *dbe_;
 
- bool verbose_;
- 
- DQMStore* dbe_;
- 
- std::string outputFile_;
+  std::string outputFile_;
 
- int myEntries;
- float eRLength[26];
+  int myEntries;
+  float eRLength[26];
 
- MonitorElement* menEBHits_;
+  MonitorElement *menEBHits_;
 
- MonitorElement* menEBCrystals_;
+  MonitorElement *menEBCrystals_;
 
- MonitorElement* meEBOccupancy_;
+  MonitorElement *meEBOccupancy_;
 
- MonitorElement* meEBLongitudinalShower_;
+  MonitorElement *meEBLongitudinalShower_;
 
- MonitorElement* meEBhitEnergy_;
+  MonitorElement *meEBhitEnergy_;
 
- MonitorElement* meEBhitLog10Energy_;
+  MonitorElement *meEBhitLog10Energy_;
 
- MonitorElement* meEBhitLog10EnergyNorm_;
+  MonitorElement *meEBhitLog10EnergyNorm_;
 
- MonitorElement* meEBhitLog10Energy25Norm_;
+  MonitorElement *meEBhitLog10Energy25Norm_;
 
- MonitorElement* meEBhitEnergy2_;
+  MonitorElement *meEBhitEnergy2_;
 
- MonitorElement* meEBcrystalEnergy_;
+  MonitorElement *meEBcrystalEnergy_;
 
- MonitorElement* meEBcrystalEnergy2_;
+  MonitorElement *meEBcrystalEnergy2_;
 
- MonitorElement* meEBe1_; 
- MonitorElement* meEBe4_; 
- MonitorElement* meEBe9_; 
- MonitorElement* meEBe16_; 
- MonitorElement* meEBe25_; 
+  MonitorElement *meEBe1_;
+  MonitorElement *meEBe4_;
+  MonitorElement *meEBe9_;
+  MonitorElement *meEBe16_;
+  MonitorElement *meEBe25_;
 
- MonitorElement* meEBe1oe4_;
- MonitorElement* meEBe1oe9_;
- MonitorElement* meEBe4oe9_;
- MonitorElement* meEBe9oe16_;
- MonitorElement* meEBe1oe25_;
- MonitorElement* meEBe9oe25_; 
- MonitorElement* meEBe16oe25_;
+  MonitorElement *meEBe1oe4_;
+  MonitorElement *meEBe1oe9_;
+  MonitorElement *meEBe4oe9_;
+  MonitorElement *meEBe9oe16_;
+  MonitorElement *meEBe1oe25_;
+  MonitorElement *meEBe9oe25_;
+  MonitorElement *meEBe16oe25_;
 };
 
 #endif
diff --git a/Validation/EcalHits/interface/EcalEndcapSimHitsValidation.h b/Validation/EcalHits/interface/EcalEndcapSimHitsValidation.h
index f3b8c0b46891a..21c792a64e0fa 100644
--- a/Validation/EcalHits/interface/EcalEndcapSimHitsValidation.h
+++ b/Validation/EcalHits/interface/EcalEndcapSimHitsValidation.h
@@ -6,19 +6,19 @@
  *
  * \author C.Rovelli
  *
-*/
+ */
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
@@ -27,109 +27,99 @@
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 #include "SimDataFormats/ValidationFormats/interface/PValidationFormats.h"
 
-#include <iostream>
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include <fstream>
-#include <vector>
+#include <iostream>
 #include <map>
-#include "DQMServices/Core/interface/MonitorElement.h"
-
-
-class EcalEndcapSimHitsValidation: public edm::EDAnalyzer{
+#include <vector>
 
-    typedef std::map<uint32_t,float,std::less<uint32_t> >  MapType;
+class EcalEndcapSimHitsValidation : public edm::EDAnalyzer {
+  typedef std::map<uint32_t, float, std::less<uint32_t>> MapType;
 
 public:
+  /// Constructor
+  EcalEndcapSimHitsValidation(const edm::ParameterSet &ps);
 
-/// Constructor
-EcalEndcapSimHitsValidation(const edm::ParameterSet& ps);
-
-/// Destructor
-~EcalEndcapSimHitsValidation() override;
+  /// Destructor
+  ~EcalEndcapSimHitsValidation() override;
 
 protected:
+  /// Analyze
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
-/// Analyze
-void analyze(const edm::Event& e, const edm::EventSetup& c) override;
-
-// BeginJob
-void beginJob() override;
+  // BeginJob
+  void beginJob() override;
 
-// EndJob
-void endJob(void) override;
+  // EndJob
+  void endJob(void) override;
 
 private:
+  uint32_t getUnitWithMaxEnergy(MapType &themap);
+
+  virtual float energyInMatrixEE(int nCellInX, int nCellInY, int centralX, int centralY, int centralZ, MapType &themap);
+
+  std::vector<uint32_t> getIdsAroundMax(
+      int nCellInX, int nCellInY, int centralX, int centralY, int centralZ, MapType &themap);
 
- uint32_t getUnitWithMaxEnergy(MapType& themap);
+  bool fillEEMatrix(
+      int nCellInX, int nCellInY, int CentralX, int CentralY, int CentralZ, MapType &fillmap, MapType &themap);
 
- virtual float energyInMatrixEE(int nCellInX, int nCellInY, 
-                                int centralX, int centralY, int centralZ,
-                                MapType& themap); 
- 
- std::vector<uint32_t> getIdsAroundMax(int nCellInX, int nCellInY, 
-                                int centralX, int centralY, int centralZ,
-                                MapType& themap); 
+  float eCluster2x2(MapType &themap);
+  float eCluster4x4(float e33, MapType &themap);
 
- bool  fillEEMatrix(int nCellInX, int nCellInY,
-                    int CentralX, int CentralY,int CentralZ,
-                    MapType& fillmap, MapType&  themap);
+  std::string g4InfoLabel;
+  std::string EEHitsCollection;
+  std::string ValidationCollection;
 
- float eCluster2x2( MapType& themap);
- float eCluster4x4(float e33,MapType& themap);
+  edm::EDGetTokenT<edm::PCaloHitContainer> EEHitsToken;
+  edm::EDGetTokenT<PEcalValidInfo> ValidationCollectionToken;
 
- std::string g4InfoLabel;
- std::string EEHitsCollection;
- std::string ValidationCollection;
- 
- edm::EDGetTokenT<edm::PCaloHitContainer> EEHitsToken;
- edm::EDGetTokenT<PEcalValidInfo> ValidationCollectionToken;
+  bool verbose_;
 
- bool verbose_;
- 
- DQMStore* dbe_;
- 
- std::string outputFile_;
+  DQMStore *dbe_;
 
- int myEntries;
- float eRLength[26];
+  std::string outputFile_;
 
- MonitorElement* meEEzpHits_;
- MonitorElement* meEEzmHits_;
+  int myEntries;
+  float eRLength[26];
 
- MonitorElement* meEEzpCrystals_;
- MonitorElement* meEEzmCrystals_;
+  MonitorElement *meEEzpHits_;
+  MonitorElement *meEEzmHits_;
 
- MonitorElement* meEEzpOccupancy_;
- MonitorElement* meEEzmOccupancy_;
+  MonitorElement *meEEzpCrystals_;
+  MonitorElement *meEEzmCrystals_;
 
- MonitorElement* meEELongitudinalShower_;
+  MonitorElement *meEEzpOccupancy_;
+  MonitorElement *meEEzmOccupancy_;
 
- MonitorElement* meEEHitEnergy_;
+  MonitorElement *meEELongitudinalShower_;
 
- MonitorElement* meEEhitLog10Energy_;
+  MonitorElement *meEEHitEnergy_;
 
- MonitorElement* meEEhitLog10EnergyNorm_;
+  MonitorElement *meEEhitLog10Energy_;
 
- MonitorElement* meEEhitLog10Energy25Norm_;
+  MonitorElement *meEEhitLog10EnergyNorm_;
 
+  MonitorElement *meEEhitLog10Energy25Norm_;
 
- MonitorElement* meEEHitEnergy2_;
+  MonitorElement *meEEHitEnergy2_;
 
- MonitorElement* meEEcrystalEnergy_;
- MonitorElement* meEEcrystalEnergy2_;
+  MonitorElement *meEEcrystalEnergy_;
+  MonitorElement *meEEcrystalEnergy2_;
 
- MonitorElement* meEEe1_; 
- MonitorElement* meEEe4_; 
- MonitorElement* meEEe9_; 
- MonitorElement* meEEe16_; 
- MonitorElement* meEEe25_; 
+  MonitorElement *meEEe1_;
+  MonitorElement *meEEe4_;
+  MonitorElement *meEEe9_;
+  MonitorElement *meEEe16_;
+  MonitorElement *meEEe25_;
 
- MonitorElement* meEEe1oe4_;
- MonitorElement* meEEe1oe9_;
- MonitorElement* meEEe4oe9_;
- MonitorElement* meEEe9oe16_;
- MonitorElement* meEEe1oe25_;
- MonitorElement* meEEe9oe25_;
- MonitorElement* meEEe16oe25_;
+  MonitorElement *meEEe1oe4_;
+  MonitorElement *meEEe1oe9_;
+  MonitorElement *meEEe4oe9_;
+  MonitorElement *meEEe9oe16_;
+  MonitorElement *meEEe1oe25_;
+  MonitorElement *meEEe9oe25_;
+  MonitorElement *meEEe16oe25_;
 };
 
 #endif
diff --git a/Validation/EcalHits/interface/EcalPreshowerSimHitsValidation.h b/Validation/EcalHits/interface/EcalPreshowerSimHitsValidation.h
index 9bb5e8be531a2..9456f5b670c37 100644
--- a/Validation/EcalHits/interface/EcalPreshowerSimHitsValidation.h
+++ b/Validation/EcalHits/interface/EcalPreshowerSimHitsValidation.h
@@ -6,98 +6,92 @@
  *
  * \author C.Rovelli
  *
-*/
+ */
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
+#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "SimDataFormats/ValidationFormats/interface/PValidationFormats.h"
 
-#include <iostream>
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include <fstream>
-#include <vector>
+#include <iostream>
 #include <map>
-#include "DQMServices/Core/interface/MonitorElement.h"
-
-
-class EcalPreshowerSimHitsValidation: public edm::EDAnalyzer{
+#include <vector>
 
-    typedef std::map<uint32_t,float,std::less<uint32_t> >  MapType;
+class EcalPreshowerSimHitsValidation : public edm::EDAnalyzer {
+  typedef std::map<uint32_t, float, std::less<uint32_t>> MapType;
 
 public:
+  /// Constructor
+  EcalPreshowerSimHitsValidation(const edm::ParameterSet &ps);
 
-/// Constructor
-EcalPreshowerSimHitsValidation(const edm::ParameterSet& ps);
-
-/// Destructor
-~EcalPreshowerSimHitsValidation() override;
+  /// Destructor
+  ~EcalPreshowerSimHitsValidation() override;
 
 protected:
+  /// Analyze
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
-/// Analyze
-void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  // BeginJob
+  void beginJob() override;
 
-// BeginJob
-void beginJob() override;
-
-// EndJob
-void endJob(void) override;
+  // EndJob
+  void endJob(void) override;
 
 private:
+  std::string HepMCLabel;
+  std::string g4InfoLabel;
+  std::string EEHitsCollection;
+  std::string ESHitsCollection;
+
+  edm::EDGetTokenT<edm::HepMCProduct> HepMCToken;
+  edm::EDGetTokenT<edm::PCaloHitContainer> EEHitsToken;
+  edm::EDGetTokenT<edm::PCaloHitContainer> ESHitsToken;
 
- std::string HepMCLabel; 
- std::string g4InfoLabel; 
- std::string EEHitsCollection;
- std::string ESHitsCollection;
+  bool verbose_;
 
- edm::EDGetTokenT<edm::HepMCProduct> HepMCToken;
- edm::EDGetTokenT<edm::PCaloHitContainer> EEHitsToken;
- edm::EDGetTokenT<edm::PCaloHitContainer> ESHitsToken;
- 
- bool verbose_;
- 
- DQMStore* dbe_;
- 
- std::string outputFile_;
+  DQMStore *dbe_;
 
- MonitorElement* menESHits1zp_;
- MonitorElement* menESHits2zp_;
+  std::string outputFile_;
 
- MonitorElement* menESHits1zm_;
- MonitorElement* menESHits2zm_;
+  MonitorElement *menESHits1zp_;
+  MonitorElement *menESHits2zp_;
 
- MonitorElement* meEShitLog10Energy_;
- MonitorElement* meEShitLog10EnergyNorm_;
+  MonitorElement *menESHits1zm_;
+  MonitorElement *menESHits2zm_;
 
- MonitorElement* meESEnergyHits1zp_;
- MonitorElement* meESEnergyHits2zp_;
+  MonitorElement *meEShitLog10Energy_;
+  MonitorElement *meEShitLog10EnergyNorm_;
 
- MonitorElement* meESEnergyHits1zm_;
- MonitorElement* meESEnergyHits2zm_;
+  MonitorElement *meESEnergyHits1zp_;
+  MonitorElement *meESEnergyHits2zp_;
 
- MonitorElement* meE1alphaE2zp_;
- MonitorElement* meE1alphaE2zm_;
+  MonitorElement *meESEnergyHits1zm_;
+  MonitorElement *meESEnergyHits2zm_;
 
- MonitorElement* meEEoverESzp_;
- MonitorElement* meEEoverESzm_;
+  MonitorElement *meE1alphaE2zp_;
+  MonitorElement *meE1alphaE2zm_;
 
- MonitorElement* me2eszpOver1eszp_; 
- MonitorElement* me2eszmOver1eszm_; 
+  MonitorElement *meEEoverESzp_;
+  MonitorElement *meEEoverESzm_;
 
+  MonitorElement *me2eszpOver1eszp_;
+  MonitorElement *me2eszmOver1eszm_;
 };
 
 #endif
diff --git a/Validation/EcalHits/interface/EcalSimHitsValidProducer.h b/Validation/EcalHits/interface/EcalSimHitsValidProducer.h
index c491f8de57cd5..f72540128cf60 100644
--- a/Validation/EcalHits/interface/EcalSimHitsValidProducer.h
+++ b/Validation/EcalHits/interface/EcalSimHitsValidProducer.h
@@ -1,15 +1,15 @@
 #ifndef _EcalSimHitsValidProducer_h
 #define _EcalSimHitsValidProducer_h
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
- 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "SimG4Core/Watcher/interface/SimProducer.h"
-#include "SimG4Core/Notification/interface/Observer.h"
-#include "DataFormats/EcalDetId/interface/EEDetId.h"
+
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
+#include "DataFormats/EcalDetId/interface/EEDetId.h"
 #include "DataFormats/EcalDetId/interface/ESDetId.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "SimG4Core/Notification/interface/Observer.h"
+#include "SimG4Core/Watcher/interface/SimProducer.h"
 
 #include "DataFormats/Math/interface/LorentzVector.h"
 
@@ -19,71 +19,62 @@ class EndOfEvent;
 class PEcalValidInfo;
 
 namespace edm {
-    class ParameterSet;
+  class ParameterSet;
 }
 
 class EcalSimHitsValidProducer : public SimProducer,
-                         public Observer<const BeginOfEvent*>,
-                         public Observer<const G4Step*>,
-                         public Observer<const EndOfEvent*>
-{
-    typedef std::vector<float>  FloatVector;
-    typedef std::map<uint32_t,float,std::less<uint32_t> >  MapType;
+                                 public Observer<const BeginOfEvent *>,
+                                 public Observer<const G4Step *>,
+                                 public Observer<const EndOfEvent *> {
+  typedef std::vector<float> FloatVector;
+  typedef std::map<uint32_t, float, std::less<uint32_t>> MapType;
 
 public:
-    EcalSimHitsValidProducer(const edm::ParameterSet&);
-    ~EcalSimHitsValidProducer() override;
-
-    void produce(edm::Event&, const edm::EventSetup&) override;
+  EcalSimHitsValidProducer(const edm::ParameterSet &);
+  ~EcalSimHitsValidProducer() override;
 
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
 private:
-   EcalSimHitsValidProducer(const EcalSimHitsValidProducer&) = delete; // stop default
-   const EcalSimHitsValidProducer& operator=(const EcalSimHitsValidProducer&) = delete; // stop default
+  EcalSimHitsValidProducer(const EcalSimHitsValidProducer &) = delete;                   // stop default
+  const EcalSimHitsValidProducer &operator=(const EcalSimHitsValidProducer &) = delete;  // stop default
 
-   void update(const BeginOfEvent*) override;
-   void update(const G4Step*) override;
-   void update(const EndOfEvent*) override;
-   
-   void fillEventInfo(PEcalValidInfo&);
+  void update(const BeginOfEvent *) override;
+  void update(const G4Step *) override;
+  void update(const EndOfEvent *) override;
+
+  void fillEventInfo(PEcalValidInfo &);
 
 private:
-  uint32_t getUnitWithMaxEnergy(MapType& themap);
-
-  float energyInEEMatrix(int nCellInX, int nCellInY,
-                                int centralX, int centralY, int centralZ,
-                                MapType& themap);
-  float energyInEBMatrix(int nCellInX, int nCellInY,
-                                int centralX, int centralY, int centralZ,
-                                MapType& themap);
-  
-
-   bool  fillEEMatrix(int nCellInEta, int nCellInPhi,
-                         int CentralEta, int CentralPhi,int CentralZ,
-                                      MapType& fillmap, MapType&  themap);
-
-  bool  fillEBMatrix(int nCellInEta, int nCellInPhi,
-                       int CentralEta, int CentralPhi,int CentralZ,
-                                     MapType& fillmap, MapType&  themap);
-
-  float eCluster2x2( MapType& themap);
-  float eCluster4x4(float e33,MapType& themap);
-      
+  uint32_t getUnitWithMaxEnergy(MapType &themap);
+
+  float energyInEEMatrix(int nCellInX, int nCellInY, int centralX, int centralY, int centralZ, MapType &themap);
+  float energyInEBMatrix(int nCellInX, int nCellInY, int centralX, int centralY, int centralZ, MapType &themap);
+
+  bool fillEEMatrix(
+      int nCellInEta, int nCellInPhi, int CentralEta, int CentralPhi, int CentralZ, MapType &fillmap, MapType &themap);
+
+  bool fillEBMatrix(
+      int nCellInEta, int nCellInPhi, int CentralEta, int CentralPhi, int CentralZ, MapType &fillmap, MapType &themap);
+
+  float eCluster2x2(MapType &themap);
+  float eCluster4x4(float e33, MapType &themap);
+
 private:
-  float  ee1;
-  float  ee4;
-  float  ee9;
-  float  ee16;
-  float  ee25;
-
-  float  eb1;
-  float  eb4;
-  float  eb9;
-  float  eb16;
-  float  eb25;
+  float ee1;
+  float ee4;
+  float ee9;
+  float ee16;
+  float ee25;
+
+  float eb1;
+  float eb4;
+  float eb9;
+  float eb16;
+  float eb25;
 
   float totalEInEE;
-  float totalEInEB; 
+  float totalEInEB;
   float totalEInES;
 
   float totalEInEEzp;
@@ -106,41 +97,39 @@ class EcalSimHitsValidProducer : public SimProducer,
   int nHitsIn2ESzp;
   int nHitsIn2ESzm;
 
-  float  eBX0[26];
-  float  eEX0[26];
-
- 
-  FloatVector  eOf1ES;
-  FloatVector  eOf2ES;
-  FloatVector  eOf1ESzp;
-  FloatVector  eOf1ESzm;
-  FloatVector  eOf2ESzp;
-  FloatVector  eOf2ESzm;
-
-
-  FloatVector  zOfES;
-  FloatVector  phiOfEECaloG4Hit; 
-  FloatVector  etaOfEECaloG4Hit;
-  FloatVector  tOfEECaloG4Hit;
-  FloatVector  eOfEECaloG4Hit;
-  FloatVector  eOfEEPlusCaloG4Hit;
-  FloatVector  eOfEEMinusCaloG4Hit;
-
-  FloatVector  phiOfEBCaloG4Hit;
-  FloatVector  etaOfEBCaloG4Hit;
-  FloatVector  tOfEBCaloG4Hit;
-  FloatVector  eOfEBCaloG4Hit;
-
-  FloatVector  phiOfESCaloG4Hit;
-  FloatVector  etaOfESCaloG4Hit;
-  FloatVector  tOfESCaloG4Hit;
-  FloatVector  eOfESCaloG4Hit;
+  float eBX0[26];
+  float eEX0[26];
+
+  FloatVector eOf1ES;
+  FloatVector eOf2ES;
+  FloatVector eOf1ESzp;
+  FloatVector eOf1ESzm;
+  FloatVector eOf2ESzp;
+  FloatVector eOf2ESzm;
+
+  FloatVector zOfES;
+  FloatVector phiOfEECaloG4Hit;
+  FloatVector etaOfEECaloG4Hit;
+  FloatVector tOfEECaloG4Hit;
+  FloatVector eOfEECaloG4Hit;
+  FloatVector eOfEEPlusCaloG4Hit;
+  FloatVector eOfEEMinusCaloG4Hit;
+
+  FloatVector phiOfEBCaloG4Hit;
+  FloatVector etaOfEBCaloG4Hit;
+  FloatVector tOfEBCaloG4Hit;
+  FloatVector eOfEBCaloG4Hit;
+
+  FloatVector phiOfESCaloG4Hit;
+  FloatVector etaOfESCaloG4Hit;
+  FloatVector tOfESCaloG4Hit;
+  FloatVector eOfESCaloG4Hit;
 
   math::XYZTLorentzVector theMomentum;
   math::XYZTLorentzVector theVertex;
 
-  int     thePID; 
-  std::string  label;
+  int thePID;
+  std::string label;
 };
 
 #endif
diff --git a/Validation/EcalHits/interface/EcalSimHitsValidation.h b/Validation/EcalHits/interface/EcalSimHitsValidation.h
index c7235a8725c5b..5356b1a525d2c 100644
--- a/Validation/EcalHits/interface/EcalSimHitsValidation.h
+++ b/Validation/EcalHits/interface/EcalSimHitsValidation.h
@@ -6,83 +6,78 @@
  *
  * \author C.Rovelli
  *
-*/
+ */
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
+#include "SimDataFormats/CaloHit/interface/PCaloHit.h"
+#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 #include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
+#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "SimDataFormats/Track/interface/SimTrack.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
+#include "SimDataFormats/ValidationFormats/interface/PValidationFormats.h"
 #include "SimDataFormats/Vertex/interface/SimVertex.h"
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
-#include "SimDataFormats/CaloHit/interface/PCaloHit.h"
-#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
-#include "SimDataFormats/ValidationFormats/interface/PValidationFormats.h"
 
-#include <iostream>
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include <fstream>
-#include <vector>
+#include <iostream>
 #include <map>
-#include "DQMServices/Core/interface/MonitorElement.h"
+#include <vector>
 
+class EcalSimHitsValidation : public edm::EDAnalyzer {
+  typedef std::map<uint32_t, float, std::less<uint32_t>> MapType;
 
-class EcalSimHitsValidation: public edm::EDAnalyzer{
+public:
+  /// Constructor
+  EcalSimHitsValidation(const edm::ParameterSet &ps);
 
-    typedef std::map<uint32_t,float,std::less<uint32_t> >  MapType;
+  /// Destructor
+  ~EcalSimHitsValidation() override;
 
-public:
+protected:
+  /// Analyze
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
-/// Constructor
-EcalSimHitsValidation(const edm::ParameterSet& ps);
+  // BeginJob
+  void beginJob() override;
 
-/// Destructor
-~EcalSimHitsValidation() override;
+  // EndJob
+  void endJob(void) override;
 
-protected:
+private:
+  std::string g4InfoLabel;
+  edm::EDGetTokenT<edm::HepMCProduct> HepMCToken;
+  edm::EDGetTokenT<edm::PCaloHitContainer> EBHitsCollectionToken;
+  edm::EDGetTokenT<edm::PCaloHitContainer> EEHitsCollectionToken;
+  edm::EDGetTokenT<edm::PCaloHitContainer> ESHitsCollectionToken;
 
-/// Analyze
-void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  bool verbose_;
 
-// BeginJob
-void beginJob() override;
+  DQMStore *dbe_;
 
-// EndJob
-void endJob(void) override;
+  std::string outputFile_;
 
-private:
+  MonitorElement *meGunEnergy_;
+  MonitorElement *meGunEta_;
+  MonitorElement *meGunPhi_;
 
- std::string g4InfoLabel;
- edm::EDGetTokenT<edm::HepMCProduct> HepMCToken;
- edm::EDGetTokenT<edm::PCaloHitContainer> EBHitsCollectionToken;
- edm::EDGetTokenT<edm::PCaloHitContainer> EEHitsCollectionToken;
- edm::EDGetTokenT<edm::PCaloHitContainer> ESHitsCollectionToken;
-
- bool verbose_;
- 
- DQMStore* dbe_;
- 
- std::string outputFile_;
-
- MonitorElement* meGunEnergy_;
- MonitorElement* meGunEta_;
- MonitorElement* meGunPhi_;   
-
- MonitorElement* meEBEnergyFraction_;
- MonitorElement* meEEEnergyFraction_;
- MonitorElement* meESEnergyFraction_;
+  MonitorElement *meEBEnergyFraction_;
+  MonitorElement *meEEEnergyFraction_;
+  MonitorElement *meESEnergyFraction_;
 };
 
 #endif
diff --git a/Validation/EcalHits/src/EcalBarrelSimHitsValidation.cc b/Validation/EcalHits/src/EcalBarrelSimHitsValidation.cc
index 9ae1e7d9831f5..3b15bca9f67be 100644
--- a/Validation/EcalHits/src/EcalBarrelSimHitsValidation.cc
+++ b/Validation/EcalHits/src/EcalBarrelSimHitsValidation.cc
@@ -3,171 +3,174 @@
  *
  * \author C.Rovelli
  *
-*/
+ */
 
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/Utilities/interface/Exception.h"
-#include <DataFormats/EcalDetId/interface/EBDetId.h>
 #include "Validation/EcalHits/interface/EcalBarrelSimHitsValidation.h"
-#include "DQMServices/Core/interface/DQMStore.h"
+#include <DataFormats/EcalDetId/interface/EBDetId.h>
 
 using namespace cms;
 using namespace edm;
 using namespace std;
 
-EcalBarrelSimHitsValidation::EcalBarrelSimHitsValidation(const edm::ParameterSet& ps):
-  g4InfoLabel(ps.getParameter<std::string>("moduleLabelG4")),
-  EBHitsCollection(ps.getParameter<std::string>("EBHitsCollection")),
-  ValidationCollection(ps.getParameter<std::string>("ValidationCollection")){   
-
-  EBHitsToken               = consumes <edm::PCaloHitContainer> (edm::InputTag(std::string(g4InfoLabel),std::string(EBHitsCollection)));
-  ValidationCollectionToken = consumes <PEcalValidInfo>         (edm::InputTag(std::string(g4InfoLabel),std::string(ValidationCollection)));
+EcalBarrelSimHitsValidation::EcalBarrelSimHitsValidation(const edm::ParameterSet &ps)
+    : g4InfoLabel(ps.getParameter<std::string>("moduleLabelG4")),
+      EBHitsCollection(ps.getParameter<std::string>("EBHitsCollection")),
+      ValidationCollection(ps.getParameter<std::string>("ValidationCollection")) {
+  EBHitsToken =
+      consumes<edm::PCaloHitContainer>(edm::InputTag(std::string(g4InfoLabel), std::string(EBHitsCollection)));
+  ValidationCollectionToken =
+      consumes<PEcalValidInfo>(edm::InputTag(std::string(g4InfoLabel), std::string(ValidationCollection)));
   // verbosity switch
   verbose_ = ps.getUntrackedParameter<bool>("verbose", false);
- 
+
   // get hold of back-end interface
   dbe_ = nullptr;
-  dbe_ = edm::Service<DQMStore>().operator->();           
-  if ( dbe_ ) {
-    if ( verbose_ ) { dbe_->setVerbose(1); } 
-    else            { dbe_->setVerbose(0); }
+  dbe_ = edm::Service<DQMStore>().operator->();
+  if (dbe_) {
+    if (verbose_) {
+      dbe_->setVerbose(1);
+    } else {
+      dbe_->setVerbose(0);
+    }
   }
-                                                                               
-  if ( dbe_ ) {
-    if ( verbose_ ) dbe_->showDirStructure();
+
+  if (dbe_) {
+    if (verbose_)
+      dbe_->showDirStructure();
   }
- 
-  menEBHits_       = nullptr;
-  menEBCrystals_   = nullptr;
-  meEBOccupancy_   = nullptr;
+
+  menEBHits_ = nullptr;
+  menEBCrystals_ = nullptr;
+  meEBOccupancy_ = nullptr;
   meEBLongitudinalShower_ = nullptr;
-  meEBhitEnergy_   = nullptr;
-  meEBhitLog10Energy_       = nullptr;
-  meEBhitLog10EnergyNorm_   = nullptr;
+  meEBhitEnergy_ = nullptr;
+  meEBhitLog10Energy_ = nullptr;
+  meEBhitLog10EnergyNorm_ = nullptr;
   meEBhitLog10Energy25Norm_ = nullptr;
-  meEBhitEnergy2_   = nullptr;
-  meEBcrystalEnergy_   = nullptr;
-  meEBcrystalEnergy2_   = nullptr;
-
-  meEBe1_  = nullptr;  
-  meEBe4_  = nullptr;  
-  meEBe9_  = nullptr;  
-  meEBe16_ = nullptr; 
-  meEBe25_ = nullptr; 
-
-  meEBe1oe4_   = nullptr;  
-  meEBe1oe9_   = nullptr;  
-  meEBe4oe9_   = nullptr;  
-  meEBe9oe16_  = nullptr;
-  meEBe1oe25_  = nullptr;  
-  meEBe9oe25_  = nullptr; 
+  meEBhitEnergy2_ = nullptr;
+  meEBcrystalEnergy_ = nullptr;
+  meEBcrystalEnergy2_ = nullptr;
+
+  meEBe1_ = nullptr;
+  meEBe4_ = nullptr;
+  meEBe9_ = nullptr;
+  meEBe16_ = nullptr;
+  meEBe25_ = nullptr;
+
+  meEBe1oe4_ = nullptr;
+  meEBe1oe9_ = nullptr;
+  meEBe4oe9_ = nullptr;
+  meEBe9oe16_ = nullptr;
+  meEBe1oe25_ = nullptr;
+  meEBe9oe25_ = nullptr;
   meEBe16oe25_ = nullptr;
 
   myEntries = 0;
-  for (int myStep = 0; myStep<26; myStep++) { eRLength[myStep] = 0.0; }
+  for (int myStep = 0; myStep < 26; myStep++) {
+    eRLength[myStep] = 0.0;
+  }
 
   Char_t histo[200];
-   
-  if ( dbe_ ) {
+
+  if (dbe_) {
     dbe_->setCurrentFolder("EcalHitsV/EcalSimHitsValidation");
-  
-    sprintf (histo, "EB hits multiplicity" ) ;
-    menEBHits_ = dbe_->book1D(histo, histo, 50, 0., 5000.) ;
- 
-    sprintf (histo, "EB crystals multiplicity" ) ;
-    menEBCrystals_ = dbe_->book1D(histo, histo, 200, 0., 2000.) ; 
-
-    sprintf (histo, "EB occupancy" ) ;
+
+    sprintf(histo, "EB hits multiplicity");
+    menEBHits_ = dbe_->book1D(histo, histo, 50, 0., 5000.);
+
+    sprintf(histo, "EB crystals multiplicity");
+    menEBCrystals_ = dbe_->book1D(histo, histo, 200, 0., 2000.);
+
+    sprintf(histo, "EB occupancy");
     meEBOccupancy_ = dbe_->book2D(histo, histo, 360, 0., 360., 170, -85., 85.);
-  
-    sprintf (histo, "EB longitudinal shower profile" ) ;
+
+    sprintf(histo, "EB longitudinal shower profile");
     meEBLongitudinalShower_ = dbe_->bookProfile(histo, histo, 26, 0., 26., 100, 0., 20000.);
 
-    sprintf (histo, "EB hits energy spectrum" );
+    sprintf(histo, "EB hits energy spectrum");
     meEBhitEnergy_ = dbe_->book1D(histo, histo, 4000, 0., 400.);
 
-    sprintf (histo, "EB hits log10energy spectrum" );
+    sprintf(histo, "EB hits log10energy spectrum");
     meEBhitLog10Energy_ = dbe_->book1D(histo, histo, 140, -10., 4.);
 
-    sprintf (histo, "EB hits log10energy spectrum vs normalized energy" );
+    sprintf(histo, "EB hits log10energy spectrum vs normalized energy");
     meEBhitLog10EnergyNorm_ = dbe_->bookProfile(histo, histo, 140, -10., 4., 100, 0., 1.);
 
-    sprintf (histo, "EB hits log10energy spectrum vs normalized energy25" );
+    sprintf(histo, "EB hits log10energy spectrum vs normalized energy25");
     meEBhitLog10Energy25Norm_ = dbe_->bookProfile(histo, histo, 140, -10., 4., 100, 0., 1.);
 
-    sprintf (histo, "EB hits energy spectrum 2" );
+    sprintf(histo, "EB hits energy spectrum 2");
     meEBhitEnergy2_ = dbe_->book1D(histo, histo, 1000, 0., 0.001);
 
-    sprintf (histo, "EB crystal energy spectrum" );
+    sprintf(histo, "EB crystal energy spectrum");
     meEBcrystalEnergy_ = dbe_->book1D(histo, histo, 5000, 0., 50.);
 
-    sprintf (histo, "EB crystal energy spectrum 2" );
+    sprintf(histo, "EB crystal energy spectrum 2");
     meEBcrystalEnergy2_ = dbe_->book1D(histo, histo, 1000, 0., 0.001);
 
-    sprintf (histo, "EB E1" ) ;
+    sprintf(histo, "EB E1");
     meEBe1_ = dbe_->book1D(histo, histo, 400, 0., 400.);
 
-    sprintf (histo, "EB E4" ) ;
+    sprintf(histo, "EB E4");
     meEBe4_ = dbe_->book1D(histo, histo, 400, 0., 400.);
 
-    sprintf (histo, "EB E9" ) ;
+    sprintf(histo, "EB E9");
     meEBe9_ = dbe_->book1D(histo, histo, 400, 0., 400.);
 
-    sprintf (histo, "EB E16" ) ;
+    sprintf(histo, "EB E16");
     meEBe16_ = dbe_->book1D(histo, histo, 400, 0., 400.);
 
-    sprintf (histo, "EB E25" ) ;
+    sprintf(histo, "EB E25");
     meEBe25_ = dbe_->book1D(histo, histo, 400, 0., 400.);
 
-    sprintf (histo, "EB E1oE4" ) ;
+    sprintf(histo, "EB E1oE4");
     meEBe1oe4_ = dbe_->book1D(histo, histo, 100, 0.4, 1.1);
 
-    sprintf (histo, "EB E1oE9" ) ;
+    sprintf(histo, "EB E1oE9");
     meEBe1oe9_ = dbe_->book1D(histo, histo, 100, 0.4, 1.1);
 
-    sprintf (histo, "EB E4oE9" ) ;
+    sprintf(histo, "EB E4oE9");
     meEBe4oe9_ = dbe_->book1D(histo, histo, 100, 0.4, 1.1);
 
-    sprintf (histo, "EB E9oE16" ) ;
+    sprintf(histo, "EB E9oE16");
     meEBe9oe16_ = dbe_->book1D(histo, histo, 100, 0.4, 1.1);
 
-    sprintf (histo, "EB E1oE25" ) ;
+    sprintf(histo, "EB E1oE25");
     meEBe1oe25_ = dbe_->book1D(histo, histo, 100, 0.4, 1.1);
 
-    sprintf (histo, "EB E9oE25" ) ;
+    sprintf(histo, "EB E9oE25");
     meEBe9oe25_ = dbe_->book1D(histo, histo, 100, 0.4, 1.1);
 
-    sprintf (histo, "EB E16oE25" ) ;
+    sprintf(histo, "EB E16oE25");
     meEBe16oe25_ = dbe_->book1D(histo, histo, 100, 0.4, 1.1);
   }
 }
 
-EcalBarrelSimHitsValidation::~EcalBarrelSimHitsValidation(){
- 
-}
-
-void EcalBarrelSimHitsValidation::beginJob(){
+EcalBarrelSimHitsValidation::~EcalBarrelSimHitsValidation() {}
 
-}
+void EcalBarrelSimHitsValidation::beginJob() {}
 
-void EcalBarrelSimHitsValidation::endJob(){
-  
-  //for (int myStep=0; myStep<26; myStep++){
-  //  if (meEBLongitudinalShower_) meEBLongitudinalShower_->Fill(float(myStep), eRLength[myStep]/myEntries);
+void EcalBarrelSimHitsValidation::endJob() {
+  // for (int myStep=0; myStep<26; myStep++){
+  //  if (meEBLongitudinalShower_) meEBLongitudinalShower_->Fill(float(myStep),
+  //  eRLength[myStep]/myEntries);
   //}
 }
 
-void EcalBarrelSimHitsValidation::analyze(const edm::Event& e, const edm::EventSetup& c){
-
+void EcalBarrelSimHitsValidation::analyze(const edm::Event &e, const edm::EventSetup &c) {
   edm::LogInfo("EventInfo") << " Run = " << e.id().run() << " Event = " << e.id().event();
-  
+
   edm::Handle<edm::PCaloHitContainer> EcalHitsEB;
-  e.getByToken(EBHitsToken,EcalHitsEB);
+  e.getByToken(EBHitsToken, EcalHitsEB);
 
   // Do nothing if no Barrel data available
-  if( ! EcalHitsEB.isValid() ) return;
+  if (!EcalHitsEB.isValid())
+    return;
 
   edm::Handle<PEcalValidInfo> MyPEcalValidInfo;
-  e.getByToken(ValidationCollectionToken,MyPEcalValidInfo);
+  e.getByToken(ValidationCollectionToken, MyPEcalValidInfo);
 
   std::vector<PCaloHit> theEBCaloHits;
   theEBCaloHits.insert(theEBCaloHits.end(), EcalHitsEB->begin(), EcalHitsEB->end());
@@ -175,283 +178,301 @@ void EcalBarrelSimHitsValidation::analyze(const edm::Event& e, const edm::EventS
   myEntries++;
 
   double EBEnergy_ = 0.;
-  std::map<unsigned int, std::vector<PCaloHit*>,std::less<unsigned int> > CaloHitMap;
-  
-  double eb1  = 0.0;
-  double eb4  = 0.0;
-  double eb9  = 0.0;
+  std::map<unsigned int, std::vector<PCaloHit *>, std::less<unsigned int>> CaloHitMap;
+
+  double eb1 = 0.0;
+  double eb4 = 0.0;
+  double eb9 = 0.0;
   double eb16 = 0.0;
   double eb25 = 0.0;
-  std::vector<double> econtr(140, 0. );
-  std::vector<double> econtr25(140, 0. );
-  
+  std::vector<double> econtr(140, 0.);
+  std::vector<double> econtr25(140, 0.);
+
   MapType ebmap;
   uint32_t nEBHits = 0;
-  
-  for (std::vector<PCaloHit>::iterator isim = theEBCaloHits.begin();
-       isim != theEBCaloHits.end(); ++isim){
-
-    if ( isim->time() > 500. ) { continue; }
-
-    CaloHitMap[ isim->id()].push_back( &(*isim) );
-    
-    EBDetId ebid (isim->id()) ;
-    
-    LogDebug("HitInfo") 
-      << " CaloHit "    << isim->getName() << "\n" 
-      << " DetID = "    << isim->id()   << " EBDetId = " << ebid.ieta() << " " << ebid.iphi() << "\n" 
-      << " Time = "     << isim->time()    << "\n"
-      << " Track Id = " << isim->geantTrackId() << "\n"
-      << " Energy = "   << isim->energy();
-    
-    if (meEBOccupancy_) meEBOccupancy_->Fill( ebid.iphi(), ebid.ieta() );
-    
+
+  for (std::vector<PCaloHit>::iterator isim = theEBCaloHits.begin(); isim != theEBCaloHits.end(); ++isim) {
+    if (isim->time() > 500.) {
+      continue;
+    }
+
+    CaloHitMap[isim->id()].push_back(&(*isim));
+
+    EBDetId ebid(isim->id());
+
+    LogDebug("HitInfo") << " CaloHit " << isim->getName() << "\n"
+                        << " DetID = " << isim->id() << " EBDetId = " << ebid.ieta() << " " << ebid.iphi() << "\n"
+                        << " Time = " << isim->time() << "\n"
+                        << " Track Id = " << isim->geantTrackId() << "\n"
+                        << " Energy = " << isim->energy();
+
+    if (meEBOccupancy_)
+      meEBOccupancy_->Fill(ebid.iphi(), ebid.ieta());
+
     uint32_t crystid = ebid.rawId();
     ebmap[crystid] += isim->energy();
-    
+
     EBEnergy_ += isim->energy();
     nEBHits++;
     meEBhitEnergy_->Fill(isim->energy());
-    if( isim->energy() > 0 ) {
+    if (isim->energy() > 0) {
       meEBhitLog10Energy_->Fill(log10(isim->energy()));
-      int log10i = int( ( log10(isim->energy()) + 10. ) * 10. );
-      if( log10i >=0 && log10i < 140 ) econtr[log10i] += isim->energy();
+      int log10i = int((log10(isim->energy()) + 10.) * 10.);
+      if (log10i >= 0 && log10i < 140)
+        econtr[log10i] += isim->energy();
     }
     meEBhitEnergy2_->Fill(isim->energy());
-    
   }
 
-  if (menEBCrystals_) menEBCrystals_->Fill(ebmap.size());
+  if (menEBCrystals_)
+    menEBCrystals_->Fill(ebmap.size());
   if (meEBcrystalEnergy_) {
-    for (std::map<uint32_t,float,std::less<uint32_t> >::iterator it = ebmap.begin(); it != ebmap.end(); ++it ) meEBcrystalEnergy_->Fill((*it).second);
+    for (std::map<uint32_t, float, std::less<uint32_t>>::iterator it = ebmap.begin(); it != ebmap.end(); ++it)
+      meEBcrystalEnergy_->Fill((*it).second);
   }
   if (meEBcrystalEnergy2_) {
-    for (std::map<uint32_t,float,std::less<uint32_t> >::iterator it = ebmap.begin(); it != ebmap.end(); ++it ) meEBcrystalEnergy2_->Fill((*it).second);
+    for (std::map<uint32_t, float, std::less<uint32_t>>::iterator it = ebmap.begin(); it != ebmap.end(); ++it)
+      meEBcrystalEnergy2_->Fill((*it).second);
   }
-  
-  if (menEBHits_) menEBHits_->Fill(nEBHits);
-  
-  if (nEBHits > 0 ) {
-    
-    uint32_t  ebcenterid = getUnitWithMaxEnergy(ebmap);
+
+  if (menEBHits_)
+    menEBHits_->Fill(nEBHits);
+
+  if (nEBHits > 0) {
+    uint32_t ebcenterid = getUnitWithMaxEnergy(ebmap);
     EBDetId myEBid(ebcenterid);
     int bx = myEBid.ietaAbs();
     int by = myEBid.iphi();
     int bz = myEBid.zside();
-    eb1 =  energyInMatrixEB(1,1,bx,by,bz,ebmap);
-    if (meEBe1_) meEBe1_->Fill(eb1);
-    eb9 =  energyInMatrixEB(3,3,bx,by,bz,ebmap);
-    if (meEBe9_) meEBe9_->Fill(eb9);
-    eb25=  energyInMatrixEB(5,5,bx,by,bz,ebmap);
-    if (meEBe25_) meEBe25_->Fill(eb25);
-    
-    std::vector<uint32_t> ids25; ids25 = getIdsAroundMax(5,5,bx,by,bz,ebmap);
-
-    for( unsigned i=0; i<25; i++ ) {
-      for( unsigned int j=0; j<CaloHitMap[ids25[i]].size(); j++ ) {
-	if( CaloHitMap[ids25[i]][j]->energy() > 0 ) {
-	  int log10i = int( ( log10( CaloHitMap[ids25[i]][j]->energy()) + 10. ) * 10. );
-	  if( log10i >=0 && log10i < 140 ) econtr25[log10i] += CaloHitMap[ids25[i]][j]->energy();
-	}
+    eb1 = energyInMatrixEB(1, 1, bx, by, bz, ebmap);
+    if (meEBe1_)
+      meEBe1_->Fill(eb1);
+    eb9 = energyInMatrixEB(3, 3, bx, by, bz, ebmap);
+    if (meEBe9_)
+      meEBe9_->Fill(eb9);
+    eb25 = energyInMatrixEB(5, 5, bx, by, bz, ebmap);
+    if (meEBe25_)
+      meEBe25_->Fill(eb25);
+
+    std::vector<uint32_t> ids25;
+    ids25 = getIdsAroundMax(5, 5, bx, by, bz, ebmap);
+
+    for (unsigned i = 0; i < 25; i++) {
+      for (unsigned int j = 0; j < CaloHitMap[ids25[i]].size(); j++) {
+        if (CaloHitMap[ids25[i]][j]->energy() > 0) {
+          int log10i = int((log10(CaloHitMap[ids25[i]][j]->energy()) + 10.) * 10.);
+          if (log10i >= 0 && log10i < 140)
+            econtr25[log10i] += CaloHitMap[ids25[i]][j]->energy();
+        }
       }
     }
 
-    MapType  newebmap;
-    if( fillEBMatrix(3,3,bx,by,bz,newebmap, ebmap)){
+    MapType newebmap;
+    if (fillEBMatrix(3, 3, bx, by, bz, newebmap, ebmap)) {
       eb4 = eCluster2x2(newebmap);
-      if (meEBe4_) meEBe4_->Fill(eb4);
+      if (meEBe4_)
+        meEBe4_->Fill(eb4);
     }
-    if( fillEBMatrix(5,5,bx,by,bz,newebmap, ebmap)){
-      eb16 = eCluster4x4(eb9,newebmap); 
-      if (meEBe16_) meEBe16_->Fill(eb16);
+    if (fillEBMatrix(5, 5, bx, by, bz, newebmap, ebmap)) {
+      eb16 = eCluster4x4(eb9, newebmap);
+      if (meEBe16_)
+        meEBe16_->Fill(eb16);
     }
-    
-    if (meEBe1oe4_   && eb4  > 0.1 ) meEBe1oe4_  -> Fill(eb1/eb4);
-    if (meEBe1oe9_   && eb9  > 0.1 ) meEBe1oe9_  -> Fill(eb1/eb9);
-    if (meEBe4oe9_   && eb9  > 0.1 ) meEBe4oe9_  -> Fill(eb4/eb9);
-    if (meEBe9oe16_  && eb16 > 0.1 ) meEBe9oe16_ -> Fill(eb9/eb16);
-    if (meEBe1oe25_  && eb25 > 0.1 ) meEBe1oe25_ -> Fill(eb1/eb25);
-    if (meEBe9oe25_  && eb25 > 0.1 ) meEBe9oe25_ -> Fill(eb9/eb25);
-    if (meEBe16oe25_ && eb25 > 0.1 ) meEBe16oe25_-> Fill(eb16/eb25);
-
-    if( meEBhitLog10EnergyNorm_ && EBEnergy_ != 0 ) {
-      for( int i=0; i<140; i++ ) {
-	meEBhitLog10EnergyNorm_->Fill( -10.+(float(i)+0.5)/10., econtr[i]/EBEnergy_ );
+
+    if (meEBe1oe4_ && eb4 > 0.1)
+      meEBe1oe4_->Fill(eb1 / eb4);
+    if (meEBe1oe9_ && eb9 > 0.1)
+      meEBe1oe9_->Fill(eb1 / eb9);
+    if (meEBe4oe9_ && eb9 > 0.1)
+      meEBe4oe9_->Fill(eb4 / eb9);
+    if (meEBe9oe16_ && eb16 > 0.1)
+      meEBe9oe16_->Fill(eb9 / eb16);
+    if (meEBe1oe25_ && eb25 > 0.1)
+      meEBe1oe25_->Fill(eb1 / eb25);
+    if (meEBe9oe25_ && eb25 > 0.1)
+      meEBe9oe25_->Fill(eb9 / eb25);
+    if (meEBe16oe25_ && eb25 > 0.1)
+      meEBe16oe25_->Fill(eb16 / eb25);
+
+    if (meEBhitLog10EnergyNorm_ && EBEnergy_ != 0) {
+      for (int i = 0; i < 140; i++) {
+        meEBhitLog10EnergyNorm_->Fill(-10. + (float(i) + 0.5) / 10., econtr[i] / EBEnergy_);
       }
     }
 
-    if( meEBhitLog10Energy25Norm_ && eb25 != 0 ) {
-      for( int i=0; i<140; i++ ) {
-	meEBhitLog10Energy25Norm_->Fill( -10.+(float(i)+0.5)/10., econtr25[i]/eb25 );
+    if (meEBhitLog10Energy25Norm_ && eb25 != 0) {
+      for (int i = 0; i < 140; i++) {
+        meEBhitLog10Energy25Norm_->Fill(-10. + (float(i) + 0.5) / 10., econtr25[i] / eb25);
       }
     }
-
-
   }
-  
-
-  if( MyPEcalValidInfo.isValid() ) {
-    if ( MyPEcalValidInfo->eb1x1() > 0. ) {
-      std::vector<float>  BX0 = MyPEcalValidInfo->bX0();
-      if (meEBLongitudinalShower_) meEBLongitudinalShower_->Reset();
-      for (int myStep=0; myStep< 26; myStep++ ) { 
-	eRLength[myStep] += BX0[myStep]; 
-	if (meEBLongitudinalShower_) meEBLongitudinalShower_->Fill(float(myStep), eRLength[myStep]/myEntries);
+
+  if (MyPEcalValidInfo.isValid()) {
+    if (MyPEcalValidInfo->eb1x1() > 0.) {
+      std::vector<float> BX0 = MyPEcalValidInfo->bX0();
+      if (meEBLongitudinalShower_)
+        meEBLongitudinalShower_->Reset();
+      for (int myStep = 0; myStep < 26; myStep++) {
+        eRLength[myStep] += BX0[myStep];
+        if (meEBLongitudinalShower_)
+          meEBLongitudinalShower_->Fill(float(myStep), eRLength[myStep] / myEntries);
       }
     }
   }
 }
 
-float EcalBarrelSimHitsValidation::energyInMatrixEB(int nCellInEta, int nCellInPhi,
-					      int centralEta, int centralPhi,
-					      int centralZ, MapType& themap){
-
-  int   ncristals   = 0;
+float EcalBarrelSimHitsValidation::energyInMatrixEB(
+    int nCellInEta, int nCellInPhi, int centralEta, int centralPhi, int centralZ, MapType &themap) {
+  int ncristals = 0;
   float totalEnergy = 0.;
-  
-  int goBackInEta = nCellInEta/2;
-  int goBackInPhi = nCellInPhi/2;
-  int startEta    = centralZ*centralEta-goBackInEta;
-  int startPhi    = centralPhi-goBackInPhi;
-  
-  for (int ieta=startEta; ieta<startEta+nCellInEta; ieta++) {
-    for (int iphi=startPhi; iphi<startPhi+nCellInPhi; iphi++) {
-      
-      uint32_t index ;
-      if (abs(ieta) > 85 || abs(ieta)<1 ) { continue; }
-      if (iphi< 1)      { index = EBDetId(ieta,iphi+360).rawId(); }
-      else if(iphi>360) { index = EBDetId(ieta,iphi-360).rawId(); }
-      else              { index = EBDetId(ieta,iphi).rawId();     }
-
-      totalEnergy   += themap[index];
-      ncristals     += 1;
+
+  int goBackInEta = nCellInEta / 2;
+  int goBackInPhi = nCellInPhi / 2;
+  int startEta = centralZ * centralEta - goBackInEta;
+  int startPhi = centralPhi - goBackInPhi;
+
+  for (int ieta = startEta; ieta < startEta + nCellInEta; ieta++) {
+    for (int iphi = startPhi; iphi < startPhi + nCellInPhi; iphi++) {
+      uint32_t index;
+      if (abs(ieta) > 85 || abs(ieta) < 1) {
+        continue;
+      }
+      if (iphi < 1) {
+        index = EBDetId(ieta, iphi + 360).rawId();
+      } else if (iphi > 360) {
+        index = EBDetId(ieta, iphi - 360).rawId();
+      } else {
+        index = EBDetId(ieta, iphi).rawId();
+      }
+
+      totalEnergy += themap[index];
+      ncristals += 1;
     }
   }
-  
-  LogDebug("GeomInfo")
-    << nCellInEta << " x " << nCellInPhi 
-    << " EB matrix energy = " << totalEnergy
-    << " for " << ncristals << " crystals" ;
+
+  LogDebug("GeomInfo") << nCellInEta << " x " << nCellInPhi << " EB matrix energy = " << totalEnergy << " for "
+                       << ncristals << " crystals";
   return totalEnergy;
-  
-}   
-
-std::vector<uint32_t> EcalBarrelSimHitsValidation::getIdsAroundMax( int nCellInEta, int nCellInPhi, int centralEta, int centralPhi, int centralZ, MapType& themap){
-
-  int   ncristals   = 0;
-  std::vector<uint32_t> ids( nCellInEta*nCellInPhi );
-  
-  int goBackInEta = nCellInEta/2;
-  int goBackInPhi = nCellInPhi/2;
-  int startEta    = centralZ*centralEta-goBackInEta;
-  int startPhi    = centralPhi-goBackInPhi;
-  
-  for (int ieta=startEta; ieta<startEta+nCellInEta; ieta++) {
-    for (int iphi=startPhi; iphi<startPhi+nCellInPhi; iphi++) {
-      
-      uint32_t index ;
-      if (abs(ieta) > 85 || abs(ieta)<1 ) { continue; }
-      if (iphi< 1)      { index = EBDetId(ieta,iphi+360).rawId(); }
-      else if(iphi>360) { index = EBDetId(ieta,iphi-360).rawId(); }
-      else              { index = EBDetId(ieta,iphi).rawId();     }
+}
+
+std::vector<uint32_t> EcalBarrelSimHitsValidation::getIdsAroundMax(
+    int nCellInEta, int nCellInPhi, int centralEta, int centralPhi, int centralZ, MapType &themap) {
+  int ncristals = 0;
+  std::vector<uint32_t> ids(nCellInEta * nCellInPhi);
+
+  int goBackInEta = nCellInEta / 2;
+  int goBackInPhi = nCellInPhi / 2;
+  int startEta = centralZ * centralEta - goBackInEta;
+  int startPhi = centralPhi - goBackInPhi;
+
+  for (int ieta = startEta; ieta < startEta + nCellInEta; ieta++) {
+    for (int iphi = startPhi; iphi < startPhi + nCellInPhi; iphi++) {
+      uint32_t index;
+      if (abs(ieta) > 85 || abs(ieta) < 1) {
+        continue;
+      }
+      if (iphi < 1) {
+        index = EBDetId(ieta, iphi + 360).rawId();
+      } else if (iphi > 360) {
+        index = EBDetId(ieta, iphi - 360).rawId();
+      } else {
+        index = EBDetId(ieta, iphi).rawId();
+      }
       ids[ncristals] = index;
-      ncristals     += 1;
+      ncristals += 1;
     }
   }
-  
+
   return ids;
-  
-}   
-
-bool  EcalBarrelSimHitsValidation::fillEBMatrix(int nCellInEta, int nCellInPhi,
-                                    int CentralEta, int CentralPhi,int CentralZ,
-                                    MapType& fillmap, MapType&  themap)
-{
-  int goBackInEta = nCellInEta/2;
-  int goBackInPhi = nCellInPhi/2;
-  
-  int startEta  =  CentralZ*CentralEta - goBackInEta;
-  int startPhi  =  CentralPhi - goBackInPhi;
-  
-  int i = 0 ;
-  for ( int ieta = startEta; ieta < startEta+nCellInEta; ieta ++ ) {
-    for( int iphi = startPhi; iphi < startPhi + nCellInPhi; iphi++ ) {
-      uint32_t  index;
-      if (abs(ieta) > 85 || abs(ieta)<1 ) { continue; }
-      if (iphi< 1)      { index = EBDetId(ieta,iphi+360).rawId(); }
-      else if(iphi>360) { index = EBDetId(ieta,iphi-360).rawId(); }
-      else              { index = EBDetId(ieta,iphi).rawId();     }
+}
+
+bool EcalBarrelSimHitsValidation::fillEBMatrix(
+    int nCellInEta, int nCellInPhi, int CentralEta, int CentralPhi, int CentralZ, MapType &fillmap, MapType &themap) {
+  int goBackInEta = nCellInEta / 2;
+  int goBackInPhi = nCellInPhi / 2;
+
+  int startEta = CentralZ * CentralEta - goBackInEta;
+  int startPhi = CentralPhi - goBackInPhi;
+
+  int i = 0;
+  for (int ieta = startEta; ieta < startEta + nCellInEta; ieta++) {
+    for (int iphi = startPhi; iphi < startPhi + nCellInPhi; iphi++) {
+      uint32_t index;
+      if (abs(ieta) > 85 || abs(ieta) < 1) {
+        continue;
+      }
+      if (iphi < 1) {
+        index = EBDetId(ieta, iphi + 360).rawId();
+      } else if (iphi > 360) {
+        index = EBDetId(ieta, iphi - 360).rawId();
+      } else {
+        index = EBDetId(ieta, iphi).rawId();
+      }
       fillmap[i++] = themap[index];
     }
   }
-  
-  uint32_t  ebcenterid = getUnitWithMaxEnergy(themap);
-  
-  if ( fillmap[i/2] == themap[ebcenterid] ) 
+
+  uint32_t ebcenterid = getUnitWithMaxEnergy(themap);
+
+  if (fillmap[i / 2] == themap[ebcenterid])
     return true;
-  else 
+  else
     return false;
-} 
-
-float EcalBarrelSimHitsValidation::eCluster2x2( MapType& themap){
-  float  E22=0.;
-  float e012  = themap[0]+themap[1]+themap[2];
-  float e036  = themap[0]+themap[3]+themap[6];
-  float e678  = themap[6]+themap[7]+themap[8];
-  float e258  = themap[2]+themap[5]+themap[8];
-
-  if ( (e012>e678 || e012==e678) && (e036>e258  || e036==e258))
-    return     E22=themap[0]+themap[1]+themap[3]+themap[4];
-  else if ( (e012>e678 || e012==e678)  && (e036<e258 || e036==e258) )
-    return    E22=themap[1]+themap[2]+themap[4]+themap[5];
-  else if ( (e012<e678 || e012==e678) && (e036>e258 || e036==e258))
-    return     E22=themap[3]+themap[4]+themap[6]+themap[7];
-  else if ( (e012<e678|| e012==e678)  && (e036<e258|| e036==e258) )
-    return    E22=themap[4]+themap[5]+themap[7]+themap[8];
+}
+
+float EcalBarrelSimHitsValidation::eCluster2x2(MapType &themap) {
+  float E22 = 0.;
+  float e012 = themap[0] + themap[1] + themap[2];
+  float e036 = themap[0] + themap[3] + themap[6];
+  float e678 = themap[6] + themap[7] + themap[8];
+  float e258 = themap[2] + themap[5] + themap[8];
+
+  if ((e012 > e678 || e012 == e678) && (e036 > e258 || e036 == e258))
+    return E22 = themap[0] + themap[1] + themap[3] + themap[4];
+  else if ((e012 > e678 || e012 == e678) && (e036 < e258 || e036 == e258))
+    return E22 = themap[1] + themap[2] + themap[4] + themap[5];
+  else if ((e012 < e678 || e012 == e678) && (e036 > e258 || e036 == e258))
+    return E22 = themap[3] + themap[4] + themap[6] + themap[7];
+  else if ((e012 < e678 || e012 == e678) && (e036 < e258 || e036 == e258))
+    return E22 = themap[4] + themap[5] + themap[7] + themap[8];
   else {
     return E22;
   }
 }
 
-float EcalBarrelSimHitsValidation::eCluster4x4(float e33,  MapType&  themap){
-  float E44=0.;
-  float e0_4   = themap[0]+themap[1]+themap[2]+themap[3]+themap[4];
-  float e0_20  = themap[0]+themap[5]+themap[10]+themap[15]+themap[20];
-  float e4_24  = themap[4]+themap[9]+themap[14]+themap[19]+themap[24];
-  float e0_24  = themap[20]+themap[21]+themap[22]+themap[23]+themap[24];
-  
-  if ((e0_4>e0_24 || e0_4==e0_24) && (e0_20>e4_24|| e0_20==e4_24))
-    return E44=e33+themap[0]+themap[1]+themap[2]+themap[3]+themap[5]+themap[10]+themap[15];
-  else if ((e0_4>e0_24 || e0_4==e0_24)  && (e0_20<e4_24 || e0_20==e4_24))
-    return E44=e33+themap[1]+themap[2]+themap[3]+themap[4]+themap[9]+themap[14]+themap[19];
-  else if ((e0_4<e0_24|| e0_4==e0_24) && (e0_20>e4_24 || e0_20==e4_24))
-    return E44=e33+themap[5]+themap[10]+themap[15]+themap[20]+themap[21]+themap[22]+themap[23];
-  else if ((e0_4<e0_24|| e0_4==e0_24) && (e0_20<e4_24 || e0_20==e4_24))
-    return E44=e33+themap[21]+themap[22]+themap[23]+themap[24]+themap[9]+themap[14]+themap[19];
-  else{
+float EcalBarrelSimHitsValidation::eCluster4x4(float e33, MapType &themap) {
+  float E44 = 0.;
+  float e0_4 = themap[0] + themap[1] + themap[2] + themap[3] + themap[4];
+  float e0_20 = themap[0] + themap[5] + themap[10] + themap[15] + themap[20];
+  float e4_24 = themap[4] + themap[9] + themap[14] + themap[19] + themap[24];
+  float e0_24 = themap[20] + themap[21] + themap[22] + themap[23] + themap[24];
+
+  if ((e0_4 > e0_24 || e0_4 == e0_24) && (e0_20 > e4_24 || e0_20 == e4_24))
+    return E44 = e33 + themap[0] + themap[1] + themap[2] + themap[3] + themap[5] + themap[10] + themap[15];
+  else if ((e0_4 > e0_24 || e0_4 == e0_24) && (e0_20 < e4_24 || e0_20 == e4_24))
+    return E44 = e33 + themap[1] + themap[2] + themap[3] + themap[4] + themap[9] + themap[14] + themap[19];
+  else if ((e0_4 < e0_24 || e0_4 == e0_24) && (e0_20 > e4_24 || e0_20 == e4_24))
+    return E44 = e33 + themap[5] + themap[10] + themap[15] + themap[20] + themap[21] + themap[22] + themap[23];
+  else if ((e0_4 < e0_24 || e0_4 == e0_24) && (e0_20 < e4_24 || e0_20 == e4_24))
+    return E44 = e33 + themap[21] + themap[22] + themap[23] + themap[24] + themap[9] + themap[14] + themap[19];
+  else {
     return E44;
   }
 }
 
-uint32_t EcalBarrelSimHitsValidation::getUnitWithMaxEnergy(MapType& themap) {
-  
-  //look for max
+uint32_t EcalBarrelSimHitsValidation::getUnitWithMaxEnergy(MapType &themap) {
+  // look for max
   uint32_t unitWithMaxEnergy = 0;
-  float    maxEnergy = 0.;
-  
+  float maxEnergy = 0.;
+
   MapType::iterator iter;
   for (iter = themap.begin(); iter != themap.end(); iter++) {
-    
     if (maxEnergy < (*iter).second) {
-      maxEnergy = (*iter).second;       
+      maxEnergy = (*iter).second;
       unitWithMaxEnergy = (*iter).first;
-    }                           
+    }
   }
-  
-  LogDebug("GeomInfo")
-    << " max energy of " << maxEnergy 
-    << " GeV in Unit id " << unitWithMaxEnergy;
+
+  LogDebug("GeomInfo") << " max energy of " << maxEnergy << " GeV in Unit id " << unitWithMaxEnergy;
   return unitWithMaxEnergy;
 }
-
-
diff --git a/Validation/EcalHits/src/EcalEndcapSimHitsValidation.cc b/Validation/EcalHits/src/EcalEndcapSimHitsValidation.cc
index c1ec00c958cee..2f4b58cb32cb4 100644
--- a/Validation/EcalHits/src/EcalEndcapSimHitsValidation.cc
+++ b/Validation/EcalHits/src/EcalEndcapSimHitsValidation.cc
@@ -3,490 +3,499 @@
  *
  * \author C.Rovelli
  *
-*/
+ */
 
-#include <DataFormats/EcalDetId/interface/EEDetId.h>
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/Utilities/interface/Exception.h"
 #include "Validation/EcalHits/interface/EcalEndcapSimHitsValidation.h"
-#include "DQMServices/Core/interface/DQMStore.h"
+#include <DataFormats/EcalDetId/interface/EEDetId.h>
 
 using namespace cms;
 using namespace edm;
 using namespace std;
 
-EcalEndcapSimHitsValidation::EcalEndcapSimHitsValidation(const edm::ParameterSet& ps):
-  g4InfoLabel(ps.getParameter<std::string>("moduleLabelG4")),
-  EEHitsCollection(ps.getParameter<std::string>("EEHitsCollection")),
-  ValidationCollection(ps.getParameter<std::string>("ValidationCollection")){   
-
-  EEHitsToken               = consumes <edm::PCaloHitContainer> (edm::InputTag(std::string(g4InfoLabel),std::string(EEHitsCollection)));
-  ValidationCollectionToken = consumes <PEcalValidInfo>         (edm::InputTag(std::string(g4InfoLabel),std::string(ValidationCollection)));
+EcalEndcapSimHitsValidation::EcalEndcapSimHitsValidation(const edm::ParameterSet &ps)
+    : g4InfoLabel(ps.getParameter<std::string>("moduleLabelG4")),
+      EEHitsCollection(ps.getParameter<std::string>("EEHitsCollection")),
+      ValidationCollection(ps.getParameter<std::string>("ValidationCollection")) {
+  EEHitsToken =
+      consumes<edm::PCaloHitContainer>(edm::InputTag(std::string(g4InfoLabel), std::string(EEHitsCollection)));
+  ValidationCollectionToken =
+      consumes<PEcalValidInfo>(edm::InputTag(std::string(g4InfoLabel), std::string(ValidationCollection)));
   // verbosity switch
   verbose_ = ps.getUntrackedParameter<bool>("verbose", false);
- 
+
   // get hold of back-end interface
   dbe_ = nullptr;
-  dbe_ = edm::Service<DQMStore>().operator->();           
-  if ( dbe_ ) {
-    if ( verbose_ ) { dbe_->setVerbose(1); } 
-    else            { dbe_->setVerbose(0); }
+  dbe_ = edm::Service<DQMStore>().operator->();
+  if (dbe_) {
+    if (verbose_) {
+      dbe_->setVerbose(1);
+    } else {
+      dbe_->setVerbose(0);
+    }
   }
-                                                                                                            
-  if ( dbe_ ) {
-    if ( verbose_ ) dbe_->showDirStructure();
+
+  if (dbe_) {
+    if (verbose_)
+      dbe_->showDirStructure();
   }
- 
-
-  meEEzpHits_             = nullptr;
-  meEEzmHits_             = nullptr;
-  meEEzpCrystals_         = nullptr;
-  meEEzmCrystals_         = nullptr;
-  meEEzpOccupancy_        = nullptr;
-  meEEzmOccupancy_        = nullptr;
+
+  meEEzpHits_ = nullptr;
+  meEEzmHits_ = nullptr;
+  meEEzpCrystals_ = nullptr;
+  meEEzmCrystals_ = nullptr;
+  meEEzpOccupancy_ = nullptr;
+  meEEzmOccupancy_ = nullptr;
   meEELongitudinalShower_ = nullptr;
-  meEEHitEnergy_          = nullptr;
-  meEEhitLog10Energy_       = nullptr;
-  meEEhitLog10EnergyNorm_   = nullptr;
+  meEEHitEnergy_ = nullptr;
+  meEEhitLog10Energy_ = nullptr;
+  meEEhitLog10EnergyNorm_ = nullptr;
   meEEhitLog10Energy25Norm_ = nullptr;
-  meEEHitEnergy2_         = nullptr;
-  meEEcrystalEnergy_      = nullptr;
-  meEEcrystalEnergy2_     = nullptr;
-
-  meEEe1_  = nullptr;  
-  meEEe4_  = nullptr;  
-  meEEe9_  = nullptr;  
-  meEEe16_ = nullptr; 
-  meEEe25_ = nullptr; 
-
-  meEEe1oe4_   = nullptr;  
-  meEEe1oe9_   = nullptr;  
-  meEEe4oe9_   = nullptr;  
-  meEEe9oe16_  = nullptr;
-  meEEe1oe25_  = nullptr;  
-  meEEe9oe25_  = nullptr; 
+  meEEHitEnergy2_ = nullptr;
+  meEEcrystalEnergy_ = nullptr;
+  meEEcrystalEnergy2_ = nullptr;
+
+  meEEe1_ = nullptr;
+  meEEe4_ = nullptr;
+  meEEe9_ = nullptr;
+  meEEe16_ = nullptr;
+  meEEe25_ = nullptr;
+
+  meEEe1oe4_ = nullptr;
+  meEEe1oe9_ = nullptr;
+  meEEe4oe9_ = nullptr;
+  meEEe9oe16_ = nullptr;
+  meEEe1oe25_ = nullptr;
+  meEEe9oe25_ = nullptr;
   meEEe16oe25_ = nullptr;
 
   myEntries = 0;
-  for ( int myStep = 0; myStep<26; myStep++) { eRLength[myStep] = 0.0; }
+  for (int myStep = 0; myStep < 26; myStep++) {
+    eRLength[myStep] = 0.0;
+  }
 
   Char_t histo[200];
- 
-  if ( dbe_ ) {
+
+  if (dbe_) {
     dbe_->setCurrentFolder("EcalHitsV/EcalSimHitsValidation");
-  
-    sprintf (histo, "EE+ hits multiplicity" ) ;
-    meEEzpHits_ = dbe_->book1D(histo, histo, 50, 0., 5000.) ; 
 
-    sprintf (histo, "EE- hits multiplicity" ) ;
-    meEEzmHits_ = dbe_->book1D(histo, histo, 50, 0., 5000.) ; 
+    sprintf(histo, "EE+ hits multiplicity");
+    meEEzpHits_ = dbe_->book1D(histo, histo, 50, 0., 5000.);
+
+    sprintf(histo, "EE- hits multiplicity");
+    meEEzmHits_ = dbe_->book1D(histo, histo, 50, 0., 5000.);
 
-    sprintf (histo, "EE+ crystals multiplicity" ) ;
-    meEEzpCrystals_ = dbe_->book1D(histo, histo, 200, 0., 2000.) ; 
+    sprintf(histo, "EE+ crystals multiplicity");
+    meEEzpCrystals_ = dbe_->book1D(histo, histo, 200, 0., 2000.);
 
-    sprintf (histo, "EE- crystals multiplicity" ) ;
-    meEEzmCrystals_ = dbe_->book1D(histo, histo, 200, 0., 2000.) ; 
+    sprintf(histo, "EE- crystals multiplicity");
+    meEEzmCrystals_ = dbe_->book1D(histo, histo, 200, 0., 2000.);
 
-    sprintf (histo, "EE+ occupancy" ) ;
+    sprintf(histo, "EE+ occupancy");
     meEEzpOccupancy_ = dbe_->book2D(histo, histo, 100, 0., 100., 100, 0., 100.);
-  
-    sprintf (histo, "EE- occupancy" ) ;
+
+    sprintf(histo, "EE- occupancy");
     meEEzmOccupancy_ = dbe_->book2D(histo, histo, 100, 0., 100., 100, 0., 100.);
-  
-    sprintf (histo, "EE longitudinal shower profile" ) ;
-    meEELongitudinalShower_ = dbe_->bookProfile(histo, histo, 26,0,26, 100, 0, 20000);
 
-    sprintf (histo, "EE hits energy spectrum" );
+    sprintf(histo, "EE longitudinal shower profile");
+    meEELongitudinalShower_ = dbe_->bookProfile(histo, histo, 26, 0, 26, 100, 0, 20000);
+
+    sprintf(histo, "EE hits energy spectrum");
     meEEHitEnergy_ = dbe_->book1D(histo, histo, 4000, 0., 400.);
 
-    sprintf (histo, "EE hits log10energy spectrum" );
+    sprintf(histo, "EE hits log10energy spectrum");
     meEEhitLog10Energy_ = dbe_->book1D(histo, histo, 140, -10., 4.);
 
-    sprintf (histo, "EE hits log10energy spectrum vs normalized energy" );
+    sprintf(histo, "EE hits log10energy spectrum vs normalized energy");
     meEEhitLog10EnergyNorm_ = dbe_->bookProfile(histo, histo, 140, -10., 4., 100, 0., 1.);
 
-    sprintf (histo, "EE hits log10energy spectrum vs normalized energy25" );
+    sprintf(histo, "EE hits log10energy spectrum vs normalized energy25");
     meEEhitLog10Energy25Norm_ = dbe_->bookProfile(histo, histo, 140, -10., 4., 100, 0., 1.);
 
-    sprintf (histo, "EE hits energy spectrum 2" );
+    sprintf(histo, "EE hits energy spectrum 2");
     meEEHitEnergy2_ = dbe_->book1D(histo, histo, 1000, 0., 0.001);
 
-    sprintf (histo, "EE crystal energy spectrum" );
+    sprintf(histo, "EE crystal energy spectrum");
     meEEcrystalEnergy_ = dbe_->book1D(histo, histo, 5000, 0., 50.);
 
-    sprintf (histo, "EE crystal energy spectrum 2" );
+    sprintf(histo, "EE crystal energy spectrum 2");
     meEEcrystalEnergy2_ = dbe_->book1D(histo, histo, 1000, 0., 0.001);
 
-    sprintf (histo, "EE E1" ) ;
+    sprintf(histo, "EE E1");
     meEEe1_ = dbe_->book1D(histo, histo, 400, 0., 400.);
 
-    sprintf (histo, "EE E4" ) ;
+    sprintf(histo, "EE E4");
     meEEe4_ = dbe_->book1D(histo, histo, 400, 0., 400.);
 
-    sprintf (histo, "EE E9" ) ;
+    sprintf(histo, "EE E9");
     meEEe9_ = dbe_->book1D(histo, histo, 400, 0., 400.);
 
-    sprintf (histo, "EE E16" ) ;
+    sprintf(histo, "EE E16");
     meEEe16_ = dbe_->book1D(histo, histo, 400, 0., 400.);
 
-    sprintf (histo, "EE E25" ) ;
+    sprintf(histo, "EE E25");
     meEEe25_ = dbe_->book1D(histo, histo, 400, 0., 400.);
 
-    sprintf (histo, "EE E1oE4" ) ;
+    sprintf(histo, "EE E1oE4");
     meEEe1oe4_ = dbe_->book1D(histo, histo, 100, 0.4, 1.1);
 
-    sprintf (histo, "EE E1oE9" ) ;
+    sprintf(histo, "EE E1oE9");
     meEEe1oe9_ = dbe_->book1D(histo, histo, 100, 0.4, 1.1);
 
-    sprintf (histo, "EE E4oE9" ) ;
+    sprintf(histo, "EE E4oE9");
     meEEe4oe9_ = dbe_->book1D(histo, histo, 100, 0.4, 1.1);
 
-    sprintf (histo, "EE E9oE16" ) ;
+    sprintf(histo, "EE E9oE16");
     meEEe9oe16_ = dbe_->book1D(histo, histo, 100, 0.4, 1.1);
 
-    sprintf (histo, "EE E1oE25" ) ;
+    sprintf(histo, "EE E1oE25");
     meEEe1oe25_ = dbe_->book1D(histo, histo, 100, 0.4, 1.1);
 
-    sprintf (histo, "EE E9oE25" ) ;
+    sprintf(histo, "EE E9oE25");
     meEEe9oe25_ = dbe_->book1D(histo, histo, 100, 0.4, 1.1);
 
-    sprintf (histo, "EE E16oE25" ) ;
+    sprintf(histo, "EE E16oE25");
     meEEe16oe25_ = dbe_->book1D(histo, histo, 100, 0.4, 1.1);
   }
 }
 
-EcalEndcapSimHitsValidation::~EcalEndcapSimHitsValidation(){
-
-}
-
-void EcalEndcapSimHitsValidation::beginJob(){
-
-}
+EcalEndcapSimHitsValidation::~EcalEndcapSimHitsValidation() {}
 
-void EcalEndcapSimHitsValidation::endJob(){
+void EcalEndcapSimHitsValidation::beginJob() {}
 
-  //for ( int myStep = 0; myStep<26; myStep++){
-  //  if (meEELongitudinalShower_) meEELongitudinalShower_->Fill(float(myStep), eRLength[myStep]/myEntries);
+void EcalEndcapSimHitsValidation::endJob() {
+  // for ( int myStep = 0; myStep<26; myStep++){
+  //  if (meEELongitudinalShower_) meEELongitudinalShower_->Fill(float(myStep),
+  //  eRLength[myStep]/myEntries);
   //}
-
 }
 
-void EcalEndcapSimHitsValidation::analyze(const edm::Event& e, const edm::EventSetup& c){
-
+void EcalEndcapSimHitsValidation::analyze(const edm::Event &e, const edm::EventSetup &c) {
   edm::LogInfo("EventInfo") << " Run = " << e.id().run() << " Event = " << e.id().event();
-  
+
   edm::Handle<edm::PCaloHitContainer> EcalHitsEE;
-  e.getByToken(EEHitsToken,EcalHitsEE);
+  e.getByToken(EEHitsToken, EcalHitsEE);
 
   // Do nothing if no EndCap data available
-  if( ! EcalHitsEE.isValid() ) return;
+  if (!EcalHitsEE.isValid())
+    return;
 
   edm::Handle<PEcalValidInfo> MyPEcalValidInfo;
-  e.getByToken(ValidationCollectionToken,MyPEcalValidInfo);
+  e.getByToken(ValidationCollectionToken, MyPEcalValidInfo);
 
   std::vector<PCaloHit> theEECaloHits;
   theEECaloHits.insert(theEECaloHits.end(), EcalHitsEE->begin(), EcalHitsEE->end());
-  
+
   myEntries++;
 
-  std::map<unsigned int, std::vector<PCaloHit*>,std::less<unsigned int> > CaloHitMap;
-  
+  std::map<unsigned int, std::vector<PCaloHit *>, std::less<unsigned int>> CaloHitMap;
+
   double EEetzp_ = 0.;
   double EEetzm_ = 0.;
-  
-  double ee1  = 0.0;
-  double ee4  = 0.0;
-  double ee9  = 0.0;
+
+  double ee1 = 0.0;
+  double ee4 = 0.0;
+  double ee9 = 0.0;
   double ee16 = 0.0;
   double ee25 = 0.0;
-  std::vector<double> econtr(140, 0. );
-  std::vector<double> econtr25(140, 0. );
-  
+  std::vector<double> econtr(140, 0.);
+  std::vector<double> econtr25(140, 0.);
+
   MapType eemap;
   MapType eemapzp;
   MapType eemapzm;
   uint32_t nEEzpHits = 0;
   uint32_t nEEzmHits = 0;
-  
-  for (std::vector<PCaloHit>::iterator isim = theEECaloHits.begin();
-       isim != theEECaloHits.end(); ++isim){
-
-    if ( isim->time() > 500. ) { continue; }
-
-    CaloHitMap[ isim->id()].push_back(&(*isim));
-    
-    EEDetId eeid (isim->id()) ;
-    
-    LogDebug("HitInfo") 
-      << " CaloHit " << isim->getName() << "\n" 
-      << " DetID = "<<isim->id()<< " EEDetId = " << eeid.ix() << " " << eeid.iy() << "\n"	
-      << " Time = " << isim->time() << "\n"
-      << " Track Id = " << isim->geantTrackId() << "\n"
-      << " Energy = " << isim->energy();
-    
+
+  for (std::vector<PCaloHit>::iterator isim = theEECaloHits.begin(); isim != theEECaloHits.end(); ++isim) {
+    if (isim->time() > 500.) {
+      continue;
+    }
+
+    CaloHitMap[isim->id()].push_back(&(*isim));
+
+    EEDetId eeid(isim->id());
+
+    LogDebug("HitInfo") << " CaloHit " << isim->getName() << "\n"
+                        << " DetID = " << isim->id() << " EEDetId = " << eeid.ix() << " " << eeid.iy() << "\n"
+                        << " Time = " << isim->time() << "\n"
+                        << " Track Id = " << isim->geantTrackId() << "\n"
+                        << " Energy = " << isim->energy();
+
     uint32_t crystid = eeid.rawId();
-     
-    if (eeid.zside() > 0 ) {
+
+    if (eeid.zside() > 0) {
       nEEzpHits++;
       EEetzp_ += isim->energy();
       eemapzp[crystid] += isim->energy();
-      if (meEEzpOccupancy_) meEEzpOccupancy_->Fill(eeid.ix(), eeid.iy());
-    }
-    else if (eeid.zside() < 0 ) {
+      if (meEEzpOccupancy_)
+        meEEzpOccupancy_->Fill(eeid.ix(), eeid.iy());
+    } else if (eeid.zside() < 0) {
       nEEzmHits++;
       EEetzm_ += isim->energy();
       eemapzm[crystid] += isim->energy();
-      if (meEEzmOccupancy_) meEEzmOccupancy_->Fill(eeid.ix(), eeid.iy());
+      if (meEEzmOccupancy_)
+        meEEzmOccupancy_->Fill(eeid.ix(), eeid.iy());
     }
 
-    if (meEEHitEnergy_) meEEHitEnergy_->Fill(isim->energy());
-    if( isim->energy() > 0 ) {
-      if( meEEhitLog10Energy_ ) meEEhitLog10Energy_->Fill(log10(isim->energy()));
-      int log10i = int( ( log10(isim->energy()) + 10. ) * 10. );
-      if( log10i >=0 && log10i < 140 ) econtr[log10i] += isim->energy();
+    if (meEEHitEnergy_)
+      meEEHitEnergy_->Fill(isim->energy());
+    if (isim->energy() > 0) {
+      if (meEEhitLog10Energy_)
+        meEEhitLog10Energy_->Fill(log10(isim->energy()));
+      int log10i = int((log10(isim->energy()) + 10.) * 10.);
+      if (log10i >= 0 && log10i < 140)
+        econtr[log10i] += isim->energy();
     }
-    if (meEEHitEnergy2_) meEEHitEnergy2_->Fill(isim->energy());
+    if (meEEHitEnergy2_)
+      meEEHitEnergy2_->Fill(isim->energy());
     eemap[crystid] += isim->energy();
+  }
 
+  if (meEEzpCrystals_)
+    meEEzpCrystals_->Fill(eemapzp.size());
+  if (meEEzmCrystals_)
+    meEEzmCrystals_->Fill(eemapzm.size());
 
-  }
-  
-  if (meEEzpCrystals_) meEEzpCrystals_->Fill(eemapzp.size());
-  if (meEEzmCrystals_) meEEzmCrystals_->Fill(eemapzm.size());
-  
   if (meEEcrystalEnergy_) {
-    for (std::map<uint32_t,float,std::less<uint32_t> >::iterator it = eemap.begin(); it != eemap.end(); ++it ) meEEcrystalEnergy_->Fill((*it).second);
+    for (std::map<uint32_t, float, std::less<uint32_t>>::iterator it = eemap.begin(); it != eemap.end(); ++it)
+      meEEcrystalEnergy_->Fill((*it).second);
   }
   if (meEEcrystalEnergy2_) {
-    for (std::map<uint32_t,float,std::less<uint32_t> >::iterator it = eemap.begin(); it != eemap.end(); ++it ) meEEcrystalEnergy2_->Fill((*it).second);
+    for (std::map<uint32_t, float, std::less<uint32_t>>::iterator it = eemap.begin(); it != eemap.end(); ++it)
+      meEEcrystalEnergy2_->Fill((*it).second);
   }
-    
-  if (meEEzpHits_)    meEEzpHits_->Fill(nEEzpHits);
-  if (meEEzmHits_)    meEEzmHits_->Fill(nEEzmHits);
-    
-  
+
+  if (meEEzpHits_)
+    meEEzpHits_->Fill(nEEzpHits);
+  if (meEEzmHits_)
+    meEEzmHits_->Fill(nEEzmHits);
+
   int nEEHits = nEEzmHits + nEEzpHits;
   if (nEEHits > 0) {
-    
-    uint32_t  eecenterid = getUnitWithMaxEnergy(eemap);
+    uint32_t eecenterid = getUnitWithMaxEnergy(eemap);
     EEDetId myEEid(eecenterid);
     int bx = myEEid.ix();
     int by = myEEid.iy();
     int bz = myEEid.zside();
-    ee1 =  energyInMatrixEE(1,1,bx,by,bz,eemap);
-    if (meEEe1_) meEEe1_->Fill(ee1);
-    ee9 =  energyInMatrixEE(3,3,bx,by,bz,eemap);
-    if (meEEe9_) meEEe9_->Fill(ee9);
-    ee25=  energyInMatrixEE(5,5,bx,by,bz,eemap);
-    if (meEEe25_) meEEe25_->Fill(ee25);
-    
-    std::vector<uint32_t> ids25; ids25 = getIdsAroundMax(5,5,bx,by,bz,eemap);
-
-    for( unsigned i=0; i<25; i++ ) {
-      for( unsigned int j=0; j<CaloHitMap[ids25[i]].size(); j++ ) {
-	if( CaloHitMap[ids25[i]][j]->energy() > 0 ) {
-	  int log10i = int( ( log10( CaloHitMap[ids25[i]][j]->energy()) + 10. ) * 10. );
-	  if( log10i >=0 && log10i < 140 ) econtr25[log10i] += CaloHitMap[ids25[i]][j]->energy();
-	}
+    ee1 = energyInMatrixEE(1, 1, bx, by, bz, eemap);
+    if (meEEe1_)
+      meEEe1_->Fill(ee1);
+    ee9 = energyInMatrixEE(3, 3, bx, by, bz, eemap);
+    if (meEEe9_)
+      meEEe9_->Fill(ee9);
+    ee25 = energyInMatrixEE(5, 5, bx, by, bz, eemap);
+    if (meEEe25_)
+      meEEe25_->Fill(ee25);
+
+    std::vector<uint32_t> ids25;
+    ids25 = getIdsAroundMax(5, 5, bx, by, bz, eemap);
+
+    for (unsigned i = 0; i < 25; i++) {
+      for (unsigned int j = 0; j < CaloHitMap[ids25[i]].size(); j++) {
+        if (CaloHitMap[ids25[i]][j]->energy() > 0) {
+          int log10i = int((log10(CaloHitMap[ids25[i]][j]->energy()) + 10.) * 10.);
+          if (log10i >= 0 && log10i < 140)
+            econtr25[log10i] += CaloHitMap[ids25[i]][j]->energy();
+        }
       }
     }
 
-    MapType  neweemap;
-    if( fillEEMatrix(3,3,bx,by,bz,neweemap, eemap)){
+    MapType neweemap;
+    if (fillEEMatrix(3, 3, bx, by, bz, neweemap, eemap)) {
       ee4 = eCluster2x2(neweemap);
-      if (meEEe4_) meEEe4_->Fill(ee4);
+      if (meEEe4_)
+        meEEe4_->Fill(ee4);
     }
-    if( fillEEMatrix(5,5,bx,by,bz,neweemap, eemap)){
-      ee16 = eCluster4x4(ee9,neweemap); 
-      if (meEEe16_) meEEe16_->Fill(ee16);
+    if (fillEEMatrix(5, 5, bx, by, bz, neweemap, eemap)) {
+      ee16 = eCluster4x4(ee9, neweemap);
+      if (meEEe16_)
+        meEEe16_->Fill(ee16);
     }
-    
-    if (meEEe1oe4_   && ee4  > 0.1 ) meEEe1oe4_  ->Fill(ee1/ee4);
-    if (meEEe1oe9_   && ee9  > 0.1 ) meEEe1oe9_  ->Fill(ee1/ee9);
-    if (meEEe4oe9_   && ee9  > 0.1 ) meEEe4oe9_  ->Fill(ee4/ee9);
-    if (meEEe9oe16_  && ee16 > 0.1 ) meEEe9oe16_ ->Fill(ee9/ee16);
-    if (meEEe16oe25_ && ee25 > 0.1 ) meEEe16oe25_->Fill(ee16/ee25);
-    if (meEEe1oe25_  && ee25 > 0.1 ) meEEe1oe25_ ->Fill(ee1/ee25);
-    if (meEEe9oe25_  && ee25 > 0.1 ) meEEe9oe25_ ->Fill(ee9/ee25);
-
-    if( meEEhitLog10EnergyNorm_ && (EEetzp_+EEetzm_) != 0 ) {
-      for( int i=0; i<140; i++ ) {
-	meEEhitLog10EnergyNorm_->Fill( -10.+(float(i)+0.5)/10., econtr[i]/(EEetzp_+EEetzm_) );
+
+    if (meEEe1oe4_ && ee4 > 0.1)
+      meEEe1oe4_->Fill(ee1 / ee4);
+    if (meEEe1oe9_ && ee9 > 0.1)
+      meEEe1oe9_->Fill(ee1 / ee9);
+    if (meEEe4oe9_ && ee9 > 0.1)
+      meEEe4oe9_->Fill(ee4 / ee9);
+    if (meEEe9oe16_ && ee16 > 0.1)
+      meEEe9oe16_->Fill(ee9 / ee16);
+    if (meEEe16oe25_ && ee25 > 0.1)
+      meEEe16oe25_->Fill(ee16 / ee25);
+    if (meEEe1oe25_ && ee25 > 0.1)
+      meEEe1oe25_->Fill(ee1 / ee25);
+    if (meEEe9oe25_ && ee25 > 0.1)
+      meEEe9oe25_->Fill(ee9 / ee25);
+
+    if (meEEhitLog10EnergyNorm_ && (EEetzp_ + EEetzm_) != 0) {
+      for (int i = 0; i < 140; i++) {
+        meEEhitLog10EnergyNorm_->Fill(-10. + (float(i) + 0.5) / 10., econtr[i] / (EEetzp_ + EEetzm_));
       }
     }
 
-    if( meEEhitLog10Energy25Norm_ && ee25 != 0 ) {
-      for( int i=0; i<140; i++ ) {
-	meEEhitLog10Energy25Norm_->Fill( -10.+(float(i)+0.5)/10., econtr25[i]/ee25 );
+    if (meEEhitLog10Energy25Norm_ && ee25 != 0) {
+      for (int i = 0; i < 140; i++) {
+        meEEhitLog10Energy25Norm_->Fill(-10. + (float(i) + 0.5) / 10., econtr25[i] / ee25);
       }
     }
-    
   }
-    
-  if( MyPEcalValidInfo.isValid() ) {
-    if ( MyPEcalValidInfo->ee1x1() > 0. ) {
-      std::vector<float>  EX0 = MyPEcalValidInfo->eX0();
-      if (meEELongitudinalShower_) meEELongitudinalShower_->Reset();
-      for (int myStep=0; myStep< 26; myStep++ ) { 
-	eRLength[myStep] += EX0[myStep]; 
-	if (meEELongitudinalShower_) meEELongitudinalShower_->Fill(float(myStep), eRLength[myStep]/myEntries);
+
+  if (MyPEcalValidInfo.isValid()) {
+    if (MyPEcalValidInfo->ee1x1() > 0.) {
+      std::vector<float> EX0 = MyPEcalValidInfo->eX0();
+      if (meEELongitudinalShower_)
+        meEELongitudinalShower_->Reset();
+      for (int myStep = 0; myStep < 26; myStep++) {
+        eRLength[myStep] += EX0[myStep];
+        if (meEELongitudinalShower_)
+          meEELongitudinalShower_->Fill(float(myStep), eRLength[myStep] / myEntries);
       }
     }
   }
 }
 
-float EcalEndcapSimHitsValidation::energyInMatrixEE(int nCellInX, int nCellInY,
-                                        int centralX, int centralY,
-                                        int centralZ, MapType& themap){
-  
-  int   ncristals   = 0;
+float EcalEndcapSimHitsValidation::energyInMatrixEE(
+    int nCellInX, int nCellInY, int centralX, int centralY, int centralZ, MapType &themap) {
+  int ncristals = 0;
   float totalEnergy = 0.;
-        
-  int goBackInX = nCellInX/2;
-  int goBackInY = nCellInY/2;
-  int startX    = centralX-goBackInX;
-  int startY    = centralY-goBackInY;
-  
-  for (int ix=startX; ix<startX+nCellInX; ix++) {
-    for (int iy=startY; iy<startY+nCellInY; iy++) {
-      uint32_t index ;
-      
-      if(EEDetId::validDetId(ix,iy,centralZ)) {
-        index = EEDetId(ix,iy,centralZ).rawId();
+
+  int goBackInX = nCellInX / 2;
+  int goBackInY = nCellInY / 2;
+  int startX = centralX - goBackInX;
+  int startY = centralY - goBackInY;
+
+  for (int ix = startX; ix < startX + nCellInX; ix++) {
+    for (int iy = startY; iy < startY + nCellInY; iy++) {
+      uint32_t index;
+
+      if (EEDetId::validDetId(ix, iy, centralZ)) {
+        index = EEDetId(ix, iy, centralZ).rawId();
+      } else {
+        continue;
       }
-      else { continue; }
 
-      totalEnergy   += themap[index];
-      ncristals     += 1;
+      totalEnergy += themap[index];
+      ncristals += 1;
     }
   }
-  
-  LogDebug("GeomInfo")
-    << nCellInX << " x " << nCellInY 
-    << " EE matrix energy = " << totalEnergy
-    << " for " << ncristals << " crystals";
+
+  LogDebug("GeomInfo") << nCellInX << " x " << nCellInY << " EE matrix energy = " << totalEnergy << " for " << ncristals
+                       << " crystals";
   return totalEnergy;
-  
 }
 
-std::vector<uint32_t> EcalEndcapSimHitsValidation::getIdsAroundMax( int nCellInX, int nCellInY, int centralX, int centralY, int centralZ, MapType& themap){
-  
-  int   ncristals   = 0;
-  std::vector<uint32_t> ids( nCellInX*nCellInY );
-        
-  int goBackInX = nCellInX/2;
-  int goBackInY = nCellInY/2;
-  int startX    = centralX-goBackInX;
-  int startY    = centralY-goBackInY;
-  
-  for (int ix=startX; ix<startX+nCellInX; ix++) {
-    for (int iy=startY; iy<startY+nCellInY; iy++) {
-      uint32_t index ;
-      
-      if(EEDetId::validDetId(ix,iy,centralZ)) {
-        index = EEDetId(ix,iy,centralZ).rawId();
+std::vector<uint32_t> EcalEndcapSimHitsValidation::getIdsAroundMax(
+    int nCellInX, int nCellInY, int centralX, int centralY, int centralZ, MapType &themap) {
+  int ncristals = 0;
+  std::vector<uint32_t> ids(nCellInX * nCellInY);
+
+  int goBackInX = nCellInX / 2;
+  int goBackInY = nCellInY / 2;
+  int startX = centralX - goBackInX;
+  int startY = centralY - goBackInY;
+
+  for (int ix = startX; ix < startX + nCellInX; ix++) {
+    for (int iy = startY; iy < startY + nCellInY; iy++) {
+      uint32_t index;
+
+      if (EEDetId::validDetId(ix, iy, centralZ)) {
+        index = EEDetId(ix, iy, centralZ).rawId();
+      } else {
+        continue;
       }
-      else { continue; }
 
       ids[ncristals] = index;
-      ncristals     += 1;
+      ncristals += 1;
     }
   }
-  
+
   return ids;
 }
 
-bool  EcalEndcapSimHitsValidation::fillEEMatrix(int nCellInX, int nCellInY,
-                                    int CentralX, int CentralY,int CentralZ,
-                                    MapType& fillmap, MapType&  themap)
-{
-   int goBackInX = nCellInX/2;
-   int goBackInY = nCellInY/2;
-
-   int startX  =  CentralX - goBackInX;
-   int startY  =  CentralY - goBackInY;
+bool EcalEndcapSimHitsValidation::fillEEMatrix(
+    int nCellInX, int nCellInY, int CentralX, int CentralY, int CentralZ, MapType &fillmap, MapType &themap) {
+  int goBackInX = nCellInX / 2;
+  int goBackInY = nCellInY / 2;
 
-   int i = 0 ;
-   for ( int ix = startX; ix < startX+nCellInX; ix ++ ) {
+  int startX = CentralX - goBackInX;
+  int startY = CentralY - goBackInY;
 
-      for( int iy = startY; iy < startY + nCellInY; iy++ ) {
+  int i = 0;
+  for (int ix = startX; ix < startX + nCellInX; ix++) {
+    for (int iy = startY; iy < startY + nCellInY; iy++) {
+      uint32_t index;
 
-        uint32_t index ;
-
-	if(EEDetId::validDetId(ix,iy,CentralZ)) {
-          index = EEDetId(ix,iy,CentralZ).rawId();
-	}
-	else { continue; }
-        fillmap[i++] = themap[index];
+      if (EEDetId::validDetId(ix, iy, CentralZ)) {
+        index = EEDetId(ix, iy, CentralZ).rawId();
+      } else {
+        continue;
       }
-   }
-   uint32_t  centerid = getUnitWithMaxEnergy(themap);
+      fillmap[i++] = themap[index];
+    }
+  }
+  uint32_t centerid = getUnitWithMaxEnergy(themap);
 
-   if ( fillmap[i/2] == themap[centerid] ) 
-        return true;
-   else
-        return false;
+  if (fillmap[i / 2] == themap[centerid])
+    return true;
+  else
+    return false;
 }
 
-
-float EcalEndcapSimHitsValidation::eCluster2x2( MapType& themap){
-  float  E22=0.;
-  float e012  = themap[0]+themap[1]+themap[2];
-  float e036  = themap[0]+themap[3]+themap[6];
-  float e678  = themap[6]+themap[7]+themap[8];
-  float e258  = themap[2]+themap[5]+themap[8];
-
-  if ( (e012>e678 || e012==e678) && (e036>e258  || e036==e258))
-    return     E22=themap[0]+themap[1]+themap[3]+themap[4];
-  else if ( (e012>e678 || e012==e678)  && (e036<e258 || e036==e258) )
-    return    E22=themap[1]+themap[2]+themap[4]+themap[5];
-  else if ( (e012<e678 || e012==e678) && (e036>e258 || e036==e258))
-    return     E22=themap[3]+themap[4]+themap[6]+themap[7];
-  else if ( (e012<e678|| e012==e678)  && (e036<e258|| e036==e258) )
-    return    E22=themap[4]+themap[5]+themap[7]+themap[8];
+float EcalEndcapSimHitsValidation::eCluster2x2(MapType &themap) {
+  float E22 = 0.;
+  float e012 = themap[0] + themap[1] + themap[2];
+  float e036 = themap[0] + themap[3] + themap[6];
+  float e678 = themap[6] + themap[7] + themap[8];
+  float e258 = themap[2] + themap[5] + themap[8];
+
+  if ((e012 > e678 || e012 == e678) && (e036 > e258 || e036 == e258))
+    return E22 = themap[0] + themap[1] + themap[3] + themap[4];
+  else if ((e012 > e678 || e012 == e678) && (e036 < e258 || e036 == e258))
+    return E22 = themap[1] + themap[2] + themap[4] + themap[5];
+  else if ((e012 < e678 || e012 == e678) && (e036 > e258 || e036 == e258))
+    return E22 = themap[3] + themap[4] + themap[6] + themap[7];
+  else if ((e012 < e678 || e012 == e678) && (e036 < e258 || e036 == e258))
+    return E22 = themap[4] + themap[5] + themap[7] + themap[8];
   else {
     return E22;
   }
 }
 
-float EcalEndcapSimHitsValidation::eCluster4x4(float e33,  MapType&  themap){
-  float E44=0.;
-  float e0_4   = themap[0]+themap[1]+themap[2]+themap[3]+themap[4];
-  float e0_20  = themap[0]+themap[5]+themap[10]+themap[15]+themap[20];
-  float e4_24  = themap[4]+themap[9]+themap[14]+themap[19]+themap[24];
-  float e0_24  = themap[20]+themap[21]+themap[22]+themap[23]+themap[24];
-  
-  if ((e0_4>e0_24 || e0_4==e0_24) && (e0_20>e4_24|| e0_20==e4_24))
-    return E44=e33+themap[0]+themap[1]+themap[2]+themap[3]+themap[5]+themap[10]+themap[15];
-  else if ((e0_4>e0_24 || e0_4==e0_24)  && (e0_20<e4_24 || e0_20==e4_24))
-    return E44=e33+themap[1]+themap[2]+themap[3]+themap[4]+themap[9]+themap[14]+themap[19];
-  else if ((e0_4<e0_24|| e0_4==e0_24) && (e0_20>e4_24 || e0_20==e4_24))
-    return E44=e33+themap[5]+themap[10]+themap[15]+themap[20]+themap[21]+themap[22]+themap[23];
-  else if ((e0_4<e0_24|| e0_4==e0_24) && (e0_20<e4_24 || e0_20==e4_24))
-    return E44=e33+themap[21]+themap[22]+themap[23]+themap[24]+themap[9]+themap[14]+themap[19];
-  else{
+float EcalEndcapSimHitsValidation::eCluster4x4(float e33, MapType &themap) {
+  float E44 = 0.;
+  float e0_4 = themap[0] + themap[1] + themap[2] + themap[3] + themap[4];
+  float e0_20 = themap[0] + themap[5] + themap[10] + themap[15] + themap[20];
+  float e4_24 = themap[4] + themap[9] + themap[14] + themap[19] + themap[24];
+  float e0_24 = themap[20] + themap[21] + themap[22] + themap[23] + themap[24];
+
+  if ((e0_4 > e0_24 || e0_4 == e0_24) && (e0_20 > e4_24 || e0_20 == e4_24))
+    return E44 = e33 + themap[0] + themap[1] + themap[2] + themap[3] + themap[5] + themap[10] + themap[15];
+  else if ((e0_4 > e0_24 || e0_4 == e0_24) && (e0_20 < e4_24 || e0_20 == e4_24))
+    return E44 = e33 + themap[1] + themap[2] + themap[3] + themap[4] + themap[9] + themap[14] + themap[19];
+  else if ((e0_4 < e0_24 || e0_4 == e0_24) && (e0_20 > e4_24 || e0_20 == e4_24))
+    return E44 = e33 + themap[5] + themap[10] + themap[15] + themap[20] + themap[21] + themap[22] + themap[23];
+  else if ((e0_4 < e0_24 || e0_4 == e0_24) && (e0_20 < e4_24 || e0_20 == e4_24))
+    return E44 = e33 + themap[21] + themap[22] + themap[23] + themap[24] + themap[9] + themap[14] + themap[19];
+  else {
     return E44;
   }
 }
 
-uint32_t EcalEndcapSimHitsValidation::getUnitWithMaxEnergy(MapType& themap) {
-  
-  //look for max
+uint32_t EcalEndcapSimHitsValidation::getUnitWithMaxEnergy(MapType &themap) {
+  // look for max
   uint32_t unitWithMaxEnergy = 0;
-  float    maxEnergy = 0.;
-  
+  float maxEnergy = 0.;
+
   MapType::iterator iter;
   for (iter = themap.begin(); iter != themap.end(); iter++) {
-    
     if (maxEnergy < (*iter).second) {
-      maxEnergy = (*iter).second;       
+      maxEnergy = (*iter).second;
       unitWithMaxEnergy = (*iter).first;
-    }                           
+    }
   }
-  
-  LogDebug("GeomInfo")
-    << " max energy of " << maxEnergy 
-    << " GeV in Unit id " << unitWithMaxEnergy;
+
+  LogDebug("GeomInfo") << " max energy of " << maxEnergy << " GeV in Unit id " << unitWithMaxEnergy;
   return unitWithMaxEnergy;
 }
-
-
diff --git a/Validation/EcalHits/src/EcalPreshowerSimHitsValidation.cc b/Validation/EcalHits/src/EcalPreshowerSimHitsValidation.cc
index 84fbddaa5e440..d62fc87528380 100644
--- a/Validation/EcalHits/src/EcalPreshowerSimHitsValidation.cc
+++ b/Validation/EcalHits/src/EcalPreshowerSimHitsValidation.cc
@@ -3,169 +3,168 @@
  *
  * \author C.Rovelli
  *
-*/
+ */
 
-#include <DataFormats/EcalDetId/interface/EEDetId.h>
-#include <DataFormats/EcalDetId/interface/ESDetId.h>
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/Utilities/interface/Exception.h"
 #include "Validation/EcalHits/interface/EcalPreshowerSimHitsValidation.h"
-#include "DQMServices/Core/interface/DQMStore.h"
+#include <DataFormats/EcalDetId/interface/EEDetId.h>
+#include <DataFormats/EcalDetId/interface/ESDetId.h>
 
 using namespace cms;
 using namespace edm;
 using namespace std;
 
-EcalPreshowerSimHitsValidation::EcalPreshowerSimHitsValidation(const edm::ParameterSet& ps):
-
-  HepMCLabel(ps.getParameter<std::string>("moduleLabelMC")),
-  g4InfoLabel(ps.getParameter<std::string>("moduleLabelG4")),
-  EEHitsCollection(ps.getParameter<std::string>("EEHitsCollection")),
-  ESHitsCollection(ps.getParameter<std::string>("ESHitsCollection")){
-
-  HepMCToken   = consumes <edm::HepMCProduct>      (HepMCLabel);
-  EEHitsToken  = consumes <edm::PCaloHitContainer> (edm::InputTag(std::string(g4InfoLabel),std::string(EEHitsCollection)));
-  ESHitsToken  = consumes <edm::PCaloHitContainer> (edm::InputTag(std::string(g4InfoLabel),std::string(ESHitsCollection)));
+EcalPreshowerSimHitsValidation::EcalPreshowerSimHitsValidation(const edm::ParameterSet &ps)
+    :
+
+      HepMCLabel(ps.getParameter<std::string>("moduleLabelMC")),
+      g4InfoLabel(ps.getParameter<std::string>("moduleLabelG4")),
+      EEHitsCollection(ps.getParameter<std::string>("EEHitsCollection")),
+      ESHitsCollection(ps.getParameter<std::string>("ESHitsCollection")) {
+  HepMCToken = consumes<edm::HepMCProduct>(HepMCLabel);
+  EEHitsToken =
+      consumes<edm::PCaloHitContainer>(edm::InputTag(std::string(g4InfoLabel), std::string(EEHitsCollection)));
+  ESHitsToken =
+      consumes<edm::PCaloHitContainer>(edm::InputTag(std::string(g4InfoLabel), std::string(ESHitsCollection)));
   // verbosity switch
   verbose_ = ps.getUntrackedParameter<bool>("verbose", false);
- 
+
   // get hold of back-end interface
   dbe_ = nullptr;
   dbe_ = edm::Service<DQMStore>().operator->();
-  if ( dbe_ ) {
-    if ( verbose_ ) { dbe_->setVerbose(1); } 
-    else            { dbe_->setVerbose(0); }
+  if (dbe_) {
+    if (verbose_) {
+      dbe_->setVerbose(1);
+    } else {
+      dbe_->setVerbose(0);
+    }
   }
 
-  if ( dbe_ ) {
-    if ( verbose_ ) dbe_->showDirStructure();
+  if (dbe_) {
+    if (verbose_)
+      dbe_->showDirStructure();
   }
 
+  menESHits1zp_ = nullptr;
+  menESHits2zp_ = nullptr;
+  menESHits1zm_ = nullptr;
+  menESHits2zm_ = nullptr;
 
-  menESHits1zp_ = nullptr;     
-  menESHits2zp_ = nullptr;     
-  menESHits1zm_ = nullptr;     
-  menESHits2zm_ = nullptr;     
-                                    
   meESEnergyHits1zp_ = nullptr;
   meESEnergyHits2zp_ = nullptr;
   meESEnergyHits1zm_ = nullptr;
   meESEnergyHits2zm_ = nullptr;
 
-  meEShitLog10Energy_       = nullptr;
-  meEShitLog10EnergyNorm_   = nullptr;
+  meEShitLog10Energy_ = nullptr;
+  meEShitLog10EnergyNorm_ = nullptr;
 
   meE1alphaE2zp_ = nullptr;
   meE1alphaE2zm_ = nullptr;
-  meEEoverESzp_  = nullptr;
-  meEEoverESzm_  = nullptr;
+  meEEoverESzp_ = nullptr;
+  meEEoverESzm_ = nullptr;
 
   me2eszpOver1eszp_ = nullptr;
   me2eszmOver1eszm_ = nullptr;
 
-
   Char_t histo[200];
- 
-  if ( dbe_ ) {
+
+  if (dbe_) {
     dbe_->setCurrentFolder("EcalHitsV/EcalSimHitsValidation");
-  
-    sprintf (histo, "ES hits layer 1 multiplicity z+" ) ;
-    menESHits1zp_ = dbe_->book1D(histo, histo, 50, 0., 50. ) ;
 
-    sprintf (histo, "ES hits layer 2 multiplicity z+" ) ;
-    menESHits2zp_ = dbe_->book1D(histo, histo, 50, 0., 50. ) ;
+    sprintf(histo, "ES hits layer 1 multiplicity z+");
+    menESHits1zp_ = dbe_->book1D(histo, histo, 50, 0., 50.);
 
-    sprintf (histo, "ES hits layer 1 multiplicity z-" ) ;
-    menESHits1zm_ = dbe_->book1D(histo, histo, 50, 0., 50. ) ;
+    sprintf(histo, "ES hits layer 2 multiplicity z+");
+    menESHits2zp_ = dbe_->book1D(histo, histo, 50, 0., 50.);
 
-    sprintf (histo, "ES hits layer 2 multiplicity z-" ) ;
-    menESHits2zm_ = dbe_->book1D(histo, histo, 50, 0., 50. ) ;
+    sprintf(histo, "ES hits layer 1 multiplicity z-");
+    menESHits1zm_ = dbe_->book1D(histo, histo, 50, 0., 50.);
 
-    sprintf (histo, "ES hits energy layer 1 z+" ) ;
-    meESEnergyHits1zp_ = dbe_->book1D(histo, histo, 100, 0., 0.05 ) ;
+    sprintf(histo, "ES hits layer 2 multiplicity z-");
+    menESHits2zm_ = dbe_->book1D(histo, histo, 50, 0., 50.);
 
-    sprintf (histo, "ES hits energy layer 2 z+" ) ;
-    meESEnergyHits2zp_ = dbe_->book1D(histo, histo, 100, 0., 0.05 ) ;
+    sprintf(histo, "ES hits energy layer 1 z+");
+    meESEnergyHits1zp_ = dbe_->book1D(histo, histo, 100, 0., 0.05);
 
-    sprintf (histo, "ES hits energy layer 1 z-" ) ;
-    meESEnergyHits1zm_ = dbe_->book1D(histo, histo, 100, 0., 0.05 ) ;
+    sprintf(histo, "ES hits energy layer 2 z+");
+    meESEnergyHits2zp_ = dbe_->book1D(histo, histo, 100, 0., 0.05);
 
-    sprintf (histo, "ES hits energy layer 2 z-" ) ;
-    meESEnergyHits2zm_ = dbe_->book1D(histo, histo, 100, 0., 0.05 ) ;
+    sprintf(histo, "ES hits energy layer 1 z-");
+    meESEnergyHits1zm_ = dbe_->book1D(histo, histo, 100, 0., 0.05);
 
-    sprintf (histo, "ES hits log10energy spectrum" );
+    sprintf(histo, "ES hits energy layer 2 z-");
+    meESEnergyHits2zm_ = dbe_->book1D(histo, histo, 100, 0., 0.05);
+
+    sprintf(histo, "ES hits log10energy spectrum");
     meEShitLog10Energy_ = dbe_->book1D(histo, histo, 140, -10., 4.);
 
-    sprintf (histo, "ES hits log10energy spectrum vs normalized energy" );
+    sprintf(histo, "ES hits log10energy spectrum vs normalized energy");
     meEShitLog10EnergyNorm_ = dbe_->bookProfile(histo, histo, 140, -10., 4., 100, 0., 1.);
 
-    sprintf (histo, "ES E1+07E2 z+" ) ;
+    sprintf(histo, "ES E1+07E2 z+");
     meE1alphaE2zp_ = dbe_->book1D(histo, histo, 100, 0., 0.05);
 
-    sprintf (histo, "ES E1+07E2 z-" ) ;
+    sprintf(histo, "ES E1+07E2 z-");
     meE1alphaE2zm_ = dbe_->book1D(histo, histo, 100, 0., 0.05);
 
-    sprintf (histo, "EE vs ES z+" ) ;
+    sprintf(histo, "EE vs ES z+");
     meEEoverESzp_ = dbe_->bookProfile(histo, histo, 250, 0., 500., 200, 0., 200.);
 
-    sprintf (histo, "EE vs ES z-" ) ;
+    sprintf(histo, "EE vs ES z-");
     meEEoverESzm_ = dbe_->bookProfile(histo, histo, 250, 0., 500., 200, 0., 200.);
 
-    sprintf (histo, "ES ene2oEne1 z+" ) ;
+    sprintf(histo, "ES ene2oEne1 z+");
     me2eszpOver1eszp_ = dbe_->book1D(histo, histo, 50, 0., 10.);
 
-    sprintf (histo, "ES ene2oEne1 z-" ) ;
+    sprintf(histo, "ES ene2oEne1 z-");
     me2eszmOver1eszm_ = dbe_->book1D(histo, histo, 50, 0., 10.);
   }
 }
 
-EcalPreshowerSimHitsValidation::~EcalPreshowerSimHitsValidation(){
+EcalPreshowerSimHitsValidation::~EcalPreshowerSimHitsValidation() {}
 
-}
+void EcalPreshowerSimHitsValidation::beginJob() {}
 
-void EcalPreshowerSimHitsValidation::beginJob(){
-
-}
-
-void EcalPreshowerSimHitsValidation::endJob(){
-
-}
-
-void EcalPreshowerSimHitsValidation::analyze(const edm::Event& e, const edm::EventSetup& c){
+void EcalPreshowerSimHitsValidation::endJob() {}
 
+void EcalPreshowerSimHitsValidation::analyze(const edm::Event &e, const edm::EventSetup &c) {
   edm::LogInfo("EventInfo") << " Run = " << e.id().run() << " Event = " << e.id().event();
-  
+
   edm::Handle<edm::HepMCProduct> MCEvt;
   e.getByToken(HepMCToken, MCEvt);
 
   edm::Handle<edm::PCaloHitContainer> EcalHitsEE;
-  e.getByToken(EEHitsToken,EcalHitsEE);
+  e.getByToken(EEHitsToken, EcalHitsEE);
 
   edm::Handle<edm::PCaloHitContainer> EcalHitsES;
-  e.getByToken(ESHitsToken,EcalHitsES);
+  e.getByToken(ESHitsToken, EcalHitsES);
 
-  std::vector<PCaloHit> theEECaloHits;  
-  if( EcalHitsEE.isValid() ) {
+  std::vector<PCaloHit> theEECaloHits;
+  if (EcalHitsEE.isValid()) {
     theEECaloHits.insert(theEECaloHits.end(), EcalHitsEE->begin(), EcalHitsEE->end());
   }
 
   std::vector<PCaloHit> theESCaloHits;
-  if( EcalHitsES.isValid() ) {
+  if (EcalHitsES.isValid()) {
     theESCaloHits.insert(theESCaloHits.end(), EcalHitsES->begin(), EcalHitsES->end());
   }
 
   double ESEnergy_ = 0.;
-  //std::map<unsigned int, std::vector<PCaloHit>,std::less<unsigned int> > CaloHitMap;
+  // std::map<unsigned int, std::vector<PCaloHit>,std::less<unsigned int> >
+  // CaloHitMap;
 
   // endcap
   double EEetzp_ = 0.;
   double EEetzm_ = 0.;
-  for (std::vector<PCaloHit>::iterator isim = theEECaloHits.begin(); isim != theEECaloHits.end(); ++isim){
-    EEDetId eeid (isim->id()) ;
-    if (eeid.zside() > 0 ) EEetzp_ += isim->energy();
-    if (eeid.zside() < 0 ) EEetzm_ += isim->energy();
+  for (std::vector<PCaloHit>::iterator isim = theEECaloHits.begin(); isim != theEECaloHits.end(); ++isim) {
+    EEDetId eeid(isim->id());
+    if (eeid.zside() > 0)
+      EEetzp_ += isim->energy();
+    if (eeid.zside() < 0)
+      EEetzm_ += isim->energy();
   }
-  
-  
+
   uint32_t nESHits1zp = 0;
   uint32_t nESHits1zm = 0;
   uint32_t nESHits2zp = 0;
@@ -174,90 +173,97 @@ void EcalPreshowerSimHitsValidation::analyze(const edm::Event& e, const edm::Eve
   double ESet2zp_ = 0.;
   double ESet1zm_ = 0.;
   double ESet2zm_ = 0.;
-  std::vector<double> econtr(140, 0. );
-  
-  for (std::vector<PCaloHit>::iterator isim = theESCaloHits.begin();
-       isim != theESCaloHits.end(); ++isim){
-    //CaloHitMap[(*isim).id()].push_back((*isim));
-    
-    ESDetId esid (isim->id()) ;
-    
-    LogDebug("HitInfo")
-      << " CaloHit " << isim->getName() << "\n" 
-      << " DetID = "<<isim->id()<< " ESDetId: z side " << esid.zside() << "  plane " << esid.plane() << esid.six() << ',' << esid.siy() << ':' << esid.strip() << "\n"
-      << " Time = " << isim->time() << "\n"
-      << " Track Id = " << isim->geantTrackId() << "\n"
-      << " Energy = " << isim->energy();
-    
+  std::vector<double> econtr(140, 0.);
+
+  for (std::vector<PCaloHit>::iterator isim = theESCaloHits.begin(); isim != theESCaloHits.end(); ++isim) {
+    // CaloHitMap[(*isim).id()].push_back((*isim));
+
+    ESDetId esid(isim->id());
+
+    LogDebug("HitInfo") << " CaloHit " << isim->getName() << "\n"
+                        << " DetID = " << isim->id() << " ESDetId: z side " << esid.zside() << "  plane "
+                        << esid.plane() << esid.six() << ',' << esid.siy() << ':' << esid.strip() << "\n"
+                        << " Time = " << isim->time() << "\n"
+                        << " Track Id = " << isim->geantTrackId() << "\n"
+                        << " Energy = " << isim->energy();
+
     ESEnergy_ += isim->energy();
-    if( isim->energy() > 0 ) {
+    if (isim->energy() > 0) {
       meEShitLog10Energy_->Fill(log10(isim->energy()));
-      int log10i = int( ( log10(isim->energy()) + 10. ) * 10. );
-      if( log10i >=0 && log10i < 140 ) econtr[log10i] += isim->energy();
+      int log10i = int((log10(isim->energy()) + 10.) * 10.);
+      if (log10i >= 0 && log10i < 140)
+        econtr[log10i] += isim->energy();
     }
 
-    if (esid.plane() == 1 ) { 
-      if (esid.zside() > 0 ) {
-	nESHits1zp++ ;
-	ESet1zp_ += isim->energy();
-	if (meESEnergyHits1zp_) meESEnergyHits1zp_->Fill(isim->energy()) ; 
+    if (esid.plane() == 1) {
+      if (esid.zside() > 0) {
+        nESHits1zp++;
+        ESet1zp_ += isim->energy();
+        if (meESEnergyHits1zp_)
+          meESEnergyHits1zp_->Fill(isim->energy());
+      } else if (esid.zside() < 0) {
+        nESHits1zm++;
+        ESet1zm_ += isim->energy();
+        if (meESEnergyHits1zm_)
+          meESEnergyHits1zm_->Fill(isim->energy());
       }
-      else if (esid.zside() < 0 ) {
-	nESHits1zm++ ; 
-	ESet1zm_ += isim->energy();
-	if (meESEnergyHits1zm_) meESEnergyHits1zm_->Fill(isim->energy()) ; 
+    } else if (esid.plane() == 2) {
+      if (esid.zside() > 0) {
+        nESHits2zp++;
+        ESet2zp_ += isim->energy();
+        if (meESEnergyHits2zp_)
+          meESEnergyHits2zp_->Fill(isim->energy());
+      } else if (esid.zside() < 0) {
+        nESHits2zm++;
+        ESet2zm_ += isim->energy();
+        if (meESEnergyHits2zm_)
+          meESEnergyHits2zm_->Fill(isim->energy());
       }
     }
-    else if (esid.plane() == 2 ) {
-      if (esid.zside() > 0 ) {
-	nESHits2zp++ ; 
-	ESet2zp_ += isim->energy();
-	if (meESEnergyHits2zp_) meESEnergyHits2zp_->Fill(isim->energy()) ; 
-      }
-      else if (esid.zside() < 0 ) {
-	nESHits2zm++ ; 
-	ESet2zm_ += isim->energy();
-	if (meESEnergyHits2zm_) meESEnergyHits2zm_->Fill(isim->energy()) ; 
-      }
-    }
-    
   }
-  
-  if (menESHits1zp_) menESHits1zp_->Fill(nESHits1zp);
-  if (menESHits1zm_) menESHits1zm_->Fill(nESHits1zm);
-  
-  if (menESHits2zp_) menESHits2zp_->Fill(nESHits2zp);
-  if (menESHits2zm_) menESHits2zm_->Fill(nESHits2zm);
-  
-  if( meEShitLog10EnergyNorm_ && ESEnergy_ != 0 ) {
-    for( int i=0; i<140; i++ ) {
-      meEShitLog10EnergyNorm_->Fill( -10.+(float(i)+0.5)/10., econtr[i]/ESEnergy_ );
+
+  if (menESHits1zp_)
+    menESHits1zp_->Fill(nESHits1zp);
+  if (menESHits1zm_)
+    menESHits1zm_->Fill(nESHits1zm);
+
+  if (menESHits2zp_)
+    menESHits2zp_->Fill(nESHits2zp);
+  if (menESHits2zm_)
+    menESHits2zm_->Fill(nESHits2zm);
+
+  if (meEShitLog10EnergyNorm_ && ESEnergy_ != 0) {
+    for (int i = 0; i < 140; i++) {
+      meEShitLog10EnergyNorm_->Fill(-10. + (float(i) + 0.5) / 10., econtr[i] / ESEnergy_);
     }
   }
 
-
-  for ( HepMC::GenEvent::particle_const_iterator p = MCEvt->GetEvent()->particles_begin();
-	p != MCEvt->GetEvent()->particles_end(); ++p ) {
-    
+  for (HepMC::GenEvent::particle_const_iterator p = MCEvt->GetEvent()->particles_begin();
+       p != MCEvt->GetEvent()->particles_end();
+       ++p) {
     double htheta = (*p)->momentum().theta();
     double heta = -99999.;
-    if( tan(htheta * 0.5) > 0 ) {
+    if (tan(htheta * 0.5) > 0) {
       heta = -log(tan(htheta * 0.5));
     }
 
-    if ( heta > 1.653 && heta < 2.6 ) {
-
-      if (meE1alphaE2zp_) meE1alphaE2zp_->Fill(ESet1zp_+0.7*ESet2zp_);
-      if (meEEoverESzp_)  meEEoverESzp_ ->Fill((ESet1zp_+0.7*ESet2zp_)/0.00009, EEetzp_);
-      if ((me2eszpOver1eszp_) && (ESet1zp_ != 0.)) me2eszpOver1eszp_->Fill(ESet2zp_/ESet1zp_);
+    if (heta > 1.653 && heta < 2.6) {
+      if (meE1alphaE2zp_)
+        meE1alphaE2zp_->Fill(ESet1zp_ + 0.7 * ESet2zp_);
+      if (meEEoverESzp_)
+        meEEoverESzp_->Fill((ESet1zp_ + 0.7 * ESet2zp_) / 0.00009, EEetzp_);
+      if ((me2eszpOver1eszp_) && (ESet1zp_ != 0.))
+        me2eszpOver1eszp_->Fill(ESet2zp_ / ESet1zp_);
     }
-    if ( heta < -1.653 && heta > -2.6 ) {
-      if (meE1alphaE2zm_) meE1alphaE2zm_->Fill(ESet1zm_+0.7*ESet2zm_);
-      if (meEEoverESzm_)  meEEoverESzm_ ->Fill((ESet1zm_+0.7*ESet2zm_)/0.00009, EEetzm_);
-      if ((me2eszmOver1eszm_) && (ESet1zm_ != 0.)) me2eszmOver1eszm_->Fill(ESet2zm_/ESet1zm_);
+    if (heta < -1.653 && heta > -2.6) {
+      if (meE1alphaE2zm_)
+        meE1alphaE2zm_->Fill(ESet1zm_ + 0.7 * ESet2zm_);
+      if (meEEoverESzm_)
+        meEEoverESzm_->Fill((ESet1zm_ + 0.7 * ESet2zm_) / 0.00009, EEetzm_);
+      if ((me2eszmOver1eszm_) && (ESet1zm_ != 0.))
+        me2eszmOver1eszm_->Fill(ESet2zm_ / ESet1zm_);
     }
   }
 }
 
-
 //  LocalWords:  EcalSimHitsValidation
diff --git a/Validation/EcalHits/src/EcalSimHitsValidProducer.cc b/Validation/EcalHits/src/EcalSimHitsValidProducer.cc
index c9b17a4ef7a4b..8ad22f8dc28ab 100644
--- a/Validation/EcalHits/src/EcalSimHitsValidProducer.cc
+++ b/Validation/EcalHits/src/EcalSimHitsValidProducer.cc
@@ -1,181 +1,189 @@
-#include "Validation/EcalHits/interface/EcalSimHitsValidProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "Validation/EcalHits/interface/EcalSimHitsValidProducer.h"
 
-#include "SimG4Core/Notification/interface/BeginOfTrack.h"
+#include "DataFormats/Math/interface/Point3D.h"
+#include "SimDataFormats/ValidationFormats/interface/PValidationFormats.h"
+#include "SimG4CMS/Calo/interface/CaloG4HitCollection.h"
 #include "SimG4Core/Notification/interface/BeginOfEvent.h"
+#include "SimG4Core/Notification/interface/BeginOfTrack.h"
 #include "SimG4Core/Notification/interface/EndOfEvent.h"
-#include "SimG4CMS/Calo/interface/CaloG4HitCollection.h"
-#include "SimDataFormats/ValidationFormats/interface/PValidationFormats.h"
-#include "DataFormats/Math/interface/Point3D.h"
 
-#include "G4Step.hh"
-#include "G4SDManager.hh"
 #include "G4PrimaryParticle.hh"
 #include "G4PrimaryVertex.hh"
+#include "G4SDManager.hh"
+#include "G4Step.hh"
 
 #include <iostream>
 
-
-EcalSimHitsValidProducer::EcalSimHitsValidProducer(const edm::ParameterSet& iPSet) :
-     ee1(0.0),ee4(0.0),ee9(0.0),ee16(0.0),ee25(0.0),
-     eb1(0.0),eb4(0.0),eb9(0.0),eb16(0.0),eb25(0.0),
-     totalEInEE(0.0),totalEInEB(0),totalEInES(0.0),totalEInEEzp(0.0),totalEInEEzm(0.0),
-     totalEInESzp(0.0),totalEInESzm(0.0), 
-     totalHits(0),nHitsInEE(0),nHitsInEB(0),nHitsInES(0),nHitsIn1ES(0),nHitsIn2ES(0),
-     nCrystalInEB(0),nCrystalInEEzp(0),nCrystalInEEzm(0),
-     nHitsIn1ESzp(0),nHitsIn1ESzm(0),nHitsIn2ESzp(0),nHitsIn2ESzm(0),
-     thePID(0),
-     label(iPSet.getUntrackedParameter<std::string>("instanceLabel","EcalValidInfo") ) 
-{
-   produces<PEcalValidInfo>(label);
-  
-  for ( int i = 0; i<26; i++ ) {
-     eBX0[i] = 0.0;
-     eEX0[i] = 0.0;
+EcalSimHitsValidProducer::EcalSimHitsValidProducer(const edm::ParameterSet &iPSet)
+    : ee1(0.0),
+      ee4(0.0),
+      ee9(0.0),
+      ee16(0.0),
+      ee25(0.0),
+      eb1(0.0),
+      eb4(0.0),
+      eb9(0.0),
+      eb16(0.0),
+      eb25(0.0),
+      totalEInEE(0.0),
+      totalEInEB(0),
+      totalEInES(0.0),
+      totalEInEEzp(0.0),
+      totalEInEEzm(0.0),
+      totalEInESzp(0.0),
+      totalEInESzm(0.0),
+      totalHits(0),
+      nHitsInEE(0),
+      nHitsInEB(0),
+      nHitsInES(0),
+      nHitsIn1ES(0),
+      nHitsIn2ES(0),
+      nCrystalInEB(0),
+      nCrystalInEEzp(0),
+      nCrystalInEEzm(0),
+      nHitsIn1ESzp(0),
+      nHitsIn1ESzm(0),
+      nHitsIn2ESzp(0),
+      nHitsIn2ESzm(0),
+      thePID(0),
+      label(iPSet.getUntrackedParameter<std::string>("instanceLabel", "EcalValidInfo")) {
+  produces<PEcalValidInfo>(label);
+
+  for (int i = 0; i < 26; i++) {
+    eBX0[i] = 0.0;
+    eEX0[i] = 0.0;
   }
-  
 }
 
+EcalSimHitsValidProducer::~EcalSimHitsValidProducer() {}
 
-EcalSimHitsValidProducer::~EcalSimHitsValidProducer(){
-
+void EcalSimHitsValidProducer::produce(edm::Event &e, const edm::EventSetup &) {
+  std::unique_ptr<PEcalValidInfo> product(new PEcalValidInfo);
+  fillEventInfo(*product);
+  e.put(std::move(product), label);
 }
 
-void
-EcalSimHitsValidProducer::produce(edm::Event& e, const edm::EventSetup&)
-{
-   std::unique_ptr<PEcalValidInfo> product(new PEcalValidInfo );
-   fillEventInfo(*product);
-   e.put(std::move(product),label);
-}
+void EcalSimHitsValidProducer::fillEventInfo(PEcalValidInfo &product) {
+  if (ee1 != 0) {
+    product.ee1 = ee1;
+    product.ee4 = ee4;
+    product.ee9 = ee9;
+    product.ee16 = ee16;
+    product.ee25 = ee25;
+    for (int i = 0; i < 26; i++) {
+      product.eEX0.push_back(eEX0[i]);
+    }
+  }
+
+  if (eb1 != 0) {
+    product.eb1 = eb1;
+    product.eb4 = eb4;
+    product.eb9 = eb9;
+    product.eb16 = eb16;
+    product.eb25 = eb25;
+    for (int i = 0; i < 26; i++) {
+      product.eBX0.push_back(eBX0[i]);
+    }
+  }
 
-void 
-EcalSimHitsValidProducer::fillEventInfo(PEcalValidInfo& product)
-{
- if( ee1 != 0 ){
-   product.ee1 = ee1;
-   product.ee4 = ee4;
-   product.ee9 = ee9;
-   product.ee16 = ee16;
-   product.ee25 = ee25;
-   for ( int i = 0; i<26; i++ ) {
-      product.eEX0.push_back( eEX0[i]);
-   }
- } 
-
- if( eb1 != 0 ){
-   product.eb1 = eb1;
-   product.eb4 = eb4;
-   product.eb9 = eb9;
-   product.eb16 = eb16;
-   product.eb25 = eb25;
-   for ( int i = 0; i<26; i++ ) {
-      product.eBX0.push_back( eBX0[i]);
-   }
- }
-
-   product.totalEInEE  = totalEInEE;
-   product.totalEInEB  = totalEInEB;
-   product.totalEInES  = totalEInES;
-
-   product.totalEInEEzp  = totalEInEEzp;
-   product.totalEInEEzm  = totalEInEEzm;
-
-   product.totalEInESzp  = totalEInESzp;
-   product.totalEInESzm  = totalEInESzm;
-
-   product.totalHits  = totalHits;
-   product.nHitsInEE  = nHitsInEE;
-   product.nHitsInEB  = nHitsInEB;
-   product.nHitsInES  = nHitsInES;
-   product.nHitsIn1ES = nHitsIn1ES;
-   product.nHitsIn2ES = nHitsIn2ES;
-   product.nCrystalInEB   = nCrystalInEB;
-   product.nCrystalInEEzp = nCrystalInEEzp;
-   product.nCrystalInEEzm = nCrystalInEEzm; 
-
-   product.nHitsIn1ESzp = nHitsIn1ESzp;
-   product.nHitsIn1ESzm = nHitsIn1ESzm;
-   product.nHitsIn2ESzp = nHitsIn2ESzp;
-   product.nHitsIn2ESzm = nHitsIn2ESzm;
-
-
-   product.eOf1ES = eOf1ES;
-   product.eOf2ES = eOf2ES;
-   product.zOfES  = zOfES;
-
-   product.eOf1ESzp = eOf1ESzp;
-   product.eOf1ESzm = eOf1ESzm;
-   product.eOf2ESzp = eOf2ESzp;
-   product.eOf2ESzm = eOf2ESzm;
-
-
-   product.phiOfEECaloG4Hit = phiOfEECaloG4Hit;
-   product.etaOfEECaloG4Hit = etaOfEECaloG4Hit;
-   product.eOfEECaloG4Hit   = eOfEECaloG4Hit;
-   product.eOfEEPlusCaloG4Hit    = eOfEEPlusCaloG4Hit;
-   product.eOfEEMinusCaloG4Hit   = eOfEEMinusCaloG4Hit;
-   product.tOfEECaloG4Hit        = tOfEECaloG4Hit;
-
-   product.phiOfESCaloG4Hit = phiOfESCaloG4Hit;
-   product.etaOfESCaloG4Hit = etaOfESCaloG4Hit;
-   product.eOfESCaloG4Hit   = eOfESCaloG4Hit;
-   product.tOfESCaloG4Hit   = tOfESCaloG4Hit;
-
-   product.phiOfEBCaloG4Hit = phiOfEBCaloG4Hit;
-   product.etaOfEBCaloG4Hit = etaOfEBCaloG4Hit;
-   product.eOfEBCaloG4Hit   = eOfEBCaloG4Hit;
-   product.tOfEBCaloG4Hit   = tOfEBCaloG4Hit;
-
-
-   product.theMomentum = theMomentum;
-   product.theVertex   = theVertex;
-   product.thePID      = thePID;
+  product.totalEInEE = totalEInEE;
+  product.totalEInEB = totalEInEB;
+  product.totalEInES = totalEInES;
+
+  product.totalEInEEzp = totalEInEEzp;
+  product.totalEInEEzm = totalEInEEzm;
+
+  product.totalEInESzp = totalEInESzp;
+  product.totalEInESzm = totalEInESzm;
+
+  product.totalHits = totalHits;
+  product.nHitsInEE = nHitsInEE;
+  product.nHitsInEB = nHitsInEB;
+  product.nHitsInES = nHitsInES;
+  product.nHitsIn1ES = nHitsIn1ES;
+  product.nHitsIn2ES = nHitsIn2ES;
+  product.nCrystalInEB = nCrystalInEB;
+  product.nCrystalInEEzp = nCrystalInEEzp;
+  product.nCrystalInEEzm = nCrystalInEEzm;
+
+  product.nHitsIn1ESzp = nHitsIn1ESzp;
+  product.nHitsIn1ESzm = nHitsIn1ESzm;
+  product.nHitsIn2ESzp = nHitsIn2ESzp;
+  product.nHitsIn2ESzm = nHitsIn2ESzm;
+
+  product.eOf1ES = eOf1ES;
+  product.eOf2ES = eOf2ES;
+  product.zOfES = zOfES;
+
+  product.eOf1ESzp = eOf1ESzp;
+  product.eOf1ESzm = eOf1ESzm;
+  product.eOf2ESzp = eOf2ESzp;
+  product.eOf2ESzm = eOf2ESzm;
+
+  product.phiOfEECaloG4Hit = phiOfEECaloG4Hit;
+  product.etaOfEECaloG4Hit = etaOfEECaloG4Hit;
+  product.eOfEECaloG4Hit = eOfEECaloG4Hit;
+  product.eOfEEPlusCaloG4Hit = eOfEEPlusCaloG4Hit;
+  product.eOfEEMinusCaloG4Hit = eOfEEMinusCaloG4Hit;
+  product.tOfEECaloG4Hit = tOfEECaloG4Hit;
+
+  product.phiOfESCaloG4Hit = phiOfESCaloG4Hit;
+  product.etaOfESCaloG4Hit = etaOfESCaloG4Hit;
+  product.eOfESCaloG4Hit = eOfESCaloG4Hit;
+  product.tOfESCaloG4Hit = tOfESCaloG4Hit;
+
+  product.phiOfEBCaloG4Hit = phiOfEBCaloG4Hit;
+  product.etaOfEBCaloG4Hit = etaOfEBCaloG4Hit;
+  product.eOfEBCaloG4Hit = eOfEBCaloG4Hit;
+  product.tOfEBCaloG4Hit = tOfEBCaloG4Hit;
+
+  product.theMomentum = theMomentum;
+  product.theVertex = theVertex;
+  product.thePID = thePID;
 }
 
-void 
-EcalSimHitsValidProducer::update(const BeginOfEvent*){
-  ee1  = 0.0;
-  ee4  = 0.0;
-  ee9  = 0.0;
+void EcalSimHitsValidProducer::update(const BeginOfEvent *) {
+  ee1 = 0.0;
+  ee4 = 0.0;
+  ee9 = 0.0;
   ee16 = 0.0;
   ee25 = 0.0;
 
-  eb1  = 0.0;
-  eb4  = 0.0;
-  eb9  = 0.0;
+  eb1 = 0.0;
+  eb4 = 0.0;
+  eb9 = 0.0;
   eb16 = 0.0;
   eb25 = 0.0;
 
-  totalEInEE = 0.0 ;
-  totalEInEB = 0.0 ;
-  totalEInES = 0.0 ;
-  
-  totalEInEEzp = 0.0 ;
-  totalEInEEzm = 0.0 ;
-  totalEInESzp = 0.0 ;
-  totalEInESzm = 0.0 ;
-
-  totalHits  = 0 ;
-  nHitsInEE  = 0 ;
-  nHitsInEB  = 0 ;
-  nHitsInES  = 0 ;
-  nHitsIn1ES = 0 ;
-  nHitsIn2ES = 0 ;
-  nCrystalInEB   = 0;
+  totalEInEE = 0.0;
+  totalEInEB = 0.0;
+  totalEInES = 0.0;
+
+  totalEInEEzp = 0.0;
+  totalEInEEzm = 0.0;
+  totalEInESzp = 0.0;
+  totalEInESzm = 0.0;
+
+  totalHits = 0;
+  nHitsInEE = 0;
+  nHitsInEB = 0;
+  nHitsInES = 0;
+  nHitsIn1ES = 0;
+  nHitsIn2ES = 0;
+  nCrystalInEB = 0;
   nCrystalInEEzp = 0;
   nCrystalInEEzm = 0;
- 
-
-  nHitsIn1ESzp = 0 ;
-  nHitsIn1ESzm = 0 ;
-  nHitsIn2ESzp = 0 ;
-  nHitsIn2ESzm = 0 ;
- 
-  for ( int i = 0; i<26; i++ ) {
-     eBX0[i] = 0.0;
-     eEX0[i] = 0.0;
+
+  nHitsIn1ESzp = 0;
+  nHitsIn1ESzm = 0;
+  nHitsIn2ESzp = 0;
+  nHitsIn2ESzm = 0;
+
+  for (int i = 0; i < 26; i++) {
+    eBX0[i] = 0.0;
+    eEX0[i] = 0.0;
   }
 
   eOf1ES.clear();
@@ -205,450 +213,421 @@ EcalSimHitsValidProducer::update(const BeginOfEvent*){
   eOfEBCaloG4Hit.clear();
 }
 
-void
-EcalSimHitsValidProducer::update(const EndOfEvent* evt){
-
+void EcalSimHitsValidProducer::update(const EndOfEvent *evt) {
   int trackID = 0;
-  G4PrimaryParticle * thePrim = nullptr;
+  G4PrimaryParticle *thePrim = nullptr;
   int nvertex = (*evt)()->GetNumberOfPrimaryVertex();
-  if ( nvertex <= 0) {
-          edm::LogWarning("EcalSimHitsValidProducer")
-                <<" No Vertex in this Event!";
-  }else {
-    for ( int i = 0; i< nvertex; i++){
-          G4PrimaryVertex * avertex =(*evt)()->GetPrimaryVertex(i);
-          if ( avertex == nullptr )
-                  edm::LogWarning("EcalSimHitsValidProducer")
-                  <<" Pointer to vertex is NULL!";
-          else {
-             float x0 = avertex->GetX0();
-             float y0 = avertex->GetY0();
-             float z0 = avertex->GetZ0();
-             float t0 = avertex->GetT0();
-             theVertex.SetCoordinates(x0,y0,z0,t0);
-    
-             int npart = avertex->GetNumberOfParticle();
-             if ( npart == 0)
-                edm::LogWarning("EcalSimHitsValidProducer")
-                <<" No primary particle in this event";
-             else {
-                 if ( thePrim == nullptr)
-                   thePrim = avertex->GetPrimary(trackID);
-             }
-          }
-     }
-
-   // the direction of momentum of primary particles
-    double pInit =0; // etaInit =0, phiInit =0, // UNUSED
-     if ( thePrim != nullptr){
-          double  px = thePrim -> GetPx();
-          double  py = thePrim -> GetPy();
-          double  pz = thePrim -> GetPz();
-          theMomentum.SetCoordinates(px,py,pz,0.);
-
-          pInit =sqrt( pow(px,2.) + pow(py,2.) + pow(pz,2.));
-          if ( pInit == 0)
-                  edm::LogWarning("EcalSimHitsValidProducer") 
-                  <<" Primary has p = 0 ; ";
-          else {
-                  theMomentum.SetE(pInit);
-                  // double costheta  = pz/pInit; // UNUSED
-                  // double theta = acos(std::min(std::max(costheta, -1.),1.)); // UNUSED
-                  // etaInit = -log(tan(theta/2)); // UNUSED
-
-                  // if ( px != 0 || py != 0) phiInit = atan2(py,px); // UNUSED
-          }
-
-          thePID = thePrim->GetPDGcode();
-      }else {
-          edm::LogWarning("EcalSimHitsValidProducer")
-          <<" Could not find the primary particle!!";
+  if (nvertex <= 0) {
+    edm::LogWarning("EcalSimHitsValidProducer") << " No Vertex in this Event!";
+  } else {
+    for (int i = 0; i < nvertex; i++) {
+      G4PrimaryVertex *avertex = (*evt)()->GetPrimaryVertex(i);
+      if (avertex == nullptr)
+        edm::LogWarning("EcalSimHitsValidProducer") << " Pointer to vertex is NULL!";
+      else {
+        float x0 = avertex->GetX0();
+        float y0 = avertex->GetY0();
+        float z0 = avertex->GetZ0();
+        float t0 = avertex->GetT0();
+        theVertex.SetCoordinates(x0, y0, z0, t0);
+
+        int npart = avertex->GetNumberOfParticle();
+        if (npart == 0)
+          edm::LogWarning("EcalSimHitsValidProducer") << " No primary particle in this event";
+        else {
+          if (thePrim == nullptr)
+            thePrim = avertex->GetPrimary(trackID);
+        }
       }
+    }
+
+    // the direction of momentum of primary particles
+    double pInit = 0;  // etaInit =0, phiInit =0, // UNUSED
+    if (thePrim != nullptr) {
+      double px = thePrim->GetPx();
+      double py = thePrim->GetPy();
+      double pz = thePrim->GetPz();
+      theMomentum.SetCoordinates(px, py, pz, 0.);
+
+      pInit = sqrt(pow(px, 2.) + pow(py, 2.) + pow(pz, 2.));
+      if (pInit == 0)
+        edm::LogWarning("EcalSimHitsValidProducer") << " Primary has p = 0 ; ";
+      else {
+        theMomentum.SetE(pInit);
+        // double costheta  = pz/pInit; // UNUSED
+        // double theta = acos(std::min(std::max(costheta, -1.),1.)); // UNUSED
+        // etaInit = -log(tan(theta/2)); // UNUSED
+
+        // if ( px != 0 || py != 0) phiInit = atan2(py,px); // UNUSED
+      }
+
+      thePID = thePrim->GetPDGcode();
+    } else {
+      edm::LogWarning("EcalSimHitsValidProducer") << " Could not find the primary particle!!";
+    }
   }
   // hit map for EB for matrices
-  G4HCofThisEvent* allHC = (*evt)()->GetHCofThisEvent();
+  G4HCofThisEvent *allHC = (*evt)()->GetHCofThisEvent();
   int EBHCid = G4SDManager::GetSDMpointer()->GetCollectionID("EcalHitsEB");
   int EEHCid = G4SDManager::GetSDMpointer()->GetCollectionID("EcalHitsEE");
   int SEHCid = G4SDManager::GetSDMpointer()->GetCollectionID("EcalHitsES");
- 
 
-  CaloG4HitCollection* theEBHC = (CaloG4HitCollection*) allHC->GetHC(EBHCid);
-  CaloG4HitCollection* theEEHC = (CaloG4HitCollection*) allHC->GetHC(EEHCid);
-  CaloG4HitCollection* theSEHC = (CaloG4HitCollection*) allHC->GetHC(SEHCid);
-  
+  CaloG4HitCollection *theEBHC = (CaloG4HitCollection *)allHC->GetHC(EBHCid);
+  CaloG4HitCollection *theEEHC = (CaloG4HitCollection *)allHC->GetHC(EEHCid);
+  CaloG4HitCollection *theSEHC = (CaloG4HitCollection *)allHC->GetHC(SEHCid);
+
   nHitsInEE = theEEHC->entries();
   nHitsInEB = theEBHC->entries();
   nHitsInES = theSEHC->entries();
   totalHits = nHitsInEE + nHitsInEB + nHitsInES;
 
- //   EB Hit collection start
- MapType ebmap;
- for (int j=0; j<theEBHC->entries(); j++) {
-   CaloG4Hit* aHit = (*theEBHC)[j];
+  //   EB Hit collection start
+  MapType ebmap;
+  for (int j = 0; j < theEBHC->entries(); j++) {
+    CaloG4Hit *aHit = (*theEBHC)[j];
     totalEInEB += aHit->getEnergyDeposit();
-    float he     = aHit->getEnergyDeposit();
-    float htime  = aHit->getTimeSlice();
-                                                                                                                             
+    float he = aHit->getEnergyDeposit();
+    float htime = aHit->getTimeSlice();
+
     math::XYZPoint hpos = aHit->getEntry();
-    float htheta    = hpos.theta();
-    float heta    = -log(tan(htheta * 0.5));
-    float hphi    = hpos.phi();
+    float htheta = hpos.theta();
+    float heta = -log(tan(htheta * 0.5));
+    float hphi = hpos.phi();
 
-    phiOfEBCaloG4Hit.push_back( hphi);
+    phiOfEBCaloG4Hit.push_back(hphi);
     etaOfEBCaloG4Hit.push_back(heta);
     tOfEBCaloG4Hit.push_back(htime);
     eOfEBCaloG4Hit.push_back(he);
-    uint32_t  crystid = aHit->getUnitID();
+    uint32_t crystid = aHit->getUnitID();
     ebmap[crystid] += aHit->getEnergyDeposit();
-}
+  }
+
+  nCrystalInEB = ebmap.size();
 
-    nCrystalInEB = ebmap.size();
+  //   EE Hit collection start
+  MapType eemap, eezpmap, eezmmap;
 
- //   EE Hit collection start
- MapType eemap,eezpmap,eezmmap;
- 
- for (int j=0; j<theEEHC->entries(); j++) {
-    CaloG4Hit* aHit = (*theEEHC)[j];
+  for (int j = 0; j < theEEHC->entries(); j++) {
+    CaloG4Hit *aHit = (*theEEHC)[j];
     totalEInEE += aHit->getEnergyDeposit();
-    float he     = aHit->getEnergyDeposit();
-    float htime  = aHit->getTimeSlice();
+    float he = aHit->getEnergyDeposit();
+    float htime = aHit->getTimeSlice();
 
     math::XYZPoint hpos = aHit->getEntry();
-    float htheta    = hpos.theta();
-    float heta    = -log(tan(htheta * 0.5));
-    float hphi    = hpos.phi();
-    phiOfEECaloG4Hit.push_back( hphi);
+    float htheta = hpos.theta();
+    float heta = -log(tan(htheta * 0.5));
+    float hphi = hpos.phi();
+    phiOfEECaloG4Hit.push_back(hphi);
     etaOfEECaloG4Hit.push_back(heta);
     tOfEECaloG4Hit.push_back(htime);
     eOfEECaloG4Hit.push_back(he);
- 
-    uint32_t  crystid = aHit->getUnitID();
+
+    uint32_t crystid = aHit->getUnitID();
     EEDetId myEEid(crystid);
-    if ( myEEid.zside() == -1 ) {
-          totalEInEEzm += aHit->getEnergyDeposit();
-          eOfEEMinusCaloG4Hit.push_back(he);
-          eezmmap[crystid] += aHit->getEnergyDeposit();
-     }
-    if ( myEEid.zside() == 1 ) {
-          totalEInEEzp += aHit->getEnergyDeposit();
-          eOfEEPlusCaloG4Hit.push_back(he);
-          eezpmap[crystid] += aHit->getEnergyDeposit();
-     }
-               
-
-    eemap[crystid] += aHit->getEnergyDeposit(); 
- }
-
- nCrystalInEEzm = eezmmap.size();
- nCrystalInEEzp = eezpmap.size(); 
-
- //Hits from ES
- for (int j=0; j<theSEHC->entries(); j++) {
-    CaloG4Hit* aHit = (*theSEHC)[j];
-    totalEInES += aHit->getEnergyDeposit();
-    ESDetId esid = ESDetId( aHit->getUnitID());
+    if (myEEid.zside() == -1) {
+      totalEInEEzm += aHit->getEnergyDeposit();
+      eOfEEMinusCaloG4Hit.push_back(he);
+      eezmmap[crystid] += aHit->getEnergyDeposit();
+    }
+    if (myEEid.zside() == 1) {
+      totalEInEEzp += aHit->getEnergyDeposit();
+      eOfEEPlusCaloG4Hit.push_back(he);
+      eezpmap[crystid] += aHit->getEnergyDeposit();
+    }
 
-    if (esid.zside() == -1) {
+    eemap[crystid] += aHit->getEnergyDeposit();
+  }
 
-           totalEInESzm +=  aHit->getEnergyDeposit();
+  nCrystalInEEzm = eezmmap.size();
+  nCrystalInEEzp = eezpmap.size();
 
-           if (esid.plane() ==  1) {
-                 nHitsIn1ESzm++;
-                 eOf1ESzm.push_back(aHit->getEnergyDeposit());
-            }else if ( esid.plane() ==  2){
-                  nHitsIn2ESzm++;
-                  eOf2ESzm.push_back(aHit->getEnergyDeposit());
-            }
-    } 
-    if (esid.zside() == 1) {
-
-           totalEInESzp +=  aHit->getEnergyDeposit();
+  // Hits from ES
+  for (int j = 0; j < theSEHC->entries(); j++) {
+    CaloG4Hit *aHit = (*theSEHC)[j];
+    totalEInES += aHit->getEnergyDeposit();
+    ESDetId esid = ESDetId(aHit->getUnitID());
 
-           if (esid.plane() ==  1) {
-                 nHitsIn1ESzp++;
-                 eOf1ESzp.push_back(aHit->getEnergyDeposit());
-            }else if ( esid.plane() ==  2){
-                  nHitsIn2ESzp++;
-                  eOf2ESzp.push_back(aHit->getEnergyDeposit());
-            }
+    if (esid.zside() == -1) {
+      totalEInESzm += aHit->getEnergyDeposit();
+
+      if (esid.plane() == 1) {
+        nHitsIn1ESzm++;
+        eOf1ESzm.push_back(aHit->getEnergyDeposit());
+      } else if (esid.plane() == 2) {
+        nHitsIn2ESzm++;
+        eOf2ESzm.push_back(aHit->getEnergyDeposit());
+      }
+    }
+    if (esid.zside() == 1) {
+      totalEInESzp += aHit->getEnergyDeposit();
+
+      if (esid.plane() == 1) {
+        nHitsIn1ESzp++;
+        eOf1ESzp.push_back(aHit->getEnergyDeposit());
+      } else if (esid.plane() == 2) {
+        nHitsIn2ESzp++;
+        eOf2ESzp.push_back(aHit->getEnergyDeposit());
+      }
     }
-
-
-  
   }
-  
-   uint32_t  eemaxid = getUnitWithMaxEnergy(eemap);
-   uint32_t  ebmaxid = getUnitWithMaxEnergy(ebmap); 
-   if ( eemap[eemaxid] > ebmap[ebmaxid] ) {
-    uint32_t  centerid = getUnitWithMaxEnergy(eemap);
+
+  uint32_t eemaxid = getUnitWithMaxEnergy(eemap);
+  uint32_t ebmaxid = getUnitWithMaxEnergy(ebmap);
+  if (eemap[eemaxid] > ebmap[ebmaxid]) {
+    uint32_t centerid = getUnitWithMaxEnergy(eemap);
     EEDetId myEEid(centerid);
     int ix = myEEid.ix();
     int iy = myEEid.iy();
     int iz = myEEid.zside();
 
-    ee1 =  energyInEEMatrix(1,1,ix,iy,iz,eemap);
-    ee9 =  energyInEEMatrix(3,3,ix,iy,iz,eemap);
-    ee25=  energyInEEMatrix(5,5,ix,iy,iz,eemap);
-    MapType   neweemap;
-    if( fillEEMatrix(3,3,ix,iy,iz,neweemap, eemap)) {
-          ee4 = eCluster2x2(neweemap);
+    ee1 = energyInEEMatrix(1, 1, ix, iy, iz, eemap);
+    ee9 = energyInEEMatrix(3, 3, ix, iy, iz, eemap);
+    ee25 = energyInEEMatrix(5, 5, ix, iy, iz, eemap);
+    MapType neweemap;
+    if (fillEEMatrix(3, 3, ix, iy, iz, neweemap, eemap)) {
+      ee4 = eCluster2x2(neweemap);
     }
-    if ( fillEEMatrix(5,5,ix,iy,iz,neweemap, eemap)) {
-          ee16 = eCluster4x4(ee9,neweemap);
+    if (fillEEMatrix(5, 5, ix, iy, iz, neweemap, eemap)) {
+      ee16 = eCluster4x4(ee9, neweemap);
     }
   } else {
-    uint32_t  ebcenterid = getUnitWithMaxEnergy(ebmap);
+    uint32_t ebcenterid = getUnitWithMaxEnergy(ebmap);
     EBDetId myEBid(ebcenterid);
     int bx = myEBid.ietaAbs();
     int by = myEBid.iphi();
     int bz = myEBid.zside();
-    eb1 =  energyInEBMatrix(1,1,bx,by,bz,ebmap);
-    eb9 =  energyInEBMatrix(3,3,bx,by,bz,ebmap);
-    eb25=  energyInEBMatrix(5,5,bx,by,bz,ebmap);
+    eb1 = energyInEBMatrix(1, 1, bx, by, bz, ebmap);
+    eb9 = energyInEBMatrix(3, 3, bx, by, bz, ebmap);
+    eb25 = energyInEBMatrix(5, 5, bx, by, bz, ebmap);
 
-    MapType  newebmap;
-    if( fillEBMatrix(3,3,bx,by,bz,newebmap, ebmap)){
-          eb4 = eCluster2x2(newebmap);
+    MapType newebmap;
+    if (fillEBMatrix(3, 3, bx, by, bz, newebmap, ebmap)) {
+      eb4 = eCluster2x2(newebmap);
     }
-    if( fillEBMatrix(5,5,bx,by,bz,newebmap, ebmap)){
-          eb16 = eCluster4x4(eb9,newebmap);
+    if (fillEBMatrix(5, 5, bx, by, bz, newebmap, ebmap)) {
+      eb16 = eCluster4x4(eb9, newebmap);
     }
-  } 
-
+  }
 }
 
-void
-EcalSimHitsValidProducer::update(const G4Step* aStep){
- G4StepPoint* preStepPoint = aStep->GetPreStepPoint();
-  const G4ThreeVector& hitPoint = preStepPoint->GetPosition();
-  G4VPhysicalVolume* currentPV  = preStepPoint->GetPhysicalVolume();
-  const G4String& name         = currentPV->GetName();
+void EcalSimHitsValidProducer::update(const G4Step *aStep) {
+  G4StepPoint *preStepPoint = aStep->GetPreStepPoint();
+  const G4ThreeVector &hitPoint = preStepPoint->GetPosition();
+  G4VPhysicalVolume *currentPV = preStepPoint->GetPhysicalVolume();
+  const G4String &name = currentPV->GetName();
   std::string crystal;
-  crystal.assign(name,0,4);
-
-  float Edeposit =  aStep->GetTotalEnergyDeposit();
-  if ( crystal == "EFRY"&& Edeposit > 0.0){
-          float z = hitPoint.z();
-          float detz = fabs(fabs(z)-3200);
-          int x0 = (int)floor( detz/8.9 );
-          if ( x0< 26){ 
-            eEX0[x0] += Edeposit;
-          }
-  } 
-  if(crystal == "EBRY" && Edeposit > 0.0) {
-            float x = hitPoint.x();
-            float y = hitPoint.y();
-            float r = sqrt(x*x +y*y);
-            float detr = r -1290;
-            int x0 = (int)floor( detr/8.9);
-            eBX0[x0] += Edeposit;
+  crystal.assign(name, 0, 4);
+
+  float Edeposit = aStep->GetTotalEnergyDeposit();
+  if (crystal == "EFRY" && Edeposit > 0.0) {
+    float z = hitPoint.z();
+    float detz = fabs(fabs(z) - 3200);
+    int x0 = (int)floor(detz / 8.9);
+    if (x0 < 26) {
+      eEX0[x0] += Edeposit;
+    }
+  }
+  if (crystal == "EBRY" && Edeposit > 0.0) {
+    float x = hitPoint.x();
+    float y = hitPoint.y();
+    float r = sqrt(x * x + y * y);
+    float detr = r - 1290;
+    int x0 = (int)floor(detr / 8.9);
+    eBX0[x0] += Edeposit;
   }
-   
 }
 
-bool  EcalSimHitsValidProducer::fillEEMatrix(int nCellInEta, int nCellInPhi,
-                                   int CentralEta, int CentralPhi,int CentralZ,
-                                   MapType& fillmap, MapType&  themap)
-{
-   int goBackInEta = nCellInEta/2;
-   int goBackInPhi = nCellInPhi/2;
+bool EcalSimHitsValidProducer::fillEEMatrix(
+    int nCellInEta, int nCellInPhi, int CentralEta, int CentralPhi, int CentralZ, MapType &fillmap, MapType &themap) {
+  int goBackInEta = nCellInEta / 2;
+  int goBackInPhi = nCellInPhi / 2;
 
-   int startEta  =  CentralEta - goBackInEta;
-   int startPhi  =  CentralPhi - goBackInPhi;
+  int startEta = CentralEta - goBackInEta;
+  int startPhi = CentralPhi - goBackInPhi;
 
-   int i = 0 ;
-   for ( int ieta = startEta; ieta < startEta+nCellInEta; ieta ++ ) {
+  int i = 0;
+  for (int ieta = startEta; ieta < startEta + nCellInEta; ieta++) {
+    for (int iphi = startPhi; iphi < startPhi + nCellInPhi; iphi++) {
+      uint32_t index;
 
-      for( int iphi = startPhi; iphi < startPhi + nCellInPhi; iphi++ ) {
-        uint32_t index;
-
-	if (EEDetId::validDetId(ieta, iphi,CentralZ)) {
-          index = EEDetId( ieta, iphi,CentralZ).rawId();
-        } else { continue; }
-	
-	fillmap[i++] = themap[index];
+      if (EEDetId::validDetId(ieta, iphi, CentralZ)) {
+        index = EEDetId(ieta, iphi, CentralZ).rawId();
+      } else {
+        continue;
       }
-   }
-   uint32_t  centerid = getUnitWithMaxEnergy(themap);
 
-   if ( fillmap[i/2] == themap[centerid] ) 
-        return true;
-   else
-        return false;
+      fillmap[i++] = themap[index];
+    }
+  }
+  uint32_t centerid = getUnitWithMaxEnergy(themap);
+
+  if (fillmap[i / 2] == themap[centerid])
+    return true;
+  else
+    return false;
 }
 
-bool  EcalSimHitsValidProducer::fillEBMatrix(int nCellInEta, int nCellInPhi,
-                                   int CentralEta, int CentralPhi,int CentralZ,
-                                   MapType& fillmap, MapType&  themap)
-{
-   int goBackInEta = nCellInEta/2;
-   int goBackInPhi = nCellInPhi/2;
-
-   int startEta  =  CentralZ*CentralEta - goBackInEta;
-   int startPhi  =  CentralPhi - goBackInPhi;
-
-   int i = 0 ;
-   for ( int ieta = startEta; ieta < startEta+nCellInEta; ieta ++ ) {
-      for( int iphi = startPhi; iphi < startPhi + nCellInPhi; iphi++ ) {
-          uint32_t  index;
-          if (abs(ieta) > 85 || abs(ieta)<1 ) { continue; }
-          if (iphi< 1)      { index = EBDetId(ieta,iphi+360).rawId(); }
-          else if(iphi>360) { index = EBDetId(ieta,iphi-360).rawId(); }
-          else              { index = EBDetId(ieta,iphi).rawId();     }
-          fillmap[i++] = themap[index];
-      }
-   }
+bool EcalSimHitsValidProducer::fillEBMatrix(
+    int nCellInEta, int nCellInPhi, int CentralEta, int CentralPhi, int CentralZ, MapType &fillmap, MapType &themap) {
+  int goBackInEta = nCellInEta / 2;
+  int goBackInPhi = nCellInPhi / 2;
 
-   uint32_t  ebcenterid = getUnitWithMaxEnergy(themap);
+  int startEta = CentralZ * CentralEta - goBackInEta;
+  int startPhi = CentralPhi - goBackInPhi;
 
-   if ( fillmap[i/2] == themap[ebcenterid] )
-        return true;
-   else
-        return false;
-}
+  int i = 0;
+  for (int ieta = startEta; ieta < startEta + nCellInEta; ieta++) {
+    for (int iphi = startPhi; iphi < startPhi + nCellInPhi; iphi++) {
+      uint32_t index;
+      if (abs(ieta) > 85 || abs(ieta) < 1) {
+        continue;
+      }
+      if (iphi < 1) {
+        index = EBDetId(ieta, iphi + 360).rawId();
+      } else if (iphi > 360) {
+        index = EBDetId(ieta, iphi - 360).rawId();
+      } else {
+        index = EBDetId(ieta, iphi).rawId();
+      }
+      fillmap[i++] = themap[index];
+    }
+  }
 
+  uint32_t ebcenterid = getUnitWithMaxEnergy(themap);
 
-float EcalSimHitsValidProducer::eCluster2x2( MapType& themap){
-        float  E22=0.;
-        float e012  = themap[0]+themap[1]+themap[2];
-        float e036  = themap[0]+themap[3]+themap[6];
-        float e678  = themap[6]+themap[7]+themap[8];
-        float e258  = themap[2]+themap[5]+themap[8];
-
-    if ( (e012>e678 || e012==e678) && (e036>e258  || e036==e258))
-            return     E22=themap[0]+themap[1]+themap[3]+themap[4];
-    else if ( (e012>e678 || e012==e678)  && (e036<e258 || e036==e258) )
-            return    E22=themap[1]+themap[2]+themap[4]+themap[5];
-    else if ( (e012<e678 || e012==e678) && (e036>e258 || e036==e258))
-            return     E22=themap[3]+themap[4]+themap[6]+themap[7];
-    else if ( (e012<e678|| e012==e678)  && (e036<e258|| e036==e258) )
-            return    E22=themap[4]+themap[5]+themap[7]+themap[8];
-    else {
-            return E22;
-    }
+  if (fillmap[i / 2] == themap[ebcenterid])
+    return true;
+  else
+    return false;
 }
 
-float EcalSimHitsValidProducer::eCluster4x4(float e33,  MapType&  themap){
-        float E44=0.;
-        float e0_4   = themap[0]+themap[1]+themap[2]+themap[3]+themap[4];
-        float e0_20  = themap[0]+themap[5]+themap[10]+themap[15]+themap[20];
-        float e4_24  = themap[4]+themap[9]+themap[14]+themap[19]+themap[24];
-        float e0_24  = themap[20]+themap[21]+themap[22]+themap[23]+themap[24];
-
-   if ((e0_4>e0_24 || e0_4==e0_24) && (e0_20>e4_24|| e0_20==e4_24))
-           return E44=e33+themap[0]+themap[1]+themap[2]+themap[3]+themap[5]+themap[10]+themap[15];
-   else if ((e0_4>e0_24 || e0_4==e0_24)  && (e0_20<e4_24 || e0_20==e4_24))
-           return E44=e33+themap[1]+themap[2]+themap[3]+themap[4]+themap[9]+themap[14]+themap[19];
-   else if ((e0_4<e0_24|| e0_4==e0_24) && (e0_20>e4_24 || e0_20==e4_24))
-           return E44=e33+themap[5]+themap[10]+themap[15]+themap[20]+themap[21]+themap[22]+themap[23];
-   else if ((e0_4<e0_24|| e0_4==e0_24) && (e0_20<e4_24 || e0_20==e4_24))
-           return E44=e33+themap[21]+themap[22]+themap[23]+themap[24]+themap[9]+themap[14]+themap[19];
-   else{
-           return E44;
-   }
+float EcalSimHitsValidProducer::eCluster2x2(MapType &themap) {
+  float E22 = 0.;
+  float e012 = themap[0] + themap[1] + themap[2];
+  float e036 = themap[0] + themap[3] + themap[6];
+  float e678 = themap[6] + themap[7] + themap[8];
+  float e258 = themap[2] + themap[5] + themap[8];
+
+  if ((e012 > e678 || e012 == e678) && (e036 > e258 || e036 == e258))
+    return E22 = themap[0] + themap[1] + themap[3] + themap[4];
+  else if ((e012 > e678 || e012 == e678) && (e036 < e258 || e036 == e258))
+    return E22 = themap[1] + themap[2] + themap[4] + themap[5];
+  else if ((e012 < e678 || e012 == e678) && (e036 > e258 || e036 == e258))
+    return E22 = themap[3] + themap[4] + themap[6] + themap[7];
+  else if ((e012 < e678 || e012 == e678) && (e036 < e258 || e036 == e258))
+    return E22 = themap[4] + themap[5] + themap[7] + themap[8];
+  else {
+    return E22;
+  }
 }
 
-float EcalSimHitsValidProducer::energyInEEMatrix(int nCellInX, int nCellInY,
-                                        int centralX, int centralY,
-                                        int centralZ, MapType& themap){
+float EcalSimHitsValidProducer::eCluster4x4(float e33, MapType &themap) {
+  float E44 = 0.;
+  float e0_4 = themap[0] + themap[1] + themap[2] + themap[3] + themap[4];
+  float e0_20 = themap[0] + themap[5] + themap[10] + themap[15] + themap[20];
+  float e4_24 = themap[4] + themap[9] + themap[14] + themap[19] + themap[24];
+  float e0_24 = themap[20] + themap[21] + themap[22] + themap[23] + themap[24];
+
+  if ((e0_4 > e0_24 || e0_4 == e0_24) && (e0_20 > e4_24 || e0_20 == e4_24))
+    return E44 = e33 + themap[0] + themap[1] + themap[2] + themap[3] + themap[5] + themap[10] + themap[15];
+  else if ((e0_4 > e0_24 || e0_4 == e0_24) && (e0_20 < e4_24 || e0_20 == e4_24))
+    return E44 = e33 + themap[1] + themap[2] + themap[3] + themap[4] + themap[9] + themap[14] + themap[19];
+  else if ((e0_4 < e0_24 || e0_4 == e0_24) && (e0_20 > e4_24 || e0_20 == e4_24))
+    return E44 = e33 + themap[5] + themap[10] + themap[15] + themap[20] + themap[21] + themap[22] + themap[23];
+  else if ((e0_4 < e0_24 || e0_4 == e0_24) && (e0_20 < e4_24 || e0_20 == e4_24))
+    return E44 = e33 + themap[21] + themap[22] + themap[23] + themap[24] + themap[9] + themap[14] + themap[19];
+  else {
+    return E44;
+  }
+}
 
-  int   ncristals   = 0;
+float EcalSimHitsValidProducer::energyInEEMatrix(
+    int nCellInX, int nCellInY, int centralX, int centralY, int centralZ, MapType &themap) {
+  int ncristals = 0;
   float totalEnergy = 0.;
 
-  int goBackInX = nCellInX/2;
-  int goBackInY = nCellInY/2;
-  int startX    = centralX-goBackInX;
-  int startY    = centralY-goBackInY;
-
-  for (int ix=startX; ix<startX+nCellInX; ix++) {
-    for (int iy=startY; iy<startY+nCellInY; iy++) {
-
-      uint32_t index ;
-      if (EEDetId::validDetId(ix, iy,centralZ)) {
-        index = EEDetId(ix,iy,centralZ).rawId();
-      } else { continue; }
+  int goBackInX = nCellInX / 2;
+  int goBackInY = nCellInY / 2;
+  int startX = centralX - goBackInX;
+  int startY = centralY - goBackInY;
+
+  for (int ix = startX; ix < startX + nCellInX; ix++) {
+    for (int iy = startY; iy < startY + nCellInY; iy++) {
+      uint32_t index;
+      if (EEDetId::validDetId(ix, iy, centralZ)) {
+        index = EEDetId(ix, iy, centralZ).rawId();
+      } else {
+        continue;
+      }
 
-      totalEnergy   += themap[index];
-      ncristals     += 1;
+      totalEnergy += themap[index];
+      ncristals += 1;
 
-      LogDebug("EcalSimHitsValidProducer")   
-      << " EnergyInEEMatrix: ix - iy - E = " << ix
-      << "  " << iy << " "  << themap[index] ;
-    
+      LogDebug("EcalSimHitsValidProducer")
+          << " EnergyInEEMatrix: ix - iy - E = " << ix << "  " << iy << " " << themap[index];
     }
   }
 
-    LogDebug("EcalSimHitsValidProducer")
-    << " EnergyInEEMatrix: energy in " << nCellInX
-    << " cells in x times " << nCellInY
-    << " cells in y matrix = " << totalEnergy
-    << " for " << ncristals << " crystals";
+  LogDebug("EcalSimHitsValidProducer") << " EnergyInEEMatrix: energy in " << nCellInX << " cells in x times "
+                                       << nCellInY << " cells in y matrix = " << totalEnergy << " for " << ncristals
+                                       << " crystals";
 
   return totalEnergy;
-
 }
 
-float EcalSimHitsValidProducer::energyInEBMatrix(int nCellInEta, int nCellInPhi,
-                                        int centralEta, int centralPhi,
-                                        int centralZ, MapType& themap){
-
-  int   ncristals   = 0;
+float EcalSimHitsValidProducer::energyInEBMatrix(
+    int nCellInEta, int nCellInPhi, int centralEta, int centralPhi, int centralZ, MapType &themap) {
+  int ncristals = 0;
   float totalEnergy = 0.;
 
-  int goBackInEta = nCellInEta/2;
-  int goBackInPhi = nCellInPhi/2;
-  int startEta    = centralZ*centralEta-goBackInEta;
-  int startPhi    = centralPhi-goBackInPhi;
-
-  for (int ieta=startEta; ieta<startEta+nCellInEta; ieta++) {
-    for (int iphi=startPhi; iphi<startPhi+nCellInPhi; iphi++) {
+  int goBackInEta = nCellInEta / 2;
+  int goBackInPhi = nCellInPhi / 2;
+  int startEta = centralZ * centralEta - goBackInEta;
+  int startPhi = centralPhi - goBackInPhi;
 
-      uint32_t index ;
-      if (abs(ieta) > 85 || abs(ieta)<1 ) { continue; }
-      if (iphi< 1)      { index = EBDetId(ieta,iphi+360).rawId(); }
-      else if(iphi>360) { index = EBDetId(ieta,iphi-360).rawId(); }
-      else              { index = EBDetId(ieta,iphi).rawId();     }
+  for (int ieta = startEta; ieta < startEta + nCellInEta; ieta++) {
+    for (int iphi = startPhi; iphi < startPhi + nCellInPhi; iphi++) {
+      uint32_t index;
+      if (abs(ieta) > 85 || abs(ieta) < 1) {
+        continue;
+      }
+      if (iphi < 1) {
+        index = EBDetId(ieta, iphi + 360).rawId();
+      } else if (iphi > 360) {
+        index = EBDetId(ieta, iphi - 360).rawId();
+      } else {
+        index = EBDetId(ieta, iphi).rawId();
+      }
 
-      totalEnergy   += themap[index];
-      ncristals     += 1;
+      totalEnergy += themap[index];
+      ncristals += 1;
 
       LogDebug("EcalSimHitsValidProducer")
-      << " EnergyInEBMatrix: ieta - iphi - E = " << ieta
-      << "  " << iphi << " "  << themap[index];
-
+          << " EnergyInEBMatrix: ieta - iphi - E = " << ieta << "  " << iphi << " " << themap[index];
     }
   }
 
-    LogDebug("EcalSimHitsValidProducer")
-    << " EnergyInEBMatrix: energy in " << nCellInEta
-    << " cells in eta times " << nCellInPhi
-    << " cells in phi matrix = " << totalEnergy
-    << " for " << ncristals << " crystals";
+  LogDebug("EcalSimHitsValidProducer") << " EnergyInEBMatrix: energy in " << nCellInEta << " cells in eta times "
+                                       << nCellInPhi << " cells in phi matrix = " << totalEnergy << " for " << ncristals
+                                       << " crystals";
 
   return totalEnergy;
-
 }
 
-uint32_t EcalSimHitsValidProducer::getUnitWithMaxEnergy(MapType& themap) {
-
+uint32_t EcalSimHitsValidProducer::getUnitWithMaxEnergy(MapType &themap) {
   uint32_t unitWithMaxEnergy = 0;
-  float    maxEnergy = 0.;
+  float maxEnergy = 0.;
 
   MapType::iterator iter;
   for (iter = themap.begin(); iter != themap.end(); iter++) {
-
     if (maxEnergy < (*iter).second) {
       maxEnergy = (*iter).second;
       unitWithMaxEnergy = (*iter).first;
     }
   }
 
-  
-   LogDebug("EcalSimHitsValidProducer")
-   << " Max energy of " << maxEnergy
-   << " MeV was found in Unit id 0x" << std::hex
-    << unitWithMaxEnergy << std::dec; 
+  LogDebug("EcalSimHitsValidProducer") << " Max energy of " << maxEnergy << " MeV was found in Unit id 0x" << std::hex
+                                       << unitWithMaxEnergy << std::dec;
 
   return unitWithMaxEnergy;
 }
-
diff --git a/Validation/EcalHits/src/EcalSimHitsValidation.cc b/Validation/EcalHits/src/EcalSimHitsValidation.cc
index 49179f06df536..162d8bfe1a380 100644
--- a/Validation/EcalHits/src/EcalSimHitsValidation.cc
+++ b/Validation/EcalHits/src/EcalSimHitsValidation.cc
@@ -3,109 +3,107 @@
  *
  * \author C.Rovelli
  *
-*/
+ */
 
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Utilities/interface/Exception.h"
+#include "Validation/EcalHits/interface/EcalSimHitsValidation.h"
 #include <DataFormats/EcalDetId/interface/EBDetId.h>
 #include <DataFormats/EcalDetId/interface/EEDetId.h>
 #include <DataFormats/EcalDetId/interface/ESDetId.h>
-#include "FWCore/Utilities/interface/Exception.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
-#include "Validation/EcalHits/interface/EcalSimHitsValidation.h"
-#include "DQMServices/Core/interface/DQMStore.h"
 
 using namespace cms;
 using namespace edm;
 using namespace std;
 
-EcalSimHitsValidation::EcalSimHitsValidation(const edm::ParameterSet& ps):
-  g4InfoLabel(ps.getParameter<std::string>("moduleLabelG4")),
-  HepMCToken(consumes<edm::HepMCProduct>(ps.getParameter<std::string>("moduleLabelMC")))
-{
-  EBHitsCollectionToken = consumes<edm::PCaloHitContainer>(edm::InputTag(g4InfoLabel, ps.getParameter<std::string>("EBHitsCollection")));
-  EEHitsCollectionToken = consumes<edm::PCaloHitContainer>(edm::InputTag(g4InfoLabel, ps.getParameter<std::string>("EEHitsCollection")));
-  ESHitsCollectionToken = consumes<edm::PCaloHitContainer>(edm::InputTag(g4InfoLabel, ps.getParameter<std::string>("ESHitsCollection")));
+EcalSimHitsValidation::EcalSimHitsValidation(const edm::ParameterSet &ps)
+    : g4InfoLabel(ps.getParameter<std::string>("moduleLabelG4")),
+      HepMCToken(consumes<edm::HepMCProduct>(ps.getParameter<std::string>("moduleLabelMC"))) {
+  EBHitsCollectionToken =
+      consumes<edm::PCaloHitContainer>(edm::InputTag(g4InfoLabel, ps.getParameter<std::string>("EBHitsCollection")));
+  EEHitsCollectionToken =
+      consumes<edm::PCaloHitContainer>(edm::InputTag(g4InfoLabel, ps.getParameter<std::string>("EEHitsCollection")));
+  ESHitsCollectionToken =
+      consumes<edm::PCaloHitContainer>(edm::InputTag(g4InfoLabel, ps.getParameter<std::string>("ESHitsCollection")));
 
   // DQM ROOT output
   outputFile_ = ps.getUntrackedParameter<std::string>("outputFile", "");
- 
-  if ( !outputFile_.empty() ) {
+
+  if (!outputFile_.empty()) {
     edm::LogInfo("OutputInfo") << " Ecal SimHits Task histograms will be saved to " << outputFile_.c_str();
   } else {
     edm::LogInfo("OutputInfo") << " Ecal SimHits Task histograms will NOT be saved";
   }
- 
+
   // verbosity switch
   verbose_ = ps.getUntrackedParameter<bool>("verbose", false);
- 
-  // DQMServices                                                        
+
+  // DQMServices
   dbe_ = nullptr;
 
   // get hold of back-end interface
-  dbe_ = edm::Service<DQMStore>().operator->();           
-  if ( dbe_ ) {
-    if ( verbose_ ) { dbe_->setVerbose(1); } 
-    else            { dbe_->setVerbose(0); }
+  dbe_ = edm::Service<DQMStore>().operator->();
+  if (dbe_) {
+    if (verbose_) {
+      dbe_->setVerbose(1);
+    } else {
+      dbe_->setVerbose(0);
+    }
   }
-                                                                                                            
-  if ( dbe_ ) {
-    if ( verbose_ ) dbe_->showDirStructure();
+
+  if (dbe_) {
+    if (verbose_)
+      dbe_->showDirStructure();
   }
- 
+
   meGunEnergy_ = nullptr;
-  meGunEta_    = nullptr;   
-  meGunPhi_    = nullptr;   
-  meEBEnergyFraction_  = nullptr;
-  meEEEnergyFraction_  = nullptr;
-  meESEnergyFraction_  = nullptr;
+  meGunEta_ = nullptr;
+  meGunPhi_ = nullptr;
+  meEBEnergyFraction_ = nullptr;
+  meEEEnergyFraction_ = nullptr;
+  meESEnergyFraction_ = nullptr;
 
   Char_t histo[200];
- 
-  
-  if ( dbe_ ) {
+
+  if (dbe_) {
     dbe_->setCurrentFolder("EcalHitsV/EcalSimHitsValidation");
-  
-    sprintf (histo, "EcalSimHitsValidation Gun Momentum" ) ;
+
+    sprintf(histo, "EcalSimHitsValidation Gun Momentum");
     meGunEnergy_ = dbe_->book1D(histo, histo, 100, 0., 1000.);
-  
-    sprintf (histo, "EcalSimHitsValidation Gun Eta" ) ;
+
+    sprintf(histo, "EcalSimHitsValidation Gun Eta");
     meGunEta_ = dbe_->book1D(histo, histo, 700, -3.5, 3.5);
-  
-    sprintf (histo, "EcalSimHitsValidation Gun Phi" ) ;
+
+    sprintf(histo, "EcalSimHitsValidation Gun Phi");
     meGunPhi_ = dbe_->book1D(histo, histo, 360, 0., 360.);
 
-    sprintf (histo, "EcalSimHitsValidation Barrel fraction of energy" ) ;
-    meEBEnergyFraction_ = dbe_->book1D(histo, histo, 100 , 0. , 1.1);
-  
-    sprintf (histo, "EcalSimHitsValidation Endcap fraction of energy" ) ;
-    meEEEnergyFraction_ = dbe_->book1D(histo, histo, 100 , 0. , 1.1);
-  
-    sprintf (histo, "EcalSimHitsValidation Preshower fraction of energy" ) ;
-    meESEnergyFraction_ = dbe_->book1D(histo, histo, 60 , 0. , 0.001);
-  }
- 
-}
+    sprintf(histo, "EcalSimHitsValidation Barrel fraction of energy");
+    meEBEnergyFraction_ = dbe_->book1D(histo, histo, 100, 0., 1.1);
 
-EcalSimHitsValidation::~EcalSimHitsValidation(){
- 
-  if ( !outputFile_.empty() && dbe_ ) dbe_->save(outputFile_);
+    sprintf(histo, "EcalSimHitsValidation Endcap fraction of energy");
+    meEEEnergyFraction_ = dbe_->book1D(histo, histo, 100, 0., 1.1);
 
+    sprintf(histo, "EcalSimHitsValidation Preshower fraction of energy");
+    meESEnergyFraction_ = dbe_->book1D(histo, histo, 60, 0., 0.001);
+  }
 }
 
-void EcalSimHitsValidation::beginJob(){
-
+EcalSimHitsValidation::~EcalSimHitsValidation() {
+  if (!outputFile_.empty() && dbe_)
+    dbe_->save(outputFile_);
 }
 
-void EcalSimHitsValidation::endJob(){
+void EcalSimHitsValidation::beginJob() {}
 
-}
-
-void EcalSimHitsValidation::analyze(const edm::Event& e, const edm::EventSetup& c){
+void EcalSimHitsValidation::endJob() {}
 
+void EcalSimHitsValidation::analyze(const edm::Event &e, const edm::EventSetup &c) {
   edm::LogInfo("EventInfo") << " Run = " << e.id().run() << " Event = " << e.id().event();
-  
-  std::vector<PCaloHit>  theEBCaloHits;
-  std::vector<PCaloHit>  theEECaloHits;
-  std::vector<PCaloHit>  theESCaloHits;
+
+  std::vector<PCaloHit> theEBCaloHits;
+  std::vector<PCaloHit> theEECaloHits;
+  std::vector<PCaloHit> theESCaloHits;
 
   edm::Handle<edm::HepMCProduct> MCEvt;
   edm::Handle<edm::PCaloHitContainer> EcalHitsEB;
@@ -117,68 +115,70 @@ void EcalSimHitsValidation::analyze(const edm::Event& e, const edm::EventSetup&
   e.getByToken(EEHitsCollectionToken, EcalHitsEE);
   e.getByToken(ESHitsCollectionToken, EcalHitsES);
 
-  for ( HepMC::GenEvent::particle_const_iterator p = MCEvt->GetEvent()->particles_begin();
-        p != MCEvt->GetEvent()->particles_end(); ++p ) {
-
+  for (HepMC::GenEvent::particle_const_iterator p = MCEvt->GetEvent()->particles_begin();
+       p != MCEvt->GetEvent()->particles_end();
+       ++p) {
     double htheta = (*p)->momentum().theta();
     double heta = -99999.;
-    if( tan(htheta * 0.5) > 0 ) {
+    if (tan(htheta * 0.5) > 0) {
       heta = -log(tan(htheta * 0.5));
     }
     double hphi = (*p)->momentum().phi();
-    hphi = (hphi>=0) ? hphi : hphi+2*M_PI;
+    hphi = (hphi >= 0) ? hphi : hphi + 2 * M_PI;
     hphi = hphi / M_PI * 180.;
 
-    LogDebug("EventInfo") << "Particle gun type form MC = " << abs((*p)->pdg_id()) << "\n" << "Energy = "<< (*p)->momentum().e() << " Eta = " << heta << " Phi = " << hphi;
-
-    if (meGunEnergy_) meGunEnergy_->Fill((*p)->momentum().e());
-    if (meGunEta_)    meGunEta_   ->Fill(heta);
-    if (meGunPhi_)    meGunPhi_   ->Fill(hphi);
+    LogDebug("EventInfo") << "Particle gun type form MC = " << abs((*p)->pdg_id()) << "\n"
+                          << "Energy = " << (*p)->momentum().e() << " Eta = " << heta << " Phi = " << hphi;
 
+    if (meGunEnergy_)
+      meGunEnergy_->Fill((*p)->momentum().e());
+    if (meGunEta_)
+      meGunEta_->Fill(heta);
+    if (meGunPhi_)
+      meGunPhi_->Fill(hphi);
   }
-  
+
   double EBEnergy_ = 0.;
-  if ( EcalHitsEB.isValid() ) {
+  if (EcalHitsEB.isValid()) {
     theEBCaloHits.insert(theEBCaloHits.end(), EcalHitsEB->begin(), EcalHitsEB->end());
-    for (std::vector<PCaloHit>::iterator isim = theEBCaloHits.begin();
-         isim != theEBCaloHits.end(); ++isim){
+    for (std::vector<PCaloHit>::iterator isim = theEBCaloHits.begin(); isim != theEBCaloHits.end(); ++isim) {
       EBEnergy_ += isim->energy();
     }
   }
 
   double EEEnergy_ = 0.;
-  if ( EcalHitsEE.isValid() ) {
+  if (EcalHitsEE.isValid()) {
     theEECaloHits.insert(theEECaloHits.end(), EcalHitsEE->begin(), EcalHitsEE->end());
-    for (std::vector<PCaloHit>::iterator isim = theEECaloHits.begin();
-         isim != theEECaloHits.end(); ++isim){
+    for (std::vector<PCaloHit>::iterator isim = theEECaloHits.begin(); isim != theEECaloHits.end(); ++isim) {
       EEEnergy_ += isim->energy();
     }
   }
-  
+
   double ESEnergy_ = 0.;
-  if ( EcalHitsES.isValid() ) {
+  if (EcalHitsES.isValid()) {
     theESCaloHits.insert(theESCaloHits.end(), EcalHitsES->begin(), EcalHitsES->end());
-    for (std::vector<PCaloHit>::iterator isim = theESCaloHits.begin();
-         isim != theESCaloHits.end(); ++isim){
+    for (std::vector<PCaloHit>::iterator isim = theESCaloHits.begin(); isim != theESCaloHits.end(); ++isim) {
       ESEnergy_ += isim->energy();
     }
   }
-  
-  double etot = EBEnergy_ + EEEnergy_ + ESEnergy_ ;
+
+  double etot = EBEnergy_ + EEEnergy_ + ESEnergy_;
   double fracEB = 0.0;
   double fracEE = 0.0;
   double fracES = 0.0;
-  
-  if (etot>0.0) { 
-    fracEB  = EBEnergy_/etot; 
-    fracEE  = EEEnergy_/etot; 
-    fracES  = ESEnergy_/etot; 
+
+  if (etot > 0.0) {
+    fracEB = EBEnergy_ / etot;
+    fracEE = EEEnergy_ / etot;
+    fracES = ESEnergy_ / etot;
   }
-  
-  if (meEBEnergyFraction_) meEBEnergyFraction_->Fill(fracEB);
-  
-  if (meEEEnergyFraction_) meEEEnergyFraction_->Fill(fracEE);
-  
-  if (meESEnergyFraction_) meESEnergyFraction_->Fill(fracES);
-}
 
+  if (meEBEnergyFraction_)
+    meEBEnergyFraction_->Fill(fracEB);
+
+  if (meEEEnergyFraction_)
+    meEEEnergyFraction_->Fill(fracEE);
+
+  if (meESEnergyFraction_)
+    meESEnergyFraction_->Fill(fracES);
+}
diff --git a/Validation/EcalHits/src/module.cc b/Validation/EcalHits/src/module.cc
index a20f5c4253cb2..0323b4ff6a423 100644
--- a/Validation/EcalHits/src/module.cc
+++ b/Validation/EcalHits/src/module.cc
@@ -1,11 +1,9 @@
-#include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-
-
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
 
 #include "Validation/EcalHits/interface/EcalSimHitsValidProducer.h"
-DEFINE_SIMWATCHER (EcalSimHitsValidProducer);
+DEFINE_SIMWATCHER(EcalSimHitsValidProducer);
 
 #include <Validation/EcalHits/interface/EcalSimHitsValidation.h>
 DEFINE_FWK_MODULE(EcalSimHitsValidation);
diff --git a/Validation/EcalRecHits/interface/EcalBarrelRecHitsValidation.h b/Validation/EcalRecHits/interface/EcalBarrelRecHitsValidation.h
index 3264c6e75abba..7078a4e2dfdb0 100644
--- a/Validation/EcalRecHits/interface/EcalBarrelRecHitsValidation.h
+++ b/Validation/EcalRecHits/interface/EcalBarrelRecHitsValidation.h
@@ -6,75 +6,71 @@
  *
  * \author C. Rovelli
  *
-*/
+ */
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DataFormats/EcalDigi/interface/EBDataFrame.h"
-#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
+#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 
-#include "CondFormats/EcalObjects/interface/EcalPedestals.h"
 #include "CondFormats/DataRecord/interface/EcalPedestalsRcd.h"
+#include "CondFormats/EcalObjects/interface/EcalPedestals.h"
 
-#include <iostream>
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include <fstream>
-#include <vector>
+#include <iostream>
 #include <map>
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-
-class EcalBarrelRecHitsValidation: public DQMEDAnalyzer{
+#include <vector>
 
+class EcalBarrelRecHitsValidation : public DQMEDAnalyzer {
 public:
+  /// Constructor
+  EcalBarrelRecHitsValidation(const edm::ParameterSet &ps);
 
-/// Constructor
-EcalBarrelRecHitsValidation(const edm::ParameterSet& ps);
-
-/// Destructor
-~EcalBarrelRecHitsValidation() override;
+  /// Destructor
+  ~EcalBarrelRecHitsValidation() override;
 
 protected:
-
-/// Analyze
-void bookHistograms(DQMStore::IBooker &i, edm::Run const&, edm::EventSetup const&) override;
-void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  /// Analyze
+  void bookHistograms(DQMStore::IBooker &i, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
 private:
-
- bool verbose_;
- 
- // fix for consumes
- edm::EDGetTokenT< EBDigiCollection > EBdigiCollection_token_;
- edm::EDGetTokenT< EBUncalibratedRecHitCollection > EBuncalibrechitCollection_token_;
-
- MonitorElement* meEBUncalibRecHitsOccupancy_;     
- MonitorElement* meEBUncalibRecHitsAmplitude_;    
- MonitorElement* meEBUncalibRecHitsPedestal_;      
- MonitorElement* meEBUncalibRecHitsJitter_;        
- MonitorElement* meEBUncalibRecHitsChi2_;          
- MonitorElement* meEBUncalibRecHitMaxSampleRatio_;
- MonitorElement* meEBUncalibRecHitsOccupancyGt100adc_;     
- MonitorElement* meEBUncalibRecHitsAmplitudeGt100adc_;    
- MonitorElement* meEBUncalibRecHitsPedestalGt100adc_;      
- MonitorElement* meEBUncalibRecHitsJitterGt100adc_;        
- MonitorElement* meEBUncalibRecHitsChi2Gt100adc_;          
- MonitorElement* meEBUncalibRecHitMaxSampleRatioGt100adc_;
- MonitorElement* meEBUncalibRecHitsAmpFullMap_;
- MonitorElement* meEBUncalibRecHitsPedFullMap_;
- MonitorElement* meEBUncalibRecHitAmplMap_[36];
- MonitorElement* meEBUncalibRecHitPedMap_[36];
+  bool verbose_;
+
+  // fix for consumes
+  edm::EDGetTokenT<EBDigiCollection> EBdigiCollection_token_;
+  edm::EDGetTokenT<EBUncalibratedRecHitCollection> EBuncalibrechitCollection_token_;
+
+  MonitorElement *meEBUncalibRecHitsOccupancy_;
+  MonitorElement *meEBUncalibRecHitsAmplitude_;
+  MonitorElement *meEBUncalibRecHitsPedestal_;
+  MonitorElement *meEBUncalibRecHitsJitter_;
+  MonitorElement *meEBUncalibRecHitsChi2_;
+  MonitorElement *meEBUncalibRecHitMaxSampleRatio_;
+  MonitorElement *meEBUncalibRecHitsOccupancyGt100adc_;
+  MonitorElement *meEBUncalibRecHitsAmplitudeGt100adc_;
+  MonitorElement *meEBUncalibRecHitsPedestalGt100adc_;
+  MonitorElement *meEBUncalibRecHitsJitterGt100adc_;
+  MonitorElement *meEBUncalibRecHitsChi2Gt100adc_;
+  MonitorElement *meEBUncalibRecHitMaxSampleRatioGt100adc_;
+  MonitorElement *meEBUncalibRecHitsAmpFullMap_;
+  MonitorElement *meEBUncalibRecHitsPedFullMap_;
+  MonitorElement *meEBUncalibRecHitAmplMap_[36];
+  MonitorElement *meEBUncalibRecHitPedMap_[36];
 };
 
 #endif
diff --git a/Validation/EcalRecHits/interface/EcalEndcapRecHitsValidation.h b/Validation/EcalRecHits/interface/EcalEndcapRecHitsValidation.h
index 01f33ddde3fe0..8623cbcce184d 100644
--- a/Validation/EcalRecHits/interface/EcalEndcapRecHitsValidation.h
+++ b/Validation/EcalRecHits/interface/EcalEndcapRecHitsValidation.h
@@ -6,76 +6,72 @@
  *
  * \author C. Rovelli
  *
-*/
+ */
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DataFormats/EcalDigi/interface/EEDataFrame.h"
-#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
+#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 
-#include "CondFormats/EcalObjects/interface/EcalPedestals.h"
 #include "CondFormats/DataRecord/interface/EcalPedestalsRcd.h"
+#include "CondFormats/EcalObjects/interface/EcalPedestals.h"
 
-#include <iostream>
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include <fstream>
-#include <vector>
+#include <iostream>
 #include <map>
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-
-class EcalEndcapRecHitsValidation: public DQMEDAnalyzer{
+#include <vector>
 
+class EcalEndcapRecHitsValidation : public DQMEDAnalyzer {
 public:
+  /// Constructor
+  EcalEndcapRecHitsValidation(const edm::ParameterSet &ps);
 
-/// Constructor
-EcalEndcapRecHitsValidation(const edm::ParameterSet& ps);
-
-/// Destructor
-~EcalEndcapRecHitsValidation() override;
+  /// Destructor
+  ~EcalEndcapRecHitsValidation() override;
 
 protected:
+  void bookHistograms(DQMStore::IBooker &i, edm::Run const &, edm::EventSetup const &) override;
 
-void bookHistograms(DQMStore::IBooker &i, edm::Run const&, edm::EventSetup const&) override;
-
-/// Analyze
-void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  /// Analyze
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
 private:
-
- bool verbose_;
-
- // fix for consumes
- edm::EDGetTokenT< EEDigiCollection > EEdigiCollection_token_;
- edm::EDGetTokenT< EEUncalibratedRecHitCollection > EEuncalibrechitCollection_token_;
-
- MonitorElement* meEEUncalibRecHitsOccupancyPlus_;     
- MonitorElement* meEEUncalibRecHitsOccupancyMinus_;     
- MonitorElement* meEEUncalibRecHitsAmplitude_;    
- MonitorElement* meEEUncalibRecHitsPedestal_;      
- MonitorElement* meEEUncalibRecHitsJitter_;        
- MonitorElement* meEEUncalibRecHitsChi2_;          
- MonitorElement* meEEUncalibRecHitMaxSampleRatio_; 
- MonitorElement* meEEUncalibRecHitsOccupancyPlusGt60adc_;     
- MonitorElement* meEEUncalibRecHitsOccupancyMinusGt60adc_;     
- MonitorElement* meEEUncalibRecHitsAmplitudeGt60adc_;    
- MonitorElement* meEEUncalibRecHitsPedestalGt60adc_;      
- MonitorElement* meEEUncalibRecHitsJitterGt60adc_;        
- MonitorElement* meEEUncalibRecHitsChi2Gt60adc_;          
- MonitorElement* meEEUncalibRecHitMaxSampleRatioGt60adc_; 
- MonitorElement* meEEUncalibRecHitsAmpFullMap_;
- MonitorElement* meEEUncalibRecHitsPedFullMap_;
+  bool verbose_;
+
+  // fix for consumes
+  edm::EDGetTokenT<EEDigiCollection> EEdigiCollection_token_;
+  edm::EDGetTokenT<EEUncalibratedRecHitCollection> EEuncalibrechitCollection_token_;
+
+  MonitorElement *meEEUncalibRecHitsOccupancyPlus_;
+  MonitorElement *meEEUncalibRecHitsOccupancyMinus_;
+  MonitorElement *meEEUncalibRecHitsAmplitude_;
+  MonitorElement *meEEUncalibRecHitsPedestal_;
+  MonitorElement *meEEUncalibRecHitsJitter_;
+  MonitorElement *meEEUncalibRecHitsChi2_;
+  MonitorElement *meEEUncalibRecHitMaxSampleRatio_;
+  MonitorElement *meEEUncalibRecHitsOccupancyPlusGt60adc_;
+  MonitorElement *meEEUncalibRecHitsOccupancyMinusGt60adc_;
+  MonitorElement *meEEUncalibRecHitsAmplitudeGt60adc_;
+  MonitorElement *meEEUncalibRecHitsPedestalGt60adc_;
+  MonitorElement *meEEUncalibRecHitsJitterGt60adc_;
+  MonitorElement *meEEUncalibRecHitsChi2Gt60adc_;
+  MonitorElement *meEEUncalibRecHitMaxSampleRatioGt60adc_;
+  MonitorElement *meEEUncalibRecHitsAmpFullMap_;
+  MonitorElement *meEEUncalibRecHitsPedFullMap_;
 };
 
 #endif
diff --git a/Validation/EcalRecHits/interface/EcalPreshowerRecHitsValidation.h b/Validation/EcalRecHits/interface/EcalPreshowerRecHitsValidation.h
index 8a4ab1db945a0..8dbb2c3b3edbd 100644
--- a/Validation/EcalRecHits/interface/EcalPreshowerRecHitsValidation.h
+++ b/Validation/EcalRecHits/interface/EcalPreshowerRecHitsValidation.h
@@ -8,71 +8,66 @@
  *
  */
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include "DataFormats/EcalDigi/interface/ESDataFrame.h"
 #include "DataFormats/EcalDigi/interface/EEDataFrame.h"
+#include "DataFormats/EcalDigi/interface/ESDataFrame.h"
 #include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 
-#include <iostream>
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include <fstream>
-#include <vector>
+#include <iostream>
 #include <map>
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include <vector>
 
-class EcalPreshowerRecHitsValidation: public DQMEDAnalyzer{
-  
- public:
-  
+class EcalPreshowerRecHitsValidation : public DQMEDAnalyzer {
+public:
   /// Constructor
-  EcalPreshowerRecHitsValidation(const edm::ParameterSet& ps);
-  
+  EcalPreshowerRecHitsValidation(const edm::ParameterSet &ps);
+
   /// Destructor
   ~EcalPreshowerRecHitsValidation() override;
-  
- protected:
- 
-  void bookHistograms(DQMStore::IBooker &i, edm::Run const&, edm::EventSetup const&) override; 
+
+protected:
+  void bookHistograms(DQMStore::IBooker &i, edm::Run const &, edm::EventSetup const &) override;
   /// Analyze
-  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
-  
- private:
-  
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
+
+private:
   bool verbose_;
 
   edm::EDGetTokenT<EEUncalibratedRecHitCollection> EEuncalibrechitCollection_token_;
   edm::EDGetTokenT<EERecHitCollection> EErechitCollection_token_;
   edm::EDGetTokenT<ESRecHitCollection> ESrechitCollection_token_;
-  
-  MonitorElement* meESRecHitsEnergy_;    
-  MonitorElement* meESRecHitsEnergy_zp1st_;
-  MonitorElement* meESRecHitsEnergy_zp2nd_;
-  MonitorElement* meESRecHitsEnergy_zm1st_;
-  MonitorElement* meESRecHitsEnergy_zm2nd_;
-  MonitorElement* meESRecHitsMultip_;
-  MonitorElement* meESRecHitsMultip_zp1st_;
-  MonitorElement* meESRecHitsMultip_zp2nd_;
-  MonitorElement* meESRecHitsMultip_zm1st_;
-  MonitorElement* meESRecHitsMultip_zm2nd_;
-  MonitorElement* meESEERecHitsEnergy_zp_;
-  MonitorElement* meESEERecHitsEnergy_zm_;
-  MonitorElement* meESRecHitsStripOccupancy_zp1st_[36];
-  MonitorElement* meESRecHitsStripOccupancy_zm1st_[36];
-  MonitorElement* meESRecHitsStripOccupancy_zp2nd_[36];
-  MonitorElement* meESRecHitsStripOccupancy_zm2nd_[36];
 
+  MonitorElement *meESRecHitsEnergy_;
+  MonitorElement *meESRecHitsEnergy_zp1st_;
+  MonitorElement *meESRecHitsEnergy_zp2nd_;
+  MonitorElement *meESRecHitsEnergy_zm1st_;
+  MonitorElement *meESRecHitsEnergy_zm2nd_;
+  MonitorElement *meESRecHitsMultip_;
+  MonitorElement *meESRecHitsMultip_zp1st_;
+  MonitorElement *meESRecHitsMultip_zp2nd_;
+  MonitorElement *meESRecHitsMultip_zm1st_;
+  MonitorElement *meESRecHitsMultip_zm2nd_;
+  MonitorElement *meESEERecHitsEnergy_zp_;
+  MonitorElement *meESEERecHitsEnergy_zm_;
+  MonitorElement *meESRecHitsStripOccupancy_zp1st_[36];
+  MonitorElement *meESRecHitsStripOccupancy_zm1st_[36];
+  MonitorElement *meESRecHitsStripOccupancy_zp2nd_[36];
+  MonitorElement *meESRecHitsStripOccupancy_zm2nd_[36];
 };
 
 #endif
diff --git a/Validation/EcalRecHits/interface/EcalRecHitsValidation.h b/Validation/EcalRecHits/interface/EcalRecHitsValidation.h
index d34b12b8e43e8..112655c526100 100644
--- a/Validation/EcalRecHits/interface/EcalRecHitsValidation.h
+++ b/Validation/EcalRecHits/interface/EcalRecHitsValidation.h
@@ -6,24 +6,24 @@
  *
  * \author C. Rovelli
  *
-*/
+ */
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
+#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 
 #include "DataFormats/EcalDigi/interface/EBDataFrame.h"
 #include "DataFormats/EcalDigi/interface/EEDataFrame.h"
@@ -34,119 +34,110 @@
 #include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
 #include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 
-#include <iostream>
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include <fstream>
-#include <vector>
+#include <iostream>
 #include <map>
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-
-class EcalRecHitsValidation: public DQMEDAnalyzer{
+#include <vector>
 
-  typedef std::map<uint32_t,float,std::less<uint32_t> >  MapType;
+class EcalRecHitsValidation : public DQMEDAnalyzer {
+  typedef std::map<uint32_t, float, std::less<uint32_t>> MapType;
 
 public:
+  /// Constructor
+  EcalRecHitsValidation(const edm::ParameterSet &ps);
 
-/// Constructor
-EcalRecHitsValidation(const edm::ParameterSet& ps);
-
-/// Destructor
-~EcalRecHitsValidation() override;
+  /// Destructor
+  ~EcalRecHitsValidation() override;
 
 protected:
+  void bookHistograms(DQMStore::IBooker &i, edm::Run const &, edm::EventSetup const &) override;
+  /// Analyze
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
-void bookHistograms(DQMStore::IBooker &i, edm::Run const&, edm::EventSetup const&) override;
-/// Analyze
-void analyze(const edm::Event& e, const edm::EventSetup& c) override;
-
- uint32_t getUnitWithMaxEnergy(MapType& themap);
- void     findBarrelMatrix(int nCellInEta, int nCellInPhi,
-                           int CentralEta, int CentralPhi,int CentralZ,
-                           MapType& themap); 
- void     findEndcapMatrix(int nCellInX, int nCellInY,
-                           int CentralX, int CentralY,int CentralZ,
-                           MapType&  themap);
+  uint32_t getUnitWithMaxEnergy(MapType &themap);
+  void findBarrelMatrix(int nCellInEta, int nCellInPhi, int CentralEta, int CentralPhi, int CentralZ, MapType &themap);
+  void findEndcapMatrix(int nCellInX, int nCellInY, int CentralX, int CentralY, int CentralZ, MapType &themap);
 
 private:
-
- std::string HepMCLabel;
- std::string hitsProducer_;
- 
- bool verbose_;
-
- std::string outputFile_;
-
- edm::InputTag EBrechitCollection_;
- edm::InputTag EErechitCollection_;
- edm::InputTag ESrechitCollection_;
- edm::InputTag EBuncalibrechitCollection_;
- edm::InputTag EEuncalibrechitCollection_;
- // fix for consumes
- edm::EDGetTokenT<edm::HepMCProduct> HepMCLabel_Token_;
- edm::EDGetTokenT<EBRecHitCollection> EBrechitCollection_Token_;
- edm::EDGetTokenT<EERecHitCollection> EErechitCollection_Token_;
- edm::EDGetTokenT<ESRecHitCollection> ESrechitCollection_Token_;
- edm::EDGetTokenT<EBUncalibratedRecHitCollection> EBuncalibrechitCollection_Token_;
- edm::EDGetTokenT<EEUncalibratedRecHitCollection> EEuncalibrechitCollection_Token_;
- edm::EDGetTokenT<CrossingFrame<PCaloHit>> EBHits_Token_;
- edm::EDGetTokenT<CrossingFrame<PCaloHit>> EEHits_Token_;
- edm::EDGetTokenT<CrossingFrame<PCaloHit>> ESHits_Token_;
-
- MonitorElement* meGunEnergy_;
- MonitorElement* meGunEta_;
- MonitorElement* meGunPhi_;   
- MonitorElement* meEBRecHitSimHitRatio_;
- MonitorElement* meEERecHitSimHitRatio_;
- MonitorElement* meESRecHitSimHitRatio_;
- MonitorElement* meEBRecHitSimHitRatio1011_;
- MonitorElement* meEERecHitSimHitRatio1011_;
- MonitorElement* meEBRecHitSimHitRatio12_;
- MonitorElement* meEERecHitSimHitRatio12_;
- MonitorElement* meEBRecHitSimHitRatio13_;
- MonitorElement* meEERecHitSimHitRatio13_;
- MonitorElement* meEBRecHitSimHitRatioGt35_;
- MonitorElement* meEERecHitSimHitRatioGt35_;
- MonitorElement* meEBUnRecHitSimHitRatio_;
- MonitorElement* meEEUnRecHitSimHitRatio_;
- MonitorElement* meEBUnRecHitSimHitRatioGt35_;
- MonitorElement* meEEUnRecHitSimHitRatioGt35_;
- MonitorElement* meEBe5x5_;
- MonitorElement* meEBe5x5OverSimHits_;
- MonitorElement* meEBe5x5OverGun_;
- MonitorElement* meEEe5x5_;
- MonitorElement* meEEe5x5OverSimHits_;
- MonitorElement* meEEe5x5OverGun_;
-
- MonitorElement* meEBRecHitLog10Energy_;
- MonitorElement* meEERecHitLog10Energy_;
- MonitorElement* meESRecHitLog10Energy_;
- MonitorElement* meEBRecHitLog10EnergyContr_;
- MonitorElement* meEERecHitLog10EnergyContr_;
- MonitorElement* meESRecHitLog10EnergyContr_;
- MonitorElement* meEBRecHitLog10Energy5x5Contr_;
- MonitorElement* meEERecHitLog10Energy5x5Contr_;
-
- MonitorElement* meEBRecHitsOccupancyFlag5_6_;     
- MonitorElement* meEBRecHitsOccupancyFlag8_9_;     
-
- MonitorElement* meEERecHitsOccupancyPlusFlag5_6_;     
- MonitorElement* meEERecHitsOccupancyMinusFlag5_6_;     
- MonitorElement* meEERecHitsOccupancyPlusFlag8_9_;     
- MonitorElement* meEERecHitsOccupancyMinusFlag8_9_;     
-
- MonitorElement* meEBRecHitFlags_;
- MonitorElement* meEBRecHitSimHitvsSimHitFlag5_6_;
- MonitorElement* meEBRecHitSimHitFlag6_;
- MonitorElement* meEBRecHitSimHitFlag7_;
- MonitorElement* meEB5x5RecHitSimHitvsSimHitFlag8_;
-
- MonitorElement* meEERecHitFlags_;
- MonitorElement* meEERecHitSimHitvsSimHitFlag5_6_;
- MonitorElement* meEERecHitSimHitFlag6_;
- MonitorElement* meEERecHitSimHitFlag7_;
-
- std::vector<uint32_t> crystalMatrix;
-
+  std::string HepMCLabel;
+  std::string hitsProducer_;
+
+  bool verbose_;
+
+  std::string outputFile_;
+
+  edm::InputTag EBrechitCollection_;
+  edm::InputTag EErechitCollection_;
+  edm::InputTag ESrechitCollection_;
+  edm::InputTag EBuncalibrechitCollection_;
+  edm::InputTag EEuncalibrechitCollection_;
+  // fix for consumes
+  edm::EDGetTokenT<edm::HepMCProduct> HepMCLabel_Token_;
+  edm::EDGetTokenT<EBRecHitCollection> EBrechitCollection_Token_;
+  edm::EDGetTokenT<EERecHitCollection> EErechitCollection_Token_;
+  edm::EDGetTokenT<ESRecHitCollection> ESrechitCollection_Token_;
+  edm::EDGetTokenT<EBUncalibratedRecHitCollection> EBuncalibrechitCollection_Token_;
+  edm::EDGetTokenT<EEUncalibratedRecHitCollection> EEuncalibrechitCollection_Token_;
+  edm::EDGetTokenT<CrossingFrame<PCaloHit>> EBHits_Token_;
+  edm::EDGetTokenT<CrossingFrame<PCaloHit>> EEHits_Token_;
+  edm::EDGetTokenT<CrossingFrame<PCaloHit>> ESHits_Token_;
+
+  MonitorElement *meGunEnergy_;
+  MonitorElement *meGunEta_;
+  MonitorElement *meGunPhi_;
+  MonitorElement *meEBRecHitSimHitRatio_;
+  MonitorElement *meEERecHitSimHitRatio_;
+  MonitorElement *meESRecHitSimHitRatio_;
+  MonitorElement *meEBRecHitSimHitRatio1011_;
+  MonitorElement *meEERecHitSimHitRatio1011_;
+  MonitorElement *meEBRecHitSimHitRatio12_;
+  MonitorElement *meEERecHitSimHitRatio12_;
+  MonitorElement *meEBRecHitSimHitRatio13_;
+  MonitorElement *meEERecHitSimHitRatio13_;
+  MonitorElement *meEBRecHitSimHitRatioGt35_;
+  MonitorElement *meEERecHitSimHitRatioGt35_;
+  MonitorElement *meEBUnRecHitSimHitRatio_;
+  MonitorElement *meEEUnRecHitSimHitRatio_;
+  MonitorElement *meEBUnRecHitSimHitRatioGt35_;
+  MonitorElement *meEEUnRecHitSimHitRatioGt35_;
+  MonitorElement *meEBe5x5_;
+  MonitorElement *meEBe5x5OverSimHits_;
+  MonitorElement *meEBe5x5OverGun_;
+  MonitorElement *meEEe5x5_;
+  MonitorElement *meEEe5x5OverSimHits_;
+  MonitorElement *meEEe5x5OverGun_;
+
+  MonitorElement *meEBRecHitLog10Energy_;
+  MonitorElement *meEERecHitLog10Energy_;
+  MonitorElement *meESRecHitLog10Energy_;
+  MonitorElement *meEBRecHitLog10EnergyContr_;
+  MonitorElement *meEERecHitLog10EnergyContr_;
+  MonitorElement *meESRecHitLog10EnergyContr_;
+  MonitorElement *meEBRecHitLog10Energy5x5Contr_;
+  MonitorElement *meEERecHitLog10Energy5x5Contr_;
+
+  MonitorElement *meEBRecHitsOccupancyFlag5_6_;
+  MonitorElement *meEBRecHitsOccupancyFlag8_9_;
+
+  MonitorElement *meEERecHitsOccupancyPlusFlag5_6_;
+  MonitorElement *meEERecHitsOccupancyMinusFlag5_6_;
+  MonitorElement *meEERecHitsOccupancyPlusFlag8_9_;
+  MonitorElement *meEERecHitsOccupancyMinusFlag8_9_;
+
+  MonitorElement *meEBRecHitFlags_;
+  MonitorElement *meEBRecHitSimHitvsSimHitFlag5_6_;
+  MonitorElement *meEBRecHitSimHitFlag6_;
+  MonitorElement *meEBRecHitSimHitFlag7_;
+  MonitorElement *meEB5x5RecHitSimHitvsSimHitFlag8_;
+
+  MonitorElement *meEERecHitFlags_;
+  MonitorElement *meEERecHitSimHitvsSimHitFlag5_6_;
+  MonitorElement *meEERecHitSimHitFlag6_;
+  MonitorElement *meEERecHitSimHitFlag7_;
+
+  std::vector<uint32_t> crystalMatrix;
 };
 
 #endif
diff --git a/Validation/EcalRecHits/interface/EcalTBValidation.h b/Validation/EcalRecHits/interface/EcalTBValidation.h
index 9f39833e2d5d0..0a67727129e0e 100644
--- a/Validation/EcalRecHits/interface/EcalTBValidation.h
+++ b/Validation/EcalRecHits/interface/EcalTBValidation.h
@@ -1,38 +1,37 @@
 #ifndef ECALTBVALIDATION_H
 #define ECALTBVALIDATION_H
 
-#include <memory>
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "DataFormats/EcalDetId/interface/EBDetId.h"
+#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
+#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
-#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
-#include "DataFormats/EcalDetId/interface/EBDetId.h"
+#include "TBDataFormats/EcalTBObjects/interface/EcalTBEventHeader.h"
 #include "TBDataFormats/EcalTBObjects/interface/EcalTBHodoscopeRecInfo.h"
 #include "TBDataFormats/EcalTBObjects/interface/EcalTBTDCRecInfo.h"
-#include "TBDataFormats/EcalTBObjects/interface/EcalTBEventHeader.h"
+#include <memory>
 
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
 class EcalTBValidation : public DQMEDAnalyzer {
- public:
-  explicit EcalTBValidation( const edm::ParameterSet& );
+public:
+  explicit EcalTBValidation(const edm::ParameterSet &);
   ~EcalTBValidation() override;
-  
-  void bookHistograms(DQMStore::IBooker &i, edm::Run const&, edm::EventSetup const&) override;
-  void analyze( const edm::Event&, const edm::EventSetup& ) override;
-  
- private:
 
+  void bookHistograms(DQMStore::IBooker &i, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+
+private:
   bool verbose_;
 
   int data_;
   int xtalInBeam_;
-  //std::string rootfile_;
+  // std::string rootfile_;
   std::string digiCollection_;
   std::string digiProducer_;
   std::string hitCollection_;
@@ -50,42 +49,38 @@ class EcalTBValidation : public DQMEDAnalyzer {
   edm::EDGetTokenT<EcalTBTDCRecInfo> tdcRec_Token_;
   edm::EDGetTokenT<EcalTBEventHeader> eventHeader_Token_;
   // histos
-  //TH2F *h_xib,   *h_ampltdc, *h_Shape;
-  //TH1F *h_hodoX, *h_hodoY;
-  //TH1F *h_e1x1, *h_e3x3,  *h_e5x5;
-  //TH1F *h_e1e9, *h_e1e25, *h_e9e25;
-  //TH1F *h_e1x1_center, *h_e3x3_center,  *h_e5x5_center;
-  //TH2F *h_e1vsX,      *h_e1vsY;
-  //TH2F *h_e1e9vsX,    *h_e1e9vsY;
-  //TH2F *h_e1e25vsX,   *h_e1e25vsY;
-  //TH2F *h_e9e25vsX,   *h_e9e25vsY;
-
-  MonitorElement* meETBxib_;
-  MonitorElement* meETBampltdc_;
-  MonitorElement* meETBShape_;
-  MonitorElement* meETBhodoX_;
-  MonitorElement* meETBhodoY_;
-  MonitorElement* meETBe1x1_;
-  MonitorElement* meETBe3x3_;
-  MonitorElement* meETBe5x5_;
-  MonitorElement* meETBe1e9_;
-  MonitorElement* meETBe1e25_;
-  MonitorElement* meETBe9e25_;
-  MonitorElement* meETBe1x1_center_;
-  MonitorElement* meETBe3x3_center_;
-  MonitorElement* meETBe5x5_center_;
-  MonitorElement* meETBe1vsX_;
-  MonitorElement* meETBe1vsY_;
-  MonitorElement* meETBe1e9vsX_;
-  MonitorElement* meETBe1e9vsY_;
-  MonitorElement* meETBe1e25vsX_;
-  MonitorElement* meETBe1e25vsY_;
-  MonitorElement* meETBe9e25vsX_;
-  MonitorElement* meETBe9e25vsY_;
+  // TH2F *h_xib,   *h_ampltdc, *h_Shape;
+  // TH1F *h_hodoX, *h_hodoY;
+  // TH1F *h_e1x1, *h_e3x3,  *h_e5x5;
+  // TH1F *h_e1e9, *h_e1e25, *h_e9e25;
+  // TH1F *h_e1x1_center, *h_e3x3_center,  *h_e5x5_center;
+  // TH2F *h_e1vsX,      *h_e1vsY;
+  // TH2F *h_e1e9vsX,    *h_e1e9vsY;
+  // TH2F *h_e1e25vsX,   *h_e1e25vsY;
+  // TH2F *h_e9e25vsX,   *h_e9e25vsY;
 
+  MonitorElement *meETBxib_;
+  MonitorElement *meETBampltdc_;
+  MonitorElement *meETBShape_;
+  MonitorElement *meETBhodoX_;
+  MonitorElement *meETBhodoY_;
+  MonitorElement *meETBe1x1_;
+  MonitorElement *meETBe3x3_;
+  MonitorElement *meETBe5x5_;
+  MonitorElement *meETBe1e9_;
+  MonitorElement *meETBe1e25_;
+  MonitorElement *meETBe9e25_;
+  MonitorElement *meETBe1x1_center_;
+  MonitorElement *meETBe3x3_center_;
+  MonitorElement *meETBe5x5_center_;
+  MonitorElement *meETBe1vsX_;
+  MonitorElement *meETBe1vsY_;
+  MonitorElement *meETBe1e9vsX_;
+  MonitorElement *meETBe1e9vsY_;
+  MonitorElement *meETBe1e25vsX_;
+  MonitorElement *meETBe1e25vsY_;
+  MonitorElement *meETBe9e25vsX_;
+  MonitorElement *meETBe9e25vsY_;
 };
 
-
-
-
 #endif
diff --git a/Validation/EcalRecHits/src/EcalBarrelRecHitsValidation.cc b/Validation/EcalRecHits/src/EcalBarrelRecHitsValidation.cc
index 25c702994e727..4e70972f97550 100644
--- a/Validation/EcalRecHits/src/EcalBarrelRecHitsValidation.cc
+++ b/Validation/EcalRecHits/src/EcalBarrelRecHitsValidation.cc
@@ -5,113 +5,109 @@
  *
  */
 
-#include <Validation/EcalRecHits/interface/EcalBarrelRecHitsValidation.h>
-#include <DataFormats/EcalDetId/interface/EBDetId.h>
 #include "DQMServices/Core/interface/DQMStore.h"
+#include <DataFormats/EcalDetId/interface/EBDetId.h>
+#include <Validation/EcalRecHits/interface/EcalBarrelRecHitsValidation.h>
 
 using namespace cms;
 using namespace edm;
 using namespace std;
 
-EcalBarrelRecHitsValidation::EcalBarrelRecHitsValidation(const ParameterSet& ps){
-  
-  // ---------------------- 
-  EBdigiCollection_token_          = consumes< EBDigiCollection > (ps.getParameter<edm::InputTag>("EBdigiCollection") );
-  EBuncalibrechitCollection_token_ = consumes< EBUncalibratedRecHitCollection > (ps.getParameter<edm::InputTag>("EBuncalibrechitCollection") );
-  
-  // ---------------------- 
-  // verbosity switch 
+EcalBarrelRecHitsValidation::EcalBarrelRecHitsValidation(const ParameterSet &ps) {
+  // ----------------------
+  EBdigiCollection_token_ = consumes<EBDigiCollection>(ps.getParameter<edm::InputTag>("EBdigiCollection"));
+  EBuncalibrechitCollection_token_ =
+      consumes<EBUncalibratedRecHitCollection>(ps.getParameter<edm::InputTag>("EBuncalibrechitCollection"));
+
+  // ----------------------
+  // verbosity switch
   verbose_ = ps.getUntrackedParameter<bool>("verbose", false);
-    
-  // ----------------------   
-  meEBUncalibRecHitsOccupancy_             = nullptr;
-  meEBUncalibRecHitsAmplitude_             = nullptr;
-  meEBUncalibRecHitsPedestal_              = nullptr;
-  meEBUncalibRecHitsJitter_                = nullptr;
-  meEBUncalibRecHitsChi2_                  = nullptr;
-  meEBUncalibRecHitMaxSampleRatio_         = nullptr;
-  meEBUncalibRecHitsOccupancyGt100adc_     = nullptr;
-  meEBUncalibRecHitsAmplitudeGt100adc_     = nullptr;
-  meEBUncalibRecHitsPedestalGt100adc_      = nullptr;
-  meEBUncalibRecHitsJitterGt100adc_        = nullptr;
-  meEBUncalibRecHitsChi2Gt100adc_          = nullptr;
+
+  // ----------------------
+  meEBUncalibRecHitsOccupancy_ = nullptr;
+  meEBUncalibRecHitsAmplitude_ = nullptr;
+  meEBUncalibRecHitsPedestal_ = nullptr;
+  meEBUncalibRecHitsJitter_ = nullptr;
+  meEBUncalibRecHitsChi2_ = nullptr;
+  meEBUncalibRecHitMaxSampleRatio_ = nullptr;
+  meEBUncalibRecHitsOccupancyGt100adc_ = nullptr;
+  meEBUncalibRecHitsAmplitudeGt100adc_ = nullptr;
+  meEBUncalibRecHitsPedestalGt100adc_ = nullptr;
+  meEBUncalibRecHitsJitterGt100adc_ = nullptr;
+  meEBUncalibRecHitsChi2Gt100adc_ = nullptr;
   meEBUncalibRecHitMaxSampleRatioGt100adc_ = nullptr;
-  meEBUncalibRecHitsAmpFullMap_            = nullptr;
-  meEBUncalibRecHitsPedFullMap_            = nullptr;
-  for (int i=0; i<36 ; i++) 
-    {
-      meEBUncalibRecHitAmplMap_[i] = nullptr;
-      meEBUncalibRecHitPedMap_[i]  = nullptr;
-    }
+  meEBUncalibRecHitsAmpFullMap_ = nullptr;
+  meEBUncalibRecHitsPedFullMap_ = nullptr;
+  for (int i = 0; i < 36; i++) {
+    meEBUncalibRecHitAmplMap_[i] = nullptr;
+    meEBUncalibRecHitPedMap_[i] = nullptr;
+  }
 }
 
-EcalBarrelRecHitsValidation::~EcalBarrelRecHitsValidation(){   
-
-}
+EcalBarrelRecHitsValidation::~EcalBarrelRecHitsValidation() {}
 
-void EcalBarrelRecHitsValidation::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&){ 
+void EcalBarrelRecHitsValidation::bookHistograms(DQMStore::IBooker &ibooker,
+                                                 edm::Run const &,
+                                                 edm::EventSetup const &) {
   Char_t histo[200];
-   
+
   ibooker.setCurrentFolder("EcalRecHitsV/EcalBarrelRecHitsTask");
-   
-  sprintf (histo, "EB Occupancy" );  
+
+  sprintf(histo, "EB Occupancy");
   meEBUncalibRecHitsOccupancy_ = ibooker.book2D(histo, histo, 170, -85., 85., 360, 0., 360.);
-  
-  sprintf (histo, "EB Amplitude" );
+
+  sprintf(histo, "EB Amplitude");
   meEBUncalibRecHitsAmplitude_ = ibooker.book1D(histo, histo, 201, -20., 4000.);
-  
-  sprintf (histo, "EB Pedestal" );
+
+  sprintf(histo, "EB Pedestal");
   meEBUncalibRecHitsPedestal_ = ibooker.book1D(histo, histo, 50, 190., 210.);
-  
-  sprintf (histo, "EB Jitter" );
+
+  sprintf(histo, "EB Jitter");
   meEBUncalibRecHitsJitter_ = ibooker.book1D(histo, histo, 100, 0., 100.);
-      
-  sprintf (histo, "EB Chi2" );
+
+  sprintf(histo, "EB Chi2");
   meEBUncalibRecHitsChi2_ = ibooker.book1D(histo, histo, 100, 18000., 22000.);
 
-  sprintf (histo, "EB RecHit Max Sample Ratio"); 
+  sprintf(histo, "EB RecHit Max Sample Ratio");
   meEBUncalibRecHitMaxSampleRatio_ = ibooker.book1D(histo, histo, 120, 0.90, 1.05);
 
-  sprintf (histo, "EB Occupancy gt 100 adc counts" );
+  sprintf(histo, "EB Occupancy gt 100 adc counts");
   meEBUncalibRecHitsOccupancyGt100adc_ = ibooker.book2D(histo, histo, 170, -85., 85., 360, 0., 360.);
-  
-  sprintf (histo, "EB Amplitude gt 100 adc counts" );
+
+  sprintf(histo, "EB Amplitude gt 100 adc counts");
   meEBUncalibRecHitsAmplitudeGt100adc_ = ibooker.book1D(histo, histo, 200, 0., 4000.);
 
-  sprintf (histo, "EB Pedestal gt 100 adc counts" );
+  sprintf(histo, "EB Pedestal gt 100 adc counts");
   meEBUncalibRecHitsPedestalGt100adc_ = ibooker.book1D(histo, histo, 50, 190., 210.);
 
-  sprintf (histo, "EB Jitter gt 100 adc counts" );
+  sprintf(histo, "EB Jitter gt 100 adc counts");
   meEBUncalibRecHitsJitterGt100adc_ = ibooker.book1D(histo, histo, 100, 0., 100.);
 
-  sprintf (histo, "EB Chi2 gt 100 adc counts" );
+  sprintf(histo, "EB Chi2 gt 100 adc counts");
   meEBUncalibRecHitsChi2Gt100adc_ = ibooker.book1D(histo, histo, 100, 18000., 22000.);
 
-  sprintf (histo, "EB RecHit Max Sample Ratio gt 100 adc counts"); 
+  sprintf(histo, "EB RecHit Max Sample Ratio gt 100 adc counts");
   meEBUncalibRecHitMaxSampleRatioGt100adc_ = ibooker.book1D(histo, histo, 120, 0.90, 1.05);
-  
-  sprintf (histo, "EB Amplitude Full Map");
+
+  sprintf(histo, "EB Amplitude Full Map");
   meEBUncalibRecHitsAmpFullMap_ = ibooker.bookProfile2D(histo, histo, 170, -85., 85., 360, 0., 360., 200, 0., 4000.);
 
-  sprintf (histo, "EB Pedestal Full Map");
+  sprintf(histo, "EB Pedestal Full Map");
   meEBUncalibRecHitsPedFullMap_ = ibooker.bookProfile2D(histo, histo, 170, -85., 85., 360, 0., 360., 50, 194., 201.);
 
-  for (int i=0; i<36 ; i++) 
-    {
-      sprintf(histo, "EB Amp SM%02d", i+1);
-      meEBUncalibRecHitAmplMap_[i] = ibooker.bookProfile2D(histo, histo, 85, 0., 85., 20, 0., 20., 200, 0., 4000.);
-      
-      sprintf(histo, "EB Ped SM%02d", i+1);
-      meEBUncalibRecHitPedMap_[i] = ibooker.bookProfile2D(histo, histo, 85, 0., 85., 20, 0., 20., 50, 194., 201.);
-    }
-}
+  for (int i = 0; i < 36; i++) {
+    sprintf(histo, "EB Amp SM%02d", i + 1);
+    meEBUncalibRecHitAmplMap_[i] = ibooker.bookProfile2D(histo, histo, 85, 0., 85., 20, 0., 20., 200, 0., 4000.);
 
-void EcalBarrelRecHitsValidation::analyze(const Event& e, const EventSetup& c){
+    sprintf(histo, "EB Ped SM%02d", i + 1);
+    meEBUncalibRecHitPedMap_[i] = ibooker.bookProfile2D(histo, histo, 85, 0., 85., 20, 0., 20., 50, 194., 201.);
+  }
+}
 
-  
+void EcalBarrelRecHitsValidation::analyze(const Event &e, const EventSetup &c) {
   const EBUncalibratedRecHitCollection *EBUncalibRecHit = nullptr;
-  Handle< EBUncalibratedRecHitCollection > EcalUncalibRecHitEB;
-  e.getByToken( EBuncalibrechitCollection_token_, EcalUncalibRecHitEB);
+  Handle<EBUncalibratedRecHitCollection> EcalUncalibRecHitEB;
+  e.getByToken(EBuncalibrechitCollection_token_, EcalUncalibRecHitEB);
   if (EcalUncalibRecHitEB.isValid()) {
     EBUncalibRecHit = EcalUncalibRecHitEB.product();
   } else {
@@ -120,87 +116,101 @@ void EcalBarrelRecHitsValidation::analyze(const Event& e, const EventSetup& c){
 
   bool skipDigis = false;
   const EBDigiCollection *EBDigi = nullptr;
-  Handle< EBDigiCollection > EcalDigiEB;
-  e.getByToken( EBdigiCollection_token_, EcalDigiEB);
+  Handle<EBDigiCollection> EcalDigiEB;
+  e.getByToken(EBdigiCollection_token_, EcalDigiEB);
   if (EcalDigiEB.isValid()) {
-    EBDigi = EcalDigiEB.product();    
+    EBDigi = EcalDigiEB.product();
   } else {
     skipDigis = true;
   }
 
-  edm::ESHandle<EcalPedestals> ecalPeds; 
+  edm::ESHandle<EcalPedestals> ecalPeds;
   c.get<EcalPedestalsRcd>().get(ecalPeds);
 
-  // ---------------------- 
+  // ----------------------
   // loop over UncalibRecHits
-  for (EcalUncalibratedRecHitCollection::const_iterator uncalibRecHit = EBUncalibRecHit->begin(); uncalibRecHit != EBUncalibRecHit->end() ; ++uncalibRecHit)
-    {
-      EBDetId EBid = EBDetId(uncalibRecHit->id());
-      
-      // general checks
-      if (meEBUncalibRecHitsOccupancy_)  meEBUncalibRecHitsOccupancy_  -> Fill(EBid.ieta(), EBid.iphi());
-      if (meEBUncalibRecHitsAmplitude_)  meEBUncalibRecHitsAmplitude_  -> Fill(uncalibRecHit->amplitude());
-      if (meEBUncalibRecHitsPedestal_)   meEBUncalibRecHitsPedestal_   -> Fill(uncalibRecHit->pedestal());
-      if (meEBUncalibRecHitsJitter_)     meEBUncalibRecHitsJitter_     -> Fill(uncalibRecHit->jitter());
-      if (meEBUncalibRecHitsChi2_)       meEBUncalibRecHitsChi2_       -> Fill(uncalibRecHit->chi2());
-      if (meEBUncalibRecHitsAmpFullMap_) meEBUncalibRecHitsAmpFullMap_ -> Fill(EBid.ieta(), EBid.iphi(), uncalibRecHit->amplitude()); 
-      if (meEBUncalibRecHitsPedFullMap_) meEBUncalibRecHitsPedFullMap_ -> Fill(EBid.ieta(), EBid.iphi(), uncalibRecHit->pedestal()); 
-
-      // general checks, with threshold at 3.5 GeV = 100 ADC counts
-      if ( uncalibRecHit->amplitude() > 100 ) 
-	{
-	  if (meEBUncalibRecHitsOccupancyGt100adc_)  meEBUncalibRecHitsOccupancyGt100adc_  -> Fill(EBid.ieta(), EBid.iphi());
-	  if (meEBUncalibRecHitsAmplitudeGt100adc_)  meEBUncalibRecHitsAmplitudeGt100adc_  -> Fill(uncalibRecHit->amplitude());
-	  if (meEBUncalibRecHitsPedestalGt100adc_)   meEBUncalibRecHitsPedestalGt100adc_   -> Fill(uncalibRecHit->pedestal());
-	  if (meEBUncalibRecHitsJitterGt100adc_)     meEBUncalibRecHitsJitterGt100adc_     -> Fill(uncalibRecHit->jitter());
-	  if (meEBUncalibRecHitsChi2Gt100adc_)       meEBUncalibRecHitsChi2Gt100adc_       -> Fill(uncalibRecHit->chi2());
-	}
-
-      // supermodule maps
-      int ic = EBid.ic();              
-      int ie = (ic-1)/20 + 1;          
-      int ip = (ic-1)%20 + 1;
-      int ism = EBid.ism();
-      float xie = ie - 0.5;
-      float xip = ip - 0.5;      
-      if( meEBUncalibRecHitPedMap_[ism-1] ) meEBUncalibRecHitPedMap_[ism-1]->Fill(xie, xip, uncalibRecHit->pedestal());
-      if( meEBUncalibRecHitAmplMap_[ism-1] ) meEBUncalibRecHitAmplMap_[ism-1]->Fill(xie, xip, uncalibRecHit->amplitude());
-      
-      if ( ! skipDigis ) { 
-        // find the rechit corresponding digi and the max sample
-        EBDigiCollection::const_iterator myDigi = EBDigi->find(EBid);
-        // int sMax = -1; // UNUSED
-        double eMax = 0.;
-        if (myDigi != EBDigi->end()){
-          for (unsigned int sample = 0 ; sample < myDigi->size(); ++sample){
-            EcalMGPASample thisSample = (*myDigi)[sample];
-            double analogSample = thisSample.adc();
-            if ( eMax < analogSample ){
-              eMax = analogSample;
-              // sMax = sample; // UNUSED
-            }
-          }
-        }
-        else
-          continue;
+  for (EcalUncalibratedRecHitCollection::const_iterator uncalibRecHit = EBUncalibRecHit->begin();
+       uncalibRecHit != EBUncalibRecHit->end();
+       ++uncalibRecHit) {
+    EBDetId EBid = EBDetId(uncalibRecHit->id());
+
+    // general checks
+    if (meEBUncalibRecHitsOccupancy_)
+      meEBUncalibRecHitsOccupancy_->Fill(EBid.ieta(), EBid.iphi());
+    if (meEBUncalibRecHitsAmplitude_)
+      meEBUncalibRecHitsAmplitude_->Fill(uncalibRecHit->amplitude());
+    if (meEBUncalibRecHitsPedestal_)
+      meEBUncalibRecHitsPedestal_->Fill(uncalibRecHit->pedestal());
+    if (meEBUncalibRecHitsJitter_)
+      meEBUncalibRecHitsJitter_->Fill(uncalibRecHit->jitter());
+    if (meEBUncalibRecHitsChi2_)
+      meEBUncalibRecHitsChi2_->Fill(uncalibRecHit->chi2());
+    if (meEBUncalibRecHitsAmpFullMap_)
+      meEBUncalibRecHitsAmpFullMap_->Fill(EBid.ieta(), EBid.iphi(), uncalibRecHit->amplitude());
+    if (meEBUncalibRecHitsPedFullMap_)
+      meEBUncalibRecHitsPedFullMap_->Fill(EBid.ieta(), EBid.iphi(), uncalibRecHit->pedestal());
+
+    // general checks, with threshold at 3.5 GeV = 100 ADC counts
+    if (uncalibRecHit->amplitude() > 100) {
+      if (meEBUncalibRecHitsOccupancyGt100adc_)
+        meEBUncalibRecHitsOccupancyGt100adc_->Fill(EBid.ieta(), EBid.iphi());
+      if (meEBUncalibRecHitsAmplitudeGt100adc_)
+        meEBUncalibRecHitsAmplitudeGt100adc_->Fill(uncalibRecHit->amplitude());
+      if (meEBUncalibRecHitsPedestalGt100adc_)
+        meEBUncalibRecHitsPedestalGt100adc_->Fill(uncalibRecHit->pedestal());
+      if (meEBUncalibRecHitsJitterGt100adc_)
+        meEBUncalibRecHitsJitterGt100adc_->Fill(uncalibRecHit->jitter());
+      if (meEBUncalibRecHitsChi2Gt100adc_)
+        meEBUncalibRecHitsChi2Gt100adc_->Fill(uncalibRecHit->chi2());
+    }
 
-        // ratio uncalibratedRecHit amplitude + ped / max energy digi  
-        const EcalPedestals* myped = ecalPeds.product();
-        EcalPedestalsMap::const_iterator it=myped->getMap().find( EBid );
-        if( it != myped->getMap().end() ){
-          
-          if (eMax > (*it).mean_x1 + 5 * (*it).rms_x1 && eMax != 0 ) {//only real signal RecHit
-            
-            if ( meEBUncalibRecHitMaxSampleRatio_ ) meEBUncalibRecHitMaxSampleRatio_->Fill( (uncalibRecHit->amplitude()+uncalibRecHit->pedestal())/eMax);
-            if ( meEBUncalibRecHitMaxSampleRatioGt100adc_ && (uncalibRecHit->amplitude()>100) ) meEBUncalibRecHitMaxSampleRatioGt100adc_->Fill( (uncalibRecHit->amplitude()+uncalibRecHit->pedestal())/eMax);
-            LogDebug("EcalRecHitsTaskInfo") << "barrel, eMax = " << eMax << " Amplitude = " << uncalibRecHit->amplitude()+uncalibRecHit->pedestal();  
+    // supermodule maps
+    int ic = EBid.ic();
+    int ie = (ic - 1) / 20 + 1;
+    int ip = (ic - 1) % 20 + 1;
+    int ism = EBid.ism();
+    float xie = ie - 0.5;
+    float xip = ip - 0.5;
+    if (meEBUncalibRecHitPedMap_[ism - 1])
+      meEBUncalibRecHitPedMap_[ism - 1]->Fill(xie, xip, uncalibRecHit->pedestal());
+    if (meEBUncalibRecHitAmplMap_[ism - 1])
+      meEBUncalibRecHitAmplMap_[ism - 1]->Fill(xie, xip, uncalibRecHit->amplitude());
+
+    if (!skipDigis) {
+      // find the rechit corresponding digi and the max sample
+      EBDigiCollection::const_iterator myDigi = EBDigi->find(EBid);
+      // int sMax = -1; // UNUSED
+      double eMax = 0.;
+      if (myDigi != EBDigi->end()) {
+        for (unsigned int sample = 0; sample < myDigi->size(); ++sample) {
+          EcalMGPASample thisSample = (*myDigi)[sample];
+          double analogSample = thisSample.adc();
+          if (eMax < analogSample) {
+            eMax = analogSample;
+            // sMax = sample; // UNUSED
           }
-          else
-            continue;
         }
-        else
+      } else
+        continue;
+
+      // ratio uncalibratedRecHit amplitude + ped / max energy digi
+      const EcalPedestals *myped = ecalPeds.product();
+      EcalPedestalsMap::const_iterator it = myped->getMap().find(EBid);
+      if (it != myped->getMap().end()) {
+        if (eMax > (*it).mean_x1 + 5 * (*it).rms_x1 && eMax != 0) {  // only real signal RecHit
+
+          if (meEBUncalibRecHitMaxSampleRatio_)
+            meEBUncalibRecHitMaxSampleRatio_->Fill((uncalibRecHit->amplitude() + uncalibRecHit->pedestal()) / eMax);
+          if (meEBUncalibRecHitMaxSampleRatioGt100adc_ && (uncalibRecHit->amplitude() > 100))
+            meEBUncalibRecHitMaxSampleRatioGt100adc_->Fill((uncalibRecHit->amplitude() + uncalibRecHit->pedestal()) /
+                                                           eMax);
+          LogDebug("EcalRecHitsTaskInfo")
+              << "barrel, eMax = " << eMax << " Amplitude = " << uncalibRecHit->amplitude() + uncalibRecHit->pedestal();
+        } else
           continue;
-      }
-      
-    }  // loop over the UncalibratedRecHitCollection
+      } else
+        continue;
+    }
+
+  }  // loop over the UncalibratedRecHitCollection
 }
diff --git a/Validation/EcalRecHits/src/EcalEndcapRecHitsValidation.cc b/Validation/EcalRecHits/src/EcalEndcapRecHitsValidation.cc
index 35e5559ad30cb..629203bff18d2 100644
--- a/Validation/EcalRecHits/src/EcalEndcapRecHitsValidation.cc
+++ b/Validation/EcalRecHits/src/EcalEndcapRecHitsValidation.cc
@@ -5,197 +5,213 @@
  *
  */
 
-#include <Validation/EcalRecHits/interface/EcalEndcapRecHitsValidation.h>
-#include <DataFormats/EcalDetId/interface/EEDetId.h>
 #include "DQMServices/Core/interface/DQMStore.h"
+#include <DataFormats/EcalDetId/interface/EEDetId.h>
+#include <Validation/EcalRecHits/interface/EcalEndcapRecHitsValidation.h>
 
 using namespace cms;
 using namespace edm;
 using namespace std;
 
-EcalEndcapRecHitsValidation::EcalEndcapRecHitsValidation(const ParameterSet& ps){
+EcalEndcapRecHitsValidation::EcalEndcapRecHitsValidation(const ParameterSet &ps) {
+  // ----------------------
+  EEdigiCollection_token_ = consumes<EEDigiCollection>(ps.getParameter<edm::InputTag>("EEdigiCollection"));
+  EEuncalibrechitCollection_token_ =
+      consumes<EEUncalibratedRecHitCollection>(ps.getParameter<edm::InputTag>("EEuncalibrechitCollection"));
 
-  // ---------------------- 
-  EEdigiCollection_token_          = consumes< EEDigiCollection > (ps.getParameter<edm::InputTag>("EEdigiCollection") );
-  EEuncalibrechitCollection_token_ = consumes< EEUncalibratedRecHitCollection > (ps.getParameter<edm::InputTag>("EEuncalibrechitCollection") );
-    
-  // ---------------------- 
-  // verbosity switch 
+  // ----------------------
+  // verbosity switch
   verbose_ = ps.getUntrackedParameter<bool>("verbose", false);
-  
-  // ----------------------   
-  meEEUncalibRecHitsOccupancyPlus_         = nullptr;
-  meEEUncalibRecHitsOccupancyMinus_        = nullptr;
-  meEEUncalibRecHitsAmplitude_             = nullptr;
-  meEEUncalibRecHitsPedestal_              = nullptr;
-  meEEUncalibRecHitsJitter_                = nullptr;
-  meEEUncalibRecHitsChi2_                  = nullptr;
-  meEEUncalibRecHitMaxSampleRatio_         = nullptr;
-  meEEUncalibRecHitsOccupancyPlusGt60adc_  = nullptr;
-  meEEUncalibRecHitsOccupancyMinusGt60adc_ = nullptr;
-  meEEUncalibRecHitsAmplitudeGt60adc_      = nullptr;
-  meEEUncalibRecHitsPedestalGt60adc_       = nullptr;
-  meEEUncalibRecHitsJitterGt60adc_         = nullptr;
-  meEEUncalibRecHitsChi2Gt60adc_           = nullptr;
-  meEEUncalibRecHitMaxSampleRatioGt60adc_  = nullptr;
-  meEEUncalibRecHitsAmpFullMap_            = nullptr;
-  meEEUncalibRecHitsPedFullMap_            = nullptr;
 
+  // ----------------------
+  meEEUncalibRecHitsOccupancyPlus_ = nullptr;
+  meEEUncalibRecHitsOccupancyMinus_ = nullptr;
+  meEEUncalibRecHitsAmplitude_ = nullptr;
+  meEEUncalibRecHitsPedestal_ = nullptr;
+  meEEUncalibRecHitsJitter_ = nullptr;
+  meEEUncalibRecHitsChi2_ = nullptr;
+  meEEUncalibRecHitMaxSampleRatio_ = nullptr;
+  meEEUncalibRecHitsOccupancyPlusGt60adc_ = nullptr;
+  meEEUncalibRecHitsOccupancyMinusGt60adc_ = nullptr;
+  meEEUncalibRecHitsAmplitudeGt60adc_ = nullptr;
+  meEEUncalibRecHitsPedestalGt60adc_ = nullptr;
+  meEEUncalibRecHitsJitterGt60adc_ = nullptr;
+  meEEUncalibRecHitsChi2Gt60adc_ = nullptr;
+  meEEUncalibRecHitMaxSampleRatioGt60adc_ = nullptr;
+  meEEUncalibRecHitsAmpFullMap_ = nullptr;
+  meEEUncalibRecHitsPedFullMap_ = nullptr;
 }
 
-EcalEndcapRecHitsValidation::~EcalEndcapRecHitsValidation(){   
+EcalEndcapRecHitsValidation::~EcalEndcapRecHitsValidation() {}
 
-}
-
-void EcalEndcapRecHitsValidation::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&){
-   
+void EcalEndcapRecHitsValidation::bookHistograms(DQMStore::IBooker &ibooker,
+                                                 edm::Run const &,
+                                                 edm::EventSetup const &) {
   Char_t histo[200];
-   
+
   ibooker.setCurrentFolder("EcalRecHitsV/EcalEndcapRecHitsTask");
 
-  sprintf (histo, "EE+ Occupancy" );  
+  sprintf(histo, "EE+ Occupancy");
   meEEUncalibRecHitsOccupancyPlus_ = ibooker.book2D(histo, histo, 100, 0., 100., 100, 0., 100.);
 
-  sprintf (histo, "EE- Occupancy" );  
+  sprintf(histo, "EE- Occupancy");
   meEEUncalibRecHitsOccupancyMinus_ = ibooker.book2D(histo, histo, 100, 0., 100., 100, 0., 100.);
 
-  sprintf (histo, "EE Amplitude" );
+  sprintf(histo, "EE Amplitude");
   meEEUncalibRecHitsAmplitude_ = ibooker.book1D(histo, histo, 201, -20., 4000.);
 
-  sprintf (histo, "EE Pedestal" );
+  sprintf(histo, "EE Pedestal");
   meEEUncalibRecHitsPedestal_ = ibooker.book1D(histo, histo, 50, 190., 210.);
 
-  sprintf (histo, "EE Jitter" );
+  sprintf(histo, "EE Jitter");
   meEEUncalibRecHitsJitter_ = ibooker.book1D(histo, histo, 100, 0., 100.);
 
-  sprintf (histo, "EE Chi2" );
+  sprintf(histo, "EE Chi2");
   meEEUncalibRecHitsChi2_ = ibooker.book1D(histo, histo, 100, 18000., 22000.);
 
-  sprintf (histo, "EE RecHit Max Sample Ratio"); 
+  sprintf(histo, "EE RecHit Max Sample Ratio");
   meEEUncalibRecHitMaxSampleRatio_ = ibooker.book1D(histo, histo, 120, 0.90, 1.05);
 
-  sprintf (histo, "EE+ Occupancy gt 60 adc counts" );  
+  sprintf(histo, "EE+ Occupancy gt 60 adc counts");
   meEEUncalibRecHitsOccupancyPlusGt60adc_ = ibooker.book2D(histo, histo, 100, 0., 100., 100, 0., 100.);
 
-  sprintf (histo, "EE- Occupancy gt 60 adc counts" );  
+  sprintf(histo, "EE- Occupancy gt 60 adc counts");
   meEEUncalibRecHitsOccupancyMinusGt60adc_ = ibooker.book2D(histo, histo, 100, 0., 100., 100, 0., 100.);
 
-  sprintf (histo, "EE Amplitude gt 60 adc counts" );
+  sprintf(histo, "EE Amplitude gt 60 adc counts");
   meEEUncalibRecHitsAmplitudeGt60adc_ = ibooker.book1D(histo, histo, 200, 0., 4000.);
 
-  sprintf (histo, "EE Pedestal gt 60 adc counts" );
+  sprintf(histo, "EE Pedestal gt 60 adc counts");
   meEEUncalibRecHitsPedestalGt60adc_ = ibooker.book1D(histo, histo, 50, 190., 210.);
 
-  sprintf (histo, "EE Jitter gt 60 adc counts" );
+  sprintf(histo, "EE Jitter gt 60 adc counts");
   meEEUncalibRecHitsJitterGt60adc_ = ibooker.book1D(histo, histo, 100, 0., 100.);
 
-  sprintf (histo, "EE Chi2 gt 60 adc counts" );
+  sprintf(histo, "EE Chi2 gt 60 adc counts");
   meEEUncalibRecHitsChi2Gt60adc_ = ibooker.book1D(histo, histo, 100, 18000., 22000.);
 
-  sprintf (histo, "EE RecHit Max Sample Ratio gt 60 adc counts"); 
+  sprintf(histo, "EE RecHit Max Sample Ratio gt 60 adc counts");
   meEEUncalibRecHitMaxSampleRatioGt60adc_ = ibooker.book1D(histo, histo, 120, 0.90, 1.05);
 
-  sprintf (histo, "EE Amplitude Full Map");
+  sprintf(histo, "EE Amplitude Full Map");
   meEEUncalibRecHitsAmpFullMap_ = ibooker.bookProfile2D(histo, histo, 100, 0., 100., 100, 0., 100., 200, 0., 4000.);
 
-  sprintf (histo, "EE Pedestal Full Map");
+  sprintf(histo, "EE Pedestal Full Map");
   meEEUncalibRecHitsPedFullMap_ = ibooker.bookProfile2D(histo, histo, 100, 0., 100., 100, 0., 100., 50, 194., 201.);
-
 }
 
-void EcalEndcapRecHitsValidation::analyze(const Event& e, const EventSetup& c){
-
+void EcalEndcapRecHitsValidation::analyze(const Event &e, const EventSetup &c) {
   const EEUncalibratedRecHitCollection *EEUncalibRecHit = nullptr;
-  Handle< EEUncalibratedRecHitCollection > EcalUncalibRecHitEE;
-  e.getByToken( EEuncalibrechitCollection_token_, EcalUncalibRecHitEE);
+  Handle<EEUncalibratedRecHitCollection> EcalUncalibRecHitEE;
+  e.getByToken(EEuncalibrechitCollection_token_, EcalUncalibRecHitEE);
   if (EcalUncalibRecHitEE.isValid()) {
-    EEUncalibRecHit = EcalUncalibRecHitEE.product() ;
+    EEUncalibRecHit = EcalUncalibRecHitEE.product();
   } else {
     return;
   }
-  
+
   bool skipDigis = false;
   const EEDigiCollection *EEDigi = nullptr;
-  Handle< EEDigiCollection > EcalDigiEE;
-  e.getByToken( EEdigiCollection_token_, EcalDigiEE);
-  if (EcalDigiEE.isValid()) { 
-    EEDigi = EcalDigiEE.product(); 
-  } else { 
+  Handle<EEDigiCollection> EcalDigiEE;
+  e.getByToken(EEdigiCollection_token_, EcalDigiEE);
+  if (EcalDigiEE.isValid()) {
+    EEDigi = EcalDigiEE.product();
+  } else {
     skipDigis = true;
   }
-  
-  edm::ESHandle<EcalPedestals> ecalPeds; 
+
+  edm::ESHandle<EcalPedestals> ecalPeds;
   c.get<EcalPedestalsRcd>().get(ecalPeds);
 
-  // ---------------------- 
+  // ----------------------
   // loop over UncalibRecHits
-  for (EcalUncalibratedRecHitCollection::const_iterator uncalibRecHit = EEUncalibRecHit->begin(); uncalibRecHit != EEUncalibRecHit->end() ; ++uncalibRecHit)
-    {
-      EEDetId EEid = EEDetId(uncalibRecHit->id());
-
-      int mySide = EEid.zside();      
-
-      // general checks
-      if (mySide > 0) { if (meEEUncalibRecHitsOccupancyPlus_)  meEEUncalibRecHitsOccupancyPlus_  ->Fill(EEid.ix(), EEid.iy()); }
-      if (mySide < 0) { if (meEEUncalibRecHitsOccupancyMinus_) meEEUncalibRecHitsOccupancyMinus_ ->Fill(EEid.ix(), EEid.iy()); }
-      if (meEEUncalibRecHitsAmplitude_)  meEEUncalibRecHitsAmplitude_  -> Fill(uncalibRecHit->amplitude());
-      if (meEEUncalibRecHitsPedestal_)   meEEUncalibRecHitsPedestal_   -> Fill(uncalibRecHit->pedestal());
-      if (meEEUncalibRecHitsJitter_)     meEEUncalibRecHitsJitter_     -> Fill(uncalibRecHit->jitter());
-      if (meEEUncalibRecHitsChi2_)       meEEUncalibRecHitsChi2_       -> Fill(uncalibRecHit->chi2());
-      if (meEEUncalibRecHitsAmpFullMap_) meEEUncalibRecHitsAmpFullMap_ -> Fill(EEid.ix(), EEid.iy(), uncalibRecHit->amplitude()); 
-      if (meEEUncalibRecHitsPedFullMap_) meEEUncalibRecHitsPedFullMap_ -> Fill(EEid.ix(), EEid.iy(), uncalibRecHit->pedestal()); 
-
-
-      // general checks, with threshold at 60 ADC counts
-      if ( uncalibRecHit->amplitude() > 60 ) 
-	{
-	  if (mySide > 0) { if (meEEUncalibRecHitsOccupancyPlusGt60adc_)  meEEUncalibRecHitsOccupancyPlusGt60adc_ ->Fill(EEid.ix(), EEid.iy()); }
-	  if (mySide < 0) { if (meEEUncalibRecHitsOccupancyMinusGt60adc_) meEEUncalibRecHitsOccupancyMinusGt60adc_->Fill(EEid.ix(), EEid.iy()); }
-	  if (meEEUncalibRecHitsAmplitudeGt60adc_)  meEEUncalibRecHitsAmplitudeGt60adc_  -> Fill(uncalibRecHit->amplitude());
-	  if (meEEUncalibRecHitsPedestalGt60adc_)   meEEUncalibRecHitsPedestalGt60adc_   -> Fill(uncalibRecHit->pedestal());
-	  if (meEEUncalibRecHitsJitterGt60adc_)     meEEUncalibRecHitsJitterGt60adc_     -> Fill(uncalibRecHit->jitter());
-	  if (meEEUncalibRecHitsChi2Gt60adc_)       meEEUncalibRecHitsChi2Gt60adc_       -> Fill(uncalibRecHit->chi2());
-	}
-
-      if ( ! skipDigis ) {
-        // Find the rechit corresponding digi
-        EEDigiCollection::const_iterator myDigi = EEDigi->find(EEid);
-        // int sMax    = -1; // UNUSED
-        double eMax = 0.;
-        if (myDigi != EEDigi->end()){ 
-          for (unsigned int sample = 0 ; sample < myDigi->size(); ++sample){
-            EcalMGPASample thisSample = (*myDigi)[sample];
-            double analogSample = thisSample.adc();
-            if ( eMax < analogSample ){ 
-              eMax = analogSample;
-              // sMax = sample; // UNUSED
-            }
+  for (EcalUncalibratedRecHitCollection::const_iterator uncalibRecHit = EEUncalibRecHit->begin();
+       uncalibRecHit != EEUncalibRecHit->end();
+       ++uncalibRecHit) {
+    EEDetId EEid = EEDetId(uncalibRecHit->id());
+
+    int mySide = EEid.zside();
+
+    // general checks
+    if (mySide > 0) {
+      if (meEEUncalibRecHitsOccupancyPlus_)
+        meEEUncalibRecHitsOccupancyPlus_->Fill(EEid.ix(), EEid.iy());
+    }
+    if (mySide < 0) {
+      if (meEEUncalibRecHitsOccupancyMinus_)
+        meEEUncalibRecHitsOccupancyMinus_->Fill(EEid.ix(), EEid.iy());
+    }
+    if (meEEUncalibRecHitsAmplitude_)
+      meEEUncalibRecHitsAmplitude_->Fill(uncalibRecHit->amplitude());
+    if (meEEUncalibRecHitsPedestal_)
+      meEEUncalibRecHitsPedestal_->Fill(uncalibRecHit->pedestal());
+    if (meEEUncalibRecHitsJitter_)
+      meEEUncalibRecHitsJitter_->Fill(uncalibRecHit->jitter());
+    if (meEEUncalibRecHitsChi2_)
+      meEEUncalibRecHitsChi2_->Fill(uncalibRecHit->chi2());
+    if (meEEUncalibRecHitsAmpFullMap_)
+      meEEUncalibRecHitsAmpFullMap_->Fill(EEid.ix(), EEid.iy(), uncalibRecHit->amplitude());
+    if (meEEUncalibRecHitsPedFullMap_)
+      meEEUncalibRecHitsPedFullMap_->Fill(EEid.ix(), EEid.iy(), uncalibRecHit->pedestal());
+
+    // general checks, with threshold at 60 ADC counts
+    if (uncalibRecHit->amplitude() > 60) {
+      if (mySide > 0) {
+        if (meEEUncalibRecHitsOccupancyPlusGt60adc_)
+          meEEUncalibRecHitsOccupancyPlusGt60adc_->Fill(EEid.ix(), EEid.iy());
+      }
+      if (mySide < 0) {
+        if (meEEUncalibRecHitsOccupancyMinusGt60adc_)
+          meEEUncalibRecHitsOccupancyMinusGt60adc_->Fill(EEid.ix(), EEid.iy());
+      }
+      if (meEEUncalibRecHitsAmplitudeGt60adc_)
+        meEEUncalibRecHitsAmplitudeGt60adc_->Fill(uncalibRecHit->amplitude());
+      if (meEEUncalibRecHitsPedestalGt60adc_)
+        meEEUncalibRecHitsPedestalGt60adc_->Fill(uncalibRecHit->pedestal());
+      if (meEEUncalibRecHitsJitterGt60adc_)
+        meEEUncalibRecHitsJitterGt60adc_->Fill(uncalibRecHit->jitter());
+      if (meEEUncalibRecHitsChi2Gt60adc_)
+        meEEUncalibRecHitsChi2Gt60adc_->Fill(uncalibRecHit->chi2());
+    }
+
+    if (!skipDigis) {
+      // Find the rechit corresponding digi
+      EEDigiCollection::const_iterator myDigi = EEDigi->find(EEid);
+      // int sMax    = -1; // UNUSED
+      double eMax = 0.;
+      if (myDigi != EEDigi->end()) {
+        for (unsigned int sample = 0; sample < myDigi->size(); ++sample) {
+          EcalMGPASample thisSample = (*myDigi)[sample];
+          double analogSample = thisSample.adc();
+          if (eMax < analogSample) {
+            eMax = analogSample;
+            // sMax = sample; // UNUSED
           }
         }
-        else
-          continue;
-      
-        // ratio uncalibratedRecHit amplitude + ped / max energy digi  
-        const EcalPedestals* myped = ecalPeds.product();
-        EcalPedestalsMap::const_iterator it=myped->getMap().find( EEid );
-        if( it != myped->getMap().end() ){
-          
-          if (eMax > (*it).mean_x1 + 5 * (*it).rms_x1 && eMax != 0 ){ //only real signal RecHit
-            
-            if ( meEEUncalibRecHitMaxSampleRatio_ )
-              { meEEUncalibRecHitMaxSampleRatio_->Fill( (uncalibRecHit->amplitude()+uncalibRecHit->pedestal())/eMax); }
-            
-            if ( meEEUncalibRecHitMaxSampleRatioGt60adc_ && (uncalibRecHit->amplitude() > 60) ) 
-              { meEEUncalibRecHitMaxSampleRatioGt60adc_->Fill( (uncalibRecHit->amplitude()+uncalibRecHit->pedestal())/eMax); }
-            
-            LogDebug("EcalRecHitsTaskInfo") << "endcap, eMax = " << eMax << " Amplitude = " << uncalibRecHit->amplitude()+uncalibRecHit->pedestal();  
+      } else
+        continue;
+
+      // ratio uncalibratedRecHit amplitude + ped / max energy digi
+      const EcalPedestals *myped = ecalPeds.product();
+      EcalPedestalsMap::const_iterator it = myped->getMap().find(EEid);
+      if (it != myped->getMap().end()) {
+        if (eMax > (*it).mean_x1 + 5 * (*it).rms_x1 && eMax != 0) {  // only real signal RecHit
+
+          if (meEEUncalibRecHitMaxSampleRatio_) {
+            meEEUncalibRecHitMaxSampleRatio_->Fill((uncalibRecHit->amplitude() + uncalibRecHit->pedestal()) / eMax);
           }
-          else
-            continue;
-        }
-        else
-          continue;
-      }
-    } // loop over the UncalibratedRecHitCollection
 
+          if (meEEUncalibRecHitMaxSampleRatioGt60adc_ && (uncalibRecHit->amplitude() > 60)) {
+            meEEUncalibRecHitMaxSampleRatioGt60adc_->Fill((uncalibRecHit->amplitude() + uncalibRecHit->pedestal()) /
+                                                          eMax);
+          }
+
+          LogDebug("EcalRecHitsTaskInfo")
+              << "endcap, eMax = " << eMax << " Amplitude = " << uncalibRecHit->amplitude() + uncalibRecHit->pedestal();
+        } else
+          continue;
+      } else
+        continue;
+    }
+  }  // loop over the UncalibratedRecHitCollection
 }
diff --git a/Validation/EcalRecHits/src/EcalPreshowerRecHitsValidation.cc b/Validation/EcalRecHits/src/EcalPreshowerRecHitsValidation.cc
index da89e32b5fe00..c3b164f2a74f4 100644
--- a/Validation/EcalRecHits/src/EcalPreshowerRecHitsValidation.cc
+++ b/Validation/EcalRecHits/src/EcalPreshowerRecHitsValidation.cc
@@ -5,121 +5,114 @@
  *
  */
 
-#include <Validation/EcalRecHits/interface/EcalPreshowerRecHitsValidation.h>
-#include <DataFormats/EcalDetId/interface/ESDetId.h>
-#include <DataFormats/EcalDetId/interface/EEDetId.h>
 #include "DQMServices/Core/interface/DQMStore.h"
+#include <DataFormats/EcalDetId/interface/EEDetId.h>
+#include <DataFormats/EcalDetId/interface/ESDetId.h>
+#include <Validation/EcalRecHits/interface/EcalPreshowerRecHitsValidation.h>
 
 using namespace cms;
 using namespace edm;
 using namespace std;
 
-
-EcalPreshowerRecHitsValidation::EcalPreshowerRecHitsValidation(const ParameterSet& ps){
-
-
+EcalPreshowerRecHitsValidation::EcalPreshowerRecHitsValidation(const ParameterSet &ps) {
   // ----------------------
-  EEuncalibrechitCollection_token_ = consumes<EEUncalibratedRecHitCollection>(ps.getParameter<edm::InputTag>("EEuncalibrechitCollection"));
-  EErechitCollection_token_        = consumes<EERecHitCollection>(ps.getParameter<edm::InputTag>("EErechitCollection"));
-  ESrechitCollection_token_        = consumes<ESRecHitCollection>(ps.getParameter<edm::InputTag>("ESrechitCollection"));
-
+  EEuncalibrechitCollection_token_ =
+      consumes<EEUncalibratedRecHitCollection>(ps.getParameter<edm::InputTag>("EEuncalibrechitCollection"));
+  EErechitCollection_token_ = consumes<EERecHitCollection>(ps.getParameter<edm::InputTag>("EErechitCollection"));
+  ESrechitCollection_token_ = consumes<ESRecHitCollection>(ps.getParameter<edm::InputTag>("ESrechitCollection"));
 
-  // ---------------------- 
-  // verbosity switch 
+  // ----------------------
+  // verbosity switch
   verbose_ = ps.getUntrackedParameter<bool>("verbose", false);
 
-  // ----------------------  
-  meESRecHitsEnergy_           = nullptr;                // total energy
-  meESRecHitsEnergy_zp1st_     = nullptr;    
-  meESRecHitsEnergy_zp2nd_     = nullptr;    
-  meESRecHitsEnergy_zm1st_     = nullptr;    
-  meESRecHitsEnergy_zm2nd_     = nullptr;    
-  meESRecHitsMultip_           = nullptr;                // total multiplicity
-  meESRecHitsMultip_zp1st_     = nullptr;    
-  meESRecHitsMultip_zp2nd_     = nullptr;    
-  meESRecHitsMultip_zm1st_     = nullptr;    
-  meESRecHitsMultip_zm2nd_     = nullptr;    
-  meESEERecHitsEnergy_zp_      = nullptr;                // versus EE energy 
-  meESEERecHitsEnergy_zm_      = nullptr;      
-
-  for (int kk=0; kk<32; kk++)
-    { 
-      meESRecHitsStripOccupancy_zp1st_[kk] = nullptr;   
-      meESRecHitsStripOccupancy_zm1st_[kk] = nullptr;   
-      meESRecHitsStripOccupancy_zp2nd_[kk] = nullptr;   
-      meESRecHitsStripOccupancy_zm2nd_[kk] = nullptr;   
-    }
-}
-
-EcalPreshowerRecHitsValidation::~EcalPreshowerRecHitsValidation(){   
-
+  // ----------------------
+  meESRecHitsEnergy_ = nullptr;  // total energy
+  meESRecHitsEnergy_zp1st_ = nullptr;
+  meESRecHitsEnergy_zp2nd_ = nullptr;
+  meESRecHitsEnergy_zm1st_ = nullptr;
+  meESRecHitsEnergy_zm2nd_ = nullptr;
+  meESRecHitsMultip_ = nullptr;  // total multiplicity
+  meESRecHitsMultip_zp1st_ = nullptr;
+  meESRecHitsMultip_zp2nd_ = nullptr;
+  meESRecHitsMultip_zm1st_ = nullptr;
+  meESRecHitsMultip_zm2nd_ = nullptr;
+  meESEERecHitsEnergy_zp_ = nullptr;  // versus EE energy
+  meESEERecHitsEnergy_zm_ = nullptr;
+
+  for (int kk = 0; kk < 32; kk++) {
+    meESRecHitsStripOccupancy_zp1st_[kk] = nullptr;
+    meESRecHitsStripOccupancy_zm1st_[kk] = nullptr;
+    meESRecHitsStripOccupancy_zp2nd_[kk] = nullptr;
+    meESRecHitsStripOccupancy_zm2nd_[kk] = nullptr;
+  }
 }
 
-void EcalPreshowerRecHitsValidation::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&){
+EcalPreshowerRecHitsValidation::~EcalPreshowerRecHitsValidation() {}
 
+void EcalPreshowerRecHitsValidation::bookHistograms(DQMStore::IBooker &ibooker,
+                                                    edm::Run const &,
+                                                    edm::EventSetup const &) {
   Char_t histo[200];
 
   ibooker.setCurrentFolder("EcalRecHitsV/EcalPreshowerRecHitsTask");
 
-  sprintf (histo, "ES Energy" );
+  sprintf(histo, "ES Energy");
   meESRecHitsEnergy_ = ibooker.book1D(histo, histo, 210, -0.0005, 0.01);
-  
-  sprintf (histo, "ES Energy Plane1 Side+" );
+
+  sprintf(histo, "ES Energy Plane1 Side+");
   meESRecHitsEnergy_zp1st_ = ibooker.book1D(histo, histo, 210, -0.0005, 0.01);
 
-  sprintf (histo, "ES Energy Plane2 Side+");
+  sprintf(histo, "ES Energy Plane2 Side+");
   meESRecHitsEnergy_zp2nd_ = ibooker.book1D(histo, histo, 210, -0.0005, 0.01);
- 
-  sprintf (histo, "ES Energy Plane1 Side-");
+
+  sprintf(histo, "ES Energy Plane1 Side-");
   meESRecHitsEnergy_zm1st_ = ibooker.book1D(histo, histo, 210, -0.0005, 0.01);
 
-  sprintf (histo, "ES Energy Plane2 Side-");
+  sprintf(histo, "ES Energy Plane2 Side-");
   meESRecHitsEnergy_zm2nd_ = ibooker.book1D(histo, histo, 210, -0.0005, 0.01);
 
-  sprintf (histo, "ES Multiplicity" );
+  sprintf(histo, "ES Multiplicity");
   meESRecHitsMultip_ = ibooker.book1D(histo, histo, 100, 0., 700.);
 
-  sprintf (histo, "ES Multiplicity Plane1 Side+");
+  sprintf(histo, "ES Multiplicity Plane1 Side+");
   meESRecHitsMultip_zp1st_ = ibooker.book1D(histo, histo, 100, 0., 700.);
 
-  sprintf (histo, "ES Multiplicity Plane2 Side+");
+  sprintf(histo, "ES Multiplicity Plane2 Side+");
   meESRecHitsMultip_zp2nd_ = ibooker.book1D(histo, histo, 100, 0., 700.);
 
-  sprintf (histo, "ES Multiplicity Plane1 Side-");
+  sprintf(histo, "ES Multiplicity Plane1 Side-");
   meESRecHitsMultip_zm1st_ = ibooker.book1D(histo, histo, 100, 0., 700.);
 
-  sprintf (histo, "ES Multiplicity Plane2 Side-");
+  sprintf(histo, "ES Multiplicity Plane2 Side-");
   meESRecHitsMultip_zm2nd_ = ibooker.book1D(histo, histo, 100, 0., 700.);
 
-  sprintf (histo, "Preshower EE vs ES energy Side+");
+  sprintf(histo, "Preshower EE vs ES energy Side+");
   meESEERecHitsEnergy_zp_ = ibooker.book2D(histo, histo, 100, 0., 0.2, 100, 0., 150.);
 
-  sprintf (histo, "Preshower EE vs ES energy Side-");
+  sprintf(histo, "Preshower EE vs ES energy Side-");
   meESEERecHitsEnergy_zm_ = ibooker.book2D(histo, histo, 100, 0., 0.2, 100, 0., 150.);
 
-  for (int kk=0; kk<32; kk++)
-    { 
-      sprintf(histo, "ES Occupancy Plane1 Side+ Strip%02d", kk+1);    
-      meESRecHitsStripOccupancy_zp1st_[kk] = ibooker.book2D(histo, histo, 40, 0., 40., 40, 0., 40.);
+  for (int kk = 0; kk < 32; kk++) {
+    sprintf(histo, "ES Occupancy Plane1 Side+ Strip%02d", kk + 1);
+    meESRecHitsStripOccupancy_zp1st_[kk] = ibooker.book2D(histo, histo, 40, 0., 40., 40, 0., 40.);
 
-      sprintf(histo, "ES Occupancy Plane2 Side+ Strip%02d", kk+1);    
-      meESRecHitsStripOccupancy_zp2nd_[kk] = ibooker.book2D(histo, histo, 40, 0., 40., 40, 0., 40.);
+    sprintf(histo, "ES Occupancy Plane2 Side+ Strip%02d", kk + 1);
+    meESRecHitsStripOccupancy_zp2nd_[kk] = ibooker.book2D(histo, histo, 40, 0., 40., 40, 0., 40.);
 
-      sprintf(histo, "ES Occupancy Plane1 Side- Strip%02d", kk+1);    
-      meESRecHitsStripOccupancy_zm1st_[kk] = ibooker.book2D(histo, histo, 40, 0., 40., 40, 0., 40.);
+    sprintf(histo, "ES Occupancy Plane1 Side- Strip%02d", kk + 1);
+    meESRecHitsStripOccupancy_zm1st_[kk] = ibooker.book2D(histo, histo, 40, 0., 40., 40, 0., 40.);
 
-      sprintf(histo, "ES Occupancy Plane2 Side- Strip%02d", kk+1);    
-      meESRecHitsStripOccupancy_zm2nd_[kk] = ibooker.book2D(histo, histo, 40, 0., 40., 40, 0., 40.);
-    }
+    sprintf(histo, "ES Occupancy Plane2 Side- Strip%02d", kk + 1);
+    meESRecHitsStripOccupancy_zm2nd_[kk] = ibooker.book2D(histo, histo, 40, 0., 40., 40, 0., 40.);
+  }
 }
 
-void EcalPreshowerRecHitsValidation::analyze(const Event& e, const EventSetup& c){
-
+void EcalPreshowerRecHitsValidation::analyze(const Event &e, const EventSetup &c) {
   const ESRecHitCollection *ESRecHit = nullptr;
   Handle<ESRecHitCollection> EcalRecHitES;
-  e.getByToken( ESrechitCollection_token_, EcalRecHitES);
+  e.getByToken(ESrechitCollection_token_, EcalRecHitES);
   if (EcalRecHitES.isValid()) {
-    ESRecHit = EcalRecHitES.product ();
+    ESRecHit = EcalRecHitES.product();
   } else {
     return;
   }
@@ -127,126 +120,146 @@ void EcalPreshowerRecHitsValidation::analyze(const Event& e, const EventSetup& c
   bool skipEE = false;
   const EERecHitCollection *EERecHit = nullptr;
   Handle<EERecHitCollection> EcalRecHitEE;
-  e.getByToken( EErechitCollection_token_, EcalRecHitEE);
-  if (EcalRecHitEE.isValid()){   
-    EERecHit = EcalRecHitEE.product ();  
+  e.getByToken(EErechitCollection_token_, EcalRecHitEE);
+  if (EcalRecHitEE.isValid()) {
+    EERecHit = EcalRecHitEE.product();
   } else {
     skipEE = true;
   }
 
   const EEUncalibratedRecHitCollection *EEUncalibRecHit = nullptr;
-  Handle< EEUncalibratedRecHitCollection > EcalUncalibRecHitEE;
-  e.getByToken( EEuncalibrechitCollection_token_, EcalUncalibRecHitEE);
+  Handle<EEUncalibratedRecHitCollection> EcalUncalibRecHitEE;
+  e.getByToken(EEuncalibrechitCollection_token_, EcalUncalibRecHitEE);
   if (EcalUncalibRecHitEE.isValid()) {
-    EEUncalibRecHit = EcalUncalibRecHitEE.product() ;
+    EEUncalibRecHit = EcalUncalibRecHitEE.product();
   } else {
     skipEE = true;
   }
 
-
-
-  // ---------------------- 
+  // ----------------------
   // loop over RecHits
   // multiplicities
-  int mult_tot       = 0;
-  int mult_zp1st     = 0;
-  int mult_zp2nd     = 0;
-  int mult_zm1st     = 0;
-  int mult_zm2nd     = 0;
+  int mult_tot = 0;
+  int mult_zp1st = 0;
+  int mult_zp2nd = 0;
+  int mult_zm1st = 0;
+  int mult_zm2nd = 0;
 
   // energies
-  float ene_zp1st      = 0.;
-  float ene_zp2nd      = 0.;
-  float ene_zm1st      = 0.;
-  float ene_zm2nd      = 0.;
-
+  float ene_zp1st = 0.;
+  float ene_zp2nd = 0.;
+  float ene_zm1st = 0.;
+  float ene_zm2nd = 0.;
 
   // ES
-  for (ESRecHitCollection::const_iterator recHit = ESRecHit->begin(); recHit != ESRecHit->end() ; ++recHit)
-    {
-      ESDetId ESid = ESDetId(recHit->id());
-
-      int zside = ESid.zside();
-      int plane = ESid.plane();
-      int six   = ESid.six();
-      int siy   = ESid.siy();
-      int strip = ESid.strip();
-      
-      // global
-      mult_tot++;
-      if (meESRecHitsEnergy_) meESRecHitsEnergy_ ->Fill(recHit->energy());      
-      
-      // side +, plane 1
-      if ( (zside == +1) && (plane == 1) )
-	{ 
-	  mult_zp1st++;
-	  ene_zp1st += recHit->energy();
-	  if ( meESRecHitsEnergy_zp1st_ )                 { meESRecHitsEnergy_zp1st_                 -> Fill(recHit->energy()); }
-	  if ( meESRecHitsStripOccupancy_zp1st_[strip-1] ){ meESRecHitsStripOccupancy_zp1st_[strip-1]-> Fill( six, siy ); }
-	}
-      
-
-      // side +, plane 2
-      if ( (zside == +1) && (plane == 2) )
-	{ 
-	  mult_zp2nd++; 
-	  ene_zp2nd += recHit->energy();
-	  if ( meESRecHitsEnergy_zp2nd_ )                 { meESRecHitsEnergy_zp2nd_                 -> Fill(recHit->energy()); }
-	  if ( meESRecHitsStripOccupancy_zp2nd_[strip-1] ){ meESRecHitsStripOccupancy_zp2nd_[strip-1]-> Fill( six, siy ); }
-	}
-
-
-      // side -, plane 1
-      if ( (zside == -1) && (plane == 1) )
-	{ 
-	  mult_zm1st++;
-	  ene_zm1st += recHit->energy(); 
-	  if ( meESRecHitsEnergy_zm1st_ )                 { meESRecHitsEnergy_zm1st_                 -> Fill(recHit->energy()); }
-	  if ( meESRecHitsStripOccupancy_zm1st_[strip-1] ){ meESRecHitsStripOccupancy_zm1st_[strip-1]-> Fill( six, siy ); }
-	}
-
-
-      // side +, plane 2
-      if ( (zside == -1) && (plane == 2) )
-	{ 
-	  mult_zm2nd ++; 
-	  ene_zm2nd += recHit->energy();
-	  if ( meESRecHitsEnergy_zm2nd_ )                 { meESRecHitsEnergy_zm2nd_                 -> Fill(recHit->energy()); }
-	  if ( meESRecHitsStripOccupancy_zm2nd_[strip-1] ){ meESRecHitsStripOccupancy_zm2nd_[strip-1]-> Fill( six, siy ); }
-	}
-
-    }  // loop over the ES RecHitCollection
+  for (ESRecHitCollection::const_iterator recHit = ESRecHit->begin(); recHit != ESRecHit->end(); ++recHit) {
+    ESDetId ESid = ESDetId(recHit->id());
+
+    int zside = ESid.zside();
+    int plane = ESid.plane();
+    int six = ESid.six();
+    int siy = ESid.siy();
+    int strip = ESid.strip();
+
+    // global
+    mult_tot++;
+    if (meESRecHitsEnergy_)
+      meESRecHitsEnergy_->Fill(recHit->energy());
+
+    // side +, plane 1
+    if ((zside == +1) && (plane == 1)) {
+      mult_zp1st++;
+      ene_zp1st += recHit->energy();
+      if (meESRecHitsEnergy_zp1st_) {
+        meESRecHitsEnergy_zp1st_->Fill(recHit->energy());
+      }
+      if (meESRecHitsStripOccupancy_zp1st_[strip - 1]) {
+        meESRecHitsStripOccupancy_zp1st_[strip - 1]->Fill(six, siy);
+      }
+    }
+
+    // side +, plane 2
+    if ((zside == +1) && (plane == 2)) {
+      mult_zp2nd++;
+      ene_zp2nd += recHit->energy();
+      if (meESRecHitsEnergy_zp2nd_) {
+        meESRecHitsEnergy_zp2nd_->Fill(recHit->energy());
+      }
+      if (meESRecHitsStripOccupancy_zp2nd_[strip - 1]) {
+        meESRecHitsStripOccupancy_zp2nd_[strip - 1]->Fill(six, siy);
+      }
+    }
+
+    // side -, plane 1
+    if ((zside == -1) && (plane == 1)) {
+      mult_zm1st++;
+      ene_zm1st += recHit->energy();
+      if (meESRecHitsEnergy_zm1st_) {
+        meESRecHitsEnergy_zm1st_->Fill(recHit->energy());
+      }
+      if (meESRecHitsStripOccupancy_zm1st_[strip - 1]) {
+        meESRecHitsStripOccupancy_zm1st_[strip - 1]->Fill(six, siy);
+      }
+    }
 
+    // side +, plane 2
+    if ((zside == -1) && (plane == 2)) {
+      mult_zm2nd++;
+      ene_zm2nd += recHit->energy();
+      if (meESRecHitsEnergy_zm2nd_) {
+        meESRecHitsEnergy_zm2nd_->Fill(recHit->energy());
+      }
+      if (meESRecHitsStripOccupancy_zm2nd_[strip - 1]) {
+        meESRecHitsStripOccupancy_zm2nd_[strip - 1]->Fill(six, siy);
+      }
+    }
 
+  }  // loop over the ES RecHitCollection
 
   // EE
   double zpEE = 0.;
   double zmEE = 0.;
-  if ( ! skipEE ) {
-    
-    for (EcalUncalibratedRecHitCollection::const_iterator uncalibRecHit = EEUncalibRecHit->begin(); uncalibRecHit != EEUncalibRecHit->end() ; ++uncalibRecHit)
-      {
-        EEDetId EEid = EEDetId(uncalibRecHit->id());
-        int mySide = EEid.zside();
-        
-        // Find corresponding recHit
-        EcalRecHitCollection::const_iterator myRecHit = EERecHit->find(EEid);
-        
-        if (myRecHit != EERecHit->end() )
-          {
-            if (mySide > 0) { zpEE = zpEE + myRecHit->energy(); }
-            if (mySide < 0) { zmEE = zmEE + myRecHit->energy(); }
-          }
-      } 
+  if (!skipEE) {
+    for (EcalUncalibratedRecHitCollection::const_iterator uncalibRecHit = EEUncalibRecHit->begin();
+         uncalibRecHit != EEUncalibRecHit->end();
+         ++uncalibRecHit) {
+      EEDetId EEid = EEDetId(uncalibRecHit->id());
+      int mySide = EEid.zside();
+
+      // Find corresponding recHit
+      EcalRecHitCollection::const_iterator myRecHit = EERecHit->find(EEid);
+
+      if (myRecHit != EERecHit->end()) {
+        if (mySide > 0) {
+          zpEE = zpEE + myRecHit->energy();
+        }
+        if (mySide < 0) {
+          zmEE = zmEE + myRecHit->energy();
+        }
+      }
+    }
   }
-  
 
   // filling histos
-  if (meESRecHitsMultip_)            { meESRecHitsMultip_           -> Fill(mult_tot);   }
-  if (meESRecHitsMultip_zp1st_ )     { meESRecHitsMultip_zp1st_     -> Fill(mult_zp1st); }
-  if (meESRecHitsMultip_zp2nd_ )     { meESRecHitsMultip_zp2nd_     -> Fill(mult_zp2nd); }
-  if (meESRecHitsMultip_zm1st_ )     { meESRecHitsMultip_zm1st_     -> Fill(mult_zm1st); }
-  if (meESRecHitsMultip_zm2nd_ )     { meESRecHitsMultip_zm2nd_     -> Fill(mult_zm2nd); }
-  if (meESEERecHitsEnergy_zp_)       { meESEERecHitsEnergy_zp_      -> Fill( (ene_zp1st + 0.7*ene_zp2nd)/0.09, zpEE ); }
-  if (meESEERecHitsEnergy_zm_)       { meESEERecHitsEnergy_zm_      -> Fill( (ene_zm1st + 0.7*ene_zm2nd)/0.09, zmEE ); }
+  if (meESRecHitsMultip_) {
+    meESRecHitsMultip_->Fill(mult_tot);
+  }
+  if (meESRecHitsMultip_zp1st_) {
+    meESRecHitsMultip_zp1st_->Fill(mult_zp1st);
+  }
+  if (meESRecHitsMultip_zp2nd_) {
+    meESRecHitsMultip_zp2nd_->Fill(mult_zp2nd);
+  }
+  if (meESRecHitsMultip_zm1st_) {
+    meESRecHitsMultip_zm1st_->Fill(mult_zm1st);
+  }
+  if (meESRecHitsMultip_zm2nd_) {
+    meESRecHitsMultip_zm2nd_->Fill(mult_zm2nd);
+  }
+  if (meESEERecHitsEnergy_zp_) {
+    meESEERecHitsEnergy_zp_->Fill((ene_zp1st + 0.7 * ene_zp2nd) / 0.09, zpEE);
+  }
+  if (meESEERecHitsEnergy_zm_) {
+    meESEERecHitsEnergy_zm_->Fill((ene_zm1st + 0.7 * ene_zm2nd) / 0.09, zmEE);
+  }
 }
diff --git a/Validation/EcalRecHits/src/EcalRecHitsValidation.cc b/Validation/EcalRecHits/src/EcalRecHitsValidation.cc
index b8740748091c2..c9d78505be9a8 100644
--- a/Validation/EcalRecHits/src/EcalRecHitsValidation.cc
+++ b/Validation/EcalRecHits/src/EcalRecHitsValidation.cc
@@ -3,175 +3,175 @@
  *
  * \author C. Rovelli
  *
-*/
+ */
 
-#include <Validation/EcalRecHits/interface/EcalRecHitsValidation.h>
-#include <DataFormats/EcalDetId/interface/EBDetId.h>
-#include <DataFormats/EcalDetId/interface/EEDetId.h>
-#include <DataFormats/EcalDetId/interface/ESDetId.h>
 #include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include <string>
 #include "CondFormats/DataRecord/interface/EcalChannelStatusRcd.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "Geometry/CaloTopology/interface/EcalTrigTowerConstituentsMap.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"
+#include <DataFormats/EcalDetId/interface/EBDetId.h>
+#include <DataFormats/EcalDetId/interface/EEDetId.h>
+#include <DataFormats/EcalDetId/interface/ESDetId.h>
+#include <Validation/EcalRecHits/interface/EcalRecHitsValidation.h>
+#include <string>
 
 using namespace cms;
 using namespace edm;
 using namespace std;
 
-EcalRecHitsValidation::EcalRecHitsValidation(const ParameterSet& ps){
-
-  // ---------------------- 
-  HepMCLabel                 = ps.getParameter<std::string>("moduleLabelMC"); 
-  hitsProducer_              = ps.getParameter<std::string>("hitsProducer");
-  EBrechitCollection_        = ps.getParameter<edm::InputTag>("EBrechitCollection");
-  EErechitCollection_        = ps.getParameter<edm::InputTag>("EErechitCollection");
-  ESrechitCollection_        = ps.getParameter<edm::InputTag>("ESrechitCollection");
+EcalRecHitsValidation::EcalRecHitsValidation(const ParameterSet &ps) {
+  // ----------------------
+  HepMCLabel = ps.getParameter<std::string>("moduleLabelMC");
+  hitsProducer_ = ps.getParameter<std::string>("hitsProducer");
+  EBrechitCollection_ = ps.getParameter<edm::InputTag>("EBrechitCollection");
+  EErechitCollection_ = ps.getParameter<edm::InputTag>("EErechitCollection");
+  ESrechitCollection_ = ps.getParameter<edm::InputTag>("ESrechitCollection");
   EBuncalibrechitCollection_ = ps.getParameter<edm::InputTag>("EBuncalibrechitCollection");
   EEuncalibrechitCollection_ = ps.getParameter<edm::InputTag>("EEuncalibrechitCollection");
   // fix for consumes
-  HepMCLabel_Token_         = consumes<HepMCProduct>(ps.getParameter<std::string>("moduleLabelMC"));
+  HepMCLabel_Token_ = consumes<HepMCProduct>(ps.getParameter<std::string>("moduleLabelMC"));
   EBrechitCollection_Token_ = consumes<EBRecHitCollection>(ps.getParameter<edm::InputTag>("EBrechitCollection"));
   EErechitCollection_Token_ = consumes<EERecHitCollection>(ps.getParameter<edm::InputTag>("EErechitCollection"));
   ESrechitCollection_Token_ = consumes<ESRecHitCollection>(ps.getParameter<edm::InputTag>("ESrechitCollection"));
-  EBuncalibrechitCollection_Token_ = consumes<EBUncalibratedRecHitCollection>(ps.getParameter<edm::InputTag>("EBuncalibrechitCollection"));
-  EEuncalibrechitCollection_Token_ = consumes<EEUncalibratedRecHitCollection>(ps.getParameter<edm::InputTag>("EEuncalibrechitCollection"));  
-  EBHits_Token_ = consumes<CrossingFrame<PCaloHit> >(edm::InputTag(std::string("mix"), ps.getParameter<std::string>("hitsProducer") + std::string("EcalHitsEB")));
-  EEHits_Token_ = consumes<CrossingFrame<PCaloHit> >(edm::InputTag(std::string("mix"), ps.getParameter<std::string>("hitsProducer") + std::string("EcalHitsEE")));
-  ESHits_Token_ = consumes<CrossingFrame<PCaloHit> >(edm::InputTag(std::string("mix"), ps.getParameter<std::string>("hitsProducer") + std::string("EcalHitsES")));
-
-  // ---------------------- 
-  // DQM ROOT output 
+  EBuncalibrechitCollection_Token_ =
+      consumes<EBUncalibratedRecHitCollection>(ps.getParameter<edm::InputTag>("EBuncalibrechitCollection"));
+  EEuncalibrechitCollection_Token_ =
+      consumes<EEUncalibratedRecHitCollection>(ps.getParameter<edm::InputTag>("EEuncalibrechitCollection"));
+  EBHits_Token_ = consumes<CrossingFrame<PCaloHit>>(
+      edm::InputTag(std::string("mix"), ps.getParameter<std::string>("hitsProducer") + std::string("EcalHitsEB")));
+  EEHits_Token_ = consumes<CrossingFrame<PCaloHit>>(
+      edm::InputTag(std::string("mix"), ps.getParameter<std::string>("hitsProducer") + std::string("EcalHitsEE")));
+  ESHits_Token_ = consumes<CrossingFrame<PCaloHit>>(
+      edm::InputTag(std::string("mix"), ps.getParameter<std::string>("hitsProducer") + std::string("EcalHitsES")));
+
+  // ----------------------
+  // DQM ROOT output
   outputFile_ = ps.getUntrackedParameter<string>("outputFile", "");
 
-  if ( !outputFile_.empty() ) {
+  if (!outputFile_.empty()) {
     LogInfo("OutputInfo") << " Ecal RecHits Task histograms will be saved to '" << outputFile_.c_str() << "'";
   } else {
     LogInfo("OutputInfo") << " Ecal RecHits Task histograms will NOT be saved";
   }
- 
-  // ---------------------- 
-  // verbosity switch 
+
+  // ----------------------
+  // verbosity switch
   verbose_ = ps.getUntrackedParameter<bool>("verbose", false);
 
-  // ----------------------   
-  meGunEnergy_                 = nullptr;
-  meGunEta_                    = nullptr;   
-  meGunPhi_                    = nullptr;   
-  meEBRecHitSimHitRatio_       = nullptr;
-  meEERecHitSimHitRatio_       = nullptr;
-  meESRecHitSimHitRatio_       = nullptr;
-  meEBRecHitSimHitRatio1011_   = nullptr;
-  meEERecHitSimHitRatio1011_   = nullptr;
-  meEBRecHitSimHitRatio12_     = nullptr;
-  meEERecHitSimHitRatio12_     = nullptr;
-  meEBRecHitSimHitRatio13_     = nullptr;
-  meEERecHitSimHitRatio13_     = nullptr;
-  meEBRecHitSimHitRatioGt35_   = nullptr;
-  meEERecHitSimHitRatioGt35_   = nullptr;
-  meEBUnRecHitSimHitRatio_     = nullptr;
-  meEEUnRecHitSimHitRatio_     = nullptr;
+  // ----------------------
+  meGunEnergy_ = nullptr;
+  meGunEta_ = nullptr;
+  meGunPhi_ = nullptr;
+  meEBRecHitSimHitRatio_ = nullptr;
+  meEERecHitSimHitRatio_ = nullptr;
+  meESRecHitSimHitRatio_ = nullptr;
+  meEBRecHitSimHitRatio1011_ = nullptr;
+  meEERecHitSimHitRatio1011_ = nullptr;
+  meEBRecHitSimHitRatio12_ = nullptr;
+  meEERecHitSimHitRatio12_ = nullptr;
+  meEBRecHitSimHitRatio13_ = nullptr;
+  meEERecHitSimHitRatio13_ = nullptr;
+  meEBRecHitSimHitRatioGt35_ = nullptr;
+  meEERecHitSimHitRatioGt35_ = nullptr;
+  meEBUnRecHitSimHitRatio_ = nullptr;
+  meEEUnRecHitSimHitRatio_ = nullptr;
   meEBUnRecHitSimHitRatioGt35_ = nullptr;
   meEEUnRecHitSimHitRatioGt35_ = nullptr;
-  meEBe5x5_                    = nullptr;
-  meEBe5x5OverSimHits_         = nullptr;
-  meEBe5x5OverGun_             = nullptr;
-  meEEe5x5_                    = nullptr;
-  meEEe5x5OverSimHits_         = nullptr;
-  meEEe5x5OverGun_             = nullptr;
-  
-  meEBRecHitLog10Energy_         = nullptr;
-  meEERecHitLog10Energy_         = nullptr;
-  meESRecHitLog10Energy_         = nullptr;
-  meEBRecHitLog10EnergyContr_    = nullptr;
-  meEERecHitLog10EnergyContr_    = nullptr;
-  meESRecHitLog10EnergyContr_    = nullptr;
+  meEBe5x5_ = nullptr;
+  meEBe5x5OverSimHits_ = nullptr;
+  meEBe5x5OverGun_ = nullptr;
+  meEEe5x5_ = nullptr;
+  meEEe5x5OverSimHits_ = nullptr;
+  meEEe5x5OverGun_ = nullptr;
+
+  meEBRecHitLog10Energy_ = nullptr;
+  meEERecHitLog10Energy_ = nullptr;
+  meESRecHitLog10Energy_ = nullptr;
+  meEBRecHitLog10EnergyContr_ = nullptr;
+  meEERecHitLog10EnergyContr_ = nullptr;
+  meESRecHitLog10EnergyContr_ = nullptr;
   meEBRecHitLog10Energy5x5Contr_ = nullptr;
   meEERecHitLog10Energy5x5Contr_ = nullptr;
 
-  meEBRecHitsOccupancyFlag5_6_      = nullptr;
-  meEBRecHitsOccupancyFlag8_9_      = nullptr;
-  meEERecHitsOccupancyPlusFlag5_6_  = nullptr;
+  meEBRecHitsOccupancyFlag5_6_ = nullptr;
+  meEBRecHitsOccupancyFlag8_9_ = nullptr;
+  meEERecHitsOccupancyPlusFlag5_6_ = nullptr;
   meEERecHitsOccupancyMinusFlag5_6_ = nullptr;
-  meEERecHitsOccupancyPlusFlag8_9_  = nullptr;
+  meEERecHitsOccupancyPlusFlag8_9_ = nullptr;
   meEERecHitsOccupancyMinusFlag8_9_ = nullptr;
-  
-  meEBRecHitFlags_                   = nullptr;
-  meEBRecHitSimHitvsSimHitFlag5_6_   = nullptr;
-  meEBRecHitSimHitFlag6_             = nullptr;
-  meEBRecHitSimHitFlag7_             = nullptr;
-  meEB5x5RecHitSimHitvsSimHitFlag8_  = nullptr;
-
-  meEERecHitFlags_                   = nullptr;
-  meEERecHitSimHitvsSimHitFlag5_6_   = nullptr;
-  meEERecHitSimHitFlag6_             = nullptr;
-  meEERecHitSimHitFlag7_             = nullptr;
-
-}
 
-EcalRecHitsValidation::~EcalRecHitsValidation(){   
+  meEBRecHitFlags_ = nullptr;
+  meEBRecHitSimHitvsSimHitFlag5_6_ = nullptr;
+  meEBRecHitSimHitFlag6_ = nullptr;
+  meEBRecHitSimHitFlag7_ = nullptr;
+  meEB5x5RecHitSimHitvsSimHitFlag8_ = nullptr;
 
+  meEERecHitFlags_ = nullptr;
+  meEERecHitSimHitvsSimHitFlag5_6_ = nullptr;
+  meEERecHitSimHitFlag6_ = nullptr;
+  meEERecHitSimHitFlag7_ = nullptr;
 }
 
-void EcalRecHitsValidation::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&){
+EcalRecHitsValidation::~EcalRecHitsValidation() {}
 
+void EcalRecHitsValidation::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &, edm::EventSetup const &) {
   std::string histo;
-   
+
   ibooker.setCurrentFolder("EcalRecHitsV/EcalRecHitsTask");
-  
+
   histo = "EcalRecHitsTask Gun Momentum";
   meGunEnergy_ = ibooker.book1D(histo.c_str(), histo.c_str(), 100, 0., 1000.);
 
-  histo = "EcalRecHitsTask Gun Eta";      
+  histo = "EcalRecHitsTask Gun Eta";
   meGunEta_ = ibooker.book1D(histo.c_str(), histo.c_str(), 700, -3.5, 3.5);
-   
-  histo = "EcalRecHitsTask Gun Phi";  
-  meGunPhi_ = ibooker.book1D(histo.c_str(), histo.c_str(), 360, 0., 360.);    
-  
-  histo = "EcalRecHitsTask Barrel RecSimHit Ratio";  
-  meEBRecHitSimHitRatio_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);   
-
-  histo = "EcalRecHitsTask Endcap RecSimHit Ratio"; 
+
+  histo = "EcalRecHitsTask Gun Phi";
+  meGunPhi_ = ibooker.book1D(histo.c_str(), histo.c_str(), 360, 0., 360.);
+
+  histo = "EcalRecHitsTask Barrel RecSimHit Ratio";
+  meEBRecHitSimHitRatio_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);
+
+  histo = "EcalRecHitsTask Endcap RecSimHit Ratio";
   meEERecHitSimHitRatio_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);
 
-  histo = "EcalRecHitsTask Preshower RecSimHit Ratio"; 
+  histo = "EcalRecHitsTask Preshower RecSimHit Ratio";
   meESRecHitSimHitRatio_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);
 
-  histo = "EcalRecHitsTask Barrel RecSimHit Ratio gt 3p5 GeV";  
-  meEBRecHitSimHitRatioGt35_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0.9, 1.1);   
+  histo = "EcalRecHitsTask Barrel RecSimHit Ratio gt 3p5 GeV";
+  meEBRecHitSimHitRatioGt35_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0.9, 1.1);
 
-  histo = "EcalRecHitsTask Endcap RecSimHit Ratio gt 3p5 GeV"; 
+  histo = "EcalRecHitsTask Endcap RecSimHit Ratio gt 3p5 GeV";
   meEERecHitSimHitRatioGt35_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0.9, 1.1);
 
-  histo = "EcalRecHitsTask Barrel Unc RecSimHit Ratio";  
-  meEBUnRecHitSimHitRatio_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);   
+  histo = "EcalRecHitsTask Barrel Unc RecSimHit Ratio";
+  meEBUnRecHitSimHitRatio_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);
 
-  histo = "EcalRecHitsTask Endcap Unc RecSimHit Ratio"; 
+  histo = "EcalRecHitsTask Endcap Unc RecSimHit Ratio";
   meEEUnRecHitSimHitRatio_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);
 
-  histo = "EcalRecHitsTask Barrel RecSimHit Ratio Channel Status=10 11";  
-  meEBRecHitSimHitRatio1011_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);   
+  histo = "EcalRecHitsTask Barrel RecSimHit Ratio Channel Status=10 11";
+  meEBRecHitSimHitRatio1011_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);
 
-  histo = "EcalRecHitsTask Endcap RecSimHit Ratio Channel Status=10 11"; 
+  histo = "EcalRecHitsTask Endcap RecSimHit Ratio Channel Status=10 11";
   meEERecHitSimHitRatio1011_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);
 
-  histo = "EcalRecHitsTask Barrel RecSimHit Ratio Channel Status=12";  
-  meEBRecHitSimHitRatio12_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);   
+  histo = "EcalRecHitsTask Barrel RecSimHit Ratio Channel Status=12";
+  meEBRecHitSimHitRatio12_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);
 
-  histo = "EcalRecHitsTask Endcap RecSimHit Ratio Channel Status=12"; 
+  histo = "EcalRecHitsTask Endcap RecSimHit Ratio Channel Status=12";
   meEERecHitSimHitRatio12_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);
 
-  histo = "EcalRecHitsTask Barrel RecSimHit Ratio Channel Status=13";  
-  meEBRecHitSimHitRatio13_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);   
+  histo = "EcalRecHitsTask Barrel RecSimHit Ratio Channel Status=13";
+  meEBRecHitSimHitRatio13_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);
 
-  histo = "EcalRecHitsTask Endcap RecSimHit Ratio Channel Status=13"; 
+  histo = "EcalRecHitsTask Endcap RecSimHit Ratio Channel Status=13";
   meEERecHitSimHitRatio13_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);
 
-  histo = "EcalRecHitsTask Barrel Unc RecSimHit Ratio gt 3p5 GeV";  
-  meEBUnRecHitSimHitRatioGt35_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0.9, 1.1);   
+  histo = "EcalRecHitsTask Barrel Unc RecSimHit Ratio gt 3p5 GeV";
+  meEBUnRecHitSimHitRatioGt35_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0.9, 1.1);
 
-  histo = "EcalRecHitsTask Endcap Unc RecSimHit Ratio gt 3p5 GeV"; 
+  histo = "EcalRecHitsTask Endcap Unc RecSimHit Ratio gt 3p5 GeV";
   meEEUnRecHitSimHitRatioGt35_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0.9, 1.1);
 
   histo = "EcalRecHitsTask Barrel Rec E5x5";
@@ -192,99 +192,132 @@ void EcalRecHitsValidation::bookHistograms(DQMStore::IBooker &ibooker, edm::Run
   histo = "EcalRecHitsTask Endcap Rec E5x5 over gun energy";
   meEEe5x5OverGun_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0.9, 1.1);
 
-  meEBRecHitLog10Energy_ = ibooker.book1D( "EcalRecHitsTask Barrel Log10 Energy", "EcalRecHitsTask Barrel Log10 Energy", 90, -5., 4. ); 
-  meEERecHitLog10Energy_ = ibooker.book1D( "EcalRecHitsTask Endcap Log10 Energy", "EcalRecHitsTask Endcap Log10 Energy", 90, -5., 4. ); 
-  meESRecHitLog10Energy_ = ibooker.book1D( "EcalRecHitsTask Preshower Log10 Energy", "EcalRecHitsTask Preshower Log10 Energy", 90, -5., 4. ); 
-  meEBRecHitLog10EnergyContr_ = ibooker.bookProfile( "EcalRecHits Barrel Log10En vs Hit Contribution", "EcalRecHits Barrel Log10En vs Hit Contribution", 90, -5., 4., 100, 0., 1. ); 
-  meEERecHitLog10EnergyContr_ = ibooker.bookProfile( "EcalRecHits Endcap Log10En vs Hit Contribution", "EcalRecHits Endcap Log10En vs Hit Contribution", 90, -5., 4., 100, 0., 1. ); 
-  meESRecHitLog10EnergyContr_ = ibooker.bookProfile( "EcalRecHits Preshower Log10En vs Hit Contribution", "EcalRecHits Preshower Log10En vs Hit Contribution", 90, -5., 4., 100, 0., 1. ); 
-  meEBRecHitLog10Energy5x5Contr_ = ibooker.bookProfile( "EcalRecHits Barrel Log10En5x5 vs Hit Contribution", "EcalRecHits Barrel Log10En5x5 vs Hit Contribution", 90, -5., 4., 100, 0., 1. ); 
-  meEERecHitLog10Energy5x5Contr_ = ibooker.bookProfile( "EcalRecHits Endcap Log10En5x5 vs Hit Contribution", "EcalRecHits Endcap Log10En5x5 vs Hit Contribution", 90, -5., 4., 100, 0., 1. ); 
-  
-
-  histo = "EB Occupancy Flag=5 6";  
+  meEBRecHitLog10Energy_ =
+      ibooker.book1D("EcalRecHitsTask Barrel Log10 Energy", "EcalRecHitsTask Barrel Log10 Energy", 90, -5., 4.);
+  meEERecHitLog10Energy_ =
+      ibooker.book1D("EcalRecHitsTask Endcap Log10 Energy", "EcalRecHitsTask Endcap Log10 Energy", 90, -5., 4.);
+  meESRecHitLog10Energy_ =
+      ibooker.book1D("EcalRecHitsTask Preshower Log10 Energy", "EcalRecHitsTask Preshower Log10 Energy", 90, -5., 4.);
+  meEBRecHitLog10EnergyContr_ = ibooker.bookProfile("EcalRecHits Barrel Log10En vs Hit Contribution",
+                                                    "EcalRecHits Barrel Log10En vs Hit Contribution",
+                                                    90,
+                                                    -5.,
+                                                    4.,
+                                                    100,
+                                                    0.,
+                                                    1.);
+  meEERecHitLog10EnergyContr_ = ibooker.bookProfile("EcalRecHits Endcap Log10En vs Hit Contribution",
+                                                    "EcalRecHits Endcap Log10En vs Hit Contribution",
+                                                    90,
+                                                    -5.,
+                                                    4.,
+                                                    100,
+                                                    0.,
+                                                    1.);
+  meESRecHitLog10EnergyContr_ = ibooker.bookProfile("EcalRecHits Preshower Log10En vs Hit Contribution",
+                                                    "EcalRecHits Preshower Log10En vs Hit Contribution",
+                                                    90,
+                                                    -5.,
+                                                    4.,
+                                                    100,
+                                                    0.,
+                                                    1.);
+  meEBRecHitLog10Energy5x5Contr_ = ibooker.bookProfile("EcalRecHits Barrel Log10En5x5 vs Hit Contribution",
+                                                       "EcalRecHits Barrel Log10En5x5 vs Hit Contribution",
+                                                       90,
+                                                       -5.,
+                                                       4.,
+                                                       100,
+                                                       0.,
+                                                       1.);
+  meEERecHitLog10Energy5x5Contr_ = ibooker.bookProfile("EcalRecHits Endcap Log10En5x5 vs Hit Contribution",
+                                                       "EcalRecHits Endcap Log10En5x5 vs Hit Contribution",
+                                                       90,
+                                                       -5.,
+                                                       4.,
+                                                       100,
+                                                       0.,
+                                                       1.);
+
+  histo = "EB Occupancy Flag=5 6";
   meEBRecHitsOccupancyFlag5_6_ = ibooker.book2D(histo, histo, 170, -85., 85., 360, 0., 360.);
-  histo = "EB Occupancy Flag=8 9";  
+  histo = "EB Occupancy Flag=8 9";
   meEBRecHitsOccupancyFlag8_9_ = ibooker.book2D(histo, histo, 170, -85., 85., 360, 0., 360.);
 
-  histo = "EE+ Occupancy Flag=5 6";  
+  histo = "EE+ Occupancy Flag=5 6";
   meEERecHitsOccupancyPlusFlag5_6_ = ibooker.book2D(histo, histo, 100, 0., 100., 100, 0., 100.);
-  histo = "EE- Occupancy Flag=5 6";  
+  histo = "EE- Occupancy Flag=5 6";
   meEERecHitsOccupancyMinusFlag5_6_ = ibooker.book2D(histo, histo, 100, 0., 100., 100, 0., 100.);
-  histo = "EE+ Occupancy Flag=8 9";  
+  histo = "EE+ Occupancy Flag=8 9";
   meEERecHitsOccupancyPlusFlag8_9_ = ibooker.book2D(histo, histo, 100, 0., 100., 100, 0., 100.);
-  histo = "EE- Occupancy Flag=8 9";  
+  histo = "EE- Occupancy Flag=8 9";
   meEERecHitsOccupancyMinusFlag8_9_ = ibooker.book2D(histo, histo, 100, 0., 100., 100, 0., 100.);
 
-
-  histo = "EcalRecHitsTask Barrel Reco Flags";  
-  meEBRecHitFlags_ = ibooker.book1D(histo.c_str(), histo.c_str(), 10, 0., 10.);   
-  histo = "EcalRecHitsTask Endcap Reco Flags";  
-  meEERecHitFlags_ = ibooker.book1D(histo.c_str(), histo.c_str(), 10, 0., 10.);   
-  histo = "EcalRecHitsTask Barrel RecSimHit Ratio vs SimHit Flag=5 6";  
-  meEBRecHitSimHitvsSimHitFlag5_6_ = ibooker.book2D(histo.c_str(), histo.c_str(), 80, 0., 2., 4000, 0., 400. );   
-  histo = "EcalRecHitsTask Endcap RecSimHit Ratio vs SimHit Flag=5 6"; 
-  meEERecHitSimHitvsSimHitFlag5_6_ = ibooker.book2D(histo.c_str(), histo.c_str(), 80, 0., 2., 4000, 0., 400. );
-  histo = "EcalRecHitsTask Barrel RecSimHit Ratio Flag=6";  
-  meEBRecHitSimHitFlag6_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);   
-  histo = "EcalRecHitsTask Endcap RecSimHit Ratio Flag=6"; 
+  histo = "EcalRecHitsTask Barrel Reco Flags";
+  meEBRecHitFlags_ = ibooker.book1D(histo.c_str(), histo.c_str(), 10, 0., 10.);
+  histo = "EcalRecHitsTask Endcap Reco Flags";
+  meEERecHitFlags_ = ibooker.book1D(histo.c_str(), histo.c_str(), 10, 0., 10.);
+  histo = "EcalRecHitsTask Barrel RecSimHit Ratio vs SimHit Flag=5 6";
+  meEBRecHitSimHitvsSimHitFlag5_6_ = ibooker.book2D(histo.c_str(), histo.c_str(), 80, 0., 2., 4000, 0., 400.);
+  histo = "EcalRecHitsTask Endcap RecSimHit Ratio vs SimHit Flag=5 6";
+  meEERecHitSimHitvsSimHitFlag5_6_ = ibooker.book2D(histo.c_str(), histo.c_str(), 80, 0., 2., 4000, 0., 400.);
+  histo = "EcalRecHitsTask Barrel RecSimHit Ratio Flag=6";
+  meEBRecHitSimHitFlag6_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);
+  histo = "EcalRecHitsTask Endcap RecSimHit Ratio Flag=6";
   meEERecHitSimHitFlag6_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);
-  histo = "EcalRecHitsTask Barrel RecSimHit Ratio Flag=7";  
-  meEBRecHitSimHitFlag7_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);   
-  histo = "EcalRecHitsTask Endcap RecSimHit Ratio Flag=7"; 
+  histo = "EcalRecHitsTask Barrel RecSimHit Ratio Flag=7";
+  meEBRecHitSimHitFlag7_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);
+  histo = "EcalRecHitsTask Endcap RecSimHit Ratio Flag=7";
   meEERecHitSimHitFlag7_ = ibooker.book1D(histo.c_str(), histo.c_str(), 80, 0., 2.);
-  histo = "EcalRecHitsTask Barrel 5x5 RecSimHit Ratio vs SimHit Flag=8";  
-  meEB5x5RecHitSimHitvsSimHitFlag8_ = ibooker.book2D(histo.c_str(), histo.c_str(), 80, 0., 2., 4000, 0., 400. );   
-
+  histo = "EcalRecHitsTask Barrel 5x5 RecSimHit Ratio vs SimHit Flag=8";
+  meEB5x5RecHitSimHitvsSimHitFlag8_ = ibooker.book2D(histo.c_str(), histo.c_str(), 80, 0., 2., 4000, 0., 400.);
 }
 
+void EcalRecHitsValidation::analyze(const Event &e, const EventSetup &c) {
+  // Temporary stuff
 
-void EcalRecHitsValidation::analyze(const Event& e, const EventSetup& c){
-
-  //Temporary stuff
-
-
-  
   LogInfo("EcalRecHitsTask, EventInfo: ") << " Run = " << e.id().run() << " Event = " << e.id().event();
 
   // ADC -> GeV Scale
   edm::ESHandle<EcalADCToGeVConstant> pAgc;
   c.get<EcalADCToGeVConstantRcd>().get(pAgc);
-  const EcalADCToGeVConstant* agc = pAgc.product();
-  const double barrelADCtoGeV_  = agc->getEBValue();
+  const EcalADCToGeVConstant *agc = pAgc.product();
+  const double barrelADCtoGeV_ = agc->getEBValue();
   const double endcapADCtoGeV_ = agc->getEEValue();
-  
-  Handle<HepMCProduct> MCEvt;                   
+
+  Handle<HepMCProduct> MCEvt;
   bool skipMC = false;
-  e.getByToken(HepMCLabel_Token_, MCEvt);  
-  if (!MCEvt.isValid()) { skipMC = true; }
+  e.getByToken(HepMCLabel_Token_, MCEvt);
+  if (!MCEvt.isValid()) {
+    skipMC = true;
+  }
 
-  edm::Handle<CrossingFrame<PCaloHit> > crossingFrame;
+  edm::Handle<CrossingFrame<PCaloHit>> crossingFrame;
 
   bool skipBarrel = false;
-  const EBUncalibratedRecHitCollection *EBUncalibRecHit =nullptr;
-  Handle< EBUncalibratedRecHitCollection > EcalUncalibRecHitEB;
-  e.getByToken( EBuncalibrechitCollection_Token_, EcalUncalibRecHitEB);
+  const EBUncalibratedRecHitCollection *EBUncalibRecHit = nullptr;
+  Handle<EBUncalibratedRecHitCollection> EcalUncalibRecHitEB;
+  e.getByToken(EBuncalibrechitCollection_Token_, EcalUncalibRecHitEB);
   if (EcalUncalibRecHitEB.isValid()) {
-    EBUncalibRecHit = EcalUncalibRecHitEB.product() ;    
+    EBUncalibRecHit = EcalUncalibRecHitEB.product();
   } else {
     skipBarrel = true;
   }
 
   bool skipEndcap = false;
   const EEUncalibratedRecHitCollection *EEUncalibRecHit = nullptr;
-  Handle< EEUncalibratedRecHitCollection > EcalUncalibRecHitEE;
-  e.getByToken( EEuncalibrechitCollection_Token_, EcalUncalibRecHitEE);
-  if (EcalUncalibRecHitEE.isValid()){ 
-    EEUncalibRecHit = EcalUncalibRecHitEE.product () ;
+  Handle<EEUncalibratedRecHitCollection> EcalUncalibRecHitEE;
+  e.getByToken(EEuncalibrechitCollection_Token_, EcalUncalibRecHitEE);
+  if (EcalUncalibRecHitEE.isValid()) {
+    EEUncalibRecHit = EcalUncalibRecHitEE.product();
   } else {
     skipEndcap = true;
   }
 
   const EBRecHitCollection *EBRecHit = nullptr;
   Handle<EBRecHitCollection> EcalRecHitEB;
-  e.getByToken( EBrechitCollection_Token_, EcalRecHitEB);
-  if (EcalRecHitEB.isValid()){ 
+  e.getByToken(EBrechitCollection_Token_, EcalRecHitEB);
+  if (EcalRecHitEB.isValid()) {
     EBRecHit = EcalRecHitEB.product();
   } else {
     skipBarrel = true;
@@ -292,9 +325,9 @@ void EcalRecHitsValidation::analyze(const Event& e, const EventSetup& c){
 
   const EERecHitCollection *EERecHit = nullptr;
   Handle<EERecHitCollection> EcalRecHitEE;
-  e.getByToken( EErechitCollection_Token_, EcalRecHitEE);
-  if (EcalRecHitEE.isValid()){
-    EERecHit = EcalRecHitEE.product ();
+  e.getByToken(EErechitCollection_Token_, EcalRecHitEE);
+  if (EcalRecHitEE.isValid()) {
+    EERecHit = EcalRecHitEE.product();
   } else {
     skipEndcap = true;
   }
@@ -302,186 +335,215 @@ void EcalRecHitsValidation::analyze(const Event& e, const EventSetup& c){
   bool skipPreshower = false;
   const ESRecHitCollection *ESRecHit = nullptr;
   Handle<ESRecHitCollection> EcalRecHitES;
-  e.getByToken( ESrechitCollection_Token_, EcalRecHitES);
+  e.getByToken(ESrechitCollection_Token_, EcalRecHitES);
   if (EcalRecHitES.isValid()) {
-    ESRecHit = EcalRecHitES.product ();      
+    ESRecHit = EcalRecHitES.product();
   } else {
     skipPreshower = true;
   }
 
-
-  // ---------------------- 
+  // ----------------------
   // gun
   double eGun = 0.;
-  if ( ! skipMC ) {
-    for ( HepMC::GenEvent::particle_const_iterator p = MCEvt->GetEvent()->particles_begin(); p != MCEvt->GetEvent()->particles_end(); ++p )  {      
+  if (!skipMC) {
+    for (HepMC::GenEvent::particle_const_iterator p = MCEvt->GetEvent()->particles_begin();
+         p != MCEvt->GetEvent()->particles_end();
+         ++p) {
       double htheta = (*p)->momentum().theta();
       double heta = -99999.;
-      if( tan(htheta * 0.5) > 0 ) {
-	heta = -log(tan(htheta * 0.5));
+      if (tan(htheta * 0.5) > 0) {
+        heta = -log(tan(htheta * 0.5));
       }
       double hphi = (*p)->momentum().phi();
-      hphi = (hphi>=0) ? hphi : hphi+2*M_PI;
+      hphi = (hphi >= 0) ? hphi : hphi + 2 * M_PI;
       hphi = hphi / M_PI * 180.;
-      
-      LogDebug("EventInfo") << "EcalRecHitsTask: Particle gun type form MC = " << abs((*p)->pdg_id()) 
-			    << "\n" << "Energy = "<< (*p)->momentum().e() 
-			    << "\n" << "Eta = "   << heta 
-			    << "\n" << "Phi = "   << hphi;
-      
-      if ( (*p)->momentum().e() > eGun ) eGun = (*p)->momentum().e();
-
-      if (meGunEnergy_) meGunEnergy_->Fill((*p)->momentum().e());
-      if (meGunEta_)    meGunEta_   ->Fill(heta);
-      if (meGunPhi_)    meGunPhi_   ->Fill(hphi); 
+
+      LogDebug("EventInfo") << "EcalRecHitsTask: Particle gun type form MC = " << abs((*p)->pdg_id()) << "\n"
+                            << "Energy = " << (*p)->momentum().e() << "\n"
+                            << "Eta = " << heta << "\n"
+                            << "Phi = " << hphi;
+
+      if ((*p)->momentum().e() > eGun)
+        eGun = (*p)->momentum().e();
+
+      if (meGunEnergy_)
+        meGunEnergy_->Fill((*p)->momentum().e());
+      if (meGunEta_)
+        meGunEta_->Fill(heta);
+      if (meGunPhi_)
+        meGunPhi_->Fill(hphi);
     }
   }
 
   // -------------------------------------------------------------------
   // BARREL
 
-  if ( ! skipBarrel) {
-
-    // 1) loop over simHits  
-    e.getByToken(EBHits_Token_,crossingFrame);
+  if (!skipBarrel) {
+    // 1) loop over simHits
+    e.getByToken(EBHits_Token_, crossingFrame);
     const MixCollection<PCaloHit> barrelHits(crossingFrame.product());
-    
+
     MapType ebSimMap;
     MapType ebRecMap;
     const int ebcSize = 90;
-    double ebcontr[ebcSize]; 
+    double ebcontr[ebcSize];
     double ebcontr25[ebcSize];
-    for( int i=0; i<ebcSize; i++ ) { ebcontr[i] = 0.0; ebcontr25[i] = 0.0; } 
+    for (int i = 0; i < ebcSize; i++) {
+      ebcontr[i] = 0.0;
+      ebcontr25[i] = 0.0;
+    }
     double ebtotal = 0.;
 
-    for ( auto const & iHit : barrelHits ) {
+    for (auto const &iHit : barrelHits) {
       EBDetId ebid = EBDetId(iHit.id());
-      
-      LogDebug("SimHitInfo, barrel") 
-	<< "CaloHit "   << iHit.getName() << " DetID = " << iHit.id()   << "\n"	
-	<< "Energy = "  << iHit.energy()  << " Time = "  << iHit.time() << "\n"
-	<< "EBDetId = " << ebid.ieta()       << " "         << ebid.iphi();
-      
+
+      LogDebug("SimHitInfo, barrel") << "CaloHit " << iHit.getName() << " DetID = " << iHit.id() << "\n"
+                                     << "Energy = " << iHit.energy() << " Time = " << iHit.time() << "\n"
+                                     << "EBDetId = " << ebid.ieta() << " " << ebid.iphi();
+
       uint32_t crystid = ebid.rawId();
       ebSimMap[crystid] += iHit.energy();
     }
-    
-    
-    
-    // 2) loop over RecHits 
-    for (EcalUncalibratedRecHitCollection::const_iterator uncalibRecHit = EBUncalibRecHit->begin(); uncalibRecHit != EBUncalibRecHit->end() ; ++uncalibRecHit) {
+
+    // 2) loop over RecHits
+    for (EcalUncalibratedRecHitCollection::const_iterator uncalibRecHit = EBUncalibRecHit->begin();
+         uncalibRecHit != EBUncalibRecHit->end();
+         ++uncalibRecHit) {
       EBDetId EBid = EBDetId(uncalibRecHit->id());
-      
+
       // Find corresponding recHit
       EcalRecHitCollection::const_iterator myRecHit = EBRecHit->find(EBid);
-      if( myRecHit == EBRecHit->end() ) continue; 
+      if (myRecHit == EBRecHit->end())
+        continue;
       ebRecMap[EBid.rawId()] += myRecHit->energy();
-      
-      // Fill log10(Energy) stuff...   
+
+      // Fill log10(Energy) stuff...
       ebtotal += myRecHit->energy();
-      if( myRecHit->energy() > 0 ) {
-	if( meEBRecHitLog10Energy_ ) meEBRecHitLog10Energy_->Fill( log10( myRecHit->energy() ) );
-	int log10i = int( ( log10( myRecHit->energy() ) + 5. ) * 10. );
-	if( log10i >=0 and log10i < ebcSize ) ebcontr[ log10i ] += myRecHit->energy();
+      if (myRecHit->energy() > 0) {
+        if (meEBRecHitLog10Energy_)
+          meEBRecHitLog10Energy_->Fill(log10(myRecHit->energy()));
+        int log10i = int((log10(myRecHit->energy()) + 5.) * 10.);
+        if (log10i >= 0 and log10i < ebcSize)
+          ebcontr[log10i] += myRecHit->energy();
       }
 
       // comparison Rec/Sim hit
-      if ( ebSimMap[EBid.rawId()] != 0. ) {
-	double uncEnergy = uncalibRecHit->amplitude()*barrelADCtoGeV_;
-	if (meEBUnRecHitSimHitRatio_)                                {meEBUnRecHitSimHitRatio_    ->Fill(uncEnergy/ebSimMap[EBid.rawId()]);}
-	if (meEBUnRecHitSimHitRatioGt35_ && (myRecHit->energy()>3.5)){meEBUnRecHitSimHitRatioGt35_->Fill(uncEnergy/ebSimMap[EBid.rawId()]);}
+      if (ebSimMap[EBid.rawId()] != 0.) {
+        double uncEnergy = uncalibRecHit->amplitude() * barrelADCtoGeV_;
+        if (meEBUnRecHitSimHitRatio_) {
+          meEBUnRecHitSimHitRatio_->Fill(uncEnergy / ebSimMap[EBid.rawId()]);
+        }
+        if (meEBUnRecHitSimHitRatioGt35_ && (myRecHit->energy() > 3.5)) {
+          meEBUnRecHitSimHitRatioGt35_->Fill(uncEnergy / ebSimMap[EBid.rawId()]);
+        }
       }
-      
+
       if (myRecHit != EBRecHit->end()) {
-	if ( ebSimMap[EBid.rawId()] != 0. ) {
-	  if (meEBRecHitSimHitRatio_)                                {meEBRecHitSimHitRatio_    ->Fill(myRecHit->energy()/ebSimMap[EBid.rawId()]);}
-	  if (meEBRecHitSimHitRatioGt35_ && (myRecHit->energy()>3.5)){meEBRecHitSimHitRatioGt35_->Fill(myRecHit->energy()/ebSimMap[EBid.rawId()]);}
-	  uint16_t sc = 0;
-	  edm::ESHandle<EcalChannelStatus> pEcs;
-	  c.get<EcalChannelStatusRcd>().get(pEcs); 
-	  const EcalChannelStatus* ecs = nullptr;
-	  if( pEcs.isValid() ) ecs = pEcs.product();
-	  if( ecs != nullptr ) {
-	    EcalChannelStatusMap::const_iterator csmi = ecs->find(EBid.rawId());
-	    EcalChannelStatusCode csc = 0;
-	    if( csmi != ecs->end() ) csc = *csmi;
-	    sc = csc.getStatusCode();
-	  }
-
-	  if( meEBRecHitSimHitRatio1011_ != nullptr && 
-	      ( sc == 10 || sc == 11 ) ) { meEBRecHitSimHitRatio1011_->Fill(myRecHit->energy()/ebSimMap[EBid.rawId()]); }
-	  if( meEBRecHitSimHitRatio12_ != nullptr && sc == 12 ) { meEBRecHitSimHitRatio12_->Fill(myRecHit->energy()/ebSimMap[EBid.rawId()]); }
-
-	  edm::ESHandle<EcalTrigTowerConstituentsMap> pttMap;
-	  c.get<IdealGeometryRecord>().get(pttMap);
-	  const EcalTrigTowerConstituentsMap* ttMap = nullptr;
-	  if( pttMap.isValid() ) ttMap = pttMap.product();
-	  double ttSimEnergy = 0;
-	  if( ttMap != nullptr ) {
-	    EcalTrigTowerDetId ttDetId = EBid.tower();
-	    std::vector<DetId> vid = ttMap->constituentsOf( ttDetId );
-	    for( std::vector<DetId>::const_iterator dit = vid.begin(); dit != vid.end(); dit++ ) {
-	      EBDetId ttEBid = EBDetId(*dit);
-	      ttSimEnergy += ebSimMap[ttEBid.rawId()];
-	    }
-	    if( !vid.empty() ) ttSimEnergy = ttSimEnergy / vid.size();
-	  }
-	  if( meEBRecHitSimHitRatio13_ != nullptr && sc == 13 && ttSimEnergy != 0 ) 
-	    meEBRecHitSimHitRatio13_->Fill(myRecHit->energy()/ttSimEnergy); 
-
-	  int flag = myRecHit->recoFlag();
-	  if( meEBRecHitFlags_ != nullptr ) meEBRecHitFlags_->Fill( flag );
-	  if( meEBRecHitSimHitvsSimHitFlag5_6_  && ( flag == EcalRecHit::kSaturated || flag == EcalRecHit::kLeadingEdgeRecovered ))
-	    meEBRecHitSimHitvsSimHitFlag5_6_->Fill( myRecHit->energy()/ebSimMap[EBid.rawId()], ebSimMap[EBid.rawId()] );
-	  if( meEBRecHitSimHitFlag6_  && ( flag == EcalRecHit::kLeadingEdgeRecovered ))
-	    meEBRecHitSimHitFlag6_->Fill( myRecHit->energy()/ebSimMap[EBid.rawId()] );
-	  if( meEBRecHitSimHitFlag7_  && ( flag == EcalRecHit::kNeighboursRecovered ))
-	    meEBRecHitSimHitFlag6_->Fill( myRecHit->energy()/ebSimMap[EBid.rawId()] );
-	  if( meEB5x5RecHitSimHitvsSimHitFlag8_  && ( flag == EcalRecHit::kTowerRecovered ) && ttSimEnergy != 0 )
-	    meEB5x5RecHitSimHitvsSimHitFlag8_->Fill( myRecHit->energy()/ttSimEnergy, ttSimEnergy );
-
-	  if (meEBRecHitsOccupancyFlag5_6_ && ( (flag==EcalRecHit::kSaturated) || (flag==EcalRecHit::kLeadingEdgeRecovered) ) ) 
-	    meEBRecHitsOccupancyFlag5_6_  -> Fill(EBid.ieta(), EBid.iphi());
-	  if (meEBRecHitsOccupancyFlag8_9_ && ( (flag==EcalRecHit::kTowerRecovered) || (flag==EcalRecHit::kDead) ) ) 
-	    meEBRecHitsOccupancyFlag8_9_  -> Fill(EBid.ieta(), EBid.iphi());
-
-	}
-      }
-      else
-	continue;
+        if (ebSimMap[EBid.rawId()] != 0.) {
+          if (meEBRecHitSimHitRatio_) {
+            meEBRecHitSimHitRatio_->Fill(myRecHit->energy() / ebSimMap[EBid.rawId()]);
+          }
+          if (meEBRecHitSimHitRatioGt35_ && (myRecHit->energy() > 3.5)) {
+            meEBRecHitSimHitRatioGt35_->Fill(myRecHit->energy() / ebSimMap[EBid.rawId()]);
+          }
+          uint16_t sc = 0;
+          edm::ESHandle<EcalChannelStatus> pEcs;
+          c.get<EcalChannelStatusRcd>().get(pEcs);
+          const EcalChannelStatus *ecs = nullptr;
+          if (pEcs.isValid())
+            ecs = pEcs.product();
+          if (ecs != nullptr) {
+            EcalChannelStatusMap::const_iterator csmi = ecs->find(EBid.rawId());
+            EcalChannelStatusCode csc = 0;
+            if (csmi != ecs->end())
+              csc = *csmi;
+            sc = csc.getStatusCode();
+          }
+
+          if (meEBRecHitSimHitRatio1011_ != nullptr && (sc == 10 || sc == 11)) {
+            meEBRecHitSimHitRatio1011_->Fill(myRecHit->energy() / ebSimMap[EBid.rawId()]);
+          }
+          if (meEBRecHitSimHitRatio12_ != nullptr && sc == 12) {
+            meEBRecHitSimHitRatio12_->Fill(myRecHit->energy() / ebSimMap[EBid.rawId()]);
+          }
+
+          edm::ESHandle<EcalTrigTowerConstituentsMap> pttMap;
+          c.get<IdealGeometryRecord>().get(pttMap);
+          const EcalTrigTowerConstituentsMap *ttMap = nullptr;
+          if (pttMap.isValid())
+            ttMap = pttMap.product();
+          double ttSimEnergy = 0;
+          if (ttMap != nullptr) {
+            EcalTrigTowerDetId ttDetId = EBid.tower();
+            std::vector<DetId> vid = ttMap->constituentsOf(ttDetId);
+            for (std::vector<DetId>::const_iterator dit = vid.begin(); dit != vid.end(); dit++) {
+              EBDetId ttEBid = EBDetId(*dit);
+              ttSimEnergy += ebSimMap[ttEBid.rawId()];
+            }
+            if (!vid.empty())
+              ttSimEnergy = ttSimEnergy / vid.size();
+          }
+          if (meEBRecHitSimHitRatio13_ != nullptr && sc == 13 && ttSimEnergy != 0)
+            meEBRecHitSimHitRatio13_->Fill(myRecHit->energy() / ttSimEnergy);
+
+          int flag = myRecHit->recoFlag();
+          if (meEBRecHitFlags_ != nullptr)
+            meEBRecHitFlags_->Fill(flag);
+          if (meEBRecHitSimHitvsSimHitFlag5_6_ &&
+              (flag == EcalRecHit::kSaturated || flag == EcalRecHit::kLeadingEdgeRecovered))
+            meEBRecHitSimHitvsSimHitFlag5_6_->Fill(myRecHit->energy() / ebSimMap[EBid.rawId()], ebSimMap[EBid.rawId()]);
+          if (meEBRecHitSimHitFlag6_ && (flag == EcalRecHit::kLeadingEdgeRecovered))
+            meEBRecHitSimHitFlag6_->Fill(myRecHit->energy() / ebSimMap[EBid.rawId()]);
+          if (meEBRecHitSimHitFlag7_ && (flag == EcalRecHit::kNeighboursRecovered))
+            meEBRecHitSimHitFlag6_->Fill(myRecHit->energy() / ebSimMap[EBid.rawId()]);
+          if (meEB5x5RecHitSimHitvsSimHitFlag8_ && (flag == EcalRecHit::kTowerRecovered) && ttSimEnergy != 0)
+            meEB5x5RecHitSimHitvsSimHitFlag8_->Fill(myRecHit->energy() / ttSimEnergy, ttSimEnergy);
+
+          if (meEBRecHitsOccupancyFlag5_6_ &&
+              ((flag == EcalRecHit::kSaturated) || (flag == EcalRecHit::kLeadingEdgeRecovered)))
+            meEBRecHitsOccupancyFlag5_6_->Fill(EBid.ieta(), EBid.iphi());
+          if (meEBRecHitsOccupancyFlag8_9_ && ((flag == EcalRecHit::kTowerRecovered) || (flag == EcalRecHit::kDead)))
+            meEBRecHitsOccupancyFlag8_9_->Fill(EBid.ieta(), EBid.iphi());
+        }
+      } else
+        continue;
     }  // loop over the UncalibratedRecHitCollection
-    
+
     // RecHits matrix
-    uint32_t  ebcenterid = getUnitWithMaxEnergy(ebRecMap);
+    uint32_t ebcenterid = getUnitWithMaxEnergy(ebRecMap);
     EBDetId myEBid(ebcenterid);
     int bx = myEBid.ietaAbs();
     int by = myEBid.iphi();
     int bz = myEBid.zside();
-    findBarrelMatrix(5,5,bx,by,bz,ebRecMap);
+    findBarrelMatrix(5, 5, bx, by, bz, ebRecMap);
     double e5x5rec = 0.;
     double e5x5sim = 0.;
-    for ( unsigned int i = 0; i < crystalMatrix.size(); i++ ) {
+    for (unsigned int i = 0; i < crystalMatrix.size(); i++) {
       e5x5rec += ebRecMap[crystalMatrix[i]];
       e5x5sim += ebSimMap[crystalMatrix[i]];
-      if( ebRecMap[crystalMatrix[i]] > 0 ) {
-	int log10i25 = int( ( log10( ebRecMap[crystalMatrix[i]] ) + 5. ) * 10. );
-	if( log10i25 >=0 && log10i25 < ebcSize ) ebcontr25[ log10i25 ] += ebRecMap[crystalMatrix[i]];
+      if (ebRecMap[crystalMatrix[i]] > 0) {
+        int log10i25 = int((log10(ebRecMap[crystalMatrix[i]]) + 5.) * 10.);
+        if (log10i25 >= 0 && log10i25 < ebcSize)
+          ebcontr25[log10i25] += ebRecMap[crystalMatrix[i]];
       }
     }
-    
-    if( meEBe5x5_ ) meEBe5x5_->Fill(e5x5rec);
-    if ( e5x5sim > 0. && meEBe5x5OverSimHits_ ) meEBe5x5OverSimHits_->Fill(e5x5rec/e5x5sim);
-    if ( eGun > 0. && meEBe5x5OverGun_ ) meEBe5x5OverGun_->Fill(e5x5rec/eGun);
-    
-    if( meEBRecHitLog10EnergyContr_  && ebtotal != 0 ) {
-      for( int i=0; i<ebcSize; i++ ) {
-	meEBRecHitLog10EnergyContr_->Fill( -5.+(float(i)+0.5)/10., ebcontr[i]/ebtotal );
+
+    if (meEBe5x5_)
+      meEBe5x5_->Fill(e5x5rec);
+    if (e5x5sim > 0. && meEBe5x5OverSimHits_)
+      meEBe5x5OverSimHits_->Fill(e5x5rec / e5x5sim);
+    if (eGun > 0. && meEBe5x5OverGun_)
+      meEBe5x5OverGun_->Fill(e5x5rec / eGun);
+
+    if (meEBRecHitLog10EnergyContr_ && ebtotal != 0) {
+      for (int i = 0; i < ebcSize; i++) {
+        meEBRecHitLog10EnergyContr_->Fill(-5. + (float(i) + 0.5) / 10., ebcontr[i] / ebtotal);
       }
     }
-    
-    if( meEBRecHitLog10Energy5x5Contr_  && e5x5rec != 0 ) {
-      for( int i=0; i<ebcSize; i++ ) {
-	meEBRecHitLog10Energy5x5Contr_->Fill( -5.+(float(i)+0.5)/10., ebcontr25[i]/e5x5rec );
+
+    if (meEBRecHitLog10Energy5x5Contr_ && e5x5rec != 0) {
+      for (int i = 0; i < ebcSize; i++) {
+        meEBRecHitLog10Energy5x5Contr_->Fill(-5. + (float(i) + 0.5) / 10., ebcontr25[i] / e5x5rec);
       }
     }
   }
@@ -489,137 +551,164 @@ void EcalRecHitsValidation::analyze(const Event& e, const EventSetup& c){
   // -------------------------------------------------------------------
   // ENDCAP
 
-  if ( ! skipEndcap ) {
-
+  if (!skipEndcap) {
     // 1) loop over simHits
-    e.getByToken(EEHits_Token_,crossingFrame);
+    e.getByToken(EEHits_Token_, crossingFrame);
     const MixCollection<PCaloHit> endcapHits(crossingFrame.product());
-  
+
     MapType eeSimMap;
     MapType eeRecMap;
     const int eecSize = 90;
     double eecontr[eecSize];
     double eecontr25[eecSize];
-    for( int i=0; i<eecSize; i++ ) { eecontr[i] = 0.0; eecontr25[i] = 0.0; } 
+    for (int i = 0; i < eecSize; i++) {
+      eecontr[i] = 0.0;
+      eecontr25[i] = 0.0;
+    }
     double eetotal = 0.;
- 
-    for ( auto const & iHit : endcapHits ) {
+
+    for (auto const &iHit : endcapHits) {
       EEDetId eeid(iHit.id());
 
-      LogDebug("Endcap, HitInfo")
-	<<" CaloHit "      << iHit.getName() << " DetID = "        << iHit.id()   << "\n"
-	<< "Energy = "     << iHit.energy()  << " Time = "         << iHit.time() << "\n"
-	<< "EEDetId side " << eeid.zside()      << " = " << eeid.ix() << " " << eeid.iy();
-      
+      LogDebug("Endcap, HitInfo") << " CaloHit " << iHit.getName() << " DetID = " << iHit.id() << "\n"
+                                  << "Energy = " << iHit.energy() << " Time = " << iHit.time() << "\n"
+                                  << "EEDetId side " << eeid.zside() << " = " << eeid.ix() << " " << eeid.iy();
+
       uint32_t crystid = eeid.rawId();
       eeSimMap[crystid] += iHit.energy();
     }
 
-
-
     // 2) loop over RecHits
-    for (EcalUncalibratedRecHitCollection::const_iterator uncalibRecHit = EEUncalibRecHit->begin(); uncalibRecHit != EEUncalibRecHit->end(); ++uncalibRecHit) {
+    for (EcalUncalibratedRecHitCollection::const_iterator uncalibRecHit = EEUncalibRecHit->begin();
+         uncalibRecHit != EEUncalibRecHit->end();
+         ++uncalibRecHit) {
       EEDetId EEid = EEDetId(uncalibRecHit->id());
-      
+
       // Find corresponding recHit
       EcalRecHitCollection::const_iterator myRecHit = EERecHit->find(EEid);
-      if( myRecHit == EERecHit->end() ) continue; 
+      if (myRecHit == EERecHit->end())
+        continue;
       eeRecMap[EEid.rawId()] += myRecHit->energy();
 
       // Fill log10(Energy) stuff...
-      eetotal += myRecHit->energy();   
-      if( myRecHit->energy() > 0 ) {
-	if( meEERecHitLog10Energy_ ) meEERecHitLog10Energy_->Fill( log10( myRecHit->energy() ) );
-	int log10i = int( ( log10( myRecHit->energy() ) + 5. ) * 10. );
-	if( log10i >=0 and log10i < eecSize ) eecontr[ log10i ] += myRecHit->energy();
+      eetotal += myRecHit->energy();
+      if (myRecHit->energy() > 0) {
+        if (meEERecHitLog10Energy_)
+          meEERecHitLog10Energy_->Fill(log10(myRecHit->energy()));
+        int log10i = int((log10(myRecHit->energy()) + 5.) * 10.);
+        if (log10i >= 0 and log10i < eecSize)
+          eecontr[log10i] += myRecHit->energy();
       }
 
       // comparison Rec/Sim hit
-      if ( eeSimMap[EEid.rawId()] != 0. ) {
-	double uncEnergy = uncalibRecHit->amplitude()*endcapADCtoGeV_;
-	if (meEEUnRecHitSimHitRatio_)                                {meEEUnRecHitSimHitRatio_    ->Fill(uncEnergy/eeSimMap[EEid.rawId()]);}
-	if (meEEUnRecHitSimHitRatioGt35_ && (myRecHit->energy()>3.5)){meEEUnRecHitSimHitRatioGt35_->Fill(uncEnergy/eeSimMap[EEid.rawId()]);}
+      if (eeSimMap[EEid.rawId()] != 0.) {
+        double uncEnergy = uncalibRecHit->amplitude() * endcapADCtoGeV_;
+        if (meEEUnRecHitSimHitRatio_) {
+          meEEUnRecHitSimHitRatio_->Fill(uncEnergy / eeSimMap[EEid.rawId()]);
+        }
+        if (meEEUnRecHitSimHitRatioGt35_ && (myRecHit->energy() > 3.5)) {
+          meEEUnRecHitSimHitRatioGt35_->Fill(uncEnergy / eeSimMap[EEid.rawId()]);
+        }
       }
 
       if (myRecHit != EERecHit->end()) {
-	if ( eeSimMap[EEid.rawId()] != 0. ) {
-	  if (meEERecHitSimHitRatio_)                                {meEERecHitSimHitRatio_    ->Fill(myRecHit->energy()/eeSimMap[EEid.rawId()]); }
-	  if (meEERecHitSimHitRatioGt35_ && (myRecHit->energy()>3.5)){meEERecHitSimHitRatioGt35_->Fill(myRecHit->energy()/eeSimMap[EEid.rawId()]); }
-
-	  edm::ESHandle<EcalChannelStatus> pEcs;
-	  c.get<EcalChannelStatusRcd>().get(pEcs);
-	  const EcalChannelStatus* ecs = nullptr;
-	  if( pEcs.isValid() ) ecs = pEcs.product();
-	  if( ecs != nullptr ) {
-	    EcalChannelStatusMap::const_iterator csmi = ecs->find(EEid.rawId());
-	    EcalChannelStatusCode csc = 0;
-	    if( csmi != ecs->end() ) csc = *csmi;
-	    uint16_t sc = csc.getStatusCode();
-	    if( meEERecHitSimHitRatio1011_ != nullptr && 
-		( sc == 10 || sc == 11 ) ) { meEERecHitSimHitRatio1011_->Fill(myRecHit->energy()/eeSimMap[EEid.rawId()]); }
-	    if( meEERecHitSimHitRatio12_ != nullptr && sc == 12 ) { meEERecHitSimHitRatio12_->Fill(myRecHit->energy()/eeSimMap[EEid.rawId()]); }
-	    if( meEERecHitSimHitRatio13_ != nullptr && sc == 13 ) { meEERecHitSimHitRatio13_->Fill(myRecHit->energy()/eeSimMap[EEid.rawId()]); }
-	  }
-
-	  int flag = myRecHit->recoFlag();
-	  if( meEERecHitFlags_ != nullptr ) meEERecHitFlags_->Fill( flag );
-	  if( meEERecHitSimHitvsSimHitFlag5_6_  && ( flag == EcalRecHit::kSaturated || flag == EcalRecHit::kLeadingEdgeRecovered ))
-	    meEERecHitSimHitvsSimHitFlag5_6_->Fill( myRecHit->energy()/eeSimMap[EEid.rawId()], eeSimMap[EEid.rawId()] );
-	  if( meEERecHitSimHitFlag6_  && ( flag == EcalRecHit::kLeadingEdgeRecovered ))
-	    meEERecHitSimHitFlag6_->Fill( myRecHit->energy()/eeSimMap[EEid.rawId()] );
-	  if( meEERecHitSimHitFlag7_  && ( flag == EcalRecHit::kNeighboursRecovered ))
-	    meEERecHitSimHitFlag6_->Fill( myRecHit->energy()/eeSimMap[EEid.rawId()] );
-
-	  if (EEid.zside() > 0) { 
-	    if (meEERecHitsOccupancyPlusFlag5_6_ && (( flag == EcalRecHit::kSaturated ) || ( flag == EcalRecHit::kLeadingEdgeRecovered ) ))  
-	      meEERecHitsOccupancyPlusFlag5_6_  ->Fill(EEid.ix(), EEid.iy()); 
-	    if (meEERecHitsOccupancyPlusFlag8_9_ && (( flag == EcalRecHit::kTowerRecovered ) || ( flag == EcalRecHit::kDead ) ))  
-	      meEERecHitsOccupancyPlusFlag8_9_  ->Fill(EEid.ix(), EEid.iy()); 
-	  }
-	  if (EEid.zside() < 0) { 
-	    if (meEERecHitsOccupancyMinusFlag5_6_ && (( flag == EcalRecHit::kSaturated ) || ( flag == EcalRecHit::kLeadingEdgeRecovered ) ))  
-	      meEERecHitsOccupancyMinusFlag5_6_  ->Fill(EEid.ix(), EEid.iy()); 
-	    if (meEERecHitsOccupancyMinusFlag8_9_ && (( flag == EcalRecHit::kTowerRecovered ) || ( flag == EcalRecHit::kDead ) ))  
-	      meEERecHitsOccupancyMinusFlag8_9_  ->Fill(EEid.ix(), EEid.iy()); 
-	  }
-	}
-      }
-      else
-	continue;
+        if (eeSimMap[EEid.rawId()] != 0.) {
+          if (meEERecHitSimHitRatio_) {
+            meEERecHitSimHitRatio_->Fill(myRecHit->energy() / eeSimMap[EEid.rawId()]);
+          }
+          if (meEERecHitSimHitRatioGt35_ && (myRecHit->energy() > 3.5)) {
+            meEERecHitSimHitRatioGt35_->Fill(myRecHit->energy() / eeSimMap[EEid.rawId()]);
+          }
+
+          edm::ESHandle<EcalChannelStatus> pEcs;
+          c.get<EcalChannelStatusRcd>().get(pEcs);
+          const EcalChannelStatus *ecs = nullptr;
+          if (pEcs.isValid())
+            ecs = pEcs.product();
+          if (ecs != nullptr) {
+            EcalChannelStatusMap::const_iterator csmi = ecs->find(EEid.rawId());
+            EcalChannelStatusCode csc = 0;
+            if (csmi != ecs->end())
+              csc = *csmi;
+            uint16_t sc = csc.getStatusCode();
+            if (meEERecHitSimHitRatio1011_ != nullptr && (sc == 10 || sc == 11)) {
+              meEERecHitSimHitRatio1011_->Fill(myRecHit->energy() / eeSimMap[EEid.rawId()]);
+            }
+            if (meEERecHitSimHitRatio12_ != nullptr && sc == 12) {
+              meEERecHitSimHitRatio12_->Fill(myRecHit->energy() / eeSimMap[EEid.rawId()]);
+            }
+            if (meEERecHitSimHitRatio13_ != nullptr && sc == 13) {
+              meEERecHitSimHitRatio13_->Fill(myRecHit->energy() / eeSimMap[EEid.rawId()]);
+            }
+          }
+
+          int flag = myRecHit->recoFlag();
+          if (meEERecHitFlags_ != nullptr)
+            meEERecHitFlags_->Fill(flag);
+          if (meEERecHitSimHitvsSimHitFlag5_6_ &&
+              (flag == EcalRecHit::kSaturated || flag == EcalRecHit::kLeadingEdgeRecovered))
+            meEERecHitSimHitvsSimHitFlag5_6_->Fill(myRecHit->energy() / eeSimMap[EEid.rawId()], eeSimMap[EEid.rawId()]);
+          if (meEERecHitSimHitFlag6_ && (flag == EcalRecHit::kLeadingEdgeRecovered))
+            meEERecHitSimHitFlag6_->Fill(myRecHit->energy() / eeSimMap[EEid.rawId()]);
+          if (meEERecHitSimHitFlag7_ && (flag == EcalRecHit::kNeighboursRecovered))
+            meEERecHitSimHitFlag6_->Fill(myRecHit->energy() / eeSimMap[EEid.rawId()]);
+
+          if (EEid.zside() > 0) {
+            if (meEERecHitsOccupancyPlusFlag5_6_ &&
+                ((flag == EcalRecHit::kSaturated) || (flag == EcalRecHit::kLeadingEdgeRecovered)))
+              meEERecHitsOccupancyPlusFlag5_6_->Fill(EEid.ix(), EEid.iy());
+            if (meEERecHitsOccupancyPlusFlag8_9_ &&
+                ((flag == EcalRecHit::kTowerRecovered) || (flag == EcalRecHit::kDead)))
+              meEERecHitsOccupancyPlusFlag8_9_->Fill(EEid.ix(), EEid.iy());
+          }
+          if (EEid.zside() < 0) {
+            if (meEERecHitsOccupancyMinusFlag5_6_ &&
+                ((flag == EcalRecHit::kSaturated) || (flag == EcalRecHit::kLeadingEdgeRecovered)))
+              meEERecHitsOccupancyMinusFlag5_6_->Fill(EEid.ix(), EEid.iy());
+            if (meEERecHitsOccupancyMinusFlag8_9_ &&
+                ((flag == EcalRecHit::kTowerRecovered) || (flag == EcalRecHit::kDead)))
+              meEERecHitsOccupancyMinusFlag8_9_->Fill(EEid.ix(), EEid.iy());
+          }
+        }
+      } else
+        continue;
     }  // loop over the UncalibratedechitCollection
-  
+
     // RecHits matrix
-    uint32_t  eecenterid = getUnitWithMaxEnergy(eeRecMap);
+    uint32_t eecenterid = getUnitWithMaxEnergy(eeRecMap);
     EEDetId myEEid(eecenterid);
     int bx = myEEid.ix();
     int by = myEEid.iy();
     int bz = myEEid.zside();
-    findEndcapMatrix(5,5,bx,by,bz,eeRecMap);
+    findEndcapMatrix(5, 5, bx, by, bz, eeRecMap);
     double e5x5rec = 0.;
     double e5x5sim = 0.;
-    for ( unsigned int i = 0; i < crystalMatrix.size(); i++ ) {
+    for (unsigned int i = 0; i < crystalMatrix.size(); i++) {
       e5x5rec += eeRecMap[crystalMatrix[i]];
       e5x5sim += eeSimMap[crystalMatrix[i]];
-      if( eeRecMap[crystalMatrix[i]] > 0 ) {
-	int log10i25 = int( ( log10( eeRecMap[crystalMatrix[i]] ) + 5. ) * 10. );
-	if( log10i25 >=0 && log10i25 < eecSize ) eecontr25[ log10i25 ] += eeRecMap[crystalMatrix[i]];
+      if (eeRecMap[crystalMatrix[i]] > 0) {
+        int log10i25 = int((log10(eeRecMap[crystalMatrix[i]]) + 5.) * 10.);
+        if (log10i25 >= 0 && log10i25 < eecSize)
+          eecontr25[log10i25] += eeRecMap[crystalMatrix[i]];
       }
     }
 
-    if( meEEe5x5_ ) meEEe5x5_->Fill(e5x5rec);
-    if ( e5x5sim > 0. && meEEe5x5OverSimHits_ ) meEEe5x5OverSimHits_->Fill(e5x5rec/e5x5sim);
-    if ( eGun > 0. && meEEe5x5OverGun_ ) meEEe5x5OverGun_->Fill(e5x5rec/eGun);
-    
+    if (meEEe5x5_)
+      meEEe5x5_->Fill(e5x5rec);
+    if (e5x5sim > 0. && meEEe5x5OverSimHits_)
+      meEEe5x5OverSimHits_->Fill(e5x5rec / e5x5sim);
+    if (eGun > 0. && meEEe5x5OverGun_)
+      meEEe5x5OverGun_->Fill(e5x5rec / eGun);
 
-    if( meEERecHitLog10EnergyContr_  && eetotal != 0 ) {
-      for( int i=0; i<eecSize; i++ ) {
-	meEERecHitLog10EnergyContr_->Fill( -5.+(float(i)+0.5)/10., eecontr[i]/eetotal );
+    if (meEERecHitLog10EnergyContr_ && eetotal != 0) {
+      for (int i = 0; i < eecSize; i++) {
+        meEERecHitLog10EnergyContr_->Fill(-5. + (float(i) + 0.5) / 10., eecontr[i] / eetotal);
       }
     }
-    
-    if( meEERecHitLog10Energy5x5Contr_  && e5x5rec != 0 ) {
-      for( int i=0; i<eecSize; i++ ) {
-	meEERecHitLog10Energy5x5Contr_->Fill( -5.+(float(i)+0.5)/10., eecontr25[i]/e5x5rec );
+
+    if (meEERecHitLog10Energy5x5Contr_ && e5x5rec != 0) {
+      for (int i = 0; i < eecSize; i++) {
+        meEERecHitLog10Energy5x5Contr_->Fill(-5. + (float(i) + 0.5) / 10., eecontr25[i] / e5x5rec);
       }
     }
   }
@@ -627,129 +716,123 @@ void EcalRecHitsValidation::analyze(const Event& e, const EventSetup& c){
   // -------------------------------------------------------------------
   // PRESHOWER
 
-  if ( ! skipPreshower ) {
-
+  if (!skipPreshower) {
     // 1) loop over simHits
-    e.getByToken(ESHits_Token_,crossingFrame);
+    e.getByToken(ESHits_Token_, crossingFrame);
     const MixCollection<PCaloHit> preshowerHits(crossingFrame.product());
 
     MapType esSimMap;
     const int escSize = 90;
     double escontr[escSize];
-    for( int i=0; i<escSize; i++ ) { escontr[i] = 0.0; }
+    for (int i = 0; i < escSize; i++) {
+      escontr[i] = 0.0;
+    }
     double estotal = 0.;
 
-    for ( auto const & iHit : preshowerHits ) {
+    for (auto const &iHit : preshowerHits) {
       ESDetId esid(iHit.id());
-      LogDebug("Preshower, HitInfo")
-	<<" CaloHit "       << iHit.getName() << " DetID = "         << iHit.id()   << "\n"
-	<< "Energy = "      << iHit.energy()  << " Time = "          << iHit.time() << "\n"
-	<< "ESDetId strip " << esid.strip()      << " = " << esid.six() << " " << esid.siy();
-      
+      LogDebug("Preshower, HitInfo") << " CaloHit " << iHit.getName() << " DetID = " << iHit.id() << "\n"
+                                     << "Energy = " << iHit.energy() << " Time = " << iHit.time() << "\n"
+                                     << "ESDetId strip " << esid.strip() << " = " << esid.six() << " " << esid.siy();
+
       uint32_t crystid = esid.rawId();
       esSimMap[crystid] += iHit.energy();
     }
 
-
     // 2) loop over RecHits
     for (EcalRecHitCollection::const_iterator recHit = ESRecHit->begin(); recHit != ESRecHit->end(); ++recHit) {
       ESDetId ESid = ESDetId(recHit->id());
-      if ( esSimMap[ESid.rawId()] != 0. ) { 
-	
-	// Fill log10(Energy) stuff...
-	estotal += recHit->energy();   
-	if( recHit->energy() > 0 ) {
-	  if( meESRecHitLog10Energy_ ) meESRecHitLog10Energy_->Fill( log10( recHit->energy() ) );
-	  int log10i = int( ( log10( recHit->energy() ) + 5. ) * 10. );
-	  if( log10i >=0 and log10i < escSize ) escontr[ log10i ] += recHit->energy();
-	}
-
-	if (meESRecHitSimHitRatio_) { 
-	  meESRecHitSimHitRatio_ ->Fill(recHit->energy()/esSimMap[ESid.rawId()]); 
-	}
-      }
-      else
-	continue;
+      if (esSimMap[ESid.rawId()] != 0.) {
+        // Fill log10(Energy) stuff...
+        estotal += recHit->energy();
+        if (recHit->energy() > 0) {
+          if (meESRecHitLog10Energy_)
+            meESRecHitLog10Energy_->Fill(log10(recHit->energy()));
+          int log10i = int((log10(recHit->energy()) + 5.) * 10.);
+          if (log10i >= 0 and log10i < escSize)
+            escontr[log10i] += recHit->energy();
+        }
+
+        if (meESRecHitSimHitRatio_) {
+          meESRecHitSimHitRatio_->Fill(recHit->energy() / esSimMap[ESid.rawId()]);
+        }
+      } else
+        continue;
     }  // loop over the RechitCollection
 
-    if( meESRecHitLog10EnergyContr_  && estotal != 0 ) {
-      for( int i=0; i<escSize; i++ ) {
-	meESRecHitLog10EnergyContr_->Fill( -5.+(float(i)+0.5)/10., escontr[i]/estotal );
+    if (meESRecHitLog10EnergyContr_ && estotal != 0) {
+      for (int i = 0; i < escSize; i++) {
+        meESRecHitLog10EnergyContr_->Fill(-5. + (float(i) + 0.5) / 10., escontr[i] / estotal);
       }
     }
-
-    
   }
-  
 }
 
-  
-uint32_t EcalRecHitsValidation::getUnitWithMaxEnergy(MapType& themap) {
-  
-  //look for max
+uint32_t EcalRecHitsValidation::getUnitWithMaxEnergy(MapType &themap) {
+  // look for max
   uint32_t unitWithMaxEnergy = 0;
-  float    maxEnergy = 0.;
-  
+  float maxEnergy = 0.;
+
   MapType::iterator iter;
   for (iter = themap.begin(); iter != themap.end(); iter++) {
-    
     if (maxEnergy < (*iter).second) {
-      maxEnergy = (*iter).second;       
+      maxEnergy = (*iter).second;
       unitWithMaxEnergy = (*iter).first;
-    }                           
+    }
   }
-  
+
   return unitWithMaxEnergy;
 }
 
-void EcalRecHitsValidation::findBarrelMatrix(int nCellInEta, int nCellInPhi,
-                                             int CentralEta, int CentralPhi,int CentralZ,
-                                             MapType& themap) {
-  
-  int goBackInEta = nCellInEta/2;
-  int goBackInPhi = nCellInPhi/2;
-  int matrixSize = nCellInEta*nCellInPhi; 
+void EcalRecHitsValidation::findBarrelMatrix(
+    int nCellInEta, int nCellInPhi, int CentralEta, int CentralPhi, int CentralZ, MapType &themap) {
+  int goBackInEta = nCellInEta / 2;
+  int goBackInPhi = nCellInPhi / 2;
+  int matrixSize = nCellInEta * nCellInPhi;
   crystalMatrix.clear();
   crystalMatrix.resize(matrixSize);
 
-  int startEta  =  CentralZ*CentralEta - goBackInEta;
-  int startPhi  =  CentralPhi - goBackInPhi;
-  
-  int i = 0 ;
-  for ( int ieta = startEta; ieta < startEta+nCellInEta; ieta ++ ) {
-    for( int iphi = startPhi; iphi < startPhi + nCellInPhi; iphi++ ) {
-      uint32_t  index;
-      if (abs(ieta) > 85 || abs(ieta)<1 ) { continue; }
-      if (iphi< 1)      { index = EBDetId(ieta,iphi+360).rawId(); }
-      else if(iphi>360) { index = EBDetId(ieta,iphi-360).rawId(); }
-      else              { index = EBDetId(ieta,iphi).rawId();     }
+  int startEta = CentralZ * CentralEta - goBackInEta;
+  int startPhi = CentralPhi - goBackInPhi;
+
+  int i = 0;
+  for (int ieta = startEta; ieta < startEta + nCellInEta; ieta++) {
+    for (int iphi = startPhi; iphi < startPhi + nCellInPhi; iphi++) {
+      uint32_t index;
+      if (abs(ieta) > 85 || abs(ieta) < 1) {
+        continue;
+      }
+      if (iphi < 1) {
+        index = EBDetId(ieta, iphi + 360).rawId();
+      } else if (iphi > 360) {
+        index = EBDetId(ieta, iphi - 360).rawId();
+      } else {
+        index = EBDetId(ieta, iphi).rawId();
+      }
       crystalMatrix[i++] = index;
     }
   }
-  
 }
- 
-void EcalRecHitsValidation::findEndcapMatrix(int nCellInX, int nCellInY,
-                                             int CentralX, int CentralY,int CentralZ,
-                                             MapType&  themap) {
-  int goBackInX = nCellInX/2;
-  int goBackInY = nCellInY/2;
-  crystalMatrix.clear();
 
-   int startX  =  CentralX - goBackInX;
-   int startY  =  CentralY - goBackInY;
-
-   for ( int ix = startX; ix < startX+nCellInX; ix ++ ) {
+void EcalRecHitsValidation::findEndcapMatrix(
+    int nCellInX, int nCellInY, int CentralX, int CentralY, int CentralZ, MapType &themap) {
+  int goBackInX = nCellInX / 2;
+  int goBackInY = nCellInY / 2;
+  crystalMatrix.clear();
 
-      for( int iy = startY; iy < startY + nCellInY; iy++ ) {
+  int startX = CentralX - goBackInX;
+  int startY = CentralY - goBackInY;
 
-        uint32_t index ;
+  for (int ix = startX; ix < startX + nCellInX; ix++) {
+    for (int iy = startY; iy < startY + nCellInY; iy++) {
+      uint32_t index;
 
-	if(EEDetId::validDetId(ix,iy,CentralZ)) {
-          index = EEDetId(ix,iy,CentralZ).rawId();
-	}
-	else { continue; }
-        crystalMatrix.push_back(index);
+      if (EEDetId::validDetId(ix, iy, CentralZ)) {
+        index = EEDetId(ix, iy, CentralZ).rawId();
+      } else {
+        continue;
       }
-   }
+      crystalMatrix.push_back(index);
+    }
+  }
 }
diff --git a/Validation/EcalRecHits/src/EcalTBValidation.cc b/Validation/EcalRecHits/src/EcalTBValidation.cc
index 5a0e7214679a0..f0ce785b79bd3 100644
--- a/Validation/EcalRecHits/src/EcalTBValidation.cc
+++ b/Validation/EcalRecHits/src/EcalTBValidation.cc
@@ -1,45 +1,43 @@
-// Ecal H4 tesbeam analysis 
-#include "Validation/EcalRecHits/interface/EcalTBValidation.h"
-#include "DataFormats/EcalRecHit/interface/EcalUncalibratedRecHit.h"
-#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
+// Ecal H4 tesbeam analysis
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
+#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
+#include "DataFormats/EcalRecHit/interface/EcalUncalibratedRecHit.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
+#include "TBDataFormats/EcalTBObjects/interface/EcalTBEventHeader.h"
 #include "TBDataFormats/EcalTBObjects/interface/EcalTBHodoscopeRecInfo.h"
 #include "TBDataFormats/EcalTBObjects/interface/EcalTBTDCRecInfo.h"
-#include "TBDataFormats/EcalTBObjects/interface/EcalTBEventHeader.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
-
+#include "Validation/EcalRecHits/interface/EcalTBValidation.h"
 
 #include <iostream>
 #include <string>
 
+EcalTBValidation::EcalTBValidation(const edm::ParameterSet &config) {
+  data_ = config.getUntrackedParameter<int>("data", -1000);
+  xtalInBeam_ = config.getUntrackedParameter<int>("xtalInBeam", -1000);
 
-EcalTBValidation::EcalTBValidation( const edm::ParameterSet& config ) {  
-
-  data_                  = config.getUntrackedParameter<int>("data",-1000);
-  xtalInBeam_            = config.getUntrackedParameter<int>("xtalInBeam",-1000);
-
-  digiCollection_        = config.getParameter<std::string>("digiCollection");
-  digiProducer_          = config.getParameter<std::string>("digiProducer");
-  hitCollection_         = config.getParameter<std::string>("hitCollection");
-  hitProducer_           = config.getParameter<std::string>("hitProducer");
+  digiCollection_ = config.getParameter<std::string>("digiCollection");
+  digiProducer_ = config.getParameter<std::string>("digiProducer");
+  hitCollection_ = config.getParameter<std::string>("hitCollection");
+  hitProducer_ = config.getParameter<std::string>("hitProducer");
   hodoRecInfoCollection_ = config.getParameter<std::string>("hodoRecInfoCollection");
-  hodoRecInfoProducer_   = config.getParameter<std::string>("hodoRecInfoProducer");
-  tdcRecInfoCollection_  = config.getParameter<std::string>("tdcRecInfoCollection");
-  tdcRecInfoProducer_    = config.getParameter<std::string>("tdcRecInfoProducer");
+  hodoRecInfoProducer_ = config.getParameter<std::string>("hodoRecInfoProducer");
+  tdcRecInfoCollection_ = config.getParameter<std::string>("tdcRecInfoCollection");
+  tdcRecInfoProducer_ = config.getParameter<std::string>("tdcRecInfoProducer");
   eventHeaderCollection_ = config.getParameter<std::string>("eventHeaderCollection");
-  eventHeaderProducer_   = config.getParameter<std::string>("eventHeaderProducer");
+  eventHeaderProducer_ = config.getParameter<std::string>("eventHeaderProducer");
 
   digi_Token_ = consumes<EBDigiCollection>(edm::InputTag(digiProducer_, digiCollection_));
   hit_Token_ = consumes<EBUncalibratedRecHitCollection>(edm::InputTag(hitProducer_, hitCollection_));
   hodoRec_Token_ = consumes<EcalTBHodoscopeRecInfo>(edm::InputTag(hodoRecInfoProducer_, hodoRecInfoCollection_));
   tdcRec_Token_ = consumes<EcalTBTDCRecInfo>(edm::InputTag(tdcRecInfoProducer_, tdcRecInfoCollection_));
   eventHeader_Token_ = consumes<EcalTBEventHeader>(edm::InputTag(eventHeaderProducer_));
-  //rootfile_              = config.getUntrackedParameter<std::string>("rootfile","EcalTBValidation.root");
+  // rootfile_              =
+  // config.getUntrackedParameter<std::string>("rootfile","EcalTBValidation.root");
 
   // verbosity...
   verbose_ = config.getUntrackedParameter<bool>("verbose", false);
-    
+
   meETBxib_ = nullptr;
   meETBampltdc_ = nullptr;
   meETBShape_ = nullptr;
@@ -62,220 +60,219 @@ EcalTBValidation::EcalTBValidation( const edm::ParameterSet& config ) {
   meETBe1e25vsY_ = nullptr;
   meETBe9e25vsX_ = nullptr;
   meETBe9e25vsY_ = nullptr;
-
 }
 
+EcalTBValidation::~EcalTBValidation() {}
 
-EcalTBValidation::~EcalTBValidation(){}
-
-void EcalTBValidation::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const&, edm::EventSetup const&){
-
-  std::string hname;   
-  ibooker.setCurrentFolder( "EcalRecHitsV/EcalTBValidationTask" );
+void EcalTBValidation::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &, edm::EventSetup const &) {
+  std::string hname;
+  ibooker.setCurrentFolder("EcalRecHitsV/EcalTBValidationTask");
 
   hname = "xtal in beam position";
-  meETBxib_          = ibooker.book2D( hname, hname, 85, 0., 85., 20,0., 20. );
+  meETBxib_ = ibooker.book2D(hname, hname, 85, 0., 85., 20, 0., 20.);
   hname = "Max Amplitude vs TDC offset";
-  meETBampltdc_      = ibooker.book2D( hname, hname, 100, 0., 1., 1000, 0., 4000. );
+  meETBampltdc_ = ibooker.book2D(hname, hname, 100, 0., 1., 1000, 0., 4000.);
   hname = "Beam Profile X";
-  meETBhodoX_        = ibooker.book1D( hname, hname, 100, -20., 20. );
+  meETBhodoX_ = ibooker.book1D(hname, hname, 100, -20., 20.);
   hname = "Beam Profile Y";
-  meETBhodoY_        = ibooker.book1D( hname, hname, 100, -20., 20. );
+  meETBhodoY_ = ibooker.book1D(hname, hname, 100, -20., 20.);
   hname = "E1x1 energy";
-  meETBe1x1_         = ibooker.book1D( hname, hname, 1000, 0., 4000. );
+  meETBe1x1_ = ibooker.book1D(hname, hname, 1000, 0., 4000.);
   hname = "E3x3 energy";
-  meETBe3x3_         = ibooker.book1D( hname, hname, 1000, 0., 4000. );
+  meETBe3x3_ = ibooker.book1D(hname, hname, 1000, 0., 4000.);
   hname = "E5x5 energy";
-  meETBe5x5_         = ibooker.book1D( hname, hname, 1000, 0., 4000. );
+  meETBe5x5_ = ibooker.book1D(hname, hname, 1000, 0., 4000.);
   hname = "E1x1 energy center";
-  meETBe1x1_center_  = ibooker.book1D( hname, hname, 1000, 0., 4000. );
+  meETBe1x1_center_ = ibooker.book1D(hname, hname, 1000, 0., 4000.);
   hname = "E3x3 energy center";
-  meETBe3x3_center_  = ibooker.book1D( hname, hname, 1000, 0., 4000. );
+  meETBe3x3_center_ = ibooker.book1D(hname, hname, 1000, 0., 4000.);
   hname = "E5x5 energy center";
-  meETBe5x5_center_  = ibooker.book1D( hname, hname, 1000, 0., 4000. );
+  meETBe5x5_center_ = ibooker.book1D(hname, hname, 1000, 0., 4000.);
   hname = "E1 over E9 ratio";
-  meETBe1e9_         = ibooker.book1D( hname, hname, 600, 0., 1.2 );
+  meETBe1e9_ = ibooker.book1D(hname, hname, 600, 0., 1.2);
   hname = "E1 over E25 ratio";
-  meETBe1e25_        = ibooker.book1D( hname, hname, 600, 0., 1.2 );
+  meETBe1e25_ = ibooker.book1D(hname, hname, 600, 0., 1.2);
   hname = "E9 over E25 ratio";
-  meETBe9e25_        = ibooker.book1D( hname, hname, 600, 0., 1.2 );
+  meETBe9e25_ = ibooker.book1D(hname, hname, 600, 0., 1.2);
   hname = "E1 vs X";
-  meETBe1vsX_        = ibooker.book2D( hname, hname, 80, -20, 20, 1000, 0., 4000. );
+  meETBe1vsX_ = ibooker.book2D(hname, hname, 80, -20, 20, 1000, 0., 4000.);
   hname = "E1 vs Y";
-  meETBe1vsY_        = ibooker.book2D( hname, hname, 80, -20, 20, 1000, 0., 4000. );  
+  meETBe1vsY_ = ibooker.book2D(hname, hname, 80, -20, 20, 1000, 0., 4000.);
   hname = "E1 over E9 vs X";
-  meETBe1e9vsX_      = ibooker.book2D( hname, hname, 80, -20, 20, 600, 0., 1.2 );
+  meETBe1e9vsX_ = ibooker.book2D(hname, hname, 80, -20, 20, 600, 0., 1.2);
   hname = "E1 over E9 vs Y";
-  meETBe1e9vsY_      = ibooker.book2D( hname, hname, 80, -20, 20, 600, 0., 1.2 );
+  meETBe1e9vsY_ = ibooker.book2D(hname, hname, 80, -20, 20, 600, 0., 1.2);
   hname = "E1 over E25 vs X";
-  meETBe1e25vsX_     = ibooker.book2D( hname, hname, 80, -20, 20, 600, 0., 1.2 );
+  meETBe1e25vsX_ = ibooker.book2D(hname, hname, 80, -20, 20, 600, 0., 1.2);
   hname = "E1 over E25 vs Y";
-  meETBe1e25vsY_     = ibooker.book2D( hname, hname, 80, -20, 20, 600, 0., 1.2 );
+  meETBe1e25vsY_ = ibooker.book2D(hname, hname, 80, -20, 20, 600, 0., 1.2);
   hname = "E9 over E25 vs X";
-  meETBe9e25vsX_     = ibooker.book2D( hname, hname, 80, -20, 20, 600, 0., 1.2 );
+  meETBe9e25vsX_ = ibooker.book2D(hname, hname, 80, -20, 20, 600, 0., 1.2);
   hname = "E9 over E25 vs Y";
-  meETBe9e25vsY_     = ibooker.book2D( hname, hname, 80, -20, 20, 600, 0., 1.2 );
+  meETBe9e25vsY_ = ibooker.book2D(hname, hname, 80, -20, 20, 600, 0., 1.2);
   hname = "Xtal in Beam Shape";
-  meETBShape_        = ibooker.book2D( hname, hname, 250, 0, 10, 350, 0, 3500 );
-
+  meETBShape_ = ibooker.book2D(hname, hname, 250, 0, 10, 350, 0, 3500);
 }
 
-void EcalTBValidation::analyze( const edm::Event& event, const edm::EventSetup& setup ) {
-
+void EcalTBValidation::analyze(const edm::Event &event, const edm::EventSetup &setup) {
   using namespace edm;
   using namespace cms;
 
   // digis
-  const EBDigiCollection* theDigis=nullptr;
+  const EBDigiCollection *theDigis = nullptr;
   Handle<EBDigiCollection> pdigis;
   event.getByToken(digi_Token_, pdigis);
-  if(pdigis.isValid()){
-    theDigis = pdigis.product(); 
-  } 
-  else {    
+  if (pdigis.isValid()) {
+    theDigis = pdigis.product();
+  } else {
     std::cerr << "Error! can't get the product " << digiCollection_.c_str() << std::endl;
     return;
   }
 
   // rechits
-  const EBUncalibratedRecHitCollection* theHits=nullptr;  
+  const EBUncalibratedRecHitCollection *theHits = nullptr;
   Handle<EBUncalibratedRecHitCollection> phits;
   event.getByToken(hit_Token_, phits);
-  if(phits.isValid()){
-    theHits = phits.product(); 
-  } 
-  else {
+  if (phits.isValid()) {
+    theHits = phits.product();
+  } else {
     std::cerr << "Error! can't get the product " << hitCollection_.c_str() << std::endl;
     return;
   }
 
   // hodoscopes
-  const EcalTBHodoscopeRecInfo* theHodo=nullptr;  
+  const EcalTBHodoscopeRecInfo *theHodo = nullptr;
   Handle<EcalTBHodoscopeRecInfo> pHodo;
   event.getByToken(hodoRec_Token_, pHodo);
-  if(pHodo.isValid()){ 
-    theHodo = pHodo.product(); 
-  }
-  else{ 
+  if (pHodo.isValid()) {
+    theHodo = pHodo.product();
+  } else {
     std::cerr << "Error! can't get the product " << hodoRecInfoCollection_.c_str() << std::endl;
     return;
   }
-  
+
   // tdc
-  const EcalTBTDCRecInfo* theTDC=nullptr;
+  const EcalTBTDCRecInfo *theTDC = nullptr;
   Handle<EcalTBTDCRecInfo> pTDC;
   event.getByToken(tdcRec_Token_, pTDC);
-  if(pTDC.isValid()){
-    theTDC = pTDC.product(); 
-  }
-  else{ 
+  if (pTDC.isValid()) {
+    theTDC = pTDC.product();
+  } else {
     std::cerr << "Error! can't get the product " << tdcRecInfoCollection_.c_str() << std::endl;
     return;
   }
 
   // event header
-  const EcalTBEventHeader* evtHeader=nullptr;
+  const EcalTBEventHeader *evtHeader = nullptr;
   Handle<EcalTBEventHeader> pEventHeader;
-  event.getByToken(eventHeader_Token_ , pEventHeader);
-  if(pEventHeader.isValid()){
-    evtHeader = pEventHeader.product(); 
-  }
-  else{ 
+  event.getByToken(eventHeader_Token_, pEventHeader);
+  if (pEventHeader.isValid()) {
+    evtHeader = pEventHeader.product();
+  } else {
     std::cerr << "Error! can't get the product " << eventHeaderProducer_.c_str() << std::endl;
     return;
   }
-  
- 
+
   // -----------------------------------------------------------------------
   // xtal-in-beam
-  EBDetId xtalInBeamId(1,xtalInBeam_, EBDetId::SMCRYSTALMODE);
-  if (xtalInBeamId==EBDetId(0)){ return; }
+  EBDetId xtalInBeamId(1, xtalInBeam_, EBDetId::SMCRYSTALMODE);
+  if (xtalInBeamId == EBDetId(0)) {
+    return;
+  }
   int xibEta = xtalInBeamId.ieta();
   int xibPhi = xtalInBeamId.iphi();
 
   // skipping events with moving table (in data)
-  if (data_ && (evtHeader->tableIsMoving())) return;
-  
+  if (data_ && (evtHeader->tableIsMoving()))
+    return;
+
   // amplitudes
   EBDetId Xtals5x5[25];
-  for (unsigned int icry=0;icry<25;icry++){
-    unsigned int row    = icry/5;
-    unsigned int column = icry%5;
-    int ieta = xtalInBeamId.ieta()+column-2;
-    int iphi = xtalInBeamId.iphi()+row-2;
-    if(EBDetId::validDetId(ieta, iphi)){ 
-      EBDetId tempId(ieta, iphi,EBDetId::ETAPHIMODE);
-      if (tempId.ism()==1) 
-	Xtals5x5[icry] = tempId;
+  for (unsigned int icry = 0; icry < 25; icry++) {
+    unsigned int row = icry / 5;
+    unsigned int column = icry % 5;
+    int ieta = xtalInBeamId.ieta() + column - 2;
+    int iphi = xtalInBeamId.iphi() + row - 2;
+    if (EBDetId::validDetId(ieta, iphi)) {
+      EBDetId tempId(ieta, iphi, EBDetId::ETAPHIMODE);
+      if (tempId.ism() == 1)
+        Xtals5x5[icry] = tempId;
       else
-	Xtals5x5[icry] = EBDetId(0);
+        Xtals5x5[icry] = EBDetId(0);
     } else {
-      Xtals5x5[icry] = EBDetId(0);   
+      Xtals5x5[icry] = EBDetId(0);
     }
-  } 
- 
+  }
+
   // matrices
   double ampl1x1 = 0.;
   double ampl3x3 = 0.;
   double ampl5x5 = 0.;
-  for (unsigned int icry=0;icry<25;icry++) {
-    if (!Xtals5x5[icry].null()){
+  for (unsigned int icry = 0; icry < 25; icry++) {
+    if (!Xtals5x5[icry].null()) {
       double theAmpl = (theHits->find(Xtals5x5[icry]))->amplitude();
       ampl5x5 += theAmpl;
-      if (icry==12){ampl1x1 = theAmpl;}
-      if (icry==6 || icry==7 || icry==8 || icry==11 || icry==12 || icry==13 || icry==16 || icry==17 || icry==18){ampl3x3 += theAmpl;}
-    }}
-
+      if (icry == 12) {
+        ampl1x1 = theAmpl;
+      }
+      if (icry == 6 || icry == 7 || icry == 8 || icry == 11 || icry == 12 || icry == 13 || icry == 16 || icry == 17 ||
+          icry == 18) {
+        ampl3x3 += theAmpl;
+      }
+    }
+  }
 
   // pulse shape
   double sampleSave[10];
-  for(int ii=0; ii < 10; ++ii){ sampleSave[ii] = 0.0; }
+  for (int ii = 0; ii < 10; ++ii) {
+    sampleSave[ii] = 0.0;
+  }
   EBDigiCollection::const_iterator thisDigi = theDigis->find(xtalInBeamId);
   // int sMax = -1; // UNUSED
   double eMax = 0.;
-  if (thisDigi != theDigis->end()){
+  if (thisDigi != theDigis->end()) {
     EBDataFrame myDigi = (*thisDigi);
-    for (int sample=0; sample < myDigi.size(); ++sample){
+    for (int sample = 0; sample < myDigi.size(); ++sample) {
       double analogSample = myDigi.sample(sample).adc();
-      sampleSave[sample]  = analogSample;
-      if ( eMax < analogSample ) {
-	eMax = analogSample;
-	// sMax = sample; // UNUSED
+      sampleSave[sample] = analogSample;
+      if (eMax < analogSample) {
+        eMax = analogSample;
+        // sMax = sample; // UNUSED
       }
     }
   }
-  
+
   // beam profile
   double xBeam = theHodo->posX();
   double yBeam = theHodo->posY();
 
   // filling histos
-  meETBxib_      -> Fill(xibEta, xibPhi);
-  meETBhodoX_    -> Fill(xBeam);
-  meETBhodoY_    -> Fill(yBeam);
-  meETBampltdc_  -> Fill(theTDC->offset(),ampl1x1);
-  meETBe1x1_     -> Fill(ampl1x1);
-  meETBe3x3_     -> Fill(ampl3x3);
-  meETBe5x5_     -> Fill(ampl5x5);
-  meETBe1e9_     -> Fill(ampl1x1/ampl3x3);
-  meETBe1e25_    -> Fill(ampl1x1/ampl5x5);
-  meETBe9e25_    -> Fill(ampl3x3/ampl5x5);
-  meETBe1vsX_    -> Fill(xBeam,ampl1x1);
-  meETBe1vsY_    -> Fill(yBeam,ampl1x1);
-  meETBe1e9vsX_  -> Fill(xBeam,ampl1x1/ampl3x3);
-  meETBe1e9vsY_  -> Fill(yBeam,ampl1x1/ampl3x3);
-  meETBe1e25vsX_ -> Fill(xBeam,ampl1x1/ampl5x5);
-  meETBe1e25vsY_ -> Fill(yBeam,ampl1x1/ampl5x5);
-  meETBe9e25vsX_ -> Fill(xBeam,ampl3x3/ampl5x5);
-  meETBe9e25vsY_ -> Fill(yBeam,ampl3x3/ampl5x5);
+  meETBxib_->Fill(xibEta, xibPhi);
+  meETBhodoX_->Fill(xBeam);
+  meETBhodoY_->Fill(yBeam);
+  meETBampltdc_->Fill(theTDC->offset(), ampl1x1);
+  meETBe1x1_->Fill(ampl1x1);
+  meETBe3x3_->Fill(ampl3x3);
+  meETBe5x5_->Fill(ampl5x5);
+  meETBe1e9_->Fill(ampl1x1 / ampl3x3);
+  meETBe1e25_->Fill(ampl1x1 / ampl5x5);
+  meETBe9e25_->Fill(ampl3x3 / ampl5x5);
+  meETBe1vsX_->Fill(xBeam, ampl1x1);
+  meETBe1vsY_->Fill(yBeam, ampl1x1);
+  meETBe1e9vsX_->Fill(xBeam, ampl1x1 / ampl3x3);
+  meETBe1e9vsY_->Fill(yBeam, ampl1x1 / ampl3x3);
+  meETBe1e25vsX_->Fill(xBeam, ampl1x1 / ampl5x5);
+  meETBe1e25vsY_->Fill(yBeam, ampl1x1 / ampl5x5);
+  meETBe9e25vsX_->Fill(xBeam, ampl3x3 / ampl5x5);
+  meETBe9e25vsY_->Fill(yBeam, ampl3x3 / ampl5x5);
 
-  for(int ii=0; ii < 10; ++ii){ meETBShape_->Fill(double(ii)+theTDC->offset(),sampleSave[ii]); }
+  for (int ii = 0; ii < 10; ++ii) {
+    meETBShape_->Fill(double(ii) + theTDC->offset(), sampleSave[ii]);
+  }
 
-  if ( (fabs(xBeam)<2.5) && (fabs(yBeam)<2.5) ){ 
-    meETBe1x1_center_  -> Fill(ampl1x1);
-    meETBe3x3_center_  -> Fill(ampl3x3);
-    meETBe5x5_center_  -> Fill(ampl5x5);
+  if ((fabs(xBeam) < 2.5) && (fabs(yBeam) < 2.5)) {
+    meETBe1x1_center_->Fill(ampl1x1);
+    meETBe3x3_center_->Fill(ampl3x3);
+    meETBe5x5_center_->Fill(ampl5x5);
   }
 }
-
-
diff --git a/Validation/EcalRecHits/src/SealModule.cc b/Validation/EcalRecHits/src/SealModule.cc
index 19bf96e0a32a3..ad1a1ed526290 100644
--- a/Validation/EcalRecHits/src/SealModule.cc
+++ b/Validation/EcalRecHits/src/SealModule.cc
@@ -2,12 +2,10 @@
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-
-
-#include <Validation/EcalRecHits/interface/EcalRecHitsValidation.h>
 #include <Validation/EcalRecHits/interface/EcalBarrelRecHitsValidation.h>
 #include <Validation/EcalRecHits/interface/EcalEndcapRecHitsValidation.h>
 #include <Validation/EcalRecHits/interface/EcalPreshowerRecHitsValidation.h>
+#include <Validation/EcalRecHits/interface/EcalRecHitsValidation.h>
 #include <Validation/EcalRecHits/interface/EcalTBValidation.h>
 DEFINE_FWK_MODULE(EcalRecHitsValidation);
 DEFINE_FWK_MODULE(EcalBarrelRecHitsValidation);
diff --git a/Validation/EcalTriggerPrimitives/src/TPGCheck.cc b/Validation/EcalTriggerPrimitives/src/TPGCheck.cc
index 0c3a4b4a3447d..35f1de927dc2f 100644
--- a/Validation/EcalTriggerPrimitives/src/TPGCheck.cc
+++ b/Validation/EcalTriggerPrimitives/src/TPGCheck.cc
@@ -2,7 +2,7 @@
 //
 // Package:    TPGCheck
 // Class:      TPGCheck
-// 
+//
 /**\class TPGCheck TPGCheck.cc Validation/TPGSimulation/src/TPGCheck.cc
 
  Description: <one line class summary>
@@ -15,25 +15,24 @@
 //         Created:  Thu Oct 26 10:47:17 CEST 2006
 //
 
-
 // system include files
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include <vector>
 #include <string>
+#include <vector>
 
-#include "TH1I.h"
 #include "TFile.h"
+#include "TH1I.h"
 
 using namespace edm;
 using namespace std;
@@ -43,121 +42,113 @@ using namespace std;
 //
 
 class TPGCheck : public edm::EDAnalyzer {
-   public:
-      explicit TPGCheck(const edm::ParameterSet&);
-      ~TPGCheck() override;
-
-
-   private:
-      void beginJob() override ;
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      void endJob() override ;
-
-      // ----------member data ---------------------------
-      TH1I *ecal_et_[2];
-      TH1I *ecal_tt_[2];
-      TH1I * ecal_fgvb_[2];
-      
-      TFile *histFile_;
-      std::string label_;
-      std::string producer_;
-      std::vector<std::string> ecal_parts_;
+public:
+  explicit TPGCheck(const edm::ParameterSet &);
+  ~TPGCheck() override;
+
+private:
+  void beginJob() override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
+
+  // ----------member data ---------------------------
+  TH1I *ecal_et_[2];
+  TH1I *ecal_tt_[2];
+  TH1I *ecal_fgvb_[2];
+
+  TFile *histFile_;
+  std::string label_;
+  std::string producer_;
+  std::vector<std::string> ecal_parts_;
   // fix for consumes
-      edm::EDGetTokenT<EcalTrigPrimDigiCollection> ecal_tp_token_;
+  edm::EDGetTokenT<EcalTrigPrimDigiCollection> ecal_tp_token_;
 };
 
 //
 // constructors and destructor
 //
-TPGCheck::TPGCheck(const edm::ParameterSet& iConfig)
-{
-   //now do what ever initialization is needed
-   
+TPGCheck::TPGCheck(const edm::ParameterSet &iConfig) {
+  // now do what ever initialization is needed
+
   ecal_parts_.push_back("Barrel");
   ecal_parts_.push_back("Endcap");
 
-  histFile_=new TFile("histos.root","RECREATE");
-  for (unsigned int i=0;i<2;++i) {
+  histFile_ = new TFile("histos.root", "RECREATE");
+  for (unsigned int i = 0; i < 2; ++i) {
     // Energy
     char t[30];
-    sprintf(t,"%s_energy",ecal_parts_[i].c_str());  
-    ecal_et_[i]=new TH1I(t,"Et",255,0,255);
-    
+    sprintf(t, "%s_energy", ecal_parts_[i].c_str());
+    ecal_et_[i] = new TH1I(t, "Et", 255, 0, 255);
+
     // Trigger Tower flag
     char titleTTF[30];
-    sprintf(titleTTF,"%s_ttf",ecal_parts_[i].c_str());
-    ecal_tt_[i]=new TH1I(titleTTF,"TTF",10,0,10);
-    
+    sprintf(titleTTF, "%s_ttf", ecal_parts_[i].c_str());
+    ecal_tt_[i] = new TH1I(titleTTF, "TTF", 10, 0, 10);
+
     // Fain Grain
     char titleFG[30];
-    sprintf(titleFG,"%s_fgvb",ecal_parts_[i].c_str());
-    ecal_fgvb_[i]=new TH1I(titleFG,"FGVB",10,0,10);
+    sprintf(titleFG, "%s_fgvb", ecal_parts_[i].c_str());
+    ecal_fgvb_[i] = new TH1I(titleFG, "FGVB", 10, 0, 10);
   }
-  
-  label_= iConfig.getParameter<std::string>("Label");
-  producer_= iConfig.getParameter<std::string>("Producer");
-  ecal_tp_token_ = consumes<EcalTrigPrimDigiCollection> (edm::InputTag(label_,producer_));
+
+  label_ = iConfig.getParameter<std::string>("Label");
+  producer_ = iConfig.getParameter<std::string>("Producer");
+  ecal_tp_token_ =
+      consumes<EcalTrigPrimDigiCollection>(edm::InputTag(label_, producer_));
 }
 
+TPGCheck::~TPGCheck() {
 
-TPGCheck::~TPGCheck()
-{
- 
-   // do anything here that needs to be done at desctruction time
-   // (e.g. close files, deallocate resources etc.)
-   
-   histFile_->Write();
-   histFile_->Close();
+  // do anything here that needs to be done at desctruction time
+  // (e.g. close files, deallocate resources etc.)
 
+  histFile_->Write();
+  histFile_->Close();
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-TPGCheck::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-  
+void TPGCheck::analyze(const edm::Event &iEvent,
+                       const edm::EventSetup &iSetup) {
+
   // Get input
   edm::Handle<EcalTrigPrimDigiCollection> tp;
-  iEvent.getByToken(ecal_tp_token_,tp);
-  for (unsigned int i=0;i<tp.product()->size();i++) {  
-    EcalTriggerPrimitiveDigi d=(*(tp.product()))[i]; 
-    int subdet=d.id().subDet()-1;
-    // for endcap, regroup double TP-s that are generated for the 2 interior rings
-    if (subdet==0) {
+  iEvent.getByToken(ecal_tp_token_, tp);
+  for (unsigned int i = 0; i < tp.product()->size(); i++) {
+    EcalTriggerPrimitiveDigi d = (*(tp.product()))[i];
+    int subdet = d.id().subDet() - 1;
+    // for endcap, regroup double TP-s that are generated for the 2 interior
+    // rings
+    if (subdet == 0) {
       ecal_et_[subdet]->Fill(d.compressedEt());
-    }
-    else {
-      if (d.id().ietaAbs()==27 || d.id().ietaAbs()==28) {
-	if (i%2) ecal_et_[subdet]->Fill(d.compressedEt()*2.);
-      }
-      else ecal_et_[subdet]->Fill(d.compressedEt());
+    } else {
+      if (d.id().ietaAbs() == 27 || d.id().ietaAbs() == 28) {
+        if (i % 2)
+          ecal_et_[subdet]->Fill(d.compressedEt() * 2.);
+      } else
+        ecal_et_[subdet]->Fill(d.compressedEt());
     }
     ecal_tt_[subdet]->Fill(d.ttFlag());
     ecal_fgvb_[subdet]->Fill(d.fineGrain());
   }
 }
 
+// ------------ method called once each job just before starting event loop
+// ------------
+void TPGCheck::beginJob() {}
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-TPGCheck::beginJob()
-{
-}
-
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-TPGCheck::endJob() {
-   for (unsigned int i=0;i<2;++i) {
+// ------------ method called once each job just after ending the event loop
+// ------------
+void TPGCheck::endJob() {
+  for (unsigned int i = 0; i < 2; ++i) {
     ecal_et_[i]->Write();
     ecal_tt_[i]->Write();
     ecal_fgvb_[i]->Write();
   }
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(TPGCheck);
diff --git a/Validation/EventGenerator/BuildFile.xml b/Validation/EventGenerator/BuildFile.xml
index 1948af4c0d0e9..105cb20b1c086 100644
--- a/Validation/EventGenerator/BuildFile.xml
+++ b/Validation/EventGenerator/BuildFile.xml
@@ -1,5 +1,6 @@
 <use name="hepmc"/>
 <use name="SimDataFormats/GeneratorProducts"/>
+<use name="SimGeneral/HepPDTRecord"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DQMServices/Core"/>
diff --git a/Validation/Geometry/data/trackerMaterials.l0 b/Validation/Geometry/data/trackerMaterials.l0
index bcd5ed58c002a..329618557e649 100644
--- a/Validation/Geometry/data/trackerMaterials.l0
+++ b/Validation/Geometry/data/trackerMaterials.l0
@@ -11,6 +11,8 @@ T_Aluminium                      1.000 0.000 0.000 0.000 0.000
 T_Beryllium                      1.000 0.000 0.000 0.000 0.000
 		                 
 T_Carbon                         1.000 0.000 0.000 0.000 0.000
+
+T_Kapton                         1.000 0.000 0.000 0.000 0.000
 		                 
 T_Nomex                          1.000 0.000 0.000 0.000 0.000
     		                 
@@ -74,6 +76,8 @@ T_G10                            1.000 0.000 0.000 0.000 0.000
 
 T_CarbonFibreStr                 1.000 0.000 0.000 0.000 0.000
 
+T_CarbonFibreStrBox              1.000 0.000 0.000 0.000 0.000
+
 MS_CU60                          0.000 0.000 1.000 0.000 0.000
 
 MS_AL36                          0.000 0.000 1.000 0.000 0.000
@@ -85,7 +89,6 @@ MS_AL_60                         0.000 0.000 1.000 0.000 0.000
 Polyurethane                     1.000 0.000 0.000 0.000 0.000
 
 
-
 #pixel_bar.in 0 0 0 0 0
 
 Pix_Bar_Baseplate_Full           1.000 0.000 0.000 0.000 0.000
@@ -118,19 +121,19 @@ Layer3_EndringPrints             0.006 0.000 0.000 0.000 0.994
 
 silicone_pipes_plus_coolant      0.000 0.000 0.000 1.000 0.000
 
-SectorA                          0.354 0.000 0.084 0.187 0.375
+SectorA                          0.331 0.000 0.023 0.105 0.542
 
-SectorB                          0.399 0.000 0.219 0.218 0.164
+SectorB                          0.300 0.000 0.359 0.246 0.095
 
-SectorC                          0.312 0.000 0.094 0.171 0.423
+SectorC                          0.214 0.000 0.120 0.177 0.489
 
-PixelBarrelSupTubCables          0.000 0.000 0.784 0.216 0.000
+SectorBC                         0.322 0.000 0.048 0.056 0.574
 
-PixelBarrelSupTubCables2         0.000 0.000 0.784 0.216 0.000
+PixelBarrelSupTubCables          0.000 0.000 0.762 0.238 0.000
 
-BPix_Silicone                    1.000 0.000 0.000 0.000 0.000
+PixelBarrelSupTubCables2         0.000 0.000 0.762 0.238 0.000
 
-CoolPipesDaisyChain              0.000 0.000 0.000 1.000 0.000
+BPix_Silicone                    1.000 0.000 0.000 0.000 0.000
 
 Pix_Bar_Baseplate_Full_Upgrade   1.000 0.000 0.000 0.000 0.000
 
@@ -140,6 +143,10 @@ Pix_Bar_CableSignal_Upgrade      0.000 0.000 1.000 0.000 0.000
 
 Pix_Bar_CablePower_Upgrade       0.000 0.000 1.000 0.000 0.000
 
+Pix_Bar_Cable_Layer1_Upgrade     0.000 0.000 1.000 0.000 0.000
+
+Pix_Bar_Cable_Layer234_Upgrade   0.000 0.000 1.000 0.000 0.000
+
 cable_endring_to_tube_Upgrade    0.309 0.000 0.585 0.000 0.105
 
 Layer1_2_EndringPrints_Upgrade   0.008 0.000 0.000 0.000 0.992
@@ -154,7 +161,7 @@ Flange2_Airex                    1.000 0.000 0.000 0.000 0.000
 
 Flange3_Airex                    1.000 0.000 0.000 0.000 0.000
 
-Flange4_InnerCFK                    1.000 0.000 0.000 0.000 0.000
+Flange4_InnerCFK                 1.000 0.000 0.000 0.000 0.000
 
 Flange1_CFK                      1.000 0.000 0.000 0.000 0.000
 
@@ -172,6 +179,40 @@ Silicon_Nitride                  1.000 0.000 0.000 0.000 0.000
 
 FlangeOuter_Layer3_Upgrade       1.000 0.000 0.000 0.000 0.000
 
+micro_twisted_boundle            0.000 0.000 0.000 0.000 1.000
+
+CFK                              1.000 0.000 0.000 0.000 0.000
+
+CFK_Layer1                       1.000 0.000 0.000 0.000 0.000
+
+CFK_Layer2                       1.000 0.000 0.000 0.000 0.000
+
+CFK_Layer3                       1.000 0.000 0.000 0.000 0.000
+
+CFK_Layer4                       1.000 0.000 0.000 0.000 0.000
+
+CFK_Layer4                       1.000 0.000 0.000 0.000 0.000
+
+CoolPipesDaisyChain              0.000 0.000 0.000 1.000 0.000
+
+Bpix_Pipe_Steel_Half             0.000 0.000 0.000 1.000 0.000
+
+Bpix_CO2_-20C_Half               0.000 0.000 0.000 1.000 0.000
+
+Bpix_Pipe_Steel                  0.000 0.000 0.000 1.000 0.000
+
+Bpix_CO2_-20C                    0.000 0.000 0.000 1.000 0.000
+
+C6F14_F2_-10C                    0.000 0.000 0.000 1.000 0.000
+
+SupplyTubeEpoxy                  1.000 0.000 0.000 0.000 0.000
+
+SupplyTubeConn3                  1.000 0.000 0.000 0.000 0.000
+
+SupplyTubeConn3_Upgrade          1.000 0.000 0.000 0.000 0.000
+
+Polyoxymethylene                 1.000 0.000 0.000 0.000 0.000
+
 
 #pixel_fwd.in 0 0 0 0 0
 
@@ -223,6 +264,41 @@ FPix_CFSkin                      1.000 0.000 0.000 0.000 0.000
 
 Pix_Fwd_ROChip                   0.000 0.000 0.000 0.000 1.000
 
+Pix_Fwd_InnerBlade_AdhFilm       1.000 0.000 0.000 0.000 0.000
+
+Pix_Fwd_AluFlexCable2            0.000 0.000 1.000 0.000 0.000
+
+Pix_Fwd_AluFlexCable3            0.000 0.000 1.000 0.000 0.000
+
+FPix_CFSkin_InnerInnerRing       1.000 0.000 0.000 0.000 0.000
+
+FPix_CFSkin_InnerOuterRing       1.000 0.000 0.000 0.000 0.000
+
+FPix_CFSkin_OuterInnerRing       1.000 0.000 0.000 0.000 0.000
+
+FPix_CFSkin_OuterOuterRing       1.000 0.000 0.000 0.000 0.000
+
+C_C_InnerInnerRing               1.000 0.000 0.000 0.000 0.000
+
+C_C_InnerOuterRing               1.000 0.000 0.000 0.000 0.000
+
+C_C_OuterInnerRing               1.000 0.000 0.000 0.000 0.000
+
+C_C_OuterOuterRing               1.000 0.000 0.000 0.000 0.000
+
+Pix_Fwd_OuterBlade_AdhFilm       1.000 0.000 0.000 0.000 0.000
+
+CF_SupportArm                    1.000 0.000 0.000 0.000 0.000
+
+Pix_Fwd_Conn                     0.000 0.000 1.000 0.000 0.000
+
+Pix_Fwd_AluFlexCable             0.000 0.000 1.000 0.000 0.000
+
+DiskCoolingTube_inner            0.000 0.000 0.000 1.000 0.000
+
+DiskCoolingTube_outer            0.000 0.000 0.000 1.000 0.000
+
+Peek                             1.000 0.000 0.000 0.000 0.000
 
 
 #tib_module.in 0 0 0 0 0
@@ -276,7 +352,6 @@ TIB_RailTop                      1.000 0.000 0.000 0.000 0.000
 TIB_RailBottom                   1.000 0.000 0.000 0.000 0.000
     
 
-
 #tid_module.in 0 0 0 0 0
 
 TID_CoolInsert                   1.000 0.000 0.000 0.000 0.000
@@ -806,5 +881,3 @@ Tk_SO_FC_E              1.000 0.000 0.000 0.000 0.000
 
 Tk_SO_FC_F              1.000 0.000 0.000 0.000 0.000
 
-
-
diff --git a/Validation/Geometry/data/trackerMaterials.x0 b/Validation/Geometry/data/trackerMaterials.x0
index a9b66b92db13c..7afa90e2133ad 100644
--- a/Validation/Geometry/data/trackerMaterials.x0
+++ b/Validation/Geometry/data/trackerMaterials.x0
@@ -5,12 +5,14 @@
 #CommonMaterials 0 0 0 0 0
 
 Silicon                          0.000 1.000 0.000 0.000 0.000
-			         
+
 T_Aluminium                      1.000 0.000 0.000 0.000 0.000
 			       
 T_Beryllium                      1.000 0.000 0.000 0.000 0.000
 			       
 T_Carbon                         1.000 0.000 0.000 0.000 0.000
+
+T_Kapton                         1.000 0.000 0.000 0.000 0.000
 			       
 T_Nomex                          1.000 0.000 0.000 0.000 0.000
 			       
@@ -74,6 +76,8 @@ T_G10                            1.000 0.000 0.000 0.000 0.000
 
 T_CarbonFibreStr                 1.000 0.000 0.000 0.000 0.000
 
+T_CarbonFibreStrBox              1.000 0.000 0.000 0.000 0.000
+
 MS_CU60                          0.000 0.000 1.000 0.000 0.000
 
 MS_AL36                          0.000 0.000 1.000 0.000 0.000
@@ -117,20 +121,20 @@ Layer3_EndringPrints             0.010 0.000 0.000 0.000 0.990
 
 silicone_pipes_plus_coolant      0.000 0.000 0.000 1.000 0.000
 
-SectorA                          0.276 0.000 0.111 0.294 0.319
+SectorA                          0.331 0.000 0.023 0.105 0.542
 
 SectorB                          0.300 0.000 0.359 0.246 0.095
 
 SectorC                          0.214 0.000 0.120 0.177 0.489
 
+SectorBC                         0.322 0.000 0.048 0.056 0.574
+
 PixelBarrelSupTubCables          0.000 0.000 0.762 0.238 0.000
 
 PixelBarrelSupTubCables2         0.000 0.000 0.762 0.238 0.000
 
 BPix_Silicone                    1.000 0.000 0.000 0.000 0.000
 
-CoolPipesDaisyChain              0.000 0.000 0.000 1.000 0.000
-
 Pix_Bar_Baseplate_Full_Upgrade   1.000 0.000 0.000 0.000 0.000
 
 Pix_Bar_Cable_Upgrade            0.000 0.000 1.000 0.000 0.000
@@ -139,6 +143,10 @@ Pix_Bar_CableSignal_Upgrade      0.000 0.000 1.000 0.000 0.000
 
 Pix_Bar_CablePower_Upgrade       0.000 0.000 1.000 0.000 0.000
 
+Pix_Bar_Cable_Layer1_Upgrade     0.000 0.000 1.000 0.000 0.000
+
+Pix_Bar_Cable_Layer234_Upgrade   0.000 0.000 1.000 0.000 0.000
+
 cable_endring_to_tube_Upgrade    0.309 0.000 0.585 0.000 0.105
 
 Layer1_2_EndringPrints_Upgrade   0.008 0.000 0.000 0.000 0.992
@@ -153,9 +161,11 @@ Flange2_Airex                    1.000 0.000 0.000 0.000 0.000
 
 Flange3_Airex                    1.000 0.000 0.000 0.000 0.000
 
-Flange4_InnerCFK                    1.000 0.000 0.000 0.000 0.000
+Flange4_InnerCFK                 1.000 0.000 0.000 0.000 0.000
+
+nge1_CFK                         1.000 0.000 0.000 0.000 0.000
 
-nge1_CFK                      1.000 0.000 0.000 0.000 0.000
+Flange1_CFK                      1.000 0.000 0.000 0.000 0.000
 
 Flange2_CFK                      1.000 0.000 0.000 0.000 0.000
 
@@ -171,6 +181,39 @@ Silicon_Nitride                  1.000 0.000 0.000 0.000 0.000
 
 FlangeOuter_Layer3_Upgrade       1.000 0.000 0.000 0.000 0.000
 
+micro_twisted_boundle            0.000 0.000 0.000 0.000 1.000
+
+CFK                              1.000 0.000 0.000 0.000 0.000
+
+CFK_Layer1                       1.000 0.000 0.000 0.000 0.000
+
+CFK_Layer2                       1.000 0.000 0.000 0.000 0.000
+
+CFK_Layer3                       1.000 0.000 0.000 0.000 0.000
+
+CFK_Layer4                       1.000 0.000 0.000 0.000 0.000
+
+CoolPipesDaisyChain              0.000 0.000 0.000 1.000 0.000
+
+Bpix_Pipe_Steel_Half             0.000 0.000 0.000 1.000 0.000
+
+Bpix_CO2_-20C_Half               0.000 0.000 0.000 1.000 0.000
+
+Bpix_Pipe_Steel                  0.000 0.000 0.000 1.000 0.000
+
+Bpix_CO2_-20C                    0.000 0.000 0.000 1.000 0.000
+
+C6F14_F2_-10C                    0.000 0.000 0.000 1.000 0.000
+
+SupplyTubeEpoxy                  1.000 0.000 0.000 0.000 0.000
+
+SupplyTubeConn3                  1.000 0.000 0.000 0.000 0.000
+
+SupplyTubeConn3_Upgrade          1.000 0.000 0.000 0.000 0.000
+
+Polyoxymethylene                 1.000 0.000 0.000 0.000 0.000
+
+
 #pixel_fwd.in 0 0 0 0 0
 
 Pix_Fwd_Bump                     0.000 0.000 0.000 0.000 1.000
@@ -221,6 +264,41 @@ FPix_CFSkin                      1.000 0.000 0.000 0.000 0.000
 
 Pix_Fwd_ROChip                   0.000 0.000 0.000 0.000 1.000
 
+Pix_Fwd_InnerBlade_AdhFilm       1.000 0.000 0.000 0.000 0.000
+
+Pix_Fwd_AluFlexCable2            0.000 0.000 1.000 0.000 0.000
+
+Pix_Fwd_AluFlexCable3            0.000 0.000 1.000 0.000 0.000
+
+FPix_CFSkin_InnerInnerRing       1.000 0.000 0.000 0.000 0.000
+
+FPix_CFSkin_InnerOuterRing       1.000 0.000 0.000 0.000 0.000
+
+FPix_CFSkin_OuterInnerRing       1.000 0.000 0.000 0.000 0.000
+
+FPix_CFSkin_OuterOuterRing       1.000 0.000 0.000 0.000 0.000
+
+C_C_InnerInnerRing               1.000 0.000 0.000 0.000 0.000
+
+C_C_InnerOuterRing               1.000 0.000 0.000 0.000 0.000
+
+C_C_OuterInnerRing               1.000 0.000 0.000 0.000 0.000
+
+C_C_OuterOuterRing               1.000 0.000 0.000 0.000 0.000
+
+Pix_Fwd_OuterBlade_AdhFilm       1.000 0.000 0.000 0.000 0.000
+
+CF_SupportArm                    1.000 0.000 0.000 0.000 0.000
+
+Pix_Fwd_Conn                     0.000 0.000 1.000 0.000 0.000
+
+Pix_Fwd_AluFlexCable             0.000 0.000 1.000 0.000 0.000
+
+DiskCoolingTube_inner            0.000 0.000 0.000 1.000 0.000
+
+DiskCoolingTube_outer            0.000 0.000 0.000 1.000 0.000
+
+Peek                             1.000 0.000 0.000 0.000 0.000
 
 
 #tib_module.in 0 0 0 0 0
diff --git a/Validation/Geometry/python/plot_utils.py b/Validation/Geometry/python/plot_utils.py
index b3890e4a60014..d4ae5b6abad17 100644
--- a/Validation/Geometry/python/plot_utils.py
+++ b/Validation/Geometry/python/plot_utils.py
@@ -190,10 +190,10 @@ def setTDRStyle():
     tdrStyle.SetStatW(0.15)
 
     # Margins:
-    tdrStyle.SetPadTopMargin(0.1)
+    tdrStyle.SetPadTopMargin(0.05)
     tdrStyle.SetPadBottomMargin(0.1)
-    tdrStyle.SetPadLeftMargin(0.1)
-    tdrStyle.SetPadRightMargin(0.1)
+    tdrStyle.SetPadLeftMargin(0.12)
+    tdrStyle.SetPadRightMargin(0.05)
 
     # For the Global title:
     tdrStyle.SetOptTitle(1)
diff --git a/Validation/Geometry/test/MaterialBudget.py b/Validation/Geometry/test/MaterialBudget.py
index c81ee6c89de95..6c4a6045e0cb1 100644
--- a/Validation/Geometry/test/MaterialBudget.py
+++ b/Validation/Geometry/test/MaterialBudget.py
@@ -802,7 +802,8 @@ def createCompoundPlots(detector, plot, geometry):
        keys of plots dictionary (imported from plot_utils.
 
     """
-
+    setTDRStyle()
+    
     theDirname = 'Images'
     if not checkFile_(theDirname):
         os.mkdir(theDirname)
@@ -818,7 +819,7 @@ def createCompoundPlots(detector, plot, geometry):
                                                plots[plot].abscissa,
                                                plots[plot].ordinate)
     stack_X0 = THStack("stack_X0", stackTitle);
-    theLegend = TLegend(0.70, 0.70, 0.89, 0.89);
+    theLegend = TLegend(0.50, 0.70, 0.70, 0.90);
 
     def setRanges(h):
         legendSpace = 1. + 0.3 # 30%
@@ -836,20 +837,19 @@ def setRanges(h):
         hist_X0_elements[label].SetFillColor(color)
         hist_X0_elements[label].SetLineColor(kBlack)
         stack_X0.Add(hist_X0_elements[label])
-        theLegend.AddEntry(hist_X0_elements[label], leg, "f")
+        if hist_X0_elements[label].Integral() > 0.: theLegend.AddEntry(hist_X0_elements[label], leg, "f")
 
     # canvas
     canname = "MBCan_1D_%s_%s"  % (detector, plot)
     can = TCanvas(canname, canname, 800, 800)
     can.Range(0,0,25,25)
-    can.SetFillColor(kWhite)
-    gStyle.SetOptStat(0)
-
-    setTDRStyle()
+    gStyle.SetOptTitle(0)
 
     # Draw
     setRanges(stack_X0.GetStack().Last())
     stack_X0.Draw("HIST");
+    stack_X0.GetXaxis().SetLabelSize(0.035)
+    stack_X0.GetYaxis().SetLabelSize(0.035)
     theLegend.Draw();
 
     cmsMark = TLatex()
@@ -857,9 +857,9 @@ def setRanges(h):
     cmsMark.SetTextAngle(0);
     cmsMark.SetTextColor(kBlack);    
     cmsMark.SetTextFont(61)
-    cmsMark.SetTextSize(7e-2)
+    cmsMark.SetTextSize(5e-2)
     cmsMark.SetTextAlign(11)
-    cmsMark.DrawLatex(0.1,0.91,"CMS")
+    cmsMark.DrawLatex(0.16,0.86,"CMS")
 
     simuMark = TLatex()
     simuMark.SetNDC();
@@ -867,7 +867,7 @@ def setRanges(h):
     simuMark.SetTextColor(kBlack);    
     simuMark.SetTextSize(3e-2)
     simuMark.SetTextAlign(11)
-    simuMark.DrawLatex(0.26,0.91,"#font[52]{Preliminary Simulation}")
+    simuMark.DrawLatex(0.16,0.82,"#font[52]{Simulation Internal}")
  
     # Store
     can.Update();
diff --git a/Validation/Geometry/test/runMaterialMapForReco_fromReco.py b/Validation/Geometry/test/runMaterialMapForReco_fromReco.py
index 0b7e487e40627..9992485bed95b 100644
--- a/Validation/Geometry/test/runMaterialMapForReco_fromReco.py
+++ b/Validation/Geometry/test/runMaterialMapForReco_fromReco.py
@@ -7,7 +7,6 @@
 
 from FWCore.ParameterSet.VarParsing import VarParsing
 
-from Configuration.StandardSequences.Eras import eras
 
 options = VarParsing ('analysis')
 options.register('inputFile',
@@ -84,7 +83,8 @@
 if options.inputFile is not None:
   input_file = options.inputFile
 
-process = cms.Process('MATERIAL',eras.Run2_2016)
+from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
+process = cms.Process('MATERIAL',Run2_2016)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/Validation/Geometry/test/runMaterialMapForReco_fromReco_Harvesting.py b/Validation/Geometry/test/runMaterialMapForReco_fromReco_Harvesting.py
index 5bb88d15ac89a..b211d8ef3ba17 100644
--- a/Validation/Geometry/test/runMaterialMapForReco_fromReco_Harvesting.py
+++ b/Validation/Geometry/test/runMaterialMapForReco_fromReco_Harvesting.py
@@ -6,7 +6,6 @@
 import FWCore.ParameterSet.Config as cms
 
 from FWCore.ParameterSet.VarParsing import VarParsing 
-from Configuration.StandardSequences.Eras import eras
 
 options = VarParsing ('analysis')
 options.register('inputFile',
@@ -21,7 +20,8 @@
                 "Label to use in the final ROOT file.")
 options.parseArguments()
 
-process = cms.Process('HARVESTING',eras.Run2_2016)
+from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
+process = cms.Process('HARVESTING',Run2_2016)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/Validation/Geometry/test/runP_Tracker_cfg.py b/Validation/Geometry/test/runP_Tracker_cfg.py
index 4ce053c289fcb..469e3f6dfc96a 100644
--- a/Validation/Geometry/test/runP_Tracker_cfg.py
+++ b/Validation/Geometry/test/runP_Tracker_cfg.py
@@ -2,7 +2,7 @@
 #
 # for t in {'BeamPipe','Tracker','PixBar','PixFwdMinus','PixFwdPlus','TIB','TOB','TIDB','TIDF','TEC','TkStrct','InnerServices'}; do cmsRun runP_Tracker_cfg.py geom=XYZ label=$t >& /dev/null &; done
 
-
+from __future__ import print_function
 import FWCore.ParameterSet.Config as cms
 from FWCore.ParameterSet.VarParsing import VarParsing
 import sys, re
@@ -62,9 +62,9 @@
     )
 
 if options.label not in _ALLOWED_LABELS:
-    print "\n*** Error, '%s' not registered as a valid components to monitor." % options.label
-    print "Allowed components:", _ALLOWED_LABELS
-    print
+    print("\n*** Error, '%s' not registered as a valid components to monitor." % options.label)
+    print("Allowed components:", _ALLOWED_LABELS)
+    print()
     raise RuntimeError("Unknown label")
 
 _components = _LABELS2COMPS[options.label]
diff --git a/Validation/Geometry/test/step3_PhaseI_testing.py b/Validation/Geometry/test/step3_PhaseI_testing.py
index 7516df46c3df0..e5a1cab2ce7c0 100644
--- a/Validation/Geometry/test/step3_PhaseI_testing.py
+++ b/Validation/Geometry/test/step3_PhaseI_testing.py
@@ -5,9 +5,9 @@
 # with command line options: step3 --conditions auto:phase1_2017_realistic --pileup_input das:/RelValMinBias_13/CMSSW_8_1_0_pre7-81X_upgrade2017_realistic_v3_UPG17newGT-v1/GEN-SIM -n 10 --era Run2_2017 --eventcontent RECOSIM,DQM -s RAW2DIGI,L1Reco,RECO:reconstruction_trackingOnly,VALIDATION:@trackingOnlyValidation,DQM:@trackingOnlyDQM --datatier GEN-SIM-RECO,DQMIO --pileup AVE_35_BX_25ns --geometry DB:Extended --conditions 81X_upgrade2017_realistic_v3 --no_exec --filein file:step2.root --fileout file:step3.root --nThreads 4 --python_filename fuffa.py
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('RECO',eras.Run2_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process('RECO',Run2_2017)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/Validation/Geometry/test/step4_PhaseI_testing.py b/Validation/Geometry/test/step4_PhaseI_testing.py
index 9d6eb9adafcf3..b597f244c225b 100644
--- a/Validation/Geometry/test/step4_PhaseI_testing.py
+++ b/Validation/Geometry/test/step4_PhaseI_testing.py
@@ -5,9 +5,9 @@
 # with command line options: step4 --filetype DQM --mc --conditions auto:phase1_2017_realistic --era Run2_2017 -s HARVESTING:@trackingOnlyValidation+@trackingOnlyDQM -n -1 --filein file:matbdgForReco_FromReco_TTbarPhaseI_inDQM.root --python_filename fuffa_harvesting.py --no_exec
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('HARVESTING',eras.Run2_2017)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process('HARVESTING',Run2_2017)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/Validation/GlobalDigis/interface/GlobalDigisAnalyzer.h b/Validation/GlobalDigis/interface/GlobalDigisAnalyzer.h
index 8bac68e77b867..125893c08fbd3 100644
--- a/Validation/GlobalDigis/interface/GlobalDigisAnalyzer.h
+++ b/Validation/GlobalDigis/interface/GlobalDigisAnalyzer.h
@@ -2,68 +2,68 @@
 #define GlobalDigisAnalyzer_h
 
 /** \class GlobalDigiAnalyzer
- *  
- *  Class to fill PGlobalDigi object to be inserted into data stream 
- *  containing information about various sub-systems in global coordinates 
+ *
+ *  Class to fill PGlobalDigi object to be inserted into data stream
+ *  containing information about various sub-systems in global coordinates
  *  with full geometry
  *
  *  \author M. Strang SUNY-Buffalo
  */
 
 // framework & common header files
+#include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/Provenance/interface/Provenance.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "DataFormats/Provenance/interface/Provenance.h"
-#include "FWCore/Framework/interface/MakerMacros.h" 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-//DQM services
+// DQM services
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 // ecal calorimeter info
+#include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
+#include "DataFormats/EcalDetId/interface/EBDetId.h"
+#include "DataFormats/EcalDetId/interface/EEDetId.h"
+#include "DataFormats/EcalDetId/interface/ESDetId.h"
 #include "DataFormats/EcalDigi/interface/EBDataFrame.h"
 #include "DataFormats/EcalDigi/interface/EEDataFrame.h"
 #include "DataFormats/EcalDigi/interface/ESDataFrame.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
-#include "DataFormats/EcalDetId/interface/EBDetId.h"
-#include "DataFormats/EcalDetId/interface/EEDetId.h"
-#include "DataFormats/EcalDetId/interface/ESDetId.h"
-#include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
 
 // hcal calorimeter info
-#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
-#include "DataFormats/HcalDetId/interface/HcalElectronicsId.h"
-#include "DataFormats/HcalDetId/interface/HcalDetId.h"
-#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
-#include "DataFormats/HcalDigi/interface/HcalQIESample.h"
-#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
-#include "CalibFormats/HcalObjects/interface/HcalCoderDb.h"
 #include "CalibFormats/HcalObjects/interface/HcalCalibrations.h"
+#include "CalibFormats/HcalObjects/interface/HcalCoderDb.h"
+#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
+#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
+#include "DataFormats/HcalDetId/interface/HcalDetId.h"
+#include "DataFormats/HcalDetId/interface/HcalElectronicsId.h"
+#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
 #include "DataFormats/HcalDigi/interface/HBHEDataFrame.h"
 #include "DataFormats/HcalDigi/interface/HFDataFrame.h"
 #include "DataFormats/HcalDigi/interface/HODataFrame.h"
-#include "CalibFormats/HcalObjects/interface/HcalDbService.h"
+#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
+#include "DataFormats/HcalDigi/interface/HcalQIESample.h"
 
 // silicon strip info
 #include "DataFormats/Common/interface/DetSetVector.h"
-#include "DataFormats/SiStripDigi/interface/SiStripDigi.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
+#include "DataFormats/SiStripDigi/interface/SiStripDigi.h"
 
 // silicon pixel info
-#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
 
 // muon DT info
 #include "DataFormats/DTDigi/interface/DTDigi.h"
 #include "DataFormats/DTDigi/interface/DTDigiCollection.h"
-#include "DataFormats/MuonDetId/interface/DTWireId.h"
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
+#include "DataFormats/MuonDetId/interface/DTWireId.h"
 
 // muon CSC Strip info
 #include "DataFormats/CSCDigi/interface/CSCStripDigi.h"
@@ -74,69 +74,65 @@
 #include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
 
 // muon RPC info
+#include "DataFormats/MuonDetId/interface/RPCDetId.h"
 #include "DataFormats/RPCDigi/interface/RPCDigi.h"
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
-#include "Geometry/RPCGeometry/interface/RPCGeometry.h"
 #include "DataFormats/RPCDigi/interface/RPCDigiCollection.h"
-#include "DataFormats/MuonDetId/interface/RPCDetId.h"
+#include "Geometry/RPCGeometry/interface/RPCGeometry.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-#include "Geometry/CommonTopologies/interface/RectangularStripTopology.h"
-#include "Geometry/CommonTopologies/interface/TrapezoidalStripTopology.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
+#include "Geometry/CommonTopologies/interface/RectangularStripTopology.h"
+#include "Geometry/CommonTopologies/interface/TrapezoidalStripTopology.h"
 
 // event info
-#include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
-#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
+#include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
+#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 
-#include <iostream>
 #include <cstdlib>
-#include <string>
+#include <iostream>
+#include <map>
 #include <memory>
+#include <string>
 #include <vector>
-#include <map>
 
-#include "TString.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+#include "TString.h"
 
 class PGlobalDigi;
 
-class GlobalDigisAnalyzer : public DQMEDAnalyzer
-{
-
- public:
+class GlobalDigisAnalyzer : public DQMEDAnalyzer {
+public:
   typedef std::vector<float> FloatVector;
   typedef std::vector<double> DoubleVector;
   typedef std::vector<int> IntVector;
-  typedef std::map<uint32_t,float,std::less<uint32_t> > MapType;
+  typedef std::map<uint32_t, float, std::less<uint32_t>> MapType;
 
-  explicit GlobalDigisAnalyzer(const edm::ParameterSet&);
+  explicit GlobalDigisAnalyzer(const edm::ParameterSet &);
   ~GlobalDigisAnalyzer() override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
- protected:
+protected:
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  
- private:
 
+private:
   // production related methods
-  void fillECal(const edm::Event&, const edm::EventSetup&);
-  //void storeECal(PGlobalDigi&);
-  void fillHCal(const edm::Event&, const edm::EventSetup&);
-  //void storeHCal(PGlobalDigi&);
-  void fillTrk(const edm::Event&, const edm::EventSetup&);
-  //void storeTrk(PGlobalDigi&);
-  void fillMuon(const edm::Event&, const edm::EventSetup&);
-  //void storeMuon(PGlobalDigi&);  
-
-  //void clear();
-
- private:
-
+  void fillECal(const edm::Event &, const edm::EventSetup &);
+  // void storeECal(PGlobalDigi&);
+  void fillHCal(const edm::Event &, const edm::EventSetup &);
+  // void storeHCal(PGlobalDigi&);
+  void fillTrk(const edm::Event &, const edm::EventSetup &);
+  // void storeTrk(PGlobalDigi&);
+  void fillMuon(const edm::Event &, const edm::EventSetup &);
+  // void storeMuon(PGlobalDigi&);
+
+  // void clear();
+
+private:
   //  parameter information
   std::string fName;
   int verbosity;
@@ -148,7 +144,7 @@ class GlobalDigisAnalyzer : public DQMEDAnalyzer
 
   // Electromagnetic info
   // ECal info
- 
+
   MonitorElement *mehEcaln[2];
   MonitorElement *mehEScaln;
   MonitorElement *mehEcalAEE[2];
@@ -162,7 +158,7 @@ class GlobalDigisAnalyzer : public DQMEDAnalyzer
   edm::InputTag ECalEESrc_;
   edm::InputTag ECalESSrc_;
 
-  std::map<int, double, std::less<int> > ECalgainConv_;
+  std::map<int, double, std::less<int>> ECalgainConv_;
   double ECalbarrelADCtoGeV_;
   double ECalendcapADCtoGeV_;
 
@@ -179,7 +175,7 @@ class GlobalDigisAnalyzer : public DQMEDAnalyzer
 
   // Tracker info
   // SiStrip
-  
+
   MonitorElement *mehSiStripn[19];
   MonitorElement *mehSiStripADC[19];
   MonitorElement *mehSiStripStrip[19];
@@ -192,9 +188,9 @@ class GlobalDigisAnalyzer : public DQMEDAnalyzer
   MonitorElement *mehSiPixelADC[7];
   MonitorElement *mehSiPixelRow[7];
   MonitorElement *mehSiPixelCol[7];
-  
+
   edm::InputTag SiPxlSrc_;
-  
+
   // Muon info
   // DT
 
@@ -229,11 +225,11 @@ class GlobalDigisAnalyzer : public DQMEDAnalyzer
   edm::EDGetTokenT<EEDigiCollection> ECalEESrc_Token_;
   edm::EDGetTokenT<ESDigiCollection> ECalESSrc_Token_;
   edm::EDGetTokenT<edm::PCaloHitContainer> HCalSrc_Token_;
-  edm::EDGetTokenT<edm::SortedCollection<HBHEDataFrame> > HBHEDigi_Token_;
-  edm::EDGetTokenT<edm::SortedCollection<HODataFrame> > HODigi_Token_;
-  edm::EDGetTokenT<edm::SortedCollection<HFDataFrame> > HFDigi_Token_;
-  edm::EDGetTokenT<edm::DetSetVector<SiStripDigi> > SiStripSrc_Token_;
-  edm::EDGetTokenT<edm::DetSetVector<PixelDigi> > SiPxlSrc_Token_;
+  edm::EDGetTokenT<edm::SortedCollection<HBHEDataFrame>> HBHEDigi_Token_;
+  edm::EDGetTokenT<edm::SortedCollection<HODataFrame>> HODigi_Token_;
+  edm::EDGetTokenT<edm::SortedCollection<HFDataFrame>> HFDigi_Token_;
+  edm::EDGetTokenT<edm::DetSetVector<SiStripDigi>> SiStripSrc_Token_;
+  edm::EDGetTokenT<edm::DetSetVector<PixelDigi>> SiPxlSrc_Token_;
   edm::EDGetTokenT<DTDigiCollection> MuDTSrc_Token_;
   edm::EDGetTokenT<CSCStripDigiCollection> MuCSCStripSrc_Token_;
   edm::EDGetTokenT<CSCWireDigiCollection> MuCSCWireSrc_Token_;
@@ -246,7 +242,7 @@ class GlobalDigisAnalyzer : public DQMEDAnalyzer
   // private statistics information
   unsigned int count;
 
-}; // end class declaration
+};  // end class declaration
 
 #endif
 
@@ -254,37 +250,37 @@ class GlobalDigisAnalyzer : public DQMEDAnalyzer
 #define GlobalHitMap
 
 // geometry mapping
-static const int dTrk             = 1;
-static const int sdPxlBrl         = 1;
-static const int sdPxlFwd         = 2;
-static const int sdSiTIB          = 3;
-static const int sdSiTID          = 4;
-static const int sdSiTOB          = 5;
-static const int sdSiTEC          = 6;
-
-static const int dMuon            = 2;
-static const int sdMuonDT         = 1;
-static const int sdMuonCSC        = 2;
-static const int sdMuonRPC        = 3;
-static const int sdMuonRPCRgnBrl  = 0;
+static const int dTrk = 1;
+static const int sdPxlBrl = 1;
+static const int sdPxlFwd = 2;
+static const int sdSiTIB = 3;
+static const int sdSiTID = 4;
+static const int sdSiTOB = 5;
+static const int sdSiTEC = 6;
+
+static const int dMuon = 2;
+static const int sdMuonDT = 1;
+static const int sdMuonCSC = 2;
+static const int sdMuonRPC = 3;
+static const int sdMuonRPCRgnBrl = 0;
 static const int sdMuonRPCRgnFwdp = 1;
 static const int sdMuonRPCRgnFwdn = -1;
 
-static const int dEcal            = 3;
-static const int sdEcalBrl        = 1;
-static const int sdEcalFwd        = 2;
-static const int sdEcalPS         = 3;
-static const int sdEcalTT         = 4;
-static const int sdEcalLPnD       = 5;
-
-static const int dHcal            = 4;
-static const int sdHcalEmpty      = 0;
-static const int sdHcalBrl        = 1;
-static const int sdHcalEC         = 2;
-static const int sdHcalOut        = 3;
-static const int sdHcalFwd        = 4;
-static const int sdHcalTT         = 5;
-static const int sdHcalCalib      = 6;
-static const int sdHcalCompst     = 7;
-
-#endif //PGlobalDigisAnalyzer_h
+static const int dEcal = 3;
+static const int sdEcalBrl = 1;
+static const int sdEcalFwd = 2;
+static const int sdEcalPS = 3;
+static const int sdEcalTT = 4;
+static const int sdEcalLPnD = 5;
+
+static const int dHcal = 4;
+static const int sdHcalEmpty = 0;
+static const int sdHcalBrl = 1;
+static const int sdHcalEC = 2;
+static const int sdHcalOut = 3;
+static const int sdHcalFwd = 4;
+static const int sdHcalTT = 5;
+static const int sdHcalCalib = 6;
+static const int sdHcalCompst = 7;
+
+#endif  // PGlobalDigisAnalyzer_h
diff --git a/Validation/GlobalDigis/interface/GlobalDigisHistogrammer.h b/Validation/GlobalDigis/interface/GlobalDigisHistogrammer.h
index 658a8f8d8e554..c61f46a5fb3e7 100644
--- a/Validation/GlobalDigis/interface/GlobalDigisHistogrammer.h
+++ b/Validation/GlobalDigis/interface/GlobalDigisHistogrammer.h
@@ -2,33 +2,31 @@
 #define GlobalDigisHistogrammer_h
 
 /** \class GlobalHitsProducer
- *  
- *  Class to fill PGlobalDigis object to be inserted into data stream 
- *  containing information about various sub-systems in global coordinates 
+ *
+ *  Class to fill PGlobalDigis object to be inserted into data stream
+ *  containing information about various sub-systems in global coordinates
  *  with full geometry
  *
  *  \author M. Strang SUNY-Buffalo
  */
 
 // framework & common header files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
-//DQM services
+// DQM services
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-
 //#include "DataFormats/Common/interface/Provenance.h"
 #include "DataFormats/Provenance/interface/Provenance.h"
-#include "FWCore/Framework/interface/MakerMacros.h" 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 // event info
 #include "SimDataFormats/ValidationFormats/interface/PValidationFormats.h"
@@ -37,36 +35,30 @@
 //#include <CLHEP/Vector/LorentzVector.h>
 //#include <CLHEP/Units/SystemOfUnits.h>
 
-#include <iostream>
+#include <cmath>
 #include <cstdlib>
-#include <string>
+#include <iostream>
+#include <map>
 #include <memory>
+#include <string>
 #include <vector>
-#include <map>
-#include <cmath>
 
-#include "TString.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-
+#include "TString.h"
 
 class GlobalDigisHistogrammer : public DQMEDAnalyzer {
+public:
+  // typedef std::vector<float> FloatVector;
+  // typedef std::vector<double> DoubleVector;
+  // typedef std::vector<int> IntVector;
+  typedef std::map<uint32_t, float, std::less<uint32_t>> MapType;
 
- public:
-
-  //typedef std::vector<float> FloatVector;
-  //typedef std::vector<double> DoubleVector;
-  //typedef std::vector<int> IntVector;
-  typedef std::map<uint32_t,float,std::less<uint32_t> > MapType;
-
-  explicit GlobalDigisHistogrammer(const edm::ParameterSet&);
+  explicit GlobalDigisHistogrammer(const edm::ParameterSet &);
   ~GlobalDigisHistogrammer() override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void bookHistograms(DQMStore::IBooker &,
-      edm::Run const &, edm::EventSetup const &) override;
-  
-
- private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
+private:
   //  parameter information
   std::string fName;
   int verbosity;
@@ -79,7 +71,7 @@ class GlobalDigisHistogrammer : public DQMEDAnalyzer {
   bool doOutput;
 
   edm::InputTag GlobalDigisSrc_;
-  //edm::InputTag srcGlobalDigis;
+  // edm::InputTag srcGlobalDigis;
   edm::EDGetTokenT<PGlobalDigi> GlobalDigisSrc_Token_;
 
   // Electromagnetic info
@@ -99,18 +91,16 @@ class GlobalDigisHistogrammer : public DQMEDAnalyzer {
   MonitorElement *mehHcalAEESHE[4];
   MonitorElement *mehHcalSHEvAEE[4];
 
-
   // Tracker info
   // SiStrip
-  
+
   MonitorElement *mehSiStripn[19];
   MonitorElement *mehSiStripADC[19];
   MonitorElement *mehSiStripStrip[19];
 
-
   // SiPxl
 
-   MonitorElement *mehSiPixeln[7];
+  MonitorElement *mehSiPixeln[7];
   MonitorElement *mehSiPixelADC[7];
   MonitorElement *mehSiPixelRow[7];
   MonitorElement *mehSiPixelCol[7];
@@ -134,11 +124,6 @@ class GlobalDigisHistogrammer : public DQMEDAnalyzer {
   // private statistics information
   unsigned int count;
 
-}; // end class declaration
-
-
-
-
-
+};  // end class declaration
 
-#endif //PGlobalDigisHistogrammer_h
+#endif  // PGlobalDigisHistogrammer_h
diff --git a/Validation/GlobalDigis/interface/GlobalDigisProducer.h b/Validation/GlobalDigis/interface/GlobalDigisProducer.h
index a36a7064c6a9a..82b748b0ea6b9 100644
--- a/Validation/GlobalDigis/interface/GlobalDigisProducer.h
+++ b/Validation/GlobalDigis/interface/GlobalDigisProducer.h
@@ -2,53 +2,53 @@
 #define GlobalDigisProducer_h
 
 /** \class GlobalDigiProducer
- *  
- *  Class to fill PGlobalDigi object to be inserted into data stream 
- *  containing information about various sub-systems in global coordinates 
+ *
+ *  Class to fill PGlobalDigi object to be inserted into data stream
+ *  containing information about various sub-systems in global coordinates
  *  with full geometry
  *
  *  \author M. Strang SUNY-Buffalo
  */
 
 // framework & common header files
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EDProducer.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 //#include "DataFormats/Common/interface/Provenance.h"
 #include "DataFormats/Provenance/interface/Provenance.h"
-#include "FWCore/Framework/interface/MakerMacros.h" 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-//DQM services
+// DQM services
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 // ecal calorimeter info
+#include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
+#include "DataFormats/EcalDetId/interface/EBDetId.h"
+#include "DataFormats/EcalDetId/interface/EEDetId.h"
+#include "DataFormats/EcalDetId/interface/ESDetId.h"
 #include "DataFormats/EcalDigi/interface/EBDataFrame.h"
 #include "DataFormats/EcalDigi/interface/EEDataFrame.h"
 #include "DataFormats/EcalDigi/interface/ESDataFrame.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
-#include "DataFormats/EcalDetId/interface/EBDetId.h"
-#include "DataFormats/EcalDetId/interface/EEDetId.h"
-#include "DataFormats/EcalDetId/interface/ESDetId.h"
-#include "CalibCalorimetry/EcalTrivialCondModules/interface/EcalTrivialConditionRetriever.h"
 
 // hcal calorimeter info
-#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
-#include "DataFormats/HcalDetId/interface/HcalElectronicsId.h"
-#include "DataFormats/HcalDetId/interface/HcalDetId.h"
-#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
-#include "DataFormats/HcalDigi/interface/HcalQIESample.h"
-#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
-#include "CalibFormats/HcalObjects/interface/HcalCoderDb.h"
 #include "CalibFormats/HcalObjects/interface/HcalCalibrations.h"
+#include "CalibFormats/HcalObjects/interface/HcalCoderDb.h"
+#include "CalibFormats/HcalObjects/interface/HcalDbRecord.h"
+#include "DataFormats/HcalDetId/interface/HcalDetId.h"
+#include "DataFormats/HcalDetId/interface/HcalElectronicsId.h"
+#include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
 #include "DataFormats/HcalDigi/interface/HBHEDataFrame.h"
 #include "DataFormats/HcalDigi/interface/HFDataFrame.h"
 #include "DataFormats/HcalDigi/interface/HODataFrame.h"
+#include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
+#include "DataFormats/HcalDigi/interface/HcalQIESample.h"
 //#include "Geometry/Records/interface/IdealGeometryRecord.h"
 //#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 //#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
@@ -57,18 +57,18 @@
 
 // silicon strip info
 #include "DataFormats/Common/interface/DetSetVector.h"
-#include "DataFormats/SiStripDigi/interface/SiStripDigi.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
+#include "DataFormats/SiStripDigi/interface/SiStripDigi.h"
 
 // silicon pixel info
-#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
 
 // muon DT info
 #include "DataFormats/DTDigi/interface/DTDigi.h"
 #include "DataFormats/DTDigi/interface/DTDigiCollection.h"
-#include "DataFormats/MuonDetId/interface/DTWireId.h"
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
+#include "DataFormats/MuonDetId/interface/DTWireId.h"
 
 // muon CSC Strip info
 #include "DataFormats/CSCDigi/interface/CSCStripDigi.h"
@@ -79,59 +79,54 @@
 #include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
 
 // event info
-#include "SimDataFormats/ValidationFormats/interface/PValidationFormats.h"
-#include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
-#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
+#include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
+#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
+#include "SimDataFormats/ValidationFormats/interface/PValidationFormats.h"
 
 // helper files
 //#include <CLHEP/Vector/LorentzVector.h>
 //#include <CLHEP/Units/SystemOfUnits.h>
 
-#include <iostream>
 #include <cstdlib>
-#include <string>
+#include <iostream>
+#include <map>
 #include <memory>
+#include <string>
 #include <vector>
-#include <map>
 
 #include "TString.h"
 
 class PGlobalDigi;
 
-class GlobalDigisProducer : public edm::EDProducer
-{
-
- public:
-
+class GlobalDigisProducer : public edm::EDProducer {
+public:
   typedef std::vector<float> FloatVector;
   typedef std::vector<double> DoubleVector;
   typedef std::vector<int> IntVector;
-  typedef std::map<uint32_t,float,std::less<uint32_t> > MapType;
+  typedef std::map<uint32_t, float, std::less<uint32_t>> MapType;
 
-  explicit GlobalDigisProducer(const edm::ParameterSet&);
+  explicit GlobalDigisProducer(const edm::ParameterSet &);
   ~GlobalDigisProducer() override;
-  void beginJob( void ) override;
-  void endJob() override;  
-  void produce(edm::Event&, const edm::EventSetup&) override;
-  
- private:
+  void beginJob(void) override;
+  void endJob() override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
+private:
   // production related methods
-  void fillECal(edm::Event&, const edm::EventSetup&);
-  void storeECal(PGlobalDigi&);
-  void fillHCal(edm::Event&, const edm::EventSetup&);
-  void storeHCal(PGlobalDigi&);
-  void fillTrk(edm::Event&, const edm::EventSetup&);
-  void storeTrk(PGlobalDigi&);
-  void fillMuon(edm::Event&, const edm::EventSetup&);
-  void storeMuon(PGlobalDigi&);  
+  void fillECal(edm::Event &, const edm::EventSetup &);
+  void storeECal(PGlobalDigi &);
+  void fillHCal(edm::Event &, const edm::EventSetup &);
+  void storeHCal(PGlobalDigi &);
+  void fillTrk(edm::Event &, const edm::EventSetup &);
+  void storeTrk(PGlobalDigi &);
+  void fillMuon(edm::Event &, const edm::EventSetup &);
+  void storeMuon(PGlobalDigi &);
 
   void clear();
 
- private:
-
+private:
   //  parameter information
   std::string fName;
   int verbosity;
@@ -142,13 +137,13 @@ class GlobalDigisProducer : public edm::EDProducer
 
   // Electromagnetic info
   // ECal info
- 
-  IntVector EBCalmaxPos; 
-  DoubleVector EBCalAEE; 
+
+  IntVector EBCalmaxPos;
+  DoubleVector EBCalAEE;
   FloatVector EBCalSHE;
 
-  IntVector EECalmaxPos; 
-  DoubleVector EECalAEE; 
+  IntVector EECalmaxPos;
+  DoubleVector EECalAEE;
   FloatVector EECalSHE;
 
   FloatVector ESCalADC0, ESCalADC1, ESCalADC2;
@@ -158,7 +153,7 @@ class GlobalDigisProducer : public edm::EDProducer
   edm::InputTag ECalEESrc_;
   edm::InputTag ECalESSrc_;
 
-  std::map<int, double, std::less<int> > ECalgainConv_;
+  std::map<int, double, std::less<int>> ECalgainConv_;
   double ECalbarrelADCtoGeV_;
   double ECalendcapADCtoGeV_;
 
@@ -181,7 +176,7 @@ class GlobalDigisProducer : public edm::EDProducer
 
   // Tracker info
   // SiStrip
-  
+
   FloatVector TIBL1ADC, TIBL2ADC, TIBL3ADC, TIBL4ADC;
   IntVector TIBL1Strip, TIBL2Strip, TIBL3Strip, TIBL4Strip;
 
@@ -191,10 +186,8 @@ class GlobalDigisProducer : public edm::EDProducer
   FloatVector TIDW1ADC, TIDW2ADC, TIDW3ADC;
   IntVector TIDW1Strip, TIDW2Strip, TIDW3Strip;
 
-  FloatVector TECW1ADC, TECW2ADC, TECW3ADC, TECW4ADC, TECW5ADC, TECW6ADC, 
-    TECW7ADC, TECW8ADC;
-  IntVector TECW1Strip, TECW2Strip, TECW3Strip, TECW4Strip, TECW5Strip, 
-    TECW6Strip, TECW7Strip, TECW8Strip;
+  FloatVector TECW1ADC, TECW2ADC, TECW3ADC, TECW4ADC, TECW5ADC, TECW6ADC, TECW7ADC, TECW8ADC;
+  IntVector TECW1Strip, TECW2Strip, TECW3Strip, TECW4Strip, TECW5Strip, TECW6Strip, TECW7Strip, TECW8Strip;
 
   edm::InputTag SiStripSrc_;
 
@@ -237,16 +230,16 @@ class GlobalDigisProducer : public edm::EDProducer
   // private statistics information
   unsigned int count;
 
-  //fix for consumes
+  // fix for consumes
   edm::EDGetTokenT<EBDigiCollection> ECalEBSrc_Token_;
   edm::EDGetTokenT<EEDigiCollection> ECalEESrc_Token_;
   edm::EDGetTokenT<ESDigiCollection> ECalESSrc_Token_;
   edm::EDGetTokenT<edm::PCaloHitContainer> HCalSrc_Token_;
-  edm::EDGetTokenT<edm::SortedCollection<HBHEDataFrame> > HBHEDigi_Token_;
-  edm::EDGetTokenT<edm::SortedCollection<HODataFrame> > HODigi_Token_;
-  edm::EDGetTokenT<edm::SortedCollection<HFDataFrame> > HFDigi_Token_;
-  edm::EDGetTokenT<edm::DetSetVector<SiStripDigi> > SiStripSrc_Token_;
-  edm::EDGetTokenT<edm::DetSetVector<PixelDigi> > SiPxlSrc_Token_;
+  edm::EDGetTokenT<edm::SortedCollection<HBHEDataFrame>> HBHEDigi_Token_;
+  edm::EDGetTokenT<edm::SortedCollection<HODataFrame>> HODigi_Token_;
+  edm::EDGetTokenT<edm::SortedCollection<HFDataFrame>> HFDigi_Token_;
+  edm::EDGetTokenT<edm::DetSetVector<SiStripDigi>> SiStripSrc_Token_;
+  edm::EDGetTokenT<edm::DetSetVector<PixelDigi>> SiPxlSrc_Token_;
   edm::EDGetTokenT<DTDigiCollection> MuDTSrc_Token_;
   edm::EDGetTokenT<CSCStripDigiCollection> MuCSCStripSrc_Token_;
   edm::EDGetTokenT<CSCWireDigiCollection> MuCSCWireSrc_Token_;
@@ -254,7 +247,7 @@ class GlobalDigisProducer : public edm::EDProducer
   edm::EDGetTokenT<CrossingFrame<PCaloHit>> EEHits_Token_;
   edm::EDGetTokenT<CrossingFrame<PCaloHit>> ESHits_Token_;
 
-}; // end class declaration
+};  // end class declaration
 
 #endif
 
@@ -262,37 +255,37 @@ class GlobalDigisProducer : public edm::EDProducer
 #define GlobalHitMap
 
 // geometry mapping
-static const int dTrk             = 1;
-static const int sdPxlBrl         = 1;
-static const int sdPxlFwd         = 2;
-static const int sdSiTIB          = 3;
-static const int sdSiTID          = 4;
-static const int sdSiTOB          = 5;
-static const int sdSiTEC          = 6;
-
-static const int dMuon            = 2;
-static const int sdMuonDT         = 1;
-static const int sdMuonCSC        = 2;
-static const int sdMuonRPC        = 3;
-static const int sdMuonRPCRgnBrl  = 0;
+static const int dTrk = 1;
+static const int sdPxlBrl = 1;
+static const int sdPxlFwd = 2;
+static const int sdSiTIB = 3;
+static const int sdSiTID = 4;
+static const int sdSiTOB = 5;
+static const int sdSiTEC = 6;
+
+static const int dMuon = 2;
+static const int sdMuonDT = 1;
+static const int sdMuonCSC = 2;
+static const int sdMuonRPC = 3;
+static const int sdMuonRPCRgnBrl = 0;
 static const int sdMuonRPCRgnFwdp = 1;
 static const int sdMuonRPCRgnFwdn = -1;
 
-static const int dEcal            = 3;
-static const int sdEcalBrl        = 1;
-static const int sdEcalFwd        = 2;
-static const int sdEcalPS         = 3;
-static const int sdEcalTT         = 4;
-static const int sdEcalLPnD       = 5;
-
-static const int dHcal            = 4;
-static const int sdHcalEmpty      = 0;
-static const int sdHcalBrl        = 1;
-static const int sdHcalEC         = 2;
-static const int sdHcalOut        = 3;
-static const int sdHcalFwd        = 4;
-static const int sdHcalTT         = 5;
-static const int sdHcalCalib      = 6;
-static const int sdHcalCompst     = 7;
-
-#endif //PGlobalDigisProducer_h
+static const int dEcal = 3;
+static const int sdEcalBrl = 1;
+static const int sdEcalFwd = 2;
+static const int sdEcalPS = 3;
+static const int sdEcalTT = 4;
+static const int sdEcalLPnD = 5;
+
+static const int dHcal = 4;
+static const int sdHcalEmpty = 0;
+static const int sdHcalBrl = 1;
+static const int sdHcalEC = 2;
+static const int sdHcalOut = 3;
+static const int sdHcalFwd = 4;
+static const int sdHcalTT = 5;
+static const int sdHcalCalib = 6;
+static const int sdHcalCompst = 7;
+
+#endif  // PGlobalDigisProducer_h
diff --git a/Validation/GlobalDigis/src/GlobalDigisAnalyzer.cc b/Validation/GlobalDigis/src/GlobalDigisAnalyzer.cc
index ace728553af1c..5f8405157f137 100644
--- a/Validation/GlobalDigis/src/GlobalDigisAnalyzer.cc
+++ b/Validation/GlobalDigis/src/GlobalDigisAnalyzer.cc
@@ -1,41 +1,44 @@
 /** \file GlobalDigisAnalyzer.cc
- *  
+ *
  *  See header file for description of class
  *
  *  \author M. Strang SUNY-Buffalo
  */
 
-#include "Validation/GlobalDigis/interface/GlobalDigisAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
+#include "Validation/GlobalDigis/interface/GlobalDigisAnalyzer.h"
 
-GlobalDigisAnalyzer::GlobalDigisAnalyzer(const edm::ParameterSet& iPSet) :
-  fName(""), verbosity(0), frequency(0), label(""), getAllProvenances(false),
-  printProvenanceInfo(false), hitsProducer(""), theCSCStripPedestalSum(0),
-  theCSCStripPedestalCount(0), count(0)
-{
+GlobalDigisAnalyzer::GlobalDigisAnalyzer(const edm::ParameterSet &iPSet)
+    : fName(""),
+      verbosity(0),
+      frequency(0),
+      label(""),
+      getAllProvenances(false),
+      printProvenanceInfo(false),
+      hitsProducer(""),
+      theCSCStripPedestalSum(0),
+      theCSCStripPedestalCount(0),
+      count(0) {
   std::string MsgLoggerCat = "GlobalDigisAnalyzer_GlobalDigisAnalyzer";
 
   // get information from parameter set
   fName = iPSet.getUntrackedParameter<std::string>("Name");
   verbosity = iPSet.getUntrackedParameter<int>("Verbosity");
   frequency = iPSet.getUntrackedParameter<int>("Frequency");
-  edm::ParameterSet m_Prov =
-    iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup");
-  getAllProvenances = 
-    m_Prov.getUntrackedParameter<bool>("GetAllProvenances");
-  printProvenanceInfo = 
-    m_Prov.getUntrackedParameter<bool>("PrintProvenanceInfo");
+  edm::ParameterSet m_Prov = iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup");
+  getAllProvenances = m_Prov.getUntrackedParameter<bool>("GetAllProvenances");
+  printProvenanceInfo = m_Prov.getUntrackedParameter<bool>("PrintProvenanceInfo");
   hitsProducer = iPSet.getParameter<std::string>("hitsProducer");
-  
-  //get Labels to use to extract information
+
+  // get Labels to use to extract information
   ECalEBSrc_ = iPSet.getParameter<edm::InputTag>("ECalEBSrc");
   ECalEESrc_ = iPSet.getParameter<edm::InputTag>("ECalEESrc");
   ECalESSrc_ = iPSet.getParameter<edm::InputTag>("ECalESSrc");
   HCalSrc_ = iPSet.getParameter<edm::InputTag>("HCalSrc");
   HCalDigi_ = iPSet.getParameter<edm::InputTag>("HCalDigi");
-  SiStripSrc_ = iPSet.getParameter<edm::InputTag>("SiStripSrc"); 
+  SiStripSrc_ = iPSet.getParameter<edm::InputTag>("SiStripSrc");
   SiPxlSrc_ = iPSet.getParameter<edm::InputTag>("SiPxlSrc");
   MuDTSrc_ = iPSet.getParameter<edm::InputTag>("MuDTSrc");
   MuCSCStripSrc_ = iPSet.getParameter<edm::InputTag>("MuCSCStripSrc");
@@ -46,442 +49,428 @@ GlobalDigisAnalyzer::GlobalDigisAnalyzer(const edm::ParameterSet& iPSet) :
   ECalEESrc_Token_ = consumes<EEDigiCollection>(iPSet.getParameter<edm::InputTag>("ECalEESrc"));
   ECalESSrc_Token_ = consumes<ESDigiCollection>(iPSet.getParameter<edm::InputTag>("ECalESSrc"));
   HCalSrc_Token_ = consumes<edm::PCaloHitContainer>(iPSet.getParameter<edm::InputTag>("HCalSrc"));
-  HBHEDigi_Token_ = consumes<edm::SortedCollection<HBHEDataFrame> >(iPSet.getParameter<edm::InputTag>("HCalDigi"));  
-  HODigi_Token_ = consumes<edm::SortedCollection<HODataFrame>>(iPSet.getParameter<edm::InputTag>("HCalDigi"));  
-  HFDigi_Token_ = consumes<edm::SortedCollection<HFDataFrame>>(iPSet.getParameter<edm::InputTag>("HCalDigi"));  
-  SiStripSrc_Token_ = consumes<edm::DetSetVector<SiStripDigi> >(iPSet.getParameter<edm::InputTag>("SiStripSrc")); 
-  SiPxlSrc_Token_ = consumes<edm::DetSetVector<PixelDigi> >(iPSet.getParameter<edm::InputTag>("SiPxlSrc"));
+  HBHEDigi_Token_ = consumes<edm::SortedCollection<HBHEDataFrame>>(iPSet.getParameter<edm::InputTag>("HCalDigi"));
+  HODigi_Token_ = consumes<edm::SortedCollection<HODataFrame>>(iPSet.getParameter<edm::InputTag>("HCalDigi"));
+  HFDigi_Token_ = consumes<edm::SortedCollection<HFDataFrame>>(iPSet.getParameter<edm::InputTag>("HCalDigi"));
+  SiStripSrc_Token_ = consumes<edm::DetSetVector<SiStripDigi>>(iPSet.getParameter<edm::InputTag>("SiStripSrc"));
+  SiPxlSrc_Token_ = consumes<edm::DetSetVector<PixelDigi>>(iPSet.getParameter<edm::InputTag>("SiPxlSrc"));
   MuDTSrc_Token_ = consumes<DTDigiCollection>(iPSet.getParameter<edm::InputTag>("MuDTSrc"));
   MuCSCStripSrc_Token_ = consumes<CSCStripDigiCollection>(iPSet.getParameter<edm::InputTag>("MuCSCStripSrc"));
   MuCSCWireSrc_Token_ = consumes<CSCWireDigiCollection>(iPSet.getParameter<edm::InputTag>("MuCSCWireSrc"));
   MuRPCSrc_Token_ = consumes<RPCDigiCollection>(iPSet.getParameter<edm::InputTag>("MuRPCSrc"));
   //
-  const std::string barrelHitsName(hitsProducer+"EcalHitsEB");
-  const std::string endcapHitsName(hitsProducer+"EcalHitsEE");
-  const std::string preshowerHitsName(hitsProducer+"EcalHitsES");
-  EBHits_Token_ = consumes<CrossingFrame<PCaloHit> >(edm::InputTag(std::string("mix"), std::string("barrelHitsName")));
-  EEHits_Token_ = consumes<CrossingFrame<PCaloHit> >(edm::InputTag(std::string("mix"), std::string("endcapHitsName")));
-  ESHits_Token_ = consumes<CrossingFrame<PCaloHit> >(edm::InputTag(std::string("mix"), std::string("preshowerHitsName")));
-
-  RPCSimHit_Token_ = consumes<edm::PSimHitContainer>(edm::InputTag(std::string("g4SimHits"), std::string("MuonRPCHits")));
+  const std::string barrelHitsName(hitsProducer + "EcalHitsEB");
+  const std::string endcapHitsName(hitsProducer + "EcalHitsEE");
+  const std::string preshowerHitsName(hitsProducer + "EcalHitsES");
+  EBHits_Token_ = consumes<CrossingFrame<PCaloHit>>(edm::InputTag(std::string("mix"), std::string("barrelHitsName")));
+  EEHits_Token_ = consumes<CrossingFrame<PCaloHit>>(edm::InputTag(std::string("mix"), std::string("endcapHitsName")));
+  ESHits_Token_ =
+      consumes<CrossingFrame<PCaloHit>>(edm::InputTag(std::string("mix"), std::string("preshowerHitsName")));
+
+  RPCSimHit_Token_ =
+      consumes<edm::PSimHitContainer>(edm::InputTag(std::string("g4SimHits"), std::string("MuonRPCHits")));
   // use value of first digit to determine default output level (inclusive)
   // 0 is none, 1 is basic, 2 is fill output, 3 is gather output
   verbosity %= 10;
-  
+
   // print out Parameter Set information being used
   if (verbosity >= 0) {
-    edm::LogInfo(MsgLoggerCat) 
-      << "\n===============================\n"
-      << "Initialized as EDAnalyzer with parameter values:\n"
-      << "    Name          = " << fName << "\n"
-      << "    Verbosity     = " << verbosity << "\n"
-      << "    Frequency     = " << frequency << "\n"
-      << "    GetProv       = " << getAllProvenances << "\n"
-      << "    PrintProv     = " << printProvenanceInfo << "\n"
-      << "    ECalEBSrc     = " << ECalEBSrc_.label() 
-      << ":" << ECalEBSrc_.instance() << "\n"
-      << "    ECalEESrc     = " << ECalEESrc_.label() 
-      << ":" << ECalEESrc_.instance() << "\n"
-      << "    ECalESSrc     = " << ECalESSrc_.label() 
-      << ":" << ECalESSrc_.instance() << "\n"
-      << "    HCalSrc       = " << HCalSrc_.label() 
-      << ":" << HCalSrc_.instance() << "\n"
-      << "    HCalDigi       = " << HCalDigi_.label() 
-      << ":" << HCalDigi_.instance() << "\n"
-      << "    SiStripSrc    = " << SiStripSrc_.label() 
-      << ":" << SiStripSrc_.instance() << "\n" 
-      << "    SiPixelSrc    = " << SiPxlSrc_.label()
-      << ":" << SiPxlSrc_.instance() << "\n"
-      << "    MuDTSrc       = " << MuDTSrc_.label()
-      << ":" << MuDTSrc_.instance() << "\n"
-      << "    MuCSCStripSrc = " << MuCSCStripSrc_.label()
-      << ":" << MuCSCStripSrc_.instance() << "\n"
-      << "    MuCSCWireSrc  = " << MuCSCWireSrc_.label()
-      << ":" << MuCSCWireSrc_.instance() << "\n"
-      << "    MuRPCSrc      = " << MuRPCSrc_.label()
-      << ":" << MuRPCSrc_.instance() << "\n"
-      << "===============================\n";
+    edm::LogInfo(MsgLoggerCat) << "\n===============================\n"
+                               << "Initialized as EDAnalyzer with parameter values:\n"
+                               << "    Name          = " << fName << "\n"
+                               << "    Verbosity     = " << verbosity << "\n"
+                               << "    Frequency     = " << frequency << "\n"
+                               << "    GetProv       = " << getAllProvenances << "\n"
+                               << "    PrintProv     = " << printProvenanceInfo << "\n"
+                               << "    ECalEBSrc     = " << ECalEBSrc_.label() << ":" << ECalEBSrc_.instance() << "\n"
+                               << "    ECalEESrc     = " << ECalEESrc_.label() << ":" << ECalEESrc_.instance() << "\n"
+                               << "    ECalESSrc     = " << ECalESSrc_.label() << ":" << ECalESSrc_.instance() << "\n"
+                               << "    HCalSrc       = " << HCalSrc_.label() << ":" << HCalSrc_.instance() << "\n"
+                               << "    HCalDigi       = " << HCalDigi_.label() << ":" << HCalDigi_.instance() << "\n"
+                               << "    SiStripSrc    = " << SiStripSrc_.label() << ":" << SiStripSrc_.instance() << "\n"
+                               << "    SiPixelSrc    = " << SiPxlSrc_.label() << ":" << SiPxlSrc_.instance() << "\n"
+                               << "    MuDTSrc       = " << MuDTSrc_.label() << ":" << MuDTSrc_.instance() << "\n"
+                               << "    MuCSCStripSrc = " << MuCSCStripSrc_.label() << ":" << MuCSCStripSrc_.instance()
+                               << "\n"
+                               << "    MuCSCWireSrc  = " << MuCSCWireSrc_.label() << ":" << MuCSCWireSrc_.instance()
+                               << "\n"
+                               << "    MuRPCSrc      = " << MuRPCSrc_.label() << ":" << MuRPCSrc_.instance() << "\n"
+                               << "===============================\n";
   }
-  
+
   // set default constants
   // ECal
-  
+
   ECalbarrelADCtoGeV_ = 0.035;
   ECalendcapADCtoGeV_ = 0.06;
 
-  EcalMGPAGainRatio defaultRatios;  
+  EcalMGPAGainRatio defaultRatios;
   ECalgainConv_[0] = 0.;
   ECalgainConv_[1] = 1.;
-  ECalgainConv_[2] = defaultRatios.gain12Over6() ;
-  ECalgainConv_[3] = ECalgainConv_[2]*(defaultRatios.gain6Over1()) ;
-  
+  ECalgainConv_[2] = defaultRatios.gain12Over6();
+  ECalgainConv_[3] = ECalgainConv_[2] * (defaultRatios.gain6Over1());
+
   if (verbosity >= 0) {
-    edm::LogInfo(MsgLoggerCat) 
-      << "Modified Calorimeter gain constants: g0 = " << ECalgainConv_[0]
-      << ", g1 = " << ECalgainConv_[1] << ", g2 = " << ECalgainConv_[2]
-      << ", g3 = " << ECalgainConv_[3];
+    edm::LogInfo(MsgLoggerCat) << "Modified Calorimeter gain constants: g0 = " << ECalgainConv_[0]
+                               << ", g1 = " << ECalgainConv_[1] << ", g2 = " << ECalgainConv_[2]
+                               << ", g3 = " << ECalgainConv_[3];
   }
 }
- 
+
 GlobalDigisAnalyzer::~GlobalDigisAnalyzer() {}
-  
+
 void GlobalDigisAnalyzer::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, edm::EventSetup const &) {
   // Si Strip
-  std::string SiStripString[19] = {"TECW1", "TECW2", "TECW3", "TECW4", 
-			     "TECW5", "TECW6", "TECW7", "TECW8", 
-			     "TIBL1", "TIBL2", "TIBL3", "TIBL4", 
-			     "TIDW1", "TIDW2", "TIDW3", "TOBL1", 
-			     "TOBL2", "TOBL3", "TOBL4"};
-  for(int i = 0; i<19; ++i) {
-    mehSiStripn[i]=nullptr;
-    mehSiStripADC[i]=nullptr;
-    mehSiStripStrip[i]=nullptr;
+  std::string SiStripString[19] = {"TECW1",
+                                   "TECW2",
+                                   "TECW3",
+                                   "TECW4",
+                                   "TECW5",
+                                   "TECW6",
+                                   "TECW7",
+                                   "TECW8",
+                                   "TIBL1",
+                                   "TIBL2",
+                                   "TIBL3",
+                                   "TIBL4",
+                                   "TIDW1",
+                                   "TIDW2",
+                                   "TIDW3",
+                                   "TOBL1",
+                                   "TOBL2",
+                                   "TOBL3",
+                                   "TOBL4"};
+  for (int i = 0; i < 19; ++i) {
+    mehSiStripn[i] = nullptr;
+    mehSiStripADC[i] = nullptr;
+    mehSiStripStrip[i] = nullptr;
   }
   std::string hcharname, hchartitle;
   iBooker.setCurrentFolder("GlobalDigisV/SiStrips");
-  for(int amend = 0; amend < 19; ++amend) { 
-    hcharname = "hSiStripn_"+SiStripString[amend];
-    hchartitle= SiStripString[amend]+"  Digis";
-    mehSiStripn[amend] = iBooker.book1D(hcharname,hchartitle,5000,0.,10000.);
-    mehSiStripn[amend]->setAxisTitle("Number of Digis",1);
-    mehSiStripn[amend]->setAxisTitle("Count",2);
-    
-    hcharname = "hSiStripADC_"+SiStripString[amend];
-    hchartitle= SiStripString[amend]+" ADC";
-    mehSiStripADC[amend] = iBooker.book1D(hcharname,hchartitle,150,0.0,300.);
-    mehSiStripADC[amend]->setAxisTitle("ADC",1);
-    mehSiStripADC[amend]->setAxisTitle("Count",2);
-    
-    hcharname = "hSiStripStripADC_"+SiStripString[amend];
-    hchartitle= SiStripString[amend]+" Strip";
-    mehSiStripStrip[amend] = iBooker.book1D(hcharname,hchartitle,200,0.0,800.);
-    mehSiStripStrip[amend]->setAxisTitle("Strip Number",1);
-    mehSiStripStrip[amend]->setAxisTitle("Count",2);
+  for (int amend = 0; amend < 19; ++amend) {
+    hcharname = "hSiStripn_" + SiStripString[amend];
+    hchartitle = SiStripString[amend] + "  Digis";
+    mehSiStripn[amend] = iBooker.book1D(hcharname, hchartitle, 5000, 0., 10000.);
+    mehSiStripn[amend]->setAxisTitle("Number of Digis", 1);
+    mehSiStripn[amend]->setAxisTitle("Count", 2);
+
+    hcharname = "hSiStripADC_" + SiStripString[amend];
+    hchartitle = SiStripString[amend] + " ADC";
+    mehSiStripADC[amend] = iBooker.book1D(hcharname, hchartitle, 150, 0.0, 300.);
+    mehSiStripADC[amend]->setAxisTitle("ADC", 1);
+    mehSiStripADC[amend]->setAxisTitle("Count", 2);
+
+    hcharname = "hSiStripStripADC_" + SiStripString[amend];
+    hchartitle = SiStripString[amend] + " Strip";
+    mehSiStripStrip[amend] = iBooker.book1D(hcharname, hchartitle, 200, 0.0, 800.);
+    mehSiStripStrip[amend]->setAxisTitle("Strip Number", 1);
+    mehSiStripStrip[amend]->setAxisTitle("Count", 2);
   }
-  
-  //HCal
-  std::string HCalString[4] = {"HB", "HE", "HO","HF"}; 
-  float calnUpper[4] = {30000.,30000.,30000.,20000.}; 
-  float calnLower[4]={0.,0.,0.,0.}; 
-  float SHEUpper[4]={1.,1.,1.,1.};
-  float SHEvAEEUpper[4] = {5000, 5000, 5000, 5000}; 
-  float SHEvAEELower[4] = {-5000, -5000, -5000, -5000}; 
-  int SHEvAEEnBins[4] = {200,200,200,200};
-  double ProfileUpper[4] = {1.,1.,1.,1.};  
-  
-  for(int i =0; i<4; ++i) {
-    mehHcaln[i]=nullptr;
-    mehHcalAEE[i]=nullptr;
-    mehHcalSHE[i]=nullptr;
-    mehHcalAEESHE[i]=nullptr;
-    mehHcalSHEvAEE[i]=nullptr;
+
+  // HCal
+  std::string HCalString[4] = {"HB", "HE", "HO", "HF"};
+  float calnUpper[4] = {30000., 30000., 30000., 20000.};
+  float calnLower[4] = {0., 0., 0., 0.};
+  float SHEUpper[4] = {1., 1., 1., 1.};
+  float SHEvAEEUpper[4] = {5000, 5000, 5000, 5000};
+  float SHEvAEELower[4] = {-5000, -5000, -5000, -5000};
+  int SHEvAEEnBins[4] = {200, 200, 200, 200};
+  double ProfileUpper[4] = {1., 1., 1., 1.};
+
+  for (int i = 0; i < 4; ++i) {
+    mehHcaln[i] = nullptr;
+    mehHcalAEE[i] = nullptr;
+    mehHcalSHE[i] = nullptr;
+    mehHcalAEESHE[i] = nullptr;
+    mehHcalSHEvAEE[i] = nullptr;
   }
   iBooker.setCurrentFolder("GlobalDigisV/HCals");
-  
-  for(int amend = 0; amend < 4; ++amend) {
-    hcharname = "hHcaln_"+HCalString[amend];
-    hchartitle= HCalString[amend]+"  digis";
-    mehHcaln[amend] = iBooker.book1D(hcharname,hchartitle, 10000, calnLower[amend], 
-			    calnUpper[amend]);
-    mehHcaln[amend]->setAxisTitle("Number of Digis",1);
-    mehHcaln[amend]->setAxisTitle("Count",2);
-
-    hcharname = "hHcalAEE_"+HCalString[amend];
-    hchartitle= HCalString[amend]+"Cal AEE";
-    mehHcalAEE[amend] = iBooker.book1D(hcharname,hchartitle, 60, -10., 50.);
-    mehHcalAEE[amend]->setAxisTitle("Analog Equivalent Energy",1);
-    mehHcalAEE[amend]->setAxisTitle("Count",2);
-
-    hcharname = "hHcalSHE_"+HCalString[amend];
-    hchartitle= HCalString[amend]+"Cal SHE";
-    mehHcalSHE[amend] = iBooker.book1D(hcharname,hchartitle, 1000, 0.0, 
-			      SHEUpper[amend]);
-    mehHcalSHE[amend]->setAxisTitle("Simulated Hit Energy",1);
-    mehHcalSHE[amend]->setAxisTitle("Count",2);
-
-    hcharname = "hHcalAEESHE_"+HCalString[amend];
-    hchartitle= HCalString[amend]+"Cal AEE/SHE";
-    mehHcalAEESHE[amend] = iBooker.book1D(hcharname, hchartitle, SHEvAEEnBins[amend], 
-				 SHEvAEELower[amend], 
-				 SHEvAEEUpper[amend]);
-    mehHcalAEESHE[amend]->setAxisTitle("ADC / SHE",1);
-    mehHcalAEESHE[amend]->setAxisTitle("Count",2);
-    
-    hcharname = "hHcalSHEvAEE_"+HCalString[amend];
-    hchartitle= HCalString[amend]+"Cal SHE vs. AEE";
-    mehHcalSHEvAEE[amend] = iBooker.bookProfile(hcharname,hchartitle, 60, -10., 
-				       50., 100, 0., 
-				       (float)ProfileUpper[amend],"");
-    mehHcalSHEvAEE[amend]->setAxisTitle("AEE / SHE",1);
-    mehHcalSHEvAEE[amend]->setAxisTitle("SHE",2);
 
+  for (int amend = 0; amend < 4; ++amend) {
+    hcharname = "hHcaln_" + HCalString[amend];
+    hchartitle = HCalString[amend] + "  digis";
+    mehHcaln[amend] = iBooker.book1D(hcharname, hchartitle, 10000, calnLower[amend], calnUpper[amend]);
+    mehHcaln[amend]->setAxisTitle("Number of Digis", 1);
+    mehHcaln[amend]->setAxisTitle("Count", 2);
+
+    hcharname = "hHcalAEE_" + HCalString[amend];
+    hchartitle = HCalString[amend] + "Cal AEE";
+    mehHcalAEE[amend] = iBooker.book1D(hcharname, hchartitle, 60, -10., 50.);
+    mehHcalAEE[amend]->setAxisTitle("Analog Equivalent Energy", 1);
+    mehHcalAEE[amend]->setAxisTitle("Count", 2);
+
+    hcharname = "hHcalSHE_" + HCalString[amend];
+    hchartitle = HCalString[amend] + "Cal SHE";
+    mehHcalSHE[amend] = iBooker.book1D(hcharname, hchartitle, 1000, 0.0, SHEUpper[amend]);
+    mehHcalSHE[amend]->setAxisTitle("Simulated Hit Energy", 1);
+    mehHcalSHE[amend]->setAxisTitle("Count", 2);
+
+    hcharname = "hHcalAEESHE_" + HCalString[amend];
+    hchartitle = HCalString[amend] + "Cal AEE/SHE";
+    mehHcalAEESHE[amend] =
+        iBooker.book1D(hcharname, hchartitle, SHEvAEEnBins[amend], SHEvAEELower[amend], SHEvAEEUpper[amend]);
+    mehHcalAEESHE[amend]->setAxisTitle("ADC / SHE", 1);
+    mehHcalAEESHE[amend]->setAxisTitle("Count", 2);
+
+    hcharname = "hHcalSHEvAEE_" + HCalString[amend];
+    hchartitle = HCalString[amend] + "Cal SHE vs. AEE";
+    mehHcalSHEvAEE[amend] =
+        iBooker.bookProfile(hcharname, hchartitle, 60, -10., 50., 100, 0., (float)ProfileUpper[amend], "");
+    mehHcalSHEvAEE[amend]->setAxisTitle("AEE / SHE", 1);
+    mehHcalSHEvAEE[amend]->setAxisTitle("SHE", 2);
   }
-  
-  //Ecal
-  std::string ECalString[2] = {"EB","EE"}; 
-  
-  for(int i =0; i<2; ++i) {
-    mehEcaln[i]=nullptr;
-    mehEcalAEE[i]=nullptr;
-    mehEcalSHE[i]=nullptr;
-    mehEcalMaxPos[i]=nullptr;
-    mehEcalMultvAEE[i]=nullptr;
-    mehEcalSHEvAEESHE[i]=nullptr;
+
+  // Ecal
+  std::string ECalString[2] = {"EB", "EE"};
+
+  for (int i = 0; i < 2; ++i) {
+    mehEcaln[i] = nullptr;
+    mehEcalAEE[i] = nullptr;
+    mehEcalSHE[i] = nullptr;
+    mehEcalMaxPos[i] = nullptr;
+    mehEcalMultvAEE[i] = nullptr;
+    mehEcalSHEvAEESHE[i] = nullptr;
   }
   iBooker.setCurrentFolder("GlobalDigisV/ECals");
-  
-  for(int amend = 0; amend < 2; ++amend) {
-    hcharname = "hEcaln_"+ECalString[amend];
-    hchartitle= ECalString[amend]+"  digis";
-    mehEcaln[amend] = iBooker.book1D(hcharname,hchartitle, 3000, 0., 40000.);
-    mehEcaln[amend]->setAxisTitle("Number of Digis",1);
-    mehEcaln[amend]->setAxisTitle("Count",2);
-
-    hcharname = "hEcalAEE_"+ECalString[amend];
-    hchartitle= ECalString[amend]+"Cal AEE";
-    mehEcalAEE[amend] = iBooker.book1D(hcharname,hchartitle, 1000, 0., 100.);
-    mehEcalAEE[amend]->setAxisTitle("Analog Equivalent Energy",1);
-    mehEcalAEE[amend]->setAxisTitle("Count",2);
-
-    hcharname = "hEcalSHE_"+ECalString[amend];
-    hchartitle= ECalString[amend]+"Cal SHE";
-    mehEcalSHE[amend] = iBooker.book1D(hcharname,hchartitle, 500, 0., 50.);
-    mehEcalSHE[amend]->setAxisTitle("Simulated Hit Energy",1);
-    mehEcalSHE[amend]->setAxisTitle("Count",2);
-
-    hcharname = "hEcalMaxPos_"+ECalString[amend];
-    hchartitle= ECalString[amend]+"Cal MaxPos";
-    mehEcalMaxPos[amend] = iBooker.book1D(hcharname,hchartitle,10, 0., 10.);
-    mehEcalMaxPos[amend]->setAxisTitle("Maximum Position",1);
-    mehEcalMaxPos[amend]->setAxisTitle("Count",2);
-    
-    hcharname = "hEcalSHEvAEESHE_"+ECalString[amend];
-    hchartitle= ECalString[amend]+"Cal SHE vs. AEE/SHE";
-    mehEcalSHEvAEESHE[amend] = iBooker.bookProfile(hcharname,hchartitle,1000, 0., 100., 
-					  500, 0., 50.,"");
-    mehEcalSHEvAEESHE[amend]->setAxisTitle("AEE / SHE",1);
-    mehEcalSHEvAEESHE[amend]->setAxisTitle("SHE",2);
-
-    hcharname = "hEcalMultvAEE_"+ECalString[amend];
-    hchartitle= ECalString[amend]+"Cal Multi vs. AEE";
-    mehEcalMultvAEE[amend] = iBooker.bookProfile(hcharname,hchartitle, 1000, 0., 100., 
-					4000, 0., 40000.,"");
-    mehEcalMultvAEE[amend]->setAxisTitle("Analog Equivalent Energy",1);
-    mehEcalMultvAEE[amend]->setAxisTitle("Number of Digis",2);      
+
+  for (int amend = 0; amend < 2; ++amend) {
+    hcharname = "hEcaln_" + ECalString[amend];
+    hchartitle = ECalString[amend] + "  digis";
+    mehEcaln[amend] = iBooker.book1D(hcharname, hchartitle, 3000, 0., 40000.);
+    mehEcaln[amend]->setAxisTitle("Number of Digis", 1);
+    mehEcaln[amend]->setAxisTitle("Count", 2);
+
+    hcharname = "hEcalAEE_" + ECalString[amend];
+    hchartitle = ECalString[amend] + "Cal AEE";
+    mehEcalAEE[amend] = iBooker.book1D(hcharname, hchartitle, 1000, 0., 100.);
+    mehEcalAEE[amend]->setAxisTitle("Analog Equivalent Energy", 1);
+    mehEcalAEE[amend]->setAxisTitle("Count", 2);
+
+    hcharname = "hEcalSHE_" + ECalString[amend];
+    hchartitle = ECalString[amend] + "Cal SHE";
+    mehEcalSHE[amend] = iBooker.book1D(hcharname, hchartitle, 500, 0., 50.);
+    mehEcalSHE[amend]->setAxisTitle("Simulated Hit Energy", 1);
+    mehEcalSHE[amend]->setAxisTitle("Count", 2);
+
+    hcharname = "hEcalMaxPos_" + ECalString[amend];
+    hchartitle = ECalString[amend] + "Cal MaxPos";
+    mehEcalMaxPos[amend] = iBooker.book1D(hcharname, hchartitle, 10, 0., 10.);
+    mehEcalMaxPos[amend]->setAxisTitle("Maximum Position", 1);
+    mehEcalMaxPos[amend]->setAxisTitle("Count", 2);
+
+    hcharname = "hEcalSHEvAEESHE_" + ECalString[amend];
+    hchartitle = ECalString[amend] + "Cal SHE vs. AEE/SHE";
+    mehEcalSHEvAEESHE[amend] = iBooker.bookProfile(hcharname, hchartitle, 1000, 0., 100., 500, 0., 50., "");
+    mehEcalSHEvAEESHE[amend]->setAxisTitle("AEE / SHE", 1);
+    mehEcalSHEvAEESHE[amend]->setAxisTitle("SHE", 2);
+
+    hcharname = "hEcalMultvAEE_" + ECalString[amend];
+    hchartitle = ECalString[amend] + "Cal Multi vs. AEE";
+    mehEcalMultvAEE[amend] = iBooker.bookProfile(hcharname, hchartitle, 1000, 0., 100., 4000, 0., 40000., "");
+    mehEcalMultvAEE[amend]->setAxisTitle("Analog Equivalent Energy", 1);
+    mehEcalMultvAEE[amend]->setAxisTitle("Number of Digis", 2);
   }
   mehEScaln = nullptr;
 
   hcharname = "hEcaln_ES";
-  hchartitle= "ESCAL  digis";
-  mehEScaln = iBooker.book1D(hcharname,hchartitle, 1000, 0., 5000.);
-  mehEScaln->setAxisTitle("Number of Digis",1);
-  mehEScaln->setAxisTitle("Count",2);
+  hchartitle = "ESCAL  digis";
+  mehEScaln = iBooker.book1D(hcharname, hchartitle, 1000, 0., 5000.);
+  mehEScaln->setAxisTitle("Number of Digis", 1);
+  mehEScaln->setAxisTitle("Count", 2);
 
   std::string ADCNumber[3] = {"0", "1", "2"};
-  for(int i =0; i<3; ++i) {
+  for (int i = 0; i < 3; ++i) {
     mehEScalADC[i] = nullptr;
-    hcharname = "hEcalADC"+ADCNumber[i]+"_ES";
-    hchartitle= "ESCAL  ADC"+ADCNumber[i];
-    mehEScalADC[i] = iBooker.book1D(hcharname,hchartitle, 1500, 0., 1500.);
-    mehEScalADC[i]->setAxisTitle("ADC"+ADCNumber[i],1);
-    mehEScalADC[i]->setAxisTitle("Count",2);
+    hcharname = "hEcalADC" + ADCNumber[i] + "_ES";
+    hchartitle = "ESCAL  ADC" + ADCNumber[i];
+    mehEScalADC[i] = iBooker.book1D(hcharname, hchartitle, 1500, 0., 1500.);
+    mehEScalADC[i]->setAxisTitle("ADC" + ADCNumber[i], 1);
+    mehEScalADC[i]->setAxisTitle("Count", 2);
   }
-  
-  //Si Pixels ***DONE***  
-  std::string SiPixelString[7] = {"BRL1", "BRL2", "BRL3", "FWD1n", "FWD1p", 
-			    "FWD2n", "FWD2p"};
-  for(int j =0; j<7; ++j) {
-    mehSiPixeln[j]=nullptr;
-    mehSiPixelADC[j]=nullptr;
-    mehSiPixelRow[j]=nullptr;
-    mehSiPixelCol[j]=nullptr;
+
+  // Si Pixels ***DONE***
+  std::string SiPixelString[7] = {"BRL1", "BRL2", "BRL3", "FWD1n", "FWD1p", "FWD2n", "FWD2p"};
+  for (int j = 0; j < 7; ++j) {
+    mehSiPixeln[j] = nullptr;
+    mehSiPixelADC[j] = nullptr;
+    mehSiPixelRow[j] = nullptr;
+    mehSiPixelCol[j] = nullptr;
   }
-  
+
   iBooker.setCurrentFolder("GlobalDigisV/SiPixels");
-  for(int amend = 0; amend < 7; ++amend) {
-    hcharname = "hSiPixeln_"+SiPixelString[amend];
-    hchartitle= SiPixelString[amend]+" Digis";
-    if(amend<3) mehSiPixeln[amend] = iBooker.book1D(hcharname,hchartitle,500,0.,1000.);
-    else mehSiPixeln[amend] = iBooker.book1D(hcharname,hchartitle,500,0.,1000.);
-    mehSiPixeln[amend]->setAxisTitle("Number of Digis",1);
-    mehSiPixeln[amend]->setAxisTitle("Count",2);
-    
-    hcharname = "hSiPixelADC_"+SiPixelString[amend];
-    hchartitle= SiPixelString[amend]+" ADC";
-    mehSiPixelADC[amend] = iBooker.book1D(hcharname,hchartitle,150,0.0,300.);
-    mehSiPixelADC[amend]->setAxisTitle("ADC",1);
-    mehSiPixelADC[amend]->setAxisTitle("Count",2);
-
-    hcharname = "hSiPixelRow_"+SiPixelString[amend];
-    hchartitle= SiPixelString[amend]+" Row";
-    mehSiPixelRow[amend] = iBooker.book1D(hcharname,hchartitle,100,0.0,100.);
-    mehSiPixelRow[amend]->setAxisTitle("Row Number",1);
-    mehSiPixelRow[amend]->setAxisTitle("Count",2);
-
-    hcharname = "hSiPixelColumn_"+SiPixelString[amend];
-    hchartitle= SiPixelString[amend]+" Column";
-    mehSiPixelCol[amend] = iBooker.book1D(hcharname,hchartitle,200,0.0,500.);
-    mehSiPixelCol[amend]->setAxisTitle("Column Number",1);
-    mehSiPixelCol[amend]->setAxisTitle("Count",2);
+  for (int amend = 0; amend < 7; ++amend) {
+    hcharname = "hSiPixeln_" + SiPixelString[amend];
+    hchartitle = SiPixelString[amend] + " Digis";
+    if (amend < 3)
+      mehSiPixeln[amend] = iBooker.book1D(hcharname, hchartitle, 500, 0., 1000.);
+    else
+      mehSiPixeln[amend] = iBooker.book1D(hcharname, hchartitle, 500, 0., 1000.);
+    mehSiPixeln[amend]->setAxisTitle("Number of Digis", 1);
+    mehSiPixeln[amend]->setAxisTitle("Count", 2);
+
+    hcharname = "hSiPixelADC_" + SiPixelString[amend];
+    hchartitle = SiPixelString[amend] + " ADC";
+    mehSiPixelADC[amend] = iBooker.book1D(hcharname, hchartitle, 150, 0.0, 300.);
+    mehSiPixelADC[amend]->setAxisTitle("ADC", 1);
+    mehSiPixelADC[amend]->setAxisTitle("Count", 2);
+
+    hcharname = "hSiPixelRow_" + SiPixelString[amend];
+    hchartitle = SiPixelString[amend] + " Row";
+    mehSiPixelRow[amend] = iBooker.book1D(hcharname, hchartitle, 100, 0.0, 100.);
+    mehSiPixelRow[amend]->setAxisTitle("Row Number", 1);
+    mehSiPixelRow[amend]->setAxisTitle("Count", 2);
+
+    hcharname = "hSiPixelColumn_" + SiPixelString[amend];
+    hchartitle = SiPixelString[amend] + " Column";
+    mehSiPixelCol[amend] = iBooker.book1D(hcharname, hchartitle, 200, 0.0, 500.);
+    mehSiPixelCol[amend]->setAxisTitle("Column Number", 1);
+    mehSiPixelCol[amend]->setAxisTitle("Count", 2);
   }
 
-  //Muons
+  // Muons
   iBooker.setCurrentFolder("GlobalDigisV/Muons");
 
-  //DT
+  // DT
   std::string MuonString[4] = {"MB1", "MB2", "MB3", "MB4"};
-  
-  for(int i =0; i < 4; ++i) {
+
+  for (int i = 0; i < 4; ++i) {
     mehDtMuonn[i] = nullptr;
     mehDtMuonLayer[i] = nullptr;
     mehDtMuonTime[i] = nullptr;
     mehDtMuonTimevLayer[i] = nullptr;
   }
-  
-  for(int j = 0; j < 4; ++j) {
-    hcharname = "hDtMuonn_"+MuonString[j];
-    hchartitle= MuonString[j]+"  digis";
-    mehDtMuonn[j] = iBooker.book1D(hcharname,hchartitle,250, 0., 500.);
-    mehDtMuonn[j]->setAxisTitle("Number of Digis",1);
-    mehDtMuonn[j]->setAxisTitle("Count",2);
-
-    hcharname = "hDtLayer_"+MuonString[j];
-    hchartitle= MuonString[j]+"  Layer";
-    mehDtMuonLayer[j] = iBooker.book1D(hcharname,hchartitle,12, 1., 13.);
-    mehDtMuonLayer[j]->setAxisTitle("4 * (SuperLayer - 1) + Layer",1);
-    mehDtMuonLayer[j]->setAxisTitle("Count",2);
-
-    hcharname = "hDtMuonTime_"+MuonString[j];
-    hchartitle= MuonString[j]+"  Time";
-    mehDtMuonTime[j] = iBooker.book1D(hcharname,hchartitle,300, 400., 1000.);
-    mehDtMuonTime[j]->setAxisTitle("Time",1);
-    mehDtMuonTime[j]->setAxisTitle("Count",2);
-
-    hcharname = "hDtMuonTimevLayer_"+MuonString[j];
-    hchartitle= MuonString[j]+"  Time vs. Layer";
-    mehDtMuonTimevLayer[j] = iBooker.bookProfile(hcharname,hchartitle,12, 1., 13., 300, 
-					400., 1000.,"");
-    mehDtMuonTimevLayer[j]->setAxisTitle("4 * (SuperLayer - 1) + Layer",1);
-    mehDtMuonTimevLayer[j]->setAxisTitle("Time",2);
+
+  for (int j = 0; j < 4; ++j) {
+    hcharname = "hDtMuonn_" + MuonString[j];
+    hchartitle = MuonString[j] + "  digis";
+    mehDtMuonn[j] = iBooker.book1D(hcharname, hchartitle, 250, 0., 500.);
+    mehDtMuonn[j]->setAxisTitle("Number of Digis", 1);
+    mehDtMuonn[j]->setAxisTitle("Count", 2);
+
+    hcharname = "hDtLayer_" + MuonString[j];
+    hchartitle = MuonString[j] + "  Layer";
+    mehDtMuonLayer[j] = iBooker.book1D(hcharname, hchartitle, 12, 1., 13.);
+    mehDtMuonLayer[j]->setAxisTitle("4 * (SuperLayer - 1) + Layer", 1);
+    mehDtMuonLayer[j]->setAxisTitle("Count", 2);
+
+    hcharname = "hDtMuonTime_" + MuonString[j];
+    hchartitle = MuonString[j] + "  Time";
+    mehDtMuonTime[j] = iBooker.book1D(hcharname, hchartitle, 300, 400., 1000.);
+    mehDtMuonTime[j]->setAxisTitle("Time", 1);
+    mehDtMuonTime[j]->setAxisTitle("Count", 2);
+
+    hcharname = "hDtMuonTimevLayer_" + MuonString[j];
+    hchartitle = MuonString[j] + "  Time vs. Layer";
+    mehDtMuonTimevLayer[j] = iBooker.bookProfile(hcharname, hchartitle, 12, 1., 13., 300, 400., 1000., "");
+    mehDtMuonTimevLayer[j]->setAxisTitle("4 * (SuperLayer - 1) + Layer", 1);
+    mehDtMuonTimevLayer[j]->setAxisTitle("Time", 2);
   }
 
-  //CSC 
+  // CSC
   mehCSCStripn = nullptr;
   hcharname = "hCSCStripn";
   hchartitle = "CSC Strip digis";
-  mehCSCStripn = iBooker.book1D(hcharname,hchartitle,250, 0., 500.);
-  mehCSCStripn->setAxisTitle("Number of Digis",1);
-  mehCSCStripn->setAxisTitle("Count",2);
-  
+  mehCSCStripn = iBooker.book1D(hcharname, hchartitle, 250, 0., 500.);
+  mehCSCStripn->setAxisTitle("Number of Digis", 1);
+  mehCSCStripn->setAxisTitle("Count", 2);
+
   mehCSCStripADC = nullptr;
   hcharname = "hCSCStripADC";
   hchartitle = "CSC Strip ADC";
-  mehCSCStripADC = iBooker.book1D(hcharname,hchartitle, 110, 0., 1100.);
-  mehCSCStripADC->setAxisTitle("ADC",1);
-  mehCSCStripADC->setAxisTitle("Count",2);
-  
+  mehCSCStripADC = iBooker.book1D(hcharname, hchartitle, 110, 0., 1100.);
+  mehCSCStripADC->setAxisTitle("ADC", 1);
+  mehCSCStripADC->setAxisTitle("Count", 2);
+
   mehCSCWiren = nullptr;
   hcharname = "hCSCWiren";
   hchartitle = "CSC Wire digis";
-  mehCSCWiren = iBooker.book1D(hcharname,hchartitle,250, 0., 500.);
-  mehCSCWiren->setAxisTitle("Number of Digis",1);
-  mehCSCWiren->setAxisTitle("Count",2);
-  
+  mehCSCWiren = iBooker.book1D(hcharname, hchartitle, 250, 0., 500.);
+  mehCSCWiren->setAxisTitle("Number of Digis", 1);
+  mehCSCWiren->setAxisTitle("Count", 2);
+
   mehCSCWireTime = nullptr;
   hcharname = "hCSCWireTime";
   hchartitle = "CSC Wire Time";
-  mehCSCWireTime = iBooker.book1D(hcharname,hchartitle,10, 0., 10.);
-  mehCSCWireTime->setAxisTitle("Time",1);
-  mehCSCWireTime->setAxisTitle("Count",2);
-  
-  // RPC 
+  mehCSCWireTime = iBooker.book1D(hcharname, hchartitle, 10, 0., 10.);
+  mehCSCWireTime->setAxisTitle("Time", 1);
+  mehCSCWireTime->setAxisTitle("Count", 2);
+
+  // RPC
   mehRPCMuonn = nullptr;
   hcharname = "hRPCMuonn";
   hchartitle = "RPC digis";
-  mehCSCStripn = iBooker.book1D(hcharname,hchartitle,250, 0., 500.);
-  mehCSCStripn->setAxisTitle("Number of Digis",1);
-  mehCSCStripn->setAxisTitle("Count",2);
+  mehCSCStripn = iBooker.book1D(hcharname, hchartitle, 250, 0., 500.);
+  mehCSCStripn->setAxisTitle("Number of Digis", 1);
+  mehCSCStripn->setAxisTitle("Count", 2);
 
   std::string MuonRPCString[5] = {"Wmin2", "Wmin1", "W0", "Wpu1", "Wpu2"};
-  for(int i =0; i < 5; ++i) {
+  for (int i = 0; i < 5; ++i) {
     mehRPCRes[i] = nullptr;
   }
 
-  for(int j = 0; j < 5; ++j) {    
-    hcharname = "hRPCRes_"+MuonRPCString[j];
-    hchartitle= MuonRPCString[j]+"  Digi - Sim";   
-    mehRPCRes[j] = iBooker.book1D(hcharname,hchartitle,200, -8., 8.);
-    mehRPCRes[j]->setAxisTitle("Digi - Sim center of strip x",1);
-    mehRPCRes[j]->setAxisTitle("Count",2);
+  for (int j = 0; j < 5; ++j) {
+    hcharname = "hRPCRes_" + MuonRPCString[j];
+    hchartitle = MuonRPCString[j] + "  Digi - Sim";
+    mehRPCRes[j] = iBooker.book1D(hcharname, hchartitle, 200, -8., 8.);
+    mehRPCRes[j]->setAxisTitle("Digi - Sim center of strip x", 1);
+    mehRPCRes[j]->setAxisTitle("Count", 2);
   }
 }
 
-void GlobalDigisAnalyzer::analyze(const edm::Event& iEvent, 
-				  const edm::EventSetup& iSetup)
-{
+void GlobalDigisAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalDigisAnalyzer_analyze";
-  
+
   // keep track of number of events processed
   ++count;
 
-
-  
   // THIS BLOCK MIGRATED HERE FROM beginJob:
   // setup calorimeter constants from service
   edm::ESHandle<EcalADCToGeVConstant> pAgc;
   iSetup.get<EcalADCToGeVConstantRcd>().get(pAgc);
-  const EcalADCToGeVConstant* agc = pAgc.product();
+  const EcalADCToGeVConstant *agc = pAgc.product();
   ECalbarrelADCtoGeV_ = agc->getEBValue();
   ECalendcapADCtoGeV_ = agc->getEEValue();
   if (verbosity >= 0) {
-    edm::LogInfo(MsgLoggerCat)
-      << "Modified Calorimeter ADCtoGeV constants: barrel = " 
-      << ECalbarrelADCtoGeV_ << ", endcap = " << ECalendcapADCtoGeV_;
+    edm::LogInfo(MsgLoggerCat) << "Modified Calorimeter ADCtoGeV constants: barrel = " << ECalbarrelADCtoGeV_
+                               << ", endcap = " << ECalendcapADCtoGeV_;
   }
-  
-
 
   // get event id information
   edm::RunNumber_t nrun = iEvent.id().run();
   edm::EventNumber_t nevt = iEvent.id().event();
-  
+
   if (verbosity > 0) {
-    edm::LogInfo(MsgLoggerCat)
-      << "Processing run " << nrun << ", event " << nevt
-      << " (" << count << " events total)";
+    edm::LogInfo(MsgLoggerCat) << "Processing run " << nrun << ", event " << nevt << " (" << count << " events total)";
   } else if (verbosity == 0) {
-    if (nevt%frequency == 0 || nevt == 1) {
-      edm::LogInfo(MsgLoggerCat)
-	<< "Processing run " << nrun << ", event " << nevt
-	<< " (" << count << " events total)";
+    if (nevt % frequency == 0 || nevt == 1) {
+      edm::LogInfo(MsgLoggerCat) << "Processing run " << nrun << ", event " << nevt << " (" << count
+                                 << " events total)";
     }
   }
-    
+
   // look at information available in the event
   if (getAllProvenances) {
-    
-    std::vector<const edm::StableProvenance*> AllProv;
+    std::vector<const edm::StableProvenance *> AllProv;
     iEvent.getAllStableProvenance(AllProv);
-    
+
     if (verbosity >= 0)
-      edm::LogInfo(MsgLoggerCat)
-	<< "Number of Provenances = " << AllProv.size();
-    
+      edm::LogInfo(MsgLoggerCat) << "Number of Provenances = " << AllProv.size();
+
     if (printProvenanceInfo && (verbosity >= 0)) {
-      TString eventout("\nProvenance info:\n");      
-      
+      TString eventout("\nProvenance info:\n");
+
       for (unsigned int i = 0; i < AllProv.size(); ++i) {
-	eventout += "\n       ******************************";
-	eventout += "\n       Module       : ";
-	eventout += AllProv[i]->moduleLabel();
-	eventout += "\n       ProductID    : ";
-	eventout += AllProv[i]->productID().id();
-	eventout += "\n       ClassName    : ";
-	eventout += AllProv[i]->className();
-	eventout += "\n       InstanceName : ";
-	eventout += AllProv[i]->productInstanceName();
-	eventout += "\n       BranchName   : ";
-	eventout += AllProv[i]->branchName();
+        eventout += "\n       ******************************";
+        eventout += "\n       Module       : ";
+        eventout += AllProv[i]->moduleLabel();
+        eventout += "\n       ProductID    : ";
+        eventout += AllProv[i]->productID().id();
+        eventout += "\n       ClassName    : ";
+        eventout += AllProv[i]->className();
+        eventout += "\n       InstanceName : ";
+        eventout += AllProv[i]->productInstanceName();
+        eventout += "\n       BranchName   : ";
+        eventout += AllProv[i]->branchName();
       }
       eventout += "\n       ******************************\n";
       edm::LogInfo(MsgLoggerCat) << eventout << "\n";
@@ -489,519 +478,477 @@ void GlobalDigisAnalyzer::analyze(const edm::Event& iEvent,
     }
     getAllProvenances = false;
   }
-  
+
   // call fill functions
   // gather Ecal information from event
-  fillECal(iEvent,  iSetup);
+  fillECal(iEvent, iSetup);
   // gather Hcal information from event
   fillHCal(iEvent, iSetup);
   // gather Track information from event
-  fillTrk(iEvent,  iSetup);
+  fillTrk(iEvent, iSetup);
   // gather Muon information from event
-  fillMuon(iEvent,  iSetup);
-  
+  fillMuon(iEvent, iSetup);
+
   if (verbosity > 0)
-    edm::LogInfo (MsgLoggerCat)
-      << "Done gathering data from event.";
-  
+    edm::LogInfo(MsgLoggerCat) << "Done gathering data from event.";
+
   if (verbosity > 2)
-    edm::LogInfo (MsgLoggerCat)
-      << "Saving event contents:";
-    
+    edm::LogInfo(MsgLoggerCat) << "Saving event contents:";
+
   return;
 }
 
-void GlobalDigisAnalyzer::fillECal(const edm::Event& iEvent, 
-				   const edm::EventSetup& iSetup)
-{
+void GlobalDigisAnalyzer::fillECal(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalDigisAnalyzer_fillECal";
-  
+
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
-  
+    eventout = "\nGathering info:";
+
   // extract crossing frame from event
-  edm::Handle<CrossingFrame<PCaloHit> > crossingFrame;
-  
+  edm::Handle<CrossingFrame<PCaloHit>> crossingFrame;
+
   ////////////////////////
-  //extract EB information
+  // extract EB information
   ////////////////////////
   bool isBarrel = true;
-  edm::Handle<EBDigiCollection> EcalDigiEB;  
+  edm::Handle<EBDigiCollection> EcalDigiEB;
   iEvent.getByToken(ECalEBSrc_Token_, EcalDigiEB);
   bool validDigiEB = true;
   if (!EcalDigiEB.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find EcalDigiEB in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find EcalDigiEB in event!";
     validDigiEB = false;
-  }  
+  }
   if (validDigiEB) {
-    if ( EcalDigiEB->empty()) isBarrel = false;
-    
+    if (EcalDigiEB->empty())
+      isBarrel = false;
+
     if (isBarrel) {
-      
       // loop over simhits
       MapType ebSimMap;
-      iEvent.getByToken(EBHits_Token_,crossingFrame);
+      iEvent.getByToken(EBHits_Token_, crossingFrame);
       bool validXFrame = true;
       if (!crossingFrame.isValid()) {
-	LogDebug(MsgLoggerCat)
-	  << "Unable to find cal barrel crossingFrame in event!";
-	validXFrame = false;
+        LogDebug(MsgLoggerCat) << "Unable to find cal barrel crossingFrame in event!";
+        validXFrame = false;
       }
       if (validXFrame) {
-	const MixCollection<PCaloHit> barrelHits(crossingFrame.product());
-	
-	// keep track of sum of simhit energy in each crystal
-	for ( auto const & iHit : barrelHits ) {
-	  
-	  EBDetId ebid = EBDetId(iHit.id());
-	  
-	  uint32_t crystid = ebid.rawId();
-	  ebSimMap[crystid] += iHit.energy();
-	}
+        const MixCollection<PCaloHit> barrelHits(crossingFrame.product());
+
+        // keep track of sum of simhit energy in each crystal
+        for (auto const &iHit : barrelHits) {
+          EBDetId ebid = EBDetId(iHit.id());
+
+          uint32_t crystid = ebid.rawId();
+          ebSimMap[crystid] += iHit.energy();
+        }
       }
 
       // loop over digis
       const EBDigiCollection *barrelDigi = EcalDigiEB.product();
-      
+
       std::vector<double> ebAnalogSignal;
       std::vector<double> ebADCCounts;
       std::vector<double> ebADCGains;
       ebAnalogSignal.reserve(EBDataFrame::MAXSAMPLES);
       ebADCCounts.reserve(EBDataFrame::MAXSAMPLES);
       ebADCGains.reserve(EBDataFrame::MAXSAMPLES);
-      
+
       int i = 0;
-      for (unsigned int digis=0; digis<EcalDigiEB->size(); ++digis) {
-	
-	++i;
-	
-	EBDataFrame ebdf = (*barrelDigi)[digis];
-	int nrSamples = ebdf.size();
-	
-	EBDetId ebid = ebdf.id () ;
-	
-	double Emax = 0;
-	int Pmax = 0;
-	double pedestalPreSample = 0.;
-	double pedestalPreSampleAnalog = 0.;
-	
-	for (int sample = 0 ; sample < nrSamples; ++sample) {
-	  ebAnalogSignal[sample] = 0.;
-	  ebADCCounts[sample] = 0.;
-	  ebADCGains[sample] = -1.;
-	}
-	
-	// calculate maximum energy and pedestal
-	for (int sample = 0 ; sample < nrSamples; ++sample) {
-	  
-	  EcalMGPASample thisSample = ebdf[sample];
-	  ebADCCounts[sample] = (thisSample.adc());
-	  ebADCGains[sample]  = (thisSample.gainId());
-	  ebAnalogSignal[sample] = 
-	    (ebADCCounts[sample] * ECalgainConv_[(int)ebADCGains[sample]]
-	     * ECalbarrelADCtoGeV_);
-	  if (Emax < ebAnalogSignal[sample]) {
-	    Emax = ebAnalogSignal[sample];
-	    Pmax = sample;
-	  }
-	  if ( sample < 3 ) {
-	    pedestalPreSample += ebADCCounts[sample] ;
-	    pedestalPreSampleAnalog += 
-	      ebADCCounts[sample] * ECalgainConv_[(int)ebADCGains[sample]]
-	      * ECalbarrelADCtoGeV_ ;
-	  }
-	  
-	}
-	pedestalPreSample /= 3. ; 
-	pedestalPreSampleAnalog /= 3. ; 
-	
-	// calculate pedestal subtracted digi energy in the crystal
-	double Erec = Emax - pedestalPreSampleAnalog
-	  * ECalgainConv_[(int)ebADCGains[Pmax]];
-	
-	// gather necessary information
-	mehEcalMaxPos[0]->Fill(Pmax);
-	mehEcalSHE[0]->Fill(ebSimMap[ebid.rawId()]);
-	mehEcalAEE[0]->Fill(Erec);
-	//Adding protection against FPE
-	if (ebSimMap[ebid.rawId()]!=0) {
-	  mehEcalSHEvAEESHE[0]->Fill(Erec/ebSimMap[ebid.rawId()],
-				     ebSimMap[ebid.rawId()]);
-	}
-	//else {
-	//  std::cout<<"Would have been an FPE! with ebSimMap[ebid.rawId()]==0\n";
-	//}
-
-	mehEcalMultvAEE[0]->Fill(Pmax,(float)i);
+      for (unsigned int digis = 0; digis < EcalDigiEB->size(); ++digis) {
+        ++i;
+
+        EBDataFrame ebdf = (*barrelDigi)[digis];
+        int nrSamples = ebdf.size();
+
+        EBDetId ebid = ebdf.id();
+
+        double Emax = 0;
+        int Pmax = 0;
+        double pedestalPreSample = 0.;
+        double pedestalPreSampleAnalog = 0.;
+
+        for (int sample = 0; sample < nrSamples; ++sample) {
+          ebAnalogSignal[sample] = 0.;
+          ebADCCounts[sample] = 0.;
+          ebADCGains[sample] = -1.;
+        }
+
+        // calculate maximum energy and pedestal
+        for (int sample = 0; sample < nrSamples; ++sample) {
+          EcalMGPASample thisSample = ebdf[sample];
+          ebADCCounts[sample] = (thisSample.adc());
+          ebADCGains[sample] = (thisSample.gainId());
+          ebAnalogSignal[sample] = (ebADCCounts[sample] * ECalgainConv_[(int)ebADCGains[sample]] * ECalbarrelADCtoGeV_);
+          if (Emax < ebAnalogSignal[sample]) {
+            Emax = ebAnalogSignal[sample];
+            Pmax = sample;
+          }
+          if (sample < 3) {
+            pedestalPreSample += ebADCCounts[sample];
+            pedestalPreSampleAnalog +=
+                ebADCCounts[sample] * ECalgainConv_[(int)ebADCGains[sample]] * ECalbarrelADCtoGeV_;
+          }
+        }
+        pedestalPreSample /= 3.;
+        pedestalPreSampleAnalog /= 3.;
+
+        // calculate pedestal subtracted digi energy in the crystal
+        double Erec = Emax - pedestalPreSampleAnalog * ECalgainConv_[(int)ebADCGains[Pmax]];
+
+        // gather necessary information
+        mehEcalMaxPos[0]->Fill(Pmax);
+        mehEcalSHE[0]->Fill(ebSimMap[ebid.rawId()]);
+        mehEcalAEE[0]->Fill(Erec);
+        // Adding protection against FPE
+        if (ebSimMap[ebid.rawId()] != 0) {
+          mehEcalSHEvAEESHE[0]->Fill(Erec / ebSimMap[ebid.rawId()], ebSimMap[ebid.rawId()]);
+        }
+        // else {
+        //  std::cout<<"Would have been an FPE! with
+        //  ebSimMap[ebid.rawId()]==0\n";
+        //}
+
+        mehEcalMultvAEE[0]->Fill(Pmax, (float)i);
       }
-      
+
       if (verbosity > 1) {
-	eventout += "\n          Number of EBDigis collected:.............. ";
-	eventout += i;
+        eventout += "\n          Number of EBDigis collected:.............. ";
+        eventout += i;
       }
       mehEcaln[0]->Fill((float)i);
     }
   }
-  
+
   /////////////////////////
-  //extract EE information
+  // extract EE information
   ////////////////////////
   bool isEndCap = true;
-  edm::Handle<EEDigiCollection> EcalDigiEE;  
+  edm::Handle<EEDigiCollection> EcalDigiEE;
   iEvent.getByToken(ECalEESrc_Token_, EcalDigiEE);
   bool validDigiEE = true;
   if (!EcalDigiEE.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find EcalDigiEE in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find EcalDigiEE in event!";
     validDigiEE = false;
-  }  
+  }
   if (validDigiEE) {
-    if (EcalDigiEE->empty()) isEndCap = false;
-    
+    if (EcalDigiEE->empty())
+      isEndCap = false;
+
     if (isEndCap) {
-      
       // loop over simhits
       MapType eeSimMap;
-      iEvent.getByToken(EEHits_Token_,crossingFrame);
+      iEvent.getByToken(EEHits_Token_, crossingFrame);
       bool validXFrame = true;
       if (!crossingFrame.isValid()) {
-	LogDebug(MsgLoggerCat)
-	  << "Unable to find cal endcap crossingFrame in event!";
-	validXFrame = false;
+        LogDebug(MsgLoggerCat) << "Unable to find cal endcap crossingFrame in event!";
+        validXFrame = false;
       }
       if (validXFrame) {
-	const MixCollection<PCaloHit> endcapHits(crossingFrame.product());
-	
-	// keep track of sum of simhit energy in each crystal
-	for ( auto const & iHit : endcapHits ) {
-	  
-	  EEDetId eeid = EEDetId(iHit.id());
-	  
-	  uint32_t crystid = eeid.rawId();
-	  eeSimMap[crystid] += iHit.energy();
-	}
+        const MixCollection<PCaloHit> endcapHits(crossingFrame.product());
+
+        // keep track of sum of simhit energy in each crystal
+        for (auto const &iHit : endcapHits) {
+          EEDetId eeid = EEDetId(iHit.id());
+
+          uint32_t crystid = eeid.rawId();
+          eeSimMap[crystid] += iHit.energy();
+        }
       }
 
       // loop over digis
       const EEDigiCollection *endcapDigi = EcalDigiEE.product();
-      
+
       std::vector<double> eeAnalogSignal;
       std::vector<double> eeADCCounts;
       std::vector<double> eeADCGains;
       eeAnalogSignal.reserve(EEDataFrame::MAXSAMPLES);
       eeADCCounts.reserve(EEDataFrame::MAXSAMPLES);
       eeADCGains.reserve(EEDataFrame::MAXSAMPLES);
-      
+
       int inc = 0;
-      for (unsigned int digis=0; digis<EcalDigiEE->size(); ++digis){ 
-	
-	++inc;
-	
-	EEDataFrame eedf = (*endcapDigi)[digis];
-	int nrSamples = eedf.size();
-	
-	EEDetId eeid = eedf.id () ;
-	
-	double Emax = 0;
-	int Pmax = 0;
-	double pedestalPreSample = 0.;
-	double pedestalPreSampleAnalog = 0.;
-	
-	for (int sample = 0 ; sample < nrSamples; ++sample) {
-	  eeAnalogSignal[sample] = 0.;
-	  eeADCCounts[sample] = 0.;
-	  eeADCGains[sample] = -1.;
-	}
-	
-	// calculate maximum enery and pedestal
-	for (int sample = 0 ; sample < nrSamples; ++sample) {
-	  
-	  EcalMGPASample thisSample = eedf[sample];
-	  
-	  eeADCCounts[sample] = (thisSample.adc());
-	  eeADCGains[sample]  = (thisSample.gainId());
-	  eeAnalogSignal[sample] = 
-	    (eeADCCounts[sample] * ECalgainConv_[(int)eeADCGains[sample]]
-	     * ECalbarrelADCtoGeV_);
-	  if (Emax < eeAnalogSignal[sample]) {
-	    Emax = eeAnalogSignal[sample];
-	    Pmax = sample;
-	  }
-	  if ( sample < 3 ) {
-	    pedestalPreSample += eeADCCounts[sample] ;
-	    pedestalPreSampleAnalog += 
-	      eeADCCounts[sample] * ECalgainConv_[(int)eeADCGains[sample]]
-	      * ECalbarrelADCtoGeV_ ;
-	  }
-	  
-	}
-	pedestalPreSample /= 3. ; 
-	pedestalPreSampleAnalog /= 3. ; 
-	
-	// calculate pedestal subtracted digi energy in the crystal
-	double Erec = Emax - pedestalPreSampleAnalog
-	  * ECalgainConv_[(int)eeADCGains[Pmax]];
-	
-	// gather necessary information
-	mehEcalMaxPos[1]->Fill(Pmax);
-	mehEcalSHE[1]->Fill(eeSimMap[eeid.rawId()]);
-	mehEcalAEE[1]->Fill(Erec);
-	//Adding protection against FPE
-        if (eeSimMap[eeid.rawId()]!=0){
-	  mehEcalSHEvAEESHE[1]->Fill(Erec/eeSimMap[eeid.rawId()],
-				     eeSimMap[eeid.rawId()]);
-	}
-	//else{
-	//  std::cout<<"Would have been an FPE! with eeSimMap[eeid.rawId()]==0\n"; 
-	//}
-	mehEcalMultvAEE[1]->Fill(Pmax,(float)inc);
-	
+      for (unsigned int digis = 0; digis < EcalDigiEE->size(); ++digis) {
+        ++inc;
+
+        EEDataFrame eedf = (*endcapDigi)[digis];
+        int nrSamples = eedf.size();
+
+        EEDetId eeid = eedf.id();
+
+        double Emax = 0;
+        int Pmax = 0;
+        double pedestalPreSample = 0.;
+        double pedestalPreSampleAnalog = 0.;
+
+        for (int sample = 0; sample < nrSamples; ++sample) {
+          eeAnalogSignal[sample] = 0.;
+          eeADCCounts[sample] = 0.;
+          eeADCGains[sample] = -1.;
+        }
+
+        // calculate maximum enery and pedestal
+        for (int sample = 0; sample < nrSamples; ++sample) {
+          EcalMGPASample thisSample = eedf[sample];
+
+          eeADCCounts[sample] = (thisSample.adc());
+          eeADCGains[sample] = (thisSample.gainId());
+          eeAnalogSignal[sample] = (eeADCCounts[sample] * ECalgainConv_[(int)eeADCGains[sample]] * ECalbarrelADCtoGeV_);
+          if (Emax < eeAnalogSignal[sample]) {
+            Emax = eeAnalogSignal[sample];
+            Pmax = sample;
+          }
+          if (sample < 3) {
+            pedestalPreSample += eeADCCounts[sample];
+            pedestalPreSampleAnalog +=
+                eeADCCounts[sample] * ECalgainConv_[(int)eeADCGains[sample]] * ECalbarrelADCtoGeV_;
+          }
+        }
+        pedestalPreSample /= 3.;
+        pedestalPreSampleAnalog /= 3.;
+
+        // calculate pedestal subtracted digi energy in the crystal
+        double Erec = Emax - pedestalPreSampleAnalog * ECalgainConv_[(int)eeADCGains[Pmax]];
+
+        // gather necessary information
+        mehEcalMaxPos[1]->Fill(Pmax);
+        mehEcalSHE[1]->Fill(eeSimMap[eeid.rawId()]);
+        mehEcalAEE[1]->Fill(Erec);
+        // Adding protection against FPE
+        if (eeSimMap[eeid.rawId()] != 0) {
+          mehEcalSHEvAEESHE[1]->Fill(Erec / eeSimMap[eeid.rawId()], eeSimMap[eeid.rawId()]);
+        }
+        // else{
+        //  std::cout<<"Would have been an FPE! with
+        //  eeSimMap[eeid.rawId()]==0\n";
+        //}
+        mehEcalMultvAEE[1]->Fill(Pmax, (float)inc);
       }
-      
+
       if (verbosity > 1) {
-	eventout += "\n          Number of EEDigis collected:.............. ";
-	eventout += inc;
+        eventout += "\n          Number of EEDigis collected:.............. ";
+        eventout += inc;
       }
-      
+
       mehEcaln[1]->Fill((float)inc);
     }
   }
 
   /////////////////////////
-  //extract ES information
+  // extract ES information
   ////////////////////////
   bool isPreshower = true;
-  edm::Handle<ESDigiCollection> EcalDigiES;  
+  edm::Handle<ESDigiCollection> EcalDigiES;
   iEvent.getByToken(ECalESSrc_Token_, EcalDigiES);
   bool validDigiES = true;
   if (!EcalDigiES.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find EcalDigiES in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find EcalDigiES in event!";
     validDigiES = false;
-  } 
-  
+  }
+
   // ONLY WHILE GEOMETRY IS REMOVED
   validDigiES = false;
- 
+
   if (validDigiES) {
-    if (EcalDigiES->empty()) isPreshower = false;
-    
+    if (EcalDigiES->empty())
+      isPreshower = false;
+
     if (isPreshower) {
-      
       // loop over simhits
-      iEvent.getByToken(ESHits_Token_,crossingFrame);
+      iEvent.getByToken(ESHits_Token_, crossingFrame);
       bool validXFrame = true;
       if (!crossingFrame.isValid()) {
-	LogDebug(MsgLoggerCat)
-	  << "Unable to find cal preshower crossingFrame in event!";
-	validXFrame = false;
+        LogDebug(MsgLoggerCat) << "Unable to find cal preshower crossingFrame in event!";
+        validXFrame = false;
       }
       if (validXFrame) {
-	const MixCollection<PCaloHit> preshowerHits(crossingFrame.product());
-	
-	// keep track of sum of simhit energy in each crystal
-	MapType esSimMap;
-	for ( auto const & iHit : preshowerHits ) { 
-	  
-	  ESDetId esid = ESDetId(iHit.id());
-	  
-	  uint32_t crystid = esid.rawId();
-	  esSimMap[crystid] += iHit.energy();
-	}
+        const MixCollection<PCaloHit> preshowerHits(crossingFrame.product());
+
+        // keep track of sum of simhit energy in each crystal
+        MapType esSimMap;
+        for (auto const &iHit : preshowerHits) {
+          ESDetId esid = ESDetId(iHit.id());
+
+          uint32_t crystid = esid.rawId();
+          esSimMap[crystid] += iHit.energy();
+        }
       }
 
       // loop over digis
       const ESDigiCollection *preshowerDigi = EcalDigiES.product();
-      
+
       std::vector<double> esADCCounts;
       esADCCounts.reserve(ESDataFrame::MAXSAMPLES);
-      
+
       int i = 0;
-      for (unsigned int digis=0; digis<EcalDigiES->size(); ++digis) {
-	
-	++i;
-	
-	
-	ESDataFrame esdf = (*preshowerDigi)[digis];
-	int nrSamples = esdf.size();
-	
-	for (int sample = 0 ; sample < nrSamples; ++sample) {
-	  esADCCounts[sample] = 0.;
-	}
-	
-	// gether ADC counts
-	for (int sample = 0 ; sample < nrSamples; ++sample) {
-	  
-	  ESSample thisSample = esdf[sample];
-	  esADCCounts[sample] = (thisSample.adc());
-	}
-	
-	mehEScalADC[0]->Fill(esADCCounts[0]);
-	mehEScalADC[1]->Fill(esADCCounts[1]);
-	mehEScalADC[2]->Fill(esADCCounts[2]);
-	
+      for (unsigned int digis = 0; digis < EcalDigiES->size(); ++digis) {
+        ++i;
+
+        ESDataFrame esdf = (*preshowerDigi)[digis];
+        int nrSamples = esdf.size();
+
+        for (int sample = 0; sample < nrSamples; ++sample) {
+          esADCCounts[sample] = 0.;
+        }
+
+        // gether ADC counts
+        for (int sample = 0; sample < nrSamples; ++sample) {
+          ESSample thisSample = esdf[sample];
+          esADCCounts[sample] = (thisSample.adc());
+        }
+
+        mehEScalADC[0]->Fill(esADCCounts[0]);
+        mehEScalADC[1]->Fill(esADCCounts[1]);
+        mehEScalADC[2]->Fill(esADCCounts[2]);
       }
-      
+
       if (verbosity > 1) {
-	eventout += "\n          Number of ESDigis collected:.............. ";
-	eventout += i;
+        eventout += "\n          Number of ESDigis collected:.............. ";
+        eventout += i;
       }
-      
+
       mehEScaln->Fill((float)i);
     }
   }
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
-  
+
   return;
 }
 
-
-void GlobalDigisAnalyzer::fillHCal(const edm::Event& iEvent, 
-				   const edm::EventSetup& iSetup)
-{
+void GlobalDigisAnalyzer::fillHCal(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalDigisAnalyzer_fillHCal";
-  
+
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
-  
+    eventout = "\nGathering info:";
+
   // get calibration info
   edm::ESHandle<HcalDbService> HCalconditions;
   iSetup.get<HcalDbRecord>().get(HCalconditions);
   if (!HCalconditions.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find HCalconditions in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find HCalconditions in event!";
     return;
-  } 
-  //HcalCalibrations calibrations;
+  }
+  // HcalCalibrations calibrations;
   CaloSamples tool;
-  
+
   ///////////////////////
   // extract simhit info
   //////////////////////
   edm::Handle<edm::PCaloHitContainer> hcalHits;
-  iEvent.getByToken(HCalSrc_Token_,hcalHits);
+  iEvent.getByToken(HCalSrc_Token_, hcalHits);
   bool validhcalHits = true;
   if (!hcalHits.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find hcalHits in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find hcalHits in event!";
     validhcalHits = false;
-  }  
+  }
   MapType fHBEnergySimHits;
   MapType fHEEnergySimHits;
   MapType fHOEnergySimHits;
   MapType fHFEnergySimHits;
   if (validhcalHits) {
     const edm::PCaloHitContainer *simhitResult = hcalHits.product();
-    
-    for (std::vector<PCaloHit>::const_iterator simhits = simhitResult->begin();
-	 simhits != simhitResult->end();
-	 ++simhits) {
-      
+
+    for (std::vector<PCaloHit>::const_iterator simhits = simhitResult->begin(); simhits != simhitResult->end();
+         ++simhits) {
       HcalDetId detId(simhits->id());
       uint32_t cellid = detId.rawId();
-      
-      if (detId.subdet() == sdHcalBrl){  
-	fHBEnergySimHits[cellid] += simhits->energy(); 
+
+      if (detId.subdet() == sdHcalBrl) {
+        fHBEnergySimHits[cellid] += simhits->energy();
       }
-      if (detId.subdet() == sdHcalEC){  
-	fHEEnergySimHits[cellid] += simhits->energy(); 
-      }    
-      if (detId.subdet() == sdHcalOut){  
-	fHOEnergySimHits[cellid] += simhits->energy(); 
-      }    
-      if (detId.subdet() == sdHcalFwd){  
-	fHFEnergySimHits[cellid] += simhits->energy(); 
-      }    
-    } 
+      if (detId.subdet() == sdHcalEC) {
+        fHEEnergySimHits[cellid] += simhits->energy();
+      }
+      if (detId.subdet() == sdHcalOut) {
+        fHOEnergySimHits[cellid] += simhits->energy();
+      }
+      if (detId.subdet() == sdHcalFwd) {
+        fHFEnergySimHits[cellid] += simhits->energy();
+      }
+    }
   }
 
   ////////////////////////
   // get HBHE information
   ///////////////////////
-  edm::Handle<edm::SortedCollection<HBHEDataFrame> > hbhe;
-  iEvent.getByToken(HBHEDigi_Token_,hbhe);
+  edm::Handle<edm::SortedCollection<HBHEDataFrame>> hbhe;
+  iEvent.getByToken(HBHEDigi_Token_, hbhe);
   bool validHBHE = true;
   if (!hbhe.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find HBHEDataFrame in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find HBHEDataFrame in event!";
     validHBHE = false;
-  }    
+  }
 
   if (validHBHE) {
     edm::SortedCollection<HBHEDataFrame>::const_iterator ihbhe;
-    
+
     int iHB = 0;
-    int iHE = 0; 
+    int iHE = 0;
     for (ihbhe = hbhe->begin(); ihbhe != hbhe->end(); ++ihbhe) {
-      HcalDetId cell(ihbhe->id()); 
-      
+      HcalDetId cell(ihbhe->id());
+
       if ((cell.subdet() == sdHcalBrl) || (cell.subdet() == sdHcalEC)) {
-	
-	//HCalconditions->makeHcalCalibration(cell, &calibrations);
-	const HcalCalibrations& calibrations = 
-	  HCalconditions->getHcalCalibrations(cell);
-	const HcalQIECoder *channelCoder = HCalconditions->getHcalCoder(cell);
-	const HcalQIEShape *shape = HCalconditions->getHcalShape(channelCoder);
-	HcalCoderDb coder(*channelCoder, *shape);
-	coder.adc2fC(*ihbhe, tool);
-	
-	// get HB info
-	if (cell.subdet() == sdHcalBrl) {
-	  
-	  ++iHB;
-	  float fDigiSum = 0.0;
-	  for  (int ii = 0; ii < tool.size(); ++ii) {
-	    // default ped is 4.5
-	    int capid = (*ihbhe)[ii].capid();
-	    fDigiSum += (tool[ii] - calibrations.pedestal(capid));
-	  }
-	  
-	  mehHcalSHE[0]->Fill(fHFEnergySimHits[cell.rawId()]);
-	  mehHcalAEE[0]->Fill(fDigiSum);
-	  //Adding protection against FPE
-	  if (fHFEnergySimHits[cell.rawId()]!=0){
-	    mehHcalAEESHE[0]->Fill(fDigiSum/fHFEnergySimHits[cell.rawId()]);
-	  }
-	  //else {
-	  //  std::cout<<"It would have been an FPE! with fHFEnergySimHits[cell.rawId()]==0!\n";
-	  //}
-	  mehHcalSHEvAEE[0]->Fill(fDigiSum, fHFEnergySimHits[cell.rawId()]);
-	}
-	
-	// get HE info
-	if (cell.subdet() == sdHcalEC) {
-	  
-	  ++iHE;
-	  float fDigiSum = 0.0;
-	  for  (int ii = 0; ii < tool.size(); ++ii) {
-	    int capid = (*ihbhe)[ii].capid();
-	    fDigiSum += (tool[ii]-calibrations.pedestal(capid));
-	  }
-	  
-	  mehHcalSHE[1]->Fill(fHFEnergySimHits[cell.rawId()]);
-	  mehHcalAEE[1]->Fill(fDigiSum);
-	  //Adding protection against FPE
-	  if (fHFEnergySimHits[cell.rawId()]!=0){
-	    mehHcalAEESHE[1]->Fill(fDigiSum/fHFEnergySimHits[cell.rawId()]);
-	  }
-	  //else{
-	  //  std::cout<<"It would have been an FPE! with fHFEnergySimHits[cell.rawId()]==0!\n";
-	  //}
-	  mehHcalSHEvAEE[1]->Fill(fDigiSum, fHFEnergySimHits[cell.rawId()]);
-	}
+        // HCalconditions->makeHcalCalibration(cell, &calibrations);
+        const HcalCalibrations &calibrations = HCalconditions->getHcalCalibrations(cell);
+        const HcalQIECoder *channelCoder = HCalconditions->getHcalCoder(cell);
+        const HcalQIEShape *shape = HCalconditions->getHcalShape(channelCoder);
+        HcalCoderDb coder(*channelCoder, *shape);
+        coder.adc2fC(*ihbhe, tool);
+
+        // get HB info
+        if (cell.subdet() == sdHcalBrl) {
+          ++iHB;
+          float fDigiSum = 0.0;
+          for (int ii = 0; ii < tool.size(); ++ii) {
+            // default ped is 4.5
+            int capid = (*ihbhe)[ii].capid();
+            fDigiSum += (tool[ii] - calibrations.pedestal(capid));
+          }
+
+          mehHcalSHE[0]->Fill(fHFEnergySimHits[cell.rawId()]);
+          mehHcalAEE[0]->Fill(fDigiSum);
+          // Adding protection against FPE
+          if (fHFEnergySimHits[cell.rawId()] != 0) {
+            mehHcalAEESHE[0]->Fill(fDigiSum / fHFEnergySimHits[cell.rawId()]);
+          }
+          // else {
+          //  std::cout<<"It would have been an FPE! with
+          //  fHFEnergySimHits[cell.rawId()]==0!\n";
+          //}
+          mehHcalSHEvAEE[0]->Fill(fDigiSum, fHFEnergySimHits[cell.rawId()]);
+        }
+
+        // get HE info
+        if (cell.subdet() == sdHcalEC) {
+          ++iHE;
+          float fDigiSum = 0.0;
+          for (int ii = 0; ii < tool.size(); ++ii) {
+            int capid = (*ihbhe)[ii].capid();
+            fDigiSum += (tool[ii] - calibrations.pedestal(capid));
+          }
+
+          mehHcalSHE[1]->Fill(fHFEnergySimHits[cell.rawId()]);
+          mehHcalAEE[1]->Fill(fDigiSum);
+          // Adding protection against FPE
+          if (fHFEnergySimHits[cell.rawId()] != 0) {
+            mehHcalAEESHE[1]->Fill(fDigiSum / fHFEnergySimHits[cell.rawId()]);
+          }
+          // else{
+          //  std::cout<<"It would have been an FPE! with
+          //  fHFEnergySimHits[cell.rawId()]==0!\n";
+          //}
+          mehHcalSHEvAEE[1]->Fill(fDigiSum, fHFEnergySimHits[cell.rawId()]);
+        }
       }
     }
-  
+
     if (verbosity > 1) {
       eventout += "\n          Number of HBDigis collected:.............. ";
       eventout += iHB;
     }
     mehHcaln[0]->Fill((float)iHB);
-    
+
     if (verbosity > 1) {
       eventout += "\n          Number of HEDigis collected:.............. ";
       eventout += iHE;
@@ -1012,108 +959,104 @@ void GlobalDigisAnalyzer::fillHCal(const edm::Event& iEvent,
   ////////////////////////
   // get HO information
   ///////////////////////
-  edm::Handle<edm::SortedCollection<HODataFrame> > ho;
-  iEvent.getByToken(HODigi_Token_,ho);
+  edm::Handle<edm::SortedCollection<HODataFrame>> ho;
+  iEvent.getByToken(HODigi_Token_, ho);
   bool validHO = true;
   if (!ho.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find HODataFrame in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find HODataFrame in event!";
     validHO = false;
-  }    
+  }
   if (validHO) {
     edm::SortedCollection<HODataFrame>::const_iterator iho;
-    
-    int iHO = 0; 
+
+    int iHO = 0;
     for (iho = ho->begin(); iho != ho->end(); ++iho) {
-      HcalDetId cell(iho->id()); 
-      
+      HcalDetId cell(iho->id());
+
       if (cell.subdet() == sdHcalOut) {
-	
-	//HCalconditions->makeHcalCalibration(cell, &calibrations);
-	const HcalCalibrations& calibrations = 
-	  HCalconditions->getHcalCalibrations(cell);
-	const HcalQIECoder *channelCoder = HCalconditions->getHcalCoder(cell);
-	const HcalQIEShape *shape = HCalconditions->getHcalShape(channelCoder);
-	HcalCoderDb coder (*channelCoder, *shape);
-	coder.adc2fC(*iho, tool);
-	
-	++iHO;
-	float fDigiSum = 0.0;
-	for  (int ii = 0; ii < tool.size(); ++ii) {
-	  // default ped is 4.5
-	  int capid = (*iho)[ii].capid();
-	  fDigiSum += (tool[ii] - calibrations.pedestal(capid));
-	}
-	
-	mehHcalSHE[2]->Fill(fHFEnergySimHits[cell.rawId()]);
-	mehHcalAEE[2]->Fill(fDigiSum);
-	//Adding protection against FPE
-	if (fHFEnergySimHits[cell.rawId()]!=0){
-	  mehHcalAEESHE[2]->Fill(fDigiSum/fHFEnergySimHits[cell.rawId()]);
-	}
-	//else{
-	//  std::cout<<"It would have been an FPE! with fHFEnergySimHits[cell.rawId()]==0!\n";
-	//}
-	mehHcalSHEvAEE[2]->Fill(fDigiSum, fHFEnergySimHits[cell.rawId()]);
+        // HCalconditions->makeHcalCalibration(cell, &calibrations);
+        const HcalCalibrations &calibrations = HCalconditions->getHcalCalibrations(cell);
+        const HcalQIECoder *channelCoder = HCalconditions->getHcalCoder(cell);
+        const HcalQIEShape *shape = HCalconditions->getHcalShape(channelCoder);
+        HcalCoderDb coder(*channelCoder, *shape);
+        coder.adc2fC(*iho, tool);
+
+        ++iHO;
+        float fDigiSum = 0.0;
+        for (int ii = 0; ii < tool.size(); ++ii) {
+          // default ped is 4.5
+          int capid = (*iho)[ii].capid();
+          fDigiSum += (tool[ii] - calibrations.pedestal(capid));
+        }
+
+        mehHcalSHE[2]->Fill(fHFEnergySimHits[cell.rawId()]);
+        mehHcalAEE[2]->Fill(fDigiSum);
+        // Adding protection against FPE
+        if (fHFEnergySimHits[cell.rawId()] != 0) {
+          mehHcalAEESHE[2]->Fill(fDigiSum / fHFEnergySimHits[cell.rawId()]);
+        }
+        // else{
+        //  std::cout<<"It would have been an FPE! with
+        //  fHFEnergySimHits[cell.rawId()]==0!\n";
+        //}
+        mehHcalSHEvAEE[2]->Fill(fDigiSum, fHFEnergySimHits[cell.rawId()]);
       }
     }
-    
+
     if (verbosity > 1) {
       eventout += "\n          Number of HODigis collected:.............. ";
       eventout += iHO;
     }
     mehHcaln[2]->Fill((float)iHO);
-  }  
+  }
 
   ////////////////////////
   // get HF information
   ///////////////////////
-  edm::Handle<edm::SortedCollection<HFDataFrame> > hf;
-  iEvent.getByToken(HFDigi_Token_,hf);
+  edm::Handle<edm::SortedCollection<HFDataFrame>> hf;
+  iEvent.getByToken(HFDigi_Token_, hf);
   bool validHF = true;
   if (!hf.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find HFDataFrame in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find HFDataFrame in event!";
     validHF = false;
-  }    
+  }
   if (validHF) {
     edm::SortedCollection<HFDataFrame>::const_iterator ihf;
-    
-    int iHF = 0; 
+
+    int iHF = 0;
     for (ihf = hf->begin(); ihf != hf->end(); ++ihf) {
-      HcalDetId cell(ihf->id()); 
-      
+      HcalDetId cell(ihf->id());
+
       if (cell.subdet() == sdHcalFwd) {
-	
-	//HCalconditions->makeHcalCalibration(cell, &calibrations);
-	const HcalCalibrations& calibrations = 
-	  HCalconditions->getHcalCalibrations(cell);
-	const HcalQIECoder *channelCoder = HCalconditions->getHcalCoder(cell);
-	const HcalQIEShape *shape = HCalconditions->getHcalShape(channelCoder);
-	HcalCoderDb coder (*channelCoder, *shape);
-	coder.adc2fC(*ihf, tool);
-	
-	++iHF;
-	float fDigiSum = 0.0;
-	for  (int ii = 0; ii < tool.size(); ++ii) {
-	  // default ped is 1.73077
-	  int capid = (*ihf)[ii].capid();
-	  fDigiSum += (tool[ii] - calibrations.pedestal(capid));
-	}
-	
-	mehHcalSHE[3]->Fill(fHFEnergySimHits[cell.rawId()]);
-	mehHcalAEE[3]->Fill(fDigiSum);
-	//Adding protection against FPE
-	if (fHFEnergySimHits[cell.rawId()]!=0){
-	  mehHcalAEESHE[3]->Fill(fDigiSum/fHFEnergySimHits[cell.rawId()]);
-	}
-	//else{
-	//  std::cout<<"It would have been an FPE! with fHFEnergySimHits[cell.rawId()]==0!\n";
-	//}
-	mehHcalSHEvAEE[3]->Fill(fDigiSum, fHFEnergySimHits[cell.rawId()]);
+        // HCalconditions->makeHcalCalibration(cell, &calibrations);
+        const HcalCalibrations &calibrations = HCalconditions->getHcalCalibrations(cell);
+        const HcalQIECoder *channelCoder = HCalconditions->getHcalCoder(cell);
+        const HcalQIEShape *shape = HCalconditions->getHcalShape(channelCoder);
+        HcalCoderDb coder(*channelCoder, *shape);
+        coder.adc2fC(*ihf, tool);
+
+        ++iHF;
+        float fDigiSum = 0.0;
+        for (int ii = 0; ii < tool.size(); ++ii) {
+          // default ped is 1.73077
+          int capid = (*ihf)[ii].capid();
+          fDigiSum += (tool[ii] - calibrations.pedestal(capid));
+        }
+
+        mehHcalSHE[3]->Fill(fHFEnergySimHits[cell.rawId()]);
+        mehHcalAEE[3]->Fill(fDigiSum);
+        // Adding protection against FPE
+        if (fHFEnergySimHits[cell.rawId()] != 0) {
+          mehHcalAEESHE[3]->Fill(fDigiSum / fHFEnergySimHits[cell.rawId()]);
+        }
+        // else{
+        //  std::cout<<"It would have been an FPE! with
+        //  fHFEnergySimHits[cell.rawId()]==0!\n";
+        //}
+        mehHcalSHEvAEE[3]->Fill(fDigiSum, fHFEnergySimHits[cell.rawId()]);
       }
     }
-  
+
     if (verbosity > 1) {
       eventout += "\n          Number of HFDigis collected:.............. ";
       eventout += iHF;
@@ -1123,339 +1066,319 @@ void GlobalDigisAnalyzer::fillHCal(const edm::Event& iEvent,
 
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
-  
+
   return;
 }
 
-void GlobalDigisAnalyzer::fillTrk(const edm::Event& iEvent, 
-				  const edm::EventSetup& iSetup)
-{
-  //Retrieve tracker topology from geometry
+void GlobalDigisAnalyzer::fillTrk(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
-
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
   std::string MsgLoggerCat = "GlobalDigisAnalyzer_fillTrk";
-  
+
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
-  
+    eventout = "\nGathering info:";
+
   // get strip information
-  edm::Handle<edm::DetSetVector<SiStripDigi> > stripDigis;  
+  edm::Handle<edm::DetSetVector<SiStripDigi>> stripDigis;
   iEvent.getByToken(SiStripSrc_Token_, stripDigis);
   bool validstripDigis = true;
   if (!stripDigis.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find stripDigis in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find stripDigis in event!";
     validstripDigis = false;
-  }  
-  
+  }
+
   if (validstripDigis) {
     int nStripBrl = 0, nStripFwd = 0;
     edm::DetSetVector<SiStripDigi>::const_iterator DSViter;
-    for (DSViter = stripDigis->begin(); DSViter != stripDigis->end(); 
-	 ++DSViter) {
+    for (DSViter = stripDigis->begin(); DSViter != stripDigis->end(); ++DSViter) {
       unsigned int id = DSViter->id;
       DetId detId(id);
       edm::DetSet<SiStripDigi>::const_iterator begin = DSViter->data.begin();
       edm::DetSet<SiStripDigi>::const_iterator end = DSViter->data.end();
       edm::DetSet<SiStripDigi>::const_iterator iter;
-      
+
       // get TIB
       if (detId.subdetId() == sdSiTIB) {
-	
-	for (iter = begin; iter != end; ++iter) {
-	  ++nStripBrl;
-	  if (tTopo->tibLayer(id) == 1) {
-	    mehSiStripADC[0]->Fill((*iter).adc());
-	    mehSiStripStrip[0]->Fill((*iter).strip());
-	  }
-	  if (tTopo->tibLayer(id) == 2) {
-	    mehSiStripADC[1]->Fill((*iter).adc());
-	    mehSiStripStrip[1]->Fill((*iter).strip());
-	  }	
-	  if (tTopo->tibLayer(id) == 3) {
-	    mehSiStripADC[2]->Fill((*iter).adc());
-	    mehSiStripStrip[2]->Fill((*iter).strip());
-	  }
-	  if (tTopo->tibLayer(id) == 4) {
-	    mehSiStripADC[3]->Fill((*iter).adc());
-	    mehSiStripStrip[3]->Fill((*iter).strip());
-	  }
-	}
+        for (iter = begin; iter != end; ++iter) {
+          ++nStripBrl;
+          if (tTopo->tibLayer(id) == 1) {
+            mehSiStripADC[0]->Fill((*iter).adc());
+            mehSiStripStrip[0]->Fill((*iter).strip());
+          }
+          if (tTopo->tibLayer(id) == 2) {
+            mehSiStripADC[1]->Fill((*iter).adc());
+            mehSiStripStrip[1]->Fill((*iter).strip());
+          }
+          if (tTopo->tibLayer(id) == 3) {
+            mehSiStripADC[2]->Fill((*iter).adc());
+            mehSiStripStrip[2]->Fill((*iter).strip());
+          }
+          if (tTopo->tibLayer(id) == 4) {
+            mehSiStripADC[3]->Fill((*iter).adc());
+            mehSiStripStrip[3]->Fill((*iter).strip());
+          }
+        }
       }
-      
+
       // get TOB
       if (detId.subdetId() == sdSiTOB) {
-	
-	for (iter = begin; iter != end; ++iter) {
-	  ++nStripBrl;
-	  if (tTopo->tobLayer(id) == 1) {
-	    mehSiStripADC[4]->Fill((*iter).adc());
-	    mehSiStripStrip[4]->Fill((*iter).strip());
-	  }
-	  if (tTopo->tobLayer(id) == 2) {
-	    mehSiStripADC[5]->Fill((*iter).adc());
-	    mehSiStripStrip[5]->Fill((*iter).strip());
-	  }	
-	  if (tTopo->tobLayer(id) == 3) {
-	    mehSiStripADC[6]->Fill((*iter).adc());
-	    mehSiStripStrip[6]->Fill((*iter).strip());
-	  }
-	  if (tTopo->tobLayer(id) == 4) {
-	    mehSiStripADC[7]->Fill((*iter).adc());
-	    mehSiStripStrip[7]->Fill((*iter).strip());
-	  }
-	}
-      }    
-      
+        for (iter = begin; iter != end; ++iter) {
+          ++nStripBrl;
+          if (tTopo->tobLayer(id) == 1) {
+            mehSiStripADC[4]->Fill((*iter).adc());
+            mehSiStripStrip[4]->Fill((*iter).strip());
+          }
+          if (tTopo->tobLayer(id) == 2) {
+            mehSiStripADC[5]->Fill((*iter).adc());
+            mehSiStripStrip[5]->Fill((*iter).strip());
+          }
+          if (tTopo->tobLayer(id) == 3) {
+            mehSiStripADC[6]->Fill((*iter).adc());
+            mehSiStripStrip[6]->Fill((*iter).strip());
+          }
+          if (tTopo->tobLayer(id) == 4) {
+            mehSiStripADC[7]->Fill((*iter).adc());
+            mehSiStripStrip[7]->Fill((*iter).strip());
+          }
+        }
+      }
+
       // get TID
       if (detId.subdetId() == sdSiTID) {
-	
-	for (iter = begin; iter != end; ++iter) {
-	  ++nStripFwd;
-	  if (tTopo->tidWheel(id) == 1) {
-	    mehSiStripADC[8]->Fill((*iter).adc());
-	    mehSiStripStrip[8]->Fill((*iter).strip());
-	  }
-	  if (tTopo->tidWheel(id) == 2) {
-	    mehSiStripADC[9]->Fill((*iter).adc());
-	    mehSiStripStrip[9]->Fill((*iter).strip());
-	  }
-	  if (tTopo->tidWheel(id) == 3) {
-	    mehSiStripADC[10]->Fill((*iter).adc());
-	    mehSiStripStrip[10]->Fill((*iter).strip());
-	  }
-	}
-      }   
-      
+        for (iter = begin; iter != end; ++iter) {
+          ++nStripFwd;
+          if (tTopo->tidWheel(id) == 1) {
+            mehSiStripADC[8]->Fill((*iter).adc());
+            mehSiStripStrip[8]->Fill((*iter).strip());
+          }
+          if (tTopo->tidWheel(id) == 2) {
+            mehSiStripADC[9]->Fill((*iter).adc());
+            mehSiStripStrip[9]->Fill((*iter).strip());
+          }
+          if (tTopo->tidWheel(id) == 3) {
+            mehSiStripADC[10]->Fill((*iter).adc());
+            mehSiStripStrip[10]->Fill((*iter).strip());
+          }
+        }
+      }
+
       // get TEC
       if (detId.subdetId() == sdSiTEC) {
-	
-	for (iter = begin; iter != end; ++iter) {
-	  ++nStripFwd;
-	  if (tTopo->tecWheel(id) == 1) {
-	    mehSiStripADC[11]->Fill((*iter).adc());
-	    mehSiStripStrip[11]->Fill((*iter).strip());
-	  }
-	  if (tTopo->tecWheel(id) == 2) {
-	    mehSiStripADC[12]->Fill((*iter).adc());
-	    mehSiStripStrip[12]->Fill((*iter).strip());
-	  }
-	  if (tTopo->tecWheel(id) == 3) {
-	    mehSiStripADC[13]->Fill((*iter).adc());
-	    mehSiStripStrip[13]->Fill((*iter).strip());
-	  }
-	  if (tTopo->tecWheel(id) == 4) {
-	    mehSiStripADC[14]->Fill((*iter).adc());
-	    mehSiStripStrip[14]->Fill((*iter).strip());
-	  }
-	  if (tTopo->tecWheel(id) == 5) {
-	    mehSiStripADC[15]->Fill((*iter).adc());
-	    mehSiStripStrip[15]->Fill((*iter).strip());
-	  }
-	  if (tTopo->tecWheel(id) == 6) {
-	    mehSiStripADC[16]->Fill((*iter).adc());
-	    mehSiStripStrip[16]->Fill((*iter).strip());
-	  }
-	  if (tTopo->tecWheel(id) == 7) {
-	    mehSiStripADC[17]->Fill((*iter).adc());
-	    mehSiStripStrip[17]->Fill((*iter).strip());
-	  }
-	  if (tTopo->tecWheel(id) == 8) {
-	    mehSiStripADC[18]->Fill((*iter).adc());
-	    mehSiStripStrip[18]->Fill((*iter).strip());
-	  }
-	}
-      }     
-    } // end loop over DataSetVector
-    
+        for (iter = begin; iter != end; ++iter) {
+          ++nStripFwd;
+          if (tTopo->tecWheel(id) == 1) {
+            mehSiStripADC[11]->Fill((*iter).adc());
+            mehSiStripStrip[11]->Fill((*iter).strip());
+          }
+          if (tTopo->tecWheel(id) == 2) {
+            mehSiStripADC[12]->Fill((*iter).adc());
+            mehSiStripStrip[12]->Fill((*iter).strip());
+          }
+          if (tTopo->tecWheel(id) == 3) {
+            mehSiStripADC[13]->Fill((*iter).adc());
+            mehSiStripStrip[13]->Fill((*iter).strip());
+          }
+          if (tTopo->tecWheel(id) == 4) {
+            mehSiStripADC[14]->Fill((*iter).adc());
+            mehSiStripStrip[14]->Fill((*iter).strip());
+          }
+          if (tTopo->tecWheel(id) == 5) {
+            mehSiStripADC[15]->Fill((*iter).adc());
+            mehSiStripStrip[15]->Fill((*iter).strip());
+          }
+          if (tTopo->tecWheel(id) == 6) {
+            mehSiStripADC[16]->Fill((*iter).adc());
+            mehSiStripStrip[16]->Fill((*iter).strip());
+          }
+          if (tTopo->tecWheel(id) == 7) {
+            mehSiStripADC[17]->Fill((*iter).adc());
+            mehSiStripStrip[17]->Fill((*iter).strip());
+          }
+          if (tTopo->tecWheel(id) == 8) {
+            mehSiStripADC[18]->Fill((*iter).adc());
+            mehSiStripStrip[18]->Fill((*iter).strip());
+          }
+        }
+      }
+    }  // end loop over DataSetVector
+
     if (verbosity > 1) {
       eventout += "\n          Number of BrlStripDigis collected:........ ";
       eventout += nStripBrl;
     }
-    for(int i = 0; i < 8; ++i) {
+    for (int i = 0; i < 8; ++i) {
       mehSiStripn[i]->Fill((float)nStripBrl);
     }
-    
+
     if (verbosity > 1) {
       eventout += "\n          Number of FrwdStripDigis collected:....... ";
       eventout += nStripFwd;
     }
-    for(int i = 8; i < 19; ++i) {
+    for (int i = 8; i < 19; ++i) {
       mehSiStripn[i]->Fill((float)nStripFwd);
     }
   }
 
   // get pixel information
-  edm::Handle<edm::DetSetVector<PixelDigi> > pixelDigis;  
+  edm::Handle<edm::DetSetVector<PixelDigi>> pixelDigis;
   iEvent.getByToken(SiPxlSrc_Token_, pixelDigis);
   bool validpixelDigis = true;
   if (!pixelDigis.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find pixelDigis in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find pixelDigis in event!";
     validpixelDigis = false;
-  }  
+  }
   if (validpixelDigis) {
     int nPxlBrl = 0, nPxlFwd = 0;
     edm::DetSetVector<PixelDigi>::const_iterator DPViter;
-    for (DPViter = pixelDigis->begin(); DPViter != pixelDigis->end(); 
-	 ++DPViter) {
+    for (DPViter = pixelDigis->begin(); DPViter != pixelDigis->end(); ++DPViter) {
       unsigned int id = DPViter->id;
       DetId detId(id);
       edm::DetSet<PixelDigi>::const_iterator begin = DPViter->data.begin();
       edm::DetSet<PixelDigi>::const_iterator end = DPViter->data.end();
       edm::DetSet<PixelDigi>::const_iterator iter;
-      
+
       // get Barrel pixels
       if (detId.subdetId() == sdPxlBrl) {
-	
-	for (iter = begin; iter != end; ++iter) {
-	  ++nPxlBrl;
-	  if (tTopo->pxbLayer(id) == 1) {
-	    mehSiPixelADC[0]->Fill((*iter).adc());
-	    mehSiPixelRow[0]->Fill((*iter).row());
-	    mehSiPixelCol[0]->Fill((*iter).column());
-	  }
-	  if (tTopo->pxbLayer(id) == 2) {
-	    mehSiPixelADC[1]->Fill((*iter).adc());
-	    mehSiPixelRow[1]->Fill((*iter).row());
-	    mehSiPixelCol[1]->Fill((*iter).column());
-	  }
-	  if (tTopo->pxbLayer(id) == 3) {
-	    mehSiPixelADC[2]->Fill((*iter).adc());
-	    mehSiPixelRow[2]->Fill((*iter).row());
-	    mehSiPixelCol[2]->Fill((*iter).column());
-	  }
-	}
+        for (iter = begin; iter != end; ++iter) {
+          ++nPxlBrl;
+          if (tTopo->pxbLayer(id) == 1) {
+            mehSiPixelADC[0]->Fill((*iter).adc());
+            mehSiPixelRow[0]->Fill((*iter).row());
+            mehSiPixelCol[0]->Fill((*iter).column());
+          }
+          if (tTopo->pxbLayer(id) == 2) {
+            mehSiPixelADC[1]->Fill((*iter).adc());
+            mehSiPixelRow[1]->Fill((*iter).row());
+            mehSiPixelCol[1]->Fill((*iter).column());
+          }
+          if (tTopo->pxbLayer(id) == 3) {
+            mehSiPixelADC[2]->Fill((*iter).adc());
+            mehSiPixelRow[2]->Fill((*iter).row());
+            mehSiPixelCol[2]->Fill((*iter).column());
+          }
+        }
       }
-      
+
       // get Forward pixels
       if (detId.subdetId() == sdPxlFwd) {
-	
-	for (iter = begin; iter != end; ++iter) {
-	  ++nPxlFwd;
-	  if (tTopo->pxfDisk(id) == 1) {
-	    if (tTopo->pxfSide(id) == 1) {
-	      mehSiPixelADC[4]->Fill((*iter).adc());
-	      mehSiPixelRow[4]->Fill((*iter).row());
-	      mehSiPixelCol[4]->Fill((*iter).column());
-	    }
-	    if (tTopo->pxfSide(id) == 2) {
-	      mehSiPixelADC[3]->Fill((*iter).adc());
-	      mehSiPixelRow[3]->Fill((*iter).row());
-	      mehSiPixelCol[3]->Fill((*iter).column());
-	    }
-	  }
-	  if (tTopo->pxfDisk(id) == 2) {
-	    if (tTopo->pxfSide(id) == 1) {
-	      
-	      mehSiPixelADC[6]->Fill((*iter).adc());
-	      mehSiPixelRow[6]->Fill((*iter).row());
-	      mehSiPixelCol[6]->Fill((*iter).column());
-	    }
-	    if (tTopo->pxfSide(id) == 2) {
-	      mehSiPixelADC[5]->Fill((*iter).adc());
-	      mehSiPixelRow[5]->Fill((*iter).row());
-	      mehSiPixelCol[5]->Fill((*iter).column());
-	    }
-	  }
-	}
+        for (iter = begin; iter != end; ++iter) {
+          ++nPxlFwd;
+          if (tTopo->pxfDisk(id) == 1) {
+            if (tTopo->pxfSide(id) == 1) {
+              mehSiPixelADC[4]->Fill((*iter).adc());
+              mehSiPixelRow[4]->Fill((*iter).row());
+              mehSiPixelCol[4]->Fill((*iter).column());
+            }
+            if (tTopo->pxfSide(id) == 2) {
+              mehSiPixelADC[3]->Fill((*iter).adc());
+              mehSiPixelRow[3]->Fill((*iter).row());
+              mehSiPixelCol[3]->Fill((*iter).column());
+            }
+          }
+          if (tTopo->pxfDisk(id) == 2) {
+            if (tTopo->pxfSide(id) == 1) {
+              mehSiPixelADC[6]->Fill((*iter).adc());
+              mehSiPixelRow[6]->Fill((*iter).row());
+              mehSiPixelCol[6]->Fill((*iter).column());
+            }
+            if (tTopo->pxfSide(id) == 2) {
+              mehSiPixelADC[5]->Fill((*iter).adc());
+              mehSiPixelRow[5]->Fill((*iter).row());
+              mehSiPixelCol[5]->Fill((*iter).column());
+            }
+          }
+        }
       }
     }
-    
+
     if (verbosity > 1) {
       eventout += "\n          Number of BrlPixelDigis collected:........ ";
       eventout += nPxlBrl;
     }
-    for(int i = 0; i < 3; ++i) {
+    for (int i = 0; i < 3; ++i) {
       mehSiPixeln[i]->Fill((float)nPxlBrl);
     }
-    
+
     if (verbosity > 1) {
       eventout += "\n          Number of FrwdPixelDigis collected:....... ";
       eventout += nPxlFwd;
     }
-    
-    for(int i = 3; i < 7; ++i) {
+
+    for (int i = 3; i < 7; ++i) {
       mehSiPixeln[i]->Fill((float)nPxlFwd);
     }
   }
 
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
-  
+
   return;
 }
 
-void GlobalDigisAnalyzer::fillMuon(const edm::Event& iEvent, 
-				   const edm::EventSetup& iSetup)
-{
+void GlobalDigisAnalyzer::fillMuon(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalDigisAnalyzer_fillMuon";
-  
+
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
-  
+    eventout = "\nGathering info:";
+
   // get DT information
-  edm::Handle<DTDigiCollection> dtDigis;  
+  edm::Handle<DTDigiCollection> dtDigis;
   iEvent.getByToken(MuDTSrc_Token_, dtDigis);
   bool validdtDigis = true;
   if (!dtDigis.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find dtDigis in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find dtDigis in event!";
     validdtDigis = false;
-  }  
+  }
   if (validdtDigis) {
-    int nDt0 = 0; int nDt1 = 0; int nDt2 = 0; int nDt3 = 0;
+    int nDt0 = 0;
+    int nDt1 = 0;
+    int nDt2 = 0;
+    int nDt3 = 0;
     int nDt = 0;
     DTDigiCollection::DigiRangeIterator detUnitIt;
-    for (detUnitIt = dtDigis->begin(); detUnitIt != dtDigis->end(); 
-	 ++detUnitIt) {
-      
-      const DTLayerId& id = (*detUnitIt).first;
-      const DTDigiCollection::Range& range = (*detUnitIt).second;
-      for (DTDigiCollection::const_iterator digiIt = range.first;
-	   digiIt != range.second;
-	   ++digiIt) {
-	
-	++nDt;
-	
-	DTWireId wireId(id,(*digiIt).wire());
-	if (wireId.station() == 1) {
-	  mehDtMuonLayer[0]->Fill(id.layer());
-	  mehDtMuonTime[0]->Fill((*digiIt).time());
-	  mehDtMuonTimevLayer[0]->Fill(id.layer(),(*digiIt).time());
-	  ++nDt0;
-	}
-	if (wireId.station() == 2) {
-	  mehDtMuonLayer[1]->Fill(id.layer());
-	  mehDtMuonTime[1]->Fill((*digiIt).time());
-	  mehDtMuonTimevLayer[1]->Fill(id.layer(),(*digiIt).time());
-	  ++nDt1;
-	}
-	if (wireId.station() == 3) {
-	  mehDtMuonLayer[2]->Fill(id.layer());
-	  mehDtMuonTime[2]->Fill((*digiIt).time());
-	  mehDtMuonTimevLayer[2]->Fill(id.layer(),(*digiIt).time());
-	  ++nDt2;
-	}
-	if (wireId.station() == 4) {
-	  mehDtMuonLayer[3]->Fill(id.layer());
-	  mehDtMuonTime[3]->Fill((*digiIt).time());
-	  mehDtMuonTimevLayer[3]->Fill(id.layer(),(*digiIt).time());
-	  ++nDt3;
-	}
+    for (detUnitIt = dtDigis->begin(); detUnitIt != dtDigis->end(); ++detUnitIt) {
+      const DTLayerId &id = (*detUnitIt).first;
+      const DTDigiCollection::Range &range = (*detUnitIt).second;
+      for (DTDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) {
+        ++nDt;
+
+        DTWireId wireId(id, (*digiIt).wire());
+        if (wireId.station() == 1) {
+          mehDtMuonLayer[0]->Fill(id.layer());
+          mehDtMuonTime[0]->Fill((*digiIt).time());
+          mehDtMuonTimevLayer[0]->Fill(id.layer(), (*digiIt).time());
+          ++nDt0;
+        }
+        if (wireId.station() == 2) {
+          mehDtMuonLayer[1]->Fill(id.layer());
+          mehDtMuonTime[1]->Fill((*digiIt).time());
+          mehDtMuonTimevLayer[1]->Fill(id.layer(), (*digiIt).time());
+          ++nDt1;
+        }
+        if (wireId.station() == 3) {
+          mehDtMuonLayer[2]->Fill(id.layer());
+          mehDtMuonTime[2]->Fill((*digiIt).time());
+          mehDtMuonTimevLayer[2]->Fill(id.layer(), (*digiIt).time());
+          ++nDt2;
+        }
+        if (wireId.station() == 4) {
+          mehDtMuonLayer[3]->Fill(id.layer());
+          mehDtMuonTime[3]->Fill((*digiIt).time());
+          mehDtMuonTimevLayer[3]->Fill(id.layer(), (*digiIt).time());
+          ++nDt3;
+        }
       }
     }
     mehDtMuonn[0]->Fill((float)nDt0);
     mehDtMuonn[1]->Fill((float)nDt1);
     mehDtMuonn[2]->Fill((float)nDt2);
     mehDtMuonn[3]->Fill((float)nDt3);
-    
-    
+
     if (verbosity > 1) {
       eventout += "\n          Number of DtMuonDigis collected:.......... ";
       eventout += nDt;
@@ -1463,42 +1386,38 @@ void GlobalDigisAnalyzer::fillMuon(const edm::Event& iEvent,
   }
 
   // get CSC Strip information
-  edm::Handle<CSCStripDigiCollection> strips;  
+  edm::Handle<CSCStripDigiCollection> strips;
   iEvent.getByToken(MuCSCStripSrc_Token_, strips);
   bool validstrips = true;
   if (!strips.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find muon strips in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find muon strips in event!";
     validstrips = false;
   }
-  
+
   if (validstrips) {
     int nStrips = 0;
-    for (CSCStripDigiCollection::DigiRangeIterator j = strips->begin();
-	 j != strips->end();
-	 ++j) {
-      
+    for (CSCStripDigiCollection::DigiRangeIterator j = strips->begin(); j != strips->end(); ++j) {
       std::vector<CSCStripDigi>::const_iterator digiItr = (*j).second.first;
       std::vector<CSCStripDigi>::const_iterator last = (*j).second.second;
-      
-      for ( ; digiItr != last; ++digiItr) {
-	++nStrips;
-	
-	// average pedestals
-	std::vector<int> adcCounts = digiItr->getADCCounts();
-	theCSCStripPedestalSum += adcCounts[0];
-	theCSCStripPedestalSum += adcCounts[1];
-	theCSCStripPedestalCount += 2;
-	
-	// if there are enough pedestal statistics
-	if (theCSCStripPedestalCount > 100) {
-	  float pedestal = theCSCStripPedestalSum / theCSCStripPedestalCount;
-	  if (adcCounts[5] > (pedestal + 100)) 
-	    mehCSCStripADC->Fill(adcCounts[4] - pedestal);
-	}
+
+      for (; digiItr != last; ++digiItr) {
+        ++nStrips;
+
+        // average pedestals
+        std::vector<int> adcCounts = digiItr->getADCCounts();
+        theCSCStripPedestalSum += adcCounts[0];
+        theCSCStripPedestalSum += adcCounts[1];
+        theCSCStripPedestalCount += 2;
+
+        // if there are enough pedestal statistics
+        if (theCSCStripPedestalCount > 100) {
+          float pedestal = theCSCStripPedestalSum / theCSCStripPedestalCount;
+          if (adcCounts[5] > (pedestal + 100))
+            mehCSCStripADC->Fill(adcCounts[4] - pedestal);
+        }
       }
     }
-    
+
     if (verbosity > 1) {
       eventout += "\n          Number of CSCStripDigis collected:........ ";
       eventout += nStrips;
@@ -1507,35 +1426,31 @@ void GlobalDigisAnalyzer::fillMuon(const edm::Event& iEvent,
   }
 
   // get CSC Wire information
-  edm::Handle<CSCWireDigiCollection> wires;  
+  edm::Handle<CSCWireDigiCollection> wires;
   iEvent.getByToken(MuCSCWireSrc_Token_, wires);
   bool validwires = true;
   if (!wires.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find muon wires in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find muon wires in event!";
     validwires = false;
-  }  
-  
+  }
+
   if (validwires) {
     int nWires = 0;
-    for (CSCWireDigiCollection::DigiRangeIterator j = wires->begin();
-	 j != wires->end();
-	 ++j) {
-      
+    for (CSCWireDigiCollection::DigiRangeIterator j = wires->begin(); j != wires->end(); ++j) {
       std::vector<CSCWireDigi>::const_iterator digiItr = (*j).second.first;
       std::vector<CSCWireDigi>::const_iterator endDigi = (*j).second.second;
-      
-      for ( ; digiItr != endDigi; ++digiItr) {
-	++nWires;
-	mehCSCWireTime->Fill(digiItr->getTimeBin());
+
+      for (; digiItr != endDigi; ++digiItr) {
+        ++nWires;
+        mehCSCWireTime->Fill(digiItr->getTimeBin());
       }
     }
-    
+
     if (verbosity > 1) {
       eventout += "\n          Number of CSCWireDigis collected:......... ";
       eventout += nWires;
     }
-    mehCSCWiren->Fill((float)nWires); 
+    mehCSCWiren->Fill((float)nWires);
   }
 
   // get RPC information
@@ -1543,49 +1458,45 @@ void GlobalDigisAnalyzer::fillMuon(const edm::Event& iEvent,
   edm::ESHandle<RPCGeometry> rpcGeom;
   iSetup.get<MuonGeometryRecord>().get(rpcGeom);
   if (!rpcGeom.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find RPCGeometryRecord in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find RPCGeometryRecord in event!";
     return;
   }
-  
+
   edm::Handle<edm::PSimHitContainer> rpcsimHit;
   iEvent.getByToken(RPCSimHit_Token_, rpcsimHit);
   bool validrpcsim = true;
   if (!rpcsimHit.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find rpcsimHit in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find rpcsimHit in event!";
     validrpcsim = false;
-  }   
-  
-  edm::Handle<RPCDigiCollection> rpcDigis;  
+  }
+
+  edm::Handle<RPCDigiCollection> rpcDigis;
   iEvent.getByToken(MuRPCSrc_Token_, rpcDigis);
   bool validrpcdigi = true;
   if (!rpcDigis.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find rpcDigis in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find rpcDigis in event!";
     validrpcdigi = false;
-  } 
+  }
 
   // ONLY UNTIL PROBLEM WITH RPC DIGIS IS FIGURED OUT
   validrpcdigi = false;
 
   // Loop on simhits
   edm::PSimHitContainer::const_iterator rpcsimIt;
-  std::map<RPCDetId, std::vector<double> > allsims;
+  std::map<RPCDetId, std::vector<double>> allsims;
 
   if (validrpcsim) {
-    for (rpcsimIt = rpcsimHit->begin(); rpcsimIt != rpcsimHit->end(); 
-	 rpcsimIt++) {
+    for (rpcsimIt = rpcsimHit->begin(); rpcsimIt != rpcsimHit->end(); rpcsimIt++) {
       RPCDetId Rsid = (RPCDetId)(*rpcsimIt).detUnitId();
       int ptype = rpcsimIt->particleType();
-      
+
       if (ptype == 13 || ptype == -13) {
-	std::vector<double> buff;
-	if (allsims.find(Rsid) != allsims.end() ){
-	  buff= allsims[Rsid];
-	}
-	buff.push_back(rpcsimIt->localPosition().x());
-	allsims[Rsid]=buff;
+        std::vector<double> buff;
+        if (allsims.find(Rsid) != allsims.end()) {
+          buff = allsims[Rsid];
+        }
+        buff.push_back(rpcsimIt->localPosition().x());
+        allsims[Rsid] = buff;
       }
     }
   }
@@ -1595,55 +1506,49 @@ void GlobalDigisAnalyzer::fillMuon(const edm::Event& iEvent,
   if (validrpcdigi) {
     int nRPC = 0;
     RPCDigiCollection::DigiRangeIterator rpcdetUnitIt;
-    for (rpcdetUnitIt = rpcDigis->begin(); rpcdetUnitIt != rpcDigis->end(); 
-	 ++rpcdetUnitIt) {
-      
-      const RPCDetId Rsid = (*rpcdetUnitIt).first;      
-      const RPCRoll* roll = 
-	dynamic_cast<const RPCRoll* >( rpcGeom->roll(Rsid));   
-      const RPCDigiCollection::Range& range = (*rpcdetUnitIt).second;
-      
+    for (rpcdetUnitIt = rpcDigis->begin(); rpcdetUnitIt != rpcDigis->end(); ++rpcdetUnitIt) {
+      const RPCDetId Rsid = (*rpcdetUnitIt).first;
+      const RPCRoll *roll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(Rsid));
+      const RPCDigiCollection::Range &range = (*rpcdetUnitIt).second;
+
       std::vector<double> sims;
-      if (allsims.find(Rsid) != allsims.end() ){
-	sims = allsims[Rsid];
+      if (allsims.find(Rsid) != allsims.end()) {
+        sims = allsims[Rsid];
       }
-      
+
       int ndigi = 0;
-      for (RPCDigiCollection::const_iterator rpcdigiIt = range.first;
-	   rpcdigiIt != range.second;
-	   ++rpcdigiIt) {
-	
-	++ndigi;
-	++nRPC;
+      for (RPCDigiCollection::const_iterator rpcdigiIt = range.first; rpcdigiIt != range.second; ++rpcdigiIt) {
+        ++ndigi;
+        ++nRPC;
       }
-      
-      if (sims.size() == 1 && ndigi == 1){
-	double dis = roll->centreOfStrip(range.first->strip()).x()-sims[0];
-	
-	if (Rsid.region() == 0 ){
-	  if (Rsid.ring() == -2)
-	    mehRPCRes[0]->Fill((float)dis);
-	  else if (Rsid.ring() == -1)
-	    mehRPCRes[1]->Fill((float)dis);
-	  else if (Rsid.ring() == 0)
-	    mehRPCRes[2]->Fill((float)dis);
-	  else if (Rsid.ring() == 1)
-	    mehRPCRes[3]->Fill((float)dis);
-	  else if (Rsid.ring() == 2)
-	    mehRPCRes[4]->Fill((float)dis);
-	}  
+
+      if (sims.size() == 1 && ndigi == 1) {
+        double dis = roll->centreOfStrip(range.first->strip()).x() - sims[0];
+
+        if (Rsid.region() == 0) {
+          if (Rsid.ring() == -2)
+            mehRPCRes[0]->Fill((float)dis);
+          else if (Rsid.ring() == -1)
+            mehRPCRes[1]->Fill((float)dis);
+          else if (Rsid.ring() == 0)
+            mehRPCRes[2]->Fill((float)dis);
+          else if (Rsid.ring() == 1)
+            mehRPCRes[3]->Fill((float)dis);
+          else if (Rsid.ring() == 2)
+            mehRPCRes[4]->Fill((float)dis);
+        }
       }
     }
-    
+
     if (verbosity > 1) {
       eventout += "\n          Number of RPCDigis collected:.............. ";
       eventout += nRPC;
     }
     mehRPCMuonn->Fill(float(nRPC));
   }
-  
+
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
-  
+
   return;
 }
diff --git a/Validation/GlobalDigis/src/GlobalDigisHistogrammer.cc b/Validation/GlobalDigis/src/GlobalDigisHistogrammer.cc
index d996702c84303..477dff4226290 100644
--- a/Validation/GlobalDigis/src/GlobalDigisHistogrammer.cc
+++ b/Validation/GlobalDigis/src/GlobalDigisHistogrammer.cc
@@ -1,5 +1,5 @@
 /** \file GlobalDigisHistogrammer.cc
- *  
+ *
  *  See header file for description of class
  *
  *  \author M. Strang SUNY-Buffalo
@@ -7,11 +7,16 @@
 
 #include "Validation/GlobalDigis/interface/GlobalDigisHistogrammer.h"
 
-GlobalDigisHistogrammer::GlobalDigisHistogrammer(const edm::ParameterSet& iPSet) :
-  fName(""), verbosity(0), frequency(0), label(""), getAllProvenances(false),
-  printProvenanceInfo(false), theCSCStripPedestalSum(0),
-  theCSCStripPedestalCount(0), count(0)
-{
+GlobalDigisHistogrammer::GlobalDigisHistogrammer(const edm::ParameterSet &iPSet)
+    : fName(""),
+      verbosity(0),
+      frequency(0),
+      label(""),
+      getAllProvenances(false),
+      printProvenanceInfo(false),
+      theCSCStripPedestalSum(0),
+      theCSCStripPedestalCount(0),
+      count(0) {
   std::string MsgLoggerCat = "GlobalDigisHistogrammer_GlobalDigisHistogrammer";
 
   // get information from parameter set
@@ -20,71 +25,81 @@ GlobalDigisHistogrammer::GlobalDigisHistogrammer(const edm::ParameterSet& iPSet)
   frequency = iPSet.getUntrackedParameter<int>("Frequency");
   outputfile = iPSet.getParameter<std::string>("outputFile");
   doOutput = iPSet.getParameter<bool>("DoOutput");
-  edm::ParameterSet m_Prov =
-    iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup");
-  getAllProvenances = 
-    m_Prov.getUntrackedParameter<bool>("GetAllProvenances");
-  printProvenanceInfo = 
-    m_Prov.getUntrackedParameter<bool>("PrintProvenanceInfo");
-
-  //get Labels to use to extract information
+  edm::ParameterSet m_Prov = iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup");
+  getAllProvenances = m_Prov.getUntrackedParameter<bool>("GetAllProvenances");
+  printProvenanceInfo = m_Prov.getUntrackedParameter<bool>("PrintProvenanceInfo");
+
+  // get Labels to use to extract information
   GlobalDigisSrc_ = iPSet.getParameter<edm::InputTag>("GlobalDigisSrc");
-  //ECalEBSrc_ = iPSet.getParameter<edm::InputTag>("ECalEBSrc");
-  //ECalEESrc_ = iPSet.getParameter<edm::InputTag>("ECalEESrc");
-  //ECalESSrc_ = iPSet.getParameter<edm::InputTag>("ECalESSrc");
-  //HCalSrc_ = iPSet.getParameter<edm::InputTag>("HCalSrc");
-  //SiStripSrc_ = iPSet.getParameter<edm::InputTag>("SiStripSrc"); 
-  //SiPxlSrc_ = iPSet.getParameter<edm::InputTag>("SiPxlSrc");
-  //MuDTSrc_ = iPSet.getParameter<edm::InputTag>("MuDTSrc");
-  //MuCSCStripSrc_ = iPSet.getParameter<edm::InputTag>("MuCSCStripSrc");
-  //MuCSCWireSrc_ = iPSet.getParameter<edm::InputTag>("MuCSCWireSrc");
-
-  //fix for consumes
+  // ECalEBSrc_ = iPSet.getParameter<edm::InputTag>("ECalEBSrc");
+  // ECalEESrc_ = iPSet.getParameter<edm::InputTag>("ECalEESrc");
+  // ECalESSrc_ = iPSet.getParameter<edm::InputTag>("ECalESSrc");
+  // HCalSrc_ = iPSet.getParameter<edm::InputTag>("HCalSrc");
+  // SiStripSrc_ = iPSet.getParameter<edm::InputTag>("SiStripSrc");
+  // SiPxlSrc_ = iPSet.getParameter<edm::InputTag>("SiPxlSrc");
+  // MuDTSrc_ = iPSet.getParameter<edm::InputTag>("MuDTSrc");
+  // MuCSCStripSrc_ = iPSet.getParameter<edm::InputTag>("MuCSCStripSrc");
+  // MuCSCWireSrc_ = iPSet.getParameter<edm::InputTag>("MuCSCWireSrc");
+
+  // fix for consumes
   GlobalDigisSrc_Token_ = consumes<PGlobalDigi>(iPSet.getParameter<edm::InputTag>("GlobalDigisSrc"));
   // use value of first digit to determine default output level (inclusive)
   // 0 is none, 1 is basic, 2 is fill output, 3 is gather output
   verbosity %= 10;
 
   // create persistent object
-  //produces<PGlobalDigi>(label);
+  // produces<PGlobalDigi>(label);
 
   // print out Parameter Set information being used
   if (verbosity >= 0) {
-    edm::LogInfo(MsgLoggerCat) 
-      << "\n===============================\n"
-      << "Initialized as EDHistogrammer with parameter values:\n"
-      << "    Name          = " << fName << "\n"
-      << "    Verbosity     = " << verbosity << "\n"
-      << "    Frequency     = " << frequency << "\n"
-      << "    OutputFile    = " << outputfile << "\n"
-      << "    DoOutput      = " << doOutput << "\n"
-      << "    GetProv       = " << getAllProvenances << "\n"
-      << "    PrintProv     = " << printProvenanceInfo << "\n"
-      << "    Global Src    = " << GlobalDigisSrc_ << "\n"
-
-      << "===============================\n";
+    edm::LogInfo(MsgLoggerCat) << "\n===============================\n"
+                               << "Initialized as EDHistogrammer with parameter values:\n"
+                               << "    Name          = " << fName << "\n"
+                               << "    Verbosity     = " << verbosity << "\n"
+                               << "    Frequency     = " << frequency << "\n"
+                               << "    OutputFile    = " << outputfile << "\n"
+                               << "    DoOutput      = " << doOutput << "\n"
+                               << "    GetProv       = " << getAllProvenances << "\n"
+                               << "    PrintProv     = " << printProvenanceInfo << "\n"
+                               << "    Global Src    = " << GlobalDigisSrc_ << "\n"
+
+                               << "===============================\n";
   }
 }
 
-  // set default constants
-  // ECal
-
-  //ECalgainConv_[0] = 0.;
-  //ECalgainConv_[1] = 1.;
-  //ECalgainConv_[2] = 2.;
-  //ECalgainConv_[3] = 12.;  
-  //ECalbarrelADCtoGeV_ = 0.035;
-  //ECalendcapADCtoGeV_ = 0.06;
-
-void GlobalDigisHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
-  edm::Run const &, edm::EventSetup const & ){
-
-//monitor elements 
-
-//Si Strip  ***Done***
-  std::string SiStripString[19] = {"TECW1", "TECW2", "TECW3", "TECW4", "TECW5",
-      "TECW6", "TECW7", "TECW8", "TIBL1", "TIBL2", "TIBL3", "TIBL4", "TIDW1",
-      "TIDW2", "TIDW3", "TOBL1", "TOBL2", "TOBL3", "TOBL4"};
+// set default constants
+// ECal
+
+// ECalgainConv_[0] = 0.;
+// ECalgainConv_[1] = 1.;
+// ECalgainConv_[2] = 2.;
+// ECalgainConv_[3] = 12.;
+// ECalbarrelADCtoGeV_ = 0.035;
+// ECalendcapADCtoGeV_ = 0.06;
+
+void GlobalDigisHistogrammer::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &, edm::EventSetup const &) {
+  // monitor elements
+
+  // Si Strip  ***Done***
+  std::string SiStripString[19] = {"TECW1",
+                                   "TECW2",
+                                   "TECW3",
+                                   "TECW4",
+                                   "TECW5",
+                                   "TECW6",
+                                   "TECW7",
+                                   "TECW8",
+                                   "TIBL1",
+                                   "TIBL2",
+                                   "TIBL3",
+                                   "TIBL4",
+                                   "TIDW1",
+                                   "TIDW2",
+                                   "TIDW3",
+                                   "TOBL1",
+                                   "TOBL2",
+                                   "TOBL3",
+                                   "TOBL4"};
 
   for (int i = 0; i < 19; ++i) {
     mehSiStripn[i] = nullptr;
@@ -93,25 +108,25 @@ void GlobalDigisHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
   }
 
   ibooker.setCurrentFolder("GlobalDigisV/SiStrips");
-  for (int amend = 0; amend < 19; ++amend) { 
-    mehSiStripn[amend] = ibooker.book1D("hSiStripn_" + SiStripString[amend],
-        SiStripString[amend] + "  Digis", 500, 0., 1000.);
+  for (int amend = 0; amend < 19; ++amend) {
+    mehSiStripn[amend] =
+        ibooker.book1D("hSiStripn_" + SiStripString[amend], SiStripString[amend] + "  Digis", 500, 0., 1000.);
 
     mehSiStripn[amend]->setAxisTitle("Number of Digis", 1);
     mehSiStripn[amend]->setAxisTitle("Count", 2);
-    mehSiStripADC[amend] = ibooker.book1D("hSiStripADC_" + SiStripString[amend],
-        SiStripString[amend] + " ADC", 150, 0.0, 300.);
+    mehSiStripADC[amend] =
+        ibooker.book1D("hSiStripADC_" + SiStripString[amend], SiStripString[amend] + " ADC", 150, 0.0, 300.);
 
     mehSiStripADC[amend]->setAxisTitle("ADC", 1);
     mehSiStripADC[amend]->setAxisTitle("Count", 2);
-    mehSiStripStrip[amend] = ibooker.book1D("hSiStripStripADC_" + SiStripString[amend],
-        SiStripString[amend] + " Strip", 200, 0.0, 800.);
+    mehSiStripStrip[amend] =
+        ibooker.book1D("hSiStripStripADC_" + SiStripString[amend], SiStripString[amend] + " Strip", 200, 0.0, 800.);
     mehSiStripStrip[amend]->setAxisTitle("Strip Number", 1);
     mehSiStripStrip[amend]->setAxisTitle("Count", 2);
   }
 
-  //HCal  **DONE**
-  std::string HCalString[4] = {"HB", "HE", "HO","HF"};
+  // HCal  **DONE**
+  std::string HCalString[4] = {"HB", "HE", "HO", "HF"};
   float calnUpper[4] = {3000., 3000., 3000., 2000.};
   float calnLower[4] = {2000., 2000., 2000., 1000.};
   float SHEUpper[4] = {0.05, .05, 0.05, 20};
@@ -120,7 +135,7 @@ void GlobalDigisHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
   int SHEvAEEnBins[4] = {200, 200, 200, 40};
   double ProfileUpper[4] = {1., 1., 1., 20.};
 
-  for (int i =0; i<4; ++i) {
+  for (int i = 0; i < 4; ++i) {
     mehHcaln[i] = nullptr;
     mehHcalAEE[i] = nullptr;
     mehHcalSHE[i] = nullptr;
@@ -130,39 +145,46 @@ void GlobalDigisHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
 
   ibooker.setCurrentFolder("GlobalDigisV/HCals");
   for (int amend = 0; amend < 4; ++amend) {
-    mehHcaln[amend] = ibooker.book1D("hHcaln_" + HCalString[amend],
-        HCalString[amend] + "  digis", 1000, calnLower[amend], calnUpper[amend]);
+    mehHcaln[amend] = ibooker.book1D(
+        "hHcaln_" + HCalString[amend], HCalString[amend] + "  digis", 1000, calnLower[amend], calnUpper[amend]);
 
     mehHcaln[amend]->setAxisTitle("Number of Digis", 1);
     mehHcaln[amend]->setAxisTitle("Count", 2);
-    mehHcalAEE[amend] = ibooker.book1D("hHcalAEE_" + HCalString[amend],
-        HCalString[amend]+"Cal AEE", 60, -10., 50.);
+    mehHcalAEE[amend] = ibooker.book1D("hHcalAEE_" + HCalString[amend], HCalString[amend] + "Cal AEE", 60, -10., 50.);
 
     mehHcalAEE[amend]->setAxisTitle("Analog Equivalent Energy", 1);
     mehHcalAEE[amend]->setAxisTitle("Count", 2);
-    mehHcalSHE[amend] = ibooker.book1D("hHcalSHE_" + HCalString[amend],
-        HCalString[amend]+"Cal SHE", 100, 0.0, SHEUpper[amend]);
+    mehHcalSHE[amend] =
+        ibooker.book1D("hHcalSHE_" + HCalString[amend], HCalString[amend] + "Cal SHE", 100, 0.0, SHEUpper[amend]);
 
     mehHcalSHE[amend]->setAxisTitle("Simulated Hit Energy", 1);
     mehHcalSHE[amend]->setAxisTitle("Count", 2);
     mehHcalAEESHE[amend] = ibooker.book1D("hHcalAEESHE_" + HCalString[amend],
-        HCalString[amend] + "Cal AEE/SHE", SHEvAEEnBins[amend],
-        SHEvAEELower[amend], SHEvAEEUpper[amend]);
+                                          HCalString[amend] + "Cal AEE/SHE",
+                                          SHEvAEEnBins[amend],
+                                          SHEvAEELower[amend],
+                                          SHEvAEEUpper[amend]);
 
     mehHcalAEESHE[amend]->setAxisTitle("ADC / SHE", 1);
     mehHcalAEESHE[amend]->setAxisTitle("Count", 2);
-  
+
     //************  Not sure how to do Profile ME **************
     mehHcalSHEvAEE[amend] = ibooker.bookProfile("hHcalSHEvAEE_" + HCalString[amend],
-        HCalString[amend] + "Cal SHE vs. AEE", 60, (float)-10., (float)50., 100,
-        (float)0., (float)ProfileUpper[amend],"");
+                                                HCalString[amend] + "Cal SHE vs. AEE",
+                                                60,
+                                                (float)-10.,
+                                                (float)50.,
+                                                100,
+                                                (float)0.,
+                                                (float)ProfileUpper[amend],
+                                                "");
 
     mehHcalSHEvAEE[amend]->setAxisTitle("AEE / SHE", 1);
     mehHcalSHEvAEE[amend]->setAxisTitle("SHE", 2);
   }
 
-  //Ecal **Done **
-  std::string ECalString[2] = {"EB","EE"}; 
+  // Ecal **Done **
+  std::string ECalString[2] = {"EB", "EE"};
 
   for (int i = 0; i < 2; ++i) {
     mehEcaln[i] = nullptr;
@@ -175,37 +197,46 @@ void GlobalDigisHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
 
   ibooker.setCurrentFolder("GlobalDigisV/ECals");
   for (int amend = 0; amend < 2; ++amend) {
-    mehEcaln[amend] = ibooker.book1D("hEcaln_" + ECalString[amend],
-        ECalString[amend] + "  digis", 300, 1000., 4000.);
+    mehEcaln[amend] = ibooker.book1D("hEcaln_" + ECalString[amend], ECalString[amend] + "  digis", 300, 1000., 4000.);
 
     mehEcaln[amend]->setAxisTitle("Number of Digis", 1);
     mehEcaln[amend]->setAxisTitle("Count", 2);
-    mehEcalAEE[amend] = ibooker.book1D("hEcalAEE_" + ECalString[amend],
-        ECalString[amend] + "Cal AEE", 100, 0., 1.);
+    mehEcalAEE[amend] = ibooker.book1D("hEcalAEE_" + ECalString[amend], ECalString[amend] + "Cal AEE", 100, 0., 1.);
 
     mehEcalAEE[amend]->setAxisTitle("Analog Equivalent Energy", 1);
     mehEcalAEE[amend]->setAxisTitle("Count", 2);
-    mehEcalSHE[amend] = ibooker.book1D("hEcalSHE_" + ECalString[amend],
-        ECalString[amend] + "Cal SHE", 50, 0., 5.);
+    mehEcalSHE[amend] = ibooker.book1D("hEcalSHE_" + ECalString[amend], ECalString[amend] + "Cal SHE", 50, 0., 5.);
 
     mehEcalSHE[amend]->setAxisTitle("Simulated Hit Energy", 1);
     mehEcalSHE[amend]->setAxisTitle("Count", 2);
-    mehEcalMaxPos[amend] = ibooker.book1D("hEcalMaxPos_" + ECalString[amend],
-        ECalString[amend] + "Cal MaxPos", 10, 0., 10.);
+    mehEcalMaxPos[amend] =
+        ibooker.book1D("hEcalMaxPos_" + ECalString[amend], ECalString[amend] + "Cal MaxPos", 10, 0., 10.);
 
     mehEcalMaxPos[amend]->setAxisTitle("Maximum Position", 1);
     mehEcalMaxPos[amend]->setAxisTitle("Count", 2);
-    
+
     //************  Not sure how to do Profile ME **************
     mehEcalSHEvAEESHE[amend] = ibooker.bookProfile("hEcalSHEvAEESHE_" + ECalString[amend],
-        ECalString[amend] + "Cal SHE vs. AEE/SHE", 100, (float)0., (float)10., 50,
-        (float)0., (float)5., "");
+                                                   ECalString[amend] + "Cal SHE vs. AEE/SHE",
+                                                   100,
+                                                   (float)0.,
+                                                   (float)10.,
+                                                   50,
+                                                   (float)0.,
+                                                   (float)5.,
+                                                   "");
 
     mehEcalSHEvAEESHE[amend]->setAxisTitle("AEE / SHE", 1);
     mehEcalSHEvAEESHE[amend]->setAxisTitle("SHE", 2);
     mehEcalMultvAEE[amend] = ibooker.bookProfile("hEcalMultvAEE_" + ECalString[amend],
-        ECalString[amend] + "Cal Multi vs. AEE", 100, (float)0., (float)10., 400,
-        (float)0., (float)4000., "");
+                                                 ECalString[amend] + "Cal Multi vs. AEE",
+                                                 100,
+                                                 (float)0.,
+                                                 (float)10.,
+                                                 400,
+                                                 (float)0.,
+                                                 (float)4000.,
+                                                 "");
     mehEcalMultvAEE[amend]->setAxisTitle("Analog Equivalent Energy", 1);
     mehEcalMultvAEE[amend]->setAxisTitle("Number of Digis", 2);
   }
@@ -217,16 +248,14 @@ void GlobalDigisHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
   std::string ADCNumber[3] = {"0", "1", "2"};
   for (int i = 0; i < 3; ++i) {
     mehEScalADC[i] = nullptr;
-    mehEScalADC[i] = ibooker.book1D(
-        "hEcalADC" + ADCNumber[i] + "_ES","ESCAL  ADC" + ADCNumber[i], 150, 950., 1500.);
+    mehEScalADC[i] = ibooker.book1D("hEcalADC" + ADCNumber[i] + "_ES", "ESCAL  ADC" + ADCNumber[i], 150, 950., 1500.);
 
     mehEScalADC[i]->setAxisTitle("ADC" + ADCNumber[i], 1);
     mehEScalADC[i]->setAxisTitle("Count", 2);
   }
 
-  //Si Pixels ***DONE***  
-  std::string SiPixelString[7] = {"BRL1", "BRL2", "BRL3", "FWD1n", "FWD1p", "FWD2n",
-      "FWD2p"};
+  // Si Pixels ***DONE***
+  std::string SiPixelString[7] = {"BRL1", "BRL2", "BRL3", "FWD1n", "FWD1p", "FWD2n", "FWD2p"};
 
   for (int j = 0; j < 7; ++j) {
     mehSiPixeln[j] = nullptr;
@@ -238,34 +267,33 @@ void GlobalDigisHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
   ibooker.setCurrentFolder("GlobalDigisV/SiPixels");
   for (int amend = 0; amend < 7; ++amend) {
     if (amend < 3) {
-      mehSiPixeln[amend] = ibooker.book1D("hSiPixeln_" + SiPixelString[amend],
-          SiPixelString[amend] + " Digis", 50, 0., 100.);
-    }
-    else {
-      mehSiPixeln[amend] = ibooker.book1D("hSiPixeln_" + SiPixelString[amend],
-          SiPixelString[amend] + " Digis", 25, 0., 50.);
+      mehSiPixeln[amend] =
+          ibooker.book1D("hSiPixeln_" + SiPixelString[amend], SiPixelString[amend] + " Digis", 50, 0., 100.);
+    } else {
+      mehSiPixeln[amend] =
+          ibooker.book1D("hSiPixeln_" + SiPixelString[amend], SiPixelString[amend] + " Digis", 25, 0., 50.);
     }
 
     mehSiPixeln[amend]->setAxisTitle("Number of Digis", 1);
     mehSiPixeln[amend]->setAxisTitle("Count", 2);
-    mehSiPixelADC[amend] = ibooker.book1D("hSiPixelADC_" + SiPixelString[amend],
-        SiPixelString[amend] + " ADC", 150, 0.0, 300.);
+    mehSiPixelADC[amend] =
+        ibooker.book1D("hSiPixelADC_" + SiPixelString[amend], SiPixelString[amend] + " ADC", 150, 0.0, 300.);
 
     mehSiPixelADC[amend]->setAxisTitle("ADC", 1);
     mehSiPixelADC[amend]->setAxisTitle("Count", 2);
-    mehSiPixelRow[amend] = ibooker.book1D("hSiPixelRow_" + SiPixelString[amend],
-        SiPixelString[amend] + " Row", 100, 0.0, 100.);
+    mehSiPixelRow[amend] =
+        ibooker.book1D("hSiPixelRow_" + SiPixelString[amend], SiPixelString[amend] + " Row", 100, 0.0, 100.);
 
     mehSiPixelRow[amend]->setAxisTitle("Row Number", 1);
     mehSiPixelRow[amend]->setAxisTitle("Count", 2);
-    mehSiPixelCol[amend] = ibooker.book1D("hSiPixelColumn_" + SiPixelString[amend],
-        SiPixelString[amend] + " Column", 200, 0.0, 500.);
+    mehSiPixelCol[amend] =
+        ibooker.book1D("hSiPixelColumn_" + SiPixelString[amend], SiPixelString[amend] + " Column", 200, 0.0, 500.);
 
     mehSiPixelCol[amend]->setAxisTitle("Column Number", 1);
     mehSiPixelCol[amend]->setAxisTitle("Count", 2);
   }
 
-  //Muons ***DONE****
+  // Muons ***DONE****
   ibooker.setCurrentFolder("GlobalDigisV/Muons");
   std::string MuonString[4] = {"MB1", "MB2", "MB3", "MB4"};
 
@@ -277,31 +305,27 @@ void GlobalDigisHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
   }
 
   for (int j = 0; j < 4; ++j) {
-    mehDtMuonn[j] = ibooker.book1D("hDtMuonn_" + MuonString[j],
-        MuonString[j] + "  digis", 25, 0., 50.);
+    mehDtMuonn[j] = ibooker.book1D("hDtMuonn_" + MuonString[j], MuonString[j] + "  digis", 25, 0., 50.);
 
     mehDtMuonn[j]->setAxisTitle("Number of Digis", 1);
     mehDtMuonn[j]->setAxisTitle("Count", 2);
-    mehDtMuonLayer[j] = ibooker.book1D("hDtLayer_" + MuonString[j],
-        MuonString[j]+"  Layer", 12, 1., 13.);
+    mehDtMuonLayer[j] = ibooker.book1D("hDtLayer_" + MuonString[j], MuonString[j] + "  Layer", 12, 1., 13.);
 
     mehDtMuonLayer[j]->setAxisTitle("4 * (SuperLayer - 1) + Layer", 1);
     mehDtMuonLayer[j]->setAxisTitle("Count", 2);
-    mehDtMuonTime[j] = ibooker.book1D("hDtMuonTime_" + MuonString[j],
-        MuonString[j] + "  Time", 300, 400., 1000.);
+    mehDtMuonTime[j] = ibooker.book1D("hDtMuonTime_" + MuonString[j], MuonString[j] + "  Time", 300, 400., 1000.);
 
     mehDtMuonTime[j]->setAxisTitle("Time", 1);
     mehDtMuonTime[j]->setAxisTitle("Count", 2);
-    mehDtMuonTimevLayer[j] = ibooker.bookProfile("hDtMuonTimevLayer_" + MuonString[j],
-        MuonString[j] + "  Time vs. Layer", 12, 1., 13., 300, 400., 1000., "");
+    mehDtMuonTimevLayer[j] = ibooker.bookProfile(
+        "hDtMuonTimevLayer_" + MuonString[j], MuonString[j] + "  Time vs. Layer", 12, 1., 13., 300, 400., 1000., "");
 
     mehDtMuonTimevLayer[j]->setAxisTitle("4 * (SuperLayer - 1) + Layer", 1);
     mehDtMuonTimevLayer[j]->setAxisTitle("Time", 2);
   }
 
-
   //  ****  Have to do CSC and RPC now *****
-  //CSC 
+  // CSC
   mehCSCStripn = nullptr;
   mehCSCStripn = ibooker.book1D("hCSCStripn", "CSC Strip digis", 25, 0., 50.);
   mehCSCStripn->setAxisTitle("Number of Digis", 1);
@@ -322,15 +346,11 @@ void GlobalDigisHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
   mehCSCWiren->setAxisTitle("Time", 1);
   mehCSCWiren->setAxisTitle("Count", 2);
 
-} //close bookHistograms
+}  // close bookHistograms
 
-GlobalDigisHistogrammer::~GlobalDigisHistogrammer() 
-{
-}
+GlobalDigisHistogrammer::~GlobalDigisHistogrammer() {}
 
-void GlobalDigisHistogrammer::analyze(const edm::Event& iEvent, 
-				  const edm::EventSetup& iSetup)
-{
+void GlobalDigisHistogrammer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalDigisHistogrammer_analyze";
 
   // keep track of number of events processed
@@ -341,66 +361,57 @@ void GlobalDigisHistogrammer::analyze(const edm::Event& iEvent,
   edm::EventNumber_t nevt = iEvent.id().event();
 
   if (verbosity > 0) {
-    edm::LogInfo(MsgLoggerCat)
-      << "Processing run " << nrun << ", event " << nevt
-      << " (" << count << " events total)";
+    edm::LogInfo(MsgLoggerCat) << "Processing run " << nrun << ", event " << nevt << " (" << count << " events total)";
   } else if (verbosity == 0) {
-    if (nevt%frequency == 0 || nevt == 1) {
-      edm::LogInfo(MsgLoggerCat)
-	<< "Processing run " << nrun << ", event " << nevt
-	<< " (" << count << " events total)";
+    if (nevt % frequency == 0 || nevt == 1) {
+      edm::LogInfo(MsgLoggerCat) << "Processing run " << nrun << ", event " << nevt << " (" << count
+                                 << " events total)";
     }
   }
 
   // clear event holders
-  //clear();
+  // clear();
 
   // look at information available in the event
   if (getAllProvenances) {
-
-    std::vector<const edm::StableProvenance*> AllProv;
+    std::vector<const edm::StableProvenance *> AllProv;
     iEvent.getAllStableProvenance(AllProv);
 
     if (verbosity >= 0)
-      edm::LogInfo(MsgLoggerCat)
-	<< "Number of Provenances = " << AllProv.size();
+      edm::LogInfo(MsgLoggerCat) << "Number of Provenances = " << AllProv.size();
 
     if (printProvenanceInfo && (verbosity >= 0)) {
-      TString eventout("\nProvenance info:\n");      
+      TString eventout("\nProvenance info:\n");
 
       for (unsigned int i = 0; i < AllProv.size(); ++i) {
-	eventout += "\n       ******************************";
-	eventout += "\n       Module       : ";
-	//eventout += (AllProv[i]->product).moduleLabel();
-	eventout += AllProv[i]->moduleLabel();
-	eventout += "\n       ProductID    : ";
-	//eventout += (AllProv[i]->product).productID_.id_;
-	eventout += AllProv[i]->productID().id();
-	eventout += "\n       ClassName    : ";
-	//eventout += (AllProv[i]->product).fullClassName_;
-	eventout += AllProv[i]->className();
-	eventout += "\n       InstanceName : ";
-	//eventout += (AllProv[i]->product).productInstanceName_;
-	eventout += AllProv[i]->productInstanceName();
-	eventout += "\n       BranchName   : ";
-	//eventout += (AllProv[i]->product).branchName_;
-	eventout += AllProv[i]->branchName();
+        eventout += "\n       ******************************";
+        eventout += "\n       Module       : ";
+        // eventout += (AllProv[i]->product).moduleLabel();
+        eventout += AllProv[i]->moduleLabel();
+        eventout += "\n       ProductID    : ";
+        // eventout += (AllProv[i]->product).productID_.id_;
+        eventout += AllProv[i]->productID().id();
+        eventout += "\n       ClassName    : ";
+        // eventout += (AllProv[i]->product).fullClassName_;
+        eventout += AllProv[i]->className();
+        eventout += "\n       InstanceName : ";
+        // eventout += (AllProv[i]->product).productInstanceName_;
+        eventout += AllProv[i]->productInstanceName();
+        eventout += "\n       BranchName   : ";
+        // eventout += (AllProv[i]->product).branchName_;
+        eventout += AllProv[i]->branchName();
       }
       eventout += "\n       ******************************\n";
       edm::LogInfo(MsgLoggerCat) << eventout << "\n";
       printProvenanceInfo = false;
       getAllProvenances = false;
     }
-edm::Handle<PGlobalDigi> srcGlobalDigis;
-  iEvent.getByToken(GlobalDigisSrc_Token_,srcGlobalDigis);
-  if (!srcGlobalDigis.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find PGlobalDigis in event!";
-    return;
-
-  }
-
-    
+    edm::Handle<PGlobalDigi> srcGlobalDigis;
+    iEvent.getByToken(GlobalDigisSrc_Token_, srcGlobalDigis);
+    if (!srcGlobalDigis.isValid()) {
+      edm::LogWarning(MsgLoggerCat) << "Unable to find PGlobalDigis in event!";
+      return;
+    }
 
     int nEBCalDigis = srcGlobalDigis->getnEBCalDigis();
     int nEECalDigis = srcGlobalDigis->getnEECalDigis();
@@ -409,282 +420,250 @@ edm::Handle<PGlobalDigi> srcGlobalDigis;
     int nHBCalDigis = srcGlobalDigis->getnHBCalDigis();
     int nHECalDigis = srcGlobalDigis->getnHECalDigis();
     int nHOCalDigis = srcGlobalDigis->getnHOCalDigis();
-    int nHFCalDigis = srcGlobalDigis->getnHFCalDigis();        
-
-    int nTIBL1Digis = srcGlobalDigis->getnTIBL1Digis();    
-    int nTIBL2Digis = srcGlobalDigis->getnTIBL2Digis();    
-    int nTIBL3Digis = srcGlobalDigis->getnTIBL3Digis();    
-    int nTIBL4Digis = srcGlobalDigis->getnTIBL4Digis();    
-    int nTOBL1Digis = srcGlobalDigis->getnTOBL1Digis();    
-    int nTOBL2Digis = srcGlobalDigis->getnTOBL2Digis();    
-    int nTOBL3Digis = srcGlobalDigis->getnTOBL3Digis();    
-    int nTOBL4Digis = srcGlobalDigis->getnTOBL4Digis();    
-    int nTIDW1Digis = srcGlobalDigis->getnTIDW1Digis();    
-    int nTIDW2Digis = srcGlobalDigis->getnTIDW2Digis();    
-    int nTIDW3Digis = srcGlobalDigis->getnTIDW3Digis();    
-    int nTECW1Digis = srcGlobalDigis->getnTECW1Digis();    
-    int nTECW2Digis = srcGlobalDigis->getnTECW2Digis();    
-    int nTECW3Digis = srcGlobalDigis->getnTECW3Digis();  
-    int nTECW4Digis = srcGlobalDigis->getnTECW4Digis();    
-    int nTECW5Digis = srcGlobalDigis->getnTECW5Digis();    
-    int nTECW6Digis = srcGlobalDigis->getnTECW6Digis();  
-    int nTECW7Digis = srcGlobalDigis->getnTECW7Digis();    
+    int nHFCalDigis = srcGlobalDigis->getnHFCalDigis();
+
+    int nTIBL1Digis = srcGlobalDigis->getnTIBL1Digis();
+    int nTIBL2Digis = srcGlobalDigis->getnTIBL2Digis();
+    int nTIBL3Digis = srcGlobalDigis->getnTIBL3Digis();
+    int nTIBL4Digis = srcGlobalDigis->getnTIBL4Digis();
+    int nTOBL1Digis = srcGlobalDigis->getnTOBL1Digis();
+    int nTOBL2Digis = srcGlobalDigis->getnTOBL2Digis();
+    int nTOBL3Digis = srcGlobalDigis->getnTOBL3Digis();
+    int nTOBL4Digis = srcGlobalDigis->getnTOBL4Digis();
+    int nTIDW1Digis = srcGlobalDigis->getnTIDW1Digis();
+    int nTIDW2Digis = srcGlobalDigis->getnTIDW2Digis();
+    int nTIDW3Digis = srcGlobalDigis->getnTIDW3Digis();
+    int nTECW1Digis = srcGlobalDigis->getnTECW1Digis();
+    int nTECW2Digis = srcGlobalDigis->getnTECW2Digis();
+    int nTECW3Digis = srcGlobalDigis->getnTECW3Digis();
+    int nTECW4Digis = srcGlobalDigis->getnTECW4Digis();
+    int nTECW5Digis = srcGlobalDigis->getnTECW5Digis();
+    int nTECW6Digis = srcGlobalDigis->getnTECW6Digis();
+    int nTECW7Digis = srcGlobalDigis->getnTECW7Digis();
     int nTECW8Digis = srcGlobalDigis->getnTECW8Digis();
 
-    int nBRL1Digis = srcGlobalDigis->getnBRL1Digis();    
-    int nBRL2Digis = srcGlobalDigis->getnBRL2Digis();    
-    int nBRL3Digis = srcGlobalDigis->getnBRL3Digis();       
+    int nBRL1Digis = srcGlobalDigis->getnBRL1Digis();
+    int nBRL2Digis = srcGlobalDigis->getnBRL2Digis();
+    int nBRL3Digis = srcGlobalDigis->getnBRL3Digis();
     int nFWD1nDigis = srcGlobalDigis->getnFWD1nDigis();
-    int nFWD1pDigis = srcGlobalDigis->getnFWD1pDigis();    
-    int nFWD2nDigis = srcGlobalDigis->getnFWD2nDigis();    
-    int nFWD2pDigis = srcGlobalDigis->getnFWD2pDigis(); 
-  
-    int nMB1Digis = srcGlobalDigis->getnMB1Digis();  
-    int nMB2Digis = srcGlobalDigis->getnMB2Digis();  
-    int nMB3Digis = srcGlobalDigis->getnMB3Digis();  
-    int nMB4Digis = srcGlobalDigis->getnMB4Digis();  
+    int nFWD1pDigis = srcGlobalDigis->getnFWD1pDigis();
+    int nFWD2nDigis = srcGlobalDigis->getnFWD2nDigis();
+    int nFWD2pDigis = srcGlobalDigis->getnFWD2pDigis();
+
+    int nMB1Digis = srcGlobalDigis->getnMB1Digis();
+    int nMB2Digis = srcGlobalDigis->getnMB2Digis();
+    int nMB3Digis = srcGlobalDigis->getnMB3Digis();
+    int nMB4Digis = srcGlobalDigis->getnMB4Digis();
 
     int nCSCstripDigis = srcGlobalDigis->getnCSCstripDigis();
 
     int nCSCwireDigis = srcGlobalDigis->getnCSCwireDigis();
 
-  // get Ecal info
-    std::vector<PGlobalDigi::ECalDigi> EECalDigis = 
-      srcGlobalDigis->getEECalDigis();
+    // get Ecal info
+    std::vector<PGlobalDigi::ECalDigi> EECalDigis = srcGlobalDigis->getEECalDigis();
     mehEcaln[0]->Fill((float)nEECalDigis);
     for (unsigned int i = 0; i < EECalDigis.size(); ++i) {
       mehEcalAEE[0]->Fill(EECalDigis[i].AEE);
       mehEcalMaxPos[0]->Fill(EECalDigis[i].maxPos);
-      mehEcalMultvAEE[0]->Fill(EECalDigis[i].AEE,(float)nEECalDigis,1);
+      mehEcalMultvAEE[0]->Fill(EECalDigis[i].AEE, (float)nEECalDigis, 1);
       if (EECalDigis[i].SHE != 0.) {
-	mehEcalSHE[0]->Fill(EECalDigis[i].SHE);
-	mehEcalSHEvAEESHE[0]->
-	  Fill(EECalDigis[i].AEE/EECalDigis[i].SHE,EECalDigis[i].SHE,1);
+        mehEcalSHE[0]->Fill(EECalDigis[i].SHE);
+        mehEcalSHEvAEESHE[0]->Fill(EECalDigis[i].AEE / EECalDigis[i].SHE, EECalDigis[i].SHE, 1);
       }
     }
-    
-    std::vector<PGlobalDigi::ECalDigi> EBCalDigis = 
-      srcGlobalDigis->getEBCalDigis();
+
+    std::vector<PGlobalDigi::ECalDigi> EBCalDigis = srcGlobalDigis->getEBCalDigis();
     mehEcaln[1]->Fill((float)nEBCalDigis);
     for (unsigned int i = 0; i < EBCalDigis.size(); ++i) {
       mehEcalAEE[1]->Fill(EBCalDigis[i].AEE);
       mehEcalMaxPos[1]->Fill(EBCalDigis[i].maxPos);
-      mehEcalMultvAEE[1]->Fill(EBCalDigis[i].AEE,(float)nEBCalDigis,1);
+      mehEcalMultvAEE[1]->Fill(EBCalDigis[i].AEE, (float)nEBCalDigis, 1);
       if (EBCalDigis[i].SHE != 0.) {
-	mehEcalSHE[1]->Fill(EBCalDigis[i].SHE);
-	mehEcalSHEvAEESHE[1]->
-	  Fill(EBCalDigis[i].AEE/EBCalDigis[i].SHE,EBCalDigis[i].SHE,1);
+        mehEcalSHE[1]->Fill(EBCalDigis[i].SHE);
+        mehEcalSHEvAEESHE[1]->Fill(EBCalDigis[i].AEE / EBCalDigis[i].SHE, EBCalDigis[i].SHE, 1);
       }
     }
-    
-    std::vector<PGlobalDigi::ESCalDigi> ESCalDigis = 
-      srcGlobalDigis->getESCalDigis();   
+
+    std::vector<PGlobalDigi::ESCalDigi> ESCalDigis = srcGlobalDigis->getESCalDigis();
     mehEcaln[2]->Fill((float)nESCalDigis);
     for (unsigned int i = 0; i < ESCalDigis.size(); ++i) {
       mehEScalADC[0]->Fill(ESCalDigis[i].ADC0);
       mehEScalADC[1]->Fill(ESCalDigis[i].ADC1);
       mehEScalADC[2]->Fill(ESCalDigis[i].ADC2);
     }
-    
+
     // Get HCal info
-    std::vector<PGlobalDigi::HCalDigi> HBCalDigis = 
-      srcGlobalDigis->getHBCalDigis();
+    std::vector<PGlobalDigi::HCalDigi> HBCalDigis = srcGlobalDigis->getHBCalDigis();
     mehHcaln[0]->Fill((float)nHBCalDigis);
     for (unsigned int i = 0; i < HBCalDigis.size(); ++i) {
       mehHcalAEE[0]->Fill(HBCalDigis[i].AEE);
       if (HBCalDigis[i].SHE != 0.) {
-	mehHcalSHE[0]->Fill(HBCalDigis[i].SHE);
-	mehHcalAEESHE[0]->Fill(HBCalDigis[i].AEE/HBCalDigis[i].SHE);
-	mehHcalSHEvAEE[0]->
-	  Fill(HBCalDigis[i].AEE,HBCalDigis[i].SHE,1);
+        mehHcalSHE[0]->Fill(HBCalDigis[i].SHE);
+        mehHcalAEESHE[0]->Fill(HBCalDigis[i].AEE / HBCalDigis[i].SHE);
+        mehHcalSHEvAEE[0]->Fill(HBCalDigis[i].AEE, HBCalDigis[i].SHE, 1);
       }
     }
-    std::vector<PGlobalDigi::HCalDigi> HECalDigis = 
-      srcGlobalDigis->getHECalDigis();
+    std::vector<PGlobalDigi::HCalDigi> HECalDigis = srcGlobalDigis->getHECalDigis();
     mehHcaln[1]->Fill((float)nHECalDigis);
     for (unsigned int i = 0; i < HECalDigis.size(); ++i) {
       mehHcalAEE[1]->Fill(HECalDigis[i].AEE);
       if (HECalDigis[i].SHE != 0.) {
-	mehHcalSHE[1]->Fill(HECalDigis[i].SHE);
-	mehHcalAEESHE[1]->Fill(HECalDigis[i].AEE/HECalDigis[i].SHE);
-	mehHcalSHEvAEE[1]->
-	  Fill(HECalDigis[i].AEE,HECalDigis[i].SHE,1);
+        mehHcalSHE[1]->Fill(HECalDigis[i].SHE);
+        mehHcalAEESHE[1]->Fill(HECalDigis[i].AEE / HECalDigis[i].SHE);
+        mehHcalSHEvAEE[1]->Fill(HECalDigis[i].AEE, HECalDigis[i].SHE, 1);
       }
     }
 
-    std::vector<PGlobalDigi::HCalDigi> HOCalDigis = 
-      srcGlobalDigis->getHOCalDigis();
+    std::vector<PGlobalDigi::HCalDigi> HOCalDigis = srcGlobalDigis->getHOCalDigis();
     mehHcaln[2]->Fill((float)nHOCalDigis);
     for (unsigned int i = 0; i < HOCalDigis.size(); ++i) {
       mehHcalAEE[2]->Fill(HOCalDigis[i].AEE);
       if (HOCalDigis[i].SHE != 0.) {
-	mehHcalSHE[2]->Fill(HOCalDigis[i].SHE);
-	mehHcalAEESHE[2]->Fill(HOCalDigis[i].AEE/HOCalDigis[i].SHE);
-	mehHcalSHEvAEE[2]->
-	  Fill(HOCalDigis[i].AEE,HOCalDigis[i].SHE,1);
+        mehHcalSHE[2]->Fill(HOCalDigis[i].SHE);
+        mehHcalAEESHE[2]->Fill(HOCalDigis[i].AEE / HOCalDigis[i].SHE);
+        mehHcalSHEvAEE[2]->Fill(HOCalDigis[i].AEE, HOCalDigis[i].SHE, 1);
       }
     }
 
-    std::vector<PGlobalDigi::HCalDigi> HFCalDigis = 
-      srcGlobalDigis->getHFCalDigis();
+    std::vector<PGlobalDigi::HCalDigi> HFCalDigis = srcGlobalDigis->getHFCalDigis();
     mehHcaln[3]->Fill((float)nHFCalDigis);
     for (unsigned int i = 0; i < HFCalDigis.size(); ++i) {
       mehHcalAEE[3]->Fill(HFCalDigis[i].AEE);
       if (HFCalDigis[i].SHE != 0.) {
-	mehHcalSHE[3]->Fill(HFCalDigis[i].SHE);
-	mehHcalAEESHE[3]->Fill(HFCalDigis[i].AEE/HFCalDigis[i].SHE);
-	mehHcalSHEvAEE[3]->
-	  Fill(HFCalDigis[i].AEE,HFCalDigis[i].SHE,1);
+        mehHcalSHE[3]->Fill(HFCalDigis[i].SHE);
+        mehHcalAEESHE[3]->Fill(HFCalDigis[i].AEE / HFCalDigis[i].SHE);
+        mehHcalSHEvAEE[3]->Fill(HFCalDigis[i].AEE, HFCalDigis[i].SHE, 1);
       }
     }
 
     // get SiStrip info
-    std::vector<PGlobalDigi::SiStripDigi> TIBL1Digis =
-      srcGlobalDigis->getTIBL1Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TIBL1Digis = srcGlobalDigis->getTIBL1Digis();
     mehSiStripn[0]->Fill((float)nTIBL1Digis);
     for (unsigned int i = 0; i < TIBL1Digis.size(); ++i) {
       mehSiStripADC[0]->Fill(TIBL1Digis[i].ADC);
       mehSiStripStrip[0]->Fill(TIBL1Digis[i].STRIP);
     }
 
-    std::vector<PGlobalDigi::SiStripDigi> TIBL2Digis =
-      srcGlobalDigis->getTIBL2Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TIBL2Digis = srcGlobalDigis->getTIBL2Digis();
     mehSiStripn[1]->Fill((float)nTIBL2Digis);
     for (unsigned int i = 0; i < TIBL2Digis.size(); ++i) {
       mehSiStripADC[1]->Fill(TIBL2Digis[i].ADC);
       mehSiStripStrip[1]->Fill(TIBL2Digis[i].STRIP);
     }
 
-    std::vector<PGlobalDigi::SiStripDigi> TIBL3Digis =
-      srcGlobalDigis->getTIBL3Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TIBL3Digis = srcGlobalDigis->getTIBL3Digis();
     mehSiStripn[2]->Fill((float)nTIBL3Digis);
     for (unsigned int i = 0; i < TIBL3Digis.size(); ++i) {
       mehSiStripADC[2]->Fill(TIBL3Digis[i].ADC);
       mehSiStripStrip[2]->Fill(TIBL3Digis[i].STRIP);
     }
 
-    std::vector<PGlobalDigi::SiStripDigi> TIBL4Digis =
-      srcGlobalDigis->getTIBL4Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TIBL4Digis = srcGlobalDigis->getTIBL4Digis();
     mehSiStripn[3]->Fill((float)nTIBL4Digis);
     for (unsigned int i = 0; i < TIBL4Digis.size(); ++i) {
       mehSiStripADC[3]->Fill(TIBL4Digis[i].ADC);
       mehSiStripStrip[3]->Fill(TIBL4Digis[i].STRIP);
     }
 
-    std::vector<PGlobalDigi::SiStripDigi> TOBL1Digis =
-      srcGlobalDigis->getTOBL1Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TOBL1Digis = srcGlobalDigis->getTOBL1Digis();
     mehSiStripn[4]->Fill((float)nTOBL1Digis);
     for (unsigned int i = 0; i < TOBL1Digis.size(); ++i) {
       mehSiStripADC[4]->Fill(TOBL1Digis[i].ADC);
       mehSiStripStrip[4]->Fill(TOBL1Digis[i].STRIP);
     }
 
-    std::vector<PGlobalDigi::SiStripDigi> TOBL2Digis =
-      srcGlobalDigis->getTOBL2Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TOBL2Digis = srcGlobalDigis->getTOBL2Digis();
     mehSiStripn[5]->Fill((float)nTOBL2Digis);
     for (unsigned int i = 0; i < TOBL2Digis.size(); ++i) {
       mehSiStripADC[5]->Fill(TOBL2Digis[i].ADC);
       mehSiStripStrip[5]->Fill(TOBL2Digis[i].STRIP);
     }
 
-    std::vector<PGlobalDigi::SiStripDigi> TOBL3Digis =
-      srcGlobalDigis->getTOBL3Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TOBL3Digis = srcGlobalDigis->getTOBL3Digis();
     mehSiStripn[6]->Fill((float)nTOBL3Digis);
     for (unsigned int i = 0; i < TOBL3Digis.size(); ++i) {
       mehSiStripADC[6]->Fill(TOBL3Digis[i].ADC);
       mehSiStripStrip[6]->Fill(TOBL3Digis[i].STRIP);
     }
 
-    std::vector<PGlobalDigi::SiStripDigi> TOBL4Digis =
-      srcGlobalDigis->getTOBL4Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TOBL4Digis = srcGlobalDigis->getTOBL4Digis();
     mehSiStripn[7]->Fill((float)nTOBL4Digis);
     for (unsigned int i = 0; i < TOBL4Digis.size(); ++i) {
       mehSiStripADC[7]->Fill(TOBL4Digis[i].ADC);
       mehSiStripStrip[7]->Fill(TOBL4Digis[i].STRIP);
     }
 
-    std::vector<PGlobalDigi::SiStripDigi> TIDW1Digis =
-      srcGlobalDigis->getTIDW1Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TIDW1Digis = srcGlobalDigis->getTIDW1Digis();
     mehSiStripn[8]->Fill((float)nTIDW1Digis);
     for (unsigned int i = 0; i < TIDW1Digis.size(); ++i) {
       mehSiStripADC[8]->Fill(TIDW1Digis[i].ADC);
       mehSiStripStrip[8]->Fill(TIDW1Digis[i].STRIP);
     }
 
-    std::vector<PGlobalDigi::SiStripDigi> TIDW2Digis =
-      srcGlobalDigis->getTIDW2Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TIDW2Digis = srcGlobalDigis->getTIDW2Digis();
     mehSiStripn[9]->Fill((float)nTIDW2Digis);
     for (unsigned int i = 0; i < TIDW2Digis.size(); ++i) {
       mehSiStripADC[9]->Fill(TIDW2Digis[i].ADC);
       mehSiStripStrip[9]->Fill(TIDW2Digis[i].STRIP);
     }
 
-    std::vector<PGlobalDigi::SiStripDigi> TIDW3Digis =
-      srcGlobalDigis->getTIDW3Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TIDW3Digis = srcGlobalDigis->getTIDW3Digis();
     mehSiStripn[10]->Fill((float)nTIDW3Digis);
     for (unsigned int i = 0; i < TIDW3Digis.size(); ++i) {
       mehSiStripADC[10]->Fill(TIDW3Digis[i].ADC);
       mehSiStripStrip[10]->Fill(TIDW3Digis[i].STRIP);
     }
 
-    std::vector<PGlobalDigi::SiStripDigi> TECW1Digis =
-      srcGlobalDigis->getTECW1Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TECW1Digis = srcGlobalDigis->getTECW1Digis();
     mehSiStripn[11]->Fill((float)nTECW1Digis);
     for (unsigned int i = 0; i < TECW1Digis.size(); ++i) {
       mehSiStripADC[11]->Fill(TECW1Digis[i].ADC);
       mehSiStripStrip[11]->Fill(TECW1Digis[i].STRIP);
     }
 
-    std::vector<PGlobalDigi::SiStripDigi> TECW2Digis =
-      srcGlobalDigis->getTECW2Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TECW2Digis = srcGlobalDigis->getTECW2Digis();
     mehSiStripn[12]->Fill((float)nTECW2Digis);
     for (unsigned int i = 0; i < TECW2Digis.size(); ++i) {
       mehSiStripADC[12]->Fill(TECW2Digis[i].ADC);
       mehSiStripStrip[12]->Fill(TECW2Digis[i].STRIP);
     }
 
-    std::vector<PGlobalDigi::SiStripDigi> TECW3Digis =
-      srcGlobalDigis->getTECW3Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TECW3Digis = srcGlobalDigis->getTECW3Digis();
     mehSiStripn[13]->Fill((float)nTECW3Digis);
     for (unsigned int i = 0; i < TECW3Digis.size(); ++i) {
       mehSiStripADC[13]->Fill(TECW3Digis[i].ADC);
       mehSiStripStrip[13]->Fill(TECW3Digis[i].STRIP);
     }
 
-    std::vector<PGlobalDigi::SiStripDigi> TECW4Digis =
-      srcGlobalDigis->getTECW4Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TECW4Digis = srcGlobalDigis->getTECW4Digis();
     mehSiStripn[14]->Fill((float)nTECW4Digis);
     for (unsigned int i = 0; i < TECW4Digis.size(); ++i) {
       mehSiStripADC[14]->Fill(TECW4Digis[i].ADC);
       mehSiStripStrip[14]->Fill(TECW4Digis[i].STRIP);
     }
 
-    std::vector<PGlobalDigi::SiStripDigi> TECW5Digis =
-      srcGlobalDigis->getTECW5Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TECW5Digis = srcGlobalDigis->getTECW5Digis();
     mehSiStripn[15]->Fill((float)nTECW5Digis);
     for (unsigned int i = 0; i < TECW5Digis.size(); ++i) {
       mehSiStripADC[15]->Fill(TECW5Digis[i].ADC);
       mehSiStripStrip[15]->Fill(TECW5Digis[i].STRIP);
     }
 
-    std::vector<PGlobalDigi::SiStripDigi> TECW6Digis =
-      srcGlobalDigis->getTECW6Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TECW6Digis = srcGlobalDigis->getTECW6Digis();
     mehSiStripn[16]->Fill((float)nTECW6Digis);
     for (unsigned int i = 0; i < TECW6Digis.size(); ++i) {
       mehSiStripADC[16]->Fill(TECW6Digis[i].ADC);
       mehSiStripStrip[16]->Fill(TECW6Digis[i].STRIP);
     }
 
-    std::vector<PGlobalDigi::SiStripDigi> TECW7Digis =
-      srcGlobalDigis->getTECW7Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TECW7Digis = srcGlobalDigis->getTECW7Digis();
     mehSiStripn[17]->Fill((float)nTECW7Digis);
     for (unsigned int i = 0; i < TECW7Digis.size(); ++i) {
       mehSiStripADC[17]->Fill(TECW7Digis[i].ADC);
       mehSiStripStrip[17]->Fill(TECW7Digis[i].STRIP);
     }
 
-    std::vector<PGlobalDigi::SiStripDigi> TECW8Digis =
-      srcGlobalDigis->getTECW8Digis();      
+    std::vector<PGlobalDigi::SiStripDigi> TECW8Digis = srcGlobalDigis->getTECW8Digis();
     mehSiStripn[18]->Fill((float)nTECW8Digis);
     for (unsigned int i = 0; i < TECW8Digis.size(); ++i) {
       mehSiStripADC[18]->Fill(TECW8Digis[i].ADC);
@@ -692,8 +671,7 @@ edm::Handle<PGlobalDigi> srcGlobalDigis;
     }
 
     // get SiPixel info
-    std::vector<PGlobalDigi::SiPixelDigi> BRL1Digis =
-      srcGlobalDigis->getBRL1Digis();      
+    std::vector<PGlobalDigi::SiPixelDigi> BRL1Digis = srcGlobalDigis->getBRL1Digis();
     mehSiPixeln[0]->Fill((float)nBRL1Digis);
     for (unsigned int i = 0; i < BRL1Digis.size(); ++i) {
       mehSiPixelADC[0]->Fill(BRL1Digis[i].ADC);
@@ -701,8 +679,7 @@ edm::Handle<PGlobalDigi> srcGlobalDigis;
       mehSiPixelCol[0]->Fill(BRL1Digis[i].COLUMN);
     }
 
-    std::vector<PGlobalDigi::SiPixelDigi> BRL2Digis =
-      srcGlobalDigis->getBRL2Digis();      
+    std::vector<PGlobalDigi::SiPixelDigi> BRL2Digis = srcGlobalDigis->getBRL2Digis();
     mehSiPixeln[1]->Fill((float)nBRL2Digis);
     for (unsigned int i = 0; i < BRL2Digis.size(); ++i) {
       mehSiPixelADC[1]->Fill(BRL2Digis[i].ADC);
@@ -710,17 +687,15 @@ edm::Handle<PGlobalDigi> srcGlobalDigis;
       mehSiPixelCol[1]->Fill(BRL2Digis[i].COLUMN);
     }
 
-    std::vector<PGlobalDigi::SiPixelDigi> BRL3Digis =
-      srcGlobalDigis->getBRL3Digis();      
+    std::vector<PGlobalDigi::SiPixelDigi> BRL3Digis = srcGlobalDigis->getBRL3Digis();
     mehSiPixeln[2]->Fill((float)nBRL3Digis);
     for (unsigned int i = 0; i < BRL3Digis.size(); ++i) {
       mehSiPixelADC[2]->Fill(BRL3Digis[i].ADC);
       mehSiPixelRow[2]->Fill(BRL3Digis[i].ROW);
-      mehSiPixelCol[2]->Fill(BRL3Digis[i].COLUMN); 
-   }
+      mehSiPixelCol[2]->Fill(BRL3Digis[i].COLUMN);
+    }
 
-    std::vector<PGlobalDigi::SiPixelDigi> FWD1pDigis =
-      srcGlobalDigis->getFWD1pDigis();      
+    std::vector<PGlobalDigi::SiPixelDigi> FWD1pDigis = srcGlobalDigis->getFWD1pDigis();
     mehSiPixeln[3]->Fill((float)nFWD1pDigis);
     for (unsigned int i = 0; i < FWD1pDigis.size(); ++i) {
       mehSiPixelADC[3]->Fill(FWD1pDigis[i].ADC);
@@ -728,8 +703,7 @@ edm::Handle<PGlobalDigi> srcGlobalDigis;
       mehSiPixelCol[3]->Fill(FWD1pDigis[i].COLUMN);
     }
 
-    std::vector<PGlobalDigi::SiPixelDigi> FWD1nDigis =
-      srcGlobalDigis->getFWD1nDigis();      
+    std::vector<PGlobalDigi::SiPixelDigi> FWD1nDigis = srcGlobalDigis->getFWD1nDigis();
     mehSiPixeln[4]->Fill((float)nFWD1nDigis);
     for (unsigned int i = 0; i < FWD1nDigis.size(); ++i) {
       mehSiPixelADC[4]->Fill(FWD1nDigis[i].ADC);
@@ -737,8 +711,7 @@ edm::Handle<PGlobalDigi> srcGlobalDigis;
       mehSiPixelCol[4]->Fill(FWD1nDigis[i].COLUMN);
     }
 
-    std::vector<PGlobalDigi::SiPixelDigi> FWD2pDigis =
-      srcGlobalDigis->getFWD2pDigis();      
+    std::vector<PGlobalDigi::SiPixelDigi> FWD2pDigis = srcGlobalDigis->getFWD2pDigis();
     mehSiPixeln[5]->Fill((float)nFWD2pDigis);
     for (unsigned int i = 0; i < FWD2pDigis.size(); ++i) {
       mehSiPixelADC[5]->Fill(FWD2pDigis[i].ADC);
@@ -746,8 +719,7 @@ edm::Handle<PGlobalDigi> srcGlobalDigis;
       mehSiPixelCol[5]->Fill(FWD2pDigis[i].COLUMN);
     }
 
-    std::vector<PGlobalDigi::SiPixelDigi> FWD2nDigis =
-      srcGlobalDigis->getFWD2nDigis();      
+    std::vector<PGlobalDigi::SiPixelDigi> FWD2nDigis = srcGlobalDigis->getFWD2nDigis();
     mehSiPixeln[6]->Fill((float)nFWD2nDigis);
     for (unsigned int i = 0; i < FWD2nDigis.size(); ++i) {
       mehSiPixelADC[6]->Fill(FWD2nDigis[i].ADC);
@@ -756,67 +728,60 @@ edm::Handle<PGlobalDigi> srcGlobalDigis;
     }
 
     // get DtMuon info
-    std::vector<PGlobalDigi::DTDigi> MB1Digis =
-      srcGlobalDigis->getMB1Digis();      
+    std::vector<PGlobalDigi::DTDigi> MB1Digis = srcGlobalDigis->getMB1Digis();
     mehDtMuonn[0]->Fill((float)nMB1Digis);
     for (unsigned int i = 0; i < MB1Digis.size(); ++i) {
       float layer = 4.0 * (MB1Digis[i].SLAYER - 1.0) + MB1Digis[i].LAYER;
       mehDtMuonLayer[0]->Fill(layer);
       mehDtMuonTime[0]->Fill(MB1Digis[i].TIME);
-      mehDtMuonTimevLayer[0]->Fill(layer,MB1Digis[i].TIME,1);
+      mehDtMuonTimevLayer[0]->Fill(layer, MB1Digis[i].TIME, 1);
     }
 
-    std::vector<PGlobalDigi::DTDigi> MB2Digis =
-      srcGlobalDigis->getMB2Digis();      
+    std::vector<PGlobalDigi::DTDigi> MB2Digis = srcGlobalDigis->getMB2Digis();
     mehDtMuonn[1]->Fill((float)nMB2Digis);
     for (unsigned int i = 0; i < MB2Digis.size(); ++i) {
       float layer = 4.0 * (MB2Digis[i].SLAYER - 1.0) + MB2Digis[i].LAYER;
       mehDtMuonLayer[1]->Fill(layer);
       mehDtMuonTime[1]->Fill(MB2Digis[i].TIME);
-      mehDtMuonTimevLayer[1]->Fill(layer,MB2Digis[i].TIME,1);
+      mehDtMuonTimevLayer[1]->Fill(layer, MB2Digis[i].TIME, 1);
     }
 
-    std::vector<PGlobalDigi::DTDigi> MB3Digis =
-      srcGlobalDigis->getMB3Digis();      
+    std::vector<PGlobalDigi::DTDigi> MB3Digis = srcGlobalDigis->getMB3Digis();
     mehDtMuonn[2]->Fill((float)nMB3Digis);
     for (unsigned int i = 0; i < MB3Digis.size(); ++i) {
       float layer = 4.0 * (MB3Digis[i].SLAYER - 1.0) + MB3Digis[i].LAYER;
       mehDtMuonLayer[2]->Fill(layer);
       mehDtMuonTime[2]->Fill(MB3Digis[i].TIME);
-      mehDtMuonTimevLayer[2]->Fill(layer,MB3Digis[i].TIME,1);
+      mehDtMuonTimevLayer[2]->Fill(layer, MB3Digis[i].TIME, 1);
     }
 
-    std::vector<PGlobalDigi::DTDigi> MB4Digis =
-      srcGlobalDigis->getMB4Digis();      
+    std::vector<PGlobalDigi::DTDigi> MB4Digis = srcGlobalDigis->getMB4Digis();
     mehDtMuonn[3]->Fill((float)nMB4Digis);
     for (unsigned int i = 0; i < MB4Digis.size(); ++i) {
       float layer = 4.0 * (MB4Digis[i].SLAYER - 1.0) + MB4Digis[i].LAYER;
       mehDtMuonLayer[3]->Fill(layer);
       mehDtMuonTime[3]->Fill(MB4Digis[i].TIME);
-      mehDtMuonTimevLayer[3]->Fill(layer,MB4Digis[i].TIME,1);
+      mehDtMuonTimevLayer[3]->Fill(layer, MB4Digis[i].TIME, 1);
     }
 
     // get CSC Strip info
-    std::vector<PGlobalDigi::CSCstripDigi> CSCstripDigis =
-      srcGlobalDigis->getCSCstripDigis();      
+    std::vector<PGlobalDigi::CSCstripDigi> CSCstripDigis = srcGlobalDigis->getCSCstripDigis();
     mehCSCStripn->Fill((float)nCSCstripDigis);
     for (unsigned int i = 0; i < CSCstripDigis.size(); ++i) {
       mehCSCStripADC->Fill(CSCstripDigis[i].ADC);
     }
 
     // get CSC Wire info
-    std::vector<PGlobalDigi::CSCwireDigi> CSCwireDigis =
-      srcGlobalDigis->getCSCwireDigis();      
+    std::vector<PGlobalDigi::CSCwireDigi> CSCwireDigis = srcGlobalDigis->getCSCwireDigis();
     mehCSCWiren->Fill((float)nCSCwireDigis);
     for (unsigned int i = 0; i < CSCwireDigis.size(); ++i) {
       mehCSCWireTime->Fill(CSCwireDigis[i].TIME);
     }
- if (verbosity > 0)
-    edm::LogInfo (MsgLoggerCat)
-      << "Done gathering data from event.";
+    if (verbosity > 0)
+      edm::LogInfo(MsgLoggerCat) << "Done gathering data from event.";
 
-  } // end loop through events
+  }  // end loop through events
 }
 
-//define this as a plug-in
-//DEFINE_FWK_MODULE(GlobalDigisHistogrammer);
+// define this as a plug-in
+// DEFINE_FWK_MODULE(GlobalDigisHistogrammer);
diff --git a/Validation/GlobalDigis/src/GlobalDigisProducer.cc b/Validation/GlobalDigis/src/GlobalDigisProducer.cc
index ce1d9a25bbba5..d438208350e7f 100644
--- a/Validation/GlobalDigis/src/GlobalDigisProducer.cc
+++ b/Validation/GlobalDigis/src/GlobalDigisProducer.cc
@@ -1,19 +1,24 @@
 /** \file GlobalDigisProducer.cc
- *  
+ *
  *  See header file for description of class
  *
  *  \author M. Strang SUNY-Buffalo
  */
 
-#include "Validation/GlobalDigis/interface/GlobalDigisProducer.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
+#include "Validation/GlobalDigis/interface/GlobalDigisProducer.h"
 
-GlobalDigisProducer::GlobalDigisProducer(const edm::ParameterSet& iPSet) :
-  fName(""), verbosity(0), frequency(0), label(""), getAllProvenances(false),
-  printProvenanceInfo(false), theCSCStripPedestalSum(0),
-  theCSCStripPedestalCount(0), count(0)
-{
+GlobalDigisProducer::GlobalDigisProducer(const edm::ParameterSet &iPSet)
+    : fName(""),
+      verbosity(0),
+      frequency(0),
+      label(""),
+      getAllProvenances(false),
+      printProvenanceInfo(false),
+      theCSCStripPedestalSum(0),
+      theCSCStripPedestalCount(0),
+      count(0) {
   std::string MsgLoggerCat = "GlobalDigisProducer_GlobalDigisProducer";
 
   // get information from parameter set
@@ -21,20 +26,17 @@ GlobalDigisProducer::GlobalDigisProducer(const edm::ParameterSet& iPSet) :
   verbosity = iPSet.getUntrackedParameter<int>("Verbosity");
   frequency = iPSet.getUntrackedParameter<int>("Frequency");
   label = iPSet.getParameter<std::string>("Label");
-  edm::ParameterSet m_Prov =
-    iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup");
-  getAllProvenances = 
-    m_Prov.getUntrackedParameter<bool>("GetAllProvenances");
-  printProvenanceInfo = 
-    m_Prov.getUntrackedParameter<bool>("PrintProvenanceInfo");
-
-  //get Labels to use to extract information
+  edm::ParameterSet m_Prov = iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup");
+  getAllProvenances = m_Prov.getUntrackedParameter<bool>("GetAllProvenances");
+  printProvenanceInfo = m_Prov.getUntrackedParameter<bool>("PrintProvenanceInfo");
+
+  // get Labels to use to extract information
   ECalEBSrc_ = iPSet.getParameter<edm::InputTag>("ECalEBSrc");
   ECalEESrc_ = iPSet.getParameter<edm::InputTag>("ECalEESrc");
   ECalESSrc_ = iPSet.getParameter<edm::InputTag>("ECalESSrc");
   HCalSrc_ = iPSet.getParameter<edm::InputTag>("HCalSrc");
   HCalDigi_ = iPSet.getParameter<edm::InputTag>("HCalDigi");
-  SiStripSrc_ = iPSet.getParameter<edm::InputTag>("SiStripSrc"); 
+  SiStripSrc_ = iPSet.getParameter<edm::InputTag>("SiStripSrc");
   SiPxlSrc_ = iPSet.getParameter<edm::InputTag>("SiPxlSrc");
   MuDTSrc_ = iPSet.getParameter<edm::InputTag>("MuDTSrc");
   MuCSCStripSrc_ = iPSet.getParameter<edm::InputTag>("MuCSCStripSrc");
@@ -44,11 +46,11 @@ GlobalDigisProducer::GlobalDigisProducer(const edm::ParameterSet& iPSet) :
   ECalEESrc_Token_ = consumes<EEDigiCollection>(iPSet.getParameter<edm::InputTag>("ECalEESrc"));
   ECalESSrc_Token_ = consumes<ESDigiCollection>(iPSet.getParameter<edm::InputTag>("ECalESSrc"));
   HCalSrc_Token_ = consumes<edm::PCaloHitContainer>(iPSet.getParameter<edm::InputTag>("HCalSrc"));
-  HBHEDigi_Token_ = consumes<edm::SortedCollection<HBHEDataFrame> >(iPSet.getParameter<edm::InputTag>("HCalDigi"));  
-  HODigi_Token_ = consumes<edm::SortedCollection<HODataFrame>>(iPSet.getParameter<edm::InputTag>("HCalDigi"));  
-  HFDigi_Token_ = consumes<edm::SortedCollection<HFDataFrame>>(iPSet.getParameter<edm::InputTag>("HCalDigi"));  
-  SiStripSrc_Token_ = consumes<edm::DetSetVector<SiStripDigi> >(iPSet.getParameter<edm::InputTag>("SiStripSrc")); 
-  SiPxlSrc_Token_ = consumes<edm::DetSetVector<PixelDigi> >(iPSet.getParameter<edm::InputTag>("SiPxlSrc"));
+  HBHEDigi_Token_ = consumes<edm::SortedCollection<HBHEDataFrame>>(iPSet.getParameter<edm::InputTag>("HCalDigi"));
+  HODigi_Token_ = consumes<edm::SortedCollection<HODataFrame>>(iPSet.getParameter<edm::InputTag>("HCalDigi"));
+  HFDigi_Token_ = consumes<edm::SortedCollection<HFDataFrame>>(iPSet.getParameter<edm::InputTag>("HCalDigi"));
+  SiStripSrc_Token_ = consumes<edm::DetSetVector<SiStripDigi>>(iPSet.getParameter<edm::InputTag>("SiStripSrc"));
+  SiPxlSrc_Token_ = consumes<edm::DetSetVector<PixelDigi>>(iPSet.getParameter<edm::InputTag>("SiPxlSrc"));
   MuDTSrc_Token_ = consumes<DTDigiCollection>(iPSet.getParameter<edm::InputTag>("MuDTSrc"));
   MuCSCStripSrc_Token_ = consumes<CSCStripDigiCollection>(iPSet.getParameter<edm::InputTag>("MuCSCStripSrc"));
   MuCSCWireSrc_Token_ = consumes<CSCWireDigiCollection>(iPSet.getParameter<edm::InputTag>("MuCSCWireSrc"));
@@ -56,9 +58,10 @@ GlobalDigisProducer::GlobalDigisProducer(const edm::ParameterSet& iPSet) :
   const std::string barrelHitsName("EcalHitsEB");
   const std::string endcapHitsName("EcalHitsEE");
   const std::string preshowerHitsName("EcalHitsES");
-  EBHits_Token_ = consumes<CrossingFrame<PCaloHit> >(edm::InputTag(std::string("mix"), std::string("barrelHitsName")));
-  EEHits_Token_ = consumes<CrossingFrame<PCaloHit> >(edm::InputTag(std::string("mix"), std::string("endcapHitsName")));
-  ESHits_Token_ = consumes<CrossingFrame<PCaloHit> >(edm::InputTag(std::string("mix"), std::string("preshowerHitsName")));
+  EBHits_Token_ = consumes<CrossingFrame<PCaloHit>>(edm::InputTag(std::string("mix"), std::string("barrelHitsName")));
+  EEHits_Token_ = consumes<CrossingFrame<PCaloHit>>(edm::InputTag(std::string("mix"), std::string("endcapHitsName")));
+  ESHits_Token_ =
+      consumes<CrossingFrame<PCaloHit>>(edm::InputTag(std::string("mix"), std::string("preshowerHitsName")));
 
   // use value of first digit to determine default output level (inclusive)
   // 0 is none, 1 is basic, 2 is fill output, 3 is gather output
@@ -69,36 +72,27 @@ GlobalDigisProducer::GlobalDigisProducer(const edm::ParameterSet& iPSet) :
 
   // print out Parameter Set information being used
   if (verbosity >= 0) {
-    edm::LogInfo(MsgLoggerCat) 
-      << "\n===============================\n"
-      << "Initialized as EDProducer with parameter values:\n"
-      << "    Name          = " << fName << "\n"
-      << "    Verbosity     = " << verbosity << "\n"
-      << "    Frequency     = " << frequency << "\n"
-      << "    Label         = " << label << "\n"
-      << "    GetProv       = " << getAllProvenances << "\n"
-      << "    PrintProv     = " << printProvenanceInfo << "\n"
-      << "    ECalEBSrc     = " << ECalEBSrc_.label() 
-      << ":" << ECalEBSrc_.instance() << "\n"
-      << "    ECalEESrc     = " << ECalEESrc_.label() 
-      << ":" << ECalEESrc_.instance() << "\n"
-      << "    ECalESSrc     = " << ECalESSrc_.label() 
-      << ":" << ECalESSrc_.instance() << "\n"
-      << "    HCalSrc       = " << HCalSrc_.label() 
-      << ":" << HCalSrc_.instance() << "\n"
-      << "    HCalDigi       = " << HCalDigi_.label() 
-      << ":" << HCalDigi_.instance() << "\n"
-      << "    SiStripSrc    = " << SiStripSrc_.label() 
-      << ":" << SiStripSrc_.instance() << "\n" 
-      << "    SiPixelSrc    = " << SiPxlSrc_.label()
-      << ":" << SiPxlSrc_.instance() << "\n"
-      << "    MuDTSrc       = " << MuDTSrc_.label()
-      << ":" << MuDTSrc_.instance() << "\n"
-      << "    MuCSCStripSrc = " << MuCSCStripSrc_.label()
-      << ":" << MuCSCStripSrc_.instance() << "\n"
-      << "    MuCSCWireSrc  = " << MuCSCWireSrc_.label()
-      << ":" << MuCSCWireSrc_.instance() << "\n"
-      << "===============================\n";
+    edm::LogInfo(MsgLoggerCat) << "\n===============================\n"
+                               << "Initialized as EDProducer with parameter values:\n"
+                               << "    Name          = " << fName << "\n"
+                               << "    Verbosity     = " << verbosity << "\n"
+                               << "    Frequency     = " << frequency << "\n"
+                               << "    Label         = " << label << "\n"
+                               << "    GetProv       = " << getAllProvenances << "\n"
+                               << "    PrintProv     = " << printProvenanceInfo << "\n"
+                               << "    ECalEBSrc     = " << ECalEBSrc_.label() << ":" << ECalEBSrc_.instance() << "\n"
+                               << "    ECalEESrc     = " << ECalEESrc_.label() << ":" << ECalEESrc_.instance() << "\n"
+                               << "    ECalESSrc     = " << ECalESSrc_.label() << ":" << ECalESSrc_.instance() << "\n"
+                               << "    HCalSrc       = " << HCalSrc_.label() << ":" << HCalSrc_.instance() << "\n"
+                               << "    HCalDigi       = " << HCalDigi_.label() << ":" << HCalDigi_.instance() << "\n"
+                               << "    SiStripSrc    = " << SiStripSrc_.label() << ":" << SiStripSrc_.instance() << "\n"
+                               << "    SiPixelSrc    = " << SiPxlSrc_.label() << ":" << SiPxlSrc_.instance() << "\n"
+                               << "    MuDTSrc       = " << MuDTSrc_.label() << ":" << MuDTSrc_.instance() << "\n"
+                               << "    MuCSCStripSrc = " << MuCSCStripSrc_.label() << ":" << MuCSCStripSrc_.instance()
+                               << "\n"
+                               << "    MuCSCWireSrc  = " << MuCSCWireSrc_.label() << ":" << MuCSCWireSrc_.instance()
+                               << "\n"
+                               << "===============================\n";
   }
 
   // set default constants
@@ -106,45 +100,40 @@ GlobalDigisProducer::GlobalDigisProducer(const edm::ParameterSet& iPSet) :
   ECalgainConv_[0] = 0.;
   ECalgainConv_[1] = 1.;
   ECalgainConv_[2] = 2.;
-  ECalgainConv_[3] = 12.;  
+  ECalgainConv_[3] = 12.;
   ECalbarrelADCtoGeV_ = 0.035;
   ECalendcapADCtoGeV_ = 0.06;
-
 }
 
-GlobalDigisProducer::~GlobalDigisProducer() 
-{
-}
+GlobalDigisProducer::~GlobalDigisProducer() {}
 
-void GlobalDigisProducer::beginJob( void )
-{
+void GlobalDigisProducer::beginJob(void) {
   std::string MsgLoggerCat = "GlobalDigisProducer_beginJob";
 
-//   // setup calorimeter constants from service
-//   edm::ESHandle<EcalADCToGeVConstant> pAgc;
-//   iSetup.get<EcalADCToGeVConstantRcd>().get(pAgc);
-//   const EcalADCToGeVConstant* agc = pAgc.product();
-  
-  EcalMGPAGainRatio * defaultRatios = new EcalMGPAGainRatio();
+  //   // setup calorimeter constants from service
+  //   edm::ESHandle<EcalADCToGeVConstant> pAgc;
+  //   iSetup.get<EcalADCToGeVConstantRcd>().get(pAgc);
+  //   const EcalADCToGeVConstant* agc = pAgc.product();
+
+  EcalMGPAGainRatio *defaultRatios = new EcalMGPAGainRatio();
 
   ECalgainConv_[0] = 0.;
   ECalgainConv_[1] = 1.;
-  ECalgainConv_[2] = defaultRatios->gain12Over6() ;
-  ECalgainConv_[3] = ECalgainConv_[2]*(defaultRatios->gain6Over1()) ;
+  ECalgainConv_[2] = defaultRatios->gain12Over6();
+  ECalgainConv_[3] = ECalgainConv_[2] * (defaultRatios->gain6Over1());
 
   delete defaultRatios;
 
-//   ECalbarrelADCtoGeV_ = agc->getEBValue();
-//   ECalendcapADCtoGeV_ = agc->getEEValue();
+  //   ECalbarrelADCtoGeV_ = agc->getEBValue();
+  //   ECalendcapADCtoGeV_ = agc->getEEValue();
 
   if (verbosity >= 0) {
-    edm::LogInfo(MsgLoggerCat) 
-      << "Modified Calorimeter gain constants: g0 = " << ECalgainConv_[0]
-      << ", g1 = " << ECalgainConv_[1] << ", g2 = " << ECalgainConv_[2]
-      << ", g3 = " << ECalgainConv_[3];
-//     edm::LogInfo(MsgLoggerCat)
-//       << "Modified Calorimeter ADCtoGeV constants: barrel = " 
-//       << ECalbarrelADCtoGeV_ << ", endcap = " << ECalendcapADCtoGeV_;
+    edm::LogInfo(MsgLoggerCat) << "Modified Calorimeter gain constants: g0 = " << ECalgainConv_[0]
+                               << ", g1 = " << ECalgainConv_[1] << ", g2 = " << ECalgainConv_[2]
+                               << ", g3 = " << ECalgainConv_[3];
+    //     edm::LogInfo(MsgLoggerCat)
+    //       << "Modified Calorimeter ADCtoGeV constants: barrel = "
+    //       << ECalbarrelADCtoGeV_ << ", endcap = " << ECalendcapADCtoGeV_;
   }
 
   // clear storage vectors
@@ -152,51 +141,41 @@ void GlobalDigisProducer::beginJob( void )
   return;
 }
 
-void GlobalDigisProducer::endJob()
-{
+void GlobalDigisProducer::endJob() {
   std::string MsgLoggerCat = "GlobalDigisProducer_endJob";
   if (verbosity >= 0)
-    edm::LogInfo(MsgLoggerCat) 
-      << "Terminating having processed " << count << " events.";
+    edm::LogInfo(MsgLoggerCat) << "Terminating having processed " << count << " events.";
   return;
 }
 
-void GlobalDigisProducer::produce(edm::Event& iEvent, 
-				  const edm::EventSetup& iSetup)
-{
+void GlobalDigisProducer::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalDigisProducer_produce";
 
   // keep track of number of events processed
   ++count;
 
-
   // THIS BLOCK MIGRATED HERE FROM beginJob:
   // setup calorimeter constants from service
   edm::ESHandle<EcalADCToGeVConstant> pAgc;
   iSetup.get<EcalADCToGeVConstantRcd>().get(pAgc);
-  const EcalADCToGeVConstant* agc = pAgc.product();
+  const EcalADCToGeVConstant *agc = pAgc.product();
   ECalbarrelADCtoGeV_ = agc->getEBValue();
   ECalendcapADCtoGeV_ = agc->getEEValue();
   if (verbosity >= 0) {
-    edm::LogInfo(MsgLoggerCat)
-      << "Modified Calorimeter ADCtoGeV constants: barrel = " 
-      << ECalbarrelADCtoGeV_ << ", endcap = " << ECalendcapADCtoGeV_;
+    edm::LogInfo(MsgLoggerCat) << "Modified Calorimeter ADCtoGeV constants: barrel = " << ECalbarrelADCtoGeV_
+                               << ", endcap = " << ECalendcapADCtoGeV_;
   }
-  
 
   // get event id information
   edm::RunNumber_t nrun = iEvent.id().run();
   edm::EventNumber_t nevt = iEvent.id().event();
 
   if (verbosity > 0) {
-    edm::LogInfo(MsgLoggerCat)
-      << "Processing run " << nrun << ", event " << nevt
-      << " (" << count << " events total)";
+    edm::LogInfo(MsgLoggerCat) << "Processing run " << nrun << ", event " << nevt << " (" << count << " events total)";
   } else if (verbosity == 0) {
-    if (nevt%frequency == 0 || nevt == 1) {
-      edm::LogInfo(MsgLoggerCat)
-	<< "Processing run " << nrun << ", event " << nevt
-	<< " (" << count << " events total)";
+    if (nevt % frequency == 0 || nevt == 1) {
+      edm::LogInfo(MsgLoggerCat) << "Processing run " << nrun << ", event " << nevt << " (" << count
+                                 << " events total)";
     }
   }
 
@@ -205,34 +184,32 @@ void GlobalDigisProducer::produce(edm::Event& iEvent,
 
   // look at information available in the event
   if (getAllProvenances) {
-
-    std::vector<const edm::StableProvenance*> AllProv;
+    std::vector<const edm::StableProvenance *> AllProv;
     iEvent.getAllStableProvenance(AllProv);
 
     if (verbosity >= 0)
-      edm::LogInfo(MsgLoggerCat)
-	<< "Number of Provenances = " << AllProv.size();
+      edm::LogInfo(MsgLoggerCat) << "Number of Provenances = " << AllProv.size();
 
     if (printProvenanceInfo && (verbosity >= 0)) {
-      TString eventout("\nProvenance info:\n");      
+      TString eventout("\nProvenance info:\n");
 
       for (unsigned int i = 0; i < AllProv.size(); ++i) {
-	eventout += "\n       ******************************";
-	eventout += "\n       Module       : ";
-	//eventout += (AllProv[i]->product).moduleLabel();
-	eventout += AllProv[i]->moduleLabel();
-	eventout += "\n       ProductID    : ";
-	//eventout += (AllProv[i]->product).productID_.id_;
-	eventout += AllProv[i]->productID().id();
-	eventout += "\n       ClassName    : ";
-	//eventout += (AllProv[i]->product).fullClassName_;
-	eventout += AllProv[i]->className();
-	eventout += "\n       InstanceName : ";
-	//eventout += (AllProv[i]->product).productInstanceName_;
-	eventout += AllProv[i]->productInstanceName();
-	eventout += "\n       BranchName   : ";
-	//eventout += (AllProv[i]->product).branchName_;
-	eventout += AllProv[i]->branchName();
+        eventout += "\n       ******************************";
+        eventout += "\n       Module       : ";
+        // eventout += (AllProv[i]->product).moduleLabel();
+        eventout += AllProv[i]->moduleLabel();
+        eventout += "\n       ProductID    : ";
+        // eventout += (AllProv[i]->product).productID_.id_;
+        eventout += AllProv[i]->productID().id();
+        eventout += "\n       ClassName    : ";
+        // eventout += (AllProv[i]->product).fullClassName_;
+        eventout += AllProv[i]->className();
+        eventout += "\n       InstanceName : ";
+        // eventout += (AllProv[i]->product).productInstanceName_;
+        eventout += AllProv[i]->productInstanceName();
+        eventout += "\n       BranchName   : ";
+        // eventout += (AllProv[i]->product).branchName_;
+        eventout += AllProv[i]->branchName();
       }
       eventout += "\n       ******************************\n";
       edm::LogInfo(MsgLoggerCat) << eventout << "\n";
@@ -252,15 +229,13 @@ void GlobalDigisProducer::produce(edm::Event& iEvent,
   fillMuon(iEvent, iSetup);
 
   if (verbosity > 0)
-    edm::LogInfo (MsgLoggerCat)
-      << "Done gathering data from event.";
+    edm::LogInfo(MsgLoggerCat) << "Done gathering data from event.";
 
   // produce object to put into event
   std::unique_ptr<PGlobalDigi> pOut(new PGlobalDigi);
 
   if (verbosity > 2)
-    edm::LogInfo (MsgLoggerCat)
-      << "Saving event contents:";
+    edm::LogInfo(MsgLoggerCat) << "Saving event contents:";
 
   // call store functions
   // store ECal information in produce
@@ -273,65 +248,56 @@ void GlobalDigisProducer::produce(edm::Event& iEvent,
   storeMuon(*pOut);
 
   // store information in event
-  iEvent.put(std::move(pOut),label);
+  iEvent.put(std::move(pOut), label);
 
   return;
 }
 
-void GlobalDigisProducer::fillECal(edm::Event& iEvent, 
-				   const edm::EventSetup& iSetup)
-{
+void GlobalDigisProducer::fillECal(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalDigisProducer_fillECal";
 
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
+    eventout = "\nGathering info:";
 
   // extract crossing frame from event
-  //edm::Handle<CrossingFrame> crossingFrame;
-  edm::Handle<CrossingFrame<PCaloHit> > crossingFrame;
-  //iEvent.getByType(crossingFrame);
-  //if (!crossingFrame.isValid()) {
+  // edm::Handle<CrossingFrame> crossingFrame;
+  edm::Handle<CrossingFrame<PCaloHit>> crossingFrame;
+  // iEvent.getByType(crossingFrame);
+  // if (!crossingFrame.isValid()) {
   //  edm::LogWarning(MsgLoggerCat)
   //    << "Unable to crossingFrame in event!";
   //  return;
   //}
 
   ////////////////////////
-  //extract EB information
+  // extract EB information
   ////////////////////////
   bool isBarrel = true;
-  edm::Handle<EBDigiCollection> EcalDigiEB;  
+  edm::Handle<EBDigiCollection> EcalDigiEB;
   iEvent.getByToken(ECalEBSrc_Token_, EcalDigiEB);
   if (!EcalDigiEB.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find EcalDigiEB in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find EcalDigiEB in event!";
     return;
-  }  
-  if ( EcalDigiEB->empty()) isBarrel = false;
+  }
+  if (EcalDigiEB->empty())
+    isBarrel = false;
 
   if (isBarrel) {
-    
     // loop over simhits
-    iEvent.getByToken(EBHits_Token_,crossingFrame);
+    iEvent.getByToken(EBHits_Token_, crossingFrame);
     if (!crossingFrame.isValid()) {
-      edm::LogWarning(MsgLoggerCat)
-	<< "Unable to find cal barrel crossingFrame in event!";
+      edm::LogWarning(MsgLoggerCat) << "Unable to find cal barrel crossingFrame in event!";
       return;
     }
-    //std::unique_ptr<MixCollection<PCaloHit> >
-    //barrelHits(new MixCollection<PCaloHit>
+    // std::unique_ptr<MixCollection<PCaloHit> >
+    // barrelHits(new MixCollection<PCaloHit>
     //		 (crossingFrame.product(), barrelHitsName));
-    std::unique_ptr<MixCollection<PCaloHit> >
-      barrelHits(new MixCollection<PCaloHit>(crossingFrame.product()));
+    std::unique_ptr<MixCollection<PCaloHit>> barrelHits(new MixCollection<PCaloHit>(crossingFrame.product()));
 
     // keep track of sum of simhit energy in each crystal
     MapType ebSimMap;
-    for (MixCollection<PCaloHit>::MixItr hitItr 
-	   = barrelHits->begin();
-	 hitItr != barrelHits->end();
-	 ++hitItr) {
-      
+    for (MixCollection<PCaloHit>::MixItr hitItr = barrelHits->begin(); hitItr != barrelHits->end(); ++hitItr) {
       EBDetId ebid = EBDetId(hitItr->id());
 
       uint32_t crystid = ebid.rawId();
@@ -349,9 +315,8 @@ void GlobalDigisProducer::fillECal(edm::Event& iEvent,
     ebADCGains.reserve(EBDataFrame::MAXSAMPLES);
 
     int i = 0;
-    for (unsigned int digis=0; digis<EcalDigiEB->size(); ++digis) 
-    {
-      //for (std::vector<EBDataFrame>::const_iterator digis =
+    for (unsigned int digis = 0; digis < EcalDigiEB->size(); ++digis) {
+      // for (std::vector<EBDataFrame>::const_iterator digis =
       //   barrelDigi->begin();
       // digis != barrelDigi->end();
       // ++digis) {
@@ -360,57 +325,51 @@ void GlobalDigisProducer::fillECal(edm::Event& iEvent,
 
       EBDataFrame ebdf = (*barrelDigi)[digis];
       int nrSamples = ebdf.size();
-      
-      EBDetId ebid = ebdf.id () ;
-      //EBDetId ebid = digis->id();
+
+      EBDetId ebid = ebdf.id();
+      // EBDetId ebid = digis->id();
 
       double Emax = 0;
       int Pmax = 0;
       double pedestalPreSample = 0.;
       double pedestalPreSampleAnalog = 0.;
-        
-      for (int sample = 0 ; sample < nrSamples; ++sample) {
-      //for (int sample = 0; sample < digis->size(); ++sample) {
-	ebAnalogSignal[sample] = 0.;
-	ebADCCounts[sample] = 0.;
-	ebADCGains[sample] = -1.;
+
+      for (int sample = 0; sample < nrSamples; ++sample) {
+        // for (int sample = 0; sample < digis->size(); ++sample) {
+        ebAnalogSignal[sample] = 0.;
+        ebADCCounts[sample] = 0.;
+        ebADCGains[sample] = -1.;
       }
-  
+
       // calculate maximum energy and pedestal
-      for (int sample = 0 ; sample < nrSamples; ++sample) {
-	//for (int sample = 0; sample < digis->size(); ++sample) {
-
-	EcalMGPASample thisSample = ebdf[sample];
-	ebADCCounts[sample] = (thisSample.adc());
-	ebADCGains[sample]  = (thisSample.gainId());
-	ebAnalogSignal[sample] = 
-	  (ebADCCounts[sample] * ECalgainConv_[(int)ebADCGains[sample]]
-	   * ECalbarrelADCtoGeV_);
-	if (Emax < ebAnalogSignal[sample]) {
-	  Emax = ebAnalogSignal[sample];
-	  Pmax = sample;
-	}
-	if ( sample < 3 ) {
-	  pedestalPreSample += ebADCCounts[sample] ;
-	  pedestalPreSampleAnalog += 
-	    ebADCCounts[sample] * ECalgainConv_[(int)ebADCGains[sample]]
-	    * ECalbarrelADCtoGeV_ ;
-	}
-	
+      for (int sample = 0; sample < nrSamples; ++sample) {
+        // for (int sample = 0; sample < digis->size(); ++sample) {
+
+        EcalMGPASample thisSample = ebdf[sample];
+        ebADCCounts[sample] = (thisSample.adc());
+        ebADCGains[sample] = (thisSample.gainId());
+        ebAnalogSignal[sample] = (ebADCCounts[sample] * ECalgainConv_[(int)ebADCGains[sample]] * ECalbarrelADCtoGeV_);
+        if (Emax < ebAnalogSignal[sample]) {
+          Emax = ebAnalogSignal[sample];
+          Pmax = sample;
+        }
+        if (sample < 3) {
+          pedestalPreSample += ebADCCounts[sample];
+          pedestalPreSampleAnalog += ebADCCounts[sample] * ECalgainConv_[(int)ebADCGains[sample]] * ECalbarrelADCtoGeV_;
+        }
       }
-      pedestalPreSample /= 3. ; 
-      pedestalPreSampleAnalog /= 3. ; 
+      pedestalPreSample /= 3.;
+      pedestalPreSampleAnalog /= 3.;
 
       // calculate pedestal subtracted digi energy in the crystal
-      double Erec = Emax - pedestalPreSampleAnalog
-	* ECalgainConv_[(int)ebADCGains[Pmax]];
-      
+      double Erec = Emax - pedestalPreSampleAnalog * ECalgainConv_[(int)ebADCGains[Pmax]];
+
       // gather necessary information
       EBCalAEE.push_back(Erec);
       EBCalSHE.push_back(ebSimMap[ebid.rawId()]);
       EBCalmaxPos.push_back(Pmax);
     }
-    
+
     if (verbosity > 1) {
       eventout += "\n          Number of EBDigis collected:.............. ";
       eventout += i;
@@ -418,40 +377,33 @@ void GlobalDigisProducer::fillECal(edm::Event& iEvent,
   }
 
   /////////////////////////
-  //extract EE information
+  // extract EE information
   ////////////////////////
   bool isEndCap = true;
-  edm::Handle<EEDigiCollection> EcalDigiEE;  
+  edm::Handle<EEDigiCollection> EcalDigiEE;
   iEvent.getByToken(ECalEESrc_Token_, EcalDigiEE);
   if (!EcalDigiEE.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find EcalDigiEE in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find EcalDigiEE in event!";
     return;
-  }  
-  if (EcalDigiEE->empty()) isEndCap = false;
+  }
+  if (EcalDigiEE->empty())
+    isEndCap = false;
 
   if (isEndCap) {
-
     // loop over simhits
     iEvent.getByToken(EEHits_Token_, crossingFrame);
     if (!crossingFrame.isValid()) {
-      edm::LogWarning(MsgLoggerCat)
-	<< "Unable to find cal endcap crossingFrame in event!";
+      edm::LogWarning(MsgLoggerCat) << "Unable to find cal endcap crossingFrame in event!";
       return;
     }
-    //std::unique_ptr<MixCollection<PCaloHit> >
+    // std::unique_ptr<MixCollection<PCaloHit> >
     //  endcapHits(new MixCollection<PCaloHit>
     //	 (crossingFrame.product(), endcapHitsName));
-    std::unique_ptr<MixCollection<PCaloHit> >
-      endcapHits(new MixCollection<PCaloHit>(crossingFrame.product()));
+    std::unique_ptr<MixCollection<PCaloHit>> endcapHits(new MixCollection<PCaloHit>(crossingFrame.product()));
 
     // keep track of sum of simhit energy in each crystal
     MapType eeSimMap;
-    for (MixCollection<PCaloHit>::MixItr hitItr 
-	   = endcapHits->begin();
-	 hitItr != endcapHits->end();
-	 ++hitItr) {
-
+    for (MixCollection<PCaloHit>::MixItr hitItr = endcapHits->begin(); hitItr != endcapHits->end(); ++hitItr) {
       EEDetId eeid = EEDetId(hitItr->id());
 
       uint32_t crystid = eeid.rawId();
@@ -469,68 +421,61 @@ void GlobalDigisProducer::fillECal(edm::Event& iEvent,
     eeADCGains.reserve(EEDataFrame::MAXSAMPLES);
 
     int i = 0;
-    //for (std::vector<EEDataFrame>::const_iterator digis =
+    // for (std::vector<EEDataFrame>::const_iterator digis =
     //   endcapDigi->begin();
     // digis != endcapDigi->end();
     // ++digis) {
-    for (unsigned int digis=0; digis<EcalDigiEE->size(); ++digis){ 
-    
+    for (unsigned int digis = 0; digis < EcalDigiEE->size(); ++digis) {
       ++i;
 
       EEDataFrame eedf = (*endcapDigi)[digis];
       int nrSamples = eedf.size();
-      
-      EEDetId eeid = eedf.id () ;
-      //EEDetId eeid = digis->id();
+
+      EEDetId eeid = eedf.id();
+      // EEDetId eeid = digis->id();
 
       double Emax = 0;
       int Pmax = 0;
       double pedestalPreSample = 0.;
       double pedestalPreSampleAnalog = 0.;
-        
-      for (int sample = 0 ; sample < nrSamples; ++sample) {
-      //for (int sample = 0; sample < digis->size(); ++sample) {
-	eeAnalogSignal[sample] = 0.;
-	eeADCCounts[sample] = 0.;
-	eeADCGains[sample] = -1.;
+
+      for (int sample = 0; sample < nrSamples; ++sample) {
+        // for (int sample = 0; sample < digis->size(); ++sample) {
+        eeAnalogSignal[sample] = 0.;
+        eeADCCounts[sample] = 0.;
+        eeADCGains[sample] = -1.;
       }
-  
+
       // calculate maximum enery and pedestal
-      for (int sample = 0 ; sample < nrSamples; ++sample) {
-	//for (int sample = 0; sample < digis->size(); ++sample) {
-
-	EcalMGPASample thisSample = eedf[sample];
-
-	eeADCCounts[sample] = (thisSample.adc());
-	eeADCGains[sample]  = (thisSample.gainId());
-	eeAnalogSignal[sample] = 
-	  (eeADCCounts[sample] * ECalgainConv_[(int)eeADCGains[sample]]
-	   * ECalbarrelADCtoGeV_);
-	if (Emax < eeAnalogSignal[sample]) {
-	  Emax = eeAnalogSignal[sample];
-	  Pmax = sample;
-	}
-	if ( sample < 3 ) {
-	  pedestalPreSample += eeADCCounts[sample] ;
-	  pedestalPreSampleAnalog += 
-	    eeADCCounts[sample] * ECalgainConv_[(int)eeADCGains[sample]]
-	    * ECalbarrelADCtoGeV_ ;
-	}
-	
+      for (int sample = 0; sample < nrSamples; ++sample) {
+        // for (int sample = 0; sample < digis->size(); ++sample) {
+
+        EcalMGPASample thisSample = eedf[sample];
+
+        eeADCCounts[sample] = (thisSample.adc());
+        eeADCGains[sample] = (thisSample.gainId());
+        eeAnalogSignal[sample] = (eeADCCounts[sample] * ECalgainConv_[(int)eeADCGains[sample]] * ECalbarrelADCtoGeV_);
+        if (Emax < eeAnalogSignal[sample]) {
+          Emax = eeAnalogSignal[sample];
+          Pmax = sample;
+        }
+        if (sample < 3) {
+          pedestalPreSample += eeADCCounts[sample];
+          pedestalPreSampleAnalog += eeADCCounts[sample] * ECalgainConv_[(int)eeADCGains[sample]] * ECalbarrelADCtoGeV_;
+        }
       }
-      pedestalPreSample /= 3. ; 
-      pedestalPreSampleAnalog /= 3. ; 
+      pedestalPreSample /= 3.;
+      pedestalPreSampleAnalog /= 3.;
 
       // calculate pedestal subtracted digi energy in the crystal
-      double Erec = Emax - pedestalPreSampleAnalog
-	* ECalgainConv_[(int)eeADCGains[Pmax]];
+      double Erec = Emax - pedestalPreSampleAnalog * ECalgainConv_[(int)eeADCGains[Pmax]];
 
       // gather necessary information
       EECalAEE.push_back(Erec);
       EECalSHE.push_back(eeSimMap[eeid.rawId()]);
       EECalmaxPos.push_back(Pmax);
     }
-    
+
     if (verbosity > 1) {
       eventout += "\n          Number of EEDigis collected:.............. ";
       eventout += i;
@@ -538,40 +483,33 @@ void GlobalDigisProducer::fillECal(edm::Event& iEvent,
   }
 
   /////////////////////////
-  //extract ES information
+  // extract ES information
   ////////////////////////
   bool isPreshower = true;
-  edm::Handle<ESDigiCollection> EcalDigiES;  
+  edm::Handle<ESDigiCollection> EcalDigiES;
   iEvent.getByToken(ECalESSrc_Token_, EcalDigiES);
   if (!EcalDigiES.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find EcalDigiES in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find EcalDigiES in event!";
     return;
-  }  
-  if (EcalDigiES->empty()) isPreshower = false;
+  }
+  if (EcalDigiES->empty())
+    isPreshower = false;
 
   if (isPreshower) {
-
     // loop over simhits
-    iEvent.getByToken(ESHits_Token_,crossingFrame);
+    iEvent.getByToken(ESHits_Token_, crossingFrame);
     if (!crossingFrame.isValid()) {
-      edm::LogWarning(MsgLoggerCat)
-	<< "Unable to find cal preshower crossingFrame in event!";
+      edm::LogWarning(MsgLoggerCat) << "Unable to find cal preshower crossingFrame in event!";
       return;
     }
-    //std::unique_ptr<MixCollection<PCaloHit> >
+    // std::unique_ptr<MixCollection<PCaloHit> >
     //  preshowerHits(new MixCollection<PCaloHit>
     //		 (crossingFrame.product(), preshowerHitsName));
-   std::unique_ptr<MixCollection<PCaloHit> >
-      preshowerHits(new MixCollection<PCaloHit>(crossingFrame.product()));
+    std::unique_ptr<MixCollection<PCaloHit>> preshowerHits(new MixCollection<PCaloHit>(crossingFrame.product()));
 
     // keep track of sum of simhit energy in each crystal
     MapType esSimMap;
-    for (MixCollection<PCaloHit>::MixItr hitItr 
-	   = preshowerHits->begin();
-	 hitItr != preshowerHits->end();
-	 ++hitItr) {
-
+    for (MixCollection<PCaloHit>::MixItr hitItr = preshowerHits->begin(); hitItr != preshowerHits->end(); ++hitItr) {
       ESDetId esid = ESDetId(hitItr->id());
 
       uint32_t crystid = esid.rawId();
@@ -585,40 +523,38 @@ void GlobalDigisProducer::fillECal(edm::Event& iEvent,
     esADCCounts.reserve(ESDataFrame::MAXSAMPLES);
 
     int i = 0;
-    for (unsigned int digis=0; digis<EcalDigiES->size(); ++digis) {
-    //for (std::vector<ESDataFrame>::const_iterator digis =
-    //   preshowerDigi->begin();
-    // digis != preshowerDigi->end();
-    // ++digis) {
+    for (unsigned int digis = 0; digis < EcalDigiES->size(); ++digis) {
+      // for (std::vector<ESDataFrame>::const_iterator digis =
+      //   preshowerDigi->begin();
+      // digis != preshowerDigi->end();
+      // ++digis) {
 
       ++i;
 
-
       ESDataFrame esdf = (*preshowerDigi)[digis];
       int nrSamples = esdf.size();
-      
-      ESDetId esid = esdf.id () ;
+
+      ESDetId esid = esdf.id();
       // ESDetId esid = digis->id();
-        
-      for (int sample = 0 ; sample < nrSamples; ++sample) {
-      //for (int sample = 0; sample < digis->size(); ++sample) {
-	esADCCounts[sample] = 0.;
+
+      for (int sample = 0; sample < nrSamples; ++sample) {
+        // for (int sample = 0; sample < digis->size(); ++sample) {
+        esADCCounts[sample] = 0.;
       }
-  
-      // gether ADC counts
-      for (int sample = 0 ; sample < nrSamples; ++sample) {
 
-	ESSample thisSample = esdf[sample];
-	//for (int sample = 0; sample < digis->size(); ++sample) {
-	esADCCounts[sample] = (thisSample.adc());
+      // gether ADC counts
+      for (int sample = 0; sample < nrSamples; ++sample) {
+        ESSample thisSample = esdf[sample];
+        // for (int sample = 0; sample < digis->size(); ++sample) {
+        esADCCounts[sample] = (thisSample.adc());
       }
-      
+
       ESCalADC0.push_back(esADCCounts[0]);
       ESCalADC1.push_back(esADCCounts[1]);
       ESCalADC2.push_back(esADCCounts[2]);
       ESCalSHE.push_back(esSimMap[esid.rawId()]);
     }
-    
+
     if (verbosity > 1) {
       eventout += "\n          Number of ESDigis collected:.............. ";
       eventout += i;
@@ -631,8 +567,7 @@ void GlobalDigisProducer::fillECal(edm::Event& iEvent,
   return;
 }
 
-void GlobalDigisProducer::storeECal(PGlobalDigi& product)
-{
+void GlobalDigisProducer::storeECal(PGlobalDigi &product) {
   std::string MsgLoggerCat = "GlobalDigisProducer_storeECal";
 
   if (verbosity > 2) {
@@ -674,125 +609,114 @@ void GlobalDigisProducer::storeECal(PGlobalDigi& product)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
   }
 
-  product.putEBCalDigis(EBCalmaxPos,EBCalAEE,EBCalSHE);
-  product.putEECalDigis(EECalmaxPos,EECalAEE,EECalSHE);
-  product.putESCalDigis(ESCalADC0,ESCalADC1,ESCalADC2,ESCalSHE);
+  product.putEBCalDigis(EBCalmaxPos, EBCalAEE, EBCalSHE);
+  product.putEECalDigis(EECalmaxPos, EECalAEE, EECalSHE);
+  product.putESCalDigis(ESCalADC0, ESCalADC1, ESCalADC2, ESCalSHE);
 
   return;
 }
 
-void GlobalDigisProducer::fillHCal(edm::Event& iEvent, 
-				   const edm::EventSetup& iSetup)
-{
+void GlobalDigisProducer::fillHCal(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalDigisProducer_fillHCal";
 
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
+    eventout = "\nGathering info:";
 
   // get calibration info
   edm::ESHandle<HcalDbService> HCalconditions;
   iSetup.get<HcalDbRecord>().get(HCalconditions);
   if (!HCalconditions.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find HCalconditions in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find HCalconditions in event!";
     return;
-  } 
-  //HcalCalibrations calibrations;
+  }
+  // HcalCalibrations calibrations;
   CaloSamples tool;
 
   ///////////////////////
   // extract simhit info
   //////////////////////
   edm::Handle<edm::PCaloHitContainer> hcalHits;
-  iEvent.getByToken(HCalSrc_Token_,hcalHits);
+  iEvent.getByToken(HCalSrc_Token_, hcalHits);
   if (!hcalHits.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find hcalHits in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find hcalHits in event!";
     return;
-  }  
+  }
   const edm::PCaloHitContainer *simhitResult = hcalHits.product();
-  
+
   MapType fHBEnergySimHits;
   MapType fHEEnergySimHits;
   MapType fHOEnergySimHits;
   MapType fHFEnergySimHits;
-  for (std::vector<PCaloHit>::const_iterator simhits = simhitResult->begin();
-       simhits != simhitResult->end();
+  for (std::vector<PCaloHit>::const_iterator simhits = simhitResult->begin(); simhits != simhitResult->end();
        ++simhits) {
-    
     HcalDetId detId(simhits->id());
     uint32_t cellid = detId.rawId();
 
-    if (detId.subdet() == sdHcalBrl){  
-      fHBEnergySimHits[cellid] += simhits->energy(); 
-    }
-    if (detId.subdet() == sdHcalEC){  
-      fHEEnergySimHits[cellid] += simhits->energy(); 
-    }    
-    if (detId.subdet() == sdHcalOut){  
-      fHOEnergySimHits[cellid] += simhits->energy(); 
-    }    
-    if (detId.subdet() == sdHcalFwd){  
-      fHFEnergySimHits[cellid] += simhits->energy(); 
-    }    
+    if (detId.subdet() == sdHcalBrl) {
+      fHBEnergySimHits[cellid] += simhits->energy();
+    }
+    if (detId.subdet() == sdHcalEC) {
+      fHEEnergySimHits[cellid] += simhits->energy();
+    }
+    if (detId.subdet() == sdHcalOut) {
+      fHOEnergySimHits[cellid] += simhits->energy();
+    }
+    if (detId.subdet() == sdHcalFwd) {
+      fHFEnergySimHits[cellid] += simhits->energy();
+    }
   }
 
   ////////////////////////
   // get HBHE information
   ///////////////////////
-  edm::Handle<edm::SortedCollection<HBHEDataFrame> > hbhe;
-  iEvent.getByToken(HBHEDigi_Token_,hbhe);
+  edm::Handle<edm::SortedCollection<HBHEDataFrame>> hbhe;
+  iEvent.getByToken(HBHEDigi_Token_, hbhe);
   if (!hbhe.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find HBHEDataFrame in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find HBHEDataFrame in event!";
     return;
-  }    
+  }
   edm::SortedCollection<HBHEDataFrame>::const_iterator ihbhe;
-  
+
   int iHB = 0;
-  int iHE = 0; 
+  int iHE = 0;
   for (ihbhe = hbhe->begin(); ihbhe != hbhe->end(); ++ihbhe) {
-    HcalDetId cell(ihbhe->id()); 
+    HcalDetId cell(ihbhe->id());
 
     if ((cell.subdet() == sdHcalBrl) || (cell.subdet() == sdHcalEC)) {
-      
-      //HCalconditions->makeHcalCalibration(cell, &calibrations);
-      const HcalCalibrations& calibrations = 
-	HCalconditions->getHcalCalibrations(cell);
+      // HCalconditions->makeHcalCalibration(cell, &calibrations);
+      const HcalCalibrations &calibrations = HCalconditions->getHcalCalibrations(cell);
       const HcalQIECoder *channelCoder = HCalconditions->getHcalCoder(cell);
       const HcalQIEShape *shape = HCalconditions->getHcalShape(channelCoder);
 
       HcalCoderDb coder(*channelCoder, *shape);
       coder.adc2fC(*ihbhe, tool);
-      
+
       // get HB info
       if (cell.subdet() == sdHcalBrl) {
-
-	++iHB;
-	float fDigiSum = 0.0;
-	for  (int ii = 0; ii < tool.size(); ++ii) {
-	  // default ped is 4.5
-	  int capid = (*ihbhe)[ii].capid();
-	  fDigiSum += (tool[ii] - calibrations.pedestal(capid));
-	}
-	
-	HBCalAEE.push_back(fDigiSum);
-	HBCalSHE.push_back(fHBEnergySimHits[cell.rawId()]);
+        ++iHB;
+        float fDigiSum = 0.0;
+        for (int ii = 0; ii < tool.size(); ++ii) {
+          // default ped is 4.5
+          int capid = (*ihbhe)[ii].capid();
+          fDigiSum += (tool[ii] - calibrations.pedestal(capid));
+        }
+
+        HBCalAEE.push_back(fDigiSum);
+        HBCalSHE.push_back(fHBEnergySimHits[cell.rawId()]);
       }
-	
+
       // get HE info
       if (cell.subdet() == sdHcalEC) {
-	
-	++iHE;
-	float fDigiSum = 0.0;
-	for  (int ii = 0; ii < tool.size(); ++ii) {
-	  int capid = (*ihbhe)[ii].capid();
-	  fDigiSum += (tool[ii]-calibrations.pedestal(capid));
-	}
-	
-	HECalAEE.push_back(fDigiSum);
-	HECalSHE.push_back(fHEEnergySimHits[cell.rawId()]);
+        ++iHE;
+        float fDigiSum = 0.0;
+        for (int ii = 0; ii < tool.size(); ++ii) {
+          int capid = (*ihbhe)[ii].capid();
+          fDigiSum += (tool[ii] - calibrations.pedestal(capid));
+        }
+
+        HECalAEE.push_back(fDigiSum);
+        HECalSHE.push_back(fHEEnergySimHits[cell.rawId()]);
       }
     }
   }
@@ -801,7 +725,7 @@ void GlobalDigisProducer::fillHCal(edm::Event& iEvent,
     eventout += "\n          Number of HBDigis collected:.............. ";
     eventout += iHB;
   }
-  
+
   if (verbosity > 1) {
     eventout += "\n          Number of HEDigis collected:.............. ";
     eventout += iHE;
@@ -810,38 +734,35 @@ void GlobalDigisProducer::fillHCal(edm::Event& iEvent,
   ////////////////////////
   // get HO information
   ///////////////////////
-  edm::Handle<edm::SortedCollection<HODataFrame> > ho;
-  iEvent.getByToken(HODigi_Token_,ho);
+  edm::Handle<edm::SortedCollection<HODataFrame>> ho;
+  iEvent.getByToken(HODigi_Token_, ho);
   if (!ho.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find HODataFrame in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find HODataFrame in event!";
     return;
-  }    
+  }
   edm::SortedCollection<HODataFrame>::const_iterator iho;
-  
-  int iHO = 0; 
+
+  int iHO = 0;
   for (iho = ho->begin(); iho != ho->end(); ++iho) {
-    HcalDetId cell(iho->id()); 
+    HcalDetId cell(iho->id());
 
     if (cell.subdet() == sdHcalOut) {
-      
-      //HCalconditions->makeHcalCalibration(cell, &calibrations);
-      const HcalCalibrations& calibrations = 
-	HCalconditions->getHcalCalibrations(cell);
+      // HCalconditions->makeHcalCalibration(cell, &calibrations);
+      const HcalCalibrations &calibrations = HCalconditions->getHcalCalibrations(cell);
       const HcalQIECoder *channelCoder = HCalconditions->getHcalCoder(cell);
       const HcalQIEShape *shape = HCalconditions->getHcalShape(channelCoder);
 
-      HcalCoderDb coder (*channelCoder, *shape);
+      HcalCoderDb coder(*channelCoder, *shape);
       coder.adc2fC(*iho, tool);
 
       ++iHO;
       float fDigiSum = 0.0;
-      for  (int ii = 0; ii < tool.size(); ++ii) {
-	// default ped is 4.5
-	int capid = (*iho)[ii].capid();
-	fDigiSum += (tool[ii] - calibrations.pedestal(capid));
+      for (int ii = 0; ii < tool.size(); ++ii) {
+        // default ped is 4.5
+        int capid = (*iho)[ii].capid();
+        fDigiSum += (tool[ii] - calibrations.pedestal(capid));
       }
-	
+
       HOCalAEE.push_back(fDigiSum);
       HOCalSHE.push_back(fHOEnergySimHits[cell.rawId()]);
     }
@@ -855,38 +776,35 @@ void GlobalDigisProducer::fillHCal(edm::Event& iEvent,
   ////////////////////////
   // get HF information
   ///////////////////////
-  edm::Handle<edm::SortedCollection<HFDataFrame> > hf;
-  iEvent.getByToken(HFDigi_Token_,hf);
+  edm::Handle<edm::SortedCollection<HFDataFrame>> hf;
+  iEvent.getByToken(HFDigi_Token_, hf);
   if (!hf.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find HFDataFrame in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find HFDataFrame in event!";
     return;
-  }    
+  }
   edm::SortedCollection<HFDataFrame>::const_iterator ihf;
-  
-  int iHF = 0; 
+
+  int iHF = 0;
   for (ihf = hf->begin(); ihf != hf->end(); ++ihf) {
-    HcalDetId cell(ihf->id()); 
+    HcalDetId cell(ihf->id());
 
     if (cell.subdet() == sdHcalFwd) {
-      
-      //HCalconditions->makeHcalCalibration(cell, &calibrations);
-      const HcalCalibrations& calibrations = 
-	HCalconditions->getHcalCalibrations(cell);
+      // HCalconditions->makeHcalCalibration(cell, &calibrations);
+      const HcalCalibrations &calibrations = HCalconditions->getHcalCalibrations(cell);
       const HcalQIECoder *channelCoder = HCalconditions->getHcalCoder(cell);
       const HcalQIEShape *shape = HCalconditions->getHcalShape(channelCoder);
 
-      HcalCoderDb coder (*channelCoder, *shape);
+      HcalCoderDb coder(*channelCoder, *shape);
       coder.adc2fC(*ihf, tool);
 
       ++iHF;
       float fDigiSum = 0.0;
-      for  (int ii = 0; ii < tool.size(); ++ii) {
-	// default ped is 1.73077
-	int capid = (*ihf)[ii].capid();
-	fDigiSum += (tool[ii] - calibrations.pedestal(capid));
+      for (int ii = 0; ii < tool.size(); ++ii) {
+        // default ped is 1.73077
+        int capid = (*ihf)[ii].capid();
+        fDigiSum += (tool[ii] - calibrations.pedestal(capid));
       }
-	
+
       HFCalAEE.push_back(fDigiSum);
       HFCalSHE.push_back(fHFEnergySimHits[cell.rawId()]);
     }
@@ -903,8 +821,7 @@ void GlobalDigisProducer::fillHCal(edm::Event& iEvent,
   return;
 }
 
-void GlobalDigisProducer::storeHCal(PGlobalDigi& product)
-{
+void GlobalDigisProducer::storeHCal(PGlobalDigi &product) {
   std::string MsgLoggerCat = "GlobalDigisProducer_storeHCal";
 
   if (verbosity > 2) {
@@ -948,156 +865,147 @@ void GlobalDigisProducer::storeHCal(PGlobalDigi& product)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
   }
 
-  product.putHBCalDigis(HBCalAEE,HBCalSHE);
-  product.putHECalDigis(HECalAEE,HECalSHE);
-  product.putHOCalDigis(HOCalAEE,HOCalSHE);
-  product.putHFCalDigis(HFCalAEE,HFCalSHE);
+  product.putHBCalDigis(HBCalAEE, HBCalSHE);
+  product.putHECalDigis(HECalAEE, HECalSHE);
+  product.putHOCalDigis(HOCalAEE, HOCalSHE);
+  product.putHFCalDigis(HFCalAEE, HFCalSHE);
 
   return;
 }
 
-void GlobalDigisProducer::fillTrk(edm::Event& iEvent, 
-				   const edm::EventSetup& iSetup)
-{
-  //Retrieve tracker topology from geometry
+void GlobalDigisProducer::fillTrk(edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   iSetup.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
-
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
   std::string MsgLoggerCat = "GlobalDigisProducer_fillTrk";
 
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
+    eventout = "\nGathering info:";
 
   // get strip information
-  edm::Handle<edm::DetSetVector<SiStripDigi> > stripDigis;  
+  edm::Handle<edm::DetSetVector<SiStripDigi>> stripDigis;
   iEvent.getByToken(SiStripSrc_Token_, stripDigis);
   if (!stripDigis.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find stripDigis in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find stripDigis in event!";
     return;
-  }  
+  }
 
   int nStripBrl = 0, nStripFwd = 0;
   edm::DetSetVector<SiStripDigi>::const_iterator DSViter;
-  for (DSViter = stripDigis->begin(); DSViter != stripDigis->end(); 
-       ++DSViter) {
+  for (DSViter = stripDigis->begin(); DSViter != stripDigis->end(); ++DSViter) {
     unsigned int id = DSViter->id;
     DetId detId(id);
     edm::DetSet<SiStripDigi>::const_iterator begin = DSViter->data.begin();
     edm::DetSet<SiStripDigi>::const_iterator end = DSViter->data.end();
     edm::DetSet<SiStripDigi>::const_iterator iter;
-    
+
     // get TIB
     if (detId.subdetId() == sdSiTIB) {
-      
       for (iter = begin; iter != end; ++iter) {
-	++nStripBrl;
-	if (tTopo->tibLayer(id) == 1) {
-	  TIBL1ADC.push_back((*iter).adc());
-	  TIBL1Strip.push_back((*iter).strip());
-	}
-	if (tTopo->tibLayer(id) == 2) {
-	  TIBL2ADC.push_back((*iter).adc());
-	  TIBL2Strip.push_back((*iter).strip());
-	}	
-	if (tTopo->tibLayer(id) == 3) {
-	  TIBL3ADC.push_back((*iter).adc());
-	  TIBL3Strip.push_back((*iter).strip());
-	}
-	if (tTopo->tibLayer(id) == 4) {
-	  TIBL4ADC.push_back((*iter).adc());
-	  TIBL4Strip.push_back((*iter).strip());
-	}
+        ++nStripBrl;
+        if (tTopo->tibLayer(id) == 1) {
+          TIBL1ADC.push_back((*iter).adc());
+          TIBL1Strip.push_back((*iter).strip());
+        }
+        if (tTopo->tibLayer(id) == 2) {
+          TIBL2ADC.push_back((*iter).adc());
+          TIBL2Strip.push_back((*iter).strip());
+        }
+        if (tTopo->tibLayer(id) == 3) {
+          TIBL3ADC.push_back((*iter).adc());
+          TIBL3Strip.push_back((*iter).strip());
+        }
+        if (tTopo->tibLayer(id) == 4) {
+          TIBL4ADC.push_back((*iter).adc());
+          TIBL4Strip.push_back((*iter).strip());
+        }
       }
     }
-    
+
     // get TOB
     if (detId.subdetId() == sdSiTOB) {
-      
       for (iter = begin; iter != end; ++iter) {
-	++nStripBrl;
-	if (tTopo->tobLayer(id) == 1) {
-	  TOBL1ADC.push_back((*iter).adc());
-	  TOBL1Strip.push_back((*iter).strip());
-	}
-	if (tTopo->tobLayer(id) == 2) {
-	  TOBL2ADC.push_back((*iter).adc());
-	  TOBL2Strip.push_back((*iter).strip());
-	}	
-	if (tTopo->tobLayer(id) == 3) {
-	  TOBL3ADC.push_back((*iter).adc());
-	  TOBL3Strip.push_back((*iter).strip());
-	}
-	if (tTopo->tobLayer(id) == 4) {
-	  TOBL4ADC.push_back((*iter).adc());
-	  TOBL4Strip.push_back((*iter).strip());
-	}
+        ++nStripBrl;
+        if (tTopo->tobLayer(id) == 1) {
+          TOBL1ADC.push_back((*iter).adc());
+          TOBL1Strip.push_back((*iter).strip());
+        }
+        if (tTopo->tobLayer(id) == 2) {
+          TOBL2ADC.push_back((*iter).adc());
+          TOBL2Strip.push_back((*iter).strip());
+        }
+        if (tTopo->tobLayer(id) == 3) {
+          TOBL3ADC.push_back((*iter).adc());
+          TOBL3Strip.push_back((*iter).strip());
+        }
+        if (tTopo->tobLayer(id) == 4) {
+          TOBL4ADC.push_back((*iter).adc());
+          TOBL4Strip.push_back((*iter).strip());
+        }
       }
-    }    
-    
+    }
+
     // get TID
     if (detId.subdetId() == sdSiTID) {
-      
       for (iter = begin; iter != end; ++iter) {
-	++nStripFwd;
-	if (tTopo->tidWheel(id) == 1) {
-	  TIDW1ADC.push_back((*iter).adc());
-	  TIDW1Strip.push_back((*iter).strip());
-	}
-	if (tTopo->tidWheel(id) == 2) {
-	  TIDW2ADC.push_back((*iter).adc());
-	  TIDW2Strip.push_back((*iter).strip());
-	}
-	if (tTopo->tidWheel(id) == 3) {
-	  TIDW3ADC.push_back((*iter).adc());
-	  TIDW3Strip.push_back((*iter).strip());
-	}
+        ++nStripFwd;
+        if (tTopo->tidWheel(id) == 1) {
+          TIDW1ADC.push_back((*iter).adc());
+          TIDW1Strip.push_back((*iter).strip());
+        }
+        if (tTopo->tidWheel(id) == 2) {
+          TIDW2ADC.push_back((*iter).adc());
+          TIDW2Strip.push_back((*iter).strip());
+        }
+        if (tTopo->tidWheel(id) == 3) {
+          TIDW3ADC.push_back((*iter).adc());
+          TIDW3Strip.push_back((*iter).strip());
+        }
       }
-    }   
+    }
 
     // get TEC
     if (detId.subdetId() == sdSiTEC) {
-      
       for (iter = begin; iter != end; ++iter) {
-	++nStripFwd;
-	if (tTopo->tecWheel(id) == 1) {
-	  TECW1ADC.push_back((*iter).adc());
-	  TECW1Strip.push_back((*iter).strip());
-	}
-	if (tTopo->tecWheel(id) == 2) {
-	  TECW2ADC.push_back((*iter).adc());
-	  TECW2Strip.push_back((*iter).strip());
-	}
-	if (tTopo->tecWheel(id) == 3) {
-	  TECW3ADC.push_back((*iter).adc());
-	  TECW3Strip.push_back((*iter).strip());
-	}
-	if (tTopo->tecWheel(id) == 4) {
-	  TECW4ADC.push_back((*iter).adc());
-	  TECW4Strip.push_back((*iter).strip());
-	}
-	if (tTopo->tecWheel(id) == 5) {
-	  TECW5ADC.push_back((*iter).adc());
-	  TECW5Strip.push_back((*iter).strip());
-	}
-	if (tTopo->tecWheel(id) == 6) {
-	  TECW6ADC.push_back((*iter).adc());
-	  TECW6Strip.push_back((*iter).strip());
-	}
-	if (tTopo->tecWheel(id) == 7) {
-	  TECW7ADC.push_back((*iter).adc());
-	  TECW7Strip.push_back((*iter).strip());
-	}
-	if (tTopo->tecWheel(id) == 8) {
-	  TECW8ADC.push_back((*iter).adc());
-	  TECW8Strip.push_back((*iter).strip());
-	}
+        ++nStripFwd;
+        if (tTopo->tecWheel(id) == 1) {
+          TECW1ADC.push_back((*iter).adc());
+          TECW1Strip.push_back((*iter).strip());
+        }
+        if (tTopo->tecWheel(id) == 2) {
+          TECW2ADC.push_back((*iter).adc());
+          TECW2Strip.push_back((*iter).strip());
+        }
+        if (tTopo->tecWheel(id) == 3) {
+          TECW3ADC.push_back((*iter).adc());
+          TECW3Strip.push_back((*iter).strip());
+        }
+        if (tTopo->tecWheel(id) == 4) {
+          TECW4ADC.push_back((*iter).adc());
+          TECW4Strip.push_back((*iter).strip());
+        }
+        if (tTopo->tecWheel(id) == 5) {
+          TECW5ADC.push_back((*iter).adc());
+          TECW5Strip.push_back((*iter).strip());
+        }
+        if (tTopo->tecWheel(id) == 6) {
+          TECW6ADC.push_back((*iter).adc());
+          TECW6Strip.push_back((*iter).strip());
+        }
+        if (tTopo->tecWheel(id) == 7) {
+          TECW7ADC.push_back((*iter).adc());
+          TECW7Strip.push_back((*iter).strip());
+        }
+        if (tTopo->tecWheel(id) == 8) {
+          TECW8ADC.push_back((*iter).adc());
+          TECW8Strip.push_back((*iter).strip());
+        }
       }
-    }     
-  } // end loop over DataSetVector
+    }
+  }  // end loop over DataSetVector
 
   if (verbosity > 1) {
     eventout += "\n          Number of BrlStripDigis collected:........ ";
@@ -1110,18 +1018,16 @@ void GlobalDigisProducer::fillTrk(edm::Event& iEvent,
   }
 
   // get pixel information
-  edm::Handle<edm::DetSetVector<PixelDigi> > pixelDigis;  
+  edm::Handle<edm::DetSetVector<PixelDigi>> pixelDigis;
   iEvent.getByToken(SiPxlSrc_Token_, pixelDigis);
   if (!pixelDigis.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find pixelDigis in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find pixelDigis in event!";
     return;
-  }  
+  }
 
   int nPxlBrl = 0, nPxlFwd = 0;
   edm::DetSetVector<PixelDigi>::const_iterator DPViter;
-  for (DPViter = pixelDigis->begin(); DPViter != pixelDigis->end(); 
-       ++DPViter) {
+  for (DPViter = pixelDigis->begin(); DPViter != pixelDigis->end(); ++DPViter) {
     unsigned int id = DPViter->id;
     DetId detId(id);
     edm::DetSet<PixelDigi>::const_iterator begin = DPViter->data.begin();
@@ -1130,56 +1036,54 @@ void GlobalDigisProducer::fillTrk(edm::Event& iEvent,
 
     // get Barrel pixels
     if (detId.subdetId() == sdPxlBrl) {
-      
       for (iter = begin; iter != end; ++iter) {
-	++nPxlBrl;
-	if (tTopo->pxbLayer(id) == 1) {
-	  BRL1ADC.push_back((*iter).adc());
-	  BRL1Row.push_back((*iter).row());
-	  BRL1Col.push_back((*iter).column());	  
-	}
-	if (tTopo->pxbLayer(id) == 2) {
-	  BRL2ADC.push_back((*iter).adc());
-	  BRL2Row.push_back((*iter).row());
-	  BRL2Col.push_back((*iter).column());	  
-	}
-	if (tTopo->pxbLayer(id) == 3) {
-	  BRL3ADC.push_back((*iter).adc());
-	  BRL3Row.push_back((*iter).row());
-	  BRL3Col.push_back((*iter).column());	  
-	}
+        ++nPxlBrl;
+        if (tTopo->pxbLayer(id) == 1) {
+          BRL1ADC.push_back((*iter).adc());
+          BRL1Row.push_back((*iter).row());
+          BRL1Col.push_back((*iter).column());
+        }
+        if (tTopo->pxbLayer(id) == 2) {
+          BRL2ADC.push_back((*iter).adc());
+          BRL2Row.push_back((*iter).row());
+          BRL2Col.push_back((*iter).column());
+        }
+        if (tTopo->pxbLayer(id) == 3) {
+          BRL3ADC.push_back((*iter).adc());
+          BRL3Row.push_back((*iter).row());
+          BRL3Col.push_back((*iter).column());
+        }
       }
     }
 
     // get Forward pixels
     if (detId.subdetId() == sdPxlFwd) {
-      
       for (iter = begin; iter != end; ++iter) {
-	++nPxlFwd;
-	if (tTopo->pxfDisk(id) == 1) {
-	  if (tTopo->pxfSide(id) == 1) {
-	    FWD1nADC.push_back((*iter).adc());
-	    FWD1nRow.push_back((*iter).row());
-	    FWD1nCol.push_back((*iter).column());
-	  }
-	  if (tTopo->pxfSide(id) == 2) {
-	    FWD1pADC.push_back((*iter).adc());
-	    FWD1pRow.push_back((*iter).row());
-	    FWD1pCol.push_back((*iter).column());
-	  }
-	}
-	if (tTopo->pxfDisk(id) == 2) {
-	  if (tTopo->pxfSide(id) == 1) {
-	    FWD2nADC.push_back((*iter).adc());
-	    FWD2nRow.push_back((*iter).row());
-	    FWD2nCol.push_back((*iter).column());
-	  }
-	  if (tTopo->pxfSide(id) == 2) {
-	    FWD2pADC.push_back((*iter).adc());
-	    FWD2pRow.push_back((*iter).row());
-	    FWD2pCol.push_back((*iter).column());
-	  }
-	}
+        ++nPxlFwd;
+        if (tTopo->pxfDisk(id) == 1) {
+          if (tTopo->pxfSide(id) == 1) {
+            FWD1nADC.push_back((*iter).adc());
+            FWD1nRow.push_back((*iter).row());
+            FWD1nCol.push_back((*iter).column());
+          }
+          if (tTopo->pxfSide(id) == 2) {
+            FWD1pADC.push_back((*iter).adc());
+            FWD1pRow.push_back((*iter).row());
+            FWD1pCol.push_back((*iter).column());
+          }
+        }
+        if (tTopo->pxfDisk(id) == 2) {
+          if (tTopo->pxfSide(id) == 1) {
+            FWD2nADC.push_back((*iter).adc());
+            FWD2nRow.push_back((*iter).row());
+            FWD2nCol.push_back((*iter).column());
+          }
+          if (tTopo->pxfSide(id) == 2) {
+            FWD2pADC.push_back((*iter).adc());
+            FWD2pRow.push_back((*iter).row());
+            FWD2pCol.push_back((*iter).column());
+          }
+        }
       }
     }
   }
@@ -1200,12 +1104,10 @@ void GlobalDigisProducer::fillTrk(edm::Event& iEvent,
   return;
 }
 
-void GlobalDigisProducer::storeTrk(PGlobalDigi& product)
-{
+void GlobalDigisProducer::storeTrk(PGlobalDigi &product) {
   std::string MsgLoggerCat = "GlobalDigisProducer_storeTrk";
 
   if (verbosity > 2) {
-
     // strip output
     TString eventout("\n         nTIBL1     = ");
     eventout += TIBL1ADC.size();
@@ -1390,7 +1292,7 @@ void GlobalDigisProducer::storeTrk(PGlobalDigi& product)
       eventout += ", ";
       eventout += BRL1Col[i];
       eventout += ")";
-    } 
+    }
     eventout += "\n         nBRL2     = ";
     eventout += BRL2ADC.size();
     for (unsigned int i = 0; i < BRL2ADC.size(); ++i) {
@@ -1401,7 +1303,7 @@ void GlobalDigisProducer::storeTrk(PGlobalDigi& product)
       eventout += ", ";
       eventout += BRL2Col[i];
       eventout += ")";
-    } 
+    }
     eventout += "\n         nBRL3     = ";
     eventout += BRL3ADC.size();
     for (unsigned int i = 0; i < BRL3ADC.size(); ++i) {
@@ -1412,7 +1314,7 @@ void GlobalDigisProducer::storeTrk(PGlobalDigi& product)
       eventout += ", ";
       eventout += BRL3Col[i];
       eventout += ")";
-    }    
+    }
     eventout += "\n         nFWD1p     = ";
     eventout += FWD1pADC.size();
     for (unsigned int i = 0; i < FWD1pADC.size(); ++i) {
@@ -1423,7 +1325,7 @@ void GlobalDigisProducer::storeTrk(PGlobalDigi& product)
       eventout += ", ";
       eventout += FWD1pCol[i];
       eventout += ")";
-    } 
+    }
     eventout += "\n         nFWD1p     = ";
     eventout += FWD1nADC.size();
     for (unsigned int i = 0; i < FWD1nADC.size(); ++i) {
@@ -1434,7 +1336,7 @@ void GlobalDigisProducer::storeTrk(PGlobalDigi& product)
       eventout += ", ";
       eventout += FWD1nCol[i];
       eventout += ")";
-    } 
+    }
     eventout += "\n         nFWD1p     = ";
     eventout += FWD2pADC.size();
     for (unsigned int i = 0; i < FWD2pADC.size(); ++i) {
@@ -1445,7 +1347,7 @@ void GlobalDigisProducer::storeTrk(PGlobalDigi& product)
       eventout += ", ";
       eventout += FWD2pCol[i];
       eventout += ")";
-    } 
+    }
     eventout += "\n         nFWD2p     = ";
     eventout += FWD2nADC.size();
     for (unsigned int i = 0; i < FWD2nADC.size(); ++i) {
@@ -1456,31 +1358,31 @@ void GlobalDigisProducer::storeTrk(PGlobalDigi& product)
       eventout += ", ";
       eventout += FWD2nCol[i];
       eventout += ")";
-    } 
+    }
 
-    edm::LogInfo(MsgLoggerCat) << eventout << "\n";  
+    edm::LogInfo(MsgLoggerCat) << eventout << "\n";
   }
 
   // strip output
-  product.putTIBL1Digis(TIBL1ADC,TIBL1Strip);
-  product.putTIBL2Digis(TIBL2ADC,TIBL2Strip);
-  product.putTIBL3Digis(TIBL3ADC,TIBL3Strip);
-  product.putTIBL4Digis(TIBL4ADC,TIBL4Strip);
-  product.putTOBL1Digis(TOBL1ADC,TOBL1Strip);
-  product.putTOBL2Digis(TOBL2ADC,TOBL2Strip);
-  product.putTOBL3Digis(TOBL3ADC,TOBL3Strip);
-  product.putTOBL4Digis(TOBL4ADC,TOBL4Strip);
-  product.putTIDW1Digis(TIDW1ADC,TIDW1Strip);
-  product.putTIDW2Digis(TIDW2ADC,TIDW2Strip);
-  product.putTIDW3Digis(TIDW3ADC,TIDW3Strip);
-  product.putTECW1Digis(TECW1ADC,TECW1Strip);
-  product.putTECW2Digis(TECW2ADC,TECW2Strip);
-  product.putTECW3Digis(TECW3ADC,TECW3Strip);
-  product.putTECW4Digis(TECW4ADC,TECW4Strip);
-  product.putTECW5Digis(TECW5ADC,TECW5Strip);
-  product.putTECW6Digis(TECW6ADC,TECW6Strip);  
-  product.putTECW7Digis(TECW7ADC,TECW7Strip);
-  product.putTECW8Digis(TECW8ADC,TECW8Strip);  
+  product.putTIBL1Digis(TIBL1ADC, TIBL1Strip);
+  product.putTIBL2Digis(TIBL2ADC, TIBL2Strip);
+  product.putTIBL3Digis(TIBL3ADC, TIBL3Strip);
+  product.putTIBL4Digis(TIBL4ADC, TIBL4Strip);
+  product.putTOBL1Digis(TOBL1ADC, TOBL1Strip);
+  product.putTOBL2Digis(TOBL2ADC, TOBL2Strip);
+  product.putTOBL3Digis(TOBL3ADC, TOBL3Strip);
+  product.putTOBL4Digis(TOBL4ADC, TOBL4Strip);
+  product.putTIDW1Digis(TIDW1ADC, TIDW1Strip);
+  product.putTIDW2Digis(TIDW2ADC, TIDW2Strip);
+  product.putTIDW3Digis(TIDW3ADC, TIDW3Strip);
+  product.putTECW1Digis(TECW1ADC, TECW1Strip);
+  product.putTECW2Digis(TECW2ADC, TECW2Strip);
+  product.putTECW3Digis(TECW3ADC, TECW3Strip);
+  product.putTECW4Digis(TECW4ADC, TECW4Strip);
+  product.putTECW5Digis(TECW5ADC, TECW5Strip);
+  product.putTECW6Digis(TECW6ADC, TECW6Strip);
+  product.putTECW7Digis(TECW7ADC, TECW7Strip);
+  product.putTECW8Digis(TECW8ADC, TECW8Strip);
 
   // pixel output
   product.putBRL1Digis(BRL1ADC, BRL1Row, BRL1Col);
@@ -1494,85 +1396,73 @@ void GlobalDigisProducer::storeTrk(PGlobalDigi& product)
   return;
 }
 
-void GlobalDigisProducer::fillMuon(edm::Event& iEvent, 
-				   const edm::EventSetup& iSetup)
-{
+void GlobalDigisProducer::fillMuon(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalDigisProducer_fillMuon";
-  
+
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
+    eventout = "\nGathering info:";
 
   // get DT information
-  edm::Handle<DTDigiCollection> dtDigis;  
+  edm::Handle<DTDigiCollection> dtDigis;
   iEvent.getByToken(MuDTSrc_Token_, dtDigis);
   if (!dtDigis.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find dtDigis in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find dtDigis in event!";
     return;
-  }  
+  }
 
   int nDt = 0;
   DTDigiCollection::DigiRangeIterator detUnitIt;
-  for (detUnitIt = dtDigis->begin(); detUnitIt != dtDigis->end(); 
-       ++detUnitIt) {
-    
-    const DTLayerId& id = (*detUnitIt).first;
-    const DTDigiCollection::Range& range = (*detUnitIt).second;
-
-    for (DTDigiCollection::const_iterator digiIt = range.first;
-	 digiIt != range.second;
-	 ++digiIt) {
-      
+  for (detUnitIt = dtDigis->begin(); detUnitIt != dtDigis->end(); ++detUnitIt) {
+    const DTLayerId &id = (*detUnitIt).first;
+    const DTDigiCollection::Range &range = (*detUnitIt).second;
+
+    for (DTDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) {
       ++nDt;
-      
-      DTWireId wireId(id,(*digiIt).wire());
+
+      DTWireId wireId(id, (*digiIt).wire());
       if (wireId.station() == 1) {
-	MB1SLayer.push_back(id.superlayer());
-	MB1Time.push_back((*digiIt).time());
-	MB1Layer.push_back(id.layer());
+        MB1SLayer.push_back(id.superlayer());
+        MB1Time.push_back((*digiIt).time());
+        MB1Layer.push_back(id.layer());
       }
       if (wireId.station() == 2) {
-	MB2SLayer.push_back(id.superlayer());
-	MB2Time.push_back((*digiIt).time());
-	MB2Layer.push_back(id.layer());
+        MB2SLayer.push_back(id.superlayer());
+        MB2Time.push_back((*digiIt).time());
+        MB2Layer.push_back(id.layer());
       }
       if (wireId.station() == 3) {
-	MB3SLayer.push_back(id.superlayer());
-	MB3Time.push_back((*digiIt).time());
-	MB3Layer.push_back(id.layer());
+        MB3SLayer.push_back(id.superlayer());
+        MB3Time.push_back((*digiIt).time());
+        MB3Layer.push_back(id.layer());
       }
       if (wireId.station() == 4) {
-	MB4SLayer.push_back(id.superlayer());
-	MB4Time.push_back((*digiIt).time());
-	MB4Layer.push_back(id.layer());
+        MB4SLayer.push_back(id.superlayer());
+        MB4Time.push_back((*digiIt).time());
+        MB4Layer.push_back(id.layer());
       }
     }
   }
-                                                                     
+
   if (verbosity > 1) {
     eventout += "\n          Number of DtMuonDigis collected:.......... ";
     eventout += nDt;
   }
 
   // get CSC Strip information
-  edm::Handle<CSCStripDigiCollection> strips;  
+  edm::Handle<CSCStripDigiCollection> strips;
   iEvent.getByToken(MuCSCStripSrc_Token_, strips);
   if (!strips.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find muon strips in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find muon strips in event!";
     return;
-  }  
+  }
 
   int nStrips = 0;
-  for (CSCStripDigiCollection::DigiRangeIterator j = strips->begin();
-       j != strips->end();
-       ++j) {
-
+  for (CSCStripDigiCollection::DigiRangeIterator j = strips->begin(); j != strips->end(); ++j) {
     std::vector<CSCStripDigi>::const_iterator digiItr = (*j).second.first;
     std::vector<CSCStripDigi>::const_iterator last = (*j).second.second;
 
-    for ( ; digiItr != last; ++digiItr) {
+    for (; digiItr != last; ++digiItr) {
       ++nStrips;
 
       // average pedestals
@@ -1580,45 +1470,41 @@ void GlobalDigisProducer::fillMuon(edm::Event& iEvent,
       theCSCStripPedestalSum += adcCounts[0];
       theCSCStripPedestalSum += adcCounts[1];
       theCSCStripPedestalCount += 2;
- 
+
       // if there are enough pedestal statistics
       if (theCSCStripPedestalCount > 100) {
-	float pedestal = theCSCStripPedestalSum / theCSCStripPedestalCount;
-	if (adcCounts[5] > (pedestal + 100)) 
-	  CSCStripADC.push_back(adcCounts[4] - pedestal);	  
+        float pedestal = theCSCStripPedestalSum / theCSCStripPedestalCount;
+        if (adcCounts[5] > (pedestal + 100))
+          CSCStripADC.push_back(adcCounts[4] - pedestal);
       }
     }
   }
-                                                        
+
   if (verbosity > 1) {
     eventout += "\n          Number of CSCStripDigis collected:........ ";
     eventout += nStrips;
   }
 
   // get CSC Wire information
-  edm::Handle<CSCWireDigiCollection> wires;  
+  edm::Handle<CSCWireDigiCollection> wires;
   iEvent.getByToken(MuCSCWireSrc_Token_, wires);
   if (!wires.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find muon wires in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find muon wires in event!";
     return;
-  }  
+  }
 
   int nWires = 0;
-  for (CSCWireDigiCollection::DigiRangeIterator j = wires->begin();
-       j != wires->end();
-       ++j) {
-
+  for (CSCWireDigiCollection::DigiRangeIterator j = wires->begin(); j != wires->end(); ++j) {
     std::vector<CSCWireDigi>::const_iterator digiItr = (*j).second.first;
     std::vector<CSCWireDigi>::const_iterator endDigi = (*j).second.second;
 
-    for ( ; digiItr != endDigi; ++digiItr) {
+    for (; digiItr != endDigi; ++digiItr) {
       ++nWires;
 
-      CSCWireTime.push_back(digiItr->getTimeBin());	  
+      CSCWireTime.push_back(digiItr->getTimeBin());
     }
   }
-                                                        
+
   if (verbosity > 1) {
     eventout += "\n          Number of CSCWireDigis collected:......... ";
     eventout += nWires;
@@ -1626,16 +1512,14 @@ void GlobalDigisProducer::fillMuon(edm::Event& iEvent,
 
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
-  
+
   return;
 }
 
-void GlobalDigisProducer::storeMuon(PGlobalDigi& product)
-{
+void GlobalDigisProducer::storeMuon(PGlobalDigi &product) {
   std::string MsgLoggerCat = "GlobalDigisProducer_storeMuon";
-  
-  if (verbosity > 2) {
 
+  if (verbosity > 2) {
     // dt output
     TString eventout("\n         nMB1     = ");
     eventout += MB1SLayer.size();
@@ -1680,7 +1564,7 @@ void GlobalDigisProducer::storeMuon(PGlobalDigi& product)
       eventout += ", ";
       eventout += MB4Layer[i];
       eventout += ")";
-    }    
+    }
 
     // CSC Strip
     eventout += "\n         nCSCStrip     = ";
@@ -1689,7 +1573,7 @@ void GlobalDigisProducer::storeMuon(PGlobalDigi& product)
       eventout += "\n      (adc) = (";
       eventout += CSCStripADC[i];
       eventout += ")";
-    }    
+    }
 
     // CSC Wire
     eventout += "\n         nCSCWire     = ";
@@ -1698,15 +1582,15 @@ void GlobalDigisProducer::storeMuon(PGlobalDigi& product)
       eventout += "\n      (time) = (";
       eventout += CSCWireTime[i];
       eventout += ")";
-    }    
+    }
 
-    edm::LogInfo(MsgLoggerCat) << eventout << "\n";  
+    edm::LogInfo(MsgLoggerCat) << eventout << "\n";
   }
-  
-  product.putMB1Digis(MB1SLayer,MB1Time,MB1Layer);
-  product.putMB2Digis(MB2SLayer,MB2Time,MB2Layer);
-  product.putMB3Digis(MB3SLayer,MB3Time,MB3Layer);
-  product.putMB4Digis(MB4SLayer,MB4Time,MB4Layer);  
+
+  product.putMB1Digis(MB1SLayer, MB1Time, MB1Layer);
+  product.putMB2Digis(MB2SLayer, MB2Time, MB2Layer);
+  product.putMB3Digis(MB3SLayer, MB3Time, MB3Layer);
+  product.putMB4Digis(MB4SLayer, MB4Time, MB4Layer);
 
   product.putCSCstripDigis(CSCStripADC);
 
@@ -1715,22 +1599,20 @@ void GlobalDigisProducer::storeMuon(PGlobalDigi& product)
   return;
 }
 
-void GlobalDigisProducer::clear()
-{
+void GlobalDigisProducer::clear() {
   std::string MsgLoggerCat = "GlobalDigisProducer_clear";
 
   if (verbosity > 0)
-    edm::LogInfo(MsgLoggerCat)
-      << "Clearing event holders"; 
+    edm::LogInfo(MsgLoggerCat) << "Clearing event holders";
 
   // reset electromagnetic info
   // EE info
-  EECalmaxPos.clear(); 
-  EECalAEE.clear(); 
+  EECalmaxPos.clear();
+  EECalAEE.clear();
   EECalSHE.clear();
   // EB info
-  EBCalmaxPos.clear(); 
-  EBCalAEE.clear(); 
+  EBCalmaxPos.clear();
+  EBCalAEE.clear();
   EBCalSHE.clear();
   // ES info
   ESCalADC0.clear();
@@ -1746,49 +1628,49 @@ void GlobalDigisProducer::clear()
   HOCalAEE.clear();
   HOCalSHE.clear();
   HFCalAEE.clear();
-  HFCalSHE.clear();  
+  HFCalSHE.clear();
 
   // reset Track Info
-  TIBL1ADC.clear(); 
-  TIBL2ADC.clear(); 
-  TIBL3ADC.clear(); 
+  TIBL1ADC.clear();
+  TIBL2ADC.clear();
+  TIBL3ADC.clear();
   TIBL4ADC.clear();
-  TIBL1Strip.clear(); 
-  TIBL2Strip.clear(); 
-  TIBL3Strip.clear(); 
+  TIBL1Strip.clear();
+  TIBL2Strip.clear();
+  TIBL3Strip.clear();
   TIBL4Strip.clear();
-  
-  TOBL1ADC.clear(); 
-  TOBL2ADC.clear(); 
-  TOBL3ADC.clear(); 
+
+  TOBL1ADC.clear();
+  TOBL2ADC.clear();
+  TOBL3ADC.clear();
   TOBL4ADC.clear();
-  TOBL1Strip.clear(); 
-  TOBL2Strip.clear(); 
-  TOBL3Strip.clear(); 
+  TOBL1Strip.clear();
+  TOBL2Strip.clear();
+  TOBL3Strip.clear();
   TOBL4Strip.clear();
-  
-  TIDW1ADC.clear(); 
-  TIDW2ADC.clear(); 
+
+  TIDW1ADC.clear();
+  TIDW2ADC.clear();
   TIDW3ADC.clear();
-  TIDW1Strip.clear(); 
-  TIDW2Strip.clear(); 
+  TIDW1Strip.clear();
+  TIDW2Strip.clear();
   TIDW3Strip.clear();
-  
-  TECW1ADC.clear(); 
-  TECW2ADC.clear(); 
-  TECW3ADC.clear(); 
-  TECW4ADC.clear(); 
-  TECW5ADC.clear(); 
-  TECW6ADC.clear(); 
-  TECW7ADC.clear(); 
+
+  TECW1ADC.clear();
+  TECW2ADC.clear();
+  TECW3ADC.clear();
+  TECW4ADC.clear();
+  TECW5ADC.clear();
+  TECW6ADC.clear();
+  TECW7ADC.clear();
   TECW8ADC.clear();
-  TECW1Strip.clear(); 
-  TECW2Strip.clear(); 
-  TECW3Strip.clear(); 
-  TECW4Strip.clear(); 
-  TECW5Strip.clear(); 
-  TECW6Strip.clear(); 
-  TECW7Strip.clear(); 
+  TECW1Strip.clear();
+  TECW2Strip.clear();
+  TECW3Strip.clear();
+  TECW4Strip.clear();
+  TECW5Strip.clear();
+  TECW6Strip.clear();
+  TECW7Strip.clear();
   TECW8Strip.clear();
 
   BRL1ADC.clear();
@@ -1802,25 +1684,25 @@ void GlobalDigisProducer::clear()
   BRL3Col.clear();
 
   FWD1pADC.clear();
-  FWD1pRow.clear();  
+  FWD1pRow.clear();
   FWD1pCol.clear();
   FWD1nADC.clear();
-  FWD1nRow.clear();  
+  FWD1nRow.clear();
   FWD1nCol.clear();
   FWD2pADC.clear();
-  FWD2pRow.clear();  
+  FWD2pRow.clear();
   FWD2pCol.clear();
   FWD2nADC.clear();
-  FWD2nRow.clear();  
+  FWD2nRow.clear();
   FWD2nCol.clear();
 
-  //muon clear
+  // muon clear
   MB1SLayer.clear();
   MB1Time.clear();
   MB1Layer.clear();
   MB2SLayer.clear();
-  MB2Time.clear(); 
-  MB2Layer.clear(); 
+  MB2Time.clear();
+  MB2Layer.clear();
   MB3SLayer.clear();
   MB3Time.clear();
   MB3Layer.clear();
@@ -1835,5 +1717,5 @@ void GlobalDigisProducer::clear()
   return;
 }
 
-//define this as a plug-in
-//DEFINE_FWK_MODULE(GlobalDigisProducer);
+// define this as a plug-in
+// DEFINE_FWK_MODULE(GlobalDigisProducer);
diff --git a/Validation/GlobalDigis/src/SealModule.cc b/Validation/GlobalDigis/src/SealModule.cc
index 1afa4c57f512a..9a21b50cafe08 100644
--- a/Validation/GlobalDigis/src/SealModule.cc
+++ b/Validation/GlobalDigis/src/SealModule.cc
@@ -2,8 +2,6 @@
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-
-
 #include <Validation/GlobalDigis/interface/GlobalDigisProducer.h>
 DEFINE_FWK_MODULE(GlobalDigisProducer);
 
diff --git a/Validation/GlobalHits/interface/GlobalHitsAnalyzer.h b/Validation/GlobalHits/interface/GlobalHitsAnalyzer.h
index 6d2ef2ef6127e..40aca9826c967 100644
--- a/Validation/GlobalHits/interface/GlobalHitsAnalyzer.h
+++ b/Validation/GlobalHits/interface/GlobalHitsAnalyzer.h
@@ -2,101 +2,95 @@
 #define GlobalHitsAnalyzer_h
 
 /** \class GlobalHitsAnalyzer
- *  
+ *
  *  Class to fill dqm monitor elements from existing EDM file
  *
  *  \author M. Strang SUNY-Buffalo
  */
 
 // framework & common header files
+#include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/DetId/interface/DetId.h"
+#include "DataFormats/Provenance/interface/Provenance.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "DataFormats/Provenance/interface/Provenance.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "DataFormats/DetId/interface/DetId.h"
 
-//DQM services
+// DQM services
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 // tracker info
+#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
-#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 
 // muon info
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
+#include "DataFormats/MuonDetId/interface/DTWireId.h"
+#include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
+#include "DataFormats/MuonDetId/interface/RPCDetId.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
 #include "Geometry/RPCGeometry/interface/RPCGeometry.h"
-#include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
-#include "DataFormats/MuonDetId/interface/RPCDetId.h"
-#include "DataFormats/MuonDetId/interface/DTWireId.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 // calorimeter info
-#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
-#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 #include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
+#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
+#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
+#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 
 // data in edm::event
+#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
-#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
+#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
 // helper files
 //#include <CLHEP/Vector/LorentzVector.h>
-#include "DataFormats/Math/interface/LorentzVector.h"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 
-#include <iostream>
 #include <cstdlib>
-#include <string>
+#include <iostream>
 #include <memory>
+#include <string>
 #include <vector>
 
-#include "TString.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+#include "TString.h"
 
-class GlobalHitsAnalyzer : public DQMEDAnalyzer
-{
-  
- public:
-
-  //typedef std::vector<float> FloatVector;
+class GlobalHitsAnalyzer : public DQMEDAnalyzer {
+public:
+  // typedef std::vector<float> FloatVector;
 
-  explicit GlobalHitsAnalyzer(const edm::ParameterSet&);
+  explicit GlobalHitsAnalyzer(const edm::ParameterSet &);
   ~GlobalHitsAnalyzer() override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
- protected:
+protected:
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  
- private:
 
+private:
   // production related methods
-  void fillG4MC(const edm::Event&);
-  void fillTrk(const edm::Event&, const edm::EventSetup&);
-  void fillMuon(const edm::Event&, const edm::EventSetup&);
-  void fillECal(const edm::Event&, const edm::EventSetup&);
-  void fillHCal(const edm::Event&, const edm::EventSetup&);
-
-
- private:
+  void fillG4MC(const edm::Event &);
+  void fillTrk(const edm::Event &, const edm::EventSetup &);
+  void fillMuon(const edm::Event &, const edm::EventSetup &);
+  void fillECal(const edm::Event &, const edm::EventSetup &);
+  void fillHCal(const edm::Event &, const edm::EventSetup &);
 
+private:
   //  parameter information
   std::string fName;
   int verbosity;
@@ -134,8 +128,8 @@ class GlobalHitsAnalyzer : public DQMEDAnalyzer
   MonitorElement *meMCRGP[2];
   MonitorElement *meMCG4Vtx[2];
   MonitorElement *meGeantVtxX[2];
-  MonitorElement *meGeantVtxY[2];  
-  MonitorElement *meGeantVtxZ[2];  
+  MonitorElement *meGeantVtxY[2];
+  MonitorElement *meGeantVtxZ[2];
   MonitorElement *meMCG4Trk[2];
   MonitorElement *meGeantTrkPt;
   MonitorElement *meGeantTrkE;
@@ -143,7 +137,7 @@ class GlobalHitsAnalyzer : public DQMEDAnalyzer
   MonitorElement *meGeantVtxPhi;
   MonitorElement *meGeantVtxRad[2];
   MonitorElement *meGeantVtxMulti;
-  int nRawGenPart;  
+  int nRawGenPart;
 
   edm::InputTag G4VtxSrc_;
   edm::InputTag G4TrkSrc_;
@@ -156,7 +150,7 @@ class GlobalHitsAnalyzer : public DQMEDAnalyzer
   MonitorElement *meCaloEcalE[2];
   MonitorElement *meCaloEcalToF[2];
   MonitorElement *meCaloEcalPhi;
-  MonitorElement *meCaloEcalEta;  
+  MonitorElement *meCaloEcalEta;
   edm::InputTag ECalEBSrc_;
   edm::InputTag ECalEESrc_;
   edm::EDGetTokenT<edm::PCaloHitContainer> ECalEBSrc_Token_;
@@ -177,9 +171,9 @@ class GlobalHitsAnalyzer : public DQMEDAnalyzer
   MonitorElement *meCaloHcalE[2];
   MonitorElement *meCaloHcalToF[2];
   MonitorElement *meCaloHcalPhi;
-  MonitorElement *meCaloHcalEta;  
+  MonitorElement *meCaloHcalEta;
   edm::InputTag HCalSrc_;
-  edm::EDGetTokenT<edm::PCaloHitContainer>  HCalSrc_Token_;
+  edm::EDGetTokenT<edm::PCaloHitContainer> HCalSrc_Token_;
 
   // Tracker info
   // Pixel info
@@ -253,44 +247,44 @@ class GlobalHitsAnalyzer : public DQMEDAnalyzer
   // private statistics information
   unsigned int count;
 
-}; // end class declaration
-  
+};  // end class declaration
+
 #endif
 
 #ifndef GlobalHitMap
 #define GlobalHitMap
 // geometry mapping
-static const int dTrk             = 1;
-static const int sdPxlBrl         = 1;
-static const int sdPxlFwd         = 2;
-static const int sdSiTIB          = 3;
-static const int sdSiTID          = 4;
-static const int sdSiTOB          = 5;
-static const int sdSiTEC          = 6;
-
-static const int dMuon            = 2;
-static const int sdMuonDT         = 1;
-static const int sdMuonCSC        = 2;
-static const int sdMuonRPC        = 3;
-static const int sdMuonRPCRgnBrl  = 0;
+static const int dTrk = 1;
+static const int sdPxlBrl = 1;
+static const int sdPxlFwd = 2;
+static const int sdSiTIB = 3;
+static const int sdSiTID = 4;
+static const int sdSiTOB = 5;
+static const int sdSiTEC = 6;
+
+static const int dMuon = 2;
+static const int sdMuonDT = 1;
+static const int sdMuonCSC = 2;
+static const int sdMuonRPC = 3;
+static const int sdMuonRPCRgnBrl = 0;
 static const int sdMuonRPCRgnFwdp = 1;
 static const int sdMuonRPCRgnFwdn = -1;
 
-static const int dEcal            = 3;
-static const int sdEcalBrl        = 1;
-static const int sdEcalFwd        = 2;
-static const int sdEcalPS         = 3;
-static const int sdEcalTT         = 4;
-static const int sdEcalLPnD       = 5;
-
-static const int dHcal            = 4;
-static const int sdHcalEmpty      = 0;
-static const int sdHcalBrl        = 1;
-static const int sdHcalEC         = 2;
-static const int sdHcalOut        = 3;
-static const int sdHcalFwd        = 4;
-static const int sdHcalTT         = 5;
-static const int sdHcalCalib      = 6;
-static const int sdHcalCompst     = 7;
+static const int dEcal = 3;
+static const int sdEcalBrl = 1;
+static const int sdEcalFwd = 2;
+static const int sdEcalPS = 3;
+static const int sdEcalTT = 4;
+static const int sdEcalLPnD = 5;
+
+static const int dHcal = 4;
+static const int sdHcalEmpty = 0;
+static const int sdHcalBrl = 1;
+static const int sdHcalEC = 2;
+static const int sdHcalOut = 3;
+static const int sdHcalFwd = 4;
+static const int sdHcalTT = 5;
+static const int sdHcalCalib = 6;
+static const int sdHcalCompst = 7;
 
 #endif
diff --git a/Validation/GlobalHits/interface/GlobalHitsHistogrammer.h b/Validation/GlobalHits/interface/GlobalHitsHistogrammer.h
index 6e436e7e2ecb1..017caac2a11aa 100644
--- a/Validation/GlobalHits/interface/GlobalHitsHistogrammer.h
+++ b/Validation/GlobalHits/interface/GlobalHitsHistogrammer.h
@@ -2,26 +2,26 @@
 #define GlobalHitsHistogrammer_h
 
 /** \class GlobalHitsHistogrammer
- *  
+ *
  *  Class to fill dqm monitor elements from existing EDM file
  *
  *  \author M. Strang SUNY-Buffalo
  */
 
 // framework & common header files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "DataFormats/Provenance/interface/Provenance.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 //#include "Geometry/CommonDetUnit/interface/GeomDet.h"
 //#include "DataFormats/DetId/interface/DetId.h"
 
-//DQM services
+// DQM services
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
@@ -59,32 +59,28 @@
 
 // helper files
 //#include <CLHEP/Vector/LorentzVector.h>
-#include "DataFormats/Math/interface/LorentzVector.h"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 
-#include <iostream>
 #include <cstdlib>
-#include <string>
+#include <iostream>
 #include <memory>
+#include <string>
 #include <vector>
 
-#include "TString.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "TString.h"
 
 class GlobalHitsHistogrammer : public DQMEDAnalyzer {
+public:
+  // typedef std::vector<float> FloatVector;
 
- public:
-
-  //typedef std::vector<float> FloatVector;
-
-  explicit GlobalHitsHistogrammer(const edm::ParameterSet&);
+  explicit GlobalHitsHistogrammer(const edm::ParameterSet &);
   ~GlobalHitsHistogrammer() override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void bookHistograms(DQMStore::IBooker &,
-      edm::Run const &, edm::EventSetup const &) override;
-
- private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
+private:
   //  parameter information
   std::string fName;
   int verbosity;
@@ -104,11 +100,11 @@ class GlobalHitsHistogrammer : public DQMEDAnalyzer {
   MonitorElement *meMCRGP[2];
   MonitorElement *meMCG4Vtx[2];
   MonitorElement *meGeantVtxX[2];
-  MonitorElement *meGeantVtxY[2];  
-  MonitorElement *meGeantVtxZ[2];  
+  MonitorElement *meGeantVtxY[2];
+  MonitorElement *meGeantVtxZ[2];
   MonitorElement *meMCG4Trk[2];
   MonitorElement *meGeantTrkPt;
-  MonitorElement *meGeantTrkE; 
+  MonitorElement *meGeantTrkE;
 
   // Electromagnetic info
   // ECal info
@@ -116,7 +112,7 @@ class GlobalHitsHistogrammer : public DQMEDAnalyzer {
   MonitorElement *meCaloEcalE[2];
   MonitorElement *meCaloEcalToF[2];
   MonitorElement *meCaloEcalPhi;
-  MonitorElement *meCaloEcalEta;  
+  MonitorElement *meCaloEcalEta;
 
   // Preshower info
   MonitorElement *meCaloPreSh[2];
@@ -131,7 +127,7 @@ class GlobalHitsHistogrammer : public DQMEDAnalyzer {
   MonitorElement *meCaloHcalE[2];
   MonitorElement *meCaloHcalToF[2];
   MonitorElement *meCaloHcalPhi;
-  MonitorElement *meCaloHcalEta;  
+  MonitorElement *meCaloHcalEta;
 
   // Tracker info
   // Pixel info
@@ -185,8 +181,6 @@ class GlobalHitsHistogrammer : public DQMEDAnalyzer {
   // private statistics information
   unsigned int count;
 
-}; // end class declaration
-  
-#endif
-
+};  // end class declaration
 
+#endif
diff --git a/Validation/GlobalHits/interface/GlobalHitsProdHist.h b/Validation/GlobalHits/interface/GlobalHitsProdHist.h
index 3ef89fb0acfdc..de33e27b8ed1d 100644
--- a/Validation/GlobalHits/interface/GlobalHitsProdHist.h
+++ b/Validation/GlobalHits/interface/GlobalHitsProdHist.h
@@ -2,100 +2,95 @@
 #define GlobalHitsProdHist_h
 
 /** \class GlobalHitsProdHist
- *  
+ *
  *  Class to fill dqm monitor elements from existing EDM file
  *
  *  \author M. Strang SUNY-Buffalo
  */
 
 // framework & common header files
-#include "FWCore/Framework/interface/one/EDProducer.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/Run.h"
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/Provenance/interface/Provenance.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/Run.h"
+#include "FWCore/Framework/interface/one/EDProducer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "DataFormats/DetId/interface/DetId.h"
 
-//DQM services
+// DQM services
 //#include "DQMServices/Core/interface/DQMStore.h"
 //#include "FWCore/ServiceRegistry/interface/Service.h"
 
 // tracker info
+#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
-#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 
 // muon info
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
+#include "DataFormats/MuonDetId/interface/DTWireId.h"
+#include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
+#include "DataFormats/MuonDetId/interface/RPCDetId.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
 #include "Geometry/RPCGeometry/interface/RPCGeometry.h"
-#include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
-#include "DataFormats/MuonDetId/interface/RPCDetId.h"
-#include "DataFormats/MuonDetId/interface/DTWireId.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 // calorimeter info
-#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
-#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 #include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
+#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
+#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
+#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 
 // data in edm::event
+#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
-#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
+#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
 // helper files
 //#include <CLHEP/Vector/LorentzVector.h>
-#include "DataFormats/Math/interface/LorentzVector.h"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 
-#include <iostream>
 #include <cstdlib>
-#include <string>
+#include <iostream>
 #include <memory>
+#include <string>
 #include <vector>
 
-#include "TString.h"
 #include "TH1F.h"
+#include "TString.h"
 
-class GlobalHitsProdHist : public edm::one::EDProducer<edm::EndRunProducer>
-{
-  
- public:
-
-  //typedef std::vector<float> FloatVector;
+class GlobalHitsProdHist : public edm::one::EDProducer<edm::EndRunProducer> {
+public:
+  // typedef std::vector<float> FloatVector;
 
-  explicit GlobalHitsProdHist(const edm::ParameterSet&);
+  explicit GlobalHitsProdHist(const edm::ParameterSet &);
   ~GlobalHitsProdHist() override;
   void beginJob() override;
-  void endJob() override;  
-  void produce(edm::Event&, const edm::EventSetup&) override;
-  void endRunProduce(edm::Run&, const edm::EventSetup&) override;
-  
- private:
+  void endJob() override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
+  void endRunProduce(edm::Run &, const edm::EventSetup &) override;
 
+private:
   // production related methods
-  void fillG4MC(edm::Event&);
-  void fillTrk(edm::Event&, const edm::EventSetup&);
-  void fillMuon(edm::Event&, const edm::EventSetup&);
-  void fillECal(edm::Event&, const edm::EventSetup&);
-  void fillHCal(edm::Event&, const edm::EventSetup&);
-
- private:
+  void fillG4MC(edm::Event &);
+  void fillTrk(edm::Event &, const edm::EventSetup &);
+  void fillMuon(edm::Event &, const edm::EventSetup &);
+  void fillECal(edm::Event &, const edm::EventSetup &);
+  void fillHCal(edm::Event &, const edm::EventSetup &);
 
+private:
   //  parameter information
   std::string fName;
   int verbosity;
@@ -104,22 +99,22 @@ class GlobalHitsProdHist : public edm::one::EDProducer<edm::EndRunProducer>
   bool getAllProvenances;
   bool printProvenanceInfo;
 
-  //DQMStore *dbe;
-  //std::string outputfile;
+  // DQMStore *dbe;
+  // std::string outputfile;
 
   std::vector<std::string> histName_;
-  std::map<std::string, TH1F*> histMap_;
+  std::map<std::string, TH1F *> histMap_;
 
   // G4MC info
   TH1F *hMCRGP[2];
   TH1F *hMCG4Vtx[2];
   TH1F *hGeantVtxX[2];
-  TH1F *hGeantVtxY[2];  
-  TH1F *hGeantVtxZ[2];  
+  TH1F *hGeantVtxY[2];
+  TH1F *hGeantVtxZ[2];
   TH1F *hMCG4Trk[2];
   TH1F *hGeantTrkPt;
   TH1F *hGeantTrkE;
-  int nRawGenPart;  
+  int nRawGenPart;
 
   edm::InputTag G4VtxSrc_;
   edm::InputTag G4TrkSrc_;
@@ -132,7 +127,7 @@ class GlobalHitsProdHist : public edm::one::EDProducer<edm::EndRunProducer>
   TH1F *hCaloEcalE[2];
   TH1F *hCaloEcalToF[2];
   TH1F *hCaloEcalPhi;
-  TH1F *hCaloEcalEta;  
+  TH1F *hCaloEcalEta;
   edm::InputTag ECalEBSrc_;
   edm::InputTag ECalEESrc_;
   edm::EDGetTokenT<edm::PCaloHitContainer> ECalEBSrc_Token_;
@@ -153,9 +148,9 @@ class GlobalHitsProdHist : public edm::one::EDProducer<edm::EndRunProducer>
   TH1F *hCaloHcalE[2];
   TH1F *hCaloHcalToF[2];
   TH1F *hCaloHcalPhi;
-  TH1F *hCaloHcalEta;  
+  TH1F *hCaloHcalEta;
   edm::InputTag HCalSrc_;
-  edm::EDGetTokenT<edm::PCaloHitContainer>  HCalSrc_Token_;
+  edm::EDGetTokenT<edm::PCaloHitContainer> HCalSrc_Token_;
 
   // Tracker info
   // Pixel info
@@ -229,44 +224,44 @@ class GlobalHitsProdHist : public edm::one::EDProducer<edm::EndRunProducer>
   // private statistics information
   unsigned int count;
 
-}; // end class declaration
-  
+};  // end class declaration
+
 #endif
 
 #ifndef GlobalHitMap
 #define GlobalHitMap
 // geometry mapping
-static const int dTrk             = 1;
-static const int sdPxlBrl         = 1;
-static const int sdPxlFwd         = 2;
-static const int sdSiTIB          = 3;
-static const int sdSiTID          = 4;
-static const int sdSiTOB          = 5;
-static const int sdSiTEC          = 6;
-
-static const int dMuon            = 2;
-static const int sdMuonDT         = 1;
-static const int sdMuonCSC        = 2;
-static const int sdMuonRPC        = 3;
-static const int sdMuonRPCRgnBrl  = 0;
+static const int dTrk = 1;
+static const int sdPxlBrl = 1;
+static const int sdPxlFwd = 2;
+static const int sdSiTIB = 3;
+static const int sdSiTID = 4;
+static const int sdSiTOB = 5;
+static const int sdSiTEC = 6;
+
+static const int dMuon = 2;
+static const int sdMuonDT = 1;
+static const int sdMuonCSC = 2;
+static const int sdMuonRPC = 3;
+static const int sdMuonRPCRgnBrl = 0;
 static const int sdMuonRPCRgnFwdp = 1;
 static const int sdMuonRPCRgnFwdn = -1;
 
-static const int dEcal            = 3;
-static const int sdEcalBrl        = 1;
-static const int sdEcalFwd        = 2;
-static const int sdEcalPS         = 3;
-static const int sdEcalTT         = 4;
-static const int sdEcalLPnD       = 5;
-
-static const int dHcal            = 4;
-static const int sdHcalEmpty      = 0;
-static const int sdHcalBrl        = 1;
-static const int sdHcalEC         = 2;
-static const int sdHcalOut        = 3;
-static const int sdHcalFwd        = 4;
-static const int sdHcalTT         = 5;
-static const int sdHcalCalib      = 6;
-static const int sdHcalCompst     = 7;
+static const int dEcal = 3;
+static const int sdEcalBrl = 1;
+static const int sdEcalFwd = 2;
+static const int sdEcalPS = 3;
+static const int sdEcalTT = 4;
+static const int sdEcalLPnD = 5;
+
+static const int dHcal = 4;
+static const int sdHcalEmpty = 0;
+static const int sdHcalBrl = 1;
+static const int sdHcalEC = 2;
+static const int sdHcalOut = 3;
+static const int sdHcalFwd = 4;
+static const int sdHcalTT = 5;
+static const int sdHcalCalib = 6;
+static const int sdHcalCompst = 7;
 
 #endif
diff --git a/Validation/GlobalHits/interface/GlobalHitsProdHistStripper.h b/Validation/GlobalHits/interface/GlobalHitsProdHistStripper.h
index e322062548247..6d57aee4ab772 100644
--- a/Validation/GlobalHits/interface/GlobalHitsProdHistStripper.h
+++ b/Validation/GlobalHits/interface/GlobalHitsProdHistStripper.h
@@ -2,60 +2,56 @@
 #define GlobalHitsProdHistStripper_h
 
 /** \class GlobalHitsProdHistStripper
- *  
+ *
  *  Class to fill dqm monitor elements from existing EDM file
  *
  *  \author M. Strang SUNY-Buffalo
  */
 
 // framework & common header files
+#include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/Provenance/interface/Provenance.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "DataFormats/Provenance/interface/Provenance.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-//DQM services
+// DQM services
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 // helper files
 //#include <CLHEP/Vector/LorentzVector.h>
-#include "DataFormats/Math/interface/LorentzVector.h"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 
-#include <iostream>
 #include <cstdlib>
-#include <string>
+#include <iostream>
 #include <memory>
+#include <string>
 #include <vector>
 
-#include "TString.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "TString.h"
 
-class GlobalHitsProdHistStripper : public edm::EDAnalyzer
-{
-  
- public:
-
-  //typedef std::vector<float> FloatVector;
+class GlobalHitsProdHistStripper : public edm::EDAnalyzer {
+public:
+  // typedef std::vector<float> FloatVector;
 
-  explicit GlobalHitsProdHistStripper(const edm::ParameterSet&);
+  explicit GlobalHitsProdHistStripper(const edm::ParameterSet &);
   ~GlobalHitsProdHistStripper() override;
-  void beginJob( void ) override;
-  void endJob() override;  
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void beginRun(const edm::Run&, const edm::EventSetup&) override;
-  void endRun(const edm::Run&, const edm::EventSetup&) override;
-  
- private:
+  void beginJob(void) override;
+  void endJob() override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void beginRun(const edm::Run &, const edm::EventSetup &) override;
+  void endRun(const edm::Run &, const edm::EventSetup &) override;
 
+private:
   //  parameter information
   std::string fName;
   int verbosity;
@@ -64,24 +60,23 @@ class GlobalHitsProdHistStripper : public edm::EDAnalyzer
   bool getAllProvenances;
   bool printProvenanceInfo;
 
-
   DQMStore *dbe;
   std::string outputfile;
   bool doOutput;
 
-  std::map<std::string,MonitorElement*> monitorElements;
+  std::map<std::string, MonitorElement *> monitorElements;
 
-  std::vector<MonitorElement*> me;
+  std::vector<MonitorElement *> me;
 
   // G4MC info
   MonitorElement *meMCRGP[2];
   MonitorElement *meMCG4Vtx[2];
   MonitorElement *meGeantVtxX[2];
-  MonitorElement *meGeantVtxY[2];  
-  MonitorElement *meGeantVtxZ[2];  
+  MonitorElement *meGeantVtxY[2];
+  MonitorElement *meGeantVtxZ[2];
   MonitorElement *meMCG4Trk[2];
   MonitorElement *meGeantTrkPt;
-  MonitorElement *meGeantTrkE; 
+  MonitorElement *meGeantTrkE;
 
   // Electromagnetic info
   // ECal info
@@ -89,7 +84,7 @@ class GlobalHitsProdHistStripper : public edm::EDAnalyzer
   MonitorElement *meCaloEcalE[2];
   MonitorElement *meCaloEcalToF[2];
   MonitorElement *meCaloEcalPhi;
-  MonitorElement *meCaloEcalEta;  
+  MonitorElement *meCaloEcalEta;
 
   // Preshower info
   MonitorElement *meCaloPreSh[2];
@@ -104,13 +99,13 @@ class GlobalHitsProdHistStripper : public edm::EDAnalyzer
   MonitorElement *meCaloHcalE[2];
   MonitorElement *meCaloHcalToF[2];
   MonitorElement *meCaloHcalPhi;
-  MonitorElement *meCaloHcalEta;  
+  MonitorElement *meCaloHcalEta;
 
   // Tracker info
   // Pixel info
-  //int nPxlBrlHits;
-  //int nPxlFwdHits;
-  //int nPxlHits;
+  // int nPxlBrlHits;
+  // int nPxlFwdHits;
+  // int nPxlHits;
   MonitorElement *meTrackerPx[2];
   MonitorElement *meTrackerPxPhi;
   MonitorElement *meTrackerPxEta;
@@ -120,9 +115,9 @@ class GlobalHitsProdHistStripper : public edm::EDAnalyzer
   MonitorElement *meTrackerPxFZ;
 
   // Strip info
-  //int nSiHits;
-  //int nSiBrlHits;
-  //int nSiFwdHits;
+  // int nSiHits;
+  // int nSiBrlHits;
+  // int nSiFwdHits;
   MonitorElement *meTrackerSi[2];
   MonitorElement *meTrackerSiPhi;
   MonitorElement *meTrackerSiEta;
@@ -135,21 +130,21 @@ class GlobalHitsProdHistStripper : public edm::EDAnalyzer
   MonitorElement *meMuon[2];
   MonitorElement *meMuonPhi;
   MonitorElement *meMuonEta;
-  //int nMuonHits;
+  // int nMuonHits;
 
   // DT info
-  //int nMuonDtHits;
+  // int nMuonDtHits;
   MonitorElement *meMuonDtToF[2];
   MonitorElement *meMuonDtR;
 
   // CSC info
-  //int nMuonCscHits;
+  // int nMuonCscHits;
   MonitorElement *meMuonCscToF[2];
   MonitorElement *meMuonCscZ;
 
   // RPC info
-  //int nMuonRpcBrlHits;
-  //int nMuonRpcFwdHits;
+  // int nMuonRpcBrlHits;
+  // int nMuonRpcFwdHits;
   MonitorElement *meMuonRpcFToF[2];
   MonitorElement *meMuonRpcFZ;
   MonitorElement *meMuonRpcBToF[2];
@@ -158,8 +153,6 @@ class GlobalHitsProdHistStripper : public edm::EDAnalyzer
   // private statistics information
   unsigned int count;
 
-}; // end class declaration
-  
-#endif
-
+};  // end class declaration
 
+#endif
diff --git a/Validation/GlobalHits/interface/GlobalHitsProducer.h b/Validation/GlobalHits/interface/GlobalHitsProducer.h
index 61a8d974294c5..32f1f89daf379 100644
--- a/Validation/GlobalHits/interface/GlobalHitsProducer.h
+++ b/Validation/GlobalHits/interface/GlobalHitsProducer.h
@@ -2,110 +2,105 @@
 #define GlobalHitsProducer_h
 
 /** \class GlobalHitsProducer
- *  
- *  Class to fill PGlobalSimHit object to be inserted into data stream 
- *  containing information about various sub-systems in global coordinates 
+ *
+ *  Class to fill PGlobalSimHit object to be inserted into data stream
+ *  containing information about various sub-systems in global coordinates
  *  with full geometry
  *
  *  \author M. Strang SUNY-Buffalo
  */
 
 // framework & common header files
+#include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/DetId/interface/DetId.h"
+#include "DataFormats/Provenance/interface/Provenance.h"
 #include "FWCore/Framework/interface/EDProducer.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "DataFormats/Provenance/interface/Provenance.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "DataFormats/DetId/interface/DetId.h"
 
 // tracker info
+#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
-#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 
 // muon info
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
+#include "DataFormats/MuonDetId/interface/DTWireId.h"
+#include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
+#include "DataFormats/MuonDetId/interface/RPCDetId.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
 #include "Geometry/RPCGeometry/interface/RPCGeometry.h"
-#include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
-#include "DataFormats/MuonDetId/interface/RPCDetId.h"
-#include "DataFormats/MuonDetId/interface/DTWireId.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 // calorimeter info
-#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
-#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 #include "DataFormats/EcalDetId/interface/EcalSubdetector.h"
 #include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
+#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
+#include "Geometry/CaloGeometry/interface/CaloGeometry.h"
+#include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 
 // data in edm::event
-#include "SimDataFormats/ValidationFormats/interface/PValidationFormats.h"
+#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
-#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
+#include "SimDataFormats/ValidationFormats/interface/PValidationFormats.h"
+#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 //#include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
 //#include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 
 // helper files
 //#include <CLHEP/Vector/LorentzVector.h>
-#include "DataFormats/Math/interface/LorentzVector.h"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 
-#include <iostream>
 #include <cstdlib>
-#include <string>
+#include <iostream>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "TString.h"
 
 class PGlobalSimHit;
-  
-class GlobalHitsProducer : public edm::EDProducer
-{
-  
- public:
 
+class GlobalHitsProducer : public edm::EDProducer {
+public:
   typedef std::vector<float> FloatVector;
 
-  explicit GlobalHitsProducer(const edm::ParameterSet&);
+  explicit GlobalHitsProducer(const edm::ParameterSet &);
   ~GlobalHitsProducer() override;
-  void beginJob( void ) override;
-  void endJob() override;  
-  void produce(edm::Event&, const edm::EventSetup&) override;
-  
- private:
+  void beginJob(void) override;
+  void endJob() override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
-  //GlobalValidation(const GlobalValidation&);   
-  //const GlobalValidation& operator=(const GlobalValidation&);
+private:
+  // GlobalValidation(const GlobalValidation&);
+  // const GlobalValidation& operator=(const GlobalValidation&);
 
   // production related methods
-  void fillG4MC(edm::Event&);
-  void storeG4MC(PGlobalSimHit&);
-  void fillTrk(edm::Event&, const edm::EventSetup&);
-  void storeTrk(PGlobalSimHit&);
-  void fillMuon(edm::Event&, const edm::EventSetup&);
-  void storeMuon(PGlobalSimHit&);
-  void fillECal(edm::Event&, const edm::EventSetup&);
-  void storeECal(PGlobalSimHit&);
-  void fillHCal(edm::Event&, const edm::EventSetup&);
-  void storeHCal(PGlobalSimHit&);
+  void fillG4MC(edm::Event &);
+  void storeG4MC(PGlobalSimHit &);
+  void fillTrk(edm::Event &, const edm::EventSetup &);
+  void storeTrk(PGlobalSimHit &);
+  void fillMuon(edm::Event &, const edm::EventSetup &);
+  void storeMuon(PGlobalSimHit &);
+  void fillECal(edm::Event &, const edm::EventSetup &);
+  void storeECal(PGlobalSimHit &);
+  void fillHCal(edm::Event &, const edm::EventSetup &);
+  void storeHCal(PGlobalSimHit &);
 
   void clear();
 
- private:
-
+private:
   //  parameter information
   std::string fName;
   int verbosity;
@@ -117,10 +112,10 @@ class GlobalHitsProducer : public edm::EDProducer
 
   // G4MC info
   int nRawGenPart;
-  FloatVector G4VtxX; 
-  FloatVector G4VtxY; 
-  FloatVector G4VtxZ; 
-  FloatVector G4TrkPt; 
+  FloatVector G4VtxX;
+  FloatVector G4VtxY;
+  FloatVector G4VtxZ;
+  FloatVector G4TrkPt;
   FloatVector G4TrkE;
 
   edm::InputTag G4VtxSrc_;
@@ -130,9 +125,9 @@ class GlobalHitsProducer : public edm::EDProducer
 
   // Electromagnetic info
   // ECal info
-  FloatVector ECalE; 
-  FloatVector ECalToF; 
-  FloatVector ECalPhi; 
+  FloatVector ECalE;
+  FloatVector ECalToF;
+  FloatVector ECalPhi;
   FloatVector ECalEta;
   edm::InputTag ECalEBSrc_;
   edm::InputTag ECalEESrc_;
@@ -140,31 +135,31 @@ class GlobalHitsProducer : public edm::EDProducer
   edm::EDGetTokenT<edm::PCaloHitContainer> ECalEESrc_Token_;
 
   // Preshower info
-  FloatVector PreShE; 
-  FloatVector PreShToF; 
-  FloatVector PreShPhi; 
+  FloatVector PreShE;
+  FloatVector PreShToF;
+  FloatVector PreShPhi;
   FloatVector PreShEta;
   edm::InputTag ECalESSrc_;
   edm::EDGetTokenT<edm::PCaloHitContainer> ECalESSrc_Token_;
 
   // Hadronic info
   // HCal info
-  FloatVector HCalE; 
-  FloatVector HCalToF; 
-  FloatVector HCalPhi; 
+  FloatVector HCalE;
+  FloatVector HCalToF;
+  FloatVector HCalPhi;
   FloatVector HCalEta;
   edm::InputTag HCalSrc_;
-  edm::EDGetTokenT<edm::PCaloHitContainer>  HCalSrc_Token_;
+  edm::EDGetTokenT<edm::PCaloHitContainer> HCalSrc_Token_;
 
   // Tracker info
   // Pixel info
-  FloatVector PxlBrlToF; 
-  FloatVector PxlBrlR; 
-  FloatVector PxlBrlPhi; 
-  FloatVector PxlBrlEta; 
-  FloatVector PxlFwdToF; 
+  FloatVector PxlBrlToF;
+  FloatVector PxlBrlR;
+  FloatVector PxlBrlPhi;
+  FloatVector PxlBrlEta;
+  FloatVector PxlFwdToF;
   FloatVector PxlFwdZ;
-  FloatVector PxlFwdPhi; 
+  FloatVector PxlFwdPhi;
   FloatVector PxlFwdEta;
   edm::InputTag PxlBrlLowSrc_;
   edm::InputTag PxlBrlHighSrc_;
@@ -176,13 +171,13 @@ class GlobalHitsProducer : public edm::EDProducer
   edm::EDGetTokenT<edm::PSimHitContainer> PxlFwdHighSrc_Token_;
 
   // Strip info
-  FloatVector SiBrlToF; 
-  FloatVector SiBrlR; 
-  FloatVector SiBrlPhi; 
-  FloatVector SiBrlEta;  
-  FloatVector SiFwdToF; 
+  FloatVector SiBrlToF;
+  FloatVector SiBrlR;
+  FloatVector SiBrlPhi;
+  FloatVector SiBrlEta;
+  FloatVector SiFwdToF;
   FloatVector SiFwdZ;
-  FloatVector SiFwdPhi; 
+  FloatVector SiFwdPhi;
   FloatVector SiFwdEta;
   edm::InputTag SiTIBLowSrc_;
   edm::InputTag SiTIBHighSrc_;
@@ -203,25 +198,25 @@ class GlobalHitsProducer : public edm::EDProducer
 
   // Muon info
   // DT info
-  FloatVector MuonDtToF; 
+  FloatVector MuonDtToF;
   FloatVector MuonDtR;
   FloatVector MuonDtPhi;
   FloatVector MuonDtEta;
   edm::InputTag MuonDtSrc_;
   edm::EDGetTokenT<edm::PSimHitContainer> MuonDtSrc_Token_;
   // CSC info
-  FloatVector MuonCscToF; 
+  FloatVector MuonCscToF;
   FloatVector MuonCscZ;
   FloatVector MuonCscPhi;
   FloatVector MuonCscEta;
   edm::InputTag MuonCscSrc_;
   edm::EDGetTokenT<edm::PSimHitContainer> MuonCscSrc_Token_;
   // RPC info
-  FloatVector MuonRpcBrlToF; 
+  FloatVector MuonRpcBrlToF;
   FloatVector MuonRpcBrlR;
   FloatVector MuonRpcBrlPhi;
   FloatVector MuonRpcBrlEta;
-  FloatVector MuonRpcFwdToF; 
+  FloatVector MuonRpcFwdToF;
   FloatVector MuonRpcFwdZ;
   FloatVector MuonRpcFwdPhi;
   FloatVector MuonRpcFwdEta;
@@ -231,44 +226,44 @@ class GlobalHitsProducer : public edm::EDProducer
   // private statistics information
   unsigned int count;
 
-}; // end class declaration
- 
+};  // end class declaration
+
 #endif
- 
+
 #ifndef GlobalHitMap
 #define GlobalHitMap
 // geometry mapping
-static const int dTrk             = 1;
-static const int sdPxlBrl         = 1;
-static const int sdPxlFwd         = 2;
-static const int sdSiTIB          = 3;
-static const int sdSiTID          = 4;
-static const int sdSiTOB          = 5;
-static const int sdSiTEC          = 6;
-
-static const int dMuon            = 2;
-static const int sdMuonDT         = 1;
-static const int sdMuonCSC        = 2;
-static const int sdMuonRPC        = 3;
-static const int sdMuonRPCRgnBrl  = 0;
+static const int dTrk = 1;
+static const int sdPxlBrl = 1;
+static const int sdPxlFwd = 2;
+static const int sdSiTIB = 3;
+static const int sdSiTID = 4;
+static const int sdSiTOB = 5;
+static const int sdSiTEC = 6;
+
+static const int dMuon = 2;
+static const int sdMuonDT = 1;
+static const int sdMuonCSC = 2;
+static const int sdMuonRPC = 3;
+static const int sdMuonRPCRgnBrl = 0;
 static const int sdMuonRPCRgnFwdp = 1;
 static const int sdMuonRPCRgnFwdn = -1;
 
-static const int dEcal            = 3;
-static const int sdEcalBrl        = 1;
-static const int sdEcalFwd        = 2;
-static const int sdEcalPS         = 3;
-static const int sdEcalTT         = 4;
-static const int sdEcalLPnD       = 5;
-
-static const int dHcal            = 4;
-static const int sdHcalEmpty      = 0;
-static const int sdHcalBrl        = 1;
-static const int sdHcalEC         = 2;
-static const int sdHcalOut        = 3;
-static const int sdHcalFwd        = 4;
-static const int sdHcalTT         = 5;
-static const int sdHcalCalib      = 6;
-static const int sdHcalCompst     = 7;
+static const int dEcal = 3;
+static const int sdEcalBrl = 1;
+static const int sdEcalFwd = 2;
+static const int sdEcalPS = 3;
+static const int sdEcalTT = 4;
+static const int sdEcalLPnD = 5;
+
+static const int dHcal = 4;
+static const int sdHcalEmpty = 0;
+static const int sdHcalBrl = 1;
+static const int sdHcalEC = 2;
+static const int sdHcalOut = 3;
+static const int sdHcalFwd = 4;
+static const int sdHcalTT = 5;
+static const int sdHcalCalib = 6;
+static const int sdHcalCompst = 7;
 
 #endif
diff --git a/Validation/GlobalHits/interface/GlobalHitsTester.h b/Validation/GlobalHits/interface/GlobalHitsTester.h
index afe1c66c79c3c..9035c7882e663 100644
--- a/Validation/GlobalHits/interface/GlobalHitsTester.h
+++ b/Validation/GlobalHits/interface/GlobalHitsTester.h
@@ -2,33 +2,33 @@
 #define GlobalHitsTester_h
 
 /** \class GlobalHitsAnalyzer
- *  
+ *
  *  Class to fill dqm monitor elements from existing EDM file
  *
  *  \author M. Strang SUNY-Buffalo
  */
 
 // framework & common header files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/Run.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "DataFormats/Provenance/interface/Provenance.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 //#include "Geometry/CommonDetUnit/interface/GeomDet.h"
 //#include "DataFormats/DetId/interface/DetId.h"
 #include "TRandom.h"
 #include "TRandom3.h"
 
-//DQM services
+// DQM services
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 // tracker info
 //#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
@@ -65,25 +65,21 @@
 //#include "DataFormats/Math/interface/LorentzVector.h"
 //#include "CLHEP/Units/GlobalSystemOfUnits.h"
 
-#include <iostream>
 #include <cstdlib>
-#include <string>
+#include <iostream>
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "TString.h"
 
-class GlobalHitsTester : public DQMEDAnalyzer
-{
-  
- public:
-
-  explicit GlobalHitsTester(const edm::ParameterSet&);
+class GlobalHitsTester : public DQMEDAnalyzer {
+public:
+  explicit GlobalHitsTester(const edm::ParameterSet &);
   ~GlobalHitsTester() override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void bookHistograms(DQMStore::IBooker &,
-    edm::Run const &, edm::EventSetup const &) override;
-  
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+
 private:
   std::string fName;
   int verbosity;
@@ -110,7 +106,7 @@ class GlobalHitsTester : public DQMEDAnalyzer
   double RandomVal2;
   double RandomVal3;
 
- // private statistics information
+  // private statistics information
   unsigned int count;
 };
 
diff --git a/Validation/GlobalHits/src/GlobalHitsAnalyzer.cc b/Validation/GlobalHits/src/GlobalHitsAnalyzer.cc
index 58ccbdb019ab2..9e1061e24d0e2 100644
--- a/Validation/GlobalHits/src/GlobalHitsAnalyzer.cc
+++ b/Validation/GlobalHits/src/GlobalHitsAnalyzer.cc
@@ -1,27 +1,32 @@
 /** \file GlobalHitsAnalyzer.cc
- *  
+ *
  *  See header file for description of class
  *
  *  \author M. Strang SUNY-Buffalo
  */
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
 
-#include "Validation/GlobalHits/interface/GlobalHitsAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "Validation/GlobalHits/interface/GlobalHitsAnalyzer.h"
 
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
-#include "Geometry/Records/interface/HcalRecNumberingRecord.h"
 #include "Geometry/HcalCommonData/interface/HcalDDDRecConstants.h"
 #include "Geometry/HcalCommonData/interface/HcalHitRelabeller.h"
 #include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h"
+#include "Geometry/Records/interface/HcalRecNumberingRecord.h"
 
-GlobalHitsAnalyzer::GlobalHitsAnalyzer(const edm::ParameterSet& iPSet) :
-  fName(""), verbosity(0), frequency(0), vtxunit(0), label(""), 
-  getAllProvenances(false), printProvenanceInfo(false), testNumber(false),
-  G4VtxSrc_Token_( consumes<edm::SimVertexContainer>((iPSet.getParameter<edm::InputTag>("G4VtxSrc"))) ),
-  G4TrkSrc_Token_( consumes<edm::SimTrackContainer>(iPSet.getParameter<edm::InputTag>("G4TrkSrc")) ),
-  count(0)
-{
+GlobalHitsAnalyzer::GlobalHitsAnalyzer(const edm::ParameterSet &iPSet)
+    : fName(""),
+      verbosity(0),
+      frequency(0),
+      vtxunit(0),
+      label(""),
+      getAllProvenances(false),
+      printProvenanceInfo(false),
+      testNumber(false),
+      G4VtxSrc_Token_(consumes<edm::SimVertexContainer>((iPSet.getParameter<edm::InputTag>("G4VtxSrc")))),
+      G4TrkSrc_Token_(consumes<edm::SimTrackContainer>(iPSet.getParameter<edm::InputTag>("G4TrkSrc"))),
+      count(0) {
   consumesMany<edm::HepMCProduct>();
   std::string MsgLoggerCat = "GlobalHitsAnalyzer_GlobalHitsAnalyzer";
 
@@ -30,15 +35,12 @@ GlobalHitsAnalyzer::GlobalHitsAnalyzer(const edm::ParameterSet& iPSet) :
   verbosity = iPSet.getUntrackedParameter<int>("Verbosity");
   frequency = iPSet.getUntrackedParameter<int>("Frequency");
   vtxunit = iPSet.getUntrackedParameter<int>("VtxUnit");
-  edm::ParameterSet m_Prov =
-    iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup");
-  getAllProvenances = 
-    m_Prov.getUntrackedParameter<bool>("GetAllProvenances");
-  printProvenanceInfo = 
-    m_Prov.getUntrackedParameter<bool>("PrintProvenanceInfo");
+  edm::ParameterSet m_Prov = iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup");
+  getAllProvenances = m_Prov.getUntrackedParameter<bool>("GetAllProvenances");
+  printProvenanceInfo = m_Prov.getUntrackedParameter<bool>("PrintProvenanceInfo");
   testNumber = iPSet.getUntrackedParameter<bool>("testNumber");
 
-  //get Labels to use to extract information
+  // get Labels to use to extract information
   PxlBrlLowSrc_ = iPSet.getParameter<edm::InputTag>("PxlBrlLowSrc");
   PxlBrlHighSrc_ = iPSet.getParameter<edm::InputTag>("PxlBrlHighSrc");
   PxlFwdLowSrc_ = iPSet.getParameter<edm::InputTag>("PxlFwdLowSrc");
@@ -89,29 +91,27 @@ GlobalHitsAnalyzer::GlobalHitsAnalyzer(const edm::ParameterSet& iPSet) :
 
   // determine whether to process subdetector or not
   validHepMCevt = iPSet.getUntrackedParameter<bool>("validHepMCevt");
-  validG4VtxContainer = 
-    iPSet.getUntrackedParameter<bool>("validG4VtxContainer");
-  validG4trkContainer = 
-    iPSet.getUntrackedParameter<bool>("validG4trkContainer");
-  validPxlBrlLow = iPSet.getUntrackedParameter<bool>("validPxlBrlLow",true);
-  validPxlBrlHigh = iPSet.getUntrackedParameter<bool>("validPxlBrlHigh",true);
-  validPxlFwdLow = iPSet.getUntrackedParameter<bool>("validPxlFwdLow",true);
-  validPxlFwdHigh = iPSet.getUntrackedParameter<bool>("validPxlFwdHigh",true);
-  validSiTIBLow = iPSet.getUntrackedParameter<bool>("validSiTIBLow",true);
-  validSiTIBHigh = iPSet.getUntrackedParameter<bool>("validSiTIBHigh",true);
-  validSiTOBLow = iPSet.getUntrackedParameter<bool>("validSiTOBLow",true);
-  validSiTOBHigh = iPSet.getUntrackedParameter<bool>("validSiTOBHigh",true);
-  validSiTIDLow = iPSet.getUntrackedParameter<bool>("validSiTIDLow",true);
-  validSiTIDHigh = iPSet.getUntrackedParameter<bool>("validSiTIDHigh",true);
-  validSiTECLow = iPSet.getUntrackedParameter<bool>("validSiTECLow",true);
-  validSiTECHigh = iPSet.getUntrackedParameter<bool>("validSiTECHigh",true);
-  validMuonCSC = iPSet.getUntrackedParameter<bool>("validMuonCSC",true);
-  validMuonDt = iPSet.getUntrackedParameter<bool>("validMuonDt",true);
-  validMuonRPC = iPSet.getUntrackedParameter<bool>("validMuonRPC",true);
-  validEB = iPSet.getUntrackedParameter<bool>("validEB",true);
-  validEE = iPSet.getUntrackedParameter<bool>("validEE",true);
-  validPresh = iPSet.getUntrackedParameter<bool>("validPresh",true);
-  validHcal = iPSet.getUntrackedParameter<bool>("validHcal",true);  
+  validG4VtxContainer = iPSet.getUntrackedParameter<bool>("validG4VtxContainer");
+  validG4trkContainer = iPSet.getUntrackedParameter<bool>("validG4trkContainer");
+  validPxlBrlLow = iPSet.getUntrackedParameter<bool>("validPxlBrlLow", true);
+  validPxlBrlHigh = iPSet.getUntrackedParameter<bool>("validPxlBrlHigh", true);
+  validPxlFwdLow = iPSet.getUntrackedParameter<bool>("validPxlFwdLow", true);
+  validPxlFwdHigh = iPSet.getUntrackedParameter<bool>("validPxlFwdHigh", true);
+  validSiTIBLow = iPSet.getUntrackedParameter<bool>("validSiTIBLow", true);
+  validSiTIBHigh = iPSet.getUntrackedParameter<bool>("validSiTIBHigh", true);
+  validSiTOBLow = iPSet.getUntrackedParameter<bool>("validSiTOBLow", true);
+  validSiTOBHigh = iPSet.getUntrackedParameter<bool>("validSiTOBHigh", true);
+  validSiTIDLow = iPSet.getUntrackedParameter<bool>("validSiTIDLow", true);
+  validSiTIDHigh = iPSet.getUntrackedParameter<bool>("validSiTIDHigh", true);
+  validSiTECLow = iPSet.getUntrackedParameter<bool>("validSiTECLow", true);
+  validSiTECHigh = iPSet.getUntrackedParameter<bool>("validSiTECHigh", true);
+  validMuonCSC = iPSet.getUntrackedParameter<bool>("validMuonCSC", true);
+  validMuonDt = iPSet.getUntrackedParameter<bool>("validMuonDt", true);
+  validMuonRPC = iPSet.getUntrackedParameter<bool>("validMuonRPC", true);
+  validEB = iPSet.getUntrackedParameter<bool>("validEB", true);
+  validEE = iPSet.getUntrackedParameter<bool>("validEE", true);
+  validPresh = iPSet.getUntrackedParameter<bool>("validPresh", true);
+  validHcal = iPSet.getUntrackedParameter<bool>("validHcal", true);
 
   // use value of first digit to determine default output level (inclusive)
   // 0 is none, 1 is basic, 2 is fill output, 3 is gather output
@@ -119,157 +119,137 @@ GlobalHitsAnalyzer::GlobalHitsAnalyzer(const edm::ParameterSet& iPSet) :
 
   // print out Parameter Set information being used
   if (verbosity >= 0) {
-    edm::LogInfo(MsgLoggerCat) 
-      << "\n===============================\n"
-      << "Initialized as EDAnalyzer with parameter values:\n"
-      << "    Name                  = " << fName << "\n"
-      << "    Verbosity             = " << verbosity << "\n"
-      << "    Frequency             = " << frequency << "\n"
-      << "    VtxUnit               = " << vtxunit << "\n"
-      << "    GetProv               = " << getAllProvenances << "\n"
-      << "    PrintProv             = " << printProvenanceInfo << "\n"
-      << "    PxlBrlLowSrc          = " << PxlBrlLowSrc_.label() 
-      << ":" << PxlBrlLowSrc_.instance() << "\n"
-      << "    PxlBrlHighSrc         = " << PxlBrlHighSrc_.label() 
-      << ":" << PxlBrlHighSrc_.instance() << "\n"
-      << "    PxlFwdLowSrc          = " << PxlFwdLowSrc_.label() 
-      << ":" << PxlBrlLowSrc_.instance() << "\n"
-      << "    PxlFwdHighSrc         = " << PxlFwdHighSrc_.label() 
-      << ":" << PxlBrlHighSrc_.instance() << "\n"
-      << "    SiTIBLowSrc           = " << SiTIBLowSrc_.label() 
-      << ":" << SiTIBLowSrc_.instance() << "\n"
-      << "    SiTIBHighSrc          = " << SiTIBHighSrc_.label() 
-      << ":" << SiTIBHighSrc_.instance() << "\n"
-      << "    SiTOBLowSrc           = " << SiTOBLowSrc_.label() 
-      << ":" << SiTOBLowSrc_.instance() << "\n"
-      << "    SiTOBHighSrc          = " << SiTOBHighSrc_.label() 
-      << ":" << SiTOBHighSrc_.instance() << "\n"
-      << "    SiTIDLowSrc           = " << SiTIDLowSrc_.label() 
-      << ":" << SiTIDLowSrc_.instance() << "\n"
-      << "    SiTIDHighSrc          = " << SiTIDHighSrc_.label() 
-      << ":" << SiTIDHighSrc_.instance() << "\n"
-      << "    SiTECLowSrc           = " << SiTECLowSrc_.label() 
-      << ":" << SiTECLowSrc_.instance() << "\n"
-      << "    SiTECHighSrc          = " << SiTECHighSrc_.label() 
-      << ":" << SiTECHighSrc_.instance() << "\n"
-      << "    MuonCscSrc            = " << MuonCscSrc_.label() 
-      << ":" << MuonCscSrc_.instance() << "\n"
-      << "    MuonDtSrc             = " << MuonDtSrc_.label() 
-      << ":" << MuonDtSrc_.instance() << "\n"
-      << "    MuonRpcSrc            = " << MuonRpcSrc_.label() 
-      << ":" << MuonRpcSrc_.instance() << "\n"
-      << "    ECalEBSrc             = " << ECalEBSrc_.label() 
-      << ":" << ECalEBSrc_.instance() << "\n"
-      << "    ECalEESrc             = " << ECalEESrc_.label() 
-      << ":" << ECalEESrc_.instance() << "\n"
-      << "    ECalESSrc             = " << ECalESSrc_.label() 
-      << ":" << ECalESSrc_.instance() << "\n"
-      << "    HCalSrc               = " << HCalSrc_.label() 
-      << ":" << HCalSrc_.instance() << "\n"
-      << "\n"
-      << "    validHepMCevt         = "
-      << ":" <<  validHepMCevt << "\n"
-      << "    validG4VtxContainer   = "
-      << ":" <<  validG4VtxContainer << "\n"
-      << "    validG4trkContainer   = "
-      << ":" <<  validG4trkContainer << "\n"
-      << "    validPxlBrlLow        = "
-      << ":" <<  validPxlBrlLow << "\n"
-      << "    validPxlBrlHigh       = "
-      << ":" <<  validPxlBrlHigh << "\n"
-      << "    validPxlFwdLow        = "
-      << ":" <<  validPxlFwdLow << "\n"
-      << "    validPxlFwdHigh       = "
-      << ":" <<  validPxlFwdHigh << "\n"
-      << "    validSiTIBLow         = "
-      << ":" <<  validSiTIBLow << "\n"
-      << "    validSiTIBHigh        = "
-      << ":" <<  validSiTIBHigh << "\n"
-      << "    validSiTOBLow         = "
-      << ":" <<  validSiTOBLow << "\n"
-      << "    validSiTOBHigh        = "
-      << ":" <<  validSiTOBHigh << "\n"
-      << "    validSiTIDLow         = "
-      << ":" <<  validSiTIDLow << "\n"
-      << "    validSiTIDHigh        = "
-      << ":" <<  validSiTIDHigh << "\n"
-      << "    validSiTECLow         = "
-      << ":" <<  validSiTECLow << "\n"
-      << "    validSiTECHigh        = "
-      << ":" <<  validSiTECHigh << "\n"
-      << "    validMuonCSC          = "
-      << ":" <<  validMuonCSC << "\n"
-      << "    validMuonDt           = "
-      << ":" <<  validMuonDt << "\n"
-      << "    validMuonRPC          = "
-      << ":" <<  validMuonRPC << "\n"
-      << "    validEB               = "
-      << ":" <<  validEB << "\n"
-      << "    validEE               = "
-      << ":" <<  validEE << "\n"
-      << "    validPresh            = "
-      << ":" <<  validPresh << "\n"
-      << "    validHcal             = "
-      << ":" <<  validHcal << "\n"
-      << "===============================\n";
+    edm::LogInfo(MsgLoggerCat)
+        << "\n===============================\n"
+        << "Initialized as EDAnalyzer with parameter values:\n"
+        << "    Name                  = " << fName << "\n"
+        << "    Verbosity             = " << verbosity << "\n"
+        << "    Frequency             = " << frequency << "\n"
+        << "    VtxUnit               = " << vtxunit << "\n"
+        << "    GetProv               = " << getAllProvenances << "\n"
+        << "    PrintProv             = " << printProvenanceInfo << "\n"
+        << "    PxlBrlLowSrc          = " << PxlBrlLowSrc_.label() << ":" << PxlBrlLowSrc_.instance() << "\n"
+        << "    PxlBrlHighSrc         = " << PxlBrlHighSrc_.label() << ":" << PxlBrlHighSrc_.instance() << "\n"
+        << "    PxlFwdLowSrc          = " << PxlFwdLowSrc_.label() << ":" << PxlBrlLowSrc_.instance() << "\n"
+        << "    PxlFwdHighSrc         = " << PxlFwdHighSrc_.label() << ":" << PxlBrlHighSrc_.instance() << "\n"
+        << "    SiTIBLowSrc           = " << SiTIBLowSrc_.label() << ":" << SiTIBLowSrc_.instance() << "\n"
+        << "    SiTIBHighSrc          = " << SiTIBHighSrc_.label() << ":" << SiTIBHighSrc_.instance() << "\n"
+        << "    SiTOBLowSrc           = " << SiTOBLowSrc_.label() << ":" << SiTOBLowSrc_.instance() << "\n"
+        << "    SiTOBHighSrc          = " << SiTOBHighSrc_.label() << ":" << SiTOBHighSrc_.instance() << "\n"
+        << "    SiTIDLowSrc           = " << SiTIDLowSrc_.label() << ":" << SiTIDLowSrc_.instance() << "\n"
+        << "    SiTIDHighSrc          = " << SiTIDHighSrc_.label() << ":" << SiTIDHighSrc_.instance() << "\n"
+        << "    SiTECLowSrc           = " << SiTECLowSrc_.label() << ":" << SiTECLowSrc_.instance() << "\n"
+        << "    SiTECHighSrc          = " << SiTECHighSrc_.label() << ":" << SiTECHighSrc_.instance() << "\n"
+        << "    MuonCscSrc            = " << MuonCscSrc_.label() << ":" << MuonCscSrc_.instance() << "\n"
+        << "    MuonDtSrc             = " << MuonDtSrc_.label() << ":" << MuonDtSrc_.instance() << "\n"
+        << "    MuonRpcSrc            = " << MuonRpcSrc_.label() << ":" << MuonRpcSrc_.instance() << "\n"
+        << "    ECalEBSrc             = " << ECalEBSrc_.label() << ":" << ECalEBSrc_.instance() << "\n"
+        << "    ECalEESrc             = " << ECalEESrc_.label() << ":" << ECalEESrc_.instance() << "\n"
+        << "    ECalESSrc             = " << ECalESSrc_.label() << ":" << ECalESSrc_.instance() << "\n"
+        << "    HCalSrc               = " << HCalSrc_.label() << ":" << HCalSrc_.instance() << "\n"
+        << "\n"
+        << "    validHepMCevt         = "
+        << ":" << validHepMCevt << "\n"
+        << "    validG4VtxContainer   = "
+        << ":" << validG4VtxContainer << "\n"
+        << "    validG4trkContainer   = "
+        << ":" << validG4trkContainer << "\n"
+        << "    validPxlBrlLow        = "
+        << ":" << validPxlBrlLow << "\n"
+        << "    validPxlBrlHigh       = "
+        << ":" << validPxlBrlHigh << "\n"
+        << "    validPxlFwdLow        = "
+        << ":" << validPxlFwdLow << "\n"
+        << "    validPxlFwdHigh       = "
+        << ":" << validPxlFwdHigh << "\n"
+        << "    validSiTIBLow         = "
+        << ":" << validSiTIBLow << "\n"
+        << "    validSiTIBHigh        = "
+        << ":" << validSiTIBHigh << "\n"
+        << "    validSiTOBLow         = "
+        << ":" << validSiTOBLow << "\n"
+        << "    validSiTOBHigh        = "
+        << ":" << validSiTOBHigh << "\n"
+        << "    validSiTIDLow         = "
+        << ":" << validSiTIDLow << "\n"
+        << "    validSiTIDHigh        = "
+        << ":" << validSiTIDHigh << "\n"
+        << "    validSiTECLow         = "
+        << ":" << validSiTECLow << "\n"
+        << "    validSiTECHigh        = "
+        << ":" << validSiTECHigh << "\n"
+        << "    validMuonCSC          = "
+        << ":" << validMuonCSC << "\n"
+        << "    validMuonDt           = "
+        << ":" << validMuonDt << "\n"
+        << "    validMuonRPC          = "
+        << ":" << validMuonRPC << "\n"
+        << "    validEB               = "
+        << ":" << validEB << "\n"
+        << "    validEE               = "
+        << ":" << validEE << "\n"
+        << "    validPresh            = "
+        << ":" << validPresh << "\n"
+        << "    validHcal             = "
+        << ":" << validHcal << "\n"
+        << "===============================\n";
   }
 
   // initialize monitor elements
   for (Int_t i = 0; i < 2; ++i) {
-    meMCRGP[i]     = nullptr;
-    meMCG4Vtx[i]   = nullptr;
+    meMCRGP[i] = nullptr;
+    meMCG4Vtx[i] = nullptr;
     meGeantVtxX[i] = nullptr;
     meGeantVtxY[i] = nullptr;
-    meGeantVtxZ[i] = nullptr; 
-    meMCG4Trk[i]   = nullptr;
-    meCaloEcal[i]  = nullptr;
+    meGeantVtxZ[i] = nullptr;
+    meMCG4Trk[i] = nullptr;
+    meCaloEcal[i] = nullptr;
     meCaloEcalE[i] = nullptr;
     meCaloEcalToF[i] = nullptr;
-    meCaloPreSh[i]   = nullptr;
-    meCaloPreShE[i]  = nullptr;
-    meCaloPreShToF[i]= nullptr;
-    meCaloHcal[i]    = nullptr;
-    meCaloHcalE[i]   = nullptr;
+    meCaloPreSh[i] = nullptr;
+    meCaloPreShE[i] = nullptr;
+    meCaloPreShToF[i] = nullptr;
+    meCaloHcal[i] = nullptr;
+    meCaloHcalE[i] = nullptr;
     meCaloHcalToF[i] = nullptr;
-    meTrackerPx[i]   = nullptr;
-    meTrackerSi[i]   = nullptr;
-    meMuon[i]        = nullptr;
-    meMuonDtToF[i]   = nullptr;
-    meMuonCscToF[i]  = nullptr;
+    meTrackerPx[i] = nullptr;
+    meTrackerSi[i] = nullptr;
+    meMuon[i] = nullptr;
+    meMuonDtToF[i] = nullptr;
+    meMuonCscToF[i] = nullptr;
     meMuonRpcFToF[i] = nullptr;
     meMuonRpcBToF[i] = nullptr;
     meGeantVtxRad[i] = nullptr;
   }
-  meGeantTrkPt   = nullptr;
-  meGeantTrkE    = nullptr;
-  meGeantVtxEta  = nullptr;
-  meGeantVtxPhi  = nullptr;
-  meGeantVtxMulti= nullptr;
-  meCaloEcalPhi  = nullptr;
-  meCaloEcalEta  = nullptr;
+  meGeantTrkPt = nullptr;
+  meGeantTrkE = nullptr;
+  meGeantVtxEta = nullptr;
+  meGeantVtxPhi = nullptr;
+  meGeantVtxMulti = nullptr;
+  meCaloEcalPhi = nullptr;
+  meCaloEcalEta = nullptr;
   meCaloPreShPhi = nullptr;
   meCaloPreShEta = nullptr;
-  meCaloHcalPhi  = nullptr;
-  meCaloHcalEta  = nullptr;
+  meCaloHcalPhi = nullptr;
+  meCaloHcalEta = nullptr;
   meTrackerPxPhi = nullptr;
   meTrackerPxEta = nullptr;
-  meTrackerPxBToF= nullptr;
-  meTrackerPxBR  = nullptr;
-  meTrackerPxFToF= nullptr;
-  meTrackerPxFZ  = nullptr;
+  meTrackerPxBToF = nullptr;
+  meTrackerPxBR = nullptr;
+  meTrackerPxFToF = nullptr;
+  meTrackerPxFZ = nullptr;
   meTrackerSiPhi = nullptr;
   meTrackerSiEta = nullptr;
-  meTrackerSiBToF= nullptr;
-  meTrackerSiBR  = nullptr;
-  meTrackerSiFToF= nullptr;
-  meTrackerSiFZ  = nullptr;
-  meMuonPhi      = nullptr;
-  meMuonEta      = nullptr;
-  meMuonDtR      = nullptr;
-  meMuonCscZ     = nullptr;
-  meMuonRpcBR    = nullptr;
-  meMuonRpcFZ    = nullptr;
-
+  meTrackerSiBToF = nullptr;
+  meTrackerSiBR = nullptr;
+  meTrackerSiFToF = nullptr;
+  meTrackerSiFZ = nullptr;
+  meMuonPhi = nullptr;
+  meMuonEta = nullptr;
+  meMuonDtR = nullptr;
+  meMuonCscZ = nullptr;
+  meMuonRpcBR = nullptr;
+  meMuonRpcFZ = nullptr;
 }
 
 GlobalHitsAnalyzer::~GlobalHitsAnalyzer() {}
@@ -281,415 +261,412 @@ void GlobalHitsAnalyzer::bookHistograms(DQMStore::IBooker &iBooker, edm::Run con
 
   // MCGeant
   iBooker.setCurrentFolder("GlobalHitsV/MCGeant");
-  sprintf(hname,"hMCRGP1");
-  sprintf(htitle,"RawGenParticles");
-  meMCRGP[0] = iBooker.book1D(hname,htitle,100,0.,5000.);
-  sprintf(hname,"hMCRGP2");
-  meMCRGP[1] = iBooker.book1D(hname,htitle,100,0.,500.);  
+  sprintf(hname, "hMCRGP1");
+  sprintf(htitle, "RawGenParticles");
+  meMCRGP[0] = iBooker.book1D(hname, htitle, 100, 0., 5000.);
+  sprintf(hname, "hMCRGP2");
+  meMCRGP[1] = iBooker.book1D(hname, htitle, 100, 0., 500.);
   for (Int_t i = 0; i < 2; ++i) {
-    meMCRGP[i]->setAxisTitle("Number of Raw Generated Particles",1);
-    meMCRGP[i]->setAxisTitle("Count",2);
+    meMCRGP[i]->setAxisTitle("Number of Raw Generated Particles", 1);
+    meMCRGP[i]->setAxisTitle("Count", 2);
   }
 
-  sprintf(hname,"hMCG4Vtx1");
-  sprintf(htitle,"G4 Vertices");
-  meMCG4Vtx[0] = iBooker.book1D(hname,htitle,150,0.,15000.);
-  sprintf(hname,"hMCG4Vtx2");
-  meMCG4Vtx[1] = iBooker.book1D(hname,htitle,100,-0.5,99.5); 
+  sprintf(hname, "hMCG4Vtx1");
+  sprintf(htitle, "G4 Vertices");
+  meMCG4Vtx[0] = iBooker.book1D(hname, htitle, 150, 0., 15000.);
+  sprintf(hname, "hMCG4Vtx2");
+  meMCG4Vtx[1] = iBooker.book1D(hname, htitle, 100, -0.5, 99.5);
   for (Int_t i = 0; i < 2; ++i) {
-    meMCG4Vtx[i]->setAxisTitle("Number of Vertices",1);
-    meMCG4Vtx[i]->setAxisTitle("Count",2);
+    meMCG4Vtx[i]->setAxisTitle("Number of Vertices", 1);
+    meMCG4Vtx[i]->setAxisTitle("Count", 2);
   }
 
-  sprintf(hname,"hMCG4Trk1");
-  sprintf(htitle,"G4 Tracks");
-  meMCG4Trk[0] = iBooker.book1D(hname,htitle,150,0.,15000.);
-  sprintf(hname,"hMCG4Trk2");
-  meMCG4Trk[1] = iBooker.book1D(hname,htitle,150,-0.5,99.5);    
+  sprintf(hname, "hMCG4Trk1");
+  sprintf(htitle, "G4 Tracks");
+  meMCG4Trk[0] = iBooker.book1D(hname, htitle, 150, 0., 15000.);
+  sprintf(hname, "hMCG4Trk2");
+  meMCG4Trk[1] = iBooker.book1D(hname, htitle, 150, -0.5, 99.5);
   for (Int_t i = 0; i < 2; ++i) {
-    meMCG4Trk[i]->setAxisTitle("Number of Tracks",1);
-    meMCG4Trk[i]->setAxisTitle("Count",2);
+    meMCG4Trk[i]->setAxisTitle("Number of Tracks", 1);
+    meMCG4Trk[i]->setAxisTitle("Count", 2);
   }
 
-  sprintf(hname,"hGeantVtxX1");
-  sprintf(htitle,"Geant vertex x/micrometer");
-  meGeantVtxX[0] = iBooker.book1D(hname,htitle,100,-8000000.,8000000.);
-  sprintf(hname,"hGeantVtxX2");
-  meGeantVtxX[1] = iBooker.book1D(hname,htitle,100,-50.,50.); 
+  sprintf(hname, "hGeantVtxX1");
+  sprintf(htitle, "Geant vertex x/micrometer");
+  meGeantVtxX[0] = iBooker.book1D(hname, htitle, 100, -8000000., 8000000.);
+  sprintf(hname, "hGeantVtxX2");
+  meGeantVtxX[1] = iBooker.book1D(hname, htitle, 100, -50., 50.);
   for (Int_t i = 0; i < 2; ++i) {
-    meGeantVtxX[i]->setAxisTitle("x of Vertex (um)",1);
-    meGeantVtxX[i]->setAxisTitle("Count",2);
+    meGeantVtxX[i]->setAxisTitle("x of Vertex (um)", 1);
+    meGeantVtxX[i]->setAxisTitle("Count", 2);
   }
 
-  sprintf(hname,"hGeantVtxY1");
-  sprintf(htitle,"Geant vertex y/micrometer");
-  meGeantVtxY[0] = iBooker.book1D(hname,htitle,100,-8000000,8000000.);
-  sprintf(hname,"hGeantVtxY2");
-  meGeantVtxY[1] = iBooker.book1D(hname,htitle,100,-50.,50.); 
+  sprintf(hname, "hGeantVtxY1");
+  sprintf(htitle, "Geant vertex y/micrometer");
+  meGeantVtxY[0] = iBooker.book1D(hname, htitle, 100, -8000000, 8000000.);
+  sprintf(hname, "hGeantVtxY2");
+  meGeantVtxY[1] = iBooker.book1D(hname, htitle, 100, -50., 50.);
   for (Int_t i = 0; i < 2; ++i) {
-    meGeantVtxY[i]->setAxisTitle("y of Vertex (um)",1);
-    meGeantVtxY[i]->setAxisTitle("Count",2);
+    meGeantVtxY[i]->setAxisTitle("y of Vertex (um)", 1);
+    meGeantVtxY[i]->setAxisTitle("Count", 2);
   }
 
-  sprintf(hname,"hGeantVtxZ1");
-  sprintf(htitle,"Geant vertex z/millimeter");
-  meGeantVtxZ[0] = iBooker.book1D(hname,htitle,100,-11000.,11000.);
-  sprintf(hname,"hGeantVtxZ2");
-  meGeantVtxZ[1] = iBooker.book1D(hname,htitle,200,-500.,500.);
-  //meGeantVtxZ[1] = iBooker.book1D(hname,htitle,100,-250.,250.);
+  sprintf(hname, "hGeantVtxZ1");
+  sprintf(htitle, "Geant vertex z/millimeter");
+  meGeantVtxZ[0] = iBooker.book1D(hname, htitle, 100, -11000., 11000.);
+  sprintf(hname, "hGeantVtxZ2");
+  meGeantVtxZ[1] = iBooker.book1D(hname, htitle, 200, -500., 500.);
+  // meGeantVtxZ[1] = iBooker.book1D(hname,htitle,100,-250.,250.);
   for (Int_t i = 0; i < 2; ++i) {
-    meGeantVtxZ[i]->setAxisTitle("z of Vertex (mm)",1);
-    meGeantVtxZ[i]->setAxisTitle("Count",2);
+    meGeantVtxZ[i]->setAxisTitle("z of Vertex (mm)", 1);
+    meGeantVtxZ[i]->setAxisTitle("Count", 2);
   }
 
-  sprintf(hname,"hGeantTrkPt");
-  sprintf(htitle,"Log10 Geant track pt/GeV");
-  meGeantTrkPt = iBooker.book1D(hname,htitle,80,-4.,4.);
-  meGeantTrkPt->setAxisTitle("Log10 pT of Track (GeV)",1);
-  meGeantTrkPt->setAxisTitle("Count",2);
-
-  sprintf(hname,"hGeantTrkE");
-  sprintf(htitle,"Log10 Geant track E/GeV");
-  meGeantTrkE = iBooker.book1D(hname,htitle,80,-4.,4.);
-  meGeantTrkE->setAxisTitle("Log10 E of Track (GeV)",1);
-  meGeantTrkE->setAxisTitle("Count",2);
-
-  sprintf(hname,"hGeantVtxEta");
-  sprintf(htitle,"Geant vertices eta");
-  meGeantVtxEta = iBooker.book1D(hname,htitle,220,-5.5,5.5);
-  meGeantVtxEta->setAxisTitle("eta of SimVertex",1);
-  meGeantVtxEta->setAxisTitle("Count",2);
-
-  sprintf(hname,"hGeantVtxPhi");
-  sprintf(htitle,"Geant vertices phi/rad");
-  meGeantVtxPhi = iBooker.book1D(hname,htitle,100,-3.2,3.2);
-  meGeantVtxPhi->setAxisTitle("phi of SimVertex (rad)",1);
-  meGeantVtxPhi->setAxisTitle("Count",2);
-
-  sprintf(hname,"hGeantVtxRad1");
-  sprintf(htitle,"Geant vertices radius/cm");
-  meGeantVtxRad[0] = iBooker.book1D(hname,htitle,130,0.,130.);
-  sprintf(hname,"hGeantVtxRad2");
-  meGeantVtxRad[1] = iBooker.book1D(hname,htitle,100,0.,1000.);
+  sprintf(hname, "hGeantTrkPt");
+  sprintf(htitle, "Log10 Geant track pt/GeV");
+  meGeantTrkPt = iBooker.book1D(hname, htitle, 80, -4., 4.);
+  meGeantTrkPt->setAxisTitle("Log10 pT of Track (GeV)", 1);
+  meGeantTrkPt->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hGeantTrkE");
+  sprintf(htitle, "Log10 Geant track E/GeV");
+  meGeantTrkE = iBooker.book1D(hname, htitle, 80, -4., 4.);
+  meGeantTrkE->setAxisTitle("Log10 E of Track (GeV)", 1);
+  meGeantTrkE->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hGeantVtxEta");
+  sprintf(htitle, "Geant vertices eta");
+  meGeantVtxEta = iBooker.book1D(hname, htitle, 220, -5.5, 5.5);
+  meGeantVtxEta->setAxisTitle("eta of SimVertex", 1);
+  meGeantVtxEta->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hGeantVtxPhi");
+  sprintf(htitle, "Geant vertices phi/rad");
+  meGeantVtxPhi = iBooker.book1D(hname, htitle, 100, -3.2, 3.2);
+  meGeantVtxPhi->setAxisTitle("phi of SimVertex (rad)", 1);
+  meGeantVtxPhi->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hGeantVtxRad1");
+  sprintf(htitle, "Geant vertices radius/cm");
+  meGeantVtxRad[0] = iBooker.book1D(hname, htitle, 130, 0., 130.);
+  sprintf(hname, "hGeantVtxRad2");
+  meGeantVtxRad[1] = iBooker.book1D(hname, htitle, 100, 0., 1000.);
   for (Int_t i = 0; i < 2; ++i) {
-    meGeantVtxRad[i]->setAxisTitle("radius of SimVertex (cm)",1);
-    meGeantVtxRad[i]->setAxisTitle("Count",2);
+    meGeantVtxRad[i]->setAxisTitle("radius of SimVertex (cm)", 1);
+    meGeantVtxRad[i]->setAxisTitle("Count", 2);
   }
 
-  sprintf(hname,"hGeantVtxMulti");
-  sprintf(htitle,"Geant vertices outgoing multiplicity");
-  meGeantVtxMulti = iBooker.book1D(hname,htitle,20,0.,20);
-  meGeantVtxMulti->setAxisTitle("multiplicity of particles attached to a SimVertex",1);
-  meGeantVtxMulti->setAxisTitle("Count",2);
+  sprintf(hname, "hGeantVtxMulti");
+  sprintf(htitle, "Geant vertices outgoing multiplicity");
+  meGeantVtxMulti = iBooker.book1D(hname, htitle, 20, 0., 20);
+  meGeantVtxMulti->setAxisTitle("multiplicity of particles attached to a SimVertex", 1);
+  meGeantVtxMulti->setAxisTitle("Count", 2);
 
   // ECal
   iBooker.setCurrentFolder("GlobalHitsV/ECals");
-  sprintf(hname,"hCaloEcal1");
-  sprintf(htitle,"Ecal hits");
-  meCaloEcal[0] = iBooker.book1D(hname,htitle,100,0.,10000.);
-  sprintf(hname,"hCaloEcal2");
-  meCaloEcal[1] = iBooker.book1D(hname,htitle,100,-0.5,99.5);
-
-  sprintf(hname,"hCaloEcalE1");
-  sprintf(htitle,"Ecal hits, energy/GeV");
-  meCaloEcalE[0] = iBooker.book1D(hname,htitle,100,0.,10.);
-  sprintf(hname,"hCaloEcalE2");
-  meCaloEcalE[1] = iBooker.book1D(hname,htitle,100,0.,0.1);
-  sprintf(hname,"hCaloEcalToF1");
-  sprintf(htitle,"Ecal hits, ToF/ns");
-  meCaloEcalToF[0] = iBooker.book1D(hname,htitle,100,0.,1000.);
-  sprintf(hname,"hCaloEcalToF2");
-  meCaloEcalToF[1] = iBooker.book1D(hname,htitle,100,0.,100.);
- 
+  sprintf(hname, "hCaloEcal1");
+  sprintf(htitle, "Ecal hits");
+  meCaloEcal[0] = iBooker.book1D(hname, htitle, 100, 0., 10000.);
+  sprintf(hname, "hCaloEcal2");
+  meCaloEcal[1] = iBooker.book1D(hname, htitle, 100, -0.5, 99.5);
+
+  sprintf(hname, "hCaloEcalE1");
+  sprintf(htitle, "Ecal hits, energy/GeV");
+  meCaloEcalE[0] = iBooker.book1D(hname, htitle, 100, 0., 10.);
+  sprintf(hname, "hCaloEcalE2");
+  meCaloEcalE[1] = iBooker.book1D(hname, htitle, 100, 0., 0.1);
+  sprintf(hname, "hCaloEcalToF1");
+  sprintf(htitle, "Ecal hits, ToF/ns");
+  meCaloEcalToF[0] = iBooker.book1D(hname, htitle, 100, 0., 1000.);
+  sprintf(hname, "hCaloEcalToF2");
+  meCaloEcalToF[1] = iBooker.book1D(hname, htitle, 100, 0., 100.);
+
   for (Int_t i = 0; i < 2; ++i) {
-    meCaloEcal[i]->setAxisTitle("Number of Hits",1);
-    meCaloEcal[i]->setAxisTitle("Count",2);
-    meCaloEcalE[i]->setAxisTitle("Energy of Hits (GeV)",1);
-    meCaloEcalE[i]->setAxisTitle("Count",2);
-    meCaloEcalToF[i]->setAxisTitle("Time of Flight of Hits (ns)",1);
-    meCaloEcalToF[i]->setAxisTitle("Count",2);
+    meCaloEcal[i]->setAxisTitle("Number of Hits", 1);
+    meCaloEcal[i]->setAxisTitle("Count", 2);
+    meCaloEcalE[i]->setAxisTitle("Energy of Hits (GeV)", 1);
+    meCaloEcalE[i]->setAxisTitle("Count", 2);
+    meCaloEcalToF[i]->setAxisTitle("Time of Flight of Hits (ns)", 1);
+    meCaloEcalToF[i]->setAxisTitle("Count", 2);
   }
 
-  sprintf(hname,"hCaloEcalPhi");
-  sprintf(htitle,"Ecal hits, phi/rad");
-  meCaloEcalPhi = iBooker.book1D(hname,htitle,100,-3.2,3.2);
-  meCaloEcalPhi->setAxisTitle("Phi of Hits (rad)",1);
-  meCaloEcalPhi->setAxisTitle("Count",2);
-
-  sprintf(hname,"hCaloEcalEta");
-  sprintf(htitle,"Ecal hits, eta");
-  meCaloEcalEta = iBooker.book1D(hname,htitle,100,-5.5,5.5);
-  meCaloEcalEta->setAxisTitle("Eta of Hits",1);
-  meCaloEcalEta->setAxisTitle("Count",2);
-
-  sprintf(hname,"hCaloPreSh1");
-  sprintf(htitle,"PreSh hits");
-  meCaloPreSh[0] = iBooker.book1D(hname,htitle,100,0.,10000.);
-  sprintf(hname,"hCaloPreSh2");
-  meCaloPreSh[1] = iBooker.book1D(hname,htitle,100,-0.5,99.5);
-
-  sprintf(hname,"hCaloPreShE1");
-  sprintf(htitle,"PreSh hits, energy/GeV");
-  meCaloPreShE[0] = iBooker.book1D(hname,htitle,100,0.,10.);
-  sprintf(hname,"hCaloPreShE2");
-  meCaloPreShE[1] = iBooker.book1D(hname,htitle,100,0.,0.1);
-
-  sprintf(hname,"hCaloPreShToF1");
-  sprintf(htitle,"PreSh hits, ToF/ns");
-  meCaloPreShToF[0] = iBooker.book1D(hname,htitle,100,0.,1000.);
-  sprintf(hname,"hCaloPreShToF2");
-  meCaloPreShToF[1] = iBooker.book1D(hname,htitle,100,0.,100.);
+  sprintf(hname, "hCaloEcalPhi");
+  sprintf(htitle, "Ecal hits, phi/rad");
+  meCaloEcalPhi = iBooker.book1D(hname, htitle, 100, -3.2, 3.2);
+  meCaloEcalPhi->setAxisTitle("Phi of Hits (rad)", 1);
+  meCaloEcalPhi->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hCaloEcalEta");
+  sprintf(htitle, "Ecal hits, eta");
+  meCaloEcalEta = iBooker.book1D(hname, htitle, 100, -5.5, 5.5);
+  meCaloEcalEta->setAxisTitle("Eta of Hits", 1);
+  meCaloEcalEta->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hCaloPreSh1");
+  sprintf(htitle, "PreSh hits");
+  meCaloPreSh[0] = iBooker.book1D(hname, htitle, 100, 0., 10000.);
+  sprintf(hname, "hCaloPreSh2");
+  meCaloPreSh[1] = iBooker.book1D(hname, htitle, 100, -0.5, 99.5);
+
+  sprintf(hname, "hCaloPreShE1");
+  sprintf(htitle, "PreSh hits, energy/GeV");
+  meCaloPreShE[0] = iBooker.book1D(hname, htitle, 100, 0., 10.);
+  sprintf(hname, "hCaloPreShE2");
+  meCaloPreShE[1] = iBooker.book1D(hname, htitle, 100, 0., 0.1);
+
+  sprintf(hname, "hCaloPreShToF1");
+  sprintf(htitle, "PreSh hits, ToF/ns");
+  meCaloPreShToF[0] = iBooker.book1D(hname, htitle, 100, 0., 1000.);
+  sprintf(hname, "hCaloPreShToF2");
+  meCaloPreShToF[1] = iBooker.book1D(hname, htitle, 100, 0., 100.);
 
   for (Int_t i = 0; i < 2; ++i) {
-    meCaloPreSh[i]->setAxisTitle("Number of Hits",1);
-    meCaloPreSh[i]->setAxisTitle("Count",2);
-    meCaloPreShE[i]->setAxisTitle("Energy of Hits (GeV)",1);
-    meCaloPreShE[i]->setAxisTitle("Count",2);
-    meCaloPreShToF[i]->setAxisTitle("Time of Flight of Hits (ns)",1);
-    meCaloPreShToF[i]->setAxisTitle("Count",2);
+    meCaloPreSh[i]->setAxisTitle("Number of Hits", 1);
+    meCaloPreSh[i]->setAxisTitle("Count", 2);
+    meCaloPreShE[i]->setAxisTitle("Energy of Hits (GeV)", 1);
+    meCaloPreShE[i]->setAxisTitle("Count", 2);
+    meCaloPreShToF[i]->setAxisTitle("Time of Flight of Hits (ns)", 1);
+    meCaloPreShToF[i]->setAxisTitle("Count", 2);
   }
 
-  sprintf(hname,"hCaloPreShPhi");
-  sprintf(htitle,"PreSh hits, phi/rad");
-  meCaloPreShPhi = iBooker.book1D(hname,htitle,100,-3.2,3.2);
-  meCaloPreShPhi->setAxisTitle("Phi of Hits (rad)",1);
-  meCaloPreShPhi->setAxisTitle("Count",2);
+  sprintf(hname, "hCaloPreShPhi");
+  sprintf(htitle, "PreSh hits, phi/rad");
+  meCaloPreShPhi = iBooker.book1D(hname, htitle, 100, -3.2, 3.2);
+  meCaloPreShPhi->setAxisTitle("Phi of Hits (rad)", 1);
+  meCaloPreShPhi->setAxisTitle("Count", 2);
 
-  sprintf(hname,"hCaloPreShEta");
-  sprintf(htitle,"PreSh hits, eta");
-  meCaloPreShEta = iBooker.book1D(hname,htitle,100,-5.5,5.5);
-  meCaloPreShEta->setAxisTitle("Eta of Hits",1);
-  meCaloPreShEta->setAxisTitle("Count",2);
+  sprintf(hname, "hCaloPreShEta");
+  sprintf(htitle, "PreSh hits, eta");
+  meCaloPreShEta = iBooker.book1D(hname, htitle, 100, -5.5, 5.5);
+  meCaloPreShEta->setAxisTitle("Eta of Hits", 1);
+  meCaloPreShEta->setAxisTitle("Count", 2);
 
   // Hcal
   iBooker.setCurrentFolder("GlobalHitsV/HCals");
-  sprintf(hname,"hCaloHcal1");
-  sprintf(htitle,"Hcal hits");
-  meCaloHcal[0] = iBooker.book1D(hname,htitle,100,0.,10000.);
-  sprintf(hname,"hCaloHcal2");
-  meCaloHcal[1] = iBooker.book1D(hname,htitle,100,-0.5,99.5);
-
-  sprintf(hname,"hCaloHcalE1");
-  sprintf(htitle,"Hcal hits, energy/GeV");
-  meCaloHcalE[0] = iBooker.book1D(hname,htitle,100,0.,10.);
-  sprintf(hname,"hCaloHcalE2");
-  meCaloHcalE[1] = iBooker.book1D(hname,htitle,100,0.,0.1);
-
-  sprintf(hname,"hCaloHcalToF1");
-  sprintf(htitle,"Hcal hits, ToF/ns");
-  meCaloHcalToF[0] = iBooker.book1D(hname,htitle,100,0.,1000.);
-  sprintf(hname,"hCaloHcalToF2");
-  meCaloHcalToF[1] = iBooker.book1D(hname,htitle,100,0.,100.);
+  sprintf(hname, "hCaloHcal1");
+  sprintf(htitle, "Hcal hits");
+  meCaloHcal[0] = iBooker.book1D(hname, htitle, 100, 0., 10000.);
+  sprintf(hname, "hCaloHcal2");
+  meCaloHcal[1] = iBooker.book1D(hname, htitle, 100, -0.5, 99.5);
+
+  sprintf(hname, "hCaloHcalE1");
+  sprintf(htitle, "Hcal hits, energy/GeV");
+  meCaloHcalE[0] = iBooker.book1D(hname, htitle, 100, 0., 10.);
+  sprintf(hname, "hCaloHcalE2");
+  meCaloHcalE[1] = iBooker.book1D(hname, htitle, 100, 0., 0.1);
+
+  sprintf(hname, "hCaloHcalToF1");
+  sprintf(htitle, "Hcal hits, ToF/ns");
+  meCaloHcalToF[0] = iBooker.book1D(hname, htitle, 100, 0., 1000.);
+  sprintf(hname, "hCaloHcalToF2");
+  meCaloHcalToF[1] = iBooker.book1D(hname, htitle, 100, 0., 100.);
 
   for (Int_t i = 0; i < 2; ++i) {
-    meCaloHcal[i]->setAxisTitle("Number of Hits",1);
-    meCaloHcal[i]->setAxisTitle("Count",2);
-    meCaloHcalE[i]->setAxisTitle("Energy of Hits (GeV)",1);
-    meCaloHcalE[i]->setAxisTitle("Count",2);
-    meCaloHcalToF[i]->setAxisTitle("Time of Flight of Hits (ns)",1);
-    meCaloHcalToF[i]->setAxisTitle("Count",2);
+    meCaloHcal[i]->setAxisTitle("Number of Hits", 1);
+    meCaloHcal[i]->setAxisTitle("Count", 2);
+    meCaloHcalE[i]->setAxisTitle("Energy of Hits (GeV)", 1);
+    meCaloHcalE[i]->setAxisTitle("Count", 2);
+    meCaloHcalToF[i]->setAxisTitle("Time of Flight of Hits (ns)", 1);
+    meCaloHcalToF[i]->setAxisTitle("Count", 2);
   }
 
-  sprintf(hname,"hCaloHcalPhi");
-  sprintf(htitle,"Hcal hits, phi/rad");
-  meCaloHcalPhi = iBooker.book1D(hname,htitle,100,-3.2,3.2);
-  meCaloHcalPhi->setAxisTitle("Phi of Hits (rad)",1);
-  meCaloHcalPhi->setAxisTitle("Count",2);
-
-  sprintf(hname,"hCaloHcalEta");
-  sprintf(htitle,"Hcal hits, eta");
-  meCaloHcalEta = iBooker.book1D(hname,htitle,100,-5.5,5.5);
-  meCaloHcalEta->setAxisTitle("Eta of Hits",1);
-  meCaloHcalEta->setAxisTitle("Count",2);
-  
+  sprintf(hname, "hCaloHcalPhi");
+  sprintf(htitle, "Hcal hits, phi/rad");
+  meCaloHcalPhi = iBooker.book1D(hname, htitle, 100, -3.2, 3.2);
+  meCaloHcalPhi->setAxisTitle("Phi of Hits (rad)", 1);
+  meCaloHcalPhi->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hCaloHcalEta");
+  sprintf(htitle, "Hcal hits, eta");
+  meCaloHcalEta = iBooker.book1D(hname, htitle, 100, -5.5, 5.5);
+  meCaloHcalEta->setAxisTitle("Eta of Hits", 1);
+  meCaloHcalEta->setAxisTitle("Count", 2);
+
   // SiPixels
   iBooker.setCurrentFolder("GlobalHitsV/SiPixels");
-  sprintf(hname,"hTrackerPx1");
-  sprintf(htitle,"Pixel hits");
-  meTrackerPx[0] = iBooker.book1D(hname,htitle,100,0.,10000.);
-  sprintf(hname,"hTrackerPx2");
-  meTrackerPx[1] = iBooker.book1D(hname,htitle,100,-0.5,99.5);
+  sprintf(hname, "hTrackerPx1");
+  sprintf(htitle, "Pixel hits");
+  meTrackerPx[0] = iBooker.book1D(hname, htitle, 100, 0., 10000.);
+  sprintf(hname, "hTrackerPx2");
+  meTrackerPx[1] = iBooker.book1D(hname, htitle, 100, -0.5, 99.5);
   for (Int_t i = 0; i < 2; ++i) {
-    meTrackerPx[i]->setAxisTitle("Number of Pixel Hits",1);
-    meTrackerPx[i]->setAxisTitle("Count",2);
+    meTrackerPx[i]->setAxisTitle("Number of Pixel Hits", 1);
+    meTrackerPx[i]->setAxisTitle("Count", 2);
   }
 
-  sprintf(hname,"hTrackerPxPhi");
-  sprintf(htitle,"Pixel hits phi/rad");
-  meTrackerPxPhi = iBooker.book1D(hname,htitle,100,-3.2,3.2);
-  meTrackerPxPhi->setAxisTitle("Phi of Hits (rad)",1);
-  meTrackerPxPhi->setAxisTitle("Count",2);
-
-  sprintf(hname,"hTrackerPxEta");
-  sprintf(htitle,"Pixel hits eta");
-  meTrackerPxEta = iBooker.book1D(hname,htitle,100,-3.5,3.5);
-  meTrackerPxEta->setAxisTitle("Eta of Hits",1);
-  meTrackerPxEta->setAxisTitle("Count",2);
-
-  sprintf(hname,"hTrackerPxBToF");
-  sprintf(htitle,"Pixel barrel hits, ToF/ns");
-  meTrackerPxBToF = iBooker.book1D(hname,htitle,100,0.,40.);
-  meTrackerPxBToF->setAxisTitle("Time of Flight of Hits (ns)",1);
-  meTrackerPxBToF->setAxisTitle("Count",2);
-
-  sprintf(hname,"hTrackerPxBR");
-  sprintf(htitle,"Pixel barrel hits, R/cm");
-  meTrackerPxBR = iBooker.book1D(hname,htitle,100,0.,50.);
-  meTrackerPxBR->setAxisTitle("R of Hits (cm)",1);
-  meTrackerPxBR->setAxisTitle("Count",2);
-
-  sprintf(hname,"hTrackerPxFToF");
-  sprintf(htitle,"Pixel forward hits, ToF/ns");
-  meTrackerPxFToF = iBooker.book1D(hname,htitle,100,0.,50.);
-  meTrackerPxFToF->setAxisTitle("Time of Flight of Hits (ns)",1);
-  meTrackerPxFToF->setAxisTitle("Count",2);
-
-  sprintf(hname,"hTrackerPxFZ");
-  sprintf(htitle,"Pixel forward hits, Z/cm");
-  meTrackerPxFZ = 
-    iBooker.book1D(hname,htitle,200,-100.,100.);
-  meTrackerPxFZ->setAxisTitle("Z of Hits (cm)",1);
-  meTrackerPxFZ->setAxisTitle("Count",2);
+  sprintf(hname, "hTrackerPxPhi");
+  sprintf(htitle, "Pixel hits phi/rad");
+  meTrackerPxPhi = iBooker.book1D(hname, htitle, 100, -3.2, 3.2);
+  meTrackerPxPhi->setAxisTitle("Phi of Hits (rad)", 1);
+  meTrackerPxPhi->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hTrackerPxEta");
+  sprintf(htitle, "Pixel hits eta");
+  meTrackerPxEta = iBooker.book1D(hname, htitle, 100, -3.5, 3.5);
+  meTrackerPxEta->setAxisTitle("Eta of Hits", 1);
+  meTrackerPxEta->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hTrackerPxBToF");
+  sprintf(htitle, "Pixel barrel hits, ToF/ns");
+  meTrackerPxBToF = iBooker.book1D(hname, htitle, 100, 0., 40.);
+  meTrackerPxBToF->setAxisTitle("Time of Flight of Hits (ns)", 1);
+  meTrackerPxBToF->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hTrackerPxBR");
+  sprintf(htitle, "Pixel barrel hits, R/cm");
+  meTrackerPxBR = iBooker.book1D(hname, htitle, 100, 0., 50.);
+  meTrackerPxBR->setAxisTitle("R of Hits (cm)", 1);
+  meTrackerPxBR->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hTrackerPxFToF");
+  sprintf(htitle, "Pixel forward hits, ToF/ns");
+  meTrackerPxFToF = iBooker.book1D(hname, htitle, 100, 0., 50.);
+  meTrackerPxFToF->setAxisTitle("Time of Flight of Hits (ns)", 1);
+  meTrackerPxFToF->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hTrackerPxFZ");
+  sprintf(htitle, "Pixel forward hits, Z/cm");
+  meTrackerPxFZ = iBooker.book1D(hname, htitle, 200, -100., 100.);
+  meTrackerPxFZ->setAxisTitle("Z of Hits (cm)", 1);
+  meTrackerPxFZ->setAxisTitle("Count", 2);
 
   // SiStrips
   iBooker.setCurrentFolder("GlobalHitsV/SiStrips");
-  sprintf(hname,"hTrackerSi1");
-  sprintf(htitle,"Silicon hits");
-  meTrackerSi[0] = iBooker.book1D(hname,htitle,100,0.,10000.);
-  sprintf(hname,"hTrackerSi2");
-  meTrackerSi[1] = iBooker.book1D(hname,htitle,100,-0.5,99.5);
-  for (Int_t i = 0; i < 2; ++i) { 
-    meTrackerSi[i]->setAxisTitle("Number of Silicon Hits",1);
-    meTrackerSi[i]->setAxisTitle("Count",2);
+  sprintf(hname, "hTrackerSi1");
+  sprintf(htitle, "Silicon hits");
+  meTrackerSi[0] = iBooker.book1D(hname, htitle, 100, 0., 10000.);
+  sprintf(hname, "hTrackerSi2");
+  meTrackerSi[1] = iBooker.book1D(hname, htitle, 100, -0.5, 99.5);
+  for (Int_t i = 0; i < 2; ++i) {
+    meTrackerSi[i]->setAxisTitle("Number of Silicon Hits", 1);
+    meTrackerSi[i]->setAxisTitle("Count", 2);
   }
 
-  sprintf(hname,"hTrackerSiPhi");
-  sprintf(htitle,"Silicon hits phi/rad");
-  meTrackerSiPhi = iBooker.book1D(hname,htitle,100,-3.2,3.2);
-  meTrackerSiPhi->setAxisTitle("Phi of Hits (rad)",1);
-  meTrackerSiPhi->setAxisTitle("Count",2);
-
-  sprintf(hname,"hTrackerSiEta");
-  sprintf(htitle,"Silicon hits eta");
-  meTrackerSiEta = iBooker.book1D(hname,htitle,100,-3.5,3.5);
-  meTrackerSiEta->setAxisTitle("Eta of Hits",1);
-  meTrackerSiEta->setAxisTitle("Count",2);
-
-  sprintf(hname,"hTrackerSiBToF");
-  sprintf(htitle,"Silicon barrel hits, ToF/ns");
-  meTrackerSiBToF = iBooker.book1D(hname,htitle,100,0.,50.);
-  meTrackerSiBToF->setAxisTitle("Time of Flight of Hits (ns)",1);
-  meTrackerSiBToF->setAxisTitle("Count",2);
-
-  sprintf(hname,"hTrackerSiBR");
-  sprintf(htitle,"Silicon barrel hits, R/cm");
-  meTrackerSiBR = iBooker.book1D(hname,htitle,100,0.,200.);
-  meTrackerSiBR->setAxisTitle("R of Hits (cm)",1);
-  meTrackerSiBR->setAxisTitle("Count",2);
-
-  sprintf(hname,"hTrackerSiFToF");
-  sprintf(htitle,"Silicon forward hits, ToF/ns");
-  meTrackerSiFToF = iBooker.book1D(hname,htitle,100,0.,75.);
-  meTrackerSiFToF->setAxisTitle("Time of Flight of Hits (ns)",1);
-  meTrackerSiFToF->setAxisTitle("Count",2);
-
-  sprintf(hname,"hTrackerSiFZ");
-  sprintf(htitle,"Silicon forward hits, Z/cm");
-  meTrackerSiFZ = iBooker.book1D(hname,htitle,200,-300.,300.);
-  meTrackerSiFZ->setAxisTitle("Z of Hits (cm)",1);
-  meTrackerSiFZ->setAxisTitle("Count",2);
+  sprintf(hname, "hTrackerSiPhi");
+  sprintf(htitle, "Silicon hits phi/rad");
+  meTrackerSiPhi = iBooker.book1D(hname, htitle, 100, -3.2, 3.2);
+  meTrackerSiPhi->setAxisTitle("Phi of Hits (rad)", 1);
+  meTrackerSiPhi->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hTrackerSiEta");
+  sprintf(htitle, "Silicon hits eta");
+  meTrackerSiEta = iBooker.book1D(hname, htitle, 100, -3.5, 3.5);
+  meTrackerSiEta->setAxisTitle("Eta of Hits", 1);
+  meTrackerSiEta->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hTrackerSiBToF");
+  sprintf(htitle, "Silicon barrel hits, ToF/ns");
+  meTrackerSiBToF = iBooker.book1D(hname, htitle, 100, 0., 50.);
+  meTrackerSiBToF->setAxisTitle("Time of Flight of Hits (ns)", 1);
+  meTrackerSiBToF->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hTrackerSiBR");
+  sprintf(htitle, "Silicon barrel hits, R/cm");
+  meTrackerSiBR = iBooker.book1D(hname, htitle, 100, 0., 200.);
+  meTrackerSiBR->setAxisTitle("R of Hits (cm)", 1);
+  meTrackerSiBR->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hTrackerSiFToF");
+  sprintf(htitle, "Silicon forward hits, ToF/ns");
+  meTrackerSiFToF = iBooker.book1D(hname, htitle, 100, 0., 75.);
+  meTrackerSiFToF->setAxisTitle("Time of Flight of Hits (ns)", 1);
+  meTrackerSiFToF->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hTrackerSiFZ");
+  sprintf(htitle, "Silicon forward hits, Z/cm");
+  meTrackerSiFZ = iBooker.book1D(hname, htitle, 200, -300., 300.);
+  meTrackerSiFZ->setAxisTitle("Z of Hits (cm)", 1);
+  meTrackerSiFZ->setAxisTitle("Count", 2);
 
   // Muon
   iBooker.setCurrentFolder("GlobalHitsV/Muons");
-  sprintf(hname,"hMuon1");
-  sprintf(htitle,"Muon hits");
-  meMuon[0] = iBooker.book1D(hname,htitle,100,0.,10000.);
-  sprintf(hname,"hMuon2");
-  meMuon[1] = iBooker.book1D(hname,htitle,100,-0.5,99.5);
-  for (Int_t i = 0; i < 2; ++i) { 
-    meMuon[i]->setAxisTitle("Number of Muon Hits",1);
-    meMuon[i]->setAxisTitle("Count",2);
-  }  
-
-  sprintf(hname,"hMuonPhi");
-  sprintf(htitle,"Muon hits phi/rad");
-  meMuonPhi = iBooker.book1D(hname,htitle,100,-3.2,3.2);
-  meMuonPhi->setAxisTitle("Phi of Hits (rad)",1);
-  meMuonPhi->setAxisTitle("Count",2);
-
-  sprintf(hname,"hMuonEta");
-  sprintf(htitle,"Muon hits eta");
-  meMuonEta = iBooker.book1D(hname,htitle,100,-3.5,3.5);
-  meMuonEta->setAxisTitle("Eta of Hits",1);
-  meMuonEta->setAxisTitle("Count",2);
-
-  sprintf(hname,"hMuonCscToF1");
-  sprintf(htitle,"Muon CSC hits, ToF/ns");
-  meMuonCscToF[0] = iBooker.book1D(hname,htitle,100,0.,250.);
-  sprintf(hname,"hMuonCscToF2");
-  meMuonCscToF[1] = iBooker.book1D(hname,htitle,100,0.,50.);
-  for (Int_t i = 0; i < 2; ++i) {   
-    meMuonCscToF[i]->setAxisTitle("Time of Flight of Hits (ns)",1);
-    meMuonCscToF[i]->setAxisTitle("Count",2);
-  }  
-
-  sprintf(hname,"hMuonCscZ");
-  sprintf(htitle,"Muon CSC hits, Z/cm");
-  meMuonCscZ = iBooker.book1D(hname,htitle,200,-1500.,1500.);
-  meMuonCscZ->setAxisTitle("Z of Hits (cm)",1);
-  meMuonCscZ->setAxisTitle("Count",2);
-
-  sprintf(hname,"hMuonDtToF1");
-  sprintf(htitle,"Muon DT hits, ToF/ns");
-  meMuonDtToF[0] = iBooker.book1D(hname,htitle,100,0.,250.);
-  sprintf(hname,"hMuonDtToF2");
-  meMuonDtToF[1] = iBooker.book1D(hname,htitle,100,0.,50.);
-  for (Int_t i = 0; i < 2; ++i) {   
-    meMuonDtToF[i]->setAxisTitle("Time of Flight of Hits (ns)",1);
-    meMuonDtToF[i]->setAxisTitle("Count",2);
-  } 
-
-  sprintf(hname,"hMuonDtR");
-  sprintf(htitle,"Muon DT hits, R/cm");
-  meMuonDtR = iBooker.book1D(hname,htitle,100,0.,1500.); 
-  meMuonDtR->setAxisTitle("R of Hits (cm)",1);
-  meMuonDtR->setAxisTitle("Count",2);
-
-  sprintf(hname,"hMuonRpcFToF1");
-  sprintf(htitle,"Muon RPC forward hits, ToF/ns");
-  meMuonRpcFToF[0] = iBooker.book1D(hname,htitle,100,0.,250.);
-  sprintf(hname,"hMuonRpcFToF2");
-  meMuonRpcFToF[1] = iBooker.book1D(hname,htitle,100,0.,50.);
-  for (Int_t i = 0; i < 2; ++i) {   
-    meMuonRpcFToF[i]->setAxisTitle("Time of Flight of Hits (ns)",1);
-    meMuonRpcFToF[i]->setAxisTitle("Count",2);
-  }  
-  sprintf(hname,"hMuonRpcFZ");
-  sprintf(htitle,"Muon RPC forward hits, Z/cm");
-  meMuonRpcFZ = iBooker.book1D(hname,htitle,201,-1500.,1500.);
-  meMuonRpcFZ->setAxisTitle("Z of Hits (cm)",1);
-  meMuonRpcFZ->setAxisTitle("Count",2);
-
-  sprintf(hname,"hMuonRpcBToF1");
-  sprintf(htitle,"Muon RPC barrel hits, ToF/ns");
-  meMuonRpcBToF[0] = iBooker.book1D(hname,htitle,100,0.,250.);
-  sprintf(hname,"hMuonRpcBToF2");
-  meMuonRpcBToF[1] = iBooker.book1D(hname,htitle,100,0.,50.);
-  for (Int_t i = 0; i < 2; ++i) {   
-    meMuonRpcBToF[i]->setAxisTitle("Time of Flight of Hits (ns)",1);
-    meMuonRpcBToF[i]->setAxisTitle("Count",2);
+  sprintf(hname, "hMuon1");
+  sprintf(htitle, "Muon hits");
+  meMuon[0] = iBooker.book1D(hname, htitle, 100, 0., 10000.);
+  sprintf(hname, "hMuon2");
+  meMuon[1] = iBooker.book1D(hname, htitle, 100, -0.5, 99.5);
+  for (Int_t i = 0; i < 2; ++i) {
+    meMuon[i]->setAxisTitle("Number of Muon Hits", 1);
+    meMuon[i]->setAxisTitle("Count", 2);
+  }
+
+  sprintf(hname, "hMuonPhi");
+  sprintf(htitle, "Muon hits phi/rad");
+  meMuonPhi = iBooker.book1D(hname, htitle, 100, -3.2, 3.2);
+  meMuonPhi->setAxisTitle("Phi of Hits (rad)", 1);
+  meMuonPhi->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hMuonEta");
+  sprintf(htitle, "Muon hits eta");
+  meMuonEta = iBooker.book1D(hname, htitle, 100, -3.5, 3.5);
+  meMuonEta->setAxisTitle("Eta of Hits", 1);
+  meMuonEta->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hMuonCscToF1");
+  sprintf(htitle, "Muon CSC hits, ToF/ns");
+  meMuonCscToF[0] = iBooker.book1D(hname, htitle, 100, 0., 250.);
+  sprintf(hname, "hMuonCscToF2");
+  meMuonCscToF[1] = iBooker.book1D(hname, htitle, 100, 0., 50.);
+  for (Int_t i = 0; i < 2; ++i) {
+    meMuonCscToF[i]->setAxisTitle("Time of Flight of Hits (ns)", 1);
+    meMuonCscToF[i]->setAxisTitle("Count", 2);
+  }
+
+  sprintf(hname, "hMuonCscZ");
+  sprintf(htitle, "Muon CSC hits, Z/cm");
+  meMuonCscZ = iBooker.book1D(hname, htitle, 200, -1500., 1500.);
+  meMuonCscZ->setAxisTitle("Z of Hits (cm)", 1);
+  meMuonCscZ->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hMuonDtToF1");
+  sprintf(htitle, "Muon DT hits, ToF/ns");
+  meMuonDtToF[0] = iBooker.book1D(hname, htitle, 100, 0., 250.);
+  sprintf(hname, "hMuonDtToF2");
+  meMuonDtToF[1] = iBooker.book1D(hname, htitle, 100, 0., 50.);
+  for (Int_t i = 0; i < 2; ++i) {
+    meMuonDtToF[i]->setAxisTitle("Time of Flight of Hits (ns)", 1);
+    meMuonDtToF[i]->setAxisTitle("Count", 2);
   }
 
-  sprintf(hname,"hMuonRpcBR");
-  sprintf(htitle,"Muon RPC barrel hits, R/cm");
-  meMuonRpcBR = iBooker.book1D(hname,htitle,100,0.,1500.);
-  meMuonRpcBR->setAxisTitle("R of Hits (cm)",1);
-  meMuonRpcBR->setAxisTitle("Count",2); 
+  sprintf(hname, "hMuonDtR");
+  sprintf(htitle, "Muon DT hits, R/cm");
+  meMuonDtR = iBooker.book1D(hname, htitle, 100, 0., 1500.);
+  meMuonDtR->setAxisTitle("R of Hits (cm)", 1);
+  meMuonDtR->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hMuonRpcFToF1");
+  sprintf(htitle, "Muon RPC forward hits, ToF/ns");
+  meMuonRpcFToF[0] = iBooker.book1D(hname, htitle, 100, 0., 250.);
+  sprintf(hname, "hMuonRpcFToF2");
+  meMuonRpcFToF[1] = iBooker.book1D(hname, htitle, 100, 0., 50.);
+  for (Int_t i = 0; i < 2; ++i) {
+    meMuonRpcFToF[i]->setAxisTitle("Time of Flight of Hits (ns)", 1);
+    meMuonRpcFToF[i]->setAxisTitle("Count", 2);
+  }
+  sprintf(hname, "hMuonRpcFZ");
+  sprintf(htitle, "Muon RPC forward hits, Z/cm");
+  meMuonRpcFZ = iBooker.book1D(hname, htitle, 201, -1500., 1500.);
+  meMuonRpcFZ->setAxisTitle("Z of Hits (cm)", 1);
+  meMuonRpcFZ->setAxisTitle("Count", 2);
+
+  sprintf(hname, "hMuonRpcBToF1");
+  sprintf(htitle, "Muon RPC barrel hits, ToF/ns");
+  meMuonRpcBToF[0] = iBooker.book1D(hname, htitle, 100, 0., 250.);
+  sprintf(hname, "hMuonRpcBToF2");
+  meMuonRpcBToF[1] = iBooker.book1D(hname, htitle, 100, 0., 50.);
+  for (Int_t i = 0; i < 2; ++i) {
+    meMuonRpcBToF[i]->setAxisTitle("Time of Flight of Hits (ns)", 1);
+    meMuonRpcBToF[i]->setAxisTitle("Count", 2);
+  }
+
+  sprintf(hname, "hMuonRpcBR");
+  sprintf(htitle, "Muon RPC barrel hits, R/cm");
+  meMuonRpcBR = iBooker.book1D(hname, htitle, 100, 0., 1500.);
+  meMuonRpcBR->setAxisTitle("R of Hits (cm)", 1);
+  meMuonRpcBR->setAxisTitle("Count", 2);
 }
 
-void GlobalHitsAnalyzer::analyze(const edm::Event& iEvent, 
-				 const edm::EventSetup& iSetup)
-{
+void GlobalHitsAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalHitsAnalyzer_analyze";
 
   // keep track of number of events processed
@@ -700,42 +677,37 @@ void GlobalHitsAnalyzer::analyze(const edm::Event& iEvent,
   edm::EventNumber_t nevt = iEvent.id().event();
 
   if (verbosity > 0) {
-    edm::LogInfo(MsgLoggerCat)
-      << "Processing run " << nrun << ", event " << nevt
-      << " (" << count << " events total)";
+    edm::LogInfo(MsgLoggerCat) << "Processing run " << nrun << ", event " << nevt << " (" << count << " events total)";
   } else if (verbosity == 0) {
-    if (nevt%frequency == 0 || nevt == 1) {
-      edm::LogInfo(MsgLoggerCat)
-	<< "Processing run " << nrun << ", event " << nevt
-	<< " (" << count << " events total)";
+    if (nevt % frequency == 0 || nevt == 1) {
+      edm::LogInfo(MsgLoggerCat) << "Processing run " << nrun << ", event " << nevt << " (" << count
+                                 << " events total)";
     }
   }
 
   // look at information available in the event
   if (getAllProvenances) {
-
-    std::vector<const edm::StableProvenance*> AllProv;
+    std::vector<const edm::StableProvenance *> AllProv;
     iEvent.getAllStableProvenance(AllProv);
 
     if (verbosity >= 0)
-      edm::LogInfo(MsgLoggerCat)
-	<< "Number of Provenances = " << AllProv.size();
+      edm::LogInfo(MsgLoggerCat) << "Number of Provenances = " << AllProv.size();
 
     if (printProvenanceInfo && (verbosity >= 0)) {
-      TString eventout("\nProvenance info:\n");      
+      TString eventout("\nProvenance info:\n");
 
       for (unsigned int i = 0; i < AllProv.size(); ++i) {
-	eventout += "\n       ******************************";
-	eventout += "\n       Module       : ";
-	eventout += AllProv[i]->moduleLabel();
-	eventout += "\n       ProductID    : ";
-	eventout += AllProv[i]->productID().id();
-	eventout += "\n       ClassName    : ";
-	eventout += AllProv[i]->className();
-	eventout += "\n       InstanceName : ";
-	eventout += AllProv[i]->productInstanceName();
-	eventout += "\n       BranchName   : ";
-	eventout += AllProv[i]->branchName();
+        eventout += "\n       ******************************";
+        eventout += "\n       Module       : ";
+        eventout += AllProv[i]->moduleLabel();
+        eventout += "\n       ProductID    : ";
+        eventout += AllProv[i]->productID().id();
+        eventout += "\n       ClassName    : ";
+        eventout += AllProv[i]->className();
+        eventout += "\n       InstanceName : ";
+        eventout += AllProv[i]->productInstanceName();
+        eventout += "\n       BranchName   : ";
+        eventout += AllProv[i]->branchName();
       }
       eventout += "\n       ******************************\n";
       edm::LogInfo(MsgLoggerCat) << eventout << "\n";
@@ -745,10 +717,10 @@ void GlobalHitsAnalyzer::analyze(const edm::Event& iEvent,
   }
 
   // call fill functions
-  //gather G4MC information from event
+  // gather G4MC information from event
   fillG4MC(iEvent);
   // gather Tracker information from event
-  fillTrk(iEvent,iSetup);
+  fillTrk(iEvent, iSetup);
   // gather muon information from event
   fillMuon(iEvent, iSetup);
   // gather Ecal information from event
@@ -757,18 +729,15 @@ void GlobalHitsAnalyzer::analyze(const edm::Event& iEvent,
   fillHCal(iEvent, iSetup);
 
   if (verbosity > 0)
-    edm::LogInfo (MsgLoggerCat)
-      << "Done gathering data from event.";
+    edm::LogInfo(MsgLoggerCat) << "Done gathering data from event.";
 
   return;
 }
 
 //==================fill and store functions================================
-void GlobalHitsAnalyzer::fillG4MC(const edm::Event& iEvent)
-{
-
+void GlobalHitsAnalyzer::fillG4MC(const edm::Event &iEvent) {
   std::string MsgLoggerCat = "GlobalHitsAnalyzer_fillG4MC";
- 
+
   TString eventout;
   if (verbosity > 0)
     eventout = "\nGathering info:";
@@ -777,7 +746,7 @@ void GlobalHitsAnalyzer::fillG4MC(const edm::Event& iEvent)
   // get MC information
   /////////////////////
   edm::Handle<edm::HepMCProduct> HepMCEvt;
-  std::vector<edm::Handle<edm::HepMCProduct> > AllHepMCEvt;
+  std::vector<edm::Handle<edm::HepMCProduct>> AllHepMCEvt;
   iEvent.getManyByType(AllHepMCEvt);
 
   // loop through products and extract VtxSmearing if available. Any of them
@@ -789,35 +758,36 @@ void GlobalHitsAnalyzer::fillG4MC(const edm::Event& iEvent)
   }
 
   if (!HepMCEvt.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find HepMCProduct in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find HepMCProduct in event!";
     validHepMCevt = false;
   } else {
     eventout += "\n          Using HepMCProduct: ";
     eventout += (HepMCEvt.provenance()->branchDescription()).moduleLabel();
   }
   if (validHepMCevt) {
-    const HepMC::GenEvent* MCEvt = HepMCEvt->GetEvent();
+    const HepMC::GenEvent *MCEvt = HepMCEvt->GetEvent();
     nRawGenPart = MCEvt->particles_size();
-    
-    
+
     if (verbosity > 1) {
       eventout += "\n          Number of Raw Particles collected:......... ";
       eventout += nRawGenPart;
-    }      
-    
-    if (meMCRGP[0]) meMCRGP[0]->Fill((float)nRawGenPart);
-    if (meMCRGP[1]) meMCRGP[1]->Fill((float)nRawGenPart);  
+    }
+
+    if (meMCRGP[0])
+      meMCRGP[0]->Fill((float)nRawGenPart);
+    if (meMCRGP[1])
+      meMCRGP[1]->Fill((float)nRawGenPart);
   }
-  
-  
+
   ////////////////////////////
   // get G4Vertex information
   ////////////////////////////
   // convert unit stored in SimVertex to mm
   float unit = 0.;
-  if (vtxunit == 0) unit = 1.;  // already in mm
-  if (vtxunit == 1) unit = 10.; // stored in cm, convert to mm
+  if (vtxunit == 0)
+    unit = 1.;  // already in mm
+  if (vtxunit == 1)
+    unit = 10.;  // stored in cm, convert to mm
 
   edm::Handle<edm::SimVertexContainer> G4VtxContainer;
   iEvent.getByToken(G4VtxSrc_Token_, G4VtxContainer);
@@ -827,128 +797,128 @@ void GlobalHitsAnalyzer::fillG4MC(const edm::Event& iEvent)
   iEvent.getByToken(G4TrkSrc_Token_, G4TrkContainer);
 
   if (!G4VtxContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find SimVertex in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find SimVertex in event!";
     validG4VtxContainer = false;
   }
   if (validG4VtxContainer) {
     int i = 0;
     edm::SimVertexContainer::const_iterator itVtx;
-    for (itVtx = G4VtxContainer->begin(); itVtx != G4VtxContainer->end(); 
-	 ++itVtx) {
-      
+    for (itVtx = G4VtxContainer->begin(); itVtx != G4VtxContainer->end(); ++itVtx) {
       ++i;
-      
-      const math::XYZTLorentzVector G4Vtx1(itVtx->position().x(),
-					   itVtx->position().y(),
-					   itVtx->position().z(),
-					   itVtx->position().e());
-      
+
+      const math::XYZTLorentzVector G4Vtx1(
+          itVtx->position().x(), itVtx->position().y(), itVtx->position().z(), itVtx->position().e());
+
       double G4Vtx[4];
       G4Vtx1.GetCoordinates(G4Vtx);
-      
-      if (meGeantVtxX[0]) meGeantVtxX[0]->Fill((G4Vtx[0]*unit)/micrometer);
-      if (meGeantVtxX[1]) meGeantVtxX[1]->Fill((G4Vtx[0]*unit)/micrometer);
-      
-      if (meGeantVtxY[0]) meGeantVtxY[0]->Fill((G4Vtx[1]*unit)/micrometer);
-      if (meGeantVtxY[1]) meGeantVtxY[1]->Fill((G4Vtx[1]*unit)/micrometer);
-      
-      if (meGeantVtxZ[0]) meGeantVtxZ[0]->Fill((G4Vtx[2]*unit)/millimeter);
-      if (meGeantVtxZ[1]) meGeantVtxZ[1]->Fill((G4Vtx[2]*unit)/millimeter); 
-
-      if (meGeantVtxEta) meGeantVtxEta->Fill(G4Vtx1.eta());
-      if (meGeantVtxPhi) meGeantVtxPhi->Fill(G4Vtx1.phi());
-      if (meGeantVtxRad[0]) meGeantVtxRad[0]->Fill(G4Vtx1.rho());
-      if (meGeantVtxRad[1]) meGeantVtxRad[1]->Fill(G4Vtx1.rho());
-
-      if (meGeantVtxMulti) { 
+
+      if (meGeantVtxX[0])
+        meGeantVtxX[0]->Fill((G4Vtx[0] * unit) / micrometer);
+      if (meGeantVtxX[1])
+        meGeantVtxX[1]->Fill((G4Vtx[0] * unit) / micrometer);
+
+      if (meGeantVtxY[0])
+        meGeantVtxY[0]->Fill((G4Vtx[1] * unit) / micrometer);
+      if (meGeantVtxY[1])
+        meGeantVtxY[1]->Fill((G4Vtx[1] * unit) / micrometer);
+
+      if (meGeantVtxZ[0])
+        meGeantVtxZ[0]->Fill((G4Vtx[2] * unit) / millimeter);
+      if (meGeantVtxZ[1])
+        meGeantVtxZ[1]->Fill((G4Vtx[2] * unit) / millimeter);
+
+      if (meGeantVtxEta)
+        meGeantVtxEta->Fill(G4Vtx1.eta());
+      if (meGeantVtxPhi)
+        meGeantVtxPhi->Fill(G4Vtx1.phi());
+      if (meGeantVtxRad[0])
+        meGeantVtxRad[0]->Fill(G4Vtx1.rho());
+      if (meGeantVtxRad[1])
+        meGeantVtxRad[1]->Fill(G4Vtx1.rho());
+
+      if (meGeantVtxMulti) {
         int multi = 0;
-        if ( G4TrkContainer.isValid() ) {
+        if (G4TrkContainer.isValid()) {
           edm::SimTrackContainer::const_iterator itTrk;
-          for (itTrk = G4TrkContainer->begin(); itTrk != G4TrkContainer->end(); 
-               ++itTrk) {
-            if ( (*itTrk).vertIndex() == i ) { multi++; }
+          for (itTrk = G4TrkContainer->begin(); itTrk != G4TrkContainer->end(); ++itTrk) {
+            if ((*itTrk).vertIndex() == i) {
+              multi++;
+            }
           }
         }
-        meGeantVtxMulti->Fill(((double)multi+0.5));
-    }
-      
+        meGeantVtxMulti->Fill(((double)multi + 0.5));
+      }
     }
-    
+
     if (verbosity > 1) {
       eventout += "\n          Number of G4Vertices collected:............ ";
       eventout += i;
-    }  
-    
-    if (meMCG4Vtx[0]) meMCG4Vtx[0]->Fill((float)i);
-    if (meMCG4Vtx[1]) meMCG4Vtx[1]->Fill((float)i);  
+    }
 
+    if (meMCG4Vtx[0])
+      meMCG4Vtx[0]->Fill((float)i);
+    if (meMCG4Vtx[1])
+      meMCG4Vtx[1]->Fill((float)i);
   }
 
   ///////////////////////////
   // get G4Track information
   ///////////////////////////
   if (!G4TrkContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find SimTrack in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find SimTrack in event!";
     validG4trkContainer = false;
   }
   if (validG4trkContainer) {
     int i = 0;
     edm::SimTrackContainer::const_iterator itTrk;
-    for (itTrk = G4TrkContainer->begin(); itTrk != G4TrkContainer->end(); 
-	 ++itTrk) {
-      
+    for (itTrk = G4TrkContainer->begin(); itTrk != G4TrkContainer->end(); ++itTrk) {
       ++i;
-      
-      const math::XYZTLorentzVector G4Trk1(itTrk->momentum().x(),
-					   itTrk->momentum().y(),
-					   itTrk->momentum().z(),
-					   itTrk->momentum().e());
+
+      const math::XYZTLorentzVector G4Trk1(
+          itTrk->momentum().x(), itTrk->momentum().y(), itTrk->momentum().z(), itTrk->momentum().e());
       double G4Trk[4];
       G4Trk1.GetCoordinates(G4Trk);
-      
-      if (meGeantTrkPt) meGeantTrkPt->
-			  Fill(std::log10(std::max(sqrt(G4Trk[0]*G4Trk[0]+G4Trk[1]*G4Trk[1]),-9.)));
-      if (meGeantTrkE) meGeantTrkE->Fill(std::log10(std::max(G4Trk[3],-9.)));
-    } 
-    
+
+      if (meGeantTrkPt)
+        meGeantTrkPt->Fill(std::log10(std::max(sqrt(G4Trk[0] * G4Trk[0] + G4Trk[1] * G4Trk[1]), -9.)));
+      if (meGeantTrkE)
+        meGeantTrkE->Fill(std::log10(std::max(G4Trk[3], -9.)));
+    }
+
     if (verbosity > 1) {
       eventout += "\n          Number of G4Tracks collected:.............. ";
       eventout += i;
-    }  
-    
-    if (meMCG4Trk[0]) meMCG4Trk[0]->Fill((float)i);
-    if (meMCG4Trk[1]) meMCG4Trk[1]->Fill((float)i); 
+    }
+
+    if (meMCG4Trk[0])
+      meMCG4Trk[0]->Fill((float)i);
+    if (meMCG4Trk[1])
+      meMCG4Trk[1]->Fill((float)i);
   }
 
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
-    
+
   return;
 }
 
-void GlobalHitsAnalyzer::fillTrk(const edm::Event& iEvent, 
-				 const edm::EventSetup& iSetup)
-{
-
+void GlobalHitsAnalyzer::fillTrk(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   nPxlHits = 0;
   std::string MsgLoggerCat = "GlobalHitsAnalyzer_fillTrk";
 
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
-  
+    eventout = "\nGathering info:";
+
   // access the tracker geometry
   edm::ESHandle<TrackerGeometry> theTrackerGeometry;
   iSetup.get<TrackerDigiGeometryRecord>().get(theTrackerGeometry);
   if (!theTrackerGeometry.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerDigiGeometryRecord in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerDigiGeometryRecord in event!";
     return;
   }
-  const TrackerGeometry& theTracker(*theTrackerGeometry);
-    
+  const TrackerGeometry &theTracker(*theTrackerGeometry);
+
   // iterator to access containers
   edm::PSimHitContainer::const_iterator itHit;
 
@@ -958,114 +928,100 @@ void GlobalHitsAnalyzer::fillTrk(const edm::Event& iEvent,
   edm::PSimHitContainer thePxlBrlHits;
   // extract low container
   edm::Handle<edm::PSimHitContainer> PxlBrlLowContainer;
-  iEvent.getByToken(PxlBrlLowSrc_Token_,PxlBrlLowContainer);
+  iEvent.getByToken(PxlBrlLowSrc_Token_, PxlBrlLowContainer);
   if (!PxlBrlLowContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find TrackerHitsPixelBarrelLowTof in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find TrackerHitsPixelBarrelLowTof in event!";
     validPxlBrlLow = false;
   }
   // extract high container
   edm::Handle<edm::PSimHitContainer> PxlBrlHighContainer;
-  iEvent.getByToken(PxlBrlHighSrc_Token_,PxlBrlHighContainer);
+  iEvent.getByToken(PxlBrlHighSrc_Token_, PxlBrlHighContainer);
   if (!PxlBrlHighContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find TrackerHitsPixelBarrelHighTof in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find TrackerHitsPixelBarrelHighTof in event!";
     validPxlBrlHigh = false;
   }
   // place both containers into new container
-  if (validPxlBrlLow) 
-    thePxlBrlHits.insert(thePxlBrlHits.end(),PxlBrlLowContainer->begin(),
-			 PxlBrlLowContainer->end());
-  if(validPxlBrlHigh)
-    thePxlBrlHits.insert(thePxlBrlHits.end(),PxlBrlHighContainer->begin(),
-			 PxlBrlHighContainer->end());
+  if (validPxlBrlLow)
+    thePxlBrlHits.insert(thePxlBrlHits.end(), PxlBrlLowContainer->begin(), PxlBrlLowContainer->end());
+  if (validPxlBrlHigh)
+    thePxlBrlHits.insert(thePxlBrlHits.end(), PxlBrlHighContainer->begin(), PxlBrlHighContainer->end());
 
   // cycle through new container
   int i = 0, j = 0;
   for (itHit = thePxlBrlHits.begin(); itHit != thePxlBrlHits.end(); ++itHit) {
-    
     ++i;
-    
+
     // create a DetId from the detUnitId
     DetId theDetUnitId(itHit->detUnitId());
     int detector = theDetUnitId.det();
     int subdetector = theDetUnitId.subdetId();
-    
+
     // check that expected detector is returned
     if ((detector == dTrk) && (subdetector == sdPxlBrl)) {
-      
       // get the GeomDetUnit from the geometry using theDetUnitID
       const GeomDetUnit *theDet = theTracker.idToDetUnit(theDetUnitId);
-      
+
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get GeomDetUnit from PxlBrlHits for Hit " << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from PxlBrlHits for Hit " << i;
+        continue;
       }
-      
+
       ++j;
-      
+
       // get the Surface of the hit (knows how to go from local <-> global)
-      const BoundPlane& bSurface = theDet->surface();
-      
-      if(meTrackerPxBToF) meTrackerPxBToF->Fill(itHit->tof());
-      if(meTrackerPxBR) 
-	meTrackerPxBR->Fill(bSurface.toGlobal(itHit->localPosition()).perp());
-      if(meTrackerPxPhi) 
-	meTrackerPxPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
-      if(meTrackerPxEta) 
-	meTrackerPxEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
-      
+      const BoundPlane &bSurface = theDet->surface();
+
+      if (meTrackerPxBToF)
+        meTrackerPxBToF->Fill(itHit->tof());
+      if (meTrackerPxBR)
+        meTrackerPxBR->Fill(bSurface.toGlobal(itHit->localPosition()).perp());
+      if (meTrackerPxPhi)
+        meTrackerPxPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
+      if (meTrackerPxEta)
+        meTrackerPxEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
+
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "PxlBrl PSimHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dTrk << "," << sdPxlBrl
-	<< "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "PxlBrl PSimHit " << i << " is expected to be (det,subdet) = (" << dTrk << ","
+                                    << sdPxlBrl << "); value returned is: (" << detector << "," << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through PxlBrl Hits
-  
+    }  // end detector type check
+  }    // end loop through PxlBrl Hits
+
   if (verbosity > 1) {
     eventout += "\n          Number of Pixel Barrel Hits collected:..... ";
     eventout += j;
-  }  
-  
+  }
+
   nPxlHits += j;
-  
+
   /////////////////////////////////
   // get Pixel Forward information
   ////////////////////////////////
   edm::PSimHitContainer thePxlFwdHits;
   // extract low container
   edm::Handle<edm::PSimHitContainer> PxlFwdLowContainer;
-  iEvent.getByToken(PxlFwdLowSrc_Token_,PxlFwdLowContainer);
+  iEvent.getByToken(PxlFwdLowSrc_Token_, PxlFwdLowContainer);
   if (!PxlFwdLowContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find TrackerHitsPixelEndcapLowTof in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find TrackerHitsPixelEndcapLowTof in event!";
     validPxlFwdLow = false;
   }
   // extract high container
   edm::Handle<edm::PSimHitContainer> PxlFwdHighContainer;
-  iEvent.getByToken(PxlFwdHighSrc_Token_,PxlFwdHighContainer);
+  iEvent.getByToken(PxlFwdHighSrc_Token_, PxlFwdHighContainer);
   if (!PxlFwdHighContainer.isValid()) {
-    LogDebug("GlobalHitsAnalyzer_fillTrk")
-      << "Unable to find TrackerHitsPixelEndcapHighTof in event!";
+    LogDebug("GlobalHitsAnalyzer_fillTrk") << "Unable to find TrackerHitsPixelEndcapHighTof in event!";
     validPxlFwdHigh = false;
   }
   // place both containers into new container
   if (validPxlFwdLow)
-    thePxlFwdHits.insert(thePxlFwdHits.end(),PxlFwdLowContainer->begin(),
-			 PxlFwdLowContainer->end());
+    thePxlFwdHits.insert(thePxlFwdHits.end(), PxlFwdLowContainer->begin(), PxlFwdLowContainer->end());
   if (validPxlFwdHigh)
-    thePxlFwdHits.insert(thePxlFwdHits.end(),PxlFwdHighContainer->begin(),
-			 PxlFwdHighContainer->end());
+    thePxlFwdHits.insert(thePxlFwdHits.end(), PxlFwdHighContainer->begin(), PxlFwdHighContainer->end());
 
   // cycle through new container
-  i = 0; j = 0;
+  i = 0;
+  j = 0;
   for (itHit = thePxlFwdHits.begin(); itHit != thePxlFwdHits.end(); ++itHit) {
-
     ++i;
 
     // create a DetId from the detUnitId
@@ -1075,49 +1031,47 @@ void GlobalHitsAnalyzer::fillTrk(const edm::Event& iEvent,
 
     // check that expected detector is returned
     if ((detector == dTrk) && (subdetector == sdPxlFwd)) {
-
       // get the GeomDetUnit from the geometry using theDetUnitID
       const GeomDetUnit *theDet = theTracker.idToDetUnit(theDetUnitId);
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get GeomDetUnit from PxlFwdHits for Hit " << i;;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from PxlFwdHits for Hit " << i;
+        ;
+        continue;
       }
 
       ++j;
 
       // get the Surface of the hit (knows how to go from local <-> global)
-      const BoundPlane& bSurface = theDet->surface();
+      const BoundPlane &bSurface = theDet->surface();
 
-      if(meTrackerPxFToF) meTrackerPxFToF->Fill(itHit->tof());
-      if(meTrackerPxFZ) 
-	meTrackerPxFZ->Fill(bSurface.toGlobal(itHit->localPosition()).z());
-      if(meTrackerPxPhi) 
-	meTrackerPxPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
-      if(meTrackerPxEta) 
-	meTrackerPxEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
+      if (meTrackerPxFToF)
+        meTrackerPxFToF->Fill(itHit->tof());
+      if (meTrackerPxFZ)
+        meTrackerPxFZ->Fill(bSurface.toGlobal(itHit->localPosition()).z());
+      if (meTrackerPxPhi)
+        meTrackerPxPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
+      if (meTrackerPxEta)
+        meTrackerPxEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
 
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "PxlFwd PSimHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dTrk << "," << sdPxlFwd
-	<< "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "PxlFwd PSimHit " << i << " is expected to be (det,subdet) = (" << dTrk << ","
+                                    << sdPxlFwd << "); value returned is: (" << detector << "," << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through PxlFwd Hits
+    }  // end detector type check
+  }    // end loop through PxlFwd Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of Pixel Forward Hits collected:.... ";
     eventout += j;
-  }  
+  }
 
   nPxlHits += j;
 
-  if (meTrackerPx[0]) meTrackerPx[0]->Fill((float)nPxlHits);
-  if (meTrackerPx[1]) meTrackerPx[1]->Fill((float)nPxlHits); 
+  if (meTrackerPx[0])
+    meTrackerPx[0]->Fill((float)nPxlHits);
+  if (meTrackerPx[1])
+    meTrackerPx[1]->Fill((float)nPxlHits);
 
   ///////////////////////////////////
   // get Silicon Barrel information
@@ -1126,54 +1080,46 @@ void GlobalHitsAnalyzer::fillTrk(const edm::Event& iEvent,
   edm::PSimHitContainer theSiBrlHits;
   // extract TIB low container
   edm::Handle<edm::PSimHitContainer> SiTIBLowContainer;
-  iEvent.getByToken(SiTIBLowSrc_Token_,SiTIBLowContainer);
+  iEvent.getByToken(SiTIBLowSrc_Token_, SiTIBLowContainer);
   if (!SiTIBLowContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find TrackerHitsTIBLowTof in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find TrackerHitsTIBLowTof in event!";
     validSiTIBLow = false;
   }
   // extract TIB high container
   edm::Handle<edm::PSimHitContainer> SiTIBHighContainer;
-  iEvent.getByToken(SiTIBHighSrc_Token_,SiTIBHighContainer);
+  iEvent.getByToken(SiTIBHighSrc_Token_, SiTIBHighContainer);
   if (!SiTIBHighContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find TrackerHitsTIBHighTof in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find TrackerHitsTIBHighTof in event!";
     validSiTIBHigh = false;
   }
   // extract TOB low container
   edm::Handle<edm::PSimHitContainer> SiTOBLowContainer;
-  iEvent.getByToken(SiTOBLowSrc_Token_,SiTOBLowContainer);
+  iEvent.getByToken(SiTOBLowSrc_Token_, SiTOBLowContainer);
   if (!SiTOBLowContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find TrackerHitsTOBLowTof in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find TrackerHitsTOBLowTof in event!";
     validSiTOBLow = false;
   }
   // extract TOB high container
   edm::Handle<edm::PSimHitContainer> SiTOBHighContainer;
-  iEvent.getByToken(SiTOBHighSrc_Token_,SiTOBHighContainer);
+  iEvent.getByToken(SiTOBHighSrc_Token_, SiTOBHighContainer);
   if (!SiTOBHighContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find TrackerHitsTOBHighTof in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find TrackerHitsTOBHighTof in event!";
     validSiTOBHigh = false;
   }
   // place all containers into new container
   if (validSiTIBLow)
-    theSiBrlHits.insert(theSiBrlHits.end(),SiTIBLowContainer->begin(),
-			SiTIBLowContainer->end());
+    theSiBrlHits.insert(theSiBrlHits.end(), SiTIBLowContainer->begin(), SiTIBLowContainer->end());
   if (validSiTIBHigh)
-    theSiBrlHits.insert(theSiBrlHits.end(),SiTIBHighContainer->begin(),
-			SiTIBHighContainer->end());
+    theSiBrlHits.insert(theSiBrlHits.end(), SiTIBHighContainer->begin(), SiTIBHighContainer->end());
   if (validSiTOBLow)
-    theSiBrlHits.insert(theSiBrlHits.end(),SiTOBLowContainer->begin(),
-			SiTOBLowContainer->end());
+    theSiBrlHits.insert(theSiBrlHits.end(), SiTOBLowContainer->begin(), SiTOBLowContainer->end());
   if (validSiTOBHigh)
-    theSiBrlHits.insert(theSiBrlHits.end(),SiTOBHighContainer->begin(),
-			SiTOBHighContainer->end());
+    theSiBrlHits.insert(theSiBrlHits.end(), SiTOBHighContainer->begin(), SiTOBHighContainer->end());
 
   // cycle through new container
-  i = 0; j = 0;
+  i = 0;
+  j = 0;
   for (itHit = theSiBrlHits.begin(); itHit != theSiBrlHits.end(); ++itHit) {
-
     ++i;
 
     // create a DetId from the detUnitId
@@ -1182,47 +1128,41 @@ void GlobalHitsAnalyzer::fillTrk(const edm::Event& iEvent,
     int subdetector = theDetUnitId.subdetId();
 
     // check that expected detector is returned
-    if ((detector == dTrk) && 
-	((subdetector == sdSiTIB) ||
-	 (subdetector == sdSiTOB))) {
-
+    if ((detector == dTrk) && ((subdetector == sdSiTIB) || (subdetector == sdSiTOB))) {
       // get the GeomDetUnit from the geometry using theDetUnitID
       const GeomDetUnit *theDet = theTracker.idToDetUnit(theDetUnitId);
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get GeomDetUnit from SiBrlHits for Hit " << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from SiBrlHits for Hit " << i;
+        continue;
       }
 
       ++j;
 
       // get the Surface of the hit (knows how to go from local <-> global)
-      const BoundPlane& bSurface = theDet->surface();
+      const BoundPlane &bSurface = theDet->surface();
 
-      if(meTrackerSiBToF) meTrackerSiBToF->Fill(itHit->tof());
-      if(meTrackerSiBR) 
-	meTrackerSiBR->Fill(bSurface.toGlobal(itHit->localPosition()).perp());
-      if(meTrackerSiPhi) 
-	meTrackerSiPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
-      if(meTrackerSiEta) 
-	meTrackerSiEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
+      if (meTrackerSiBToF)
+        meTrackerSiBToF->Fill(itHit->tof());
+      if (meTrackerSiBR)
+        meTrackerSiBR->Fill(bSurface.toGlobal(itHit->localPosition()).perp());
+      if (meTrackerSiPhi)
+        meTrackerSiPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
+      if (meTrackerSiEta)
+        meTrackerSiEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
 
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "SiBrl PSimHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dTrk << "," << sdSiTIB
-	<< " || " << sdSiTOB << "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "SiBrl PSimHit " << i << " is expected to be (det,subdet) = (" << dTrk << ","
+                                    << sdSiTIB << " || " << sdSiTOB << "); value returned is: (" << detector << ","
+                                    << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through SiBrl Hits
+    }  // end detector type check
+  }    // end loop through SiBrl Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of Silicon Barrel Hits collected:... ";
     eventout += j;
-  }  
+  }
 
   nSiHits += j;
 
@@ -1232,54 +1172,46 @@ void GlobalHitsAnalyzer::fillTrk(const edm::Event& iEvent,
   edm::PSimHitContainer theSiFwdHits;
   // extract TID low container
   edm::Handle<edm::PSimHitContainer> SiTIDLowContainer;
-  iEvent.getByToken(SiTIDLowSrc_Token_,SiTIDLowContainer);
+  iEvent.getByToken(SiTIDLowSrc_Token_, SiTIDLowContainer);
   if (!SiTIDLowContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find TrackerHitsTIDLowTof in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find TrackerHitsTIDLowTof in event!";
     validSiTIDLow = false;
   }
   // extract TID high container
   edm::Handle<edm::PSimHitContainer> SiTIDHighContainer;
-  iEvent.getByToken(SiTIDHighSrc_Token_,SiTIDHighContainer);
+  iEvent.getByToken(SiTIDHighSrc_Token_, SiTIDHighContainer);
   if (!SiTIDHighContainer.isValid()) {
-    LogDebug("GlobalHitsAnalyzer_fillTrk")
-      << "Unable to find TrackerHitsTIDHighTof in event!";
+    LogDebug("GlobalHitsAnalyzer_fillTrk") << "Unable to find TrackerHitsTIDHighTof in event!";
     validSiTIDHigh = false;
   }
   // extract TEC low container
   edm::Handle<edm::PSimHitContainer> SiTECLowContainer;
-  iEvent.getByToken(SiTECLowSrc_Token_,SiTECLowContainer);
+  iEvent.getByToken(SiTECLowSrc_Token_, SiTECLowContainer);
   if (!SiTECLowContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find TrackerHitsTECLowTof in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find TrackerHitsTECLowTof in event!";
     validSiTECLow = false;
   }
   // extract TEC high container
   edm::Handle<edm::PSimHitContainer> SiTECHighContainer;
-  iEvent.getByToken(SiTECHighSrc_Token_,SiTECHighContainer);
+  iEvent.getByToken(SiTECHighSrc_Token_, SiTECHighContainer);
   if (!SiTECHighContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find TrackerHitsTECHighTof in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find TrackerHitsTECHighTof in event!";
     validSiTECHigh = false;
   }
   // place all containers into new container
   if (validSiTIDLow)
-    theSiFwdHits.insert(theSiFwdHits.end(),SiTIDLowContainer->begin(),
-			SiTIDLowContainer->end());
+    theSiFwdHits.insert(theSiFwdHits.end(), SiTIDLowContainer->begin(), SiTIDLowContainer->end());
   if (validSiTIDHigh)
-    theSiFwdHits.insert(theSiFwdHits.end(),SiTIDHighContainer->begin(),
-			SiTIDHighContainer->end());
+    theSiFwdHits.insert(theSiFwdHits.end(), SiTIDHighContainer->begin(), SiTIDHighContainer->end());
   if (validSiTECLow)
-    theSiFwdHits.insert(theSiFwdHits.end(),SiTECLowContainer->begin(),
-			SiTECLowContainer->end());
+    theSiFwdHits.insert(theSiFwdHits.end(), SiTECLowContainer->begin(), SiTECLowContainer->end());
   if (validSiTECHigh)
-    theSiFwdHits.insert(theSiFwdHits.end(),SiTECHighContainer->begin(),
-			SiTECHighContainer->end());
+    theSiFwdHits.insert(theSiFwdHits.end(), SiTECHighContainer->begin(), SiTECHighContainer->end());
 
   // cycle through container
-  i = 0; j = 0;
+  i = 0;
+  j = 0;
   for (itHit = theSiFwdHits.begin(); itHit != theSiFwdHits.end(); ++itHit) {
-
     ++i;
 
     // create a DetId from the detUnitId
@@ -1287,53 +1219,49 @@ void GlobalHitsAnalyzer::fillTrk(const edm::Event& iEvent,
     int detector = theDetUnitId.det();
     int subdetector = theDetUnitId.subdetId();
 
-    // check that expected detector is returned 
-    if ((detector == dTrk) && 
-	((subdetector == sdSiTID) ||
-	 (subdetector == sdSiTEC))) {
-      
+    // check that expected detector is returned
+    if ((detector == dTrk) && ((subdetector == sdSiTID) || (subdetector == sdSiTEC))) {
       // get the GeomDetUnit from the geometry using theDetUnitID
       const GeomDetUnit *theDet = theTracker.idToDetUnit(theDetUnitId);
-      
+
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get GeomDetUnit from SiFwdHits Hit " << i;
-	return;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from SiFwdHits Hit " << i;
+        return;
       }
-      
+
       ++j;
 
       // get the Surface of the hit (knows how to go from local <-> global)
-      const BoundPlane& bSurface = theDet->surface();
-      
-      if(meTrackerSiFToF) meTrackerSiFToF->Fill(itHit->tof());
-      if(meTrackerSiFZ) 
-	meTrackerSiFZ->Fill(bSurface.toGlobal(itHit->localPosition()).z());
-      if(meTrackerSiPhi) 
-	meTrackerSiPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
-      if(meTrackerSiEta) 
-	meTrackerSiEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
+      const BoundPlane &bSurface = theDet->surface();
+
+      if (meTrackerSiFToF)
+        meTrackerSiFToF->Fill(itHit->tof());
+      if (meTrackerSiFZ)
+        meTrackerSiFZ->Fill(bSurface.toGlobal(itHit->localPosition()).z());
+      if (meTrackerSiPhi)
+        meTrackerSiPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
+      if (meTrackerSiEta)
+        meTrackerSiEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
 
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "SiFwd PSimHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dTrk << "," << sdSiTOB
-	<< " || " << sdSiTEC << "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "SiFwd PSimHit " << i << " is expected to be (det,subdet) = (" << dTrk << ","
+                                    << sdSiTOB << " || " << sdSiTEC << "); value returned is: (" << detector << ","
+                                    << subdetector << ")";
       continue;
-    } // end check detector type
-  } // end loop through SiFwd Hits
+    }  // end check detector type
+  }    // end loop through SiFwd Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of Silicon Forward Hits collected:.. ";
     eventout += j;
-  }  
+  }
 
-  nSiHits +=j;
+  nSiHits += j;
 
-  if (meTrackerSi[0]) meTrackerSi[0]->Fill((float)nSiHits);
-  if (meTrackerSi[1]) meTrackerSi[1]->Fill((float)nSiHits); 
+  if (meTrackerSi[0])
+    meTrackerSi[0]->Fill((float)nSiHits);
+  if (meTrackerSi[1])
+    meTrackerSi[1]->Fill((float)nSiHits);
 
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
@@ -1341,15 +1269,13 @@ void GlobalHitsAnalyzer::fillTrk(const edm::Event& iEvent,
   return;
 }
 
-void GlobalHitsAnalyzer::fillMuon(const edm::Event& iEvent, 
-				  const edm::EventSetup& iSetup)
-{
+void GlobalHitsAnalyzer::fillMuon(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   nMuonHits = 0;
   std::string MsgLoggerCat = "GlobalHitsAnalyzer_fillMuon";
 
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
+    eventout = "\nGathering info:";
 
   // iterator to access containers
   edm::PSimHitContainer::const_iterator itHit;
@@ -1361,76 +1287,68 @@ void GlobalHitsAnalyzer::fillMuon(const edm::Event& iEvent,
   edm::ESHandle<CSCGeometry> theCSCGeometry;
   iSetup.get<MuonGeometryRecord>().get(theCSCGeometry);
   if (!theCSCGeometry.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find MuonGeometryRecord for the CSCGeometry in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find MuonGeometryRecord for the CSCGeometry in event!";
     return;
   }
-  const CSCGeometry& theCSCMuon(*theCSCGeometry);
+  const CSCGeometry &theCSCMuon(*theCSCGeometry);
 
   // get Muon CSC information
   edm::Handle<edm::PSimHitContainer> MuonCSCContainer;
-  iEvent.getByToken(MuonCscSrc_Token_,MuonCSCContainer);
+  iEvent.getByToken(MuonCscSrc_Token_, MuonCSCContainer);
   if (!MuonCSCContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find MuonCSCHits in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find MuonCSCHits in event!";
     validMuonCSC = false;
   }
 
   if (validMuonCSC) {
     // cycle through container
     int i = 0, j = 0;
-    for (itHit = MuonCSCContainer->begin(); itHit != MuonCSCContainer->end(); 
-	 ++itHit) {
-      
+    for (itHit = MuonCSCContainer->begin(); itHit != MuonCSCContainer->end(); ++itHit) {
       ++i;
-      
+
       // create a DetId from the detUnitId
       DetId theDetUnitId(itHit->detUnitId());
       int detector = theDetUnitId.det();
       int subdetector = theDetUnitId.subdetId();
-      
+
       // check that expected detector is returned
-      if ((detector == dMuon) && 
-	  (subdetector == sdMuonCSC)) {
-	
-	// get the GeomDetUnit from the geometry using theDetUnitID
-	const GeomDetUnit *theDet = theCSCMuon.idToDetUnit(theDetUnitId);
-	
-	if (!theDet) {
-	  edm::LogWarning(MsgLoggerCat)
-	    << "Unable to get GeomDetUnit from theCSCMuon for hit " << i;
-	  continue;
-	}
-	
-	++j;
-	
-	// get the Surface of the hit (knows how to go from local <-> global)
-	const BoundPlane& bSurface = theDet->surface();
-	
-	if (meMuonCscToF[0]) meMuonCscToF[0]->Fill(itHit->tof());
-	if (meMuonCscToF[1]) meMuonCscToF[1]->Fill(itHit->tof());
-	if (meMuonCscZ) 
-	  meMuonCscZ->Fill(bSurface.toGlobal(itHit->localPosition()).z());
-	if (meMuonPhi)
-	  meMuonPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
-	if (meMuonEta)
-	  meMuonEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
-	
+      if ((detector == dMuon) && (subdetector == sdMuonCSC)) {
+        // get the GeomDetUnit from the geometry using theDetUnitID
+        const GeomDetUnit *theDet = theCSCMuon.idToDetUnit(theDetUnitId);
+
+        if (!theDet) {
+          edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from theCSCMuon for hit " << i;
+          continue;
+        }
+
+        ++j;
+
+        // get the Surface of the hit (knows how to go from local <-> global)
+        const BoundPlane &bSurface = theDet->surface();
+
+        if (meMuonCscToF[0])
+          meMuonCscToF[0]->Fill(itHit->tof());
+        if (meMuonCscToF[1])
+          meMuonCscToF[1]->Fill(itHit->tof());
+        if (meMuonCscZ)
+          meMuonCscZ->Fill(bSurface.toGlobal(itHit->localPosition()).z());
+        if (meMuonPhi)
+          meMuonPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
+        if (meMuonEta)
+          meMuonEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
+
       } else {
-	edm::LogWarning(MsgLoggerCat)
-	  << "MuonCsc PSimHit " << i 
-	  << " is expected to be (det,subdet) = (" 
-	  << dMuon << "," << sdMuonCSC
-	  << "); value returned is: ("
-	  << detector << "," << subdetector << ")";
-	continue;
-      } // end detector type check
-    } // end loop through CSC Hits
-    
+        edm::LogWarning(MsgLoggerCat) << "MuonCsc PSimHit " << i << " is expected to be (det,subdet) = (" << dMuon
+                                      << "," << sdMuonCSC << "); value returned is: (" << detector << "," << subdetector
+                                      << ")";
+        continue;
+      }  // end detector type check
+    }    // end loop through CSC Hits
+
     if (verbosity > 1) {
       eventout += "\n          Number of CSC muon Hits collected:......... ";
       eventout += j;
-    }  
+    }
 
     nMuonHits += j;
   }
@@ -1442,85 +1360,76 @@ void GlobalHitsAnalyzer::fillMuon(const edm::Event& iEvent,
   edm::ESHandle<DTGeometry> theDTGeometry;
   iSetup.get<MuonGeometryRecord>().get(theDTGeometry);
   if (!theDTGeometry.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find MuonGeometryRecord for the DTGeometry in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find MuonGeometryRecord for the DTGeometry in event!";
     return;
   }
-  const DTGeometry& theDTMuon(*theDTGeometry);
+  const DTGeometry &theDTMuon(*theDTGeometry);
 
   // get Muon DT information
   edm::Handle<edm::PSimHitContainer> MuonDtContainer;
-  iEvent.getByToken(MuonDtSrc_Token_,MuonDtContainer);
+  iEvent.getByToken(MuonDtSrc_Token_, MuonDtContainer);
   if (!MuonDtContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find MuonDTHits in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find MuonDTHits in event!";
     validMuonDt = false;
   }
 
   if (validMuonDt) {
     // cycle through container
     int i = 0, j = 0;
-    for (itHit = MuonDtContainer->begin(); itHit != MuonDtContainer->end(); 
-	 ++itHit) {
-      
+    for (itHit = MuonDtContainer->begin(); itHit != MuonDtContainer->end(); ++itHit) {
       ++i;
-      
+
       // create a DetId from the detUnitId
       DetId theDetUnitId(itHit->detUnitId());
       int detector = theDetUnitId.det();
       int subdetector = theDetUnitId.subdetId();
-      
+
       // check that expected detector is returned
-      if ((detector == dMuon) && 
-	  (subdetector == sdMuonDT)) {
-	
-	// CSC uses wires and layers rather than the full detID
-	// get the wireId
-	DTWireId wireId(itHit->detUnitId());
-	
-	// get the DTLayer from the geometry using the wireID
-	const DTLayer *theDet = theDTMuon.layer(wireId.layerId());
-	
-	if (!theDet) {
-	  edm::LogWarning(MsgLoggerCat)
-	    << "Unable to get GeomDetUnit from theDtMuon for hit " << i;
-	  continue;
-	}
-	
-	++j;
-	
-	// get the Surface of the hit (knows how to go from local <-> global)
-	const BoundPlane& bSurface = theDet->surface();
-	
-	if (meMuonDtToF[0]) meMuonDtToF[0]->Fill(itHit->tof());
-	if (meMuonDtToF[1]) meMuonDtToF[1]->Fill(itHit->tof());
-	if (meMuonDtR) 
-	  meMuonDtR->Fill(bSurface.toGlobal(itHit->localPosition()).perp());
-	if (meMuonPhi)
-	  meMuonPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
-	if (meMuonEta)
-	  meMuonEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
-	
+      if ((detector == dMuon) && (subdetector == sdMuonDT)) {
+        // CSC uses wires and layers rather than the full detID
+        // get the wireId
+        DTWireId wireId(itHit->detUnitId());
+
+        // get the DTLayer from the geometry using the wireID
+        const DTLayer *theDet = theDTMuon.layer(wireId.layerId());
+
+        if (!theDet) {
+          edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from theDtMuon for hit " << i;
+          continue;
+        }
+
+        ++j;
+
+        // get the Surface of the hit (knows how to go from local <-> global)
+        const BoundPlane &bSurface = theDet->surface();
+
+        if (meMuonDtToF[0])
+          meMuonDtToF[0]->Fill(itHit->tof());
+        if (meMuonDtToF[1])
+          meMuonDtToF[1]->Fill(itHit->tof());
+        if (meMuonDtR)
+          meMuonDtR->Fill(bSurface.toGlobal(itHit->localPosition()).perp());
+        if (meMuonPhi)
+          meMuonPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
+        if (meMuonEta)
+          meMuonEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
+
       } else {
-	edm::LogWarning(MsgLoggerCat)
-	  << "MuonDt PSimHit " << i 
-	  << " is expected to be (det,subdet) = (" 
-	  << dMuon << "," << sdMuonDT
-	  << "); value returned is: ("
-	  << detector << "," << subdetector << ")";
-	continue;
-      } // end detector type check
-    } // end loop through DT Hits
-    
+        edm::LogWarning(MsgLoggerCat) << "MuonDt PSimHit " << i << " is expected to be (det,subdet) = (" << dMuon << ","
+                                      << sdMuonDT << "); value returned is: (" << detector << "," << subdetector << ")";
+        continue;
+      }  // end detector type check
+    }    // end loop through DT Hits
+
     if (verbosity > 1) {
       eventout += "\n          Number of DT muon Hits collected:.......... ";
       eventout += j;
-    } 
-    
+    }
+
     nMuonHits += j;
   }
 
-  //int RPCBrl = 0, RPCFwd = 0;
+  // int RPCBrl = 0, RPCFwd = 0;
   ///////////////////////
   // access the RPC Muon
   ///////////////////////
@@ -1528,141 +1437,132 @@ void GlobalHitsAnalyzer::fillMuon(const edm::Event& iEvent,
   edm::ESHandle<RPCGeometry> theRPCGeometry;
   iSetup.get<MuonGeometryRecord>().get(theRPCGeometry);
   if (!theRPCGeometry.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find MuonGeometryRecord for the RPCGeometry in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find MuonGeometryRecord for the RPCGeometry in event!";
     return;
   }
-  const RPCGeometry& theRPCMuon(*theRPCGeometry);
+  const RPCGeometry &theRPCMuon(*theRPCGeometry);
 
   // get Muon RPC information
   edm::Handle<edm::PSimHitContainer> MuonRPCContainer;
-  iEvent.getByToken(MuonRpcSrc_Token_,MuonRPCContainer);
+  iEvent.getByToken(MuonRpcSrc_Token_, MuonRPCContainer);
   if (!MuonRPCContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find MuonRPCHits in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find MuonRPCHits in event!";
     validMuonRPC = false;
   }
 
   if (validMuonRPC) {
     // cycle through container
     int i = 0, j = 0;
-    int RPCBrl =0, RPCFwd = 0;
-    for (itHit = MuonRPCContainer->begin(); itHit != MuonRPCContainer->end(); 
-	 ++itHit) {
-      
+    int RPCBrl = 0, RPCFwd = 0;
+    for (itHit = MuonRPCContainer->begin(); itHit != MuonRPCContainer->end(); ++itHit) {
       ++i;
-      
+
       // create a DetID from the detUnitId
       DetId theDetUnitId(itHit->detUnitId());
       int detector = theDetUnitId.det();
       int subdetector = theDetUnitId.subdetId();
-      
+
       // check that expected detector is returned
-      if ((detector == dMuon) && 
-	  (subdetector == sdMuonRPC)) {
-	
-	// get an RPCDetID from the detUnitID
-	RPCDetId RPCId(itHit->detUnitId());      
-	
-	// find the region of the RPC hit
-	int region = RPCId.region();
-	
-	// get the GeomDetUnit from the geometry using the RPCDetId
-	const GeomDetUnit *theDet = theRPCMuon.idToDetUnit(theDetUnitId);
-	
-	if (!theDet) {
-	  edm::LogWarning(MsgLoggerCat)
-	    << "Unable to get GeomDetUnit from theRPCMuon for hit " << i;
-	  continue;
-	}
-	
-	++j;
-	
-	// get the Surface of the hit (knows how to go from local <-> global)
-	const BoundPlane& bSurface = theDet->surface();
-	
-	// gather necessary information
-	if ((region == sdMuonRPCRgnFwdp) || (region == sdMuonRPCRgnFwdn)) {
-	  ++RPCFwd;
-	  
-	  if (meMuonRpcFToF[0]) meMuonRpcFToF[0]->Fill(itHit->tof());
-	  if (meMuonRpcFToF[1]) meMuonRpcFToF[1]->Fill(itHit->tof());
-	  if (meMuonRpcFZ) 
-	    meMuonRpcFZ->Fill(bSurface.toGlobal(itHit->localPosition()).z());
-	  if (meMuonPhi)
-	    meMuonPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
-	  if (meMuonEta)
-	    meMuonEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
-	  
-	} else if (region == sdMuonRPCRgnBrl) {
-	  ++RPCBrl;
-	  
-	  if (meMuonRpcBToF[0]) meMuonRpcBToF[0]->Fill(itHit->tof());
-	  if (meMuonRpcBToF[1]) meMuonRpcBToF[1]->Fill(itHit->tof());
-	  if (meMuonRpcBR) 
-	    meMuonRpcBR->Fill(bSurface.toGlobal(itHit->
-						localPosition()).perp());
-	  if (meMuonPhi)
-	    meMuonPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
-	  if (meMuonEta)
-	    meMuonEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
-	  
-	} else {
-	  edm::LogWarning(MsgLoggerCat)
-	    << "Invalid region for RPC Muon hit" << i;
-	  continue;
-	} // end check of region
+      if ((detector == dMuon) && (subdetector == sdMuonRPC)) {
+        // get an RPCDetID from the detUnitID
+        RPCDetId RPCId(itHit->detUnitId());
+
+        // find the region of the RPC hit
+        int region = RPCId.region();
+
+        // get the GeomDetUnit from the geometry using the RPCDetId
+        const GeomDetUnit *theDet = theRPCMuon.idToDetUnit(theDetUnitId);
+
+        if (!theDet) {
+          edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from theRPCMuon for hit " << i;
+          continue;
+        }
+
+        ++j;
+
+        // get the Surface of the hit (knows how to go from local <-> global)
+        const BoundPlane &bSurface = theDet->surface();
+
+        // gather necessary information
+        if ((region == sdMuonRPCRgnFwdp) || (region == sdMuonRPCRgnFwdn)) {
+          ++RPCFwd;
+
+          if (meMuonRpcFToF[0])
+            meMuonRpcFToF[0]->Fill(itHit->tof());
+          if (meMuonRpcFToF[1])
+            meMuonRpcFToF[1]->Fill(itHit->tof());
+          if (meMuonRpcFZ)
+            meMuonRpcFZ->Fill(bSurface.toGlobal(itHit->localPosition()).z());
+          if (meMuonPhi)
+            meMuonPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
+          if (meMuonEta)
+            meMuonEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
+
+        } else if (region == sdMuonRPCRgnBrl) {
+          ++RPCBrl;
+
+          if (meMuonRpcBToF[0])
+            meMuonRpcBToF[0]->Fill(itHit->tof());
+          if (meMuonRpcBToF[1])
+            meMuonRpcBToF[1]->Fill(itHit->tof());
+          if (meMuonRpcBR)
+            meMuonRpcBR->Fill(bSurface.toGlobal(itHit->localPosition()).perp());
+          if (meMuonPhi)
+            meMuonPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
+          if (meMuonEta)
+            meMuonEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
+
+        } else {
+          edm::LogWarning(MsgLoggerCat) << "Invalid region for RPC Muon hit" << i;
+          continue;
+        }  // end check of region
       } else {
-	edm::LogWarning(MsgLoggerCat)
-	  << "MuonRpc PSimHit " << i 
-	  << " is expected to be (det,subdet) = (" 
-        << dMuon << "," << sdMuonRPC
-	  << "); value returned is: ("
-	  << detector << "," << subdetector << ")";
-	continue;
-      } // end detector type check
-    } // end loop through RPC Hits
-    
+        edm::LogWarning(MsgLoggerCat) << "MuonRpc PSimHit " << i << " is expected to be (det,subdet) = (" << dMuon
+                                      << "," << sdMuonRPC << "); value returned is: (" << detector << "," << subdetector
+                                      << ")";
+        continue;
+      }  // end detector type check
+    }    // end loop through RPC Hits
+
     if (verbosity > 1) {
       eventout += "\n          Number of RPC muon Hits collected:......... ";
       eventout += j;
       eventout += "\n                    RPC Barrel muon Hits:............ ";
       eventout += RPCBrl;
       eventout += "\n                    RPC Forward muon Hits:........... ";
-      eventout += RPCFwd;    
-    }  
-    
+      eventout += RPCFwd;
+    }
+
     nMuonHits += j;
   }
 
-  if (meMuon[0]) meMuon[0]->Fill((float)nMuonHits);
-  if (meMuon[1]) meMuon[1]->Fill((float)nMuonHits); 
-  
+  if (meMuon[0])
+    meMuon[0]->Fill((float)nMuonHits);
+  if (meMuon[1])
+    meMuon[1]->Fill((float)nMuonHits);
+
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
-  
+
   return;
 }
 
-void GlobalHitsAnalyzer::fillECal(const edm::Event& iEvent, 
-				  const edm::EventSetup& iSetup)
-{
+void GlobalHitsAnalyzer::fillECal(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalHitsAnalyzer_fillECal";
 
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
-  
+    eventout = "\nGathering info:";
+
   // access the calorimeter geometry
   edm::ESHandle<CaloGeometry> theCaloGeometry;
   iSetup.get<CaloGeometryRecord>().get(theCaloGeometry);
   if (!theCaloGeometry.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find CaloGeometryRecord in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find CaloGeometryRecord in event!";
     return;
   }
-  const CaloGeometry& theCalo(*theCaloGeometry);
-    
+  const CaloGeometry &theCalo(*theCaloGeometry);
+
   // iterator to access containers
   edm::PCaloHitContainer::const_iterator itHit;
 
@@ -1672,32 +1572,27 @@ void GlobalHitsAnalyzer::fillECal(const edm::Event& iEvent,
   edm::PCaloHitContainer theECalHits;
   // extract EB container
   edm::Handle<edm::PCaloHitContainer> EBContainer;
-  iEvent.getByToken(ECalEBSrc_Token_,EBContainer);
+  iEvent.getByToken(ECalEBSrc_Token_, EBContainer);
   if (!EBContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find EcalHitsEB in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find EcalHitsEB in event!";
     validEB = false;
   }
   // extract EE container
   edm::Handle<edm::PCaloHitContainer> EEContainer;
-  iEvent.getByToken(ECalEESrc_Token_,EEContainer);
+  iEvent.getByToken(ECalEESrc_Token_, EEContainer);
   if (!EEContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find EcalHitsEE in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find EcalHitsEE in event!";
     validEE = false;
   }
   // place both containers into new container
   if (validEB)
-    theECalHits.insert(theECalHits.end(),EBContainer->begin(),
-		       EBContainer->end());
+    theECalHits.insert(theECalHits.end(), EBContainer->begin(), EBContainer->end());
   if (validEE)
-    theECalHits.insert(theECalHits.end(),EEContainer->begin(),
-		       EEContainer->end());
+    theECalHits.insert(theECalHits.end(), EEContainer->begin(), EEContainer->end());
 
   // cycle through new container
   int i = 0, j = 0;
   for (itHit = theECalHits.begin(); itHit != theECalHits.end(); ++itHit) {
-
     ++i;
 
     // create a DetId from the detUnitId
@@ -1706,149 +1601,144 @@ void GlobalHitsAnalyzer::fillECal(const edm::Event& iEvent,
     int subdetector = theDetUnitId.subdetId();
 
     // check that expected detector is returned
-    if ((detector == dEcal) && 
-	((subdetector == sdEcalBrl) ||
-	 (subdetector == sdEcalFwd))) {
-
+    if ((detector == dEcal) && ((subdetector == sdEcalBrl) || (subdetector == sdEcalFwd))) {
       // get the Cell geometry
       auto theDet = (theCalo.getSubdetectorGeometry(theDetUnitId))->getGeometry(theDetUnitId);
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get CaloCellGeometry from ECalHits for Hit " << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get CaloCellGeometry from ECalHits for Hit " << i;
+        continue;
       }
 
       ++j;
 
       // get the global position of the cell
-      const GlobalPoint& globalposition = theDet->getPosition();
-
-      if (meCaloEcalE[0]) meCaloEcalE[0]->Fill(itHit->energy());
-      if (meCaloEcalE[1]) meCaloEcalE[1]->Fill(itHit->energy());
-      if (meCaloEcalToF[0]) meCaloEcalToF[0]->Fill(itHit->time());
-      if (meCaloEcalToF[1]) meCaloEcalToF[1]->Fill(itHit->time());
-      if (meCaloEcalPhi) meCaloEcalPhi->Fill(globalposition.phi());
-      if (meCaloEcalEta) meCaloEcalEta->Fill(globalposition.eta());
+      const GlobalPoint &globalposition = theDet->getPosition();
+
+      if (meCaloEcalE[0])
+        meCaloEcalE[0]->Fill(itHit->energy());
+      if (meCaloEcalE[1])
+        meCaloEcalE[1]->Fill(itHit->energy());
+      if (meCaloEcalToF[0])
+        meCaloEcalToF[0]->Fill(itHit->time());
+      if (meCaloEcalToF[1])
+        meCaloEcalToF[1]->Fill(itHit->time());
+      if (meCaloEcalPhi)
+        meCaloEcalPhi->Fill(globalposition.phi());
+      if (meCaloEcalEta)
+        meCaloEcalEta->Fill(globalposition.eta());
 
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "ECal PCaloHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dEcal << "," << sdEcalBrl
-	<< " || " << sdEcalFwd << "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "ECal PCaloHit " << i << " is expected to be (det,subdet) = (" << dEcal << ","
+                                    << sdEcalBrl << " || " << sdEcalFwd << "); value returned is: (" << detector << ","
+                                    << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through ECal Hits
+    }  // end detector type check
+  }    // end loop through ECal Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of ECal Hits collected:............. ";
     eventout += j;
-  }  
+  }
 
-  if (meCaloEcal[0]) meCaloEcal[0]->Fill((float)j);
-  if (meCaloEcal[1]) meCaloEcal[1]->Fill((float)j); 
+  if (meCaloEcal[0])
+    meCaloEcal[0]->Fill((float)j);
+  if (meCaloEcal[1])
+    meCaloEcal[1]->Fill((float)j);
 
   ////////////////////////////
   // Get Preshower information
   ////////////////////////////
   // extract PreShower container
   edm::Handle<edm::PCaloHitContainer> PreShContainer;
-  iEvent.getByToken(ECalESSrc_Token_,PreShContainer);
+  iEvent.getByToken(ECalESSrc_Token_, PreShContainer);
   if (!PreShContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find EcalHitsES in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find EcalHitsES in event!";
     validPresh = false;
   }
 
   if (validPresh) {
     // cycle through container
     int i = 0, j = 0;
-    for (itHit = PreShContainer->begin(); 
-	 itHit != PreShContainer->end(); ++itHit) {
-      
+    for (itHit = PreShContainer->begin(); itHit != PreShContainer->end(); ++itHit) {
       ++i;
-      
+
       // create a DetId from the detUnitId
       DetId theDetUnitId(itHit->id());
       int detector = theDetUnitId.det();
       int subdetector = theDetUnitId.subdetId();
-      
+
       // check that expected detector is returned
-      if ((detector == dEcal) && 
-	  (subdetector == sdEcalPS)) {
-	
-	// get the Cell geometry
-	auto theDet = (theCalo.getSubdetectorGeometry(theDetUnitId))->getGeometry(theDetUnitId);
-	
-	if (!theDet) {
-	  edm::LogWarning(MsgLoggerCat)
-	    << "Unable to get CaloCellGeometry from PreShContainer for Hit " 
-	    << i;
-	  continue;
-	}
-	
-	++j;
-	
-	// get the global position of the cell
-	const GlobalPoint& globalposition = theDet->getPosition();
-	
-	if (meCaloPreShE[0]) meCaloPreShE[0]->Fill(itHit->energy());
-	if (meCaloPreShE[1]) meCaloPreShE[1]->Fill(itHit->energy());
-	if (meCaloPreShToF[0]) meCaloPreShToF[0]->Fill(itHit->time());
-	if (meCaloPreShToF[1]) meCaloPreShToF[1]->Fill(itHit->time());
-	if (meCaloPreShPhi) meCaloPreShPhi->Fill(globalposition.phi());
-	if (meCaloPreShEta) meCaloPreShEta->Fill(globalposition.eta());
-	
+      if ((detector == dEcal) && (subdetector == sdEcalPS)) {
+        // get the Cell geometry
+        auto theDet = (theCalo.getSubdetectorGeometry(theDetUnitId))->getGeometry(theDetUnitId);
+
+        if (!theDet) {
+          edm::LogWarning(MsgLoggerCat) << "Unable to get CaloCellGeometry from PreShContainer for Hit " << i;
+          continue;
+        }
+
+        ++j;
+
+        // get the global position of the cell
+        const GlobalPoint &globalposition = theDet->getPosition();
+
+        if (meCaloPreShE[0])
+          meCaloPreShE[0]->Fill(itHit->energy());
+        if (meCaloPreShE[1])
+          meCaloPreShE[1]->Fill(itHit->energy());
+        if (meCaloPreShToF[0])
+          meCaloPreShToF[0]->Fill(itHit->time());
+        if (meCaloPreShToF[1])
+          meCaloPreShToF[1]->Fill(itHit->time());
+        if (meCaloPreShPhi)
+          meCaloPreShPhi->Fill(globalposition.phi());
+        if (meCaloPreShEta)
+          meCaloPreShEta->Fill(globalposition.eta());
+
       } else {
-	edm::LogWarning(MsgLoggerCat)
-	  << "PreSh PCaloHit " << i 
-	  << " is expected to be (det,subdet) = (" 
-	  << dEcal << "," << sdEcalPS
-	  << "); value returned is: ("
-	  << detector << "," << subdetector << ")";
-	continue;
-      } // end detector type check
-    } // end loop through PreShower Hits
-    
+        edm::LogWarning(MsgLoggerCat) << "PreSh PCaloHit " << i << " is expected to be (det,subdet) = (" << dEcal << ","
+                                      << sdEcalPS << "); value returned is: (" << detector << "," << subdetector << ")";
+        continue;
+      }  // end detector type check
+    }    // end loop through PreShower Hits
+
     if (verbosity > 1) {
       eventout += "\n          Number of PreSh Hits collected:............ ";
       eventout += j;
-    }  
-    
-    if (meCaloPreSh[0]) meCaloPreSh[0]->Fill((float)j);
-    if (meCaloPreSh[1]) meCaloPreSh[1]->Fill((float)j); 
+    }
+
+    if (meCaloPreSh[0])
+      meCaloPreSh[0]->Fill((float)j);
+    if (meCaloPreSh[1])
+      meCaloPreSh[1]->Fill((float)j);
   }
-  
+
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
-  
+
   return;
 }
 
-void GlobalHitsAnalyzer::fillHCal(const edm::Event& iEvent, 
-				  const edm::EventSetup& iSetup)
-{
+void GlobalHitsAnalyzer::fillHCal(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalHitsAnalyzer_fillHCal";
 
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
-  
+    eventout = "\nGathering info:";
+
   // access the calorimeter geometry
   edm::ESHandle<CaloGeometry> theCaloGeometry;
   iSetup.get<CaloGeometryRecord>().get(theCaloGeometry);
   if (!theCaloGeometry.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find CaloGeometryRecord in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find CaloGeometryRecord in event!";
     return;
   }
-  const CaloGeometry& theCalo(*theCaloGeometry);
+  const CaloGeometry &theCalo(*theCaloGeometry);
 
   edm::ESHandle<HcalDDDRecConstants> pHRNDC;
-  iSetup.get<HcalRecNumberingRecord>().get( pHRNDC );
-  const HcalDDDRecConstants* hcons = &(*pHRNDC);
+  iSetup.get<HcalRecNumberingRecord>().get(pHRNDC);
+  const HcalDDDRecConstants *hcons = &(*pHRNDC);
 
   // iterator to access containers
   edm::PCaloHitContainer::const_iterator itHit;
@@ -1858,83 +1748,79 @@ void GlobalHitsAnalyzer::fillHCal(const edm::Event& iEvent,
   ///////////////////////////////
   // extract HCal container
   edm::Handle<edm::PCaloHitContainer> HCalContainer;
-  iEvent.getByToken(HCalSrc_Token_,HCalContainer);
+  iEvent.getByToken(HCalSrc_Token_, HCalContainer);
   if (!HCalContainer.isValid()) {
-    LogDebug(MsgLoggerCat)
-      << "Unable to find HCalHits in event!";
+    LogDebug(MsgLoggerCat) << "Unable to find HCalHits in event!";
     validHcal = false;
   }
 
   if (validHcal) {
     // cycle through container
     int i = 0, j = 0;
-    for (itHit = HCalContainer->begin(); 
-	 itHit != HCalContainer->end(); ++itHit) {
-      
+    for (itHit = HCalContainer->begin(); itHit != HCalContainer->end(); ++itHit) {
       ++i;
 
-      // create a DetId from the detUnitId      
+      // create a DetId from the detUnitId
       DetId theDetUnitId;
       unsigned int id_ = itHit->id();
-      if(testNumber) theDetUnitId = HcalHitRelabeller::relabel(id_,hcons);
-      else theDetUnitId = id_;
+      if (testNumber)
+        theDetUnitId = HcalHitRelabeller::relabel(id_, hcons);
+      else
+        theDetUnitId = id_;
 
       int detector = theDetUnitId.det();
       int subdetector = theDetUnitId.subdetId();
-      
+
       // check that expected detector is returned
-      if ((detector == dHcal) && 
-	  ((subdetector == sdHcalBrl) ||
-	   (subdetector == sdHcalEC) ||
-	   (subdetector == sdHcalOut) ||
-	   (subdetector == sdHcalFwd))) {
-	
-	// get the Cell geometry
-	const HcalGeometry *theDet = dynamic_cast<const HcalGeometry*>
-	  (theCalo.getSubdetectorGeometry(theDetUnitId));
-	
-	if (!theDet) {
-	  edm::LogWarning(MsgLoggerCat)
-	    << "Unable to get HcalGeometry from HCalContainer for Hit " 
-	    << i;
-	  continue;
-	}
-	
-	++j;
-	
-	// get the global position of the cell
-	const GlobalPoint& globalposition = theDet->getPosition(theDetUnitId);
-	
-	if (meCaloHcalE[0]) meCaloHcalE[0]->Fill(itHit->energy());
-	if (meCaloHcalE[1]) meCaloHcalE[1]->Fill(itHit->energy());
-	if (meCaloHcalToF[0]) meCaloHcalToF[0]->Fill(itHit->time());
-	if (meCaloHcalToF[1]) meCaloHcalToF[1]->Fill(itHit->time());
-	if (meCaloHcalPhi) meCaloHcalPhi->Fill(globalposition.phi());
-	if (meCaloHcalEta) meCaloHcalEta->Fill(globalposition.eta());
-	
+      if ((detector == dHcal) && ((subdetector == sdHcalBrl) || (subdetector == sdHcalEC) ||
+                                  (subdetector == sdHcalOut) || (subdetector == sdHcalFwd))) {
+        // get the Cell geometry
+        const HcalGeometry *theDet = dynamic_cast<const HcalGeometry *>(theCalo.getSubdetectorGeometry(theDetUnitId));
+
+        if (!theDet) {
+          edm::LogWarning(MsgLoggerCat) << "Unable to get HcalGeometry from HCalContainer for Hit " << i;
+          continue;
+        }
+
+        ++j;
+
+        // get the global position of the cell
+        const GlobalPoint &globalposition = theDet->getPosition(theDetUnitId);
+
+        if (meCaloHcalE[0])
+          meCaloHcalE[0]->Fill(itHit->energy());
+        if (meCaloHcalE[1])
+          meCaloHcalE[1]->Fill(itHit->energy());
+        if (meCaloHcalToF[0])
+          meCaloHcalToF[0]->Fill(itHit->time());
+        if (meCaloHcalToF[1])
+          meCaloHcalToF[1]->Fill(itHit->time());
+        if (meCaloHcalPhi)
+          meCaloHcalPhi->Fill(globalposition.phi());
+        if (meCaloHcalEta)
+          meCaloHcalEta->Fill(globalposition.eta());
+
       } else {
-	edm::LogWarning(MsgLoggerCat)
-	  << "HCal PCaloHit " << i 
-	  << " is expected to be (det,subdet) = (" 
-	  << dHcal << "," << sdHcalBrl
-	  << " || " << sdHcalEC << " || " << sdHcalOut << " || " << sdHcalFwd
-	  << "); value returned is: ("
-	  << detector << "," << subdetector << ")";
-	continue;
-      } // end detector type check
-    } // end loop through HCal Hits
-    
+        edm::LogWarning(MsgLoggerCat) << "HCal PCaloHit " << i << " is expected to be (det,subdet) = (" << dHcal << ","
+                                      << sdHcalBrl << " || " << sdHcalEC << " || " << sdHcalOut << " || " << sdHcalFwd
+                                      << "); value returned is: (" << detector << "," << subdetector << ")";
+        continue;
+      }  // end detector type check
+    }    // end loop through HCal Hits
+
     if (verbosity > 1) {
       eventout += "\n          Number of HCal Hits collected:............. ";
       eventout += j;
-    }  
-    
-    if (meCaloHcal[0]) meCaloHcal[0]->Fill((float)j);
-    if (meCaloHcal[1]) meCaloHcal[1]->Fill((float)j); 
+    }
+
+    if (meCaloHcal[0])
+      meCaloHcal[0]->Fill((float)j);
+    if (meCaloHcal[1])
+      meCaloHcal[1]->Fill((float)j);
   }
 
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
-  
+
   return;
 }
diff --git a/Validation/GlobalHits/src/GlobalHitsHistogrammer.cc b/Validation/GlobalHits/src/GlobalHitsHistogrammer.cc
index ffc10776deae1..bda26186e1a12 100644
--- a/Validation/GlobalHits/src/GlobalHitsHistogrammer.cc
+++ b/Validation/GlobalHits/src/GlobalHitsHistogrammer.cc
@@ -1,5 +1,5 @@
 /** \file GlobalHitsHistogrammer.cc
- *  
+ *
  *  See header file for description of class
  *
  *  \author M. Strang SUNY-Buffalo
@@ -8,10 +8,15 @@
 #include "Validation/GlobalHits/interface/GlobalHitsHistogrammer.h"
 // #include "DQMServices/Core/interface/DQMStore.h"
 
-GlobalHitsHistogrammer::GlobalHitsHistogrammer(const edm::ParameterSet& iPSet) 
-  : fName(""), verbosity(0), frequency(0), vtxunit(0), label(""), 
-  getAllProvenances(false), printProvenanceInfo(false), count(0)
-{
+GlobalHitsHistogrammer::GlobalHitsHistogrammer(const edm::ParameterSet &iPSet)
+    : fName(""),
+      verbosity(0),
+      frequency(0),
+      vtxunit(0),
+      label(""),
+      getAllProvenances(false),
+      printProvenanceInfo(false),
+      count(0) {
   std::string MsgLoggerCat = "GlobalHitsHistogrammer_GlobalHitsHistogrammer";
 
   // get information from parameter set
@@ -21,14 +26,11 @@ GlobalHitsHistogrammer::GlobalHitsHistogrammer(const edm::ParameterSet& iPSet)
   vtxunit = iPSet.getUntrackedParameter<int>("VtxUnit");
   outputfile = iPSet.getParameter<std::string>("OutputFile");
   doOutput = iPSet.getParameter<bool>("DoOutput");
-  edm::ParameterSet m_Prov =
-    iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup");
-  getAllProvenances = 
-    m_Prov.getUntrackedParameter<bool>("GetAllProvenances");
-  printProvenanceInfo = 
-    m_Prov.getUntrackedParameter<bool>("PrintProvenanceInfo");
-
-  //get Labels to use to extract information
+  edm::ParameterSet m_Prov = iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup");
+  getAllProvenances = m_Prov.getUntrackedParameter<bool>("GetAllProvenances");
+  printProvenanceInfo = m_Prov.getUntrackedParameter<bool>("PrintProvenanceInfo");
+
+  // get Labels to use to extract information
   GlobalHitSrc_ = iPSet.getParameter<edm::InputTag>("GlobalHitSrc");
   // fix for consumes
   GlobalHitSrc_Token_ = consumes<PGlobalSimHit>(iPSet.getParameter<edm::InputTag>("GlobalHitSrc"));
@@ -39,34 +41,30 @@ GlobalHitsHistogrammer::GlobalHitsHistogrammer(const edm::ParameterSet& iPSet)
 
   // print out Parameter Set information being used
   if (verbosity >= 0) {
-    edm::LogInfo(MsgLoggerCat) 
-      << "\n===============================\n"
-      << "Initialized as EDAnalyzer with parameter values:\n"
-      << "    Name          = " << fName << "\n"
-      << "    Verbosity     = " << verbosity << "\n"
-      << "    Frequency     = " << frequency << "\n"
-      << "    VtxUnit       = " << vtxunit << "\n"
-      << "    OutputFile    = " << outputfile << "\n"
-      << "    DoOutput      = " << doOutput << "\n"
-      << "    GetProv       = " << getAllProvenances << "\n"
-      << "    PrintProv     = " << printProvenanceInfo << "\n"
-      << "    GlobalHitSrc  = " << GlobalHitSrc_.label() 
-      << ":" << GlobalHitSrc_.instance() << "\n"
-      << "===============================\n";
+    edm::LogInfo(MsgLoggerCat) << "\n===============================\n"
+                               << "Initialized as EDAnalyzer with parameter values:\n"
+                               << "    Name          = " << fName << "\n"
+                               << "    Verbosity     = " << verbosity << "\n"
+                               << "    Frequency     = " << frequency << "\n"
+                               << "    VtxUnit       = " << vtxunit << "\n"
+                               << "    OutputFile    = " << outputfile << "\n"
+                               << "    DoOutput      = " << doOutput << "\n"
+                               << "    GetProv       = " << getAllProvenances << "\n"
+                               << "    PrintProv     = " << printProvenanceInfo << "\n"
+                               << "    GlobalHitSrc  = " << GlobalHitSrc_.label() << ":" << GlobalHitSrc_.instance()
+                               << "\n"
+                               << "===============================\n";
   }
-
 }
 
-void GlobalHitsHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
-  edm::Run const &, edm::EventSetup const & ){
-
+void GlobalHitsHistogrammer::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &, edm::EventSetup const &) {
   // initialize monitor elements
   for (Int_t i = 0; i < 2; ++i) {
     meMCRGP[i] = nullptr;
     meMCG4Vtx[i] = nullptr;
     meGeantVtxX[i] = nullptr;
     meGeantVtxY[i] = nullptr;
-    meGeantVtxZ[i] = nullptr; 
+    meGeantVtxZ[i] = nullptr;
     meMCG4Trk[i] = nullptr;
     meCaloEcal[i] = nullptr;
     meCaloEcalE[i] = nullptr;
@@ -112,17 +110,17 @@ void GlobalHitsHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
   meMuonRpcBR = nullptr;
   meMuonRpcFZ = nullptr;
 
-  //create histograms
+  // create histograms
   Char_t hname[200];
   Char_t htitle[200];
 
-    // MCGeant
+  // MCGeant
   ibooker.setCurrentFolder("GlobalHitsV/MCGeant");
   sprintf(hname, "hMCRGP1");
   sprintf(htitle, "RawGenParticles");
   meMCRGP[0] = ibooker.book1D(hname, htitle, 100, 0., 5000.);
   sprintf(hname, "hMCRGP2");
-  meMCRGP[1] = ibooker.book1D(hname, htitle, 100, 0., 500.);  
+  meMCRGP[1] = ibooker.book1D(hname, htitle, 100, 0., 500.);
   for (Int_t i = 0; i < 2; ++i) {
     meMCRGP[i]->setAxisTitle("Number of Raw Generated Particles", 1);
     meMCRGP[i]->setAxisTitle("Count", 2);
@@ -132,7 +130,7 @@ void GlobalHitsHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
   sprintf(htitle, "G4 Vertices");
   meMCG4Vtx[0] = ibooker.book1D(hname, htitle, 100, 0., 50000.);
   sprintf(hname, "hMCG4Vtx2");
-  meMCG4Vtx[1] = ibooker.book1D(hname, htitle, 100, -0.5, 99.5); 
+  meMCG4Vtx[1] = ibooker.book1D(hname, htitle, 100, -0.5, 99.5);
   for (Int_t i = 0; i < 2; ++i) {
     meMCG4Vtx[i]->setAxisTitle("Number of Vertices", 1);
     meMCG4Vtx[i]->setAxisTitle("Count", 2);
@@ -142,7 +140,7 @@ void GlobalHitsHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
   sprintf(htitle, "G4 Tracks");
   meMCG4Trk[0] = ibooker.book1D(hname, htitle, 150, 0., 15000.);
   sprintf(hname, "hMCG4Trk2");
-  meMCG4Trk[1] = ibooker.book1D(hname, htitle, 150, -0.5, 99.5);    
+  meMCG4Trk[1] = ibooker.book1D(hname, htitle, 150, -0.5, 99.5);
   for (Int_t i = 0; i < 2; ++i) {
     meMCG4Trk[i]->setAxisTitle("Number of Tracks", 1);
     meMCG4Trk[i]->setAxisTitle("Count", 2);
@@ -152,7 +150,7 @@ void GlobalHitsHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
   sprintf(htitle, "Geant vertex x/micrometer");
   meGeantVtxX[0] = ibooker.book1D(hname, htitle, 100, -8000000., 8000000.);
   sprintf(hname, "hGeantVtxX2");
-  meGeantVtxX[1] = ibooker.book1D(hname, htitle, 100, -50., 50.); 
+  meGeantVtxX[1] = ibooker.book1D(hname, htitle, 100, -50., 50.);
   for (Int_t i = 0; i < 2; ++i) {
     meGeantVtxX[i]->setAxisTitle("x of Vertex (um)", 1);
     meGeantVtxX[i]->setAxisTitle("Count", 2);
@@ -162,7 +160,7 @@ void GlobalHitsHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
   sprintf(htitle, "Geant vertex y/micrometer");
   meGeantVtxY[0] = ibooker.book1D(hname, htitle, 100, -8000000, 8000000.);
   sprintf(hname, "hGeantVtxY2");
-  meGeantVtxY[1] = ibooker.book1D(hname, htitle, 100, -50., 50.); 
+  meGeantVtxY[1] = ibooker.book1D(hname, htitle, 100, -50., 50.);
   for (Int_t i = 0; i < 2; ++i) {
     meGeantVtxY[i]->setAxisTitle("y of Vertex (um)", 1);
     meGeantVtxY[i]->setAxisTitle("Count", 2);
@@ -210,7 +208,7 @@ void GlobalHitsHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
   meCaloEcalToF[0] = ibooker.book1D(hname, htitle, 100, 0., 1000.);
   sprintf(hname, "hCaloEcalToF2");
   meCaloEcalToF[1] = ibooker.book1D(hname, htitle, 100, 0., 100.);
- 
+
   for (Int_t i = 0; i < 2; ++i) {
     meCaloEcal[i]->setAxisTitle("Number of Hits", 1);
     meCaloEcal[i]->setAxisTitle("Count", 2);
@@ -311,7 +309,7 @@ void GlobalHitsHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
   meCaloHcalEta = ibooker.book1D(hname, htitle, 100, -5.5, 5.5);
   meCaloHcalEta->setAxisTitle("Eta of Hits", 1);
   meCaloHcalEta->setAxisTitle("Count", 2);
-    
+
   // SiPixels
   ibooker.setCurrentFolder("GlobalHitsV/SiPixels");
   sprintf(hname, "hTrackerPx1");
@@ -418,7 +416,7 @@ void GlobalHitsHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
   for (Int_t i = 0; i < 2; ++i) {
     meMuon[i]->setAxisTitle("Number of Muon Hits", 1);
     meMuon[i]->setAxisTitle("Count", 2);
-  }  
+  }
 
   sprintf(hname, "hMuonPhi");
   sprintf(htitle, "Muon hits phi/rad");
@@ -440,7 +438,7 @@ void GlobalHitsHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
   for (Int_t i = 0; i < 2; ++i) {
     meMuonCscToF[i]->setAxisTitle("Time of Flight of Hits (ns)", 1);
     meMuonCscToF[i]->setAxisTitle("Count", 2);
-  }  
+  }
 
   sprintf(hname, "hMuonCscZ");
   sprintf(htitle, "Muon CSC hits, Z/cm");
@@ -456,11 +454,11 @@ void GlobalHitsHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
   for (Int_t i = 0; i < 2; ++i) {
     meMuonDtToF[i]->setAxisTitle("Time of Flight of Hits (ns)", 1);
     meMuonDtToF[i]->setAxisTitle("Count", 2);
-  } 
+  }
 
   sprintf(hname, "hMuonDtR");
   sprintf(htitle, "Muon DT hits, R/cm");
-  meMuonDtR = ibooker.book1D(hname, htitle, 100, 0., 1500.); 
+  meMuonDtR = ibooker.book1D(hname, htitle, 100, 0., 1500.);
   meMuonDtR->setAxisTitle("R of Hits (cm)", 1);
   meMuonDtR->setAxisTitle("Count", 2);
 
@@ -494,18 +492,12 @@ void GlobalHitsHistogrammer::bookHistograms(DQMStore::IBooker & ibooker,
   sprintf(htitle, "Muon RPC barrel hits, R/cm");
   meMuonRpcBR = ibooker.book1D(hname, htitle, 100, 0., 1500.);
   meMuonRpcBR->setAxisTitle("R of Hits (cm)", 1);
-  meMuonRpcBR->setAxisTitle("Count", 2); 
-
+  meMuonRpcBR->setAxisTitle("Count", 2);
 }
 
-GlobalHitsHistogrammer::~GlobalHitsHistogrammer() 
-{
-
-}
+GlobalHitsHistogrammer::~GlobalHitsHistogrammer() {}
 
-void GlobalHitsHistogrammer::analyze(const edm::Event& iEvent, 
-				 const edm::EventSetup& iSetup)
-{
+void GlobalHitsHistogrammer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalHitsHistogrammer_analyze";
 
   // keep track of number of events processed
@@ -516,42 +508,37 @@ void GlobalHitsHistogrammer::analyze(const edm::Event& iEvent,
   edm::EventNumber_t nevt = iEvent.id().event();
 
   if (verbosity > 0) {
-    edm::LogInfo(MsgLoggerCat)
-      << "Processing run " << nrun << ", event " << nevt
-      << " (" << count << " events total)";
+    edm::LogInfo(MsgLoggerCat) << "Processing run " << nrun << ", event " << nevt << " (" << count << " events total)";
   } else if (verbosity == 0) {
-    if (nevt%frequency == 0 || nevt == 1) {
-      edm::LogInfo(MsgLoggerCat)
-	<< "Processing run " << nrun << ", event " << nevt
-	<< " (" << count << " events total)";
+    if (nevt % frequency == 0 || nevt == 1) {
+      edm::LogInfo(MsgLoggerCat) << "Processing run " << nrun << ", event " << nevt << " (" << count
+                                 << " events total)";
     }
   }
 
   // look at information available in the event
   if (getAllProvenances) {
-
-    std::vector<const edm::StableProvenance*> AllProv;
+    std::vector<const edm::StableProvenance *> AllProv;
     iEvent.getAllStableProvenance(AllProv);
 
     if (verbosity >= 0)
-      edm::LogInfo(MsgLoggerCat)
-	<< "Number of Provenances = " << AllProv.size();
+      edm::LogInfo(MsgLoggerCat) << "Number of Provenances = " << AllProv.size();
 
     if (printProvenanceInfo && (verbosity >= 0)) {
-      TString eventout("\nProvenance info:\n");      
+      TString eventout("\nProvenance info:\n");
 
       for (unsigned int i = 0; i < AllProv.size(); ++i) {
-	eventout += "\n       ******************************";
-	eventout += "\n       Module       : ";
-	eventout += AllProv[i]->moduleLabel();
-	eventout += "\n       ProductID    : ";
-	eventout += AllProv[i]->productID().id();
-	eventout += "\n       ClassName    : ";
-	eventout += AllProv[i]->className();
-	eventout += "\n       InstanceName : ";
-	eventout += AllProv[i]->productInstanceName();
-	eventout += "\n       BranchName   : ";
-	eventout += AllProv[i]->branchName();
+        eventout += "\n       ******************************";
+        eventout += "\n       Module       : ";
+        eventout += AllProv[i]->moduleLabel();
+        eventout += "\n       ProductID    : ";
+        eventout += AllProv[i]->productID().id();
+        eventout += "\n       ClassName    : ";
+        eventout += AllProv[i]->className();
+        eventout += "\n       InstanceName : ";
+        eventout += AllProv[i]->productInstanceName();
+        eventout += "\n       BranchName   : ";
+        eventout += AllProv[i]->branchName();
       }
       eventout += "\n       ******************************\n";
       edm::LogInfo(MsgLoggerCat) << eventout << "\n";
@@ -562,10 +549,9 @@ void GlobalHitsHistogrammer::analyze(const edm::Event& iEvent,
 
   // fill histograms
   edm::Handle<PGlobalSimHit> srcGlobalHits;
-  iEvent.getByToken(GlobalHitSrc_Token_,srcGlobalHits);
+  iEvent.getByToken(GlobalHitSrc_Token_, srcGlobalHits);
   if (!srcGlobalHits.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find PGlobalSimHit in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find PGlobalSimHit in event!";
     return;
   }
 
@@ -574,7 +560,7 @@ void GlobalHitsHistogrammer::analyze(const edm::Event& iEvent,
   nPxlHits = nPxlBrlHits + nPxlFwdHits;
   nSiBrlHits = srcGlobalHits->getnSiBrlHits();
   nSiFwdHits = srcGlobalHits->getnSiFwdHits();
-  nSiHits = nSiBrlHits + nSiFwdHits;    
+  nSiHits = nSiBrlHits + nSiFwdHits;
   nMuonDtHits = srcGlobalHits->getnMuonDtHits();
   nMuonCscHits = srcGlobalHits->getnMuonCscHits();
   nMuonRpcBrlHits = srcGlobalHits->getnMuonRpcBrlHits();
@@ -602,29 +588,27 @@ void GlobalHitsHistogrammer::analyze(const edm::Event& iEvent,
       meGeantVtxZ[j]->Fill(G4Vtx[i].z);
     }
   }
-  
+
   // get G4Track info
   std::vector<PGlobalSimHit::Trk> G4Trk = srcGlobalHits->getG4Trk();
   for (unsigned int i = 0; i < G4Trk.size(); ++i) {
     meGeantTrkPt->Fill(G4Trk[i].pt);
     meGeantTrkE->Fill(G4Trk[i].e);
   }
-  
+
   // get Ecal info
-  std::vector<PGlobalSimHit::CalHit> ECalHits = 
-    srcGlobalHits->getECalHits();
+  std::vector<PGlobalSimHit::CalHit> ECalHits = srcGlobalHits->getECalHits();
   for (unsigned int i = 0; i < ECalHits.size(); ++i) {
     for (Int_t j = 0; j < 2; ++j) {
-	meCaloEcalE[j]->Fill(ECalHits[i].e);
-	meCaloEcalToF[j]->Fill(ECalHits[i].tof);
+      meCaloEcalE[j]->Fill(ECalHits[i].e);
+      meCaloEcalToF[j]->Fill(ECalHits[i].tof);
     }
     meCaloEcalPhi->Fill(ECalHits[i].phi);
     meCaloEcalEta->Fill(ECalHits[i].eta);
   }
-  
+
   // get PreShower info
-  std::vector<PGlobalSimHit::CalHit> PreShHits = 
-    srcGlobalHits->getPreShHits();
+  std::vector<PGlobalSimHit::CalHit> PreShHits = srcGlobalHits->getPreShHits();
   for (unsigned int i = 0; i < PreShHits.size(); ++i) {
     for (Int_t j = 0; j < 2; ++j) {
       meCaloPreShE[j]->Fill(PreShHits[i].e);
@@ -633,10 +617,9 @@ void GlobalHitsHistogrammer::analyze(const edm::Event& iEvent,
     meCaloPreShPhi->Fill(PreShHits[i].phi);
     meCaloPreShEta->Fill(PreShHits[i].eta);
   }
-  
+
   // get Hcal info
-  std::vector<PGlobalSimHit::CalHit> HCalHits = 
-    srcGlobalHits->getHCalHits();
+  std::vector<PGlobalSimHit::CalHit> HCalHits = srcGlobalHits->getHCalHits();
   for (unsigned int i = 0; i < HCalHits.size(); ++i) {
     for (Int_t j = 0; j < 2; ++j) {
       meCaloHcalE[j]->Fill(HCalHits[i].e);
@@ -645,50 +628,45 @@ void GlobalHitsHistogrammer::analyze(const edm::Event& iEvent,
     meCaloHcalPhi->Fill(HCalHits[i].phi);
     meCaloHcalEta->Fill(HCalHits[i].eta);
   }
-  
+
   // get Pixel Barrel info
-  std::vector<PGlobalSimHit::BrlHit> PxlBrlHits = 
-    srcGlobalHits->getPxlBrlHits();
+  std::vector<PGlobalSimHit::BrlHit> PxlBrlHits = srcGlobalHits->getPxlBrlHits();
   for (unsigned int i = 0; i < PxlBrlHits.size(); ++i) {
     meTrackerPxPhi->Fill(PxlBrlHits[i].phi);
     meTrackerPxEta->Fill(PxlBrlHits[i].eta);
     meTrackerPxBToF->Fill(PxlBrlHits[i].tof);
     meTrackerPxBR->Fill(PxlBrlHits[i].r);
   }
-  
+
   // get Pixel Forward info
-  std::vector<PGlobalSimHit::FwdHit> PxlFwdHits = 
-    srcGlobalHits->getPxlFwdHits();
+  std::vector<PGlobalSimHit::FwdHit> PxlFwdHits = srcGlobalHits->getPxlFwdHits();
   for (unsigned int i = 0; i < PxlFwdHits.size(); ++i) {
     meTrackerPxPhi->Fill(PxlFwdHits[i].phi);
     meTrackerPxEta->Fill(PxlFwdHits[i].eta);
     meTrackerPxFToF->Fill(PxlFwdHits[i].tof);
     meTrackerPxFZ->Fill(PxlFwdHits[i].z);
   }
-  
+
   // get Strip Barrel info
-  std::vector<PGlobalSimHit::BrlHit> SiBrlHits = 
-    srcGlobalHits->getSiBrlHits();
+  std::vector<PGlobalSimHit::BrlHit> SiBrlHits = srcGlobalHits->getSiBrlHits();
   for (unsigned int i = 0; i < SiBrlHits.size(); ++i) {
     meTrackerSiPhi->Fill(SiBrlHits[i].phi);
     meTrackerSiEta->Fill(SiBrlHits[i].eta);
     meTrackerSiBToF->Fill(SiBrlHits[i].tof);
     meTrackerSiBR->Fill(SiBrlHits[i].r);
   }
-  
+
   // get Strip Forward info
-  std::vector<PGlobalSimHit::FwdHit> SiFwdHits = 
-    srcGlobalHits->getSiFwdHits();
+  std::vector<PGlobalSimHit::FwdHit> SiFwdHits = srcGlobalHits->getSiFwdHits();
   for (unsigned int i = 0; i < SiFwdHits.size(); ++i) {
     meTrackerSiPhi->Fill(SiFwdHits[i].phi);
     meTrackerSiEta->Fill(SiFwdHits[i].eta);
     meTrackerSiFToF->Fill(SiFwdHits[i].tof);
     meTrackerSiFZ->Fill(SiFwdHits[i].z);
   }
-  
+
   // get Muon CSC info
-  std::vector<PGlobalSimHit::FwdHit> MuonCscHits = 
-    srcGlobalHits->getMuonCscHits();
+  std::vector<PGlobalSimHit::FwdHit> MuonCscHits = srcGlobalHits->getMuonCscHits();
   for (unsigned int i = 0; i < MuonCscHits.size(); ++i) {
     meMuonPhi->Fill(MuonCscHits[i].phi);
     meMuonEta->Fill(MuonCscHits[i].eta);
@@ -696,11 +674,10 @@ void GlobalHitsHistogrammer::analyze(const edm::Event& iEvent,
       meMuonCscToF[j]->Fill(MuonCscHits[i].tof);
     }
     meMuonCscZ->Fill(MuonCscHits[i].z);
-  }    
-  
+  }
+
   // get Muon DT info
-  std::vector<PGlobalSimHit::BrlHit> MuonDtHits = 
-    srcGlobalHits->getMuonDtHits();
+  std::vector<PGlobalSimHit::BrlHit> MuonDtHits = srcGlobalHits->getMuonDtHits();
   for (unsigned int i = 0; i < MuonDtHits.size(); ++i) {
     meMuonPhi->Fill(MuonDtHits[i].phi);
     meMuonEta->Fill(MuonDtHits[i].eta);
@@ -709,10 +686,9 @@ void GlobalHitsHistogrammer::analyze(const edm::Event& iEvent,
     }
     meMuonDtR->Fill(MuonDtHits[i].r);
   }
-  
+
   // get Muon RPC forward info
-  std::vector<PGlobalSimHit::FwdHit> MuonRpcFwdHits = 
-    srcGlobalHits->getMuonRpcFwdHits();
+  std::vector<PGlobalSimHit::FwdHit> MuonRpcFwdHits = srcGlobalHits->getMuonRpcFwdHits();
   for (unsigned int i = 0; i < MuonRpcFwdHits.size(); ++i) {
     meMuonPhi->Fill(MuonRpcFwdHits[i].phi);
     meMuonEta->Fill(MuonRpcFwdHits[i].eta);
@@ -720,11 +696,10 @@ void GlobalHitsHistogrammer::analyze(const edm::Event& iEvent,
       meMuonRpcFToF[j]->Fill(MuonRpcFwdHits[i].tof);
     }
     meMuonRpcFZ->Fill(MuonRpcFwdHits[i].z);
-  }    
-  
+  }
+
   // get Muon RPC barrel info
-  std::vector<PGlobalSimHit::BrlHit> MuonRpcBrlHits = 
-    srcGlobalHits->getMuonRpcBrlHits();
+  std::vector<PGlobalSimHit::BrlHit> MuonRpcBrlHits = srcGlobalHits->getMuonRpcBrlHits();
   for (unsigned int i = 0; i < MuonRpcBrlHits.size(); ++i) {
     meMuonPhi->Fill(MuonRpcBrlHits[i].phi);
     meMuonEta->Fill(MuonRpcBrlHits[i].eta);
@@ -732,9 +707,7 @@ void GlobalHitsHistogrammer::analyze(const edm::Event& iEvent,
       meMuonRpcBToF[j]->Fill(MuonRpcBrlHits[i].tof);
     }
     meMuonRpcBR->Fill(MuonRpcBrlHits[i].r);
-  }   
-  
+  }
+
   return;
 }
-
-
diff --git a/Validation/GlobalHits/src/GlobalHitsProdHist.cc b/Validation/GlobalHits/src/GlobalHitsProdHist.cc
index 63cb9131aeb30..ad1124bb2209f 100644
--- a/Validation/GlobalHits/src/GlobalHitsProdHist.cc
+++ b/Validation/GlobalHits/src/GlobalHitsProdHist.cc
@@ -1,21 +1,24 @@
 /** \file GlobalHitsProdHist.cc
- *  
+ *
  *  See header file for description of class
  *
  *  \author M. Strang SUNY-Buffalo
  */
 
-#include "Validation/GlobalHits/interface/GlobalHitsProdHist.h"
-#include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h"
+#include "Geometry/Records/interface/CaloGeometryRecord.h"
+#include "Validation/GlobalHits/interface/GlobalHitsProdHist.h"
 
-GlobalHitsProdHist::GlobalHitsProdHist(const edm::ParameterSet& iPSet) :
-  fName(""), verbosity(0), frequency(0), vtxunit(0), 
-  getAllProvenances(false), printProvenanceInfo(false),
-  G4VtxSrc_Token_( consumes<edm::SimVertexContainer>((iPSet.getParameter<edm::InputTag>("G4VtxSrc"))) ),
-  G4TrkSrc_Token_( consumes<edm::SimTrackContainer>(iPSet.getParameter<edm::InputTag>("G4TrkSrc")) ),
-  count(0)
-{
+GlobalHitsProdHist::GlobalHitsProdHist(const edm::ParameterSet &iPSet)
+    : fName(""),
+      verbosity(0),
+      frequency(0),
+      vtxunit(0),
+      getAllProvenances(false),
+      printProvenanceInfo(false),
+      G4VtxSrc_Token_(consumes<edm::SimVertexContainer>((iPSet.getParameter<edm::InputTag>("G4VtxSrc")))),
+      G4TrkSrc_Token_(consumes<edm::SimTrackContainer>(iPSet.getParameter<edm::InputTag>("G4TrkSrc"))),
+      count(0) {
   std::string MsgLoggerCat = "GlobalHitsProdHist_GlobalHitsProdHist";
 
   // get information from parameter set
@@ -23,14 +26,11 @@ GlobalHitsProdHist::GlobalHitsProdHist(const edm::ParameterSet& iPSet) :
   verbosity = iPSet.getUntrackedParameter<int>("Verbosity");
   frequency = iPSet.getUntrackedParameter<int>("Frequency");
   vtxunit = iPSet.getUntrackedParameter<int>("VtxUnit");
-  edm::ParameterSet m_Prov =
-    iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup");
-  getAllProvenances = 
-    m_Prov.getUntrackedParameter<bool>("GetAllProvenances");
-  printProvenanceInfo = 
-    m_Prov.getUntrackedParameter<bool>("PrintProvenanceInfo");
-
-  //get Labels to use to extract information
+  edm::ParameterSet m_Prov = iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup");
+  getAllProvenances = m_Prov.getUntrackedParameter<bool>("GetAllProvenances");
+  printProvenanceInfo = m_Prov.getUntrackedParameter<bool>("PrintProvenanceInfo");
+
+  // get Labels to use to extract information
   PxlBrlLowSrc_ = iPSet.getParameter<edm::InputTag>("PxlBrlLowSrc");
   PxlBrlHighSrc_ = iPSet.getParameter<edm::InputTag>("PxlBrlHighSrc");
   PxlFwdLowSrc_ = iPSet.getParameter<edm::InputTag>("PxlFwdLowSrc");
@@ -61,180 +61,161 @@ GlobalHitsProdHist::GlobalHitsProdHist(const edm::ParameterSet& iPSet) :
 
   // print out Parameter Set information being used
   if (verbosity >= 0) {
-    edm::LogInfo(MsgLoggerCat) 
-      << "\n===============================\n"
-      << "Initialized as EDProducer with parameter values:\n"
-      << "    Name          = " << fName << "\n"
-      << "    Verbosity     = " << verbosity << "\n"
-      << "    Frequency     = " << frequency << "\n"
-      << "    VtxUnit       = " << vtxunit << "\n"
-      << "    GetProv       = " << getAllProvenances << "\n"
-      << "    PrintProv     = " << printProvenanceInfo << "\n"
-      << "    PxlBrlLowSrc  = " << PxlBrlLowSrc_.label() 
-      << ":" << PxlBrlLowSrc_.instance() << "\n"
-      << "    PxlBrlHighSrc = " << PxlBrlHighSrc_.label() 
-      << ":" << PxlBrlHighSrc_.instance() << "\n"
-      << "    PxlFwdLowSrc  = " << PxlFwdLowSrc_.label() 
-      << ":" << PxlBrlLowSrc_.instance() << "\n"
-      << "    PxlFwdHighSrc = " << PxlFwdHighSrc_.label() 
-      << ":" << PxlBrlHighSrc_.instance() << "\n"
-      << "    SiTIBLowSrc   = " << SiTIBLowSrc_.label() 
-      << ":" << SiTIBLowSrc_.instance() << "\n"
-      << "    SiTIBHighSrc  = " << SiTIBHighSrc_.label() 
-      << ":" << SiTIBHighSrc_.instance() << "\n"
-      << "    SiTOBLowSrc   = " << SiTOBLowSrc_.label() 
-      << ":" << SiTOBLowSrc_.instance() << "\n"
-      << "    SiTOBHighSrc  = " << SiTOBHighSrc_.label() 
-      << ":" << SiTOBHighSrc_.instance() << "\n"
-      << "    SiTIDLowSrc   = " << SiTIDLowSrc_.label() 
-      << ":" << SiTIDLowSrc_.instance() << "\n"
-      << "    SiTIDHighSrc  = " << SiTIDHighSrc_.label() 
-      << ":" << SiTIDHighSrc_.instance() << "\n"
-      << "    SiTECLowSrc   = " << SiTECLowSrc_.label() 
-      << ":" << SiTECLowSrc_.instance() << "\n"
-      << "    SiTECHighSrc  = " << SiTECHighSrc_.label() 
-      << ":" << SiTECHighSrc_.instance() << "\n"
-      << "    MuonCscSrc    = " << MuonCscSrc_.label() 
-      << ":" << MuonCscSrc_.instance() << "\n"
-      << "    MuonDtSrc     = " << MuonDtSrc_.label() 
-      << ":" << MuonDtSrc_.instance() << "\n"
-      << "    MuonRpcSrc    = " << MuonRpcSrc_.label() 
-      << ":" << MuonRpcSrc_.instance() << "\n"
-      << "    ECalEBSrc     = " << ECalEBSrc_.label() 
-      << ":" << ECalEBSrc_.instance() << "\n"
-      << "    ECalEESrc     = " << ECalEESrc_.label() 
-      << ":" << ECalEESrc_.instance() << "\n"
-      << "    ECalESSrc     = " << ECalESSrc_.label() 
-      << ":" << ECalESSrc_.instance() << "\n"
-      << "    HCalSrc       = " << HCalSrc_.label() 
-      << ":" << HCalSrc_.instance() << "\n"
-      << "===============================\n";
-  }
-
-  //create histograms
+    edm::LogInfo(MsgLoggerCat)
+        << "\n===============================\n"
+        << "Initialized as EDProducer with parameter values:\n"
+        << "    Name          = " << fName << "\n"
+        << "    Verbosity     = " << verbosity << "\n"
+        << "    Frequency     = " << frequency << "\n"
+        << "    VtxUnit       = " << vtxunit << "\n"
+        << "    GetProv       = " << getAllProvenances << "\n"
+        << "    PrintProv     = " << printProvenanceInfo << "\n"
+        << "    PxlBrlLowSrc  = " << PxlBrlLowSrc_.label() << ":" << PxlBrlLowSrc_.instance() << "\n"
+        << "    PxlBrlHighSrc = " << PxlBrlHighSrc_.label() << ":" << PxlBrlHighSrc_.instance() << "\n"
+        << "    PxlFwdLowSrc  = " << PxlFwdLowSrc_.label() << ":" << PxlBrlLowSrc_.instance() << "\n"
+        << "    PxlFwdHighSrc = " << PxlFwdHighSrc_.label() << ":" << PxlBrlHighSrc_.instance() << "\n"
+        << "    SiTIBLowSrc   = " << SiTIBLowSrc_.label() << ":" << SiTIBLowSrc_.instance() << "\n"
+        << "    SiTIBHighSrc  = " << SiTIBHighSrc_.label() << ":" << SiTIBHighSrc_.instance() << "\n"
+        << "    SiTOBLowSrc   = " << SiTOBLowSrc_.label() << ":" << SiTOBLowSrc_.instance() << "\n"
+        << "    SiTOBHighSrc  = " << SiTOBHighSrc_.label() << ":" << SiTOBHighSrc_.instance() << "\n"
+        << "    SiTIDLowSrc   = " << SiTIDLowSrc_.label() << ":" << SiTIDLowSrc_.instance() << "\n"
+        << "    SiTIDHighSrc  = " << SiTIDHighSrc_.label() << ":" << SiTIDHighSrc_.instance() << "\n"
+        << "    SiTECLowSrc   = " << SiTECLowSrc_.label() << ":" << SiTECLowSrc_.instance() << "\n"
+        << "    SiTECHighSrc  = " << SiTECHighSrc_.label() << ":" << SiTECHighSrc_.instance() << "\n"
+        << "    MuonCscSrc    = " << MuonCscSrc_.label() << ":" << MuonCscSrc_.instance() << "\n"
+        << "    MuonDtSrc     = " << MuonDtSrc_.label() << ":" << MuonDtSrc_.instance() << "\n"
+        << "    MuonRpcSrc    = " << MuonRpcSrc_.label() << ":" << MuonRpcSrc_.instance() << "\n"
+        << "    ECalEBSrc     = " << ECalEBSrc_.label() << ":" << ECalEBSrc_.instance() << "\n"
+        << "    ECalEESrc     = " << ECalEESrc_.label() << ":" << ECalEESrc_.instance() << "\n"
+        << "    ECalESSrc     = " << ECalESSrc_.label() << ":" << ECalESSrc_.instance() << "\n"
+        << "    HCalSrc       = " << HCalSrc_.label() << ":" << HCalSrc_.instance() << "\n"
+        << "===============================\n";
+  }
+
+  // create histograms
   Char_t hname[200];
   Char_t htitle[200];
- 
+
   // MCGeant
-  sprintf(hname,"hMCRGP1");
+  sprintf(hname, "hMCRGP1");
   histName_.push_back(hname);
-  sprintf(htitle,"RawGenParticles");
-  hMCRGP[0] = new TH1F(hname,htitle,100,0.,5000.);
-  sprintf(hname,"hMCRGP2");
+  sprintf(htitle, "RawGenParticles");
+  hMCRGP[0] = new TH1F(hname, htitle, 100, 0., 5000.);
+  sprintf(hname, "hMCRGP2");
   histName_.push_back(hname);
-  hMCRGP[1] = new TH1F(hname,htitle,100,0.,500.);  
+  hMCRGP[1] = new TH1F(hname, htitle, 100, 0., 500.);
   for (Int_t i = 0; i < 2; ++i) {
     hMCRGP[i]->GetXaxis()->SetTitle("Number of Raw Generated Particles");
     hMCRGP[i]->GetYaxis()->SetTitle("Count");
     histMap_[hMCRGP[i]->GetName()] = hMCRGP[i];
   }
-  
-  sprintf(hname,"hMCG4Vtx1");
+
+  sprintf(hname, "hMCG4Vtx1");
   histName_.push_back(hname);
-  sprintf(htitle,"G4 Vertices");
-  hMCG4Vtx[0] = new TH1F(hname,htitle,100,0.,50000.);
-  sprintf(hname,"hMCG4Vtx2");
+  sprintf(htitle, "G4 Vertices");
+  hMCG4Vtx[0] = new TH1F(hname, htitle, 100, 0., 50000.);
+  sprintf(hname, "hMCG4Vtx2");
   histName_.push_back(hname);
-  hMCG4Vtx[1] = new TH1F(hname,htitle,100,-0.5,99.5); 
+  hMCG4Vtx[1] = new TH1F(hname, htitle, 100, -0.5, 99.5);
   for (Int_t i = 0; i < 2; ++i) {
     hMCG4Vtx[i]->GetXaxis()->SetTitle("Number of Vertices");
     hMCG4Vtx[i]->GetYaxis()->SetTitle("Count");
     histMap_[hMCG4Vtx[i]->GetName()] = hMCG4Vtx[i];
   }
-  
-  sprintf(hname,"hMCG4Trk1");
+
+  sprintf(hname, "hMCG4Trk1");
   histName_.push_back(hname);
-  sprintf(htitle,"G4 Tracks");
-  hMCG4Trk[0] = new TH1F(hname,htitle,150,0.,15000.);
-  sprintf(hname,"hMCG4Trk2");
+  sprintf(htitle, "G4 Tracks");
+  hMCG4Trk[0] = new TH1F(hname, htitle, 150, 0., 15000.);
+  sprintf(hname, "hMCG4Trk2");
   histName_.push_back(hname);
-  hMCG4Trk[1] = new TH1F(hname,htitle,150,-0.5,99.5);    
+  hMCG4Trk[1] = new TH1F(hname, htitle, 150, -0.5, 99.5);
   for (Int_t i = 0; i < 2; ++i) {
     hMCG4Trk[i]->GetXaxis()->SetTitle("Number of Tracks");
     hMCG4Trk[i]->GetYaxis()->SetTitle("Count");
     histMap_[hMCG4Trk[i]->GetName()] = hMCG4Trk[i];
   }
-  
-  sprintf(hname,"hGeantVtxX1");
+
+  sprintf(hname, "hGeantVtxX1");
   histName_.push_back(hname);
-  sprintf(htitle,"Geant vertex x/micrometer");
-  hGeantVtxX[0] = new TH1F(hname,htitle,100,-8000000.,8000000.);
-  sprintf(hname,"hGeantVtxX2");
+  sprintf(htitle, "Geant vertex x/micrometer");
+  hGeantVtxX[0] = new TH1F(hname, htitle, 100, -8000000., 8000000.);
+  sprintf(hname, "hGeantVtxX2");
   histName_.push_back(hname);
-  hGeantVtxX[1] = new TH1F(hname,htitle,100,-50.,50.); 
+  hGeantVtxX[1] = new TH1F(hname, htitle, 100, -50., 50.);
   for (Int_t i = 0; i < 2; ++i) {
     hGeantVtxX[i]->GetXaxis()->SetTitle("x of Vertex (um)");
     hGeantVtxX[i]->GetYaxis()->SetTitle("Count");
     histMap_[hGeantVtxX[i]->GetName()] = hGeantVtxX[i];
   }
-  
-  sprintf(hname,"hGeantVtxY1");
+
+  sprintf(hname, "hGeantVtxY1");
   histName_.push_back(hname);
-  sprintf(htitle,"Geant vertex y/micrometer");
-  hGeantVtxY[0] = new TH1F(hname,htitle,100,-8000000,8000000.);
-  sprintf(hname,"hGeantVtxY2");
+  sprintf(htitle, "Geant vertex y/micrometer");
+  hGeantVtxY[0] = new TH1F(hname, htitle, 100, -8000000, 8000000.);
+  sprintf(hname, "hGeantVtxY2");
   histName_.push_back(hname);
-  hGeantVtxY[1] = new TH1F(hname,htitle,100,-50.,50.); 
+  hGeantVtxY[1] = new TH1F(hname, htitle, 100, -50., 50.);
   for (Int_t i = 0; i < 2; ++i) {
     hGeantVtxY[i]->GetXaxis()->SetTitle("y of Vertex (um)");
     hGeantVtxY[i]->GetYaxis()->SetTitle("Count");
     histMap_[hGeantVtxY[i]->GetName()] = hGeantVtxY[i];
   }
-  
-  sprintf(hname,"hGeantVtxZ1");
+
+  sprintf(hname, "hGeantVtxZ1");
   histName_.push_back(hname);
-  sprintf(htitle,"Geant vertex z/millimeter");
-  hGeantVtxZ[0] = new TH1F(hname,htitle,100,-11000.,11000.);
-  sprintf(hname,"hGeantVtxZ2");
+  sprintf(htitle, "Geant vertex z/millimeter");
+  hGeantVtxZ[0] = new TH1F(hname, htitle, 100, -11000., 11000.);
+  sprintf(hname, "hGeantVtxZ2");
   histName_.push_back(hname);
-  hGeantVtxZ[1] = new TH1F(hname,htitle,100,-250.,250.);
+  hGeantVtxZ[1] = new TH1F(hname, htitle, 100, -250., 250.);
   for (Int_t i = 0; i < 2; ++i) {
     hGeantVtxZ[i]->GetXaxis()->SetTitle("z of Vertex (mm)");
     hGeantVtxZ[i]->GetYaxis()->SetTitle("Count");
     histMap_[hGeantVtxZ[i]->GetName()] = hGeantVtxZ[i];
   }
-  
-  sprintf(hname,"hGeantTrkPt");
+
+  sprintf(hname, "hGeantTrkPt");
   histName_.push_back(hname);
-  sprintf(htitle,"Geant track pt/GeV");
-  hGeantTrkPt = new TH1F(hname,htitle,100,0.,200.);
+  sprintf(htitle, "Geant track pt/GeV");
+  hGeantTrkPt = new TH1F(hname, htitle, 100, 0., 200.);
   hGeantTrkPt->GetXaxis()->SetTitle("pT of Track (GeV)");
   hGeantTrkPt->GetYaxis()->SetTitle("Count");
   histMap_[hGeantTrkPt->GetName()] = hGeantTrkPt;
-  
-  sprintf(hname,"hGeantTrkE");
+
+  sprintf(hname, "hGeantTrkE");
   histName_.push_back(hname);
-  sprintf(htitle,"Geant track E/GeV");
-  hGeantTrkE = new TH1F(hname,htitle,100,0.,5000.);
+  sprintf(htitle, "Geant track E/GeV");
+  hGeantTrkE = new TH1F(hname, htitle, 100, 0., 5000.);
   hGeantTrkE->GetXaxis()->SetTitle("E of Track (GeV)");
   hGeantTrkE->GetYaxis()->SetTitle("Count");
   histMap_[hGeantTrkE->GetName()] = hGeantTrkE;
- 
+
   // ECal
-  sprintf(hname,"hCaloEcal1");
+  sprintf(hname, "hCaloEcal1");
   histName_.push_back(hname);
-  sprintf(htitle,"Ecal hits");
-  hCaloEcal[0] = new TH1F(hname,htitle,100,0.,10000.);
-  sprintf(hname,"hCaloEcal2");
+  sprintf(htitle, "Ecal hits");
+  hCaloEcal[0] = new TH1F(hname, htitle, 100, 0., 10000.);
+  sprintf(hname, "hCaloEcal2");
   histName_.push_back(hname);
-  hCaloEcal[1] = new TH1F(hname,htitle,100,-0.5,99.5);
-  
-  sprintf(hname,"hCaloEcalE1");
+  hCaloEcal[1] = new TH1F(hname, htitle, 100, -0.5, 99.5);
+
+  sprintf(hname, "hCaloEcalE1");
   histName_.push_back(hname);
-  sprintf(htitle,"Ecal hits, energy/GeV");
-  hCaloEcalE[0] = new TH1F(hname,htitle,100,0.,10.);
-  sprintf(hname,"hCaloEcalE2");
+  sprintf(htitle, "Ecal hits, energy/GeV");
+  hCaloEcalE[0] = new TH1F(hname, htitle, 100, 0., 10.);
+  sprintf(hname, "hCaloEcalE2");
   histName_.push_back(hname);
-  hCaloEcalE[1] = new TH1F(hname,htitle,100,0.,0.1);
-  
-  sprintf(hname,"hCaloEcalToF1");
+  hCaloEcalE[1] = new TH1F(hname, htitle, 100, 0., 0.1);
+
+  sprintf(hname, "hCaloEcalToF1");
   histName_.push_back(hname);
-  sprintf(htitle,"Ecal hits, ToF/ns");
-  hCaloEcalToF[0] = new TH1F(hname,htitle,100,0.,1000.);
-  sprintf(hname,"hCaloEcalToF2");
+  sprintf(htitle, "Ecal hits, ToF/ns");
+  hCaloEcalToF[0] = new TH1F(hname, htitle, 100, 0., 1000.);
+  sprintf(hname, "hCaloEcalToF2");
   histName_.push_back(hname);
-  hCaloEcalToF[1] = new TH1F(hname,htitle,100,0.,100.);
-  
+  hCaloEcalToF[1] = new TH1F(hname, htitle, 100, 0., 100.);
+
   for (Int_t i = 0; i < 2; ++i) {
     hCaloEcal[i]->GetXaxis()->SetTitle("Number of Hits");
     hCaloEcal[i]->GetYaxis()->SetTitle("Count");
@@ -246,47 +227,47 @@ GlobalHitsProdHist::GlobalHitsProdHist(const edm::ParameterSet& iPSet) :
     hCaloEcalToF[i]->GetYaxis()->SetTitle("Count");
     histMap_[hCaloEcalToF[i]->GetName()] = hCaloEcalToF[i];
   }
-  
-  sprintf(hname,"hCaloEcalPhi");
+
+  sprintf(hname, "hCaloEcalPhi");
   histName_.push_back(hname);
-  sprintf(htitle,"Ecal hits, phi/rad");
-  hCaloEcalPhi = new TH1F(hname,htitle,100,-3.2,3.2);
+  sprintf(htitle, "Ecal hits, phi/rad");
+  hCaloEcalPhi = new TH1F(hname, htitle, 100, -3.2, 3.2);
   hCaloEcalPhi->GetXaxis()->SetTitle("Phi of Hits (rad)");
   hCaloEcalPhi->GetYaxis()->SetTitle("Count");
   histMap_[hCaloEcalPhi->GetName()] = hCaloEcalPhi;
-  
-  sprintf(hname,"hCaloEcalEta");
+
+  sprintf(hname, "hCaloEcalEta");
   histName_.push_back(hname);
-  sprintf(htitle,"Ecal hits, eta");
-  hCaloEcalEta = new TH1F(hname,htitle,100,-5.5,5.5);
+  sprintf(htitle, "Ecal hits, eta");
+  hCaloEcalEta = new TH1F(hname, htitle, 100, -5.5, 5.5);
   hCaloEcalEta->GetXaxis()->SetTitle("Eta of Hits");
   hCaloEcalEta->GetYaxis()->SetTitle("Count");
   histMap_[hCaloEcalEta->GetName()] = hCaloEcalEta;
 
-  sprintf(hname,"hCaloPreSh1");
+  sprintf(hname, "hCaloPreSh1");
   histName_.push_back(hname);
-  sprintf(htitle,"PreSh hits");
-  hCaloPreSh[0] = new TH1F(hname,htitle,100,0.,10000.);
-  sprintf(hname,"hCaloPreSh2");
+  sprintf(htitle, "PreSh hits");
+  hCaloPreSh[0] = new TH1F(hname, htitle, 100, 0., 10000.);
+  sprintf(hname, "hCaloPreSh2");
   histName_.push_back(hname);
-  hCaloPreSh[1] = new TH1F(hname,htitle,100,-0.5,99.5);
-  
-  sprintf(hname,"hCaloPreShE1");
+  hCaloPreSh[1] = new TH1F(hname, htitle, 100, -0.5, 99.5);
+
+  sprintf(hname, "hCaloPreShE1");
   histName_.push_back(hname);
-  sprintf(htitle,"PreSh hits, energy/GeV");
-  hCaloPreShE[0] = new TH1F(hname,htitle,100,0.,10.);
-  sprintf(hname,"hCaloPreShE2");
+  sprintf(htitle, "PreSh hits, energy/GeV");
+  hCaloPreShE[0] = new TH1F(hname, htitle, 100, 0., 10.);
+  sprintf(hname, "hCaloPreShE2");
   histName_.push_back(hname);
-  hCaloPreShE[1] = new TH1F(hname,htitle,100,0.,0.1);
+  hCaloPreShE[1] = new TH1F(hname, htitle, 100, 0., 0.1);
 
-  sprintf(hname,"hCaloPreShToF1");
+  sprintf(hname, "hCaloPreShToF1");
   histName_.push_back(hname);
-  sprintf(htitle,"PreSh hits, ToF/ns");
-  hCaloPreShToF[0] = new TH1F(hname,htitle,100,0.,1000.);
-  sprintf(hname,"hCaloPreShToF2");
+  sprintf(htitle, "PreSh hits, ToF/ns");
+  hCaloPreShToF[0] = new TH1F(hname, htitle, 100, 0., 1000.);
+  sprintf(hname, "hCaloPreShToF2");
   histName_.push_back(hname);
-  hCaloPreShToF[1] = new TH1F(hname,htitle,100,0.,100.);
-  
+  hCaloPreShToF[1] = new TH1F(hname, htitle, 100, 0., 100.);
+
   for (Int_t i = 0; i < 2; ++i) {
     hCaloPreSh[i]->GetXaxis()->SetTitle("Number of Hits");
     hCaloPreSh[i]->GetYaxis()->SetTitle("Count");
@@ -298,48 +279,48 @@ GlobalHitsProdHist::GlobalHitsProdHist(const edm::ParameterSet& iPSet) :
     hCaloPreShToF[i]->GetYaxis()->SetTitle("Count");
     histMap_[hCaloPreShToF[i]->GetName()] = hCaloPreShToF[i];
   }
-  
-  sprintf(hname,"hCaloPreShPhi");
+
+  sprintf(hname, "hCaloPreShPhi");
   histName_.push_back(hname);
-  sprintf(htitle,"PreSh hits, phi/rad");
-  hCaloPreShPhi = new TH1F(hname,htitle,100,-3.2,3.2);
+  sprintf(htitle, "PreSh hits, phi/rad");
+  hCaloPreShPhi = new TH1F(hname, htitle, 100, -3.2, 3.2);
   hCaloPreShPhi->GetXaxis()->SetTitle("Phi of Hits (rad)");
   hCaloPreShPhi->GetYaxis()->SetTitle("Count");
   histMap_[hCaloPreShPhi->GetName()] = hCaloPreShPhi;
 
-  sprintf(hname,"hCaloPreShEta");
+  sprintf(hname, "hCaloPreShEta");
   histName_.push_back(hname);
-  sprintf(htitle,"PreSh hits, eta");
-  hCaloPreShEta = new TH1F(hname,htitle,100,-5.5,5.5);
+  sprintf(htitle, "PreSh hits, eta");
+  hCaloPreShEta = new TH1F(hname, htitle, 100, -5.5, 5.5);
   hCaloPreShEta->GetXaxis()->SetTitle("Eta of Hits");
   hCaloPreShEta->GetYaxis()->SetTitle("Count");
-  histMap_[hCaloPreShEta->GetName()] = hCaloPreShEta;  
+  histMap_[hCaloPreShEta->GetName()] = hCaloPreShEta;
 
   // Hcal
-  sprintf(hname,"hCaloHcal1");
+  sprintf(hname, "hCaloHcal1");
   histName_.push_back(hname);
-  sprintf(htitle,"Hcal hits");
-  hCaloHcal[0] = new TH1F(hname,htitle,100,0.,10000.);
-  sprintf(hname,"hCaloHcal2");
+  sprintf(htitle, "Hcal hits");
+  hCaloHcal[0] = new TH1F(hname, htitle, 100, 0., 10000.);
+  sprintf(hname, "hCaloHcal2");
   histName_.push_back(hname);
-  hCaloHcal[1] = new TH1F(hname,htitle,100,-0.5,99.5);
-  
-  sprintf(hname,"hCaloHcalE1");
+  hCaloHcal[1] = new TH1F(hname, htitle, 100, -0.5, 99.5);
+
+  sprintf(hname, "hCaloHcalE1");
   histName_.push_back(hname);
-  sprintf(htitle,"Hcal hits, energy/GeV");
-  hCaloHcalE[0] = new TH1F(hname,htitle,100,0.,10.);
-  sprintf(hname,"hCaloHcalE2");
+  sprintf(htitle, "Hcal hits, energy/GeV");
+  hCaloHcalE[0] = new TH1F(hname, htitle, 100, 0., 10.);
+  sprintf(hname, "hCaloHcalE2");
   histName_.push_back(hname);
-  hCaloHcalE[1] = new TH1F(hname,htitle,100,0.,0.1);
-  
-  sprintf(hname,"hCaloHcalToF1");
+  hCaloHcalE[1] = new TH1F(hname, htitle, 100, 0., 0.1);
+
+  sprintf(hname, "hCaloHcalToF1");
   histName_.push_back(hname);
-  sprintf(htitle,"Hcal hits, ToF/ns");
-  hCaloHcalToF[0] = new TH1F(hname,htitle,100,0.,1000.);
-  sprintf(hname,"hCaloHcalToF2");
+  sprintf(htitle, "Hcal hits, ToF/ns");
+  hCaloHcalToF[0] = new TH1F(hname, htitle, 100, 0., 1000.);
+  sprintf(hname, "hCaloHcalToF2");
   histName_.push_back(hname);
-  hCaloHcalToF[1] = new TH1F(hname,htitle,100,0.,100.);
-  
+  hCaloHcalToF[1] = new TH1F(hname, htitle, 100, 0., 100.);
+
   for (Int_t i = 0; i < 2; ++i) {
     hCaloHcal[i]->GetXaxis()->SetTitle("Number of Hits");
     hCaloHcal[i]->GetYaxis()->SetTitle("Count");
@@ -351,258 +332,258 @@ GlobalHitsProdHist::GlobalHitsProdHist(const edm::ParameterSet& iPSet) :
     hCaloHcalToF[i]->GetYaxis()->SetTitle("Count");
     histMap_[hCaloHcalToF[i]->GetName()] = hCaloHcalToF[i];
   }
-  
-  sprintf(hname,"hCaloHcalPhi");
+
+  sprintf(hname, "hCaloHcalPhi");
   histName_.push_back(hname);
-  sprintf(htitle,"Hcal hits, phi/rad");
-  hCaloHcalPhi = new TH1F(hname,htitle,100,-3.2,3.2);
+  sprintf(htitle, "Hcal hits, phi/rad");
+  hCaloHcalPhi = new TH1F(hname, htitle, 100, -3.2, 3.2);
   hCaloHcalPhi->GetXaxis()->SetTitle("Phi of Hits (rad)");
   hCaloHcalPhi->GetYaxis()->SetTitle("Count");
   histMap_[hCaloHcalPhi->GetName()] = hCaloHcalPhi;
-  
-  sprintf(hname,"hCaloHcalEta");
+
+  sprintf(hname, "hCaloHcalEta");
   histName_.push_back(hname);
-  sprintf(htitle,"Hcal hits, eta");
-  hCaloHcalEta = new TH1F(hname,htitle,100,-5.5,5.5);
+  sprintf(htitle, "Hcal hits, eta");
+  hCaloHcalEta = new TH1F(hname, htitle, 100, -5.5, 5.5);
   hCaloHcalEta->GetXaxis()->SetTitle("Eta of Hits");
   hCaloHcalEta->GetYaxis()->SetTitle("Count");
   histMap_[hCaloHcalEta->GetName()] = hCaloHcalEta;
 
   // tracker
-  sprintf(hname,"hTrackerPx1");
+  sprintf(hname, "hTrackerPx1");
   histName_.push_back(hname);
-  sprintf(htitle,"Pixel hits");
-  hTrackerPx[0] = new TH1F(hname,htitle,100,0.,10000.);
-  sprintf(hname,"hTrackerPx2");
+  sprintf(htitle, "Pixel hits");
+  hTrackerPx[0] = new TH1F(hname, htitle, 100, 0., 10000.);
+  sprintf(hname, "hTrackerPx2");
   histName_.push_back(hname);
-  hTrackerPx[1] = new TH1F(hname,htitle,100,-0.5,99.5);
+  hTrackerPx[1] = new TH1F(hname, htitle, 100, -0.5, 99.5);
   for (Int_t i = 0; i < 2; ++i) {
     hTrackerPx[i]->GetXaxis()->SetTitle("Number of Pixel Hits");
     hTrackerPx[i]->GetYaxis()->SetTitle("Count");
     histMap_[hTrackerPx[i]->GetName()] = hTrackerPx[i];
   }
-  
-  sprintf(hname,"hTrackerPxPhi");
+
+  sprintf(hname, "hTrackerPxPhi");
   histName_.push_back(hname);
-  sprintf(htitle,"Pixel hits phi/rad");
-  hTrackerPxPhi = new TH1F(hname,htitle,100,-3.2,3.2);
+  sprintf(htitle, "Pixel hits phi/rad");
+  hTrackerPxPhi = new TH1F(hname, htitle, 100, -3.2, 3.2);
   hTrackerPxPhi->GetXaxis()->SetTitle("Phi of Hits (rad)");
   hTrackerPxPhi->GetYaxis()->SetTitle("Count");
   histMap_[hTrackerPxPhi->GetName()] = hTrackerPxPhi;
 
-  sprintf(hname,"hTrackerPxEta");
+  sprintf(hname, "hTrackerPxEta");
   histName_.push_back(hname);
-  sprintf(htitle,"Pixel hits eta");
-  hTrackerPxEta = new TH1F(hname,htitle,100,-3.5,3.5);
+  sprintf(htitle, "Pixel hits eta");
+  hTrackerPxEta = new TH1F(hname, htitle, 100, -3.5, 3.5);
   hTrackerPxEta->GetXaxis()->SetTitle("Eta of Hits");
   hTrackerPxEta->GetYaxis()->SetTitle("Count");
   histMap_[hTrackerPxEta->GetName()] = hTrackerPxEta;
 
-  sprintf(hname,"hTrackerPxBToF");
+  sprintf(hname, "hTrackerPxBToF");
   histName_.push_back(hname);
-  sprintf(htitle,"Pixel barrel hits, ToF/ns");
-  hTrackerPxBToF = new TH1F(hname,htitle,100,0.,40.);
+  sprintf(htitle, "Pixel barrel hits, ToF/ns");
+  hTrackerPxBToF = new TH1F(hname, htitle, 100, 0., 40.);
   hTrackerPxBToF->GetXaxis()->SetTitle("Time of Flight of Hits (ns)");
   hTrackerPxBToF->GetYaxis()->SetTitle("Count");
   histMap_[hTrackerPxBToF->GetName()] = hTrackerPxBToF;
 
-  sprintf(hname,"hTrackerPxBR");
+  sprintf(hname, "hTrackerPxBR");
   histName_.push_back(hname);
-  sprintf(htitle,"Pixel barrel hits, R/cm");
-  hTrackerPxBR = new TH1F(hname,htitle,100,0.,50.);
+  sprintf(htitle, "Pixel barrel hits, R/cm");
+  hTrackerPxBR = new TH1F(hname, htitle, 100, 0., 50.);
   hTrackerPxBR->GetXaxis()->SetTitle("R of Hits (cm)");
   hTrackerPxBR->GetYaxis()->SetTitle("Count");
   histMap_[hTrackerPxBR->GetName()] = hTrackerPxBR;
 
-  sprintf(hname,"hTrackerPxFToF");
+  sprintf(hname, "hTrackerPxFToF");
   histName_.push_back(hname);
-  sprintf(htitle,"Pixel forward hits, ToF/ns");
-  hTrackerPxFToF = new TH1F(hname,htitle,100,0.,50.);
+  sprintf(htitle, "Pixel forward hits, ToF/ns");
+  hTrackerPxFToF = new TH1F(hname, htitle, 100, 0., 50.);
   hTrackerPxFToF->GetXaxis()->SetTitle("Time of Flight of Hits (ns)");
   hTrackerPxFToF->GetYaxis()->SetTitle("Count");
   histMap_[hTrackerPxFToF->GetName()] = hTrackerPxFToF;
 
-  sprintf(hname,"hTrackerPxFZ");
+  sprintf(hname, "hTrackerPxFZ");
   histName_.push_back(hname);
-  sprintf(htitle,"Pixel forward hits, Z/cm");
-  hTrackerPxFZ = new TH1F(hname,htitle,200,-100.,100.);
+  sprintf(htitle, "Pixel forward hits, Z/cm");
+  hTrackerPxFZ = new TH1F(hname, htitle, 200, -100., 100.);
   hTrackerPxFZ->GetXaxis()->SetTitle("Z of Hits (cm)");
   hTrackerPxFZ->GetYaxis()->SetTitle("Count");
   histMap_[hTrackerPxFZ->GetName()] = hTrackerPxFZ;
-  
-  sprintf(hname,"hTrackerSi1");
+
+  sprintf(hname, "hTrackerSi1");
   histName_.push_back(hname);
-  sprintf(htitle,"Silicon hits");
-  hTrackerSi[0] = new TH1F(hname,htitle,100,0.,10000.);
-  sprintf(hname,"hTrackerSi2");
+  sprintf(htitle, "Silicon hits");
+  hTrackerSi[0] = new TH1F(hname, htitle, 100, 0., 10000.);
+  sprintf(hname, "hTrackerSi2");
   histName_.push_back(hname);
-  hTrackerSi[1] = new TH1F(hname,htitle,100,-0.5,99.5);
-  for (Int_t i = 0; i < 2; ++i) { 
+  hTrackerSi[1] = new TH1F(hname, htitle, 100, -0.5, 99.5);
+  for (Int_t i = 0; i < 2; ++i) {
     hTrackerSi[i]->GetXaxis()->SetTitle("Number of Silicon Hits");
     hTrackerSi[i]->GetYaxis()->SetTitle("Count");
     histMap_[hTrackerSi[i]->GetName()] = hTrackerSi[i];
   }
-  
-  sprintf(hname,"hTrackerSiPhi");
+
+  sprintf(hname, "hTrackerSiPhi");
   histName_.push_back(hname);
-  sprintf(htitle,"Silicon hits phi/rad");
-  hTrackerSiPhi = new TH1F(hname,htitle,100,-3.2,3.2);
+  sprintf(htitle, "Silicon hits phi/rad");
+  hTrackerSiPhi = new TH1F(hname, htitle, 100, -3.2, 3.2);
   hTrackerSiPhi->GetXaxis()->SetTitle("Phi of Hits (rad)");
   hTrackerSiPhi->GetYaxis()->SetTitle("Count");
   histMap_[hTrackerSiPhi->GetName()] = hTrackerSiPhi;
 
-  sprintf(hname,"hTrackerSiEta");
+  sprintf(hname, "hTrackerSiEta");
   histName_.push_back(hname);
-  sprintf(htitle,"Silicon hits eta");
-  hTrackerSiEta = new TH1F(hname,htitle,100,-3.5,3.5);
+  sprintf(htitle, "Silicon hits eta");
+  hTrackerSiEta = new TH1F(hname, htitle, 100, -3.5, 3.5);
   hTrackerSiEta->GetXaxis()->SetTitle("Eta of Hits");
   hTrackerSiEta->GetYaxis()->SetTitle("Count");
   histMap_[hTrackerSiEta->GetName()] = hTrackerSiEta;
-  
-  sprintf(hname,"hTrackerSiBToF");
+
+  sprintf(hname, "hTrackerSiBToF");
   histName_.push_back(hname);
-  sprintf(htitle,"Silicon barrel hits, ToF/ns");
-  hTrackerSiBToF = new TH1F(hname,htitle,100,0.,50.);
+  sprintf(htitle, "Silicon barrel hits, ToF/ns");
+  hTrackerSiBToF = new TH1F(hname, htitle, 100, 0., 50.);
   hTrackerSiBToF->GetXaxis()->SetTitle("Time of Flight of Hits (ns)");
   hTrackerSiBToF->GetYaxis()->SetTitle("Count");
   histMap_[hTrackerSiBToF->GetName()] = hTrackerSiBToF;
 
-  sprintf(hname,"hTrackerSiBR");
+  sprintf(hname, "hTrackerSiBR");
   histName_.push_back(hname);
-  sprintf(htitle,"Silicon barrel hits, R/cm");
-  hTrackerSiBR = new TH1F(hname,htitle,100,0.,200.);
+  sprintf(htitle, "Silicon barrel hits, R/cm");
+  hTrackerSiBR = new TH1F(hname, htitle, 100, 0., 200.);
   hTrackerSiBR->GetXaxis()->SetTitle("R of Hits (cm)");
   hTrackerSiBR->GetYaxis()->SetTitle("Count");
   histMap_[hTrackerSiBR->GetName()] = hTrackerSiBR;
-  
-  sprintf(hname,"hTrackerSiFToF");
+
+  sprintf(hname, "hTrackerSiFToF");
   histName_.push_back(hname);
-  sprintf(htitle,"Silicon forward hits, ToF/ns");
-  hTrackerSiFToF = new TH1F(hname,htitle,100,0.,75.);
+  sprintf(htitle, "Silicon forward hits, ToF/ns");
+  hTrackerSiFToF = new TH1F(hname, htitle, 100, 0., 75.);
   hTrackerSiFToF->GetXaxis()->SetTitle("Time of Flight of Hits (ns)");
   hTrackerSiFToF->GetYaxis()->SetTitle("Count");
   histMap_[hTrackerSiFToF->GetName()] = hTrackerSiFToF;
 
-  sprintf(hname,"hTrackerSiFZ");
+  sprintf(hname, "hTrackerSiFZ");
   histName_.push_back(hname);
-  sprintf(htitle,"Silicon forward hits, Z/cm");
-  hTrackerSiFZ = new TH1F(hname,htitle,200,-300.,300.);
+  sprintf(htitle, "Silicon forward hits, Z/cm");
+  hTrackerSiFZ = new TH1F(hname, htitle, 200, -300., 300.);
   hTrackerSiFZ->GetXaxis()->SetTitle("Z of Hits (cm)");
   hTrackerSiFZ->GetYaxis()->SetTitle("Count");
-  histMap_[hTrackerSiFZ->GetName()] = hTrackerSiFZ;  
+  histMap_[hTrackerSiFZ->GetName()] = hTrackerSiFZ;
 
   // muon
-  sprintf(hname,"hMuon1");
+  sprintf(hname, "hMuon1");
   histName_.push_back(hname);
-  sprintf(htitle,"Muon hits");
-  hMuon[0] = new TH1F(hname,htitle,100,0.,10000.);
-  sprintf(hname,"hMuon2");
+  sprintf(htitle, "Muon hits");
+  hMuon[0] = new TH1F(hname, htitle, 100, 0., 10000.);
+  sprintf(hname, "hMuon2");
   histName_.push_back(hname);
-  hMuon[1] = new TH1F(hname,htitle,100,-0.5,99.5);
-  for (Int_t i = 0; i < 2; ++i) { 
+  hMuon[1] = new TH1F(hname, htitle, 100, -0.5, 99.5);
+  for (Int_t i = 0; i < 2; ++i) {
     hMuon[i]->GetXaxis()->SetTitle("Number of Muon Hits");
     hMuon[i]->GetYaxis()->SetTitle("Count");
     histMap_[hMuon[i]->GetName()] = hMuon[i];
-  }  
-  
-  sprintf(hname,"hMuonPhi");
+  }
+
+  sprintf(hname, "hMuonPhi");
   histName_.push_back(hname);
-  sprintf(htitle,"Muon hits phi/rad");
-  hMuonPhi = new TH1F(hname,htitle,100,-3.2,3.2);
+  sprintf(htitle, "Muon hits phi/rad");
+  hMuonPhi = new TH1F(hname, htitle, 100, -3.2, 3.2);
   hMuonPhi->GetXaxis()->SetTitle("Phi of Hits (rad)");
   hMuonPhi->GetYaxis()->SetTitle("Count");
   histMap_[hMuonPhi->GetName()] = hMuonPhi;
 
-  sprintf(hname,"hMuonEta");
+  sprintf(hname, "hMuonEta");
   histName_.push_back(hname);
-  sprintf(htitle,"Muon hits eta");
-  hMuonEta = new TH1F(hname,htitle,100,-3.5,3.5);
+  sprintf(htitle, "Muon hits eta");
+  hMuonEta = new TH1F(hname, htitle, 100, -3.5, 3.5);
   hMuonEta->GetXaxis()->SetTitle("Eta of Hits");
   hMuonEta->GetYaxis()->SetTitle("Count");
   histMap_[hMuonEta->GetName()] = hMuonEta;
 
-  sprintf(hname,"hMuonCscToF1");
+  sprintf(hname, "hMuonCscToF1");
   histName_.push_back(hname);
-  sprintf(htitle,"Muon CSC hits, ToF/ns");
-  hMuonCscToF[0] = new TH1F(hname,htitle,100,0.,250.);
-  sprintf(hname,"hMuonCscToF2");
+  sprintf(htitle, "Muon CSC hits, ToF/ns");
+  hMuonCscToF[0] = new TH1F(hname, htitle, 100, 0., 250.);
+  sprintf(hname, "hMuonCscToF2");
   histName_.push_back(hname);
-  hMuonCscToF[1] = new TH1F(hname,htitle,100,0.,50.);
-  for (Int_t i = 0; i < 2; ++i) {   
+  hMuonCscToF[1] = new TH1F(hname, htitle, 100, 0., 50.);
+  for (Int_t i = 0; i < 2; ++i) {
     hMuonCscToF[i]->GetXaxis()->SetTitle("Time of Flight of Hits (ns)");
     hMuonCscToF[i]->GetYaxis()->SetTitle("Count");
     histMap_[hMuonCscToF[i]->GetName()] = hMuonCscToF[i];
-  }  
-  
-  sprintf(hname,"hMuonCscZ");
+  }
+
+  sprintf(hname, "hMuonCscZ");
   histName_.push_back(hname);
-  sprintf(htitle,"Muon CSC hits, Z/cm");
-  hMuonCscZ = new TH1F(hname,htitle,200,-1500.,1500.);
+  sprintf(htitle, "Muon CSC hits, Z/cm");
+  hMuonCscZ = new TH1F(hname, htitle, 200, -1500., 1500.);
   hMuonCscZ->GetXaxis()->SetTitle("Z of Hits (cm)");
   hMuonCscZ->GetYaxis()->SetTitle("Count");
   histMap_[hMuonCscZ->GetName()] = hMuonCscZ;
-  
-  sprintf(hname,"hMuonDtToF1");
+
+  sprintf(hname, "hMuonDtToF1");
   histName_.push_back(hname);
-  sprintf(htitle,"Muon DT hits, ToF/ns");
-  hMuonDtToF[0] = new TH1F(hname,htitle,100,0.,250.);
-  sprintf(hname,"hMuonDtToF2");
+  sprintf(htitle, "Muon DT hits, ToF/ns");
+  hMuonDtToF[0] = new TH1F(hname, htitle, 100, 0., 250.);
+  sprintf(hname, "hMuonDtToF2");
   histName_.push_back(hname);
-  hMuonDtToF[1] = new TH1F(hname,htitle,100,0.,50.);
-  for (Int_t i = 0; i < 2; ++i) {   
+  hMuonDtToF[1] = new TH1F(hname, htitle, 100, 0., 50.);
+  for (Int_t i = 0; i < 2; ++i) {
     hMuonDtToF[i]->GetXaxis()->SetTitle("Time of Flight of Hits (ns)");
     hMuonDtToF[i]->GetYaxis()->SetTitle("Count");
     histMap_[hMuonDtToF[i]->GetName()] = hMuonDtToF[i];
-  } 
-  
-  sprintf(hname,"hMuonDtR");
+  }
+
+  sprintf(hname, "hMuonDtR");
   histName_.push_back(hname);
-  sprintf(htitle,"Muon DT hits, R/cm");
-  hMuonDtR = new TH1F(hname,htitle,100,0.,1500.); 
+  sprintf(htitle, "Muon DT hits, R/cm");
+  hMuonDtR = new TH1F(hname, htitle, 100, 0., 1500.);
   hMuonDtR->GetXaxis()->SetTitle("R of Hits (cm)");
   hMuonDtR->GetYaxis()->SetTitle("Count");
   histMap_[hMuonDtR->GetName()] = hMuonDtR;
 
-  sprintf(hname,"hMuonRpcFToF1");
+  sprintf(hname, "hMuonRpcFToF1");
   histName_.push_back(hname);
-  sprintf(htitle,"Muon RPC forward hits, ToF/ns");
-  hMuonRpcFToF[0] = new TH1F(hname,htitle,100,0.,250.);
-  sprintf(hname,"hMuonRpcFToF2");
+  sprintf(htitle, "Muon RPC forward hits, ToF/ns");
+  hMuonRpcFToF[0] = new TH1F(hname, htitle, 100, 0., 250.);
+  sprintf(hname, "hMuonRpcFToF2");
   histName_.push_back(hname);
-  hMuonRpcFToF[1] = new TH1F(hname,htitle,100,0.,50.);
-  for (Int_t i = 0; i < 2; ++i) {   
+  hMuonRpcFToF[1] = new TH1F(hname, htitle, 100, 0., 50.);
+  for (Int_t i = 0; i < 2; ++i) {
     hMuonRpcFToF[i]->GetXaxis()->SetTitle("Time of Flight of Hits (ns)");
     hMuonRpcFToF[i]->GetYaxis()->SetTitle("Count");
     histMap_[hMuonRpcFToF[i]->GetName()] = hMuonRpcFToF[i];
-  }  
-  
-  sprintf(hname,"hMuonRpcFZ");
+  }
+
+  sprintf(hname, "hMuonRpcFZ");
   histName_.push_back(hname);
-  sprintf(htitle,"Muon RPC forward hits, Z/cm");
-  hMuonRpcFZ = new TH1F(hname,htitle,201,-1500.,1500.);
+  sprintf(htitle, "Muon RPC forward hits, Z/cm");
+  hMuonRpcFZ = new TH1F(hname, htitle, 201, -1500., 1500.);
   hMuonRpcFZ->GetXaxis()->SetTitle("Z of Hits (cm)");
   hMuonRpcFZ->GetYaxis()->SetTitle("Count");
   histMap_[hMuonRpcFZ->GetName()] = hMuonRpcFZ;
 
-  sprintf(hname,"hMuonRpcBToF1");
+  sprintf(hname, "hMuonRpcBToF1");
   histName_.push_back(hname);
-  sprintf(htitle,"Muon RPC barrel hits, ToF/ns");
-  hMuonRpcBToF[0] = new TH1F(hname,htitle,100,0.,250.);
-  sprintf(hname,"hMuonRpcBToF2");
+  sprintf(htitle, "Muon RPC barrel hits, ToF/ns");
+  hMuonRpcBToF[0] = new TH1F(hname, htitle, 100, 0., 250.);
+  sprintf(hname, "hMuonRpcBToF2");
   histName_.push_back(hname);
-  hMuonRpcBToF[1] = new TH1F(hname,htitle,100,0.,50.);
-  for (Int_t i = 0; i < 2; ++i) {   
+  hMuonRpcBToF[1] = new TH1F(hname, htitle, 100, 0., 50.);
+  for (Int_t i = 0; i < 2; ++i) {
     hMuonRpcBToF[i]->GetXaxis()->SetTitle("Time of Flight of Hits (ns)");
     hMuonRpcBToF[i]->GetYaxis()->SetTitle("Count");
     histMap_[hMuonRpcBToF[i]->GetName()] = hMuonRpcBToF[i];
   }
-  
-  sprintf(hname,"hMuonRpcBR");
+
+  sprintf(hname, "hMuonRpcBR");
   histName_.push_back(hname);
-  sprintf(htitle,"Muon RPC barrel hits, R/cm");
-  hMuonRpcBR = new TH1F(hname,htitle,100,0.,1500.);
+  sprintf(htitle, "Muon RPC barrel hits, R/cm");
+  hMuonRpcBR = new TH1F(hname, htitle, 100, 0., 1500.);
   hMuonRpcBR->GetXaxis()->SetTitle("R of Hits (cm)");
-  hMuonRpcBR->GetYaxis()->SetTitle("Count"); 
+  hMuonRpcBR->GetYaxis()->SetTitle("Count");
   histMap_[hMuonRpcBR->GetName()] = hMuonRpcBR;
 
   // create persistent objects
@@ -611,27 +592,18 @@ GlobalHitsProdHist::GlobalHitsProdHist(const edm::ParameterSet& iPSet) :
   }
 }
 
-GlobalHitsProdHist::~GlobalHitsProdHist() 
-{
-}
+GlobalHitsProdHist::~GlobalHitsProdHist() {}
 
-void GlobalHitsProdHist::beginJob()
-{
-  return;
-}
+void GlobalHitsProdHist::beginJob() { return; }
 
-void GlobalHitsProdHist::endJob()
-{
+void GlobalHitsProdHist::endJob() {
   std::string MsgLoggerCat = "GlobalHitsProdHist_endJob";
   if (verbosity >= 0)
-    edm::LogInfo(MsgLoggerCat) 
-      << "Terminating having processed " << count << " events.";
+    edm::LogInfo(MsgLoggerCat) << "Terminating having processed " << count << " events.";
   return;
 }
 
-void GlobalHitsProdHist::produce(edm::Event& iEvent, 
-				 const edm::EventSetup& iSetup)
-{
+void GlobalHitsProdHist::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalHitsProdHist_produce";
 
   // keep track of number of events processed
@@ -642,42 +614,37 @@ void GlobalHitsProdHist::produce(edm::Event& iEvent,
   edm::EventNumber_t nevt = iEvent.id().event();
 
   if (verbosity > 0) {
-    edm::LogInfo(MsgLoggerCat)
-      << "Processing run " << nrun << ", event " << nevt
-      << " (" << count << " events total)";
+    edm::LogInfo(MsgLoggerCat) << "Processing run " << nrun << ", event " << nevt << " (" << count << " events total)";
   } else if (verbosity == 0) {
-    if (nevt%frequency == 0 || nevt == 1) {
-      edm::LogInfo(MsgLoggerCat)
-	<< "Processing run " << nrun << ", event " << nevt
-	<< " (" << count << " events total)";
+    if (nevt % frequency == 0 || nevt == 1) {
+      edm::LogInfo(MsgLoggerCat) << "Processing run " << nrun << ", event " << nevt << " (" << count
+                                 << " events total)";
     }
   }
 
   // look at information available in the event
   if (getAllProvenances) {
-
-    std::vector<const edm::StableProvenance*> AllProv;
+    std::vector<const edm::StableProvenance *> AllProv;
     iEvent.getAllStableProvenance(AllProv);
 
     if (verbosity >= 0)
-      edm::LogInfo(MsgLoggerCat)
-	<< "Number of Provenances = " << AllProv.size();
+      edm::LogInfo(MsgLoggerCat) << "Number of Provenances = " << AllProv.size();
 
     if (printProvenanceInfo && (verbosity >= 0)) {
-      TString eventout("\nProvenance info:\n");      
+      TString eventout("\nProvenance info:\n");
 
       for (unsigned int i = 0; i < AllProv.size(); ++i) {
-	eventout += "\n       ******************************";
-	eventout += "\n       Module       : ";
-	eventout += AllProv[i]->moduleLabel();
-	eventout += "\n       ProductID    : ";
-	eventout += AllProv[i]->productID().id();
-	eventout += "\n       ClassName    : ";
-	eventout += AllProv[i]->className();
-	eventout += "\n       InstanceName : ";
-	eventout += AllProv[i]->productInstanceName();
-	eventout += "\n       BranchName   : ";
-	eventout += AllProv[i]->branchName();
+        eventout += "\n       ******************************";
+        eventout += "\n       Module       : ";
+        eventout += AllProv[i]->moduleLabel();
+        eventout += "\n       ProductID    : ";
+        eventout += AllProv[i]->productID().id();
+        eventout += "\n       ClassName    : ";
+        eventout += AllProv[i]->className();
+        eventout += "\n       InstanceName : ";
+        eventout += AllProv[i]->productInstanceName();
+        eventout += "\n       BranchName   : ";
+        eventout += AllProv[i]->branchName();
       }
       eventout += "\n       ******************************\n";
       edm::LogInfo(MsgLoggerCat) << eventout << "\n";
@@ -687,10 +654,10 @@ void GlobalHitsProdHist::produce(edm::Event& iEvent,
   }
 
   // call fill functions
-  //gather G4MC information from event
+  // gather G4MC information from event
   fillG4MC(iEvent);
   // gather Tracker information from event
-  fillTrk(iEvent,iSetup);
+  fillTrk(iEvent, iSetup);
   // gather muon information from event
   fillMuon(iEvent, iSetup);
   // gather Ecal information from event
@@ -699,15 +666,12 @@ void GlobalHitsProdHist::produce(edm::Event& iEvent,
   fillHCal(iEvent, iSetup);
 
   if (verbosity > 0)
-    edm::LogInfo (MsgLoggerCat)
-      << "Done gathering data from event.";
+    edm::LogInfo(MsgLoggerCat) << "Done gathering data from event.";
 
   return;
 }
 
-void GlobalHitsProdHist::endRunProduce(edm::Run& iRun, const edm::EventSetup& iSetup)
-{
-
+void GlobalHitsProdHist::endRunProduce(edm::Run &iRun, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalHitsProdHist_endRun";
 
   TString eventout;
@@ -715,11 +679,10 @@ void GlobalHitsProdHist::endRunProduce(edm::Run& iRun, const edm::EventSetup& iS
   bool warning = false;
 
   if (verbosity > 0)
-    edm::LogInfo (MsgLoggerCat)
-      << "\nStoring histograms.";
+    edm::LogInfo(MsgLoggerCat) << "\nStoring histograms.";
 
   // store persistent objects
-  std::map<std::string, TH1F*>::iterator iter;
+  std::map<std::string, TH1F *>::iterator iter;
   for (std::size_t i = 0; i < histName_.size(); ++i) {
     iter = histMap_.find(histName_[i]);
     if (iter != histMap_.end()) {
@@ -741,11 +704,9 @@ void GlobalHitsProdHist::endRunProduce(edm::Run& iRun, const edm::EventSetup& iS
 }
 
 //==================fill and store functions================================
-void GlobalHitsProdHist::fillG4MC(edm::Event& iEvent)
-{
-
+void GlobalHitsProdHist::fillG4MC(edm::Event &iEvent) {
   std::string MsgLoggerCat = "GlobalHitsProdHist_fillG4MC";
- 
+
   TString eventout;
   if (verbosity > 0)
     eventout = "\nGathering info:";
@@ -754,7 +715,7 @@ void GlobalHitsProdHist::fillG4MC(edm::Event& iEvent)
   // get MC information
   /////////////////////
   edm::Handle<edm::HepMCProduct> HepMCEvt;
-  std::vector<edm::Handle<edm::HepMCProduct> > AllHepMCEvt;
+  std::vector<edm::Handle<edm::HepMCProduct>> AllHepMCEvt;
   iEvent.getManyByType(AllHepMCEvt);
 
   // loop through products and extract VtxSmearing if available. Any of them
@@ -766,72 +727,77 @@ void GlobalHitsProdHist::fillG4MC(edm::Event& iEvent)
   }
 
   if (!HepMCEvt.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find HepMCProduct in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find HepMCProduct in event!";
     return;
   } else {
     eventout += "\n          Using HepMCProduct: ";
     eventout += (HepMCEvt.provenance()->branchDescription()).moduleLabel();
   }
-  const HepMC::GenEvent* MCEvt = HepMCEvt->GetEvent();
+  const HepMC::GenEvent *MCEvt = HepMCEvt->GetEvent();
   nRawGenPart = MCEvt->particles_size();
 
   if (verbosity > 1) {
     eventout += "\n          Number of Raw Particles collected:......... ";
     eventout += nRawGenPart;
-  }  
+  }
 
-  if (hMCRGP[0]) hMCRGP[0]->Fill((float)nRawGenPart);
-  if (hMCRGP[1]) hMCRGP[1]->Fill((float)nRawGenPart);  
+  if (hMCRGP[0])
+    hMCRGP[0]->Fill((float)nRawGenPart);
+  if (hMCRGP[1])
+    hMCRGP[1]->Fill((float)nRawGenPart);
 
   ////////////////////////////
   // get G4Vertex information
   ////////////////////////////
   // convert unit stored in SimVertex to mm
   float unit = 0.;
-  if (vtxunit == 0) unit = 1.;  // already in mm
-  if (vtxunit == 1) unit = 10.; // stored in cm, convert to mm
+  if (vtxunit == 0)
+    unit = 1.;  // already in mm
+  if (vtxunit == 1)
+    unit = 10.;  // stored in cm, convert to mm
 
   edm::Handle<edm::SimVertexContainer> G4VtxContainer;
   iEvent.getByToken(G4VtxSrc_Token_, G4VtxContainer);
   if (!G4VtxContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find SimVertex in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find SimVertex in event!";
     return;
   }
   int i = 0;
   edm::SimVertexContainer::const_iterator itVtx;
-  for (itVtx = G4VtxContainer->begin(); itVtx != G4VtxContainer->end(); 
-       ++itVtx) {
-    
+  for (itVtx = G4VtxContainer->begin(); itVtx != G4VtxContainer->end(); ++itVtx) {
     ++i;
 
-    const math::XYZTLorentzVector G4Vtx1(itVtx->position().x(),
-					 itVtx->position().y(),
-					 itVtx->position().z(),
-					 itVtx->position().e());
+    const math::XYZTLorentzVector G4Vtx1(
+        itVtx->position().x(), itVtx->position().y(), itVtx->position().z(), itVtx->position().e());
 
     double G4Vtx[4];
     G4Vtx1.GetCoordinates(G4Vtx);
 
-    if (hGeantVtxX[0]) hGeantVtxX[0]->Fill((G4Vtx[0]*unit)/micrometer);
-    if (hGeantVtxX[1]) hGeantVtxX[1]->Fill((G4Vtx[0]*unit)/micrometer);
-    
-    if (hGeantVtxY[0]) hGeantVtxY[0]->Fill((G4Vtx[1]*unit)/micrometer);
-    if (hGeantVtxY[1]) hGeantVtxY[1]->Fill((G4Vtx[1]*unit)/micrometer);
-    
-    if (hGeantVtxZ[0]) hGeantVtxZ[0]->Fill((G4Vtx[2]*unit)/millimeter);
-    if (hGeantVtxZ[1]) hGeantVtxZ[1]->Fill((G4Vtx[2]*unit)/millimeter); 
-    
+    if (hGeantVtxX[0])
+      hGeantVtxX[0]->Fill((G4Vtx[0] * unit) / micrometer);
+    if (hGeantVtxX[1])
+      hGeantVtxX[1]->Fill((G4Vtx[0] * unit) / micrometer);
+
+    if (hGeantVtxY[0])
+      hGeantVtxY[0]->Fill((G4Vtx[1] * unit) / micrometer);
+    if (hGeantVtxY[1])
+      hGeantVtxY[1]->Fill((G4Vtx[1] * unit) / micrometer);
+
+    if (hGeantVtxZ[0])
+      hGeantVtxZ[0]->Fill((G4Vtx[2] * unit) / millimeter);
+    if (hGeantVtxZ[1])
+      hGeantVtxZ[1]->Fill((G4Vtx[2] * unit) / millimeter);
   }
 
   if (verbosity > 1) {
     eventout += "\n          Number of G4Vertices collected:............ ";
     eventout += i;
-  }  
+  }
 
-  if (hMCG4Vtx[0]) hMCG4Vtx[0]->Fill((float)i);
-  if (hMCG4Vtx[1]) hMCG4Vtx[1]->Fill((float)i);  
+  if (hMCG4Vtx[0])
+    hMCG4Vtx[0]->Fill((float)i);
+  if (hMCG4Vtx[1])
+    hMCG4Vtx[1]->Fill((float)i);
 
   ///////////////////////////
   // get G4Track information
@@ -839,64 +805,58 @@ void GlobalHitsProdHist::fillG4MC(edm::Event& iEvent)
   edm::Handle<edm::SimTrackContainer> G4TrkContainer;
   iEvent.getByToken(G4TrkSrc_Token_, G4TrkContainer);
   if (!G4TrkContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find SimTrack in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find SimTrack in event!";
     return;
   }
   i = 0;
   edm::SimTrackContainer::const_iterator itTrk;
-  for (itTrk = G4TrkContainer->begin(); itTrk != G4TrkContainer->end(); 
-       ++itTrk) {
-
+  for (itTrk = G4TrkContainer->begin(); itTrk != G4TrkContainer->end(); ++itTrk) {
     ++i;
 
-    const math::XYZTLorentzVector G4Trk1(itTrk->momentum().x(),
-					 itTrk->momentum().y(),
-					 itTrk->momentum().z(),
-					 itTrk->momentum().e());
+    const math::XYZTLorentzVector G4Trk1(
+        itTrk->momentum().x(), itTrk->momentum().y(), itTrk->momentum().z(), itTrk->momentum().e());
     double G4Trk[4];
     G4Trk1.GetCoordinates(G4Trk);
 
-    if (hGeantTrkPt) hGeantTrkPt->
-			Fill(sqrt(G4Trk[0]*G4Trk[0]+G4Trk[1]*G4Trk[1]));
-    if (hGeantTrkE) hGeantTrkE->Fill(G4Trk[3]);
-  } 
+    if (hGeantTrkPt)
+      hGeantTrkPt->Fill(sqrt(G4Trk[0] * G4Trk[0] + G4Trk[1] * G4Trk[1]));
+    if (hGeantTrkE)
+      hGeantTrkE->Fill(G4Trk[3]);
+  }
 
   if (verbosity > 1) {
     eventout += "\n          Number of G4Tracks collected:.............. ";
     eventout += i;
-  }  
+  }
 
-  if (hMCG4Trk[0]) hMCG4Trk[0]->Fill((float)i);
-  if (hMCG4Trk[1]) hMCG4Trk[1]->Fill((float)i); 
+  if (hMCG4Trk[0])
+    hMCG4Trk[0]->Fill((float)i);
+  if (hMCG4Trk[1])
+    hMCG4Trk[1]->Fill((float)i);
 
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
-    
+
   return;
 }
 
-void GlobalHitsProdHist::fillTrk(edm::Event& iEvent, 
-				 const edm::EventSetup& iSetup)
-{
-
+void GlobalHitsProdHist::fillTrk(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   nPxlHits = 0;
   std::string MsgLoggerCat = "GlobalHitsProdHist_fillTrk";
 
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
-  
+    eventout = "\nGathering info:";
+
   // access the tracker geometry
   edm::ESHandle<TrackerGeometry> theTrackerGeometry;
   iSetup.get<TrackerDigiGeometryRecord>().get(theTrackerGeometry);
   if (!theTrackerGeometry.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerDigiGeometryRecord in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerDigiGeometryRecord in event!";
     return;
   }
-  const TrackerGeometry& theTracker(*theTrackerGeometry);
-    
+  const TrackerGeometry &theTracker(*theTrackerGeometry);
+
   // iterator to access containers
   edm::PSimHitContainer::const_iterator itHit;
 
@@ -906,30 +866,25 @@ void GlobalHitsProdHist::fillTrk(edm::Event& iEvent,
   edm::PSimHitContainer thePxlBrlHits;
   // extract low container
   edm::Handle<edm::PSimHitContainer> PxlBrlLowContainer;
-  iEvent.getByToken(PxlBrlLowSrc_Token_,PxlBrlLowContainer);
+  iEvent.getByToken(PxlBrlLowSrc_Token_, PxlBrlLowContainer);
   if (!PxlBrlLowContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsPixelBarrelLowTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsPixelBarrelLowTof in event!";
     return;
   }
   // extract high container
   edm::Handle<edm::PSimHitContainer> PxlBrlHighContainer;
-  iEvent.getByToken(PxlBrlHighSrc_Token_,PxlBrlHighContainer);
+  iEvent.getByToken(PxlBrlHighSrc_Token_, PxlBrlHighContainer);
   if (!PxlBrlHighContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsPixelBarrelHighTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsPixelBarrelHighTof in event!";
     return;
   }
   // place both containers into new container
-  thePxlBrlHits.insert(thePxlBrlHits.end(),PxlBrlLowContainer->begin(),
-		       PxlBrlLowContainer->end());
-  thePxlBrlHits.insert(thePxlBrlHits.end(),PxlBrlHighContainer->begin(),
-		       PxlBrlHighContainer->end());
+  thePxlBrlHits.insert(thePxlBrlHits.end(), PxlBrlLowContainer->begin(), PxlBrlLowContainer->end());
+  thePxlBrlHits.insert(thePxlBrlHits.end(), PxlBrlHighContainer->begin(), PxlBrlHighContainer->end());
 
   // cycle through new container
   int i = 0, j = 0;
   for (itHit = thePxlBrlHits.begin(); itHit != thePxlBrlHits.end(); ++itHit) {
-
     ++i;
 
     // create a DetId from the detUnitId
@@ -939,45 +894,40 @@ void GlobalHitsProdHist::fillTrk(edm::Event& iEvent,
 
     // check that expected detector is returned
     if ((detector == dTrk) && (subdetector == sdPxlBrl)) {
-
       // get the GeomDetUnit from the geometry using theDetUnitID
       const GeomDetUnit *theDet = theTracker.idToDetUnit(theDetUnitId);
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get GeomDetUnit from PxlBrlHits for Hit " << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from PxlBrlHits for Hit " << i;
+        continue;
       }
 
       ++j;
 
       // get the Surface of the hit (knows how to go from local <-> global)
-      const BoundPlane& bSurface = theDet->surface();
+      const BoundPlane &bSurface = theDet->surface();
 
-      if(hTrackerPxBToF) hTrackerPxBToF->Fill(itHit->tof());
-      if(hTrackerPxBR) 
-	hTrackerPxBR->Fill(bSurface.toGlobal(itHit->localPosition()).perp());
-      if(hTrackerPxPhi) 
-	hTrackerPxPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
-      if(hTrackerPxEta) 
-	hTrackerPxEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
+      if (hTrackerPxBToF)
+        hTrackerPxBToF->Fill(itHit->tof());
+      if (hTrackerPxBR)
+        hTrackerPxBR->Fill(bSurface.toGlobal(itHit->localPosition()).perp());
+      if (hTrackerPxPhi)
+        hTrackerPxPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
+      if (hTrackerPxEta)
+        hTrackerPxEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
 
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "PxlBrl PSimHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dTrk << "," << sdPxlBrl
-	<< "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "PxlBrl PSimHit " << i << " is expected to be (det,subdet) = (" << dTrk << ","
+                                    << sdPxlBrl << "); value returned is: (" << detector << "," << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through PxlBrl Hits
+    }  // end detector type check
+  }    // end loop through PxlBrl Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of Pixel Barrel Hits collected:..... ";
     eventout += j;
-  }  
-  
+  }
+
   nPxlHits += j;
 
   /////////////////////////////////
@@ -986,30 +936,26 @@ void GlobalHitsProdHist::fillTrk(edm::Event& iEvent,
   edm::PSimHitContainer thePxlFwdHits;
   // extract low container
   edm::Handle<edm::PSimHitContainer> PxlFwdLowContainer;
-  iEvent.getByToken(PxlFwdLowSrc_Token_,PxlFwdLowContainer);
+  iEvent.getByToken(PxlFwdLowSrc_Token_, PxlFwdLowContainer);
   if (!PxlFwdLowContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsPixelEndcapLowTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsPixelEndcapLowTof in event!";
     return;
   }
   // extract high container
   edm::Handle<edm::PSimHitContainer> PxlFwdHighContainer;
-  iEvent.getByToken(PxlFwdHighSrc_Token_,PxlFwdHighContainer);
+  iEvent.getByToken(PxlFwdHighSrc_Token_, PxlFwdHighContainer);
   if (!PxlFwdHighContainer.isValid()) {
-    edm::LogWarning("GlobalHitsProdHist_fillTrk")
-      << "Unable to find TrackerHitsPixelEndcapHighTof in event!";
+    edm::LogWarning("GlobalHitsProdHist_fillTrk") << "Unable to find TrackerHitsPixelEndcapHighTof in event!";
     return;
   }
   // place both containers into new container
-  thePxlFwdHits.insert(thePxlFwdHits.end(),PxlFwdLowContainer->begin(),
-		       PxlFwdLowContainer->end());
-  thePxlFwdHits.insert(thePxlFwdHits.end(),PxlFwdHighContainer->begin(),
-		       PxlFwdHighContainer->end());
+  thePxlFwdHits.insert(thePxlFwdHits.end(), PxlFwdLowContainer->begin(), PxlFwdLowContainer->end());
+  thePxlFwdHits.insert(thePxlFwdHits.end(), PxlFwdHighContainer->begin(), PxlFwdHighContainer->end());
 
   // cycle through new container
-  i = 0; j = 0;
+  i = 0;
+  j = 0;
   for (itHit = thePxlFwdHits.begin(); itHit != thePxlFwdHits.end(); ++itHit) {
-
     ++i;
 
     // create a DetId from the detUnitId
@@ -1019,49 +965,47 @@ void GlobalHitsProdHist::fillTrk(edm::Event& iEvent,
 
     // check that expected detector is returned
     if ((detector == dTrk) && (subdetector == sdPxlFwd)) {
-
       // get the GeomDetUnit from the geometry using theDetUnitID
       const GeomDetUnit *theDet = theTracker.idToDetUnit(theDetUnitId);
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get GeomDetUnit from PxlFwdHits for Hit " << i;;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from PxlFwdHits for Hit " << i;
+        ;
+        continue;
       }
 
       ++j;
 
       // get the Surface of the hit (knows how to go from local <-> global)
-      const BoundPlane& bSurface = theDet->surface();
+      const BoundPlane &bSurface = theDet->surface();
 
-      if(hTrackerPxFToF) hTrackerPxFToF->Fill(itHit->tof());
-      if(hTrackerPxFZ) 
-	hTrackerPxFZ->Fill(bSurface.toGlobal(itHit->localPosition()).z());
-      if(hTrackerPxPhi) 
-	hTrackerPxPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
-      if(hTrackerPxEta) 
-	hTrackerPxEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
+      if (hTrackerPxFToF)
+        hTrackerPxFToF->Fill(itHit->tof());
+      if (hTrackerPxFZ)
+        hTrackerPxFZ->Fill(bSurface.toGlobal(itHit->localPosition()).z());
+      if (hTrackerPxPhi)
+        hTrackerPxPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
+      if (hTrackerPxEta)
+        hTrackerPxEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
 
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "PxlFwd PSimHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dTrk << "," << sdPxlFwd
-	<< "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "PxlFwd PSimHit " << i << " is expected to be (det,subdet) = (" << dTrk << ","
+                                    << sdPxlFwd << "); value returned is: (" << detector << "," << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through PxlFwd Hits
+    }  // end detector type check
+  }    // end loop through PxlFwd Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of Pixel Forward Hits collected:.... ";
     eventout += j;
-  }  
+  }
 
   nPxlHits += j;
 
-  if (hTrackerPx[0]) hTrackerPx[0]->Fill((float)nPxlHits);
-  if (hTrackerPx[1]) hTrackerPx[1]->Fill((float)nPxlHits); 
+  if (hTrackerPx[0])
+    hTrackerPx[0]->Fill((float)nPxlHits);
+  if (hTrackerPx[1])
+    hTrackerPx[1]->Fill((float)nPxlHits);
 
   ///////////////////////////////////
   // get Silicon Barrel information
@@ -1070,50 +1014,42 @@ void GlobalHitsProdHist::fillTrk(edm::Event& iEvent,
   edm::PSimHitContainer theSiBrlHits;
   // extract TIB low container
   edm::Handle<edm::PSimHitContainer> SiTIBLowContainer;
-  iEvent.getByToken(SiTIBLowSrc_Token_,SiTIBLowContainer);
+  iEvent.getByToken(SiTIBLowSrc_Token_, SiTIBLowContainer);
   if (!SiTIBLowContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsTIBLowTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsTIBLowTof in event!";
     return;
   }
   // extract TIB high container
   edm::Handle<edm::PSimHitContainer> SiTIBHighContainer;
-  iEvent.getByToken(SiTIBHighSrc_Token_,SiTIBHighContainer);
+  iEvent.getByToken(SiTIBHighSrc_Token_, SiTIBHighContainer);
   if (!SiTIBHighContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsTIBHighTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsTIBHighTof in event!";
     return;
   }
   // extract TOB low container
   edm::Handle<edm::PSimHitContainer> SiTOBLowContainer;
-  iEvent.getByToken(SiTOBLowSrc_Token_,SiTOBLowContainer);
+  iEvent.getByToken(SiTOBLowSrc_Token_, SiTOBLowContainer);
   if (!SiTOBLowContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsTOBLowTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsTOBLowTof in event!";
     return;
   }
   // extract TOB high container
   edm::Handle<edm::PSimHitContainer> SiTOBHighContainer;
-  iEvent.getByToken(SiTOBHighSrc_Token_,SiTOBHighContainer);
+  iEvent.getByToken(SiTOBHighSrc_Token_, SiTOBHighContainer);
   if (!SiTOBHighContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsTOBHighTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsTOBHighTof in event!";
     return;
   }
   // place all containers into new container
-  theSiBrlHits.insert(theSiBrlHits.end(),SiTIBLowContainer->begin(),
-		       SiTIBLowContainer->end());
-  theSiBrlHits.insert(theSiBrlHits.end(),SiTIBHighContainer->begin(),
-		       SiTIBHighContainer->end());
-  theSiBrlHits.insert(theSiBrlHits.end(),SiTOBLowContainer->begin(),
-		       SiTOBLowContainer->end());
-  theSiBrlHits.insert(theSiBrlHits.end(),SiTOBHighContainer->begin(),
-		       SiTOBHighContainer->end());
+  theSiBrlHits.insert(theSiBrlHits.end(), SiTIBLowContainer->begin(), SiTIBLowContainer->end());
+  theSiBrlHits.insert(theSiBrlHits.end(), SiTIBHighContainer->begin(), SiTIBHighContainer->end());
+  theSiBrlHits.insert(theSiBrlHits.end(), SiTOBLowContainer->begin(), SiTOBLowContainer->end());
+  theSiBrlHits.insert(theSiBrlHits.end(), SiTOBHighContainer->begin(), SiTOBHighContainer->end());
 
   // cycle through new container
-  i = 0; j = 0;
+  i = 0;
+  j = 0;
   for (itHit = theSiBrlHits.begin(); itHit != theSiBrlHits.end(); ++itHit) {
-
     ++i;
 
     // create a DetId from the detUnitId
@@ -1122,47 +1058,41 @@ void GlobalHitsProdHist::fillTrk(edm::Event& iEvent,
     int subdetector = theDetUnitId.subdetId();
 
     // check that expected detector is returned
-    if ((detector == dTrk) && 
-	((subdetector == sdSiTIB) ||
-	 (subdetector == sdSiTOB))) {
-
+    if ((detector == dTrk) && ((subdetector == sdSiTIB) || (subdetector == sdSiTOB))) {
       // get the GeomDetUnit from the geometry using theDetUnitID
       const GeomDetUnit *theDet = theTracker.idToDetUnit(theDetUnitId);
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get GeomDetUnit from SiBrlHits for Hit " << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from SiBrlHits for Hit " << i;
+        continue;
       }
 
       ++j;
 
       // get the Surface of the hit (knows how to go from local <-> global)
-      const BoundPlane& bSurface = theDet->surface();
+      const BoundPlane &bSurface = theDet->surface();
 
-      if(hTrackerSiBToF) hTrackerSiBToF->Fill(itHit->tof());
-      if(hTrackerSiBR) 
-	hTrackerSiBR->Fill(bSurface.toGlobal(itHit->localPosition()).perp());
-      if(hTrackerSiPhi) 
-	hTrackerSiPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
-      if(hTrackerSiEta) 
-	hTrackerSiEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
+      if (hTrackerSiBToF)
+        hTrackerSiBToF->Fill(itHit->tof());
+      if (hTrackerSiBR)
+        hTrackerSiBR->Fill(bSurface.toGlobal(itHit->localPosition()).perp());
+      if (hTrackerSiPhi)
+        hTrackerSiPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
+      if (hTrackerSiEta)
+        hTrackerSiEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
 
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "SiBrl PSimHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dTrk << "," << sdSiTIB
-	<< " || " << sdSiTOB << "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "SiBrl PSimHit " << i << " is expected to be (det,subdet) = (" << dTrk << ","
+                                    << sdSiTIB << " || " << sdSiTOB << "); value returned is: (" << detector << ","
+                                    << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through SiBrl Hits
+    }  // end detector type check
+  }    // end loop through SiBrl Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of Silicon Barrel Hits collected:... ";
     eventout += j;
-  }  
+  }
 
   nSiHits += j;
 
@@ -1172,50 +1102,42 @@ void GlobalHitsProdHist::fillTrk(edm::Event& iEvent,
   edm::PSimHitContainer theSiFwdHits;
   // extract TID low container
   edm::Handle<edm::PSimHitContainer> SiTIDLowContainer;
-  iEvent.getByToken(SiTIDLowSrc_Token_,SiTIDLowContainer);
+  iEvent.getByToken(SiTIDLowSrc_Token_, SiTIDLowContainer);
   if (!SiTIDLowContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsTIDLowTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsTIDLowTof in event!";
     return;
   }
   // extract TID high container
   edm::Handle<edm::PSimHitContainer> SiTIDHighContainer;
-  iEvent.getByToken(SiTIDHighSrc_Token_,SiTIDHighContainer);
+  iEvent.getByToken(SiTIDHighSrc_Token_, SiTIDHighContainer);
   if (!SiTIDHighContainer.isValid()) {
-    edm::LogWarning("GlobalHitsProdHist_fillTrk")
-      << "Unable to find TrackerHitsTIDHighTof in event!";
+    edm::LogWarning("GlobalHitsProdHist_fillTrk") << "Unable to find TrackerHitsTIDHighTof in event!";
     return;
   }
   // extract TEC low container
   edm::Handle<edm::PSimHitContainer> SiTECLowContainer;
-  iEvent.getByToken(SiTECLowSrc_Token_,SiTECLowContainer);
+  iEvent.getByToken(SiTECLowSrc_Token_, SiTECLowContainer);
   if (!SiTECLowContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsTECLowTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsTECLowTof in event!";
     return;
   }
   // extract TEC high container
   edm::Handle<edm::PSimHitContainer> SiTECHighContainer;
-  iEvent.getByToken(SiTECHighSrc_Token_,SiTECHighContainer);
+  iEvent.getByToken(SiTECHighSrc_Token_, SiTECHighContainer);
   if (!SiTECHighContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsTECHighTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsTECHighTof in event!";
     return;
   }
   // place all containers into new container
-  theSiFwdHits.insert(theSiFwdHits.end(),SiTIDLowContainer->begin(),
-		       SiTIDLowContainer->end());
-  theSiFwdHits.insert(theSiFwdHits.end(),SiTIDHighContainer->begin(),
-		       SiTIDHighContainer->end());
-  theSiFwdHits.insert(theSiFwdHits.end(),SiTECLowContainer->begin(),
-		       SiTECLowContainer->end());
-  theSiFwdHits.insert(theSiFwdHits.end(),SiTECHighContainer->begin(),
-		       SiTECHighContainer->end());
+  theSiFwdHits.insert(theSiFwdHits.end(), SiTIDLowContainer->begin(), SiTIDLowContainer->end());
+  theSiFwdHits.insert(theSiFwdHits.end(), SiTIDHighContainer->begin(), SiTIDHighContainer->end());
+  theSiFwdHits.insert(theSiFwdHits.end(), SiTECLowContainer->begin(), SiTECLowContainer->end());
+  theSiFwdHits.insert(theSiFwdHits.end(), SiTECHighContainer->begin(), SiTECHighContainer->end());
 
   // cycle through container
-  i = 0; j = 0;
+  i = 0;
+  j = 0;
   for (itHit = theSiFwdHits.begin(); itHit != theSiFwdHits.end(); ++itHit) {
-
     ++i;
 
     // create a DetId from the detUnitId
@@ -1223,53 +1145,49 @@ void GlobalHitsProdHist::fillTrk(edm::Event& iEvent,
     int detector = theDetUnitId.det();
     int subdetector = theDetUnitId.subdetId();
 
-    // check that expected detector is returned 
-    if ((detector == dTrk) && 
-	((subdetector == sdSiTID) ||
-	 (subdetector == sdSiTEC))) {
-      
+    // check that expected detector is returned
+    if ((detector == dTrk) && ((subdetector == sdSiTID) || (subdetector == sdSiTEC))) {
       // get the GeomDetUnit from the geometry using theDetUnitID
       const GeomDetUnit *theDet = theTracker.idToDetUnit(theDetUnitId);
-      
+
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get GeomDetUnit from SiFwdHits Hit " << i;
-	return;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from SiFwdHits Hit " << i;
+        return;
       }
-      
+
       ++j;
 
       // get the Surface of the hit (knows how to go from local <-> global)
-      const BoundPlane& bSurface = theDet->surface();
-      
-      if(hTrackerSiFToF) hTrackerSiFToF->Fill(itHit->tof());
-      if(hTrackerSiFZ) 
-	hTrackerSiFZ->Fill(bSurface.toGlobal(itHit->localPosition()).z());
-      if(hTrackerSiPhi) 
-	hTrackerSiPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
-      if(hTrackerSiEta) 
-	hTrackerSiEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
+      const BoundPlane &bSurface = theDet->surface();
+
+      if (hTrackerSiFToF)
+        hTrackerSiFToF->Fill(itHit->tof());
+      if (hTrackerSiFZ)
+        hTrackerSiFZ->Fill(bSurface.toGlobal(itHit->localPosition()).z());
+      if (hTrackerSiPhi)
+        hTrackerSiPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
+      if (hTrackerSiEta)
+        hTrackerSiEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
 
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "SiFwd PSimHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dTrk << "," << sdSiTOB
-	<< " || " << sdSiTEC << "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "SiFwd PSimHit " << i << " is expected to be (det,subdet) = (" << dTrk << ","
+                                    << sdSiTOB << " || " << sdSiTEC << "); value returned is: (" << detector << ","
+                                    << subdetector << ")";
       continue;
-    } // end check detector type
-  } // end loop through SiFwd Hits
+    }  // end check detector type
+  }    // end loop through SiFwd Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of Silicon Forward Hits collected:.. ";
     eventout += j;
-  }  
+  }
 
-  nSiHits +=j;
+  nSiHits += j;
 
-  if (hTrackerSi[0]) hTrackerSi[0]->Fill((float)nSiHits);
-  if (hTrackerSi[1]) hTrackerSi[1]->Fill((float)nSiHits); 
+  if (hTrackerSi[0])
+    hTrackerSi[0]->Fill((float)nSiHits);
+  if (hTrackerSi[1])
+    hTrackerSi[1]->Fill((float)nSiHits);
 
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
@@ -1277,15 +1195,13 @@ void GlobalHitsProdHist::fillTrk(edm::Event& iEvent,
   return;
 }
 
-void GlobalHitsProdHist::fillMuon(edm::Event& iEvent, 
-				  const edm::EventSetup& iSetup)
-{
+void GlobalHitsProdHist::fillMuon(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   nMuonHits = 0;
   std::string MsgLoggerCat = "GlobalHitsProdHist_fillMuon";
 
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
+    eventout = "\nGathering info:";
 
   // iterator to access containers
   edm::PSimHitContainer::const_iterator itHit;
@@ -1297,26 +1213,22 @@ void GlobalHitsProdHist::fillMuon(edm::Event& iEvent,
   edm::ESHandle<CSCGeometry> theCSCGeometry;
   iSetup.get<MuonGeometryRecord>().get(theCSCGeometry);
   if (!theCSCGeometry.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find MuonGeometryRecord for the CSCGeometry in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find MuonGeometryRecord for the CSCGeometry in event!";
     return;
   }
-  const CSCGeometry& theCSCMuon(*theCSCGeometry);
+  const CSCGeometry &theCSCMuon(*theCSCGeometry);
 
   // get Muon CSC information
   edm::Handle<edm::PSimHitContainer> MuonCSCContainer;
-  iEvent.getByToken(MuonCscSrc_Token_,MuonCSCContainer);
+  iEvent.getByToken(MuonCscSrc_Token_, MuonCSCContainer);
   if (!MuonCSCContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find MuonCSCHits in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find MuonCSCHits in event!";
     return;
   }
 
   // cycle through container
   int i = 0, j = 0;
-  for (itHit = MuonCSCContainer->begin(); itHit != MuonCSCContainer->end(); 
-       ++itHit) {
-
+  for (itHit = MuonCSCContainer->begin(); itHit != MuonCSCContainer->end(); ++itHit) {
     ++i;
 
     // create a DetId from the detUnitId
@@ -1325,47 +1237,42 @@ void GlobalHitsProdHist::fillMuon(edm::Event& iEvent,
     int subdetector = theDetUnitId.subdetId();
 
     // check that expected detector is returned
-    if ((detector == dMuon) && 
-        (subdetector == sdMuonCSC)) {
-
+    if ((detector == dMuon) && (subdetector == sdMuonCSC)) {
       // get the GeomDetUnit from the geometry using theDetUnitID
       const GeomDetUnit *theDet = theCSCMuon.idToDetUnit(theDetUnitId);
-    
+
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get GeomDetUnit from theCSCMuon for hit " << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from theCSCMuon for hit " << i;
+        continue;
       }
-     
+
       ++j;
 
       // get the Surface of the hit (knows how to go from local <-> global)
-      const BoundPlane& bSurface = theDet->surface();
-    
-      if (hMuonCscToF[0]) hMuonCscToF[0]->Fill(itHit->tof());
-      if (hMuonCscToF[1]) hMuonCscToF[1]->Fill(itHit->tof());
-      if (hMuonCscZ) 
-	hMuonCscZ->Fill(bSurface.toGlobal(itHit->localPosition()).z());
+      const BoundPlane &bSurface = theDet->surface();
+
+      if (hMuonCscToF[0])
+        hMuonCscToF[0]->Fill(itHit->tof());
+      if (hMuonCscToF[1])
+        hMuonCscToF[1]->Fill(itHit->tof());
+      if (hMuonCscZ)
+        hMuonCscZ->Fill(bSurface.toGlobal(itHit->localPosition()).z());
       if (hMuonPhi)
-	hMuonPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
+        hMuonPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
       if (hMuonEta)
-	hMuonEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
+        hMuonEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
 
     } else {
-      edm::LogWarning(MsgLoggerCat)
-        << "MuonCsc PSimHit " << i 
-        << " is expected to be (det,subdet) = (" 
-        << dMuon << "," << sdMuonCSC
-        << "); value returned is: ("
-        << detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "MuonCsc PSimHit " << i << " is expected to be (det,subdet) = (" << dMuon << ","
+                                    << sdMuonCSC << "); value returned is: (" << detector << "," << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through CSC Hits
+    }  // end detector type check
+  }    // end loop through CSC Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of CSC muon Hits collected:......... ";
     eventout += j;
-  }  
+  }
 
   nMuonHits += j;
 
@@ -1376,26 +1283,22 @@ void GlobalHitsProdHist::fillMuon(edm::Event& iEvent,
   edm::ESHandle<DTGeometry> theDTGeometry;
   iSetup.get<MuonGeometryRecord>().get(theDTGeometry);
   if (!theDTGeometry.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find MuonGeometryRecord for the DTGeometry in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find MuonGeometryRecord for the DTGeometry in event!";
     return;
   }
-  const DTGeometry& theDTMuon(*theDTGeometry);
+  const DTGeometry &theDTMuon(*theDTGeometry);
 
   // get Muon DT information
   edm::Handle<edm::PSimHitContainer> MuonDtContainer;
-  iEvent.getByToken(MuonDtSrc_Token_,MuonDtContainer);
+  iEvent.getByToken(MuonDtSrc_Token_, MuonDtContainer);
   if (!MuonDtContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find MuonDTHits in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find MuonDTHits in event!";
     return;
   }
 
   // cycle through container
   i = 0, j = 0;
-  for (itHit = MuonDtContainer->begin(); itHit != MuonDtContainer->end(); 
-       ++itHit) {
-
+  for (itHit = MuonDtContainer->begin(); itHit != MuonDtContainer->end(); ++itHit) {
     ++i;
 
     // create a DetId from the detUnitId
@@ -1404,9 +1307,7 @@ void GlobalHitsProdHist::fillMuon(edm::Event& iEvent,
     int subdetector = theDetUnitId.subdetId();
 
     // check that expected detector is returned
-    if ((detector == dMuon) && 
-        (subdetector == sdMuonDT)) {
-
+    if ((detector == dMuon) && (subdetector == sdMuonDT)) {
       // CSC uses wires and layers rather than the full detID
       // get the wireId
       DTWireId wireId(itHit->detUnitId());
@@ -1415,44 +1316,41 @@ void GlobalHitsProdHist::fillMuon(edm::Event& iEvent,
       const DTLayer *theDet = theDTMuon.layer(wireId.layerId());
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get GeomDetUnit from theDtMuon for hit " << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from theDtMuon for hit " << i;
+        continue;
       }
-     
+
       ++j;
 
       // get the Surface of the hit (knows how to go from local <-> global)
-      const BoundPlane& bSurface = theDet->surface();
-    
-      if (hMuonDtToF[0]) hMuonDtToF[0]->Fill(itHit->tof());
-      if (hMuonDtToF[1]) hMuonDtToF[1]->Fill(itHit->tof());
-      if (hMuonDtR) 
-	hMuonDtR->Fill(bSurface.toGlobal(itHit->localPosition()).perp());
+      const BoundPlane &bSurface = theDet->surface();
+
+      if (hMuonDtToF[0])
+        hMuonDtToF[0]->Fill(itHit->tof());
+      if (hMuonDtToF[1])
+        hMuonDtToF[1]->Fill(itHit->tof());
+      if (hMuonDtR)
+        hMuonDtR->Fill(bSurface.toGlobal(itHit->localPosition()).perp());
       if (hMuonPhi)
-	hMuonPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
+        hMuonPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
       if (hMuonEta)
-	hMuonEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
+        hMuonEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
 
     } else {
-      edm::LogWarning(MsgLoggerCat)
-        << "MuonDt PSimHit " << i 
-        << " is expected to be (det,subdet) = (" 
-        << dMuon << "," << sdMuonDT
-        << "); value returned is: ("
-        << detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "MuonDt PSimHit " << i << " is expected to be (det,subdet) = (" << dMuon << ","
+                                    << sdMuonDT << "); value returned is: (" << detector << "," << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through DT Hits
+    }  // end detector type check
+  }    // end loop through DT Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of DT muon Hits collected:.......... ";
     eventout += j;
-  } 
+  }
 
   nMuonHits += j;
 
-  //int RPCBrl = 0, RPCFwd = 0;
+  // int RPCBrl = 0, RPCFwd = 0;
   ///////////////////////
   // access the RPC Muon
   ///////////////////////
@@ -1460,27 +1358,23 @@ void GlobalHitsProdHist::fillMuon(edm::Event& iEvent,
   edm::ESHandle<RPCGeometry> theRPCGeometry;
   iSetup.get<MuonGeometryRecord>().get(theRPCGeometry);
   if (!theRPCGeometry.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find MuonGeometryRecord for the RPCGeometry in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find MuonGeometryRecord for the RPCGeometry in event!";
     return;
   }
-  const RPCGeometry& theRPCMuon(*theRPCGeometry);
+  const RPCGeometry &theRPCMuon(*theRPCGeometry);
 
   // get Muon RPC information
   edm::Handle<edm::PSimHitContainer> MuonRPCContainer;
-  iEvent.getByToken(MuonRpcSrc_Token_,MuonRPCContainer);
+  iEvent.getByToken(MuonRpcSrc_Token_, MuonRPCContainer);
   if (!MuonRPCContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find MuonRPCHits in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find MuonRPCHits in event!";
     return;
   }
 
   // cycle through container
   i = 0, j = 0;
-  int RPCBrl =0, RPCFwd = 0;
-  for (itHit = MuonRPCContainer->begin(); itHit != MuonRPCContainer->end(); 
-       ++itHit) {
-
+  int RPCBrl = 0, RPCFwd = 0;
+  for (itHit = MuonRPCContainer->begin(); itHit != MuonRPCContainer->end(); ++itHit) {
     ++i;
 
     // create a DetID from the detUnitId
@@ -1489,11 +1383,9 @@ void GlobalHitsProdHist::fillMuon(edm::Event& iEvent,
     int subdetector = theDetUnitId.subdetId();
 
     // check that expected detector is returned
-    if ((detector == dMuon) && 
-        (subdetector == sdMuonRPC)) {
-      
+    if ((detector == dMuon) && (subdetector == sdMuonRPC)) {
       // get an RPCDetID from the detUnitID
-      RPCDetId RPCId(itHit->detUnitId());      
+      RPCDetId RPCId(itHit->detUnitId());
 
       // find the region of the RPC hit
       int region = RPCId.region();
@@ -1502,56 +1394,54 @@ void GlobalHitsProdHist::fillMuon(edm::Event& iEvent,
       const GeomDetUnit *theDet = theRPCMuon.idToDetUnit(theDetUnitId);
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get GeomDetUnit from theRPCMuon for hit " << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from theRPCMuon for hit " << i;
+        continue;
       }
 
       ++j;
 
       // get the Surface of the hit (knows how to go from local <-> global)
-      const BoundPlane& bSurface = theDet->surface();
-    
+      const BoundPlane &bSurface = theDet->surface();
+
       // gather necessary information
       if ((region == sdMuonRPCRgnFwdp) || (region == sdMuonRPCRgnFwdn)) {
-	++RPCFwd;
-
-	if (hMuonRpcFToF[0]) hMuonRpcFToF[0]->Fill(itHit->tof());
-	if (hMuonRpcFToF[1]) hMuonRpcFToF[1]->Fill(itHit->tof());
-	if (hMuonRpcFZ) 
-	  hMuonRpcFZ->Fill(bSurface.toGlobal(itHit->localPosition()).z());
-	if (hMuonPhi)
-	  hMuonPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
-	if (hMuonEta)
-	  hMuonEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
+        ++RPCFwd;
+
+        if (hMuonRpcFToF[0])
+          hMuonRpcFToF[0]->Fill(itHit->tof());
+        if (hMuonRpcFToF[1])
+          hMuonRpcFToF[1]->Fill(itHit->tof());
+        if (hMuonRpcFZ)
+          hMuonRpcFZ->Fill(bSurface.toGlobal(itHit->localPosition()).z());
+        if (hMuonPhi)
+          hMuonPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
+        if (hMuonEta)
+          hMuonEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
 
       } else if (region == sdMuonRPCRgnBrl) {
-	++RPCBrl;
-
-	if (hMuonRpcBToF[0]) hMuonRpcBToF[0]->Fill(itHit->tof());
-	if (hMuonRpcBToF[1]) hMuonRpcBToF[1]->Fill(itHit->tof());
-	if (hMuonRpcBR) 
-	  hMuonRpcBR->Fill(bSurface.toGlobal(itHit->localPosition()).perp());
-	if (hMuonPhi)
-	  hMuonPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
-	if (hMuonEta)
-	  hMuonEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
-	
+        ++RPCBrl;
+
+        if (hMuonRpcBToF[0])
+          hMuonRpcBToF[0]->Fill(itHit->tof());
+        if (hMuonRpcBToF[1])
+          hMuonRpcBToF[1]->Fill(itHit->tof());
+        if (hMuonRpcBR)
+          hMuonRpcBR->Fill(bSurface.toGlobal(itHit->localPosition()).perp());
+        if (hMuonPhi)
+          hMuonPhi->Fill(bSurface.toGlobal(itHit->localPosition()).phi());
+        if (hMuonEta)
+          hMuonEta->Fill(bSurface.toGlobal(itHit->localPosition()).eta());
+
       } else {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Invalid region for RPC Muon hit" << i;
-	continue;
-      } // end check of region
+        edm::LogWarning(MsgLoggerCat) << "Invalid region for RPC Muon hit" << i;
+        continue;
+      }  // end check of region
     } else {
-      edm::LogWarning(MsgLoggerCat)
-        << "MuonRpc PSimHit " << i 
-        << " is expected to be (det,subdet) = (" 
-        << dMuon << "," << sdMuonRPC
-        << "); value returned is: ("
-        << detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "MuonRpc PSimHit " << i << " is expected to be (det,subdet) = (" << dMuon << ","
+                                    << sdMuonRPC << "); value returned is: (" << detector << "," << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through RPC Hits
+    }  // end detector type check
+  }    // end loop through RPC Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of RPC muon Hits collected:......... ";
@@ -1559,13 +1449,15 @@ void GlobalHitsProdHist::fillMuon(edm::Event& iEvent,
     eventout += "\n                    RPC Barrel muon Hits:............ ";
     eventout += RPCBrl;
     eventout += "\n                    RPC Forward muon Hits:........... ";
-    eventout += RPCFwd;    
-  }  
+    eventout += RPCFwd;
+  }
 
   nMuonHits += j;
 
-  if (hMuon[0]) hMuon[0]->Fill((float)nMuonHits);
-  if (hMuon[1]) hMuon[1]->Fill((float)nMuonHits); 
+  if (hMuon[0])
+    hMuon[0]->Fill((float)nMuonHits);
+  if (hMuon[1])
+    hMuon[1]->Fill((float)nMuonHits);
 
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
@@ -1573,25 +1465,22 @@ void GlobalHitsProdHist::fillMuon(edm::Event& iEvent,
   return;
 }
 
-void GlobalHitsProdHist::fillECal(edm::Event& iEvent, 
-				  const edm::EventSetup& iSetup)
-{
+void GlobalHitsProdHist::fillECal(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalHitsProdHist_fillECal";
 
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
-  
+    eventout = "\nGathering info:";
+
   // access the calorimeter geometry
   edm::ESHandle<CaloGeometry> theCaloGeometry;
   iSetup.get<CaloGeometryRecord>().get(theCaloGeometry);
   if (!theCaloGeometry.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find CaloGeometryRecord in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find CaloGeometryRecord in event!";
     return;
   }
-  const CaloGeometry& theCalo(*theCaloGeometry);
-    
+  const CaloGeometry &theCalo(*theCaloGeometry);
+
   // iterator to access containers
   edm::PCaloHitContainer::const_iterator itHit;
 
@@ -1601,30 +1490,25 @@ void GlobalHitsProdHist::fillECal(edm::Event& iEvent,
   edm::PCaloHitContainer theECalHits;
   // extract EB container
   edm::Handle<edm::PCaloHitContainer> EBContainer;
-  iEvent.getByToken(ECalEBSrc_Token_,EBContainer);
+  iEvent.getByToken(ECalEBSrc_Token_, EBContainer);
   if (!EBContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find EcalHitsEB in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find EcalHitsEB in event!";
     return;
   }
   // extract EE container
   edm::Handle<edm::PCaloHitContainer> EEContainer;
-  iEvent.getByToken(ECalEESrc_Token_,EEContainer);
+  iEvent.getByToken(ECalEESrc_Token_, EEContainer);
   if (!EEContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find EcalHitsEE in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find EcalHitsEE in event!";
     return;
   }
   // place both containers into new container
-  theECalHits.insert(theECalHits.end(),EBContainer->begin(),
-		       EBContainer->end());
-  theECalHits.insert(theECalHits.end(),EEContainer->begin(),
-		       EEContainer->end());
+  theECalHits.insert(theECalHits.end(), EBContainer->begin(), EBContainer->end());
+  theECalHits.insert(theECalHits.end(), EEContainer->begin(), EEContainer->end());
 
   // cycle through new container
   int i = 0, j = 0;
   for (itHit = theECalHits.begin(); itHit != theECalHits.end(); ++itHit) {
-
     ++i;
 
     // create a DetId from the detUnitId
@@ -1633,67 +1517,65 @@ void GlobalHitsProdHist::fillECal(edm::Event& iEvent,
     int subdetector = theDetUnitId.subdetId();
 
     // check that expected detector is returned
-    if ((detector == dEcal) && 
-	((subdetector == sdEcalBrl) ||
-	 (subdetector == sdEcalFwd))) {
-
+    if ((detector == dEcal) && ((subdetector == sdEcalBrl) || (subdetector == sdEcalFwd))) {
       // get the Cell geometry
       auto theDet = (theCalo.getSubdetectorGeometry(theDetUnitId))->getGeometry(theDetUnitId);
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get CaloCellGeometry from ECalHits for Hit " << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get CaloCellGeometry from ECalHits for Hit " << i;
+        continue;
       }
 
       ++j;
 
       // get the global position of the cell
-      const GlobalPoint& globalposition = theDet->getPosition();
-
-      if (hCaloEcalE[0]) hCaloEcalE[0]->Fill(itHit->energy());
-      if (hCaloEcalE[1]) hCaloEcalE[1]->Fill(itHit->energy());
-      if (hCaloEcalToF[0]) hCaloEcalToF[0]->Fill(itHit->time());
-      if (hCaloEcalToF[1]) hCaloEcalToF[1]->Fill(itHit->time());
-      if (hCaloEcalPhi) hCaloEcalPhi->Fill(globalposition.phi());
-      if (hCaloEcalEta) hCaloEcalEta->Fill(globalposition.eta());
+      const GlobalPoint &globalposition = theDet->getPosition();
+
+      if (hCaloEcalE[0])
+        hCaloEcalE[0]->Fill(itHit->energy());
+      if (hCaloEcalE[1])
+        hCaloEcalE[1]->Fill(itHit->energy());
+      if (hCaloEcalToF[0])
+        hCaloEcalToF[0]->Fill(itHit->time());
+      if (hCaloEcalToF[1])
+        hCaloEcalToF[1]->Fill(itHit->time());
+      if (hCaloEcalPhi)
+        hCaloEcalPhi->Fill(globalposition.phi());
+      if (hCaloEcalEta)
+        hCaloEcalEta->Fill(globalposition.eta());
 
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "ECal PCaloHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dEcal << "," << sdEcalBrl
-	<< " || " << sdEcalFwd << "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "ECal PCaloHit " << i << " is expected to be (det,subdet) = (" << dEcal << ","
+                                    << sdEcalBrl << " || " << sdEcalFwd << "); value returned is: (" << detector << ","
+                                    << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through ECal Hits
+    }  // end detector type check
+  }    // end loop through ECal Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of ECal Hits collected:............. ";
     eventout += j;
-  }  
+  }
 
-  if (hCaloEcal[0]) hCaloEcal[0]->Fill((float)j);
-  if (hCaloEcal[1]) hCaloEcal[1]->Fill((float)j); 
+  if (hCaloEcal[0])
+    hCaloEcal[0]->Fill((float)j);
+  if (hCaloEcal[1])
+    hCaloEcal[1]->Fill((float)j);
 
   ////////////////////////////
   // Get Preshower information
   ////////////////////////////
   // extract PreShower container
   edm::Handle<edm::PCaloHitContainer> PreShContainer;
-  iEvent.getByToken(ECalESSrc_Token_,PreShContainer);
+  iEvent.getByToken(ECalESSrc_Token_, PreShContainer);
   if (!PreShContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find EcalHitsES in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find EcalHitsES in event!";
     return;
   }
 
   // cycle through container
   i = 0, j = 0;
-  for (itHit = PreShContainer->begin(); 
-       itHit != PreShContainer->end(); ++itHit) {
-
+  for (itHit = PreShContainer->begin(); itHit != PreShContainer->end(); ++itHit) {
     ++i;
 
     // create a DetId from the detUnitId
@@ -1702,49 +1584,49 @@ void GlobalHitsProdHist::fillECal(edm::Event& iEvent,
     int subdetector = theDetUnitId.subdetId();
 
     // check that expected detector is returned
-    if ((detector == dEcal) && 
-	(subdetector == sdEcalPS)) {
-
+    if ((detector == dEcal) && (subdetector == sdEcalPS)) {
       // get the Cell geometry
       auto theDet = (theCalo.getSubdetectorGeometry(theDetUnitId))->getGeometry(theDetUnitId);
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get CaloCellGeometry from PreShContainer for Hit " 
-	  << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get CaloCellGeometry from PreShContainer for Hit " << i;
+        continue;
       }
 
       ++j;
 
       // get the global position of the cell
-      const GlobalPoint& globalposition = theDet->getPosition();
-
-      if (hCaloPreShE[0]) hCaloPreShE[0]->Fill(itHit->energy());
-      if (hCaloPreShE[1]) hCaloPreShE[1]->Fill(itHit->energy());
-      if (hCaloPreShToF[0]) hCaloPreShToF[0]->Fill(itHit->time());
-      if (hCaloPreShToF[1]) hCaloPreShToF[1]->Fill(itHit->time());
-      if (hCaloPreShPhi) hCaloPreShPhi->Fill(globalposition.phi());
-      if (hCaloPreShEta) hCaloPreShEta->Fill(globalposition.eta());
+      const GlobalPoint &globalposition = theDet->getPosition();
+
+      if (hCaloPreShE[0])
+        hCaloPreShE[0]->Fill(itHit->energy());
+      if (hCaloPreShE[1])
+        hCaloPreShE[1]->Fill(itHit->energy());
+      if (hCaloPreShToF[0])
+        hCaloPreShToF[0]->Fill(itHit->time());
+      if (hCaloPreShToF[1])
+        hCaloPreShToF[1]->Fill(itHit->time());
+      if (hCaloPreShPhi)
+        hCaloPreShPhi->Fill(globalposition.phi());
+      if (hCaloPreShEta)
+        hCaloPreShEta->Fill(globalposition.eta());
 
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "PreSh PCaloHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dEcal << "," << sdEcalPS
-	<< "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "PreSh PCaloHit " << i << " is expected to be (det,subdet) = (" << dEcal << ","
+                                    << sdEcalPS << "); value returned is: (" << detector << "," << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through PreShower Hits
+    }  // end detector type check
+  }    // end loop through PreShower Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of PreSh Hits collected:............ ";
     eventout += j;
-  }  
+  }
 
-  if (hCaloPreSh[0]) hCaloPreSh[0]->Fill((float)j);
-  if (hCaloPreSh[1]) hCaloPreSh[1]->Fill((float)j); 
+  if (hCaloPreSh[0])
+    hCaloPreSh[0]->Fill((float)j);
+  if (hCaloPreSh[1])
+    hCaloPreSh[1]->Fill((float)j);
 
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
@@ -1752,25 +1634,22 @@ void GlobalHitsProdHist::fillECal(edm::Event& iEvent,
   return;
 }
 
-void GlobalHitsProdHist::fillHCal(edm::Event& iEvent, 
-				  const edm::EventSetup& iSetup)
-{
+void GlobalHitsProdHist::fillHCal(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalHitsProdHist_fillHCal";
 
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
-  
+    eventout = "\nGathering info:";
+
   // access the calorimeter geometry
   edm::ESHandle<CaloGeometry> theCaloGeometry;
   iSetup.get<CaloGeometryRecord>().get(theCaloGeometry);
   if (!theCaloGeometry.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find CaloGeometryRecord in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find CaloGeometryRecord in event!";
     return;
   }
-  const CaloGeometry& theCalo(*theCaloGeometry);
-    
+  const CaloGeometry &theCalo(*theCaloGeometry);
+
   // iterator to access containers
   edm::PCaloHitContainer::const_iterator itHit;
 
@@ -1779,18 +1658,15 @@ void GlobalHitsProdHist::fillHCal(edm::Event& iEvent,
   ///////////////////////////////
   // extract HCal container
   edm::Handle<edm::PCaloHitContainer> HCalContainer;
-  iEvent.getByToken(HCalSrc_Token_,HCalContainer);
+  iEvent.getByToken(HCalSrc_Token_, HCalContainer);
   if (!HCalContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find HCalHits in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find HCalHits in event!";
     return;
   }
 
   // cycle through container
   int i = 0, j = 0;
-  for (itHit = HCalContainer->begin(); 
-       itHit != HCalContainer->end(); ++itHit) {
-
+  for (itHit = HCalContainer->begin(); itHit != HCalContainer->end(); ++itHit) {
     ++i;
 
     // create a DetId from the detUnitId
@@ -1799,53 +1675,51 @@ void GlobalHitsProdHist::fillHCal(edm::Event& iEvent,
     int subdetector = theDetUnitId.subdetId();
 
     // check that expected detector is returned
-    if ((detector == dHcal) && 
-	((subdetector == sdHcalBrl) ||
-	 (subdetector == sdHcalEC) ||
-	 (subdetector == sdHcalOut) ||
-	 (subdetector == sdHcalFwd))) {
-
+    if ((detector == dHcal) && ((subdetector == sdHcalBrl) || (subdetector == sdHcalEC) || (subdetector == sdHcalOut) ||
+                                (subdetector == sdHcalFwd))) {
       // get the Cell geometry
-      const HcalGeometry *theDet = dynamic_cast<const HcalGeometry*>
-	(theCalo.getSubdetectorGeometry(theDetUnitId));
+      const HcalGeometry *theDet = dynamic_cast<const HcalGeometry *>(theCalo.getSubdetectorGeometry(theDetUnitId));
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get HcalGeometry from HCalContainer for Hit " << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get HcalGeometry from HCalContainer for Hit " << i;
+        continue;
       }
 
       ++j;
 
       // get the global position of the cell
-      const GlobalPoint& globalposition = theDet->getPosition(theDetUnitId);
-
-      if (hCaloHcalE[0]) hCaloHcalE[0]->Fill(itHit->energy());
-      if (hCaloHcalE[1]) hCaloHcalE[1]->Fill(itHit->energy());
-      if (hCaloHcalToF[0]) hCaloHcalToF[0]->Fill(itHit->time());
-      if (hCaloHcalToF[1]) hCaloHcalToF[1]->Fill(itHit->time());
-      if (hCaloHcalPhi) hCaloHcalPhi->Fill(globalposition.phi());
-      if (hCaloHcalEta) hCaloHcalEta->Fill(globalposition.eta());
+      const GlobalPoint &globalposition = theDet->getPosition(theDetUnitId);
+
+      if (hCaloHcalE[0])
+        hCaloHcalE[0]->Fill(itHit->energy());
+      if (hCaloHcalE[1])
+        hCaloHcalE[1]->Fill(itHit->energy());
+      if (hCaloHcalToF[0])
+        hCaloHcalToF[0]->Fill(itHit->time());
+      if (hCaloHcalToF[1])
+        hCaloHcalToF[1]->Fill(itHit->time());
+      if (hCaloHcalPhi)
+        hCaloHcalPhi->Fill(globalposition.phi());
+      if (hCaloHcalEta)
+        hCaloHcalEta->Fill(globalposition.eta());
 
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "HCal PCaloHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dHcal << "," << sdHcalBrl
-	<< " || " << sdHcalEC << " || " << sdHcalOut << " || " << sdHcalFwd
-	<< "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "HCal PCaloHit " << i << " is expected to be (det,subdet) = (" << dHcal << ","
+                                    << sdHcalBrl << " || " << sdHcalEC << " || " << sdHcalOut << " || " << sdHcalFwd
+                                    << "); value returned is: (" << detector << "," << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through HCal Hits
+    }  // end detector type check
+  }    // end loop through HCal Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of HCal Hits collected:............. ";
     eventout += j;
-  }  
+  }
 
-  if (hCaloHcal[0]) hCaloHcal[0]->Fill((float)j);
-  if (hCaloHcal[1]) hCaloHcal[1]->Fill((float)j); 
+  if (hCaloHcal[0])
+    hCaloHcal[0]->Fill((float)j);
+  if (hCaloHcal[1])
+    hCaloHcal[1]->Fill((float)j);
 
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
diff --git a/Validation/GlobalHits/src/GlobalHitsProdHistStripper.cc b/Validation/GlobalHits/src/GlobalHitsProdHistStripper.cc
index 8d143096ac4cc..79da37abaa4e3 100644
--- a/Validation/GlobalHits/src/GlobalHitsProdHistStripper.cc
+++ b/Validation/GlobalHits/src/GlobalHitsProdHistStripper.cc
@@ -1,23 +1,24 @@
 /** \file GlobalHitsProdHistStripper.cc
- *  
+ *
  *  See header file for description of class
  *
  *  \author M. Strang SUNY-Buffalo
  */
 
-#include "Validation/GlobalHits/interface/GlobalHitsProdHistStripper.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "Validation/GlobalHits/interface/GlobalHitsProdHistStripper.h"
 
-GlobalHitsProdHistStripper::GlobalHitsProdHistStripper(const 
-						       edm::ParameterSet& 
-						       iPSet) 
-  : fName(""), verbosity(0), frequency(0), vtxunit(0), 
-    getAllProvenances(false), printProvenanceInfo(false), outputfile(""),
-    count(0)
-{
-  std::string MsgLoggerCat = 
-    "GlobalHitsProdHistStripper_GlobalHitsProdHistStripper";
+GlobalHitsProdHistStripper::GlobalHitsProdHistStripper(const edm::ParameterSet &iPSet)
+    : fName(""),
+      verbosity(0),
+      frequency(0),
+      vtxunit(0),
+      getAllProvenances(false),
+      printProvenanceInfo(false),
+      outputfile(""),
+      count(0) {
+  std::string MsgLoggerCat = "GlobalHitsProdHistStripper_GlobalHitsProdHistStripper";
 
   // get information from parameter set
   fName = iPSet.getUntrackedParameter<std::string>("Name");
@@ -26,13 +27,9 @@ GlobalHitsProdHistStripper::GlobalHitsProdHistStripper(const
   vtxunit = iPSet.getUntrackedParameter<int>("VtxUnit");
   outputfile = iPSet.getParameter<std::string>("OutputFile");
   doOutput = iPSet.getParameter<bool>("DoOutput");
-  edm::ParameterSet m_Prov =
-    iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup");
-  getAllProvenances = 
-    m_Prov.getUntrackedParameter<bool>("GetAllProvenances");
-  printProvenanceInfo = 
-    m_Prov.getUntrackedParameter<bool>("PrintProvenanceInfo");
-
+  edm::ParameterSet m_Prov = iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup");
+  getAllProvenances = m_Prov.getUntrackedParameter<bool>("GetAllProvenances");
+  printProvenanceInfo = m_Prov.getUntrackedParameter<bool>("PrintProvenanceInfo");
 
   // use value of first digit to determine default output level (inclusive)
   // 0 is none, 1 is basic, 2 is fill output, 3 is gather output
@@ -42,7 +39,7 @@ GlobalHitsProdHistStripper::GlobalHitsProdHistStripper(const
   dbe = nullptr;
   dbe = edm::Service<DQMStore>().operator->();
   if (dbe) {
-    if (verbosity > 0 ) {
+    if (verbosity > 0) {
       dbe->setVerbose(1);
     } else {
       dbe->setVerbose(0);
@@ -50,90 +47,78 @@ GlobalHitsProdHistStripper::GlobalHitsProdHistStripper(const
   }
 
   if (dbe) {
-    if (verbosity > 0 ) dbe->showDirStructure();
+    if (verbosity > 0)
+      dbe->showDirStructure();
   }
 
   // print out Parameter Set information being used
   if (verbosity >= 0) {
-    edm::LogInfo(MsgLoggerCat) 
-      << "\n===============================\n"
-      << "Initialized as EDAnalyzer with parameter values:\n"
-      << "    Name           = " << fName << "\n"
-      << "    Verbosity      = " << verbosity << "\n"
-      << "    Frequency      = " << frequency << "\n"
-      << "    VtxUnit        = " << vtxunit << "\n"
-      << "    OutputFile     = " << outputfile << "\n"
-      << "    DoOutput      = " << doOutput << "\n"
-      << "    GetProv        = " << getAllProvenances << "\n"
-      << "    PrintProv      = " << printProvenanceInfo << "\n"
-      << "===============================\n";
+    edm::LogInfo(MsgLoggerCat) << "\n===============================\n"
+                               << "Initialized as EDAnalyzer with parameter values:\n"
+                               << "    Name           = " << fName << "\n"
+                               << "    Verbosity      = " << verbosity << "\n"
+                               << "    Frequency      = " << frequency << "\n"
+                               << "    VtxUnit        = " << vtxunit << "\n"
+                               << "    OutputFile     = " << outputfile << "\n"
+                               << "    DoOutput      = " << doOutput << "\n"
+                               << "    GetProv        = " << getAllProvenances << "\n"
+                               << "    PrintProv      = " << printProvenanceInfo << "\n"
+                               << "===============================\n";
   }
-
 }
 
-GlobalHitsProdHistStripper::~GlobalHitsProdHistStripper() 
-{
+GlobalHitsProdHistStripper::~GlobalHitsProdHistStripper() {
   if (doOutput)
-    if (!outputfile.empty() && dbe) dbe->save(outputfile);
+    if (!outputfile.empty() && dbe)
+      dbe->save(outputfile);
 }
 
-void GlobalHitsProdHistStripper::beginJob( void )
-{
-  return;
-}
+void GlobalHitsProdHistStripper::beginJob(void) { return; }
 
-void GlobalHitsProdHistStripper::endJob()
-{
+void GlobalHitsProdHistStripper::endJob() {
   std::string MsgLoggerCat = "GlobalHitsProdHistStripper_endJob";
   if (verbosity >= 0)
-    edm::LogInfo(MsgLoggerCat) 
-      << "Terminating having processed " << count << " runs.";
+    edm::LogInfo(MsgLoggerCat) << "Terminating having processed " << count << " runs.";
   return;
 }
 
-void GlobalHitsProdHistStripper::beginRun(const edm::Run& iRun,
-					  const edm::EventSetup& iSetup)
-{
+void GlobalHitsProdHistStripper::beginRun(const edm::Run &iRun, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalHitsProdHistStripper_beginRun";
   // keep track of number of runs processed
-  ++count;  
+  ++count;
 
   int nrun = iRun.run();
 
   if (verbosity > 0) {
-    edm::LogInfo(MsgLoggerCat)
-      << "Processing run " << nrun << " (" << count << " runs total)";
+    edm::LogInfo(MsgLoggerCat) << "Processing run " << nrun << " (" << count << " runs total)";
   } else if (verbosity == 0) {
-    if (nrun%frequency == 0 || count == 1) {
-      edm::LogInfo(MsgLoggerCat)
-	<< "Processing run " << nrun << " (" << count << " runs total)";
+    if (nrun % frequency == 0 || count == 1) {
+      edm::LogInfo(MsgLoggerCat) << "Processing run " << nrun << " (" << count << " runs total)";
     }
   }
 
   if (getAllProvenances) {
-
-    std::vector<const edm::StableProvenance*> AllProv;
+    std::vector<const edm::StableProvenance *> AllProv;
     iRun.getAllStableProvenance(AllProv);
 
     if (verbosity >= 0)
-      edm::LogInfo(MsgLoggerCat)
-	<< "Number of Provenances = " << AllProv.size();
+      edm::LogInfo(MsgLoggerCat) << "Number of Provenances = " << AllProv.size();
 
     if (printProvenanceInfo && (verbosity >= 0)) {
-      TString eventout("\nProvenance info:\n");      
+      TString eventout("\nProvenance info:\n");
 
       for (unsigned int i = 0; i < AllProv.size(); ++i) {
-	eventout += "\n       ******************************";
-	eventout += "\n       Module       : ";
-	eventout += AllProv[i]->moduleLabel();
-	eventout += "\n       ProductID    : ";
-	eventout += AllProv[i]->productID().id();
-	eventout += "\n       ClassName    : ";
-	eventout += AllProv[i]->className();
-	eventout += "\n       InstanceName : ";
-	eventout += AllProv[i]->productInstanceName();
-	eventout += "\n       BranchName   : ";
-	eventout += AllProv[i]->branchName();
+        eventout += "\n       ******************************";
+        eventout += "\n       Module       : ";
+        eventout += AllProv[i]->moduleLabel();
+        eventout += "\n       ProductID    : ";
+        eventout += AllProv[i]->productID().id();
+        eventout += "\n       ClassName    : ";
+        eventout += AllProv[i]->className();
+        eventout += "\n       InstanceName : ";
+        eventout += AllProv[i]->productInstanceName();
+        eventout += "\n       BranchName   : ";
+        eventout += AllProv[i]->branchName();
       }
       eventout += "\n       ******************************\n";
       edm::LogInfo(MsgLoggerCat) << eventout << "\n";
@@ -145,137 +130,129 @@ void GlobalHitsProdHistStripper::beginRun(const edm::Run& iRun,
   return;
 }
 
-void GlobalHitsProdHistStripper::endRun(const edm::Run& iRun,
-					const edm::EventSetup& iSetup)
-{
+void GlobalHitsProdHistStripper::endRun(const edm::Run &iRun, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalHitsProdHistStripper_endRun";
 
   edm::Handle<TH1F> histogram1D;
-  std::vector<edm::Handle<TH1F> > allhistogram1D;
+  std::vector<edm::Handle<TH1F>> allhistogram1D;
   iRun.getManyByType(allhistogram1D);
 
   me.resize(allhistogram1D.size());
 
   for (uint i = 0; i < allhistogram1D.size(); ++i) {
     histogram1D = allhistogram1D[i];
-    if(!histogram1D.isValid()) {
-      edm::LogWarning(MsgLoggerCat)
-	<< "Invalid histogram extracted from event.";
-      continue;      
+    if (!histogram1D.isValid()) {
+      edm::LogWarning(MsgLoggerCat) << "Invalid histogram extracted from event.";
+      continue;
     }
 
     me[i] = nullptr;
 
     /*
     std::cout << "Extracting histogram: " << std::endl
-	      << "       Module       : "
-	      << (histogram1D.provenance()->branchDescription()).moduleLabel()
-	      << std::endl
-	      << "       ProductID    : "
-	      << (histogram1D.provenance()->branchDescription()).productID().id()
-	      << std::endl
-	      << "       ClassName    : "
-	      << (histogram1D.provenance()->branchDescription()).className()
-	      << std::endl
-	      << "       InstanceName : "
-	      << (histogram1D.provenance()->branchDescription()).productInstanceName()
-	      << std::endl
-	      << "       BranchName   : "
-	      << (histogram1D.provenance()->branchDescription()).branchName()
-	      << std::endl;
+              << "       Module       : "
+              << (histogram1D.provenance()->branchDescription()).moduleLabel()
+              << std::endl
+              << "       ProductID    : "
+              <<
+    (histogram1D.provenance()->branchDescription()).productID().id()
+              << std::endl
+              << "       ClassName    : "
+              << (histogram1D.provenance()->branchDescription()).className()
+              << std::endl
+              << "       InstanceName : "
+              <<
+    (histogram1D.provenance()->branchDescription()).productInstanceName()
+              << std::endl
+              << "       BranchName   : "
+              << (histogram1D.provenance()->branchDescription()).branchName()
+              << std::endl;
     */
 
-    if ((histogram1D.provenance()->branchDescription()).moduleLabel()
-	!= "globalhitsprodhist") continue;
-   
+    if ((histogram1D.provenance()->branchDescription()).moduleLabel() != "globalhitsprodhist")
+      continue;
+
     std::string histname = histogram1D->GetName();
-    
-    std::string subhist1 = histname.substr(1,5);
-    std::string subhist2 = histname.substr(1,4);
+
+    std::string subhist1 = histname.substr(1, 5);
+    std::string subhist2 = histname.substr(1, 4);
 
     if (dbe) {
       if (subhist1 == "CaloE" || subhist1 == "CaloP") {
-	dbe->setCurrentFolder("GlobalHitsV/ECal");
+        dbe->setCurrentFolder("GlobalHitsV/ECal");
       } else if (subhist1 == "CaloH") {
-	dbe->setCurrentFolder("GlobalHitsV/HCal");
-      } else if (subhist1 == "Geant" || subhist2 == "MCG4" ||
-		 subhist1 == "MCRGP") {
-	dbe->setCurrentFolder("GlobalHitsV/MCGeant");
+        dbe->setCurrentFolder("GlobalHitsV/HCal");
+      } else if (subhist1 == "Geant" || subhist2 == "MCG4" || subhist1 == "MCRGP") {
+        dbe->setCurrentFolder("GlobalHitsV/MCGeant");
       } else if (subhist2 == "Muon") {
-	dbe->setCurrentFolder("GlobalHitsV/Muon");
+        dbe->setCurrentFolder("GlobalHitsV/Muon");
       } else if (subhist1 == "Track") {
-	dbe->setCurrentFolder("GlobalHitsV/Tracker");
+        dbe->setCurrentFolder("GlobalHitsV/Tracker");
       }
-     
-      me[i] = dbe->book1D(histname,histogram1D->GetTitle(),
-		       histogram1D->GetXaxis()->GetNbins(),
-		       histogram1D->GetXaxis()->GetXmin(),
-		       histogram1D->GetXaxis()->GetXmax());
-      me[i]->setAxisTitle(histogram1D->GetXaxis()->GetTitle(),1);
-      me[i]->setAxisTitle(histogram1D->GetYaxis()->GetTitle(),2);
-      
+
+      me[i] = dbe->book1D(histname,
+                          histogram1D->GetTitle(),
+                          histogram1D->GetXaxis()->GetNbins(),
+                          histogram1D->GetXaxis()->GetXmin(),
+                          histogram1D->GetXaxis()->GetXmax());
+      me[i]->setAxisTitle(histogram1D->GetXaxis()->GetTitle(), 1);
+      me[i]->setAxisTitle(histogram1D->GetYaxis()->GetTitle(), 2);
     }
-    
+
     std::string mename = me[i]->getName();
-    
-    //std::cout << "Extracting histogram " << histname
+
+    // std::cout << "Extracting histogram " << histname
     //	      << " into MonitorElement " << mename
     //	      << std::endl;
-    
+
     for (Int_t x = 1; x <= histogram1D->GetXaxis()->GetNbins(); ++x) {
       Double_t binx = histogram1D->GetBinCenter(x);
       Double_t value = histogram1D->GetBinContent(x);
-      me[i]->Fill(binx,value);
+      me[i]->Fill(binx, value);
     }
   }
   return;
 }
-    /*
-    if (iter != monitorElements.end()) {
-      
-      std::string mename = iter->second->getName();
-
-      std::cout << "Extracting histogram " << histname
-		<< " into MonitorElement " << mename
-		<< std::endl;
-    
-      if (histname == "hGeantTrkE" || histname == "hGeantTrkPt") {
-	std::cout << "Information stored in histogram pointer:" 
-		  << std::endl;
-	std::cout << histname << ":" << std::endl;
-	std::cout << "  Entries: " << histogram1D->GetEntries() 
-		  << std::endl;
-	std::cout << "  Mean: " << histogram1D->GetMean() << std::endl;
-	std::cout << "  RMS: " << histogram1D->GetRMS() << std::endl;
-      }
+/*
+if (iter != monitorElements.end()) {
+
+  std::string mename = iter->second->getName();
+
+  std::cout << "Extracting histogram " << histname
+            << " into MonitorElement " << mename
+            << std::endl;
+
+  if (histname == "hGeantTrkE" || histname == "hGeantTrkPt") {
+    std::cout << "Information stored in histogram pointer:"
+              << std::endl;
+    std::cout << histname << ":" << std::endl;
+    std::cout << "  Entries: " << histogram1D->GetEntries()
+              << std::endl;
+    std::cout << "  Mean: " << histogram1D->GetMean() << std::endl;
+    std::cout << "  RMS: " << histogram1D->GetRMS() << std::endl;
+  }
 
-      for (Int_t x = 1; x <= histogram1D->GetXaxis()->GetNbins(); ++x) {
-	Double_t binx = histogram1D->GetBinCenter(x);
-	Double_t value = histogram1D->GetBinContent(x);
-	iter->second->Fill(binx,value);
-      }
-     
-      if (histname == "hGeantTrkE" || histname == "hGeantTrkPt") {
-	std::cout << "Information stored in monitor element:" << std::endl;
-	std::cout << mename << ":" << std::endl;
-	std::cout << "  Entries: " 
-		  << iter->second->getEntries() << std::endl;
-	std::cout << "  Mean: " << iter->second->getMean() 
-		  << std::endl;
-	std::cout << "  RMS: " << iter->second->getRMS() 
-		  << std::endl;
-		  }
-  } // find in map
-} // loop through getManyByType
+  for (Int_t x = 1; x <= histogram1D->GetXaxis()->GetNbins(); ++x) {
+    Double_t binx = histogram1D->GetBinCenter(x);
+    Double_t value = histogram1D->GetBinContent(x);
+    iter->second->Fill(binx,value);
+  }
 
-  return;
-}
-    */
+  if (histname == "hGeantTrkE" || histname == "hGeantTrkPt") {
+    std::cout << "Information stored in monitor element:" << std::endl;
+    std::cout << mename << ":" << std::endl;
+    std::cout << "  Entries: "
+              << iter->second->getEntries() << std::endl;
+    std::cout << "  Mean: " << iter->second->getMean()
+              << std::endl;
+    std::cout << "  RMS: " << iter->second->getRMS()
+              << std::endl;
+              }
+} // find in map
+} // loop through getManyByType
 
-void GlobalHitsProdHistStripper::analyze(const edm::Event& iEvent, 
-					 const edm::EventSetup& iSetup)
-{
-  return;
+return;
 }
+*/
 
-
+void GlobalHitsProdHistStripper::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) { return; }
diff --git a/Validation/GlobalHits/src/GlobalHitsProducer.cc b/Validation/GlobalHits/src/GlobalHitsProducer.cc
index 988678940b467..4b0d95ef521e4 100644
--- a/Validation/GlobalHits/src/GlobalHitsProducer.cc
+++ b/Validation/GlobalHits/src/GlobalHitsProducer.cc
@@ -1,27 +1,32 @@
 /** \file GlobalHitsProducer.cc
- *  
+ *
  *  See header file for description of class
  *
  *  \author M. Strang SUNY-Buffalo
  */
 
-#include "Validation/GlobalHits/interface/GlobalHitsProducer.h"
-#include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h"
+#include "Geometry/Records/interface/CaloGeometryRecord.h"
+#include "Validation/GlobalHits/interface/GlobalHitsProducer.h"
 
-GlobalHitsProducer::GlobalHitsProducer(const edm::ParameterSet& iPSet) :
-  fName(""), verbosity(0), frequency(0), vtxunit(0), label(""), 
-  getAllProvenances(false), printProvenanceInfo(false), nRawGenPart(0), 
-  G4VtxSrc_Token_( consumes<edm::SimVertexContainer>((iPSet.getParameter<edm::InputTag>("G4VtxSrc"))) ),
-  G4TrkSrc_Token_( consumes<edm::SimTrackContainer>(iPSet.getParameter<edm::InputTag>("G4TrkSrc")) ),
-  //ECalEBSrc_(""), ECalEESrc_(""), ECalESSrc_(""), HCalSrc_(""),
-  //PxlBrlLowSrc_(""), PxlBrlHighSrc_(""), PxlFwdLowSrc_(""),
-  //PxlFwdHighSrc_(""), SiTIBLowSrc_(""), SiTIBHighSrc_(""),
-  //SiTOBLowSrc_(""), SiTOBHighSrc_(""), SiTIDLowSrc_(""), 
-  //SiTIDHighSrc_(""), SiTECLowSrc_(""), SiTECHighSrc_(""),
-  //MuonDtSrc_(""), MuonCscSrc_(""), MuonRpcSrc_(""), 
-  count(0)
-{
+GlobalHitsProducer::GlobalHitsProducer(const edm::ParameterSet &iPSet)
+    : fName(""),
+      verbosity(0),
+      frequency(0),
+      vtxunit(0),
+      label(""),
+      getAllProvenances(false),
+      printProvenanceInfo(false),
+      nRawGenPart(0),
+      G4VtxSrc_Token_(consumes<edm::SimVertexContainer>((iPSet.getParameter<edm::InputTag>("G4VtxSrc")))),
+      G4TrkSrc_Token_(consumes<edm::SimTrackContainer>(iPSet.getParameter<edm::InputTag>("G4TrkSrc"))),
+      // ECalEBSrc_(""), ECalEESrc_(""), ECalESSrc_(""), HCalSrc_(""),
+      // PxlBrlLowSrc_(""), PxlBrlHighSrc_(""), PxlFwdLowSrc_(""),
+      // PxlFwdHighSrc_(""), SiTIBLowSrc_(""), SiTIBHighSrc_(""),
+      // SiTOBLowSrc_(""), SiTOBHighSrc_(""), SiTIDLowSrc_(""),
+      // SiTIDHighSrc_(""), SiTECLowSrc_(""), SiTECHighSrc_(""),
+      // MuonDtSrc_(""), MuonCscSrc_(""), MuonRpcSrc_(""),
+      count(0) {
   std::string MsgLoggerCat = "GlobalHitsProducer_GlobalHitsProducer";
 
   // get information from parameter set
@@ -30,14 +35,11 @@ GlobalHitsProducer::GlobalHitsProducer(const edm::ParameterSet& iPSet) :
   frequency = iPSet.getUntrackedParameter<int>("Frequency");
   vtxunit = iPSet.getUntrackedParameter<int>("VtxUnit");
   label = iPSet.getParameter<std::string>("Label");
-  edm::ParameterSet m_Prov =
-    iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup");
-  getAllProvenances = 
-    m_Prov.getUntrackedParameter<bool>("GetAllProvenances");
-  printProvenanceInfo = 
-    m_Prov.getUntrackedParameter<bool>("PrintProvenanceInfo");
-
-  //get Labels to use to extract information
+  edm::ParameterSet m_Prov = iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup");
+  getAllProvenances = m_Prov.getUntrackedParameter<bool>("GetAllProvenances");
+  printProvenanceInfo = m_Prov.getUntrackedParameter<bool>("PrintProvenanceInfo");
+
+  // get Labels to use to extract information
   PxlBrlLowSrc_ = iPSet.getParameter<edm::InputTag>("PxlBrlLowSrc");
   PxlBrlHighSrc_ = iPSet.getParameter<edm::InputTag>("PxlBrlHighSrc");
   PxlFwdLowSrc_ = iPSet.getParameter<edm::InputTag>("PxlFwdLowSrc");
@@ -95,83 +97,54 @@ GlobalHitsProducer::GlobalHitsProducer(const edm::ParameterSet& iPSet) :
 
   // print out Parameter Set information being used
   if (verbosity >= 0) {
-    edm::LogInfo(MsgLoggerCat) 
-      << "\n===============================\n"
-      << "Initialized as EDProducer with parameter values:\n"
-      << "    Name          = " << fName << "\n"
-      << "    Verbosity     = " << verbosity << "\n"
-      << "    Frequency     = " << frequency << "\n"
-      << "    VtxUnit       = " << vtxunit << "\n"
-      << "    Label         = " << label << "\n"
-      << "    GetProv       = " << getAllProvenances << "\n"
-      << "    PrintProv     = " << printProvenanceInfo << "\n"
-      << "    PxlBrlLowSrc  = " << PxlBrlLowSrc_.label() 
-      << ":" << PxlBrlLowSrc_.instance() << "\n"
-      << "    PxlBrlHighSrc = " << PxlBrlHighSrc_.label() 
-      << ":" << PxlBrlHighSrc_.instance() << "\n"
-      << "    PxlFwdLowSrc  = " << PxlFwdLowSrc_.label() 
-      << ":" << PxlBrlLowSrc_.instance() << "\n"
-      << "    PxlFwdHighSrc = " << PxlFwdHighSrc_.label() 
-      << ":" << PxlBrlHighSrc_.instance() << "\n"
-      << "    SiTIBLowSrc   = " << SiTIBLowSrc_.label() 
-      << ":" << SiTIBLowSrc_.instance() << "\n"
-      << "    SiTIBHighSrc  = " << SiTIBHighSrc_.label() 
-      << ":" << SiTIBHighSrc_.instance() << "\n"
-      << "    SiTOBLowSrc   = " << SiTOBLowSrc_.label() 
-      << ":" << SiTOBLowSrc_.instance() << "\n"
-      << "    SiTOBHighSrc  = " << SiTOBHighSrc_.label() 
-      << ":" << SiTOBHighSrc_.instance() << "\n"
-      << "    SiTIDLowSrc   = " << SiTIDLowSrc_.label() 
-      << ":" << SiTIDLowSrc_.instance() << "\n"
-      << "    SiTIDHighSrc  = " << SiTIDHighSrc_.label() 
-      << ":" << SiTIDHighSrc_.instance() << "\n"
-      << "    SiTECLowSrc   = " << SiTECLowSrc_.label() 
-      << ":" << SiTECLowSrc_.instance() << "\n"
-      << "    SiTECHighSrc  = " << SiTECHighSrc_.label() 
-      << ":" << SiTECHighSrc_.instance() << "\n"
-      << "    MuonCscSrc    = " << MuonCscSrc_.label() 
-      << ":" << MuonCscSrc_.instance() << "\n"
-      << "    MuonDtSrc     = " << MuonDtSrc_.label() 
-      << ":" << MuonDtSrc_.instance() << "\n"
-      << "    MuonRpcSrc    = " << MuonRpcSrc_.label() 
-      << ":" << MuonRpcSrc_.instance() << "\n"
-      << "    ECalEBSrc     = " << ECalEBSrc_.label() 
-      << ":" << ECalEBSrc_.instance() << "\n"
-      << "    ECalEESrc     = " << ECalEESrc_.label() 
-      << ":" << ECalEESrc_.instance() << "\n"
-      << "    ECalESSrc     = " << ECalESSrc_.label() 
-      << ":" << ECalESSrc_.instance() << "\n"
-      << "    HCalSrc       = " << HCalSrc_.label() 
-      << ":" << HCalSrc_.instance() << "\n"
-      << "===============================\n";
+    edm::LogInfo(MsgLoggerCat)
+        << "\n===============================\n"
+        << "Initialized as EDProducer with parameter values:\n"
+        << "    Name          = " << fName << "\n"
+        << "    Verbosity     = " << verbosity << "\n"
+        << "    Frequency     = " << frequency << "\n"
+        << "    VtxUnit       = " << vtxunit << "\n"
+        << "    Label         = " << label << "\n"
+        << "    GetProv       = " << getAllProvenances << "\n"
+        << "    PrintProv     = " << printProvenanceInfo << "\n"
+        << "    PxlBrlLowSrc  = " << PxlBrlLowSrc_.label() << ":" << PxlBrlLowSrc_.instance() << "\n"
+        << "    PxlBrlHighSrc = " << PxlBrlHighSrc_.label() << ":" << PxlBrlHighSrc_.instance() << "\n"
+        << "    PxlFwdLowSrc  = " << PxlFwdLowSrc_.label() << ":" << PxlBrlLowSrc_.instance() << "\n"
+        << "    PxlFwdHighSrc = " << PxlFwdHighSrc_.label() << ":" << PxlBrlHighSrc_.instance() << "\n"
+        << "    SiTIBLowSrc   = " << SiTIBLowSrc_.label() << ":" << SiTIBLowSrc_.instance() << "\n"
+        << "    SiTIBHighSrc  = " << SiTIBHighSrc_.label() << ":" << SiTIBHighSrc_.instance() << "\n"
+        << "    SiTOBLowSrc   = " << SiTOBLowSrc_.label() << ":" << SiTOBLowSrc_.instance() << "\n"
+        << "    SiTOBHighSrc  = " << SiTOBHighSrc_.label() << ":" << SiTOBHighSrc_.instance() << "\n"
+        << "    SiTIDLowSrc   = " << SiTIDLowSrc_.label() << ":" << SiTIDLowSrc_.instance() << "\n"
+        << "    SiTIDHighSrc  = " << SiTIDHighSrc_.label() << ":" << SiTIDHighSrc_.instance() << "\n"
+        << "    SiTECLowSrc   = " << SiTECLowSrc_.label() << ":" << SiTECLowSrc_.instance() << "\n"
+        << "    SiTECHighSrc  = " << SiTECHighSrc_.label() << ":" << SiTECHighSrc_.instance() << "\n"
+        << "    MuonCscSrc    = " << MuonCscSrc_.label() << ":" << MuonCscSrc_.instance() << "\n"
+        << "    MuonDtSrc     = " << MuonDtSrc_.label() << ":" << MuonDtSrc_.instance() << "\n"
+        << "    MuonRpcSrc    = " << MuonRpcSrc_.label() << ":" << MuonRpcSrc_.instance() << "\n"
+        << "    ECalEBSrc     = " << ECalEBSrc_.label() << ":" << ECalEBSrc_.instance() << "\n"
+        << "    ECalEESrc     = " << ECalEESrc_.label() << ":" << ECalEESrc_.instance() << "\n"
+        << "    ECalESSrc     = " << ECalESSrc_.label() << ":" << ECalESSrc_.instance() << "\n"
+        << "    HCalSrc       = " << HCalSrc_.label() << ":" << HCalSrc_.instance() << "\n"
+        << "===============================\n";
   }
 
   // migrated here from beginJob
   clear();
-
 }
 
-GlobalHitsProducer::~GlobalHitsProducer() 
-{
-}
+GlobalHitsProducer::~GlobalHitsProducer() {}
 
-void GlobalHitsProducer::beginJob( void )
-{
-  return;
-}
+void GlobalHitsProducer::beginJob(void) { return; }
 
-void GlobalHitsProducer::endJob()
-{
+void GlobalHitsProducer::endJob() {
   std::string MsgLoggerCat = "GlobalHitsProducer_endJob";
   if (verbosity >= 0)
-    edm::LogInfo(MsgLoggerCat) 
-      << "Terminating having processed " << count << " events.";
+    edm::LogInfo(MsgLoggerCat) << "Terminating having processed " << count << " events.";
   return;
 }
 
-void GlobalHitsProducer::produce(edm::Event& iEvent, 
-			       const edm::EventSetup& iSetup)
-{
+void GlobalHitsProducer::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalHitsProducer_produce";
 
   // keep track of number of events processed
@@ -182,14 +155,11 @@ void GlobalHitsProducer::produce(edm::Event& iEvent,
   edm::EventNumber_t nevt = iEvent.id().event();
 
   if (verbosity > 0) {
-    edm::LogInfo(MsgLoggerCat)
-      << "Processing run " << nrun << ", event " << nevt
-      << " (" << count << " events total)";
+    edm::LogInfo(MsgLoggerCat) << "Processing run " << nrun << ", event " << nevt << " (" << count << " events total)";
   } else if (verbosity == 0) {
-    if (nevt%frequency == 0 || nevt == 1) {
-      edm::LogInfo(MsgLoggerCat)
-	<< "Processing run " << nrun << ", event " << nevt
-	<< " (" << count << " events total)";
+    if (nevt % frequency == 0 || nevt == 1) {
+      edm::LogInfo(MsgLoggerCat) << "Processing run " << nrun << ", event " << nevt << " (" << count
+                                 << " events total)";
     }
   }
 
@@ -198,29 +168,27 @@ void GlobalHitsProducer::produce(edm::Event& iEvent,
 
   // look at information available in the event
   if (getAllProvenances) {
-
-    std::vector<const edm::StableProvenance*> AllProv;
+    std::vector<const edm::StableProvenance *> AllProv;
     iEvent.getAllStableProvenance(AllProv);
 
     if (verbosity >= 0)
-      edm::LogInfo(MsgLoggerCat)
-	<< "Number of Provenances = " << AllProv.size();
+      edm::LogInfo(MsgLoggerCat) << "Number of Provenances = " << AllProv.size();
 
     if (printProvenanceInfo && (verbosity >= 0)) {
-      TString eventout("\nProvenance info:\n");      
+      TString eventout("\nProvenance info:\n");
 
       for (unsigned int i = 0; i < AllProv.size(); ++i) {
-	eventout += "\n       ******************************";
-	eventout += "\n       Module       : ";
-	eventout += AllProv[i]->moduleLabel();
-	eventout += "\n       ProductID    : ";
-	eventout += AllProv[i]->productID().id();
-	eventout += "\n       ClassName    : ";
-	eventout += AllProv[i]->className();
-	eventout += "\n       InstanceName : ";
-	eventout += AllProv[i]->productInstanceName();
-	eventout += "\n       BranchName   : ";
-	eventout += AllProv[i]->branchName();
+        eventout += "\n       ******************************";
+        eventout += "\n       Module       : ";
+        eventout += AllProv[i]->moduleLabel();
+        eventout += "\n       ProductID    : ";
+        eventout += AllProv[i]->productID().id();
+        eventout += "\n       ClassName    : ";
+        eventout += AllProv[i]->className();
+        eventout += "\n       InstanceName : ";
+        eventout += AllProv[i]->productInstanceName();
+        eventout += "\n       BranchName   : ";
+        eventout += AllProv[i]->branchName();
       }
       eventout += "\n       ******************************\n";
       edm::LogInfo(MsgLoggerCat) << eventout << "\n";
@@ -230,10 +198,10 @@ void GlobalHitsProducer::produce(edm::Event& iEvent,
   }
 
   // call fill functions
-  //gather G4MC information from event
+  // gather G4MC information from event
   fillG4MC(iEvent);
   // gather Tracker information from event
-  fillTrk(iEvent,iSetup);
+  fillTrk(iEvent, iSetup);
   // gather muon information from event
   fillMuon(iEvent, iSetup);
   // gather Ecal information from event
@@ -242,15 +210,13 @@ void GlobalHitsProducer::produce(edm::Event& iEvent,
   fillHCal(iEvent, iSetup);
 
   if (verbosity > 0)
-    edm::LogInfo (MsgLoggerCat)
-      << "Done gathering data from event.";
+    edm::LogInfo(MsgLoggerCat) << "Done gathering data from event.";
 
   // produce object to put into event
   std::unique_ptr<PGlobalSimHit> pOut(new PGlobalSimHit);
 
   if (verbosity > 2)
-    edm::LogInfo (MsgLoggerCat)
-      << "Saving event contents:";
+    edm::LogInfo(MsgLoggerCat) << "Saving event contents:";
 
   // call store functions
   // store G4MC information in product
@@ -265,17 +231,15 @@ void GlobalHitsProducer::produce(edm::Event& iEvent,
   storeHCal(*pOut);
 
   // store information in event
-  iEvent.put(std::move(pOut),label);
+  iEvent.put(std::move(pOut), label);
 
   return;
 }
 
 //==================fill and store functions================================
-void GlobalHitsProducer::fillG4MC(edm::Event& iEvent)
-{
-
+void GlobalHitsProducer::fillG4MC(edm::Event &iEvent) {
   std::string MsgLoggerCat = "GlobalHitsProducer_fillG4MC";
- 
+
   TString eventout;
   if (verbosity > 0)
     eventout = "\nGathering info:";
@@ -284,7 +248,7 @@ void GlobalHitsProducer::fillG4MC(edm::Event& iEvent)
   // get MC information
   /////////////////////
   edm::Handle<edm::HepMCProduct> HepMCEvt;
-  std::vector<edm::Handle<edm::HepMCProduct> > AllHepMCEvt;
+  std::vector<edm::Handle<edm::HepMCProduct>> AllHepMCEvt;
   iEvent.getManyByType(AllHepMCEvt);
 
   // loop through products and extract VtxSmearing if available. Any of them
@@ -296,59 +260,55 @@ void GlobalHitsProducer::fillG4MC(edm::Event& iEvent)
   }
 
   if (!HepMCEvt.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find HepMCProduct in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find HepMCProduct in event!";
     return;
   } else {
     eventout += "\n          Using HepMCProduct: ";
     eventout += (HepMCEvt.provenance()->branchDescription()).moduleLabel();
   }
-  const HepMC::GenEvent* MCEvt = HepMCEvt->GetEvent();
+  const HepMC::GenEvent *MCEvt = HepMCEvt->GetEvent();
   nRawGenPart = MCEvt->particles_size();
 
   if (verbosity > 1) {
     eventout += "\n          Number of Raw Particles collected:......... ";
     eventout += nRawGenPart;
-  }  
+  }
 
   ////////////////////////////
   // get G4Vertex information
   ////////////////////////////
   // convert unit stored in SimVertex to mm
   float unit = 0.;
-  if (vtxunit == 0) unit = 1.;  // already in mm
-  if (vtxunit == 1) unit = 10.; // stored in cm, convert to mm
+  if (vtxunit == 0)
+    unit = 1.;  // already in mm
+  if (vtxunit == 1)
+    unit = 10.;  // stored in cm, convert to mm
 
   edm::Handle<edm::SimVertexContainer> G4VtxContainer;
   iEvent.getByToken(G4VtxSrc_Token_, G4VtxContainer);
   if (!G4VtxContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find SimVertex in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find SimVertex in event!";
     return;
   }
   int i = 0;
   edm::SimVertexContainer::const_iterator itVtx;
-  for (itVtx = G4VtxContainer->begin(); itVtx != G4VtxContainer->end(); 
-       ++itVtx) {
-    
+  for (itVtx = G4VtxContainer->begin(); itVtx != G4VtxContainer->end(); ++itVtx) {
     ++i;
 
-    const math::XYZTLorentzVector G4Vtx1(itVtx->position().x(),
-					 itVtx->position().y(),
-					 itVtx->position().z(),
-					 itVtx->position().e());
+    const math::XYZTLorentzVector G4Vtx1(
+        itVtx->position().x(), itVtx->position().y(), itVtx->position().z(), itVtx->position().e());
     double G4Vtx[4];
     G4Vtx1.GetCoordinates(G4Vtx);
 
-    G4VtxX.push_back((G4Vtx[0]*unit)/micrometer);
-    G4VtxY.push_back((G4Vtx[1]*unit)/micrometer);
-    G4VtxZ.push_back((G4Vtx[2]*unit)/millimeter);
+    G4VtxX.push_back((G4Vtx[0] * unit) / micrometer);
+    G4VtxY.push_back((G4Vtx[1] * unit) / micrometer);
+    G4VtxZ.push_back((G4Vtx[2] * unit) / millimeter);
   }
 
   if (verbosity > 1) {
     eventout += "\n          Number of G4Vertices collected:............ ";
     eventout += i;
-  }  
+  }
 
   ///////////////////////////
   // get G4Track information
@@ -357,32 +317,27 @@ void GlobalHitsProducer::fillG4MC(edm::Event& iEvent)
   iEvent.getByToken(G4TrkSrc_Token_, G4TrkContainer);
 
   if (!G4TrkContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find SimTrack in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find SimTrack in event!";
     return;
   }
   i = 0;
   edm::SimTrackContainer::const_iterator itTrk;
-  for (itTrk = G4TrkContainer->begin(); itTrk != G4TrkContainer->end(); 
-       ++itTrk) {
-
+  for (itTrk = G4TrkContainer->begin(); itTrk != G4TrkContainer->end(); ++itTrk) {
     ++i;
 
-    const math::XYZTLorentzVector G4Trk1(itTrk->momentum().x(),
-					 itTrk->momentum().y(),
-					 itTrk->momentum().z(),
-					 itTrk->momentum().e());
+    const math::XYZTLorentzVector G4Trk1(
+        itTrk->momentum().x(), itTrk->momentum().y(), itTrk->momentum().z(), itTrk->momentum().e());
     double G4Trk[4];
     G4Trk1.GetCoordinates(G4Trk);
 
-    G4TrkPt.push_back(sqrt(G4Trk[0]*G4Trk[0]+G4Trk[1]*G4Trk[1])); //GeV
-    G4TrkE.push_back(G4Trk[3]);                                   //GeV
-  } 
+    G4TrkPt.push_back(sqrt(G4Trk[0] * G4Trk[0] + G4Trk[1] * G4Trk[1]));  // GeV
+    G4TrkE.push_back(G4Trk[3]);                                          // GeV
+  }
 
   if (verbosity > 1) {
     eventout += "\n          Number of G4Tracks collected:.............. ";
     eventout += i;
-  }  
+  }
 
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
@@ -390,8 +345,7 @@ void GlobalHitsProducer::fillG4MC(edm::Event& iEvent)
   return;
 }
 
-void GlobalHitsProducer::storeG4MC(PGlobalSimHit& product)
-{
+void GlobalHitsProducer::storeG4MC(PGlobalSimHit &product) {
   std::string MsgLoggerCat = "GlobalHitsProducer_storeG4MC";
 
   if (verbosity > 2) {
@@ -406,7 +360,7 @@ void GlobalHitsProducer::storeG4MC(PGlobalSimHit& product)
       eventout += G4VtxY[i];
       eventout += ", ";
       eventout += G4VtxZ[i];
-      eventout += ")";      
+      eventout += ")";
     }
     eventout += "\n       nG4Trk             = ";
     eventout += G4TrkPt.size();
@@ -416,9 +370,9 @@ void GlobalHitsProducer::storeG4MC(PGlobalSimHit& product)
       eventout += ", ";
       eventout += G4TrkE[i];
       eventout += ")";
-    }    
+    }
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
-  } // end verbose output
+  }  // end verbose output
 
   product.putRawGenPart(nRawGenPart);
   product.putG4Vtx(G4VtxX, G4VtxY, G4VtxZ);
@@ -427,25 +381,22 @@ void GlobalHitsProducer::storeG4MC(PGlobalSimHit& product)
   return;
 }
 
-void GlobalHitsProducer::fillTrk(edm::Event& iEvent, 
-				const edm::EventSetup& iSetup)
-{
+void GlobalHitsProducer::fillTrk(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalHitsProducer_fillTrk";
 
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
-  
+    eventout = "\nGathering info:";
+
   // access the tracker geometry
   edm::ESHandle<TrackerGeometry> theTrackerGeometry;
   iSetup.get<TrackerDigiGeometryRecord>().get(theTrackerGeometry);
   if (!theTrackerGeometry.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerDigiGeometryRecord in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerDigiGeometryRecord in event!";
     return;
   }
-  const TrackerGeometry& theTracker(*theTrackerGeometry);
-    
+  const TrackerGeometry &theTracker(*theTrackerGeometry);
+
   // iterator to access containers
   edm::PSimHitContainer::const_iterator itHit;
 
@@ -455,30 +406,25 @@ void GlobalHitsProducer::fillTrk(edm::Event& iEvent,
   edm::PSimHitContainer thePxlBrlHits;
   // extract low container
   edm::Handle<edm::PSimHitContainer> PxlBrlLowContainer;
-  iEvent.getByToken(PxlBrlLowSrc_Token_,PxlBrlLowContainer);
+  iEvent.getByToken(PxlBrlLowSrc_Token_, PxlBrlLowContainer);
   if (!PxlBrlLowContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsPixelBarrelLowTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsPixelBarrelLowTof in event!";
     return;
   }
   // extract high container
   edm::Handle<edm::PSimHitContainer> PxlBrlHighContainer;
-  iEvent.getByToken(PxlBrlHighSrc_Token_,PxlBrlHighContainer);
+  iEvent.getByToken(PxlBrlHighSrc_Token_, PxlBrlHighContainer);
   if (!PxlBrlHighContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsPixelBarrelHighTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsPixelBarrelHighTof in event!";
     return;
   }
   // place both containers into new container
-  thePxlBrlHits.insert(thePxlBrlHits.end(),PxlBrlLowContainer->begin(),
-		       PxlBrlLowContainer->end());
-  thePxlBrlHits.insert(thePxlBrlHits.end(),PxlBrlHighContainer->begin(),
-		       PxlBrlHighContainer->end());
+  thePxlBrlHits.insert(thePxlBrlHits.end(), PxlBrlLowContainer->begin(), PxlBrlLowContainer->end());
+  thePxlBrlHits.insert(thePxlBrlHits.end(), PxlBrlHighContainer->begin(), PxlBrlHighContainer->end());
 
   // cycle through new container
   int i = 0, j = 0;
   for (itHit = thePxlBrlHits.begin(); itHit != thePxlBrlHits.end(); ++itHit) {
-
     ++i;
 
     // create a DetId from the detUnitId
@@ -488,20 +434,18 @@ void GlobalHitsProducer::fillTrk(edm::Event& iEvent,
 
     // check that expected detector is returned
     if ((detector == dTrk) && (subdetector == sdPxlBrl)) {
-
       // get the GeomDetUnit from the geometry using theDetUnitID
       const GeomDetUnit *theDet = theTracker.idToDetUnit(theDetUnitId);
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get GeomDetUnit from PxlBrlHits for Hit " << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from PxlBrlHits for Hit " << i;
+        continue;
       }
 
       ++j;
 
       // get the Surface of the hit (knows how to go from local <-> global)
-      const BoundPlane& bSurface = theDet->surface();
+      const BoundPlane &bSurface = theDet->surface();
 
       // gather necessary information
       PxlBrlToF.push_back(itHit->tof());
@@ -510,51 +454,43 @@ void GlobalHitsProducer::fillTrk(edm::Event& iEvent,
       PxlBrlEta.push_back(bSurface.toGlobal(itHit->localPosition()).eta());
 
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "PxlBrl PSimHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dTrk << "," << sdPxlBrl
-	<< "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "PxlBrl PSimHit " << i << " is expected to be (det,subdet) = (" << dTrk << ","
+                                    << sdPxlBrl << "); value returned is: (" << detector << "," << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through PxlBrl Hits
+    }  // end detector type check
+  }    // end loop through PxlBrl Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of Pixel Barrel Hits collected:..... ";
     eventout += j;
-  }  
-  
+  }
+
   /////////////////////////////////
   // get Pixel Forward information
   ////////////////////////////////
   edm::PSimHitContainer thePxlFwdHits;
   // extract low container
   edm::Handle<edm::PSimHitContainer> PxlFwdLowContainer;
-  iEvent.getByToken(PxlFwdLowSrc_Token_,PxlFwdLowContainer);
+  iEvent.getByToken(PxlFwdLowSrc_Token_, PxlFwdLowContainer);
   if (!PxlFwdLowContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsPixelEndcapLowTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsPixelEndcapLowTof in event!";
     return;
   }
   // extract high container
   edm::Handle<edm::PSimHitContainer> PxlFwdHighContainer;
-  iEvent.getByToken(PxlFwdHighSrc_Token_,PxlFwdHighContainer);
+  iEvent.getByToken(PxlFwdHighSrc_Token_, PxlFwdHighContainer);
   if (!PxlFwdHighContainer.isValid()) {
-    edm::LogWarning("GlobalHitsProducer_fillTrk")
-      << "Unable to find TrackerHitsPixelEndcapHighTof in event!";
+    edm::LogWarning("GlobalHitsProducer_fillTrk") << "Unable to find TrackerHitsPixelEndcapHighTof in event!";
     return;
   }
   // place both containers into new container
-  thePxlFwdHits.insert(thePxlFwdHits.end(),PxlFwdLowContainer->begin(),
-		       PxlFwdLowContainer->end());
-  thePxlFwdHits.insert(thePxlFwdHits.end(),PxlFwdHighContainer->begin(),
-		       PxlFwdHighContainer->end());
+  thePxlFwdHits.insert(thePxlFwdHits.end(), PxlFwdLowContainer->begin(), PxlFwdLowContainer->end());
+  thePxlFwdHits.insert(thePxlFwdHits.end(), PxlFwdHighContainer->begin(), PxlFwdHighContainer->end());
 
   // cycle through new container
-  i = 0; j = 0;
+  i = 0;
+  j = 0;
   for (itHit = thePxlFwdHits.begin(); itHit != thePxlFwdHits.end(); ++itHit) {
-
     ++i;
 
     // create a DetId from the detUnitId
@@ -564,20 +500,19 @@ void GlobalHitsProducer::fillTrk(edm::Event& iEvent,
 
     // check that expected detector is returned
     if ((detector == dTrk) && (subdetector == sdPxlFwd)) {
-
       // get the GeomDetUnit from the geometry using theDetUnitID
       const GeomDetUnit *theDet = theTracker.idToDetUnit(theDetUnitId);
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get GeomDetUnit from PxlFwdHits for Hit " << i;;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from PxlFwdHits for Hit " << i;
+        ;
+        continue;
       }
 
       ++j;
 
       // get the Surface of the hit (knows how to go from local <-> global)
-      const BoundPlane& bSurface = theDet->surface();
+      const BoundPlane &bSurface = theDet->surface();
 
       // gather necessary information
       PxlFwdToF.push_back(itHit->tof());
@@ -585,20 +520,16 @@ void GlobalHitsProducer::fillTrk(edm::Event& iEvent,
       PxlFwdPhi.push_back(bSurface.toGlobal(itHit->localPosition()).phi());
       PxlFwdEta.push_back(bSurface.toGlobal(itHit->localPosition()).eta());
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "PxlFwd PSimHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dTrk << "," << sdPxlFwd
-	<< "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "PxlFwd PSimHit " << i << " is expected to be (det,subdet) = (" << dTrk << ","
+                                    << sdPxlFwd << "); value returned is: (" << detector << "," << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through PxlFwd Hits
+    }  // end detector type check
+  }    // end loop through PxlFwd Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of Pixel Forward Hits collected:.... ";
     eventout += j;
-  }  
+  }
 
   ///////////////////////////////////
   // get Silicon Barrel information
@@ -606,50 +537,42 @@ void GlobalHitsProducer::fillTrk(edm::Event& iEvent,
   edm::PSimHitContainer theSiBrlHits;
   // extract TIB low container
   edm::Handle<edm::PSimHitContainer> SiTIBLowContainer;
-  iEvent.getByToken(SiTIBLowSrc_Token_,SiTIBLowContainer);
+  iEvent.getByToken(SiTIBLowSrc_Token_, SiTIBLowContainer);
   if (!SiTIBLowContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsTIBLowTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsTIBLowTof in event!";
     return;
   }
   // extract TIB high container
   edm::Handle<edm::PSimHitContainer> SiTIBHighContainer;
-  iEvent.getByToken(SiTIBHighSrc_Token_,SiTIBHighContainer);
+  iEvent.getByToken(SiTIBHighSrc_Token_, SiTIBHighContainer);
   if (!SiTIBHighContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsTIBHighTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsTIBHighTof in event!";
     return;
   }
   // extract TOB low container
   edm::Handle<edm::PSimHitContainer> SiTOBLowContainer;
-  iEvent.getByToken(SiTOBLowSrc_Token_,SiTOBLowContainer);
+  iEvent.getByToken(SiTOBLowSrc_Token_, SiTOBLowContainer);
   if (!SiTOBLowContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsTOBLowTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsTOBLowTof in event!";
     return;
   }
   // extract TOB high container
   edm::Handle<edm::PSimHitContainer> SiTOBHighContainer;
-  iEvent.getByToken(SiTOBHighSrc_Token_,SiTOBHighContainer);
+  iEvent.getByToken(SiTOBHighSrc_Token_, SiTOBHighContainer);
   if (!SiTOBHighContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsTOBHighTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsTOBHighTof in event!";
     return;
   }
   // place all containers into new container
-  theSiBrlHits.insert(theSiBrlHits.end(),SiTIBLowContainer->begin(),
-		       SiTIBLowContainer->end());
-  theSiBrlHits.insert(theSiBrlHits.end(),SiTIBHighContainer->begin(),
-		       SiTIBHighContainer->end());
-  theSiBrlHits.insert(theSiBrlHits.end(),SiTOBLowContainer->begin(),
-		       SiTOBLowContainer->end());
-  theSiBrlHits.insert(theSiBrlHits.end(),SiTOBHighContainer->begin(),
-		       SiTOBHighContainer->end());
+  theSiBrlHits.insert(theSiBrlHits.end(), SiTIBLowContainer->begin(), SiTIBLowContainer->end());
+  theSiBrlHits.insert(theSiBrlHits.end(), SiTIBHighContainer->begin(), SiTIBHighContainer->end());
+  theSiBrlHits.insert(theSiBrlHits.end(), SiTOBLowContainer->begin(), SiTOBLowContainer->end());
+  theSiBrlHits.insert(theSiBrlHits.end(), SiTOBHighContainer->begin(), SiTOBHighContainer->end());
 
   // cycle through new container
-  i = 0; j = 0;
+  i = 0;
+  j = 0;
   for (itHit = theSiBrlHits.begin(); itHit != theSiBrlHits.end(); ++itHit) {
-
     ++i;
 
     // create a DetId from the detUnitId
@@ -658,23 +581,19 @@ void GlobalHitsProducer::fillTrk(edm::Event& iEvent,
     int subdetector = theDetUnitId.subdetId();
 
     // check that expected detector is returned
-    if ((detector == dTrk) && 
-	((subdetector == sdSiTIB) ||
-	 (subdetector == sdSiTOB))) {
-
+    if ((detector == dTrk) && ((subdetector == sdSiTIB) || (subdetector == sdSiTOB))) {
       // get the GeomDetUnit from the geometry using theDetUnitID
       const GeomDetUnit *theDet = theTracker.idToDetUnit(theDetUnitId);
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get GeomDetUnit from SiBrlHits for Hit " << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from SiBrlHits for Hit " << i;
+        continue;
       }
 
       ++j;
 
       // get the Surface of the hit (knows how to go from local <-> global)
-      const BoundPlane& bSurface = theDet->surface();
+      const BoundPlane &bSurface = theDet->surface();
 
       // gather necessary information
       SiBrlToF.push_back(itHit->tof());
@@ -682,20 +601,17 @@ void GlobalHitsProducer::fillTrk(edm::Event& iEvent,
       SiBrlPhi.push_back(bSurface.toGlobal(itHit->localPosition()).phi());
       SiBrlEta.push_back(bSurface.toGlobal(itHit->localPosition()).eta());
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "SiBrl PSimHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dTrk << "," << sdSiTIB
-	<< " || " << sdSiTOB << "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "SiBrl PSimHit " << i << " is expected to be (det,subdet) = (" << dTrk << ","
+                                    << sdSiTIB << " || " << sdSiTOB << "); value returned is: (" << detector << ","
+                                    << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through SiBrl Hits
+    }  // end detector type check
+  }    // end loop through SiBrl Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of Silicon Barrel Hits collected:... ";
     eventout += j;
-  }  
+  }
 
   ///////////////////////////////////
   // get Silicon Forward information
@@ -703,50 +619,42 @@ void GlobalHitsProducer::fillTrk(edm::Event& iEvent,
   edm::PSimHitContainer theSiFwdHits;
   // extract TID low container
   edm::Handle<edm::PSimHitContainer> SiTIDLowContainer;
-  iEvent.getByToken(SiTIDLowSrc_Token_,SiTIDLowContainer);
+  iEvent.getByToken(SiTIDLowSrc_Token_, SiTIDLowContainer);
   if (!SiTIDLowContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsTIDLowTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsTIDLowTof in event!";
     return;
   }
   // extract TID high container
   edm::Handle<edm::PSimHitContainer> SiTIDHighContainer;
-  iEvent.getByToken(SiTIDHighSrc_Token_,SiTIDHighContainer);
+  iEvent.getByToken(SiTIDHighSrc_Token_, SiTIDHighContainer);
   if (!SiTIDHighContainer.isValid()) {
-    edm::LogWarning("GlobalHitsProducer_fillTrk")
-      << "Unable to find TrackerHitsTIDHighTof in event!";
+    edm::LogWarning("GlobalHitsProducer_fillTrk") << "Unable to find TrackerHitsTIDHighTof in event!";
     return;
   }
   // extract TEC low container
   edm::Handle<edm::PSimHitContainer> SiTECLowContainer;
-  iEvent.getByToken(SiTECLowSrc_Token_,SiTECLowContainer);
+  iEvent.getByToken(SiTECLowSrc_Token_, SiTECLowContainer);
   if (!SiTECLowContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsTECLowTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsTECLowTof in event!";
     return;
   }
   // extract TEC high container
   edm::Handle<edm::PSimHitContainer> SiTECHighContainer;
-  iEvent.getByToken(SiTECHighSrc_Token_,SiTECHighContainer);
+  iEvent.getByToken(SiTECHighSrc_Token_, SiTECHighContainer);
   if (!SiTECHighContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find TrackerHitsTECHighTof in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find TrackerHitsTECHighTof in event!";
     return;
   }
   // place all containers into new container
-  theSiFwdHits.insert(theSiFwdHits.end(),SiTIDLowContainer->begin(),
-		       SiTIDLowContainer->end());
-  theSiFwdHits.insert(theSiFwdHits.end(),SiTIDHighContainer->begin(),
-		       SiTIDHighContainer->end());
-  theSiFwdHits.insert(theSiFwdHits.end(),SiTECLowContainer->begin(),
-		       SiTECLowContainer->end());
-  theSiFwdHits.insert(theSiFwdHits.end(),SiTECHighContainer->begin(),
-		       SiTECHighContainer->end());
+  theSiFwdHits.insert(theSiFwdHits.end(), SiTIDLowContainer->begin(), SiTIDLowContainer->end());
+  theSiFwdHits.insert(theSiFwdHits.end(), SiTIDHighContainer->begin(), SiTIDHighContainer->end());
+  theSiFwdHits.insert(theSiFwdHits.end(), SiTECLowContainer->begin(), SiTECLowContainer->end());
+  theSiFwdHits.insert(theSiFwdHits.end(), SiTECHighContainer->begin(), SiTECHighContainer->end());
 
   // cycle through container
-  i = 0; j = 0;
+  i = 0;
+  j = 0;
   for (itHit = theSiFwdHits.begin(); itHit != theSiFwdHits.end(); ++itHit) {
-
     ++i;
 
     // create a DetId from the detUnitId
@@ -754,54 +662,46 @@ void GlobalHitsProducer::fillTrk(edm::Event& iEvent,
     int detector = theDetUnitId.det();
     int subdetector = theDetUnitId.subdetId();
 
-    // check that expected detector is returned 
-    if ((detector == dTrk) && 
-	((subdetector == sdSiTID) ||
-	 (subdetector == sdSiTEC))) {
-      
+    // check that expected detector is returned
+    if ((detector == dTrk) && ((subdetector == sdSiTID) || (subdetector == sdSiTEC))) {
       // get the GeomDetUnit from the geometry using theDetUnitID
       const GeomDetUnit *theDet = theTracker.idToDetUnit(theDetUnitId);
-      
+
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get GeomDetUnit from SiFwdHits Hit " << i;
-	return;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from SiFwdHits Hit " << i;
+        return;
       }
-      
+
       ++j;
 
       // get the Surface of the hit (knows how to go from local <-> global)
-      const BoundPlane& bSurface = theDet->surface();
-      
+      const BoundPlane &bSurface = theDet->surface();
+
       // gather necessary information
       SiFwdToF.push_back(itHit->tof());
       SiFwdZ.push_back(bSurface.toGlobal(itHit->localPosition()).z());
       SiFwdPhi.push_back(bSurface.toGlobal(itHit->localPosition()).phi());
       SiFwdEta.push_back(bSurface.toGlobal(itHit->localPosition()).eta());
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "SiFwd PSimHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dTrk << "," << sdSiTOB
-	<< " || " << sdSiTEC << "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "SiFwd PSimHit " << i << " is expected to be (det,subdet) = (" << dTrk << ","
+                                    << sdSiTOB << " || " << sdSiTEC << "); value returned is: (" << detector << ","
+                                    << subdetector << ")";
       continue;
-    } // end check detector type
-  } // end loop through SiFwd Hits
+    }  // end check detector type
+  }    // end loop through SiFwd Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of Silicon Forward Hits collected:.. ";
     eventout += j;
-  }  
+  }
 
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
 
   return;
-  }
+}
 
-void GlobalHitsProducer::storeTrk(PGlobalSimHit& product)
-{
+void GlobalHitsProducer::storeTrk(PGlobalSimHit &product) {
   std::string MsgLoggerCat = "GlobalHitsProducer_storeTrk";
 
   if (verbosity > 2) {
@@ -816,8 +716,8 @@ void GlobalHitsProducer::storeTrk(PGlobalSimHit& product)
       eventout += PxlBrlPhi[i];
       eventout += ", ";
       eventout += PxlBrlEta[i];
-      eventout += ")";      
-    } // end PxlBrl output
+      eventout += ")";
+    }  // end PxlBrl output
     eventout += "\n       nPxlFwdHits        = ";
     eventout += PxlFwdToF.size();
     for (unsigned int i = 0; i < PxlFwdToF.size(); ++i) {
@@ -829,8 +729,8 @@ void GlobalHitsProducer::storeTrk(PGlobalSimHit& product)
       eventout += PxlFwdPhi[i];
       eventout += ", ";
       eventout += PxlFwdEta[i];
-      eventout += ")";      
-    } // end PxlFwd output
+      eventout += ")";
+    }  // end PxlFwd output
     eventout += "\n       nSiBrlHits         = ";
     eventout += SiBrlToF.size();
     for (unsigned int i = 0; i < SiBrlToF.size(); ++i) {
@@ -842,8 +742,8 @@ void GlobalHitsProducer::storeTrk(PGlobalSimHit& product)
       eventout += SiBrlPhi[i];
       eventout += ", ";
       eventout += SiBrlEta[i];
-      eventout += ")";      
-    } // end SiBrl output
+      eventout += ")";
+    }  // end SiBrl output
     eventout += "\n       nSiFwdHits         = ";
     eventout += SiFwdToF.size();
     for (unsigned int i = 0; i < SiFwdToF.size(); ++i) {
@@ -855,32 +755,30 @@ void GlobalHitsProducer::storeTrk(PGlobalSimHit& product)
       eventout += SiFwdPhi[i];
       eventout += ", ";
       eventout += SiFwdEta[i];
-      eventout += ")";      
-    } // end SiFwd output
+      eventout += ")";
+    }  // end SiFwd output
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
-  } // end verbose output
+  }  // end verbose output
 
-  product.putPxlBrlHits(PxlBrlToF,PxlBrlR,PxlBrlPhi,PxlBrlEta);
-  product.putPxlFwdHits(PxlFwdToF,PxlFwdZ,PxlFwdPhi,PxlFwdEta);
-  product.putSiBrlHits(SiBrlToF,SiBrlR,SiBrlPhi,SiBrlEta);
-  product.putSiFwdHits(SiFwdToF,SiFwdZ,SiFwdPhi,SiFwdEta);
+  product.putPxlBrlHits(PxlBrlToF, PxlBrlR, PxlBrlPhi, PxlBrlEta);
+  product.putPxlFwdHits(PxlFwdToF, PxlFwdZ, PxlFwdPhi, PxlFwdEta);
+  product.putSiBrlHits(SiBrlToF, SiBrlR, SiBrlPhi, SiBrlEta);
+  product.putSiFwdHits(SiFwdToF, SiFwdZ, SiFwdPhi, SiFwdEta);
 
   return;
 }
 
-void GlobalHitsProducer::fillMuon(edm::Event& iEvent, 
-				 const edm::EventSetup& iSetup)
-{
+void GlobalHitsProducer::fillMuon(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalHitsProducer_fillMuon";
 
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
+    eventout = "\nGathering info:";
 
   // iterator to access containers
   edm::PSimHitContainer::const_iterator itHit;
 
-  //int i = 0, j = 0;
+  // int i = 0, j = 0;
   ///////////////////////
   // access the CSC Muon
   ///////////////////////
@@ -888,26 +786,22 @@ void GlobalHitsProducer::fillMuon(edm::Event& iEvent,
   edm::ESHandle<CSCGeometry> theCSCGeometry;
   iSetup.get<MuonGeometryRecord>().get(theCSCGeometry);
   if (!theCSCGeometry.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find MuonGeometryRecord for the CSCGeometry in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find MuonGeometryRecord for the CSCGeometry in event!";
     return;
   }
-  const CSCGeometry& theCSCMuon(*theCSCGeometry);
+  const CSCGeometry &theCSCMuon(*theCSCGeometry);
 
   // get Muon CSC information
   edm::Handle<edm::PSimHitContainer> MuonCSCContainer;
-  iEvent.getByToken(MuonCscSrc_Token_,MuonCSCContainer);
+  iEvent.getByToken(MuonCscSrc_Token_, MuonCSCContainer);
   if (!MuonCSCContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find MuonCSCHits in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find MuonCSCHits in event!";
     return;
   }
 
   // cycle through container
   int i = 0, j = 0;
-  for (itHit = MuonCSCContainer->begin(); itHit != MuonCSCContainer->end(); 
-       ++itHit) {
-
+  for (itHit = MuonCSCContainer->begin(); itHit != MuonCSCContainer->end(); ++itHit) {
     ++i;
 
     // create a DetId from the detUnitId
@@ -916,45 +810,38 @@ void GlobalHitsProducer::fillMuon(edm::Event& iEvent,
     int subdetector = theDetUnitId.subdetId();
 
     // check that expected detector is returned
-    if ((detector == dMuon) && 
-        (subdetector == sdMuonCSC)) {
-
+    if ((detector == dMuon) && (subdetector == sdMuonCSC)) {
       // get the GeomDetUnit from the geometry using theDetUnitID
       const GeomDetUnit *theDet = theCSCMuon.idToDetUnit(theDetUnitId);
-    
+
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get GeomDetUnit from theCSCMuon for hit " << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from theCSCMuon for hit " << i;
+        continue;
       }
-     
+
       ++j;
 
       // get the Surface of the hit (knows how to go from local <-> global)
-      const BoundPlane& bSurface = theDet->surface();
-    
+      const BoundPlane &bSurface = theDet->surface();
+
       // gather necessary information
       MuonCscToF.push_back(itHit->tof());
       MuonCscZ.push_back(bSurface.toGlobal(itHit->localPosition()).z());
       MuonCscPhi.push_back(bSurface.toGlobal(itHit->localPosition()).phi());
       MuonCscEta.push_back(bSurface.toGlobal(itHit->localPosition()).eta());
     } else {
-      edm::LogWarning(MsgLoggerCat)
-        << "MuonCsc PSimHit " << i 
-        << " is expected to be (det,subdet) = (" 
-        << dMuon << "," << sdMuonCSC
-        << "); value returned is: ("
-        << detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "MuonCsc PSimHit " << i << " is expected to be (det,subdet) = (" << dMuon << ","
+                                    << sdMuonCSC << "); value returned is: (" << detector << "," << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through CSC Hits
+    }  // end detector type check
+  }    // end loop through CSC Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of CSC muon Hits collected:......... ";
     eventout += j;
-  }  
+  }
 
-  //i = 0, j = 0;
+  // i = 0, j = 0;
   /////////////////////
   // access the DT Muon
   /////////////////////
@@ -962,26 +849,22 @@ void GlobalHitsProducer::fillMuon(edm::Event& iEvent,
   edm::ESHandle<DTGeometry> theDTGeometry;
   iSetup.get<MuonGeometryRecord>().get(theDTGeometry);
   if (!theDTGeometry.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find MuonGeometryRecord for the DTGeometry in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find MuonGeometryRecord for the DTGeometry in event!";
     return;
   }
-  const DTGeometry& theDTMuon(*theDTGeometry);
+  const DTGeometry &theDTMuon(*theDTGeometry);
 
   // get Muon DT information
   edm::Handle<edm::PSimHitContainer> MuonDtContainer;
-  iEvent.getByToken(MuonDtSrc_Token_,MuonDtContainer);
+  iEvent.getByToken(MuonDtSrc_Token_, MuonDtContainer);
   if (!MuonDtContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find MuonDTHits in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find MuonDTHits in event!";
     return;
   }
 
   // cycle through container
   i = 0, j = 0;
-  for (itHit = MuonDtContainer->begin(); itHit != MuonDtContainer->end(); 
-       ++itHit) {
-
+  for (itHit = MuonDtContainer->begin(); itHit != MuonDtContainer->end(); ++itHit) {
     ++i;
 
     // create a DetId from the detUnitId
@@ -990,9 +873,7 @@ void GlobalHitsProducer::fillMuon(edm::Event& iEvent,
     int subdetector = theDetUnitId.subdetId();
 
     // check that expected detector is returned
-    if ((detector == dMuon) && 
-        (subdetector == sdMuonDT)) {
-
+    if ((detector == dMuon) && (subdetector == sdMuonDT)) {
       // CSC uses wires and layers rather than the full detID
       // get the wireId
       DTWireId wireId(itHit->detUnitId());
@@ -1001,39 +882,34 @@ void GlobalHitsProducer::fillMuon(edm::Event& iEvent,
       const DTLayer *theDet = theDTMuon.layer(wireId.layerId());
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get GeomDetUnit from theDtMuon for hit " << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from theDtMuon for hit " << i;
+        continue;
       }
-     
+
       ++j;
 
       // get the Surface of the hit (knows how to go from local <-> global)
-      const BoundPlane& bSurface = theDet->surface();
-    
+      const BoundPlane &bSurface = theDet->surface();
+
       // gather necessary information
       MuonDtToF.push_back(itHit->tof());
       MuonDtR.push_back(bSurface.toGlobal(itHit->localPosition()).perp());
       MuonDtPhi.push_back(bSurface.toGlobal(itHit->localPosition()).phi());
       MuonDtEta.push_back(bSurface.toGlobal(itHit->localPosition()).eta());
     } else {
-      edm::LogWarning(MsgLoggerCat)
-        << "MuonDt PSimHit " << i 
-        << " is expected to be (det,subdet) = (" 
-        << dMuon << "," << sdMuonDT
-        << "); value returned is: ("
-        << detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "MuonDt PSimHit " << i << " is expected to be (det,subdet) = (" << dMuon << ","
+                                    << sdMuonDT << "); value returned is: (" << detector << "," << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through DT Hits
+    }  // end detector type check
+  }    // end loop through DT Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of DT muon Hits collected:.......... ";
     eventout += j;
-  } 
+  }
 
-  //i = 0, j = 0;
-  //int RPCBrl = 0, RPCFwd = 0;
+  // i = 0, j = 0;
+  // int RPCBrl = 0, RPCFwd = 0;
   ///////////////////////
   // access the RPC Muon
   ///////////////////////
@@ -1041,27 +917,23 @@ void GlobalHitsProducer::fillMuon(edm::Event& iEvent,
   edm::ESHandle<RPCGeometry> theRPCGeometry;
   iSetup.get<MuonGeometryRecord>().get(theRPCGeometry);
   if (!theRPCGeometry.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find MuonGeometryRecord for the RPCGeometry in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find MuonGeometryRecord for the RPCGeometry in event!";
     return;
   }
-  const RPCGeometry& theRPCMuon(*theRPCGeometry);
+  const RPCGeometry &theRPCMuon(*theRPCGeometry);
 
   // get Muon RPC information
   edm::Handle<edm::PSimHitContainer> MuonRPCContainer;
-  iEvent.getByToken(MuonRpcSrc_Token_,MuonRPCContainer);
+  iEvent.getByToken(MuonRpcSrc_Token_, MuonRPCContainer);
   if (!MuonRPCContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find MuonRPCHits in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find MuonRPCHits in event!";
     return;
   }
 
   // cycle through container
   i = 0, j = 0;
-  int RPCBrl =0, RPCFwd = 0;
-  for (itHit = MuonRPCContainer->begin(); itHit != MuonRPCContainer->end(); 
-       ++itHit) {
-
+  int RPCBrl = 0, RPCFwd = 0;
+  for (itHit = MuonRPCContainer->begin(); itHit != MuonRPCContainer->end(); ++itHit) {
     ++i;
 
     // create a DetID from the detUnitId
@@ -1070,11 +942,9 @@ void GlobalHitsProducer::fillMuon(edm::Event& iEvent,
     int subdetector = theDetUnitId.subdetId();
 
     // check that expected detector is returned
-    if ((detector == dMuon) && 
-        (subdetector == sdMuonRPC)) {
-      
+    if ((detector == dMuon) && (subdetector == sdMuonRPC)) {
       // get an RPCDetID from the detUnitID
-      RPCDetId RPCId(itHit->detUnitId());      
+      RPCDetId RPCId(itHit->detUnitId());
 
       // find the region of the RPC hit
       int region = RPCId.region();
@@ -1083,51 +953,40 @@ void GlobalHitsProducer::fillMuon(edm::Event& iEvent,
       const GeomDetUnit *theDet = theRPCMuon.idToDetUnit(theDetUnitId);
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get GeomDetUnit from theRPCMuon for hit " << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get GeomDetUnit from theRPCMuon for hit " << i;
+        continue;
       }
 
       ++j;
 
       // get the Surface of the hit (knows how to go from local <-> global)
-      const BoundPlane& bSurface = theDet->surface();
-    
+      const BoundPlane &bSurface = theDet->surface();
+
       // gather necessary information
       if ((region == sdMuonRPCRgnFwdp) || (region == sdMuonRPCRgnFwdn)) {
-	++RPCFwd;
-
-	MuonRpcFwdToF.push_back(itHit->tof());
-	MuonRpcFwdZ.push_back(bSurface.toGlobal(itHit->localPosition()).z());
-	MuonRpcFwdPhi.
-	  push_back(bSurface.toGlobal(itHit->localPosition()).phi());
-	MuonRpcFwdEta.
-	  push_back(bSurface.toGlobal(itHit->localPosition()).eta());
+        ++RPCFwd;
+
+        MuonRpcFwdToF.push_back(itHit->tof());
+        MuonRpcFwdZ.push_back(bSurface.toGlobal(itHit->localPosition()).z());
+        MuonRpcFwdPhi.push_back(bSurface.toGlobal(itHit->localPosition()).phi());
+        MuonRpcFwdEta.push_back(bSurface.toGlobal(itHit->localPosition()).eta());
       } else if (region == sdMuonRPCRgnBrl) {
-	++RPCBrl;
-
-	MuonRpcBrlToF.push_back(itHit->tof());
-	MuonRpcBrlR.
-	  push_back(bSurface.toGlobal(itHit->localPosition()).perp());
-	MuonRpcBrlPhi.
-	  push_back(bSurface.toGlobal(itHit->localPosition()).phi());
-	MuonRpcBrlEta.
-	  push_back(bSurface.toGlobal(itHit->localPosition()).eta());	
+        ++RPCBrl;
+
+        MuonRpcBrlToF.push_back(itHit->tof());
+        MuonRpcBrlR.push_back(bSurface.toGlobal(itHit->localPosition()).perp());
+        MuonRpcBrlPhi.push_back(bSurface.toGlobal(itHit->localPosition()).phi());
+        MuonRpcBrlEta.push_back(bSurface.toGlobal(itHit->localPosition()).eta());
       } else {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Invalid region for RPC Muon hit" << i;
-	continue;
-      } // end check of region
+        edm::LogWarning(MsgLoggerCat) << "Invalid region for RPC Muon hit" << i;
+        continue;
+      }  // end check of region
     } else {
-      edm::LogWarning(MsgLoggerCat)
-        << "MuonRpc PSimHit " << i 
-        << " is expected to be (det,subdet) = (" 
-        << dMuon << "," << sdMuonRPC
-        << "); value returned is: ("
-        << detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "MuonRpc PSimHit " << i << " is expected to be (det,subdet) = (" << dMuon << ","
+                                    << sdMuonRPC << "); value returned is: (" << detector << "," << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through RPC Hits
+    }  // end detector type check
+  }    // end loop through RPC Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of RPC muon Hits collected:......... ";
@@ -1135,8 +994,8 @@ void GlobalHitsProducer::fillMuon(edm::Event& iEvent,
     eventout += "\n                    RPC Barrel muon Hits:............ ";
     eventout += RPCBrl;
     eventout += "\n                    RPC Forward muon Hits:........... ";
-    eventout += RPCFwd;    
-  }  
+    eventout += RPCFwd;
+  }
 
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
@@ -1144,8 +1003,7 @@ void GlobalHitsProducer::fillMuon(edm::Event& iEvent,
   return;
 }
 
-void GlobalHitsProducer::storeMuon(PGlobalSimHit& product)
-{
+void GlobalHitsProducer::storeMuon(PGlobalSimHit &product) {
   std::string MsgLoggerCat = "GlobalHitsProducer_storeMuon";
 
   if (verbosity > 2) {
@@ -1160,8 +1018,8 @@ void GlobalHitsProducer::storeMuon(PGlobalSimHit& product)
       eventout += MuonCscPhi[i];
       eventout += ", ";
       eventout += MuonCscEta[i];
-      eventout += ")";      
-    } // end MuonCsc output
+      eventout += ")";
+    }  // end MuonCsc output
     eventout += "\n       nMuonDtHits        = ";
     eventout += MuonDtToF.size();
     for (unsigned int i = 0; i < MuonDtToF.size(); ++i) {
@@ -1173,8 +1031,8 @@ void GlobalHitsProducer::storeMuon(PGlobalSimHit& product)
       eventout += MuonDtPhi[i];
       eventout += ", ";
       eventout += MuonDtEta[i];
-      eventout += ")";      
-    } // end MuonDt output
+      eventout += ")";
+    }  // end MuonDt output
     eventout += "\n       nMuonRpcBrlHits    = ";
     eventout += MuonRpcBrlToF.size();
     for (unsigned int i = 0; i < MuonRpcBrlToF.size(); ++i) {
@@ -1186,8 +1044,8 @@ void GlobalHitsProducer::storeMuon(PGlobalSimHit& product)
       eventout += MuonRpcBrlPhi[i];
       eventout += ", ";
       eventout += MuonRpcBrlEta[i];
-      eventout += ")";      
-    } // end MuonRpcBrl output
+      eventout += ")";
+    }  // end MuonRpcBrl output
     eventout += "\n       nMuonRpcFwdHits    = ";
     eventout += MuonRpcFwdToF.size();
     for (unsigned int i = 0; i < MuonRpcFwdToF.size(); ++i) {
@@ -1198,41 +1056,36 @@ void GlobalHitsProducer::storeMuon(PGlobalSimHit& product)
       eventout += ", ";
       eventout += MuonRpcFwdPhi[i];
       eventout += ", ";
-      eventout += MuonRpcFwdEta[i]; 
-      eventout += ")";      
-    } // end MuonRpcFwd output
+      eventout += MuonRpcFwdEta[i];
+      eventout += ")";
+    }  // end MuonRpcFwd output
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
-  } // end verbose output
+  }  // end verbose output
 
-  product.putMuonCscHits(MuonCscToF,MuonCscZ,MuonCscPhi,MuonCscEta);
-  product.putMuonDtHits(MuonDtToF,MuonDtR,MuonDtPhi,MuonDtEta);
-  product.putMuonRpcBrlHits(MuonRpcBrlToF,MuonRpcBrlR,MuonRpcBrlPhi,
-			     MuonRpcBrlEta);
-  product.putMuonRpcFwdHits(MuonRpcFwdToF,MuonRpcFwdZ,MuonRpcFwdPhi,
-			     MuonRpcFwdEta);
+  product.putMuonCscHits(MuonCscToF, MuonCscZ, MuonCscPhi, MuonCscEta);
+  product.putMuonDtHits(MuonDtToF, MuonDtR, MuonDtPhi, MuonDtEta);
+  product.putMuonRpcBrlHits(MuonRpcBrlToF, MuonRpcBrlR, MuonRpcBrlPhi, MuonRpcBrlEta);
+  product.putMuonRpcFwdHits(MuonRpcFwdToF, MuonRpcFwdZ, MuonRpcFwdPhi, MuonRpcFwdEta);
 
   return;
 }
 
-void GlobalHitsProducer::fillECal(edm::Event& iEvent, 
-				const edm::EventSetup& iSetup)
-{
+void GlobalHitsProducer::fillECal(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalHitsProducer_fillECal";
 
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
-  
+    eventout = "\nGathering info:";
+
   // access the calorimeter geometry
   edm::ESHandle<CaloGeometry> theCaloGeometry;
   iSetup.get<CaloGeometryRecord>().get(theCaloGeometry);
   if (!theCaloGeometry.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find CaloGeometryRecord in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find CaloGeometryRecord in event!";
     return;
   }
-  const CaloGeometry& theCalo(*theCaloGeometry);
-    
+  const CaloGeometry &theCalo(*theCaloGeometry);
+
   // iterator to access containers
   edm::PCaloHitContainer::const_iterator itHit;
 
@@ -1242,30 +1095,25 @@ void GlobalHitsProducer::fillECal(edm::Event& iEvent,
   edm::PCaloHitContainer theECalHits;
   // extract EB container
   edm::Handle<edm::PCaloHitContainer> EBContainer;
-  iEvent.getByToken(ECalEBSrc_Token_,EBContainer);
+  iEvent.getByToken(ECalEBSrc_Token_, EBContainer);
   if (!EBContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find EcalHitsEB in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find EcalHitsEB in event!";
     return;
   }
   // extract EE container
   edm::Handle<edm::PCaloHitContainer> EEContainer;
-  iEvent.getByToken(ECalEESrc_Token_,EEContainer);
+  iEvent.getByToken(ECalEESrc_Token_, EEContainer);
   if (!EEContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find EcalHitsEE in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find EcalHitsEE in event!";
     return;
   }
   // place both containers into new container
-  theECalHits.insert(theECalHits.end(),EBContainer->begin(),
-		       EBContainer->end());
-  theECalHits.insert(theECalHits.end(),EEContainer->begin(),
-		       EEContainer->end());
+  theECalHits.insert(theECalHits.end(), EBContainer->begin(), EBContainer->end());
+  theECalHits.insert(theECalHits.end(), EEContainer->begin(), EEContainer->end());
 
   // cycle through new container
   int i = 0, j = 0;
   for (itHit = theECalHits.begin(); itHit != theECalHits.end(); ++itHit) {
-
     ++i;
 
     // create a DetId from the detUnitId
@@ -1274,23 +1122,19 @@ void GlobalHitsProducer::fillECal(edm::Event& iEvent,
     int subdetector = theDetUnitId.subdetId();
 
     // check that expected detector is returned
-    if ((detector == dEcal) && 
-	((subdetector == sdEcalBrl) ||
-	 (subdetector == sdEcalFwd))) {
-
+    if ((detector == dEcal) && ((subdetector == sdEcalBrl) || (subdetector == sdEcalFwd))) {
       // get the Cell geometry
       auto theDet = (theCalo.getSubdetectorGeometry(theDetUnitId))->getGeometry(theDetUnitId);
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get CaloCellGeometry from ECalHits for Hit " << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get CaloCellGeometry from ECalHits for Hit " << i;
+        continue;
       }
 
       ++j;
 
       // get the global position of the cell
-      const GlobalPoint& globalposition = theDet->getPosition();
+      const GlobalPoint &globalposition = theDet->getPosition();
 
       // gather necessary information
       ECalE.push_back(itHit->energy());
@@ -1299,38 +1143,32 @@ void GlobalHitsProducer::fillECal(edm::Event& iEvent,
       ECalEta.push_back(globalposition.eta());
 
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "ECal PCaloHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dEcal << "," << sdEcalBrl
-	<< " || " << sdEcalFwd << "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "ECal PCaloHit " << i << " is expected to be (det,subdet) = (" << dEcal << ","
+                                    << sdEcalBrl << " || " << sdEcalFwd << "); value returned is: (" << detector << ","
+                                    << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through ECal Hits
+    }  // end detector type check
+  }    // end loop through ECal Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of ECal Hits collected:............. ";
     eventout += j;
-  }  
+  }
 
   ////////////////////////////
   // Get Preshower information
   ////////////////////////////
   // extract PreShower container
   edm::Handle<edm::PCaloHitContainer> PreShContainer;
-  iEvent.getByToken(ECalESSrc_Token_,PreShContainer);
+  iEvent.getByToken(ECalESSrc_Token_, PreShContainer);
   if (!PreShContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find EcalHitsES in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find EcalHitsES in event!";
     return;
   }
 
   // cycle through container
   i = 0, j = 0;
-  for (itHit = PreShContainer->begin(); 
-       itHit != PreShContainer->end(); ++itHit) {
-
+  for (itHit = PreShContainer->begin(); itHit != PreShContainer->end(); ++itHit) {
     ++i;
 
     // create a DetId from the detUnitId
@@ -1339,23 +1177,19 @@ void GlobalHitsProducer::fillECal(edm::Event& iEvent,
     int subdetector = theDetUnitId.subdetId();
 
     // check that expected detector is returned
-    if ((detector == dEcal) && 
-	(subdetector == sdEcalPS)) {
-
+    if ((detector == dEcal) && (subdetector == sdEcalPS)) {
       // get the Cell geometry
       auto theDet = (theCalo.getSubdetectorGeometry(theDetUnitId))->getGeometry(theDetUnitId);
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get CaloCellGeometry from PreShContainer for Hit " 
-	  << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get CaloCellGeometry from PreShContainer for Hit " << i;
+        continue;
       }
 
       ++j;
 
       // get the global position of the cell
-      const GlobalPoint& globalposition = theDet->getPosition();
+      const GlobalPoint &globalposition = theDet->getPosition();
 
       // gather necessary information
       PreShE.push_back(itHit->energy());
@@ -1364,20 +1198,16 @@ void GlobalHitsProducer::fillECal(edm::Event& iEvent,
       PreShEta.push_back(globalposition.eta());
 
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "PreSh PCaloHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dEcal << "," << sdEcalPS
-	<< "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "PreSh PCaloHit " << i << " is expected to be (det,subdet) = (" << dEcal << ","
+                                    << sdEcalPS << "); value returned is: (" << detector << "," << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through PreShower Hits
+    }  // end detector type check
+  }    // end loop through PreShower Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of PreSh Hits collected:............ ";
     eventout += j;
-  }  
+  }
 
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
@@ -1385,8 +1215,7 @@ void GlobalHitsProducer::fillECal(edm::Event& iEvent,
   return;
 }
 
-void GlobalHitsProducer::storeECal(PGlobalSimHit& product)
-{
+void GlobalHitsProducer::storeECal(PGlobalSimHit &product) {
   std::string MsgLoggerCat = "GlobalHitsProducer_storeECal";
 
   if (verbosity > 2) {
@@ -1400,9 +1229,9 @@ void GlobalHitsProducer::storeECal(PGlobalSimHit& product)
       eventout += ", ";
       eventout += ECalPhi[i];
       eventout += ", ";
-      eventout += ECalEta[i];  
-      eventout += ")";   
-    } // end ECal output
+      eventout += ECalEta[i];
+      eventout += ")";
+    }  // end ECal output
     eventout += "\n       nPreShHits         = ";
     eventout += PreShE.size();
     for (unsigned int i = 0; i < PreShE.size(); ++i) {
@@ -1413,37 +1242,34 @@ void GlobalHitsProducer::storeECal(PGlobalSimHit& product)
       eventout += ", ";
       eventout += PreShPhi[i];
       eventout += ", ";
-      eventout += PreShEta[i]; 
-      eventout += ")";    
-    } // end PreShower output
+      eventout += PreShEta[i];
+      eventout += ")";
+    }  // end PreShower output
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
-  } // end verbose output
+  }  // end verbose output
 
-  product.putECalHits(ECalE,ECalToF,ECalPhi,ECalEta);
-  product.putPreShHits(PreShE,PreShToF,PreShPhi,PreShEta);
+  product.putECalHits(ECalE, ECalToF, ECalPhi, ECalEta);
+  product.putPreShHits(PreShE, PreShToF, PreShPhi, PreShEta);
 
   return;
 }
 
-void GlobalHitsProducer::fillHCal(edm::Event& iEvent, 
-				const edm::EventSetup& iSetup)
-{
+void GlobalHitsProducer::fillHCal(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   std::string MsgLoggerCat = "GlobalHitsProducer_fillHCal";
 
   TString eventout;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
-  
+    eventout = "\nGathering info:";
+
   // access the calorimeter geometry
   edm::ESHandle<CaloGeometry> theCaloGeometry;
   iSetup.get<CaloGeometryRecord>().get(theCaloGeometry);
   if (!theCaloGeometry.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find CaloGeometryRecord in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find CaloGeometryRecord in event!";
     return;
   }
-  const CaloGeometry& theCalo(*theCaloGeometry);
-    
+  const CaloGeometry &theCalo(*theCaloGeometry);
+
   // iterator to access containers
   edm::PCaloHitContainer::const_iterator itHit;
 
@@ -1452,18 +1278,15 @@ void GlobalHitsProducer::fillHCal(edm::Event& iEvent,
   ///////////////////////////////
   // extract HCal container
   edm::Handle<edm::PCaloHitContainer> HCalContainer;
-  iEvent.getByToken(HCalSrc_Token_,HCalContainer);
+  iEvent.getByToken(HCalSrc_Token_, HCalContainer);
   if (!HCalContainer.isValid()) {
-    edm::LogWarning(MsgLoggerCat)
-      << "Unable to find HCalHits in event!";
+    edm::LogWarning(MsgLoggerCat) << "Unable to find HCalHits in event!";
     return;
   }
 
   // cycle through container
   int i = 0, j = 0;
-  for (itHit = HCalContainer->begin(); 
-       itHit != HCalContainer->end(); ++itHit) {
-
+  for (itHit = HCalContainer->begin(); itHit != HCalContainer->end(); ++itHit) {
     ++i;
 
     // create a DetId from the detUnitId
@@ -1472,26 +1295,20 @@ void GlobalHitsProducer::fillHCal(edm::Event& iEvent,
     int subdetector = theDetUnitId.subdetId();
 
     // check that expected detector is returned
-    if ((detector == dHcal) && 
-	((subdetector == sdHcalBrl) ||
-	 (subdetector == sdHcalEC) ||
-	 (subdetector == sdHcalOut) ||
-	 (subdetector == sdHcalFwd))) {
-
+    if ((detector == dHcal) && ((subdetector == sdHcalBrl) || (subdetector == sdHcalEC) || (subdetector == sdHcalOut) ||
+                                (subdetector == sdHcalFwd))) {
       // get the Cell geometry
-      const HcalGeometry *theDet = dynamic_cast<const HcalGeometry*>
-	(theCalo.getSubdetectorGeometry(theDetUnitId));
+      const HcalGeometry *theDet = dynamic_cast<const HcalGeometry *>(theCalo.getSubdetectorGeometry(theDetUnitId));
 
       if (!theDet) {
-	edm::LogWarning(MsgLoggerCat)
-	  << "Unable to get CaloCellGeometry from HCalContainer for Hit " << i;
-	continue;
+        edm::LogWarning(MsgLoggerCat) << "Unable to get CaloCellGeometry from HCalContainer for Hit " << i;
+        continue;
       }
 
       ++j;
 
       // get the global position of the cell
-      const GlobalPoint& globalposition = theDet->getPosition(theDetUnitId);
+      const GlobalPoint &globalposition = theDet->getPosition(theDetUnitId);
 
       // gather necessary information
       HCalE.push_back(itHit->energy());
@@ -1500,21 +1317,17 @@ void GlobalHitsProducer::fillHCal(edm::Event& iEvent,
       HCalEta.push_back(globalposition.eta());
 
     } else {
-      edm::LogWarning(MsgLoggerCat)
-	<< "HCal PCaloHit " << i 
-	<< " is expected to be (det,subdet) = (" 
-	<< dHcal << "," << sdHcalBrl
-	<< " || " << sdHcalEC << " || " << sdHcalOut << " || " << sdHcalFwd
-	<< "); value returned is: ("
-	<< detector << "," << subdetector << ")";
+      edm::LogWarning(MsgLoggerCat) << "HCal PCaloHit " << i << " is expected to be (det,subdet) = (" << dHcal << ","
+                                    << sdHcalBrl << " || " << sdHcalEC << " || " << sdHcalOut << " || " << sdHcalFwd
+                                    << "); value returned is: (" << detector << "," << subdetector << ")";
       continue;
-    } // end detector type check
-  } // end loop through HCal Hits
+    }  // end detector type check
+  }    // end loop through HCal Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of HCal Hits collected:............. ";
     eventout += j;
-  }  
+  }
 
   if (verbosity > 0)
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
@@ -1522,8 +1335,7 @@ void GlobalHitsProducer::fillHCal(edm::Event& iEvent,
   return;
 }
 
-void GlobalHitsProducer::storeHCal(PGlobalSimHit& product)
-{
+void GlobalHitsProducer::storeHCal(PGlobalSimHit &product) {
   std::string MsgLoggerCat = "GlobalHitsProducer_storeHCal";
 
   if (verbosity > 2) {
@@ -1537,24 +1349,22 @@ void GlobalHitsProducer::storeHCal(PGlobalSimHit& product)
       eventout += ", ";
       eventout += HCalPhi[i];
       eventout += ", ";
-      eventout += HCalEta[i];  
-      eventout += ")";      
-    } // end HCal output
+      eventout += HCalEta[i];
+      eventout += ")";
+    }  // end HCal output
     edm::LogInfo(MsgLoggerCat) << eventout << "\n";
-  } // end verbose output
+  }  // end verbose output
 
-  product.putHCalHits(HCalE,HCalToF,HCalPhi,HCalEta);
+  product.putHCalHits(HCalE, HCalToF, HCalPhi, HCalEta);
 
   return;
 }
 
-void GlobalHitsProducer::clear()
-{
+void GlobalHitsProducer::clear() {
   std::string MsgLoggerCat = "GlobalHitsProducer_clear";
 
   if (verbosity > 0)
-    edm::LogInfo(MsgLoggerCat)
-      << "Clearing event holders"; 
+    edm::LogInfo(MsgLoggerCat) << "Clearing event holders";
 
   // reset G4MC info
   nRawGenPart = 0;
@@ -1585,41 +1395,41 @@ void GlobalHitsProducer::clear()
 
   // reset tracker info
   // reset Pixel info
-  PxlBrlToF.clear(); 
-  PxlBrlR.clear(); 
-  PxlBrlPhi.clear(); 
-  PxlBrlEta.clear(); 
-  PxlFwdToF.clear(); 
+  PxlBrlToF.clear();
+  PxlBrlR.clear();
+  PxlBrlPhi.clear();
+  PxlBrlEta.clear();
+  PxlFwdToF.clear();
   PxlFwdZ.clear();
-  PxlFwdPhi.clear(); 
+  PxlFwdPhi.clear();
   PxlFwdEta.clear();
   // reset strip info
-  SiBrlToF.clear(); 
-  SiBrlR.clear(); 
-  SiBrlPhi.clear(); 
-  SiBrlEta.clear(); 
-  SiFwdToF.clear(); 
+  SiBrlToF.clear();
+  SiBrlR.clear();
+  SiBrlPhi.clear();
+  SiBrlEta.clear();
+  SiFwdToF.clear();
   SiFwdZ.clear();
-  SiFwdPhi.clear(); 
+  SiFwdPhi.clear();
   SiFwdEta.clear();
 
   // reset muon info
   // reset muon DT info
-  MuonDtToF.clear(); 
+  MuonDtToF.clear();
   MuonDtR.clear();
   MuonDtPhi.clear();
   MuonDtEta.clear();
   // reset muon CSC info
-  MuonCscToF.clear(); 
+  MuonCscToF.clear();
   MuonCscZ.clear();
   MuonCscPhi.clear();
   MuonCscEta.clear();
   // rest muon RPC info
-  MuonRpcBrlToF.clear(); 
+  MuonRpcBrlToF.clear();
   MuonRpcBrlR.clear();
   MuonRpcBrlPhi.clear();
-  MuonRpcBrlEta.clear(); 
-  MuonRpcFwdToF.clear(); 
+  MuonRpcBrlEta.clear();
+  MuonRpcFwdToF.clear();
   MuonRpcFwdZ.clear();
   MuonRpcFwdPhi.clear();
   MuonRpcFwdEta.clear();
diff --git a/Validation/GlobalHits/src/GlobalHitsTester.cc b/Validation/GlobalHits/src/GlobalHitsTester.cc
index 23f309305892d..de5fc6ef4ce8b 100644
--- a/Validation/GlobalHits/src/GlobalHitsTester.cc
+++ b/Validation/GlobalHits/src/GlobalHitsTester.cc
@@ -1,10 +1,15 @@
-#include "Validation/GlobalHits/interface/GlobalHitsTester.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "Validation/GlobalHits/interface/GlobalHitsTester.h"
 
-GlobalHitsTester::GlobalHitsTester(const edm::ParameterSet& iPSet) :
-  fName(""), verbosity(0), frequency(0), vtxunit(0), label(""), 
-  getAllProvenances(false), printProvenanceInfo(false), count(0)
-{
+GlobalHitsTester::GlobalHitsTester(const edm::ParameterSet &iPSet)
+    : fName(""),
+      verbosity(0),
+      frequency(0),
+      vtxunit(0),
+      label(""),
+      getAllProvenances(false),
+      printProvenanceInfo(false),
+      count(0) {
   std::string MsgLoggerCat = "GlobalHitsTester_GlobalHitsTester";
 
   fName = iPSet.getUntrackedParameter<std::string>("Name");
@@ -13,36 +18,28 @@ GlobalHitsTester::GlobalHitsTester(const edm::ParameterSet& iPSet) :
   vtxunit = iPSet.getUntrackedParameter<int>("VtxUnit");
   outputfile = iPSet.getParameter<std::string>("OutputFile");
   doOutput = iPSet.getParameter<bool>("DoOutput");
-  edm::ParameterSet m_Prov =
-    iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup");
-  getAllProvenances = 
-    m_Prov.getUntrackedParameter<bool>("GetAllProvenances");
-  printProvenanceInfo = 
-    m_Prov.getUntrackedParameter<bool>("PrintProvenanceInfo");
- 
+  edm::ParameterSet m_Prov = iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup");
+  getAllProvenances = m_Prov.getUntrackedParameter<bool>("GetAllProvenances");
+  printProvenanceInfo = m_Prov.getUntrackedParameter<bool>("PrintProvenanceInfo");
+
   if (verbosity >= 0) {
-    edm::LogInfo(MsgLoggerCat) 
-      << "\n===============================\n"
-      << "Initialized as EDAnalyzer with parameter values:\n"
-      << "    Name          = " << fName << "\n"
-      << "    Verbosity     = " << verbosity << "\n"
-      << "    Frequency     = " << frequency << "\n"
-      << "    VtxUnit       = " << vtxunit << "\n"
-      << "    OutputFile    = " << outputfile << "\n"
-      << "    DoOutput      = " << doOutput << "\n"
-      << "    GetProv       = " << getAllProvenances << "\n"
-      << "    PrintProv     = " << printProvenanceInfo << "\n"
-      << "===============================\n";
+    edm::LogInfo(MsgLoggerCat) << "\n===============================\n"
+                               << "Initialized as EDAnalyzer with parameter values:\n"
+                               << "    Name          = " << fName << "\n"
+                               << "    Verbosity     = " << verbosity << "\n"
+                               << "    Frequency     = " << frequency << "\n"
+                               << "    VtxUnit       = " << vtxunit << "\n"
+                               << "    OutputFile    = " << outputfile << "\n"
+                               << "    DoOutput      = " << doOutput << "\n"
+                               << "    GetProv       = " << getAllProvenances << "\n"
+                               << "    PrintProv     = " << printProvenanceInfo << "\n"
+                               << "===============================\n";
   }
 }
 
-GlobalHitsTester::~GlobalHitsTester() 
-{
-}
-
-void GlobalHitsTester::bookHistograms(DQMStore::IBooker & ibooker,
-  edm::Run const &, edm::EventSetup const & ){
+GlobalHitsTester::~GlobalHitsTester() {}
 
+void GlobalHitsTester::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &, edm::EventSetup const &) {
   meTestString = nullptr;
   meTestInt = nullptr;
   meTestFloat = nullptr;
@@ -54,7 +51,7 @@ void GlobalHitsTester::bookHistograms(DQMStore::IBooker & ibooker,
   Random = new TRandom3();
 
   ibooker.setCurrentFolder("GlobalTestV/String");
-  meTestString = ibooker.bookString("TestString", "Hello World" );
+  meTestString = ibooker.bookString("TestString", "Hello World");
 
   ibooker.setCurrentFolder("GlobalTestV/Int");
   meTestInt = ibooker.bookInt("TestInt");
@@ -66,20 +63,16 @@ void GlobalHitsTester::bookHistograms(DQMStore::IBooker & ibooker,
   meTestTH1F = ibooker.book1D("Random1D", "Random1D", 100, -10., 10.);
 
   ibooker.setCurrentFolder("GlobalTestV/TH2F");
-  meTestTH2F = ibooker.book2D("Random2D", "Random2D", 100, -10, 10., 100, -10.,
-      10.);
+  meTestTH2F = ibooker.book2D("Random2D", "Random2D", 100, -10, 10., 100, -10., 10.);
 
   ibooker.setCurrentFolder("GlobalTestV/TH3F");
-  meTestTH3F = ibooker.book3D("Random3D", "Random3D", 100, -10., 10., 100,
-      -10., 10., 100, -10., 10.);
+  meTestTH3F = ibooker.book3D("Random3D", "Random3D", 100, -10., 10., 100, -10., 10., 100, -10., 10.);
 
   ibooker.setCurrentFolder("GlobalTestV/TProfile");
-  meTestProfile1 = ibooker.bookProfile("Profile1", "Profile1", 100, -10., 10.,
-      100, -10., 10.);
+  meTestProfile1 = ibooker.bookProfile("Profile1", "Profile1", 100, -10., 10., 100, -10., 10.);
 
   ibooker.setCurrentFolder("GlobalTestV/TProfile2D");
-  meTestProfile2 = ibooker.bookProfile2D("Profile2", "Profile2", 100, -10.,
-      10., 100, -10, 10., 100, -10., 10.);
+  meTestProfile2 = ibooker.bookProfile2D("Profile2", "Profile2", 100, -10., 10., 100, -10, 10., 100, -10., 10.);
 
   ibooker.tag(meTestTH1F, 1);
   ibooker.tag(meTestTH2F, 2);
@@ -89,18 +82,14 @@ void GlobalHitsTester::bookHistograms(DQMStore::IBooker & ibooker,
   ibooker.tag(meTestString, 6);
   ibooker.tag(meTestInt, 7);
   ibooker.tag(meTestFloat, 8);
-
 }
 
-void GlobalHitsTester::analyze(const edm::Event& iEvent, 
-			       const edm::EventSetup& iSetup)
-{
-  
-  for(int i = 0; i < 1000; ++i) {
-    RandomVal1 = Random->Gaus(0.,1.);
-    RandomVal2 = Random->Gaus(0.,1.);
-    RandomVal3 = Random->Gaus(0.,1.);
-    
+void GlobalHitsTester::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  for (int i = 0; i < 1000; ++i) {
+    RandomVal1 = Random->Gaus(0., 1.);
+    RandomVal2 = Random->Gaus(0., 1.);
+    RandomVal3 = Random->Gaus(0., 1.);
+
     meTestTH1F->Fill(RandomVal1);
     meTestTH2F->Fill(RandomVal1, RandomVal2);
     meTestTH3F->Fill(RandomVal1, RandomVal2, RandomVal3);
diff --git a/Validation/GlobalHits/src/SealModule.cc b/Validation/GlobalHits/src/SealModule.cc
index 8c461af216d1b..83a34417bae8b 100644
--- a/Validation/GlobalHits/src/SealModule.cc
+++ b/Validation/GlobalHits/src/SealModule.cc
@@ -2,8 +2,6 @@
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-
-
 #include <Validation/GlobalHits/interface/GlobalHitsProducer.h>
 DEFINE_FWK_MODULE(GlobalHitsProducer);
 
diff --git a/Validation/HGCalValidation/test/HGCalDigiStudy.cc b/Validation/HGCalValidation/test/HGCalDigiStudy.cc
index 0f0aac3fe5d36..74057d7359f61 100644
--- a/Validation/HGCalValidation/test/HGCalDigiStudy.cc
+++ b/Validation/HGCalValidation/test/HGCalDigiStudy.cc
@@ -95,6 +95,7 @@ class HGCalDigiStudy : public edm::one::EDAnalyzer<edm::one::WatchRuns,edm::one:
   int                     layers_, layerFront_, geomType_;
   TH1D                   *h_Charge_, *h_ADC_, *h_LayZp_, *h_LayZm_;
   TH2D                   *h_RZ_, *h_EtaPhi_;
+  TH1D                   *h_W1_, *h_W2_, *h_C1_, *h_C2_, *h_Ly_;
 };
 
 HGCalDigiStudy::HGCalDigiStudy(const edm::ParameterSet& iConfig) :
@@ -193,6 +194,38 @@ void HGCalDigiStudy::beginJob() {
   title << "Charge vs Layer (-z) for " << nameDetector_;
   h_LayZm_ = fs->make<TH1D>(hname.str().c_str(), title.str().c_str(),
 			    60,0.0,60.0);
+  hname.str(""); title.str("");
+  hname  << "LY_" << nameDetector_;
+  title << "Layer number for " << nameDetector_;
+  h_Ly_ = fs->make<TH1D>(hname.str().c_str(),title.str().c_str(),200,0,100);
+  if ((nameDetector_=="HGCalHEScintillatorSensitive") ||
+      (nameDetector_=="HCal")) {
+    hname.str(""); title.str("");
+    hname  << "IR_" << nameDetector_;
+    title << "Radius index for " << nameDetector_;
+    h_W1_ = fs->make<TH1D>(hname.str().c_str(),title.str().c_str(),200,-50,50);
+    hname.str(""); title.str("");
+    hname  << "FI_" << nameDetector_;
+    title << "#phi index for " << nameDetector_;
+    h_C1_ = fs->make<TH1D>(hname.str().c_str(),title.str().c_str(),720,0,360);
+  } else {
+    hname.str(""); title.str("");
+    hname  << "WU_" << nameDetector_;
+    title << "u index of wafers for " << nameDetector_;
+    h_W1_ = fs->make<TH1D>(hname.str().c_str(),title.str().c_str(),200,-50,50);
+    hname.str(""); title.str("");
+    hname  << "WV_" << nameDetector_;
+    title << "v index of wafers for " << nameDetector_;
+    h_W2_ = fs->make<TH1D>(hname.str().c_str(),title.str().c_str(),100,-50,50);
+    hname.str(""); title.str("");
+    hname  << "CU_" << nameDetector_;
+    title << "u index of cells for " << nameDetector_;
+    h_C1_ = fs->make<TH1D>(hname.str().c_str(),title.str().c_str(),100,0,50);
+    hname.str(""); title.str("");
+    hname  << "CV_" << nameDetector_;
+    title << "v index of cells for " << nameDetector_;
+    h_C2_ = fs->make<TH1D>(hname.str().c_str(),title.str().c_str(),100,0,50);
+  }
 }
 
 void HGCalDigiStudy::beginRun(const edm::Run&, 
@@ -267,6 +300,26 @@ void HGCalDigiStudy::analyze(const edm::Event& iEvent,
 	uint16_t   adc       = hgcSample.data();
 	double     charge    = adc*gain;
 	digiValidation(detId, hgcGeom_, layer, adc, charge);
+	if (geomType_ == 0) {
+	  HGCalDetId id = HGCalDetId(detId);
+	  h_Ly_->Fill(id.layer());
+	  h_W1_->Fill(id.wafer());
+	  h_C1_->Fill(id.cell());
+	} else if (geomType_ == 1) {
+	  HGCSiliconDetId id = HGCSiliconDetId(detId);
+	  h_Ly_->Fill(id.layer());
+	  h_W1_->Fill(id.waferU());
+	  h_W2_->Fill(id.waferV());
+	  h_C1_->Fill(id.cellU());
+	  h_C2_->Fill(id.cellV());
+	} else {
+	  HFNoseDetId id = HFNoseDetId(detId);
+	  h_Ly_->Fill(id.layer());
+	  h_W1_->Fill(id.waferU());
+	  h_W2_->Fill(id.waferV());
+	  h_C1_->Fill(id.cellU());
+	  h_C2_->Fill(id.cellV());
+	}
       }
     } else {
       edm::LogVerbatim("HGCalValidation") << "DigiCollection handle "
@@ -296,6 +349,24 @@ void HGCalDigiStudy::analyze(const edm::Event& iEvent,
 	uint16_t   adc       = hgcSample.data();
 	double     charge    = adc*gain;
 	digiValidation(detId, hgcGeom_, layer, adc, charge);
+	if (geomType_ == 0) {
+	  HGCalDetId id = HGCalDetId(detId);
+	  h_Ly_->Fill(id.layer());
+	  h_W1_->Fill(id.wafer());
+	  h_C1_->Fill(id.cell());
+	} else if (geomType_ == 1) {
+	  HGCSiliconDetId id = HGCSiliconDetId(detId);
+	  h_Ly_->Fill(id.layer());
+	  h_W1_->Fill(id.waferU());
+	  h_W2_->Fill(id.waferV());
+	  h_C1_->Fill(id.cellU());
+	  h_C2_->Fill(id.cellV());
+	} else {
+	  HGCScintillatorDetId id = HGCScintillatorDetId(detId);
+	  h_Ly_->Fill(id.layer());
+	  h_W1_->Fill(id.ieta());
+	  h_C1_->Fill(id.iphi());
+	}
       }
     } else {
       edm::LogVerbatim("HGCalValidation") << "DigiCollection handle "
diff --git a/Validation/HGCalValidation/test/HGCalRecHitStudy.cc b/Validation/HGCalValidation/test/HGCalRecHitStudy.cc
index 39ea0db4f7684..b5126c29b6aab 100644
--- a/Validation/HGCalValidation/test/HGCalRecHitStudy.cc
+++ b/Validation/HGCalValidation/test/HGCalRecHitStudy.cc
@@ -97,6 +97,7 @@ class HGCalRecHitStudy : public edm::one::EDAnalyzer<edm::one::WatchRuns,edm::on
   std::vector<TH1D*>    HitOccupancy_Plus_;
   std::vector<TH1D*>    HitOccupancy_Minus_;
   TH1D                 *MeanHitOccupancy_Plus_, *MeanHitOccupancy_Minus_;
+  TH2D                 *h_RZ_, *h_EtaPhi_;
 };
 
 
@@ -232,6 +233,8 @@ void HGCalRecHitStudy::recHitValidation(DetId & detId, int layer,
   float globalx = global.x();
   float globaly = global.y();
   float globalz = global.z();
+  h_RZ_->Fill(std::abs(globalz),global.perp());
+  h_EtaPhi_->Fill(std::abs(global.eta()),global.phi());
       
   HitsInfo   hinfo;
   hinfo.energy = energy;
@@ -325,6 +328,14 @@ void HGCalRecHitStudy::beginRun(edm::Run const&,
 
   MeanHitOccupancy_Plus_= fs->make<TH1D>("SUMOfRecHitOccupancy_Plus", "SUMOfRecHitOccupancy_Plus", layers_, -0.5, layers_-0.5);
   MeanHitOccupancy_Minus_ = fs->make<TH1D>("SUMOfRecHitOccupancy_Minus", "SUMOfRecHitOccupancy_Minus", layers_, -0.5,layers_-0.5);
+
+  char title[100];
+  sprintf (histoname, "RZ_%s", nameDetector_.c_str());
+  sprintf (title,     "R vs Z for %s", nameDetector_.c_str());
+  h_RZ_ = fs->make<TH2D>(histoname,title,600,300.,600.,300,0,300.);
+  sprintf (histoname, "EtaPhi_%s", nameDetector_.c_str());
+  sprintf (title,     "#phi vs #eta for %s", nameDetector_.c_str());
+  h_EtaPhi_ = fs->make<TH2D>(histoname,title,200,1.0,3.0,200,-M_PI,M_PI);
 }
 
 
diff --git a/Validation/HGCalValidation/test/HGCalSimHitStudy.cc b/Validation/HGCalValidation/test/HGCalSimHitStudy.cc
index 78d48d3a7c5f4..eba9c057108d4 100644
--- a/Validation/HGCalValidation/test/HGCalSimHitStudy.cc
+++ b/Validation/HGCalValidation/test/HGCalSimHitStudy.cc
@@ -43,6 +43,7 @@
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 #include "CLHEP/Units/GlobalPhysicalConstants.h"
 
+#include "TH1D.h"
 #include "TH2D.h"
 
 class HGCalSimHitStudy : public edm::one::EDAnalyzer<edm::one::WatchRuns,edm::one::SharedResources> {
@@ -88,6 +89,7 @@ class HGCalSimHitStudy : public edm::one::EDAnalyzer<edm::one::WatchRuns,edm::on
   //histogram related stuff
   std::vector<TH2D*>                    h_RZ_, h_EtaPhi_, h_EtFiZp_, h_EtFiZm_;
   std::vector<TH1D*>                    h_E_, h_T_, h_LayerZp_, h_LayerZm_;
+  std::vector<TH1D*>                    h_W1_, h_W2_, h_C1_, h_C2_, h_Ly_;
 };
 
 HGCalSimHitStudy::HGCalSimHitStudy(const edm::ParameterSet& iConfig) :
@@ -228,6 +230,9 @@ void HGCalSimHitStudy::analyzeHits(int ih, std::string const& name,
 	zside    = detId.zside();
 	xy       = hgcons_[ih]->locateCell(layer,sector,sector2,cell,cell2,
 					   false,true);
+	h_W2_[ih]->Fill(sector2);
+	h_C2_[ih]->Fill(cell2);
+
       } else if ((hgcons_[ih]->geomMode() == HGCalGeometryMode::Hexagon8) ||
 		 (hgcons_[ih]->geomMode() == HGCalGeometryMode::Hexagon8Full)){
 	HGCSiliconDetId detId = HGCSiliconDetId(id);
@@ -241,10 +246,12 @@ void HGCalSimHitStudy::analyzeHits(int ih, std::string const& name,
 	zside    = detId.zside();
 	xy       = hgcons_[ih]->locateCell(layer,sector,sector2,cell,cell2,
 					   false,true);
+	h_W2_[ih]->Fill(sector2);
+	h_C2_[ih]->Fill(cell2);
       } else if (hgcons_[ih]->geomMode() == HGCalGeometryMode::Trapezoid) {
 	HGCScintillatorDetId detId = HGCScintillatorDetId(id);
 	subdet   = (int)(detId.det());
-	sector   = detId.ietaAbs();
+	sector   = detId.ieta();
 	cell     = detId.iphi();
 	type     = detId.type();
 	layer    = detId.layer();
@@ -298,6 +305,9 @@ void HGCalSimHitStudy::analyzeHits(int ih, std::string const& name,
     h_RZ_[ih+1]->Fill(std::abs(gcoord.z()),gcoord.rho());
     h_EtaPhi_[0]   ->Fill(std::abs(hinfo.eta),hinfo.phi);
     h_EtaPhi_[ih+1]->Fill(std::abs(hinfo.eta),hinfo.phi);
+    h_Ly_[ih]->Fill(layer);
+    h_W1_[ih]->Fill(sector);
+    h_C1_[ih]->Fill(cell);
   }
   if (verbosity_>0) 
     edm::LogVerbatim("HGCalValidation") << name << " with " << map_hits.size()
@@ -456,6 +466,48 @@ void HGCalSimHitStudy::beginJob() {
     h_T_.emplace_back(fs->make<TH1D>(name.str().c_str(), title.str().c_str(),
 				     1000,0.0,200.0));
   }
+
+  for (unsigned int ih=0; ih<nameDetectors_.size(); ++ih) {
+    name.str(""); title.str("");
+    name  << "LY_" << nameDetectors_[ih];
+    title << "Layer number for " << nameDetectors_[ih];
+    h_Ly_.emplace_back(fs->make<TH1D>(name.str().c_str(), 
+					title.str().c_str(),200,0,100));
+    if ((nameDetectors_[ih]=="HGCalHEScintillatorSensitive") ||
+	heRebuild_[ih]) {
+      name.str(""); title.str("");
+      name  << "IR_" << nameDetectors_[ih];
+      title << "Radius index for " << nameDetectors_[ih];
+      h_W1_.emplace_back(fs->make<TH1D>(name.str().c_str(), 
+					title.str().c_str(),200,-50,50));
+      name.str(""); title.str("");
+      name  << "FI_" << nameDetectors_[ih];
+      title << "#phi index for " << nameDetectors_[ih];
+      h_C1_.emplace_back(fs->make<TH1D>(name.str().c_str(), 
+					title.str().c_str(),720,0,360));
+    } else {
+      name.str(""); title.str("");
+      name  << "WU_" << nameDetectors_[ih];
+      title << "u index of wafers for " << nameDetectors_[ih];
+      h_W1_.emplace_back(fs->make<TH1D>(name.str().c_str(), 
+					title.str().c_str(),200,-50,50));
+      name.str(""); title.str("");
+      name  << "WV_" << nameDetectors_[ih];
+      title << "v index of wafers for " << nameDetectors_[ih];
+      h_W2_.emplace_back(fs->make<TH1D>(name.str().c_str(), 
+					title.str().c_str(),100,-50,50));
+      name.str(""); title.str("");
+      name  << "CU_" << nameDetectors_[ih];
+      title << "u index of cells for " << nameDetectors_[ih];
+      h_C1_.emplace_back(fs->make<TH1D>(name.str().c_str(), 
+					title.str().c_str(),100,0,50));
+      name.str(""); title.str("");
+      name  << "CV_" << nameDetectors_[ih];
+      title << "v index of cells for " << nameDetectors_[ih];
+      h_C2_.emplace_back(fs->make<TH1D>(name.str().c_str(), 
+					title.str().c_str(),100,0,50));
+    }
+  }
 }
 
 #include "FWCore/Framework/interface/MakerMacros.h"
diff --git a/Validation/HGCalValidation/test/digiValidation_cfg.py b/Validation/HGCalValidation/test/digiValidation_cfg.py
index 2dc8837643933..8d7303b2eff80 100644
--- a/Validation/HGCalValidation/test/digiValidation_cfg.py
+++ b/Validation/HGCalValidation/test/digiValidation_cfg.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 import six
 
-process = cms.Process('SIM',eras.Phase2C2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('SIM',Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/Validation/HGCalValidation/test/rechitValidation_cfg.py b/Validation/HGCalValidation/test/rechitValidation_cfg.py
index 80feeb7817094..23d11efc445ec 100644
--- a/Validation/HGCalValidation/test/rechitValidation_cfg.py
+++ b/Validation/HGCalValidation/test/rechitValidation_cfg.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 import six
 
-process = cms.Process('SIMDIGIRECO',eras.Phase2C2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('SIMDIGIRECO',Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/Validation/HGCalValidation/test/runHFNoseDigiStudy_cfg.py b/Validation/HGCalValidation/test/runHFNoseDigiStudy_cfg.py
index d76c5d2217001..b96ea333cc147 100644
--- a/Validation/HGCalValidation/test/runHFNoseDigiStudy_cfg.py
+++ b/Validation/HGCalValidation/test/runHFNoseDigiStudy_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('PROD',eras.Phase2C6)
+from Configuration.Eras.Era_Phase2C6_cff import Phase2C6
+process = cms.Process('PROD',Phase2C6)
 
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
 process.load('Configuration.Geometry.GeometryExtended2023D31_cff')
diff --git a/Validation/HGCalValidation/test/runHFNoseSimHitStudy_cfg.py b/Validation/HGCalValidation/test/runHFNoseSimHitStudy_cfg.py
index 832359383715e..b0dd15f479b13 100644
--- a/Validation/HGCalValidation/test/runHFNoseSimHitStudy_cfg.py
+++ b/Validation/HGCalValidation/test/runHFNoseSimHitStudy_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('PROD',eras.Phase2C6)
+from Configuration.Eras.Era_Phase2C6_cff import Phase2C6
+process = cms.Process('PROD',Phase2C6)
 
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
 process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi")
diff --git a/Validation/HGCalValidation/test/runHGCGeomCheck_cfg.py b/Validation/HGCalValidation/test/runHGCGeomCheck_cfg.py
index 556654d3d63aa..b55d394ffe27c 100644
--- a/Validation/HGCalValidation/test/runHGCGeomCheck_cfg.py
+++ b/Validation/HGCalValidation/test/runHGCGeomCheck_cfg.py
@@ -1,13 +1,15 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-#process = cms.Process("HGCGeomAnalysis",eras.Phase2)
+#from Configuration.Eras.Era_Phase2_cff import Phase2
+#process = cms.Process("HGCGeomAnalysis",Phase2)
 #process.load('Configuration.Geometry.GeometryExtended2023D21Reco_cff')
 #process.load('Configuration.Geometry.GeometryExtended2023D21_cff')
-#process = cms.Process("HGCGeomAnalysis",eras.Phase2C4)
+#from Configuration.Eras.Era_Phase2C4_cff import Phase2C4
+#process = cms.Process("HGCGeomAnalysis",Phase2C4)
 #process.load('Configuration.Geometry.GeometryExtended2023D28Reco_cff')
 #process.load('Configuration.Geometry.GeometryExtended2023D28_cff')
-process = cms.Process("HGCGeomAnalysis",eras.Phase2C4_timing_layer_bar)
+from Configuration.Eras.Era_Phase2C4_timing_layer_bar_cff import Phase2C4_timing_layer_bar
+process = cms.Process("HGCGeomAnalysis",Phase2C4_timing_layer_bar)
 process.load('Configuration.Geometry.GeometryExtended2023D41Reco_cff')
 process.load('Configuration.Geometry.GeometryExtended2023D41_cff')
 
diff --git a/Validation/HGCalValidation/test/runHGCHitAnalyzer_cfg.py b/Validation/HGCalValidation/test/runHGCHitAnalyzer_cfg.py
index 3c3a3f49e2e2f..a829583b9aceb 100644
--- a/Validation/HGCalValidation/test/runHGCHitAnalyzer_cfg.py
+++ b/Validation/HGCalValidation/test/runHGCHitAnalyzer_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('HGCGeomAnalysis',eras.Phase2C4)
+from Configuration.Eras.Era_Phase2C4_cff import Phase2C4
+process = cms.Process('HGCGeomAnalysis',Phase2C4)
 
 process.load('Configuration.StandardSequences.Services_cff')
 process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi')    
diff --git a/Validation/HGCalValidation/test/runHGCalDigiStudy_cfg.py b/Validation/HGCalValidation/test/runHGCalDigiStudy_cfg.py
index 0ee11d07d4f7a..3bb9591596ea5 100644
--- a/Validation/HGCalValidation/test/runHGCalDigiStudy_cfg.py
+++ b/Validation/HGCalValidation/test/runHGCalDigiStudy_cfg.py
@@ -1,11 +1,12 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-#process = cms.Process('PROD',eras.Phase2C4)
+#from Configuration.Eras.Era_Phase2C4_cff import Phase2C4
+#process = cms.Process('PROD',Phase2C4)
 #process.load('Configuration.Geometry.GeometryExtended2023D28_cff')
 #process.load('Configuration.Geometry.GeometryExtended2023D28Reco_cff')
 
-process = cms.Process('PROD',eras.Phase2C4_timing_layer_bar)
+from Configuration.Eras.Era_Phase2C4_timing_layer_bar_cff import Phase2C4_timing_layer_bar
+process = cms.Process('PROD',Phase2C4_timing_layer_bar)
 process.load('Configuration.Geometry.GeometryExtended2023D41_cff')
 process.load('Configuration.Geometry.GeometryExtended2023D41Reco_cff')
 
@@ -23,7 +24,7 @@
 
 process.source = cms.Source("PoolSource",
                             fileNames = cms.untracked.vstring(
-        'file:step2.root',
+        'file:step2_29034.root',
 #       'root://cms-xrd-global.cern.ch//store/relval/CMSSW_9_1_1_patch1/RelValSingleElectronPt35Extended/GEN-SIM-RECO/91X_upgrade2023_realistic_v1_D17-v1/10000/10D95AC2-B14A-E711-BC4A-0CC47A7C3638.root',
         )
                             )
@@ -33,7 +34,7 @@
 )
 
 process.TFileService = cms.Service("TFileService",
-                                   fileName = cms.string('hgcDigi.root'),
+                                   fileName = cms.string('hgcDigiD41tt.root'),
                                    closeFileFast = cms.untracked.bool(True)
                                    )
 
diff --git a/Validation/HGCalValidation/test/runHGCalRecHitStudy_cfg.py b/Validation/HGCalValidation/test/runHGCalRecHitStudy_cfg.py
index 16ba54e018a08..e1a1d5a2f4d58 100644
--- a/Validation/HGCalValidation/test/runHGCalRecHitStudy_cfg.py
+++ b/Validation/HGCalValidation/test/runHGCalRecHitStudy_cfg.py
@@ -1,12 +1,13 @@
 import FWCore.ParameterSet.Config as cms
 import FWCore.Utilities.FileUtils as FileUtils
-from Configuration.StandardSequences.Eras import eras
 
-#process = cms.Process('PROD',eras.Phase2C4)
+#from Configuration.Eras.Era_Phase2C4_cff import Phase2C4
+#process = cms.Process('PROD',Phase2C4)
 #process.load('Configuration.Geometry.GeometryExtended2023D28_cff')
 #process.load('Configuration.Geometry.GeometryExtended2023D28Reco_cff')
 
-process = cms.Process('PROD',eras.Phase2C4_timing_layer_bar)
+from Configuration.Eras.Era_Phase2C4_timing_layer_bar_cff import Phase2C4_timing_layer_bar
+process = cms.Process('PROD',Phase2C4_timing_layer_bar)
 process.load('Configuration.Geometry.GeometryExtended2023D41_cff')
 process.load('Configuration.Geometry.GeometryExtended2023D41Reco_cff')
 
@@ -26,7 +27,7 @@
 
 process.source = cms.Source("PoolSource",
                             fileNames = cms.untracked.vstring(
-        'file:step3.root',
+        'file:step3_29034.root',
 #       'root://cms-xrd-global.cern.ch//store/relval/CMSSW_9_1_1_patch1/RelValSingleElectronPt35Extended/GEN-SIM-RECO/91X_upgrade2023_realistic_v1_D17-v1/10000/10D95AC2-B14A-E711-BC4A-0CC47A7C3638.root',
         )
                             )
@@ -39,7 +40,7 @@
 process.hgcalRecHitStudyBH.Verbosity = 0
 
 process.TFileService = cms.Service("TFileService",
-                                   fileName = cms.string('hgcRecHit.root'),
+                                   fileName = cms.string('hgcRecHitD41tt.root'),
                                    closeFileFast = cms.untracked.bool(True)
                                    )
 
diff --git a/Validation/HGCalValidation/test/runHGCalSimHitStudy_cfg.py b/Validation/HGCalValidation/test/runHGCalSimHitStudy_cfg.py
index 76fdd298bbc3f..282df087e8acc 100644
--- a/Validation/HGCalValidation/test/runHGCalSimHitStudy_cfg.py
+++ b/Validation/HGCalValidation/test/runHGCalSimHitStudy_cfg.py
@@ -1,85 +1,36 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-#process = cms.Process('PROD',eras.Phase2C4)
+#from Configuration.Eras.Era_Phase2C4_cff import Phase2C4
+#process = cms.Process('PROD',Phase2C4)
 #process.load('Configuration.Geometry.GeometryExtended2023D28_cff')
 
-process = cms.Process('PROD',eras.Phase2C4_timing_layer_bar)
+from Configuration.Eras.Era_Phase2C4_timing_layer_bar_cff import Phase2C4_timing_layer_bar
+process = cms.Process('PROD',Phase2C4_timing_layer_bar)
 process.load('Configuration.Geometry.GeometryExtended2023D41_cff')
 
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
-process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi")
 process.load("Configuration.StandardSequences.MagneticField_cff")
 process.load("Configuration.EventContent.EventContent_cff")
-process.load('Configuration.StandardSequences.Generator_cff')
-process.load('Configuration.StandardSequences.SimIdeal_cff')
 process.load('FWCore.MessageService.MessageLogger_cfi')
 process.load('Validation.HGCalValidation.hgcSimHitStudy_cfi')
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.autoCond import autoCond
 process.GlobalTag.globaltag = autoCond['phase2_realistic']
 
-#if hasattr(process,'MessageLogger'):
-#    process.MessageLogger.categories.append('HGCalGeom')
-#    process.MessageLogger.categories.append('HGCSim')
-#    process.MessageLogger.categories.append('HGCalValidation')
-
-process.load("IOMC.RandomEngine.IOMC_cff")
-process.RandomNumberGeneratorService.generator.initialSeed = 456789
-process.RandomNumberGeneratorService.g4SimHits.initialSeed = 9876
-process.RandomNumberGeneratorService.VtxSmeared.initialSeed = 123456789
-
-process.Timing = cms.Service("Timing")
+process.source = cms.Source("PoolSource",
+                            fileNames = cms.untracked.vstring(
+        'file:step1_29034.root',
+#       'root://cms-xrd-global.cern.ch//store/relval/CMSSW_9_1_1_patch1/RelValSingleElectronPt35Extended/GEN-SIM-RECO/91X_upgrade2023_realistic_v1_D17-v1/10000/10D95AC2-B14A-E711-BC4A-0CC47A7C3638.root',
+        )
+                            )
 
 process.maxEvents = cms.untracked.PSet(
-    input = cms.untracked.int32(10000)
-)
-
-process.source = cms.Source("EmptySource",
-    firstRun        = cms.untracked.uint32(1),
-    firstEvent      = cms.untracked.uint32(1)
-)
-
-process.generator = cms.EDProducer("FlatRandomEGunProducer",
-    PGunParameters = cms.PSet(
-        PartID = cms.vint32(13),
-        MinEta = cms.double(1.25),
-        MaxEta = cms.double(3.00),
-        MinPhi = cms.double(-3.1415926),
-        MaxPhi = cms.double(3.1415926),
-        MinE   = cms.double(100.00),
-        MaxE   = cms.double(100.00)
-    ),
-    Verbosity       = cms.untracked.int32(0),
-    AddAntiParticle = cms.bool(True)
-)
-
-process.output = cms.OutputModule("PoolOutputModule",
-    process.FEVTSIMEventContent,
-    fileName = cms.untracked.string('simevent.root')
+    input = cms.untracked.int32(-1)
 )
 
 process.TFileService = cms.Service("TFileService",
-                                   fileName = cms.string('hgcSimHit.root'),
+                                   fileName = cms.string('hgcSimHitD41tt.root'),
                                    closeFileFast = cms.untracked.bool(True)
                                    )
 
-process.generation_step = cms.Path(process.pgen)
-process.simulation_step = cms.Path(process.psim)
-process.analysis_step   = cms.Path(process.hgcalSimHitStudy)
-process.out_step = cms.EndPath(process.output)
-
-process.g4SimHits.Physics.type = 'SimG4Core/Physics/FTFP_BERT_EMM'
-process.g4SimHits.Physics.DefaultCutValue   = 0.1
-process.hgcalSimHitStudy.verbosity = 0
-process.hgcalSimHitStudy.nBinZ = 3000
-
-# Schedule definition
-process.schedule = cms.Schedule(process.generation_step,
-                                process.simulation_step,
-                                process.analysis_step,
-                                )
-
-# filter all path with the production filter sequence
-for path in process.paths:
-        getattr(process,path)._seq = process.generator * getattr(process,path)._seq
+process.p = cms.Path(process.hgcalSimHitStudy)
diff --git a/Validation/HGCalValidation/test/runHGCalWaferStudy_cfg.py b/Validation/HGCalValidation/test/runHGCalWaferStudy_cfg.py
index 31ca3e48d1564..ec0da773e2416 100644
--- a/Validation/HGCalValidation/test/runHGCalWaferStudy_cfg.py
+++ b/Validation/HGCalValidation/test/runHGCalWaferStudy_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('PROD',eras.Phase2C4)
+from Configuration.Eras.Era_Phase2C4_cff import Phase2C4
+process = cms.Process('PROD',Phase2C4)
 
 process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
 process.load('Configuration.Geometry.GeometryExtended2023D28_cff')
diff --git a/Validation/HGCalValidation/test/simHitValidation_cfg.py b/Validation/HGCalValidation/test/simHitValidation_cfg.py
index 0e165ba34ecc0..a2db4ea245f28 100644
--- a/Validation/HGCalValidation/test/simHitValidation_cfg.py
+++ b/Validation/HGCalValidation/test/simHitValidation_cfg.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 import six
 
-process = cms.Process("SIM",eras.Phase2C2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process("SIM",Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/Validation/HGCalValidation/test/standalone_fromRECO.py b/Validation/HGCalValidation/test/standalone_fromRECO.py
index f8e530075ed14..ef5c90850dbc5 100644
--- a/Validation/HGCalValidation/test/standalone_fromRECO.py
+++ b/Validation/HGCalValidation/test/standalone_fromRECO.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('HGCAL',eras.Phase2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('HGCAL',Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/Validation/HGCalValidation/test/standalone_fromRECO_HARVESTING.py b/Validation/HGCalValidation/test/standalone_fromRECO_HARVESTING.py
index 620e24ab97944..86bdcd97b1666 100644
--- a/Validation/HGCalValidation/test/standalone_fromRECO_HARVESTING.py
+++ b/Validation/HGCalValidation/test/standalone_fromRECO_HARVESTING.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('HARVESTING',eras.Phase2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('HARVESTING',Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/Validation/HGCalValidation/test/testHGCalBHValid_cfg.py b/Validation/HGCalValidation/test/testHGCalBHValid_cfg.py
index e9125fcb47add..2d42b2fb67875 100644
--- a/Validation/HGCalValidation/test/testHGCalBHValid_cfg.py
+++ b/Validation/HGCalValidation/test/testHGCalBHValid_cfg.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 import six
 
-process = cms.Process("testHGCalRecoLocal",eras.Phase2C2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process("testHGCalRecoLocal",Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/Validation/HGCalValidation/test/testHGCalSimHitStudy_cfg.py b/Validation/HGCalValidation/test/testHGCalSimHitStudy_cfg.py
new file mode 100644
index 0000000000000..28c53f88abf74
--- /dev/null
+++ b/Validation/HGCalValidation/test/testHGCalSimHitStudy_cfg.py
@@ -0,0 +1,86 @@
+import FWCore.ParameterSet.Config as cms
+
+#from Configuration.Eras.Era_Phase2C4_cff import Phase2C4
+#process = cms.Process('PROD',Phase2C4)
+#process.load('Configuration.Geometry.GeometryExtended2023D28_cff')
+
+from Configuration.Eras.Era_Phase2C4_timing_layer_bar_cff import Phase2C4_timing_layer_bar
+process = cms.Process('PROD',Phase2C4_timing_layer_bar)
+process.load('Configuration.Geometry.GeometryExtended2023D41_cff')
+
+process.load("SimGeneral.HepPDTESSource.pythiapdt_cfi")
+process.load("IOMC.EventVertexGenerators.VtxSmearedGauss_cfi")
+process.load("Configuration.StandardSequences.MagneticField_cff")
+process.load("Configuration.EventContent.EventContent_cff")
+process.load('Configuration.StandardSequences.Generator_cff')
+process.load('Configuration.StandardSequences.SimIdeal_cff')
+process.load('FWCore.MessageService.MessageLogger_cfi')
+process.load('Validation.HGCalValidation.hgcSimHitStudy_cfi')
+process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
+from Configuration.AlCa.autoCond import autoCond
+process.GlobalTag.globaltag = autoCond['phase2_realistic']
+
+#if hasattr(process,'MessageLogger'):
+#    process.MessageLogger.categories.append('HGCalGeom')
+#    process.MessageLogger.categories.append('HGCSim')
+#    process.MessageLogger.categories.append('HGCalValidation')
+
+process.load("IOMC.RandomEngine.IOMC_cff")
+process.RandomNumberGeneratorService.generator.initialSeed = 456789
+process.RandomNumberGeneratorService.g4SimHits.initialSeed = 9876
+process.RandomNumberGeneratorService.VtxSmeared.initialSeed = 123456789
+
+process.Timing = cms.Service("Timing")
+
+process.maxEvents = cms.untracked.PSet(
+    input = cms.untracked.int32(10000)
+)
+
+process.source = cms.Source("EmptySource",
+    firstRun        = cms.untracked.uint32(1),
+    firstEvent      = cms.untracked.uint32(1)
+)
+
+process.generator = cms.EDProducer("FlatRandomEGunProducer",
+    PGunParameters = cms.PSet(
+        PartID = cms.vint32(13),
+        MinEta = cms.double(1.25),
+        MaxEta = cms.double(3.00),
+        MinPhi = cms.double(-3.1415926),
+        MaxPhi = cms.double(3.1415926),
+        MinE   = cms.double(100.00),
+        MaxE   = cms.double(100.00)
+    ),
+    Verbosity       = cms.untracked.int32(0),
+    AddAntiParticle = cms.bool(True)
+)
+
+process.output = cms.OutputModule("PoolOutputModule",
+    process.FEVTSIMEventContent,
+    fileName = cms.untracked.string('simevent.root')
+)
+
+process.TFileService = cms.Service("TFileService",
+                                   fileName = cms.string('hgcSimHit.root'),
+                                   closeFileFast = cms.untracked.bool(True)
+                                   )
+
+process.generation_step = cms.Path(process.pgen)
+process.simulation_step = cms.Path(process.psim)
+process.analysis_step   = cms.Path(process.hgcalSimHitStudy)
+process.out_step = cms.EndPath(process.output)
+
+process.g4SimHits.Physics.type = 'SimG4Core/Physics/FTFP_BERT_EMM'
+process.g4SimHits.Physics.DefaultCutValue   = 0.1
+process.hgcalSimHitStudy.verbosity = 0
+process.hgcalSimHitStudy.nBinZ = 3000
+
+# Schedule definition
+process.schedule = cms.Schedule(process.generation_step,
+                                process.simulation_step,
+                                process.analysis_step,
+                                )
+
+# filter all path with the production filter sequence
+for path in process.paths:
+        getattr(process,path)._seq = process.generator * getattr(process,path)._seq
diff --git a/Validation/HGCalValidation/test/testHGCalSimWatcherV10_cfg.py b/Validation/HGCalValidation/test/testHGCalSimWatcherV10_cfg.py
index 252c238725504..6f93b8f148ea9 100644
--- a/Validation/HGCalValidation/test/testHGCalSimWatcherV10_cfg.py
+++ b/Validation/HGCalValidation/test/testHGCalSimWatcherV10_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('testHGCalRecoLocal',eras.Phase2C4_timing_layer_bar)
+from Configuration.Eras.Era_Phase2C4_timing_layer_bar_cff import Phase2C4_timing_layer_bar
+process = cms.Process('testHGCalRecoLocal',Phase2C4_timing_layer_bar)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/Validation/HGCalValidation/test/testHGCalSimWatcherV8_cfg.py b/Validation/HGCalValidation/test/testHGCalSimWatcherV8_cfg.py
index bfc390bf4b3df..ec4db5200bd56 100644
--- a/Validation/HGCalValidation/test/testHGCalSimWatcherV8_cfg.py
+++ b/Validation/HGCalValidation/test/testHGCalSimWatcherV8_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process("testHGCalRecoLocal",eras.Phase2)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process("testHGCalRecoLocal",Phase2)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/Validation/HGCalValidation/test/testHGCalSimWatcherV9_cfg.py b/Validation/HGCalValidation/test/testHGCalSimWatcherV9_cfg.py
index 5e188284284e3..5113c1b234f1c 100644
--- a/Validation/HGCalValidation/test/testHGCalSimWatcherV9_cfg.py
+++ b/Validation/HGCalValidation/test/testHGCalSimWatcherV9_cfg.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('testHGCalRecoLocal',eras.Phase2C4)
+from Configuration.Eras.Era_Phase2C4_cff import Phase2C4
+process = cms.Process('testHGCalRecoLocal',Phase2C4)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/Validation/HGCalValidation/test/testValidationHGCalTrigPrim_RelVal_cfg.py b/Validation/HGCalValidation/test/testValidationHGCalTrigPrim_RelVal_cfg.py
index 38985c81424a3..03a2bae3eeeb9 100644
--- a/Validation/HGCalValidation/test/testValidationHGCalTrigPrim_RelVal_cfg.py
+++ b/Validation/HGCalValidation/test/testValidationHGCalTrigPrim_RelVal_cfg.py
@@ -1,8 +1,8 @@
 import FWCore.ParameterSet.Config as cms 
-from Configuration.StandardSequences.Eras import eras
 from Configuration.ProcessModifiers.convertHGCalDigisSim_cff import convertHGCalDigisSim
 
-process = cms.Process('DIGI',eras.Phase2,convertHGCalDigisSim)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('DIGI',Phase2,convertHGCalDigisSim)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/Validation/HcalHits/interface/HcalSimHitStudy.h b/Validation/HcalHits/interface/HcalSimHitStudy.h
index 677d0a0aad8f1..4df511a22584b 100644
--- a/Validation/HcalHits/interface/HcalSimHitStudy.h
+++ b/Validation/HcalHits/interface/HcalSimHitStudy.h
@@ -1,16 +1,16 @@
 #ifndef SimG4CMS_HcalSimHitStudy_H
 #define SimG4CMS_HcalSimHitStudy_H
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
@@ -22,33 +22,30 @@
 #include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 
-#include <iostream>
 #include <fstream>
-#include <vector>
+#include <iostream>
 #include <map>
 #include <string>
+#include <vector>
 
-class HcalSimHitStudy: public DQMEDAnalyzer {
+class HcalSimHitStudy : public DQMEDAnalyzer {
 public:
-
-  HcalSimHitStudy(const edm::ParameterSet& ps);
+  HcalSimHitStudy(const edm::ParameterSet &ps);
   ~HcalSimHitStudy() override;
 
-  void bookHistograms(DQMStore::IBooker &, edm::Run const & , edm::EventSetup const & ) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
 protected:
+  // void endJob   ();
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
-  //void endJob   ();
-  void analyze  (const edm::Event& e, const edm::EventSetup& c) override;
-
-  void analyzeHits  (std::vector<PCaloHit> &);
+  void analyzeHits(std::vector<PCaloHit> &);
 
 private:
-
-  const HcalDDDRecConstants               *hcons;
-  int                                      maxDepthHB_, maxDepthHE_;
-  int                                      maxDepthHO_, maxDepthHF_;
-  int                                      maxDepth_;
+  const HcalDDDRecConstants *hcons;
+  int maxDepthHB_, maxDepthHE_;
+  int maxDepthHO_, maxDepthHF_;
+  int maxDepth_;
 
   int iphi_bins;
   float iphi_min, iphi_max;
@@ -61,15 +58,15 @@ class HcalSimHitStudy: public DQMEDAnalyzer {
   int ieta_bins_HF;
   float ieta_min_HF, ieta_max_HF;
 
-  std::string    g4Label, hcalHits, outFile_;
-  bool           verbose_, checkHit_, testNumber_, hep17_;
+  std::string g4Label, hcalHits, outFile_;
+  bool verbose_, checkHit_, testNumber_, hep17_;
 
   edm::EDGetTokenT<edm::PCaloHitContainer> tok_hits_;
 
   MonitorElement *meAllNHit_, *meBadDetHit_, *meBadSubHit_, *meBadIdHit_;
   MonitorElement *meHBNHit_, *meHENHit_, *meHONHit_, *meHFNHit_;
   MonitorElement *meDetectHit_, *meSubdetHit_, *meDepthHit_, *meEtaHit_, *meEtaPhiHit_;
-  std::vector<MonitorElement*> meEtaPhiHitDepth_;
+  std::vector<MonitorElement *> meEtaPhiHitDepth_;
   MonitorElement *mePhiHit_, *mePhiHitb_, *meEnergyHit_, *meTimeHit_, *meTimeWHit_;
   MonitorElement *meHBDepHit_, *meHEDepHit_, *meHODepHit_, *meHFDepHit_, *meHFDepHitw_;
   MonitorElement *meHBEtaHit_, *meHEEtaHit_, *meHOEtaHit_, *meHFEtaHit_;
@@ -83,8 +80,6 @@ class HcalSimHitStudy: public DQMEDAnalyzer {
   MonitorElement *meHBL10Ene_, *meHEL10Ene_, *meHOL10Ene_, *meHFL10Ene_;
   MonitorElement *meHBL10EneP_, *meHEL10EneP_, *meHOL10EneP_, *meHFL10EneP_;
   MonitorElement *meHEP17EneHit_, *meHEP17EneHit2_;
-
-
 };
 
 #endif
diff --git a/Validation/HcalHits/interface/HcalSimHitsClient.h b/Validation/HcalHits/interface/HcalSimHitsClient.h
index 9ee251a8221f1..31b31132fbfa2 100644
--- a/Validation/HcalHits/interface/HcalSimHitsClient.h
+++ b/Validation/HcalHits/interface/HcalSimHitsClient.h
@@ -3,57 +3,55 @@
 
 // -*- C++ -*-
 //
-// 
+//
 /*
  Description: This is a SImHit CLient code
 */
 
 //
 // Originally create by: Bhawna Gomber
-//                        
+//
 //
 
-#include <memory>
-#include <unistd.h>
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
 #include "Geometry/HcalCommonData/interface/HcalDDDRecConstants.h"
+#include <memory>
+#include <unistd.h>
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <vector>
 
 class MonitorElement;
 
 class HcalSimHitsClient : public DQMEDHarvester {
- 
 private:
-  int SimHitsEndjob(const std::vector<MonitorElement*> &hcalMEs);
+  int SimHitsEndjob(const std::vector<MonitorElement *> &hcalMEs);
   std::vector<std::string> getHistogramTypes();
 
-  std::string                dirName_;
-  bool                       verbose_;
-  static const int           nTime = 4;
-  static const int           nType1 = 4;
+  std::string dirName_;
+  bool verbose_;
+  static const int nTime = 4;
+  static const int nType1 = 4;
   const HcalDDDRecConstants *hcons;
-  int                        maxDepthHB_, maxDepthHE_, maxDepthHO_, maxDepthHF_;
+  int maxDepthHB_, maxDepthHE_, maxDepthHO_, maxDepthHF_;
 
 public:
-  explicit HcalSimHitsClient(const edm::ParameterSet& );
+  explicit HcalSimHitsClient(const edm::ParameterSet &);
   ~HcalSimHitsClient() override;
-  
-  void beginRun(edm::Run const& run, edm::EventSetup const& c) override;
-  virtual void runClient_(DQMStore::IBooker &, DQMStore::IGetter &);   
-  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
 
+  void beginRun(edm::Run const &run, edm::EventSetup const &c) override;
+  virtual void runClient_(DQMStore::IBooker &, DQMStore::IGetter &);
+  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
 };
 
 #endif
diff --git a/Validation/HcalHits/interface/HcalSimHitsValidation.h b/Validation/HcalHits/interface/HcalSimHitsValidation.h
index 0f26f3a57283f..e3c82c43f4ecb 100644
--- a/Validation/HcalHits/interface/HcalSimHitsValidation.h
+++ b/Validation/HcalHits/interface/HcalSimHitsValidation.h
@@ -1,14 +1,14 @@
 #ifndef HcalSimHitsValidation_H
 #define HcalSimHitsValidation_H
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
@@ -17,94 +17,91 @@
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 #include "DataFormats/HcalRecHit/interface/HcalSourcePositionData.h"
 
+#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 #include <DataFormats/EcalDetId/interface/EBDetId.h>
 #include <DataFormats/EcalDetId/interface/EEDetId.h>
-#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 
-#include "DataFormats/HcalDetId/interface/HcalElectronicsId.h"
-#include "Geometry/HcalCommonData/interface/HcalDDDRecConstants.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
+#include "DataFormats/HcalDetId/interface/HcalElectronicsId.h"
+#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
+#include "Geometry/HcalCommonData/interface/HcalDDDRecConstants.h"
 
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 
-#include <vector>
-#include <utility>
-#include <ostream>
-#include <string>
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include <algorithm>
 #include <cmath>
-#include "DQMServices/Core/interface/MonitorElement.h"
-
+#include <ostream>
+#include <string>
+#include <utility>
+#include <vector>
 
 class HcalSimHitsValidation : public DQMEDAnalyzer {
-
 public:
-  HcalSimHitsValidation(edm::ParameterSet const& conf);
+  HcalSimHitsValidation(edm::ParameterSet const &conf);
   ~HcalSimHitsValidation() override;
 
-  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const & ) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
-  void analyze(edm::Event const& ev, edm::EventSetup const& c) override;
+  void analyze(edm::Event const &ev, edm::EventSetup const &c) override;
   void endJob() override;
 
 private:
-  
   double dR(double eta1, double phi1, double eta2, double phi2);
   double phi12(double phi1, double en1, double phi2, double en2);
-  double dPhiWsign(double phi1,double phi2);  
+  double dPhiWsign(double phi1, double phi2);
 
   std::string outputFile_;
-  std::string g4Label_,hcalHits_,ebHits_,eeHits_;
+  std::string g4Label_, hcalHits_, ebHits_, eeHits_;
 
   edm::EDGetTokenT<edm::HepMCProduct> tok_evt_;
   edm::EDGetTokenT<edm::PCaloHitContainer> tok_hcal_;
   edm::EDGetTokenT<edm::PCaloHitContainer> tok_ecalEB_;
   edm::EDGetTokenT<edm::PCaloHitContainer> tok_ecalEE_;
 
-  const HcalDDDRecConstants               *hcons;
-  int                                      maxDepthHB_, maxDepthHE_;
-  int                                      maxDepthHO_, maxDepthHF_;
+  const HcalDDDRecConstants *hcons;
+  int maxDepthHB_, maxDepthHE_;
+  int maxDepthHO_, maxDepthHF_;
 
-  bool                                     testNumber_;
-  bool                                     auxPlots_;
+  bool testNumber_;
+  bool auxPlots_;
 
   // Hits counters
-  std::vector<MonitorElement*> Nhb;
-  std::vector<MonitorElement*> Nhe;
-  MonitorElement* Nho;
-  std::vector<MonitorElement*> Nhf;
+  std::vector<MonitorElement *> Nhb;
+  std::vector<MonitorElement *> Nhe;
+  MonitorElement *Nho;
+  std::vector<MonitorElement *> Nhf;
 
-  // In ALL other cases : 2D ieta-iphi maps 
+  // In ALL other cases : 2D ieta-iphi maps
   // without and with cuts (a la "Scheme B") on energy
   // - only in the cone around particle for single-part samples (mc = "yes")
   // - for all calls in milti-particle samples (mc = "no")
 
-  std::vector<MonitorElement*> emean_vs_ieta_HB;
-  std::vector<MonitorElement*> emean_vs_ieta_HE;
-  MonitorElement* emean_vs_ieta_HO;
-  std::vector<MonitorElement*> emean_vs_ieta_HF;
+  std::vector<MonitorElement *> emean_vs_ieta_HB;
+  std::vector<MonitorElement *> emean_vs_ieta_HE;
+  MonitorElement *emean_vs_ieta_HO;
+  std::vector<MonitorElement *> emean_vs_ieta_HF;
 
-  std::vector<MonitorElement*> occupancy_vs_ieta_HB;
-  std::vector<MonitorElement*> occupancy_vs_ieta_HE;
-  MonitorElement* occupancy_vs_ieta_HO;
-  std::vector<MonitorElement*> occupancy_vs_ieta_HF;
+  std::vector<MonitorElement *> occupancy_vs_ieta_HB;
+  std::vector<MonitorElement *> occupancy_vs_ieta_HE;
+  MonitorElement *occupancy_vs_ieta_HO;
+  std::vector<MonitorElement *> occupancy_vs_ieta_HF;
 
   // for single monoenergetic particles - cone collection profile vs ieta.
-  MonitorElement* meEnConeEtaProfile;
-  MonitorElement* meEnConeEtaProfile_E;
-  MonitorElement* meEnConeEtaProfile_EH;
+  MonitorElement *meEnConeEtaProfile;
+  MonitorElement *meEnConeEtaProfile_E;
+  MonitorElement *meEnConeEtaProfile_EH;
 
   // energy of rechits
-  std::vector<MonitorElement*> meSimHitsEnergyHB;
-  std::vector<MonitorElement*> meSimHitsEnergyHE;
-  MonitorElement* meSimHitsEnergyHO;
-  std::vector<MonitorElement*> meSimHitsEnergyHF;
+  std::vector<MonitorElement *> meSimHitsEnergyHB;
+  std::vector<MonitorElement *> meSimHitsEnergyHE;
+  MonitorElement *meSimHitsEnergyHO;
+  std::vector<MonitorElement *> meSimHitsEnergyHF;
 
-  edm::ESHandle<CaloGeometry> geometry ;
+  edm::ESHandle<CaloGeometry> geometry;
 
   // counter
   int nevtot;
diff --git a/Validation/HcalHits/interface/SimG4HcalHitCluster.h b/Validation/HcalHits/interface/SimG4HcalHitCluster.h
index aa1bf5066c46b..3c0fb1bb356cd 100644
--- a/Validation/HcalHits/interface/SimG4HcalHitCluster.h
+++ b/Validation/HcalHits/interface/SimG4HcalHitCluster.h
@@ -10,32 +10,28 @@
 #include <vector>
 
 class SimG4HcalHitCluster {
-
 public:
-
   SimG4HcalHitCluster();
   virtual ~SimG4HcalHitCluster();
 
-  double e()   const {return ec;}
-  double eta() const {return etac;}
-  double phi() const {return phic;}
-  std::vector<CaloHit> * getHits() {return &hitsc;}
+  double e() const { return ec; }
+  double eta() const { return etac; }
+  double phi() const { return phic; }
+  std::vector<CaloHit> *getHits() { return &hitsc; }
 
-  bool operator<(const SimG4HcalHitCluster& cluster) const; 
-  SimG4HcalHitCluster& operator+=(const CaloHit& hit);
+  bool operator<(const SimG4HcalHitCluster &cluster) const;
+  SimG4HcalHitCluster &operator+=(const CaloHit &hit);
 
-  double collectEcalEnergyR(); 
+  double collectEcalEnergyR();
 
 private:
-
-  double my_cosh(float eta) {return 0.5 * (exp(eta) + exp(-eta));}
-  double my_sinh(float eta) {return 0.5 * (exp(eta) - exp(-eta));}
+  double my_cosh(float eta) { return 0.5 * (exp(eta) + exp(-eta)); }
+  double my_sinh(float eta) { return 0.5 * (exp(eta) - exp(-eta)); }
 
   double ec, etac, phic;
   std::vector<CaloHit> hitsc;
-
 };
 
-std::ostream& operator<<(std::ostream&, const SimG4HcalHitCluster&);
+std::ostream &operator<<(std::ostream &, const SimG4HcalHitCluster &);
 
 #endif
diff --git a/Validation/HcalHits/interface/SimG4HcalHitJetFinder.h b/Validation/HcalHits/interface/SimG4HcalHitJetFinder.h
index 3a9a25e8984da..70bc620f385b6 100644
--- a/Validation/HcalHits/interface/SimG4HcalHitJetFinder.h
+++ b/Validation/HcalHits/interface/SimG4HcalHitJetFinder.h
@@ -11,24 +11,20 @@
 #include <vector>
 
 class SimG4HcalHitJetFinder {
-
 public:
-
-  SimG4HcalHitJetFinder(double cone=0.5);
+  SimG4HcalHitJetFinder(double cone = 0.5);
   virtual ~SimG4HcalHitJetFinder();
 
-  void setCone(double);   
+  void setCone(double);
   void setInput(std::vector<CaloHit> *);
-  std::vector<SimG4HcalHitCluster> * getClusters(bool);
-  double rDist(const SimG4HcalHitCluster* , const CaloHit*) const;
+  std::vector<SimG4HcalHitCluster> *getClusters(bool);
+  double rDist(const SimG4HcalHitCluster *, const CaloHit *) const;
   double rDist(const double, const double, const double, const double) const;
 
-private :
-
-  double                           jetcone;
-  std::vector<CaloHit>             input;
-  std::vector<SimG4HcalHitCluster> clusvector; 
-
+private:
+  double jetcone;
+  std::vector<CaloHit> input;
+  std::vector<SimG4HcalHitCluster> clusvector;
 };
 
 #endif
diff --git a/Validation/HcalHits/interface/SimG4HcalValidation.h b/Validation/HcalHits/interface/SimG4HcalValidation.h
index 66cac3dec2731..348ee1ec27384 100644
--- a/Validation/HcalHits/interface/SimG4HcalValidation.h
+++ b/Validation/HcalHits/interface/SimG4HcalValidation.h
@@ -5,21 +5,21 @@
 #ifndef Validation_HcalHits_SimG4HcalValidation_H
 #define Validation_HcalHits_SimG4HcalValidation_H
 
-#include "SimG4Core/Watcher/interface/SimProducer.h"
 #include "SimG4Core/Notification/interface/Observer.h"
+#include "SimG4Core/Watcher/interface/SimProducer.h"
 
+#include "Geometry/HcalCommonData/interface/HcalNumberingFromDDD.h"
+#include "SimG4CMS/Calo/interface/HcalTestNumberingScheme.h"
 #include "Validation/HcalHits/interface/SimG4HcalHitCluster.h"
 #include "Validation/HcalHits/interface/SimG4HcalHitJetFinder.h"
-#include "SimG4CMS/Calo/interface/HcalTestNumberingScheme.h"
-#include "Geometry/HcalCommonData/interface/HcalNumberingFromDDD.h"
 
 #include "SimDataFormats/CaloHit/interface/CaloHit.h"
 #include "SimDataFormats/ValidationFormats/interface/PValidationFormats.h"
 
 #include <iostream>
 #include <memory>
-#include <vector>
 #include <string>
+#include <vector>
 
 class G4Step;
 class BeginOfJob;
@@ -32,78 +32,76 @@ namespace edm {
 }
 
 class SimG4HcalValidation : public SimProducer,
-			    public Observer<const BeginOfJob *>, 
-			    public Observer<const BeginOfRun *>, 
-			    public Observer<const BeginOfEvent *>, 
-			    public Observer<const EndOfEvent *>, 
-			    public Observer<const G4Step *> {
-
+                            public Observer<const BeginOfJob *>,
+                            public Observer<const BeginOfRun *>,
+                            public Observer<const BeginOfEvent *>,
+                            public Observer<const EndOfEvent *>,
+                            public Observer<const G4Step *> {
 public:
   SimG4HcalValidation(const edm::ParameterSet &p);
   ~SimG4HcalValidation() override;
 
-  void produce(edm::Event&, const edm::EventSetup&) override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
 private:
-  SimG4HcalValidation(const SimG4HcalValidation&) = delete; // stop default
-  const SimG4HcalValidation& operator=(const SimG4HcalValidation&) = delete;
+  SimG4HcalValidation(const SimG4HcalValidation &) = delete;  // stop default
+  const SimG4HcalValidation &operator=(const SimG4HcalValidation &) = delete;
 
-  void  init();
+  void init();
 
   // observer classes
-  void update(const BeginOfJob * job) override;
-  void update(const BeginOfRun * run) override;
-  void update(const BeginOfEvent * evt) override;
-  void update(const G4Step * step) override;
-  void update(const EndOfEvent * evt) override;
+  void update(const BeginOfJob *job) override;
+  void update(const BeginOfRun *run) override;
+  void update(const BeginOfEvent *evt) override;
+  void update(const G4Step *step) override;
+  void update(const EndOfEvent *evt) override;
 
   // jetfinding and analysis-related stuff
-  void   fill(const EndOfEvent * ev);
-  void   layerAnalysis(PHcalValidInfoLayer&);
-  void   nxNAnalysis(PHcalValidInfoNxN&);
-  void   jetAnalysis(PHcalValidInfoJets&);
-  void   fetchHits(PHcalValidInfoLayer&);
-  void   clear();
-  void   collectEnergyRdir(const double, const double); 
-  double getHcalScale(std::string, int) const; 
-
+  void fill(const EndOfEvent *ev);
+  void layerAnalysis(PHcalValidInfoLayer &);
+  void nxNAnalysis(PHcalValidInfoNxN &);
+  void jetAnalysis(PHcalValidInfoJets &);
+  void fetchHits(PHcalValidInfoLayer &);
+  void clear();
+  void collectEnergyRdir(const double, const double);
+  double getHcalScale(std::string, int) const;
 
 private:
-  //Keep parameters to instantiate Jet finder later 
-  SimG4HcalHitJetFinder *   jetf;
+  // Keep parameters to instantiate Jet finder later
+  SimG4HcalHitJetFinder *jetf;
 
-  //Keep reference to instantiate HcalNumberingFromDDD later
-  HcalNumberingFromDDD *    numberingFromDDD;
+  // Keep reference to instantiate HcalNumberingFromDDD later
+  HcalNumberingFromDDD *numberingFromDDD;
 
-  //Keep parameters to instantiate HcalTestNumberingScheme later
-  HcalTestNumberingScheme * org;
+  // Keep parameters to instantiate HcalTestNumberingScheme later
+  HcalTestNumberingScheme *org;
 
   // Hit cache for cluster analysis
-  std::vector<CaloHit>      hitcache;   // e, eta, phi, time, layer, calo type 
+  std::vector<CaloHit> hitcache;  // e, eta, phi, time, layer, calo type
 
   // scale factors :
-  std::vector<float>        scaleHB;
-  std::vector<float>        scaleHE;
-  std::vector<float>        scaleHF;
-  
+  std::vector<float> scaleHB;
+  std::vector<float> scaleHE;
+  std::vector<float> scaleHF;
+
   // to read from parameter set
-  std::vector<std::string>  names;
-  double                    coneSize, ehitThreshold, hhitThreshold;
-  float                     timeLowlim, timeUplim, eta0, phi0, jetThreshold; 
-  bool                      applySampling, hcalOnly;
-  int                       infolevel;
-  std::string               labelLayer, labelNxN, labelJets;
+  std::vector<std::string> names;
+  double coneSize, ehitThreshold, hhitThreshold;
+  float timeLowlim, timeUplim, eta0, phi0, jetThreshold;
+  bool applySampling, hcalOnly;
+  int infolevel;
+  std::string labelLayer, labelNxN, labelJets;
 
   // eta and phi size of windows around eta0, phi0
-  std::vector<double>       dEta;
-  std::vector<double>       dPhi;
-
-  // some private members for ananlysis 
-  unsigned int              count;                  
-  double                    edepEB, edepEE, edepHB, edepHE, edepHO;
-  double                    edepd[5], edepl[20];
-  double                    een, hen, hoen; // Energy sum in ECAL, HCAL, HO 
-  double                    vhitec, vhithc, enEcal, enHcal;
+  std::vector<double> dEta;
+  std::vector<double> dPhi;
+
+  // some private members for ananlysis
+  unsigned int count;
+  double edepEB, edepEE, edepHB, edepHE, edepHO;
+  double edepd[5], edepl[20];
+  double een, hen, hoen;  // Energy sum in ECAL, HCAL, HO
+  double vhitec, vhithc, enEcal, enHcal;
 };
 
 #endif
diff --git a/Validation/HcalHits/interface/SimHitsValidationHcal.h b/Validation/HcalHits/interface/SimHitsValidationHcal.h
index b78714ab876a7..8fe63e25cbbac 100644
--- a/Validation/HcalHits/interface/SimHitsValidationHcal.h
+++ b/Validation/HcalHits/interface/SimHitsValidationHcal.h
@@ -1,81 +1,94 @@
 #ifndef ValidationSimHitsValidationHcal_H
 #define ValidationSimHitsValidationHcal_H
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
+#include "DataFormats/HcalDetId/interface/HcalDetId.h"
+#include "Geometry/HcalCommonData/interface/HcalDDDRecConstants.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
-#include "Geometry/HcalCommonData/interface/HcalDDDRecConstants.h"
-#include "DataFormats/HcalDetId/interface/HcalDetId.h"
 
-#include <iostream>
 #include <fstream>
-#include <vector>
+#include <iostream>
 #include <map>
 #include <string>
+#include <vector>
 
-class SimHitsValidationHcal: public DQMEDAnalyzer {
+class SimHitsValidationHcal : public DQMEDAnalyzer {
 public:
-
-  SimHitsValidationHcal(const edm::ParameterSet& ps);
+  SimHitsValidationHcal(const edm::ParameterSet &ps);
   ~SimHitsValidationHcal() override;
-  static void fillDescriptions(edm::ConfigurationDescriptions & descriptions);
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
 
 protected:
-
-  void analyze  (const edm::Event& e, const edm::EventSetup& c) override;
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
-  void analyzeHits  (std::vector<PCaloHit> &);
+  void analyzeHits(std::vector<PCaloHit> &);
 
 private:
   struct energysum {
-    double          e25, e50, e100, e250;
-    energysum()    {e25=e50=e100=e250=0.0;}
+    double e25, e50, e100, e250;
+    energysum() { e25 = e50 = e100 = e250 = 0.0; }
   };
 
   struct idType {
-    idType()       {subdet=HcalEmpty; z=depth1=depth2=0;}
-    idType(HcalSubdetector det, int iz, int d1, int d2) {subdet=det; z=iz; depth1=d1; depth2=d2;}
+    idType() {
+      subdet = HcalEmpty;
+      z = depth1 = depth2 = 0;
+    }
+    idType(HcalSubdetector det, int iz, int d1, int d2) {
+      subdet = det;
+      z = iz;
+      depth1 = d1;
+      depth2 = d2;
+    }
     HcalSubdetector subdet;
-    int             z, depth1, depth2;
+    int z, depth1, depth2;
   };
 
   struct etaRange {
-    etaRange()     {bins=0; low=high=0;}
-    etaRange(int bin, double min, double max) {bins=bin; low=min; high=max;}
-    int             bins;
-    double          low, high;
+    etaRange() {
+      bins = 0;
+      low = high = 0;
+    }
+    etaRange(int bin, double min, double max) {
+      bins = bin;
+      low = min;
+      high = max;
+    }
+    int bins;
+    double low, high;
   };
 
-  std::vector<std::pair<std::string,std::string> > getHistogramTypes();
-  etaRange           getLimits (idType);
-  std::pair<int,int> histId(int subdet, int eta, int depth, unsigned int dep);
+  std::vector<std::pair<std::string, std::string>> getHistogramTypes();
+  etaRange getLimits(idType);
+  std::pair<int, int> histId(int subdet, int eta, int depth, unsigned int dep);
 
-  bool                                     initialized;
-  std::string                              g4Label_, hcalHits_;
+  bool initialized;
+  std::string g4Label_, hcalHits_;
   edm::EDGetTokenT<edm::PCaloHitContainer> tok_hits_;
-  const HcalDDDRecConstants               *hcons;
-  std::vector<idType>                      types;
-  bool                                     verbose_, testNumber_;
-  int                                      maxDepthHB_, maxDepthHE_;
-  int                                      maxDepthHO_, maxDepthHF_; 
-
-  std::vector<MonitorElement*> meHcalHitEta_, meHcalHitTimeEta_;
-  std::vector<MonitorElement*> meHcalEnergyl25_, meHcalEnergyl50_;
-  std::vector<MonitorElement*> meHcalEnergyl100_, meHcalEnergyl250_;
+  const HcalDDDRecConstants *hcons;
+  std::vector<idType> types;
+  bool verbose_, testNumber_;
+  int maxDepthHB_, maxDepthHE_;
+  int maxDepthHO_, maxDepthHF_;
+
+  std::vector<MonitorElement *> meHcalHitEta_, meHcalHitTimeEta_;
+  std::vector<MonitorElement *> meHcalEnergyl25_, meHcalEnergyl50_;
+  std::vector<MonitorElement *> meHcalEnergyl100_, meHcalEnergyl250_;
   MonitorElement *meEnergy_HB, *metime_HB, *metime_enweighted_HB;
   MonitorElement *meEnergy_HE, *metime_HE, *metime_enweighted_HE;
   MonitorElement *meEnergy_HO, *metime_HO, *metime_enweighted_HO;
diff --git a/Validation/HcalHits/interface/ZdcSimHitStudy.h b/Validation/HcalHits/interface/ZdcSimHitStudy.h
index d27d9c2075d94..0b8e02ffbba4e 100644
--- a/Validation/HcalHits/interface/ZdcSimHitStudy.h
+++ b/Validation/HcalHits/interface/ZdcSimHitStudy.h
@@ -3,34 +3,41 @@
 // Class:      ZdcSimHitStudy
 //
 /*
- Description: 
-              This code has been developed to be a check for the ZDC sim. In 2009, it was found that the ZDC Simulation was unrealistic and needed repair. The aim of this code is to show the user the input and output of a ZDC MinBias simulation.
+ Description:
+              This code has been developed to be a check for the ZDC sim. In
+ 2009, it was found that the ZDC Simulation was unrealistic and needed repair.
+ The aim of this code is to show the user the input and output of a ZDC MinBias
+ simulation.
 
  Implementation:
-      First a MinBias simulation should be run, it could be pythia,hijin,or hydjet. This will output a .root file which should have information about recoGenParticles, hcalunsuppresseddigis, and g4SimHits_ZDCHits. Use this .root file as the input into the cfg.py which is found in the main directory of this package. This output will be another .root file which is meant to be viewed in a TBrowser.
+      First a MinBias simulation should be run, it could be pythia,hijin,or
+ hydjet. This will output a .root file which should have information about
+ recoGenParticles, hcalunsuppresseddigis, and g4SimHits_ZDCHits. Use this .root
+ file as the input into the cfg.py which is found in the main directory of this
+ package. This output will be another .root file which is meant to be viewed in
+ a TBrowser.
 
 */
 //
-// Original Author: Jaime Gomez (U. of Maryland) with SIGNIFICANT assistance of Dr. Jefferey Temple (U. of Maryland) 
-// Adapted from: E. Garcia-Solis' (CSU) original code    
+// Original Author: Jaime Gomez (U. of Maryland) with SIGNIFICANT assistance of
+// Dr. Jefferey Temple (U. of Maryland) Adapted from: E. Garcia-Solis' (CSU)
+// original code
 //
 //         Created:  Summer 2012
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-
-
 #ifndef SimG4CMS_ZdcSimHitStudy_H
 #define SimG4CMS_ZdcSimHitStudy_H
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
@@ -38,35 +45,32 @@
 #include "SimDataFormats/CaloHit/interface/PCaloHit.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 
-#include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
+#include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
 
-
-#include <iostream>
 #include <fstream>
-#include <vector>
+#include <iostream>
 #include <map>
-#include <string>
 #include <memory>
+#include <string>
+#include <vector>
 
-class ZdcSimHitStudy: public DQMEDAnalyzer{
+class ZdcSimHitStudy : public DQMEDAnalyzer {
 public:
-
-  ZdcSimHitStudy(const edm::ParameterSet& ps);
+  ZdcSimHitStudy(const edm::ParameterSet &ps);
   ~ZdcSimHitStudy() override;
 
 protected:
-
-  void endRun(const edm::Run& run, const edm::EventSetup& c) override;
+  void endRun(const edm::Run &run, const edm::EventSetup &c) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
-  void analyze  (const edm::Event& e, const edm::EventSetup& c) override;
-  void analyzeHits  (std::vector<PCaloHit> &);
-  int FillHitValHist (int side,int section,int channel,double energy,double time);
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
+  void analyzeHits(std::vector<PCaloHit> &);
+  int FillHitValHist(int side, int section, int channel, double energy, double time);
 
 private:
-  double enetotEmN, enetotHadN,enetotN;  
-  double enetotEmP,enetotHadP,enetotP;
+  double enetotEmN, enetotHadN, enetotN;
+  double enetotEmP, enetotHadP, enetotP;
   double enetot;
 
   /////////////////////////////////////////
@@ -75,57 +79,54 @@ class ZdcSimHitStudy: public DQMEDAnalyzer{
   //# they will be filled in the .cc file #
   /////////////////////////////////////////
 
-
-
-  std::string    g4Label, zdcHits, outFile_;
+  std::string g4Label, zdcHits, outFile_;
   edm::EDGetTokenT<reco::GenParticleCollection> tok_gen_;
-  edm::EDGetTokenT<edm::PCaloHitContainer> tok_hits_; 
-  bool           verbose_, checkHit_;
+  edm::EDGetTokenT<edm::PCaloHitContainer> tok_hits_;
+  bool verbose_, checkHit_;
 
   MonitorElement *meAllZdcNHit_, *meBadZdcDetHit_, *meBadZdcSecHit_, *meBadZdcIdHit_;
-  MonitorElement *meZdcNHit_,*meZdcDetectHit_,*meZdcSideHit_,*meZdcETime_;
-  MonitorElement *meZdcNHitEM_,*meZdcNHitHad_,*meZdcNHitLum_,*meZdc10Ene_;
-  MonitorElement *meZdcSectionHit_,*meZdcChannelHit_,*meZdcEnergyHit_,*meZdcTimeWHit_;
+  MonitorElement *meZdcNHit_, *meZdcDetectHit_, *meZdcSideHit_, *meZdcETime_;
+  MonitorElement *meZdcNHitEM_, *meZdcNHitHad_, *meZdcNHitLum_, *meZdc10Ene_;
+  MonitorElement *meZdcSectionHit_, *meZdcChannelHit_, *meZdcEnergyHit_, *meZdcTimeWHit_;
   MonitorElement *meZdcHadEnergyHit_, *meZdcEMEnergyHit_, *meZdcTimeHit_, *meZdcHadL10EneP_;
-  MonitorElement *meZdc10EneP_, *meZdcEHadCh_, *meZdcEEMCh_,*meZdcEML10EneP_;
-  MonitorElement *meZdcEneEmN1_,*meZdcEneEmN2_,*meZdcEneEmN3_,*meZdcEneEmN4_,*meZdcEneEmN5_; 
-  MonitorElement *meZdcEneHadN1_,*meZdcEneHadN2_,*meZdcEneHadN3_,*meZdcEneHadN4_;
-  MonitorElement *meZdcEneTEmN1_,*meZdcEneTEmN2_,*meZdcEneTEmN3_,*meZdcEneTEmN4_,*meZdcEneTEmN5_; 
-  MonitorElement *meZdcEneTHadN1_,*meZdcEneTHadN2_,*meZdcEneTHadN3_,*meZdcEneTHadN4_;
-  MonitorElement *meZdcEneHadNTot_,*meZdcEneEmNTot_,*meZdcEneNTot_;
+  MonitorElement *meZdc10EneP_, *meZdcEHadCh_, *meZdcEEMCh_, *meZdcEML10EneP_;
+  MonitorElement *meZdcEneEmN1_, *meZdcEneEmN2_, *meZdcEneEmN3_, *meZdcEneEmN4_, *meZdcEneEmN5_;
+  MonitorElement *meZdcEneHadN1_, *meZdcEneHadN2_, *meZdcEneHadN3_, *meZdcEneHadN4_;
+  MonitorElement *meZdcEneTEmN1_, *meZdcEneTEmN2_, *meZdcEneTEmN3_, *meZdcEneTEmN4_, *meZdcEneTEmN5_;
+  MonitorElement *meZdcEneTHadN1_, *meZdcEneTHadN2_, *meZdcEneTHadN3_, *meZdcEneTHadN4_;
+  MonitorElement *meZdcEneHadNTot_, *meZdcEneEmNTot_, *meZdcEneNTot_;
   MonitorElement *meZdcCorEEmNEHadN_;
-  MonitorElement *meZdcEneEmP1_,*meZdcEneEmP2_,*meZdcEneEmP3_,*meZdcEneEmP4_,*meZdcEneEmP5_; 
-  MonitorElement *meZdcEneHadP1_,*meZdcEneHadP2_,*meZdcEneHadP3_,*meZdcEneHadP4_;
-  MonitorElement *meZdcEneTEmP1_,*meZdcEneTEmP2_,*meZdcEneTEmP3_,*meZdcEneTEmP4_,*meZdcEneTEmP5_; 
-  MonitorElement *meZdcEneTHadP1_,*meZdcEneTHadP2_,*meZdcEneTHadP3_,*meZdcEneTHadP4_;
-  MonitorElement *meZdcEneHadPTot_,*meZdcEneEmPTot_, *meZdcEnePTot_;
-  MonitorElement *meZdcCorEEmPEHadP_,*meZdcCorEtotNEtotP_,*meZdcEneTot_;
-
-///////////////////New Plots/////////////
-
-////////GenParticle Plots///////
- MonitorElement* genpart_Pi0F;
- MonitorElement* genpart_Pi0F_energydist;
- MonitorElement* genpart_Pi0B;
- MonitorElement* genpart_Pi0B_energydist;
- MonitorElement* genpart_NeutF;
- MonitorElement* genpart_NeutF_energydist;
- MonitorElement* genpart_NeutB;
- MonitorElement* genpart_NeutB_energydist;
- MonitorElement* genpart_GammaF;
- MonitorElement* genpart_GammaF_energydist;
- MonitorElement* genpart_GammaB;
- MonitorElement* genpart_GammaB_energydist;
-//////////////////////////////
-
-
- //N counts plots                    
- MonitorElement* genpart_Pi0F_counts;
- MonitorElement* genpart_Pi0B_counts;
- MonitorElement* genpart_NeutF_counts;
- MonitorElement* genpart_NeutB_counts;
- MonitorElement* genpart_GammaF_counts;
- MonitorElement* genpart_GammaB_counts;
+  MonitorElement *meZdcEneEmP1_, *meZdcEneEmP2_, *meZdcEneEmP3_, *meZdcEneEmP4_, *meZdcEneEmP5_;
+  MonitorElement *meZdcEneHadP1_, *meZdcEneHadP2_, *meZdcEneHadP3_, *meZdcEneHadP4_;
+  MonitorElement *meZdcEneTEmP1_, *meZdcEneTEmP2_, *meZdcEneTEmP3_, *meZdcEneTEmP4_, *meZdcEneTEmP5_;
+  MonitorElement *meZdcEneTHadP1_, *meZdcEneTHadP2_, *meZdcEneTHadP3_, *meZdcEneTHadP4_;
+  MonitorElement *meZdcEneHadPTot_, *meZdcEneEmPTot_, *meZdcEnePTot_;
+  MonitorElement *meZdcCorEEmPEHadP_, *meZdcCorEtotNEtotP_, *meZdcEneTot_;
+
+  ///////////////////New Plots/////////////
+
+  ////////GenParticle Plots///////
+  MonitorElement *genpart_Pi0F;
+  MonitorElement *genpart_Pi0F_energydist;
+  MonitorElement *genpart_Pi0B;
+  MonitorElement *genpart_Pi0B_energydist;
+  MonitorElement *genpart_NeutF;
+  MonitorElement *genpart_NeutF_energydist;
+  MonitorElement *genpart_NeutB;
+  MonitorElement *genpart_NeutB_energydist;
+  MonitorElement *genpart_GammaF;
+  MonitorElement *genpart_GammaF_energydist;
+  MonitorElement *genpart_GammaB;
+  MonitorElement *genpart_GammaB_energydist;
+  //////////////////////////////
+
+  // N counts plots
+  MonitorElement *genpart_Pi0F_counts;
+  MonitorElement *genpart_Pi0B_counts;
+  MonitorElement *genpart_NeutF_counts;
+  MonitorElement *genpart_NeutB_counts;
+  MonitorElement *genpart_GammaF_counts;
+  MonitorElement *genpart_GammaB_counts;
 };
 
 #endif
diff --git a/Validation/HcalHits/src/HcalSimHitStudy.cc b/Validation/HcalHits/src/HcalSimHitStudy.cc
index fcf9fe0df914a..ccb23971777ba 100644
--- a/Validation/HcalHits/src/HcalSimHitStudy.cc
+++ b/Validation/HcalHits/src/HcalSimHitStudy.cc
@@ -1,43 +1,40 @@
-#include "Validation/HcalHits/interface/HcalSimHitStudy.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "Geometry/HcalCommonData/interface/HcalHitRelabeller.h"
+#include "Validation/HcalHits/interface/HcalSimHitStudy.h"
 
 #include "FWCore/Utilities/interface/Exception.h"
 
-HcalSimHitStudy::HcalSimHitStudy(const edm::ParameterSet& ps) {
-
-  g4Label  = ps.getUntrackedParameter<std::string>("moduleLabel","g4SimHits");
-  hcalHits = ps.getUntrackedParameter<std::string>("HitCollection","HcalHits");
+HcalSimHitStudy::HcalSimHitStudy(const edm::ParameterSet &ps) {
+  g4Label = ps.getUntrackedParameter<std::string>("moduleLabel", "g4SimHits");
+  hcalHits = ps.getUntrackedParameter<std::string>("HitCollection", "HcalHits");
   outFile_ = ps.getUntrackedParameter<std::string>("outputFile", "hcHit.root");
   verbose_ = ps.getUntrackedParameter<bool>("Verbose", false);
-  testNumber_= ps.getParameter<bool>("TestNumber");
-  hep17_   = ps.getParameter<bool>("hep17");
-  checkHit_= true;
+  testNumber_ = ps.getParameter<bool>("TestNumber");
+  hep17_ = ps.getParameter<bool>("hep17");
+  checkHit_ = true;
 
-  tok_hits_ = consumes<edm::PCaloHitContainer>(edm::InputTag(g4Label,hcalHits));
-
-  edm::LogInfo("HcalSim") << "Module Label: " << g4Label << "   Hits: "
-			  << hcalHits << " / "<< checkHit_ 
-			  << "   Output: " << outFile_;
+  tok_hits_ = consumes<edm::PCaloHitContainer>(edm::InputTag(g4Label, hcalHits));
 
+  edm::LogInfo("HcalSim") << "Module Label: " << g4Label << "   Hits: " << hcalHits << " / " << checkHit_
+                          << "   Output: " << outFile_;
 }
 
 HcalSimHitStudy::~HcalSimHitStudy() {}
 
-void HcalSimHitStudy::bookHistograms(DQMStore::IBooker &ib, edm::Run const & run, edm::EventSetup const & es)
-{
+void HcalSimHitStudy::bookHistograms(DQMStore::IBooker &ib, edm::Run const &run, edm::EventSetup const &es) {
   edm::ESHandle<HcalDDDRecConstants> pHRNDC;
-  es.get<HcalRecNumberingRecord>().get( pHRNDC );
+  es.get<HcalRecNumberingRecord>().get(pHRNDC);
   hcons = &(*pHRNDC);
   maxDepthHB_ = hcons->getMaxDepth(0);
   maxDepthHE_ = hcons->getMaxDepth(1);
   maxDepthHF_ = hcons->getMaxDepth(2);
   maxDepthHO_ = hcons->getMaxDepth(3);
   maxDepth_ = (maxDepthHB_ > maxDepthHE_ ? maxDepthHB_ : maxDepthHE_);
-  maxDepth_ = (maxDepth_   > maxDepthHF_ ? maxDepth_   : maxDepthHF_);
-  maxDepth_ = (maxDepth_   > maxDepthHO_ ? maxDepth_   : maxDepthHO_);
+  maxDepth_ = (maxDepth_ > maxDepthHF_ ? maxDepth_ : maxDepthHF_);
+  maxDepth_ = (maxDepth_ > maxDepthHO_ ? maxDepth_ : maxDepthHO_);
 
-  //Get Phi segmentation from geometry, use the max phi number so that all iphi values are included.
+  // Get Phi segmentation from geometry, use the max phi number so that all iphi
+  // values are included.
 
   int NphiMax = hcons->getNPhi(0);
 
@@ -45,18 +42,18 @@ void HcalSimHitStudy::bookHistograms(DQMStore::IBooker &ib, edm::Run const & run
   NphiMax = (hcons->getNPhi(2) > NphiMax ? hcons->getNPhi(2) : NphiMax);
   NphiMax = (hcons->getNPhi(3) > NphiMax ? hcons->getNPhi(3) : NphiMax);
 
-  //Center the iphi bins on the integers
+  // Center the iphi bins on the integers
   iphi_min = 0.5;
   iphi_max = NphiMax + 0.5;
-  iphi_bins = (int) (iphi_max - iphi_min);
+  iphi_bins = (int)(iphi_max - iphi_min);
 
   int iEtaHBMax = hcons->getEtaRange(0).second;
   int iEtaHEMax = hcons->getEtaRange(1).second;
   int iEtaHFMax = hcons->getEtaRange(2).second;
   int iEtaHOMax = hcons->getEtaRange(3).second;
 
-  //Retain classic behavior, all plots have same ieta range.
-  //Comment out code to allow each subdetector to have its on range
+  // Retain classic behavior, all plots have same ieta range.
+  // Comment out code to allow each subdetector to have its on range
 
   int iEtaMax = (iEtaHBMax > iEtaHEMax ? iEtaHBMax : iEtaHEMax);
   iEtaMax = (iEtaMax > iEtaHFMax ? iEtaMax : iEtaHFMax);
@@ -67,374 +64,397 @@ void HcalSimHitStudy::bookHistograms(DQMStore::IBooker &ib, edm::Run const & run
   iEtaHFMax = iEtaMax;
   iEtaHOMax = iEtaMax;
 
-  //Give an empty bin around the subdet ieta range to make it clear that all ieta rings have been included
+  // Give an empty bin around the subdet ieta range to make it clear that all
+  // ieta rings have been included
   ieta_min_HB = -iEtaHBMax - 1.5;
   ieta_max_HB = iEtaHBMax + 1.5;
-  ieta_bins_HB = (int) (ieta_max_HB - ieta_min_HB);
+  ieta_bins_HB = (int)(ieta_max_HB - ieta_min_HB);
 
   ieta_min_HE = -iEtaHEMax - 1.5;
   ieta_max_HE = iEtaHEMax + 1.5;
-  ieta_bins_HE = (int) (ieta_max_HE - ieta_min_HE);
+  ieta_bins_HE = (int)(ieta_max_HE - ieta_min_HE);
 
   ieta_min_HF = -iEtaHFMax - 1.5;
   ieta_max_HF = iEtaHFMax + 1.5;
-  ieta_bins_HF = (int) (ieta_max_HF - ieta_min_HF);
+  ieta_bins_HF = (int)(ieta_max_HF - ieta_min_HF);
 
   ieta_min_HO = -iEtaHOMax - 1.5;
   ieta_max_HO = iEtaHOMax + 1.5;
-  ieta_bins_HO = (int) (ieta_max_HO - ieta_min_HO);
+  ieta_bins_HO = (int)(ieta_max_HO - ieta_min_HO);
 
   Char_t hname[100];
   Char_t htitle[100];
 
-    ib.setCurrentFolder("HcalHitsV/HcalSimHitsTask");
-
-    //Histograms for Hits
-    if (checkHit_) {
-      meAllNHit_  = ib.book1D("Hit01","Number of Hits in HCal",20000,0.,20000.);
-      meBadDetHit_= ib.book1D("Hit02","Hits with wrong Det",   100,0.,100.);
-      meBadSubHit_= ib.book1D("Hit03","Hits with wrong Subdet",100,0.,100.);
-      meBadIdHit_ = ib.book1D("Hit04","Hits with wrong ID",    100,0.,100.);
-      meHBNHit_   = ib.book1D("Hit05","Number of Hits in HB",20000,0.,20000.);
-      meHENHit_   = ib.book1D("Hit06","Number of Hits in HE",10000,0.,10000.);
-      meHONHit_   = ib.book1D("Hit07","Number of Hits in HO",10000,0.,10000.);
-      meHFNHit_   = ib.book1D("Hit08","Number of Hits in HF",10000,0.,10000.);
-      meDetectHit_= ib.book1D("Hit09","Detector ID",           50,0.,50.);
-      meSubdetHit_= ib.book1D("Hit10","Subdetectors in HCal",  50,0.,50.);
-      meDepthHit_ = ib.book1D("Hit11","Depths in HCal",        20,0.,20.);
-      meEtaHit_   = ib.book1D("Hit12","Eta in HCal",          ieta_bins_HF,ieta_min_HF,ieta_max_HF);
-      meEtaPhiHit_   = ib.book2D("Hit12b","Eta-phi in HCal",          ieta_bins_HF,ieta_min_HF,ieta_max_HF,iphi_bins,iphi_min,iphi_max);
-      for (int depth = 1; depth <= maxDepth_; depth++) {
-	sprintf(hname,"Hit12bd%d", depth);
-	sprintf(htitle,"Eta-phi in HCal d%d", depth);
-	meEtaPhiHitDepth_.push_back( ib.book2D(hname, htitle, 
-					       ieta_bins_HF,ieta_min_HF,ieta_max_HF,
-					       iphi_bins,iphi_min,iphi_max) );
-      }
-      //KC: There are different phi segmentation schemes, this plot uses wider bins to represent the most sparse segmentation
-      mePhiHit_   = ib.book1D("Hit13","Phi in HCal (HB,HO)",  iphi_bins,iphi_min,iphi_max);
-      mePhiHitb_  = ib.book1D("Hit13b","Phi in HCal (HE,HF)", iphi_bins,iphi_min,iphi_max);
-      meEnergyHit_= ib.book1D("Hit14","Energy in HCal",       2000,0.,20.);
-      meTimeHit_  = ib.book1D("Hit15","Time in HCal",         528,0.,528.);
-      meTimeWHit_ = ib.book1D("Hit16","Time in HCal (E wtd)", 528,0.,528.);
-      meHBDepHit_ = ib.book1D("Hit17","Depths in HB",          20,0.,20.);
-      meHEDepHit_ = ib.book1D("Hit18","Depths in HE",          20,0.,20.);
-      meHODepHit_ = ib.book1D("Hit19","Depths in HO",          20,0.,20.);
-      meHFDepHit_ = ib.book1D("Hit20","Depths in HF",          20,0.,20.);
-      meHFDepHitw_ = ib.book1D("Hit20b","Depths in HF (p.e. weighted)",          20,0.,20.);
-      meHBEtaHit_ = ib.book1D("Hit21","Eta in HB",            ieta_bins_HB,ieta_min_HB,ieta_max_HB);
-      meHEEtaHit_ = ib.book1D("Hit22","Eta in HE",            ieta_bins_HE,ieta_min_HE,ieta_max_HE);
-      meHOEtaHit_ = ib.book1D("Hit23","Eta in HO",            ieta_bins_HO,ieta_min_HO,ieta_max_HO);
-      meHFEtaHit_ = ib.book1D("Hit24","Eta in HF",            ieta_bins_HF,ieta_min_HF,ieta_max_HF);
-      meHBPhiHit_ = ib.book1D("Hit25","Phi in HB",            iphi_bins,iphi_min,iphi_max);
-      meHEPhiHit_ = ib.book1D("Hit26","Phi in HE",            iphi_bins,iphi_min,iphi_max); 
-      meHOPhiHit_ = ib.book1D("Hit27","Phi in HO",            iphi_bins,iphi_min,iphi_max); 
-      meHFPhiHit_ = ib.book1D("Hit28","Phi in HF",            iphi_bins,iphi_min,iphi_max); 
-      meHBEneHit_ = ib.book1D("Hit29","Energy in HB",         2000,0.,20.);
-      meHEEneHit_ = ib.book1D("Hit30","Energy in HE",         500,0.,5.);
-      meHEP17EneHit_ = ib.book1D("Hit30b","Energy in HEP17",     500,0.,5.);
-      meHOEneHit_ = ib.book1D("Hit31","Energy in HO",         500,0.,5.);
-      meHFEneHit_ = ib.book1D("Hit32","Energy in HF",         1001,-0.5,1000.5);
-
-      //HxEneMap, HxEneSum, HxEneSum_vs_ieta plot the sum of the simhits energy within a single ieta-iphi tower.
-
-      meHBEneMap_ = ib.book2D("HBEneMap","HBEneMap", ieta_bins_HB, ieta_min_HB, ieta_max_HB, iphi_bins, iphi_min, iphi_max);
-      meHEEneMap_ = ib.book2D("HEEneMap","HEEneMap", ieta_bins_HE, ieta_min_HE, ieta_max_HE, iphi_bins, iphi_min, iphi_max);
-      meHOEneMap_ = ib.book2D("HOEneMap","HOEneMap", ieta_bins_HO, ieta_min_HO, ieta_max_HO, iphi_bins, iphi_min, iphi_max);
-      meHFEneMap_ = ib.book2D("HFEneMap","HFEneMap", ieta_bins_HF, ieta_min_HF, ieta_max_HF, iphi_bins, iphi_min, iphi_max);
-
-      meHBEneSum_ = ib.book1D("HBEneSum","HBEneSum", 2000, 0., 20.);
-      meHEEneSum_ = ib.book1D("HEEneSum","HEEneSum", 500, 0., 5.);
-      meHOEneSum_ = ib.book1D("HOEneSum","HOEneSum", 500, 0., 5.);
-      meHFEneSum_ = ib.book1D("HFEneSum","HFEneSum", 1001, -0.5, 1000.5);
-
-      meHBEneSum_vs_ieta_ = ib.bookProfile("HBEneSum_vs_ieta","HBEneSum_vs_ieta", ieta_bins_HB, ieta_min_HB, ieta_max_HB, 2011, -10.5, 2000.5, " ");
-      meHEEneSum_vs_ieta_ = ib.bookProfile("HEEneSum_vs_ieta","HEEneSum_vs_ieta", ieta_bins_HE, ieta_min_HE, ieta_max_HE, 2011, -10.5, 2000.5, " ");
-      meHOEneSum_vs_ieta_ = ib.bookProfile("HOEneSum_vs_ieta","HOEneSum_vs_ieta", ieta_bins_HO, ieta_min_HO, ieta_max_HO, 2011, -10.5, 2000.5, " ");
-      meHFEneSum_vs_ieta_ = ib.bookProfile("HFEneSum_vs_ieta","HFEneSum_vs_ieta", ieta_bins_HF, ieta_min_HF, ieta_max_HF, 2011, -10.5, 2000.5, " ");
-
-      meHBTimHit_ = ib.book1D("Hit33","Time in HB",           528,0.,528.);
-      meHETimHit_ = ib.book1D("Hit34","Time in HE",           528,0.,528.);
-      meHOTimHit_ = ib.book1D("Hit35","Time in HO",           528,0.,528.);
-      meHFTimHit_ = ib.book1D("Hit36","Time in HF",           528,0.,528.);
-      //These are the zoomed in energy ranges
-      meHBEneHit2_ = ib.book1D("Hit37","Energy in HB 2",         100,0.,0.0001);
-      meHEEneHit2_ = ib.book1D("Hit38","Energy in HE 2",         100,0.,0.0001);
-      meHEP17EneHit2_ = ib.book1D("Hit38b","Energy in HEP17 2",     100,0.,0.0001);
-      meHOEneHit2_ = ib.book1D("Hit39","Energy in HO 2",         100,0.,0.0001);
-      meHFEneHit2_ = ib.book1D("Hit40","Energy in HF 2",         100,0.5,100.5);
-      meHBL10Ene_ = ib.book1D("Hit41","Log10Energy in HB", 140, -10., 4. );
-      meHEL10Ene_ = ib.book1D("Hit42","Log10Energy in HE", 140, -10., 4. );
-      meHFL10Ene_ = ib.book1D("Hit43","Log10Energy in HF", 50, -1., 4. );
-      meHOL10Ene_ = ib.book1D("Hit44","Log10Energy in HO", 140, -10., 4. );
-      meHBL10EneP_ = ib.bookProfile("Hit45","Log10Energy in HB vs Hit contribution", 140, -10., 4., 100, 0., 1. );
-      meHEL10EneP_ = ib.bookProfile("Hit46","Log10Energy in HE vs Hit contribution", 140, -10., 4., 100, 0., 1. );
-      meHFL10EneP_ = ib.bookProfile("Hit47","Log10Energy in HF vs Hit contribution", 140, -10., 4., 100, 0., 1. );
-      meHOL10EneP_ = ib.bookProfile("Hit48","Log10Energy in HO vs Hit contribution", 140, -10., 4., 100, 0., 1. );
-    }
+  ib.setCurrentFolder("HcalHitsV/HcalSimHitsTask");
 
+  // Histograms for Hits
+  if (checkHit_) {
+    meAllNHit_ = ib.book1D("Hit01", "Number of Hits in HCal", 20000, 0., 20000.);
+    meBadDetHit_ = ib.book1D("Hit02", "Hits with wrong Det", 100, 0., 100.);
+    meBadSubHit_ = ib.book1D("Hit03", "Hits with wrong Subdet", 100, 0., 100.);
+    meBadIdHit_ = ib.book1D("Hit04", "Hits with wrong ID", 100, 0., 100.);
+    meHBNHit_ = ib.book1D("Hit05", "Number of Hits in HB", 20000, 0., 20000.);
+    meHENHit_ = ib.book1D("Hit06", "Number of Hits in HE", 10000, 0., 10000.);
+    meHONHit_ = ib.book1D("Hit07", "Number of Hits in HO", 10000, 0., 10000.);
+    meHFNHit_ = ib.book1D("Hit08", "Number of Hits in HF", 10000, 0., 10000.);
+    meDetectHit_ = ib.book1D("Hit09", "Detector ID", 50, 0., 50.);
+    meSubdetHit_ = ib.book1D("Hit10", "Subdetectors in HCal", 50, 0., 50.);
+    meDepthHit_ = ib.book1D("Hit11", "Depths in HCal", 20, 0., 20.);
+    meEtaHit_ = ib.book1D("Hit12", "Eta in HCal", ieta_bins_HF, ieta_min_HF, ieta_max_HF);
+    meEtaPhiHit_ =
+        ib.book2D("Hit12b", "Eta-phi in HCal", ieta_bins_HF, ieta_min_HF, ieta_max_HF, iphi_bins, iphi_min, iphi_max);
+    for (int depth = 1; depth <= maxDepth_; depth++) {
+      sprintf(hname, "Hit12bd%d", depth);
+      sprintf(htitle, "Eta-phi in HCal d%d", depth);
+      meEtaPhiHitDepth_.push_back(
+          ib.book2D(hname, htitle, ieta_bins_HF, ieta_min_HF, ieta_max_HF, iphi_bins, iphi_min, iphi_max));
+    }
+    // KC: There are different phi segmentation schemes, this plot uses wider
+    // bins to represent the most sparse segmentation
+    mePhiHit_ = ib.book1D("Hit13", "Phi in HCal (HB,HO)", iphi_bins, iphi_min, iphi_max);
+    mePhiHitb_ = ib.book1D("Hit13b", "Phi in HCal (HE,HF)", iphi_bins, iphi_min, iphi_max);
+    meEnergyHit_ = ib.book1D("Hit14", "Energy in HCal", 2000, 0., 20.);
+    meTimeHit_ = ib.book1D("Hit15", "Time in HCal", 528, 0., 528.);
+    meTimeWHit_ = ib.book1D("Hit16", "Time in HCal (E wtd)", 528, 0., 528.);
+    meHBDepHit_ = ib.book1D("Hit17", "Depths in HB", 20, 0., 20.);
+    meHEDepHit_ = ib.book1D("Hit18", "Depths in HE", 20, 0., 20.);
+    meHODepHit_ = ib.book1D("Hit19", "Depths in HO", 20, 0., 20.);
+    meHFDepHit_ = ib.book1D("Hit20", "Depths in HF", 20, 0., 20.);
+    meHFDepHitw_ = ib.book1D("Hit20b", "Depths in HF (p.e. weighted)", 20, 0., 20.);
+    meHBEtaHit_ = ib.book1D("Hit21", "Eta in HB", ieta_bins_HB, ieta_min_HB, ieta_max_HB);
+    meHEEtaHit_ = ib.book1D("Hit22", "Eta in HE", ieta_bins_HE, ieta_min_HE, ieta_max_HE);
+    meHOEtaHit_ = ib.book1D("Hit23", "Eta in HO", ieta_bins_HO, ieta_min_HO, ieta_max_HO);
+    meHFEtaHit_ = ib.book1D("Hit24", "Eta in HF", ieta_bins_HF, ieta_min_HF, ieta_max_HF);
+    meHBPhiHit_ = ib.book1D("Hit25", "Phi in HB", iphi_bins, iphi_min, iphi_max);
+    meHEPhiHit_ = ib.book1D("Hit26", "Phi in HE", iphi_bins, iphi_min, iphi_max);
+    meHOPhiHit_ = ib.book1D("Hit27", "Phi in HO", iphi_bins, iphi_min, iphi_max);
+    meHFPhiHit_ = ib.book1D("Hit28", "Phi in HF", iphi_bins, iphi_min, iphi_max);
+    meHBEneHit_ = ib.book1D("Hit29", "Energy in HB", 2000, 0., 20.);
+    meHEEneHit_ = ib.book1D("Hit30", "Energy in HE", 500, 0., 5.);
+    meHEP17EneHit_ = ib.book1D("Hit30b", "Energy in HEP17", 500, 0., 5.);
+    meHOEneHit_ = ib.book1D("Hit31", "Energy in HO", 500, 0., 5.);
+    meHFEneHit_ = ib.book1D("Hit32", "Energy in HF", 1001, -0.5, 1000.5);
+
+    // HxEneMap, HxEneSum, HxEneSum_vs_ieta plot the sum of the simhits energy
+    // within a single ieta-iphi tower.
+
+    meHBEneMap_ =
+        ib.book2D("HBEneMap", "HBEneMap", ieta_bins_HB, ieta_min_HB, ieta_max_HB, iphi_bins, iphi_min, iphi_max);
+    meHEEneMap_ =
+        ib.book2D("HEEneMap", "HEEneMap", ieta_bins_HE, ieta_min_HE, ieta_max_HE, iphi_bins, iphi_min, iphi_max);
+    meHOEneMap_ =
+        ib.book2D("HOEneMap", "HOEneMap", ieta_bins_HO, ieta_min_HO, ieta_max_HO, iphi_bins, iphi_min, iphi_max);
+    meHFEneMap_ =
+        ib.book2D("HFEneMap", "HFEneMap", ieta_bins_HF, ieta_min_HF, ieta_max_HF, iphi_bins, iphi_min, iphi_max);
+
+    meHBEneSum_ = ib.book1D("HBEneSum", "HBEneSum", 2000, 0., 20.);
+    meHEEneSum_ = ib.book1D("HEEneSum", "HEEneSum", 500, 0., 5.);
+    meHOEneSum_ = ib.book1D("HOEneSum", "HOEneSum", 500, 0., 5.);
+    meHFEneSum_ = ib.book1D("HFEneSum", "HFEneSum", 1001, -0.5, 1000.5);
+
+    meHBEneSum_vs_ieta_ = ib.bookProfile(
+        "HBEneSum_vs_ieta", "HBEneSum_vs_ieta", ieta_bins_HB, ieta_min_HB, ieta_max_HB, 2011, -10.5, 2000.5, " ");
+    meHEEneSum_vs_ieta_ = ib.bookProfile(
+        "HEEneSum_vs_ieta", "HEEneSum_vs_ieta", ieta_bins_HE, ieta_min_HE, ieta_max_HE, 2011, -10.5, 2000.5, " ");
+    meHOEneSum_vs_ieta_ = ib.bookProfile(
+        "HOEneSum_vs_ieta", "HOEneSum_vs_ieta", ieta_bins_HO, ieta_min_HO, ieta_max_HO, 2011, -10.5, 2000.5, " ");
+    meHFEneSum_vs_ieta_ = ib.bookProfile(
+        "HFEneSum_vs_ieta", "HFEneSum_vs_ieta", ieta_bins_HF, ieta_min_HF, ieta_max_HF, 2011, -10.5, 2000.5, " ");
+
+    meHBTimHit_ = ib.book1D("Hit33", "Time in HB", 528, 0., 528.);
+    meHETimHit_ = ib.book1D("Hit34", "Time in HE", 528, 0., 528.);
+    meHOTimHit_ = ib.book1D("Hit35", "Time in HO", 528, 0., 528.);
+    meHFTimHit_ = ib.book1D("Hit36", "Time in HF", 528, 0., 528.);
+    // These are the zoomed in energy ranges
+    meHBEneHit2_ = ib.book1D("Hit37", "Energy in HB 2", 100, 0., 0.0001);
+    meHEEneHit2_ = ib.book1D("Hit38", "Energy in HE 2", 100, 0., 0.0001);
+    meHEP17EneHit2_ = ib.book1D("Hit38b", "Energy in HEP17 2", 100, 0., 0.0001);
+    meHOEneHit2_ = ib.book1D("Hit39", "Energy in HO 2", 100, 0., 0.0001);
+    meHFEneHit2_ = ib.book1D("Hit40", "Energy in HF 2", 100, 0.5, 100.5);
+    meHBL10Ene_ = ib.book1D("Hit41", "Log10Energy in HB", 140, -10., 4.);
+    meHEL10Ene_ = ib.book1D("Hit42", "Log10Energy in HE", 140, -10., 4.);
+    meHFL10Ene_ = ib.book1D("Hit43", "Log10Energy in HF", 50, -1., 4.);
+    meHOL10Ene_ = ib.book1D("Hit44", "Log10Energy in HO", 140, -10., 4.);
+    meHBL10EneP_ = ib.bookProfile("Hit45", "Log10Energy in HB vs Hit contribution", 140, -10., 4., 100, 0., 1.);
+    meHEL10EneP_ = ib.bookProfile("Hit46", "Log10Energy in HE vs Hit contribution", 140, -10., 4., 100, 0., 1.);
+    meHFL10EneP_ = ib.bookProfile("Hit47", "Log10Energy in HF vs Hit contribution", 140, -10., 4., 100, 0., 1.);
+    meHOL10EneP_ = ib.bookProfile("Hit48", "Log10Energy in HO vs Hit contribution", 140, -10., 4., 100, 0., 1.);
+  }
 }
 
-
 /*void HcalSimHitStudy::endJob() {
   if (dbe_ && outFile_.size() > 0) dbe_->save(outFile_);
 }*/
 
-void HcalSimHitStudy::analyze(const edm::Event& e, const edm::EventSetup& ) {
-
-  LogDebug("HcalSim") << "Run = " << e.id().run() << " Event = " 
-		      << e.id().event();
+void HcalSimHitStudy::analyze(const edm::Event &e, const edm::EventSetup &) {
+  LogDebug("HcalSim") << "Run = " << e.id().run() << " Event = " << e.id().event();
 
-  std::vector<PCaloHit>               caloHits;
+  std::vector<PCaloHit> caloHits;
   edm::Handle<edm::PCaloHitContainer> hitsHcal;
 
   bool getHits = false;
   if (checkHit_) {
-    e.getByToken(tok_hits_,hitsHcal); 
-    if (hitsHcal.isValid()) getHits = true;
+    e.getByToken(tok_hits_, hitsHcal);
+    if (hitsHcal.isValid())
+      getHits = true;
   }
 
   LogDebug("HcalSim") << "HcalValidation: Input flags Hits " << getHits;
 
   if (getHits) {
-    caloHits.insert(caloHits.end(),hitsHcal->begin(),hitsHcal->end());
-    LogDebug("HcalSim") << "HcalValidation: Hit buffer " 
-			<< caloHits.size(); 
-    analyzeHits (caloHits);
+    caloHits.insert(caloHits.end(), hitsHcal->begin(), hitsHcal->end());
+    LogDebug("HcalSim") << "HcalValidation: Hit buffer " << caloHits.size();
+    analyzeHits(caloHits);
   }
 }
 
-void HcalSimHitStudy::analyzeHits (std::vector<PCaloHit>& hits) {
-
+void HcalSimHitStudy::analyzeHits(std::vector<PCaloHit> &hits) {
   int nHit = hits.size();
-  int nHB=0, nHE=0, nHO=0, nHF=0, nBad1=0, nBad2=0, nBad=0;
+  int nHB = 0, nHE = 0, nHO = 0, nHF = 0, nBad1 = 0, nBad2 = 0, nBad = 0;
   std::vector<double> encontHB(140, 0.);
   std::vector<double> encontHE(140, 0.);
   std::vector<double> encontHF(140, 0.);
   std::vector<double> encontHO(140, 0.);
-  double entotHB = 0, entotHE = 0, entotHF = 0, entotHO = 0; 
+  double entotHB = 0, entotHE = 0, entotHF = 0, entotHO = 0;
 
   double HBEneMap[ieta_bins_HB][iphi_bins];
   double HEEneMap[ieta_bins_HE][iphi_bins];
   double HOEneMap[ieta_bins_HO][iphi_bins];
   double HFEneMap[ieta_bins_HF][iphi_bins];
- 
-  //Works in ieta_min_Hx is < 0
+
+  // Works in ieta_min_Hx is < 0
   int eta_offset_HB = -(int)ieta_min_HB;
   int eta_offset_HE = -(int)ieta_min_HE;
   int eta_offset_HO = -(int)ieta_min_HO;
   int eta_offset_HF = -(int)ieta_min_HF;
 
-  for(int i = 0; i < ieta_bins_HB; i++){
-     for(int j = 0; j < iphi_bins; j++){
-       HBEneMap[i][j] = 0.;
-     }
+  for (int i = 0; i < ieta_bins_HB; i++) {
+    for (int j = 0; j < iphi_bins; j++) {
+      HBEneMap[i][j] = 0.;
+    }
   }
 
-  for(int i = 0; i < ieta_bins_HE; i++){
-     for(int j = 0; j < iphi_bins; j++){
-       HEEneMap[i][j] = 0.;
-     }
+  for (int i = 0; i < ieta_bins_HE; i++) {
+    for (int j = 0; j < iphi_bins; j++) {
+      HEEneMap[i][j] = 0.;
+    }
   }
 
-  for(int i = 0; i < ieta_bins_HO; i++){
-     for(int j = 0; j < iphi_bins; j++){
-       HOEneMap[i][j] = 0.;
-     }
+  for (int i = 0; i < ieta_bins_HO; i++) {
+    for (int j = 0; j < iphi_bins; j++) {
+      HOEneMap[i][j] = 0.;
+    }
   }
 
-  for(int i = 0; i < ieta_bins_HF; i++){
-     for(int j = 0; j < iphi_bins; j++){
-       HFEneMap[i][j] = 0.;
-     }
+  for (int i = 0; i < ieta_bins_HF; i++) {
+    for (int j = 0; j < iphi_bins; j++) {
+      HFEneMap[i][j] = 0.;
+    }
   }
 
-  for (int i=0; i<nHit; i++) {
-    double energy    = hits[i].energy();
-    double log10en   = log10(energy);
-    int log10i       = int( (log10en+10.)*10. );
-    double time      = hits[i].time();
+  for (int i = 0; i < nHit; i++) {
+    double energy = hits[i].energy();
+    double log10en = log10(energy);
+    int log10i = int((log10en + 10.) * 10.);
+    double time = hits[i].time();
     unsigned int id_ = hits[i].id();
     int det, subdet, depth, eta, phi;
     HcalDetId hid;
-    if (testNumber_) hid = HcalHitRelabeller::relabel(id_,hcons);
-    else hid = HcalDetId(id_);
-    det      = hid.det();
-    subdet   = hid.subdet();
-    depth    = hid.depth();
-    eta      = hid.ieta();
-    phi      = hid.iphi();
-
-    LogDebug("HcalSim") << "Hit[" << i << "] ID " << std::hex << id_ 
-			<< std::dec << " Det " << det << " Sub " 
-			<< subdet << " depth " << depth << " Eta " << eta
-			<< " Phi " << phi << " E " << energy << " time " 
-			<< time;
-    if (det ==  4) { // Check DetId.h
-      if      (subdet == static_cast<int>(HcalBarrel))  nHB++;
-      else if (subdet == static_cast<int>(HcalEndcap))  nHE++;
-      else if (subdet == static_cast<int>(HcalOuter))   nHO++;
-      else if (subdet == static_cast<int>(HcalForward)) nHF++;
-      else    { nBad++;  nBad2++;}
-    } else    { nBad++;  nBad1++;}
-
-      meDetectHit_->Fill(double(det));
-      if (det ==  4) {
-	meSubdetHit_->Fill(double(subdet));
-	meDepthHit_->Fill(double(depth));
-	meEtaHit_->Fill(double(eta));
-	meEtaPhiHit_->Fill(double(eta),double(phi));
-	meEtaPhiHitDepth_[depth-1]->Fill(double(eta),double(phi));
-
-	//We will group the phi plots by HB,HO and HE,HF since these groups share similar segmentation schemes
-	if      (subdet == static_cast<int>(HcalBarrel))  mePhiHit_->Fill(double(phi));
-	else if (subdet == static_cast<int>(HcalEndcap))  mePhiHitb_->Fill(double(phi));
-	else if (subdet == static_cast<int>(HcalOuter))   mePhiHit_->Fill(double(phi));
-	else if (subdet == static_cast<int>(HcalForward)) mePhiHitb_->Fill(double(phi));	
-	
-
-	//KC: HF energy is in photoelectrons rather than eV, so it will not be included in total HCal energy
-	if (subdet != static_cast<int>(HcalForward)){
-		meEnergyHit_->Fill(energy);
-
-		//Since the HF energy is a different scale it does not make sense to include it in the Energy Weighted Plot
-		meTimeWHit_->Fill(double(time),energy);
-	}
-	meTimeHit_->Fill(time);
-	
-	if      (subdet == static_cast<int>(HcalBarrel)) {
-	  meHBDepHit_->Fill(double(depth));
-	  meHBEtaHit_->Fill(double(eta));
-	  meHBPhiHit_->Fill(double(phi));
-	  meHBEneHit_->Fill(energy);
-	  meHBEneHit2_->Fill(energy);
-	  meHBTimHit_->Fill(time);
-	  meHBL10Ene_->Fill(log10en);
-	  if( log10i >=0 && log10i < 140 ) encontHB[log10i] += energy;
-	  entotHB += energy;
-    
-          HBEneMap[eta + eta_offset_HB][phi-1] += energy;
-
-	} else if (subdet == static_cast<int>(HcalEndcap)) {
-	  meHEDepHit_->Fill(double(depth));
-	  meHEEtaHit_->Fill(double(eta));
-	  meHEPhiHit_->Fill(double(phi));
-
-	  bool isHEP17 = (phi>=63)&&(phi<=66)&&(eta>0); 
-	  if(hep17_){
-	    if(!isHEP17){
-	      meHEEneHit_->Fill(energy);
-	      meHEEneHit2_->Fill(energy);
-	    } else {
-	      meHEP17EneHit_->Fill(energy);
-	      meHEP17EneHit2_->Fill(energy);
-	    }
-	  } else {
-	    meHEEneHit_->Fill(energy);
-	    meHEEneHit2_->Fill(energy);
-	  }
-
-	  meHETimHit_->Fill(time);
-	  meHEL10Ene_->Fill(log10en);
-	  if( log10i >=0 && log10i < 140 ) encontHE[log10i] += energy;
-	  entotHE += energy;
-    
-          HEEneMap[eta + eta_offset_HE][phi-1] += energy;
-
-	} else if (subdet == static_cast<int>(HcalOuter)) {
-	  meHODepHit_->Fill(double(depth));
-	  meHOEtaHit_->Fill(double(eta));
-	  meHOPhiHit_->Fill(double(phi));
-	  meHOEneHit_->Fill(energy);
-	  meHOEneHit2_->Fill(energy);
-	  meHOTimHit_->Fill(time);
-	  meHOL10Ene_->Fill(log10en);
-	  if( log10i >=0 && log10i < 140 ) encontHO[log10i] += energy;
-	  entotHO += energy;
-    
-          HOEneMap[eta + eta_offset_HO][phi-1] += energy;
-
-	} else if (subdet == static_cast<int>(HcalForward)) {
-	  meHFDepHit_->Fill(double(depth));
-	  meHFDepHitw_->Fill(double(depth),energy);
-	  meHFEtaHit_->Fill(double(eta));
-	  meHFPhiHit_->Fill(double(phi));
-	  meHFEneHit_->Fill(energy);
-	  meHFEneHit2_->Fill(energy);
-	  meHFTimHit_->Fill(time);
-	  meHFL10Ene_->Fill(log10en);
-	  if( log10i >=0 && log10i < 140 ) encontHF[log10i] += energy;
-	  entotHF += energy;
-    
-          HFEneMap[eta + eta_offset_HF][phi-1] += energy;
-
-	}
+    if (testNumber_)
+      hid = HcalHitRelabeller::relabel(id_, hcons);
+    else
+      hid = HcalDetId(id_);
+    det = hid.det();
+    subdet = hid.subdet();
+    depth = hid.depth();
+    eta = hid.ieta();
+    phi = hid.iphi();
+
+    LogDebug("HcalSim") << "Hit[" << i << "] ID " << std::hex << id_ << std::dec << " Det " << det << " Sub " << subdet
+                        << " depth " << depth << " Eta " << eta << " Phi " << phi << " E " << energy << " time "
+                        << time;
+    if (det == 4) {  // Check DetId.h
+      if (subdet == static_cast<int>(HcalBarrel))
+        nHB++;
+      else if (subdet == static_cast<int>(HcalEndcap))
+        nHE++;
+      else if (subdet == static_cast<int>(HcalOuter))
+        nHO++;
+      else if (subdet == static_cast<int>(HcalForward))
+        nHF++;
+      else {
+        nBad++;
+        nBad2++;
       }
-  }
-  if( entotHB != 0 ) for( int i=0; i<140; i++ ) meHBL10EneP_->Fill( -10.+(float(i)+0.5)/10., encontHB[i]/entotHB );
-  if( entotHE != 0 ) for( int i=0; i<140; i++ ) meHEL10EneP_->Fill( -10.+(float(i)+0.5)/10., encontHE[i]/entotHE );
-  if( entotHF != 0 ) for( int i=0; i<140; i++ ) meHFL10EneP_->Fill( -10.+(float(i)+0.5)/10., encontHF[i]/entotHF );
-  if( entotHO != 0 ) for( int i=0; i<140; i++ ) meHOL10EneP_->Fill( -10.+(float(i)+0.5)/10., encontHO[i]/entotHO );
-
-    meAllNHit_->Fill(double(nHit));
-    meBadDetHit_->Fill(double(nBad1));
-    meBadSubHit_->Fill(double(nBad2));
-    meBadIdHit_->Fill(double(nBad));
-    meHBNHit_->Fill(double(nHB));
-    meHENHit_->Fill(double(nHE));
-    meHONHit_->Fill(double(nHO));
-    meHFNHit_->Fill(double(nHF));
-
-  for(int i = 0; i < ieta_bins_HB; i++){
-     for(int j = 0; j < iphi_bins; j++){
-
-        if(HBEneMap[i][j] != 0){
-           meHBEneSum_->Fill(HBEneMap[i][j]);
-           meHBEneSum_vs_ieta_->Fill((i - eta_offset_HB), HBEneMap[i][j]);
-           meHBEneMap_->Fill((i - eta_offset_HB), j+1, HBEneMap[i][j]);
+    } else {
+      nBad++;
+      nBad1++;
+    }
+
+    meDetectHit_->Fill(double(det));
+    if (det == 4) {
+      meSubdetHit_->Fill(double(subdet));
+      meDepthHit_->Fill(double(depth));
+      meEtaHit_->Fill(double(eta));
+      meEtaPhiHit_->Fill(double(eta), double(phi));
+      meEtaPhiHitDepth_[depth - 1]->Fill(double(eta), double(phi));
+
+      // We will group the phi plots by HB,HO and HE,HF since these groups share
+      // similar segmentation schemes
+      if (subdet == static_cast<int>(HcalBarrel))
+        mePhiHit_->Fill(double(phi));
+      else if (subdet == static_cast<int>(HcalEndcap))
+        mePhiHitb_->Fill(double(phi));
+      else if (subdet == static_cast<int>(HcalOuter))
+        mePhiHit_->Fill(double(phi));
+      else if (subdet == static_cast<int>(HcalForward))
+        mePhiHitb_->Fill(double(phi));
+
+      // KC: HF energy is in photoelectrons rather than eV, so it will not be
+      // included in total HCal energy
+      if (subdet != static_cast<int>(HcalForward)) {
+        meEnergyHit_->Fill(energy);
+
+        // Since the HF energy is a different scale it does not make sense to
+        // include it in the Energy Weighted Plot
+        meTimeWHit_->Fill(double(time), energy);
+      }
+      meTimeHit_->Fill(time);
+
+      if (subdet == static_cast<int>(HcalBarrel)) {
+        meHBDepHit_->Fill(double(depth));
+        meHBEtaHit_->Fill(double(eta));
+        meHBPhiHit_->Fill(double(phi));
+        meHBEneHit_->Fill(energy);
+        meHBEneHit2_->Fill(energy);
+        meHBTimHit_->Fill(time);
+        meHBL10Ene_->Fill(log10en);
+        if (log10i >= 0 && log10i < 140)
+          encontHB[log10i] += energy;
+        entotHB += energy;
+
+        HBEneMap[eta + eta_offset_HB][phi - 1] += energy;
+
+      } else if (subdet == static_cast<int>(HcalEndcap)) {
+        meHEDepHit_->Fill(double(depth));
+        meHEEtaHit_->Fill(double(eta));
+        meHEPhiHit_->Fill(double(phi));
+
+        bool isHEP17 = (phi >= 63) && (phi <= 66) && (eta > 0);
+        if (hep17_) {
+          if (!isHEP17) {
+            meHEEneHit_->Fill(energy);
+            meHEEneHit2_->Fill(energy);
+          } else {
+            meHEP17EneHit_->Fill(energy);
+            meHEP17EneHit2_->Fill(energy);
+          }
+        } else {
+          meHEEneHit_->Fill(energy);
+          meHEEneHit2_->Fill(energy);
         }
 
-     }
+        meHETimHit_->Fill(time);
+        meHEL10Ene_->Fill(log10en);
+        if (log10i >= 0 && log10i < 140)
+          encontHE[log10i] += energy;
+        entotHE += energy;
+
+        HEEneMap[eta + eta_offset_HE][phi - 1] += energy;
+
+      } else if (subdet == static_cast<int>(HcalOuter)) {
+        meHODepHit_->Fill(double(depth));
+        meHOEtaHit_->Fill(double(eta));
+        meHOPhiHit_->Fill(double(phi));
+        meHOEneHit_->Fill(energy);
+        meHOEneHit2_->Fill(energy);
+        meHOTimHit_->Fill(time);
+        meHOL10Ene_->Fill(log10en);
+        if (log10i >= 0 && log10i < 140)
+          encontHO[log10i] += energy;
+        entotHO += energy;
+
+        HOEneMap[eta + eta_offset_HO][phi - 1] += energy;
+
+      } else if (subdet == static_cast<int>(HcalForward)) {
+        meHFDepHit_->Fill(double(depth));
+        meHFDepHitw_->Fill(double(depth), energy);
+        meHFEtaHit_->Fill(double(eta));
+        meHFPhiHit_->Fill(double(phi));
+        meHFEneHit_->Fill(energy);
+        meHFEneHit2_->Fill(energy);
+        meHFTimHit_->Fill(time);
+        meHFL10Ene_->Fill(log10en);
+        if (log10i >= 0 && log10i < 140)
+          encontHF[log10i] += energy;
+        entotHF += energy;
+
+        HFEneMap[eta + eta_offset_HF][phi - 1] += energy;
+      }
+    }
+  }
+  if (entotHB != 0)
+    for (int i = 0; i < 140; i++)
+      meHBL10EneP_->Fill(-10. + (float(i) + 0.5) / 10., encontHB[i] / entotHB);
+  if (entotHE != 0)
+    for (int i = 0; i < 140; i++)
+      meHEL10EneP_->Fill(-10. + (float(i) + 0.5) / 10., encontHE[i] / entotHE);
+  if (entotHF != 0)
+    for (int i = 0; i < 140; i++)
+      meHFL10EneP_->Fill(-10. + (float(i) + 0.5) / 10., encontHF[i] / entotHF);
+  if (entotHO != 0)
+    for (int i = 0; i < 140; i++)
+      meHOL10EneP_->Fill(-10. + (float(i) + 0.5) / 10., encontHO[i] / entotHO);
+
+  meAllNHit_->Fill(double(nHit));
+  meBadDetHit_->Fill(double(nBad1));
+  meBadSubHit_->Fill(double(nBad2));
+  meBadIdHit_->Fill(double(nBad));
+  meHBNHit_->Fill(double(nHB));
+  meHENHit_->Fill(double(nHE));
+  meHONHit_->Fill(double(nHO));
+  meHFNHit_->Fill(double(nHF));
+
+  for (int i = 0; i < ieta_bins_HB; i++) {
+    for (int j = 0; j < iphi_bins; j++) {
+      if (HBEneMap[i][j] != 0) {
+        meHBEneSum_->Fill(HBEneMap[i][j]);
+        meHBEneSum_vs_ieta_->Fill((i - eta_offset_HB), HBEneMap[i][j]);
+        meHBEneMap_->Fill((i - eta_offset_HB), j + 1, HBEneMap[i][j]);
+      }
+    }
   }
-  
-  for(int i = 0; i < ieta_bins_HE; i++){
-     for(int j = 0; j < iphi_bins; j++){
-
-        if(HEEneMap[i][j] != 0){
-           meHEEneSum_->Fill(HEEneMap[i][j]);
-           meHEEneSum_vs_ieta_->Fill((i - eta_offset_HE), HEEneMap[i][j]);
-           meHEEneMap_->Fill((i - eta_offset_HE), j+1, HEEneMap[i][j]);
-        }
 
-     }
+  for (int i = 0; i < ieta_bins_HE; i++) {
+    for (int j = 0; j < iphi_bins; j++) {
+      if (HEEneMap[i][j] != 0) {
+        meHEEneSum_->Fill(HEEneMap[i][j]);
+        meHEEneSum_vs_ieta_->Fill((i - eta_offset_HE), HEEneMap[i][j]);
+        meHEEneMap_->Fill((i - eta_offset_HE), j + 1, HEEneMap[i][j]);
+      }
+    }
   }
-  
-  for(int i = 0; i < ieta_bins_HO; i++){
-     for(int j = 0; j < iphi_bins; j++){
-
-        if(HOEneMap[i][j] != 0){
-           meHOEneSum_->Fill(HOEneMap[i][j]);
-           meHOEneSum_vs_ieta_->Fill((i - eta_offset_HO), HOEneMap[i][j]);
-           meHOEneMap_->Fill((i - eta_offset_HO), j+1, HOEneMap[i][j]);
-        }
 
-     }
+  for (int i = 0; i < ieta_bins_HO; i++) {
+    for (int j = 0; j < iphi_bins; j++) {
+      if (HOEneMap[i][j] != 0) {
+        meHOEneSum_->Fill(HOEneMap[i][j]);
+        meHOEneSum_vs_ieta_->Fill((i - eta_offset_HO), HOEneMap[i][j]);
+        meHOEneMap_->Fill((i - eta_offset_HO), j + 1, HOEneMap[i][j]);
+      }
+    }
   }
-  
-  for(int i = 0; i < ieta_bins_HF; i++){
-     for(int j = 0; j < iphi_bins; j++){
-
-        if(HFEneMap[i][j] != 0){
-           meHFEneSum_->Fill(HFEneMap[i][j]);
-           meHFEneSum_vs_ieta_->Fill((i - eta_offset_HF), HFEneMap[i][j]);
-           meHFEneMap_->Fill((i - eta_offset_HF), j+1, HFEneMap[i][j]);
-        }
 
-     }
+  for (int i = 0; i < ieta_bins_HF; i++) {
+    for (int j = 0; j < iphi_bins; j++) {
+      if (HFEneMap[i][j] != 0) {
+        meHFEneSum_->Fill(HFEneMap[i][j]);
+        meHFEneSum_vs_ieta_->Fill((i - eta_offset_HF), HFEneMap[i][j]);
+        meHFEneMap_->Fill((i - eta_offset_HF), j + 1, HFEneMap[i][j]);
+      }
+    }
   }
-  
-  LogDebug("HcalSim") << "HcalSimHitStudy::analyzeHits: HB " << nHB 
-		      << " HE " << nHE << " HO " << nHO << " HF " << nHF 
-		      << " Bad " << nBad << " All " << nHit;
 
+  LogDebug("HcalSim") << "HcalSimHitStudy::analyzeHits: HB " << nHB << " HE " << nHE << " HO " << nHO << " HF " << nHF
+                      << " Bad " << nBad << " All " << nHit;
 }
diff --git a/Validation/HcalHits/src/HcalSimHitsClient.cc b/Validation/HcalHits/src/HcalSimHitsClient.cc
index 64e30b10144c2..d6261d1883de6 100644
--- a/Validation/HcalHits/src/HcalSimHitsClient.cc
+++ b/Validation/HcalHits/src/HcalSimHitsClient.cc
@@ -1,9 +1,9 @@
-#include "Validation/HcalHits/interface/HcalSimHitsClient.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "Validation/HcalHits/interface/HcalSimHitsClient.h"
 
-#include "FWCore/Framework/interface/Run.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
@@ -11,213 +11,207 @@
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "Geometry/Records/interface/HcalRecNumberingRecord.h"
 
-HcalSimHitsClient::HcalSimHitsClient(const edm::ParameterSet& iConfig) {
-
+HcalSimHitsClient::HcalSimHitsClient(const edm::ParameterSet &iConfig) {
   dirName_ = iConfig.getParameter<std::string>("DQMDirName");
-  verbose_ = iConfig.getUntrackedParameter<bool>("Verbosity",false);
+  verbose_ = iConfig.getUntrackedParameter<bool>("Verbosity", false);
 }
 
+HcalSimHitsClient::~HcalSimHitsClient() {}
 
-HcalSimHitsClient::~HcalSimHitsClient() { }
-
-void HcalSimHitsClient::beginRun(edm::Run const& run, edm::EventSetup const& c) {
+void HcalSimHitsClient::beginRun(edm::Run const &run, edm::EventSetup const &c) {
   edm::ESHandle<HcalDDDRecConstants> pHRNDC;
-  c.get<HcalRecNumberingRecord>().get( pHRNDC );
+  c.get<HcalRecNumberingRecord>().get(pHRNDC);
   hcons = &(*pHRNDC);
   maxDepthHB_ = hcons->getMaxDepth(0);
   maxDepthHE_ = hcons->getMaxDepth(1);
   maxDepthHF_ = hcons->getMaxDepth(2);
   maxDepthHO_ = hcons->getMaxDepth(3);
 
-  edm::LogInfo("HitsValidationHcal") << " Maximum Depths HB:"<< maxDepthHB_
-				     << " HE:" << maxDepthHE_ << " HO:"
-				     << maxDepthHO_ << " HF:" << maxDepthHF_;
+  edm::LogInfo("HitsValidationHcal") << " Maximum Depths HB:" << maxDepthHB_ << " HE:" << maxDepthHE_
+                                     << " HO:" << maxDepthHO_ << " HF:" << maxDepthHF_;
 }
 
-void HcalSimHitsClient::dqmEndJob(DQMStore::IBooker &ib, DQMStore::IGetter &ig){
-  runClient_(ib,ig);
-}
+void HcalSimHitsClient::dqmEndJob(DQMStore::IBooker &ib, DQMStore::IGetter &ig) { runClient_(ib, ig); }
 
 void HcalSimHitsClient::runClient_(DQMStore::IBooker &ib, DQMStore::IGetter &ig) {
-
   ig.setCurrentFolder(dirName_);
-  
-  if (verbose_) edm::LogInfo("HitsValidationHcal") << "runClient"; 
 
-  std::vector<MonitorElement*> hcalMEs;
-  
+  if (verbose_)
+    edm::LogInfo("HitsValidationHcal") << "runClient";
+
+  std::vector<MonitorElement *> hcalMEs;
+
   std::vector<std::string> fullPathHLTFolders = ig.getSubdirs();
-  for (unsigned int i=0;i<fullPathHLTFolders.size();i++) {
-    if (verbose_) 
+  for (unsigned int i = 0; i < fullPathHLTFolders.size(); i++) {
+    if (verbose_)
       edm::LogInfo("HitsValidationHcal") << "fullPath: " << fullPathHLTFolders[i];
     ig.setCurrentFolder(fullPathHLTFolders[i]);
 
     std::vector<std::string> fullSubPathHLTFolders = ig.getSubdirs();
-    for (unsigned int j=0;j<fullSubPathHLTFolders.size();j++) {
-
-      if (verbose_) edm::LogInfo("HitsValidationHcal") << "fullSub: "<< fullSubPathHLTFolders[j];
+    for (unsigned int j = 0; j < fullSubPathHLTFolders.size(); j++) {
+      if (verbose_)
+        edm::LogInfo("HitsValidationHcal") << "fullSub: " << fullSubPathHLTFolders[j];
 
       if (strcmp(fullSubPathHLTFolders[j].c_str(), "HcalHitsV/SimHitsValidationHcal") == 0) {
-	hcalMEs = ig.getContents(fullSubPathHLTFolders[j]);
-	if (verbose_) edm::LogInfo("HitsValidationHcal") << "hltMES size : " << hcalMEs.size();
-	if (!SimHitsEndjob(hcalMEs)) 
-	  edm::LogWarning("HitsValidationHcal") << "Error in SimhitEndjob!";
+        hcalMEs = ig.getContents(fullSubPathHLTFolders[j]);
+        if (verbose_)
+          edm::LogInfo("HitsValidationHcal") << "hltMES size : " << hcalMEs.size();
+        if (!SimHitsEndjob(hcalMEs))
+          edm::LogWarning("HitsValidationHcal") << "Error in SimhitEndjob!";
       }
-    }    
+    }
   }
-  
 }
 
 // called after entering the  directory
 // hcalMEs are within that directory
-int HcalSimHitsClient::SimHitsEndjob(const std::vector<MonitorElement*> &hcalMEs) {
-  
+int HcalSimHitsClient::SimHitsEndjob(const std::vector<MonitorElement *> &hcalMEs) {
   std::vector<std::string> divisions = getHistogramTypes();
   MonitorElement *Occupancy_map[nTime][divisions.size()];
   MonitorElement *Energy[nType1], *Time_weighteden[nType1];
   MonitorElement *HitEnergyvsieta[divisions.size()], *HitTimevsieta[divisions.size()];
-  
-  std::string time[nTime]={"25","50","100","250"};
-  std::string detdivision[nType1]={"HB","HE","HF","HO"};
+
+  std::string time[nTime] = {"25", "50", "100", "250"};
+  std::string detdivision[nType1] = {"HB", "HE", "HF", "HO"};
   char name[40], name1[40], name2[40], name3[40], name4[40];
 
-  for (int k=0; k<nType1;k++) {
+  for (int k = 0; k < nType1; k++) {
     Energy[k] = nullptr;
     Time_weighteden[k] = nullptr;
-    for (unsigned int ih=0; ih<hcalMEs.size(); ih++) {
-      sprintf (name1, "Energy_%s", detdivision[k].c_str());
-      sprintf (name2, "Time_Enweighted_%s", detdivision[k].c_str());
+    for (unsigned int ih = 0; ih < hcalMEs.size(); ih++) {
+      sprintf(name1, "Energy_%s", detdivision[k].c_str());
+      sprintf(name2, "Time_Enweighted_%s", detdivision[k].c_str());
       if (strcmp(hcalMEs[ih]->getName().c_str(), name1) == 0) {
-	Energy[k] = hcalMEs[ih];
+        Energy[k] = hcalMEs[ih];
       }
       if (strcmp(hcalMEs[ih]->getName().c_str(), name2) == 0) {
-	Time_weighteden[k] = hcalMEs[ih];
+        Time_weighteden[k] = hcalMEs[ih];
       }
     }
   }
-    
-  for (int i=0; i<nTime; i++) {
-    for (unsigned int j=0; j<divisions.size();j++) {
-      for (unsigned int ih=0; ih<hcalMEs.size(); ih++) {
-	sprintf (name, "HcalHitE%s%s", time[i].c_str(),divisions[j].c_str());
-	if (strcmp(hcalMEs[ih]->getName().c_str(), name) == 0) {
-	  Occupancy_map[i][j]= hcalMEs[ih];
-	}
+
+  for (int i = 0; i < nTime; i++) {
+    for (unsigned int j = 0; j < divisions.size(); j++) {
+      for (unsigned int ih = 0; ih < hcalMEs.size(); ih++) {
+        sprintf(name, "HcalHitE%s%s", time[i].c_str(), divisions[j].c_str());
+        if (strcmp(hcalMEs[ih]->getName().c_str(), name) == 0) {
+          Occupancy_map[i][j] = hcalMEs[ih];
+        }
       }
     }
   }
 
-  for (unsigned int k=0; k<divisions.size();k++) {
-    HitEnergyvsieta[k]= nullptr;
-    HitTimevsieta[k]= nullptr;
-    for (unsigned int ih=0; ih<hcalMEs.size(); ih++) {
-      sprintf (name3, "HcalHitEta%s",divisions[k].c_str());
-      sprintf (name4, "HcalHitTimeAEta%s",divisions[k].c_str());
+  for (unsigned int k = 0; k < divisions.size(); k++) {
+    HitEnergyvsieta[k] = nullptr;
+    HitTimevsieta[k] = nullptr;
+    for (unsigned int ih = 0; ih < hcalMEs.size(); ih++) {
+      sprintf(name3, "HcalHitEta%s", divisions[k].c_str());
+      sprintf(name4, "HcalHitTimeAEta%s", divisions[k].c_str());
       if (strcmp(hcalMEs[ih]->getName().c_str(), name3) == 0) {
-	HitEnergyvsieta[k]= hcalMEs[ih];
+        HitEnergyvsieta[k] = hcalMEs[ih];
       }
       if (strcmp(hcalMEs[ih]->getName().c_str(), name4) == 0) {
-	HitTimevsieta[k]= hcalMEs[ih];
+        HitTimevsieta[k] = hcalMEs[ih];
       }
     }
   }
-    
-  //mean energy 
- 
+
+  // mean energy
+
   double nevent = Energy[0]->getEntries();
-  if (verbose_) edm::LogInfo("HitsValidationHcal") << "nevent : " << nevent;
+  if (verbose_)
+    edm::LogInfo("HitsValidationHcal") << "nevent : " << nevent;
 
   float cont[nTime][divisions.size()];
   float en[nType1], tme[nType1];
   float hitenergy[divisions.size()], hittime[divisions.size()];
   float fev = float(nevent);
-  
-  for (int dettype=0; dettype<nType1; dettype++) {
-    int nx1=Energy[dettype]->getNbinsX();
-    for (int i=0; i<=nx1; i++) {
-      en[dettype]= Energy[dettype]->getBinContent(i)/fev;
-      Energy[dettype]->setBinContent(i,en[dettype]);
+
+  for (int dettype = 0; dettype < nType1; dettype++) {
+    int nx1 = Energy[dettype]->getNbinsX();
+    for (int i = 0; i <= nx1; i++) {
+      en[dettype] = Energy[dettype]->getBinContent(i) / fev;
+      Energy[dettype]->setBinContent(i, en[dettype]);
     }
-    int nx2= Time_weighteden[dettype]->getNbinsX();
-    for (int i=0; i<=nx2; i++) {
-      tme[dettype]= Time_weighteden[dettype]->getBinContent(i)/fev;
-      Time_weighteden[dettype]->setBinContent(i,tme[dettype]);
+    int nx2 = Time_weighteden[dettype]->getNbinsX();
+    for (int i = 0; i <= nx2; i++) {
+      tme[dettype] = Time_weighteden[dettype]->getBinContent(i) / fev;
+      Time_weighteden[dettype]->setBinContent(i, tme[dettype]);
     }
   }
-  
-  for (unsigned int dettype=0; dettype<divisions.size(); dettype++)  {
-    int nx1=HitEnergyvsieta[dettype]->getNbinsX();
-    for (int i=0; i<=nx1; i++) {
-      hitenergy[dettype]= HitEnergyvsieta[dettype]->getBinContent(i)/fev;
-      HitEnergyvsieta[dettype]->setBinContent(i,hitenergy[dettype]);
+
+  for (unsigned int dettype = 0; dettype < divisions.size(); dettype++) {
+    int nx1 = HitEnergyvsieta[dettype]->getNbinsX();
+    for (int i = 0; i <= nx1; i++) {
+      hitenergy[dettype] = HitEnergyvsieta[dettype]->getBinContent(i) / fev;
+      HitEnergyvsieta[dettype]->setBinContent(i, hitenergy[dettype]);
     }
-    int nx2= HitTimevsieta[dettype]->getNbinsX();
-    for (int i=0; i<=nx2; i++) {
-      hittime[dettype]= HitTimevsieta[dettype]->getBinContent(i)/fev;
-      HitTimevsieta[dettype]->setBinContent(i,hittime[dettype]);
+    int nx2 = HitTimevsieta[dettype]->getNbinsX();
+    for (int i = 0; i <= nx2; i++) {
+      hittime[dettype] = HitTimevsieta[dettype]->getBinContent(i) / fev;
+      HitTimevsieta[dettype]->setBinContent(i, hittime[dettype]);
     }
   }
-  
-  for (int itime=0; itime<nTime; itime++) {
-    for (unsigned int det=0; det<divisions.size(); det++) {
-      int ny= Occupancy_map[itime][det]->getNbinsY();
-      int nx= Occupancy_map[itime][det]->getNbinsX(); 
-      for (int i=1; i<nx+1; i++) {
-	for (int j=1; j<ny+1; j++) {
-	  cont[itime][det] = Occupancy_map[itime][det]->getBinContent(i,j)/fev;
-	  Occupancy_map[itime][det]->setBinContent(i,j,cont[itime][det]);
-	}
+
+  for (int itime = 0; itime < nTime; itime++) {
+    for (unsigned int det = 0; det < divisions.size(); det++) {
+      int ny = Occupancy_map[itime][det]->getNbinsY();
+      int nx = Occupancy_map[itime][det]->getNbinsX();
+      for (int i = 1; i < nx + 1; i++) {
+        for (int j = 1; j < ny + 1; j++) {
+          cont[itime][det] = Occupancy_map[itime][det]->getBinContent(i, j) / fev;
+          Occupancy_map[itime][det]->setBinContent(i, j, cont[itime][det]);
+        }
       }
     }
   }
- 
+
   return 1;
 }
 
 std::vector<std::string> HcalSimHitsClient::getHistogramTypes() {
-
-  int maxDepth = std::max(maxDepthHB_,maxDepthHE_);
-  if (verbose_) edm::LogInfo("HitsValidationHcal") << "Max depth 1st step:: "
-						   << maxDepth;
-  maxDepth = std::max(maxDepth,maxDepthHF_);
-  if (verbose_) edm::LogInfo("HitsValidationHcal") << "Max depth 2nd step:: "
-						   << maxDepth;
-  maxDepth = std::max(maxDepth,maxDepthHO_);
-  if (verbose_) edm::LogInfo("HitsValidationHcal") <<"Max depth 3rd step:: "
-						   << maxDepth;
-  std::vector<std::string > divisions;
-  char                      name1[20];
-
-  //first overall Hcal
-  for (int depth=0; depth<maxDepth; ++depth) {
-    sprintf (name1, "HC%d", depth);
+  int maxDepth = std::max(maxDepthHB_, maxDepthHE_);
+  if (verbose_)
+    edm::LogInfo("HitsValidationHcal") << "Max depth 1st step:: " << maxDepth;
+  maxDepth = std::max(maxDepth, maxDepthHF_);
+  if (verbose_)
+    edm::LogInfo("HitsValidationHcal") << "Max depth 2nd step:: " << maxDepth;
+  maxDepth = std::max(maxDepth, maxDepthHO_);
+  if (verbose_)
+    edm::LogInfo("HitsValidationHcal") << "Max depth 3rd step:: " << maxDepth;
+  std::vector<std::string> divisions;
+  char name1[20];
+
+  // first overall Hcal
+  for (int depth = 0; depth < maxDepth; ++depth) {
+    sprintf(name1, "HC%d", depth);
     divisions.push_back(std::string(name1));
   }
-  //HB
-  for (int depth=0; depth<maxDepthHB_; ++depth) {
-    sprintf (name1, "HB%d", depth);
+  // HB
+  for (int depth = 0; depth < maxDepthHB_; ++depth) {
+    sprintf(name1, "HB%d", depth);
     divisions.push_back(std::string(name1));
   }
-  //HE
-  for (int depth=0; depth<maxDepthHE_; ++depth) {
-    sprintf (name1, "HE%d+z", depth);
+  // HE
+  for (int depth = 0; depth < maxDepthHE_; ++depth) {
+    sprintf(name1, "HE%d+z", depth);
     divisions.push_back(std::string(name1));
-    sprintf (name1, "HE%d-z", depth);
+    sprintf(name1, "HE%d-z", depth);
     divisions.push_back(std::string(name1));
   }
-  //HO
+  // HO
   {
     int depth = maxDepthHO_;
-    sprintf (name1, "HO%d", depth);
+    sprintf(name1, "HO%d", depth);
     divisions.push_back(std::string(name1));
   }
-  //HF (first absorber, then different types of abnormal hits)
-  std::string hfty1[4] = {"A","W","B","J"};
-  for (int k=0; k<4; ++k) {
-    for (int depth=0; depth<maxDepthHF_; ++depth) {
-      sprintf (name1, "HF%s%d+z", hfty1[k].c_str(), depth);
+  // HF (first absorber, then different types of abnormal hits)
+  std::string hfty1[4] = {"A", "W", "B", "J"};
+  for (int k = 0; k < 4; ++k) {
+    for (int depth = 0; depth < maxDepthHF_; ++depth) {
+      sprintf(name1, "HF%s%d+z", hfty1[k].c_str(), depth);
       divisions.push_back(std::string(name1));
-      sprintf (name1, "HF%s%d-z", hfty1[k].c_str(), depth);
+      sprintf(name1, "HF%s%d-z", hfty1[k].c_str(), depth);
       divisions.push_back(std::string(name1));
     }
   }
diff --git a/Validation/HcalHits/src/HcalSimHitsValidation.cc b/Validation/HcalHits/src/HcalSimHitsValidation.cc
index 4c54a2fa563ed..dcf3dee6f2f6b 100644
--- a/Validation/HcalHits/src/HcalSimHitsValidation.cc
+++ b/Validation/HcalHits/src/HcalSimHitsValidation.cc
@@ -1,52 +1,50 @@
-#include "Validation/HcalHits/interface/HcalSimHitsValidation.h"
-#include "Geometry/Records/interface/CaloGeometryRecord.h"
 #include "Geometry/HcalCommonData/interface/HcalHitRelabeller.h"
+#include "Geometry/Records/interface/CaloGeometryRecord.h"
+#include "Validation/HcalHits/interface/HcalSimHitsValidation.h"
 
-HcalSimHitsValidation::HcalSimHitsValidation(edm::ParameterSet const& conf) {
+HcalSimHitsValidation::HcalSimHitsValidation(edm::ParameterSet const &conf) {
   // DQM ROOT output
   outputFile_ = conf.getUntrackedParameter<std::string>("outputFile", "myfile.root");
-  testNumber_ = conf.getUntrackedParameter<bool>("TestNumber",false);
-  auxPlots_ = conf.getUntrackedParameter<bool>("auxiliaryPlots",false);
+  testNumber_ = conf.getUntrackedParameter<bool>("TestNumber", false);
+  auxPlots_ = conf.getUntrackedParameter<bool>("auxiliaryPlots", false);
 
   // register for data access
-  g4Label_  = conf.getUntrackedParameter<std::string>("ModuleLabel","g4SimHits");
-  hcalHits_ = conf.getUntrackedParameter<std::string>("HcalHitCollection","HcalHits");
-  ebHits_ = conf.getUntrackedParameter<std::string>("EBHitCollection","EcalHitsEB");
-  eeHits_ = conf.getUntrackedParameter<std::string>("EEHitCollection","EcalHitsEE");
-  
+  g4Label_ = conf.getUntrackedParameter<std::string>("ModuleLabel", "g4SimHits");
+  hcalHits_ = conf.getUntrackedParameter<std::string>("HcalHitCollection", "HcalHits");
+  ebHits_ = conf.getUntrackedParameter<std::string>("EBHitCollection", "EcalHitsEB");
+  eeHits_ = conf.getUntrackedParameter<std::string>("EEHitCollection", "EcalHitsEE");
+
   // import sampling factors
   hf1_ = conf.getParameter<double>("hf1");
   hf2_ = conf.getParameter<double>("hf2");
 
   tok_evt_ = consumes<edm::HepMCProduct>(edm::InputTag("generatorSmeared"));
-  tok_hcal_ = consumes<edm::PCaloHitContainer>(edm::InputTag(g4Label_,hcalHits_));
-  tok_ecalEB_ = consumes<edm::PCaloHitContainer>(edm::InputTag(g4Label_,ebHits_));
-  tok_ecalEE_ = consumes<edm::PCaloHitContainer>(edm::InputTag(g4Label_,eeHits_));
-  
-  if ( !outputFile_.empty() ) {    edm::LogInfo("OutputInfo") << " Hcal SimHit Task histograms will be saved to '" << outputFile_.c_str() << "'";
+  tok_hcal_ = consumes<edm::PCaloHitContainer>(edm::InputTag(g4Label_, hcalHits_));
+  tok_ecalEB_ = consumes<edm::PCaloHitContainer>(edm::InputTag(g4Label_, ebHits_));
+  tok_ecalEE_ = consumes<edm::PCaloHitContainer>(edm::InputTag(g4Label_, eeHits_));
+
+  if (!outputFile_.empty()) {
+    edm::LogInfo("OutputInfo") << " Hcal SimHit Task histograms will be saved to '" << outputFile_.c_str() << "'";
   } else {
     edm::LogInfo("OutputInfo") << " Hcal SimHit Task histograms will NOT be saved";
   }
-  
+
   nevtot = 0;
-  
 }
 
+HcalSimHitsValidation::~HcalSimHitsValidation() {}
 
-HcalSimHitsValidation::~HcalSimHitsValidation() { }
-
-
-void HcalSimHitsValidation::bookHistograms(DQMStore::IBooker &ib, edm::Run const &run, edm::EventSetup const &es)
-{
+void HcalSimHitsValidation::bookHistograms(DQMStore::IBooker &ib, edm::Run const &run, edm::EventSetup const &es) {
   edm::ESHandle<HcalDDDRecConstants> pHRNDC;
-  es.get<HcalRecNumberingRecord>().get( pHRNDC );
+  es.get<HcalRecNumberingRecord>().get(pHRNDC);
   hcons = &(*pHRNDC);
   maxDepthHB_ = hcons->getMaxDepth(0);
   maxDepthHE_ = hcons->getMaxDepth(1);
   maxDepthHF_ = hcons->getMaxDepth(2);
   maxDepthHO_ = hcons->getMaxDepth(3);
 
-  //Get Phi segmentation from geometry, use the max phi number so that all iphi values are included.
+  // Get Phi segmentation from geometry, use the max phi number so that all iphi
+  // values are included.
 
   int NphiMax = hcons->getNPhi(0);
 
@@ -54,20 +52,20 @@ void HcalSimHitsValidation::bookHistograms(DQMStore::IBooker &ib, edm::Run const
   NphiMax = (hcons->getNPhi(2) > NphiMax ? hcons->getNPhi(2) : NphiMax);
   NphiMax = (hcons->getNPhi(3) > NphiMax ? hcons->getNPhi(3) : NphiMax);
 
-  //Center the iphi bins on the integers
-  //float iphi_min = 0.5;
-  //float iphi_max = NphiMax + 0.5;
-  //int iphi_bins = (int) (iphi_max - iphi_min);
+  // Center the iphi bins on the integers
+  // float iphi_min = 0.5;
+  // float iphi_max = NphiMax + 0.5;
+  // int iphi_bins = (int) (iphi_max - iphi_min);
 
   int iEtaHBMax = hcons->getEtaRange(0).second;
   int iEtaHEMax = hcons->getEtaRange(1).second;
   int iEtaHFMax = hcons->getEtaRange(2).second;
   int iEtaHOMax = hcons->getEtaRange(3).second;
 
-  //Retain classic behavior, all plots have same ieta range.
-  //Comment out	code to	allow each subdetector to have its on range
+  // Retain classic behavior, all plots have same ieta range.
+  // Comment out	code to	allow each subdetector to have its on range
 
-  int iEtaMax =	(iEtaHBMax > iEtaHEMax ? iEtaHBMax : iEtaHEMax);
+  int iEtaMax = (iEtaHBMax > iEtaHEMax ? iEtaHBMax : iEtaHEMax);
   iEtaMax = (iEtaMax > iEtaHFMax ? iEtaMax : iEtaHFMax);
   iEtaMax = (iEtaMax > iEtaHOMax ? iEtaMax : iEtaHOMax);
 
@@ -76,186 +74,218 @@ void HcalSimHitsValidation::bookHistograms(DQMStore::IBooker &ib, edm::Run const
   iEtaHFMax = iEtaMax;
   iEtaHOMax = iEtaMax;
 
-  //Give an empty bin around the subdet ieta range to make it clear that all ieta rings have been included
+  // Give an empty bin around the subdet ieta range to make it clear that all
+  // ieta rings have been included
   float ieta_min_HB = -iEtaHBMax - 1.5;
   float ieta_max_HB = iEtaHBMax + 1.5;
-  int ieta_bins_HB = (int) (ieta_max_HB - ieta_min_HB);
+  int ieta_bins_HB = (int)(ieta_max_HB - ieta_min_HB);
 
   float ieta_min_HE = -iEtaHEMax - 1.5;
   float ieta_max_HE = iEtaHEMax + 1.5;
-  int ieta_bins_HE = (int) (ieta_max_HE - ieta_min_HE);
+  int ieta_bins_HE = (int)(ieta_max_HE - ieta_min_HE);
 
   float ieta_min_HF = -iEtaHFMax - 1.5;
   float ieta_max_HF = iEtaHFMax + 1.5;
-  int ieta_bins_HF = (int) (ieta_max_HF - ieta_min_HF);
+  int ieta_bins_HF = (int)(ieta_max_HF - ieta_min_HF);
 
   float ieta_min_HO = -iEtaHOMax - 1.5;
   float ieta_max_HO = iEtaHOMax + 1.5;
-  int ieta_bins_HO = (int) (ieta_max_HO - ieta_min_HO);
+  int ieta_bins_HO = (int)(ieta_max_HO - ieta_min_HO);
 
   Char_t histo[200];
 
-    ib.setCurrentFolder("HcalHitsV/HcalSimHitTask");
+  ib.setCurrentFolder("HcalHitsV/HcalSimHitTask");
 
-    if (auxPlots_) {
-    
+  if (auxPlots_) {
     // General counters
-    for(int depth = 0; depth <= maxDepthHB_; depth++){
-       if(depth == 0){ sprintf  (histo, "N_HB" ); }
-       else {          sprintf  (histo, "N_HB%d", depth ); }
+    for (int depth = 0; depth <= maxDepthHB_; depth++) {
+      if (depth == 0) {
+        sprintf(histo, "N_HB");
+      } else {
+        sprintf(histo, "N_HB%d", depth);
+      }
 
-       Nhb.push_back( ib.book1D(histo, histo, 2600,0.,2600.) );
+      Nhb.push_back(ib.book1D(histo, histo, 2600, 0., 2600.));
     }
-    for(int depth = 0; depth <= maxDepthHE_; depth++){
-       if(depth == 0){ sprintf  (histo, "N_HE" ); }
-       else {          sprintf  (histo, "N_HE%d", depth ); }
+    for (int depth = 0; depth <= maxDepthHE_; depth++) {
+      if (depth == 0) {
+        sprintf(histo, "N_HE");
+      } else {
+        sprintf(histo, "N_HE%d", depth);
+      }
 
-       Nhe.push_back( ib.book1D(histo, histo, 2600,0.,2600.) );
+      Nhe.push_back(ib.book1D(histo, histo, 2600, 0., 2600.));
     }
 
-       sprintf  (histo, "N_HO" );
-       Nho = ib.book1D(histo, histo, 2200,0.,2200.);
+    sprintf(histo, "N_HO");
+    Nho = ib.book1D(histo, histo, 2200, 0., 2200.);
 
-    for(int depth = 0; depth <= maxDepthHF_; depth++){
-       if(depth == 0){ sprintf  (histo, "N_HF" ); }
-       else {          sprintf  (histo, "N_HF%d", depth ); }
+    for (int depth = 0; depth <= maxDepthHF_; depth++) {
+      if (depth == 0) {
+        sprintf(histo, "N_HF");
+      } else {
+        sprintf(histo, "N_HF%d", depth);
+      }
 
-       Nhf.push_back( ib.book1D(histo, histo, 1800,0.,1800.) );
+      Nhf.push_back(ib.book1D(histo, histo, 1800, 0., 1800.));
     }
 
-    //Mean energy vs iEta TProfiles
-    for(int depth = 0; depth <= maxDepthHB_; depth++){
-       if(depth == 0){ sprintf  (histo, "emean_vs_ieta_HB" ); }
-       else {          sprintf  (histo, "emean_vs_ieta_HB%d", depth ); }
+    // Mean energy vs iEta TProfiles
+    for (int depth = 0; depth <= maxDepthHB_; depth++) {
+      if (depth == 0) {
+        sprintf(histo, "emean_vs_ieta_HB");
+      } else {
+        sprintf(histo, "emean_vs_ieta_HB%d", depth);
+      }
 
-       emean_vs_ieta_HB.push_back( ib.bookProfile(histo, histo, ieta_bins_HB, ieta_min_HB, ieta_max_HB, -10., 2000., " ") );
+      emean_vs_ieta_HB.push_back(
+          ib.bookProfile(histo, histo, ieta_bins_HB, ieta_min_HB, ieta_max_HB, -10., 2000., " "));
     }
-    for(int depth = 0; depth <= maxDepthHE_; depth++){
-       if(depth == 0){ sprintf  (histo, "emean_vs_ieta_HE" ); }
-       else {          sprintf  (histo, "emean_vs_ieta_HE%d", depth ); }
+    for (int depth = 0; depth <= maxDepthHE_; depth++) {
+      if (depth == 0) {
+        sprintf(histo, "emean_vs_ieta_HE");
+      } else {
+        sprintf(histo, "emean_vs_ieta_HE%d", depth);
+      }
 
-       emean_vs_ieta_HE.push_back( ib.bookProfile(histo, histo, ieta_bins_HE, ieta_min_HE, ieta_max_HE, -10., 2000., " ") );
+      emean_vs_ieta_HE.push_back(
+          ib.bookProfile(histo, histo, ieta_bins_HE, ieta_min_HE, ieta_max_HE, -10., 2000., " "));
     }
 
-       sprintf  (histo, "emean_vs_ieta_HO" ); 
-       emean_vs_ieta_HO =  ib.bookProfile(histo, histo, ieta_bins_HO, ieta_min_HO, ieta_max_HO, -10., 2000., " ");
+    sprintf(histo, "emean_vs_ieta_HO");
+    emean_vs_ieta_HO = ib.bookProfile(histo, histo, ieta_bins_HO, ieta_min_HO, ieta_max_HO, -10., 2000., " ");
 
-    for(int depth = 0; depth <= maxDepthHF_; depth++){
-       if(depth == 0){ sprintf  (histo, "emean_vs_ieta_HF" ); }
-       else {          sprintf  (histo, "emean_vs_ieta_HF%d", depth ); }
+    for (int depth = 0; depth <= maxDepthHF_; depth++) {
+      if (depth == 0) {
+        sprintf(histo, "emean_vs_ieta_HF");
+      } else {
+        sprintf(histo, "emean_vs_ieta_HF%d", depth);
+      }
 
-       emean_vs_ieta_HF.push_back( ib.bookProfile(histo, histo, ieta_bins_HF, ieta_min_HF, ieta_max_HF, -10., 2000., " ") );
+      emean_vs_ieta_HF.push_back(
+          ib.bookProfile(histo, histo, ieta_bins_HF, ieta_min_HF, ieta_max_HF, -10., 2000., " "));
     }
 
-    //Occupancy vs. iEta TH1Fs
-    for(int depth = 0; depth <= maxDepthHB_; depth++){
-       if(depth == 0){ sprintf  (histo, "occupancy_vs_ieta_HB" ); }
-       else {          sprintf  (histo, "occupancy_vs_ieta_HB%d", depth ); }
+    // Occupancy vs. iEta TH1Fs
+    for (int depth = 0; depth <= maxDepthHB_; depth++) {
+      if (depth == 0) {
+        sprintf(histo, "occupancy_vs_ieta_HB");
+      } else {
+        sprintf(histo, "occupancy_vs_ieta_HB%d", depth);
+      }
 
-       occupancy_vs_ieta_HB.push_back( ib.book1D(histo, histo, ieta_bins_HB, ieta_min_HB, ieta_max_HB) );
+      occupancy_vs_ieta_HB.push_back(ib.book1D(histo, histo, ieta_bins_HB, ieta_min_HB, ieta_max_HB));
     }
-    for(int depth = 0; depth <= maxDepthHE_; depth++){
-       if(depth == 0){ sprintf  (histo, "occupancy_vs_ieta_HE" ); }
-       else {          sprintf  (histo, "occupancy_vs_ieta_HE%d", depth ); }
+    for (int depth = 0; depth <= maxDepthHE_; depth++) {
+      if (depth == 0) {
+        sprintf(histo, "occupancy_vs_ieta_HE");
+      } else {
+        sprintf(histo, "occupancy_vs_ieta_HE%d", depth);
+      }
 
-       occupancy_vs_ieta_HE.push_back( ib.book1D(histo, histo, ieta_bins_HE, ieta_min_HE, ieta_max_HE) );
+      occupancy_vs_ieta_HE.push_back(ib.book1D(histo, histo, ieta_bins_HE, ieta_min_HE, ieta_max_HE));
     }
 
-       sprintf  (histo, "occupancy_vs_ieta_HO" ); 
-       occupancy_vs_ieta_HO = ib.book1D(histo, histo, ieta_bins_HO, ieta_min_HO, ieta_max_HO);
+    sprintf(histo, "occupancy_vs_ieta_HO");
+    occupancy_vs_ieta_HO = ib.book1D(histo, histo, ieta_bins_HO, ieta_min_HO, ieta_max_HO);
 
-    for(int depth = 0; depth <= maxDepthHF_; depth++){
-       if(depth == 0){ sprintf  (histo, "occupancy_vs_ieta_HF" ); }
-       else {          sprintf  (histo, "occupancy_vs_ieta_HF%d", depth ); }
+    for (int depth = 0; depth <= maxDepthHF_; depth++) {
+      if (depth == 0) {
+        sprintf(histo, "occupancy_vs_ieta_HF");
+      } else {
+        sprintf(histo, "occupancy_vs_ieta_HF%d", depth);
+      }
 
-       occupancy_vs_ieta_HF.push_back( ib.book1D(histo, histo, ieta_bins_HF, ieta_min_HF, ieta_max_HF) );
+      occupancy_vs_ieta_HF.push_back(ib.book1D(histo, histo, ieta_bins_HF, ieta_min_HF, ieta_max_HF));
     }
 
-    //Energy spectra
-    for(int depth = 0; depth <= maxDepthHB_; depth++){
-       if(depth == 0){ sprintf  (histo, "HcalSimHitTask_energy_of_simhits_HB" ); }
-       else {          sprintf  (histo, "HcalSimHitTask_energy_of_simhits_HB%d", depth ); }
+    // Energy spectra
+    for (int depth = 0; depth <= maxDepthHB_; depth++) {
+      if (depth == 0) {
+        sprintf(histo, "HcalSimHitTask_energy_of_simhits_HB");
+      } else {
+        sprintf(histo, "HcalSimHitTask_energy_of_simhits_HB%d", depth);
+      }
 
-       meSimHitsEnergyHB.push_back( ib.book1D(histo, histo, 510 , -0.1 , 5.) );
+      meSimHitsEnergyHB.push_back(ib.book1D(histo, histo, 510, -0.1, 5.));
     }
-    for(int depth = 0; depth <= maxDepthHE_; depth++){
-       if(depth == 0){ sprintf  (histo, "HcalSimHitTask_energy_of_simhits_HE" ); }
-       else {          sprintf  (histo, "HcalSimHitTask_energy_of_simhits_HE%d", depth ); }
+    for (int depth = 0; depth <= maxDepthHE_; depth++) {
+      if (depth == 0) {
+        sprintf(histo, "HcalSimHitTask_energy_of_simhits_HE");
+      } else {
+        sprintf(histo, "HcalSimHitTask_energy_of_simhits_HE%d", depth);
+      }
 
-       meSimHitsEnergyHE.push_back( ib.book1D(histo, histo, 510 , -0.1 , 5.) );
+      meSimHitsEnergyHE.push_back(ib.book1D(histo, histo, 510, -0.1, 5.));
     }
 
-       sprintf  (histo, "HcalSimHitTask_energy_of_simhits_HO" );
-       meSimHitsEnergyHO = ib.book1D(histo, histo, 510 , -0.1 , 5.);
+    sprintf(histo, "HcalSimHitTask_energy_of_simhits_HO");
+    meSimHitsEnergyHO = ib.book1D(histo, histo, 510, -0.1, 5.);
 
-    for(int depth = 0; depth <= maxDepthHF_; depth++){
-       if(depth == 0){ sprintf  (histo, "HcalSimHitTask_energy_of_simhits_HF" ); }
-       else {          sprintf  (histo, "HcalSimHitTask_energy_of_simhits_HF%d", depth ); }
+    for (int depth = 0; depth <= maxDepthHF_; depth++) {
+      if (depth == 0) {
+        sprintf(histo, "HcalSimHitTask_energy_of_simhits_HF");
+      } else {
+        sprintf(histo, "HcalSimHitTask_energy_of_simhits_HF%d", depth);
+      }
 
-       meSimHitsEnergyHF.push_back( ib.book1D(histo, histo, 1010 , -5. , 500.) );
+      meSimHitsEnergyHF.push_back(ib.book1D(histo, histo, 1010, -5., 500.));
     }
 
-    } // auxPlots_
+  }  // auxPlots_
 
-    //Energy in Cone
-    sprintf (histo, "HcalSimHitTask_En_simhits_cone_profile_vs_ieta_all_depths");
-    meEnConeEtaProfile = ib.bookProfile(histo, histo, ieta_bins_HF, ieta_min_HF, ieta_max_HF, -10., 200., " ");  
-    
-    sprintf (histo, "HcalSimHitTask_En_simhits_cone_profile_vs_ieta_all_depths_E");
-    meEnConeEtaProfile_E = ib.bookProfile(histo, histo, ieta_bins_HF, ieta_min_HF, ieta_max_HF, -10., 200., " ");  
-      
-    sprintf (histo, "HcalSimHitTask_En_simhits_cone_profile_vs_ieta_all_depths_EH");
-    meEnConeEtaProfile_EH = ib.bookProfile(histo, histo, ieta_bins_HF, ieta_min_HF, ieta_max_HF, -10., 200., " ");  
-    
-
-}
+  // Energy in Cone
+  sprintf(histo, "HcalSimHitTask_En_simhits_cone_profile_vs_ieta_all_depths");
+  meEnConeEtaProfile = ib.bookProfile(histo, histo, ieta_bins_HF, ieta_min_HF, ieta_max_HF, -10., 200., " ");
 
+  sprintf(histo, "HcalSimHitTask_En_simhits_cone_profile_vs_ieta_all_depths_E");
+  meEnConeEtaProfile_E = ib.bookProfile(histo, histo, ieta_bins_HF, ieta_min_HF, ieta_max_HF, -10., 200., " ");
 
-void HcalSimHitsValidation::endJob() { 
-
-  if (auxPlots_){
+  sprintf(histo, "HcalSimHitTask_En_simhits_cone_profile_vs_ieta_all_depths_EH");
+  meEnConeEtaProfile_EH = ib.bookProfile(histo, histo, ieta_bins_HF, ieta_min_HF, ieta_max_HF, -10., 200., " ");
+}
 
-  for (int i = 1; i <= occupancy_vs_ieta_HB[0]->getNbinsX(); i++){
+void HcalSimHitsValidation::endJob() {
+  if (auxPlots_) {
+    for (int i = 1; i <= occupancy_vs_ieta_HB[0]->getNbinsX(); i++) {
+      int ieta = i - 43;  // -41 -1, 1 41
 
-    int ieta = i - 43;        // -41 -1, 1 41 
+      float phi_factor;
 
-    float phi_factor;
+      if (std::abs(ieta) <= 20)
+        phi_factor = 72.;
+      else if (std::abs(ieta) < 40)
+        phi_factor = 36.;
+      else
+        phi_factor = 18.;
 
-    if      (std::abs(ieta) <= 20) phi_factor = 72.;
-    else if (std::abs(ieta) <  40) phi_factor = 36.;
-    else                       phi_factor = 18.;
-    
-    float cnorm;
+      float cnorm;
 
-    //Occupancy vs. iEta TH1Fs
-    for(int depth = 0; depth <= maxDepthHB_; depth++){
-       cnorm = occupancy_vs_ieta_HB[depth]->getBinContent(i) / (phi_factor * nevtot); 
-       occupancy_vs_ieta_HB[depth]->setBinContent(i, cnorm);
-    }
-    for(int depth = 0; depth <= maxDepthHE_; depth++){
-       cnorm = occupancy_vs_ieta_HE[depth]->getBinContent(i) / (phi_factor * nevtot); 
-       occupancy_vs_ieta_HE[depth]->setBinContent(i, cnorm);
-    }
+      // Occupancy vs. iEta TH1Fs
+      for (int depth = 0; depth <= maxDepthHB_; depth++) {
+        cnorm = occupancy_vs_ieta_HB[depth]->getBinContent(i) / (phi_factor * nevtot);
+        occupancy_vs_ieta_HB[depth]->setBinContent(i, cnorm);
+      }
+      for (int depth = 0; depth <= maxDepthHE_; depth++) {
+        cnorm = occupancy_vs_ieta_HE[depth]->getBinContent(i) / (phi_factor * nevtot);
+        occupancy_vs_ieta_HE[depth]->setBinContent(i, cnorm);
+      }
 
-       cnorm = occupancy_vs_ieta_HO->getBinContent(i) / (phi_factor * nevtot); 
-       occupancy_vs_ieta_HO->setBinContent(i, cnorm);
+      cnorm = occupancy_vs_ieta_HO->getBinContent(i) / (phi_factor * nevtot);
+      occupancy_vs_ieta_HO->setBinContent(i, cnorm);
 
-    for(int depth = 0; depth <= maxDepthHF_; depth++){
-       cnorm = occupancy_vs_ieta_HF[depth]->getBinContent(i) / (phi_factor * nevtot); 
-       occupancy_vs_ieta_HF[depth]->setBinContent(i, cnorm);
+      for (int depth = 0; depth <= maxDepthHF_; depth++) {
+        cnorm = occupancy_vs_ieta_HF[depth]->getBinContent(i) / (phi_factor * nevtot);
+        occupancy_vs_ieta_HF[depth]->setBinContent(i, cnorm);
+      }
     }
-
-  }
-
   }
 
   // let's see if this breaks anything
-  //if ( outputFile_.size() != 0 && dbe_ ) dbe_->save(outputFile_);
+  // if ( outputFile_.size() != 0 && dbe_ ) dbe_->save(outputFile_);
 }
 
-
-void HcalSimHitsValidation::analyze(edm::Event const& ev, edm::EventSetup const& c) {
-
+void HcalSimHitsValidation::analyze(edm::Event const &ev, edm::EventSetup const &c) {
   using namespace edm;
   using namespace std;
 
@@ -267,221 +297,238 @@ void HcalSimHitsValidation::analyze(edm::Event const& ev, edm::EventSetup const&
   double eta_MC = -999.;  // eta of initial particle from HepMC
 
   edm::Handle<edm::HepMCProduct> evtMC;
-  ev.getByToken(tok_evt_,evtMC);  // generator in late 310_preX
+  ev.getByToken(tok_evt_, evtMC);  // generator in late 310_preX
   if (!evtMC.isValid()) {
-    std::cout << "no HepMCProduct found" << std::endl;    
+    std::cout << "no HepMCProduct found" << std::endl;
   }
 
-  // MC particle with highest pt is taken as a direction reference  
+  // MC particle with highest pt is taken as a direction reference
   double maxPt = -99999.;
-  int npart    = 0;
+  int npart = 0;
 
-  const HepMC::GenEvent * myGenEvent = evtMC->GetEvent();
-  for ( HepMC::GenEvent::particle_const_iterator p = myGenEvent->particles_begin();
-	p != myGenEvent->particles_end(); ++p ) {
+  const HepMC::GenEvent *myGenEvent = evtMC->GetEvent();
+  for (HepMC::GenEvent::particle_const_iterator p = myGenEvent->particles_begin(); p != myGenEvent->particles_end();
+       ++p) {
     double phip = (*p)->momentum().phi();
     double etap = (*p)->momentum().eta();
-    double pt   = (*p)->momentum().perp();
-    if(pt > maxPt) {npart++; maxPt = pt; phi_MC = phip; eta_MC = etap; }
+    double pt = (*p)->momentum().perp();
+    if (pt > maxPt) {
+      npart++;
+      maxPt = pt;
+      phi_MC = phip;
+      eta_MC = etap;
+    }
   }
 
-  double partR   = 0.3;
+  double partR = 0.3;
 
+  // Hcal SimHits
 
-  //Hcal SimHits
-
-  //Approximate calibration constants
+  // Approximate calibration constants
   const float calib_HB = 120.;
   const float calib_HE = 190.;
-  const float calib_HF1 = hf1_;//1.0/0.383;
-  const float calib_HF2 = hf2_;//1.0/0.368;
-  
+  const float calib_HF1 = hf1_;  // 1.0/0.383;
+  const float calib_HF2 = hf2_;  // 1.0/0.368;
+
   edm::Handle<PCaloHitContainer> hcalHits;
-  ev.getByToken(tok_hcal_,hcalHits);
-  const PCaloHitContainer * SimHitResult = hcalHits.product () ;
-    
+  ev.getByToken(tok_hcal_, hcalHits);
+  const PCaloHitContainer *SimHitResult = hcalHits.product();
+
   float eta_diff;
-  float etaMax  = 9999;
+  float etaMax = 9999;
   int ietaMax = 0;
 
   double HcalCone = 0;
 
-  c.get<CaloGeometryRecord>().get (geometry);
-    
-  for (std::vector<PCaloHit>::const_iterator SimHits = SimHitResult->begin () ; SimHits != SimHitResult->end(); ++SimHits) {
+  c.get<CaloGeometryRecord>().get(geometry);
+
+  for (std::vector<PCaloHit>::const_iterator SimHits = SimHitResult->begin(); SimHits != SimHitResult->end();
+       ++SimHits) {
     HcalDetId cell;
-    if (testNumber_) cell = HcalHitRelabeller::relabel(SimHits->id(),hcons);
-    else cell = HcalDetId(SimHits->id());
+    if (testNumber_)
+      cell = HcalHitRelabeller::relabel(SimHits->id(), hcons);
+    else
+      cell = HcalDetId(SimHits->id());
 
     auto cellGeometry = geometry->getSubdetectorGeometry(cell)->getGeometry(cell);
-    double etaS = cellGeometry->getPosition().eta () ;
-    double phiS = cellGeometry->getPosition().phi () ;
-    double en   = SimHits->energy();    
-    
-    int sub     = cell.subdet();
-    int depth   = cell.depth();
+    double etaS = cellGeometry->getPosition().eta();
+    double phiS = cellGeometry->getPosition().phi();
+    double en = SimHits->energy();
+
+    int sub = cell.subdet();
+    int depth = cell.depth();
     double ieta = cell.ieta();
 
-    //Energy in Cone 
-    double r  = dR(eta_MC, phi_MC, etaS, phiS);
-    
-    if (r < partR){      
+    // Energy in Cone
+    double r = dR(eta_MC, phi_MC, etaS, phiS);
+
+    if (r < partR) {
       eta_diff = std::abs(eta_MC - etaS);
-      if(eta_diff < etaMax) {
-	etaMax  = eta_diff; 
-	ietaMax = cell.ieta(); 
+      if (eta_diff < etaMax) {
+        etaMax = eta_diff;
+        ietaMax = cell.ieta();
       }
-      //Approximation of calibration
-      if      (sub == 1)               HcalCone += en*calib_HB;
-      else if (sub == 2)               HcalCone += en*calib_HE;
-      else if (sub == 4 && (depth == 1 || depth == 3)) HcalCone += en*calib_HF1;
-      else if (sub == 4 && (depth == 2 || depth == 4)) HcalCone += en*calib_HF2;
+      // Approximation of calibration
+      if (sub == 1)
+        HcalCone += en * calib_HB;
+      else if (sub == 2)
+        HcalCone += en * calib_HE;
+      else if (sub == 4 && (depth == 1 || depth == 3))
+        HcalCone += en * calib_HF1;
+      else if (sub == 4 && (depth == 2 || depth == 4))
+        HcalCone += en * calib_HF2;
     }
-    
+
     if (auxPlots_) {
+      // HB
+      if (sub == 1) {
+        meSimHitsEnergyHB[0]->Fill(en);
+        meSimHitsEnergyHB[depth]->Fill(en);
 
-    //HB
-    if (sub == 1){
-      meSimHitsEnergyHB[0]->Fill(en);
-      meSimHitsEnergyHB[depth]->Fill(en);
+        emean_vs_ieta_HB[0]->Fill(double(ieta), en);
+        emean_vs_ieta_HB[depth]->Fill(double(ieta), en);
 
-      emean_vs_ieta_HB[0]->Fill(double(ieta), en);
-      emean_vs_ieta_HB[depth]->Fill(double(ieta), en);
+        occupancy_vs_ieta_HB[0]->Fill(double(ieta));
+        occupancy_vs_ieta_HB[depth]->Fill(double(ieta));
+      }
+      // HE
+      if (sub == 2) {
+        meSimHitsEnergyHE[0]->Fill(en);
+        meSimHitsEnergyHE[depth]->Fill(en);
 
-      occupancy_vs_ieta_HB[0]->Fill(double(ieta));
-      occupancy_vs_ieta_HB[depth]->Fill(double(ieta));
-    }
-    //HE
-    if (sub == 2){
-      meSimHitsEnergyHE[0]->Fill(en);
-      meSimHitsEnergyHE[depth]->Fill(en);
+        emean_vs_ieta_HE[0]->Fill(double(ieta), en);
+        emean_vs_ieta_HE[depth]->Fill(double(ieta), en);
 
-      emean_vs_ieta_HE[0]->Fill(double(ieta), en);
-      emean_vs_ieta_HE[depth]->Fill(double(ieta), en);
+        occupancy_vs_ieta_HE[0]->Fill(double(ieta));
+        occupancy_vs_ieta_HE[depth]->Fill(double(ieta));
+      }
+      // HO
+      if (sub == 3) {
+        meSimHitsEnergyHO->Fill(en);
 
-      occupancy_vs_ieta_HE[0]->Fill(double(ieta));
-      occupancy_vs_ieta_HE[depth]->Fill(double(ieta));
-    }
-    //HO
-    if (sub == 3){
-      meSimHitsEnergyHO->Fill(en);
+        emean_vs_ieta_HO->Fill(double(ieta), en);
 
-      emean_vs_ieta_HO->Fill(double(ieta), en);
+        occupancy_vs_ieta_HO->Fill(double(ieta));
+      }
+      // HF
+      if (sub == 4) {
+        meSimHitsEnergyHF[0]->Fill(en);
+        meSimHitsEnergyHF[depth]->Fill(en);
 
-      occupancy_vs_ieta_HO->Fill(double(ieta));
-    }
-    //HF
-    if (sub == 4){
-      meSimHitsEnergyHF[0]->Fill(en);
-      meSimHitsEnergyHF[depth]->Fill(en);
+        emean_vs_ieta_HF[0]->Fill(double(ieta), en);
+        emean_vs_ieta_HF[depth]->Fill(double(ieta), en);
 
-      emean_vs_ieta_HF[0]->Fill(double(ieta), en);
-      emean_vs_ieta_HF[depth]->Fill(double(ieta), en);
+        occupancy_vs_ieta_HF[0]->Fill(double(ieta));
+        occupancy_vs_ieta_HF[depth]->Fill(double(ieta));
+      }
 
-      occupancy_vs_ieta_HF[0]->Fill(double(ieta));
-      occupancy_vs_ieta_HF[depth]->Fill(double(ieta));
-    }
-    
-    } // auxPlots_
+    }  // auxPlots_
 
-  } //Loop over SimHits
+  }  // Loop over SimHits
 
-  //Ecal EB SimHits
+  // Ecal EB SimHits
   double EcalCone = 0;
 
-  if (!ebHits_.empty()){
-  edm::Handle<PCaloHitContainer> ecalEBHits;
-  ev.getByToken(tok_ecalEB_,ecalEBHits);
-  const PCaloHitContainer * SimHitResultEB = ecalEBHits.product () ;
+  if (!ebHits_.empty()) {
+    edm::Handle<PCaloHitContainer> ecalEBHits;
+    ev.getByToken(tok_ecalEB_, ecalEBHits);
+    const PCaloHitContainer *SimHitResultEB = ecalEBHits.product();
 
-  for (std::vector<PCaloHit>::const_iterator SimHits = SimHitResultEB->begin () ; SimHits != SimHitResultEB->end(); ++SimHits) {
+    for (std::vector<PCaloHit>::const_iterator SimHits = SimHitResultEB->begin(); SimHits != SimHitResultEB->end();
+         ++SimHits) {
+      EBDetId EBid = EBDetId(SimHits->id());
 
-    EBDetId EBid = EBDetId(SimHits->id());
+      auto cellGeometry = geometry->getSubdetectorGeometry(EBid)->getGeometry(EBid);
+      double etaS = cellGeometry->getPosition().eta();
+      double phiS = cellGeometry->getPosition().phi();
+      double en = SimHits->energy();
 
-    auto cellGeometry = geometry->getSubdetectorGeometry(EBid)->getGeometry(EBid);
-    double etaS = cellGeometry->getPosition().eta () ;
-    double phiS = cellGeometry->getPosition().phi () ;
-    double en   = SimHits->energy();    
-  
-    double r  = dR(eta_MC, phi_MC, etaS, phiS);
-    
-    if (r < partR) EcalCone += en;   
-  }
-  } // ebHits_
-
-  //Ecal EE SimHits
-  if (!eeHits_.empty()){
-  edm::Handle<PCaloHitContainer> ecalEEHits;
-  ev.getByToken(tok_ecalEE_,ecalEEHits);
-  const PCaloHitContainer * SimHitResultEE = ecalEEHits.product () ;
-
-  for (std::vector<PCaloHit>::const_iterator SimHits = SimHitResultEE->begin () ; SimHits != SimHitResultEE->end(); ++SimHits) {
-
-    EEDetId EEid = EEDetId(SimHits->id());
-
-    auto cellGeometry = geometry->getSubdetectorGeometry(EEid)->getGeometry(EEid) ;
-    double etaS = cellGeometry->getPosition().eta () ;
-    double phiS = cellGeometry->getPosition().phi () ;
-    double en   = SimHits->energy();    
-    
-    double r  = dR(eta_MC, phi_MC, etaS, phiS);
-    
-    if (r < partR) EcalCone += en;   
-  }
-  } // eeHits_
+      double r = dR(eta_MC, phi_MC, etaS, phiS);
+
+      if (r < partR)
+        EcalCone += en;
+    }
+  }  // ebHits_
+
+  // Ecal EE SimHits
+  if (!eeHits_.empty()) {
+    edm::Handle<PCaloHitContainer> ecalEEHits;
+    ev.getByToken(tok_ecalEE_, ecalEEHits);
+    const PCaloHitContainer *SimHitResultEE = ecalEEHits.product();
+
+    for (std::vector<PCaloHit>::const_iterator SimHits = SimHitResultEE->begin(); SimHits != SimHitResultEE->end();
+         ++SimHits) {
+      EEDetId EEid = EEDetId(SimHits->id());
+
+      auto cellGeometry = geometry->getSubdetectorGeometry(EEid)->getGeometry(EEid);
+      double etaS = cellGeometry->getPosition().eta();
+      double phiS = cellGeometry->getPosition().phi();
+      double en = SimHits->energy();
+
+      double r = dR(eta_MC, phi_MC, etaS, phiS);
 
-  if (ietaMax != 0){            //If ietaMax == 0, there were no good HCAL SimHits     
-    meEnConeEtaProfile       ->Fill(double(ietaMax), HcalCone);    
-    meEnConeEtaProfile_E     ->Fill(double(ietaMax), EcalCone);
-    meEnConeEtaProfile_EH    ->Fill(double(ietaMax), HcalCone+EcalCone); 
+      if (r < partR)
+        EcalCone += en;
+    }
+  }  // eeHits_
+
+  if (ietaMax != 0) {  // If ietaMax == 0, there were no good HCAL SimHits
+    meEnConeEtaProfile->Fill(double(ietaMax), HcalCone);
+    meEnConeEtaProfile_E->Fill(double(ietaMax), EcalCone);
+    meEnConeEtaProfile_EH->Fill(double(ietaMax), HcalCone + EcalCone);
   }
-  
+
   nevtot++;
 }
 
-
-double HcalSimHitsValidation::dR(double eta1, double phi1, double eta2, double phi2) { 
+double HcalSimHitsValidation::dR(double eta1, double phi1, double eta2, double phi2) {
   double PI = 3.1415926535898;
-  double deltaphi= phi1 - phi2;
-  if( phi2 > phi1 ) { deltaphi= phi2 - phi1;}
-  if(deltaphi > PI) { deltaphi = 2.*PI - deltaphi;}
+  double deltaphi = phi1 - phi2;
+  if (phi2 > phi1) {
+    deltaphi = phi2 - phi1;
+  }
+  if (deltaphi > PI) {
+    deltaphi = 2. * PI - deltaphi;
+  }
   double deltaeta = eta2 - eta1;
-  double tmp = sqrt(deltaeta* deltaeta + deltaphi*deltaphi);
+  double tmp = sqrt(deltaeta * deltaeta + deltaphi * deltaphi);
   return tmp;
 }
 
 double HcalSimHitsValidation::phi12(double phi1, double en1, double phi2, double en2) {
   // weighted mean value of phi1 and phi2
-  
+
   double tmp;
   double PI = 3.1415926535898;
-  double a1 = phi1; double a2  = phi2;
+  double a1 = phi1;
+  double a2 = phi2;
 
-  if( a1 > 0.5*PI  && a2 < 0.) a2 += 2*PI; 
-  if( a2 > 0.5*PI  && a1 < 0.) a1 += 2*PI; 
-  tmp = (a1 * en1 + a2 * en2)/(en1 + en2);
-  if(tmp > PI) tmp -= 2.*PI; 
- 
-  return tmp;
+  if (a1 > 0.5 * PI && a2 < 0.)
+    a2 += 2 * PI;
+  if (a2 > 0.5 * PI && a1 < 0.)
+    a1 += 2 * PI;
+  tmp = (a1 * en1 + a2 * en2) / (en1 + en2);
+  if (tmp > PI)
+    tmp -= 2. * PI;
 
+  return tmp;
 }
 
 double HcalSimHitsValidation::dPhiWsign(double phi1, double phi2) {
   // clockwise      phi2 w.r.t phi1 means "+" phi distance
-  // anti-clockwise phi2 w.r.t phi1 means "-" phi distance 
+  // anti-clockwise phi2 w.r.t phi1 means "-" phi distance
 
   double PI = 3.1415926535898;
-  double a1 = phi1; double a2  = phi2;
-  double tmp =  a2 - a1;
-  if( a1*a2 < 0.) {
-    if(a1 > 0.5 * PI)  tmp += 2.*PI;
-    if(a2 > 0.5 * PI)  tmp -= 2.*PI;
+  double a1 = phi1;
+  double a2 = phi2;
+  double tmp = a2 - a1;
+  if (a1 * a2 < 0.) {
+    if (a1 > 0.5 * PI)
+      tmp += 2. * PI;
+    if (a2 > 0.5 * PI)
+      tmp -= 2. * PI;
   }
   return tmp;
-
 }
 
-
-
 DEFINE_FWK_MODULE(HcalSimHitsValidation);
-
diff --git a/Validation/HcalHits/src/SimG4HcalHitCluster.cc b/Validation/HcalHits/src/SimG4HcalHitCluster.cc
index bc9b3254906e6..33db5a48846d6 100644
--- a/Validation/HcalHits/src/SimG4HcalHitCluster.cc
+++ b/Validation/HcalHits/src/SimG4HcalHitCluster.cc
@@ -6,69 +6,66 @@
 
 #include "CLHEP/Vector/LorentzVector.h"
 
-SimG4HcalHitCluster::SimG4HcalHitCluster(): ec(0), etac(0), phic(0) {}
+SimG4HcalHitCluster::SimG4HcalHitCluster() : ec(0), etac(0), phic(0) {}
 
 SimG4HcalHitCluster::~SimG4HcalHitCluster() {}
 
-bool SimG4HcalHitCluster::operator<(const SimG4HcalHitCluster& cluster) const {
-  return (ec/cosh(etac) < cluster.e()/cosh(cluster.eta())) ? false : true ;
+bool SimG4HcalHitCluster::operator<(const SimG4HcalHitCluster &cluster) const {
+  return (ec / cosh(etac) < cluster.e() / cosh(cluster.eta())) ? false : true;
 }
 
-SimG4HcalHitCluster& SimG4HcalHitCluster::operator+=(const CaloHit& hit) {
-
+SimG4HcalHitCluster &SimG4HcalHitCluster::operator+=(const CaloHit &hit) {
   hitsc.push_back(hit);
- 
+
   if (ec == 0. && etac == 0. && phic == 0.) {
-    ec   = hit.e();
+    ec = hit.e();
     etac = hit.eta();
     phic = hit.phi();
-  } else {   
+  } else {
     // cluster px,py,pz
     double et = ec / my_cosh(etac);
     double px = et * cos(phic);
     double py = et * sin(phic);
-    double pz = et * my_sinh(etac); 
+    double pz = et * my_sinh(etac);
+
+    CLHEP::HepLorentzVector clusHLV(px, py, pz, ec);
 
-    CLHEP::HepLorentzVector clusHLV(px,py,pz,ec);
-      
     // hit px,py,pz
-    double eh   = hit.e();
+    double eh = hit.e();
     double etah = hit.eta();
     double phih = hit.phi();
     et = eh / my_cosh(etah);
     px = et * cos(phih);
     py = et * sin(phih);
-    pz = et * my_sinh(etah); 
-      
-    CLHEP::HepLorentzVector hitHLV(px,py,pz,eh);
-      
+    pz = et * my_sinh(etah);
+
+    CLHEP::HepLorentzVector hitHLV(px, py, pz, eh);
+
     // clus + hit
     clusHLV += hitHLV;
-      
-    double theta  = clusHLV.theta();
-    etac = -log(tan(theta/2.));
+
+    double theta = clusHLV.theta();
+    etac = -log(tan(theta / 2.));
     phic = clusHLV.phi();
-    ec   = clusHLV.t();
+    ec = clusHLV.t();
   }
 
   return *this;
 }
 
 double SimG4HcalHitCluster::collectEcalEnergyR() {
-
   double sum = 0.;
   std::vector<CaloHit>::iterator itr;
 
   for (itr = hitsc.begin(); itr < hitsc.end(); itr++) {
     if (itr->det() == 10 || itr->det() == 11 || itr->det() == 12) {
-      sum += itr->e(); 
-    }    
+      sum += itr->e();
+    }
   }
   return sum;
 }
 
-std::ostream& operator<<(std::ostream& os, const SimG4HcalHitCluster& cluster){
-  os << " SimG4HcalHitCluster:: E " << cluster.e() << "  eta " << cluster.eta()
-     << "  phi " << cluster.phi();
+std::ostream &operator<<(std::ostream &os, const SimG4HcalHitCluster &cluster) {
+  os << " SimG4HcalHitCluster:: E " << cluster.e() << "  eta " << cluster.eta() << "  phi " << cluster.phi();
   return os;
 }
diff --git a/Validation/HcalHits/src/SimG4HcalHitJetFinder.cc b/Validation/HcalHits/src/SimG4HcalHitJetFinder.cc
index 27a161361e44d..f620b6c5eeb46 100644
--- a/Validation/HcalHits/src/SimG4HcalHitJetFinder.cc
+++ b/Validation/HcalHits/src/SimG4HcalHitJetFinder.cc
@@ -2,113 +2,104 @@
 // File: SimG4HcalHitJetFinder.cc
 // Description: Jet finder class for SimG4HcalValidation
 ///////////////////////////////////////////////////////////////////////////////
-#include "Validation/HcalHits/interface/SimG4HcalHitJetFinder.h"
 #include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "Validation/HcalHits/interface/SimG4HcalHitJetFinder.h"
 
 #include <algorithm>
-#include <iostream>
 #include <cmath>
+#include <iostream>
 
-SimG4HcalHitJetFinder::SimG4HcalHitJetFinder(double cone): jetcone(cone) {}
+SimG4HcalHitJetFinder::SimG4HcalHitJetFinder(double cone) : jetcone(cone) {}
 
-SimG4HcalHitJetFinder::~SimG4HcalHitJetFinder() {
-  edm::LogInfo("ValidHcal") << "SimG4HcalHitJetFinder:: Deleting";
-}
+SimG4HcalHitJetFinder::~SimG4HcalHitJetFinder() { edm::LogInfo("ValidHcal") << "SimG4HcalHitJetFinder:: Deleting"; }
 
-void SimG4HcalHitJetFinder::setCone(double cone) { 
-  jetcone = cone;
-}   
+void SimG4HcalHitJetFinder::setCone(double cone) { jetcone = cone; }
 
-void SimG4HcalHitJetFinder::setInput(std::vector<CaloHit>* hhit) { 
-  input   = * hhit;
-}
+void SimG4HcalHitJetFinder::setInput(std::vector<CaloHit> *hhit) { input = *hhit; }
 
-std::vector<SimG4HcalHitCluster>* SimG4HcalHitJetFinder::getClusters(bool hcal_only){
-  clusvector.erase(clusvector.begin(),clusvector.end()); 
-  if (input.empty()) { 
+std::vector<SimG4HcalHitCluster> *SimG4HcalHitJetFinder::getClusters(bool hcal_only) {
+  clusvector.erase(clusvector.begin(), clusvector.end());
+  if (input.empty()) {
     return &clusvector;
   }
 
   std::vector<CaloHit>::iterator itr;
   for (itr = input.begin(); itr != input.end(); itr++) {
-    LogDebug("ValidHcal") << "HcalHitJetFinder::getClusters_1 - input :  e " 
-			  << itr->e() << "  eta " << itr->eta() << "  phi " 
-			  << itr->phi() << "  subdet " << itr->det();
+    LogDebug("ValidHcal") << "HcalHitJetFinder::getClusters_1 - input :  e " << itr->e() << "  eta " << itr->eta()
+                          << "  phi " << itr->phi() << "  subdet " << itr->det();
   }
 
-  sort(input.begin(),input.end()); // sort input in descending order
- 
+  sort(input.begin(), input.end());  // sort input in descending order
+
   for (itr = input.begin(); itr != input.end(); itr++) {
-    LogDebug("ValidHcal") << "HcalHitJetFinder::getClusters_2 - input :  e " 
-			  << itr->e() << "  eta " << itr->eta() << "  phi " 
-			  << itr->phi() << "  subdet " << itr->det();
+    LogDebug("ValidHcal") << "HcalHitJetFinder::getClusters_2 - input :  e " << itr->e() << "  eta " << itr->eta()
+                          << "  phi " << itr->phi() << "  subdet " << itr->det();
   }
 
-  std::vector<SimG4HcalHitCluster> temp;   // dummy container for clusters
+  std::vector<SimG4HcalHitCluster> temp;  // dummy container for clusters
 
   //  first input hit -> first cluster
 
-  CaloHit             hit;
+  CaloHit hit;
   SimG4HcalHitCluster cluster;
 
   std::vector<CaloHit>::iterator itr_hits;
 
   int j, first_seed = 0;
-  for (j=0, itr_hits = input.begin(); itr_hits != input.end();
-       j++, itr_hits++) {
-    int h_type = itr_hits->det(); //if desired HCAL hits (only) clusterfinding
-    if (((h_type == static_cast<int>(HcalBarrel) ||
-	  h_type == static_cast<int>(HcalEndcap) ||
-	  h_type == static_cast<int>(HcalForward)) && hcal_only) || 
-	(!hcal_only)) {
+  for (j = 0, itr_hits = input.begin(); itr_hits != input.end(); j++, itr_hits++) {
+    int h_type = itr_hits->det();  // if desired HCAL hits (only) clusterfinding
+    if (((h_type == static_cast<int>(HcalBarrel) || h_type == static_cast<int>(HcalEndcap) ||
+          h_type == static_cast<int>(HcalForward)) &&
+         hcal_only) ||
+        (!hcal_only)) {
       cluster += input[j];
       LogDebug("ValidHcal") << "HcalHitJetFinder:: First seed hit "
-			    << "..................\n" << (*itr_hits);
+                            << "..................\n"
+                            << (*itr_hits);
       first_seed = j;
       break;
     }
   }
-  
+
   temp.push_back(cluster);
-  
+
   std::vector<SimG4HcalHitCluster>::iterator itr_clus;
 
-  for (j=0, itr_hits = input.begin(); itr_hits != input.end();
-       j++, itr_hits++) {
-    int h_type = itr_hits->det(); //if desired HCAL hits (only) clusterfinding
-    if ((((h_type == static_cast<int>(HcalBarrel) ||
-	   h_type == static_cast<int>(HcalEndcap) ||
-	   h_type == static_cast<int>(HcalForward)) && hcal_only) || 
-	 (!hcal_only)) && (j != first_seed)) {
+  for (j = 0, itr_hits = input.begin(); itr_hits != input.end(); j++, itr_hits++) {
+    int h_type = itr_hits->det();  // if desired HCAL hits (only) clusterfinding
+    if ((((h_type == static_cast<int>(HcalBarrel) || h_type == static_cast<int>(HcalEndcap) ||
+           h_type == static_cast<int>(HcalForward)) &&
+          hcal_only) ||
+         (!hcal_only)) &&
+        (j != first_seed)) {
       LogDebug("ValidHcal") << "HcalHitJetFinder:: ........... Consider hit"
-			    << " ..................\n" << (*itr_hits);
-      
-      int incl = 0; // if the hit is included in one of clusters
-      
-      int iclus;  
-      for (itr_clus = temp.begin(), iclus = 0; itr_clus != temp.end();
-	   itr_clus++, iclus++) { 
-	
-	LogDebug("ValidHcal") << "HcalHitJetFinder::=======> Cluster " 
-			      << iclus << "\n" << (*itr_clus);
-	
-	double d = rDist(&(*itr_clus), &(*itr_hits));
-	if (d < jetcone) {
-	  LogDebug("ValidHcal") << "HcalHitJetFinder:: -> associated ... ";
-	  temp[iclus] += *itr_hits;
-	  incl = 1;
-	  break;  
-	}
+                            << " ..................\n"
+                            << (*itr_hits);
+
+      int incl = 0;  // if the hit is included in one of clusters
+
+      int iclus;
+      for (itr_clus = temp.begin(), iclus = 0; itr_clus != temp.end(); itr_clus++, iclus++) {
+        LogDebug("ValidHcal") << "HcalHitJetFinder::=======> Cluster " << iclus << "\n" << (*itr_clus);
+
+        double d = rDist(&(*itr_clus), &(*itr_hits));
+        if (d < jetcone) {
+          LogDebug("ValidHcal") << "HcalHitJetFinder:: -> associated ... ";
+          temp[iclus] += *itr_hits;
+          incl = 1;
+          break;
+        }
       }
-      
+
       // to here jumps "break"
       if (incl == 0) {
-	SimG4HcalHitCluster cl;
-	cl += *itr_hits;
-	temp.push_back(cl);
-	LogDebug("ValidHcal") << "HcalHitJetFinder:: ************ NEW CLUSTER"
-			      << " !\n" << cl;
+        SimG4HcalHitCluster cl;
+        cl += *itr_hits;
+        temp.push_back(cl);
+        LogDebug("ValidHcal") << "HcalHitJetFinder:: ************ NEW CLUSTER"
+                              << " !\n"
+                              << cl;
       }
     }
   }
@@ -117,35 +108,30 @@ std::vector<SimG4HcalHitCluster>* SimG4HcalHitJetFinder::getClusters(bool hcal_o
   return &clusvector;
 }
 
-double SimG4HcalHitJetFinder::rDist(const SimG4HcalHitCluster* cluster, 
-				    const CaloHit* hit) const {
-
+double SimG4HcalHitJetFinder::rDist(const SimG4HcalHitCluster *cluster, const CaloHit *hit) const {
   double etac = cluster->eta();
   double phic = cluster->phi();
-  
+
   double etah = hit->eta();
   double phih = hit->phi();
 
   return rDist(etac, phic, etah, phih);
 }
 
-
-double SimG4HcalHitJetFinder::rDist(const double etac,const double phic,
-				    const double etah,const double phih) const{
-
+double SimG4HcalHitJetFinder::rDist(const double etac, const double phic, const double etah, const double phih) const {
   double delta_eta = etac - etah;
   double delta_phi = phic - phih;
 
-  if (phic < phih)      delta_phi = phih - phic;
-  if (delta_phi > M_PI) delta_phi = 2*M_PI - delta_phi;
+  if (phic < phih)
+    delta_phi = phih - phic;
+  if (delta_phi > M_PI)
+    delta_phi = 2 * M_PI - delta_phi;
 
   double tmp = sqrt(delta_eta * delta_eta + delta_phi * delta_phi);
 
   LogDebug("ValidHcal") << "HcalHitJetFinder::rDist:\n"
-			<< " Clus. eta, phi = " << etac << " " << phic << "\n"
-			<< " hit   eta, phi = " << etah << " " << phih 
-			<< " rDist = " << tmp;
+                        << " Clus. eta, phi = " << etac << " " << phic << "\n"
+                        << " hit   eta, phi = " << etah << " " << phih << " rDist = " << tmp;
 
   return tmp;
 }
-
diff --git a/Validation/HcalHits/src/SimG4HcalValidation.cc b/Validation/HcalHits/src/SimG4HcalValidation.cc
index 1cb9a8cef463d..1e57576c27dcc 100644
--- a/Validation/HcalHits/src/SimG4HcalValidation.cc
+++ b/Validation/HcalHits/src/SimG4HcalValidation.cc
@@ -4,90 +4,82 @@
 ///////////////////////////////////////////////////////////////////////////////
 #include "Validation/HcalHits/interface/SimG4HcalValidation.h"
 
+#include "SimG4Core/Notification/interface/BeginOfEvent.h"
 #include "SimG4Core/Notification/interface/BeginOfJob.h"
 #include "SimG4Core/Notification/interface/BeginOfRun.h"
-#include "SimG4Core/Notification/interface/BeginOfEvent.h"
 #include "SimG4Core/Notification/interface/EndOfEvent.h"
 
 // to retreive hits
 #include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
-#include "SimG4CMS/Calo/interface/HCalSD.h"
+#include "DataFormats/Math/interface/Point3D.h"
 #include "SimG4CMS/Calo/interface/CaloG4Hit.h"
 #include "SimG4CMS/Calo/interface/CaloG4HitCollection.h"
-#include "DataFormats/Math/interface/Point3D.h"
+#include "SimG4CMS/Calo/interface/HCalSD.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "Geometry/Records/interface/HcalSimNumberingRecord.h"
 #include "Geometry/HcalCommonData/interface/HcalDDDSimConstants.h"
+#include "Geometry/Records/interface/HcalSimNumberingRecord.h"
 
+#include "CLHEP/Units/GlobalPhysicalConstants.h"
+#include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "G4HCofThisEvent.hh"
 #include "G4SDManager.hh"
 #include "G4Step.hh"
 #include "G4Track.hh"
 #include "G4VProcess.hh"
-#include "G4HCofThisEvent.hh"
-#include "CLHEP/Units/GlobalSystemOfUnits.h"
-#include "CLHEP/Units/GlobalPhysicalConstants.h"
 #include <cmath>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
-SimG4HcalValidation::SimG4HcalValidation(const edm::ParameterSet &p): 
-  jetf(nullptr), numberingFromDDD(nullptr), org(nullptr) {
-
+SimG4HcalValidation::SimG4HcalValidation(const edm::ParameterSet &p)
+    : jetf(nullptr), numberingFromDDD(nullptr), org(nullptr) {
   edm::ParameterSet m_Anal = p.getParameter<edm::ParameterSet>("SimG4HcalValidation");
-  infolevel     = m_Anal.getParameter<int>("InfoLevel");
-  hcalOnly      = m_Anal.getParameter<bool>("HcalClusterOnly");
+  infolevel = m_Anal.getParameter<int>("InfoLevel");
+  hcalOnly = m_Anal.getParameter<bool>("HcalClusterOnly");
   applySampling = m_Anal.getParameter<bool>("HcalSampling");
-  coneSize      = m_Anal.getParameter<double>("ConeSize");
+  coneSize = m_Anal.getParameter<double>("ConeSize");
   ehitThreshold = m_Anal.getParameter<double>("EcalHitThreshold");
   hhitThreshold = m_Anal.getParameter<double>("HcalHitThreshold");
-  timeLowlim    = m_Anal.getParameter<double>("TimeLowLimit");
-  timeUplim     = m_Anal.getParameter<double>("TimeUpLimit");
-  jetThreshold  = m_Anal.getParameter<double>("JetThreshold");
-  eta0          = m_Anal.getParameter<double>("Eta0");
-  phi0          = m_Anal.getParameter<double>("Phi0");
-  names         = m_Anal.getParameter<std::vector<std::string> >("Names");
-  labelLayer    = m_Anal.getUntrackedParameter<std::string>("LabelLayerInfo","HcalInfoLayer");
-  labelNxN      = m_Anal.getUntrackedParameter<std::string>("LabelNxNInfo","HcalInfoNxN");
-  labelJets     = m_Anal.getUntrackedParameter<std::string>("LabelJetsInfo","HcalInfoJets");
+  timeLowlim = m_Anal.getParameter<double>("TimeLowLimit");
+  timeUplim = m_Anal.getParameter<double>("TimeUpLimit");
+  jetThreshold = m_Anal.getParameter<double>("JetThreshold");
+  eta0 = m_Anal.getParameter<double>("Eta0");
+  phi0 = m_Anal.getParameter<double>("Phi0");
+  names = m_Anal.getParameter<std::vector<std::string>>("Names");
+  labelLayer = m_Anal.getUntrackedParameter<std::string>("LabelLayerInfo", "HcalInfoLayer");
+  labelNxN = m_Anal.getUntrackedParameter<std::string>("LabelNxNInfo", "HcalInfoNxN");
+  labelJets = m_Anal.getUntrackedParameter<std::string>("LabelJetsInfo", "HcalInfoJets");
 
   produces<PHcalValidInfoLayer>(labelLayer);
-  if (infolevel > 0) produces<PHcalValidInfoNxN>(labelNxN);
-  if (infolevel > 1) produces<PHcalValidInfoJets>(labelJets);
+  if (infolevel > 0)
+    produces<PHcalValidInfoNxN>(labelNxN);
+  if (infolevel > 1)
+    produces<PHcalValidInfoJets>(labelJets);
 
   edm::LogInfo("ValidHcal") << "HcalTestAnalysis:: Initialised as observer of "
-			    << "begin/end events and of G4step with Parameter "
-			    << "values: \n\tInfoLevel     = " << infolevel
-			    << "\n\thcalOnly      = " << hcalOnly 
-			    << "\n\tapplySampling = " << applySampling 
-			    << "\n\tconeSize      = " << coneSize
-			    << "\n\tehitThreshold = " << ehitThreshold 
-			    << "\n\thhitThreshold = " << hhitThreshold
-			    << "\n\tttimeLowlim   = " << timeLowlim
-			    << "\n\tttimeUplim    = " << timeUplim
-			    << "\n\teta0          = " << eta0
-			    << "\n\tphi0          = " << phi0
-			    << "\nLabels (Layer): " << labelLayer
-			    << " (NxN): " << labelNxN << " (Jets): "
-			    << labelJets;
+                            << "begin/end events and of G4step with Parameter "
+                            << "values: \n\tInfoLevel     = " << infolevel << "\n\thcalOnly      = " << hcalOnly
+                            << "\n\tapplySampling = " << applySampling << "\n\tconeSize      = " << coneSize
+                            << "\n\tehitThreshold = " << ehitThreshold << "\n\thhitThreshold = " << hhitThreshold
+                            << "\n\tttimeLowlim   = " << timeLowlim << "\n\tttimeUplim    = " << timeUplim
+                            << "\n\teta0          = " << eta0 << "\n\tphi0          = " << phi0
+                            << "\nLabels (Layer): " << labelLayer << " (NxN): " << labelNxN << " (Jets): " << labelJets;
 
   init();
-} 
-   
-SimG4HcalValidation::~SimG4HcalValidation() {
+}
 
+SimG4HcalValidation::~SimG4HcalValidation() {
   edm::LogInfo("ValidHcal") << "\n -------->  Total number of selected entries"
-			    << " : " << count << "\nPointers:: JettFinder " 
-			    << jetf << ", Numbering Scheme " << org 
-			    << " and FromDDD " << numberingFromDDD;
-  if (jetf)   {
+                            << " : " << count << "\nPointers:: JettFinder " << jetf << ", Numbering Scheme " << org
+                            << " and FromDDD " << numberingFromDDD;
+  if (jetf) {
     edm::LogInfo("ValidHcal") << "Delete Jetfinder";
     delete jetf;
-    jetf  = nullptr;
+    jetf = nullptr;
   }
   if (numberingFromDDD) {
     edm::LogInfo("ValidHcal") << "Delete HcalNumberingFromDDD";
@@ -96,132 +88,123 @@ SimG4HcalValidation::~SimG4HcalValidation() {
   }
 }
 
-void SimG4HcalValidation::produce(edm::Event& e, const edm::EventSetup&) {
-
+void SimG4HcalValidation::produce(edm::Event &e, const edm::EventSetup &) {
   std::unique_ptr<PHcalValidInfoLayer> productLayer(new PHcalValidInfoLayer);
   layerAnalysis(*productLayer);
-  e.put(std::move(productLayer),labelLayer);
+  e.put(std::move(productLayer), labelLayer);
 
   if (infolevel > 0) {
     std::unique_ptr<PHcalValidInfoNxN> productNxN(new PHcalValidInfoNxN);
     nxNAnalysis(*productNxN);
-    e.put(std::move(productNxN),labelNxN);
+    e.put(std::move(productNxN), labelNxN);
   }
 
   if (infolevel > 1) {
     std::unique_ptr<PHcalValidInfoJets> productJets(new PHcalValidInfoJets);
     jetAnalysis(*productJets);
-    e.put(std::move(productJets),labelJets);
+    e.put(std::move(productJets), labelJets);
   }
 }
 
 //==================================================================== per RUN
 void SimG4HcalValidation::init() {
+  float sHB[4] = {117., 117., 178., 217.};
+  float sHE[3] = {178., 178., 178.};
+  float sHF[3] = {2.84, 2.09, 0.};  //
 
-  float sHB[4] = { 117., 117., 178., 217.};
-  float sHE[3] = { 178., 178., 178.};
-  float sHF[3] = { 2.84, 2.09, 0.};     //
-
-  float deta[4] = { 0.0435, 0.1305, 0.2175, 0.3045 };
-  float dphi[4] = { 0.0436, 0.1309, 0.2182, 0.3054 };
+  float deta[4] = {0.0435, 0.1305, 0.2175, 0.3045};
+  float dphi[4] = {0.0436, 0.1309, 0.2182, 0.3054};
 
-  int i=0;
-  for (i = 0; i < 4; i++) { 
+  int i = 0;
+  for (i = 0; i < 4; i++) {
     scaleHB.push_back(sHB[i]);
   }
-  for (i = 0; i < 3; i++) { 
+  for (i = 0; i < 3; i++) {
     scaleHE.push_back(sHE[i]);
   }
-  for (i = 0; i < 3; i++) { 
+  for (i = 0; i < 3; i++) {
     scaleHF.push_back(sHF[i]);
   }
 
   // window steps;
-  for(i = 0; i < 4; i++) { 
+  for (i = 0; i < 4; i++) {
     dEta.push_back(deta[i]);
     dPhi.push_back(dphi[i]);
   }
 
   // jetfinder conse size setting
-  jetf   = new SimG4HcalHitJetFinder(coneSize);
+  jetf = new SimG4HcalHitJetFinder(coneSize);
 
-  // counter 
+  // counter
   count = 0;
-  
 }
 
-void SimG4HcalValidation::update(const BeginOfJob * job) {
-
+void SimG4HcalValidation::update(const BeginOfJob *job) {
   // Numbering From DDD
-  edm::ESHandle<HcalDDDSimConstants>    hdc;
+  edm::ESHandle<HcalDDDSimConstants> hdc;
   (*job)()->get<HcalSimNumberingRecord>().get(hdc);
   const HcalDDDSimConstants *hcons = hdc.product();
   edm::LogInfo("ValidHcal") << "HcalTestAnalysis:: Initialise "
-			    << "HcalNumberingFromDDD";
+                            << "HcalNumberingFromDDD";
   numberingFromDDD = new HcalNumberingFromDDD(hcons);
 
   // Numbering scheme
-  org              = new HcalTestNumberingScheme(false);
-
+  org = new HcalTestNumberingScheme(false);
 }
 
-void SimG4HcalValidation::update(const BeginOfRun * run) {
-
+void SimG4HcalValidation::update(const BeginOfRun *run) {
   int irun = (*run)()->GetRunID();
-  
-  edm::LogInfo("ValidHcal") <<" =====> Begin of Run = " << irun;
- 
-  std::string  sdname = names[0];
-  G4SDManager* sd     = G4SDManager::GetSDMpointerIfExist();
+
+  edm::LogInfo("ValidHcal") << " =====> Begin of Run = " << irun;
+
+  std::string sdname = names[0];
+  G4SDManager *sd = G4SDManager::GetSDMpointerIfExist();
   if (sd != nullptr) {
-    G4VSensitiveDetector* aSD = sd->FindSensitiveDetector(sdname);
-    if (aSD==nullptr) {
+    G4VSensitiveDetector *aSD = sd->FindSensitiveDetector(sdname);
+    if (aSD == nullptr) {
       edm::LogWarning("ValidHcal") << "SimG4HcalValidation::beginOfRun: No SD"
-				   << " with name " << sdname << " in this "
-				   << "Setup";
+                                   << " with name " << sdname << " in this "
+                                   << "Setup";
     } else {
-      HCalSD* theCaloSD = dynamic_cast<HCalSD*>(aSD);
+      HCalSD *theCaloSD = dynamic_cast<HCalSD *>(aSD);
       edm::LogInfo("ValidHcal") << "SimG4HcalValidation::beginOfRun: Finds SD"
-				<< "with name " << theCaloSD->GetName() 
-				<< " in this Setup";
+                                << "with name " << theCaloSD->GetName() << " in this Setup";
       if (org) {
         theCaloSD->setNumberingScheme(org);
         edm::LogInfo("ValidHcal") << "SimG4HcalValidation::beginOfRun: set a "
-				  << "new numbering scheme";
+                                  << "new numbering scheme";
       }
     }
   } else {
     edm::LogWarning("ValidHcal") << "SimG4HcalValidation::beginOfRun: Could "
-				 << "not get SD Manager!";
+                                 << "not get SD Manager!";
   }
-
 }
 
 //=================================================================== per EVENT
-void SimG4HcalValidation::update(const BeginOfEvent * evt) {
- 
+void SimG4HcalValidation::update(const BeginOfEvent *evt) {
   int i = 0;
   edepEB = edepEE = edepHB = edepHE = edepHO = 0.;
-  for (i = 0; i < 5;  i++) edepd[i] = 0.;
-  for (i = 0; i < 20; i++) edepl[i] = 0.;
-  vhitec = vhithc = enEcal = enHcal = 0;  
-  // Cache reset  
+  for (i = 0; i < 5; i++)
+    edepd[i] = 0.;
+  for (i = 0; i < 20; i++)
+    edepl[i] = 0.;
+  vhitec = vhithc = enEcal = enHcal = 0;
+  // Cache reset
   clear();
 
   int iev = (*evt)()->GetEventID();
-  LogDebug("ValidHcal") << "SimG4HcalValidation: =====> Begin of event = "
-			<< iev;
+  LogDebug("ValidHcal") << "SimG4HcalValidation: =====> Begin of event = " << iev;
 }
 
 //=================================================================== each STEP
-void SimG4HcalValidation::update(const G4Step * aStep) {
-
+void SimG4HcalValidation::update(const G4Step *aStep) {
   if (aStep != nullptr) {
-    G4VPhysicalVolume* curPV  = aStep->GetPreStepPoint()->GetPhysicalVolume();
+    G4VPhysicalVolume *curPV = aStep->GetPreStepPoint()->GetPhysicalVolume();
     G4String name = curPV->GetName();
-    name.assign(name,0,3);
+    name.assign(name, 0, 3);
     double edeposit = aStep->GetTotalEnergyDeposit();
-    int    layer=-1,  depth=-1;
+    int layer = -1, depth = -1;
     if (name == "EBR") {
       depth = 0;
       edepEB += edeposit;
@@ -229,51 +212,51 @@ void SimG4HcalValidation::update(const G4Step * aStep) {
       depth = 0;
       edepEE += edeposit;
     } else if (name == "HBS") {
-      layer = (curPV->GetCopyNo()/10)%100;
-      depth = (curPV->GetCopyNo())%10 + 1;
+      layer = (curPV->GetCopyNo() / 10) % 100;
+      depth = (curPV->GetCopyNo()) % 10 + 1;
       if (depth > 0 && depth < 4 && layer >= 0 && layer < 17) {
-	edepHB += edeposit;
+        edepHB += edeposit;
       } else {
-	edm::LogWarning("ValidHcal") << "SimG4HcalValidation:Error " 
-				     << curPV->GetName() << curPV->GetCopyNo();
-	depth = -1; layer = -1;
+        edm::LogWarning("ValidHcal") << "SimG4HcalValidation:Error " << curPV->GetName() << curPV->GetCopyNo();
+        depth = -1;
+        layer = -1;
       }
     } else if (name == "HES") {
-      layer = (curPV->GetCopyNo()/10)%100;
-      depth = (curPV->GetCopyNo())%10 + 1;
+      layer = (curPV->GetCopyNo() / 10) % 100;
+      depth = (curPV->GetCopyNo()) % 10 + 1;
       if (depth > 0 && depth < 3 && layer >= 0 && layer < 19) {
-	edepHE += edeposit;
+        edepHE += edeposit;
       } else {
-	edm::LogWarning("ValidHcal") << "SimG4HcalValidation:Error " 
-				     << curPV->GetName() << curPV->GetCopyNo();
-	depth = -1; layer = -1;
+        edm::LogWarning("ValidHcal") << "SimG4HcalValidation:Error " << curPV->GetName() << curPV->GetCopyNo();
+        depth = -1;
+        layer = -1;
       }
     } else if (name == "HTS") {
-      layer = (curPV->GetCopyNo()/10)%100;
-      depth = (curPV->GetCopyNo())%10 + 1;
+      layer = (curPV->GetCopyNo() / 10) % 100;
+      depth = (curPV->GetCopyNo()) % 10 + 1;
       if (depth > 3 && depth < 5 && layer >= 17 && layer < 20) {
-	edepHO += edeposit;
-       } else {
-	 edm::LogWarning("ValidHcal") << "SimG4HcalValidation:Error " 
-				      << curPV->GetName() <<curPV->GetCopyNo();
-	 depth = -1; layer = -1;
-       }
+        edepHO += edeposit;
+      } else {
+        edm::LogWarning("ValidHcal") << "SimG4HcalValidation:Error " << curPV->GetName() << curPV->GetCopyNo();
+        depth = -1;
+        layer = -1;
+      }
     }
-    if (depth >= 0 && depth < 5)  edepd[depth] += edeposit;
-    if (layer >= 0 && layer < 20) edepl[layer] += edeposit;
+    if (depth >= 0 && depth < 5)
+      edepd[depth] += edeposit;
+    if (layer >= 0 && layer < 20)
+      edepl[layer] += edeposit;
 
     if (layer >= 0 && layer < 20) {
-      LogDebug("ValidHcal") << "SimG4HcalValidation:: G4Step: " << name 
-			    << " Layer " << std::setw(3) << layer << " Depth "
-			    << std::setw(2) << depth << " Edep " <<std::setw(6)
-			    << edeposit/MeV << " MeV";
+      LogDebug("ValidHcal") << "SimG4HcalValidation:: G4Step: " << name << " Layer " << std::setw(3) << layer
+                            << " Depth " << std::setw(2) << depth << " Edep " << std::setw(6) << edeposit / MeV
+                            << " MeV";
     }
   }
 }
 
 //================================================================ End of EVENT
-void SimG4HcalValidation::update(const EndOfEvent * evt) {
-
+void SimG4HcalValidation::update(const EndOfEvent *evt) {
   count++;
 
   // Fill hits cache for jetfinding etc.
@@ -282,513 +265,460 @@ void SimG4HcalValidation::update(const EndOfEvent * evt) {
 }
 
 //---------------------------------------------------
-void SimG4HcalValidation::fill(const EndOfEvent * evt) {
-
-  LogDebug("ValidHcal") << "SimG4HcalValidation:Fill event " 
-			<< (*evt)()->GetEventID();
-  
-  // access to the G4 hit collections 
-  G4HCofThisEvent* allHC = (*evt)()->GetHCofThisEvent();
-  
-  int nhc = 0, j = 0;    
- 
+void SimG4HcalValidation::fill(const EndOfEvent *evt) {
+  LogDebug("ValidHcal") << "SimG4HcalValidation:Fill event " << (*evt)()->GetEventID();
+
+  // access to the G4 hit collections
+  G4HCofThisEvent *allHC = (*evt)()->GetHCofThisEvent();
+
+  int nhc = 0, j = 0;
+
   // Hcal
   int HCHCid = G4SDManager::GetSDMpointer()->GetCollectionID(names[0]);
-  CaloG4HitCollection* theHCHC = (CaloG4HitCollection*) allHC->GetHC(HCHCid);
-  LogDebug("ValidHcal") << "SimG4HcalValidation :: Hit Collection for " 
-			<< names[0] << " of ID " << HCHCid <<" is obtained at "
-			<< theHCHC;
+  CaloG4HitCollection *theHCHC = (CaloG4HitCollection *)allHC->GetHC(HCHCid);
+  LogDebug("ValidHcal") << "SimG4HcalValidation :: Hit Collection for " << names[0] << " of ID " << HCHCid
+                        << " is obtained at " << theHCHC;
   if (HCHCid >= 0 && theHCHC != nullptr) {
     for (j = 0; j < theHCHC->entries(); j++) {
+      CaloG4Hit *aHit = (*theHCHC)[j];
+
+      double e = aHit->getEnergyDeposit() / GeV;
+      double time = aHit->getTimeSlice();
+
+      math::XYZPoint pos = aHit->getPosition();
+      double theta = pos.theta();
+      double eta = -log(tan(theta * 0.5));
+      double phi = pos.phi();
 
-      CaloG4Hit* aHit = (*theHCHC)[j]; 
-    
-      double e        = aHit->getEnergyDeposit()/GeV;
-      double time     = aHit->getTimeSlice();
-      
-      math::XYZPoint pos  = aHit->getPosition();
-      double theta    = pos.theta();
-      double   eta    = -log(tan(theta * 0.5));
-      double   phi    = pos.phi();
-    
       uint32_t unitID = aHit->getUnitID();
       int subdet, zside, layer, etaIndex, phiIndex, lay;
-      org->unpackHcalIndex(unitID,subdet,zside,layer,etaIndex,phiIndex,lay);
+      org->unpackHcalIndex(unitID, subdet, zside, layer, etaIndex, phiIndex, lay);
 
       // some logic to separate HO ...
       layer--;
-      std::string det =  "HB";
+      std::string det = "HB";
       if (subdet == static_cast<int>(HcalForward)) {
-	det = "HF";
-	uint16_t depth = aHit->getDepth();
-	if (depth != 0) { layer += 2; lay += 2; }
-	if      (layer == 1) vhithc += e;
-	else if (layer == 0) vhitec += e;
-	else
-	  edm::LogInfo("ValidHcal") << "SimG4HcalValidation::HitPMT " 
-				    << subdet << " " << (2*zside-1)*etaIndex 
-				    << " " << phiIndex << " " << layer+1 
-				    << " R " << pos.rho() << " Phi " << phi/deg
-				    << " Edep " << e << " Time " << time;
+        det = "HF";
+        uint16_t depth = aHit->getDepth();
+        if (depth != 0) {
+          layer += 2;
+          lay += 2;
+        }
+        if (layer == 1)
+          vhithc += e;
+        else if (layer == 0)
+          vhitec += e;
+        else
+          edm::LogInfo("ValidHcal") << "SimG4HcalValidation::HitPMT " << subdet << " " << (2 * zside - 1) * etaIndex
+                                    << " " << phiIndex << " " << layer + 1 << " R " << pos.rho() << " Phi " << phi / deg
+                                    << " Edep " << e << " Time " << time;
       } else if (subdet == static_cast<int>(HcalEndcap)) {
-	if (etaIndex <= 20) {
-	  det  = "HES";
-	} else {
-	  det = "HED";
-	}
+        if (etaIndex <= 20) {
+          det = "HES";
+        } else {
+          det = "HED";
+        }
       }
-      LogDebug("ValidHcal") << "SimG4HcalValidation::debugFill Hcal " 
-			    << det << " layer " << std::setw(2) << layer 
-			    << " lay " << std::setw(2) << lay << " time " 
-			    << std::setw(6) << time << " theta " 
-			    << std::setw(8) << theta << " eta " << std::setw(8)
-			    << eta << " phi " << std::setw(8) << phi << " e " 
-			    << std::setw(8) << e << " ID 0x" << std::hex
-			    << unitID << " ID dec " << std::dec << (int)unitID;
+      LogDebug("ValidHcal") << "SimG4HcalValidation::debugFill Hcal " << det << " layer " << std::setw(2) << layer
+                            << " lay " << std::setw(2) << lay << " time " << std::setw(6) << time << " theta "
+                            << std::setw(8) << theta << " eta " << std::setw(8) << eta << " phi " << std::setw(8) << phi
+                            << " e " << std::setw(8) << e << " ID 0x" << std::hex << unitID << " ID dec " << std::dec
+                            << (int)unitID;
 
       // if desired, apply sampling factors in HCAL !!!
-      if (applySampling) e *= getHcalScale(det,layer);    
-
-      //    filter on time & energy 
-      if (time >= timeLowlim && time <= timeUplim && e > hhitThreshold ) {
-	enHcal += e;
-	CaloHit ahit(subdet,lay,e,eta,phi,time,unitID);
-	hitcache.push_back(ahit);    // fill cache
-	++nhc;
-      }    
+      if (applySampling)
+        e *= getHcalScale(det, layer);
+
+      //    filter on time & energy
+      if (time >= timeLowlim && time <= timeUplim && e > hhitThreshold) {
+        enHcal += e;
+        CaloHit ahit(subdet, lay, e, eta, phi, time, unitID);
+        hitcache.push_back(ahit);  // fill cache
+        ++nhc;
+      }
     }
   }
   LogDebug("ValidHcal") << "SimG4HcalValidation:: HCAL hits : " << nhc;
 
-  if (!hcalOnly) { //--------------------------  ECAL hits --------------------
+  if (!hcalOnly) {  //--------------------------  ECAL hits --------------------
     int ndets = names.size();
-    if (ndets > 3) ndets = 3;
+    if (ndets > 3)
+      ndets = 3;
     for (int idty = 1; idty < ndets; idty++) {
-      std::string          det = "EB";
-      if      (idty ==  2) det = "EE";
-      else if (idty > 2)   det = "ES";
+      std::string det = "EB";
+      if (idty == 2)
+        det = "EE";
+      else if (idty > 2)
+        det = "ES";
 
-      int nec    = 0;
+      int nec = 0;
       int ECHCid = G4SDManager::GetSDMpointer()->GetCollectionID(names[idty]);
-      CaloG4HitCollection* theECHC =(CaloG4HitCollection*)allHC->GetHC(ECHCid);
-      LogDebug("ValidHcal") << "SimG4HcalValidation:: Hit Collection for "
-			    << names[idty] << " of ID " << ECHCid 
-			    << " is obtained at " << theECHC;
+      CaloG4HitCollection *theECHC = (CaloG4HitCollection *)allHC->GetHC(ECHCid);
+      LogDebug("ValidHcal") << "SimG4HcalValidation:: Hit Collection for " << names[idty] << " of ID " << ECHCid
+                            << " is obtained at " << theECHC;
       if (ECHCid >= 0 && theECHC != nullptr) {
-	for (j = 0; j < theECHC->entries(); j++) {
-
-	  CaloG4Hit* aHit = (*theECHC)[j]; 
-    
-	  double e        = aHit->getEnergyDeposit()/GeV;
-	  double time     = aHit->getTimeSlice();
-      
-	  math::XYZPoint pos  = aHit->getPosition();
-	  double theta    = pos.theta();
-	  double   eta    = -log(tan(theta/2.));
-	  double   phi    = pos.phi();
-	  HcalNumberingFromDDD::HcalID id = numberingFromDDD->unitID(eta,phi,1,1);
-	  uint32_t unitID = org->getUnitID(id);
-	  int subdet, zside, layer, ieta, iphi, lay;
-	  org->unpackHcalIndex(unitID,subdet,zside,layer,ieta,iphi,lay);
-	  subdet = idty+9;
-	  layer  = 0;
-	  unitID = org->packHcalIndex(subdet,zside,layer,ieta,iphi,lay);
-	  
-	  //    filter on time & energy 
-	  if (time >= timeLowlim && time <= timeUplim && e > ehitThreshold ) {
-	    enEcal += e;
-	    CaloHit ahit(subdet,lay,e,eta,phi,time,unitID);
-	    hitcache.push_back(ahit);    // fill cache
-	    ++nec;
-	  }
-
-	  LogDebug("ValidHcal") << "SimG4HcalValidation::debugFill Ecal " 
-				<< det << " layer " << std::setw(2) << layer 
-				<< " lay " << std::setw(2) << lay << " time " 
-				<< std::setw(6) << time << " theta " 
-				<< std::setw(8) << theta << " eta " 
-				<< std::setw(8) << eta  << " phi " 
-				<< std::setw(8) << phi << " e " << std::setw(8)
-				<< e << " ID 0x" << std::hex << unitID 
-				<< " ID dec " << std::dec << (int)unitID;
-
-	}
+        for (j = 0; j < theECHC->entries(); j++) {
+          CaloG4Hit *aHit = (*theECHC)[j];
+
+          double e = aHit->getEnergyDeposit() / GeV;
+          double time = aHit->getTimeSlice();
+
+          math::XYZPoint pos = aHit->getPosition();
+          double theta = pos.theta();
+          double eta = -log(tan(theta / 2.));
+          double phi = pos.phi();
+          HcalNumberingFromDDD::HcalID id = numberingFromDDD->unitID(eta, phi, 1, 1);
+          uint32_t unitID = org->getUnitID(id);
+          int subdet, zside, layer, ieta, iphi, lay;
+          org->unpackHcalIndex(unitID, subdet, zside, layer, ieta, iphi, lay);
+          subdet = idty + 9;
+          layer = 0;
+          unitID = org->packHcalIndex(subdet, zside, layer, ieta, iphi, lay);
+
+          //    filter on time & energy
+          if (time >= timeLowlim && time <= timeUplim && e > ehitThreshold) {
+            enEcal += e;
+            CaloHit ahit(subdet, lay, e, eta, phi, time, unitID);
+            hitcache.push_back(ahit);  // fill cache
+            ++nec;
+          }
+
+          LogDebug("ValidHcal") << "SimG4HcalValidation::debugFill Ecal " << det << " layer " << std::setw(2) << layer
+                                << " lay " << std::setw(2) << lay << " time " << std::setw(6) << time << " theta "
+                                << std::setw(8) << theta << " eta " << std::setw(8) << eta << " phi " << std::setw(8)
+                                << phi << " e " << std::setw(8) << e << " ID 0x" << std::hex << unitID << " ID dec "
+                                << std::dec << (int)unitID;
+        }
       }
 
-      LogDebug("ValidHcal") << "SimG4HcalValidation:: " << det << " hits : "
-			    << nec;
+      LogDebug("ValidHcal") << "SimG4HcalValidation:: " << det << " hits : " << nec;
     }
-  } // end of if(!hcalOnly)
-
+  }  // end of if(!hcalOnly)
 }
 
-void SimG4HcalValidation::layerAnalysis(PHcalValidInfoLayer& product) {
-
+void SimG4HcalValidation::layerAnalysis(PHcalValidInfoLayer &product) {
   int i = 0;
   LogDebug("ValidHcal") << "\n ===>>> SimG4HcalValidation: Energy deposit "
-			<< "in MeV\n at EB : " << std::setw(6) << edepEB/MeV 
-			<< "\n at EE : " << std::setw(6) << edepEE/MeV 
-			<< "\n at HB : " << std::setw(6) << edepHB/MeV 
-			<< "\n at HE : " << std::setw(6) << edepHE/MeV 
-			<< "\n at HO : " << std::setw(6) << edepHO/MeV 
-			<< "\n ---- SimG4HcalValidation: Energy deposit in";
-  for (i = 0; i < 5; i++) 
-    LogDebug("ValidHcal") << " Depth " << std::setw(2) << i << " E " 
-			  << std::setw(8) << edepd[i]/MeV << " MeV";
+                        << "in MeV\n at EB : " << std::setw(6) << edepEB / MeV << "\n at EE : " << std::setw(6)
+                        << edepEE / MeV << "\n at HB : " << std::setw(6) << edepHB / MeV
+                        << "\n at HE : " << std::setw(6) << edepHE / MeV << "\n at HO : " << std::setw(6)
+                        << edepHO / MeV << "\n ---- SimG4HcalValidation: Energy deposit in";
+  for (i = 0; i < 5; i++)
+    LogDebug("ValidHcal") << " Depth " << std::setw(2) << i << " E " << std::setw(8) << edepd[i] / MeV << " MeV";
   LogDebug("ValidHcal") << " ---- SimG4HcalValidation: Energy deposit in"
-			<< "layers";
-  for (i = 0; i < 20; i++) 
-    LogDebug("ValidHcal") << " Layer " << std::setw(2) << i << " E " 
-			  << std::setw(8) << edepl[i]/MeV  << " MeV";
+                        << "layers";
+  for (i = 0; i < 20; i++)
+    LogDebug("ValidHcal") << " Layer " << std::setw(2) << i << " E " << std::setw(8) << edepl[i] / MeV << " MeV";
 
-  product.fillLayers(edepl, edepd, edepHO, edepHB+edepHE, edepEB+edepEE);  
+  product.fillLayers(edepl, edepd, edepHO, edepHB + edepHE, edepEB + edepEE);
 
   // Hits in HF
   product.fillHF(vhitec, vhithc, enEcal, enHcal);
-  LogDebug("ValidHcal") << "SimG4HcalValidation::HF hits " << vhitec 
-			<< " in EC and " << vhithc << " in HC\n"
-			<< "                     HB/HE   " << enEcal 
-			<< " in EC and " << enHcal << " in HC";
+  LogDebug("ValidHcal") << "SimG4HcalValidation::HF hits " << vhitec << " in EC and " << vhithc << " in HC\n"
+                        << "                     HB/HE   " << enEcal << " in EC and " << enHcal << " in HC";
 
   // Another HCAL hist to porcess and store separately (a bit more complicated)
   fetchHits(product);
 
   LogDebug("ValidHcal") << " layerAnalysis ===> after fetchHits";
-
 }
 
 //-----------------------------------------------------------------------------
-void SimG4HcalValidation::nxNAnalysis(PHcalValidInfoNxN& product) {
-
-  std::vector<CaloHit> * hits = &hitcache;
+void SimG4HcalValidation::nxNAnalysis(PHcalValidInfoNxN &product) {
+  std::vector<CaloHit> *hits = &hitcache;
   std::vector<CaloHit>::iterator hit_itr;
 
   LogDebug("ValidHcal") << "SimG4HcalValidation::NxNAnalysis : entrance ";
 
-  collectEnergyRdir(eta0,phi0); // HCAL and ECAL energy in  SimHitCache
-                                // around (eta0,phi0)
+  collectEnergyRdir(eta0, phi0);  // HCAL and ECAL energy in  SimHitCache
+                                  // around (eta0,phi0)
+
+  LogDebug("ValidHcal") << " NxNAnalysis : coolectEnergyRdir - Ecal " << een << "   Hcal " << hen;
 
-  LogDebug("ValidHcal") << " NxNAnalysis : coolectEnergyRdir - Ecal " << een 
-			<< "   Hcal " << hen;
+  double etot = 0.;  // total e deposited     in "cluster"
+  double ee = 0.;    // ECAL  e deposited     in "cluster"
+  double he = 0.;    // HCAL  e deposited     in "cluster"
+  double hoe = 0.;   // HO    e deposited     in "cluster"
 
-  double etot  = 0.;      // total e deposited     in "cluster"
-  double ee    = 0.;      // ECAL  e deposited     in "cluster"
-  double he    = 0.;      // HCAL  e deposited     in "cluster"
-  double hoe   = 0.;      // HO    e deposited     in "cluster"     
+  int max = dEta.size();  // 4
 
-  int    max   = dEta.size(); // 4
-  
   for (hit_itr = hits->begin(); hit_itr < hits->end(); hit_itr++) {
+    double e = hit_itr->e();
+    double t = hit_itr->t();
+    double eta = hit_itr->eta();
+    double phi = hit_itr->phi();
+    int type = hit_itr->det();
+    int layer = hit_itr->layer();
 
-    double e     = hit_itr->e();
-    double t     = hit_itr->t();
-    double eta   = hit_itr->eta();
-    double phi   = hit_itr->phi();
-    int    type  = hit_itr->det();
-    int    layer = hit_itr->layer();
-    
     // NxN calulation
-    
-    if (fabs(eta0-eta) <= dEta[max-1] && fabs(phi0-phi) <= dPhi[max-1]) {
+
+    if (fabs(eta0 - eta) <= dEta[max - 1] && fabs(phi0 - phi) <= dPhi[max - 1]) {
       etot += e;
-      if (type == 10 || type == 11 || type == 12)  ee += e;
-      if (type  == static_cast<int>(HcalBarrel) ||
-	  type  == static_cast<int>(HcalEndcap) ||
-	  type  == static_cast<int>(HcalForward)) { 
-	he += e; 
-	if (type  == static_cast<int>(HcalBarrel) && layer > 17) hoe += e;
-
-	// which concrete i-th square ?
-	for (int i = 0; i < max; i++ ) { 
-	  if ((eta0-eta) <= dEta[i] && (eta0-eta) >= -dEta[i] &&
-	      (phi0-phi) <= dPhi[i] && (phi0-phi) >= -dPhi[i]) {
-
-	    LogDebug("ValidHcal") << "SimG4HcalValidation:: nxNAnalysis eta0,"
-				  << " phi0 = " << eta0 << " " << phi0 
-				  << "   type, layer = " << type << "," 
-				  << layer << "  eta, phi = " << eta << " " 
-				  << phi;
-
-	    product.fillTProfileNxN(e, i, t);  
-	    break;
-	  }
-	}
+      if (type == 10 || type == 11 || type == 12)
+        ee += e;
+      if (type == static_cast<int>(HcalBarrel) || type == static_cast<int>(HcalEndcap) ||
+          type == static_cast<int>(HcalForward)) {
+        he += e;
+        if (type == static_cast<int>(HcalBarrel) && layer > 17)
+          hoe += e;
+
+        // which concrete i-th square ?
+        for (int i = 0; i < max; i++) {
+          if ((eta0 - eta) <= dEta[i] && (eta0 - eta) >= -dEta[i] && (phi0 - phi) <= dPhi[i] &&
+              (phi0 - phi) >= -dPhi[i]) {
+            LogDebug("ValidHcal") << "SimG4HcalValidation:: nxNAnalysis eta0,"
+                                  << " phi0 = " << eta0 << " " << phi0 << "   type, layer = " << type << "," << layer
+                                  << "  eta, phi = " << eta << " " << phi;
+
+            product.fillTProfileNxN(e, i, t);
+            break;
+          }
+        }
         // here comes break ...
       }
     }
   }
 
-  product.fillEcollectNxN(ee, he, hoe, etot);       
-  product.fillHvsE(een, hen, hoen, een+hen);
+  product.fillEcollectNxN(ee, he, hoe, etot);
+  product.fillHvsE(een, hen, hoen, een + hen);
 
   LogDebug("ValidHcal") << " nxNAnalysis ===> after fillHvsE";
-
-
 }
 
-
 //-----------------------------------------------------------------------------
-void SimG4HcalValidation::jetAnalysis(PHcalValidInfoJets& product) {
-
-  std::vector<CaloHit> * hhit = &hitcache;
+void SimG4HcalValidation::jetAnalysis(PHcalValidInfoJets &product) {
+  std::vector<CaloHit> *hhit = &hitcache;
 
   jetf->setInput(hhit);
 
   // zeroing cluster list, perfom clustering, fill cluster list & return pntr
-  std::vector<SimG4HcalHitCluster> * result = jetf->getClusters(hcalOnly);  
+  std::vector<SimG4HcalHitCluster> *result = jetf->getClusters(hcalOnly);
 
   std::vector<SimG4HcalHitCluster>::iterator clus_itr;
 
-  LogDebug("ValidHcal") << "\n ---------- Final list of " << (*result).size()
-			<< " clusters ---------------";
-  for (clus_itr = result->begin(); clus_itr < result->end(); clus_itr++) 
+  LogDebug("ValidHcal") << "\n ---------- Final list of " << (*result).size() << " clusters ---------------";
+  for (clus_itr = result->begin(); clus_itr < result->end(); clus_itr++)
     LogDebug("ValidHcal") << (*clus_itr);
 
-  std::vector<double> enevec, etavec, phivec; 
+  std::vector<double> enevec, etavec, phivec;
 
   if (!(*result).empty()) {
+    sort((*result).begin(), (*result).end());
 
-    sort((*result).begin(),(*result).end()); 
-
-    clus_itr = result->begin(); // first cluster only 
+    clus_itr = result->begin();  // first cluster only
     double etac = clus_itr->eta();
     double phic = clus_itr->phi();
 
-    double ecal_collect = 0.;    // collect Ecal energy in the cone
+    double ecal_collect = 0.;  // collect Ecal energy in the cone
     if (!hcalOnly) {
-      ecal_collect = clus_itr->collectEcalEnergyR();}
-    else {
+      ecal_collect = clus_itr->collectEcalEnergyR();
+    } else {
       collectEnergyRdir(etac, phic);
       ecal_collect = een;
     }
-    LogDebug("ValidHcal") << " JetAnalysis ===> ecal_collect  = " 
-			  << ecal_collect;
+    LogDebug("ValidHcal") << " JetAnalysis ===> ecal_collect  = " << ecal_collect;
 
     // eta-phi deviation of the cluster from nominal (eta0, phi0) values
     double dist = jetf->rDist(eta0, phi0, etac, phic);
     LogDebug("ValidHcal") << " JetAnalysis ===> eta phi deviation  = " << dist;
     product.fillEtaPhiProfileJet(eta0, phi0, etac, phic, dist);
-   
+
     LogDebug("ValidHcal") << " JetAnalysis ===> after fillEtaPhiProfileJet";
-    
-    std::vector<CaloHit> * hits = clus_itr->getHits() ;
+
+    std::vector<CaloHit> *hits = clus_itr->getHits();
     std::vector<CaloHit>::iterator hit_itr;
 
     double ee = 0., he = 0., hoe = 0., etot = 0.;
-    
+
     // cycle over all hits in the FIRST cluster
     for (hit_itr = hits->begin(); hit_itr < hits->end(); hit_itr++) {
-      double e   = hit_itr->e();
-      double t   = hit_itr->t();
-      double r   = jetf->rDist(&(*clus_itr), &(*hit_itr));
+      double e = hit_itr->e();
+      double t = hit_itr->t();
+      double r = jetf->rDist(&(*clus_itr), &(*hit_itr));
 
       // energy collection
       etot += e;
-      if (hit_itr->det()  == 10 || hit_itr->det()  == 11 ||
-	  hit_itr->det()  == 12) ee  += e;
-      if (hit_itr->det()  == static_cast<int>(HcalBarrel) ||
-	  hit_itr->det()  == static_cast<int>(HcalEndcap) ||
-	  hit_itr->det()  == static_cast<int>(HcalForward)) { 
-	he  += e; 
-	if (hit_itr->det()  == static_cast<int>(HcalBarrel) &&
-	    hit_itr->layer() > 17) 
-	  hoe += e; 
+      if (hit_itr->det() == 10 || hit_itr->det() == 11 || hit_itr->det() == 12)
+        ee += e;
+      if (hit_itr->det() == static_cast<int>(HcalBarrel) || hit_itr->det() == static_cast<int>(HcalEndcap) ||
+          hit_itr->det() == static_cast<int>(HcalForward)) {
+        he += e;
+        if (hit_itr->det() == static_cast<int>(HcalBarrel) && hit_itr->layer() > 17)
+          hoe += e;
       }
 
-      if (hit_itr->det()  == static_cast<int>(HcalBarrel) ||
-	  hit_itr->det()  == static_cast<int>(HcalEndcap) ||
-	  hit_itr->det()  == static_cast<int>(HcalForward)) { 
-	product.fillTProfileJet(he, r, t);
+      if (hit_itr->det() == static_cast<int>(HcalBarrel) || hit_itr->det() == static_cast<int>(HcalEndcap) ||
+          hit_itr->det() == static_cast<int>(HcalForward)) {
+        product.fillTProfileJet(he, r, t);
       }
     }
-    
-    product.fillEcollectJet(ee, he, hoe, etot);       
+
+    product.fillEcollectJet(ee, he, hoe, etot);
 
     LogDebug("ValidHcal") << " JetAnalysis ===> after fillEcollectJet: "
-			  << "ee/he/hoe/etot " << ee << "/" << he << "/" 
-			  << hoe << "/" << etot;
+                          << "ee/he/hoe/etot " << ee << "/" << he << "/" << hoe << "/" << etot;
 
     // Loop over clusters
     for (clus_itr = result->begin(); clus_itr < result->end(); clus_itr++) {
       if (clus_itr->e() > jetThreshold) {
-	enevec.push_back(clus_itr->e());
-	etavec.push_back(clus_itr->eta());
-	phivec.push_back(clus_itr->phi());
+        enevec.push_back(clus_itr->e());
+        etavec.push_back(clus_itr->eta());
+        phivec.push_back(clus_itr->phi());
       }
     }
     product.fillJets(enevec, etavec, phivec);
 
     LogDebug("ValidHcal") << " JetAnalysis ===> after fillJets\n"
-			  << " JetAnalysis ===> (*result).size() "
-			  << (*result).size();
- 
+                          << " JetAnalysis ===> (*result).size() " << (*result).size();
+
     // Di-jet mass
     if (etavec.size() > 1) {
-      if (etavec[0] > -2.5 && etavec[0] < 2.5 && 
-	  etavec[1] > -2.5 && etavec[1] < 2.5) {
- 
-	LogDebug("ValidHcal") << " JetAnalysis ===> Di-jet mass enter\n"
-			      << " JetAnalysis ===> Di-jet vectors ";
-	for (unsigned int i = 0; i < enevec.size(); i++)
-	  LogDebug("ValidHcal") << "   e, eta, phi = " << enevec[i] << " "
-				<<  etavec[i] << " " << phivec[i];
+      if (etavec[0] > -2.5 && etavec[0] < 2.5 && etavec[1] > -2.5 && etavec[1] < 2.5) {
+        LogDebug("ValidHcal") << " JetAnalysis ===> Di-jet mass enter\n"
+                              << " JetAnalysis ===> Di-jet vectors ";
+        for (unsigned int i = 0; i < enevec.size(); i++)
+          LogDebug("ValidHcal") << "   e, eta, phi = " << enevec[i] << " " << etavec[i] << " " << phivec[i];
 
         double et0 = enevec[0] / cosh(etavec[0]);
-        double px0 = et0  * cos(phivec[0]);
-        double py0 = et0  * sin(phivec[0]);
-        double pz0 = et0  * sinh(etavec[0]);
+        double px0 = et0 * cos(phivec[0]);
+        double py0 = et0 * sin(phivec[0]);
+        double pz0 = et0 * sinh(etavec[0]);
         double et1 = enevec[1] / cosh(etavec[1]);
-        double px1 = et1  * cos(phivec[1]);
-        double py1 = et1  * sin(phivec[1]);
-        double pz1 = et1  * sinh(etavec[1]);
-         
-        double dijetmass2 = (enevec[0]+enevec[1])*(enevec[0]+enevec[1])
-          - (px1+px0)*(px1+px0) - (py1+py0)*(py1+py0) - (pz1+pz0)*(pz1+pz0);
- 
-	LogDebug("ValidHcal") << " JetAnalysis ===> Di-jet massSQ "
-			      << dijetmass2;
+        double px1 = et1 * cos(phivec[1]);
+        double py1 = et1 * sin(phivec[1]);
+        double pz1 = et1 * sinh(etavec[1]);
+
+        double dijetmass2 = (enevec[0] + enevec[1]) * (enevec[0] + enevec[1]) - (px1 + px0) * (px1 + px0) -
+                            (py1 + py0) * (py1 + py0) - (pz1 + pz0) * (pz1 + pz0);
+
+        LogDebug("ValidHcal") << " JetAnalysis ===> Di-jet massSQ " << dijetmass2;
 
         double dijetmass;
-        if(dijetmass2 >= 0.) dijetmass = sqrt(dijetmass2);
-        else                 dijetmass = -sqrt(-1. * dijetmass2);
+        if (dijetmass2 >= 0.)
+          dijetmass = sqrt(dijetmass2);
+        else
+          dijetmass = -sqrt(-1. * dijetmass2);
 
         product.fillDiJets(dijetmass);
- 
-	LogDebug("ValidHcal") << " JetAnalysis ===> after fillDiJets";
+
+        LogDebug("ValidHcal") << " JetAnalysis ===> after fillDiJets";
       }
     }
   }
 }
 
 //---------------------------------------------------
-void SimG4HcalValidation::fetchHits(PHcalValidInfoLayer& product) {
-
-  LogDebug("ValidHcal") << "Enter SimG4HcalValidation::fetchHits with "
-			<< hitcache.size() << " hits";
+void SimG4HcalValidation::fetchHits(PHcalValidInfoLayer &product) {
+  LogDebug("ValidHcal") << "Enter SimG4HcalValidation::fetchHits with " << hitcache.size() << " hits";
   int nHit = hitcache.size();
-  int hit  = 0;
+  int hit = 0;
   int i;
   std::vector<CaloHit>::iterator itr;
-  std::vector<CaloHit*> lhits(nHit);
+  std::vector<CaloHit *> lhits(nHit);
   for (i = 0, itr = hitcache.begin(); itr != hitcache.end(); i++, itr++) {
-    uint32_t unitID=itr->id();
-    int   subdet, zside, group, ieta, iphi, lay;
-    HcalTestNumbering::unpackHcalIndex(unitID,subdet,zside,group,
-				       ieta,iphi,lay);
+    uint32_t unitID = itr->id();
+    int subdet, zside, group, ieta, iphi, lay;
+    HcalTestNumbering::unpackHcalIndex(unitID, subdet, zside, group, ieta, iphi, lay);
     subdet = itr->det();
-    lay    = itr->layer();
-    group  = (subdet&15)<<20;
-    group += ((lay-1)&31)<<15;
-    group += (zside&1)<<14;
-    group += (ieta&127)<<7;
-    group += (iphi&127);
+    lay = itr->layer();
+    group = (subdet & 15) << 20;
+    group += ((lay - 1) & 31) << 15;
+    group += (zside & 1) << 14;
+    group += (ieta & 127) << 7;
+    group += (iphi & 127);
     itr->setId(group);
     lhits[i] = &hitcache[i];
-    LogDebug("ValidHcal") << "SimG4HcalValidation::fetchHits:Original " << i 
-			  << " "  << hitcache[i] << "\n"
-			  << "SimG4HcalValidation::fetchHits:Copied   " << i 
-			  << " " << *lhits[i];
+    LogDebug("ValidHcal") << "SimG4HcalValidation::fetchHits:Original " << i << " " << hitcache[i] << "\n"
+                          << "SimG4HcalValidation::fetchHits:Copied   " << i << " " << *lhits[i];
   }
-  sort(lhits.begin(),lhits.end(),CaloHitIdMore());
-  std::vector<CaloHit*>::iterator k1, k2;
+  sort(lhits.begin(), lhits.end(), CaloHitIdMore());
+  std::vector<CaloHit *>::iterator k1, k2;
   for (i = 0, k1 = lhits.begin(); k1 != lhits.end(); i++, k1++)
-    LogDebug("ValidHcal") << "SimG4HcalValidation::fetchHits:Sorted " << i 
-			  << " " << **k1;
+    LogDebug("ValidHcal") << "SimG4HcalValidation::fetchHits:Sorted " << i << " " << **k1;
   int nHits = 0;
   for (i = 0, k1 = lhits.begin(); k1 != lhits.end(); i++, k1++) {
-    double       ehit  = (**k1).e();
-    double       t     = (**k1).t();
-    uint32_t     unitID= (**k1).id();
-    int          jump  = 0;
-    LogDebug("ValidHcal") << "SimG4HcalValidation::fetchHits:Start " << i 
-			  << " U/T/E" << " 0x" << std::hex << unitID 
-			  << std::dec << " "  << t << " " << ehit;
-    for (k2 = k1+1; k2 != lhits.end() && (t-(**k2).t()) < 1 &&
-	   (t-(**k2).t()) > -1 && unitID == (**k2).id(); k2++) {
+    double ehit = (**k1).e();
+    double t = (**k1).t();
+    uint32_t unitID = (**k1).id();
+    int jump = 0;
+    LogDebug("ValidHcal") << "SimG4HcalValidation::fetchHits:Start " << i << " U/T/E"
+                          << " 0x" << std::hex << unitID << std::dec << " " << t << " " << ehit;
+    for (k2 = k1 + 1; k2 != lhits.end() && (t - (**k2).t()) < 1 && (t - (**k2).t()) > -1 && unitID == (**k2).id();
+         k2++) {
       ehit += (**k2).e();
       LogDebug("ValidHcal") << "\t + " << (**k2).e();
       jump++;
     }
     LogDebug("ValidHcal") << "\t = " << ehit << " in " << jump;
 
-    double eta  = (*k1)->eta();
-    double phi  = (*k1)->phi();
-    int lay     = ((unitID>>15)&31) + 1;
-    int subdet  = (unitID>>20)&15;
-    int zside   = (unitID>>14)&1;
-    int ieta    = (unitID>>7)&127;
-    int iphi    = (unitID)&127;
- 
+    double eta = (*k1)->eta();
+    double phi = (*k1)->phi();
+    int lay = ((unitID >> 15) & 31) + 1;
+    int subdet = (unitID >> 20) & 15;
+    int zside = (unitID >> 14) & 1;
+    int ieta = (unitID >> 7) & 127;
+    int iphi = (unitID)&127;
+
     // All hits in cache
     product.fillHits(nHits, lay, subdet, eta, phi, ehit, t);
     nHits++;
 
-    LogDebug("ValidHcal") << "SimG4HcalValidation::fetchHits:Hit " << nHits 
-			  << " " << i << " ID 0x" << std::hex << unitID 
-			  << "   det " <<  std::dec  << subdet << " " << lay 
-			  << " " << zside << " " << ieta << " " << iphi 
-			  << " Time " << t << " E " << ehit;
+    LogDebug("ValidHcal") << "SimG4HcalValidation::fetchHits:Hit " << nHits << " " << i << " ID 0x" << std::hex
+                          << unitID << "   det " << std::dec << subdet << " " << lay << " " << zside << " " << ieta
+                          << " " << iphi << " Time " << t << " E " << ehit;
 
-    i  += jump;
+    i += jump;
     k1 += jump;
   }
 
-  LogDebug("ValidHcal") << "SimG4HcalValidation::fetchHits called with "
-			<< nHit << " hits" << " and writes out " << nHits
-			<< '(' << hit << ") hits";
-
+  LogDebug("ValidHcal") << "SimG4HcalValidation::fetchHits called with " << nHit << " hits"
+                        << " and writes out " << nHits << '(' << hit << ") hits";
 }
 //---------------------------------------------------
-void SimG4HcalValidation::clear(){
-   hitcache.erase( hitcache.begin(), hitcache.end()); 
-}
+void SimG4HcalValidation::clear() { hitcache.erase(hitcache.begin(), hitcache.end()); }
 
 //---------------------------------------------------
-void SimG4HcalValidation::collectEnergyRdir (const double eta0, 
-					     const double phi0) {
-
-  std::vector<CaloHit> * hits = &hitcache;
+void SimG4HcalValidation::collectEnergyRdir(const double eta0, const double phi0) {
+  std::vector<CaloHit> *hits = &hitcache;
   std::vector<CaloHit>::iterator hit_itr;
 
-  double sume = 0., sumh = 0., sumho = 0.;  
+  double sume = 0., sumh = 0., sumho = 0.;
 
   for (hit_itr = hits->begin(); hit_itr < hits->end(); hit_itr++) {
-
-    double e   = hit_itr->e();
+    double e = hit_itr->e();
     double eta = hit_itr->eta();
     double phi = hit_itr->phi();
-    
-    int type  = hit_itr->det();
 
-    double r =  jetf->rDist(eta0, phi0, eta, phi);
+    int type = hit_itr->det();
+
+    double r = jetf->rDist(eta0, phi0, eta, phi);
     if (r < coneSize) {
       if (type == 10 || type == 11 || type == 12) {
-	sume += e;
-      } else           {
-	sumh += e;
-	if (type  == static_cast<int>(HcalBarrel) &&
-	    hit_itr->layer() > 17) sumho += e;
+        sume += e;
+      } else {
+        sumh += e;
+        if (type == static_cast<int>(HcalBarrel) && hit_itr->layer() > 17)
+          sumho += e;
       }
     }
   }
-  
-  een  = sume;
-  hen  = sumh;
+
+  een = sume;
+  hen = sumh;
   hoen = sumho;
 }
 
 //---------------------------------------------------
 double SimG4HcalValidation::getHcalScale(std::string det, int layer) const {
-
   double tmp = 0.;
-    
-  if (det == "HB")                         {
+
+  if (det == "HB") {
     tmp = scaleHB[layer];
   } else if (det == "HES" || det == "HED") {
     tmp = scaleHE[layer];
-  } else if (det == "HF")                  {
+  } else if (det == "HF") {
     tmp = scaleHF[layer];
-  }    
-  
+  }
+
   return tmp;
 }
diff --git a/Validation/HcalHits/src/SimHitsValidationHcal.cc b/Validation/HcalHits/src/SimHitsValidationHcal.cc
index 643883d965172..8f3b3775eac4b 100644
--- a/Validation/HcalHits/src/SimHitsValidationHcal.cc
+++ b/Validation/HcalHits/src/SimHitsValidationHcal.cc
@@ -1,37 +1,35 @@
-#include "Validation/HcalHits/interface/SimHitsValidationHcal.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
-#include "Geometry/Records/interface/HcalRecNumberingRecord.h"
 #include "Geometry/HcalCommonData/interface/HcalHitRelabeller.h"
+#include "Geometry/Records/interface/HcalRecNumberingRecord.h"
+#include "Validation/HcalHits/interface/SimHitsValidationHcal.h"
 
 #define DebugLog
 
-SimHitsValidationHcal::SimHitsValidationHcal(const edm::ParameterSet& ps) {
-
-  g4Label_  = ps.getParameter<std::string>("ModuleLabel");
+SimHitsValidationHcal::SimHitsValidationHcal(const edm::ParameterSet &ps) {
+  g4Label_ = ps.getParameter<std::string>("ModuleLabel");
   hcalHits_ = ps.getParameter<std::string>("HitCollection");
-  verbose_  = ps.getParameter<bool>("Verbose");
-  testNumber_= ps.getParameter<bool>("TestNumber");
+  verbose_ = ps.getParameter<bool>("Verbose");
+  testNumber_ = ps.getParameter<bool>("TestNumber");
 
-  tok_hits_ = consumes<edm::PCaloHitContainer>(edm::InputTag(g4Label_,hcalHits_));
+  tok_hits_ = consumes<edm::PCaloHitContainer>(edm::InputTag(g4Label_, hcalHits_));
 
-  edm::LogInfo("HitsValidationHcal") << "Module Label: " << g4Label_ 
-				     << "   Hits: " << hcalHits_
-				     << " TestNumbering " << testNumber_;
+  edm::LogInfo("HitsValidationHcal") << "Module Label: " << g4Label_ << "   Hits: " << hcalHits_ << " TestNumbering "
+                                     << testNumber_;
 }
 
 SimHitsValidationHcal::~SimHitsValidationHcal() {}
 
 void SimHitsValidationHcal::bookHistograms(DQMStore::IBooker &ib, edm::Run const &run, edm::EventSetup const &es) {
-  
   edm::ESHandle<HcalDDDRecConstants> pHRNDC;
-  es.get<HcalRecNumberingRecord>().get( pHRNDC );
+  es.get<HcalRecNumberingRecord>().get(pHRNDC);
   hcons = &(*pHRNDC);
   maxDepthHB_ = hcons->getMaxDepth(0);
   maxDepthHE_ = hcons->getMaxDepth(1);
   maxDepthHF_ = hcons->getMaxDepth(2);
   maxDepthHO_ = hcons->getMaxDepth(3);
 
-  //Get Phi segmentation from geometry, use the max phi number so that all iphi values are included.
+  // Get Phi segmentation from geometry, use the max phi number so that all iphi
+  // values are included.
 
   int NphiMax = hcons->getNPhi(0);
 
@@ -39,20 +37,20 @@ void SimHitsValidationHcal::bookHistograms(DQMStore::IBooker &ib, edm::Run const
   NphiMax = (hcons->getNPhi(2) > NphiMax ? hcons->getNPhi(2) : NphiMax);
   NphiMax = (hcons->getNPhi(3) > NphiMax ? hcons->getNPhi(3) : NphiMax);
 
-  //Center the iphi bins on the integers
+  // Center the iphi bins on the integers
   float iphi_min = 0.5;
   float iphi_max = NphiMax + 0.5;
-  int iphi_bins = (int) (iphi_max - iphi_min);
+  int iphi_bins = (int)(iphi_max - iphi_min);
 
   int iEtaHBMax = hcons->getEtaRange(0).second;
   int iEtaHEMax = hcons->getEtaRange(1).second;
   int iEtaHFMax = hcons->getEtaRange(2).second;
   int iEtaHOMax = hcons->getEtaRange(3).second;
 
-  //Retain classic behavior, all plots have same ieta range.
-  //Comment out	code to	allow each subdetector to have its on range
+  // Retain classic behavior, all plots have same ieta range.
+  // Comment out	code to	allow each subdetector to have its on range
 
-  int iEtaMax =	(iEtaHBMax > iEtaHEMax ? iEtaHBMax : iEtaHEMax);
+  int iEtaMax = (iEtaHBMax > iEtaHEMax ? iEtaHBMax : iEtaHEMax);
   iEtaMax = (iEtaMax > iEtaHFMax ? iEtaMax : iEtaHFMax);
   iEtaMax = (iEtaMax > iEtaHOMax ? iEtaMax : iEtaHOMax);
 
@@ -61,154 +59,151 @@ void SimHitsValidationHcal::bookHistograms(DQMStore::IBooker &ib, edm::Run const
   iEtaHFMax = iEtaMax;
   iEtaHOMax = iEtaMax;
 
-  //Give an empty bin around the subdet ieta range to make it clear that all ieta rings have been included
-  //float ieta_min_HB = -iEtaHBMax - 1.5;
-  //float ieta_max_HB = iEtaHBMax + 1.5;
-  //int ieta_bins_HB = (int) (ieta_max_HB - ieta_min_HB);
+  // Give an empty bin around the subdet ieta range to make it clear that all
+  // ieta rings have been included float ieta_min_HB = -iEtaHBMax - 1.5; float
+  // ieta_max_HB = iEtaHBMax + 1.5; int ieta_bins_HB = (int) (ieta_max_HB -
+  // ieta_min_HB);
 
-  //float ieta_min_HE = -iEtaHEMax - 1.5;
-  //float ieta_max_HE = iEtaHEMax + 1.5;
-  //int ieta_bins_HE = (int) (ieta_max_HE - ieta_min_HE);
+  // float ieta_min_HE = -iEtaHEMax - 1.5;
+  // float ieta_max_HE = iEtaHEMax + 1.5;
+  // int ieta_bins_HE = (int) (ieta_max_HE - ieta_min_HE);
 
-  //float ieta_min_HF = -iEtaHFMax - 1.5;
-  //float ieta_max_HF = iEtaHFMax + 1.5;
-  //int ieta_bins_HF = (int) (ieta_max_HF - ieta_min_HF);
+  // float ieta_min_HF = -iEtaHFMax - 1.5;
+  // float ieta_max_HF = iEtaHFMax + 1.5;
+  // int ieta_bins_HF = (int) (ieta_max_HF - ieta_min_HF);
 
-  //float ieta_min_HO = -iEtaHOMax - 1.5;
-  //float ieta_max_HO = iEtaHOMax + 1.5;
-  //int ieta_bins_HO = (int) (ieta_max_HO - ieta_min_HO);
+  // float ieta_min_HO = -iEtaHOMax - 1.5;
+  // float ieta_max_HO = iEtaHOMax + 1.5;
+  // int ieta_bins_HO = (int) (ieta_max_HO - ieta_min_HO);
 
 #ifdef DebugLog
-  edm::LogInfo("HitsValidationHcal") << " Maximum Depths HB:"<< maxDepthHB_ 
-				     << " HE:" << maxDepthHE_  << " HO:" 
-				     << maxDepthHO_ << " HF:" << maxDepthHF_;
-#endif  
-  std::vector<std::pair<std::string,std::string> > divisions = getHistogramTypes();
+  edm::LogInfo("HitsValidationHcal") << " Maximum Depths HB:" << maxDepthHB_ << " HE:" << maxDepthHE_
+                                     << " HO:" << maxDepthHO_ << " HF:" << maxDepthHF_;
+#endif
+  std::vector<std::pair<std::string, std::string>> divisions = getHistogramTypes();
 
   edm::LogInfo("HitsValidationHcal") << "Booking the Histograms";
   ib.setCurrentFolder("HcalHitsV/SimHitsValidationHcal");
 
-  //Histograms for Hits
+  // Histograms for Hits
 
   char name[100], title[200];
-  for (unsigned int i=0; i<types.size(); ++i) {
+  for (unsigned int i = 0; i < types.size(); ++i) {
     etaRange limit = getLimits(types[i]);
-    sprintf (name, "HcalHitEta%s", divisions[i].first.c_str());
-    sprintf (title, "Hit energy as a function of eta tower index in %s", divisions[i].second.c_str());
+    sprintf(name, "HcalHitEta%s", divisions[i].first.c_str());
+    sprintf(title, "Hit energy as a function of eta tower index in %s", divisions[i].second.c_str());
     meHcalHitEta_.push_back(ib.book1D(name, title, limit.bins, limit.low, limit.high));
-      
-    sprintf (name, "HcalHitTimeAEta%s", divisions[i].first.c_str());
-    sprintf (title, "Hit time as a function of eta tower index in %s", divisions[i].second.c_str());
+
+    sprintf(name, "HcalHitTimeAEta%s", divisions[i].first.c_str());
+    sprintf(title, "Hit time as a function of eta tower index in %s", divisions[i].second.c_str());
     meHcalHitTimeEta_.push_back(ib.book1D(name, title, limit.bins, limit.low, limit.high));
-      
-    sprintf (name, "HcalHitE25%s", divisions[i].first.c_str());
-    sprintf (title, "Energy in time window 0 to 25 for a tower in %s", divisions[i].second.c_str());
-    meHcalEnergyl25_.push_back(ib.book2D(name, title, limit.bins, limit.low, limit.high, iphi_bins, iphi_min, iphi_max));
-      
-    sprintf (name, "HcalHitE50%s", divisions[i].first.c_str());
-    sprintf (title, "Energy in time window 0 to 50 for a tower in %s", divisions[i].second.c_str());
-    meHcalEnergyl50_.push_back(ib.book2D(name, title, limit.bins, limit.low, limit.high, iphi_bins, iphi_min, iphi_max));
-      
-    sprintf (name, "HcalHitE100%s", divisions[i].first.c_str());
-    sprintf (title, "Energy in time window 0 to 100 for a tower in %s", divisions[i].second.c_str());
-    meHcalEnergyl100_.push_back(ib.book2D(name, title, limit.bins, limit.low, limit.high, iphi_bins, iphi_min, iphi_max));
-      
-    sprintf (name, "HcalHitE250%s", divisions[i].first.c_str());
-    sprintf (title, "Energy in time window 0 to 250 for a tower in %s", divisions[i].second.c_str());
-    meHcalEnergyl250_.push_back(ib.book2D(name, title, limit.bins, limit.low, limit.high, iphi_bins, iphi_min, iphi_max));
+
+    sprintf(name, "HcalHitE25%s", divisions[i].first.c_str());
+    sprintf(title, "Energy in time window 0 to 25 for a tower in %s", divisions[i].second.c_str());
+    meHcalEnergyl25_.push_back(
+        ib.book2D(name, title, limit.bins, limit.low, limit.high, iphi_bins, iphi_min, iphi_max));
+
+    sprintf(name, "HcalHitE50%s", divisions[i].first.c_str());
+    sprintf(title, "Energy in time window 0 to 50 for a tower in %s", divisions[i].second.c_str());
+    meHcalEnergyl50_.push_back(
+        ib.book2D(name, title, limit.bins, limit.low, limit.high, iphi_bins, iphi_min, iphi_max));
+
+    sprintf(name, "HcalHitE100%s", divisions[i].first.c_str());
+    sprintf(title, "Energy in time window 0 to 100 for a tower in %s", divisions[i].second.c_str());
+    meHcalEnergyl100_.push_back(
+        ib.book2D(name, title, limit.bins, limit.low, limit.high, iphi_bins, iphi_min, iphi_max));
+
+    sprintf(name, "HcalHitE250%s", divisions[i].first.c_str());
+    sprintf(title, "Energy in time window 0 to 250 for a tower in %s", divisions[i].second.c_str());
+    meHcalEnergyl250_.push_back(
+        ib.book2D(name, title, limit.bins, limit.low, limit.high, iphi_bins, iphi_min, iphi_max));
   }
 
-  sprintf (name, "Energy_HB");
-  meEnergy_HB = ib.book1D(name, name, 100,0,1);
-  sprintf (name, "Energy_HE");
-  meEnergy_HE = ib.book1D(name, name, 100,0,1);
-  sprintf (name, "Energy_HO");
-  meEnergy_HO = ib.book1D(name, name, 100,0,1);
-  sprintf (name, "Energy_HF");
-  meEnergy_HF = ib.book1D(name, name, 100,0,50);
-      
-  sprintf (name, "Time_HB");
-  metime_HB = ib.book1D(name, name, 300,-150,150);
-  sprintf (name, "Time_HE");
-  metime_HE = ib.book1D(name, name, 300,-150,150);
-  sprintf (name, "Time_HO");
-  metime_HO = ib.book1D(name, name, 300,-150, 150);
-  sprintf (name, "Time_HF");
-  metime_HF = ib.book1D(name, name, 300,-150,150);
-
-  sprintf (name, "Time_Enweighted_HB");
-  metime_enweighted_HB = ib.book1D(name, name, 300,-150,150);
-  sprintf (name, "Time_Enweighted_HE");
-  metime_enweighted_HE = ib.book1D(name, name, 300,-150,150);
-  sprintf (name, "Time_Enweighted_HO");
-  metime_enweighted_HO = ib.book1D(name, name, 300,-150, 150);
-  sprintf (name, "Time_Enweighted_HF");
-  metime_enweighted_HF = ib.book1D(name, name, 300,-150,150);
+  sprintf(name, "Energy_HB");
+  meEnergy_HB = ib.book1D(name, name, 100, 0, 1);
+  sprintf(name, "Energy_HE");
+  meEnergy_HE = ib.book1D(name, name, 100, 0, 1);
+  sprintf(name, "Energy_HO");
+  meEnergy_HO = ib.book1D(name, name, 100, 0, 1);
+  sprintf(name, "Energy_HF");
+  meEnergy_HF = ib.book1D(name, name, 100, 0, 50);
+
+  sprintf(name, "Time_HB");
+  metime_HB = ib.book1D(name, name, 300, -150, 150);
+  sprintf(name, "Time_HE");
+  metime_HE = ib.book1D(name, name, 300, -150, 150);
+  sprintf(name, "Time_HO");
+  metime_HO = ib.book1D(name, name, 300, -150, 150);
+  sprintf(name, "Time_HF");
+  metime_HF = ib.book1D(name, name, 300, -150, 150);
+
+  sprintf(name, "Time_Enweighted_HB");
+  metime_enweighted_HB = ib.book1D(name, name, 300, -150, 150);
+  sprintf(name, "Time_Enweighted_HE");
+  metime_enweighted_HE = ib.book1D(name, name, 300, -150, 150);
+  sprintf(name, "Time_Enweighted_HO");
+  metime_enweighted_HO = ib.book1D(name, name, 300, -150, 150);
+  sprintf(name, "Time_Enweighted_HF");
+  metime_enweighted_HF = ib.book1D(name, name, 300, -150, 150);
 }
 
-void SimHitsValidationHcal::analyze(const edm::Event& e, 
-				    const edm::EventSetup& ) {
-  
-  
-#ifdef DebugLog  
-  edm::LogInfo("HitsValidationHcal") << "Run = " << e.id().run() << " Event = "
-				     << e.id().event();
+void SimHitsValidationHcal::analyze(const edm::Event &e, const edm::EventSetup &) {
+#ifdef DebugLog
+  edm::LogInfo("HitsValidationHcal") << "Run = " << e.id().run() << " Event = " << e.id().event();
 #endif
-  std::vector<PCaloHit>               caloHits;
+  std::vector<PCaloHit> caloHits;
   edm::Handle<edm::PCaloHitContainer> hitsHcal;
-  
+
   bool getHits = false;
-  e.getByToken(tok_hits_,hitsHcal); 
-  if (hitsHcal.isValid()) getHits = true;
-#ifdef DebugLog  
-  edm::LogInfo("HitsValidationHcal") << "HitsValidationHcal.: Input flags Hits "
-				     << getHits;
+  e.getByToken(tok_hits_, hitsHcal);
+  if (hitsHcal.isValid())
+    getHits = true;
+#ifdef DebugLog
+  edm::LogInfo("HitsValidationHcal") << "HitsValidationHcal.: Input flags Hits " << getHits;
 #endif
   if (getHits) {
-    caloHits.insert(caloHits.end(),hitsHcal->begin(),hitsHcal->end());
+    caloHits.insert(caloHits.end(), hitsHcal->begin(), hitsHcal->end());
 #ifdef DebugLog
     edm::LogInfo("HitsValidationHcal") << "testNumber_:" << testNumber_;
 #endif
     if (testNumber_) {
-      for (unsigned int i=0; i<caloHits.size(); ++i) {
+      for (unsigned int i = 0; i < caloHits.size(); ++i) {
         unsigned int id_ = caloHits[i].id();
-        HcalDetId hid = HcalHitRelabeller::relabel(id_,hcons);
+        HcalDetId hid = HcalHitRelabeller::relabel(id_, hcons);
         caloHits[i].setID(hid.rawId());
 #ifdef DebugLog
-	edm::LogInfo("HitsValidationHcal") << "Hit[" << i << "] " << hid;
+        edm::LogInfo("HitsValidationHcal") << "Hit[" << i << "] " << hid;
 #endif
       }
     }
-#ifdef DebugLog 
-    edm::LogInfo("HitsValidationHcal") << "HitsValidationHcal: Hit buffer " 
-				       << caloHits.size(); 
+#ifdef DebugLog
+    edm::LogInfo("HitsValidationHcal") << "HitsValidationHcal: Hit buffer " << caloHits.size();
 #endif
-    analyzeHits (caloHits);
+    analyzeHits(caloHits);
   }
 }
 
-void SimHitsValidationHcal::analyzeHits (std::vector<PCaloHit>& hits) {
-
+void SimHitsValidationHcal::analyzeHits(std::vector<PCaloHit> &hits) {
   int nHit = hits.size();
-  double entotHB = 0, entotHE = 0, entotHF = 0, entotHO = 0; 
-  double timetotHB = 0, timetotHE = 0, timetotHF = 0, timetotHO = 0; 
-  int    nHB=0, nHE=0, nHO=0, nHF=0;
-  
-  std::map<std::pair<HcalDetId,unsigned int>,energysum> map_try;
+  double entotHB = 0, entotHE = 0, entotHF = 0, entotHO = 0;
+  double timetotHB = 0, timetotHE = 0, timetotHF = 0, timetotHO = 0;
+  int nHB = 0, nHE = 0, nHO = 0, nHF = 0;
+
+  std::map<std::pair<HcalDetId, unsigned int>, energysum> map_try;
   map_try.clear();
-  std::map<std::pair<HcalDetId,unsigned int>,energysum>::iterator itr;
-  
-  for (int i=0; i<nHit; i++) {
-    double energy    = hits[i].energy();
-    double time      = hits[i].time();
-    HcalDetId id     = HcalDetId(hits[i].id());
-    int itime        = (int)(time);
-    int subdet       = id.subdet();
-    int depth        = id.depth();
-    int eta          = id.ieta();
+  std::map<std::pair<HcalDetId, unsigned int>, energysum>::iterator itr;
+
+  for (int i = 0; i < nHit; i++) {
+    double energy = hits[i].energy();
+    double time = hits[i].time();
+    HcalDetId id = HcalDetId(hits[i].id());
+    int itime = (int)(time);
+    int subdet = id.subdet();
+    int depth = id.depth();
+    int eta = id.ieta();
     unsigned int dep = hits[i].depth();
-        
-    std::pair<int,int> types = histId(subdet, eta, depth, dep);
+
+    std::pair<int, int> types = histId(subdet, eta, depth, dep);
     if (subdet == static_cast<int>(HcalBarrel)) {
       entotHB += energy;
       timetotHB += time;
@@ -227,44 +222,43 @@ void SimHitsValidationHcal::analyzeHits (std::vector<PCaloHit>& hits) {
       nHF++;
     }
 
-    std::pair<HcalDetId,unsigned int> id0(id,dep);
+    std::pair<HcalDetId, unsigned int> id0(id, dep);
     energysum ensum;
-    if (map_try.count(id0) != 0) ensum =  map_try[id0];
-    if (itime<250) {
+    if (map_try.count(id0) != 0)
+      ensum = map_try[id0];
+    if (itime < 250) {
       ensum.e250 += energy;
-      if (itime<100) {
-	ensum.e100 += energy;
-	if (itime<50) {
-	  ensum.e50 += energy;
-	  if (itime<25) ensum.e25 += energy;
-	}
+      if (itime < 100) {
+        ensum.e100 += energy;
+        if (itime < 50) {
+          ensum.e50 += energy;
+          if (itime < 25)
+            ensum.e25 += energy;
+        }
       }
     }
     map_try[id0] = ensum;
-    
+
 #ifdef DebugLog
-    edm::LogInfo("HitsValidationHcal") << "Hit[" << i << "] ID " << std::dec 
-				       << " " << id << std::dec << " Det " 
-				       << id.det() << " Sub " << subdet 
-				       << " depth " << depth << " depthX "
-				       << dep << " Eta " << eta << " Phi " 
-				       << id.iphi() << " E " << energy 
-				       << " time " << time << " type " 
-				       << types.first << " " << types.second;
+    edm::LogInfo("HitsValidationHcal") << "Hit[" << i << "] ID " << std::dec << " " << id << std::dec << " Det "
+                                       << id.det() << " Sub " << subdet << " depth " << depth << " depthX " << dep
+                                       << " Eta " << eta << " Phi " << id.iphi() << " E " << energy << " time " << time
+                                       << " type " << types.first << " " << types.second;
 #endif
-    
+
     double etax = eta - 0.5;
-    if (eta < 0) etax += 1;
+    if (eta < 0)
+      etax += 1;
     if (types.first >= 0) {
-      meHcalHitEta_[types.first]->Fill(etax,energy);
-      meHcalHitTimeEta_[types.first]->Fill(etax,time);
+      meHcalHitEta_[types.first]->Fill(etax, energy);
+      meHcalHitTimeEta_[types.first]->Fill(etax, time);
     }
     if (types.second >= 0) {
-      meHcalHitEta_[types.second]->Fill(etax,energy);
-      meHcalHitTimeEta_[types.second]->Fill(etax,time);
+      meHcalHitEta_[types.second]->Fill(etax, energy);
+      meHcalHitTimeEta_[types.second]->Fill(etax, time);
     }
   }
-  
+
   meEnergy_HB->Fill(entotHB);
   meEnergy_HE->Fill(entotHE);
   meEnergy_HF->Fill(entotHF);
@@ -274,195 +268,191 @@ void SimHitsValidationHcal::analyzeHits (std::vector<PCaloHit>& hits) {
   metime_HE->Fill(timetotHE);
   metime_HF->Fill(timetotHF);
   metime_HO->Fill(timetotHO);
-  
-  metime_enweighted_HB->Fill(timetotHB,entotHB);
-  metime_enweighted_HE->Fill(timetotHE,entotHE);
-  metime_enweighted_HF->Fill(timetotHF,entotHF);
-  metime_enweighted_HO->Fill(timetotHO,entotHO);
-  
-  
+
+  metime_enweighted_HB->Fill(timetotHB, entotHB);
+  metime_enweighted_HE->Fill(timetotHE, entotHE);
+  metime_enweighted_HF->Fill(timetotHF, entotHF);
+  metime_enweighted_HO->Fill(timetotHO, entotHO);
+
   for (itr = map_try.begin(); itr != map_try.end(); ++itr) {
-    HcalDetId id    = (*itr).first.first;
+    HcalDetId id = (*itr).first.first;
     energysum ensum = (*itr).second;
-    std::pair<int,int> types = histId((int)(id.subdet()), id.ieta(), id.depth(), (*itr).first.second);
+    std::pair<int, int> types = histId((int)(id.subdet()), id.ieta(), id.depth(), (*itr).first.second);
     int eta = id.ieta();
     int phi = id.iphi();
-    double etax= eta-0.5;
-    double phix= phi-0.5;
+    double etax = eta - 0.5;
+    double phix = phi - 0.5;
     if (types.first >= 0) {
-      meHcalEnergyl25_[types.first]->Fill(etax,phix,ensum.e25);
-      meHcalEnergyl50_[types.first]->Fill(etax,phix,ensum.e50);
-      meHcalEnergyl100_[types.first]->Fill(etax,phix,ensum.e100);
-      meHcalEnergyl250_[types.first]->Fill(etax,phix,ensum.e250);
+      meHcalEnergyl25_[types.first]->Fill(etax, phix, ensum.e25);
+      meHcalEnergyl50_[types.first]->Fill(etax, phix, ensum.e50);
+      meHcalEnergyl100_[types.first]->Fill(etax, phix, ensum.e100);
+      meHcalEnergyl250_[types.first]->Fill(etax, phix, ensum.e250);
     }
     if (types.second >= 0) {
-      meHcalEnergyl25_[types.second]->Fill(etax,phix,ensum.e25);
-      meHcalEnergyl50_[types.second]->Fill(etax,phix,ensum.e50);
-      meHcalEnergyl100_[types.second]->Fill(etax,phix,ensum.e100);
-      meHcalEnergyl250_[types.second]->Fill(etax,phix,ensum.e250);
+      meHcalEnergyl25_[types.second]->Fill(etax, phix, ensum.e25);
+      meHcalEnergyl50_[types.second]->Fill(etax, phix, ensum.e50);
+      meHcalEnergyl100_[types.second]->Fill(etax, phix, ensum.e100);
+      meHcalEnergyl250_[types.second]->Fill(etax, phix, ensum.e250);
     }
 
 #ifdef DebugLog
-    edm::LogInfo("HitsValidationHcal") << " energy of tower ="   << (*itr).first.first 
-				       << " in time 25ns is == " << (*itr).second.e25 
-				       << " in time 25-50ns == " << (*itr).second.e50 
-				       << " in time 50-100ns == " << (*itr).second.e100 
-				       << " in time 100-250 ns == " << (*itr).second.e250;
+    edm::LogInfo("HitsValidationHcal") << " energy of tower =" << (*itr).first.first
+                                       << " in time 25ns is == " << (*itr).second.e25
+                                       << " in time 25-50ns == " << (*itr).second.e50
+                                       << " in time 50-100ns == " << (*itr).second.e100
+                                       << " in time 100-250 ns == " << (*itr).second.e250;
 #endif
   }
-  
 }
 
-SimHitsValidationHcal::etaRange SimHitsValidationHcal::getLimits (idType type){
-
-  int    bins;
-  std::pair<int,int> range;
+SimHitsValidationHcal::etaRange SimHitsValidationHcal::getLimits(idType type) {
+  int bins;
+  std::pair<int, int> range;
   double low, high;
-  
+
   if (type.subdet == HcalBarrel) {
     range = hcons->getEtaRange(0);
-    low  =-range.second;
+    low = -range.second;
     high = range.second;
-    bins = (high-low);
+    bins = (high - low);
   } else if (type.subdet == HcalEndcap) {
     range = hcons->getEtaRange(1);
-    bins = range.second- range.first;
+    bins = range.second - range.first;
     if (type.z == 1) {
-      low  = range.first;
+      low = range.first;
       high = range.second;
     } else {
-      low  =-range.second;
-      high =-range.first;
+      low = -range.second;
+      high = -range.first;
     }
   } else if (type.subdet == HcalOuter) {
     range = hcons->getEtaRange(3);
-    low  =-range.second;
+    low = -range.second;
     high = range.second;
-    bins = high-low;
+    bins = high - low;
   } else if (type.subdet == HcalForward) {
     range = hcons->getEtaRange(2);
-    bins = range.second-range.first;
+    bins = range.second - range.first;
     if (type.z == 1) {
-      low  = range.first;
+      low = range.first;
       high = range.second;
     } else {
-      low  =-range.second;
-      high =-range.first;
+      low = -range.second;
+      high = -range.first;
     }
   } else {
     bins = 82;
-    low  =-41;
+    low = -41;
     high = 41;
   }
 #ifdef DebugLog
-  edm::LogInfo("HitsValidationHcal") << "Subdetector:" << type.subdet << " z:" 
-				     << type.z << " range.first:" << range.first
-				     << " and second:" << range.second;
-  edm::LogInfo("HitsValidationHcal") << "bins: " << bins << " low:" << low 
-				     << " high:" << high;
+  edm::LogInfo("HitsValidationHcal") << "Subdetector:" << type.subdet << " z:" << type.z
+                                     << " range.first:" << range.first << " and second:" << range.second;
+  edm::LogInfo("HitsValidationHcal") << "bins: " << bins << " low:" << low << " high:" << high;
 #endif
   return SimHitsValidationHcal::etaRange(bins, low, high);
 }
 
-std::pair<int,int> SimHitsValidationHcal::histId(int subdet, int eta, int depth, unsigned int dep) {
-
+std::pair<int, int> SimHitsValidationHcal::histId(int subdet, int eta, int depth, unsigned int dep) {
   int id1(-1), id2(-1);
-  for (unsigned int k=0; k<types.size(); ++k) {
+  for (unsigned int k = 0; k < types.size(); ++k) {
     if (subdet == HcalForward) {
-      if (subdet == (int)(types[k].subdet) && depth == types[k].depth1 &&
-	  eta*types[k].z > 0 && dep == (unsigned int)(types[k].depth2)) {
-	id1 = k; break;
+      if (subdet == (int)(types[k].subdet) && depth == types[k].depth1 && eta * types[k].z > 0 &&
+          dep == (unsigned int)(types[k].depth2)) {
+        id1 = k;
+        break;
       }
     } else if (subdet == HcalEndcap) {
-      if (subdet == (int)(types[k].subdet) && depth == types[k].depth1 &&
-	  eta*types[k].z > 0) {
-	id1 = k; break;
+      if (subdet == (int)(types[k].subdet) && depth == types[k].depth1 && eta * types[k].z > 0) {
+        id1 = k;
+        break;
       }
     } else {
       if (subdet == (int)(types[k].subdet) && depth == types[k].depth1) {
-	id1 = k; break;
+        id1 = k;
+        break;
       }
     }
   }
-  if (subdet == HcalForward) depth += 2*dep;
-  for (unsigned int k=0; k<types.size(); ++k) {
+  if (subdet == HcalForward)
+    depth += 2 * dep;
+  for (unsigned int k = 0; k < types.size(); ++k) {
     if (types[k].subdet == HcalEmpty && types[k].depth1 == depth) {
-      id2 = k; 
+      id2 = k;
       break;
     }
   }
-  return std::pair<int,int>(id1,id2);
+  return std::pair<int, int>(id1, id2);
 }
 
-std::vector<std::pair<std::string,std::string> > SimHitsValidationHcal::getHistogramTypes() {
-
-  int maxDepth = std::max(maxDepthHB_,maxDepthHE_);
-  maxDepth = std::max(maxDepth,maxDepthHF_);
-  maxDepth = std::max(maxDepth,maxDepthHO_);
-
-  std::vector<std::pair<std::string,std::string> > divisions;
-  std::pair<std::string,std::string> names;
-  char                               name1[40], name2[40];
-  SimHitsValidationHcal::idType      type;
-  //first overall Hcal
-  for (int depth=0; depth<maxDepth; ++depth) {
-    snprintf (name1, 40, "HC%d", depth);
-    snprintf (name2, 40, "HCAL depth%d", depth+1);
-    names = std::pair<std::string,std::string>(std::string(name1),std::string(name2));
-    type  = SimHitsValidationHcal::idType(HcalEmpty,0,depth+1,depth+1);
+std::vector<std::pair<std::string, std::string>> SimHitsValidationHcal::getHistogramTypes() {
+  int maxDepth = std::max(maxDepthHB_, maxDepthHE_);
+  maxDepth = std::max(maxDepth, maxDepthHF_);
+  maxDepth = std::max(maxDepth, maxDepthHO_);
+
+  std::vector<std::pair<std::string, std::string>> divisions;
+  std::pair<std::string, std::string> names;
+  char name1[40], name2[40];
+  SimHitsValidationHcal::idType type;
+  // first overall Hcal
+  for (int depth = 0; depth < maxDepth; ++depth) {
+    snprintf(name1, 40, "HC%d", depth);
+    snprintf(name2, 40, "HCAL depth%d", depth + 1);
+    names = std::pair<std::string, std::string>(std::string(name1), std::string(name2));
+    type = SimHitsValidationHcal::idType(HcalEmpty, 0, depth + 1, depth + 1);
     divisions.push_back(names);
     types.push_back(type);
   }
-  //HB
-  for (int depth=0; depth<maxDepthHB_; ++depth) {
-    snprintf (name1, 40, "HB%d", depth);
-    snprintf (name2, 40, "HB depth%d", depth+1);
-    names = std::pair<std::string,std::string>(std::string(name1),std::string(name2));
-    type  = SimHitsValidationHcal::idType(HcalBarrel,0,depth+1,depth+1);
+  // HB
+  for (int depth = 0; depth < maxDepthHB_; ++depth) {
+    snprintf(name1, 40, "HB%d", depth);
+    snprintf(name2, 40, "HB depth%d", depth + 1);
+    names = std::pair<std::string, std::string>(std::string(name1), std::string(name2));
+    type = SimHitsValidationHcal::idType(HcalBarrel, 0, depth + 1, depth + 1);
     divisions.push_back(names);
     types.push_back(type);
   }
-  //HE
-  for (int depth=0; depth<maxDepthHE_; ++depth) {
-    snprintf (name1, 40, "HE%d+z", depth);
-    snprintf (name2, 40, "HE +z depth%d", depth+1);
-    names = std::pair<std::string,std::string>(std::string(name1),std::string(name2));
-    type  = SimHitsValidationHcal::idType(HcalEndcap,1,depth+1,depth+1);
+  // HE
+  for (int depth = 0; depth < maxDepthHE_; ++depth) {
+    snprintf(name1, 40, "HE%d+z", depth);
+    snprintf(name2, 40, "HE +z depth%d", depth + 1);
+    names = std::pair<std::string, std::string>(std::string(name1), std::string(name2));
+    type = SimHitsValidationHcal::idType(HcalEndcap, 1, depth + 1, depth + 1);
     divisions.push_back(names);
     types.push_back(type);
-    snprintf (name1, 40, "HE%d-z", depth);
-    snprintf (name2, 40, "HE -z depth%d", depth+1);
-    names = std::pair<std::string,std::string>(std::string(name1),std::string(name2));
-    type  = SimHitsValidationHcal::idType(HcalEndcap,-1,depth+1,depth+1);
+    snprintf(name1, 40, "HE%d-z", depth);
+    snprintf(name2, 40, "HE -z depth%d", depth + 1);
+    names = std::pair<std::string, std::string>(std::string(name1), std::string(name2));
+    type = SimHitsValidationHcal::idType(HcalEndcap, -1, depth + 1, depth + 1);
     divisions.push_back(names);
     types.push_back(type);
   }
-  //HO
+  // HO
   {
     int depth = maxDepthHO_;
-    snprintf (name1, 40, "HO%d", depth);
-    snprintf (name2, 40, "HO depth%d", depth);
-    names = std::pair<std::string,std::string>(std::string(name1),std::string(name2));
-    type  = SimHitsValidationHcal::idType(HcalOuter,0,depth,depth);
+    snprintf(name1, 40, "HO%d", depth);
+    snprintf(name2, 40, "HO depth%d", depth);
+    names = std::pair<std::string, std::string>(std::string(name1), std::string(name2));
+    type = SimHitsValidationHcal::idType(HcalOuter, 0, depth, depth);
     divisions.push_back(names);
     types.push_back(type);
   }
-  //HF (first absorber, then different types of abnormal hits)
-  std::string hfty1[4] = {"A","W","B","J"};
+  // HF (first absorber, then different types of abnormal hits)
+  std::string hfty1[4] = {"A", "W", "B", "J"};
   std::string hfty2[4] = {"Absorber", "Window", "Bundle", "Jungle"};
-  int         dept0[4] = {0, 1, 2, 3};
-  for (int k=0; k<4; ++k) {
-    for (int depth=0; depth<maxDepthHF_; ++depth) {
-      snprintf (name1, 40, "HF%s%d+z", hfty1[k].c_str(), depth);
-      snprintf (name2, 40, "HF (%s) +z depth%d", hfty2[k].c_str(), depth+1);
-      names = std::pair<std::string,std::string>(std::string(name1),std::string(name2));
-      type  = SimHitsValidationHcal::idType(HcalForward,1,depth+1,dept0[k]);
+  int dept0[4] = {0, 1, 2, 3};
+  for (int k = 0; k < 4; ++k) {
+    for (int depth = 0; depth < maxDepthHF_; ++depth) {
+      snprintf(name1, 40, "HF%s%d+z", hfty1[k].c_str(), depth);
+      snprintf(name2, 40, "HF (%s) +z depth%d", hfty2[k].c_str(), depth + 1);
+      names = std::pair<std::string, std::string>(std::string(name1), std::string(name2));
+      type = SimHitsValidationHcal::idType(HcalForward, 1, depth + 1, dept0[k]);
       divisions.push_back(names);
       types.push_back(type);
-      snprintf (name1, 40, "HF%s%d-z", hfty1[k].c_str(), depth);
-      snprintf (name2, 40, "HF (%s) -z depth%d", hfty2[k].c_str(), depth+1);
-      names = std::pair<std::string,std::string>(std::string(name1),std::string(name2));
-      type  = SimHitsValidationHcal::idType(HcalForward,-1,depth+1,dept0[k]);
+      snprintf(name1, 40, "HF%s%d-z", hfty1[k].c_str(), depth);
+      snprintf(name2, 40, "HF (%s) -z depth%d", hfty2[k].c_str(), depth + 1);
+      names = std::pair<std::string, std::string>(std::string(name1), std::string(name2));
+      type = SimHitsValidationHcal::idType(HcalForward, -1, depth + 1, dept0[k]);
       divisions.push_back(names);
       types.push_back(type);
     }
@@ -471,12 +461,12 @@ std::vector<std::pair<std::string,std::string> > SimHitsValidationHcal::getHisto
   return divisions;
 }
 
-void SimHitsValidationHcal::fillDescriptions(edm::ConfigurationDescriptions & descriptions){
+void SimHitsValidationHcal::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
   edm::ParameterSetDescription desc;
-  desc.add<std::string>("ModuleLabel","g4SimHits");
-  desc.add<std::string>("HitCollection","HcalHits");
-  desc.add<bool>("Verbose",false);
-  desc.add<bool>("TestNumber",false);
+  desc.add<std::string>("ModuleLabel", "g4SimHits");
+  desc.add<std::string>("HitCollection", "HcalHits");
+  desc.add<bool>("Verbose", false);
+  desc.add<bool>("TestNumber", false);
 
   descriptions.addDefault(desc);
 }
diff --git a/Validation/HcalHits/src/ZdcSimHitStudy.cc b/Validation/HcalHits/src/ZdcSimHitStudy.cc
index d2c248d0745da..65083c0ec7b8e 100644
--- a/Validation/HcalHits/src/ZdcSimHitStudy.cc
+++ b/Validation/HcalHits/src/ZdcSimHitStudy.cc
@@ -4,502 +4,518 @@
 //
 /*
   Description:
-  This code has been developed to be a check for the ZDC sim. In 2009, it was found that the ZDC Simulation was unrealistic and needed repair. The aim of this code is to show the user the input and output of a ZDC MinBias simulation.
+  This code has been developed to be a check for the ZDC sim. In 2009, it was
+  found that the ZDC Simulation was unrealistic and needed repair. The aim of
+  this code is to show the user the input and output of a ZDC MinBias
+  simulation.
 
   Implementation:
-  First a MinBias simulation should be run, it could be pythia,hijin,or hydjet. This will output a .root file which should have information about recoGenParticles, and g4SimHits_ZDCHits. Use this .root file as the input into the cfg.py which is found in the main directory of this package. This output will be another .root file which is meant to be viewed in a TBrowser.
+  First a MinBias simulation should be run, it could be pythia,hijin,or hydjet.
+  This will output a .root file which should have information about
+  recoGenParticles, and g4SimHits_ZDCHits. Use this .root file as the input into
+  the cfg.py which is found in the main directory of this package. This output
+  will be another .root file which is meant to be viewed in a TBrowser.
 
 */
 //
-// Original Author: Jaime Gomez (U. of Maryland) with SIGNIFICANT assistance of Dr. Jefferey Temple (U. of Maryland)
-// Adapted from: E. Garcia-Solis' (CSU) original code
+// Original Author: Jaime Gomez (U. of Maryland) with SIGNIFICANT assistance of
+// Dr. Jefferey Temple (U. of Maryland) Adapted from: E. Garcia-Solis' (CSU)
+// original code
 //
 //         Created:  Summer 2012
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-
-
-
-
-#include "Validation/HcalHits/interface/ZdcSimHitStudy.h"
 #include "DataFormats/HcalDetId/interface/HcalZDCDetId.h"
+#include "Validation/HcalHits/interface/ZdcSimHitStudy.h"
 
-#include "FWCore/Utilities/interface/Exception.h"
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include "FWCore/Utilities/interface/Exception.h"
 
-ZdcSimHitStudy::ZdcSimHitStudy(const edm::ParameterSet& ps) {
-
-  g4Label  = ps.getUntrackedParameter<std::string>("moduleLabel","g4SimHits");
-  zdcHits = ps.getUntrackedParameter<std::string>("HitCollection","ZdcHits");
+ZdcSimHitStudy::ZdcSimHitStudy(const edm::ParameterSet &ps) {
+  g4Label = ps.getUntrackedParameter<std::string>("moduleLabel", "g4SimHits");
+  zdcHits = ps.getUntrackedParameter<std::string>("HitCollection", "ZdcHits");
   outFile_ = ps.getUntrackedParameter<std::string>("outputFile", "zdcHitStudy.root");
   verbose_ = ps.getUntrackedParameter<bool>("Verbose", false);
-  checkHit_= true;
+  checkHit_ = true;
 
   tok_gen_ = consumes<reco::GenParticleCollection>(edm::InputTag("genParticles"));
-  tok_hits_ = consumes<edm::PCaloHitContainer>(edm::InputTag(g4Label,zdcHits));
+  tok_hits_ = consumes<edm::PCaloHitContainer>(edm::InputTag(g4Label, zdcHits));
 
   edm::LogInfo("ZdcSimHitStudy")
-    //std::cout
-    << "Module Label: " << g4Label << "   Hits: "
-    << zdcHits << " / "<< checkHit_
-    << "   Output: " << outFile_;
-
+      // std::cout
+      << "Module Label: " << g4Label << "   Hits: " << zdcHits << " / " << checkHit_ << "   Output: " << outFile_;
 }
 
 ZdcSimHitStudy::~ZdcSimHitStudy() {}
 
 void ZdcSimHitStudy::bookHistograms(DQMStore::IBooker &ib, edm::Run const &run, edm::EventSetup const &es) {
   ib.setCurrentFolder("ZDCValidation");
-  //Histograms for Hits
+  // Histograms for Hits
   /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-  //# Below we are filling the histograms made in the .h file. The syntax is as follows:                                      #
-  //# plot_code_name = ib.TypeofPlot[(1,2,3)-D,(F,I,D)]("Name as it will appear","Title",axis options);                    #
-  //# They will be stored in the TFile subdirectory set by :    ib.setCurrentFolder("FolderIwant")                         #
-  //# axis options are like (#ofbins,min,max)                                                                                 #
+  //# Below we are filling the histograms made in the .h file. The syntax is as
+  // follows:                                      # # plot_code_name =
+  // ib.TypeofPlot[(1,2,3)-D,(F,I,D)]("Name as it will appear","Title",axis
+  // options);                    # # They will be stored in the TFile
+  // subdirectory set by :    ib.setCurrentFolder("FolderIwant") # # axis
+  // options are like (#ofbins,min,max) #
   /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-
   if (checkHit_) {
     /////////////////////////1///////////////////////////
     ib.setCurrentFolder("ZDCValidation/ZdcSimHits");
-    meAllZdcNHit_ = ib.book1D("ZDC Hits","Number of All Hits in ZDC",100,0.,100.);
-    meAllZdcNHit_->setAxisTitle("Total Hits",1);
-    meAllZdcNHit_->setAxisTitle("Counts",2);
+    meAllZdcNHit_ = ib.book1D("ZDC Hits", "Number of All Hits in ZDC", 100, 0., 100.);
+    meAllZdcNHit_->setAxisTitle("Total Hits", 1);
+    meAllZdcNHit_->setAxisTitle("Counts", 2);
     /////////////////////////2///////////////////////////
     ib.setCurrentFolder("ZDCValidation/ZdcSimHits/Excess_Info/Debug_Helper");
-    meBadZdcDetHit_= ib.book1D("Hiits with the wrong Det","Hits with wrong Det in ZDC",100,0.,100.);
-    meBadZdcDetHit_->setAxisTitle("Wrong Hits",1);
-    meBadZdcDetHit_->setAxisTitle("Counts",2);
+    meBadZdcDetHit_ = ib.book1D("Hiits with the wrong Det", "Hits with wrong Det in ZDC", 100, 0., 100.);
+    meBadZdcDetHit_->setAxisTitle("Wrong Hits", 1);
+    meBadZdcDetHit_->setAxisTitle("Counts", 2);
     /////////////////////////3///////////////////////////
-    meBadZdcSecHit_= ib.book1D("Wrong Section Hits","Hits with wrong Section in ZDC",100,0.,100.);
-    meBadZdcSecHit_->setAxisTitle("Hits in wrong section",1);
-    meBadZdcSecHit_->setAxisTitle("Counts",2);
+    meBadZdcSecHit_ = ib.book1D("Wrong Section Hits", "Hits with wrong Section in ZDC", 100, 0., 100.);
+    meBadZdcSecHit_->setAxisTitle("Hits in wrong section", 1);
+    meBadZdcSecHit_->setAxisTitle("Counts", 2);
     /////////////////////////4///////////////////////////
-    meBadZdcIdHit_ = ib.book1D("Wrong_ID_Hits","Hits with wrong ID in ZDC",100,0.,100.);
-    meBadZdcIdHit_->setAxisTitle("Hits with wrong ID",1);
-    meBadZdcIdHit_->setAxisTitle("Counts",2);
+    meBadZdcIdHit_ = ib.book1D("Wrong_ID_Hits", "Hits with wrong ID in ZDC", 100, 0., 100.);
+    meBadZdcIdHit_->setAxisTitle("Hits with wrong ID", 1);
+    meBadZdcIdHit_->setAxisTitle("Counts", 2);
     /////////////////////////5///////////////////////////
     ib.setCurrentFolder("ZDCValidation/ZdcSimHits/Excess_Info/BasicHitInfo");
-    meZdcNHitEM_   = ib.book1D("Hits in EM","Number of Hits in ZDC EM",100,0.,100.);
-    meZdcNHitEM_->setAxisTitle("EM Hits",1);
-    meZdcNHitEM_->setAxisTitle("Counts",2);
+    meZdcNHitEM_ = ib.book1D("Hits in EM", "Number of Hits in ZDC EM", 100, 0., 100.);
+    meZdcNHitEM_->setAxisTitle("EM Hits", 1);
+    meZdcNHitEM_->setAxisTitle("Counts", 2);
     /////////////////////////6///////////////////////////
-    meZdcNHitHad_   = ib.book1D("Hits in HAD","Number of Hits in ZDC Had",100,0.,100.);
-    meZdcNHitHad_->setAxisTitle("HAD Hits",1);
-    meZdcNHitHad_->setAxisTitle("Counts",2);
+    meZdcNHitHad_ = ib.book1D("Hits in HAD", "Number of Hits in ZDC Had", 100, 0., 100.);
+    meZdcNHitHad_->setAxisTitle("HAD Hits", 1);
+    meZdcNHitHad_->setAxisTitle("Counts", 2);
     /////////////////////////7///////////////////////////
-    meZdcNHitLum_   = ib.book1D("Hits in LUM","Number of Hits in ZDC Lum",100,0.,100.);
-    meZdcNHitLum_->setAxisTitle("LUM Hits",1);
-    meZdcNHitLum_->setAxisTitle("Counts",2);
+    meZdcNHitLum_ = ib.book1D("Hits in LUM", "Number of Hits in ZDC Lum", 100, 0., 100.);
+    meZdcNHitLum_->setAxisTitle("LUM Hits", 1);
+    meZdcNHitLum_->setAxisTitle("Counts", 2);
     /////////////////////////8///////////////////////////
-    meZdcDetectHit_= ib.book1D("Calo Detector ID","Calo Detector ID",50,0.,50.);
-    meZdcDetectHit_->setAxisTitle("Detector Hits",1);
-    meZdcDetectHit_->setAxisTitle("Counts",2);
+    meZdcDetectHit_ = ib.book1D("Calo Detector ID", "Calo Detector ID", 50, 0., 50.);
+    meZdcDetectHit_->setAxisTitle("Detector Hits", 1);
+    meZdcDetectHit_->setAxisTitle("Counts", 2);
     /////////////////////////9///////////////////////////
-    meZdcSideHit_ = ib.book1D("ZDC Side","Side in ZDC",4,-2,2.);
-    meZdcSideHit_->setAxisTitle("ZDC Side",1);
-    meZdcSideHit_->setAxisTitle("Counts",2);
+    meZdcSideHit_ = ib.book1D("ZDC Side", "Side in ZDC", 4, -2, 2.);
+    meZdcSideHit_->setAxisTitle("ZDC Side", 1);
+    meZdcSideHit_->setAxisTitle("Counts", 2);
     /////////////////////////10///////////////////////////
-    meZdcSectionHit_   = ib.book1D("ZDC Section","Section in ZDC",4,0.,4.);
-    meZdcSectionHit_->setAxisTitle("ZDC Section",1);
-    meZdcSectionHit_->setAxisTitle("Counts",2);
+    meZdcSectionHit_ = ib.book1D("ZDC Section", "Section in ZDC", 4, 0., 4.);
+    meZdcSectionHit_->setAxisTitle("ZDC Section", 1);
+    meZdcSectionHit_->setAxisTitle("Counts", 2);
     /////////////////////////11///////////////////////////
-    meZdcChannelHit_   = ib.book1D("ZDC Channel","Channel in ZDC",10,0.,10.);
-    meZdcChannelHit_->setAxisTitle("ZDC Channel",1);
-    meZdcChannelHit_->setAxisTitle("Counts",2);
+    meZdcChannelHit_ = ib.book1D("ZDC Channel", "Channel in ZDC", 10, 0., 10.);
+    meZdcChannelHit_->setAxisTitle("ZDC Channel", 1);
+    meZdcChannelHit_->setAxisTitle("Counts", 2);
     /////////////////////////12///////////////////////////
     ib.setCurrentFolder("ZDCValidation/ZdcSimHits/");
-    meZdcEnergyHit_= ib.book1D("Hit Energy","Hits Energy",4000,0.,8000.);
-    meZdcEnergyHit_->setAxisTitle("Counts",2);
-    meZdcEnergyHit_->setAxisTitle("Energy (GeV)",1);
+    meZdcEnergyHit_ = ib.book1D("Hit Energy", "Hits Energy", 4000, 0., 8000.);
+    meZdcEnergyHit_->setAxisTitle("Counts", 2);
+    meZdcEnergyHit_->setAxisTitle("Energy (GeV)", 1);
     /////////////////////////13///////////////////////////
-    meZdcHadEnergyHit_= ib.book1D("Hit Energy HAD","Hits Energy in Had Section",4000,0.,8000.);
-    meZdcHadEnergyHit_->setAxisTitle("Counts",2);
-    meZdcHadEnergyHit_->setAxisTitle("Energy (GeV)",1);
+    meZdcHadEnergyHit_ = ib.book1D("Hit Energy HAD", "Hits Energy in Had Section", 4000, 0., 8000.);
+    meZdcHadEnergyHit_->setAxisTitle("Counts", 2);
+    meZdcHadEnergyHit_->setAxisTitle("Energy (GeV)", 1);
     /////////////////////////14///////////////////////////
-    meZdcEMEnergyHit_ = ib.book1D("Hit Energy EM","Hits Energy in EM Section",4000,0.,8000.);
-    meZdcEMEnergyHit_->setAxisTitle("Counts",2);
-    meZdcEMEnergyHit_->setAxisTitle("Energy (GeV)",1);
+    meZdcEMEnergyHit_ = ib.book1D("Hit Energy EM", "Hits Energy in EM Section", 4000, 0., 8000.);
+    meZdcEMEnergyHit_->setAxisTitle("Counts", 2);
+    meZdcEMEnergyHit_->setAxisTitle("Energy (GeV)", 1);
     /////////////////////////15///////////////////////////
     ib.setCurrentFolder("ZDCValidation/ZdcSimHits/Excess_Info/BasicHitInfo");
-    meZdcTimeHit_  = ib.book1D("Time in ZDC","Time in ZDC",300,0.,600.);
-    meZdcTimeHit_->setAxisTitle("Time (ns)",1);
-    meZdcTimeHit_->setAxisTitle("Counts",2);
+    meZdcTimeHit_ = ib.book1D("Time in ZDC", "Time in ZDC", 300, 0., 600.);
+    meZdcTimeHit_->setAxisTitle("Time (ns)", 1);
+    meZdcTimeHit_->setAxisTitle("Counts", 2);
     /////////////////////////16///////////////////////////
-    meZdcTimeWHit_ = ib.book1D("Energy Weighted Time in ZDC","Time in ZDC (E wtd)", 300,0.,600.);
-    meZdcTimeWHit_->setAxisTitle("Time (ns)",1);
-    meZdcTimeWHit_->setAxisTitle("Counts",2);
+    meZdcTimeWHit_ = ib.book1D("Energy Weighted Time in ZDC", "Time in ZDC (E wtd)", 300, 0., 600.);
+    meZdcTimeWHit_->setAxisTitle("Time (ns)", 1);
+    meZdcTimeWHit_->setAxisTitle("Counts", 2);
     /////////////////////////17///////////////////////////
-    meZdc10Ene_ = ib.book1D("ZDC Log(E)","Log10Energy in ZDC", 140, -20., 20. );
-    meZdc10Ene_->setAxisTitle("Log(E) (GeV)",1);
-    meZdc10Ene_->setAxisTitle("Counts",2);
+    meZdc10Ene_ = ib.book1D("ZDC Log(E)", "Log10Energy in ZDC", 140, -20., 20.);
+    meZdc10Ene_->setAxisTitle("Log(E) (GeV)", 1);
+    meZdc10Ene_->setAxisTitle("Counts", 2);
     /////////////////////////18///////////////////////////
-    meZdcHadL10EneP_ = ib.bookProfile("Log(EHAD) vs Contribution","Log10Energy in Had ZDC vs Hit contribution", 140, -1., 20., 100, 0., 1. );
-    meZdcHadL10EneP_->setAxisTitle("Log(EHAD) (GeV)",1);
-    meZdcHadL10EneP_->setAxisTitle("Counts",2);
+    meZdcHadL10EneP_ = ib.bookProfile(
+        "Log(EHAD) vs Contribution", "Log10Energy in Had ZDC vs Hit contribution", 140, -1., 20., 100, 0., 1.);
+    meZdcHadL10EneP_->setAxisTitle("Log(EHAD) (GeV)", 1);
+    meZdcHadL10EneP_->setAxisTitle("Counts", 2);
     /////////////////////////19///////////////////////////
-    meZdcEML10EneP_ = ib.bookProfile("Log(EEM) vs Contribution","Log10Energy in EM ZDC vs Hit contribution", 140, -1., 20., 100, 0., 1. );
-    meZdcEML10EneP_->setAxisTitle("Log(EEM) (GeV)",1);
-    meZdcEML10EneP_->setAxisTitle("Counts",2);
+    meZdcEML10EneP_ = ib.bookProfile(
+        "Log(EEM) vs Contribution", "Log10Energy in EM ZDC vs Hit contribution", 140, -1., 20., 100, 0., 1.);
+    meZdcEML10EneP_->setAxisTitle("Log(EEM) (GeV)", 1);
+    meZdcEML10EneP_->setAxisTitle("Counts", 2);
     /////////////////////////20///////////////////////////
     ib.setCurrentFolder("ZDCValidation/ZdcSimHits");
-    meZdcEHadCh_ = ib.book2D("ZDC EHAD vs Channel","ZDC Had Section Energy vs Channel", 4000, 0., 8000., 6, 0., 6. );
-    meZdcEHadCh_->setAxisTitle("Hadronic Channel Number",2);
-    meZdcEHadCh_->setAxisTitle("Energy (GeV)",1);
+    meZdcEHadCh_ = ib.book2D("ZDC EHAD vs Channel", "ZDC Had Section Energy vs Channel", 4000, 0., 8000., 6, 0., 6.);
+    meZdcEHadCh_->setAxisTitle("Hadronic Channel Number", 2);
+    meZdcEHadCh_->setAxisTitle("Energy (GeV)", 1);
     /////////////////////////21///////////////////////////
-    meZdcEEMCh_ = ib.book2D("ZDC EEM vs Channel","ZDC EM Section Energy vs Channel", 4000, 0., 8000., 6, 0., 6. );
-    meZdcEEMCh_->setAxisTitle("EM Channel Number",2);
-    meZdcEEMCh_->setAxisTitle("Energy (GeV)",1);
+    meZdcEEMCh_ = ib.book2D("ZDC EEM vs Channel", "ZDC EM Section Energy vs Channel", 4000, 0., 8000., 6, 0., 6.);
+    meZdcEEMCh_->setAxisTitle("EM Channel Number", 2);
+    meZdcEEMCh_->setAxisTitle("Energy (GeV)", 1);
     /////////////////////////22///////////////////////////
     ib.setCurrentFolder("ZDCValidation/ZdcSimHits/Excess_Info/BasicHitInfo");
-    meZdcETime_ = ib.book2D("E vs T","Hits ZDC Energy vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcETime_->setAxisTitle("Energy (GeV)",1);
-    meZdcETime_->setAxisTitle("Time (ns)",2);
+    meZdcETime_ = ib.book2D("E vs T", "Hits ZDC Energy vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcETime_->setAxisTitle("Energy (GeV)", 1);
+    meZdcETime_->setAxisTitle("Time (ns)", 2);
     /////////////////////////23///////////////////////////
     ib.setCurrentFolder("ZDCValidation/ZdcSimHits/ENERGY_SUMS/Individual_Channels/NZDC");
-    meZdcEneEmN1_  = ib.book1D("NZDC EM1 Energy","Energy EM module N1",4000,0.,8000.);
-    meZdcEneEmN1_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneEmN1_->setAxisTitle("Counts",2);
+    meZdcEneEmN1_ = ib.book1D("NZDC EM1 Energy", "Energy EM module N1", 4000, 0., 8000.);
+    meZdcEneEmN1_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneEmN1_->setAxisTitle("Counts", 2);
     /////////////////////////24///////////////////////////
-    meZdcEneEmN2_  = ib.book1D("NZDC EM2 Energy","Energy EM module N2",4000,0.,8000.);
-    meZdcEneEmN2_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneEmN2_->setAxisTitle("Counts",2);
+    meZdcEneEmN2_ = ib.book1D("NZDC EM2 Energy", "Energy EM module N2", 4000, 0., 8000.);
+    meZdcEneEmN2_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneEmN2_->setAxisTitle("Counts", 2);
     /////////////////////////25///////////////////////////
-    meZdcEneEmN3_  = ib.book1D("NZDC EM3 Energy","Energy EM module N3",4000,0.,8000.);
-    meZdcEneEmN3_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneEmN3_->setAxisTitle("Counts",2);
+    meZdcEneEmN3_ = ib.book1D("NZDC EM3 Energy", "Energy EM module N3", 4000, 0., 8000.);
+    meZdcEneEmN3_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneEmN3_->setAxisTitle("Counts", 2);
     /////////////////////////26///////////////////////////
-    meZdcEneEmN4_  = ib.book1D("NZDC EM4 Energy","Energy EM module N4",4000,0.,8000.);
-    meZdcEneEmN4_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneEmN4_->setAxisTitle("Counts",2);
+    meZdcEneEmN4_ = ib.book1D("NZDC EM4 Energy", "Energy EM module N4", 4000, 0., 8000.);
+    meZdcEneEmN4_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneEmN4_->setAxisTitle("Counts", 2);
     /////////////////////////27///////////////////////////
-    meZdcEneEmN5_  = ib.book1D("NZDC EM5 Energy","Energy EM module N5",4000,0.,8000.);
-    meZdcEneEmN5_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneEmN5_->setAxisTitle("Counts",2);
+    meZdcEneEmN5_ = ib.book1D("NZDC EM5 Energy", "Energy EM module N5", 4000, 0., 8000.);
+    meZdcEneEmN5_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneEmN5_->setAxisTitle("Counts", 2);
     /////////////////////////28///////////////////////////
-    meZdcEneHadN1_ = ib.book1D("NZDC HAD1 Energy","Energy HAD module N1",4000,0.,8000.);
-    meZdcEneHadN1_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneHadN1_->setAxisTitle("Counts",2);
+    meZdcEneHadN1_ = ib.book1D("NZDC HAD1 Energy", "Energy HAD module N1", 4000, 0., 8000.);
+    meZdcEneHadN1_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneHadN1_->setAxisTitle("Counts", 2);
     /////////////////////////29///////////////////////////
-    meZdcEneHadN2_ = ib.book1D("NZDC HAD2 Energy","Energy HAD module N2",4000,0.,8000.);
-    meZdcEneHadN2_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneHadN2_->setAxisTitle("Counts",2);
+    meZdcEneHadN2_ = ib.book1D("NZDC HAD2 Energy", "Energy HAD module N2", 4000, 0., 8000.);
+    meZdcEneHadN2_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneHadN2_->setAxisTitle("Counts", 2);
     /////////////////////////30///////////////////////////
-    meZdcEneHadN3_ = ib.book1D("NZDC HAD3 Energy","Energy HAD module N3",4000,0.,8000.);
-    meZdcEneHadN3_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneHadN3_->setAxisTitle("Counts",2);
+    meZdcEneHadN3_ = ib.book1D("NZDC HAD3 Energy", "Energy HAD module N3", 4000, 0., 8000.);
+    meZdcEneHadN3_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneHadN3_->setAxisTitle("Counts", 2);
     /////////////////////////31///////////////////////////
-    meZdcEneHadN4_ = ib.book1D("NZDC HAD4 Energy","Energy HAD module N4",4000,0.,8000.);
-    meZdcEneHadN4_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneHadN4_->setAxisTitle("Counts",2);
+    meZdcEneHadN4_ = ib.book1D("NZDC HAD4 Energy", "Energy HAD module N4", 4000, 0., 8000.);
+    meZdcEneHadN4_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneHadN4_->setAxisTitle("Counts", 2);
     /////////////////////////32///////////////////////////
     ib.setCurrentFolder("ZDCValidation/ZdcSimHits/Excess_Info/Individual_ChannelvsTime/NZDC");
-    meZdcEneTEmN1_ = ib.book2D("NZDC EM1 Energy vs Time","Energy EM mod N1 vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcEneTEmN1_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneTEmN1_->setAxisTitle("Time (ns)",2);
+    meZdcEneTEmN1_ = ib.book2D("NZDC EM1 Energy vs Time", "Energy EM mod N1 vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcEneTEmN1_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneTEmN1_->setAxisTitle("Time (ns)", 2);
     /////////////////////////33///////////////////////////
-    meZdcEneTEmN2_ = ib.book2D("NZDC EM2 Energy vs Time","Energy EM mod N2 vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcEneTEmN2_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneTEmN2_->setAxisTitle("Time (ns)",2);
+    meZdcEneTEmN2_ = ib.book2D("NZDC EM2 Energy vs Time", "Energy EM mod N2 vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcEneTEmN2_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneTEmN2_->setAxisTitle("Time (ns)", 2);
     /////////////////////////34///////////////////////////
-    meZdcEneTEmN3_ = ib.book2D("NZDC EM3 Energy vs Time","Energy EM mod N3 vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcEneTEmN3_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneTEmN3_->setAxisTitle("Time (ns)",2);
+    meZdcEneTEmN3_ = ib.book2D("NZDC EM3 Energy vs Time", "Energy EM mod N3 vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcEneTEmN3_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneTEmN3_->setAxisTitle("Time (ns)", 2);
     /////////////////////////35///////////////////////////
-    meZdcEneTEmN4_ = ib.book2D("NZDC EM4 Energy vs Time","Energy EM mod N4 vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcEneTEmN4_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneTEmN4_->setAxisTitle("Time (ns)",2);
+    meZdcEneTEmN4_ = ib.book2D("NZDC EM4 Energy vs Time", "Energy EM mod N4 vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcEneTEmN4_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneTEmN4_->setAxisTitle("Time (ns)", 2);
     /////////////////////////36///////////////////////////
-    meZdcEneTEmN5_ = ib.book2D("NZDC EM5 Energy vs Time","Energy EM mod N5 vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcEneTEmN5_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneTEmN5_->setAxisTitle("Time (ns)",2);
+    meZdcEneTEmN5_ = ib.book2D("NZDC EM5 Energy vs Time", "Energy EM mod N5 vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcEneTEmN5_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneTEmN5_->setAxisTitle("Time (ns)", 2);
     /////////////////////////37///////////////////////////
-    meZdcEneTHadN1_ = ib.book2D("NZDC HAD1 Energy vs Time","Energy HAD mod N1 vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcEneTHadN1_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneTHadN1_->setAxisTitle("Time (ns)",2);
+    meZdcEneTHadN1_ =
+        ib.book2D("NZDC HAD1 Energy vs Time", "Energy HAD mod N1 vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcEneTHadN1_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneTHadN1_->setAxisTitle("Time (ns)", 2);
     /////////////////////////38///////////////////////////
-    meZdcEneTHadN2_ = ib.book2D("NZDC HAD2 Energy vs Time","Energy HAD mod N2 vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcEneTHadN2_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneTHadN2_->setAxisTitle("Time (ns)",2);
+    meZdcEneTHadN2_ =
+        ib.book2D("NZDC HAD2 Energy vs Time", "Energy HAD mod N2 vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcEneTHadN2_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneTHadN2_->setAxisTitle("Time (ns)", 2);
     /////////////////////////39///////////////////////////
-    meZdcEneTHadN3_ = ib.book2D("NZDC HAD3 Energy vs Time","Energy HAD mod N3 vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcEneTHadN3_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneTHadN3_->setAxisTitle("Time (ns)",2);
+    meZdcEneTHadN3_ =
+        ib.book2D("NZDC HAD3 Energy vs Time", "Energy HAD mod N3 vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcEneTHadN3_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneTHadN3_->setAxisTitle("Time (ns)", 2);
     /////////////////////////40///////////////////////////
-    meZdcEneTHadN4_ = ib.book2D("NZDC HAD4 Energy vs Time","Energy HAD mod N4 vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcEneTHadN4_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneTHadN4_->setAxisTitle("Time (ns)",2);
+    meZdcEneTHadN4_ =
+        ib.book2D("NZDC HAD4 Energy vs Time", "Energy HAD mod N4 vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcEneTHadN4_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneTHadN4_->setAxisTitle("Time (ns)", 2);
     /////////////////////////41///////////////////////////
     ib.setCurrentFolder("ZDCValidation/ZdcSimHits/ENERGY_SUMS/NZDC");
-    meZdcEneHadNTot_ = ib.book1D("NZDC EHAD","Total N-ZDC HAD Energy",4000,0.,4000.);
-    meZdcEneHadNTot_->setAxisTitle("Counts",2);
-    meZdcEneHadNTot_->setAxisTitle("Energy (GeV)",1);
+    meZdcEneHadNTot_ = ib.book1D("NZDC EHAD", "Total N-ZDC HAD Energy", 4000, 0., 4000.);
+    meZdcEneHadNTot_->setAxisTitle("Counts", 2);
+    meZdcEneHadNTot_->setAxisTitle("Energy (GeV)", 1);
     /////////////////////////42///////////////////////////
-    meZdcEneEmNTot_ = ib.book1D("NZDC EEM","Total N-ZDC EM Energy",3000,0.,3000.);
-    meZdcEneEmNTot_->setAxisTitle("Counts",2);
-    meZdcEneEmNTot_->setAxisTitle("Energy (GeV)",1);
+    meZdcEneEmNTot_ = ib.book1D("NZDC EEM", "Total N-ZDC EM Energy", 3000, 0., 3000.);
+    meZdcEneEmNTot_->setAxisTitle("Counts", 2);
+    meZdcEneEmNTot_->setAxisTitle("Energy (GeV)", 1);
     /////////////////////////43///////////////////////////
-    meZdcEneNTot_ = ib.book1D("NZDC ETOT","Total N-ZDC Energy ",7000,0.,7000.);
-    meZdcEneNTot_->setAxisTitle("Counts",2);
-    meZdcEneNTot_->setAxisTitle("Energy (GeV)",1);
+    meZdcEneNTot_ = ib.book1D("NZDC ETOT", "Total N-ZDC Energy ", 7000, 0., 7000.);
+    meZdcEneNTot_->setAxisTitle("Counts", 2);
+    meZdcEneNTot_->setAxisTitle("Energy (GeV)", 1);
     /////////////////////////44///////////////////////////
     ib.setCurrentFolder("ZDCValidation/ZdcSimHits/ENERGY_SUMS/Individual_Channels/PZDC");
-    meZdcEneEmP1_ = ib.book1D("PZDC EM1 Energy","Energy EM module P1",3000,0.,3000.);
-    meZdcEneEmP1_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneEmP1_->setAxisTitle("Counts",2);
+    meZdcEneEmP1_ = ib.book1D("PZDC EM1 Energy", "Energy EM module P1", 3000, 0., 3000.);
+    meZdcEneEmP1_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneEmP1_->setAxisTitle("Counts", 2);
     /////////////////////////45///////////////////////////
-    meZdcEneEmP2_ = ib.book1D("PZDC EM2 Energy","Energy EM module P2",3000,0.,3000.);
-    meZdcEneEmP2_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneEmP2_->setAxisTitle("Counts",2);
+    meZdcEneEmP2_ = ib.book1D("PZDC EM2 Energy", "Energy EM module P2", 3000, 0., 3000.);
+    meZdcEneEmP2_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneEmP2_->setAxisTitle("Counts", 2);
     /////////////////////////46///////////////////////////
-    meZdcEneEmP3_ = ib.book1D("PZDC EM3 Energy","Energy EM module P3",3000,0.,3000.);
-    meZdcEneEmP3_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneEmP3_->setAxisTitle("Counts",2);
+    meZdcEneEmP3_ = ib.book1D("PZDC EM3 Energy", "Energy EM module P3", 3000, 0., 3000.);
+    meZdcEneEmP3_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneEmP3_->setAxisTitle("Counts", 2);
     /////////////////////////47///////////////////////////
-    meZdcEneEmP4_ = ib.book1D("PZDC EM4 Energy","Energy EM module P4",3000,0.,3000.);
-    meZdcEneEmP4_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneEmP4_->setAxisTitle("Counts",2);
+    meZdcEneEmP4_ = ib.book1D("PZDC EM4 Energy", "Energy EM module P4", 3000, 0., 3000.);
+    meZdcEneEmP4_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneEmP4_->setAxisTitle("Counts", 2);
     /////////////////////////48///////////////////////////
-    meZdcEneEmP5_ = ib.book1D("PZDC EM5 Energy","Energy EM module P5",3000,0.,3000.);
-    meZdcEneEmP5_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneEmP5_->setAxisTitle("Counts",2);
+    meZdcEneEmP5_ = ib.book1D("PZDC EM5 Energy", "Energy EM module P5", 3000, 0., 3000.);
+    meZdcEneEmP5_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneEmP5_->setAxisTitle("Counts", 2);
     /////////////////////////49///////////////////////////
-    meZdcEneHadP1_ = ib.book1D("PZDC HAD1 Energy","Energy HAD module P1",3000,0.,3000.);
-    meZdcEneHadP1_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneHadP1_->setAxisTitle("Counts",2);
+    meZdcEneHadP1_ = ib.book1D("PZDC HAD1 Energy", "Energy HAD module P1", 3000, 0., 3000.);
+    meZdcEneHadP1_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneHadP1_->setAxisTitle("Counts", 2);
     /////////////////////////50///////////////////////////
-    meZdcEneHadP2_ = ib.book1D("PZDC HAD2 Energy","Energy HAD module P2",3000,0.,3000.);
-    meZdcEneHadP2_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneHadP2_->setAxisTitle("Counts",2);
+    meZdcEneHadP2_ = ib.book1D("PZDC HAD2 Energy", "Energy HAD module P2", 3000, 0., 3000.);
+    meZdcEneHadP2_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneHadP2_->setAxisTitle("Counts", 2);
     /////////////////////////51///////////////////////////
-    meZdcEneHadP3_ = ib.book1D("PZDC HAD3 Energy","Energy HAD module P3",3000,0.,3000.);
-    meZdcEneHadP3_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneHadP3_->setAxisTitle("Counts",2);
+    meZdcEneHadP3_ = ib.book1D("PZDC HAD3 Energy", "Energy HAD module P3", 3000, 0., 3000.);
+    meZdcEneHadP3_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneHadP3_->setAxisTitle("Counts", 2);
     /////////////////////////52///////////////////////////
-    meZdcEneHadP4_ = ib.book1D("PZDC HAD4 Energy","Energy HAD module P4",3000,0.,3000.);
-    meZdcEneHadP4_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneHadP4_->setAxisTitle("Counts",2);
+    meZdcEneHadP4_ = ib.book1D("PZDC HAD4 Energy", "Energy HAD module P4", 3000, 0., 3000.);
+    meZdcEneHadP4_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneHadP4_->setAxisTitle("Counts", 2);
     /////////////////////////53///////////////////////////
     ib.setCurrentFolder("ZDCValidation/ZdcSimHits/Excess_Info/Individual_ChannelvsTime/PZDC");
-    meZdcEneTEmP1_ = ib.book2D("PZDC EM1 Energy vs Time","Energy EM mod P1 vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcEneTEmP1_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneTEmP1_->setAxisTitle("Time (ns)",2);
+    meZdcEneTEmP1_ = ib.book2D("PZDC EM1 Energy vs Time", "Energy EM mod P1 vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcEneTEmP1_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneTEmP1_->setAxisTitle("Time (ns)", 2);
     /////////////////////////54///////////////////////////
-    meZdcEneTEmP2_ = ib.book2D("PZDC EM2 Energy vs Time","Energy EM mod P2 vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcEneTEmP2_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneTEmP2_->setAxisTitle("Time (ns)",2);
+    meZdcEneTEmP2_ = ib.book2D("PZDC EM2 Energy vs Time", "Energy EM mod P2 vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcEneTEmP2_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneTEmP2_->setAxisTitle("Time (ns)", 2);
     /////////////////////////55///////////////////////////
-    meZdcEneTEmP3_ = ib.book2D("PZDC EM3 Energy vs Time","Energy EM mod P3 vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcEneTEmP3_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneTEmP3_->setAxisTitle("Time (ns)",2);
+    meZdcEneTEmP3_ = ib.book2D("PZDC EM3 Energy vs Time", "Energy EM mod P3 vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcEneTEmP3_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneTEmP3_->setAxisTitle("Time (ns)", 2);
     /////////////////////////56///////////////////////////
-    meZdcEneTEmP4_ = ib.book2D("PZDC EM4 Energy vs Time","Energy EM mod P4 vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcEneTEmP4_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneTEmP4_->setAxisTitle("Time (ns)",2);
+    meZdcEneTEmP4_ = ib.book2D("PZDC EM4 Energy vs Time", "Energy EM mod P4 vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcEneTEmP4_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneTEmP4_->setAxisTitle("Time (ns)", 2);
     /////////////////////////57///////////////////////////
-    meZdcEneTEmP5_ = ib.book2D("PZDC EM5 Energy vs Time","Energy EM mod P5 vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcEneTEmP5_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneTEmP5_->setAxisTitle("Time (ns)",2);
+    meZdcEneTEmP5_ = ib.book2D("PZDC EM5 Energy vs Time", "Energy EM mod P5 vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcEneTEmP5_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneTEmP5_->setAxisTitle("Time (ns)", 2);
     /////////////////////////58///////////////////////////
-    meZdcEneTHadP1_ = ib.book2D("PZDC HAD1 Energy vs Time","Energy HAD mod P1 vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcEneTHadP1_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneTHadP1_->setAxisTitle("Time (ns)",2);
+    meZdcEneTHadP1_ =
+        ib.book2D("PZDC HAD1 Energy vs Time", "Energy HAD mod P1 vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcEneTHadP1_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneTHadP1_->setAxisTitle("Time (ns)", 2);
     /////////////////////////59///////////////////////////
-    meZdcEneTHadP2_ = ib.book2D("PZDC HAD2 Energy vs Time","Energy HAD mod P2 vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcEneTHadP2_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneTHadP2_->setAxisTitle("Time (ns)",2);
+    meZdcEneTHadP2_ =
+        ib.book2D("PZDC HAD2 Energy vs Time", "Energy HAD mod P2 vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcEneTHadP2_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneTHadP2_->setAxisTitle("Time (ns)", 2);
     /////////////////////////60///////////////////////////
-    meZdcEneTHadP3_ = ib.book2D("PZDC HAD3 Energy vs Time","Energy HAD mod P3 vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcEneTHadP3_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneTHadP3_->setAxisTitle("Time (ns)",2);
+    meZdcEneTHadP3_ =
+        ib.book2D("PZDC HAD3 Energy vs Time", "Energy HAD mod P3 vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcEneTHadP3_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneTHadP3_->setAxisTitle("Time (ns)", 2);
     /////////////////////////61///////////////////////////
-    meZdcEneTHadP4_ = ib.book2D("PZDC HAD4 Energy vs Time","Energy HAD mod P4 vs Time", 4000, 0., 8000., 300, 0., 600. );
-    meZdcEneTHadP4_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneTHadP4_->setAxisTitle("Time (ns)",2);
+    meZdcEneTHadP4_ =
+        ib.book2D("PZDC HAD4 Energy vs Time", "Energy HAD mod P4 vs Time", 4000, 0., 8000., 300, 0., 600.);
+    meZdcEneTHadP4_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneTHadP4_->setAxisTitle("Time (ns)", 2);
     /////////////////////////62/////////////////////////////
     ib.setCurrentFolder("ZDCValidation/ZdcSimHits/ENERGY_SUMS/PZDC");
-    meZdcEneHadPTot_ = ib.book1D("PZDC EHAD","Total P-ZDC HAD Energy",10000,0.,10000.);
-    meZdcEneHadPTot_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneHadPTot_->setAxisTitle("Counts",2);
+    meZdcEneHadPTot_ = ib.book1D("PZDC EHAD", "Total P-ZDC HAD Energy", 10000, 0., 10000.);
+    meZdcEneHadPTot_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneHadPTot_->setAxisTitle("Counts", 2);
     /////////////////////////63///////////////////////////
-    meZdcEneEmPTot_ = ib.book1D("PZDC EEM","Total P-ZDC EM Energy",10000,0.,10000.);
-    meZdcEneEmPTot_->setAxisTitle("Energy (GeV)",1);
-    meZdcEneEmPTot_->setAxisTitle("Counts",2);
+    meZdcEneEmPTot_ = ib.book1D("PZDC EEM", "Total P-ZDC EM Energy", 10000, 0., 10000.);
+    meZdcEneEmPTot_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEneEmPTot_->setAxisTitle("Counts", 2);
     /////////////////////////64///////////////////////////
-    meZdcEnePTot_ = ib.book1D("PZDC ETOT","Total P-ZDC Energy",10000,0.,10000.);
-    meZdcEnePTot_->setAxisTitle("Energy (GeV)",1);
-    meZdcEnePTot_->setAxisTitle("Counts",2);
+    meZdcEnePTot_ = ib.book1D("PZDC ETOT", "Total P-ZDC Energy", 10000, 0., 10000.);
+    meZdcEnePTot_->setAxisTitle("Energy (GeV)", 1);
+    meZdcEnePTot_->setAxisTitle("Counts", 2);
     /////////////////////////65///////////////////////////
     ib.setCurrentFolder("ZDCValidation/ZdcSimHits/ENERGY_SUMS/NZDC");
-    meZdcCorEEmNEHadN_= ib.book2D("NZDC EMvHAD","N-ZDC Energy EM vs HAD", 3000, 0., 3000.,3000, 0., 3000.);
-    meZdcCorEEmNEHadN_->setAxisTitle("EM Energy (GeV)",1);
-    meZdcCorEEmNEHadN_->setAxisTitle("HAD Energy (GeV)",2);
+    meZdcCorEEmNEHadN_ = ib.book2D("NZDC EMvHAD", "N-ZDC Energy EM vs HAD", 3000, 0., 3000., 3000, 0., 3000.);
+    meZdcCorEEmNEHadN_->setAxisTitle("EM Energy (GeV)", 1);
+    meZdcCorEEmNEHadN_->setAxisTitle("HAD Energy (GeV)", 2);
     /////////////////////////66///////////////////////////
     ib.setCurrentFolder("ZDCValidation/ZdcSimHits/ENERGY_SUMS/PZDC");
-    meZdcCorEEmPEHadP_= ib.book2D("PZDC EMvHAD","P-ZDC Energy EM vs HAD", 3000, 0., 3000.,3000, 0., 3000.);
-    meZdcCorEEmPEHadP_->setAxisTitle("EM Energy (GeV)",1);
-    meZdcCorEEmPEHadP_->setAxisTitle("HAD Energy (GeV)",2);
+    meZdcCorEEmPEHadP_ = ib.book2D("PZDC EMvHAD", "P-ZDC Energy EM vs HAD", 3000, 0., 3000., 3000, 0., 3000.);
+    meZdcCorEEmPEHadP_->setAxisTitle("EM Energy (GeV)", 1);
+    meZdcCorEEmPEHadP_->setAxisTitle("HAD Energy (GeV)", 2);
     /////////////////////////67///////////////////////////
     ib.setCurrentFolder("ZDCValidation/ZdcSimHits/ENERGY_SUMS");
-    meZdcCorEtotNEtotP_ = ib.book2D("PZDC vs NZDC","Energy N-ZDC vs P-ZDC", 3000, 0., 3000.,3000, 0., 3000.);
-    meZdcCorEtotNEtotP_->setAxisTitle("N-ZDC Total Energy (GeV)",1);
-    meZdcCorEtotNEtotP_->setAxisTitle("P-ZDC Total Energy (GeV)",2);
+    meZdcCorEtotNEtotP_ = ib.book2D("PZDC vs NZDC", "Energy N-ZDC vs P-ZDC", 3000, 0., 3000., 3000, 0., 3000.);
+    meZdcCorEtotNEtotP_->setAxisTitle("N-ZDC Total Energy (GeV)", 1);
+    meZdcCorEtotNEtotP_->setAxisTitle("P-ZDC Total Energy (GeV)", 2);
     /////////////////////////68///////////////////////////
-    meZdcEneTot_ = ib.book1D("ETOT ZDCs","Total Energy ZDCs",3000,0.,3000.);
-    meZdcEneTot_->setAxisTitle("Counts",2);
-    meZdcEneTot_->setAxisTitle("Energy (GeV)",1);
+    meZdcEneTot_ = ib.book1D("ETOT ZDCs", "Total Energy ZDCs", 3000, 0., 3000.);
+    meZdcEneTot_->setAxisTitle("Counts", 2);
+    meZdcEneTot_->setAxisTitle("Energy (GeV)", 1);
     ///////////////////////////////////////////////////////////
 
-
-
-
     //////////////////New Plots////////////////////////////////
 
-    ////////////////////// GenParticle Plots///////////////////////////////////////
+    ////////////////////// GenParticle
+    /// Plots///////////////////////////////////////
     ib.setCurrentFolder("ZDCValidation/GenParticles/Forward");
     //////////////////////////////////////////////////////////////////////////////
     ///////////////////////////////69/////////////////////////////////////////////
-    genpart_Pi0F = ib.book2D("Pi0_Forward","Forward Generated Pi0s",200,7.5,13,100,-3.15,3.15);
-    genpart_Pi0F->setAxisTitle("Eta",1);
-    genpart_Pi0F->setAxisTitle("Phi (radians)",2);
-    genpart_Pi0F->setAxisTitle("Energy (GeV)",3);
+    genpart_Pi0F = ib.book2D("Pi0_Forward", "Forward Generated Pi0s", 200, 7.5, 13, 100, -3.15, 3.15);
+    genpart_Pi0F->setAxisTitle("Eta", 1);
+    genpart_Pi0F->setAxisTitle("Phi (radians)", 2);
+    genpart_Pi0F->setAxisTitle("Energy (GeV)", 3);
     genpart_Pi0F->getTH2F()->SetOption("lego2z,prof");
-    genpart_Pi0F->getTH2F()->SetTitleOffset(1.4,"x");
-    genpart_Pi0F->getTH2F()->SetTitleOffset(1.4,"y");
-
-    genpart_Pi0F_counts = ib.book2D("Pi0_Forward_Counts","Number of Forward Generated Pi0s",200,7.5,13,100,-3.15,3.15);
-    genpart_Pi0F_counts->setAxisTitle("#eta",1);
-    genpart_Pi0F_counts->setAxisTitle("#phi (radians)",2);
-    genpart_Pi0F_counts->setAxisTitle("Energy (GeV)",3);
+    genpart_Pi0F->getTH2F()->SetTitleOffset(1.4, "x");
+    genpart_Pi0F->getTH2F()->SetTitleOffset(1.4, "y");
+
+    genpart_Pi0F_counts =
+        ib.book2D("Pi0_Forward_Counts", "Number of Forward Generated Pi0s", 200, 7.5, 13, 100, -3.15, 3.15);
+    genpart_Pi0F_counts->setAxisTitle("#eta", 1);
+    genpart_Pi0F_counts->setAxisTitle("#phi (radians)", 2);
+    genpart_Pi0F_counts->setAxisTitle("Energy (GeV)", 3);
     genpart_Pi0F_counts->getTH2F()->SetOption("lego2z,prof");
-    genpart_Pi0F_counts->getTH2F()->SetTitleOffset(1.4,"x");
-    genpart_Pi0F_counts->getTH2F()->SetTitleOffset(1.4,"y");
+    genpart_Pi0F_counts->getTH2F()->SetTitleOffset(1.4, "x");
+    genpart_Pi0F_counts->getTH2F()->SetTitleOffset(1.4, "y");
 
     /////////////////////////////////////////////////////////////////////////////////
     ///////////////////////////////70/////////////////////////////////////////////
-    genpart_NeutF = ib.book2D("Neutron_Forward","Forward Generated Neutrons",200,7.5,13,100,-3.15,3.15);
-    genpart_NeutF->setAxisTitle("Eta",1);
-    genpart_NeutF->setAxisTitle("Phi (radians)",2);
-    genpart_NeutF->setAxisTitle("Energy (GeV)",3);
+    genpart_NeutF = ib.book2D("Neutron_Forward", "Forward Generated Neutrons", 200, 7.5, 13, 100, -3.15, 3.15);
+    genpart_NeutF->setAxisTitle("Eta", 1);
+    genpart_NeutF->setAxisTitle("Phi (radians)", 2);
+    genpart_NeutF->setAxisTitle("Energy (GeV)", 3);
     genpart_NeutF->getTH2F()->SetOption("lego2z,prof");
-    genpart_NeutF->getTH2F()->SetTitleOffset(1.4,"x");
-    genpart_NeutF->getTH2F()->SetTitleOffset(1.4,"y");
-
-    genpart_NeutF_counts = ib.book2D("Neutron_Forward_Counts","Number of Forward Generated Neutrons",200,7.5,13,100,-3.15,3.15);
-    genpart_NeutF_counts->setAxisTitle("#eta",1);
-    genpart_NeutF_counts->setAxisTitle("#phi (radians)",2);
-    genpart_NeutF_counts->setAxisTitle("Energy (GeV)",3);
+    genpart_NeutF->getTH2F()->SetTitleOffset(1.4, "x");
+    genpart_NeutF->getTH2F()->SetTitleOffset(1.4, "y");
+
+    genpart_NeutF_counts =
+        ib.book2D("Neutron_Forward_Counts", "Number of Forward Generated Neutrons", 200, 7.5, 13, 100, -3.15, 3.15);
+    genpart_NeutF_counts->setAxisTitle("#eta", 1);
+    genpart_NeutF_counts->setAxisTitle("#phi (radians)", 2);
+    genpart_NeutF_counts->setAxisTitle("Energy (GeV)", 3);
     genpart_NeutF_counts->getTH2F()->SetOption("lego2z,prof");
-    genpart_NeutF_counts->getTH2F()->SetTitleOffset(1.4,"x");
-    genpart_NeutF_counts->getTH2F()->SetTitleOffset(1.4,"y");
+    genpart_NeutF_counts->getTH2F()->SetTitleOffset(1.4, "x");
+    genpart_NeutF_counts->getTH2F()->SetTitleOffset(1.4, "y");
 
     /////////////////////////////////////////////////////////////////////////////////
     ///////////////////////////////71/////////////////////////////////////////////
-    genpart_GammaF = ib.book2D("Gamma_Forward","Forward Generated Gammas",200,7.5,13,100,-3.15,3.15);
-    genpart_GammaF->setAxisTitle("Eta",1);
-    genpart_GammaF->setAxisTitle("Phi (radians)",2);
-    genpart_GammaF->setAxisTitle("Energy (GeV)",3);
+    genpart_GammaF = ib.book2D("Gamma_Forward", "Forward Generated Gammas", 200, 7.5, 13, 100, -3.15, 3.15);
+    genpart_GammaF->setAxisTitle("Eta", 1);
+    genpart_GammaF->setAxisTitle("Phi (radians)", 2);
+    genpart_GammaF->setAxisTitle("Energy (GeV)", 3);
     genpart_GammaF->getTH2F()->SetOption("lego2z,prof");
-    genpart_GammaF->getTH2F()->SetTitleOffset(1.4,"x");
-    genpart_GammaF->getTH2F()->SetTitleOffset(1.4,"y");
-
-    genpart_GammaF_counts = ib.book2D("Gamma_Forward_Counts","Number of Forward Generated Gammas",200,7.5,13,100,-3.15,3.15);
-    genpart_GammaF_counts->setAxisTitle("#eta",1);
-    genpart_GammaF_counts->setAxisTitle("#phi (radians)",2);
-    genpart_GammaF_counts->setAxisTitle("Energy (GeV)",3);
+    genpart_GammaF->getTH2F()->SetTitleOffset(1.4, "x");
+    genpart_GammaF->getTH2F()->SetTitleOffset(1.4, "y");
+
+    genpart_GammaF_counts =
+        ib.book2D("Gamma_Forward_Counts", "Number of Forward Generated Gammas", 200, 7.5, 13, 100, -3.15, 3.15);
+    genpart_GammaF_counts->setAxisTitle("#eta", 1);
+    genpart_GammaF_counts->setAxisTitle("#phi (radians)", 2);
+    genpart_GammaF_counts->setAxisTitle("Energy (GeV)", 3);
     genpart_GammaF_counts->getTH2F()->SetOption("lego2z,prof");
-    genpart_GammaF_counts->getTH2F()->SetTitleOffset(1.4,"x");
-    genpart_GammaF_counts->getTH2F()->SetTitleOffset(1.4,"y");
+    genpart_GammaF_counts->getTH2F()->SetTitleOffset(1.4, "x");
+    genpart_GammaF_counts->getTH2F()->SetTitleOffset(1.4, "y");
 
     ////////////////////////////////////////////////////////////////////////////////
     //////////////////////////////////////////////////////////////////////////////
-    genpart_Pi0F_energydist = ib.book1D("Pi0_Forward_EDistribution","Gen-Level Forward Pi0 Energy",1500,0,1500);
-    genpart_Pi0F_energydist->setAxisTitle("Energy (GeV)",1);
-    genpart_Pi0F_energydist->setAxisTitle("Counts",2);
+    genpart_Pi0F_energydist = ib.book1D("Pi0_Forward_EDistribution", "Gen-Level Forward Pi0 Energy", 1500, 0, 1500);
+    genpart_Pi0F_energydist->setAxisTitle("Energy (GeV)", 1);
+    genpart_Pi0F_energydist->setAxisTitle("Counts", 2);
     ////////////////////////////////////////////////////////////////////////////////
     //////////////////////////////////////////////////////////////////////////////
-    genpart_NeutF_energydist = ib.book1D("N_Forward_EDistribution","Gen-Level Forward Neutron Energy",1500,0,1500);
-    genpart_NeutF_energydist->setAxisTitle("Energy (GeV)",1);
-    genpart_NeutF_energydist->setAxisTitle("Counts",2);
+    genpart_NeutF_energydist = ib.book1D("N_Forward_EDistribution", "Gen-Level Forward Neutron Energy", 1500, 0, 1500);
+    genpart_NeutF_energydist->setAxisTitle("Energy (GeV)", 1);
+    genpart_NeutF_energydist->setAxisTitle("Counts", 2);
     ///////////////////////////////////////////////////////////////////////////////
     ///////////////////////////////////////////////////////////////////////////////
-    genpart_GammaF_energydist = ib.book1D("Gamma_Forward_EDistribution","Gen-Level Fowarad Gamma Energy",1500,0,1500);
-    genpart_GammaF_energydist->setAxisTitle("Energy (GeV)",1);
-    genpart_GammaF_energydist->setAxisTitle("Counts",2);
+    genpart_GammaF_energydist =
+        ib.book1D("Gamma_Forward_EDistribution", "Gen-Level Fowarad Gamma Energy", 1500, 0, 1500);
+    genpart_GammaF_energydist->setAxisTitle("Energy (GeV)", 1);
+    genpart_GammaF_energydist->setAxisTitle("Counts", 2);
     /////////////////////////////////////////////////////////////////////////////////
     ib.setCurrentFolder("ZDCValidation/GenParticles/Backward");
     ////////////////////////////////////////////////////////////////////////////////
     ///////////////////////////////72/////////////////////////////////////////////
-    genpart_Pi0B = ib.book2D("Pi0_Backward","Backward Generated Pi0s",1000,-13,-7.5,100,-3.15,3.15);
-    genpart_Pi0B->setAxisTitle("Eta",1);
-    genpart_Pi0B->setAxisTitle("Phi (radians)",2);
-    genpart_Pi0B->setAxisTitle("Energy (GeV)",3);
+    genpart_Pi0B = ib.book2D("Pi0_Backward", "Backward Generated Pi0s", 1000, -13, -7.5, 100, -3.15, 3.15);
+    genpart_Pi0B->setAxisTitle("Eta", 1);
+    genpart_Pi0B->setAxisTitle("Phi (radians)", 2);
+    genpart_Pi0B->setAxisTitle("Energy (GeV)", 3);
     genpart_Pi0B->getTH2F()->SetOption("lego2z,prof");
-    genpart_Pi0B->getTH2F()->SetTitleOffset(1.4,"x");
-    genpart_Pi0B->getTH2F()->SetTitleOffset(1.4,"y");
-
-    genpart_Pi0B_counts = ib.book2D("Pi0_Backwards_Counts","Number of Backward Generated Pi0s",200,-13,-7.5,100,-3.15,3.15);
-    genpart_Pi0B_counts->setAxisTitle("#eta",1);
-    genpart_Pi0B_counts->setAxisTitle("#phi (radians)",2);
-    genpart_Pi0B_counts->setAxisTitle("Energy (GeV)",3);
+    genpart_Pi0B->getTH2F()->SetTitleOffset(1.4, "x");
+    genpart_Pi0B->getTH2F()->SetTitleOffset(1.4, "y");
+
+    genpart_Pi0B_counts =
+        ib.book2D("Pi0_Backwards_Counts", "Number of Backward Generated Pi0s", 200, -13, -7.5, 100, -3.15, 3.15);
+    genpart_Pi0B_counts->setAxisTitle("#eta", 1);
+    genpart_Pi0B_counts->setAxisTitle("#phi (radians)", 2);
+    genpart_Pi0B_counts->setAxisTitle("Energy (GeV)", 3);
     genpart_Pi0B_counts->getTH2F()->SetOption("lego2z,prof");
-    genpart_Pi0B_counts->getTH2F()->SetTitleOffset(1.4,"x");
-    genpart_Pi0B_counts->getTH2F()->SetTitleOffset(1.4,"y");
+    genpart_Pi0B_counts->getTH2F()->SetTitleOffset(1.4, "x");
+    genpart_Pi0B_counts->getTH2F()->SetTitleOffset(1.4, "y");
 
     /////////////////////////////////////////////////////////////////////////////////
     ///////////////////////////////73/////////////////////////////////////////////
-    genpart_NeutB = ib.book2D("Neutron_Backward","Backward Generated Neutrons",1000,-13,-7.5,100,-3.15,3.15);
-    genpart_NeutB->setAxisTitle("Eta",1);
-    genpart_NeutB->setAxisTitle("Phi (radians)",2);
-    genpart_NeutB->setAxisTitle("Energy (GeV)",3);
+    genpart_NeutB = ib.book2D("Neutron_Backward", "Backward Generated Neutrons", 1000, -13, -7.5, 100, -3.15, 3.15);
+    genpart_NeutB->setAxisTitle("Eta", 1);
+    genpart_NeutB->setAxisTitle("Phi (radians)", 2);
+    genpart_NeutB->setAxisTitle("Energy (GeV)", 3);
     genpart_NeutB->getTH2F()->SetOption("lego2z,prof");
-    genpart_NeutB->getTH2F()->SetTitleOffset(1.4,"x");
-    genpart_NeutB->getTH2F()->SetTitleOffset(1.4,"y");
-
-    genpart_NeutB_counts = ib.book2D("Neutron_Backwards_Counts","Number of Backward Generated Neutrons",200,-13,-7.5,100,-3.15,3.15);
-    genpart_NeutB_counts->setAxisTitle("#eta",1);
-    genpart_NeutB_counts->setAxisTitle("#phi (radians)",2);
-    genpart_NeutB_counts->setAxisTitle("Energy (GeV)",3);
+    genpart_NeutB->getTH2F()->SetTitleOffset(1.4, "x");
+    genpart_NeutB->getTH2F()->SetTitleOffset(1.4, "y");
+
+    genpart_NeutB_counts = ib.book2D(
+        "Neutron_Backwards_Counts", "Number of Backward Generated Neutrons", 200, -13, -7.5, 100, -3.15, 3.15);
+    genpart_NeutB_counts->setAxisTitle("#eta", 1);
+    genpart_NeutB_counts->setAxisTitle("#phi (radians)", 2);
+    genpart_NeutB_counts->setAxisTitle("Energy (GeV)", 3);
     genpart_NeutB_counts->getTH2F()->SetOption("lego2z,prof");
-    genpart_NeutB_counts->getTH2F()->SetTitleOffset(1.4,"x");
-    genpart_NeutB_counts->getTH2F()->SetTitleOffset(1.4,"y");
+    genpart_NeutB_counts->getTH2F()->SetTitleOffset(1.4, "x");
+    genpart_NeutB_counts->getTH2F()->SetTitleOffset(1.4, "y");
 
-    
     ///////////////////////////////74/////////////////////////////////////////////
-    genpart_GammaB = ib.book2D("Gamma_Backward","Backward Generated Gammas",1000,-13,-7.5,100,-3.15,3.15);
-    genpart_GammaB->setAxisTitle("Eta",1);
-    genpart_GammaB->setAxisTitle("Phi (radians)",2);
-    genpart_GammaB->setAxisTitle("Energy (GeV)",3);
+    genpart_GammaB = ib.book2D("Gamma_Backward", "Backward Generated Gammas", 1000, -13, -7.5, 100, -3.15, 3.15);
+    genpart_GammaB->setAxisTitle("Eta", 1);
+    genpart_GammaB->setAxisTitle("Phi (radians)", 2);
+    genpart_GammaB->setAxisTitle("Energy (GeV)", 3);
     genpart_GammaB->getTH2F()->SetOption("lego2z,prof");
-    genpart_GammaB->getTH2F()->SetTitleOffset(1.4,"x");
-    genpart_GammaB->getTH2F()->SetTitleOffset(1.4,"y");
-
-    genpart_GammaB_counts = ib.book2D("Gamma_Backwards_Counts","Number of Backward Generated Gammas",200,-13,-7.5,100,-3.15,3.15);
-    genpart_GammaB_counts->setAxisTitle("#eta",1);
-    genpart_GammaB_counts->setAxisTitle("#phi (radians)",2);
-    genpart_GammaB_counts->setAxisTitle("Energy (GeV)",3);
+    genpart_GammaB->getTH2F()->SetTitleOffset(1.4, "x");
+    genpart_GammaB->getTH2F()->SetTitleOffset(1.4, "y");
+
+    genpart_GammaB_counts =
+        ib.book2D("Gamma_Backwards_Counts", "Number of Backward Generated Gammas", 200, -13, -7.5, 100, -3.15, 3.15);
+    genpart_GammaB_counts->setAxisTitle("#eta", 1);
+    genpart_GammaB_counts->setAxisTitle("#phi (radians)", 2);
+    genpart_GammaB_counts->setAxisTitle("Energy (GeV)", 3);
     genpart_GammaB_counts->getTH2F()->SetOption("lego2z,prof");
-    genpart_GammaB_counts->getTH2F()->SetTitleOffset(1.4,"x");
-    genpart_GammaB_counts->getTH2F()->SetTitleOffset(1.4,"y");
+    genpart_GammaB_counts->getTH2F()->SetTitleOffset(1.4, "x");
+    genpart_GammaB_counts->getTH2F()->SetTitleOffset(1.4, "y");
 
     /////////////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////GEN Particle Energy Distributions/////////////////////
+    ///////////////////////////////GEN Particle Energy
+    /// Distributions/////////////////////
     ///////////////////////////////////////////////////////////////////////////////////////////////
-    genpart_Pi0B_energydist = ib.book1D("Pi0_Backward_EDistribution","Gen-Level Backward Pi0 Energy",1500,0,1500);
-    genpart_Pi0B_energydist->setAxisTitle("Energy (GeV)",1);
-    genpart_Pi0B_energydist->setAxisTitle("Counts",2);
+    genpart_Pi0B_energydist = ib.book1D("Pi0_Backward_EDistribution", "Gen-Level Backward Pi0 Energy", 1500, 0, 1500);
+    genpart_Pi0B_energydist->setAxisTitle("Energy (GeV)", 1);
+    genpart_Pi0B_energydist->setAxisTitle("Counts", 2);
     //////////////////////////////////////////////////////////////////////////////////////////////
     //////////////////////////////////////////////////////////////////////////////////////////////////////////
-    genpart_NeutB_energydist = ib.book1D("N_Backward_EDistribution","Gen-Level Foward Neutron Energy",1500,0,1500);
-    genpart_NeutB_energydist->setAxisTitle("Energy (GeV)",1);
-    genpart_NeutB_energydist->setAxisTitle("Counts",2);
+    genpart_NeutB_energydist = ib.book1D("N_Backward_EDistribution", "Gen-Level Foward Neutron Energy", 1500, 0, 1500);
+    genpart_NeutB_energydist->setAxisTitle("Energy (GeV)", 1);
+    genpart_NeutB_energydist->setAxisTitle("Counts", 2);
     ///////////////////////////////////////////////////////////////////////////////////////////
     //////////////////////////////////////////////////////////////////////////////////////////
-    genpart_GammaB_energydist = ib.book1D("Gamma_Backward_EDistribution","Gen-Level Backward Gamma Energy",1500,0,1500);
-    genpart_GammaB_energydist->setAxisTitle("Energy (GeV)",1);
-    genpart_GammaB_energydist->setAxisTitle("Counts",2);
+    genpart_GammaB_energydist =
+        ib.book1D("Gamma_Backward_EDistribution", "Gen-Level Backward Gamma Energy", 1500, 0, 1500);
+    genpart_GammaB_energydist->setAxisTitle("Energy (GeV)", 1);
+    genpart_GammaB_energydist->setAxisTitle("Counts", 2);
     /////////////////////////////////////////////////////////////////////////////////////////
-
   }
 }
 
@@ -508,147 +524,138 @@ void ZdcSimHitStudy::bookHistograms(DQMStore::IBooker &ib, edm::Run const &run,
   if (dbe_ && outFile_.size() > 0) dbe_->save(outFile_);
   }*/
 
-//void ZdcSimHitStudy::analyze(const edm::Event& e, const edm::EventSetup& ) {
-void ZdcSimHitStudy::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup ) {
+// void ZdcSimHitStudy::analyze(const edm::Event& e, const edm::EventSetup& ) {
+void ZdcSimHitStudy::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   //////////NEW STUFF//////////////////////
 
   using namespace edm;
-  bool gotGenParticles=true;
-
+  bool gotGenParticles = true;
 
   Handle<reco::GenParticleCollection> genhandle;
 
-  if (!(iEvent.getByToken(tok_gen_,genhandle)))
-    {
-      gotGenParticles=false; //this is the same kind of boolean except for the genparticles collection
-    }
-  if (!(genhandle.isValid()))
-    {
-      gotGenParticles=false;
-    }
+  if (!(iEvent.getByToken(tok_gen_, genhandle))) {
+    gotGenParticles = false;  // this is the same kind of boolean except for the
+                              // genparticles collection
+  }
+  if (!(genhandle.isValid())) {
+    gotGenParticles = false;
+  }
+
+  // Handle<edm::PCaloHitContainer> zdcsimhandle;
 
+  ////////////////////////////////////GEN PARTICLE
+  /// HISTOS///////////////////////////////////
 
-  //Handle<edm::PCaloHitContainer> zdcsimhandle;
-
-
-  ////////////////////////////////////GEN PARTICLE HISTOS///////////////////////////////////
-
-
-  if (gotGenParticles==true){ //if the boolean was able to find the leaf "genparticles" then do this
-    for (reco::GenParticleCollection::const_iterator gen = genhandle->begin();
-         gen!=genhandle->end();
-         ++gen) //here we iterate over all generated particles
-      {
-        //         double energy=gen->energy();
-        reco::GenParticle thisParticle = (reco::GenParticle)(*gen); //get the particle "gen" points to
-        double energy_2= thisParticle.energy(); //here I grab some of the attributes of the generated particle....like its energy, its phi and its eta and what kind of particle it is
-        double gen_phi = thisParticle.phi();
-        double gen_eta = thisParticle.eta();
-        int gen_id = thisParticle.pdgId();
-
-        if (gen_id==111){ //here i require a pi0
-          if (gen_eta>8.3){ //eta requirement
-
-            //////////////////////////////////////////////////////////////////////////////////////
-            //# IMPORTANT     IMPORTANT         IMPORTANT            IMPORTANT                  #
-            //# The real eta of the ZDC is |eta| > 8.3, I have only changed it here to 3 because#
-            //# in the PG simulation the ZDC is at an eta of about 4.5-7, in the real GEANT the #
-            //# ZDC is in its appropriate place at the very foward region...please edit this if #
-            //# looking at MinBias data or the like                                             #
-            //#                                                                                 #
-            //# IMPORTANT     IMPORTANT      IMPORTANT       IMPORTANT                          #
-            /////////////////////////////////////////////////////////////////////////////////////
-
-
-	    genpart_Pi0F->Fill(gen_eta,gen_phi,energy_2); //fill the lego plot                          
-            genpart_Pi0F_counts->Fill(gen_eta,gen_phi,1);
-	    //genpart_Pi0F_profile->Fill(gen_eta,gen_phi,energy_2);
-            genpart_Pi0F_energydist->Fill(energy_2); //fill the 1D distribution 
-            
-          }
-          if (gen_eta<-8.3){ //neg eta requirement
-	    genpart_Pi0B->Fill(gen_eta,gen_phi,energy_2);
-            // genpart_Pi0B_profile->Fill(gen_eta,gen_phi,energy_2);
-            genpart_Pi0B_counts->Fill(gen_eta,gen_phi,1);
-            genpart_Pi0B_energydist->Fill(energy_2);
-          }
+  if (gotGenParticles == true) {  // if the boolean was able to find the leaf
+                                  // "genparticles" then do this
+    for (reco::GenParticleCollection::const_iterator gen = genhandle->begin(); gen != genhandle->end();
+         ++gen)  // here we iterate over all generated particles
+    {
+      //         double energy=gen->energy();
+      reco::GenParticle thisParticle = (reco::GenParticle)(*gen);  // get the particle "gen" points to
+      double energy_2 = thisParticle.energy();  // here I grab some of the attributes of the generated
+                                                // particle....like its energy, its phi and its eta and
+                                                // what kind of particle it is
+      double gen_phi = thisParticle.phi();
+      double gen_eta = thisParticle.eta();
+      int gen_id = thisParticle.pdgId();
+
+      if (gen_id == 111) {    // here i require a pi0
+        if (gen_eta > 8.3) {  // eta requirement
+
+          //////////////////////////////////////////////////////////////////////////////////////
+          //# IMPORTANT     IMPORTANT         IMPORTANT            IMPORTANT #
+          //# The real eta of the ZDC is |eta| > 8.3, I have only changed it
+          // here to 3 because# # in the PG simulation the ZDC is at an eta of
+          // about 4.5-7, in the real GEANT the # # ZDC is in its appropriate
+          // place at the very foward region...please edit this if # # looking
+          // at MinBias data or the like # # # # IMPORTANT     IMPORTANT
+          // IMPORTANT IMPORTANT                          #
+          /////////////////////////////////////////////////////////////////////////////////////
+
+          genpart_Pi0F->Fill(gen_eta, gen_phi, energy_2);  // fill the lego plot
+          genpart_Pi0F_counts->Fill(gen_eta, gen_phi, 1);
+          // genpart_Pi0F_profile->Fill(gen_eta,gen_phi,energy_2);
+          genpart_Pi0F_energydist->Fill(energy_2);  // fill the 1D distribution
+        }
+        if (gen_eta < -8.3) {  // neg eta requirement
+          genpart_Pi0B->Fill(gen_eta, gen_phi, energy_2);
+          // genpart_Pi0B_profile->Fill(gen_eta,gen_phi,energy_2);
+          genpart_Pi0B_counts->Fill(gen_eta, gen_phi, 1);
+          genpart_Pi0B_energydist->Fill(energy_2);
+        }
+      }
+      if (gen_id == 2112) {  // require neutron
+        if (gen_eta > 8.3) {
+          genpart_NeutF->Fill(gen_eta, gen_phi, energy_2);
+          // genpart_NeutF_profile->Fill(gen_eta,gen_phi,energy_2);
+          genpart_NeutF_counts->Fill(gen_eta, gen_phi, 1);
+          genpart_NeutF_energydist->Fill(energy_2);
         }
-        if (gen_id==2112){ //require neutron
-          if (gen_eta>8.3){
-	    genpart_NeutF->Fill(gen_eta,gen_phi,energy_2);
-            //genpart_NeutF_profile->Fill(gen_eta,gen_phi,energy_2);
-            genpart_NeutF_counts->Fill(gen_eta,gen_phi,1);
-            genpart_NeutF_energydist->Fill(energy_2);
-          }
-          if (gen_eta<-8.3){
-	    genpart_NeutB->Fill(gen_eta,gen_phi,energy_2);
-            //genpart_NeutB_profile->Fill(gen_eta,gen_phi,energy_2);                                   
-            genpart_NeutB_counts->Fill(gen_eta,gen_phi,1);
-            genpart_NeutB_energydist->Fill(energy_2);
-          }
+        if (gen_eta < -8.3) {
+          genpart_NeutB->Fill(gen_eta, gen_phi, energy_2);
+          // genpart_NeutB_profile->Fill(gen_eta,gen_phi,energy_2);
+          genpart_NeutB_counts->Fill(gen_eta, gen_phi, 1);
+          genpart_NeutB_energydist->Fill(energy_2);
         }
+      }
 
-        if (gen_id==22){ //require gamma
-          if (gen_eta>8.3){
-	    genpart_GammaF->Fill(gen_eta,gen_phi,energy_2);
-            // genpart_GammaF_profile->Fill(gen_eta,gen_phi,energy_2);                                 
-            genpart_GammaF_counts->Fill(gen_eta,gen_phi,1);
-            genpart_GammaF_energydist->Fill(energy_2);
-          }
-          if (gen_eta<-8.3){
-	    genpart_GammaB->Fill(gen_eta,gen_phi,energy_2);
-            //genpart_GammaB_profile->Fill(gen_eta,gen_phi,energy_2);                                    
-            genpart_GammaB_counts->Fill(gen_eta,gen_phi,1);
-            genpart_GammaB_energydist->Fill(energy_2);
-          }
+      if (gen_id == 22) {  // require gamma
+        if (gen_eta > 8.3) {
+          genpart_GammaF->Fill(gen_eta, gen_phi, energy_2);
+          // genpart_GammaF_profile->Fill(gen_eta,gen_phi,energy_2);
+          genpart_GammaF_counts->Fill(gen_eta, gen_phi, 1);
+          genpart_GammaF_energydist->Fill(energy_2);
+        }
+        if (gen_eta < -8.3) {
+          genpart_GammaB->Fill(gen_eta, gen_phi, energy_2);
+          // genpart_GammaB_profile->Fill(gen_eta,gen_phi,energy_2);
+          genpart_GammaB_counts->Fill(gen_eta, gen_phi, 1);
+          genpart_GammaB_energydist->Fill(energy_2);
         }
+      }
 
-      } //end of GEN loop
+    }  // end of GEN loop
   }
 
-
-
   /////////////////////////////////////////////////////////////////////
 
-  //Below is the old script which I will comment later
-
-
+  // Below is the old script which I will comment later
 
   LogDebug("ZdcSimHitStudy")
-    //std::cout
-    //std::cout
-    << "Run = " << iEvent.id().run() << " Event = "
-    << iEvent.id().event();
+      // std::cout
+      // std::cout
+      << "Run = " << iEvent.id().run() << " Event = " << iEvent.id().event();
   /*    << "Run = " << e.id().run() << " Event = "
         << e.id().event();*/
-  //std::cout<<std::endl;
+  // std::cout<<std::endl;
 
-  std::vector<PCaloHit>               caloHits;
+  std::vector<PCaloHit> caloHits;
   edm::Handle<edm::PCaloHitContainer> hitsZdc;
 
   bool getHits = false;
   if (checkHit_) {
-    iEvent.getByToken(tok_hits_,hitsZdc);
-    if (hitsZdc.isValid()) getHits = true;
+    iEvent.getByToken(tok_hits_, hitsZdc);
+    if (hitsZdc.isValid())
+      getHits = true;
   }
 
   LogDebug("ZdcSim") << "ZdcValidation: Input flags Hits " << getHits;
 
   if (getHits) {
-    caloHits.insert(caloHits.end(),hitsZdc->begin(),hitsZdc->end());
+    caloHits.insert(caloHits.end(), hitsZdc->begin(), hitsZdc->end());
     LogDebug("ZdcSimHitStudy")
-      //std::cout
-      << "ZdcValidation: Hit buffer "
-      << caloHits.size();
+        // std::cout
+        << "ZdcValidation: Hit buffer " << caloHits.size();
     //<< std::endl;
-    analyzeHits (caloHits);
+    analyzeHits(caloHits);
   }
 }
 
-void ZdcSimHitStudy::analyzeHits(std::vector<PCaloHit>& hits){
+void ZdcSimHitStudy::analyzeHits(std::vector<PCaloHit> &hits) {
   int nHit = hits.size();
   int nZdcEM = 0, nZdcHad = 0, nZdcLum = 0;
-  int nBad1=0, nBad2=0, nBad=0;
+  int nBad1 = 0, nBad2 = 0, nBad = 0;
   std::vector<double> encontZdcEM(140, 0.);
   std::vector<double> encontZdcHad(140, 0.);
   double entotZdcEM = 0;
@@ -662,68 +669,78 @@ void ZdcSimHitStudy::analyzeHits(std::vector<PCaloHit>& hits){
   enetotP = 0;
   enetot = 0;
 
-  for (int i=0; i<nHit; i++) {
-    double energy    = hits[i].energy();
-    double log10en   = log10(energy);
-    int log10i       = int( (log10en+10.)*10. );
-    double time      = hits[i].time();
+  for (int i = 0; i < nHit; i++) {
+    double energy = hits[i].energy();
+    double log10en = log10(energy);
+    int log10i = int((log10en + 10.) * 10.);
+    double time = hits[i].time();
     unsigned int id_ = hits[i].id();
-    HcalZDCDetId id  = HcalZDCDetId(id_);
-    int det          = id.det();
-    int side         = id.zside();
-    int section      = id.section();
-    int channel      = id.channel();
-
-    FillHitValHist(side,section,channel,energy,time);
+    HcalZDCDetId id = HcalZDCDetId(id_);
+    int det = id.det();
+    int side = id.zside();
+    int section = id.section();
+    int channel = id.channel();
 
+    FillHitValHist(side, section, channel, energy, time);
 
     LogDebug("ZdcSimHitStudy")
-      //std::cout
-      << "Hit[" << i << "] ID " << std::hex << id_
-      << std::dec <<" DetID "<<id
-      << " Det "<< det << " side "<< side
-      << " Section " << section
-      << " channel "<< channel
-      << " E " << energy
-      << " time \n" << time;
+        // std::cout
+        << "Hit[" << i << "] ID " << std::hex << id_ << std::dec << " DetID " << id << " Det " << det << " side "
+        << side << " Section " << section << " channel " << channel << " E " << energy << " time \n"
+        << time;
     //<<std::endl;
 
-    if(det == 5) { // Check DetId.h
-      if(section == HcalZDCDetId::EM)nZdcEM++;
-      else if(section == HcalZDCDetId::HAD)nZdcHad++;
-      else if(section == HcalZDCDetId::LUM)nZdcLum++;
-      else    { nBad++;  nBad2++;}
-    } else    { nBad++;  nBad1++;}
+    if (det == 5) {  // Check DetId.h
+      if (section == HcalZDCDetId::EM)
+        nZdcEM++;
+      else if (section == HcalZDCDetId::HAD)
+        nZdcHad++;
+      else if (section == HcalZDCDetId::LUM)
+        nZdcLum++;
+      else {
+        nBad++;
+        nBad2++;
+      }
+    } else {
+      nBad++;
+      nBad1++;
+    }
 
     meZdcDetectHit_->Fill(double(det));
-    if (det ==  5) {
+    if (det == 5) {
       meZdcSideHit_->Fill(double(side));
       meZdcSectionHit_->Fill(double(section));
       meZdcChannelHit_->Fill(double(channel));
       meZdcEnergyHit_->Fill(energy);
-      if(section == HcalZDCDetId::EM){
+      if (section == HcalZDCDetId::EM) {
         meZdcEMEnergyHit_->Fill(energy);
-        meZdcEEMCh_->Fill(energy,channel);
-        if( log10i >=0 && log10i < 140 )encontZdcEM[log10i] += energy;
+        meZdcEEMCh_->Fill(energy, channel);
+        if (log10i >= 0 && log10i < 140)
+          encontZdcEM[log10i] += energy;
         entotZdcEM += energy;
       }
-      if(section == HcalZDCDetId::HAD){
+      if (section == HcalZDCDetId::HAD) {
         meZdcHadEnergyHit_->Fill(energy);
-        meZdcEHadCh_->Fill(energy,channel);
-        if( log10i >=0 && log10i < 140 )encontZdcHad[log10i] += energy;
+        meZdcEHadCh_->Fill(energy, channel);
+        if (log10i >= 0 && log10i < 140)
+          encontZdcHad[log10i] += energy;
         entotZdcHad += energy;
       }
       meZdcTimeHit_->Fill(time);
-      meZdcTimeWHit_->Fill(double(time),energy);
+      meZdcTimeWHit_->Fill(double(time), energy);
       meZdc10Ene_->Fill(log10en);
       meZdcETime_->Fill(energy, double(time));
     }
   }
 
-  if( entotZdcEM  != 0 ) for( int i=0; i<140; i++ ) meZdcEML10EneP_->Fill( -10.+(float(i)+0.5)/10., encontZdcEM[i]/entotZdcEM);
-  if( entotZdcHad != 0 ) for( int i=0; i<140; i++ ) meZdcHadL10EneP_->Fill( -10.+(float(i)+0.5)/10.,encontZdcHad[i]/entotZdcHad);
+  if (entotZdcEM != 0)
+    for (int i = 0; i < 140; i++)
+      meZdcEML10EneP_->Fill(-10. + (float(i) + 0.5) / 10., encontZdcEM[i] / entotZdcEM);
+  if (entotZdcHad != 0)
+    for (int i = 0; i < 140; i++)
+      meZdcHadL10EneP_->Fill(-10. + (float(i) + 0.5) / 10., encontZdcHad[i] / entotZdcHad);
 
-  if ( nHit>0) {
+  if (nHit > 0) {
     meAllZdcNHit_->Fill(double(nHit));
     meBadZdcDetHit_->Fill(double(nBad1));
     meBadZdcSecHit_->Fill(double(nBad2));
@@ -737,136 +754,118 @@ void ZdcSimHitStudy::analyzeHits(std::vector<PCaloHit>& hits){
     meZdcEneHadPTot_->Fill(enetotHadP);
     meZdcEneEmNTot_->Fill(enetotEmN);
     meZdcEneEmPTot_->Fill(enetotEmP);
-    meZdcCorEEmNEHadN_->Fill(enetotEmN,enetotHadN);
-    meZdcCorEEmPEHadP_->Fill(enetotEmP,enetotHadP);
-    meZdcCorEtotNEtotP_->Fill(enetotN,enetotP);
+    meZdcCorEEmNEHadN_->Fill(enetotEmN, enetotHadN);
+    meZdcCorEEmPEHadP_->Fill(enetotEmP, enetotHadP);
+    meZdcCorEtotNEtotP_->Fill(enetotN, enetotP);
     meZdcEneTot_->Fill(enetot);
   }
   LogDebug("HcalSimHitStudy")
-    //std::cout
-    <<"HcalSimHitStudy::analyzeHits: Had " << nZdcHad
-    << " EM "<< nZdcEM
-    << " Bad " << nBad << " All " << nHit;
+      // std::cout
+      << "HcalSimHitStudy::analyzeHits: Had " << nZdcHad << " EM " << nZdcEM << " Bad " << nBad << " All " << nHit;
   //<<std::endl;
 }
 
-int ZdcSimHitStudy::FillHitValHist(int side,int section,int channel,double energy,double time){
+int ZdcSimHitStudy::FillHitValHist(int side, int section, int channel, double energy, double time) {
   enetot += enetot;
-  if(side == -1){
+  if (side == -1) {
     enetotN += energy;
-    if(section == HcalZDCDetId::EM){
+    if (section == HcalZDCDetId::EM) {
       enetotEmN += energy;
-      switch(channel){
-      case 1 :
-        meZdcEneEmN1_->Fill(energy);
-        meZdcEneTEmN1_->Fill(energy,time);
-        break;
-      case 2 :
-        meZdcEneEmN2_->Fill(energy);
-        meZdcEneTEmN2_->Fill(energy,time);
-        break;
-      case 3 :
-        meZdcEneEmN3_->Fill(energy);
-        meZdcEneTEmN3_->Fill(energy,time);
-        break;
-      case 4 :
-        meZdcEneEmN4_->Fill(energy);
-        meZdcEneTEmN4_->Fill(energy,time);
-        break;
-      case 5 :
-        meZdcEneEmN4_->Fill(energy);
-        meZdcEneTEmN4_->Fill(energy,time);
-        break;
+      switch (channel) {
+        case 1:
+          meZdcEneEmN1_->Fill(energy);
+          meZdcEneTEmN1_->Fill(energy, time);
+          break;
+        case 2:
+          meZdcEneEmN2_->Fill(energy);
+          meZdcEneTEmN2_->Fill(energy, time);
+          break;
+        case 3:
+          meZdcEneEmN3_->Fill(energy);
+          meZdcEneTEmN3_->Fill(energy, time);
+          break;
+        case 4:
+          meZdcEneEmN4_->Fill(energy);
+          meZdcEneTEmN4_->Fill(energy, time);
+          break;
+        case 5:
+          meZdcEneEmN4_->Fill(energy);
+          meZdcEneTEmN4_->Fill(energy, time);
+          break;
       }
     }
-    if(section == HcalZDCDetId::HAD){
+    if (section == HcalZDCDetId::HAD) {
       enetotHadN += energy;
-      switch(channel){
-      case 1 :
-        meZdcEneHadN1_->Fill(energy);
-        meZdcEneTHadN1_->Fill(energy,time);
-        break;
-      case 2 :
-        meZdcEneHadN2_->Fill(energy);
-        meZdcEneTHadN2_->Fill(energy,time);
-        break;
-      case 3 :
-        meZdcEneHadN3_->Fill(energy);
-        meZdcEneTHadN3_->Fill(energy,time);
-        break;
-      case 4 :
-        meZdcEneHadN4_->Fill(energy);
-        meZdcEneTHadN4_->Fill(energy,time);
-        break;
+      switch (channel) {
+        case 1:
+          meZdcEneHadN1_->Fill(energy);
+          meZdcEneTHadN1_->Fill(energy, time);
+          break;
+        case 2:
+          meZdcEneHadN2_->Fill(energy);
+          meZdcEneTHadN2_->Fill(energy, time);
+          break;
+        case 3:
+          meZdcEneHadN3_->Fill(energy);
+          meZdcEneTHadN3_->Fill(energy, time);
+          break;
+        case 4:
+          meZdcEneHadN4_->Fill(energy);
+          meZdcEneTHadN4_->Fill(energy, time);
+          break;
       }
     }
   }
-  if(side == 1){
+  if (side == 1) {
     enetotP += energy;
-    if(section == HcalZDCDetId::EM){
+    if (section == HcalZDCDetId::EM) {
       enetotEmP += energy;
-      switch(channel){
-      case 1 :
-        meZdcEneEmP1_->Fill(energy);
-        meZdcEneTEmP1_->Fill(energy,time);
-        break;
-      case 2 :
-        meZdcEneEmP2_->Fill(energy);
-        meZdcEneTEmP2_->Fill(energy,time);
-        break;
-      case 3 :
-        meZdcEneEmP3_->Fill(energy);
-        meZdcEneTEmP3_->Fill(energy,time);
-        break;
-      case 4 :
-        meZdcEneEmP4_->Fill(energy);
-        meZdcEneTEmP4_->Fill(energy,time);
-        break;
-      case 5 :
-        meZdcEneEmP4_->Fill(energy);
-        meZdcEneTEmP4_->Fill(energy,time);
-        break;
+      switch (channel) {
+        case 1:
+          meZdcEneEmP1_->Fill(energy);
+          meZdcEneTEmP1_->Fill(energy, time);
+          break;
+        case 2:
+          meZdcEneEmP2_->Fill(energy);
+          meZdcEneTEmP2_->Fill(energy, time);
+          break;
+        case 3:
+          meZdcEneEmP3_->Fill(energy);
+          meZdcEneTEmP3_->Fill(energy, time);
+          break;
+        case 4:
+          meZdcEneEmP4_->Fill(energy);
+          meZdcEneTEmP4_->Fill(energy, time);
+          break;
+        case 5:
+          meZdcEneEmP4_->Fill(energy);
+          meZdcEneTEmP4_->Fill(energy, time);
+          break;
       }
     }
-    if(section == HcalZDCDetId::HAD){
+    if (section == HcalZDCDetId::HAD) {
       enetotHadP += energy;
-      switch(channel){
-      case 1 :
-        meZdcEneHadP1_->Fill(energy);
-        meZdcEneTHadP1_->Fill(energy,time);
-        break;
-      case 2 :
-        meZdcEneHadP2_->Fill(energy);
-        meZdcEneTHadP2_->Fill(energy,time);
-        break;
-      case 3 :
-        meZdcEneHadP3_->Fill(energy);
-        meZdcEneTHadP3_->Fill(energy,time);
-        break;
-      case 4 :
-        meZdcEneHadP4_->Fill(energy);
-        meZdcEneTHadP4_->Fill(energy,time);
-        break;
+      switch (channel) {
+        case 1:
+          meZdcEneHadP1_->Fill(energy);
+          meZdcEneTHadP1_->Fill(energy, time);
+          break;
+        case 2:
+          meZdcEneHadP2_->Fill(energy);
+          meZdcEneTHadP2_->Fill(energy, time);
+          break;
+        case 3:
+          meZdcEneHadP3_->Fill(energy);
+          meZdcEneTHadP3_->Fill(energy, time);
+          break;
+        case 4:
+          meZdcEneHadP4_->Fill(energy);
+          meZdcEneTHadP4_->Fill(energy, time);
+          break;
       }
     }
   }
   return 0;
 }
 
-
-
-void ZdcSimHitStudy::endRun(const edm::Run& run, const edm::EventSetup& c)
-{
-}
-
-
-
-
-
-
-
-
-
-
-
-
+void ZdcSimHitStudy::endRun(const edm::Run &run, const edm::EventSetup &c) {}
diff --git a/Validation/HcalHits/src/module.cc b/Validation/HcalHits/src/module.cc
index 475f221133474..a0f2f796bd8b6 100644
--- a/Validation/HcalHits/src/module.cc
+++ b/Validation/HcalHits/src/module.cc
@@ -1,12 +1,12 @@
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
 #include "Validation/HcalHits/interface/SimG4HcalValidation.h"
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 
-DEFINE_SIMWATCHER (SimG4HcalValidation);
+DEFINE_SIMWATCHER(SimG4HcalValidation);
 
 #include "Validation/HcalHits/interface/HcalSimHitStudy.h"
 #include "Validation/HcalHits/interface/ZdcSimHitStudy.h"
 
-DEFINE_FWK_MODULE (HcalSimHitStudy);
-DEFINE_FWK_MODULE (ZdcSimHitStudy);
+DEFINE_FWK_MODULE(HcalSimHitStudy);
+DEFINE_FWK_MODULE(ZdcSimHitStudy);
diff --git a/Validation/HcalHits/test/HcalHitValidation.cc b/Validation/HcalHits/test/HcalHitValidation.cc
index 96d8d03d58b9e..c6b87a576fb99 100644
--- a/Validation/HcalHits/test/HcalHitValidation.cc
+++ b/Validation/HcalHits/test/HcalHitValidation.cc
@@ -1,131 +1,123 @@
-#include "Validation/HcalHits/test/HcalHitValidation.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
+#include "Validation/HcalHits/test/HcalHitValidation.h"
 
 #include "FWCore/Utilities/interface/Exception.h"
 
-HcalHitValidation::HcalHitValidation(const edm::ParameterSet& ps) {
-
-  g4Label  = ps.getUntrackedParameter<std::string>("moduleLabel","g4SimHits");
-  hcalHits = ps.getUntrackedParameter<std::string>("HitCollection","HcalHits");
-  layerInfo= ps.getUntrackedParameter<std::string>("LayerInfo","PHcalValidInfoLayer");
-  nxNInfo  = ps.getUntrackedParameter<std::string>("NxNInfo","PHcalValidInfoNxN");
-  jetsInfo = ps.getUntrackedParameter<std::string>("JetsInfo","PHcalValidInfoJets");
+HcalHitValidation::HcalHitValidation(const edm::ParameterSet &ps) {
+  g4Label = ps.getUntrackedParameter<std::string>("moduleLabel", "g4SimHits");
+  hcalHits = ps.getUntrackedParameter<std::string>("HitCollection", "HcalHits");
+  layerInfo = ps.getUntrackedParameter<std::string>("LayerInfo", "PHcalValidInfoLayer");
+  nxNInfo = ps.getUntrackedParameter<std::string>("NxNInfo", "PHcalValidInfoNxN");
+  jetsInfo = ps.getUntrackedParameter<std::string>("JetsInfo", "PHcalValidInfoJets");
   outFile_ = ps.getUntrackedParameter<std::string>("outputFile", "hcValid.root");
   verbose_ = ps.getUntrackedParameter<bool>("Verbose", false);
-  scheme_  = ps.getUntrackedParameter<bool>("TestNumbering", true);
-  checkHit_= ps.getUntrackedParameter<bool>("CheckHits",  true);
-  checkLay_= ps.getUntrackedParameter<bool>("CheckLayer", true);
-  checkNxN_= ps.getUntrackedParameter<bool>("CheckNxN",   true);
-  checkJet_= ps.getUntrackedParameter<bool>("CheckJets",  true);
+  scheme_ = ps.getUntrackedParameter<bool>("TestNumbering", true);
+  checkHit_ = ps.getUntrackedParameter<bool>("CheckHits", true);
+  checkLay_ = ps.getUntrackedParameter<bool>("CheckLayer", true);
+  checkNxN_ = ps.getUntrackedParameter<bool>("CheckNxN", true);
+  checkJet_ = ps.getUntrackedParameter<bool>("CheckJets", true);
 
   // register for data access
-  tok_hh_ = consumes<edm::PCaloHitContainer>(edm::InputTag(g4Label,hcalHits));
-  tok_iL_ = consumes<PHcalValidInfoLayer>(edm::InputTag(g4Label,layerInfo));
-  tok_iN_ = consumes<PHcalValidInfoNxN>(edm::InputTag(g4Label,nxNInfo));
-  tok_iJ_ = consumes<PHcalValidInfoJets>(edm::InputTag(g4Label,jetsInfo));
-
-  edm::LogInfo("HcalHitValid") << "Module Label: " << g4Label << "   Hits: "
-			       << hcalHits << " / "<< checkHit_ 
-			       << "   LayerInfo: " << layerInfo << " / "
-			       << checkLay_  << "  NxNInfo: " << nxNInfo 
-			       << " / " << checkNxN_ << "  jetsInfo: "
-			       << jetsInfo << " / " << checkJet_ 
-			       << "   Output: " << outFile_ 
-			       << "   Usage of TestNumberingScheme " <<scheme_;
-
+  tok_hh_ = consumes<edm::PCaloHitContainer>(edm::InputTag(g4Label, hcalHits));
+  tok_iL_ = consumes<PHcalValidInfoLayer>(edm::InputTag(g4Label, layerInfo));
+  tok_iN_ = consumes<PHcalValidInfoNxN>(edm::InputTag(g4Label, nxNInfo));
+  tok_iJ_ = consumes<PHcalValidInfoJets>(edm::InputTag(g4Label, jetsInfo));
+
+  edm::LogInfo("HcalHitValid") << "Module Label: " << g4Label << "   Hits: " << hcalHits << " / " << checkHit_
+                               << "   LayerInfo: " << layerInfo << " / " << checkLay_ << "  NxNInfo: " << nxNInfo
+                               << " / " << checkNxN_ << "  jetsInfo: " << jetsInfo << " / " << checkJet_
+                               << "   Output: " << outFile_ << "   Usage of TestNumberingScheme " << scheme_;
 }
 
-HcalHitValidation::~HcalHitValidation() {
-}
-
-void HcalHitValidation::bookHistograms(DQMStore::IBooker & ibooker,
-  edm::Run const &, edm::EventSetup const & ){
+HcalHitValidation::~HcalHitValidation() {}
 
+void HcalHitValidation::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &, edm::EventSetup const &) {
   ibooker.setCurrentFolder("HcalHitValidation");
 
   char title[60], name[20];
   double my_pi = 3.1415926;
-  //Histograms for Hits
+  // Histograms for Hits
   if (checkHit_) {
-    meAllNHit_   = ibooker.book1D("Hit01", "Number of Hits in HCal", 1000, 0., 5000.);
-    meBadDetHit_ = ibooker.book1D("Hit02", "Hits with wrong Det",   100, 0., 100.);
-    meBadSubHit_ = ibooker.book1D("Hit03", "Hits with wrong Subdet",100, 0., 100.);
-    meBadIdHit_  = ibooker.book1D("Hit04", "Hits with wrong ID",    100, 0., 100.);
-    meHBNHit_    = ibooker.book1D("Hit05", "Number of Hits in HB", 1000, 0., 5000.);
-    meHENHit_    = ibooker.book1D("Hit06", "Number of Hits in HE", 1000, 0., 5000.);
-    meHONHit_    = ibooker.book1D("Hit07", "Number of Hits in HO", 1000, 0., 5000.);
-    meHFNHit_    = ibooker.book1D("Hit08", "Number of Hits in HF", 1000, 0., 5000.);
-    meDetectHit_ = ibooker.book1D("Hit09", "Detector ID",           50, 0., 50.);
-    meSubdetHit_ = ibooker.book1D("Hit10", "Subdetectors in HCal",  50, 0., 50.);
-    meDepthHit_  = ibooker.book1D("Hit11", "Depths in HCal",        20, 0., 20.);
-    meEtaHit_    = ibooker.book1D("Hit12", "Eta in HCal",          100, -50., 50.);
-    mePhiHit_    = ibooker.book1D("Hit13", "Phi in HCal",          100, 0., 100.);
-    meEnergyHit_ = ibooker.book1D("Hit14", "Energy in HCal",       100, 0., 1.);
-    meTimeHit_   = ibooker.book1D("Hit15", "Time in HCal",         100, 0., 400.);
-    meTimeWHit_  = ibooker.book1D("Hit16", "Time in HCal (E wtd)", 100, 0., 400.);
-    meHBDepHit_  = ibooker.book1D("Hit17", "Depths in HB",          20, 0., 20.);
-    meHEDepHit_  = ibooker.book1D("Hit18", "Depths in HE",          20, 0., 20.);
-    meHODepHit_  = ibooker.book1D("Hit19", "Depths in HO",          20, 0., 20.);
-    meHFDepHit_  = ibooker.book1D("Hit20", "Depths in HF",          20, 0., 20.);
-    meHBEtaHit_  = ibooker.book1D("Hit21", "Eta in HB",            100, -50., 50.);
-    meHEEtaHit_  = ibooker.book1D("Hit22", "Eta in HE",            100, -50., 50.);
-    meHOEtaHit_  = ibooker.book1D("Hit23", "Eta in HO",            100, -50., 50.);
-    meHFEtaHit_  = ibooker.book1D("Hit24", "Eta in HF",            100, -50., 50.);
-    meHBPhiHit_  = ibooker.book1D("Hit25", "Phi in HB",            100, 0., 100.);
-    meHEPhiHit_  = ibooker.book1D("Hit26", "Phi in HE",            100, 0., 100.);
-    meHOPhiHit_  = ibooker.book1D("Hit27", "Phi in HO",            100, 0., 100.);
-    meHFPhiHit_  = ibooker.book1D("Hit28", "Phi in HF",            100, 0., 100.);
-    meHBEneHit_  = ibooker.book1D("Hit29", "Energy in HB",         100, 0., 1.);
-    meHEEneHit_  = ibooker.book1D("Hit30", "Energy in HE",         100, 0., 1.);
-    meHOEneHit_  = ibooker.book1D("Hit31", "Energy in HO",         100, 0., 1.);
-    meHFEneHit_  = ibooker.book1D("Hit32", "Energy in HF",         100, 0., 100.);
-    meHBTimHit_  = ibooker.book1D("Hit33", "Time in HB",           100, 0., 400.);
-    meHETimHit_  = ibooker.book1D("Hit34", "Time in HE",           100, 0., 400.);
-    meHOTimHit_  = ibooker.book1D("Hit35", "Time in HO",           100, 0., 400.);
-    meHFTimHit_  = ibooker.book1D("Hit36", "Time in HF",           100, 0., 400.);
-    mePMTHit_    = ibooker.book1D("Hit37", "Number of Hit in PMT",1000, 0., 1000.);
-    mePMTDepHit_ = ibooker.book1D("Hit38", "Depths in HF PMT",      20, 0., 20.);
-    mePMTEtaHit_ = ibooker.book1D("Hit39", "Eta in HF PMT",        100, -50., 50.);
-    mePMTPhiHit_ = ibooker.book1D("Hit40", "Phi in HF PMT",        100, 0., 100.);
-    mePMTEn1Hit_ = ibooker.book1D("Hit41", "Energy (Ceren) in PMT",100, 0., 100.);
-    mePMTEn2Hit_ = ibooker.book1D("Hit42", "Energy (dE/dx) in PMT",100, 0., 100.);
-    mePMTTimHit_ = ibooker.book1D("Hit43", "Time in HF PMT",       100, 0., 400.);
+    meAllNHit_ = ibooker.book1D("Hit01", "Number of Hits in HCal", 1000, 0., 5000.);
+    meBadDetHit_ = ibooker.book1D("Hit02", "Hits with wrong Det", 100, 0., 100.);
+    meBadSubHit_ = ibooker.book1D("Hit03", "Hits with wrong Subdet", 100, 0., 100.);
+    meBadIdHit_ = ibooker.book1D("Hit04", "Hits with wrong ID", 100, 0., 100.);
+    meHBNHit_ = ibooker.book1D("Hit05", "Number of Hits in HB", 1000, 0., 5000.);
+    meHENHit_ = ibooker.book1D("Hit06", "Number of Hits in HE", 1000, 0., 5000.);
+    meHONHit_ = ibooker.book1D("Hit07", "Number of Hits in HO", 1000, 0., 5000.);
+    meHFNHit_ = ibooker.book1D("Hit08", "Number of Hits in HF", 1000, 0., 5000.);
+    meDetectHit_ = ibooker.book1D("Hit09", "Detector ID", 50, 0., 50.);
+    meSubdetHit_ = ibooker.book1D("Hit10", "Subdetectors in HCal", 50, 0., 50.);
+    meDepthHit_ = ibooker.book1D("Hit11", "Depths in HCal", 20, 0., 20.);
+    meEtaHit_ = ibooker.book1D("Hit12", "Eta in HCal", 100, -50., 50.);
+    mePhiHit_ = ibooker.book1D("Hit13", "Phi in HCal", 100, 0., 100.);
+    meEnergyHit_ = ibooker.book1D("Hit14", "Energy in HCal", 100, 0., 1.);
+    meTimeHit_ = ibooker.book1D("Hit15", "Time in HCal", 100, 0., 400.);
+    meTimeWHit_ = ibooker.book1D("Hit16", "Time in HCal (E wtd)", 100, 0., 400.);
+    meHBDepHit_ = ibooker.book1D("Hit17", "Depths in HB", 20, 0., 20.);
+    meHEDepHit_ = ibooker.book1D("Hit18", "Depths in HE", 20, 0., 20.);
+    meHODepHit_ = ibooker.book1D("Hit19", "Depths in HO", 20, 0., 20.);
+    meHFDepHit_ = ibooker.book1D("Hit20", "Depths in HF", 20, 0., 20.);
+    meHBEtaHit_ = ibooker.book1D("Hit21", "Eta in HB", 100, -50., 50.);
+    meHEEtaHit_ = ibooker.book1D("Hit22", "Eta in HE", 100, -50., 50.);
+    meHOEtaHit_ = ibooker.book1D("Hit23", "Eta in HO", 100, -50., 50.);
+    meHFEtaHit_ = ibooker.book1D("Hit24", "Eta in HF", 100, -50., 50.);
+    meHBPhiHit_ = ibooker.book1D("Hit25", "Phi in HB", 100, 0., 100.);
+    meHEPhiHit_ = ibooker.book1D("Hit26", "Phi in HE", 100, 0., 100.);
+    meHOPhiHit_ = ibooker.book1D("Hit27", "Phi in HO", 100, 0., 100.);
+    meHFPhiHit_ = ibooker.book1D("Hit28", "Phi in HF", 100, 0., 100.);
+    meHBEneHit_ = ibooker.book1D("Hit29", "Energy in HB", 100, 0., 1.);
+    meHEEneHit_ = ibooker.book1D("Hit30", "Energy in HE", 100, 0., 1.);
+    meHOEneHit_ = ibooker.book1D("Hit31", "Energy in HO", 100, 0., 1.);
+    meHFEneHit_ = ibooker.book1D("Hit32", "Energy in HF", 100, 0., 100.);
+    meHBTimHit_ = ibooker.book1D("Hit33", "Time in HB", 100, 0., 400.);
+    meHETimHit_ = ibooker.book1D("Hit34", "Time in HE", 100, 0., 400.);
+    meHOTimHit_ = ibooker.book1D("Hit35", "Time in HO", 100, 0., 400.);
+    meHFTimHit_ = ibooker.book1D("Hit36", "Time in HF", 100, 0., 400.);
+    mePMTHit_ = ibooker.book1D("Hit37", "Number of Hit in PMT", 1000, 0., 1000.);
+    mePMTDepHit_ = ibooker.book1D("Hit38", "Depths in HF PMT", 20, 0., 20.);
+    mePMTEtaHit_ = ibooker.book1D("Hit39", "Eta in HF PMT", 100, -50., 50.);
+    mePMTPhiHit_ = ibooker.book1D("Hit40", "Phi in HF PMT", 100, 0., 100.);
+    mePMTEn1Hit_ = ibooker.book1D("Hit41", "Energy (Ceren) in PMT", 100, 0., 100.);
+    mePMTEn2Hit_ = ibooker.book1D("Hit42", "Energy (dE/dx) in PMT", 100, 0., 100.);
+    mePMTTimHit_ = ibooker.book1D("Hit43", "Time in HF PMT", 100, 0., 400.);
   }
 
-  //Histograms for Layers
+  // Histograms for Layers
   if (checkLay_) {
     meLayerLay_ = ibooker.book1D("Lay01", "Layer # of the Hits", 20, 0., 20.);
-    meEtaHLay_  = ibooker.book1D("Lay02", "Eta of the Hits", 100, -5., 5.);
-    mePhiHLay_  = ibooker.book1D("Lay03", "Phi of the Hits", 100, -my_pi, my_pi);
-    meEneHLay_  = ibooker.book1D("Lay04", "Energy of the Hits", 100, 0., 2.);
-    meDepHlay_  = ibooker.book1D("Lay05", "Depth  of the Hits", 10, 0., 10.);
-    meTimHLay_  = ibooker.book1D("Lay06", "Time of the Hits",   100, 0., 400.);
-    meTimWLay_  = ibooker.book1D("Lay07", "Time (wtd) of Hits", 100, 0., 400.);
-    meEtaPhi_   = ibooker.book2D("Lay08", "Phi%Eta of the Hits", 100, -5., 5.,
-        100,-my_pi,my_pi);
-
-    meHitELay_  = ibooker.book1D("Lay09", "Hit in Ecal", 1000, 0., 2000.);
-    meHitHLay_  = ibooker.book1D("Lay10", "Hit in Hcal", 1000, 0., 2000.);
-    meHitTLay_  = ibooker.book1D("Lay11", "Total Hits",  1000, 0., 2000.);
-    meEneLLay_  = ibooker.book1D("Lay12", "Energy per layer", 100, 0., 1.);
-    int nn=0;
+    meEtaHLay_ = ibooker.book1D("Lay02", "Eta of the Hits", 100, -5., 5.);
+    mePhiHLay_ = ibooker.book1D("Lay03", "Phi of the Hits", 100, -my_pi, my_pi);
+    meEneHLay_ = ibooker.book1D("Lay04", "Energy of the Hits", 100, 0., 2.);
+    meDepHlay_ = ibooker.book1D("Lay05", "Depth  of the Hits", 10, 0., 10.);
+    meTimHLay_ = ibooker.book1D("Lay06", "Time of the Hits", 100, 0., 400.);
+    meTimWLay_ = ibooker.book1D("Lay07", "Time (wtd) of Hits", 100, 0., 400.);
+    meEtaPhi_ = ibooker.book2D("Lay08", "Phi%Eta of the Hits", 100, -5., 5., 100, -my_pi, my_pi);
+
+    meHitELay_ = ibooker.book1D("Lay09", "Hit in Ecal", 1000, 0., 2000.);
+    meHitHLay_ = ibooker.book1D("Lay10", "Hit in Hcal", 1000, 0., 2000.);
+    meHitTLay_ = ibooker.book1D("Lay11", "Total Hits", 1000, 0., 2000.);
+    meEneLLay_ = ibooker.book1D("Lay12", "Energy per layer", 100, 0., 1.);
+    int nn = 0;
     for (int i = 0; i < nLayersMAX; i++) {
-      sprintf (name,  "Layl%d", nn); nn++;
-      sprintf (title, "Energy deposit in Layer %d", i);
+      sprintf(name, "Layl%d", nn);
+      nn++;
+      sprintf(title, "Energy deposit in Layer %d", i);
       meEneLay_[i] = ibooker.book1D(name, title, 100, 0., 0.4);
     }
-    meLngLay_   = ibooker.book1D("Lay13", "Lonitudinal Shower Profile",20, 0, 20.);
-    meEneDLay_  = ibooker.book1D("Lay14", "Energy per depth", 100, 0., 1.);
+    meLngLay_ = ibooker.book1D("Lay13", "Lonitudinal Shower Profile", 20, 0, 20.);
+    meEneDLay_ = ibooker.book1D("Lay14", "Energy per depth", 100, 0., 1.);
     for (int i = 0; i < nDepthsMAX; i++) {
-      sprintf (name,  "Layl%d", nn); nn++;
-      sprintf (title, "Energy deposit in Depth %d", i);
+      sprintf(name, "Layl%d", nn);
+      nn++;
+      sprintf(title, "Energy deposit in Depth %d", i);
       meDepLay_[i] = ibooker.book1D(name, title, 100, 0., 2.);
     }
 
-    meEtotLay_  = ibooker.book1D("Lay15", "Total Energy", 100, 0., 1.);
-    meEHOLay_   = ibooker.book1D("Lay16", "Energy in HO", 100, 0., 2000.);
+    meEtotLay_ = ibooker.book1D("Lay15", "Total Energy", 100, 0., 1.);
+    meEHOLay_ = ibooker.book1D("Lay16", "Energy in HO", 100, 0., 2000.);
     meEHBHELay_ = ibooker.book1D("Lay17", "Energy in HB/HE", 100, 0., 2000.);
-    meEFibLLay_ = ibooker.book1D("Lay18", "Energy in HF (Long)",  100, 0., 100.);
+    meEFibLLay_ = ibooker.book1D("Lay18", "Energy in HF (Long)", 100, 0., 100.);
     meEFibSLay_ = ibooker.book1D("Lay19", "Energy in HF (Short)", 100, 0., 100.);
     meEHFEmLay_ = ibooker.book1D("Lay20", "EM   energy in HF", 100, 0., 200.);
     meEHFHdLay_ = ibooker.book1D("Lay21", "Had. energy in HF", 100, 0., 200.);
@@ -135,191 +127,184 @@ void HcalHitValidation::bookHistograms(DQMStore::IBooker & ibooker,
   if (checkNxN_) {
     meEcalRNxN_ = ibooker.book1D("NxN01", "Energy in ECal (NxN)r", 100, 0., 200.);
     meHcalRNxN_ = ibooker.book1D("NxN02", "Energy in HCal (NxN)r", 100, 0., 200.);
-    meHoRNxN_   = ibooker.book1D("NxN03", "Energy in HO (NxN)r",  100, 0., 200.);
-    meEtotRNxN_ = ibooker.book1D("NxN04", "Energy Total (NxN)r",  100, 0., 200.);
-    meEcalNxN_  = ibooker.book1D("NxN05", "Energy in ECal (NxN)", 100, 0., 200.);
-    meHcalNxN_  = ibooker.book1D("NxN06", "Energy in HCal (NxN)", 100, 0., 200.);
-    meHoNxN_    = ibooker.book1D("NxN07", "Energy in HO (NxN)",   100, 0., 200.);
-    meEtotNxN_  = ibooker.book1D("NxN08", "Energy Total (NxN)",   100, 0., 200.);
-    meEiNxN_    = ibooker.book1D("NxN09", "Energy of Hits in (NxN)", 100, 0., 1.);
-    meTiNxN_    = ibooker.book1D("NxN10", "Time   of Hits in (NxN)", 100, 0., 400.);
-    meTrNxN_    = ibooker.book1D("NxN11", "Dist.  of Hits in (NxN)", 100, 0., 1.);
+    meHoRNxN_ = ibooker.book1D("NxN03", "Energy in HO (NxN)r", 100, 0., 200.);
+    meEtotRNxN_ = ibooker.book1D("NxN04", "Energy Total (NxN)r", 100, 0., 200.);
+    meEcalNxN_ = ibooker.book1D("NxN05", "Energy in ECal (NxN)", 100, 0., 200.);
+    meHcalNxN_ = ibooker.book1D("NxN06", "Energy in HCal (NxN)", 100, 0., 200.);
+    meHoNxN_ = ibooker.book1D("NxN07", "Energy in HO (NxN)", 100, 0., 200.);
+    meEtotNxN_ = ibooker.book1D("NxN08", "Energy Total (NxN)", 100, 0., 200.);
+    meEiNxN_ = ibooker.book1D("NxN09", "Energy of Hits in (NxN)", 100, 0., 1.);
+    meTiNxN_ = ibooker.book1D("NxN10", "Time   of Hits in (NxN)", 100, 0., 400.);
+    meTrNxN_ = ibooker.book1D("NxN11", "Dist.  of Hits in (NxN)", 100, 0., 1.);
   }
 
-  //Histograms for Jets
+  // Histograms for Jets
   if (checkJet_) {
-    meRJet_    = ibooker.book1D("Jet01", "R of Hits", 100, 0., 1.);
-    meTJet_    = ibooker.book1D("Jet02", "T of Hits", 100, 0., 200.);
-    meEJet_    = ibooker.book1D("Jet03", "E of Hits", 100, 0., 200.);
+    meRJet_ = ibooker.book1D("Jet01", "R of Hits", 100, 0., 1.);
+    meTJet_ = ibooker.book1D("Jet02", "T of Hits", 100, 0., 200.);
+    meEJet_ = ibooker.book1D("Jet03", "E of Hits", 100, 0., 200.);
     meEcalJet_ = ibooker.book1D("Jet04", "Ecal Energy (First Jet)", 100, 0., 200.);
     meHcalJet_ = ibooker.book1D("Jet05", "Hcal Energy (First Jet)", 100, 0., 200.);
-    meHoJet_   = ibooker.book1D("Jet06", "Ho   Energy (First Jet)", 100, 0., 200.);
+    meHoJet_ = ibooker.book1D("Jet06", "Ho   Energy (First Jet)", 100, 0., 200.);
     meEtotJet_ = ibooker.book1D("Jet07", "Total Energy(First Jet)", 100, 0., 200.);
-    meEcHcJet_ = ibooker.book2D("Jet08", "Energy in Hcal% Ecal", 100,0., 200., 100,
-        0., 200.);
+    meEcHcJet_ = ibooker.book2D("Jet08", "Energy in Hcal% Ecal", 100, 0., 200., 100, 0., 200.);
 
     meDetaJet_ = ibooker.book1D("Jet09", "Delta Eta", 100, 0., 2.);
     meDphiJet_ = ibooker.book1D("Jet10", "Delta Phi", 100, 0., 1.);
-    meDrJet_   = ibooker.book1D("Jet11", "Delta R",   100, 0., 2.);
+    meDrJet_ = ibooker.book1D("Jet11", "Delta R", 100, 0., 2.);
     meMassJet_ = ibooker.book1D("Jet12", "Di-jet mass", 100, 0., 200.);
-    meEneJet_  = ibooker.book1D("Jet13", "Jet Energy", 100, 0., 200.);
-    meEtaJet_  = ibooker.book1D("Jet14", "Jet Eta", 100, -5., 5.);
-    mePhiJet_  = ibooker.book1D("Jet15", "Jet Phi", 100, -my_pi, my_pi);
+    meEneJet_ = ibooker.book1D("Jet13", "Jet Energy", 100, 0., 200.);
+    meEtaJet_ = ibooker.book1D("Jet14", "Jet Eta", 100, -5., 5.);
+    mePhiJet_ = ibooker.book1D("Jet15", "Jet Phi", 100, -my_pi, my_pi);
   }
 }
 
-void HcalHitValidation::analyze(const edm::Event& e, const edm::EventSetup& ) {
+void HcalHitValidation::analyze(const edm::Event &e, const edm::EventSetup &) {
+  LogDebug("HcalHitValid") << "Run = " << e.id().run() << " Event = " << e.id().event();
 
-  LogDebug("HcalHitValid") << "Run = " << e.id().run() << " Event = " 
-			   << e.id().event();
-
-  std::vector<PCaloHit>               caloHits;
+  std::vector<PCaloHit> caloHits;
   edm::Handle<edm::PCaloHitContainer> hitsHcal;
-  edm::Handle<PHcalValidInfoLayer>    infoLayer;
-  edm::Handle<PHcalValidInfoNxN>      infoNxN;
-  edm::Handle<PHcalValidInfoJets>     infoJets;
+  edm::Handle<PHcalValidInfoLayer> infoLayer;
+  edm::Handle<PHcalValidInfoNxN> infoNxN;
+  edm::Handle<PHcalValidInfoJets> infoJets;
 
   bool getHits = false;
   if (checkHit_) {
-    e.getByToken(tok_hh_,hitsHcal); 
-    if (hitsHcal.isValid()) getHits = true;
+    e.getByToken(tok_hh_, hitsHcal);
+    if (hitsHcal.isValid())
+      getHits = true;
   }
 
   bool getLayer = false;
   if (checkLay_) {
-    e.getByToken(tok_iL_,infoLayer);
-    if (infoLayer.isValid()) getLayer = true;
+    e.getByToken(tok_iL_, infoLayer);
+    if (infoLayer.isValid())
+      getLayer = true;
   }
 
   bool getNxN = false;
   if (checkNxN_) {
-    e.getByToken(tok_iN_,infoNxN);
-    if (infoNxN.isValid()) getNxN = true;
+    e.getByToken(tok_iN_, infoNxN);
+    if (infoNxN.isValid())
+      getNxN = true;
   }
 
   bool getJets = false;
   if (checkJet_) {
-    e.getByToken(tok_iJ_,infoJets);
-    if (infoJets.isValid()) getJets = true;
+    e.getByToken(tok_iJ_, infoJets);
+    if (infoJets.isValid())
+      getJets = true;
   }
 
-  LogDebug("HcalHitValid") << "HcalValidation: Input flags Hits " << getHits 
-			   << ", Layer " << getLayer << ", NxN " << getNxN
-			   << ", Jets " << getJets;
+  LogDebug("HcalHitValid") << "HcalValidation: Input flags Hits " << getHits << ", Layer " << getLayer << ", NxN "
+                           << getNxN << ", Jets " << getJets;
 
   if (getHits) {
-    caloHits.insert(caloHits.end(),hitsHcal->begin(),hitsHcal->end());
-    LogDebug("HcalHitValid") << "HcalValidation: Hit buffer " 
-			     << caloHits.size(); 
-    analyzeHits (caloHits);
+    caloHits.insert(caloHits.end(), hitsHcal->begin(), hitsHcal->end());
+    LogDebug("HcalHitValid") << "HcalValidation: Hit buffer " << caloHits.size();
+    analyzeHits(caloHits);
   }
 
-  if (getLayer) analyzeLayer (infoLayer);
-  if (getNxN)   analyzeNxN   (infoNxN);
-  if (getJets)  analyzeJets  (infoJets);
+  if (getLayer)
+    analyzeLayer(infoLayer);
+  if (getNxN)
+    analyzeNxN(infoNxN);
+  if (getJets)
+    analyzeJets(infoJets);
 }
 
-void HcalHitValidation::analyzeHits (std::vector<PCaloHit>& hits) {
-
+void HcalHitValidation::analyzeHits(std::vector<PCaloHit> &hits) {
   int nHit = hits.size();
-  int nHB=0, nHE=0, nHO=0, nHF=0, nPMT=0, nBad1=0, nBad2=0, nBad=0;
-  for (int i=0; i<nHit; i++) {
-    double energy    = hits[i].energy();
-    double time      = hits[i].time();
+  int nHB = 0, nHE = 0, nHO = 0, nHF = 0, nPMT = 0, nBad1 = 0, nBad2 = 0, nBad = 0;
+  for (int i = 0; i < nHit; i++) {
+    double energy = hits[i].energy();
+    double time = hits[i].time();
     unsigned int id_ = hits[i].id();
     int det, subdet, depth, eta, phi;
     if (scheme_) {
-      det            = 4;
-      subdet         = (id_>>28)&15;
-      depth          = (id_>>26)&3; depth++;
-      int zside      = ((id_&0x100000)?(1):(-1)); 
-      eta            = zside*((id_>>10)&1023);
-      phi            = (id_&1023);
+      det = 4;
+      subdet = (id_ >> 28) & 15;
+      depth = (id_ >> 26) & 3;
+      depth++;
+      int zside = ((id_ & 0x100000) ? (1) : (-1));
+      eta = zside * ((id_ >> 10) & 1023);
+      phi = (id_ & 1023);
     } else {
-      HcalDetId id   = HcalDetId(id_);
-      det            = id.det();
-      subdet         = id.subdet();
-      depth          = id.depth();
-      eta            = id.ieta();
-      phi            = id.iphi();
+      HcalDetId id = HcalDetId(id_);
+      det = id.det();
+      subdet = id.subdet();
+      depth = id.depth();
+      eta = id.ieta();
+      phi = id.iphi();
     }
-    uint16_t depth_  = hits[i].depth();
-    double energyEM  = hits[i].energyEM();
+    uint16_t depth_ = hits[i].depth();
+    double energyEM = hits[i].energyEM();
     double energyHad = hits[i].energyHad();
-    LogDebug("HcalHitValid") << "Hit[" << i << "] ID " << std::hex << id_ 
-	         << std::dec << " Det " << det << " Sub "
-	         << subdet << " depth " << depth << " " << depth_
-	         << " Eta " << eta << " Phi " << phi << " E "
-	         << energy << "(EM " << energyEM << ", Had "
-	         << energyHad << ") time " << time;
-    if (det ==  4) { // Check DetId.h
-      if (subdet == static_cast<int>(HcalBarrel))
-      {
-	      nHB++;
-      } else if (subdet == static_cast<int>(HcalEndcap))
-      {
-	      nHE++;
-      } else if (subdet == static_cast<int>(HcalOuter))
-      {
-	      nHO++;
-      } else if (subdet == static_cast<int>(HcalForward))
-      {
-	      if (depth_ == 0) nHF++;
-	      else             nPMT++;
-      } else
-      {
-	      nBad++;
+    LogDebug("HcalHitValid") << "Hit[" << i << "] ID " << std::hex << id_ << std::dec << " Det " << det << " Sub "
+                             << subdet << " depth " << depth << " " << depth_ << " Eta " << eta << " Phi " << phi
+                             << " E " << energy << "(EM " << energyEM << ", Had " << energyHad << ") time " << time;
+    if (det == 4) {  // Check DetId.h
+      if (subdet == static_cast<int>(HcalBarrel)) {
+        nHB++;
+      } else if (subdet == static_cast<int>(HcalEndcap)) {
+        nHE++;
+      } else if (subdet == static_cast<int>(HcalOuter)) {
+        nHO++;
+      } else if (subdet == static_cast<int>(HcalForward)) {
+        if (depth_ == 0)
+          nHF++;
+        else
+          nPMT++;
+      } else {
+        nBad++;
         nBad2++;
       }
-    } else
-    {
+    } else {
       nBad++;
       nBad1++;
     }
 
     meDetectHit_->Fill(double(det));
-    if (det ==  4 && depth_ == 0) {
-	    meSubdetHit_->Fill(double(subdet));
-	    meDepthHit_->Fill(double(depth));
-	    meEtaHit_->Fill(double(eta));
-	    mePhiHit_->Fill(double(phi));
-	    meEnergyHit_->Fill(energy);
-	    meTimeHit_->Fill(time);
-	    meTimeWHit_->Fill(double(time),energy);
-	    if (subdet == static_cast<int>(HcalBarrel)) {
-	      meHBDepHit_->Fill(double(depth));
-	      meHBEtaHit_->Fill(double(eta));
-	      meHBPhiHit_->Fill(double(phi));
-	      meHBEneHit_->Fill(energy);
-	      meHBTimHit_->Fill(time);
-	    } else if (subdet == static_cast<int>(HcalEndcap)) {
-	      meHEDepHit_->Fill(double(depth));
-	      meHEEtaHit_->Fill(double(eta));
-	      meHEPhiHit_->Fill(double(phi));
-	      meHEEneHit_->Fill(energy);
-	      meHETimHit_->Fill(time);
-	    } else if (subdet == static_cast<int>(HcalOuter)) {
-	      meHODepHit_->Fill(double(depth));
-	      meHOEtaHit_->Fill(double(eta));
-	      meHOPhiHit_->Fill(double(phi));
-	      meHOEneHit_->Fill(energy);
-	      meHOTimHit_->Fill(time);
-	    } else if (subdet == static_cast<int>(HcalForward)) {
-	      meHFDepHit_->Fill(double(depth));
-	      meHFEtaHit_->Fill(double(eta));
-	      meHFPhiHit_->Fill(double(phi));
-	      meHFEneHit_->Fill(energy);
-	      meHFTimHit_->Fill(time);
-	    }
-    }
-    else if (det == 0 && subdet == static_cast<int>(HcalForward))
-    {
-	    mePMTDepHit_->Fill(double(depth));
-	    mePMTEtaHit_->Fill(double(eta));
-	    mePMTPhiHit_->Fill(double(phi));
-	    mePMTEn1Hit_->Fill(energyEM);
-	    mePMTEn2Hit_->Fill(energyHad);
-	    mePMTTimHit_->Fill(time);
+    if (det == 4 && depth_ == 0) {
+      meSubdetHit_->Fill(double(subdet));
+      meDepthHit_->Fill(double(depth));
+      meEtaHit_->Fill(double(eta));
+      mePhiHit_->Fill(double(phi));
+      meEnergyHit_->Fill(energy);
+      meTimeHit_->Fill(time);
+      meTimeWHit_->Fill(double(time), energy);
+      if (subdet == static_cast<int>(HcalBarrel)) {
+        meHBDepHit_->Fill(double(depth));
+        meHBEtaHit_->Fill(double(eta));
+        meHBPhiHit_->Fill(double(phi));
+        meHBEneHit_->Fill(energy);
+        meHBTimHit_->Fill(time);
+      } else if (subdet == static_cast<int>(HcalEndcap)) {
+        meHEDepHit_->Fill(double(depth));
+        meHEEtaHit_->Fill(double(eta));
+        meHEPhiHit_->Fill(double(phi));
+        meHEEneHit_->Fill(energy);
+        meHETimHit_->Fill(time);
+      } else if (subdet == static_cast<int>(HcalOuter)) {
+        meHODepHit_->Fill(double(depth));
+        meHOEtaHit_->Fill(double(eta));
+        meHOPhiHit_->Fill(double(phi));
+        meHOEneHit_->Fill(energy);
+        meHOTimHit_->Fill(time);
+      } else if (subdet == static_cast<int>(HcalForward)) {
+        meHFDepHit_->Fill(double(depth));
+        meHFEtaHit_->Fill(double(eta));
+        meHFPhiHit_->Fill(double(phi));
+        meHFEneHit_->Fill(energy);
+        meHFTimHit_->Fill(time);
+      }
+    } else if (det == 0 && subdet == static_cast<int>(HcalForward)) {
+      mePMTDepHit_->Fill(double(depth));
+      mePMTEtaHit_->Fill(double(eta));
+      mePMTPhiHit_->Fill(double(phi));
+      mePMTEn1Hit_->Fill(energyEM);
+      mePMTEn2Hit_->Fill(energyHad);
+      mePMTTimHit_->Fill(time);
     }
   }
   meAllNHit_->Fill(double(nHit));
@@ -332,34 +317,33 @@ void HcalHitValidation::analyzeHits (std::vector<PCaloHit>& hits) {
   meHFNHit_->Fill(double(nHF));
   mePMTHit_->Fill(double(nPMT));
 
-  LogDebug("HcalHitValid") << "HcalHitValidation::analyzeHits: HB " << nHB
-      << " HE " << nHE << " HO " << nHO << " HF " << nHF
-      << " PMT " << nPMT << " Bad " << nBad << " All "
-      << nHit;
-
+  LogDebug("HcalHitValid") << "HcalHitValidation::analyzeHits: HB " << nHB << " HE " << nHE << " HO " << nHO << " HF "
+                           << nHF << " PMT " << nPMT << " Bad " << nBad << " All " << nHit;
 }
 
-void HcalHitValidation::analyzeLayer (edm::Handle<PHcalValidInfoLayer>& infoLayer) {
-
-  // CaloHits from PHcalValidInfoLayer  
-  int                    nHits = infoLayer->nHit();
-  std::vector<float>    idHits = infoLayer->idHit();
-  std::vector<float>   phiHits = infoLayer->phiHit();
-  std::vector<float>   etaHits = infoLayer->etaHit();
+void HcalHitValidation::analyzeLayer(edm::Handle<PHcalValidInfoLayer> &infoLayer) {
+  // CaloHits from PHcalValidInfoLayer
+  int nHits = infoLayer->nHit();
+  std::vector<float> idHits = infoLayer->idHit();
+  std::vector<float> phiHits = infoLayer->phiHit();
+  std::vector<float> etaHits = infoLayer->etaHit();
   std::vector<float> layerHits = infoLayer->layerHit();
-  std::vector<float>     eHits = infoLayer->eHit();
-  std::vector<float>     tHits = infoLayer->tHit();
+  std::vector<float> eHits = infoLayer->eHit();
+  std::vector<float> tHits = infoLayer->tHit();
 
-  int ne = 0, nh = 0; 
+  int ne = 0, nh = 0;
   for (int j = 0; j < nHits; j++) {
-    int layer = (int)(layerHits[j])-1;
-    int id    = (int)(idHits[j]);
-    
-    if(id >= 10) {ne++;}
-    else {nh++;}
+    int layer = (int)(layerHits[j]) - 1;
+    int id = (int)(idHits[j]);
+
+    if (id >= 10) {
+      ne++;
+    } else {
+      nh++;
+    }
 
     LogDebug("HcalHitValid") << "HcalHitValidation::analyzeLayer:Hit "
-			     << "subdet = " << id  << "  lay = " << layer;
+                             << "subdet = " << id << "  lay = " << layer;
 
     meLayerLay_->Fill(double(layer));
     meEtaHLay_->Fill(etaHits[j]);
@@ -367,13 +351,13 @@ void HcalHitValidation::analyzeLayer (edm::Handle<PHcalValidInfoLayer>& infoLaye
     meEneHLay_->Fill(eHits[j]);
     meDepHlay_->Fill(idHits[j]);
     meTimHLay_->Fill(tHits[j]);
-    meTimWLay_->Fill(tHits[j],eHits[j]);
-    if (id < 6) // HCAL only. Depth is needed, not layer !!!
+    meTimWLay_->Fill(tHits[j], eHits[j]);
+    if (id < 6)  // HCAL only. Depth is needed, not layer !!!
     {
-	    meEtaPhi_->Fill(etaHits[j],phiHits[j]);
+      meEtaPhi_->Fill(etaHits[j], phiHits[j]);
     }
   }
-  
+
   meHitELay_->Fill(double(ne));
   meHitHLay_->Fill(double(nh));
   meHitTLay_->Fill(double(nHits));
@@ -383,27 +367,25 @@ void HcalHitValidation::analyzeLayer (edm::Handle<PHcalValidInfoLayer>& infoLaye
   std::vector<float> eDepth = infoLayer->edepth();
   float eTot = 0.;
 
-  for (int j = 0; j < nLayersMAX ; j++)
-  {
+  for (int j = 0; j < nLayersMAX; j++) {
     eTot += eLayer[j];
     meEneLLay_->Fill(eLayer[j]);
     meEneLay_[j]->Fill(eLayer[j]);
-    meLngLay_->Fill((double)(j),eLayer[j]);  // HCAL SimHits only
+    meLngLay_->Fill((double)(j), eLayer[j]);  // HCAL SimHits only
   }
-  for (int j = 0; j < nDepthsMAX; j++)
-  {
+  for (int j = 0; j < nDepthsMAX; j++) {
     meEneDLay_->Fill(eDepth[j]);
     meDepLay_[j]->Fill(eDepth[j]);
   }
   meEtotLay_->Fill(eTot);
-       
+
   // The rest  PHcalValidInfoLayer
-  double eHO      =  infoLayer->eho(); 
-  double eHBHE    =  infoLayer->ehbhe(); 
-  double elongHF  =  infoLayer->elonghf(); 
-  double eshortHF =  infoLayer->eshorthf(); 
-  double eEcalHF  =  infoLayer->eecalhf(); 
-  double eHcalHF  =  infoLayer->ehcalhf(); 
+  double eHO = infoLayer->eho();
+  double eHBHE = infoLayer->ehbhe();
+  double elongHF = infoLayer->elonghf();
+  double eshortHF = infoLayer->eshorthf();
+  double eEcalHF = infoLayer->eecalhf();
+  double eHcalHF = infoLayer->ehcalhf();
 
   meEHOLay_->Fill(eHO);
   meEHBHELay_->Fill(eHBHE);
@@ -412,57 +394,52 @@ void HcalHitValidation::analyzeLayer (edm::Handle<PHcalValidInfoLayer>& infoLaye
   meEHFEmLay_->Fill(eEcalHF);
   meEHFHdLay_->Fill(eHcalHF);
 
-  LogDebug("HcalHitValid") << "HcalHitValidation::analyzeLayer: eHO " << eHO
-      << "  eHBHE = " << eHBHE  << " elongHF = "
-      << elongHF << " eshortHF = " << eshortHF
-      << "  eEcalHF = " << eEcalHF << "  eHcalHF = "
-      << eHcalHF;
+  LogDebug("HcalHitValid") << "HcalHitValidation::analyzeLayer: eHO " << eHO << "  eHBHE = " << eHBHE
+                           << " elongHF = " << elongHF << " eshortHF = " << eshortHF << "  eEcalHF = " << eEcalHF
+                           << "  eHcalHF = " << eHcalHF;
 }
 
-void HcalHitValidation::analyzeNxN (edm::Handle<PHcalValidInfoNxN>& infoNxN) {
-
+void HcalHitValidation::analyzeNxN(edm::Handle<PHcalValidInfoNxN> &infoNxN) {
   // NxN quantities
   double ecalNxNr = infoNxN->ecalnxnr();
   double hcalNxNr = infoNxN->hcalnxnr();
-  double   hoNxNr = infoNxN->honxnr();
+  double hoNxNr = infoNxN->honxnr();
   double etotNxNr = infoNxN->etotnxnr();
-  
-  double ecalNxN  = infoNxN->ecalnxn();
-  double hcalNxN  = infoNxN->hcalnxn();
-  double   hoNxN  = infoNxN->honxn();
-  double etotNxN  = infoNxN->etotnxn();
+
+  double ecalNxN = infoNxN->ecalnxn();
+  double hcalNxN = infoNxN->hcalnxn();
+  double hoNxN = infoNxN->honxn();
+  double etotNxN = infoNxN->etotnxn();
 
   meEcalRNxN_->Fill(ecalNxNr);
   meHcalRNxN_->Fill(hcalNxNr);
   meHoRNxN_->Fill(hoNxNr);
   meEtotRNxN_->Fill(etotNxNr);
-   
+
   meEcalNxN_->Fill(ecalNxN);
   meHcalNxN_->Fill(hcalNxN);
   meHoNxN_->Fill(hoNxN);
   meEtotNxN_->Fill(etotNxN);
-   
-  int                    nIxI = infoNxN->nnxn();
-  std::vector<float>    idIxI = infoNxN->idnxn();
-  std::vector<float>     eIxI = infoNxN->enxn();
-  std::vector<float>     tIxI = infoNxN->tnxn();
- 
-  for (int j = 0; j < nIxI ; j++) // NB !!! j < nIxI
+
+  int nIxI = infoNxN->nnxn();
+  std::vector<float> idIxI = infoNxN->idnxn();
+  std::vector<float> eIxI = infoNxN->enxn();
+  std::vector<float> tIxI = infoNxN->tnxn();
+
+  for (int j = 0; j < nIxI; j++)  // NB !!! j < nIxI
   {
     meEiNxN_->Fill(eIxI[j]);
     meTiNxN_->Fill(tIxI[j]);
-    meTrNxN_->Fill(idIxI[j],eIxI[j]);  // transverse profile
+    meTrNxN_->Fill(idIxI[j], eIxI[j]);  // transverse profile
   }
 
-  LogDebug("HcalHitValid") << "HcalHitValidation::analyzeNxN: " << nIxI
-      << " hits in NxN analysis; Total Energy " << etotNxN
-      << "/" << etotNxNr;
+  LogDebug("HcalHitValid") << "HcalHitValidation::analyzeNxN: " << nIxI << " hits in NxN analysis; Total Energy "
+                           << etotNxN << "/" << etotNxNr;
 }
 
-void HcalHitValidation::analyzeJets (edm::Handle<PHcalValidInfoJets>& infoJets) {
-
+void HcalHitValidation::analyzeJets(edm::Handle<PHcalValidInfoJets> &infoJets) {
   // -- Leading Jet
-  int nJetHits =  infoJets->njethit();
+  int nJetHits = infoJets->njethit();
 
   std::vector<float> rJetHits = infoJets->jethitr();
   std::vector<float> tJetHits = infoJets->jethitt();
@@ -470,16 +447,15 @@ void HcalHitValidation::analyzeJets (edm::Handle<PHcalValidInfoJets>& infoJets)
 
   double ecalJet = infoJets->ecaljet();
   double hcalJet = infoJets->hcaljet();
-  double   hoJet = infoJets->hojet();
+  double hoJet = infoJets->hojet();
   double etotJet = infoJets->etotjet();
 
   double detaJet = infoJets->detajet();
   double dphiJet = infoJets->dphijet();
-  double   drJet = infoJets->drjet();
-  double  dijetM = infoJets->dijetm();
+  double drJet = infoJets->drjet();
+  double dijetM = infoJets->dijetm();
 
-  for (int j = 0; j < nJetHits; j++)
-  {
+  for (int j = 0; j < nJetHits; j++) {
     meRJet_->Fill(rJetHits[j]);
     meTJet_->Fill(tJetHits[j]);
     meEJet_->Fill(eJetHits[j]);
@@ -489,30 +465,30 @@ void HcalHitValidation::analyzeJets (edm::Handle<PHcalValidInfoJets>& infoJets)
   meHcalJet_->Fill(hcalJet);
   meHoJet_->Fill(hoJet);
   meEtotJet_->Fill(etotJet);
-  meEcHcJet_->Fill(ecalJet,hcalJet);
+  meEcHcJet_->Fill(ecalJet, hcalJet);
 
   meDetaJet_->Fill(detaJet);
   meDphiJet_->Fill(dphiJet);
   meDrJet_->Fill(drJet);
   meMassJet_->Fill(dijetM);
 
-  // All Jets 
-  int                nJets  = infoJets->njet();
-  std::vector<float> jetE   = infoJets->jete();
+  // All Jets
+  int nJets = infoJets->njet();
+  std::vector<float> jetE = infoJets->jete();
   std::vector<float> jetEta = infoJets->jeteta();
   std::vector<float> jetPhi = infoJets->jetphi();
-  
+
   for (int j = 0; j < nJets; j++) {
     meEneJet_->Fill(jetE[j]);
     meEtaJet_->Fill(jetEta[j]);
     mePhiJet_->Fill(jetPhi[j]);
   }
-  LogDebug("HcalHitValid") << "HcalHitValidation::analyzeJets: " << nJets
-      << " jets with "  << nJetHits << " hits in the "
-      << "leading jet\n" << "   d(Eta) = " << detaJet
-      << "  d(Phi) = " << dphiJet << "  d(R) = " << drJet
-      << "  diJet Mass = " << dijetM;
+  LogDebug("HcalHitValid") << "HcalHitValidation::analyzeJets: " << nJets << " jets with " << nJetHits
+                           << " hits in the "
+                           << "leading jet\n"
+                           << "   d(Eta) = " << detaJet << "  d(Phi) = " << dphiJet << "  d(R) = " << drJet
+                           << "  diJet Mass = " << dijetM;
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(HcalHitValidation);
diff --git a/Validation/HcalHits/test/HcalHitValidation.h b/Validation/HcalHits/test/HcalHitValidation.h
index 30e2ef7b06472..e8614a4bb8e0d 100644
--- a/Validation/HcalHits/test/HcalHitValidation.h
+++ b/Validation/HcalHits/test/HcalHitValidation.h
@@ -3,13 +3,13 @@
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
@@ -20,39 +20,35 @@
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 #include "SimDataFormats/ValidationFormats/interface/PValidationFormats.h"
 
-#include <iostream>
 #include <fstream>
-#include <vector>
+#include <iostream>
 #include <map>
 #include <string>
+#include <vector>
 
-class HcalHitValidation: public DQMEDAnalyzer {
+class HcalHitValidation : public DQMEDAnalyzer {
 public:
-
-  HcalHitValidation(const edm::ParameterSet& ps);
+  HcalHitValidation(const edm::ParameterSet &ps);
   ~HcalHitValidation();
 
 protected:
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
-  void analyze  (const edm::Event& e, const edm::EventSetup& c) override;
-  void bookHistograms(DQMStore::IBooker &,
-    edm::Run const &, edm::EventSetup const &) override;
-
-  void analyzeHits  (std::vector<PCaloHit> &);
-  void analyzeLayer (edm::Handle<PHcalValidInfoLayer> &);
-  void analyzeNxN   (edm::Handle<PHcalValidInfoNxN> &);
-  void analyzeJets  (edm::Handle<PHcalValidInfoJets> &);
+  void analyzeHits(std::vector<PCaloHit> &);
+  void analyzeLayer(edm::Handle<PHcalValidInfoLayer> &);
+  void analyzeNxN(edm::Handle<PHcalValidInfoNxN> &);
+  void analyzeJets(edm::Handle<PHcalValidInfoJets> &);
 
 private:
-
-  std::string    g4Label, hcalHits, layerInfo, nxNInfo, jetsInfo;
+  std::string g4Label, hcalHits, layerInfo, nxNInfo, jetsInfo;
   edm::EDGetTokenT<edm::PCaloHitContainer> tok_hh_;
   edm::EDGetTokenT<PHcalValidInfoLayer> tok_iL_;
   edm::EDGetTokenT<PHcalValidInfoNxN> tok_iN_;
   edm::EDGetTokenT<PHcalValidInfoJets> tok_iJ_;
-  std::string    outFile_;
-  bool           verbose_, scheme_;
-  bool           checkHit_, checkLay_, checkNxN_, checkJet_;
+  std::string outFile_;
+  bool verbose_, scheme_;
+  bool checkHit_, checkLay_, checkNxN_, checkJet_;
 
   MonitorElement *meAllNHit_, *meBadDetHit_, *meBadSubHit_, *meBadIdHit_;
   MonitorElement *meHBNHit_, *meHENHit_, *meHONHit_, *meHFNHit_;
@@ -63,21 +59,21 @@ class HcalHitValidation: public DQMEDAnalyzer {
   MonitorElement *meHBPhiHit_, *meHEPhiHit_, *meHOPhiHit_, *meHFPhiHit_;
   MonitorElement *meHBEneHit_, *meHEEneHit_, *meHOEneHit_, *meHFEneHit_;
   MonitorElement *meHBTimHit_, *meHETimHit_, *meHOTimHit_, *meHFTimHit_;
-  MonitorElement *mePMTHit_,   *mePMTDepHit_,*mePMTEtaHit_,*mePMTPhiHit_;
-  MonitorElement *mePMTEn1Hit_,*mePMTEn2Hit_,*mePMTTimHit_;
+  MonitorElement *mePMTHit_, *mePMTDepHit_, *mePMTEtaHit_, *mePMTPhiHit_;
+  MonitorElement *mePMTEn1Hit_, *mePMTEn2Hit_, *mePMTTimHit_;
 
-  static const int nLayersMAX=20, nDepthsMAX=5;
+  static const int nLayersMAX = 20, nDepthsMAX = 5;
   MonitorElement *meLayerLay_, *meEtaHLay_, *mePhiHLay_, *meEneHLay_;
-  MonitorElement *meDepHlay_,  *meTimHLay_, *meTimWLay_;
-  MonitorElement *meEtaPhi_,   *meHitELay_, *meHitHLay_, *meHitTLay_;
-  MonitorElement *meEneLLay_,  *meEneLay_[nLayersMAX], *meLngLay_;
-  MonitorElement *meEneDLay_,  *meDepLay_[nDepthsMAX], *meEtotLay_;
-  MonitorElement *meEHOLay_,   *meEHBHELay_, *meEFibLLay_, *meEFibSLay_;
+  MonitorElement *meDepHlay_, *meTimHLay_, *meTimWLay_;
+  MonitorElement *meEtaPhi_, *meHitELay_, *meHitHLay_, *meHitTLay_;
+  MonitorElement *meEneLLay_, *meEneLay_[nLayersMAX], *meLngLay_;
+  MonitorElement *meEneDLay_, *meDepLay_[nDepthsMAX], *meEtotLay_;
+  MonitorElement *meEHOLay_, *meEHBHELay_, *meEFibLLay_, *meEFibSLay_;
   MonitorElement *meEHFEmLay_, *meEHFHdLay_;
 
   MonitorElement *meEcalRNxN_, *meHcalRNxN_, *meHoRNxN_, *meEtotRNxN_;
-  MonitorElement *meEcalNxN_,  *meHcalNxN_,  *meHoNxN_,  *meEtotNxN_;
-  MonitorElement *meEiNxN_,    *meTiNxN_,    *meTrNxN_;
+  MonitorElement *meEcalNxN_, *meHcalNxN_, *meHoNxN_, *meEtotNxN_;
+  MonitorElement *meEiNxN_, *meTiNxN_, *meTrNxN_;
 
   MonitorElement *meRJet_, *meTJet_, *meEJet_;
   MonitorElement *meEcalJet_, *meHcalJet_, *meHoJet_, *meEtotJet_, *meEcHcJet_;
diff --git a/Validation/HcalRecHits/interface/HcalRecHitsClient.h b/Validation/HcalRecHits/interface/HcalRecHitsClient.h
index 6b8e25d139fd4..15e5c2560c846 100644
--- a/Validation/HcalRecHits/interface/HcalRecHitsClient.h
+++ b/Validation/HcalRecHits/interface/HcalRecHitsClient.h
@@ -3,37 +3,36 @@
 
 // -*- C++ -*-
 //
-// 
+//
 /*
- Description: This is a RecHits client meant to plot rechits quantities 
+ Description: This is a RecHits client meant to plot rechits quantities
 */
 
 //
-// Originally create by: Hongxuan Liu 
+// Originally create by: Hongxuan Liu
 //                        May 2010
 //
 
-#include <memory>
-#include <unistd.h>
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
+#include <memory>
+#include <unistd.h>
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <vector>
 
 class MonitorElement;
 
 class HcalRecHitsClient : public DQMEDHarvester {
- 
- private:
+private:
   std::string outputFile_;
 
   edm::ParameterSet conf_;
@@ -45,14 +44,13 @@ class HcalRecHitsClient : public DQMEDHarvester {
   std::string dirNameJet_;
   std::string dirNameMET_;
 
- public:
-  explicit HcalRecHitsClient(const edm::ParameterSet& );
+public:
+  explicit HcalRecHitsClient(const edm::ParameterSet &);
   ~HcalRecHitsClient() override;
 
   void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
-  
-  int HcalRecHitsEndjob(const std::vector<MonitorElement*> &hcalMEs);
 
+  int HcalRecHitsEndjob(const std::vector<MonitorElement *> &hcalMEs);
 };
- 
+
 #endif
diff --git a/Validation/HcalRecHits/interface/HcalRecHitsValidation.h b/Validation/HcalRecHits/interface/HcalRecHitsValidation.h
index b6c17618b6333..0b2d2696c877f 100644
--- a/Validation/HcalRecHits/interface/HcalRecHitsValidation.h
+++ b/Validation/HcalRecHits/interface/HcalRecHitsValidation.h
@@ -1,49 +1,49 @@
 #ifndef HcalRecHitsValidation_H
 #define HcalRecHitsValidation_H
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DataFormats/HcalRecHit/interface/HcalRecHitCollections.h"
 #include "DataFormats/HcalRecHit/interface/HcalSourcePositionData.h"
 
+#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 #include <DataFormats/EcalDetId/interface/EBDetId.h>
 #include <DataFormats/EcalDetId/interface/EEDetId.h>
-#include "DataFormats/EcalRecHit/interface/EcalRecHitCollections.h"
 
-#include "DataFormats/HcalDetId/interface/HcalElectronicsId.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
+#include "DataFormats/HcalDetId/interface/HcalElectronicsId.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
+#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
-#include "Geometry/CaloGeometry/interface/CaloCellGeometry.h"
 
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 
-#include <vector>
-#include <utility>
-#include <ostream>
-#include <string>
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include <algorithm>
 #include <cmath>
-#include "DQMServices/Core/interface/MonitorElement.h"
+#include <ostream>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "DataFormats/DetId/interface/DetId.h"
 // channel status
-#include "CondFormats/EcalObjects/interface/EcalChannelStatus.h"
 #include "CondFormats/DataRecord/interface/EcalChannelStatusRcd.h"
+#include "CondFormats/EcalObjects/interface/EcalChannelStatus.h"
 
-#include "CondFormats/HcalObjects/interface/HcalChannelQuality.h"
 #include "CondFormats/DataRecord/interface/HcalChannelQualityRcd.h"
+#include "CondFormats/HcalObjects/interface/HcalChannelQuality.h"
 
 // severity level assignment for HCAL
 #include "RecoLocalCalo/HcalRecAlgos/interface/HcalSeverityLevelComputer.h"
@@ -52,21 +52,19 @@
 // severity level assignment for ECAL
 #include "RecoLocalCalo/EcalRecAlgos/interface/EcalSeverityLevelAlgo.h"
 
-
 class HcalRecHitsValidation : public DQMEDAnalyzer {
- public:
-  HcalRecHitsValidation(edm::ParameterSet const& conf);
+public:
+  HcalRecHitsValidation(edm::ParameterSet const &conf);
   ~HcalRecHitsValidation() override;
-  void analyze(edm::Event const& ev, edm::EventSetup const& c) override;
+  void analyze(edm::Event const &ev, edm::EventSetup const &c) override;
 
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
- private:
-  
-  virtual void fillRecHitsTmp(int subdet_, edm::Event const& ev);
+private:
+  virtual void fillRecHitsTmp(int subdet_, edm::Event const &ev);
   double dR(double eta1, double phi1, double eta2, double phi2);
   double phi12(double phi1, double en1, double phi2, double en2);
-  double dPhiWsign(double phi1,double phi2);  
+  double dPhiWsign(double phi1, double phi2);
 
   std::string topFolderName_;
 
@@ -77,7 +75,7 @@ class HcalRecHitsValidation : public DQMEDAnalyzer {
   std::string mc_;
   bool testNumber_;
 
-  //RecHit Collection input tags
+  // RecHit Collection input tags
   edm::EDGetTokenT<edm::HepMCProduct> tok_evt_;
   edm::EDGetTokenT<EBRecHitCollection> tok_EB_;
   edm::EDGetTokenT<EERecHitCollection> tok_EE_;
@@ -93,81 +91,78 @@ class HcalRecHitsValidation : public DQMEDAnalyzer {
   int iz;
   int imc;
 
-  // In ALL other cases : 2D ieta-iphi maps 
+  // In ALL other cases : 2D ieta-iphi maps
   // without and with cuts (a la "Scheme B") on energy
   // - only in the cone around particle for single-part samples (mc = "yes")
   // - for all calls in milti-particle samples (mc = "no")
 
-  MonitorElement* meEnConeEtaProfile;
-  MonitorElement* meEnConeEtaProfile_E;
-  MonitorElement* meEnConeEtaProfile_EH;
+  MonitorElement *meEnConeEtaProfile;
+  MonitorElement *meEnConeEtaProfile_E;
+  MonitorElement *meEnConeEtaProfile_EH;
 
   // energy of rechits
-  MonitorElement* meRecHitsEnergyHB;
-  MonitorElement* meRecHitsEnergyHE;
-  MonitorElement* meRecHitsEnergyHO;
-  MonitorElement* meRecHitsEnergyHF;
-
-  MonitorElement* meTEprofileHB_Low;
-  MonitorElement* meTEprofileHB;
-  MonitorElement* meTEprofileHB_High;
+  MonitorElement *meRecHitsEnergyHB;
+  MonitorElement *meRecHitsEnergyHE;
+  MonitorElement *meRecHitsEnergyHO;
+  MonitorElement *meRecHitsEnergyHF;
 
-  MonitorElement* meTEprofileHE_Low;
-  MonitorElement* meTEprofileHE;
+  MonitorElement *meTEprofileHB_Low;
+  MonitorElement *meTEprofileHB;
+  MonitorElement *meTEprofileHB_High;
 
-  MonitorElement* meTEprofileHO;
-  MonitorElement* meTEprofileHO_High;
+  MonitorElement *meTEprofileHE_Low;
+  MonitorElement *meTEprofileHE;
 
-  MonitorElement* meTEprofileHF_Low;
-  MonitorElement* meTEprofileHF;
+  MonitorElement *meTEprofileHO;
+  MonitorElement *meTEprofileHO_High;
 
+  MonitorElement *meTEprofileHF_Low;
+  MonitorElement *meTEprofileHF;
 
   // Histo (2D plot) for sum of RecHits vs SimHits (hcal only)
-  MonitorElement* meRecHitSimHitHB;
-  MonitorElement* meRecHitSimHitHE;
-  MonitorElement* meRecHitSimHitHO;
-  MonitorElement* meRecHitSimHitHF;
-  MonitorElement* meRecHitSimHitHFL;
-  MonitorElement* meRecHitSimHitHFS;
+  MonitorElement *meRecHitSimHitHB;
+  MonitorElement *meRecHitSimHitHE;
+  MonitorElement *meRecHitSimHitHO;
+  MonitorElement *meRecHitSimHitHF;
+  MonitorElement *meRecHitSimHitHFL;
+  MonitorElement *meRecHitSimHitHFS;
   // profile histo (2D plot) for sum of RecHits vs SimHits (hcal only)
-  MonitorElement* meRecHitSimHitProfileHB;
-  MonitorElement* meRecHitSimHitProfileHE;
-  MonitorElement* meRecHitSimHitProfileHO;
-  MonitorElement* meRecHitSimHitProfileHF;
-  MonitorElement* meRecHitSimHitProfileHFL;
-  MonitorElement* meRecHitSimHitProfileHFS;
+  MonitorElement *meRecHitSimHitProfileHB;
+  MonitorElement *meRecHitSimHitProfileHE;
+  MonitorElement *meRecHitSimHitProfileHO;
+  MonitorElement *meRecHitSimHitProfileHF;
+  MonitorElement *meRecHitSimHitProfileHFL;
+  MonitorElement *meRecHitSimHitProfileHFS;
 
   // 2D plot of sum of RecHits in HCAL as function of ECAL's one
-  MonitorElement* meEnergyHcalVsEcalHB;
-  MonitorElement* meEnergyHcalVsEcalHE;
-  
-  // Chi2 
-  MonitorElement* meRecHitsM2Chi2HB;  
-  MonitorElement* meRecHitsM2Chi2HE;
-
-  MonitorElement* meLog10Chi2profileHB;
-  MonitorElement* meLog10Chi2profileHE;
-
-  edm::ESHandle<CaloGeometry> geometry ;
-
-
- // Filling vectors with essential RecHits data
-  std::vector<int>      csub;
-  std::vector<int>      cieta;
-  std::vector<int>      ciphi;
-  std::vector<int>      cdepth;
-  std::vector<double>   cen;
-  std::vector<double>   ceta;
-  std::vector<double>   cphi;
-  std::vector<double>   ctime;
-  std::vector<double>   cz;
+  MonitorElement *meEnergyHcalVsEcalHB;
+  MonitorElement *meEnergyHcalVsEcalHE;
+
+  // Chi2
+  MonitorElement *meRecHitsM2Chi2HB;
+  MonitorElement *meRecHitsM2Chi2HE;
+
+  MonitorElement *meLog10Chi2profileHB;
+  MonitorElement *meLog10Chi2profileHE;
+
+  edm::ESHandle<CaloGeometry> geometry;
+
+  // Filling vectors with essential RecHits data
+  std::vector<int> csub;
+  std::vector<int> cieta;
+  std::vector<int> ciphi;
+  std::vector<int> cdepth;
+  std::vector<double> cen;
+  std::vector<double> ceta;
+  std::vector<double> cphi;
+  std::vector<double> ctime;
+  std::vector<double> cz;
   std::vector<uint32_t> cstwd;
   std::vector<uint32_t> cauxstwd;
-  std::vector<double>   cchi2;
+  std::vector<double> cchi2;
 
   // counter
   int nevtot;
-
 };
 
 #endif
diff --git a/Validation/HcalRecHits/interface/NoiseRates.h b/Validation/HcalRecHits/interface/NoiseRates.h
index 1cc36259434fa..b31221aae412b 100644
--- a/Validation/HcalRecHits/interface/NoiseRates.h
+++ b/Validation/HcalRecHits/interface/NoiseRates.h
@@ -1,7 +1,6 @@
 #ifndef _ANOMALOUSNOISE_ANALYZERS_NOISERATES_H_
 #define _ANOMALOUSNOISE_ANALYZERS_NOISERATES_H_
 
-
 //
 // NoiseRates.h
 //
@@ -17,9 +16,9 @@
 #include <vector>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -33,7 +32,7 @@
 
 #include "DataFormats/METReco/interface/HcalNoiseRBX.h"
 
-//Hcal Hoise Summary
+// Hcal Hoise Summary
 #include "DataFormats/METReco/interface/HcalNoiseSummary.h"
 
 //
@@ -41,58 +40,55 @@
 //
 
 class NoiseRates : public DQMEDAnalyzer {
- public:
-  explicit NoiseRates(const edm::ParameterSet&);
+public:
+  explicit NoiseRates(const edm::ParameterSet &);
   ~NoiseRates() override;
- 
-  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override; 
-  
- private:
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+
+private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
   std::string outputFile_;
 
   // parameters
-  edm::InputTag rbxCollName_;          // label for the rbx collection
+  edm::InputTag rbxCollName_;  // label for the rbx collection
   edm::EDGetTokenT<reco::HcalNoiseRBXCollection> tok_rbx_;
-  double minRBXEnergy_;                // RBX energy threshold
-  double minHitEnergy_;                // RecHit energy threshold
+  double minRBXEnergy_;  // RBX energy threshold
+  double minHitEnergy_;  // RecHit energy threshold
 
-  bool   useAllHistos_;
+  bool useAllHistos_;
 
-  //Hcal Noise Summary Parameters
+  // Hcal Noise Summary Parameters
   edm::EDGetTokenT<HcalNoiseSummary> noisetoken_;
 
-  MonitorElement* hLumiBlockCount_;
-  MonitorElement* hRBXEnergy_;
-  MonitorElement* hRBXEnergyType1_;
-  MonitorElement* hRBXEnergyType2_;
-  MonitorElement* hRBXEnergyType3_;
-  MonitorElement* hRBXNHits_;
+  MonitorElement *hLumiBlockCount_;
+  MonitorElement *hRBXEnergy_;
+  MonitorElement *hRBXEnergyType1_;
+  MonitorElement *hRBXEnergyType2_;
+  MonitorElement *hRBXEnergyType3_;
+  MonitorElement *hRBXNHits_;
 
-  //Hcal Noise Summary Plots
+  // Hcal Noise Summary Plots
 
-  MonitorElement* nNNumChannels_;
-  MonitorElement* nNSumE_;
-  MonitorElement* nNSumEt_;
+  MonitorElement *nNNumChannels_;
+  MonitorElement *nNSumE_;
+  MonitorElement *nNSumEt_;
 
-  MonitorElement* sNNumChannels_;
-  MonitorElement* sNSumE_;
-  MonitorElement* sNSumEt_;
+  MonitorElement *sNNumChannels_;
+  MonitorElement *sNSumE_;
+  MonitorElement *sNSumEt_;
 
-  MonitorElement* iNNumChannels_;
-  MonitorElement* iNSumE_;
-  MonitorElement* iNSumEt_;
+  MonitorElement *iNNumChannels_;
+  MonitorElement *iNSumE_;
+  MonitorElement *iNSumEt_;
 
-  MonitorElement* hNoise_maxZeros_;
-  MonitorElement* hNoise_maxHPDHits_;
-  MonitorElement* hNoise_maxHPDNoOtherHits_;
-  
+  MonitorElement *hNoise_maxZeros_;
+  MonitorElement *hNoise_maxHPDHits_;
+  MonitorElement *hNoise_maxHPDNoOtherHits_;
 
   // count lumi segments
   std::map<int, int> lumiCountMap_;
-
 };
 
-
 #endif
diff --git a/Validation/HcalRecHits/interface/NoiseRatesClient.h b/Validation/HcalRecHits/interface/NoiseRatesClient.h
index 50ef640ac38bb..6ab720a68ecab 100644
--- a/Validation/HcalRecHits/interface/NoiseRatesClient.h
+++ b/Validation/HcalRecHits/interface/NoiseRatesClient.h
@@ -3,37 +3,36 @@
 
 // -*- C++ -*-
 //
-// 
+//
 /*
- Description: This is a NoiseRates client meant to plot noiserates quantities 
+ Description: This is a NoiseRates client meant to plot noiserates quantities
 */
 
 //
-// Originally create by: Hongxuan Liu 
+// Originally create by: Hongxuan Liu
 //                        May 2010
 //
 
-#include <memory>
-#include <unistd.h>
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
+#include <memory>
+#include <unistd.h>
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <vector>
 
 class MonitorElement;
 
 class NoiseRatesClient : public DQMEDHarvester {
- 
- private:
+private:
   std::string outputFile_;
 
   edm::ParameterSet conf_;
@@ -45,15 +44,14 @@ class NoiseRatesClient : public DQMEDHarvester {
   std::string dirNameJet_;
   std::string dirNameMET_;
 
- public:
-  explicit NoiseRatesClient(const edm::ParameterSet& );
+public:
+  explicit NoiseRatesClient(const edm::ParameterSet &);
   ~NoiseRatesClient() override;
-  
-  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
-  virtual void runClient_(DQMStore::IBooker &, DQMStore::IGetter &);   
 
-  int NoiseRatesEndjob(const std::vector<MonitorElement*> &hcalMEs);
+  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
+  virtual void runClient_(DQMStore::IBooker &, DQMStore::IGetter &);
 
+  int NoiseRatesEndjob(const std::vector<MonitorElement *> &hcalMEs);
 };
- 
+
 #endif
diff --git a/Validation/HcalRecHits/src/HcalRecHitsClient.cc b/Validation/HcalRecHits/src/HcalRecHitsClient.cc
index d66e0c5738586..22aba1be7c786 100644
--- a/Validation/HcalRecHits/src/HcalRecHitsClient.cc
+++ b/Validation/HcalRecHits/src/HcalRecHitsClient.cc
@@ -1,46 +1,31 @@
-#include "Validation/HcalRecHits/interface/HcalRecHitsClient.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "Validation/HcalRecHits/interface/HcalRecHitsClient.h"
 
-#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-HcalRecHitsClient::HcalRecHitsClient(const edm::ParameterSet& iConfig):conf_(iConfig)
-{
-
+HcalRecHitsClient::HcalRecHitsClient(const edm::ParameterSet &iConfig) : conf_(iConfig) {
   outputFile_ = iConfig.getUntrackedParameter<std::string>("outputFile", "myfile.root");
 
- 
   debug_ = false;
   verbose_ = false;
 
-  dirName_=iConfig.getParameter<std::string>("DQMDirName");
- 
-}
-
-
-HcalRecHitsClient::~HcalRecHitsClient()
-{ 
-  
+  dirName_ = iConfig.getParameter<std::string>("DQMDirName");
 }
 
+HcalRecHitsClient::~HcalRecHitsClient() {}
 
-void HcalRecHitsClient::dqmEndJob(DQMStore::IBooker &ib, DQMStore::IGetter &ig )
-{
-  ig.setCurrentFolder(dirName_);
-
-}
-
+void HcalRecHitsClient::dqmEndJob(DQMStore::IBooker &ib, DQMStore::IGetter &ig) { ig.setCurrentFolder(dirName_); }
 
 // called after entering the HcalRecHitsV/HcalRecHitTask directory
 // hcalMEs are within that directory
-int HcalRecHitsClient::HcalRecHitsEndjob(const std::vector<MonitorElement*> &hcalMEs){
-
-   return 1; // Removed all actions
+int HcalRecHitsClient::HcalRecHitsEndjob(const std::vector<MonitorElement *> &hcalMEs) {
+  return 1;  // Removed all actions
 }
 
 DEFINE_FWK_MODULE(HcalRecHitsClient);
diff --git a/Validation/HcalRecHits/src/HcalRecHitsValidation.cc b/Validation/HcalRecHits/src/HcalRecHitsValidation.cc
index 22c270f64840f..0d155f50f648f 100644
--- a/Validation/HcalRecHits/src/HcalRecHitsValidation.cc
+++ b/Validation/HcalRecHits/src/HcalRecHitsValidation.cc
@@ -1,34 +1,33 @@
-#include "Validation/HcalRecHits/interface/HcalRecHitsValidation.h"
-#include "Geometry/Records/interface/CaloGeometryRecord.h"
-#include "Geometry/HcalCommonData/interface/HcalDDDRecConstants.h"
-#include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h"
 #include "DataFormats/HcalDetId/interface/HcalSubdetector.h"
+#include "Geometry/HcalCommonData/interface/HcalDDDRecConstants.h"
 #include "Geometry/HcalCommonData/interface/HcalHitRelabeller.h"
+#include "Geometry/HcalTowerAlgo/interface/HcalGeometry.h"
+#include "Geometry/Records/interface/CaloGeometryRecord.h"
+#include "Validation/HcalRecHits/interface/HcalRecHitsValidation.h"
 
-HcalRecHitsValidation::HcalRecHitsValidation(edm::ParameterSet const& conf) 
-  : topFolderName_ (conf.getParameter<std::string>("TopFolderName"))
-{
+HcalRecHitsValidation::HcalRecHitsValidation(edm::ParameterSet const &conf)
+    : topFolderName_(conf.getParameter<std::string>("TopFolderName")) {
   // DQM ROOT output
   outputFile_ = conf.getUntrackedParameter<std::string>("outputFile", "myfile.root");
-  
-  if ( !outputFile_.empty() ) {
+
+  if (!outputFile_.empty()) {
     edm::LogInfo("OutputInfo") << " Hcal RecHit Task histograms will be saved to '" << outputFile_.c_str() << "'";
   } else {
     edm::LogInfo("OutputInfo") << " Hcal RecHit Task histograms will NOT be saved";
   }
-  
+
   nevtot = 0;
-  
+
   hcalselector_ = conf.getUntrackedParameter<std::string>("hcalselector", "all");
   ecalselector_ = conf.getUntrackedParameter<std::string>("ecalselector", "yes");
-  sign_         = conf.getUntrackedParameter<std::string>("sign", "*");
-  mc_           = conf.getUntrackedParameter<std::string>("mc", "yes");
-  testNumber_   = conf.getParameter<bool>("TestNumber");
+  sign_ = conf.getUntrackedParameter<std::string>("sign", "*");
+  mc_ = conf.getUntrackedParameter<std::string>("mc", "yes");
+  testNumber_ = conf.getParameter<bool>("TestNumber");
 
-  //Collections
+  // Collections
   tok_hbhe_ = consumes<HBHERecHitCollection>(conf.getUntrackedParameter<edm::InputTag>("HBHERecHitCollectionLabel"));
-  tok_hf_   = consumes<HFRecHitCollection>(conf.getUntrackedParameter<edm::InputTag>("HFRecHitCollectionLabel"));
-  tok_ho_   = consumes<HORecHitCollection>(conf.getUntrackedParameter<edm::InputTag>("HORecHitCollectionLabel"));
+  tok_hf_ = consumes<HFRecHitCollection>(conf.getUntrackedParameter<edm::InputTag>("HFRecHitCollectionLabel"));
+  tok_ho_ = consumes<HORecHitCollection>(conf.getUntrackedParameter<edm::InputTag>("HORecHitCollectionLabel"));
 
   // register for data access
   tok_evt_ = consumes<edm::HepMCProduct>(edm::InputTag("generatorSmeared"));
@@ -40,499 +39,491 @@ HcalRecHitsValidation::HcalRecHitsValidation(edm::ParameterSet const& conf)
   tok_hh_ = consumes<edm::PCaloHitContainer>(conf.getUntrackedParameter<edm::InputTag>("SimHitCollectionLabel"));
 
   subdet_ = 5;
-  if (hcalselector_ == "noise") subdet_ = 0;
-  if (hcalselector_ == "HB"   ) subdet_ = 1;
-  if (hcalselector_ == "HE"   ) subdet_ = 2;
-  if (hcalselector_ == "HO"   ) subdet_ = 3;
-  if (hcalselector_ == "HF"   ) subdet_ = 4;
-  if (hcalselector_ == "all"  ) subdet_ = 5;
-  if (hcalselector_ == "ZS"   ) subdet_ = 6;
+  if (hcalselector_ == "noise")
+    subdet_ = 0;
+  if (hcalselector_ == "HB")
+    subdet_ = 1;
+  if (hcalselector_ == "HE")
+    subdet_ = 2;
+  if (hcalselector_ == "HO")
+    subdet_ = 3;
+  if (hcalselector_ == "HF")
+    subdet_ = 4;
+  if (hcalselector_ == "all")
+    subdet_ = 5;
+  if (hcalselector_ == "ZS")
+    subdet_ = 6;
 
   iz = 1;
-  if(sign_ == "-") iz = -1;
-  if(sign_ == "*") iz = 0;
+  if (sign_ == "-")
+    iz = -1;
+  if (sign_ == "*")
+    iz = 0;
 
   imc = 1;
-  if(mc_ == "no") imc = 0;
-
+  if (mc_ == "no")
+    imc = 0;
 }
 
+HcalRecHitsValidation::~HcalRecHitsValidation() {}
 
-HcalRecHitsValidation::~HcalRecHitsValidation() { }
-
-void HcalRecHitsValidation::bookHistograms(DQMStore::IBooker &ib, edm::Run const &run, edm::EventSetup const &es )
-{
-
+void HcalRecHitsValidation::bookHistograms(DQMStore::IBooker &ib, edm::Run const &run, edm::EventSetup const &es) {
   Char_t histo[200];
 
   ib.setCurrentFolder(topFolderName_);
 
-    //======================= Now various cases one by one ===================
-
-    //Histograms drawn for single pion scan
-    if(subdet_ != 0 && imc != 0) { // just not for noise  
-      sprintf (histo, "HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths");
-      meEnConeEtaProfile = ib.bookProfile(histo, histo, 83, -41.5, 41.5, -100., 2000., " ");  
-      
-      sprintf (histo, "HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths_E");
-      meEnConeEtaProfile_E = ib.bookProfile(histo, histo, 83, -41.5, 41.5, -100., 2000., " ");  
-      
-      sprintf (histo, "HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths_EH");
-      meEnConeEtaProfile_EH = ib.bookProfile(histo, histo, 83, -41.5, 41.5, -100., 2000., " ");  
-    }
+  //======================= Now various cases one by one ===================
 
-    // ************** HB **********************************
-    if (subdet_ == 1 || subdet_ == 5 ){
+  // Histograms drawn for single pion scan
+  if (subdet_ != 0 && imc != 0) {  // just not for noise
+    sprintf(histo, "HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths");
+    meEnConeEtaProfile = ib.bookProfile(histo, histo, 83, -41.5, 41.5, -100., 2000., " ");
 
+    sprintf(histo, "HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths_E");
+    meEnConeEtaProfile_E = ib.bookProfile(histo, histo, 83, -41.5, 41.5, -100., 2000., " ");
 
-      sprintf (histo, "HcalRecHitTask_M2Log10Chi2_of_rechits_HB" ) ;   //   Chi2
-      meRecHitsM2Chi2HB = ib.book1D(histo, histo, 120 , -2. , 10.);       
+    sprintf(histo, "HcalRecHitTask_En_rechits_cone_profile_vs_ieta_all_depths_EH");
+    meEnConeEtaProfile_EH = ib.bookProfile(histo, histo, 83, -41.5, 41.5, -100., 2000., " ");
+  }
 
-      sprintf (histo, "HcalRecHitTask_Log10Chi2_vs_energy_profile_HB" ) ;
-      meLog10Chi2profileHB = ib.bookProfile(histo, histo, 300, -5., 295., -2., 9.9, " ");
+  // ************** HB **********************************
+  if (subdet_ == 1 || subdet_ == 5) {
+    sprintf(histo, "HcalRecHitTask_M2Log10Chi2_of_rechits_HB");  //   Chi2
+    meRecHitsM2Chi2HB = ib.book1D(histo, histo, 120, -2., 10.);
 
+    sprintf(histo, "HcalRecHitTask_Log10Chi2_vs_energy_profile_HB");
+    meLog10Chi2profileHB = ib.bookProfile(histo, histo, 300, -5., 295., -2., 9.9, " ");
 
-      sprintf (histo, "HcalRecHitTask_energy_of_rechits_HB" ) ;
-      meRecHitsEnergyHB = ib.book1D(histo, histo, 2010 , -10. , 2000.); 
-      
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_profile_HB" ) ;
-      meTEprofileHB = ib.bookProfile(histo, histo, 150, -5., 295., -48., 92., " "); 
+    sprintf(histo, "HcalRecHitTask_energy_of_rechits_HB");
+    meRecHitsEnergyHB = ib.book1D(histo, histo, 2010, -10., 2000.);
 
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_profile_Low_HB" ) ;
-      meTEprofileHB_Low = ib.bookProfile(histo, histo, 150, -5., 295., -48., 92., " "); 
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_profile_HB");
+    meTEprofileHB = ib.bookProfile(histo, histo, 150, -5., 295., -48., 92., " ");
 
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_profile_High_HB" ) ;
-      meTEprofileHB_High = ib.bookProfile(histo, histo, 150, -5., 295., 48., 92., " "); 
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_profile_Low_HB");
+    meTEprofileHB_Low = ib.bookProfile(histo, histo, 150, -5., 295., -48., 92., " ");
 
-      if(imc != 0) {
-        sprintf (histo, "HcalRecHitTask_energy_rechits_vs_simhits_HB");
-        meRecHitSimHitHB = ib.book2D(histo, histo, 120, 0., 1.2,  300, 0., 150.);
-        sprintf (histo, "HcalRecHitTask_energy_rechits_vs_simhits_profile_HB");
-        meRecHitSimHitProfileHB = ib.bookProfile(histo, histo, 120, 0., 1.2, 0., 500., " ");  
-      } 
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_profile_High_HB");
+    meTEprofileHB_High = ib.bookProfile(histo, histo, 150, -5., 295., 48., 92., " ");
 
+    if (imc != 0) {
+      sprintf(histo, "HcalRecHitTask_energy_rechits_vs_simhits_HB");
+      meRecHitSimHitHB = ib.book2D(histo, histo, 120, 0., 1.2, 300, 0., 150.);
+      sprintf(histo, "HcalRecHitTask_energy_rechits_vs_simhits_profile_HB");
+      meRecHitSimHitProfileHB = ib.bookProfile(histo, histo, 120, 0., 1.2, 0., 500., " ");
     }
-    
-    // ********************** HE ************************************
-    if ( subdet_ == 2 || subdet_ == 5 ){
-
+  }
 
-      sprintf (histo, "HcalRecHitTask_M2Log10Chi2_of_rechits_HE" ) ;   //   Chi2
-      meRecHitsM2Chi2HE = ib.book1D(histo, histo, 120 , -2. , 10.);       
+  // ********************** HE ************************************
+  if (subdet_ == 2 || subdet_ == 5) {
+    sprintf(histo, "HcalRecHitTask_M2Log10Chi2_of_rechits_HE");  //   Chi2
+    meRecHitsM2Chi2HE = ib.book1D(histo, histo, 120, -2., 10.);
 
-      sprintf (histo, "HcalRecHitTask_Log10Chi2_vs_energy_profile_HE" ) ;
-      meLog10Chi2profileHE = ib.bookProfile(histo, histo, 1000, -5., 995., -2., 9.9, " ");
+    sprintf(histo, "HcalRecHitTask_Log10Chi2_vs_energy_profile_HE");
+    meLog10Chi2profileHE = ib.bookProfile(histo, histo, 1000, -5., 995., -2., 9.9, " ");
 
+    sprintf(histo, "HcalRecHitTask_energy_of_rechits_HE");
+    meRecHitsEnergyHE = ib.book1D(histo, histo, 2010, -10., 2000.);
 
-      sprintf (histo, "HcalRecHitTask_energy_of_rechits_HE" ) ;
-      meRecHitsEnergyHE = ib.book1D(histo, histo, 2010, -10., 2000.);
-      
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_profile_Low_HE" ) ;
-      meTEprofileHE_Low = ib.bookProfile(histo, histo, 80, -5., 75., -48., 92., " "); 
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_profile_Low_HE");
+    meTEprofileHE_Low = ib.bookProfile(histo, histo, 80, -5., 75., -48., 92., " ");
 
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_profile_HE" ) ;
-      meTEprofileHE = ib.bookProfile(histo, histo, 200, -5., 2995., -48., 92., " "); 
-      
-      if(imc != 0) {
-        sprintf (histo, "HcalRecHitTask_energy_rechits_vs_simhits_HE");
-        meRecHitSimHitHE = ib.book2D(histo, histo, 120, 0., 0.6,  300, 0., 150.);
-        sprintf (histo, "HcalRecHitTask_energy_rechits_vs_simhits_profile_HE");
-        meRecHitSimHitProfileHE = ib.bookProfile(histo, histo, 120, 0., 0.6, 0., 500., " ");  
-      }
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_profile_HE");
+    meTEprofileHE = ib.bookProfile(histo, histo, 200, -5., 2995., -48., 92., " ");
 
+    if (imc != 0) {
+      sprintf(histo, "HcalRecHitTask_energy_rechits_vs_simhits_HE");
+      meRecHitSimHitHE = ib.book2D(histo, histo, 120, 0., 0.6, 300, 0., 150.);
+      sprintf(histo, "HcalRecHitTask_energy_rechits_vs_simhits_profile_HE");
+      meRecHitSimHitProfileHE = ib.bookProfile(histo, histo, 120, 0., 0.6, 0., 500., " ");
     }
+  }
 
-    // ************** HO ****************************************
-    if ( subdet_ == 3 || subdet_ == 5  ){
-
-      sprintf (histo, "HcalRecHitTask_energy_of_rechits_HO" ) ;
-      meRecHitsEnergyHO = ib.book1D(histo, histo, 2010 , -10. , 2000.);
-      
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_profile_HO" ) ;
-      meTEprofileHO = ib.bookProfile(histo, histo, 60, -5., 55., -48., 92., " "); 
-
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_profile_High_HO" ) ;
-      meTEprofileHO_High = ib.bookProfile(histo, histo, 100, -5., 995., -48., 92., " "); 
-      
-      if(imc != 0) {
-        sprintf (histo, "HcalRecHitTask_energy_rechits_vs_simhits_HO");
-        meRecHitSimHitHO = ib.book2D(histo, histo, 150, 0., 1.5,  350, 0., 350.);
-        sprintf (histo, "HcalRecHitTask_energy_rechits_vs_simhits_profile_HO");
-        meRecHitSimHitProfileHO = ib.bookProfile(histo, histo, 150, 0., 1.5, 0., 500., " ");  
-      }
+  // ************** HO ****************************************
+  if (subdet_ == 3 || subdet_ == 5) {
+    sprintf(histo, "HcalRecHitTask_energy_of_rechits_HO");
+    meRecHitsEnergyHO = ib.book1D(histo, histo, 2010, -10., 2000.);
 
-    }   
-  
-    // ********************** HF ************************************
-    if ( subdet_ == 4 || subdet_ == 5 ){
-
-      sprintf (histo, "HcalRecHitTask_energy_of_rechits_HF" ) ;
-      meRecHitsEnergyHF = ib.book1D(histo, histo, 2010 , -10. , 2000.); 
-      
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_profile_Low_HF" ) ;
-      meTEprofileHF_Low = ib.bookProfile(histo, histo, 100, -5., 195., -48., 92., " "); 
-
-      sprintf (histo, "HcalRecHitTask_timing_vs_energy_profile_HF" ) ;
-      meTEprofileHF = ib.bookProfile(histo, histo, 200, -5., 995., -48., 92., " "); 
-
-      if(imc != 0) {
-        sprintf (histo, "HcalRecHitTask_energy_rechits_vs_simhits_HF");
-        meRecHitSimHitHF  = ib.book2D(histo, histo, 50, 0., 50., 150, 0., 150.);      
-        sprintf (histo, "HcalRecHitTask_energy_rechits_vs_simhits_HFL");
-        meRecHitSimHitHFL = ib.book2D(histo, histo, 50, 0., 50., 150, 0., 150.);      
-        sprintf (histo, "HcalRecHitTask_energy_rechits_vs_simhits_HFS");
-        meRecHitSimHitHFS = ib.book2D(histo, histo, 50, 0., 50., 150, 0., 150.);
-        sprintf (histo, "HcalRecHitTask_energy_rechits_vs_simhits_profile_HF");
-        meRecHitSimHitProfileHF  = ib.bookProfile(histo, histo, 50, 0., 50., 0., 500., " ");  
-        sprintf (histo, "HcalRecHitTask_energy_rechits_vs_simhits_profile_HFL");
-        meRecHitSimHitProfileHFL = ib.bookProfile(histo, histo, 50, 0., 50., 0., 500., " ");  
-        sprintf (histo, "HcalRecHitTask_energy_rechits_vs_simhits_profile_HFS");
-        meRecHitSimHitProfileHFS = ib.bookProfile(histo, histo, 50, 0., 50., 0., 500., " ");  
-      }
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_profile_HO");
+    meTEprofileHO = ib.bookProfile(histo, histo, 60, -5., 55., -48., 92., " ");
+
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_profile_High_HO");
+    meTEprofileHO_High = ib.bookProfile(histo, histo, 100, -5., 995., -48., 92., " ");
 
+    if (imc != 0) {
+      sprintf(histo, "HcalRecHitTask_energy_rechits_vs_simhits_HO");
+      meRecHitSimHitHO = ib.book2D(histo, histo, 150, 0., 1.5, 350, 0., 350.);
+      sprintf(histo, "HcalRecHitTask_energy_rechits_vs_simhits_profile_HO");
+      meRecHitSimHitProfileHO = ib.bookProfile(histo, histo, 150, 0., 1.5, 0., 500., " ");
     }
+  }
 
+  // ********************** HF ************************************
+  if (subdet_ == 4 || subdet_ == 5) {
+    sprintf(histo, "HcalRecHitTask_energy_of_rechits_HF");
+    meRecHitsEnergyHF = ib.book1D(histo, histo, 2010, -10., 2000.);
+
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_profile_Low_HF");
+    meTEprofileHF_Low = ib.bookProfile(histo, histo, 100, -5., 195., -48., 92., " ");
+
+    sprintf(histo, "HcalRecHitTask_timing_vs_energy_profile_HF");
+    meTEprofileHF = ib.bookProfile(histo, histo, 200, -5., 995., -48., 92., " ");
+
+    if (imc != 0) {
+      sprintf(histo, "HcalRecHitTask_energy_rechits_vs_simhits_HF");
+      meRecHitSimHitHF = ib.book2D(histo, histo, 50, 0., 50., 150, 0., 150.);
+      sprintf(histo, "HcalRecHitTask_energy_rechits_vs_simhits_HFL");
+      meRecHitSimHitHFL = ib.book2D(histo, histo, 50, 0., 50., 150, 0., 150.);
+      sprintf(histo, "HcalRecHitTask_energy_rechits_vs_simhits_HFS");
+      meRecHitSimHitHFS = ib.book2D(histo, histo, 50, 0., 50., 150, 0., 150.);
+      sprintf(histo, "HcalRecHitTask_energy_rechits_vs_simhits_profile_HF");
+      meRecHitSimHitProfileHF = ib.bookProfile(histo, histo, 50, 0., 50., 0., 500., " ");
+      sprintf(histo, "HcalRecHitTask_energy_rechits_vs_simhits_profile_HFL");
+      meRecHitSimHitProfileHFL = ib.bookProfile(histo, histo, 50, 0., 50., 0., 500., " ");
+      sprintf(histo, "HcalRecHitTask_energy_rechits_vs_simhits_profile_HFS");
+      meRecHitSimHitProfileHFS = ib.bookProfile(histo, histo, 50, 0., 50., 0., 500., " ");
+    }
+  }
 }
 
-void HcalRecHitsValidation::analyze(edm::Event const& ev, edm::EventSetup const& c) {
-
+void HcalRecHitsValidation::analyze(edm::Event const &ev, edm::EventSetup const &c) {
   using namespace edm;
 
   edm::ESHandle<HcalDDDRecConstants> pHRNDC;
-  c.get<HcalRecNumberingRecord>().get( pHRNDC );
-  const HcalDDDRecConstants* hcons = &(*pHRNDC);
+  c.get<HcalRecNumberingRecord>().get(pHRNDC);
+  const HcalDDDRecConstants *hcons = &(*pHRNDC);
 
   // cuts for each subdet_ector mimiking  "Scheme B"
-  //  double cutHB = 0.9, cutHE = 1.4, cutHO = 1.1, cutHFL = 1.2, cutHFS = 1.8; 
+  //  double cutHB = 0.9, cutHE = 1.4, cutHO = 1.1, cutHFL = 1.2, cutHFS = 1.8;
 
   // energy in HCAL
-  double eHcal        = 0.;
-  double eHcalCone    = 0.;  
-  double eHcalConeHB  = 0.;  
-  double eHcalConeHE  = 0.;  
-  double eHcalConeHO  = 0.;  
-  double eHcalConeHF  = 0.;  
-  double eHcalConeHFL = 0.;  
-  double eHcalConeHFS = 0.;  
+  double eHcal = 0.;
+  double eHcalCone = 0.;
+  double eHcalConeHB = 0.;
+  double eHcalConeHE = 0.;
+  double eHcalConeHO = 0.;
+  double eHcalConeHF = 0.;
+  double eHcalConeHFL = 0.;
+  double eHcalConeHFS = 0.;
 
   // Total numbet of RecHits in HCAL, in the cone, above 1 GeV theshold
-  int nrechits       = 0;
-  int nrechitsCone   = 0;
+  int nrechits = 0;
+  int nrechitsCone = 0;
   int nrechitsThresh = 0;
 
   // energy in ECAL
-  double eEcal       = 0.;
-  double eEcalB      = 0.;
-  double eEcalE      = 0.;
-  double eEcalCone   = 0.;
+  double eEcal = 0.;
+  double eEcalB = 0.;
+  double eEcalE = 0.;
+  double eEcalCone = 0.;
   int numrechitsEcal = 0;
 
-  // MC info 
+  // MC info
   double phi_MC = -999999.;  // phi of initial particle from HepMC
   double eta_MC = -999999.;  // eta of initial particle from HepMC
 
   // HCAL energy around MC eta-phi at all depths;
   double partR = 0.3;
 
-  if(imc != 0) { 
-
-     edm::Handle<edm::HepMCProduct> evtMC;
-     ev.getByToken(tok_evt_,evtMC);  // generator in late 310_preX
-     if (!evtMC.isValid()) {
-        edm::LogInfo("HcalRecHitsValidation") << "no HepMCProduct found";    
-     } else {
-        //    std::cout << "*** source HepMCProduct found"<< std::endl;
-     }  
-
-     // MC particle with highest pt is taken as a direction reference  
-     double maxPt = -99999.;
-     int npart    = 0;
-     const HepMC::GenEvent * myGenEvent = evtMC->GetEvent();
-     for ( HepMC::GenEvent::particle_const_iterator p = myGenEvent->particles_begin(); p != myGenEvent->particles_end(); ++p ) {
-       double phip = (*p)->momentum().phi();
-       double etap = (*p)->momentum().eta();
-       //    phi_MC = phip;
-       //    eta_MC = etap;
-       double pt  = (*p)->momentum().perp();
-       if(pt > maxPt) { npart++; maxPt = pt; phi_MC = phip; eta_MC = etap; }
-     }
-     //  std::cout << "*** Max pT = " << maxPt <<  std::endl;  
+  if (imc != 0) {
+    edm::Handle<edm::HepMCProduct> evtMC;
+    ev.getByToken(tok_evt_, evtMC);  // generator in late 310_preX
+    if (!evtMC.isValid()) {
+      edm::LogInfo("HcalRecHitsValidation") << "no HepMCProduct found";
+    } else {
+      //    std::cout << "*** source HepMCProduct found"<< std::endl;
+    }
 
+    // MC particle with highest pt is taken as a direction reference
+    double maxPt = -99999.;
+    int npart = 0;
+    const HepMC::GenEvent *myGenEvent = evtMC->GetEvent();
+    for (HepMC::GenEvent::particle_const_iterator p = myGenEvent->particles_begin(); p != myGenEvent->particles_end();
+         ++p) {
+      double phip = (*p)->momentum().phi();
+      double etap = (*p)->momentum().eta();
+      //    phi_MC = phip;
+      //    eta_MC = etap;
+      double pt = (*p)->momentum().perp();
+      if (pt > maxPt) {
+        npart++;
+        maxPt = pt;
+        phi_MC = phip;
+        eta_MC = etap;
+      }
+    }
+    //  std::cout << "*** Max pT = " << maxPt <<  std::endl;
   }
 
-  //   std::cout << "*** 2" << std::endl; 
+  //   std::cout << "*** 2" << std::endl;
 
-  c.get<CaloGeometryRecord>().get (geometry);
+  c.get<CaloGeometryRecord>().get(geometry);
 
   // Fill working vectors of HCAL RecHits quantities (all of these are drawn)
-  fillRecHitsTmp(subdet_, ev); 
+  fillRecHitsTmp(subdet_, ev);
 
-  //  std::cout << "*** 3" << std::endl; 
+  //  std::cout << "*** 3" << std::endl;
 
   //===========================================================================
-  // IN ALL other CASES : ieta-iphi maps 
+  // IN ALL other CASES : ieta-iphi maps
   //===========================================================================
 
-  // ECAL 
-  if(ecalselector_ == "yes" && (subdet_ == 1 || subdet_ == 2 || subdet_ == 5)) {
+  // ECAL
+  if (ecalselector_ == "yes" && (subdet_ == 1 || subdet_ == 2 || subdet_ == 5)) {
     Handle<EBRecHitCollection> rhitEB;
 
     EcalRecHitCollection::const_iterator RecHit;
     EcalRecHitCollection::const_iterator RecHitEnd;
-    
-
-    if ( ev.getByToken(tok_EB_, rhitEB) ) {
-
-      RecHit = rhitEB.product()->begin();  
-      RecHitEnd = rhitEB.product()->end();  
-    
-      for (; RecHit != RecHitEnd ; ++RecHit) {
-	EBDetId EBid = EBDetId(RecHit->id());
-       
-	auto cellGeometry = geometry->getSubdetectorGeometry(EBid)->getGeometry (EBid) ;
-	double eta = cellGeometry->getPosition ().eta () ;
-	double phi = cellGeometry->getPosition ().phi () ;
-	double en  = RecHit->energy();
-	eEcal  += en;
-	eEcalB += en;
-	
-	double r   = dR(eta_MC, phi_MC, eta, phi);
-	if( r < partR)  {
-	  eEcalCone += en;
-	  numrechitsEcal++; 
-	}
+
+    if (ev.getByToken(tok_EB_, rhitEB)) {
+      RecHit = rhitEB.product()->begin();
+      RecHitEnd = rhitEB.product()->end();
+
+      for (; RecHit != RecHitEnd; ++RecHit) {
+        EBDetId EBid = EBDetId(RecHit->id());
+
+        auto cellGeometry = geometry->getSubdetectorGeometry(EBid)->getGeometry(EBid);
+        double eta = cellGeometry->getPosition().eta();
+        double phi = cellGeometry->getPosition().phi();
+        double en = RecHit->energy();
+        eEcal += en;
+        eEcalB += en;
+
+        double r = dR(eta_MC, phi_MC, eta, phi);
+        if (r < partR) {
+          eEcalCone += en;
+          numrechitsEcal++;
+        }
       }
-      
     }
 
     Handle<EERecHitCollection> rhitEE;
- 
-    if ( ev.getByToken(tok_EE_, rhitEE) ) {
-      
-      RecHit = rhitEE.product()->begin();  
-      RecHitEnd = rhitEE.product()->end();  
-      
-      for (; RecHit != RecHitEnd ; ++RecHit) {
-	EEDetId EEid = EEDetId(RecHit->id());
-	
-	auto cellGeometry = geometry->getSubdetectorGeometry(EEid)->getGeometry (EEid) ;
-	double eta = cellGeometry->getPosition ().eta () ;
-	double phi = cellGeometry->getPosition ().phi () ;	
-	double en   = RecHit->energy();
-	eEcal  += en;
-	eEcalE += en;
-	
-	double r   = dR(eta_MC, phi_MC, eta, phi);
-	if( r < partR)  {
-	  eEcalCone += en;
-	  numrechitsEcal++; 
-	}
+
+    if (ev.getByToken(tok_EE_, rhitEE)) {
+      RecHit = rhitEE.product()->begin();
+      RecHitEnd = rhitEE.product()->end();
+
+      for (; RecHit != RecHitEnd; ++RecHit) {
+        EEDetId EEid = EEDetId(RecHit->id());
+
+        auto cellGeometry = geometry->getSubdetectorGeometry(EEid)->getGeometry(EEid);
+        double eta = cellGeometry->getPosition().eta();
+        double phi = cellGeometry->getPosition().phi();
+        double en = RecHit->energy();
+        eEcal += en;
+        eEcalE += en;
+
+        double r = dR(eta_MC, phi_MC, eta, phi);
+        if (r < partR) {
+          eEcalCone += en;
+          numrechitsEcal++;
+        }
       }
     }
-  }     // end of ECAL selection 
-
-
-  //     std::cout << "*** 4" << std::endl; 
+  }  // end of ECAL selection
 
+  //     std::cout << "*** 4" << std::endl;
 
   //===========================================================================
-  // SUBSYSTEMS,  
+  // SUBSYSTEMS,
   //===========================================================================
-  
-  if ((subdet_ != 6) && (subdet_ != 0)) {
 
-    //       std::cout << "*** 6" << std::endl; 
-    
-    
-    double HcalCone    = 0.;
+  if ((subdet_ != 6) && (subdet_ != 0)) {
+    //       std::cout << "*** 6" << std::endl;
 
-    int ietaMax   =  9999;
-    double etaMax =  9999.;
+    double HcalCone = 0.;
 
+    int ietaMax = 9999;
+    double etaMax = 9999.;
 
     //   CYCLE over cells ====================================================
 
     for (unsigned int i = 0; i < cen.size(); i++) {
-      int sub    = csub[i];
-      int depth  = cdepth[i];
-      double eta = ceta[i]; 
-      double phi = cphi[i]; 
-      double en  = cen[i]; 
-      double t   = ctime[i];
-      int   ieta = cieta[i];
+      int sub = csub[i];
+      int depth = cdepth[i];
+      double eta = ceta[i];
+      double phi = cphi[i];
+      double en = cen[i];
+      double t = ctime[i];
+      int ieta = cieta[i];
       double chi2 = cchi2[i];
 
-      double chi2_log10 = 9.99;                // initial value above histos limits , keep it if chi2 <= 0.
-      if (chi2 > 0.) chi2_log10 = log10(chi2);
+      double chi2_log10 = 9.99;  // initial value above histos limits , keep it if chi2 <= 0.
+      if (chi2 > 0.)
+        chi2_log10 = log10(chi2);
 
-      nrechits++;	    
+      nrechits++;
       eHcal += en;
-      if(en > 1. ) nrechitsThresh++;
-
-      double r    = dR(eta_MC, phi_MC, eta, phi);
-      if( r < partR ){
-        if(sub == 1)   eHcalConeHB += en;
-        if(sub == 2)   eHcalConeHE += en;
-        if(sub == 3)   eHcalConeHO += en;
-        if(sub == 4) {
-	  eHcalConeHF += en;
-	  if (depth == 1) eHcalConeHFL += en;
-	  else            eHcalConeHFS += en;
-	}
-	eHcalCone += en;
-	nrechitsCone++;
+      if (en > 1.)
+        nrechitsThresh++;
+
+      double r = dR(eta_MC, phi_MC, eta, phi);
+      if (r < partR) {
+        if (sub == 1)
+          eHcalConeHB += en;
+        if (sub == 2)
+          eHcalConeHE += en;
+        if (sub == 3)
+          eHcalConeHO += en;
+        if (sub == 4) {
+          eHcalConeHF += en;
+          if (depth == 1)
+            eHcalConeHFL += en;
+          else
+            eHcalConeHFS += en;
+        }
+        eHcalCone += en;
+        nrechitsCone++;
 
         HcalCone += en;
 
         // alternative: ietamax -> closest to MC eta  !!!
-	float eta_diff = fabs(eta_MC - eta);
-	if(eta_diff < etaMax) {
-	  etaMax  = eta_diff; 
-          ietaMax = ieta; 
-	}
+        float eta_diff = fabs(eta_MC - eta);
+        if (eta_diff < etaMax) {
+          etaMax = eta_diff;
+          ietaMax = ieta;
+        }
       }
-      
-      //The energy and overall timing histos are drawn while
-      //the ones split by depth are not
-      if(sub == 1 && (subdet_ == 1 || subdet_ == 5)) {  
 
+      // The energy and overall timing histos are drawn while
+      // the ones split by depth are not
+      if (sub == 1 && (subdet_ == 1 || subdet_ == 5)) {
         meRecHitsM2Chi2HB->Fill(chi2_log10);
-        meLog10Chi2profileHB->Fill(en,chi2_log10);
-
-	meRecHitsEnergyHB->Fill(en);
-	
-	meTEprofileHB_Low->Fill(en, t);
-	meTEprofileHB->Fill(en, t);
-	meTEprofileHB_High->Fill(en, t);
-
-      }     
-      if(sub == 2 && (subdet_ == 2 || subdet_ == 5)) {  
+        meLog10Chi2profileHB->Fill(en, chi2_log10);
 
+        meRecHitsEnergyHB->Fill(en);
 
+        meTEprofileHB_Low->Fill(en, t);
+        meTEprofileHB->Fill(en, t);
+        meTEprofileHB_High->Fill(en, t);
+      }
+      if (sub == 2 && (subdet_ == 2 || subdet_ == 5)) {
         meRecHitsM2Chi2HE->Fill(chi2_log10);
-        meLog10Chi2profileHE->Fill(en,chi2_log10);
-
+        meLog10Chi2profileHE->Fill(en, chi2_log10);
 
-	meRecHitsEnergyHE->Fill(en);
-
-	meTEprofileHE_Low->Fill(en, t);
-	meTEprofileHE->Fill(en, t);
+        meRecHitsEnergyHE->Fill(en);
 
+        meTEprofileHE_Low->Fill(en, t);
+        meTEprofileHE->Fill(en, t);
       }
-      if(sub == 4 && (subdet_ == 4 || subdet_ == 5)) {  
-	meRecHitsEnergyHF->Fill(en);	  
-
-	meTEprofileHF_Low->Fill(en, t);
-	meTEprofileHF->Fill(en, t);
+      if (sub == 4 && (subdet_ == 4 || subdet_ == 5)) {
+        meRecHitsEnergyHF->Fill(en);
 
+        meTEprofileHF_Low->Fill(en, t);
+        meTEprofileHF->Fill(en, t);
       }
-      if(sub == 3 && (subdet_ == 3 || subdet_ == 5)) {  
-	meRecHitsEnergyHO->Fill(en);
+      if (sub == 3 && (subdet_ == 3 || subdet_ == 5)) {
+        meRecHitsEnergyHO->Fill(en);
 
-	meTEprofileHO->Fill(en, t);
-	meTEprofileHO_High->Fill(en, t);
+        meTEprofileHO->Fill(en, t);
+        meTEprofileHO_High->Fill(en, t);
       }
     }
 
-    if(imc != 0) {
-      meEnConeEtaProfile       ->Fill(double(ietaMax),  HcalCone);   // 
-      meEnConeEtaProfile_E     ->Fill(double(ietaMax), eEcalCone);   
-      meEnConeEtaProfile_EH    ->Fill(double(ietaMax),  HcalCone+eEcalCone); 
+    if (imc != 0) {
+      meEnConeEtaProfile->Fill(double(ietaMax), HcalCone);  //
+      meEnConeEtaProfile_E->Fill(double(ietaMax), eEcalCone);
+      meEnConeEtaProfile_EH->Fill(double(ietaMax), HcalCone + eEcalCone);
     }
 
-    //     std::cout << "*** 7" << std::endl; 
-
-    
+    //     std::cout << "*** 7" << std::endl;
   }
 
-  //SimHits vs. RecHits
-  const CaloGeometry* geo = geometry.product();
-  if(subdet_ > 0 && subdet_ < 6 && imc !=0) {  // not noise 
+  // SimHits vs. RecHits
+  const CaloGeometry *geo = geometry.product();
+  if (subdet_ > 0 && subdet_ < 6 && imc != 0) {  // not noise
 
     edm::Handle<PCaloHitContainer> hcalHits;
-    if ( ev.getByToken(tok_hh_,hcalHits) ) {
-      const PCaloHitContainer * SimHitResult = hcalHits.product () ;
-      
-      double enSimHits    = 0.;
-      double enSimHitsHB  = 0.;
-      double enSimHitsHE  = 0.;
-      double enSimHitsHO  = 0.;
-      double enSimHitsHF  = 0.;
+    if (ev.getByToken(tok_hh_, hcalHits)) {
+      const PCaloHitContainer *SimHitResult = hcalHits.product();
+
+      double enSimHits = 0.;
+      double enSimHitsHB = 0.;
+      double enSimHitsHE = 0.;
+      double enSimHitsHO = 0.;
+      double enSimHitsHF = 0.;
       double enSimHitsHFL = 0.;
       double enSimHitsHFS = 0.;
-      // sum of SimHits in the cone 
-      
-      for (std::vector<PCaloHit>::const_iterator SimHits = SimHitResult->begin () ; SimHits != SimHitResult->end(); ++SimHits) {
-	
-	int sub, depth;
-	HcalDetId cell; 
-	
-	if (testNumber_) cell = HcalHitRelabeller::relabel(SimHits->id(),hcons);
-	else cell = HcalDetId(SimHits->id());
-	
-	sub          = cell.subdet();
-	depth        = cell.depth();
-	
-	if(sub != subdet_ && subdet_ != 5) continue; //If we are not looking at all of the subdetectors and the simhit doesn't come from the specific subdetector of interest, then we won't do any thing with it 
-	
-	const HcalGeometry* cellGeometry = 
-	  dynamic_cast<const HcalGeometry*>(geo->getSubdetectorGeometry(DetId::Hcal,cell.subdet()));
-	double etaS = cellGeometry->getPosition(cell).eta () ;
-	double phiS = cellGeometry->getPosition(cell).phi () ;
-	double en   = SimHits->energy();    
-	
-	double r  = dR(eta_MC, phi_MC, etaS, phiS);
-	
-	if ( r < partR ){ // just energy in the small cone
-	  
-	  enSimHits += en;
-	  if(sub == static_cast<int>(HcalBarrel)) enSimHitsHB += en; 
-	  if(sub == static_cast<int>(HcalEndcap)) enSimHitsHE += en; 
-	  if(sub == static_cast<int>(HcalOuter)) enSimHitsHO += en; 
-	  if(sub == static_cast<int>(HcalForward)) {
-	    enSimHitsHF += en;
-	    if(depth == 1) enSimHitsHFL += en;
-	    else           enSimHitsHFS += en;
-	  } 
-	}
+      // sum of SimHits in the cone
+
+      for (std::vector<PCaloHit>::const_iterator SimHits = SimHitResult->begin(); SimHits != SimHitResult->end();
+           ++SimHits) {
+        int sub, depth;
+        HcalDetId cell;
+
+        if (testNumber_)
+          cell = HcalHitRelabeller::relabel(SimHits->id(), hcons);
+        else
+          cell = HcalDetId(SimHits->id());
+
+        sub = cell.subdet();
+        depth = cell.depth();
+
+        if (sub != subdet_ && subdet_ != 5)
+          continue;  // If we are not looking at all of the subdetectors and the
+                     // simhit doesn't come from the specific subdetector of
+                     // interest, then we won't do any thing with it
+
+        const HcalGeometry *cellGeometry =
+            dynamic_cast<const HcalGeometry *>(geo->getSubdetectorGeometry(DetId::Hcal, cell.subdet()));
+        double etaS = cellGeometry->getPosition(cell).eta();
+        double phiS = cellGeometry->getPosition(cell).phi();
+        double en = SimHits->energy();
+
+        double r = dR(eta_MC, phi_MC, etaS, phiS);
+
+        if (r < partR) {  // just energy in the small cone
+
+          enSimHits += en;
+          if (sub == static_cast<int>(HcalBarrel))
+            enSimHitsHB += en;
+          if (sub == static_cast<int>(HcalEndcap))
+            enSimHitsHE += en;
+          if (sub == static_cast<int>(HcalOuter))
+            enSimHitsHO += en;
+          if (sub == static_cast<int>(HcalForward)) {
+            enSimHitsHF += en;
+            if (depth == 1)
+              enSimHitsHFL += en;
+            else
+              enSimHitsHFS += en;
+          }
+        }
       }
-      
+
       // Now some histos with SimHits
-      
-      if(subdet_ == 4 || subdet_ == 5) {
-	meRecHitSimHitHF->Fill( enSimHitsHF, eHcalConeHF );
-	meRecHitSimHitProfileHF->Fill( enSimHitsHF, eHcalConeHF);
-	
-	meRecHitSimHitHFL->Fill( enSimHitsHFL, eHcalConeHFL );
-	meRecHitSimHitProfileHFL->Fill( enSimHitsHFL, eHcalConeHFL);
-	meRecHitSimHitHFS->Fill( enSimHitsHFS, eHcalConeHFS );
-	meRecHitSimHitProfileHFS->Fill( enSimHitsHFS, eHcalConeHFS);       
+
+      if (subdet_ == 4 || subdet_ == 5) {
+        meRecHitSimHitHF->Fill(enSimHitsHF, eHcalConeHF);
+        meRecHitSimHitProfileHF->Fill(enSimHitsHF, eHcalConeHF);
+
+        meRecHitSimHitHFL->Fill(enSimHitsHFL, eHcalConeHFL);
+        meRecHitSimHitProfileHFL->Fill(enSimHitsHFL, eHcalConeHFL);
+        meRecHitSimHitHFS->Fill(enSimHitsHFS, eHcalConeHFS);
+        meRecHitSimHitProfileHFS->Fill(enSimHitsHFS, eHcalConeHFS);
       }
-      if(subdet_ == 1  || subdet_ == 5) { 
-	meRecHitSimHitHB->Fill( enSimHitsHB,eHcalConeHB );
-	meRecHitSimHitProfileHB->Fill( enSimHitsHB,eHcalConeHB);
+      if (subdet_ == 1 || subdet_ == 5) {
+        meRecHitSimHitHB->Fill(enSimHitsHB, eHcalConeHB);
+        meRecHitSimHitProfileHB->Fill(enSimHitsHB, eHcalConeHB);
       }
-      if(subdet_ == 2  || subdet_ == 5) { 
-	meRecHitSimHitHE->Fill( enSimHitsHE,eHcalConeHE );
-	meRecHitSimHitProfileHE->Fill( enSimHitsHE,eHcalConeHE);
+      if (subdet_ == 2 || subdet_ == 5) {
+        meRecHitSimHitHE->Fill(enSimHitsHE, eHcalConeHE);
+        meRecHitSimHitProfileHE->Fill(enSimHitsHE, eHcalConeHE);
       }
-      if(subdet_ == 3  || subdet_ == 5) { 
-	meRecHitSimHitHO->Fill( enSimHitsHO,eHcalConeHO );
-	meRecHitSimHitProfileHO->Fill( enSimHitsHO,eHcalConeHO);
+      if (subdet_ == 3 || subdet_ == 5) {
+        meRecHitSimHitHO->Fill(enSimHitsHO, eHcalConeHO);
+        meRecHitSimHitProfileHO->Fill(enSimHitsHO, eHcalConeHO);
       }
-    
     }
   }
 
   nevtot++;
 }
 
-
 ///////////////////////////////////////////////////////////////////////////////
-void HcalRecHitsValidation::fillRecHitsTmp(int subdet_, edm::Event const& ev){
-
+void HcalRecHitsValidation::fillRecHitsTmp(int subdet_, edm::Event const &ev) {
   using namespace edm;
-  
+
   // initialize data vectors
   csub.clear();
   cen.clear();
@@ -545,165 +536,160 @@ void HcalRecHitsValidation::fillRecHitsTmp(int subdet_, edm::Event const& ev){
   cz.clear();
   cchi2.clear();
 
-  if( subdet_ == 1 || subdet_ == 2  || subdet_ == 5 || subdet_ == 6 || subdet_ == 0) {
-    
-    //HBHE
+  if (subdet_ == 1 || subdet_ == 2 || subdet_ == 5 || subdet_ == 6 || subdet_ == 0) {
+    // HBHE
     edm::Handle<HBHERecHitCollection> hbhecoll;
-    if ( ev.getByToken(tok_hbhe_, hbhecoll) ) {
-      const CaloGeometry* geo = geometry.product();
-      
-      for (HBHERecHitCollection::const_iterator j=hbhecoll->begin(); j != hbhecoll->end(); j++) {
-	
-	HcalDetId cell(j->id());
-	const HcalGeometry* cellGeometry = 
-	  dynamic_cast<const HcalGeometry*>(geo->getSubdetectorGeometry(DetId::Hcal,cell.subdet()));
-	double eta  = cellGeometry->getPosition(cell).eta () ;
-	double phi  = cellGeometry->getPosition(cell).phi () ;
-	double zc   = cellGeometry->getPosition(cell).z ();
-	int sub     = cell.subdet();
-	int depth   = cell.depth();
-	int inteta  = cell.ieta();
-	int intphi  = cell.iphi()-1;
-	double en   = j->energy();
-	double t    = j->time();
+    if (ev.getByToken(tok_hbhe_, hbhecoll)) {
+      const CaloGeometry *geo = geometry.product();
+
+      for (HBHERecHitCollection::const_iterator j = hbhecoll->begin(); j != hbhecoll->end(); j++) {
+        HcalDetId cell(j->id());
+        const HcalGeometry *cellGeometry =
+            dynamic_cast<const HcalGeometry *>(geo->getSubdetectorGeometry(DetId::Hcal, cell.subdet()));
+        double eta = cellGeometry->getPosition(cell).eta();
+        double phi = cellGeometry->getPosition(cell).phi();
+        double zc = cellGeometry->getPosition(cell).z();
+        int sub = cell.subdet();
+        int depth = cell.depth();
+        int inteta = cell.ieta();
+        int intphi = cell.iphi() - 1;
+        double en = j->energy();
+        double t = j->time();
         double chi2 = j->chi2();
-	
-	if((iz > 0 && eta > 0.) || (iz < 0 && eta <0.) || iz == 0) { 
-	  
-	  csub.push_back(sub);
-	  cen.push_back(en);
-	  ceta.push_back(eta);
-	  cphi.push_back(phi);
-	  ctime.push_back(t);
-	  cieta.push_back(inteta);
-	  ciphi.push_back(intphi);
-	  cdepth.push_back(depth);
-	  cz.push_back(zc);
-	  cchi2.push_back(chi2);
-
-	}
+
+        if ((iz > 0 && eta > 0.) || (iz < 0 && eta < 0.) || iz == 0) {
+          csub.push_back(sub);
+          cen.push_back(en);
+          ceta.push_back(eta);
+          cphi.push_back(phi);
+          ctime.push_back(t);
+          cieta.push_back(inteta);
+          ciphi.push_back(intphi);
+          cdepth.push_back(depth);
+          cz.push_back(zc);
+          cchi2.push_back(chi2);
+        }
       }
     }
-    
   }
 
-  if( subdet_ == 4 || subdet_ == 5 || subdet_ == 6 || subdet_ == 0) {
-
-    //HF
+  if (subdet_ == 4 || subdet_ == 5 || subdet_ == 6 || subdet_ == 0) {
+    // HF
     edm::Handle<HFRecHitCollection> hfcoll;
-    if ( ev.getByToken(tok_hf_, hfcoll) ) {
-      
+    if (ev.getByToken(tok_hf_, hfcoll)) {
       for (HFRecHitCollection::const_iterator j = hfcoll->begin(); j != hfcoll->end(); j++) {
-	
-	HcalDetId cell(j->id());
-	auto cellGeometry = geometry->getSubdetectorGeometry(cell)->getGeometry (cell) ;
-	
-	double eta   = cellGeometry->getPosition().eta () ;
-	double phi   = cellGeometry->getPosition().phi () ;
-	double zc     = cellGeometry->getPosition().z ();
-	int sub      = cell.subdet();
-	int depth    = cell.depth();
-	int inteta   = cell.ieta();
-	int intphi   = cell.iphi()-1;
-	double en    = j->energy();
-	double t     = j->time();
-	
-	if((iz > 0 && eta > 0.) || (iz < 0 && eta <0.) || iz == 0) { 
-	  
-	  csub.push_back(sub);
-	  cen.push_back(en);
-	  ceta.push_back(eta);
-	  cphi.push_back(phi);
-	  ctime.push_back(t);
-	  cieta.push_back(inteta);
-	  ciphi.push_back(intphi);
-	  cdepth.push_back(depth);
-	  cz.push_back(zc);
-	  cchi2.push_back(0.);
-	}
+        HcalDetId cell(j->id());
+        auto cellGeometry = geometry->getSubdetectorGeometry(cell)->getGeometry(cell);
+
+        double eta = cellGeometry->getPosition().eta();
+        double phi = cellGeometry->getPosition().phi();
+        double zc = cellGeometry->getPosition().z();
+        int sub = cell.subdet();
+        int depth = cell.depth();
+        int inteta = cell.ieta();
+        int intphi = cell.iphi() - 1;
+        double en = j->energy();
+        double t = j->time();
+
+        if ((iz > 0 && eta > 0.) || (iz < 0 && eta < 0.) || iz == 0) {
+          csub.push_back(sub);
+          cen.push_back(en);
+          ceta.push_back(eta);
+          cphi.push_back(phi);
+          ctime.push_back(t);
+          cieta.push_back(inteta);
+          ciphi.push_back(intphi);
+          cdepth.push_back(depth);
+          cz.push_back(zc);
+          cchi2.push_back(0.);
+        }
       }
     }
   }
 
-  //HO
-  if( subdet_ == 3 || subdet_ == 5 || subdet_ == 6 || subdet_ == 0) {
-  
+  // HO
+  if (subdet_ == 3 || subdet_ == 5 || subdet_ == 6 || subdet_ == 0) {
     edm::Handle<HORecHitCollection> hocoll;
-    if ( ev.getByToken(tok_ho_, hocoll) ) {
-    
+    if (ev.getByToken(tok_ho_, hocoll)) {
       for (HORecHitCollection::const_iterator j = hocoll->begin(); j != hocoll->end(); j++) {
-	
-	HcalDetId cell(j->id());
-	auto cellGeometry = geometry->getSubdetectorGeometry(cell)->getGeometry (cell) ;
-	
-	double eta   = cellGeometry->getPosition().eta () ;
-	double phi   = cellGeometry->getPosition().phi () ;
-	double zc    = cellGeometry->getPosition().z ();
-	int sub      = cell.subdet();
-	int depth    = cell.depth();
-	int inteta   = cell.ieta();
-	int intphi   = cell.iphi()-1;
-	double t     = j->time();
-	double en    = j->energy();
-	
-	if((iz > 0 && eta > 0.) || (iz < 0 && eta <0.) || iz == 0) { 
-	  csub.push_back(sub);
-	  cen.push_back(en);
-	  ceta.push_back(eta);
-	  cphi.push_back(phi);
-	  ctime.push_back(t);
-	  cieta.push_back(inteta);
-	  ciphi.push_back(intphi);
-	  cdepth.push_back(depth);
-	  cz.push_back(zc);
-	  cchi2.push_back(0.);
-	}
+        HcalDetId cell(j->id());
+        auto cellGeometry = geometry->getSubdetectorGeometry(cell)->getGeometry(cell);
+
+        double eta = cellGeometry->getPosition().eta();
+        double phi = cellGeometry->getPosition().phi();
+        double zc = cellGeometry->getPosition().z();
+        int sub = cell.subdet();
+        int depth = cell.depth();
+        int inteta = cell.ieta();
+        int intphi = cell.iphi() - 1;
+        double t = j->time();
+        double en = j->energy();
+
+        if ((iz > 0 && eta > 0.) || (iz < 0 && eta < 0.) || iz == 0) {
+          csub.push_back(sub);
+          cen.push_back(en);
+          ceta.push_back(eta);
+          cphi.push_back(phi);
+          ctime.push_back(t);
+          cieta.push_back(inteta);
+          ciphi.push_back(intphi);
+          cdepth.push_back(depth);
+          cz.push_back(zc);
+          cchi2.push_back(0.);
+        }
       }
     }
   }
 }
 
-double HcalRecHitsValidation::dR(double eta1, double phi1, double eta2, double phi2) { 
+double HcalRecHitsValidation::dR(double eta1, double phi1, double eta2, double phi2) {
   double PI = 3.1415926535898;
-  double deltaphi= phi1 - phi2;
-  if( phi2 > phi1 ) { deltaphi= phi2 - phi1;}
-  if(deltaphi > PI) { deltaphi = 2.*PI - deltaphi;}
+  double deltaphi = phi1 - phi2;
+  if (phi2 > phi1) {
+    deltaphi = phi2 - phi1;
+  }
+  if (deltaphi > PI) {
+    deltaphi = 2. * PI - deltaphi;
+  }
   double deltaeta = eta2 - eta1;
-  double tmp = sqrt(deltaeta* deltaeta + deltaphi*deltaphi);
+  double tmp = sqrt(deltaeta * deltaeta + deltaphi * deltaphi);
   return tmp;
 }
 
 double HcalRecHitsValidation::phi12(double phi1, double en1, double phi2, double en2) {
   // weighted mean value of phi1 and phi2
-  
+
   double tmp;
   double PI = 3.1415926535898;
-  double a1 = phi1; double a2  = phi2;
+  double a1 = phi1;
+  double a2 = phi2;
 
-  if( a1 > 0.5*PI  && a2 < 0.) a2 += 2*PI; 
-  if( a2 > 0.5*PI  && a1 < 0.) a1 += 2*PI; 
-  tmp = (a1 * en1 + a2 * en2)/(en1 + en2);
-  if(tmp > PI) tmp -= 2.*PI; 
- 
-  return tmp;
+  if (a1 > 0.5 * PI && a2 < 0.)
+    a2 += 2 * PI;
+  if (a2 > 0.5 * PI && a1 < 0.)
+    a1 += 2 * PI;
+  tmp = (a1 * en1 + a2 * en2) / (en1 + en2);
+  if (tmp > PI)
+    tmp -= 2. * PI;
 
+  return tmp;
 }
 
 double HcalRecHitsValidation::dPhiWsign(double phi1, double phi2) {
   // clockwise      phi2 w.r.t phi1 means "+" phi distance
-  // anti-clockwise phi2 w.r.t phi1 means "-" phi distance 
+  // anti-clockwise phi2 w.r.t phi1 means "-" phi distance
 
   double PI = 3.1415926535898;
-  double a1 = phi1; double a2  = phi2;
-  double tmp =  a2 - a1;
-  if( a1*a2 < 0.) {
-    if(a1 > 0.5 * PI)  tmp += 2.*PI;
-    if(a2 > 0.5 * PI)  tmp -= 2.*PI;
+  double a1 = phi1;
+  double a2 = phi2;
+  double tmp = a2 - a1;
+  if (a1 * a2 < 0.) {
+    if (a1 > 0.5 * PI)
+      tmp += 2. * PI;
+    if (a2 > 0.5 * PI)
+      tmp -= 2. * PI;
   }
   return tmp;
-
 }
 
-
 DEFINE_FWK_MODULE(HcalRecHitsValidation);
-
diff --git a/Validation/HcalRecHits/src/NoiseRates.cc b/Validation/HcalRecHits/src/NoiseRates.cc
index 561193b6ce41a..fa61f08df3933 100644
--- a/Validation/HcalRecHits/src/NoiseRates.cc
+++ b/Validation/HcalRecHits/src/NoiseRates.cc
@@ -7,134 +7,119 @@
 //
 //
 
-#include "Validation/HcalRecHits/interface/NoiseRates.h"
 #include "FWCore/Utilities/interface/EDMException.h"
+#include "Validation/HcalRecHits/interface/NoiseRates.h"
 
 //
 // constructors and destructor
 //
 
-NoiseRates::NoiseRates(const edm::ParameterSet& iConfig)
-{
-
+NoiseRates::NoiseRates(const edm::ParameterSet &iConfig) {
   // DQM ROOT output
-  outputFile_ = iConfig.getUntrackedParameter<std::string>("outputFile","myfile.root");
+  outputFile_ = iConfig.getUntrackedParameter<std::string>("outputFile", "myfile.root");
 
   // set parameters
-  rbxCollName_   = iConfig.getUntrackedParameter<edm::InputTag>("rbxCollName");
-  minRBXEnergy_  = iConfig.getUntrackedParameter<double>("minRBXEnergy");
-  minHitEnergy_  = iConfig.getUntrackedParameter<double>("minHitEnergy");
+  rbxCollName_ = iConfig.getUntrackedParameter<edm::InputTag>("rbxCollName");
+  minRBXEnergy_ = iConfig.getUntrackedParameter<double>("minRBXEnergy");
+  minHitEnergy_ = iConfig.getUntrackedParameter<double>("minHitEnergy");
 
   tok_rbx_ = consumes<reco::HcalNoiseRBXCollection>(rbxCollName_);
 
-  useAllHistos_  = iConfig.getUntrackedParameter<bool>("useAllHistos", false);
+  useAllHistos_ = iConfig.getUntrackedParameter<bool>("useAllHistos", false);
 
-  //Hcal Noise Summary
+  // Hcal Noise Summary
   noisetoken_ = consumes<HcalNoiseSummary>(iConfig.getParameter<edm::InputTag>("noiselabel"));
-
-}
-  
-  
-NoiseRates::~NoiseRates()
-{
 }
-  
-  
+
+NoiseRates::~NoiseRates() {}
+
 //
 // member functions
 //
 
-void NoiseRates::bookHistograms(DQMStore::IBooker &ib, edm::Run const &run, edm::EventSetup const &es)
-{
-
+void NoiseRates::bookHistograms(DQMStore::IBooker &ib, edm::Run const &run, edm::EventSetup const &es) {
   ib.setCurrentFolder("NoiseRatesV/NoiseRatesTask");
 
   // book histograms
   Char_t histo[100];
 
-  //Lumi block is not drawn; the rest are
-  if (useAllHistos_){
-    sprintf  (histo, "hLumiBlockCount" );
+  // Lumi block is not drawn; the rest are
+  if (useAllHistos_) {
+    sprintf(histo, "hLumiBlockCount");
     hLumiBlockCount_ = ib.book1D(histo, histo, 1, -0.5, 0.5);
   }
-  
-  sprintf  (histo, "hRBXEnergy" );
+
+  sprintf(histo, "hRBXEnergy");
   hRBXEnergy_ = ib.book1D(histo, histo, 300, 0, 3000);
 
-  sprintf  (histo, "hRBXEnergyType1" );
+  sprintf(histo, "hRBXEnergyType1");
   hRBXEnergyType1_ = ib.book1D(histo, histo, 300, 0, 3000);
 
-  sprintf  (histo, "hRBXEnergyType2" );
+  sprintf(histo, "hRBXEnergyType2");
   hRBXEnergyType2_ = ib.book1D(histo, histo, 300, 0, 3000);
 
-  sprintf  (histo, "hRBXEnergyType3" );
+  sprintf(histo, "hRBXEnergyType3");
   hRBXEnergyType3_ = ib.book1D(histo, histo, 300, 0, 3000);
 
-  sprintf  (histo, "hRBXNHits" );
-  hRBXNHits_ = ib.book1D(histo, histo, 73,-0.5,72.5);
+  sprintf(histo, "hRBXNHits");
+  hRBXNHits_ = ib.book1D(histo, histo, 73, -0.5, 72.5);
 
-  //HcalNoiseSummary
+  // HcalNoiseSummary
 
-  sprintf (histo, "nNNumChannels");
+  sprintf(histo, "nNNumChannels");
   nNNumChannels_ = ib.book1D(histo, histo, 100, 0, 100);
-  sprintf (histo, "nNSumE");
-  nNSumE_ = ib.book1D(histo, histo , 100, 0, 5000);
-  sprintf (histo, "nNSumEt");
-  nNSumEt_ = ib.book1D(histo, histo , 100, 0, 2000);
+  sprintf(histo, "nNSumE");
+  nNSumE_ = ib.book1D(histo, histo, 100, 0, 5000);
+  sprintf(histo, "nNSumEt");
+  nNSumEt_ = ib.book1D(histo, histo, 100, 0, 2000);
 
-  sprintf (histo, "sNNumChannels");
+  sprintf(histo, "sNNumChannels");
   sNNumChannels_ = ib.book1D(histo, histo, 100, 0, 100);
-  sprintf (histo, "sNSumE");
-  sNSumE_ = ib.book1D(histo, histo , 100, 0, 5000);
-  sprintf (histo, "sNSumEt");
-  sNSumEt_ = ib.book1D(histo, histo , 100, 0, 2000);
+  sprintf(histo, "sNSumE");
+  sNSumE_ = ib.book1D(histo, histo, 100, 0, 5000);
+  sprintf(histo, "sNSumEt");
+  sNSumEt_ = ib.book1D(histo, histo, 100, 0, 2000);
 
-  sprintf (histo, "iNNumChannels");
+  sprintf(histo, "iNNumChannels");
   iNNumChannels_ = ib.book1D(histo, histo, 100, 0, 100);
-  sprintf (histo, "iNSumE");
-  iNSumE_ = ib.book1D(histo, histo , 100, 0, 5000);
-  sprintf (histo, "iNSumEt");
-  iNSumEt_ = ib.book1D(histo, histo , 100, 0, 2000);
+  sprintf(histo, "iNSumE");
+  iNSumE_ = ib.book1D(histo, histo, 100, 0, 5000);
+  sprintf(histo, "iNSumEt");
+  iNSumEt_ = ib.book1D(histo, histo, 100, 0, 2000);
 
-  sprintf (histo, "hNoise_maxZeros");
+  sprintf(histo, "hNoise_maxZeros");
   hNoise_maxZeros_ = ib.book1D(histo, histo, 80, 0, 80);
-  sprintf (histo, "hNoise_maxHPDHits");
+  sprintf(histo, "hNoise_maxHPDHits");
   hNoise_maxHPDHits_ = ib.book1D(histo, histo, 20, 0, 20);
-  sprintf (histo, "hNoise_maxHPDNoOtherHits");
+  sprintf(histo, "hNoise_maxHPDNoOtherHits");
   hNoise_maxHPDNoOtherHits_ = ib.book1D(histo, histo, 20, 0, 20);
-
-
-
 }
-  
-// ------------ method called to for each event  ------------
-void
-NoiseRates::analyze(const edm::Event& iEvent, const edm::EventSetup& evSetup)
-{
 
+// ------------ method called to for each event  ------------
+void NoiseRates::analyze(const edm::Event &iEvent, const edm::EventSetup &evSetup) {
   // get the lumi section
   int lumiSection = iEvent.luminosityBlock();
   lumiCountMap_[lumiSection]++;
 
   // get the RBX Noise collection
   edm::Handle<reco::HcalNoiseRBXCollection> handle;
-  iEvent.getByToken(tok_rbx_,handle);
-  if(!handle.isValid()) {
+  iEvent.getByToken(tok_rbx_, handle);
+  if (!handle.isValid()) {
     throw edm::Exception(edm::errors::ProductNotFound)
-      << " could not find HcalNoiseRBXCollection named " << rbxCollName_ << ".\n";
+        << " could not find HcalNoiseRBXCollection named " << rbxCollName_ << ".\n";
     return;
   }
 
   // get the Noise summary object
   edm::Handle<HcalNoiseSummary> summary_h;
   iEvent.getByToken(noisetoken_, summary_h);
-  if(!summary_h.isValid()) {
+  if (!summary_h.isValid()) {
     throw edm::Exception(edm::errors::ProductNotFound) << " could not find HcalNoiseSummary.\n";
     return;
   }
   const HcalNoiseSummary summary = *summary_h;
 
-  //Fill the Noise Summary histograms
+  // Fill the Noise Summary histograms
   nNNumChannels_->Fill(summary.numNegativeNoiseChannels());
   nNSumE_->Fill(summary.NegativeNoiseSumE());
   nNSumEt_->Fill(summary.NegativeNoiseSumEt());
@@ -145,34 +130,36 @@ NoiseRates::analyze(const edm::Event& iEvent, const edm::EventSetup& evSetup)
 
   iNNumChannels_->Fill(summary.numIsolatedNoiseChannels());
   iNSumE_->Fill(summary.isolatedNoiseSumE());
-  iNSumEt_->Fill(summary.isolatedNoiseSumEt());  
+  iNSumEt_->Fill(summary.isolatedNoiseSumEt());
 
   hNoise_maxZeros_->Fill(summary.maxZeros());
   hNoise_maxHPDHits_->Fill(summary.maxHPDHits());
   hNoise_maxHPDNoOtherHits_->Fill(summary.maxHPDNoOtherHits());
 
   // loop over the RBXs and fill the histograms
-  for(reco::HcalNoiseRBXCollection::const_iterator it=handle->begin(); it!=handle->end(); ++it) {
-    const reco::HcalNoiseRBX &rbx=(*it);
+  for (reco::HcalNoiseRBXCollection::const_iterator it = handle->begin(); it != handle->end(); ++it) {
+    const reco::HcalNoiseRBX &rbx = (*it);
 
     double energy = rbx.recHitEnergy(minHitEnergy_);
 
     int nhits = rbx.numRecHits(minHitEnergy_);
 
-    if(energy < minRBXEnergy_) continue;
+    if (energy < minRBXEnergy_)
+      continue;
 
     hRBXEnergy_->Fill(energy);
-    
-    if      (nhits <= 9)  hRBXEnergyType1_->Fill(energy);
-    else if (nhits <= 18) hRBXEnergyType2_->Fill(energy);
-    else               	  hRBXEnergyType3_->Fill(energy);
-    
+
+    if (nhits <= 9)
+      hRBXEnergyType1_->Fill(energy);
+    else if (nhits <= 18)
+      hRBXEnergyType2_->Fill(energy);
+    else
+      hRBXEnergyType3_->Fill(energy);
+
     hRBXNHits_->Fill(nhits);
-    
-  }   // done looping over RBXs
 
+  }  // done looping over RBXs
 }
 
-
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(NoiseRates);
diff --git a/Validation/HcalRecHits/src/NoiseRatesClient.cc b/Validation/HcalRecHits/src/NoiseRatesClient.cc
index 0d67262af95ca..96b1eaffa1e4a 100644
--- a/Validation/HcalRecHits/src/NoiseRatesClient.cc
+++ b/Validation/HcalRecHits/src/NoiseRatesClient.cc
@@ -1,92 +1,80 @@
-#include "Validation/HcalRecHits/interface/NoiseRatesClient.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "Validation/HcalRecHits/interface/NoiseRatesClient.h"
 
-#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Run.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-NoiseRatesClient::NoiseRatesClient(const edm::ParameterSet& iConfig):conf_(iConfig)
-{
-
+NoiseRatesClient::NoiseRatesClient(const edm::ParameterSet &iConfig) : conf_(iConfig) {
   outputFile_ = iConfig.getUntrackedParameter<std::string>("outputFile", "myfile.root");
 
   debug_ = false;
   verbose_ = false;
 
-  dirName_=iConfig.getParameter<std::string>("DQMDirName");
- 
+  dirName_ = iConfig.getParameter<std::string>("DQMDirName");
 }
 
+NoiseRatesClient::~NoiseRatesClient() {}
 
-NoiseRatesClient::~NoiseRatesClient()
-{ 
-  
-}
-
-
-
-void NoiseRatesClient::dqmEndJob(DQMStore::IBooker &ib, DQMStore::IGetter &ig)
-{
-  runClient_(ib,ig);
-}
+void NoiseRatesClient::dqmEndJob(DQMStore::IBooker &ib, DQMStore::IGetter &ig) { runClient_(ib, ig); }
 
-void NoiseRatesClient::runClient_(DQMStore::IBooker &ib, DQMStore::IGetter &ig)
-{
+void NoiseRatesClient::runClient_(DQMStore::IBooker &ib, DQMStore::IGetter &ig) {
   ig.setCurrentFolder(dirName_);
 
-  if (verbose_) std::cout << "\nrunClient" << std::endl; 
+  if (verbose_)
+    std::cout << "\nrunClient" << std::endl;
 
-  std::vector<MonitorElement*> hcalMEs;
+  std::vector<MonitorElement *> hcalMEs;
 
-  // Since out folders are fixed to three, we can just go over these three folders
-  // i.e., CaloTowersV/CaloTowersTask, HcalRecHitsV/HcalRecHitTask, NoiseRatesV/NoiseRatesTask.
+  // Since out folders are fixed to three, we can just go over these three
+  // folders i.e., CaloTowersV/CaloTowersTask, HcalRecHitsV/HcalRecHitTask,
+  // NoiseRatesV/NoiseRatesTask.
   std::vector<std::string> fullPathHLTFolders = ig.getSubdirs();
-  for(unsigned int i=0;i<fullPathHLTFolders.size();i++) {
-
-    if (verbose_) std::cout <<"\nfullPath: "<< fullPathHLTFolders[i] << std::endl;
+  for (unsigned int i = 0; i < fullPathHLTFolders.size(); i++) {
+    if (verbose_)
+      std::cout << "\nfullPath: " << fullPathHLTFolders[i] << std::endl;
     ig.setCurrentFolder(fullPathHLTFolders[i]);
 
     std::vector<std::string> fullSubPathHLTFolders = ig.getSubdirs();
-    for(unsigned int j=0;j<fullSubPathHLTFolders.size();j++) {
-
-      if (verbose_) std::cout <<"fullSub: "<<fullSubPathHLTFolders[j] << std::endl;
-
-      if( strcmp(fullSubPathHLTFolders[j].c_str(), "NoiseRatesV/NoiseRatesTask") ==0  ){
-         hcalMEs = ig.getContents(fullSubPathHLTFolders[j]);
-         if (verbose_) std::cout <<"hltMES size : "<<hcalMEs.size()<<std::endl;
-         if( !NoiseRatesEndjob(hcalMEs) ) std::cout<<"\nError in NoiseRatesEndjob!"<<std::endl<<std::endl;
+    for (unsigned int j = 0; j < fullSubPathHLTFolders.size(); j++) {
+      if (verbose_)
+        std::cout << "fullSub: " << fullSubPathHLTFolders[j] << std::endl;
+
+      if (strcmp(fullSubPathHLTFolders[j].c_str(), "NoiseRatesV/NoiseRatesTask") == 0) {
+        hcalMEs = ig.getContents(fullSubPathHLTFolders[j]);
+        if (verbose_)
+          std::cout << "hltMES size : " << hcalMEs.size() << std::endl;
+        if (!NoiseRatesEndjob(hcalMEs))
+          std::cout << "\nError in NoiseRatesEndjob!" << std::endl << std::endl;
       }
-
-    }    
-
+    }
   }
-
 }
 
 // called after entering the NoiseRatesV/NoiseRatesTask directory
 // hcalMEs are within that directory
-int NoiseRatesClient::NoiseRatesEndjob(const std::vector<MonitorElement*> &hcalMEs){
-
-   int useAllHistos = 0;
-   MonitorElement* hLumiBlockCount =nullptr;
-   for(unsigned int ih=0; ih<hcalMEs.size(); ih++){
-      if( strcmp(hcalMEs[ih]->getName().c_str(), "hLumiBlockCount") ==0  ){
-         hLumiBlockCount = hcalMEs[ih];
-         useAllHistos =1;
-      } 
-   } 
-   if( useAllHistos !=0 && useAllHistos !=1 ) return 0;
-
-// FIXME: dummy lumiCountMap.size since hLumiBlockCount is disabled
-// in a general case.
-   int lumiCountMapsize = -1; // dummy
-   if (useAllHistos) hLumiBlockCount->Fill(0.0, lumiCountMapsize);
+int NoiseRatesClient::NoiseRatesEndjob(const std::vector<MonitorElement *> &hcalMEs) {
+  int useAllHistos = 0;
+  MonitorElement *hLumiBlockCount = nullptr;
+  for (unsigned int ih = 0; ih < hcalMEs.size(); ih++) {
+    if (strcmp(hcalMEs[ih]->getName().c_str(), "hLumiBlockCount") == 0) {
+      hLumiBlockCount = hcalMEs[ih];
+      useAllHistos = 1;
+    }
+  }
+  if (useAllHistos != 0 && useAllHistos != 1)
+    return 0;
 
-   return 1;
+  // FIXME: dummy lumiCountMap.size since hLumiBlockCount is disabled
+  // in a general case.
+  int lumiCountMapsize = -1;  // dummy
+  if (useAllHistos)
+    hLumiBlockCount->Fill(0.0, lumiCountMapsize);
 
+  return 1;
 }
 
 DEFINE_FWK_MODULE(NoiseRatesClient);
diff --git a/Validation/L1T/interface/L1Validator.h b/Validation/L1T/interface/L1Validator.h
index 68eb76974f89d..26d2c5a72008e 100644
--- a/Validation/L1T/interface/L1Validator.h
+++ b/Validation/L1T/interface/L1Validator.h
@@ -5,7 +5,7 @@
 //
 // Package:    L1T
 // Class:      L1Validator
-// 
+//
 /**\class L1T L1Validator.cc Validation/L1T/plugins/L1Validator.cc
 
  Description: [one line class summary]
@@ -20,44 +20,43 @@
 //
 //
 
-
 // system include files
-#include <memory>
 #include <iostream>
+#include <memory>
 #include <string>
 #include <vector>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
-#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Common/interface/Provenance.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Common/interface/Provenance.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
+#include "DataFormats/JetReco/interface/GenJet.h"
+#include "DataFormats/JetReco/interface/GenJetCollection.h"
 #include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h"
 #include <DataFormats/HepMCCandidate/interface/GenParticle.h>
 #include <DataFormats/HepMCCandidate/interface/GenParticleFwd.h>
+#include <DataFormats/L1Trigger/interface/EGamma.h>
+#include <DataFormats/L1Trigger/interface/Jet.h>
 #include <DataFormats/L1Trigger/interface/L1EmParticle.h>
 #include <DataFormats/L1Trigger/interface/L1EmParticleFwd.h>
+#include <DataFormats/L1Trigger/interface/L1EtMissParticle.h>
+#include <DataFormats/L1Trigger/interface/L1EtMissParticleFwd.h>
 #include <DataFormats/L1Trigger/interface/L1JetParticle.h>
 #include <DataFormats/L1Trigger/interface/L1JetParticleFwd.h>
 #include <DataFormats/L1Trigger/interface/L1MuonParticle.h>
 #include <DataFormats/L1Trigger/interface/L1MuonParticleFwd.h>
-#include <DataFormats/L1Trigger/interface/L1EtMissParticle.h>
-#include <DataFormats/L1Trigger/interface/L1EtMissParticleFwd.h>
 #include <DataFormats/L1Trigger/interface/Muon.h>
-#include <DataFormats/L1Trigger/interface/EGamma.h>
 #include <DataFormats/L1Trigger/interface/Tau.h>
-#include <DataFormats/L1Trigger/interface/Jet.h>
-#include "DataFormats/JetReco/interface/GenJetCollection.h"
-#include "DataFormats/JetReco/interface/GenJet.h"
 
-#include <DQMServices/Core/interface/MonitorElement.h>
 #include <DQMServices/Core/interface/DQMEDAnalyzer.h>
+#include <DQMServices/Core/interface/MonitorElement.h>
 
 #include <Validation/L1T/interface/L1ValidatorHists.h>
 
@@ -66,36 +65,40 @@
 //
 
 class L1Validator : public DQMEDAnalyzer {
-  public:
-    explicit L1Validator(const edm::ParameterSet&);
-    ~L1Validator() override;
-
-    static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
-    void analyze(const edm::Event&, const edm::EventSetup&) override;
-
-  protected:
-    void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-
-  private:
-    // ----------member data ---------------------------
-    std::string _dirName;
-    std::string _fileName;
-
-    edm::EDGetTokenT<reco::GenParticleCollection> _GenSource;
-    edm::EDGetTokenT<l1t::MuonBxCollection> _L1MuonBXSource;
-    edm::EDGetTokenT<l1t::EGammaBxCollection> _L1EGammaBXSource;
-    edm::EDGetTokenT<l1t::TauBxCollection> _L1TauBXSource;
-    edm::EDGetTokenT<l1t::JetBxCollection> _L1JetBXSource;
-    edm::EDGetTokenT<GenEventInfoProduct>         _srcToken;
-    edm::EDGetTokenT<reco::GenJetCollection> _L1GenJetSource;
-  
-    L1ValidatorHists _Hists;
-
-    //---------------helper functions------------------
-  private:
-    const reco::LeafCandidate *FindBest(const reco::GenParticle *, const std::vector<l1extra::L1EmParticle> *, const std::vector<l1extra::L1EmParticle> *);
-    const reco::LeafCandidate *FindBest(const reco::GenParticle *, const std::vector<l1extra::L1JetParticle> *, const std::vector<l1extra::L1JetParticle> *);
-    const reco::LeafCandidate *FindBest(const reco::GenParticle *, const std::vector<l1extra::L1MuonParticle> *);
+public:
+  explicit L1Validator(const edm::ParameterSet &);
+  ~L1Validator() override;
+
+  static void fillDescriptions(edm::ConfigurationDescriptions &descriptions);
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+
+protected:
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+
+private:
+  // ----------member data ---------------------------
+  std::string _dirName;
+  std::string _fileName;
+
+  edm::EDGetTokenT<reco::GenParticleCollection> _GenSource;
+  edm::EDGetTokenT<l1t::MuonBxCollection> _L1MuonBXSource;
+  edm::EDGetTokenT<l1t::EGammaBxCollection> _L1EGammaBXSource;
+  edm::EDGetTokenT<l1t::TauBxCollection> _L1TauBXSource;
+  edm::EDGetTokenT<l1t::JetBxCollection> _L1JetBXSource;
+  edm::EDGetTokenT<GenEventInfoProduct> _srcToken;
+  edm::EDGetTokenT<reco::GenJetCollection> _L1GenJetSource;
+
+  L1ValidatorHists _Hists;
+
+  //---------------helper functions------------------
+private:
+  const reco::LeafCandidate *FindBest(const reco::GenParticle *,
+                                      const std::vector<l1extra::L1EmParticle> *,
+                                      const std::vector<l1extra::L1EmParticle> *);
+  const reco::LeafCandidate *FindBest(const reco::GenParticle *,
+                                      const std::vector<l1extra::L1JetParticle> *,
+                                      const std::vector<l1extra::L1JetParticle> *);
+  const reco::LeafCandidate *FindBest(const reco::GenParticle *, const std::vector<l1extra::L1MuonParticle> *);
 };
 
 //
diff --git a/Validation/L1T/interface/L1ValidatorHists.h b/Validation/L1T/interface/L1ValidatorHists.h
index 872b10f585d6e..b423ecc76a3d0 100644
--- a/Validation/L1T/interface/L1ValidatorHists.h
+++ b/Validation/L1T/interface/L1ValidatorHists.h
@@ -22,62 +22,62 @@ TH2F * ## TYPE ## _dPt;
 */
 
 class L1ValidatorHists {
-  public:
-    L1ValidatorHists();
-    ~L1ValidatorHists();
-
-    void Book(DQMStore::IBooker &, std::string dirname);
-    void Write();
-
-    int NEvents;
-
-    //enum Type{ IsoEG, NonIsoEG, CenJet, ForJet, TauJet, Muon, Number };
-    enum Type{ Egamma, Jet, Tau, Muon, Number };
-    std::string Name[4];
-
-    // Each object has gen (pt, eta, phi, pdg), reco (pt, eta, phi, pdg)
-    // split by pdg (CenJet, ETM, ETT, ForJet, HTM, HTT, IsoEG, Mu, NoIsoEG, TauJet): 10
-    // needs efficiency (by pt, eta), fake rate (by pt, eta), dR (by pt, (eta?))
-    /**TH2F *IsoEG_N_Pt_Eta, *IsoEG_Eff_Pt, *IsoEG_Eff_Eta, *IsoEG_dR_Pt, *IsoEG_dPt_Pt;
-    TH2F *NonIsoEG_N_Pt_Eta, *NonIsoEG_Eff_Pt, *NonIsoEG_Eff_Eta, *NonIsoEG_dR_Pt, *NonIsoEG_dPt_Pt;
-    TH2F *CenJet_N_Pt_Eta, *CenJet_Eff_Pt, *CenJet_Eff_Eta, *CenJet_dR_Pt, *CenJet_dPt_Pt;
-    TH2F *Muon_N_Pt_Eta, *Muon_Eff_Pt, *Muon_Eff_Eta, *Muon_dR_Pt, *Muon_dPt_Pt;*/
-
-    /*DECLARE_HISTS(IsoEG)
-    DECLARE_HISTS(NonIsoEG)
-    DECLARE_HISTS(CenJet)
-    DECLARE_HISTS(ForJet)
-    DECLARE_HISTS(TauJet)
-    DECLARE_HISTS(Muon)*/
-
-    MonitorElement *N[Type::Number];
-
-    MonitorElement *Eff_Pt[Type::Number];
-    MonitorElement *Eff_Pt_Denom[Type::Number];
-    MonitorElement *Eff_Pt_Nomin[Type::Number];
-    MonitorElement *Eff_Eta[Type::Number];
-    MonitorElement *Eff_Eta_Denom[Type::Number];
-    MonitorElement *Eff_Eta_Nomin[Type::Number];
-    MonitorElement *TurnOn_15[Type::Number];
-    MonitorElement *TurnOn_15_Denom[Type::Number];
-    MonitorElement *TurnOn_15_Nomin[Type::Number];
-    MonitorElement *TurnOn_30[Type::Number];
-    MonitorElement *TurnOn_30_Denom[Type::Number];
-    MonitorElement *TurnOn_30_Nomin[Type::Number];
-    MonitorElement *dR[Type::Number];
-    MonitorElement *dPt[Type::Number];
-    MonitorElement *dR_vs_Pt[Type::Number];
-    MonitorElement *dPt_vs_Pt[Type::Number];
-
-
-    // add the rest...
-    //TH2F *ETM_Delta, *ETT_Delta, *HTM_Delta, *HTT_Delta;
-
-    void Fill(int, const reco::LeafCandidate *, const reco::LeafCandidate *);
-    void FillNumber(int, int);
-//  private:
-//    void NormalizeSlices(TH2F *Hist);
+public:
+  L1ValidatorHists();
+  ~L1ValidatorHists();
+
+  void Book(DQMStore::IBooker &, std::string dirname);
+  void Write();
+
+  int NEvents;
+
+  // enum Type{ IsoEG, NonIsoEG, CenJet, ForJet, TauJet, Muon, Number };
+  enum Type { Egamma, Jet, Tau, Muon, Number };
+  std::string Name[4];
+
+  // Each object has gen (pt, eta, phi, pdg), reco (pt, eta, phi, pdg)
+  // split by pdg (CenJet, ETM, ETT, ForJet, HTM, HTT, IsoEG, Mu, NoIsoEG,
+  // TauJet): 10 needs efficiency (by pt, eta), fake rate (by pt, eta), dR (by
+  // pt, (eta?))
+  /**TH2F *IsoEG_N_Pt_Eta, *IsoEG_Eff_Pt, *IsoEG_Eff_Eta, *IsoEG_dR_Pt,
+   *IsoEG_dPt_Pt; TH2F *NonIsoEG_N_Pt_Eta, *NonIsoEG_Eff_Pt, *NonIsoEG_Eff_Eta,
+   *NonIsoEG_dR_Pt, *NonIsoEG_dPt_Pt; TH2F *CenJet_N_Pt_Eta, *CenJet_Eff_Pt,
+   *CenJet_Eff_Eta, *CenJet_dR_Pt, *CenJet_dPt_Pt; TH2F *Muon_N_Pt_Eta,
+   *Muon_Eff_Pt, *Muon_Eff_Eta, *Muon_dR_Pt, *Muon_dPt_Pt;*/
+
+  /*DECLARE_HISTS(IsoEG)
+  DECLARE_HISTS(NonIsoEG)
+  DECLARE_HISTS(CenJet)
+  DECLARE_HISTS(ForJet)
+  DECLARE_HISTS(TauJet)
+  DECLARE_HISTS(Muon)*/
+
+  MonitorElement *N[Type::Number];
+
+  MonitorElement *Eff_Pt[Type::Number];
+  MonitorElement *Eff_Pt_Denom[Type::Number];
+  MonitorElement *Eff_Pt_Nomin[Type::Number];
+  MonitorElement *Eff_Eta[Type::Number];
+  MonitorElement *Eff_Eta_Denom[Type::Number];
+  MonitorElement *Eff_Eta_Nomin[Type::Number];
+  MonitorElement *TurnOn_15[Type::Number];
+  MonitorElement *TurnOn_15_Denom[Type::Number];
+  MonitorElement *TurnOn_15_Nomin[Type::Number];
+  MonitorElement *TurnOn_30[Type::Number];
+  MonitorElement *TurnOn_30_Denom[Type::Number];
+  MonitorElement *TurnOn_30_Nomin[Type::Number];
+  MonitorElement *dR[Type::Number];
+  MonitorElement *dPt[Type::Number];
+  MonitorElement *dR_vs_Pt[Type::Number];
+  MonitorElement *dPt_vs_Pt[Type::Number];
+
+  // add the rest...
+  // TH2F *ETM_Delta, *ETT_Delta, *HTM_Delta, *HTT_Delta;
+
+  void Fill(int, const reco::LeafCandidate *, const reco::LeafCandidate *);
+  void FillNumber(int, int);
+  //  private:
+  //    void NormalizeSlices(TH2F *Hist);
 };
 
-
 #endif
diff --git a/Validation/L1T/plugins/L1Validator.cc b/Validation/L1T/plugins/L1Validator.cc
index 32b75f079a9aa..b8b08ffd18b8b 100644
--- a/Validation/L1T/plugins/L1Validator.cc
+++ b/Validation/L1T/plugins/L1Validator.cc
@@ -2,12 +2,12 @@
 //
 // Package:    L1T
 // Class:      L1Validator
-// 
+//
 /**
  * \class L1T L1Validator.cc Validation/L1T/plugins/L1Validator.cc
  *
  * Description: [one line class summary]
- * 
+ *
  * Implementation:
  *    [Notes on implementation]
  */
@@ -28,53 +28,51 @@
 
 #include "TFile.h"
 
-//defining as a macro instead of a function because inheritance doesn't work:
-#define FINDRECOPART(TYPE, COLLECTION1, COLLECTION2) \
-const TYPE *RecoPart=NULL; \
-double BestDist=999.; \
-for(uint i=0; i < COLLECTION1->size(); i++){ \
-  const TYPE *ThisPart = &COLLECTION1->at(i); \
-  double ThisDist = reco::deltaR(GenPart->eta(), GenPart->phi(), ThisPart->eta(), ThisPart->phi()); \
-  if(ThisDist < 1.0 && ThisDist < BestDist){ \
-    BestDist = ThisDist; \
-    RecoPart = ThisPart; \
-  } \
-} \
-if(COLLECTION1.product() != COLLECTION2.product()){ \
-  for(uint i=0; i < COLLECTION2->size(); i++){ \
-    const TYPE *ThisPart = &COLLECTION2->at(i); \
-    double ThisDist = reco::deltaR(GenPart->eta(), GenPart->phi(), ThisPart->eta(), ThisPart->phi()); \
-    if(ThisDist < 1.0 && ThisDist < BestDist){ \
-      BestDist = ThisDist; \
-      RecoPart = ThisPart; \
-    } \
-  } \
-}
+// defining as a macro instead of a function because inheritance doesn't work:
+#define FINDRECOPART(TYPE, COLLECTION1, COLLECTION2)                                                    \
+  const TYPE *RecoPart = NULL;                                                                          \
+  double BestDist = 999.;                                                                               \
+  for (uint i = 0; i < COLLECTION1->size(); i++) {                                                      \
+    const TYPE *ThisPart = &COLLECTION1->at(i);                                                         \
+    double ThisDist = reco::deltaR(GenPart->eta(), GenPart->phi(), ThisPart->eta(), ThisPart->phi());   \
+    if (ThisDist < 1.0 && ThisDist < BestDist) {                                                        \
+      BestDist = ThisDist;                                                                              \
+      RecoPart = ThisPart;                                                                              \
+    }                                                                                                   \
+  }                                                                                                     \
+  if (COLLECTION1.product() != COLLECTION2.product()) {                                                 \
+    for (uint i = 0; i < COLLECTION2->size(); i++) {                                                    \
+      const TYPE *ThisPart = &COLLECTION2->at(i);                                                       \
+      double ThisDist = reco::deltaR(GenPart->eta(), GenPart->phi(), ThisPart->eta(), ThisPart->phi()); \
+      if (ThisDist < 1.0 && ThisDist < BestDist) {                                                      \
+        BestDist = ThisDist;                                                                            \
+        RecoPart = ThisPart;                                                                            \
+      }                                                                                                 \
+    }                                                                                                   \
+  }
 
-L1Validator::L1Validator(const edm::ParameterSet& iConfig){
+L1Validator::L1Validator(const edm::ParameterSet &iConfig) {
   _dirName = iConfig.getParameter<std::string>("dirName");
-  _GenSource = consumes<reco::GenParticleCollection> (iConfig.getParameter<edm::InputTag>("GenSource"));
+  _GenSource = consumes<reco::GenParticleCollection>(iConfig.getParameter<edm::InputTag>("GenSource"));
 
-  _L1MuonBXSource = consumes<l1t::MuonBxCollection> (iConfig.getParameter<edm::InputTag>("L1MuonBXSource"));
-  _L1EGammaBXSource = consumes<l1t::EGammaBxCollection> (iConfig.getParameter<edm::InputTag>("L1EGammaBXSource"));
-  _L1TauBXSource = consumes<l1t::TauBxCollection> (iConfig.getParameter<edm::InputTag>("L1TauBXSource"));
-  _L1JetBXSource = consumes<l1t::JetBxCollection> (iConfig.getParameter<edm::InputTag>("L1JetBXSource"));
-  _srcToken = mayConsume<GenEventInfoProduct>( iConfig.getParameter<edm::InputTag>("srcToken") );
-  _L1GenJetSource = consumes<reco::GenJetCollection>( iConfig.getParameter<edm::InputTag>("L1GenJetSource"));
+  _L1MuonBXSource = consumes<l1t::MuonBxCollection>(iConfig.getParameter<edm::InputTag>("L1MuonBXSource"));
+  _L1EGammaBXSource = consumes<l1t::EGammaBxCollection>(iConfig.getParameter<edm::InputTag>("L1EGammaBXSource"));
+  _L1TauBXSource = consumes<l1t::TauBxCollection>(iConfig.getParameter<edm::InputTag>("L1TauBXSource"));
+  _L1JetBXSource = consumes<l1t::JetBxCollection>(iConfig.getParameter<edm::InputTag>("L1JetBXSource"));
+  _srcToken = mayConsume<GenEventInfoProduct>(iConfig.getParameter<edm::InputTag>("srcToken"));
+  _L1GenJetSource = consumes<reco::GenJetCollection>(iConfig.getParameter<edm::InputTag>("L1GenJetSource"));
 
   //_fileName = iConfig.getParameter<std::string>("fileName");
 }
 
-
-L1Validator::~L1Validator(){
-}
+L1Validator::~L1Validator() {}
 
 void L1Validator::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const &, edm::EventSetup const &) {
-  //iBooker.setCurrentFolder(_dirName);
+  // iBooker.setCurrentFolder(_dirName);
   _Hists.Book(iBooker, _dirName);
 };
 
-void L1Validator::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup){
+void L1Validator::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace edm;
   using namespace std;
   using namespace l1extra;
@@ -88,69 +86,83 @@ void L1Validator::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu
   Handle<GenEventInfoProduct> genEvtInfoProduct;
   Handle<reco::GenJetCollection> GenJets;
 
-  bool GotEverything=true;
-
-  if(!iEvent.getByToken(_GenSource, GenParticles)) GotEverything=false;
-  if(!iEvent.getByToken(_L1MuonBXSource, MuonsBX)) GotEverything=false;
-  if(!iEvent.getByToken(_L1EGammaBXSource, EGammasBX)) GotEverything=false;
-  if(!iEvent.getByToken(_L1TauBXSource, TausBX)) GotEverything=false;
-  if(!iEvent.getByToken(_L1JetBXSource, JetsBX)) GotEverything=false;
-  if(!iEvent.getByToken(_srcToken, genEvtInfoProduct)) GotEverything=false;
-  if(!iEvent.getByToken(_L1GenJetSource, GenJets)) GotEverything=false;  
-
-  if(!GotEverything) return;
+  bool GotEverything = true;
+
+  if (!iEvent.getByToken(_GenSource, GenParticles))
+    GotEverything = false;
+  if (!iEvent.getByToken(_L1MuonBXSource, MuonsBX))
+    GotEverything = false;
+  if (!iEvent.getByToken(_L1EGammaBXSource, EGammasBX))
+    GotEverything = false;
+  if (!iEvent.getByToken(_L1TauBXSource, TausBX))
+    GotEverything = false;
+  if (!iEvent.getByToken(_L1JetBXSource, JetsBX))
+    GotEverything = false;
+  if (!iEvent.getByToken(_srcToken, genEvtInfoProduct))
+    GotEverything = false;
+  if (!iEvent.getByToken(_L1GenJetSource, GenJets))
+    GotEverything = false;
+
+  if (!GotEverything)
+    return;
 
   /*
   std::string moduleName = "";
   if( genEvtInfoProduct.isValid() ) {
-	  const edm::Provenance& prov = iEvent.getProvenance(genEvtInfoProduct.id());
-	  moduleName = edm::moduleName(prov);
-	  //cout<<" generator name: "<<moduleName<<endl;
+          const edm::Provenance& prov =
+  iEvent.getProvenance(genEvtInfoProduct.id()); moduleName =
+  edm::moduleName(prov);
+          //cout<<" generator name: "<<moduleName<<endl;
   }
-  */ 
+  */
 
   _Hists.NEvents++;
 
   int nL1Muons = 0, nL1EGammas = 0, nL1Taus = 0, nL1Jets = 0;
-  if(MuonsBX->getFirstBX()>=0) nL1Muons = MuonsBX->size(0);
-  if(EGammasBX->getFirstBX()>=0) nL1EGammas = EGammasBX->size(0);
-  if(TausBX->getFirstBX()>=0) nL1Taus = TausBX->size(0);
-  if(JetsBX->getFirstBX()>=0) nL1Jets = JetsBX->size(0);
+  if (MuonsBX->getFirstBX() >= 0)
+    nL1Muons = MuonsBX->size(0);
+  if (EGammasBX->getFirstBX() >= 0)
+    nL1EGammas = EGammasBX->size(0);
+  if (TausBX->getFirstBX() >= 0)
+    nL1Taus = TausBX->size(0);
+  if (JetsBX->getFirstBX() >= 0)
+    nL1Jets = JetsBX->size(0);
 
   _Hists.FillNumber(L1ValidatorHists::Type::Muon, nL1Muons);
   _Hists.FillNumber(L1ValidatorHists::Type::Egamma, nL1EGammas);
   _Hists.FillNumber(L1ValidatorHists::Type::Tau, nL1Taus);
   _Hists.FillNumber(L1ValidatorHists::Type::Jet, nL1Jets);
 
-  //For gen jet
+  // For gen jet
 
-  for(auto &Genjet : *GenJets ){
+  for (auto &Genjet : *GenJets) {
+    // eta within calorimeter acceptance 4.7
+    if (fabs((&Genjet)->eta()) > 4.7)
+      continue;
 
-     // eta within calorimeter acceptance 4.7
-     if(fabs((&Genjet)->eta())>4.7) continue;
+    // only consider the gen jet with pt greater than 10 GeV
+    if ((&Genjet)->pt() < 10.0)
+      continue;
 
-     // only consider the gen jet with pt greater than 10 GeV
-     if((&Genjet)->pt()<10.0) continue;
-
-     double minDR = 999.0;
+    double minDR = 999.0;
 
-     // match L1T object
-     const l1t::Jet        *L1Part=nullptr;
-     for(int iBx = JetsBX->getFirstBX();  iBx<=JetsBX->getLastBX(); ++iBx){
-          if(iBx>0) continue;
-          for(std::vector<l1t::Jet>::const_iterator jet = JetsBX->begin(iBx); jet != JetsBX->end(iBx); ++jet){
-                double idR = reco::deltaR((&Genjet)->eta(), (&Genjet)->phi(), jet->eta(), jet->phi());
-                if( idR < minDR ){
-                         minDR = idR;
-                         L1Part = &(*jet);
-                }
-          }
-     }
-     _Hists.Fill(L1ValidatorHists::Type::Jet, &Genjet, L1Part);
+    // match L1T object
+    const l1t::Jet *L1Part = nullptr;
+    for (int iBx = JetsBX->getFirstBX(); iBx <= JetsBX->getLastBX(); ++iBx) {
+      if (iBx > 0)
+        continue;
+      for (std::vector<l1t::Jet>::const_iterator jet = JetsBX->begin(iBx); jet != JetsBX->end(iBx); ++jet) {
+        double idR = reco::deltaR((&Genjet)->eta(), (&Genjet)->phi(), jet->eta(), jet->phi());
+        if (idR < minDR) {
+          minDR = idR;
+          L1Part = &(*jet);
+        }
+      }
+    }
+    _Hists.Fill(L1ValidatorHists::Type::Jet, &Genjet, L1Part);
   }
 
-
-  for(uint i=0; i < GenParticles->size(); i++){
+  for (uint i = 0; i < GenParticles->size(); i++) {
     const GenParticle *GenPart = &GenParticles->at(i);
 
     int pdg = GenPart->pdgId(), status = GenPart->status();
@@ -158,100 +170,108 @@ void L1Validator::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetu
     double minDR = 999.0;
 
     // only consider the gen particle with pt greater than 10 GeV
-    if(GenPart->pt()<10.0) continue;
+    if (GenPart->pt() < 10.0)
+      continue;
 
     /// select the final state (i.e status==1) muons (pdg==+/-13)
-    if(status==1 && abs(pdg)==13){  //Muon
-
-       // eta within tracker acceptance 2.4
-       if(fabs(GenPart->eta())>2.4) continue;
-
-       // match L1T object
-       const l1t::Muon 	*L1Part=nullptr;
-       for(int iBx = MuonsBX->getFirstBX();  iBx<=MuonsBX->getLastBX(); ++iBx){
-	  if(iBx>0) continue;
-          for(std::vector<l1t::Muon>::const_iterator mu = MuonsBX->begin(iBx); mu != MuonsBX->end(iBx); ++mu){
-	  	double idR = reco::deltaR(GenPart->eta(), GenPart->phi(), mu->eta(), mu->phi());  
-		if(idR < minDR ){
-			 minDR = idR;
-			 L1Part = &(*mu);
-		}
-	 		
-	  }
-          _Hists.Fill(L1ValidatorHists::Type::Muon, GenPart, L1Part);
-       } 
-
-
-    /// select the final state (i.e status==1) electrons (pdg==+/-11) and photons (pdg==22)
-    }  else if(status==1 && (abs(pdg)==11 || pdg==22)){  //Egamma
-
-       // eta within EM calorimeter acceptance 2.5
-       if(fabs(GenPart->eta())>2.5) continue;
-
-       // exclude the calorimeter barrel and endcap overlap region 
-       if(fabs(GenPart->eta())>1.4442 && fabs(GenPart->eta())<1.5660) continue;
-
-       // match L1T object
-       const l1t::EGamma 	*L1Part=nullptr;
-       for(int iBx = EGammasBX->getFirstBX();  iBx<=EGammasBX->getLastBX(); ++iBx){
-	  if(iBx>0) continue;
-          for(std::vector<l1t::EGamma>::const_iterator eg = EGammasBX->begin(iBx); eg != EGammasBX->end(iBx); ++eg){
-	  	double idR = reco::deltaR(GenPart->eta(), GenPart->phi(), eg->eta(), eg->phi());  
-		if(idR < minDR ){
-			 minDR = idR;
-			 L1Part = &(*eg);
-		}
-	  }
-       }
-       _Hists.Fill(L1ValidatorHists::Type::Egamma, GenPart, L1Part);
-
-
-    /// select the matrix element (i.e status==2) taus (pdg==+/-15) before decay
-     } else if(status==2 && abs(pdg)==15){  //Tau
-
-       // eta within tracker acceptance 2.4
-       if(fabs(GenPart->eta())>2.4) continue;
-
-       // match L1T object
-       const l1t::Tau 	*L1Part=nullptr;
-       for(int iBx = TausBX->getFirstBX();  iBx<=TausBX->getLastBX(); ++iBx){
-	  if(iBx>0) continue;
-          for(std::vector<l1t::Tau>::const_iterator tau = TausBX->begin(iBx); tau != TausBX->end(iBx); ++tau){
-	  	double idR = reco::deltaR(GenPart->eta(), GenPart->phi(), tau->eta(), tau->phi());  
-		if(idR < minDR ){
-			 minDR = idR;
-			 L1Part = &(*tau);
-		}
-	  }
-       }
-       _Hists.Fill(L1ValidatorHists::Type::Tau, GenPart, L1Part);
-
+    if (status == 1 && abs(pdg) == 13) {  // Muon
+
+      // eta within tracker acceptance 2.4
+      if (fabs(GenPart->eta()) > 2.4)
+        continue;
+
+      // match L1T object
+      const l1t::Muon *L1Part = nullptr;
+      for (int iBx = MuonsBX->getFirstBX(); iBx <= MuonsBX->getLastBX(); ++iBx) {
+        if (iBx > 0)
+          continue;
+        for (std::vector<l1t::Muon>::const_iterator mu = MuonsBX->begin(iBx); mu != MuonsBX->end(iBx); ++mu) {
+          double idR = reco::deltaR(GenPart->eta(), GenPart->phi(), mu->eta(), mu->phi());
+          if (idR < minDR) {
+            minDR = idR;
+            L1Part = &(*mu);
+          }
+        }
+        _Hists.Fill(L1ValidatorHists::Type::Muon, GenPart, L1Part);
+      }
+
+      /// select the final state (i.e status==1) electrons (pdg==+/-11) and
+      /// photons (pdg==22)
+    } else if (status == 1 && (abs(pdg) == 11 || pdg == 22)) {  // Egamma
+
+      // eta within EM calorimeter acceptance 2.5
+      if (fabs(GenPart->eta()) > 2.5)
+        continue;
+
+      // exclude the calorimeter barrel and endcap overlap region
+      if (fabs(GenPart->eta()) > 1.4442 && fabs(GenPart->eta()) < 1.5660)
+        continue;
+
+      // match L1T object
+      const l1t::EGamma *L1Part = nullptr;
+      for (int iBx = EGammasBX->getFirstBX(); iBx <= EGammasBX->getLastBX(); ++iBx) {
+        if (iBx > 0)
+          continue;
+        for (std::vector<l1t::EGamma>::const_iterator eg = EGammasBX->begin(iBx); eg != EGammasBX->end(iBx); ++eg) {
+          double idR = reco::deltaR(GenPart->eta(), GenPart->phi(), eg->eta(), eg->phi());
+          if (idR < minDR) {
+            minDR = idR;
+            L1Part = &(*eg);
+          }
+        }
+      }
+      _Hists.Fill(L1ValidatorHists::Type::Egamma, GenPart, L1Part);
+
+      /// select the matrix element (i.e status==2) taus (pdg==+/-15) before
+      /// decay
+    } else if (status == 2 && abs(pdg) == 15) {  // Tau
+
+      // eta within tracker acceptance 2.4
+      if (fabs(GenPart->eta()) > 2.4)
+        continue;
+
+      // match L1T object
+      const l1t::Tau *L1Part = nullptr;
+      for (int iBx = TausBX->getFirstBX(); iBx <= TausBX->getLastBX(); ++iBx) {
+        if (iBx > 0)
+          continue;
+        for (std::vector<l1t::Tau>::const_iterator tau = TausBX->begin(iBx); tau != TausBX->end(iBx); ++tau) {
+          double idR = reco::deltaR(GenPart->eta(), GenPart->phi(), tau->eta(), tau->phi());
+          if (idR < minDR) {
+            minDR = idR;
+            L1Part = &(*tau);
+          }
+        }
+      }
+      _Hists.Fill(L1ValidatorHists::Type::Tau, GenPart, L1Part);
     }
-
   }
-
 }
 
-//The next three are exactly the same, but apparently inheritance doesn't work like I thought it did.
-const reco::LeafCandidate *L1Validator::FindBest(const reco::GenParticle *GenPart, const std::vector<l1extra::L1EmParticle> *Collection1, const std::vector<l1extra::L1EmParticle> *Collection2=nullptr){
-  const reco::LeafCandidate *BestPart=nullptr;
-  double BestDR=999.;
+// The next three are exactly the same, but apparently inheritance doesn't work
+// like I thought it did.
+const reco::LeafCandidate *L1Validator::FindBest(const reco::GenParticle *GenPart,
+                                                 const std::vector<l1extra::L1EmParticle> *Collection1,
+                                                 const std::vector<l1extra::L1EmParticle> *Collection2 = nullptr) {
+  const reco::LeafCandidate *BestPart = nullptr;
+  double BestDR = 999.;
 
-  for(uint i=0; i < Collection1->size(); i++){
+  for (uint i = 0; i < Collection1->size(); i++) {
     const reco::LeafCandidate *ThisPart = &Collection1->at(i);
     double ThisDR = reco::deltaR(GenPart->eta(), GenPart->phi(), ThisPart->eta(), ThisPart->phi());
-    if(ThisDR < BestDR){
+    if (ThisDR < BestDR) {
       BestDR = ThisDR;
       BestPart = ThisPart;
     }
   }
 
-  if(Collection2==nullptr) return BestPart;
+  if (Collection2 == nullptr)
+    return BestPart;
 
-  for(uint i=0; i < Collection2->size(); i++){
+  for (uint i = 0; i < Collection2->size(); i++) {
     const reco::LeafCandidate *ThisPart = &Collection2->at(i);
     double ThisDR = reco::deltaR(GenPart->eta(), GenPart->phi(), ThisPart->eta(), ThisPart->phi());
-    if(ThisDR < BestDR){
+    if (ThisDR < BestDR) {
       BestDR = ThisDR;
       BestPart = ThisPart;
     }
@@ -260,25 +280,28 @@ const reco::LeafCandidate *L1Validator::FindBest(const reco::GenParticle *GenPar
   return BestPart;
 }
 
-const reco::LeafCandidate *L1Validator::FindBest(const reco::GenParticle *GenPart, const std::vector<l1extra::L1JetParticle> *Collection1, const std::vector<l1extra::L1JetParticle> *Collection2=nullptr){
-  const reco::LeafCandidate *BestPart=nullptr;
-  double BestDR=999.;
+const reco::LeafCandidate *L1Validator::FindBest(const reco::GenParticle *GenPart,
+                                                 const std::vector<l1extra::L1JetParticle> *Collection1,
+                                                 const std::vector<l1extra::L1JetParticle> *Collection2 = nullptr) {
+  const reco::LeafCandidate *BestPart = nullptr;
+  double BestDR = 999.;
 
-  for(uint i=0; i < Collection1->size(); i++){
+  for (uint i = 0; i < Collection1->size(); i++) {
     const reco::LeafCandidate *ThisPart = &Collection1->at(i);
     double ThisDR = reco::deltaR(GenPart->eta(), GenPart->phi(), ThisPart->eta(), ThisPart->phi());
-    if(ThisDR < BestDR){
+    if (ThisDR < BestDR) {
       BestDR = ThisDR;
       BestPart = ThisPart;
     }
   }
 
-  if(Collection2==nullptr) return BestPart;
+  if (Collection2 == nullptr)
+    return BestPart;
 
-  for(uint i=0; i < Collection2->size(); i++){
+  for (uint i = 0; i < Collection2->size(); i++) {
     const reco::LeafCandidate *ThisPart = &Collection2->at(i);
     double ThisDR = reco::deltaR(GenPart->eta(), GenPart->phi(), ThisPart->eta(), ThisPart->phi());
-    if(ThisDR < BestDR){
+    if (ThisDR < BestDR) {
       BestDR = ThisDR;
       BestPart = ThisPart;
     }
@@ -287,14 +310,15 @@ const reco::LeafCandidate *L1Validator::FindBest(const reco::GenParticle *GenPar
   return BestPart;
 }
 
-const reco::LeafCandidate *L1Validator::FindBest(const reco::GenParticle *GenPart, const std::vector<l1extra::L1MuonParticle> *Collection1){
-  const reco::LeafCandidate *BestPart=nullptr;
-  double BestDR=999.;
+const reco::LeafCandidate *L1Validator::FindBest(const reco::GenParticle *GenPart,
+                                                 const std::vector<l1extra::L1MuonParticle> *Collection1) {
+  const reco::LeafCandidate *BestPart = nullptr;
+  double BestDR = 999.;
 
-  for(uint i=0; i < Collection1->size(); i++){
+  for (uint i = 0; i < Collection1->size(); i++) {
     const reco::LeafCandidate *ThisPart = &Collection1->at(i);
     double ThisDR = reco::deltaR(GenPart->eta(), GenPart->phi(), ThisPart->eta(), ThisPart->phi());
-    if(ThisDR < BestDR){
+    if (ThisDR < BestDR) {
       BestDR = ThisDR;
       BestPart = ThisPart;
     }
@@ -303,15 +327,17 @@ const reco::LeafCandidate *L1Validator::FindBest(const reco::GenParticle *GenPar
   return BestPart;
 }
 
-
-// ------------ method fills 'descriptions' with the allowed parameters for the module  ------------
-void L1Validator::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
-  //The following says we do not know what parameters are allowed so do no validation
-  // Please change this to state exactly what you do use, even if it is no parameters
+// ------------ method fills 'descriptions' with the allowed parameters for the
+// module  ------------
+void L1Validator::fillDescriptions(edm::ConfigurationDescriptions &descriptions) {
+  // The following says we do not know what parameters are allowed so do no
+  // validation
+  // Please change this to state exactly what you do use, even if it is no
+  // parameters
   edm::ParameterSetDescription desc;
   desc.setUnknown();
   descriptions.addDefault(desc);
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(L1Validator);
diff --git a/Validation/L1T/src/L1ValidatorHists.cc b/Validation/L1T/src/L1ValidatorHists.cc
index 480984bd01fe4..8bcc629a478bf 100644
--- a/Validation/L1T/src/L1ValidatorHists.cc
+++ b/Validation/L1T/src/L1ValidatorHists.cc
@@ -12,93 +12,157 @@ TYPE ## _Eff_Eta = new TH2F(#TYPE "_Eff_Eta", #TYPE " Number", 20, -4, 4); \
 TYPE ## _dR = new TH2F(#TYPE "_dR", #TYPE " Number", 20, 0, 1); \
 TYPE ## _dPt = new TH2F(#TYPE "_dPt", #TYPE " Number", 20, -1, 1);
 */
-L1ValidatorHists::L1ValidatorHists(){
-//  Name[0]="IsoEG"; // Run I legacy
-//  Name[1]="NonIsoEG";
-//  Name[2]="CenJet";
-//  Name[3]="ForJet";
-//  Name[4]="TauJet";
-//  Name[5]="Muon";
-  Name[0]="Egamma";
-  Name[1]="Jet";
-  Name[2]="Tau";
-  Name[3]="Muon";
-
+L1ValidatorHists::L1ValidatorHists() {
+  //  Name[0]="IsoEG"; // Run I legacy
+  //  Name[1]="NonIsoEG";
+  //  Name[2]="CenJet";
+  //  Name[3]="ForJet";
+  //  Name[4]="TauJet";
+  //  Name[5]="Muon";
+  Name[0] = "Egamma";
+  Name[1] = "Jet";
+  Name[2] = "Tau";
+  Name[3] = "Muon";
 }
-L1ValidatorHists::~L1ValidatorHists(){}
+L1ValidatorHists::~L1ValidatorHists() {}
 
-void L1ValidatorHists::Book(DQMStore::IBooker &iBooker, std::string dirname){
-  NEvents=0;
+void L1ValidatorHists::Book(DQMStore::IBooker &iBooker, std::string dirname) {
+  NEvents = 0;
 
-  float ptbins[14] = { 0,5,10,15,20,25,30,35, 40, 50, 60, 80, 120, 160}; 
+  float ptbins[14] = {0, 5, 10, 15, 20, 25, 30, 35, 40, 50, 60, 80, 120, 160};
   int Nptbin = 13;
 
   iBooker.setCurrentFolder(dirname + "/numerators_denominators");
-  for(int i=0; i<Type::Number; i++){
-    Eff_Pt_Denom[i] = iBooker.book1D( (Name[i]+"_Eff_Pt_Denom").c_str(), (Name[i]+" Efficiency vs Pt Denom; Gen p_{T} [GeV]; Entries").c_str(), Nptbin, ptbins);
-    Eff_Pt_Nomin[i] = iBooker.book1D( (Name[i]+"_Eff_Pt_Nomin").c_str(), (Name[i]+" Efficiency vs Pt Nomin; Gen p_{T} [GeV]; Entries").c_str(), Nptbin, ptbins);
-    Eff_Eta_Denom[i] = iBooker.book1D( (Name[i]+"_Eff_Eta_Denom").c_str(), (Name[i]+" Efficiency vs #eta Denom; Gen #eta; Entries").c_str(), 80, -4, 4);
-    Eff_Eta_Nomin[i] = iBooker.book1D( (Name[i]+"_Eff_Eta_Nomin").c_str(), (Name[i]+" Efficiency vs #eta Nomin; Gen #eta; Entries").c_str(), 80, -4, 4);
-    TurnOn_15_Denom[i] = iBooker.book1D( (Name[i]+"_TurnOn_15_Denom").c_str(), (Name[i]+" Turn On (15 GeV) Denom; Gen p_{T} [GeV]; Entries").c_str(), Nptbin, ptbins);
-    TurnOn_15_Nomin[i] = iBooker.book1D( (Name[i]+"_TurnOn_15_Nomin").c_str(), (Name[i]+" Turn On (15 GeV) Nomin; Gen p_{T} [GeV]; Entries").c_str(), Nptbin, ptbins);
-    TurnOn_30_Denom[i] = iBooker.book1D( (Name[i]+"_TurnOn_30_Denom").c_str(), (Name[i]+" Turn On (30 GeV) Denom; Gen p_{T} [GeV]; Entries").c_str(), Nptbin, ptbins);
-    TurnOn_30_Nomin[i] = iBooker.book1D( (Name[i]+"_TurnOn_30_Nomin").c_str(), (Name[i]+" Turn On (30 GeV) Nomin; Gen p_{T} [GeV]; Entries").c_str(), Nptbin, ptbins);
+  for (int i = 0; i < Type::Number; i++) {
+    Eff_Pt_Denom[i] = iBooker.book1D((Name[i] + "_Eff_Pt_Denom").c_str(),
+                                     (Name[i] + " Efficiency vs Pt Denom; Gen p_{T} [GeV]; Entries").c_str(),
+                                     Nptbin,
+                                     ptbins);
+    Eff_Pt_Nomin[i] = iBooker.book1D((Name[i] + "_Eff_Pt_Nomin").c_str(),
+                                     (Name[i] + " Efficiency vs Pt Nomin; Gen p_{T} [GeV]; Entries").c_str(),
+                                     Nptbin,
+                                     ptbins);
+    Eff_Eta_Denom[i] = iBooker.book1D((Name[i] + "_Eff_Eta_Denom").c_str(),
+                                      (Name[i] + " Efficiency vs #eta Denom; Gen #eta; Entries").c_str(),
+                                      80,
+                                      -4,
+                                      4);
+    Eff_Eta_Nomin[i] = iBooker.book1D((Name[i] + "_Eff_Eta_Nomin").c_str(),
+                                      (Name[i] + " Efficiency vs #eta Nomin; Gen #eta; Entries").c_str(),
+                                      80,
+                                      -4,
+                                      4);
+    TurnOn_15_Denom[i] = iBooker.book1D((Name[i] + "_TurnOn_15_Denom").c_str(),
+                                        (Name[i] + " Turn On (15 GeV) Denom; Gen p_{T} [GeV]; Entries").c_str(),
+                                        Nptbin,
+                                        ptbins);
+    TurnOn_15_Nomin[i] = iBooker.book1D((Name[i] + "_TurnOn_15_Nomin").c_str(),
+                                        (Name[i] + " Turn On (15 GeV) Nomin; Gen p_{T} [GeV]; Entries").c_str(),
+                                        Nptbin,
+                                        ptbins);
+    TurnOn_30_Denom[i] = iBooker.book1D((Name[i] + "_TurnOn_30_Denom").c_str(),
+                                        (Name[i] + " Turn On (30 GeV) Denom; Gen p_{T} [GeV]; Entries").c_str(),
+                                        Nptbin,
+                                        ptbins);
+    TurnOn_30_Nomin[i] = iBooker.book1D((Name[i] + "_TurnOn_30_Nomin").c_str(),
+                                        (Name[i] + " Turn On (30 GeV) Nomin; Gen p_{T} [GeV]; Entries").c_str(),
+                                        Nptbin,
+                                        ptbins);
   }
 
-
   iBooker.setCurrentFolder(dirname);
-  for(int i=0; i<Type::Number; i++){
-    N[i] = iBooker.book1D( (Name[i]+"_N").c_str(), ("L1 " + Name[i]+" Number with BX=0").c_str(), 16, -0.5, 15.5);
+  for (int i = 0; i < Type::Number; i++) {
+    N[i] = iBooker.book1D((Name[i] + "_N").c_str(), ("L1 " + Name[i] + " Number with BX=0").c_str(), 16, -0.5, 15.5);
 
-    Eff_Pt[i] = iBooker.book1D( (Name[i]+"_Eff_Pt").c_str(), (Name[i]+" Efficiency vs Pt; Gen p_{T} [GeV]; L1T Efficiency").c_str(), Nptbin, ptbins);
+    Eff_Pt[i] = iBooker.book1D((Name[i] + "_Eff_Pt").c_str(),
+                               (Name[i] + " Efficiency vs Pt; Gen p_{T} [GeV]; L1T Efficiency").c_str(),
+                               Nptbin,
+                               ptbins);
     Eff_Pt[i]->setEfficiencyFlag();
-    Eff_Eta[i] = iBooker.book1D( (Name[i]+"_Eff_Eta").c_str(), (Name[i]+" Efficiency vs #eta (Gen p_{T} > 10GeV); Gen #eta; L1T Efficiency").c_str(), 80, -4, 4);
+    Eff_Eta[i] = iBooker.book1D((Name[i] + "_Eff_Eta").c_str(),
+                                (Name[i] + " Efficiency vs #eta (Gen p_{T} > 10GeV); Gen #eta; L1T Efficiency").c_str(),
+                                80,
+                                -4,
+                                4);
     Eff_Eta[i]->setEfficiencyFlag();
-    TurnOn_15[i] = iBooker.book1D( (Name[i]+"_TurnOn_15").c_str(), (Name[i]+" Turn On (15 GeV); Gen p_{T} [GeV]; L1T Efficiency").c_str(), Nptbin, ptbins);
+    TurnOn_15[i] = iBooker.book1D((Name[i] + "_TurnOn_15").c_str(),
+                                  (Name[i] + " Turn On (15 GeV); Gen p_{T} [GeV]; L1T Efficiency").c_str(),
+                                  Nptbin,
+                                  ptbins);
     TurnOn_15[i]->setEfficiencyFlag();
-    TurnOn_30[i] = iBooker.book1D( (Name[i]+"_TurnOn_30").c_str(), (Name[i]+" Turn On (30 GeV); Gen p_{T} [GeV]; L1T Efficiency").c_str(), Nptbin, ptbins);
+    TurnOn_30[i] = iBooker.book1D((Name[i] + "_TurnOn_30").c_str(),
+                                  (Name[i] + " Turn On (30 GeV); Gen p_{T} [GeV]; L1T Efficiency").c_str(),
+                                  Nptbin,
+                                  ptbins);
     TurnOn_30[i]->setEfficiencyFlag();
-    dR[i] = iBooker.book1D( (Name[i]+"_dR").c_str(), (Name[i]+" #DeltaR; #DeltaR(L1 object, Gen object); Entries").c_str(), 40, 0, 1);
-    dR_vs_Pt[i] = iBooker.book2D( (Name[i]+"_dR_vs_Pt").c_str(), (Name[i]+" #DeltaR vs p_{T}; Gen p_{T} [GeV]; #DeltaR(L1 object, Gen object); Entries").c_str(), 12, 0, 120, 40, 0, 1);
-    dPt[i] = iBooker.book1D( (Name[i]+"_dPt").c_str(), (Name[i]+" #Deltap_{T}; (p_{T}^{L1}-p_{T}^{Gen})/p_{T}^{Gen}; Entries").c_str(), 100, -2, 2);
-    dPt_vs_Pt[i] = iBooker.book2D( (Name[i]+"_dPt_vs_Pt").c_str(), (Name[i]+" #Deltap_{T} vs p_{T}; Gen p_{T} [GeV]; (p_{T}^{L1}-p_{T}^{Gen})/p_{T}^{Gen}; Entries").c_str(), 12, 0, 120, 40, -2, 2);
+    dR[i] = iBooker.book1D(
+        (Name[i] + "_dR").c_str(), (Name[i] + " #DeltaR; #DeltaR(L1 object, Gen object); Entries").c_str(), 40, 0, 1);
+    dR_vs_Pt[i] = iBooker.book2D((Name[i] + "_dR_vs_Pt").c_str(),
+                                 (Name[i] + " #DeltaR vs p_{T}; Gen p_{T} [GeV]; "
+                                            "#DeltaR(L1 object, Gen object); Entries")
+                                     .c_str(),
+                                 12,
+                                 0,
+                                 120,
+                                 40,
+                                 0,
+                                 1);
+    dPt[i] = iBooker.book1D((Name[i] + "_dPt").c_str(),
+                            (Name[i] + " #Deltap_{T}; (p_{T}^{L1}-p_{T}^{Gen})/p_{T}^{Gen}; Entries").c_str(),
+                            100,
+                            -2,
+                            2);
+    dPt_vs_Pt[i] = iBooker.book2D((Name[i] + "_dPt_vs_Pt").c_str(),
+                                  (Name[i] + " #Deltap_{T} vs p_{T}; Gen p_{T} [GeV]; "
+                                             "(p_{T}^{L1}-p_{T}^{Gen})/p_{T}^{Gen}; Entries")
+                                      .c_str(),
+                                  12,
+                                  0,
+                                  120,
+                                  40,
+                                  -2,
+                                  2);
   }
-
 }
 
-void L1ValidatorHists::Fill(int i, const reco::LeafCandidate *GenPart, const reco::LeafCandidate *L1Part){
+void L1ValidatorHists::Fill(int i, const reco::LeafCandidate *GenPart, const reco::LeafCandidate *L1Part) {
   double GenPartPt = GenPart->pt();
   // fill the overflow in the last bin
-  if(GenPart->pt()>=160.0) GenPartPt = 159.0;
-  if(L1Part==nullptr) {
-     Eff_Pt_Denom[i]->Fill(GenPartPt);
-     if(GenPart->pt()>10)Eff_Eta_Denom[i]->Fill(GenPart->eta());
-     TurnOn_15_Denom[i]->Fill(GenPartPt);
-     TurnOn_30_Denom[i]->Fill(GenPartPt);
+  if (GenPart->pt() >= 160.0)
+    GenPartPt = 159.0;
+  if (L1Part == nullptr) {
+    Eff_Pt_Denom[i]->Fill(GenPartPt);
+    if (GenPart->pt() > 10)
+      Eff_Eta_Denom[i]->Fill(GenPart->eta());
+    TurnOn_15_Denom[i]->Fill(GenPartPt);
+    TurnOn_30_Denom[i]->Fill(GenPartPt);
   } else {
-     double idR = reco::deltaR(GenPart->eta(), GenPart->phi(), L1Part->eta(), L1Part->phi());
-     bool matched  = idR < 0.15;
-     Eff_Pt_Denom[i]->Fill(GenPartPt);
-     if(GenPart->pt()>10)Eff_Eta_Denom[i]->Fill(GenPart->eta());
-     if(matched)Eff_Pt_Nomin[i]->Fill(GenPartPt);
-     if(matched && GenPart->pt()>10)Eff_Eta_Nomin[i]->Fill(GenPart->eta());
-     TurnOn_15_Denom[i]->Fill(GenPartPt);
-     TurnOn_30_Denom[i]->Fill(GenPartPt);
-     if(L1Part->pt()>15 && matched) TurnOn_15_Nomin[i]->Fill(GenPartPt);
-     if(L1Part->pt()>30 && matched) TurnOn_30_Nomin[i]->Fill(GenPartPt);
-     dR[i]->Fill(idR);
-     dPt[i]->Fill( (L1Part->pt()-GenPart->pt()) / GenPart->pt() );
-     dR_vs_Pt[i]->Fill(GenPart->pt(), idR);
-     dPt_vs_Pt[i]->Fill( GenPart->pt(),  (L1Part->pt()-GenPart->pt()) / GenPart->pt() );
+    double idR = reco::deltaR(GenPart->eta(), GenPart->phi(), L1Part->eta(), L1Part->phi());
+    bool matched = idR < 0.15;
+    Eff_Pt_Denom[i]->Fill(GenPartPt);
+    if (GenPart->pt() > 10)
+      Eff_Eta_Denom[i]->Fill(GenPart->eta());
+    if (matched)
+      Eff_Pt_Nomin[i]->Fill(GenPartPt);
+    if (matched && GenPart->pt() > 10)
+      Eff_Eta_Nomin[i]->Fill(GenPart->eta());
+    TurnOn_15_Denom[i]->Fill(GenPartPt);
+    TurnOn_30_Denom[i]->Fill(GenPartPt);
+    if (L1Part->pt() > 15 && matched)
+      TurnOn_15_Nomin[i]->Fill(GenPartPt);
+    if (L1Part->pt() > 30 && matched)
+      TurnOn_30_Nomin[i]->Fill(GenPartPt);
+    dR[i]->Fill(idR);
+    dPt[i]->Fill((L1Part->pt() - GenPart->pt()) / GenPart->pt());
+    dR_vs_Pt[i]->Fill(GenPart->pt(), idR);
+    dPt_vs_Pt[i]->Fill(GenPart->pt(), (L1Part->pt() - GenPart->pt()) / GenPart->pt());
   }
 }
 
-void L1ValidatorHists::FillNumber(int i, int Number){
-  N[i]->Fill(Number);
-}
+void L1ValidatorHists::FillNumber(int i, int Number) { N[i]->Fill(Number); }
 
-void L1ValidatorHists::Write(){
-  for(int i=0; i<Type::Number; i++){
+void L1ValidatorHists::Write() {
+  for (int i = 0; i < Type::Number; i++) {
     N[i]->getTH1()->Write();
     Eff_Pt[i]->getTH1()->Write();
     Eff_Pt_Denom[i]->getTH1()->Write();
diff --git a/Validation/Mixing/interface/GlobalTest.h b/Validation/Mixing/interface/GlobalTest.h
index 1ac28f8d71338..d322d93427ad8 100644
--- a/Validation/Mixing/interface/GlobalTest.h
+++ b/Validation/Mixing/interface/GlobalTest.h
@@ -13,7 +13,6 @@
 //
 //
 
-
 // system include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 
@@ -30,11 +29,11 @@
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 
-//DQM services for histogram
+// DQM services for histogram
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 class TFile;
 class MonitorElement;
@@ -44,34 +43,32 @@ class MonitorElement;
 //
 
 class GlobalTest : public DQMEDAnalyzer {
- public:
-  explicit GlobalTest(const edm::ParameterSet&);
+public:
+  explicit GlobalTest(const edm::ParameterSet &);
   ~GlobalTest() override;
 
-  void bookHistograms(DQMStore::IBooker &,
-      edm::Run const &, edm::EventSetup const &) override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
- private:
+private:
   std::string filename_;
   int minbunch_;
   int maxbunch_;
   TFile *histfile_;
 
-  const static int nMaxH=10;
-  MonitorElement * nrPileupsH_[nMaxH];
-  MonitorElement * nrVerticesH_[nMaxH];
-  MonitorElement * nrTracksH_[nMaxH];
-  MonitorElement * trackPartIdH_[nMaxH];
-  MonitorElement * caloEnergyEBH_[nMaxH];
-  MonitorElement * caloEnergyEEH_[nMaxH];
-
-  const static int nrHistos=6;
-  char * labels[nrHistos];
-
-  edm::EDGetTokenT<CrossingFrame<SimTrack> > cfTrackToken_;
-  edm::EDGetTokenT<CrossingFrame<SimTrack> > cfVertexToken_;
-  edm::EDGetTokenT<CrossingFrame<PCaloHit> > g4SimHits_EB_Token_;
-  edm::EDGetTokenT<CrossingFrame<PCaloHit> > g4SimHits_EE_Token_;
+  const static int nMaxH = 10;
+  MonitorElement *nrPileupsH_[nMaxH];
+  MonitorElement *nrVerticesH_[nMaxH];
+  MonitorElement *nrTracksH_[nMaxH];
+  MonitorElement *trackPartIdH_[nMaxH];
+  MonitorElement *caloEnergyEBH_[nMaxH];
+  MonitorElement *caloEnergyEEH_[nMaxH];
+
+  const static int nrHistos = 6;
+  char *labels[nrHistos];
+
+  edm::EDGetTokenT<CrossingFrame<SimTrack>> cfTrackToken_;
+  edm::EDGetTokenT<CrossingFrame<SimTrack>> cfVertexToken_;
+  edm::EDGetTokenT<CrossingFrame<PCaloHit>> g4SimHits_EB_Token_;
+  edm::EDGetTokenT<CrossingFrame<PCaloHit>> g4SimHits_EE_Token_;
 };
-
diff --git a/Validation/Mixing/interface/MixCollectionValidation.h b/Validation/Mixing/interface/MixCollectionValidation.h
index b88ec9fc22c9a..0b6ef20e33c87 100644
--- a/Validation/Mixing/interface/MixCollectionValidation.h
+++ b/Validation/Mixing/interface/MixCollectionValidation.h
@@ -7,9 +7,9 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "SimDataFormats/CrossingFrame/interface/CrossingFrame.h"
 #include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
@@ -20,10 +20,10 @@
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 
-//DQM services for histogram
+// DQM services for histogram
+#include <DQMServices/Core/interface/DQMEDAnalyzer.h>
 #include <DQMServices/Core/interface/DQMStore.h>
 #include <DQMServices/Core/interface/MonitorElement.h>
-#include <DQMServices/Core/interface/DQMEDAnalyzer.h>
 
 #include <string>
 
@@ -33,22 +33,25 @@
 
 class MixCollectionValidation : public DQMEDAnalyzer {
 public:
-  explicit MixCollectionValidation(const edm::ParameterSet&);
+  explicit MixCollectionValidation(const edm::ParameterSet &);
   ~MixCollectionValidation() override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
 private:
-  
   edm::ParameterSet mixObjextsSet_;
 
-  template<class T1, class T2> void fillMultiplicity(T1 & theItr_, T2 & theColl_, MonitorElement * theProfile_);
+  template <class T1, class T2>
+  void fillMultiplicity(T1 &theItr_, T2 &theColl_, MonitorElement *theProfile_);
 
-  template<class T1, class T2> void fillGenParticleMulti(T1 & theItr_, T2 & theColl_, MonitorElement * theProfile_);
+  template <class T1, class T2>
+  void fillGenParticleMulti(T1 &theItr_, T2 &theColl_, MonitorElement *theProfile_);
 
-  template<class T1, class T2> void fillSimHitTime(T1 & theItr_, T2 & theColl_, MonitorElement * theProfile_);
+  template <class T1, class T2>
+  void fillSimHitTime(T1 &theItr_, T2 &theColl_, MonitorElement *theProfile_);
 
-  template<class T1, class T2> void fillCaloHitTime(T1 & theItr_, T2 & theColl_, MonitorElement * theProfile_);
+  template <class T1, class T2>
+  void fillCaloHitTime(T1 &theItr_, T2 &theColl_, MonitorElement *theProfile_);
 
   /* N.B. I see vector<InputTag> as private members of this class, but
      in the corresponding C++ only the first element, if present, is
@@ -57,11 +60,11 @@ class MixCollectionValidation : public DQMEDAnalyzer {
      Tokens. For all but PSimHitTags_ and PCaloHitTags_, which have a
      corresponding vector of Tokens. */
 
-  edm::EDGetTokenT<CrossingFrame<edm::HepMCProduct> > crossingFrame_Hep_Token_;
-  edm::EDGetTokenT<CrossingFrame<SimTrack> > crossingFrame_SimTr_Token_;
-  edm::EDGetTokenT<CrossingFrame<SimVertex> > crossingFrame_SimVtx_Token_;
-  std::vector< edm::EDGetTokenT<CrossingFrame<PSimHit> > > crossingFrame_PSimHit_Tokens_;
-  std::vector< edm::EDGetTokenT<CrossingFrame<PCaloHit> > > crossingFrame_PCaloHit_Tokens_;
+  edm::EDGetTokenT<CrossingFrame<edm::HepMCProduct>> crossingFrame_Hep_Token_;
+  edm::EDGetTokenT<CrossingFrame<SimTrack>> crossingFrame_SimTr_Token_;
+  edm::EDGetTokenT<CrossingFrame<SimVertex>> crossingFrame_SimVtx_Token_;
+  std::vector<edm::EDGetTokenT<CrossingFrame<PSimHit>>> crossingFrame_PSimHit_Tokens_;
+  std::vector<edm::EDGetTokenT<CrossingFrame<PCaloHit>>> crossingFrame_PCaloHit_Tokens_;
 
   std::string outputFile_;
   int minbunch_;
@@ -69,15 +72,15 @@ class MixCollectionValidation : public DQMEDAnalyzer {
 
   bool verbose_;
 
-  MonitorElement * nrHepMCProductH_;
-  MonitorElement * nrSimTrackH_;
-  MonitorElement * nrSimVertexH_;
+  MonitorElement *nrHepMCProductH_;
+  MonitorElement *nrSimTrackH_;
+  MonitorElement *nrSimVertexH_;
 
-  std::map<std::string,MonitorElement *> SimHitNrmap_;
-  std::map<std::string,MonitorElement *> SimHitTimemap_;
+  std::map<std::string, MonitorElement *> SimHitNrmap_;
+  std::map<std::string, MonitorElement *> SimHitTimemap_;
 
-  std::map<std::string,MonitorElement *> CaloHitNrmap_;
-  std::map<std::string,MonitorElement *> CaloHitTimemap_;
+  std::map<std::string, MonitorElement *> CaloHitNrmap_;
+  std::map<std::string, MonitorElement *> CaloHitTimemap_;
 
   std::vector<edm::InputTag> HepMCProductTags_;
   std::vector<edm::InputTag> SimTrackTags_;
@@ -86,7 +89,6 @@ class MixCollectionValidation : public DQMEDAnalyzer {
   std::vector<edm::InputTag> PCaloHitTags_;
 
   int nbin_;
-
 };
 
 #endif
diff --git a/Validation/Mixing/interface/TestSuite.h b/Validation/Mixing/interface/TestSuite.h
index 4c4a03f04855f..49d6afe58c9c6 100644
--- a/Validation/Mixing/interface/TestSuite.h
+++ b/Validation/Mixing/interface/TestSuite.h
@@ -13,10 +13,9 @@
 //
 //
 
-
 // system include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -28,12 +27,12 @@
 #include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 
-#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
-//DQM services for histogram
+// DQM services for histogram
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
@@ -44,25 +43,24 @@ class TFile;
 //
 
 class TestSuite : public edm::EDAnalyzer {
- public:
-  explicit TestSuite(const edm::ParameterSet&);
+public:
+  explicit TestSuite(const edm::ParameterSet &);
   ~TestSuite() override;
 
-
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
   void beginJob() override;
   void endJob() override;
 
- private:
+private:
   std::string filename_;
   int bunchcr_;
   int minbunch_;
   int maxbunch_;
-  DQMStore* dbe_;
+  DQMStore *dbe_;
 
-  edm::EDGetTokenT<CrossingFrame<SimTrack> > cfTrackToken_;
-  edm::EDGetTokenT<CrossingFrame<SimTrack> > cfVertexToken_;
-  edm::EDGetTokenT<CrossingFrame<PSimHit> >  g4SimHits_Token_;
-  edm::EDGetTokenT<CrossingFrame<PCaloHit> > g4SimHits_Ecal_Token_;
-  edm::EDGetTokenT<CrossingFrame<PCaloHit> > g4SimHits_HCal_Token_;
+  edm::EDGetTokenT<CrossingFrame<SimTrack>> cfTrackToken_;
+  edm::EDGetTokenT<CrossingFrame<SimTrack>> cfVertexToken_;
+  edm::EDGetTokenT<CrossingFrame<PSimHit>> g4SimHits_Token_;
+  edm::EDGetTokenT<CrossingFrame<PCaloHit>> g4SimHits_Ecal_Token_;
+  edm::EDGetTokenT<CrossingFrame<PCaloHit>> g4SimHits_HCal_Token_;
 };
diff --git a/Validation/Mixing/src/GlobalTest.cc b/Validation/Mixing/src/GlobalTest.cc
index 5627ec14910fb..9cfd41eef0e71 100644
--- a/Validation/Mixing/src/GlobalTest.cc
+++ b/Validation/Mixing/src/GlobalTest.cc
@@ -13,7 +13,6 @@
 //
 //
 
-
 #include "Validation/Mixing/interface/GlobalTest.h"
 
 // system include files
@@ -23,54 +22,45 @@
 #include <string>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "TFile.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "TFile.h"
 
 using namespace edm;
 
-GlobalTest::GlobalTest(const edm::ParameterSet& iConfig):
-    filename_(iConfig.getParameter<std::string>("fileName")),
-    minbunch_(iConfig.getParameter<int>("minBunch")),
-    maxbunch_(iConfig.getParameter<int>("maxBunch")),
-    cfTrackToken_(consumes<CrossingFrame<SimTrack> > (
-        iConfig.getParameter<edm::InputTag>("cfTrackTag"))),
-    cfVertexToken_(consumes<CrossingFrame<SimTrack> >(
-        iConfig.getParameter<edm::InputTag>("cfVertexTag")))
-{
+GlobalTest::GlobalTest(const edm::ParameterSet &iConfig)
+    : filename_(iConfig.getParameter<std::string>("fileName")),
+      minbunch_(iConfig.getParameter<int>("minBunch")),
+      maxbunch_(iConfig.getParameter<int>("maxBunch")),
+      cfTrackToken_(consumes<CrossingFrame<SimTrack>>(iConfig.getParameter<edm::InputTag>("cfTrackTag"))),
+      cfVertexToken_(consumes<CrossingFrame<SimTrack>>(iConfig.getParameter<edm::InputTag>("cfVertexTag"))) {
   std::string ecalsubdetb("");
   std::string ecalsubdete("g4SimHitsEcalHitsEE");
-  g4SimHits_EB_Token_ = consumes<CrossingFrame<PCaloHit> > (
-      edm::InputTag("mix", "g4SimHitsEcalHitsEB"));
-  g4SimHits_EE_Token_ = consumes<CrossingFrame<PCaloHit> > (
-      edm::InputTag("mix", "g4SimHitsEcalHitsEE"));
-
-  std::cout << "Constructed GlobalTest, filename: "
-            << filename_ << " minbunch: "
-            << minbunch_ << ", maxbunch: "
-            << maxbunch_ << std::endl;
+  g4SimHits_EB_Token_ = consumes<CrossingFrame<PCaloHit>>(edm::InputTag("mix", "g4SimHitsEcalHitsEB"));
+  g4SimHits_EE_Token_ = consumes<CrossingFrame<PCaloHit>>(edm::InputTag("mix", "g4SimHitsEcalHitsEE"));
 
+  std::cout << "Constructed GlobalTest, filename: " << filename_ << " minbunch: " << minbunch_
+            << ", maxbunch: " << maxbunch_ << std::endl;
 }
 
-GlobalTest::~GlobalTest()
-{
-  for (int i = 0; i < 6; i++) delete[] labels[i];
+GlobalTest::~GlobalTest() {
+  for (int i = 0; i < 6; i++)
+    delete[] labels[i];
 }
 
-void GlobalTest::bookHistograms(DQMStore::IBooker & ibooker,
-  edm::Run const &, edm::EventSetup const & ){
+void GlobalTest::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &, edm::EventSetup const &) {
   using namespace std;
 
   ibooker.setCurrentFolder("MixingV/Mixing");
-  //book histos
+  // book histos
   std::string NrPileupEvts = "NrPileupEvts";
   size_t NrPileupEvtsSize = NrPileupEvts.size() + 1;
   std::string NrVertices = "NrVertices";
@@ -84,55 +74,52 @@ void GlobalTest::bookHistograms(DQMStore::IBooker & ibooker,
   std::string CaloEnergyEE = "CaloEnergyEE";
   size_t CaloEnergyEESize = CaloEnergyEE.size() + 1;
 
-  labels[0] = new char [NrPileupEvtsSize];
+  labels[0] = new char[NrPileupEvtsSize];
   strncpy(labels[0], NrPileupEvts.c_str(), NrPileupEvtsSize);
-  labels[1] = new char [NrVerticesSize];
+  labels[1] = new char[NrVerticesSize];
   strncpy(labels[1], NrVertices.c_str(), NrVerticesSize);
-  labels[2] = new char [NrTracksSize];
+  labels[2] = new char[NrTracksSize];
   strncpy(labels[2], NrTracks.c_str(), NrTracksSize);
-  labels[3] = new char [TrackPartIdSize];
+  labels[3] = new char[TrackPartIdSize];
   strncpy(labels[3], TrackPartId.c_str(), TrackPartIdSize);
-  labels[4] = new char [CaloEnergyEBSize];
+  labels[4] = new char[CaloEnergyEBSize];
   strncpy(labels[4], CaloEnergyEB.c_str(), CaloEnergyEBSize);
-  labels[5] = new char [CaloEnergyEESize];
+  labels[5] = new char[CaloEnergyEESize];
   strncpy(labels[5], CaloEnergyEE.c_str(), CaloEnergyEESize);
 
-  //FIXME: test for max nr of histos
-  for (int i=minbunch_;i<=maxbunch_;++i) {
-    int ii=i-minbunch_;
+  // FIXME: test for max nr of histos
+  for (int i = minbunch_; i <= maxbunch_; ++i) {
+    int ii = i - minbunch_;
     char label[50];
-    sprintf(label,"%s_%d",labels[0],i);
-    nrPileupsH_[ii]    = ibooker.book1D(label,label,100,0,100);
-    sprintf(label,"%s_%d",labels[1],i);
-    nrVerticesH_[ii]   = ibooker.book1D(label,label,100,0,5000);
-    sprintf(label,"%s_%d",labels[2],i);
-    nrTracksH_[ii]     = ibooker.book1D(label,label,100,0,10000);
-    sprintf(label,"%s_%d",labels[3],i);
-    trackPartIdH_[ii]  =  ibooker.book1D(label,label,100,0,100);
-    sprintf(label,"%s_%d",labels[4],i);
-    caloEnergyEBH_ [ii]  = ibooker.book1D(label,label,100,0.,1000.);
-    sprintf(label,"%s_%d",labels[5],i);
-    caloEnergyEEH_ [ii]  = ibooker.book1D(label,label,100,0.,1000.);
+    sprintf(label, "%s_%d", labels[0], i);
+    nrPileupsH_[ii] = ibooker.book1D(label, label, 100, 0, 100);
+    sprintf(label, "%s_%d", labels[1], i);
+    nrVerticesH_[ii] = ibooker.book1D(label, label, 100, 0, 5000);
+    sprintf(label, "%s_%d", labels[2], i);
+    nrTracksH_[ii] = ibooker.book1D(label, label, 100, 0, 10000);
+    sprintf(label, "%s_%d", labels[3], i);
+    trackPartIdH_[ii] = ibooker.book1D(label, label, 100, 0, 100);
+    sprintf(label, "%s_%d", labels[4], i);
+    caloEnergyEBH_[ii] = ibooker.book1D(label, label, 100, 0., 1000.);
+    sprintf(label, "%s_%d", labels[5], i);
+    caloEnergyEEH_[ii] = ibooker.book1D(label, label, 100, 0., 1000.);
   }
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to analyze the data  ------------
-void
-GlobalTest::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void GlobalTest::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace edm;
   using namespace std;
 
   // Get input
-  edm::Handle<CrossingFrame<SimTrack> > cf_track;
-  edm::Handle<CrossingFrame<SimTrack> > cf_vertex;
-  edm::Handle<CrossingFrame<PCaloHit> > cf_calohitE;
-  edm::Handle<CrossingFrame<PCaloHit> > cf_calohitB;
+  edm::Handle<CrossingFrame<SimTrack>> cf_track;
+  edm::Handle<CrossingFrame<SimTrack>> cf_vertex;
+  edm::Handle<CrossingFrame<PCaloHit>> cf_calohitE;
+  edm::Handle<CrossingFrame<PCaloHit>> cf_calohitB;
   std::string ecalsubdetb("g4SimHitsEcalHitsEB");
   std::string ecalsubdete("g4SimHitsEcalHitsEE");
   iEvent.getByToken(cfTrackToken_, cf_track);
@@ -143,44 +130,43 @@ GlobalTest::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
   // number of events/bcr ??
 
   // number of tracks
-  for (int i=minbunch_;i<=maxbunch_;++i) {
-    nrTracksH_[i-minbunch_]->Fill(cf_track->getNrPileups(i));
+  for (int i = minbunch_; i <= maxbunch_; ++i) {
+    nrTracksH_[i - minbunch_]->Fill(cf_track->getNrPileups(i));
   }
 
   // number of vertices
-  for (int i=minbunch_;i<=maxbunch_;++i) {
-    nrVerticesH_[i-minbunch_]->Fill(cf_vertex->getNrPileups(i));
+  for (int i = minbunch_; i <= maxbunch_; ++i) {
+    nrVerticesH_[i - minbunch_]->Fill(cf_vertex->getNrPileups(i));
   }
 
   // part id for each track
-  std::unique_ptr<MixCollection<SimTrack> > coltr(new MixCollection<SimTrack>(cf_track.product()));
+  std::unique_ptr<MixCollection<SimTrack>> coltr(new MixCollection<SimTrack>(cf_track.product()));
   MixCollection<SimTrack>::iterator cfitr;
-  for (cfitr=coltr->begin(); cfitr!=coltr->end();cfitr++) {
-    trackPartIdH_[cfitr.bunch()-minbunch_]->Fill(cfitr->type());
+  for (cfitr = coltr->begin(); cfitr != coltr->end(); cfitr++) {
+    trackPartIdH_[cfitr.bunch() - minbunch_]->Fill(cfitr->type());
   }
 
   // energy sum
-  double sumE[10]={0.,0.,0.,0.,0.,0.,0.,0.,0.,0.};
-  std::unique_ptr<MixCollection<PCaloHit> > colecalb(new MixCollection<PCaloHit>(cf_calohitB.product()));
+  double sumE[10] = {0., 0., 0., 0., 0., 0., 0., 0., 0., 0.};
+  std::unique_ptr<MixCollection<PCaloHit>> colecalb(new MixCollection<PCaloHit>(cf_calohitB.product()));
   MixCollection<PCaloHit>::iterator cfiecalb;
-  for (cfiecalb=colecalb->begin(); cfiecalb!=colecalb->end();cfiecalb++) {
-    sumE[cfiecalb.bunch()-minbunch_]+=cfiecalb->energy();
+  for (cfiecalb = colecalb->begin(); cfiecalb != colecalb->end(); cfiecalb++) {
+    sumE[cfiecalb.bunch() - minbunch_] += cfiecalb->energy();
     //      if (cfiecal.getTrigger())    tofecalhist_sig->Fill(cfiecal->time());
     //      else    tofecalhist->Fill(cfiecal->time());
   }
-  for (int i=minbunch_;i<=maxbunch_;++i) {
-    caloEnergyEBH_[i-minbunch_]->Fill(sumE[i-minbunch_]);
+  for (int i = minbunch_; i <= maxbunch_; ++i) {
+    caloEnergyEBH_[i - minbunch_]->Fill(sumE[i - minbunch_]);
   }
-  double sumEE[10]={0.,0.,0.,0.,0.,0.,0.,0.,0.,0.};
-  std::unique_ptr<MixCollection<PCaloHit> > colecale(new MixCollection<PCaloHit>(cf_calohitE.product()));
+  double sumEE[10] = {0., 0., 0., 0., 0., 0., 0., 0., 0., 0.};
+  std::unique_ptr<MixCollection<PCaloHit>> colecale(new MixCollection<PCaloHit>(cf_calohitE.product()));
   MixCollection<PCaloHit>::iterator cfiecale;
-  for (cfiecale=colecale->begin(); cfiecale!=colecale->end();cfiecale++) {
-    sumEE[cfiecale.bunch()-minbunch_]+=cfiecale->energy();
+  for (cfiecale = colecale->begin(); cfiecale != colecale->end(); cfiecale++) {
+    sumEE[cfiecale.bunch() - minbunch_] += cfiecale->energy();
     //      if (cfiecal.getTrigger())    tofecalhist_sig->Fill(cfiecal->time());
     //      else    tofecalhist->Fill(cfiecal->time());
   }
-  for (int i=minbunch_;i<=maxbunch_;++i) {
-    caloEnergyEEH_[i-minbunch_]->Fill(sumEE[i-minbunch_]);
+  for (int i = minbunch_; i <= maxbunch_; ++i) {
+    caloEnergyEEH_[i - minbunch_]->Fill(sumEE[i - minbunch_]);
   }
 }
-
diff --git a/Validation/Mixing/src/MixCollectionValidation.cc b/Validation/Mixing/src/MixCollectionValidation.cc
index e9005b1dd37f1..622644a24e934 100644
--- a/Validation/Mixing/src/MixCollectionValidation.cc
+++ b/Validation/Mixing/src/MixCollectionValidation.cc
@@ -2,187 +2,171 @@
 #include "Validation/Mixing/interface/MixCollectionValidation.h"
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
-#include "TFile.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "TFile.h"
 
 #include <memory>
 #include <utility>
 
 using namespace edm;
 
-MixCollectionValidation::MixCollectionValidation(const edm::ParameterSet& iConfig):
-  minbunch_(iConfig.getParameter<int>("minBunch")),
-  maxbunch_(iConfig.getParameter<int>("maxBunch")),
-  verbose_(iConfig.getUntrackedParameter<bool>("verbose",false)),
-  nbin_(maxbunch_-minbunch_+1)
-{
+MixCollectionValidation::MixCollectionValidation(const edm::ParameterSet &iConfig)
+    : minbunch_(iConfig.getParameter<int>("minBunch")),
+      maxbunch_(iConfig.getParameter<int>("maxBunch")),
+      verbose_(iConfig.getUntrackedParameter<bool>("verbose", false)),
+      nbin_(maxbunch_ - minbunch_ + 1) {
   // Histograms will be defined according to the configuration
   ParameterSet mixObjextsSet_ = iConfig.getParameter<ParameterSet>("mixObjects");
 }
 
-MixCollectionValidation::~MixCollectionValidation()
-{
+MixCollectionValidation::~MixCollectionValidation() {
   // do anything here that needs to be done at desctruction time
   // (e.g. close files, deallocate resources etc.)
 }
 
-void MixCollectionValidation::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const & iRun, edm::EventSetup const & /* iSetup */)
-{
+void MixCollectionValidation::bookHistograms(DQMStore::IBooker &iBooker,
+                                             edm::Run const &iRun,
+                                             edm::EventSetup const & /* iSetup */) {
   iBooker.setCurrentFolder("MixingV/Mixing");
 
   std::vector<std::string> names = mixObjextsSet_.getParameterNames();
 
-  for (std::vector<std::string>::iterator it = names.begin();it!= names.end();++it)
-  {
+  for (std::vector<std::string>::iterator it = names.begin(); it != names.end(); ++it) {
     ParameterSet pset = mixObjextsSet_.getParameter<ParameterSet>((*it));
-    if (!pset.exists("type"))  continue; //to allow replacement by empty pset
+    if (!pset.exists("type"))
+      continue;  // to allow replacement by empty pset
     std::string object = pset.getParameter<std::string>("type");
-    std::vector<InputTag> tags = pset.getParameter<std::vector<InputTag> >("input");
-
-    if ( object == "HepMCProduct" ) {
+    std::vector<InputTag> tags = pset.getParameter<std::vector<InputTag>>("input");
 
+    if (object == "HepMCProduct") {
       std::string title = "Log10 Number of GenParticle in " + object;
       std::string name = "NumberOf" + object;
-      nrHepMCProductH_ = iBooker.bookProfile(name,title,nbin_,minbunch_,maxbunch_+1,40,0.,40.);
+      nrHepMCProductH_ = iBooker.bookProfile(name, title, nbin_, minbunch_, maxbunch_ + 1, 40, 0., 40.);
 
       HepMCProductTags_ = tags;
       if (!HepMCProductTags_.empty()) {
-        crossingFrame_Hep_Token_ = consumes<CrossingFrame<HepMCProduct> >(
-            edm::InputTag("mix", HepMCProductTags_[0].label()));
+        crossingFrame_Hep_Token_ =
+            consumes<CrossingFrame<HepMCProduct>>(edm::InputTag("mix", HepMCProductTags_[0].label()));
       }
-    }
-    else if ( object == "SimTrack" ) {
-
+    } else if (object == "SimTrack") {
       std::string title = "Log10 Number of " + object;
       std::string name = "NumberOf" + object;
-      nrSimTrackH_ = iBooker.bookProfile(name,title,nbin_,minbunch_,maxbunch_+1,40,0.,40.);
+      nrSimTrackH_ = iBooker.bookProfile(name, title, nbin_, minbunch_, maxbunch_ + 1, 40, 0., 40.);
 
       SimTrackTags_ = tags;
       if (!SimTrackTags_.empty()) {
-        crossingFrame_SimTr_Token_ = consumes<CrossingFrame<SimTrack> >(
-            edm::InputTag("mix", SimTrackTags_[0].label()));
+        crossingFrame_SimTr_Token_ = consumes<CrossingFrame<SimTrack>>(edm::InputTag("mix", SimTrackTags_[0].label()));
       }
-    }
-    else if ( object == "SimVertex" )  {
-
+    } else if (object == "SimVertex") {
       std::string title = "Log10 Number of " + object;
       std::string name = "NumberOf" + object;
-      nrSimVertexH_ = iBooker.bookProfile(name,title,nbin_,minbunch_,maxbunch_+1,40,0.,40.);
+      nrSimVertexH_ = iBooker.bookProfile(name, title, nbin_, minbunch_, maxbunch_ + 1, 40, 0., 40.);
 
       SimVertexTags_ = tags;
       if (!SimVertexTags_.empty()) {
-        crossingFrame_SimVtx_Token_ = consumes<CrossingFrame<SimVertex> >(
-            edm::InputTag("mix", SimVertexTags_[0].label()));
+        crossingFrame_SimVtx_Token_ =
+            consumes<CrossingFrame<SimVertex>>(edm::InputTag("mix", SimVertexTags_[0].label()));
       }
-    }
-    else if ( object == "PSimHit" ) {
-      std::vector<std::string> subdets=pset.getParameter<std::vector<std::string> >("subdets");
-      for (unsigned int ii=0;ii<subdets.size();ii++) {
-
+    } else if (object == "PSimHit") {
+      std::vector<std::string> subdets = pset.getParameter<std::vector<std::string>>("subdets");
+      for (unsigned int ii = 0; ii < subdets.size(); ii++) {
         std::string title = "Log10 Number of " + subdets[ii];
         std::string name = "NumberOf" + subdets[ii];
-        SimHitNrmap_[subdets[ii]] = iBooker.bookProfile(name,title,nbin_,minbunch_,maxbunch_+1,40,0.,40.);
+        SimHitNrmap_[subdets[ii]] = iBooker.bookProfile(name, title, nbin_, minbunch_, maxbunch_ + 1, 40, 0., 40.);
 
         title = "Time of " + subdets[ii];
         name = "TimeOf" + subdets[ii];
-        SimHitTimemap_[subdets[ii]] = iBooker.bookProfile(name,title,nbin_,minbunch_,maxbunch_+1,40,-125.,375.);
-
+        SimHitTimemap_[subdets[ii]] =
+            iBooker.bookProfile(name, title, nbin_, minbunch_, maxbunch_ + 1, 40, -125., 375.);
       }
 
       PSimHitTags_ = tags;
-      for (auto const & it : PSimHitTags_)
-        crossingFrame_PSimHit_Tokens_.push_back(consumes<CrossingFrame<PSimHit> >(
-            edm::InputTag("mix", it.label() + it.instance())));
-    }
-    else if ( object == "PCaloHit" ) {
-      std::vector<std::string> subdets=pset.getParameter<std::vector<std::string> >("subdets");
-      for (unsigned int ii=0;ii<subdets.size();ii++) {
-
+      for (auto const &it : PSimHitTags_)
+        crossingFrame_PSimHit_Tokens_.push_back(
+            consumes<CrossingFrame<PSimHit>>(edm::InputTag("mix", it.label() + it.instance())));
+    } else if (object == "PCaloHit") {
+      std::vector<std::string> subdets = pset.getParameter<std::vector<std::string>>("subdets");
+      for (unsigned int ii = 0; ii < subdets.size(); ii++) {
         std::string title = "Log10 Number of " + subdets[ii];
         std::string name = "NumberOf" + subdets[ii];
-        CaloHitNrmap_[subdets[ii]] = iBooker.bookProfile(name,title,nbin_,minbunch_,maxbunch_+1,40,0.,40.);
+        CaloHitNrmap_[subdets[ii]] = iBooker.bookProfile(name, title, nbin_, minbunch_, maxbunch_ + 1, 40, 0., 40.);
 
         title = "Time of " + subdets[ii];
         name = "TimeOf" + subdets[ii];
-        CaloHitTimemap_[subdets[ii]] = iBooker.bookProfile(name,title,nbin_,minbunch_,maxbunch_+1,40,-125.,375.);
-
+        CaloHitTimemap_[subdets[ii]] =
+            iBooker.bookProfile(name, title, nbin_, minbunch_, maxbunch_ + 1, 40, -125., 375.);
       }
 
       PCaloHitTags_ = tags;
-      for (auto const & it : PCaloHitTags_)
-        crossingFrame_PCaloHit_Tokens_.push_back(consumes<CrossingFrame<PCaloHit> >(
-            edm::InputTag("mix", it.label() + it.instance())));
+      for (auto const &it : PCaloHitTags_)
+        crossingFrame_PCaloHit_Tokens_.push_back(
+            consumes<CrossingFrame<PCaloHit>>(edm::InputTag("mix", it.label() + it.instance())));
     }
   }
 }
 
-void MixCollectionValidation::analyze(const edm::Event& iEvent, const edm::EventSetup& iConfig)
-{
+void MixCollectionValidation::analyze(const edm::Event &iEvent, const edm::EventSetup &iConfig) {
   using namespace edm;
 
-  if ( !HepMCProductTags_.empty() ) {
+  if (!HepMCProductTags_.empty()) {
     bool gotHepMCProduct;
-    edm::Handle<CrossingFrame<HepMCProduct> > crossingFrame;
+    edm::Handle<CrossingFrame<HepMCProduct>> crossingFrame;
     gotHepMCProduct = iEvent.getByToken(crossingFrame_Hep_Token_, crossingFrame);
 
-    if (gotHepMCProduct){
-      std::unique_ptr<MixCollection<HepMCProduct> >
-          hepMCProduct (new MixCollection<HepMCProduct>(crossingFrame.product ()));
+    if (gotHepMCProduct) {
+      std::unique_ptr<MixCollection<HepMCProduct>> hepMCProduct(
+          new MixCollection<HepMCProduct>(crossingFrame.product()));
       MixCollection<HepMCProduct>::MixItr hitItr;
 
       fillGenParticleMulti(hitItr, hepMCProduct, nrHepMCProductH_);
     }
   }
 
-  if ( !SimTrackTags_.empty() ) {
+  if (!SimTrackTags_.empty()) {
     bool gotSimTrack;
-    edm::Handle<CrossingFrame<SimTrack> > crossingFrame;
-    gotSimTrack = iEvent.getByToken(crossingFrame_SimTr_Token_,crossingFrame);
+    edm::Handle<CrossingFrame<SimTrack>> crossingFrame;
+    gotSimTrack = iEvent.getByToken(crossingFrame_SimTr_Token_, crossingFrame);
 
-    if (gotSimTrack){
-      std::unique_ptr<MixCollection<SimTrack> >
-          simTracks (new MixCollection<SimTrack>(crossingFrame.product ()));
+    if (gotSimTrack) {
+      std::unique_ptr<MixCollection<SimTrack>> simTracks(new MixCollection<SimTrack>(crossingFrame.product()));
       MixCollection<SimTrack>::MixItr hitItr;
 
       fillMultiplicity(hitItr, simTracks, nrSimTrackH_);
     }
   }
 
-  if ( !SimVertexTags_.empty() ) {
+  if (!SimVertexTags_.empty()) {
     bool gotSimVertex;
-    edm::Handle<CrossingFrame<SimVertex> > crossingFrame;
+    edm::Handle<CrossingFrame<SimVertex>> crossingFrame;
     std::string SimVertexLabel = SimVertexTags_[0].label();
     gotSimVertex = iEvent.getByToken(crossingFrame_SimVtx_Token_, crossingFrame);
 
-    if (gotSimVertex){
-      std::unique_ptr<MixCollection<SimVertex> >
-          simVerteces (new MixCollection<SimVertex>(crossingFrame.product ()));
+    if (gotSimVertex) {
+      std::unique_ptr<MixCollection<SimVertex>> simVerteces(new MixCollection<SimVertex>(crossingFrame.product()));
       MixCollection<SimVertex>::MixItr hitItr;
 
       fillMultiplicity(hitItr, simVerteces, nrSimVertexH_);
     }
   }
 
-  if ( !PSimHitTags_.empty() ) {
+  if (!PSimHitTags_.empty()) {
+    edm::Handle<CrossingFrame<PSimHit>> crossingFrame;
 
-    edm::Handle<CrossingFrame<PSimHit> > crossingFrame;
-
-    for ( int i = 0; i < (int)PSimHitTags_.size(); i++ ) {
+    for (int i = 0; i < (int)PSimHitTags_.size(); i++) {
       bool gotPSimHit;
       gotPSimHit = iEvent.getByToken(crossingFrame_PSimHit_Tokens_[i], crossingFrame);
 
-      if (gotPSimHit){
-        std::unique_ptr<MixCollection<PSimHit> >
-            simHits (new MixCollection<PSimHit>(crossingFrame.product ()));
+      if (gotPSimHit) {
+        std::unique_ptr<MixCollection<PSimHit>> simHits(new MixCollection<PSimHit>(crossingFrame.product()));
 
         MixCollection<PSimHit>::MixItr hitItr;
 
@@ -193,18 +177,16 @@ void MixCollectionValidation::analyze(const edm::Event& iEvent, const edm::Event
     }
   }
 
-  if ( !PCaloHitTags_.empty() ) {
-
-    edm::Handle<CrossingFrame<PCaloHit> > crossingFrame;
+  if (!PCaloHitTags_.empty()) {
+    edm::Handle<CrossingFrame<PCaloHit>> crossingFrame;
 
-    for ( int i = 0; i < (int)PCaloHitTags_.size(); i++ ) {
+    for (int i = 0; i < (int)PCaloHitTags_.size(); i++) {
       bool gotPCaloHit;
-      std::string PCaloHitLabel = PCaloHitTags_[i].label()+PCaloHitTags_[i].instance();
+      std::string PCaloHitLabel = PCaloHitTags_[i].label() + PCaloHitTags_[i].instance();
       gotPCaloHit = iEvent.getByToken(crossingFrame_PCaloHit_Tokens_[i], crossingFrame);
 
-      if (gotPCaloHit){
-        std::unique_ptr<MixCollection<PCaloHit> >
-            caloHits (new MixCollection<PCaloHit>(crossingFrame.product ()));
+      if (gotPCaloHit) {
+        std::unique_ptr<MixCollection<PCaloHit>> caloHits(new MixCollection<PCaloHit>(crossingFrame.product()));
 
         MixCollection<PCaloHit>::MixItr hitItr;
 
@@ -214,70 +196,70 @@ void MixCollectionValidation::analyze(const edm::Event& iEvent, const edm::Event
       }
     }
   }
-
 }
 
-template<class T1, class T2> void MixCollectionValidation::fillMultiplicity(T1 & theItr_, T2 & theColl_, MonitorElement * theProfile_) {
-
+template <class T1, class T2>
+void MixCollectionValidation::fillMultiplicity(T1 &theItr_, T2 &theColl_, MonitorElement *theProfile_) {
   std::vector<int> theMult(nbin_);
 
-  for ( theItr_ = theColl_->begin() ; theItr_ != theColl_->end() ; ++theItr_) {
-
+  for (theItr_ = theColl_->begin(); theItr_ != theColl_->end(); ++theItr_) {
     int bunch = (*theItr_).eventId().bunchCrossing();
     int index = bunch - minbunch_;
-    if ( index >= 0 && index < nbin_ ) { theMult[index] += 1; }
-    else { edm::LogWarning("MixCollectionValidation") << "fillMultiplicity: bunch number " << bunch << " out of range"; }
-
+    if (index >= 0 && index < nbin_) {
+      theMult[index] += 1;
+    } else {
+      edm::LogWarning("MixCollectionValidation") << "fillMultiplicity: bunch number " << bunch << " out of range";
+    }
   }
 
-  for ( int i = 0; i < nbin_; i++ ) {
-    theProfile_->Fill(float(i+minbunch_+0.5),std::log10(std::max(float(0.1),float(theMult[i]))));
+  for (int i = 0; i < nbin_; i++) {
+    theProfile_->Fill(float(i + minbunch_ + 0.5), std::log10(std::max(float(0.1), float(theMult[i]))));
   }
 }
 
-
-template<class T1, class T2> void MixCollectionValidation::fillGenParticleMulti(T1 & theItr_, T2 & theColl_, MonitorElement * theProfile_) {
-
+template <class T1, class T2>
+void MixCollectionValidation::fillGenParticleMulti(T1 &theItr_, T2 &theColl_, MonitorElement *theProfile_) {
   std::vector<int> theMult(nbin_);
 
-  for ( theItr_ = theColl_->begin() ; theItr_ != theColl_->end() ; ++theItr_) {
-
+  for (theItr_ = theColl_->begin(); theItr_ != theColl_->end(); ++theItr_) {
     int bunch = theItr_.bunch();
     int index = bunch - minbunch_;
-    if ( index >= 0 && index < nbin_ ) { theMult[index] += (*theItr_).GetEvent()->particles_size(); }
-    else { edm::LogWarning("MixCollectionValidation") << "fillMultiplicity: bunch number " << bunch << " out of range"; }
-
+    if (index >= 0 && index < nbin_) {
+      theMult[index] += (*theItr_).GetEvent()->particles_size();
+    } else {
+      edm::LogWarning("MixCollectionValidation") << "fillMultiplicity: bunch number " << bunch << " out of range";
+    }
   }
 
-  for ( int i = 0; i < nbin_; i++ ) {
-    theProfile_->Fill(float(i+minbunch_+0.5),std::log10(std::max(float(0.1),float(theMult[i]))));
+  for (int i = 0; i < nbin_; i++) {
+    theProfile_->Fill(float(i + minbunch_ + 0.5), std::log10(std::max(float(0.1), float(theMult[i]))));
   }
 }
 
-template<class T1, class T2> void MixCollectionValidation::fillSimHitTime(T1 & theItr_, T2 & theColl_, MonitorElement * theProfile_) {
-
-  for ( theItr_ = theColl_->begin() ; theItr_ != theColl_->end() ; ++theItr_) {
-
+template <class T1, class T2>
+void MixCollectionValidation::fillSimHitTime(T1 &theItr_, T2 &theColl_, MonitorElement *theProfile_) {
+  for (theItr_ = theColl_->begin(); theItr_ != theColl_->end(); ++theItr_) {
     int bunch = (*theItr_).eventId().bunchCrossing();
     float time = (*theItr_).timeOfFlight();
     int index = bunch - minbunch_;
-    if ( index >= 0 && index < nbin_ ) { theProfile_->Fill(float(bunch+0.5),time); }
-    else { edm::LogWarning("MixCollectionValidation") << "fillSimHitTime: bunch number " << bunch << " out of range"; }
-
+    if (index >= 0 && index < nbin_) {
+      theProfile_->Fill(float(bunch + 0.5), time);
+    } else {
+      edm::LogWarning("MixCollectionValidation") << "fillSimHitTime: bunch number " << bunch << " out of range";
+    }
   }
-
 }
 
-template<class T1, class T2> void MixCollectionValidation::fillCaloHitTime(T1 & theItr_, T2 & theColl_, MonitorElement * theProfile_) {
-
-  for ( theItr_ = theColl_->begin() ; theItr_ != theColl_->end() ; ++theItr_) {
-
+template <class T1, class T2>
+void MixCollectionValidation::fillCaloHitTime(T1 &theItr_, T2 &theColl_, MonitorElement *theProfile_) {
+  for (theItr_ = theColl_->begin(); theItr_ != theColl_->end(); ++theItr_) {
     int bunch = (*theItr_).eventId().bunchCrossing();
     float time = (*theItr_).time();
     int index = bunch - minbunch_;
-    if ( index >= 0 && index < nbin_ ) { theProfile_->Fill(float(bunch+0.5),time); }
-    else { edm::LogWarning("MixCollectionValidation") << "fillCaloHitTime: bunch number " << bunch << " out of range"; }
-
+    if (index >= 0 && index < nbin_) {
+      theProfile_->Fill(float(bunch + 0.5), time);
+    } else {
+      edm::LogWarning("MixCollectionValidation") << "fillCaloHitTime: bunch number " << bunch << " out of range";
+    }
   }
-
 }
diff --git a/Validation/Mixing/src/SealModule.cc b/Validation/Mixing/src/SealModule.cc
index 3f63aca3560d5..576fdaf441456 100644
--- a/Validation/Mixing/src/SealModule.cc
+++ b/Validation/Mixing/src/SealModule.cc
@@ -3,12 +3,10 @@
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "Validation/Mixing/interface/TestSuite.h"
 #include "Validation/Mixing/interface/GlobalTest.h"
 #include "Validation/Mixing/interface/MixCollectionValidation.h"
-
+#include "Validation/Mixing/interface/TestSuite.h"
 
 DEFINE_FWK_MODULE(TestSuite);
 DEFINE_FWK_MODULE(GlobalTest);
 DEFINE_FWK_MODULE(MixCollectionValidation);
-
diff --git a/Validation/Mixing/src/TestSuite.cc b/Validation/Mixing/src/TestSuite.cc
index 90aacf2406af8..cc00e611ce337 100644
--- a/Validation/Mixing/src/TestSuite.cc
+++ b/Validation/Mixing/src/TestSuite.cc
@@ -21,38 +21,32 @@
 
 // user include files
 
-#include "TFile.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "TFile.h"
 
 using namespace edm;
 
-TestSuite::TestSuite(const edm::ParameterSet& iConfig): filename_(iConfig.getParameter<std::string>("fileName")), bunchcr_(iConfig.getParameter<int>("BunchNr")), minbunch_(iConfig.getParameter<int>("minBunch")),maxbunch_(iConfig.getParameter<int>("maxBunch")),  dbe_(nullptr),
-                                                        cfTrackToken_(consumes<CrossingFrame<SimTrack> > (
-                                                            iConfig.getParameter<edm::InputTag>("cfTrackTag"))),
-                                                        cfVertexToken_(consumes<CrossingFrame<SimTrack> > (
-                                                            iConfig.getParameter<edm::InputTag>("cfVertexTag"))),
-                                                        g4SimHits_Token_(consumes<CrossingFrame<PSimHit> > (
-                                                            edm::InputTag("mix", "g4SimHitsTrackerHitsTECLowTof"))),
-                                                        g4SimHits_Ecal_Token_(consumes<CrossingFrame<PCaloHit> > (
-                                                            edm::InputTag("mix", "g4SimHitsEcalHitsEB"))),
-                                                        g4SimHits_HCal_Token_(consumes<CrossingFrame<PCaloHit> > (
-                                                            edm::InputTag("mix", "g4SimHitsHcalHits")))
-{
-  std::cout << "Constructed testSuite , bunchcr " << bunchcr_
-            << " filename: " << filename_ << std::endl;
+TestSuite::TestSuite(const edm::ParameterSet &iConfig)
+    : filename_(iConfig.getParameter<std::string>("fileName")),
+      bunchcr_(iConfig.getParameter<int>("BunchNr")),
+      minbunch_(iConfig.getParameter<int>("minBunch")),
+      maxbunch_(iConfig.getParameter<int>("maxBunch")),
+      dbe_(nullptr),
+      cfTrackToken_(consumes<CrossingFrame<SimTrack>>(iConfig.getParameter<edm::InputTag>("cfTrackTag"))),
+      cfVertexToken_(consumes<CrossingFrame<SimTrack>>(iConfig.getParameter<edm::InputTag>("cfVertexTag"))),
+      g4SimHits_Token_(consumes<CrossingFrame<PSimHit>>(edm::InputTag("mix", "g4SimHitsTrackerHitsTECLowTof"))),
+      g4SimHits_Ecal_Token_(consumes<CrossingFrame<PCaloHit>>(edm::InputTag("mix", "g4SimHitsEcalHitsEB"))),
+      g4SimHits_HCal_Token_(consumes<CrossingFrame<PCaloHit>>(edm::InputTag("mix", "g4SimHitsHcalHits"))) {
+  std::cout << "Constructed testSuite , bunchcr " << bunchcr_ << " filename: " << filename_ << std::endl;
 }
 
-
-TestSuite::~TestSuite()
-{
-
+TestSuite::~TestSuite() {
   // do anything here that needs to be done at desctruction time
   // (e.g. close files, deallocate resources etc.)
 }
 
 void TestSuite::beginJob() {
-
   // get hold of back-end interface
   dbe_ = Service<DQMStore>().operator->();
   dbe_->showDirStructure();
@@ -60,23 +54,20 @@ void TestSuite::beginJob() {
 }
 
 void TestSuite::endJob() {
-  if (!filename_.empty() && dbe_ ) dbe_->save(filename_);
+  if (!filename_.empty() && dbe_)
+    dbe_->save(filename_);
 }
 
-
-
 // ------------ method called to analyze the data  ------------
-void
-TestSuite::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void TestSuite::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   using namespace edm;
 
   // Get input
-  edm::Handle<CrossingFrame<SimTrack> > cf_track;
-  edm::Handle<CrossingFrame<SimVertex> > cf_vertex;
-  edm::Handle<CrossingFrame<PSimHit> > cf_simhit;
-  edm::Handle<CrossingFrame<PCaloHit> > cf_calohitEcal;
-  edm::Handle<CrossingFrame<PCaloHit> > cf_calohitHcal;
+  edm::Handle<CrossingFrame<SimTrack>> cf_track;
+  edm::Handle<CrossingFrame<SimVertex>> cf_vertex;
+  edm::Handle<CrossingFrame<PSimHit>> cf_simhit;
+  edm::Handle<CrossingFrame<PCaloHit>> cf_calohitEcal;
+  edm::Handle<CrossingFrame<PCaloHit>> cf_calohitHcal;
   std::string subdetTracker("g4SimHitsTrackerHitsTECLowTof");
   std::string ecalsubdet("g4SimHitsEcalHitsEB");
   std::string hcalsubdet("g4SimHitsHcalHits");
@@ -87,23 +78,25 @@ TestSuite::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
   iEvent.getByToken(g4SimHits_HCal_Token_, cf_calohitHcal);
 
   // use MixCollection and its iterator
-  // Please note that bunch() and getTrigger() are methods of the iterator itself
-  // while operator-> points to the templated objects!!!!
-
-  //track histo
-  char histotracks[30],sighistotracks[30],histotracksindsig[30],histotracksind[30];
-  sprintf(histotracks,"Tracks_bcr_%d",bunchcr_);
-  sprintf(sighistotracks,"SignalTracks_bcr_%d",bunchcr_);
-  sprintf(histotracksind,"VtxPointers_%d",bunchcr_);
-  sprintf(histotracksindsig,"VtxPointers_signal_%d",bunchcr_);
-  MonitorElement * trhist = dbe_->book1D(histotracks,"Bunchcrossings",maxbunch_-minbunch_+1,minbunch_,maxbunch_+1);
-  MonitorElement * trhistsig = dbe_->book1D(sighistotracks,"Bunchcrossings",maxbunch_-minbunch_+1,minbunch_,maxbunch_+1);
-  MonitorElement * trindhist = dbe_->book1D(histotracksind,"Track to Vertex indices",100,0,500);
-  MonitorElement * trindhistsig = dbe_->book1D(histotracksindsig,"Signal Track to Vertex indices",100,0,500);
-  std::unique_ptr<MixCollection<SimTrack> > col1(new MixCollection<SimTrack>(cf_track.product()));
+  // Please note that bunch() and getTrigger() are methods of the iterator
+  // itself while operator-> points to the templated objects!!!!
+
+  // track histo
+  char histotracks[30], sighistotracks[30], histotracksindsig[30], histotracksind[30];
+  sprintf(histotracks, "Tracks_bcr_%d", bunchcr_);
+  sprintf(sighistotracks, "SignalTracks_bcr_%d", bunchcr_);
+  sprintf(histotracksind, "VtxPointers_%d", bunchcr_);
+  sprintf(histotracksindsig, "VtxPointers_signal_%d", bunchcr_);
+  MonitorElement *trhist =
+      dbe_->book1D(histotracks, "Bunchcrossings", maxbunch_ - minbunch_ + 1, minbunch_, maxbunch_ + 1);
+  MonitorElement *trhistsig =
+      dbe_->book1D(sighistotracks, "Bunchcrossings", maxbunch_ - minbunch_ + 1, minbunch_, maxbunch_ + 1);
+  MonitorElement *trindhist = dbe_->book1D(histotracksind, "Track to Vertex indices", 100, 0, 500);
+  MonitorElement *trindhistsig = dbe_->book1D(histotracksindsig, "Signal Track to Vertex indices", 100, 0, 500);
+  std::unique_ptr<MixCollection<SimTrack>> col1(new MixCollection<SimTrack>(cf_track.product()));
   MixCollection<SimTrack>::iterator cfi1;
-  for (cfi1=col1->begin(); cfi1!=col1->end();cfi1++) {
-    if (cfi1.getTrigger()==0) {
+  for (cfi1 = col1->begin(); cfi1 != col1->end(); cfi1++) {
+    if (cfi1.getTrigger() == 0) {
       trhist->Fill(cfi1.bunch());
       trindhist->Fill(cfi1->vertIndex());
     } else {
@@ -112,73 +105,84 @@ TestSuite::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
     }
   }
 
-
-  //vertex histo
-  char histovertices[30], sighistovertices[30],histovertexindices[30],histovertexindicessig[30];
-  sprintf(histovertices,"Vertices_bcr_%d",bunchcr_);
-  sprintf(sighistovertices,"SignalVertices_bcr_%d",bunchcr_);
-  sprintf(histovertexindices,"TrackPointers_%d",bunchcr_);
-  sprintf(histovertexindicessig,"TrackPointers_signal_%d",bunchcr_);
-  MonitorElement * vtxhist = dbe_->book1D(histovertices,"Bunchcrossings",maxbunch_-minbunch_+1,minbunch_,maxbunch_+1);
-  MonitorElement * vtxhistsig = dbe_->book1D(sighistovertices,"Bunchcrossings",maxbunch_-minbunch_+1,minbunch_,maxbunch_+1);
-  MonitorElement * vtxindhist = dbe_->book1D(histovertexindices,"Vertex to Track Indices",100,0,300);
-  MonitorElement * vtxindhistsig = dbe_->book1D(histovertexindicessig,"Signal Vertex to Track Indices",100,0,300);
-  std::unique_ptr<MixCollection<SimVertex> > col2(new MixCollection<SimVertex>(cf_vertex.product()));
+  // vertex histo
+  char histovertices[30], sighistovertices[30], histovertexindices[30], histovertexindicessig[30];
+  sprintf(histovertices, "Vertices_bcr_%d", bunchcr_);
+  sprintf(sighistovertices, "SignalVertices_bcr_%d", bunchcr_);
+  sprintf(histovertexindices, "TrackPointers_%d", bunchcr_);
+  sprintf(histovertexindicessig, "TrackPointers_signal_%d", bunchcr_);
+  MonitorElement *vtxhist =
+      dbe_->book1D(histovertices, "Bunchcrossings", maxbunch_ - minbunch_ + 1, minbunch_, maxbunch_ + 1);
+  MonitorElement *vtxhistsig =
+      dbe_->book1D(sighistovertices, "Bunchcrossings", maxbunch_ - minbunch_ + 1, minbunch_, maxbunch_ + 1);
+  MonitorElement *vtxindhist = dbe_->book1D(histovertexindices, "Vertex to Track Indices", 100, 0, 300);
+  MonitorElement *vtxindhistsig = dbe_->book1D(histovertexindicessig, "Signal Vertex to Track Indices", 100, 0, 300);
+  std::unique_ptr<MixCollection<SimVertex>> col2(new MixCollection<SimVertex>(cf_vertex.product()));
   MixCollection<SimVertex>::iterator cfi2;
-  for (cfi2=col2->begin(); cfi2!=col2->end();cfi2++) {
-    if (cfi2.getTrigger()==0) {
+  for (cfi2 = col2->begin(); cfi2 != col2->end(); cfi2++) {
+    if (cfi2.getTrigger() == 0) {
       vtxhist->Fill(cfi2.bunch());
-      if (!cfi2->noParent()) 	vtxindhist->Fill(cfi2->parentIndex());
+      if (!cfi2->noParent())
+        vtxindhist->Fill(cfi2->parentIndex());
     } else {
       vtxhistsig->Fill(cfi2.bunch());
-      if (!cfi2->noParent()) 	vtxindhistsig->Fill(cfi2->parentIndex());
+      if (!cfi2->noParent())
+        vtxindhistsig->Fill(cfi2->parentIndex());
     }
   }
 
-  //tracker
-  int bsp=cf_simhit->getBunchSpace();
+  // tracker
+  int bsp = cf_simhit->getBunchSpace();
   char tof[30];
 
-  sprintf(tof,"TrackerHit_Tof_bcr_%d",bunchcr_);
-  MonitorElement * tofhist = dbe_->book1D(tof,"TrackerHit_ToF",100,float(bsp*minbunch_),float(bsp*maxbunch_)+50.);
-  sprintf(tof,"SignalTrackerHit_Tof_bcr_%d",bunchcr_);
-  MonitorElement * tofhist_sig = dbe_->book1D(tof,"TrackerHit_ToF",100,float(bsp*minbunch_),float(bsp*maxbunch_)+50.);
-  std::unique_ptr<MixCollection<PSimHit> > colsh(new MixCollection<PSimHit>(cf_simhit.product()));
+  sprintf(tof, "TrackerHit_Tof_bcr_%d", bunchcr_);
+  MonitorElement *tofhist =
+      dbe_->book1D(tof, "TrackerHit_ToF", 100, float(bsp * minbunch_), float(bsp * maxbunch_) + 50.);
+  sprintf(tof, "SignalTrackerHit_Tof_bcr_%d", bunchcr_);
+  MonitorElement *tofhist_sig =
+      dbe_->book1D(tof, "TrackerHit_ToF", 100, float(bsp * minbunch_), float(bsp * maxbunch_) + 50.);
+  std::unique_ptr<MixCollection<PSimHit>> colsh(new MixCollection<PSimHit>(cf_simhit.product()));
   MixCollection<PSimHit>::iterator cfish;
-  for (cfish=colsh->begin(); cfish!=colsh->end();cfish++) {
-    if (cfish.getTrigger())  {
+  for (cfish = colsh->begin(); cfish != colsh->end(); cfish++) {
+    if (cfish.getTrigger()) {
       tofhist_sig->Fill(cfish->timeOfFlight());
-    }
-    else  {
+    } else {
       tofhist->Fill(cfish->timeOfFlight());
     }
   }
 
-  //Ecal
-  sprintf(tof,"EcalEBHit_Tof_bcr_%d",bunchcr_);
-  MonitorElement * tofecalhist = dbe_->book1D(tof,"EcalEBHit_ToF",100,float(bsp*minbunch_),float(bsp*maxbunch_)+50.);
-  sprintf(tof,"SignalEcalEBHit_Tof_bcr_%d",bunchcr_);
-  MonitorElement * tofecalhist_sig = dbe_->book1D(tof,"EcalEBHit_ToF",100,float(bsp*minbunch_),float(bsp*maxbunch_)+50.);
+  // Ecal
+  sprintf(tof, "EcalEBHit_Tof_bcr_%d", bunchcr_);
+  MonitorElement *tofecalhist =
+      dbe_->book1D(tof, "EcalEBHit_ToF", 100, float(bsp * minbunch_), float(bsp * maxbunch_) + 50.);
+  sprintf(tof, "SignalEcalEBHit_Tof_bcr_%d", bunchcr_);
+  MonitorElement *tofecalhist_sig =
+      dbe_->book1D(tof, "EcalEBHit_ToF", 100, float(bsp * minbunch_), float(bsp * maxbunch_) + 50.);
   //    std::string ecalsubdet("EcalHitsEB");
-  std::unique_ptr<MixCollection<PCaloHit> > colecal(new MixCollection<PCaloHit>(cf_calohitEcal.product()));
+  std::unique_ptr<MixCollection<PCaloHit>> colecal(new MixCollection<PCaloHit>(cf_calohitEcal.product()));
   MixCollection<PCaloHit>::iterator cfiecal;
-  for (cfiecal=colecal->begin(); cfiecal!=colecal->end();cfiecal++) {
-    if (cfiecal.getTrigger())    tofecalhist_sig->Fill(cfiecal->time());
-    else    tofecalhist->Fill(cfiecal->time());
+  for (cfiecal = colecal->begin(); cfiecal != colecal->end(); cfiecal++) {
+    if (cfiecal.getTrigger())
+      tofecalhist_sig->Fill(cfiecal->time());
+    else
+      tofecalhist->Fill(cfiecal->time());
   }
 
   // Hcal
-  sprintf(tof,"HcalHit_Tof_bcr_%d",bunchcr_);
-  MonitorElement * tofhcalhist = dbe_->book1D(tof,"HcalHit_ToF",100,float(bsp*minbunch_),float(bsp*maxbunch_)+50.);
-  sprintf(tof,"SignalHcalHit_Tof_bcr_%d",bunchcr_);
-  MonitorElement * tofhcalhist_sig = dbe_->book1D(tof,"HcalHit_ToF",100,float(bsp*minbunch_),float(bsp*maxbunch_)+50.);
+  sprintf(tof, "HcalHit_Tof_bcr_%d", bunchcr_);
+  MonitorElement *tofhcalhist =
+      dbe_->book1D(tof, "HcalHit_ToF", 100, float(bsp * minbunch_), float(bsp * maxbunch_) + 50.);
+  sprintf(tof, "SignalHcalHit_Tof_bcr_%d", bunchcr_);
+  MonitorElement *tofhcalhist_sig =
+      dbe_->book1D(tof, "HcalHit_ToF", 100, float(bsp * minbunch_), float(bsp * maxbunch_) + 50.);
   //    std::string hcalsubdet("HcalHits");
-  std::unique_ptr<MixCollection<PCaloHit> > colhcal(new MixCollection<PCaloHit>(cf_calohitHcal.product()));
+  std::unique_ptr<MixCollection<PCaloHit>> colhcal(new MixCollection<PCaloHit>(cf_calohitHcal.product()));
   MixCollection<PCaloHit>::iterator cfihcal;
 
-  for (cfihcal=colhcal->begin(); cfihcal!=colhcal->end();cfihcal++) {
-    if (cfihcal.getTrigger())  tofhcalhist_sig->Fill(cfihcal->time());
-    else  tofhcalhist->Fill(cfihcal->time());
+  for (cfihcal = colhcal->begin(); cfihcal != colhcal->end(); cfihcal++) {
+    if (cfihcal.getTrigger())
+      tofhcalhist_sig->Fill(cfihcal->time());
+    else
+      tofhcalhist->Fill(cfihcal->time());
   }
 }
-
diff --git a/Validation/MuonCSCDigis/interface/CSCBaseValidation.h b/Validation/MuonCSCDigis/interface/CSCBaseValidation.h
index 62bd8253fec92..f6df75f5ef2a0 100644
--- a/Validation/MuonCSCDigis/interface/CSCBaseValidation.h
+++ b/Validation/MuonCSCDigis/interface/CSCBaseValidation.h
@@ -3,30 +3,28 @@
 
 // user include files
 
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
-#include "SimMuon/MCTruth/interface/PSimHitMap.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
-
+#include "SimMuon/MCTruth/interface/PSimHitMap.h"
 
 class CSCBaseValidation {
 public:
-  CSCBaseValidation(const edm::InputTag & inputTag);
+  CSCBaseValidation(const edm::InputTag &inputTag);
   virtual ~CSCBaseValidation() {}
-  void setGeometry(const CSCGeometry * geom) {theCSCGeometry = geom;}
-  void setSimHitMap(const  PSimHitMap * simHitMap) {theSimHitMap = simHitMap;}
-  virtual void analyze(const edm::Event&e, const edm::EventSetup& eventSetup) = 0;
+  void setGeometry(const CSCGeometry *geom) { theCSCGeometry = geom; }
+  void setSimHitMap(const PSimHitMap *simHitMap) { theSimHitMap = simHitMap; }
+  virtual void analyze(const edm::Event &e, const edm::EventSetup &eventSetup) = 0;
 
 protected:
-  const CSCLayer * findLayer(int detId) const;
+  const CSCLayer *findLayer(int detId) const;
   edm::InputTag theInputTag;
-  const PSimHitMap * theSimHitMap;
-  const CSCGeometry * theCSCGeometry;
+  const PSimHitMap *theSimHitMap;
+  const CSCGeometry *theCSCGeometry;
 };
 
 #endif
-
diff --git a/Validation/MuonCSCDigis/plugins/Module.cc b/Validation/MuonCSCDigis/plugins/Module.cc
index c9bb845328bf3..52aa57d5c4180 100644
--- a/Validation/MuonCSCDigis/plugins/Module.cc
+++ b/Validation/MuonCSCDigis/plugins/Module.cc
@@ -1,8 +1,5 @@
-#include "Validation/MuonCSCDigis/src/CSCDigiValidation.h"
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "Validation/MuonCSCDigis/src/CSCDigiValidation.h"
 
-
-DEFINE_FWK_MODULE (CSCDigiValidation) ;
-
-
+DEFINE_FWK_MODULE(CSCDigiValidation);
diff --git a/Validation/MuonCSCDigis/src/CSCALCTDigiValidation.cc b/Validation/MuonCSCDigis/src/CSCALCTDigiValidation.cc
index 61b90341542ae..eab2a8a07c1b8 100644
--- a/Validation/MuonCSCDigis/src/CSCALCTDigiValidation.cc
+++ b/Validation/MuonCSCDigis/src/CSCALCTDigiValidation.cc
@@ -1,39 +1,30 @@
-#include "Validation/MuonCSCDigis/src/CSCALCTDigiValidation.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "Validation/MuonCSCDigis/src/CSCALCTDigiValidation.h"
 
-#include "Geometry/CSCGeometry/interface/CSCLayerGeometry.h"
-#include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "Geometry/CSCGeometry/interface/CSCGeometry.h"
+#include "Geometry/CSCGeometry/interface/CSCLayerGeometry.h"
 
-CSCALCTDigiValidation::CSCALCTDigiValidation(const edm::InputTag & inputTag,
-                                             edm::ConsumesCollector && iC):
-  CSCBaseValidation(inputTag),
-  theTimeBinPlots(),
-  theNDigisPerLayerPlots()
-{
-  alcts_Token_ = iC.consumes<CSCALCTDigiCollection> (inputTag);
+CSCALCTDigiValidation::CSCALCTDigiValidation(const edm::InputTag &inputTag, edm::ConsumesCollector &&iC)
+    : CSCBaseValidation(inputTag), theTimeBinPlots(), theNDigisPerLayerPlots() {
+  alcts_Token_ = iC.consumes<CSCALCTDigiCollection>(inputTag);
 }
 
-CSCALCTDigiValidation::~CSCALCTDigiValidation()
-{
-}
+CSCALCTDigiValidation::~CSCALCTDigiValidation() {}
 
-void CSCALCTDigiValidation::bookHistograms(DQMStore::IBooker & iBooker)
-{
+void CSCALCTDigiValidation::bookHistograms(DQMStore::IBooker &iBooker) {
   theNDigisPerEventPlot = iBooker.book1D("CSCALCTDigisPerEvent", "CSC ALCT Digis per event", 100, 0, 100);
-  for(int i = 0; i < 10; ++i)
-  {
+  for (int i = 0; i < 10; ++i) {
     char title1[200], title2[200];
-    sprintf(title1, "CSCALCTDigiTimeType%d", i+1);
-    sprintf(title2, "CSCALCTDigisPerLayerType%d", i+1);
+    sprintf(title1, "CSCALCTDigiTimeType%d", i + 1);
+    sprintf(title2, "CSCALCTDigisPerLayerType%d", i + 1);
     theTimeBinPlots[i] = iBooker.book1D(title1, title1, 20, 0, 20);
     theNDigisPerLayerPlots[i] = iBooker.book1D(title2, title2, 100, 0, 20);
   }
 }
 
-void CSCALCTDigiValidation::analyze(const edm::Event&e, const edm::EventSetup&)
-{
+void CSCALCTDigiValidation::analyze(const edm::Event &e, const edm::EventSetup &) {
   edm::Handle<CSCALCTDigiCollection> alcts;
 
   e.getByToken(alcts_Token_, alcts);
@@ -42,19 +33,17 @@ void CSCALCTDigiValidation::analyze(const edm::Event&e, const edm::EventSetup&)
   }
   unsigned nDigisPerEvent = 0;
 
-  for (CSCALCTDigiCollection::DigiRangeIterator j=alcts->begin(); j!=alcts->end(); j++) {
+  for (CSCALCTDigiCollection::DigiRangeIterator j = alcts->begin(); j != alcts->end(); j++) {
     std::vector<CSCALCTDigi>::const_iterator beginDigi = (*j).second.first;
     std::vector<CSCALCTDigi>::const_iterator endDigi = (*j).second.second;
     CSCDetId detId((*j).first.rawId());
     int chamberType = detId.iChamberType();
-    int nDigis = endDigi-beginDigi;
+    int nDigis = endDigi - beginDigi;
     nDigisPerEvent += nDigis;
-    theNDigisPerLayerPlots[chamberType-1]->Fill(nDigis);
+    theNDigisPerLayerPlots[chamberType - 1]->Fill(nDigis);
 
-    for( std::vector<CSCALCTDigi>::const_iterator digiItr = beginDigi;
-         digiItr != endDigi; ++digiItr)
-    {
-      theTimeBinPlots[chamberType-1]->Fill(digiItr->getBX());
+    for (std::vector<CSCALCTDigi>::const_iterator digiItr = beginDigi; digiItr != endDigi; ++digiItr) {
+      theTimeBinPlots[chamberType - 1]->Fill(digiItr->getBX());
     }
   }
 }
diff --git a/Validation/MuonCSCDigis/src/CSCALCTDigiValidation.h b/Validation/MuonCSCDigis/src/CSCALCTDigiValidation.h
index 58f37d3e25903..115bf2a9da894 100644
--- a/Validation/MuonCSCDigis/src/CSCALCTDigiValidation.h
+++ b/Validation/MuonCSCDigis/src/CSCALCTDigiValidation.h
@@ -3,27 +3,25 @@
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/CSCDigi/interface/CSCALCTDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCALCTDigiCollection.h"
 #include "Validation/MuonCSCDigis/interface/CSCBaseValidation.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 
-class CSCALCTDigiValidation : public CSCBaseValidation
-{
+class CSCALCTDigiValidation : public CSCBaseValidation {
 public:
-  CSCALCTDigiValidation(const edm::InputTag & inputTag,
-                        edm::ConsumesCollector && iC);
+  CSCALCTDigiValidation(const edm::InputTag &inputTag, edm::ConsumesCollector &&iC);
   ~CSCALCTDigiValidation() override;
   void bookHistograms(DQMStore::IBooker &);
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
 private:
   edm::EDGetTokenT<CSCALCTDigiCollection> alcts_Token_;
 
-  MonitorElement* theTimeBinPlots[10];
-  MonitorElement* theNDigisPerLayerPlots[10];
-  MonitorElement* theNDigisPerEventPlot;
+  MonitorElement *theTimeBinPlots[10];
+  MonitorElement *theNDigisPerLayerPlots[10];
+  MonitorElement *theNDigisPerEventPlot;
 };
 
 #endif
diff --git a/Validation/MuonCSCDigis/src/CSCBaseValidation.cc b/Validation/MuonCSCDigis/src/CSCBaseValidation.cc
index 1b5180ed32da9..39f996d4beadb 100644
--- a/Validation/MuonCSCDigis/src/CSCBaseValidation.cc
+++ b/Validation/MuonCSCDigis/src/CSCBaseValidation.cc
@@ -1,15 +1,11 @@
-#include "Validation/MuonCSCDigis/interface/CSCBaseValidation.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "Validation/MuonCSCDigis/interface/CSCBaseValidation.h"
 
-CSCBaseValidation::CSCBaseValidation(const edm::InputTag & inputTag)
-: theInputTag(inputTag),
-  theSimHitMap(nullptr),
-  theCSCGeometry(nullptr)
-{
-}
+CSCBaseValidation::CSCBaseValidation(const edm::InputTag &inputTag)
+    : theInputTag(inputTag), theSimHitMap(nullptr), theCSCGeometry(nullptr) {}
 
-const CSCLayer * CSCBaseValidation::findLayer(int detId) const {
+const CSCLayer *CSCBaseValidation::findLayer(int detId) const {
   assert(theCSCGeometry != nullptr);
-  const GeomDetUnit* detUnit = theCSCGeometry->idToDetUnit(CSCDetId(detId));
+  const GeomDetUnit *detUnit = theCSCGeometry->idToDetUnit(CSCDetId(detId));
   return dynamic_cast<const CSCLayer *>(detUnit);
 }
diff --git a/Validation/MuonCSCDigis/src/CSCCLCTDigiValidation.cc b/Validation/MuonCSCDigis/src/CSCCLCTDigiValidation.cc
index 58fe8be071294..915dfc58307e1 100644
--- a/Validation/MuonCSCDigis/src/CSCCLCTDigiValidation.cc
+++ b/Validation/MuonCSCDigis/src/CSCCLCTDigiValidation.cc
@@ -1,39 +1,30 @@
-#include "Validation/MuonCSCDigis/src/CSCCLCTDigiValidation.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "Validation/MuonCSCDigis/src/CSCCLCTDigiValidation.h"
 
-#include "Geometry/CSCGeometry/interface/CSCLayerGeometry.h"
-#include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "Geometry/CSCGeometry/interface/CSCGeometry.h"
+#include "Geometry/CSCGeometry/interface/CSCLayerGeometry.h"
 
-CSCCLCTDigiValidation::CSCCLCTDigiValidation(const edm::InputTag & inputTag,
-                                             edm::ConsumesCollector && iC):
-  CSCBaseValidation(inputTag),
-  theTimeBinPlots(),
-  theNDigisPerLayerPlots()
-{
-  clcts_Token_ = iC.consumes<CSCCLCTDigiCollection> (inputTag);
+CSCCLCTDigiValidation::CSCCLCTDigiValidation(const edm::InputTag &inputTag, edm::ConsumesCollector &&iC)
+    : CSCBaseValidation(inputTag), theTimeBinPlots(), theNDigisPerLayerPlots() {
+  clcts_Token_ = iC.consumes<CSCCLCTDigiCollection>(inputTag);
 }
 
-CSCCLCTDigiValidation::~CSCCLCTDigiValidation()
-{
-}
+CSCCLCTDigiValidation::~CSCCLCTDigiValidation() {}
 
-void CSCCLCTDigiValidation::bookHistograms(DQMStore::IBooker & iBooker)
-{
+void CSCCLCTDigiValidation::bookHistograms(DQMStore::IBooker &iBooker) {
   theNDigisPerEventPlot = iBooker.book1D("CSCCLCTDigisPerEvent", "CSC CLCT Digis per event", 100, 0, 100);
-  for(int i = 0; i < 10; ++i)
-  {
+  for (int i = 0; i < 10; ++i) {
     char title1[200], title2[200];
-    sprintf(title1, "CSCCLCTDigiTimeType%d", i+1);
-    sprintf(title2, "CSCCLCTDigisPerLayerType%d", i+1);
+    sprintf(title1, "CSCCLCTDigiTimeType%d", i + 1);
+    sprintf(title2, "CSCCLCTDigisPerLayerType%d", i + 1);
     theTimeBinPlots[i] = iBooker.book1D(title1, title1, 20, 0, 20);
     theNDigisPerLayerPlots[i] = iBooker.book1D(title2, title2, 100, 0, 20);
   }
 }
 
-void CSCCLCTDigiValidation::analyze(const edm::Event&e, const edm::EventSetup&)
-{
+void CSCCLCTDigiValidation::analyze(const edm::Event &e, const edm::EventSetup &) {
   edm::Handle<CSCCLCTDigiCollection> clcts;
 
   e.getByToken(clcts_Token_, clcts);
@@ -43,21 +34,18 @@ void CSCCLCTDigiValidation::analyze(const edm::Event&e, const edm::EventSetup&)
 
   unsigned nDigisPerEvent = 0;
 
-  for (CSCCLCTDigiCollection::DigiRangeIterator j=clcts->begin(); j!=clcts->end(); j++) {
+  for (CSCCLCTDigiCollection::DigiRangeIterator j = clcts->begin(); j != clcts->end(); j++) {
     std::vector<CSCCLCTDigi>::const_iterator beginDigi = (*j).second.first;
     std::vector<CSCCLCTDigi>::const_iterator endDigi = (*j).second.second;
     CSCDetId detId((*j).first.rawId());
     int chamberType = detId.iChamberType();
 
-    int nDigis = endDigi-beginDigi;
+    int nDigis = endDigi - beginDigi;
     nDigisPerEvent += nDigis;
-    theNDigisPerLayerPlots[chamberType-1]->Fill(nDigis);
+    theNDigisPerLayerPlots[chamberType - 1]->Fill(nDigis);
 
-    for( std::vector<CSCCLCTDigi>::const_iterator digiItr = beginDigi;
-         digiItr != endDigi; ++digiItr)
-    {
-      theTimeBinPlots[chamberType-1]->Fill(digiItr->getBX());
+    for (std::vector<CSCCLCTDigi>::const_iterator digiItr = beginDigi; digiItr != endDigi; ++digiItr) {
+      theTimeBinPlots[chamberType - 1]->Fill(digiItr->getBX());
     }
-
   }
 }
diff --git a/Validation/MuonCSCDigis/src/CSCCLCTDigiValidation.h b/Validation/MuonCSCDigis/src/CSCCLCTDigiValidation.h
index 59a7e9765de6f..671e2f38a29be 100644
--- a/Validation/MuonCSCDigis/src/CSCCLCTDigiValidation.h
+++ b/Validation/MuonCSCDigis/src/CSCCLCTDigiValidation.h
@@ -3,28 +3,25 @@
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/CSCDigi/interface/CSCCLCTDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCCLCTDigiCollection.h"
 #include "Validation/MuonCSCDigis/interface/CSCBaseValidation.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 
-class CSCCLCTDigiValidation : public CSCBaseValidation
-{
+class CSCCLCTDigiValidation : public CSCBaseValidation {
 public:
-  CSCCLCTDigiValidation(const edm::InputTag & inputTag,
-                        edm::ConsumesCollector && iC);
+  CSCCLCTDigiValidation(const edm::InputTag &inputTag, edm::ConsumesCollector &&iC);
   ~CSCCLCTDigiValidation() override;
   void bookHistograms(DQMStore::IBooker &);
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
 private:
   edm::EDGetTokenT<CSCCLCTDigiCollection> clcts_Token_;
 
-  MonitorElement* theTimeBinPlots[10];
-  MonitorElement* theNDigisPerLayerPlots[10];
-  MonitorElement* theNDigisPerEventPlot;
+  MonitorElement *theTimeBinPlots[10];
+  MonitorElement *theNDigisPerLayerPlots[10];
+  MonitorElement *theNDigisPerEventPlot;
 };
 
 #endif
-
diff --git a/Validation/MuonCSCDigis/src/CSCComparatorDigiValidation.cc b/Validation/MuonCSCDigis/src/CSCComparatorDigiValidation.cc
index b75d0e2fa5937..8d8c8f65c96d8 100644
--- a/Validation/MuonCSCDigis/src/CSCComparatorDigiValidation.cc
+++ b/Validation/MuonCSCDigis/src/CSCComparatorDigiValidation.cc
@@ -1,37 +1,30 @@
-#include "Validation/MuonCSCDigis/src/CSCComparatorDigiValidation.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-
+#include "Validation/MuonCSCDigis/src/CSCComparatorDigiValidation.h"
 
-CSCComparatorDigiValidation::CSCComparatorDigiValidation(
-    const edm::InputTag & inputTag,
-    const edm::InputTag & stripDigiInputTag,
-    edm::ConsumesCollector && iC):
-  CSCBaseValidation(inputTag),
-  theStripDigi_Token_(iC.consumes<CSCStripDigiCollection>(stripDigiInputTag)),
-  theTimeBinPlots(),
-  theNDigisPerLayerPlots(),
-  theStripDigiPlots(),
-  the3StripPlots()
-{
+CSCComparatorDigiValidation::CSCComparatorDigiValidation(const edm::InputTag &inputTag,
+                                                         const edm::InputTag &stripDigiInputTag,
+                                                         edm::ConsumesCollector &&iC)
+    : CSCBaseValidation(inputTag),
+      theStripDigi_Token_(iC.consumes<CSCStripDigiCollection>(stripDigiInputTag)),
+      theTimeBinPlots(),
+      theNDigisPerLayerPlots(),
+      theStripDigiPlots(),
+      the3StripPlots() {
   comparators_Token_ = iC.consumes<CSCComparatorDigiCollection>(inputTag);
 }
 
-CSCComparatorDigiValidation::~CSCComparatorDigiValidation()
-{
-}
+CSCComparatorDigiValidation::~CSCComparatorDigiValidation() {}
 
-void CSCComparatorDigiValidation::bookHistograms(DQMStore::IBooker & iBooker)
-{
+void CSCComparatorDigiValidation::bookHistograms(DQMStore::IBooker &iBooker) {
   theNDigisPerEventPlot = iBooker.book1D("CSCComparatorDigisPerEvent", "CSC Comparator Digis per event", 100, 0, 100);
-  for(int i = 0; i < 10; ++i)
-  {
+  for (int i = 0; i < 10; ++i) {
     char title1[200], title2[200], title3[200], title4[200];
-    sprintf(title1, "CSCComparatorDigiTimeType%d", i+1);
-    sprintf(title2, "CSCComparatorDigisPerLayerType%d", i+1);
-    sprintf(title3, "CSCComparatorStripAmplitudeType%d", i+1);
-    sprintf(title4, "CSCComparator3StripAmplitudeType%d", i+1);
+    sprintf(title1, "CSCComparatorDigiTimeType%d", i + 1);
+    sprintf(title2, "CSCComparatorDigisPerLayerType%d", i + 1);
+    sprintf(title3, "CSCComparatorStripAmplitudeType%d", i + 1);
+    sprintf(title4, "CSCComparator3StripAmplitudeType%d", i + 1);
     theTimeBinPlots[i] = iBooker.book1D(title1, title1, 9, 0, 8);
     theNDigisPerLayerPlots[i] = iBooker.book1D(title2, title2, 100, 0, 20);
     theStripDigiPlots[i] = iBooker.book1D(title3, title3, 100, 0, 1000);
@@ -39,8 +32,7 @@ void CSCComparatorDigiValidation::bookHistograms(DQMStore::IBooker & iBooker)
   }
 }
 
-void CSCComparatorDigiValidation::analyze(const edm::Event&e, const edm::EventSetup&)
-{
+void CSCComparatorDigiValidation::analyze(const edm::Event &e, const edm::EventSetup &) {
   edm::Handle<CSCComparatorDigiCollection> comparators;
   edm::Handle<CSCStripDigiCollection> stripDigis;
 
@@ -55,50 +47,43 @@ void CSCComparatorDigiValidation::analyze(const edm::Event&e, const edm::EventSe
 
   unsigned nDigisPerEvent = 0;
 
-  for (CSCComparatorDigiCollection::DigiRangeIterator j=comparators->begin(); j!=comparators->end(); j++) {
+  for (CSCComparatorDigiCollection::DigiRangeIterator j = comparators->begin(); j != comparators->end(); j++) {
     std::vector<CSCComparatorDigi>::const_iterator digiItr = (*j).second.first;
     std::vector<CSCComparatorDigi>::const_iterator last = (*j).second.second;
 
     CSCDetId detId((*j).first);
-    const CSCLayer * layer = findLayer(detId.rawId());
+    const CSCLayer *layer = findLayer(detId.rawId());
     int chamberType = layer->chamber()->specs()->chamberType();
 
     CSCStripDigiCollection::Range stripRange = stripDigis->get(detId);
 
-    theNDigisPerLayerPlots[chamberType-1]->Fill(last-digiItr);
+    theNDigisPerLayerPlots[chamberType - 1]->Fill(last - digiItr);
 
-    for( ; digiItr != last; ++digiItr) {
+    for (; digiItr != last; ++digiItr) {
       ++nDigisPerEvent;
-      theTimeBinPlots[chamberType-1]->Fill(digiItr->getTimeBin());
+      theTimeBinPlots[chamberType - 1]->Fill(digiItr->getTimeBin());
 
       int strip = digiItr->getStrip();
-      for(std::vector<CSCStripDigi>::const_iterator stripItr = stripRange.first;
-          stripItr != stripRange.second; ++stripItr)
-      {
-        if(stripItr->getStrip() == strip)
-        {
+      for (std::vector<CSCStripDigi>::const_iterator stripItr = stripRange.first; stripItr != stripRange.second;
+           ++stripItr) {
+        if (stripItr->getStrip() == strip) {
           std::vector<int> adc = stripItr->getADCCounts();
-          float pedc = 0.5*(adc[0]+adc[1]);
+          float pedc = 0.5 * (adc[0] + adc[1]);
           float amp = adc[4] - pedc;
-          theStripDigiPlots[chamberType-1]->Fill(amp);
+          theStripDigiPlots[chamberType - 1]->Fill(amp);
           // check neighbors
-          if(stripItr != stripRange.first && stripItr != stripRange.second-1)
-          {
-            std::vector<int> adcl = (stripItr-1)->getADCCounts();
-            std::vector<int> adcr = (stripItr+1)->getADCCounts();
-            float pedl = 0.5*(adcl[0]+adcl[1]);
-            float pedr = 0.5*(adcr[0]+adcr[1]);
-            float three = adcl[4]-pedl
-                        + adcr[4]-pedr
-                        + amp;
-            the3StripPlots[chamberType-1]->Fill(three);
+          if (stripItr != stripRange.first && stripItr != stripRange.second - 1) {
+            std::vector<int> adcl = (stripItr - 1)->getADCCounts();
+            std::vector<int> adcr = (stripItr + 1)->getADCCounts();
+            float pedl = 0.5 * (adcl[0] + adcl[1]);
+            float pedr = 0.5 * (adcr[0] + adcr[1]);
+            float three = adcl[4] - pedl + adcr[4] - pedr + amp;
+            the3StripPlots[chamberType - 1]->Fill(three);
           }
         }
       }
     }
-
   }
 
   theNDigisPerEventPlot->Fill(nDigisPerEvent);
 }
-
diff --git a/Validation/MuonCSCDigis/src/CSCComparatorDigiValidation.h b/Validation/MuonCSCDigis/src/CSCComparatorDigiValidation.h
index 1f1f9fc417295..3859f1c2b80d5 100644
--- a/Validation/MuonCSCDigis/src/CSCComparatorDigiValidation.h
+++ b/Validation/MuonCSCDigis/src/CSCComparatorDigiValidation.h
@@ -6,30 +6,29 @@
 #include "DataFormats/CSCDigi/interface/CSCComparatorDigiCollection.h"
 #include "DataFormats/CSCDigi/interface/CSCStripDigiCollection.h"
 
-#include "Validation/MuonCSCDigis/interface/CSCBaseValidation.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "Validation/MuonCSCDigis/interface/CSCBaseValidation.h"
 
-class CSCComparatorDigiValidation : public CSCBaseValidation
-{
+class CSCComparatorDigiValidation : public CSCBaseValidation {
 public:
-  CSCComparatorDigiValidation(const edm::InputTag & inputTag,
-                              const edm::InputTag & stripDigiInputTag,
-                              edm::ConsumesCollector && iC);
+  CSCComparatorDigiValidation(const edm::InputTag &inputTag,
+                              const edm::InputTag &stripDigiInputTag,
+                              edm::ConsumesCollector &&iC);
   ~CSCComparatorDigiValidation() override;
   void bookHistograms(DQMStore::IBooker &);
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
- private:
+private:
   edm::EDGetTokenT<CSCStripDigiCollection> theStripDigi_Token_;
   edm::EDGetTokenT<CSCComparatorDigiCollection> comparators_Token_;
 
-  MonitorElement* theTimeBinPlots[10];
-  MonitorElement* theNDigisPerLayerPlots[10];
-  MonitorElement* theStripDigiPlots[10];
-  MonitorElement* the3StripPlots[10];
+  MonitorElement *theTimeBinPlots[10];
+  MonitorElement *theNDigisPerLayerPlots[10];
+  MonitorElement *theStripDigiPlots[10];
+  MonitorElement *the3StripPlots[10];
 
-  MonitorElement* theNDigisPerEventPlot;
+  MonitorElement *theNDigisPerEventPlot;
 };
 
 #endif
diff --git a/Validation/MuonCSCDigis/src/CSCDigiValidation.cc b/Validation/MuonCSCDigis/src/CSCDigiValidation.cc
index 7c1e9343c6375..d3b527e6fcb5a 100644
--- a/Validation/MuonCSCDigis/src/CSCDigiValidation.cc
+++ b/Validation/MuonCSCDigis/src/CSCDigiValidation.cc
@@ -1,49 +1,43 @@
-#include "Validation/MuonCSCDigis/src/CSCDigiValidation.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
-#include "Validation/MuonCSCDigis/src/CSCStripDigiValidation.h"
-#include "Validation/MuonCSCDigis/src/CSCWireDigiValidation.h"
-#include "Validation/MuonCSCDigis/src/CSCComparatorDigiValidation.h"
 #include "Validation/MuonCSCDigis/src/CSCALCTDigiValidation.h"
 #include "Validation/MuonCSCDigis/src/CSCCLCTDigiValidation.h"
+#include "Validation/MuonCSCDigis/src/CSCComparatorDigiValidation.h"
+#include "Validation/MuonCSCDigis/src/CSCDigiValidation.h"
+#include "Validation/MuonCSCDigis/src/CSCStripDigiValidation.h"
+#include "Validation/MuonCSCDigis/src/CSCWireDigiValidation.h"
 #include <iostream>
-#include "DQMServices/Core/interface/DQMStore.h"
 
-CSCDigiValidation::CSCDigiValidation(const edm::ParameterSet & ps)
-  : doSim_(ps.getParameter<bool>("doSim")),
-    theSimHitMap(ps.getParameter<edm::InputTag>("simHitsTag"), consumesCollector()),
-    theCSCGeometry(nullptr),
-    theStripDigiValidation(nullptr),
-    theWireDigiValidation(nullptr),
-    theComparatorDigiValidation(nullptr),
-    theALCTDigiValidation(nullptr),
-    theCLCTDigiValidation(nullptr)
-{
-  theStripDigiValidation = new CSCStripDigiValidation(ps.getParameter<edm::InputTag>("stripDigiTag"),
-                                                      consumesCollector());
-  theWireDigiValidation  = new CSCWireDigiValidation(ps.getParameter<edm::InputTag>("wireDigiTag"),
-                                                     consumesCollector(),
-                                                     doSim_);
-  theComparatorDigiValidation  = new CSCComparatorDigiValidation(ps.getParameter<edm::InputTag>("comparatorDigiTag"),
-                                                                 ps.getParameter<edm::InputTag>("stripDigiTag"),
-                                                                 consumesCollector());
-  theALCTDigiValidation = new CSCALCTDigiValidation(ps.getParameter<edm::InputTag>("alctDigiTag"),
-                                                    consumesCollector());
-  theCLCTDigiValidation = new CSCCLCTDigiValidation(ps.getParameter<edm::InputTag>("clctDigiTag"),
-                                                    consumesCollector());
+CSCDigiValidation::CSCDigiValidation(const edm::ParameterSet &ps)
+    : doSim_(ps.getParameter<bool>("doSim")),
+      theSimHitMap(ps.getParameter<edm::InputTag>("simHitsTag"), consumesCollector()),
+      theCSCGeometry(nullptr),
+      theStripDigiValidation(nullptr),
+      theWireDigiValidation(nullptr),
+      theComparatorDigiValidation(nullptr),
+      theALCTDigiValidation(nullptr),
+      theCLCTDigiValidation(nullptr) {
+  theStripDigiValidation =
+      new CSCStripDigiValidation(ps.getParameter<edm::InputTag>("stripDigiTag"), consumesCollector());
+  theWireDigiValidation =
+      new CSCWireDigiValidation(ps.getParameter<edm::InputTag>("wireDigiTag"), consumesCollector(), doSim_);
+  theComparatorDigiValidation = new CSCComparatorDigiValidation(ps.getParameter<edm::InputTag>("comparatorDigiTag"),
+                                                                ps.getParameter<edm::InputTag>("stripDigiTag"),
+                                                                consumesCollector());
+  theALCTDigiValidation = new CSCALCTDigiValidation(ps.getParameter<edm::InputTag>("alctDigiTag"), consumesCollector());
+  theCLCTDigiValidation = new CSCCLCTDigiValidation(ps.getParameter<edm::InputTag>("clctDigiTag"), consumesCollector());
 
-  if(doSim_)
-  {
+  if (doSim_) {
     theStripDigiValidation->setSimHitMap(&theSimHitMap);
     theWireDigiValidation->setSimHitMap(&theSimHitMap);
     theComparatorDigiValidation->setSimHitMap(&theSimHitMap);
   }
 }
 
-CSCDigiValidation::~CSCDigiValidation()
-{
+CSCDigiValidation::~CSCDigiValidation() {
   delete theStripDigiValidation;
   delete theWireDigiValidation;
   delete theComparatorDigiValidation;
@@ -51,8 +45,9 @@ CSCDigiValidation::~CSCDigiValidation()
   delete theCLCTDigiValidation;
 }
 
-void CSCDigiValidation::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const & iRun, edm::EventSetup const & /* iSetup */)
-{
+void CSCDigiValidation::bookHistograms(DQMStore::IBooker &iBooker,
+                                       edm::Run const &iRun,
+                                       edm::EventSetup const & /* iSetup */) {
   iBooker.setCurrentFolder("MuonCSCDigisV/CSCDigiTask");
   theStripDigiValidation->bookHistograms(iBooker, doSim_);
   theWireDigiValidation->bookHistograms(iBooker);
@@ -61,29 +56,23 @@ void CSCDigiValidation::bookHistograms(DQMStore::IBooker & iBooker, edm::Run con
   theCLCTDigiValidation->bookHistograms(iBooker);
 }
 
-void CSCDigiValidation::analyze(const edm::Event&e, const edm::EventSetup& eventSetup)
-{
+void CSCDigiValidation::analyze(const edm::Event &e, const edm::EventSetup &eventSetup) {
   theSimHitMap.fill(e);
 
   // find the geometry & conditions for this event
   edm::ESHandle<CSCGeometry> hGeom;
-  eventSetup.get<MuonGeometryRecord>().get( hGeom );
+  eventSetup.get<MuonGeometryRecord>().get(hGeom);
   const CSCGeometry *pGeom = &*hGeom;
 
-  theStripDigiValidation->setGeometry( pGeom );
-  theWireDigiValidation->setGeometry( pGeom );
-  theComparatorDigiValidation->setGeometry( pGeom );
-  theALCTDigiValidation->setGeometry( pGeom );
-  theCLCTDigiValidation->setGeometry( pGeom );
-
-
-  theStripDigiValidation->analyze(e,eventSetup);
-  theWireDigiValidation->analyze(e,eventSetup);
-  theComparatorDigiValidation->analyze(e,eventSetup);
-  theALCTDigiValidation->analyze(e,eventSetup);
-  theCLCTDigiValidation->analyze(e,eventSetup);
+  theStripDigiValidation->setGeometry(pGeom);
+  theWireDigiValidation->setGeometry(pGeom);
+  theComparatorDigiValidation->setGeometry(pGeom);
+  theALCTDigiValidation->setGeometry(pGeom);
+  theCLCTDigiValidation->setGeometry(pGeom);
 
+  theStripDigiValidation->analyze(e, eventSetup);
+  theWireDigiValidation->analyze(e, eventSetup);
+  theComparatorDigiValidation->analyze(e, eventSetup);
+  theALCTDigiValidation->analyze(e, eventSetup);
+  theCLCTDigiValidation->analyze(e, eventSetup);
 }
-
-
-
diff --git a/Validation/MuonCSCDigis/src/CSCDigiValidation.h b/Validation/MuonCSCDigis/src/CSCDigiValidation.h
index 2eb8fcda1c7c4..7f27bc1743597 100644
--- a/Validation/MuonCSCDigis/src/CSCDigiValidation.h
+++ b/Validation/MuonCSCDigis/src/CSCDigiValidation.h
@@ -3,14 +3,14 @@
 
 // user include files
 
-#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 
-#include <DQMServices/Core/interface/DQMStore.h>
 #include <DQMServices/Core/interface/DQMEDAnalyzer.h>
+#include <DQMServices/Core/interface/DQMStore.h>
 
-#include "SimMuon/MCTruth/interface/PSimHitMap.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
+#include "SimMuon/MCTruth/interface/PSimHitMap.h"
 
 class CSCStripDigiValidation;
 class CSCWireDigiValidation;
@@ -20,22 +20,21 @@ class CSCCLCTDigiValidation;
 
 class CSCDigiValidation : public DQMEDAnalyzer {
 public:
-  explicit CSCDigiValidation(const edm::ParameterSet&);
+  explicit CSCDigiValidation(const edm::ParameterSet &);
   ~CSCDigiValidation() override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
 private:
   bool doSim_;
   PSimHitMap theSimHitMap;
-  CSCGeometry* theCSCGeometry;
+  CSCGeometry *theCSCGeometry;
 
-  CSCStripDigiValidation*      theStripDigiValidation;
-  CSCWireDigiValidation*       theWireDigiValidation;
-  CSCComparatorDigiValidation* theComparatorDigiValidation;
-  CSCALCTDigiValidation*       theALCTDigiValidation;
-  CSCCLCTDigiValidation*       theCLCTDigiValidation;
+  CSCStripDigiValidation *theStripDigiValidation;
+  CSCWireDigiValidation *theWireDigiValidation;
+  CSCComparatorDigiValidation *theComparatorDigiValidation;
+  CSCALCTDigiValidation *theALCTDigiValidation;
+  CSCCLCTDigiValidation *theCLCTDigiValidation;
 };
 
 #endif
-
diff --git a/Validation/MuonCSCDigis/src/CSCStripDigiValidation.cc b/Validation/MuonCSCDigis/src/CSCStripDigiValidation.cc
index 49b15320482d8..459aca23ffb04 100644
--- a/Validation/MuonCSCDigis/src/CSCStripDigiValidation.cc
+++ b/Validation/MuonCSCDigis/src/CSCStripDigiValidation.cc
@@ -1,124 +1,100 @@
-#include "Validation/MuonCSCDigis/src/CSCStripDigiValidation.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-
+#include "Validation/MuonCSCDigis/src/CSCStripDigiValidation.h"
 
-CSCStripDigiValidation::CSCStripDigiValidation(const edm::InputTag & inputTag,
-                                               edm::ConsumesCollector && iC):
-  CSCBaseValidation(inputTag),
-  thePedestalSum(0),
-  thePedestalCovarianceSum(0),
-  thePedestalCount(0),
-  thePedestalTimeCorrelationPlot(nullptr),
-  thePedestalNeighborCorrelationPlot(nullptr),
-  theNDigisPerChamberPlot(nullptr)
-{
+CSCStripDigiValidation::CSCStripDigiValidation(const edm::InputTag &inputTag, edm::ConsumesCollector &&iC)
+    : CSCBaseValidation(inputTag),
+      thePedestalSum(0),
+      thePedestalCovarianceSum(0),
+      thePedestalCount(0),
+      thePedestalTimeCorrelationPlot(nullptr),
+      thePedestalNeighborCorrelationPlot(nullptr),
+      theNDigisPerChamberPlot(nullptr) {
   strips_Token_ = iC.consumes<CSCStripDigiCollection>(inputTag);
 }
 
-CSCStripDigiValidation::~CSCStripDigiValidation()
-{
-}
+CSCStripDigiValidation::~CSCStripDigiValidation() {}
 
-void CSCStripDigiValidation::bookHistograms(DQMStore::IBooker & iBooker,
-                                            bool doSim)
-{
+void CSCStripDigiValidation::bookHistograms(DQMStore::IBooker &iBooker, bool doSim) {
   thePedestalPlot = iBooker.book1D("CSCPedestal", "CSC Pedestal ", 400, 550, 650);
   theAmplitudePlot = iBooker.book1D("CSCStripAmplitude", "CSC Strip Amplitude", 200, 0, 2000);
   theRatio4to5Plot = iBooker.book1D("CSCStrip4to5", "CSC Strip Ratio tbin 4 to tbin 5", 100, 0, 1);
   theRatio6to5Plot = iBooker.book1D("CSCStrip6to5", "CSC Strip Ratio tbin 6 to tbin 5", 120, 0, 1.2);
   theNDigisPerLayerPlot = iBooker.book1D("CSCStripDigisPerLayer", "Number of CSC Strip Digis per layer", 48, 0, 48);
-  theNDigisPerEventPlot = iBooker.book1D("CSCStripDigisPerEvent", "Number of CSC Strip Digis per event", 100, 0, 500); 
-  if(doSim) {
-    for(int i = 0; i < 10; ++i)
-    {
+  theNDigisPerEventPlot = iBooker.book1D("CSCStripDigisPerEvent", "Number of CSC Strip Digis per event", 100, 0, 500);
+  if (doSim) {
+    for (int i = 0; i < 10; ++i) {
       char title1[200];
-      sprintf(title1, "CSCStripDigiResolution%d", i+1);
+      sprintf(title1, "CSCStripDigiResolution%d", i + 1);
       theResolutionPlots[i] = iBooker.book1D(title1, title1, 100, -5, 5);
     }
   }
 }
 
-void CSCStripDigiValidation::analyze(const edm::Event& e,
-                                     const edm::EventSetup&)
-{
+void CSCStripDigiValidation::analyze(const edm::Event &e, const edm::EventSetup &) {
   edm::Handle<CSCStripDigiCollection> strips;
   e.getByToken(strips_Token_, strips);
   if (!strips.isValid()) {
-    edm::LogError("CSCDigiValidation") << "Cannot get strips by label "
-                                       << theInputTag.encode();
+    edm::LogError("CSCDigiValidation") << "Cannot get strips by label " << theInputTag.encode();
   }
 
- unsigned nDigisPerEvent = 0;
+  unsigned nDigisPerEvent = 0;
 
- for (CSCStripDigiCollection::DigiRangeIterator j=strips->begin(); j!=strips->end(); j++) {
+  for (CSCStripDigiCollection::DigiRangeIterator j = strips->begin(); j != strips->end(); j++) {
     std::vector<CSCStripDigi>::const_iterator digiItr = (*j).second.first;
     std::vector<CSCStripDigi>::const_iterator last = (*j).second.second;
-    int nDigis = last-digiItr;
+    int nDigis = last - digiItr;
     nDigisPerEvent += nDigis;
     theNDigisPerLayerPlot->Fill(nDigis);
 
     double maxAmplitude = 0.;
     // int maxStrip = 0;
 
-    for( ; digiItr != last; ++digiItr) {
+    for (; digiItr != last; ++digiItr) {
       // average up the pedestals
       std::vector<int> adcCounts = digiItr->getADCCounts();
       thePedestalSum += adcCounts[0];
       thePedestalSum += adcCounts[1];
       thePedestalCount += 2;
-      float pedestal = thePedestalSum/thePedestalCount;
-      if(adcCounts[4]-pedestal > maxAmplitude)
-      {
-      //  maxStrip = digiItr->getStrip();
-        maxAmplitude = adcCounts[4]-pedestal;
+      float pedestal = thePedestalSum / thePedestalCount;
+      if (adcCounts[4] - pedestal > maxAmplitude) {
+        //  maxStrip = digiItr->getStrip();
+        maxAmplitude = adcCounts[4] - pedestal;
       }
 
       // if we have enough pedestal statistics
-      if(thePedestalCount > 100)
-      {
+      if (thePedestalCount > 100) {
         fillPedestalPlots(*digiItr);
 
         // see if it's big enough to count as "signal"
-        if(adcCounts[5] > (thePedestalSum/thePedestalCount + 100))
-        {
+        if (adcCounts[5] > (thePedestalSum / thePedestalCount + 100)) {
           fillSignalPlots(*digiItr);
         }
       }
     }
-  } // loop over digis
+  }  // loop over digis
 
   theNDigisPerEventPlot->Fill(nDigisPerEvent);
 }
 
-
-void CSCStripDigiValidation::fillPedestalPlots(const CSCStripDigi & digi)
-{
+void CSCStripDigiValidation::fillPedestalPlots(const CSCStripDigi &digi) {
   std::vector<int> adcCounts = digi.getADCCounts();
   thePedestalPlot->Fill(adcCounts[0]);
   thePedestalPlot->Fill(adcCounts[1]);
 }
 
-
-
-void CSCStripDigiValidation::fillSignalPlots(const CSCStripDigi & digi)
-{
+void CSCStripDigiValidation::fillSignalPlots(const CSCStripDigi &digi) {
   std::vector<int> adcCounts = digi.getADCCounts();
-  float pedestal = thePedestalSum/thePedestalCount;
+  float pedestal = thePedestalSum / thePedestalCount;
   theAmplitudePlot->Fill(adcCounts[4] - pedestal);
-  theRatio4to5Plot->Fill( (adcCounts[3]-pedestal) / (adcCounts[4]-pedestal) );
-  theRatio6to5Plot->Fill( (adcCounts[5]-pedestal) / (adcCounts[4]-pedestal) );
+  theRatio4to5Plot->Fill((adcCounts[3] - pedestal) / (adcCounts[4] - pedestal));
+  theRatio6to5Plot->Fill((adcCounts[5] - pedestal) / (adcCounts[4] - pedestal));
 }
 
-
-void CSCStripDigiValidation::plotResolution(const PSimHit & hit, int strip,
-                                           const CSCLayer * layer, int chamberType)
-{
+void CSCStripDigiValidation::plotResolution(const PSimHit &hit, int strip, const CSCLayer *layer, int chamberType) {
   double hitX = hit.localPosition().x();
   double hitY = hit.localPosition().y();
   double digiX = layer->geometry()->xOfStrip(strip, hitY);
-  theResolutionPlots[chamberType-1]->Fill(digiX - hitX);
+  theResolutionPlots[chamberType - 1]->Fill(digiX - hitX);
 }
-
-
diff --git a/Validation/MuonCSCDigis/src/CSCStripDigiValidation.h b/Validation/MuonCSCDigis/src/CSCStripDigiValidation.h
index 2a3b9a5cb9b4a..a3a19792b3323 100644
--- a/Validation/MuonCSCDigis/src/CSCStripDigiValidation.h
+++ b/Validation/MuonCSCDigis/src/CSCStripDigiValidation.h
@@ -3,43 +3,39 @@
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/CSCDigi/interface/CSCStripDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCStripDigiCollection.h"
 #include "Validation/MuonCSCDigis/interface/CSCBaseValidation.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 
-class CSCStripDigiValidation : public CSCBaseValidation
-{
+class CSCStripDigiValidation : public CSCBaseValidation {
 public:
-  CSCStripDigiValidation(const edm::InputTag & inputTag,
-                         edm::ConsumesCollector && iC);
+  CSCStripDigiValidation(const edm::InputTag &inputTag, edm::ConsumesCollector &&iC);
   ~CSCStripDigiValidation() override;
   void bookHistograms(DQMStore::IBooker &, bool doSim);
-  void analyze(const edm::Event& e, const edm::EventSetup&) override;
-  void setGeometry(const CSCGeometry * geom) {theCSCGeometry = geom;}
-  void plotResolution(const PSimHit & hit, int strip,
-                      const CSCLayer * layer, int chamberType);
+  void analyze(const edm::Event &e, const edm::EventSetup &) override;
+  void setGeometry(const CSCGeometry *geom) { theCSCGeometry = geom; }
+  void plotResolution(const PSimHit &hit, int strip, const CSCLayer *layer, int chamberType);
 
 private:
-  void fillPedestalPlots(const CSCStripDigi & digi);
-  void fillSignalPlots(const CSCStripDigi & digi);
+  void fillPedestalPlots(const CSCStripDigi &digi);
+  void fillSignalPlots(const CSCStripDigi &digi);
 
   edm::EDGetTokenT<CSCStripDigiCollection> strips_Token_;
   float thePedestalSum;
   float thePedestalCovarianceSum;
   int thePedestalCount;
-  MonitorElement* thePedestalPlot;
-  MonitorElement* thePedestalTimeCorrelationPlot;
-  MonitorElement* thePedestalNeighborCorrelationPlot;
-  MonitorElement* theAmplitudePlot;
-  MonitorElement* theRatio4to5Plot;
-  MonitorElement* theRatio6to5Plot;
-  MonitorElement* theNDigisPerLayerPlot;
-  MonitorElement* theNDigisPerChamberPlot;
-  MonitorElement* theNDigisPerEventPlot;
-  MonitorElement* theResolutionPlots[10];
+  MonitorElement *thePedestalPlot;
+  MonitorElement *thePedestalTimeCorrelationPlot;
+  MonitorElement *thePedestalNeighborCorrelationPlot;
+  MonitorElement *theAmplitudePlot;
+  MonitorElement *theRatio4to5Plot;
+  MonitorElement *theRatio6to5Plot;
+  MonitorElement *theNDigisPerLayerPlot;
+  MonitorElement *theNDigisPerChamberPlot;
+  MonitorElement *theNDigisPerEventPlot;
+  MonitorElement *theResolutionPlots[10];
 };
 
 #endif
-
diff --git a/Validation/MuonCSCDigis/src/CSCWireDigiValidation.cc b/Validation/MuonCSCDigis/src/CSCWireDigiValidation.cc
index 6c2e0fef442ea..fa9721a1cec78 100644
--- a/Validation/MuonCSCDigis/src/CSCWireDigiValidation.cc
+++ b/Validation/MuonCSCDigis/src/CSCWireDigiValidation.cc
@@ -1,43 +1,32 @@
-#include "Validation/MuonCSCDigis/src/CSCWireDigiValidation.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "Validation/MuonCSCDigis/src/CSCWireDigiValidation.h"
 
-#include "Geometry/CSCGeometry/interface/CSCLayerGeometry.h"
-#include "Geometry/CSCGeometry/interface/CSCGeometry.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "Geometry/CSCGeometry/interface/CSCGeometry.h"
+#include "Geometry/CSCGeometry/interface/CSCLayerGeometry.h"
 
-CSCWireDigiValidation::CSCWireDigiValidation(const edm::InputTag & inputTag,
-                                             edm::ConsumesCollector && iC,
-                                             bool doSim): 
-  CSCBaseValidation(inputTag),
-  doSim_(doSim),
-  theTimeBinPlots(),
-  theNDigisPerLayerPlots()
-{
+CSCWireDigiValidation::CSCWireDigiValidation(const edm::InputTag &inputTag, edm::ConsumesCollector &&iC, bool doSim)
+    : CSCBaseValidation(inputTag), doSim_(doSim), theTimeBinPlots(), theNDigisPerLayerPlots() {
   wires_Token_ = iC.consumes<CSCWireDigiCollection>(inputTag);
 }
 
-CSCWireDigiValidation::~CSCWireDigiValidation()
-{
-}
+CSCWireDigiValidation::~CSCWireDigiValidation() {}
 
-void CSCWireDigiValidation::bookHistograms(DQMStore::IBooker & iBooker)
-{
+void CSCWireDigiValidation::bookHistograms(DQMStore::IBooker &iBooker) {
   theNDigisPerEventPlot = iBooker.book1D("CSCWireDigisPerEvent", "CSC Wire Digis per event", 100, 0, 100);
-  for(int i = 0; i < 10; ++i)
-  {
+  for (int i = 0; i < 10; ++i) {
     char title1[200], title2[200], title3[200];
-    sprintf(title1, "CSCWireDigiTimeType%d", i+1);
-    sprintf(title2, "CSCWireDigisPerLayerType%d", i+1);
-    sprintf(title3, "CSCWireDigiResolution%d", i+1);
+    sprintf(title1, "CSCWireDigiTimeType%d", i + 1);
+    sprintf(title2, "CSCWireDigisPerLayerType%d", i + 1);
+    sprintf(title3, "CSCWireDigiResolution%d", i + 1);
     theTimeBinPlots[i] = iBooker.book1D(title1, title1, 9, 0, 8);
     theNDigisPerLayerPlots[i] = iBooker.book1D(title2, title2, 100, 0, 20);
     theResolutionPlots[i] = iBooker.book1D(title3, title3, 100, -10, 10);
   }
 }
 
-void CSCWireDigiValidation::analyze(const edm::Event&e, const edm::EventSetup&)
-{
+void CSCWireDigiValidation::analyze(const edm::Event &e, const edm::EventSetup &) {
   edm::Handle<CSCWireDigiCollection> wires;
 
   e.getByToken(wires_Token_, wires);
@@ -48,28 +37,24 @@ void CSCWireDigiValidation::analyze(const edm::Event&e, const edm::EventSetup&)
 
   unsigned nDigisPerEvent = 0;
 
-  for (CSCWireDigiCollection::DigiRangeIterator j=wires->begin(); j!=wires->end(); j++) {
+  for (CSCWireDigiCollection::DigiRangeIterator j = wires->begin(); j != wires->end(); j++) {
     std::vector<CSCWireDigi>::const_iterator beginDigi = (*j).second.first;
     std::vector<CSCWireDigi>::const_iterator endDigi = (*j).second.second;
     int detId = (*j).first.rawId();
-    
-    const CSCLayer * layer = findLayer(detId);
+
+    const CSCLayer *layer = findLayer(detId);
     int chamberType = layer->chamber()->specs()->chamberType();
-    int nDigis = endDigi-beginDigi;
+    int nDigis = endDigi - beginDigi;
     nDigisPerEvent += nDigis;
-    theNDigisPerLayerPlots[chamberType-1]->Fill(nDigis);
+    theNDigisPerLayerPlots[chamberType - 1]->Fill(nDigis);
 
-    for( std::vector<CSCWireDigi>::const_iterator digiItr = beginDigi;
-         digiItr != endDigi; ++digiItr) 
-    {
-      theTimeBinPlots[chamberType-1]->Fill(digiItr->getTimeBin());
+    for (std::vector<CSCWireDigi>::const_iterator digiItr = beginDigi; digiItr != endDigi; ++digiItr) {
+      theTimeBinPlots[chamberType - 1]->Fill(digiItr->getTimeBin());
     }
 
-    if(doSim_) 
-    {
+    if (doSim_) {
       const edm::PSimHitContainer simHits = theSimHitMap->hits(detId);
-      if(nDigis == 1 && simHits.size() == 1)
-      {
+      if (nDigis == 1 && simHits.size() == 1) {
         plotResolution(simHits[0], *beginDigi, layer, chamberType);
       }
     }
@@ -78,14 +63,12 @@ void CSCWireDigiValidation::analyze(const edm::Event&e, const edm::EventSetup&)
   theNDigisPerEventPlot->Fill(nDigisPerEvent);
 }
 
-
-void CSCWireDigiValidation::plotResolution(const PSimHit & hit, 
-                                           const CSCWireDigi & digi, 
-                                           const CSCLayer * layer, 
-                                           int chamberType)
-{
+void CSCWireDigiValidation::plotResolution(const PSimHit &hit,
+                                           const CSCWireDigi &digi,
+                                           const CSCLayer *layer,
+                                           int chamberType) {
   double hitX = hit.localPosition().x();
   double hitY = hit.localPosition().y();
   double digiY = layer->geometry()->yOfWireGroup(digi.getWireGroup(), hitX);
-  theResolutionPlots[chamberType-1]->Fill(digiY - hitY);
+  theResolutionPlots[chamberType - 1]->Fill(digiY - hitY);
 }
diff --git a/Validation/MuonCSCDigis/src/CSCWireDigiValidation.h b/Validation/MuonCSCDigis/src/CSCWireDigiValidation.h
index 5b2b72c70d20d..1cabd3c60a2c1 100644
--- a/Validation/MuonCSCDigis/src/CSCWireDigiValidation.h
+++ b/Validation/MuonCSCDigis/src/CSCWireDigiValidation.h
@@ -3,32 +3,27 @@
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/CSCDigi/interface/CSCWireDigi.h"
 #include "DataFormats/CSCDigi/interface/CSCWireDigiCollection.h"
 #include "Validation/MuonCSCDigis/interface/CSCBaseValidation.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 
-class CSCWireDigiValidation : public CSCBaseValidation
-{
+class CSCWireDigiValidation : public CSCBaseValidation {
 public:
-  CSCWireDigiValidation(const edm::InputTag & inputTag,
-                        edm::ConsumesCollector && iC,
-                        bool doSim);
+  CSCWireDigiValidation(const edm::InputTag &inputTag, edm::ConsumesCollector &&iC, bool doSim);
   ~CSCWireDigiValidation() override;
   void bookHistograms(DQMStore::IBooker &);
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void plotResolution(const PSimHit & hit, const CSCWireDigi & digi,
-                      const CSCLayer * layer, int chamberType);
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void plotResolution(const PSimHit &hit, const CSCWireDigi &digi, const CSCLayer *layer, int chamberType);
 
 private:
   edm::EDGetTokenT<CSCWireDigiCollection> wires_Token_;
   bool doSim_;
-  MonitorElement* theTimeBinPlots[10];
-  MonitorElement* theNDigisPerLayerPlots[10];
-  MonitorElement* theResolutionPlots[10];
-  MonitorElement* theNDigisPerEventPlot;
+  MonitorElement *theTimeBinPlots[10];
+  MonitorElement *theNDigisPerLayerPlots[10];
+  MonitorElement *theResolutionPlots[10];
+  MonitorElement *theNDigisPerEventPlot;
 };
 
 #endif
-
diff --git a/Validation/MuonDTDigis/src/MuonDTDigis.cc b/Validation/MuonDTDigis/src/MuonDTDigis.cc
old mode 100755
new mode 100644
index ac42fe82e3bd8..a9bde61134227
--- a/Validation/MuonDTDigis/src/MuonDTDigis.cc
+++ b/Validation/MuonDTDigis/src/MuonDTDigis.cc
@@ -16,17 +16,16 @@
 using namespace edm;
 using namespace std;
 
-MuonDTDigis::MuonDTDigis(const ParameterSet& pset){
-
+MuonDTDigis::MuonDTDigis(const ParameterSet &pset) {
   // ----------------------
   // Get the debug parameter for verbose output
-  verbose_ = pset.getUntrackedParameter<bool>("verbose",false);
+  verbose_ = pset.getUntrackedParameter<bool>("verbose", false);
 
   // the name of the Digi collection
   SimHitToken_ = consumes<edm::PSimHitContainer>(pset.getParameter<edm::InputTag>("SimHitLabel"));
 
   // the name of the Digi collection
-  DigiToken_ = consumes<DTDigiCollection> (pset.getParameter<edm::InputTag>(("DigiLabel")));
+  DigiToken_ = consumes<DTDigiCollection>(pset.getParameter<edm::InputTag>(("DigiLabel")));
 
   hDigis_global = std::make_unique<hDigis>("Global");
   hDigis_W0 = std::make_unique<hDigis>("Wheel0");
@@ -35,35 +34,36 @@ MuonDTDigis::MuonDTDigis(const ParameterSet& pset){
   hAllHits = std::make_unique<hHits>("AllHits");
 }
 
-MuonDTDigis::~MuonDTDigis(){
-  if(verbose_)
+MuonDTDigis::~MuonDTDigis() {
+  if (verbose_)
     cout << "[MuonDTDigis] Destructor called" << endl;
 }
 
-void MuonDTDigis::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const & iRun, edm::EventSetup const & /* iSetup */)
-{
-  meDigiTimeBox_          = nullptr;
-  meDigiTimeBox_wheel2m_  = nullptr;
-  meDigiTimeBox_wheel1m_  = nullptr;
-  meDigiTimeBox_wheel0_   = nullptr;
-  meDigiTimeBox_wheel1p_  = nullptr;
-  meDigiTimeBox_wheel2p_  = nullptr;
-  meDigiEfficiency_       = nullptr;
-  meDigiEfficiencyMu_     = nullptr;
-  meDoubleDigi_           = nullptr;
-  meSimvsDigi_            = nullptr;
-  meWire_DoubleDigi_      = nullptr;
-
-  meMB1_sim_occup_        = nullptr;
-  meMB1_digi_occup_       = nullptr;
-  meMB2_sim_occup_        = nullptr;
-  meMB2_digi_occup_       = nullptr;
-  meMB3_sim_occup_        = nullptr;
-  meMB3_digi_occup_       = nullptr;
-  meMB4_sim_occup_        = nullptr;
-  meMB4_digi_occup_       = nullptr;
-
-  meDigiHisto_            = nullptr;
+void MuonDTDigis::bookHistograms(DQMStore::IBooker &iBooker,
+                                 edm::Run const &iRun,
+                                 edm::EventSetup const & /* iSetup */) {
+  meDigiTimeBox_ = nullptr;
+  meDigiTimeBox_wheel2m_ = nullptr;
+  meDigiTimeBox_wheel1m_ = nullptr;
+  meDigiTimeBox_wheel0_ = nullptr;
+  meDigiTimeBox_wheel1p_ = nullptr;
+  meDigiTimeBox_wheel2p_ = nullptr;
+  meDigiEfficiency_ = nullptr;
+  meDigiEfficiencyMu_ = nullptr;
+  meDoubleDigi_ = nullptr;
+  meSimvsDigi_ = nullptr;
+  meWire_DoubleDigi_ = nullptr;
+
+  meMB1_sim_occup_ = nullptr;
+  meMB1_digi_occup_ = nullptr;
+  meMB2_sim_occup_ = nullptr;
+  meMB2_digi_occup_ = nullptr;
+  meMB3_sim_occup_ = nullptr;
+  meMB3_digi_occup_ = nullptr;
+  meMB4_sim_occup_ = nullptr;
+  meMB4_digi_occup_ = nullptr;
+
+  meDigiHisto_ = nullptr;
 
   // ----------------------
   // We go
@@ -74,96 +74,95 @@ void MuonDTDigis::bookHistograms(DQMStore::IBooker & iBooker, edm::Run const & i
 
   iBooker.setCurrentFolder("MuonDTDigisV/DTDigiValidationTask");
 
-  sprintf (histo_n, "DigiTimeBox" );
-  sprintf (histo_t, "Digi Time Box" );
-  meDigiTimeBox_ = iBooker.book1D(histo_n, histo_t, 1536,0,1200);
+  sprintf(histo_n, "DigiTimeBox");
+  sprintf(histo_t, "Digi Time Box");
+  meDigiTimeBox_ = iBooker.book1D(histo_n, histo_t, 1536, 0, 1200);
 
-  sprintf (histo_n, "DigiTimeBox_wheel2m" );
-  sprintf (histo_t, "Digi Time Box wheel -2" );
-  meDigiTimeBox_wheel2m_ = iBooker.book1D(histo_n, histo_t, 384,0,1200);
+  sprintf(histo_n, "DigiTimeBox_wheel2m");
+  sprintf(histo_t, "Digi Time Box wheel -2");
+  meDigiTimeBox_wheel2m_ = iBooker.book1D(histo_n, histo_t, 384, 0, 1200);
 
-  sprintf (histo_n, "DigiTimeBox_wheel1m" );
-  sprintf (histo_t, "Digi Time Box wheel -1" );
-  meDigiTimeBox_wheel1m_ = iBooker.book1D(histo_n, histo_t, 384,0,1200);
+  sprintf(histo_n, "DigiTimeBox_wheel1m");
+  sprintf(histo_t, "Digi Time Box wheel -1");
+  meDigiTimeBox_wheel1m_ = iBooker.book1D(histo_n, histo_t, 384, 0, 1200);
 
-  sprintf (histo_n, "DigiTimeBox_wheel0" );
-  sprintf (histo_t, "Digi Time Box wheel 0" );
-  meDigiTimeBox_wheel0_ = iBooker.book1D(histo_n, histo_t, 384,0,1200);
+  sprintf(histo_n, "DigiTimeBox_wheel0");
+  sprintf(histo_t, "Digi Time Box wheel 0");
+  meDigiTimeBox_wheel0_ = iBooker.book1D(histo_n, histo_t, 384, 0, 1200);
 
-  sprintf (histo_n, "DigiTimeBox_wheel1p" );
-  sprintf (histo_t, "Digi Time Box wheel 1" );
-  meDigiTimeBox_wheel1p_ = iBooker.book1D(histo_n, histo_t, 384,0,1200);
+  sprintf(histo_n, "DigiTimeBox_wheel1p");
+  sprintf(histo_t, "Digi Time Box wheel 1");
+  meDigiTimeBox_wheel1p_ = iBooker.book1D(histo_n, histo_t, 384, 0, 1200);
 
-  sprintf (histo_n, "DigiTimeBox_wheel2p" );
-  sprintf (histo_t, "Digi Time Box wheel 2" );
-  meDigiTimeBox_wheel2p_ = iBooker.book1D(histo_n, histo_t, 384,0,1200);
+  sprintf(histo_n, "DigiTimeBox_wheel2p");
+  sprintf(histo_t, "Digi Time Box wheel 2");
+  meDigiTimeBox_wheel2p_ = iBooker.book1D(histo_n, histo_t, 384, 0, 1200);
 
-  sprintf (histo_n, "DigiEfficiencyMu" );
-  sprintf (histo_t, "Ratio (#Digis Mu)/(#SimHits Mu)" );
+  sprintf(histo_n, "DigiEfficiencyMu");
+  sprintf(histo_t, "Ratio (#Digis Mu)/(#SimHits Mu)");
   meDigiEfficiencyMu_ = iBooker.book1D(histo_n, histo_t, 100, 0., 5.);
 
-  sprintf (histo_n, "DigiEfficiency" );
-  sprintf (histo_t, "Ratio (#Digis)/(#SimHits)" );
+  sprintf(histo_n, "DigiEfficiency");
+  sprintf(histo_t, "Ratio (#Digis)/(#SimHits)");
   meDigiEfficiency_ = iBooker.book1D(histo_n, histo_t, 100, 0., 5.);
 
-  sprintf (histo_n, "Number_Digi_per_layer" );
-  sprintf (histo_t, "Number_Digi_per_layer" );
-  meDoubleDigi_ = iBooker.book1D(histo_n, histo_t, 10,0.,10.);
+  sprintf(histo_n, "Number_Digi_per_layer");
+  sprintf(histo_t, "Number_Digi_per_layer");
+  meDoubleDigi_ = iBooker.book1D(histo_n, histo_t, 10, 0., 10.);
 
-  sprintf (histo_n, "Number_simhit_vs_digi" );
-  sprintf (histo_t, "Number_simhit_vs_digi" );
+  sprintf(histo_n, "Number_simhit_vs_digi");
+  sprintf(histo_t, "Number_simhit_vs_digi");
   meSimvsDigi_ = iBooker.book2D(histo_n, histo_t, 100, 0., 140., 100, 0., 140.);
 
-  sprintf (histo_n, "Wire_Number_with_double_Digi" );
-  sprintf (histo_t, "Wire_Number_with_double_Digi" );
-  meWire_DoubleDigi_ = iBooker.book1D(histo_n, histo_t, 100,0.,100.);
+  sprintf(histo_n, "Wire_Number_with_double_Digi");
+  sprintf(histo_t, "Wire_Number_with_double_Digi");
+  meWire_DoubleDigi_ = iBooker.book1D(histo_n, histo_t, 100, 0., 100.);
 
-  sprintf (histo_n, "Simhit_occupancy_MB1" );
-  sprintf (histo_t, "Simhit_occupancy_MB1" );
-  meMB1_sim_occup_ = iBooker.book1D(histo_n, histo_t, 55, 0., 55. );
+  sprintf(histo_n, "Simhit_occupancy_MB1");
+  sprintf(histo_t, "Simhit_occupancy_MB1");
+  meMB1_sim_occup_ = iBooker.book1D(histo_n, histo_t, 55, 0., 55.);
 
-  sprintf (histo_n, "Digi_occupancy_MB1" );
-  sprintf (histo_t, "Digi_occupancy_MB1" );
-  meMB1_digi_occup_ = iBooker.book1D(histo_n, histo_t, 55, 0., 55. );
+  sprintf(histo_n, "Digi_occupancy_MB1");
+  sprintf(histo_t, "Digi_occupancy_MB1");
+  meMB1_digi_occup_ = iBooker.book1D(histo_n, histo_t, 55, 0., 55.);
 
-  sprintf (histo_n, "Simhit_occupancy_MB2" );
-  sprintf (histo_t, "Simhit_occupancy_MB2" );
-  meMB2_sim_occup_ = iBooker.book1D(histo_n, histo_t, 63, 0., 63. );
+  sprintf(histo_n, "Simhit_occupancy_MB2");
+  sprintf(histo_t, "Simhit_occupancy_MB2");
+  meMB2_sim_occup_ = iBooker.book1D(histo_n, histo_t, 63, 0., 63.);
 
-  sprintf (histo_n, "Digi_occupancy_MB2" );
-  sprintf (histo_t, "Digi_occupancy_MB2" );
-  meMB2_digi_occup_ = iBooker.book1D(histo_n, histo_t, 63, 0., 63. );
+  sprintf(histo_n, "Digi_occupancy_MB2");
+  sprintf(histo_t, "Digi_occupancy_MB2");
+  meMB2_digi_occup_ = iBooker.book1D(histo_n, histo_t, 63, 0., 63.);
 
-  sprintf (histo_n, "Simhit_occupancy_MB3" );
-  sprintf (histo_t, "Simhit_occupancy_MB3" );
-  meMB3_sim_occup_ = iBooker.book1D(histo_n, histo_t, 75, 0., 75. );
+  sprintf(histo_n, "Simhit_occupancy_MB3");
+  sprintf(histo_t, "Simhit_occupancy_MB3");
+  meMB3_sim_occup_ = iBooker.book1D(histo_n, histo_t, 75, 0., 75.);
 
-  sprintf (histo_n, "Digi_occupancy_MB3" );
-  sprintf (histo_t, "Digi_occupancy_MB3" );
-  meMB3_digi_occup_ = iBooker.book1D(histo_n, histo_t, 75, 0., 75. );
+  sprintf(histo_n, "Digi_occupancy_MB3");
+  sprintf(histo_t, "Digi_occupancy_MB3");
+  meMB3_digi_occup_ = iBooker.book1D(histo_n, histo_t, 75, 0., 75.);
 
-  sprintf (histo_n, "Simhit_occupancy_MB4" );
-  sprintf (histo_t, "Simhit_occupancy_MB4" );
-  meMB4_sim_occup_ = iBooker.book1D(histo_n, histo_t, 99, 0., 99. );
+  sprintf(histo_n, "Simhit_occupancy_MB4");
+  sprintf(histo_t, "Simhit_occupancy_MB4");
+  meMB4_sim_occup_ = iBooker.book1D(histo_n, histo_t, 99, 0., 99.);
 
-  sprintf (histo_n, "Digi_occupancy_MB4" );
-  sprintf (histo_t, "Digi_occupancy_MB4" );
-  meMB4_digi_occup_ = iBooker.book1D(histo_n, histo_t, 99, 0., 99. );
+  sprintf(histo_n, "Digi_occupancy_MB4");
+  sprintf(histo_t, "Digi_occupancy_MB4");
+  meMB4_digi_occup_ = iBooker.book1D(histo_n, histo_t, 99, 0., 99.);
 
   // Begona's option
   char stringcham[40];
-  for ( int slnum = 1; slnum < 62; ++slnum ) {
-    sprintf(stringcham, "DigiTimeBox_slid_%d", slnum) ;
-    meDigiHisto_ =  iBooker.book1D(stringcham, stringcham, 100,0,1200);
+  for (int slnum = 1; slnum < 62; ++slnum) {
+    sprintf(stringcham, "DigiTimeBox_slid_%d", slnum);
+    meDigiHisto_ = iBooker.book1D(stringcham, stringcham, 100, 0, 1200);
     meDigiTimeBox_SL_.push_back(meDigiHisto_);
-  }  
+  }
 }
 
-void  MuonDTDigis::analyze(const Event & event, const EventSetup& eventSetup){
-
-  if(verbose_)
-    cout << "--- [MuonDTDigis] Analysing Event: #Run: " << event.id().run()
-         << " #Event: " << event.id().event() << endl;
+void MuonDTDigis::analyze(const Event &event, const EventSetup &eventSetup) {
+  if (verbose_)
+    cout << "--- [MuonDTDigis] Analysing Event: #Run: " << event.id().run() << " #Event: " << event.id().event()
+         << endl;
 
   // Get the DT Geometry
   ESHandle<DTGeometry> muonGeom;
@@ -177,23 +176,22 @@ void  MuonDTDigis::analyze(const Event & event, const EventSetup& eventSetup){
   Handle<PSimHitContainer> simHits;
   event.getByToken(SimHitToken_, simHits);
 
-
   int num_mudigis;
   int num_musimhits;
   int num_digis;
   int num_digis_layer;
-  int cham_num ;
+  int cham_num;
   int wire_touched;
   num_digis = 0;
   num_mudigis = 0;
   num_musimhits = 0;
   DTWireIdMap wireMap;
 
-  for(vector<PSimHit>::const_iterator hit = simHits->begin();
-      hit != simHits->end(); hit++){
+  for (vector<PSimHit>::const_iterator hit = simHits->begin(); hit != simHits->end(); hit++) {
     // Create the id of the wire, the simHits in the DT known also the wireId
     DTWireId wireId(hit->detUnitId());
-    //   cout << " PSimHits wire id " << wireId << " part type " << hit->particleType() << endl;
+    //   cout << " PSimHits wire id " << wireId << " part type " <<
+    //   hit->particleType() << endl;
 
     // Fill the map
     wireMap[wireId].push_back(&(*hit));
@@ -201,134 +199,147 @@ void  MuonDTDigis::analyze(const Event & event, const EventSetup& eventSetup){
     LocalPoint entryP = hit->entryPoint();
     LocalPoint exitP = hit->exitPoint();
     int partType = hit->particleType();
-    if ( abs(partType) == 13 ) num_musimhits++;
-
-    if ( wireId.station() == 1 && abs(partType) == 13 ) meMB1_sim_occup_->Fill(wireId.wire());
-    if ( wireId.station() == 2 && abs(partType) == 13 ) meMB2_sim_occup_->Fill(wireId.wire());
-    if ( wireId.station() == 3 && abs(partType) == 13 ) meMB3_sim_occup_->Fill(wireId.wire());
-    if ( wireId.station() == 4 && abs(partType) == 13 ) meMB4_sim_occup_->Fill(wireId.wire());
-
-
-    float path = (exitP-entryP).mag();
-    float path_x = fabs((exitP-entryP).x());
-
-    hAllHits->Fill(entryP.x(),exitP.x(),
-		   entryP.y(),exitP.y(),
-		   entryP.z(),exitP.z(),
-		   path , path_x,
-		   partType, hit->processType(),
+    if (abs(partType) == 13)
+      num_musimhits++;
+
+    if (wireId.station() == 1 && abs(partType) == 13)
+      meMB1_sim_occup_->Fill(wireId.wire());
+    if (wireId.station() == 2 && abs(partType) == 13)
+      meMB2_sim_occup_->Fill(wireId.wire());
+    if (wireId.station() == 3 && abs(partType) == 13)
+      meMB3_sim_occup_->Fill(wireId.wire());
+    if (wireId.station() == 4 && abs(partType) == 13)
+      meMB4_sim_occup_->Fill(wireId.wire());
+
+    float path = (exitP - entryP).mag();
+    float path_x = fabs((exitP - entryP).x());
+
+    hAllHits->Fill(entryP.x(),
+                   exitP.x(),
+                   entryP.y(),
+                   exitP.y(),
+                   entryP.z(),
+                   exitP.z(),
+                   path,
+                   path_x,
+                   partType,
+                   hit->processType(),
                    hit->pabs());
-
   }
 
   //  cout << "num muon simhits " << num_musimhits << endl;
 
   DTDigiCollection::DigiRangeIterator detUnitIt;
-  for (detUnitIt=dtDigis->begin();
-       detUnitIt!=dtDigis->end();
-       ++detUnitIt){
+  for (detUnitIt = dtDigis->begin(); detUnitIt != dtDigis->end(); ++detUnitIt) {
+    const DTLayerId &id = (*detUnitIt).first;
+    const DTDigiCollection::Range &range = (*detUnitIt).second;
 
-    const DTLayerId& id = (*detUnitIt).first;
-    const DTDigiCollection::Range& range = (*detUnitIt).second;
-
-    num_digis_layer = 0 ;
-    cham_num = 0 ;
+    num_digis_layer = 0;
+    cham_num = 0;
     wire_touched = 0;
 
     // Loop over the digis of this DetUnit
-    for (DTDigiCollection::const_iterator digiIt = range.first;
-	 digiIt!=range.second;
-	 ++digiIt){
+    for (DTDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) {
       //   cout<<" Wire: "<<(*digiIt).wire()<<endl
       //  <<" digi time (ns): "<<(*digiIt).time()<<endl;
 
       num_digis++;
       num_digis_layer++;
-      if (num_digis_layer > 1 )
-      {
-        if ( (*digiIt).wire() == wire_touched )
-        {
+      if (num_digis_layer > 1) {
+        if ((*digiIt).wire() == wire_touched) {
           meWire_DoubleDigi_->Fill((*digiIt).wire());
-          //      cout << "old & new wire " << wire_touched << " " << (*digiIt).wire() << endl;
+          //      cout << "old & new wire " << wire_touched << " " <<
+          //      (*digiIt).wire() << endl;
         }
       }
       wire_touched = (*digiIt).wire();
 
       meDigiTimeBox_->Fill((*digiIt).time());
-      if (id.wheel() == -2 ) meDigiTimeBox_wheel2m_->Fill((*digiIt).time());
-      if (id.wheel() == -1 ) meDigiTimeBox_wheel1m_->Fill((*digiIt).time());
-      if (id.wheel() == 0 )  meDigiTimeBox_wheel0_ ->Fill((*digiIt).time());
-      if (id.wheel() == 1 )  meDigiTimeBox_wheel1p_->Fill((*digiIt).time());
-      if (id.wheel() == 2 )  meDigiTimeBox_wheel2p_->Fill((*digiIt).time());
+      if (id.wheel() == -2)
+        meDigiTimeBox_wheel2m_->Fill((*digiIt).time());
+      if (id.wheel() == -1)
+        meDigiTimeBox_wheel1m_->Fill((*digiIt).time());
+      if (id.wheel() == 0)
+        meDigiTimeBox_wheel0_->Fill((*digiIt).time());
+      if (id.wheel() == 1)
+        meDigiTimeBox_wheel1p_->Fill((*digiIt).time());
+      if (id.wheel() == 2)
+        meDigiTimeBox_wheel2p_->Fill((*digiIt).time());
 
       //   Superlayer number and fill histo with digi timebox
 
-      cham_num = (id.wheel() +2)*12 + (id.station() -1)*3 + id.superlayer();
+      cham_num = (id.wheel() + 2) * 12 + (id.station() - 1) * 3 + id.superlayer();
       //   cout << " Histo number " << cham_num << endl;
 
       meDigiTimeBox_SL_[cham_num]->Fill((*digiIt).time());
 
       //    cout << " size de digis " << (*digiIt).size() << endl;
 
-      DTWireId wireId(id,(*digiIt).wire());
-      if (wireId.station() == 1 ) meMB1_digi_occup_->Fill((*digiIt).wire());
-      if (wireId.station() == 2 ) meMB2_digi_occup_->Fill((*digiIt).wire());
-      if (wireId.station() == 3 ) meMB3_digi_occup_->Fill((*digiIt).wire());
-      if (wireId.station() == 4 ) meMB4_digi_occup_->Fill((*digiIt).wire());
-
-      int mu=0;
+      DTWireId wireId(id, (*digiIt).wire());
+      if (wireId.station() == 1)
+        meMB1_digi_occup_->Fill((*digiIt).wire());
+      if (wireId.station() == 2)
+        meMB2_digi_occup_->Fill((*digiIt).wire());
+      if (wireId.station() == 3)
+        meMB3_digi_occup_->Fill((*digiIt).wire());
+      if (wireId.station() == 4)
+        meMB4_digi_occup_->Fill((*digiIt).wire());
+
+      int mu = 0;
       float theta = 0;
 
-      for(vector<const PSimHit*>::iterator hit = wireMap[wireId].begin();
-	  hit != wireMap[wireId].end(); hit++)
-	if( abs((*hit)->particleType()) == 13){
-	  theta = atan( (*hit)->momentumAtEntry().x()/ (-(*hit)->momentumAtEntry().z()) )*180/M_PI;
+      for (vector<const PSimHit *>::iterator hit = wireMap[wireId].begin(); hit != wireMap[wireId].end(); hit++)
+        if (abs((*hit)->particleType()) == 13) {
+          theta = atan((*hit)->momentumAtEntry().x() / (-(*hit)->momentumAtEntry().z())) * 180 / M_PI;
           //	  cout<<"momentum x: "<<(*hit)->momentumAtEntry().x()<<endl
           //	      <<"momentum z: "<<(*hit)->momentumAtEntry().z()<<endl
           //	      <<"atan: "<<theta<<endl;
-	  mu++;
-	}
+          mu++;
+        }
 
-      if( mu ) num_mudigis++;
+      if (mu)
+        num_mudigis++;
 
-      if(mu && theta){
-	hDigis_global->Fill((*digiIt).time(),theta,id.superlayer());
-	//filling digi histos for wheel and for RZ and RPhi
-	WheelHistos(id.wheel())->Fill((*digiIt).time(),theta,id.superlayer());
+      if (mu && theta) {
+        hDigis_global->Fill((*digiIt).time(), theta, id.superlayer());
+        // filling digi histos for wheel and for RZ and RPhi
+        WheelHistos(id.wheel())->Fill((*digiIt).time(), theta, id.superlayer());
       }
 
-    }// for digis in layer
+    }  // for digis in layer
 
-    meDoubleDigi_->Fill( (float)num_digis_layer );
+    meDoubleDigi_->Fill((float)num_digis_layer);
 
-  }// for layers
+  }  // for layers
 
-  //cout << "num_digis " << num_digis << "mu digis " << num_mudigis << endl;
+  // cout << "num_digis " << num_digis << "mu digis " << num_mudigis << endl;
 
   if (num_musimhits != 0) {
-    meDigiEfficiencyMu_->Fill( (float)num_mudigis/(float)num_musimhits );
-    meDigiEfficiency_->Fill( (float)num_digis/(float)num_musimhits );
+    meDigiEfficiencyMu_->Fill((float)num_mudigis / (float)num_musimhits);
+    meDigiEfficiency_->Fill((float)num_digis / (float)num_musimhits);
   }
 
-  meSimvsDigi_->Fill( (float)num_musimhits, (float)num_digis ) ;
+  meSimvsDigi_->Fill((float)num_musimhits, (float)num_digis);
   //  cout<<"--------------"<<endl;
-
 }
 
-hDigis* MuonDTDigis::WheelHistos(int wheel){
-  switch(abs(wheel)){
-
-    case 0: return  hDigis_W0.get();
+hDigis *MuonDTDigis::WheelHistos(int wheel) {
+  switch (abs(wheel)) {
+    case 0:
+      return hDigis_W0.get();
 
-    case 1: return  hDigis_W1.get();
+    case 1:
+      return hDigis_W1.get();
 
-    case 2: return  hDigis_W2.get();
+    case 2:
+      return hDigis_W2.get();
 
-    default: return nullptr;
+    default:
+      return nullptr;
   }
 }
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "DQMServices/Core/interface/DQMStore.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 
 DEFINE_FWK_MODULE(MuonDTDigis);
diff --git a/Validation/MuonDTDigis/src/MuonDTDigis.h b/Validation/MuonDTDigis/src/MuonDTDigis.h
old mode 100755
new mode 100644
index 817d7a3e68197..c1464919eecad
--- a/Validation/MuonDTDigis/src/MuonDTDigis.h
+++ b/Validation/MuonDTDigis/src/MuonDTDigis.h
@@ -6,65 +6,63 @@
  *
  *  \authors: R. Bellan
  */
-#include <FWCore/Framework/interface/Event.h>
-#include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/EventSetup.h"
+#include <FWCore/Framework/interface/Event.h>
 
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
+#include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "Geometry/DTGeometry/interface/DTGeometry.h"
 #include "Geometry/DTGeometry/interface/DTLayer.h"
-#include "DataFormats/GeometryVector/interface/LocalPoint.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 #include "DataFormats/DTDigi/interface/DTDigi.h"
 #include "DataFormats/DTDigi/interface/DTDigiCollection.h"
-#include "DataFormats/MuonDetId/interface/DTWireId.h"
 #include "DataFormats/MuonDetId/interface/DTLayerId.h"
+#include "DataFormats/MuonDetId/interface/DTWireId.h"
 
 #include "SimMuon/DTDigitizer/test/Histograms.h"
 
 #include <vector>
 
+#include <DQMServices/Core/interface/DQMEDAnalyzer.h>
 #include <DQMServices/Core/interface/DQMStore.h>
 #include <DQMServices/Core/interface/MonitorElement.h>
-#include <DQMServices/Core/interface/DQMEDAnalyzer.h>
 
 class TH1F;
 class TFile;
 class PSimHit;
 class hDigis;
 
-namespace edm
-{
+namespace edm {
   class ParameterSet;
   class Event;
   class EventSetup;
-}
+}  // namespace edm
 
-class MuonDTDigis : public DQMEDAnalyzer{
-
- public:
+class MuonDTDigis : public DQMEDAnalyzer {
+public:
   // Constructor
-  explicit MuonDTDigis(const edm::ParameterSet& pset);
+  explicit MuonDTDigis(const edm::ParameterSet &pset);
 
   // Destructor
   ~MuonDTDigis() override;
 
- protected:
+protected:
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
   // Analysis
-  void analyze(const edm::Event & event, const edm::EventSetup& eventSetup) override;
+  void analyze(const edm::Event &event, const edm::EventSetup &eventSetup) override;
 
-  hDigis* WheelHistos(int wheel);
+  hDigis *WheelHistos(int wheel);
 
- private:
-  typedef std::map<DTWireId, std::vector<const PSimHit*> > DTWireIdMap;
+private:
+  typedef std::map<DTWireId, std::vector<const PSimHit *>> DTWireIdMap;
 
   edm::EDGetTokenT<edm::PSimHitContainer> SimHitToken_;
   edm::EDGetTokenT<DTDigiCollection> DigiToken_;
@@ -73,29 +71,29 @@ class MuonDTDigis : public DQMEDAnalyzer{
   bool verbose_;
 
   // Monitor elements
-  MonitorElement* meDigiTimeBox_;
-  MonitorElement* meDigiTimeBox_wheel2m_;
-  MonitorElement* meDigiTimeBox_wheel1m_;
-  MonitorElement* meDigiTimeBox_wheel0_;
-  MonitorElement* meDigiTimeBox_wheel1p_;
-  MonitorElement* meDigiTimeBox_wheel2p_;
-  MonitorElement* meDigiEfficiency_;
-  MonitorElement* meDigiEfficiencyMu_;
-  MonitorElement* meDoubleDigi_;
-  MonitorElement* meSimvsDigi_;
-  MonitorElement* meWire_DoubleDigi_;
-
-  MonitorElement* meMB1_sim_occup_;
-  MonitorElement* meMB1_digi_occup_;
-  MonitorElement* meMB2_sim_occup_;
-  MonitorElement* meMB2_digi_occup_;
-  MonitorElement* meMB3_sim_occup_;
-  MonitorElement* meMB3_digi_occup_;
-  MonitorElement* meMB4_sim_occup_;
-  MonitorElement* meMB4_digi_occup_;
-
-  std::vector<MonitorElement*> meDigiTimeBox_SL_;
-  MonitorElement* meDigiHisto_;
+  MonitorElement *meDigiTimeBox_;
+  MonitorElement *meDigiTimeBox_wheel2m_;
+  MonitorElement *meDigiTimeBox_wheel1m_;
+  MonitorElement *meDigiTimeBox_wheel0_;
+  MonitorElement *meDigiTimeBox_wheel1p_;
+  MonitorElement *meDigiTimeBox_wheel2p_;
+  MonitorElement *meDigiEfficiency_;
+  MonitorElement *meDigiEfficiencyMu_;
+  MonitorElement *meDoubleDigi_;
+  MonitorElement *meSimvsDigi_;
+  MonitorElement *meWire_DoubleDigi_;
+
+  MonitorElement *meMB1_sim_occup_;
+  MonitorElement *meMB1_digi_occup_;
+  MonitorElement *meMB2_sim_occup_;
+  MonitorElement *meMB2_digi_occup_;
+  MonitorElement *meMB3_sim_occup_;
+  MonitorElement *meMB3_digi_occup_;
+  MonitorElement *meMB4_sim_occup_;
+  MonitorElement *meMB4_digi_occup_;
+
+  std::vector<MonitorElement *> meDigiTimeBox_SL_;
+  MonitorElement *meDigiHisto_;
 
   //  TH1F *DigiTimeBox;
   //  TFile *file_more_plots;
@@ -105,7 +103,6 @@ class MuonDTDigis : public DQMEDAnalyzer{
   std::unique_ptr<hDigis> hDigis_W1;
   std::unique_ptr<hDigis> hDigis_W2;
   std::unique_ptr<hHits> hAllHits;
-
 };
 
 #endif
diff --git a/Validation/MuonGEMDigis/interface/GEMCheckGeometry.h b/Validation/MuonGEMDigis/interface/GEMCheckGeometry.h
index c174b3b11b116..5ac083d762010 100644
--- a/Validation/MuonGEMDigis/interface/GEMCheckGeometry.h
+++ b/Validation/MuonGEMDigis/interface/GEMCheckGeometry.h
@@ -4,29 +4,27 @@
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-#include "FWCore/Framework/interface/Event.h"
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
-class GEMCheckGeometry : public DQMEDAnalyzer
-{
+class GEMCheckGeometry : public DQMEDAnalyzer {
 public:
-  explicit GEMCheckGeometry(const edm::ParameterSet& gc);
+  explicit GEMCheckGeometry(const edm::ParameterSet &gc);
   ~GEMCheckGeometry() override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(const edm::Event& e, const edm::EventSetup&) override;
-
- private:
+  void analyze(const edm::Event &e, const edm::EventSetup &) override;
 
-  std::map< UInt_t , MonitorElement* > theStdPlots;
-  std::map< UInt_t , MonitorElement* > the_st_dphi;
-  double GE11PhiBegin_; 
+private:
+  std::map<UInt_t, MonitorElement *> theStdPlots;
+  std::map<UInt_t, MonitorElement *> the_st_dphi;
+  double GE11PhiBegin_;
   double GE11PhiStep_;
   double minPhi_;
   double maxPhi_;
-  bool detailPlot_; 
+  bool detailPlot_;
 };
 
 #endif
diff --git a/Validation/MuonGEMDigis/interface/GEMCoPadDigiValidation.h b/Validation/MuonGEMDigis/interface/GEMCoPadDigiValidation.h
index 77cf17b257c0c..8b650d48e1f33 100644
--- a/Validation/MuonGEMDigis/interface/GEMCoPadDigiValidation.h
+++ b/Validation/MuonGEMDigis/interface/GEMCoPadDigiValidation.h
@@ -1,30 +1,27 @@
 #ifndef GEMCoPadDigiValidation_H
 #define GEMCoPadDigiValidation_H
 
-#include "Validation/MuonGEMHits/interface/GEMBaseValidation.h"
 #include "DataFormats/GEMDigi/interface/GEMCoPadDigiCollection.h"
+#include "Validation/MuonGEMHits/interface/GEMBaseValidation.h"
 
-
-class GEMCoPadDigiValidation : public GEMBaseValidation
-{
+class GEMCoPadDigiValidation : public GEMBaseValidation {
 public:
-  explicit GEMCoPadDigiValidation( const edm::ParameterSet& );
+  explicit GEMCoPadDigiValidation(const edm::ParameterSet &);
   ~GEMCoPadDigiValidation() override;
-  void analyze(const edm::Event& e, const edm::EventSetup&) override;
+  void analyze(const edm::Event &e, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
- private:
-
-  MonitorElement* theCSCCoPad_xy[2][3];
-  MonitorElement* theCSCCoPad_phipad[2][3];
-  MonitorElement* theCSCCoPad[2][3];
-  MonitorElement* theCSCCoPad_bx[2][3];
-  MonitorElement* theCSCCoPad_zr[2][3];
-	std::unordered_map< UInt_t , MonitorElement* > theCSCCoPad_xy_ch;
 
+private:
+  MonitorElement *theCSCCoPad_xy[2][3];
+  MonitorElement *theCSCCoPad_phipad[2][3];
+  MonitorElement *theCSCCoPad[2][3];
+  MonitorElement *theCSCCoPad_bx[2][3];
+  MonitorElement *theCSCCoPad_zr[2][3];
+  std::unordered_map<UInt_t, MonitorElement *> theCSCCoPad_xy_ch;
 
   // Simple plots
-  std::unordered_map< UInt_t , MonitorElement* > theCoPad_dcEta;
-  std::unordered_map< UInt_t , MonitorElement* > theCoPad_simple_zr;
+  std::unordered_map<UInt_t, MonitorElement *> theCoPad_dcEta;
+  std::unordered_map<UInt_t, MonitorElement *> theCoPad_simple_zr;
   int minBXGEM_, maxBXGEM_;
   edm::EDGetToken InputTagToken_;
   int nBinXY_;
diff --git a/Validation/MuonGEMDigis/interface/GEMDigiMatcher.h b/Validation/MuonGEMDigis/interface/GEMDigiMatcher.h
index e37fb5aca03e9..83704356deabe 100644
--- a/Validation/MuonGEMDigis/interface/GEMDigiMatcher.h
+++ b/Validation/MuonGEMDigis/interface/GEMDigiMatcher.h
@@ -10,34 +10,39 @@
 
 #include "GenericDigi.h"
 
-#include "FWCore/Utilities/interface/InputTag.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
 #include "DataFormats/Common/interface/DetSetVector.h"
+#include "DataFormats/GEMDigi/interface/GEMCoPadDigiCollection.h"
 #include "DataFormats/GEMDigi/interface/GEMDigiCollection.h"
 #include "DataFormats/GEMDigi/interface/GEMPadDigiCollection.h"
-#include "DataFormats/GEMDigi/interface/GEMCoPadDigiCollection.h"
 
 #include <SimDataFormats/Track/interface/SimTrackContainer.h>
 #include <SimDataFormats/Vertex/interface/SimVertexContainer.h>
 
-#include <vector>
 #include <map>
 #include <set>
+#include <vector>
 
 class SimHitMatcher;
 class GEMGeometry;
-class GEMDigiMatcher 
-{
+class GEMDigiMatcher {
   using DigiContainer = matching::DigiContainer;
+
 public:
+  GEMDigiMatcher(const SimHitMatcher &sh,
+                 const edm::Event &,
+                 const GEMGeometry &geom,
+                 const edm::ParameterSet &cfg,
+                 edm::EDGetToken &,
+                 edm::EDGetToken &,
+                 edm::EDGetToken &);
 
-  GEMDigiMatcher(const SimHitMatcher& sh, const edm::Event& , const GEMGeometry& geom, const edm::ParameterSet& cfg, edm::EDGetToken& ,edm::EDGetToken& ,edm::EDGetToken& );
-  
   ~GEMDigiMatcher();
 
   // partition GEM detIds with digis
@@ -57,21 +62,19 @@ class GEMDigiMatcher
   // partition detIds with coincidence pads
   std::set<unsigned int> detIdsWithCoPads() const;
 
-
-
   // GEM digis from a particular partition, chamber or superchamber
-  const DigiContainer& digisInDetId(unsigned int) const;
-  const DigiContainer& digisInChamber(unsigned int) const;
-  const DigiContainer& digisInSuperChamber(unsigned int) const;
+  const DigiContainer &digisInDetId(unsigned int) const;
+  const DigiContainer &digisInChamber(unsigned int) const;
+  const DigiContainer &digisInSuperChamber(unsigned int) const;
 
   // GEM pads from a particular partition, chamber or superchamber
-  const DigiContainer& padsInDetId(unsigned int) const;
-  const DigiContainer& padsInChamber(unsigned int) const;
-  const DigiContainer& padsInSuperChamber(unsigned int) const;
+  const DigiContainer &padsInDetId(unsigned int) const;
+  const DigiContainer &padsInChamber(unsigned int) const;
+  const DigiContainer &padsInSuperChamber(unsigned int) const;
 
   // GEM co-pads from a particular partition or superchamber
-  const DigiContainer& coPadsInDetId(unsigned int) const;
-  const DigiContainer& coPadsInSuperChamber(unsigned int) const;
+  const DigiContainer &coPadsInDetId(unsigned int) const;
+  const DigiContainer &coPadsInSuperChamber(unsigned int) const;
 
   // #layers with digis from this simtrack
   int nLayersWithDigisInSuperChamber(unsigned int) const;
@@ -92,19 +95,18 @@ class GEMDigiMatcher
   std::set<int> partitionNumbersWithCoPads() const;
 
 private:
+  void init(const edm::Event &);
 
-  void init(const edm::Event& );
-
-  void matchDigisToSimTrack(const GEMDigiCollection& digis);
-  void matchPadsToSimTrack(const GEMPadDigiCollection& pads);
-  void matchCoPadsToSimTrack(const GEMCoPadDigiCollection& co_pads);
+  void matchDigisToSimTrack(const GEMDigiCollection &digis);
+  void matchPadsToSimTrack(const GEMPadDigiCollection &pads);
+  void matchCoPadsToSimTrack(const GEMCoPadDigiCollection &co_pads);
 
   edm::Handle<GEMDigiCollection> gem_digis_;
   edm::Handle<GEMPadDigiCollection> gem_pads_;
   edm::Handle<GEMCoPadDigiCollection> gem_co_pads_;
 
-  const SimHitMatcher& simhit_matcher_;
-  const GEMGeometry& gem_geo_;
+  const SimHitMatcher &simhit_matcher_;
+  const GEMGeometry &gem_geo_;
 
   int minBXGEM_, maxBXGEM_;
   bool verbose_;
diff --git a/Validation/MuonGEMDigis/interface/GEMDigiTrackMatch.h b/Validation/MuonGEMDigis/interface/GEMDigiTrackMatch.h
index 937148c566c42..4c384ad6b3a62 100644
--- a/Validation/MuonGEMDigis/interface/GEMDigiTrackMatch.h
+++ b/Validation/MuonGEMDigis/interface/GEMDigiTrackMatch.h
@@ -1,46 +1,44 @@
 #ifndef GEMDigiTrackMatch_H
 #define GEMDigiTrackMatch_H
 
-#include "Validation/MuonGEMHits/interface/GEMTrackMatch.h"
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/GEMGeometry/interface/GEMGeometry.h"
+#include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/GEMGeometry/interface/GEMEtaPartition.h"
 #include "Geometry/GEMGeometry/interface/GEMEtaPartitionSpecs.h"
-#include "Geometry/CommonTopologies/interface/StripTopology.h"
-#include "Validation/MuonGEMHits/interface/SimHitMatcher.h"
+#include "Geometry/GEMGeometry/interface/GEMGeometry.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Validation/MuonGEMDigis/interface/GEMDigiMatcher.h"
+#include "Validation/MuonGEMHits/interface/GEMTrackMatch.h"
+#include "Validation/MuonGEMHits/interface/SimHitMatcher.h"
 
-
-class GEMDigiTrackMatch : public GEMTrackMatch 
-{
+class GEMDigiTrackMatch : public GEMTrackMatch {
 public:
-  explicit GEMDigiTrackMatch(const edm::ParameterSet& ps);
+  explicit GEMDigiTrackMatch(const edm::ParameterSet &ps);
   ~GEMDigiTrackMatch() override;
-  void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const &) override;
-  void analyze(const edm::Event& e, const edm::EventSetup&) override;
- private:
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(const edm::Event &e, const edm::EventSetup &) override;
 
-  MonitorElement* track_eta[3];
-  MonitorElement* track_phi[3][3];
+private:
+  MonitorElement *track_eta[3];
+  MonitorElement *track_phi[3][3];
 
-  MonitorElement* dg_eta[4][3];
-  MonitorElement* dg_sh_eta[4][3]; 
-  MonitorElement* pad_eta[4][3];
-  MonitorElement* copad_eta[4][3];
+  MonitorElement *dg_eta[4][3];
+  MonitorElement *dg_sh_eta[4][3];
+  MonitorElement *pad_eta[4][3];
+  MonitorElement *copad_eta[4][3];
 
-  MonitorElement* dg_phi[4][3][3];
-  MonitorElement* dg_sh_phi[4][3][3]; 
-  MonitorElement* pad_phi[4][3][3];
-  MonitorElement* copad_phi[4][3][3];
+  MonitorElement *dg_phi[4][3][3];
+  MonitorElement *dg_sh_phi[4][3][3];
+  MonitorElement *pad_phi[4][3][3];
+  MonitorElement *copad_phi[4][3][3];
 
   edm::EDGetToken gem_digiToken_;
   edm::EDGetToken gem_padToken_;
   edm::EDGetToken gem_copadToken_;
 
-//  std::map< UInt_t , MonitorElement* > theStrip_dcEta;
-//  std::map< UInt_t , MonitorElement* > thePad_dcEta;
-//  std::map< UInt_t , MonitorElement* > theCoPad_dcEta; 
+  //  std::map< UInt_t , MonitorElement* > theStrip_dcEta;
+  //  std::map< UInt_t , MonitorElement* > thePad_dcEta;
+  //  std::map< UInt_t , MonitorElement* > theCoPad_dcEta;
 };
 
 #endif
diff --git a/Validation/MuonGEMDigis/interface/GEMPadDigiValidation.h b/Validation/MuonGEMDigis/interface/GEMPadDigiValidation.h
index c4e6215efc53a..5057fa0eecb4d 100644
--- a/Validation/MuonGEMDigis/interface/GEMPadDigiValidation.h
+++ b/Validation/MuonGEMDigis/interface/GEMPadDigiValidation.h
@@ -1,29 +1,29 @@
 #ifndef GEMPadDigiValidation_H
 #define GEMPadDigiValidation_H
 
-#include "Validation/MuonGEMHits/interface/GEMBaseValidation.h"
 #include "DataFormats/GEMDigi/interface/GEMPadDigiCollection.h"
+#include "Validation/MuonGEMHits/interface/GEMBaseValidation.h"
 
 //#include "DataFormats/Common/interface/Handle.h"
-class GEMPadDigiValidation : public GEMBaseValidation
-{
+class GEMPadDigiValidation : public GEMBaseValidation {
 public:
-  explicit GEMPadDigiValidation( const edm::ParameterSet& );
+  explicit GEMPadDigiValidation(const edm::ParameterSet &);
   ~GEMPadDigiValidation() override;
-  void analyze(const edm::Event& e, const edm::EventSetup&) override;
+  void analyze(const edm::Event &e, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
- private:
+
+private:
   // Detail plots
-  MonitorElement* theCSCPad_xy[2][3][2];
-  MonitorElement* theCSCPad_phipad[2][3][2];
-  MonitorElement* theCSCPad[2][3][2];
-  MonitorElement* theCSCPad_bx[2][3][2];
-  MonitorElement* theCSCPad_zr[2][3][2];
-	std::unordered_map< UInt_t , MonitorElement* > theCSCPad_xy_ch;
+  MonitorElement *theCSCPad_xy[2][3][2];
+  MonitorElement *theCSCPad_phipad[2][3][2];
+  MonitorElement *theCSCPad[2][3][2];
+  MonitorElement *theCSCPad_bx[2][3][2];
+  MonitorElement *theCSCPad_zr[2][3][2];
+  std::unordered_map<UInt_t, MonitorElement *> theCSCPad_xy_ch;
 
   // Simple plots
-  std::unordered_map< UInt_t , MonitorElement* > thePad_dcEta;
-  std::unordered_map< UInt_t , MonitorElement* > thePad_simple_zr;
+  std::unordered_map<UInt_t, MonitorElement *> thePad_dcEta;
+  std::unordered_map<UInt_t, MonitorElement *> thePad_simple_zr;
 
   edm::EDGetToken InputTagToken_;
   int nBinXY_;
diff --git a/Validation/MuonGEMDigis/interface/GEMStripDigiValidation.h b/Validation/MuonGEMDigis/interface/GEMStripDigiValidation.h
index 1215e84a82803..baec60c88e78e 100644
--- a/Validation/MuonGEMDigis/interface/GEMStripDigiValidation.h
+++ b/Validation/MuonGEMDigis/interface/GEMStripDigiValidation.h
@@ -1,34 +1,31 @@
 #ifndef GEMStripDigiValidation_H
 #define GEMStripDigiValidation_H
 
-
 #include "Validation/MuonGEMHits/interface/GEMBaseValidation.h"
 
 //#include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/GEMDigi/interface/GEMDigiCollection.h"
 
-class GEMStripDigiValidation : public GEMBaseValidation
-{
+class GEMStripDigiValidation : public GEMBaseValidation {
 public:
-  explicit GEMStripDigiValidation(const edm::ParameterSet&);
+  explicit GEMStripDigiValidation(const edm::ParameterSet &);
   ~GEMStripDigiValidation() override;
-  void analyze(const edm::Event& e, const edm::EventSetup&) override;
+  void analyze(const edm::Event &e, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
- private:
-
+private:
   // Detail plots
-  MonitorElement* theStrip_xy[2][3][2];
-  MonitorElement* theStrip_phistrip[2][3][2];
-  MonitorElement* theStrip[2][3][2];
-  MonitorElement* theStrip_bx[2][3][2];
-  MonitorElement* theStrip_zr[2][3][2];
-  std::unordered_map< UInt_t , MonitorElement* > theStrip_xy_ch;
+  MonitorElement *theStrip_xy[2][3][2];
+  MonitorElement *theStrip_phistrip[2][3][2];
+  MonitorElement *theStrip[2][3][2];
+  MonitorElement *theStrip_bx[2][3][2];
+  MonitorElement *theStrip_zr[2][3][2];
+  std::unordered_map<UInt_t, MonitorElement *> theStrip_xy_ch;
 
   // Simple plots
-  std::unordered_map< UInt_t , MonitorElement* > theStrip_dcEta;
-  std::unordered_map< UInt_t , MonitorElement* > theStrip_simple_zr;
-  
+  std::unordered_map<UInt_t, MonitorElement *> theStrip_dcEta;
+  std::unordered_map<UInt_t, MonitorElement *> theStrip_simple_zr;
+
   edm::EDGetToken InputTagToken_;
   int nBinXY_;
   bool detailPlot_;
diff --git a/Validation/MuonGEMDigis/interface/GenericDigi.h b/Validation/MuonGEMDigis/interface/GenericDigi.h
index 28627f21a19b1..554a9e4106f2f 100644
--- a/Validation/MuonGEMDigis/interface/GenericDigi.h
+++ b/Validation/MuonGEMDigis/interface/GenericDigi.h
@@ -18,51 +18,70 @@
 
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 
-#include <vector>
-#include <tuple>
 #include <iostream>
+#include <tuple>
+#include <vector>
 
 namespace matching {
 
-typedef enum {INVALID=0, GEM_STRIP, GEM_PAD, GEM_COPAD, CSC_STRIP, CSC_WIRE, CSC_CLCT, CSC_ALCT, CSC_LCT} DigiType;
-
-// digi info keeper: <detid, channel, bx, type, quality, bend, WireGroup>
-typedef std::tuple<unsigned int, int, int, DigiType, int, int, int, float> Digi;
-
-// digi collection
-typedef std::vector<Digi> DigiContainer;
-
-// digi makeres
-inline Digi make_digi() { return std::make_tuple(0, 0, 0, INVALID, 0, 0, 0, 0.); }
-inline Digi make_digi(unsigned int id, int ch, int bx, DigiType t) { return std::make_tuple(id, ch, bx, t, 0, 0, 0, 0.); }
-inline Digi make_digi(unsigned int id, int ch, int bx, DigiType t, int q) { return std::make_tuple(id, ch, bx, t, q, 0, 0, 0.); }
-inline Digi make_digi(unsigned int id, int ch, int bx, DigiType t, int q, int pat) { return std::make_tuple(id, ch, bx, t, q, pat, 0, 0.); }
-inline Digi make_digi(unsigned int id, int ch, int bx, DigiType t, int q, int pat, int wg) { return std::make_tuple(id, ch, bx, t, q, pat, wg, 0.); }
-inline Digi make_digi(unsigned int id, int ch, int bx, DigiType t, int q, int pat, int wg, float dphi) { return std::make_tuple(id, ch, bx, t, q, pat, wg, dphi); }
-
-// digi accessors
-inline bool is_valid(const Digi& d) {return std::get<0>(d) != INVALID; }
-
-inline unsigned int digi_id(const Digi& d) { return std::get<0>(d); }
-inline int digi_channel(const Digi& d) { return std::get<1>(d); }
-inline int digi_bx(const Digi& d) { return std::get<2>(d); }
-inline DigiType digi_type(const Digi& d) { return std::get<3>(d); }
-inline int digi_quality(const Digi& d) { return std::get<4>(d); }
-inline int digi_pattern(const Digi& d) { return std::get<5>(d); }
-
-// can access and also modify the WG value by reference with this one
-int& digi_wg(Digi& d);
-// only read for const digi
-int digi_wg(const Digi& d);
-
-// can access and also modify the dphi value by reference with this one
-inline float& digi_dphi(Digi& d) { return std::get<7>(d); }
-// only read for const digi
-inline float digi_dphi(const Digi& d) { return std::get<7>(d); }
-
-}
-
-std::ostream & operator<<(std::ostream & o, const matching::Digi& d);
+  typedef enum {
+    INVALID = 0,
+    GEM_STRIP,
+    GEM_PAD,
+    GEM_COPAD,
+    CSC_STRIP,
+    CSC_WIRE,
+    CSC_CLCT,
+    CSC_ALCT,
+    CSC_LCT
+  } DigiType;
+
+  // digi info keeper: <detid, channel, bx, type, quality, bend, WireGroup>
+  typedef std::tuple<unsigned int, int, int, DigiType, int, int, int, float> Digi;
+
+  // digi collection
+  typedef std::vector<Digi> DigiContainer;
+
+  // digi makeres
+  inline Digi make_digi() { return std::make_tuple(0, 0, 0, INVALID, 0, 0, 0, 0.); }
+  inline Digi make_digi(unsigned int id, int ch, int bx, DigiType t) {
+    return std::make_tuple(id, ch, bx, t, 0, 0, 0, 0.);
+  }
+  inline Digi make_digi(unsigned int id, int ch, int bx, DigiType t, int q) {
+    return std::make_tuple(id, ch, bx, t, q, 0, 0, 0.);
+  }
+  inline Digi make_digi(unsigned int id, int ch, int bx, DigiType t, int q, int pat) {
+    return std::make_tuple(id, ch, bx, t, q, pat, 0, 0.);
+  }
+  inline Digi make_digi(unsigned int id, int ch, int bx, DigiType t, int q, int pat, int wg) {
+    return std::make_tuple(id, ch, bx, t, q, pat, wg, 0.);
+  }
+  inline Digi make_digi(unsigned int id, int ch, int bx, DigiType t, int q, int pat, int wg, float dphi) {
+    return std::make_tuple(id, ch, bx, t, q, pat, wg, dphi);
+  }
+
+  // digi accessors
+  inline bool is_valid(const Digi &d) { return std::get<0>(d) != INVALID; }
+
+  inline unsigned int digi_id(const Digi &d) { return std::get<0>(d); }
+  inline int digi_channel(const Digi &d) { return std::get<1>(d); }
+  inline int digi_bx(const Digi &d) { return std::get<2>(d); }
+  inline DigiType digi_type(const Digi &d) { return std::get<3>(d); }
+  inline int digi_quality(const Digi &d) { return std::get<4>(d); }
+  inline int digi_pattern(const Digi &d) { return std::get<5>(d); }
+
+  // can access and also modify the WG value by reference with this one
+  int &digi_wg(Digi &d);
+  // only read for const digi
+  int digi_wg(const Digi &d);
+
+  // can access and also modify the dphi value by reference with this one
+  inline float &digi_dphi(Digi &d) { return std::get<7>(d); }
+  // only read for const digi
+  inline float digi_dphi(const Digi &d) { return std::get<7>(d); }
+
+}  // namespace matching
+
+std::ostream &operator<<(std::ostream &o, const matching::Digi &d);
 
 #endif
-
diff --git a/Validation/MuonGEMDigis/plugins/MuonGEMDigisHarvestor.cc b/Validation/MuonGEMDigis/plugins/MuonGEMDigisHarvestor.cc
index cc89a1a9d84b8..3fad3024c7371 100644
--- a/Validation/MuonGEMDigis/plugins/MuonGEMDigisHarvestor.cc
+++ b/Validation/MuonGEMDigis/plugins/MuonGEMDigisHarvestor.cc
@@ -2,52 +2,50 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "TTree.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 #include "TFile.h"
 #include "TGraphAsymmErrors.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Utilities/interface/InputTag.h"
+#include "TTree.h"
 
-///Data Format
+/// Data Format
+#include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/GEMDigi/interface/GEMDigiCollection.h"
 #include "DataFormats/GEMDigi/interface/GEMPadDigiCollection.h"
-#include "DataFormats/MuonDetId/interface/GEMDetId.h"
 #include "DataFormats/GeometrySurface/interface/LocalError.h"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
-#include "DataFormats/Scalers/interface/DcsStatus.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/Math/interface/deltaPhi.h"
+#include "DataFormats/MuonDetId/interface/GEMDetId.h"
+#include "DataFormats/Scalers/interface/DcsStatus.h"
 
-#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-///Geometry
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
+/// Geometry
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
-#include "Geometry/GEMGeometry/interface/GEMGeometry.h"
+#include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/GEMGeometry/interface/GEMEtaPartition.h"
 #include "Geometry/GEMGeometry/interface/GEMEtaPartitionSpecs.h"
-#include "Geometry/CommonTopologies/interface/StripTopology.h"
+#include "Geometry/GEMGeometry/interface/GEMGeometry.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 
-///Log messages
+/// Log messages
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "Validation/MuonGEMDigis/plugins/MuonGEMDigisHarvestor.h"
 #include "Validation/MuonGEMHits/interface/GEMDetLabel.h"
 
-MuonGEMDigisHarvestor::MuonGEMDigisHarvestor(const edm::ParameterSet& ps)
-{
+MuonGEMDigisHarvestor::MuonGEMDigisHarvestor(const edm::ParameterSet &ps) {
   dbe_path_ = ps.getParameter<std::string>("dbePath");
   dbe_hist_prefix_ = ps.getParameter<std::string>("dbeHistPrefix");
   compareable_dbe_path_ = ps.getParameter<std::string>("compareDBEPath");
@@ -56,97 +54,105 @@ MuonGEMDigisHarvestor::MuonGEMDigisHarvestor(const edm::ParameterSet& ps)
   outputFile_ = ps.getUntrackedParameter<std::string>("outputFile", "myfile.root");
 }
 
-
-MuonGEMDigisHarvestor::~MuonGEMDigisHarvestor()
-{
-}
-TProfile* MuonGEMDigisHarvestor::ComputeEff(TH1F* num, TH1F* denum )
-{
-  std::string name  = "eff_"+std::string(num->GetName());
-  std::string title = "Eff. "+std::string(num->GetTitle());
-  TProfile * efficHist = new TProfile(name.c_str(), title.c_str(),denum->GetXaxis()->GetNbins(), denum->GetXaxis()->GetXmin(),denum->GetXaxis()->GetXmax());
-
-  for (int i=1; i <= denum->GetNbinsX(); i++) {
-
+MuonGEMDigisHarvestor::~MuonGEMDigisHarvestor() {}
+TProfile *MuonGEMDigisHarvestor::ComputeEff(TH1F *num, TH1F *denum) {
+  std::string name = "eff_" + std::string(num->GetName());
+  std::string title = "Eff. " + std::string(num->GetTitle());
+  TProfile *efficHist = new TProfile(name.c_str(),
+                                     title.c_str(),
+                                     denum->GetXaxis()->GetNbins(),
+                                     denum->GetXaxis()->GetXmin(),
+                                     denum->GetXaxis()->GetXmax());
+
+  for (int i = 1; i <= denum->GetNbinsX(); i++) {
     double nNum = num->GetBinContent(i);
     double nDenum = denum->GetBinContent(i);
-    if ( nDenum == 0 || nNum ==0  ) {
+    if (nDenum == 0 || nNum == 0) {
       continue;
     }
-    if ( nNum > nDenum ) {
+    if (nNum > nDenum) {
       double temp = nDenum;
       nDenum = nNum;
       nNum = temp;
-      LogDebug("MuonGEMDigisHarvestor")<<"Alert! specific bin's num is bigger than denum";
+      LogDebug("MuonGEMDigisHarvestor") << "Alert! specific bin's num is bigger than denum";
     }
-    const double effVal = nNum/nDenum;
+    const double effVal = nNum / nDenum;
     efficHist->SetBinContent(i, effVal);
-    efficHist->SetBinEntries(i,1);
-    efficHist->SetBinError(i,0);
-    const double errLo = TEfficiency::ClopperPearson((int)nDenum,(int)nNum,0.683,false);
-    const double errUp = TEfficiency::ClopperPearson((int)nDenum,(int)nNum,0.683,true);
+    efficHist->SetBinEntries(i, 1);
+    efficHist->SetBinError(i, 0);
+    const double errLo = TEfficiency::ClopperPearson((int)nDenum, (int)nNum, 0.683, false);
+    const double errUp = TEfficiency::ClopperPearson((int)nDenum, (int)nNum, 0.683, true);
     const double errVal = (effVal - errLo > errUp - effVal) ? effVal - errLo : errUp - effVal;
     efficHist->SetBinError(i, sqrt(effVal * effVal + errVal * errVal));
   }
   return efficHist;
 }
 
-void MuonGEMDigisHarvestor::ProcessBooking( DQMStore::IBooker& ibooker, DQMStore::IGetter& ig, const char* label, TString suffix, TH1F* track_hist, TH1F* sh_hist )
-{
-  TString dbe_label = TString(dbe_path_)+label+suffix;
-  if( ig.get(dbe_label.Data()) != nullptr && sh_hist !=nullptr && track_hist !=nullptr ) {
-    TH1F* hist =    (TH1F*)ig.get( dbe_label.Data() )->getTH1F()->Clone();
-    TProfile* profile = ComputeEff( hist, track_hist);
-    TProfile* profile_sh = ComputeEff( hist, sh_hist );
-    profile_sh->SetName( (profile->GetName()+std::string("_sh")).c_str());
+void MuonGEMDigisHarvestor::ProcessBooking(DQMStore::IBooker &ibooker,
+                                           DQMStore::IGetter &ig,
+                                           const char *label,
+                                           TString suffix,
+                                           TH1F *track_hist,
+                                           TH1F *sh_hist) {
+  TString dbe_label = TString(dbe_path_) + label + suffix;
+  if (ig.get(dbe_label.Data()) != nullptr && sh_hist != nullptr && track_hist != nullptr) {
+    TH1F *hist = (TH1F *)ig.get(dbe_label.Data())->getTH1F()->Clone();
+    TProfile *profile = ComputeEff(hist, track_hist);
+    TProfile *profile_sh = ComputeEff(hist, sh_hist);
+    profile_sh->SetName((profile->GetName() + std::string("_sh")).c_str());
     TString x_axis_title = TString(hist->GetXaxis()->GetTitle());
-    TString title  = TString::Format("Eff. for a SimTrack to have an associated GEM digi in %s;%s;Eff.",suffix.Data(),x_axis_title.Data());
-    TString title2 = TString::Format("Eff. for a SimTrack to have an associated GEM digi in %s with a matched SimHit;%s;Eff.",suffix.Data(),x_axis_title.Data() );
-    profile->SetTitle( title.Data());
-    profile_sh->SetTitle( title2.Data() );
-    ibooker.bookProfile( profile->GetName(),profile); 
-    ibooker.bookProfile( profile_sh->GetName(),profile_sh); 
-  }
-  else {
-    LogDebug("MuonGEMDigisHarvestor")<<"Can not found histogram of "<<dbe_label; 
-    if ( track_hist == nullptr) LogDebug("MuonGEMDigisHarvestor")<<"track not found";
-    if ( sh_hist    == nullptr) LogDebug("MuonGEMDigisHarvestor")<<"sh_hist not found";
+    TString title = TString::Format(
+        "Eff. for a SimTrack to have an associated GEM digi in %s;%s;Eff.", suffix.Data(), x_axis_title.Data());
+    TString title2 = TString::Format(
+        "Eff. for a SimTrack to have an associated GEM digi in "
+        "%s with a matched SimHit;%s;Eff.",
+        suffix.Data(),
+        x_axis_title.Data());
+    profile->SetTitle(title.Data());
+    profile_sh->SetTitle(title2.Data());
+    ibooker.bookProfile(profile->GetName(), profile);
+    ibooker.bookProfile(profile_sh->GetName(), profile_sh);
+  } else {
+    LogDebug("MuonGEMDigisHarvestor") << "Can not found histogram of " << dbe_label;
+    if (track_hist == nullptr)
+      LogDebug("MuonGEMDigisHarvestor") << "track not found";
+    if (sh_hist == nullptr)
+      LogDebug("MuonGEMDigisHarvestor") << "sh_hist not found";
   }
   return;
 }
 
-
-void 
-MuonGEMDigisHarvestor::dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::IGetter& ig)
-{
+void MuonGEMDigisHarvestor::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &ig) {
   ig.setCurrentFolder(dbe_path_);
-  TH1F* gem_trk_eta[3];
-  TH1F* gem_trk_phi[3][2];  
-
-  TH1F* sh_eta[3][4];
-  TH1F* sh_phi[3][4][3];
-
+  TH1F *gem_trk_eta[3];
+  TH1F *gem_trk_phi[3][2];
 
+  TH1F *sh_eta[3][4];
+  TH1F *sh_phi[3][4][3];
 
   // simplePlots
   /*
   for( int region = -1 ; region <= 1 ; region = region+2) {
     for ( int station = 0 ; station <2 ; station++) {
       if ( station ==1 ) station=2 ;
-      TString dcEta_label = TString::Format("%s%s_r%d%s",dbe_path_.c_str(),dbe_hist_prefix_.c_str(), region, s_suffix[station].c_str());
-      TString denum_dcEta_label = TString::Format("%s%s_r%d%s",compareable_dbe_path_.c_str(),compareable_dbe_hist_prefix_.c_str(), region, s_suffix[station].c_str());
-
- 
-        if ( ig.get( dcEta_label.Data()) != nullptr && ig.get( denum_dcEta_label.Data()) != nullptr) {
-        TH2F* dcEta = (TH2F*)ig.get( dcEta_label.Data())->getTH2F()->Clone();
-        TH2F* denum_dcEta = (TH2F*)ig.get( denum_dcEta_label.Data())->getTH2F()->Clone();
-        dcEta->Divide(denum_dcEta);
+      TString dcEta_label =
+  TString::Format("%s%s_r%d%s",dbe_path_.c_str(),dbe_hist_prefix_.c_str(),
+  region, s_suffix[station].c_str()); TString denum_dcEta_label =
+  TString::Format("%s%s_r%d%s",compareable_dbe_path_.c_str(),compareable_dbe_hist_prefix_.c_str(),
+  region, s_suffix[station].c_str());
+
+
+        if ( ig.get( dcEta_label.Data()) != nullptr && ig.get(
+  denum_dcEta_label.Data()) != nullptr) { TH2F* dcEta = (TH2F*)ig.get(
+  dcEta_label.Data())->getTH2F()->Clone(); TH2F* denum_dcEta = (TH2F*)ig.get(
+  denum_dcEta_label.Data())->getTH2F()->Clone(); dcEta->Divide(denum_dcEta);
         TH2F* eff_dcEta = (TH2F*)dcEta->Clone();
 
-        TString eff_dcEta_title = TString::Format("Hits Efficiency on detector component at r%d%s",region,s_suffix[station].c_str());
-        TString eff_dcEta_label = TString::Format("eff_DigiHit_r%d%s",region,s_suffix[station].c_str());
+        TString eff_dcEta_title = TString::Format("Hits Efficiency on detector
+  component at r%d%s",region,s_suffix[station].c_str()); TString eff_dcEta_label
+  = TString::Format("eff_DigiHit_r%d%s",region,s_suffix[station].c_str());
+
 
-     
         eff_dcEta->SetName( eff_dcEta_label.Data());
         eff_dcEta->SetTitle( eff_dcEta_title.Data());
 
@@ -164,53 +170,54 @@ MuonGEMDigisHarvestor::dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::IGetter&
   using namespace GEMDetLabel;
 
   // detailPlots
-  for( unsigned int i = 0 ; i < s_suffix.size() ; i++) {
-    TString eta_label = TString(dbe_path_)+"track_eta"+s_suffix[i];
+  for (unsigned int i = 0; i < s_suffix.size(); i++) {
+    TString eta_label = TString(dbe_path_) + "track_eta" + s_suffix[i];
     TString phi_label;
-    if ( ig.get(eta_label.Data()) != nullptr ) {
-      gem_trk_eta[i] = (TH1F*)ig.get(eta_label.Data())->getTH1F()->Clone();
+    if (ig.get(eta_label.Data()) != nullptr) {
+      gem_trk_eta[i] = (TH1F *)ig.get(eta_label.Data())->getTH1F()->Clone();
       gem_trk_eta[i]->Sumw2();
-    }
-    else LogDebug("MuonGEMDigisHarvestor")<<"Can not found track_eta";
-    for ( unsigned int k=0 ; k < c_suffix.size() ; k++) {
-      phi_label = TString(dbe_path_.c_str())+"track_phi"+s_suffix[i]+c_suffix[k];
-      if ( ig.get(phi_label.Data()) !=nullptr ) {
-        gem_trk_phi[i][k] = (TH1F*)ig.get(phi_label.Data())->getTH1F()->Clone();
+    } else
+      LogDebug("MuonGEMDigisHarvestor") << "Can not found track_eta";
+    for (unsigned int k = 0; k < c_suffix.size(); k++) {
+      phi_label = TString(dbe_path_.c_str()) + "track_phi" + s_suffix[i] + c_suffix[k];
+      if (ig.get(phi_label.Data()) != nullptr) {
+        gem_trk_phi[i][k] = (TH1F *)ig.get(phi_label.Data())->getTH1F()->Clone();
         gem_trk_phi[i][k]->Sumw2();
-      }
-      else LogDebug("MuonGEMDigisHarvestor")<<"Can not found track_phi";
+      } else
+        LogDebug("MuonGEMDigisHarvestor") << "Can not found track_phi";
     }
 
-    if ( ig.get(eta_label.Data()) != nullptr && ig.get(phi_label.Data()) !=nullptr ) {
-      for( unsigned int j = 0; j < l_suffix.size() ; j++) { 
-        TString suffix = TString( s_suffix[i] )+TString( l_suffix[j]);
-        TString eta_label = TString(dbe_path_)+"dg_sh_eta"+suffix;
-        if( ig.get(eta_label.Data()) !=nullptr ) {
-          sh_eta[i][j] = (TH1F*)ig.get(eta_label.Data())->getTH1F()->Clone();
+    if (ig.get(eta_label.Data()) != nullptr && ig.get(phi_label.Data()) != nullptr) {
+      for (unsigned int j = 0; j < l_suffix.size(); j++) {
+        TString suffix = TString(s_suffix[i]) + TString(l_suffix[j]);
+        TString eta_label = TString(dbe_path_) + "dg_sh_eta" + suffix;
+        if (ig.get(eta_label.Data()) != nullptr) {
+          sh_eta[i][j] = (TH1F *)ig.get(eta_label.Data())->getTH1F()->Clone();
           sh_eta[i][j]->Sumw2();
-        }
-        else LogDebug("MuonGEMDigisHarvestor")<<"Can not found eta histogram : "<<eta_label;
-        ProcessBooking( ibooker, ig, "dg_eta", suffix, gem_trk_eta[i], sh_eta[i][j]); 
-        ProcessBooking( ibooker, ig, "pad_eta", suffix, gem_trk_eta[i], sh_eta[i][j]); 
-        ProcessBooking( ibooker, ig, "copad_eta", suffix, gem_trk_eta[i], sh_eta[i][j]); 
-        for ( unsigned int k = 0 ; k < c_suffix.size() ; k++) {
-          suffix = TString( s_suffix[i])+TString( l_suffix[j]) +TString(c_suffix[k]);
-          TString phi_label = TString(dbe_path_)+"dg_sh_phi"+suffix;
-          if( ig.get(phi_label.Data()) !=nullptr ) {
-            sh_phi[i][j][k] = (TH1F*)ig.get(phi_label.Data())->getTH1F()->Clone();
+        } else
+          LogDebug("MuonGEMDigisHarvestor") << "Can not found eta histogram : " << eta_label;
+        ProcessBooking(ibooker, ig, "dg_eta", suffix, gem_trk_eta[i], sh_eta[i][j]);
+        ProcessBooking(ibooker, ig, "pad_eta", suffix, gem_trk_eta[i], sh_eta[i][j]);
+        ProcessBooking(ibooker, ig, "copad_eta", suffix, gem_trk_eta[i], sh_eta[i][j]);
+        for (unsigned int k = 0; k < c_suffix.size(); k++) {
+          suffix = TString(s_suffix[i]) + TString(l_suffix[j]) + TString(c_suffix[k]);
+          TString phi_label = TString(dbe_path_) + "dg_sh_phi" + suffix;
+          if (ig.get(phi_label.Data()) != nullptr) {
+            sh_phi[i][j][k] = (TH1F *)ig.get(phi_label.Data())->getTH1F()->Clone();
             sh_phi[i][j][k]->Sumw2();
+          } else {
+            LogDebug("MuonGEMDigisHarvestor") << "Can not found phi plots : " << phi_label;
+            continue;
           }
-          else { LogDebug("MuonGEMDigisHarvestor")<<"Can not found phi plots : "<<phi_label; continue; }
-          ProcessBooking( ibooker, ig, "dg_phi",suffix, gem_trk_phi[i][k], sh_phi[i][j][k]);      
-          ProcessBooking( ibooker, ig, "pad_phi",suffix,gem_trk_phi[i][k], sh_phi[i][j][k]);
-          ProcessBooking( ibooker, ig, "copad_phi",suffix,gem_trk_phi[i][k], sh_phi[i][j][k]);
+          ProcessBooking(ibooker, ig, "dg_phi", suffix, gem_trk_phi[i][k], sh_phi[i][j][k]);
+          ProcessBooking(ibooker, ig, "pad_phi", suffix, gem_trk_phi[i][k], sh_phi[i][j][k]);
+          ProcessBooking(ibooker, ig, "copad_phi", suffix, gem_trk_phi[i][k], sh_phi[i][j][k]);
         }
       }
-    }
-    else LogDebug("MuonGEMDigisHarvestor")<<"Can not find eta or phi of all track";
+    } else
+      LogDebug("MuonGEMDigisHarvestor") << "Can not find eta or phi of all track";
   }
 }
 
-
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(MuonGEMDigisHarvestor);
diff --git a/Validation/MuonGEMDigis/plugins/MuonGEMDigisHarvestor.h b/Validation/MuonGEMDigis/plugins/MuonGEMDigisHarvestor.h
index 46efe50637c55..59af98d4aa7e9 100644
--- a/Validation/MuonGEMDigis/plugins/MuonGEMDigisHarvestor.h
+++ b/Validation/MuonGEMDigis/plugins/MuonGEMDigisHarvestor.h
@@ -1,37 +1,36 @@
 #ifndef MuonGEMDigisHarvestor_H
 #define MuonGEMDigisHarvestor_H
 
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 
-
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
-#include "SimMuon/MCTruth/interface/PSimHitMap.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "Geometry/GEMGeometry/interface/GEMGeometry.h"
+#include "SimMuon/MCTruth/interface/PSimHitMap.h"
 
-#include "Validation/MuonGEMDigis/interface/GEMStripDigiValidation.h"
-#include "Validation/MuonGEMDigis/interface/GEMPadDigiValidation.h"
 #include "Validation/MuonGEMDigis/interface/GEMCoPadDigiValidation.h"
+#include "Validation/MuonGEMDigis/interface/GEMPadDigiValidation.h"
+#include "Validation/MuonGEMDigis/interface/GEMStripDigiValidation.h"
 #include <TEfficiency.h>
 #include <TGraphAsymmErrors.h>
 #include <TProfile.h>
 
-class MuonGEMDigisHarvestor : public DQMEDHarvester
-{
+class MuonGEMDigisHarvestor : public DQMEDHarvester {
 public:
   /// constructor
-  explicit MuonGEMDigisHarvestor(const edm::ParameterSet&);
+  explicit MuonGEMDigisHarvestor(const edm::ParameterSet &);
   /// destructor
   ~MuonGEMDigisHarvestor() override;
 
   void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
-  void ProcessBooking( DQMStore::IBooker& , DQMStore::IGetter&, const char* label, TString suffix, TH1F* track_hist, TH1F* sh_hist );
-  TProfile* ComputeEff(TH1F* num, TH1F* denum );
+  void ProcessBooking(
+      DQMStore::IBooker &, DQMStore::IGetter &, const char *label, TString suffix, TH1F *track_hist, TH1F *sh_hist);
+  TProfile *ComputeEff(TH1F *num, TH1F *denum);
 
 private:
-  std::string dbe_path_,dbe_hist_prefix_,compareable_dbe_path_,compareable_dbe_hist_prefix_ ,outputFile_;
-//  std::string dbe_strip_prefix_, dbe_pad_prefix_, dbe_copad_prefix_;
+  std::string dbe_path_, dbe_hist_prefix_, compareable_dbe_path_, compareable_dbe_hist_prefix_, outputFile_;
+  //  std::string dbe_strip_prefix_, dbe_pad_prefix_, dbe_copad_prefix_;
 };
 #endif
diff --git a/Validation/MuonGEMDigis/plugins/MuonGEMDigisValidator.cc b/Validation/MuonGEMDigis/plugins/MuonGEMDigisValidator.cc
index 25d5b900092bb..11ff3c9b3cdd0 100644
--- a/Validation/MuonGEMDigis/plugins/MuonGEMDigisValidator.cc
+++ b/Validation/MuonGEMDigis/plugins/MuonGEMDigisValidator.cc
@@ -1,13 +1,12 @@
-#include "Validation/MuonGEMDigis/interface/GEMStripDigiValidation.h"
-#include "Validation/MuonGEMDigis/interface/GEMPadDigiValidation.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "Validation/MuonGEMDigis/interface/GEMCheckGeometry.h"
 #include "Validation/MuonGEMDigis/interface/GEMCoPadDigiValidation.h"
 #include "Validation/MuonGEMDigis/interface/GEMDigiTrackMatch.h"
-#include "Validation/MuonGEMDigis/interface/GEMCheckGeometry.h"
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-DEFINE_FWK_MODULE (GEMStripDigiValidation) ;
-DEFINE_FWK_MODULE (GEMPadDigiValidation) ;
-DEFINE_FWK_MODULE (GEMCoPadDigiValidation) ;
-DEFINE_FWK_MODULE (GEMDigiTrackMatch) ;
-DEFINE_FWK_MODULE (GEMCheckGeometry) ;
-
+#include "Validation/MuonGEMDigis/interface/GEMPadDigiValidation.h"
+#include "Validation/MuonGEMDigis/interface/GEMStripDigiValidation.h"
+DEFINE_FWK_MODULE(GEMStripDigiValidation);
+DEFINE_FWK_MODULE(GEMPadDigiValidation);
+DEFINE_FWK_MODULE(GEMCoPadDigiValidation);
+DEFINE_FWK_MODULE(GEMDigiTrackMatch);
+DEFINE_FWK_MODULE(GEMCheckGeometry);
diff --git a/Validation/MuonGEMDigis/src/GEMCheckGeometry.cc b/Validation/MuonGEMDigis/src/GEMCheckGeometry.cc
index b1fd97a536a6b..4b440d1ccf56d 100644
--- a/Validation/MuonGEMDigis/src/GEMCheckGeometry.cc
+++ b/Validation/MuonGEMDigis/src/GEMCheckGeometry.cc
@@ -1,112 +1,91 @@
-#include "Validation/MuonGEMDigis/interface/GEMCheckGeometry.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
+#include "Geometry/GEMGeometry/interface/GEMEtaPartitionSpecs.h"
 #include "Geometry/GEMGeometry/interface/GEMGeometry.h"
-#include "Geometry/GEMGeometry/interface/GEMEtaPartitionSpecs.h" 
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
-#include "DataFormats/Common/interface/Handle.h"
+#include "Validation/MuonGEMDigis/interface/GEMCheckGeometry.h"
 
 #include <iomanip>
 
-GEMCheckGeometry::GEMCheckGeometry(const edm::ParameterSet& gc)
-{
-  
-  GE11PhiBegin_ = gc.getUntrackedParameter< double >("GE11PhiBegin",-5.) ;
-  GE11PhiStep_ = gc.getUntrackedParameter< double >("GE11PhiStep",10) ;
-  minPhi_ = gc.getUntrackedParameter< double >("minPhi",-180.);
-  maxPhi_ = gc.getUntrackedParameter< double >("maxPhi",+180.);
-  detailPlot_ = gc.getParameter< bool >("detailPlot"); 
+GEMCheckGeometry::GEMCheckGeometry(const edm::ParameterSet &gc) {
+  GE11PhiBegin_ = gc.getUntrackedParameter<double>("GE11PhiBegin", -5.);
+  GE11PhiStep_ = gc.getUntrackedParameter<double>("GE11PhiStep", 10);
+  minPhi_ = gc.getUntrackedParameter<double>("minPhi", -180.);
+  maxPhi_ = gc.getUntrackedParameter<double>("maxPhi", +180.);
+  detailPlot_ = gc.getParameter<bool>("detailPlot");
 }
 
+void GEMCheckGeometry::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &Run, edm::EventSetup const &iSetup) {
+  if (!detailPlot_)
+    return;
+  const GEMGeometry *GEMGeometry_;
 
-void GEMCheckGeometry::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & Run, edm::EventSetup const & iSetup) {
-
-  if ( !detailPlot_ ) return ; 
-  const GEMGeometry* GEMGeometry_;
-
-  try{
+  try {
     edm::ESHandle<GEMGeometry> hGeom;
     iSetup.get<MuonGeometryRecord>().get(hGeom);
-    GEMGeometry_=&*hGeom;
-  }
-  catch(edm::eventsetup::NoProxyException<GEMGeometry>& e){
+    GEMGeometry_ = &*hGeom;
+  } catch (edm::eventsetup::NoProxyException<GEMGeometry> &e) {
     edm::LogError("MuonGEMGeometry") << "+++ Error : GEM geometry  is unavailable on event loop. +++\n";
     return;
   }
 
   ibooker.setCurrentFolder("MuonGEMDigisV/GEMDigisTask");
-  LogDebug("GEMCheckGeometry")<<"ibooker set current folder\n";
-  
-  for( auto region : GEMGeometry_->regions()) {
-        TString title = TString::Format("Geometry's phi distribution on Region %d ; #phi(degree); ;",region->region());
-        TString name  = TString::Format("geo_phi_r%d",region->region());
-        auto temp_me = ibooker.book2D(name.Data(), title.Data(), 360000, -180., 180, 12,1,13);
-        temp_me->setBinLabel(1,"St1,La1_even",2);
-        temp_me->setBinLabel(2,"St1,La1_odd",2);
-        temp_me->setBinLabel(3,"St1,La2_even",2);
-        temp_me->setBinLabel(4,"St1,La2_odd",2);
-        temp_me->setBinLabel(5,"St2,La1_even",2);
-        temp_me->setBinLabel(6,"St2,La1_odd",2);
-        temp_me->setBinLabel(7,"St2,La2_even",2);
-        temp_me->setBinLabel(8,"St2,La2_odd",2);
-        theStdPlots.insert( std::map< UInt_t, MonitorElement*>::value_type(name.Hash(), temp_me ));
-   }
-
+  LogDebug("GEMCheckGeometry") << "ibooker set current folder\n";
+
+  for (auto region : GEMGeometry_->regions()) {
+    TString title = TString::Format("Geometry's phi distribution on Region %d ; #phi(degree); ;", region->region());
+    TString name = TString::Format("geo_phi_r%d", region->region());
+    auto temp_me = ibooker.book2D(name.Data(), title.Data(), 360000, -180., 180, 12, 1, 13);
+    temp_me->setBinLabel(1, "St1,La1_even", 2);
+    temp_me->setBinLabel(2, "St1,La1_odd", 2);
+    temp_me->setBinLabel(3, "St1,La2_even", 2);
+    temp_me->setBinLabel(4, "St1,La2_odd", 2);
+    temp_me->setBinLabel(5, "St2,La1_even", 2);
+    temp_me->setBinLabel(6, "St2,La1_odd", 2);
+    temp_me->setBinLabel(7, "St2,La2_even", 2);
+    temp_me->setBinLabel(8, "St2,La2_odd", 2);
+    theStdPlots.insert(std::map<UInt_t, MonitorElement *>::value_type(name.Hash(), temp_me));
+  }
 
-  for( auto region : GEMGeometry_->regions())
+  for (auto region : GEMGeometry_->regions())
     for (auto station : region->stations())
-      for ( auto ring : station->rings())
-        for ( auto sch : ring->superChambers())
-          for ( auto ch : sch->chambers())
-            for ( auto roll : ch->etaPartitions()) {
-              const StripTopology* topology(&(roll->specificTopology()));
+      for (auto ring : station->rings())
+        for (auto sch : ring->superChambers())
+          for (auto ch : sch->chambers())
+            for (auto roll : ch->etaPartitions()) {
+              const StripTopology *topology(&(roll->specificTopology()));
               auto parameters(roll->specs()->parameters());
               float nStrips(parameters[3]);
-              for( int strip = 0 ; strip <=nStrips ; strip++) {
+              for (int strip = 0; strip <= nStrips; strip++) {
                 LocalPoint lEdge(topology->localPosition(strip));
-                //double x = roll->toGlobal(lEdge).x();
+                // double x = roll->toGlobal(lEdge).x();
 
-
-
-             //double y = roll->toGlobal(lEdge).y();
-                //double z = roll->toGlobal(lEdge).z();
-                //double eta = roll->toGlobal(lEdge).eta();
+                // double y = roll->toGlobal(lEdge).y();
+                // double z = roll->toGlobal(lEdge).z();
+                // double eta = roll->toGlobal(lEdge).eta();
                 double phi = roll->toGlobal(lEdge).phi().degrees();
-                
-                GEMDetId id( roll->id()) ;
+
+                GEMDetId id(roll->id());
                 int region_idx = id.region();
                 int station_idx = id.station();
                 int chamber_idx = id.chamber();
                 int layer_idx = id.layer();
-                //int roll_idx = id.roll();
-                int value = (station_idx-1)*4+(layer_idx-1)*2+(chamber_idx%2)+1;
-                
-                if ( region_idx ==1 ) {
-                UInt_t hash = TString("geo_phi_r1").Hash();
-                theStdPlots[hash]  ->Fill( phi, value);
-                }
-                else {
+                // int roll_idx = id.roll();
+                int value = (station_idx - 1) * 4 + (layer_idx - 1) * 2 + (chamber_idx % 2) + 1;
+
+                if (region_idx == 1) {
+                  UInt_t hash = TString("geo_phi_r1").Hash();
+                  theStdPlots[hash]->Fill(phi, value);
+                } else {
                   UInt_t hash = TString("geo_phi_r-1").Hash();
-                  theStdPlots[hash]  ->Fill( phi, value);
+                  theStdPlots[hash]->Fill(phi, value);
                 }
-                
               }
             }
-
-
-}
- 
-
-GEMCheckGeometry::~GEMCheckGeometry() {
- 
-
-}
-
-void GEMCheckGeometry::analyze(const edm::Event& e, const edm::EventSetup&) {
-
-
 }
 
+GEMCheckGeometry::~GEMCheckGeometry() {}
 
-
+void GEMCheckGeometry::analyze(const edm::Event &e, const edm::EventSetup &) {}
diff --git a/Validation/MuonGEMDigis/src/GEMCoPadDigiValidation.cc b/Validation/MuonGEMDigis/src/GEMCoPadDigiValidation.cc
index c6b46c365096a..ff8842f90c19f 100644
--- a/Validation/MuonGEMDigis/src/GEMCoPadDigiValidation.cc
+++ b/Validation/MuonGEMDigis/src/GEMCoPadDigiValidation.cc
@@ -1,103 +1,125 @@
 #include "Validation/MuonGEMDigis/interface/GEMCoPadDigiValidation.h"
 #include <TMath.h>
 
-GEMCoPadDigiValidation::GEMCoPadDigiValidation(const edm::ParameterSet& cfg): GEMBaseValidation(cfg)
-{
+GEMCoPadDigiValidation::GEMCoPadDigiValidation(const edm::ParameterSet &cfg) : GEMBaseValidation(cfg) {
   InputTagToken_ = consumes<GEMCoPadDigiCollection>(cfg.getParameter<edm::InputTag>("CopadLabel"));
   detailPlot_ = cfg.getParameter<bool>("detailPlot");
-  minBXGEM_ = cfg.getParameter<int>("minBXGEM"); 
-  maxBXGEM_ = cfg.getParameter<int>("maxBXGEM"); 
+  minBXGEM_ = cfg.getParameter<int>("minBXGEM");
+  maxBXGEM_ = cfg.getParameter<int>("maxBXGEM");
 }
-void GEMCoPadDigiValidation::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & Run, edm::EventSetup const & iSetup ) {
-  const GEMGeometry* GEMGeometry_ = initGeometry(iSetup);
-  if ( GEMGeometry_ == nullptr) return ;
-  LogDebug("GEMCoPadDigiValidation")<<"Geometry is acquired from MuonGeometryRecord\n";
+void GEMCoPadDigiValidation::bookHistograms(DQMStore::IBooker &ibooker,
+                                            edm::Run const &Run,
+                                            edm::EventSetup const &iSetup) {
+  const GEMGeometry *GEMGeometry_ = initGeometry(iSetup);
+  if (GEMGeometry_ == nullptr)
+    return;
+  LogDebug("GEMCoPadDigiValidation") << "Geometry is acquired from MuonGeometryRecord\n";
   ibooker.setCurrentFolder("MuonGEMDigisV/GEMDigisTask");
-  LogDebug("GEMCoPadDigiValidation")<<"ibooker set current folder\n";
+  LogDebug("GEMCoPadDigiValidation") << "ibooker set current folder\n";
 
   const double PI = TMath::Pi();
 
-  int npadsGE11 = GEMGeometry_->regions()[0]->stations()[0]->superChambers()[0]->chambers()[0]->etaPartitions()[0]->npads();
+  int npadsGE11 =
+      GEMGeometry_->regions()[0]->stations()[0]->superChambers()[0]->chambers()[0]->etaPartitions()[0]->npads();
   int npadsGE21 = 0;
   int nPads = 0;
 
-  if (GEMGeometry_->regions()[0]->stations().size()>1 &&!GEMGeometry_->regions()[0]->stations()[1]->superChambers().empty() ) {
-    npadsGE21  = GEMGeometry_->regions()[0]->stations()[1]->superChambers()[0]->chambers()[0]->etaPartitions()[0]->npads();
+  if (GEMGeometry_->regions()[0]->stations().size() > 1 &&
+      !GEMGeometry_->regions()[0]->stations()[1]->superChambers().empty()) {
+    npadsGE21 =
+        GEMGeometry_->regions()[0]->stations()[1]->superChambers()[0]->chambers()[0]->etaPartitions()[0]->npads();
   }
 
-  for( auto& region : GEMGeometry_->regions()  ){
+  for (auto &region : GEMGeometry_->regions()) {
     int re = region->region();
-    TString title_suffix = getSuffixTitle(re); 
-    TString histname_suffix = getSuffixName( re) ;
-    TString simpleZR_title    = TString::Format("Copad ZR Occupancy%s; |Z|(cm) ; R(cm)",title_suffix.Data());
-    TString simpleZR_histname = TString::Format("copad_simple_zr%s",histname_suffix.Data());
-
-    auto* simpleZR = getSimpleZR(ibooker, simpleZR_title, simpleZR_histname);
-    if ( simpleZR != nullptr) {
-      theCoPad_simple_zr[simpleZR_histname.Hash() ] = simpleZR;
+    TString title_suffix = getSuffixTitle(re);
+    TString histname_suffix = getSuffixName(re);
+    TString simpleZR_title = TString::Format("Copad ZR Occupancy%s; |Z|(cm) ; R(cm)", title_suffix.Data());
+    TString simpleZR_histname = TString::Format("copad_simple_zr%s", histname_suffix.Data());
+
+    auto *simpleZR = getSimpleZR(ibooker, simpleZR_title, simpleZR_histname);
+    if (simpleZR != nullptr) {
+      theCoPad_simple_zr[simpleZR_histname.Hash()] = simpleZR;
     }
-    for( auto& station : region->stations()) {
+    for (auto &station : region->stations()) {
       int st = station->station();
-      TString title_suffix2 = getSuffixTitle( re , st) ;
-      TString histname_suffix2 = getSuffixName( re, st) ;
-
-      TString dcEta_title    = TString::Format("Copad's occupancy for detector component %s; # of sub-detector ;#eta-partition",title_suffix2.Data());
-      TString dcEta_histname = TString::Format("copad_dcEta%s",histname_suffix2.Data());
-
-      auto* dcEta = getDCEta(ibooker, station, dcEta_title, dcEta_histname);
-      if ( dcEta != nullptr) {
-        theCoPad_dcEta[ dcEta_histname.Hash() ] = dcEta;
+      TString title_suffix2 = getSuffixTitle(re, st);
+      TString histname_suffix2 = getSuffixName(re, st);
+
+      TString dcEta_title = TString::Format(
+          "Copad's occupancy for detector component %s; # of "
+          "sub-detector ;#eta-partition",
+          title_suffix2.Data());
+      TString dcEta_histname = TString::Format("copad_dcEta%s", histname_suffix2.Data());
+
+      auto *dcEta = getDCEta(ibooker, station, dcEta_title, dcEta_histname);
+      if (dcEta != nullptr) {
+        theCoPad_dcEta[dcEta_histname.Hash()] = dcEta;
       }
     }
 
-    if ( detailPlot_) {
-      for( auto&  region : GEMGeometry_->regions() ) {
+    if (detailPlot_) {
+      for (auto &region : GEMGeometry_->regions()) {
         int re = region->region();
-        int region_num = (re+1)/2;
-        std::string name_prefix  = getSuffixName( re);
+        int region_num = (re + 1) / 2;
+        std::string name_prefix = getSuffixName(re);
         std::string label_prefix = getSuffixTitle(re);
-        for( auto& station : region->stations() ) {
+        for (auto &station : region->stations()) {
           int st = station->station();
-          int station_num = st-1;
-            
-          if ( st == 1 ) nPads = npadsGE11;
-          else nPads = npadsGE21;
-          name_prefix  = getSuffixName( re, st) ;
-          label_prefix = getSuffixTitle( re, st) ;
-          theCSCCoPad_phipad[region_num][station_num] = ibooker.book2D( ("copad_dg_phipad"+name_prefix).c_str(), ("Digi occupancy: "+label_prefix+"; phi [rad]; Pad number").c_str(), 280,-PI,PI, nPads/2,0,nPads );
-          theCSCCoPad[region_num][station_num] = ibooker.book1D( ("copad_dg"+name_prefix).c_str(), ("Digi occupancy per pad number: "+label_prefix+";Pad number; entries").c_str(), nPads,0.5,nPads+0.5);
-          theCSCCoPad_bx[region_num][station_num] = ibooker.book1D( ("copad_dg_bx"+name_prefix).c_str(), ("Bunch crossing: "+label_prefix+"; bunch crossing ; entries").c_str(), 11,-5.5,5.5);
-          theCSCCoPad_zr[region_num][station_num] = BookHistZR( ibooker, "copad_dg","CoPad Digi",region_num,station_num);
-          theCSCCoPad_xy[region_num][station_num] = BookHistXY( ibooker, "copad_dg","CoPad Digi",region_num,station_num);
-          TString xy_name = TString::Format("copad_dg_xy%s_odd",name_prefix.c_str());
-          TString xy_title = TString::Format("Digi XY occupancy %s at odd chambers",label_prefix.c_str());
-          theCSCCoPad_xy_ch[ xy_name.Hash()] = ibooker.book2D(xy_name, xy_title, 360, -360,360, 360, -360, 360);
-          xy_name = TString::Format("copad_dg_xy%s_even",name_prefix.c_str());
-          xy_title = TString::Format("Digi XY occupancy %s at even chambers",label_prefix.c_str());
-          theCSCCoPad_xy_ch[ xy_name.Hash()] = ibooker.book2D(xy_name, xy_title, 360, -360,360, 360, -360, 360);
+          int station_num = st - 1;
+
+          if (st == 1)
+            nPads = npadsGE11;
+          else
+            nPads = npadsGE21;
+          name_prefix = getSuffixName(re, st);
+          label_prefix = getSuffixTitle(re, st);
+          theCSCCoPad_phipad[region_num][station_num] =
+              ibooker.book2D(("copad_dg_phipad" + name_prefix).c_str(),
+                             ("Digi occupancy: " + label_prefix + "; phi [rad]; Pad number").c_str(),
+                             280,
+                             -PI,
+                             PI,
+                             nPads / 2,
+                             0,
+                             nPads);
+          theCSCCoPad[region_num][station_num] =
+              ibooker.book1D(("copad_dg" + name_prefix).c_str(),
+                             ("Digi occupancy per pad number: " + label_prefix + ";Pad number; entries").c_str(),
+                             nPads,
+                             0.5,
+                             nPads + 0.5);
+          theCSCCoPad_bx[region_num][station_num] =
+              ibooker.book1D(("copad_dg_bx" + name_prefix).c_str(),
+                             ("Bunch crossing: " + label_prefix + "; bunch crossing ; entries").c_str(),
+                             11,
+                             -5.5,
+                             5.5);
+          theCSCCoPad_zr[region_num][station_num] =
+              BookHistZR(ibooker, "copad_dg", "CoPad Digi", region_num, station_num);
+          theCSCCoPad_xy[region_num][station_num] =
+              BookHistXY(ibooker, "copad_dg", "CoPad Digi", region_num, station_num);
+          TString xy_name = TString::Format("copad_dg_xy%s_odd", name_prefix.c_str());
+          TString xy_title = TString::Format("Digi XY occupancy %s at odd chambers", label_prefix.c_str());
+          theCSCCoPad_xy_ch[xy_name.Hash()] = ibooker.book2D(xy_name, xy_title, 360, -360, 360, 360, -360, 360);
+          xy_name = TString::Format("copad_dg_xy%s_even", name_prefix.c_str());
+          xy_title = TString::Format("Digi XY occupancy %s at even chambers", label_prefix.c_str());
+          theCSCCoPad_xy_ch[xy_name.Hash()] = ibooker.book2D(xy_name, xy_title, 360, -360, 360, 360, -360, 360);
         }
       }
     }
   }
 }
 
+GEMCoPadDigiValidation::~GEMCoPadDigiValidation() {}
 
-GEMCoPadDigiValidation::~GEMCoPadDigiValidation() {
-
-
-}
-
-
-void GEMCoPadDigiValidation::analyze(const edm::Event& e,
-    const edm::EventSetup& iSetup)
-{
-  const GEMGeometry* GEMGeometry_;
+void GEMCoPadDigiValidation::analyze(const edm::Event &e, const edm::EventSetup &iSetup) {
+  const GEMGeometry *GEMGeometry_;
   try {
     edm::ESHandle<GEMGeometry> hGeom;
     iSetup.get<MuonGeometryRecord>().get(hGeom);
     GEMGeometry_ = &*hGeom;
-  }
-  catch( edm::eventsetup::NoProxyException<GEMGeometry>& e) {
+  } catch (edm::eventsetup::NoProxyException<GEMGeometry> &e) {
     edm::LogError("GEMCoPadDigiValidation") << "+++ Error : GEM geometry is unavailable on event loop. +++\n";
     return;
   }
@@ -105,93 +127,101 @@ void GEMCoPadDigiValidation::analyze(const edm::Event& e,
   e.getByToken(InputTagToken_, gem_digis);
   if (!gem_digis.isValid()) {
     edm::LogError("GEMCoPadDigiValidation") << "Cannot get pads by token.";
-    return ;
+    return;
   }
 
-  for (GEMCoPadDigiCollection::DigiRangeIterator cItr=gem_digis->begin(); cItr!=gem_digis->end(); cItr++) {
+  for (GEMCoPadDigiCollection::DigiRangeIterator cItr = gem_digis->begin(); cItr != gem_digis->end(); cItr++) {
     GEMDetId id = (*cItr).first;
     int re = id.region();
     int st = id.station();
     int la = id.layer();
-    Short_t chamber = (Short_t) id.chamber();
+    Short_t chamber = (Short_t)id.chamber();
     GEMCoPadDigiCollection::const_iterator digiItr;
-    //loop over digis of given roll
-    for (digiItr = (*cItr ).second.first; digiItr != (*cItr ).second.second; ++digiItr)
-    {
+    // loop over digis of given roll
+    for (digiItr = (*cItr).second.first; digiItr != (*cItr).second.second; ++digiItr) {
       // GEM copads are stored per super chamber!
       GEMDetId schId = GEMDetId(re, id.ring(), st, 0, chamber, 0);
       Short_t nroll = (*digiItr).roll();
-      LogDebug("GEMCoPadDigiValidation")<<"schId : "<<schId;
-      const GeomDet* gdet = GEMGeometry_->idToDet(schId);
-      if ( gdet == nullptr) {
-        edm::LogError("GEMCoPadDigiValidation")<<schId<<" : This detId cannot be loaded from GEMGeometry // Original"<<id<<" station : "<<st;
-        edm::LogError("GEMCoPadDigiValidation")<<"Getting DetId failed. Discard this gem copad hit. ";
-        continue; 
+      LogDebug("GEMCoPadDigiValidation") << "schId : " << schId;
+      const GeomDet *gdet = GEMGeometry_->idToDet(schId);
+      if (gdet == nullptr) {
+        edm::LogError("GEMCoPadDigiValidation")
+            << schId << " : This detId cannot be loaded from GEMGeometry // Original" << id << " station : " << st;
+        edm::LogError("GEMCoPadDigiValidation") << "Getting DetId failed. Discard this gem copad hit. ";
+        continue;
       }
-      const BoundPlane & surface = gdet->surface();
-      const GEMSuperChamber * superChamber = GEMGeometry_->superChamber(schId);
-      LogDebug("GEMCoPadDigiValidation")<<" #pads in this partition : "<< superChamber->chamber(1)->etaPartition(1)->npads();
-
-      Short_t pad1 = (Short_t) digiItr->pad(1);
-      Short_t pad2 = (Short_t) digiItr->pad(2);
-      Short_t bx1  = (Short_t) digiItr->bx(1);
-      Short_t bx2  = (Short_t) digiItr->bx(2);
-      LogDebug("GEMCoPadDigiValidation")<<" copad #1 pad : "<<pad1<<"  bx : "<<bx1;
-      LogDebug("GEMCoPadDigiValidation")<<" copad #2 pad : "<<pad2<<"  bx : "<<bx2;
+      const BoundPlane &surface = gdet->surface();
+      const GEMSuperChamber *superChamber = GEMGeometry_->superChamber(schId);
+      LogDebug("GEMCoPadDigiValidation") << " #pads in this partition : "
+                                         << superChamber->chamber(1)->etaPartition(1)->npads();
+
+      Short_t pad1 = (Short_t)digiItr->pad(1);
+      Short_t pad2 = (Short_t)digiItr->pad(2);
+      Short_t bx1 = (Short_t)digiItr->bx(1);
+      Short_t bx2 = (Short_t)digiItr->bx(2);
+      LogDebug("GEMCoPadDigiValidation") << " copad #1 pad : " << pad1 << "  bx : " << bx1;
+      LogDebug("GEMCoPadDigiValidation") << " copad #2 pad : " << pad2 << "  bx : " << bx2;
 
       // Filtered using BX
-      if ( bx1 < (Short_t)minBXGEM_ || bx1 > (Short_t)maxBXGEM_) continue;
-      if ( bx2 < (Short_t)minBXGEM_ || bx2 > (Short_t)maxBXGEM_) continue;
+      if (bx1 < (Short_t)minBXGEM_ || bx1 > (Short_t)maxBXGEM_)
+        continue;
+      if (bx2 < (Short_t)minBXGEM_ || bx2 > (Short_t)maxBXGEM_)
+        continue;
 
       LocalPoint lp1 = superChamber->chamber(1)->etaPartition(nroll)->centreOfPad(pad1);
       LocalPoint lp2 = superChamber->chamber(2)->etaPartition(nroll)->centreOfPad(pad2);
 
       GlobalPoint gp1 = surface.toGlobal(lp1);
       GlobalPoint gp2 = surface.toGlobal(lp2);
-      Float_t g_r1 = (Float_t) gp1.perp();
-      Float_t g_r2 = (Float_t) gp2.perp();
-      Float_t g_z1 = (Float_t) gp1.z();
-      Float_t g_z2 = (Float_t) gp2.z();
-
-      Float_t g_phi = (Float_t) gp1.phi();
-      Float_t g_x = (Float_t) gp1.x();
-      Float_t g_y = (Float_t) gp1.y();
-
-      int region_num=0;
-      if ( re == -1 ) region_num = 0 ; 
-      else if (re == 1 ) region_num = 1; 
+      Float_t g_r1 = (Float_t)gp1.perp();
+      Float_t g_r2 = (Float_t)gp2.perp();
+      Float_t g_z1 = (Float_t)gp1.z();
+      Float_t g_z2 = (Float_t)gp2.z();
+
+      Float_t g_phi = (Float_t)gp1.phi();
+      Float_t g_x = (Float_t)gp1.x();
+      Float_t g_y = (Float_t)gp1.y();
+
+      int region_num = 0;
+      if (re == -1)
+        region_num = 0;
+      else if (re == 1)
+        region_num = 1;
       else {
-        edm::LogError("GEMCoPadDigiValidation")<<"region : "<<re<<std::endl;
+        edm::LogError("GEMCoPadDigiValidation") << "region : " << re << std::endl;
       }
-      int binX = (chamber-1)*2+la;
+      int binX = (chamber - 1) * 2 + la;
       int binY = nroll;
-      int station_num = st-1;
+      int station_num = st - 1;
 
       // Fill normal plots.
-      TString histname_suffix = getSuffixName( re); 
-      TString simple_zr_histname = TString::Format("copad_simple_zr%s",histname_suffix.Data());
-      theCoPad_simple_zr[simple_zr_histname.Hash()]->Fill( fabs(g_z1), g_r1);
-      theCoPad_simple_zr[simple_zr_histname.Hash()]->Fill( fabs(g_z2), g_r2);
+      TString histname_suffix = getSuffixName(re);
+      TString simple_zr_histname = TString::Format("copad_simple_zr%s", histname_suffix.Data());
+      theCoPad_simple_zr[simple_zr_histname.Hash()]->Fill(fabs(g_z1), g_r1);
+      theCoPad_simple_zr[simple_zr_histname.Hash()]->Fill(fabs(g_z2), g_r2);
 
-      histname_suffix = getSuffixName( re, st ) ;
-      TString dcEta_histname = TString::Format("copad_dcEta%s",histname_suffix.Data());
-      theCoPad_dcEta[dcEta_histname.Hash()]->Fill( binX, binY);
-      theCoPad_dcEta[dcEta_histname.Hash()]->Fill( binX+1, binY);
+      histname_suffix = getSuffixName(re, st);
+      TString dcEta_histname = TString::Format("copad_dcEta%s", histname_suffix.Data());
+      theCoPad_dcEta[dcEta_histname.Hash()]->Fill(binX, binY);
+      theCoPad_dcEta[dcEta_histname.Hash()]->Fill(binX + 1, binY);
 
       // Fill detail plots.
-      if ( detailPlot_) {
-        theCSCCoPad_xy[region_num][station_num]->Fill(g_x,g_y);     
-        theCSCCoPad_phipad[region_num][station_num]->Fill(g_phi,pad1);
+      if (detailPlot_) {
+        theCSCCoPad_xy[region_num][station_num]->Fill(g_x, g_y);
+        theCSCCoPad_phipad[region_num][station_num]->Fill(g_phi, pad1);
         theCSCCoPad[region_num][station_num]->Fill(pad1);
         theCSCCoPad_bx[region_num][station_num]->Fill(bx1);
         theCSCCoPad_bx[region_num][station_num]->Fill(bx2);
-        theCSCCoPad_zr[region_num][station_num]->Fill(g_z1,g_r1);
-        theCSCCoPad_zr[region_num][station_num]->Fill(g_z2,g_r2);
-        std::string name_prefix = getSuffixName( re, st) ;
+        theCSCCoPad_zr[region_num][station_num]->Fill(g_z1, g_r1);
+        theCSCCoPad_zr[region_num][station_num]->Fill(g_z2, g_r2);
+        std::string name_prefix = getSuffixName(re, st);
         TString hname;
-        if ( chamber %2 == 0 ) { hname = TString::Format("copad_dg_xy%s_even",name_prefix.c_str()); }
-        else { hname = TString::Format("copad_dg_xy%s_odd",name_prefix.c_str()); }
-        theCSCCoPad_xy_ch[hname.Hash()]->Fill(g_x,g_y);
+        if (chamber % 2 == 0) {
+          hname = TString::Format("copad_dg_xy%s_even", name_prefix.c_str());
+        } else {
+          hname = TString::Format("copad_dg_xy%s_odd", name_prefix.c_str());
+        }
+        theCSCCoPad_xy_ch[hname.Hash()]->Fill(g_x, g_y);
       }
     }
   }
diff --git a/Validation/MuonGEMDigis/src/GEMDigiMatcher.cc b/Validation/MuonGEMDigis/src/GEMDigiMatcher.cc
index 44f3d21f2307f..00d06299f800e 100644
--- a/Validation/MuonGEMDigis/src/GEMDigiMatcher.cc
+++ b/Validation/MuonGEMDigis/src/GEMDigiMatcher.cc
@@ -7,371 +7,324 @@
 using namespace std;
 using namespace matching;
 
-GEMDigiMatcher::GEMDigiMatcher(const SimHitMatcher& sh, const edm::Event& e, const GEMGeometry& geom, const edm::ParameterSet& cfg,edm::EDGetToken& gem_digiToken, edm::EDGetToken& gem_padToken, edm::EDGetToken& gem_copadToken ):simhit_matcher_(sh),gem_geo_(geom)
-{
+GEMDigiMatcher::GEMDigiMatcher(const SimHitMatcher &sh,
+                               const edm::Event &e,
+                               const GEMGeometry &geom,
+                               const edm::ParameterSet &cfg,
+                               edm::EDGetToken &gem_digiToken,
+                               edm::EDGetToken &gem_padToken,
+                               edm::EDGetToken &gem_copadToken)
+    : simhit_matcher_(sh), gem_geo_(geom) {
   minBXGEM_ = cfg.getUntrackedParameter<int>("minBXGEM", -1);
   maxBXGEM_ = cfg.getUntrackedParameter<int>("maxBXGEM", 1);
 
   matchDeltaStrip_ = cfg.getUntrackedParameter<int>("matchDeltaStripGEM", 1);
 
-  //setVerbose(cfg.getUntrackedParameter<int>("verboseGEMDigi", 0));
-  verbose_=false;
+  // setVerbose(cfg.getUntrackedParameter<int>("verboseGEMDigi", 0));
+  verbose_ = false;
 
   e.getByToken(gem_digiToken, gem_digis_);
   e.getByToken(gem_padToken, gem_pads_);
   e.getByToken(gem_copadToken, gem_co_pads_);
-  if ( !gem_digis_.isValid() ) return ;
-       
+  if (!gem_digis_.isValid())
+    return;
+
   init(e);
 }
 
 GEMDigiMatcher::~GEMDigiMatcher() {}
 
-
-void
-GEMDigiMatcher::init(const edm::Event& e)
-{
+void GEMDigiMatcher::init(const edm::Event &e) {
   matchDigisToSimTrack(*gem_digis_.product());
-  if ( gem_pads_.isValid())  matchPadsToSimTrack(*gem_pads_.product());
-  if ( gem_co_pads_.isValid())  matchCoPadsToSimTrack(*gem_co_pads_.product()); 
+  if (gem_pads_.isValid())
+    matchPadsToSimTrack(*gem_pads_.product());
+  if (gem_co_pads_.isValid())
+    matchCoPadsToSimTrack(*gem_co_pads_.product());
 }
 
-
-void
-GEMDigiMatcher::matchDigisToSimTrack(const GEMDigiCollection& digis)
-{
+void GEMDigiMatcher::matchDigisToSimTrack(const GEMDigiCollection &digis) {
   auto det_ids = simhit_matcher_.detIdsGEM();
-  for (auto id: det_ids)
-  {
+  for (auto id : det_ids) {
     GEMDetId p_id(id);
     GEMDetId superch_id(p_id.region(), p_id.ring(), p_id.station(), 1, p_id.chamber(), 0);
 
     auto hit_strips = simhit_matcher_.hitStripsInDetId(id, matchDeltaStrip_);
-    if (verbose_)
-    {
-      cout<<"hit_strips_fat ";
+    if (verbose_) {
+      cout << "hit_strips_fat ";
       copy(hit_strips.begin(), hit_strips.end(), ostream_iterator<int>(cout, " "));
-      cout<<endl;
+      cout << endl;
     }
 
     auto digis_in_det = digis.get(GEMDetId(id));
 
-    for (auto d = digis_in_det.first; d != digis_in_det.second; ++d)
-    {
-      if (verbose_) cout<<"gdigi "<<p_id<<" "<<*d<<endl;
+    for (auto d = digis_in_det.first; d != digis_in_det.second; ++d) {
+      if (verbose_)
+        cout << "gdigi " << p_id << " " << *d << endl;
       // check that the digi is within BX range
-      if (d->bx() < minBXGEM_ || d->bx() > maxBXGEM_) continue;
+      if (d->bx() < minBXGEM_ || d->bx() > maxBXGEM_)
+        continue;
       // check that it matches a strip that was hit by SimHits from our track
-      if (hit_strips.find(d->strip()) == hit_strips.end()) continue;
-      if (verbose_) cout<<"oki"<<endl;
+      if (hit_strips.find(d->strip()) == hit_strips.end())
+        continue;
+      if (verbose_)
+        cout << "oki" << endl;
 
       auto mydigi = make_digi(id, d->strip(), d->bx(), GEM_STRIP);
       detid_to_digis_[id].push_back(mydigi);
-      chamber_to_digis_[ p_id.chamberId().rawId() ].push_back(mydigi);
-      superchamber_to_digis_[ superch_id() ].push_back(mydigi);
+      chamber_to_digis_[p_id.chamberId().rawId()].push_back(mydigi);
+      superchamber_to_digis_[superch_id()].push_back(mydigi);
 
-      //int pad_num = 1 + static_cast<int>( roll->padOfStrip(d->strip()) ); // d->strip() is int
-      //digi_map[ make_pair(pad_num, d->bx()) ].push_back( d->strip() );
+      // int pad_num = 1 + static_cast<int>( roll->padOfStrip(d->strip()) ); //
+      // d->strip() is int digi_map[ make_pair(pad_num, d->bx()) ].push_back(
+      // d->strip() );
     }
   }
 }
 
-
-void
-GEMDigiMatcher::matchPadsToSimTrack(const GEMPadDigiCollection& pads)
-{
+void GEMDigiMatcher::matchPadsToSimTrack(const GEMPadDigiCollection &pads) {
   auto det_ids = simhit_matcher_.detIdsGEM();
-  for (auto id: det_ids)
-  {
+  for (auto id : det_ids) {
     GEMDetId p_id(id);
     GEMDetId superch_id(p_id.region(), p_id.ring(), p_id.station(), 1, p_id.chamber(), 0);
 
     auto hit_pads = simhit_matcher_.hitPadsInDetId(id);
     auto pads_in_det = pads.get(p_id);
 
-    if (verbose_)
-    {
-      cout<<"checkpads "<<hit_pads.size()<<" "<<std::distance(pads_in_det.first, pads_in_det.second)<<" hit_pads: ";
-      copy(hit_pads.begin(), hit_pads.end(), ostream_iterator<int>(cout," "));
-      cout<<endl;
+    if (verbose_) {
+      cout << "checkpads " << hit_pads.size() << " " << std::distance(pads_in_det.first, pads_in_det.second)
+           << " hit_pads: ";
+      copy(hit_pads.begin(), hit_pads.end(), ostream_iterator<int>(cout, " "));
+      cout << endl;
     }
 
-    for (auto pad = pads_in_det.first; pad != pads_in_det.second; ++pad)
-    {
-      if (verbose_) cout<<"chp "<<*pad<<endl;
+    for (auto pad = pads_in_det.first; pad != pads_in_det.second; ++pad) {
+      if (verbose_)
+        cout << "chp " << *pad << endl;
       // check that the pad BX is within the range
-      if (pad->bx() < minBXGEM_ || pad->bx() > maxBXGEM_) continue;
-      if (verbose_) cout<<"chp1"<<endl;
+      if (pad->bx() < minBXGEM_ || pad->bx() > maxBXGEM_)
+        continue;
+      if (verbose_)
+        cout << "chp1" << endl;
       // check that it matches a pad that was hit by SimHits from our track
-      if (hit_pads.find(pad->pad()) == hit_pads.end()) continue;
-      if (verbose_) cout<<"chp2"<<endl;
+      if (hit_pads.find(pad->pad()) == hit_pads.end())
+        continue;
+      if (verbose_)
+        cout << "chp2" << endl;
 
       auto mydigi = make_digi(id, pad->pad(), pad->bx(), GEM_PAD);
       detid_to_pads_[id].push_back(mydigi);
-      chamber_to_pads_[ p_id.chamberId().rawId() ].push_back(mydigi);
-      superchamber_to_pads_[ superch_id() ].push_back(mydigi);
+      chamber_to_pads_[p_id.chamberId().rawId()].push_back(mydigi);
+      superchamber_to_pads_[superch_id()].push_back(mydigi);
     }
   }
 }
 
-
-void
-GEMDigiMatcher::matchCoPadsToSimTrack(const GEMCoPadDigiCollection& co_pads)
-{
+void GEMDigiMatcher::matchCoPadsToSimTrack(const GEMCoPadDigiCollection &co_pads) {
   auto det_ids = simhit_matcher_.detIdsGEMCoincidences();
-  for (auto id: det_ids)
-  {
+  for (auto id : det_ids) {
     GEMDetId p_id(id);
     GEMDetId superch_id(p_id.region(), p_id.ring(), p_id.station(), 1, p_id.chamber(), 0);
 
     auto hit_co_pads = simhit_matcher_.hitCoPadsInDetId(id);
     auto co_pads_in_det = co_pads.get(p_id);
 
-    for (auto pad = co_pads_in_det.first; pad != co_pads_in_det.second; ++pad)
-    {
+    for (auto pad = co_pads_in_det.first; pad != co_pads_in_det.second; ++pad) {
       // check that the pad BX is within the range
-      if (pad->bx(1) < minBXGEM_ || pad->bx(1) > maxBXGEM_) continue;
-      if (pad->bx(2) < minBXGEM_ || pad->bx(2) > maxBXGEM_) continue;
-      // check that it matches a coincidence pad that was hit by SimHits from our track
-      if (hit_co_pads.find(pad->pad(1)) == hit_co_pads.end()) continue;
-      if (hit_co_pads.find(pad->pad(2)) == hit_co_pads.end()) continue;
+      if (pad->bx(1) < minBXGEM_ || pad->bx(1) > maxBXGEM_)
+        continue;
+      if (pad->bx(2) < minBXGEM_ || pad->bx(2) > maxBXGEM_)
+        continue;
+      // check that it matches a coincidence pad that was hit by SimHits from
+      // our track
+      if (hit_co_pads.find(pad->pad(1)) == hit_co_pads.end())
+        continue;
+      if (hit_co_pads.find(pad->pad(2)) == hit_co_pads.end())
+        continue;
 
       auto mydigi = make_digi(id, pad->pad(1), pad->bx(1), GEM_COPAD);
-      //auto mydigi = make_digi(id, pad->pad(2), pad->bx(2), GEM_COPAD);  // FIXIT : Solve duplicate problem.
+      // auto mydigi = make_digi(id, pad->pad(2), pad->bx(2), GEM_COPAD);  //
+      // FIXIT : Solve duplicate problem.
       detid_to_copads_[id].push_back(mydigi);
-      superchamber_to_copads_[ superch_id() ].push_back(mydigi);
+      superchamber_to_copads_[superch_id()].push_back(mydigi);
     }
   }
 }
 
-
-std::set<unsigned int>
-GEMDigiMatcher::detIds() const
-{
+std::set<unsigned int> GEMDigiMatcher::detIds() const {
   std::set<unsigned int> result;
-  for (auto& p: detid_to_digis_) result.insert(p.first);
+  for (auto &p : detid_to_digis_)
+    result.insert(p.first);
   return result;
 }
 
-
-std::set<unsigned int>
-GEMDigiMatcher::chamberIds() const
-{
+std::set<unsigned int> GEMDigiMatcher::chamberIds() const {
   std::set<unsigned int> result;
-  for (auto& p: chamber_to_digis_) result.insert(p.first);
+  for (auto &p : chamber_to_digis_)
+    result.insert(p.first);
   return result;
 }
-std::set<unsigned int>
-GEMDigiMatcher::chamberIdsWithPads() const
-{
+std::set<unsigned int> GEMDigiMatcher::chamberIdsWithPads() const {
   std::set<unsigned int> result;
-  for (auto& p: chamber_to_pads_) result.insert(p.first);
+  for (auto &p : chamber_to_pads_)
+    result.insert(p.first);
   return result;
 }
-std::set<unsigned int>
-GEMDigiMatcher::superChamberIds() const
-{
+std::set<unsigned int> GEMDigiMatcher::superChamberIds() const {
   std::set<unsigned int> result;
-  for (auto& p: superchamber_to_digis_) result.insert(p.first);
+  for (auto &p : superchamber_to_digis_)
+    result.insert(p.first);
   return result;
 }
-std::set<unsigned int>
-GEMDigiMatcher::superChamberIdsWithPads() const
-{
+std::set<unsigned int> GEMDigiMatcher::superChamberIdsWithPads() const {
   std::set<unsigned int> result;
-  for (auto& p: superchamber_to_pads_) result.insert(p.first);
+  for (auto &p : superchamber_to_pads_)
+    result.insert(p.first);
   return result;
 }
-std::set<unsigned int>
-GEMDigiMatcher::superChamberIdsWithCoPads() const
-{
+std::set<unsigned int> GEMDigiMatcher::superChamberIdsWithCoPads() const {
   std::set<unsigned int> result;
-  for (auto& p: superchamber_to_copads_) result.insert(p.first);
+  for (auto &p : superchamber_to_copads_)
+    result.insert(p.first);
   return result;
 }
-std::set<unsigned int>
-GEMDigiMatcher::detIdsWithCoPads() const
-{
+std::set<unsigned int> GEMDigiMatcher::detIdsWithCoPads() const {
   std::set<unsigned int> result;
-  for (auto& p: detid_to_copads_) result.insert(p.first);
+  for (auto &p : detid_to_copads_)
+    result.insert(p.first);
   return result;
 }
 
-
-
-
-const matching::DigiContainer&
-GEMDigiMatcher::digisInDetId(unsigned int detid) const
-{
-  if (detid_to_digis_.find(detid) == detid_to_digis_.end()) return no_digis_;
+const matching::DigiContainer &GEMDigiMatcher::digisInDetId(unsigned int detid) const {
+  if (detid_to_digis_.find(detid) == detid_to_digis_.end())
+    return no_digis_;
   return detid_to_digis_.at(detid);
 }
 
-const matching::DigiContainer&
-GEMDigiMatcher::digisInChamber(unsigned int detid) const
-{
-  if (chamber_to_digis_.find(detid) == chamber_to_digis_.end()) return no_digis_;
+const matching::DigiContainer &GEMDigiMatcher::digisInChamber(unsigned int detid) const {
+  if (chamber_to_digis_.find(detid) == chamber_to_digis_.end())
+    return no_digis_;
   return chamber_to_digis_.at(detid);
 }
 
-const matching::DigiContainer&
-GEMDigiMatcher::digisInSuperChamber(unsigned int detid) const
-{
-  if (superchamber_to_digis_.find(detid) == superchamber_to_digis_.end()) return no_digis_;
+const matching::DigiContainer &GEMDigiMatcher::digisInSuperChamber(unsigned int detid) const {
+  if (superchamber_to_digis_.find(detid) == superchamber_to_digis_.end())
+    return no_digis_;
   return superchamber_to_digis_.at(detid);
 }
 
-const matching::DigiContainer&
-GEMDigiMatcher::padsInDetId(unsigned int detid) const
-{
-  if (detid_to_pads_.find(detid) == detid_to_pads_.end()) return no_digis_;
+const matching::DigiContainer &GEMDigiMatcher::padsInDetId(unsigned int detid) const {
+  if (detid_to_pads_.find(detid) == detid_to_pads_.end())
+    return no_digis_;
   return detid_to_pads_.at(detid);
 }
 
-const matching::DigiContainer&
-GEMDigiMatcher::padsInChamber(unsigned int detid) const
-{
-  if (chamber_to_pads_.find(detid) == chamber_to_pads_.end()) return no_digis_;
+const matching::DigiContainer &GEMDigiMatcher::padsInChamber(unsigned int detid) const {
+  if (chamber_to_pads_.find(detid) == chamber_to_pads_.end())
+    return no_digis_;
   return chamber_to_pads_.at(detid);
 }
 
-const matching::DigiContainer&
-GEMDigiMatcher::padsInSuperChamber(unsigned int detid) const
-{
-  if (superchamber_to_pads_.find(detid) == superchamber_to_pads_.end()) return no_digis_;
+const matching::DigiContainer &GEMDigiMatcher::padsInSuperChamber(unsigned int detid) const {
+  if (superchamber_to_pads_.find(detid) == superchamber_to_pads_.end())
+    return no_digis_;
   return superchamber_to_pads_.at(detid);
 }
 
-
-const matching::DigiContainer&
-GEMDigiMatcher::coPadsInDetId(unsigned int detid) const
-{
-  if (detid_to_copads_.find(detid) == detid_to_copads_.end()) return no_digis_;
+const matching::DigiContainer &GEMDigiMatcher::coPadsInDetId(unsigned int detid) const {
+  if (detid_to_copads_.find(detid) == detid_to_copads_.end())
+    return no_digis_;
   return detid_to_copads_.at(detid);
 }
 
-const matching::DigiContainer&
-GEMDigiMatcher::coPadsInSuperChamber(unsigned int detid) const
-{
-  if (superchamber_to_copads_.find(detid) == superchamber_to_copads_.end()) return no_digis_;
+const matching::DigiContainer &GEMDigiMatcher::coPadsInSuperChamber(unsigned int detid) const {
+  if (superchamber_to_copads_.find(detid) == superchamber_to_copads_.end())
+    return no_digis_;
   return superchamber_to_copads_.at(detid);
 }
 
-
-int
-GEMDigiMatcher::nLayersWithDigisInSuperChamber(unsigned int detid) const
-{
+int GEMDigiMatcher::nLayersWithDigisInSuperChamber(unsigned int detid) const {
   set<int> layers;
   auto digis = digisInSuperChamber(detid);
-  for (auto& d: digis)
-  {
+  for (auto &d : digis) {
     GEMDetId idd(digi_id(d));
     layers.insert(idd.layer());
   }
   return layers.size();
 }
 
-
-int
-GEMDigiMatcher::nLayersWithPadsInSuperChamber(unsigned int detid) const
-{
+int GEMDigiMatcher::nLayersWithPadsInSuperChamber(unsigned int detid) const {
   set<int> layers;
   auto digis = padsInSuperChamber(detid);
-  for (auto& d: digis)
-  {
+  for (auto &d : digis) {
     GEMDetId idd(digi_id(d));
     layers.insert(idd.layer());
   }
   return layers.size();
 }
 
-
-int
-GEMDigiMatcher::nCoPads() const
-{
+int GEMDigiMatcher::nCoPads() const {
   int n = 0;
   auto ids = superChamberIdsWithCoPads();
-  for (auto id: ids)
-  {
+  for (auto id : ids) {
     n += coPadsInSuperChamber(id).size();
   }
   return n;
 }
 
-
-int
-GEMDigiMatcher::nPads() const
-{
+int GEMDigiMatcher::nPads() const {
   int n = 0;
   auto ids = superChamberIdsWithPads();
-  for (auto id: ids)
-  {
+  for (auto id : ids) {
     n += padsInSuperChamber(id).size();
   }
   return n;
 }
 
-
-std::set<int>
-GEMDigiMatcher::stripNumbersInDetId(unsigned int detid) const
-{
+std::set<int> GEMDigiMatcher::stripNumbersInDetId(unsigned int detid) const {
   set<int> result;
   auto digis = digisInDetId(detid);
-  for (auto& d: digis)
-  {
-    result.insert( digi_channel(d) );
+  for (auto &d : digis) {
+    result.insert(digi_channel(d));
   }
   return result;
 }
 
-std::set<int>
-GEMDigiMatcher::padNumbersInDetId(unsigned int detid) const
-{
+std::set<int> GEMDigiMatcher::padNumbersInDetId(unsigned int detid) const {
   set<int> result;
   auto digis = padsInDetId(detid);
-  for (auto& d: digis)
-  {
-    result.insert( digi_channel(d) );
+  for (auto &d : digis) {
+    result.insert(digi_channel(d));
   }
   return result;
 }
 
-std::set<int>
-GEMDigiMatcher::coPadNumbersInDetId(unsigned int detid) const
-{
+std::set<int> GEMDigiMatcher::coPadNumbersInDetId(unsigned int detid) const {
   set<int> result;
   auto digis = coPadsInDetId(detid);
-  for (auto& d: digis)
-  {
-    result.insert( digi_channel(d) );
+  for (auto &d : digis) {
+    result.insert(digi_channel(d));
   }
   return result;
 }
 
-std::set<int>
-GEMDigiMatcher::partitionNumbers() const
-{
+std::set<int> GEMDigiMatcher::partitionNumbers() const {
   std::set<int> result;
 
   auto detids = detIds();
-  for (auto id: detids)
-  {
+  for (auto id : detids) {
     GEMDetId idd(id);
-    result.insert( idd.roll() );
+    result.insert(idd.roll());
   }
   return result;
 }
 
-std::set<int>
-GEMDigiMatcher::partitionNumbersWithCoPads() const
-{
+std::set<int> GEMDigiMatcher::partitionNumbersWithCoPads() const {
   std::set<int> result;
 
   auto detids = detIdsWithCoPads();
-  for (auto id: detids)
-  {
+  for (auto id : detids) {
     GEMDetId idd(id);
-    result.insert( idd.roll() );
+    result.insert(idd.roll());
   }
   return result;
 }
diff --git a/Validation/MuonGEMDigis/src/GEMDigiTrackMatch.cc b/Validation/MuonGEMDigis/src/GEMDigiTrackMatch.cc
index 16bf59544b34b..009b2af2603f3 100644
--- a/Validation/MuonGEMDigis/src/GEMDigiTrackMatch.cc
+++ b/Validation/MuonGEMDigis/src/GEMDigiTrackMatch.cc
@@ -1,104 +1,99 @@
-#include "Validation/MuonGEMDigis/interface/GEMDigiTrackMatch.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DataFormats/GEMDigi/interface/GEMDigiCollection.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include <TMath.h>
-#include <TH1F.h>
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "Validation/MuonGEMDigis/interface/GEMDigiTrackMatch.h"
 #include "Validation/MuonGEMHits/interface/GEMDetLabel.h"
+#include <TH1F.h>
+#include <TMath.h>
 
 using namespace std;
 using namespace GEMDetLabel;
-GEMDigiTrackMatch::GEMDigiTrackMatch(const edm::ParameterSet& ps) : GEMTrackMatch(ps)
-{
+GEMDigiTrackMatch::GEMDigiTrackMatch(const edm::ParameterSet &ps) : GEMTrackMatch(ps) {
   std::string simInputLabel_ = ps.getUntrackedParameter<std::string>("simInputLabel");
-  simHitsToken_ = consumes<edm::PSimHitContainer>(edm::InputTag(simInputLabel_,"MuonGEMHits"));
-  simTracksToken_ = consumes< edm::SimTrackContainer >(ps.getParameter<edm::InputTag>("simTrackCollection"));
-  simVerticesToken_ = consumes< edm::SimVertexContainer >(ps.getParameter<edm::InputTag>("simVertexCollection"));
+  simHitsToken_ = consumes<edm::PSimHitContainer>(edm::InputTag(simInputLabel_, "MuonGEMHits"));
+  simTracksToken_ = consumes<edm::SimTrackContainer>(ps.getParameter<edm::InputTag>("simTrackCollection"));
+  simVerticesToken_ = consumes<edm::SimVertexContainer>(ps.getParameter<edm::InputTag>("simVertexCollection"));
 
   gem_digiToken_ = consumes<GEMDigiCollection>(ps.getParameter<edm::InputTag>("gemDigiInput"));
-  gem_padToken_  = consumes<GEMPadDigiCollection>(ps.getParameter<edm::InputTag>("gemPadDigiInput"));
-  gem_copadToken_ = consumes<GEMCoPadDigiCollection>(ps.getParameter<edm::InputTag>("gemCoPadDigiInput")); 
+  gem_padToken_ = consumes<GEMPadDigiCollection>(ps.getParameter<edm::InputTag>("gemPadDigiInput"));
+  gem_copadToken_ = consumes<GEMCoPadDigiCollection>(ps.getParameter<edm::InputTag>("gemCoPadDigiInput"));
   detailPlot_ = ps.getParameter<bool>("detailPlot");
   cfg_ = ps;
 }
 
-void GEMDigiTrackMatch::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& run, edm::EventSetup const & iSetup){
-
+void GEMDigiTrackMatch::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &run, edm::EventSetup const &iSetup) {
   edm::ESHandle<GEMGeometry> hGeom;
   iSetup.get<MuonGeometryRecord>().get(hGeom);
-  const GEMGeometry& geom = *hGeom;
+  const GEMGeometry &geom = *hGeom;
   setGeometry(geom);
-    
+
   ibooker.setCurrentFolder("MuonGEMDigisV/GEMDigisTask");
-  LogDebug("GEMDigiTrackMatch")<<"ibooker set current folder\n";
+  LogDebug("GEMDigiTrackMatch") << "ibooker set current folder\n";
 
-  const float PI=TMath::Pi();
+  const float PI = TMath::Pi();
 
   nstation = geom.regions()[0]->stations().size();
-  if ( detailPlot_) { 
-    for( unsigned int j=0 ; j<nstation ; j++) {
-      string track_eta_name  = string("track_eta")+s_suffix[j];
-      string track_eta_title = string("track_eta")+";SimTrack |#eta|;# of tracks";
-      track_eta[j] = ibooker.book1D(track_eta_name.c_str(), track_eta_title.c_str(),140,minEta_,maxEta_);
-
-      for ( unsigned int k = 0 ; k<3 ; k++) {
-        string suffix = string(s_suffix[j])+ string(c_suffix[k]);
-        string track_phi_name  = string("track_phi")+suffix;
-        string track_phi_title = string("track_phi")+suffix+";SimTrack #phi;# of tracks";
-        track_phi[j][k] = ibooker.book1D(track_phi_name.c_str(), track_phi_title.c_str(),200,-PI,PI);
+  if (detailPlot_) {
+    for (unsigned int j = 0; j < nstation; j++) {
+      string track_eta_name = string("track_eta") + s_suffix[j];
+      string track_eta_title = string("track_eta") + ";SimTrack |#eta|;# of tracks";
+      track_eta[j] = ibooker.book1D(track_eta_name.c_str(), track_eta_title.c_str(), 140, minEta_, maxEta_);
+
+      for (unsigned int k = 0; k < 3; k++) {
+        string suffix = string(s_suffix[j]) + string(c_suffix[k]);
+        string track_phi_name = string("track_phi") + suffix;
+        string track_phi_title = string("track_phi") + suffix + ";SimTrack #phi;# of tracks";
+        track_phi[j][k] = ibooker.book1D(track_phi_name.c_str(), track_phi_title.c_str(), 200, -PI, PI);
       }
 
-
-      for( unsigned int i=0 ; i< 4; i++) {
-        string suffix = string(s_suffix[j])+string(l_suffix[i]);
-        string dg_eta_name = string("dg_eta")+suffix;
-        string dg_eta_title = dg_eta_name+"; tracks |#eta|; # of tracks";
-        dg_eta[i][j] = ibooker.book1D( dg_eta_name.c_str(), dg_eta_title.c_str(), 140, minEta_, maxEta_) ;
-
-        string dg_sh_eta_name = string("dg_sh_eta")+suffix;
-        string dg_sh_eta_title = dg_sh_eta_name+"; tracks |#eta|; # of tracks";
-        dg_sh_eta[i][j] = ibooker.book1D( dg_sh_eta_name.c_str(), dg_sh_eta_title.c_str(), 140, minEta_, maxEta_) ;
-
-        string pad_eta_name = string("pad_eta")+suffix;
-        string pad_eta_title = pad_eta_name+"; tracks |#eta|; # of tracks";
-        pad_eta[i][j] = ibooker.book1D( pad_eta_name.c_str(), pad_eta_title.c_str(), 140, minEta_, maxEta_) ;
-
-        string copad_eta_name = string("copad_eta")+suffix;
-        string copad_eta_title = copad_eta_name+"; tracks |#eta|; # of tracks";
-        copad_eta[i][j] = ibooker.book1D( copad_eta_name.c_str(), copad_eta_title.c_str(), 140, minEta_, maxEta_) ;
-
-        for ( unsigned int k = 0 ; k<3 ; k++) {
-          suffix = string(s_suffix[j])+string(l_suffix[i])+ string(c_suffix[k]);
-          string dg_phi_name = string("dg_phi")+suffix;
-          string dg_phi_title = dg_phi_name+"; tracks #phi; # of tracks";
-          dg_phi[i][j][k] = ibooker.book1D( (dg_phi_name).c_str(), dg_phi_title.c_str(), 200, -PI,PI) ;
-
-          string dg_sh_phi_name = string("dg_sh_phi")+suffix;
-          string dg_sh_phi_title = dg_sh_phi_name+"; tracks #phi; # of tracks";
-          dg_sh_phi[i][j][k] = ibooker.book1D( (dg_sh_phi_name).c_str(), dg_sh_phi_title.c_str(), 200,-PI,PI) ;
-
-          string pad_phi_name = string("pad_phi")+suffix;
-          string pad_phi_title = pad_phi_name+"; tracks #phi; # of tracks";
-          pad_phi[i][j][k] = ibooker.book1D( (pad_phi_name).c_str(), pad_phi_title.c_str(), 200, -PI,PI) ;
-
-          string copad_phi_name = string("copad_phi")+suffix;
-          string copad_phi_title = copad_phi_name+"; tracks #phi; # of tracks";
-          copad_phi[i][j][k] = ibooker.book1D( (copad_phi_name).c_str(), copad_phi_title.c_str(), 200, -PI,PI) ;
-
+      for (unsigned int i = 0; i < 4; i++) {
+        string suffix = string(s_suffix[j]) + string(l_suffix[i]);
+        string dg_eta_name = string("dg_eta") + suffix;
+        string dg_eta_title = dg_eta_name + "; tracks |#eta|; # of tracks";
+        dg_eta[i][j] = ibooker.book1D(dg_eta_name.c_str(), dg_eta_title.c_str(), 140, minEta_, maxEta_);
+
+        string dg_sh_eta_name = string("dg_sh_eta") + suffix;
+        string dg_sh_eta_title = dg_sh_eta_name + "; tracks |#eta|; # of tracks";
+        dg_sh_eta[i][j] = ibooker.book1D(dg_sh_eta_name.c_str(), dg_sh_eta_title.c_str(), 140, minEta_, maxEta_);
+
+        string pad_eta_name = string("pad_eta") + suffix;
+        string pad_eta_title = pad_eta_name + "; tracks |#eta|; # of tracks";
+        pad_eta[i][j] = ibooker.book1D(pad_eta_name.c_str(), pad_eta_title.c_str(), 140, minEta_, maxEta_);
+
+        string copad_eta_name = string("copad_eta") + suffix;
+        string copad_eta_title = copad_eta_name + "; tracks |#eta|; # of tracks";
+        copad_eta[i][j] = ibooker.book1D(copad_eta_name.c_str(), copad_eta_title.c_str(), 140, minEta_, maxEta_);
+
+        for (unsigned int k = 0; k < 3; k++) {
+          suffix = string(s_suffix[j]) + string(l_suffix[i]) + string(c_suffix[k]);
+          string dg_phi_name = string("dg_phi") + suffix;
+          string dg_phi_title = dg_phi_name + "; tracks #phi; # of tracks";
+          dg_phi[i][j][k] = ibooker.book1D((dg_phi_name).c_str(), dg_phi_title.c_str(), 200, -PI, PI);
+
+          string dg_sh_phi_name = string("dg_sh_phi") + suffix;
+          string dg_sh_phi_title = dg_sh_phi_name + "; tracks #phi; # of tracks";
+          dg_sh_phi[i][j][k] = ibooker.book1D((dg_sh_phi_name).c_str(), dg_sh_phi_title.c_str(), 200, -PI, PI);
+
+          string pad_phi_name = string("pad_phi") + suffix;
+          string pad_phi_title = pad_phi_name + "; tracks #phi; # of tracks";
+          pad_phi[i][j][k] = ibooker.book1D((pad_phi_name).c_str(), pad_phi_title.c_str(), 200, -PI, PI);
+
+          string copad_phi_name = string("copad_phi") + suffix;
+          string copad_phi_title = copad_phi_name + "; tracks #phi; # of tracks";
+          copad_phi[i][j][k] = ibooker.book1D((copad_phi_name).c_str(), copad_phi_title.c_str(), 200, -PI, PI);
         }
       }
     }
   }
 }
 
-GEMDigiTrackMatch::~GEMDigiTrackMatch() {  }
+GEMDigiTrackMatch::~GEMDigiTrackMatch() {}
 
-void GEMDigiTrackMatch::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void GEMDigiTrackMatch::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   edm::ESHandle<GEMGeometry> hGeom;
   iSetup.get<MuonGeometryRecord>().get(hGeom);
-  const GEMGeometry& geom = *hGeom;
+  const GEMGeometry &geom = *hGeom;
 
   edm::Handle<edm::PSimHitContainer> simhits;
   edm::Handle<edm::SimTrackContainer> sim_tracks;
@@ -106,90 +101,89 @@ void GEMDigiTrackMatch::analyze(const edm::Event& iEvent, const edm::EventSetup&
   iEvent.getByToken(simHitsToken_, simhits);
   iEvent.getByToken(simTracksToken_, sim_tracks);
   iEvent.getByToken(simVerticesToken_, sim_vertices);
-  if ( !simhits.isValid() || !sim_tracks.isValid() || !sim_vertices.isValid()) return;
-
-  if ( detailPlot_) {
+  if (!simhits.isValid() || !sim_tracks.isValid() || !sim_vertices.isValid())
+    return;
 
+  if (detailPlot_) {
     edm::Handle<edm::PSimHitContainer> simhits;
     edm::Handle<edm::SimTrackContainer> sim_tracks;
     edm::Handle<edm::SimVertexContainer> sim_vertices;
     iEvent.getByToken(simHitsToken_, simhits);
     iEvent.getByToken(simTracksToken_, sim_tracks);
     iEvent.getByToken(simVerticesToken_, sim_vertices);
-    if ( !simhits.isValid() || !sim_tracks.isValid() || !sim_vertices.isValid()) return;
-
-    //const edm::SimVertexContainer & sim_vert = *sim_vertices.product();
-    const edm::SimTrackContainer & sim_trks = *sim_tracks.product();
-    MySimTrack track_; 
-    for (auto& t: sim_trks)
-    {
-      if (!isSimTrackGood(t)) 
-      { continue; } 
+    if (!simhits.isValid() || !sim_tracks.isValid() || !sim_vertices.isValid())
+      return;
+
+    // const edm::SimVertexContainer & sim_vert = *sim_vertices.product();
+    const edm::SimTrackContainer &sim_trks = *sim_tracks.product();
+    MySimTrack track_;
+    for (auto &t : sim_trks) {
+      if (!isSimTrackGood(t)) {
+        continue;
+      }
 
       // match hits and digis to this SimTrack
 
-      const SimHitMatcher& match_sh = SimHitMatcher( t, iEvent, geom, cfg_, simHitsToken_, simTracksToken_, simVerticesToken_);
-      const GEMDigiMatcher& match_gd = GEMDigiMatcher( match_sh, iEvent, geom, cfg_ ,gem_digiToken_, gem_padToken_, gem_copadToken_);
+      const SimHitMatcher &match_sh =
+          SimHitMatcher(t, iEvent, geom, cfg_, simHitsToken_, simTracksToken_, simVerticesToken_);
+      const GEMDigiMatcher &match_gd =
+          GEMDigiMatcher(match_sh, iEvent, geom, cfg_, gem_digiToken_, gem_padToken_, gem_copadToken_);
 
       track_.pt = t.momentum().pt();
       track_.phi = t.momentum().phi();
       track_.eta = t.momentum().eta();
-      std::fill( std::begin(track_.hitOdd), std::end(track_.hitOdd),false);
-      std::fill( std::begin(track_.hitEven), std::end(track_.hitEven),false);
+      std::fill(std::begin(track_.hitOdd), std::end(track_.hitOdd), false);
+      std::fill(std::begin(track_.hitEven), std::end(track_.hitEven), false);
 
-      for ( int i= 0 ; i< 3 ; i++) {
-        for ( int j= 0 ; j<2 ; j++) {
-          track_.gem_sh[i][j]  = false;
-          track_.gem_dg[i][j]  = false;
+      for (int i = 0; i < 3; i++) {
+        for (int j = 0; j < 2; j++) {
+          track_.gem_sh[i][j] = false;
+          track_.gem_dg[i][j] = false;
           track_.gem_pad[i][j] = false;
         }
       }
 
       // ** GEM SimHits ** //
       const auto gem_sh_ids_ch = match_sh.chamberIdsGEM();
-      for(auto d: gem_sh_ids_ch)
-      {
+      for (auto d : gem_sh_ids_ch) {
         const GEMDetId id(d);
-        if ( id.chamber() %2 ==0 ) track_.hitEven[id.station()-1] = true;
-        else if ( id.chamber() %2 ==1 ) track_.hitOdd[id.station()-1] = true;
-        else { std::cout<<"Error to get chamber id"<<std::endl;}
-
-        track_.gem_sh[ id.station()-1][ (id.layer()-1)] = true;
+        if (id.chamber() % 2 == 0)
+          track_.hitEven[id.station() - 1] = true;
+        else if (id.chamber() % 2 == 1)
+          track_.hitOdd[id.station() - 1] = true;
+        else {
+          std::cout << "Error to get chamber id" << std::endl;
+        }
 
+        track_.gem_sh[id.station() - 1][(id.layer() - 1)] = true;
       }
       // ** GEM Digis, Pads and CoPads ** //
       const auto gem_dg_ids_ch = match_gd.chamberIds();
 
-      for(auto d: gem_dg_ids_ch)
-      {
+      for (auto d : gem_dg_ids_ch) {
         const GEMDetId id(d);
-        track_.gem_dg[ id.station()-1][ (id.layer()-1)] = true;
+        track_.gem_dg[id.station() - 1][(id.layer() - 1)] = true;
       }
       const auto gem_pad_ids_ch = match_gd.chamberIdsWithPads();
-      for(auto d: gem_pad_ids_ch)
-      {
+      for (auto d : gem_pad_ids_ch) {
         const GEMDetId id(d);
-        track_.gem_pad[ id.station()-1][ (id.layer()-1)] = true;
+        track_.gem_pad[id.station() - 1][(id.layer() - 1)] = true;
       }
 
+      FillWithTrigger(track_eta, fabs(track_.eta));
+      FillWithTrigger(track_phi, fabs(track_.eta), track_.phi, track_.hitOdd, track_.hitEven);
 
-      FillWithTrigger( track_eta, fabs(track_.eta)) ;
-      FillWithTrigger( track_phi, fabs(track_.eta), track_.phi, track_.hitOdd, track_.hitEven);
-
-
-      FillWithTrigger( dg_sh_eta, track_.gem_sh  , fabs( track_.eta) );
-      FillWithTrigger( dg_eta,    track_.gem_dg  , fabs( track_.eta) );
-      FillWithTrigger( pad_eta,   track_.gem_pad , fabs( track_.eta) );
-      FillWithTrigger( copad_eta,   track_.gem_pad , fabs( track_.eta) );
+      FillWithTrigger(dg_sh_eta, track_.gem_sh, fabs(track_.eta));
+      FillWithTrigger(dg_eta, track_.gem_dg, fabs(track_.eta));
+      FillWithTrigger(pad_eta, track_.gem_pad, fabs(track_.eta));
+      FillWithTrigger(copad_eta, track_.gem_pad, fabs(track_.eta));
 
       // Separate station.
 
-      FillWithTrigger( dg_sh_phi, track_.gem_sh  ,fabs(track_.eta), track_.phi , track_.hitOdd, track_.hitEven);
-      FillWithTrigger( dg_phi,    track_.gem_dg  ,fabs(track_.eta), track_.phi , track_.hitOdd, track_.hitEven);
-      FillWithTrigger( pad_phi,   track_.gem_pad ,fabs(track_.eta), track_.phi , track_.hitOdd, track_.hitEven);
-      FillWithTrigger( copad_phi,   track_.gem_pad ,fabs(track_.eta), track_.phi , track_.hitOdd, track_.hitEven);
-
-
+      FillWithTrigger(dg_sh_phi, track_.gem_sh, fabs(track_.eta), track_.phi, track_.hitOdd, track_.hitEven);
+      FillWithTrigger(dg_phi, track_.gem_dg, fabs(track_.eta), track_.phi, track_.hitOdd, track_.hitEven);
+      FillWithTrigger(pad_phi, track_.gem_pad, fabs(track_.eta), track_.phi, track_.hitOdd, track_.hitEven);
+      FillWithTrigger(copad_phi, track_.gem_pad, fabs(track_.eta), track_.phi, track_.hitOdd, track_.hitEven);
     }
   }
 }
diff --git a/Validation/MuonGEMDigis/src/GEMPadDigiValidation.cc b/Validation/MuonGEMDigis/src/GEMPadDigiValidation.cc
index ea67574718373..0b7ce1d33944d 100644
--- a/Validation/MuonGEMDigis/src/GEMPadDigiValidation.cc
+++ b/Validation/MuonGEMDigis/src/GEMPadDigiValidation.cc
@@ -1,102 +1,121 @@
 #include "Validation/MuonGEMDigis/interface/GEMPadDigiValidation.h"
 #include <TMath.h>
 
-GEMPadDigiValidation::GEMPadDigiValidation(const edm::ParameterSet& cfg): GEMBaseValidation(cfg)
-{
+GEMPadDigiValidation::GEMPadDigiValidation(const edm::ParameterSet &cfg) : GEMBaseValidation(cfg) {
   InputTagToken_ = consumes<GEMPadDigiCollection>(cfg.getParameter<edm::InputTag>("PadLabel"));
   detailPlot_ = cfg.getParameter<bool>("detailPlot");
 }
-void GEMPadDigiValidation::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & Run, edm::EventSetup const & iSetup ) {
-    
-  const GEMGeometry* GEMGeometry_ = initGeometry(iSetup);
-  if ( GEMGeometry_ == nullptr) return ;
-  LogDebug("GEMPadDigiValidation")<<"Geometry is acquired from MuonGeometryRecord\n";
+void GEMPadDigiValidation::bookHistograms(DQMStore::IBooker &ibooker,
+                                          edm::Run const &Run,
+                                          edm::EventSetup const &iSetup) {
+  const GEMGeometry *GEMGeometry_ = initGeometry(iSetup);
+  if (GEMGeometry_ == nullptr)
+    return;
+  LogDebug("GEMPadDigiValidation") << "Geometry is acquired from MuonGeometryRecord\n";
   ibooker.setCurrentFolder("MuonGEMDigisV/GEMDigisTask");
-  LogDebug("GEMPadDigiValidation")<<"ibooker set current folder\n";
+  LogDebug("GEMPadDigiValidation") << "ibooker set current folder\n";
 
-  if ( GEMGeometry_ == nullptr) return ;
-  int npadsGE11 = GEMGeometry_->regions()[0]->stations()[0]->superChambers()[0]->chambers()[0]->etaPartitions()[0]->npads();
+  if (GEMGeometry_ == nullptr)
+    return;
+  int npadsGE11 =
+      GEMGeometry_->regions()[0]->stations()[0]->superChambers()[0]->chambers()[0]->etaPartitions()[0]->npads();
   int npadsGE21 = 0;
   int nPads = 0;
 
-  if (GEMGeometry_->regions()[0]->stations().size()>1 && !GEMGeometry_->regions()[0]->stations()[1]->superChambers().empty() ) {
-    npadsGE21 = GEMGeometry_->regions()[0]->stations()[1]->superChambers()[0]->chambers()[0]->etaPartitions()[0]->npads();
+  if (GEMGeometry_->regions()[0]->stations().size() > 1 &&
+      !GEMGeometry_->regions()[0]->stations()[1]->superChambers().empty()) {
+    npadsGE21 =
+        GEMGeometry_->regions()[0]->stations()[1]->superChambers()[0]->chambers()[0]->etaPartitions()[0]->npads();
   }
 
-  for( auto& region : GEMGeometry_->regions()  ){
+  for (auto &region : GEMGeometry_->regions()) {
     int re = region->region();
-    TString title_suffix = getSuffixTitle(re) ;
-    TString histname_suffix = getSuffixName( re ) ;
-    TString simpleZR_title    = TString::Format("ZR Occupancy%s; |Z|(cm) ; R(cm)",title_suffix.Data());
-    TString simpleZR_histname = TString::Format("pad_simple_zr%s",histname_suffix.Data());
-
-    auto* simpleZR = getSimpleZR(ibooker, simpleZR_title, simpleZR_histname);
-    if ( simpleZR != nullptr) {
-      thePad_simple_zr[simpleZR_histname.Hash() ] = simpleZR;
+    TString title_suffix = getSuffixTitle(re);
+    TString histname_suffix = getSuffixName(re);
+    TString simpleZR_title = TString::Format("ZR Occupancy%s; |Z|(cm) ; R(cm)", title_suffix.Data());
+    TString simpleZR_histname = TString::Format("pad_simple_zr%s", histname_suffix.Data());
+
+    auto *simpleZR = getSimpleZR(ibooker, simpleZR_title, simpleZR_histname);
+    if (simpleZR != nullptr) {
+      thePad_simple_zr[simpleZR_histname.Hash()] = simpleZR;
     }
-    for( auto& station : region->stations()) {
+    for (auto &station : region->stations()) {
       int st = station->station();
-      TString title_suffix2 = getSuffixTitle( re, st) ;
-      TString histname_suffix2 = getSuffixName( re, st) ;
+      TString title_suffix2 = getSuffixTitle(re, st);
+      TString histname_suffix2 = getSuffixName(re, st);
 
-      TString dcEta_title    = TString::Format("Occupancy for detector component %s;;#eta-partition",title_suffix2.Data());
-      TString dcEta_histname = TString::Format("pad_dcEta%s",histname_suffix2.Data());
+      TString dcEta_title =
+          TString::Format("Occupancy for detector component %s;;#eta-partition", title_suffix2.Data());
+      TString dcEta_histname = TString::Format("pad_dcEta%s", histname_suffix2.Data());
 
-      auto* dcEta = getDCEta(ibooker, station, dcEta_title, dcEta_histname);
-      if ( dcEta != nullptr) {
-        thePad_dcEta[ dcEta_histname.Hash() ] = dcEta;
+      auto *dcEta = getDCEta(ibooker, station, dcEta_title, dcEta_histname);
+      if (dcEta != nullptr) {
+        thePad_dcEta[dcEta_histname.Hash()] = dcEta;
       }
     }
   }
 
-
-  if ( detailPlot_ ) {
-    for( auto& region : GEMGeometry_->regions() ) {
+  if (detailPlot_) {
+    for (auto &region : GEMGeometry_->regions()) {
       int re = region->region();
-      int region_num = (re+1)/2;
-      for( auto& station : region->stations() ) {
-      int st = station->station();
-      int station_num = st-1;
-         if ( station_num == 0 ) nPads = npadsGE11;
-         else nPads = npadsGE21;
-        for( int la = 1 ; la <= 2 ; la++) {
-          int layer_num = la-1;
-          std::string name_prefix  = getSuffixName( re, st, la);
-          std::string label_prefix = getSuffixTitle( re, st, la) ;
-          theCSCPad_phipad[region_num][station_num][layer_num] = ibooker.book2D( ("pad_dg_phipad"+name_prefix).c_str(), ("Digi occupancy: "+label_prefix+"; phi [rad]; Pad number").c_str(), 280,-TMath::Pi(),TMath::Pi(), nPads/2,0,nPads );
-          theCSCPad[region_num][station_num][layer_num] = ibooker.book1D( ("pad_dg"+name_prefix).c_str(), ("Digi occupancy per pad number: "+label_prefix+";Pad number; entries").c_str(), nPads,0.5,nPads+0.5);
-          theCSCPad_bx[region_num][station_num][layer_num] = ibooker.book1D( ("pad_dg_bx"+name_prefix).c_str(), ("Bunch crossing: "+label_prefix+"; bunch crossing ; entries").c_str(), 11,-5.5,5.5);
-          theCSCPad_zr[region_num][station_num][layer_num] = BookHistZR(ibooker,"pad_dg","Pad Digi",region_num,station_num,layer_num);
-          theCSCPad_xy[region_num][station_num][layer_num] = BookHistXY(ibooker,"pad_dg","Pad Digi",region_num,station_num,layer_num);
-          TString xy_name = TString::Format("pad_dg_xy%s_odd",name_prefix.c_str());
-          TString xy_title = TString::Format("Digi XY occupancy %s at odd chambers",label_prefix.c_str());
-          theCSCPad_xy_ch[ xy_name.Hash()] = ibooker.book2D(xy_name, xy_title, 360, -360,360, 360, -360, 360);
-          xy_name = TString::Format("pad_dg_xy%s_even",name_prefix.c_str());
-          xy_title = TString::Format("Digi XY occupancy %s at even chambers",label_prefix.c_str());
-          theCSCPad_xy_ch[ xy_name.Hash()] = ibooker.book2D(xy_name, xy_title, 360, -360,360, 360, -360, 360);
+      int region_num = (re + 1) / 2;
+      for (auto &station : region->stations()) {
+        int st = station->station();
+        int station_num = st - 1;
+        if (station_num == 0)
+          nPads = npadsGE11;
+        else
+          nPads = npadsGE21;
+        for (int la = 1; la <= 2; la++) {
+          int layer_num = la - 1;
+          std::string name_prefix = getSuffixName(re, st, la);
+          std::string label_prefix = getSuffixTitle(re, st, la);
+          theCSCPad_phipad[region_num][station_num][layer_num] =
+              ibooker.book2D(("pad_dg_phipad" + name_prefix).c_str(),
+                             ("Digi occupancy: " + label_prefix + "; phi [rad]; Pad number").c_str(),
+                             280,
+                             -TMath::Pi(),
+                             TMath::Pi(),
+                             nPads / 2,
+                             0,
+                             nPads);
+          theCSCPad[region_num][station_num][layer_num] =
+              ibooker.book1D(("pad_dg" + name_prefix).c_str(),
+                             ("Digi occupancy per pad number: " + label_prefix + ";Pad number; entries").c_str(),
+                             nPads,
+                             0.5,
+                             nPads + 0.5);
+          theCSCPad_bx[region_num][station_num][layer_num] =
+              ibooker.book1D(("pad_dg_bx" + name_prefix).c_str(),
+                             ("Bunch crossing: " + label_prefix + "; bunch crossing ; entries").c_str(),
+                             11,
+                             -5.5,
+                             5.5);
+          theCSCPad_zr[region_num][station_num][layer_num] =
+              BookHistZR(ibooker, "pad_dg", "Pad Digi", region_num, station_num, layer_num);
+          theCSCPad_xy[region_num][station_num][layer_num] =
+              BookHistXY(ibooker, "pad_dg", "Pad Digi", region_num, station_num, layer_num);
+          TString xy_name = TString::Format("pad_dg_xy%s_odd", name_prefix.c_str());
+          TString xy_title = TString::Format("Digi XY occupancy %s at odd chambers", label_prefix.c_str());
+          theCSCPad_xy_ch[xy_name.Hash()] = ibooker.book2D(xy_name, xy_title, 360, -360, 360, 360, -360, 360);
+          xy_name = TString::Format("pad_dg_xy%s_even", name_prefix.c_str());
+          xy_title = TString::Format("Digi XY occupancy %s at even chambers", label_prefix.c_str());
+          theCSCPad_xy_ch[xy_name.Hash()] = ibooker.book2D(xy_name, xy_title, 360, -360, 360, 360, -360, 360);
         }
       }
     }
   }
 }
 
+GEMPadDigiValidation::~GEMPadDigiValidation() {}
 
-GEMPadDigiValidation::~GEMPadDigiValidation() {
- 
-
-}
-
-
-void GEMPadDigiValidation::analyze(const edm::Event& e,
-                                     const edm::EventSetup& iSetup)
-{
-  const GEMGeometry* GEMGeometry_ ;
+void GEMPadDigiValidation::analyze(const edm::Event &e, const edm::EventSetup &iSetup) {
+  const GEMGeometry *GEMGeometry_;
   try {
     edm::ESHandle<GEMGeometry> hGeom;
     iSetup.get<MuonGeometryRecord>().get(hGeom);
     GEMGeometry_ = &*hGeom;
-  }
-  catch( edm::eventsetup::NoProxyException<GEMGeometry>& e) {
+  } catch (edm::eventsetup::NoProxyException<GEMGeometry> &e) {
     edm::LogError("GEMPadDigiValidation") << "+++ Error : GEM geometry is unavailable on event loop. +++\n";
     return;
   }
@@ -106,70 +125,73 @@ void GEMPadDigiValidation::analyze(const edm::Event& e,
     edm::LogError("GEMPadDigiValidation") << "Cannot get pads by label GEMPadToken.";
   }
 
-  for (GEMPadDigiCollection::DigiRangeIterator cItr=gem_digis->begin(); cItr!=gem_digis->end(); cItr++) {
-
+  for (GEMPadDigiCollection::DigiRangeIterator cItr = gem_digis->begin(); cItr != gem_digis->end(); cItr++) {
     GEMDetId id = (*cItr).first;
 
-    const GeomDet* gdet = GEMGeometry_->idToDet(id);
-    if ( gdet == nullptr) { 
-      std::cout<<"Getting DetId failed. Discard this gem pad hit.Maybe it comes from unmatched geometry."<<std::endl;
-      continue; 
+    const GeomDet *gdet = GEMGeometry_->idToDet(id);
+    if (gdet == nullptr) {
+      std::cout << "Getting DetId failed. Discard this gem pad hit.Maybe it "
+                   "comes from unmatched geometry."
+                << std::endl;
+      continue;
     }
-    const BoundPlane & surface = gdet->surface();
-    const GEMEtaPartition * roll = GEMGeometry_->etaPartition(id);
+    const BoundPlane &surface = gdet->surface();
+    const GEMEtaPartition *roll = GEMGeometry_->etaPartition(id);
 
     int re = id.region();
     int la = id.layer();
     int st = id.station();
-		Short_t chamber = (Short_t) id.chamber();
-    Short_t nroll = (Short_t) id.roll();
+    Short_t chamber = (Short_t)id.chamber();
+    Short_t nroll = (Short_t)id.roll();
     GEMPadDigiCollection::const_iterator digiItr;
 
-    //loop over digis of given roll
+    // loop over digis of given roll
     //
-    for (digiItr = (*cItr ).second.first; digiItr != (*cItr ).second.second; ++digiItr)
-    {
-      Short_t pad = (Short_t) digiItr->pad();
-      Short_t bx = (Short_t) digiItr->bx();
+    for (digiItr = (*cItr).second.first; digiItr != (*cItr).second.second; ++digiItr) {
+      Short_t pad = (Short_t)digiItr->pad();
+      Short_t bx = (Short_t)digiItr->bx();
 
       LocalPoint lp = roll->centreOfPad(digiItr->pad());
 
       GlobalPoint gp = surface.toGlobal(lp);
-      Float_t g_r = (Float_t) gp.perp();
-      Float_t g_phi = (Float_t) gp.phi();
-      Float_t g_x = (Float_t) gp.x();
-      Float_t g_y = (Float_t) gp.y();
-      Float_t g_z = (Float_t) gp.z();
-      edm::LogInfo("GEMPadDIGIValidation")<<"Global x "<<g_x<<"Global y "<<g_y<<"\n";  
-      edm::LogInfo("GEMPadDIGIValidation")<<"Global pad "<<pad<<"Global phi "<<g_phi<<std::endl; 
-      edm::LogInfo("GEMPadDIGIValidation")<<"Global bx "<<bx<<std::endl; 
-
-      int region_num  = (re+1)/2;
-      int station_num = st-1;
-      int layer_num   = la-1;
-      int binX = (chamber-1)*2+layer_num;
+      Float_t g_r = (Float_t)gp.perp();
+      Float_t g_phi = (Float_t)gp.phi();
+      Float_t g_x = (Float_t)gp.x();
+      Float_t g_y = (Float_t)gp.y();
+      Float_t g_z = (Float_t)gp.z();
+      edm::LogInfo("GEMPadDIGIValidation") << "Global x " << g_x << "Global y " << g_y << "\n";
+      edm::LogInfo("GEMPadDIGIValidation") << "Global pad " << pad << "Global phi " << g_phi << std::endl;
+      edm::LogInfo("GEMPadDIGIValidation") << "Global bx " << bx << std::endl;
+
+      int region_num = (re + 1) / 2;
+      int station_num = st - 1;
+      int layer_num = la - 1;
+      int binX = (chamber - 1) * 2 + layer_num;
       int binY = nroll;
 
       // Fill normal plots.
-      TString histname_suffix = getSuffixName( re);
-      TString simple_zr_histname = TString::Format("pad_simple_zr%s",histname_suffix.Data());
-      thePad_simple_zr[simple_zr_histname.Hash()]->Fill( fabs(g_z), g_r);
+      TString histname_suffix = getSuffixName(re);
+      TString simple_zr_histname = TString::Format("pad_simple_zr%s", histname_suffix.Data());
+      thePad_simple_zr[simple_zr_histname.Hash()]->Fill(fabs(g_z), g_r);
 
-      histname_suffix = getSuffixName( re, st);
-      TString dcEta_histname = TString::Format("pad_dcEta%s",histname_suffix.Data());
-      thePad_dcEta[dcEta_histname.Hash()]->Fill( binX, binY); 
+      histname_suffix = getSuffixName(re, st);
+      TString dcEta_histname = TString::Format("pad_dcEta%s", histname_suffix.Data());
+      thePad_dcEta[dcEta_histname.Hash()]->Fill(binX, binY);
 
-      if ( detailPlot_) {
-        theCSCPad_xy[region_num][station_num][layer_num]->Fill(g_x,g_y);     
-        theCSCPad_phipad[region_num][station_num][layer_num]->Fill(g_phi,pad);
+      if (detailPlot_) {
+        theCSCPad_xy[region_num][station_num][layer_num]->Fill(g_x, g_y);
+        theCSCPad_phipad[region_num][station_num][layer_num]->Fill(g_phi, pad);
         theCSCPad[region_num][station_num][layer_num]->Fill(pad);
         theCSCPad_bx[region_num][station_num][layer_num]->Fill(bx);
-        theCSCPad_zr[region_num][station_num][layer_num]->Fill(g_z,g_r);
-        std::string name_prefix = getSuffixName( re, st, la);
+        theCSCPad_zr[region_num][station_num][layer_num]->Fill(g_z, g_r);
+        std::string name_prefix = getSuffixName(re, st, la);
         TString hname;
-        if ( chamber %2 == 0 ) { hname = TString::Format("pad_dg_xy%s_even",name_prefix.c_str()); }
-        else { hname = TString::Format("pad_dg_xy%s_odd",name_prefix.c_str()); }
-        theCSCPad_xy_ch[hname.Hash()]->Fill(g_x,g_y);
+        if (chamber % 2 == 0) {
+          hname = TString::Format("pad_dg_xy%s_even", name_prefix.c_str());
+        } else {
+          hname = TString::Format("pad_dg_xy%s_odd", name_prefix.c_str());
+        }
+        theCSCPad_xy_ch[hname.Hash()]->Fill(g_x, g_y);
       }
     }
   }
diff --git a/Validation/MuonGEMDigis/src/GEMStripDigiValidation.cc b/Validation/MuonGEMDigis/src/GEMStripDigiValidation.cc
index 27a6f4431b5e1..c8881bc022167 100644
--- a/Validation/MuonGEMDigis/src/GEMStripDigiValidation.cc
+++ b/Validation/MuonGEMDigis/src/GEMStripDigiValidation.cc
@@ -1,187 +1,205 @@
-#include "Validation/MuonGEMDigis/interface/GEMStripDigiValidation.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
+#include "Validation/MuonGEMDigis/interface/GEMStripDigiValidation.h"
 
 #include <TMath.h>
 #include <iomanip>
-GEMStripDigiValidation::GEMStripDigiValidation(const edm::ParameterSet& cfg): GEMBaseValidation(cfg)
-{
+GEMStripDigiValidation::GEMStripDigiValidation(const edm::ParameterSet &cfg) : GEMBaseValidation(cfg) {
   InputTagToken_ = consumes<GEMDigiCollection>(cfg.getParameter<edm::InputTag>("stripLabel"));
   detailPlot_ = cfg.getParameter<bool>("detailPlot");
 }
 
-void GEMStripDigiValidation::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & Run, edm::EventSetup const & iSetup ) {
-    
-  const GEMGeometry* GEMGeometry_  = initGeometry( iSetup) ;
-  if ( GEMGeometry_ == nullptr) return ;
-  LogDebug("GEMStripDigiValidation")<<"Geometry is acquired from MuonGeometryRecord\n";
+void GEMStripDigiValidation::bookHistograms(DQMStore::IBooker &ibooker,
+                                            edm::Run const &Run,
+                                            edm::EventSetup const &iSetup) {
+  const GEMGeometry *GEMGeometry_ = initGeometry(iSetup);
+  if (GEMGeometry_ == nullptr)
+    return;
+  LogDebug("GEMStripDigiValidation") << "Geometry is acquired from MuonGeometryRecord\n";
   ibooker.setCurrentFolder("MuonGEMDigisV/GEMDigisTask");
-  LogDebug("GEMStripDigiValidation")<<"ibooker set current folder\n";
+  LogDebug("GEMStripDigiValidation") << "ibooker set current folder\n";
 
-  LogDebug("GEMStripDigiValidation")<<"nregions set.\n";
-  LogDebug("GEMStripDigiValidation")<<"nstations set.\n";
+  LogDebug("GEMStripDigiValidation") << "nregions set.\n";
+  LogDebug("GEMStripDigiValidation") << "nstations set.\n";
   int nstripsGE11 = 384;
   int nstripsGE21 = 768;
 
-  LogDebug("GEMStripDigiValidation")<<"Successfully binning set.\n";
-
+  LogDebug("GEMStripDigiValidation") << "Successfully binning set.\n";
 
   int nstrips = 0;
 
-
-  for( auto& region : GEMGeometry_->regions()  ){
+  for (auto &region : GEMGeometry_->regions()) {
     int re = region->region();
-    TString title_suffix = getSuffixTitle( re );
-    TString histname_suffix = getSuffixName( re) ;
-    TString simpleZR_title    = TString::Format("ZR Occupancy%s; |Z|(cm) ; R(cm)",title_suffix.Data());
-    TString simpleZR_histname = TString::Format("strip_simple_zr%s",histname_suffix.Data());
-
-    auto* simpleZR = getSimpleZR(ibooker, simpleZR_title, simpleZR_histname);
-    if ( simpleZR != nullptr) {
-      theStrip_simple_zr[simpleZR_histname.Hash() ] = simpleZR;
+    TString title_suffix = getSuffixTitle(re);
+    TString histname_suffix = getSuffixName(re);
+    TString simpleZR_title = TString::Format("ZR Occupancy%s; |Z|(cm) ; R(cm)", title_suffix.Data());
+    TString simpleZR_histname = TString::Format("strip_simple_zr%s", histname_suffix.Data());
+
+    auto *simpleZR = getSimpleZR(ibooker, simpleZR_title, simpleZR_histname);
+    if (simpleZR != nullptr) {
+      theStrip_simple_zr[simpleZR_histname.Hash()] = simpleZR;
     }
 
-    for( auto& station : region->stations()) {
+    for (auto &station : region->stations()) {
       int st = station->station();
-      TString title_suffix2 = getSuffixTitle( re, st ) ;
-      TString histname_suffix2 = getSuffixName( re, st) ;
+      TString title_suffix2 = getSuffixTitle(re, st);
+      TString histname_suffix2 = getSuffixName(re, st);
 
-      TString dcEta_title    = TString::Format("Occupancy for detector component %s;;#eta-partition",title_suffix2.Data());
-      TString dcEta_histname = TString::Format("strip_dcEta%s",histname_suffix2.Data());
+      TString dcEta_title =
+          TString::Format("Occupancy for detector component %s;;#eta-partition", title_suffix2.Data());
+      TString dcEta_histname = TString::Format("strip_dcEta%s", histname_suffix2.Data());
 
-      auto* dcEta = getDCEta(ibooker, station, dcEta_title, dcEta_histname);
-      if ( dcEta != nullptr) {
-        theStrip_dcEta[ dcEta_histname.Hash() ] = dcEta; 
+      auto *dcEta = getDCEta(ibooker, station, dcEta_title, dcEta_histname);
+      if (dcEta != nullptr) {
+        theStrip_dcEta[dcEta_histname.Hash()] = dcEta;
       }
     }
   }
 
   // Booking detail plot.
-  if ( detailPlot_ ) {
-    for( auto& region : GEMGeometry_->regions() ) {
-    for( auto& station : region->stations()) {
-      for( int la = 1 ; la <= 2 ; la++) {
+  if (detailPlot_) {
+    for (auto &region : GEMGeometry_->regions()) {
+      for (auto &station : region->stations()) {
+        for (int la = 1; la <= 2; la++) {
           int re = region->region();
           int st = station->station();
-          int region_num = (re+1)/2;
-          int station_num = st-1;
-          int layer_num = la-1;
-
-          if ( st ==1 ) nstrips = nstripsGE11;
-          else nstrips = nstripsGE21;
-          std::string name_prefix = getSuffixName( re, st, la);
-          std::string label_prefix = getSuffixTitle( re, st, la) ;
-          theStrip_phistrip[region_num][station_num][layer_num] = ibooker.book2D( ("strip_dg_phistrip"+name_prefix).c_str(), ("Digi occupancy: "+label_prefix+"; phi [rad];strip number").c_str(), 280, -TMath::Pi(), TMath::Pi(), nstrips/2,0,nstrips);
-          theStrip[region_num][station_num][layer_num] = ibooker.book1D( ("strip_dg"+name_prefix).c_str(), ("Digi occupancy per stip number: "+label_prefix+";strip number; entries").c_str(), nstrips,0.5,nstrips+0.5);
-          theStrip_bx[region_num][station_num][layer_num] = ibooker.book1D( ("strip_dg_bx"+name_prefix).c_str(), ("Bunch crossing: "+label_prefix+"; bunch crossing ; entries").c_str(), 11,-5.5,5.5);
-          theStrip_zr[region_num][station_num][layer_num] = BookHistZR(ibooker,"strip_dg","Strip Digi",region_num,station_num,layer_num);
-          theStrip_xy[region_num][station_num][layer_num] = BookHistXY(ibooker,"strip_dg","Strip Digi",region_num,station_num,layer_num);
-          TString xy_name = TString::Format("strip_dg_xy%s_odd",name_prefix.c_str());
-          TString xy_title = TString::Format("Digi XY occupancy %s at odd chambers",label_prefix.c_str());
-          theStrip_xy_ch[ xy_name.Hash() ] = ibooker.book2D(xy_name, xy_title, 360, -360,360, 360, -360, 360);
-          xy_name = TString::Format("strip_dg_xy%s_even",name_prefix.c_str());
-          xy_title = TString::Format("Digi XY occupancy %s at even chambers",label_prefix.c_str());
-          theStrip_xy_ch[ xy_name.Hash() ] = ibooker.book2D(xy_name, xy_title, 360, -360,360, 360, -360, 360);
+          int region_num = (re + 1) / 2;
+          int station_num = st - 1;
+          int layer_num = la - 1;
+
+          if (st == 1)
+            nstrips = nstripsGE11;
+          else
+            nstrips = nstripsGE21;
+          std::string name_prefix = getSuffixName(re, st, la);
+          std::string label_prefix = getSuffixTitle(re, st, la);
+          theStrip_phistrip[region_num][station_num][layer_num] =
+              ibooker.book2D(("strip_dg_phistrip" + name_prefix).c_str(),
+                             ("Digi occupancy: " + label_prefix + "; phi [rad];strip number").c_str(),
+                             280,
+                             -TMath::Pi(),
+                             TMath::Pi(),
+                             nstrips / 2,
+                             0,
+                             nstrips);
+          theStrip[region_num][station_num][layer_num] =
+              ibooker.book1D(("strip_dg" + name_prefix).c_str(),
+                             ("Digi occupancy per stip number: " + label_prefix + ";strip number; entries").c_str(),
+                             nstrips,
+                             0.5,
+                             nstrips + 0.5);
+          theStrip_bx[region_num][station_num][layer_num] =
+              ibooker.book1D(("strip_dg_bx" + name_prefix).c_str(),
+                             ("Bunch crossing: " + label_prefix + "; bunch crossing ; entries").c_str(),
+                             11,
+                             -5.5,
+                             5.5);
+          theStrip_zr[region_num][station_num][layer_num] =
+              BookHistZR(ibooker, "strip_dg", "Strip Digi", region_num, station_num, layer_num);
+          theStrip_xy[region_num][station_num][layer_num] =
+              BookHistXY(ibooker, "strip_dg", "Strip Digi", region_num, station_num, layer_num);
+          TString xy_name = TString::Format("strip_dg_xy%s_odd", name_prefix.c_str());
+          TString xy_title = TString::Format("Digi XY occupancy %s at odd chambers", label_prefix.c_str());
+          theStrip_xy_ch[xy_name.Hash()] = ibooker.book2D(xy_name, xy_title, 360, -360, 360, 360, -360, 360);
+          xy_name = TString::Format("strip_dg_xy%s_even", name_prefix.c_str());
+          xy_title = TString::Format("Digi XY occupancy %s at even chambers", label_prefix.c_str());
+          theStrip_xy_ch[xy_name.Hash()] = ibooker.book2D(xy_name, xy_title, 360, -360, 360, 360, -360, 360);
         }
       }
     }
   }
-  LogDebug("GEMStripDigiValidation")<<"Booking End.\n";
+  LogDebug("GEMStripDigiValidation") << "Booking End.\n";
 }
 
+GEMStripDigiValidation::~GEMStripDigiValidation() {}
 
-GEMStripDigiValidation::~GEMStripDigiValidation() {
-}
-
-void GEMStripDigiValidation::analyze(const edm::Event& e,
-    const edm::EventSetup& iSetup)
-{
-  const GEMGeometry* GEMGeometry_ ;
+void GEMStripDigiValidation::analyze(const edm::Event &e, const edm::EventSetup &iSetup) {
+  const GEMGeometry *GEMGeometry_;
   try {
     edm::ESHandle<GEMGeometry> hGeom;
     iSetup.get<MuonGeometryRecord>().get(hGeom);
     GEMGeometry_ = &*hGeom;
-  }
-  catch( edm::eventsetup::NoProxyException<GEMGeometry>& e) {
+  } catch (edm::eventsetup::NoProxyException<GEMGeometry> &e) {
     edm::LogError("GEMStripDigiValidation") << "+++ Error : GEM geometry is unavailable on event loop. +++\n";
     return;
   }
 
   edm::Handle<GEMDigiCollection> gem_digis;
-  e.getByToken( this->InputTagToken_, gem_digis);
+  e.getByToken(this->InputTagToken_, gem_digis);
   if (!gem_digis.isValid()) {
     edm::LogError("GEMStripDigiValidation") << "Cannot get strips by Token stripToken.\n";
-    return ;
+    return;
   }
-  for (GEMDigiCollection::DigiRangeIterator cItr=gem_digis->begin(); cItr!=gem_digis->end(); cItr++) {
+  for (GEMDigiCollection::DigiRangeIterator cItr = gem_digis->begin(); cItr != gem_digis->end(); cItr++) {
     GEMDetId id = (*cItr).first;
 
-    const GeomDet* gdet = GEMGeometry_->idToDet(id);
-    if ( gdet == nullptr) { 
-      std::cout<<"Getting DetId failed. Discard this gem strip hit.Maybe it comes from unmatched geometry."<<std::endl;
-      continue; 
+    const GeomDet *gdet = GEMGeometry_->idToDet(id);
+    if (gdet == nullptr) {
+      std::cout << "Getting DetId failed. Discard this gem strip hit.Maybe it "
+                   "comes from unmatched geometry."
+                << std::endl;
+      continue;
     }
-    const BoundPlane & surface = gdet->surface();
-    const GEMEtaPartition * roll = GEMGeometry_->etaPartition(id);
+    const BoundPlane &surface = gdet->surface();
+    const GEMEtaPartition *roll = GEMGeometry_->etaPartition(id);
 
     int re = id.region();
     int la = id.layer();
     int st = id.station();
-    Short_t chamber = (Short_t) id.chamber();
-    Short_t nroll = (Short_t) id.roll();
+    Short_t chamber = (Short_t)id.chamber();
+    Short_t nroll = (Short_t)id.roll();
 
     GEMDigiCollection::const_iterator digiItr;
-    for (digiItr = (*cItr ).second.first; digiItr != (*cItr ).second.second; ++digiItr)
-    {
-      Short_t strip = (Short_t) digiItr->strip();
-      Short_t bx = (Short_t) digiItr->bx();
+    for (digiItr = (*cItr).second.first; digiItr != (*cItr).second.second; ++digiItr) {
+      Short_t strip = (Short_t)digiItr->strip();
+      Short_t bx = (Short_t)digiItr->bx();
 
       LocalPoint lp = roll->centreOfStrip(digiItr->strip());
 
       GlobalPoint gp = surface.toGlobal(lp);
-      Float_t g_r = (Float_t) gp.perp();
-      //Float_t g_eta = (Float_t) gp.eta();
-      Float_t g_phi = (Float_t) gp.phi();
-      Float_t g_x = (Float_t) gp.x();
-      Float_t g_y = (Float_t) gp.y();
-      Float_t g_z = (Float_t) gp.z();
-
-
-      int region_num = (re+1)/2;
-      int station_num = st-1;
-      int layer_num = la-1;
-
-      int binX = (chamber-1)*2+layer_num;
+      Float_t g_r = (Float_t)gp.perp();
+      // Float_t g_eta = (Float_t) gp.eta();
+      Float_t g_phi = (Float_t)gp.phi();
+      Float_t g_x = (Float_t)gp.x();
+      Float_t g_y = (Float_t)gp.y();
+      Float_t g_z = (Float_t)gp.z();
+
+      int region_num = (re + 1) / 2;
+      int station_num = st - 1;
+      int layer_num = la - 1;
+
+      int binX = (chamber - 1) * 2 + layer_num;
       int binY = nroll;
 
       // Fill normal plots.
-      TString histname_suffix = getSuffixName( re) ;
-      TString simple_zr_histname = TString::Format("strip_simple_zr%s",histname_suffix.Data());
-      theStrip_simple_zr[simple_zr_histname.Hash()]->Fill( fabs(g_z), g_r);
+      TString histname_suffix = getSuffixName(re);
+      TString simple_zr_histname = TString::Format("strip_simple_zr%s", histname_suffix.Data());
+      theStrip_simple_zr[simple_zr_histname.Hash()]->Fill(fabs(g_z), g_r);
 
-
-      histname_suffix = getSuffixName( re, st) ;
-      TString dcEta_histname = TString::Format("strip_dcEta%s",histname_suffix.Data());
-      theStrip_dcEta[dcEta_histname.Hash()]->Fill( binX, binY); 
+      histname_suffix = getSuffixName(re, st);
+      TString dcEta_histname = TString::Format("strip_dcEta%s", histname_suffix.Data());
+      theStrip_dcEta[dcEta_histname.Hash()]->Fill(binX, binY);
 
       // Fill detail plots.
-      if ( detailPlot_) {
-        if ( theStrip_xy[region_num][station_num][layer_num] != nullptr) {
-          theStrip_xy[region_num][station_num][layer_num]->Fill(g_x,g_y);     
-          theStrip_phistrip[region_num][station_num][layer_num]->Fill(g_phi,strip);
+      if (detailPlot_) {
+        if (theStrip_xy[region_num][station_num][layer_num] != nullptr) {
+          theStrip_xy[region_num][station_num][layer_num]->Fill(g_x, g_y);
+          theStrip_phistrip[region_num][station_num][layer_num]->Fill(g_phi, strip);
           theStrip[region_num][station_num][layer_num]->Fill(strip);
           theStrip_bx[region_num][station_num][layer_num]->Fill(bx);
-          theStrip_zr[region_num][station_num][layer_num]->Fill(g_z,g_r);
+          theStrip_zr[region_num][station_num][layer_num]->Fill(g_z, g_r);
 
-          std::string name_prefix = getSuffixName( re, st, la) ;
+          std::string name_prefix = getSuffixName(re, st, la);
           TString hname;
-          if ( chamber %2 == 0 ) { hname = TString::Format("strip_dg_xy%s_even",name_prefix.c_str()); }
-          else { hname = TString::Format("strip_dg_xy%s_odd",name_prefix.c_str()); }
-          theStrip_xy_ch[hname.Hash()]->Fill(g_x,g_y);
-        }
-        else {
-          std::cout<<"Error is occued when histograms is called."<<std::endl;
+          if (chamber % 2 == 0) {
+            hname = TString::Format("strip_dg_xy%s_even", name_prefix.c_str());
+          } else {
+            hname = TString::Format("strip_dg_xy%s_odd", name_prefix.c_str());
+          }
+          theStrip_xy_ch[hname.Hash()]->Fill(g_x, g_y);
+        } else {
+          std::cout << "Error is occued when histograms is called." << std::endl;
         }
       }
-    }    
+    }
   }
 }
diff --git a/Validation/MuonGEMRecHits/interface/GEMRecHitMatcher.h b/Validation/MuonGEMRecHits/interface/GEMRecHitMatcher.h
index c4d0fab42f973..d5cba36250de9 100644
--- a/Validation/MuonGEMRecHits/interface/GEMRecHitMatcher.h
+++ b/Validation/MuonGEMRecHits/interface/GEMRecHitMatcher.h
@@ -10,44 +10,43 @@
 
 */
 
-
 #include "FWCore/Utilities/interface/InputTag.h"
 
-
-
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Framework/interface/ConsumesCollector.h"
 
 #include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/GEMDigi/interface/GEMDigiCollection.h"
 #include "DataFormats/GEMDigi/interface/GEMPadDigiCollection.h"
 
 #include <SimDataFormats/Track/interface/SimTrackContainer.h>
-#include <SimDataFormats/Vertex/interface/SimVertexContainer.h> 
+#include <SimDataFormats/Vertex/interface/SimVertexContainer.h>
 
 #include "DataFormats/Common/interface/DetSetVector.h"
-#include <DataFormats/GEMRecHit/interface/GEMRecHit.h>
 #include "DataFormats/GEMRecHit/interface/GEMRecHitCollection.h"
 #include "Validation/MuonGEMDigis/interface/GenericDigi.h"
+#include <DataFormats/GEMRecHit/interface/GEMRecHit.h>
 
-#include <vector>
 #include <map>
 #include <set>
+#include <vector>
 
 class SimHitMatcher;
 class GEMGeometry;
-class GEMRecHitMatcher
-{
+class GEMRecHitMatcher {
 public:
-
   typedef matching::Digi RecHit;
   typedef matching::DigiContainer RecHitContainer;
 
-  GEMRecHitMatcher(const SimHitMatcher& sh, const edm::Event& , const GEMGeometry& geom, const edm::ParameterSet& cfg, edm::EDGetToken&);
-  
+  GEMRecHitMatcher(const SimHitMatcher &sh,
+                   const edm::Event &,
+                   const GEMGeometry &geom,
+                   const edm::ParameterSet &cfg,
+                   edm::EDGetToken &);
+
   ~GEMRecHitMatcher();
 
   // partition GEM detIds with rechits
@@ -60,9 +59,9 @@ class GEMRecHitMatcher
   std::set<unsigned int> superChamberIds() const;
 
   // GEM recHits from a particular partition, chamber or superchamber
-  const RecHitContainer& recHitsInDetId(unsigned int) const;
-  const RecHitContainer& recHitsInChamber(unsigned int) const;
-  const RecHitContainer& recHitsInSuperChamber(unsigned int) const;
+  const RecHitContainer &recHitsInDetId(unsigned int) const;
+  const RecHitContainer &recHitsInChamber(unsigned int) const;
+  const RecHitContainer &recHitsInSuperChamber(unsigned int) const;
 
   // #layers with recHits from this simtrack
   int nLayersWithRecHitsInSuperChamber(unsigned int) const;
@@ -78,19 +77,18 @@ class GEMRecHitMatcher
   // verbose value
   bool verbose() const { return verbose_; }
 
-  GlobalPoint recHitPosition(const RecHit& rechit) const;
-  GlobalPoint recHitMeanPosition(const RecHitContainer& rechits) const;
+  GlobalPoint recHitPosition(const RecHit &rechit) const;
+  GlobalPoint recHitMeanPosition(const RecHitContainer &rechits) const;
 
 private:
+  void init(const edm::Event &);
 
-  void init(const edm::Event& );
-
-  void matchRecHitsToSimTrack(const GEMRecHitCollection& recHits);
+  void matchRecHitsToSimTrack(const GEMRecHitCollection &recHits);
 
   edm::Handle<GEMRecHitCollection> gem_rechits_;
 
-  const SimHitMatcher& simhit_matcher_;
-  const GEMGeometry& gem_geo_;
+  const SimHitMatcher &simhit_matcher_;
+  const GEMGeometry &gem_geo_;
 
   int minBXGEM_, maxBXGEM_;
   bool verbose_;
@@ -102,8 +100,6 @@ class GEMRecHitMatcher
   std::map<unsigned int, RecHitContainer> superchamber_to_recHits_;
 
   const RecHitContainer no_recHits_;
-
-  
 };
 
 #endif
diff --git a/Validation/MuonGEMRecHits/interface/GEMRecHitTrackMatch.h b/Validation/MuonGEMRecHits/interface/GEMRecHitTrackMatch.h
index d0e1f568c24e6..0df7a20cf75c5 100644
--- a/Validation/MuonGEMRecHits/interface/GEMRecHitTrackMatch.h
+++ b/Validation/MuonGEMRecHits/interface/GEMRecHitTrackMatch.h
@@ -1,39 +1,36 @@
 #ifndef GEMRecHitTrackMatch_H
 #define GEMRecHitTrackMatch_H
 
-#include "Validation/MuonGEMHits/interface/GEMTrackMatch.h"
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/GEMGeometry/interface/GEMGeometry.h"
+#include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/GEMGeometry/interface/GEMEtaPartition.h"
 #include "Geometry/GEMGeometry/interface/GEMEtaPartitionSpecs.h"
-#include "Geometry/CommonTopologies/interface/StripTopology.h"
-#include "Validation/MuonGEMHits/interface/SimHitMatcher.h"
+#include "Geometry/GEMGeometry/interface/GEMGeometry.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Validation/MuonGEMDigis/interface/GEMDigiMatcher.h"
+#include "Validation/MuonGEMHits/interface/GEMTrackMatch.h"
+#include "Validation/MuonGEMHits/interface/SimHitMatcher.h"
 #include "Validation/MuonGEMRecHits/interface/GEMRecHitMatcher.h"
 
-
-class GEMRecHitTrackMatch : public GEMTrackMatch 
-{
+class GEMRecHitTrackMatch : public GEMTrackMatch {
 public:
-  explicit GEMRecHitTrackMatch(const edm::ParameterSet& ps);
+  explicit GEMRecHitTrackMatch(const edm::ParameterSet &ps);
   ~GEMRecHitTrackMatch() override;
-  void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const &) override;
-  void analyze(const edm::Event& e, const edm::EventSetup&) override;
- private:
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(const edm::Event &e, const edm::EventSetup &) override;
 
-  MonitorElement* track_eta[3];
-  MonitorElement* track_phi[3][3];
+private:
+  MonitorElement *track_eta[3];
+  MonitorElement *track_phi[3][3];
 
-  MonitorElement* rh_eta[4][3];
-  MonitorElement* rh_sh_eta[4][3]; 
+  MonitorElement *rh_eta[4][3];
+  MonitorElement *rh_sh_eta[4][3];
 
-  MonitorElement* rh_phi[4][3][3];
+  MonitorElement *rh_phi[4][3][3];
 
-  MonitorElement* rh_sh_phi[4][3][3]; 
+  MonitorElement *rh_sh_phi[4][3][3];
 
   edm::EDGetToken gem_recHitToken_;
-
 };
 
 #endif
\ No newline at end of file
diff --git a/Validation/MuonGEMRecHits/interface/GEMRecHitsValidation.h b/Validation/MuonGEMRecHits/interface/GEMRecHitsValidation.h
index 27888485ef065..b38db7298d75f 100644
--- a/Validation/MuonGEMRecHits/interface/GEMRecHitsValidation.h
+++ b/Validation/MuonGEMRecHits/interface/GEMRecHitsValidation.h
@@ -6,37 +6,47 @@
 #include <DataFormats/GEMRecHit/interface/GEMRecHit.h>
 #include <DataFormats/GEMRecHit/interface/GEMRecHitCollection.h>
 
-class GEMRecHitsValidation : public GEMBaseValidation
-{
+class GEMRecHitsValidation : public GEMBaseValidation {
 public:
-  explicit GEMRecHitsValidation( const edm::ParameterSet& );
+  explicit GEMRecHitsValidation(const edm::ParameterSet &);
   ~GEMRecHitsValidation() override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(const edm::Event& e, const edm::EventSetup&) override;
-  MonitorElement* BookHist1D( DQMStore::IBooker &, const char* name, const char* label, unsigned int region_num, unsigned int station_num, unsigned int layer_num, const unsigned int Nbin, const Float_t xMin, const Float_t xMax);
-  MonitorElement* BookHist1D( DQMStore::IBooker &, const char* name, const char* label, unsigned int region_num, const unsigned int Nbin, const Float_t xMin, const Float_t xMax);
+  void analyze(const edm::Event &e, const edm::EventSetup &) override;
+  MonitorElement *BookHist1D(DQMStore::IBooker &,
+                             const char *name,
+                             const char *label,
+                             unsigned int region_num,
+                             unsigned int station_num,
+                             unsigned int layer_num,
+                             const unsigned int Nbin,
+                             const Float_t xMin,
+                             const Float_t xMax);
+  MonitorElement *BookHist1D(DQMStore::IBooker &,
+                             const char *name,
+                             const char *label,
+                             unsigned int region_num,
+                             const unsigned int Nbin,
+                             const Float_t xMin,
+                             const Float_t xMax);
 
 private:
-
-  //Detaile Plots
-  MonitorElement* gem_rh_xy[2][3][2];
-  MonitorElement* gem_rh_zr[2][3][2];
-  MonitorElement* gem_cls[2][3][2];
-  MonitorElement* gem_pullX[2][3][2];
-  MonitorElement* gem_pullY[2][3][2];
-
-
-  //Simple Plots
-  MonitorElement* gem_cls_tot;
-  std::unordered_map< UInt_t , MonitorElement* > recHits_dcEta;
-  std::unordered_map< UInt_t , MonitorElement* > recHits_simple_zr;
-  MonitorElement* gem_region_pullX[2];
-  MonitorElement* gem_region_pullY[2];
+  // Detaile Plots
+  MonitorElement *gem_rh_xy[2][3][2];
+  MonitorElement *gem_rh_zr[2][3][2];
+  MonitorElement *gem_cls[2][3][2];
+  MonitorElement *gem_pullX[2][3][2];
+  MonitorElement *gem_pullY[2][3][2];
+
+  // Simple Plots
+  MonitorElement *gem_cls_tot;
+  std::unordered_map<UInt_t, MonitorElement *> recHits_dcEta;
+  std::unordered_map<UInt_t, MonitorElement *> recHits_simple_zr;
+  MonitorElement *gem_region_pullX[2];
+  MonitorElement *gem_region_pullY[2];
 
   edm::EDGetToken InputTagToken_, InputTagToken_RH;
   int nBinXY_;
   bool detailPlot_;
-
 };
 
 #endif
diff --git a/Validation/MuonGEMRecHits/plugins/MuonGEMRecHitsHarvestor.cc b/Validation/MuonGEMRecHits/plugins/MuonGEMRecHitsHarvestor.cc
index d2af92b5433bb..84127d7207592 100644
--- a/Validation/MuonGEMRecHits/plugins/MuonGEMRecHitsHarvestor.cc
+++ b/Validation/MuonGEMRecHits/plugins/MuonGEMRecHitsHarvestor.cc
@@ -2,173 +2,177 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "TTree.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 #include "TFile.h"
 #include "TGraphAsymmErrors.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Utilities/interface/InputTag.h"
+#include "TTree.h"
 
-///Data Format
-#include <DataFormats/GEMRecHit/interface/GEMRecHit.h>
-#include <DataFormats/GEMRecHit/interface/GEMRecHitCollection.h>
-#include "DataFormats/MuonDetId/interface/GEMDetId.h"
+/// Data Format
+#include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/GeometrySurface/interface/LocalError.h"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
-#include "DataFormats/Scalers/interface/DcsStatus.h"
-#include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/Math/interface/deltaPhi.h"
+#include "DataFormats/MuonDetId/interface/GEMDetId.h"
+#include "DataFormats/Scalers/interface/DcsStatus.h"
+#include <DataFormats/GEMRecHit/interface/GEMRecHit.h>
+#include <DataFormats/GEMRecHit/interface/GEMRecHitCollection.h>
 
-#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-///Geometry
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
+/// Geometry
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
-#include "Geometry/GEMGeometry/interface/GEMGeometry.h"
+#include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/GEMGeometry/interface/GEMEtaPartition.h"
 #include "Geometry/GEMGeometry/interface/GEMEtaPartitionSpecs.h"
-#include "Geometry/CommonTopologies/interface/StripTopology.h"
+#include "Geometry/GEMGeometry/interface/GEMGeometry.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 
-///Log messages
+/// Log messages
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include "Validation/MuonGEMRecHits/plugins/MuonGEMRecHitsHarvestor.h"
 #include "Validation/MuonGEMHits/interface/GEMDetLabel.h"
+#include "Validation/MuonGEMRecHits/plugins/MuonGEMRecHitsHarvestor.h"
 
-
-MuonGEMRecHitsHarvestor::MuonGEMRecHitsHarvestor(const edm::ParameterSet& ps)
-{
+MuonGEMRecHitsHarvestor::MuonGEMRecHitsHarvestor(const edm::ParameterSet &ps) {
   dbe_path_ = std::string("MuonGEMRecHitsV/GEMRecHitsTask/");
   outputFile_ = ps.getUntrackedParameter<std::string>("outputFile", "myfile.root");
 }
 
-
-MuonGEMRecHitsHarvestor::~MuonGEMRecHitsHarvestor()
-{
-}
-TProfile* MuonGEMRecHitsHarvestor::ComputeEff(TH1F* num, TH1F* denum )
-{
-  std::string name  = "eff_"+std::string(num->GetName());
-  std::string title = "Eff. "+std::string(num->GetTitle());
-  TProfile * efficHist = new TProfile(name.c_str(), title.c_str(),denum->GetXaxis()->GetNbins(), denum->GetXaxis()->GetXmin(),denum->GetXaxis()->GetXmax());
-
-  for (int i=1; i <= denum->GetNbinsX(); i++) {
-
+MuonGEMRecHitsHarvestor::~MuonGEMRecHitsHarvestor() {}
+TProfile *MuonGEMRecHitsHarvestor::ComputeEff(TH1F *num, TH1F *denum) {
+  std::string name = "eff_" + std::string(num->GetName());
+  std::string title = "Eff. " + std::string(num->GetTitle());
+  TProfile *efficHist = new TProfile(name.c_str(),
+                                     title.c_str(),
+                                     denum->GetXaxis()->GetNbins(),
+                                     denum->GetXaxis()->GetXmin(),
+                                     denum->GetXaxis()->GetXmax());
+
+  for (int i = 1; i <= denum->GetNbinsX(); i++) {
     double nNum = num->GetBinContent(i);
     double nDenum = denum->GetBinContent(i);
-    if ( nDenum == 0 || nNum ==0  ) {
+    if (nDenum == 0 || nNum == 0) {
       continue;
     }
-    if ( nNum > nDenum ) {
+    if (nNum > nDenum) {
       double temp = nDenum;
       nDenum = nNum;
       nNum = temp;
-      std::cout<<"Alert! specific bin's num is bigger than denum"<<std::endl;
+      std::cout << "Alert! specific bin's num is bigger than denum" << std::endl;
     }
-    const double effVal = nNum/nDenum;
+    const double effVal = nNum / nDenum;
     efficHist->SetBinContent(i, effVal);
-    efficHist->SetBinEntries(i,1);
-    efficHist->SetBinError(i,0);
-    const double errLo = TEfficiency::ClopperPearson((int)nDenum,(int)nNum,0.683,false);
-    const double errUp = TEfficiency::ClopperPearson((int)nDenum,(int)nNum,0.683,true);
+    efficHist->SetBinEntries(i, 1);
+    efficHist->SetBinError(i, 0);
+    const double errLo = TEfficiency::ClopperPearson((int)nDenum, (int)nNum, 0.683, false);
+    const double errUp = TEfficiency::ClopperPearson((int)nDenum, (int)nNum, 0.683, true);
     const double errVal = (effVal - errLo > errUp - effVal) ? effVal - errLo : errUp - effVal;
     efficHist->SetBinError(i, sqrt(effVal * effVal + errVal * errVal));
   }
   return efficHist;
 }
 
-void MuonGEMRecHitsHarvestor::ProcessBooking( DQMStore::IBooker& ibooker, DQMStore::IGetter& ig, const char* label, TString suffix, TH1F* track_hist, TH1F* sh_hist )
-{
-  TString dbe_label = TString(dbe_path_)+label+suffix;
-  if( ig.get(dbe_label.Data()) != nullptr && sh_hist !=nullptr && track_hist !=nullptr ) {
-    TH1F* hist =    (TH1F*)ig.get( dbe_label.Data() )->getTH1F()->Clone();
-    TProfile* profile = ComputeEff( hist, track_hist);
-    TProfile* profile_sh = ComputeEff( hist, sh_hist );
-    profile_sh->SetName( (profile->GetName()+std::string("_sh")).c_str());
+void MuonGEMRecHitsHarvestor::ProcessBooking(DQMStore::IBooker &ibooker,
+                                             DQMStore::IGetter &ig,
+                                             const char *label,
+                                             TString suffix,
+                                             TH1F *track_hist,
+                                             TH1F *sh_hist) {
+  TString dbe_label = TString(dbe_path_) + label + suffix;
+  if (ig.get(dbe_label.Data()) != nullptr && sh_hist != nullptr && track_hist != nullptr) {
+    TH1F *hist = (TH1F *)ig.get(dbe_label.Data())->getTH1F()->Clone();
+    TProfile *profile = ComputeEff(hist, track_hist);
+    TProfile *profile_sh = ComputeEff(hist, sh_hist);
+    profile_sh->SetName((profile->GetName() + std::string("_sh")).c_str());
     TString x_axis_title = TString(hist->GetXaxis()->GetTitle());
-    TString title  = TString::Format("Eff. for a SimTrack to have an associated GEM RecHits in %s;%s;Eff.",suffix.Data(),x_axis_title.Data());
-    TString title2 = TString::Format("Eff. for a SimTrack to have an associated GEM RecHits in %s with a matched SimHit;%s;Eff.",suffix.Data(),x_axis_title.Data() );
-    profile->SetTitle( title.Data());
-    profile_sh->SetTitle( title2.Data() );
-    ibooker.bookProfile( profile->GetName(),profile); 
-    ibooker.bookProfile( profile_sh->GetName(),profile_sh); 
-  }
-  else {
-    std::cout<<"Can not found histogram of "<<dbe_label<<std::endl; 
-    if ( track_hist == nullptr) std::cout<<"track not found"<<std::endl;
-    if ( sh_hist    == nullptr) std::cout<<"sh_hist not found"<<std::endl;
+    TString title = TString::Format(
+        "Eff. for a SimTrack to have an associated GEM RecHits in %s;%s;Eff.", suffix.Data(), x_axis_title.Data());
+    TString title2 = TString::Format(
+        "Eff. for a SimTrack to have an associated GEM RecHits "
+        "in %s with a matched SimHit;%s;Eff.",
+        suffix.Data(),
+        x_axis_title.Data());
+    profile->SetTitle(title.Data());
+    profile_sh->SetTitle(title2.Data());
+    ibooker.bookProfile(profile->GetName(), profile);
+    ibooker.bookProfile(profile_sh->GetName(), profile_sh);
+  } else {
+    std::cout << "Can not found histogram of " << dbe_label << std::endl;
+    if (track_hist == nullptr)
+      std::cout << "track not found" << std::endl;
+    if (sh_hist == nullptr)
+      std::cout << "sh_hist not found" << std::endl;
   }
   return;
 }
 
-
-void 
-MuonGEMRecHitsHarvestor::dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::IGetter& ig)
-{
+void MuonGEMRecHitsHarvestor::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &ig) {
   ig.setCurrentFolder(dbe_path_);
 
   using namespace GEMDetLabel;
- 
-  TH1F* gem_trk_eta[s_suffix.size()];
-  TH1F* gem_trk_phi[s_suffix.size()][c_suffix.size()];  
-
-  TH1F* sh_eta[s_suffix.size()][l_suffix.size()];
-  TH1F* sh_phi[s_suffix.size()][l_suffix.size()][c_suffix.size()];
-  
-  for( unsigned int i = 0 ; i < s_suffix.size() ; i++) {
-    TString eta_label = TString(dbe_path_)+"track_eta"+s_suffix[i];
+
+  TH1F *gem_trk_eta[s_suffix.size()];
+  TH1F *gem_trk_phi[s_suffix.size()][c_suffix.size()];
+
+  TH1F *sh_eta[s_suffix.size()][l_suffix.size()];
+  TH1F *sh_phi[s_suffix.size()][l_suffix.size()][c_suffix.size()];
+
+  for (unsigned int i = 0; i < s_suffix.size(); i++) {
+    TString eta_label = TString(dbe_path_) + "track_eta" + s_suffix[i];
     TString phi_label;
-    if ( ig.get(eta_label.Data()) != nullptr ) {
-      gem_trk_eta[i] = (TH1F*)ig.get(eta_label.Data())->getTH1F()->Clone();
+    if (ig.get(eta_label.Data()) != nullptr) {
+      gem_trk_eta[i] = (TH1F *)ig.get(eta_label.Data())->getTH1F()->Clone();
       gem_trk_eta[i]->Sumw2();
-    }
-    else std::cout<<"Can not found track_eta"<<std::endl;
-    for ( unsigned int k=0 ; k < c_suffix.size() ; k++) {
-      phi_label = TString(dbe_path_.c_str())+"track_phi"+s_suffix[i]+c_suffix[k];
-      if ( ig.get(phi_label.Data()) !=nullptr ) {
-        gem_trk_phi[i][k] = (TH1F*)ig.get(phi_label.Data())->getTH1F()->Clone();
+    } else
+      std::cout << "Can not found track_eta" << std::endl;
+    for (unsigned int k = 0; k < c_suffix.size(); k++) {
+      phi_label = TString(dbe_path_.c_str()) + "track_phi" + s_suffix[i] + c_suffix[k];
+      if (ig.get(phi_label.Data()) != nullptr) {
+        gem_trk_phi[i][k] = (TH1F *)ig.get(phi_label.Data())->getTH1F()->Clone();
         gem_trk_phi[i][k]->Sumw2();
-      }
-      else std::cout<<"Can not found track_phi"<<std::endl;
+      } else
+        std::cout << "Can not found track_phi" << std::endl;
     }
-    
-    if ( ig.get(eta_label.Data()) != nullptr && ig.get(phi_label.Data()) !=nullptr ) {
-      for( unsigned int j = 0; j < l_suffix.size() ; j++) { 
-        TString suffix = TString( s_suffix[i] )+TString( l_suffix[j]);
-        TString eta_label = TString(dbe_path_)+"rh_sh_eta"+suffix;
-        if( ig.get(eta_label.Data()) !=nullptr ) {
-          sh_eta[i][j] = (TH1F*)ig.get(eta_label.Data())->getTH1F()->Clone();
+
+    if (ig.get(eta_label.Data()) != nullptr && ig.get(phi_label.Data()) != nullptr) {
+      for (unsigned int j = 0; j < l_suffix.size(); j++) {
+        TString suffix = TString(s_suffix[i]) + TString(l_suffix[j]);
+        TString eta_label = TString(dbe_path_) + "rh_sh_eta" + suffix;
+        if (ig.get(eta_label.Data()) != nullptr) {
+          sh_eta[i][j] = (TH1F *)ig.get(eta_label.Data())->getTH1F()->Clone();
           sh_eta[i][j]->Sumw2();
-        }
-        else std::cout<<"Can not found eta histogram : "<<eta_label<<std::endl;
-        ProcessBooking( ibooker, ig, "rh_eta", suffix, gem_trk_eta[i], sh_eta[i][j]); 
-        for ( unsigned int k= 0 ; k < c_suffix.size() ; k++) {
-          suffix = TString( s_suffix[i])+TString( l_suffix[j]) +TString(c_suffix[k]);
-          TString phi_label = TString(dbe_path_)+"rh_sh_phi"+suffix;
-          if( ig.get(phi_label.Data()) !=nullptr ) {
-           sh_phi[i][j][k] = (TH1F*)ig.get(phi_label.Data())->getTH1F()->Clone();
-           sh_phi[i][j][k]->Sumw2();
+        } else
+          std::cout << "Can not found eta histogram : " << eta_label << std::endl;
+        ProcessBooking(ibooker, ig, "rh_eta", suffix, gem_trk_eta[i], sh_eta[i][j]);
+        for (unsigned int k = 0; k < c_suffix.size(); k++) {
+          suffix = TString(s_suffix[i]) + TString(l_suffix[j]) + TString(c_suffix[k]);
+          TString phi_label = TString(dbe_path_) + "rh_sh_phi" + suffix;
+          if (ig.get(phi_label.Data()) != nullptr) {
+            sh_phi[i][j][k] = (TH1F *)ig.get(phi_label.Data())->getTH1F()->Clone();
+            sh_phi[i][j][k]->Sumw2();
+          } else {
+            std::cout << "Can not found phi plots : " << phi_label << std::endl;
+            continue;
           }
-          else { std::cout<<"Can not found phi plots : "<<phi_label<<std::endl; continue; }
-          ProcessBooking( ibooker, ig, "rh_phi",suffix, gem_trk_phi[i][k], sh_phi[i][j][k]);
+          ProcessBooking(ibooker, ig, "rh_phi", suffix, gem_trk_phi[i][k], sh_phi[i][j][k]);
         }
       }
-    }
-    else std::cout<<"Can not find eta or phi of all track"<<std::endl;
+    } else
+      std::cout << "Can not find eta or phi of all track" << std::endl;
   }
 }
 
-
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(MuonGEMRecHitsHarvestor);
diff --git a/Validation/MuonGEMRecHits/plugins/MuonGEMRecHitsHarvestor.h b/Validation/MuonGEMRecHits/plugins/MuonGEMRecHitsHarvestor.h
index 1baa1e224b281..ef9847686dcd6 100644
--- a/Validation/MuonGEMRecHits/plugins/MuonGEMRecHitsHarvestor.h
+++ b/Validation/MuonGEMRecHits/plugins/MuonGEMRecHitsHarvestor.h
@@ -1,33 +1,33 @@
 #ifndef MuonGEMDigisHarvestor_H
 #define MuonGEMDigisHarvestor_H
 
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
-#include "SimMuon/MCTruth/interface/PSimHitMap.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "Geometry/GEMGeometry/interface/GEMGeometry.h"
+#include "SimMuon/MCTruth/interface/PSimHitMap.h"
 
 #include "Validation/MuonGEMRecHits/interface/GEMRecHitsValidation.h"
 #include <TEfficiency.h>
 #include <TGraphAsymmErrors.h>
 #include <TProfile.h>
 
-class MuonGEMRecHitsHarvestor : public DQMEDHarvester
-{
+class MuonGEMRecHitsHarvestor : public DQMEDHarvester {
 public:
   /// constructor
-  explicit MuonGEMRecHitsHarvestor(const edm::ParameterSet&);
+  explicit MuonGEMRecHitsHarvestor(const edm::ParameterSet &);
   /// destructor
   ~MuonGEMRecHitsHarvestor() override;
 
   void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
-  void ProcessBooking( DQMStore::IBooker& , DQMStore::IGetter&, const char* label, TString suffix, TH1F* track_hist, TH1F* sh_hist );
-  TProfile* ComputeEff(TH1F* num, TH1F* denum );
+  void ProcessBooking(
+      DQMStore::IBooker &, DQMStore::IGetter &, const char *label, TString suffix, TH1F *track_hist, TH1F *sh_hist);
+  TProfile *ComputeEff(TH1F *num, TH1F *denum);
 
 private:
-  std::string dbe_path_,outputFile_;
+  std::string dbe_path_, outputFile_;
 };
 #endif
diff --git a/Validation/MuonGEMRecHits/plugins/MuonGEMRecHitsValidator.cc b/Validation/MuonGEMRecHits/plugins/MuonGEMRecHitsValidator.cc
index 9a89b72492d3f..374a6141aa7e2 100644
--- a/Validation/MuonGEMRecHits/plugins/MuonGEMRecHitsValidator.cc
+++ b/Validation/MuonGEMRecHits/plugins/MuonGEMRecHitsValidator.cc
@@ -1,6 +1,6 @@
-#include "Validation/MuonGEMRecHits/interface/GEMRecHitsValidation.h"
-#include "Validation/MuonGEMRecHits/interface/GEMRecHitTrackMatch.h"
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-DEFINE_FWK_MODULE (GEMRecHitsValidation) ;
-DEFINE_FWK_MODULE (GEMRecHitTrackMatch) ;
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "Validation/MuonGEMRecHits/interface/GEMRecHitTrackMatch.h"
+#include "Validation/MuonGEMRecHits/interface/GEMRecHitsValidation.h"
+DEFINE_FWK_MODULE(GEMRecHitsValidation);
+DEFINE_FWK_MODULE(GEMRecHitTrackMatch);
diff --git a/Validation/MuonGEMRecHits/src/GEMRecHitMatcher.cc b/Validation/MuonGEMRecHits/src/GEMRecHitMatcher.cc
index 481e49aa573c7..84a17c493d5fd 100644
--- a/Validation/MuonGEMRecHits/src/GEMRecHitMatcher.cc
+++ b/Validation/MuonGEMRecHits/src/GEMRecHitMatcher.cc
@@ -1,24 +1,26 @@
-#include "Validation/MuonGEMRecHits/interface/GEMRecHitMatcher.h"
-#include "Validation/MuonGEMHits/interface/SimHitMatcher.h"
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
 #include "Geometry/GEMGeometry/interface/GEMGeometry.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
+#include "Validation/MuonGEMHits/interface/SimHitMatcher.h"
+#include "Validation/MuonGEMRecHits/interface/GEMRecHitMatcher.h"
 
 #include "DataFormats/MuonDetId/interface/GEMDetId.h"
 
 using namespace std;
 using namespace matching;
 
-GEMRecHitMatcher::GEMRecHitMatcher(const SimHitMatcher& sh, const edm::Event& e, const GEMGeometry& geom, 
-                                   const edm::ParameterSet& cfg,edm::EDGetToken& gem_recHitToken)
-                                   :simhit_matcher_(sh),gem_geo_(geom)
-{
+GEMRecHitMatcher::GEMRecHitMatcher(const SimHitMatcher &sh,
+                                   const edm::Event &e,
+                                   const GEMGeometry &geom,
+                                   const edm::ParameterSet &cfg,
+                                   edm::EDGetToken &gem_recHitToken)
+    : simhit_matcher_(sh), gem_geo_(geom) {
   minBXGEM_ = cfg.getUntrackedParameter<int>("minBXGEM", -1);
   maxBXGEM_ = cfg.getUntrackedParameter<int>("maxBXGEM", 1);
 
   matchDeltaStrip_ = cfg.getUntrackedParameter<int>("matchDeltaStripGEM", 1);
 
-  //setVerbose(cfg.getUntrackedParameter<int>("verboseGEMDigi", 0));
-  verbose_=false;
+  // setVerbose(cfg.getUntrackedParameter<int>("verboseGEMDigi", 0));
+  verbose_ = false;
 
   e.getByToken(gem_recHitToken, gem_rechits_);
 
@@ -27,116 +29,94 @@ GEMRecHitMatcher::GEMRecHitMatcher(const SimHitMatcher& sh, const edm::Event& e,
 
 GEMRecHitMatcher::~GEMRecHitMatcher() {}
 
+void GEMRecHitMatcher::init(const edm::Event &e) { matchRecHitsToSimTrack(*gem_rechits_.product()); }
 
-void
-GEMRecHitMatcher::init(const edm::Event& e)
-{
-  matchRecHitsToSimTrack(*gem_rechits_.product());
-}
-
-
-void
-GEMRecHitMatcher::matchRecHitsToSimTrack(const GEMRecHitCollection& rechits)
-{
-  
+void GEMRecHitMatcher::matchRecHitsToSimTrack(const GEMRecHitCollection &rechits) {
   auto det_ids = simhit_matcher_.detIdsGEM();
-  for (auto id: det_ids)
-  {
+  for (auto id : det_ids) {
     GEMDetId p_id(id);
     GEMDetId superch_id(p_id.region(), p_id.ring(), p_id.station(), 1, p_id.chamber(), 0);
 
     auto hit_strips = simhit_matcher_.hitStripsInDetId(id, matchDeltaStrip_);
-    if (verbose())
-    {
-      cout<<"hit_strips_fat ";
+    if (verbose()) {
+      cout << "hit_strips_fat ";
       copy(hit_strips.begin(), hit_strips.end(), ostream_iterator<int>(cout, " "));
-      cout<<endl;
+      cout << endl;
     }
 
     auto rechits_in_det = rechits.get(GEMDetId(id));
 
-    for (auto d = rechits_in_det.first; d != rechits_in_det.second; ++d)
-    {
-      if (verbose()) cout<<"recHit "<<p_id<<" "<<*d<<endl;
+    for (auto d = rechits_in_det.first; d != rechits_in_det.second; ++d) {
+      if (verbose())
+        cout << "recHit " << p_id << " " << *d << endl;
       // check that the rechit is within BX range
-      if (d->BunchX() < minBXGEM_ || d->BunchX() > maxBXGEM_) continue;
+      if (d->BunchX() < minBXGEM_ || d->BunchX() > maxBXGEM_)
+        continue;
       // check that it matches a strip that was hit by SimHits from our track
 
       int firstStrip = d->firstClusterStrip();
       int cls = d->clusterSize();
       bool stripFound = false;
 
-      for(int i = firstStrip; i < (firstStrip + cls); i++){
-
-	if (hit_strips.find(i) != hit_strips.end()) stripFound = true;
-        //std::cout<<i<<" "<<firstStrip<<" "<<cls<<" "<<stripFound<<std::endl;
-	
+      for (int i = firstStrip; i < (firstStrip + cls); i++) {
+        if (hit_strips.find(i) != hit_strips.end())
+          stripFound = true;
+        // std::cout<<i<<" "<<firstStrip<<" "<<cls<<" "<<stripFound<<std::endl;
       }
 
-      if (!stripFound) continue;
-      if (verbose()) cout<<"oki"<<endl;
+      if (!stripFound)
+        continue;
+      if (verbose())
+        cout << "oki" << endl;
 
       auto myrechit = make_digi(id, d->firstClusterStrip(), d->BunchX(), GEM_STRIP, d->clusterSize());
       detid_to_recHits_[id].push_back(myrechit);
-      chamber_to_recHits_[ p_id.chamberId().rawId() ].push_back(myrechit);
-      superchamber_to_recHits_[ superch_id() ].push_back(myrechit);
-
+      chamber_to_recHits_[p_id.chamberId().rawId()].push_back(myrechit);
+      superchamber_to_recHits_[superch_id()].push_back(myrechit);
     }
   }
-  
 }
 
-
-std::set<unsigned int>
-GEMRecHitMatcher::detIds() const
-{
+std::set<unsigned int> GEMRecHitMatcher::detIds() const {
   std::set<unsigned int> result;
-  for (auto& p: detid_to_recHits_) result.insert(p.first);
+  for (auto &p : detid_to_recHits_)
+    result.insert(p.first);
   return result;
 }
 
-
-std::set<unsigned int>
-GEMRecHitMatcher::chamberIds() const
-{
+std::set<unsigned int> GEMRecHitMatcher::chamberIds() const {
   std::set<unsigned int> result;
-  for (auto& p: chamber_to_recHits_) result.insert(p.first);
+  for (auto &p : chamber_to_recHits_)
+    result.insert(p.first);
   return result;
 }
 
-std::set<unsigned int>
-GEMRecHitMatcher::superChamberIds() const
-{
+std::set<unsigned int> GEMRecHitMatcher::superChamberIds() const {
   std::set<unsigned int> result;
-  for (auto& p: superchamber_to_recHits_) result.insert(p.first);
+  for (auto &p : superchamber_to_recHits_)
+    result.insert(p.first);
   return result;
 }
 
-
-const GEMRecHitMatcher::RecHitContainer&
-GEMRecHitMatcher::recHitsInDetId(unsigned int detid) const
-{
-  if (detid_to_recHits_.find(detid) == detid_to_recHits_.end()) return no_recHits_;
+const GEMRecHitMatcher::RecHitContainer &GEMRecHitMatcher::recHitsInDetId(unsigned int detid) const {
+  if (detid_to_recHits_.find(detid) == detid_to_recHits_.end())
+    return no_recHits_;
   return detid_to_recHits_.at(detid);
 }
 
-const GEMRecHitMatcher::RecHitContainer&
-GEMRecHitMatcher::recHitsInChamber(unsigned int detid) const
-{
-  if (chamber_to_recHits_.find(detid) == chamber_to_recHits_.end()) return no_recHits_;
+const GEMRecHitMatcher::RecHitContainer &GEMRecHitMatcher::recHitsInChamber(unsigned int detid) const {
+  if (chamber_to_recHits_.find(detid) == chamber_to_recHits_.end())
+    return no_recHits_;
   return chamber_to_recHits_.at(detid);
 }
 
-const GEMRecHitMatcher::RecHitContainer&
-GEMRecHitMatcher::recHitsInSuperChamber(unsigned int detid) const
-{
-  if (superchamber_to_recHits_.find(detid) == superchamber_to_recHits_.end()) return no_recHits_;
+const GEMRecHitMatcher::RecHitContainer &GEMRecHitMatcher::recHitsInSuperChamber(unsigned int detid) const {
+  if (superchamber_to_recHits_.find(detid) == superchamber_to_recHits_.end())
+    return no_recHits_;
   return superchamber_to_recHits_.at(detid);
 }
 
-int
-GEMRecHitMatcher::nLayersWithRecHitsInSuperChamber(unsigned int detid) const
-{
+int GEMRecHitMatcher::nLayersWithRecHitsInSuperChamber(unsigned int detid) const {
   set<int> layers;
   /*
   auto recHits = recHitsInSuperChamber(detid);
@@ -149,10 +129,7 @@ GEMRecHitMatcher::nLayersWithRecHitsInSuperChamber(unsigned int detid) const
   return layers.size();
 }
 
-
-std::set<int>
-GEMRecHitMatcher::stripNumbersInDetId(unsigned int detid) const
-{
+std::set<int> GEMRecHitMatcher::stripNumbersInDetId(unsigned int detid) const {
   set<int> result;
   /*
   auto recHits = recHitsInDetId(detid);
@@ -164,30 +141,24 @@ GEMRecHitMatcher::stripNumbersInDetId(unsigned int detid) const
   return result;
 }
 
-std::set<int>
-GEMRecHitMatcher::partitionNumbers() const
-{
+std::set<int> GEMRecHitMatcher::partitionNumbers() const {
   std::set<int> result;
 
   auto detids = detIds();
-  for (auto id: detids)
-  {
+  for (auto id : detids) {
     GEMDetId idd(id);
-    result.insert( idd.roll() );
+    result.insert(idd.roll());
   }
   return result;
 }
 
-GlobalPoint
-GEMRecHitMatcher::recHitPosition(const RecHit& rechit) const
-{
+GlobalPoint GEMRecHitMatcher::recHitPosition(const RecHit &rechit) const {
   unsigned int id = digi_id(rechit);
   int strip = digi_channel(rechit);
   DigiType t = digi_type(rechit);
 
   GlobalPoint gp;
-  if ( t == GEM_STRIP )
-  {
+  if (t == GEM_STRIP) {
     GEMDetId idd(id);
     LocalPoint lp = gem_geo_.etaPartition(idd)->centreOfStrip(strip);
     gp = gem_geo_.idToDet(id)->surface().toGlobal(lp);
@@ -196,27 +167,25 @@ GEMRecHitMatcher::recHitPosition(const RecHit& rechit) const
   return gp;
 }
 
-
-GlobalPoint
-GEMRecHitMatcher::recHitMeanPosition(const RecHitContainer& rechit) const
-{
+GlobalPoint GEMRecHitMatcher::recHitMeanPosition(const RecHitContainer &rechit) const {
   GlobalPoint point_zero;
-  if (rechit.empty()) return point_zero; // point "zero"
+  if (rechit.empty())
+    return point_zero;  // point "zero"
 
   float sumx, sumy, sumz;
   sumx = sumy = sumz = 0.f;
   size_t n = 0;
-  for (auto& d: rechit)
-  {
+  for (auto &d : rechit) {
     GlobalPoint gp = recHitPosition(d);
-    if (gp == point_zero) continue;
+    if (gp == point_zero)
+      continue;
 
     sumx += gp.x();
     sumy += gp.y();
     sumz += gp.z();
     ++n;
   }
-  if (n == 0) return GlobalPoint();
-  return GlobalPoint(sumx/n, sumy/n, sumz/n);
+  if (n == 0)
+    return GlobalPoint();
+  return GlobalPoint(sumx / n, sumy / n, sumz / n);
 }
-
diff --git a/Validation/MuonGEMRecHits/src/GEMRecHitTrackMatch.cc b/Validation/MuonGEMRecHits/src/GEMRecHitTrackMatch.cc
index e983c88064ae0..4f89892b894da 100644
--- a/Validation/MuonGEMRecHits/src/GEMRecHitTrackMatch.cc
+++ b/Validation/MuonGEMRecHits/src/GEMRecHitTrackMatch.cc
@@ -1,21 +1,20 @@
-#include "Validation/MuonGEMRecHits/interface/GEMRecHitTrackMatch.h"
-#include "Validation/MuonGEMHits/interface/GEMDetLabel.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DataFormats/GEMDigi/interface/GEMDigiCollection.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "Validation/MuonGEMHits/interface/GEMDetLabel.h"
+#include "Validation/MuonGEMRecHits/interface/GEMRecHitTrackMatch.h"
 #include <DataFormats/GEMRecHit/interface/GEMRecHit.h>
 #include <DataFormats/GEMRecHit/interface/GEMRecHitCollection.h>
-#include "DQMServices/Core/interface/DQMStore.h"
-#include <TMath.h>
 #include <TH1F.h>
+#include <TMath.h>
 
 using namespace std;
-GEMRecHitTrackMatch::GEMRecHitTrackMatch(const edm::ParameterSet& ps) : GEMTrackMatch(ps)
-{
+GEMRecHitTrackMatch::GEMRecHitTrackMatch(const edm::ParameterSet &ps) : GEMTrackMatch(ps) {
   std::string simInputLabel_ = ps.getUntrackedParameter<std::string>("simInputLabel");
-  simHitsToken_ = consumes<edm::PSimHitContainer>(edm::InputTag(simInputLabel_,"MuonGEMHits"));
-  simTracksToken_ = consumes< edm::SimTrackContainer >(ps.getParameter<edm::InputTag>("simTrackCollection"));
-  simVerticesToken_ = consumes< edm::SimVertexContainer >(ps.getParameter<edm::InputTag>("simVertexCollection"));
+  simHitsToken_ = consumes<edm::PSimHitContainer>(edm::InputTag(simInputLabel_, "MuonGEMHits"));
+  simTracksToken_ = consumes<edm::SimTrackContainer>(ps.getParameter<edm::InputTag>("simTrackCollection"));
+  simVerticesToken_ = consumes<edm::SimVertexContainer>(ps.getParameter<edm::InputTag>("simVertexCollection"));
 
   gem_recHitToken_ = consumes<GEMRecHitCollection>(ps.getParameter<edm::InputTag>("gemRecHitInput"));
 
@@ -23,159 +22,160 @@ GEMRecHitTrackMatch::GEMRecHitTrackMatch(const edm::ParameterSet& ps) : GEMTrack
   cfg_ = ps;
 }
 
-void GEMRecHitTrackMatch::bookHistograms(DQMStore::IBooker& ibooker, edm::Run const& run, edm::EventSetup const & iSetup){
-  edm::LogInfo("GEMRecHitTrackMatch")<<"GEM RecHitTrackMatch :: bookHistograms"<<std::endl;
+void GEMRecHitTrackMatch::bookHistograms(DQMStore::IBooker &ibooker,
+                                         edm::Run const &run,
+                                         edm::EventSetup const &iSetup) {
+  edm::LogInfo("GEMRecHitTrackMatch") << "GEM RecHitTrackMatch :: bookHistograms" << std::endl;
   edm::ESHandle<GEMGeometry> hGeom;
   iSetup.get<MuonGeometryRecord>().get(hGeom);
-  const GEMGeometry& geom = *hGeom;
-  edm::LogInfo("GEMRecHitTrackMatch")<<"GEM RecHitTrackMatch :: about to set the geometry"<<std::endl;
+  const GEMGeometry &geom = *hGeom;
+  edm::LogInfo("GEMRecHitTrackMatch") << "GEM RecHitTrackMatch :: about to set the geometry" << std::endl;
   setGeometry(geom);
-  edm::LogInfo("GEMRecHitTrackMatch")<<"GEM RecHitTrackMatch :: successfully set the geometry"<<std::endl;
-  edm::LogInfo("GEMRecHitTrackMatch")<<"GEM RecHitTrackMatch :: geom = "<<&geom<<std::endl;
-    
-  ibooker.setCurrentFolder("MuonGEMRecHitsV/GEMRecHitsTask");
-  edm::LogInfo("GEMRecHitTrackMatch")<<"ibooker set current folder\n";
-    
-  const float PI=TMath::Pi();
-
-  using namespace GEMDetLabel;
+  edm::LogInfo("GEMRecHitTrackMatch") << "GEM RecHitTrackMatch :: successfully set the geometry" << std::endl;
+  edm::LogInfo("GEMRecHitTrackMatch") << "GEM RecHitTrackMatch :: geom = " << &geom << std::endl;
 
-  nstation = geom.regions()[0]->stations().size(); 
-  for( unsigned int j=0 ; j<nstation ; j++) {
-      string track_eta_name  = string("track_eta")+s_suffix.at(j);
-      string track_eta_title = string("track_eta")+";SimTrack |#eta|;# of tracks";
-      track_eta[j] = ibooker.book1D(track_eta_name.c_str(), track_eta_title.c_str(),140,minEta_,maxEta_);
-
-      for ( unsigned int k = 0 ; k < c_suffix.size() ; k++) {
-          string suffix = string(s_suffix[j])+ string(c_suffix[k]);
-          string track_phi_name  = string("track_phi")+suffix;
-          string track_phi_title = string("track_phi")+suffix+";SimTrack #phi;# of tracks";
-          track_phi[j][k] = ibooker.book1D(track_phi_name.c_str(), track_phi_title.c_str(),200,-PI,PI);
-      }
-
-
-      for( unsigned int i=0 ; i < l_suffix.size(); i++) {
-         string suffix = string(s_suffix[j])+string(l_suffix[i]);
-         string rh_eta_name = string("rh_eta")+suffix;
-         string rh_eta_title = rh_eta_name+"; tracks |#eta|; # of tracks";
-         rh_eta[i][j] = ibooker.book1D( rh_eta_name.c_str(), rh_eta_title.c_str(), 140, minEta_, maxEta_) ;
+  ibooker.setCurrentFolder("MuonGEMRecHitsV/GEMRecHitsTask");
+  edm::LogInfo("GEMRecHitTrackMatch") << "ibooker set current folder\n";
 
-         string rh_sh_eta_name = string("rh_sh_eta")+suffix;
-         string rh_sh_eta_title = rh_sh_eta_name+"; tracks |#eta|; # of tracks";
-         rh_sh_eta[i][j] = ibooker.book1D( rh_sh_eta_name.c_str(), rh_sh_eta_title.c_str(), 140, minEta_, maxEta_) ;
+  const float PI = TMath::Pi();
 
-         for ( unsigned int k = 0 ; k < c_suffix.size() ; k++) {
-          suffix = string(s_suffix[j])+string(l_suffix[i])+ string(c_suffix[k]);
-          string rh_phi_name = string("rh_phi")+suffix;
-          string rh_phi_title = rh_phi_name+"; tracks #phi; # of tracks";
-          rh_phi[i][j][k] = ibooker.book1D( (rh_phi_name).c_str(), rh_phi_title.c_str(), 200, -PI,PI) ;
+  using namespace GEMDetLabel;
 
-          string rh_sh_phi_name = string("rh_sh_phi")+suffix;
-          string rh_sh_phi_title = rh_sh_phi_name+"; tracks #phi; # of tracks";
-          rh_sh_phi[i][j][k] = ibooker.book1D( (rh_sh_phi_name).c_str(), rh_sh_phi_title.c_str(), 200,-PI,PI) ;
+  nstation = geom.regions()[0]->stations().size();
+  for (unsigned int j = 0; j < nstation; j++) {
+    string track_eta_name = string("track_eta") + s_suffix.at(j);
+    string track_eta_title = string("track_eta") + ";SimTrack |#eta|;# of tracks";
+    track_eta[j] = ibooker.book1D(track_eta_name.c_str(), track_eta_title.c_str(), 140, minEta_, maxEta_);
+
+    for (unsigned int k = 0; k < c_suffix.size(); k++) {
+      string suffix = string(s_suffix[j]) + string(c_suffix[k]);
+      string track_phi_name = string("track_phi") + suffix;
+      string track_phi_title = string("track_phi") + suffix + ";SimTrack #phi;# of tracks";
+      track_phi[j][k] = ibooker.book1D(track_phi_name.c_str(), track_phi_title.c_str(), 200, -PI, PI);
+    }
 
-         }
+    for (unsigned int i = 0; i < l_suffix.size(); i++) {
+      string suffix = string(s_suffix[j]) + string(l_suffix[i]);
+      string rh_eta_name = string("rh_eta") + suffix;
+      string rh_eta_title = rh_eta_name + "; tracks |#eta|; # of tracks";
+      rh_eta[i][j] = ibooker.book1D(rh_eta_name.c_str(), rh_eta_title.c_str(), 140, minEta_, maxEta_);
+
+      string rh_sh_eta_name = string("rh_sh_eta") + suffix;
+      string rh_sh_eta_title = rh_sh_eta_name + "; tracks |#eta|; # of tracks";
+      rh_sh_eta[i][j] = ibooker.book1D(rh_sh_eta_name.c_str(), rh_sh_eta_title.c_str(), 140, minEta_, maxEta_);
+
+      for (unsigned int k = 0; k < c_suffix.size(); k++) {
+        suffix = string(s_suffix[j]) + string(l_suffix[i]) + string(c_suffix[k]);
+        string rh_phi_name = string("rh_phi") + suffix;
+        string rh_phi_title = rh_phi_name + "; tracks #phi; # of tracks";
+        rh_phi[i][j][k] = ibooker.book1D((rh_phi_name).c_str(), rh_phi_title.c_str(), 200, -PI, PI);
+
+        string rh_sh_phi_name = string("rh_sh_phi") + suffix;
+        string rh_sh_phi_title = rh_sh_phi_name + "; tracks #phi; # of tracks";
+        rh_sh_phi[i][j][k] = ibooker.book1D((rh_sh_phi_name).c_str(), rh_sh_phi_title.c_str(), 200, -PI, PI);
       }
-   }
+    }
+  }
 }
 
-GEMRecHitTrackMatch::~GEMRecHitTrackMatch() {  }
+GEMRecHitTrackMatch::~GEMRecHitTrackMatch() {}
 
-void GEMRecHitTrackMatch::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-  edm::LogInfo("GEMRecHitTrackMatch")<<"GEM RecHitTrackMatch :: analyze"<<std::endl;
+void GEMRecHitTrackMatch::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  edm::LogInfo("GEMRecHitTrackMatch") << "GEM RecHitTrackMatch :: analyze" << std::endl;
   edm::ESHandle<GEMGeometry> hGeom;
   iSetup.get<MuonGeometryRecord>().get(hGeom);
-  const GEMGeometry& geom = *hGeom;
+  const GEMGeometry &geom = *hGeom;
 
   edm::Handle<edm::PSimHitContainer> simhits;
   edm::Handle<edm::SimTrackContainer> sim_tracks;
-  //edm::Handle<edm::SimVertexContainer> sim_vertices;
+  // edm::Handle<edm::SimVertexContainer> sim_vertices;
   iEvent.getByToken(simHitsToken_, simhits);
   iEvent.getByToken(simTracksToken_, sim_tracks);
-  //iEvent.getByToken(simVerticesToken_, sim_vertices);
-  //if ( !simhits.isValid() || !sim_tracks.isValid() || !sim_vertices.isValid()) return;
-  if ( !simhits.isValid() || !sim_tracks.isValid() ) return;
-
-  //const edm::SimVertexContainer & sim_vert = *sim_vertices.product();
-  const edm::SimTrackContainer & sim_trks = *sim_tracks.product();
-
-  MySimTrack track_; 
-  for (auto& t: sim_trks)
-  {
-    if (!isSimTrackGood(t)) 
-    { continue; } 
-    
+  // iEvent.getByToken(simVerticesToken_, sim_vertices);
+  // if ( !simhits.isValid() || !sim_tracks.isValid() ||
+  // !sim_vertices.isValid()) return;
+  if (!simhits.isValid() || !sim_tracks.isValid())
+    return;
+
+  // const edm::SimVertexContainer & sim_vert = *sim_vertices.product();
+  const edm::SimTrackContainer &sim_trks = *sim_tracks.product();
+
+  MySimTrack track_;
+  for (auto &t : sim_trks) {
+    if (!isSimTrackGood(t)) {
+      continue;
+    }
+
     // match hits and rechits to this SimTrack
 
-    const SimHitMatcher& match_sh = SimHitMatcher( t, iEvent, geom, cfg_, simHitsToken_, simTracksToken_, simVerticesToken_);
-    const GEMRecHitMatcher& match_rh = GEMRecHitMatcher( match_sh, iEvent, geom, cfg_ ,gem_recHitToken_);
+    const SimHitMatcher &match_sh =
+        SimHitMatcher(t, iEvent, geom, cfg_, simHitsToken_, simTracksToken_, simVerticesToken_);
+    const GEMRecHitMatcher &match_rh = GEMRecHitMatcher(match_sh, iEvent, geom, cfg_, gem_recHitToken_);
 
     track_.pt = t.momentum().pt();
-    //std::cout << "SimTrack pt value :  " << track_.pt << "\n"; 
+    // std::cout << "SimTrack pt value :  " << track_.pt << "\n";
     track_.phi = t.momentum().phi();
     track_.eta = t.momentum().eta();
-    std::fill( std::begin(track_.hitOdd), std::end(track_.hitOdd),false);
-    std::fill( std::begin(track_.hitEven), std::end(track_.hitEven),false);
+    std::fill(std::begin(track_.hitOdd), std::end(track_.hitOdd), false);
+    std::fill(std::begin(track_.hitEven), std::end(track_.hitEven), false);
 
-    for ( int i= 0 ; i< 3 ; i++) {
-      for ( int j= 0 ; j<2 ; j++) {
-        track_.gem_sh[i][j]  = false;
-        track_.gem_rh[i][j]  = false;
+    for (int i = 0; i < 3; i++) {
+      for (int j = 0; j < 2; j++) {
+        track_.gem_sh[i][j] = false;
+        track_.gem_rh[i][j] = false;
       }
     }
 
     // ** GEM SimHits ** //
     const auto gem_sh_ids_ch = match_sh.chamberIdsGEM();
-    for(auto d: gem_sh_ids_ch)
-    {
+    for (auto d : gem_sh_ids_ch) {
       const GEMDetId id(d);
-      if ( id.chamber() %2 ==0 ) track_.hitEven[id.station()-1] = true;
-      else if ( id.chamber() %2 ==1 ) track_.hitOdd[id.station()-1] = true;
-      else { edm::LogInfo("GEMRecHitTrackMatch")<<"Error to get chamber id"<<std::endl; }
-
-      track_.gem_sh[ id.station()-1][ (id.layer()-1)] = true;
+      if (id.chamber() % 2 == 0)
+        track_.hitEven[id.station() - 1] = true;
+      else if (id.chamber() % 2 == 1)
+        track_.hitOdd[id.station() - 1] = true;
+      else {
+        edm::LogInfo("GEMRecHitTrackMatch") << "Error to get chamber id" << std::endl;
+      }
 
+      track_.gem_sh[id.station() - 1][(id.layer() - 1)] = true;
     }
     // ** GEM RecHits ** //
     const auto gem_rh_ids_ch = match_rh.chamberIds();
 
-    for(auto d: gem_rh_ids_ch)
-    {
+    for (auto d : gem_rh_ids_ch) {
       const GEMDetId id(d);
-      track_.gem_rh[ id.station()-1][ (id.layer()-1)] = true;
+      track_.gem_rh[id.station() - 1][(id.layer() - 1)] = true;
     }
-    
-    FillWithTrigger( track_eta, fabs(track_.eta)) ;
-    FillWithTrigger( track_phi, fabs(track_.eta), track_.phi, track_.hitOdd, track_.hitEven);
 
+    FillWithTrigger(track_eta, fabs(track_.eta));
+    FillWithTrigger(track_phi, fabs(track_.eta), track_.phi, track_.hitOdd, track_.hitEven);
+
+    FillWithTrigger(rh_sh_eta, track_.gem_sh, fabs(track_.eta));
+    FillWithTrigger(rh_eta, track_.gem_rh, fabs(track_.eta));
 
-    FillWithTrigger( rh_sh_eta, track_.gem_sh  , fabs( track_.eta) );
-    FillWithTrigger( rh_eta,    track_.gem_rh  , fabs( track_.eta) );
-  
     // Separate station.
 
-    FillWithTrigger( rh_sh_phi, track_.gem_sh  ,fabs(track_.eta), track_.phi , track_.hitOdd, track_.hitEven);
-    FillWithTrigger( rh_phi,    track_.gem_rh  ,fabs(track_.eta), track_.phi , track_.hitOdd, track_.hitEven);
-  
-   
-    /*  
+    FillWithTrigger(rh_sh_phi, track_.gem_sh, fabs(track_.eta), track_.phi, track_.hitOdd, track_.hitEven);
+    FillWithTrigger(rh_phi, track_.gem_rh, fabs(track_.eta), track_.phi, track_.hitOdd, track_.hitEven);
+
+    /*
 
     // Calculation of the localXY efficiency
     GlobalPoint gp_track(match_sh.propagatedPositionGEM());
-    
+
     float track_angle = gp_track.phi().degrees();
     if (track_angle < 0.) track_angle += 360.;
     const int track_region = (gp_track.z() > 0 ? 1 : -1);
 
     // closest chambers in phi
     const auto mypair = getClosestChambers(track_region, track_angle);
- 
+
     GEMDetId detId_first(mypair.first);
     GEMDetId detId_second(mypair.second);
- 
-    // assignment of local even and odd chambers (there is always an even and an odd chamber)
-    bool firstIsOdd = detId_first.chamber() & 1;
+
+    // assignment of local even and odd chambers (there is always an even and an
+    odd chamber) bool firstIsOdd = detId_first.chamber() & 1;
 
     GEMDetId detId_even_L1(firstIsOdd ? detId_second : detId_first);
     GEMDetId detId_odd_L1(firstIsOdd ? detId_first : detId_second);
@@ -186,7 +186,7 @@ void GEMRecHitTrackMatch::analyze(const edm::Event& iEvent, const edm::EventSetu
     LocalPoint p0(0.,0.,0.);
     GlobalPoint gp_even_partition = even_partition.toGlobal(p0);
     GlobalPoint gp_odd_partition = odd_partition.toGlobal(p0);
-    
+
     LocalPoint lp_track_even_partition = even_partition.toLocal(gp_track);
     LocalPoint lp_track_odd_partition = odd_partition.toLocal(gp_track);
 
@@ -196,13 +196,18 @@ void GEMRecHitTrackMatch::analyze(const edm::Event& iEvent, const edm::EventSetu
 
     // track chamber local y is the same as track partition local y
     // corrected for partition's local y WRT chamber
-    track_.gem_ly_even = lp_track_even_partition.y() + (gp_even_partition.perp() - radiusCenter_);
-    track_.gem_ly_odd = lp_track_odd_partition.y() + (gp_odd_partition.perp() - radiusCenter_);
-
-    GEMDetId id_ch_even_L1(detId_even_L1.region(), detId_even_L1.ring(), detId_even_L1.station(), 1, detId_even_L1.chamber(), 0);
-    GEMDetId id_ch_odd_L1(detId_odd_L1.region(), detId_odd_L1.ring(), detId_odd_L1.station(), 1, detId_odd_L1.chamber(), 0);
-    GEMDetId id_ch_even_L2(detId_even_L1.region(), detId_even_L1.ring(), detId_even_L1.station(), 2, detId_even_L1.chamber(), 0);
-    GEMDetId id_ch_odd_L2(detId_odd_L1.region(), detId_odd_L1.ring(), detId_odd_L1.station(), 2, detId_odd_L1.chamber(), 0);
+    track_.gem_ly_even = lp_track_even_partition.y() + (gp_even_partition.perp()
+    - radiusCenter_); track_.gem_ly_odd = lp_track_odd_partition.y() +
+    (gp_odd_partition.perp() - radiusCenter_);
+
+    GEMDetId id_ch_even_L1(detId_even_L1.region(), detId_even_L1.ring(),
+    detId_even_L1.station(), 1, detId_even_L1.chamber(), 0); GEMDetId
+    id_ch_odd_L1(detId_odd_L1.region(), detId_odd_L1.ring(),
+    detId_odd_L1.station(), 1, detId_odd_L1.chamber(), 0); GEMDetId
+    id_ch_even_L2(detId_even_L1.region(), detId_even_L1.ring(),
+    detId_even_L1.station(), 2, detId_even_L1.chamber(), 0); GEMDetId
+    id_ch_odd_L2(detId_odd_L1.region(), detId_odd_L1.ring(),
+    detId_odd_L1.station(), 2, detId_odd_L1.chamber(), 0);
 
     if(gem_sh_ids_ch.count(id_ch_even_L1)!=0) track_.has_gem_sh_l1 |= 2;
     if(gem_sh_ids_ch.count(id_ch_odd_L1)!=0) track_.has_gem_sh_l1 |= 1;
@@ -230,16 +235,16 @@ void GEMRecHitTrackMatch::analyze(const edm::Event& iEvent, const edm::EventSetu
     dg_lx_odd->Fill( track_.gem_lx_odd);
     dg_ly_even->Fill( track_.gem_ly_even);
     dg_ly_odd->Fill( track_.gem_ly_odd);
-    
+
     if ( track_.has_gem_dg_l1 /2 >= 1 ) {
       dg_lx_even_l1->Fill ( track_.gem_lx_even);
       dg_ly_even_l1->Fill ( track_.gem_ly_even);
     }
-    if ( track_.has_gem_dg_l1 %2 == 1 ) { 
+    if ( track_.has_gem_dg_l1 %2 == 1 ) {
       dg_lx_odd_l1->Fill ( track_.gem_lx_odd);
       dg_ly_odd_l1->Fill ( track_.gem_ly_odd);
     }
-    if ( track_.has_gem_dg_l2 /2  >=1 ) { 
+    if ( track_.has_gem_dg_l2 /2  >=1 ) {
       dg_lx_even_l2->Fill ( track_.gem_lx_even);
       dg_ly_even_l2->Fill ( track_.gem_ly_even);
     }
@@ -264,6 +269,5 @@ void GEMRecHitTrackMatch::analyze(const edm::Event& iEvent, const edm::EventSetu
       dg_ly_odd_l1and2->Fill ( track_.gem_ly_odd);
     }
 */
-
   }
 }
diff --git a/Validation/MuonGEMRecHits/src/GEMRecHitsValidation.cc b/Validation/MuonGEMRecHits/src/GEMRecHitsValidation.cc
index dc94fe0213be6..bf6c64205bfa1 100644
--- a/Validation/MuonGEMRecHits/src/GEMRecHitsValidation.cc
+++ b/Validation/MuonGEMRecHits/src/GEMRecHitsValidation.cc
@@ -1,227 +1,247 @@
-#include "Validation/MuonGEMRecHits/interface/GEMRecHitsValidation.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
+#include "Validation/MuonGEMRecHits/interface/GEMRecHitsValidation.h"
 #include <iomanip>
 
 using namespace std;
 
-GEMRecHitsValidation::GEMRecHitsValidation(const edm::ParameterSet& cfg): GEMBaseValidation(cfg)
-{
-  InputTagToken_   = consumes<edm::PSimHitContainer>(cfg.getParameter<edm::InputTag>("simInputLabel"));
+GEMRecHitsValidation::GEMRecHitsValidation(const edm::ParameterSet &cfg) : GEMBaseValidation(cfg) {
+  InputTagToken_ = consumes<edm::PSimHitContainer>(cfg.getParameter<edm::InputTag>("simInputLabel"));
   InputTagToken_RH = consumes<GEMRecHitCollection>(cfg.getParameter<edm::InputTag>("recHitsInputLabel"));
   detailPlot_ = cfg.getParameter<bool>("detailPlot");
 }
 
-MonitorElement* GEMRecHitsValidation::BookHist1D( DQMStore::IBooker& ibooker, const char* name, const char* label, unsigned int region_num, unsigned int station_num, unsigned int layer_num, const unsigned int Nbin, const Float_t xMin, const Float_t xMax) {                                                                            
-  string hist_name  = name+getSuffixName( region_num, station_num+1, layer_num+1);
-  string hist_label = label+string(" : ")+getSuffixTitle( region_num, station_num+1, layer_num+1);
-  return ibooker.book1D( hist_name, hist_label,Nbin,xMin,xMax ); 
+MonitorElement *GEMRecHitsValidation::BookHist1D(DQMStore::IBooker &ibooker,
+                                                 const char *name,
+                                                 const char *label,
+                                                 unsigned int region_num,
+                                                 unsigned int station_num,
+                                                 unsigned int layer_num,
+                                                 const unsigned int Nbin,
+                                                 const Float_t xMin,
+                                                 const Float_t xMax) {
+  string hist_name = name + getSuffixName(region_num, station_num + 1, layer_num + 1);
+  string hist_label = label + string(" : ") + getSuffixTitle(region_num, station_num + 1, layer_num + 1);
+  return ibooker.book1D(hist_name, hist_label, Nbin, xMin, xMax);
 }
 
-MonitorElement* GEMRecHitsValidation::BookHist1D( DQMStore::IBooker& ibooker, const char* name, const char* label, unsigned int region_num, const unsigned int Nbin, const Float_t xMin, const Float_t xMax) {
-  string hist_name  = name+getSuffixName( region_num);
-  string hist_label = label+string(" : ")+getSuffixName( region_num ) ;
-  return ibooker.book1D( hist_name, hist_label,Nbin,xMin,xMax );
+MonitorElement *GEMRecHitsValidation::BookHist1D(DQMStore::IBooker &ibooker,
+                                                 const char *name,
+                                                 const char *label,
+                                                 unsigned int region_num,
+                                                 const unsigned int Nbin,
+                                                 const Float_t xMin,
+                                                 const Float_t xMax) {
+  string hist_name = name + getSuffixName(region_num);
+  string hist_label = label + string(" : ") + getSuffixName(region_num);
+  return ibooker.book1D(hist_name, hist_label, Nbin, xMin, xMax);
 }
 
-void GEMRecHitsValidation::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & Run, edm::EventSetup const & iSetup ) {
-  const GEMGeometry* GEMGeometry_ = initGeometry(iSetup);
-  if ( GEMGeometry_ == nullptr) return ;  
+void GEMRecHitsValidation::bookHistograms(DQMStore::IBooker &ibooker,
+                                          edm::Run const &Run,
+                                          edm::EventSetup const &iSetup) {
+  const GEMGeometry *GEMGeometry_ = initGeometry(iSetup);
+  if (GEMGeometry_ == nullptr)
+    return;
 
-  LogDebug("GEMRecHitsValidation")<<"Geometry is acquired from MuonGeometryRecord\n";
+  LogDebug("GEMRecHitsValidation") << "Geometry is acquired from MuonGeometryRecord\n";
   ibooker.setCurrentFolder("MuonGEMRecHitsV/GEMRecHitsTask");
-  LogDebug("GEMRecHitsValidation")<<"ibooker set current folder\n";
+  LogDebug("GEMRecHitsValidation") << "ibooker set current folder\n";
 
-
-  gem_cls_tot = ibooker.book1D("gem_cls_tot","ClusterSize Distribution",11,-0.5,10.5);
-  for( auto& region : GEMGeometry_->regions() ){
+  gem_cls_tot = ibooker.book1D("gem_cls_tot", "ClusterSize Distribution", 11, -0.5, 10.5);
+  for (auto &region : GEMGeometry_->regions()) {
     int re = region->region();
-    TString title_suffix = getSuffixTitle( re) ;
-    TString histname_suffix = getSuffixName( re);
-    TString simpleZR_title    = TString::Format("ZR Occupancy%s; |Z|(cm) ; R(cm)",title_suffix.Data());
-    TString simpleZR_histname = TString::Format("rh_simple_zr%s",histname_suffix.Data());
-    auto* simpleZR = getSimpleZR(ibooker, simpleZR_title, simpleZR_histname);
-    if( simpleZR != nullptr) {
-      recHits_simple_zr[simpleZR_histname.Hash() ] = simpleZR;
+    TString title_suffix = getSuffixTitle(re);
+    TString histname_suffix = getSuffixName(re);
+    TString simpleZR_title = TString::Format("ZR Occupancy%s; |Z|(cm) ; R(cm)", title_suffix.Data());
+    TString simpleZR_histname = TString::Format("rh_simple_zr%s", histname_suffix.Data());
+    auto *simpleZR = getSimpleZR(ibooker, simpleZR_title, simpleZR_histname);
+    if (simpleZR != nullptr) {
+      recHits_simple_zr[simpleZR_histname.Hash()] = simpleZR;
     }
 
-    for( auto& station : region->stations()) {
+    for (auto &station : region->stations()) {
       int station_num = station->station();
       TString title_suffix2 = title_suffix + TString::Format("  Station%d", station_num);
       TString histname_suffix2 = histname_suffix + TString::Format("_st%d", station_num);
 
-      TString dcEta_title    = TString::Format("Occupancy for detector component %s;;#eta-partition",title_suffix2.Data());
-      TString dcEta_histname = TString::Format("rh_dcEta%s",histname_suffix2.Data());
-      auto* dcEta = getDCEta( ibooker, station, dcEta_title, dcEta_histname);
-      if ( dcEta != nullptr) {
-        recHits_dcEta[ dcEta_histname.Hash() ] = dcEta;
+      TString dcEta_title =
+          TString::Format("Occupancy for detector component %s;;#eta-partition", title_suffix2.Data());
+      TString dcEta_histname = TString::Format("rh_dcEta%s", histname_suffix2.Data());
+      auto *dcEta = getDCEta(ibooker, station, dcEta_title, dcEta_histname);
+      if (dcEta != nullptr) {
+        recHits_dcEta[dcEta_histname.Hash()] = dcEta;
       }
-      int idx = 0 ;
-      for(unsigned int sCh = 1 ; sCh <= station->superChambers().size() ; sCh++ ) {
-        for( unsigned int Ch =1 ; Ch<=2 ; Ch++) {
+      int idx = 0;
+      for (unsigned int sCh = 1; sCh <= station->superChambers().size(); sCh++) {
+        for (unsigned int Ch = 1; Ch <= 2; Ch++) {
           idx++;
-          TString label = TString::Format("ch%d_la%d",sCh, Ch);
-          recHits_dcEta[ dcEta_histname.Hash() ]->setBinLabel(idx, label.Data());
+          TString label = TString::Format("ch%d_la%d", sCh, Ch);
+          recHits_dcEta[dcEta_histname.Hash()]->setBinLabel(idx, label.Data());
         }
       }
     }
   }
-  
-  for( unsigned int region_num = 0 ; region_num <nRegion() ; region_num++ ) {
-    gem_region_pullX[region_num] = BookHist1D(ibooker,"pullX","Pull Of X",region_num,100,-50,50);
-    gem_region_pullY[region_num] = BookHist1D(ibooker,"pullY","Pull Of Y",region_num,100,-50,50);
+
+  for (unsigned int region_num = 0; region_num < nRegion(); region_num++) {
+    gem_region_pullX[region_num] = BookHist1D(ibooker, "pullX", "Pull Of X", region_num, 100, -50, 50);
+    gem_region_pullY[region_num] = BookHist1D(ibooker, "pullY", "Pull Of Y", region_num, 100, -50, 50);
   }
 
-  if(detailPlot_){
-    for( unsigned int region_num = 0 ; region_num <nRegion() ; region_num++ ) {
-      for( int layer_num = 0 ; layer_num < 2 ; layer_num++) {
-        for( unsigned int station_num = 0 ; station_num < nStation() ; station_num++) {
-          gem_cls[region_num][station_num][layer_num] = BookHist1D(ibooker,"cls","ClusterSize Distribution",region_num,station_num,layer_num,11,-0.5,10.5);
-          gem_pullX[region_num][station_num][layer_num] = BookHist1D(ibooker,"pullX","Pull Of X",region_num,station_num,layer_num,100,-50,50);
-          gem_pullY[region_num][station_num][layer_num] = BookHist1D(ibooker,"pullY","Pull Of Y",region_num,station_num,layer_num,100,-50,50);
-          gem_rh_zr[region_num][station_num][layer_num] = BookHistZR(ibooker,"rh","RecHits",region_num,station_num,layer_num);
-          gem_rh_xy[region_num][station_num][layer_num] = BookHistXY(ibooker,"rh","RecHits",region_num,station_num,layer_num);
+  if (detailPlot_) {
+    for (unsigned int region_num = 0; region_num < nRegion(); region_num++) {
+      for (int layer_num = 0; layer_num < 2; layer_num++) {
+        for (unsigned int station_num = 0; station_num < nStation(); station_num++) {
+          gem_cls[region_num][station_num][layer_num] = BookHist1D(
+              ibooker, "cls", "ClusterSize Distribution", region_num, station_num, layer_num, 11, -0.5, 10.5);
+          gem_pullX[region_num][station_num][layer_num] =
+              BookHist1D(ibooker, "pullX", "Pull Of X", region_num, station_num, layer_num, 100, -50, 50);
+          gem_pullY[region_num][station_num][layer_num] =
+              BookHist1D(ibooker, "pullY", "Pull Of Y", region_num, station_num, layer_num, 100, -50, 50);
+          gem_rh_zr[region_num][station_num][layer_num] =
+              BookHistZR(ibooker, "rh", "RecHits", region_num, station_num, layer_num);
+          gem_rh_xy[region_num][station_num][layer_num] =
+              BookHistXY(ibooker, "rh", "RecHits", region_num, station_num, layer_num);
         }
       }
     }
   }
-  LogDebug("GEMRecHitsValidation")<<"Booking End.\n";
+  LogDebug("GEMRecHitsValidation") << "Booking End.\n";
 }
 
+GEMRecHitsValidation::~GEMRecHitsValidation() {}
 
-GEMRecHitsValidation::~GEMRecHitsValidation() {
-}
-
-void GEMRecHitsValidation::analyze(const edm::Event& e,
-    const edm::EventSetup& iSetup)
-{
-  const GEMGeometry* GEMGeometry_  = initGeometry(iSetup);
-  if ( GEMGeometry_ == nullptr) return; 
+void GEMRecHitsValidation::analyze(const edm::Event &e, const edm::EventSetup &iSetup) {
+  const GEMGeometry *GEMGeometry_ = initGeometry(iSetup);
+  if (GEMGeometry_ == nullptr)
+    return;
 
   edm::Handle<GEMRecHitCollection> gemRecHits;
   edm::Handle<edm::PSimHitContainer> gemSimHits;
-  e.getByToken( this->InputTagToken_, gemSimHits);
-  e.getByToken( this->InputTagToken_RH,gemRecHits);
+  e.getByToken(this->InputTagToken_, gemSimHits);
+  e.getByToken(this->InputTagToken_RH, gemRecHits);
   if (!gemRecHits.isValid()) {
     edm::LogError("GEMRecHitsValidation") << "Cannot get strips by Token RecHits Token.\n";
-    return ;
+    return;
   }
 
-  for (edm::PSimHitContainer::const_iterator hits = gemSimHits->begin(); hits!=gemSimHits->end(); ++hits) {
-
+  for (edm::PSimHitContainer::const_iterator hits = gemSimHits->begin(); hits != gemSimHits->end(); ++hits) {
     const GEMDetId id(hits->detUnitId());
 
     Int_t sh_region = id.region();
-    //Int_t sh_ring = id.ring();
+    // Int_t sh_ring = id.ring();
     Int_t sh_roll = id.roll();
     Int_t sh_station = id.station();
     Int_t sh_layer = id.layer();
     Int_t sh_chamber = id.chamber();
 
-    if ( GEMGeometry_->idToDet(hits->detUnitId()) == nullptr) {
-      std::cout<<"simHit did not matched with GEMGeometry."<<std::endl;
+    if (GEMGeometry_->idToDet(hits->detUnitId()) == nullptr) {
+      std::cout << "simHit did not matched with GEMGeometry." << std::endl;
       continue;
     }
 
-    if (!(abs(hits-> particleType()) == 13)) continue;
+    if (!(abs(hits->particleType()) == 13))
+      continue;
 
-    //const LocalPoint p0(0., 0., 0.);
-    //const GlobalPoint Gp0(GEMGeometry_->idToDet(hits->detUnitId())->surface().toGlobal(p0));
+    // const LocalPoint p0(0., 0., 0.);
+    // const GlobalPoint
+    // Gp0(GEMGeometry_->idToDet(hits->detUnitId())->surface().toGlobal(p0));
     const LocalPoint hitLP(hits->localPosition());
 
     const LocalPoint hitEP(hits->entryPoint());
     Int_t sh_strip = GEMGeometry_->etaPartition(hits->detUnitId())->strip(hitEP);
 
-    //const GlobalPoint hitGP(GEMGeometry_->idToDet(hits->detUnitId())->surface().toGlobal(hitLP));
-    //Float_t sh_l_r = hitLP.perp();
+    // const GlobalPoint
+    // hitGP(GEMGeometry_->idToDet(hits->detUnitId())->surface().toGlobal(hitLP));
+    // Float_t sh_l_r = hitLP.perp();
     Float_t sh_l_x = hitLP.x();
     Float_t sh_l_y = hitLP.y();
-    //Float_t sh_l_z = hitLP.z();
-
-
-    for (GEMRecHitCollection::const_iterator recHit = gemRecHits->begin(); recHit != gemRecHits->end(); ++recHit){
-      Float_t  rh_l_x = recHit->localPosition().x();
-      Float_t  rh_l_xErr = recHit->localPositionError().xx();
-      Float_t  rh_l_y = recHit->localPosition().y();
-      Float_t  rh_l_yErr = recHit->localPositionError().yy();
-      //Int_t  detId = (Short_t) (*recHit).gemId();
-      //Int_t  bx = recHit->BunchX();
-      Int_t  clusterSize = recHit->clusterSize();
-      Int_t  firstClusterStrip = recHit->firstClusterStrip();
+    // Float_t sh_l_z = hitLP.z();
+
+    for (GEMRecHitCollection::const_iterator recHit = gemRecHits->begin(); recHit != gemRecHits->end(); ++recHit) {
+      Float_t rh_l_x = recHit->localPosition().x();
+      Float_t rh_l_xErr = recHit->localPositionError().xx();
+      Float_t rh_l_y = recHit->localPosition().y();
+      Float_t rh_l_yErr = recHit->localPositionError().yy();
+      // Int_t  detId = (Short_t) (*recHit).gemId();
+      // Int_t  bx = recHit->BunchX();
+      Int_t clusterSize = recHit->clusterSize();
+      Int_t firstClusterStrip = recHit->firstClusterStrip();
 
       GEMDetId id((*recHit).gemId());
 
-      Short_t rh_region = (Short_t) id.region();
-      //Int_t rh_ring = (Short_t) id.ring();
-      Short_t rh_station = (Short_t) id.station();
-      Short_t rh_layer = (Short_t) id.layer();
-      Short_t rh_chamber = (Short_t) id.chamber();
-      Short_t rh_roll = (Short_t) id.roll();
+      Short_t rh_region = (Short_t)id.region();
+      // Int_t rh_ring = (Short_t) id.ring();
+      Short_t rh_station = (Short_t)id.station();
+      Short_t rh_layer = (Short_t)id.layer();
+      Short_t rh_chamber = (Short_t)id.chamber();
+      Short_t rh_roll = (Short_t)id.roll();
 
       LocalPoint recHitLP = recHit->localPosition();
-      if ( GEMGeometry_->idToDet((*recHit).gemId()) == nullptr) {
-        std::cout<<"This gem recHit did not matched with GEMGeometry."<<std::endl;
+      if (GEMGeometry_->idToDet((*recHit).gemId()) == nullptr) {
+        std::cout << "This gem recHit did not matched with GEMGeometry." << std::endl;
         continue;
       }
       GlobalPoint recHitGP = GEMGeometry_->idToDet((*recHit).gemId())->surface().toGlobal(recHitLP);
 
-      Float_t     rh_g_R = recHitGP.perp();
-      //Float_t rh_g_Eta = recHitGP.eta();
-      //Float_t rh_g_Phi = recHitGP.phi();
-      Float_t     rh_g_X = recHitGP.x();
-      Float_t     rh_g_Y = recHitGP.y();
-      Float_t     rh_g_Z = recHitGP.z();
-      Float_t   rh_pullX = (Float_t)(rh_l_x - sh_l_x)/(rh_l_xErr);
-      Float_t   rh_pullY = (Float_t)(rh_l_y - sh_l_y)/(rh_l_yErr);
+      Float_t rh_g_R = recHitGP.perp();
+      // Float_t rh_g_Eta = recHitGP.eta();
+      // Float_t rh_g_Phi = recHitGP.phi();
+      Float_t rh_g_X = recHitGP.x();
+      Float_t rh_g_Y = recHitGP.y();
+      Float_t rh_g_Z = recHitGP.z();
+      Float_t rh_pullX = (Float_t)(rh_l_x - sh_l_x) / (rh_l_xErr);
+      Float_t rh_pullY = (Float_t)(rh_l_y - sh_l_y) / (rh_l_yErr);
 
       std::vector<int> stripsFired;
-      for(int i = firstClusterStrip; i < (firstClusterStrip + clusterSize); i++){
+      for (int i = firstClusterStrip; i < (firstClusterStrip + clusterSize); i++) {
         stripsFired.push_back(i);
       }
 
-      const bool cond1( sh_region == rh_region and sh_layer == rh_layer and sh_station == rh_station);
+      const bool cond1(sh_region == rh_region and sh_layer == rh_layer and sh_station == rh_station);
       const bool cond2(sh_chamber == rh_chamber and sh_roll == rh_roll);
       const bool cond3(std::find(stripsFired.begin(), stripsFired.end(), (sh_strip + 1)) != stripsFired.end());
 
-      if(cond1 and cond2 and cond3){
-        LogDebug("GEMRecHitsValidation")<< " Region : " << rh_region << "\t Station : " << rh_station
-          << "\t Layer : "<< rh_layer << "\n Radius: " << rh_g_R << "\t X : " << rh_g_X << "\t Y : "<< rh_g_Y << "\t Z : " << rh_g_Z << std::endl;	
-
-        int region_num=0 ;
-        if ( rh_region ==-1 ) region_num = 0 ;
-        else if ( rh_region==1) region_num = 1;
-        int layer_num = rh_layer-1;
-        int binX = (rh_chamber-1)*2+layer_num;
+      if (cond1 and cond2 and cond3) {
+        LogDebug("GEMRecHitsValidation") << " Region : " << rh_region << "\t Station : " << rh_station
+                                         << "\t Layer : " << rh_layer << "\n Radius: " << rh_g_R << "\t X : " << rh_g_X
+                                         << "\t Y : " << rh_g_Y << "\t Z : " << rh_g_Z << std::endl;
+
+        int region_num = 0;
+        if (rh_region == -1)
+          region_num = 0;
+        else if (rh_region == 1)
+          region_num = 1;
+        int layer_num = rh_layer - 1;
+        int binX = (rh_chamber - 1) * 2 + layer_num;
         int binY = rh_roll;
-        int station_num = rh_station -1;
+        int station_num = rh_station - 1;
 
         // Fill normal plots.
-        TString histname_suffix = TString::Format("_r%d",rh_region);
-        TString simple_zr_histname = TString::Format("rh_simple_zr%s",histname_suffix.Data());
-        LogDebug("GEMRecHitsValidation")<< " simpleZR!\n";
-        recHits_simple_zr[simple_zr_histname.Hash()]->Fill( fabs(rh_g_Z), rh_g_R);
-
+        TString histname_suffix = TString::Format("_r%d", rh_region);
+        TString simple_zr_histname = TString::Format("rh_simple_zr%s", histname_suffix.Data());
+        LogDebug("GEMRecHitsValidation") << " simpleZR!\n";
+        recHits_simple_zr[simple_zr_histname.Hash()]->Fill(fabs(rh_g_Z), rh_g_R);
 
-        histname_suffix = TString::Format("_r%d_st%d",rh_region, rh_station);
-        TString dcEta_histname = TString::Format("rh_dcEta%s",histname_suffix.Data());
-        LogDebug("GEMRecHitsValidation")<< " dcEta\n";
-        recHits_dcEta[dcEta_histname.Hash()]->Fill( binX, binY);
+        histname_suffix = TString::Format("_r%d_st%d", rh_region, rh_station);
+        TString dcEta_histname = TString::Format("rh_dcEta%s", histname_suffix.Data());
+        LogDebug("GEMRecHitsValidation") << " dcEta\n";
+        recHits_dcEta[dcEta_histname.Hash()]->Fill(binX, binY);
 
         gem_cls_tot->Fill(clusterSize);
         gem_region_pullX[region_num]->Fill(rh_pullX);
         gem_region_pullY[region_num]->Fill(rh_pullY);
-        LogDebug("GEMRecHitsValidation")<< " Begin detailPlot!\n";
+        LogDebug("GEMRecHitsValidation") << " Begin detailPlot!\n";
 
-        if(detailPlot_){
+        if (detailPlot_) {
           gem_cls[region_num][station_num][layer_num]->Fill(clusterSize);
           gem_pullX[region_num][station_num][layer_num]->Fill(rh_pullX);
           gem_pullY[region_num][station_num][layer_num]->Fill(rh_pullY);
-          gem_rh_zr[region_num][station_num][layer_num]->Fill(rh_g_Z ,rh_g_R);
-          gem_rh_xy[region_num][station_num][layer_num]->Fill(rh_g_X ,rh_g_Y);
+          gem_rh_zr[region_num][station_num][layer_num]->Fill(rh_g_Z, rh_g_R);
+          gem_rh_xy[region_num][station_num][layer_num]->Fill(rh_g_X, rh_g_Y);
         }
       }
-    } //End loop on RecHits
-  } //End loop on SimHits
-
+    }  // End loop on RecHits
+  }    // End loop on SimHits
 }
diff --git a/Validation/MuonIdentification/interface/MuonIdVal.h b/Validation/MuonIdentification/interface/MuonIdVal.h
index aa6dc037bbfb3..416499510af36 100644
--- a/Validation/MuonIdentification/interface/MuonIdVal.h
+++ b/Validation/MuonIdentification/interface/MuonIdVal.h
@@ -2,7 +2,7 @@
 //
 // Package:    Validation/MuonIdentification
 // Class:      MuonIdVal
-// 
+//
 /*
 
  Description:  Makes and fills lots of histograms using the various reco::Muon
@@ -29,14 +29,14 @@
 #include "DataFormats/MuonDetId/interface/DTChamberId.h"
 #include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
 #include "DataFormats/MuonReco/interface/Muon.h"
+#include "DataFormats/MuonReco/interface/MuonCosmicCompatibility.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 #include "DataFormats/MuonReco/interface/MuonQuality.h"
 #include "DataFormats/MuonReco/interface/MuonSelectors.h"
+#include "DataFormats/MuonReco/interface/MuonShower.h"
 #include "DataFormats/MuonReco/interface/MuonTime.h"
 #include "DataFormats/MuonReco/interface/MuonTimeExtra.h"
 #include "DataFormats/MuonReco/interface/MuonTimeExtraMap.h"
-#include "DataFormats/MuonReco/interface/MuonCosmicCompatibility.h"
-#include "DataFormats/MuonReco/interface/MuonShower.h"
 
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -47,179 +47,178 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "Geometry/CSCGeometry/interface/CSCGeometry.h"
+#include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
 #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 
-//class MuonIdVal : public edm::EDAnalyzer {
+// class MuonIdVal : public edm::EDAnalyzer {
 class MuonIdVal : public DQMEDAnalyzer {
-   public:
-      explicit MuonIdVal(const edm::ParameterSet&);
-      ~MuonIdVal() override;
-
-   private:
-      void bookHistograms(DQMStore::IBooker &,  edm::Run const &, edm::EventSetup const &) override;
-      void analyze(const edm::Event&, const edm::EventSetup&) override;
-      virtual void Fill(MonitorElement*, float);
-
-      edm::ParameterSet iConfig;
-      edm::ParameterSet parameters_;
-      std::string eventInfoFolder_;
-      std::string subsystemname_;
-  
-      // ----------member data ---------------------------
-      edm::InputTag inputMuonCollection_;
-      edm::InputTag inputDTRecSegment4DCollection_;
-      edm::InputTag inputCSCSegmentCollection_;
-      edm::InputTag inputMuonTimeExtraValueMap_;
-      edm::InputTag inputMuonCosmicCompatibilityValueMap_;
-      edm::InputTag inputMuonShowerInformationValueMap_;
-      edm::EDGetTokenT<reco::MuonCollection> inputMuonCollectionToken_;
-      edm::EDGetTokenT<DTRecSegment4DCollection> inputDTRecSegment4DCollectionToken_;
-      edm::EDGetTokenT<CSCSegmentCollection> inputCSCSegmentCollectionToken_;
-      edm::EDGetTokenT<reco::MuonTimeExtraMap> inputMuonTimeExtraValueMapCombToken_;
-      edm::EDGetTokenT<reco::MuonTimeExtraMap> inputMuonTimeExtraValueMapDTToken_;
-      edm::EDGetTokenT<reco::MuonTimeExtraMap> inputMuonTimeExtraValueMapCSCToken_;
-      edm::EDGetTokenT<edm::ValueMap<reco::MuonCosmicCompatibility> > inputMuonCosmicCompatibilityValueMapToken_;
-      edm::EDGetTokenT<edm::ValueMap<reco::MuonShower> > inputMuonShowerInformationValueMapToken_;
-      bool useTrackerMuons_;
-      bool useGlobalMuons_;
-      bool useTrackerMuonsNotGlobalMuons_;
-      bool useGlobalMuonsNotTrackerMuons_;
-      bool makeEnergyPlots_;
-      bool makeTimePlots_;
-      bool make2DPlots_;
-      bool makeAllChamberPlots_;
-      bool makeCosmicCompatibilityPlots_;
-      bool makeShowerInformationPlots_;
-      std::string baseFolder_;
-
-
-      edm::Handle<reco::MuonCollection> muonCollectionH_;
-      edm::Handle<DTRecSegment4DCollection> dtSegmentCollectionH_;
-      edm::Handle<CSCSegmentCollection> cscSegmentCollectionH_;
-      edm::Handle<reco::MuonTimeExtraMap> combinedMuonTimeExtraValueMapH_;
-      edm::Handle<reco::MuonTimeExtraMap> cscMuonTimeExtraValueMapH_;
-      edm::Handle<reco::MuonTimeExtraMap> dtMuonTimeExtraValueMapH_;
-      edm::Handle<edm::ValueMap<reco::MuonCosmicCompatibility> > muonCosmicCompatibilityValueMapH_;
-      edm::Handle<edm::ValueMap<reco::MuonShower> > muonShowerInformationValueMapH_;
-      edm::ESHandle<GlobalTrackingGeometry> geometry_;
-
-      // trackerMuon == 0; globalMuon == 1
-      // energy deposits
-      MonitorElement* hEnergyEMBarrel[4];
-      MonitorElement* hEnergyHABarrel[4];
-      MonitorElement* hEnergyHO[4];
-      MonitorElement* hEnergyEMEndcap[4];
-      MonitorElement* hEnergyHAEndcap[4];
-
-      // time information
-      MonitorElement* hMuonTimeNDOF[4];
-      MonitorElement* hMuonTimeTimeAtIpInOut[4];
-      MonitorElement* hMuonTimeTimeAtIpInOutErr[4];
-      MonitorElement* hMuonTimeTimeAtIpOutIn[4];
-      MonitorElement* hMuonTimeTimeAtIpOutInErr[4];
-      MonitorElement* hMuonTimeExtraCombinedNDOF[4];
-      MonitorElement* hMuonTimeExtraCombinedTimeAtIpInOut[4];
-      MonitorElement* hMuonTimeExtraCombinedTimeAtIpInOutErr[4];
-      MonitorElement* hMuonTimeExtraCombinedTimeAtIpOutIn[4];
-      MonitorElement* hMuonTimeExtraCombinedTimeAtIpOutInErr[4];
-      MonitorElement* hMuonTimeExtraCSCNDOF[4];
-      MonitorElement* hMuonTimeExtraCSCTimeAtIpInOut[4];
-      MonitorElement* hMuonTimeExtraCSCTimeAtIpInOutErr[4];
-      MonitorElement* hMuonTimeExtraCSCTimeAtIpOutIn[4];
-      MonitorElement* hMuonTimeExtraCSCTimeAtIpOutInErr[4];
-      MonitorElement* hMuonTimeExtraDTNDOF[4];
-      MonitorElement* hMuonTimeExtraDTTimeAtIpInOut[4];
-      MonitorElement* hMuonTimeExtraDTTimeAtIpInOutErr[4];
-      MonitorElement* hMuonTimeExtraDTTimeAtIpOutIn[4];
-      MonitorElement* hMuonTimeExtraDTTimeAtIpOutInErr[4];
-
-      // muonid
-      MonitorElement* hCaloCompat[4];
-      MonitorElement* hSegmentCompat[4];
-      MonitorElement* hCaloSegmentCompat[4];
-      MonitorElement* hMuonQualityTrkRelChi2[4];
-      MonitorElement* hMuonQualityStaRelChi2[4];
-      MonitorElement* hMuonQualityTrkKink[4];
-      MonitorElement* hGlobalMuonPromptTightBool[4];
-      MonitorElement* hTMLastStationLooseBool[4];
-      MonitorElement* hTMLastStationTightBool[4];
-      MonitorElement* hTM2DCompatibilityLooseBool[4];
-      MonitorElement* hTM2DCompatibilityTightBool[4];
-      MonitorElement* hTMOneStationLooseBool[4];
-      MonitorElement* hTMOneStationTightBool[4];
-      MonitorElement* hTMLastStationOptimizedLowPtLooseBool[4];
-      MonitorElement* hTMLastStationOptimizedLowPtTightBool[4];
-      MonitorElement* hGMTkChiCompatibilityBool[4];
-      MonitorElement* hGMStaChiCompatibilityBool[4];
-      MonitorElement* hGMTkKinkTightBool[4];
-      MonitorElement* hTMLastStationAngLooseBool[4];
-      MonitorElement* hTMLastStationAngTightBool[4];
-      MonitorElement* hTMOneStationAngLooseBool[4];
-      MonitorElement* hTMOneStationAngTightBool[4];
-      MonitorElement* hTMLastStationOptimizedBarrelLowPtLooseBool[4];
-      MonitorElement* hTMLastStationOptimizedBarrelLowPtTightBool[4];
-    
-      //cosmic compatibilities
-      MonitorElement* hCombinedCosmicCompat[4];
-      MonitorElement* hTimeCosmicCompat[4];
-      MonitorElement* hB2BCosmicCompat[4];
-      MonitorElement* hOverlapCosmicCompat[4];
-        
-      // by station
-
-      //shower information
-      MonitorElement* hMuonShowerSizeT[4][4];
-      MonitorElement* hMuonShowerDeltaR[4][4];
-      MonitorElement* hMuonAllHits[4][4];
-      MonitorElement* hMuonHitsFromSegments[4][4];
-      MonitorElement* hMuonUncorrelatedHits[4][4];
-
-      MonitorElement* hDTPullxPropErr[4][4];
-      MonitorElement* hDTPulldXdZPropErr[4][4];
-      MonitorElement* hDTPullyPropErr[4][3];
-      MonitorElement* hDTPulldYdZPropErr[4][3];
-      MonitorElement* hDTDistWithSegment[4][4];
-      MonitorElement* hDTDistWithNoSegment[4][4];
-      MonitorElement* hDTPullDistWithSegment[4][4];
-      MonitorElement* hDTPullDistWithNoSegment[4][4];
-      MonitorElement* hCSCPullxPropErr[4][4];
-      MonitorElement* hCSCPulldXdZPropErr[4][4];
-      MonitorElement* hCSCPullyPropErr[4][4];
-      MonitorElement* hCSCPulldYdZPropErr[4][4];
-      MonitorElement* hCSCDistWithSegment[4][4];
-      MonitorElement* hCSCDistWithNoSegment[4][4];
-      MonitorElement* hCSCPullDistWithSegment[4][4];
-      MonitorElement* hCSCPullDistWithNoSegment[4][4];
-
-      // by chamber, trackerMuons only
-      // DT:  [station][wheel][sector]
-      // CSC: [endcap][station][ring][chamber]
-      MonitorElement* hDTChamberDx[4][5][14];
-      MonitorElement* hDTChamberDy[3][5][14];
-      MonitorElement* hDTChamberEdgeXWithSegment[4][5][14];
-      MonitorElement* hDTChamberEdgeXWithNoSegment[4][5][14];
-      MonitorElement* hDTChamberEdgeYWithSegment[4][5][14];
-      MonitorElement* hDTChamberEdgeYWithNoSegment[4][5][14];
-      MonitorElement* hCSCChamberDx[2][4][4][36];
-      MonitorElement* hCSCChamberDy[2][4][4][36];
-      MonitorElement* hCSCChamberEdgeXWithSegment[2][4][4][36];
-      MonitorElement* hCSCChamberEdgeXWithNoSegment[2][4][4][36];
-      MonitorElement* hCSCChamberEdgeYWithSegment[2][4][4][36];
-      MonitorElement* hCSCChamberEdgeYWithNoSegment[2][4][4][36];
-
-      // segment matching "efficiency"
-      MonitorElement* hSegmentIsAssociatedRZ;
-      MonitorElement* hSegmentIsAssociatedXY;
-      MonitorElement* hSegmentIsNotAssociatedRZ;
-      MonitorElement* hSegmentIsNotAssociatedXY;
-      MonitorElement* hSegmentIsBestDrAssociatedRZ;
-      MonitorElement* hSegmentIsBestDrAssociatedXY;
-      MonitorElement* hSegmentIsBestDrNotAssociatedRZ;
-      MonitorElement* hSegmentIsBestDrNotAssociatedXY;
+public:
+  explicit MuonIdVal(const edm::ParameterSet &);
+  ~MuonIdVal() override;
+
+private:
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  virtual void Fill(MonitorElement *, float);
+
+  edm::ParameterSet iConfig;
+  edm::ParameterSet parameters_;
+  std::string eventInfoFolder_;
+  std::string subsystemname_;
+
+  // ----------member data ---------------------------
+  edm::InputTag inputMuonCollection_;
+  edm::InputTag inputDTRecSegment4DCollection_;
+  edm::InputTag inputCSCSegmentCollection_;
+  edm::InputTag inputMuonTimeExtraValueMap_;
+  edm::InputTag inputMuonCosmicCompatibilityValueMap_;
+  edm::InputTag inputMuonShowerInformationValueMap_;
+  edm::EDGetTokenT<reco::MuonCollection> inputMuonCollectionToken_;
+  edm::EDGetTokenT<DTRecSegment4DCollection> inputDTRecSegment4DCollectionToken_;
+  edm::EDGetTokenT<CSCSegmentCollection> inputCSCSegmentCollectionToken_;
+  edm::EDGetTokenT<reco::MuonTimeExtraMap> inputMuonTimeExtraValueMapCombToken_;
+  edm::EDGetTokenT<reco::MuonTimeExtraMap> inputMuonTimeExtraValueMapDTToken_;
+  edm::EDGetTokenT<reco::MuonTimeExtraMap> inputMuonTimeExtraValueMapCSCToken_;
+  edm::EDGetTokenT<edm::ValueMap<reco::MuonCosmicCompatibility>> inputMuonCosmicCompatibilityValueMapToken_;
+  edm::EDGetTokenT<edm::ValueMap<reco::MuonShower>> inputMuonShowerInformationValueMapToken_;
+  bool useTrackerMuons_;
+  bool useGlobalMuons_;
+  bool useTrackerMuonsNotGlobalMuons_;
+  bool useGlobalMuonsNotTrackerMuons_;
+  bool makeEnergyPlots_;
+  bool makeTimePlots_;
+  bool make2DPlots_;
+  bool makeAllChamberPlots_;
+  bool makeCosmicCompatibilityPlots_;
+  bool makeShowerInformationPlots_;
+  std::string baseFolder_;
+
+  edm::Handle<reco::MuonCollection> muonCollectionH_;
+  edm::Handle<DTRecSegment4DCollection> dtSegmentCollectionH_;
+  edm::Handle<CSCSegmentCollection> cscSegmentCollectionH_;
+  edm::Handle<reco::MuonTimeExtraMap> combinedMuonTimeExtraValueMapH_;
+  edm::Handle<reco::MuonTimeExtraMap> cscMuonTimeExtraValueMapH_;
+  edm::Handle<reco::MuonTimeExtraMap> dtMuonTimeExtraValueMapH_;
+  edm::Handle<edm::ValueMap<reco::MuonCosmicCompatibility>> muonCosmicCompatibilityValueMapH_;
+  edm::Handle<edm::ValueMap<reco::MuonShower>> muonShowerInformationValueMapH_;
+  edm::ESHandle<GlobalTrackingGeometry> geometry_;
+
+  // trackerMuon == 0; globalMuon == 1
+  // energy deposits
+  MonitorElement *hEnergyEMBarrel[4];
+  MonitorElement *hEnergyHABarrel[4];
+  MonitorElement *hEnergyHO[4];
+  MonitorElement *hEnergyEMEndcap[4];
+  MonitorElement *hEnergyHAEndcap[4];
+
+  // time information
+  MonitorElement *hMuonTimeNDOF[4];
+  MonitorElement *hMuonTimeTimeAtIpInOut[4];
+  MonitorElement *hMuonTimeTimeAtIpInOutErr[4];
+  MonitorElement *hMuonTimeTimeAtIpOutIn[4];
+  MonitorElement *hMuonTimeTimeAtIpOutInErr[4];
+  MonitorElement *hMuonTimeExtraCombinedNDOF[4];
+  MonitorElement *hMuonTimeExtraCombinedTimeAtIpInOut[4];
+  MonitorElement *hMuonTimeExtraCombinedTimeAtIpInOutErr[4];
+  MonitorElement *hMuonTimeExtraCombinedTimeAtIpOutIn[4];
+  MonitorElement *hMuonTimeExtraCombinedTimeAtIpOutInErr[4];
+  MonitorElement *hMuonTimeExtraCSCNDOF[4];
+  MonitorElement *hMuonTimeExtraCSCTimeAtIpInOut[4];
+  MonitorElement *hMuonTimeExtraCSCTimeAtIpInOutErr[4];
+  MonitorElement *hMuonTimeExtraCSCTimeAtIpOutIn[4];
+  MonitorElement *hMuonTimeExtraCSCTimeAtIpOutInErr[4];
+  MonitorElement *hMuonTimeExtraDTNDOF[4];
+  MonitorElement *hMuonTimeExtraDTTimeAtIpInOut[4];
+  MonitorElement *hMuonTimeExtraDTTimeAtIpInOutErr[4];
+  MonitorElement *hMuonTimeExtraDTTimeAtIpOutIn[4];
+  MonitorElement *hMuonTimeExtraDTTimeAtIpOutInErr[4];
+
+  // muonid
+  MonitorElement *hCaloCompat[4];
+  MonitorElement *hSegmentCompat[4];
+  MonitorElement *hCaloSegmentCompat[4];
+  MonitorElement *hMuonQualityTrkRelChi2[4];
+  MonitorElement *hMuonQualityStaRelChi2[4];
+  MonitorElement *hMuonQualityTrkKink[4];
+  MonitorElement *hGlobalMuonPromptTightBool[4];
+  MonitorElement *hTMLastStationLooseBool[4];
+  MonitorElement *hTMLastStationTightBool[4];
+  MonitorElement *hTM2DCompatibilityLooseBool[4];
+  MonitorElement *hTM2DCompatibilityTightBool[4];
+  MonitorElement *hTMOneStationLooseBool[4];
+  MonitorElement *hTMOneStationTightBool[4];
+  MonitorElement *hTMLastStationOptimizedLowPtLooseBool[4];
+  MonitorElement *hTMLastStationOptimizedLowPtTightBool[4];
+  MonitorElement *hGMTkChiCompatibilityBool[4];
+  MonitorElement *hGMStaChiCompatibilityBool[4];
+  MonitorElement *hGMTkKinkTightBool[4];
+  MonitorElement *hTMLastStationAngLooseBool[4];
+  MonitorElement *hTMLastStationAngTightBool[4];
+  MonitorElement *hTMOneStationAngLooseBool[4];
+  MonitorElement *hTMOneStationAngTightBool[4];
+  MonitorElement *hTMLastStationOptimizedBarrelLowPtLooseBool[4];
+  MonitorElement *hTMLastStationOptimizedBarrelLowPtTightBool[4];
+
+  // cosmic compatibilities
+  MonitorElement *hCombinedCosmicCompat[4];
+  MonitorElement *hTimeCosmicCompat[4];
+  MonitorElement *hB2BCosmicCompat[4];
+  MonitorElement *hOverlapCosmicCompat[4];
+
+  // by station
+
+  // shower information
+  MonitorElement *hMuonShowerSizeT[4][4];
+  MonitorElement *hMuonShowerDeltaR[4][4];
+  MonitorElement *hMuonAllHits[4][4];
+  MonitorElement *hMuonHitsFromSegments[4][4];
+  MonitorElement *hMuonUncorrelatedHits[4][4];
+
+  MonitorElement *hDTPullxPropErr[4][4];
+  MonitorElement *hDTPulldXdZPropErr[4][4];
+  MonitorElement *hDTPullyPropErr[4][3];
+  MonitorElement *hDTPulldYdZPropErr[4][3];
+  MonitorElement *hDTDistWithSegment[4][4];
+  MonitorElement *hDTDistWithNoSegment[4][4];
+  MonitorElement *hDTPullDistWithSegment[4][4];
+  MonitorElement *hDTPullDistWithNoSegment[4][4];
+  MonitorElement *hCSCPullxPropErr[4][4];
+  MonitorElement *hCSCPulldXdZPropErr[4][4];
+  MonitorElement *hCSCPullyPropErr[4][4];
+  MonitorElement *hCSCPulldYdZPropErr[4][4];
+  MonitorElement *hCSCDistWithSegment[4][4];
+  MonitorElement *hCSCDistWithNoSegment[4][4];
+  MonitorElement *hCSCPullDistWithSegment[4][4];
+  MonitorElement *hCSCPullDistWithNoSegment[4][4];
+
+  // by chamber, trackerMuons only
+  // DT:  [station][wheel][sector]
+  // CSC: [endcap][station][ring][chamber]
+  MonitorElement *hDTChamberDx[4][5][14];
+  MonitorElement *hDTChamberDy[3][5][14];
+  MonitorElement *hDTChamberEdgeXWithSegment[4][5][14];
+  MonitorElement *hDTChamberEdgeXWithNoSegment[4][5][14];
+  MonitorElement *hDTChamberEdgeYWithSegment[4][5][14];
+  MonitorElement *hDTChamberEdgeYWithNoSegment[4][5][14];
+  MonitorElement *hCSCChamberDx[2][4][4][36];
+  MonitorElement *hCSCChamberDy[2][4][4][36];
+  MonitorElement *hCSCChamberEdgeXWithSegment[2][4][4][36];
+  MonitorElement *hCSCChamberEdgeXWithNoSegment[2][4][4][36];
+  MonitorElement *hCSCChamberEdgeYWithSegment[2][4][4][36];
+  MonitorElement *hCSCChamberEdgeYWithNoSegment[2][4][4][36];
+
+  // segment matching "efficiency"
+  MonitorElement *hSegmentIsAssociatedRZ;
+  MonitorElement *hSegmentIsAssociatedXY;
+  MonitorElement *hSegmentIsNotAssociatedRZ;
+  MonitorElement *hSegmentIsNotAssociatedXY;
+  MonitorElement *hSegmentIsBestDrAssociatedRZ;
+  MonitorElement *hSegmentIsBestDrAssociatedXY;
+  MonitorElement *hSegmentIsBestDrNotAssociatedRZ;
+  MonitorElement *hSegmentIsBestDrNotAssociatedXY;
 };
 
 #endif
diff --git a/Validation/MuonIdentification/src/MuonIdVal.cc b/Validation/MuonIdentification/src/MuonIdVal.cc
index 9a4c31fedeef2..567c9615e79a0 100644
--- a/Validation/MuonIdentification/src/MuonIdVal.cc
+++ b/Validation/MuonIdentification/src/MuonIdVal.cc
@@ -1,651 +1,789 @@
 #include "Validation/MuonIdentification/interface/MuonIdVal.h"
 
-MuonIdVal::MuonIdVal(const edm::ParameterSet& ps)
-{
-  iConfig=ps;
-   inputMuonCollection_ = iConfig.getParameter<edm::InputTag>("inputMuonCollection");
-   inputDTRecSegment4DCollection_ = iConfig.getParameter<edm::InputTag>("inputDTRecSegment4DCollection");
-   inputCSCSegmentCollection_ = iConfig.getParameter<edm::InputTag>("inputCSCSegmentCollection");
-   inputMuonTimeExtraValueMap_ = iConfig.getParameter<edm::InputTag>("inputMuonTimeExtraValueMap");
-   inputMuonCosmicCompatibilityValueMap_ = iConfig.getParameter<edm::InputTag>("inputMuonCosmicCompatibilityValueMap");
-   inputMuonShowerInformationValueMap_ = iConfig.getParameter<edm::InputTag>("inputMuonShowerInformationValueMap");
-   useTrackerMuons_ = iConfig.getUntrackedParameter<bool>("useTrackerMuons");
-   useGlobalMuons_ = iConfig.getUntrackedParameter<bool>("useGlobalMuons");
-   useTrackerMuonsNotGlobalMuons_ = iConfig.getUntrackedParameter<bool>("useTrackerMuonsNotGlobalMuons");
-   useGlobalMuonsNotTrackerMuons_ = iConfig.getUntrackedParameter<bool>("useGlobalMuonsNotTrackerMuons");
-   makeEnergyPlots_ = iConfig.getUntrackedParameter<bool>("makeEnergyPlots");
-   makeTimePlots_ = iConfig.getUntrackedParameter<bool>("makeTimePlots");
-   make2DPlots_ = iConfig.getUntrackedParameter<bool>("make2DPlots");
-   makeAllChamberPlots_ = iConfig.getUntrackedParameter<bool>("makeAllChamberPlots");
-   makeCosmicCompatibilityPlots_ = iConfig.getUntrackedParameter<bool>("makeCosmicCompatibilityPlots");
-   makeShowerInformationPlots_ = iConfig.getUntrackedParameter<bool>("makeShowerInformationPlots");
-   baseFolder_ = iConfig.getUntrackedParameter<std::string>("baseFolder");
-
-   inputMuonCollectionToken_ = consumes<reco::MuonCollection>(inputMuonCollection_);
-   inputDTRecSegment4DCollectionToken_ = consumes<DTRecSegment4DCollection>(inputDTRecSegment4DCollection_);
-   inputCSCSegmentCollectionToken_ = consumes<CSCSegmentCollection>(inputCSCSegmentCollection_);
-   inputMuonTimeExtraValueMapCombToken_ = consumes<reco::MuonTimeExtraMap>(edm::InputTag(inputMuonTimeExtraValueMap_.label(), "combined"));
-   inputMuonTimeExtraValueMapDTToken_= consumes<reco::MuonTimeExtraMap>(edm::InputTag(inputMuonTimeExtraValueMap_.label(), "csc"));
-   inputMuonTimeExtraValueMapCSCToken_ = consumes<reco::MuonTimeExtraMap>(edm::InputTag(inputMuonTimeExtraValueMap_.label(), "dt"));
-   inputMuonCosmicCompatibilityValueMapToken_ = consumes<edm::ValueMap<reco::MuonCosmicCompatibility> >(inputMuonCosmicCompatibilityValueMap_);
-   inputMuonShowerInformationValueMapToken_ = consumes<edm::ValueMap<reco::MuonShower> >(inputMuonShowerInformationValueMap_);
-
-   subsystemname_ = iConfig.getUntrackedParameter<std::string>("subSystemFolder", "YourSubsystem") ;
+MuonIdVal::MuonIdVal(const edm::ParameterSet &ps) {
+  iConfig = ps;
+  inputMuonCollection_ = iConfig.getParameter<edm::InputTag>("inputMuonCollection");
+  inputDTRecSegment4DCollection_ = iConfig.getParameter<edm::InputTag>("inputDTRecSegment4DCollection");
+  inputCSCSegmentCollection_ = iConfig.getParameter<edm::InputTag>("inputCSCSegmentCollection");
+  inputMuonTimeExtraValueMap_ = iConfig.getParameter<edm::InputTag>("inputMuonTimeExtraValueMap");
+  inputMuonCosmicCompatibilityValueMap_ = iConfig.getParameter<edm::InputTag>("inputMuonCosmicCompatibilityValueMap");
+  inputMuonShowerInformationValueMap_ = iConfig.getParameter<edm::InputTag>("inputMuonShowerInformationValueMap");
+  useTrackerMuons_ = iConfig.getUntrackedParameter<bool>("useTrackerMuons");
+  useGlobalMuons_ = iConfig.getUntrackedParameter<bool>("useGlobalMuons");
+  useTrackerMuonsNotGlobalMuons_ = iConfig.getUntrackedParameter<bool>("useTrackerMuonsNotGlobalMuons");
+  useGlobalMuonsNotTrackerMuons_ = iConfig.getUntrackedParameter<bool>("useGlobalMuonsNotTrackerMuons");
+  makeEnergyPlots_ = iConfig.getUntrackedParameter<bool>("makeEnergyPlots");
+  makeTimePlots_ = iConfig.getUntrackedParameter<bool>("makeTimePlots");
+  make2DPlots_ = iConfig.getUntrackedParameter<bool>("make2DPlots");
+  makeAllChamberPlots_ = iConfig.getUntrackedParameter<bool>("makeAllChamberPlots");
+  makeCosmicCompatibilityPlots_ = iConfig.getUntrackedParameter<bool>("makeCosmicCompatibilityPlots");
+  makeShowerInformationPlots_ = iConfig.getUntrackedParameter<bool>("makeShowerInformationPlots");
+  baseFolder_ = iConfig.getUntrackedParameter<std::string>("baseFolder");
+
+  inputMuonCollectionToken_ = consumes<reco::MuonCollection>(inputMuonCollection_);
+  inputDTRecSegment4DCollectionToken_ = consumes<DTRecSegment4DCollection>(inputDTRecSegment4DCollection_);
+  inputCSCSegmentCollectionToken_ = consumes<CSCSegmentCollection>(inputCSCSegmentCollection_);
+  inputMuonTimeExtraValueMapCombToken_ =
+      consumes<reco::MuonTimeExtraMap>(edm::InputTag(inputMuonTimeExtraValueMap_.label(), "combined"));
+  inputMuonTimeExtraValueMapDTToken_ =
+      consumes<reco::MuonTimeExtraMap>(edm::InputTag(inputMuonTimeExtraValueMap_.label(), "csc"));
+  inputMuonTimeExtraValueMapCSCToken_ =
+      consumes<reco::MuonTimeExtraMap>(edm::InputTag(inputMuonTimeExtraValueMap_.label(), "dt"));
+  inputMuonCosmicCompatibilityValueMapToken_ =
+      consumes<edm::ValueMap<reco::MuonCosmicCompatibility>>(inputMuonCosmicCompatibilityValueMap_);
+  inputMuonShowerInformationValueMapToken_ =
+      consumes<edm::ValueMap<reco::MuonShower>>(inputMuonShowerInformationValueMap_);
+
+  subsystemname_ = iConfig.getUntrackedParameter<std::string>("subSystemFolder", "YourSubsystem");
 }
 
 MuonIdVal::~MuonIdVal() {}
 
+void MuonIdVal::bookHistograms(DQMStore::IBooker &ibooker, const edm::Run &, const edm::EventSetup &) {
+  char name[100], title[200];
+  ibooker.setCurrentFolder(baseFolder_);
+
+  // trackerMuon == 0; globalMuon == 1; trackerMuon && !globalMuon == 2;
+  // globalMuon && !trackerMuon == 3
+  for (unsigned int i = 0; i < 4; i++) {
+    if ((i == 0 && !useTrackerMuons_) || (i == 1 && !useGlobalMuons_))
+      continue;
+    if ((i == 2 && !useTrackerMuonsNotGlobalMuons_) || (i == 3 && !useGlobalMuonsNotTrackerMuons_))
+      continue;
+    if (i == 0)
+      ibooker.setCurrentFolder(baseFolder_ + "/TrackerMuons");
+    if (i == 1)
+      ibooker.setCurrentFolder(baseFolder_ + "/GlobalMuons");
+    if (i == 2)
+      ibooker.setCurrentFolder(baseFolder_ + "/TrackerMuonsNotGlobalMuons");
+    if (i == 3)
+      ibooker.setCurrentFolder(baseFolder_ + "/GlobalMuonsNotTrackerMuons");
+
+    if (makeEnergyPlots_) {
+      hEnergyEMBarrel[i] = ibooker.book1D("hEnergyEMBarrel", "Energy in ECAL Barrel", 100, -0.5, 2.);
+      hEnergyHABarrel[i] = ibooker.book1D("hEnergyHABarrel", "Energy in HCAL Barrel", 100, -4., 12.);
+      hEnergyHO[i] = ibooker.book1D("hEnergyHO", "Energy HO", 100, -2., 5.);
+      hEnergyEMEndcap[i] = ibooker.book1D("hEnergyEMEndcap", "Energy in ECAL Endcap", 100, -0.5, 2.);
+      hEnergyHAEndcap[i] = ibooker.book1D("hEnergyHAEndcap", "Energy in HCAL Endcap", 100, -4., 12.);
+    }
+
+    if (makeTimePlots_) {
+      hMuonTimeNDOF[i] = ibooker.book1D("hMuonTimeNDOF", "MuonTime NDOF", 52, -1.5, 50.5);
+      hMuonTimeTimeAtIpInOut[i] = ibooker.book1D("hMuonTimeTimeAtIpInOut", "MuonTime TimeAtIpInOut", 100, -20., 20.);
+      hMuonTimeTimeAtIpInOutErr[i] =
+          ibooker.book1D("hMuonTimeTimeAtIpInOutErr", "MuonTime TimeAtIpInOutErr", 100, 0., 8.);
+      hMuonTimeTimeAtIpOutIn[i] = ibooker.book1D("hMuonTimeTimeAtIpOutIn", "MuonTime TimeAtIpOutIn", 100, -1., 75.);
+      hMuonTimeTimeAtIpOutInErr[i] =
+          ibooker.book1D("hMuonTimeTimeAtIpOutInErr", "MuonTime TimeAtIpOutInErr", 100, 0., 8.);
+      hMuonTimeExtraCombinedNDOF[i] =
+          ibooker.book1D("hMuonTimeExtraCombinedNDOF", "MuonTimeExtra Combined NDOF", 52, -1.5, 50.5);
+      hMuonTimeExtraCombinedTimeAtIpInOut[i] =
+          ibooker.book1D("hMuonTimeExtraCombinedTimeAtIpInOut", "MuonTimeExtra Combined TimeAtIpInOut", 100, -20., 20.);
+      hMuonTimeExtraCombinedTimeAtIpInOutErr[i] = ibooker.book1D(
+          "hMuonTimeExtraCombinedTimeAtIpInOutErr", "MuonTimeExtra Combined TimeAtIpInOutErr", 100, 0., 8.);
+      hMuonTimeExtraCombinedTimeAtIpOutIn[i] =
+          ibooker.book1D("hMuonTimeExtraCombinedTimeAtIpOutIn", "MuonTimeExtra Combined TimeAtIpOutIn", 100, -1., 75.);
+      hMuonTimeExtraCombinedTimeAtIpOutInErr[i] = ibooker.book1D(
+          "hMuonTimeExtraCombinedTimeAtIpOutInErr", "MuonTimeExtra Combined TimeAtIpOutInErr", 100, 0., 8.);
+      hMuonTimeExtraCSCNDOF[i] = ibooker.book1D("hMuonTimeExtraCSCNDOF", "MuonTimeExtra CSC NDOF", 52, -1.5, 50.5);
+      hMuonTimeExtraCSCTimeAtIpInOut[i] =
+          ibooker.book1D("hMuonTimeExtraCSCTimeAtIpInOut", "MuonTimeExtra CSC TimeAtIpInOut", 100, -20., 20.);
+      hMuonTimeExtraCSCTimeAtIpInOutErr[i] =
+          ibooker.book1D("hMuonTimeExtraCSCTimeAtIpInOutErr", "MuonTimeExtra CSC TimeAtIpInOutErr", 100, 0., 8.);
+      hMuonTimeExtraCSCTimeAtIpOutIn[i] =
+          ibooker.book1D("hMuonTimeExtraCSCTimeAtIpOutIn", "MuonTimeExtra CSC TimeAtIpOutIn", 100, -1., 75.);
+      hMuonTimeExtraCSCTimeAtIpOutInErr[i] =
+          ibooker.book1D("hMuonTimeExtraCSCTimeAtIpOutInErr", "MuonTimeExtra CSC TimeAtIpOutInErr", 100, 0., 8.);
+      hMuonTimeExtraDTNDOF[i] = ibooker.book1D("hMuonTimeExtraDTNDOF", "MuonTimeExtra DT NDOF", 52, -1.5, 50.5);
+      hMuonTimeExtraDTTimeAtIpInOut[i] =
+          ibooker.book1D("hMuonTimeExtraDTTimeAtIpInOut", "MuonTimeExtra DT TimeAtIpInOut", 100, -20., 20.);
+      hMuonTimeExtraDTTimeAtIpInOutErr[i] =
+          ibooker.book1D("hMuonTimeExtraDTTimeAtIpInOutErr", "MuonTimeExtra DT TimeAtIpInOutErr", 100, 0., 8.);
+      hMuonTimeExtraDTTimeAtIpOutIn[i] =
+          ibooker.book1D("hMuonTimeExtraDTTimeAtIpOutIn", "MuonTimeExtra DT TimeAtIpOutIn", 100, -1., 75.);
+      hMuonTimeExtraDTTimeAtIpOutInErr[i] =
+          ibooker.book1D("hMuonTimeExtraDTTimeAtIpOutInErr", "MuonTimeExtra DT TimeAtIpOutInErr", 100, 0., 8.);
+    }
+
+    hCaloCompat[i] = ibooker.book1D("hCaloCompat", "Calo Compatibility", 101, -0.05, 1.05);
+    hSegmentCompat[i] = ibooker.book1D("hSegmentCompat", "Segment Compatibility", 101, -0.05, 1.05);
+    if (make2DPlots_)
+      hCaloSegmentCompat[i] = ibooker.book2D(
+          "hCaloSegmentCompat", "Calo Compatibility vs. Segment Compatibility", 101, -0.05, 1.05, 101, -0.05, 1.05);
+    hMuonQualityTrkRelChi2[i] = ibooker.book1D("hMuonQualityTrkRelChi2", "MuonQuality TrkRelChi2", 100, 0., 1.5);
+    hMuonQualityStaRelChi2[i] = ibooker.book1D("hMuonQualityStaRelChi2", "MuonQuality StaRelChi2", 100, 0., 3.);
+    hMuonQualityTrkKink[i] = ibooker.book1D("hMuonQualityTrkKink", "MuonQuality TrkKink", 100, 0., 150.);
+    hGlobalMuonPromptTightBool[i] =
+        ibooker.book1D("hGlobalMuonPromptTightBool", "GlobalMuonPromptTight Boolean", 2, -0.5, 1.5);
+    hTMLastStationLooseBool[i] = ibooker.book1D("hTMLastStationLooseBool", "TMLastStationLoose Boolean", 2, -0.5, 1.5);
+    hTMLastStationTightBool[i] = ibooker.book1D("hTMLastStationTightBool", "TMLastStationTight Boolean", 2, -0.5, 1.5);
+    hTM2DCompatibilityLooseBool[i] =
+        ibooker.book1D("hTM2DCompatibilityLooseBool", "TM2DCompatibilityLoose Boolean", 2, -0.5, 1.5);
+    hTM2DCompatibilityTightBool[i] =
+        ibooker.book1D("hTM2DCompatibilityTightBool", "TM2DCompatibilityTight Boolean", 2, -0.5, 1.5);
+    hTMOneStationLooseBool[i] = ibooker.book1D("hTMOneStationLooseBool", "TMOneStationLoose Boolean", 2, -0.5, 1.5);
+    hTMOneStationTightBool[i] = ibooker.book1D("hTMOneStationTightBool", "TMOneStationTight Boolean", 2, -0.5, 1.5);
+    hTMLastStationOptimizedLowPtLooseBool[i] = ibooker.book1D(
+        "hTMLastStationOptimizedLowPtLooseBool", "TMLastStationOptimizedLowPtLoose Boolean", 2, -0.5, 1.5);
+    hTMLastStationOptimizedLowPtTightBool[i] = ibooker.book1D(
+        "hTMLastStationOptimizedLowPtTightBool", "TMLastStationOptimizedLowPtTight Boolean", 2, -0.5, 1.5);
+    hGMTkChiCompatibilityBool[i] =
+        ibooker.book1D("hGMTkChiCompatibilityBool", "GMTkChiCompatibility Boolean", 2, -0.5, 1.5);
+    hGMStaChiCompatibilityBool[i] =
+        ibooker.book1D("hGMStaChiCompatibilityBool", "GMStaChiCompatibility Boolean", 2, -0.5, 1.5);
+    hGMTkKinkTightBool[i] = ibooker.book1D("hGMTkKinkTightBool", "GMTkKinkTight Boolean", 2, -0.5, 1.5);
+    hTMLastStationAngLooseBool[i] =
+        ibooker.book1D("hTMLastStationAngLooseBool", "TMLastStationAngLoose Boolean", 2, -0.5, 1.5);
+    hTMLastStationAngTightBool[i] =
+        ibooker.book1D("hTMLastStationAngTightBool", "TMLastStationAngTight Boolean", 2, -0.5, 1.5);
+    hTMOneStationAngLooseBool[i] =
+        ibooker.book1D("hTMOneStationAngLooseBool", "TMOneStationAngLoose Boolean", 2, -0.5, 1.5);
+    hTMOneStationAngTightBool[i] =
+        ibooker.book1D("hTMOneStationAngTightBool", "TMOneStationAngTight Boolean", 2, -0.5, 1.5);
+    hTMLastStationOptimizedBarrelLowPtLooseBool[i] = ibooker.book1D(
+        "hTMLastStationOptimizedBarrelLowPtLooseBool", "TMLastStationOptimizedBarrelLowPtLoose Boolean", 2, -0.5, 1.5);
+    hTMLastStationOptimizedBarrelLowPtTightBool[i] = ibooker.book1D(
+        "hTMLastStationOptimizedBarrelLowPtTightBool", "TMLastStationOptimizedBarrelLowPtTight Boolean", 2, -0.5, 1.5);
+
+    if (makeCosmicCompatibilityPlots_) {
+      hCombinedCosmicCompat[i] =
+          ibooker.book1D("hCombinedCosmicCompat", "hCombinedCosmicCompatibility float", 40, 0., 10.);
+      hTimeCosmicCompat[i] = ibooker.book1D("hTimeCosmicCompat", "hTimeCosmicCompatibility float", 6, 0., 3.);
+      hB2BCosmicCompat[i] = ibooker.book1D("hB2BCosmicCompat", "Number of back-to-back partners", 10, 0, 10);
+      hOverlapCosmicCompat[i] = ibooker.book1D("hOverlapCosmicCompat", "Overlap between muons and 1Leg", 2, 0, 2);
+    }
+
+    // by station
+    for (int station = 0; station < 4; ++station) {
+      if (makeShowerInformationPlots_) {
+        sprintf(name, "hMuonShowerSizeT%i", station + 1);
+        sprintf(title, "Station %i Transverse Cluster Size", station + 1);
+        hMuonShowerSizeT[i][station] = ibooker.book1D(name, title, 1000, 0, 500);
+        sprintf(name, "hMuonShowerDeltaR%i", station + 1);
+        sprintf(title, "Station %i DeltaR", station + 1);
+        hMuonShowerDeltaR[i][station] = ibooker.book1D(name, title, 5000, 0, 0.5);
+        sprintf(name, "hMuonAllHits%i", station + 1);
+        sprintf(title, "Station %i Number of 1D DT or 2D CSC RecHits", station + 1);
+        hMuonAllHits[i][station] = ibooker.book1D(name, title, 400, 0, 400);
+        sprintf(name, "hMuonHitsFromSegments%i", station + 1);
+        sprintf(title, "Station %i Hits used by 4D DT or 3D CSC Segments", station + 1);
+        hMuonHitsFromSegments[i][station] = ibooker.book1D(name, title, 400, 0, 400);
+        sprintf(name, "hMuonUncorrelatedHits%i", station + 1);
+        sprintf(title, "Station %i Uncorrelated Hits", station + 1);
+        hMuonUncorrelatedHits[i][station] = ibooker.book1D(name, title, 400, 0, 400);
+      }
+
+      sprintf(name, "hDT%iPullxPropErr", station + 1);
+      sprintf(title, "DT Station %i Pull X w/ Propagation Error Only", station + 1);
+      hDTPullxPropErr[i][station] = ibooker.book1D(name, title, 100, -20., 20.);
+
+      sprintf(name, "hDT%iPulldXdZPropErr", station + 1);
+      sprintf(title, "DT Station %i Pull DxDz w/ Propagation Error Only", station + 1);
+      hDTPulldXdZPropErr[i][station] = ibooker.book1D(name, title, 100, -20., 20.);
+
+      if (station < 3) {
+        sprintf(name, "hDT%iPullyPropErr", station + 1);
+        sprintf(title, "DT Station %i Pull Y w/ Propagation Error Only", station + 1);
+        hDTPullyPropErr[i][station] = ibooker.book1D(name, title, 100, -20., 20.);
+
+        sprintf(name, "hDT%iPulldYdZPropErr", station + 1);
+        sprintf(title, "DT Station %i Pull DyDz w/ Propagation Error Only", station + 1);
+        hDTPulldYdZPropErr[i][station] = ibooker.book1D(name, title, 100, -20., 20.);
+      }
+
+      sprintf(name, "hDT%iDistWithSegment", station + 1);
+      sprintf(title, "DT Station %i Dist When There Is A Segment", station + 1);
+      hDTDistWithSegment[i][station] = ibooker.book1D(name, title, 100, -140., 30.);
+
+      sprintf(name, "hDT%iDistWithNoSegment", station + 1);
+      sprintf(title, "DT Station %i Dist When There Is No Segment", station + 1);
+      hDTDistWithNoSegment[i][station] = ibooker.book1D(name, title, 100, -140., 30.);
+
+      sprintf(name, "hDT%iPullDistWithSegment", station + 1);
+      sprintf(title, "DT Station %i Pull Dist When There Is A Segment", station + 1);
+      hDTPullDistWithSegment[i][station] = ibooker.book1D(name, title, 100, -140., 30.);
+
+      sprintf(name, "hDT%iPullDistWithNoSegment", station + 1);
+      sprintf(title, "DT Station %i Pull Dist When There Is No Segment", station + 1);
+      hDTPullDistWithNoSegment[i][station] = ibooker.book1D(name, title, 100, -140., 30.);
+
+      sprintf(name, "hCSC%iPullxPropErr", station + 1);
+      sprintf(title, "CSC Station %i Pull X w/ Propagation Error Only", station + 1);
+      hCSCPullxPropErr[i][station] = ibooker.book1D(name, title, 100, -20., 20.);
+
+      sprintf(name, "hCSC%iPulldXdZPropErr", station + 1);
+      sprintf(title, "CSC Station %i Pull DxDz w/ Propagation Error Only", station + 1);
+      hCSCPulldXdZPropErr[i][station] = ibooker.book1D(name, title, 100, -20., 20.);
+
+      sprintf(name, "hCSC%iPullyPropErr", station + 1);
+      sprintf(title, "CSC Station %i Pull Y w/ Propagation Error Only", station + 1);
+      hCSCPullyPropErr[i][station] = ibooker.book1D(name, title, 100, -20., 20.);
+
+      sprintf(name, "hCSC%iPulldYdZPropErr", station + 1);
+      sprintf(title, "CSC Station %i Pull DyDz w/ Propagation Error Only", station + 1);
+      hCSCPulldYdZPropErr[i][station] = ibooker.book1D(name, title, 100, -50., 50.);
+
+      sprintf(name, "hCSC%iDistWithSegment", station + 1);
+      sprintf(title, "CSC Station %i Dist When There Is A Segment", station + 1);
+      hCSCDistWithSegment[i][station] = ibooker.book1D(name, title, 100, -70., 20.);
+
+      sprintf(name, "hCSC%iDistWithNoSegment", station + 1);
+      sprintf(title, "CSC Station %i Dist When There Is No Segment", station + 1);
+      hCSCDistWithNoSegment[i][station] = ibooker.book1D(name, title, 100, -70., 20.);
+
+      sprintf(name, "hCSC%iPullDistWithSegment", station + 1);
+      sprintf(title, "CSC Station %i Pull Dist When There Is A Segment", station + 1);
+      hCSCPullDistWithSegment[i][station] = ibooker.book1D(name, title, 100, -70., 20.);
+
+      sprintf(name, "hCSC%iPullDistWithNoSegment", station + 1);
+      sprintf(title, "CSC Station %i Pull Dist When There Is No Segment", station + 1);
+      hCSCPullDistWithNoSegment[i][station] = ibooker.book1D(name, title, 100, -70., 20.);
+    }  // station
+  }
+
+  if (make2DPlots_) {
+    ibooker.setCurrentFolder(baseFolder_);
+    hSegmentIsAssociatedRZ =
+        ibooker.book2D("hSegmentIsAssociatedRZ", "R-Z of Associated Segments", 2140, -1070., 1070., 850, 0., 850.);
+    hSegmentIsAssociatedXY =
+        ibooker.book2D("hSegmentIsAssociatedXY", "X-Y of Associated Segments", 1700, -850., 850., 1700, -850., 850.);
+    hSegmentIsNotAssociatedRZ = ibooker.book2D(
+        "hSegmentIsNotAssociatedRZ", "R-Z of Not Associated Segments", 2140, -1070., 1070., 850, 0., 850.);
+    hSegmentIsNotAssociatedXY = ibooker.book2D(
+        "hSegmentIsNotAssociatedXY", "X-Y of Not Associated Segments", 1700, -850., 850., 1700, -850., 850.);
+    hSegmentIsBestDrAssociatedRZ = ibooker.book2D("hSegmentIsBestDrAssociatedRZ",
+                                                  "R-Z of Best in Station by #DeltaR Associated Segments",
+                                                  2140,
+                                                  -1070.,
+                                                  1070.,
+                                                  850,
+                                                  0.,
+                                                  850.);
+    hSegmentIsBestDrAssociatedXY = ibooker.book2D("hSegmentIsBestDrAssociatedXY",
+                                                  "X-Y of Best in Station by #DeltaR Associated Segments",
+                                                  1700,
+                                                  -850.,
+                                                  850.,
+                                                  1700,
+                                                  -850.,
+                                                  850.);
+    hSegmentIsBestDrNotAssociatedRZ = ibooker.book2D("hSegmentIsBestDrNotAssociatedRZ",
+                                                     "R-Z of Best in Station by #DeltaR Not Associated Segments",
+                                                     2140,
+                                                     -1070.,
+                                                     1070.,
+                                                     850,
+                                                     0.,
+                                                     850.);
+    hSegmentIsBestDrNotAssociatedXY = ibooker.book2D("hSegmentIsBestDrNotAssociatedXY",
+                                                     "X-Y of Best in Station by #DeltaR Not Associated Segments",
+                                                     1700,
+                                                     -850.,
+                                                     850.,
+                                                     1700,
+                                                     -850.,
+                                                     850.);
+  }
+
+  if (useTrackerMuons_ && makeAllChamberPlots_) {
+    ibooker.setCurrentFolder(baseFolder_ + "/TrackerMuons");
+
+    // by chamber
+    for (int station = 0; station < 4; ++station) {
+      // DT wheels: -2 -> 2
+      for (int wheel = 0; wheel < 5; ++wheel) {
+        // DT sectors: 1 -> 14
+        for (int sector = 0; sector < 14; ++sector) {
+          sprintf(name, "hDTChamberDx_%i_%i_%i", station + 1, wheel - 2, sector + 1);
+          sprintf(title, "DT Chamber Delta X: Station %i Wheel %i Sector %i", station + 1, wheel - 2, sector + 1);
+          hDTChamberDx[station][wheel][sector] = ibooker.book1D(name, title, 100, -100., 100.);
+
+          if (station < 3) {
+            sprintf(name, "hDTChamberDy_%i_%i_%i", station + 1, wheel - 2, sector + 1);
+            sprintf(title, "DT Chamber Delta Y: Station %i Wheel %i Sector %i", station + 1, wheel - 2, sector + 1);
+            hDTChamberDy[station][wheel][sector] = ibooker.book1D(name, title, 100, -150., 150.);
+          }
+
+          sprintf(name, "hDTChamberEdgeXWithSegment_%i_%i_%i", station + 1, wheel - 2, sector + 1);
+          sprintf(title,
+                  "DT Chamber Edge X When There Is A Segment: Station %i Wheel "
+                  "%i Sector %i",
+                  station + 1,
+                  wheel - 2,
+                  sector + 1);
+          hDTChamberEdgeXWithSegment[station][wheel][sector] = ibooker.book1D(name, title, 100, -140., 30.);
+
+          sprintf(name, "hDTChamberEdgeXWithNoSegment_%i_%i_%i", station + 1, wheel - 2, sector + 1);
+          sprintf(title,
+                  "DT Chamber Edge X When There Is No Segment: Station %i "
+                  "Wheel %i Sector %i",
+                  station + 1,
+                  wheel - 2,
+                  sector + 1);
+          hDTChamberEdgeXWithNoSegment[station][wheel][sector] = ibooker.book1D(name, title, 100, -140., 30.);
+
+          sprintf(name, "hDTChamberEdgeYWithSegment_%i_%i_%i", station + 1, wheel - 2, sector + 1);
+          sprintf(title,
+                  "DT Chamber Edge Y When There Is A Segment: Station %i Wheel "
+                  "%i Sector %i",
+                  station + 1,
+                  wheel - 2,
+                  sector + 1);
+          hDTChamberEdgeYWithSegment[station][wheel][sector] = ibooker.book1D(name, title, 100, -140., 30.);
+
+          sprintf(name, "hDTChamberEdgeYWithNoSegment_%i_%i_%i", station + 1, wheel - 2, sector + 1);
+          sprintf(title,
+                  "DT Chamber Edge Y When There Is No Segment: Station %i "
+                  "Wheel %i Sector %i",
+                  station + 1,
+                  wheel - 2,
+                  sector + 1);
+          hDTChamberEdgeYWithNoSegment[station][wheel][sector] = ibooker.book1D(name, title, 100, -140., 30.);
+        }  // sector
+      }    // wheel
+
+      // CSC endcaps: 1 -> 2
+      for (int endcap = 0; endcap < 2; ++endcap) {
+        // CSC rings: 1 -> 4
+        for (int ring = 0; ring < 4; ++ring) {
+          // CSC chambers: 1 -> 36
+          for (int chamber = 0; chamber < 36; ++chamber) {
+            sprintf(name, "hCSCChamberDx_%i_%i_%i_%i", endcap + 1, station + 1, ring + 1, chamber + 1);
+            sprintf(title,
+                    "CSC Chamber Delta X: Endcap %i Station %i Ring %i Chamber %i",
+                    endcap + 1,
+                    station + 1,
+                    ring + 1,
+                    chamber + 1);
+            hCSCChamberDx[endcap][station][ring][chamber] = ibooker.book1D(name, title, 100, -50., 50.);
+
+            sprintf(name, "hCSCChamberDy_%i_%i_%i_%i", endcap + 1, station + 1, ring + 1, chamber + 1);
+            sprintf(title,
+                    "CSC Chamber Delta Y: Endcap %i Station %i Ring %i Chamber %i",
+                    endcap + 1,
+                    station + 1,
+                    ring + 1,
+                    chamber + 1);
+            hCSCChamberDy[endcap][station][ring][chamber] = ibooker.book1D(name, title, 100, -50., 50.);
+
+            sprintf(name, "hCSCChamberEdgeXWithSegment_%i_%i_%i_%i", endcap + 1, station + 1, ring + 1, chamber + 1);
+            sprintf(title,
+                    "CSC Chamber Edge X When There Is A Segment: Endcap %i "
+                    "Station %i Ring %i Chamber %i",
+                    endcap + 1,
+                    station + 1,
+                    ring + 1,
+                    chamber + 1);
+            hCSCChamberEdgeXWithSegment[endcap][station][ring][chamber] = ibooker.book1D(name, title, 100, -70., 20.);
+
+            sprintf(name, "hCSCChamberEdgeXWithNoSegment_%i_%i_%i_%i", endcap + 1, station + 1, ring + 1, chamber + 1);
+            sprintf(title,
+                    "CSC Chamber Edge X When There Is No Segment: Endcap %i "
+                    "Station %i Ring %i Chamber %i",
+                    endcap + 1,
+                    station + 1,
+                    ring + 1,
+                    chamber + 1);
+            hCSCChamberEdgeXWithNoSegment[endcap][station][ring][chamber] = ibooker.book1D(name, title, 100, -70., 20.);
+
+            sprintf(name, "hCSCChamberEdgeYWithSegment_%i_%i_%i_%i", endcap + 1, station + 1, ring + 1, chamber + 1);
+            sprintf(title,
+                    "CSC Chamber Edge Y When There Is A Segment: Endcap %i "
+                    "Station %i Ring %i Chamber %i",
+                    endcap + 1,
+                    station + 1,
+                    ring + 1,
+                    chamber + 1);
+            hCSCChamberEdgeYWithSegment[endcap][station][ring][chamber] = ibooker.book1D(name, title, 100, -70., 20.);
+
+            sprintf(name, "hCSCChamberEdgeYWithNoSegment_%i_%i_%i_%i", endcap + 1, station + 1, ring + 1, chamber + 1);
+            sprintf(title,
+                    "CSC Chamber Edge Y When There Is No Segment: Endcap %i "
+                    "Station %i Ring %i Chamber %i",
+                    endcap + 1,
+                    station + 1,
+                    ring + 1,
+                    chamber + 1);
+            hCSCChamberEdgeYWithNoSegment[endcap][station][ring][chamber] = ibooker.book1D(name, title, 100, -70., 20.);
+          }  // chamber
+        }    // ring
+      }      // endcap
+    }        // station
+  }
+}
 
-void MuonIdVal::bookHistograms(DQMStore::IBooker & ibooker, const edm::Run&, const edm::EventSetup&)
-{
-   char name[100], title[200];
-   ibooker.setCurrentFolder(baseFolder_) ;
-
-   // trackerMuon == 0; globalMuon == 1; trackerMuon && !globalMuon == 2; globalMuon && !trackerMuon == 3
-   for (unsigned int i = 0; i < 4; i++) {
-      if ((i == 0 && ! useTrackerMuons_) || (i == 1 && ! useGlobalMuons_)) continue;
-      if ((i == 2 && ! useTrackerMuonsNotGlobalMuons_) || (i == 3 && ! useGlobalMuonsNotTrackerMuons_)) continue;
-      if (i == 0) ibooker.setCurrentFolder(baseFolder_+"/TrackerMuons");
-      if (i == 1) ibooker.setCurrentFolder(baseFolder_+"/GlobalMuons");
-      if (i == 2) ibooker.setCurrentFolder(baseFolder_+"/TrackerMuonsNotGlobalMuons");
-      if (i == 3) ibooker.setCurrentFolder(baseFolder_+"/GlobalMuonsNotTrackerMuons");
-
-      if (makeEnergyPlots_) {
-         hEnergyEMBarrel[i] = ibooker.book1D("hEnergyEMBarrel", "Energy in ECAL Barrel", 100, -0.5, 2.);
-         hEnergyHABarrel[i] = ibooker.book1D("hEnergyHABarrel", "Energy in HCAL Barrel", 100, -4., 12.);
-         hEnergyHO[i] = ibooker.book1D("hEnergyHO", "Energy HO", 100, -2., 5.);
-         hEnergyEMEndcap[i] = ibooker.book1D("hEnergyEMEndcap", "Energy in ECAL Endcap", 100, -0.5, 2.);
-         hEnergyHAEndcap[i] = ibooker.book1D("hEnergyHAEndcap", "Energy in HCAL Endcap", 100, -4., 12.);
+void MuonIdVal::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  using namespace edm;
+  using namespace reco;
+
+  iEvent.getByToken(inputMuonCollectionToken_, muonCollectionH_);
+  iEvent.getByToken(inputDTRecSegment4DCollectionToken_, dtSegmentCollectionH_);
+  iEvent.getByToken(inputCSCSegmentCollectionToken_, cscSegmentCollectionH_);
+  iEvent.getByToken(inputMuonTimeExtraValueMapCombToken_, combinedMuonTimeExtraValueMapH_);
+  iEvent.getByToken(inputMuonTimeExtraValueMapCSCToken_, cscMuonTimeExtraValueMapH_);
+  iEvent.getByToken(inputMuonTimeExtraValueMapDTToken_, dtMuonTimeExtraValueMapH_);
+  iEvent.getByToken(inputMuonShowerInformationValueMapToken_, muonShowerInformationValueMapH_);
+  iEvent.getByToken(inputMuonCosmicCompatibilityValueMapToken_, muonCosmicCompatibilityValueMapH_);
+
+  iSetup.get<GlobalTrackingGeometryRecord>().get(geometry_);
+
+  unsigned int muonIdx = 0;
+  for (MuonCollection::const_iterator muon = muonCollectionH_->begin(); muon != muonCollectionH_->end(); ++muon) {
+    // trackerMuon == 0; globalMuon == 1; trackerMuon && !globalMuon == 2;
+    // globalMuon && !trackerMuon == 3
+    for (unsigned int i = 0; i < 4; i++) {
+      if (i == 0 && (!useTrackerMuons_ || !muon->isTrackerMuon()))
+        continue;
+      if (i == 1 && (!useGlobalMuons_ || !muon->isGlobalMuon()))
+        continue;
+      if (i == 2 && (!useTrackerMuonsNotGlobalMuons_ || (!(muon->isTrackerMuon() && !muon->isGlobalMuon()))))
+        continue;
+      if (i == 3 && (!useGlobalMuonsNotTrackerMuons_ || (!(muon->isGlobalMuon() && !muon->isTrackerMuon()))))
+        continue;
+
+      if (makeEnergyPlots_ && muon->isEnergyValid()) {
+        // EM
+        if (fabs(muon->eta()) > 1.479)
+          hEnergyEMEndcap[i]->Fill(muon->calEnergy().em);
+        else
+          hEnergyEMBarrel[i]->Fill(muon->calEnergy().em);
+        // HAD
+        if (fabs(muon->eta()) > 1.4)
+          hEnergyHAEndcap[i]->Fill(muon->calEnergy().had);
+        else
+          hEnergyHABarrel[i]->Fill(muon->calEnergy().had);
+        // HO
+        if (fabs(muon->eta()) < 1.26)
+          hEnergyHO[i]->Fill(muon->calEnergy().ho);
       }
 
       if (makeTimePlots_) {
-         hMuonTimeNDOF[i] = ibooker.book1D("hMuonTimeNDOF", "MuonTime NDOF", 52, -1.5, 50.5);
-         hMuonTimeTimeAtIpInOut[i] = ibooker.book1D("hMuonTimeTimeAtIpInOut", "MuonTime TimeAtIpInOut", 100, -20., 20.);
-         hMuonTimeTimeAtIpInOutErr[i] = ibooker.book1D("hMuonTimeTimeAtIpInOutErr", "MuonTime TimeAtIpInOutErr", 100, 0., 8.);
-         hMuonTimeTimeAtIpOutIn[i] = ibooker.book1D("hMuonTimeTimeAtIpOutIn", "MuonTime TimeAtIpOutIn", 100, -1., 75.);
-         hMuonTimeTimeAtIpOutInErr[i] = ibooker.book1D("hMuonTimeTimeAtIpOutInErr", "MuonTime TimeAtIpOutInErr", 100, 0., 8.);
-         hMuonTimeExtraCombinedNDOF[i] = ibooker.book1D("hMuonTimeExtraCombinedNDOF", "MuonTimeExtra Combined NDOF", 52, -1.5, 50.5);
-         hMuonTimeExtraCombinedTimeAtIpInOut[i] = ibooker.book1D("hMuonTimeExtraCombinedTimeAtIpInOut", "MuonTimeExtra Combined TimeAtIpInOut", 100, -20., 20.);
-         hMuonTimeExtraCombinedTimeAtIpInOutErr[i] = ibooker.book1D("hMuonTimeExtraCombinedTimeAtIpInOutErr", "MuonTimeExtra Combined TimeAtIpInOutErr", 100, 0., 8.);
-         hMuonTimeExtraCombinedTimeAtIpOutIn[i] = ibooker.book1D("hMuonTimeExtraCombinedTimeAtIpOutIn", "MuonTimeExtra Combined TimeAtIpOutIn", 100, -1., 75.);
-         hMuonTimeExtraCombinedTimeAtIpOutInErr[i] = ibooker.book1D("hMuonTimeExtraCombinedTimeAtIpOutInErr", "MuonTimeExtra Combined TimeAtIpOutInErr", 100, 0., 8.);
-         hMuonTimeExtraCSCNDOF[i] = ibooker.book1D("hMuonTimeExtraCSCNDOF", "MuonTimeExtra CSC NDOF", 52, -1.5, 50.5);
-         hMuonTimeExtraCSCTimeAtIpInOut[i] = ibooker.book1D("hMuonTimeExtraCSCTimeAtIpInOut", "MuonTimeExtra CSC TimeAtIpInOut", 100, -20., 20.);
-         hMuonTimeExtraCSCTimeAtIpInOutErr[i] = ibooker.book1D("hMuonTimeExtraCSCTimeAtIpInOutErr", "MuonTimeExtra CSC TimeAtIpInOutErr", 100, 0., 8.);
-         hMuonTimeExtraCSCTimeAtIpOutIn[i] = ibooker.book1D("hMuonTimeExtraCSCTimeAtIpOutIn", "MuonTimeExtra CSC TimeAtIpOutIn", 100, -1., 75.);
-         hMuonTimeExtraCSCTimeAtIpOutInErr[i] = ibooker.book1D("hMuonTimeExtraCSCTimeAtIpOutInErr", "MuonTimeExtra CSC TimeAtIpOutInErr", 100, 0., 8.);
-         hMuonTimeExtraDTNDOF[i] = ibooker.book1D("hMuonTimeExtraDTNDOF", "MuonTimeExtra DT NDOF", 52, -1.5, 50.5);
-         hMuonTimeExtraDTTimeAtIpInOut[i] = ibooker.book1D("hMuonTimeExtraDTTimeAtIpInOut", "MuonTimeExtra DT TimeAtIpInOut", 100, -20., 20.);
-         hMuonTimeExtraDTTimeAtIpInOutErr[i] = ibooker.book1D("hMuonTimeExtraDTTimeAtIpInOutErr", "MuonTimeExtra DT TimeAtIpInOutErr", 100, 0., 8.);
-         hMuonTimeExtraDTTimeAtIpOutIn[i] = ibooker.book1D("hMuonTimeExtraDTTimeAtIpOutIn", "MuonTimeExtra DT TimeAtIpOutIn", 100, -1., 75.);
-         hMuonTimeExtraDTTimeAtIpOutInErr[i] = ibooker.book1D("hMuonTimeExtraDTTimeAtIpOutInErr", "MuonTimeExtra DT TimeAtIpOutInErr", 100, 0., 8.);
+        if (muon->isTimeValid()) {
+          hMuonTimeNDOF[i]->Fill(muon->time().nDof);
+          hMuonTimeTimeAtIpInOut[i]->Fill(muon->time().timeAtIpInOut);
+          hMuonTimeTimeAtIpInOutErr[i]->Fill(muon->time().timeAtIpInOutErr);
+          hMuonTimeTimeAtIpOutIn[i]->Fill(muon->time().timeAtIpOutIn);
+          hMuonTimeTimeAtIpOutInErr[i]->Fill(muon->time().timeAtIpOutInErr);
+        }
+
+        MuonRef muonRef(muonCollectionH_, muonIdx);
+        MuonTimeExtra combinedMuonTimeExtra = (*combinedMuonTimeExtraValueMapH_)[muonRef];
+        MuonTimeExtra cscMuonTimeExtra = (*cscMuonTimeExtraValueMapH_)[muonRef];
+        MuonTimeExtra dtMuonTimeExtra = (*dtMuonTimeExtraValueMapH_)[muonRef];
+
+        hMuonTimeExtraCombinedNDOF[i]->Fill(combinedMuonTimeExtra.nDof());
+        hMuonTimeExtraCombinedTimeAtIpInOut[i]->Fill(combinedMuonTimeExtra.timeAtIpInOut());
+        hMuonTimeExtraCombinedTimeAtIpInOutErr[i]->Fill(combinedMuonTimeExtra.timeAtIpInOutErr());
+        hMuonTimeExtraCombinedTimeAtIpOutIn[i]->Fill(combinedMuonTimeExtra.timeAtIpOutIn());
+        hMuonTimeExtraCombinedTimeAtIpOutInErr[i]->Fill(combinedMuonTimeExtra.timeAtIpOutInErr());
+        hMuonTimeExtraCSCNDOF[i]->Fill(cscMuonTimeExtra.nDof());
+        hMuonTimeExtraCSCTimeAtIpInOut[i]->Fill(cscMuonTimeExtra.timeAtIpInOut());
+        hMuonTimeExtraCSCTimeAtIpInOutErr[i]->Fill(cscMuonTimeExtra.timeAtIpInOutErr());
+        hMuonTimeExtraCSCTimeAtIpOutIn[i]->Fill(cscMuonTimeExtra.timeAtIpOutIn());
+        hMuonTimeExtraCSCTimeAtIpOutInErr[i]->Fill(cscMuonTimeExtra.timeAtIpOutInErr());
+        hMuonTimeExtraDTNDOF[i]->Fill(dtMuonTimeExtra.nDof());
+        hMuonTimeExtraDTTimeAtIpInOut[i]->Fill(dtMuonTimeExtra.timeAtIpInOut());
+        hMuonTimeExtraDTTimeAtIpInOutErr[i]->Fill(dtMuonTimeExtra.timeAtIpInOutErr());
+        hMuonTimeExtraDTTimeAtIpOutIn[i]->Fill(dtMuonTimeExtra.timeAtIpOutIn());
+        hMuonTimeExtraDTTimeAtIpOutInErr[i]->Fill(dtMuonTimeExtra.timeAtIpOutInErr());
       }
 
-      hCaloCompat[i] = ibooker.book1D("hCaloCompat", "Calo Compatibility", 101, -0.05, 1.05);
-      hSegmentCompat[i] = ibooker.book1D("hSegmentCompat", "Segment Compatibility", 101, -0.05, 1.05);
-      if (make2DPlots_)
-         hCaloSegmentCompat[i] = ibooker.book2D("hCaloSegmentCompat", "Calo Compatibility vs. Segment Compatibility", 101, -0.05, 1.05, 101, -0.05, 1.05);
-      hMuonQualityTrkRelChi2[i] = ibooker.book1D("hMuonQualityTrkRelChi2", "MuonQuality TrkRelChi2", 100, 0., 1.5);
-      hMuonQualityStaRelChi2[i] = ibooker.book1D("hMuonQualityStaRelChi2", "MuonQuality StaRelChi2", 100, 0., 3.);
-      hMuonQualityTrkKink[i] = ibooker.book1D("hMuonQualityTrkKink", "MuonQuality TrkKink", 100, 0., 150.);
-      hGlobalMuonPromptTightBool[i] = ibooker.book1D("hGlobalMuonPromptTightBool", "GlobalMuonPromptTight Boolean", 2, -0.5, 1.5);
-      hTMLastStationLooseBool[i] = ibooker.book1D("hTMLastStationLooseBool", "TMLastStationLoose Boolean", 2, -0.5, 1.5);
-      hTMLastStationTightBool[i] = ibooker.book1D("hTMLastStationTightBool", "TMLastStationTight Boolean", 2, -0.5, 1.5);
-      hTM2DCompatibilityLooseBool[i] = ibooker.book1D("hTM2DCompatibilityLooseBool", "TM2DCompatibilityLoose Boolean", 2, -0.5, 1.5);
-      hTM2DCompatibilityTightBool[i] = ibooker.book1D("hTM2DCompatibilityTightBool", "TM2DCompatibilityTight Boolean", 2, -0.5, 1.5);
-      hTMOneStationLooseBool[i] = ibooker.book1D("hTMOneStationLooseBool", "TMOneStationLoose Boolean", 2, -0.5, 1.5);
-      hTMOneStationTightBool[i] = ibooker.book1D("hTMOneStationTightBool", "TMOneStationTight Boolean", 2, -0.5, 1.5);
-      hTMLastStationOptimizedLowPtLooseBool[i] = ibooker.book1D("hTMLastStationOptimizedLowPtLooseBool", "TMLastStationOptimizedLowPtLoose Boolean", 2, -0.5, 1.5);
-      hTMLastStationOptimizedLowPtTightBool[i] = ibooker.book1D("hTMLastStationOptimizedLowPtTightBool", "TMLastStationOptimizedLowPtTight Boolean", 2, -0.5, 1.5);
-      hGMTkChiCompatibilityBool[i] = ibooker.book1D("hGMTkChiCompatibilityBool", "GMTkChiCompatibility Boolean", 2, -0.5, 1.5);
-      hGMStaChiCompatibilityBool[i] = ibooker.book1D("hGMStaChiCompatibilityBool", "GMStaChiCompatibility Boolean", 2, -0.5, 1.5);
-      hGMTkKinkTightBool[i] = ibooker.book1D("hGMTkKinkTightBool", "GMTkKinkTight Boolean", 2, -0.5, 1.5);
-      hTMLastStationAngLooseBool[i] = ibooker.book1D("hTMLastStationAngLooseBool", "TMLastStationAngLoose Boolean", 2, -0.5, 1.5);
-      hTMLastStationAngTightBool[i] = ibooker.book1D("hTMLastStationAngTightBool", "TMLastStationAngTight Boolean", 2, -0.5, 1.5);
-      hTMOneStationAngLooseBool[i] = ibooker.book1D("hTMOneStationAngLooseBool", "TMOneStationAngLoose Boolean", 2, -0.5, 1.5);
-      hTMOneStationAngTightBool[i] = ibooker.book1D("hTMOneStationAngTightBool", "TMOneStationAngTight Boolean", 2, -0.5, 1.5);
-      hTMLastStationOptimizedBarrelLowPtLooseBool[i] = ibooker.book1D("hTMLastStationOptimizedBarrelLowPtLooseBool", "TMLastStationOptimizedBarrelLowPtLoose Boolean", 2, -0.5, 1.5);
-      hTMLastStationOptimizedBarrelLowPtTightBool[i] = ibooker.book1D("hTMLastStationOptimizedBarrelLowPtTightBool", "TMLastStationOptimizedBarrelLowPtTight Boolean", 2, -0.5, 1.5);
+      if (muon->isCaloCompatibilityValid())
+        hCaloCompat[i]->Fill(muon->caloCompatibility());
+      hSegmentCompat[i]->Fill(muon::segmentCompatibility(*muon));
+      if (make2DPlots_ && muon->isCaloCompatibilityValid())
+        hCaloSegmentCompat[i]->Fill(muon->caloCompatibility(), muon::segmentCompatibility(*muon));
+      if (muon->isQualityValid()) {
+        hMuonQualityTrkRelChi2[i]->Fill(muon->combinedQuality().trkRelChi2);
+        hMuonQualityStaRelChi2[i]->Fill(muon->combinedQuality().staRelChi2);
+        hMuonQualityTrkKink[i]->Fill(muon->combinedQuality().trkKink);
+      }
+      hGlobalMuonPromptTightBool[i]->Fill(muon::isGoodMuon(*muon, muon::GlobalMuonPromptTight));
+      hTMLastStationLooseBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMLastStationLoose));
+      hTMLastStationTightBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMLastStationTight));
+      hTM2DCompatibilityLooseBool[i]->Fill(muon::isGoodMuon(*muon, muon::TM2DCompatibilityLoose));
+      hTM2DCompatibilityTightBool[i]->Fill(muon::isGoodMuon(*muon, muon::TM2DCompatibilityTight));
+      hTMOneStationLooseBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMOneStationLoose));
+      hTMOneStationTightBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMOneStationTight));
+      hTMLastStationOptimizedLowPtLooseBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMLastStationOptimizedLowPtLoose));
+      hTMLastStationOptimizedLowPtTightBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMLastStationOptimizedLowPtTight));
+      hGMTkChiCompatibilityBool[i]->Fill(muon::isGoodMuon(*muon, muon::GMTkChiCompatibility));
+      hGMStaChiCompatibilityBool[i]->Fill(muon::isGoodMuon(*muon, muon::GMStaChiCompatibility));
+      hGMTkKinkTightBool[i]->Fill(muon::isGoodMuon(*muon, muon::GMTkKinkTight));
+      hTMLastStationAngLooseBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMLastStationAngLoose));
+      hTMLastStationAngTightBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMLastStationAngTight));
+      hTMOneStationAngLooseBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMOneStationAngLoose));
+      hTMOneStationAngTightBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMOneStationAngTight));
+      hTMLastStationOptimizedBarrelLowPtLooseBool[i]->Fill(
+          muon::isGoodMuon(*muon, muon::TMLastStationOptimizedBarrelLowPtLoose));
+      hTMLastStationOptimizedBarrelLowPtTightBool[i]->Fill(
+          muon::isGoodMuon(*muon, muon::TMLastStationOptimizedBarrelLowPtTight));
 
       if (makeCosmicCompatibilityPlots_) {
-	hCombinedCosmicCompat[i] = ibooker.book1D("hCombinedCosmicCompat", "hCombinedCosmicCompatibility float", 40, 0., 10.);
-	hTimeCosmicCompat[i] = ibooker.book1D("hTimeCosmicCompat", "hTimeCosmicCompatibility float", 6, 0., 3.);
-	hB2BCosmicCompat[i] = ibooker.book1D("hB2BCosmicCompat", "Number of back-to-back partners", 10, 0, 10);
-	hOverlapCosmicCompat[i] = ibooker.book1D("hOverlapCosmicCompat", "Overlap between muons and 1Leg", 2, 0, 2);
+        MuonRef muonRef(muonCollectionH_, muonIdx);
+        MuonCosmicCompatibility muonCosmicCompatibility = (*muonCosmicCompatibilityValueMapH_)[muonRef];
+        hCombinedCosmicCompat[i]->Fill(muonCosmicCompatibility.cosmicCompatibility);
+        hTimeCosmicCompat[i]->Fill(muonCosmicCompatibility.timeCompatibility);
+        hB2BCosmicCompat[i]->Fill(muonCosmicCompatibility.backToBackCompatibility);
+        hOverlapCosmicCompat[i]->Fill(muonCosmicCompatibility.overlapCompatibility);
       }
 
       // by station
-      for(int station = 0; station < 4; ++station)
-      {
-
-         if (makeShowerInformationPlots_) {
-             sprintf(name, "hMuonShowerSizeT%i", station+1);
-             sprintf(title, "Station %i Transverse Cluster Size", station+1);
-             hMuonShowerSizeT[i][station] = ibooker.book1D(name, title,1000,0,500);
-             sprintf(name, "hMuonShowerDeltaR%i", station+1);
-             sprintf(title, "Station %i DeltaR", station+1);
-             hMuonShowerDeltaR[i][station] = ibooker.book1D(name, title,5000,0,0.5);
-             sprintf(name, "hMuonAllHits%i", station+1);
-             sprintf(title, "Station %i Number of 1D DT or 2D CSC RecHits", station+1);
-             hMuonAllHits[i][station] = ibooker.book1D(name, title,400,0,400);
-             sprintf(name, "hMuonHitsFromSegments%i", station+1);
-             sprintf(title, "Station %i Hits used by 4D DT or 3D CSC Segments", station+1);
-             hMuonHitsFromSegments[i][station] = ibooker.book1D(name, title,400,0,400);
-             sprintf(name, "hMuonUncorrelatedHits%i", station+1);
-             sprintf(title, "Station %i Uncorrelated Hits", station+1);
-             hMuonUncorrelatedHits[i][station] = ibooker.book1D(name, title,400,0,400);
-         }
-
-         sprintf(name, "hDT%iPullxPropErr", station+1);
-         sprintf(title, "DT Station %i Pull X w/ Propagation Error Only", station+1);
-         hDTPullxPropErr[i][station] = ibooker.book1D(name, title, 100, -20., 20.);
-
-         sprintf(name, "hDT%iPulldXdZPropErr", station+1);
-         sprintf(title, "DT Station %i Pull DxDz w/ Propagation Error Only", station+1);
-         hDTPulldXdZPropErr[i][station] = ibooker.book1D(name, title, 100, -20., 20.);
-
-         if (station < 3) {
-            sprintf(name, "hDT%iPullyPropErr", station+1);
-            sprintf(title, "DT Station %i Pull Y w/ Propagation Error Only", station+1);
-            hDTPullyPropErr[i][station] = ibooker.book1D(name, title, 100, -20., 20.);
-
-            sprintf(name, "hDT%iPulldYdZPropErr", station+1);
-            sprintf(title, "DT Station %i Pull DyDz w/ Propagation Error Only", station+1);
-            hDTPulldYdZPropErr[i][station] = ibooker.book1D(name, title, 100, -20., 20.);
-         }
-
-         sprintf(name, "hDT%iDistWithSegment", station+1);
-         sprintf(title, "DT Station %i Dist When There Is A Segment", station+1);
-         hDTDistWithSegment[i][station] = ibooker.book1D(name, title, 100, -140., 30.);
-
-         sprintf(name, "hDT%iDistWithNoSegment", station+1);
-         sprintf(title, "DT Station %i Dist When There Is No Segment", station+1);
-         hDTDistWithNoSegment[i][station] = ibooker.book1D(name, title, 100, -140., 30.);
-
-         sprintf(name, "hDT%iPullDistWithSegment", station+1);
-         sprintf(title, "DT Station %i Pull Dist When There Is A Segment", station+1);
-         hDTPullDistWithSegment[i][station] = ibooker.book1D(name, title, 100, -140., 30.);
-
-         sprintf(name, "hDT%iPullDistWithNoSegment", station+1);
-         sprintf(title, "DT Station %i Pull Dist When There Is No Segment", station+1);
-         hDTPullDistWithNoSegment[i][station] = ibooker.book1D(name, title, 100, -140., 30.);
-
-         sprintf(name, "hCSC%iPullxPropErr", station+1);
-         sprintf(title, "CSC Station %i Pull X w/ Propagation Error Only", station+1);
-         hCSCPullxPropErr[i][station] = ibooker.book1D(name, title, 100, -20., 20.);
-
-         sprintf(name, "hCSC%iPulldXdZPropErr", station+1);
-         sprintf(title, "CSC Station %i Pull DxDz w/ Propagation Error Only", station+1);
-         hCSCPulldXdZPropErr[i][station] = ibooker.book1D(name, title, 100, -20., 20.);
-
-         sprintf(name, "hCSC%iPullyPropErr", station+1);
-         sprintf(title, "CSC Station %i Pull Y w/ Propagation Error Only", station+1);
-         hCSCPullyPropErr[i][station] = ibooker.book1D(name, title, 100, -20., 20.);
-
-         sprintf(name, "hCSC%iPulldYdZPropErr", station+1);
-         sprintf(title, "CSC Station %i Pull DyDz w/ Propagation Error Only", station+1);
-         hCSCPulldYdZPropErr[i][station] = ibooker.book1D(name, title, 100, -50., 50.);
-
-         sprintf(name, "hCSC%iDistWithSegment", station+1);
-         sprintf(title, "CSC Station %i Dist When There Is A Segment", station+1);
-         hCSCDistWithSegment[i][station] = ibooker.book1D(name, title, 100, -70., 20.);
-
-         sprintf(name, "hCSC%iDistWithNoSegment", station+1);
-         sprintf(title, "CSC Station %i Dist When There Is No Segment", station+1);
-         hCSCDistWithNoSegment[i][station] = ibooker.book1D(name, title, 100, -70., 20.);
-
-         sprintf(name, "hCSC%iPullDistWithSegment", station+1);
-         sprintf(title, "CSC Station %i Pull Dist When There Is A Segment", station+1);
-         hCSCPullDistWithSegment[i][station] = ibooker.book1D(name, title, 100, -70., 20.);
-
-         sprintf(name, "hCSC%iPullDistWithNoSegment", station+1);
-         sprintf(title, "CSC Station %i Pull Dist When There Is No Segment", station+1);
-         hCSCPullDistWithNoSegment[i][station] = ibooker.book1D(name, title, 100, -70., 20.);
-      }// station
-   }
-
-   if (make2DPlots_) {
-      ibooker.setCurrentFolder(baseFolder_);
-      hSegmentIsAssociatedRZ = ibooker.book2D("hSegmentIsAssociatedRZ", "R-Z of Associated Segments", 2140, -1070., 1070., 850, 0., 850.);
-      hSegmentIsAssociatedXY = ibooker.book2D("hSegmentIsAssociatedXY", "X-Y of Associated Segments", 1700, -850., 850., 1700, -850., 850.);
-      hSegmentIsNotAssociatedRZ = ibooker.book2D("hSegmentIsNotAssociatedRZ", "R-Z of Not Associated Segments", 2140, -1070., 1070., 850, 0., 850.);
-      hSegmentIsNotAssociatedXY = ibooker.book2D("hSegmentIsNotAssociatedXY", "X-Y of Not Associated Segments", 1700, -850., 850., 1700, -850., 850.);
-      hSegmentIsBestDrAssociatedRZ = ibooker.book2D("hSegmentIsBestDrAssociatedRZ", "R-Z of Best in Station by #DeltaR Associated Segments", 2140, -1070., 1070., 850, 0., 850.);
-      hSegmentIsBestDrAssociatedXY = ibooker.book2D("hSegmentIsBestDrAssociatedXY", "X-Y of Best in Station by #DeltaR Associated Segments", 1700, -850., 850., 1700, -850., 850.);
-      hSegmentIsBestDrNotAssociatedRZ = ibooker.book2D("hSegmentIsBestDrNotAssociatedRZ", "R-Z of Best in Station by #DeltaR Not Associated Segments", 2140, -1070., 1070., 850, 0., 850.);
-      hSegmentIsBestDrNotAssociatedXY = ibooker.book2D("hSegmentIsBestDrNotAssociatedXY", "X-Y of Best in Station by #DeltaR Not Associated Segments", 1700, -850., 850., 1700, -850., 850.);
-   }
-
-   if (useTrackerMuons_ && makeAllChamberPlots_) {
-      ibooker.setCurrentFolder(baseFolder_+"/TrackerMuons");
-
+      for (int station = 0; station < 4; ++station) {
+        if (makeShowerInformationPlots_) {
+          MuonRef muonRef(muonCollectionH_, muonIdx);
+          MuonShower muonShowerInformation = (*muonShowerInformationValueMapH_)[muonRef];
+
+          hMuonShowerSizeT[i][station]->Fill((muonShowerInformation.stationShowerSizeT).at(station));
+          hMuonShowerDeltaR[i][station]->Fill((muonShowerInformation.stationShowerDeltaR.at(station)));
+          hMuonAllHits[i][station]->Fill((muonShowerInformation.nStationHits.at(station)));
+          hMuonHitsFromSegments[i][station]->Fill((muonShowerInformation.nStationCorrelatedHits.at(station)));
+          hMuonUncorrelatedHits[i][station]->Fill((muonShowerInformation.nStationHits.at(station)) -
+                                                  muonShowerInformation.nStationCorrelatedHits.at(station));
+        }
+
+        Fill(hDTPullxPropErr[i][station],
+             muon->pullX(station + 1, MuonSubdetId::DT, Muon::SegmentAndTrackArbitration, false));
+        Fill(hDTPulldXdZPropErr[i][station],
+             muon->pullDxDz(station + 1, MuonSubdetId::DT, Muon::SegmentAndTrackArbitration, false));
+
+        if (station < 3) {
+          Fill(hDTPullyPropErr[i][station],
+               muon->pullY(station + 1, MuonSubdetId::DT, Muon::SegmentAndTrackArbitration, false));
+          Fill(hDTPulldYdZPropErr[i][station],
+               muon->pullDyDz(station + 1, MuonSubdetId::DT, Muon::SegmentAndTrackArbitration, false));
+        }
+
+        float distance = muon->trackDist(station + 1, MuonSubdetId::DT);
+        float error = muon->trackDistErr(station + 1, MuonSubdetId::DT);
+        if (error == 0)
+          error = 0.000001;
+
+        if (muon->numberOfSegments(station + 1, MuonSubdetId::DT, Muon::NoArbitration) > 0) {
+          Fill(hDTDistWithSegment[i][station], distance);
+          Fill(hDTPullDistWithSegment[i][station], distance / error);
+        } else {
+          Fill(hDTDistWithNoSegment[i][station], distance);
+          Fill(hDTPullDistWithNoSegment[i][station], distance / error);
+        }
+
+        Fill(hCSCPullxPropErr[i][station],
+             muon->pullX(station + 1, MuonSubdetId::CSC, Muon::SegmentAndTrackArbitration, false));
+        Fill(hCSCPulldXdZPropErr[i][station],
+             muon->pullDxDz(station + 1, MuonSubdetId::CSC, Muon::SegmentAndTrackArbitration, false));
+        Fill(hCSCPullyPropErr[i][station],
+             muon->pullY(station + 1, MuonSubdetId::CSC, Muon::SegmentAndTrackArbitration, false));
+        Fill(hCSCPulldYdZPropErr[i][station],
+             muon->pullDyDz(station + 1, MuonSubdetId::CSC, Muon::SegmentAndTrackArbitration, false));
+
+        distance = muon->trackDist(station + 1, MuonSubdetId::CSC);
+        error = muon->trackDistErr(station + 1, MuonSubdetId::CSC);
+        if (error == 0)
+          error = 0.000001;
+
+        if (muon->numberOfSegments(station + 1, MuonSubdetId::CSC, Muon::NoArbitration) > 0) {
+          Fill(hCSCDistWithSegment[i][station], distance);
+          Fill(hCSCPullDistWithSegment[i][station], distance / error);
+        } else {
+          Fill(hCSCDistWithNoSegment[i][station], distance);
+          Fill(hCSCPullDistWithNoSegment[i][station], distance / error);
+        }
+      }  // station
+    }
+
+    if (!useTrackerMuons_ || !muon->isTrackerMuon())
+      continue;
+    if (makeAllChamberPlots_) {
       // by chamber
-      for(int station = 0; station < 4; ++station) {
-         // DT wheels: -2 -> 2
-         for(int wheel = 0; wheel < 5; ++wheel) {
-            // DT sectors: 1 -> 14
-            for(int sector = 0; sector < 14; ++sector)
-            {
-               sprintf(name, "hDTChamberDx_%i_%i_%i", station+1, wheel-2, sector+1);
-               sprintf(title, "DT Chamber Delta X: Station %i Wheel %i Sector %i", station+1, wheel-2, sector+1);
-               hDTChamberDx[station][wheel][sector] = ibooker.book1D(name, title, 100, -100., 100.);
-
-               if (station < 3) {
-                  sprintf(name, "hDTChamberDy_%i_%i_%i", station+1, wheel-2, sector+1);
-                  sprintf(title, "DT Chamber Delta Y: Station %i Wheel %i Sector %i", station+1, wheel-2, sector+1);
-                  hDTChamberDy[station][wheel][sector] = ibooker.book1D(name, title, 100, -150., 150.);
-               }
-
-               sprintf(name, "hDTChamberEdgeXWithSegment_%i_%i_%i", station+1, wheel-2, sector+1);
-               sprintf(title, "DT Chamber Edge X When There Is A Segment: Station %i Wheel %i Sector %i", station+1, wheel-2, sector+1);
-               hDTChamberEdgeXWithSegment[station][wheel][sector] = ibooker.book1D(name, title, 100, -140., 30.);
-
-               sprintf(name, "hDTChamberEdgeXWithNoSegment_%i_%i_%i", station+1, wheel-2, sector+1);
-               sprintf(title, "DT Chamber Edge X When There Is No Segment: Station %i Wheel %i Sector %i", station+1, wheel-2, sector+1);
-               hDTChamberEdgeXWithNoSegment[station][wheel][sector] = ibooker.book1D(name, title, 100, -140., 30.);
-
-               sprintf(name, "hDTChamberEdgeYWithSegment_%i_%i_%i", station+1, wheel-2, sector+1);
-               sprintf(title, "DT Chamber Edge Y When There Is A Segment: Station %i Wheel %i Sector %i", station+1, wheel-2, sector+1);
-               hDTChamberEdgeYWithSegment[station][wheel][sector] = ibooker.book1D(name, title, 100, -140., 30.);
-
-               sprintf(name, "hDTChamberEdgeYWithNoSegment_%i_%i_%i", station+1, wheel-2, sector+1);
-               sprintf(title, "DT Chamber Edge Y When There Is No Segment: Station %i Wheel %i Sector %i", station+1, wheel-2, sector+1);
-               hDTChamberEdgeYWithNoSegment[station][wheel][sector] = ibooker.book1D(name, title, 100, -140., 30.);
-            }// sector
-         }// wheel
-
-         // CSC endcaps: 1 -> 2
-         for(int endcap = 0; endcap < 2; ++endcap) {
-            // CSC rings: 1 -> 4
-            for(int ring = 0; ring < 4; ++ring) {
-               // CSC chambers: 1 -> 36
-               for(int chamber = 0; chamber < 36; ++chamber)
-               {
-                  sprintf(name, "hCSCChamberDx_%i_%i_%i_%i", endcap+1, station+1, ring+1, chamber+1);
-                  sprintf(title, "CSC Chamber Delta X: Endcap %i Station %i Ring %i Chamber %i", endcap+1, station+1, ring+1, chamber+1);
-                  hCSCChamberDx[endcap][station][ring][chamber] = ibooker.book1D(name, title, 100, -50., 50.);
-
-                  sprintf(name, "hCSCChamberDy_%i_%i_%i_%i", endcap+1, station+1, ring+1, chamber+1);
-                  sprintf(title, "CSC Chamber Delta Y: Endcap %i Station %i Ring %i Chamber %i", endcap+1, station+1, ring+1, chamber+1);
-                  hCSCChamberDy[endcap][station][ring][chamber] = ibooker.book1D(name, title, 100, -50., 50.);
-
-                  sprintf(name, "hCSCChamberEdgeXWithSegment_%i_%i_%i_%i", endcap+1, station+1, ring+1, chamber+1);
-                  sprintf(title, "CSC Chamber Edge X When There Is A Segment: Endcap %i Station %i Ring %i Chamber %i", endcap+1, station+1, ring+1, chamber+1);
-                  hCSCChamberEdgeXWithSegment[endcap][station][ring][chamber] = ibooker.book1D(name, title, 100, -70., 20.);
-
-                  sprintf(name, "hCSCChamberEdgeXWithNoSegment_%i_%i_%i_%i", endcap+1, station+1, ring+1, chamber+1);
-                  sprintf(title, "CSC Chamber Edge X When There Is No Segment: Endcap %i Station %i Ring %i Chamber %i", endcap+1, station+1, ring+1, chamber+1);
-                  hCSCChamberEdgeXWithNoSegment[endcap][station][ring][chamber] = ibooker.book1D(name, title, 100, -70., 20.);
-
-                  sprintf(name, "hCSCChamberEdgeYWithSegment_%i_%i_%i_%i", endcap+1, station+1, ring+1, chamber+1);
-                  sprintf(title, "CSC Chamber Edge Y When There Is A Segment: Endcap %i Station %i Ring %i Chamber %i", endcap+1, station+1, ring+1, chamber+1);
-                  hCSCChamberEdgeYWithSegment[endcap][station][ring][chamber] = ibooker.book1D(name, title, 100, -70., 20.);
-
-                  sprintf(name, "hCSCChamberEdgeYWithNoSegment_%i_%i_%i_%i", endcap+1, station+1, ring+1, chamber+1);
-                  sprintf(title, "CSC Chamber Edge Y When There Is No Segment: Endcap %i Station %i Ring %i Chamber %i", endcap+1, station+1, ring+1, chamber+1);
-                  hCSCChamberEdgeYWithNoSegment[endcap][station][ring][chamber] = ibooker.book1D(name, title, 100, -70., 20.);
-               }// chamber
-            }// ring
-         }// endcap
-      }// station
-   }
-}
-
-void
-MuonIdVal::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-   using namespace edm;
-   using namespace reco;
-
-   iEvent.getByToken(inputMuonCollectionToken_, muonCollectionH_);
-   iEvent.getByToken(inputDTRecSegment4DCollectionToken_, dtSegmentCollectionH_);
-   iEvent.getByToken(inputCSCSegmentCollectionToken_, cscSegmentCollectionH_);
-   iEvent.getByToken(inputMuonTimeExtraValueMapCombToken_, combinedMuonTimeExtraValueMapH_);
-   iEvent.getByToken(inputMuonTimeExtraValueMapCSCToken_, cscMuonTimeExtraValueMapH_);
-   iEvent.getByToken(inputMuonTimeExtraValueMapDTToken_, dtMuonTimeExtraValueMapH_);
-   iEvent.getByToken(inputMuonShowerInformationValueMapToken_, muonShowerInformationValueMapH_);
-   iEvent.getByToken(inputMuonCosmicCompatibilityValueMapToken_, muonCosmicCompatibilityValueMapH_);
-  
-   iSetup.get<GlobalTrackingGeometryRecord>().get(geometry_);
-
-   unsigned int muonIdx = 0;
-   for(MuonCollection::const_iterator muon = muonCollectionH_->begin();
-         muon != muonCollectionH_->end(); ++muon)
-   {
-      // trackerMuon == 0; globalMuon == 1; trackerMuon && !globalMuon == 2; globalMuon && !trackerMuon == 3
-      for (unsigned int i = 0; i < 4; i++) {
-         if (i == 0 && (! useTrackerMuons_ || ! muon->isTrackerMuon())) continue;
-         if (i == 1 && (! useGlobalMuons_ || ! muon->isGlobalMuon())) continue;
-         if (i == 2 && (! useTrackerMuonsNotGlobalMuons_ || (! (muon->isTrackerMuon() && ! muon->isGlobalMuon())))) continue;
-         if (i == 3 && (! useGlobalMuonsNotTrackerMuons_ || (! (muon->isGlobalMuon() && ! muon->isTrackerMuon())))) continue;
-
-         if (makeEnergyPlots_ && muon->isEnergyValid()) {
-            // EM
-            if (fabs(muon->eta()) > 1.479)
-               hEnergyEMEndcap[i]->Fill(muon->calEnergy().em); 
-            else
-               hEnergyEMBarrel[i]->Fill(muon->calEnergy().em);
-            // HAD
-            if (fabs(muon->eta()) > 1.4)
-               hEnergyHAEndcap[i]->Fill(muon->calEnergy().had);
-            else
-               hEnergyHABarrel[i]->Fill(muon->calEnergy().had);
-            // HO
-            if (fabs(muon->eta()) < 1.26)
-               hEnergyHO[i]->Fill(muon->calEnergy().ho);
-         }
-
-         if (makeTimePlots_) {
-            if (muon->isTimeValid()) {
-               hMuonTimeNDOF[i]->Fill(muon->time().nDof);
-               hMuonTimeTimeAtIpInOut[i]->Fill(muon->time().timeAtIpInOut);
-               hMuonTimeTimeAtIpInOutErr[i]->Fill(muon->time().timeAtIpInOutErr);
-               hMuonTimeTimeAtIpOutIn[i]->Fill(muon->time().timeAtIpOutIn);
-               hMuonTimeTimeAtIpOutInErr[i]->Fill(muon->time().timeAtIpOutInErr);
-            }
-
-            MuonRef muonRef(muonCollectionH_, muonIdx);
-            MuonTimeExtra combinedMuonTimeExtra = (*combinedMuonTimeExtraValueMapH_)[muonRef];
-            MuonTimeExtra cscMuonTimeExtra = (*cscMuonTimeExtraValueMapH_)[muonRef];
-            MuonTimeExtra dtMuonTimeExtra = (*dtMuonTimeExtraValueMapH_)[muonRef];
-
-            hMuonTimeExtraCombinedNDOF[i]->Fill(combinedMuonTimeExtra.nDof());
-            hMuonTimeExtraCombinedTimeAtIpInOut[i]->Fill(combinedMuonTimeExtra.timeAtIpInOut());
-            hMuonTimeExtraCombinedTimeAtIpInOutErr[i]->Fill(combinedMuonTimeExtra.timeAtIpInOutErr());
-            hMuonTimeExtraCombinedTimeAtIpOutIn[i]->Fill(combinedMuonTimeExtra.timeAtIpOutIn());
-            hMuonTimeExtraCombinedTimeAtIpOutInErr[i]->Fill(combinedMuonTimeExtra.timeAtIpOutInErr());
-            hMuonTimeExtraCSCNDOF[i]->Fill(cscMuonTimeExtra.nDof());
-            hMuonTimeExtraCSCTimeAtIpInOut[i]->Fill(cscMuonTimeExtra.timeAtIpInOut());
-            hMuonTimeExtraCSCTimeAtIpInOutErr[i]->Fill(cscMuonTimeExtra.timeAtIpInOutErr());
-            hMuonTimeExtraCSCTimeAtIpOutIn[i]->Fill(cscMuonTimeExtra.timeAtIpOutIn());
-            hMuonTimeExtraCSCTimeAtIpOutInErr[i]->Fill(cscMuonTimeExtra.timeAtIpOutInErr());
-            hMuonTimeExtraDTNDOF[i]->Fill(dtMuonTimeExtra.nDof());
-            hMuonTimeExtraDTTimeAtIpInOut[i]->Fill(dtMuonTimeExtra.timeAtIpInOut());
-            hMuonTimeExtraDTTimeAtIpInOutErr[i]->Fill(dtMuonTimeExtra.timeAtIpInOutErr());
-            hMuonTimeExtraDTTimeAtIpOutIn[i]->Fill(dtMuonTimeExtra.timeAtIpOutIn());
-            hMuonTimeExtraDTTimeAtIpOutInErr[i]->Fill(dtMuonTimeExtra.timeAtIpOutInErr());
-         }
-
-         if (muon->isCaloCompatibilityValid())
-            hCaloCompat[i]->Fill(muon->caloCompatibility());
-         hSegmentCompat[i]->Fill(muon::segmentCompatibility(*muon));
-         if (make2DPlots_ && muon->isCaloCompatibilityValid())
-            hCaloSegmentCompat[i]->Fill(muon->caloCompatibility(), muon::segmentCompatibility(*muon));
-         if (muon->isQualityValid()) {
-            hMuonQualityTrkRelChi2[i]->Fill(muon->combinedQuality().trkRelChi2);
-            hMuonQualityStaRelChi2[i]->Fill(muon->combinedQuality().staRelChi2);
-            hMuonQualityTrkKink[i]->Fill(muon->combinedQuality().trkKink);
-         }
-         hGlobalMuonPromptTightBool[i]->Fill(muon::isGoodMuon(*muon, muon::GlobalMuonPromptTight));
-         hTMLastStationLooseBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMLastStationLoose));
-         hTMLastStationTightBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMLastStationTight));
-         hTM2DCompatibilityLooseBool[i]->Fill(muon::isGoodMuon(*muon, muon::TM2DCompatibilityLoose));
-         hTM2DCompatibilityTightBool[i]->Fill(muon::isGoodMuon(*muon, muon::TM2DCompatibilityTight));
-         hTMOneStationLooseBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMOneStationLoose));
-         hTMOneStationTightBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMOneStationTight));
-         hTMLastStationOptimizedLowPtLooseBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMLastStationOptimizedLowPtLoose));
-         hTMLastStationOptimizedLowPtTightBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMLastStationOptimizedLowPtTight));
-         hGMTkChiCompatibilityBool[i]->Fill(muon::isGoodMuon(*muon, muon::GMTkChiCompatibility));
-         hGMStaChiCompatibilityBool[i]->Fill(muon::isGoodMuon(*muon, muon::GMStaChiCompatibility));
-         hGMTkKinkTightBool[i]->Fill(muon::isGoodMuon(*muon, muon::GMTkKinkTight));
-         hTMLastStationAngLooseBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMLastStationAngLoose));
-         hTMLastStationAngTightBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMLastStationAngTight));
-         hTMOneStationAngLooseBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMOneStationAngLoose));
-         hTMOneStationAngTightBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMOneStationAngTight));
-         hTMLastStationOptimizedBarrelLowPtLooseBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMLastStationOptimizedBarrelLowPtLoose));
-         hTMLastStationOptimizedBarrelLowPtTightBool[i]->Fill(muon::isGoodMuon(*muon, muon::TMLastStationOptimizedBarrelLowPtTight));
-
-         if (makeCosmicCompatibilityPlots_) {
-	   MuonRef muonRef(muonCollectionH_, muonIdx);
-	   MuonCosmicCompatibility muonCosmicCompatibility = (*muonCosmicCompatibilityValueMapH_)[muonRef];
-	   hCombinedCosmicCompat[i]->Fill(muonCosmicCompatibility.cosmicCompatibility);
-	   hTimeCosmicCompat[i]->Fill(muonCosmicCompatibility.timeCompatibility);
-	   hB2BCosmicCompat[i]->Fill(muonCosmicCompatibility.backToBackCompatibility);
-	   hOverlapCosmicCompat[i]->Fill(muonCosmicCompatibility.overlapCompatibility);
-         }
-	 
-         // by station
-         for(int station = 0; station < 4; ++station)
-         {
-         
-            if (makeShowerInformationPlots_) {
-                MuonRef muonRef(muonCollectionH_, muonIdx);
-                MuonShower muonShowerInformation = (*muonShowerInformationValueMapH_)[muonRef];
-  
-                hMuonShowerSizeT[i][station]->Fill((muonShowerInformation.stationShowerSizeT).at(station));
-                hMuonShowerDeltaR[i][station]->Fill((muonShowerInformation.stationShowerDeltaR.at(station)));
-                hMuonAllHits[i][station]->Fill((muonShowerInformation.nStationHits.at(station)));
-                hMuonHitsFromSegments[i][station]->Fill((muonShowerInformation.nStationCorrelatedHits.at(station)));
-                hMuonUncorrelatedHits[i][station]->Fill((muonShowerInformation.nStationHits.at(station)) - muonShowerInformation.nStationCorrelatedHits.at(station));
-            }
-
-
-            Fill(hDTPullxPropErr[i][station], muon->pullX(station+1, MuonSubdetId::DT, Muon::SegmentAndTrackArbitration, false));
-            Fill(hDTPulldXdZPropErr[i][station], muon->pullDxDz(station+1, MuonSubdetId::DT, Muon::SegmentAndTrackArbitration, false));
-
-            if (station < 3) {
-               Fill(hDTPullyPropErr[i][station], muon->pullY(station+1, MuonSubdetId::DT, Muon::SegmentAndTrackArbitration, false));
-               Fill(hDTPulldYdZPropErr[i][station], muon->pullDyDz(station+1, MuonSubdetId::DT, Muon::SegmentAndTrackArbitration, false));
-            }
-
-            float distance = muon->trackDist(station+1, MuonSubdetId::DT);
-            float error    = muon->trackDistErr(station+1, MuonSubdetId::DT);
-            if (error == 0) error = 0.000001;
-
-            if (muon->numberOfSegments(station+1, MuonSubdetId::DT, Muon::NoArbitration) > 0) {
-               Fill(hDTDistWithSegment[i][station], distance);
-               Fill(hDTPullDistWithSegment[i][station], distance/error);
-            } else {
-               Fill(hDTDistWithNoSegment[i][station], distance);
-               Fill(hDTPullDistWithNoSegment[i][station], distance/error);
-            }
-
-            Fill(hCSCPullxPropErr[i][station], muon->pullX(station+1, MuonSubdetId::CSC, Muon::SegmentAndTrackArbitration, false));
-            Fill(hCSCPulldXdZPropErr[i][station], muon->pullDxDz(station+1, MuonSubdetId::CSC, Muon::SegmentAndTrackArbitration, false));
-            Fill(hCSCPullyPropErr[i][station], muon->pullY(station+1, MuonSubdetId::CSC, Muon::SegmentAndTrackArbitration, false));
-            Fill(hCSCPulldYdZPropErr[i][station], muon->pullDyDz(station+1, MuonSubdetId::CSC, Muon::SegmentAndTrackArbitration, false));
-
-            distance = muon->trackDist(station+1, MuonSubdetId::CSC);
-            error    = muon->trackDistErr(station+1, MuonSubdetId::CSC);
-            if (error == 0) error = 0.000001;
-
-            if (muon->numberOfSegments(station+1, MuonSubdetId::CSC, Muon::NoArbitration) > 0) {
-               Fill(hCSCDistWithSegment[i][station], distance);
-               Fill(hCSCPullDistWithSegment[i][station], distance/error);
-            } else {
-               Fill(hCSCDistWithNoSegment[i][station], distance);
-               Fill(hCSCPullDistWithNoSegment[i][station], distance/error);
-            }
-         }// station
-      }
-
-      if (! useTrackerMuons_ || ! muon->isTrackerMuon()) continue;
-      if (makeAllChamberPlots_) {
-         // by chamber
-         for(std::vector<MuonChamberMatch>::const_iterator chamberMatch = muon->matches().begin();
-               chamberMatch != muon->matches().end(); ++chamberMatch)
-         {
-            int station = chamberMatch->station();
-
-            if (chamberMatch->detector() == MuonSubdetId::DT) {
-               DTChamberId dtId(chamberMatch->id.rawId());
-               int wheel  = dtId.wheel();
-               int sector = dtId.sector();
-
-               if (chamberMatch->segmentMatches.empty()) {
-                  Fill(hDTChamberEdgeXWithNoSegment[station-1][wheel+2][sector-1], chamberMatch->edgeX);
-                  Fill(hDTChamberEdgeYWithNoSegment[station-1][wheel+2][sector-1], chamberMatch->edgeY);
-               } else {
-                  Fill(hDTChamberEdgeXWithSegment[station-1][wheel+2][sector-1], chamberMatch->edgeX);
-                  Fill(hDTChamberEdgeYWithSegment[station-1][wheel+2][sector-1], chamberMatch->edgeY);
-
-                  for(std::vector<MuonSegmentMatch>::const_iterator segmentMatch = chamberMatch->segmentMatches.begin();
-                        segmentMatch != chamberMatch->segmentMatches.end(); ++segmentMatch)
-                  {
-                     if (segmentMatch->isMask(MuonSegmentMatch::BestInChamberByDR)) {
-                        Fill(hDTChamberDx[station-1][wheel+2][sector-1], chamberMatch->x-segmentMatch->x);
-                        if (station < 4) Fill(hDTChamberDy[station-1][wheel+2][sector-1], chamberMatch->y-segmentMatch->y);
-                        break;
-                     }
-                  }// segmentMatch
-               }
-
-               continue;
-            }
-
-            if (chamberMatch->detector() == MuonSubdetId::CSC)  {
-               CSCDetId cscId(chamberMatch->id.rawId());
-               int endcap  = cscId.endcap();
-               int ring    = cscId.ring();
-               int chamber = cscId.chamber();
-
-               if (chamberMatch->segmentMatches.empty()) {
-                  Fill(hCSCChamberEdgeXWithNoSegment[endcap-1][station-1][ring-1][chamber-1], chamberMatch->edgeX);
-                  Fill(hCSCChamberEdgeYWithNoSegment[endcap-1][station-1][ring-1][chamber-1], chamberMatch->edgeY);
-               } else {
-                  Fill(hCSCChamberEdgeXWithSegment[endcap-1][station-1][ring-1][chamber-1], chamberMatch->edgeX);
-                  Fill(hCSCChamberEdgeYWithSegment[endcap-1][station-1][ring-1][chamber-1], chamberMatch->edgeY);
-
-                  for(std::vector<MuonSegmentMatch>::const_iterator segmentMatch = chamberMatch->segmentMatches.begin();
-                        segmentMatch != chamberMatch->segmentMatches.end(); ++segmentMatch)
-                  {
-                     if (segmentMatch->isMask(MuonSegmentMatch::BestInChamberByDR)) {
-                        Fill(hCSCChamberDx[endcap-1][station-1][ring-1][chamber-1], chamberMatch->x-segmentMatch->x);
-                        Fill(hCSCChamberDy[endcap-1][station-1][ring-1][chamber-1], chamberMatch->y-segmentMatch->y);
-                        break;
-                     }
-                  }// segmentMatch
-               }
-            }
-         }// chamberMatch
-      }
-      ++muonIdx;
-   }// muon
-
-   if (! make2DPlots_) return;
-
-   for(DTRecSegment4DCollection::const_iterator segment = dtSegmentCollectionH_->begin();
-         segment != dtSegmentCollectionH_->end(); ++segment)
-   {
-      LocalPoint  segmentLocalPosition       = segment->localPosition();
-      LocalVector segmentLocalDirection      = segment->localDirection();
-      LocalError  segmentLocalPositionError  = segment->localPositionError();
-      LocalError  segmentLocalDirectionError = segment->localDirectionError();
-      const GeomDet* segmentGeomDet = geometry_->idToDet(segment->geographicalId());
-      GlobalPoint segmentGlobalPosition = segmentGeomDet->toGlobal(segment->localPosition());
-      bool segmentFound = false;
-      bool segmentBestDrFound = false;
-
-      for(MuonCollection::const_iterator muon = muonCollectionH_->begin();
-            muon != muonCollectionH_->end(); ++muon)
-      {
-         if (! muon->isMatchesValid())
-            continue;
-
-         for(std::vector<MuonChamberMatch>::const_iterator chamberMatch = muon->matches().begin();
-               chamberMatch != muon->matches().end(); ++chamberMatch) {
-            for(std::vector<MuonSegmentMatch>::const_iterator segmentMatch = chamberMatch->segmentMatches.begin();
-                  segmentMatch != chamberMatch->segmentMatches.end(); ++segmentMatch)
-            {
-               if (fabs(segmentMatch->x       - segmentLocalPosition.x()                           ) < 1E-6 &&
-                   fabs(segmentMatch->y       - segmentLocalPosition.y()                           ) < 1E-6 &&
-                   fabs(segmentMatch->dXdZ    - segmentLocalDirection.x()/segmentLocalDirection.z()) < 1E-6 &&
-                   fabs(segmentMatch->dYdZ    - segmentLocalDirection.y()/segmentLocalDirection.z()) < 1E-6 &&
-                   fabs(segmentMatch->xErr    - sqrt(segmentLocalPositionError.xx())               ) < 1E-6 &&
-                   fabs(segmentMatch->yErr    - sqrt(segmentLocalPositionError.yy())               ) < 1E-6 &&
-                   fabs(segmentMatch->dXdZErr - sqrt(segmentLocalDirectionError.xx())              ) < 1E-6 &&
-                   fabs(segmentMatch->dYdZErr - sqrt(segmentLocalDirectionError.yy())              ) < 1E-6)
-               {
-                  segmentFound = true;
-                  if (segmentMatch->isMask(reco::MuonSegmentMatch::BestInStationByDR)) segmentBestDrFound = true;
-                  break;
-               }
-            }// segmentMatch
-            if (segmentFound) break;
-         }// chamberMatch
-         if (segmentFound) break;
-      }// muon
-
-      if (segmentFound) {
-         hSegmentIsAssociatedRZ->Fill(segmentGlobalPosition.z(), segmentGlobalPosition.perp());
-         hSegmentIsAssociatedXY->Fill(segmentGlobalPosition.x(), segmentGlobalPosition.y());
-
-         if (segmentBestDrFound) {
-            hSegmentIsBestDrAssociatedRZ->Fill(segmentGlobalPosition.z(), segmentGlobalPosition.perp());
-            hSegmentIsBestDrAssociatedXY->Fill(segmentGlobalPosition.x(), segmentGlobalPosition.y());
-         }
-      } else {
-         hSegmentIsNotAssociatedRZ->Fill(segmentGlobalPosition.z(), segmentGlobalPosition.perp());
-         hSegmentIsNotAssociatedXY->Fill(segmentGlobalPosition.x(), segmentGlobalPosition.y());
-         hSegmentIsBestDrNotAssociatedRZ->Fill(segmentGlobalPosition.z(), segmentGlobalPosition.perp());
-         hSegmentIsBestDrNotAssociatedXY->Fill(segmentGlobalPosition.x(), segmentGlobalPosition.y());
+      for (std::vector<MuonChamberMatch>::const_iterator chamberMatch = muon->matches().begin();
+           chamberMatch != muon->matches().end();
+           ++chamberMatch) {
+        int station = chamberMatch->station();
+
+        if (chamberMatch->detector() == MuonSubdetId::DT) {
+          DTChamberId dtId(chamberMatch->id.rawId());
+          int wheel = dtId.wheel();
+          int sector = dtId.sector();
+
+          if (chamberMatch->segmentMatches.empty()) {
+            Fill(hDTChamberEdgeXWithNoSegment[station - 1][wheel + 2][sector - 1], chamberMatch->edgeX);
+            Fill(hDTChamberEdgeYWithNoSegment[station - 1][wheel + 2][sector - 1], chamberMatch->edgeY);
+          } else {
+            Fill(hDTChamberEdgeXWithSegment[station - 1][wheel + 2][sector - 1], chamberMatch->edgeX);
+            Fill(hDTChamberEdgeYWithSegment[station - 1][wheel + 2][sector - 1], chamberMatch->edgeY);
+
+            for (std::vector<MuonSegmentMatch>::const_iterator segmentMatch = chamberMatch->segmentMatches.begin();
+                 segmentMatch != chamberMatch->segmentMatches.end();
+                 ++segmentMatch) {
+              if (segmentMatch->isMask(MuonSegmentMatch::BestInChamberByDR)) {
+                Fill(hDTChamberDx[station - 1][wheel + 2][sector - 1], chamberMatch->x - segmentMatch->x);
+                if (station < 4)
+                  Fill(hDTChamberDy[station - 1][wheel + 2][sector - 1], chamberMatch->y - segmentMatch->y);
+                break;
+              }
+            }  // segmentMatch
+          }
+
+          continue;
+        }
+
+        if (chamberMatch->detector() == MuonSubdetId::CSC) {
+          CSCDetId cscId(chamberMatch->id.rawId());
+          int endcap = cscId.endcap();
+          int ring = cscId.ring();
+          int chamber = cscId.chamber();
+
+          if (chamberMatch->segmentMatches.empty()) {
+            Fill(hCSCChamberEdgeXWithNoSegment[endcap - 1][station - 1][ring - 1][chamber - 1], chamberMatch->edgeX);
+            Fill(hCSCChamberEdgeYWithNoSegment[endcap - 1][station - 1][ring - 1][chamber - 1], chamberMatch->edgeY);
+          } else {
+            Fill(hCSCChamberEdgeXWithSegment[endcap - 1][station - 1][ring - 1][chamber - 1], chamberMatch->edgeX);
+            Fill(hCSCChamberEdgeYWithSegment[endcap - 1][station - 1][ring - 1][chamber - 1], chamberMatch->edgeY);
+
+            for (std::vector<MuonSegmentMatch>::const_iterator segmentMatch = chamberMatch->segmentMatches.begin();
+                 segmentMatch != chamberMatch->segmentMatches.end();
+                 ++segmentMatch) {
+              if (segmentMatch->isMask(MuonSegmentMatch::BestInChamberByDR)) {
+                Fill(hCSCChamberDx[endcap - 1][station - 1][ring - 1][chamber - 1], chamberMatch->x - segmentMatch->x);
+                Fill(hCSCChamberDy[endcap - 1][station - 1][ring - 1][chamber - 1], chamberMatch->y - segmentMatch->y);
+                break;
+              }
+            }  // segmentMatch
+          }
+        }
+      }  // chamberMatch
+    }
+    ++muonIdx;
+  }  // muon
+
+  if (!make2DPlots_)
+    return;
+
+  for (DTRecSegment4DCollection::const_iterator segment = dtSegmentCollectionH_->begin();
+       segment != dtSegmentCollectionH_->end();
+       ++segment) {
+    LocalPoint segmentLocalPosition = segment->localPosition();
+    LocalVector segmentLocalDirection = segment->localDirection();
+    LocalError segmentLocalPositionError = segment->localPositionError();
+    LocalError segmentLocalDirectionError = segment->localDirectionError();
+    const GeomDet *segmentGeomDet = geometry_->idToDet(segment->geographicalId());
+    GlobalPoint segmentGlobalPosition = segmentGeomDet->toGlobal(segment->localPosition());
+    bool segmentFound = false;
+    bool segmentBestDrFound = false;
+
+    for (MuonCollection::const_iterator muon = muonCollectionH_->begin(); muon != muonCollectionH_->end(); ++muon) {
+      if (!muon->isMatchesValid())
+        continue;
+
+      for (std::vector<MuonChamberMatch>::const_iterator chamberMatch = muon->matches().begin();
+           chamberMatch != muon->matches().end();
+           ++chamberMatch) {
+        for (std::vector<MuonSegmentMatch>::const_iterator segmentMatch = chamberMatch->segmentMatches.begin();
+             segmentMatch != chamberMatch->segmentMatches.end();
+             ++segmentMatch) {
+          if (fabs(segmentMatch->x - segmentLocalPosition.x()) < 1E-6 &&
+              fabs(segmentMatch->y - segmentLocalPosition.y()) < 1E-6 &&
+              fabs(segmentMatch->dXdZ - segmentLocalDirection.x() / segmentLocalDirection.z()) < 1E-6 &&
+              fabs(segmentMatch->dYdZ - segmentLocalDirection.y() / segmentLocalDirection.z()) < 1E-6 &&
+              fabs(segmentMatch->xErr - sqrt(segmentLocalPositionError.xx())) < 1E-6 &&
+              fabs(segmentMatch->yErr - sqrt(segmentLocalPositionError.yy())) < 1E-6 &&
+              fabs(segmentMatch->dXdZErr - sqrt(segmentLocalDirectionError.xx())) < 1E-6 &&
+              fabs(segmentMatch->dYdZErr - sqrt(segmentLocalDirectionError.yy())) < 1E-6) {
+            segmentFound = true;
+            if (segmentMatch->isMask(reco::MuonSegmentMatch::BestInStationByDR))
+              segmentBestDrFound = true;
+            break;
+          }
+        }  // segmentMatch
+        if (segmentFound)
+          break;
+      }  // chamberMatch
+      if (segmentFound)
+        break;
+    }  // muon
+
+    if (segmentFound) {
+      hSegmentIsAssociatedRZ->Fill(segmentGlobalPosition.z(), segmentGlobalPosition.perp());
+      hSegmentIsAssociatedXY->Fill(segmentGlobalPosition.x(), segmentGlobalPosition.y());
+
+      if (segmentBestDrFound) {
+        hSegmentIsBestDrAssociatedRZ->Fill(segmentGlobalPosition.z(), segmentGlobalPosition.perp());
+        hSegmentIsBestDrAssociatedXY->Fill(segmentGlobalPosition.x(), segmentGlobalPosition.y());
       }
-   }// dt segment
-
-   for(CSCSegmentCollection::const_iterator segment = cscSegmentCollectionH_->begin();
-         segment != cscSegmentCollectionH_->end(); ++segment)
-   {
-      LocalPoint  segmentLocalPosition       = segment->localPosition();
-      LocalVector segmentLocalDirection      = segment->localDirection();
-      LocalError  segmentLocalPositionError  = segment->localPositionError();
-      LocalError  segmentLocalDirectionError = segment->localDirectionError();
-      const GeomDet* segmentGeomDet = geometry_->idToDet(segment->geographicalId());
-      GlobalPoint segmentGlobalPosition = segmentGeomDet->toGlobal(segment->localPosition());
-      bool segmentFound = false;
-      bool segmentBestDrFound = false;
-
-      for(MuonCollection::const_iterator muon = muonCollectionH_->begin();
-            muon != muonCollectionH_->end(); ++muon)
-      {
-         if (! muon->isMatchesValid())
-            continue;
-
-         for(std::vector<MuonChamberMatch>::const_iterator chamberMatch = muon->matches().begin();
-               chamberMatch != muon->matches().end(); ++chamberMatch) {
-            for(std::vector<MuonSegmentMatch>::const_iterator segmentMatch = chamberMatch->segmentMatches.begin();
-                  segmentMatch != chamberMatch->segmentMatches.end(); ++segmentMatch)
-            {
-               if (fabs(segmentMatch->x       - segmentLocalPosition.x()                           ) < 1E-6 &&
-                   fabs(segmentMatch->y       - segmentLocalPosition.y()                           ) < 1E-6 &&
-                   fabs(segmentMatch->dXdZ    - segmentLocalDirection.x()/segmentLocalDirection.z()) < 1E-6 &&
-                   fabs(segmentMatch->dYdZ    - segmentLocalDirection.y()/segmentLocalDirection.z()) < 1E-6 &&
-                   fabs(segmentMatch->xErr    - sqrt(segmentLocalPositionError.xx())               ) < 1E-6 &&
-                   fabs(segmentMatch->yErr    - sqrt(segmentLocalPositionError.yy())               ) < 1E-6 &&
-                   fabs(segmentMatch->dXdZErr - sqrt(segmentLocalDirectionError.xx())              ) < 1E-6 &&
-                   fabs(segmentMatch->dYdZErr - sqrt(segmentLocalDirectionError.yy())              ) < 1E-6)
-               {
-                  segmentFound = true;
-                  if (segmentMatch->isMask(reco::MuonSegmentMatch::BestInStationByDR)) segmentBestDrFound = true;
-                  break;
-               }
-            }// segmentMatch
-            if (segmentFound) break;
-         }// chamberMatch
-         if (segmentFound) break;
-      }// muon
-
-      if (segmentFound) {
-         hSegmentIsAssociatedRZ->Fill(segmentGlobalPosition.z(), segmentGlobalPosition.perp());
-         hSegmentIsAssociatedXY->Fill(segmentGlobalPosition.x(), segmentGlobalPosition.y());
-
-         if (segmentBestDrFound) {
-            hSegmentIsBestDrAssociatedRZ->Fill(segmentGlobalPosition.z(), segmentGlobalPosition.perp());
-            hSegmentIsBestDrAssociatedXY->Fill(segmentGlobalPosition.x(), segmentGlobalPosition.y());
-         }
-      } else {
-         hSegmentIsNotAssociatedRZ->Fill(segmentGlobalPosition.z(), segmentGlobalPosition.perp());
-         hSegmentIsNotAssociatedXY->Fill(segmentGlobalPosition.x(), segmentGlobalPosition.y());
-         hSegmentIsBestDrNotAssociatedRZ->Fill(segmentGlobalPosition.z(), segmentGlobalPosition.perp());
-         hSegmentIsBestDrNotAssociatedXY->Fill(segmentGlobalPosition.x(), segmentGlobalPosition.y());
+    } else {
+      hSegmentIsNotAssociatedRZ->Fill(segmentGlobalPosition.z(), segmentGlobalPosition.perp());
+      hSegmentIsNotAssociatedXY->Fill(segmentGlobalPosition.x(), segmentGlobalPosition.y());
+      hSegmentIsBestDrNotAssociatedRZ->Fill(segmentGlobalPosition.z(), segmentGlobalPosition.perp());
+      hSegmentIsBestDrNotAssociatedXY->Fill(segmentGlobalPosition.x(), segmentGlobalPosition.y());
+    }
+  }  // dt segment
+
+  for (CSCSegmentCollection::const_iterator segment = cscSegmentCollectionH_->begin();
+       segment != cscSegmentCollectionH_->end();
+       ++segment) {
+    LocalPoint segmentLocalPosition = segment->localPosition();
+    LocalVector segmentLocalDirection = segment->localDirection();
+    LocalError segmentLocalPositionError = segment->localPositionError();
+    LocalError segmentLocalDirectionError = segment->localDirectionError();
+    const GeomDet *segmentGeomDet = geometry_->idToDet(segment->geographicalId());
+    GlobalPoint segmentGlobalPosition = segmentGeomDet->toGlobal(segment->localPosition());
+    bool segmentFound = false;
+    bool segmentBestDrFound = false;
+
+    for (MuonCollection::const_iterator muon = muonCollectionH_->begin(); muon != muonCollectionH_->end(); ++muon) {
+      if (!muon->isMatchesValid())
+        continue;
+
+      for (std::vector<MuonChamberMatch>::const_iterator chamberMatch = muon->matches().begin();
+           chamberMatch != muon->matches().end();
+           ++chamberMatch) {
+        for (std::vector<MuonSegmentMatch>::const_iterator segmentMatch = chamberMatch->segmentMatches.begin();
+             segmentMatch != chamberMatch->segmentMatches.end();
+             ++segmentMatch) {
+          if (fabs(segmentMatch->x - segmentLocalPosition.x()) < 1E-6 &&
+              fabs(segmentMatch->y - segmentLocalPosition.y()) < 1E-6 &&
+              fabs(segmentMatch->dXdZ - segmentLocalDirection.x() / segmentLocalDirection.z()) < 1E-6 &&
+              fabs(segmentMatch->dYdZ - segmentLocalDirection.y() / segmentLocalDirection.z()) < 1E-6 &&
+              fabs(segmentMatch->xErr - sqrt(segmentLocalPositionError.xx())) < 1E-6 &&
+              fabs(segmentMatch->yErr - sqrt(segmentLocalPositionError.yy())) < 1E-6 &&
+              fabs(segmentMatch->dXdZErr - sqrt(segmentLocalDirectionError.xx())) < 1E-6 &&
+              fabs(segmentMatch->dYdZErr - sqrt(segmentLocalDirectionError.yy())) < 1E-6) {
+            segmentFound = true;
+            if (segmentMatch->isMask(reco::MuonSegmentMatch::BestInStationByDR))
+              segmentBestDrFound = true;
+            break;
+          }
+        }  // segmentMatch
+        if (segmentFound)
+          break;
+      }  // chamberMatch
+      if (segmentFound)
+        break;
+    }  // muon
+
+    if (segmentFound) {
+      hSegmentIsAssociatedRZ->Fill(segmentGlobalPosition.z(), segmentGlobalPosition.perp());
+      hSegmentIsAssociatedXY->Fill(segmentGlobalPosition.x(), segmentGlobalPosition.y());
+
+      if (segmentBestDrFound) {
+        hSegmentIsBestDrAssociatedRZ->Fill(segmentGlobalPosition.z(), segmentGlobalPosition.perp());
+        hSegmentIsBestDrAssociatedXY->Fill(segmentGlobalPosition.x(), segmentGlobalPosition.y());
       }
-   }// csc segment
+    } else {
+      hSegmentIsNotAssociatedRZ->Fill(segmentGlobalPosition.z(), segmentGlobalPosition.perp());
+      hSegmentIsNotAssociatedXY->Fill(segmentGlobalPosition.x(), segmentGlobalPosition.y());
+      hSegmentIsBestDrNotAssociatedRZ->Fill(segmentGlobalPosition.z(), segmentGlobalPosition.perp());
+      hSegmentIsBestDrNotAssociatedXY->Fill(segmentGlobalPosition.x(), segmentGlobalPosition.y());
+    }
+  }  // csc segment
 }
 
-void MuonIdVal::Fill(MonitorElement* me, float f) {
-   if (fabs(f) > 900000) return;
-   //if (fabs(f) < 1E-8) return;
-   me->Fill(f);
+void MuonIdVal::Fill(MonitorElement *me, float f) {
+  if (fabs(f) > 900000)
+    return;
+  // if (fabs(f) < 1E-8) return;
+  me->Fill(f);
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(MuonIdVal);
diff --git a/Validation/MuonIsolation/interface/MuIsoValidation.h b/Validation/MuonIsolation/interface/MuIsoValidation.h
index badbb87d1f16c..0457ff7e53337 100644
--- a/Validation/MuonIsolation/interface/MuIsoValidation.h
+++ b/Validation/MuonIsolation/interface/MuIsoValidation.h
@@ -125,7 +125,6 @@ class MuIsoValidation : public DQMEDAnalyzer {
   //---------------Dynamic Variables---------------------
   
   //MonitorElement
-  DQMStore* dbe;
 
   edm::ParameterSet iConfig;  
   //The Data
diff --git a/Validation/MuonIsolation/src/MuIsoValidation.cc b/Validation/MuonIsolation/src/MuIsoValidation.cc
index 42afaa066c2b7..c2715652a5de4 100644
--- a/Validation/MuonIsolation/src/MuIsoValidation.cc
+++ b/Validation/MuonIsolation/src/MuIsoValidation.cc
@@ -83,8 +83,6 @@ MuIsoValidation::MuIsoValidation(const edm::ParameterSet& ps)
   InitStatics();
   
   //Set up DAQ
-  dbe = nullptr;
-  dbe = edm::Service<DQMStore>().operator->();
   subsystemname_ = iConfig.getUntrackedParameter<std::string>("subSystemFolder", "YourSubsystem") ;
   
   //------"allocate" space for the data vectors-------
diff --git a/Validation/MuonME0Validation/interface/ME0BaseValidation.h b/Validation/MuonME0Validation/interface/ME0BaseValidation.h
index b6d50a5107524..484f77b803b31 100644
--- a/Validation/MuonME0Validation/interface/ME0BaseValidation.h
+++ b/Validation/MuonME0Validation/interface/ME0BaseValidation.h
@@ -1,41 +1,43 @@
 #ifndef ME0BaseValidation_H
 #define ME0BaseValidation_H
 
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
+#include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/GEMGeometry/interface/ME0EtaPartitionSpecs.h"
 #include "Geometry/GEMGeometry/interface/ME0Geometry.h"
-#include "Geometry/CommonTopologies/interface/StripTopology.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Utilities/interface/EDGetToken.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-class ME0BaseValidation : public DQMEDAnalyzer
-{
+class ME0BaseValidation : public DQMEDAnalyzer {
 public:
-  explicit ME0BaseValidation( const edm::ParameterSet& ps );
+  explicit ME0BaseValidation(const edm::ParameterSet &ps);
   ~ME0BaseValidation() override;
-  void analyze(const edm::Event& e, const edm::EventSetup&) override = 0 ;
-  MonitorElement* BookHistZR( DQMStore::IBooker &, const char* name, const char* label, unsigned int region_num, unsigned int layer_num =99 ); 
-  MonitorElement* BookHistXY( DQMStore::IBooker &, const char* name, const char* label, unsigned int region_num, unsigned int layer_num =99 ); 
+  void analyze(const edm::Event &e, const edm::EventSetup &) override = 0;
+  MonitorElement *BookHistZR(
+      DQMStore::IBooker &, const char *name, const char *label, unsigned int region_num, unsigned int layer_num = 99);
+  MonitorElement *BookHistXY(
+      DQMStore::IBooker &, const char *name, const char *label, unsigned int region_num, unsigned int layer_num = 99);
+
 protected:
-  std::vector< std::string > regionLabel;
-  std::vector< std::string > layerLabel;
+  std::vector<std::string> regionLabel;
+  std::vector<std::string> layerLabel;
   std::vector<double> nBinZR_;
   std::vector<double> RangeZR_;
   edm::EDGetToken InputTagToken_;
   int nBinXY_;
 
-private :
+private:
 };
 
 #endif
diff --git a/Validation/MuonME0Validation/interface/ME0DigisValidation.h b/Validation/MuonME0Validation/interface/ME0DigisValidation.h
index b729c490a29ee..34fa17e1df633 100644
--- a/Validation/MuonME0Validation/interface/ME0DigisValidation.h
+++ b/Validation/MuonME0Validation/interface/ME0DigisValidation.h
@@ -2,59 +2,56 @@
 #define ME0DigisValidation_H
 
 #include "Validation/MuonME0Validation/interface/ME0BaseValidation.h"
-//Data Formats
+// Data Formats
 #include "DataFormats/GEMDigi/interface/ME0DigiPreReco.h"
 #include "DataFormats/GEMDigi/interface/ME0DigiPreRecoCollection.h"
 
-
-class ME0DigisValidation : public ME0BaseValidation
-{
+class ME0DigisValidation : public ME0BaseValidation {
 public:
-    explicit ME0DigisValidation( const edm::ParameterSet& );
-    ~ME0DigisValidation() override;
-    void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-    void analyze(const edm::Event& e, const edm::EventSetup&) override;
-    bool isMatched(const int, const int, const int, const int, const int, const int);
+  explicit ME0DigisValidation(const edm::ParameterSet &);
+  ~ME0DigisValidation() override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+  void analyze(const edm::Event &e, const edm::EventSetup &) override;
+  bool isMatched(const int, const int, const int, const int, const int, const int);
+
 private:
-    
-    MonitorElement* num_evts;
-    MonitorElement* me0_strip_dg_xy[2][6];
-    MonitorElement* me0_strip_dg_xy_Muon[2][6];
-    MonitorElement* me0_strip_dg_zr[2][6];
-    MonitorElement* me0_strip_dg_zr_tot[2];
-    MonitorElement* me0_strip_dg_zr_tot_Muon[2];
-    
-    MonitorElement* me0_strip_dg_dx_local_Muon[2][6];
-    MonitorElement* me0_strip_dg_dy_local_Muon[2][6];
-    MonitorElement* me0_strip_dg_dphi_global_Muon[2][6];
-    
-    MonitorElement* me0_strip_dg_dx_local_tot_Muon;
-    MonitorElement* me0_strip_dg_dy_local_tot_Muon;
-    MonitorElement* me0_strip_dg_x_local_tot;
-    MonitorElement* me0_strip_dg_y_local_tot;
-    MonitorElement* me0_strip_dg_dphi_global_tot_Muon;
-    MonitorElement* me0_strip_dg_dphi_vs_phi_global_tot_Muon;
-    MonitorElement* me0_strip_dg_dtime_tot_Muon;
-    MonitorElement* me0_strip_dg_time_tot;
-    
-    MonitorElement* me0_strip_dg_den_eta[2][6];
-    MonitorElement* me0_strip_dg_num_eta[2][6];
-    
-    MonitorElement* me0_strip_dg_den_eta_tot;
-    MonitorElement* me0_strip_dg_num_eta_tot;
-    
-    MonitorElement* me0_strip_dg_bkg_rad_tot;
-    MonitorElement* me0_strip_dg_bkgElePos_rad;
-    MonitorElement* me0_strip_dg_bkgNeutral_rad;
-    MonitorElement* me0_strip_exp_bkg_rad_tot;
-    MonitorElement* me0_strip_exp_bkgElePos_rad;
-    MonitorElement* me0_strip_exp_bkgNeutral_rad;
-    
-    edm::EDGetToken InputTagToken_Digi;
-    double sigma_x_, sigma_y_;
-    
-    int npart;
-    
+  MonitorElement *num_evts;
+  MonitorElement *me0_strip_dg_xy[2][6];
+  MonitorElement *me0_strip_dg_xy_Muon[2][6];
+  MonitorElement *me0_strip_dg_zr[2][6];
+  MonitorElement *me0_strip_dg_zr_tot[2];
+  MonitorElement *me0_strip_dg_zr_tot_Muon[2];
+
+  MonitorElement *me0_strip_dg_dx_local_Muon[2][6];
+  MonitorElement *me0_strip_dg_dy_local_Muon[2][6];
+  MonitorElement *me0_strip_dg_dphi_global_Muon[2][6];
+
+  MonitorElement *me0_strip_dg_dx_local_tot_Muon;
+  MonitorElement *me0_strip_dg_dy_local_tot_Muon;
+  MonitorElement *me0_strip_dg_x_local_tot;
+  MonitorElement *me0_strip_dg_y_local_tot;
+  MonitorElement *me0_strip_dg_dphi_global_tot_Muon;
+  MonitorElement *me0_strip_dg_dphi_vs_phi_global_tot_Muon;
+  MonitorElement *me0_strip_dg_dtime_tot_Muon;
+  MonitorElement *me0_strip_dg_time_tot;
+
+  MonitorElement *me0_strip_dg_den_eta[2][6];
+  MonitorElement *me0_strip_dg_num_eta[2][6];
+
+  MonitorElement *me0_strip_dg_den_eta_tot;
+  MonitorElement *me0_strip_dg_num_eta_tot;
+
+  MonitorElement *me0_strip_dg_bkg_rad_tot;
+  MonitorElement *me0_strip_dg_bkgElePos_rad;
+  MonitorElement *me0_strip_dg_bkgNeutral_rad;
+  MonitorElement *me0_strip_exp_bkg_rad_tot;
+  MonitorElement *me0_strip_exp_bkgElePos_rad;
+  MonitorElement *me0_strip_exp_bkgNeutral_rad;
+
+  edm::EDGetToken InputTagToken_Digi;
+  double sigma_x_, sigma_y_;
+
+  int npart;
 };
 
 #endif
diff --git a/Validation/MuonME0Validation/interface/ME0HitsValidation.h b/Validation/MuonME0Validation/interface/ME0HitsValidation.h
index 061285798187c..ad636b8acc054 100644
--- a/Validation/MuonME0Validation/interface/ME0HitsValidation.h
+++ b/Validation/MuonME0Validation/interface/ME0HitsValidation.h
@@ -3,29 +3,24 @@
 
 #include "Validation/MuonME0Validation/interface/ME0BaseValidation.h"
 
-
-
-class ME0HitsValidation : public ME0BaseValidation
-{
+class ME0HitsValidation : public ME0BaseValidation {
 public:
-  explicit ME0HitsValidation( const edm::ParameterSet& );
+  explicit ME0HitsValidation(const edm::ParameterSet &);
   ~ME0HitsValidation() override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(const edm::Event& e, const edm::EventSetup&) override;
- private:
+  void analyze(const edm::Event &e, const edm::EventSetup &) override;
 
-  MonitorElement* me0_sh_xy[2][6];
-  MonitorElement* me0_sh_zr[2][6];
-  MonitorElement* me0_sh_tot_zr[2];
+private:
+  MonitorElement *me0_sh_xy[2][6];
+  MonitorElement *me0_sh_zr[2][6];
+  MonitorElement *me0_sh_tot_zr[2];
 
-  MonitorElement* me0_sh_tof[2][6];
-  MonitorElement* me0_sh_tofMu[2][6];
-  MonitorElement* me0_sh_eloss[2][6];
-  MonitorElement* me0_sh_elossMu[2][6];
+  MonitorElement *me0_sh_tof[2][6];
+  MonitorElement *me0_sh_tofMu[2][6];
+  MonitorElement *me0_sh_eloss[2][6];
+  MonitorElement *me0_sh_elossMu[2][6];
 
   Int_t npart;
-  
-
 };
 
 #endif
diff --git a/Validation/MuonME0Validation/interface/ME0RecHitsValidation.h b/Validation/MuonME0Validation/interface/ME0RecHitsValidation.h
index 347a74e76b5e6..6aa19e3993cbe 100644
--- a/Validation/MuonME0Validation/interface/ME0RecHitsValidation.h
+++ b/Validation/MuonME0Validation/interface/ME0RecHitsValidation.h
@@ -3,36 +3,30 @@
 
 #include "Validation/MuonME0Validation/interface/ME0BaseValidation.h"
 
-//Data Format
-#include <DataFormats/GEMRecHit/interface/ME0RecHit.h>
-#include "DataFormats/MuonDetId/interface/GEMDetId.h"
+// Data Format
 #include "DataFormats/GEMRecHit/interface/ME0RecHitCollection.h"
+#include "DataFormats/MuonDetId/interface/GEMDetId.h"
+#include <DataFormats/GEMRecHit/interface/ME0RecHit.h>
 
-
-
-
-class ME0RecHitsValidation : public ME0BaseValidation
-{
+class ME0RecHitsValidation : public ME0BaseValidation {
 public:
-  explicit ME0RecHitsValidation( const edm::ParameterSet& );
+  explicit ME0RecHitsValidation(const edm::ParameterSet &);
   ~ME0RecHitsValidation() override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(const edm::Event& e, const edm::EventSetup&) override;
- private:
+  void analyze(const edm::Event &e, const edm::EventSetup &) override;
 
-  MonitorElement* me0_rh_xy[2][6];
-  MonitorElement* me0_rh_zr[2];
+private:
+  MonitorElement *me0_rh_xy[2][6];
+  MonitorElement *me0_rh_zr[2];
 
-  MonitorElement* me0_rh_DeltaX[2][6];
-  MonitorElement* me0_rh_DeltaY[2][6];
-  MonitorElement* me0_rh_PullX[2][6];
-  MonitorElement* me0_rh_PullY[2][6];
+  MonitorElement *me0_rh_DeltaX[2][6];
+  MonitorElement *me0_rh_DeltaY[2][6];
+  MonitorElement *me0_rh_PullX[2][6];
+  MonitorElement *me0_rh_PullY[2][6];
 
   edm::EDGetToken InputTagToken_RecHit;
 
   Int_t npart;
-
-
 };
 
 #endif
diff --git a/Validation/MuonME0Validation/interface/ME0SegmentsValidation.h b/Validation/MuonME0Validation/interface/ME0SegmentsValidation.h
index a117815e22f50..cbdbe4adc78d9 100644
--- a/Validation/MuonME0Validation/interface/ME0SegmentsValidation.h
+++ b/Validation/MuonME0Validation/interface/ME0SegmentsValidation.h
@@ -8,55 +8,52 @@
 
 #include "DataFormats/GEMDigi/interface/ME0DigiPreReco.h"
 #include "DataFormats/GEMDigi/interface/ME0DigiPreRecoCollection.h"
+#include "DataFormats/GEMRecHit/interface/ME0RecHitCollection.h"
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include <DataFormats/GEMRecHit/interface/ME0RecHit.h>
-#include "DataFormats/GEMRecHit/interface/ME0RecHitCollection.h"
-
 
-class ME0SegmentsValidation : public ME0BaseValidation
-{
+class ME0SegmentsValidation : public ME0BaseValidation {
 public:
-  explicit ME0SegmentsValidation( const edm::ParameterSet& );
+  explicit ME0SegmentsValidation(const edm::ParameterSet &);
   ~ME0SegmentsValidation() override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  void analyze(const edm::Event& e, const edm::EventSetup&) override;
-  std::pair<int,int> isMatched(ME0DetId, LocalPoint, edm::Handle<ME0DigiPreRecoCollection>);
+  void analyze(const edm::Event &e, const edm::EventSetup &) override;
+  std::pair<int, int> isMatched(ME0DetId, LocalPoint, edm::Handle<ME0DigiPreRecoCollection>);
   bool isSimTrackGood(edm::SimTrackContainer::const_iterator simTrack);
   bool isSimMatched(edm::SimTrackContainer::const_iterator, edm::PSimHitContainer::const_iterator);
- private:
 
-  MonitorElement* me0_specRH_xy[2][6];
-  MonitorElement* me0_rh_xy_Muon[2][6];
-  MonitorElement* me0_specRH_zr[2];
-  
+private:
+  MonitorElement *me0_specRH_xy[2][6];
+  MonitorElement *me0_rh_xy_Muon[2][6];
+  MonitorElement *me0_specRH_zr[2];
+
   MonitorElement *me0_segment_chi2, *me0_segment_redchi2, *me0_segment_ndof;
   MonitorElement *me0_segment_time, *me0_segment_timeErr;
   MonitorElement *me0_segment_numRH, *me0_segment_numRHSig, *me0_segment_numRHBkg;
   MonitorElement *me0_segment_EtaRH, *me0_segment_PhiRH, *me0_segment_size;
-    
+
   MonitorElement *me0_simsegment_eta, *me0_simsegment_pt, *me0_simsegment_phi;
   MonitorElement *me0_matchedsimsegment_eta, *me0_matchedsimsegment_pt, *me0_matchedsimsegment_phi;
-  
-  MonitorElement* me0_specRH_DeltaX[2][6];
-  MonitorElement* me0_specRH_DeltaY[2][6];
-  MonitorElement* me0_specRH_PullX[2][6];
-  MonitorElement* me0_specRH_PullY[2][6];
-  
+
+  MonitorElement *me0_specRH_DeltaX[2][6];
+  MonitorElement *me0_specRH_DeltaY[2][6];
+  MonitorElement *me0_specRH_PullX[2][6];
+  MonitorElement *me0_specRH_PullY[2][6];
+
   edm::EDGetToken InputTagToken_Segments;
   edm::EDGetToken InputTagToken_Digis;
   edm::EDGetToken InputTagToken_;
   edm::EDGetToken InputTagTokenST_;
-  
+
   int npart;
   double sigma_x_, sigma_y_;
   double eta_max_, eta_min_;
   double pt_min_;
   bool isMuonGun_;
-    
-  typedef std::map<edm::SimTrackContainer::const_iterator,edm::PSimHitContainer> MapTypeSim;
-  typedef std::map<ME0SegmentCollection::const_iterator,std::vector<ME0RecHit> > MapTypeSeg;
-  
+
+  typedef std::map<edm::SimTrackContainer::const_iterator, edm::PSimHitContainer> MapTypeSim;
+  typedef std::map<ME0SegmentCollection::const_iterator, std::vector<ME0RecHit>> MapTypeSeg;
 };
-  
+
 #endif
diff --git a/Validation/MuonME0Validation/plugins/Module.cc b/Validation/MuonME0Validation/plugins/Module.cc
index 951361c073f42..3c89326375211 100644
--- a/Validation/MuonME0Validation/plugins/Module.cc
+++ b/Validation/MuonME0Validation/plugins/Module.cc
@@ -2,7 +2,7 @@
 //
 // Package:    MuonME0Hits
 // Class:      MuonME0Hits
-// 
+//
 /**\class Module.cc
 
  Description: Declaration of the ME0 plugins for the local validation
@@ -11,18 +11,18 @@
      [Notes on implementation]
 */
 //
-// Original Author: Claudio Caputo, INFN Bari  
+// Original Author: Claudio Caputo, INFN Bari
 //         Created:  14 Jan 2016 17:00:00 GMT
 // $Id$
 //
 //
-#include "Validation/MuonME0Validation/interface/ME0HitsValidation.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "Validation/MuonME0Validation/interface/ME0DigisValidation.h"
+#include "Validation/MuonME0Validation/interface/ME0HitsValidation.h"
 #include "Validation/MuonME0Validation/interface/ME0RecHitsValidation.h"
 #include "Validation/MuonME0Validation/interface/ME0SegmentsValidation.h"
-#include "FWCore/PluginManager/interface/ModuleDef.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-DEFINE_FWK_MODULE (ME0HitsValidation) ;
-DEFINE_FWK_MODULE (ME0DigisValidation) ;
-DEFINE_FWK_MODULE (ME0RecHitsValidation) ;
-DEFINE_FWK_MODULE (ME0SegmentsValidation) ;
+DEFINE_FWK_MODULE(ME0HitsValidation);
+DEFINE_FWK_MODULE(ME0DigisValidation);
+DEFINE_FWK_MODULE(ME0RecHitsValidation);
+DEFINE_FWK_MODULE(ME0SegmentsValidation);
diff --git a/Validation/MuonME0Validation/plugins/MuonME0DigisHarvestor.cc b/Validation/MuonME0Validation/plugins/MuonME0DigisHarvestor.cc
index bb96a62f731c4..78ed0d8504fa4 100644
--- a/Validation/MuonME0Validation/plugins/MuonME0DigisHarvestor.cc
+++ b/Validation/MuonME0Validation/plugins/MuonME0DigisHarvestor.cc
@@ -2,254 +2,218 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "TGraphAsymmErrors.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Utilities/interface/InputTag.h"
+#include "TGraphAsymmErrors.h"
 
-///Geometry
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
+/// Geometry
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
-#include "Geometry/GEMGeometry/interface/ME0Geometry.h"
+#include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/GEMGeometry/interface/ME0EtaPartition.h"
 #include "Geometry/GEMGeometry/interface/ME0EtaPartitionSpecs.h"
-#include "Geometry/CommonTopologies/interface/StripTopology.h"
+#include "Geometry/GEMGeometry/interface/ME0Geometry.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 
-///Log messages
+/// Log messages
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "Validation/MuonME0Validation/plugins/MuonME0DigisHarvestor.h"
 
-
-MuonME0DigisHarvestor::MuonME0DigisHarvestor(const edm::ParameterSet& ps)
-{
+MuonME0DigisHarvestor::MuonME0DigisHarvestor(const edm::ParameterSet &ps) {
   dbe_path_ = std::string("MuonME0DigisV/ME0DigisTask/");
 }
 
+MuonME0DigisHarvestor::~MuonME0DigisHarvestor() {}
 
-MuonME0DigisHarvestor::~MuonME0DigisHarvestor()
-{
-}
-
-
-TProfile* MuonME0DigisHarvestor::ComputeEff(TH1F* num, TH1F* denum, std::string nameHist)
-{
-  std::string name  = "eff_"+nameHist;
-  std::string title = "Digi Efficiency"+std::string(num->GetTitle());
-  TProfile * efficHist = new TProfile(name.c_str(), title.c_str(),denum->GetXaxis()->GetNbins(), denum->GetXaxis()->GetXmin(),denum->GetXaxis()->GetXmax());
-
-  for (int i=1; i <= denum->GetNbinsX(); i++) {
+TProfile *MuonME0DigisHarvestor::ComputeEff(TH1F *num, TH1F *denum, std::string nameHist) {
+  std::string name = "eff_" + nameHist;
+  std::string title = "Digi Efficiency" + std::string(num->GetTitle());
+  TProfile *efficHist = new TProfile(name.c_str(),
+                                     title.c_str(),
+                                     denum->GetXaxis()->GetNbins(),
+                                     denum->GetXaxis()->GetXmin(),
+                                     denum->GetXaxis()->GetXmax());
 
+  for (int i = 1; i <= denum->GetNbinsX(); i++) {
     double nNum = num->GetBinContent(i);
     double nDenum = denum->GetBinContent(i);
-    if ( nDenum == 0 || nNum ==0  ) {
+    if (nDenum == 0 || nNum == 0) {
       continue;
     }
-    if ( nNum > nDenum ) {
+    if (nNum > nDenum) {
       double temp = nDenum;
       nDenum = nNum;
       nNum = temp;
-      edm::LogWarning("MuonME0DigisHarvestor")<<"Alert! specific bin's num is bigger than denum "<<i<<" "<<nNum<<" "<<nDenum;
+      edm::LogWarning("MuonME0DigisHarvestor")
+          << "Alert! specific bin's num is bigger than denum " << i << " " << nNum << " " << nDenum;
     }
-    const double effVal = nNum/nDenum;
+    const double effVal = nNum / nDenum;
     efficHist->SetBinContent(i, effVal);
-    efficHist->SetBinEntries(i,1);
-    efficHist->SetBinError(i,0);
-    const double errLo = TEfficiency::ClopperPearson((int)nDenum,(int)nNum,0.683,false);
-    const double errUp = TEfficiency::ClopperPearson((int)nDenum,(int)nNum,0.683,true);
+    efficHist->SetBinEntries(i, 1);
+    efficHist->SetBinError(i, 0);
+    const double errLo = TEfficiency::ClopperPearson((int)nDenum, (int)nNum, 0.683, false);
+    const double errUp = TEfficiency::ClopperPearson((int)nDenum, (int)nNum, 0.683, true);
     const double errVal = (effVal - errLo > errUp - effVal) ? effVal - errLo : errUp - effVal;
     efficHist->SetBinError(i, sqrt(effVal * effVal + errVal * errVal));
   }
   return efficHist;
 }
 
-
-void MuonME0DigisHarvestor::ProcessBooking( DQMStore::IBooker& ibooker, DQMStore::IGetter& ig, std::string nameHist, TH1F* num, TH1F* den )
-{
-    
-  if( num !=nullptr && den !=nullptr ) {
-      
-    TProfile* profile = ComputeEff(num, den, nameHist);
+void MuonME0DigisHarvestor::ProcessBooking(
+    DQMStore::IBooker &ibooker, DQMStore::IGetter &ig, std::string nameHist, TH1F *num, TH1F *den) {
+  if (num != nullptr && den != nullptr) {
+    TProfile *profile = ComputeEff(num, den, nameHist);
 
     TString x_axis_title = TString(num->GetXaxis()->GetTitle());
-    TString title  = TString::Format("Digi Efficiency;%s;Eff.",x_axis_title.Data());
+    TString title = TString::Format("Digi Efficiency;%s;Eff.", x_axis_title.Data());
+
+    profile->SetTitle(title.Data());
+    ibooker.bookProfile(profile->GetName(), profile);
 
-    profile->SetTitle( title.Data());
-    ibooker.bookProfile( profile->GetName(),profile);
-      
     delete profile;
-      
-  }
-  else {
-      
-    edm::LogWarning("MuonME0DigisHarvestor")<<"Can not find histograms";
-    if ( num == nullptr) edm::LogWarning("MuonME0DigisHarvestor")<<"num not found";
-    if ( den == nullptr) edm::LogWarning("MuonME0DigisHarvestor")<<"den not found";
-      
+
+  } else {
+    edm::LogWarning("MuonME0DigisHarvestor") << "Can not find histograms";
+    if (num == nullptr)
+      edm::LogWarning("MuonME0DigisHarvestor") << "num not found";
+    if (den == nullptr)
+      edm::LogWarning("MuonME0DigisHarvestor") << "den not found";
   }
   return;
-    
 }
 
+TH1F *MuonME0DigisHarvestor::ComputeBKG(TH1F *hist1, TH1F *hist2, std::string nameHist) {
+  std::string name = "rate_" + nameHist;
+  hist1->SetName(name.c_str());
+  for (int bin = 1; bin <= hist1->GetNbinsX(); ++bin) {
+    double R_min = hist1->GetBinCenter(bin) - 0.5 * hist1->GetBinWidth(bin);
+    double R_max = hist1->GetBinCenter(bin) + 0.5 * hist1->GetBinWidth(bin);
 
-TH1F* MuonME0DigisHarvestor::ComputeBKG(TH1F* hist1, TH1F* hist2, std::string nameHist)
-{
- 
-    std::string name = "rate_"+nameHist;
-    hist1->SetName(name.c_str());
-    for (int bin = 1; bin<=hist1->GetNbinsX();++bin){
-        
-        double R_min = hist1->GetBinCenter(bin) - 0.5 * hist1->GetBinWidth(bin);
-        double R_max = hist1->GetBinCenter(bin) + 0.5 * hist1->GetBinWidth(bin);
-        
-        double Area = TMath::Pi() * ( R_max*R_max - R_min*R_min );
-        hist1->SetBinContent(bin,(hist1->GetBinContent(bin))/Area);
-        hist1->SetBinError(bin,(hist1->GetBinError(bin))/Area);
-        
-    }
+    double Area = TMath::Pi() * (R_max * R_max - R_min * R_min);
+    hist1->SetBinContent(bin, (hist1->GetBinContent(bin)) / Area);
+    hist1->SetBinError(bin, (hist1->GetBinError(bin)) / Area);
+  }
 
-    int nEvts = hist2->GetEntries();
-    float scale = 6*2*nEvts*3*25e-9; //New redigitizer saves hits only in the BX range: [-1,+1], so the number of background hits has to be divided by 3
-    hist1->Scale(1.0/scale);
-    return hist1;
-    
+  int nEvts = hist2->GetEntries();
+  float scale = 6 * 2 * nEvts * 3 * 25e-9;  // New redigitizer saves hits only in the BX range: [-1,+1], so the
+                                            // number of background hits has to be divided by 3
+  hist1->Scale(1.0 / scale);
+  return hist1;
 }
 
+void MuonME0DigisHarvestor::ProcessBookingBKG(
+    DQMStore::IBooker &ibooker, DQMStore::IGetter &ig, std::string nameHist, TH1F *hist1, TH1F *hist2) {
+  if (hist1 != nullptr && hist2 != nullptr) {
+    TH1F *rate = ComputeBKG(hist1, hist2, nameHist);
 
-void MuonME0DigisHarvestor::ProcessBookingBKG( DQMStore::IBooker& ibooker, DQMStore::IGetter& ig, std::string nameHist, TH1F* hist1, TH1F* hist2 )
-{
-    
-    if( hist1 !=nullptr && hist2 !=nullptr ) {
+    TString x_axis_title = TString(hist1->GetXaxis()->GetTitle());
+    TString origTitle = TString(hist1->GetTitle());
+    TString title = TString::Format((origTitle + ";%s;Rate [Hz/cm^{2}]").Data(), x_axis_title.Data());
 
-        TH1F* rate = ComputeBKG(hist1, hist2, nameHist);
-        
-        TString x_axis_title = TString(hist1->GetXaxis()->GetTitle());
-        TString origTitle = TString(hist1->GetTitle());
-        TString title  = TString::Format((origTitle+";%s;Rate [Hz/cm^{2}]").Data(),x_axis_title.Data());
-        
-        rate->SetTitle( title.Data() );
-        ibooker.book1D( rate->GetName(),rate );
+    rate->SetTitle(title.Data());
+    ibooker.book1D(rate->GetName(), rate);
 
-    }
-    else {
-        
-        edm::LogWarning("MuonME0DigisHarvestor")<<"Can not find histograms";
-        if ( hist1 == nullptr ) edm::LogWarning("MuonME0DigisHarvestor")<<"num not found";
-        if ( hist2 == nullptr ) edm::LogWarning("MuonME0DigisHarvestor")<<"den not found";
-        
-    }
-    return;
-    
+  } else {
+    edm::LogWarning("MuonME0DigisHarvestor") << "Can not find histograms";
+    if (hist1 == nullptr)
+      edm::LogWarning("MuonME0DigisHarvestor") << "num not found";
+    if (hist2 == nullptr)
+      edm::LogWarning("MuonME0DigisHarvestor") << "den not found";
+  }
+  return;
 }
 
-
-void 
-MuonME0DigisHarvestor::dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::IGetter& ig)
-{
+void MuonME0DigisHarvestor::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &ig) {
   ig.setCurrentFolder(dbe_path_);
- 
-  const char* l_suffix[6] = {"_l1","_l2","_l3","_l4","_l5","_l6"};
-  const char* r_suffix[2] = {"-1","1"};
-    
-  TString eta_label_den_tot = TString(dbe_path_)+"me0_strip_dg_den_eta_tot";
-  TString eta_label_num_tot = TString(dbe_path_)+"me0_strip_dg_num_eta_tot";
-  if( ig.get(eta_label_num_tot.Data()) !=nullptr && ig.get(eta_label_den_tot.Data()) !=nullptr ) {
-        
-      TH1F* num_vs_eta_tot = (TH1F*)ig.get(eta_label_num_tot.Data())->getTH1F()->Clone();
-      num_vs_eta_tot->Sumw2();
-      TH1F *den_vs_eta_tot = (TH1F*)ig.get(eta_label_den_tot.Data())->getTH1F()->Clone();
-      den_vs_eta_tot->Sumw2();
-      
-      ProcessBooking( ibooker, ig, "me0_strip_dg_eta_tot", num_vs_eta_tot, den_vs_eta_tot );
-      
-      delete num_vs_eta_tot;
-      delete den_vs_eta_tot;
-      
-  }
-  else edm::LogWarning("MuonME0DigisHarvestor")<<"Can not find histograms: "<<eta_label_num_tot<<" or "<<eta_label_den_tot;
-  
-  for( int i = 0 ; i < 2 ; i++) {
-      
-      for( int j = 0; j < 6 ; j++) {
-          
-          TString eta_label_den = TString(dbe_path_)+"me0_strip_dg_den_eta"+r_suffix[i]+l_suffix[j];
-          TString eta_label_num = TString(dbe_path_)+"me0_strip_dg_num_eta"+r_suffix[i]+l_suffix[j];
-
-          if( ig.get(eta_label_num.Data()) !=nullptr && ig.get(eta_label_den.Data()) !=nullptr) {
-            
-              TH1F* num_vs_eta = (TH1F*)ig.get(eta_label_num.Data())->getTH1F()->Clone();
-              num_vs_eta->Sumw2();
-              TH1F* den_vs_eta = (TH1F*)ig.get(eta_label_den.Data())->getTH1F()->Clone();
-              den_vs_eta->Sumw2();
-              
-              std::string r_s = r_suffix[i];
-              std::string l_s = l_suffix[j];
-              std::string name = "me0_strip_dg_eta"+r_s+l_s;
-              ProcessBooking( ibooker, ig, name, num_vs_eta, den_vs_eta );
-              
-              delete num_vs_eta;
-              delete den_vs_eta;
-            
-          }
-          else edm::LogWarning("MuonME0DigisHarvestor")<<"Can not find histograms: "<<eta_label_num<<" "<<eta_label_den;
-
-      }
 
+  const char *l_suffix[6] = {"_l1", "_l2", "_l3", "_l4", "_l5", "_l6"};
+  const char *r_suffix[2] = {"-1", "1"};
+
+  TString eta_label_den_tot = TString(dbe_path_) + "me0_strip_dg_den_eta_tot";
+  TString eta_label_num_tot = TString(dbe_path_) + "me0_strip_dg_num_eta_tot";
+  if (ig.get(eta_label_num_tot.Data()) != nullptr && ig.get(eta_label_den_tot.Data()) != nullptr) {
+    TH1F *num_vs_eta_tot = (TH1F *)ig.get(eta_label_num_tot.Data())->getTH1F()->Clone();
+    num_vs_eta_tot->Sumw2();
+    TH1F *den_vs_eta_tot = (TH1F *)ig.get(eta_label_den_tot.Data())->getTH1F()->Clone();
+    den_vs_eta_tot->Sumw2();
+
+    ProcessBooking(ibooker, ig, "me0_strip_dg_eta_tot", num_vs_eta_tot, den_vs_eta_tot);
+
+    delete num_vs_eta_tot;
+    delete den_vs_eta_tot;
+
+  } else
+    edm::LogWarning("MuonME0DigisHarvestor")
+        << "Can not find histograms: " << eta_label_num_tot << " or " << eta_label_den_tot;
+
+  for (int i = 0; i < 2; i++) {
+    for (int j = 0; j < 6; j++) {
+      TString eta_label_den = TString(dbe_path_) + "me0_strip_dg_den_eta" + r_suffix[i] + l_suffix[j];
+      TString eta_label_num = TString(dbe_path_) + "me0_strip_dg_num_eta" + r_suffix[i] + l_suffix[j];
+
+      if (ig.get(eta_label_num.Data()) != nullptr && ig.get(eta_label_den.Data()) != nullptr) {
+        TH1F *num_vs_eta = (TH1F *)ig.get(eta_label_num.Data())->getTH1F()->Clone();
+        num_vs_eta->Sumw2();
+        TH1F *den_vs_eta = (TH1F *)ig.get(eta_label_den.Data())->getTH1F()->Clone();
+        den_vs_eta->Sumw2();
+
+        std::string r_s = r_suffix[i];
+        std::string l_s = l_suffix[j];
+        std::string name = "me0_strip_dg_eta" + r_s + l_s;
+        ProcessBooking(ibooker, ig, name, num_vs_eta, den_vs_eta);
+
+        delete num_vs_eta;
+        delete den_vs_eta;
+
+      } else
+        edm::LogWarning("MuonME0DigisHarvestor")
+            << "Can not find histograms: " << eta_label_num << " " << eta_label_den;
+    }
   }
-    
-  TString label_eleBkg = TString(dbe_path_)+"me0_strip_dg_bkgElePos_radius";
-  TString label_neuBkg = TString(dbe_path_)+"me0_strip_dg_bkgNeutral_radius";
-  TString label_totBkg = TString(dbe_path_)+"me0_strip_dg_bkg_radius_tot";
-  TString label_evts = TString(dbe_path_)+"num_evts";
-    
-  if( ig.get(label_evts.Data()) !=nullptr ) {
-    
-      TH1F* numEvts = (TH1F*)ig.get(label_evts.Data())->getTH1F()->Clone();
-    
-      if( ig.get(label_eleBkg.Data()) !=nullptr ) {
-      
-          TH1F* eleBkg = (TH1F*)ig.get(label_eleBkg.Data())->getTH1F()->Clone();
-          eleBkg->Sumw2();
-          ProcessBookingBKG( ibooker, ig, "me0_strip_dg_elePosBkg_rad", eleBkg, numEvts);
-          
-          delete eleBkg;
-    
-      }
-      if( ig.get(label_neuBkg.Data()) !=nullptr ) {
-        
-          TH1F* neuBkg = (TH1F*)ig.get(label_neuBkg.Data())->getTH1F()->Clone();
-          neuBkg->Sumw2();
-          ProcessBookingBKG( ibooker, ig, "me0_strip_dg_neuBkg_rad", neuBkg, numEvts);
-          
-          delete neuBkg;
-      
-      }
-      if( ig.get(label_totBkg.Data()) !=nullptr ) {
-        
-          TH1F* totBkg = (TH1F*)ig.get(label_totBkg.Data())->getTH1F()->Clone();
-          totBkg->Sumw2();
-          ProcessBookingBKG( ibooker, ig, "me0_strip_dg_totBkg_rad", totBkg, numEvts);
-          
-          delete totBkg;
-
-      }
-      
-      delete numEvts;
-      
+
+  TString label_eleBkg = TString(dbe_path_) + "me0_strip_dg_bkgElePos_radius";
+  TString label_neuBkg = TString(dbe_path_) + "me0_strip_dg_bkgNeutral_radius";
+  TString label_totBkg = TString(dbe_path_) + "me0_strip_dg_bkg_radius_tot";
+  TString label_evts = TString(dbe_path_) + "num_evts";
+
+  if (ig.get(label_evts.Data()) != nullptr) {
+    TH1F *numEvts = (TH1F *)ig.get(label_evts.Data())->getTH1F()->Clone();
+
+    if (ig.get(label_eleBkg.Data()) != nullptr) {
+      TH1F *eleBkg = (TH1F *)ig.get(label_eleBkg.Data())->getTH1F()->Clone();
+      eleBkg->Sumw2();
+      ProcessBookingBKG(ibooker, ig, "me0_strip_dg_elePosBkg_rad", eleBkg, numEvts);
+
+      delete eleBkg;
+    }
+    if (ig.get(label_neuBkg.Data()) != nullptr) {
+      TH1F *neuBkg = (TH1F *)ig.get(label_neuBkg.Data())->getTH1F()->Clone();
+      neuBkg->Sumw2();
+      ProcessBookingBKG(ibooker, ig, "me0_strip_dg_neuBkg_rad", neuBkg, numEvts);
+
+      delete neuBkg;
+    }
+    if (ig.get(label_totBkg.Data()) != nullptr) {
+      TH1F *totBkg = (TH1F *)ig.get(label_totBkg.Data())->getTH1F()->Clone();
+      totBkg->Sumw2();
+      ProcessBookingBKG(ibooker, ig, "me0_strip_dg_totBkg_rad", totBkg, numEvts);
+
+      delete totBkg;
+    }
+
+    delete numEvts;
   }
-    
 }
 
-
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(MuonME0DigisHarvestor);
diff --git a/Validation/MuonME0Validation/plugins/MuonME0DigisHarvestor.h b/Validation/MuonME0Validation/plugins/MuonME0DigisHarvestor.h
index 8e0f396a036e8..7aca571ada2bc 100644
--- a/Validation/MuonME0Validation/plugins/MuonME0DigisHarvestor.h
+++ b/Validation/MuonME0Validation/plugins/MuonME0DigisHarvestor.h
@@ -1,33 +1,33 @@
 #ifndef MuonME0DigisHarvestor_H
 #define MuonME0DigisHarvestor_H
 
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
-#include "SimMuon/MCTruth/interface/PSimHitMap.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "Geometry/GEMGeometry/interface/ME0Geometry.h"
+#include "SimMuon/MCTruth/interface/PSimHitMap.h"
 
 #include "Validation/MuonME0Validation/interface/ME0DigisValidation.h"
 #include <TEfficiency.h>
 #include <TGraphAsymmErrors.h>
 #include <TProfile.h>
 
-class MuonME0DigisHarvestor : public DQMEDHarvester
-{
+class MuonME0DigisHarvestor : public DQMEDHarvester {
 public:
   /// constructor
-  explicit MuonME0DigisHarvestor(const edm::ParameterSet&);
+  explicit MuonME0DigisHarvestor(const edm::ParameterSet &);
   /// destructor
   ~MuonME0DigisHarvestor() override;
 
   void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
-  void ProcessBooking( DQMStore::IBooker& , DQMStore::IGetter&, std::string nameHist, TH1F* num, TH1F* den );
-  void ProcessBookingBKG( DQMStore::IBooker& ibooker, DQMStore::IGetter& ig, std::string nameHist, TH1F* hist, TH1F* hist2 );
-  TProfile* ComputeEff(TH1F* num, TH1F* denum, std::string nameHist );
-  TH1F* ComputeBKG(TH1F* hist1, TH1F* hist2, std::string nameHist );
+  void ProcessBooking(DQMStore::IBooker &, DQMStore::IGetter &, std::string nameHist, TH1F *num, TH1F *den);
+  void ProcessBookingBKG(
+      DQMStore::IBooker &ibooker, DQMStore::IGetter &ig, std::string nameHist, TH1F *hist, TH1F *hist2);
+  TProfile *ComputeEff(TH1F *num, TH1F *denum, std::string nameHist);
+  TH1F *ComputeBKG(TH1F *hist1, TH1F *hist2, std::string nameHist);
 
 private:
   std::string dbe_path_;
diff --git a/Validation/MuonME0Validation/plugins/MuonME0SegHarvestor.cc b/Validation/MuonME0Validation/plugins/MuonME0SegHarvestor.cc
index 82f4e684b4d63..169900ca90d29 100644
--- a/Validation/MuonME0Validation/plugins/MuonME0SegHarvestor.cc
+++ b/Validation/MuonME0Validation/plugins/MuonME0SegHarvestor.cc
@@ -2,166 +2,148 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "TGraphAsymmErrors.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Utilities/interface/InputTag.h"
+#include "TGraphAsymmErrors.h"
 
-///Geometry
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
+/// Geometry
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
-#include "Geometry/GEMGeometry/interface/ME0Geometry.h"
+#include "Geometry/CommonTopologies/interface/StripTopology.h"
 #include "Geometry/GEMGeometry/interface/ME0EtaPartition.h"
 #include "Geometry/GEMGeometry/interface/ME0EtaPartitionSpecs.h"
-#include "Geometry/CommonTopologies/interface/StripTopology.h"
+#include "Geometry/GEMGeometry/interface/ME0Geometry.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 
-///Log messages
+/// Log messages
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "Validation/MuonME0Validation/plugins/MuonME0SegHarvestor.h"
 
-
-MuonME0SegHarvestor::MuonME0SegHarvestor(const edm::ParameterSet& ps)
-{
+MuonME0SegHarvestor::MuonME0SegHarvestor(const edm::ParameterSet &ps) {
   dbe_path_ = std::string("MuonME0RecHitsV/ME0SegmentsTask/");
 }
 
+MuonME0SegHarvestor::~MuonME0SegHarvestor() {}
 
-MuonME0SegHarvestor::~MuonME0SegHarvestor()
-{
-}
-
-
-TProfile* MuonME0SegHarvestor::ComputeEff(TH1F* num, TH1F* denum, std::string nameHist)
-{
-  std::string name  = "eff_"+nameHist;
-  std::string title = "Segment Efficiency"+std::string(num->GetTitle());
-  TProfile * efficHist = new TProfile(name.c_str(), title.c_str(),denum->GetXaxis()->GetNbins(), denum->GetXaxis()->GetXmin(),denum->GetXaxis()->GetXmax());
-
-  for (int i=1; i <= denum->GetNbinsX(); i++) {
+TProfile *MuonME0SegHarvestor::ComputeEff(TH1F *num, TH1F *denum, std::string nameHist) {
+  std::string name = "eff_" + nameHist;
+  std::string title = "Segment Efficiency" + std::string(num->GetTitle());
+  TProfile *efficHist = new TProfile(name.c_str(),
+                                     title.c_str(),
+                                     denum->GetXaxis()->GetNbins(),
+                                     denum->GetXaxis()->GetXmin(),
+                                     denum->GetXaxis()->GetXmax());
 
+  for (int i = 1; i <= denum->GetNbinsX(); i++) {
     double nNum = num->GetBinContent(i);
     double nDenum = denum->GetBinContent(i);
-    if ( nDenum == 0 || nNum ==0  ) {
+    if (nDenum == 0 || nNum == 0) {
       continue;
     }
-    if ( nNum > nDenum ) {
+    if (nNum > nDenum) {
       double temp = nDenum;
       nDenum = nNum;
       nNum = temp;
-      edm::LogWarning("MuonME0SegHarvestor")<<"Alert! specific bin's num is bigger than denum "<<i<<" "<<nNum<<" "<<nDenum;
+      edm::LogWarning("MuonME0SegHarvestor")
+          << "Alert! specific bin's num is bigger than denum " << i << " " << nNum << " " << nDenum;
     }
-    const double effVal = nNum/nDenum;
+    const double effVal = nNum / nDenum;
     efficHist->SetBinContent(i, effVal);
-    efficHist->SetBinEntries(i,1);
-    efficHist->SetBinError(i,0);
-    const double errLo = TEfficiency::ClopperPearson((int)nDenum,(int)nNum,0.683,false);
-    const double errUp = TEfficiency::ClopperPearson((int)nDenum,(int)nNum,0.683,true);
+    efficHist->SetBinEntries(i, 1);
+    efficHist->SetBinError(i, 0);
+    const double errLo = TEfficiency::ClopperPearson((int)nDenum, (int)nNum, 0.683, false);
+    const double errUp = TEfficiency::ClopperPearson((int)nDenum, (int)nNum, 0.683, true);
     const double errVal = (effVal - errLo > errUp - effVal) ? effVal - errLo : errUp - effVal;
     efficHist->SetBinError(i, sqrt(effVal * effVal + errVal * errVal));
   }
   return efficHist;
 }
 
-
-void MuonME0SegHarvestor::ProcessBooking( DQMStore::IBooker& ibooker, DQMStore::IGetter& ig, std::string nameHist, TH1F* num, TH1F* den )
-{
-    
-  if( num !=nullptr && den !=nullptr ) {
-      
-    TProfile* profile = ComputeEff(num, den, nameHist);
+void MuonME0SegHarvestor::ProcessBooking(
+    DQMStore::IBooker &ibooker, DQMStore::IGetter &ig, std::string nameHist, TH1F *num, TH1F *den) {
+  if (num != nullptr && den != nullptr) {
+    TProfile *profile = ComputeEff(num, den, nameHist);
 
     TString x_axis_title = TString(num->GetXaxis()->GetTitle());
-    TString title  = TString::Format("Segment Efficiency;%s;Eff.",x_axis_title.Data());
+    TString title = TString::Format("Segment Efficiency;%s;Eff.", x_axis_title.Data());
+
+    profile->SetTitle(title.Data());
+    ibooker.bookProfile(profile->GetName(), profile);
 
-    profile->SetTitle( title.Data());
-    ibooker.bookProfile( profile->GetName(),profile);
-      
     delete profile;
-      
-  }
-  else {
-      
-    edm::LogWarning("MuonME0SegHarvestor")<<"Can not find histograms";
-    if ( num == nullptr) edm::LogWarning("MuonME0SegHarvestor")<<"num not found";
-    if ( den == nullptr) edm::LogWarning("MuonME0SegHarvestor")<<"den not found";
-      
+
+  } else {
+    edm::LogWarning("MuonME0SegHarvestor") << "Can not find histograms";
+    if (num == nullptr)
+      edm::LogWarning("MuonME0SegHarvestor") << "num not found";
+    if (den == nullptr)
+      edm::LogWarning("MuonME0SegHarvestor") << "den not found";
   }
   return;
-    
 }
 
-
-void 
-MuonME0SegHarvestor::dqmEndJob(DQMStore::IBooker& ibooker, DQMStore::IGetter& ig)
-{
+void MuonME0SegHarvestor::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &ig) {
   ig.setCurrentFolder(dbe_path_);
-    
-  TString eta_label_den = TString(dbe_path_)+"me0_simsegment_eta";
-  TString eta_label_num = TString(dbe_path_)+"me0_matchedsimsegment_eta";
-  TString pt_label_den = TString(dbe_path_)+"me0_simsegment_pt";
-  TString pt_label_num = TString(dbe_path_)+"me0_matchedsimsegment_pt";
-  TString phi_label_den = TString(dbe_path_)+"me0_simsegment_phi";
-  TString phi_label_num = TString(dbe_path_)+"me0_matchedsimsegment_phi";
-
-  if( ig.get(eta_label_num.Data()) !=nullptr && ig.get(eta_label_den.Data()) !=nullptr ) {
-        
-      TH1F* num_vs_eta = (TH1F*)ig.get(eta_label_num.Data())->getTH1F()->Clone();
-      num_vs_eta->Sumw2();
-      TH1F *den_vs_eta = (TH1F*)ig.get(eta_label_den.Data())->getTH1F()->Clone();
-      den_vs_eta->Sumw2();
-      
-      ProcessBooking( ibooker, ig, "me0segment_eff_vs_eta", num_vs_eta, den_vs_eta );
-      
-      delete num_vs_eta;
-      delete den_vs_eta;
-      
-  }
-  else edm::LogWarning("MuonME0SegHarvestor")<<"Can not find histograms: "<<eta_label_num<<" or "<<eta_label_den;
- 
-  if( ig.get(pt_label_num.Data()) !=nullptr && ig.get(pt_label_den.Data()) !=nullptr ) {
-        
-      TH1F* num_vs_pt = (TH1F*)ig.get(pt_label_num.Data())->getTH1F()->Clone();
-      num_vs_pt->Sumw2();
-      TH1F *den_vs_pt = (TH1F*)ig.get(pt_label_den.Data())->getTH1F()->Clone();
-      den_vs_pt->Sumw2();
-      
-      ProcessBooking( ibooker, ig, "me0segment_eff_vs_pt", num_vs_pt, den_vs_pt );
-      
-      delete num_vs_pt;
-      delete den_vs_pt;
-      
-  }
-  else edm::LogWarning("MuonME0SegHarvestor")<<"Can not find histograms: "<<pt_label_num<<" or "<<pt_label_den;
-
-  if( ig.get(phi_label_num.Data()) !=nullptr && ig.get(phi_label_den.Data()) !=nullptr ) {
-        
-      TH1F* num_vs_phi = (TH1F*)ig.get(phi_label_num.Data())->getTH1F()->Clone();
-      num_vs_phi->Sumw2();
-      TH1F *den_vs_phi = (TH1F*)ig.get(phi_label_den.Data())->getTH1F()->Clone();
-      den_vs_phi->Sumw2();
-      
-      ProcessBooking( ibooker, ig, "me0segment_eff_vs_phi", num_vs_phi, den_vs_phi );
-      
-      delete num_vs_phi;
-      delete den_vs_phi;
-      
-  }
-  else edm::LogWarning("MuonME0SegHarvestor")<<"Can not find histograms: "<<phi_label_num<<" or "<<phi_label_den;
 
-    
-}
+  TString eta_label_den = TString(dbe_path_) + "me0_simsegment_eta";
+  TString eta_label_num = TString(dbe_path_) + "me0_matchedsimsegment_eta";
+  TString pt_label_den = TString(dbe_path_) + "me0_simsegment_pt";
+  TString pt_label_num = TString(dbe_path_) + "me0_matchedsimsegment_pt";
+  TString phi_label_den = TString(dbe_path_) + "me0_simsegment_phi";
+  TString phi_label_num = TString(dbe_path_) + "me0_matchedsimsegment_phi";
+
+  if (ig.get(eta_label_num.Data()) != nullptr && ig.get(eta_label_den.Data()) != nullptr) {
+    TH1F *num_vs_eta = (TH1F *)ig.get(eta_label_num.Data())->getTH1F()->Clone();
+    num_vs_eta->Sumw2();
+    TH1F *den_vs_eta = (TH1F *)ig.get(eta_label_den.Data())->getTH1F()->Clone();
+    den_vs_eta->Sumw2();
+
+    ProcessBooking(ibooker, ig, "me0segment_eff_vs_eta", num_vs_eta, den_vs_eta);
+
+    delete num_vs_eta;
+    delete den_vs_eta;
 
+  } else
+    edm::LogWarning("MuonME0SegHarvestor") << "Can not find histograms: " << eta_label_num << " or " << eta_label_den;
+
+  if (ig.get(pt_label_num.Data()) != nullptr && ig.get(pt_label_den.Data()) != nullptr) {
+    TH1F *num_vs_pt = (TH1F *)ig.get(pt_label_num.Data())->getTH1F()->Clone();
+    num_vs_pt->Sumw2();
+    TH1F *den_vs_pt = (TH1F *)ig.get(pt_label_den.Data())->getTH1F()->Clone();
+    den_vs_pt->Sumw2();
+
+    ProcessBooking(ibooker, ig, "me0segment_eff_vs_pt", num_vs_pt, den_vs_pt);
+
+    delete num_vs_pt;
+    delete den_vs_pt;
+
+  } else
+    edm::LogWarning("MuonME0SegHarvestor") << "Can not find histograms: " << pt_label_num << " or " << pt_label_den;
+
+  if (ig.get(phi_label_num.Data()) != nullptr && ig.get(phi_label_den.Data()) != nullptr) {
+    TH1F *num_vs_phi = (TH1F *)ig.get(phi_label_num.Data())->getTH1F()->Clone();
+    num_vs_phi->Sumw2();
+    TH1F *den_vs_phi = (TH1F *)ig.get(phi_label_den.Data())->getTH1F()->Clone();
+    den_vs_phi->Sumw2();
+
+    ProcessBooking(ibooker, ig, "me0segment_eff_vs_phi", num_vs_phi, den_vs_phi);
+
+    delete num_vs_phi;
+    delete den_vs_phi;
+
+  } else
+    edm::LogWarning("MuonME0SegHarvestor") << "Can not find histograms: " << phi_label_num << " or " << phi_label_den;
+}
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(MuonME0SegHarvestor);
diff --git a/Validation/MuonME0Validation/plugins/MuonME0SegHarvestor.h b/Validation/MuonME0Validation/plugins/MuonME0SegHarvestor.h
index 7738cfcce45ae..d645c5ddd505e 100644
--- a/Validation/MuonME0Validation/plugins/MuonME0SegHarvestor.h
+++ b/Validation/MuonME0Validation/plugins/MuonME0SegHarvestor.h
@@ -1,12 +1,12 @@
 #ifndef MuonME0SegHarvestor_H
 #define MuonME0SegHarvestor_H
 
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 
-#include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include "DQMServices/Core/interface/DQMStore.h"
 #include "Geometry/GEMGeometry/interface/ME0Geometry.h"
 
 #include <TEfficiency.h>
@@ -15,19 +15,18 @@
 
 #include "Validation/MuonME0Validation/interface/ME0RecHitsValidation.h"
 
-class MuonME0SegHarvestor : public DQMEDHarvester
-{
+class MuonME0SegHarvestor : public DQMEDHarvester {
 public:
-    /// constructor
-    explicit MuonME0SegHarvestor(const edm::ParameterSet&);
-    /// destructor
-    ~MuonME0SegHarvestor() override;
-    
-    void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
-    void ProcessBooking( DQMStore::IBooker& , DQMStore::IGetter&, std::string nameHist, TH1F* num, TH1F* den );
-    TProfile* ComputeEff(TH1F* num, TH1F* denum, std::string nameHist );
-    
+  /// constructor
+  explicit MuonME0SegHarvestor(const edm::ParameterSet &);
+  /// destructor
+  ~MuonME0SegHarvestor() override;
+
+  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
+  void ProcessBooking(DQMStore::IBooker &, DQMStore::IGetter &, std::string nameHist, TH1F *num, TH1F *den);
+  TProfile *ComputeEff(TH1F *num, TH1F *denum, std::string nameHist);
+
 private:
-    std::string dbe_path_;
+  std::string dbe_path_;
 };
 #endif
diff --git a/Validation/MuonME0Validation/src/ME0BaseValidation.cc b/Validation/MuonME0Validation/src/ME0BaseValidation.cc
index 9e95caa8fc19d..7ed7063bf992c 100644
--- a/Validation/MuonME0Validation/src/ME0BaseValidation.cc
+++ b/Validation/MuonME0Validation/src/ME0BaseValidation.cc
@@ -1,15 +1,14 @@
-#include "Validation/MuonME0Validation/interface/ME0BaseValidation.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "Validation/MuonME0Validation/interface/ME0BaseValidation.h"
 
 using namespace std;
-ME0BaseValidation::ME0BaseValidation( const edm::ParameterSet& ps)
-{
-  nBinZR_ = ps.getUntrackedParameter<std::vector<double>>("nBinGlobalZR") ;
-  RangeZR_ = ps.getUntrackedParameter< std::vector<double> >("RangeGlobalZR");
-  nBinXY_ = ps.getUntrackedParameter<int>("nBinGlobalXY",160) ;
+ME0BaseValidation::ME0BaseValidation(const edm::ParameterSet &ps) {
+  nBinZR_ = ps.getUntrackedParameter<std::vector<double>>("nBinGlobalZR");
+  RangeZR_ = ps.getUntrackedParameter<std::vector<double>>("RangeGlobalZR");
+  nBinXY_ = ps.getUntrackedParameter<int>("nBinGlobalXY", 160);
 
   regionLabel.push_back("-1");
-  regionLabel.push_back("1" );
+  regionLabel.push_back("1");
 
   layerLabel.push_back("1");
   layerLabel.push_back("2");
@@ -17,52 +16,53 @@ ME0BaseValidation::ME0BaseValidation( const edm::ParameterSet& ps)
   layerLabel.push_back("4");
   layerLabel.push_back("5");
   layerLabel.push_back("6");
-
 }
 
+ME0BaseValidation::~ME0BaseValidation() {}
 
-ME0BaseValidation::~ME0BaseValidation() {
-}
-
-MonitorElement* ME0BaseValidation::BookHistZR( DQMStore::IBooker& ibooker, const char* name, const char* label, unsigned int region_num, unsigned int layer_num) {
+MonitorElement *ME0BaseValidation::BookHistZR(
+    DQMStore::IBooker &ibooker, const char *name, const char *label, unsigned int region_num, unsigned int layer_num) {
   string hist_name, hist_label;
-  if ( layer_num == 0 || layer_num==1 || layer_num==2 || layer_num==3 || layer_num==4 || layer_num==5 || layer_num==6 ) {
-    hist_name  = name+string("_zr_r") + regionLabel[region_num]+"_l"+layerLabel[layer_num];
-    hist_label = label+string(" occupancy : region")+regionLabel[region_num]+" layer "+layerLabel[layer_num]+" "+" ; globalZ [cm]; globalR[cm]";
-  }
-  else {
-    hist_name  = name+string("_zr_r") + regionLabel[region_num];
-    hist_label = label+string(" occupancy : region")+regionLabel[region_num]+" ; globalZ [cm]; globalR[cm]";
+  if (layer_num == 0 || layer_num == 1 || layer_num == 2 || layer_num == 3 || layer_num == 4 || layer_num == 5 ||
+      layer_num == 6) {
+    hist_name = name + string("_zr_r") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
+    hist_label = label + string(" occupancy : region") + regionLabel[region_num] + " layer " + layerLabel[layer_num] +
+                 " " + " ; globalZ [cm]; globalR[cm]";
+  } else {
+    hist_name = name + string("_zr_r") + regionLabel[region_num];
+    hist_label = label + string(" occupancy : region") + regionLabel[region_num] + " ; globalZ [cm]; globalR[cm]";
   }
   int xbin = (int)nBinZR_[0];
   int ybin = (int)nBinZR_[1];
   double xmin = 0;
-  double xmax = 0; 
+  double xmax = 0;
   double ymin = 0;
   double ymax = 0;
-  ymin = RangeZR_[ RangeZR_.size()/2 + 0];;
-  ymax = RangeZR_[ RangeZR_.size()/2 + 1];;
-  if ( region_num ==0 ) {
+  ymin = RangeZR_[RangeZR_.size() / 2 + 0];
+  ;
+  ymax = RangeZR_[RangeZR_.size() / 2 + 1];
+  ;
+  if (region_num == 0) {
     xmin = -RangeZR_[1];
     xmax = -RangeZR_[0];
-  }
-  else {
+  } else {
     xmin = RangeZR_[0];
     xmax = RangeZR_[1];
   }
-  return ibooker.book2D( hist_name, hist_label, xbin, xmin, xmax, ybin,ymin, ymax);
+  return ibooker.book2D(hist_name, hist_label, xbin, xmin, xmax, ybin, ymin, ymax);
 }
 
-MonitorElement* ME0BaseValidation::BookHistXY( DQMStore::IBooker& ibooker, const char* name, const char* label, unsigned int region_num, unsigned int layer_num) {
+MonitorElement *ME0BaseValidation::BookHistXY(
+    DQMStore::IBooker &ibooker, const char *name, const char *label, unsigned int region_num, unsigned int layer_num) {
   string hist_name, hist_label;
-  if ( layer_num == 0 || layer_num==1 || layer_num==2 || layer_num==3 || layer_num==4 || layer_num==5 || layer_num==6 ) {
-    hist_name  = name+string("_xy_r") + regionLabel[region_num]+"_l"+layerLabel[layer_num];
-    hist_label = label+string(" occupancy : region")+regionLabel[region_num]+" layer "+layerLabel[layer_num]+" "+" ; globalX [cm]; globalY[cm]";
+  if (layer_num == 0 || layer_num == 1 || layer_num == 2 || layer_num == 3 || layer_num == 4 || layer_num == 5 ||
+      layer_num == 6) {
+    hist_name = name + string("_xy_r") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
+    hist_label = label + string(" occupancy : region") + regionLabel[region_num] + " layer " + layerLabel[layer_num] +
+                 " " + " ; globalX [cm]; globalY[cm]";
+  } else {
+    hist_name = name + string("_xy_r") + regionLabel[region_num];
+    hist_label = label + string(" occupancy : region") + regionLabel[region_num] + " ; globalX [cm]; globalY[cm]";
   }
-  else {
-    hist_name  = name+string("_xy_r") + regionLabel[region_num];
-    hist_label = label+string(" occupancy : region")+regionLabel[region_num]+" ; globalX [cm]; globalY[cm]";
-  } 
-  return ibooker.book2D( hist_name, hist_label, nBinXY_, -160,160,nBinXY_,-160,160);
+  return ibooker.book2D(hist_name, hist_label, nBinXY_, -160, 160, nBinXY_, -160, 160);
 }
-
diff --git a/Validation/MuonME0Validation/src/ME0DigisValidation.cc b/Validation/MuonME0Validation/src/ME0DigisValidation.cc
index 4bee9304ceb39..f261845c06d8d 100644
--- a/Validation/MuonME0Validation/src/ME0DigisValidation.cc
+++ b/Validation/MuonME0Validation/src/ME0DigisValidation.cc
@@ -1,268 +1,311 @@
 #include "Validation/MuonME0Validation/interface/ME0DigisValidation.h"
 #include <TMath.h>
 
-ME0DigisValidation::ME0DigisValidation(const edm::ParameterSet& cfg):  ME0BaseValidation(cfg)
-{
+ME0DigisValidation::ME0DigisValidation(const edm::ParameterSet &cfg) : ME0BaseValidation(cfg) {
   InputTagToken_ = consumes<edm::PSimHitContainer>(cfg.getParameter<edm::InputTag>("simInputLabel"));
   InputTagToken_Digi = consumes<ME0DigiPreRecoCollection>(cfg.getParameter<edm::InputTag>("digiInputLabel"));
   sigma_x_ = cfg.getParameter<double>("sigma_x");
   sigma_y_ = cfg.getParameter<double>("sigma_y");
 }
 
-void ME0DigisValidation::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & Run, edm::EventSetup const & iSetup ) {
-
-  LogDebug("MuonME0DigisValidation")<<"Info: Loading Geometry information\n";
+void ME0DigisValidation::bookHistograms(DQMStore::IBooker &ibooker,
+                                        edm::Run const &Run,
+                                        edm::EventSetup const &iSetup) {
+  LogDebug("MuonME0DigisValidation") << "Info: Loading Geometry information\n";
   ibooker.setCurrentFolder("MuonME0DigisV/ME0DigisTask");
 
   unsigned int nregion = 2;
 
-  edm::LogInfo("MuonME0DigisValidation")<<"+++ Info : # of region: "<<nregion<<std::endl;
-
-  LogDebug("MuonME0DigisValidation")<<"+++ Info : finish to get geometry information from ES.\n";
-    
-  num_evts = ibooker.book1D( "num_evts", "Number of events; ; Number of events", 1, 0, 2);
-    
-  me0_strip_dg_x_local_tot = ibooker.book1D( "me0_strip_dg_x_local_tot", "Local X; X_{local} [cm]; Entries", 60, -30.0, +30.0);
-  me0_strip_dg_y_local_tot = ibooker.book1D( "me0_strip_dg_y_local_tot", "Local Y; Y_{local} [cm]; Entries", 100, -50.0, +50.0);
-  me0_strip_dg_time_tot = ibooker.book1D( "me0_strip_dg_time_tot", "ToF; ToF [ns]; Entries", 400, -200, +200);
-    
-  me0_strip_dg_dx_local_tot_Muon = ibooker.book1D( "me0_strip_dg_dx_local_tot", "Local DeltaX; #Delta X_{local} [cm]; Entries", 50, -0.1, +0.1);
-  me0_strip_dg_dy_local_tot_Muon = ibooker.book1D( "me0_strip_dg_dy_local_tot", "Local DeltaY; #Delta Y_{local} [cm]; Entries", 500, -10.0, +10.0);
-  me0_strip_dg_dphi_global_tot_Muon = ibooker.book1D( "me0_strip_dg_dphi_global_tot", "Global DeltaPhi; #Delta #phi_{global} [rad]; Entries", 50, -0.01, +0.01);
-  me0_strip_dg_dtime_tot_Muon = ibooker.book1D( "me0_strip_dg_dtime_tot", "DeltaToF; #Delta ToF [ns]; Entries", 50, -5, +5);
-    
-  me0_strip_dg_dphi_vs_phi_global_tot_Muon = ibooker.book2D( "me0_strip_dg_dphi_vs_phi_global_tot", "Global DeltaPhi vs. Phi; #phi_{global} [rad]; #Delta #phi_{global} [rad]", 72,-M_PI,+M_PI,50,-0.01,+0.01);
-    
-  me0_strip_dg_den_eta_tot = ibooker.book1D( "me0_strip_dg_den_eta_tot", "Denominator; #eta; Entries", 12, 1.8, 3.0);
-  me0_strip_dg_num_eta_tot = ibooker.book1D( "me0_strip_dg_num_eta_tot", "Numerator; #eta; Entries", 12, 1.8, 3.0);
-    
+  edm::LogInfo("MuonME0DigisValidation") << "+++ Info : # of region: " << nregion << std::endl;
+
+  LogDebug("MuonME0DigisValidation") << "+++ Info : finish to get geometry information from ES.\n";
+
+  num_evts = ibooker.book1D("num_evts", "Number of events; ; Number of events", 1, 0, 2);
+
+  me0_strip_dg_x_local_tot =
+      ibooker.book1D("me0_strip_dg_x_local_tot", "Local X; X_{local} [cm]; Entries", 60, -30.0, +30.0);
+  me0_strip_dg_y_local_tot =
+      ibooker.book1D("me0_strip_dg_y_local_tot", "Local Y; Y_{local} [cm]; Entries", 100, -50.0, +50.0);
+  me0_strip_dg_time_tot = ibooker.book1D("me0_strip_dg_time_tot", "ToF; ToF [ns]; Entries", 400, -200, +200);
+
+  me0_strip_dg_dx_local_tot_Muon =
+      ibooker.book1D("me0_strip_dg_dx_local_tot", "Local DeltaX; #Delta X_{local} [cm]; Entries", 50, -0.1, +0.1);
+  me0_strip_dg_dy_local_tot_Muon =
+      ibooker.book1D("me0_strip_dg_dy_local_tot", "Local DeltaY; #Delta Y_{local} [cm]; Entries", 500, -10.0, +10.0);
+  me0_strip_dg_dphi_global_tot_Muon = ibooker.book1D(
+      "me0_strip_dg_dphi_global_tot", "Global DeltaPhi; #Delta #phi_{global} [rad]; Entries", 50, -0.01, +0.01);
+  me0_strip_dg_dtime_tot_Muon =
+      ibooker.book1D("me0_strip_dg_dtime_tot", "DeltaToF; #Delta ToF [ns]; Entries", 50, -5, +5);
+
+  me0_strip_dg_dphi_vs_phi_global_tot_Muon = ibooker.book2D("me0_strip_dg_dphi_vs_phi_global_tot",
+                                                            "Global DeltaPhi vs. Phi; #phi_{global} [rad]; #Delta "
+                                                            "#phi_{global} [rad]",
+                                                            72,
+                                                            -M_PI,
+                                                            +M_PI,
+                                                            50,
+                                                            -0.01,
+                                                            +0.01);
+
+  me0_strip_dg_den_eta_tot = ibooker.book1D("me0_strip_dg_den_eta_tot", "Denominator; #eta; Entries", 12, 1.8, 3.0);
+  me0_strip_dg_num_eta_tot = ibooker.book1D("me0_strip_dg_num_eta_tot", "Numerator; #eta; Entries", 12, 1.8, 3.0);
+
   float bins[] = {62.3, 70.0, 77.7, 87.1, 96.4, 108.2, 119.9, 134.7, 149.5};
-  int binnum = sizeof(bins)/sizeof(float) - 1;
-    
-  me0_strip_dg_bkg_rad_tot = ibooker.book1D( "me0_strip_dg_bkg_radius_tot", "Total neutron background; Radius [cm]; Entries", binnum, bins);
-  me0_strip_dg_bkgElePos_rad = ibooker.book1D( "me0_strip_dg_bkgElePos_radius", "Neutron background: electrons+positrons; Radius [cm]; Entries", binnum, bins);
-  me0_strip_dg_bkgNeutral_rad = ibooker.book1D( "me0_strip_dg_bkgNeutral_radius", "Neutron background: gammas+neutrons; Radius [cm]; Entries", binnum, bins);
-    
-  me0_strip_exp_bkg_rad_tot = ibooker.book1D( "me0_strip_exp_bkg_radius_tot", "Total expected neutron background; Radius [cm]; Hit Rate [Hz/cm^{2}]", binnum, bins);
-  me0_strip_exp_bkgElePos_rad = ibooker.book1D( "me0_strip_exp_bkgElePos_radius", "Expected neutron background: electrons+positrons; Radius [cm]; Hit Rate [Hz/cm^{2}]", binnum, bins);
-  me0_strip_exp_bkgNeutral_rad = ibooker.book1D( "me0_strip_exp_bkgNeutral_radius", "Expected neutron background: gammas+neutrons; Radius [cm]; Hit Rate [Hz/cm^{2}]", binnum, bins);
-    
+  int binnum = sizeof(bins) / sizeof(float) - 1;
+
+  me0_strip_dg_bkg_rad_tot =
+      ibooker.book1D("me0_strip_dg_bkg_radius_tot", "Total neutron background; Radius [cm]; Entries", binnum, bins);
+  me0_strip_dg_bkgElePos_rad = ibooker.book1D(
+      "me0_strip_dg_bkgElePos_radius", "Neutron background: electrons+positrons; Radius [cm]; Entries", binnum, bins);
+  me0_strip_dg_bkgNeutral_rad = ibooker.book1D(
+      "me0_strip_dg_bkgNeutral_radius", "Neutron background: gammas+neutrons; Radius [cm]; Entries", binnum, bins);
+
+  me0_strip_exp_bkg_rad_tot = ibooker.book1D("me0_strip_exp_bkg_radius_tot",
+                                             "Total expected neutron background; Radius [cm]; Hit Rate [Hz/cm^{2}]",
+                                             binnum,
+                                             bins);
+  me0_strip_exp_bkgElePos_rad = ibooker.book1D("me0_strip_exp_bkgElePos_radius",
+                                               "Expected neutron background: electrons+positrons; Radius "
+                                               "[cm]; Hit Rate [Hz/cm^{2}]",
+                                               binnum,
+                                               bins);
+  me0_strip_exp_bkgNeutral_rad = ibooker.book1D("me0_strip_exp_bkgNeutral_radius",
+                                                "Expected neutron background: gammas+neutrons; Radius "
+                                                "[cm]; Hit Rate [Hz/cm^{2}]",
+                                                binnum,
+                                                bins);
+
   std::vector<double> neuBkg, eleBkg;
-  neuBkg.push_back(899644.0);     neuBkg.push_back(-30841.0);     neuBkg.push_back(441.28);
-  neuBkg.push_back(-3.3405);      neuBkg.push_back(0.0140588);    neuBkg.push_back(-3.11473e-05); neuBkg.push_back(2.83736e-08);
-  eleBkg.push_back(4.68590e+05);  eleBkg.push_back(-1.63834e+04); eleBkg.push_back(2.35700e+02);
-  eleBkg.push_back(-1.77706e+00); eleBkg.push_back(7.39960e-03);  eleBkg.push_back(-1.61448e-05); eleBkg.push_back(1.44368e-08);
-    
-  for(int i = 1; i < me0_strip_exp_bkgNeutral_rad->getTH1F()->GetSize(); i++){
-      
+  neuBkg.push_back(899644.0);
+  neuBkg.push_back(-30841.0);
+  neuBkg.push_back(441.28);
+  neuBkg.push_back(-3.3405);
+  neuBkg.push_back(0.0140588);
+  neuBkg.push_back(-3.11473e-05);
+  neuBkg.push_back(2.83736e-08);
+  eleBkg.push_back(4.68590e+05);
+  eleBkg.push_back(-1.63834e+04);
+  eleBkg.push_back(2.35700e+02);
+  eleBkg.push_back(-1.77706e+00);
+  eleBkg.push_back(7.39960e-03);
+  eleBkg.push_back(-1.61448e-05);
+  eleBkg.push_back(1.44368e-08);
+
+  for (int i = 1; i < me0_strip_exp_bkgNeutral_rad->getTH1F()->GetSize(); i++) {
     double pos = me0_strip_exp_bkgNeutral_rad->getTH1F()->GetBinCenter(i);
     double neutral = 0;
     double charged = 0;
-      
+
     double pos_helper = 1.0;
-    for(int j = 0; j < 7; ++j) {
-        
-      neutral += neuBkg[j]*pos_helper;
-      charged += eleBkg[j]*pos_helper;
+    for (int j = 0; j < 7; ++j) {
+      neutral += neuBkg[j] * pos_helper;
+      charged += eleBkg[j] * pos_helper;
       pos_helper *= pos;
-
     }
-      
+
     me0_strip_exp_bkgNeutral_rad->setBinContent(i, neutral);
     me0_strip_exp_bkgElePos_rad->setBinContent(i, charged);
-    me0_strip_exp_bkg_rad_tot->setBinContent(i, neutral+charged);
-        
+    me0_strip_exp_bkg_rad_tot->setBinContent(i, neutral + charged);
   }
 
-  for( unsigned int region_num = 0 ; region_num < nregion ; region_num++ ) {
-      me0_strip_dg_zr_tot[region_num] = BookHistZR(ibooker,"me0_strip_dg_tot","Digi",region_num);
-      me0_strip_dg_zr_tot_Muon[region_num] = BookHistZR(ibooker,"me0_strip_dg_tot_Muon","Digi Muon",region_num);
-      for( unsigned int layer_num = 0 ; layer_num < 6 ; layer_num++) {
-          
-          std::string hist_name_for_dx_local  = std::string("me0_strip_dg_dx_local")+regionLabel[region_num]+"_l"+layerLabel[layer_num];
-          std::string hist_name_for_dy_local  = std::string("me0_strip_dg_dy_local")+regionLabel[region_num]+"_l"+layerLabel[layer_num];
-          std::string hist_name_for_dphi_global  = std::string("me0_strip_dg_dphi_global")+regionLabel[region_num]+"_l"+layerLabel[layer_num];
-          
-          std::string hist_name_for_den_eta  = std::string("me0_strip_dg_den_eta")+regionLabel[region_num]+"_l"+layerLabel[layer_num];
-          std::string hist_name_for_num_eta  = std::string("me0_strip_dg_num_eta")+regionLabel[region_num]+"_l"+layerLabel[layer_num];
-
-          std::string hist_label_for_dx_local = "Local DeltaX: region"+regionLabel[region_num]+" layer "+layerLabel[layer_num]+" ; #Delta X_{local} [cm]; Entries";
-          std::string hist_label_for_dy_local = "Local DeltaY: region"+regionLabel[region_num]+" layer "+layerLabel[layer_num]+" ; #Delta Y_{local} [cm]; Entries";
-          std::string hist_label_for_dphi_global = "Global DeltaPhi: region"+regionLabel[region_num]+" layer "+layerLabel[layer_num]+" ; #Delta #phi_{global} [rad]; Entries";
-          
-          std::string hist_label_for_den_eta = "Denominator: region"+regionLabel[region_num]+" layer "+layerLabel[layer_num]+" ; #eta; Entries";
-          std::string hist_label_for_num_eta = "Numerator: region"+regionLabel[region_num]+" layer "+layerLabel[layer_num]+" ; #eta; Entries";
-
-          me0_strip_dg_xy[region_num][layer_num] = BookHistXY(ibooker,"me0_strip_dg","Digi",region_num,layer_num);
-          me0_strip_dg_xy_Muon[region_num][layer_num] = BookHistXY(ibooker,"me0_strip_dg_Muon","Digi Muon",region_num,layer_num);
-          
-          me0_strip_dg_dx_local_Muon[region_num][layer_num] = ibooker.book1D( hist_name_for_dx_local.c_str(), hist_label_for_dx_local.c_str(), 50, -0.1, +0.1);
-          me0_strip_dg_dy_local_Muon[region_num][layer_num] = ibooker.book1D( hist_name_for_dy_local.c_str(), hist_label_for_dy_local.c_str(), 500, -10.0, +10.0);
-          me0_strip_dg_dphi_global_Muon[region_num][layer_num] = ibooker.book1D( hist_name_for_dphi_global.c_str(), hist_label_for_dphi_global.c_str(), 50, -0.01, +0.01);
-          
-          me0_strip_dg_den_eta[region_num][layer_num] = ibooker.book1D( hist_name_for_den_eta, hist_label_for_den_eta, 12, 1.8, 3.0);
-          me0_strip_dg_num_eta[region_num][layer_num] = ibooker.book1D( hist_name_for_num_eta, hist_label_for_num_eta, 12, 1.8, 3.0);
+  for (unsigned int region_num = 0; region_num < nregion; region_num++) {
+    me0_strip_dg_zr_tot[region_num] = BookHistZR(ibooker, "me0_strip_dg_tot", "Digi", region_num);
+    me0_strip_dg_zr_tot_Muon[region_num] = BookHistZR(ibooker, "me0_strip_dg_tot_Muon", "Digi Muon", region_num);
+    for (unsigned int layer_num = 0; layer_num < 6; layer_num++) {
+      std::string hist_name_for_dx_local =
+          std::string("me0_strip_dg_dx_local") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
+      std::string hist_name_for_dy_local =
+          std::string("me0_strip_dg_dy_local") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
+      std::string hist_name_for_dphi_global =
+          std::string("me0_strip_dg_dphi_global") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
 
-      }
+      std::string hist_name_for_den_eta =
+          std::string("me0_strip_dg_den_eta") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
+      std::string hist_name_for_num_eta =
+          std::string("me0_strip_dg_num_eta") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
+
+      std::string hist_label_for_dx_local = "Local DeltaX: region" + regionLabel[region_num] + " layer " +
+                                            layerLabel[layer_num] + " ; #Delta X_{local} [cm]; Entries";
+      std::string hist_label_for_dy_local = "Local DeltaY: region" + regionLabel[region_num] + " layer " +
+                                            layerLabel[layer_num] + " ; #Delta Y_{local} [cm]; Entries";
+      std::string hist_label_for_dphi_global = "Global DeltaPhi: region" + regionLabel[region_num] + " layer " +
+                                               layerLabel[layer_num] + " ; #Delta #phi_{global} [rad]; Entries";
+
+      std::string hist_label_for_den_eta =
+          "Denominator: region" + regionLabel[region_num] + " layer " + layerLabel[layer_num] + " ; #eta; Entries";
+      std::string hist_label_for_num_eta =
+          "Numerator: region" + regionLabel[region_num] + " layer " + layerLabel[layer_num] + " ; #eta; Entries";
+
+      me0_strip_dg_xy[region_num][layer_num] = BookHistXY(ibooker, "me0_strip_dg", "Digi", region_num, layer_num);
+      me0_strip_dg_xy_Muon[region_num][layer_num] =
+          BookHistXY(ibooker, "me0_strip_dg_Muon", "Digi Muon", region_num, layer_num);
+
+      me0_strip_dg_dx_local_Muon[region_num][layer_num] =
+          ibooker.book1D(hist_name_for_dx_local.c_str(), hist_label_for_dx_local.c_str(), 50, -0.1, +0.1);
+      me0_strip_dg_dy_local_Muon[region_num][layer_num] =
+          ibooker.book1D(hist_name_for_dy_local.c_str(), hist_label_for_dy_local.c_str(), 500, -10.0, +10.0);
+      me0_strip_dg_dphi_global_Muon[region_num][layer_num] =
+          ibooker.book1D(hist_name_for_dphi_global.c_str(), hist_label_for_dphi_global.c_str(), 50, -0.01, +0.01);
+
+      me0_strip_dg_den_eta[region_num][layer_num] =
+          ibooker.book1D(hist_name_for_den_eta, hist_label_for_den_eta, 12, 1.8, 3.0);
+      me0_strip_dg_num_eta[region_num][layer_num] =
+          ibooker.book1D(hist_name_for_num_eta, hist_label_for_num_eta, 12, 1.8, 3.0);
+    }
   }
 }
 
-ME0DigisValidation::~ME0DigisValidation() {
-}
+ME0DigisValidation::~ME0DigisValidation() {}
 
+void ME0DigisValidation::analyze(const edm::Event &e, const edm::EventSetup &iSetup) {
+  edm::ESHandle<ME0Geometry> hGeom;
+  iSetup.get<MuonGeometryRecord>().get(hGeom);
+  const ME0Geometry *ME0Geometry_ = (&*hGeom);
 
-void ME0DigisValidation::analyze(const edm::Event& e,
-                                     const edm::EventSetup& iSetup)
-{
- edm::ESHandle<ME0Geometry> hGeom;
- iSetup.get<MuonGeometryRecord>().get(hGeom);
- const ME0Geometry* ME0Geometry_ =( &*hGeom);
-    
   edm::Handle<edm::PSimHitContainer> ME0Hits;
   e.getByToken(InputTagToken_, ME0Hits);
 
   edm::Handle<ME0DigiPreRecoCollection> ME0Digis;
   e.getByToken(InputTagToken_Digi, ME0Digis);
 
-  if (!ME0Hits.isValid() | !ME0Digis.isValid() ) {
+  if (!ME0Hits.isValid() | !ME0Digis.isValid()) {
     edm::LogError("ME0DigisValidation") << "Cannot get ME0Hits/ME0Digis by Token simInputTagToken";
-    return ;
+    return;
   }
-    
+
   num_evts->Fill(1);
   bool toBeCounted1 = true;
 
-  for (ME0DigiPreRecoCollection::DigiRangeIterator cItr=ME0Digis->begin(); cItr!=ME0Digis->end(); cItr++) {
+  for (ME0DigiPreRecoCollection::DigiRangeIterator cItr = ME0Digis->begin(); cItr != ME0Digis->end(); cItr++) {
     ME0DetId id = (*cItr).first;
 
-    const GeomDet* gdet = ME0Geometry_->idToDet(id);
-    if ( gdet == nullptr) {
-      edm::LogWarning("ME0DigisValidation")<<"Getting DetId failed. Discard this gem strip hit. Maybe it comes from unmatched geometry.";
+    const GeomDet *gdet = ME0Geometry_->idToDet(id);
+    if (gdet == nullptr) {
+      edm::LogWarning("ME0DigisValidation") << "Getting DetId failed. Discard this gem strip hit. Maybe it comes "
+                                               "from unmatched geometry.";
       continue;
     }
-    const BoundPlane & surface = gdet->surface();
+    const BoundPlane &surface = gdet->surface();
 
-    int region = (int) id.region();
-    int layer = (int) id.layer();
-    int chamber = (int) id.chamber();
-    int roll = (int) id.roll();
+    int region = (int)id.region();
+    int layer = (int)id.layer();
+    int chamber = (int)id.chamber();
+    int roll = (int)id.roll();
 
     ME0DigiPreRecoCollection::const_iterator digiItr;
-    for (digiItr = (*cItr ).second.first; digiItr != (*cItr ).second.second; ++digiItr)
-    {
-
+    for (digiItr = (*cItr).second.first; digiItr != (*cItr).second.second; ++digiItr) {
       LocalPoint lp(digiItr->x(), digiItr->y(), 0);
 
       GlobalPoint gp = surface.toGlobal(lp);
 
-      float g_r = (float) gp.perp();
-      float g_x = (float) gp.x();
-      float g_y = (float) gp.y();
-      float g_z = (float) gp.z();
-        
+      float g_r = (float)gp.perp();
+      float g_x = (float)gp.x();
+      float g_y = (float)gp.y();
+      float g_z = (float)gp.z();
+
       int particleType = digiItr->pdgid();
       int isPrompt = digiItr->prompt();
-    
+
       float timeOfFlight = digiItr->tof();
-        
+
       me0_strip_dg_x_local_tot->Fill(lp.x());
       me0_strip_dg_y_local_tot->Fill(lp.y());
       me0_strip_dg_time_tot->Fill(timeOfFlight);
 
       // fill hist
-      int region_num = 0 ;
-      if ( region == -1 ) region_num = 0 ;
-      else if ( region == 1) region_num = 1;
-      int layer_num = layer-1;
-        
+      int region_num = 0;
+      if (region == -1)
+        region_num = 0;
+      else if (region == 1)
+        region_num = 1;
+      int layer_num = layer - 1;
+
       bool toBeCounted2 = true;
 
       if (isPrompt == 1 && abs(particleType) == 13) {
-          
-        me0_strip_dg_zr_tot_Muon[region_num]->Fill(g_z,g_r);
-        me0_strip_dg_xy_Muon[region_num][layer_num]->Fill(g_x,g_y);
-
-        for (auto hits=ME0Hits->begin(); hits!=ME0Hits->end(); hits++) {
-            
-            int particleType_sh = hits->particleType();
-            int evtId_sh = hits->eventId().event();
-            int bx_sh = hits->eventId().bunchCrossing();
-            int procType_sh = hits->processType();
-
-            if(!(abs(particleType_sh) == 13 && evtId_sh == 0 && bx_sh == 0 && procType_sh == 0)) continue;
-            
-            const ME0DetId id(hits->detUnitId());
-            int region_sh = id.region();
-            int layer_sh = id.layer();
-            int chamber_sh = id.chamber();
-            int roll_sh = id.roll();
-            
-            int region_sh_num = 0 ;
-            if ( region_sh == -1 ) region_sh_num = 0 ;
-            else if ( region_sh == 1) region_sh_num = 1;
-            int layer_sh_num = layer_sh - 1;
-            
-            LocalPoint lp_sh = hits->localPosition();
-            GlobalPoint gp_sh = ME0Geometry_->idToDet(id)->surface().toGlobal(lp_sh);
-            
-            if(toBeCounted1){
-                
-                me0_strip_dg_den_eta[region_sh_num][layer_sh_num]->Fill(fabs(gp_sh.eta()));
-                me0_strip_dg_den_eta_tot->Fill(fabs(gp_sh.eta()));
-            }
-            
-            if(!(region == region_sh && layer == layer_sh && chamber == chamber_sh && roll == roll_sh)) continue;
-            
-            float dx_loc = lp_sh.x()-lp.x();
-            float dy_loc = lp_sh.y()-lp.y();
-            float dphi_glob = gp_sh.phi()-gp.phi();
-            float deta_glob = gp_sh.eta()-gp.eta();
-
-            if(!(fabs(dphi_glob) < 3*sigma_x_ && fabs(deta_glob) < 3*sigma_y_)) continue;
-            
-            float timeOfFlight_sh = hits->tof();
-            const LocalPoint centralLP(0., 0., 0.);
-            const GlobalPoint centralGP(ME0Geometry_->idToDet(id)->surface().toGlobal(centralLP));
-            float centralTOF(centralGP.mag() / 29.98); //speed of light
-            float timeOfFlight_sh_corr = timeOfFlight_sh - centralTOF;
-            
-            me0_strip_dg_dx_local_Muon[region_num][layer_num]->Fill(dx_loc);
-            me0_strip_dg_dy_local_Muon[region_num][layer_num]->Fill(dy_loc);
-            me0_strip_dg_dphi_global_Muon[region_num][layer_num]->Fill(dphi_glob);
-            
-            me0_strip_dg_dx_local_tot_Muon->Fill(dx_loc);
-            me0_strip_dg_dy_local_tot_Muon->Fill(dy_loc);
-            me0_strip_dg_dphi_global_tot_Muon->Fill(dphi_glob);
-            
-            me0_strip_dg_dphi_vs_phi_global_tot_Muon->Fill(gp_sh.phi(),dphi_glob);
-            me0_strip_dg_dtime_tot_Muon->Fill(timeOfFlight - timeOfFlight_sh_corr);
-                
-            if(toBeCounted2){
-                    
-                me0_strip_dg_num_eta[region_num][layer_num]->Fill(fabs(gp_sh.eta()));
-                me0_strip_dg_num_eta_tot->Fill(fabs(gp_sh.eta()));
-                
-            }
-            toBeCounted2 = false;
-            
-        }//loop SH
-          
-      toBeCounted1 = false;
-          
-      }
-      else {
-        me0_strip_dg_zr_tot[region_num]->Fill(g_z,g_r);
-        me0_strip_dg_xy[region_num][layer_num]->Fill(g_x,g_y);
+        me0_strip_dg_zr_tot_Muon[region_num]->Fill(g_z, g_r);
+        me0_strip_dg_xy_Muon[region_num][layer_num]->Fill(g_x, g_y);
+
+        for (auto hits = ME0Hits->begin(); hits != ME0Hits->end(); hits++) {
+          int particleType_sh = hits->particleType();
+          int evtId_sh = hits->eventId().event();
+          int bx_sh = hits->eventId().bunchCrossing();
+          int procType_sh = hits->processType();
+
+          if (!(abs(particleType_sh) == 13 && evtId_sh == 0 && bx_sh == 0 && procType_sh == 0))
+            continue;
+
+          const ME0DetId id(hits->detUnitId());
+          int region_sh = id.region();
+          int layer_sh = id.layer();
+          int chamber_sh = id.chamber();
+          int roll_sh = id.roll();
+
+          int region_sh_num = 0;
+          if (region_sh == -1)
+            region_sh_num = 0;
+          else if (region_sh == 1)
+            region_sh_num = 1;
+          int layer_sh_num = layer_sh - 1;
+
+          LocalPoint lp_sh = hits->localPosition();
+          GlobalPoint gp_sh = ME0Geometry_->idToDet(id)->surface().toGlobal(lp_sh);
+
+          if (toBeCounted1) {
+            me0_strip_dg_den_eta[region_sh_num][layer_sh_num]->Fill(fabs(gp_sh.eta()));
+            me0_strip_dg_den_eta_tot->Fill(fabs(gp_sh.eta()));
+          }
+
+          if (!(region == region_sh && layer == layer_sh && chamber == chamber_sh && roll == roll_sh))
+            continue;
+
+          float dx_loc = lp_sh.x() - lp.x();
+          float dy_loc = lp_sh.y() - lp.y();
+          float dphi_glob = gp_sh.phi() - gp.phi();
+          float deta_glob = gp_sh.eta() - gp.eta();
+
+          if (!(fabs(dphi_glob) < 3 * sigma_x_ && fabs(deta_glob) < 3 * sigma_y_))
+            continue;
+
+          float timeOfFlight_sh = hits->tof();
+          const LocalPoint centralLP(0., 0., 0.);
+          const GlobalPoint centralGP(ME0Geometry_->idToDet(id)->surface().toGlobal(centralLP));
+          float centralTOF(centralGP.mag() / 29.98);  // speed of light
+          float timeOfFlight_sh_corr = timeOfFlight_sh - centralTOF;
+
+          me0_strip_dg_dx_local_Muon[region_num][layer_num]->Fill(dx_loc);
+          me0_strip_dg_dy_local_Muon[region_num][layer_num]->Fill(dy_loc);
+          me0_strip_dg_dphi_global_Muon[region_num][layer_num]->Fill(dphi_glob);
+
+          me0_strip_dg_dx_local_tot_Muon->Fill(dx_loc);
+          me0_strip_dg_dy_local_tot_Muon->Fill(dy_loc);
+          me0_strip_dg_dphi_global_tot_Muon->Fill(dphi_glob);
+
+          me0_strip_dg_dphi_vs_phi_global_tot_Muon->Fill(gp_sh.phi(), dphi_glob);
+          me0_strip_dg_dtime_tot_Muon->Fill(timeOfFlight - timeOfFlight_sh_corr);
+
+          if (toBeCounted2) {
+            me0_strip_dg_num_eta[region_num][layer_num]->Fill(fabs(gp_sh.eta()));
+            me0_strip_dg_num_eta_tot->Fill(fabs(gp_sh.eta()));
+          }
+          toBeCounted2 = false;
+
+        }  // loop SH
+
+        toBeCounted1 = false;
+
+      } else {
+        me0_strip_dg_zr_tot[region_num]->Fill(g_z, g_r);
+        me0_strip_dg_xy[region_num][layer_num]->Fill(g_x, g_y);
       }
-        
+
       if ((abs(particleType) == 11 || abs(particleType) == 22 || abs(particleType) == 2112) && isPrompt == 0)
-          me0_strip_dg_bkg_rad_tot->Fill(fabs(gp.perp()));
+        me0_strip_dg_bkg_rad_tot->Fill(fabs(gp.perp()));
       if ((abs(particleType) == 11) && isPrompt == 0)
-          me0_strip_dg_bkgElePos_rad->Fill(fabs(gp.perp()));
+        me0_strip_dg_bkgElePos_rad->Fill(fabs(gp.perp()));
       if ((abs(particleType) == 22 || abs(particleType) == 2112) && isPrompt == 0)
-          me0_strip_dg_bkgNeutral_rad->Fill(fabs(gp.perp()));
-        
-    }//loop DG
-  }
+        me0_strip_dg_bkgNeutral_rad->Fill(fabs(gp.perp()));
 
+    }  // loop DG
+  }
 }
diff --git a/Validation/MuonME0Validation/src/ME0HitsValidation.cc b/Validation/MuonME0Validation/src/ME0HitsValidation.cc
index 630b2b6799e20..0914e92597f69 100644
--- a/Validation/MuonME0Validation/src/ME0HitsValidation.cc
+++ b/Validation/MuonME0Validation/src/ME0HitsValidation.cc
@@ -1,83 +1,85 @@
-#include "Validation/MuonME0Validation/interface/ME0HitsValidation.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "Validation/MuonME0Validation/interface/ME0HitsValidation.h"
 #include <TMath.h>
 
-ME0HitsValidation::ME0HitsValidation(const edm::ParameterSet& cfg):  ME0BaseValidation(cfg)
-{
+ME0HitsValidation::ME0HitsValidation(const edm::ParameterSet &cfg) : ME0BaseValidation(cfg) {
   InputTagToken_ = consumes<edm::PSimHitContainer>(cfg.getParameter<edm::InputTag>("simInputLabel"));
 }
 
-void ME0HitsValidation::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & Run, edm::EventSetup const & iSetup ) {
-
-  LogDebug("MuonME0HitsValidation")<<"Info : Loading Geometry information\n";
+void ME0HitsValidation::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &Run, edm::EventSetup const &iSetup) {
+  LogDebug("MuonME0HitsValidation") << "Info : Loading Geometry information\n";
   ibooker.setCurrentFolder("MuonME0HitsV/ME0HitsTask");
 
-  unsigned int nregion  = 2;
-
-  edm::LogInfo("MuonME0HitsValidation")<<"+++ Info : # of region : "<<nregion<<std::endl;
-
-  LogDebug("MuonME0HitsValidation")<<"+++ Info : finish to get geometry information from ES.\n";
-
-
-  for( unsigned int region_num = 0 ; region_num < nregion ; region_num++ ) {
-          me0_sh_tot_zr[region_num] = BookHistZR(ibooker,"me0_sh","SimHit",region_num);
-      for( unsigned int layer_num = 0 ; layer_num < 6 ; layer_num++) {
-          me0_sh_zr[region_num][layer_num] = BookHistZR(ibooker,"me0_sh","SimHit",region_num,layer_num);
-          me0_sh_xy[region_num][layer_num] = BookHistXY(ibooker,"me0_sh","SimHit",region_num,layer_num);
-          std::string hist_name_for_tof  = std::string("me0_sh_tof_r")+regionLabel[region_num]+"_l"+layerLabel[layer_num];
-          std::string hist_name_for_tofMu  = std::string("me0_sh_tofMuon_r")+regionLabel[region_num]+"_l"+layerLabel[layer_num];
-          std::string hist_name_for_eloss  = std::string("me0_sh_energyloss_r")+regionLabel[region_num]+"_l"+layerLabel[layer_num];
-          std::string hist_name_for_elossMu  = std::string("me0_sh_energylossMuon_r")+regionLabel[region_num]+"_l"+layerLabel[layer_num];
-          std::string hist_label_for_xy = "SimHit occupancy : region"+regionLabel[region_num]+" layer "+layerLabel[layer_num]+" ; globalX [cm]; globalY[cm]";
-          std::string hist_label_for_tof = "SimHit TOF : region"+regionLabel[region_num]+" layer "+layerLabel[layer_num]+" "+" ; Time of flight [ns] ; entries";
-          std::string hist_label_for_tofMu = "SimHit TOF(Muon only) : region"+regionLabel[region_num]+" layer "+layerLabel[layer_num]+" "+" ; Time of flight [ns] ; entries";
-          std::string hist_label_for_eloss = "SimHit energy loss : region"+regionLabel[region_num]+" layer "+layerLabel[layer_num]+" "+" ; Energy loss [eV] ; entries";
-          std::string hist_label_for_elossMu = "SimHit energy loss(Muon only) : region"+regionLabel[region_num]+" layer "+layerLabel[layer_num]+" "+" ; Energy loss [eV] ; entries";
-
-
-          double tof_min, tof_max;
-          tof_min = 10; tof_max = 30;
-          me0_sh_tof[region_num][layer_num] = ibooker.book1D( hist_name_for_tof.c_str(), hist_label_for_tof.c_str(), 40,tof_min,tof_max);
-          me0_sh_tofMu[region_num][layer_num] = ibooker.book1D( hist_name_for_tofMu.c_str(), hist_label_for_tofMu.c_str(), 40,tof_min,tof_max);
-          me0_sh_eloss[region_num][layer_num] = ibooker.book1D( hist_name_for_eloss.c_str(), hist_label_for_eloss.c_str(), 60,0.,6000.);
-          me0_sh_elossMu[region_num][layer_num] = ibooker.book1D( hist_name_for_elossMu.c_str(), hist_label_for_elossMu.c_str(), 60,0.,6000.);
-      }
+  unsigned int nregion = 2;
+
+  edm::LogInfo("MuonME0HitsValidation") << "+++ Info : # of region : " << nregion << std::endl;
+
+  LogDebug("MuonME0HitsValidation") << "+++ Info : finish to get geometry information from ES.\n";
+
+  for (unsigned int region_num = 0; region_num < nregion; region_num++) {
+    me0_sh_tot_zr[region_num] = BookHistZR(ibooker, "me0_sh", "SimHit", region_num);
+    for (unsigned int layer_num = 0; layer_num < 6; layer_num++) {
+      me0_sh_zr[region_num][layer_num] = BookHistZR(ibooker, "me0_sh", "SimHit", region_num, layer_num);
+      me0_sh_xy[region_num][layer_num] = BookHistXY(ibooker, "me0_sh", "SimHit", region_num, layer_num);
+      std::string hist_name_for_tof =
+          std::string("me0_sh_tof_r") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
+      std::string hist_name_for_tofMu =
+          std::string("me0_sh_tofMuon_r") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
+      std::string hist_name_for_eloss =
+          std::string("me0_sh_energyloss_r") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
+      std::string hist_name_for_elossMu =
+          std::string("me0_sh_energylossMuon_r") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
+      std::string hist_label_for_xy = "SimHit occupancy : region" + regionLabel[region_num] + " layer " +
+                                      layerLabel[layer_num] + " ; globalX [cm]; globalY[cm]";
+      std::string hist_label_for_tof = "SimHit TOF : region" + regionLabel[region_num] + " layer " +
+                                       layerLabel[layer_num] + " " + " ; Time of flight [ns] ; entries";
+      std::string hist_label_for_tofMu = "SimHit TOF(Muon only) : region" + regionLabel[region_num] + " layer " +
+                                         layerLabel[layer_num] + " " + " ; Time of flight [ns] ; entries";
+      std::string hist_label_for_eloss = "SimHit energy loss : region" + regionLabel[region_num] + " layer " +
+                                         layerLabel[layer_num] + " " + " ; Energy loss [eV] ; entries";
+      std::string hist_label_for_elossMu = "SimHit energy loss(Muon only) : region" + regionLabel[region_num] +
+                                           " layer " + layerLabel[layer_num] + " " + " ; Energy loss [eV] ; entries";
+
+      double tof_min, tof_max;
+      tof_min = 10;
+      tof_max = 30;
+      me0_sh_tof[region_num][layer_num] =
+          ibooker.book1D(hist_name_for_tof.c_str(), hist_label_for_tof.c_str(), 40, tof_min, tof_max);
+      me0_sh_tofMu[region_num][layer_num] =
+          ibooker.book1D(hist_name_for_tofMu.c_str(), hist_label_for_tofMu.c_str(), 40, tof_min, tof_max);
+      me0_sh_eloss[region_num][layer_num] =
+          ibooker.book1D(hist_name_for_eloss.c_str(), hist_label_for_eloss.c_str(), 60, 0., 6000.);
+      me0_sh_elossMu[region_num][layer_num] =
+          ibooker.book1D(hist_name_for_elossMu.c_str(), hist_label_for_elossMu.c_str(), 60, 0., 6000.);
+    }
   }
 }
 
+ME0HitsValidation::~ME0HitsValidation() {}
 
-ME0HitsValidation::~ME0HitsValidation() {
-}
-
-
-void ME0HitsValidation::analyze(const edm::Event& e,
-                                     const edm::EventSetup& iSetup)
-{
- edm::ESHandle<ME0Geometry> hGeom;
- iSetup.get<MuonGeometryRecord>().get(hGeom);
- const ME0Geometry* ME0Geometry_ =( &*hGeom);
+void ME0HitsValidation::analyze(const edm::Event &e, const edm::EventSetup &iSetup) {
+  edm::ESHandle<ME0Geometry> hGeom;
+  iSetup.get<MuonGeometryRecord>().get(hGeom);
+  const ME0Geometry *ME0Geometry_ = (&*hGeom);
 
   edm::Handle<edm::PSimHitContainer> ME0Hits;
   e.getByToken(InputTagToken_, ME0Hits);
   if (!ME0Hits.isValid()) {
     edm::LogError("ME0HitsValidation") << "Cannot get ME0Hits by Token simInputTagToken";
-    return ;
+    return;
   }
 
   Float_t timeOfFlightMuon = 0.;
   Float_t energyLossMuon = 0;
 
-  for (auto hits=ME0Hits->begin(); hits!=ME0Hits->end(); hits++) {
-
+  for (auto hits = ME0Hits->begin(); hits != ME0Hits->end(); hits++) {
     const ME0DetId id(hits->detUnitId());
     Int_t region = id.region();
     Int_t layer = id.layer();
 
-
-
-    //Int_t even_odd = id.chamber()%2;
-    if ( ME0Geometry_->idToDet(hits->detUnitId()) == nullptr) {
-      std::cout<<"simHit did not matched with GEMGeometry."<<std::endl;
+    // Int_t even_odd = id.chamber()%2;
+    if (ME0Geometry_->idToDet(hits->detUnitId()) == nullptr) {
+      std::cout << "simHit did not matched with GEMGeometry." << std::endl;
       continue;
     }
 
@@ -91,21 +93,18 @@ void ME0HitsValidation::analyze(const edm::Event& e,
     Float_t energyLoss = hits->energyLoss();
     Float_t timeOfFlight = hits->timeOfFlight();
 
-    if (abs(hits-> particleType()) == 13)
-    {
+    if (abs(hits->particleType()) == 13) {
       timeOfFlightMuon = hits->timeOfFlight();
       energyLossMuon = hits->energyLoss();
-      //fill histos for Muons only
-      me0_sh_tofMu[(int)(region/2.+0.5)][layer-1]->Fill(timeOfFlightMuon);
-      me0_sh_elossMu[(int)(region/2.+0.5)][layer-1]->Fill(energyLossMuon*1.e9);
-
+      // fill histos for Muons only
+      me0_sh_tofMu[(int)(region / 2. + 0.5)][layer - 1]->Fill(timeOfFlightMuon);
+      me0_sh_elossMu[(int)(region / 2. + 0.5)][layer - 1]->Fill(energyLossMuon * 1.e9);
     }
-    
-    me0_sh_zr[(int)(region/2.+0.5)][layer-1]->Fill(g_z,g_r);
-    me0_sh_tot_zr[(int)(region/2.+0.5)]->Fill(g_z,g_r);
-    me0_sh_xy[(int)(region/2.+0.5)][layer-1]->Fill(g_x,g_y);
-    me0_sh_tof[(int)(region/2.+0.5)][layer-1]->Fill(timeOfFlight);
-    me0_sh_eloss[(int)(region/2.+0.5)][layer-1]->Fill(energyLoss*1.e9);
-
-   }
+
+    me0_sh_zr[(int)(region / 2. + 0.5)][layer - 1]->Fill(g_z, g_r);
+    me0_sh_tot_zr[(int)(region / 2. + 0.5)]->Fill(g_z, g_r);
+    me0_sh_xy[(int)(region / 2. + 0.5)][layer - 1]->Fill(g_x, g_y);
+    me0_sh_tof[(int)(region / 2. + 0.5)][layer - 1]->Fill(timeOfFlight);
+    me0_sh_eloss[(int)(region / 2. + 0.5)][layer - 1]->Fill(energyLoss * 1.e9);
+  }
 }
diff --git a/Validation/MuonME0Validation/src/ME0RecHitsValidation.cc b/Validation/MuonME0Validation/src/ME0RecHitsValidation.cc
index a9313fdf8c499..48c70f713e3ce 100644
--- a/Validation/MuonME0Validation/src/ME0RecHitsValidation.cc
+++ b/Validation/MuonME0Validation/src/ME0RecHitsValidation.cc
@@ -1,156 +1,155 @@
 #include "Validation/MuonME0Validation/interface/ME0RecHitsValidation.h"
 #include <TMath.h>
 
-ME0RecHitsValidation::ME0RecHitsValidation(const edm::ParameterSet& cfg):  ME0BaseValidation(cfg)
-{
+ME0RecHitsValidation::ME0RecHitsValidation(const edm::ParameterSet &cfg) : ME0BaseValidation(cfg) {
   InputTagToken_ = consumes<edm::PSimHitContainer>(cfg.getParameter<edm::InputTag>("simInputLabel"));
   InputTagToken_RecHit = consumes<ME0RecHitCollection>(cfg.getParameter<edm::InputTag>("recHitInputLabel"));
 }
 
-void ME0RecHitsValidation::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & Run, edm::EventSetup const & iSetup ) {
-
-  LogDebug("MuonME0RecHitsValidation")<<"Info : Loading Geometry information\n";
+void ME0RecHitsValidation::bookHistograms(DQMStore::IBooker &ibooker,
+                                          edm::Run const &Run,
+                                          edm::EventSetup const &iSetup) {
+  LogDebug("MuonME0RecHitsValidation") << "Info : Loading Geometry information\n";
   ibooker.setCurrentFolder("MuonME0RecHitsV/ME0RecHitsTask");
 
-  unsigned int nregion  = 2;
-
-  edm::LogInfo("MuonME0RecHitsValidation")<<"+++ Info : # of region : "<<nregion<<std::endl;
-
-  LogDebug("MuonME0RecHitsValidation")<<"+++ Info : finish to get geometry information from ES.\n";
-
-
-  for( unsigned int region_num = 0 ; region_num < nregion ; region_num++ ) {
-      me0_rh_zr[region_num] = BookHistZR(ibooker,"me0_rh_tot","Digi",region_num);
-      for( unsigned int layer_num = 0 ; layer_num < 6 ; layer_num++) {
-          me0_rh_xy[region_num][layer_num] = BookHistXY(ibooker,"me0_rh","RecHit",region_num,layer_num);
-
-          std::string histo_name_DeltaX = std::string("me0_rh_DeltaX_r")+regionLabel[region_num]+"_l"+layerLabel[layer_num];
-          std::string histo_name_DeltaY = std::string("me0_rh_DeltaY_r")+regionLabel[region_num]+"_l"+layerLabel[layer_num];
-          std::string histo_label_DeltaX = "RecHit Delta X : region"+regionLabel[region_num]+" layer "+layerLabel[layer_num]+" "+" ; x_{SimHit} - x_{RecHit} ; entries";
-          std::string histo_label_DeltaY = "RecHit Delta Y : region"+regionLabel[region_num]+" layer "+layerLabel[layer_num]+" "+" ; y_{SimHit} - y_{RecHit} ; entries";
-
-          me0_rh_DeltaX[region_num][layer_num] = ibooker.book1D(histo_name_DeltaX.c_str(), histo_label_DeltaX.c_str(),100,-10,10);
-          me0_rh_DeltaY[region_num][layer_num] = ibooker.book1D(histo_name_DeltaY.c_str(), histo_label_DeltaY.c_str(),100,-10,10);
-
-          std::string histo_name_PullX = std::string("me0_rh_PullX_r")+regionLabel[region_num]+"_l"+layerLabel[layer_num];
-          std::string histo_name_PullY = std::string("me0_rh_PullY_r")+regionLabel[region_num]+"_l"+layerLabel[layer_num];
-          std::string histo_label_PullX = "RecHit Pull X : region"+regionLabel[region_num]+" layer "+layerLabel[layer_num]+" "+" ; #frac{x_{SimHit} - x_{RecHit}}{#sigma_{x,RecHit}} ; entries";
-          std::string histo_label_PullY = "RecHit Pull Y : region"+regionLabel[region_num]+" layer "+layerLabel[layer_num]+" "+" ; #frac{y_{SimHit} - y_{RecHit}}{#sigma_{y,RecHit}} ; entries";
-
-          me0_rh_PullX[region_num][layer_num] = ibooker.book1D(histo_name_PullX.c_str(), histo_label_DeltaX.c_str(),100,-10,10);
-          me0_rh_PullY[region_num][layer_num] = ibooker.book1D(histo_name_PullY.c_str(), histo_label_DeltaY.c_str(),100,-10,10);
-      }
+  unsigned int nregion = 2;
+
+  edm::LogInfo("MuonME0RecHitsValidation") << "+++ Info : # of region : " << nregion << std::endl;
+
+  LogDebug("MuonME0RecHitsValidation") << "+++ Info : finish to get geometry information from ES.\n";
+
+  for (unsigned int region_num = 0; region_num < nregion; region_num++) {
+    me0_rh_zr[region_num] = BookHistZR(ibooker, "me0_rh_tot", "Digi", region_num);
+    for (unsigned int layer_num = 0; layer_num < 6; layer_num++) {
+      me0_rh_xy[region_num][layer_num] = BookHistXY(ibooker, "me0_rh", "RecHit", region_num, layer_num);
+
+      std::string histo_name_DeltaX =
+          std::string("me0_rh_DeltaX_r") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
+      std::string histo_name_DeltaY =
+          std::string("me0_rh_DeltaY_r") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
+      std::string histo_label_DeltaX = "RecHit Delta X : region" + regionLabel[region_num] + " layer " +
+                                       layerLabel[layer_num] + " " + " ; x_{SimHit} - x_{RecHit} ; entries";
+      std::string histo_label_DeltaY = "RecHit Delta Y : region" + regionLabel[region_num] + " layer " +
+                                       layerLabel[layer_num] + " " + " ; y_{SimHit} - y_{RecHit} ; entries";
+
+      me0_rh_DeltaX[region_num][layer_num] =
+          ibooker.book1D(histo_name_DeltaX.c_str(), histo_label_DeltaX.c_str(), 100, -10, 10);
+      me0_rh_DeltaY[region_num][layer_num] =
+          ibooker.book1D(histo_name_DeltaY.c_str(), histo_label_DeltaY.c_str(), 100, -10, 10);
+
+      std::string histo_name_PullX =
+          std::string("me0_rh_PullX_r") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
+      std::string histo_name_PullY =
+          std::string("me0_rh_PullY_r") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
+      std::string histo_label_PullX = "RecHit Pull X : region" + regionLabel[region_num] + " layer " +
+                                      layerLabel[layer_num] + " " +
+                                      " ; #frac{x_{SimHit} - x_{RecHit}}{#sigma_{x,RecHit}} ; entries";
+      std::string histo_label_PullY = "RecHit Pull Y : region" + regionLabel[region_num] + " layer " +
+                                      layerLabel[layer_num] + " " +
+                                      " ; #frac{y_{SimHit} - y_{RecHit}}{#sigma_{y,RecHit}} ; entries";
+
+      me0_rh_PullX[region_num][layer_num] =
+          ibooker.book1D(histo_name_PullX.c_str(), histo_label_DeltaX.c_str(), 100, -10, 10);
+      me0_rh_PullY[region_num][layer_num] =
+          ibooker.book1D(histo_name_PullY.c_str(), histo_label_DeltaY.c_str(), 100, -10, 10);
+    }
   }
 }
 
+ME0RecHitsValidation::~ME0RecHitsValidation() {}
 
-ME0RecHitsValidation::~ME0RecHitsValidation() {
-}
-
-
-void ME0RecHitsValidation::analyze(const edm::Event& e,
-                                     const edm::EventSetup& iSetup)
-{
- edm::ESHandle<ME0Geometry> hGeom;
- iSetup.get<MuonGeometryRecord>().get(hGeom);
- const ME0Geometry* ME0Geometry_ =( &*hGeom);
+void ME0RecHitsValidation::analyze(const edm::Event &e, const edm::EventSetup &iSetup) {
+  edm::ESHandle<ME0Geometry> hGeom;
+  iSetup.get<MuonGeometryRecord>().get(hGeom);
+  const ME0Geometry *ME0Geometry_ = (&*hGeom);
   edm::Handle<edm::PSimHitContainer> ME0Hits;
   e.getByToken(InputTagToken_, ME0Hits);
 
   edm::Handle<ME0RecHitCollection> ME0RecHits;
   e.getByToken(InputTagToken_RecHit, ME0RecHits);
 
-  if (!ME0Hits.isValid() | !ME0RecHits.isValid() ) {
+  if (!ME0Hits.isValid() | !ME0RecHits.isValid()) {
     edm::LogError("ME0RecHitsValidation") << "Cannot get ME0Hits/ME0RecHits by Token simInputTagToken";
-    return ;
+    return;
   }
 
-
-
- for (auto hits=ME0Hits->begin(); hits!=ME0Hits->end(); hits++) {
-
-   const ME0DetId id(hits->detUnitId());
-   Int_t sh_region = id.region();
-   Int_t sh_layer = id.layer();
-   Int_t sh_station = 0;
-   Int_t sh_chamber = id.chamber();
-   Int_t sh_roll = id.roll();
-
-
-   //Int_t even_odd = id.chamber()%2;
-   if ( ME0Geometry_->idToDet(hits->detUnitId()) == nullptr) {
-     std::cout<<"simHit did not matched with GEMGeometry."<<std::endl;
-     continue;
-   }
-
-   const LocalPoint hitLP(hits->localPosition());
-
-   for (ME0RecHitCollection::const_iterator recHit = ME0RecHits->begin(); recHit != ME0RecHits->end(); ++recHit)
-   {
-
-       Float_t x = recHit->localPosition().x();
-       Float_t xErr = recHit->localPositionError().xx();
-       Float_t y = recHit->localPosition().y();
-       Float_t yErr = recHit->localPositionError().yy();
+  for (auto hits = ME0Hits->begin(); hits != ME0Hits->end(); hits++) {
+    const ME0DetId id(hits->detUnitId());
+    Int_t sh_region = id.region();
+    Int_t sh_layer = id.layer();
+    Int_t sh_station = 0;
+    Int_t sh_chamber = id.chamber();
+    Int_t sh_roll = id.roll();
+
+    // Int_t even_odd = id.chamber()%2;
+    if (ME0Geometry_->idToDet(hits->detUnitId()) == nullptr) {
+      std::cout << "simHit did not matched with GEMGeometry." << std::endl;
+      continue;
+    }
+
+    const LocalPoint hitLP(hits->localPosition());
+
+    for (ME0RecHitCollection::const_iterator recHit = ME0RecHits->begin(); recHit != ME0RecHits->end(); ++recHit) {
+      Float_t x = recHit->localPosition().x();
+      Float_t xErr = recHit->localPositionError().xx();
+      Float_t y = recHit->localPosition().y();
+      Float_t yErr = recHit->localPositionError().yy();
       // Float_t detId = (Short_t) (*recHit).me0Id();
-       Float_t bx = 0;
-       Float_t clusterSize = 0;
-       Float_t firstClusterStrip = 0;
-
-       ME0DetId id((*recHit).me0Id());
-
-       Short_t region = (Short_t) id.region();
-       Short_t station = 0;
-       Short_t layer = (Short_t) id.layer();
-       Short_t chamber = (Short_t) id.chamber();
-       Short_t roll = (Short_t) id.roll();
-
-       LocalPoint rhLP = recHit->localPosition();
-       GlobalPoint rhGP = ME0Geometry_->idToDet((*recHit).me0Id())->surface().toGlobal(rhLP);
-
-       Float_t globalR = rhGP.perp();
-       Float_t globalX = rhGP.x();
-       Float_t globalY = rhGP.y();
-       Float_t globalZ = rhGP.z();
-
-       Float_t x_sim = hitLP.x();
-       Float_t y_sim = hitLP.y();
-       Float_t pullX = (x_sim - x) / sqrt(xErr);
-       Float_t pullY = (y_sim - y) / sqrt(yErr);
-
+      Float_t bx = 0;
+      Float_t clusterSize = 0;
+      Float_t firstClusterStrip = 0;
 
-       if(bx != 0) continue;
+      ME0DetId id((*recHit).me0Id());
 
-       std::vector<int> stripsFired;
-       for(int i = firstClusterStrip; i < (firstClusterStrip + clusterSize); i++){
+      Short_t region = (Short_t)id.region();
+      Short_t station = 0;
+      Short_t layer = (Short_t)id.layer();
+      Short_t chamber = (Short_t)id.chamber();
+      Short_t roll = (Short_t)id.roll();
 
-           stripsFired.push_back(i);
+      LocalPoint rhLP = recHit->localPosition();
+      GlobalPoint rhGP = ME0Geometry_->idToDet((*recHit).me0Id())->surface().toGlobal(rhLP);
 
-       }
+      Float_t globalR = rhGP.perp();
+      Float_t globalX = rhGP.x();
+      Float_t globalY = rhGP.y();
+      Float_t globalZ = rhGP.z();
 
+      Float_t x_sim = hitLP.x();
+      Float_t y_sim = hitLP.y();
+      Float_t pullX = (x_sim - x) / sqrt(xErr);
+      Float_t pullY = (y_sim - y) / sqrt(yErr);
 
-       const bool cond1(sh_region==region and sh_layer==layer and sh_station==station);
-       const bool cond2(sh_chamber==chamber and sh_roll==roll);
-       const bool cond3((std::find(stripsFired.begin(), stripsFired.end(), (firstClusterStrip + 1)) != stripsFired.end()) or clusterSize==0);
+      if (bx != 0)
+        continue;
 
-       int region_num=0 ;
-       if ( region ==-1 ) region_num = 0 ;
-       else if ( region==1) region_num = 1;
-       int layer_num = layer-1;
-
-       if(cond1 and cond2 and cond3){
-
-         me0_rh_xy[region_num][layer_num]->Fill(globalX,globalY);
-         me0_rh_zr[region_num]->Fill(globalZ,globalR);
-
-         me0_rh_DeltaX[region_num][layer_num]->Fill(x_sim - x);
-         me0_rh_DeltaY[region_num][layer_num]->Fill(y_sim - y);
-         me0_rh_PullX[region_num][layer_num]->Fill(pullX);
-         me0_rh_PullY[region_num][layer_num]->Fill(pullY);
-
-       }
+      std::vector<int> stripsFired;
+      for (int i = firstClusterStrip; i < (firstClusterStrip + clusterSize); i++) {
+        stripsFired.push_back(i);
+      }
 
+      const bool cond1(sh_region == region and sh_layer == layer and sh_station == station);
+      const bool cond2(sh_chamber == chamber and sh_roll == roll);
+      const bool cond3(
+          (std::find(stripsFired.begin(), stripsFired.end(), (firstClusterStrip + 1)) != stripsFired.end()) or
+          clusterSize == 0);
+
+      int region_num = 0;
+      if (region == -1)
+        region_num = 0;
+      else if (region == 1)
+        region_num = 1;
+      int layer_num = layer - 1;
+
+      if (cond1 and cond2 and cond3) {
+        me0_rh_xy[region_num][layer_num]->Fill(globalX, globalY);
+        me0_rh_zr[region_num]->Fill(globalZ, globalR);
+
+        me0_rh_DeltaX[region_num][layer_num]->Fill(x_sim - x);
+        me0_rh_DeltaY[region_num][layer_num]->Fill(y_sim - y);
+        me0_rh_PullX[region_num][layer_num]->Fill(pullX);
+        me0_rh_PullY[region_num][layer_num]->Fill(pullY);
+      }
+    }
   }
 }
-
-}
diff --git a/Validation/MuonME0Validation/src/ME0SegmentsValidation.cc b/Validation/MuonME0Validation/src/ME0SegmentsValidation.cc
index 9c2daebe7ca24..13fca1bb27af6 100644
--- a/Validation/MuonME0Validation/src/ME0SegmentsValidation.cc
+++ b/Validation/MuonME0Validation/src/ME0SegmentsValidation.cc
@@ -1,407 +1,420 @@
-#include "Validation/MuonME0Validation/interface/ME0SegmentsValidation.h"
 #include "DataFormats/Scalers/interface/DcsStatus.h"
+#include "Validation/MuonME0Validation/interface/ME0SegmentsValidation.h"
 #include <TMath.h>
 
-ME0SegmentsValidation::ME0SegmentsValidation(const edm::ParameterSet& cfg):  ME0BaseValidation(cfg)
-{
-    InputTagToken_Segments = consumes<ME0SegmentCollection>(cfg.getParameter<edm::InputTag>("segmentInputLabel"));
-    InputTagToken_Digis = consumes<ME0DigiPreRecoCollection>(cfg.getParameter<edm::InputTag>("digiInputLabel"));
-    InputTagToken_ = consumes<edm::PSimHitContainer>(cfg.getParameter<edm::InputTag>("simInputLabel"));
-    InputTagTokenST_ = consumes<edm::SimTrackContainer>(cfg.getParameter<edm::InputTag>("simInputLabelST"));
-    sigma_x_ = cfg.getParameter<double>("sigma_x");
-    sigma_y_ = cfg.getParameter<double>("sigma_y");
-    eta_max_ = cfg.getParameter<double>("eta_max");
-    eta_min_ = cfg.getParameter<double>("eta_min");
-    pt_min_ = cfg.getParameter<double>("pt_min");
-    isMuonGun_ = cfg.getParameter<bool>("isMuonGun");
+ME0SegmentsValidation::ME0SegmentsValidation(const edm::ParameterSet &cfg) : ME0BaseValidation(cfg) {
+  InputTagToken_Segments = consumes<ME0SegmentCollection>(cfg.getParameter<edm::InputTag>("segmentInputLabel"));
+  InputTagToken_Digis = consumes<ME0DigiPreRecoCollection>(cfg.getParameter<edm::InputTag>("digiInputLabel"));
+  InputTagToken_ = consumes<edm::PSimHitContainer>(cfg.getParameter<edm::InputTag>("simInputLabel"));
+  InputTagTokenST_ = consumes<edm::SimTrackContainer>(cfg.getParameter<edm::InputTag>("simInputLabelST"));
+  sigma_x_ = cfg.getParameter<double>("sigma_x");
+  sigma_y_ = cfg.getParameter<double>("sigma_y");
+  eta_max_ = cfg.getParameter<double>("eta_max");
+  eta_min_ = cfg.getParameter<double>("eta_min");
+  pt_min_ = cfg.getParameter<double>("pt_min");
+  isMuonGun_ = cfg.getParameter<bool>("isMuonGun");
 }
 
-void ME0SegmentsValidation::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & Run, edm::EventSetup const & iSetup ) {
-    //edm::ESHandle<ME0Geometry> hGeom;
-    //iSetup.get<MuonGeometryRecord>().get(hGeom);
-    //const ME0Geometry* ME0Geometry_ =( &*hGeom);
-    
-    LogDebug("MuonME0SegmentsValidation")<<"Info : Loading Geometry information\n";
-    ibooker.setCurrentFolder("MuonME0RecHitsV/ME0SegmentsTask");
-    
-    unsigned int nregion  = 2;
-    
-    edm::LogInfo("MuonME0SegmentsValidation")<<"+++ Info : # of region : "<<nregion<<std::endl;
-    
-    LogDebug("MuonME0SegmentsValidation")<<"+++ Info : finish to get geometry information from ES.\n";
-    
-    me0_simsegment_eta   = ibooker.book1D("me0_simsegment_eta","SimSegment Eta Distribution; #eta; entries",8,2.0,2.8);
-    me0_simsegment_pt    = ibooker.book1D("me0_simsegment_pt","SimSegment pT Distribution; p_{T}; entries",20,0.0,100.0);
-    me0_simsegment_phi   = ibooker.book1D("me0_simsegment_phi","SimSegments phi Distribution; #phi; entries",18,-M_PI,+M_PI);
-    
-    me0_matchedsimsegment_eta   = ibooker.book1D("me0_matchedsimsegment_eta","Matched SimSegment Eta Distribution; #eta; entries",8,2.0,2.8);
-    me0_matchedsimsegment_pt    = ibooker.book1D("me0_matchedsimsegment_pt","Matched SimSegment pT Distribution; p_{T}; entries",20,0.0,100.0);
-    me0_matchedsimsegment_phi   = ibooker.book1D("me0_matchedsimsegment_phi","Matched SimSegments phi Distribution; #phi; entries",18,-M_PI,+M_PI);
-    
-    me0_segment_chi2     = ibooker.book1D("me0_seg_Chi2","#chi^{2}; #chi^{2}; # Segments",100,0,100);
-    me0_segment_redchi2  = ibooker.book1D("me0_seg_ReducedChi2","#chi^{2}/ndof; #chi^{2}/ndof; # Segments",100,0,5);
-    me0_segment_ndof     = ibooker.book1D("me0_seg_ndof","ndof; ndof; #Segments",50,0,50);
-    me0_segment_numRH    = ibooker.book1D("me0_seg_NumberRH","Number of fitted RecHits; # RecHits; entries",11,-0.5,10.5);
-    me0_segment_numRHSig = ibooker.book1D("me0_seg_NumberRHSig","Number of fitted Signal RecHits; # RecHits; entries",11,-0.5,10.5);
-    me0_segment_numRHBkg = ibooker.book1D("me0_seg_NumberRHBkg","Number of fitted BKG RecHits; # RecHits; entries",11,-0.5,10.5);
-    //me0_segment_EtaRH   = ibooker.book1D("me0_specRH_globalEta","Fitted RecHits Eta Distribution; #eta; entries",200,-4.0,4.0);
-    //me0_segment_PhiRH   = ibooker.book1D("me0_specRH_globalPhi","Fitted RecHits Phi Distribution; #eta; entries",18,-3.14,3.14);
-    me0_segment_time     = ibooker.book1D("me0_seg_time","Segment Timing; ns; entries",300,-150,150);
-    me0_segment_timeErr  = ibooker.book1D("me0_seg_timErr","Segment Timing Error; ns; entries",50,0,0.5);
-    me0_segment_size     = ibooker.book1D("me0_seg_size","Segment Multiplicity; Number of ME0 segments; entries",200,0,200);
-    
-    for( unsigned int region_num = 0 ; region_num < nregion ; region_num++ ) {
-        me0_specRH_zr[region_num] = BookHistZR(ibooker,"me0_specRH_tot","Segment RecHits",region_num);
-        for( unsigned int layer_num = 0 ; layer_num < 6 ; layer_num++) {
-            
-          //me0_strip_dg_zr[region_num][layer_num] = BookHistZR(ibooker,"me0_strip_dg","SimHit",region_num,layer_num);
-          me0_specRH_xy[region_num][layer_num] = BookHistXY(ibooker,"me0_specRH","Segment RecHits",region_num,layer_num);
-          //me0_rh_xy_Muon[region_num][layer_num] = BookHistXY(ibooker,"me0_rh","RecHit Muon",region_num,layer_num);
-
-          std::string histo_name_DeltaX = std::string("me0_specRH_DeltaX_r")+regionLabel[region_num]+"_l"+layerLabel[layer_num];
-          std::string histo_name_DeltaY = std::string("me0_specRH_DeltaY_r")+regionLabel[region_num]+"_l"+layerLabel[layer_num];
-          std::string histo_label_DeltaX = "Segment RecHits Delta X : region"+regionLabel[region_num]+
-                " layer "+layerLabel[layer_num]+" "+" ; x_{SimHit} - x_{Segment RecHits} ; entries";
-          std::string histo_label_DeltaY = "Segment RecHits Delta Y : region"+regionLabel[region_num]+
-                " layer "+layerLabel[layer_num]+" "+" ; y_{SimHit} - y_{Segment RecHit} ; entries";
-
-          me0_specRH_DeltaX[region_num][layer_num] = ibooker.book1D(histo_name_DeltaX.c_str(), histo_label_DeltaX.c_str(),100,-10,10);
-          me0_specRH_DeltaY[region_num][layer_num] = ibooker.book1D(histo_name_DeltaY.c_str(), histo_label_DeltaY.c_str(),100,-10,10);
-
-          std::string histo_name_PullX = std::string("me0_specRH_PullX_r")+regionLabel[region_num]+"_l"+layerLabel[layer_num];
-          std::string histo_name_PullY = std::string("me0_specRH_PullY_r")+regionLabel[region_num]+"_l"+layerLabel[layer_num];
-          std::string histo_label_PullX = "Segment RecHits Pull X : region"+regionLabel[region_num]+
-                " layer "+layerLabel[layer_num]+" "+" ; #frac{x_{SimHit} - x_{Segment RecHit}}{#sigma_{x,RecHit}} ; entries";
-          std::string histo_label_PullY = "Segment RecHits Pull Y : region"+regionLabel[region_num]+
-                " layer "+layerLabel[layer_num]+" "+" ; #frac{y_{SimHit} - y_{Segment RecHit}}{#sigma_{y,RecHit}} ; entries";
-
-          me0_specRH_PullX[region_num][layer_num] = ibooker.book1D(histo_name_PullX.c_str(), histo_label_DeltaX.c_str(),100,-10,10);
-          me0_specRH_PullY[region_num][layer_num] = ibooker.book1D(histo_name_PullY.c_str(), histo_label_DeltaY.c_str(),100,-10,10);
-            
-        }
+void ME0SegmentsValidation::bookHistograms(DQMStore::IBooker &ibooker,
+                                           edm::Run const &Run,
+                                           edm::EventSetup const &iSetup) {
+  // edm::ESHandle<ME0Geometry> hGeom;
+  // iSetup.get<MuonGeometryRecord>().get(hGeom);
+  // const ME0Geometry* ME0Geometry_ =( &*hGeom);
+
+  LogDebug("MuonME0SegmentsValidation") << "Info : Loading Geometry information\n";
+  ibooker.setCurrentFolder("MuonME0RecHitsV/ME0SegmentsTask");
+
+  unsigned int nregion = 2;
+
+  edm::LogInfo("MuonME0SegmentsValidation") << "+++ Info : # of region : " << nregion << std::endl;
+
+  LogDebug("MuonME0SegmentsValidation") << "+++ Info : finish to get geometry information from ES.\n";
+
+  me0_simsegment_eta = ibooker.book1D("me0_simsegment_eta", "SimSegment Eta Distribution; #eta; entries", 8, 2.0, 2.8);
+  me0_simsegment_pt = ibooker.book1D("me0_simsegment_pt", "SimSegment pT Distribution; p_{T}; entries", 20, 0.0, 100.0);
+  me0_simsegment_phi =
+      ibooker.book1D("me0_simsegment_phi", "SimSegments phi Distribution; #phi; entries", 18, -M_PI, +M_PI);
+
+  me0_matchedsimsegment_eta =
+      ibooker.book1D("me0_matchedsimsegment_eta", "Matched SimSegment Eta Distribution; #eta; entries", 8, 2.0, 2.8);
+  me0_matchedsimsegment_pt =
+      ibooker.book1D("me0_matchedsimsegment_pt", "Matched SimSegment pT Distribution; p_{T}; entries", 20, 0.0, 100.0);
+  me0_matchedsimsegment_phi = ibooker.book1D(
+      "me0_matchedsimsegment_phi", "Matched SimSegments phi Distribution; #phi; entries", 18, -M_PI, +M_PI);
+
+  me0_segment_chi2 = ibooker.book1D("me0_seg_Chi2", "#chi^{2}; #chi^{2}; # Segments", 100, 0, 100);
+  me0_segment_redchi2 = ibooker.book1D("me0_seg_ReducedChi2", "#chi^{2}/ndof; #chi^{2}/ndof; # Segments", 100, 0, 5);
+  me0_segment_ndof = ibooker.book1D("me0_seg_ndof", "ndof; ndof; #Segments", 50, 0, 50);
+  me0_segment_numRH =
+      ibooker.book1D("me0_seg_NumberRH", "Number of fitted RecHits; # RecHits; entries", 11, -0.5, 10.5);
+  me0_segment_numRHSig =
+      ibooker.book1D("me0_seg_NumberRHSig", "Number of fitted Signal RecHits; # RecHits; entries", 11, -0.5, 10.5);
+  me0_segment_numRHBkg =
+      ibooker.book1D("me0_seg_NumberRHBkg", "Number of fitted BKG RecHits; # RecHits; entries", 11, -0.5, 10.5);
+  // me0_segment_EtaRH   = ibooker.book1D("me0_specRH_globalEta","Fitted RecHits
+  // Eta Distribution; #eta; entries",200,-4.0,4.0); me0_segment_PhiRH   =
+  // ibooker.book1D("me0_specRH_globalPhi","Fitted RecHits Phi Distribution;
+  // #eta; entries",18,-3.14,3.14);
+  me0_segment_time = ibooker.book1D("me0_seg_time", "Segment Timing; ns; entries", 300, -150, 150);
+  me0_segment_timeErr = ibooker.book1D("me0_seg_timErr", "Segment Timing Error; ns; entries", 50, 0, 0.5);
+  me0_segment_size =
+      ibooker.book1D("me0_seg_size", "Segment Multiplicity; Number of ME0 segments; entries", 200, 0, 200);
+
+  for (unsigned int region_num = 0; region_num < nregion; region_num++) {
+    me0_specRH_zr[region_num] = BookHistZR(ibooker, "me0_specRH_tot", "Segment RecHits", region_num);
+    for (unsigned int layer_num = 0; layer_num < 6; layer_num++) {
+      // me0_strip_dg_zr[region_num][layer_num] =
+      // BookHistZR(ibooker,"me0_strip_dg","SimHit",region_num,layer_num);
+      me0_specRH_xy[region_num][layer_num] =
+          BookHistXY(ibooker, "me0_specRH", "Segment RecHits", region_num, layer_num);
+      // me0_rh_xy_Muon[region_num][layer_num] =
+      // BookHistXY(ibooker,"me0_rh","RecHit Muon",region_num,layer_num);
+
+      std::string histo_name_DeltaX =
+          std::string("me0_specRH_DeltaX_r") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
+      std::string histo_name_DeltaY =
+          std::string("me0_specRH_DeltaY_r") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
+      std::string histo_label_DeltaX = "Segment RecHits Delta X : region" + regionLabel[region_num] + " layer " +
+                                       layerLabel[layer_num] + " " + " ; x_{SimHit} - x_{Segment RecHits} ; entries";
+      std::string histo_label_DeltaY = "Segment RecHits Delta Y : region" + regionLabel[region_num] + " layer " +
+                                       layerLabel[layer_num] + " " + " ; y_{SimHit} - y_{Segment RecHit} ; entries";
+
+      me0_specRH_DeltaX[region_num][layer_num] =
+          ibooker.book1D(histo_name_DeltaX.c_str(), histo_label_DeltaX.c_str(), 100, -10, 10);
+      me0_specRH_DeltaY[region_num][layer_num] =
+          ibooker.book1D(histo_name_DeltaY.c_str(), histo_label_DeltaY.c_str(), 100, -10, 10);
+
+      std::string histo_name_PullX =
+          std::string("me0_specRH_PullX_r") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
+      std::string histo_name_PullY =
+          std::string("me0_specRH_PullY_r") + regionLabel[region_num] + "_l" + layerLabel[layer_num];
+      std::string histo_label_PullX = "Segment RecHits Pull X : region" + regionLabel[region_num] + " layer " +
+                                      layerLabel[layer_num] + " " +
+                                      " ; #frac{x_{SimHit} - x_{Segment "
+                                      "RecHit}}{#sigma_{x,RecHit}} ; entries";
+      std::string histo_label_PullY = "Segment RecHits Pull Y : region" + regionLabel[region_num] + " layer " +
+                                      layerLabel[layer_num] + " " +
+                                      " ; #frac{y_{SimHit} - y_{Segment "
+                                      "RecHit}}{#sigma_{y,RecHit}} ; entries";
+
+      me0_specRH_PullX[region_num][layer_num] =
+          ibooker.book1D(histo_name_PullX.c_str(), histo_label_DeltaX.c_str(), 100, -10, 10);
+      me0_specRH_PullY[region_num][layer_num] =
+          ibooker.book1D(histo_name_PullY.c_str(), histo_label_DeltaY.c_str(), 100, -10, 10);
     }
+  }
 }
 
+ME0SegmentsValidation::~ME0SegmentsValidation() {}
 
-ME0SegmentsValidation::~ME0SegmentsValidation() {
-}
+void ME0SegmentsValidation::analyze(const edm::Event &e, const edm::EventSetup &iSetup) {
+  edm::ESHandle<ME0Geometry> hGeom;
+  iSetup.get<MuonGeometryRecord>().get(hGeom);
+  const ME0Geometry *ME0Geometry_ = (&*hGeom);
 
+  edm::Handle<edm::PSimHitContainer> ME0Hits;
+  e.getByToken(InputTagToken_, ME0Hits);
 
-void ME0SegmentsValidation::analyze(const edm::Event& e,
-                                    const edm::EventSetup& iSetup)
-{
-    edm::ESHandle<ME0Geometry> hGeom;
-    iSetup.get<MuonGeometryRecord>().get(hGeom);
-    const ME0Geometry* ME0Geometry_ =( &*hGeom);
-    
-    edm::Handle<edm::PSimHitContainer> ME0Hits;
-    e.getByToken(InputTagToken_, ME0Hits);
-    
-    edm::Handle<edm::SimTrackContainer> simTracks;
-    e.getByToken(InputTagTokenST_,simTracks);
-    
-    edm::Handle<ME0SegmentCollection> ME0Segments;
-    e.getByToken(InputTagToken_Segments, ME0Segments);
-    
-    edm::Handle<ME0DigiPreRecoCollection> ME0Digis;
-    e.getByToken(InputTagToken_Digis, ME0Digis);
-    
-    if (!ME0Digis.isValid() ) {
-        edm::LogError("ME0SegmentsValidation") << "Cannot get ME0Digis by Token InputTagToken";
-        return ;
-    }
-    
-    if (!ME0Segments.isValid() ) {
-        edm::LogError("ME0SegmentsValidation") << "Cannot get ME0RecHits/ME0Segments by Token InputTagToken";
-        return ;
-    }
-    
-    if (!ME0Hits.isValid()) {
-        edm::LogError("ME0HitsValidation") << "Cannot get ME0Hits by Token simInputTagToken";
-        return ;
-    }
-    
-    
-    MapTypeSim myMap;
-    MapTypeSeg myMapSeg;
-
-    int countST = 0;
-
-    edm::SimTrackContainer::const_iterator simTrack;
-    for (simTrack = simTracks->begin(); simTrack != simTracks->end(); ++simTrack){
-        
-        edm::PSimHitContainer selectedME0Hits;
-        
-        if(!isSimTrackGood(simTrack)) continue;
-        int count = 0;
-        
-        for (edm::PSimHitContainer::const_iterator itHit = ME0Hits->begin(); itHit != ME0Hits->end(); ++itHit){
-            
-            int particleType_sh = itHit->particleType();
-            int evtId_sh = itHit->eventId().event();
-            int bx_sh = itHit->eventId().bunchCrossing();
-            int procType_sh = itHit->processType();
-            if(!(abs(particleType_sh) == 13 && evtId_sh == 0 && bx_sh == 0 && procType_sh == 0)) continue;
-            
-            if(isSimMatched(simTrack, itHit)){
-                
-                ++count;
-                selectedME0Hits.push_back(*itHit);;
-                
-            }
-            
-        }//End loop SHs
-        
-        if(selectedME0Hits.size() >= 3){
-            
-            myMap.insert(MapTypeSim::value_type(simTrack,selectedME0Hits));
-            me0_simsegment_eta->Fill(std::abs((*simTrack).momentum().eta()));
-            me0_simsegment_pt->Fill((*simTrack).momentum().pt());
-            me0_simsegment_phi->Fill((*simTrack).momentum().phi());
-            ++countST;
-            
-        }
-        
+  edm::Handle<edm::SimTrackContainer> simTracks;
+  e.getByToken(InputTagTokenST_, simTracks);
+
+  edm::Handle<ME0SegmentCollection> ME0Segments;
+  e.getByToken(InputTagToken_Segments, ME0Segments);
+
+  edm::Handle<ME0DigiPreRecoCollection> ME0Digis;
+  e.getByToken(InputTagToken_Digis, ME0Digis);
+
+  if (!ME0Digis.isValid()) {
+    edm::LogError("ME0SegmentsValidation") << "Cannot get ME0Digis by Token InputTagToken";
+    return;
+  }
+
+  if (!ME0Segments.isValid()) {
+    edm::LogError("ME0SegmentsValidation") << "Cannot get ME0RecHits/ME0Segments by Token InputTagToken";
+    return;
+  }
+
+  if (!ME0Hits.isValid()) {
+    edm::LogError("ME0HitsValidation") << "Cannot get ME0Hits by Token simInputTagToken";
+    return;
+  }
+
+  MapTypeSim myMap;
+  MapTypeSeg myMapSeg;
+
+  int countST = 0;
+
+  edm::SimTrackContainer::const_iterator simTrack;
+  for (simTrack = simTracks->begin(); simTrack != simTracks->end(); ++simTrack) {
+    edm::PSimHitContainer selectedME0Hits;
+
+    if (!isSimTrackGood(simTrack))
+      continue;
+    int count = 0;
+
+    for (edm::PSimHitContainer::const_iterator itHit = ME0Hits->begin(); itHit != ME0Hits->end(); ++itHit) {
+      int particleType_sh = itHit->particleType();
+      int evtId_sh = itHit->eventId().event();
+      int bx_sh = itHit->eventId().bunchCrossing();
+      int procType_sh = itHit->processType();
+      if (!(abs(particleType_sh) == 13 && evtId_sh == 0 && bx_sh == 0 && procType_sh == 0))
+        continue;
+
+      if (isSimMatched(simTrack, itHit)) {
+        ++count;
+        selectedME0Hits.push_back(*itHit);
+        ;
+      }
+
+    }  // End loop SHs
+
+    if (selectedME0Hits.size() >= 3) {
+      myMap.insert(MapTypeSim::value_type(simTrack, selectedME0Hits));
+      me0_simsegment_eta->Fill(std::abs((*simTrack).momentum().eta()));
+      me0_simsegment_pt->Fill((*simTrack).momentum().pt());
+      me0_simsegment_phi->Fill((*simTrack).momentum().phi());
+      ++countST;
     }
-    
-    me0_segment_size->Fill(ME0Segments->size());
-    
-    for (auto me0s = ME0Segments->begin(); me0s != ME0Segments->end(); me0s++) {
-        
-        // The ME0 Ensamble DetId refers to layer = 1
-        ME0DetId id = me0s->me0DetId();
-        auto chamber = ME0Geometry_->chamber(id);
-        auto segLP = me0s->localPosition();
-        auto segLD = me0s->localDirection();
-        auto me0rhs = me0s->specificRecHits();
-        
-        //   float localX = segLP.x();
-        //   float localY = segLP.y();
-        //   float dirTheta = segLD.theta();
-        //   float dirPhi = segLD.phi();
-        int numberRH = me0rhs.size();
-        float chi2 = (float) me0s->chi2();
-        float ndof = me0s->degreesOfFreedom();
-        double time = me0s->time();
-        double timeErr = me0s->timeErr();
-        
-        float reducedChi2 = chi2/ndof;
-        
-        me0_segment_chi2->Fill(chi2);
-        me0_segment_redchi2->Fill(reducedChi2);
-        me0_segment_ndof->Fill(ndof);
-        me0_segment_numRH->Fill(numberRH);
-
-        me0_segment_time->Fill(time);
-        me0_segment_timeErr->Fill(timeErr);
-     
-        int numberRHSig = 0;
-        int numberRHBkg = 0;
-        std::vector<ME0RecHit> selectedME0RecHits;
-        
-        for (auto rh = me0rhs.begin(); rh!= me0rhs.end(); rh++)
-        {
-            
-            auto me0id = rh->me0Id();
-            auto rhr = ME0Geometry_->etaPartition(me0id);
-            auto rhLP = rh->localPosition();
-            
-            auto result = isMatched(me0id, rhLP, ME0Digis);
-            if(result.second == 1){
-                
-                ++numberRHSig;
-                selectedME0RecHits.push_back(*rh);
-                
-            }
-            else ++numberRHBkg;
-            
-            auto erhLEP = rh->localPositionError();
-            auto rhGP = rhr->toGlobal(rhLP);
-            auto rhLPSegm = chamber->toLocal(rhGP);
-            float xe = segLP.x()+segLD.x()*rhLPSegm.z()/segLD.z();
-            float ye = segLP.y()+segLD.y()*rhLPSegm.z()/segLD.z();
-            float ze = rhLPSegm.z();
-            LocalPoint extrPoint(xe,ye,ze); // in segment rest frame
-            auto extSegm = rhr->toLocal(chamber->toGlobal(extrPoint)); // in layer restframe
-            
-            int region = me0id.region();
-            int layer = me0id.layer();
-            //     int chamber = me0id.chamber();
-            
-            float x = rhLP.x();
-            float xErr = erhLEP.xx();
-            float y = rhLP.y();
-            float yErr = erhLEP.yy();
-            
-            float globalR = rhGP.perp();
-            float globalX = rhGP.x();
-            float globalY = rhGP.y();
-            float globalZ = rhGP.z();
-            
-            float xExt = extSegm.x();
-            float yExt = extSegm.y();
-            
-            float pull_x = (x - xExt) / sqrt(xErr);
-            float pull_y = (y - yExt) / sqrt(yErr);
-            
-            int region_num=0 ;
-            if ( region ==-1 ) region_num = 0 ;
-            else if ( region==1) region_num = 1;
-            int layer_num = layer-1;
-            
-            me0_specRH_xy[region_num][layer_num]->Fill(globalX,globalY);
-            me0_specRH_zr[region_num]->Fill(globalZ,globalR);
-            
-            me0_specRH_DeltaX[region_num][layer_num]->Fill(x - xExt);
-            me0_specRH_DeltaY[region_num][layer_num]->Fill(y - yExt);
-            me0_specRH_PullX[region_num][layer_num]->Fill(pull_x);
-            me0_specRH_PullY[region_num][layer_num]->Fill(pull_y);
-
-        }
-        
-        me0_segment_numRHSig->Fill(numberRHSig);
-        me0_segment_numRHBkg->Fill(numberRHBkg);
-        myMapSeg.insert(MapTypeSeg::value_type(me0s,selectedME0RecHits));
+  }
+
+  me0_segment_size->Fill(ME0Segments->size());
+
+  for (auto me0s = ME0Segments->begin(); me0s != ME0Segments->end(); me0s++) {
+    // The ME0 Ensamble DetId refers to layer = 1
+    ME0DetId id = me0s->me0DetId();
+    auto chamber = ME0Geometry_->chamber(id);
+    auto segLP = me0s->localPosition();
+    auto segLD = me0s->localDirection();
+    auto me0rhs = me0s->specificRecHits();
+
+    //   float localX = segLP.x();
+    //   float localY = segLP.y();
+    //   float dirTheta = segLD.theta();
+    //   float dirPhi = segLD.phi();
+    int numberRH = me0rhs.size();
+    float chi2 = (float)me0s->chi2();
+    float ndof = me0s->degreesOfFreedom();
+    double time = me0s->time();
+    double timeErr = me0s->timeErr();
+
+    float reducedChi2 = chi2 / ndof;
+
+    me0_segment_chi2->Fill(chi2);
+    me0_segment_redchi2->Fill(reducedChi2);
+    me0_segment_ndof->Fill(ndof);
+    me0_segment_numRH->Fill(numberRH);
+
+    me0_segment_time->Fill(time);
+    me0_segment_timeErr->Fill(timeErr);
+
+    int numberRHSig = 0;
+    int numberRHBkg = 0;
+    std::vector<ME0RecHit> selectedME0RecHits;
+
+    for (auto rh = me0rhs.begin(); rh != me0rhs.end(); rh++) {
+      auto me0id = rh->me0Id();
+      auto rhr = ME0Geometry_->etaPartition(me0id);
+      auto rhLP = rh->localPosition();
 
+      auto result = isMatched(me0id, rhLP, ME0Digis);
+      if (result.second == 1) {
+        ++numberRHSig;
+        selectedME0RecHits.push_back(*rh);
+
+      } else
+        ++numberRHBkg;
+
+      auto erhLEP = rh->localPositionError();
+      auto rhGP = rhr->toGlobal(rhLP);
+      auto rhLPSegm = chamber->toLocal(rhGP);
+      float xe = segLP.x() + segLD.x() * rhLPSegm.z() / segLD.z();
+      float ye = segLP.y() + segLD.y() * rhLPSegm.z() / segLD.z();
+      float ze = rhLPSegm.z();
+      LocalPoint extrPoint(xe, ye, ze);                           // in segment rest frame
+      auto extSegm = rhr->toLocal(chamber->toGlobal(extrPoint));  // in layer restframe
+
+      int region = me0id.region();
+      int layer = me0id.layer();
+      //     int chamber = me0id.chamber();
+
+      float x = rhLP.x();
+      float xErr = erhLEP.xx();
+      float y = rhLP.y();
+      float yErr = erhLEP.yy();
+
+      float globalR = rhGP.perp();
+      float globalX = rhGP.x();
+      float globalY = rhGP.y();
+      float globalZ = rhGP.z();
+
+      float xExt = extSegm.x();
+      float yExt = extSegm.y();
+
+      float pull_x = (x - xExt) / sqrt(xErr);
+      float pull_y = (y - yExt) / sqrt(yErr);
+
+      int region_num = 0;
+      if (region == -1)
+        region_num = 0;
+      else if (region == 1)
+        region_num = 1;
+      int layer_num = layer - 1;
+
+      me0_specRH_xy[region_num][layer_num]->Fill(globalX, globalY);
+      me0_specRH_zr[region_num]->Fill(globalZ, globalR);
+
+      me0_specRH_DeltaX[region_num][layer_num]->Fill(x - xExt);
+      me0_specRH_DeltaY[region_num][layer_num]->Fill(y - yExt);
+      me0_specRH_PullX[region_num][layer_num]->Fill(pull_x);
+      me0_specRH_PullY[region_num][layer_num]->Fill(pull_y);
     }
-    
-    //------------------- SimToReco -------------------
-
-    for(auto const& st : myMap) {//loop over the signal simTracks
-        
-        int num_sh = st.second.size();
-        bool isThereOneSegmentMatched = false;
-        
-        for(auto const& seg : myMapSeg) {//loop over the reconstructed me0 segments
-            
-            int num_sh_matched = 0;
-            if(seg.second.empty()) continue;
-
-            for(auto const& sh : st.second) {//loop over the me0 simHits left by the signal simTracks
-                
-                for(auto const& rh : seg.second) {//loop over the tracking recHits already matched to signal digis
-                    
-                    auto me0id = rh.me0Id();
-                    int region_rh = (int) me0id.region();
-                    int layer_rh = (int) me0id.layer();
-                    int chamber_rh = (int) me0id.chamber();
-                    int roll_rh = (int) me0id.roll();
-                    
-                    const ME0DetId id(sh.detUnitId());
-                    int region_sh = id.region();
-                    int layer_sh = id.layer();
-                    int chamber_sh = id.chamber();
-                    int roll_sh = id.roll();
-                    
-                    if( !(region_sh == region_rh && chamber_sh == chamber_rh && layer_sh == layer_rh && roll_sh == roll_rh) ) continue;
-
-                    LocalPoint lp_sh = sh.localPosition();
-                    LocalPoint lp_rh = rh.localPosition();
-                    
-                    GlobalPoint gp_sh = ME0Geometry_->idToDet(id)->surface().toGlobal(lp_sh);
-                    GlobalPoint gp = ME0Geometry_->idToDet((rh).me0Id())->surface().toGlobal(lp_rh);
-                    float dphi_glob = gp_sh.phi()-gp.phi();
-                    float deta_glob = gp_sh.eta()-gp.eta();
-
-                    if(fabs(dphi_glob) < 3*sigma_x_ && fabs(deta_glob) < 3*sigma_y_) ++num_sh_matched;
-                    
-                }//End loop over RHs
-            
-            }//End loop over SHs
-            
-            float quality = 0;
-            if(num_sh != 0) quality = num_sh_matched/(1.0*num_sh);
-            if(quality > 0) isThereOneSegmentMatched = true;
-            
-        }//End loop over segments
-
-        //Fill hsitograms
-        if(isThereOneSegmentMatched){
-            
-            me0_matchedsimsegment_eta->Fill( std::abs((*(st.first)).momentum().eta()) );
-            me0_matchedsimsegment_pt->Fill( (*(st.first)).momentum().pt() );
-            me0_matchedsimsegment_phi->Fill( (*(st.first)).momentum().phi() );
-            
-        }
-        
-    }//End loop over STs
-    
-}
 
+    me0_segment_numRHSig->Fill(numberRHSig);
+    me0_segment_numRHBkg->Fill(numberRHBkg);
+    myMapSeg.insert(MapTypeSeg::value_type(me0s, selectedME0RecHits));
+  }
+
+  //------------------- SimToReco -------------------
+
+  for (auto const &st : myMap) {  // loop over the signal simTracks
+
+    int num_sh = st.second.size();
+    bool isThereOneSegmentMatched = false;
+
+    for (auto const &seg : myMapSeg) {  // loop over the reconstructed me0 segments
+
+      int num_sh_matched = 0;
+      if (seg.second.empty())
+        continue;
+
+      for (auto const &sh : st.second) {  // loop over the me0 simHits left by
+                                          // the signal simTracks
+
+        for (auto const &rh : seg.second) {  // loop over the tracking recHits
+                                             // already matched to signal digis
+
+          auto me0id = rh.me0Id();
+          int region_rh = (int)me0id.region();
+          int layer_rh = (int)me0id.layer();
+          int chamber_rh = (int)me0id.chamber();
+          int roll_rh = (int)me0id.roll();
+
+          const ME0DetId id(sh.detUnitId());
+          int region_sh = id.region();
+          int layer_sh = id.layer();
+          int chamber_sh = id.chamber();
+          int roll_sh = id.roll();
 
-std::pair<int,int> ME0SegmentsValidation::isMatched(ME0DetId me0id, LocalPoint rhLP, edm::Handle<ME0DigiPreRecoCollection> ME0Digis)
-{
-    int region_rh = (int) me0id.region();
-    int layer_rh = (int) me0id.layer();
-    int roll_rh = (int) me0id.roll();
-    int chamber_rh = (int) me0id.chamber();
-    
-    float l_x_rh = rhLP.x();
-    float l_y_rh = rhLP.y();
-    
-    int particleType = 0;
-    int isPrompt = -1;
-    
-    for (ME0DigiPreRecoCollection::DigiRangeIterator cItr=ME0Digis->begin(); cItr!=ME0Digis->end(); cItr++) {
-        
-        ME0DetId id = (*cItr).first;
-        
-        int region_dg = (int) id.region();
-        int layer_dg = (int) id.layer();
-        int roll_dg = (int) id.roll();
-        int chamber_dg = (int) id.chamber();
-        
-        if(region_rh != region_dg) continue;
-        if(layer_rh != layer_dg) continue;
-        if(chamber_rh != chamber_dg) continue;
-        if(roll_rh != roll_dg) continue;
-        
-        ME0DigiPreRecoCollection::const_iterator digiItr;
-        for (digiItr = (*cItr ).second.first; digiItr != (*cItr ).second.second; ++digiItr)
-        {
-            
-            float l_x_dg = digiItr->x();
-            float l_y_dg = digiItr->y();
-            
-            if(l_x_rh != l_x_dg) continue;
-            if(l_y_rh != l_y_dg) continue;
-            
-            particleType = digiItr->pdgid();
-            isPrompt = digiItr->prompt();
-            
-        }
-        
+          if (!(region_sh == region_rh && chamber_sh == chamber_rh && layer_sh == layer_rh && roll_sh == roll_rh))
+            continue;
+
+          LocalPoint lp_sh = sh.localPosition();
+          LocalPoint lp_rh = rh.localPosition();
+
+          GlobalPoint gp_sh = ME0Geometry_->idToDet(id)->surface().toGlobal(lp_sh);
+          GlobalPoint gp = ME0Geometry_->idToDet((rh).me0Id())->surface().toGlobal(lp_rh);
+          float dphi_glob = gp_sh.phi() - gp.phi();
+          float deta_glob = gp_sh.eta() - gp.eta();
+
+          if (fabs(dphi_glob) < 3 * sigma_x_ && fabs(deta_glob) < 3 * sigma_y_)
+            ++num_sh_matched;
+
+        }  // End loop over RHs
+
+      }  // End loop over SHs
+
+      float quality = 0;
+      if (num_sh != 0)
+        quality = num_sh_matched / (1.0 * num_sh);
+      if (quality > 0)
+        isThereOneSegmentMatched = true;
+
+    }  // End loop over segments
+
+    // Fill hsitograms
+    if (isThereOneSegmentMatched) {
+      me0_matchedsimsegment_eta->Fill(std::abs((*(st.first)).momentum().eta()));
+      me0_matchedsimsegment_pt->Fill((*(st.first)).momentum().pt());
+      me0_matchedsimsegment_phi->Fill((*(st.first)).momentum().phi());
     }
-    
-    std::pair<int,int> result;
-    result = std::make_pair(particleType,isPrompt);
-    
-    return result;
-    
+
+  }  // End loop over STs
 }
 
+std::pair<int, int> ME0SegmentsValidation::isMatched(ME0DetId me0id,
+                                                     LocalPoint rhLP,
+                                                     edm::Handle<ME0DigiPreRecoCollection> ME0Digis) {
+  int region_rh = (int)me0id.region();
+  int layer_rh = (int)me0id.layer();
+  int roll_rh = (int)me0id.roll();
+  int chamber_rh = (int)me0id.chamber();
+
+  float l_x_rh = rhLP.x();
+  float l_y_rh = rhLP.y();
 
-bool ME0SegmentsValidation::isSimTrackGood(edm::SimTrackContainer::const_iterator t)
-{
+  int particleType = 0;
+  int isPrompt = -1;
 
-    if ((*t).noVertex() && !isMuonGun_) return false;
-    if ((*t).noGenpart() && !isMuonGun_) return false;
-    if (std::abs((*t).type()) != 13) return false; // only interested in direct muon simtracks
-    if ((*t).momentum().pt() < pt_min_ ) return false;
-    const float eta(std::abs((*t).momentum().eta()));
-    if (eta < eta_min_ || eta > eta_max_ ) return false; // no GEMs could be in such eta
-    return true;
-    
+  for (ME0DigiPreRecoCollection::DigiRangeIterator cItr = ME0Digis->begin(); cItr != ME0Digis->end(); cItr++) {
+    ME0DetId id = (*cItr).first;
+
+    int region_dg = (int)id.region();
+    int layer_dg = (int)id.layer();
+    int roll_dg = (int)id.roll();
+    int chamber_dg = (int)id.chamber();
+
+    if (region_rh != region_dg)
+      continue;
+    if (layer_rh != layer_dg)
+      continue;
+    if (chamber_rh != chamber_dg)
+      continue;
+    if (roll_rh != roll_dg)
+      continue;
+
+    ME0DigiPreRecoCollection::const_iterator digiItr;
+    for (digiItr = (*cItr).second.first; digiItr != (*cItr).second.second; ++digiItr) {
+      float l_x_dg = digiItr->x();
+      float l_y_dg = digiItr->y();
+
+      if (l_x_rh != l_x_dg)
+        continue;
+      if (l_y_rh != l_y_dg)
+        continue;
+
+      particleType = digiItr->pdgid();
+      isPrompt = digiItr->prompt();
+    }
+  }
+
+  std::pair<int, int> result;
+  result = std::make_pair(particleType, isPrompt);
+
+  return result;
 }
 
+bool ME0SegmentsValidation::isSimTrackGood(edm::SimTrackContainer::const_iterator t) {
+  if ((*t).noVertex() && !isMuonGun_)
+    return false;
+  if ((*t).noGenpart() && !isMuonGun_)
+    return false;
+  if (std::abs((*t).type()) != 13)
+    return false;  // only interested in direct muon simtracks
+  if ((*t).momentum().pt() < pt_min_)
+    return false;
+  const float eta(std::abs((*t).momentum().eta()));
+  if (eta < eta_min_ || eta > eta_max_)
+    return false;  // no GEMs could be in such eta
+  return true;
+}
 
-bool ME0SegmentsValidation::isSimMatched(edm::SimTrackContainer::const_iterator simTrack, edm::PSimHitContainer::const_iterator itHit)
-{
-    
-    bool result = false;
-    int trackId = simTrack->trackId();
-    int trackId_sim = itHit->trackId();
-    if(trackId == trackId_sim) result = true;
-    return result;
-    
+bool ME0SegmentsValidation::isSimMatched(edm::SimTrackContainer::const_iterator simTrack,
+                                         edm::PSimHitContainer::const_iterator itHit) {
+  bool result = false;
+  int trackId = simTrack->trackId();
+  int trackId_sim = itHit->trackId();
+  if (trackId == trackId_sim)
+    result = true;
+  return result;
 }
diff --git a/Validation/MuonRPCDigis/interface/RPCDigiValid.h b/Validation/MuonRPCDigis/interface/RPCDigiValid.h
index e4a11faec73e8..3ad6d83f4ad70 100644
--- a/Validation/MuonRPCDigis/interface/RPCDigiValid.h
+++ b/Validation/MuonRPCDigis/interface/RPCDigiValid.h
@@ -3,72 +3,68 @@
 
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include <string>
 
-#include "FWCore/Utilities/interface/EDGetToken.h"
 #include "DataFormats/RPCDigi/interface/RPCDigiCollection.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-class RPCDigiValid: public DQMEDAnalyzer
-{
-
+class RPCDigiValid : public DQMEDAnalyzer {
 public:
-
-  RPCDigiValid(const edm::ParameterSet& ps);
+  RPCDigiValid(const edm::ParameterSet &ps);
   ~RPCDigiValid() override;
 
 protected:
-  void analyze(const edm::Event& e, const edm::EventSetup& c) override;
-  void bookHistograms(DQMStore::IBooker&, edm::Run const&, edm::EventSetup const&) override;
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
 private:
-
-  MonitorElement* xyview;
-  MonitorElement* rzview;
-  MonitorElement* Res;
-  MonitorElement* ResWmin2;
-  MonitorElement* ResWmin1;
-  MonitorElement* ResWzer0;
-  MonitorElement* ResWplu1;
-  MonitorElement* ResWplu2;
-  MonitorElement* BxDist;
-  MonitorElement* StripProf;
-
-  //barrel layers residuals
-  MonitorElement* ResLayer1_barrel;
-  MonitorElement* ResLayer2_barrel;
-  MonitorElement* ResLayer3_barrel;
-  MonitorElement* ResLayer4_barrel;
-  MonitorElement* ResLayer5_barrel;
-  MonitorElement* ResLayer6_barrel;
-
-  //members for EndCap's disks:
-  MonitorElement* ResDmin1;
-  MonitorElement* ResDmin2;
-  MonitorElement* ResDmin3;
-  MonitorElement* ResDplu1;
-  MonitorElement* ResDplu2;
-  MonitorElement* ResDplu3;
-
-  //endcap layters residuals
-  MonitorElement* Res_Endcap1_Ring2_A;
-  MonitorElement* Res_Endcap1_Ring2_B;
-  MonitorElement* Res_Endcap1_Ring2_C;
-
-  MonitorElement* Res_Endcap23_Ring2_A;
-  MonitorElement* Res_Endcap23_Ring2_B;
-  MonitorElement* Res_Endcap23_Ring2_C;
-
-  MonitorElement* Res_Endcap123_Ring3_A;
-  MonitorElement* Res_Endcap123_Ring3_B;
-  MonitorElement* Res_Endcap123_Ring3_C;
-
-  //4 endcap
+  MonitorElement *xyview;
+  MonitorElement *rzview;
+  MonitorElement *Res;
+  MonitorElement *ResWmin2;
+  MonitorElement *ResWmin1;
+  MonitorElement *ResWzer0;
+  MonitorElement *ResWplu1;
+  MonitorElement *ResWplu2;
+  MonitorElement *BxDist;
+  MonitorElement *StripProf;
+
+  // barrel layers residuals
+  MonitorElement *ResLayer1_barrel;
+  MonitorElement *ResLayer2_barrel;
+  MonitorElement *ResLayer3_barrel;
+  MonitorElement *ResLayer4_barrel;
+  MonitorElement *ResLayer5_barrel;
+  MonitorElement *ResLayer6_barrel;
+
+  // members for EndCap's disks:
+  MonitorElement *ResDmin1;
+  MonitorElement *ResDmin2;
+  MonitorElement *ResDmin3;
+  MonitorElement *ResDplu1;
+  MonitorElement *ResDplu2;
+  MonitorElement *ResDplu3;
+
+  // endcap layters residuals
+  MonitorElement *Res_Endcap1_Ring2_A;
+  MonitorElement *Res_Endcap1_Ring2_B;
+  MonitorElement *Res_Endcap1_Ring2_C;
+
+  MonitorElement *Res_Endcap23_Ring2_A;
+  MonitorElement *Res_Endcap23_Ring2_B;
+  MonitorElement *Res_Endcap23_Ring2_C;
+
+  MonitorElement *Res_Endcap123_Ring3_A;
+  MonitorElement *Res_Endcap123_Ring3_B;
+  MonitorElement *Res_Endcap123_Ring3_C;
+
+  // 4 endcap
   MonitorElement *ResDmin4;
   MonitorElement *ResDplu4;
   MonitorElement *BxDisc_4Plus;
@@ -77,15 +73,14 @@ class RPCDigiValid: public DQMEDAnalyzer
   MonitorElement *xyvDmin4;
 
   // Timing information
-  MonitorElement* hDigiTimeAll, * hDigiTime, * hDigiTimeIRPC, *hDigiTimeNoIRPC;
+  MonitorElement *hDigiTimeAll, *hDigiTime, *hDigiTimeIRPC, *hDigiTimeNoIRPC;
 
   std::string outputFile_;
   std::string digiLabel;
 
-  //Tokens for accessing run data. Used for passing to edm::Event. - stanislav
+  // Tokens for accessing run data. Used for passing to edm::Event. - stanislav
   edm::EDGetTokenT<edm::PSimHitContainer> simHitToken;
   edm::EDGetTokenT<RPCDigiCollection> rpcDigiToken;
 };
 
 #endif
-
diff --git a/Validation/MuonRPCDigis/src/RPCDigiValid.cc b/Validation/MuonRPCDigis/src/RPCDigiValid.cc
index faed57c894c2b..4d0b82a1db59f 100644
--- a/Validation/MuonRPCDigis/src/RPCDigiValid.cc
+++ b/Validation/MuonRPCDigis/src/RPCDigiValid.cc
@@ -1,44 +1,40 @@
-#include "Validation/MuonRPCDigis/interface/RPCDigiValid.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "SimDataFormats/CrossingFrame/interface/MixCollection.h"
+#include "Validation/MuonRPCDigis/interface/RPCDigiValid.h"
 
-#include "Geometry/Records/interface/MuonGeometryRecord.h"
-#include "Geometry/RPCGeometry/interface/RPCGeometry.h"
-#include "Geometry/CommonTopologies/interface/RectangularStripTopology.h"
-#include "Geometry/CommonTopologies/interface/TrapezoidalStripTopology.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "DataFormats/MuonDetId/interface/RPCDetId.h"
+#include "Geometry/CommonTopologies/interface/RectangularStripTopology.h"
+#include "Geometry/CommonTopologies/interface/TrapezoidalStripTopology.h"
+#include "Geometry/RPCGeometry/interface/RPCGeometry.h"
+#include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 #include <cmath>
 
 using namespace std;
 using namespace edm;
 
-RPCDigiValid::RPCDigiValid(const ParameterSet& ps)
-{
-
-//  Init the tokens for run data retrieval - stanislav
-//  ps.getUntackedParameter<InputTag> retrieves a InputTag from the configuration. The second param is default value
-//  module, instance and process labels may be passed in a single string if separated by colon ':'
-//  (@see the edm::InputTag constructor documentation)
-  simHitToken = consumes<PSimHitContainer>(ps.getUntrackedParameter<edm::InputTag >("simHitTag", edm::InputTag("g4SimHits:MuonRPCHits")));
-  rpcDigiToken    = consumes<RPCDigiCollection>(ps.getUntrackedParameter<edm::InputTag>("rpcDigiTag", edm::InputTag("simMuonRPCDigis")));
-
-  outputFile_ = ps.getUntrackedParameter<string> ("outputFile", "rpcDigiValidPlots.root");
-}
-
-RPCDigiValid::~RPCDigiValid()
-{
+RPCDigiValid::RPCDigiValid(const ParameterSet &ps) {
+  //  Init the tokens for run data retrieval - stanislav
+  //  ps.getUntackedParameter<InputTag> retrieves a InputTag from the
+  //  configuration. The second param is default value module, instance and
+  //  process labels may be passed in a single string if separated by colon ':'
+  //  (@see the edm::InputTag constructor documentation)
+  simHitToken = consumes<PSimHitContainer>(
+      ps.getUntrackedParameter<edm::InputTag>("simHitTag", edm::InputTag("g4SimHits:MuonRPCHits")));
+  rpcDigiToken = consumes<RPCDigiCollection>(
+      ps.getUntrackedParameter<edm::InputTag>("rpcDigiTag", edm::InputTag("simMuonRPCDigis")));
+
+  outputFile_ = ps.getUntrackedParameter<string>("outputFile", "rpcDigiValidPlots.root");
 }
 
+RPCDigiValid::~RPCDigiValid() {}
 
-void RPCDigiValid::analyze(const Event& event, const EventSetup& eventSetup)
-{
-
+void RPCDigiValid::analyze(const Event &event, const EventSetup &eventSetup) {
   // Get the RPC Geometry
   edm::ESHandle<RPCGeometry> rpcGeom;
-  eventSetup.get<MuonGeometryRecord> ().get(rpcGeom);
+  eventSetup.get<MuonGeometryRecord>().get(rpcGeom);
 
   edm::Handle<PSimHitContainer> simHit;
   edm::Handle<RPCDigiCollection> rpcDigis;
@@ -48,21 +44,17 @@ void RPCDigiValid::analyze(const Event& event, const EventSetup& eventSetup)
   // Loop on simhits
   PSimHitContainer::const_iterator simIt;
 
-  //loop over Simhit
-  std::map<RPCDetId, std::vector<double> > allsims;
+  // loop over Simhit
+  std::map<RPCDetId, std::vector<double>> allsims;
 
-  for (simIt = simHit->begin(); simIt != simHit->end(); simIt++)
-  {
+  for (simIt = simHit->begin(); simIt != simHit->end(); simIt++) {
     RPCDetId Rsid = (RPCDetId)(*simIt).detUnitId();
-    const RPCRoll* soll = dynamic_cast<const RPCRoll*> (rpcGeom->roll(Rsid));
+    const RPCRoll *soll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(Rsid));
     int ptype = simIt->particleType();
 
-    if (ptype == 13 || ptype == -13)
-    {
-
+    if (ptype == 13 || ptype == -13) {
       std::vector<double> buff;
-      if (allsims.find(Rsid) != allsims.end())
-      {
+      if (allsims.find(Rsid) != allsims.end()) {
         buff = allsims[Rsid];
       }
 
@@ -77,70 +69,59 @@ void RPCDigiValid::analyze(const Event& event, const EventSetup& eventSetup)
 
     xyview->Fill(sim_x, sim_y);
 
-    if (Rsid.region() == (+1))
-    {
-      if (Rsid.station() == 4)
-      {
+    if (Rsid.region() == (+1)) {
+      if (Rsid.station() == 4) {
         xyvDplu4->Fill(sim_x, sim_y);
       }
-    }
-    else if (Rsid.region() == (-1))
-    {
-      if (Rsid.station() == 4)
-      {
+    } else if (Rsid.region() == (-1)) {
+      if (Rsid.station() == 4) {
         xyvDmin4->Fill(sim_x, sim_y);
       }
     }
     rzview->Fill(p.z(), p.perp());
   }
-  //loop over Digis
+  // loop over Digis
   RPCDigiCollection::DigiRangeIterator detUnitIt;
-  for (detUnitIt = rpcDigis->begin(); detUnitIt != rpcDigis->end(); ++detUnitIt)
-  {
+  for (detUnitIt = rpcDigis->begin(); detUnitIt != rpcDigis->end(); ++detUnitIt) {
     const RPCDetId Rsid = (*detUnitIt).first;
-    const RPCRoll* roll = dynamic_cast<const RPCRoll*> (rpcGeom->roll(Rsid));
+    const RPCRoll *roll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(Rsid));
 
-    const RPCDigiCollection::Range& range = (*detUnitIt).second;
+    const RPCDigiCollection::Range &range = (*detUnitIt).second;
     std::vector<double> sims;
-    if (allsims.find(Rsid) != allsims.end())
-    {
+    if (allsims.find(Rsid) != allsims.end()) {
       sims = allsims[Rsid];
     }
 
-    int ndigi=0;
-    for (RPCDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt)
-    {
+    int ndigi = 0;
+    for (RPCDigiCollection::const_iterator digiIt = range.first; digiIt != range.second; ++digiIt) {
       StripProf->Fill(digiIt->strip());
       BxDist->Fill(digiIt->bx());
-      //bx for 4 endcaps
-      if (Rsid.region() == (+1))
-      {
+      // bx for 4 endcaps
+      if (Rsid.region() == (+1)) {
         if (Rsid.station() == 4)
           BxDisc_4Plus->Fill(digiIt->bx());
-      }
-      else if (Rsid.region() == (-1))
-      {
+      } else if (Rsid.region() == (-1)) {
         if (Rsid.station() == 4)
           BxDisc_4Min->Fill(digiIt->bx());
       }
 
       // Fill timing information
-      const double digiTime = digiIt->hasTime() ? digiIt->time() : digiIt->bx()*25;
+      const double digiTime = digiIt->hasTime() ? digiIt->time() : digiIt->bx() * 25;
       hDigiTimeAll->Fill(digiTime);
-      if ( digiIt->hasTime() ) {
+      if (digiIt->hasTime()) {
         hDigiTime->Fill(digiTime);
-        if ( roll->isIRPC() ) hDigiTimeIRPC->Fill(digiTime);
-        else hDigiTimeNoIRPC->Fill(digiTime);
+        if (roll->isIRPC())
+          hDigiTimeIRPC->Fill(digiTime);
+        else
+          hDigiTimeNoIRPC->Fill(digiTime);
       }
     }
 
-    if (sims.size() == 1 && ndigi == 1)
-    {
+    if (sims.size() == 1 && ndigi == 1) {
       double dis = roll->centreOfStrip(range.first->strip()).x() - sims[0];
       Res->Fill(dis);
 
-      if (Rsid.region() == 0)
-      {
+      if (Rsid.region() == 0) {
         if (Rsid.ring() == -2)
           ResWmin2->Fill(dis);
         else if (Rsid.ring() == -1)
@@ -151,7 +132,7 @@ void RPCDigiValid::analyze(const Event& event, const EventSetup& eventSetup)
           ResWplu1->Fill(dis);
         else if (Rsid.ring() == 2)
           ResWplu2->Fill(dis);
-        //barrel layers
+        // barrel layers
         if (Rsid.station() == 1 && Rsid.layer() == 1)
           ResLayer1_barrel->Fill(dis);
         if (Rsid.station() == 1 && Rsid.layer() == 2)
@@ -165,13 +146,10 @@ void RPCDigiValid::analyze(const Event& event, const EventSetup& eventSetup)
         if (Rsid.station() == 4)
           ResLayer6_barrel->Fill(dis);
       }
-      //endcap layers residuals
-      if (Rsid.region() != 0)
-      {
-        if (Rsid.ring() == 2)
-        {
-          if (abs(Rsid.station()) == 1)
-          {
+      // endcap layers residuals
+      if (Rsid.region() != 0) {
+        if (Rsid.ring() == 2) {
+          if (abs(Rsid.station()) == 1) {
             if (Rsid.roll() == 1)
               Res_Endcap1_Ring2_A->Fill(dis);
             if (Rsid.roll() == 2)
@@ -179,8 +157,7 @@ void RPCDigiValid::analyze(const Event& event, const EventSetup& eventSetup)
             if (Rsid.roll() == 3)
               Res_Endcap1_Ring2_C->Fill(dis);
           }
-          if (abs(Rsid.station()) == 2 || abs(Rsid.station()) == 3)
-          {
+          if (abs(Rsid.station()) == 2 || abs(Rsid.station()) == 3) {
             if (Rsid.roll() == 1)
               Res_Endcap23_Ring2_A->Fill(dis);
             if (Rsid.roll() == 2)
@@ -189,8 +166,7 @@ void RPCDigiValid::analyze(const Event& event, const EventSetup& eventSetup)
               Res_Endcap23_Ring2_C->Fill(dis);
           }
         }
-        if (Rsid.ring() == 3)
-        {
+        if (Rsid.ring() == 3) {
           if (Rsid.roll() == 1)
             Res_Endcap123_Ring3_A->Fill(dis);
           if (Rsid.roll() == 2)
@@ -200,9 +176,7 @@ void RPCDigiValid::analyze(const Event& event, const EventSetup& eventSetup)
         }
       }
 
-      if (Rsid.region() == (+1))
-      {
-
+      if (Rsid.region() == (+1)) {
         if (Rsid.station() == 1)
           ResDplu1->Fill(dis);
         else if (Rsid.station() == 2)
@@ -212,9 +186,7 @@ void RPCDigiValid::analyze(const Event& event, const EventSetup& eventSetup)
         else if (Rsid.station() == 4)
           ResDplu4->Fill(dis);
       }
-      if (Rsid.region() == (-1))
-      {
-
+      if (Rsid.region() == (-1)) {
         if (Rsid.station() == 1)
           ResDmin1->Fill(dis);
         else if (Rsid.station() == 2)
@@ -228,8 +200,7 @@ void RPCDigiValid::analyze(const Event& event, const EventSetup& eventSetup)
   }
 }
 
-void RPCDigiValid::bookHistograms(DQMStore::IBooker& booker, edm::Run const& run, edm::EventSetup const& eSetup)
-{
+void RPCDigiValid::bookHistograms(DQMStore::IBooker &booker, edm::Run const &run, edm::EventSetup const &eSetup) {
   booker.setCurrentFolder("RPCDigisV/RPCDigis");
 
   xyview = booker.book2D("X_Vs_Y_View", "X_Vs_Y_View", 155, -775., 775., 155, -775., 775.);
@@ -258,7 +229,7 @@ void RPCDigiValid::bookHistograms(DQMStore::IBooker& booker, edm::Run const& run
   BxDisc_4Plus = booker.book1D("BxDisc_4Plus", "BxDisc_4Plus", 20, -10., 10.);
   BxDisc_4Min = booker.book1D("BxDisc_4Min", "BxDisc_4Min", 20, -10., 10.);
 
-  //endcap residuals
+  // endcap residuals
   ResDmin1 = booker.book1D("Disk_Min1_Residuals", "Disk_Min1_Residuals", 400, -8, 8);
   ResDmin2 = booker.book1D("Disk_Min2_Residuals", "Disk_Min2_Residuals", 400, -8, 8);
   ResDmin3 = booker.book1D("Disk_Min3_Residuals", "Disk_Min3_Residuals", 400, -8, 8);
@@ -282,9 +253,9 @@ void RPCDigiValid::bookHistograms(DQMStore::IBooker& booker, edm::Run const& run
   Res_Endcap123_Ring3_C = booker.book1D("Res_Endcap123_Ring3_C", "Res_Endcap123_Ring3_C", 400, -8, 8);
 
   // Timing informations
-  hDigiTimeAll    = booker.book1D("DigiTimeAll"   , "Digi time including present electronics;Digi time (ns)", 100, -12.5, 12.5);
-  hDigiTime       = booker.book1D("DigiTime"      , "Digi time only with timing information;Digi time (ns)", 100, -12.5, 12.5);
-  hDigiTimeIRPC   = booker.book1D("DigiTimeIRPC"  , "IRPC Digi time;Digi time (ns)", 100, -12.5, 12.5);
+  hDigiTimeAll =
+      booker.book1D("DigiTimeAll", "Digi time including present electronics;Digi time (ns)", 100, -12.5, 12.5);
+  hDigiTime = booker.book1D("DigiTime", "Digi time only with timing information;Digi time (ns)", 100, -12.5, 12.5);
+  hDigiTimeIRPC = booker.book1D("DigiTimeIRPC", "IRPC Digi time;Digi time (ns)", 100, -12.5, 12.5);
   hDigiTimeNoIRPC = booker.book1D("DigiTimeNoIRPC", "non-IRPC Digi time;Digi time (ns)", 100, -12.5, 12.5);
 }
-
diff --git a/Validation/MuonRPCDigis/src/SealModule.cc b/Validation/MuonRPCDigis/src/SealModule.cc
index 162dc454b8c8d..8d6402b00e94a 100644
--- a/Validation/MuonRPCDigis/src/SealModule.cc
+++ b/Validation/MuonRPCDigis/src/SealModule.cc
@@ -1,7 +1,6 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 
 #include "Validation/MuonRPCDigis/interface/RPCDigiValid.h"
 
-
 DEFINE_FWK_MODULE(RPCDigiValid);
diff --git a/Validation/RPCRecHits/interface/RPCPointVsRecHit.h b/Validation/RPCRecHits/interface/RPCPointVsRecHit.h
index 3984dd317f8d2..cd2cc4d3e98ed 100644
--- a/Validation/RPCRecHits/interface/RPCPointVsRecHit.h
+++ b/Validation/RPCRecHits/interface/RPCPointVsRecHit.h
@@ -1,13 +1,13 @@
 #ifndef Validation_RPCRecHits_RPCPointVsRecHit_h
 #define Validation_RPCRecHits_RPCPointVsRecHit_h
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
@@ -16,13 +16,12 @@
 
 #include <string>
 
-class RPCPointVsRecHit : public DQMEDAnalyzer
-{
+class RPCPointVsRecHit : public DQMEDAnalyzer {
 public:
-  RPCPointVsRecHit(const edm::ParameterSet& pset);
-  ~RPCPointVsRecHit() override {};
+  RPCPointVsRecHit(const edm::ParameterSet &pset);
+  ~RPCPointVsRecHit() override{};
 
-  void analyze(const edm::Event& event, const edm::EventSetup& eventSetup) override;
+  void analyze(const edm::Event &event, const edm::EventSetup &eventSetup) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
 private:
@@ -32,4 +31,4 @@ class RPCPointVsRecHit : public DQMEDAnalyzer
   RPCValidHistograms h_;
 };
 
-#endif // Validation_RPCRecHits_RPCPointVsRecHit_h
+#endif  // Validation_RPCRecHits_RPCPointVsRecHit_h
diff --git a/Validation/RPCRecHits/interface/RPCRecHitValid.h b/Validation/RPCRecHits/interface/RPCRecHitValid.h
index 8530a31a2bf16..10e8ac083ed31 100644
--- a/Validation/RPCRecHits/interface/RPCRecHitValid.h
+++ b/Validation/RPCRecHits/interface/RPCRecHitValid.h
@@ -1,33 +1,32 @@
 #ifndef Validation_RPCRecHits_RPCRecHitValid_h
 #define Validation_RPCRecHits_RPCRecHitValid_h
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
+#include "DataFormats/MuonReco/interface/MuonFwd.h"
 #include "DataFormats/RPCRecHit/interface/RPCRecHitCollection.h"
 #include "DataFormats/TrackingRecHit/interface/TrackingRecHitFwd.h"
-#include "DataFormats/MuonReco/interface/MuonFwd.h"
+#include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 #include "SimGeneral/TrackingAnalysis/interface/SimHitTPAssociationProducer.h"
 #include "Validation/RPCRecHits/interface/RPCValidHistograms.h"
 
 #include <string>
 
-class RPCRecHitValid : public DQMEDAnalyzer
-{
+class RPCRecHitValid : public DQMEDAnalyzer {
 public:
-  RPCRecHitValid(const edm::ParameterSet& pset);
-  ~RPCRecHitValid() override {};
+  RPCRecHitValid(const edm::ParameterSet &pset);
+  ~RPCRecHitValid() override{};
 
-  void analyze(const edm::Event& event, const edm::EventSetup& eventSetup) override;
+  void analyze(const edm::Event &event, const edm::EventSetup &eventSetup) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
 private:
@@ -40,10 +39,10 @@ class RPCRecHitValid : public DQMEDAnalyzer
   edm::EDGetTokenT<SimHits> simHitToken_;
   edm::EDGetTokenT<RecHits> recHitToken_;
   edm::EDGetTokenT<SimParticles> simParticleToken_;
-  edm::EDGetTokenT<SimHitAssoc>  simHitAssocToken_;
+  edm::EDGetTokenT<SimHitAssoc> simHitAssocToken_;
   edm::EDGetTokenT<reco::MuonCollection> muonToken_;
 
-  typedef MonitorElement* MEP;
+  typedef MonitorElement *MEP;
   RPCValidHistograms h_;
 
   MEP h_eventCount;
@@ -73,7 +72,6 @@ class RPCRecHitValid : public DQMEDAnalyzer
   MEP h_rollAreaEndcap_detId;
 
   std::map<int, int> detIdToIndexMapBarrel_, detIdToIndexMapEndcap_;
-
 };
 
-#endif // Validation_RPCRecHits_RPCRecHitValid_h
+#endif  // Validation_RPCRecHits_RPCRecHitValid_h
diff --git a/Validation/RPCRecHits/interface/RPCRecHitValidClient.h b/Validation/RPCRecHits/interface/RPCRecHitValidClient.h
index 8c8bfbac8ce8f..52612a8f508d4 100644
--- a/Validation/RPCRecHits/interface/RPCRecHitValidClient.h
+++ b/Validation/RPCRecHits/interface/RPCRecHitValidClient.h
@@ -1,30 +1,29 @@
 #ifndef Validation_RPCRecHits_RPCRecHitValidClient_h
 #define Validation_RPCRecHits_RPCRecHitValidClient_h
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include <string>
 
-class RPCRecHitValidClient : public DQMEDHarvester
-{
+class RPCRecHitValidClient : public DQMEDHarvester {
 public:
-  RPCRecHitValidClient(const edm::ParameterSet& pset);
-  ~RPCRecHitValidClient() override {};
+  RPCRecHitValidClient(const edm::ParameterSet &pset);
+  ~RPCRecHitValidClient() override{};
 
-  void dqmEndJob(DQMStore::IBooker& booker, DQMStore::IGetter& getter) override;
+  void dqmEndJob(DQMStore::IBooker &booker, DQMStore::IGetter &getter) override;
 
 private:
   std::string subDir_;
 };
 
-#endif // Validation_RPCRecHits_RPCRecHitValidClient_h
+#endif  // Validation_RPCRecHits_RPCRecHitValidClient_h
diff --git a/Validation/RPCRecHits/interface/RPCValidHistograms.h b/Validation/RPCRecHits/interface/RPCValidHistograms.h
index cbc456ee00104..e448630b033ee 100644
--- a/Validation/RPCRecHits/interface/RPCValidHistograms.h
+++ b/Validation/RPCRecHits/interface/RPCValidHistograms.h
@@ -1,24 +1,20 @@
 #ifndef Validation_RPCRecHits_RPCValidHistograms_H
 #define Validation_RPCRecHits_RPCValidHistograms_H
 
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "DQMServices/Core/interface/DQMStore.h"
-#include "FWCore/Framework/interface/Run.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/Run.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include <string>
 
-struct RPCValidHistograms
-{
-  typedef MonitorElement* MEP;
+struct RPCValidHistograms {
+  typedef MonitorElement *MEP;
 
-  RPCValidHistograms()
-  {
-    booked_ = false;
-  };
+  RPCValidHistograms() { booked_ = false; };
 
-  void bookHistograms(DQMStore::IBooker& booker, const std::string& subDir);
+  void bookHistograms(DQMStore::IBooker &booker, const std::string &subDir);
 
   // Hit properties
   MEP clusterSize, clusterSizeBarrel, clusterSizeEndcap;
@@ -43,7 +39,7 @@ struct RPCValidHistograms
   // Residuals
   MEP resBarrel, resEndcap;
   MEP res_wheel_res, res_disk_res, res_station_res, res_ring_res;
-  
+
   // Pulls
   MEP pullBarrel, pullEndcap;
   MEP pull_wheel_pull, pull_disk_pull, pull_station_pull, pull_ring_pull;
@@ -53,4 +49,3 @@ struct RPCValidHistograms
 };
 
 #endif
-
diff --git a/Validation/RPCRecHits/src/RPCPointVsRecHit.cc b/Validation/RPCRecHits/src/RPCPointVsRecHit.cc
index 007cc9596fc0e..f66dbc67d15a9 100644
--- a/Validation/RPCRecHits/src/RPCPointVsRecHit.cc
+++ b/Validation/RPCRecHits/src/RPCPointVsRecHit.cc
@@ -1,43 +1,39 @@
-#include "Validation/RPCRecHits/interface/RPCPointVsRecHit.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "Validation/RPCRecHits/interface/RPCPointVsRecHit.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "Geometry/RPCGeometry/interface/RPCRoll.h"
 #include "Geometry/RPCGeometry/interface/RPCGeometry.h"
+#include "Geometry/RPCGeometry/interface/RPCRoll.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
 
 using namespace std;
 
-typedef MonitorElement* MEP;
+typedef MonitorElement *MEP;
 
-RPCPointVsRecHit::RPCPointVsRecHit(const edm::ParameterSet& pset)
-{
+RPCPointVsRecHit::RPCPointVsRecHit(const edm::ParameterSet &pset) {
   refHitToken_ = consumes<RPCRecHitCollection>(pset.getParameter<edm::InputTag>("refHit"));
   recHitToken_ = consumes<RPCRecHitCollection>(pset.getParameter<edm::InputTag>("recHit"));
 
   subDir_ = pset.getParameter<std::string>("subDir");
 }
 
-void RPCPointVsRecHit::analyze(const edm::Event& event, const edm::EventSetup& eventSetup)
-{
+void RPCPointVsRecHit::analyze(const edm::Event &event, const edm::EventSetup &eventSetup) {
   // Get the RPC Geometry
   edm::ESHandle<RPCGeometry> rpcGeom;
   eventSetup.get<MuonGeometryRecord>().get(rpcGeom);
 
   // Retrieve RefHits from the event
   edm::Handle<RPCRecHitCollection> refHitHandle;
-  if ( !event.getByToken(refHitToken_, refHitHandle) )
-  {
+  if (!event.getByToken(refHitToken_, refHitHandle)) {
     edm::LogInfo("RPCPointVsRecHit") << "Cannot find reference hit collection\n";
     return;
   }
 
   // Retrieve RecHits from the event
   edm::Handle<RPCRecHitCollection> recHitHandle;
-  if ( !event.getByToken(recHitToken_, recHitHandle) )
-  {
+  if (!event.getByToken(recHitToken_, recHitHandle)) {
     edm::LogInfo("RPCPointVsRecHit") << "Cannot find recHit collection\n";
     return;
   }
@@ -46,32 +42,27 @@ void RPCPointVsRecHit::analyze(const edm::Event& event, const edm::EventSetup& e
 
   // Loop over refHits, fill histograms which does not need associations
   int nRefHitBarrel = 0, nRefHitEndcap = 0;
-  for ( RecHitIter refHitIter = refHitHandle->begin();
-        refHitIter != refHitHandle->end(); ++refHitIter )
-  {
+  for (RecHitIter refHitIter = refHitHandle->begin(); refHitIter != refHitHandle->end(); ++refHitIter) {
     const RPCDetId detId = static_cast<const RPCDetId>(refHitIter->rpcId());
-    const RPCRoll* roll = dynamic_cast<const RPCRoll*>(rpcGeom->roll(detId()));
-    if ( !roll ) continue;
+    const RPCRoll *roll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(detId()));
+    if (!roll)
+      continue;
 
     const int region = roll->id().region();
     const int ring = roll->id().ring();
-    //const int sector = roll->id().sector();
+    // const int sector = roll->id().sector();
     const int station = roll->id().station();
-    //const int layer = roll->id().layer();
-    //const int subSector = roll->id().subsector();
+    // const int layer = roll->id().layer();
+    // const int subSector = roll->id().subsector();
 
-    if ( region == 0 )
-    {
+    if (region == 0) {
       h_.refHitOccupancyBarrel_wheel->Fill(ring);
       h_.refHitOccupancyBarrel_station->Fill(station);
       h_.refHitOccupancyBarrel_wheel_station->Fill(ring, station);
+    } else {
+      h_.refHitOccupancyEndcap_disk->Fill(region * station);
+      h_.refHitOccupancyEndcap_disk_ring->Fill(region * station, ring);
     }
-    else
-    {
-      h_.refHitOccupancyEndcap_disk->Fill(region*station);
-      h_.refHitOccupancyEndcap_disk_ring->Fill(region*station, ring);
-    }
-
   }
   h_.nRefHitBarrel->Fill(nRefHitBarrel);
   h_.nRefHitEndcap->Fill(nRefHitEndcap);
@@ -79,56 +70,48 @@ void RPCPointVsRecHit::analyze(const edm::Event& event, const edm::EventSetup& e
   // Loop over recHits, fill histograms which does not need associations
   int sumClusterSizeBarrel = 0, sumClusterSizeEndcap = 0;
   int nRecHitBarrel = 0, nRecHitEndcap = 0;
-  for ( RecHitIter recHitIter = recHitHandle->begin();
-        recHitIter != recHitHandle->end(); ++recHitIter )
-  {
+  for (RecHitIter recHitIter = recHitHandle->begin(); recHitIter != recHitHandle->end(); ++recHitIter) {
     const RPCDetId detId = static_cast<const RPCDetId>(recHitIter->rpcId());
-    const RPCRoll* roll = dynamic_cast<const RPCRoll*>(rpcGeom->roll(detId()));
-    if ( !roll ) continue;
+    const RPCRoll *roll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(detId()));
+    if (!roll)
+      continue;
 
     const int region = roll->id().region();
     const int ring = roll->id().ring();
-    //const int sector = roll->id().sector();
+    // const int sector = roll->id().sector();
     const int station = (roll->id().station());
-    //const int layer = roll->id().layer();
-    //const int subSector = roll->id().subsector();
+    // const int layer = roll->id().layer();
+    // const int subSector = roll->id().subsector();
 
     h_.clusterSize->Fill(recHitIter->clusterSize());
 
-    if ( region == 0 )
-    {
+    if (region == 0) {
       ++nRecHitBarrel;
       sumClusterSizeBarrel += recHitIter->clusterSize();
       h_.clusterSizeBarrel->Fill(recHitIter->clusterSize());
       h_.recHitOccupancyBarrel_wheel->Fill(ring);
       h_.recHitOccupancyBarrel_station->Fill(station);
       h_.recHitOccupancyBarrel_wheel_station->Fill(ring, station);
-    }
-    else
-    {
+    } else {
       ++nRecHitEndcap;
       sumClusterSizeEndcap += recHitIter->clusterSize();
       h_.clusterSizeEndcap->Fill(recHitIter->clusterSize());
-      h_.recHitOccupancyEndcap_disk->Fill(region*station);
-      h_.recHitOccupancyEndcap_disk_ring->Fill(ring, region*station);
+      h_.recHitOccupancyEndcap_disk->Fill(region * station);
+      h_.recHitOccupancyEndcap_disk_ring->Fill(ring, region * station);
     }
-
   }
-  const double nRecHit = nRecHitBarrel+nRecHitEndcap;
+  const double nRecHit = nRecHitBarrel + nRecHitEndcap;
   h_.nRecHitBarrel->Fill(nRecHitBarrel);
   h_.nRecHitEndcap->Fill(nRecHitEndcap);
-  if ( nRecHit > 0 )
-  {
-    const int sumClusterSize = sumClusterSizeBarrel+sumClusterSizeEndcap;
-    h_.avgClusterSize->Fill(double(sumClusterSize)/nRecHit);
-
-    if ( nRecHitBarrel > 0 )
-    {
-      h_.avgClusterSizeBarrel->Fill(double(sumClusterSizeBarrel)/nRecHitBarrel);
+  if (nRecHit > 0) {
+    const int sumClusterSize = sumClusterSizeBarrel + sumClusterSizeEndcap;
+    h_.avgClusterSize->Fill(double(sumClusterSize) / nRecHit);
+
+    if (nRecHitBarrel > 0) {
+      h_.avgClusterSizeBarrel->Fill(double(sumClusterSizeBarrel) / nRecHitBarrel);
     }
-    if ( nRecHitEndcap > 0 )
-    {
-      h_.avgClusterSizeEndcap->Fill(double(sumClusterSizeEndcap)/nRecHitEndcap);
+    if (nRecHitEndcap > 0) {
+      h_.avgClusterSizeEndcap->Fill(double(sumClusterSizeEndcap) / nRecHitEndcap);
     }
   }
 
@@ -136,39 +119,34 @@ void RPCPointVsRecHit::analyze(const edm::Event& event, const edm::EventSetup& e
   typedef std::map<RecHitIter, RecHitIter> RecToRecHitMap;
   RecToRecHitMap refToRecHitMap;
 
-  for ( RecHitIter refHitIter = refHitHandle->begin();
-        refHitIter != refHitHandle->end(); ++refHitIter )
-  {
+  for (RecHitIter refHitIter = refHitHandle->begin(); refHitIter != refHitHandle->end(); ++refHitIter) {
     const RPCDetId refDetId = static_cast<const RPCDetId>(refHitIter->rpcId());
-    const RPCRoll* refRoll = dynamic_cast<const RPCRoll*>(rpcGeom->roll(refDetId));
-    if ( !refRoll ) continue;
+    const RPCRoll *refRoll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(refDetId));
+    if (!refRoll)
+      continue;
 
     const double refX = refHitIter->localPosition().x();
 
-    for ( RecHitIter recHitIter = recHitHandle->begin();
-          recHitIter != recHitHandle->end(); ++recHitIter )
-    {
+    for (RecHitIter recHitIter = recHitHandle->begin(); recHitIter != recHitHandle->end(); ++recHitIter) {
       const RPCDetId recDetId = static_cast<const RPCDetId>(recHitIter->rpcId());
-      const RPCRoll* recRoll = dynamic_cast<const RPCRoll*>(rpcGeom->roll(recDetId));
-      if ( !recRoll ) continue;
+      const RPCRoll *recRoll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(recDetId));
+      if (!recRoll)
+        continue;
 
-      if ( refDetId != recDetId ) continue;
+      if (refDetId != recDetId)
+        continue;
 
       const double recX = recHitIter->localPosition().x();
       const double newDx = fabs(recX - refX);
 
       // Associate RefHit to RecHit
       RecToRecHitMap::const_iterator prevRefToReco = refToRecHitMap.find(refHitIter);
-      if ( prevRefToReco == refToRecHitMap.end() )
-      {
+      if (prevRefToReco == refToRecHitMap.end()) {
         refToRecHitMap.insert(std::make_pair(refHitIter, recHitIter));
-      }
-      else
-      {
+      } else {
         const double oldDx = fabs(prevRefToReco->second->localPosition().x() - refX);
 
-        if ( newDx < oldDx )
-        {
+        if (newDx < oldDx) {
           refToRecHitMap[refHitIter] = recHitIter;
         }
       }
@@ -177,33 +155,30 @@ void RPCPointVsRecHit::analyze(const edm::Event& event, const edm::EventSetup& e
 
   // Now we have refHit-recHit mapping
   // So we can fill up relavant histograms
-  for ( RecToRecHitMap::const_iterator match = refToRecHitMap.begin();
-        match != refToRecHitMap.end(); ++match )
-  {
+  for (RecToRecHitMap::const_iterator match = refToRecHitMap.begin(); match != refToRecHitMap.end(); ++match) {
     RecHitIter refHitIter = match->first;
     RecHitIter recHitIter = match->second;
 
     const RPCDetId detId = static_cast<const RPCDetId>(refHitIter->rpcId());
-    const RPCRoll* roll = dynamic_cast<const RPCRoll*>(rpcGeom->roll(detId));
+    const RPCRoll *roll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(detId));
 
     const int region = roll->id().region();
     const int ring = roll->id().ring();
-    //const int sector = roll->id().sector();
+    // const int sector = roll->id().sector();
     const int station = roll->id().station();
-    //const int layer = roll->id().layer();
-    //const int subsector = roll->id().subsector();
+    // const int layer = roll->id().layer();
+    // const int subsector = roll->id().subsector();
 
     const double refX = refHitIter->localPosition().x();
     const double recX = recHitIter->localPosition().x();
     const double errX = sqrt(recHitIter->localPositionError().xx());
     const double dX = recX - refX;
-    const double pull = errX == 0 ? -999 : dX/errX;
+    const double pull = errX == 0 ? -999 : dX / errX;
 
-    //const GlobalPoint refPos = roll->toGlobal(refHitIter->localPosition());
-    //const GlobalPoint recPos = roll->toGlobal(recHitIter->localPosition());
+    // const GlobalPoint refPos = roll->toGlobal(refHitIter->localPosition());
+    // const GlobalPoint recPos = roll->toGlobal(recHitIter->localPosition());
 
-    if ( region == 0 )
-    {
+    if (region == 0) {
       h_.resBarrel->Fill(dX);
       h_.pullBarrel->Fill(pull);
       h_.matchOccupancyBarrel_wheel->Fill(ring);
@@ -214,30 +189,25 @@ void RPCPointVsRecHit::analyze(const edm::Event& event, const edm::EventSetup& e
       h_.res_station_res->Fill(station, dX);
       h_.pull_wheel_pull->Fill(ring, pull);
       h_.pull_station_pull->Fill(station, pull);
-    }
-    else
-    {
+    } else {
       h_.resEndcap->Fill(dX);
       h_.pullEndcap->Fill(pull);
-      h_.matchOccupancyEndcap_disk->Fill(region*station);
-      h_.matchOccupancyEndcap_disk_ring->Fill(region*station, ring);
+      h_.matchOccupancyEndcap_disk->Fill(region * station);
+      h_.matchOccupancyEndcap_disk_ring->Fill(region * station, ring);
 
-      h_.res_disk_res->Fill(region*station, dX);
+      h_.res_disk_res->Fill(region * station, dX);
       h_.res_ring_res->Fill(ring, dX);
-      h_.pull_disk_pull->Fill(region*station, pull);
+      h_.pull_disk_pull->Fill(region * station, pull);
       h_.pull_ring_pull->Fill(ring, pull);
     }
   }
-
 }
 
-void RPCPointVsRecHit::bookHistograms(DQMStore::IBooker& booker,
-                                      edm::Run const & run, edm::EventSetup const & eventSetup)
-{
+void RPCPointVsRecHit::bookHistograms(DQMStore::IBooker &booker,
+                                      edm::Run const &run,
+                                      edm::EventSetup const &eventSetup) {
   // Book MonitorElements
   h_.bookHistograms(booker, subDir_);
 }
 
-
 DEFINE_FWK_MODULE(RPCPointVsRecHit);
-
diff --git a/Validation/RPCRecHits/src/RPCRecHitValid.cc b/Validation/RPCRecHits/src/RPCRecHitValid.cc
index 6a69e330fe804..a991ecbcfb6b4 100644
--- a/Validation/RPCRecHits/src/RPCRecHitValid.cc
+++ b/Validation/RPCRecHits/src/RPCRecHitValid.cc
@@ -1,30 +1,29 @@
-#include "Validation/RPCRecHits/interface/RPCRecHitValid.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "Validation/RPCRecHits/interface/RPCRecHitValid.h"
 
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
-#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
-#include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonDetId/interface/MuonSubdetId.h"
+#include "DataFormats/MuonReco/interface/Muon.h"
+#include "DataFormats/TrackReco/interface/Track.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
 #include "Geometry/CommonTopologies/interface/StripTopology.h"
+#include "Geometry/RPCGeometry/interface/RPCGeomServ.h"
+#include "Geometry/RPCGeometry/interface/RPCGeometry.h"
 #include "Geometry/RPCGeometry/interface/RPCRoll.h"
 #include "Geometry/RPCGeometry/interface/RPCRollSpecs.h"
-#include "Geometry/RPCGeometry/interface/RPCGeometry.h"
-#include "Geometry/RPCGeometry/interface/RPCGeomServ.h"
 #include "Geometry/Records/interface/MuonGeometryRecord.h"
+#include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 
 #include <algorithm>
 
 using namespace std;
 
-typedef MonitorElement* MEP;
+typedef MonitorElement *MEP;
 
-RPCRecHitValid::RPCRecHitValid(const edm::ParameterSet& pset)
-{
+RPCRecHitValid::RPCRecHitValid(const edm::ParameterSet &pset) {
   simHitToken_ = consumes<SimHits>(pset.getParameter<edm::InputTag>("simHit"));
   recHitToken_ = consumes<RecHits>(pset.getParameter<edm::InputTag>("recHit"));
   simParticleToken_ = consumes<SimParticles>(pset.getParameter<edm::InputTag>("simTrack"));
@@ -34,191 +33,215 @@ RPCRecHitValid::RPCRecHitValid(const edm::ParameterSet& pset)
   subDir_ = pset.getParameter<std::string>("subDir");
 }
 
-void RPCRecHitValid::bookHistograms(DQMStore::IBooker& booker,
-                                    edm::Run const & run, edm::EventSetup const & eventSetup)
-{
+void RPCRecHitValid::bookHistograms(DQMStore::IBooker &booker, edm::Run const &run, edm::EventSetup const &eventSetup) {
   // Book MonitorElements
   h_.bookHistograms(booker, subDir_);
 
   // SimHit plots, not compatible to RPCPoint-RPCRecHit comparison
-  booker.setCurrentFolder(subDir_+"/HitProperty");
+  booker.setCurrentFolder(subDir_ + "/HitProperty");
   h_simParticleType = booker.book1D("SimHitPType", "SimHit particle type", 11, 0, 11);
   h_simParticleType->getTH1()->SetMinimum(0);
-  if ( TH1* h = h_simParticleType->getTH1() )
-  {
-    h->GetXaxis()->SetBinLabel(1 , "#mu^{-}");
-    h->GetXaxis()->SetBinLabel(2 , "#mu^{+}");
-    h->GetXaxis()->SetBinLabel(3 , "e^{-}"  );
-    h->GetXaxis()->SetBinLabel(4 , "e^{+}"  );
-    h->GetXaxis()->SetBinLabel(5 , "#pi^{+}");
-    h->GetXaxis()->SetBinLabel(6 , "#pi^{-}");
-    h->GetXaxis()->SetBinLabel(7 , "K^{+}"  );
-    h->GetXaxis()->SetBinLabel(8 , "K^{-}"  );
-    h->GetXaxis()->SetBinLabel(9 , "p^{+}"  );
-    h->GetXaxis()->SetBinLabel(10, "p^{-}"  );
-    h->GetXaxis()->SetBinLabel(11, "Other"  );
+  if (TH1 *h = h_simParticleType->getTH1()) {
+    h->GetXaxis()->SetBinLabel(1, "#mu^{-}");
+    h->GetXaxis()->SetBinLabel(2, "#mu^{+}");
+    h->GetXaxis()->SetBinLabel(3, "e^{-}");
+    h->GetXaxis()->SetBinLabel(4, "e^{+}");
+    h->GetXaxis()->SetBinLabel(5, "#pi^{+}");
+    h->GetXaxis()->SetBinLabel(6, "#pi^{-}");
+    h->GetXaxis()->SetBinLabel(7, "K^{+}");
+    h->GetXaxis()->SetBinLabel(8, "K^{-}");
+    h->GetXaxis()->SetBinLabel(9, "p^{+}");
+    h->GetXaxis()->SetBinLabel(10, "p^{-}");
+    h->GetXaxis()->SetBinLabel(11, "Other");
   }
 
-  booker.setCurrentFolder(subDir_+"/Track");
-
-  h_nRPCHitPerSimMuon        = booker.book1D("NRPCHitPerSimMuon"       , "Number of RPC SimHit per SimMuon", 11, -0.5, 10.5);
-  h_nRPCHitPerSimMuonBarrel  = booker.book1D("NRPCHitPerSimMuonBarrel" , "Number of RPC SimHit per SimMuon", 11, -0.5, 10.5);
-  h_nRPCHitPerSimMuonOverlap = booker.book1D("NRPCHitPerSimMuonOverlap", "Number of RPC SimHit per SimMuon", 11, -0.5, 10.5);
-  h_nRPCHitPerSimMuonEndcap  = booker.book1D("NRPCHitPerSimMuonEndcap" , "Number of RPC SimHit per SimMuon", 11, -0.5, 10.5);
-
-  h_nRPCHitPerRecoMuon        = booker.book1D("NRPCHitPerRecoMuon"       , "Number of RPC RecHit per RecoMuon", 11, -0.5, 10.5);
-  h_nRPCHitPerRecoMuonBarrel  = booker.book1D("NRPCHitPerRecoMuonBarrel" , "Number of RPC RecHit per RecoMuon", 11, -0.5, 10.5);
-  h_nRPCHitPerRecoMuonOverlap = booker.book1D("NRPCHitPerRecoMuonOverlap", "Number of RPC RecHit per RecoMuon", 11, -0.5, 10.5);
-  h_nRPCHitPerRecoMuonEndcap  = booker.book1D("NRPCHitPerRecoMuonEndcap" , "Number of RPC RecHit per RecoMuon", 11, -0.5, 10.5);
-
-  h_nRPCHitPerSimMuon        ->getTH1()->SetMinimum(0);
-  h_nRPCHitPerSimMuonBarrel  ->getTH1()->SetMinimum(0);
-  h_nRPCHitPerSimMuonOverlap ->getTH1()->SetMinimum(0);
-  h_nRPCHitPerSimMuonEndcap  ->getTH1()->SetMinimum(0);
-
-  h_nRPCHitPerRecoMuon       ->getTH1()->SetMinimum(0);
-  h_nRPCHitPerRecoMuonBarrel ->getTH1()->SetMinimum(0);
+  booker.setCurrentFolder(subDir_ + "/Track");
+
+  h_nRPCHitPerSimMuon = booker.book1D("NRPCHitPerSimMuon", "Number of RPC SimHit per SimMuon", 11, -0.5, 10.5);
+  h_nRPCHitPerSimMuonBarrel =
+      booker.book1D("NRPCHitPerSimMuonBarrel", "Number of RPC SimHit per SimMuon", 11, -0.5, 10.5);
+  h_nRPCHitPerSimMuonOverlap =
+      booker.book1D("NRPCHitPerSimMuonOverlap", "Number of RPC SimHit per SimMuon", 11, -0.5, 10.5);
+  h_nRPCHitPerSimMuonEndcap =
+      booker.book1D("NRPCHitPerSimMuonEndcap", "Number of RPC SimHit per SimMuon", 11, -0.5, 10.5);
+
+  h_nRPCHitPerRecoMuon = booker.book1D("NRPCHitPerRecoMuon", "Number of RPC RecHit per RecoMuon", 11, -0.5, 10.5);
+  h_nRPCHitPerRecoMuonBarrel =
+      booker.book1D("NRPCHitPerRecoMuonBarrel", "Number of RPC RecHit per RecoMuon", 11, -0.5, 10.5);
+  h_nRPCHitPerRecoMuonOverlap =
+      booker.book1D("NRPCHitPerRecoMuonOverlap", "Number of RPC RecHit per RecoMuon", 11, -0.5, 10.5);
+  h_nRPCHitPerRecoMuonEndcap =
+      booker.book1D("NRPCHitPerRecoMuonEndcap", "Number of RPC RecHit per RecoMuon", 11, -0.5, 10.5);
+
+  h_nRPCHitPerSimMuon->getTH1()->SetMinimum(0);
+  h_nRPCHitPerSimMuonBarrel->getTH1()->SetMinimum(0);
+  h_nRPCHitPerSimMuonOverlap->getTH1()->SetMinimum(0);
+  h_nRPCHitPerSimMuonEndcap->getTH1()->SetMinimum(0);
+
+  h_nRPCHitPerRecoMuon->getTH1()->SetMinimum(0);
+  h_nRPCHitPerRecoMuonBarrel->getTH1()->SetMinimum(0);
   h_nRPCHitPerRecoMuonOverlap->getTH1()->SetMinimum(0);
-  h_nRPCHitPerRecoMuonEndcap ->getTH1()->SetMinimum(0);
+  h_nRPCHitPerRecoMuonEndcap->getTH1()->SetMinimum(0);
 
   float ptBins[] = {0, 1, 2, 5, 10, 20, 30, 50, 100, 200, 300, 500};
-  const int nPtBins = sizeof(ptBins)/sizeof(float)-1;
-  h_simMuonBarrel_pt   = booker.book1D("SimMuonBarrel_pt"  , "SimMuon RPCHit in Barrel  p_{T};p_{T} [GeV/c^{2}]", nPtBins, ptBins);
-  h_simMuonOverlap_pt  = booker.book1D("SimMuonOverlap_pt" , "SimMuon RPCHit in Overlap p_{T};p_{T} [GeV/c^{2}]", nPtBins, ptBins);
-  h_simMuonEndcap_pt   = booker.book1D("SimMuonEndcap_pt"  , "SimMuon RPCHit in Endcap  p_{T};p_{T} [GeV/c^{2}]", nPtBins, ptBins);
-  h_simMuonNoRPC_pt    = booker.book1D("SimMuonNoRPC_pt" , "SimMuon without RPCHit p_{T};p_{T} [GeV/c^{2}]", nPtBins, ptBins);
-  h_simMuonBarrel_eta  = booker.book1D("SimMuonBarrel_eta" , "SimMuon RPCHit in Barrel  #eta;#eta", 50, -2.5, 2.5);
+  const int nPtBins = sizeof(ptBins) / sizeof(float) - 1;
+  h_simMuonBarrel_pt =
+      booker.book1D("SimMuonBarrel_pt", "SimMuon RPCHit in Barrel  p_{T};p_{T} [GeV/c^{2}]", nPtBins, ptBins);
+  h_simMuonOverlap_pt =
+      booker.book1D("SimMuonOverlap_pt", "SimMuon RPCHit in Overlap p_{T};p_{T} [GeV/c^{2}]", nPtBins, ptBins);
+  h_simMuonEndcap_pt =
+      booker.book1D("SimMuonEndcap_pt", "SimMuon RPCHit in Endcap  p_{T};p_{T} [GeV/c^{2}]", nPtBins, ptBins);
+  h_simMuonNoRPC_pt =
+      booker.book1D("SimMuonNoRPC_pt", "SimMuon without RPCHit p_{T};p_{T} [GeV/c^{2}]", nPtBins, ptBins);
+  h_simMuonBarrel_eta = booker.book1D("SimMuonBarrel_eta", "SimMuon RPCHit in Barrel  #eta;#eta", 50, -2.5, 2.5);
   h_simMuonOverlap_eta = booker.book1D("SimMuonOverlap_eta", "SimMuon RPCHit in Overlap #eta;#eta", 50, -2.5, 2.5);
-  h_simMuonEndcap_eta  = booker.book1D("SimMuonEndcap_eta" , "SimMuon RPCHit in Endcap  #eta;#eta", 50, -2.5, 2.5);
-  h_simMuonNoRPC_eta   = booker.book1D("SimMuonNoRPC_eta", "SimMuon without RPCHit #eta;#eta", 50, -2.5, 2.5);
-  h_simMuonBarrel_phi  = booker.book1D("SimMuonBarrel_phi" , "SimMuon RPCHit in Barrel  #phi;#phi", 36, -TMath::Pi(), TMath::Pi());
-  h_simMuonOverlap_phi = booker.book1D("SimMuonOverlap_phi", "SimMuon RPCHit in Overlap #phi;#phi", 36, -TMath::Pi(), TMath::Pi());
-  h_simMuonEndcap_phi  = booker.book1D("SimMuonEndcap_phi" , "SimMuon RPCHit in Endcap  #phi;#phi", 36, -TMath::Pi(), TMath::Pi());
-  h_simMuonNoRPC_phi   = booker.book1D("SimMuonNoRPC_phi", "SimMuon without RPCHit #phi;#phi", 36, -TMath::Pi(), TMath::Pi());
-
-  h_recoMuonBarrel_pt   = booker.book1D("RecoMuonBarrel_pt"  , "RecoMuon RPCHit in Barrel  p_{T};p_{T} [GeV/c^{2}]", nPtBins, ptBins);
-  h_recoMuonOverlap_pt  = booker.book1D("RecoMuonOverlap_pt" , "RecoMuon RPCHit in Overlap p_{T};p_{T} [GeV/c^{2}]", nPtBins, ptBins);
-  h_recoMuonEndcap_pt   = booker.book1D("RecoMuonEndcap_pt"  , "RecoMuon RPCHit in Endcap  p_{T};p_{T} [GeV/c^{2}]", nPtBins, ptBins);
-  h_recoMuonNoRPC_pt    = booker.book1D("RecoMuonNoRPC_pt" , "RecoMuon without RPCHit p_{T};p_{T} [GeV/c^{2}]", nPtBins, ptBins);
-  h_recoMuonBarrel_eta  = booker.book1D("RecoMuonBarrel_eta" , "RecoMuon RPCHit in Barrel  #eta;#eta", 50, -2.5, 2.5);
+  h_simMuonEndcap_eta = booker.book1D("SimMuonEndcap_eta", "SimMuon RPCHit in Endcap  #eta;#eta", 50, -2.5, 2.5);
+  h_simMuonNoRPC_eta = booker.book1D("SimMuonNoRPC_eta", "SimMuon without RPCHit #eta;#eta", 50, -2.5, 2.5);
+  h_simMuonBarrel_phi =
+      booker.book1D("SimMuonBarrel_phi", "SimMuon RPCHit in Barrel  #phi;#phi", 36, -TMath::Pi(), TMath::Pi());
+  h_simMuonOverlap_phi =
+      booker.book1D("SimMuonOverlap_phi", "SimMuon RPCHit in Overlap #phi;#phi", 36, -TMath::Pi(), TMath::Pi());
+  h_simMuonEndcap_phi =
+      booker.book1D("SimMuonEndcap_phi", "SimMuon RPCHit in Endcap  #phi;#phi", 36, -TMath::Pi(), TMath::Pi());
+  h_simMuonNoRPC_phi =
+      booker.book1D("SimMuonNoRPC_phi", "SimMuon without RPCHit #phi;#phi", 36, -TMath::Pi(), TMath::Pi());
+
+  h_recoMuonBarrel_pt =
+      booker.book1D("RecoMuonBarrel_pt", "RecoMuon RPCHit in Barrel  p_{T};p_{T} [GeV/c^{2}]", nPtBins, ptBins);
+  h_recoMuonOverlap_pt =
+      booker.book1D("RecoMuonOverlap_pt", "RecoMuon RPCHit in Overlap p_{T};p_{T} [GeV/c^{2}]", nPtBins, ptBins);
+  h_recoMuonEndcap_pt =
+      booker.book1D("RecoMuonEndcap_pt", "RecoMuon RPCHit in Endcap  p_{T};p_{T} [GeV/c^{2}]", nPtBins, ptBins);
+  h_recoMuonNoRPC_pt =
+      booker.book1D("RecoMuonNoRPC_pt", "RecoMuon without RPCHit p_{T};p_{T} [GeV/c^{2}]", nPtBins, ptBins);
+  h_recoMuonBarrel_eta = booker.book1D("RecoMuonBarrel_eta", "RecoMuon RPCHit in Barrel  #eta;#eta", 50, -2.5, 2.5);
   h_recoMuonOverlap_eta = booker.book1D("RecoMuonOverlap_eta", "RecoMuon RPCHit in Overlap #eta;#eta", 50, -2.5, 2.5);
-  h_recoMuonEndcap_eta  = booker.book1D("RecoMuonEndcap_eta" , "RecoMuon RPCHit in Endcap  #eta;#eta", 50, -2.5, 2.5);
-  h_recoMuonNoRPC_eta   = booker.book1D("RecoMuonNoRPC_eta", "RecoMuon without RPCHit #eta;#eta", 50, -2.5, 2.5);
-  h_recoMuonBarrel_phi  = booker.book1D("RecoMuonBarrel_phi" , "RecoMuon RPCHit in Barrel  #phi;#phi", 36, -TMath::Pi(), TMath::Pi());
-  h_recoMuonOverlap_phi = booker.book1D("RecoMuonOverlap_phi", "RecoMuon RPCHit in Overlap #phi;#phi", 36, -TMath::Pi(), TMath::Pi());
-  h_recoMuonEndcap_phi  = booker.book1D("RecoMuonEndcap_phi" , "RecoMuon RPCHit in Endcap  #phi;#phi", 36, -TMath::Pi(), TMath::Pi());
-  h_recoMuonNoRPC_phi   = booker.book1D("RecoMuonNoRPC_phi", "RecoMuon without RPCHit #phi;#phi", 36, -TMath::Pi(), TMath::Pi());
-
-  h_simMuonBarrel_pt   ->getTH1()->SetMinimum(0);
-  h_simMuonOverlap_pt  ->getTH1()->SetMinimum(0);
-  h_simMuonEndcap_pt   ->getTH1()->SetMinimum(0);
-  h_simMuonNoRPC_pt    ->getTH1()->SetMinimum(0);
-  h_simMuonBarrel_eta  ->getTH1()->SetMinimum(0);
-  h_simMuonOverlap_eta ->getTH1()->SetMinimum(0);
-  h_simMuonEndcap_eta  ->getTH1()->SetMinimum(0);
-  h_simMuonNoRPC_eta   ->getTH1()->SetMinimum(0);
-  h_simMuonBarrel_phi  ->getTH1()->SetMinimum(0);
-  h_simMuonOverlap_phi ->getTH1()->SetMinimum(0);
-  h_simMuonEndcap_phi  ->getTH1()->SetMinimum(0);
-  h_simMuonNoRPC_phi   ->getTH1()->SetMinimum(0);
-
-  h_recoMuonBarrel_pt  ->getTH1()->SetMinimum(0);
-  h_recoMuonOverlap_pt ->getTH1()->SetMinimum(0);
-  h_recoMuonEndcap_pt  ->getTH1()->SetMinimum(0);
-  h_recoMuonNoRPC_pt   ->getTH1()->SetMinimum(0);
-  h_recoMuonBarrel_eta ->getTH1()->SetMinimum(0);
+  h_recoMuonEndcap_eta = booker.book1D("RecoMuonEndcap_eta", "RecoMuon RPCHit in Endcap  #eta;#eta", 50, -2.5, 2.5);
+  h_recoMuonNoRPC_eta = booker.book1D("RecoMuonNoRPC_eta", "RecoMuon without RPCHit #eta;#eta", 50, -2.5, 2.5);
+  h_recoMuonBarrel_phi =
+      booker.book1D("RecoMuonBarrel_phi", "RecoMuon RPCHit in Barrel  #phi;#phi", 36, -TMath::Pi(), TMath::Pi());
+  h_recoMuonOverlap_phi =
+      booker.book1D("RecoMuonOverlap_phi", "RecoMuon RPCHit in Overlap #phi;#phi", 36, -TMath::Pi(), TMath::Pi());
+  h_recoMuonEndcap_phi =
+      booker.book1D("RecoMuonEndcap_phi", "RecoMuon RPCHit in Endcap  #phi;#phi", 36, -TMath::Pi(), TMath::Pi());
+  h_recoMuonNoRPC_phi =
+      booker.book1D("RecoMuonNoRPC_phi", "RecoMuon without RPCHit #phi;#phi", 36, -TMath::Pi(), TMath::Pi());
+
+  h_simMuonBarrel_pt->getTH1()->SetMinimum(0);
+  h_simMuonOverlap_pt->getTH1()->SetMinimum(0);
+  h_simMuonEndcap_pt->getTH1()->SetMinimum(0);
+  h_simMuonNoRPC_pt->getTH1()->SetMinimum(0);
+  h_simMuonBarrel_eta->getTH1()->SetMinimum(0);
+  h_simMuonOverlap_eta->getTH1()->SetMinimum(0);
+  h_simMuonEndcap_eta->getTH1()->SetMinimum(0);
+  h_simMuonNoRPC_eta->getTH1()->SetMinimum(0);
+  h_simMuonBarrel_phi->getTH1()->SetMinimum(0);
+  h_simMuonOverlap_phi->getTH1()->SetMinimum(0);
+  h_simMuonEndcap_phi->getTH1()->SetMinimum(0);
+  h_simMuonNoRPC_phi->getTH1()->SetMinimum(0);
+
+  h_recoMuonBarrel_pt->getTH1()->SetMinimum(0);
+  h_recoMuonOverlap_pt->getTH1()->SetMinimum(0);
+  h_recoMuonEndcap_pt->getTH1()->SetMinimum(0);
+  h_recoMuonNoRPC_pt->getTH1()->SetMinimum(0);
+  h_recoMuonBarrel_eta->getTH1()->SetMinimum(0);
   h_recoMuonOverlap_eta->getTH1()->SetMinimum(0);
-  h_recoMuonEndcap_eta ->getTH1()->SetMinimum(0);
-  h_recoMuonNoRPC_eta  ->getTH1()->SetMinimum(0);
-  h_recoMuonBarrel_phi ->getTH1()->SetMinimum(0);
+  h_recoMuonEndcap_eta->getTH1()->SetMinimum(0);
+  h_recoMuonNoRPC_eta->getTH1()->SetMinimum(0);
+  h_recoMuonBarrel_phi->getTH1()->SetMinimum(0);
   h_recoMuonOverlap_phi->getTH1()->SetMinimum(0);
-  h_recoMuonEndcap_phi ->getTH1()->SetMinimum(0);
-  h_recoMuonNoRPC_phi  ->getTH1()->SetMinimum(0);
+  h_recoMuonEndcap_phi->getTH1()->SetMinimum(0);
+  h_recoMuonNoRPC_phi->getTH1()->SetMinimum(0);
 
-  booker.setCurrentFolder(subDir_+"/Occupancy");
+  booker.setCurrentFolder(subDir_ + "/Occupancy");
 
   h_eventCount = booker.book1D("EventCount", "Event count", 3, 1, 4);
   h_eventCount->getTH1()->SetMinimum(0);
-  if ( h_eventCount )
-  {
-    TH1* h = h_eventCount->getTH1();
+  if (h_eventCount) {
+    TH1 *h = h_eventCount->getTH1();
     h->GetXaxis()->SetBinLabel(1, "eventBegin");
     h->GetXaxis()->SetBinLabel(2, "eventEnd");
     h->GetXaxis()->SetBinLabel(3, "run");
   }
   h_eventCount->Fill(3);
 
-  h_refPunchOccupancyBarrel_wheel   = booker.book1D("RefPunchOccupancyBarrel_wheel"  , "RefPunchthrough occupancy", 5, -2.5, 2.5);
-  h_refPunchOccupancyEndcap_disk    = booker.book1D("RefPunchOccupancyEndcap_disk"   , "RefPunchthrough occupancy", 9, -4.5, 4.5);
-  h_refPunchOccupancyBarrel_station = booker.book1D("RefPunchOccupancyBarrel_station", "RefPunchthrough occupancy", 4,  0.5, 4.5);
-  h_recPunchOccupancyBarrel_wheel   = booker.book1D("RecPunchOccupancyBarrel_wheel"  , "Punchthrough recHit occupancy", 5, -2.5, 2.5);
-  h_recPunchOccupancyEndcap_disk    = booker.book1D("RecPunchOccupancyEndcap_disk"   , "Punchthrough recHit occupancy", 9, -4.5, 4.5);
-  h_recPunchOccupancyBarrel_station = booker.book1D("RecPunchOccupancyBarrel_station", "Punchthrough recHit occupancy", 4,  0.5, 4.5);
-
-  h_refPunchOccupancyBarrel_wheel   ->getTH1()->SetMinimum(0);
-  h_refPunchOccupancyEndcap_disk    ->getTH1()->SetMinimum(0);
-  h_refPunchOccupancyBarrel_station ->getTH1()->SetMinimum(0);
-  h_recPunchOccupancyBarrel_wheel   ->getTH1()->SetMinimum(0);
-  h_recPunchOccupancyEndcap_disk    ->getTH1()->SetMinimum(0);
-  h_recPunchOccupancyBarrel_station ->getTH1()->SetMinimum(0);
-
-  h_refPunchOccupancyBarrel_wheel_station = booker.book2D("RefPunchOccupancyBarrel_wheel_station", "RefPunchthrough occupancy", 5, -2.5, 2.5, 4, 0.5, 4.5);
-  h_refPunchOccupancyEndcap_disk_ring     = booker.book2D("RefPunchOccupancyEndcap_disk_ring"    , "RefPunchthrough occupancy", 9, -4.5, 4.5, 4, 0.5, 4.5);
-  h_recPunchOccupancyBarrel_wheel_station = booker.book2D("RecPunchOccupancyBarrel_wheel_station", "Punchthrough recHit occupancy", 5, -2.5, 2.5, 4, 0.5, 4.5);
-  h_recPunchOccupancyEndcap_disk_ring     = booker.book2D("RecPunchOccupancyEndcap_disk_ring"    , "Punchthrough recHit occupancy", 9, -4.5, 4.5, 4, 0.5, 4.5);
+  h_refPunchOccupancyBarrel_wheel =
+      booker.book1D("RefPunchOccupancyBarrel_wheel", "RefPunchthrough occupancy", 5, -2.5, 2.5);
+  h_refPunchOccupancyEndcap_disk =
+      booker.book1D("RefPunchOccupancyEndcap_disk", "RefPunchthrough occupancy", 9, -4.5, 4.5);
+  h_refPunchOccupancyBarrel_station =
+      booker.book1D("RefPunchOccupancyBarrel_station", "RefPunchthrough occupancy", 4, 0.5, 4.5);
+  h_recPunchOccupancyBarrel_wheel =
+      booker.book1D("RecPunchOccupancyBarrel_wheel", "Punchthrough recHit occupancy", 5, -2.5, 2.5);
+  h_recPunchOccupancyEndcap_disk =
+      booker.book1D("RecPunchOccupancyEndcap_disk", "Punchthrough recHit occupancy", 9, -4.5, 4.5);
+  h_recPunchOccupancyBarrel_station =
+      booker.book1D("RecPunchOccupancyBarrel_station", "Punchthrough recHit occupancy", 4, 0.5, 4.5);
+
+  h_refPunchOccupancyBarrel_wheel->getTH1()->SetMinimum(0);
+  h_refPunchOccupancyEndcap_disk->getTH1()->SetMinimum(0);
+  h_refPunchOccupancyBarrel_station->getTH1()->SetMinimum(0);
+  h_recPunchOccupancyBarrel_wheel->getTH1()->SetMinimum(0);
+  h_recPunchOccupancyEndcap_disk->getTH1()->SetMinimum(0);
+  h_recPunchOccupancyBarrel_station->getTH1()->SetMinimum(0);
+
+  h_refPunchOccupancyBarrel_wheel_station =
+      booker.book2D("RefPunchOccupancyBarrel_wheel_station", "RefPunchthrough occupancy", 5, -2.5, 2.5, 4, 0.5, 4.5);
+  h_refPunchOccupancyEndcap_disk_ring =
+      booker.book2D("RefPunchOccupancyEndcap_disk_ring", "RefPunchthrough occupancy", 9, -4.5, 4.5, 4, 0.5, 4.5);
+  h_recPunchOccupancyBarrel_wheel_station = booker.book2D(
+      "RecPunchOccupancyBarrel_wheel_station", "Punchthrough recHit occupancy", 5, -2.5, 2.5, 4, 0.5, 4.5);
+  h_recPunchOccupancyEndcap_disk_ring =
+      booker.book2D("RecPunchOccupancyEndcap_disk_ring", "Punchthrough recHit occupancy", 9, -4.5, 4.5, 4, 0.5, 4.5);
 
   h_refPunchOccupancyBarrel_wheel_station->getTH2F()->SetOption("COLZ");
-  h_refPunchOccupancyEndcap_disk_ring    ->getTH2F()->SetOption("COLZ");
+  h_refPunchOccupancyEndcap_disk_ring->getTH2F()->SetOption("COLZ");
   h_recPunchOccupancyBarrel_wheel_station->getTH2F()->SetOption("COLZ");
-  h_recPunchOccupancyEndcap_disk_ring    ->getTH2F()->SetOption("COLZ");
+  h_recPunchOccupancyEndcap_disk_ring->getTH2F()->SetOption("COLZ");
 
   h_refPunchOccupancyBarrel_wheel_station->getTH2F()->SetContour(10);
-  h_refPunchOccupancyEndcap_disk_ring    ->getTH2F()->SetContour(10);
+  h_refPunchOccupancyEndcap_disk_ring->getTH2F()->SetContour(10);
   h_recPunchOccupancyBarrel_wheel_station->getTH2F()->SetContour(10);
-  h_recPunchOccupancyEndcap_disk_ring    ->getTH2F()->SetContour(10);
+  h_recPunchOccupancyEndcap_disk_ring->getTH2F()->SetContour(10);
 
   h_refPunchOccupancyBarrel_wheel_station->getTH2F()->SetStats(false);
-  h_refPunchOccupancyEndcap_disk_ring    ->getTH2F()->SetStats(false);
+  h_refPunchOccupancyEndcap_disk_ring->getTH2F()->SetStats(false);
   h_recPunchOccupancyBarrel_wheel_station->getTH2F()->SetStats(false);
-  h_recPunchOccupancyEndcap_disk_ring    ->getTH2F()->SetStats(false);
+  h_recPunchOccupancyEndcap_disk_ring->getTH2F()->SetStats(false);
 
   h_refPunchOccupancyBarrel_wheel_station->getTH2F()->SetMinimum(0);
-  h_refPunchOccupancyEndcap_disk_ring    ->getTH2F()->SetMinimum(0);
+  h_refPunchOccupancyEndcap_disk_ring->getTH2F()->SetMinimum(0);
   h_recPunchOccupancyBarrel_wheel_station->getTH2F()->SetMinimum(0);
-  h_recPunchOccupancyEndcap_disk_ring    ->getTH2F()->SetMinimum(0);
+  h_recPunchOccupancyEndcap_disk_ring->getTH2F()->SetMinimum(0);
 
-  for ( int i=1; i<=5; ++i )
-  {
-    TString binLabel = Form("Wheel %d", i-3);
+  for (int i = 1; i <= 5; ++i) {
+    TString binLabel = Form("Wheel %d", i - 3);
     h_refPunchOccupancyBarrel_wheel->getTH1()->GetXaxis()->SetBinLabel(i, binLabel);
     h_refPunchOccupancyBarrel_wheel_station->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
     h_recPunchOccupancyBarrel_wheel->getTH1()->GetXaxis()->SetBinLabel(i, binLabel);
     h_recPunchOccupancyBarrel_wheel_station->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
   }
 
-  for ( int i=1; i<=9; ++i )
-  {
-    TString binLabel = Form("Disk %d", i-5);
-    h_refPunchOccupancyEndcap_disk  ->getTH1()->GetXaxis()->SetBinLabel(i, binLabel);
-    h_refPunchOccupancyEndcap_disk_ring  ->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
-    h_recPunchOccupancyEndcap_disk  ->getTH1()->GetXaxis()->SetBinLabel(i, binLabel);
-    h_recPunchOccupancyEndcap_disk_ring  ->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
+  for (int i = 1; i <= 9; ++i) {
+    TString binLabel = Form("Disk %d", i - 5);
+    h_refPunchOccupancyEndcap_disk->getTH1()->GetXaxis()->SetBinLabel(i, binLabel);
+    h_refPunchOccupancyEndcap_disk_ring->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
+    h_recPunchOccupancyEndcap_disk->getTH1()->GetXaxis()->SetBinLabel(i, binLabel);
+    h_recPunchOccupancyEndcap_disk_ring->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
   }
 
-  for ( int i=1; i<=4; ++i )
-  {
+  for (int i = 1; i <= 4; ++i) {
     TString binLabel = Form("Station %d", i);
-    h_refPunchOccupancyBarrel_station  ->getTH1()->GetXaxis()->SetBinLabel(i, binLabel);
-    h_refPunchOccupancyBarrel_wheel_station  ->getTH2F()->GetYaxis()->SetBinLabel(i, binLabel);
-    h_recPunchOccupancyBarrel_station  ->getTH1()->GetXaxis()->SetBinLabel(i, binLabel);
-    h_recPunchOccupancyBarrel_wheel_station  ->getTH2F()->GetYaxis()->SetBinLabel(i, binLabel);
+    h_refPunchOccupancyBarrel_station->getTH1()->GetXaxis()->SetBinLabel(i, binLabel);
+    h_refPunchOccupancyBarrel_wheel_station->getTH2F()->GetYaxis()->SetBinLabel(i, binLabel);
+    h_recPunchOccupancyBarrel_station->getTH1()->GetXaxis()->SetBinLabel(i, binLabel);
+    h_recPunchOccupancyBarrel_wheel_station->getTH2F()->GetYaxis()->SetBinLabel(i, binLabel);
   }
 
-  for ( int i=1; i<=4; ++i )
-  {
+  for (int i = 1; i <= 4; ++i) {
     TString binLabel = Form("Ring %d", i);
-    h_refPunchOccupancyEndcap_disk_ring  ->getTH2F()->GetYaxis()->SetBinLabel(i, binLabel);
-    h_recPunchOccupancyEndcap_disk_ring  ->getTH2F()->GetYaxis()->SetBinLabel(i, binLabel);
+    h_refPunchOccupancyEndcap_disk_ring->getTH2F()->GetYaxis()->SetBinLabel(i, binLabel);
+    h_recPunchOccupancyEndcap_disk_ring->getTH2F()->GetYaxis()->SetBinLabel(i, binLabel);
   }
 
   // Book roll-by-roll histograms
@@ -228,91 +251,107 @@ void RPCRecHitValid::bookHistograms(DQMStore::IBooker& booker,
   int nRPCRollBarrel = 0, nRPCRollEndcap = 0;
 
   TrackingGeometry::DetContainer rpcDets = rpcGeom->dets();
-  for ( auto det : rpcDets )
-  {
-    auto rpcCh = dynamic_cast<const RPCChamber*>(det);
-    if ( !rpcCh ) continue;
+  for (auto det : rpcDets) {
+    auto rpcCh = dynamic_cast<const RPCChamber *>(det);
+    if (!rpcCh)
+      continue;
 
-    std::vector<const RPCRoll*> rolls = rpcCh->rolls();
-    for ( auto roll : rolls )
-    {
-      if ( !roll ) continue;
+    std::vector<const RPCRoll *> rolls = rpcCh->rolls();
+    for (auto roll : rolls) {
+      if (!roll)
+        continue;
 
-      //RPCGeomServ rpcSrv(roll->id());
+      // RPCGeomServ rpcSrv(roll->id());
       const int rawId = roll->geographicalId().rawId();
-      //if ( !roll->specs()->isRPC() ) { cout << "\nNoRPC : " << rpcSrv.name() << ' ' << rawId << endl; continue; }
+      // if ( !roll->specs()->isRPC() ) { cout << "\nNoRPC : " << rpcSrv.name()
+      // << ' ' << rawId << endl; continue; }
 
-      if ( roll->isBarrel() )
-      {
+      if (roll->isBarrel()) {
         detIdToIndexMapBarrel_[rawId] = nRPCRollBarrel;
-        //rollIdToNameMapBarrel_[rawId] = rpcSrv.name();
+        // rollIdToNameMapBarrel_[rawId] = rpcSrv.name();
         ++nRPCRollBarrel;
-      }
-      else
-      {
+      } else {
         detIdToIndexMapEndcap_[rawId] = nRPCRollEndcap;
-        //rollIdToNameMapEndcap_[rawId] = rpcSrv.name();
+        // rollIdToNameMapEndcap_[rawId] = rpcSrv.name();
         ++nRPCRollEndcap;
       }
     }
   }
 
-  booker.setCurrentFolder(subDir_+"/Occupancy");
-  h_matchOccupancyBarrel_detId = booker.book1D("MatchOccupancyBarrel_detId", "Matched hit occupancy;roll index (can be arbitrary)", nRPCRollBarrel, 0, nRPCRollBarrel);
-  h_matchOccupancyEndcap_detId = booker.book1D("MatchOccupancyEndcap_detId", "Matched hit occupancy;roll index (can be arbitrary)", nRPCRollEndcap, 0, nRPCRollEndcap);
-  h_refOccupancyBarrel_detId = booker.book1D("RefOccupancyBarrel_detId", "Reference hit occupancy;roll index (can be arbitrary)", nRPCRollBarrel, 0, nRPCRollBarrel);
-  h_refOccupancyEndcap_detId = booker.book1D("RefOccupancyEndcap_detId", "Reference hit occupancy;roll index (can be arbitrary)", nRPCRollEndcap, 0, nRPCRollEndcap);
-  h_noiseOccupancyBarrel_detId = booker.book1D("NoiseOccupancyBarrel_detId", "Noise occupancy;roll index (can be arbitrary)", nRPCRollBarrel, 0, nRPCRollBarrel);
-  h_noiseOccupancyEndcap_detId = booker.book1D("NoiseOccupancyEndcap_detId", "Noise occupancy;roll index (can be arbitrary)", nRPCRollEndcap, 0, nRPCRollEndcap);
+  booker.setCurrentFolder(subDir_ + "/Occupancy");
+  h_matchOccupancyBarrel_detId = booker.book1D("MatchOccupancyBarrel_detId",
+                                               "Matched hit occupancy;roll index (can be arbitrary)",
+                                               nRPCRollBarrel,
+                                               0,
+                                               nRPCRollBarrel);
+  h_matchOccupancyEndcap_detId = booker.book1D("MatchOccupancyEndcap_detId",
+                                               "Matched hit occupancy;roll index (can be arbitrary)",
+                                               nRPCRollEndcap,
+                                               0,
+                                               nRPCRollEndcap);
+  h_refOccupancyBarrel_detId = booker.book1D("RefOccupancyBarrel_detId",
+                                             "Reference hit occupancy;roll index (can be arbitrary)",
+                                             nRPCRollBarrel,
+                                             0,
+                                             nRPCRollBarrel);
+  h_refOccupancyEndcap_detId = booker.book1D("RefOccupancyEndcap_detId",
+                                             "Reference hit occupancy;roll index (can be arbitrary)",
+                                             nRPCRollEndcap,
+                                             0,
+                                             nRPCRollEndcap);
+  h_noiseOccupancyBarrel_detId = booker.book1D(
+      "NoiseOccupancyBarrel_detId", "Noise occupancy;roll index (can be arbitrary)", nRPCRollBarrel, 0, nRPCRollBarrel);
+  h_noiseOccupancyEndcap_detId = booker.book1D(
+      "NoiseOccupancyEndcap_detId", "Noise occupancy;roll index (can be arbitrary)", nRPCRollEndcap, 0, nRPCRollEndcap);
 
   h_matchOccupancyBarrel_detId->getTH1()->SetMinimum(0);
   h_matchOccupancyEndcap_detId->getTH1()->SetMinimum(0);
-  h_refOccupancyBarrel_detId  ->getTH1()->SetMinimum(0);
-  h_refOccupancyEndcap_detId  ->getTH1()->SetMinimum(0);
+  h_refOccupancyBarrel_detId->getTH1()->SetMinimum(0);
+  h_refOccupancyEndcap_detId->getTH1()->SetMinimum(0);
   h_noiseOccupancyBarrel_detId->getTH1()->SetMinimum(0);
   h_noiseOccupancyEndcap_detId->getTH1()->SetMinimum(0);
 
-  h_rollAreaBarrel_detId = booker.bookProfile("RollAreaBarrel_detId", "Roll area;roll index;Area", nRPCRollBarrel, 0., 1.*nRPCRollBarrel, 0., 1e5);
-  h_rollAreaEndcap_detId = booker.bookProfile("RollAreaEndcap_detId", "Roll area;roll index;Area", nRPCRollEndcap, 0., 1.*nRPCRollEndcap, 0., 1e5);
+  h_rollAreaBarrel_detId = booker.bookProfile(
+      "RollAreaBarrel_detId", "Roll area;roll index;Area", nRPCRollBarrel, 0., 1. * nRPCRollBarrel, 0., 1e5);
+  h_rollAreaEndcap_detId = booker.bookProfile(
+      "RollAreaEndcap_detId", "Roll area;roll index;Area", nRPCRollEndcap, 0., 1. * nRPCRollEndcap, 0., 1e5);
 
-  for ( auto detIdToIndex : detIdToIndexMapBarrel_ )
-  {
+  for (auto detIdToIndex : detIdToIndexMapBarrel_) {
     const int rawId = detIdToIndex.first;
     const int index = detIdToIndex.second;
 
     const RPCDetId rpcDetId = static_cast<const RPCDetId>(rawId);
-    const RPCRoll* roll = dynamic_cast<const RPCRoll*>(rpcGeom->roll(rpcDetId));
+    const RPCRoll *roll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(rpcDetId));
 
-    //RPCGeomServ rpcSrv(roll->id());
-    //if ( !roll->specs()->isRPC() ) { cout << "\nNoRPC : " << rpcSrv.name() << ' ' << rawId << endl; continue; }
+    // RPCGeomServ rpcSrv(roll->id());
+    // if ( !roll->specs()->isRPC() ) { cout << "\nNoRPC : " << rpcSrv.name() <<
+    // ' ' << rawId << endl; continue; }
 
-    const StripTopology& topol = roll->specificTopology();
-    const double area = topol.stripLength()*topol.nstrips()*topol.pitch();
+    const StripTopology &topol = roll->specificTopology();
+    const double area = topol.stripLength() * topol.nstrips() * topol.pitch();
 
     h_rollAreaBarrel_detId->Fill(index, area);
   }
 
-  for ( auto detIdToIndex : detIdToIndexMapEndcap_ )
-  {
+  for (auto detIdToIndex : detIdToIndexMapEndcap_) {
     const int rawId = detIdToIndex.first;
     const int index = detIdToIndex.second;
 
     const RPCDetId rpcDetId = static_cast<const RPCDetId>(rawId);
-    const RPCRoll* roll = dynamic_cast<const RPCRoll*>(rpcGeom->roll(rpcDetId));
+    const RPCRoll *roll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(rpcDetId));
 
-    //RPCGeomServ rpcSrv(roll->id());
-    //if ( !roll->specs()->isRPC() ) { cout << "\nNoRPC : " << rpcSrv.name() << ' ' << rawId << endl; continue; }
+    // RPCGeomServ rpcSrv(roll->id());
+    // if ( !roll->specs()->isRPC() ) { cout << "\nNoRPC : " << rpcSrv.name() <<
+    // ' ' << rawId << endl; continue; }
 
-    const StripTopology& topol = roll->specificTopology();
-    const double area = topol.stripLength()*topol.nstrips()*topol.pitch();
+    const StripTopology &topol = roll->specificTopology();
+    const double area = topol.stripLength() * topol.nstrips() * topol.pitch();
 
     h_rollAreaEndcap_detId->Fill(index, area);
   }
-
 }
 
-void RPCRecHitValid::analyze(const edm::Event& event, const edm::EventSetup& eventSetup)
-{
+void RPCRecHitValid::analyze(const edm::Event &event, const edm::EventSetup &eventSetup) {
   h_eventCount->Fill(1);
 
   // Get the RPC Geometry
@@ -321,40 +360,35 @@ void RPCRecHitValid::analyze(const edm::Event& event, const edm::EventSetup& eve
 
   // Retrieve SimHits from the event
   edm::Handle<edm::PSimHitContainer> simHitHandle;
-  if ( !event.getByToken(simHitToken_, simHitHandle) )
-  {
+  if (!event.getByToken(simHitToken_, simHitHandle)) {
     edm::LogInfo("RPCRecHitValid") << "Cannot find simHit collection\n";
     return;
   }
 
   // Retrieve RecHits from the event
   edm::Handle<RPCRecHitCollection> recHitHandle;
-  if ( !event.getByToken(recHitToken_, recHitHandle) )
-  {
+  if (!event.getByToken(recHitToken_, recHitHandle)) {
     edm::LogInfo("RPCRecHitValid") << "Cannot find recHit collection\n";
     return;
   }
 
   // Get SimParticles
   edm::Handle<TrackingParticleCollection> simParticleHandle;
-  if ( !event.getByToken(simParticleToken_, simParticleHandle) )
-  {
+  if (!event.getByToken(simParticleToken_, simParticleHandle)) {
     edm::LogInfo("RPCRecHitValid") << "Cannot find TrackingParticle collection\n";
     return;
   }
 
   // Get SimParticle to SimHit association map
   edm::Handle<SimHitTPAssociationProducer::SimHitTPAssociationList> simHitsTPAssoc;
-  if ( !event.getByToken(simHitAssocToken_, simHitsTPAssoc) )
-  {
+  if (!event.getByToken(simHitAssocToken_, simHitsTPAssoc)) {
     edm::LogInfo("RPCRecHitValid") << "Cannot find TrackingParticle to SimHit association map\n";
     return;
   }
 
   // Get RecoMuons
   edm::Handle<reco::MuonCollection> muonHandle;
-  if ( !event.getByToken(muonToken_, muonHandle) )
-  {
+  if (!event.getByToken(muonToken_, muonHandle)) {
     edm::LogInfo("RPCRecHitValid") << "Cannot find muon collection\n";
     return;
   }
@@ -366,158 +400,164 @@ void RPCRecHitValid::analyze(const edm::Event& event, const edm::EventSetup& eve
   // TrackingParticles with (and without) RPC simHits
   SimHitRefs muonSimHits, pthrSimHits;
 
-  for ( int i=0, n=simParticleHandle->size(); i<n; ++i )
-  {
+  for (int i = 0, n = simParticleHandle->size(); i < n; ++i) {
     TrackingParticleRef simParticle(simParticleHandle, i);
-    if ( simParticle->pt() < 1.0 or simParticle->p() < 2.5 ) continue; // globalMuon acceptance
+    if (simParticle->pt() < 1.0 or simParticle->p() < 2.5)
+      continue;  // globalMuon acceptance
 
     // Collect SimHits from this Tracking Particle
     SimHitRefs simHitsFromParticle;
-    auto range = std::equal_range(simHitsTPAssoc->begin(), simHitsTPAssoc->end(),
+    auto range = std::equal_range(simHitsTPAssoc->begin(),
+                                  simHitsTPAssoc->end(),
                                   std::make_pair(simParticle, TrackPSimHitRef()),
                                   SimHitTPAssociationProducer::simHitTPAssociationListGreater);
-    for ( auto simParticleToHit = range.first; simParticleToHit != range.second; ++simParticleToHit )
-    {
+    for (auto simParticleToHit = range.first; simParticleToHit != range.second; ++simParticleToHit) {
       auto simHit = simParticleToHit->second;
       const DetId detId(simHit->detUnitId());
-      if ( detId.det() != DetId::Muon or detId.subdetId() != MuonSubdetId::RPC ) continue;
+      if (detId.det() != DetId::Muon or detId.subdetId() != MuonSubdetId::RPC)
+        continue;
 
       simHitsFromParticle.push_back(simParticleToHit->second);
     }
     const int nRPCHit = simHitsFromParticle.size();
     const bool hasRPCHit = nRPCHit > 0;
 
-    if ( abs(simParticle->pdgId()) == 13 )
-    {
+    if (abs(simParticle->pdgId()) == 13) {
       muonSimHits.insert(muonSimHits.end(), simHitsFromParticle.begin(), simHitsFromParticle.end());
 
       // Count number of Barrel hits and Endcap hits
       int nRPCHitBarrel = 0;
       int nRPCHitEndcap = 0;
-      for ( auto simHit : simHitsFromParticle )
-      {
+      for (auto simHit : simHitsFromParticle) {
         const RPCDetId rpcDetId = static_cast<const RPCDetId>(simHit->detUnitId());
-        const RPCRoll* roll = dynamic_cast<const RPCRoll*>(rpcGeom->roll(rpcDetId));
-        if ( !roll ) continue;
+        const RPCRoll *roll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(rpcDetId));
+        if (!roll)
+          continue;
 
-        if ( rpcDetId.region() == 0 ) ++nRPCHitBarrel;
-        else ++nRPCHitEndcap;
+        if (rpcDetId.region() == 0)
+          ++nRPCHitBarrel;
+        else
+          ++nRPCHitEndcap;
       }
 
       // Fill TrackingParticle related histograms
       h_nRPCHitPerSimMuon->Fill(nRPCHit);
-      if ( nRPCHitBarrel and nRPCHitEndcap )
-      {
+      if (nRPCHitBarrel and nRPCHitEndcap) {
         h_nRPCHitPerSimMuonOverlap->Fill(nRPCHit);
         h_simMuonOverlap_pt->Fill(simParticle->pt());
         h_simMuonOverlap_eta->Fill(simParticle->eta());
         h_simMuonOverlap_phi->Fill(simParticle->phi());
-      }
-      else if ( nRPCHitBarrel )
-      {
+      } else if (nRPCHitBarrel) {
         h_nRPCHitPerSimMuonBarrel->Fill(nRPCHit);
         h_simMuonBarrel_pt->Fill(simParticle->pt());
         h_simMuonBarrel_eta->Fill(simParticle->eta());
         h_simMuonBarrel_phi->Fill(simParticle->phi());
-      }
-      else if ( nRPCHitEndcap )
-      {
+      } else if (nRPCHitEndcap) {
         h_nRPCHitPerSimMuonEndcap->Fill(nRPCHit);
         h_simMuonEndcap_pt->Fill(simParticle->pt());
         h_simMuonEndcap_eta->Fill(simParticle->eta());
         h_simMuonEndcap_phi->Fill(simParticle->phi());
-      }
-      else
-      {
+      } else {
         h_simMuonNoRPC_pt->Fill(simParticle->pt());
         h_simMuonNoRPC_eta->Fill(simParticle->eta());
         h_simMuonNoRPC_phi->Fill(simParticle->phi());
       }
-    }
-    else
-    {
+    } else {
       pthrSimHits.insert(pthrSimHits.end(), simHitsFromParticle.begin(), simHitsFromParticle.end());
     }
 
-    if ( hasRPCHit )
-    {
-      switch ( simParticle->pdgId() )
-      {
-        case    13: h_simParticleType->Fill( 0); break;
-        case   -13: h_simParticleType->Fill( 1); break;
-        case    11: h_simParticleType->Fill( 2); break;
-        case   -11: h_simParticleType->Fill( 3); break;
-        case   211: h_simParticleType->Fill( 4); break;
-        case  -211: h_simParticleType->Fill( 5); break;
-        case   321: h_simParticleType->Fill( 6); break;
-        case  -321: h_simParticleType->Fill( 7); break;
-        case  2212: h_simParticleType->Fill( 8); break;
-        case -2212: h_simParticleType->Fill( 9); break;
-        default:    h_simParticleType->Fill(10); break;
+    if (hasRPCHit) {
+      switch (simParticle->pdgId()) {
+        case 13:
+          h_simParticleType->Fill(0);
+          break;
+        case -13:
+          h_simParticleType->Fill(1);
+          break;
+        case 11:
+          h_simParticleType->Fill(2);
+          break;
+        case -11:
+          h_simParticleType->Fill(3);
+          break;
+        case 211:
+          h_simParticleType->Fill(4);
+          break;
+        case -211:
+          h_simParticleType->Fill(5);
+          break;
+        case 321:
+          h_simParticleType->Fill(6);
+          break;
+        case -321:
+          h_simParticleType->Fill(7);
+          break;
+        case 2212:
+          h_simParticleType->Fill(8);
+          break;
+        case -2212:
+          h_simParticleType->Fill(9);
+          break;
+        default:
+          h_simParticleType->Fill(10);
+          break;
       }
     }
   }
 
   // Loop over muon simHits, fill histograms which does not need associations
   int nRefHitBarrel = 0, nRefHitEndcap = 0;
-  for ( auto simHit : muonSimHits )
-  {
+  for (auto simHit : muonSimHits) {
     const RPCDetId detId = static_cast<const RPCDetId>(simHit->detUnitId());
-    const RPCRoll* roll = dynamic_cast<const RPCRoll*>(rpcGeom->roll(detId));
+    const RPCRoll *roll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(detId));
 
     const int region = roll->id().region();
     const int ring = roll->id().ring();
-    //const int sector = roll->id().sector();
+    // const int sector = roll->id().sector();
     const int station = roll->id().station();
-    //const int layer = roll->id().layer();
-    //const int subSector = roll->id().subsector();
+    // const int layer = roll->id().layer();
+    // const int subSector = roll->id().subsector();
 
-    if ( region == 0 )
-    {
+    if (region == 0) {
       ++nRefHitBarrel;
       h_.refHitOccupancyBarrel_wheel->Fill(ring);
       h_.refHitOccupancyBarrel_station->Fill(station);
       h_.refHitOccupancyBarrel_wheel_station->Fill(ring, station);
 
       h_refOccupancyBarrel_detId->Fill(detIdToIndexMapBarrel_[simHit->detUnitId()]);
-    }
-    else
-    {
+    } else {
       ++nRefHitEndcap;
-      h_.refHitOccupancyEndcap_disk->Fill(region*station);
-      h_.refHitOccupancyEndcap_disk_ring->Fill(region*station, ring);
+      h_.refHitOccupancyEndcap_disk->Fill(region * station);
+      h_.refHitOccupancyEndcap_disk_ring->Fill(region * station, ring);
 
       h_refOccupancyEndcap_detId->Fill(detIdToIndexMapEndcap_[simHit->detUnitId()]);
     }
   }
 
-  // Loop over punch-through simHits, fill histograms which does not need associations
-  for ( auto simHit : pthrSimHits )
-  {
+  // Loop over punch-through simHits, fill histograms which does not need
+  // associations
+  for (auto simHit : pthrSimHits) {
     const RPCDetId detId = static_cast<const RPCDetId>(simHit->detUnitId());
-    const RPCRoll* roll = dynamic_cast<const RPCRoll*>(rpcGeom->roll(detId()));
+    const RPCRoll *roll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(detId()));
 
     const int region = roll->id().region();
     const int ring = roll->id().ring();
-    //const int sector = roll->id().sector();
+    // const int sector = roll->id().sector();
     const int station = roll->id().station();
-    //const int layer = roll->id().layer();
-    //const int subSector = roll->id().subsector();
+    // const int layer = roll->id().layer();
+    // const int subSector = roll->id().subsector();
 
-    if ( region == 0 )
-    {
+    if (region == 0) {
       ++nRefHitBarrel;
       h_refPunchOccupancyBarrel_wheel->Fill(ring);
       h_refPunchOccupancyBarrel_station->Fill(station);
       h_refPunchOccupancyBarrel_wheel_station->Fill(ring, station);
 
       h_refOccupancyBarrel_detId->Fill(detIdToIndexMapBarrel_[simHit->detUnitId()]);
-    }
-    else
-    {
+    } else {
       ++nRefHitEndcap;
-      h_refPunchOccupancyEndcap_disk->Fill(region*station);
-      h_refPunchOccupancyEndcap_disk_ring->Fill(region*station, ring);
+      h_refPunchOccupancyEndcap_disk->Fill(region * station);
+      h_refPunchOccupancyEndcap_disk_ring->Fill(region * station, ring);
 
       h_refOccupancyEndcap_detId->Fill(detIdToIndexMapEndcap_[simHit->detUnitId()]);
     }
@@ -528,26 +568,24 @@ void RPCRecHitValid::analyze(const edm::Event& event, const edm::EventSetup& eve
   // Loop over recHits, fill histograms which does not need associations
   int sumClusterSizeBarrel = 0, sumClusterSizeEndcap = 0;
   int nRecHitBarrel = 0, nRecHitEndcap = 0;
-  for ( RecHitIter recHitIter = recHitHandle->begin();
-        recHitIter != recHitHandle->end(); ++recHitIter )
-  {
+  for (RecHitIter recHitIter = recHitHandle->begin(); recHitIter != recHitHandle->end(); ++recHitIter) {
     const RPCDetId detId = static_cast<const RPCDetId>(recHitIter->rpcId());
-    const RPCRoll* roll = dynamic_cast<const RPCRoll*>(rpcGeom->roll(detId()));
-    if ( !roll ) continue;
+    const RPCRoll *roll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(detId()));
+    if (!roll)
+      continue;
 
     const int region = roll->id().region();
     const int ring = roll->id().ring();
-    //const int sector = roll->id().sector();
+    // const int sector = roll->id().sector();
     const int station = roll->id().station();
-    //const int layer = roll->id().layer();
-    //const int subSector = roll->id().subsector();
+    // const int layer = roll->id().layer();
+    // const int subSector = roll->id().subsector();
 
-    const double time = recHitIter->timeError() >= 0 ? recHitIter->time() : recHitIter->BunchX()*25;
+    const double time = recHitIter->timeError() >= 0 ? recHitIter->time() : recHitIter->BunchX() * 25;
 
     h_.clusterSize->Fill(recHitIter->clusterSize());
 
-    if ( region == 0 )
-    {
+    if (region == 0) {
       ++nRecHitBarrel;
       sumClusterSizeBarrel += recHitIter->clusterSize();
       h_.clusterSizeBarrel->Fill(recHitIter->clusterSize());
@@ -556,41 +594,34 @@ void RPCRecHitValid::analyze(const edm::Event& event, const edm::EventSetup& eve
       h_.recHitOccupancyBarrel_wheel_station->Fill(ring, station);
 
       h_.timeBarrel->Fill(time);
-    }
-    else
-    {
+    } else {
       ++nRecHitEndcap;
       sumClusterSizeEndcap += recHitIter->clusterSize();
       h_.clusterSizeEndcap->Fill(recHitIter->clusterSize());
-      h_.recHitOccupancyEndcap_disk->Fill(region*station);
-      h_.recHitOccupancyEndcap_disk_ring->Fill(region*station, ring);
+      h_.recHitOccupancyEndcap_disk->Fill(region * station);
+      h_.recHitOccupancyEndcap_disk_ring->Fill(region * station, ring);
 
       h_.timeEndcap->Fill(time);
     }
 
-    if ( roll->isIRPC() ) {
+    if (roll->isIRPC()) {
       h_.timeIRPC->Fill(time);
-    }
-    else {
+    } else {
       h_.timeCRPC->Fill(time);
     }
-
   }
-  const double nRecHit = nRecHitBarrel+nRecHitEndcap;
+  const double nRecHit = nRecHitBarrel + nRecHitEndcap;
   h_.nRecHitBarrel->Fill(nRecHitBarrel);
   h_.nRecHitEndcap->Fill(nRecHitEndcap);
-  if ( nRecHit > 0 )
-  {
-    const int sumClusterSize = sumClusterSizeBarrel+sumClusterSizeEndcap;
-    h_.avgClusterSize->Fill(double(sumClusterSize)/nRecHit);
-
-    if ( nRecHitBarrel > 0 )
-    {
-      h_.avgClusterSizeBarrel->Fill(double(sumClusterSizeBarrel)/nRecHitBarrel);
+  if (nRecHit > 0) {
+    const int sumClusterSize = sumClusterSizeBarrel + sumClusterSizeEndcap;
+    h_.avgClusterSize->Fill(double(sumClusterSize) / nRecHit);
+
+    if (nRecHitBarrel > 0) {
+      h_.avgClusterSizeBarrel->Fill(double(sumClusterSizeBarrel) / nRecHitBarrel);
     }
-    if ( nRecHitEndcap > 0 )
-    {
-      h_.avgClusterSizeEndcap->Fill(double(sumClusterSizeEndcap)/nRecHitEndcap);
+    if (nRecHitEndcap > 0) {
+      h_.avgClusterSizeEndcap->Fill(double(sumClusterSizeEndcap) / nRecHitEndcap);
     }
   }
 
@@ -598,37 +629,33 @@ void RPCRecHitValid::analyze(const edm::Event& event, const edm::EventSetup& eve
   typedef std::map<TrackPSimHitRef, RecHitIter> SimToRecHitMap;
   SimToRecHitMap simToRecHitMap;
 
-  for ( auto simHit : muonSimHits )
-  {
+  for (auto simHit : muonSimHits) {
     const RPCDetId simDetId = static_cast<const RPCDetId>(simHit->detUnitId());
-    //const RPCRoll* simRoll = dynamic_cast<const RPCRoll*>(rpcGeom->roll(simDetId));
+    // const RPCRoll* simRoll = dynamic_cast<const
+    // RPCRoll*>(rpcGeom->roll(simDetId));
 
     const double simX = simHit->localPosition().x();
 
-    for ( RecHitIter recHitIter = recHitHandle->begin();
-          recHitIter != recHitHandle->end(); ++recHitIter )
-    {
+    for (RecHitIter recHitIter = recHitHandle->begin(); recHitIter != recHitHandle->end(); ++recHitIter) {
       const RPCDetId recDetId = static_cast<const RPCDetId>(recHitIter->rpcId());
-      const RPCRoll* recRoll = dynamic_cast<const RPCRoll*>(rpcGeom->roll(recDetId));
-      if ( !recRoll ) continue;
+      const RPCRoll *recRoll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(recDetId));
+      if (!recRoll)
+        continue;
 
-      if ( simDetId != recDetId ) continue;
+      if (simDetId != recDetId)
+        continue;
 
       const double recX = recHitIter->localPosition().x();
       const double newDx = fabs(recX - simX);
 
       // Associate SimHit to RecHit
       SimToRecHitMap::const_iterator prevSimToReco = simToRecHitMap.find(simHit);
-      if ( prevSimToReco == simToRecHitMap.end() )
-      {
+      if (prevSimToReco == simToRecHitMap.end()) {
         simToRecHitMap.insert(std::make_pair(simHit, recHitIter));
-      }
-      else
-      {
+      } else {
         const double oldDx = fabs(prevSimToReco->second->localPosition().x() - simX);
 
-        if ( newDx < oldDx )
-        {
+        if (newDx < oldDx) {
           simToRecHitMap[simHit] = recHitIter;
         }
       }
@@ -638,32 +665,30 @@ void RPCRecHitValid::analyze(const edm::Event& event, const edm::EventSetup& eve
   // Now we have simHit-recHit mapping
   // So we can fill up relavant histograms
   int nMatchHitBarrel = 0, nMatchHitEndcap = 0;
-  for ( auto match : simToRecHitMap )
-  {
+  for (auto match : simToRecHitMap) {
     TrackPSimHitRef simHit = match.first;
     RecHitIter recHitIter = match.second;
 
     const RPCDetId detId = static_cast<const RPCDetId>(simHit->detUnitId());
-    const RPCRoll* roll = dynamic_cast<const RPCRoll*>(rpcGeom->roll(detId));
+    const RPCRoll *roll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(detId));
 
     const int region = roll->id().region();
     const int ring = roll->id().ring();
-    //const int sector = roll->id().sector();
+    // const int sector = roll->id().sector();
     const int station = roll->id().station();
-    //const int layer = roll->id().layer();
-    //const int subsector = roll->id().subsector();
+    // const int layer = roll->id().layer();
+    // const int subsector = roll->id().subsector();
 
     const double simX = simHit->localPosition().x();
     const double recX = recHitIter->localPosition().x();
     const double errX = sqrt(recHitIter->localPositionError().xx());
     const double dX = recX - simX;
-    const double pull = errX == 0 ? -999 : dX/errX;
+    const double pull = errX == 0 ? -999 : dX / errX;
 
-    //const GlobalPoint simPos = roll->toGlobal(simHitIter->localPosition());
-    //const GlobalPoint recPos = roll->toGlobal(recHitIter->localPosition());
+    // const GlobalPoint simPos = roll->toGlobal(simHitIter->localPosition());
+    // const GlobalPoint recPos = roll->toGlobal(recHitIter->localPosition());
 
-    if ( region == 0 )
-    {
+    if (region == 0) {
       ++nMatchHitBarrel;
       h_.resBarrel->Fill(dX);
       h_.pullBarrel->Fill(pull);
@@ -677,74 +702,65 @@ void RPCRecHitValid::analyze(const edm::Event& event, const edm::EventSetup& eve
       h_.pull_station_pull->Fill(station, pull);
 
       h_matchOccupancyBarrel_detId->Fill(detIdToIndexMapBarrel_[detId.rawId()]);
-    }
-    else
-    {
+    } else {
       ++nMatchHitEndcap;
       h_.resEndcap->Fill(dX);
       h_.pullEndcap->Fill(pull);
-      h_.matchOccupancyEndcap_disk->Fill(region*station);
-      h_.matchOccupancyEndcap_disk_ring->Fill(region*station, ring);
+      h_.matchOccupancyEndcap_disk->Fill(region * station);
+      h_.matchOccupancyEndcap_disk_ring->Fill(region * station, ring);
 
-      h_.res_disk_res->Fill(region*station, dX);
+      h_.res_disk_res->Fill(region * station, dX);
       h_.res_ring_res->Fill(ring, dX);
-      h_.pull_disk_pull->Fill(region*station, pull);
+      h_.pull_disk_pull->Fill(region * station, pull);
       h_.pull_ring_pull->Fill(ring, pull);
 
       h_matchOccupancyEndcap_detId->Fill(detIdToIndexMapEndcap_[detId.rawId()]);
     }
-
   }
   h_.nMatchHitBarrel->Fill(nMatchHitBarrel);
   h_.nMatchHitEndcap->Fill(nMatchHitEndcap);
 
   // Reco Muon hits
-  for ( reco::MuonCollection::const_iterator muon = muonHandle->begin();
-        muon != muonHandle->end(); ++muon )
-  {
-    if ( !muon->isGlobalMuon() ) continue;
+  for (reco::MuonCollection::const_iterator muon = muonHandle->begin(); muon != muonHandle->end(); ++muon) {
+    if (!muon->isGlobalMuon())
+      continue;
 
     int nRPCHitBarrel = 0;
     int nRPCHitEndcap = 0;
 
     const reco::TrackRef glbTrack = muon->globalTrack();
-    for ( trackingRecHit_iterator recHit = glbTrack->recHitsBegin();
-          recHit != glbTrack->recHitsEnd(); ++recHit )
-    {
-      if ( !(*recHit)->isValid() ) continue;
+    for (trackingRecHit_iterator recHit = glbTrack->recHitsBegin(); recHit != glbTrack->recHitsEnd(); ++recHit) {
+      if (!(*recHit)->isValid())
+        continue;
       const DetId detId = (*recHit)->geographicalId();
-      if ( detId.det() != DetId::Muon or detId.subdetId() != MuonSubdetId::RPC ) continue;
+      if (detId.det() != DetId::Muon or detId.subdetId() != MuonSubdetId::RPC)
+        continue;
       const RPCDetId rpcDetId = static_cast<const RPCDetId>(detId);
 
-      if ( rpcDetId.region() == 0 ) ++nRPCHitBarrel;
-      else ++nRPCHitEndcap;
+      if (rpcDetId.region() == 0)
+        ++nRPCHitBarrel;
+      else
+        ++nRPCHitEndcap;
     }
 
     const int nRPCHit = nRPCHitBarrel + nRPCHitEndcap;
     h_nRPCHitPerRecoMuon->Fill(nRPCHit);
-    if ( nRPCHitBarrel and nRPCHitEndcap )
-    {
+    if (nRPCHitBarrel and nRPCHitEndcap) {
       h_nRPCHitPerRecoMuonOverlap->Fill(nRPCHit);
       h_recoMuonOverlap_pt->Fill(muon->pt());
       h_recoMuonOverlap_eta->Fill(muon->eta());
       h_recoMuonOverlap_phi->Fill(muon->phi());
-    }
-    else if ( nRPCHitBarrel )
-    {
+    } else if (nRPCHitBarrel) {
       h_nRPCHitPerRecoMuonBarrel->Fill(nRPCHit);
       h_recoMuonBarrel_pt->Fill(muon->pt());
       h_recoMuonBarrel_eta->Fill(muon->eta());
       h_recoMuonBarrel_phi->Fill(muon->phi());
-    }
-    else if ( nRPCHitEndcap )
-    {
+    } else if (nRPCHitEndcap) {
       h_nRPCHitPerRecoMuonEndcap->Fill(nRPCHit);
       h_recoMuonEndcap_pt->Fill(muon->pt());
       h_recoMuonEndcap_eta->Fill(muon->eta());
       h_recoMuonEndcap_phi->Fill(muon->phi());
-    }
-    else
-    {
+    } else {
       h_recoMuonNoRPC_pt->Fill(muon->pt());
       h_recoMuonNoRPC_eta->Fill(muon->eta());
       h_recoMuonNoRPC_phi->Fill(muon->phi());
@@ -752,112 +768,95 @@ void RPCRecHitValid::analyze(const edm::Event& event, const edm::EventSetup& eve
   }
 
   // Find Non-muon hits
-  for ( RecHitIter recHitIter = recHitHandle->begin();
-        recHitIter != recHitHandle->end(); ++recHitIter )
-  {
+  for (RecHitIter recHitIter = recHitHandle->begin(); recHitIter != recHitHandle->end(); ++recHitIter) {
     const RPCDetId detId = static_cast<const RPCDetId>(recHitIter->rpcId());
-    const RPCRoll* roll = dynamic_cast<const RPCRoll*>(rpcGeom->roll(detId));
+    const RPCRoll *roll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(detId));
 
     const int region = roll->id().region();
     const int ring = roll->id().ring();
-    //const int sector = roll->id().sector();
+    // const int sector = roll->id().sector();
     const int station = roll->id().station();
-    //const int layer = roll->id().layer();
-    //const int subsector = roll->id().subsector();
+    // const int layer = roll->id().layer();
+    // const int subsector = roll->id().subsector();
 
     bool matched = false;
-    for ( auto match : simToRecHitMap )
-    {
-      if ( recHitIter == match.second )
-      {
+    for (auto match : simToRecHitMap) {
+      if (recHitIter == match.second) {
         matched = true;
         break;
       }
     }
 
-    if ( !matched )
-    {
+    if (!matched) {
       int nPunchMatched = 0;
       // Check if this recHit came from non-muon simHit
-      for ( auto simHit : pthrSimHits )
-      {
+      for (auto simHit : pthrSimHits) {
         const int absSimHitPType = abs(simHit->particleType());
-        if ( absSimHitPType == 13 ) continue;
+        if (absSimHitPType == 13)
+          continue;
 
         const RPCDetId simDetId = static_cast<const RPCDetId>(simHit->detUnitId());
-        if ( simDetId == detId ) ++nPunchMatched;
+        if (simDetId == detId)
+          ++nPunchMatched;
       }
 
-      if ( nPunchMatched > 0 )
-      {
-        if ( region == 0 )
-        {
+      if (nPunchMatched > 0) {
+        if (region == 0) {
           h_recPunchOccupancyBarrel_wheel->Fill(ring);
           h_recPunchOccupancyBarrel_station->Fill(station);
           h_recPunchOccupancyBarrel_wheel_station->Fill(ring, station);
-        }
-        else
-        {
-          h_recPunchOccupancyEndcap_disk->Fill(region*station);
-          h_recPunchOccupancyEndcap_disk_ring->Fill(region*station, ring);
+        } else {
+          h_recPunchOccupancyEndcap_disk->Fill(region * station);
+          h_recPunchOccupancyEndcap_disk_ring->Fill(region * station, ring);
         }
       }
     }
   }
 
   // Find noise recHits : RecHits without SimHit match
-  for ( RecHitIter recHitIter = recHitHandle->begin();
-        recHitIter != recHitHandle->end(); ++recHitIter )
-  {
+  for (RecHitIter recHitIter = recHitHandle->begin(); recHitIter != recHitHandle->end(); ++recHitIter) {
     const RPCDetId recDetId = static_cast<const RPCDetId>(recHitIter->rpcId());
-    const RPCRoll* roll = dynamic_cast<const RPCRoll*>(rpcGeom->roll(recDetId));
+    const RPCRoll *roll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(recDetId));
 
     const int region = roll->id().region();
     //    const int ring = roll->id().ring(); // UNUSED VARIABLE
-    //const int sector = roll->id().sector();
+    // const int sector = roll->id().sector();
     //    const int station = roll->id().station(); // UNUSED VARIABLE
-    //const int layer = roll->id().layer();
-    //const int subsector = roll->id().subsector();
+    // const int layer = roll->id().layer();
+    // const int subsector = roll->id().subsector();
 
     const double recX = recHitIter->localPosition().x();
     const double recErrX = sqrt(recHitIter->localPositionError().xx());
 
     bool matched = false;
-    for ( SimHitIter simHitIter = simHitHandle->begin();
-          simHitIter != simHitHandle->end(); ++simHitIter )
-    {
+    for (SimHitIter simHitIter = simHitHandle->begin(); simHitIter != simHitHandle->end(); ++simHitIter) {
       const RPCDetId simDetId = static_cast<const RPCDetId>(simHitIter->detUnitId());
-      const RPCRoll* simRoll = dynamic_cast<const RPCRoll*>(rpcGeom->roll(simDetId));
-      if ( !simRoll ) continue;
+      const RPCRoll *simRoll = dynamic_cast<const RPCRoll *>(rpcGeom->roll(simDetId));
+      if (!simRoll)
+        continue;
 
-      if ( simDetId != recDetId ) continue;
+      if (simDetId != recDetId)
+        continue;
 
       const double simX = simHitIter->localPosition().x();
-      const double dX = fabs(recX-simX);
+      const double dX = fabs(recX - simX);
 
-      if ( dX/recErrX < 5 )
-      {
+      if (dX / recErrX < 5) {
         matched = true;
         break;
       }
     }
 
-    if ( !matched )
-    {
-      if ( region == 0 )
-      {
+    if (!matched) {
+      if (region == 0) {
         h_noiseOccupancyBarrel_detId->Fill(detIdToIndexMapBarrel_[recDetId.rawId()]);
-      }
-      else
-      {
+      } else {
         h_noiseOccupancyEndcap_detId->Fill(detIdToIndexMapEndcap_[recDetId.rawId()]);
       }
     }
   }
 
   h_eventCount->Fill(2);
-
 }
 
 DEFINE_FWK_MODULE(RPCRecHitValid);
-
diff --git a/Validation/RPCRecHits/src/RPCRecHitValidClient.cc b/Validation/RPCRecHits/src/RPCRecHitValidClient.cc
index 882c5dc7fd150..8b7a10bb72486 100644
--- a/Validation/RPCRecHits/src/RPCRecHitValidClient.cc
+++ b/Validation/RPCRecHits/src/RPCRecHitValidClient.cc
@@ -7,101 +7,115 @@
 
 using namespace std;
 
-typedef MonitorElement* MEP;
+typedef MonitorElement *MEP;
 
-RPCRecHitValidClient::RPCRecHitValidClient(const edm::ParameterSet& pset)
-{
+RPCRecHitValidClient::RPCRecHitValidClient(const edm::ParameterSet &pset) {
   subDir_ = pset.getParameter<std::string>("subDir");
 }
 
-void RPCRecHitValidClient::dqmEndJob(DQMStore::IBooker& booker, DQMStore::IGetter& getter)
-{
+void RPCRecHitValidClient::dqmEndJob(DQMStore::IBooker &booker, DQMStore::IGetter &getter) {
   booker.setCurrentFolder(subDir_);
-  MEP me_rollEfficiencyBarrel_eff = booker.book1D("RollEfficiencyBarrel_eff", "Roll efficiency in Barrel;Efficiency [%]", 50+2, -2, 100+2);
-  MEP me_rollEfficiencyEndcap_eff = booker.book1D("RollEfficiencyEndcap_eff", "Roll efficiency in Endcap;Efficiency [%]", 50+2, -2, 100+2);
-  MEP me_rollEfficiencyStatCutOffBarrel_eff = booker.book1D("RollEfficiencyCutOffBarrel_eff", "Roll efficiency in Barrel without low stat chamber;Efficiency [%]", 50+2, -2, 100+2);
-  MEP me_rollEfficiencyStatCutOffEndcap_eff = booker.book1D("RollEfficiencyCutOffEndcap_eff", "Roll efficiency in Endcap without low stat chamber;Efficiency [%]", 50+2, -2, 100+2);
+  MEP me_rollEfficiencyBarrel_eff =
+      booker.book1D("RollEfficiencyBarrel_eff", "Roll efficiency in Barrel;Efficiency [%]", 50 + 2, -2, 100 + 2);
+  MEP me_rollEfficiencyEndcap_eff =
+      booker.book1D("RollEfficiencyEndcap_eff", "Roll efficiency in Endcap;Efficiency [%]", 50 + 2, -2, 100 + 2);
+  MEP me_rollEfficiencyStatCutOffBarrel_eff =
+      booker.book1D("RollEfficiencyCutOffBarrel_eff",
+                    "Roll efficiency in Barrel without low stat chamber;Efficiency [%]",
+                    50 + 2,
+                    -2,
+                    100 + 2);
+  MEP me_rollEfficiencyStatCutOffEndcap_eff =
+      booker.book1D("RollEfficiencyCutOffEndcap_eff",
+                    "Roll efficiency in Endcap without low stat chamber;Efficiency [%]",
+                    50 + 2,
+                    -2,
+                    100 + 2);
 
   const double maxNoise = 1e-7;
-  MEP me_rollNoiseBarrel_noise = booker.book1D("RollNoiseBarrel_noise", "Roll noise in Barrel;Noise level [Event^{-1}cm^{-2}]", 25+2, -maxNoise/25, maxNoise+maxNoise/25);
-  MEP me_rollNoiseEndcap_noise = booker.book1D("RollNoiseEndcap_noise", "Roll noise in Endcap;Noise level [Event^{-1}cm^{-2}]", 25+2, -maxNoise/25, maxNoise+maxNoise/25);
-
-  MEP me_matchOccupancyBarrel_detId = getter.get(subDir_+"/Occupancy/MatchOccupancyBarrel_detId");
-  MEP me_matchOccupancyEndcap_detId = getter.get(subDir_+"/Occupancy/MatchOccupancyEndcap_detId");
-  MEP me_refOccupancyBarrel_detId = getter.get(subDir_+"/Occupancy/RefOccupancyBarrel_detId");
-  MEP me_refOccupancyEndcap_detId = getter.get(subDir_+"/Occupancy/RefOccupancyEndcap_detId");
-
-  if ( me_matchOccupancyBarrel_detId and me_refOccupancyBarrel_detId )
-  {
-    TH1* h_matchOccupancyBarrel_detId = me_matchOccupancyBarrel_detId->getTH1();
-    TH1* h_refOccupancyBarrel_detId = me_refOccupancyBarrel_detId->getTH1();
-
-    for ( int bin = 1, nBin = h_matchOccupancyBarrel_detId->GetNbinsX(); bin <= nBin; ++bin )
-    {
+  MEP me_rollNoiseBarrel_noise = booker.book1D("RollNoiseBarrel_noise",
+                                               "Roll noise in Barrel;Noise level [Event^{-1}cm^{-2}]",
+                                               25 + 2,
+                                               -maxNoise / 25,
+                                               maxNoise + maxNoise / 25);
+  MEP me_rollNoiseEndcap_noise = booker.book1D("RollNoiseEndcap_noise",
+                                               "Roll noise in Endcap;Noise level [Event^{-1}cm^{-2}]",
+                                               25 + 2,
+                                               -maxNoise / 25,
+                                               maxNoise + maxNoise / 25);
+
+  MEP me_matchOccupancyBarrel_detId = getter.get(subDir_ + "/Occupancy/MatchOccupancyBarrel_detId");
+  MEP me_matchOccupancyEndcap_detId = getter.get(subDir_ + "/Occupancy/MatchOccupancyEndcap_detId");
+  MEP me_refOccupancyBarrel_detId = getter.get(subDir_ + "/Occupancy/RefOccupancyBarrel_detId");
+  MEP me_refOccupancyEndcap_detId = getter.get(subDir_ + "/Occupancy/RefOccupancyEndcap_detId");
+
+  if (me_matchOccupancyBarrel_detId and me_refOccupancyBarrel_detId) {
+    TH1 *h_matchOccupancyBarrel_detId = me_matchOccupancyBarrel_detId->getTH1();
+    TH1 *h_refOccupancyBarrel_detId = me_refOccupancyBarrel_detId->getTH1();
+
+    for (int bin = 1, nBin = h_matchOccupancyBarrel_detId->GetNbinsX(); bin <= nBin; ++bin) {
       const double nRec = h_matchOccupancyBarrel_detId->GetBinContent(bin);
       const double nRef = h_refOccupancyBarrel_detId->GetBinContent(bin);
 
-      const double eff = nRef ? nRec/nRef*100 : -1;
+      const double eff = nRef ? nRec / nRef * 100 : -1;
 
       me_rollEfficiencyBarrel_eff->Fill(eff);
-      if ( nRef >= 20 ) me_rollEfficiencyStatCutOffBarrel_eff->Fill(eff);
+      if (nRef >= 20)
+        me_rollEfficiencyStatCutOffBarrel_eff->Fill(eff);
     }
   }
 
-  if ( me_matchOccupancyEndcap_detId and me_refOccupancyEndcap_detId )
-  {
-    TH1* h_matchOccupancyEndcap_detId = me_matchOccupancyEndcap_detId->getTH1();
-    TH1* h_refOccupancyEndcap_detId = me_refOccupancyEndcap_detId->getTH1();
+  if (me_matchOccupancyEndcap_detId and me_refOccupancyEndcap_detId) {
+    TH1 *h_matchOccupancyEndcap_detId = me_matchOccupancyEndcap_detId->getTH1();
+    TH1 *h_refOccupancyEndcap_detId = me_refOccupancyEndcap_detId->getTH1();
 
-    for ( int bin = 1, nBin = h_matchOccupancyEndcap_detId->GetNbinsX(); bin <= nBin; ++bin )
-    {
+    for (int bin = 1, nBin = h_matchOccupancyEndcap_detId->GetNbinsX(); bin <= nBin; ++bin) {
       const double nRec = h_matchOccupancyEndcap_detId->GetBinContent(bin);
       const double nRef = h_refOccupancyEndcap_detId->GetBinContent(bin);
 
-      const double eff = nRef ? nRec/nRef*100 : -1;
+      const double eff = nRef ? nRec / nRef * 100 : -1;
 
       me_rollEfficiencyEndcap_eff->Fill(eff);
-      if ( nRef >= 20 ) me_rollEfficiencyStatCutOffEndcap_eff->Fill(eff);
+      if (nRef >= 20)
+        me_rollEfficiencyStatCutOffEndcap_eff->Fill(eff);
     }
   }
 
-  MEP me_eventCount = getter.get(subDir_+"/Occupancy/EventCount");
+  MEP me_eventCount = getter.get(subDir_ + "/Occupancy/EventCount");
   const double nEvent = me_eventCount ? me_eventCount->getTH1()->GetBinContent(1) : 1;
-  MEP me_noiseOccupancyBarrel_detId = getter.get(subDir_+"/Occupancy/NoiseOccupancyBarrel_detId");
-  MEP me_rollAreaBarrel_detId = getter.get(subDir_+"/Occupancy/RollAreaBarrel_detId");
-  if ( me_noiseOccupancyBarrel_detId and me_rollAreaBarrel_detId )
-  {
-    TH1* h_noiseOccupancyBarrel_detId = me_noiseOccupancyBarrel_detId->getTH1();
-    TH1* h_rollAreaBarrel_detId = me_rollAreaBarrel_detId->getTH1();
-
-    for ( int bin = 1, nBin = h_noiseOccupancyBarrel_detId->GetNbinsX(); bin <= nBin; ++bin )
-    {
+  MEP me_noiseOccupancyBarrel_detId = getter.get(subDir_ + "/Occupancy/NoiseOccupancyBarrel_detId");
+  MEP me_rollAreaBarrel_detId = getter.get(subDir_ + "/Occupancy/RollAreaBarrel_detId");
+  if (me_noiseOccupancyBarrel_detId and me_rollAreaBarrel_detId) {
+    TH1 *h_noiseOccupancyBarrel_detId = me_noiseOccupancyBarrel_detId->getTH1();
+    TH1 *h_rollAreaBarrel_detId = me_rollAreaBarrel_detId->getTH1();
+
+    for (int bin = 1, nBin = h_noiseOccupancyBarrel_detId->GetNbinsX(); bin <= nBin; ++bin) {
       const double noiseCount = h_noiseOccupancyBarrel_detId->GetBinContent(bin);
       const double area = h_rollAreaBarrel_detId->GetBinContent(bin);
-      const double noiseLevel = area > 0 ? noiseCount/area/nEvent : 0;
-      if ( noiseLevel == 0. ) me_rollNoiseBarrel_noise->Fill(-maxNoise/50); // Fill underflow bin if noise is exactly zero
-      else me_rollNoiseBarrel_noise->Fill(std::min(noiseLevel, maxNoise));
+      const double noiseLevel = area > 0 ? noiseCount / area / nEvent : 0;
+      if (noiseLevel == 0.)
+        me_rollNoiseBarrel_noise->Fill(-maxNoise / 50);  // Fill underflow bin if noise is exactly zero
+      else
+        me_rollNoiseBarrel_noise->Fill(std::min(noiseLevel, maxNoise));
     }
   }
 
-  MEP me_noiseOccupancyEndcap_detId = getter.get(subDir_+"/Occupancy/NoiseOccupancyEndcap_detId");
-  MEP me_rollAreaEndcap_detId = getter.get(subDir_+"/Occupancy/RollAreaEndcap_detId");
-  if ( me_noiseOccupancyEndcap_detId and me_rollAreaEndcap_detId )
-  {
-    TH1* h_noiseOccupancyEndcap_detId = me_noiseOccupancyEndcap_detId->getTH1();
-    TH1* h_rollAreaEndcap_detId = me_rollAreaEndcap_detId->getTH1();
+  MEP me_noiseOccupancyEndcap_detId = getter.get(subDir_ + "/Occupancy/NoiseOccupancyEndcap_detId");
+  MEP me_rollAreaEndcap_detId = getter.get(subDir_ + "/Occupancy/RollAreaEndcap_detId");
+  if (me_noiseOccupancyEndcap_detId and me_rollAreaEndcap_detId) {
+    TH1 *h_noiseOccupancyEndcap_detId = me_noiseOccupancyEndcap_detId->getTH1();
+    TH1 *h_rollAreaEndcap_detId = me_rollAreaEndcap_detId->getTH1();
 
-    for ( int bin = 1, nBin = h_noiseOccupancyEndcap_detId->GetNbinsX(); bin <= nBin; ++bin )
-    {
+    for (int bin = 1, nBin = h_noiseOccupancyEndcap_detId->GetNbinsX(); bin <= nBin; ++bin) {
       const double noiseCount = h_noiseOccupancyEndcap_detId->GetBinContent(bin);
       const double area = h_rollAreaEndcap_detId->GetBinContent(bin);
-      const double noiseLevel = area > 0 ? noiseCount/area/nEvent : 0;
-      if ( noiseLevel == 0 ) me_rollNoiseEndcap_noise->Fill(-maxNoise/50); // Fill underflow bin if noise if exactly zero
-      else me_rollNoiseEndcap_noise->Fill(std::min(noiseLevel, maxNoise));
+      const double noiseLevel = area > 0 ? noiseCount / area / nEvent : 0;
+      if (noiseLevel == 0)
+        me_rollNoiseEndcap_noise->Fill(-maxNoise / 50);  // Fill underflow bin if noise if exactly zero
+      else
+        me_rollNoiseEndcap_noise->Fill(std::min(noiseLevel, maxNoise));
     }
   }
-
 }
 
 DEFINE_FWK_MODULE(RPCRecHitValidClient);
-
diff --git a/Validation/RPCRecHits/src/RPCValidHistograms.cc b/Validation/RPCRecHits/src/RPCValidHistograms.cc
index e6889f3b92f83..a9110e0572026 100644
--- a/Validation/RPCRecHits/src/RPCValidHistograms.cc
+++ b/Validation/RPCRecHits/src/RPCValidHistograms.cc
@@ -2,10 +2,8 @@
 
 #include "TAxis.h"
 
-void RPCValidHistograms::bookHistograms(DQMStore::IBooker& booker, const std::string& subDir)
-{
-  if ( booked_ )
-  {
+void RPCValidHistograms::bookHistograms(DQMStore::IBooker &booker, const std::string &subDir) {
+  if (booked_) {
     edm::LogError("RPCValidHistograms") << "Histogram is already booked\n";
     return;
   }
@@ -14,23 +12,31 @@ void RPCValidHistograms::bookHistograms(DQMStore::IBooker& booker, const std::st
   booker.setCurrentFolder(subDir);
 
   // Book histograms
-  booker.setCurrentFolder(subDir+"/HitProperty");
+  booker.setCurrentFolder(subDir + "/HitProperty");
   clusterSize = booker.book1D("ClusterSize", "Cluster size;Cluster size", 11, -0.5, 10.5);
   clusterSizeBarrel = booker.book1D("ClusterSizeBarrel", "Cluster size in Barrel;Cluster size", 11, -0.5, 10.5);
   clusterSizeEndcap = booker.book1D("ClusterSizeEndcap", "Cluster size in Endcap;Cluster size", 11, -0.5, 10.5);
 
   avgClusterSize = booker.book1D("AverageClusterSize", "Average cluster size;Average clsuter size", 11, -0.5, 10.5);
-  avgClusterSizeBarrel = booker.book1D("AverageClusterSizeBarrel", "Average cluster size in Barrel;Average clsuter size", 11, -0.5, 10.5);
-  avgClusterSizeEndcap = booker.book1D("AverageClusterSizeEndcap", "Average cluster size in Endcap;Average clsuter size", 11, -0.5, 10.5);
-
-  nRecHitBarrel = booker.book1D("NRecHitBarrel", "Number of RPC recHits per event in Barrel;Number of RPC hits", 25, 0, 25);
-  nRecHitEndcap = booker.book1D("NRecHitEndcap", "Number of RPC recHits per event in Endcap;Number of RPC hits", 25, 0, 25);
-
-  nRefHitBarrel = booker.book1D("NRefHitBarrel", "Number of reference hits per event in Barrel;Number of RPC hits", 25, 0, 25);
-  nRefHitEndcap = booker.book1D("NRefHitEndcap", "Number of reference hits per event in Endcap;Number of RPC hits", 25, 0, 25);
-
-  nMatchHitBarrel = booker.book1D("nMatchBarrel", "Number of matched reference hits per event in Barrel;Number of RPC hits", 25, 0, 25);
-  nMatchHitEndcap = booker.book1D("nMatchEndcap", "Number of matched reference hits per event in Endcap;Number of RPC hits", 25, 0, 25);
+  avgClusterSizeBarrel =
+      booker.book1D("AverageClusterSizeBarrel", "Average cluster size in Barrel;Average clsuter size", 11, -0.5, 10.5);
+  avgClusterSizeEndcap =
+      booker.book1D("AverageClusterSizeEndcap", "Average cluster size in Endcap;Average clsuter size", 11, -0.5, 10.5);
+
+  nRecHitBarrel =
+      booker.book1D("NRecHitBarrel", "Number of RPC recHits per event in Barrel;Number of RPC hits", 25, 0, 25);
+  nRecHitEndcap =
+      booker.book1D("NRecHitEndcap", "Number of RPC recHits per event in Endcap;Number of RPC hits", 25, 0, 25);
+
+  nRefHitBarrel =
+      booker.book1D("NRefHitBarrel", "Number of reference hits per event in Barrel;Number of RPC hits", 25, 0, 25);
+  nRefHitEndcap =
+      booker.book1D("NRefHitEndcap", "Number of reference hits per event in Endcap;Number of RPC hits", 25, 0, 25);
+
+  nMatchHitBarrel = booker.book1D(
+      "nMatchBarrel", "Number of matched reference hits per event in Barrel;Number of RPC hits", 25, 0, 25);
+  nMatchHitEndcap = booker.book1D(
+      "nMatchEndcap", "Number of matched reference hits per event in Endcap;Number of RPC hits", 25, 0, 25);
 
   timeBarrel = booker.book1D("RecHitTimeBarrel", "RecHit time in Barrel;Time (ns)", 100, -12.5, 12.5);
   timeEndcap = booker.book1D("RecHitTimeEndcap", "RecHit time in Endcap;Time (ns)", 100, -12.5, 12.5);
@@ -40,82 +46,89 @@ void RPCValidHistograms::bookHistograms(DQMStore::IBooker& booker, const std::st
   clusterSize->getTH1()->SetMinimum(0);
   clusterSizeBarrel->getTH1()->SetMinimum(0);
   clusterSizeEndcap->getTH1()->SetMinimum(0);
-                      
+
   avgClusterSize->getTH1()->SetMinimum(0);
   avgClusterSizeBarrel->getTH1()->SetMinimum(0);
   avgClusterSizeEndcap->getTH1()->SetMinimum(0);
-                      
+
   nRecHitBarrel->getTH1()->SetMinimum(0);
   nRecHitEndcap->getTH1()->SetMinimum(0);
-               
+
   nRefHitBarrel->getTH1()->SetMinimum(0);
   nRefHitEndcap->getTH1()->SetMinimum(0);
-                      
+
   nMatchHitBarrel->getTH1()->SetMinimum(0);
   nMatchHitEndcap->getTH1()->SetMinimum(0);
 
   // Occupancy 1D
-  booker.setCurrentFolder(subDir+"/Occupancy");
-  refHitOccupancyBarrel_wheel   = booker.book1D("RefHitOccupancyBarrel_wheel"  , "Reference Hit occupancy", 5, -2.5, 2.5);
-  refHitOccupancyEndcap_disk    = booker.book1D("RefHitOccupancyEndcap_disk"   , "Reference Hit occupancy", 9, -4.5, 4.5);
-  refHitOccupancyBarrel_station = booker.book1D("RefHitOccupancyBarrel_station", "Reference Hit occupancy", 4,  0.5, 4.5);
-
-  recHitOccupancyBarrel_wheel   = booker.book1D("RecHitOccupancyBarrel_wheel"  , "RecHit occupancy", 5, -2.5, 2.5);
-  recHitOccupancyEndcap_disk    = booker.book1D("RecHitOccupancyEndcap_disk"   , "RecHit occupancy", 9, -4.5, 4.5);
-  recHitOccupancyBarrel_station = booker.book1D("RecHitOccupancyBarrel_station", "RecHit occupancy", 4,  0.5, 4.5);
-
-  matchOccupancyBarrel_wheel   = booker.book1D("MatchOccupancyBarrel_wheel"  , "Matched hit occupancy", 5, -2.5, 2.5);
-  matchOccupancyEndcap_disk    = booker.book1D("MatchOccupancyEndcap_disk"   , "Matched hit occupancy", 9, -4.5, 4.5);
-  matchOccupancyBarrel_station = booker.book1D("MatchOccupancyBarrel_station", "Matched hit occupancy", 4,  0.5, 4.5);
-
-  refHitOccupancyBarrel_wheel  ->getTH1()->SetMinimum(0);
-  refHitOccupancyEndcap_disk   ->getTH1()->SetMinimum(0);
+  booker.setCurrentFolder(subDir + "/Occupancy");
+  refHitOccupancyBarrel_wheel = booker.book1D("RefHitOccupancyBarrel_wheel", "Reference Hit occupancy", 5, -2.5, 2.5);
+  refHitOccupancyEndcap_disk = booker.book1D("RefHitOccupancyEndcap_disk", "Reference Hit occupancy", 9, -4.5, 4.5);
+  refHitOccupancyBarrel_station =
+      booker.book1D("RefHitOccupancyBarrel_station", "Reference Hit occupancy", 4, 0.5, 4.5);
+
+  recHitOccupancyBarrel_wheel = booker.book1D("RecHitOccupancyBarrel_wheel", "RecHit occupancy", 5, -2.5, 2.5);
+  recHitOccupancyEndcap_disk = booker.book1D("RecHitOccupancyEndcap_disk", "RecHit occupancy", 9, -4.5, 4.5);
+  recHitOccupancyBarrel_station = booker.book1D("RecHitOccupancyBarrel_station", "RecHit occupancy", 4, 0.5, 4.5);
+
+  matchOccupancyBarrel_wheel = booker.book1D("MatchOccupancyBarrel_wheel", "Matched hit occupancy", 5, -2.5, 2.5);
+  matchOccupancyEndcap_disk = booker.book1D("MatchOccupancyEndcap_disk", "Matched hit occupancy", 9, -4.5, 4.5);
+  matchOccupancyBarrel_station = booker.book1D("MatchOccupancyBarrel_station", "Matched hit occupancy", 4, 0.5, 4.5);
+
+  refHitOccupancyBarrel_wheel->getTH1()->SetMinimum(0);
+  refHitOccupancyEndcap_disk->getTH1()->SetMinimum(0);
   refHitOccupancyBarrel_station->getTH1()->SetMinimum(0);
-                               
-  recHitOccupancyBarrel_wheel  ->getTH1()->SetMinimum(0);
-  recHitOccupancyEndcap_disk   ->getTH1()->SetMinimum(0);
+
+  recHitOccupancyBarrel_wheel->getTH1()->SetMinimum(0);
+  recHitOccupancyEndcap_disk->getTH1()->SetMinimum(0);
   recHitOccupancyBarrel_station->getTH1()->SetMinimum(0);
-                               
-  matchOccupancyBarrel_wheel  ->getTH1()->SetMinimum(0);
-  matchOccupancyEndcap_disk   ->getTH1()->SetMinimum(0);
+
+  matchOccupancyBarrel_wheel->getTH1()->SetMinimum(0);
+  matchOccupancyEndcap_disk->getTH1()->SetMinimum(0);
   matchOccupancyBarrel_station->getTH1()->SetMinimum(0);
-                               
+
   // Occupancy 2D
-  refHitOccupancyBarrel_wheel_station = booker.book2D("RefHitOccupancyBarrel_wheel_station", "Reference hit occupancy", 5, -2.5, 2.5, 4, 0.5, 4.5);
-  refHitOccupancyEndcap_disk_ring     = booker.book2D("RefHitOccupancyEndcap_disk_ring"    , "Reference hit occupancy", 9, -4.5, 4.5, 4, 0.5, 4.5);
+  refHitOccupancyBarrel_wheel_station =
+      booker.book2D("RefHitOccupancyBarrel_wheel_station", "Reference hit occupancy", 5, -2.5, 2.5, 4, 0.5, 4.5);
+  refHitOccupancyEndcap_disk_ring =
+      booker.book2D("RefHitOccupancyEndcap_disk_ring", "Reference hit occupancy", 9, -4.5, 4.5, 4, 0.5, 4.5);
 
-  recHitOccupancyBarrel_wheel_station = booker.book2D("RecHitOccupancyBarrel_wheel_station", "RecHit occupancy", 5, -2.5, 2.5, 4, 0.5, 4.5);
-  recHitOccupancyEndcap_disk_ring     = booker.book2D("RecHitOccupancyEndcap_disk_ring"    , "RecHit occupancy", 9, -4.5, 4.5, 4, 0.5, 4.5);
+  recHitOccupancyBarrel_wheel_station =
+      booker.book2D("RecHitOccupancyBarrel_wheel_station", "RecHit occupancy", 5, -2.5, 2.5, 4, 0.5, 4.5);
+  recHitOccupancyEndcap_disk_ring =
+      booker.book2D("RecHitOccupancyEndcap_disk_ring", "RecHit occupancy", 9, -4.5, 4.5, 4, 0.5, 4.5);
 
-  matchOccupancyBarrel_wheel_station = booker.book2D("MatchOccupancyBarrel_wheel_station", "Matched hit occupancy", 5, -2.5, 2.5, 4, 0.5, 4.5);
-  matchOccupancyEndcap_disk_ring     = booker.book2D("MatchOccupancyEndcap_disk_ring"    , "Matched hit occupancy", 9, -4.5, 4.5, 4, 0.5, 4.5);
+  matchOccupancyBarrel_wheel_station =
+      booker.book2D("MatchOccupancyBarrel_wheel_station", "Matched hit occupancy", 5, -2.5, 2.5, 4, 0.5, 4.5);
+  matchOccupancyEndcap_disk_ring =
+      booker.book2D("MatchOccupancyEndcap_disk_ring", "Matched hit occupancy", 9, -4.5, 4.5, 4, 0.5, 4.5);
 
   refHitOccupancyBarrel_wheel_station->getTH2F()->SetMinimum(0);
-  refHitOccupancyEndcap_disk_ring    ->getTH2F()->SetMinimum(0);
+  refHitOccupancyEndcap_disk_ring->getTH2F()->SetMinimum(0);
 
   recHitOccupancyBarrel_wheel_station->getTH2F()->SetMinimum(0);
-  recHitOccupancyEndcap_disk_ring    ->getTH2F()->SetMinimum(0);
+  recHitOccupancyEndcap_disk_ring->getTH2F()->SetMinimum(0);
 
   matchOccupancyBarrel_wheel_station->getTH2F()->SetMinimum(0);
-  matchOccupancyEndcap_disk_ring    ->getTH2F()->SetMinimum(0);
+  matchOccupancyEndcap_disk_ring->getTH2F()->SetMinimum(0);
 
   // Residuals
-  booker.setCurrentFolder(subDir+"/Residual");
-  resBarrel = booker.book1D("ResBarrel", "Global Residuals for Barrel;Residual [cm]"  , 100, -8, 8);
-  resEndcap = booker.book1D("ResEndcap", "Global Residuals for Endcap;Residual [cm]"   , 100, -8, 8);
+  booker.setCurrentFolder(subDir + "/Residual");
+  resBarrel = booker.book1D("ResBarrel", "Global Residuals for Barrel;Residual [cm]", 100, -8, 8);
+  resEndcap = booker.book1D("ResEndcap", "Global Residuals for Endcap;Residual [cm]", 100, -8, 8);
 
   resBarrel->getTH1()->SetMinimum(0);
   resEndcap->getTH1()->SetMinimum(0);
 
-  res_wheel_res   = booker.book2D("Res_wheel_res"  , "Residuals vs Wheel;;Residual [cm]", 5, -2.5, 2.5, 50, -8, 8);
-  res_disk_res    = booker.book2D("Res_disk_res"   , "Residuals vs Disk;;Residual [cm]", 9, -4.5, 4.5, 50, -8, 8);
+  res_wheel_res = booker.book2D("Res_wheel_res", "Residuals vs Wheel;;Residual [cm]", 5, -2.5, 2.5, 50, -8, 8);
+  res_disk_res = booker.book2D("Res_disk_res", "Residuals vs Disk;;Residual [cm]", 9, -4.5, 4.5, 50, -8, 8);
   res_station_res = booker.book2D("Res_station_res", "Redisuals vs Station;;Residual [cm]", 4, 0.5, 4.5, 50, -8, 8);
-  res_ring_res    = booker.book2D("Res_ring_res"   , "Redisuals vs Ring;;Residual [cm]", 4, 0.5, 4.5, 50, -8, 8);
+  res_ring_res = booker.book2D("Res_ring_res", "Redisuals vs Ring;;Residual [cm]", 4, 0.5, 4.5, 50, -8, 8);
 
-  res_wheel_res  ->getTH2F()->SetMinimum(0);
-  res_disk_res   ->getTH2F()->SetMinimum(0);
+  res_wheel_res->getTH2F()->SetMinimum(0);
+  res_disk_res->getTH2F()->SetMinimum(0);
   res_station_res->getTH2F()->SetMinimum(0);
-  res_ring_res   ->getTH2F()->SetMinimum(0);
+  res_ring_res->getTH2F()->SetMinimum(0);
 
   // Pulls
   pullBarrel = booker.book1D("PullBarrel", "Global Pull for Barrel;Pull", 100, -3, 3);
@@ -124,128 +137,123 @@ void RPCValidHistograms::bookHistograms(DQMStore::IBooker& booker, const std::st
   pullBarrel->getTH1()->SetMinimum(0);
   pullEndcap->getTH1()->SetMinimum(0);
 
-  pull_wheel_pull   = booker.book2D("Pull_wheel_pull"  , "Pull vs Wheel;;Pull"  , 5, -2.5, 2.5, 50, -3, 3);
-  pull_disk_pull    = booker.book2D("Pull_disk_pull"   , "Pull vs Disk;;Pull"   , 9, -4.5, 4.5, 50, -3, 3);
-  pull_station_pull = booker.book2D("Pull_station_pull", "Pull vs Station;;Pull", 4,  0.5, 4.5, 50, -3, 3);
-  pull_ring_pull    = booker.book2D("Pull_ring_pull"   , "Pull vs Ring;;Pull"   , 4,  0.5, 4.5, 50, -3, 3);
+  pull_wheel_pull = booker.book2D("Pull_wheel_pull", "Pull vs Wheel;;Pull", 5, -2.5, 2.5, 50, -3, 3);
+  pull_disk_pull = booker.book2D("Pull_disk_pull", "Pull vs Disk;;Pull", 9, -4.5, 4.5, 50, -3, 3);
+  pull_station_pull = booker.book2D("Pull_station_pull", "Pull vs Station;;Pull", 4, 0.5, 4.5, 50, -3, 3);
+  pull_ring_pull = booker.book2D("Pull_ring_pull", "Pull vs Ring;;Pull", 4, 0.5, 4.5, 50, -3, 3);
 
-  pull_wheel_pull  ->getTH2F()->SetMinimum(0);
-  pull_disk_pull   ->getTH2F()->SetMinimum(0);
+  pull_wheel_pull->getTH2F()->SetMinimum(0);
+  pull_disk_pull->getTH2F()->SetMinimum(0);
   pull_station_pull->getTH2F()->SetMinimum(0);
-  pull_ring_pull   ->getTH2F()->SetMinimum(0);
+  pull_ring_pull->getTH2F()->SetMinimum(0);
 
   // Set plot options
   refHitOccupancyBarrel_wheel_station->getTH2F()->SetOption("COLZ");
-  refHitOccupancyEndcap_disk_ring    ->getTH2F()->SetOption("COLZ");
+  refHitOccupancyEndcap_disk_ring->getTH2F()->SetOption("COLZ");
   recHitOccupancyBarrel_wheel_station->getTH2F()->SetOption("COLZ");
-  recHitOccupancyEndcap_disk_ring    ->getTH2F()->SetOption("COLZ");
-  matchOccupancyBarrel_wheel_station ->getTH2F()->SetOption("COLZ");
-  matchOccupancyEndcap_disk_ring     ->getTH2F()->SetOption("COLZ");
+  recHitOccupancyEndcap_disk_ring->getTH2F()->SetOption("COLZ");
+  matchOccupancyBarrel_wheel_station->getTH2F()->SetOption("COLZ");
+  matchOccupancyEndcap_disk_ring->getTH2F()->SetOption("COLZ");
 
-  res_wheel_res  ->getTH2F()->SetOption("COLZ");
-  res_disk_res   ->getTH2F()->SetOption("COLZ");
+  res_wheel_res->getTH2F()->SetOption("COLZ");
+  res_disk_res->getTH2F()->SetOption("COLZ");
   res_station_res->getTH2F()->SetOption("COLZ");
-  res_ring_res   ->getTH2F()->SetOption("COLZ");
+  res_ring_res->getTH2F()->SetOption("COLZ");
 
-  pull_wheel_pull  ->getTH2F()->SetOption("COLZ");
-  pull_disk_pull   ->getTH2F()->SetOption("COLZ");
+  pull_wheel_pull->getTH2F()->SetOption("COLZ");
+  pull_disk_pull->getTH2F()->SetOption("COLZ");
   pull_station_pull->getTH2F()->SetOption("COLZ");
-  pull_ring_pull   ->getTH2F()->SetOption("COLZ");
+  pull_ring_pull->getTH2F()->SetOption("COLZ");
 
   refHitOccupancyBarrel_wheel_station->getTH2F()->SetContour(10);
-  refHitOccupancyEndcap_disk_ring    ->getTH2F()->SetContour(10);
+  refHitOccupancyEndcap_disk_ring->getTH2F()->SetContour(10);
   recHitOccupancyBarrel_wheel_station->getTH2F()->SetContour(10);
-  recHitOccupancyEndcap_disk_ring    ->getTH2F()->SetContour(10);
-  matchOccupancyBarrel_wheel_station ->getTH2F()->SetContour(10);
-  matchOccupancyEndcap_disk_ring     ->getTH2F()->SetContour(10);
+  recHitOccupancyEndcap_disk_ring->getTH2F()->SetContour(10);
+  matchOccupancyBarrel_wheel_station->getTH2F()->SetContour(10);
+  matchOccupancyEndcap_disk_ring->getTH2F()->SetContour(10);
 
-  res_wheel_res  ->getTH2F()->SetContour(10);
-  res_disk_res   ->getTH2F()->SetContour(10);
+  res_wheel_res->getTH2F()->SetContour(10);
+  res_disk_res->getTH2F()->SetContour(10);
   res_station_res->getTH2F()->SetContour(10);
-  res_ring_res   ->getTH2F()->SetContour(10);
+  res_ring_res->getTH2F()->SetContour(10);
 
-  pull_wheel_pull  ->getTH2F()->SetContour(10);
-  pull_disk_pull   ->getTH2F()->SetContour(10);
+  pull_wheel_pull->getTH2F()->SetContour(10);
+  pull_disk_pull->getTH2F()->SetContour(10);
   pull_station_pull->getTH2F()->SetContour(10);
-  pull_ring_pull   ->getTH2F()->SetContour(10);
- 
+  pull_ring_pull->getTH2F()->SetContour(10);
+
   refHitOccupancyBarrel_wheel_station->getTH2F()->SetStats(false);
-  refHitOccupancyEndcap_disk_ring    ->getTH2F()->SetStats(false);
+  refHitOccupancyEndcap_disk_ring->getTH2F()->SetStats(false);
   recHitOccupancyBarrel_wheel_station->getTH2F()->SetStats(false);
-  recHitOccupancyEndcap_disk_ring    ->getTH2F()->SetStats(false);
-  matchOccupancyBarrel_wheel_station ->getTH2F()->SetStats(false);
-  matchOccupancyEndcap_disk_ring     ->getTH2F()->SetStats(false);
+  recHitOccupancyEndcap_disk_ring->getTH2F()->SetStats(false);
+  matchOccupancyBarrel_wheel_station->getTH2F()->SetStats(false);
+  matchOccupancyEndcap_disk_ring->getTH2F()->SetStats(false);
 
-  res_wheel_res  ->getTH2F()->SetStats(false);
-  res_disk_res   ->getTH2F()->SetStats(false);
+  res_wheel_res->getTH2F()->SetStats(false);
+  res_disk_res->getTH2F()->SetStats(false);
   res_station_res->getTH2F()->SetStats(false);
-  res_ring_res   ->getTH2F()->SetStats(false);
+  res_ring_res->getTH2F()->SetStats(false);
 
-  pull_wheel_pull  ->getTH2F()->SetStats(false);
-  pull_disk_pull   ->getTH2F()->SetStats(false);
+  pull_wheel_pull->getTH2F()->SetStats(false);
+  pull_disk_pull->getTH2F()->SetStats(false);
   pull_station_pull->getTH2F()->SetStats(false);
-  pull_ring_pull   ->getTH2F()->SetStats(false);
- 
+  pull_ring_pull->getTH2F()->SetStats(false);
+
   // Set bin labels
-  for ( int i=1; i<=5; ++i )
-  {
-    TString binLabel = Form("Wheel %d", i-3);
+  for (int i = 1; i <= 5; ++i) {
+    TString binLabel = Form("Wheel %d", i - 3);
 
     refHitOccupancyBarrel_wheel->getTH1F()->GetXaxis()->SetBinLabel(i, binLabel);
     recHitOccupancyBarrel_wheel->getTH1F()->GetXaxis()->SetBinLabel(i, binLabel);
-    matchOccupancyBarrel_wheel ->getTH1F()->GetXaxis()->SetBinLabel(i, binLabel);
+    matchOccupancyBarrel_wheel->getTH1F()->GetXaxis()->SetBinLabel(i, binLabel);
 
     refHitOccupancyBarrel_wheel_station->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
     recHitOccupancyBarrel_wheel_station->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
-    matchOccupancyBarrel_wheel_station ->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
+    matchOccupancyBarrel_wheel_station->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
 
-    res_wheel_res  ->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
+    res_wheel_res->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
     pull_wheel_pull->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
   }
 
-  for ( int i=1; i<=9; ++i )
-  {
-    TString binLabel = Form("Disk %d", i-5);
+  for (int i = 1; i <= 9; ++i) {
+    TString binLabel = Form("Disk %d", i - 5);
 
     refHitOccupancyEndcap_disk->getTH1F()->GetXaxis()->SetBinLabel(i, binLabel);
     recHitOccupancyEndcap_disk->getTH1F()->GetXaxis()->SetBinLabel(i, binLabel);
-    matchOccupancyEndcap_disk ->getTH1F()->GetXaxis()->SetBinLabel(i, binLabel);
+    matchOccupancyEndcap_disk->getTH1F()->GetXaxis()->SetBinLabel(i, binLabel);
 
     refHitOccupancyEndcap_disk_ring->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
     recHitOccupancyEndcap_disk_ring->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
-    matchOccupancyEndcap_disk_ring ->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
+    matchOccupancyEndcap_disk_ring->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
 
-    res_disk_res  ->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
+    res_disk_res->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
     pull_disk_pull->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
   }
 
-  for ( int i=1; i<=4; ++i )
-  {
+  for (int i = 1; i <= 4; ++i) {
     TString binLabel = Form("Station %d", i);
 
     refHitOccupancyBarrel_station->getTH1F()->GetXaxis()->SetBinLabel(i, binLabel);
     recHitOccupancyBarrel_station->getTH1F()->GetXaxis()->SetBinLabel(i, binLabel);
-    matchOccupancyBarrel_station ->getTH1F()->GetXaxis()->SetBinLabel(i, binLabel);
+    matchOccupancyBarrel_station->getTH1F()->GetXaxis()->SetBinLabel(i, binLabel);
 
     refHitOccupancyBarrel_wheel_station->getTH2F()->GetYaxis()->SetBinLabel(i, binLabel);
     recHitOccupancyBarrel_wheel_station->getTH2F()->GetYaxis()->SetBinLabel(i, binLabel);
-    matchOccupancyBarrel_wheel_station ->getTH2F()->GetYaxis()->SetBinLabel(i, binLabel);
+    matchOccupancyBarrel_wheel_station->getTH2F()->GetYaxis()->SetBinLabel(i, binLabel);
 
-    res_station_res  ->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
+    res_station_res->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
     pull_station_pull->getTH2F()->GetXaxis()->SetBinLabel(i, binLabel);
   }
 
-  for ( int i=1; i<=4; ++i )
-  {
+  for (int i = 1; i <= 4; ++i) {
     TString binLabel = Form("Ring %d", i);
 
     refHitOccupancyEndcap_disk_ring->getTH2F()->GetYaxis()->SetBinLabel(i, binLabel);
     recHitOccupancyEndcap_disk_ring->getTH2F()->GetYaxis()->SetBinLabel(i, binLabel);
-    matchOccupancyEndcap_disk_ring ->getTH2F()->GetYaxis()->SetBinLabel(i, binLabel);
+    matchOccupancyEndcap_disk_ring->getTH2F()->GetYaxis()->SetBinLabel(i, binLabel);
   }
 
   booked_ = true;
 
   booker.setCurrentFolder(pwd);
 }
-
diff --git a/Validation/RecoB/interface/HistoCompare.h b/Validation/RecoB/interface/HistoCompare.h
index 92789cfcf59a2..cf7aaeadf6c3c 100644
--- a/Validation/RecoB/interface/HistoCompare.h
+++ b/Validation/RecoB/interface/HistoCompare.h
@@ -4,7 +4,7 @@
 /**_________________________________________________________________
    class:   HistoCompare.h
    package: Validation/RecoB
-   
+
 
  author: Victor Bazterra, UIC
          Francisco Yumiceva, Fermilab (yumiceva@fnal.gov)
@@ -12,7 +12,6 @@
 
 ________________________________________________________________**/
 
-
 #include "TFile.h"
 #include "TH1.h"
 #include "TString.h"
@@ -22,52 +21,45 @@ ________________________________________________________________**/
 #include <vector>
 
 class HistoCompare {
+public:
+  HistoCompare();
+  HistoCompare(const TString &refFilename);
+
+  ~HistoCompare();
+
+  TH1 *Compare(TH1 *h, const TString &hname);
+
+  void SetReferenceFilename(const TString &filename) {
+    refFilename_ = filename;
+    // if (refFile_) delete refFile_;
+    refFile_ = new TFile(refFilename_);
+    if (refFile_->IsZombie()) {
+      std::cout << " Error openning file " << refFilename_ << std::endl;
+      std::cout << " we will not compare histograms. " << std::endl;
+      do_nothing_ = true;
+    }
+    std::cout << " open file" << std::endl;
+  };
+
+  void SetChi2Test(bool test = true) { setChi2Test_ = test; };
+
+  void SetKGTest(bool test = true) { setKGTest_ = test; };
+
+  double GetResult() { return result_; };
+
+private:
+  bool setChi2Test_;
+  bool setKGTest_;
+  double result_;
+  bool do_nothing_;
+
+  TH1 *resHisto_;
+  TH1 *refHisto_;
+  TFile *refFile_;
+
+  TString refFilename_;
 
-  public:
-	HistoCompare();
-	HistoCompare(const TString& refFilename);
-
-	~HistoCompare();
-
-	TH1* Compare(TH1* h, const TString& hname);
-
-	void SetReferenceFilename(const TString& filename) {
-	  refFilename_ = filename;
-	  //if (refFile_) delete refFile_;
-	  refFile_ = new TFile(refFilename_);
-	  if (refFile_->IsZombie()) {
-		  std::cout << " Error openning file " << refFilename_ << std::endl;
-		  std::cout << " we will not compare histograms. " << std::endl;
-		  do_nothing_ = true;
-	  }
-	  std::cout << " open file" << std::endl;
-	};
-
-	void SetChi2Test(bool test=true) {
-		setChi2Test_ = test;
-	};
-	
-	void SetKGTest(bool test=true) {
-		setKGTest_ = test;
-	};
-	
-	double GetResult() { return result_; };
-
-  private:
-
-	bool setChi2Test_;
-	bool setKGTest_;
-	double result_;
-	bool do_nothing_;
-	
-	TH1 *resHisto_;
-	TH1 *refHisto_;
-	TFile *refFile_;
-	
-	TString refFilename_;
-
-	//std::map<std::string, TH1*> histomap_;
-	
+  // std::map<std::string, TH1*> histomap_;
 };
 
 #endif
diff --git a/Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.cc b/Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.cc
index b029fcf6cbd5e..13cb3248856d9 100644
--- a/Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.cc
+++ b/Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.cc
@@ -1,129 +1,215 @@
 #include "Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.h"
 
-const reco::TrackBaseRef toTrackRef(const edm::Ptr<reco::Candidate> & cnd)
-{
-    const reco::PFCandidate * pfcand = dynamic_cast<const reco::PFCandidate *>(cnd.get());
-
-    if ( (std::abs(pfcand->pdgId()) == 11 || pfcand->pdgId() == 22) && pfcand->gsfTrackRef().isNonnull() && pfcand->gsfTrackRef().isAvailable() )
-      return reco::TrackBaseRef(pfcand->gsfTrackRef());
-    else if ( pfcand->trackRef().isNonnull() && pfcand->trackRef().isAvailable() )
-      return reco::TrackBaseRef(pfcand->trackRef());
-    else
-      return reco::TrackBaseRef();
+const reco::TrackBaseRef toTrackRef(const edm::Ptr<reco::Candidate> &cnd) {
+  const reco::PFCandidate *pfcand = dynamic_cast<const reco::PFCandidate *>(cnd.get());
+
+  if ((std::abs(pfcand->pdgId()) == 11 || pfcand->pdgId() == 22) && pfcand->gsfTrackRef().isNonnull() &&
+      pfcand->gsfTrackRef().isAvailable())
+    return reco::TrackBaseRef(pfcand->gsfTrackRef());
+  else if (pfcand->trackRef().isNonnull() && pfcand->trackRef().isAvailable())
+    return reco::TrackBaseRef(pfcand->trackRef());
+  else
+    return reco::TrackBaseRef();
 }
 
-
 // ---------- Static member declaration -----------
-const std::vector<std::string> BDHadronTrackMonitoringAnalyzer::TrkHistCat = {"BCWeakDecay", "BWeakDecay", "CWeakDecay", "PU", "Other", "Fake"};
-
+const std::vector<std::string> BDHadronTrackMonitoringAnalyzer::TrkHistCat = {
+    "BCWeakDecay", "BWeakDecay", "CWeakDecay", "PU", "Other", "Fake"};
 
 // ---------- Constructor -----------
-BDHadronTrackMonitoringAnalyzer::BDHadronTrackMonitoringAnalyzer(const edm::ParameterSet& pSet) :
-    distJetAxis_ ( pSet.getParameter<double>("distJetAxisCut") ),
-    decayLength_ ( pSet.getParameter<double>("decayLengthCut") ),
-    minJetPt_ ( pSet.getParameter<double>("minJetPt") ),
-    maxJetEta_ ( pSet.getParameter<double>("maxJetEta") ),
-    ipTagInfos_ ( pSet.getParameter<std::string>("ipTagInfos") ),
-    PatJetSrc_ ( pSet.getParameter<InputTag>("PatJetSource") ),
-    TrackSrc_ ( pSet.getParameter<InputTag>("TrackSource") ),
-    PVSrc_ ( pSet.getParameter<InputTag>("PrimaryVertexSource") ),
-    ClusterTPMapSrc_ ( pSet.getParameter<InputTag>("clusterTPMap") ),
-    classifier_(pSet, consumesCollector())
+BDHadronTrackMonitoringAnalyzer::BDHadronTrackMonitoringAnalyzer(const edm::ParameterSet &pSet)
+    : distJetAxis_(pSet.getParameter<double>("distJetAxisCut")),
+      decayLength_(pSet.getParameter<double>("decayLengthCut")),
+      minJetPt_(pSet.getParameter<double>("minJetPt")),
+      maxJetEta_(pSet.getParameter<double>("maxJetEta")),
+      ipTagInfos_(pSet.getParameter<std::string>("ipTagInfos")),
+      PatJetSrc_(pSet.getParameter<InputTag>("PatJetSource")),
+      TrackSrc_(pSet.getParameter<InputTag>("TrackSource")),
+      PVSrc_(pSet.getParameter<InputTag>("PrimaryVertexSource")),
+      ClusterTPMapSrc_(pSet.getParameter<InputTag>("clusterTPMap")),
+      classifier_(pSet, consumesCollector())
 
 {
-    PatJetCollectionTag_ = consumes<pat::JetCollection>(PatJetSrc_);
-    TrackCollectionTag_ = consumes<reco::TrackCollection>(TrackSrc_);
-    PrimaryVertexColl_ = consumes<reco::VertexCollection>(PVSrc_);
-    clusterTPMapToken_ = consumes<ClusterTPAssociation>(ClusterTPMapSrc_);
-    //TrkHistCat = {"BCWeakDecay", "BWeakDecay", "CWeakDecay", "PU", "Other", "Fake"};
+  PatJetCollectionTag_ = consumes<pat::JetCollection>(PatJetSrc_);
+  TrackCollectionTag_ = consumes<reco::TrackCollection>(TrackSrc_);
+  PrimaryVertexColl_ = consumes<reco::VertexCollection>(PVSrc_);
+  clusterTPMapToken_ = consumes<ClusterTPAssociation>(ClusterTPMapSrc_);
+  // TrkHistCat = {"BCWeakDecay", "BWeakDecay", "CWeakDecay", "PU", "Other",
+  // "Fake"};
 }
 
-
-
-
 // ---------- BookHistograms -----------
 
-void BDHadronTrackMonitoringAnalyzer::bookHistograms(DQMStore::IBooker & ibook, edm::Run const & run, edm::EventSetup const & es)
-{
+void BDHadronTrackMonitoringAnalyzer::bookHistograms(DQMStore::IBooker &ibook,
+                                                     edm::Run const &run,
+                                                     edm::EventSetup const &es) {
   ibook.setCurrentFolder("BDHadronTracks/JetContent");
   //
   // Book all histograms.
   //
   RecoBTag::setTDRStyle();
 
+  nTrkAll_bjet = ibook.book1D(
+      "nTrkAll_bjet", "Number of selected tracks in b jets;number of selected tracks;jets", 16, -0.5, 15.5);
 
-  nTrkAll_bjet = ibook.book1D("nTrkAll_bjet","Number of selected tracks in b jets;number of selected tracks;jets",16,-0.5,15.5);
-
-  nTrkAll_cjet = ibook.book1D("nTrkAll_cjet","Number of selected tracks in c jets;number of selected tracks;jets",16,-0.5,15.5);
+  nTrkAll_cjet = ibook.book1D(
+      "nTrkAll_cjet", "Number of selected tracks in c jets;number of selected tracks;jets", 16, -0.5, 15.5);
 
-  nTrkAll_dusgjet = ibook.book1D("nTrkAll_dusgjet","Number of selected tracks in dusg jets;number of selected tracks;jets",16,-0.5,15.5);
+  nTrkAll_dusgjet = ibook.book1D(
+      "nTrkAll_dusgjet", "Number of selected tracks in dusg jets;number of selected tracks;jets", 16, -0.5, 15.5);
 
   // Loop over different Track History Categories
-  for (unsigned int i = 0; i < TrkHistCat.size(); i++){
+  for (unsigned int i = 0; i < TrkHistCat.size(); i++) {
     ibook.setCurrentFolder("BDHadronTracks/JetContent");
     // b jets
-    nTrk_bjet[i] = ibook.book1D("nTrk_bjet_"+TrkHistCat[i],"Number of selected tracks in b jets ("+TrkHistCat[i]+");number of selected tracks ("+TrkHistCat[i]+");jets",16,-0.5,15.5);
- 
+    nTrk_bjet[i] = ibook.book1D("nTrk_bjet_" + TrkHistCat[i],
+                                "Number of selected tracks in b jets (" + TrkHistCat[i] +
+                                    ");number of selected tracks (" + TrkHistCat[i] + ");jets",
+                                16,
+                                -0.5,
+                                15.5);
+
     // c jets
-    nTrk_cjet[i] = ibook.book1D("nTrk_cjet_"+TrkHistCat[i],"Number of selected tracks in c jets ("+TrkHistCat[i]+");number of selected tracks ("+TrkHistCat[i]+");jets",16,-0.5,15.5);
- 
+    nTrk_cjet[i] = ibook.book1D("nTrk_cjet_" + TrkHistCat[i],
+                                "Number of selected tracks in c jets (" + TrkHistCat[i] +
+                                    ");number of selected tracks (" + TrkHistCat[i] + ");jets",
+                                16,
+                                -0.5,
+                                15.5);
+
     // dusg jets
-    nTrk_dusgjet[i] = ibook.book1D("nTrk_dusgjet_"+TrkHistCat[i],"Number of selected tracks in dusg jets ("+TrkHistCat[i]+");number of selected tracks ("+TrkHistCat[i]+");jets",16,-0.5,15.5);
- 
+    nTrk_dusgjet[i] = ibook.book1D("nTrk_dusgjet_" + TrkHistCat[i],
+                                   "Number of selected tracks in dusg jets (" + TrkHistCat[i] +
+                                       ");number of selected tracks (" + TrkHistCat[i] + ");jets",
+                                   16,
+                                   -0.5,
+                                   15.5);
+
     ibook.setCurrentFolder("BDHadronTracks/TrackInfo");
     // track properties for all flavours combined
-    TrkPt_alljets[i] = ibook.book1D("TrkPt_"+TrkHistCat[i],"Track pT ("+TrkHistCat[i]+");track p_{T} ("+TrkHistCat[i]+");tracks",30,0,100);
-    TrkEta_alljets[i] = ibook.book1D("TrkEta_"+TrkHistCat[i],"Track #eta ("+TrkHistCat[i]+");track #eta ("+TrkHistCat[i]+");tracks",30,-2.5,2.5);
-    TrkPhi_alljets[i] = ibook.book1D("TrkPhi_"+TrkHistCat[i],"Track #phi ("+TrkHistCat[i]+");track #phi ("+TrkHistCat[i]+");tracks",30,-3.15,3.15);
-    TrkDxy_alljets[i] = ibook.book1D("TrkDxy_"+TrkHistCat[i],"Track dxy ("+TrkHistCat[i]+");track dxy ("+TrkHistCat[i]+");tracks",30,-0.1,0.1);
-    TrkDz_alljets[i] = ibook.book1D("TrkDz_"+TrkHistCat[i],"Track dz ("+TrkHistCat[i]+");track dz ("+TrkHistCat[i]+");tracks",30,-0.1,0.1);
-    TrkHitAll_alljets[i] = ibook.book1D("TrkHitAll_"+TrkHistCat[i],"Number of tracker hits ("+TrkHistCat[i]+");track number of all hits ("+TrkHistCat[i]+");tracks",31,-0.5,30.5);
-    TrkHitStrip_alljets[i] = ibook.book1D("TrkHitStrip_"+TrkHistCat[i],"Number of strip hits ("+TrkHistCat[i]+");track number of strip hits ("+TrkHistCat[i]+");tracks",31,-0.5,30.5);
-    TrkHitPixel_alljets[i] = ibook.book1D("TrkHitPixel_"+TrkHistCat[i],"Number of pixel hits ("+TrkHistCat[i]+");track number of pixel hits ("+TrkHistCat[i]+");tracks",9,-0.5,8.5);
-    
+    TrkPt_alljets[i] = ibook.book1D("TrkPt_" + TrkHistCat[i],
+                                    "Track pT (" + TrkHistCat[i] + ");track p_{T} (" + TrkHistCat[i] + ");tracks",
+                                    30,
+                                    0,
+                                    100);
+    TrkEta_alljets[i] = ibook.book1D("TrkEta_" + TrkHistCat[i],
+                                     "Track #eta (" + TrkHistCat[i] + ");track #eta (" + TrkHistCat[i] + ");tracks",
+                                     30,
+                                     -2.5,
+                                     2.5);
+    TrkPhi_alljets[i] = ibook.book1D("TrkPhi_" + TrkHistCat[i],
+                                     "Track #phi (" + TrkHistCat[i] + ");track #phi (" + TrkHistCat[i] + ");tracks",
+                                     30,
+                                     -3.15,
+                                     3.15);
+    TrkDxy_alljets[i] = ibook.book1D("TrkDxy_" + TrkHistCat[i],
+                                     "Track dxy (" + TrkHistCat[i] + ");track dxy (" + TrkHistCat[i] + ");tracks",
+                                     30,
+                                     -0.1,
+                                     0.1);
+    TrkDz_alljets[i] = ibook.book1D("TrkDz_" + TrkHistCat[i],
+                                    "Track dz (" + TrkHistCat[i] + ");track dz (" + TrkHistCat[i] + ");tracks",
+                                    30,
+                                    -0.1,
+                                    0.1);
+    TrkHitAll_alljets[i] = ibook.book1D(
+        "TrkHitAll_" + TrkHistCat[i],
+        "Number of tracker hits (" + TrkHistCat[i] + ");track number of all hits (" + TrkHistCat[i] + ");tracks",
+        31,
+        -0.5,
+        30.5);
+    TrkHitStrip_alljets[i] = ibook.book1D(
+        "TrkHitStrip_" + TrkHistCat[i],
+        "Number of strip hits (" + TrkHistCat[i] + ");track number of strip hits (" + TrkHistCat[i] + ");tracks",
+        31,
+        -0.5,
+        30.5);
+    TrkHitPixel_alljets[i] = ibook.book1D(
+        "TrkHitPixel_" + TrkHistCat[i],
+        "Number of pixel hits (" + TrkHistCat[i] + ");track number of pixel hits (" + TrkHistCat[i] + ");tracks",
+        9,
+        -0.5,
+        8.5);
+
     ibook.setCurrentFolder("BDHadronTracks/TrackTruthInfo");
-    if (i < 5){ // Fakes (i == 5) have no truth by definition!
-        TrkTruthPt_alljets[i] = ibook.book1D("TrkTruthPt_"+TrkHistCat[i],"Track pT ("+TrkHistCat[i]+" Truth);track p_{T} ("+TrkHistCat[i]+" Truth);tracks",30,0,100);
-        TrkTruthEta_alljets[i] = ibook.book1D("TrkTruthEta_"+TrkHistCat[i],"Track #eta ("+TrkHistCat[i]+" Truth);track #eta ("+TrkHistCat[i]+" Truth);tracks",30,-2.5,2.5);
-        TrkTruthPhi_alljets[i] = ibook.book1D("TrkTruthPhi_"+TrkHistCat[i],"Track #phi ("+TrkHistCat[i]+" Truth);track #phi ("+TrkHistCat[i]+" Truth);tracks",30,-3.15,3.15);
-        TrkTruthDxy_alljets[i] = ibook.book1D("TrkTruthDxy_"+TrkHistCat[i],"Track dxy ("+TrkHistCat[i]+" Truth);track dxy ("+TrkHistCat[i]+" Truth);tracks",30,-0.1,0.1);
-        TrkTruthDz_alljets[i] = ibook.book1D("TrkTruthDz_"+TrkHistCat[i],"Track dz ("+TrkHistCat[i]+" Truth);track dz ("+TrkHistCat[i]+" Truth);tracks",30,-0.1,0.1);
-        TrkTruthHitAll_alljets[i] = ibook.book1D("TrkTruthHitAll_"+TrkHistCat[i],"Number of tracker hits ("+TrkHistCat[i]+" Truth);track number of all hits ("+TrkHistCat[i]+" Truth);tracks",31,-0.5,30.5);
-        TrkTruthHitStrip_alljets[i] = ibook.book1D("TrkTruthHitStrip_"+TrkHistCat[i],"Number of strip hits ("+TrkHistCat[i]+" Truth);track number of strip hits ("+TrkHistCat[i]+" Truth);tracks",31,-0.5,30.5);
-        TrkTruthHitPixel_alljets[i] = ibook.book1D("TrkTruthHitPixel_"+TrkHistCat[i],"Number of pixel hits ("+TrkHistCat[i]+" Truth);track number of pixel hits ("+TrkHistCat[i]+" Truth);tracks",9,-0.5,8.5);
+    if (i < 5) {  // Fakes (i == 5) have no truth by definition!
+      TrkTruthPt_alljets[i] =
+          ibook.book1D("TrkTruthPt_" + TrkHistCat[i],
+                       "Track pT (" + TrkHistCat[i] + " Truth);track p_{T} (" + TrkHistCat[i] + " Truth);tracks",
+                       30,
+                       0,
+                       100);
+      TrkTruthEta_alljets[i] =
+          ibook.book1D("TrkTruthEta_" + TrkHistCat[i],
+                       "Track #eta (" + TrkHistCat[i] + " Truth);track #eta (" + TrkHistCat[i] + " Truth);tracks",
+                       30,
+                       -2.5,
+                       2.5);
+      TrkTruthPhi_alljets[i] =
+          ibook.book1D("TrkTruthPhi_" + TrkHistCat[i],
+                       "Track #phi (" + TrkHistCat[i] + " Truth);track #phi (" + TrkHistCat[i] + " Truth);tracks",
+                       30,
+                       -3.15,
+                       3.15);
+      TrkTruthDxy_alljets[i] =
+          ibook.book1D("TrkTruthDxy_" + TrkHistCat[i],
+                       "Track dxy (" + TrkHistCat[i] + " Truth);track dxy (" + TrkHistCat[i] + " Truth);tracks",
+                       30,
+                       -0.1,
+                       0.1);
+      TrkTruthDz_alljets[i] =
+          ibook.book1D("TrkTruthDz_" + TrkHistCat[i],
+                       "Track dz (" + TrkHistCat[i] + " Truth);track dz (" + TrkHistCat[i] + " Truth);tracks",
+                       30,
+                       -0.1,
+                       0.1);
+      TrkTruthHitAll_alljets[i] =
+          ibook.book1D("TrkTruthHitAll_" + TrkHistCat[i],
+                       "Number of tracker hits (" + TrkHistCat[i] + " Truth);track number of all hits (" +
+                           TrkHistCat[i] + " Truth);tracks",
+                       31,
+                       -0.5,
+                       30.5);
+      TrkTruthHitStrip_alljets[i] =
+          ibook.book1D("TrkTruthHitStrip_" + TrkHistCat[i],
+                       "Number of strip hits (" + TrkHistCat[i] + " Truth);track number of strip hits (" +
+                           TrkHistCat[i] + " Truth);tracks",
+                       31,
+                       -0.5,
+                       30.5);
+      TrkTruthHitPixel_alljets[i] =
+          ibook.book1D("TrkTruthHitPixel_" + TrkHistCat[i],
+                       "Number of pixel hits (" + TrkHistCat[i] + " Truth);track number of pixel hits (" +
+                           TrkHistCat[i] + " Truth);tracks",
+                       9,
+                       -0.5,
+                       8.5);
     }
   }
 }
 
-
 // ---------- Destructor -----------
 
-BDHadronTrackMonitoringAnalyzer::~BDHadronTrackMonitoringAnalyzer()
-{  
-}
-
+BDHadronTrackMonitoringAnalyzer::~BDHadronTrackMonitoringAnalyzer() {}
 
 // ---------- Analyze -----------
-// This is needed to get a TrackingParticle --> Cluster match (instead of Cluster-->TP) 
+// This is needed to get a TrackingParticle --> Cluster match (instead of
+// Cluster-->TP)
 using P = std::pair<OmniClusterRef, TrackingParticleRef>;
-bool compare(const P& i, const P& j) {
-    return i.second.index() > j.second.index();
-}
-
-void BDHadronTrackMonitoringAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+bool compare(const P &i, const P &j) { return i.second.index() > j.second.index(); }
 
+void BDHadronTrackMonitoringAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   edm::Handle<pat::JetCollection> patJetsColl;
   iEvent.getByToken(PatJetCollectionTag_, patJetsColl);
 
   edm::Handle<reco::TrackCollection> tracksHandle;
-  iEvent.getByToken(TrackCollectionTag_,tracksHandle);
+  iEvent.getByToken(TrackCollectionTag_, tracksHandle);
 
   edm::Handle<ClusterTPAssociation> pCluster2TPListH;
   iEvent.getByToken(clusterTPMapToken_, pCluster2TPListH);
-  const ClusterTPAssociation& clusterToTPMap = *pCluster2TPListH;
+  const ClusterTPAssociation &clusterToTPMap = *pCluster2TPListH;
 
-  edm::ESHandle<TransientTrackBuilder> trackBuilder ;
+  edm::ESHandle<TransientTrackBuilder> trackBuilder;
   iSetup.get<TransientTrackRecord>().get("TransientTrackBuilder", trackBuilder);
 
   classifier_.newEvent(iEvent, iSetup);
@@ -131,283 +217,284 @@ void BDHadronTrackMonitoringAnalyzer::analyze(const edm::Event& iEvent, const ed
   // -----Primary Vertex-----
   const reco::Vertex *pv;
 
-  edm::Handle<reco::VertexCollection> primaryVertex ;
-  iEvent.getByToken(PrimaryVertexColl_,primaryVertex);
+  edm::Handle<reco::VertexCollection> primaryVertex;
+  iEvent.getByToken(PrimaryVertexColl_, primaryVertex);
 
   bool pvFound = (!primaryVertex->empty());
-  if ( pvFound ) {
+  if (pvFound) {
     pv = &(*primaryVertex->begin());
-  }
-  else {
+  } else {
     reco::Vertex::Error e;
-    e(0,0)=0.0015*0.0015;
-    e(1,1)=0.0015*0.0015;
-    e(2,2)=15.*15.;
-    reco::Vertex::Point p(0,0,0);
-    pv=  new reco::Vertex(p,e,1,1,1);
+    e(0, 0) = 0.0015 * 0.0015;
+    e(1, 1) = 0.0015 * 0.0015;
+    e(2, 2) = 15. * 15.;
+    reco::Vertex::Point p(0, 0, 0);
+    pv = new reco::Vertex(p, e, 1, 1, 1);
   }
   // -----------------------
 
   // -------- Loop Over Jets ----------
-  for ( pat::JetCollection::const_iterator jet = patJetsColl->begin(); jet != patJetsColl->end(); ++jet ) {
-    if ( jet->pt() < minJetPt_ || std::fabs(jet->eta()) > maxJetEta_ ) continue;
+  for (pat::JetCollection::const_iterator jet = patJetsColl->begin(); jet != patJetsColl->end(); ++jet) {
+    if (jet->pt() < minJetPt_ || std::fabs(jet->eta()) > maxJetEta_)
+      continue;
 
     unsigned int flav = abs(jet->hadronFlavour());
 
-    //std::cout << "patJet collection has pfImpactParameterTagInfo?: " << jet->hasTagInfo("pfImpactParameter") << std::endl;
+    // std::cout << "patJet collection has pfImpactParameterTagInfo?: " <<
+    // jet->hasTagInfo("pfImpactParameter") << std::endl;
     const CandIPTagInfo *trackIpTagInfo = jet->tagInfoCandIP(ipTagInfos_);
-    const std::vector<edm::Ptr<reco::Candidate> > & selectedTracks( trackIpTagInfo->selectedTracks() );
-
+    const std::vector<edm::Ptr<reco::Candidate>> &selectedTracks(trackIpTagInfo->selectedTracks());
 
     unsigned int nseltracks = 0;
-    std::vector<int> nseltracksCat(TrkHistCat.size(),0); // following the order of TrkHistCat
+    std::vector<int> nseltracksCat(TrkHistCat.size(),
+                                   0);  // following the order of TrkHistCat
 
-    unsigned int nTrackSize = selectedTracks.size(); // number of tracks from IPInfos to loop over
+    unsigned int nTrackSize = selectedTracks.size();  // number of tracks from IPInfos to loop over
     // -------- Loop Over (selected) Tracks ----------
-    for (unsigned int itt=0; itt < nTrackSize; ++itt)
-    {
-        const TrackBaseRef ptrackRef = toTrackRef(selectedTracks[itt]);
-        const reco::Track * ptrackPtr = reco::btag::toTrack(ptrackRef);
-        const reco::Track & ptrack = *ptrackPtr;
-    
-        reco::TransientTrack transientTrack = trackBuilder->build(ptrackPtr);
-        GlobalVector direction(jet->px(), jet->py(), jet->pz());
-    
-        Double_t distJetAxis = IPTools::jetTrackDistance(transientTrack, direction, *pv).second.value();
-    
-        Double_t decayLength=999;
-        TrajectoryStateOnSurface closest = IPTools::closestApproachToJet(transientTrack.impactPointState(), *pv, direction, transientTrack.field());
-        if (closest.isValid())
-            decayLength =  (closest.globalPosition() - RecoVertex::convertPos(pv->position())).mag();
-        else
-            decayLength = 999;
-    
-        // extra cut ons the tracks
-        if (std::fabs(distJetAxis) > distJetAxis_ || decayLength > decayLength_){
-            continue;
-        }
-        nseltracks+=1; // if it passed these cuts, nselectedtracks +1
-    
-    
-        TrackCategories::Flags theFlag = classifier_.evaluate( toTrackRef(selectedTracks[itt]) ).flags();
-    
-        double TrkPt = ptrack.pt();
-        double TrkEta = ptrack.eta();
-        double TrkPhi = ptrack.phi();
-        double TrkDxy = ptrack.dxy(pv->position());
-        double TrkDz = ptrack.dz(pv->position());
-        int TrknHitAll = ptrack.numberOfValidHits();
-        int TrknHitPixel = ptrack.hitPattern().numberOfValidPixelHits();
-        int TrknHitStrip = ptrack.hitPattern().numberOfValidStripHits();
-
-    
-        double TrkTruthPt=-99;
-        double TrkTruthEta=-99;
-        double TrkTruthPhi=-99;
-        double TrkTruthDxy=-1;
-        double TrkTruthDz=-1;
-        int TrkTruthnHitAll=-1;
-        int TrkTruthnHitPixel=-1;
-        int TrkTruthnHitStrip=-1;
-    
-        // Get corresponding Trackingparticle
-        std::pair<TrackingParticleRef, double> res = classifier_.history().getMatchedTrackingParticle();
-        TrackingParticleRef tpr = res.first;
-        double quality_tpr = res.second;
-    
-        // Match TP to hit-cluster (re-ordering according to TP rather than clusters and look for equal_range of a given tpr)
-        auto clusterTPmap = clusterToTPMap.map();
-        std::sort(clusterTPmap.begin(), clusterTPmap.end(), compare);
-        auto clusterRange = std::equal_range(clusterTPmap.begin(), clusterTPmap.end(),std::make_pair(OmniClusterRef(), tpr), compare);
-        if (quality_tpr != 0) {
-        
-            TrkTruthPt = tpr->pt();
-            TrkTruthEta = tpr->eta();
-            TrkTruthPhi = tpr->phi();
-        
-            const TrackingParticle::Point& vertex_pv = pv->position();
-            TrackingParticle::Point vertex_tpr = tpr->vertex();
-            TrackingParticle::Vector momentum_tpr = tpr->momentum();
-            TrkTruthDxy = (-(vertex_tpr.x()-vertex_pv.x())*momentum_tpr.y()+(vertex_tpr.y()-vertex_pv.y())*momentum_tpr.x())/tpr->pt();
-            TrkTruthDz = (vertex_tpr.z()-vertex_pv.z()) - ((vertex_tpr.x()-vertex_pv.x())*momentum_tpr.x()+(vertex_tpr.y()-vertex_pv.y())*momentum_tpr.y())/sqrt(momentum_tpr.perp2()) * momentum_tpr.z()/sqrt(momentum_tpr.perp2());
-
-            TrkTruthnHitAll = 0;
-            TrkTruthnHitPixel = 0;
-            TrkTruthnHitStrip = 0;
-            if( clusterRange.first != clusterRange.second ) {
-                for( auto ip=clusterRange.first; ip != clusterRange.second; ++ip ) {
-                    const OmniClusterRef& cluster = ip->first;
-                    if (cluster.isPixel() && cluster.isValid()){ TrkTruthnHitPixel+=1;}
-                    if (cluster.isStrip() && cluster.isValid()){ TrkTruthnHitStrip+=1;}
-                }
+    for (unsigned int itt = 0; itt < nTrackSize; ++itt) {
+      const TrackBaseRef ptrackRef = toTrackRef(selectedTracks[itt]);
+      const reco::Track *ptrackPtr = reco::btag::toTrack(ptrackRef);
+      const reco::Track &ptrack = *ptrackPtr;
+
+      reco::TransientTrack transientTrack = trackBuilder->build(ptrackPtr);
+      GlobalVector direction(jet->px(), jet->py(), jet->pz());
+
+      Double_t distJetAxis = IPTools::jetTrackDistance(transientTrack, direction, *pv).second.value();
+
+      Double_t decayLength = 999;
+      TrajectoryStateOnSurface closest =
+          IPTools::closestApproachToJet(transientTrack.impactPointState(), *pv, direction, transientTrack.field());
+      if (closest.isValid())
+        decayLength = (closest.globalPosition() - RecoVertex::convertPos(pv->position())).mag();
+      else
+        decayLength = 999;
+
+      // extra cut ons the tracks
+      if (std::fabs(distJetAxis) > distJetAxis_ || decayLength > decayLength_) {
+        continue;
+      }
+      nseltracks += 1;  // if it passed these cuts, nselectedtracks +1
+
+      TrackCategories::Flags theFlag = classifier_.evaluate(toTrackRef(selectedTracks[itt])).flags();
+
+      double TrkPt = ptrack.pt();
+      double TrkEta = ptrack.eta();
+      double TrkPhi = ptrack.phi();
+      double TrkDxy = ptrack.dxy(pv->position());
+      double TrkDz = ptrack.dz(pv->position());
+      int TrknHitAll = ptrack.numberOfValidHits();
+      int TrknHitPixel = ptrack.hitPattern().numberOfValidPixelHits();
+      int TrknHitStrip = ptrack.hitPattern().numberOfValidStripHits();
+
+      double TrkTruthPt = -99;
+      double TrkTruthEta = -99;
+      double TrkTruthPhi = -99;
+      double TrkTruthDxy = -1;
+      double TrkTruthDz = -1;
+      int TrkTruthnHitAll = -1;
+      int TrkTruthnHitPixel = -1;
+      int TrkTruthnHitStrip = -1;
+
+      // Get corresponding Trackingparticle
+      std::pair<TrackingParticleRef, double> res = classifier_.history().getMatchedTrackingParticle();
+      TrackingParticleRef tpr = res.first;
+      double quality_tpr = res.second;
+
+      // Match TP to hit-cluster (re-ordering according to TP rather than
+      // clusters and look for equal_range of a given tpr)
+      auto clusterTPmap = clusterToTPMap.map();
+      std::sort(clusterTPmap.begin(), clusterTPmap.end(), compare);
+      auto clusterRange =
+          std::equal_range(clusterTPmap.begin(), clusterTPmap.end(), std::make_pair(OmniClusterRef(), tpr), compare);
+      if (quality_tpr != 0) {
+        TrkTruthPt = tpr->pt();
+        TrkTruthEta = tpr->eta();
+        TrkTruthPhi = tpr->phi();
+
+        const TrackingParticle::Point &vertex_pv = pv->position();
+        TrackingParticle::Point vertex_tpr = tpr->vertex();
+        TrackingParticle::Vector momentum_tpr = tpr->momentum();
+        TrkTruthDxy = (-(vertex_tpr.x() - vertex_pv.x()) * momentum_tpr.y() +
+                       (vertex_tpr.y() - vertex_pv.y()) * momentum_tpr.x()) /
+                      tpr->pt();
+        TrkTruthDz = (vertex_tpr.z() - vertex_pv.z()) - ((vertex_tpr.x() - vertex_pv.x()) * momentum_tpr.x() +
+                                                         (vertex_tpr.y() - vertex_pv.y()) * momentum_tpr.y()) /
+                                                            sqrt(momentum_tpr.perp2()) * momentum_tpr.z() /
+                                                            sqrt(momentum_tpr.perp2());
+
+        TrkTruthnHitAll = 0;
+        TrkTruthnHitPixel = 0;
+        TrkTruthnHitStrip = 0;
+        if (clusterRange.first != clusterRange.second) {
+          for (auto ip = clusterRange.first; ip != clusterRange.second; ++ip) {
+            const OmniClusterRef &cluster = ip->first;
+            if (cluster.isPixel() && cluster.isValid()) {
+              TrkTruthnHitPixel += 1;
             }
-            TrkTruthnHitAll = TrkTruthnHitPixel + TrkTruthnHitStrip;
-        
-        }
-    
-    
-    
-        // ----------- Filling the correct histograms based on jet flavour and Track history Category --------
-    
-        //BCWeakDecay
-        if ( theFlag[TrackCategories::SignalEvent] && theFlag[TrackCategories::BWeakDecay] && theFlag[TrackCategories::CWeakDecay] ) {
-            nseltracksCat[BDHadronTrackMonitoringAnalyzer::BCWeakDecay] += 1;
-            TrkPt_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkPt);
-            TrkEta_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkEta);
-            TrkPhi_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkPhi);
-            TrkDxy_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkDxy);
-            TrkDz_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkDz);
-            TrkHitAll_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrknHitAll);
-            TrkHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrknHitPixel);
-            TrkHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrknHitStrip);
-            if (quality_tpr != 0) {
-                TrkTruthPt_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkTruthPt);
-                TrkTruthEta_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkTruthEta);
-                TrkTruthPhi_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkTruthPhi);
-                TrkTruthDxy_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkTruthDxy);
-                TrkTruthDz_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkTruthDz);
-                TrkTruthHitAll_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkTruthnHitAll);
-                TrkTruthHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkTruthnHitPixel);
-                TrkTruthHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkTruthnHitStrip);
+            if (cluster.isStrip() && cluster.isValid()) {
+              TrkTruthnHitStrip += 1;
             }
+          }
         }
-        //BWeakDecay
-        else if ( theFlag[TrackCategories::SignalEvent] && theFlag[TrackCategories::BWeakDecay] && !theFlag[TrackCategories::CWeakDecay] ) {
-            nseltracksCat[BDHadronTrackMonitoringAnalyzer::BWeakDecay] += 1;
-            TrkPt_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkPt);
-            TrkEta_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkEta);
-            TrkPhi_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkPhi);
-            TrkDxy_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkDxy);
-            TrkDz_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkDz);
-            TrkHitAll_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrknHitAll);
-            TrkHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrknHitPixel);
-            TrkHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrknHitStrip);
-            if (quality_tpr != 0) {
-                TrkTruthPt_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkTruthPt);
-                TrkTruthEta_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkTruthEta);
-                TrkTruthPhi_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkTruthPhi);
-                TrkTruthDxy_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkTruthDxy);
-                TrkTruthDz_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkTruthDz);
-                TrkTruthHitAll_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkTruthnHitAll);
-                TrkTruthHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkTruthnHitPixel);
-                TrkTruthHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkTruthnHitStrip);
-            }
+        TrkTruthnHitAll = TrkTruthnHitPixel + TrkTruthnHitStrip;
+      }
+
+      // ----------- Filling the correct histograms based on jet flavour and
+      // Track history Category --------
+
+      // BCWeakDecay
+      if (theFlag[TrackCategories::SignalEvent] && theFlag[TrackCategories::BWeakDecay] &&
+          theFlag[TrackCategories::CWeakDecay]) {
+        nseltracksCat[BDHadronTrackMonitoringAnalyzer::BCWeakDecay] += 1;
+        TrkPt_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkPt);
+        TrkEta_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkEta);
+        TrkPhi_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkPhi);
+        TrkDxy_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkDxy);
+        TrkDz_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkDz);
+        TrkHitAll_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrknHitAll);
+        TrkHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrknHitPixel);
+        TrkHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrknHitStrip);
+        if (quality_tpr != 0) {
+          TrkTruthPt_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkTruthPt);
+          TrkTruthEta_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkTruthEta);
+          TrkTruthPhi_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkTruthPhi);
+          TrkTruthDxy_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkTruthDxy);
+          TrkTruthDz_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkTruthDz);
+          TrkTruthHitAll_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkTruthnHitAll);
+          TrkTruthHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkTruthnHitPixel);
+          TrkTruthHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::BCWeakDecay]->Fill(TrkTruthnHitStrip);
         }
-        //CWeakDecay
-        else if ( theFlag[TrackCategories::SignalEvent] && !theFlag[TrackCategories::BWeakDecay] && theFlag[TrackCategories::CWeakDecay] ) {
-            nseltracksCat[BDHadronTrackMonitoringAnalyzer::CWeakDecay] += 1;
-            TrkPt_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkPt);
-            TrkEta_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkEta);
-            TrkPhi_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkPhi);
-            TrkDxy_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkDxy);
-            TrkDz_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkDz);
-            TrkHitAll_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrknHitAll);
-            TrkHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrknHitPixel);
-            TrkHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrknHitStrip);
-            if (quality_tpr != 0) {
-                TrkTruthPt_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkTruthPt);
-                TrkTruthEta_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkTruthEta);
-                TrkTruthPhi_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkTruthPhi);
-                TrkTruthDxy_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkTruthDxy);
-                TrkTruthDz_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkTruthDz);
-                TrkTruthHitAll_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkTruthnHitAll);
-                TrkTruthHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkTruthnHitPixel);
-                TrkTruthHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkTruthnHitStrip);
-            }
+      }
+      // BWeakDecay
+      else if (theFlag[TrackCategories::SignalEvent] && theFlag[TrackCategories::BWeakDecay] &&
+               !theFlag[TrackCategories::CWeakDecay]) {
+        nseltracksCat[BDHadronTrackMonitoringAnalyzer::BWeakDecay] += 1;
+        TrkPt_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkPt);
+        TrkEta_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkEta);
+        TrkPhi_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkPhi);
+        TrkDxy_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkDxy);
+        TrkDz_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkDz);
+        TrkHitAll_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrknHitAll);
+        TrkHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrknHitPixel);
+        TrkHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrknHitStrip);
+        if (quality_tpr != 0) {
+          TrkTruthPt_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkTruthPt);
+          TrkTruthEta_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkTruthEta);
+          TrkTruthPhi_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkTruthPhi);
+          TrkTruthDxy_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkTruthDxy);
+          TrkTruthDz_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkTruthDz);
+          TrkTruthHitAll_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkTruthnHitAll);
+          TrkTruthHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkTruthnHitPixel);
+          TrkTruthHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::BWeakDecay]->Fill(TrkTruthnHitStrip);
         }
-        //PU
-        else if ( !theFlag[TrackCategories::SignalEvent] && !theFlag[TrackCategories::Fake] ) {
-            nseltracksCat[BDHadronTrackMonitoringAnalyzer::PU] += 1;
-            TrkPt_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkPt);
-            TrkEta_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkEta);
-            TrkPhi_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkPhi);
-            TrkDxy_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkDxy);
-            TrkDz_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkDz);
-            TrkHitAll_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrknHitAll);
-            TrkHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrknHitPixel);
-            TrkHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrknHitStrip);
-            if (quality_tpr != 0) {
-                TrkTruthPt_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkTruthPt);
-                TrkTruthEta_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkTruthEta);
-                TrkTruthPhi_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkTruthPhi);
-                TrkTruthDxy_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkTruthDxy);
-                TrkTruthDz_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkTruthDz);
-                TrkTruthHitAll_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkTruthnHitAll);
-                TrkTruthHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkTruthnHitPixel);
-                TrkTruthHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkTruthnHitStrip);
-            }
+      }
+      // CWeakDecay
+      else if (theFlag[TrackCategories::SignalEvent] && !theFlag[TrackCategories::BWeakDecay] &&
+               theFlag[TrackCategories::CWeakDecay]) {
+        nseltracksCat[BDHadronTrackMonitoringAnalyzer::CWeakDecay] += 1;
+        TrkPt_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkPt);
+        TrkEta_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkEta);
+        TrkPhi_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkPhi);
+        TrkDxy_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkDxy);
+        TrkDz_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkDz);
+        TrkHitAll_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrknHitAll);
+        TrkHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrknHitPixel);
+        TrkHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrknHitStrip);
+        if (quality_tpr != 0) {
+          TrkTruthPt_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkTruthPt);
+          TrkTruthEta_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkTruthEta);
+          TrkTruthPhi_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkTruthPhi);
+          TrkTruthDxy_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkTruthDxy);
+          TrkTruthDz_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkTruthDz);
+          TrkTruthHitAll_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkTruthnHitAll);
+          TrkTruthHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkTruthnHitPixel);
+          TrkTruthHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::CWeakDecay]->Fill(TrkTruthnHitStrip);
         }
-        //Other
-        else if ( theFlag[TrackCategories::SignalEvent] && !theFlag[TrackCategories::BWeakDecay] && !theFlag[TrackCategories::CWeakDecay] ){
-            nseltracksCat[BDHadronTrackMonitoringAnalyzer::Other] += 1;
-            TrkPt_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkPt);
-            TrkEta_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkEta);
-            TrkPhi_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkPhi);
-            TrkDxy_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkDxy);
-            TrkDz_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkDz);
-            TrkHitAll_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrknHitAll);
-            TrkHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrknHitPixel);
-            TrkHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrknHitStrip);
-            if (quality_tpr != 0) {
-                TrkTruthPt_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkTruthPt);
-                TrkTruthEta_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkTruthEta);
-                TrkTruthPhi_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkTruthPhi);
-                TrkTruthDxy_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkTruthDxy);
-                TrkTruthDz_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkTruthDz);
-                TrkTruthHitAll_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkTruthnHitAll);
-                TrkTruthHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkTruthnHitPixel);
-                TrkTruthHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkTruthnHitStrip);
-            }
+      }
+      // PU
+      else if (!theFlag[TrackCategories::SignalEvent] && !theFlag[TrackCategories::Fake]) {
+        nseltracksCat[BDHadronTrackMonitoringAnalyzer::PU] += 1;
+        TrkPt_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkPt);
+        TrkEta_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkEta);
+        TrkPhi_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkPhi);
+        TrkDxy_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkDxy);
+        TrkDz_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkDz);
+        TrkHitAll_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrknHitAll);
+        TrkHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrknHitPixel);
+        TrkHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrknHitStrip);
+        if (quality_tpr != 0) {
+          TrkTruthPt_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkTruthPt);
+          TrkTruthEta_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkTruthEta);
+          TrkTruthPhi_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkTruthPhi);
+          TrkTruthDxy_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkTruthDxy);
+          TrkTruthDz_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkTruthDz);
+          TrkTruthHitAll_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkTruthnHitAll);
+          TrkTruthHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkTruthnHitPixel);
+          TrkTruthHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::PU]->Fill(TrkTruthnHitStrip);
         }
-        //Fake
-        else if ( !theFlag[TrackCategories::SignalEvent] && theFlag[TrackCategories::Fake] ) {
-            nseltracksCat[BDHadronTrackMonitoringAnalyzer::Fake] += 1;
-            TrkPt_alljets[BDHadronTrackMonitoringAnalyzer::Fake]->Fill(TrkPt);
-            TrkEta_alljets[BDHadronTrackMonitoringAnalyzer::Fake]->Fill(TrkEta);
-            TrkPhi_alljets[BDHadronTrackMonitoringAnalyzer::Fake]->Fill(TrkPhi);
-            TrkDxy_alljets[BDHadronTrackMonitoringAnalyzer::Fake]->Fill(TrkDxy);
-            TrkDz_alljets[BDHadronTrackMonitoringAnalyzer::Fake]->Fill(TrkDz);
-            TrkHitAll_alljets[BDHadronTrackMonitoringAnalyzer::Fake]->Fill(TrknHitAll);
-            TrkHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::Fake]->Fill(TrknHitPixel);
-            TrkHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::Fake]->Fill(TrknHitStrip);
-            // NO TRUTH FOR FAKES!!!
+      }
+      // Other
+      else if (theFlag[TrackCategories::SignalEvent] && !theFlag[TrackCategories::BWeakDecay] &&
+               !theFlag[TrackCategories::CWeakDecay]) {
+        nseltracksCat[BDHadronTrackMonitoringAnalyzer::Other] += 1;
+        TrkPt_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkPt);
+        TrkEta_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkEta);
+        TrkPhi_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkPhi);
+        TrkDxy_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkDxy);
+        TrkDz_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkDz);
+        TrkHitAll_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrknHitAll);
+        TrkHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrknHitPixel);
+        TrkHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrknHitStrip);
+        if (quality_tpr != 0) {
+          TrkTruthPt_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkTruthPt);
+          TrkTruthEta_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkTruthEta);
+          TrkTruthPhi_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkTruthPhi);
+          TrkTruthDxy_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkTruthDxy);
+          TrkTruthDz_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkTruthDz);
+          TrkTruthHitAll_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkTruthnHitAll);
+          TrkTruthHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkTruthnHitPixel);
+          TrkTruthHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::Other]->Fill(TrkTruthnHitStrip);
         }
-    
-    
-
+      }
+      // Fake
+      else if (!theFlag[TrackCategories::SignalEvent] && theFlag[TrackCategories::Fake]) {
+        nseltracksCat[BDHadronTrackMonitoringAnalyzer::Fake] += 1;
+        TrkPt_alljets[BDHadronTrackMonitoringAnalyzer::Fake]->Fill(TrkPt);
+        TrkEta_alljets[BDHadronTrackMonitoringAnalyzer::Fake]->Fill(TrkEta);
+        TrkPhi_alljets[BDHadronTrackMonitoringAnalyzer::Fake]->Fill(TrkPhi);
+        TrkDxy_alljets[BDHadronTrackMonitoringAnalyzer::Fake]->Fill(TrkDxy);
+        TrkDz_alljets[BDHadronTrackMonitoringAnalyzer::Fake]->Fill(TrkDz);
+        TrkHitAll_alljets[BDHadronTrackMonitoringAnalyzer::Fake]->Fill(TrknHitAll);
+        TrkHitPixel_alljets[BDHadronTrackMonitoringAnalyzer::Fake]->Fill(TrknHitPixel);
+        TrkHitStrip_alljets[BDHadronTrackMonitoringAnalyzer::Fake]->Fill(TrknHitStrip);
+        // NO TRUTH FOR FAKES!!!
+      }
     }
     // -------- END Loop Over (selected) Tracks ----------
     // Still have to fill some jet-flavour specific variables
-    if (flav == 5){
-        nTrkAll_bjet->Fill(nseltracks);
-        for (unsigned int i = 0; i < TrkHistCat.size(); i++){
-            nTrk_bjet[i]->Fill(nseltracksCat[i]);
-        }
+    if (flav == 5) {
+      nTrkAll_bjet->Fill(nseltracks);
+      for (unsigned int i = 0; i < TrkHistCat.size(); i++) {
+        nTrk_bjet[i]->Fill(nseltracksCat[i]);
+      }
+    } else if (flav == 4) {
+      nTrkAll_cjet->Fill(nseltracks);
+      for (unsigned int i = 0; i < TrkHistCat.size(); i++) {
+        nTrk_cjet[i]->Fill(nseltracksCat[i]);
+      }
+    } else {
+      nTrkAll_dusgjet->Fill(nseltracks);
+      for (unsigned int i = 0; i < TrkHistCat.size(); i++) {
+        nTrk_dusgjet[i]->Fill(nseltracksCat[i]);
+      }
     }
-    else if (flav == 4){
-        nTrkAll_cjet->Fill(nseltracks);
-        for (unsigned int i = 0; i < TrkHistCat.size(); i++){
-            nTrk_cjet[i]->Fill(nseltracksCat[i]);
-        }
-    }
-    else {
-        nTrkAll_dusgjet->Fill(nseltracks);
-        for (unsigned int i = 0; i < TrkHistCat.size(); i++){
-            nTrk_dusgjet[i]->Fill(nseltracksCat[i]);
-        }
-    }
-
   }
   // -------- END Loop Over Jets ----------
-  
-  if (!pvFound){delete pv;}
-
 
+  if (!pvFound) {
+    delete pv;
+  }
 }
 
-
-
-
-
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(BDHadronTrackMonitoringAnalyzer);
diff --git a/Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.h b/Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.h
index 2d01a495c7c01..67f8ad0f77523 100644
--- a/Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.h
+++ b/Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.h
@@ -1,21 +1,21 @@
 #ifndef BDHadronTrackMonitoringAnalyzer_H
 #define BDHadronTrackMonitoringAnalyzer_H
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Utilities/interface/InputTag.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
+#include "DataFormats/BTauReco/interface/TrackIPTagInfo.h"
 #include "DataFormats/PatCandidates/interface/Jet.h"
 #include "DataFormats/PatCandidates/interface/PackedCandidate.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
-#include "DataFormats/BTauReco/interface/TrackIPTagInfo.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
 
 #include "SimTracker/TrackHistory/interface/TrackCategories.h"
@@ -23,97 +23,104 @@
 #include "SimTracker/TrackerHitAssociation/interface/ClusterTPAssociation.h"
 
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h" 
 
 #include "DQMOffline/RecoB/interface/Tools.h"
 #include "DataFormats/GeometryVector/interface/GlobalVector.h"
-#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
+#include "RecoVertex/VertexPrimitives/interface/ConvertToFromReco.h"
+#include "TrackingTools/IPTools/interface/IPTools.h"
 #include "TrackingTools/Records/interface/TransientTrackRecord.h"
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
-#include "TrackingTools/IPTools/interface/IPTools.h"
-#include "RecoVertex/VertexPrimitives/interface/ConvertToFromReco.h"
+#include "TrackingTools/TransientTrack/interface/TransientTrackBuilder.h"
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 
 using namespace reco;
 using namespace edm;
 using namespace std;
 
-
-
 /** \class BDHadronTrackMonitoringAnalyzer
  *
- *  Top level steering routine for B + D hadron track monitoring tool from RECODEBUG samples.
+ *  Top level steering routine for B + D hadron track monitoring tool from
+ * RECODEBUG samples.
  *
  */
 
-
-
 class BDHadronTrackMonitoringAnalyzer : public DQMEDAnalyzer {
-   public:
-    explicit BDHadronTrackMonitoringAnalyzer(const edm::ParameterSet& pSet);
-
-    ~BDHadronTrackMonitoringAnalyzer() override;
-
-    void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override;
-    void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;     
-
-   
-    enum HistoryClasses{ BCWeakDecay=0, BWeakDecay=1, CWeakDecay=2, PU=3, Other=4, Fake=5};
-    static const std::vector<std::string> TrkHistCat;
-
-   private:
-
-    //cut values
-    double distJetAxis_;
-    double decayLength_;
-    double minJetPt_;
-    double maxJetEta_;
-
-    // strings
-    std::string ipTagInfos_;
-
-    // InputTags
-    edm::InputTag PatJetSrc_;
-    edm::InputTag TrackSrc_;
-    edm::InputTag PVSrc_;
-    edm::InputTag ClusterTPMapSrc_;
-
-    // Tokens
-    edm::EDGetTokenT<pat::JetCollection> PatJetCollectionTag_;
-    edm::EDGetTokenT<reco::TrackCollection> TrackCollectionTag_;
-    edm::EDGetTokenT<reco::VertexCollection> PrimaryVertexColl_;
-    edm::EDGetTokenT<ClusterTPAssociation> clusterTPMapToken_;
-
-    // TrackClassifier
-    TrackClassifier classifier_;
-
-
-    // Histograms
-    // b jets
-    MonitorElement *nTrkAll_bjet; // total number of selected tracks (or TrackingParticles)
-    MonitorElement *nTrk_bjet[6]; // total number of selected tracks (or TrackingParticles) in each TrackHistory category
-    // c jets
-    MonitorElement *nTrkAll_cjet; // total number of selected tracks (or TrackingParticles)
-    MonitorElement *nTrk_cjet[6]; // total number of selected tracks (or TrackingParticles) in each TrackHistory category
-    // dusg jets
-    MonitorElement *nTrkAll_dusgjet; // total number of selected tracks (or TrackingParticles)
-    MonitorElement *nTrk_dusgjet[6]; // total number of selected tracks (or TrackingParticles) in each TrackHistory category
-    
-    // track properties for all flavours combined
-    MonitorElement *TrkPt_alljets[6], *TrkTruthPt_alljets[5]; // Pt of selected tracks (or TrackingParticles)
-    MonitorElement *TrkEta_alljets[6], *TrkTruthEta_alljets[5]; // Eta of selected tracks (or TrackingParticles)
-    MonitorElement *TrkPhi_alljets[6], *TrkTruthPhi_alljets[5]; // Phi of selected tracks (or TrackingParticles)
-    MonitorElement *TrkDxy_alljets[6], *TrkTruthDxy_alljets[5]; // Transverse IP of selected tracks (or TrackingParticles)
-    MonitorElement *TrkDz_alljets[6], *TrkTruthDz_alljets[5]; // Longitudinal IP of selected tracks (or TrackingParticles)
-    MonitorElement *TrkHitAll_alljets[6], *TrkTruthHitAll_alljets[5]; // total number Tracker hits of selected tracks (or TrackingParticles)
-    MonitorElement *TrkHitStrip_alljets[6], *TrkTruthHitStrip_alljets[5]; // number of strip hits of of selected tracks (or TrackingParticles)
-    MonitorElement *TrkHitPixel_alljets[6], *TrkTruthHitPixel_alljets[5]; // number of pixel hits of selected tracks (or TrackingParticles)
-
-
+public:
+  explicit BDHadronTrackMonitoringAnalyzer(const edm::ParameterSet &pSet);
+
+  ~BDHadronTrackMonitoringAnalyzer() override;
+
+  void analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) override;
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
+
+  enum HistoryClasses { BCWeakDecay = 0, BWeakDecay = 1, CWeakDecay = 2, PU = 3, Other = 4, Fake = 5 };
+  static const std::vector<std::string> TrkHistCat;
+
+private:
+  // cut values
+  double distJetAxis_;
+  double decayLength_;
+  double minJetPt_;
+  double maxJetEta_;
+
+  // strings
+  std::string ipTagInfos_;
+
+  // InputTags
+  edm::InputTag PatJetSrc_;
+  edm::InputTag TrackSrc_;
+  edm::InputTag PVSrc_;
+  edm::InputTag ClusterTPMapSrc_;
+
+  // Tokens
+  edm::EDGetTokenT<pat::JetCollection> PatJetCollectionTag_;
+  edm::EDGetTokenT<reco::TrackCollection> TrackCollectionTag_;
+  edm::EDGetTokenT<reco::VertexCollection> PrimaryVertexColl_;
+  edm::EDGetTokenT<ClusterTPAssociation> clusterTPMapToken_;
+
+  // TrackClassifier
+  TrackClassifier classifier_;
+
+  // Histograms
+  // b jets
+  MonitorElement *nTrkAll_bjet;  // total number of selected tracks (or TrackingParticles)
+  MonitorElement *nTrk_bjet[6];  // total number of selected tracks (or TrackingParticles)
+                                 // in each TrackHistory category
+  // c jets
+  MonitorElement *nTrkAll_cjet;  // total number of selected tracks (or TrackingParticles)
+  MonitorElement *nTrk_cjet[6];  // total number of selected tracks (or TrackingParticles)
+                                 // in each TrackHistory category
+  // dusg jets
+  MonitorElement *nTrkAll_dusgjet;  // total number of selected tracks (or TrackingParticles)
+  MonitorElement *nTrk_dusgjet[6];  // total number of selected tracks (or
+                                    // TrackingParticles) in each TrackHistory category
+
+  // track properties for all flavours combined
+  MonitorElement *TrkPt_alljets[6],
+      *TrkTruthPt_alljets[5];  // Pt of selected tracks (or TrackingParticles)
+  MonitorElement *TrkEta_alljets[6],
+      *TrkTruthEta_alljets[5];  // Eta of selected tracks (or TrackingParticles)
+  MonitorElement *TrkPhi_alljets[6],
+      *TrkTruthPhi_alljets[5];  // Phi of selected tracks (or TrackingParticles)
+  MonitorElement *TrkDxy_alljets[6],
+      *TrkTruthDxy_alljets[5];  // Transverse IP of selected tracks (or
+                                // TrackingParticles)
+  MonitorElement *TrkDz_alljets[6],
+      *TrkTruthDz_alljets[5];  // Longitudinal IP of selected tracks (or
+                               // TrackingParticles)
+  MonitorElement *TrkHitAll_alljets[6],
+      *TrkTruthHitAll_alljets[5];  // total number Tracker hits of selected
+                                   // tracks (or TrackingParticles)
+  MonitorElement *TrkHitStrip_alljets[6],
+      *TrkTruthHitStrip_alljets[5];  // number of strip hits of of selected
+                                     // tracks (or TrackingParticles)
+  MonitorElement *TrkHitPixel_alljets[6],
+      *TrkTruthHitPixel_alljets[5];  // number of pixel hits of selected tracks
+                                     // (or TrackingParticles)
 };
 
-
 #endif
diff --git a/Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.cc b/Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.cc
index c3c5510245da0..f35b1f70ec5fc 100644
--- a/Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.cc
+++ b/Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.cc
@@ -1,213 +1,196 @@
 #include "Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.h"
 
 // intialize category map
-//std::map<unsigned int, std::string> BDHadronTrackMonitoringAnalyzer::TrkHistCat(map_start_values, map_start_values + map_start_values_size);
-
-
-//typedef std::map<unsigned int, std::string>::iterator it_type;
-
-BDHadronTrackMonitoringHarvester::BDHadronTrackMonitoringHarvester(const edm::ParameterSet& pSet) 
-{
-}
-
-
-BDHadronTrackMonitoringHarvester::~BDHadronTrackMonitoringHarvester()
-{
-}
-
-void BDHadronTrackMonitoringHarvester::beginJob()
-{
+// std::map<unsigned int, std::string>
+// BDHadronTrackMonitoringAnalyzer::TrkHistCat(map_start_values,
+// map_start_values
+// + map_start_values_size);
+
+// typedef std::map<unsigned int, std::string>::iterator it_type;
+
+BDHadronTrackMonitoringHarvester::BDHadronTrackMonitoringHarvester(const edm::ParameterSet &pSet) {}
+
+BDHadronTrackMonitoringHarvester::~BDHadronTrackMonitoringHarvester() {}
+
+void BDHadronTrackMonitoringHarvester::beginJob() {}
+
+void BDHadronTrackMonitoringHarvester::dqmEndJob(DQMStore::IBooker &ibook, DQMStore::IGetter &iget) {
+  // ***********************
+  //
+  // Book all new histograms.
+  //
+  // ***********************
+  RecoBTag::setTDRStyle();
+  ibook.setCurrentFolder("BDHadronTracks/JetContent");
+
+  // b jets
+  // absolute average number of tracks
+  nTrk_absolute_bjet = ibook.book1D("nTrk_absolute_bjet", "absolute average number of tracks in b jets", 6, -0.5, 5.5);
+  for (unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
+    nTrk_absolute_bjet->setBinLabel(i + 1, BDHadronTrackMonitoringAnalyzer::TrkHistCat[i], 1);
+  }
+  nTrk_absolute_bjet->setAxisRange(0, 5, 2);
+  nTrk_absolute_bjet->setAxisTitle("average number of tracks", 2);
+
+  // relative (in percent) average number of tracks
+  nTrk_relative_bjet = ibook.book1D("nTrk_relative_bjet", "relative average number of tracks in b jets", 6, -0.5, 5.5);
+  for (unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
+    nTrk_relative_bjet->setBinLabel(i + 1, BDHadronTrackMonitoringAnalyzer::TrkHistCat[i], 1);
+  }
+  nTrk_relative_bjet->setAxisRange(0, 1, 2);
+  nTrk_relative_bjet->setAxisTitle("average fraction of tracks", 2);
+
+  // standard deviation of number of tracks
+  nTrk_std_bjet = ibook.book1D("nTrk_std_bjet", "RMS of number of tracks in b jets", 6, -0.5, 5.5);
+  for (unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
+    nTrk_std_bjet->setBinLabel(i + 1, BDHadronTrackMonitoringAnalyzer::TrkHistCat[i], 1);
+  }
+  nTrk_std_bjet->setAxisRange(0, 3, 2);
+  nTrk_std_bjet->setAxisTitle("RMS of number of tracks", 2);
+
+  // c jets
+  nTrk_absolute_cjet = ibook.book1D("nTrk_absolute_cjet", "absolute average number of tracks in c jets", 6, -0.5, 5.5);
+  for (unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
+    nTrk_absolute_cjet->setBinLabel(i + 1, BDHadronTrackMonitoringAnalyzer::TrkHistCat[i], 1);
+  }
+  nTrk_absolute_cjet->setAxisRange(0, 5, 2);
+  nTrk_absolute_cjet->setAxisTitle("average number of tracks", 2);
+
+  nTrk_relative_cjet = ibook.book1D("nTrk_relative_cjet", "relative average number of tracks in c jets", 6, -0.5, 5.5);
+  for (unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
+    nTrk_relative_cjet->setBinLabel(i + 1, BDHadronTrackMonitoringAnalyzer::TrkHistCat[i], 1);
+  }
+  nTrk_relative_cjet->setAxisRange(0, 1, 2);
+  nTrk_relative_cjet->setAxisTitle("average fraction of tracks", 2);
+
+  nTrk_std_cjet = ibook.book1D("nTrk_std_cjet", "RMS of number of tracks in c jets", 6, -0.5, 5.5);
+  for (unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
+    nTrk_std_cjet->setBinLabel(i + 1, BDHadronTrackMonitoringAnalyzer::TrkHistCat[i], 1);
+  }
+  nTrk_std_cjet->setAxisRange(0, 3, 2);
+  nTrk_std_cjet->setAxisTitle("RMS of number of tracks", 2);
+
+  // udsg jets
+  nTrk_absolute_dusgjet =
+      ibook.book1D("nTrk_absolute_dusgjet", "absolute average number of tracks in dusg jets", 6, -0.5, 5.5);
+  for (unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
+    nTrk_absolute_dusgjet->setBinLabel(i + 1, BDHadronTrackMonitoringAnalyzer::TrkHistCat[i], 1);
+  }
+  nTrk_absolute_dusgjet->setAxisRange(0, 5, 2);
+  nTrk_absolute_dusgjet->setAxisTitle("average number of tracks", 2);
+
+  nTrk_relative_dusgjet =
+      ibook.book1D("nTrk_relative_dusgjet", "relative average number of tracks in dusg jets", 6, -0.5, 5.5);
+  for (unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
+    nTrk_relative_dusgjet->setBinLabel(i + 1, BDHadronTrackMonitoringAnalyzer::TrkHistCat[i], 1);
+  }
+  nTrk_relative_dusgjet->setAxisRange(0, 1, 2);
+  nTrk_relative_dusgjet->setAxisTitle("average fraction of tracks", 2);
+
+  nTrk_std_dusgjet = ibook.book1D("nTrk_std_dusgjet", "RMS of number of tracks in dusg jets", 6, -0.5, 5.5);
+  for (unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
+    nTrk_std_dusgjet->setBinLabel(i + 1, BDHadronTrackMonitoringAnalyzer::TrkHistCat[i], 1);
+  }
+  nTrk_std_dusgjet->setAxisRange(0, 3, 2);
+  nTrk_std_dusgjet->setAxisTitle("RMS of number of tracks", 2);
+
+  // ***********************
+  //
+  // get all the old histograms
+  //
+  // ***********************
+
+  // b jets
+  MonitorElement *nTrk_bjet[6];
+  for (unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
+    nTrk_bjet[i] = iget.get("BDHadronTracks/JetContent/nTrk_bjet_" + BDHadronTrackMonitoringAnalyzer::TrkHistCat[i]);
+  }
+  MonitorElement *nTrkAll_bjet = iget.get("BDHadronTracks/JetContent/nTrkAll_bjet");
+
+  // c jets
+  MonitorElement *nTrk_cjet[6];
+  for (unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
+    nTrk_cjet[i] = iget.get("BDHadronTracks/JetContent/nTrk_cjet_" + BDHadronTrackMonitoringAnalyzer::TrkHistCat[i]);
+  }
+  MonitorElement *nTrkAll_cjet = iget.get("BDHadronTracks/JetContent/nTrkAll_cjet");
+
+  // dusg jets
+  MonitorElement *nTrk_dusgjet[6];
+  for (unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
+    nTrk_dusgjet[i] =
+        iget.get("BDHadronTracks/JetContent/nTrk_dusgjet_" + BDHadronTrackMonitoringAnalyzer::TrkHistCat[i]);
+  }
+  MonitorElement *nTrkAll_dusgjet = iget.get("BDHadronTracks/JetContent/nTrkAll_dusgjet");
+
+  // ***********************
+  //
+  // Calculate contents of new histograms
+  //
+  // ***********************
+
+  // b jets
+  float mean_bjets[6];
+  float std_bjets[6];
+  float meanAll_bjets;
+  meanAll_bjets = std::max(0.01, nTrkAll_bjet->getMean(1));
+  for (unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
+    mean_bjets[i] = nTrk_bjet[i]->getMean(1);  // mean number of tracks per category
+    std_bjets[i] = nTrk_bjet[i]->getRMS(1);
+    nTrk_absolute_bjet->setBinContent(i + 1, mean_bjets[i]);
+    nTrk_relative_bjet->setBinContent(i + 1, mean_bjets[i] / meanAll_bjets);
+    nTrk_std_bjet->setBinContent(i + 1, std_bjets[i]);
+  }
+
+  // c jets
+  float mean_cjets[6];
+  float std_cjets[6];
+  float meanAll_cjets;
+  meanAll_cjets = std::max(0.01, nTrkAll_cjet->getMean(1));
+  for (unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
+    mean_cjets[i] = nTrk_cjet[i]->getMean(1);  // mean number of tracks per category
+    std_cjets[i] = nTrk_cjet[i]->getRMS(1);
+    nTrk_absolute_cjet->setBinContent(i + 1, mean_cjets[i]);
+    nTrk_relative_cjet->setBinContent(i + 1, mean_cjets[i] / meanAll_cjets);
+    nTrk_std_cjet->setBinContent(i + 1, std_cjets[i]);
+  }
+
+  // dusg jets
+  float mean_dusgjets[6];
+  float std_dusgjets[6];
+  float meanAll_dusgjets;
+  meanAll_dusgjets = std::max(0.01, nTrkAll_dusgjet->getMean(1));
+  for (unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
+    mean_dusgjets[i] = nTrk_dusgjet[i]->getMean(1);  // mean number of tracks per category
+    std_dusgjets[i] = nTrk_dusgjet[i]->getRMS(1);
+    nTrk_absolute_dusgjet->setBinContent(i + 1, mean_dusgjets[i]);
+    nTrk_relative_dusgjet->setBinContent(i + 1, mean_dusgjets[i] / meanAll_dusgjets);
+    nTrk_std_dusgjet->setBinContent(i + 1, std_dusgjets[i]);
+  }
+
+  // ***********************
+  //
+  // Remove histograms with nTracks that we do not want to show
+  //
+  // ***********************
+
+  // b jets
+  for (unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
+    iget.removeElement("nTrk_bjet_" + BDHadronTrackMonitoringAnalyzer::TrkHistCat[i]);
+  }
+  iget.removeElement("nTrkAll_bjet");
+
+  // c jets
+  for (unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
+    iget.removeElement("nTrk_cjet_" + BDHadronTrackMonitoringAnalyzer::TrkHistCat[i]);
+  }
+  iget.removeElement("nTrkAll_cjet");
+
+  // dusg jets
+  for (unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
+    iget.removeElement("nTrk_dusgjet_" + BDHadronTrackMonitoringAnalyzer::TrkHistCat[i]);
+  }
+  iget.removeElement("nTrkAll_dusgjet");
 }
 
-void BDHadronTrackMonitoringHarvester::dqmEndJob(DQMStore::IBooker & ibook, DQMStore::IGetter & iget)
-{
-    // ***********************
-    //
-    // Book all new histograms.
-    //
-    // ***********************
-    RecoBTag::setTDRStyle();
-    ibook.setCurrentFolder("BDHadronTracks/JetContent");
-
-    // b jets
-    // absolute average number of tracks
-    nTrk_absolute_bjet = ibook.book1D("nTrk_absolute_bjet","absolute average number of tracks in b jets",6,-0.5,5.5);
-    for(unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
-        nTrk_absolute_bjet->setBinLabel(i+1,BDHadronTrackMonitoringAnalyzer::TrkHistCat[i],1);
-    }
-    nTrk_absolute_bjet->setAxisRange(0, 5, 2);
-    nTrk_absolute_bjet->setAxisTitle("average number of tracks",2);
-
-    // relative (in percent) average number of tracks
-    nTrk_relative_bjet = ibook.book1D("nTrk_relative_bjet","relative average number of tracks in b jets",6,-0.5,5.5);
-    for(unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
-        nTrk_relative_bjet->setBinLabel(i+1,BDHadronTrackMonitoringAnalyzer::TrkHistCat[i],1);
-    }
-    nTrk_relative_bjet->setAxisRange(0, 1, 2);
-    nTrk_relative_bjet->setAxisTitle("average fraction of tracks",2);
-
-    // standard deviation of number of tracks
-    nTrk_std_bjet = ibook.book1D("nTrk_std_bjet","RMS of number of tracks in b jets",6,-0.5,5.5);
-    for(unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
-        nTrk_std_bjet->setBinLabel(i+1,BDHadronTrackMonitoringAnalyzer::TrkHistCat[i],1);
-    }
-    nTrk_std_bjet->setAxisRange(0, 3, 2);
-    nTrk_std_bjet->setAxisTitle("RMS of number of tracks",2);
-
-
-
-
-    // c jets
-    nTrk_absolute_cjet = ibook.book1D("nTrk_absolute_cjet","absolute average number of tracks in c jets",6,-0.5,5.5);
-    for(unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
-        nTrk_absolute_cjet->setBinLabel(i+1,BDHadronTrackMonitoringAnalyzer::TrkHistCat[i],1);
-    }
-    nTrk_absolute_cjet->setAxisRange(0, 5, 2);
-    nTrk_absolute_cjet->setAxisTitle("average number of tracks",2);
-
-    nTrk_relative_cjet = ibook.book1D("nTrk_relative_cjet","relative average number of tracks in c jets",6,-0.5,5.5);
-    for(unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
-        nTrk_relative_cjet->setBinLabel(i+1,BDHadronTrackMonitoringAnalyzer::TrkHistCat[i],1);
-    }
-    nTrk_relative_cjet->setAxisRange(0, 1, 2);
-    nTrk_relative_cjet->setAxisTitle("average fraction of tracks",2);
-
-    nTrk_std_cjet = ibook.book1D("nTrk_std_cjet","RMS of number of tracks in c jets",6,-0.5,5.5);
-    for(unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
-        nTrk_std_cjet->setBinLabel(i+1,BDHadronTrackMonitoringAnalyzer::TrkHistCat[i],1);
-    }
-    nTrk_std_cjet->setAxisRange(0, 3, 2);
-    nTrk_std_cjet->setAxisTitle("RMS of number of tracks",2);
-
-
-
-    // udsg jets
-    nTrk_absolute_dusgjet = ibook.book1D("nTrk_absolute_dusgjet","absolute average number of tracks in dusg jets",6,-0.5,5.5);
-    for(unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
-        nTrk_absolute_dusgjet->setBinLabel(i+1,BDHadronTrackMonitoringAnalyzer::TrkHistCat[i],1);
-    }
-    nTrk_absolute_dusgjet->setAxisRange(0, 5, 2);
-    nTrk_absolute_dusgjet->setAxisTitle("average number of tracks",2);
-
-    nTrk_relative_dusgjet = ibook.book1D("nTrk_relative_dusgjet","relative average number of tracks in dusg jets",6,-0.5,5.5);
-    for(unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
-        nTrk_relative_dusgjet->setBinLabel(i+1,BDHadronTrackMonitoringAnalyzer::TrkHistCat[i],1);
-    }
-    nTrk_relative_dusgjet->setAxisRange(0, 1, 2);
-    nTrk_relative_dusgjet->setAxisTitle("average fraction of tracks",2);
-
-    nTrk_std_dusgjet = ibook.book1D("nTrk_std_dusgjet","RMS of number of tracks in dusg jets",6,-0.5,5.5);
-    for(unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
-        nTrk_std_dusgjet->setBinLabel(i+1,BDHadronTrackMonitoringAnalyzer::TrkHistCat[i],1);
-    }
-    nTrk_std_dusgjet->setAxisRange(0, 3, 2);
-    nTrk_std_dusgjet->setAxisTitle("RMS of number of tracks",2);
-
-
-    // ***********************
-    //
-    // get all the old histograms
-    //
-    // ***********************
-    
-    // b jets
-    MonitorElement *nTrk_bjet[6];
-    for(unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
-        nTrk_bjet[i] = iget.get("BDHadronTracks/JetContent/nTrk_bjet_"+BDHadronTrackMonitoringAnalyzer::TrkHistCat[i]);
-    }
-    MonitorElement *nTrkAll_bjet = iget.get("BDHadronTracks/JetContent/nTrkAll_bjet");
-    
-    // c jets
-    MonitorElement *nTrk_cjet[6];
-    for(unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
-        nTrk_cjet[i] = iget.get("BDHadronTracks/JetContent/nTrk_cjet_"+BDHadronTrackMonitoringAnalyzer::TrkHistCat[i]);
-    }
-    MonitorElement *nTrkAll_cjet = iget.get("BDHadronTracks/JetContent/nTrkAll_cjet");
-
-    // dusg jets
-    MonitorElement *nTrk_dusgjet[6];
-    for(unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
-        nTrk_dusgjet[i] = iget.get("BDHadronTracks/JetContent/nTrk_dusgjet_"+BDHadronTrackMonitoringAnalyzer::TrkHistCat[i]);
-    }
-    MonitorElement *nTrkAll_dusgjet = iget.get("BDHadronTracks/JetContent/nTrkAll_dusgjet");
-
-
-
-    // ***********************
-    //
-    // Calculate contents of new histograms
-    //
-    // ***********************
-
-    // b jets
-    float mean_bjets[6];
-    float std_bjets[6];
-    float meanAll_bjets;
-    meanAll_bjets = std::max(0.01,nTrkAll_bjet->getMean(1));
-    for (unsigned int i = 0; i< BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++){
-        mean_bjets[i] = nTrk_bjet[i]->getMean(1); // mean number of tracks per category
-        std_bjets[i] = nTrk_bjet[i]->getRMS(1);
-        nTrk_absolute_bjet->setBinContent(i+1,mean_bjets[i]);
-        nTrk_relative_bjet->setBinContent(i+1,mean_bjets[i]/meanAll_bjets);
-        nTrk_std_bjet->setBinContent(i+1,std_bjets[i]);
-    }
-
-    // c jets
-    float mean_cjets[6];
-    float std_cjets[6];
-    float meanAll_cjets;
-    meanAll_cjets = std::max(0.01,nTrkAll_cjet->getMean(1));
-    for (unsigned int i = 0; i< BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++){
-        mean_cjets[i] = nTrk_cjet[i]->getMean(1); // mean number of tracks per category
-        std_cjets[i] = nTrk_cjet[i]->getRMS(1);
-        nTrk_absolute_cjet->setBinContent(i+1,mean_cjets[i]);
-        nTrk_relative_cjet->setBinContent(i+1,mean_cjets[i]/meanAll_cjets);
-        nTrk_std_cjet->setBinContent(i+1,std_cjets[i]);
-    }
-
-
-    // dusg jets
-    float mean_dusgjets[6];
-    float std_dusgjets[6];
-    float meanAll_dusgjets;
-    meanAll_dusgjets = std::max(0.01,nTrkAll_dusgjet->getMean(1));
-    for (unsigned int i = 0; i< BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++){
-        mean_dusgjets[i] = nTrk_dusgjet[i]->getMean(1); // mean number of tracks per category
-        std_dusgjets[i] = nTrk_dusgjet[i]->getRMS(1);
-        nTrk_absolute_dusgjet->setBinContent(i+1,mean_dusgjets[i]);
-        nTrk_relative_dusgjet->setBinContent(i+1,mean_dusgjets[i]/meanAll_dusgjets);
-        nTrk_std_dusgjet->setBinContent(i+1,std_dusgjets[i]);
-    }
-
-
-    // ***********************
-    //
-    // Remove histograms with nTracks that we do not want to show
-    //
-    // ***********************
-
-    // b jets
-    for(unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
-        iget.removeElement("nTrk_bjet_"+BDHadronTrackMonitoringAnalyzer::TrkHistCat[i]);
-    }
-    iget.removeElement("nTrkAll_bjet");
-
-    // c jets
-    for(unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
-        iget.removeElement("nTrk_cjet_"+BDHadronTrackMonitoringAnalyzer::TrkHistCat[i]);
-    }
-    iget.removeElement("nTrkAll_cjet");
-
-    // dusg jets
-    for(unsigned int i = 0; i < BDHadronTrackMonitoringAnalyzer::TrkHistCat.size(); i++) {
-        iget.removeElement("nTrk_dusgjet_"+BDHadronTrackMonitoringAnalyzer::TrkHistCat[i]);
-    }
-    iget.removeElement("nTrkAll_dusgjet");
-
-
-
-}
-
-
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(BDHadronTrackMonitoringHarvester);
diff --git a/Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.h b/Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.h
index dd60473af9ff4..37869913bf9b3 100644
--- a/Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.h
+++ b/Validation/RecoB/plugins/BDHadronTrackMonitoringHarvester.h
@@ -1,15 +1,15 @@
 #ifndef BDHadronTrackMonitoringHarvester_H
 #define BDHadronTrackMonitoringHarvester_H
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
-#include "Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.h"
-#include "FWCore/Utilities/interface/InputTag.h"
-#include "DQMOffline/RecoB/interface/Tools.h"
 #include "DQMOffline/RecoB/interface/TagInfoPlotterFactory.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "DQMOffline/RecoB/interface/Tools.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/Utilities/interface/InputTag.h"
+#include "Validation/RecoB/plugins/BDHadronTrackMonitoringAnalyzer.h"
 
 using namespace edm;
 using namespace std;
@@ -22,27 +22,29 @@ using namespace RecoBTag;
  */
 
 class BDHadronTrackMonitoringHarvester : public DQMEDHarvester {
-    public:
-        explicit BDHadronTrackMonitoringHarvester(const edm::ParameterSet& pSet);
-        ~BDHadronTrackMonitoringHarvester() override;
-
-    private:
-        void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
-        void beginJob() override;
-
-
-        // Histograms
-        // b jets
-        MonitorElement *nTrk_absolute_bjet, *nTrk_relative_bjet, *nTrk_std_bjet; // number of selected tracks (absolute or in percents) in different track history categories for b jets
-
-        // c jets
-        MonitorElement *nTrk_absolute_cjet, *nTrk_relative_cjet, *nTrk_std_cjet; // number of selected tracks (absolute or in percents) in different track history categories for c jets
-
-
-        // dusg jets
-        MonitorElement *nTrk_absolute_dusgjet, *nTrk_relative_dusgjet, *nTrk_std_dusgjet; // number of selected tracks (absolute or in percents) in different track history categories for light jets
-
-
+public:
+  explicit BDHadronTrackMonitoringHarvester(const edm::ParameterSet &pSet);
+  ~BDHadronTrackMonitoringHarvester() override;
+
+private:
+  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
+  void beginJob() override;
+
+  // Histograms
+  // b jets
+  MonitorElement *nTrk_absolute_bjet, *nTrk_relative_bjet,
+      *nTrk_std_bjet;  // number of selected tracks (absolute or in percents) in
+                       // different track history categories for b jets
+
+  // c jets
+  MonitorElement *nTrk_absolute_cjet, *nTrk_relative_cjet,
+      *nTrk_std_cjet;  // number of selected tracks (absolute or in percents) in
+                       // different track history categories for c jets
+
+  // dusg jets
+  MonitorElement *nTrk_absolute_dusgjet, *nTrk_relative_dusgjet,
+      *nTrk_std_dusgjet;  // number of selected tracks (absolute or in percents)
+                          // in different track history categories for light jets
 };
 
 #endif
diff --git a/Validation/RecoB/plugins/BTagPerformanceAnalyzerMC.cc b/Validation/RecoB/plugins/BTagPerformanceAnalyzerMC.cc
index 73f337d2941fe..ee854fd196a2b 100644
--- a/Validation/RecoB/plugins/BTagPerformanceAnalyzerMC.cc
+++ b/Validation/RecoB/plugins/BTagPerformanceAnalyzerMC.cc
@@ -1,7 +1,7 @@
-#include "Validation/RecoB/plugins/BTagPerformanceAnalyzerMC.h"
+#include "DQMOffline/RecoB/interface/TagInfoPlotterFactory.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Framework/interface/makeRefToBaseProdFrom.h"
-#include "DQMOffline/RecoB/interface/TagInfoPlotterFactory.h"
+#include "Validation/RecoB/plugins/BTagPerformanceAnalyzerMC.h"
 
 using namespace reco;
 using namespace edm;
@@ -10,91 +10,106 @@ using namespace RecoBTag;
 
 typedef std::pair<Jet, reco::JetFlavourInfo> JetWithFlavour;
 
-BTagPerformanceAnalyzerMC::BTagPerformanceAnalyzerMC(const edm::ParameterSet& pSet) :
-  jetSelector(
-    pSet.getParameter<double>("etaMin"),
-    pSet.getParameter<double>("etaMax"),
-    pSet.getParameter<double>("ptRecJetMin"),
-    pSet.getParameter<double>("ptRecJetMax"),
-    0.0, 99999.0,
-    pSet.getParameter<double>("ratioMin"),
-    pSet.getParameter<double>("ratioMax"),
-    pSet.getParameter<bool>( "doJetID" )
-  ),
-  etaRanges(pSet.getParameter< vector<double> >("etaRanges")),
-  ptRanges(pSet.getParameter< vector<double> >("ptRanges")),
-  useOldFlavourTool(pSet.getParameter<bool>("useOldFlavourTool")),
-  doJEC(pSet.getParameter<bool>( "doJEC" )),
-  ptHatWeight(pSet.getParameter<bool>("applyPtHatWeight")),
-  moduleConfig(pSet.getParameter< vector<edm::ParameterSet> >("tagConfig")),
-  flavPlots_(pSet.getParameter<std::string>("flavPlots")),
-  jetMatcher(pSet.getParameter<edm::ParameterSet>("recJetMatching")),
-  doPUid(pSet.getParameter<bool>("doPUid"))
-{
-  //mcPlots_ : 1=b+c+l+ni; 2=all+1; 3=1+d+u+s+g; 4=3+all . Default is 2. Don't use 0.
+BTagPerformanceAnalyzerMC::BTagPerformanceAnalyzerMC(const edm::ParameterSet &pSet)
+    : jetSelector(pSet.getParameter<double>("etaMin"),
+                  pSet.getParameter<double>("etaMax"),
+                  pSet.getParameter<double>("ptRecJetMin"),
+                  pSet.getParameter<double>("ptRecJetMax"),
+                  0.0,
+                  99999.0,
+                  pSet.getParameter<double>("ratioMin"),
+                  pSet.getParameter<double>("ratioMax"),
+                  pSet.getParameter<bool>("doJetID")),
+      etaRanges(pSet.getParameter<vector<double>>("etaRanges")),
+      ptRanges(pSet.getParameter<vector<double>>("ptRanges")),
+      useOldFlavourTool(pSet.getParameter<bool>("useOldFlavourTool")),
+      doJEC(pSet.getParameter<bool>("doJEC")),
+      ptHatWeight(pSet.getParameter<bool>("applyPtHatWeight")),
+      moduleConfig(pSet.getParameter<vector<edm::ParameterSet>>("tagConfig")),
+      flavPlots_(pSet.getParameter<std::string>("flavPlots")),
+      jetMatcher(pSet.getParameter<edm::ParameterSet>("recJetMatching")),
+      doPUid(pSet.getParameter<bool>("doPUid")) {
+  // mcPlots_ : 1=b+c+l+ni; 2=all+1; 3=1+d+u+s+g; 4=3+all . Default is 2. Don't
+  // use 0.
   if (flavPlots_.find("dusg") < 15) {
-    if(flavPlots_.find("all") < 15) mcPlots_ = 4;
-    else mcPlots_ = 3;
+    if (flavPlots_.find("all") < 15)
+      mcPlots_ = 4;
+    else
+      mcPlots_ = 3;
   } else {
-    if(flavPlots_.find("all") < 15) mcPlots_ = 2;
-    else mcPlots_ = 1;
+    if (flavPlots_.find("all") < 15)
+      mcPlots_ = 2;
+    else
+      mcPlots_ = 1;
   }
   double ptRecJetMin = pSet.getParameter<double>("ptRecJetMin");
   jetMatcher.setThreshold(0.25 * ptRecJetMin);
-  switch(pSet.getParameter<unsigned int>("leptonPlots")) {
-    case 11: electronPlots = true; muonPlots = false; tauPlots = false; break;
-    case 13: muonPlots = true; electronPlots = false; tauPlots = false; break;
-    case 15: tauPlots = true; electronPlots = false; tauPlots = false; break;
-    default: electronPlots = false; muonPlots = false; tauPlots = false;
+  switch (pSet.getParameter<unsigned int>("leptonPlots")) {
+    case 11:
+      electronPlots = true;
+      muonPlots = false;
+      tauPlots = false;
+      break;
+    case 13:
+      muonPlots = true;
+      electronPlots = false;
+      tauPlots = false;
+      break;
+    case 15:
+      tauPlots = true;
+      electronPlots = false;
+      tauPlots = false;
+      break;
+    default:
+      electronPlots = false;
+      muonPlots = false;
+      tauPlots = false;
   }
 
   if (etaRanges.size() <= 1)
-      etaRanges = { pSet.getParameter<double>("etaMin"), pSet.getParameter<double>("etaMax") };
+    etaRanges = {pSet.getParameter<double>("etaMin"), pSet.getParameter<double>("etaMax")};
   if (ptRanges.size() <= 1)
-      ptRanges = { pSet.getParameter<double>("ptRecJetMin"), pSet.getParameter<double>("ptRecJetMax") };
-  
+    ptRanges = {pSet.getParameter<double>("ptRecJetMin"), pSet.getParameter<double>("ptRecJetMax")};
+
   genToken = mayConsume<GenEventInfoProduct>(edm::InputTag("generator"));
-  genJetsMatchedToken = mayConsume<edm::Association<reco::GenJetCollection>>(pSet.getParameter<InputTag>("genJetsMatched"));
+  genJetsMatchedToken =
+      mayConsume<edm::Association<reco::GenJetCollection>>(pSet.getParameter<InputTag>("genJetsMatched"));
   jetToken = consumes<JetFlavourInfoMatchingCollection>(pSet.getParameter<InputTag>("jetMCSrc"));
   caloJetToken = mayConsume<JetFlavourMatchingCollection>(pSet.getParameter<InputTag>("caloJetMCSrc"));
   slInfoToken = consumes<SoftLeptonTagInfoCollection>(pSet.getParameter<InputTag>("softLeptonInfo"));
-  jecMCToken = consumes<JetCorrector>(pSet.getParameter<edm::InputTag>( "JECsourceMC" ));
-  jecDataToken = mayConsume<JetCorrector>(pSet.getParameter<edm::InputTag>( "JECsourceData" ));
-  
-  for (vector<edm::ParameterSet>::const_iterator iModule = moduleConfig.begin();
-       iModule != moduleConfig.end(); ++iModule) {
-
-    const string& dataFormatType = iModule->exists("type") ?
-                                   iModule->getParameter<string>("type") :
-                                   "JetTag";
+  jecMCToken = consumes<JetCorrector>(pSet.getParameter<edm::InputTag>("JECsourceMC"));
+  jecDataToken = mayConsume<JetCorrector>(pSet.getParameter<edm::InputTag>("JECsourceData"));
+
+  for (vector<edm::ParameterSet>::const_iterator iModule = moduleConfig.begin(); iModule != moduleConfig.end();
+       ++iModule) {
+    const string &dataFormatType = iModule->exists("type") ? iModule->getParameter<string>("type") : "JetTag";
     if (dataFormatType == "JetTag") {
-      const InputTag& moduleLabel = iModule->getParameter<InputTag>("label");
+      const InputTag &moduleLabel = iModule->getParameter<InputTag>("label");
       jetTagInputTags.push_back(moduleLabel);
-      binJetTagPlotters.push_back(vector<std::unique_ptr<JetTagPlotter>>()) ;
-      jetTagToken.push_back(consumes<JetTagCollection>(moduleLabel)); 
-    } 
-    else if(dataFormatType == "TagCorrelation") {
-      const InputTag& label1 = iModule->getParameter<InputTag>("label1");
-      const InputTag& label2 = iModule->getParameter<InputTag>("label2");
+      binJetTagPlotters.push_back(vector<std::unique_ptr<JetTagPlotter>>());
+      jetTagToken.push_back(consumes<JetTagCollection>(moduleLabel));
+    } else if (dataFormatType == "TagCorrelation") {
+      const InputTag &label1 = iModule->getParameter<InputTag>("label1");
+      const InputTag &label2 = iModule->getParameter<InputTag>("label2");
       tagCorrelationInputTags.push_back(std::pair<edm::InputTag, edm::InputTag>(label1, label2));
       binTagCorrelationPlotters.push_back(vector<std::unique_ptr<TagCorrelationPlotter>>());
-      tagCorrelationToken.push_back(std::pair< edm::EDGetTokenT<reco::JetTagCollection>, edm::EDGetTokenT<reco::JetTagCollection> >(consumes<JetTagCollection>(label1), consumes<JetTagCollection>(label2)));
-    }
-    else {
+      tagCorrelationToken.push_back(
+          std::pair<edm::EDGetTokenT<reco::JetTagCollection>, edm::EDGetTokenT<reco::JetTagCollection>>(
+              consumes<JetTagCollection>(label1), consumes<JetTagCollection>(label2)));
+    } else {
       vector<edm::InputTag> vIP;
       tiDataFormatType.push_back(dataFormatType);
-      binTagInfoPlotters.push_back(vector<std::unique_ptr<BaseTagInfoPlotter>>()) ;
-      std::vector< edm::EDGetTokenT<edm::View<reco::BaseTagInfo>> > tokens; 
-      if(dataFormatType == "GenericMVA") {
-        const std::vector<InputTag> listInfo = iModule->getParameter<vector<InputTag>>("listTagInfos"); 
-        for(unsigned int ITi=0; ITi<listInfo.size(); ITi++){ 
-          tokens.push_back(consumes< View<BaseTagInfo> >(listInfo[ITi]));
+      binTagInfoPlotters.push_back(vector<std::unique_ptr<BaseTagInfoPlotter>>());
+      std::vector<edm::EDGetTokenT<edm::View<reco::BaseTagInfo>>> tokens;
+      if (dataFormatType == "GenericMVA") {
+        const std::vector<InputTag> listInfo = iModule->getParameter<vector<InputTag>>("listTagInfos");
+        for (unsigned int ITi = 0; ITi < listInfo.size(); ITi++) {
+          tokens.push_back(consumes<View<BaseTagInfo>>(listInfo[ITi]));
           vIP.push_back(listInfo[ITi]);
         }
-      }
-      else {
-        const InputTag& moduleLabel = iModule->getParameter<InputTag>("label");
-        tokens.push_back(consumes< View<BaseTagInfo> >(moduleLabel));
+      } else {
+        const InputTag &moduleLabel = iModule->getParameter<InputTag>("label");
+        tokens.push_back(consumes<View<BaseTagInfo>>(moduleLabel));
         vIP.push_back(moduleLabel);
       }
       tagInfoToken.push_back(tokens);
@@ -103,166 +118,180 @@ BTagPerformanceAnalyzerMC::BTagPerformanceAnalyzerMC(const edm::ParameterSet& pS
   }
 }
 
-void BTagPerformanceAnalyzerMC::bookHistograms(DQMStore::IBooker & ibook, edm::Run const & run, edm::EventSetup const & es)
-{
+void BTagPerformanceAnalyzerMC::bookHistograms(DQMStore::IBooker &ibook,
+                                               edm::Run const &run,
+                                               edm::EventSetup const &es) {
   //
   // Book all histograms.
   //
 
   // iterate over ranges:
-  const int iEtaStart = -1                   ;  // this will be the inactive one
-  const int iEtaEnd   = etaRanges.size() > 2 ? etaRanges.size() - 1 : 0; // if there is only one bin defined, leave it as the inactive one
-  const int iPtStart  = -1                   ;  // this will be the inactive one
-  const int iPtEnd    = ptRanges.size() > 2 ? ptRanges.size() - 1 : 0; // if there is only one bin defined, leave it as the inactive one
+  const int iEtaStart = -1;  // this will be the inactive one
+  const int iEtaEnd = etaRanges.size() > 2 ? etaRanges.size() - 1
+                                           : 0;  // if there is only one bin defined, leave it as the inactive one
+  const int iPtStart = -1;                       // this will be the inactive one
+  const int iPtEnd =
+      ptRanges.size() > 2 ? ptRanges.size() - 1 : 0;  // if there is only one bin defined, leave it as the inactive one
 
   setTDRStyle();
 
   TagInfoPlotterFactory theFactory;
-  int iTag = -1; int iTagCorr = -1; int iInfoTag = -1;
-  for (vector<edm::ParameterSet>::const_iterator iModule = moduleConfig.begin();
-       iModule != moduleConfig.end(); ++iModule) {
-
-    const string& dataFormatType = iModule->exists("type") ?
-                                   iModule->getParameter<string>("type") :
-                                   "JetTag";
+  int iTag = -1;
+  int iTagCorr = -1;
+  int iInfoTag = -1;
+  for (vector<edm::ParameterSet>::const_iterator iModule = moduleConfig.begin(); iModule != moduleConfig.end();
+       ++iModule) {
+    const string &dataFormatType = iModule->exists("type") ? iModule->getParameter<string>("type") : "JetTag";
     if (dataFormatType == "JetTag") {
       iTag++;
-      const string& folderName    = iModule->getParameter<string>("folder");
+      const string &folderName = iModule->getParameter<string>("folder");
 
       bool doDifferentialPlots = false;
       double discrCut = -999.;
       if (iModule->exists("differentialPlots") && iModule->getParameter<bool>("differentialPlots") == true) {
-          doDifferentialPlots = true;
-          discrCut = iModule->getParameter<double>("discrCut");
+        doDifferentialPlots = true;
+        discrCut = iModule->getParameter<double>("discrCut");
       }
-      
+
       // eta loop
       for (int iEta = iEtaStart; iEta < iEtaEnd; iEta++) {
         // pt loop
         for (int iPt = iPtStart; iPt < iPtEnd; iPt++) {
-
-          const EtaPtBin& etaPtBin = getEtaPtBin(iEta, iPt);
+          const EtaPtBin &etaPtBin = getEtaPtBin(iEta, iPt);
 
           // Instantiate the genertic b tag plotter
-          binJetTagPlotters.at(iTag).push_back(std::make_unique<JetTagPlotter>(folderName, etaPtBin, iModule->getParameter<edm::ParameterSet>("parameters"), mcPlots_, false, ibook, false, doDifferentialPlots, discrCut));
-
+          binJetTagPlotters.at(iTag).push_back(
+              std::make_unique<JetTagPlotter>(folderName,
+                                              etaPtBin,
+                                              iModule->getParameter<edm::ParameterSet>("parameters"),
+                                              mcPlots_,
+                                              false,
+                                              ibook,
+                                              false,
+                                              doDifferentialPlots,
+                                              discrCut));
         }
       }
-    } else if(dataFormatType == "TagCorrelation") {
-        iTagCorr++;
-        const InputTag& label1 = iModule->getParameter<InputTag>("label1");
-        const InputTag& label2 = iModule->getParameter<InputTag>("label2");
-
-        // eta loop
-        for (int iEta = iEtaStart; iEta != iEtaEnd; ++iEta) {
-          // pt loop
-          for(int iPt = iPtStart; iPt != iPtEnd; ++iPt) {
-            const EtaPtBin& etaPtBin = getEtaPtBin(iEta, iPt);
-            // Instantiate the generic b tag correlation plotter
-            binTagCorrelationPlotters.at(iTagCorr).push_back(
-                        std::make_unique<TagCorrelationPlotter>(label1.label(), label2.label(), etaPtBin,
-                                            iModule->getParameter<edm::ParameterSet>("parameters"),
-                                            mcPlots_, false, false, ibook)
-                    );
-          }
+    } else if (dataFormatType == "TagCorrelation") {
+      iTagCorr++;
+      const InputTag &label1 = iModule->getParameter<InputTag>("label1");
+      const InputTag &label2 = iModule->getParameter<InputTag>("label2");
+
+      // eta loop
+      for (int iEta = iEtaStart; iEta != iEtaEnd; ++iEta) {
+        // pt loop
+        for (int iPt = iPtStart; iPt != iPtEnd; ++iPt) {
+          const EtaPtBin &etaPtBin = getEtaPtBin(iEta, iPt);
+          // Instantiate the generic b tag correlation plotter
+          binTagCorrelationPlotters.at(iTagCorr).push_back(
+              std::make_unique<TagCorrelationPlotter>(label1.label(),
+                                                      label2.label(),
+                                                      etaPtBin,
+                                                      iModule->getParameter<edm::ParameterSet>("parameters"),
+                                                      mcPlots_,
+                                                      false,
+                                                      false,
+                                                      ibook));
         }
+      }
     } else {
       iInfoTag++;
       // tag info retrievel is deferred (needs availability of EventSetup)
-      const InputTag& moduleLabel = iModule->getParameter<InputTag>("label");
-      const string& folderName    = iModule->getParameter<string>("folder");
+      const InputTag &moduleLabel = iModule->getParameter<InputTag>("label");
+      const string &folderName = iModule->getParameter<string>("folder");
       // eta loop
-      for (int iEta = iEtaStart; iEta < iEtaEnd; iEta++ ) {
+      for (int iEta = iEtaStart; iEta < iEtaEnd; iEta++) {
         // pt loop
-        for (int iPt = iPtStart; iPt < iPtEnd; iPt++ ) {
-          const EtaPtBin& etaPtBin = getEtaPtBin(iEta, iPt);
+        for (int iPt = iPtStart; iPt < iPtEnd; iPt++) {
+          const EtaPtBin &etaPtBin = getEtaPtBin(iEta, iPt);
 
           // Instantiate the tagInfo plotter
-          binTagInfoPlotters.at(iInfoTag).push_back(theFactory.buildPlotter(dataFormatType, moduleLabel.label(), 
-                                        etaPtBin, iModule->getParameter<edm::ParameterSet>("parameters"), folderName, 
-                                        mcPlots_,false, ibook)
-                  );
+          binTagInfoPlotters.at(iInfoTag).push_back(
+              theFactory.buildPlotter(dataFormatType,
+                                      moduleLabel.label(),
+                                      etaPtBin,
+                                      iModule->getParameter<edm::ParameterSet>("parameters"),
+                                      folderName,
+                                      mcPlots_,
+                                      false,
+                                      ibook));
         }
       }
     }
   }
 }
 
-EtaPtBin BTagPerformanceAnalyzerMC::getEtaPtBin(const int& iEta, const int& iPt)
-{
+EtaPtBin BTagPerformanceAnalyzerMC::getEtaPtBin(const int &iEta, const int &iPt) {
   // DEFINE BTagBin:
-  bool    etaActive_ , ptActive_;
-  double  etaMin_, etaMax_, ptMin_, ptMax_ ;
+  bool etaActive_, ptActive_;
+  double etaMin_, etaMax_, ptMin_, ptMax_;
 
-  if ( iEta != -1 ) {
-    etaActive_ = true ;
-    etaMin_    = etaRanges[iEta];
-    etaMax_    = etaRanges[iEta+1];
-  }
-  else {
+  if (iEta != -1) {
+    etaActive_ = true;
+    etaMin_ = etaRanges[iEta];
+    etaMax_ = etaRanges[iEta + 1];
+  } else {
     etaActive_ = false;
-    etaMin_    = etaRanges[0];
-    etaMax_    = etaRanges[etaRanges.size() - 1];
+    etaMin_ = etaRanges[0];
+    etaMax_ = etaRanges[etaRanges.size() - 1];
   }
 
-  if ( iPt != -1 ) {
+  if (iPt != -1) {
     ptActive_ = true;
-    ptMin_    = ptRanges[iPt];
-    ptMax_    = ptRanges[iPt+1];
-  }
-  else {
+    ptMin_ = ptRanges[iPt];
+    ptMax_ = ptRanges[iPt + 1];
+  } else {
     ptActive_ = false;
-    ptMin_    = ptRanges[0];
-    ptMax_    = ptRanges[ptRanges.size() - 1];
+    ptMin_ = ptRanges[0];
+    ptMax_ = ptRanges[ptRanges.size() - 1];
   }
   return EtaPtBin(etaActive_, etaMin_, etaMax_, ptActive_, ptMin_, ptMax_);
 }
 
-BTagPerformanceAnalyzerMC::~BTagPerformanceAnalyzerMC() { }
+BTagPerformanceAnalyzerMC::~BTagPerformanceAnalyzerMC() {}
 
-void BTagPerformanceAnalyzerMC::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
+void BTagPerformanceAnalyzerMC::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   eventInitialized = false;
 
-  float weight = 1; // event weight
+  float weight = 1;  // event weight
 
   if (ptHatWeight) {
-
     /* APPLY PTHAT EVENT  WEIGHT */
 
     edm::Handle<GenEventInfoProduct> genInfoHandle;
     iEvent.getByToken(genToken, genInfoHandle);
 
-    if(genInfoHandle.isValid()) {
+    if (genInfoHandle.isValid()) {
       weight = weight * static_cast<float>(genInfoHandle->weight());
     }
   }
 
   LogDebug("Info") << "Event weight is: " << weight;
-    
+
   FlavourMap flavours;
   LeptonMap leptons;
 
-
-  if(!useOldFlavourTool) {
+  if (!useOldFlavourTool) {
     edm::Handle<JetFlavourInfoMatchingCollection> jetMC;
-    iEvent.getByToken(jetToken, jetMC); 
+    iEvent.getByToken(jetToken, jetMC);
     for (JetFlavourInfoMatchingCollection::const_iterator iter = jetMC->begin(); iter != jetMC->end(); ++iter) {
       unsigned int fl = std::abs(iter->second.getPartonFlavour());
       flavours.insert(std::make_pair(iter->first, fl));
       const GenParticleRefVector &lep = iter->second.getLeptons();
       reco::JetFlavour::Leptons lepCount;
-      for (unsigned int i=0; i<lep.size(); i++){
-        if(abs(lep[i]->pdgId())==11) lepCount.electron++;
-        else if(abs(lep[i]->pdgId())==13) lepCount.muon++;
-        else if(abs(lep[i]->pdgId())==15) lepCount.tau++;
+      for (unsigned int i = 0; i < lep.size(); i++) {
+        if (abs(lep[i]->pdgId()) == 11)
+          lepCount.electron++;
+        else if (abs(lep[i]->pdgId()) == 13)
+          lepCount.muon++;
+        else if (abs(lep[i]->pdgId()) == 15)
+          lepCount.tau++;
       }
       leptons.insert(std::make_pair(iter->first, lepCount));
     }
-  }
-  else {
+  } else {
     edm::Handle<JetFlavourMatchingCollection> jetMC;
-    iEvent.getByToken(caloJetToken, jetMC); 
+    iEvent.getByToken(caloJetToken, jetMC);
     for (JetFlavourMatchingCollection::const_iterator iter = jetMC->begin(); iter != jetMC->end(); ++iter) {
       unsigned int fl = std::abs(iter->second.getFlavour());
       flavours.insert(std::make_pair(iter->first, fl));
@@ -274,41 +303,41 @@ void BTagPerformanceAnalyzerMC::analyze(const edm::Event& iEvent, const edm::Eve
   edm::Handle<reco::SoftLeptonTagInfoCollection> infoHandle;
   iEvent.getByToken(slInfoToken, infoHandle);
 
-  edm::Handle<edm::Association<reco::GenJetCollection> > genJetsMatched;
+  edm::Handle<edm::Association<reco::GenJetCollection>> genJetsMatched;
   if (doPUid) {
     iEvent.getByToken(genJetsMatchedToken, genJetsMatched);
   }
 
-  //Get JEC
-  const JetCorrector* corrector = nullptr;
+  // Get JEC
+  const JetCorrector *corrector = nullptr;
   if (doJEC) {
-    edm::Handle<GenEventInfoProduct> genInfoHandle; //check if data or MC
+    edm::Handle<GenEventInfoProduct> genInfoHandle;  // check if data or MC
     iEvent.getByToken(genToken, genInfoHandle);
     edm::Handle<JetCorrector> corrHandle;
-    if ( !genInfoHandle.isValid() ) iEvent.getByToken(jecDataToken, corrHandle);
-    else iEvent.getByToken(jecMCToken, corrHandle);
+    if (!genInfoHandle.isValid())
+      iEvent.getByToken(jecDataToken, corrHandle);
+    else
+      iEvent.getByToken(jecMCToken, corrHandle);
     corrector = corrHandle.product();
   }
   //
 
-// Look first at the jetTags
+  // Look first at the jetTags
   for (unsigned int iJetLabel = 0; iJetLabel != jetTagInputTags.size(); ++iJetLabel) {
     edm::Handle<reco::JetTagCollection> tagHandle;
-    iEvent.getByToken(jetTagToken[iJetLabel], tagHandle); 
-    const reco::JetTagCollection & tagColl = *(tagHandle.product());
+    iEvent.getByToken(jetTagToken[iJetLabel], tagHandle);
+    const reco::JetTagCollection &tagColl = *(tagHandle.product());
     LogDebug("Info") << "Found " << tagColl.size() << " B candidates in collection " << jetTagInputTags[iJetLabel];
 
-    int plotterSize =  binJetTagPlotters[iJetLabel].size();
-    for (JetTagCollection::const_iterator tagI = tagColl.begin();
-      tagI != tagColl.end(); ++tagI) {
+    int plotterSize = binJetTagPlotters[iJetLabel].size();
+    for (JetTagCollection::const_iterator tagI = tagColl.begin(); tagI != tagColl.end(); ++tagI) {
       // Identify parton associated to jet.
 
       /// needed for lepton specific plots
       if (flavours[tagI->first] == 5 &&
-          ((electronPlots && !leptons[tagI->first].electron) ||
-           (muonPlots && !leptons[tagI->first].muon) ||
+          ((electronPlots && !leptons[tagI->first].electron) || (muonPlots && !leptons[tagI->first].muon) ||
            (tauPlots && !leptons[tagI->first].tau)))
-         continue;
+        continue;
       // JEC
       double jec = 1.0;
       /*reco::Jet correctedJet = *(tagI->first);
@@ -324,11 +353,12 @@ void BTagPerformanceAnalyzerMC::analyze(const edm::Event& iEvent, const edm::Eve
         continue;
 
       for (int iPlotter = 0; iPlotter != plotterSize; ++iPlotter) {
-          bool inBin = false;
-          inBin = binJetTagPlotters[iJetLabel][iPlotter]->etaPtBin().inBin(jetWithFlavour.first, jec);
-          // Fill histograms if in desired pt/rapidity bin.
-          if (inBin)
-            binJetTagPlotters[iJetLabel][iPlotter]->analyzeTag(jetWithFlavour.first, jec, tagI->second, std::abs(jetWithFlavour.second.getPartonFlavour()),weight);
+        bool inBin = false;
+        inBin = binJetTagPlotters[iJetLabel][iPlotter]->etaPtBin().inBin(jetWithFlavour.first, jec);
+        // Fill histograms if in desired pt/rapidity bin.
+        if (inBin)
+          binJetTagPlotters[iJetLabel][iPlotter]->analyzeTag(
+              jetWithFlavour.first, jec, tagI->second, std::abs(jetWithFlavour.second.getPartonFlavour()), weight);
       }
     }
     for (int iPlotter = 0; iPlotter != plotterSize; ++iPlotter) {
@@ -336,27 +366,26 @@ void BTagPerformanceAnalyzerMC::analyze(const edm::Event& iEvent, const edm::Eve
     }
   }
 
-// Now look at Tag Correlations
+  // Now look at Tag Correlations
   for (unsigned int iJetLabel = 0; iJetLabel != tagCorrelationInputTags.size(); ++iJetLabel) {
-    const std::pair< edm::EDGetTokenT<reco::JetTagCollection>, edm::EDGetTokenT<reco::JetTagCollection> >& inputTokens = tagCorrelationToken[iJetLabel];
+    const std::pair<edm::EDGetTokenT<reco::JetTagCollection>, edm::EDGetTokenT<reco::JetTagCollection>> &inputTokens =
+        tagCorrelationToken[iJetLabel];
     edm::Handle<reco::JetTagCollection> tagHandle1;
-    iEvent.getByToken(inputTokens.first, tagHandle1); 
-    const reco::JetTagCollection& tagColl1 = *(tagHandle1.product());
+    iEvent.getByToken(inputTokens.first, tagHandle1);
+    const reco::JetTagCollection &tagColl1 = *(tagHandle1.product());
 
     edm::Handle<reco::JetTagCollection> tagHandle2;
     iEvent.getByToken(inputTokens.second, tagHandle2);
-    const reco::JetTagCollection& tagColl2 = *(tagHandle2.product());
+    const reco::JetTagCollection &tagColl2 = *(tagHandle2.product());
 
     int plotterSize = binTagCorrelationPlotters[iJetLabel].size();
     for (JetTagCollection::const_iterator tagI = tagColl1.begin(); tagI != tagColl1.end(); ++tagI) {
-      
       if (flavours[tagI->first] == 5 &&
-          ((electronPlots && !leptons[tagI->first].electron) ||
-           (muonPlots && !leptons[tagI->first].muon) ||
+          ((electronPlots && !leptons[tagI->first].electron) || (muonPlots && !leptons[tagI->first].muon) ||
            (tauPlots && !leptons[tagI->first].tau)))
         continue;
-      
-      //JEC
+
+      // JEC
       double jec = 1.0;
       /*reco::Jet correctedJet = *(tagI->first);
       if(doJEC && corrector) {
@@ -370,41 +399,45 @@ void BTagPerformanceAnalyzerMC::analyze(const edm::Event& iEvent, const edm::Eve
       if (!jetSelector(jetWithFlavour.first, std::abs(jetWithFlavour.second.getPartonFlavour()), infoHandle, jec))
         continue;
 
-      for(int iPlotter = 0; iPlotter != plotterSize; ++iPlotter) {
+      for (int iPlotter = 0; iPlotter != plotterSize; ++iPlotter) {
         bool inBin = false;
         inBin = binTagCorrelationPlotters[iJetLabel][iPlotter]->etaPtBin().inBin(jetWithFlavour.first, jec);
 
-        if(inBin) {
+        if (inBin) {
           double discr2 = tagColl2[tagI->first];
-          binTagCorrelationPlotters[iJetLabel][iPlotter]->analyzeTags(tagI->second, discr2, std::abs(jetWithFlavour.second.getPartonFlavour()),weight);
+          binTagCorrelationPlotters[iJetLabel][iPlotter]->analyzeTags(
+              tagI->second, discr2, std::abs(jetWithFlavour.second.getPartonFlavour()), weight);
         }
       }
     }
   }
 
-// Now look at the TagInfos
+  // Now look at the TagInfos
 
   for (unsigned int iJetLabel = 0; iJetLabel != tiDataFormatType.size(); ++iJetLabel) {
     int plotterSize = binTagInfoPlotters[iJetLabel].size();
     for (int iPlotter = 0; iPlotter != plotterSize; ++iPlotter)
       binTagInfoPlotters[iJetLabel][iPlotter]->setEventSetup(iSetup);
-   
-    vector<edm::EDGetTokenT<edm::View<reco::BaseTagInfo>> > & tokens = tagInfoToken[iJetLabel];
-    //check number of tag infos = expected number of tag infos
+
+    vector<edm::EDGetTokenT<edm::View<reco::BaseTagInfo>>> &tokens = tagInfoToken[iJetLabel];
+    // check number of tag infos = expected number of tag infos
     vector<string> labels = binTagInfoPlotters[iJetLabel][0]->tagInfoRequirements();
     if (labels.empty())
       labels.push_back("label");
-    if(labels.size()!=tokens.size()) throw cms::Exception("Configuration") << "Different number of Tag Infos than expected" << labels.size() << tokens.size() << endl;
+    if (labels.size() != tokens.size())
+      throw cms::Exception("Configuration")
+          << "Different number of Tag Infos than expected" << labels.size() << tokens.size() << endl;
 
-    unsigned int nInputTags = tokens.size(); 
-    vector< edm::Handle< View<BaseTagInfo> > > tagInfoHandles(nInputTags);
+    unsigned int nInputTags = tokens.size();
+    vector<edm::Handle<View<BaseTagInfo>>> tagInfoHandles(nInputTags);
     edm::ProductID jetProductID;
     unsigned int nTagInfos = 0;
     for (unsigned int iInputTags = 0; iInputTags < tokens.size(); ++iInputTags) {
-      edm::Handle< View<BaseTagInfo> > & tagInfoHandle = tagInfoHandles[iInputTags];
-      iEvent.getByToken(tokens[iInputTags], tagInfoHandle); 
-      if (tagInfoHandle.isValid() == false){
-        edm::LogWarning("BTagPerformanceAnalyzerMC")<<" Collection "<<tagInfoInputTags[iJetLabel][iInputTags]<<" not present. Skipping it for this event.";
+      edm::Handle<View<BaseTagInfo>> &tagInfoHandle = tagInfoHandles[iInputTags];
+      iEvent.getByToken(tokens[iInputTags], tagInfoHandle);
+      if (tagInfoHandle.isValid() == false) {
+        edm::LogWarning("BTagPerformanceAnalyzerMC")
+            << " Collection " << tagInfoInputTags[iJetLabel][iInputTags] << " not present. Skipping it for this event.";
         continue;
       }
 
@@ -421,7 +454,7 @@ void BTagPerformanceAnalyzerMC::analyze(const edm::Event& iEvent, const edm::Eve
     }
 
     for (unsigned int iTagInfos = 0; iTagInfos < nTagInfos; ++iTagInfos) {
-      vector<const BaseTagInfo*> baseTagInfos(nInputTags);
+      vector<const BaseTagInfo *> baseTagInfos(nInputTags);
       edm::RefToBase<Jet> jetRef;
       for (unsigned int iTagInfo = 0; iTagInfo < nInputTags; iTagInfo++) {
         const BaseTagInfo &baseTagInfo = (*tagInfoHandles[iTagInfo])[iTagInfos];
@@ -435,13 +468,11 @@ void BTagPerformanceAnalyzerMC::analyze(const edm::Event& iEvent, const edm::Eve
       // Identify parton associated to jet.
 
       /// needed for lepton specific plots
-      if (flavours[jetRef] == 5 &&
-          ((electronPlots && !leptons[jetRef].electron) ||
-           (muonPlots && !leptons[jetRef].muon) ||
-           (tauPlots && !leptons[jetRef].tau)))
-         continue;
-      
-      //JEC
+      if (flavours[jetRef] == 5 && ((electronPlots && !leptons[jetRef].electron) ||
+                                    (muonPlots && !leptons[jetRef].muon) || (tauPlots && !leptons[jetRef].tau)))
+        continue;
+
+      // JEC
       double jec = 1.0;
       /*reco::Jet correctedJet = *(jetRef);
       if(doJEC && corrector) {
@@ -456,44 +487,45 @@ void BTagPerformanceAnalyzerMC::analyze(const edm::Event& iEvent, const edm::Eve
         continue;
 
       for (int iPlotter = 0; iPlotter != plotterSize; ++iPlotter) {
-          bool inBin = false;
-          inBin = binTagInfoPlotters[iJetLabel][iPlotter]->etaPtBin().inBin(*jetRef, jec);
-          // Fill histograms if in desired pt/rapidity bin.
-          if (inBin)
-            binTagInfoPlotters[iJetLabel][iPlotter]->analyzeTag(baseTagInfos, jec, std::abs(jetWithFlavour.second.getPartonFlavour()),weight);
+        bool inBin = false;
+        inBin = binTagInfoPlotters[iJetLabel][iPlotter]->etaPtBin().inBin(*jetRef, jec);
+        // Fill histograms if in desired pt/rapidity bin.
+        if (inBin)
+          binTagInfoPlotters[iJetLabel][iPlotter]->analyzeTag(
+              baseTagInfos, jec, std::abs(jetWithFlavour.second.getPartonFlavour()), weight);
       }
     }
   }
 }
 
-bool BTagPerformanceAnalyzerMC::getJetWithGenJet(edm::RefToBase<Jet> jetRef, edm::Handle<edm::Association<reco::GenJetCollection> > genJetsMatched)
-{
-  if(!doPUid) return true;
+bool BTagPerformanceAnalyzerMC::getJetWithGenJet(edm::RefToBase<Jet> jetRef,
+                                                 edm::Handle<edm::Association<reco::GenJetCollection>> genJetsMatched) {
+  if (!doPUid)
+    return true;
   reco::GenJetRef genjet = (*genJetsMatched)[jetRef];
-  if (genjet.isNonnull() && genjet.isAvailable()) return true;
+  if (genjet.isNonnull() && genjet.isAvailable())
+    return true;
   return false;
 }
 
-bool  BTagPerformanceAnalyzerMC::getJetWithFlavour(const edm::Event& iEvent,
-                           edm::RefToBase<Jet> jetRef, const FlavourMap& flavours,
-                           JetWithFlavour & jetWithFlavour, const JetCorrector * corrector, 
-                           edm::Handle<edm::Association<reco::GenJetCollection> > genJetsMatched)
-{
+bool BTagPerformanceAnalyzerMC::getJetWithFlavour(const edm::Event &iEvent,
+                                                  edm::RefToBase<Jet> jetRef,
+                                                  const FlavourMap &flavours,
+                                                  JetWithFlavour &jetWithFlavour,
+                                                  const JetCorrector *corrector,
+                                                  edm::Handle<edm::Association<reco::GenJetCollection>> genJetsMatched) {
   edm::ProductID recProdId = jetRef.id();
-  edm::ProductID refProdId = (flavours.begin() == flavours.end())
-    ? recProdId
-    : flavours.begin()->first.id();
+  edm::ProductID refProdId = (flavours.begin() == flavours.end()) ? recProdId : flavours.begin()->first.id();
 
   if (!eventInitialized) {
     jetCorrector.setCorrector(corrector);
     if (recProdId != refProdId) {
       edm::RefToBaseVector<Jet> refJets;
-      for(FlavourMap::const_iterator iter = flavours.begin();
-          iter != flavours.end(); ++iter)
+      for (FlavourMap::const_iterator iter = flavours.begin(); iter != flavours.end(); ++iter)
         refJets.push_back(iter->first);
       const edm::RefToBaseProd<Jet> recJetsProd(edm::makeRefToBaseProdFrom(jetRef, iEvent));
       edm::RefToBaseVector<Jet> recJets;
-      for(unsigned int i = 0; i < recJetsProd->size(); i++)
+      for (unsigned int i = 0; i < recJetsProd->size(); i++)
         recJets.push_back(edm::RefToBase<Jet>(recJetsProd, i));
       jetMatcher.matchCollections(refJets, recJets, corrector);
     }
@@ -510,21 +542,23 @@ bool  BTagPerformanceAnalyzerMC::getJetWithFlavour(const edm::Event& iEvent,
   jetWithFlavour.first = jetCorrector(*jetRef);
 
   auto itFound = flavours.find(jetRef);
-  unsigned int flavour = itFound != flavours.end()? itFound->second : 0;
+  unsigned int flavour = itFound != flavours.end() ? itFound->second : 0;
 
-  if(doPUid){
+  if (doPUid) {
     bool isNotPU = getJetWithGenJet(jetRef, genJetsMatched);
-    if(!isNotPU) flavour=20;
+    if (!isNotPU)
+      flavour = 20;
   }
 
   jetWithFlavour.second = reco::JetFlavourInfo(flavour, flavour);
 
-  LogTrace("Info") << "Found jet with flavour "<<jetWithFlavour.second.getPartonFlavour()<<endl;
-  LogTrace("Info") << jetWithFlavour.first.p()<<" , "<< jetWithFlavour.first.pt()<<" - "<<endl;
-    //<< jetWithFlavour.second.getLorentzVector().P()<<" , "<< jetWithFlavour.second.getLorentzVector().Pt()<<endl;
+  LogTrace("Info") << "Found jet with flavour " << jetWithFlavour.second.getPartonFlavour() << endl;
+  LogTrace("Info") << jetWithFlavour.first.p() << " , " << jetWithFlavour.first.pt() << " - " << endl;
+  //<< jetWithFlavour.second.getLorentzVector().P()<<" , "<<
+  // jetWithFlavour.second.getLorentzVector().Pt()<<endl;
 
   return true;
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(BTagPerformanceAnalyzerMC);
diff --git a/Validation/RecoB/plugins/BTagPerformanceAnalyzerMC.h b/Validation/RecoB/plugins/BTagPerformanceAnalyzerMC.h
index 38923cb0e5cc5..98296f0166497 100644
--- a/Validation/RecoB/plugins/BTagPerformanceAnalyzerMC.h
+++ b/Validation/RecoB/plugins/BTagPerformanceAnalyzerMC.h
@@ -1,23 +1,23 @@
 #ifndef BTagPerformanceAnalyzerMC_H
 #define BTagPerformanceAnalyzerMC_H
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "DataFormats/JetReco/interface/Jet.h"
 #include "DQMOffline/RecoB/interface/AcceptJet.h"
-#include "DQMOffline/RecoB/interface/JetTagPlotter.h"
-#include "DQMOffline/RecoB/interface/TagCorrelationPlotter.h"
 #include "DQMOffline/RecoB/interface/BaseTagInfoPlotter.h"
-#include "SimDataFormats/JetMatching/interface/JetFlavourInfoMatching.h"
-#include "SimDataFormats/JetMatching/interface/JetFlavourMatching.h"
-#include "SimDataFormats/JetMatching/interface/JetFlavourInfo.h"
-#include "SimDataFormats/JetMatching/interface/JetFlavour.h"
+#include "DQMOffline/RecoB/interface/JetTagPlotter.h"
 #include "DQMOffline/RecoB/interface/MatchJet.h"
-#include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h"
-#include "DataFormats/JetReco/interface/GenJet.h"
+#include "DQMOffline/RecoB/interface/TagCorrelationPlotter.h"
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "DataFormats/Common/interface/Association.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
+#include "DataFormats/JetReco/interface/GenJet.h"
+#include "DataFormats/JetReco/interface/Jet.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "JetMETCorrections/JetCorrector/interface/JetCorrector.h"
+#include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h"
+#include "SimDataFormats/JetMatching/interface/JetFlavour.h"
+#include "SimDataFormats/JetMatching/interface/JetFlavourInfo.h"
+#include "SimDataFormats/JetMatching/interface/JetFlavourInfoMatching.h"
+#include "SimDataFormats/JetMatching/interface/JetFlavourMatching.h"
 /** \class BTagPerformanceAnalyzerMC
  *
  *  Top level steering routine for b tag performance analysis.
@@ -25,39 +25,40 @@
  */
 
 class BTagPerformanceAnalyzerMC : public DQMEDAnalyzer {
-   public:
-      explicit BTagPerformanceAnalyzerMC(const edm::ParameterSet& pSet);
+public:
+  explicit BTagPerformanceAnalyzerMC(const edm::ParameterSet &pSet);
 
-      ~BTagPerformanceAnalyzerMC() override;
+  ~BTagPerformanceAnalyzerMC() override;
 
-      void analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) override;
-
-   private:
+  void analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) override;
 
+private:
   struct JetRefCompare {
-    inline bool operator () (const edm::RefToBase<reco::Jet> &j1,
-                             const edm::RefToBase<reco::Jet> &j2) const
-    { return j1.id() < j2.id() || (j1.id() == j2.id() && j1.key() < j2.key()); }
+    inline bool operator()(const edm::RefToBase<reco::Jet> &j1, const edm::RefToBase<reco::Jet> &j2) const {
+      return j1.id() < j2.id() || (j1.id() == j2.id() && j1.key() < j2.key());
+    }
   };
 
   // Get histogram plotting options from configuration.
-  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;     
+  void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
-  EtaPtBin getEtaPtBin(const int& iEta, const int& iPt);
+  EtaPtBin getEtaPtBin(const int &iEta, const int &iPt);
 
   typedef std::pair<reco::Jet, reco::JetFlavourInfo> JetWithFlavour;
   typedef std::map<edm::RefToBase<reco::Jet>, unsigned int, JetRefCompare> FlavourMap;
   typedef std::map<edm::RefToBase<reco::Jet>, reco::JetFlavour::Leptons, JetRefCompare> LeptonMap;
-  
-  bool getJetWithFlavour(const edm::Event& iEvent,
-			 edm::RefToBase<reco::Jet> caloRef,
-                         const FlavourMap& _flavours, JetWithFlavour &jetWithFlavour,
-			 const reco::JetCorrector * corrector, 
-			 edm::Handle<edm::Association<reco::GenJetCollection> > genJetsMatched);
-  bool getJetWithGenJet(edm::RefToBase<reco::Jet> jetRef, edm::Handle<edm::Association<reco::GenJetCollection> > genJetsMatched); 
+
+  bool getJetWithFlavour(const edm::Event &iEvent,
+                         edm::RefToBase<reco::Jet> caloRef,
+                         const FlavourMap &_flavours,
+                         JetWithFlavour &jetWithFlavour,
+                         const reco::JetCorrector *corrector,
+                         edm::Handle<edm::Association<reco::GenJetCollection>> genJetsMatched);
+  bool getJetWithGenJet(edm::RefToBase<reco::Jet> jetRef,
+                        edm::Handle<edm::Association<reco::GenJetCollection>> genJetsMatched);
 
   std::vector<std::string> tiDataFormatType;
-  AcceptJet jetSelector;   // Decides if jet and parton satisfy kinematic cuts.
+  AcceptJet jetSelector;  // Decides if jet and parton satisfy kinematic cuts.
   std::vector<double> etaRanges, ptRanges;
   bool useOldFlavourTool;
   bool doJEC;
@@ -68,12 +69,12 @@ class BTagPerformanceAnalyzerMC : public DQMEDAnalyzer {
   edm::InputTag slInfoTag;
   edm::InputTag genJetsMatchedSrc;
 
-  std::vector< std::vector<std::unique_ptr<JetTagPlotter>> > binJetTagPlotters;
-  std::vector< std::vector<std::unique_ptr<TagCorrelationPlotter>> > binTagCorrelationPlotters;
-  std::vector< std::vector<std::unique_ptr<BaseTagInfoPlotter>> > binTagInfoPlotters;
+  std::vector<std::vector<std::unique_ptr<JetTagPlotter>>> binJetTagPlotters;
+  std::vector<std::vector<std::unique_ptr<TagCorrelationPlotter>>> binTagCorrelationPlotters;
+  std::vector<std::vector<std::unique_ptr<BaseTagInfoPlotter>>> binTagInfoPlotters;
   std::vector<edm::InputTag> jetTagInputTags;
-  std::vector< std::pair<edm::InputTag, edm::InputTag> > tagCorrelationInputTags;
-  std::vector< std::vector<edm::InputTag> > tagInfoInputTags;
+  std::vector<std::pair<edm::InputTag, edm::InputTag>> tagCorrelationInputTags;
+  std::vector<std::vector<edm::InputTag>> tagInfoInputTags;
   //  JetFlavourIdentifier jfi;
   std::vector<edm::ParameterSet> moduleConfig;
 
@@ -83,11 +84,11 @@ class BTagPerformanceAnalyzerMC : public DQMEDAnalyzer {
   CorrectJet jetCorrector;
   MatchJet jetMatcher;
 
-  bool doPUid; 
+  bool doPUid;
   bool eventInitialized;
   bool electronPlots, muonPlots, tauPlots;
 
-  //add consumes 
+  // add consumes
   edm::EDGetTokenT<GenEventInfoProduct> genToken;
   edm::EDGetTokenT<edm::Association<reco::GenJetCollection>> genJetsMatchedToken;
   edm::EDGetTokenT<reco::JetCorrector> jecMCToken;
@@ -95,10 +96,10 @@ class BTagPerformanceAnalyzerMC : public DQMEDAnalyzer {
   edm::EDGetTokenT<reco::JetFlavourInfoMatchingCollection> jetToken;
   edm::EDGetTokenT<reco::JetFlavourMatchingCollection> caloJetToken;
   edm::EDGetTokenT<reco::SoftLeptonTagInfoCollection> slInfoToken;
-  std::vector< edm::EDGetTokenT<reco::JetTagCollection> > jetTagToken;
-  std::vector< std::pair<edm::EDGetTokenT<reco::JetTagCollection>, edm::EDGetTokenT<reco::JetTagCollection>> > tagCorrelationToken;
-  std::vector<std::vector <edm::EDGetTokenT<edm::View<reco::BaseTagInfo>> >> tagInfoToken;
+  std::vector<edm::EDGetTokenT<reco::JetTagCollection>> jetTagToken;
+  std::vector<std::pair<edm::EDGetTokenT<reco::JetTagCollection>, edm::EDGetTokenT<reco::JetTagCollection>>>
+      tagCorrelationToken;
+  std::vector<std::vector<edm::EDGetTokenT<edm::View<reco::BaseTagInfo>>>> tagInfoToken;
 };
 
-
 #endif
diff --git a/Validation/RecoB/plugins/recoBSVTagInfoValidationAnalyzer.cc b/Validation/RecoB/plugins/recoBSVTagInfoValidationAnalyzer.cc
index cd664ccb8bb9b..95b1398d7d2db 100644
--- a/Validation/RecoB/plugins/recoBSVTagInfoValidationAnalyzer.cc
+++ b/Validation/RecoB/plugins/recoBSVTagInfoValidationAnalyzer.cc
@@ -1,32 +1,32 @@
-#include <map>
-#include <string>
-#include <cmath>
-#include <Math/Functions.h>
-#include <Math/SVector.h>
-#include <Math/SMatrix.h>
-#include "TH1F.h"
+#include "DataFormats/BTauReco/interface/SecondaryVertexTagInfo.h"
 #include "TH1D.h"
+#include "TH1F.h"
 #include "TH2D.h"
 #include "TMath.h"
-#include "DataFormats/BTauReco/interface/SecondaryVertexTagInfo.h"
+#include <Math/Functions.h>
+#include <Math/SMatrix.h>
+#include <Math/SVector.h>
+#include <cmath>
+#include <map>
+#include <string>
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 
-#include "SimTracker/TrackHistory/interface/VertexClassifierByProxy.h"
 #include "CommonTools/Statistics/interface/ChiSquaredProbability.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 #include "DataFormats/Math/interface/Vector.h"
-#include "TROOT.h"
 #include "Math/VectorUtil.h"
-#include <TVector3.h>
+#include "SimTracker/TrackHistory/interface/VertexClassifierByProxy.h"
+#include "TROOT.h"
 #include <Math/GenVector/PxPyPzE4D.h>
 #include <Math/GenVector/PxPyPzM4D.h>
-#include "DataFormats/Math/interface/LorentzVector.h"
+#include <TVector3.h>
 //
 // class decleration
 //
@@ -34,173 +34,172 @@ using namespace reco;
 using namespace std;
 using namespace edm;
 
-class recoBSVTagInfoValidationAnalyzer : public edm::EDAnalyzer
-{
-
+class recoBSVTagInfoValidationAnalyzer : public edm::EDAnalyzer {
 public:
-
-    explicit recoBSVTagInfoValidationAnalyzer(const edm::ParameterSet&);
+  explicit recoBSVTagInfoValidationAnalyzer(const edm::ParameterSet &);
 
 private:
-
-    void analyze(const edm::Event&, const edm::EventSetup&) override;
-    void endJob() override ;
-    // Member data
-
-    VertexClassifierByProxy<reco::SecondaryVertexTagInfoCollection> classifier_;
-
-    Int_t numberVertexClassifier_;
-    edm::InputTag trackingTruth_;
-    edm::InputTag svTagInfoProducer_;
-
-    DQMStore * dqmStore_;
-    std::string dqmLabel;
-
-    Int_t n_event;
-    Int_t rs_total_nall ; 
-    Int_t rs_total_nsv ;
-    Int_t rs_total_nbv ;
-    Int_t rs_total_nbsv ;
-    Int_t rs_total_ncv ;
-    Int_t rs_total_nlv ;
-    Int_t total_nfake ;
-
-    Int_t sr_total_nall ; 
-    Int_t sr_total_nsv ;
-    Int_t sr_total_nbv ;
-    Int_t sr_total_nbsv ;
-    Int_t sr_total_ncv ;
-    Int_t sr_total_nlv ;
-    Int_t total_nmiss ;
-        
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
+  // Member data
+
+  VertexClassifierByProxy<reco::SecondaryVertexTagInfoCollection> classifier_;
+
+  Int_t numberVertexClassifier_;
+  edm::InputTag trackingTruth_;
+  edm::InputTag svTagInfoProducer_;
+
+  DQMStore *dqmStore_;
+  std::string dqmLabel;
+
+  Int_t n_event;
+  Int_t rs_total_nall;
+  Int_t rs_total_nsv;
+  Int_t rs_total_nbv;
+  Int_t rs_total_nbsv;
+  Int_t rs_total_ncv;
+  Int_t rs_total_nlv;
+  Int_t total_nfake;
+
+  Int_t sr_total_nall;
+  Int_t sr_total_nsv;
+  Int_t sr_total_nbv;
+  Int_t sr_total_nbsv;
+  Int_t sr_total_ncv;
+  Int_t sr_total_nlv;
+  Int_t total_nmiss;
 
   // Bookeeping of all the histograms per category
   void bookRecoToSim(std::string const &);
-    void bookSimToReco(std::string const &);
+  void bookSimToReco(std::string const &);
 
-    // Fill all histogram per category
-    void fillRecoToSim(std::string const &, reco::Vertex const &, TrackingVertexRef const &);
-    void fillSimToReco(std::string const &, reco::VertexBaseRef const &, TrackingVertexRef const &);
+  // Fill all histogram per category
+  void fillRecoToSim(std::string const &, reco::Vertex const &, TrackingVertexRef const &);
+  void fillSimToReco(std::string const &, reco::VertexBaseRef const &, TrackingVertexRef const &);
 
-    // Histogram handlers
-    std::map<std::string, MonitorElement *> HistIndex_;
+  // Histogram handlers
+  std::map<std::string, MonitorElement *> HistIndex_;
 
-  //consumes
+  // consumes
   edm::EDGetTokenT<reco::SecondaryVertexTagInfoCollection> svInfoToken;
   edm::EDGetTokenT<TrackingVertexCollection> tvToken;
-
 };
 
+recoBSVTagInfoValidationAnalyzer::recoBSVTagInfoValidationAnalyzer(const edm::ParameterSet &config)
+    : classifier_(config, consumesCollector()) {
+  // Initialize counters
+  n_event = 0;
+  rs_total_nall = 0;
+  rs_total_nsv = 0;
+  rs_total_nbv = 0;
+  rs_total_nbsv = 0;
+  rs_total_ncv = 0;
+  rs_total_nlv = 0;
+  total_nfake = 0;
+
+  sr_total_nall = 0;
+  sr_total_nsv = 0;
+  sr_total_nbv = 0;
+  sr_total_nbsv = 0;
+  sr_total_ncv = 0;
+  sr_total_nlv = 0;
+  total_nmiss = 0;
+
+  //  get the store
+  dqmStore_ = edm::Service<DQMStore>().operator->();
+  dqmLabel = "SVValidation/";
+  dqmStore_->setCurrentFolder(dqmLabel);
+
+  // Get the track collection
+  svInfoToken = consumes<reco::SecondaryVertexTagInfoCollection>(config.getParameter<InputTag>("svTagInfoProducer"));
+  // Name of the traking pariticle collection
+  tvToken = consumes<TrackingVertexCollection>(config.getParameter<InputTag>("trackingTruth"));
+  // Number of track categories
+  numberVertexClassifier_ = VertexCategories::Unknown + 1;
+
+  // Define histogram for counting categories
+  HistIndex_["VertexClassifier"] = dqmStore_->book1D("VertexClassifier",
+                                                     "Frequency for the different track categories",
+                                                     numberVertexClassifier_,
+                                                     -0.5,
+                                                     numberVertexClassifier_ - 0.5);
+
+  //--- RecoToSim
+  HistIndex_["rs_All_MatchQuality"] = dqmStore_->book1D("rs_All_MatchQuality", "Quality of Match", 51, -0.01, 1.01);
+  HistIndex_["rs_All_FlightDistance2d"] =
+      dqmStore_->book1D("rs_All_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5);
+  HistIndex_["rs_SecondaryVertex_FlightDistance2d"] =
+      dqmStore_->book1D("rs_SecondaryVertex_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5);
+  HistIndex_["rs_BSV_FlightDistance2d"] =
+      dqmStore_->book1D("rs_BSV_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5);
+  HistIndex_["rs_BWeakDecay_FlightDistance2d"] =
+      dqmStore_->book1D("rs_BWeakDecay_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5);
+  HistIndex_["rs_CWeakDecay_FlightDistance2d"] =
+      dqmStore_->book1D("rs_CWeakDecay_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5);
+  HistIndex_["rs_Light_FlightDistance2d"] =
+      dqmStore_->book1D("rs_Light_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5);
+
+  HistIndex_["rs_All_nRecVtx"] = dqmStore_->book1D("rs_All_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  HistIndex_["rs_SecondaryVertex_nRecVtx"] =
+      dqmStore_->book1D("rs_SecondaryVertex_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  HistIndex_["rs_BSV_nRecVtx"] = dqmStore_->book1D("rs_BSV_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  HistIndex_["rs_BWeakDecay_nRecVtx"] =
+      dqmStore_->book1D("rs_BWeakDecay_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  HistIndex_["rs_CWeakDecay_nRecVtx"] =
+      dqmStore_->book1D("rs_CWeakDecay_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  HistIndex_["rs_Light_nRecVtx"] =
+      dqmStore_->book1D("rs_Light_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+
+  //--- SimToReco
+  HistIndex_["sr_All_MatchQuality"] = dqmStore_->book1D("sr_All_MatchQuality", "Quality of Match", 51, -0.01, 1.01);
+  HistIndex_["sr_All_nRecVtx"] = dqmStore_->book1D("sr_All_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  HistIndex_["sr_SecondaryVertex_nRecVtx"] =
+      dqmStore_->book1D("sr_SecondaryVertex_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  HistIndex_["sr_BSV_nRecVtx"] = dqmStore_->book1D("sr_BSV_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  HistIndex_["sr_BWeakDecay_nRecVtx"] =
+      dqmStore_->book1D("sr_BWeakDecay_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  HistIndex_["sr_CWeakDecay_nRecVtx"] =
+      dqmStore_->book1D("sr_CWeakDecay_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+  HistIndex_["sr_Light_nRecVtx"] =
+      dqmStore_->book1D("sr_Light_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5);
+
+  // Set the proper categories names
+  for (Int_t i = 0; i < numberVertexClassifier_; ++i)
+    HistIndex_["VertexClassifier"]->getTH1F()->GetXaxis()->SetBinLabel(i + 1, VertexCategories::Names[i]);
+
+  // book histograms
+  bookRecoToSim("rs_All");
+  bookRecoToSim("rs_SecondaryVertex");
+  bookRecoToSim("rs_BSV");
+  bookRecoToSim("rs_BWeakDecay");
+  bookRecoToSim("rs_CWeakDecay");
+  bookRecoToSim("rs_Light");
+
+  bookSimToReco("sr_All");
+  bookSimToReco("sr_SecondaryVertex");
+  bookSimToReco("sr_BSV");
+  bookSimToReco("sr_BWeakDecay");
+  bookSimToReco("sr_CWeakDecay");
+  bookSimToReco("sr_Light");
+}
 
-recoBSVTagInfoValidationAnalyzer::recoBSVTagInfoValidationAnalyzer(const edm::ParameterSet& config) : classifier_(config,consumesCollector())
-{
-  //Initialize counters
-    n_event = 0;
-    rs_total_nall = 0; 
-    rs_total_nsv = 0;
-    rs_total_nbv = 0;
-    rs_total_nbsv = 0;
-    rs_total_ncv = 0;
-    rs_total_nlv = 0;
-    total_nfake = 0;
-
-    sr_total_nall = 0; 
-    sr_total_nsv = 0;
-    sr_total_nbv = 0;
-    sr_total_nbsv = 0;
-    sr_total_ncv = 0;
-    sr_total_nlv = 0;
-    total_nmiss = 0;
-
-      //  get the store
-    dqmStore_ = edm::Service<DQMStore>().operator->();
-    dqmLabel = "SVValidation/";
-    dqmStore_->setCurrentFolder(dqmLabel);
-
-
-    // Get the track collection
-    svInfoToken = consumes<reco::SecondaryVertexTagInfoCollection>(config.getParameter<InputTag>("svTagInfoProducer"));
-    // Name of the traking pariticle collection
-    tvToken = consumes<TrackingVertexCollection>(config.getParameter<InputTag>("trackingTruth")); 
-    // Number of track categories
-    numberVertexClassifier_ = VertexCategories::Unknown+1;
-
-    // Define histogram for counting categories
-    HistIndex_["VertexClassifier"] = dqmStore_->book1D(
-                                        "VertexClassifier",
-                                        "Frequency for the different track categories",
-                                        numberVertexClassifier_,
-                                        -0.5,
-                                        numberVertexClassifier_ - 0.5
-                                    );
-    
-    //--- RecoToSim
-    HistIndex_["rs_All_MatchQuality"]= dqmStore_->book1D( "rs_All_MatchQuality", "Quality of Match", 51, -0.01, 1.01 );
-    HistIndex_["rs_All_FlightDistance2d"]= dqmStore_->book1D( "rs_All_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5 );
-    HistIndex_["rs_SecondaryVertex_FlightDistance2d"]= dqmStore_->book1D( "rs_SecondaryVertex_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5 );
-    HistIndex_["rs_BSV_FlightDistance2d"]= dqmStore_->book1D( "rs_BSV_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5 );
-    HistIndex_["rs_BWeakDecay_FlightDistance2d"]= dqmStore_->book1D( "rs_BWeakDecay_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5 );
-    HistIndex_["rs_CWeakDecay_FlightDistance2d"]= dqmStore_->book1D( "rs_CWeakDecay_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5 );
-    HistIndex_["rs_Light_FlightDistance2d"]= dqmStore_->book1D( "rs_Light_FlightDistance2d", "Transverse flight distance [cm]", 100, 0, 5 );
-
-    HistIndex_["rs_All_nRecVtx"]= dqmStore_->book1D( "rs_All_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    HistIndex_["rs_SecondaryVertex_nRecVtx"]= dqmStore_->book1D( "rs_SecondaryVertex_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    HistIndex_["rs_BSV_nRecVtx"]= dqmStore_->book1D( "rs_BSV_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    HistIndex_["rs_BWeakDecay_nRecVtx"]= dqmStore_->book1D( "rs_BWeakDecay_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    HistIndex_["rs_CWeakDecay_nRecVtx"]= dqmStore_->book1D( "rs_CWeakDecay_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    HistIndex_["rs_Light_nRecVtx"]= dqmStore_->book1D( "rs_Light_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-
-
-    //--- SimToReco
-    HistIndex_["sr_All_MatchQuality"]= dqmStore_->book1D( "sr_All_MatchQuality", "Quality of Match", 51, -0.01, 1.01 );
-    HistIndex_["sr_All_nRecVtx"]= dqmStore_->book1D( "sr_All_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    HistIndex_["sr_SecondaryVertex_nRecVtx"]= dqmStore_->book1D( "sr_SecondaryVertex_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    HistIndex_["sr_BSV_nRecVtx"]= dqmStore_->book1D( "sr_BSV_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    HistIndex_["sr_BWeakDecay_nRecVtx"]= dqmStore_->book1D( "sr_BWeakDecay_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    HistIndex_["sr_CWeakDecay_nRecVtx"]= dqmStore_->book1D( "sr_CWeakDecay_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );
-    HistIndex_["sr_Light_nRecVtx"]= dqmStore_->book1D( "sr_Light_nRecVtx", "Number of Vertices per event", 11, -0.5, 10.5 );  
-
-
-    // Set the proper categories names
-    for (Int_t i = 0; i < numberVertexClassifier_; ++i)
-      HistIndex_["VertexClassifier"]->getTH1F()->GetXaxis()->SetBinLabel(i+1, VertexCategories::Names[i]);
-    
-    // book histograms
-    bookRecoToSim("rs_All");
-    bookRecoToSim("rs_SecondaryVertex");
-    bookRecoToSim("rs_BSV");
-    bookRecoToSim("rs_BWeakDecay");
-    bookRecoToSim("rs_CWeakDecay");
-    bookRecoToSim("rs_Light");
-
-    bookSimToReco("sr_All"); 
-    bookSimToReco("sr_SecondaryVertex");
-    bookSimToReco("sr_BSV");  
-    bookSimToReco("sr_BWeakDecay");  
-    bookSimToReco("sr_CWeakDecay");  
-    bookSimToReco("sr_Light");  
-}   
-
-
-void recoBSVTagInfoValidationAnalyzer::analyze(const edm::Event& event, const edm::EventSetup& setup)
-{
+void recoBSVTagInfoValidationAnalyzer::analyze(const edm::Event &event, const edm::EventSetup &setup) {
   ++n_event;
 
   std::cout << "*** Analyzing " << event.id() << " n_event = " << n_event << std::endl << std::endl;
 
   // Set the classifier for a new event
   classifier_.newEvent(event, setup);
-  
 
   // Vertex collection
   edm::Handle<reco::SecondaryVertexTagInfoCollection> svTagInfoCollection;
   event.getByToken(svInfoToken, svTagInfoCollection);
   // Get a constant reference to the track history associated to the classifier
-  VertexHistory const & tracer = classifier_.history();
+  VertexHistory const &tracer = classifier_.history();
+
+  cout << "* Event " << n_event << " ; svTagInfoCollection->size() = " << svTagInfoCollection->size() << endl;
 
-  cout << "* Event " << n_event << " ; svTagInfoCollection->size() = " << svTagInfoCollection->size() << endl; 
-  
-  int rs_nall = 0; 
+  int rs_nall = 0;
   int rs_nsv = 0;
   int rs_nbv = 0;
   int rs_nbsv = 0;
@@ -208,7 +207,7 @@ void recoBSVTagInfoValidationAnalyzer::analyze(const edm::Event& event, const ed
   int rs_nlv = 0;
   int nfake = 0;
 
-  int sr_nall = 0; 
+  int sr_nall = 0;
   int sr_nsv = 0;
   int sr_nbv = 0;
   int sr_nbsv = 0;
@@ -217,178 +216,154 @@ void recoBSVTagInfoValidationAnalyzer::analyze(const edm::Event& event, const ed
   int nmiss = 0;
 
   // Loop over the svTagInfo collection.
-  for (std::size_t index = 0; index < svTagInfoCollection->size(); ++index){
-
+  for (std::size_t index = 0; index < svTagInfoCollection->size(); ++index) {
     reco::SecondaryVertexTagInfoRef svTagInfo(svTagInfoCollection, index);
 
     // Loop over the vertexes in svTagInfo
-    for ( std::size_t vindex = 0; vindex < svTagInfo->nVertices(); ++vindex ){
-
- 
+    for (std::size_t vindex = 0; vindex < svTagInfo->nVertices(); ++vindex) {
       // Classify the vertices
       classifier_.evaluate(svTagInfo, vindex);
 
-      //quality of the match
+      // quality of the match
       double rs_quality = tracer.quality();
 
       // Fill the histogram with the categories
       for (Int_t i = 0; i != numberVertexClassifier_; ++i) {
-
-	if ( classifier_.is( (VertexCategories::Category) i ) ) {
-
-	  HistIndex_["VertexClassifier"]->Fill(i);
-	}
+        if (classifier_.is((VertexCategories::Category)i)) {
+          HistIndex_["VertexClassifier"]->Fill(i);
+        }
       }
-      if ( !classifier_.is(VertexCategories::Fake) ) {
-
-        HistIndex_["rs_All_MatchQuality"]->Fill( rs_quality );
-	fillRecoToSim("rs_All", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
-	HistIndex_["rs_All_FlightDistance2d"]->Fill( svTagInfo->flightDistance( vindex, true ).value() );
+      if (!classifier_.is(VertexCategories::Fake)) {
+        HistIndex_["rs_All_MatchQuality"]->Fill(rs_quality);
+        fillRecoToSim("rs_All", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
+        HistIndex_["rs_All_FlightDistance2d"]->Fill(svTagInfo->flightDistance(vindex, true).value());
         rs_nall++;
 
-	if ( classifier_.is(VertexCategories::SecondaryVertex) ) {
-
-	  fillRecoToSim("rs_SecondaryVertex", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
-	  HistIndex_["rs_SecondaryVertex_FlightDistance2d"]->Fill( svTagInfo->flightDistance( vindex, true ).value() );
+        if (classifier_.is(VertexCategories::SecondaryVertex)) {
+          fillRecoToSim("rs_SecondaryVertex", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
+          HistIndex_["rs_SecondaryVertex_FlightDistance2d"]->Fill(svTagInfo->flightDistance(vindex, true).value());
           rs_nsv++;
-	}
-        
-	if ( classifier_.is(VertexCategories::BWeakDecay) ) {
+        }
 
-	  fillRecoToSim("rs_BWeakDecay", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
-	  HistIndex_["rs_BWeakDecay_FlightDistance2d"]->Fill( svTagInfo->flightDistance( vindex, true ).value() );
+        if (classifier_.is(VertexCategories::BWeakDecay)) {
+          fillRecoToSim("rs_BWeakDecay", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
+          HistIndex_["rs_BWeakDecay_FlightDistance2d"]->Fill(svTagInfo->flightDistance(vindex, true).value());
           rs_nbv++;
 
-          if ( classifier_.is(VertexCategories::SecondaryVertex) ) {
+          if (classifier_.is(VertexCategories::SecondaryVertex)) {
+            fillRecoToSim("rs_BSV", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
+            HistIndex_["rs_BSV_FlightDistance2d"]->Fill(svTagInfo->flightDistance(vindex, true).value());
+            rs_nbsv++;
+          }
+        }  // BWeakDecay
 
-	    fillRecoToSim("rs_BSV", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
-            HistIndex_["rs_BSV_FlightDistance2d"]->Fill( svTagInfo->flightDistance( vindex, true ).value() );
-	    rs_nbsv++;	 
-
-          }          
-	}//BWeakDecay
-
-	else if ( classifier_.is(VertexCategories::CWeakDecay) ) {
-
-	  fillRecoToSim("rs_CWeakDecay", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
-	  HistIndex_["rs_CWeakDecay_FlightDistance2d"]->Fill( svTagInfo->flightDistance( vindex, true ).value() );
+        else if (classifier_.is(VertexCategories::CWeakDecay)) {
+          fillRecoToSim("rs_CWeakDecay", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
+          HistIndex_["rs_CWeakDecay_FlightDistance2d"]->Fill(svTagInfo->flightDistance(vindex, true).value());
           rs_ncv++;
 
-	}                
-	else {
-
-	  fillRecoToSim("rs_Light", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
-	  HistIndex_["rs_Light_FlightDistance2d"]->Fill( svTagInfo->flightDistance( vindex, true ).value() );
+        } else {
+          fillRecoToSim("rs_Light", svTagInfo->secondaryVertex(vindex), tracer.simVertex());
+          HistIndex_["rs_Light_FlightDistance2d"]->Fill(svTagInfo->flightDistance(vindex, true).value());
           rs_nlv++;
-	}
-      }//end if classifier
+        }
+      }  // end if classifier
 
       else {
         cout << "    VertexCategories::Fake!!" << endl;
         nfake++;
       }
 
+    }  // end loop over vertices in svTagInfo
 
-    }//end loop over vertices in svTagInfo
-
-  }//loop over svTagInfo
+  }  // loop over svTagInfo
 
-  HistIndex_["rs_All_nRecVtx"]->Fill( rs_nall );
-  HistIndex_["rs_SecondaryVertex_nRecVtx"]->Fill( rs_nsv );
-  HistIndex_["rs_BWeakDecay_nRecVtx"]->Fill( rs_nbv );
-  HistIndex_["rs_BSV_nRecVtx"]->Fill( rs_nbsv );
-  HistIndex_["rs_CWeakDecay_nRecVtx"]->Fill( rs_ncv );  
-  HistIndex_["rs_Light_nRecVtx"]->Fill( rs_nlv );  
-  cout << endl;  
+  HistIndex_["rs_All_nRecVtx"]->Fill(rs_nall);
+  HistIndex_["rs_SecondaryVertex_nRecVtx"]->Fill(rs_nsv);
+  HistIndex_["rs_BWeakDecay_nRecVtx"]->Fill(rs_nbv);
+  HistIndex_["rs_BSV_nRecVtx"]->Fill(rs_nbsv);
+  HistIndex_["rs_CWeakDecay_nRecVtx"]->Fill(rs_ncv);
+  HistIndex_["rs_Light_nRecVtx"]->Fill(rs_nlv);
+  cout << endl;
 
   //----------------------------------------------------------------
   // SIM TO RECO!
 
   // Vertex collection
-  edm::Handle<TrackingVertexCollection>  TVCollection;
+  edm::Handle<TrackingVertexCollection> TVCollection;
   event.getByToken(tvToken, TVCollection);
   // Loop over the TV collection.
-  for (std::size_t index = 0; index < TVCollection->size(); ++index){
-        
+  for (std::size_t index = 0; index < TVCollection->size(); ++index) {
     TrackingVertexRef trackingVertex(TVCollection, index);
 
     classifier_.evaluate(trackingVertex);
- 	
-    double sr_quality = tracer.quality();
 
-    if ( classifier_.is(VertexCategories::Reconstructed) ) {
+    double sr_quality = tracer.quality();
 
-      HistIndex_["sr_All_MatchQuality"]->Fill( sr_quality );
+    if (classifier_.is(VertexCategories::Reconstructed)) {
+      HistIndex_["sr_All_MatchQuality"]->Fill(sr_quality);
       fillSimToReco("sr_All", tracer.recoVertex(), trackingVertex);
       sr_nall++;
 
-      if ( classifier_.is(VertexCategories::SecondaryVertex) ) {
-
+      if (classifier_.is(VertexCategories::SecondaryVertex)) {
         fillSimToReco("sr_SecondaryVertex", tracer.recoVertex(), trackingVertex);
         sr_nsv++;
       }
 
-      if ( classifier_.is(VertexCategories::BWeakDecay) ) {
-
+      if (classifier_.is(VertexCategories::BWeakDecay)) {
         fillSimToReco("sr_BWeakDecay", tracer.recoVertex(), trackingVertex);
         sr_nbv++;
 
-        if ( classifier_.is(VertexCategories::SecondaryVertex) ) {
+        if (classifier_.is(VertexCategories::SecondaryVertex)) {
+          fillSimToReco("sr_BSV", tracer.recoVertex(), trackingVertex);
+          sr_nbsv++;
+        }
 
-         fillSimToReco("sr_BSV", tracer.recoVertex(), trackingVertex);
-         sr_nbsv++;
-	}
-    
-      }//BWeakDecay
+      }  // BWeakDecay
 
-      else if ( classifier_.is(VertexCategories::CWeakDecay) ) {
-
-	fillSimToReco("sr_CWeakDecay", tracer.recoVertex(), trackingVertex);
+      else if (classifier_.is(VertexCategories::CWeakDecay)) {
+        fillSimToReco("sr_CWeakDecay", tracer.recoVertex(), trackingVertex);
         sr_ncv++;
       }
- 
-      else {
 
-	fillSimToReco("sr_Light", tracer.recoVertex(), trackingVertex);
+      else {
+        fillSimToReco("sr_Light", tracer.recoVertex(), trackingVertex);
         sr_nlv++;
       }
 
-    }//Reconstructed
+    }  // Reconstructed
     else {
-      //cout << "##### Not reconstructed!" << endl;
+      // cout << "##### Not reconstructed!" << endl;
       nmiss++;
     }
 
-  }//TVCollection.size()
+  }  // TVCollection.size()
 
-  HistIndex_["sr_All_nRecVtx"]->Fill( sr_nall );
-  HistIndex_["sr_SecondaryVertex_nRecVtx"]->Fill( sr_nsv );
-  HistIndex_["sr_BWeakDecay_nRecVtx"]->Fill( sr_nbv );
-  HistIndex_["sr_BSV_nRecVtx"]->Fill( sr_nbsv );
-  HistIndex_["sr_CWeakDecay_nRecVtx"]->Fill( sr_ncv );  
-  HistIndex_["sr_Light_nRecVtx"]->Fill( rs_nlv );  
+  HistIndex_["sr_All_nRecVtx"]->Fill(sr_nall);
+  HistIndex_["sr_SecondaryVertex_nRecVtx"]->Fill(sr_nsv);
+  HistIndex_["sr_BWeakDecay_nRecVtx"]->Fill(sr_nbv);
+  HistIndex_["sr_BSV_nRecVtx"]->Fill(sr_nbsv);
+  HistIndex_["sr_CWeakDecay_nRecVtx"]->Fill(sr_ncv);
+  HistIndex_["sr_Light_nRecVtx"]->Fill(rs_nlv);
 
-  rs_total_nall += rs_nall;  
+  rs_total_nall += rs_nall;
   rs_total_nsv += rs_nsv;
   rs_total_nbv += rs_nbv;
   rs_total_nbsv += rs_nbsv;
-  rs_total_ncv += rs_ncv ;
+  rs_total_ncv += rs_ncv;
   rs_total_nlv += rs_nlv;
   total_nfake += nfake;
 
-  sr_total_nall += sr_nall; 
+  sr_total_nall += sr_nall;
   sr_total_nsv += sr_nsv;
   sr_total_nbv += sr_nbv;
   sr_total_nbsv += sr_nbsv;
   sr_total_ncv += sr_ncv;
   sr_total_nlv += sr_nlv;
   total_nmiss += nmiss;
-
-
 }
 
-
-void recoBSVTagInfoValidationAnalyzer::bookRecoToSim(std::string const & prefix){
+void recoBSVTagInfoValidationAnalyzer::bookRecoToSim(std::string const &prefix) {
   // Book pull histograms
 
   std::string name = prefix + "_Pullx";
@@ -398,18 +373,18 @@ void recoBSVTagInfoValidationAnalyzer::bookRecoToSim(std::string const & prefix)
   name = prefix + "_Pullz";
   HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, -10., 10.);
 
-   name = prefix + "_Resx";
+  name = prefix + "_Resx";
   HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, -0.05, 0.05);
   name = prefix + "_Resy";
-  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, -0.05, 0.05); 
+  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, -0.05, 0.05);
   name = prefix + "_Resz";
-  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, -0.05, 0.05); 
+  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, -0.05, 0.05);
 
   name = prefix + "_Chi2Norm";
-  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, 0, 10.); 
+  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, 0, 10.);
   name = prefix + "_Chi2Prob";
-  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, 0., 1.); 
- 
+  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, 0., 1.);
+
   name = prefix + "_nRecTrks";
   HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 501, -0.5, 500.5);
 
@@ -435,7 +410,7 @@ void recoBSVTagInfoValidationAnalyzer::bookRecoToSim(std::string const & prefix)
   HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 200, -3., 3.);
 
   name = prefix + "_nSimTrks";
-  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 501, -0.5, 500.5); 
+  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 501, -0.5, 500.5);
 
   name = prefix + "_SimPt";
   HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 2000, 0., 1000.);
@@ -445,18 +420,15 @@ void recoBSVTagInfoValidationAnalyzer::bookRecoToSim(std::string const & prefix)
 
   name = prefix + "_SimCharge";
   HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 21, -0.5, 20.5);
-  
+
   name = prefix + "_SimTrackPt";
   HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 500, 0., 500.);
 
   name = prefix + "_SimTrackEta";
   HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 200, -3., 3.);
-
-
 }
 
-
-void recoBSVTagInfoValidationAnalyzer::bookSimToReco(std::string const & prefix){
+void recoBSVTagInfoValidationAnalyzer::bookSimToReco(std::string const &prefix) {
   // Book pull histograms
 
   std::string name = prefix + "_Pullx";
@@ -466,18 +438,18 @@ void recoBSVTagInfoValidationAnalyzer::bookSimToReco(std::string const & prefix)
   name = prefix + "_Pullz";
   HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, -10., 10.);
 
-   name = prefix + "_Resx";
+  name = prefix + "_Resx";
   HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, -0.05, 0.05);
   name = prefix + "_Resy";
-  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, -0.05, 0.05); 
+  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, -0.05, 0.05);
   name = prefix + "_Resz";
-  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, -0.05, 0.05); 
+  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, -0.05, 0.05);
 
   name = prefix + "_Chi2Norm";
-  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, 0, 10.); 
+  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, 0, 10.);
   name = prefix + "_Chi2Prob";
-  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, 0., 1.); 
- 
+  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 100, 0., 1.);
+
   name = prefix + "_nRecTrks";
   HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 501, -0.5, 500.5);
 
@@ -503,7 +475,7 @@ void recoBSVTagInfoValidationAnalyzer::bookSimToReco(std::string const & prefix)
   HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 200, -3., 3.);
 
   name = prefix + "_nSimTrks";
-  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 501, -0.5, 500.5); 
+  HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 501, -0.5, 500.5);
 
   name = prefix + "_SimPt";
   HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 2000, 0., 1000.);
@@ -513,95 +485,96 @@ void recoBSVTagInfoValidationAnalyzer::bookSimToReco(std::string const & prefix)
 
   name = prefix + "_SimCharge";
   HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 21, -0.5, 20.5);
-  
+
   name = prefix + "_SimTrackPt";
   HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 500, 0., 500.);
 
   name = prefix + "_SimTrackEta";
   HistIndex_[name] = dqmStore_->book1D(name.c_str(), name.c_str(), 200, -3., 3.);
-
-
 }
 
-
-void recoBSVTagInfoValidationAnalyzer::fillRecoToSim(std::string const & prefix, reco::Vertex const & vertex, TrackingVertexRef const & simVertex)
-{
- 
-  double pullx = (vertex.x() - simVertex->position().x())/vertex.xError();
-  double pully = (vertex.y() - simVertex->position().y())/vertex.yError();
-  double pullz = (vertex.z() - simVertex->position().z())/vertex.zError();
+void recoBSVTagInfoValidationAnalyzer::fillRecoToSim(std::string const &prefix,
+                                                     reco::Vertex const &vertex,
+                                                     TrackingVertexRef const &simVertex) {
+  double pullx = (vertex.x() - simVertex->position().x()) / vertex.xError();
+  double pully = (vertex.y() - simVertex->position().y()) / vertex.yError();
+  double pullz = (vertex.z() - simVertex->position().z()) / vertex.zError();
 
   double resx = vertex.x() - simVertex->position().x();
   double resy = vertex.y() - simVertex->position().y();
   double resz = vertex.z() - simVertex->position().z();
 
   double chi2norm = vertex.normalizedChi2();
-  double chi2prob = ChiSquaredProbability( vertex.chi2(), vertex.ndof() ); 
-
- double sum_weight = 0.;
- double weight = 0.;
- double tracksize =  vertex.tracksSize();
- math::XYZVector momentum;
- math::XYZTLorentzVector sum;
- int charge = 0;
-  double thePiMass = 0.13957;
-  for ( reco::Vertex::trackRef_iterator recDaughter = vertex.tracks_begin() ; recDaughter != vertex.tracks_end(); ++recDaughter) {
+  double chi2prob = ChiSquaredProbability(vertex.chi2(), vertex.ndof());
 
-    ROOT::Math::LorentzVector<ROOT::Math::PxPyPzM4D<double> > vec;
+  double sum_weight = 0.;
+  double weight = 0.;
+  double tracksize = vertex.tracksSize();
+  math::XYZVector momentum;
+  math::XYZTLorentzVector sum;
+  int charge = 0;
+  double thePiMass = 0.13957;
+  for (reco::Vertex::trackRef_iterator recDaughter = vertex.tracks_begin(); recDaughter != vertex.tracks_end();
+       ++recDaughter) {
+    ROOT::Math::LorentzVector<ROOT::Math::PxPyPzM4D<double>> vec;
 
-    vec.SetPx( (**recDaughter).px() );
-    vec.SetPy( (**recDaughter).py() );
-    vec.SetPz( (**recDaughter).pz() );
-    vec.SetM(thePiMass); 
+    vec.SetPx((**recDaughter).px());
+    vec.SetPy((**recDaughter).py());
+    vec.SetPz((**recDaughter).pz());
+    vec.SetM(thePiMass);
 
     sum += vec;
-  
-    weight = vertex.trackWeight(*recDaughter); 
+
+    weight = vertex.trackWeight(*recDaughter);
     sum_weight += weight;
 
     math::XYZVector p;
     p = (**recDaughter).momentum();
-    momentum += p; 
+    momentum += p;
 
     charge += (*recDaughter)->charge();
 
-    HistIndex_[prefix + "_RecTrackPt"]->Fill( (*recDaughter)->pt() );
-    HistIndex_[prefix + "_RecTrackEta"]->Fill( (*recDaughter)->eta() );      
-  }//end loop to recDaughters
-  //cout << "                   average sum of weights = " << sum_weight/tracksize << endl; 
-  
+    HistIndex_[prefix + "_RecTrackPt"]->Fill((*recDaughter)->pt());
+    HistIndex_[prefix + "_RecTrackEta"]->Fill((*recDaughter)->eta());
+  }  // end loop to recDaughters
+  // cout << "                   average sum of weights = " <<
+  // sum_weight/tracksize << endl;
+
   double mass = sum.M();
-  double pt = sqrt( momentum.Perp2() );
+  double pt = sqrt(momentum.Perp2());
   double eta = momentum.Eta();
 
   math::XYZVector simmomentum;
   int simcharge = 0;
-  for ( TrackingVertex::tp_iterator simDaughter = simVertex->daughterTracks_begin(); simDaughter != simVertex->daughterTracks_end(); ++simDaughter ){
-
+  for (TrackingVertex::tp_iterator simDaughter = simVertex->daughterTracks_begin();
+       simDaughter != simVertex->daughterTracks_end();
+       ++simDaughter) {
     math::XYZVector p;
     p = (**simDaughter).momentum();
-    simmomentum += p; 
+    simmomentum += p;
 
     simcharge += (*simDaughter)->charge();
 
-    HistIndex_[prefix + "_SimTrackPt"]->Fill( (*simDaughter)->pt() );
-    HistIndex_[prefix + "_SimTrackEta"]->Fill( (*simDaughter)->eta() );   
+    HistIndex_[prefix + "_SimTrackPt"]->Fill((*simDaughter)->pt());
+    HistIndex_[prefix + "_SimTrackEta"]->Fill((*simDaughter)->eta());
   }
 
-  double simpt = sqrt( simmomentum.Perp2() );
+  double simpt = sqrt(simmomentum.Perp2());
   double simeta = simmomentum.Eta();
 
-  //cout << "[fillRecoToSim]  vertex.tracksSize() = " << vertex.tracksSize() << " ; simVertex->nDaughterTracks() = " << simVertex->nDaughterTracks() << endl;  
+  // cout << "[fillRecoToSim]  vertex.tracksSize() = " << vertex.tracksSize() <<
+  // " ; simVertex->nDaughterTracks() = " << simVertex->nDaughterTracks() <<
+  // endl;
 
-  HistIndex_[prefix + "_nRecTrks"]->Fill( vertex.tracksSize() );
-  HistIndex_[prefix + "_nSimTrks"]->Fill( simVertex->nDaughterTracks() );
+  HistIndex_[prefix + "_nRecTrks"]->Fill(vertex.tracksSize());
+  HistIndex_[prefix + "_nSimTrks"]->Fill(simVertex->nDaughterTracks());
   HistIndex_[prefix + "_Pullx"]->Fill(pullx);
   HistIndex_[prefix + "_Pully"]->Fill(pully);
   HistIndex_[prefix + "_Pullz"]->Fill(pullz);
   HistIndex_[prefix + "_Resx"]->Fill(resx);
   HistIndex_[prefix + "_Resy"]->Fill(resy);
   HistIndex_[prefix + "_Resz"]->Fill(resz);
-  HistIndex_[prefix + "_AverageTrackWeight"]->Fill( sum_weight/tracksize );   
+  HistIndex_[prefix + "_AverageTrackWeight"]->Fill(sum_weight / tracksize);
   HistIndex_[prefix + "_Chi2Norm"]->Fill(chi2norm);
   HistIndex_[prefix + "_Chi2Prob"]->Fill(chi2prob);
   HistIndex_[prefix + "_RecPt"]->Fill(pt);
@@ -610,89 +583,91 @@ void recoBSVTagInfoValidationAnalyzer::fillRecoToSim(std::string const & prefix,
   HistIndex_[prefix + "_Mass"]->Fill(mass);
   HistIndex_[prefix + "_SimPt"]->Fill(simpt);
   HistIndex_[prefix + "_SimEta"]->Fill(simeta);
-  HistIndex_[prefix + "_SimCharge"]->Fill(simcharge);  
+  HistIndex_[prefix + "_SimCharge"]->Fill(simcharge);
 }
 
-
-void recoBSVTagInfoValidationAnalyzer::fillSimToReco(std::string const & prefix, reco::VertexBaseRef const & vertex, TrackingVertexRef const & simVertex)
-{
-
-  double pullx = (vertex->x() - simVertex->position().x())/vertex->xError();
-  double pully = (vertex->y() - simVertex->position().y())/vertex->yError();
-  double pullz = (vertex->z() - simVertex->position().z())/vertex->zError();
+void recoBSVTagInfoValidationAnalyzer::fillSimToReco(std::string const &prefix,
+                                                     reco::VertexBaseRef const &vertex,
+                                                     TrackingVertexRef const &simVertex) {
+  double pullx = (vertex->x() - simVertex->position().x()) / vertex->xError();
+  double pully = (vertex->y() - simVertex->position().y()) / vertex->yError();
+  double pullz = (vertex->z() - simVertex->position().z()) / vertex->zError();
 
   double resx = vertex->x() - simVertex->position().x();
   double resy = vertex->y() - simVertex->position().y();
   double resz = vertex->z() - simVertex->position().z();
 
   double chi2norm = vertex->normalizedChi2();
-  double chi2prob = ChiSquaredProbability(vertex->chi2(), vertex->ndof()); 
+  double chi2prob = ChiSquaredProbability(vertex->chi2(), vertex->ndof());
 
   double sum_weight = 0.;
   double weight = 0.;
-  double tracksize =  vertex->tracksSize();
+  double tracksize = vertex->tracksSize();
   math::XYZVector momentum;
   math::XYZTLorentzVector sum;
   int charge = 0;
   double thePiMass = 0.13957;
-  for ( reco::Vertex::trackRef_iterator recDaughter = vertex->tracks_begin() ; recDaughter != vertex->tracks_end(); ++recDaughter ) {
-
-    ROOT::Math::LorentzVector<ROOT::Math::PxPyPzM4D<double> > vec;
+  for (reco::Vertex::trackRef_iterator recDaughter = vertex->tracks_begin(); recDaughter != vertex->tracks_end();
+       ++recDaughter) {
+    ROOT::Math::LorentzVector<ROOT::Math::PxPyPzM4D<double>> vec;
 
-    vec.SetPx( (**recDaughter).px() );
-    vec.SetPy( (**recDaughter).py() );
-    vec.SetPz( (**recDaughter).pz() );
-    vec.SetM(thePiMass); 
+    vec.SetPx((**recDaughter).px());
+    vec.SetPy((**recDaughter).py());
+    vec.SetPz((**recDaughter).pz());
+    vec.SetM(thePiMass);
 
     sum += vec;
-  
-    weight = vertex->trackWeight(*recDaughter); 
+
+    weight = vertex->trackWeight(*recDaughter);
     sum_weight += weight;
 
     math::XYZVector p;
     p = (**recDaughter).momentum();
-    momentum += p; 
+    momentum += p;
 
     charge += (*recDaughter)->charge();
 
-    HistIndex_[prefix + "_RecTrackPt"]->Fill( (*recDaughter)->pt() );
-    HistIndex_[prefix + "_RecTrackEta"]->Fill( (*recDaughter)->eta() );  
-  
+    HistIndex_[prefix + "_RecTrackPt"]->Fill((*recDaughter)->pt());
+    HistIndex_[prefix + "_RecTrackEta"]->Fill((*recDaughter)->eta());
   }
-  //cout << "                   average sum of weights = " << sum_weight/tracksize << endl; 
+  // cout << "                   average sum of weights = " <<
+  // sum_weight/tracksize << endl;
 
   double mass = sum.M();
-  double pt = sqrt( momentum.Perp2() );
+  double pt = sqrt(momentum.Perp2());
   double eta = momentum.Eta();
 
-   math::XYZVector simmomentum;
+  math::XYZVector simmomentum;
   int simcharge = 0;
-  for ( TrackingVertex::tp_iterator simDaughter = simVertex->daughterTracks_begin(); simDaughter != simVertex->daughterTracks_end(); ++simDaughter ){
-
+  for (TrackingVertex::tp_iterator simDaughter = simVertex->daughterTracks_begin();
+       simDaughter != simVertex->daughterTracks_end();
+       ++simDaughter) {
     math::XYZVector p;
     p = (**simDaughter).momentum();
-    simmomentum += p; 
+    simmomentum += p;
 
     simcharge += (*simDaughter)->charge();
 
-    HistIndex_[prefix + "_SimTrackPt"]->Fill( (*simDaughter)->pt() );
-    HistIndex_[prefix + "_SimTrackEta"]->Fill( (*simDaughter)->eta() );   
+    HistIndex_[prefix + "_SimTrackPt"]->Fill((*simDaughter)->pt());
+    HistIndex_[prefix + "_SimTrackEta"]->Fill((*simDaughter)->eta());
   }
 
-  double simpt = sqrt( simmomentum.Perp2() );
+  double simpt = sqrt(simmomentum.Perp2());
   double simeta = simmomentum.Eta();
 
-  //cout << "[fillSimToReco]  vertex->tracksSize() = " << vertex->tracksSize() << " ; simVertex->nDaughterTracks() = " << simVertex->nDaughterTracks() << endl;  
+  // cout << "[fillSimToReco]  vertex->tracksSize() = " << vertex->tracksSize()
+  // << " ; simVertex->nDaughterTracks() = " << simVertex->nDaughterTracks() <<
+  // endl;
 
-  HistIndex_[prefix + "_nRecTrks"]->Fill( vertex->tracksSize() );
-  HistIndex_[prefix + "_nSimTrks"]->Fill( simVertex->nDaughterTracks() );
+  HistIndex_[prefix + "_nRecTrks"]->Fill(vertex->tracksSize());
+  HistIndex_[prefix + "_nSimTrks"]->Fill(simVertex->nDaughterTracks());
   HistIndex_[prefix + "_Pullx"]->Fill(pullx);
   HistIndex_[prefix + "_Pully"]->Fill(pully);
   HistIndex_[prefix + "_Pullz"]->Fill(pullz);
   HistIndex_[prefix + "_Resx"]->Fill(resx);
   HistIndex_[prefix + "_Resy"]->Fill(resy);
   HistIndex_[prefix + "_Resz"]->Fill(resz);
-  HistIndex_[prefix + "_AverageTrackWeight"]->Fill( sum_weight/tracksize );   
+  HistIndex_[prefix + "_AverageTrackWeight"]->Fill(sum_weight / tracksize);
   HistIndex_[prefix + "_Chi2Norm"]->Fill(chi2norm);
   HistIndex_[prefix + "_Chi2Prob"]->Fill(chi2prob);
   HistIndex_[prefix + "_RecPt"]->Fill(pt);
@@ -701,32 +676,27 @@ void recoBSVTagInfoValidationAnalyzer::fillSimToReco(std::string const & prefix,
   HistIndex_[prefix + "_Mass"]->Fill(mass);
   HistIndex_[prefix + "_SimPt"]->Fill(simpt);
   HistIndex_[prefix + "_SimEta"]->Fill(simeta);
-  HistIndex_[prefix + "_SimCharge"]->Fill(simcharge);  
-
+  HistIndex_[prefix + "_SimCharge"]->Fill(simcharge);
 }
 
-
-void 
-recoBSVTagInfoValidationAnalyzer::endJob() {
-
+void recoBSVTagInfoValidationAnalyzer::endJob() {
   std::cout << std::endl;
   std::cout << " ====== Total Number of analyzed events: " << n_event << " ====== " << std::endl;
   std::cout << " ====== Total Number of R2S All:                         " << rs_total_nall << " ====== " << std::endl;
-  std::cout << " ====== Total Number of R2S SecondaryVertex:             " << rs_total_nsv  << " ====== " << std::endl;
-  std::cout << " ====== Total Number of R2S BWeakDecay:                  " << rs_total_nbv  << " ====== " << std::endl;
+  std::cout << " ====== Total Number of R2S SecondaryVertex:             " << rs_total_nsv << " ====== " << std::endl;
+  std::cout << " ====== Total Number of R2S BWeakDecay:                  " << rs_total_nbv << " ====== " << std::endl;
   std::cout << " ====== Total Number of R2S BWeakDecay::SecondaryVertex: " << rs_total_nbsv << " ====== " << std::endl;
-  std::cout << " ====== Total Number of R2S CWeakDecay:                  " << rs_total_ncv  << " ====== " << std::endl;
-  std::cout << " ====== Total Number of R2S Light:                       " << rs_total_nlv  << " ====== " << std::endl;
-  std::cout << std::endl; 
+  std::cout << " ====== Total Number of R2S CWeakDecay:                  " << rs_total_ncv << " ====== " << std::endl;
+  std::cout << " ====== Total Number of R2S Light:                       " << rs_total_nlv << " ====== " << std::endl;
+  std::cout << std::endl;
   std::cout << " ====== Total Number of S2R All:                         " << sr_total_nall << " ====== " << std::endl;
-  std::cout << " ====== Total Number of S2R SecondaryVertex:             " << sr_total_nsv  << " ====== " << std::endl;
-  std::cout << " ====== Total Number of S2R BWeakDecay:                  " << sr_total_nbv  << " ====== " << std::endl;
+  std::cout << " ====== Total Number of S2R SecondaryVertex:             " << sr_total_nsv << " ====== " << std::endl;
+  std::cout << " ====== Total Number of S2R BWeakDecay:                  " << sr_total_nbv << " ====== " << std::endl;
   std::cout << " ====== Total Number of S2R BWeakDecay::SecondaryVertex: " << sr_total_nbsv << " ====== " << std::endl;
-  std::cout << " ====== Total Number of S2R CWeakDecay:                  " << sr_total_ncv  << " ====== " << std::endl;
-  std::cout << " ====== Total Number of S2R Light:                       " << sr_total_nlv  << " ====== " << std::endl;
-  std::cout << std::endl; 
-  std::cout << " ====== Total Number of Fake Vertices:              " << total_nfake   << " ====== " << std::endl;
- 
-} 
+  std::cout << " ====== Total Number of S2R CWeakDecay:                  " << sr_total_ncv << " ====== " << std::endl;
+  std::cout << " ====== Total Number of S2R Light:                       " << sr_total_nlv << " ====== " << std::endl;
+  std::cout << std::endl;
+  std::cout << " ====== Total Number of Fake Vertices:              " << total_nfake << " ====== " << std::endl;
+}
 
 DEFINE_FWK_MODULE(recoBSVTagInfoValidationAnalyzer);
diff --git a/Validation/RecoB/src/HistoCompare.cc b/Validation/RecoB/src/HistoCompare.cc
index 04a94d1d97897..f8c2962e7be32 100644
--- a/Validation/RecoB/src/HistoCompare.cc
+++ b/Validation/RecoB/src/HistoCompare.cc
@@ -1,7 +1,7 @@
 /**_________________________________________________________________
    class:   HistoCompare.cc
    package: Validation/RecoB
-   
+
 
  author: Victor Bazterra, UIC
          Francisco Yumiceva, Fermilab (yumiceva@fnal.gov)
@@ -18,67 +18,60 @@ HistoCompare::HistoCompare() {
   do_nothing_ = false;
 }
 
-HistoCompare::HistoCompare(const TString& refFilename) {
-
-	result_ = 0;
-	do_nothing_ = false;
-	// open reference file
-	refFile_ = new TFile(refFilename);
-	if (refFile_->IsZombie()) {
-		std::cout << " Error openning file " << refFilename << std::endl;
-		std::cout << " we will not compare histograms. " << std::endl;
-		do_nothing_ = true;
-	} else {
-		std::cout << " open file " << refFilename << std::endl;
-	}
-	
-	setChi2Test_ = true;
-	
+HistoCompare::HistoCompare(const TString &refFilename) {
+  result_ = 0;
+  do_nothing_ = false;
+  // open reference file
+  refFile_ = new TFile(refFilename);
+  if (refFile_->IsZombie()) {
+    std::cout << " Error openning file " << refFilename << std::endl;
+    std::cout << " we will not compare histograms. " << std::endl;
+    do_nothing_ = true;
+  } else {
+    std::cout << " open file " << refFilename << std::endl;
+  }
+
+  setChi2Test_ = true;
 }
 
-HistoCompare::~HistoCompare() {
-}
+HistoCompare::~HistoCompare() {}
+
+TH1 *HistoCompare::Compare(TH1 *h, const TString &hname) {
+  if (do_nothing_)
+    return nullptr;
+
+  // std::cout << "histo: " << h->GetName() << " entries: "<< h->GetEntries() <<
+  // std::endl; std::cout << "hname: " << hname << std::endl;
+
+  // create a residual histogram
+  // if (resHisto_) delete resHisto_;
+  resHisto_ = (TH1 *)h->Clone(TString(h->GetName()) + "_residuals");
+  resHisto_->Reset();
+
+  // clone input histogram
+  TH1 *htemp = (TH1 *)h->Clone(TString(h->GetName()));
+
+  refFile_->cd();
+  // std::cout << "get reference" << std::endl;
+  refHisto_ = (TH1 *)gDirectory->Get(hname);
+  // std::cout << "historef: " << refHisto_->GetName() << " entries: "<<
+  // refHisto_->GetEntries() << std::endl; std::cout << "name: " <<
+  // refHisto_->GetName() << std::endl;
+
+  // normalize histograms
+  htemp->Scale(1. / htemp->Integral());
+  refHisto_->Scale(1. / refHisto_->Integral());
+
+  if (setChi2Test_) {
+    result_ = refHisto_->Chi2Test(htemp, "UFOF");
+  }
+  if (setKGTest_) {
+    result_ = refHisto_->KolmogorovTest(htemp, "UO");
+  }
+
+  resHisto_->Add(htemp, refHisto_, 1., -1.);
 
+  // std::cout << " residual done." << std::endl;
 
-TH1* HistoCompare::Compare(TH1 *h, const TString& hname) {
-
-	if (do_nothing_) return nullptr;
-	
-	//std::cout << "histo: " << h->GetName() << " entries: "<< h->GetEntries() << std::endl;
-	//std::cout << "hname: " << hname << std::endl;
-
-	
-	//create a residual histogram
-	//if (resHisto_) delete resHisto_;
-	resHisto_ = (TH1*) h->Clone(TString(h->GetName())+"_residuals");
-	resHisto_->Reset();
-
-	// clone input histogram
-	TH1 *htemp = (TH1*) h->Clone(TString(h->GetName()));
-
-	refFile_->cd();
-	//std::cout << "get reference" << std::endl;
-	refHisto_ = (TH1*) gDirectory->Get( hname );
-	//std::cout << "historef: " << refHisto_->GetName() << " entries: "<< refHisto_->GetEntries() << std::endl;
-	//std::cout << "name: " << refHisto_->GetName() << std::endl;
-
-
-	// normalize histograms
-	htemp->Scale(1./htemp->Integral());
-	refHisto_->Scale(1./refHisto_->Integral());
-	
-	if (setChi2Test_) {
-		result_ = refHisto_->Chi2Test(htemp,"UFOF");
-	}
-	if (setKGTest_) {
-		result_ = refHisto_->KolmogorovTest(htemp,"UO");
-	}
-
-	
-	resHisto_->Add( htemp, refHisto_, 1., -1.);
-	
-	//std::cout << " residual done." << std::endl;
-	
-	return resHisto_;
-	
+  return resHisto_;
 }
diff --git a/Validation/RecoEgamma/test/ElectronMcFakePostValidation_cfg.py b/Validation/RecoEgamma/test/ElectronMcFakePostValidation_cfg.py
old mode 100755
new mode 100644
index 81ffe5aac5f50..d61d3b1df16e7
--- a/Validation/RecoEgamma/test/ElectronMcFakePostValidation_cfg.py
+++ b/Validation/RecoEgamma/test/ElectronMcFakePostValidation_cfg.py
@@ -9,11 +9,12 @@
 cmsEnv.checkSample() # check the sample value
 cmsEnv.checkValues()
 
-from Configuration.StandardSequences.Eras import eras
 if cmsEnv.beginTag() == 'Run2_2017':
-    process = cms.Process("electronPostValidation",eras.Run2_2017)
+    from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+    process = cms.Process("electronPostValidation",Run2_2017)
 else:
-    process = cms.Process('electronPostValidation',eras.Phase2) 
+    from Configuration.Eras.Era_Phase2_cff import Phase2
+    process = cms.Process('electronPostValidation',Phase2) 
 
 process.DQMStore = cms.Service("DQMStore")
 process.load("Validation.RecoEgamma.ElectronMcFakePostValidator_cfi")
diff --git a/Validation/RecoEgamma/test/ElectronMcFakeValidation_gedGsfElectrons_cfg.py b/Validation/RecoEgamma/test/ElectronMcFakeValidation_gedGsfElectrons_cfg.py
old mode 100755
new mode 100644
index dc034063c1bd4..11bed6fd5f5a8
--- a/Validation/RecoEgamma/test/ElectronMcFakeValidation_gedGsfElectrons_cfg.py
+++ b/Validation/RecoEgamma/test/ElectronMcFakeValidation_gedGsfElectrons_cfg.py
@@ -10,11 +10,12 @@
 cmsEnv.checkSample() # check the sample value
 cmsEnv.checkValues()
 
-from Configuration.StandardSequences.Eras import eras
 if cmsEnv.beginTag() == 'Run2_2017':
-    process = cms.Process("electronValidation",eras.Run2_2017)
+    from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+    process = cms.Process("electronValidation",Run2_2017)
 else:
-    process = cms.Process('electronValidation',eras.Phase2) 
+    from Configuration.Eras.Era_Phase2_cff import Phase2
+    process = cms.Process('electronValidation',Phase2) 
 
 process.DQMStore = cms.Service("DQMStore")
 process.load("DQMServices.Components.DQMStoreStats_cfi")
diff --git a/Validation/RecoEgamma/test/ElectronMcSignalPostValidationMiniAOD_cfg.py b/Validation/RecoEgamma/test/ElectronMcSignalPostValidationMiniAOD_cfg.py
index b8e45504ba872..7e5c934fc2034 100644
--- a/Validation/RecoEgamma/test/ElectronMcSignalPostValidationMiniAOD_cfg.py
+++ b/Validation/RecoEgamma/test/ElectronMcSignalPostValidationMiniAOD_cfg.py
@@ -3,11 +3,12 @@
 import os
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras 
 
 #process = cms.Process("electronValidation")
-#process = cms.Process("electronPostValidation",eras.Run2_2017)
-process = cms.Process('electronPostValidation',eras.Phase2) 
+#from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+#process = cms.Process("electronPostValidation",Run2_2017)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('electronPostValidation',Phase2) 
 
 process.options = cms.untracked.PSet( )
 
diff --git a/Validation/RecoEgamma/test/ElectronMcSignalPostValidationPt1000_cfg.py b/Validation/RecoEgamma/test/ElectronMcSignalPostValidationPt1000_cfg.py
old mode 100755
new mode 100644
index 725bd3b835977..d0219927a5e5a
--- a/Validation/RecoEgamma/test/ElectronMcSignalPostValidationPt1000_cfg.py
+++ b/Validation/RecoEgamma/test/ElectronMcSignalPostValidationPt1000_cfg.py
@@ -9,11 +9,12 @@
 cmsEnv.checkSample() # check the sample value
 cmsEnv.checkValues()
 
-from Configuration.StandardSequences.Eras import eras 
 if cmsEnv.beginTag() == 'Run2_2017':
-    process = cms.Process("electronPostValidation",eras.Run2_2017)
+    from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+    process = cms.Process("electronPostValidation",Run2_2017)
 else:
-    process = cms.Process('electronPostValidation',eras.Phase2) 
+    from Configuration.Eras.Era_Phase2_cff import Phase2
+    process = cms.Process('electronPostValidation',Phase2) 
 
 process.DQMStore = cms.Service("DQMStore")
 process.load("Validation.RecoEgamma.ElectronMcSignalPostValidatorPt1000_cfi")
diff --git a/Validation/RecoEgamma/test/ElectronMcSignalPostValidation_cfg.py b/Validation/RecoEgamma/test/ElectronMcSignalPostValidation_cfg.py
old mode 100755
new mode 100644
index 47c232f549b5e..c1117d3333a35
--- a/Validation/RecoEgamma/test/ElectronMcSignalPostValidation_cfg.py
+++ b/Validation/RecoEgamma/test/ElectronMcSignalPostValidation_cfg.py
@@ -9,11 +9,12 @@
 cmsEnv.checkSample() # check the sample value
 cmsEnv.checkValues()
 
-from Configuration.StandardSequences.Eras import eras 
 if cmsEnv.beginTag() == 'Run2_2017':
-    process = cms.Process("electronPostValidation",eras.Run2_2017)
+    from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+    process = cms.Process("electronPostValidation",Run2_2017)
 else:
-    process = cms.Process('electronPostValidation',eras.Phase2) 
+    from Configuration.Eras.Era_Phase2_cff import Phase2
+    process = cms.Process('electronPostValidation',Phase2) 
 
 process.DQMStore = cms.Service("DQMStore")
 process.load("Validation.RecoEgamma.ElectronMcSignalPostValidator_cfi")
diff --git a/Validation/RecoEgamma/test/ElectronMcSignalValidationMiniAOD_cfg.py b/Validation/RecoEgamma/test/ElectronMcSignalValidationMiniAOD_cfg.py
old mode 100755
new mode 100644
index 479c535e5c31a..054e190cb050a
--- a/Validation/RecoEgamma/test/ElectronMcSignalValidationMiniAOD_cfg.py
+++ b/Validation/RecoEgamma/test/ElectronMcSignalValidationMiniAOD_cfg.py
@@ -5,11 +5,12 @@
 import DQMOffline.EGamma.electronDataDiscovery as dd
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras 
 
 #process = cms.Process("electronValidation")
-#process = cms.Process("electronValidation",eras.Run2_2017)
-process = cms.Process('electronValidation',eras.Phase2) 
+#from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+#process = cms.Process("electronValidation",Run2_2017)
+from Configuration.Eras.Era_Phase2_cff import Phase2
+process = cms.Process('electronValidation',Phase2) 
 
 process.options = cms.untracked.PSet( )
 
diff --git a/Validation/RecoEgamma/test/ElectronMcSignalValidationPt1000_gedGsfElectrons_cfg.py b/Validation/RecoEgamma/test/ElectronMcSignalValidationPt1000_gedGsfElectrons_cfg.py
old mode 100755
new mode 100644
index 1d68ee548358a..b299ea78ff99a
--- a/Validation/RecoEgamma/test/ElectronMcSignalValidationPt1000_gedGsfElectrons_cfg.py
+++ b/Validation/RecoEgamma/test/ElectronMcSignalValidationPt1000_gedGsfElectrons_cfg.py
@@ -10,11 +10,12 @@
 cmsEnv.checkSample() # check the sample value
 cmsEnv.checkValues()
 
-from Configuration.StandardSequences.Eras import eras
 if cmsEnv.beginTag() == 'Run2_2017':
-    process = cms.Process("electronValidation",eras.Run2_2017)
+    from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+    process = cms.Process("electronValidation",Run2_2017)
 else:
-    process = cms.Process('electronValidation',eras.Phase2) 
+    from Configuration.Eras.Era_Phase2_cff import Phase2
+    process = cms.Process('electronValidation',Phase2) 
 
 process.DQMStore = cms.Service("DQMStore")
 process.load("DQMServices.Components.DQMStoreStats_cfi")
diff --git a/Validation/RecoEgamma/test/ElectronMcSignalValidation_gedGsfElectrons_cfg.py b/Validation/RecoEgamma/test/ElectronMcSignalValidation_gedGsfElectrons_cfg.py
old mode 100755
new mode 100644
index 4dfbaf8a42873..850a30bf23f76
--- a/Validation/RecoEgamma/test/ElectronMcSignalValidation_gedGsfElectrons_cfg.py
+++ b/Validation/RecoEgamma/test/ElectronMcSignalValidation_gedGsfElectrons_cfg.py
@@ -17,11 +17,12 @@
 cmsEnv.checkSample() # check the sample value
 cmsEnv.checkValues()
 
-from Configuration.StandardSequences.Eras import eras 
 if cmsEnv.beginTag() == 'Run2_2017':
-    process = cms.Process("electronValidation",eras.Run2_2017)
+    from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+    process = cms.Process("electronValidation",Run2_2017)
 else:
-    process = cms.Process('electronValidation',eras.Phase2) 
+    from Configuration.Eras.Era_Phase2_cff import Phase2
+    process = cms.Process('electronValidation',Phase2) 
 
 process.DQMStore = cms.Service("DQMStore")
 process.load("DQMServices.Components.DQMStoreStats_cfi")
diff --git a/Validation/RecoJets/plugins/JetTester.cc b/Validation/RecoJets/plugins/JetTester.cc
index 072b05ac51bff..eda8b15b0f0f6 100644
--- a/Validation/RecoJets/plugins/JetTester.cc
+++ b/Validation/RecoJets/plugins/JetTester.cc
@@ -9,103 +9,106 @@ using namespace edm;
 using namespace reco;
 using namespace std;
 
-JetTester::JetTester(const edm::ParameterSet& iConfig) :
-  mInputCollection               (iConfig.getParameter<edm::InputTag>       ("src")),
-//  rhoTag                         (iConfig.getParameter<edm::InputTag>       ("srcRho")), 
-  JetType                        (iConfig.getUntrackedParameter<std::string>("JetType")),
-  mRecoJetPtThreshold            (iConfig.getParameter<double>              ("recoJetPtThreshold")),
-  mMatchGenPtThreshold           (iConfig.getParameter<double>              ("matchGenPtThreshold")),
-  mRThreshold                    (iConfig.getParameter<double>              ("RThreshold"))
-{
+JetTester::JetTester(const edm::ParameterSet &iConfig)
+    : mInputCollection(iConfig.getParameter<edm::InputTag>("src")),
+      //  rhoTag                         (iConfig.getParameter<edm::InputTag>
+      //  ("srcRho")),
+      JetType(iConfig.getUntrackedParameter<std::string>("JetType")),
+      mRecoJetPtThreshold(iConfig.getParameter<double>("recoJetPtThreshold")),
+      mMatchGenPtThreshold(iConfig.getParameter<double>("matchGenPtThreshold")),
+      mRThreshold(iConfig.getParameter<double>("RThreshold")) {
   std::string inputCollectionLabel(mInputCollection.label());
 
-  isCaloJet = (std::string("calo")==JetType);
-  isPFJet   = (std::string("pf")  ==JetType);
-  isMiniAODJet = (std::string("miniaod")  ==JetType);
-  if(!isMiniAODJet){
-    mJetCorrector                  =iConfig.getParameter<edm::InputTag>("JetCorrections"); 
-  } 
-
-  //consumes
-  pvToken_ = consumes<std::vector<reco::Vertex> >(iConfig.getParameter<edm::InputTag>("primVertex"));
-  if (isCaloJet) caloJetsToken_  = consumes<reco::CaloJetCollection>(mInputCollection);
-  if (isPFJet)   pfJetsToken_    = consumes<reco::PFJetCollection>(mInputCollection);
-  if(isMiniAODJet)patJetsToken_ = consumes<pat::JetCollection>(mInputCollection);
-  mInputGenCollection            =iConfig.getParameter<edm::InputTag>("srcGen");
+  isCaloJet = (std::string("calo") == JetType);
+  isPFJet = (std::string("pf") == JetType);
+  isMiniAODJet = (std::string("miniaod") == JetType);
+  if (!isMiniAODJet) {
+    mJetCorrector = iConfig.getParameter<edm::InputTag>("JetCorrections");
+  }
+
+  // consumes
+  pvToken_ = consumes<std::vector<reco::Vertex>>(iConfig.getParameter<edm::InputTag>("primVertex"));
+  if (isCaloJet)
+    caloJetsToken_ = consumes<reco::CaloJetCollection>(mInputCollection);
+  if (isPFJet)
+    pfJetsToken_ = consumes<reco::PFJetCollection>(mInputCollection);
+  if (isMiniAODJet)
+    patJetsToken_ = consumes<pat::JetCollection>(mInputCollection);
+  mInputGenCollection = iConfig.getParameter<edm::InputTag>("srcGen");
   genJetsToken_ = consumes<reco::GenJetCollection>(edm::InputTag(mInputGenCollection));
   evtToken_ = consumes<GenEventInfoProduct>(edm::InputTag("generator"));
-  if(!isMiniAODJet && !mJetCorrector.label().empty()){
+  if (!isMiniAODJet && !mJetCorrector.label().empty()) {
     jetCorrectorToken_ = consumes<reco::JetCorrector>(mJetCorrector);
   }
-  
+
   // Events variables
-  mNvtx           = nullptr;
+  mNvtx = nullptr;
 
   // Jet parameters
-  mEta          = nullptr;
-  mPhi          = nullptr;
-  mEnergy       = nullptr;
-  mP            = nullptr;
-  mPt           = nullptr;
-  mMass         = nullptr;
+  mEta = nullptr;
+  mPhi = nullptr;
+  mEnergy = nullptr;
+  mP = nullptr;
+  mPt = nullptr;
+  mMass = nullptr;
   mConstituents = nullptr;
-  mJetArea      = nullptr;
-//  mRho          = 0;
+  mJetArea = nullptr;
+  //  mRho          = 0;
 
   // Corrected jets
-  mCorrJetPt  = nullptr;
+  mCorrJetPt = nullptr;
   mCorrJetEta = nullptr;
   mCorrJetPhi = nullptr;
   mCorrJetEta_Pt40 = nullptr;
   mCorrJetPhi_Pt40 = nullptr;
 
   // Corrected jets profiles
-  mPtCorrOverReco_Pt_B                = nullptr;
-  mPtCorrOverReco_Pt_E                = nullptr;
-  mPtCorrOverReco_Pt_F                = nullptr;
-  mPtCorrOverReco_Eta_20_40          = nullptr;
-  mPtCorrOverReco_Eta_40_200          = nullptr;
-  mPtCorrOverReco_Eta_200_600         = nullptr;
-  mPtCorrOverReco_Eta_600_1500        = nullptr;
-  mPtCorrOverReco_Eta_1500_3500       = nullptr;
-  mPtCorrOverReco_Eta_3500_5000       = nullptr;
-  mPtCorrOverReco_Eta_5000_6500       = nullptr;
-  mPtCorrOverReco_Eta_3500       = nullptr;
-  mPtCorrOverGen_GenPt_B          = nullptr;
-  mPtCorrOverGen_GenPt_E          = nullptr;
-  mPtCorrOverGen_GenPt_F          = nullptr;
-  mPtCorrOverGen_GenEta_20_40    = nullptr;
-  mPtCorrOverGen_GenEta_40_200    = nullptr;
-  mPtCorrOverGen_GenEta_200_600   = nullptr;
-  mPtCorrOverGen_GenEta_600_1500  = nullptr;
+  mPtCorrOverReco_Pt_B = nullptr;
+  mPtCorrOverReco_Pt_E = nullptr;
+  mPtCorrOverReco_Pt_F = nullptr;
+  mPtCorrOverReco_Eta_20_40 = nullptr;
+  mPtCorrOverReco_Eta_40_200 = nullptr;
+  mPtCorrOverReco_Eta_200_600 = nullptr;
+  mPtCorrOverReco_Eta_600_1500 = nullptr;
+  mPtCorrOverReco_Eta_1500_3500 = nullptr;
+  mPtCorrOverReco_Eta_3500_5000 = nullptr;
+  mPtCorrOverReco_Eta_5000_6500 = nullptr;
+  mPtCorrOverReco_Eta_3500 = nullptr;
+  mPtCorrOverGen_GenPt_B = nullptr;
+  mPtCorrOverGen_GenPt_E = nullptr;
+  mPtCorrOverGen_GenPt_F = nullptr;
+  mPtCorrOverGen_GenEta_20_40 = nullptr;
+  mPtCorrOverGen_GenEta_40_200 = nullptr;
+  mPtCorrOverGen_GenEta_200_600 = nullptr;
+  mPtCorrOverGen_GenEta_600_1500 = nullptr;
   mPtCorrOverGen_GenEta_1500_3500 = nullptr;
   mPtCorrOverGen_GenEta_3500_5000 = nullptr;
   mPtCorrOverGen_GenEta_5000_6500 = nullptr;
   mPtCorrOverGen_GenEta_3500 = nullptr;
 
   // Generation
-  mGenEta      = nullptr;
-  mGenPhi      = nullptr;
-  mGenPt       = nullptr;
+  mGenEta = nullptr;
+  mGenPhi = nullptr;
+  mGenPt = nullptr;
   mGenEtaFirst = nullptr;
   mGenPhiFirst = nullptr;
-  mPtHat       = nullptr;
-  mDeltaEta    = nullptr;
-  mDeltaPhi    = nullptr;
-  mDeltaPt     = nullptr;
-
-  mPtRecoOverGen_B_20_40    = nullptr;
-  mPtRecoOverGen_E_20_40    = nullptr;
-  mPtRecoOverGen_F_20_40    = nullptr;
-  mPtRecoOverGen_B_40_200    = nullptr;
-  mPtRecoOverGen_E_40_200    = nullptr;
-  mPtRecoOverGen_F_40_200    = nullptr;
-  mPtRecoOverGen_B_200_600   = nullptr;
-  mPtRecoOverGen_E_200_600   = nullptr;
-  mPtRecoOverGen_F_200_600   = nullptr;
-  mPtRecoOverGen_B_600_1500  = nullptr;
-  mPtRecoOverGen_E_600_1500  = nullptr;
-  mPtRecoOverGen_F_600_1500  = nullptr;
+  mPtHat = nullptr;
+  mDeltaEta = nullptr;
+  mDeltaPhi = nullptr;
+  mDeltaPt = nullptr;
+
+  mPtRecoOverGen_B_20_40 = nullptr;
+  mPtRecoOverGen_E_20_40 = nullptr;
+  mPtRecoOverGen_F_20_40 = nullptr;
+  mPtRecoOverGen_B_40_200 = nullptr;
+  mPtRecoOverGen_E_40_200 = nullptr;
+  mPtRecoOverGen_F_40_200 = nullptr;
+  mPtRecoOverGen_B_200_600 = nullptr;
+  mPtRecoOverGen_E_200_600 = nullptr;
+  mPtRecoOverGen_F_200_600 = nullptr;
+  mPtRecoOverGen_B_600_1500 = nullptr;
+  mPtRecoOverGen_E_600_1500 = nullptr;
+  mPtRecoOverGen_F_600_1500 = nullptr;
   mPtRecoOverGen_B_1500_3500 = nullptr;
   mPtRecoOverGen_E_1500_3500 = nullptr;
   mPtRecoOverGen_F_1500_3500 = nullptr;
@@ -118,40 +121,40 @@ JetTester::JetTester(const edm::ParameterSet& iConfig) :
   mPtRecoOverGen_F_3500 = nullptr;
 
   // Generation profiles
-  mPtRecoOverGen_GenPt_B          = nullptr;
-  mPtRecoOverGen_GenPt_E          = nullptr;
-  mPtRecoOverGen_GenPt_F          = nullptr;
-  mPtRecoOverGen_GenPhi_B         = nullptr;
-  mPtRecoOverGen_GenPhi_E         = nullptr;
-  mPtRecoOverGen_GenPhi_F         = nullptr;
-  mPtRecoOverGen_GenEta_20_40    = nullptr;
-  mPtRecoOverGen_GenEta_40_200    = nullptr;
-  mPtRecoOverGen_GenEta_200_600   = nullptr;
-  mPtRecoOverGen_GenEta_600_1500  = nullptr;
+  mPtRecoOverGen_GenPt_B = nullptr;
+  mPtRecoOverGen_GenPt_E = nullptr;
+  mPtRecoOverGen_GenPt_F = nullptr;
+  mPtRecoOverGen_GenPhi_B = nullptr;
+  mPtRecoOverGen_GenPhi_E = nullptr;
+  mPtRecoOverGen_GenPhi_F = nullptr;
+  mPtRecoOverGen_GenEta_20_40 = nullptr;
+  mPtRecoOverGen_GenEta_40_200 = nullptr;
+  mPtRecoOverGen_GenEta_200_600 = nullptr;
+  mPtRecoOverGen_GenEta_600_1500 = nullptr;
   mPtRecoOverGen_GenEta_1500_3500 = nullptr;
   mPtRecoOverGen_GenEta_3500_5000 = nullptr;
   mPtRecoOverGen_GenEta_5000_6500 = nullptr;
   mPtRecoOverGen_GenEta_3500 = nullptr;
 
   // Some jet algebra
-  mEtaFirst   = nullptr;
-  mPhiFirst   = nullptr;
-  mPtFirst    = nullptr;
-  mMjj        = nullptr;
+  mEtaFirst = nullptr;
+  mPhiFirst = nullptr;
+  mPtFirst = nullptr;
+  mMjj = nullptr;
   mNJetsEta_B_20_40 = nullptr;
   mNJetsEta_E_20_40 = nullptr;
   mNJetsEta_B_40 = nullptr;
   mNJetsEta_E_40 = nullptr;
-  mNJets1     = nullptr;
-  mNJets2     = nullptr;
+  mNJets1 = nullptr;
+  mNJets2 = nullptr;
 
-//  // PFJet specific
-//  mHadEnergyInHF       = 0;
-//  mEmEnergyInHF        = 0;
-//  mChargedEmEnergy     = 0;
-//  mChargedHadronEnergy = 0;
-//  mNeutralEmEnergy     = 0;
-//  mNeutralHadronEnergy = 0;
+  //  // PFJet specific
+  //  mHadEnergyInHF       = 0;
+  //  mEmEnergyInHF        = 0;
+  //  mChargedEmEnergy     = 0;
+  //  mChargedHadronEnergy = 0;
+  //  mNeutralEmEnergy     = 0;
+  //  mNeutralHadronEnergy = 0;
 
   // ---- Calo Jet specific information ----
   /// returns the maximum energy deposited in ECAL towers
@@ -178,14 +181,16 @@ JetTester::JetTester(const edm::ParameterSet& iConfig) :
   emEnergyInHF = nullptr;
   /// returns area of contributing towers
   towersArea = nullptr;
-  /// returns the number of constituents carrying a 90% of the total Jet energy*/
+  /// returns the number of constituents carrying a 90% of the total Jet
+  /// energy*/
   n90 = nullptr;
-  /// returns the number of constituents carrying a 60% of the total Jet energy*/
+  /// returns the number of constituents carrying a 60% of the total Jet
+  /// energy*/
   n60 = nullptr;
 
   // ---- JPT Jet specific information ----
   /// chargedMultiplicity
-//  elecMultiplicity = 0;
+  //  elecMultiplicity = 0;
 
   // ---- JPT or PF Jet specific information ----
   /// muonMultiplicity
@@ -254,275 +259,291 @@ JetTester::JetTester(const edm::ParameterSet& iConfig) :
   /// HOEnergyFraction (relative to corrected jet energy)
   HOEnergyFraction = nullptr;
 
-  hadronFlavor=nullptr;
-  partonFlavor=nullptr;
-  genPartonPDGID=nullptr;
-
+  hadronFlavor = nullptr;
+  partonFlavor = nullptr;
+  genPartonPDGID = nullptr;
 }
 
-void JetTester::bookHistograms(DQMStore::IBooker & ibooker,
-                                  edm::Run const & iRun,
-                                  edm::EventSetup const & ) { 
-
-  ibooker.setCurrentFolder("JetMET/JetValidation/"+mInputCollection.label());  
-
-    double log10PtMin  = 0.50;
-    double log10PtMax  = 3.75;
-    int    log10PtBins = 26; 
-
-    //if eta range changed here need change in JetTesterPostProcessor as well
-    double etaRange[91] = {-6.0, -5.8, -5.6, -5.4, -5.2, -5.0, -4.8, -4.6, -4.4, -4.2,
-		     -4.0, -3.8, -3.6, -3.4, -3.2, -3.0, -2.9, -2.8, -2.7, -2.6,
-		     -2.5, -2.4, -2.3, -2.2, -2.1, -2.0, -1.9, -1.8, -1.7, -1.6,
-		     -1.5, -1.4, -1.3, -1.2, -1.1, -1.0, -0.9, -0.8, -0.7, -0.6,
-		     -0.5, -0.4, -0.3, -0.2, -0.1,
-		     0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9,
-		     1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9,
-		     2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9,
-		     3.0, 3.2, 3.4, 3.6, 3.8, 4.0, 4.2, 4.4, 4.6, 4.8,
-		     5.0, 5.2, 5.4, 5.6, 5.8, 6.0};
-
-    // Event variables
-    mNvtx           = ibooker.book1D("Nvtx",           "number of vertices", 60, 0, 60);
-
-    // Jet parameters
-    mEta          = ibooker.book1D("Eta",          "Eta",          120,   -6,    6); 
-    mPhi          = ibooker.book1D("Phi",          "Phi",           70, -3.5,  3.5); 
-    mPt           = ibooker.book1D("Pt",           "Pt",           100,    0,  1000); 
-    mP            = ibooker.book1D("P",            "P",            100,    0,  1000); 
-    mEnergy       = ibooker.book1D("Energy",       "Energy",       100,    0,  1000); 
-    mMass         = ibooker.book1D("Mass",         "Mass",         100,    0,  200); 
-    mConstituents = ibooker.book1D("Constituents", "Constituents", 100,    0,  100); 
-    mJetArea      = ibooker.book1D("JetArea",      "JetArea",       100,   0, 4);
-    //jet flavors contained in MiniAOD
-    if (isMiniAODJet){
-      hadronFlavor=ibooker.book1D("HadronFlavor",  "HadronFlavor",  44,  -22, 22);
-      partonFlavor=ibooker.book1D("PartonFlavor",  "PartonFlavor",  44,  -22, 22);
-      genPartonPDGID=ibooker.book1D("genPartonPDGID",  "genPartonPDGID",  44,  -22, 22);
-    }
-    // Corrected jets
-    if (isMiniAODJet || !mJetCorrector.label().empty())	{//if correction label is filled, but fill also for MiniAOD though
-      mCorrJetPt  = ibooker.book1D("CorrJetPt",  "CorrJetPt",  150,    0, 1500);
-      mCorrJetEta = ibooker.book1D("CorrJetEta", "CorrJetEta Pt>20", 60,   -6,   6);
-      mCorrJetPhi = ibooker.book1D("CorrJetPhi", "CorrJetPhi Pt>20",  70, -3.5, 3.5);
-      mCorrJetEta_Pt40 = ibooker.book1D("CorrJetEta_Pt40", "CorrJetEta Pt>40", 60,   -6,   6);
-      mCorrJetPhi_Pt40 = ibooker.book1D("CorrJetPhi_Pt40", "CorrJetPhi Pt>40",  70, -3.5, 3.5);
-
-      // Corrected jets profiles
-      mPtCorrOverReco_Pt_B = ibooker.bookProfile("PtCorrOverReco_Pt_B", "0<|eta|<1.5", log10PtBins, log10PtMin, log10PtMax, 0, 5, " ");
-      mPtCorrOverReco_Pt_E = ibooker.bookProfile("PtCorrOverReco_Pt_E", "1.5<|eta|<3", log10PtBins, log10PtMin, log10PtMax, 0, 5, " ");
-      mPtCorrOverReco_Pt_F = ibooker.bookProfile("PtCorrOverReco_Pt_F", "3<|eta|<6",   log10PtBins, log10PtMin, log10PtMax, 0, 5, " ");
-
-      mPtCorrOverReco_Eta_20_40    = ibooker.bookProfile("PtCorrOverReco_Eta_20_40",    "20<genPt<40",    90, etaRange, 0, 5, " ");
-      mPtCorrOverReco_Eta_40_200    = ibooker.bookProfile("PtCorrOverReco_Eta_40_200",    "40<genPt<200",    90, etaRange, 0, 5, " ");
-      mPtCorrOverReco_Eta_200_600   = ibooker.bookProfile("PtCorrOverReco_Eta_200_600",   "200<genPt<600",   90, etaRange, 0, 5, " ");
-      mPtCorrOverReco_Eta_600_1500  = ibooker.bookProfile("PtCorrOverReco_Eta_600_1500",  "600<genPt<1500",  90, etaRange, 0, 5, " ");
-      mPtCorrOverReco_Eta_1500_3500 = ibooker.bookProfile("PtCorrOverReco_Eta_1500_3500", "1500<genPt<3500", 90, etaRange, 0, 5, " ");
-      mPtCorrOverReco_Eta_3500_5000 = ibooker.bookProfile("PtCorrOverReco_Eta_3500_5000", "3500<genPt<5000", 90, etaRange, 0, 5, " ");
-      mPtCorrOverReco_Eta_5000_6500 = ibooker.bookProfile("PtCorrOverReco_Eta_5000_6500", "5000<genPt<6500", 90, etaRange, 0, 5, " ");
-      mPtCorrOverReco_Eta_3500      = ibooker.bookProfile("PtCorrOverReco_Eta_3500",      "genPt>3500",      90, etaRange, 0, 5, " ");
-
-      mPtCorrOverGen_GenPt_B = ibooker.bookProfile("PtCorrOverGen_GenPt_B", "0<|eta|<1.5", log10PtBins, log10PtMin, log10PtMax, 0.8, 1.2, " ");
-      mPtCorrOverGen_GenPt_E = ibooker.bookProfile("PtCorrOverGen_GenPt_E", "1.5<|eta|<3", log10PtBins, log10PtMin, log10PtMax, 0.8, 1.2, " ");
-      mPtCorrOverGen_GenPt_F = ibooker.bookProfile("PtCorrOverGen_GenPt_F", "3<|eta|<6",   log10PtBins, log10PtMin, log10PtMax, 0.8, 1.2, " ");
-      //if eta range changed here need change in JetTesterPostProcessor as well
-      mPtCorrOverGen_GenEta_20_40    = ibooker.bookProfile("PtCorrOverGen_GenEta_20_40",      "20<genPt<40;#eta",    90, etaRange, 0.8, 1.2, " ");
-      mPtCorrOverGen_GenEta_40_200    = ibooker.bookProfile("PtCorrOverGen_GenEta_40_200",    "40<genPt<200;#eta",    90, etaRange, 0.8, 1.2, " ");
-      mPtCorrOverGen_GenEta_200_600   = ibooker.bookProfile("PtCorrOverGen_GenEta_200_600",   "200<genPt<600;#eta",   90, etaRange, 0.8, 1.2, " ");
-      mPtCorrOverGen_GenEta_600_1500  = ibooker.bookProfile("PtCorrOverGen_GenEta_600_1500",  "600<genPt<1500;#eta",  90, etaRange, 0.8, 1.2, " ");
-      mPtCorrOverGen_GenEta_1500_3500 = ibooker.bookProfile("PtCorrOverGen_GenEta_1500_3500", "1500<genPt<3500;#eta", 90, etaRange, 0.8, 1.2, " ");
-      mPtCorrOverGen_GenEta_3500_5000 = ibooker.bookProfile("PtCorrOverGen_GenEta_3500_5000", "3500<genPt<5000;#eta", 90, etaRange, 0.8, 1.2, " ");
-      mPtCorrOverGen_GenEta_5000_6500 = ibooker.bookProfile("PtCorrOverGen_GenEta_5000_6500", "5000<genPt<6500;#eta", 90, etaRange, 0.8, 1.2, " ");
-      mPtCorrOverGen_GenEta_3500      = ibooker.bookProfile("PtCorrOverGen_GenEta_3500",      "genPt>3500;#eta",      90, etaRange, 0.8, 1.2, " ");
-    }
+void JetTester::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &iRun, edm::EventSetup const &) {
+  ibooker.setCurrentFolder("JetMET/JetValidation/" + mInputCollection.label());
 
-    mGenEta      = ibooker.book1D("GenEta",      "GenEta",      120,   -6,    6);
-    mGenPhi      = ibooker.book1D("GenPhi",      "GenPhi",       70, -3.5,  3.5);
-    mGenPt       = ibooker.book1D("GenPt",       "GenPt",       100,    0,  1000);
-    mGenEtaFirst = ibooker.book1D("GenEtaFirst", "GenEtaFirst", 120,   -6,    6);
-    mGenPhiFirst = ibooker.book1D("GenPhiFirst", "GenPhiFirst",  70, -3.5,  3.5);
-    mPtHat       = ibooker.book1D("PtHat",       "PtHat",       100,    0, 1000); 
-    mDeltaEta    = ibooker.book1D("DeltaEta",    "DeltaEta",    100, -0.5,  0.5);
-    mDeltaPhi    = ibooker.book1D("DeltaPhi",    "DeltaPhi",    100, -0.5,  0.5);
-    mDeltaPt     = ibooker.book1D("DeltaPt",     "DeltaPt",     100, -1.0,  1.0);
-    
-    mPtRecoOverGen_B_20_40    = ibooker.book1D("PtRecoOverGen_B_20_40",    "20<genpt<40",    90, 0, 2);
-    mPtRecoOverGen_E_20_40    = ibooker.book1D("PtRecoOverGen_E_20_40",    "20<genpt<40",    90, 0, 2);
-    mPtRecoOverGen_F_20_40    = ibooker.book1D("PtRecoOverGen_F_20_40",    "20<genpt<40",    90, 0, 2);
-    mPtRecoOverGen_B_40_200    = ibooker.book1D("PtRecoOverGen_B_40_200",    "40<genpt<200",    90, 0, 2);
-    mPtRecoOverGen_E_40_200    = ibooker.book1D("PtRecoOverGen_E_40_200",    "40<genpt<200",    90, 0, 2);
-    mPtRecoOverGen_F_40_200    = ibooker.book1D("PtRecoOverGen_F_40_200",    "40<genpt<200",    90, 0, 2);
-    mPtRecoOverGen_B_200_600   = ibooker.book1D("PtRecoOverGen_B_200_600",   "200<genpt<600",   90, 0, 2);
-    mPtRecoOverGen_E_200_600   = ibooker.book1D("PtRecoOverGen_E_200_600",   "200<genpt<600",   90, 0, 2);
-    mPtRecoOverGen_F_200_600   = ibooker.book1D("PtRecoOverGen_F_200_600",   "200<genpt<600",   90, 0, 2);
-    mPtRecoOverGen_B_600_1500  = ibooker.book1D("PtRecoOverGen_B_600_1500",  "600<genpt<1500",  90, 0, 2);
-    mPtRecoOverGen_E_600_1500  = ibooker.book1D("PtRecoOverGen_E_600_1500",  "600<genpt<1500",  90, 0, 2);
-    mPtRecoOverGen_F_600_1500  = ibooker.book1D("PtRecoOverGen_F_600_1500",  "600<genpt<1500",  90, 0, 2);
-    mPtRecoOverGen_B_1500_3500 = ibooker.book1D("PtRecoOverGen_B_1500_3500", "1500<genpt<3500", 90, 0, 2);
-    mPtRecoOverGen_E_1500_3500 = ibooker.book1D("PtRecoOverGen_E_1500_3500", "1500<genpt<3500", 90, 0, 2);
-    mPtRecoOverGen_F_1500_3500 = ibooker.book1D("PtRecoOverGen_F_1500_3500", "1500<genpt<3500", 90, 0, 2);
-    mPtRecoOverGen_B_3500_5000 = ibooker.book1D("PtRecoOverGen_B_3500_5000", "3500<genpt<5000", 90, 0, 2);
-    mPtRecoOverGen_E_3500_5000 = ibooker.book1D("PtRecoOverGen_E_3500_5000", "3500<genpt<5000", 90, 0, 2);
-    mPtRecoOverGen_B_5000_6500 = ibooker.book1D("PtRecoOverGen_B_5000_6500", "5000<genpt<6500", 90, 0, 2);
-    mPtRecoOverGen_E_5000_6500 = ibooker.book1D("PtRecoOverGen_E_5000_6500", "5000<genpt<6500", 90, 0, 2);
-    mPtRecoOverGen_B_3500      = ibooker.book1D("PtRecoOverGen_B_3500",      "genpt>3500",      90, 0, 2);
-    mPtRecoOverGen_E_3500      = ibooker.book1D("PtRecoOverGen_E_3500",      "genpt>3500",      90, 0, 2);
-    mPtRecoOverGen_F_3500      = ibooker.book1D("PtRecoOverGen_F_3500",      "genpt>3500",      90, 0, 2);
-
-    mMassRecoOverGen_B_20_40    = ibooker.book1D("MassRecoOverGen_B_20_40",    "20<genpt<40",    90, 0, 3);
-    mMassRecoOverGen_E_20_40    = ibooker.book1D("MassRecoOverGen_E_20_40",    "20<genpt<40",    90, 0, 3);
-    mMassRecoOverGen_F_20_40    = ibooker.book1D("MassRecoOverGen_F_20_40",    "20<genpt<40",    90, 0, 3);
-    mMassRecoOverGen_B_40_200    = ibooker.book1D("MassRecoOverGen_B_40_200",    "40<genpt<200",    90, 0, 3);
-    mMassRecoOverGen_E_40_200    = ibooker.book1D("MassRecoOverGen_E_40_200",    "40<genpt<200",    90, 0, 3);
-    mMassRecoOverGen_F_40_200    = ibooker.book1D("MassRecoOverGen_F_40_200",    "40<genpt<200",    90, 0, 3);
-    mMassRecoOverGen_B_200_500    = ibooker.book1D("MassRecoOverGen_B_200_500",    "200<genpt<500",    90, 0, 3);
-    mMassRecoOverGen_E_200_500    = ibooker.book1D("MassRecoOverGen_E_200_500",    "200<genpt<500",    90, 0, 3);
-    mMassRecoOverGen_F_200_500    = ibooker.book1D("MassRecoOverGen_F_200_500",    "200<genpt<500",    90, 0, 3);
-    mMassRecoOverGen_B_500_750    = ibooker.book1D("MassRecoOverGen_B_500_750",    "500<genpt<750",    90, 0, 3);
-    mMassRecoOverGen_E_500_750    = ibooker.book1D("MassRecoOverGen_E_500_750",    "500<genpt<750",    90, 0, 3);
-    mMassRecoOverGen_F_500_750    = ibooker.book1D("MassRecoOverGen_F_500_750",    "500<genpt<750",    90, 0, 3);
-    mMassRecoOverGen_B_750_1000    = ibooker.book1D("MassRecoOverGen_B_750_1000",    "750<genpt<1000",    90, 0, 3);
-    mMassRecoOverGen_E_750_1000    = ibooker.book1D("MassRecoOverGen_E_750_1000",    "750<genpt<1000",    90, 0, 3);
-    mMassRecoOverGen_F_750_1000    = ibooker.book1D("MassRecoOverGen_F_750_1000",    "750<genpt<1000",    90, 0, 3);
-    mMassRecoOverGen_B_1000_1500    = ibooker.book1D("MassRecoOverGen_B_1000_1500",    "1000<genpt<1500",    90, 0, 3);
-    mMassRecoOverGen_E_1000_1500    = ibooker.book1D("MassRecoOverGen_E_1000_1500",    "1000<genpt<1500",    90, 0, 3);
-    mMassRecoOverGen_F_1000_1500    = ibooker.book1D("MassRecoOverGen_F_1000_1500",    "1000<genpt<1500",    90, 0, 3);
-    mMassRecoOverGen_B_1500_3500    = ibooker.book1D("MassRecoOverGen_B_1500_3500",    "1500<genpt<3500",    90, 0, 3);
-    mMassRecoOverGen_E_1500_3500    = ibooker.book1D("MassRecoOverGen_E_1500_3500",    "1500<genpt<3500",    90, 0, 3);
-    mMassRecoOverGen_F_1500         = ibooker.book1D("MassRecoOverGen_F_1500",         "genpt>1500",    90, 0, 3);
-    mMassRecoOverGen_B_3500_5000    = ibooker.book1D("MassRecoOverGen_B_3500_5000",    "3500<genpt<5000",    90, 0, 3);
-    mMassRecoOverGen_E_3500_5000    = ibooker.book1D("MassRecoOverGen_E_3500_5000",    "3500<genpt<5000",    90, 0, 3);
-    mMassRecoOverGen_B_5000         = ibooker.book1D("MassRecoOverGen_B_5000",    "genpt>5000",    90, 0, 3);
-    mMassRecoOverGen_E_5000         = ibooker.book1D("MassRecoOverGen_E_5000",    "genpt>5000",    90, 0, 3);
-
-    // Generation profiles
-    mPtRecoOverGen_GenPt_B          = ibooker.bookProfile("PtRecoOverGen_GenPt_B",          "0<|eta|<1.5",     log10PtBins, log10PtMin, log10PtMax, 0, 2, " ");
-    mPtRecoOverGen_GenPt_E          = ibooker.bookProfile("PtRecoOverGen_GenPt_E",          "1.5<|eta|<3",     log10PtBins, log10PtMin, log10PtMax, 0, 2, " ");
-    mPtRecoOverGen_GenPt_F          = ibooker.bookProfile("PtRecoOverGen_GenPt_F",          "3<|eta|<6",       log10PtBins, log10PtMin, log10PtMax, 0, 2, " ");
-    mPtRecoOverGen_GenPhi_B         = ibooker.bookProfile("PtRecoOverGen_GenPhi_B",         "0<|eta|<1.5",     70, -3.5, 3.5, 0, 2, " ");
-    mPtRecoOverGen_GenPhi_E         = ibooker.bookProfile("PtRecoOverGen_GenPhi_E",         "1.5<|eta|<3",     70, -3.5, 3.5, 0, 2, " ");
-    mPtRecoOverGen_GenPhi_F         = ibooker.bookProfile("PtRecoOverGen_GenPhi_F",         "3<|eta|<6",       70, -3.5, 3.5, 0, 2, " ");
-    //if eta range changed here need change in JetTesterPostProcessor as well
-    mPtRecoOverGen_GenEta_20_40    = ibooker.bookProfile("PtRecoOverGen_GenEta_20_40",    "20<genpt<40",    90, etaRange, 0, 2, " ");
-    mPtRecoOverGen_GenEta_40_200    = ibooker.bookProfile("PtRecoOverGen_GenEta_40_200",    "40<genpt<200",    90, etaRange, 0, 2, " ");
-    mPtRecoOverGen_GenEta_200_600   = ibooker.bookProfile("PtRecoOverGen_GenEta_200_600",   "200<genpt<600",   90, etaRange, 0, 2, " ");
-    mPtRecoOverGen_GenEta_600_1500  = ibooker.bookProfile("PtRecoOverGen_GenEta_600_1500",  "600<genpt<1500",  90, etaRange, 0, 2, " ");
-    mPtRecoOverGen_GenEta_1500_3500 = ibooker.bookProfile("PtRecoOverGen_GenEta_1500_3500", "1500<genpt<3500", 90, etaRange, 0, 2, " ");
-    mPtRecoOverGen_GenEta_3500_5000 = ibooker.bookProfile("PtRecoOverGen_GenEta_3500_5000", "3500<genpt<5000", 90, etaRange, 0, 2, " ");
-    mPtRecoOverGen_GenEta_5000_6500 = ibooker.bookProfile("PtRecoOverGen_GenEta_5000_6500", "5000<genpt<6500", 90, etaRange, 0, 2, " ");
-    mPtRecoOverGen_GenEta_3500      = ibooker.bookProfile("PtRecoOverGen_GenEta_3500",      "genpt>3500",      90, etaRange, 0, 2, " "); 
-  
-    // Some jet algebra
-    //------------------------------------------------------------------------
-    mEtaFirst   = ibooker.book1D("EtaFirst",   "EtaFirst",   120,   -6,    6); 
-    mPhiFirst   = ibooker.book1D("PhiFirst",   "PhiFirst",    70, -3.5,  3.5);      
-    mPtFirst    = ibooker.book1D("PtFirst",    "PtFirst",    50,    0,  1000); 
-    mMjj        = ibooker.book1D("Mjj",        "Mjj",        100,    0, 2000); 
-    mNJetsEta_B_20_40 = ibooker.book1D("NJetsEta_B_20_40", "NJetsEta_B 20<Pt<40",  15,    0,   15);
-    mNJetsEta_E_20_40 = ibooker.book1D("NJetsEta_E_20_40", "NJetsEta_E 20<Pt<40",  15,    0,   15);
-    mNJetsEta_B_40 = ibooker.book1D("NJetsEta_B", "NJetsEta_B 40<Pt",  15,    0,   15);
-    mNJetsEta_E_40 = ibooker.book1D("NJetsEta_E", "NJetsEta_E 40<Pt",  15,    0,   15);
-    mNJets_40 = ibooker.book1D("NJets", "NJets 40>Pt",  15,    0,   15);
-    mNJets1 = ibooker.bookProfile("NJets1", "Number of jets above Pt threshold", 100, 0,  200, 100, 0, 50, "s");
-    mNJets2 = ibooker.bookProfile("NJets2", "Number of jets above Pt threshold", 100, 0, 4000, 100, 0, 50, "s");
-
-
-    if (isCaloJet) {
-      maxEInEmTowers              = ibooker.book1D("maxEInEmTowers", "maxEInEmTowers", 50,0,500);
-      maxEInHadTowers             = ibooker.book1D("maxEInHadTowers", "maxEInHadTowers", 50,0,500);
-      energyFractionHadronic      = ibooker.book1D("energyFractionHadronic", "energyFractionHadronic", 50,0,1);
-      emEnergyFraction            = ibooker.book1D("emEnergyFraction", "emEnergyFraction", 50,0,1);
-      hadEnergyInHB               = ibooker.book1D("hadEnergyInHB", "hadEnergyInHB", 50,0,500);
-      hadEnergyInHO               = ibooker.book1D("hadEnergyInHO", "hadEnergyInHO", 50,0,500);
-      hadEnergyInHE               = ibooker.book1D("hadEnergyInHE", "hadEnergyInHE", 50,0,500);
-      hadEnergyInHF               = ibooker.book1D("hadEnergyInHF", "hadEnergyInHF", 50,0,500);
-      emEnergyInEB                = ibooker.book1D("emEnergyInEB", "emEnergyInEB", 50,0,500);
-      emEnergyInEE                = ibooker.book1D("emEnergyInEE", "emEnergyInEE", 50,0,500);
-      emEnergyInHF                = ibooker.book1D("emEnergyInHF", "emEnergyInHF", 50,0,500);
-      towersArea                  = ibooker.book1D("towersArea", "towersArea", 50,0,1);
-      n90                         = ibooker.book1D("n90", "n90", 30,0,30);
-      n60                         = ibooker.book1D("n60", "n60", 30,0,30);
-    }
+  double log10PtMin = 0.50;
+  double log10PtMax = 3.75;
+  int log10PtBins = 26;
 
-    if (isPFJet || isMiniAODJet) {
-      muonMultiplicity = ibooker.book1D("muonMultiplicity", "muonMultiplicity", 10,0,10);
-      chargedMultiplicity = ibooker.book1D("chargedMultiplicity", "chargedMultiplicity", 100,0,100);
-      chargedEmEnergy = ibooker.book1D("chargedEmEnergy", "chargedEmEnergy", 100,0,500);
-      neutralEmEnergy = ibooker.book1D("neutralEmEnergy", "neutralEmEnergy", 100,0,500);
-      chargedHadronEnergy = ibooker.book1D("chargedHadronEnergy", "chargedHadronEnergy", 100,0,500);
-      neutralHadronEnergy = ibooker.book1D("neutralHadronEnergy", "neutralHadronEnergy", 100,0,500);
-      chargedHadronEnergyFraction = ibooker.book1D("chargedHadronEnergyFraction", "chargedHadronEnergyFraction", 50,0,1);
-      neutralHadronEnergyFraction = ibooker.book1D("neutralHadronEnergyFraction", "neutralHadronEnergyFraction", 50,0,1);
-      chargedEmEnergyFraction = ibooker.book1D("chargedEmEnergyFraction", "chargedEmEnergyFraction", 50,0,1);
-      neutralEmEnergyFraction = ibooker.book1D("neutralEmEnergyFraction", "neutralEmEnergyFraction", 50,0,1);
-      photonEnergy = ibooker.book1D("photonEnergy", "photonEnergy", 50,0,500);
-      photonEnergyFraction = ibooker.book1D("photonEnergyFraction", "photonEnergyFraction", 50,0,1);
-      electronEnergy = ibooker.book1D("electronEnergy", "electronEnergy", 50,0,500);
-      electronEnergyFraction = ibooker.book1D("electronEnergyFraction", "electronEnergyFraction", 50,0,1);
-      muonEnergy = ibooker.book1D("muonEnergy", "muonEnergy", 50,0,500);
-      muonEnergyFraction = ibooker.book1D("muonEnergyFraction", "muonEnergyFraction", 50,0,1);
-      HFHadronEnergy = ibooker.book1D("HFHadronEnergy", "HFHadronEnergy", 50,0,500);
-      HFHadronEnergyFraction = ibooker.book1D("HFHadronEnergyFraction", "HFHadronEnergyFraction", 50,0,1);
-      HFEMEnergy = ibooker.book1D("HFEMEnergy", "HFEMEnergy", 50,0,500);
-      HFEMEnergyFraction = ibooker.book1D("HFEMEnergyFraction", "HFEMEnergyFraction", 50,0,1);
-      chargedHadronMultiplicity = ibooker.book1D("chargedHadronMultiplicity", "chargedHadronMultiplicity", 50,0,50);
-      neutralHadronMultiplicity = ibooker.book1D("neutralHadronMultiplicity", "neutralHadronMultiplicity", 50,0,50);
-      photonMultiplicity = ibooker.book1D("photonMultiplicity", "photonMultiplicity", 10,0,10);
-      electronMultiplicity = ibooker.book1D("electronMultiplicity", "electronMultiplicity", 10,0,10);
-      HFHadronMultiplicity = ibooker.book1D("HFHadronMultiplicity", "HFHadronMultiplicity", 50,0,50);
-      HFEMMultiplicity = ibooker.book1D("HFEMMultiplicity", "HFEMMultiplicity", 50,0,50);
-      chargedMuEnergy = ibooker.book1D("chargedMuEnergy", "chargedMuEnergy", 50,0,500);
-      chargedMuEnergyFraction = ibooker.book1D("chargedMuEnergyFraction", "chargedMuEnergyFraction", 50,0,1);
-      neutralMultiplicity = ibooker.book1D("neutralMultiplicity", "neutralMultiplicity", 50,0,50);
-      HOEnergy = ibooker.book1D("HOEnergy", "HOEnergy", 50,0,500);
-      HOEnergyFraction = ibooker.book1D("HOEnergyFraction", "HOEnergyFraction", 50,0,1);
-    }
-}
+  // if eta range changed here need change in JetTesterPostProcessor as well
+  double etaRange[91] = {-6.0, -5.8, -5.6, -5.4, -5.2, -5.0, -4.8, -4.6, -4.4, -4.2, -4.0, -3.8, -3.6, -3.4, -3.2, -3.0,
+                         -2.9, -2.8, -2.7, -2.6, -2.5, -2.4, -2.3, -2.2, -2.1, -2.0, -1.9, -1.8, -1.7, -1.6, -1.5, -1.4,
+                         -1.3, -1.2, -1.1, -1.0, -0.9, -0.8, -0.7, -0.6, -0.5, -0.4, -0.3, -0.2, -0.1, 0.0,  0.1,  0.2,
+                         0.3,  0.4,  0.5,  0.6,  0.7,  0.8,  0.9,  1.0,  1.1,  1.2,  1.3,  1.4,  1.5,  1.6,  1.7,  1.8,
+                         1.9,  2.0,  2.1,  2.2,  2.3,  2.4,  2.5,  2.6,  2.7,  2.8,  2.9,  3.0,  3.2,  3.4,  3.6,  3.8,
+                         4.0,  4.2,  4.4,  4.6,  4.8,  5.0,  5.2,  5.4,  5.6,  5.8,  6.0};
+
+  // Event variables
+  mNvtx = ibooker.book1D("Nvtx", "number of vertices", 60, 0, 60);
+
+  // Jet parameters
+  mEta = ibooker.book1D("Eta", "Eta", 120, -6, 6);
+  mPhi = ibooker.book1D("Phi", "Phi", 70, -3.5, 3.5);
+  mPt = ibooker.book1D("Pt", "Pt", 100, 0, 1000);
+  mP = ibooker.book1D("P", "P", 100, 0, 1000);
+  mEnergy = ibooker.book1D("Energy", "Energy", 100, 0, 1000);
+  mMass = ibooker.book1D("Mass", "Mass", 100, 0, 200);
+  mConstituents = ibooker.book1D("Constituents", "Constituents", 100, 0, 100);
+  mJetArea = ibooker.book1D("JetArea", "JetArea", 100, 0, 4);
+  // jet flavors contained in MiniAOD
+  if (isMiniAODJet) {
+    hadronFlavor = ibooker.book1D("HadronFlavor", "HadronFlavor", 44, -22, 22);
+    partonFlavor = ibooker.book1D("PartonFlavor", "PartonFlavor", 44, -22, 22);
+    genPartonPDGID = ibooker.book1D("genPartonPDGID", "genPartonPDGID", 44, -22, 22);
+  }
+  // Corrected jets
+  if (isMiniAODJet || !mJetCorrector.label().empty()) {  // if correction label is filled, but
+                                                         // fill also for MiniAOD though
+    mCorrJetPt = ibooker.book1D("CorrJetPt", "CorrJetPt", 150, 0, 1500);
+    mCorrJetEta = ibooker.book1D("CorrJetEta", "CorrJetEta Pt>20", 60, -6, 6);
+    mCorrJetPhi = ibooker.book1D("CorrJetPhi", "CorrJetPhi Pt>20", 70, -3.5, 3.5);
+    mCorrJetEta_Pt40 = ibooker.book1D("CorrJetEta_Pt40", "CorrJetEta Pt>40", 60, -6, 6);
+    mCorrJetPhi_Pt40 = ibooker.book1D("CorrJetPhi_Pt40", "CorrJetPhi Pt>40", 70, -3.5, 3.5);
+
+    // Corrected jets profiles
+    mPtCorrOverReco_Pt_B =
+        ibooker.bookProfile("PtCorrOverReco_Pt_B", "0<|eta|<1.5", log10PtBins, log10PtMin, log10PtMax, 0, 5, " ");
+    mPtCorrOverReco_Pt_E =
+        ibooker.bookProfile("PtCorrOverReco_Pt_E", "1.5<|eta|<3", log10PtBins, log10PtMin, log10PtMax, 0, 5, " ");
+    mPtCorrOverReco_Pt_F =
+        ibooker.bookProfile("PtCorrOverReco_Pt_F", "3<|eta|<6", log10PtBins, log10PtMin, log10PtMax, 0, 5, " ");
+
+    mPtCorrOverReco_Eta_20_40 = ibooker.bookProfile("PtCorrOverReco_Eta_20_40", "20<genPt<40", 90, etaRange, 0, 5, " ");
+    mPtCorrOverReco_Eta_40_200 =
+        ibooker.bookProfile("PtCorrOverReco_Eta_40_200", "40<genPt<200", 90, etaRange, 0, 5, " ");
+    mPtCorrOverReco_Eta_200_600 =
+        ibooker.bookProfile("PtCorrOverReco_Eta_200_600", "200<genPt<600", 90, etaRange, 0, 5, " ");
+    mPtCorrOverReco_Eta_600_1500 =
+        ibooker.bookProfile("PtCorrOverReco_Eta_600_1500", "600<genPt<1500", 90, etaRange, 0, 5, " ");
+    mPtCorrOverReco_Eta_1500_3500 =
+        ibooker.bookProfile("PtCorrOverReco_Eta_1500_3500", "1500<genPt<3500", 90, etaRange, 0, 5, " ");
+    mPtCorrOverReco_Eta_3500_5000 =
+        ibooker.bookProfile("PtCorrOverReco_Eta_3500_5000", "3500<genPt<5000", 90, etaRange, 0, 5, " ");
+    mPtCorrOverReco_Eta_5000_6500 =
+        ibooker.bookProfile("PtCorrOverReco_Eta_5000_6500", "5000<genPt<6500", 90, etaRange, 0, 5, " ");
+    mPtCorrOverReco_Eta_3500 = ibooker.bookProfile("PtCorrOverReco_Eta_3500", "genPt>3500", 90, etaRange, 0, 5, " ");
+
+    mPtCorrOverGen_GenPt_B =
+        ibooker.bookProfile("PtCorrOverGen_GenPt_B", "0<|eta|<1.5", log10PtBins, log10PtMin, log10PtMax, 0.8, 1.2, " ");
+    mPtCorrOverGen_GenPt_E =
+        ibooker.bookProfile("PtCorrOverGen_GenPt_E", "1.5<|eta|<3", log10PtBins, log10PtMin, log10PtMax, 0.8, 1.2, " ");
+    mPtCorrOverGen_GenPt_F =
+        ibooker.bookProfile("PtCorrOverGen_GenPt_F", "3<|eta|<6", log10PtBins, log10PtMin, log10PtMax, 0.8, 1.2, " ");
+    // if eta range changed here need change in JetTesterPostProcessor as well
+    mPtCorrOverGen_GenEta_20_40 =
+        ibooker.bookProfile("PtCorrOverGen_GenEta_20_40", "20<genPt<40;#eta", 90, etaRange, 0.8, 1.2, " ");
+    mPtCorrOverGen_GenEta_40_200 =
+        ibooker.bookProfile("PtCorrOverGen_GenEta_40_200", "40<genPt<200;#eta", 90, etaRange, 0.8, 1.2, " ");
+    mPtCorrOverGen_GenEta_200_600 =
+        ibooker.bookProfile("PtCorrOverGen_GenEta_200_600", "200<genPt<600;#eta", 90, etaRange, 0.8, 1.2, " ");
+    mPtCorrOverGen_GenEta_600_1500 =
+        ibooker.bookProfile("PtCorrOverGen_GenEta_600_1500", "600<genPt<1500;#eta", 90, etaRange, 0.8, 1.2, " ");
+    mPtCorrOverGen_GenEta_1500_3500 =
+        ibooker.bookProfile("PtCorrOverGen_GenEta_1500_3500", "1500<genPt<3500;#eta", 90, etaRange, 0.8, 1.2, " ");
+    mPtCorrOverGen_GenEta_3500_5000 =
+        ibooker.bookProfile("PtCorrOverGen_GenEta_3500_5000", "3500<genPt<5000;#eta", 90, etaRange, 0.8, 1.2, " ");
+    mPtCorrOverGen_GenEta_5000_6500 =
+        ibooker.bookProfile("PtCorrOverGen_GenEta_5000_6500", "5000<genPt<6500;#eta", 90, etaRange, 0.8, 1.2, " ");
+    mPtCorrOverGen_GenEta_3500 =
+        ibooker.bookProfile("PtCorrOverGen_GenEta_3500", "genPt>3500;#eta", 90, etaRange, 0.8, 1.2, " ");
+  }
+
+  mGenEta = ibooker.book1D("GenEta", "GenEta", 120, -6, 6);
+  mGenPhi = ibooker.book1D("GenPhi", "GenPhi", 70, -3.5, 3.5);
+  mGenPt = ibooker.book1D("GenPt", "GenPt", 100, 0, 1000);
+  mGenEtaFirst = ibooker.book1D("GenEtaFirst", "GenEtaFirst", 120, -6, 6);
+  mGenPhiFirst = ibooker.book1D("GenPhiFirst", "GenPhiFirst", 70, -3.5, 3.5);
+  mPtHat = ibooker.book1D("PtHat", "PtHat", 100, 0, 1000);
+  mDeltaEta = ibooker.book1D("DeltaEta", "DeltaEta", 100, -0.5, 0.5);
+  mDeltaPhi = ibooker.book1D("DeltaPhi", "DeltaPhi", 100, -0.5, 0.5);
+  mDeltaPt = ibooker.book1D("DeltaPt", "DeltaPt", 100, -1.0, 1.0);
+
+  mPtRecoOverGen_B_20_40 = ibooker.book1D("PtRecoOverGen_B_20_40", "20<genpt<40", 90, 0, 2);
+  mPtRecoOverGen_E_20_40 = ibooker.book1D("PtRecoOverGen_E_20_40", "20<genpt<40", 90, 0, 2);
+  mPtRecoOverGen_F_20_40 = ibooker.book1D("PtRecoOverGen_F_20_40", "20<genpt<40", 90, 0, 2);
+  mPtRecoOverGen_B_40_200 = ibooker.book1D("PtRecoOverGen_B_40_200", "40<genpt<200", 90, 0, 2);
+  mPtRecoOverGen_E_40_200 = ibooker.book1D("PtRecoOverGen_E_40_200", "40<genpt<200", 90, 0, 2);
+  mPtRecoOverGen_F_40_200 = ibooker.book1D("PtRecoOverGen_F_40_200", "40<genpt<200", 90, 0, 2);
+  mPtRecoOverGen_B_200_600 = ibooker.book1D("PtRecoOverGen_B_200_600", "200<genpt<600", 90, 0, 2);
+  mPtRecoOverGen_E_200_600 = ibooker.book1D("PtRecoOverGen_E_200_600", "200<genpt<600", 90, 0, 2);
+  mPtRecoOverGen_F_200_600 = ibooker.book1D("PtRecoOverGen_F_200_600", "200<genpt<600", 90, 0, 2);
+  mPtRecoOverGen_B_600_1500 = ibooker.book1D("PtRecoOverGen_B_600_1500", "600<genpt<1500", 90, 0, 2);
+  mPtRecoOverGen_E_600_1500 = ibooker.book1D("PtRecoOverGen_E_600_1500", "600<genpt<1500", 90, 0, 2);
+  mPtRecoOverGen_F_600_1500 = ibooker.book1D("PtRecoOverGen_F_600_1500", "600<genpt<1500", 90, 0, 2);
+  mPtRecoOverGen_B_1500_3500 = ibooker.book1D("PtRecoOverGen_B_1500_3500", "1500<genpt<3500", 90, 0, 2);
+  mPtRecoOverGen_E_1500_3500 = ibooker.book1D("PtRecoOverGen_E_1500_3500", "1500<genpt<3500", 90, 0, 2);
+  mPtRecoOverGen_F_1500_3500 = ibooker.book1D("PtRecoOverGen_F_1500_3500", "1500<genpt<3500", 90, 0, 2);
+  mPtRecoOverGen_B_3500_5000 = ibooker.book1D("PtRecoOverGen_B_3500_5000", "3500<genpt<5000", 90, 0, 2);
+  mPtRecoOverGen_E_3500_5000 = ibooker.book1D("PtRecoOverGen_E_3500_5000", "3500<genpt<5000", 90, 0, 2);
+  mPtRecoOverGen_B_5000_6500 = ibooker.book1D("PtRecoOverGen_B_5000_6500", "5000<genpt<6500", 90, 0, 2);
+  mPtRecoOverGen_E_5000_6500 = ibooker.book1D("PtRecoOverGen_E_5000_6500", "5000<genpt<6500", 90, 0, 2);
+  mPtRecoOverGen_B_3500 = ibooker.book1D("PtRecoOverGen_B_3500", "genpt>3500", 90, 0, 2);
+  mPtRecoOverGen_E_3500 = ibooker.book1D("PtRecoOverGen_E_3500", "genpt>3500", 90, 0, 2);
+  mPtRecoOverGen_F_3500 = ibooker.book1D("PtRecoOverGen_F_3500", "genpt>3500", 90, 0, 2);
+
+  mMassRecoOverGen_B_20_40 = ibooker.book1D("MassRecoOverGen_B_20_40", "20<genpt<40", 90, 0, 3);
+  mMassRecoOverGen_E_20_40 = ibooker.book1D("MassRecoOverGen_E_20_40", "20<genpt<40", 90, 0, 3);
+  mMassRecoOverGen_F_20_40 = ibooker.book1D("MassRecoOverGen_F_20_40", "20<genpt<40", 90, 0, 3);
+  mMassRecoOverGen_B_40_200 = ibooker.book1D("MassRecoOverGen_B_40_200", "40<genpt<200", 90, 0, 3);
+  mMassRecoOverGen_E_40_200 = ibooker.book1D("MassRecoOverGen_E_40_200", "40<genpt<200", 90, 0, 3);
+  mMassRecoOverGen_F_40_200 = ibooker.book1D("MassRecoOverGen_F_40_200", "40<genpt<200", 90, 0, 3);
+  mMassRecoOverGen_B_200_500 = ibooker.book1D("MassRecoOverGen_B_200_500", "200<genpt<500", 90, 0, 3);
+  mMassRecoOverGen_E_200_500 = ibooker.book1D("MassRecoOverGen_E_200_500", "200<genpt<500", 90, 0, 3);
+  mMassRecoOverGen_F_200_500 = ibooker.book1D("MassRecoOverGen_F_200_500", "200<genpt<500", 90, 0, 3);
+  mMassRecoOverGen_B_500_750 = ibooker.book1D("MassRecoOverGen_B_500_750", "500<genpt<750", 90, 0, 3);
+  mMassRecoOverGen_E_500_750 = ibooker.book1D("MassRecoOverGen_E_500_750", "500<genpt<750", 90, 0, 3);
+  mMassRecoOverGen_F_500_750 = ibooker.book1D("MassRecoOverGen_F_500_750", "500<genpt<750", 90, 0, 3);
+  mMassRecoOverGen_B_750_1000 = ibooker.book1D("MassRecoOverGen_B_750_1000", "750<genpt<1000", 90, 0, 3);
+  mMassRecoOverGen_E_750_1000 = ibooker.book1D("MassRecoOverGen_E_750_1000", "750<genpt<1000", 90, 0, 3);
+  mMassRecoOverGen_F_750_1000 = ibooker.book1D("MassRecoOverGen_F_750_1000", "750<genpt<1000", 90, 0, 3);
+  mMassRecoOverGen_B_1000_1500 = ibooker.book1D("MassRecoOverGen_B_1000_1500", "1000<genpt<1500", 90, 0, 3);
+  mMassRecoOverGen_E_1000_1500 = ibooker.book1D("MassRecoOverGen_E_1000_1500", "1000<genpt<1500", 90, 0, 3);
+  mMassRecoOverGen_F_1000_1500 = ibooker.book1D("MassRecoOverGen_F_1000_1500", "1000<genpt<1500", 90, 0, 3);
+  mMassRecoOverGen_B_1500_3500 = ibooker.book1D("MassRecoOverGen_B_1500_3500", "1500<genpt<3500", 90, 0, 3);
+  mMassRecoOverGen_E_1500_3500 = ibooker.book1D("MassRecoOverGen_E_1500_3500", "1500<genpt<3500", 90, 0, 3);
+  mMassRecoOverGen_F_1500 = ibooker.book1D("MassRecoOverGen_F_1500", "genpt>1500", 90, 0, 3);
+  mMassRecoOverGen_B_3500_5000 = ibooker.book1D("MassRecoOverGen_B_3500_5000", "3500<genpt<5000", 90, 0, 3);
+  mMassRecoOverGen_E_3500_5000 = ibooker.book1D("MassRecoOverGen_E_3500_5000", "3500<genpt<5000", 90, 0, 3);
+  mMassRecoOverGen_B_5000 = ibooker.book1D("MassRecoOverGen_B_5000", "genpt>5000", 90, 0, 3);
+  mMassRecoOverGen_E_5000 = ibooker.book1D("MassRecoOverGen_E_5000", "genpt>5000", 90, 0, 3);
+
+  // Generation profiles
+  mPtRecoOverGen_GenPt_B =
+      ibooker.bookProfile("PtRecoOverGen_GenPt_B", "0<|eta|<1.5", log10PtBins, log10PtMin, log10PtMax, 0, 2, " ");
+  mPtRecoOverGen_GenPt_E =
+      ibooker.bookProfile("PtRecoOverGen_GenPt_E", "1.5<|eta|<3", log10PtBins, log10PtMin, log10PtMax, 0, 2, " ");
+  mPtRecoOverGen_GenPt_F =
+      ibooker.bookProfile("PtRecoOverGen_GenPt_F", "3<|eta|<6", log10PtBins, log10PtMin, log10PtMax, 0, 2, " ");
+  mPtRecoOverGen_GenPhi_B = ibooker.bookProfile("PtRecoOverGen_GenPhi_B", "0<|eta|<1.5", 70, -3.5, 3.5, 0, 2, " ");
+  mPtRecoOverGen_GenPhi_E = ibooker.bookProfile("PtRecoOverGen_GenPhi_E", "1.5<|eta|<3", 70, -3.5, 3.5, 0, 2, " ");
+  mPtRecoOverGen_GenPhi_F = ibooker.bookProfile("PtRecoOverGen_GenPhi_F", "3<|eta|<6", 70, -3.5, 3.5, 0, 2, " ");
+  // if eta range changed here need change in JetTesterPostProcessor as well
+  mPtRecoOverGen_GenEta_20_40 =
+      ibooker.bookProfile("PtRecoOverGen_GenEta_20_40", "20<genpt<40", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_40_200 =
+      ibooker.bookProfile("PtRecoOverGen_GenEta_40_200", "40<genpt<200", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_200_600 =
+      ibooker.bookProfile("PtRecoOverGen_GenEta_200_600", "200<genpt<600", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_600_1500 =
+      ibooker.bookProfile("PtRecoOverGen_GenEta_600_1500", "600<genpt<1500", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_1500_3500 =
+      ibooker.bookProfile("PtRecoOverGen_GenEta_1500_3500", "1500<genpt<3500", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_3500_5000 =
+      ibooker.bookProfile("PtRecoOverGen_GenEta_3500_5000", "3500<genpt<5000", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_5000_6500 =
+      ibooker.bookProfile("PtRecoOverGen_GenEta_5000_6500", "5000<genpt<6500", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_3500 = ibooker.bookProfile("PtRecoOverGen_GenEta_3500", "genpt>3500", 90, etaRange, 0, 2, " ");
 
+  // Some jet algebra
+  //------------------------------------------------------------------------
+  mEtaFirst = ibooker.book1D("EtaFirst", "EtaFirst", 120, -6, 6);
+  mPhiFirst = ibooker.book1D("PhiFirst", "PhiFirst", 70, -3.5, 3.5);
+  mPtFirst = ibooker.book1D("PtFirst", "PtFirst", 50, 0, 1000);
+  mMjj = ibooker.book1D("Mjj", "Mjj", 100, 0, 2000);
+  mNJetsEta_B_20_40 = ibooker.book1D("NJetsEta_B_20_40", "NJetsEta_B 20<Pt<40", 15, 0, 15);
+  mNJetsEta_E_20_40 = ibooker.book1D("NJetsEta_E_20_40", "NJetsEta_E 20<Pt<40", 15, 0, 15);
+  mNJetsEta_B_40 = ibooker.book1D("NJetsEta_B", "NJetsEta_B 40<Pt", 15, 0, 15);
+  mNJetsEta_E_40 = ibooker.book1D("NJetsEta_E", "NJetsEta_E 40<Pt", 15, 0, 15);
+  mNJets_40 = ibooker.book1D("NJets", "NJets 40>Pt", 15, 0, 15);
+  mNJets1 = ibooker.bookProfile("NJets1", "Number of jets above Pt threshold", 100, 0, 200, 100, 0, 50, "s");
+  mNJets2 = ibooker.bookProfile("NJets2", "Number of jets above Pt threshold", 100, 0, 4000, 100, 0, 50, "s");
+
+  if (isCaloJet) {
+    maxEInEmTowers = ibooker.book1D("maxEInEmTowers", "maxEInEmTowers", 50, 0, 500);
+    maxEInHadTowers = ibooker.book1D("maxEInHadTowers", "maxEInHadTowers", 50, 0, 500);
+    energyFractionHadronic = ibooker.book1D("energyFractionHadronic", "energyFractionHadronic", 50, 0, 1);
+    emEnergyFraction = ibooker.book1D("emEnergyFraction", "emEnergyFraction", 50, 0, 1);
+    hadEnergyInHB = ibooker.book1D("hadEnergyInHB", "hadEnergyInHB", 50, 0, 500);
+    hadEnergyInHO = ibooker.book1D("hadEnergyInHO", "hadEnergyInHO", 50, 0, 500);
+    hadEnergyInHE = ibooker.book1D("hadEnergyInHE", "hadEnergyInHE", 50, 0, 500);
+    hadEnergyInHF = ibooker.book1D("hadEnergyInHF", "hadEnergyInHF", 50, 0, 500);
+    emEnergyInEB = ibooker.book1D("emEnergyInEB", "emEnergyInEB", 50, 0, 500);
+    emEnergyInEE = ibooker.book1D("emEnergyInEE", "emEnergyInEE", 50, 0, 500);
+    emEnergyInHF = ibooker.book1D("emEnergyInHF", "emEnergyInHF", 50, 0, 500);
+    towersArea = ibooker.book1D("towersArea", "towersArea", 50, 0, 1);
+    n90 = ibooker.book1D("n90", "n90", 30, 0, 30);
+    n60 = ibooker.book1D("n60", "n60", 30, 0, 30);
+  }
+
+  if (isPFJet || isMiniAODJet) {
+    muonMultiplicity = ibooker.book1D("muonMultiplicity", "muonMultiplicity", 10, 0, 10);
+    chargedMultiplicity = ibooker.book1D("chargedMultiplicity", "chargedMultiplicity", 100, 0, 100);
+    chargedEmEnergy = ibooker.book1D("chargedEmEnergy", "chargedEmEnergy", 100, 0, 500);
+    neutralEmEnergy = ibooker.book1D("neutralEmEnergy", "neutralEmEnergy", 100, 0, 500);
+    chargedHadronEnergy = ibooker.book1D("chargedHadronEnergy", "chargedHadronEnergy", 100, 0, 500);
+    neutralHadronEnergy = ibooker.book1D("neutralHadronEnergy", "neutralHadronEnergy", 100, 0, 500);
+    chargedHadronEnergyFraction =
+        ibooker.book1D("chargedHadronEnergyFraction", "chargedHadronEnergyFraction", 50, 0, 1);
+    neutralHadronEnergyFraction =
+        ibooker.book1D("neutralHadronEnergyFraction", "neutralHadronEnergyFraction", 50, 0, 1);
+    chargedEmEnergyFraction = ibooker.book1D("chargedEmEnergyFraction", "chargedEmEnergyFraction", 50, 0, 1);
+    neutralEmEnergyFraction = ibooker.book1D("neutralEmEnergyFraction", "neutralEmEnergyFraction", 50, 0, 1);
+    photonEnergy = ibooker.book1D("photonEnergy", "photonEnergy", 50, 0, 500);
+    photonEnergyFraction = ibooker.book1D("photonEnergyFraction", "photonEnergyFraction", 50, 0, 1);
+    electronEnergy = ibooker.book1D("electronEnergy", "electronEnergy", 50, 0, 500);
+    electronEnergyFraction = ibooker.book1D("electronEnergyFraction", "electronEnergyFraction", 50, 0, 1);
+    muonEnergy = ibooker.book1D("muonEnergy", "muonEnergy", 50, 0, 500);
+    muonEnergyFraction = ibooker.book1D("muonEnergyFraction", "muonEnergyFraction", 50, 0, 1);
+    HFHadronEnergy = ibooker.book1D("HFHadronEnergy", "HFHadronEnergy", 50, 0, 500);
+    HFHadronEnergyFraction = ibooker.book1D("HFHadronEnergyFraction", "HFHadronEnergyFraction", 50, 0, 1);
+    HFEMEnergy = ibooker.book1D("HFEMEnergy", "HFEMEnergy", 50, 0, 500);
+    HFEMEnergyFraction = ibooker.book1D("HFEMEnergyFraction", "HFEMEnergyFraction", 50, 0, 1);
+    chargedHadronMultiplicity = ibooker.book1D("chargedHadronMultiplicity", "chargedHadronMultiplicity", 50, 0, 50);
+    neutralHadronMultiplicity = ibooker.book1D("neutralHadronMultiplicity", "neutralHadronMultiplicity", 50, 0, 50);
+    photonMultiplicity = ibooker.book1D("photonMultiplicity", "photonMultiplicity", 10, 0, 10);
+    electronMultiplicity = ibooker.book1D("electronMultiplicity", "electronMultiplicity", 10, 0, 10);
+    HFHadronMultiplicity = ibooker.book1D("HFHadronMultiplicity", "HFHadronMultiplicity", 50, 0, 50);
+    HFEMMultiplicity = ibooker.book1D("HFEMMultiplicity", "HFEMMultiplicity", 50, 0, 50);
+    chargedMuEnergy = ibooker.book1D("chargedMuEnergy", "chargedMuEnergy", 50, 0, 500);
+    chargedMuEnergyFraction = ibooker.book1D("chargedMuEnergyFraction", "chargedMuEnergyFraction", 50, 0, 1);
+    neutralMultiplicity = ibooker.book1D("neutralMultiplicity", "neutralMultiplicity", 50, 0, 50);
+    HOEnergy = ibooker.book1D("HOEnergy", "HOEnergy", 50, 0, 500);
+    HOEnergyFraction = ibooker.book1D("HOEnergyFraction", "HOEnergyFraction", 50, 0, 1);
+  }
+}
 
 //------------------------------------------------------------------------------
 // ~JetTester
 //------------------------------------------------------------------------------
 JetTester::~JetTester() {}
 
-
 //------------------------------------------------------------------------------
 // analyze
 //------------------------------------------------------------------------------
-void JetTester::analyze(const edm::Event& mEvent, const edm::EventSetup& mSetup)
-{
+void JetTester::analyze(const edm::Event &mEvent, const edm::EventSetup &mSetup) {
   // Get the primary vertices
   //----------------------------------------------------------------------------
-  edm::Handle<vector<reco::Vertex> > pvHandle;
+  edm::Handle<vector<reco::Vertex>> pvHandle;
   mEvent.getByToken(pvToken_, pvHandle);
 
   int nGoodVertices = 0;
 
-  if (pvHandle.isValid())
-    {
-      for (unsigned i=0; i<pvHandle->size(); i++)
-	{
-	  if ((*pvHandle)[i].ndof() > 4 &&
-	      (fabs((*pvHandle)[i].z()) <= 24) &&
-	      (fabs((*pvHandle)[i].position().rho()) <= 2))
-	    nGoodVertices++;
-	}
+  if (pvHandle.isValid()) {
+    for (unsigned i = 0; i < pvHandle->size(); i++) {
+      if ((*pvHandle)[i].ndof() > 4 && (fabs((*pvHandle)[i].z()) <= 24) && (fabs((*pvHandle)[i].position().rho()) <= 2))
+        nGoodVertices++;
     }
+  }
 
   mNvtx->Fill(nGoodVertices);
 
-//  // Get the jet rho
-//  //----------------------------------------------------------------------------
-//  edm::Handle<double> pRho;
-//  mEvent.getByToken(rhoTag, pRho);
-//
-//  if (pRho.isValid())
-//    {
-//      double jetRho = *pRho;
-//
-//      if (mRho) mRho->Fill(jetRho);
-//    }
-
+  //  // Get the jet rho
+  //  //----------------------------------------------------------------------------
+  //  edm::Handle<double> pRho;
+  //  mEvent.getByToken(rhoTag, pRho);
+  //
+  //  if (pRho.isValid())
+  //    {
+  //      double jetRho = *pRho;
+  //
+  //      if (mRho) mRho->Fill(jetRho);
+  //    }
 
   // Get the Jet collection
   //----------------------------------------------------------------------------
@@ -532,339 +553,397 @@ void JetTester::analyze(const edm::Event& mEvent, const edm::EventSetup& mSetup)
   recoJets.clear();
 
   edm::Handle<CaloJetCollection> caloJets;
-  edm::Handle<PFJetCollection>   pfJets;
-//  edm::Handle<JPTJetCollection>  jptJets;
+  edm::Handle<PFJetCollection> pfJets;
+  //  edm::Handle<JPTJetCollection>  jptJets;
   edm::Handle<pat::JetCollection> patJets;
 
-  if (isCaloJet) mEvent.getByToken(caloJetsToken_, caloJets);
-  if (isPFJet)   mEvent.getByToken(pfJetsToken_, pfJets);
-//  if (isJPTJet)  mEvent.getByToken(jptJetsToken_, jptJets);
-  if (isMiniAODJet)   mEvent.getByToken(patJetsToken_, patJets);
-
-  if (isCaloJet && !caloJets.isValid()) return;
-  if (isPFJet   && !pfJets.isValid())   return;
-//  if (isJPTJet  && !jptJets.isValid())  return;
- if (isMiniAODJet   && !patJets.isValid())   return;
-
-
   if (isCaloJet)
-    {
-      for (unsigned ijet=0; ijet<caloJets->size(); ijet++)
-	recoJets.push_back((*caloJets)[ijet]);
-    }
+    mEvent.getByToken(caloJetsToken_, caloJets);
+  if (isPFJet)
+    mEvent.getByToken(pfJetsToken_, pfJets);
+  //  if (isJPTJet)  mEvent.getByToken(jptJetsToken_, jptJets);
+  if (isMiniAODJet)
+    mEvent.getByToken(patJetsToken_, patJets);
+
+  if (isCaloJet && !caloJets.isValid())
+    return;
+  if (isPFJet && !pfJets.isValid())
+    return;
+  //  if (isJPTJet  && !jptJets.isValid())  return;
+  if (isMiniAODJet && !patJets.isValid())
+    return;
+
+  if (isCaloJet) {
+    for (unsigned ijet = 0; ijet < caloJets->size(); ijet++)
+      recoJets.push_back((*caloJets)[ijet]);
+  }
 
-/*  if (isJPTJet)
-    {
-      for (unsigned ijet=0; ijet<jptJets->size(); ijet++)
-	recoJets.push_back((*jptJets)[ijet]);
-    }*/
+  /*  if (isJPTJet)
+      {
+        for (unsigned ijet=0; ijet<jptJets->size(); ijet++)
+          recoJets.push_back((*jptJets)[ijet]);
+      }*/
 
   if (isPFJet) {
-    for (unsigned ijet=0; ijet<pfJets->size(); ijet++)
+    for (unsigned ijet = 0; ijet < pfJets->size(); ijet++)
       recoJets.push_back((*pfJets)[ijet]);
   }
   if (isMiniAODJet) {
-    for (unsigned ijet=0; ijet<patJets->size(); ijet++)
+    for (unsigned ijet = 0; ijet < patJets->size(); ijet++)
       recoJets.push_back((*patJets)[ijet]);
   }
 
-  int nJet      = 0;
+  int nJet = 0;
   int nJet_E_20_40 = 0;
   int nJet_B_20_40 = 0;
   int nJet_E_40 = 0;
   int nJet_B_40 = 0;
   int nJet_40 = 0;
 
-  int index_first_jet=-1;
-  double pt_first=-1;
+  int index_first_jet = -1;
+  double pt_first = -1;
 
- int index_second_jet=-1;
- double pt_second=-1;
+  int index_second_jet = -1;
+  double pt_second = -1;
 
-  for (unsigned ijet=0; ijet<recoJets.size(); ijet++) {
-    bool pass_lowjet=false;
+  for (unsigned ijet = 0; ijet < recoJets.size(); ijet++) {
+    bool pass_lowjet = false;
     bool pass_mediumjet = false;
-    if(!isMiniAODJet){
-      if (  (recoJets[ijet].pt() > 20.) &&  (recoJets[ijet].pt() < mRecoJetPtThreshold)) {
-	pass_lowjet=true;
+    if (!isMiniAODJet) {
+      if ((recoJets[ijet].pt() > 20.) && (recoJets[ijet].pt() < mRecoJetPtThreshold)) {
+        pass_lowjet = true;
       }
     }
-    if(isMiniAODJet){
-      if((recoJets[ijet].pt()*(*patJets)[ijet].jecFactor("Uncorrected"))>20. && ((recoJets[ijet].pt()*(*patJets)[ijet].jecFactor("Uncorrected")) < mRecoJetPtThreshold)){
-	pass_lowjet=true;
+    if (isMiniAODJet) {
+      if ((recoJets[ijet].pt() * (*patJets)[ijet].jecFactor("Uncorrected")) > 20. &&
+          ((recoJets[ijet].pt() * (*patJets)[ijet].jecFactor("Uncorrected")) < mRecoJetPtThreshold)) {
+        pass_lowjet = true;
       }
     }
     if (pass_lowjet) {
       if (fabs(recoJets[ijet].eta()) > 1.5)
         nJet_E_20_40++;
       else
-        nJet_B_20_40++;	  
+        nJet_B_20_40++;
     }
-    if(!isMiniAODJet){
+    if (!isMiniAODJet) {
       if (recoJets[ijet].pt() > mRecoJetPtThreshold) {
-	pass_mediumjet = true;
+        pass_mediumjet = true;
       }
     }
-    if(isMiniAODJet){
-      if((recoJets[ijet].pt()*(*patJets)[ijet].jecFactor("Uncorrected")) > mRecoJetPtThreshold){
-	pass_mediumjet=true;
+    if (isMiniAODJet) {
+      if ((recoJets[ijet].pt() * (*patJets)[ijet].jecFactor("Uncorrected")) > mRecoJetPtThreshold) {
+        pass_mediumjet = true;
       }
     }
     if (pass_mediumjet) {
-      if(isMiniAODJet){
-	if( (recoJets[ijet].pt()*(*patJets)[ijet].jecFactor("Uncorrected"))>pt_first){
-	  pt_second=pt_first;
-	  pt_first=recoJets[ijet].pt()*(*patJets)[ijet].jecFactor("Uncorrected");
-	  index_second_jet=index_first_jet;
-	  index_first_jet=ijet;
-	}else if( (recoJets[ijet].pt()*(*patJets)[ijet].jecFactor("Uncorrected"))>pt_second){
-	  index_second_jet=ijet;
-	  pt_second=recoJets[ijet].pt()*(*patJets)[ijet].jecFactor("Uncorrected");
-	}
+      if (isMiniAODJet) {
+        if ((recoJets[ijet].pt() * (*patJets)[ijet].jecFactor("Uncorrected")) > pt_first) {
+          pt_second = pt_first;
+          pt_first = recoJets[ijet].pt() * (*patJets)[ijet].jecFactor("Uncorrected");
+          index_second_jet = index_first_jet;
+          index_first_jet = ijet;
+        } else if ((recoJets[ijet].pt() * (*patJets)[ijet].jecFactor("Uncorrected")) > pt_second) {
+          index_second_jet = ijet;
+          pt_second = recoJets[ijet].pt() * (*patJets)[ijet].jecFactor("Uncorrected");
+        }
       }
-      //counting forward and barrel jets
+      // counting forward and barrel jets
       if (fabs(recoJets[ijet].eta()) > 1.5)
         nJet_E_40++;
       else
-        nJet_B_40++;	  
+        nJet_B_40++;
       nJet_40++;
 
-      if (mEta) mEta->Fill(recoJets[ijet].eta());
-
-      if (mJetArea)      mJetArea     ->Fill(recoJets[ijet].jetArea());
-      if (mPhi)          mPhi         ->Fill(recoJets[ijet].phi());
-      if(!isMiniAODJet){
-	if (mEnergy)       mEnergy      ->Fill(recoJets[ijet].energy());
-	if (mP)            mP           ->Fill(recoJets[ijet].p());
-	if (mPt)           mPt          ->Fill(recoJets[ijet].pt());
-	if (mMass)         mMass        ->Fill(recoJets[ijet].mass());
-      }else{
-	if (mEnergy)       mEnergy      ->Fill(recoJets[ijet].energy()*(*patJets)[ijet].jecFactor("Uncorrected"));
-	if (mP)            mP           ->Fill(recoJets[ijet].p()*(*patJets)[ijet].jecFactor("Uncorrected"));
-	if (mPt)           mPt          ->Fill(recoJets[ijet].pt()*(*patJets)[ijet].jecFactor("Uncorrected"));
-	if (mMass)         mMass        ->Fill(recoJets[ijet].mass()*(*patJets)[ijet].jecFactor("Uncorrected"));
-      }
-      if (mConstituents) mConstituents->Fill(recoJets[ijet].nConstituents());
-      if(!isMiniAODJet){
-	if (ijet == 0) {
-	  if (mEtaFirst) mEtaFirst->Fill(recoJets[ijet].eta());
-	  if (mPhiFirst) mPhiFirst->Fill(recoJets[ijet].phi());
-	  if (mPtFirst)  mPtFirst ->Fill(recoJets[ijet].pt());
-	}
-
-	if (ijet == 0) {nJet++; p4tmp[0] = recoJets[ijet].p4();}
-	if (ijet == 1) {nJet++; p4tmp[1] = recoJets[ijet].p4();}
+      if (mEta)
+        mEta->Fill(recoJets[ijet].eta());
+
+      if (mJetArea)
+        mJetArea->Fill(recoJets[ijet].jetArea());
+      if (mPhi)
+        mPhi->Fill(recoJets[ijet].phi());
+      if (!isMiniAODJet) {
+        if (mEnergy)
+          mEnergy->Fill(recoJets[ijet].energy());
+        if (mP)
+          mP->Fill(recoJets[ijet].p());
+        if (mPt)
+          mPt->Fill(recoJets[ijet].pt());
+        if (mMass)
+          mMass->Fill(recoJets[ijet].mass());
+      } else {
+        if (mEnergy)
+          mEnergy->Fill(recoJets[ijet].energy() * (*patJets)[ijet].jecFactor("Uncorrected"));
+        if (mP)
+          mP->Fill(recoJets[ijet].p() * (*patJets)[ijet].jecFactor("Uncorrected"));
+        if (mPt)
+          mPt->Fill(recoJets[ijet].pt() * (*patJets)[ijet].jecFactor("Uncorrected"));
+        if (mMass)
+          mMass->Fill(recoJets[ijet].mass() * (*patJets)[ijet].jecFactor("Uncorrected"));
       }
-  //    if (isPFJet || isCaloJet) {
-  //      if (mHadEnergyInHF)       mHadEnergyInHF      ->Fill((*pfJets)[ijet].HFHadronEnergy());
-  //      if (mEmEnergyInHF)        mEmEnergyInHF       ->Fill((*pfJets)[ijet].HFEMEnergy());
-  //      if (mChargedEmEnergy)     mChargedEmEnergy    ->Fill((*pfJets)[ijet].chargedEmEnergy());
-  //      if (mChargedHadronEnergy) mChargedHadronEnergy->Fill((*pfJets)[ijet].chargedHadronEnergy());
-  //      if (mNeutralEmEnergy)     mNeutralEmEnergy    ->Fill((*pfJets)[ijet].neutralEmEnergy());
-  //      if (mNeutralHadronEnergy) mNeutralHadronEnergy->Fill((*pfJets)[ijet].neutralHadronEnergy());
-  //    }
+      if (mConstituents)
+        mConstituents->Fill(recoJets[ijet].nConstituents());
+      if (!isMiniAODJet) {
+        if (ijet == 0) {
+          if (mEtaFirst)
+            mEtaFirst->Fill(recoJets[ijet].eta());
+          if (mPhiFirst)
+            mPhiFirst->Fill(recoJets[ijet].phi());
+          if (mPtFirst)
+            mPtFirst->Fill(recoJets[ijet].pt());
+        }
 
+        if (ijet == 0) {
+          nJet++;
+          p4tmp[0] = recoJets[ijet].p4();
+        }
+        if (ijet == 1) {
+          nJet++;
+          p4tmp[1] = recoJets[ijet].p4();
+        }
+      }
+      //    if (isPFJet || isCaloJet) {
+      //      if (mHadEnergyInHF)       mHadEnergyInHF
+      //      ->Fill((*pfJets)[ijet].HFHadronEnergy()); if (mEmEnergyInHF)
+      //      mEmEnergyInHF       ->Fill((*pfJets)[ijet].HFEMEnergy()); if
+      //      (mChargedEmEnergy)     mChargedEmEnergy
+      //      ->Fill((*pfJets)[ijet].chargedEmEnergy()); if
+      //      (mChargedHadronEnergy)
+      //      mChargedHadronEnergy->Fill((*pfJets)[ijet].chargedHadronEnergy());
+      //      if (mNeutralEmEnergy)     mNeutralEmEnergy
+      //      ->Fill((*pfJets)[ijet].neutralEmEnergy()); if
+      //      (mNeutralHadronEnergy)
+      //      mNeutralHadronEnergy->Fill((*pfJets)[ijet].neutralHadronEnergy());
+      //    }
 
       // ---- Calo Jet specific information ----
       if (isCaloJet) {
-        maxEInEmTowers              ->Fill((*caloJets)[ijet].maxEInEmTowers());
-        maxEInHadTowers             ->Fill((*caloJets)[ijet].maxEInHadTowers());
-        energyFractionHadronic      ->Fill((*caloJets)[ijet].energyFractionHadronic());
-        emEnergyFraction            ->Fill((*caloJets)[ijet].emEnergyFraction());
-        hadEnergyInHB               ->Fill((*caloJets)[ijet].hadEnergyInHB());
-        hadEnergyInHO               ->Fill((*caloJets)[ijet].hadEnergyInHO());
-        hadEnergyInHE               ->Fill((*caloJets)[ijet].hadEnergyInHE());
-        hadEnergyInHF               ->Fill((*caloJets)[ijet].hadEnergyInHF());
-        emEnergyInEB                ->Fill((*caloJets)[ijet].emEnergyInEB());
-        emEnergyInEE                ->Fill((*caloJets)[ijet].emEnergyInEE());
-        emEnergyInHF                ->Fill((*caloJets)[ijet].emEnergyInHF());
-        towersArea                  ->Fill((*caloJets)[ijet].towersArea());
-        n90                         ->Fill((*caloJets)[ijet].n90());
-        n60                         ->Fill((*caloJets)[ijet].n60());
+        maxEInEmTowers->Fill((*caloJets)[ijet].maxEInEmTowers());
+        maxEInHadTowers->Fill((*caloJets)[ijet].maxEInHadTowers());
+        energyFractionHadronic->Fill((*caloJets)[ijet].energyFractionHadronic());
+        emEnergyFraction->Fill((*caloJets)[ijet].emEnergyFraction());
+        hadEnergyInHB->Fill((*caloJets)[ijet].hadEnergyInHB());
+        hadEnergyInHO->Fill((*caloJets)[ijet].hadEnergyInHO());
+        hadEnergyInHE->Fill((*caloJets)[ijet].hadEnergyInHE());
+        hadEnergyInHF->Fill((*caloJets)[ijet].hadEnergyInHF());
+        emEnergyInEB->Fill((*caloJets)[ijet].emEnergyInEB());
+        emEnergyInEE->Fill((*caloJets)[ijet].emEnergyInEE());
+        emEnergyInHF->Fill((*caloJets)[ijet].emEnergyInHF());
+        towersArea->Fill((*caloJets)[ijet].towersArea());
+        n90->Fill((*caloJets)[ijet].n90());
+        n60->Fill((*caloJets)[ijet].n60());
       }
       // ---- PF Jet specific information ----
       if (isPFJet) {
-        muonMultiplicity ->Fill((*pfJets)[ijet].muonMultiplicity());
-        chargedMultiplicity ->Fill((*pfJets)[ijet].chargedMultiplicity());
-        chargedEmEnergy ->Fill((*pfJets)[ijet].chargedEmEnergy());
-        neutralEmEnergy ->Fill((*pfJets)[ijet].neutralEmEnergy());
-        chargedHadronEnergy ->Fill((*pfJets)[ijet].chargedHadronEnergy());
-        neutralHadronEnergy ->Fill((*pfJets)[ijet].neutralHadronEnergy());
-        chargedHadronEnergyFraction ->Fill((*pfJets)[ijet].chargedHadronEnergyFraction());
-        neutralHadronEnergyFraction ->Fill((*pfJets)[ijet].neutralHadronEnergyFraction());
-        chargedEmEnergyFraction ->Fill((*pfJets)[ijet].chargedEmEnergyFraction());
-        neutralEmEnergyFraction ->Fill((*pfJets)[ijet].neutralEmEnergyFraction());
-        photonEnergy ->Fill((*pfJets)[ijet].photonEnergy());
-        photonEnergyFraction ->Fill((*pfJets)[ijet].photonEnergyFraction());
-        electronEnergy ->Fill((*pfJets)[ijet].electronEnergy());
-        electronEnergyFraction ->Fill((*pfJets)[ijet].electronEnergyFraction());
-        muonEnergy ->Fill((*pfJets)[ijet].muonEnergy());
-        muonEnergyFraction ->Fill((*pfJets)[ijet].muonEnergyFraction());
-        HFHadronEnergy ->Fill((*pfJets)[ijet].HFHadronEnergy());
-        HFHadronEnergyFraction ->Fill((*pfJets)[ijet].HFHadronEnergyFraction());
-        HFEMEnergy ->Fill((*pfJets)[ijet].HFEMEnergy());
-        HFEMEnergyFraction ->Fill((*pfJets)[ijet].HFEMEnergyFraction());
-        chargedHadronMultiplicity ->Fill((*pfJets)[ijet].chargedHadronMultiplicity());
-        neutralHadronMultiplicity ->Fill((*pfJets)[ijet].neutralHadronMultiplicity());
-        photonMultiplicity ->Fill((*pfJets)[ijet].photonMultiplicity());
-        electronMultiplicity ->Fill((*pfJets)[ijet].electronMultiplicity());
-        HFHadronMultiplicity ->Fill((*pfJets)[ijet].HFHadronMultiplicity());
-        HFEMMultiplicity ->Fill((*pfJets)[ijet].HFEMMultiplicity());
-        chargedMuEnergy ->Fill((*pfJets)[ijet].chargedMuEnergy());
-        chargedMuEnergyFraction ->Fill((*pfJets)[ijet].chargedMuEnergyFraction());
-        neutralMultiplicity ->Fill((*pfJets)[ijet].neutralMultiplicity()); 
-        HOEnergy ->Fill((*pfJets)[ijet].hoEnergy());
-        HOEnergyFraction ->Fill((*pfJets)[ijet].hoEnergyFraction());
-     }
-   if (isMiniAODJet && (*patJets)[ijet].isPFJet()) {
-        muonMultiplicity ->Fill((*patJets)[ijet].muonMultiplicity());
-        chargedMultiplicity ->Fill((*patJets)[ijet].chargedMultiplicity());
-        chargedEmEnergy ->Fill((*patJets)[ijet].chargedEmEnergy());
-        neutralEmEnergy ->Fill((*patJets)[ijet].neutralEmEnergy());
-        chargedHadronEnergy ->Fill((*patJets)[ijet].chargedHadronEnergy());
-        neutralHadronEnergy ->Fill((*patJets)[ijet].neutralHadronEnergy());
-        chargedHadronEnergyFraction ->Fill((*patJets)[ijet].chargedHadronEnergyFraction());
-        neutralHadronEnergyFraction ->Fill((*patJets)[ijet].neutralHadronEnergyFraction());
-        chargedEmEnergyFraction ->Fill((*patJets)[ijet].chargedEmEnergyFraction());
-        neutralEmEnergyFraction ->Fill((*patJets)[ijet].neutralEmEnergyFraction());
-        photonEnergy ->Fill((*patJets)[ijet].photonEnergy());
-        photonEnergyFraction ->Fill((*patJets)[ijet].photonEnergyFraction());
-        electronEnergy ->Fill((*patJets)[ijet].electronEnergy());
-        electronEnergyFraction ->Fill((*patJets)[ijet].electronEnergyFraction());
-        muonEnergy ->Fill((*patJets)[ijet].muonEnergy());
-        muonEnergyFraction ->Fill((*patJets)[ijet].muonEnergyFraction());
-        HFHadronEnergy ->Fill((*patJets)[ijet].HFHadronEnergy());
-        HFHadronEnergyFraction ->Fill((*patJets)[ijet].HFHadronEnergyFraction());
-        HFEMEnergy ->Fill((*patJets)[ijet].HFEMEnergy());
-        HFEMEnergyFraction ->Fill((*patJets)[ijet].HFEMEnergyFraction());
-        chargedHadronMultiplicity ->Fill((*patJets)[ijet].chargedHadronMultiplicity());
-        neutralHadronMultiplicity ->Fill((*patJets)[ijet].neutralHadronMultiplicity());
-        photonMultiplicity ->Fill((*patJets)[ijet].photonMultiplicity());
-        electronMultiplicity ->Fill((*patJets)[ijet].electronMultiplicity());
-        HFHadronMultiplicity ->Fill((*patJets)[ijet].HFHadronMultiplicity());
-        HFEMMultiplicity ->Fill((*patJets)[ijet].HFEMMultiplicity());
-        chargedMuEnergy ->Fill((*patJets)[ijet].chargedMuEnergy());
-        chargedMuEnergyFraction ->Fill((*patJets)[ijet].chargedMuEnergyFraction());
-        neutralMultiplicity ->Fill((*patJets)[ijet].neutralMultiplicity()); 
-        HOEnergy ->Fill((*patJets)[ijet].hoEnergy());
-        HOEnergyFraction ->Fill((*patJets)[ijet].hoEnergyFraction());
+        muonMultiplicity->Fill((*pfJets)[ijet].muonMultiplicity());
+        chargedMultiplicity->Fill((*pfJets)[ijet].chargedMultiplicity());
+        chargedEmEnergy->Fill((*pfJets)[ijet].chargedEmEnergy());
+        neutralEmEnergy->Fill((*pfJets)[ijet].neutralEmEnergy());
+        chargedHadronEnergy->Fill((*pfJets)[ijet].chargedHadronEnergy());
+        neutralHadronEnergy->Fill((*pfJets)[ijet].neutralHadronEnergy());
+        chargedHadronEnergyFraction->Fill((*pfJets)[ijet].chargedHadronEnergyFraction());
+        neutralHadronEnergyFraction->Fill((*pfJets)[ijet].neutralHadronEnergyFraction());
+        chargedEmEnergyFraction->Fill((*pfJets)[ijet].chargedEmEnergyFraction());
+        neutralEmEnergyFraction->Fill((*pfJets)[ijet].neutralEmEnergyFraction());
+        photonEnergy->Fill((*pfJets)[ijet].photonEnergy());
+        photonEnergyFraction->Fill((*pfJets)[ijet].photonEnergyFraction());
+        electronEnergy->Fill((*pfJets)[ijet].electronEnergy());
+        electronEnergyFraction->Fill((*pfJets)[ijet].electronEnergyFraction());
+        muonEnergy->Fill((*pfJets)[ijet].muonEnergy());
+        muonEnergyFraction->Fill((*pfJets)[ijet].muonEnergyFraction());
+        HFHadronEnergy->Fill((*pfJets)[ijet].HFHadronEnergy());
+        HFHadronEnergyFraction->Fill((*pfJets)[ijet].HFHadronEnergyFraction());
+        HFEMEnergy->Fill((*pfJets)[ijet].HFEMEnergy());
+        HFEMEnergyFraction->Fill((*pfJets)[ijet].HFEMEnergyFraction());
+        chargedHadronMultiplicity->Fill((*pfJets)[ijet].chargedHadronMultiplicity());
+        neutralHadronMultiplicity->Fill((*pfJets)[ijet].neutralHadronMultiplicity());
+        photonMultiplicity->Fill((*pfJets)[ijet].photonMultiplicity());
+        electronMultiplicity->Fill((*pfJets)[ijet].electronMultiplicity());
+        HFHadronMultiplicity->Fill((*pfJets)[ijet].HFHadronMultiplicity());
+        HFEMMultiplicity->Fill((*pfJets)[ijet].HFEMMultiplicity());
+        chargedMuEnergy->Fill((*pfJets)[ijet].chargedMuEnergy());
+        chargedMuEnergyFraction->Fill((*pfJets)[ijet].chargedMuEnergyFraction());
+        neutralMultiplicity->Fill((*pfJets)[ijet].neutralMultiplicity());
+        HOEnergy->Fill((*pfJets)[ijet].hoEnergy());
+        HOEnergyFraction->Fill((*pfJets)[ijet].hoEnergyFraction());
       }
-    }//fill quantities for medium jets
+      if (isMiniAODJet && (*patJets)[ijet].isPFJet()) {
+        muonMultiplicity->Fill((*patJets)[ijet].muonMultiplicity());
+        chargedMultiplicity->Fill((*patJets)[ijet].chargedMultiplicity());
+        chargedEmEnergy->Fill((*patJets)[ijet].chargedEmEnergy());
+        neutralEmEnergy->Fill((*patJets)[ijet].neutralEmEnergy());
+        chargedHadronEnergy->Fill((*patJets)[ijet].chargedHadronEnergy());
+        neutralHadronEnergy->Fill((*patJets)[ijet].neutralHadronEnergy());
+        chargedHadronEnergyFraction->Fill((*patJets)[ijet].chargedHadronEnergyFraction());
+        neutralHadronEnergyFraction->Fill((*patJets)[ijet].neutralHadronEnergyFraction());
+        chargedEmEnergyFraction->Fill((*patJets)[ijet].chargedEmEnergyFraction());
+        neutralEmEnergyFraction->Fill((*patJets)[ijet].neutralEmEnergyFraction());
+        photonEnergy->Fill((*patJets)[ijet].photonEnergy());
+        photonEnergyFraction->Fill((*patJets)[ijet].photonEnergyFraction());
+        electronEnergy->Fill((*patJets)[ijet].electronEnergy());
+        electronEnergyFraction->Fill((*patJets)[ijet].electronEnergyFraction());
+        muonEnergy->Fill((*patJets)[ijet].muonEnergy());
+        muonEnergyFraction->Fill((*patJets)[ijet].muonEnergyFraction());
+        HFHadronEnergy->Fill((*patJets)[ijet].HFHadronEnergy());
+        HFHadronEnergyFraction->Fill((*patJets)[ijet].HFHadronEnergyFraction());
+        HFEMEnergy->Fill((*patJets)[ijet].HFEMEnergy());
+        HFEMEnergyFraction->Fill((*patJets)[ijet].HFEMEnergyFraction());
+        chargedHadronMultiplicity->Fill((*patJets)[ijet].chargedHadronMultiplicity());
+        neutralHadronMultiplicity->Fill((*patJets)[ijet].neutralHadronMultiplicity());
+        photonMultiplicity->Fill((*patJets)[ijet].photonMultiplicity());
+        electronMultiplicity->Fill((*patJets)[ijet].electronMultiplicity());
+        HFHadronMultiplicity->Fill((*patJets)[ijet].HFHadronMultiplicity());
+        HFEMMultiplicity->Fill((*patJets)[ijet].HFEMMultiplicity());
+        chargedMuEnergy->Fill((*patJets)[ijet].chargedMuEnergy());
+        chargedMuEnergyFraction->Fill((*patJets)[ijet].chargedMuEnergyFraction());
+        neutralMultiplicity->Fill((*patJets)[ijet].neutralMultiplicity());
+        HOEnergy->Fill((*patJets)[ijet].hoEnergy());
+        HOEnergyFraction->Fill((*patJets)[ijet].hoEnergyFraction());
+      }
+    }  // fill quantities for medium jets
   }
 
-  if (mNJetsEta_B_20_40) mNJetsEta_B_20_40->Fill(nJet_B_20_40);
-  if (mNJetsEta_E_20_40) mNJetsEta_E_20_40->Fill(nJet_E_20_40);
-  if (mNJetsEta_B_40) mNJetsEta_B_40->Fill(nJet_B_40);
-  if (mNJetsEta_E_40) mNJetsEta_E_40->Fill(nJet_E_40);
-  if (mNJets_40) mNJets_40->Fill(nJet_40); 
-  if(!isMiniAODJet){
-    if (nJet >= 2)
-      {
-	if (mMjj) mMjj->Fill((p4tmp[0]+p4tmp[1]).mass());
-      }
-  }else{
-    if(index_first_jet>-1){
-      if (mEtaFirst) mEtaFirst->Fill(recoJets[index_first_jet].eta());
-      if (mPhiFirst) mPhiFirst->Fill(recoJets[index_first_jet].phi());
-      if (mPtFirst)  mPtFirst ->Fill(recoJets[index_first_jet].pt()*(*patJets)[index_first_jet].jecFactor("Uncorrected"));
-      nJet++; p4tmp[0] = recoJets[index_first_jet].p4()*(*patJets)[index_first_jet].jecFactor("Uncorrected");
+  if (mNJetsEta_B_20_40)
+    mNJetsEta_B_20_40->Fill(nJet_B_20_40);
+  if (mNJetsEta_E_20_40)
+    mNJetsEta_E_20_40->Fill(nJet_E_20_40);
+  if (mNJetsEta_B_40)
+    mNJetsEta_B_40->Fill(nJet_B_40);
+  if (mNJetsEta_E_40)
+    mNJetsEta_E_40->Fill(nJet_E_40);
+  if (mNJets_40)
+    mNJets_40->Fill(nJet_40);
+  if (!isMiniAODJet) {
+    if (nJet >= 2) {
+      if (mMjj)
+        mMjj->Fill((p4tmp[0] + p4tmp[1]).mass());
     }
-    if(index_second_jet>-1){
-      nJet++; p4tmp[1] = recoJets[index_second_jet].p4()*(*patJets)[index_second_jet].jecFactor("Uncorrected");
+  } else {
+    if (index_first_jet > -1) {
+      if (mEtaFirst)
+        mEtaFirst->Fill(recoJets[index_first_jet].eta());
+      if (mPhiFirst)
+        mPhiFirst->Fill(recoJets[index_first_jet].phi());
+      if (mPtFirst)
+        mPtFirst->Fill(recoJets[index_first_jet].pt() * (*patJets)[index_first_jet].jecFactor("Uncorrected"));
+      nJet++;
+      p4tmp[0] = recoJets[index_first_jet].p4() * (*patJets)[index_first_jet].jecFactor("Uncorrected");
+    }
+    if (index_second_jet > -1) {
+      nJet++;
+      p4tmp[1] = recoJets[index_second_jet].p4() * (*patJets)[index_second_jet].jecFactor("Uncorrected");
+    }
+    if (nJet >= 2) {
+      if (mMjj)
+        mMjj->Fill((p4tmp[0] + p4tmp[1]).mass());
     }
-    if (nJet >= 2)
-      {
-	if (mMjj) mMjj->Fill((p4tmp[0]+p4tmp[1]).mass());
-      }
   }
 
   // Count jets above pt cut
   //----------------------------------------------------------------------------
-  for (int istep=0; istep<100; ++istep)
-    {
-      int njets1 = 0;
-      int njets2 = 0;
-
-      float ptStep1 = (istep * ( 200. / 100.));
-      float ptStep2 = (istep * (4000. / 100.));
-
-      for (unsigned ijet=0; ijet<recoJets.size(); ijet++) {
-	if(!isMiniAODJet){
-	  if (recoJets[ijet].pt() > ptStep1) njets1++;
-	  if (recoJets[ijet].pt() > ptStep2) njets2++;
-	}else{
-	  if ((recoJets[ijet].pt()*(*patJets)[ijet].jecFactor("Uncorrected")) > ptStep1) njets1++;
-	  if ((recoJets[ijet].pt()*(*patJets)[ijet].jecFactor("Uncorrected")) > ptStep2) njets2++;
-	}
-	mNJets1->Fill(ptStep1, njets1);
-	mNJets2->Fill(ptStep2, njets2);
+  for (int istep = 0; istep < 100; ++istep) {
+    int njets1 = 0;
+    int njets2 = 0;
+
+    float ptStep1 = (istep * (200. / 100.));
+    float ptStep2 = (istep * (4000. / 100.));
+
+    for (unsigned ijet = 0; ijet < recoJets.size(); ijet++) {
+      if (!isMiniAODJet) {
+        if (recoJets[ijet].pt() > ptStep1)
+          njets1++;
+        if (recoJets[ijet].pt() > ptStep2)
+          njets2++;
+      } else {
+        if ((recoJets[ijet].pt() * (*patJets)[ijet].jecFactor("Uncorrected")) > ptStep1)
+          njets1++;
+        if ((recoJets[ijet].pt() * (*patJets)[ijet].jecFactor("Uncorrected")) > ptStep2)
+          njets2++;
       }
+      mNJets1->Fill(ptStep1, njets1);
+      mNJets2->Fill(ptStep2, njets2);
     }
-
+  }
 
   // Corrected jets
   //----------------------------------------------------------------------------
   double scale = -999;
   edm::Handle<reco::JetCorrector> jetCorr;
-  bool pass_correction_flag =false;
-  if(!isMiniAODJet && !mJetCorrector.label().empty()){
+  bool pass_correction_flag = false;
+  if (!isMiniAODJet && !mJetCorrector.label().empty()) {
     mEvent.getByToken(jetCorrectorToken_, jetCorr);
-    if (jetCorr.isValid()){
-      pass_correction_flag=true;
+    if (jetCorr.isValid()) {
+      pass_correction_flag = true;
     }
   }
-  if(isMiniAODJet){
-    pass_correction_flag =true;
+  if (isMiniAODJet) {
+    pass_correction_flag = true;
   }
-  for (unsigned ijet=0; ijet<recoJets.size(); ijet++) {
+  for (unsigned ijet = 0; ijet < recoJets.size(); ijet++) {
     Jet correctedJet = recoJets[ijet];
-    if(pass_correction_flag){
-      if (isCaloJet) scale = jetCorr->correction((*caloJets)[ijet]); 
-      if (isPFJet)   scale = jetCorr->correction((*pfJets)[ijet]); 
-      //if (isJPTJet)  scale = jetCorr->correction((*jptJets)[ijet]);
-      if(!isMiniAODJet){
-	correctedJet.scaleEnergy(scale); 
+    if (pass_correction_flag) {
+      if (isCaloJet)
+        scale = jetCorr->correction((*caloJets)[ijet]);
+      if (isPFJet)
+        scale = jetCorr->correction((*pfJets)[ijet]);
+      // if (isJPTJet)  scale = jetCorr->correction((*jptJets)[ijet]);
+      if (!isMiniAODJet) {
+        correctedJet.scaleEnergy(scale);
       }
-      
-      if (correctedJet.pt() < 20) continue;
 
-      if (isMiniAODJet){
-	if(hadronFlavor)hadronFlavor->Fill((*patJets)[ijet].hadronFlavour());
-	if(partonFlavor)partonFlavor->Fill((*patJets)[ijet].partonFlavour());
-	if(genPartonPDGID && (*patJets)[ijet].genParton()!=nullptr)genPartonPDGID->Fill((*patJets)[ijet].genParton()->pdgId());
+      if (correctedJet.pt() < 20)
+        continue;
+
+      if (isMiniAODJet) {
+        if (hadronFlavor)
+          hadronFlavor->Fill((*patJets)[ijet].hadronFlavour());
+        if (partonFlavor)
+          partonFlavor->Fill((*patJets)[ijet].partonFlavour());
+        if (genPartonPDGID && (*patJets)[ijet].genParton() != nullptr)
+          genPartonPDGID->Fill((*patJets)[ijet].genParton()->pdgId());
       }
 
-      
       mCorrJetEta->Fill(correctedJet.eta());
       mCorrJetPhi->Fill(correctedJet.phi());
-      mCorrJetPt ->Fill(correctedJet.pt());
+      mCorrJetPt->Fill(correctedJet.pt());
       if (correctedJet.pt() >= 40) {
-	mCorrJetEta_Pt40->Fill(correctedJet.eta()); 
-	mCorrJetPhi_Pt40->Fill(correctedJet.phi());
+        mCorrJetEta_Pt40->Fill(correctedJet.eta());
+        mCorrJetPhi_Pt40->Fill(correctedJet.phi());
       }
-      
+
       double ijetEta = recoJets[ijet].eta();
-      double ijetPt  = recoJets[ijet].pt();
-      if(isMiniAODJet){
-	ijetPt=recoJets[ijet].pt()*(*patJets)[ijet].jecFactor("Uncorrected");
+      double ijetPt = recoJets[ijet].pt();
+      if (isMiniAODJet) {
+        ijetPt = recoJets[ijet].pt() * (*patJets)[ijet].jecFactor("Uncorrected");
       }
-      double ratio   = correctedJet.pt() / ijetPt;
-      if(isMiniAODJet){
-	ratio =1./(*patJets)[ijet].jecFactor("Uncorrected");
+      double ratio = correctedJet.pt() / ijetPt;
+      if (isMiniAODJet) {
+        ratio = 1. / (*patJets)[ijet].jecFactor("Uncorrected");
       }
-      
-      if      (fabs(ijetEta) < 1.5) mPtCorrOverReco_Pt_B->Fill(log10(ijetPt), ratio);
-      else if (fabs(ijetEta) < 3.0) mPtCorrOverReco_Pt_E->Fill(log10(ijetPt), ratio);
-      else if (fabs(ijetEta) < 6.0) mPtCorrOverReco_Pt_F->Fill(log10(ijetPt), ratio);
-      
-      if      (ijetPt <  40) mPtCorrOverReco_Eta_20_40   ->Fill(ijetEta, ratio);
-      else if (ijetPt <  200) mPtCorrOverReco_Eta_40_200  ->Fill(ijetEta, ratio);
-      else if (ijetPt <  600) mPtCorrOverReco_Eta_200_600  ->Fill(ijetEta, ratio);
-      else if (ijetPt < 1500) mPtCorrOverReco_Eta_600_1500 ->Fill(ijetEta, ratio);
-      else if (ijetPt < 3500) mPtCorrOverReco_Eta_1500_3500->Fill(ijetEta, ratio);
-      else if (ijetPt < 5000) mPtCorrOverReco_Eta_3500_5000->Fill(ijetEta, ratio);
-      else if (ijetPt < 6500) mPtCorrOverReco_Eta_5000_6500->Fill(ijetEta, ratio);
-      if (ijetPt > 3500) mPtCorrOverReco_Eta_3500->Fill(ijetEta, ratio);
+
+      if (fabs(ijetEta) < 1.5)
+        mPtCorrOverReco_Pt_B->Fill(log10(ijetPt), ratio);
+      else if (fabs(ijetEta) < 3.0)
+        mPtCorrOverReco_Pt_E->Fill(log10(ijetPt), ratio);
+      else if (fabs(ijetEta) < 6.0)
+        mPtCorrOverReco_Pt_F->Fill(log10(ijetPt), ratio);
+
+      if (ijetPt < 40)
+        mPtCorrOverReco_Eta_20_40->Fill(ijetEta, ratio);
+      else if (ijetPt < 200)
+        mPtCorrOverReco_Eta_40_200->Fill(ijetEta, ratio);
+      else if (ijetPt < 600)
+        mPtCorrOverReco_Eta_200_600->Fill(ijetEta, ratio);
+      else if (ijetPt < 1500)
+        mPtCorrOverReco_Eta_600_1500->Fill(ijetEta, ratio);
+      else if (ijetPt < 3500)
+        mPtCorrOverReco_Eta_1500_3500->Fill(ijetEta, ratio);
+      else if (ijetPt < 5000)
+        mPtCorrOverReco_Eta_3500_5000->Fill(ijetEta, ratio);
+      else if (ijetPt < 6500)
+        mPtCorrOverReco_Eta_5000_6500->Fill(ijetEta, ratio);
+      if (ijetPt > 3500)
+        mPtCorrOverReco_Eta_3500->Fill(ijetEta, ratio);
     }
   }
 
@@ -873,195 +952,282 @@ void JetTester::analyze(const edm::Event& mEvent, const edm::EventSetup& mSetup)
   // Generation
   //
   //----------------------------------------------------------------------------
-  if (!mEvent.isRealData())
-    {
-      // Get ptHat
-      //------------------------------------------------------------------------
-      edm::Handle<GenEventInfoProduct> myGenEvt;
-      mEvent.getByToken(evtToken_, myGenEvt);
-
-      if (myGenEvt.isValid()) {
-        if(myGenEvt->hasBinningValues()){
-	  double ptHat = myGenEvt->binningValues()[0];
-	  if (mPtHat) mPtHat->Fill(ptHat);
-        }
+  if (!mEvent.isRealData()) {
+    // Get ptHat
+    //------------------------------------------------------------------------
+    edm::Handle<GenEventInfoProduct> myGenEvt;
+    mEvent.getByToken(evtToken_, myGenEvt);
+
+    if (myGenEvt.isValid()) {
+      if (myGenEvt->hasBinningValues()) {
+        double ptHat = myGenEvt->binningValues()[0];
+        if (mPtHat)
+          mPtHat->Fill(ptHat);
       }
-      // Gen jets
-      //------------------------------------------------------------------------
-      edm::Handle<GenJetCollection> genJets;
-      mEvent.getByToken(genJetsToken_, genJets);
-
-      if (!genJets.isValid()) return;
-      
-      for (GenJetCollection::const_iterator gjet=genJets->begin();  gjet!=genJets->end(); gjet++)	{
-	//for MiniAOD we have here intrinsic thresholds, introduce also threshold for RECO
-	if(gjet->pt() > mMatchGenPtThreshold){
-	  if (mGenEta) mGenEta->Fill(gjet->eta());
-	  if (mGenPhi) mGenPhi->Fill(gjet->phi());
-	  if (mGenPt)  mGenPt ->Fill(gjet->pt());
-	  if (gjet == genJets->begin()) {
-	    if (mGenEtaFirst) mGenEtaFirst->Fill(gjet->eta());
-	    if (mGenPhiFirst) mGenPhiFirst->Fill(gjet->phi());
-	  }
-	}
+    }
+    // Gen jets
+    //------------------------------------------------------------------------
+    edm::Handle<GenJetCollection> genJets;
+    mEvent.getByToken(genJetsToken_, genJets);
+
+    if (!genJets.isValid())
+      return;
+
+    for (GenJetCollection::const_iterator gjet = genJets->begin(); gjet != genJets->end(); gjet++) {
+      // for MiniAOD we have here intrinsic thresholds, introduce also threshold
+      // for RECO
+      if (gjet->pt() > mMatchGenPtThreshold) {
+        if (mGenEta)
+          mGenEta->Fill(gjet->eta());
+        if (mGenPhi)
+          mGenPhi->Fill(gjet->phi());
+        if (mGenPt)
+          mGenPt->Fill(gjet->pt());
+        if (gjet == genJets->begin()) {
+          if (mGenEtaFirst)
+            mGenEtaFirst->Fill(gjet->eta());
+          if (mGenPhiFirst)
+            mGenPhiFirst->Fill(gjet->phi());
+        }
       }
+    }
 
-      if (!(mInputGenCollection.label().empty())) {
-      for (GenJetCollection::const_iterator gjet=genJets->begin(); gjet!=genJets->end(); gjet++) {
-        if (fabs(gjet->eta()) > 6.) continue;  // Out of the detector 
-        if (gjet->pt() < mMatchGenPtThreshold) continue;
-        if (recoJets.empty()) continue;
+    if (!(mInputGenCollection.label().empty())) {
+      for (GenJetCollection::const_iterator gjet = genJets->begin(); gjet != genJets->end(); gjet++) {
+        if (fabs(gjet->eta()) > 6.)
+          continue;  // Out of the detector
+        if (gjet->pt() < mMatchGenPtThreshold)
+          continue;
+        if (recoJets.empty())
+          continue;
         // pt response
         //------------------------------------------------------------
-	int iMatch    =   -1;
-	double CorrdeltaRBest = 999;
-	double CorrJetPtBest  =   0;
-	double CorrJetMassBest  =   0;
-	for (unsigned ijet=0; ijet<recoJets.size(); ++ijet) {
-	  Jet correctedJet = recoJets[ijet];
-	  if(pass_correction_flag && !isMiniAODJet){
-	    if (isCaloJet) scale = jetCorr->correction((*caloJets)[ijet]); 
-	    if (isPFJet)   scale = jetCorr->correction((*pfJets)[ijet]); 
-	    correctedJet.scaleEnergy(scale);
-	  }
-	  double CorrJetPt = correctedJet.pt();
-	  if (CorrJetPt > 10) {
-	    double CorrdR = deltaR(gjet->eta(), gjet->phi(), correctedJet.eta(), correctedJet.phi());
-	    if (CorrdR < CorrdeltaRBest) {
-	      CorrJetMassBest = correctedJet.mass();
-	      CorrdeltaRBest = CorrdR;
-	      CorrJetPtBest  = CorrJetPt;
-	      iMatch = ijet;
-	    }
-	  }
-	}
-	if (iMatch<0) continue;
-	//use mass after jet energy correction -> for MiniAOD that is the case per default
-	if(!isMiniAODJet){
-	  fillMatchHists(gjet->eta(),  gjet->phi(),  gjet->pt(), gjet->mass(), recoJets[iMatch].eta(), recoJets[iMatch].phi(),  recoJets[iMatch].pt(),CorrJetMassBest);
-	}else{
-	  fillMatchHists(gjet->eta(),  gjet->phi(),  gjet->pt(),  gjet->mass(), (*patJets)[iMatch].eta(), (*patJets)[iMatch].phi(),(*patJets)[iMatch].pt()*(*patJets)[iMatch].jecFactor("Uncorrected"),recoJets[iMatch].mass());
-	}
-        if (pass_correction_flag) {//fill only for corrected jets
-	  if (CorrdeltaRBest < mRThreshold) {
+        int iMatch = -1;
+        double CorrdeltaRBest = 999;
+        double CorrJetPtBest = 0;
+        double CorrJetMassBest = 0;
+        for (unsigned ijet = 0; ijet < recoJets.size(); ++ijet) {
+          Jet correctedJet = recoJets[ijet];
+          if (pass_correction_flag && !isMiniAODJet) {
+            if (isCaloJet)
+              scale = jetCorr->correction((*caloJets)[ijet]);
+            if (isPFJet)
+              scale = jetCorr->correction((*pfJets)[ijet]);
+            correctedJet.scaleEnergy(scale);
+          }
+          double CorrJetPt = correctedJet.pt();
+          if (CorrJetPt > 10) {
+            double CorrdR = deltaR(gjet->eta(), gjet->phi(), correctedJet.eta(), correctedJet.phi());
+            if (CorrdR < CorrdeltaRBest) {
+              CorrJetMassBest = correctedJet.mass();
+              CorrdeltaRBest = CorrdR;
+              CorrJetPtBest = CorrJetPt;
+              iMatch = ijet;
+            }
+          }
+        }
+        if (iMatch < 0)
+          continue;
+        // use mass after jet energy correction -> for MiniAOD that is the case
+        // per default
+        if (!isMiniAODJet) {
+          fillMatchHists(gjet->eta(),
+                         gjet->phi(),
+                         gjet->pt(),
+                         gjet->mass(),
+                         recoJets[iMatch].eta(),
+                         recoJets[iMatch].phi(),
+                         recoJets[iMatch].pt(),
+                         CorrJetMassBest);
+        } else {
+          fillMatchHists(gjet->eta(),
+                         gjet->phi(),
+                         gjet->pt(),
+                         gjet->mass(),
+                         (*patJets)[iMatch].eta(),
+                         (*patJets)[iMatch].phi(),
+                         (*patJets)[iMatch].pt() * (*patJets)[iMatch].jecFactor("Uncorrected"),
+                         recoJets[iMatch].mass());
+        }
+        if (pass_correction_flag) {  // fill only for corrected jets
+          if (CorrdeltaRBest < mRThreshold) {
             double response = CorrJetPtBest / gjet->pt();
-            
-            if      (fabs(gjet->eta()) < 1.5) mPtCorrOverGen_GenPt_B->Fill(log10(gjet->pt()), response);
-            else if (fabs(gjet->eta()) < 3.0) mPtCorrOverGen_GenPt_E->Fill(log10(gjet->pt()), response);   
-            else if (fabs(gjet->eta()) < 6.0) mPtCorrOverGen_GenPt_F->Fill(log10(gjet->pt()), response);
-            
+
+            if (fabs(gjet->eta()) < 1.5)
+              mPtCorrOverGen_GenPt_B->Fill(log10(gjet->pt()), response);
+            else if (fabs(gjet->eta()) < 3.0)
+              mPtCorrOverGen_GenPt_E->Fill(log10(gjet->pt()), response);
+            else if (fabs(gjet->eta()) < 6.0)
+              mPtCorrOverGen_GenPt_F->Fill(log10(gjet->pt()), response);
+
             if (gjet->pt() > 20) {
-              if      (gjet->pt() <  40) mPtCorrOverGen_GenEta_20_40   ->Fill(gjet->eta(), response);
-              else if (gjet->pt() <  200) mPtCorrOverGen_GenEta_40_200   ->Fill(gjet->eta(), response);
-              else if (gjet->pt() <  600) mPtCorrOverGen_GenEta_200_600  ->Fill(gjet->eta(), response);
-              else if (gjet->pt() < 1500) mPtCorrOverGen_GenEta_600_1500 ->Fill(gjet->eta(), response);
-              else if (gjet->pt() < 3500) mPtCorrOverGen_GenEta_1500_3500->Fill(gjet->eta(), response);
-              else if (gjet->pt() < 5000) mPtCorrOverGen_GenEta_3500_5000->Fill(gjet->eta(), response);
-              else if (gjet->pt() < 6500) mPtCorrOverGen_GenEta_5000_6500->Fill(gjet->eta(), response);
-              if (gjet->pt() > 3500) mPtCorrOverGen_GenEta_3500->Fill(gjet->eta(), response);
+              if (gjet->pt() < 40)
+                mPtCorrOverGen_GenEta_20_40->Fill(gjet->eta(), response);
+              else if (gjet->pt() < 200)
+                mPtCorrOverGen_GenEta_40_200->Fill(gjet->eta(), response);
+              else if (gjet->pt() < 600)
+                mPtCorrOverGen_GenEta_200_600->Fill(gjet->eta(), response);
+              else if (gjet->pt() < 1500)
+                mPtCorrOverGen_GenEta_600_1500->Fill(gjet->eta(), response);
+              else if (gjet->pt() < 3500)
+                mPtCorrOverGen_GenEta_1500_3500->Fill(gjet->eta(), response);
+              else if (gjet->pt() < 5000)
+                mPtCorrOverGen_GenEta_3500_5000->Fill(gjet->eta(), response);
+              else if (gjet->pt() < 6500)
+                mPtCorrOverGen_GenEta_5000_6500->Fill(gjet->eta(), response);
+              if (gjet->pt() > 3500)
+                mPtCorrOverGen_GenEta_3500->Fill(gjet->eta(), response);
             }
           }
         }
       }
     }
-    }
+  }
 }
 
-
 //------------------------------------------------------------------------------
 // fillMatchHists
 //------------------------------------------------------------------------------
 void JetTester::fillMatchHists(const double GenEta,
-			       const double GenPhi,
-			       const double GenPt,
-			       const double GenMass,
-			       const double RecoEta,
-			       const double RecoPhi,
-			       const double RecoPt,
-			       const double RecoMass) 
-{
+                               const double GenPhi,
+                               const double GenPt,
+                               const double GenMass,
+                               const double RecoEta,
+                               const double RecoPhi,
+                               const double RecoPt,
+                               const double RecoMass) {
   if (GenPt > mMatchGenPtThreshold) {
     mDeltaEta->Fill(GenEta - RecoEta);
     mDeltaPhi->Fill(GenPhi - RecoPhi);
-    mDeltaPt ->Fill((GenPt - RecoPt) / GenPt);
+    mDeltaPt->Fill((GenPt - RecoPt) / GenPt);
   }
 
-  if (fabs(GenEta) < 1.5)
-    {
-      mPtRecoOverGen_GenPt_B ->Fill(log10(GenPt),  RecoPt / GenPt);
-      mPtRecoOverGen_GenPhi_B->Fill(GenPhi, RecoPt / GenPt);
-    
-      if (GenPt > 20 && GenPt < 40) mMassRecoOverGen_B_20_40     ->Fill(RecoMass / GenMass);
-      else if (GenPt < 200)         mMassRecoOverGen_B_40_200    ->Fill(RecoMass / GenMass);
-      else if (GenPt < 500)         mMassRecoOverGen_B_200_500   ->Fill(RecoMass / GenMass);
-      else if (GenPt < 750)         mMassRecoOverGen_B_500_750   ->Fill(RecoMass / GenMass);
-      else if (GenPt < 1000)        mMassRecoOverGen_B_750_1000  ->Fill(RecoMass / GenMass);
-      else if (GenPt < 1500)        mMassRecoOverGen_B_1000_1500 ->Fill(RecoMass / GenMass);
-      else if (GenPt < 3500)        mMassRecoOverGen_B_1500_3500 ->Fill(RecoMass / GenMass);
-      else if (GenPt < 5000)        mMassRecoOverGen_B_3500_5000 ->Fill(RecoMass / GenMass);
-      else if (GenPt >= 5000)       mMassRecoOverGen_B_5000      ->Fill(RecoMass / GenMass);
-
-      if (GenPt > 20 && GenPt < 40) mPtRecoOverGen_B_20_40   ->Fill(RecoPt / GenPt);
-      else if (GenPt <  200)         mPtRecoOverGen_B_40_200  ->Fill(RecoPt / GenPt);
-      else if (GenPt <  600)         mPtRecoOverGen_B_200_600  ->Fill(RecoPt / GenPt);
-      else if (GenPt < 1500)         mPtRecoOverGen_B_600_1500 ->Fill(RecoPt / GenPt);
-      else if (GenPt < 3500)         mPtRecoOverGen_B_1500_3500->Fill(RecoPt / GenPt);
-      else if (GenPt < 5000)         mPtRecoOverGen_B_3500_5000->Fill(RecoPt / GenPt);
-      else if (GenPt < 6500)         mPtRecoOverGen_B_5000_6500->Fill(RecoPt / GenPt);
-      if (GenPt>3500)         mPtRecoOverGen_B_3500->Fill(RecoPt / GenPt);
-    }
-  else if (fabs(GenEta) < 3.0)
-    {
-      mPtRecoOverGen_GenPt_E ->Fill(log10(GenPt),  RecoPt / GenPt);
-      mPtRecoOverGen_GenPhi_E->Fill(GenPhi, RecoPt / GenPt);
-    
-      if (GenPt > 20 && GenPt < 40) mPtRecoOverGen_E_20_40   ->Fill(RecoPt / GenPt);
-      else if (GenPt <  200)         mPtRecoOverGen_E_40_200  ->Fill(RecoPt / GenPt);
-      else if (GenPt <  600)         mPtRecoOverGen_E_200_600  ->Fill(RecoPt / GenPt);
-      else if (GenPt < 1500)         mPtRecoOverGen_E_600_1500 ->Fill(RecoPt / GenPt);
-      else if (GenPt < 3500)         mPtRecoOverGen_E_1500_3500->Fill(RecoPt / GenPt);
-      else if (GenPt < 5000)         mPtRecoOverGen_E_3500_5000->Fill(RecoPt / GenPt);
-      else if (GenPt < 6500)         mPtRecoOverGen_E_5000_6500->Fill(RecoPt / GenPt);
-      if (GenPt>3500)         mPtRecoOverGen_E_3500->Fill(RecoPt / GenPt);
-
-      if (GenPt > 20 && GenPt < 40) mMassRecoOverGen_E_20_40     ->Fill(RecoMass / GenMass);
-      else if (GenPt < 200)         mMassRecoOverGen_E_40_200    ->Fill(RecoMass / GenMass);
-      else if (GenPt < 500)         mMassRecoOverGen_E_200_500   ->Fill(RecoMass / GenMass);
-      else if (GenPt < 750)         mMassRecoOverGen_E_500_750   ->Fill(RecoMass / GenMass);
-      else if (GenPt < 1000)        mMassRecoOverGen_E_750_1000  ->Fill(RecoMass / GenMass);
-      else if (GenPt < 1500)        mMassRecoOverGen_E_1000_1500 ->Fill(RecoMass / GenMass);
-      else if (GenPt < 3500)        mMassRecoOverGen_E_1500_3500 ->Fill(RecoMass / GenMass);
-      else if (GenPt < 5000)        mMassRecoOverGen_E_3500_5000 ->Fill(RecoMass / GenMass);
-      else if (GenPt >= 5000)       mMassRecoOverGen_E_5000      ->Fill(RecoMass / GenMass);
-
-    }
-  else if (fabs(GenEta) < 6.0)
-    {
-      mPtRecoOverGen_GenPt_F ->Fill (log10(GenPt),  RecoPt / GenPt);
-      mPtRecoOverGen_GenPhi_F->Fill (GenPhi, RecoPt / GenPt);
-    
-      if (GenPt > 20 && GenPt < 40) mPtRecoOverGen_F_20_40   ->Fill(RecoPt / GenPt);
-      else if (GenPt <  200)         mPtRecoOverGen_F_40_200  ->Fill(RecoPt / GenPt);
-      else if (GenPt <  600)         mPtRecoOverGen_F_200_600  ->Fill(RecoPt / GenPt);
-      else if (GenPt < 1500)         mPtRecoOverGen_F_600_1500 ->Fill(RecoPt / GenPt);
-      else if (GenPt < 3500)         mPtRecoOverGen_F_1500_3500->Fill(RecoPt / GenPt);
-      if (GenPt>3500)                mPtRecoOverGen_F_3500->Fill(RecoPt / GenPt);
-
-      if (GenPt > 20 && GenPt < 40) mMassRecoOverGen_F_20_40     ->Fill(RecoMass / GenMass);
-      else if (GenPt < 200)         mMassRecoOverGen_F_40_200    ->Fill(RecoMass / GenMass);
-      else if (GenPt < 500)         mMassRecoOverGen_F_200_500   ->Fill(RecoMass / GenMass);
-      else if (GenPt < 750)         mMassRecoOverGen_F_500_750   ->Fill(RecoMass / GenMass);
-      else if (GenPt < 1000)        mMassRecoOverGen_F_750_1000  ->Fill(RecoMass / GenMass);
-      else if (GenPt < 1500)        mMassRecoOverGen_F_1000_1500 ->Fill(RecoMass / GenMass);
-      else if (GenPt >=1500)        mMassRecoOverGen_F_1500      ->Fill(RecoMass / GenMass);
-    }
+  if (fabs(GenEta) < 1.5) {
+    mPtRecoOverGen_GenPt_B->Fill(log10(GenPt), RecoPt / GenPt);
+    mPtRecoOverGen_GenPhi_B->Fill(GenPhi, RecoPt / GenPt);
+
+    if (GenPt > 20 && GenPt < 40)
+      mMassRecoOverGen_B_20_40->Fill(RecoMass / GenMass);
+    else if (GenPt < 200)
+      mMassRecoOverGen_B_40_200->Fill(RecoMass / GenMass);
+    else if (GenPt < 500)
+      mMassRecoOverGen_B_200_500->Fill(RecoMass / GenMass);
+    else if (GenPt < 750)
+      mMassRecoOverGen_B_500_750->Fill(RecoMass / GenMass);
+    else if (GenPt < 1000)
+      mMassRecoOverGen_B_750_1000->Fill(RecoMass / GenMass);
+    else if (GenPt < 1500)
+      mMassRecoOverGen_B_1000_1500->Fill(RecoMass / GenMass);
+    else if (GenPt < 3500)
+      mMassRecoOverGen_B_1500_3500->Fill(RecoMass / GenMass);
+    else if (GenPt < 5000)
+      mMassRecoOverGen_B_3500_5000->Fill(RecoMass / GenMass);
+    else if (GenPt >= 5000)
+      mMassRecoOverGen_B_5000->Fill(RecoMass / GenMass);
+
+    if (GenPt > 20 && GenPt < 40)
+      mPtRecoOverGen_B_20_40->Fill(RecoPt / GenPt);
+    else if (GenPt < 200)
+      mPtRecoOverGen_B_40_200->Fill(RecoPt / GenPt);
+    else if (GenPt < 600)
+      mPtRecoOverGen_B_200_600->Fill(RecoPt / GenPt);
+    else if (GenPt < 1500)
+      mPtRecoOverGen_B_600_1500->Fill(RecoPt / GenPt);
+    else if (GenPt < 3500)
+      mPtRecoOverGen_B_1500_3500->Fill(RecoPt / GenPt);
+    else if (GenPt < 5000)
+      mPtRecoOverGen_B_3500_5000->Fill(RecoPt / GenPt);
+    else if (GenPt < 6500)
+      mPtRecoOverGen_B_5000_6500->Fill(RecoPt / GenPt);
+    if (GenPt > 3500)
+      mPtRecoOverGen_B_3500->Fill(RecoPt / GenPt);
+  } else if (fabs(GenEta) < 3.0) {
+    mPtRecoOverGen_GenPt_E->Fill(log10(GenPt), RecoPt / GenPt);
+    mPtRecoOverGen_GenPhi_E->Fill(GenPhi, RecoPt / GenPt);
+
+    if (GenPt > 20 && GenPt < 40)
+      mPtRecoOverGen_E_20_40->Fill(RecoPt / GenPt);
+    else if (GenPt < 200)
+      mPtRecoOverGen_E_40_200->Fill(RecoPt / GenPt);
+    else if (GenPt < 600)
+      mPtRecoOverGen_E_200_600->Fill(RecoPt / GenPt);
+    else if (GenPt < 1500)
+      mPtRecoOverGen_E_600_1500->Fill(RecoPt / GenPt);
+    else if (GenPt < 3500)
+      mPtRecoOverGen_E_1500_3500->Fill(RecoPt / GenPt);
+    else if (GenPt < 5000)
+      mPtRecoOverGen_E_3500_5000->Fill(RecoPt / GenPt);
+    else if (GenPt < 6500)
+      mPtRecoOverGen_E_5000_6500->Fill(RecoPt / GenPt);
+    if (GenPt > 3500)
+      mPtRecoOverGen_E_3500->Fill(RecoPt / GenPt);
+
+    if (GenPt > 20 && GenPt < 40)
+      mMassRecoOverGen_E_20_40->Fill(RecoMass / GenMass);
+    else if (GenPt < 200)
+      mMassRecoOverGen_E_40_200->Fill(RecoMass / GenMass);
+    else if (GenPt < 500)
+      mMassRecoOverGen_E_200_500->Fill(RecoMass / GenMass);
+    else if (GenPt < 750)
+      mMassRecoOverGen_E_500_750->Fill(RecoMass / GenMass);
+    else if (GenPt < 1000)
+      mMassRecoOverGen_E_750_1000->Fill(RecoMass / GenMass);
+    else if (GenPt < 1500)
+      mMassRecoOverGen_E_1000_1500->Fill(RecoMass / GenMass);
+    else if (GenPt < 3500)
+      mMassRecoOverGen_E_1500_3500->Fill(RecoMass / GenMass);
+    else if (GenPt < 5000)
+      mMassRecoOverGen_E_3500_5000->Fill(RecoMass / GenMass);
+    else if (GenPt >= 5000)
+      mMassRecoOverGen_E_5000->Fill(RecoMass / GenMass);
+
+  } else if (fabs(GenEta) < 6.0) {
+    mPtRecoOverGen_GenPt_F->Fill(log10(GenPt), RecoPt / GenPt);
+    mPtRecoOverGen_GenPhi_F->Fill(GenPhi, RecoPt / GenPt);
+
+    if (GenPt > 20 && GenPt < 40)
+      mPtRecoOverGen_F_20_40->Fill(RecoPt / GenPt);
+    else if (GenPt < 200)
+      mPtRecoOverGen_F_40_200->Fill(RecoPt / GenPt);
+    else if (GenPt < 600)
+      mPtRecoOverGen_F_200_600->Fill(RecoPt / GenPt);
+    else if (GenPt < 1500)
+      mPtRecoOverGen_F_600_1500->Fill(RecoPt / GenPt);
+    else if (GenPt < 3500)
+      mPtRecoOverGen_F_1500_3500->Fill(RecoPt / GenPt);
+    if (GenPt > 3500)
+      mPtRecoOverGen_F_3500->Fill(RecoPt / GenPt);
+
+    if (GenPt > 20 && GenPt < 40)
+      mMassRecoOverGen_F_20_40->Fill(RecoMass / GenMass);
+    else if (GenPt < 200)
+      mMassRecoOverGen_F_40_200->Fill(RecoMass / GenMass);
+    else if (GenPt < 500)
+      mMassRecoOverGen_F_200_500->Fill(RecoMass / GenMass);
+    else if (GenPt < 750)
+      mMassRecoOverGen_F_500_750->Fill(RecoMass / GenMass);
+    else if (GenPt < 1000)
+      mMassRecoOverGen_F_750_1000->Fill(RecoMass / GenMass);
+    else if (GenPt < 1500)
+      mMassRecoOverGen_F_1000_1500->Fill(RecoMass / GenMass);
+    else if (GenPt >= 1500)
+      mMassRecoOverGen_F_1500->Fill(RecoMass / GenMass);
+  }
 
-  if (GenPt > 20 && GenPt < 40) mPtRecoOverGen_GenEta_20_40   ->Fill(GenEta, RecoPt / GenPt);
-  else if (GenPt <  200)         mPtRecoOverGen_GenEta_40_200  ->Fill(GenEta, RecoPt / GenPt);
-  else if (GenPt <  600)         mPtRecoOverGen_GenEta_200_600  ->Fill(GenEta, RecoPt / GenPt);
-  else if (GenPt < 1500)         mPtRecoOverGen_GenEta_600_1500 ->Fill(GenEta, RecoPt / GenPt);
-  else if (GenPt < 3500)         mPtRecoOverGen_GenEta_1500_3500->Fill(GenEta, RecoPt / GenPt);
-  else if (GenPt < 5000)         mPtRecoOverGen_GenEta_3500_5000->Fill(GenEta, RecoPt / GenPt);
-  else if (GenPt < 6500)         mPtRecoOverGen_GenEta_5000_6500->Fill(GenEta, RecoPt / GenPt);
-  if (GenPt > 3500)              mPtRecoOverGen_GenEta_3500->Fill(GenEta, RecoPt / GenPt);
+  if (GenPt > 20 && GenPt < 40)
+    mPtRecoOverGen_GenEta_20_40->Fill(GenEta, RecoPt / GenPt);
+  else if (GenPt < 200)
+    mPtRecoOverGen_GenEta_40_200->Fill(GenEta, RecoPt / GenPt);
+  else if (GenPt < 600)
+    mPtRecoOverGen_GenEta_200_600->Fill(GenEta, RecoPt / GenPt);
+  else if (GenPt < 1500)
+    mPtRecoOverGen_GenEta_600_1500->Fill(GenEta, RecoPt / GenPt);
+  else if (GenPt < 3500)
+    mPtRecoOverGen_GenEta_1500_3500->Fill(GenEta, RecoPt / GenPt);
+  else if (GenPt < 5000)
+    mPtRecoOverGen_GenEta_3500_5000->Fill(GenEta, RecoPt / GenPt);
+  else if (GenPt < 6500)
+    mPtRecoOverGen_GenEta_5000_6500->Fill(GenEta, RecoPt / GenPt);
+  if (GenPt > 3500)
+    mPtRecoOverGen_GenEta_3500->Fill(GenEta, RecoPt / GenPt);
 }
diff --git a/Validation/RecoJets/plugins/JetTester.h b/Validation/RecoJets/plugins/JetTester.h
index ffb5cae4427ae..37ffc05d666a0 100644
--- a/Validation/RecoJets/plugins/JetTester.h
+++ b/Validation/RecoJets/plugins/JetTester.h
@@ -5,11 +5,14 @@
 // F. Ratnikov, Sept. 7, 2006
 // Modified by Chiyoung Jeong, Feb. 2, 2010
 // Modified by J. Piedra, Sept. 11, 2013
-// Rewritten by Viola Sordini, Matthias Artur Weber, Robert Schoefbeck Nov./Dez. 2013
+// Rewritten by Viola Sordini, Matthias Artur Weber, Robert Schoefbeck Nov./Dez.
+// 2013
 
 #include <cmath>
 #include <string>
 
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
 #include "DataFormats/JetReco/interface/CaloJetCollection.h"
@@ -18,16 +21,15 @@
 #include "DataFormats/JetReco/interface/JPTJet.h"
 #include "DataFormats/JetReco/interface/JPTJetCollection.h"
 #include "DataFormats/JetReco/interface/PFJet.h"
-#include "DataFormats/Math/interface/deltaR.h"
 #include "DataFormats/METReco/interface/CaloMET.h"
 #include "DataFormats/METReco/interface/CaloMETCollection.h"
 #include "DataFormats/METReco/interface/GenMET.h"
 #include "DataFormats/METReco/interface/GenMETCollection.h"
 #include "DataFormats/METReco/interface/MET.h"
 #include "DataFormats/METReco/interface/METCollection.h"
+#include "DataFormats/Math/interface/deltaR.h"
+#include "DataFormats/PatCandidates/interface/Jet.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -35,32 +37,35 @@
 #include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
 #include "JetMETCorrections/JetCorrector/interface/JetCorrector.h"
-#include "DataFormats/PatCandidates/interface/Jet.h"
 #include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h"
 #include <DQMServices/Core/interface/DQMEDAnalyzer.h>
 class MonitorElement;
 
 class JetTester : public DQMEDAnalyzer {
- public:
-
-  JetTester (const edm::ParameterSet&);
+public:
+  JetTester(const edm::ParameterSet &);
   ~JetTester() override;
 
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
- private:
-  
-  void fillMatchHists(const double GenEta,  const double GenPhi,  const double GenPt, const double GenMass,
-		      const double RecoEta, const double RecoPhi, const double RecoPt, const double RecoMass);
-  
-  edm::InputTag   mInputCollection;
-  edm::InputTag   mInputGenCollection;
-  edm::InputTag   mJetCorrector;
-  std::string     JetType;
+private:
+  void fillMatchHists(const double GenEta,
+                      const double GenPhi,
+                      const double GenPt,
+                      const double GenMass,
+                      const double RecoEta,
+                      const double RecoPhi,
+                      const double RecoPt,
+                      const double RecoMass);
 
-  //Tokens
-  edm::EDGetTokenT<std::vector<reco::Vertex> > pvToken_;
+  edm::InputTag mInputCollection;
+  edm::InputTag mInputGenCollection;
+  edm::InputTag mJetCorrector;
+  std::string JetType;
+
+  // Tokens
+  edm::EDGetTokenT<std::vector<reco::Vertex>> pvToken_;
   edm::EDGetTokenT<reco::CaloJetCollection> caloJetsToken_;
   edm::EDGetTokenT<reco::PFJetCollection> pfJetsToken_;
   edm::EDGetTokenT<reco::GenJetCollection> genJetsToken_;
@@ -69,207 +74,203 @@ class JetTester : public DQMEDAnalyzer {
   edm::EDGetTokenT<reco::JetCorrector> jetCorrectorToken_;
 
   // Event variables
-  MonitorElement* mNvtx;
+  MonitorElement *mNvtx;
 
   // Jet parameters
-  MonitorElement* mEta;
-  MonitorElement* mPhi;
-  MonitorElement* mPt;
-  MonitorElement* mP;
-  MonitorElement* mEnergy;
-  MonitorElement* mMass;
-  MonitorElement* mConstituents;
-  MonitorElement* mJetArea;
-//  MonitorElement* mRho;
+  MonitorElement *mEta;
+  MonitorElement *mPhi;
+  MonitorElement *mPt;
+  MonitorElement *mP;
+  MonitorElement *mEnergy;
+  MonitorElement *mMass;
+  MonitorElement *mConstituents;
+  MonitorElement *mJetArea;
+  //  MonitorElement* mRho;
 
   // Corrected jets
-  MonitorElement* mCorrJetPt;
-  MonitorElement* mCorrJetEta;
-  MonitorElement* mCorrJetPhi;
-  MonitorElement* mCorrJetEta_Pt40;
-  MonitorElement* mCorrJetPhi_Pt40;
+  MonitorElement *mCorrJetPt;
+  MonitorElement *mCorrJetEta;
+  MonitorElement *mCorrJetPhi;
+  MonitorElement *mCorrJetEta_Pt40;
+  MonitorElement *mCorrJetPhi_Pt40;
   // Corrected jets profiles
-  MonitorElement* mPtCorrOverReco_Pt_B;
-  MonitorElement* mPtCorrOverReco_Pt_E;
-  MonitorElement* mPtCorrOverReco_Pt_F;
-  MonitorElement* mPtCorrOverReco_Eta_20_40;
-  MonitorElement* mPtCorrOverReco_Eta_40_200;
-  MonitorElement* mPtCorrOverReco_Eta_200_600;
-  MonitorElement* mPtCorrOverReco_Eta_600_1500;
-  MonitorElement* mPtCorrOverReco_Eta_1500_3500;
-  MonitorElement* mPtCorrOverReco_Eta_3500_5000;
-  MonitorElement* mPtCorrOverReco_Eta_5000_6500;
-  MonitorElement* mPtCorrOverReco_Eta_3500;
-  MonitorElement* mPtCorrOverGen_GenPt_B;
-  MonitorElement* mPtCorrOverGen_GenPt_E;
-  MonitorElement* mPtCorrOverGen_GenPt_F;
-  MonitorElement* mPtCorrOverGen_GenEta_20_40;
-  MonitorElement* mPtCorrOverGen_GenEta_40_200;
-  MonitorElement* mPtCorrOverGen_GenEta_200_600;
-  MonitorElement* mPtCorrOverGen_GenEta_600_1500;
-  MonitorElement* mPtCorrOverGen_GenEta_1500_3500;
-  MonitorElement* mPtCorrOverGen_GenEta_3500_5000;
-  MonitorElement* mPtCorrOverGen_GenEta_5000_6500;
-  MonitorElement* mPtCorrOverGen_GenEta_3500;
+  MonitorElement *mPtCorrOverReco_Pt_B;
+  MonitorElement *mPtCorrOverReco_Pt_E;
+  MonitorElement *mPtCorrOverReco_Pt_F;
+  MonitorElement *mPtCorrOverReco_Eta_20_40;
+  MonitorElement *mPtCorrOverReco_Eta_40_200;
+  MonitorElement *mPtCorrOverReco_Eta_200_600;
+  MonitorElement *mPtCorrOverReco_Eta_600_1500;
+  MonitorElement *mPtCorrOverReco_Eta_1500_3500;
+  MonitorElement *mPtCorrOverReco_Eta_3500_5000;
+  MonitorElement *mPtCorrOverReco_Eta_5000_6500;
+  MonitorElement *mPtCorrOverReco_Eta_3500;
+  MonitorElement *mPtCorrOverGen_GenPt_B;
+  MonitorElement *mPtCorrOverGen_GenPt_E;
+  MonitorElement *mPtCorrOverGen_GenPt_F;
+  MonitorElement *mPtCorrOverGen_GenEta_20_40;
+  MonitorElement *mPtCorrOverGen_GenEta_40_200;
+  MonitorElement *mPtCorrOverGen_GenEta_200_600;
+  MonitorElement *mPtCorrOverGen_GenEta_600_1500;
+  MonitorElement *mPtCorrOverGen_GenEta_1500_3500;
+  MonitorElement *mPtCorrOverGen_GenEta_3500_5000;
+  MonitorElement *mPtCorrOverGen_GenEta_5000_6500;
+  MonitorElement *mPtCorrOverGen_GenEta_3500;
 
   // Generation
-  MonitorElement* mGenEta;
-  MonitorElement* mGenPhi;
-  MonitorElement* mGenPt;
-  MonitorElement* mGenEtaFirst;
-  MonitorElement* mGenPhiFirst;
-  MonitorElement* mPtHat;
-  MonitorElement* mDeltaEta;
-  MonitorElement* mDeltaPhi;
-  MonitorElement* mDeltaPt;
-
-  MonitorElement* mPtRecoOverGen_B_20_40;
-  MonitorElement* mPtRecoOverGen_E_20_40;
-  MonitorElement* mPtRecoOverGen_F_20_40;
-  MonitorElement* mPtRecoOverGen_B_40_200;
-  MonitorElement* mPtRecoOverGen_E_40_200;
-  MonitorElement* mPtRecoOverGen_F_40_200;
-  MonitorElement* mPtRecoOverGen_B_200_600;
-  MonitorElement* mPtRecoOverGen_E_200_600;
-  MonitorElement* mPtRecoOverGen_F_200_600;
-  MonitorElement* mPtRecoOverGen_B_600_1500;
-  MonitorElement* mPtRecoOverGen_E_600_1500;
-  MonitorElement* mPtRecoOverGen_F_600_1500;
-  MonitorElement* mPtRecoOverGen_B_1500_3500;
-  MonitorElement* mPtRecoOverGen_E_1500_3500;
-  MonitorElement* mPtRecoOverGen_F_1500_3500;
-  MonitorElement* mPtRecoOverGen_B_3500_5000;
-  MonitorElement* mPtRecoOverGen_E_3500_5000;
-  MonitorElement* mPtRecoOverGen_B_5000_6500;
-  MonitorElement* mPtRecoOverGen_E_5000_6500;
+  MonitorElement *mGenEta;
+  MonitorElement *mGenPhi;
+  MonitorElement *mGenPt;
+  MonitorElement *mGenEtaFirst;
+  MonitorElement *mGenPhiFirst;
+  MonitorElement *mPtHat;
+  MonitorElement *mDeltaEta;
+  MonitorElement *mDeltaPhi;
+  MonitorElement *mDeltaPt;
 
-  //jet mass resolution as function of gen-pt
-  MonitorElement* mMassRecoOverGen_B_20_40;
-  MonitorElement* mMassRecoOverGen_E_20_40;
-  MonitorElement* mMassRecoOverGen_F_20_40;
-  MonitorElement* mMassRecoOverGen_B_40_200;
-  MonitorElement* mMassRecoOverGen_E_40_200;
-  MonitorElement* mMassRecoOverGen_F_40_200;
-  MonitorElement* mMassRecoOverGen_B_200_500;
-  MonitorElement* mMassRecoOverGen_E_200_500;
-  MonitorElement* mMassRecoOverGen_F_200_500;
-  MonitorElement* mMassRecoOverGen_B_500_750;
-  MonitorElement* mMassRecoOverGen_E_500_750;
-  MonitorElement* mMassRecoOverGen_F_500_750;
-  MonitorElement* mMassRecoOverGen_B_750_1000;
-  MonitorElement* mMassRecoOverGen_E_750_1000;
-  MonitorElement* mMassRecoOverGen_F_750_1000;
-  MonitorElement* mMassRecoOverGen_B_1000_1500;
-  MonitorElement* mMassRecoOverGen_E_1000_1500;
-  MonitorElement* mMassRecoOverGen_F_1000_1500;
-  MonitorElement* mMassRecoOverGen_B_1500_3500;
-  MonitorElement* mMassRecoOverGen_E_1500_3500;
-  MonitorElement* mMassRecoOverGen_F_1500;
-  MonitorElement* mMassRecoOverGen_B_3500_5000;
-  MonitorElement* mMassRecoOverGen_E_3500_5000;
-  MonitorElement* mMassRecoOverGen_B_5000;
-  MonitorElement* mMassRecoOverGen_E_5000;
+  MonitorElement *mPtRecoOverGen_B_20_40;
+  MonitorElement *mPtRecoOverGen_E_20_40;
+  MonitorElement *mPtRecoOverGen_F_20_40;
+  MonitorElement *mPtRecoOverGen_B_40_200;
+  MonitorElement *mPtRecoOverGen_E_40_200;
+  MonitorElement *mPtRecoOverGen_F_40_200;
+  MonitorElement *mPtRecoOverGen_B_200_600;
+  MonitorElement *mPtRecoOverGen_E_200_600;
+  MonitorElement *mPtRecoOverGen_F_200_600;
+  MonitorElement *mPtRecoOverGen_B_600_1500;
+  MonitorElement *mPtRecoOverGen_E_600_1500;
+  MonitorElement *mPtRecoOverGen_F_600_1500;
+  MonitorElement *mPtRecoOverGen_B_1500_3500;
+  MonitorElement *mPtRecoOverGen_E_1500_3500;
+  MonitorElement *mPtRecoOverGen_F_1500_3500;
+  MonitorElement *mPtRecoOverGen_B_3500_5000;
+  MonitorElement *mPtRecoOverGen_E_3500_5000;
+  MonitorElement *mPtRecoOverGen_B_5000_6500;
+  MonitorElement *mPtRecoOverGen_E_5000_6500;
 
+  // jet mass resolution as function of gen-pt
+  MonitorElement *mMassRecoOverGen_B_20_40;
+  MonitorElement *mMassRecoOverGen_E_20_40;
+  MonitorElement *mMassRecoOverGen_F_20_40;
+  MonitorElement *mMassRecoOverGen_B_40_200;
+  MonitorElement *mMassRecoOverGen_E_40_200;
+  MonitorElement *mMassRecoOverGen_F_40_200;
+  MonitorElement *mMassRecoOverGen_B_200_500;
+  MonitorElement *mMassRecoOverGen_E_200_500;
+  MonitorElement *mMassRecoOverGen_F_200_500;
+  MonitorElement *mMassRecoOverGen_B_500_750;
+  MonitorElement *mMassRecoOverGen_E_500_750;
+  MonitorElement *mMassRecoOverGen_F_500_750;
+  MonitorElement *mMassRecoOverGen_B_750_1000;
+  MonitorElement *mMassRecoOverGen_E_750_1000;
+  MonitorElement *mMassRecoOverGen_F_750_1000;
+  MonitorElement *mMassRecoOverGen_B_1000_1500;
+  MonitorElement *mMassRecoOverGen_E_1000_1500;
+  MonitorElement *mMassRecoOverGen_F_1000_1500;
+  MonitorElement *mMassRecoOverGen_B_1500_3500;
+  MonitorElement *mMassRecoOverGen_E_1500_3500;
+  MonitorElement *mMassRecoOverGen_F_1500;
+  MonitorElement *mMassRecoOverGen_B_3500_5000;
+  MonitorElement *mMassRecoOverGen_E_3500_5000;
+  MonitorElement *mMassRecoOverGen_B_5000;
+  MonitorElement *mMassRecoOverGen_E_5000;
 
-  MonitorElement* mPtRecoOverGen_B_3500;
-  MonitorElement* mPtRecoOverGen_E_3500;
-  MonitorElement* mPtRecoOverGen_F_3500;
+  MonitorElement *mPtRecoOverGen_B_3500;
+  MonitorElement *mPtRecoOverGen_E_3500;
+  MonitorElement *mPtRecoOverGen_F_3500;
 
   // Generation profiles
-  MonitorElement* mPtRecoOverGen_GenPt_B;
-  MonitorElement* mPtRecoOverGen_GenPt_E;
-  MonitorElement* mPtRecoOverGen_GenPt_F;
-  MonitorElement* mPtRecoOverGen_GenPhi_B;
-  MonitorElement* mPtRecoOverGen_GenPhi_E;
-  MonitorElement* mPtRecoOverGen_GenPhi_F;
-  MonitorElement* mPtRecoOverGen_GenEta_20_40;
-  MonitorElement* mPtRecoOverGen_GenEta_40_200;
-  MonitorElement* mPtRecoOverGen_GenEta_200_600;
-  MonitorElement* mPtRecoOverGen_GenEta_600_1500;
-  MonitorElement* mPtRecoOverGen_GenEta_1500_3500;
-  MonitorElement* mPtRecoOverGen_GenEta_3500_5000;
-  MonitorElement* mPtRecoOverGen_GenEta_5000_6500;
-  MonitorElement* mPtRecoOverGen_GenEta_3500;
-
+  MonitorElement *mPtRecoOverGen_GenPt_B;
+  MonitorElement *mPtRecoOverGen_GenPt_E;
+  MonitorElement *mPtRecoOverGen_GenPt_F;
+  MonitorElement *mPtRecoOverGen_GenPhi_B;
+  MonitorElement *mPtRecoOverGen_GenPhi_E;
+  MonitorElement *mPtRecoOverGen_GenPhi_F;
+  MonitorElement *mPtRecoOverGen_GenEta_20_40;
+  MonitorElement *mPtRecoOverGen_GenEta_40_200;
+  MonitorElement *mPtRecoOverGen_GenEta_200_600;
+  MonitorElement *mPtRecoOverGen_GenEta_600_1500;
+  MonitorElement *mPtRecoOverGen_GenEta_1500_3500;
+  MonitorElement *mPtRecoOverGen_GenEta_3500_5000;
+  MonitorElement *mPtRecoOverGen_GenEta_5000_6500;
+  MonitorElement *mPtRecoOverGen_GenEta_3500;
 
   // Some jet algebra
-  MonitorElement* mEtaFirst;
-  MonitorElement* mPhiFirst;
-  MonitorElement* mPtFirst;
-  MonitorElement* mMjj;
-  MonitorElement* mNJetsEta_B_20_40;
-  MonitorElement* mNJetsEta_E_20_40;
-  MonitorElement* mNJetsEta_B_40;
-  MonitorElement* mNJetsEta_E_40;
-  MonitorElement* mNJets_40;
-  MonitorElement* mNJets1;
-  MonitorElement* mNJets2;
+  MonitorElement *mEtaFirst;
+  MonitorElement *mPhiFirst;
+  MonitorElement *mPtFirst;
+  MonitorElement *mMjj;
+  MonitorElement *mNJetsEta_B_20_40;
+  MonitorElement *mNJetsEta_E_20_40;
+  MonitorElement *mNJetsEta_B_40;
+  MonitorElement *mNJetsEta_E_40;
+  MonitorElement *mNJets_40;
+  MonitorElement *mNJets1;
+  MonitorElement *mNJets2;
 
   // ---- Calo Jet specific information ----
-  MonitorElement* maxEInEmTowers;
-  MonitorElement* maxEInHadTowers;
-  MonitorElement* energyFractionHadronic;
-  MonitorElement* emEnergyFraction;
-  MonitorElement* hadEnergyInHB;
-  MonitorElement* hadEnergyInHO;
-  MonitorElement* hadEnergyInHE;
-  MonitorElement* hadEnergyInHF;
-  MonitorElement* emEnergyInEB;
-  MonitorElement* emEnergyInEE;
-  MonitorElement* emEnergyInHF;
-  MonitorElement* towersArea;
-  MonitorElement* n90;
-  MonitorElement* n60;
+  MonitorElement *maxEInEmTowers;
+  MonitorElement *maxEInHadTowers;
+  MonitorElement *energyFractionHadronic;
+  MonitorElement *emEnergyFraction;
+  MonitorElement *hadEnergyInHB;
+  MonitorElement *hadEnergyInHO;
+  MonitorElement *hadEnergyInHE;
+  MonitorElement *hadEnergyInHF;
+  MonitorElement *emEnergyInEB;
+  MonitorElement *emEnergyInEE;
+  MonitorElement *emEnergyInHF;
+  MonitorElement *towersArea;
+  MonitorElement *n90;
+  MonitorElement *n60;
 
   // ---- JPT or PF Jet specific information ----
-  MonitorElement* muonMultiplicity;
-  MonitorElement* chargedMultiplicity;
-  MonitorElement* chargedEmEnergy;
-  MonitorElement* neutralEmEnergy;
-  MonitorElement* chargedHadronEnergy;
-  MonitorElement* neutralHadronEnergy;
-  MonitorElement* chargedHadronEnergyFraction;
-  MonitorElement* neutralHadronEnergyFraction;
-  MonitorElement* chargedEmEnergyFraction;
-  MonitorElement* neutralEmEnergyFraction;
+  MonitorElement *muonMultiplicity;
+  MonitorElement *chargedMultiplicity;
+  MonitorElement *chargedEmEnergy;
+  MonitorElement *neutralEmEnergy;
+  MonitorElement *chargedHadronEnergy;
+  MonitorElement *neutralHadronEnergy;
+  MonitorElement *chargedHadronEnergyFraction;
+  MonitorElement *neutralHadronEnergyFraction;
+  MonitorElement *chargedEmEnergyFraction;
+  MonitorElement *neutralEmEnergyFraction;
 
   // ---- PF Jet specific information ----
-  MonitorElement* photonEnergy;
-  MonitorElement* photonEnergyFraction;
-  MonitorElement* electronEnergy;
-  MonitorElement* electronEnergyFraction;
-  MonitorElement* muonEnergy;
-  MonitorElement* muonEnergyFraction;
-  MonitorElement* HFHadronEnergy;
-  MonitorElement* HFHadronEnergyFraction;
-  MonitorElement* HFEMEnergy;
-  MonitorElement* HFEMEnergyFraction;
-  MonitorElement* chargedHadronMultiplicity;
-  MonitorElement* neutralHadronMultiplicity;
-  MonitorElement* photonMultiplicity;
-  MonitorElement* electronMultiplicity;
-  MonitorElement* HFHadronMultiplicity;
-  MonitorElement* HFEMMultiplicity;
-  MonitorElement* chargedMuEnergy;
-  MonitorElement* chargedMuEnergyFraction;
-  MonitorElement* neutralMultiplicity;
-  MonitorElement* HOEnergy;
-  MonitorElement* HOEnergyFraction;
+  MonitorElement *photonEnergy;
+  MonitorElement *photonEnergyFraction;
+  MonitorElement *electronEnergy;
+  MonitorElement *electronEnergyFraction;
+  MonitorElement *muonEnergy;
+  MonitorElement *muonEnergyFraction;
+  MonitorElement *HFHadronEnergy;
+  MonitorElement *HFHadronEnergyFraction;
+  MonitorElement *HFEMEnergy;
+  MonitorElement *HFEMEnergyFraction;
+  MonitorElement *chargedHadronMultiplicity;
+  MonitorElement *neutralHadronMultiplicity;
+  MonitorElement *photonMultiplicity;
+  MonitorElement *electronMultiplicity;
+  MonitorElement *HFHadronMultiplicity;
+  MonitorElement *HFEMMultiplicity;
+  MonitorElement *chargedMuEnergy;
+  MonitorElement *chargedMuEnergyFraction;
+  MonitorElement *neutralMultiplicity;
+  MonitorElement *HOEnergy;
+  MonitorElement *HOEnergyFraction;
 
-  //contained in MiniAOD
-  MonitorElement* hadronFlavor;
-  MonitorElement* partonFlavor;
-  MonitorElement* genPartonPDGID;
+  // contained in MiniAOD
+  MonitorElement *hadronFlavor;
+  MonitorElement *partonFlavor;
+  MonitorElement *genPartonPDGID;
 
   // Parameters
-  double          mRecoJetPtThreshold;
-  double          mMatchGenPtThreshold;
-  double          mRThreshold;
-  bool            isCaloJet;
-  bool            isPFJet;
-  bool            isMiniAODJet;
-
-
+  double mRecoJetPtThreshold;
+  double mMatchGenPtThreshold;
+  double mRThreshold;
+  bool isCaloJet;
+  bool isPFJet;
+  bool isMiniAODJet;
 };
 
 #endif
diff --git a/Validation/RecoJets/plugins/JetTesterPostProcessor.cc b/Validation/RecoJets/plugins/JetTesterPostProcessor.cc
index e2e0fff921a50..3e99f9c506f89 100644
--- a/Validation/RecoJets/plugins/JetTesterPostProcessor.cc
+++ b/Validation/RecoJets/plugins/JetTesterPostProcessor.cc
@@ -2,64 +2,57 @@
 //
 // Package:    Validation/RecoMET
 // Class:      METTesterPostProcessor
-// 
+//
 // Original Author:  "Matthias Weber"
 //         Created:  Sun Feb 22 14:35:25 CET 2015
 //
 
-#include "Validation/RecoJets/plugins/JetTesterPostProcessor.h"
 #include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "FWCore/Framework/interface/Run.h"
+#include "Validation/RecoJets/plugins/JetTesterPostProcessor.h"
 
 // Some switches
 //
 // constructors and destructor
 //
-JetTesterPostProcessor::JetTesterPostProcessor(const edm::ParameterSet& iConfig)
-{
-  inputJetLabelRECO_=iConfig.getParameter<edm::InputTag>("JetTypeRECO");
-  inputJetLabelMiniAOD_=iConfig.getParameter<edm::InputTag>("JetTypeMiniAOD");
-}
-
-
-JetTesterPostProcessor::~JetTesterPostProcessor()
-{ 
+JetTesterPostProcessor::JetTesterPostProcessor(const edm::ParameterSet &iConfig) {
+  inputJetLabelRECO_ = iConfig.getParameter<edm::InputTag>("JetTypeRECO");
+  inputJetLabelMiniAOD_ = iConfig.getParameter<edm::InputTag>("JetTypeMiniAOD");
 }
 
+JetTesterPostProcessor::~JetTesterPostProcessor() {}
 
 // ------------ method called right after a run ends ------------
-void 
-JetTesterPostProcessor::dqmEndJob(DQMStore::IBooker& ibook_, DQMStore::IGetter& iget_)
-{
+void JetTesterPostProcessor::dqmEndJob(DQMStore::IBooker &ibook_, DQMStore::IGetter &iget_) {
   std::vector<std::string> subDirVec;
-  std::string RunDir="JetMET/JetValidation/";
+  std::string RunDir = "JetMET/JetValidation/";
   iget_.setCurrentFolder(RunDir);
-  jet_dirs=iget_.getSubdirs();
-  bool found_reco_dir=false;
-  bool found_miniaod_dir=false;
-  //loop over jet subdirectories
-  for (int i=0; i<int(jet_dirs.size()); i++) {
-    ibook_.setCurrentFolder(jet_dirs[i]);  
-    if(jet_dirs[i]==(RunDir+inputJetLabelRECO_.label())){
-      found_reco_dir=true;
+  jet_dirs = iget_.getSubdirs();
+  bool found_reco_dir = false;
+  bool found_miniaod_dir = false;
+  // loop over jet subdirectories
+  for (int i = 0; i < int(jet_dirs.size()); i++) {
+    ibook_.setCurrentFolder(jet_dirs[i]);
+    if (jet_dirs[i] == (RunDir + inputJetLabelRECO_.label())) {
+      found_reco_dir = true;
     }
-    if(jet_dirs[i]==(RunDir+inputJetLabelMiniAOD_.label())){
-      found_miniaod_dir=true;
+    if (jet_dirs[i] == (RunDir + inputJetLabelMiniAOD_.label())) {
+      found_miniaod_dir = true;
     }
   }
-  if(found_miniaod_dir && found_reco_dir){
-    std::string rundir_reco=RunDir+inputJetLabelRECO_.label();
-    std::string rundir_miniaod=RunDir+inputJetLabelMiniAOD_.label();
+  if (found_miniaod_dir && found_reco_dir) {
+    std::string rundir_reco = RunDir + inputJetLabelRECO_.label();
+    std::string rundir_miniaod = RunDir + inputJetLabelMiniAOD_.label();
 
-    MonitorElement* mGenPt_Reco=iget_.get(rundir_reco+"/"+"GenPt");
-    MonitorElement* mGenPhi_Reco=iget_.get(rundir_reco+"/"+"GenPhi");
-    MonitorElement* mGenEta_Reco=iget_.get(rundir_reco+"/"+"GenEta");
-    MonitorElement* mPt_Reco=iget_.get(rundir_reco+"/"+"Pt");
-    MonitorElement* mPhi_Reco=iget_.get(rundir_reco+"/"+"Phi");
-    MonitorElement* mEta_Reco=iget_.get(rundir_reco+"/"+"Eta");
-    MonitorElement* mCorrJetPt_Reco=iget_.get(rundir_reco+"/"+"CorrJetPt");
-    MonitorElement* mCorrJetPhi_Reco=iget_.get(rundir_reco+"/"+"CorrJetPhi");
-    MonitorElement* mCorrJetEta_Reco=iget_.get(rundir_reco+"/"+"CorrJetEta");
+    MonitorElement *mGenPt_Reco = iget_.get(rundir_reco + "/" + "GenPt");
+    MonitorElement *mGenPhi_Reco = iget_.get(rundir_reco + "/" + "GenPhi");
+    MonitorElement *mGenEta_Reco = iget_.get(rundir_reco + "/" + "GenEta");
+    MonitorElement *mPt_Reco = iget_.get(rundir_reco + "/" + "Pt");
+    MonitorElement *mPhi_Reco = iget_.get(rundir_reco + "/" + "Phi");
+    MonitorElement *mEta_Reco = iget_.get(rundir_reco + "/" + "Eta");
+    MonitorElement *mCorrJetPt_Reco = iget_.get(rundir_reco + "/" + "CorrJetPt");
+    MonitorElement *mCorrJetPhi_Reco = iget_.get(rundir_reco + "/" + "CorrJetPhi");
+    MonitorElement *mCorrJetEta_Reco = iget_.get(rundir_reco + "/" + "CorrJetEta");
     /*
     map_string_vec.push_back("Pt");
     map_string_vec.push_back("Phi");
@@ -67,31 +60,38 @@ JetTesterPostProcessor::dqmEndJob(DQMStore::IBooker& ibook_, DQMStore::IGetter&
     map_string_vec.push_back("CorrJetPt");
     map_string_vec.push_back("CorrJetPhi");
     map_string_vec.push_back("CorrJetEta");
-    map_of_MEs.insert(std::pair<std::string,MonitorElement*>(rundir_reco+"/"+"Pt" ,mPt_Reco));
-    map_of_MEs.insert(std::pair<std::string,MonitorElement*>(rundir_reco+"/"+"Phi" ,mPhi_Reco));
-    map_of_MEs.insert(std::pair<std::string,MonitorElement*>(rundir_reco+"/"+"Eta" ,mEta_Reco));
-    map_of_MEs.insert(std::pair<std::string,MonitorElement*>(rundir_reco+"/"+"CorrJetPt"  ,mCorrJetPt_Reco));
-    map_of_MEs.insert(std::pair<std::string,MonitorElement*>(rundir_reco+"/"+"CorrJetPhi" ,mCorrJetPhi_Reco));
-    map_of_MEs.insert(std::pair<std::string,MonitorElement*>(rundir_reco+"/"+"CorrJetEta" ,mCorrJetEta_Reco));
+    map_of_MEs.insert(std::pair<std::string,MonitorElement*>(rundir_reco+"/"+"Pt"
+    ,mPt_Reco));
+    map_of_MEs.insert(std::pair<std::string,MonitorElement*>(rundir_reco+"/"+"Phi"
+    ,mPhi_Reco));
+    map_of_MEs.insert(std::pair<std::string,MonitorElement*>(rundir_reco+"/"+"Eta"
+    ,mEta_Reco));
+    map_of_MEs.insert(std::pair<std::string,MonitorElement*>(rundir_reco+"/"+"CorrJetPt"
+    ,mCorrJetPt_Reco));
+    map_of_MEs.insert(std::pair<std::string,MonitorElement*>(rundir_reco+"/"+"CorrJetPhi"
+    ,mCorrJetPhi_Reco));
+    map_of_MEs.insert(std::pair<std::string,MonitorElement*>(rundir_reco+"/"+"CorrJetEta"
+    ,mCorrJetEta_Reco));
     */
-    MonitorElement* mPtCorrOverReco_Eta_20_40_Reco=iget_.get(rundir_reco+"/"+"PtCorrOverReco_Eta_20_40");
-    MonitorElement* mPtCorrOverReco_Eta_200_600_Reco=iget_.get(rundir_reco+"/"+"PtCorrOverReco_Eta_200_600");
-    MonitorElement* mPtCorrOverReco_Eta_1500_3500_Reco=iget_.get(rundir_reco+"/"+"PtCorrOverReco_Eta_1500_3500");
-    MonitorElement* mPtCorrOverGen_GenEta_40_200_Reco=iget_.get(rundir_reco+"/"+"PtCorrOverGen_GenEta_40_200");
-    MonitorElement* mPtCorrOverGen_GenEta_600_1500_Reco=iget_.get(rundir_reco+"/"+"PtCorrOverGen_GenEta_600_1500");
-    MonitorElement* mDeltaEta_Reco=iget_.get(rundir_reco+"/"+"DeltaEta");
-    MonitorElement* mDeltaPhi_Reco=iget_.get(rundir_reco+"/"+"DeltaPhi");
-    MonitorElement* mDeltaPt_Reco=iget_.get(rundir_reco+"/"+"DeltaPt");
-    MonitorElement* mMjj_Reco=iget_.get(rundir_reco+"/"+"Mjj");
-    MonitorElement* mNJets40_Reco=iget_.get(rundir_reco+"/"+"NJets");
-    MonitorElement* mchargedHadronMultiplicity_Reco=iget_.get(rundir_reco+"/"+"chargedHadronMultiplicity");
-    MonitorElement* mneutralHadronMultiplicity_Reco=iget_.get(rundir_reco+"/"+"neutralHadronMultiplicity");
-    MonitorElement* mphotonMultiplicity_Reco=iget_.get(rundir_reco+"/"+"photonMultiplicity");
-    MonitorElement* mphotonEnergyFraction_Reco=iget_.get(rundir_reco+"/"+"photonEnergyFraction");
-    MonitorElement* mneutralHadronEnergyFraction_Reco=iget_.get(rundir_reco+"/"+"neutralHadronEnergyFraction");
-    MonitorElement* mchargedHadronEnergyFraction_Reco=iget_.get(rundir_reco+"/"+"chargedHadronEnergyFraction");
+    MonitorElement *mPtCorrOverReco_Eta_20_40_Reco = iget_.get(rundir_reco + "/" + "PtCorrOverReco_Eta_20_40");
+    MonitorElement *mPtCorrOverReco_Eta_200_600_Reco = iget_.get(rundir_reco + "/" + "PtCorrOverReco_Eta_200_600");
+    MonitorElement *mPtCorrOverReco_Eta_1500_3500_Reco = iget_.get(rundir_reco + "/" + "PtCorrOverReco_Eta_1500_3500");
+    MonitorElement *mPtCorrOverGen_GenEta_40_200_Reco = iget_.get(rundir_reco + "/" + "PtCorrOverGen_GenEta_40_200");
+    MonitorElement *mPtCorrOverGen_GenEta_600_1500_Reco =
+        iget_.get(rundir_reco + "/" + "PtCorrOverGen_GenEta_600_1500");
+    MonitorElement *mDeltaEta_Reco = iget_.get(rundir_reco + "/" + "DeltaEta");
+    MonitorElement *mDeltaPhi_Reco = iget_.get(rundir_reco + "/" + "DeltaPhi");
+    MonitorElement *mDeltaPt_Reco = iget_.get(rundir_reco + "/" + "DeltaPt");
+    MonitorElement *mMjj_Reco = iget_.get(rundir_reco + "/" + "Mjj");
+    MonitorElement *mNJets40_Reco = iget_.get(rundir_reco + "/" + "NJets");
+    MonitorElement *mchargedHadronMultiplicity_Reco = iget_.get(rundir_reco + "/" + "chargedHadronMultiplicity");
+    MonitorElement *mneutralHadronMultiplicity_Reco = iget_.get(rundir_reco + "/" + "neutralHadronMultiplicity");
+    MonitorElement *mphotonMultiplicity_Reco = iget_.get(rundir_reco + "/" + "photonMultiplicity");
+    MonitorElement *mphotonEnergyFraction_Reco = iget_.get(rundir_reco + "/" + "photonEnergyFraction");
+    MonitorElement *mneutralHadronEnergyFraction_Reco = iget_.get(rundir_reco + "/" + "neutralHadronEnergyFraction");
+    MonitorElement *mchargedHadronEnergyFraction_Reco = iget_.get(rundir_reco + "/" + "chargedHadronEnergyFraction");
 
-    std::vector<MonitorElement*>ME_Reco;
+    std::vector<MonitorElement *> ME_Reco;
     ME_Reco.push_back(mGenPt_Reco);
     ME_Reco.push_back(mGenPhi_Reco);
     ME_Reco.push_back(mGenEta_Reco);
@@ -118,33 +118,39 @@ JetTesterPostProcessor::dqmEndJob(DQMStore::IBooker& ibook_, DQMStore::IGetter&
     ME_Reco.push_back(mneutralHadronEnergyFraction_Reco);
     ME_Reco.push_back(mchargedHadronEnergyFraction_Reco);
 
-    MonitorElement* mGenPt_MiniAOD=iget_.get(rundir_miniaod+"/"+"GenPt");
-    MonitorElement* mGenPhi_MiniAOD=iget_.get(rundir_miniaod+"/"+"GenPhi");
-    MonitorElement* mGenEta_MiniAOD=iget_.get(rundir_miniaod+"/"+"GenEta");
-    MonitorElement* mPt_MiniAOD=iget_.get(rundir_miniaod+"/"+"Pt");
-    MonitorElement* mPhi_MiniAOD=iget_.get(rundir_miniaod+"/"+"Phi");
-    MonitorElement* mEta_MiniAOD=iget_.get(rundir_miniaod+"/"+"Eta");
-    MonitorElement* mCorrJetPt_MiniAOD=iget_.get(rundir_miniaod+"/"+"CorrJetPt");
-    MonitorElement* mCorrJetPhi_MiniAOD=iget_.get(rundir_miniaod+"/"+"CorrJetPhi");
-    MonitorElement* mCorrJetEta_MiniAOD=iget_.get(rundir_miniaod+"/"+"CorrJetEta");
-    MonitorElement* mPtCorrOverReco_Eta_20_40_MiniAOD=iget_.get(rundir_miniaod+"/"+"PtCorrOverReco_Eta_20_40");
-    MonitorElement* mPtCorrOverReco_Eta_200_600_MiniAOD=iget_.get(rundir_miniaod+"/"+"PtCorrOverReco_Eta_200_600");
-    MonitorElement* mPtCorrOverReco_Eta_1500_3500_MiniAOD=iget_.get(rundir_miniaod+"/"+"PtCorrOverReco_Eta_1500_3500");
-    MonitorElement* mPtCorrOverGen_GenEta_40_200_MiniAOD=iget_.get(rundir_miniaod+"/"+"PtCorrOverGen_GenEta_40_200");
-    MonitorElement* mPtCorrOverGen_GenEta_600_1500_MiniAOD=iget_.get(rundir_miniaod+"/"+"PtCorrOverGen_GenEta_600_1500");
-    MonitorElement* mDeltaEta_MiniAOD=iget_.get(rundir_miniaod+"/"+"DeltaEta");
-    MonitorElement* mDeltaPhi_MiniAOD=iget_.get(rundir_miniaod+"/"+"DeltaPhi");
-    MonitorElement* mDeltaPt_MiniAOD=iget_.get(rundir_miniaod+"/"+"DeltaPt");
-    MonitorElement* mMjj_MiniAOD=iget_.get(rundir_miniaod+"/"+"Mjj");
-    MonitorElement* mNJets40_MiniAOD=iget_.get(rundir_miniaod+"/"+"NJets");
-    MonitorElement* mchargedHadronMultiplicity_MiniAOD=iget_.get(rundir_miniaod+"/"+"chargedHadronMultiplicity");
-    MonitorElement* mneutralHadronMultiplicity_MiniAOD=iget_.get(rundir_miniaod+"/"+"neutralHadronMultiplicity");
-    MonitorElement* mphotonMultiplicity_MiniAOD=iget_.get(rundir_miniaod+"/"+"photonMultiplicity");
-    MonitorElement* mphotonEnergyFraction_MiniAOD=iget_.get(rundir_miniaod+"/"+"photonEnergyFraction");
-    MonitorElement* mneutralHadronEnergyFraction_MiniAOD=iget_.get(rundir_miniaod+"/"+"neutralHadronEnergyFraction");
-    MonitorElement* mchargedHadronEnergyFraction_MiniAOD=iget_.get(rundir_miniaod+"/"+"chargedHadronEnergyFraction");
+    MonitorElement *mGenPt_MiniAOD = iget_.get(rundir_miniaod + "/" + "GenPt");
+    MonitorElement *mGenPhi_MiniAOD = iget_.get(rundir_miniaod + "/" + "GenPhi");
+    MonitorElement *mGenEta_MiniAOD = iget_.get(rundir_miniaod + "/" + "GenEta");
+    MonitorElement *mPt_MiniAOD = iget_.get(rundir_miniaod + "/" + "Pt");
+    MonitorElement *mPhi_MiniAOD = iget_.get(rundir_miniaod + "/" + "Phi");
+    MonitorElement *mEta_MiniAOD = iget_.get(rundir_miniaod + "/" + "Eta");
+    MonitorElement *mCorrJetPt_MiniAOD = iget_.get(rundir_miniaod + "/" + "CorrJetPt");
+    MonitorElement *mCorrJetPhi_MiniAOD = iget_.get(rundir_miniaod + "/" + "CorrJetPhi");
+    MonitorElement *mCorrJetEta_MiniAOD = iget_.get(rundir_miniaod + "/" + "CorrJetEta");
+    MonitorElement *mPtCorrOverReco_Eta_20_40_MiniAOD = iget_.get(rundir_miniaod + "/" + "PtCorrOverReco_Eta_20_40");
+    MonitorElement *mPtCorrOverReco_Eta_200_600_MiniAOD =
+        iget_.get(rundir_miniaod + "/" + "PtCorrOverReco_Eta_200_600");
+    MonitorElement *mPtCorrOverReco_Eta_1500_3500_MiniAOD =
+        iget_.get(rundir_miniaod + "/" + "PtCorrOverReco_Eta_1500_3500");
+    MonitorElement *mPtCorrOverGen_GenEta_40_200_MiniAOD =
+        iget_.get(rundir_miniaod + "/" + "PtCorrOverGen_GenEta_40_200");
+    MonitorElement *mPtCorrOverGen_GenEta_600_1500_MiniAOD =
+        iget_.get(rundir_miniaod + "/" + "PtCorrOverGen_GenEta_600_1500");
+    MonitorElement *mDeltaEta_MiniAOD = iget_.get(rundir_miniaod + "/" + "DeltaEta");
+    MonitorElement *mDeltaPhi_MiniAOD = iget_.get(rundir_miniaod + "/" + "DeltaPhi");
+    MonitorElement *mDeltaPt_MiniAOD = iget_.get(rundir_miniaod + "/" + "DeltaPt");
+    MonitorElement *mMjj_MiniAOD = iget_.get(rundir_miniaod + "/" + "Mjj");
+    MonitorElement *mNJets40_MiniAOD = iget_.get(rundir_miniaod + "/" + "NJets");
+    MonitorElement *mchargedHadronMultiplicity_MiniAOD = iget_.get(rundir_miniaod + "/" + "chargedHadronMultiplicity");
+    MonitorElement *mneutralHadronMultiplicity_MiniAOD = iget_.get(rundir_miniaod + "/" + "neutralHadronMultiplicity");
+    MonitorElement *mphotonMultiplicity_MiniAOD = iget_.get(rundir_miniaod + "/" + "photonMultiplicity");
+    MonitorElement *mphotonEnergyFraction_MiniAOD = iget_.get(rundir_miniaod + "/" + "photonEnergyFraction");
+    MonitorElement *mneutralHadronEnergyFraction_MiniAOD =
+        iget_.get(rundir_miniaod + "/" + "neutralHadronEnergyFraction");
+    MonitorElement *mchargedHadronEnergyFraction_MiniAOD =
+        iget_.get(rundir_miniaod + "/" + "chargedHadronEnergyFraction");
 
-    std::vector<MonitorElement*>ME_MiniAOD;
+    std::vector<MonitorElement *> ME_MiniAOD;
     ME_MiniAOD.push_back(mGenPt_MiniAOD);
     ME_MiniAOD.push_back(mGenPhi_MiniAOD);
     ME_MiniAOD.push_back(mGenEta_MiniAOD);
@@ -171,47 +177,58 @@ JetTesterPostProcessor::dqmEndJob(DQMStore::IBooker& ibook_, DQMStore::IGetter&
     ME_MiniAOD.push_back(mneutralHadronEnergyFraction_MiniAOD);
     ME_MiniAOD.push_back(mchargedHadronEnergyFraction_MiniAOD);
 
-    ibook_.setCurrentFolder(RunDir+"MiniAOD_over_RECO");
-    mGenPt_MiniAOD_over_Reco=ibook_.book1D("GenPt_MiniAOD_over_RECO",(TH1F*)mGenPt_Reco->getRootObject());
-    mGenPhi_MiniAOD_over_Reco=ibook_.book1D("GenPhi_MiniAOD_over_RECO",(TH1F*)mGenPhi_Reco->getRootObject());
-    mGenEta_MiniAOD_over_Reco=ibook_.book1D("GenEta_MiniAOD_over_RECO",(TH1F*)mGenEta_Reco->getRootObject());
-    mPt_MiniAOD_over_Reco=ibook_.book1D("Pt_MiniAOD_over_RECO",(TH1F*)mPt_Reco->getRootObject());
-    mPhi_MiniAOD_over_Reco=ibook_.book1D("Phi_MiniAOD_over_RECO",(TH1F*)mPhi_Reco->getRootObject());
-    mEta_MiniAOD_over_Reco=ibook_.book1D("Eta_MiniAOD_over_RECO",(TH1F*)mEta_Reco->getRootObject());
-    mCorrJetPt_MiniAOD_over_Reco=ibook_.book1D("CorrJetPt_MiniAOD_over_RECO",(TH1F*)mCorrJetPt_Reco->getRootObject());
-    mCorrJetPhi_MiniAOD_over_Reco=ibook_.book1D("CorrJetPhi_MiniAOD_over_RECO",(TH1F*)mCorrJetPhi_Reco->getRootObject());
-    mCorrJetEta_MiniAOD_over_Reco=ibook_.book1D("CorrJetEta_MiniAOD_over_RECO",(TH1F*)mCorrJetEta_Reco->getRootObject());
+    ibook_.setCurrentFolder(RunDir + "MiniAOD_over_RECO");
+    mGenPt_MiniAOD_over_Reco = ibook_.book1D("GenPt_MiniAOD_over_RECO", (TH1F *)mGenPt_Reco->getRootObject());
+    mGenPhi_MiniAOD_over_Reco = ibook_.book1D("GenPhi_MiniAOD_over_RECO", (TH1F *)mGenPhi_Reco->getRootObject());
+    mGenEta_MiniAOD_over_Reco = ibook_.book1D("GenEta_MiniAOD_over_RECO", (TH1F *)mGenEta_Reco->getRootObject());
+    mPt_MiniAOD_over_Reco = ibook_.book1D("Pt_MiniAOD_over_RECO", (TH1F *)mPt_Reco->getRootObject());
+    mPhi_MiniAOD_over_Reco = ibook_.book1D("Phi_MiniAOD_over_RECO", (TH1F *)mPhi_Reco->getRootObject());
+    mEta_MiniAOD_over_Reco = ibook_.book1D("Eta_MiniAOD_over_RECO", (TH1F *)mEta_Reco->getRootObject());
+    mCorrJetPt_MiniAOD_over_Reco =
+        ibook_.book1D("CorrJetPt_MiniAOD_over_RECO", (TH1F *)mCorrJetPt_Reco->getRootObject());
+    mCorrJetPhi_MiniAOD_over_Reco =
+        ibook_.book1D("CorrJetPhi_MiniAOD_over_RECO", (TH1F *)mCorrJetPhi_Reco->getRootObject());
+    mCorrJetEta_MiniAOD_over_Reco =
+        ibook_.book1D("CorrJetEta_MiniAOD_over_RECO", (TH1F *)mCorrJetEta_Reco->getRootObject());
 
-   //if eta range changed here need change in JetTester as well
-   float etarange[91] = {-6.0, -5.8, -5.6, -5.4, -5.2, -5.0, -4.8, -4.6, -4.4, -4.2,
-		     -4.0, -3.8, -3.6, -3.4, -3.2, -3.0, -2.9, -2.8, -2.7, -2.6,
-		     -2.5, -2.4, -2.3, -2.2, -2.1, -2.0, -1.9, -1.8, -1.7, -1.6,
-		     -1.5, -1.4, -1.3, -1.2, -1.1, -1.0, -0.9, -0.8, -0.7, -0.6,
-		     -0.5, -0.4, -0.3, -0.2, -0.1,
-		     0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9,
-		     1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9,
-		     2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9,
-		     3.0, 3.2, 3.4, 3.6, 3.8, 4.0, 4.2, 4.4, 4.6, 4.8,
-		     5.0, 5.2, 5.4, 5.6, 5.8, 6.0};
+    // if eta range changed here need change in JetTester as well
+    float etarange[91] = {-6.0, -5.8, -5.6, -5.4, -5.2, -5.0, -4.8, -4.6, -4.4, -4.2, -4.0, -3.8, -3.6,
+                          -3.4, -3.2, -3.0, -2.9, -2.8, -2.7, -2.6, -2.5, -2.4, -2.3, -2.2, -2.1, -2.0,
+                          -1.9, -1.8, -1.7, -1.6, -1.5, -1.4, -1.3, -1.2, -1.1, -1.0, -0.9, -0.8, -0.7,
+                          -0.6, -0.5, -0.4, -0.3, -0.2, -0.1, 0.0,  0.1,  0.2,  0.3,  0.4,  0.5,  0.6,
+                          0.7,  0.8,  0.9,  1.0,  1.1,  1.2,  1.3,  1.4,  1.5,  1.6,  1.7,  1.8,  1.9,
+                          2.0,  2.1,  2.2,  2.3,  2.4,  2.5,  2.6,  2.7,  2.8,  2.9,  3.0,  3.2,  3.4,
+                          3.6,  3.8,  4.0,  4.2,  4.4,  4.6,  4.8,  5.0,  5.2,  5.4,  5.6,  5.8,  6.0};
 
-    mPtCorrOverReco_Eta_20_40_MiniAOD_over_Reco=ibook_.book1D("PtCorrOverReco_Eta_20_40_MiniAOD_over_RECO","20<genpt<40",90,etarange);
-    mPtCorrOverReco_Eta_200_600_MiniAOD_over_Reco=ibook_.book1D("PtCorrOverReco_Eta_200_600_MiniAOD_over_RECO","200<genpt<600",90,etarange);
-    mPtCorrOverReco_Eta_1500_3500_MiniAOD_over_Reco=ibook_.book1D("PtCorrOverReco_Eta_1500_3500_MiniAOD_over_RECO","1500<genpt<3500",90,etarange);
-    mPtCorrOverGen_GenEta_40_200_MiniAOD_over_Reco=ibook_.book1D("PtCorrOverGen_GenEta_40_200_MiniAOD_over_RECO","40<genpt<200",90,etarange);
-    mPtCorrOverGen_GenEta_600_1500_MiniAOD_over_Reco=ibook_.book1D("PtCorrOverGen_GenEta_600_1500_MiniAOD_over_RECO","600<genpt<1500",90,etarange);
-    mDeltaPt_MiniAOD_over_Reco=ibook_.book1D("DeltaPt_MiniAOD_over_RECO",(TH1F*)mDeltaPt_Reco->getRootObject());
-    mDeltaPhi_MiniAOD_over_Reco=ibook_.book1D("DeltaPhi_MiniAOD_over_RECO",(TH1F*)mDeltaPhi_Reco->getRootObject());
-    mDeltaEta_MiniAOD_over_Reco=ibook_.book1D("DeltaEta_MiniAOD_over_RECO",(TH1F*)mDeltaEta_Reco->getRootObject());
-    mMjj_MiniAOD_over_Reco=ibook_.book1D("Mjj_MiniAOD_over_RECO",(TH1F*)mMjj_Reco->getRootObject());
-    mNJets40_MiniAOD_over_Reco=ibook_.book1D("NJets_MiniAOD_over_RECO",(TH1F*)mNJets40_Reco->getRootObject());
-    mchargedHadronMultiplicity_MiniAOD_over_Reco=ibook_.book1D("chargedHadronMultiplicity_MiniAOD_over_RECO",(TH1F*)mchargedHadronMultiplicity_Reco->getRootObject());
-    mneutralHadronMultiplicity_MiniAOD_over_Reco=ibook_.book1D("neutralHadronMultiplicity_MiniAOD_over_RECO",(TH1F*)mneutralHadronMultiplicity_Reco->getRootObject());
-    mphotonMultiplicity_MiniAOD_over_Reco=ibook_.book1D("photonMultiplicity_MiniAOD_over_RECO",(TH1F*)mphotonMultiplicity_Reco->getRootObject());
-    mchargedHadronEnergyFraction_MiniAOD_over_Reco=ibook_.book1D("chargedHadronEnergyFraction_MiniAOD_over_RECO",(TH1F*)mchargedHadronEnergyFraction_Reco->getRootObject());
-    mneutralHadronEnergyFraction_MiniAOD_over_Reco=ibook_.book1D("neutralHadronEnergyFraction_MiniAOD_over_RECO",(TH1F*)mneutralHadronEnergyFraction_Reco->getRootObject());
-    mphotonEnergyFraction_MiniAOD_over_Reco=ibook_.book1D("photonEnergyFraction_MiniAOD_over_RECO",(TH1F*)mphotonEnergyFraction_Reco->getRootObject());
+    mPtCorrOverReco_Eta_20_40_MiniAOD_over_Reco =
+        ibook_.book1D("PtCorrOverReco_Eta_20_40_MiniAOD_over_RECO", "20<genpt<40", 90, etarange);
+    mPtCorrOverReco_Eta_200_600_MiniAOD_over_Reco =
+        ibook_.book1D("PtCorrOverReco_Eta_200_600_MiniAOD_over_RECO", "200<genpt<600", 90, etarange);
+    mPtCorrOverReco_Eta_1500_3500_MiniAOD_over_Reco =
+        ibook_.book1D("PtCorrOverReco_Eta_1500_3500_MiniAOD_over_RECO", "1500<genpt<3500", 90, etarange);
+    mPtCorrOverGen_GenEta_40_200_MiniAOD_over_Reco =
+        ibook_.book1D("PtCorrOverGen_GenEta_40_200_MiniAOD_over_RECO", "40<genpt<200", 90, etarange);
+    mPtCorrOverGen_GenEta_600_1500_MiniAOD_over_Reco =
+        ibook_.book1D("PtCorrOverGen_GenEta_600_1500_MiniAOD_over_RECO", "600<genpt<1500", 90, etarange);
+    mDeltaPt_MiniAOD_over_Reco = ibook_.book1D("DeltaPt_MiniAOD_over_RECO", (TH1F *)mDeltaPt_Reco->getRootObject());
+    mDeltaPhi_MiniAOD_over_Reco = ibook_.book1D("DeltaPhi_MiniAOD_over_RECO", (TH1F *)mDeltaPhi_Reco->getRootObject());
+    mDeltaEta_MiniAOD_over_Reco = ibook_.book1D("DeltaEta_MiniAOD_over_RECO", (TH1F *)mDeltaEta_Reco->getRootObject());
+    mMjj_MiniAOD_over_Reco = ibook_.book1D("Mjj_MiniAOD_over_RECO", (TH1F *)mMjj_Reco->getRootObject());
+    mNJets40_MiniAOD_over_Reco = ibook_.book1D("NJets_MiniAOD_over_RECO", (TH1F *)mNJets40_Reco->getRootObject());
+    mchargedHadronMultiplicity_MiniAOD_over_Reco = ibook_.book1D(
+        "chargedHadronMultiplicity_MiniAOD_over_RECO", (TH1F *)mchargedHadronMultiplicity_Reco->getRootObject());
+    mneutralHadronMultiplicity_MiniAOD_over_Reco = ibook_.book1D(
+        "neutralHadronMultiplicity_MiniAOD_over_RECO", (TH1F *)mneutralHadronMultiplicity_Reco->getRootObject());
+    mphotonMultiplicity_MiniAOD_over_Reco =
+        ibook_.book1D("photonMultiplicity_MiniAOD_over_RECO", (TH1F *)mphotonMultiplicity_Reco->getRootObject());
+    mchargedHadronEnergyFraction_MiniAOD_over_Reco = ibook_.book1D(
+        "chargedHadronEnergyFraction_MiniAOD_over_RECO", (TH1F *)mchargedHadronEnergyFraction_Reco->getRootObject());
+    mneutralHadronEnergyFraction_MiniAOD_over_Reco = ibook_.book1D(
+        "neutralHadronEnergyFraction_MiniAOD_over_RECO", (TH1F *)mneutralHadronEnergyFraction_Reco->getRootObject());
+    mphotonEnergyFraction_MiniAOD_over_Reco =
+        ibook_.book1D("photonEnergyFraction_MiniAOD_over_RECO", (TH1F *)mphotonEnergyFraction_Reco->getRootObject());
 
-    std::vector<MonitorElement*>ME_MiniAOD_over_Reco;
+    std::vector<MonitorElement *> ME_MiniAOD_over_Reco;
     ME_MiniAOD_over_Reco.push_back(mGenPt_MiniAOD_over_Reco);
     ME_MiniAOD_over_Reco.push_back(mGenPhi_MiniAOD_over_Reco);
     ME_MiniAOD_over_Reco.push_back(mGenEta_MiniAOD_over_Reco);
@@ -237,19 +254,22 @@ JetTesterPostProcessor::dqmEndJob(DQMStore::IBooker& ibook_, DQMStore::IGetter&
     ME_MiniAOD_over_Reco.push_back(mphotonEnergyFraction_MiniAOD_over_Reco);
     ME_MiniAOD_over_Reco.push_back(mneutralHadronEnergyFraction_MiniAOD_over_Reco);
     ME_MiniAOD_over_Reco.push_back(mchargedHadronEnergyFraction_MiniAOD_over_Reco);
-    for(unsigned int j=0;j<ME_MiniAOD_over_Reco.size();j++){
-      MonitorElement* monReco=ME_Reco[j];if(monReco && monReco->getRootObject()){
-	MonitorElement* monMiniAOD=ME_MiniAOD[j];if(monMiniAOD && monMiniAOD->getRootObject()){
-	  MonitorElement* monMiniAOD_over_RECO=ME_MiniAOD_over_Reco[j];if(monMiniAOD_over_RECO && monMiniAOD_over_RECO->getRootObject()){
-	    for(int i=0;i<=(monMiniAOD_over_RECO->getNbinsX()+1);i++){
-	      if(monReco->getBinContent(i)!=0){
-		monMiniAOD_over_RECO->setBinContent(i,monMiniAOD->getBinContent(i)/monReco->getBinContent(i));
-	      }else if (monMiniAOD->getBinContent(i)!=0){
-		monMiniAOD_over_RECO->setBinContent(i,-0.5);
-	      }
-	    }
-	  }
-	}
+    for (unsigned int j = 0; j < ME_MiniAOD_over_Reco.size(); j++) {
+      MonitorElement *monReco = ME_Reco[j];
+      if (monReco && monReco->getRootObject()) {
+        MonitorElement *monMiniAOD = ME_MiniAOD[j];
+        if (monMiniAOD && monMiniAOD->getRootObject()) {
+          MonitorElement *monMiniAOD_over_RECO = ME_MiniAOD_over_Reco[j];
+          if (monMiniAOD_over_RECO && monMiniAOD_over_RECO->getRootObject()) {
+            for (int i = 0; i <= (monMiniAOD_over_RECO->getNbinsX() + 1); i++) {
+              if (monReco->getBinContent(i) != 0) {
+                monMiniAOD_over_RECO->setBinContent(i, monMiniAOD->getBinContent(i) / monReco->getBinContent(i));
+              } else if (monMiniAOD->getBinContent(i) != 0) {
+                monMiniAOD_over_RECO->setBinContent(i, -0.5);
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/Validation/RecoJets/plugins/JetTesterPostProcessor.h b/Validation/RecoJets/plugins/JetTesterPostProcessor.h
index db8725a32bbb3..cac0da74cedf4 100644
--- a/Validation/RecoJets/plugins/JetTesterPostProcessor.h
+++ b/Validation/RecoJets/plugins/JetTesterPostProcessor.h
@@ -4,66 +4,65 @@
 // author: Matthias Weber, Feb 2015
 
 // system include files
-#include <memory>
-#include <cstdio>
 #include <cmath>
+#include <cstdio>
+#include <memory>
 #include <sstream>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 //
 // class decleration
 //
 
 class JetTesterPostProcessor : public DQMEDHarvester {
-   public:
-      explicit JetTesterPostProcessor(const edm::ParameterSet&);
-      ~JetTesterPostProcessor() override;
-
-   private:
-      void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override ;
+public:
+  explicit JetTesterPostProcessor(const edm::ParameterSet &);
+  ~JetTesterPostProcessor() override;
 
-      edm::InputTag inputJetLabelRECO_;
-      edm::InputTag inputJetLabelMiniAOD_;
+private:
+  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
 
-      std::vector<std::string> jet_dirs;
+  edm::InputTag inputJetLabelRECO_;
+  edm::InputTag inputJetLabelMiniAOD_;
 
-      MonitorElement* mGenPt_MiniAOD_over_Reco;
-      MonitorElement* mGenPhi_MiniAOD_over_Reco;
-      MonitorElement* mGenEta_MiniAOD_over_Reco;
-      MonitorElement* mPt_MiniAOD_over_Reco;
-      MonitorElement* mPhi_MiniAOD_over_Reco;
-      MonitorElement* mEta_MiniAOD_over_Reco;
-      MonitorElement* mCorrJetPt_MiniAOD_over_Reco;
-      MonitorElement* mCorrJetPhi_MiniAOD_over_Reco;
-      MonitorElement* mCorrJetEta_MiniAOD_over_Reco;
-      MonitorElement* mPtCorrOverReco_Eta_20_40_MiniAOD_over_Reco;
-      MonitorElement* mPtCorrOverReco_Eta_200_600_MiniAOD_over_Reco;
-      MonitorElement* mPtCorrOverReco_Eta_1500_3500_MiniAOD_over_Reco;
-      MonitorElement* mPtCorrOverGen_GenEta_40_200_MiniAOD_over_Reco;
-      MonitorElement* mPtCorrOverGen_GenEta_600_1500_MiniAOD_over_Reco;
-      MonitorElement* mDeltaEta_MiniAOD_over_Reco;
-      MonitorElement* mDeltaPhi_MiniAOD_over_Reco;
-      MonitorElement* mDeltaPt_MiniAOD_over_Reco;
-      MonitorElement* mMjj_MiniAOD_over_Reco;
-      MonitorElement* mNJets40_MiniAOD_over_Reco;
-      MonitorElement* mchargedHadronMultiplicity_MiniAOD_over_Reco;
-      MonitorElement* mneutralHadronMultiplicity_MiniAOD_over_Reco;
-      MonitorElement* mphotonMultiplicity_MiniAOD_over_Reco;
-      MonitorElement* mphotonEnergyFraction_MiniAOD_over_Reco;
-      MonitorElement* mneutralHadronEnergyFraction_MiniAOD_over_Reco;
-      MonitorElement* mchargedHadronEnergyFraction_MiniAOD_over_Reco;
+  std::vector<std::string> jet_dirs;
 
+  MonitorElement *mGenPt_MiniAOD_over_Reco;
+  MonitorElement *mGenPhi_MiniAOD_over_Reco;
+  MonitorElement *mGenEta_MiniAOD_over_Reco;
+  MonitorElement *mPt_MiniAOD_over_Reco;
+  MonitorElement *mPhi_MiniAOD_over_Reco;
+  MonitorElement *mEta_MiniAOD_over_Reco;
+  MonitorElement *mCorrJetPt_MiniAOD_over_Reco;
+  MonitorElement *mCorrJetPhi_MiniAOD_over_Reco;
+  MonitorElement *mCorrJetEta_MiniAOD_over_Reco;
+  MonitorElement *mPtCorrOverReco_Eta_20_40_MiniAOD_over_Reco;
+  MonitorElement *mPtCorrOverReco_Eta_200_600_MiniAOD_over_Reco;
+  MonitorElement *mPtCorrOverReco_Eta_1500_3500_MiniAOD_over_Reco;
+  MonitorElement *mPtCorrOverGen_GenEta_40_200_MiniAOD_over_Reco;
+  MonitorElement *mPtCorrOverGen_GenEta_600_1500_MiniAOD_over_Reco;
+  MonitorElement *mDeltaEta_MiniAOD_over_Reco;
+  MonitorElement *mDeltaPhi_MiniAOD_over_Reco;
+  MonitorElement *mDeltaPt_MiniAOD_over_Reco;
+  MonitorElement *mMjj_MiniAOD_over_Reco;
+  MonitorElement *mNJets40_MiniAOD_over_Reco;
+  MonitorElement *mchargedHadronMultiplicity_MiniAOD_over_Reco;
+  MonitorElement *mneutralHadronMultiplicity_MiniAOD_over_Reco;
+  MonitorElement *mphotonMultiplicity_MiniAOD_over_Reco;
+  MonitorElement *mphotonEnergyFraction_MiniAOD_over_Reco;
+  MonitorElement *mneutralHadronEnergyFraction_MiniAOD_over_Reco;
+  MonitorElement *mchargedHadronEnergyFraction_MiniAOD_over_Reco;
 };
 
 #endif
diff --git a/Validation/RecoJets/plugins/JetTester_HeavyIons.cc b/Validation/RecoJets/plugins/JetTester_HeavyIons.cc
index 7cb70df37d536..bf3e1a7adc8b9 100644
--- a/Validation/RecoJets/plugins/JetTester_HeavyIons.cc
+++ b/Validation/RecoJets/plugins/JetTester_HeavyIons.cc
@@ -1,5 +1,5 @@
-// Producer for validation histograms for Calo and PF background subtracted objects 
-// Modified by Raghav Kunnawalkam Elayavalli, Aug 18th 2014
+// Producer for validation histograms for Calo and PF background subtracted
+// objects Modified by Raghav Kunnawalkam Elayavalli, Aug 18th 2014
 //                                          , Oct 22nd 2014 to run in 73X
 
 #include "JetTester_HeavyIons.h"
@@ -8,36 +8,38 @@ using namespace edm;
 using namespace reco;
 using namespace std;
 
-JetTester_HeavyIons::JetTester_HeavyIons(const edm::ParameterSet& iConfig) :
-  mInputCollection               (iConfig.getParameter<edm::InputTag>       ("src")),
-  mInputGenCollection            (iConfig.getParameter<edm::InputTag>       ("srcGen")),
-  mInputPFCandCollection         (iConfig.getParameter<edm::InputTag>       ("PFcands")),
-  // mInputCandCollection           (iConfig.getParameter<edm::InputTag>       ("Cands")),
-  // rhoTag                         (iConfig.getParameter<edm::InputTag>       ("srcRho")),
-  mOutputFile                    (iConfig.getUntrackedParameter<std::string>("OutputFile","")),
-  JetType                        (iConfig.getUntrackedParameter<std::string>("JetType")),
-  UEAlgo                         (iConfig.getUntrackedParameter<std::string>("UEAlgo")),
-  Background                     (iConfig.getParameter<edm::InputTag>       ("Background")),
-  mRecoJetPtThreshold            (iConfig.getParameter<double>              ("recoJetPtThreshold")),
-  mMatchGenPtThreshold           (iConfig.getParameter<double>              ("matchGenPtThreshold")),
-  mGenEnergyFractionThreshold    (iConfig.getParameter<double>              ("genEnergyFractionThreshold")),
-  mReverseEnergyFractionThreshold(iConfig.getParameter<double>              ("reverseEnergyFractionThreshold")),
-  mRThreshold                    (iConfig.getParameter<double>              ("RThreshold")),
-  JetCorrectionService           (iConfig.getParameter<std::string>         ("JetCorrections"))
-{
+JetTester_HeavyIons::JetTester_HeavyIons(const edm::ParameterSet &iConfig)
+    : mInputCollection(iConfig.getParameter<edm::InputTag>("src")),
+      mInputGenCollection(iConfig.getParameter<edm::InputTag>("srcGen")),
+      mInputPFCandCollection(iConfig.getParameter<edm::InputTag>("PFcands")),
+      // mInputCandCollection           (iConfig.getParameter<edm::InputTag>
+      // ("Cands")), rhoTag (iConfig.getParameter<edm::InputTag> ("srcRho")),
+      mOutputFile(iConfig.getUntrackedParameter<std::string>("OutputFile", "")),
+      JetType(iConfig.getUntrackedParameter<std::string>("JetType")),
+      UEAlgo(iConfig.getUntrackedParameter<std::string>("UEAlgo")),
+      Background(iConfig.getParameter<edm::InputTag>("Background")),
+      mRecoJetPtThreshold(iConfig.getParameter<double>("recoJetPtThreshold")),
+      mMatchGenPtThreshold(iConfig.getParameter<double>("matchGenPtThreshold")),
+      mGenEnergyFractionThreshold(iConfig.getParameter<double>("genEnergyFractionThreshold")),
+      mReverseEnergyFractionThreshold(iConfig.getParameter<double>("reverseEnergyFractionThreshold")),
+      mRThreshold(iConfig.getParameter<double>("RThreshold")),
+      JetCorrectionService(iConfig.getParameter<std::string>("JetCorrections")) {
   std::string inputCollectionLabel(mInputCollection.label());
 
-  isCaloJet = (std::string("calo")==JetType);
-  isJPTJet  = (std::string("jpt") ==JetType);
-  isPFJet   = (std::string("pf")  ==JetType);
+  isCaloJet = (std::string("calo") == JetType);
+  isJPTJet = (std::string("jpt") == JetType);
+  isPFJet = (std::string("pf") == JetType);
 
-  //consumes
-  pvToken_ = consumes<std::vector<reco::Vertex> >(edm::InputTag("offlinePrimaryVertices"));
+  // consumes
+  pvToken_ = consumes<std::vector<reco::Vertex>>(edm::InputTag("offlinePrimaryVertices"));
   caloTowersToken_ = consumes<CaloTowerCollection>(edm::InputTag("towerMaker"));
-  if (isCaloJet) caloJetsToken_  = consumes<reco::CaloJetCollection>(mInputCollection);
-  if (isJPTJet)  jptJetsToken_   = consumes<reco::JPTJetCollection>(mInputCollection);
-  if (isPFJet)   {
-    if(std::string("Pu")==UEAlgo) basicJetsToken_    = consumes<reco::BasicJetCollection>(mInputCollection);
+  if (isCaloJet)
+    caloJetsToken_ = consumes<reco::CaloJetCollection>(mInputCollection);
+  if (isJPTJet)
+    jptJetsToken_ = consumes<reco::JPTJetCollection>(mInputCollection);
+  if (isPFJet) {
+    if (std::string("Pu") == UEAlgo)
+      basicJetsToken_ = consumes<reco::BasicJetCollection>(mInputCollection);
   }
 
   genJetsToken_ = consumes<reco::GenJetCollection>(edm::InputTag(mInputGenCollection));
@@ -45,17 +47,17 @@ JetTester_HeavyIons::JetTester_HeavyIons(const edm::ParameterSet& iConfig) :
   pfCandToken_ = consumes<reco::PFCandidateCollection>(mInputPFCandCollection);
   pfCandViewToken_ = consumes<reco::CandidateView>(mInputPFCandCollection);
   caloCandViewToken_ = consumes<reco::CandidateView>(edm::InputTag("towerMaker"));
-  backgrounds_ = consumes<edm::ValueMap<reco::VoronoiBackground> >(Background);
-  backgrounds_value_ = consumes<std::vector<float> >(Background);
+  backgrounds_ = consumes<edm::ValueMap<reco::VoronoiBackground>>(Background);
+  backgrounds_value_ = consumes<std::vector<float>>(Background);
   centralityTag_ = iConfig.getParameter<InputTag>("centralitycollection");
   centralityToken = consumes<reco::Centrality>(centralityTag_);
 
-  centralityBinTag_ = (iConfig.getParameter<edm::InputTag> ("centralitybincollection"));
+  centralityBinTag_ = (iConfig.getParameter<edm::InputTag>("centralitybincollection"));
   centralityBinToken = consumes<int>(centralityBinTag_);
-  hiVertexToken_ = consumes<std::vector<reco::Vertex> >(edm::InputTag("hiSelectedVertex"));
-  
-  // need to initialize the PF cand histograms : which are also event variables 
-  if(isPFJet){
+  hiVertexToken_ = consumes<std::vector<reco::Vertex>>(edm::InputTag("hiSelectedVertex"));
+
+  // need to initialize the PF cand histograms : which are also event variables
+  if (isPFJet) {
     mNPFpart = nullptr;
     mPFPt = nullptr;
     mPFEta = nullptr;
@@ -81,50 +83,49 @@ JetTester_HeavyIons::JetTester_HeavyIons(const edm::ParameterSet& iConfig) :
     mSumPFPt_2p043_2p650 = nullptr;
     mSumPFPt_2p650_5p191 = nullptr;
 
-    mPFCandpT_vs_eta_Unknown = nullptr; // pf id 0
-    mPFCandpT_vs_eta_ChargedHadron = nullptr; // pf id - 1 
-    mPFCandpT_vs_eta_electron = nullptr; // pf id - 2
-    mPFCandpT_vs_eta_muon = nullptr; // pf id - 3
-    mPFCandpT_vs_eta_photon = nullptr; // pf id - 4
-    mPFCandpT_vs_eta_NeutralHadron = nullptr; // pf id - 5
-    mPFCandpT_vs_eta_HadE_inHF = nullptr; // pf id - 6
-    mPFCandpT_vs_eta_EME_inHF = nullptr; // pf id - 7
-     
-    mPFCandpT_Barrel_Unknown = nullptr; // pf id 0
-    mPFCandpT_Barrel_ChargedHadron = nullptr; // pf id - 1 
-    mPFCandpT_Barrel_electron = nullptr; // pf id - 2
-    mPFCandpT_Barrel_muon = nullptr; // pf id - 3
-    mPFCandpT_Barrel_photon = nullptr; // pf id - 4
-    mPFCandpT_Barrel_NeutralHadron = nullptr; // pf id - 5
-    mPFCandpT_Barrel_HadE_inHF = nullptr; // pf id - 6
-    mPFCandpT_Barrel_EME_inHF = nullptr; // pf id - 7
-
-    mPFCandpT_Endcap_Unknown = nullptr; // pf id 0
-    mPFCandpT_Endcap_ChargedHadron = nullptr; // pf id - 1 
-    mPFCandpT_Endcap_electron = nullptr; // pf id - 2
-    mPFCandpT_Endcap_muon = nullptr; // pf id - 3
-    mPFCandpT_Endcap_photon = nullptr; // pf id - 4
-    mPFCandpT_Endcap_NeutralHadron = nullptr; // pf id - 5
-    mPFCandpT_Endcap_HadE_inHF = nullptr; // pf id - 6
-    mPFCandpT_Endcap_EME_inHF = nullptr; // pf id - 7
-
-    mPFCandpT_Forward_Unknown = nullptr; // pf id 0
-    mPFCandpT_Forward_ChargedHadron = nullptr; // pf id - 1 
-    mPFCandpT_Forward_electron = nullptr; // pf id - 2
-    mPFCandpT_Forward_muon = nullptr; // pf id - 3
-    mPFCandpT_Forward_photon = nullptr; // pf id - 4
-    mPFCandpT_Forward_NeutralHadron = nullptr; // pf id - 5
-    mPFCandpT_Forward_HadE_inHF = nullptr; // pf id - 6
-    mPFCandpT_Forward_EME_inHF = nullptr; // pf id - 7
-    
+    mPFCandpT_vs_eta_Unknown = nullptr;        // pf id 0
+    mPFCandpT_vs_eta_ChargedHadron = nullptr;  // pf id - 1
+    mPFCandpT_vs_eta_electron = nullptr;       // pf id - 2
+    mPFCandpT_vs_eta_muon = nullptr;           // pf id - 3
+    mPFCandpT_vs_eta_photon = nullptr;         // pf id - 4
+    mPFCandpT_vs_eta_NeutralHadron = nullptr;  // pf id - 5
+    mPFCandpT_vs_eta_HadE_inHF = nullptr;      // pf id - 6
+    mPFCandpT_vs_eta_EME_inHF = nullptr;       // pf id - 7
+
+    mPFCandpT_Barrel_Unknown = nullptr;        // pf id 0
+    mPFCandpT_Barrel_ChargedHadron = nullptr;  // pf id - 1
+    mPFCandpT_Barrel_electron = nullptr;       // pf id - 2
+    mPFCandpT_Barrel_muon = nullptr;           // pf id - 3
+    mPFCandpT_Barrel_photon = nullptr;         // pf id - 4
+    mPFCandpT_Barrel_NeutralHadron = nullptr;  // pf id - 5
+    mPFCandpT_Barrel_HadE_inHF = nullptr;      // pf id - 6
+    mPFCandpT_Barrel_EME_inHF = nullptr;       // pf id - 7
+
+    mPFCandpT_Endcap_Unknown = nullptr;        // pf id 0
+    mPFCandpT_Endcap_ChargedHadron = nullptr;  // pf id - 1
+    mPFCandpT_Endcap_electron = nullptr;       // pf id - 2
+    mPFCandpT_Endcap_muon = nullptr;           // pf id - 3
+    mPFCandpT_Endcap_photon = nullptr;         // pf id - 4
+    mPFCandpT_Endcap_NeutralHadron = nullptr;  // pf id - 5
+    mPFCandpT_Endcap_HadE_inHF = nullptr;      // pf id - 6
+    mPFCandpT_Endcap_EME_inHF = nullptr;       // pf id - 7
+
+    mPFCandpT_Forward_Unknown = nullptr;        // pf id 0
+    mPFCandpT_Forward_ChargedHadron = nullptr;  // pf id - 1
+    mPFCandpT_Forward_electron = nullptr;       // pf id - 2
+    mPFCandpT_Forward_muon = nullptr;           // pf id - 3
+    mPFCandpT_Forward_photon = nullptr;         // pf id - 4
+    mPFCandpT_Forward_NeutralHadron = nullptr;  // pf id - 5
+    mPFCandpT_Forward_HadE_inHF = nullptr;      // pf id - 6
+    mPFCandpT_Forward_EME_inHF = nullptr;       // pf id - 7
   }
-  if(isCaloJet){
+  if (isCaloJet) {
     mNCalopart = nullptr;
     mCaloPt = nullptr;
     mCaloEta = nullptr;
     mCaloPhi = nullptr;
     mCaloArea = nullptr;
-    
+
     mSumCaloPt = nullptr;
     mSumSquaredCaloPt = nullptr;
     mSumCaloPt_HF = nullptr;
@@ -144,34 +145,30 @@ JetTester_HeavyIons::JetTester_HeavyIons(const edm::ParameterSet& iConfig) :
     mSumCaloPt_1p740_2p043 = nullptr;
     mSumCaloPt_2p043_2p650 = nullptr;
     mSumCaloPt_2p650_5p191 = nullptr;
-  
   }
   mSumpt = nullptr;
-  
-
 
   // Events variables
-  mNvtx         = nullptr;
-  mHF           = nullptr;
+  mNvtx = nullptr;
+  mHF = nullptr;
 
-  
   // Jet parameters
-  mEta          = nullptr;
-  mPhi          = nullptr;
-  mEnergy       = nullptr;
-  mP            = nullptr;
-  mPt           = nullptr;
-  mMass         = nullptr;
+  mEta = nullptr;
+  mPhi = nullptr;
+  mEnergy = nullptr;
+  mP = nullptr;
+  mPt = nullptr;
+  mMass = nullptr;
   mConstituents = nullptr;
-  mJetArea      = nullptr;
-  mjetpileup    = nullptr;
-  mNJets_40     = nullptr;
-  mNJets        = nullptr;
+  mJetArea = nullptr;
+  mjetpileup = nullptr;
+  mNJets_40 = nullptr;
+  mNJets = nullptr;
 
-  mGenEta      = nullptr;
-  mGenPhi      = nullptr;
-  mGenPt       = nullptr;
-  mPtHat       = nullptr;
+  mGenEta = nullptr;
+  mGenPhi = nullptr;
+  mGenPt = nullptr;
+  mPtHat = nullptr;
 
   mPtRecoOverGen_B_20_30_Cent_0_10 = nullptr;
   mPtRecoOverGen_E_20_30_Cent_0_10 = nullptr;
@@ -260,7 +257,7 @@ JetTester_HeavyIons::JetTester_HeavyIons(const edm::ParameterSet& iConfig) :
   mPtRecoOverGen_B_300_Inf_Cent_50_80 = nullptr;
   mPtRecoOverGen_E_300_Inf_Cent_50_80 = nullptr;
   mPtRecoOverGen_F_300_Inf_Cent_50_80 = nullptr;
-  
+
   mPtRecoOverGen_GenPt_B_Cent_0_10 = nullptr;
   mPtRecoOverGen_GenPt_E_Cent_0_10 = nullptr;
   mPtRecoOverGen_GenPt_F_Cent_0_10 = nullptr;
@@ -297,7 +294,7 @@ JetTester_HeavyIons::JetTester_HeavyIons(const edm::ParameterSet& iConfig) :
   mPtRecoOverGen_GenEta_120_180_Cent_30_50 = nullptr;
   mPtRecoOverGen_GenEta_180_300_Cent_30_50 = nullptr;
   mPtRecoOverGen_GenEta_300_Inf_Cent_30_50 = nullptr;
-  
+
   mPtRecoOverGen_GenEta_20_30_Cent_50_80 = nullptr;
   mPtRecoOverGen_GenEta_30_50_Cent_50_80 = nullptr;
   mPtRecoOverGen_GenEta_50_80_Cent_50_80 = nullptr;
@@ -305,324 +302,670 @@ JetTester_HeavyIons::JetTester_HeavyIons(const edm::ParameterSet& iConfig) :
   mPtRecoOverGen_GenEta_120_180_Cent_50_80 = nullptr;
   mPtRecoOverGen_GenEta_180_300_Cent_50_80 = nullptr;
   mPtRecoOverGen_GenEta_300_Inf_Cent_50_80 = nullptr;
-  
-      
 }
-   
-void JetTester_HeavyIons::bookHistograms(DQMStore::IBooker & ibooker, edm::Run const & iRun,edm::EventSetup const &) 
-{
 
-  ibooker.setCurrentFolder("JetMET/JetValidation/"+mInputCollection.label());
+void JetTester_HeavyIons::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &iRun, edm::EventSetup const &) {
+  ibooker.setCurrentFolder("JetMET/JetValidation/" + mInputCollection.label());
+
+  double log10PtMin = 0.50;
+  double log10PtMax = 3.75;
+  int log10PtBins = 26;
 
-  double log10PtMin  = 0.50;
-  double log10PtMax  = 3.75;
-  int    log10PtBins = 26; 
-  
   static const size_t ncms_hcal_edge_pseudorapidity = 82 + 1;
   static const double cms_hcal_edge_pseudorapidity[ncms_hcal_edge_pseudorapidity] = {
-    -5.191, -4.889, -4.716, -4.538, -4.363, -4.191, -4.013,
-    -3.839, -3.664, -3.489, -3.314, -3.139, -2.964, -2.853,
-    -2.650, -2.500, -2.322, -2.172, -2.043, -1.930, -1.830,
-    -1.740, -1.653, -1.566, -1.479, -1.392, -1.305, -1.218,
-    -1.131, -1.044, -0.957, -0.879, -0.783, -0.696, -0.609,
-    -0.522, -0.435, -0.348, -0.261, -0.174, -0.087,
-    0.000,
-    0.087, 0.174, 0.261, 0.348, 0.435, 0.522, 0.609,
-    0.696, 0.783, 0.879, 0.957, 1.044, 1.131, 1.218,
-    1.305, 1.392, 1.479, 1.566, 1.653, 1.740, 1.830,
-    1.930, 2.043, 2.172, 2.322, 2.500, 2.650, 2.853,
-    2.964, 3.139, 3.314, 3.489, 3.664, 3.839, 4.013,
-    4.191, 4.363, 4.538, 4.716, 4.889, 5.191
-  };
-
-  double etaRange[91] = {-6.0, -5.8, -5.6, -5.4, -5.2, -5.0, -4.8, -4.6, -4.4, -4.2,
-			 -4.0, -3.8, -3.6, -3.4, -3.2, -3.0, -2.9, -2.8, -2.7, -2.6,
-			 -2.5, -2.4, -2.3, -2.2, -2.1, -2.0, -1.9, -1.8, -1.7, -1.6,
-			 -1.5, -1.4, -1.3, -1.2, -1.1, -1.0, -0.9, -0.8, -0.7, -0.6,
-			 -0.5, -0.4, -0.3, -0.2, -0.1,
-			 0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9,
-			 1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9,
-			 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8, 2.9,
-			 3.0, 3.2, 3.4, 3.6, 3.8, 4.0, 4.2, 4.4, 4.6, 4.8,
-			 5.0, 5.2, 5.4, 5.6, 5.8, 6.0};
-    
-  double edge_pseudorapidity[etaBins_ +1] = {-5.191, -2.650, -2.043, -1.740, -1.479, -1.131, -0.783, -0.522, 0.522, 0.783, 1.131, 1.479, 1.740, 2.043, 2.650, 5.191 };
-
-  TH2F *h2D_etabins_vs_pt2 = new TH2F("h2D_etabins_vs_pt2","etaBins (x axis), sum pt^{2} (y axis)",etaBins_,edge_pseudorapidity,10000,0,10000);
-  TH2F *h2D_etabins_vs_pt = new TH2F("h2D_etabins_vs_pt","etaBins (x axis), sum pt (y axis)",etaBins_,edge_pseudorapidity,10000,-1000,1000);
-  TH2F *h2D_etabins_vs_phi = new TH2F("h2D_etabins_vs_phi","candidate map, eta(x axis), phi (y axis), pt (z axis)",ncms_hcal_edge_pseudorapidity-1,cms_hcal_edge_pseudorapidity,36,-TMath::Pi(),TMath::Pi());
-  TH2F *h2D_pfcand_etabins_vs_pt = new TH2F("h2D_etabins_vs_pt",";#eta;sum p_{T}",etaBins_,edge_pseudorapidity,300, 0, 300);
-
-  if(isPFJet){
-
-    mNPFpart         = ibooker.book1D("NPFpart","No of particle flow candidates",1000,0,10000);
-    mPFPt            = ibooker.book1D("PFPt","PF candidate p_{T}",1000,-5000,5000);
-    mPFEta           = ibooker.book1D("PFEta","PF candidate #eta",120,-6,6);
-    mPFPhi           = ibooker.book1D("PFPhi","PF candidate #phi",70,-3.5,3.5);
-    mPFArea          = ibooker.book1D("PFArea","VS PF candidate area",100,0,4);
-      
-    mSumPFPt         = ibooker.book1D("SumPFPt","Sum of initial PF p_{T}",1000,-10000,10000);
-
-    mSumSquaredPFPt         = ibooker.book1D("SumSquaredPFPt","Sum of initial PF p_{T} squared",10000,0,10000);
-
-    mSumPFPt_HF    = ibooker.book2D("SumPFPt_HF","HF energy (y axis) vs Sum initial PF p_{T} (x axis)",1000,-1000,1000,1000,0,10000);
-
-
-    mSumPFPt_n5p191_n2p650 = ibooker.book1D("mSumPFPt_n5p191_n2p650","Sum PFPt  in the eta range -5.191 to -2.650",1000,-5000,5000);
-    mSumPFPt_n2p650_n2p043 = ibooker.book1D("mSumPFPt_n2p650_n2p043","Sum PFPt  in the eta range -2.650 to -2.043 ",1000,-5000,5000);
-    mSumPFPt_n2p043_n1p740 = ibooker.book1D("mSumPFPt_n2p043_n1p740","Sum PFPt  in the eta range -2.043 to -1.740",1000,-1000,1000);
-    mSumPFPt_n1p740_n1p479 = ibooker.book1D("mSumPFPt_n1p740_n1p479","Sum PFPt  in the eta range -1.740 to -1.479",1000,-1000,1000);
-    mSumPFPt_n1p479_n1p131 = ibooker.book1D("mSumPFPt_n1p479_n1p131","Sum PFPt  in the eta range -1.479 to -1.131",1000,-1000,1000);
-    mSumPFPt_n1p131_n0p783 = ibooker.book1D("mSumPFPt_n1p131_n0p783","Sum PFPt  in the eta range -1.131 to -0.783",1000,-1000,1000);
-    mSumPFPt_n0p783_n0p522 = ibooker.book1D("mSumPFPt_n0p783_n0p522","Sum PFPt  in the eta range -0.783 to -0.522",1000,-1000,1000);
-    mSumPFPt_n0p522_0p522 = ibooker.book1D("mSumPFPt_n0p522_0p522","Sum PFPt  in the eta range -0.522 to 0.522",1000,-1000,1000);
-    mSumPFPt_0p522_0p783 = ibooker.book1D("mSumPFPt_0p522_0p783","Sum PFPt  in the eta range 0.522 to 0.783",1000,-1000,1000);
-    mSumPFPt_0p783_1p131 = ibooker.book1D("mSumPFPt_0p783_1p131","Sum PFPt  in the eta range 0.783 to 1.131",1000,-1000,1000);
-    mSumPFPt_1p131_1p479 = ibooker.book1D("mSumPFPt_1p131_1p479","Sum PFPt  in the eta range 1.131 to 1.479",1000,-1000,1000);
-    mSumPFPt_1p479_1p740 = ibooker.book1D("mSumPFPt_1p479_1p740","Sum PFPt  in the eta range 1.479 to 1.740",1000,-1000,1000);
-    mSumPFPt_1p740_2p043 = ibooker.book1D("mSumPFPt_1p740_2p043","Sum PFPt  in the eta range 1.740 to 2.043",1000,-1000,1000);
-    mSumPFPt_2p043_2p650 = ibooker.book1D("mSumPFPt_2p043_2p650","Sum PFPt  in the eta range 2.043 to 2.650",1000,-5000,5000);
-    mSumPFPt_2p650_5p191 = ibooker.book1D("mSumPFPt_2p650_5p191","Sum PFPt  in the eta range 2.650 to 5.191",1000,-5000,5000);
-
-    mPFCandpT_vs_eta_Unknown = ibooker.book2D("PF_cand_X_unknown",h2D_pfcand_etabins_vs_pt); // pf id 0
-    mPFCandpT_vs_eta_ChargedHadron = ibooker.book2D("PF_cand_chargedHad",h2D_pfcand_etabins_vs_pt); // pf id - 1 
-    mPFCandpT_vs_eta_electron = ibooker.book2D("PF_cand_electron",h2D_pfcand_etabins_vs_pt); // pf id - 2
-    mPFCandpT_vs_eta_muon = ibooker.book2D("PF_cand_muon",h2D_pfcand_etabins_vs_pt); // pf id - 3
-    mPFCandpT_vs_eta_photon = ibooker.book2D("PF_cand_photon",h2D_pfcand_etabins_vs_pt); // pf id - 4
-    mPFCandpT_vs_eta_NeutralHadron = ibooker.book2D("PF_cand_neutralHad",h2D_pfcand_etabins_vs_pt); // pf id - 5
-    mPFCandpT_vs_eta_HadE_inHF = ibooker.book2D("PF_cand_HadEner_inHF",h2D_pfcand_etabins_vs_pt); // pf id - 6
-    mPFCandpT_vs_eta_EME_inHF = ibooker.book2D("PF_cand_EMEner_inHF",h2D_pfcand_etabins_vs_pt); // pf id - 7
-
-    mPFCandpT_Barrel_Unknown = ibooker.book1D("mPFCandpT_Barrel_Unknown",Form(";PF candidate p_{T}, |#eta|<%2.2f; counts", BarrelEta),300, 0, 300); // pf id  - 0
-    mPFCandpT_Barrel_ChargedHadron = ibooker.book1D("mPFCandpT_Barrel_ChargedHadron",Form(";PF candidate p_{T}, |#eta|<%2.2f; counts", BarrelEta),300, 0, 300); // pf id - 1 
-    mPFCandpT_Barrel_electron = ibooker.book1D("mPFCandpT_Barrel_electron",Form(";PF candidate p_{T}, |#eta|<%2.2f; counts", BarrelEta),300, 0, 300); // pf id - 2
-    mPFCandpT_Barrel_muon = ibooker.book1D("mPFCandpT_Barrel_muon",Form(";PF candidate p_{T}, |#eta|<%2.2f; counts", BarrelEta),300, 0, 300); // pf id - 3
-    mPFCandpT_Barrel_photon = ibooker.book1D("mPFCandpT_Barrel_photon",Form(";PF candidate p_{T}, |#eta|<%2.2f; counts", BarrelEta),300, 0, 300); // pf id - 4
-    mPFCandpT_Barrel_NeutralHadron = ibooker.book1D("mPFCandpT_Barrel_NeutralHadron",Form(";PF candidate p_{T}, |#eta|<%2.2f; counts", BarrelEta),300, 0, 300); // pf id - 5
-    mPFCandpT_Barrel_HadE_inHF = ibooker.book1D("mPFCandpT_Barrel_HadE_inHF",Form(";PF candidate p_{T}, |#eta|<%2.2f; counts", BarrelEta),300, 0, 300); // pf id - 6
-    mPFCandpT_Barrel_EME_inHF = ibooker.book1D("mPFCandpT_Barrel_EME_inHF",Form(";PF candidate p_{T}, |#eta|<%2.2f; counts", BarrelEta),300, 0, 300); // pf id - 7
-    
-    mPFCandpT_Endcap_Unknown = ibooker.book1D("mPFCandpT_Endcap_Unknown",Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", BarrelEta, EndcapEta),300, 0, 300); // pf id - 0
-    mPFCandpT_Endcap_ChargedHadron = ibooker.book1D("mPFCandpT_Endcap_ChargedHadron",Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", BarrelEta, EndcapEta),300, 0, 300); // pf id - 1 
-    mPFCandpT_Endcap_electron = ibooker.book1D("mPFCandpT_Endcap_electron",Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", BarrelEta, EndcapEta),300, 0, 300); // pf id - 2
-    mPFCandpT_Endcap_muon = ibooker.book1D("mPFCandpT_Endcap_muon",Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", BarrelEta, EndcapEta),300, 0, 300); // pf id - 3
-    mPFCandpT_Endcap_photon = ibooker.book1D("mPFCandpT_Endcap_photon",Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", BarrelEta, EndcapEta),300, 0, 300); // pf id - 4
-    mPFCandpT_Endcap_NeutralHadron = ibooker.book1D("mPFCandpT_Endcap_NeutralHadron",Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", BarrelEta, EndcapEta),300, 0, 300); // pf id - 5
-    mPFCandpT_Endcap_HadE_inHF = ibooker.book1D("mPFCandpT_Endcap_HadE_inHF",Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", BarrelEta, EndcapEta),300, 0, 300); // pf id - 6
-    mPFCandpT_Endcap_EME_inHF = ibooker.book1D("mPFCandpT_Endcap_EME_inHF",Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", BarrelEta, EndcapEta),300, 0, 300); // pf id - 7
-
-    mPFCandpT_Forward_Unknown = ibooker.book1D("mPFCandpT_Forward_Unknown",Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", EndcapEta, ForwardEta),300, 0, 300); // pf id - 0
-    mPFCandpT_Forward_ChargedHadron = ibooker.book1D("mPFCandpT_Forward_ChargedHadron",Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", EndcapEta, ForwardEta),300, 0, 300); // pf id - 1 
-    mPFCandpT_Forward_electron = ibooker.book1D("mPFCandpT_Forward_electron",Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", EndcapEta, ForwardEta),300, 0, 300); // pf id - 2
-    mPFCandpT_Forward_muon = ibooker.book1D("mPFCandpT_Forward_muon",Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", EndcapEta, ForwardEta),300, 0, 300); // pf id - 3
-    mPFCandpT_Forward_photon = ibooker.book1D("mPFCandpT_Forward_photon",Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", EndcapEta, ForwardEta),300, 0, 300); // pf id - 4
-    mPFCandpT_Forward_NeutralHadron = ibooker.book1D("mPFCandpT_Forward_NeutralHadron",Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", EndcapEta, ForwardEta),300, 0, 300); // pf id - 5
-    mPFCandpT_Forward_HadE_inHF = ibooker.book1D("mPFCandpT_Forward_HadE_inHF",Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", EndcapEta, ForwardEta),300, 0, 300); // pf id - 6
-    mPFCandpT_Forward_EME_inHF = ibooker.book1D("mPFCandpT_Forward_EME_inHF",Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", EndcapEta, ForwardEta),300, 0, 300); // pf id - 7
-        
-      
+      -5.191, -4.889, -4.716, -4.538, -4.363, -4.191, -4.013, -3.839, -3.664, -3.489, -3.314, -3.139, -2.964, -2.853,
+      -2.650, -2.500, -2.322, -2.172, -2.043, -1.930, -1.830, -1.740, -1.653, -1.566, -1.479, -1.392, -1.305, -1.218,
+      -1.131, -1.044, -0.957, -0.879, -0.783, -0.696, -0.609, -0.522, -0.435, -0.348, -0.261, -0.174, -0.087, 0.000,
+      0.087,  0.174,  0.261,  0.348,  0.435,  0.522,  0.609,  0.696,  0.783,  0.879,  0.957,  1.044,  1.131,  1.218,
+      1.305,  1.392,  1.479,  1.566,  1.653,  1.740,  1.830,  1.930,  2.043,  2.172,  2.322,  2.500,  2.650,  2.853,
+      2.964,  3.139,  3.314,  3.489,  3.664,  3.839,  4.013,  4.191,  4.363,  4.538,  4.716,  4.889,  5.191};
+
+  double etaRange[91] = {-6.0, -5.8, -5.6, -5.4, -5.2, -5.0, -4.8, -4.6, -4.4, -4.2, -4.0, -3.8, -3.6, -3.4, -3.2, -3.0,
+                         -2.9, -2.8, -2.7, -2.6, -2.5, -2.4, -2.3, -2.2, -2.1, -2.0, -1.9, -1.8, -1.7, -1.6, -1.5, -1.4,
+                         -1.3, -1.2, -1.1, -1.0, -0.9, -0.8, -0.7, -0.6, -0.5, -0.4, -0.3, -0.2, -0.1, 0.0,  0.1,  0.2,
+                         0.3,  0.4,  0.5,  0.6,  0.7,  0.8,  0.9,  1.0,  1.1,  1.2,  1.3,  1.4,  1.5,  1.6,  1.7,  1.8,
+                         1.9,  2.0,  2.1,  2.2,  2.3,  2.4,  2.5,  2.6,  2.7,  2.8,  2.9,  3.0,  3.2,  3.4,  3.6,  3.8,
+                         4.0,  4.2,  4.4,  4.6,  4.8,  5.0,  5.2,  5.4,  5.6,  5.8,  6.0};
+
+  double edge_pseudorapidity[etaBins_ + 1] = {-5.191,
+                                              -2.650,
+                                              -2.043,
+                                              -1.740,
+                                              -1.479,
+                                              -1.131,
+                                              -0.783,
+                                              -0.522,
+                                              0.522,
+                                              0.783,
+                                              1.131,
+                                              1.479,
+                                              1.740,
+                                              2.043,
+                                              2.650,
+                                              5.191};
+
+  TH2F *h2D_etabins_vs_pt2 = new TH2F(
+      "h2D_etabins_vs_pt2", "etaBins (x axis), sum pt^{2} (y axis)", etaBins_, edge_pseudorapidity, 10000, 0, 10000);
+  TH2F *h2D_etabins_vs_pt = new TH2F(
+      "h2D_etabins_vs_pt", "etaBins (x axis), sum pt (y axis)", etaBins_, edge_pseudorapidity, 10000, -1000, 1000);
+  TH2F *h2D_etabins_vs_phi = new TH2F("h2D_etabins_vs_phi",
+                                      "candidate map, eta(x axis), phi (y axis), pt (z axis)",
+                                      ncms_hcal_edge_pseudorapidity - 1,
+                                      cms_hcal_edge_pseudorapidity,
+                                      36,
+                                      -TMath::Pi(),
+                                      TMath::Pi());
+  TH2F *h2D_pfcand_etabins_vs_pt =
+      new TH2F("h2D_etabins_vs_pt", ";#eta;sum p_{T}", etaBins_, edge_pseudorapidity, 300, 0, 300);
+
+  if (isPFJet) {
+    mNPFpart = ibooker.book1D("NPFpart", "No of particle flow candidates", 1000, 0, 10000);
+    mPFPt = ibooker.book1D("PFPt", "PF candidate p_{T}", 1000, -5000, 5000);
+    mPFEta = ibooker.book1D("PFEta", "PF candidate #eta", 120, -6, 6);
+    mPFPhi = ibooker.book1D("PFPhi", "PF candidate #phi", 70, -3.5, 3.5);
+    mPFArea = ibooker.book1D("PFArea", "VS PF candidate area", 100, 0, 4);
+
+    mSumPFPt = ibooker.book1D("SumPFPt", "Sum of initial PF p_{T}", 1000, -10000, 10000);
+
+    mSumSquaredPFPt = ibooker.book1D("SumSquaredPFPt", "Sum of initial PF p_{T} squared", 10000, 0, 10000);
+
+    mSumPFPt_HF = ibooker.book2D(
+        "SumPFPt_HF", "HF energy (y axis) vs Sum initial PF p_{T} (x axis)", 1000, -1000, 1000, 1000, 0, 10000);
+
+    mSumPFPt_n5p191_n2p650 =
+        ibooker.book1D("mSumPFPt_n5p191_n2p650", "Sum PFPt  in the eta range -5.191 to -2.650", 1000, -5000, 5000);
+    mSumPFPt_n2p650_n2p043 =
+        ibooker.book1D("mSumPFPt_n2p650_n2p043", "Sum PFPt  in the eta range -2.650 to -2.043 ", 1000, -5000, 5000);
+    mSumPFPt_n2p043_n1p740 =
+        ibooker.book1D("mSumPFPt_n2p043_n1p740", "Sum PFPt  in the eta range -2.043 to -1.740", 1000, -1000, 1000);
+    mSumPFPt_n1p740_n1p479 =
+        ibooker.book1D("mSumPFPt_n1p740_n1p479", "Sum PFPt  in the eta range -1.740 to -1.479", 1000, -1000, 1000);
+    mSumPFPt_n1p479_n1p131 =
+        ibooker.book1D("mSumPFPt_n1p479_n1p131", "Sum PFPt  in the eta range -1.479 to -1.131", 1000, -1000, 1000);
+    mSumPFPt_n1p131_n0p783 =
+        ibooker.book1D("mSumPFPt_n1p131_n0p783", "Sum PFPt  in the eta range -1.131 to -0.783", 1000, -1000, 1000);
+    mSumPFPt_n0p783_n0p522 =
+        ibooker.book1D("mSumPFPt_n0p783_n0p522", "Sum PFPt  in the eta range -0.783 to -0.522", 1000, -1000, 1000);
+    mSumPFPt_n0p522_0p522 =
+        ibooker.book1D("mSumPFPt_n0p522_0p522", "Sum PFPt  in the eta range -0.522 to 0.522", 1000, -1000, 1000);
+    mSumPFPt_0p522_0p783 =
+        ibooker.book1D("mSumPFPt_0p522_0p783", "Sum PFPt  in the eta range 0.522 to 0.783", 1000, -1000, 1000);
+    mSumPFPt_0p783_1p131 =
+        ibooker.book1D("mSumPFPt_0p783_1p131", "Sum PFPt  in the eta range 0.783 to 1.131", 1000, -1000, 1000);
+    mSumPFPt_1p131_1p479 =
+        ibooker.book1D("mSumPFPt_1p131_1p479", "Sum PFPt  in the eta range 1.131 to 1.479", 1000, -1000, 1000);
+    mSumPFPt_1p479_1p740 =
+        ibooker.book1D("mSumPFPt_1p479_1p740", "Sum PFPt  in the eta range 1.479 to 1.740", 1000, -1000, 1000);
+    mSumPFPt_1p740_2p043 =
+        ibooker.book1D("mSumPFPt_1p740_2p043", "Sum PFPt  in the eta range 1.740 to 2.043", 1000, -1000, 1000);
+    mSumPFPt_2p043_2p650 =
+        ibooker.book1D("mSumPFPt_2p043_2p650", "Sum PFPt  in the eta range 2.043 to 2.650", 1000, -5000, 5000);
+    mSumPFPt_2p650_5p191 =
+        ibooker.book1D("mSumPFPt_2p650_5p191", "Sum PFPt  in the eta range 2.650 to 5.191", 1000, -5000, 5000);
+
+    mPFCandpT_vs_eta_Unknown = ibooker.book2D("PF_cand_X_unknown", h2D_pfcand_etabins_vs_pt);         // pf id 0
+    mPFCandpT_vs_eta_ChargedHadron = ibooker.book2D("PF_cand_chargedHad", h2D_pfcand_etabins_vs_pt);  // pf id - 1
+    mPFCandpT_vs_eta_electron = ibooker.book2D("PF_cand_electron", h2D_pfcand_etabins_vs_pt);         // pf id - 2
+    mPFCandpT_vs_eta_muon = ibooker.book2D("PF_cand_muon", h2D_pfcand_etabins_vs_pt);                 // pf id - 3
+    mPFCandpT_vs_eta_photon = ibooker.book2D("PF_cand_photon", h2D_pfcand_etabins_vs_pt);             // pf id - 4
+    mPFCandpT_vs_eta_NeutralHadron = ibooker.book2D("PF_cand_neutralHad", h2D_pfcand_etabins_vs_pt);  // pf id - 5
+    mPFCandpT_vs_eta_HadE_inHF = ibooker.book2D("PF_cand_HadEner_inHF", h2D_pfcand_etabins_vs_pt);    // pf id - 6
+    mPFCandpT_vs_eta_EME_inHF = ibooker.book2D("PF_cand_EMEner_inHF", h2D_pfcand_etabins_vs_pt);      // pf id - 7
+
+    mPFCandpT_Barrel_Unknown = ibooker.book1D("mPFCandpT_Barrel_Unknown",
+                                              Form(";PF candidate p_{T}, |#eta|<%2.2f; counts", BarrelEta),
+                                              300,
+                                              0,
+                                              300);  // pf id  - 0
+    mPFCandpT_Barrel_ChargedHadron = ibooker.book1D("mPFCandpT_Barrel_ChargedHadron",
+                                                    Form(";PF candidate p_{T}, |#eta|<%2.2f; counts", BarrelEta),
+                                                    300,
+                                                    0,
+                                                    300);  // pf id - 1
+    mPFCandpT_Barrel_electron = ibooker.book1D("mPFCandpT_Barrel_electron",
+                                               Form(";PF candidate p_{T}, |#eta|<%2.2f; counts", BarrelEta),
+                                               300,
+                                               0,
+                                               300);  // pf id - 2
+    mPFCandpT_Barrel_muon = ibooker.book1D("mPFCandpT_Barrel_muon",
+                                           Form(";PF candidate p_{T}, |#eta|<%2.2f; counts", BarrelEta),
+                                           300,
+                                           0,
+                                           300);  // pf id - 3
+    mPFCandpT_Barrel_photon = ibooker.book1D("mPFCandpT_Barrel_photon",
+                                             Form(";PF candidate p_{T}, |#eta|<%2.2f; counts", BarrelEta),
+                                             300,
+                                             0,
+                                             300);  // pf id - 4
+    mPFCandpT_Barrel_NeutralHadron = ibooker.book1D("mPFCandpT_Barrel_NeutralHadron",
+                                                    Form(";PF candidate p_{T}, |#eta|<%2.2f; counts", BarrelEta),
+                                                    300,
+                                                    0,
+                                                    300);  // pf id - 5
+    mPFCandpT_Barrel_HadE_inHF = ibooker.book1D("mPFCandpT_Barrel_HadE_inHF",
+                                                Form(";PF candidate p_{T}, |#eta|<%2.2f; counts", BarrelEta),
+                                                300,
+                                                0,
+                                                300);  // pf id - 6
+    mPFCandpT_Barrel_EME_inHF = ibooker.book1D("mPFCandpT_Barrel_EME_inHF",
+                                               Form(";PF candidate p_{T}, |#eta|<%2.2f; counts", BarrelEta),
+                                               300,
+                                               0,
+                                               300);  // pf id - 7
+
+    mPFCandpT_Endcap_Unknown =
+        ibooker.book1D("mPFCandpT_Endcap_Unknown",
+                       Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", BarrelEta, EndcapEta),
+                       300,
+                       0,
+                       300);  // pf id - 0
+    mPFCandpT_Endcap_ChargedHadron =
+        ibooker.book1D("mPFCandpT_Endcap_ChargedHadron",
+                       Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", BarrelEta, EndcapEta),
+                       300,
+                       0,
+                       300);  // pf id - 1
+    mPFCandpT_Endcap_electron =
+        ibooker.book1D("mPFCandpT_Endcap_electron",
+                       Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", BarrelEta, EndcapEta),
+                       300,
+                       0,
+                       300);  // pf id - 2
+    mPFCandpT_Endcap_muon =
+        ibooker.book1D("mPFCandpT_Endcap_muon",
+                       Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", BarrelEta, EndcapEta),
+                       300,
+                       0,
+                       300);  // pf id - 3
+    mPFCandpT_Endcap_photon =
+        ibooker.book1D("mPFCandpT_Endcap_photon",
+                       Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", BarrelEta, EndcapEta),
+                       300,
+                       0,
+                       300);  // pf id - 4
+    mPFCandpT_Endcap_NeutralHadron =
+        ibooker.book1D("mPFCandpT_Endcap_NeutralHadron",
+                       Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", BarrelEta, EndcapEta),
+                       300,
+                       0,
+                       300);  // pf id - 5
+    mPFCandpT_Endcap_HadE_inHF =
+        ibooker.book1D("mPFCandpT_Endcap_HadE_inHF",
+                       Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", BarrelEta, EndcapEta),
+                       300,
+                       0,
+                       300);  // pf id - 6
+    mPFCandpT_Endcap_EME_inHF =
+        ibooker.book1D("mPFCandpT_Endcap_EME_inHF",
+                       Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", BarrelEta, EndcapEta),
+                       300,
+                       0,
+                       300);  // pf id - 7
+
+    mPFCandpT_Forward_Unknown =
+        ibooker.book1D("mPFCandpT_Forward_Unknown",
+                       Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", EndcapEta, ForwardEta),
+                       300,
+                       0,
+                       300);  // pf id - 0
+    mPFCandpT_Forward_ChargedHadron =
+        ibooker.book1D("mPFCandpT_Forward_ChargedHadron",
+                       Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", EndcapEta, ForwardEta),
+                       300,
+                       0,
+                       300);  // pf id - 1
+    mPFCandpT_Forward_electron =
+        ibooker.book1D("mPFCandpT_Forward_electron",
+                       Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", EndcapEta, ForwardEta),
+                       300,
+                       0,
+                       300);  // pf id - 2
+    mPFCandpT_Forward_muon =
+        ibooker.book1D("mPFCandpT_Forward_muon",
+                       Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", EndcapEta, ForwardEta),
+                       300,
+                       0,
+                       300);  // pf id - 3
+    mPFCandpT_Forward_photon =
+        ibooker.book1D("mPFCandpT_Forward_photon",
+                       Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", EndcapEta, ForwardEta),
+                       300,
+                       0,
+                       300);  // pf id - 4
+    mPFCandpT_Forward_NeutralHadron =
+        ibooker.book1D("mPFCandpT_Forward_NeutralHadron",
+                       Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", EndcapEta, ForwardEta),
+                       300,
+                       0,
+                       300);  // pf id - 5
+    mPFCandpT_Forward_HadE_inHF =
+        ibooker.book1D("mPFCandpT_Forward_HadE_inHF",
+                       Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", EndcapEta, ForwardEta),
+                       300,
+                       0,
+                       300);  // pf id - 6
+    mPFCandpT_Forward_EME_inHF =
+        ibooker.book1D("mPFCandpT_Forward_EME_inHF",
+                       Form(";PF candidate p_{T}, %2.2f<|#eta|<%2.2f; counts", EndcapEta, ForwardEta),
+                       300,
+                       0,
+                       300);  // pf id - 7
   }
 
-  if(isCaloJet){
-
-    mNCalopart         = ibooker.book1D("NCalopart","No of particle flow candidates",1000,0,10000);
-    mCaloPt            = ibooker.book1D("CaloPt","Calo candidate p_{T}",1000,-5000,5000);
-    mCaloEta           = ibooker.book1D("CaloEta","Calo candidate #eta",120,-6,6);
-    mCaloPhi           = ibooker.book1D("CaloPhi","Calo candidate #phi",70,-3.5,3.5);
-    mCaloArea          = ibooker.book1D("CaloArea","VS Calo candidate area",100,0,4);
-      
-    mSumCaloPt         = ibooker.book1D("SumCaloPt","Sum Calo p_{T}",1000,-10000,10000);
-
-    mSumSquaredCaloPt         = ibooker.book1D("SumSquaredCaloPt","Sum of initial Calo tower p_{T} squared",10000,0,10000);
-
-    mSumCaloPt_HF    = ibooker.book2D("SumCaloPt_HF","HF Energy (y axis) vs Sum Calo tower p_{T}",1000,-1000,1000,1000,0,10000);
-
-
-    mSumCaloPt_n5p191_n2p650 = ibooker.book1D("mSumCaloPt_n5p191_n2p650","Sum Calo tower pT variable in the eta range -5.191 to -2.650",1000,-5000,5000);
-    mSumCaloPt_n2p650_n2p043 = ibooker.book1D("mSumCaloPt_n2p650_n2p043","Sum Calo tower pT variable in the eta range -2.650 to -2.043",1000,-5000,5000);
-    mSumCaloPt_n2p043_n1p740 = ibooker.book1D("mSumCaloPt_n2p043_n1p740","Sum Calo tower pT variable in the eta range -2.043 to -1.740",1000,-1000,1000);
-    mSumCaloPt_n1p740_n1p479 = ibooker.book1D("mSumCaloPt_n1p740_n1p479","Sum Calo tower pT variable in the eta range -1.740 to -1.479",1000,-1000,1000);
-    mSumCaloPt_n1p479_n1p131 = ibooker.book1D("mSumCaloPt_n1p479_n1p131","Sum Calo tower pT variable in the eta range -1.479 to -1.131",1000,-1000,1000);
-    mSumCaloPt_n1p131_n0p783 = ibooker.book1D("mSumCaloPt_n1p131_n0p783","Sum Calo tower pT variable in the eta range -1.131 to -0.783",1000,-1000,1000);
-    mSumCaloPt_n0p783_n0p522 = ibooker.book1D("mSumCaloPt_n0p783_n0p522","Sum Calo tower pT variable in the eta range -0.783 to -0.522",1000,-1000,1000);
-    mSumCaloPt_n0p522_0p522 = ibooker.book1D("mSumCaloPt_n0p522_0p522","Sum Calo tower pT variable in the eta range -0.522 to 0.522",1000,-1000,1000);
-    mSumCaloPt_0p522_0p783 = ibooker.book1D("mSumCaloPt_0p522_0p783","Sum Calo tower pT variable in the eta range 0.522 to 0.783",1000,-1000,1000);
-    mSumCaloPt_0p783_1p131 = ibooker.book1D("mSumCaloPt_0p783_1p131","Sum Calo tower pT variable in the eta range 0.783 to 1.131",1000,-1000,1000);
-    mSumCaloPt_1p131_1p479 = ibooker.book1D("mSumCaloPt_1p131_1p479","Sum Calo tower pT variable in the eta range 1.131 to 1.479",1000,-1000,1000);
-    mSumCaloPt_1p479_1p740 = ibooker.book1D("mSumCaloPt_1p479_1p740","Sum Calo tower pT variable in the eta range 1.479 to 1.740",1000,-1000,1000);
-    mSumCaloPt_1p740_2p043 = ibooker.book1D("mSumCaloPt_1p740_2p043","Sum Calo tower pT variable in the eta range 1.740 to 2.043",1000,-1000,1000);
-    mSumCaloPt_2p043_2p650 = ibooker.book1D("mSumCaloPt_2p043_2p650","Sum Calo tower pT variable in the eta range 2.043 to 2.650",1000,-5000,5000);
-    mSumCaloPt_2p650_5p191 = ibooker.book1D("mSumCaloPt_2p650_5p191","Sum Calo tower pT variable in the eta range 2.650 to 5.191",1000,-5000,5000);
-      
+  if (isCaloJet) {
+    mNCalopart = ibooker.book1D("NCalopart", "No of particle flow candidates", 1000, 0, 10000);
+    mCaloPt = ibooker.book1D("CaloPt", "Calo candidate p_{T}", 1000, -5000, 5000);
+    mCaloEta = ibooker.book1D("CaloEta", "Calo candidate #eta", 120, -6, 6);
+    mCaloPhi = ibooker.book1D("CaloPhi", "Calo candidate #phi", 70, -3.5, 3.5);
+    mCaloArea = ibooker.book1D("CaloArea", "VS Calo candidate area", 100, 0, 4);
+
+    mSumCaloPt = ibooker.book1D("SumCaloPt", "Sum Calo p_{T}", 1000, -10000, 10000);
+
+    mSumSquaredCaloPt = ibooker.book1D("SumSquaredCaloPt", "Sum of initial Calo tower p_{T} squared", 10000, 0, 10000);
+
+    mSumCaloPt_HF =
+        ibooker.book2D("SumCaloPt_HF", "HF Energy (y axis) vs Sum Calo tower p_{T}", 1000, -1000, 1000, 1000, 0, 10000);
+
+    mSumCaloPt_n5p191_n2p650 = ibooker.book1D(
+        "mSumCaloPt_n5p191_n2p650", "Sum Calo tower pT variable in the eta range -5.191 to -2.650", 1000, -5000, 5000);
+    mSumCaloPt_n2p650_n2p043 = ibooker.book1D(
+        "mSumCaloPt_n2p650_n2p043", "Sum Calo tower pT variable in the eta range -2.650 to -2.043", 1000, -5000, 5000);
+    mSumCaloPt_n2p043_n1p740 = ibooker.book1D(
+        "mSumCaloPt_n2p043_n1p740", "Sum Calo tower pT variable in the eta range -2.043 to -1.740", 1000, -1000, 1000);
+    mSumCaloPt_n1p740_n1p479 = ibooker.book1D(
+        "mSumCaloPt_n1p740_n1p479", "Sum Calo tower pT variable in the eta range -1.740 to -1.479", 1000, -1000, 1000);
+    mSumCaloPt_n1p479_n1p131 = ibooker.book1D(
+        "mSumCaloPt_n1p479_n1p131", "Sum Calo tower pT variable in the eta range -1.479 to -1.131", 1000, -1000, 1000);
+    mSumCaloPt_n1p131_n0p783 = ibooker.book1D(
+        "mSumCaloPt_n1p131_n0p783", "Sum Calo tower pT variable in the eta range -1.131 to -0.783", 1000, -1000, 1000);
+    mSumCaloPt_n0p783_n0p522 = ibooker.book1D(
+        "mSumCaloPt_n0p783_n0p522", "Sum Calo tower pT variable in the eta range -0.783 to -0.522", 1000, -1000, 1000);
+    mSumCaloPt_n0p522_0p522 = ibooker.book1D(
+        "mSumCaloPt_n0p522_0p522", "Sum Calo tower pT variable in the eta range -0.522 to 0.522", 1000, -1000, 1000);
+    mSumCaloPt_0p522_0p783 = ibooker.book1D(
+        "mSumCaloPt_0p522_0p783", "Sum Calo tower pT variable in the eta range 0.522 to 0.783", 1000, -1000, 1000);
+    mSumCaloPt_0p783_1p131 = ibooker.book1D(
+        "mSumCaloPt_0p783_1p131", "Sum Calo tower pT variable in the eta range 0.783 to 1.131", 1000, -1000, 1000);
+    mSumCaloPt_1p131_1p479 = ibooker.book1D(
+        "mSumCaloPt_1p131_1p479", "Sum Calo tower pT variable in the eta range 1.131 to 1.479", 1000, -1000, 1000);
+    mSumCaloPt_1p479_1p740 = ibooker.book1D(
+        "mSumCaloPt_1p479_1p740", "Sum Calo tower pT variable in the eta range 1.479 to 1.740", 1000, -1000, 1000);
+    mSumCaloPt_1p740_2p043 = ibooker.book1D(
+        "mSumCaloPt_1p740_2p043", "Sum Calo tower pT variable in the eta range 1.740 to 2.043", 1000, -1000, 1000);
+    mSumCaloPt_2p043_2p650 = ibooker.book1D(
+        "mSumCaloPt_2p043_2p650", "Sum Calo tower pT variable in the eta range 2.043 to 2.650", 1000, -5000, 5000);
+    mSumCaloPt_2p650_5p191 = ibooker.book1D(
+        "mSumCaloPt_2p650_5p191", "Sum Calo tower pT variable in the eta range 2.650 to 5.191", 1000, -5000, 5000);
   }
 
-  // particle flow variables histograms 
-  mSumpt           = ibooker.book1D("SumpT","Sum p_{T} of all the PF candidates per event",1000,0,10000);
+  // particle flow variables histograms
+  mSumpt = ibooker.book1D("SumpT", "Sum p_{T} of all the PF candidates per event", 1000, 0, 10000);
 
   // Event variables
-  mNvtx            = ibooker.book1D("Nvtx",           "number of vertices", 60, 0, 60);
-  mHF              = ibooker.book1D("HF", "HF energy distribution",1000,0,10000);
+  mNvtx = ibooker.book1D("Nvtx", "number of vertices", 60, 0, 60);
+  mHF = ibooker.book1D("HF", "HF energy distribution", 1000, 0, 10000);
 
-    
   // Jet parameters
-  mEta             = ibooker.book1D("Eta",          "Eta",          120,   -6,    6); 
-  mPhi             = ibooker.book1D("Phi",          "Phi",           70, -3.5,  3.5); 
-  mPt              = ibooker.book1D("Pt",           "Pt",           100,    0,  1000); 
-  mP               = ibooker.book1D("P",            "P",            100,    0,  1000); 
-  mEnergy          = ibooker.book1D("Energy",       "Energy",       100,    0,  1000); 
-  mMass            = ibooker.book1D("Mass",         "Mass",         100,    0,  200); 
-  mConstituents    = ibooker.book1D("Constituents", "Constituents", 100,    0,  100); 
-  mJetArea         = ibooker.book1D("JetArea",      "JetArea",       100,   0, 4);
-  mjetpileup       = ibooker.book1D("jetPileUp","jetPileUp",100,0,150);
-  mNJets_40        = ibooker.book1D("NJets_pt_greater_40", "NJets pT > 40 GeV",  50,    0,   100);
-  mNJets        = ibooker.book1D("NJets", "NJets",  50,    0,   100);
-
-  mGenEta      = ibooker.book1D("Gen Eta",";gen jet #eta;counts",120,-6,6);
-  mGenPhi      = ibooker.book1D("Gen Phi",";gen jet #phi;counts",70,-3.5,3.5);
-  mGenPt       = ibooker.book1D("Gen pT","gen jet p_{T}",250,0,1000);
-  mPtHat       = ibooker.book1D("pThat","#hat{p_{T}}",250,0,1000);
-
-  mPtRecoOverGen_B_20_30_Cent_0_10    = ibooker.book1D("PtRecoOverGen_B_20_30_Cent_0_10",    "20<genpt<30; recopt/genpt (0-10%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_20_30_Cent_0_10    = ibooker.book1D("PtRecoOverGen_E_20_30_Cent_0_10",    "20<genpt<30; recopt/genpt (0-10%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_20_30_Cent_0_10    = ibooker.book1D("PtRecoOverGen_F_20_30_Cent_0_10",    "20<genpt<30; recopt/genpt (0-10%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_30_50_Cent_0_10    = ibooker.book1D("PtRecoOverGen_B_30_50_Cent_0_10",    "30<genpt<50; recopt/genpt (0-10%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_30_50_Cent_0_10    = ibooker.book1D("PtRecoOverGen_E_30_50_Cent_0_10",    "30<genpt<50; recopt/genpt (0-10%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_30_50_Cent_0_10    = ibooker.book1D("PtRecoOverGen_F_30_50_Cent_0_10",    "30<genpt<50; recopt/genpt (0-10%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_50_80_Cent_0_10    = ibooker.book1D("PtRecoOverGen_B_50_80_Cent_0_10",    "50<genpt<80; recopt/genpt (0-10%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_50_80_Cent_0_10    = ibooker.book1D("PtRecoOverGen_E_50_80_Cent_0_10",    "50<genpt<80; recopt/genpt (0-10%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_50_80_Cent_0_10    = ibooker.book1D("PtRecoOverGen_F_50_80_Cent_0_10",    "50<genpt<80; recopt/genpt (0-10%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_80_120_Cent_0_10    = ibooker.book1D("PtRecoOverGen_B_80_120_Cent_0_10",    "80<genpt<120; recopt/genpt (0-10%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_80_120_Cent_0_10    = ibooker.book1D("PtRecoOverGen_E_80_120_Cent_0_10",    "80<genpt<120; recopt/genpt (0-10%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_80_120_Cent_0_10    = ibooker.book1D("PtRecoOverGen_F_80_120_Cent_0_10",    "80<genpt<120; recopt/genpt (0-10%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_120_180_Cent_0_10    = ibooker.book1D("PtRecoOverGen_B_120_180_Cent_0_10",    "120<genpt<180; recopt/genpt (0-10%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_120_180_Cent_0_10    = ibooker.book1D("PtRecoOverGen_E_120_180_Cent_0_10",    "120<genpt<180; recopt/genpt (0-10%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_120_180_Cent_0_10    = ibooker.book1D("PtRecoOverGen_F_120_180_Cent_0_10",    "120<genpt<180; recopt/genpt (0-10%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_180_300_Cent_0_10    = ibooker.book1D("PtRecoOverGen_B_180_300_Cent_0_10",    "180<genpt<300; recopt/genpt (0-10%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_180_300_Cent_0_10    = ibooker.book1D("PtRecoOverGen_E_180_300_Cent_0_10",    "180<genpt<300; recopt/genpt (0-10%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_180_300_Cent_0_10    = ibooker.book1D("PtRecoOverGen_F_180_300_Cent_0_10",    "180<genpt<300; recopt/genpt (0-10%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_300_Inf_Cent_0_10    = ibooker.book1D("PtRecoOverGen_B_300_Inf_Cent_0_10",    "300<genpt<Inf; recopt/genpt (0-10%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_300_Inf_Cent_0_10    = ibooker.book1D("PtRecoOverGen_E_300_Inf_Cent_0_10",    "300<genpt<Inf; recopt/genpt (0-10%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_300_Inf_Cent_0_10    = ibooker.book1D("PtRecoOverGen_F_300_Inf_Cent_0_10",    "300<genpt<Inf; recopt/genpt (0-10%) (Forward);counts",    90, 0, 2);
-
-
-  mPtRecoOverGen_B_20_30_Cent_10_30    = ibooker.book1D("PtRecoOverGen_B_20_30_Cent_10_30",    "20<genpt<30; recopt/genpt (10-30%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_20_30_Cent_10_30    = ibooker.book1D("PtRecoOverGen_E_20_30_Cent_10_30",    "20<genpt<30; recopt/genpt (10-30%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_20_30_Cent_10_30    = ibooker.book1D("PtRecoOverGen_F_20_30_Cent_10_30",    "20<genpt<30; recopt/genpt (10-30%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_30_50_Cent_10_30    = ibooker.book1D("PtRecoOverGen_B_30_50_Cent_10_30",    "30<genpt<50; recopt/genpt (10-30%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_30_50_Cent_10_30    = ibooker.book1D("PtRecoOverGen_E_30_50_Cent_10_30",    "30<genpt<50; recopt/genpt (10-30%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_30_50_Cent_10_30    = ibooker.book1D("PtRecoOverGen_F_30_50_Cent_10_30",    "30<genpt<50; recopt/genpt (10-30%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_50_80_Cent_10_30    = ibooker.book1D("PtRecoOverGen_B_50_80_Cent_10_30",    "50<genpt<80; recopt/genpt (10-30%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_50_80_Cent_10_30    = ibooker.book1D("PtRecoOverGen_E_50_80_Cent_10_30",    "50<genpt<80; recopt/genpt (10-30%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_50_80_Cent_10_30    = ibooker.book1D("PtRecoOverGen_F_50_80_Cent_10_30",    "50<genpt<80; recopt/genpt (10-30%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_80_120_Cent_10_30    = ibooker.book1D("PtRecoOverGen_B_80_120_Cent_10_30",    "80<genpt<120; recopt/genpt (10-30%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_80_120_Cent_10_30    = ibooker.book1D("PtRecoOverGen_E_80_120_Cent_10_30",    "80<genpt<120; recopt/genpt (10-30%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_80_120_Cent_10_30    = ibooker.book1D("PtRecoOverGen_F_80_120_Cent_10_30",    "80<genpt<120; recopt/genpt (10-30%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_120_180_Cent_10_30    = ibooker.book1D("PtRecoOverGen_B_120_180_Cent_10_30",    "120<genpt<180; recopt/genpt (10-30%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_120_180_Cent_10_30    = ibooker.book1D("PtRecoOverGen_E_120_180_Cent_10_30",    "120<genpt<180; recopt/genpt (10-30%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_120_180_Cent_10_30    = ibooker.book1D("PtRecoOverGen_F_120_180_Cent_10_30",    "120<genpt<180; recopt/genpt (10-30%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_180_300_Cent_10_30    = ibooker.book1D("PtRecoOverGen_B_180_300_Cent_10_30",    "180<genpt<300; recopt/genpt (10-30%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_180_300_Cent_10_30    = ibooker.book1D("PtRecoOverGen_E_180_300_Cent_10_30",    "180<genpt<300; recopt/genpt (10-30%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_180_300_Cent_10_30    = ibooker.book1D("PtRecoOverGen_F_180_300_Cent_10_30",    "180<genpt<300; recopt/genpt (10-30%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_300_Inf_Cent_10_30    = ibooker.book1D("PtRecoOverGen_B_300_Inf_Cent_10_30",    "300<genpt<Inf; recopt/genpt (10-30%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_300_Inf_Cent_10_30    = ibooker.book1D("PtRecoOverGen_E_300_Inf_Cent_10_30",    "300<genpt<Inf; recopt/genpt (10-30%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_300_Inf_Cent_10_30    = ibooker.book1D("PtRecoOverGen_F_300_Inf_Cent_10_30",    "300<genpt<Inf; recopt/genpt (10-30%) (Forward);counts",    90, 0, 2);
-    
-    
-  mPtRecoOverGen_B_20_30_Cent_30_50    = ibooker.book1D("PtRecoOverGen_B_20_30_Cent_30_50",    "20<genpt<30; recopt/genpt (30-50%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_20_30_Cent_30_50    = ibooker.book1D("PtRecoOverGen_E_20_30_Cent_30_50",    "20<genpt<30; recopt/genpt (30-50%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_20_30_Cent_30_50    = ibooker.book1D("PtRecoOverGen_F_20_30_Cent_30_50",    "20<genpt<30; recopt/genpt (30-50%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_30_50_Cent_30_50    = ibooker.book1D("PtRecoOverGen_B_30_50_Cent_30_50",    "30<genpt<50; recopt/genpt (30-50%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_30_50_Cent_30_50    = ibooker.book1D("PtRecoOverGen_E_30_50_Cent_30_50",    "30<genpt<50; recopt/genpt (30-50%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_30_50_Cent_30_50    = ibooker.book1D("PtRecoOverGen_F_30_50_Cent_30_50",    "30<genpt<50; recopt/genpt (30-50%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_50_80_Cent_30_50    = ibooker.book1D("PtRecoOverGen_B_50_80_Cent_30_50",    "50<genpt<80; recopt/genpt (30-50%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_50_80_Cent_30_50    = ibooker.book1D("PtRecoOverGen_E_50_80_Cent_30_50",    "50<genpt<80; recopt/genpt (30-50%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_50_80_Cent_30_50    = ibooker.book1D("PtRecoOverGen_F_50_80_Cent_30_50",    "50<genpt<80; recopt/genpt (30-50%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_80_120_Cent_30_50    = ibooker.book1D("PtRecoOverGen_B_80_120_Cent_30_50",    "80<genpt<120; recopt/genpt (30-50%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_80_120_Cent_30_50    = ibooker.book1D("PtRecoOverGen_E_80_120_Cent_30_50",    "80<genpt<120; recopt/genpt (30-50%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_80_120_Cent_30_50    = ibooker.book1D("PtRecoOverGen_F_80_120_Cent_30_50",    "80<genpt<120; recopt/genpt (30-50%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_120_180_Cent_30_50    = ibooker.book1D("PtRecoOverGen_B_120_180_Cent_30_50",    "120<genpt<180; recopt/genpt (30-50%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_120_180_Cent_30_50    = ibooker.book1D("PtRecoOverGen_E_120_180_Cent_30_50",    "120<genpt<180; recopt/genpt (30-50%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_120_180_Cent_30_50    = ibooker.book1D("PtRecoOverGen_F_120_180_Cent_30_50",    "120<genpt<180; recopt/genpt (30-50%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_180_300_Cent_30_50    = ibooker.book1D("PtRecoOverGen_B_180_300_Cent_30_50",    "180<genpt<300; recopt/genpt (30-50%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_180_300_Cent_30_50    = ibooker.book1D("PtRecoOverGen_E_180_300_Cent_30_50",    "180<genpt<300; recopt/genpt (30-50%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_180_300_Cent_30_50    = ibooker.book1D("PtRecoOverGen_F_180_300_Cent_30_50",    "180<genpt<300; recopt/genpt (30-50%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_300_Inf_Cent_30_50    = ibooker.book1D("PtRecoOverGen_B_300_Inf_Cent_30_50",    "300<genpt<Inf; recopt/genpt (30-50%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_300_Inf_Cent_30_50    = ibooker.book1D("PtRecoOverGen_E_300_Inf_Cent_30_50",    "300<genpt<Inf; recopt/genpt (30-50%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_300_Inf_Cent_30_50    = ibooker.book1D("PtRecoOverGen_F_300_Inf_Cent_30_50",    "300<genpt<Inf; recopt/genpt (30-50%) (Forward);counts",    90, 0, 2);
-
-  mPtRecoOverGen_B_20_30_Cent_50_80    = ibooker.book1D("PtRecoOverGen_B_20_30_Cent_50_80",    "20<genpt<30; recopt/genpt (50-80%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_20_30_Cent_50_80    = ibooker.book1D("PtRecoOverGen_E_20_30_Cent_50_80",    "20<genpt<30; recopt/genpt (50-80%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_20_30_Cent_50_80    = ibooker.book1D("PtRecoOverGen_F_20_30_Cent_50_80",    "20<genpt<30; recopt/genpt (50-80%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_30_50_Cent_50_80    = ibooker.book1D("PtRecoOverGen_B_30_50_Cent_50_80",    "30<genpt<50; recopt/genpt (50-80%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_30_50_Cent_50_80    = ibooker.book1D("PtRecoOverGen_E_30_50_Cent_50_80",    "30<genpt<50; recopt/genpt (50-80%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_30_50_Cent_50_80    = ibooker.book1D("PtRecoOverGen_F_30_50_Cent_50_80",    "30<genpt<50; recopt/genpt (50-80%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_50_80_Cent_50_80    = ibooker.book1D("PtRecoOverGen_B_50_80_Cent_50_80",    "50<genpt<80; recopt/genpt (50-80%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_50_80_Cent_50_80    = ibooker.book1D("PtRecoOverGen_E_50_80_Cent_50_80",    "50<genpt<80; recopt/genpt (50-80%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_50_80_Cent_50_80    = ibooker.book1D("PtRecoOverGen_F_50_80_Cent_50_80",    "50<genpt<80; recopt/genpt (50-80%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_80_120_Cent_50_80    = ibooker.book1D("PtRecoOverGen_B_80_120_Cent_50_80",    "80<genpt<120; recopt/genpt (50-80%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_80_120_Cent_50_80    = ibooker.book1D("PtRecoOverGen_E_80_120_Cent_50_80",    "80<genpt<120; recopt/genpt (50-80%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_80_120_Cent_50_80    = ibooker.book1D("PtRecoOverGen_F_80_120_Cent_50_80",    "80<genpt<120; recopt/genpt (50-80%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_120_180_Cent_50_80    = ibooker.book1D("PtRecoOverGen_B_120_180_Cent_50_80",    "120<genpt<180; recopt/genpt (50-80%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_120_180_Cent_50_80    = ibooker.book1D("PtRecoOverGen_E_120_180_Cent_50_80",    "120<genpt<180; recopt/genpt (50-80%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_120_180_Cent_50_80    = ibooker.book1D("PtRecoOverGen_F_120_180_Cent_50_80",    "120<genpt<180; recopt/genpt (50-80%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_180_300_Cent_50_80    = ibooker.book1D("PtRecoOverGen_B_180_300_Cent_50_80",    "180<genpt<300; recopt/genpt (50-80%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_180_300_Cent_50_80    = ibooker.book1D("PtRecoOverGen_E_180_300_Cent_50_80",    "180<genpt<300; recopt/genpt (50-80%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_180_300_Cent_50_80    = ibooker.book1D("PtRecoOverGen_F_180_300_Cent_50_80",    "180<genpt<300; recopt/genpt (50-80%) (Forward);counts",    90, 0, 2);
-  mPtRecoOverGen_B_300_Inf_Cent_50_80    = ibooker.book1D("PtRecoOverGen_B_300_Inf_Cent_50_80",    "300<genpt<Inf; recopt/genpt (50-80%) (Barrel);counts",    90, 0, 2);
-  mPtRecoOverGen_E_300_Inf_Cent_50_80    = ibooker.book1D("PtRecoOverGen_E_300_Inf_Cent_50_80",    "300<genpt<Inf; recopt/genpt (50-80%) (EndCap);counts",    90, 0, 2);
-  mPtRecoOverGen_F_300_Inf_Cent_50_80    = ibooker.book1D("PtRecoOverGen_F_300_Inf_Cent_50_80",    "300<genpt<Inf; recopt/genpt (50-80%) (Forward);counts",    90, 0, 2);
-
-
-  mPtRecoOverGen_GenPt_B_Cent_0_10          = ibooker.bookProfile("PtRecoOverGen_GenPt_B_Cent_0_10",          Form("|#eta|<%2.2f, (0-10cent);genpt;recopt/genpt", BarrelEta),     log10PtBins, log10PtMin, log10PtMax, 0, 2, " ");
-  mPtRecoOverGen_GenPt_E_Cent_0_10          = ibooker.bookProfile("PtRecoOverGen_GenPt_E_Cent_0_10",          Form("%2.2f<|#eta|<%2.2f, (0-10cent);genpt;recopt/genpt", BarrelEta, EndcapEta),     log10PtBins, log10PtMin, log10PtMax, 0, 2, " ");
-  mPtRecoOverGen_GenPt_F_Cent_0_10          = ibooker.bookProfile("PtRecoOverGen_GenPt_F_Cent_0_10",          Form("%2.2f<|#eta|<%2.2f, (0-10cent);genpt;recopt/genpt", EndcapEta, ForwardEta),       log10PtBins, log10PtMin, log10PtMax, 0, 2, " ");
-  mPtRecoOverGen_GenPt_B_Cent_10_30          = ibooker.bookProfile("PtRecoOverGen_GenPt_B_Cent_10_30",          Form("|#eta|<%2.2f, (10-30cent);genpt;recopt/genpt", BarrelEta),     log10PtBins, log10PtMin, log10PtMax, 0, 2, " ");
-  mPtRecoOverGen_GenPt_E_Cent_10_30          = ibooker.bookProfile("PtRecoOverGen_GenPt_E_Cent_10_30",          Form("%2.2f<|#eta|<%2.2f, (10-30cent);genpt;recopt/genpt", BarrelEta, EndcapEta),     log10PtBins, log10PtMin, log10PtMax, 0, 2, " ");
-  mPtRecoOverGen_GenPt_F_Cent_10_30          = ibooker.bookProfile("PtRecoOverGen_GenPt_F_Cent_10_30",          Form("%2.2f<|#eta|<%2.2f, (10-30cent);genpt;recopt/genpt", EndcapEta, ForwardEta),       log10PtBins, log10PtMin, log10PtMax, 0, 2, " ");
-  mPtRecoOverGen_GenPt_B_Cent_30_50          = ibooker.bookProfile("PtRecoOverGen_GenPt_B_Cent_30_50",          Form("|#eta|<%2.2f, (30-50cent);genpt;recopt/genpt", BarrelEta),     log10PtBins, log10PtMin, log10PtMax, 0, 2, " ");
-  mPtRecoOverGen_GenPt_E_Cent_30_50          = ibooker.bookProfile("PtRecoOverGen_GenPt_E_Cent_30_50",          Form("%2.2f<|#eta|<%2.2f, (30-50cent);genpt;recopt/genpt", BarrelEta, EndcapEta),     log10PtBins, log10PtMin, log10PtMax, 0, 2, " ");
-  mPtRecoOverGen_GenPt_F_Cent_30_50          = ibooker.bookProfile("PtRecoOverGen_GenPt_F_Cent_30_50",          Form("%2.2f<|#eta|<%2.2f, (30-50cent);genpt;recopt/genpt", EndcapEta, ForwardEta),       log10PtBins, log10PtMin, log10PtMax, 0, 2, " ");
-  mPtRecoOverGen_GenPt_B_Cent_50_80          = ibooker.bookProfile("PtRecoOverGen_GenPt_B_Cent_50_80",          Form("|#eta|<%2.2f, (50-80cent);genpt;recopt/genpt", BarrelEta),     log10PtBins, log10PtMin, log10PtMax, 0, 2, " ");
-  mPtRecoOverGen_GenPt_E_Cent_50_80          = ibooker.bookProfile("PtRecoOverGen_GenPt_E_Cent_50_80",          Form("%2.2f<|#eta|<%2.2f, (50-80cent);genpt;recopt/genpt", BarrelEta, EndcapEta),     log10PtBins, log10PtMin, log10PtMax, 0, 2, " ");
-  mPtRecoOverGen_GenPt_F_Cent_50_80          = ibooker.bookProfile("PtRecoOverGen_GenPt_F_Cent_50_80",          Form("%2.2f<|#eta|<%2.2f, (50-80cent);genpt;recopt/genpt", EndcapEta, ForwardEta),       log10PtBins, log10PtMin, log10PtMax, 0, 2, " ");
-
-  mPtRecoOverGen_GenEta_20_30_Cent_0_10 = ibooker.bookProfile("PtRecoOverGen_GenEta_20_30_Cent_0_10","20<genpt<30 (0-10%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_30_50_Cent_0_10 = ibooker.bookProfile("PtRecoOverGen_GenEta_30_50_Cent_0_10","30<genpt<50 (0-10%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_50_80_Cent_0_10 = ibooker.bookProfile("PtRecoOverGen_GenEta_50_80_Cent_0_10","50<genpt<80 (0-10%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_80_120_Cent_0_10 = ibooker.bookProfile("PtRecoOverGen_GenEta_80_120_Cent_0_10","80<genpt<120 (0-10%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_120_180_Cent_0_10 = ibooker.bookProfile("PtRecoOverGen_GenEta_120_180_Cent_0_10","120<genpt<180 (0-10%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_180_300_Cent_0_10 = ibooker.bookProfile("PtRecoOverGen_GenEta_180_300_Cent_0_10","180<genpt<300 (0-10%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_300_Inf_Cent_0_10 = ibooker.bookProfile("PtRecoOverGen_GenEta_300_Inf_Cent_0_10","300<genpt<Inf (0-10%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-    
-
-  mPtRecoOverGen_GenEta_20_30_Cent_10_30 = ibooker.bookProfile("PtRecoOverGen_GenEta_20_30_Cent_10_30","20<genpt<30 (10-30%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_30_50_Cent_10_30 = ibooker.bookProfile("PtRecoOverGen_GenEta_30_50_Cent_10_30","30<genpt<50 (10-30%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_50_80_Cent_10_30 = ibooker.bookProfile("PtRecoOverGen_GenEta_50_80_Cent_10_30","50<genpt<80 (10-30%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_80_120_Cent_10_30 = ibooker.bookProfile("PtRecoOverGen_GenEta_80_120_Cent_10_30","80<genpt<120 (10-30%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_120_180_Cent_10_30 = ibooker.bookProfile("PtRecoOverGen_GenEta_120_180_Cent_10_30","120<genpt<180 (10-30%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_180_300_Cent_10_30 = ibooker.bookProfile("PtRecoOverGen_GenEta_180_300_Cent_10_30","180<genpt<300 (10-30%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_300_Inf_Cent_10_30 = ibooker.bookProfile("PtRecoOverGen_GenEta_300_Inf_Cent_10_30","300<genpt<Inf (10-30%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-
-  mPtRecoOverGen_GenEta_20_30_Cent_30_50 = ibooker.bookProfile("PtRecoOverGen_GenEta_20_30_Cent_30_50","20<genpt<30 (30-50%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_30_50_Cent_30_50 = ibooker.bookProfile("PtRecoOverGen_GenEta_30_50_Cent_30_50","30<genpt<50 (30-50%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_50_80_Cent_30_50 = ibooker.bookProfile("PtRecoOverGen_GenEta_50_80_Cent_30_50","50<genpt<80 (30-50%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_80_120_Cent_30_50 = ibooker.bookProfile("PtRecoOverGen_GenEta_80_120_Cent_30_50","80<genpt<120 (30-50%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_120_180_Cent_30_50 = ibooker.bookProfile("PtRecoOverGen_GenEta_120_180_Cent_30_50","120<genpt<180 (30-50%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_180_300_Cent_30_50 = ibooker.bookProfile("PtRecoOverGen_GenEta_180_300_Cent_30_50","180<genpt<300 (30-50%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_300_Inf_Cent_30_50 = ibooker.bookProfile("PtRecoOverGen_GenEta_300_Inf_Cent_30_50","300<genpt<Inf (30-50%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-
-  mPtRecoOverGen_GenEta_20_30_Cent_50_80 = ibooker.bookProfile("PtRecoOverGen_GenEta_20_30_Cent_50_80","20<genpt<30 (50-80%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_30_50_Cent_50_80 = ibooker.bookProfile("PtRecoOverGen_GenEta_30_50_Cent_50_80","30<genpt<50 (50-80%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_50_80_Cent_50_80 = ibooker.bookProfile("PtRecoOverGen_GenEta_50_80_Cent_50_80","50<genpt<80 (50-80%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_80_120_Cent_50_80 = ibooker.bookProfile("PtRecoOverGen_GenEta_80_120_Cent_50_80","80<genpt<120 (50-80%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_120_180_Cent_50_80 = ibooker.bookProfile("PtRecoOverGen_GenEta_120_180_Cent_50_80","120<genpt<180 (50-80%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_180_300_Cent_50_80 = ibooker.bookProfile("PtRecoOverGen_GenEta_180_300_Cent_50_80","180<genpt<300 (50-80%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-  mPtRecoOverGen_GenEta_300_Inf_Cent_50_80 = ibooker.bookProfile("PtRecoOverGen_GenEta_300_Inf_Cent_50_80","300<genpt<Inf (50-80%);geneta;recopt/genpt",90, etaRange, 0, 2, " ");
-    
-    
-  if (mOutputFile.empty ()) 
+  mEta = ibooker.book1D("Eta", "Eta", 120, -6, 6);
+  mPhi = ibooker.book1D("Phi", "Phi", 70, -3.5, 3.5);
+  mPt = ibooker.book1D("Pt", "Pt", 100, 0, 1000);
+  mP = ibooker.book1D("P", "P", 100, 0, 1000);
+  mEnergy = ibooker.book1D("Energy", "Energy", 100, 0, 1000);
+  mMass = ibooker.book1D("Mass", "Mass", 100, 0, 200);
+  mConstituents = ibooker.book1D("Constituents", "Constituents", 100, 0, 100);
+  mJetArea = ibooker.book1D("JetArea", "JetArea", 100, 0, 4);
+  mjetpileup = ibooker.book1D("jetPileUp", "jetPileUp", 100, 0, 150);
+  mNJets_40 = ibooker.book1D("NJets_pt_greater_40", "NJets pT > 40 GeV", 50, 0, 100);
+  mNJets = ibooker.book1D("NJets", "NJets", 50, 0, 100);
+
+  mGenEta = ibooker.book1D("Gen Eta", ";gen jet #eta;counts", 120, -6, 6);
+  mGenPhi = ibooker.book1D("Gen Phi", ";gen jet #phi;counts", 70, -3.5, 3.5);
+  mGenPt = ibooker.book1D("Gen pT", "gen jet p_{T}", 250, 0, 1000);
+  mPtHat = ibooker.book1D("pThat", "#hat{p_{T}}", 250, 0, 1000);
+
+  mPtRecoOverGen_B_20_30_Cent_0_10 =
+      ibooker.book1D("PtRecoOverGen_B_20_30_Cent_0_10", "20<genpt<30; recopt/genpt (0-10%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_20_30_Cent_0_10 =
+      ibooker.book1D("PtRecoOverGen_E_20_30_Cent_0_10", "20<genpt<30; recopt/genpt (0-10%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_20_30_Cent_0_10 =
+      ibooker.book1D("PtRecoOverGen_F_20_30_Cent_0_10", "20<genpt<30; recopt/genpt (0-10%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_30_50_Cent_0_10 =
+      ibooker.book1D("PtRecoOverGen_B_30_50_Cent_0_10", "30<genpt<50; recopt/genpt (0-10%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_30_50_Cent_0_10 =
+      ibooker.book1D("PtRecoOverGen_E_30_50_Cent_0_10", "30<genpt<50; recopt/genpt (0-10%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_30_50_Cent_0_10 =
+      ibooker.book1D("PtRecoOverGen_F_30_50_Cent_0_10", "30<genpt<50; recopt/genpt (0-10%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_50_80_Cent_0_10 =
+      ibooker.book1D("PtRecoOverGen_B_50_80_Cent_0_10", "50<genpt<80; recopt/genpt (0-10%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_50_80_Cent_0_10 =
+      ibooker.book1D("PtRecoOverGen_E_50_80_Cent_0_10", "50<genpt<80; recopt/genpt (0-10%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_50_80_Cent_0_10 =
+      ibooker.book1D("PtRecoOverGen_F_50_80_Cent_0_10", "50<genpt<80; recopt/genpt (0-10%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_80_120_Cent_0_10 = ibooker.book1D(
+      "PtRecoOverGen_B_80_120_Cent_0_10", "80<genpt<120; recopt/genpt (0-10%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_80_120_Cent_0_10 = ibooker.book1D(
+      "PtRecoOverGen_E_80_120_Cent_0_10", "80<genpt<120; recopt/genpt (0-10%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_80_120_Cent_0_10 = ibooker.book1D(
+      "PtRecoOverGen_F_80_120_Cent_0_10", "80<genpt<120; recopt/genpt (0-10%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_120_180_Cent_0_10 = ibooker.book1D(
+      "PtRecoOverGen_B_120_180_Cent_0_10", "120<genpt<180; recopt/genpt (0-10%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_120_180_Cent_0_10 = ibooker.book1D(
+      "PtRecoOverGen_E_120_180_Cent_0_10", "120<genpt<180; recopt/genpt (0-10%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_120_180_Cent_0_10 = ibooker.book1D(
+      "PtRecoOverGen_F_120_180_Cent_0_10", "120<genpt<180; recopt/genpt (0-10%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_180_300_Cent_0_10 = ibooker.book1D(
+      "PtRecoOverGen_B_180_300_Cent_0_10", "180<genpt<300; recopt/genpt (0-10%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_180_300_Cent_0_10 = ibooker.book1D(
+      "PtRecoOverGen_E_180_300_Cent_0_10", "180<genpt<300; recopt/genpt (0-10%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_180_300_Cent_0_10 = ibooker.book1D(
+      "PtRecoOverGen_F_180_300_Cent_0_10", "180<genpt<300; recopt/genpt (0-10%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_300_Inf_Cent_0_10 = ibooker.book1D(
+      "PtRecoOverGen_B_300_Inf_Cent_0_10", "300<genpt<Inf; recopt/genpt (0-10%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_300_Inf_Cent_0_10 = ibooker.book1D(
+      "PtRecoOverGen_E_300_Inf_Cent_0_10", "300<genpt<Inf; recopt/genpt (0-10%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_300_Inf_Cent_0_10 = ibooker.book1D(
+      "PtRecoOverGen_F_300_Inf_Cent_0_10", "300<genpt<Inf; recopt/genpt (0-10%) (Forward);counts", 90, 0, 2);
+
+  mPtRecoOverGen_B_20_30_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_B_20_30_Cent_10_30", "20<genpt<30; recopt/genpt (10-30%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_20_30_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_E_20_30_Cent_10_30", "20<genpt<30; recopt/genpt (10-30%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_20_30_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_F_20_30_Cent_10_30", "20<genpt<30; recopt/genpt (10-30%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_30_50_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_B_30_50_Cent_10_30", "30<genpt<50; recopt/genpt (10-30%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_30_50_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_E_30_50_Cent_10_30", "30<genpt<50; recopt/genpt (10-30%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_30_50_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_F_30_50_Cent_10_30", "30<genpt<50; recopt/genpt (10-30%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_50_80_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_B_50_80_Cent_10_30", "50<genpt<80; recopt/genpt (10-30%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_50_80_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_E_50_80_Cent_10_30", "50<genpt<80; recopt/genpt (10-30%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_50_80_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_F_50_80_Cent_10_30", "50<genpt<80; recopt/genpt (10-30%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_80_120_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_B_80_120_Cent_10_30", "80<genpt<120; recopt/genpt (10-30%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_80_120_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_E_80_120_Cent_10_30", "80<genpt<120; recopt/genpt (10-30%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_80_120_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_F_80_120_Cent_10_30", "80<genpt<120; recopt/genpt (10-30%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_120_180_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_B_120_180_Cent_10_30", "120<genpt<180; recopt/genpt (10-30%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_120_180_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_E_120_180_Cent_10_30", "120<genpt<180; recopt/genpt (10-30%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_120_180_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_F_120_180_Cent_10_30", "120<genpt<180; recopt/genpt (10-30%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_180_300_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_B_180_300_Cent_10_30", "180<genpt<300; recopt/genpt (10-30%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_180_300_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_E_180_300_Cent_10_30", "180<genpt<300; recopt/genpt (10-30%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_180_300_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_F_180_300_Cent_10_30", "180<genpt<300; recopt/genpt (10-30%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_300_Inf_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_B_300_Inf_Cent_10_30", "300<genpt<Inf; recopt/genpt (10-30%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_300_Inf_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_E_300_Inf_Cent_10_30", "300<genpt<Inf; recopt/genpt (10-30%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_300_Inf_Cent_10_30 = ibooker.book1D(
+      "PtRecoOverGen_F_300_Inf_Cent_10_30", "300<genpt<Inf; recopt/genpt (10-30%) (Forward);counts", 90, 0, 2);
+
+  mPtRecoOverGen_B_20_30_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_B_20_30_Cent_30_50", "20<genpt<30; recopt/genpt (30-50%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_20_30_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_E_20_30_Cent_30_50", "20<genpt<30; recopt/genpt (30-50%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_20_30_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_F_20_30_Cent_30_50", "20<genpt<30; recopt/genpt (30-50%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_30_50_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_B_30_50_Cent_30_50", "30<genpt<50; recopt/genpt (30-50%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_30_50_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_E_30_50_Cent_30_50", "30<genpt<50; recopt/genpt (30-50%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_30_50_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_F_30_50_Cent_30_50", "30<genpt<50; recopt/genpt (30-50%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_50_80_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_B_50_80_Cent_30_50", "50<genpt<80; recopt/genpt (30-50%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_50_80_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_E_50_80_Cent_30_50", "50<genpt<80; recopt/genpt (30-50%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_50_80_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_F_50_80_Cent_30_50", "50<genpt<80; recopt/genpt (30-50%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_80_120_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_B_80_120_Cent_30_50", "80<genpt<120; recopt/genpt (30-50%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_80_120_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_E_80_120_Cent_30_50", "80<genpt<120; recopt/genpt (30-50%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_80_120_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_F_80_120_Cent_30_50", "80<genpt<120; recopt/genpt (30-50%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_120_180_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_B_120_180_Cent_30_50", "120<genpt<180; recopt/genpt (30-50%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_120_180_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_E_120_180_Cent_30_50", "120<genpt<180; recopt/genpt (30-50%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_120_180_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_F_120_180_Cent_30_50", "120<genpt<180; recopt/genpt (30-50%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_180_300_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_B_180_300_Cent_30_50", "180<genpt<300; recopt/genpt (30-50%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_180_300_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_E_180_300_Cent_30_50", "180<genpt<300; recopt/genpt (30-50%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_180_300_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_F_180_300_Cent_30_50", "180<genpt<300; recopt/genpt (30-50%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_300_Inf_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_B_300_Inf_Cent_30_50", "300<genpt<Inf; recopt/genpt (30-50%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_300_Inf_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_E_300_Inf_Cent_30_50", "300<genpt<Inf; recopt/genpt (30-50%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_300_Inf_Cent_30_50 = ibooker.book1D(
+      "PtRecoOverGen_F_300_Inf_Cent_30_50", "300<genpt<Inf; recopt/genpt (30-50%) (Forward);counts", 90, 0, 2);
+
+  mPtRecoOverGen_B_20_30_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_B_20_30_Cent_50_80", "20<genpt<30; recopt/genpt (50-80%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_20_30_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_E_20_30_Cent_50_80", "20<genpt<30; recopt/genpt (50-80%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_20_30_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_F_20_30_Cent_50_80", "20<genpt<30; recopt/genpt (50-80%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_30_50_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_B_30_50_Cent_50_80", "30<genpt<50; recopt/genpt (50-80%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_30_50_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_E_30_50_Cent_50_80", "30<genpt<50; recopt/genpt (50-80%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_30_50_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_F_30_50_Cent_50_80", "30<genpt<50; recopt/genpt (50-80%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_50_80_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_B_50_80_Cent_50_80", "50<genpt<80; recopt/genpt (50-80%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_50_80_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_E_50_80_Cent_50_80", "50<genpt<80; recopt/genpt (50-80%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_50_80_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_F_50_80_Cent_50_80", "50<genpt<80; recopt/genpt (50-80%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_80_120_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_B_80_120_Cent_50_80", "80<genpt<120; recopt/genpt (50-80%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_80_120_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_E_80_120_Cent_50_80", "80<genpt<120; recopt/genpt (50-80%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_80_120_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_F_80_120_Cent_50_80", "80<genpt<120; recopt/genpt (50-80%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_120_180_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_B_120_180_Cent_50_80", "120<genpt<180; recopt/genpt (50-80%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_120_180_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_E_120_180_Cent_50_80", "120<genpt<180; recopt/genpt (50-80%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_120_180_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_F_120_180_Cent_50_80", "120<genpt<180; recopt/genpt (50-80%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_180_300_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_B_180_300_Cent_50_80", "180<genpt<300; recopt/genpt (50-80%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_180_300_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_E_180_300_Cent_50_80", "180<genpt<300; recopt/genpt (50-80%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_180_300_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_F_180_300_Cent_50_80", "180<genpt<300; recopt/genpt (50-80%) (Forward);counts", 90, 0, 2);
+  mPtRecoOverGen_B_300_Inf_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_B_300_Inf_Cent_50_80", "300<genpt<Inf; recopt/genpt (50-80%) (Barrel);counts", 90, 0, 2);
+  mPtRecoOverGen_E_300_Inf_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_E_300_Inf_Cent_50_80", "300<genpt<Inf; recopt/genpt (50-80%) (EndCap);counts", 90, 0, 2);
+  mPtRecoOverGen_F_300_Inf_Cent_50_80 = ibooker.book1D(
+      "PtRecoOverGen_F_300_Inf_Cent_50_80", "300<genpt<Inf; recopt/genpt (50-80%) (Forward);counts", 90, 0, 2);
+
+  mPtRecoOverGen_GenPt_B_Cent_0_10 = ibooker.bookProfile("PtRecoOverGen_GenPt_B_Cent_0_10",
+                                                         Form("|#eta|<%2.2f, (0-10cent);genpt;recopt/genpt", BarrelEta),
+                                                         log10PtBins,
+                                                         log10PtMin,
+                                                         log10PtMax,
+                                                         0,
+                                                         2,
+                                                         " ");
+  mPtRecoOverGen_GenPt_E_Cent_0_10 =
+      ibooker.bookProfile("PtRecoOverGen_GenPt_E_Cent_0_10",
+                          Form("%2.2f<|#eta|<%2.2f, (0-10cent);genpt;recopt/genpt", BarrelEta, EndcapEta),
+                          log10PtBins,
+                          log10PtMin,
+                          log10PtMax,
+                          0,
+                          2,
+                          " ");
+  mPtRecoOverGen_GenPt_F_Cent_0_10 =
+      ibooker.bookProfile("PtRecoOverGen_GenPt_F_Cent_0_10",
+                          Form("%2.2f<|#eta|<%2.2f, (0-10cent);genpt;recopt/genpt", EndcapEta, ForwardEta),
+                          log10PtBins,
+                          log10PtMin,
+                          log10PtMax,
+                          0,
+                          2,
+                          " ");
+  mPtRecoOverGen_GenPt_B_Cent_10_30 =
+      ibooker.bookProfile("PtRecoOverGen_GenPt_B_Cent_10_30",
+                          Form("|#eta|<%2.2f, (10-30cent);genpt;recopt/genpt", BarrelEta),
+                          log10PtBins,
+                          log10PtMin,
+                          log10PtMax,
+                          0,
+                          2,
+                          " ");
+  mPtRecoOverGen_GenPt_E_Cent_10_30 =
+      ibooker.bookProfile("PtRecoOverGen_GenPt_E_Cent_10_30",
+                          Form("%2.2f<|#eta|<%2.2f, (10-30cent);genpt;recopt/genpt", BarrelEta, EndcapEta),
+                          log10PtBins,
+                          log10PtMin,
+                          log10PtMax,
+                          0,
+                          2,
+                          " ");
+  mPtRecoOverGen_GenPt_F_Cent_10_30 =
+      ibooker.bookProfile("PtRecoOverGen_GenPt_F_Cent_10_30",
+                          Form("%2.2f<|#eta|<%2.2f, (10-30cent);genpt;recopt/genpt", EndcapEta, ForwardEta),
+                          log10PtBins,
+                          log10PtMin,
+                          log10PtMax,
+                          0,
+                          2,
+                          " ");
+  mPtRecoOverGen_GenPt_B_Cent_30_50 =
+      ibooker.bookProfile("PtRecoOverGen_GenPt_B_Cent_30_50",
+                          Form("|#eta|<%2.2f, (30-50cent);genpt;recopt/genpt", BarrelEta),
+                          log10PtBins,
+                          log10PtMin,
+                          log10PtMax,
+                          0,
+                          2,
+                          " ");
+  mPtRecoOverGen_GenPt_E_Cent_30_50 =
+      ibooker.bookProfile("PtRecoOverGen_GenPt_E_Cent_30_50",
+                          Form("%2.2f<|#eta|<%2.2f, (30-50cent);genpt;recopt/genpt", BarrelEta, EndcapEta),
+                          log10PtBins,
+                          log10PtMin,
+                          log10PtMax,
+                          0,
+                          2,
+                          " ");
+  mPtRecoOverGen_GenPt_F_Cent_30_50 =
+      ibooker.bookProfile("PtRecoOverGen_GenPt_F_Cent_30_50",
+                          Form("%2.2f<|#eta|<%2.2f, (30-50cent);genpt;recopt/genpt", EndcapEta, ForwardEta),
+                          log10PtBins,
+                          log10PtMin,
+                          log10PtMax,
+                          0,
+                          2,
+                          " ");
+  mPtRecoOverGen_GenPt_B_Cent_50_80 =
+      ibooker.bookProfile("PtRecoOverGen_GenPt_B_Cent_50_80",
+                          Form("|#eta|<%2.2f, (50-80cent);genpt;recopt/genpt", BarrelEta),
+                          log10PtBins,
+                          log10PtMin,
+                          log10PtMax,
+                          0,
+                          2,
+                          " ");
+  mPtRecoOverGen_GenPt_E_Cent_50_80 =
+      ibooker.bookProfile("PtRecoOverGen_GenPt_E_Cent_50_80",
+                          Form("%2.2f<|#eta|<%2.2f, (50-80cent);genpt;recopt/genpt", BarrelEta, EndcapEta),
+                          log10PtBins,
+                          log10PtMin,
+                          log10PtMax,
+                          0,
+                          2,
+                          " ");
+  mPtRecoOverGen_GenPt_F_Cent_50_80 =
+      ibooker.bookProfile("PtRecoOverGen_GenPt_F_Cent_50_80",
+                          Form("%2.2f<|#eta|<%2.2f, (50-80cent);genpt;recopt/genpt", EndcapEta, ForwardEta),
+                          log10PtBins,
+                          log10PtMin,
+                          log10PtMax,
+                          0,
+                          2,
+                          " ");
+
+  mPtRecoOverGen_GenEta_20_30_Cent_0_10 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_20_30_Cent_0_10", "20<genpt<30 (0-10%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_30_50_Cent_0_10 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_30_50_Cent_0_10", "30<genpt<50 (0-10%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_50_80_Cent_0_10 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_50_80_Cent_0_10", "50<genpt<80 (0-10%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_80_120_Cent_0_10 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_80_120_Cent_0_10", "80<genpt<120 (0-10%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_120_180_Cent_0_10 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_120_180_Cent_0_10", "120<genpt<180 (0-10%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_180_300_Cent_0_10 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_180_300_Cent_0_10", "180<genpt<300 (0-10%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_300_Inf_Cent_0_10 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_300_Inf_Cent_0_10", "300<genpt<Inf (0-10%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+
+  mPtRecoOverGen_GenEta_20_30_Cent_10_30 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_20_30_Cent_10_30", "20<genpt<30 (10-30%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_30_50_Cent_10_30 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_30_50_Cent_10_30", "30<genpt<50 (10-30%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_50_80_Cent_10_30 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_50_80_Cent_10_30", "50<genpt<80 (10-30%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_80_120_Cent_10_30 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_80_120_Cent_10_30", "80<genpt<120 (10-30%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_120_180_Cent_10_30 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_120_180_Cent_10_30", "120<genpt<180 (10-30%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_180_300_Cent_10_30 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_180_300_Cent_10_30", "180<genpt<300 (10-30%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_300_Inf_Cent_10_30 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_300_Inf_Cent_10_30", "300<genpt<Inf (10-30%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+
+  mPtRecoOverGen_GenEta_20_30_Cent_30_50 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_20_30_Cent_30_50", "20<genpt<30 (30-50%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_30_50_Cent_30_50 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_30_50_Cent_30_50", "30<genpt<50 (30-50%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_50_80_Cent_30_50 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_50_80_Cent_30_50", "50<genpt<80 (30-50%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_80_120_Cent_30_50 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_80_120_Cent_30_50", "80<genpt<120 (30-50%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_120_180_Cent_30_50 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_120_180_Cent_30_50", "120<genpt<180 (30-50%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_180_300_Cent_30_50 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_180_300_Cent_30_50", "180<genpt<300 (30-50%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_300_Inf_Cent_30_50 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_300_Inf_Cent_30_50", "300<genpt<Inf (30-50%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+
+  mPtRecoOverGen_GenEta_20_30_Cent_50_80 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_20_30_Cent_50_80", "20<genpt<30 (50-80%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_30_50_Cent_50_80 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_30_50_Cent_50_80", "30<genpt<50 (50-80%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_50_80_Cent_50_80 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_50_80_Cent_50_80", "50<genpt<80 (50-80%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_80_120_Cent_50_80 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_80_120_Cent_50_80", "80<genpt<120 (50-80%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_120_180_Cent_50_80 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_120_180_Cent_50_80", "120<genpt<180 (50-80%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_180_300_Cent_50_80 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_180_300_Cent_50_80", "180<genpt<300 (50-80%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+  mPtRecoOverGen_GenEta_300_Inf_Cent_50_80 = ibooker.bookProfile(
+      "PtRecoOverGen_GenEta_300_Inf_Cent_50_80", "300<genpt<Inf (50-80%);geneta;recopt/genpt", 90, etaRange, 0, 2, " ");
+
+  if (mOutputFile.empty())
     LogInfo("OutputInfo") << " Histograms will NOT be saved";
-  else 
+  else
     LogInfo("OutputInfo") << " Histograms will be saved to file:" << mOutputFile;
 
   delete h2D_etabins_vs_pt2;
@@ -631,26 +974,22 @@ void JetTester_HeavyIons::bookHistograms(DQMStore::IBooker & ibooker, edm::Run c
   delete h2D_pfcand_etabins_vs_pt;
 }
 
-
-
 //------------------------------------------------------------------------------
 // ~JetTester_HeavyIons
 //------------------------------------------------------------------------------
 JetTester_HeavyIons::~JetTester_HeavyIons() {}
 
-
 //------------------------------------------------------------------------------
 // beginJob
 //------------------------------------------------------------------------------
-//void JetTester_HeavyIons::beginJob() {
+// void JetTester_HeavyIons::beginJob() {
 //  //std::cout<<"inside the begin job function"<<endl;
 //}
 
-
 //------------------------------------------------------------------------------
 // endJob
 //------------------------------------------------------------------------------
-//void JetTester_HeavyIons::endJob()
+// void JetTester_HeavyIons::endJob()
 //{
 //  if (!mOutputFile.empty() && &*edm::Service<DQMStore>())
 //    {
@@ -658,174 +997,181 @@ JetTester_HeavyIons::~JetTester_HeavyIons() {}
 //    }
 //}
 
-
 //------------------------------------------------------------------------------
 // analyze
 //------------------------------------------------------------------------------
-void JetTester_HeavyIons::analyze(const edm::Event& mEvent, const edm::EventSetup& mSetup)
-{
+void JetTester_HeavyIons::analyze(const edm::Event &mEvent, const edm::EventSetup &mSetup) {
   // Get the primary vertices
   //----------------------------------------------------------------------------
-  edm::Handle<vector<reco::Vertex> > pvHandle;
+  edm::Handle<vector<reco::Vertex>> pvHandle;
   mEvent.getByToken(pvToken_, pvHandle);
-  reco::Vertex::Point vtx(0,0,0);
+  reco::Vertex::Point vtx(0, 0, 0);
   edm::Handle<reco::VertexCollection> vtxs;
-  //vtx = getVtx(mEvent);
+  // vtx = getVtx(mEvent);
 
   mEvent.getByToken(hiVertexToken_, vtxs);
   int greatestvtx = 0;
   int nVertex = vtxs->size();
 
-  for (unsigned int i = 0 ; i< vtxs->size(); ++i){
+  for (unsigned int i = 0; i < vtxs->size(); ++i) {
     unsigned int daughter = (*vtxs)[i].tracksSize();
-    if( daughter > (*vtxs)[greatestvtx].tracksSize()) greatestvtx = i;
+    if (daughter > (*vtxs)[greatestvtx].tracksSize())
+      greatestvtx = i;
   }
 
-  if(nVertex<=0){
-    vtx =  reco::Vertex::Point(0,0,0);
+  if (nVertex <= 0) {
+    vtx = reco::Vertex::Point(0, 0, 0);
   }
   vtx = (*vtxs)[greatestvtx].position();
 
   int nGoodVertices = 0;
 
-  if (pvHandle.isValid())
-    {
-      for (unsigned i=0; i<pvHandle->size(); i++)
-	{
-	  if ((*pvHandle)[i].ndof() > 4 &&
-	      (fabs((*pvHandle)[i].z()) <= 24) &&
-	      (fabs((*pvHandle)[i].position().rho()) <= 2))
-	    nGoodVertices++;
-	}
+  if (pvHandle.isValid()) {
+    for (unsigned i = 0; i < pvHandle->size(); i++) {
+      if ((*pvHandle)[i].ndof() > 4 && (fabs((*pvHandle)[i].z()) <= 24) && (fabs((*pvHandle)[i].position().rho()) <= 2))
+        nGoodVertices++;
     }
+  }
 
   mNvtx->Fill(nGoodVertices);
 
   // Get the Jet collection
   //----------------------------------------------------------------------------
-  //math::XYZTLorentzVector p4tmp[2];
-  
+  // math::XYZTLorentzVector p4tmp[2];
+
   std::vector<Jet> recoJets;
   recoJets.clear();
-  
-  edm::Handle<CaloJetCollection>  caloJets;
-  edm::Handle<JPTJetCollection>   jptJets;
-  edm::Handle<PFJetCollection>    pfJets;
+
+  edm::Handle<CaloJetCollection> caloJets;
+  edm::Handle<JPTJetCollection> jptJets;
+  edm::Handle<PFJetCollection> pfJets;
   edm::Handle<BasicJetCollection> basicJets;
 
-  // Get the Particle flow candidates and the Voronoi variables 
-  edm::Handle<reco::PFCandidateCollection> pfCandidates; 
-  edm::Handle<CaloTowerCollection> caloCandidates; 
+  // Get the Particle flow candidates and the Voronoi variables
+  edm::Handle<reco::PFCandidateCollection> pfCandidates;
+  edm::Handle<CaloTowerCollection> caloCandidates;
   edm::Handle<reco::CandidateView> pfcandidates_;
   edm::Handle<reco::CandidateView> calocandidates_;
-  
 
-  // get the centrality 
+  // get the centrality
   edm::Handle<reco::Centrality> cent;
   mEvent.getByToken(centralityToken, cent);  //_centralitytag comes from the cfg
 
   mHF->Fill(cent->EtHFtowerSum());
   Float_t HF_energy = cent->EtHFtowerSum();
-  
+
   edm::Handle<int> cbin;
   mEvent.getByToken(centralityBinToken, cbin);
-  if (!cent.isValid()) return;
-  
+  if (!cent.isValid())
+    return;
+
   int hibin = -999;
-  if(cbin.isValid()){
+  if (cbin.isValid()) {
     hibin = *cbin;
   }
-  //else  edm::LogWarning("JetTester_HeavyIons") << "invalid collection: centralityBin " << std::endl;
+  // else  edm::LogWarning("JetTester_HeavyIons") << "invalid collection:
+  // centralityBin " << std::endl;
 
   bool isCentral = false;
   bool ismidCentral = false;
   bool ismidPeripheral = false;
   bool isPeripheral = false;
 
-  if(hibin < 20) isCentral = true;
-  if(hibin >= 20 && hibin < 60) ismidCentral = true;
-  if(hibin >= 60 && hibin < 100) ismidPeripheral = true;
-  if(hibin >= 100 && hibin < 160) isPeripheral = true;
-  
-  
-  if (isCaloJet) mEvent.getByToken(caloJetsToken_, caloJets);
-  if (isJPTJet)  mEvent.getByToken(jptJetsToken_, jptJets);
-  if (isPFJet) {  
-    if(std::string("Pu")==UEAlgo) mEvent.getByToken(basicJetsToken_, basicJets);
+  if (hibin < 20)
+    isCentral = true;
+  if (hibin >= 20 && hibin < 60)
+    ismidCentral = true;
+  if (hibin >= 60 && hibin < 100)
+    ismidPeripheral = true;
+  if (hibin >= 100 && hibin < 160)
+    isPeripheral = true;
+
+  if (isCaloJet)
+    mEvent.getByToken(caloJetsToken_, caloJets);
+  if (isJPTJet)
+    mEvent.getByToken(jptJetsToken_, jptJets);
+  if (isPFJet) {
+    if (std::string("Pu") == UEAlgo)
+      mEvent.getByToken(basicJetsToken_, basicJets);
   }
-  
+
   mEvent.getByToken(pfCandToken_, pfCandidates);
   mEvent.getByToken(pfCandViewToken_, pfcandidates_);
 
   mEvent.getByToken(caloTowersToken_, caloCandidates);
   mEvent.getByToken(caloCandViewToken_, calocandidates_);
 
-
-  
   const reco::PFCandidateCollection *pfCandidateColl = pfCandidates.product();
-  
+
   Int_t NPFpart = 0;
   Int_t NCaloTower = 0;
   Float_t pfPt = 0;
   Float_t pfEta = 0;
-  Int_t   pfID = 0;
+  Int_t pfID = 0;
   Float_t pfPhi = 0;
   Float_t caloPt = 0;
   Float_t caloEta = 0;
   Float_t caloPhi = 0;
   Float_t SumPt_value = 0;
-  
-  double edge_pseudorapidity[etaBins_ +1] = {-5.191, -2.650, -2.043, -1.740, -1.479, -1.131, -0.783, -0.522, 0.522, 0.783, 1.131, 1.479, 1.740, 2.043, 2.650, 5.191 };
-  
-
-  if(isCaloJet){
 
+  double edge_pseudorapidity[etaBins_ + 1] = {-5.191,
+                                              -2.650,
+                                              -2.043,
+                                              -1.740,
+                                              -1.479,
+                                              -1.131,
+                                              -0.783,
+                                              -0.522,
+                                              0.522,
+                                              0.783,
+                                              1.131,
+                                              1.479,
+                                              1.740,
+                                              2.043,
+                                              2.650,
+                                              5.191};
+
+  if (isCaloJet) {
     Float_t SumCaloPt[etaBins_];
     Float_t SumSquaredCaloPt[etaBins_];
 
-    for(int i = 0;i<etaBins_;i++){
-
+    for (int i = 0; i < etaBins_; i++) {
       SumCaloPt[i] = 0;
       SumSquaredCaloPt[i] = 0;
-      
     }
 
-    for(unsigned icand = 0;icand<caloCandidates->size(); icand++){
+    for (unsigned icand = 0; icand < caloCandidates->size(); icand++) {
+      const CaloTower &tower = (*caloCandidates)[icand];
+      reco::CandidateViewRef ref(calocandidates_, icand);
+      if (tower.p4(vtx).Et() < 0.1)
+        continue;
 
-      const CaloTower & tower  = (*caloCandidates)[icand];
-      reco::CandidateViewRef ref(calocandidates_,icand);
-      if(tower.p4(vtx).Et() < 0.1) continue;
-
-      
       NCaloTower++;
 
       caloPt = tower.p4(vtx).Et();
       caloEta = tower.p4(vtx).Eta();
       caloPhi = tower.p4(vtx).Phi();
 
+      for (size_t k = 0; k < nedge_pseudorapidity - 1; k++) {
+        if (caloEta >= edge_pseudorapidity[k] && caloEta < edge_pseudorapidity[k + 1]) {
+          SumCaloPt[k] = SumCaloPt[k] + caloPt;
+          SumSquaredCaloPt[k] = SumSquaredCaloPt[k] + caloPt * caloPt;
+        }  // eta selection statement
 
+      }  // eta bin loop
 
-      for(size_t k = 0;k<nedge_pseudorapidity-1; k++){
-	if(caloEta >= edge_pseudorapidity[k] && caloEta < edge_pseudorapidity[k+1]){
-	  SumCaloPt[k] = SumCaloPt[k] + caloPt;
-	  SumSquaredCaloPt[k] = SumSquaredCaloPt[k] + caloPt*caloPt;	
-	}// eta selection statement 
-
-      }// eta bin loop
-    
       SumPt_value = SumPt_value + caloPt;
-    
+
       mCaloPt->Fill(caloPt);
       mCaloEta->Fill(caloEta);
       mCaloPhi->Fill(caloPhi);
-      
-    }// calo tower candidate  loop
+
+    }  // calo tower candidate  loop
 
     Float_t Evt_SumCaloPt = 0;
 
     Float_t Evt_SumSquaredCaloPt = 0;
 
-
     mSumCaloPt_n5p191_n2p650->Fill(SumCaloPt[0]);
     mSumCaloPt_n2p650_n2p043->Fill(SumCaloPt[1]);
     mSumCaloPt_n2p043_n1p740->Fill(SumCaloPt[2]);
@@ -842,130 +1188,146 @@ void JetTester_HeavyIons::analyze(const edm::Event& mEvent, const edm::EventSetu
     mSumCaloPt_2p043_2p650->Fill(SumCaloPt[13]);
     mSumCaloPt_2p650_5p191->Fill(SumCaloPt[14]);
 
-    for(size_t  k = 0;k<nedge_pseudorapidity-1;k++){
-      
+    for (size_t k = 0; k < nedge_pseudorapidity - 1; k++) {
       Evt_SumCaloPt = Evt_SumCaloPt + SumCaloPt[k];
-      
+
       Evt_SumSquaredCaloPt = Evt_SumSquaredCaloPt + SumSquaredCaloPt[k];
-      
-    }// eta bin loop  
-    
+
+    }  // eta bin loop
 
     mSumCaloPt->Fill(Evt_SumCaloPt);
-    
+
     mSumSquaredCaloPt->Fill(Evt_SumSquaredCaloPt);
-    
-    mSumCaloPt_HF->Fill(Evt_SumCaloPt,HF_energy);
-    
+
+    mSumCaloPt_HF->Fill(Evt_SumCaloPt, HF_energy);
+
     mNCalopart->Fill(NCaloTower);
     mSumpt->Fill(SumPt_value);
 
-  }// is calo jet 
+  }  // is calo jet
 
-  if(isPFJet){
-    
+  if (isPFJet) {
     Float_t SumPFPt[etaBins_];
-    
-    Float_t SumSquaredPFPt[etaBins_];
 
-    for(int i = 0;i<etaBins_;i++){
+    Float_t SumSquaredPFPt[etaBins_];
 
+    for (int i = 0; i < etaBins_; i++) {
       SumPFPt[i] = 0;
       SumSquaredPFPt[i] = 0;
-      
     }
-    
-    for(unsigned icand=0;icand<pfCandidateColl->size(); icand++){
-    
+
+    for (unsigned icand = 0; icand < pfCandidateColl->size(); icand++) {
       const reco::PFCandidate pfCandidate = pfCandidateColl->at(icand);
-      reco::CandidateViewRef ref(pfcandidates_,icand);
+      reco::CandidateViewRef ref(pfcandidates_, icand);
+
+      if (pfCandidate.pt() < 0.5)
+        continue;
 
-      if(pfCandidate.pt() < 0.5) continue;
-      
-      
       NPFpart++;
       pfPt = pfCandidate.pt();
       pfEta = pfCandidate.eta();
       pfPhi = pfCandidate.phi();
       pfID = pfCandidate.particleId();
 
-      bool inBarrel = false; 
-      bool inEndcap = false; 
-      bool inForward = false; 
-      
-      if(fabs(pfEta)<BarrelEta) inBarrel = true;
-      if(fabs(pfEta)>=BarrelEta && fabs(pfEta)<EndcapEta) inEndcap = true;
-      if(fabs(pfEta)>=EndcapEta && fabs(pfEta)<ForwardEta) inForward = true;
-      
-      switch(pfID){
-      case 0 :
-	mPFCandpT_vs_eta_Unknown->Fill(pfPt, pfEta);
-	if(inBarrel) mPFCandpT_Barrel_Unknown->Fill(pfPt);
-	if(inEndcap) mPFCandpT_Endcap_Unknown->Fill(pfPt);
-	if(inForward) mPFCandpT_Forward_Unknown->Fill(pfPt);
-      case 1 :
-	mPFCandpT_vs_eta_ChargedHadron->Fill(pfPt, pfEta);
-	if(inBarrel) mPFCandpT_Barrel_ChargedHadron->Fill(pfPt);
-	if(inEndcap) mPFCandpT_Endcap_ChargedHadron->Fill(pfPt);
-	if(inForward) mPFCandpT_Forward_ChargedHadron->Fill(pfPt);
-      case 2 :
-	mPFCandpT_vs_eta_electron->Fill(pfPt, pfEta);
-	if(inBarrel) mPFCandpT_Barrel_electron->Fill(pfPt);
-	if(inEndcap) mPFCandpT_Endcap_electron->Fill(pfPt);
-	if(inForward) mPFCandpT_Forward_electron->Fill(pfPt);
-      case 3 :
-	mPFCandpT_vs_eta_muon->Fill(pfPt, pfEta);
-	if(inBarrel) mPFCandpT_Barrel_muon->Fill(pfPt);
-	if(inEndcap) mPFCandpT_Endcap_muon->Fill(pfPt);
-	if(inForward) mPFCandpT_Forward_muon->Fill(pfPt);
-      case 4 :
-	mPFCandpT_vs_eta_photon->Fill(pfPt, pfEta);
-	if(inBarrel) mPFCandpT_Barrel_photon->Fill(pfPt);
-	if(inEndcap) mPFCandpT_Endcap_photon->Fill(pfPt);
-	if(inForward) mPFCandpT_Forward_photon->Fill(pfPt);
-      case 5 :
-	mPFCandpT_vs_eta_NeutralHadron->Fill(pfPt, pfEta);
-	if(inBarrel) mPFCandpT_Barrel_NeutralHadron->Fill(pfPt);
-	if(inEndcap) mPFCandpT_Endcap_NeutralHadron->Fill(pfPt);
-	if(inForward) mPFCandpT_Forward_NeutralHadron->Fill(pfPt);
-      case 6 :
-	mPFCandpT_vs_eta_HadE_inHF->Fill(pfPt, pfEta);
-	if(inBarrel) mPFCandpT_Barrel_HadE_inHF->Fill(pfPt);
-	if(inEndcap) mPFCandpT_Endcap_HadE_inHF->Fill(pfPt);
-	if(inForward) mPFCandpT_Forward_HadE_inHF->Fill(pfPt);
-      case 7 :
-	mPFCandpT_vs_eta_EME_inHF->Fill(pfPt, pfEta);
-	if(inBarrel) mPFCandpT_Barrel_EME_inHF->Fill(pfPt);
-	if(inEndcap) mPFCandpT_Endcap_EME_inHF->Fill(pfPt);
-	if(inForward) mPFCandpT_Forward_EME_inHF->Fill(pfPt);
+      bool inBarrel = false;
+      bool inEndcap = false;
+      bool inForward = false;
+
+      if (fabs(pfEta) < BarrelEta)
+        inBarrel = true;
+      if (fabs(pfEta) >= BarrelEta && fabs(pfEta) < EndcapEta)
+        inEndcap = true;
+      if (fabs(pfEta) >= EndcapEta && fabs(pfEta) < ForwardEta)
+        inForward = true;
+
+      switch (pfID) {
+        case 0:
+          mPFCandpT_vs_eta_Unknown->Fill(pfPt, pfEta);
+          if (inBarrel)
+            mPFCandpT_Barrel_Unknown->Fill(pfPt);
+          if (inEndcap)
+            mPFCandpT_Endcap_Unknown->Fill(pfPt);
+          if (inForward)
+            mPFCandpT_Forward_Unknown->Fill(pfPt);
+        case 1:
+          mPFCandpT_vs_eta_ChargedHadron->Fill(pfPt, pfEta);
+          if (inBarrel)
+            mPFCandpT_Barrel_ChargedHadron->Fill(pfPt);
+          if (inEndcap)
+            mPFCandpT_Endcap_ChargedHadron->Fill(pfPt);
+          if (inForward)
+            mPFCandpT_Forward_ChargedHadron->Fill(pfPt);
+        case 2:
+          mPFCandpT_vs_eta_electron->Fill(pfPt, pfEta);
+          if (inBarrel)
+            mPFCandpT_Barrel_electron->Fill(pfPt);
+          if (inEndcap)
+            mPFCandpT_Endcap_electron->Fill(pfPt);
+          if (inForward)
+            mPFCandpT_Forward_electron->Fill(pfPt);
+        case 3:
+          mPFCandpT_vs_eta_muon->Fill(pfPt, pfEta);
+          if (inBarrel)
+            mPFCandpT_Barrel_muon->Fill(pfPt);
+          if (inEndcap)
+            mPFCandpT_Endcap_muon->Fill(pfPt);
+          if (inForward)
+            mPFCandpT_Forward_muon->Fill(pfPt);
+        case 4:
+          mPFCandpT_vs_eta_photon->Fill(pfPt, pfEta);
+          if (inBarrel)
+            mPFCandpT_Barrel_photon->Fill(pfPt);
+          if (inEndcap)
+            mPFCandpT_Endcap_photon->Fill(pfPt);
+          if (inForward)
+            mPFCandpT_Forward_photon->Fill(pfPt);
+        case 5:
+          mPFCandpT_vs_eta_NeutralHadron->Fill(pfPt, pfEta);
+          if (inBarrel)
+            mPFCandpT_Barrel_NeutralHadron->Fill(pfPt);
+          if (inEndcap)
+            mPFCandpT_Endcap_NeutralHadron->Fill(pfPt);
+          if (inForward)
+            mPFCandpT_Forward_NeutralHadron->Fill(pfPt);
+        case 6:
+          mPFCandpT_vs_eta_HadE_inHF->Fill(pfPt, pfEta);
+          if (inBarrel)
+            mPFCandpT_Barrel_HadE_inHF->Fill(pfPt);
+          if (inEndcap)
+            mPFCandpT_Endcap_HadE_inHF->Fill(pfPt);
+          if (inForward)
+            mPFCandpT_Forward_HadE_inHF->Fill(pfPt);
+        case 7:
+          mPFCandpT_vs_eta_EME_inHF->Fill(pfPt, pfEta);
+          if (inBarrel)
+            mPFCandpT_Barrel_EME_inHF->Fill(pfPt);
+          if (inEndcap)
+            mPFCandpT_Endcap_EME_inHF->Fill(pfPt);
+          if (inForward)
+            mPFCandpT_Forward_EME_inHF->Fill(pfPt);
       }
-	
 
-      
+      for (size_t k = 0; k < nedge_pseudorapidity - 1; k++) {
+        if (pfEta >= edge_pseudorapidity[k] && pfEta < edge_pseudorapidity[k + 1]) {
+          SumPFPt[k] = SumPFPt[k] + pfPt;
+
+          SumSquaredPFPt[k] = SumSquaredPFPt[k] + pfPt * pfPt;
 
-      for(size_t k = 0;k<nedge_pseudorapidity-1; k++){
-	if(pfEta >= edge_pseudorapidity[k] && pfEta < edge_pseudorapidity[k+1]){
-	  SumPFPt[k] = SumPFPt[k] + pfPt;
+        }  // eta selection statement
+
+      }  // eta bin loop
 
-	  SumSquaredPFPt[k] = SumSquaredPFPt[k] + pfPt*pfPt;
-	  
-	}// eta selection statement 
-      
-      }// eta bin loop
-    
       SumPt_value = SumPt_value + pfPt;
-    
+
       mPFPt->Fill(pfPt);
       mPFEta->Fill(pfEta);
       mPFPhi->Fill(pfPhi);
 
-    
-    }// pf candidate loop 
+    }  // pf candidate loop
 
     Float_t Evt_SumPFPt = 0;
 
     Float_t Evt_SumSquaredPFPt = 0;
-    
 
     mSumPFPt_n5p191_n2p650->Fill(SumPFPt[0]);
     mSumPFPt_n2p650_n2p043->Fill(SumPFPt[1]);
@@ -983,87 +1345,98 @@ void JetTester_HeavyIons::analyze(const edm::Event& mEvent, const edm::EventSetu
     mSumPFPt_2p043_2p650->Fill(SumPFPt[13]);
     mSumPFPt_2p650_5p191->Fill(SumPFPt[14]);
 
-    for(size_t  k = 0;k<nedge_pseudorapidity-1;k++){
-    
+    for (size_t k = 0; k < nedge_pseudorapidity - 1; k++) {
       Evt_SumPFPt = Evt_SumPFPt + SumPFPt[k];
 
       Evt_SumSquaredPFPt = Evt_SumSquaredPFPt + SumSquaredPFPt[k];
-      
-    }// eta bin loop  
+
+    }  // eta bin loop
 
     mSumPFPt->Fill(Evt_SumPFPt);
-    
+
     mSumSquaredPFPt->Fill(Evt_SumSquaredPFPt);
-    
-    mSumPFPt_HF->Fill(Evt_SumPFPt,HF_energy);
-  
+
+    mSumPFPt_HF->Fill(Evt_SumPFPt, HF_energy);
+
     mNPFpart->Fill(NPFpart);
     mSumpt->Fill(SumPt_value);
+  }
 
+  if (isCaloJet) {
+    for (unsigned ijet = 0; ijet < caloJets->size(); ijet++)
+      recoJets.push_back((*caloJets)[ijet]);
   }
-  
-  if (isCaloJet)
-    {
-      for (unsigned ijet=0; ijet<caloJets->size(); ijet++) recoJets.push_back((*caloJets)[ijet]);
-    }
-  
-  if (isJPTJet)
-    {
-      for (unsigned ijet=0; ijet<jptJets->size(); ijet++) recoJets.push_back((*jptJets)[ijet]);
-    }
-  
+
+  if (isJPTJet) {
+    for (unsigned ijet = 0; ijet < jptJets->size(); ijet++)
+      recoJets.push_back((*jptJets)[ijet]);
+  }
+
   if (isPFJet) {
-    if(std::string("Pu")==UEAlgo){
-      for (unsigned ijet=0; ijet<basicJets->size();ijet++) recoJets.push_back((*basicJets)[ijet]);
+    if (std::string("Pu") == UEAlgo) {
+      for (unsigned ijet = 0; ijet < basicJets->size(); ijet++)
+        recoJets.push_back((*basicJets)[ijet]);
     }
   }
-    
-  if (isCaloJet && !caloJets.isValid()) return;
-  if (isJPTJet  && !jptJets.isValid())  return;
-  if (isPFJet){
-    if(std::string("Pu")==UEAlgo){if(!basicJets.isValid())   return;}
+
+  if (isCaloJet && !caloJets.isValid())
+    return;
+  if (isJPTJet && !jptJets.isValid())
+    return;
+  if (isPFJet) {
+    if (std::string("Pu") == UEAlgo) {
+      if (!basicJets.isValid())
+        return;
+    }
   }
-  
+
   int nJet_40 = 0;
 
   mNJets->Fill(recoJets.size());
-  
-  for (unsigned ijet=0; ijet<recoJets.size(); ijet++) {
-    
+
+  for (unsigned ijet = 0; ijet < recoJets.size(); ijet++) {
     if (recoJets[ijet].pt() > mRecoJetPtThreshold) {
-      //counting forward and barrel jets
-      // get an idea of no of jets with pT>40 GeV 
-      if(recoJets[ijet].pt() > 40)
-	nJet_40++;
-      
-      if (mEta) mEta->Fill(recoJets[ijet].eta());
-      if (mjetpileup) mjetpileup->Fill(recoJets[ijet].pileup());
-      if (mJetArea)      mJetArea     ->Fill(recoJets[ijet].jetArea());
-      if (mPhi)          mPhi         ->Fill(recoJets[ijet].phi());
-      if (mEnergy)       mEnergy      ->Fill(recoJets[ijet].energy());
-      if (mP)            mP           ->Fill(recoJets[ijet].p());
-      if (mPt)           mPt          ->Fill(recoJets[ijet].pt());
-      if (mMass)         mMass        ->Fill(recoJets[ijet].mass());
-      if (mConstituents) mConstituents->Fill(recoJets[ijet].nConstituents());
-      
+      // counting forward and barrel jets
+      // get an idea of no of jets with pT>40 GeV
+      if (recoJets[ijet].pt() > 40)
+        nJet_40++;
+
+      if (mEta)
+        mEta->Fill(recoJets[ijet].eta());
+      if (mjetpileup)
+        mjetpileup->Fill(recoJets[ijet].pileup());
+      if (mJetArea)
+        mJetArea->Fill(recoJets[ijet].jetArea());
+      if (mPhi)
+        mPhi->Fill(recoJets[ijet].phi());
+      if (mEnergy)
+        mEnergy->Fill(recoJets[ijet].energy());
+      if (mP)
+        mP->Fill(recoJets[ijet].p());
+      if (mPt)
+        mPt->Fill(recoJets[ijet].pt());
+      if (mMass)
+        mMass->Fill(recoJets[ijet].mass());
+      if (mConstituents)
+        mConstituents->Fill(recoJets[ijet].nConstituents());
     }
   }
-  
-  if (mNJets_40) mNJets_40->Fill(nJet_40); 
 
+  if (mNJets_40)
+    mNJets_40->Fill(nJet_40);
 
   // Gen level information:
-  if (!mEvent.isRealData()){
-
+  if (!mEvent.isRealData()) {
     // Get ptHat
     //------------------------------------------------------------------------
     edm::Handle<GenEventInfoProduct> myGenEvt;
     mEvent.getByToken(evtToken_, myGenEvt);
 
     if (myGenEvt.isValid()) {
-      if(myGenEvt->hasBinningValues()){
-	double ptHat = myGenEvt->binningValues()[0];
-	if (mPtHat) mPtHat->Fill(ptHat);
+      if (myGenEvt->hasBinningValues()) {
+        double ptHat = myGenEvt->binningValues()[0];
+        if (mPtHat)
+          mPtHat->Fill(ptHat);
       }
     }
     // Gen jets
@@ -1071,367 +1444,378 @@ void JetTester_HeavyIons::analyze(const edm::Event& mEvent, const edm::EventSetu
     edm::Handle<GenJetCollection> genJets;
     mEvent.getByToken(genJetsToken_, genJets);
 
-    if (!genJets.isValid()) return;
-      
-    for (GenJetCollection::const_iterator gjet=genJets->begin();  gjet!=genJets->end(); gjet++)	{
-      if(gjet->pt() > mMatchGenPtThreshold){
-	if (mGenEta) mGenEta->Fill(gjet->eta());
-	if (mGenPhi) mGenPhi->Fill(gjet->phi());
-	if (mGenPt)  mGenPt ->Fill(gjet->pt());
+    if (!genJets.isValid())
+      return;
+
+    for (GenJetCollection::const_iterator gjet = genJets->begin(); gjet != genJets->end(); gjet++) {
+      if (gjet->pt() > mMatchGenPtThreshold) {
+        if (mGenEta)
+          mGenEta->Fill(gjet->eta());
+        if (mGenPhi)
+          mGenPhi->Fill(gjet->phi());
+        if (mGenPt)
+          mGenPt->Fill(gjet->pt());
       }
     }
 
     if (!(mInputGenCollection.label().empty())) {
-      for (GenJetCollection::const_iterator gjet=genJets->begin(); gjet!=genJets->end(); gjet++) {
-        if (fabs(gjet->eta()) > 6.) continue;  // Out of the detector 
-        if (gjet->pt() < mMatchGenPtThreshold) continue;
-        if (recoJets.empty()) continue;
-
-	bool inBarrel = false; 
-	bool inEndcap = false; 
-	bool inForward = false; 
-	
-	if(fabs(gjet->eta())<BarrelEta) inBarrel = true;
-	if(fabs(gjet->eta())>=BarrelEta && fabs(gjet->eta())<EndcapEta) inEndcap = true;
-	if(fabs(gjet->eta())>=EndcapEta && fabs(gjet->eta())<ForwardEta) inForward = true;
-	
+      for (GenJetCollection::const_iterator gjet = genJets->begin(); gjet != genJets->end(); gjet++) {
+        if (fabs(gjet->eta()) > 6.)
+          continue;  // Out of the detector
+        if (gjet->pt() < mMatchGenPtThreshold)
+          continue;
+        if (recoJets.empty())
+          continue;
+
+        bool inBarrel = false;
+        bool inEndcap = false;
+        bool inForward = false;
+
+        if (fabs(gjet->eta()) < BarrelEta)
+          inBarrel = true;
+        if (fabs(gjet->eta()) >= BarrelEta && fabs(gjet->eta()) < EndcapEta)
+          inEndcap = true;
+        if (fabs(gjet->eta()) >= EndcapEta && fabs(gjet->eta()) < ForwardEta)
+          inForward = true;
+
         // pt response
         //------------------------------------------------------------
-	int iMatch    =   -1;
-	double deltaRBest = 999;
-	double JetPtBest  =   0;
-	for (unsigned ijet=0; ijet<recoJets.size(); ++ijet) {
-	  double recoPt = recoJets[ijet].pt();
-	  if (recoPt > 10) {
-	    double delR = deltaR(gjet->eta(), gjet->phi(), recoJets[ijet].eta(), recoJets[ijet].phi());
-	    if (delR < deltaRBest) {
-	      deltaRBest = delR;
-	      JetPtBest  = recoPt;
-	      iMatch = ijet;
-	    }
-	  }
-	}
-	if (iMatch<0) continue;
-
-	//fillMatchHists(gjet->eta(),  gjet->phi(),  gjet->pt(), recoJets[iMatch].eta(), recoJets[iMatch].phi(),  recoJets[iMatch].pt(), hibin);
-	if(deltaRBest < mRThreshold){
-	  double genpt = gjet->pt();
-	  double geneta = gjet->eta();
-	  double response = JetPtBest / genpt;
-	  // Fill all the response histograms here: for each pT bin, eta region, centrality bin
-
-	  if(inBarrel) {
-	    if(isCentral)
-	      mPtRecoOverGen_GenPt_B_Cent_0_10->Fill(log10(genpt), response);
-	    if(ismidCentral)
-	      mPtRecoOverGen_GenPt_B_Cent_10_30->Fill(log10(genpt), response);
-	    if(ismidPeripheral)
-	      mPtRecoOverGen_GenPt_B_Cent_30_50->Fill(log10(genpt), response);
-	    if(isPeripheral)
-	      mPtRecoOverGen_GenPt_B_Cent_50_80->Fill(log10(genpt), response);
-	  }
-	  if(inEndcap) {
-	    if(isCentral)
-	      mPtRecoOverGen_GenPt_E_Cent_0_10->Fill(log10(genpt), response);
-	    if(ismidCentral)
-	      mPtRecoOverGen_GenPt_E_Cent_10_30->Fill(log10(genpt), response);
-	    if(ismidPeripheral)
-	      mPtRecoOverGen_GenPt_E_Cent_30_50->Fill(log10(genpt), response);
-	    if(isPeripheral)
-	      mPtRecoOverGen_GenPt_E_Cent_50_80->Fill(log10(genpt), response);
-	  }
-	  if(inForward) {
-	    if(isCentral)
-	      mPtRecoOverGen_GenPt_F_Cent_0_10->Fill(log10(genpt), response);
-	    if(ismidCentral)
-	      mPtRecoOverGen_GenPt_F_Cent_10_30->Fill(log10(genpt), response);
-	    if(ismidPeripheral)
-	      mPtRecoOverGen_GenPt_F_Cent_30_50->Fill(log10(genpt), response);
-	    if(isPeripheral)
-	      mPtRecoOverGen_GenPt_F_Cent_50_80->Fill(log10(genpt), response);
-	  }
-
-	  if( gjet->pt() >= 20 && gjet->pt() < 30 ){
-	    if(isCentral){
-	      mPtRecoOverGen_GenEta_20_30_Cent_0_10->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_20_30_Cent_0_10->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_20_30_Cent_0_10->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_20_30_Cent_0_10->Fill(response);	      
-	    }// 
-	    if(ismidCentral){
-	      mPtRecoOverGen_GenEta_20_30_Cent_10_30->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_20_30_Cent_10_30->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_20_30_Cent_10_30->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_20_30_Cent_10_30->Fill(response);	      
-	    }// 
-	    if(ismidPeripheral){
-	      mPtRecoOverGen_GenEta_20_30_Cent_30_50->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_20_30_Cent_30_50->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_20_30_Cent_30_50->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_20_30_Cent_30_50->Fill(response);	      
-	    }// 
-	    if(isPeripheral){
-	      mPtRecoOverGen_GenEta_20_30_Cent_50_80->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_20_30_Cent_50_80->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_20_30_Cent_50_80->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_20_30_Cent_50_80->Fill(response);	      
-	    }// 
-	  }// pt bin 20-30
-
-	  if( gjet->pt() >= 30 && gjet->pt() < 50 ){
-	    if(isCentral){
-	      mPtRecoOverGen_GenEta_30_50_Cent_0_10->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_30_50_Cent_0_10->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_30_50_Cent_0_10->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_30_50_Cent_0_10->Fill(response);	      
-	    }// 
-	    if(ismidCentral){
-	      mPtRecoOverGen_GenEta_30_50_Cent_10_30->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_30_50_Cent_10_30->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_30_50_Cent_10_30->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_30_50_Cent_10_30->Fill(response);	      
-	    }// 
-	    if(ismidPeripheral){
-	      mPtRecoOverGen_GenEta_30_50_Cent_30_50->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_30_50_Cent_30_50->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_30_50_Cent_30_50->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_30_50_Cent_30_50->Fill(response);	      
-	    }// 
-	    if(isPeripheral){
-	      mPtRecoOverGen_GenEta_30_50_Cent_50_80->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_30_50_Cent_50_80->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_30_50_Cent_50_80->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_30_50_Cent_50_80->Fill(response);	      
-	    }// 
-	  }// pt bin 30-50
-
-	  if( gjet->pt() >= 50 && gjet->pt() < 80 ){
-	    if(isCentral){
-	      mPtRecoOverGen_GenEta_50_80_Cent_0_10->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_50_80_Cent_0_10->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_50_80_Cent_0_10->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_50_80_Cent_0_10->Fill(response);	      
-	    }// 
-	    if(ismidCentral){
-	      mPtRecoOverGen_GenEta_50_80_Cent_10_30->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_50_80_Cent_10_30->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_50_80_Cent_10_30->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_50_80_Cent_10_30->Fill(response);	      
-	    }// 
-	    if(ismidPeripheral){
-	      mPtRecoOverGen_GenEta_50_80_Cent_30_50->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_50_80_Cent_30_50->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_50_80_Cent_30_50->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_50_80_Cent_30_50->Fill(response);	      
-	    }// 
-	    if(isPeripheral){
-	      mPtRecoOverGen_GenEta_50_80_Cent_50_80->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_50_80_Cent_50_80->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_50_80_Cent_50_80->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_50_80_Cent_50_80->Fill(response);	      
-	    }// 
-	  }// pt bin 50-80
-
-	  if( gjet->pt() >= 80 && gjet->pt() < 120 ){
-	    if(isCentral){
-	      mPtRecoOverGen_GenEta_80_120_Cent_0_10->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_80_120_Cent_0_10->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_80_120_Cent_0_10->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_80_120_Cent_0_10->Fill(response);	      
-	    }// 
-	    if(ismidCentral){
-	      mPtRecoOverGen_GenEta_80_120_Cent_10_30->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_80_120_Cent_10_30->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_80_120_Cent_10_30->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_80_120_Cent_10_30->Fill(response);	      
-	    }// 
-	    if(ismidPeripheral){
-	      mPtRecoOverGen_GenEta_80_120_Cent_30_50->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_80_120_Cent_30_50->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_80_120_Cent_30_50->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_80_120_Cent_30_50->Fill(response);	      
-	    }// 
-	    if(isPeripheral){
-	      mPtRecoOverGen_GenEta_80_120_Cent_50_80->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_80_120_Cent_50_80->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_80_120_Cent_50_80->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_80_120_Cent_50_80->Fill(response);	      
-	    }// 
-	  }// pt bin 80-120
-
-	  if( gjet->pt() >= 120 && gjet->pt() < 180 ){
-	    if(isCentral){
-	      mPtRecoOverGen_GenEta_120_180_Cent_0_10->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_120_180_Cent_0_10->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_120_180_Cent_0_10->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_120_180_Cent_0_10->Fill(response);	      
-	    }// 
-	    if(ismidCentral){
-	      mPtRecoOverGen_GenEta_120_180_Cent_10_30->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_120_180_Cent_10_30->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_120_180_Cent_10_30->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_120_180_Cent_10_30->Fill(response);	      
-	    }// 
-	    if(ismidPeripheral){
-	      mPtRecoOverGen_GenEta_120_180_Cent_30_50->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_120_180_Cent_30_50->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_120_180_Cent_30_50->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_120_180_Cent_30_50->Fill(response);	      
-	    }// 
-	    if(isPeripheral){
-	      mPtRecoOverGen_GenEta_120_180_Cent_50_80->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_120_180_Cent_50_80->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_120_180_Cent_50_80->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_120_180_Cent_50_80->Fill(response);	      
-	    }// 
-	  }// pt bin 120-180
-
-	  if( gjet->pt() >= 180 && gjet->pt() < 300 ){
-	    if(isCentral){
-	      mPtRecoOverGen_GenEta_180_300_Cent_0_10->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_180_300_Cent_0_10->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_180_300_Cent_0_10->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_180_300_Cent_0_10->Fill(response);	      
-	    }// 
-	    if(ismidCentral){
-	      mPtRecoOverGen_GenEta_180_300_Cent_10_30->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_180_300_Cent_10_30->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_180_300_Cent_10_30->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_180_300_Cent_10_30->Fill(response);	      
-	    }// 
-	    if(ismidPeripheral){
-	      mPtRecoOverGen_GenEta_180_300_Cent_30_50->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_180_300_Cent_30_50->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_180_300_Cent_30_50->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_180_300_Cent_30_50->Fill(response);	      
-	    }// 
-	    if(isPeripheral){
-	      mPtRecoOverGen_GenEta_180_300_Cent_50_80->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_180_300_Cent_50_80->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_180_300_Cent_50_80->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_180_300_Cent_50_80->Fill(response);	      
-	    }// 
-	  }// pt bin 180-300
-
-	  if(gjet->pt() >= 300){
-	    if(isCentral){
-	      mPtRecoOverGen_GenEta_300_Inf_Cent_0_10->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_300_Inf_Cent_0_10->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_300_Inf_Cent_0_10->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_300_Inf_Cent_0_10->Fill(response);	      
-	    }// 
-	    if(ismidCentral){
-	      mPtRecoOverGen_GenEta_300_Inf_Cent_10_30->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_300_Inf_Cent_10_30->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_300_Inf_Cent_10_30->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_300_Inf_Cent_10_30->Fill(response);	      
-	    }// 
-	    if(ismidPeripheral){
-	      mPtRecoOverGen_GenEta_300_Inf_Cent_30_50->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_300_Inf_Cent_30_50->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_300_Inf_Cent_30_50->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_300_Inf_Cent_30_50->Fill(response);	      
-	    }// 
-	    if(isPeripheral){
-	      mPtRecoOverGen_GenEta_300_Inf_Cent_50_80->Fill(geneta, response);
-	      if(inBarrel) 
-		mPtRecoOverGen_B_300_Inf_Cent_50_80->Fill(response);	      
-	      if(inEndcap)
-		mPtRecoOverGen_E_300_Inf_Cent_50_80->Fill(response);
-	      if(inForward)
-		mPtRecoOverGen_F_300_Inf_Cent_50_80->Fill(response);	      
-	    }// 
-	  }// pt bin 300-Inf
-	  
-	}// delta R < mRthreshold
-
-      }// gen jet collection loop
-
-  
-    }// not empty gen collection
-
-  }// is the event real
-
+        int iMatch = -1;
+        double deltaRBest = 999;
+        double JetPtBest = 0;
+        for (unsigned ijet = 0; ijet < recoJets.size(); ++ijet) {
+          double recoPt = recoJets[ijet].pt();
+          if (recoPt > 10) {
+            double delR = deltaR(gjet->eta(), gjet->phi(), recoJets[ijet].eta(), recoJets[ijet].phi());
+            if (delR < deltaRBest) {
+              deltaRBest = delR;
+              JetPtBest = recoPt;
+              iMatch = ijet;
+            }
+          }
+        }
+        if (iMatch < 0)
+          continue;
+
+        // fillMatchHists(gjet->eta(),  gjet->phi(),  gjet->pt(),
+        // recoJets[iMatch].eta(), recoJets[iMatch].phi(),
+        // recoJets[iMatch].pt(), hibin);
+        if (deltaRBest < mRThreshold) {
+          double genpt = gjet->pt();
+          double geneta = gjet->eta();
+          double response = JetPtBest / genpt;
+          // Fill all the response histograms here: for each pT bin, eta region,
+          // centrality bin
+
+          if (inBarrel) {
+            if (isCentral)
+              mPtRecoOverGen_GenPt_B_Cent_0_10->Fill(log10(genpt), response);
+            if (ismidCentral)
+              mPtRecoOverGen_GenPt_B_Cent_10_30->Fill(log10(genpt), response);
+            if (ismidPeripheral)
+              mPtRecoOverGen_GenPt_B_Cent_30_50->Fill(log10(genpt), response);
+            if (isPeripheral)
+              mPtRecoOverGen_GenPt_B_Cent_50_80->Fill(log10(genpt), response);
+          }
+          if (inEndcap) {
+            if (isCentral)
+              mPtRecoOverGen_GenPt_E_Cent_0_10->Fill(log10(genpt), response);
+            if (ismidCentral)
+              mPtRecoOverGen_GenPt_E_Cent_10_30->Fill(log10(genpt), response);
+            if (ismidPeripheral)
+              mPtRecoOverGen_GenPt_E_Cent_30_50->Fill(log10(genpt), response);
+            if (isPeripheral)
+              mPtRecoOverGen_GenPt_E_Cent_50_80->Fill(log10(genpt), response);
+          }
+          if (inForward) {
+            if (isCentral)
+              mPtRecoOverGen_GenPt_F_Cent_0_10->Fill(log10(genpt), response);
+            if (ismidCentral)
+              mPtRecoOverGen_GenPt_F_Cent_10_30->Fill(log10(genpt), response);
+            if (ismidPeripheral)
+              mPtRecoOverGen_GenPt_F_Cent_30_50->Fill(log10(genpt), response);
+            if (isPeripheral)
+              mPtRecoOverGen_GenPt_F_Cent_50_80->Fill(log10(genpt), response);
+          }
+
+          if (gjet->pt() >= 20 && gjet->pt() < 30) {
+            if (isCentral) {
+              mPtRecoOverGen_GenEta_20_30_Cent_0_10->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_20_30_Cent_0_10->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_20_30_Cent_0_10->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_20_30_Cent_0_10->Fill(response);
+            }  //
+            if (ismidCentral) {
+              mPtRecoOverGen_GenEta_20_30_Cent_10_30->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_20_30_Cent_10_30->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_20_30_Cent_10_30->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_20_30_Cent_10_30->Fill(response);
+            }  //
+            if (ismidPeripheral) {
+              mPtRecoOverGen_GenEta_20_30_Cent_30_50->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_20_30_Cent_30_50->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_20_30_Cent_30_50->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_20_30_Cent_30_50->Fill(response);
+            }  //
+            if (isPeripheral) {
+              mPtRecoOverGen_GenEta_20_30_Cent_50_80->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_20_30_Cent_50_80->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_20_30_Cent_50_80->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_20_30_Cent_50_80->Fill(response);
+            }  //
+          }    // pt bin 20-30
+
+          if (gjet->pt() >= 30 && gjet->pt() < 50) {
+            if (isCentral) {
+              mPtRecoOverGen_GenEta_30_50_Cent_0_10->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_30_50_Cent_0_10->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_30_50_Cent_0_10->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_30_50_Cent_0_10->Fill(response);
+            }  //
+            if (ismidCentral) {
+              mPtRecoOverGen_GenEta_30_50_Cent_10_30->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_30_50_Cent_10_30->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_30_50_Cent_10_30->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_30_50_Cent_10_30->Fill(response);
+            }  //
+            if (ismidPeripheral) {
+              mPtRecoOverGen_GenEta_30_50_Cent_30_50->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_30_50_Cent_30_50->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_30_50_Cent_30_50->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_30_50_Cent_30_50->Fill(response);
+            }  //
+            if (isPeripheral) {
+              mPtRecoOverGen_GenEta_30_50_Cent_50_80->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_30_50_Cent_50_80->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_30_50_Cent_50_80->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_30_50_Cent_50_80->Fill(response);
+            }  //
+          }    // pt bin 30-50
+
+          if (gjet->pt() >= 50 && gjet->pt() < 80) {
+            if (isCentral) {
+              mPtRecoOverGen_GenEta_50_80_Cent_0_10->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_50_80_Cent_0_10->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_50_80_Cent_0_10->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_50_80_Cent_0_10->Fill(response);
+            }  //
+            if (ismidCentral) {
+              mPtRecoOverGen_GenEta_50_80_Cent_10_30->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_50_80_Cent_10_30->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_50_80_Cent_10_30->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_50_80_Cent_10_30->Fill(response);
+            }  //
+            if (ismidPeripheral) {
+              mPtRecoOverGen_GenEta_50_80_Cent_30_50->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_50_80_Cent_30_50->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_50_80_Cent_30_50->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_50_80_Cent_30_50->Fill(response);
+            }  //
+            if (isPeripheral) {
+              mPtRecoOverGen_GenEta_50_80_Cent_50_80->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_50_80_Cent_50_80->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_50_80_Cent_50_80->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_50_80_Cent_50_80->Fill(response);
+            }  //
+          }    // pt bin 50-80
+
+          if (gjet->pt() >= 80 && gjet->pt() < 120) {
+            if (isCentral) {
+              mPtRecoOverGen_GenEta_80_120_Cent_0_10->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_80_120_Cent_0_10->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_80_120_Cent_0_10->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_80_120_Cent_0_10->Fill(response);
+            }  //
+            if (ismidCentral) {
+              mPtRecoOverGen_GenEta_80_120_Cent_10_30->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_80_120_Cent_10_30->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_80_120_Cent_10_30->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_80_120_Cent_10_30->Fill(response);
+            }  //
+            if (ismidPeripheral) {
+              mPtRecoOverGen_GenEta_80_120_Cent_30_50->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_80_120_Cent_30_50->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_80_120_Cent_30_50->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_80_120_Cent_30_50->Fill(response);
+            }  //
+            if (isPeripheral) {
+              mPtRecoOverGen_GenEta_80_120_Cent_50_80->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_80_120_Cent_50_80->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_80_120_Cent_50_80->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_80_120_Cent_50_80->Fill(response);
+            }  //
+          }    // pt bin 80-120
+
+          if (gjet->pt() >= 120 && gjet->pt() < 180) {
+            if (isCentral) {
+              mPtRecoOverGen_GenEta_120_180_Cent_0_10->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_120_180_Cent_0_10->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_120_180_Cent_0_10->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_120_180_Cent_0_10->Fill(response);
+            }  //
+            if (ismidCentral) {
+              mPtRecoOverGen_GenEta_120_180_Cent_10_30->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_120_180_Cent_10_30->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_120_180_Cent_10_30->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_120_180_Cent_10_30->Fill(response);
+            }  //
+            if (ismidPeripheral) {
+              mPtRecoOverGen_GenEta_120_180_Cent_30_50->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_120_180_Cent_30_50->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_120_180_Cent_30_50->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_120_180_Cent_30_50->Fill(response);
+            }  //
+            if (isPeripheral) {
+              mPtRecoOverGen_GenEta_120_180_Cent_50_80->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_120_180_Cent_50_80->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_120_180_Cent_50_80->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_120_180_Cent_50_80->Fill(response);
+            }  //
+          }    // pt bin 120-180
+
+          if (gjet->pt() >= 180 && gjet->pt() < 300) {
+            if (isCentral) {
+              mPtRecoOverGen_GenEta_180_300_Cent_0_10->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_180_300_Cent_0_10->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_180_300_Cent_0_10->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_180_300_Cent_0_10->Fill(response);
+            }  //
+            if (ismidCentral) {
+              mPtRecoOverGen_GenEta_180_300_Cent_10_30->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_180_300_Cent_10_30->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_180_300_Cent_10_30->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_180_300_Cent_10_30->Fill(response);
+            }  //
+            if (ismidPeripheral) {
+              mPtRecoOverGen_GenEta_180_300_Cent_30_50->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_180_300_Cent_30_50->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_180_300_Cent_30_50->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_180_300_Cent_30_50->Fill(response);
+            }  //
+            if (isPeripheral) {
+              mPtRecoOverGen_GenEta_180_300_Cent_50_80->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_180_300_Cent_50_80->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_180_300_Cent_50_80->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_180_300_Cent_50_80->Fill(response);
+            }  //
+          }    // pt bin 180-300
+
+          if (gjet->pt() >= 300) {
+            if (isCentral) {
+              mPtRecoOverGen_GenEta_300_Inf_Cent_0_10->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_300_Inf_Cent_0_10->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_300_Inf_Cent_0_10->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_300_Inf_Cent_0_10->Fill(response);
+            }  //
+            if (ismidCentral) {
+              mPtRecoOverGen_GenEta_300_Inf_Cent_10_30->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_300_Inf_Cent_10_30->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_300_Inf_Cent_10_30->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_300_Inf_Cent_10_30->Fill(response);
+            }  //
+            if (ismidPeripheral) {
+              mPtRecoOverGen_GenEta_300_Inf_Cent_30_50->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_300_Inf_Cent_30_50->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_300_Inf_Cent_30_50->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_300_Inf_Cent_30_50->Fill(response);
+            }  //
+            if (isPeripheral) {
+              mPtRecoOverGen_GenEta_300_Inf_Cent_50_80->Fill(geneta, response);
+              if (inBarrel)
+                mPtRecoOverGen_B_300_Inf_Cent_50_80->Fill(response);
+              if (inEndcap)
+                mPtRecoOverGen_E_300_Inf_Cent_50_80->Fill(response);
+              if (inForward)
+                mPtRecoOverGen_F_300_Inf_Cent_50_80->Fill(response);
+            }  //
+          }    // pt bin 300-Inf
+
+        }  // delta R < mRthreshold
+
+      }  // gen jet collection loop
+
+    }  // not empty gen collection
+
+  }  // is the event real
 }
-
diff --git a/Validation/RecoJets/plugins/JetTester_HeavyIons.h b/Validation/RecoJets/plugins/JetTester_HeavyIons.h
index 711edae9d71c3..31731f512fb0f 100644
--- a/Validation/RecoJets/plugins/JetTester_HeavyIons.h
+++ b/Validation/RecoJets/plugins/JetTester_HeavyIons.h
@@ -5,16 +5,28 @@
 // F. Ratnikov, Sept. 7, 2006
 // Modified by Chiyoung Jeong, Feb. 2, 2010
 // Modified by J. Piedra, Sept. 11, 2013
-// Rewritten by Viola Sordini, Matthias Artur Weber, Robert Schoefbeck Nov./Dez. 2013
-// Modified by Raghav Kunnawalkam Elayavalli, Aug 18th 2014 to run in 72X 
+// Rewritten by Viola Sordini, Matthias Artur Weber, Robert Schoefbeck Nov./Dez.
+// 2013 Modified by Raghav Kunnawalkam Elayavalli, Aug 18th 2014 to run in 72X
 //                                          , Oct 22nd 2014 to run in 73X
-//                                          , Dec 10th 2014 74X and adding the PF candidates information to easily detect  
-//                                                          the voronoi subtraction algorithm failure modes.  
+//                                          , Dec 10th 2014 74X and adding the
+//                                          PF candidates information to easily
+//                                          detect
+//                                                          the voronoi
+//                                                          subtraction
+//                                                          algorithm failure
+//                                                          modes.
 
 #include <cmath>
 #include <string>
 
+#include "DataFormats/CaloTowers/interface/CaloTower.h"
+#include "DataFormats/CaloTowers/interface/CaloTowerCollection.h"
+#include "DataFormats/Candidate/interface/Candidate.h"
+#include "DataFormats/Candidate/interface/CandidateFwd.h"
+#include "DataFormats/Candidate/interface/CandidateWithRef.h"
 #include "DataFormats/Common/interface/Handle.h"
+#include "DataFormats/JetReco/interface/BasicJet.h"
+#include "DataFormats/JetReco/interface/BasicJetCollection.h"
 #include "DataFormats/JetReco/interface/CaloJet.h"
 #include "DataFormats/JetReco/interface/CaloJetCollection.h"
 #include "DataFormats/JetReco/interface/GenJet.h"
@@ -22,15 +34,8 @@
 #include "DataFormats/JetReco/interface/JPTJet.h"
 #include "DataFormats/JetReco/interface/JPTJetCollection.h"
 #include "DataFormats/JetReco/interface/PFJet.h"
-#include "DataFormats/JetReco/interface/BasicJet.h"
-#include "DataFormats/JetReco/interface/BasicJetCollection.h"
-#include "DataFormats/CaloTowers/interface/CaloTower.h"
-#include "DataFormats/CaloTowers/interface/CaloTowerCollection.h"
-#include "DataFormats/Candidate/interface/Candidate.h"
-#include "DataFormats/Candidate/interface/CandidateFwd.h"
-#include "DataFormats/Candidate/interface/CandidateWithRef.h"
 
-// include the pf candidates 
+// include the pf candidates
 #include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
 // include the voronoi subtraction
 #include "DataFormats/HeavyIonEvent/interface/VoronoiBackground.h"
@@ -38,19 +43,19 @@
 // include the centrality variables
 #include "DataFormats/HeavyIonEvent/interface/Centrality.h"
 
-#include "DataFormats/Math/interface/deltaR.h"
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+#include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/METReco/interface/CaloMET.h"
 #include "DataFormats/METReco/interface/CaloMETCollection.h"
 #include "DataFormats/METReco/interface/GenMET.h"
 #include "DataFormats/METReco/interface/GenMETCollection.h"
 #include "DataFormats/METReco/interface/MET.h"
 #include "DataFormats/METReco/interface/METCollection.h"
+#include "DataFormats/Math/interface/deltaR.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
-#include "DataFormats/DetId/interface/DetId.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -59,8 +64,8 @@
 #include "FWCore/Utilities/interface/EDGetToken.h"
 #include "JetMETCorrections/Objects/interface/JetCorrector.h"
 #include "RecoJets/JetProducers/interface/JetMatchingTools.h"
-#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "SimDataFormats/GeneratorProducts/interface/GenEventInfoProduct.h"
+#include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 
 const Int_t MAXPARTICLE = 10000;
 const Double_t BarrelEta = 2.0;
@@ -70,27 +75,29 @@ const Double_t ForwardEta = 5.0;
 class MonitorElement;
 
 class JetTester_HeavyIons : public DQMEDAnalyzer {
- public:
-
-  explicit JetTester_HeavyIons (const edm::ParameterSet&);
+public:
+  explicit JetTester_HeavyIons(const edm::ParameterSet &);
   ~JetTester_HeavyIons() override;
 
-  void analyze(const edm::Event&, const edm::EventSetup&) override; 
-  //virtual void beginJob(); 
-  //virtual void endJob();
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  // virtual void beginJob();
+  // virtual void endJob();
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
-  //reco::Vertex::Point getVtx(const edm::Event& ev);
-
-  //double getEt(const DetID )
-
- private:
-  
-  void fillMatchHists(const double GenEta,  const double GenPhi,  const double GenPt,
-		      const double RecoEta, const double RecoPhi, const double RecoPt);
-  
-  edm::InputTag   mInputCollection;
-  edm::InputTag   mInputGenCollection;
-  edm::InputTag   mInputPFCandCollection;
+  // reco::Vertex::Point getVtx(const edm::Event& ev);
+
+  // double getEt(const DetID )
+
+private:
+  void fillMatchHists(const double GenEta,
+                      const double GenPhi,
+                      const double GenPt,
+                      const double RecoEta,
+                      const double RecoPhi,
+                      const double RecoPt);
+
+  edm::InputTag mInputCollection;
+  edm::InputTag mInputGenCollection;
+  edm::InputTag mInputPFCandCollection;
   // edm::InputTag   mInputCandCollection;
   // edm::InputTag   rhoTag;
   edm::InputTag centralityTag_;
@@ -99,37 +106,37 @@ class JetTester_HeavyIons : public DQMEDAnalyzer {
 
   edm::InputTag centralityBinTag_;
   edm::EDGetTokenT<int> centralityBinToken;
-  edm::Handle<int>centralityBin_;
-  
-  std::string     mOutputFile;
-  std::string     JetType;
-  std::string     UEAlgo;
-  edm::InputTag   Background;
-  double          mRecoJetPtThreshold;
-  double          mMatchGenPtThreshold;
-  double          mGenEnergyFractionThreshold;
-  double          mReverseEnergyFractionThreshold;
-  double          mRThreshold;
-  std::string     JetCorrectionService;
-
-  //Tokens
-  edm::EDGetTokenT<std::vector<reco::Vertex> > pvToken_;
-  edm::EDGetTokenT<CaloTowerCollection > caloTowersToken_;
+  edm::Handle<int> centralityBin_;
+
+  std::string mOutputFile;
+  std::string JetType;
+  std::string UEAlgo;
+  edm::InputTag Background;
+  double mRecoJetPtThreshold;
+  double mMatchGenPtThreshold;
+  double mGenEnergyFractionThreshold;
+  double mReverseEnergyFractionThreshold;
+  double mRThreshold;
+  std::string JetCorrectionService;
+
+  // Tokens
+  edm::EDGetTokenT<std::vector<reco::Vertex>> pvToken_;
+  edm::EDGetTokenT<CaloTowerCollection> caloTowersToken_;
   edm::EDGetTokenT<reco::CaloJetCollection> caloJetsToken_;
   edm::EDGetTokenT<reco::PFJetCollection> pfJetsToken_;
   edm::EDGetTokenT<reco::BasicJetCollection> basicJetsToken_;
   edm::EDGetTokenT<reco::JPTJetCollection> jptJetsToken_;
   edm::EDGetTokenT<reco::GenJetCollection> genJetsToken_;
   edm::EDGetTokenT<GenEventInfoProduct> evtToken_;
-  edm::EDGetTokenT<reco::PFCandidateCollection> pfCandToken_; 
+  edm::EDGetTokenT<reco::PFCandidateCollection> pfCandToken_;
   edm::EDGetTokenT<reco::CandidateView> pfCandViewToken_;
   edm::EDGetTokenT<reco::CandidateView> caloCandViewToken_;
-  //edm::EDGetTokenT<reco::VoronoiMap> backgrounds_;
+  // edm::EDGetTokenT<reco::VoronoiMap> backgrounds_;
   edm::EDGetTokenT<edm::ValueMap<reco::VoronoiBackground>> backgrounds_;
   edm::EDGetTokenT<std::vector<float>> backgrounds_value_;
-  edm::EDGetTokenT<std::vector<reco::Vertex> > hiVertexToken_;
-  
-  //Include Particle flow variables 
+  edm::EDGetTokenT<std::vector<reco::Vertex>> hiVertexToken_;
+
+  // Include Particle flow variables
   MonitorElement *mNPFpart;
   MonitorElement *mPFPt;
   MonitorElement *mPFEta;
@@ -163,8 +170,8 @@ class JetTester_HeavyIons : public DQMEDAnalyzer {
   MonitorElement *mSumSquaredCaloPt;
 
   // Event variables (including centrality)
-  MonitorElement* mNvtx;
-  MonitorElement* mHF;
+  MonitorElement *mNvtx;
+  MonitorElement *mHF;
 
   // new additions Jan 12th 2015
   MonitorElement *mSumPFVsPt_HF;
@@ -177,7 +184,6 @@ class JetTester_HeavyIons : public DQMEDAnalyzer {
   MonitorElement *mSumCaloVsPtInitial_HF;
   MonitorElement *mSumCaloPt_HF;
 
-  
   MonitorElement *mSumPFVsPtInitial_n5p191_n2p650;
   MonitorElement *mSumPFVsPtInitial_n2p650_n2p043;
   MonitorElement *mSumPFVsPtInitial_n2p043_n1p740;
@@ -225,8 +231,7 @@ class JetTester_HeavyIons : public DQMEDAnalyzer {
   MonitorElement *mSumPFPt_1p740_2p043;
   MonitorElement *mSumPFPt_2p043_2p650;
   MonitorElement *mSumPFPt_2p650_5p191;
-  
-  
+
   MonitorElement *mSumCaloVsPtInitial_n5p191_n2p650;
   MonitorElement *mSumCaloVsPtInitial_n2p650_n2p043;
   MonitorElement *mSumCaloVsPtInitial_n2p043_n1p740;
@@ -274,209 +279,206 @@ class JetTester_HeavyIons : public DQMEDAnalyzer {
   MonitorElement *mSumCaloPt_1p740_2p043;
   MonitorElement *mSumCaloPt_2p043_2p650;
   MonitorElement *mSumCaloPt_2p650_5p191;
-  
+
   // Jet parameters
-  MonitorElement* mEta;
-  MonitorElement* mPhi;
-  MonitorElement* mPt;
-  MonitorElement* mP;
-  MonitorElement* mEnergy;
-  MonitorElement* mMass;
-  MonitorElement* mConstituents;
-  MonitorElement* mJetArea;
-  MonitorElement* mjetpileup;
-  MonitorElement* mNJets;
-  MonitorElement* mNJets_40;
+  MonitorElement *mEta;
+  MonitorElement *mPhi;
+  MonitorElement *mPt;
+  MonitorElement *mP;
+  MonitorElement *mEnergy;
+  MonitorElement *mMass;
+  MonitorElement *mConstituents;
+  MonitorElement *mJetArea;
+  MonitorElement *mjetpileup;
+  MonitorElement *mNJets;
+  MonitorElement *mNJets_40;
 
   // histograms added on Oct 27th to study the gen-reco
-  MonitorElement* mGenEta;
-  MonitorElement* mGenPhi;
-  MonitorElement* mGenPt;
-  MonitorElement* mPtHat;
-
-  MonitorElement* mPtRecoOverGen_B_20_30_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_E_20_30_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_F_20_30_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_B_30_50_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_E_30_50_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_F_30_50_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_B_50_80_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_E_50_80_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_F_50_80_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_B_80_120_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_E_80_120_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_F_80_120_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_B_120_180_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_E_120_180_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_F_120_180_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_B_180_300_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_E_180_300_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_F_180_300_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_B_300_Inf_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_E_300_Inf_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_F_300_Inf_Cent_0_10;
-  
-  MonitorElement* mPtRecoOverGen_B_20_30_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_E_20_30_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_F_20_30_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_B_30_50_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_E_30_50_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_F_30_50_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_B_50_80_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_E_50_80_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_F_50_80_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_B_80_120_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_E_80_120_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_F_80_120_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_B_120_180_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_E_120_180_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_F_120_180_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_B_180_300_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_E_180_300_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_F_180_300_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_B_300_Inf_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_E_300_Inf_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_F_300_Inf_Cent_10_30;
-
-  MonitorElement* mPtRecoOverGen_B_20_30_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_E_20_30_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_F_20_30_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_B_30_50_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_E_30_50_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_F_30_50_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_B_50_80_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_E_50_80_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_F_50_80_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_B_80_120_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_E_80_120_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_F_80_120_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_B_120_180_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_E_120_180_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_F_120_180_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_B_180_300_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_E_180_300_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_F_180_300_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_B_300_Inf_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_E_300_Inf_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_F_300_Inf_Cent_30_50;
-
-  MonitorElement* mPtRecoOverGen_B_20_30_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_E_20_30_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_F_20_30_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_B_30_50_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_E_30_50_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_F_30_50_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_B_50_80_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_E_50_80_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_F_50_80_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_B_80_120_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_E_80_120_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_F_80_120_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_B_120_180_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_E_120_180_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_F_120_180_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_B_180_300_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_E_180_300_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_F_180_300_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_B_300_Inf_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_E_300_Inf_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_F_300_Inf_Cent_50_80;
+  MonitorElement *mGenEta;
+  MonitorElement *mGenPhi;
+  MonitorElement *mGenPt;
+  MonitorElement *mPtHat;
+
+  MonitorElement *mPtRecoOverGen_B_20_30_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_E_20_30_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_F_20_30_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_B_30_50_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_E_30_50_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_F_30_50_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_B_50_80_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_E_50_80_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_F_50_80_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_B_80_120_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_E_80_120_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_F_80_120_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_B_120_180_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_E_120_180_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_F_120_180_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_B_180_300_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_E_180_300_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_F_180_300_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_B_300_Inf_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_E_300_Inf_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_F_300_Inf_Cent_0_10;
+
+  MonitorElement *mPtRecoOverGen_B_20_30_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_E_20_30_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_F_20_30_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_B_30_50_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_E_30_50_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_F_30_50_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_B_50_80_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_E_50_80_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_F_50_80_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_B_80_120_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_E_80_120_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_F_80_120_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_B_120_180_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_E_120_180_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_F_120_180_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_B_180_300_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_E_180_300_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_F_180_300_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_B_300_Inf_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_E_300_Inf_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_F_300_Inf_Cent_10_30;
+
+  MonitorElement *mPtRecoOverGen_B_20_30_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_E_20_30_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_F_20_30_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_B_30_50_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_E_30_50_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_F_30_50_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_B_50_80_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_E_50_80_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_F_50_80_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_B_80_120_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_E_80_120_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_F_80_120_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_B_120_180_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_E_120_180_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_F_120_180_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_B_180_300_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_E_180_300_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_F_180_300_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_B_300_Inf_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_E_300_Inf_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_F_300_Inf_Cent_30_50;
+
+  MonitorElement *mPtRecoOverGen_B_20_30_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_E_20_30_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_F_20_30_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_B_30_50_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_E_30_50_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_F_30_50_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_B_50_80_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_E_50_80_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_F_50_80_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_B_80_120_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_E_80_120_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_F_80_120_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_B_120_180_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_E_120_180_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_F_120_180_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_B_180_300_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_E_180_300_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_F_180_300_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_B_300_Inf_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_E_300_Inf_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_F_300_Inf_Cent_50_80;
 
   // generation profiles
-  MonitorElement* mPtRecoOverGen_GenPt_B_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_GenPt_E_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_GenPt_F_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_GenPt_B_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_GenPt_E_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_GenPt_F_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_GenPt_B_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_GenPt_E_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_GenPt_F_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_GenPt_B_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_GenPt_E_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_GenPt_F_Cent_50_80;
-
-  MonitorElement* mPtRecoOverGen_GenEta_20_30_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_GenEta_30_50_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_GenEta_50_80_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_GenEta_80_120_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_GenEta_120_180_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_GenEta_180_300_Cent_0_10;
-  MonitorElement* mPtRecoOverGen_GenEta_300_Inf_Cent_0_10;
-
-  MonitorElement* mPtRecoOverGen_GenEta_20_30_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_GenEta_30_50_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_GenEta_50_80_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_GenEta_80_120_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_GenEta_120_180_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_GenEta_180_300_Cent_10_30;
-  MonitorElement* mPtRecoOverGen_GenEta_300_Inf_Cent_10_30;
-
-  MonitorElement* mPtRecoOverGen_GenEta_20_30_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_GenEta_30_50_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_GenEta_50_80_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_GenEta_80_120_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_GenEta_120_180_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_GenEta_180_300_Cent_30_50;
-  MonitorElement* mPtRecoOverGen_GenEta_300_Inf_Cent_30_50;
-  
-  MonitorElement* mPtRecoOverGen_GenEta_20_30_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_GenEta_30_50_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_GenEta_50_80_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_GenEta_80_120_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_GenEta_120_180_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_GenEta_180_300_Cent_50_80;
-  MonitorElement* mPtRecoOverGen_GenEta_300_Inf_Cent_50_80;
-  
-  MonitorElement* mPFCandpT_vs_eta_Unknown; // pf id 0
-  MonitorElement* mPFCandpT_vs_eta_ChargedHadron; // pf id - 1 
-  MonitorElement* mPFCandpT_vs_eta_electron; // pf id - 2
-  MonitorElement* mPFCandpT_vs_eta_muon; // pf id - 3
-  MonitorElement* mPFCandpT_vs_eta_photon; // pf id - 4
-  MonitorElement* mPFCandpT_vs_eta_NeutralHadron; // pf id - 5
-  MonitorElement* mPFCandpT_vs_eta_HadE_inHF; // pf id - 6
-  MonitorElement* mPFCandpT_vs_eta_EME_inHF; // pf id - 7
-  
-  MonitorElement* mPFCandpT_Barrel_Unknown; // pf id 0
-  MonitorElement* mPFCandpT_Barrel_ChargedHadron; // pf id - 1 
-  MonitorElement* mPFCandpT_Barrel_electron; // pf id - 2
-  MonitorElement* mPFCandpT_Barrel_muon; // pf id - 3
-  MonitorElement* mPFCandpT_Barrel_photon; // pf id - 4
-  MonitorElement* mPFCandpT_Barrel_NeutralHadron; // pf id - 5
-  MonitorElement* mPFCandpT_Barrel_HadE_inHF; // pf id - 6
-  MonitorElement* mPFCandpT_Barrel_EME_inHF; // pf id - 7
-
-  MonitorElement* mPFCandpT_Endcap_Unknown; // pf id 0
-  MonitorElement* mPFCandpT_Endcap_ChargedHadron; // pf id - 1 
-  MonitorElement* mPFCandpT_Endcap_electron; // pf id - 2
-  MonitorElement* mPFCandpT_Endcap_muon; // pf id - 3
-  MonitorElement* mPFCandpT_Endcap_photon; // pf id - 4
-  MonitorElement* mPFCandpT_Endcap_NeutralHadron; // pf id - 5
-  MonitorElement* mPFCandpT_Endcap_HadE_inHF; // pf id - 6
-  MonitorElement* mPFCandpT_Endcap_EME_inHF; // pf id - 7
-
-  MonitorElement* mPFCandpT_Forward_Unknown; // pf id 0
-  MonitorElement* mPFCandpT_Forward_ChargedHadron; // pf id - 1 
-  MonitorElement* mPFCandpT_Forward_electron; // pf id - 2
-  MonitorElement* mPFCandpT_Forward_muon; // pf id - 3
-  MonitorElement* mPFCandpT_Forward_photon; // pf id - 4
-  MonitorElement* mPFCandpT_Forward_NeutralHadron; // pf id - 5
-  MonitorElement* mPFCandpT_Forward_HadE_inHF; // pf id - 6
-  MonitorElement* mPFCandpT_Forward_EME_inHF; // pf id - 7
-  
- 
+  MonitorElement *mPtRecoOverGen_GenPt_B_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_GenPt_E_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_GenPt_F_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_GenPt_B_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_GenPt_E_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_GenPt_F_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_GenPt_B_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_GenPt_E_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_GenPt_F_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_GenPt_B_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_GenPt_E_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_GenPt_F_Cent_50_80;
+
+  MonitorElement *mPtRecoOverGen_GenEta_20_30_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_GenEta_30_50_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_GenEta_50_80_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_GenEta_80_120_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_GenEta_120_180_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_GenEta_180_300_Cent_0_10;
+  MonitorElement *mPtRecoOverGen_GenEta_300_Inf_Cent_0_10;
+
+  MonitorElement *mPtRecoOverGen_GenEta_20_30_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_GenEta_30_50_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_GenEta_50_80_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_GenEta_80_120_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_GenEta_120_180_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_GenEta_180_300_Cent_10_30;
+  MonitorElement *mPtRecoOverGen_GenEta_300_Inf_Cent_10_30;
+
+  MonitorElement *mPtRecoOverGen_GenEta_20_30_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_GenEta_30_50_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_GenEta_50_80_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_GenEta_80_120_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_GenEta_120_180_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_GenEta_180_300_Cent_30_50;
+  MonitorElement *mPtRecoOverGen_GenEta_300_Inf_Cent_30_50;
+
+  MonitorElement *mPtRecoOverGen_GenEta_20_30_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_GenEta_30_50_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_GenEta_50_80_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_GenEta_80_120_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_GenEta_120_180_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_GenEta_180_300_Cent_50_80;
+  MonitorElement *mPtRecoOverGen_GenEta_300_Inf_Cent_50_80;
+
+  MonitorElement *mPFCandpT_vs_eta_Unknown;        // pf id 0
+  MonitorElement *mPFCandpT_vs_eta_ChargedHadron;  // pf id - 1
+  MonitorElement *mPFCandpT_vs_eta_electron;       // pf id - 2
+  MonitorElement *mPFCandpT_vs_eta_muon;           // pf id - 3
+  MonitorElement *mPFCandpT_vs_eta_photon;         // pf id - 4
+  MonitorElement *mPFCandpT_vs_eta_NeutralHadron;  // pf id - 5
+  MonitorElement *mPFCandpT_vs_eta_HadE_inHF;      // pf id - 6
+  MonitorElement *mPFCandpT_vs_eta_EME_inHF;       // pf id - 7
+
+  MonitorElement *mPFCandpT_Barrel_Unknown;        // pf id 0
+  MonitorElement *mPFCandpT_Barrel_ChargedHadron;  // pf id - 1
+  MonitorElement *mPFCandpT_Barrel_electron;       // pf id - 2
+  MonitorElement *mPFCandpT_Barrel_muon;           // pf id - 3
+  MonitorElement *mPFCandpT_Barrel_photon;         // pf id - 4
+  MonitorElement *mPFCandpT_Barrel_NeutralHadron;  // pf id - 5
+  MonitorElement *mPFCandpT_Barrel_HadE_inHF;      // pf id - 6
+  MonitorElement *mPFCandpT_Barrel_EME_inHF;       // pf id - 7
+
+  MonitorElement *mPFCandpT_Endcap_Unknown;        // pf id 0
+  MonitorElement *mPFCandpT_Endcap_ChargedHadron;  // pf id - 1
+  MonitorElement *mPFCandpT_Endcap_electron;       // pf id - 2
+  MonitorElement *mPFCandpT_Endcap_muon;           // pf id - 3
+  MonitorElement *mPFCandpT_Endcap_photon;         // pf id - 4
+  MonitorElement *mPFCandpT_Endcap_NeutralHadron;  // pf id - 5
+  MonitorElement *mPFCandpT_Endcap_HadE_inHF;      // pf id - 6
+  MonitorElement *mPFCandpT_Endcap_EME_inHF;       // pf id - 7
+
+  MonitorElement *mPFCandpT_Forward_Unknown;        // pf id 0
+  MonitorElement *mPFCandpT_Forward_ChargedHadron;  // pf id - 1
+  MonitorElement *mPFCandpT_Forward_electron;       // pf id - 2
+  MonitorElement *mPFCandpT_Forward_muon;           // pf id - 3
+  MonitorElement *mPFCandpT_Forward_photon;         // pf id - 4
+  MonitorElement *mPFCandpT_Forward_NeutralHadron;  // pf id - 5
+  MonitorElement *mPFCandpT_Forward_HadE_inHF;      // pf id - 6
+  MonitorElement *mPFCandpT_Forward_EME_inHF;       // pf id - 7
+
   // Parameters
 
-  bool            isCaloJet;
-  bool            isJPTJet;
-  bool            isPFJet;
+  bool isCaloJet;
+  bool isJPTJet;
+  bool isPFJet;
 
   static const Int_t fourierOrder_ = 5;
   static const Int_t etaBins_ = 15;
 
   static const size_t nedge_pseudorapidity = etaBins_ + 1;
-
-
 };
 
 #endif
diff --git a/Validation/RecoJets/plugins/SealModule.cc b/Validation/RecoJets/plugins/SealModule.cc
index bfd903d113f6e..7cb6c7f3e1aa2 100644
--- a/Validation/RecoJets/plugins/SealModule.cc
+++ b/Validation/RecoJets/plugins/SealModule.cc
@@ -1,10 +1,10 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 
 #include "JetTester.h"
 #include "JetTesterPostProcessor.h"
 #include "JetTester_HeavyIons.h"
 
-DEFINE_FWK_MODULE( JetTester );
-DEFINE_FWK_MODULE( JetTesterPostProcessor );
-DEFINE_FWK_MODULE( JetTester_HeavyIons );
+DEFINE_FWK_MODULE(JetTester);
+DEFINE_FWK_MODULE(JetTesterPostProcessor);
+DEFINE_FWK_MODULE(JetTester_HeavyIons);
diff --git a/Validation/RecoMET/plugins/METTester.cc b/Validation/RecoMET/plugins/METTester.cc
index 52ee6bbbbc9eb..f041a45206a4d 100644
--- a/Validation/RecoMET/plugins/METTester.cc
+++ b/Validation/RecoMET/plugins/METTester.cc
@@ -9,12 +9,13 @@
 //        added configuration params
 // modification: Mike Schmitt
 // date:  02.28.2007
-// note:  code rewrite. Now uses STL map for monitoring element container. 
+// note:  code rewrite. Now uses STL map for monitoring element container.
 // modification: Bobby Scurlock
 // date:  04.03.2007
-// note:  Eliminated automated resolution fitting. This is now done in a ROOT script.
+// note:  Eliminated automated resolution fitting. This is now done in a ROOT
+// script.
 
-// date:  02.04.2009 
+// date:  02.04.2009
 // note:  Added option to use fine binning or course binning for histos
 //
 // modification: Samantha Hewamanage, Florida International University
@@ -29,237 +30,255 @@ using namespace reco;
 using namespace std;
 using namespace edm;
 
-METTester::METTester(const edm::ParameterSet& iConfig)
-{
-
-  inputMETLabel_           =iConfig.getParameter<edm::InputTag>("InputMETLabel");
-  METType_                 =iConfig.getUntrackedParameter<std::string>("METType");
+METTester::METTester(const edm::ParameterSet &iConfig) {
+  inputMETLabel_ = iConfig.getParameter<edm::InputTag>("InputMETLabel");
+  METType_ = iConfig.getUntrackedParameter<std::string>("METType");
 
   std::string inputMETCollectionLabel(inputMETLabel_.label());
 
-  isCaloMET = (std::string("calo")==METType_);
-  isPFMET   = (std::string("pf")  ==METType_);
-  isGenMET  = (std::string("gen") ==METType_);
-  isMiniAODMET  = (std::string("miniaod") ==METType_);
-
-  pvToken_ = consumes<std::vector<reco::Vertex> >(iConfig.getParameter<edm::InputTag>("PrimaryVertices"));
-  if (isCaloMET)  caloMETsToken_ = consumes<reco::CaloMETCollection> (inputMETLabel_);
-  if (isPFMET)    pfMETsToken_ = consumes<reco::PFMETCollection> (inputMETLabel_); 
-  if(isMiniAODMET) patMETToken_ = consumes<pat::METCollection> (inputMETLabel_);
-  if (isGenMET)   genMETsToken_ = consumes<reco::GenMETCollection> (inputMETLabel_); 
-  if(!isMiniAODMET){
-    genMETsTrueToken_ = consumes<reco::GenMETCollection> (edm::InputTag("genMetTrue"));
-    genMETsCaloToken_ = consumes<reco::GenMETCollection> (edm::InputTag("genMetCalo"));
+  isCaloMET = (std::string("calo") == METType_);
+  isPFMET = (std::string("pf") == METType_);
+  isGenMET = (std::string("gen") == METType_);
+  isMiniAODMET = (std::string("miniaod") == METType_);
+
+  pvToken_ = consumes<std::vector<reco::Vertex>>(iConfig.getParameter<edm::InputTag>("PrimaryVertices"));
+  if (isCaloMET)
+    caloMETsToken_ = consumes<reco::CaloMETCollection>(inputMETLabel_);
+  if (isPFMET)
+    pfMETsToken_ = consumes<reco::PFMETCollection>(inputMETLabel_);
+  if (isMiniAODMET)
+    patMETToken_ = consumes<pat::METCollection>(inputMETLabel_);
+  if (isGenMET)
+    genMETsToken_ = consumes<reco::GenMETCollection>(inputMETLabel_);
+  if (!isMiniAODMET) {
+    genMETsTrueToken_ = consumes<reco::GenMETCollection>(edm::InputTag("genMetTrue"));
+    genMETsCaloToken_ = consumes<reco::GenMETCollection>(edm::InputTag("genMetCalo"));
   }
 
-  //Events variables
-  mNvertex               = nullptr;
-
-  //Common variables
-  mMEx                         = nullptr;
-  mMEy                         = nullptr;
-  mMETSig                      = nullptr;
-  mMET                         = nullptr;
-  mMETFine                     = nullptr;
-  mMET_Nvtx                    = nullptr;
-  mMETPhi                      = nullptr;
-  mSumET                       = nullptr;
-  mMETDifference_GenMETTrue    = nullptr;
-  mMETDeltaPhi_GenMETTrue      = nullptr;
-  mMETDifference_GenMETCalo    = nullptr;
-  mMETDeltaPhi_GenMETCalo      = nullptr;
-  
+  // Events variables
+  mNvertex = nullptr;
+
+  // Common variables
+  mMEx = nullptr;
+  mMEy = nullptr;
+  mMETSig = nullptr;
+  mMET = nullptr;
+  mMETFine = nullptr;
+  mMET_Nvtx = nullptr;
+  mMETPhi = nullptr;
+  mSumET = nullptr;
+  mMETDifference_GenMETTrue = nullptr;
+  mMETDeltaPhi_GenMETTrue = nullptr;
+  mMETDifference_GenMETCalo = nullptr;
+  mMETDeltaPhi_GenMETCalo = nullptr;
+
   // MET Uncertainities: Only for MiniAOD
-  mMETUnc_JetResUp  =  nullptr;
-  mMETUnc_JetResDown  =  nullptr;
-  mMETUnc_JetEnUp  =  nullptr;
-  mMETUnc_JetEnDown  =  nullptr;
-  mMETUnc_MuonEnUp  =  nullptr;
-  mMETUnc_MuonEnDown  =  nullptr;
-  mMETUnc_ElectronEnUp  =  nullptr;
-  mMETUnc_ElectronEnDown  =  nullptr;
-  mMETUnc_TauEnUp  =  nullptr;
-  mMETUnc_TauEnDown  =  nullptr;
-  mMETUnc_UnclusteredEnUp  =  nullptr;
-  mMETUnc_UnclusteredEnDown  =  nullptr;
-  mMETUnc_PhotonEnUp  =  nullptr;
-  mMETUnc_PhotonEnDown  =  nullptr;
-  
-
-  //CaloMET variables
-  mCaloMaxEtInEmTowers             = nullptr;
-  mCaloMaxEtInHadTowers            = nullptr;
-  mCaloEtFractionHadronic          = nullptr;
-  mCaloEmEtFraction                = nullptr;
-  mCaloHadEtInHB                   = nullptr;
-  mCaloHadEtInHO                   = nullptr;
-  mCaloHadEtInHE                   = nullptr;
-  mCaloHadEtInHF                   = nullptr;
-  mCaloEmEtInHF                    = nullptr;
-  mCaloSETInpHF                    = nullptr;
-  mCaloSETInmHF                    = nullptr;
-  mCaloEmEtInEE                    = nullptr;
-  mCaloEmEtInEB                    = nullptr;
-
-
-  //GenMET variables
-  mNeutralEMEtFraction=nullptr;
-  mNeutralHadEtFraction=nullptr;
-  mChargedEMEtFraction=nullptr;
-  mChargedHadEtFraction=nullptr;
-  mMuonEtFraction=nullptr; 
-  mInvisibleEtFraction=nullptr;
-  
-  //MET variables
-  
-  //PFMET variables
-  mMETDifference_GenMETTrue_MET0to20=nullptr;
-  mMETDifference_GenMETTrue_MET20to40=nullptr;
-  mMETDifference_GenMETTrue_MET40to60=nullptr;
-  mMETDifference_GenMETTrue_MET60to80=nullptr;
-  mMETDifference_GenMETTrue_MET80to100=nullptr;
-  mMETDifference_GenMETTrue_MET100to150=nullptr;
-  mMETDifference_GenMETTrue_MET150to200=nullptr;
-  mMETDifference_GenMETTrue_MET200to300=nullptr;
-  mMETDifference_GenMETTrue_MET300to400=nullptr;
-  mMETDifference_GenMETTrue_MET400to500=nullptr;
-  mMETDifference_GenMETTrue_MET500=nullptr;
-  
- 
-} 
-void METTester::bookHistograms(DQMStore::IBooker & ibooker,
-			       edm::Run const & iRun,
-			       edm::EventSetup const & /* iSetup */)
-{
-    ibooker.setCurrentFolder("JetMET/METValidation/"+inputMETLabel_.label()) ;
-
-    mNvertex                     = ibooker.book1D("Nvertex","Nvertex",80,0,80);
-    mMEx                         = ibooker.book1D("MEx","MEx",160,-800,800); 
-    mMEy                         = ibooker.book1D("MEy","MEy",160,-800,800);
-    mMETSig                      = ibooker.book1D("METSig","METSig",25,0,24.5);
-    mMET                         = ibooker.book1D("MET", "MET (20 GeV binning)"           , 100,0,2000);
-    mMETFine                     = ibooker.book1D("METFine", "MET (2 GeV binning)"        , 1000,0,2000);
-    mMET_Nvtx                    = ibooker.bookProfile("MET_Nvtx", "MET vs. nvtx",    60, 0., 60., 0., 2000., " ");
-    mMETPhi                      = ibooker.book1D("METPhi","METPhi",80,-4,4);
-    mSumET                       = ibooker.book1D("SumET"            , "SumET"            , 200,0,4000);   //10GeV
-    mMETDifference_GenMETTrue    = ibooker.book1D("METDifference_GenMETTrue","METDifference_GenMETTrue", 500,-500,500); 
-    mMETDeltaPhi_GenMETTrue      = ibooker.book1D("METDeltaPhi_GenMETTrue","METDeltaPhi_GenMETTrue", 80,0,4); 
-
-    if(isMiniAODMET){
-      mMETUnc_JetResUp               = ibooker.book1D("METUnc_JetResUp",               "METUnc_JetResUp",                200,    -10, 10);
-      mMETUnc_JetResDown             = ibooker.book1D("METUnc_JetResDown",             "METUnc_JetResDown",              200,    -10, 10);
-      mMETUnc_JetEnUp                = ibooker.book1D("METUnc_JetEnUp",                "METUnc_JetEnUp",                 200,    -10, 10);
-      mMETUnc_JetEnDown              = ibooker.book1D("METUnc_JetEnDown",              "METUnc_JetEnDown",               200,    -10, 10);
-      mMETUnc_MuonEnUp               = ibooker.book1D("METUnc_MuonEnUp",               "METUnc_MuonEnUp",                200,    -10, 10);
-      mMETUnc_MuonEnDown             = ibooker.book1D("METUnc_MuonEnDown",             "METUnc_MuonEnDown",              200,    -10, 10);
-      mMETUnc_ElectronEnUp           = ibooker.book1D("METUnc_ElectronEnUp",           "METUnc_ElectronEnUp",            200,    -10, 10);
-      mMETUnc_ElectronEnDown         = ibooker.book1D("METUnc_ElectronEnDown",         "METUnc_ElectronEnDown",          200,    -10, 10);
-      mMETUnc_TauEnUp                = ibooker.book1D("METUnc_TauEnUp",                "METUnc_TauEnUp",                 200,    -10, 10);
-      mMETUnc_TauEnDown              = ibooker.book1D("METUnc_TauEnDown",              "METUnc_TauEnDown",               200,    -10, 10);
-      mMETUnc_UnclusteredEnUp        = ibooker.book1D("METUnc_UnclusteredEnUp",        "METUnc_UnclusteredEnUp",         200,    -10, 10);
-      mMETUnc_UnclusteredEnDown      = ibooker.book1D("METUnc_UnclusteredEnDown",      "METUnc_UnclusteredEnDown",       200,    -10, 10);
-      mMETUnc_PhotonEnUp             = ibooker.book1D("METUnc_UnclusteredEnDown",      "METUnc_UnclusteredEnDown",       200,    -10, 10);
-      mMETUnc_PhotonEnDown           = ibooker.book1D("METUnc_PhotonEnDown",           "METUnc_PhotonEnDown",            200,    -10, 10);
-      
-    }
-    if(!isMiniAODMET){
-      mMETDifference_GenMETCalo    = ibooker.book1D("METDifference_GenMETCalo","METDifference_GenMETCalo", 500,-500,500); 
-      mMETDeltaPhi_GenMETCalo      = ibooker.book1D("METDeltaPhi_GenMETCalo","METDeltaPhi_GenMETCalo", 80,0,4); 
-    }
-    if(!isGenMET){
-      mMETDifference_GenMETTrue_MET0to20    = ibooker.book1D("METResolution_GenMETTrue_MET0to20"   , "METResolution_GenMETTrue_MET0to20"   , 500,-500,500); 
-      mMETDifference_GenMETTrue_MET20to40   = ibooker.book1D("METResolution_GenMETTrue_MET20to40"  , "METResolution_GenMETTrue_MET20to40"  , 500,-500,500); 
-      mMETDifference_GenMETTrue_MET40to60   = ibooker.book1D("METResolution_GenMETTrue_MET40to60"  , "METResolution_GenMETTrue_MET40to60"  , 500,-500,500); 
-      mMETDifference_GenMETTrue_MET60to80   = ibooker.book1D("METResolution_GenMETTrue_MET60to80"  , "METResolution_GenMETTrue_MET60to80"  , 500,-500,500); 
-      mMETDifference_GenMETTrue_MET80to100  = ibooker.book1D("METResolution_GenMETTrue_MET80to100" , "METResolution_GenMETTrue_MET80to100" , 500,-500,500); 
-      mMETDifference_GenMETTrue_MET100to150 = ibooker.book1D("METResolution_GenMETTrue_MET100to150", "METResolution_GenMETTrue_MET100to150", 500,-500,500); 
-      mMETDifference_GenMETTrue_MET150to200 = ibooker.book1D("METResolution_GenMETTrue_MET150to200", "METResolution_GenMETTrue_MET150to200", 500,-500,500); 
-      mMETDifference_GenMETTrue_MET200to300 = ibooker.book1D("METResolution_GenMETTrue_MET200to300", "METResolution_GenMETTrue_MET200to300", 500,-500,500); 
-      mMETDifference_GenMETTrue_MET300to400 = ibooker.book1D("METResolution_GenMETTrue_MET300to400", "METResolution_GenMETTrue_MET300to400", 500,-500,500); 
-      mMETDifference_GenMETTrue_MET400to500 = ibooker.book1D("METResolution_GenMETTrue_MET400to500", "METResolution_GenMETTrue_MET400to500", 500,-500,500); 
-      mMETDifference_GenMETTrue_MET500      = ibooker.book1D("METResolution_GenMETTrue_MET500", "METResolution_GenMETTrue_MET500", 500,-500,500);  
-    }
-    if ( isCaloMET) { 
-      mCaloMaxEtInEmTowers             = ibooker.book1D("CaloMaxEtInEmTowers","CaloMaxEtInEmTowers",300,0,1500);   //5GeV
-      mCaloMaxEtInHadTowers            = ibooker.book1D("CaloMaxEtInHadTowers","CaloMaxEtInHadTowers",300,0,1500);  //5GeV
-      mCaloEtFractionHadronic          = ibooker.book1D("CaloEtFractionHadronic","CaloEtFractionHadronic",100,0,1);
-      mCaloEmEtFraction                = ibooker.book1D("CaloEmEtFraction","CaloEmEtFraction",100,0,1);
-      mCaloHadEtInHB                   = ibooker.book1D("CaloHadEtInHB","CaloHadEtInHB", 200, 0, 2000);  //5GeV  
-      mCaloHadEtInHE                   = ibooker.book1D("CaloHadEtInHE","CaloHadEtInHE", 100, 0, 500);  //5GeV
-      mCaloHadEtInHO                   = ibooker.book1D("CaloHadEtInHO","CaloHadEtInHO", 100, 0, 200);  //5GeV
-      mCaloHadEtInHF                   = ibooker.book1D("CaloHadEtInHF","CaloHadEtInHF", 100, 0, 200);  //5GeV
-      mCaloSETInpHF                    = ibooker.book1D("CaloSETInpHF","CaloSETInpHF",100, 0, 500);
-      mCaloSETInmHF                    = ibooker.book1D("CaloSETInmHF","CaloSETInmHF",100, 0, 500);
-      mCaloEmEtInEE                    = ibooker.book1D("CaloEmEtInEE","CaloEmEtInEE",100, 0, 500);    //5GeV
-      mCaloEmEtInEB                    = ibooker.book1D("CaloEmEtInEB","CaloEmEtInEB",100, 0, 500);   //5GeV
-      mCaloEmEtInHF                    = ibooker.book1D("CaloEmEtInHF","CaloEmEtInHF",100, 0, 500);   //5GeV
-    } 
-
-    if(isGenMET){        
-      mNeutralEMEtFraction    = ibooker.book1D("GenNeutralEMEtFraction", "GenNeutralEMEtFraction", 120, 0.0, 1.2 );
-      mNeutralHadEtFraction   = ibooker.book1D("GenNeutralHadEtFraction", "GenNeutralHadEtFraction", 120, 0.0, 1.2 );
-      mChargedEMEtFraction    = ibooker.book1D("GenChargedEMEtFraction", "GenChargedEMEtFraction", 120, 0.0, 1.2);
-      mChargedHadEtFraction   = ibooker.book1D("GenChargedHadEtFraction", "GenChargedHadEtFraction", 120, 0.0,1.2);
-      mMuonEtFraction         = ibooker.book1D("GenMuonEtFraction", "GenMuonEtFraction", 120, 0.0, 1.2 );
-      mInvisibleEtFraction    = ibooker.book1D("GenInvisibleEtFraction", "GenInvisibleEtFraction", 120, 0.0, 1.2 );
-    }
+  mMETUnc_JetResUp = nullptr;
+  mMETUnc_JetResDown = nullptr;
+  mMETUnc_JetEnUp = nullptr;
+  mMETUnc_JetEnDown = nullptr;
+  mMETUnc_MuonEnUp = nullptr;
+  mMETUnc_MuonEnDown = nullptr;
+  mMETUnc_ElectronEnUp = nullptr;
+  mMETUnc_ElectronEnDown = nullptr;
+  mMETUnc_TauEnUp = nullptr;
+  mMETUnc_TauEnDown = nullptr;
+  mMETUnc_UnclusteredEnUp = nullptr;
+  mMETUnc_UnclusteredEnDown = nullptr;
+  mMETUnc_PhotonEnUp = nullptr;
+  mMETUnc_PhotonEnDown = nullptr;
+
+  // CaloMET variables
+  mCaloMaxEtInEmTowers = nullptr;
+  mCaloMaxEtInHadTowers = nullptr;
+  mCaloEtFractionHadronic = nullptr;
+  mCaloEmEtFraction = nullptr;
+  mCaloHadEtInHB = nullptr;
+  mCaloHadEtInHO = nullptr;
+  mCaloHadEtInHE = nullptr;
+  mCaloHadEtInHF = nullptr;
+  mCaloEmEtInHF = nullptr;
+  mCaloSETInpHF = nullptr;
+  mCaloSETInmHF = nullptr;
+  mCaloEmEtInEE = nullptr;
+  mCaloEmEtInEB = nullptr;
+
+  // GenMET variables
+  mNeutralEMEtFraction = nullptr;
+  mNeutralHadEtFraction = nullptr;
+  mChargedEMEtFraction = nullptr;
+  mChargedHadEtFraction = nullptr;
+  mMuonEtFraction = nullptr;
+  mInvisibleEtFraction = nullptr;
+
+  // MET variables
+
+  // PFMET variables
+  mMETDifference_GenMETTrue_MET0to20 = nullptr;
+  mMETDifference_GenMETTrue_MET20to40 = nullptr;
+  mMETDifference_GenMETTrue_MET40to60 = nullptr;
+  mMETDifference_GenMETTrue_MET60to80 = nullptr;
+  mMETDifference_GenMETTrue_MET80to100 = nullptr;
+  mMETDifference_GenMETTrue_MET100to150 = nullptr;
+  mMETDifference_GenMETTrue_MET150to200 = nullptr;
+  mMETDifference_GenMETTrue_MET200to300 = nullptr;
+  mMETDifference_GenMETTrue_MET300to400 = nullptr;
+  mMETDifference_GenMETTrue_MET400to500 = nullptr;
+  mMETDifference_GenMETTrue_MET500 = nullptr;
+}
+void METTester::bookHistograms(DQMStore::IBooker &ibooker, edm::Run const &iRun, edm::EventSetup const & /* iSetup */) {
+  ibooker.setCurrentFolder("JetMET/METValidation/" + inputMETLabel_.label());
+
+  mNvertex = ibooker.book1D("Nvertex", "Nvertex", 80, 0, 80);
+  mMEx = ibooker.book1D("MEx", "MEx", 160, -800, 800);
+  mMEy = ibooker.book1D("MEy", "MEy", 160, -800, 800);
+  mMETSig = ibooker.book1D("METSig", "METSig", 25, 0, 24.5);
+  mMET = ibooker.book1D("MET", "MET (20 GeV binning)", 100, 0, 2000);
+  mMETFine = ibooker.book1D("METFine", "MET (2 GeV binning)", 1000, 0, 2000);
+  mMET_Nvtx = ibooker.bookProfile("MET_Nvtx", "MET vs. nvtx", 60, 0., 60., 0., 2000., " ");
+  mMETPhi = ibooker.book1D("METPhi", "METPhi", 80, -4, 4);
+  mSumET = ibooker.book1D("SumET", "SumET", 200, 0, 4000);  // 10GeV
+  mMETDifference_GenMETTrue = ibooker.book1D("METDifference_GenMETTrue", "METDifference_GenMETTrue", 500, -500, 500);
+  mMETDeltaPhi_GenMETTrue = ibooker.book1D("METDeltaPhi_GenMETTrue", "METDeltaPhi_GenMETTrue", 80, 0, 4);
+
+  if (isMiniAODMET) {
+    mMETUnc_JetResUp = ibooker.book1D("METUnc_JetResUp", "METUnc_JetResUp", 200, -10, 10);
+    mMETUnc_JetResDown = ibooker.book1D("METUnc_JetResDown", "METUnc_JetResDown", 200, -10, 10);
+    mMETUnc_JetEnUp = ibooker.book1D("METUnc_JetEnUp", "METUnc_JetEnUp", 200, -10, 10);
+    mMETUnc_JetEnDown = ibooker.book1D("METUnc_JetEnDown", "METUnc_JetEnDown", 200, -10, 10);
+    mMETUnc_MuonEnUp = ibooker.book1D("METUnc_MuonEnUp", "METUnc_MuonEnUp", 200, -10, 10);
+    mMETUnc_MuonEnDown = ibooker.book1D("METUnc_MuonEnDown", "METUnc_MuonEnDown", 200, -10, 10);
+    mMETUnc_ElectronEnUp = ibooker.book1D("METUnc_ElectronEnUp", "METUnc_ElectronEnUp", 200, -10, 10);
+    mMETUnc_ElectronEnDown = ibooker.book1D("METUnc_ElectronEnDown", "METUnc_ElectronEnDown", 200, -10, 10);
+    mMETUnc_TauEnUp = ibooker.book1D("METUnc_TauEnUp", "METUnc_TauEnUp", 200, -10, 10);
+    mMETUnc_TauEnDown = ibooker.book1D("METUnc_TauEnDown", "METUnc_TauEnDown", 200, -10, 10);
+    mMETUnc_UnclusteredEnUp = ibooker.book1D("METUnc_UnclusteredEnUp", "METUnc_UnclusteredEnUp", 200, -10, 10);
+    mMETUnc_UnclusteredEnDown = ibooker.book1D("METUnc_UnclusteredEnDown", "METUnc_UnclusteredEnDown", 200, -10, 10);
+    mMETUnc_PhotonEnUp = ibooker.book1D("METUnc_UnclusteredEnDown", "METUnc_UnclusteredEnDown", 200, -10, 10);
+    mMETUnc_PhotonEnDown = ibooker.book1D("METUnc_PhotonEnDown", "METUnc_PhotonEnDown", 200, -10, 10);
+  }
+  if (!isMiniAODMET) {
+    mMETDifference_GenMETCalo = ibooker.book1D("METDifference_GenMETCalo", "METDifference_GenMETCalo", 500, -500, 500);
+    mMETDeltaPhi_GenMETCalo = ibooker.book1D("METDeltaPhi_GenMETCalo", "METDeltaPhi_GenMETCalo", 80, 0, 4);
+  }
+  if (!isGenMET) {
+    mMETDifference_GenMETTrue_MET0to20 =
+        ibooker.book1D("METResolution_GenMETTrue_MET0to20", "METResolution_GenMETTrue_MET0to20", 500, -500, 500);
+    mMETDifference_GenMETTrue_MET20to40 =
+        ibooker.book1D("METResolution_GenMETTrue_MET20to40", "METResolution_GenMETTrue_MET20to40", 500, -500, 500);
+    mMETDifference_GenMETTrue_MET40to60 =
+        ibooker.book1D("METResolution_GenMETTrue_MET40to60", "METResolution_GenMETTrue_MET40to60", 500, -500, 500);
+    mMETDifference_GenMETTrue_MET60to80 =
+        ibooker.book1D("METResolution_GenMETTrue_MET60to80", "METResolution_GenMETTrue_MET60to80", 500, -500, 500);
+    mMETDifference_GenMETTrue_MET80to100 =
+        ibooker.book1D("METResolution_GenMETTrue_MET80to100", "METResolution_GenMETTrue_MET80to100", 500, -500, 500);
+    mMETDifference_GenMETTrue_MET100to150 =
+        ibooker.book1D("METResolution_GenMETTrue_MET100to150", "METResolution_GenMETTrue_MET100to150", 500, -500, 500);
+    mMETDifference_GenMETTrue_MET150to200 =
+        ibooker.book1D("METResolution_GenMETTrue_MET150to200", "METResolution_GenMETTrue_MET150to200", 500, -500, 500);
+    mMETDifference_GenMETTrue_MET200to300 =
+        ibooker.book1D("METResolution_GenMETTrue_MET200to300", "METResolution_GenMETTrue_MET200to300", 500, -500, 500);
+    mMETDifference_GenMETTrue_MET300to400 =
+        ibooker.book1D("METResolution_GenMETTrue_MET300to400", "METResolution_GenMETTrue_MET300to400", 500, -500, 500);
+    mMETDifference_GenMETTrue_MET400to500 =
+        ibooker.book1D("METResolution_GenMETTrue_MET400to500", "METResolution_GenMETTrue_MET400to500", 500, -500, 500);
+    mMETDifference_GenMETTrue_MET500 =
+        ibooker.book1D("METResolution_GenMETTrue_MET500", "METResolution_GenMETTrue_MET500", 500, -500, 500);
+  }
+  if (isCaloMET) {
+    mCaloMaxEtInEmTowers = ibooker.book1D("CaloMaxEtInEmTowers", "CaloMaxEtInEmTowers", 300, 0, 1500);     // 5GeV
+    mCaloMaxEtInHadTowers = ibooker.book1D("CaloMaxEtInHadTowers", "CaloMaxEtInHadTowers", 300, 0, 1500);  // 5GeV
+    mCaloEtFractionHadronic = ibooker.book1D("CaloEtFractionHadronic", "CaloEtFractionHadronic", 100, 0, 1);
+    mCaloEmEtFraction = ibooker.book1D("CaloEmEtFraction", "CaloEmEtFraction", 100, 0, 1);
+    mCaloHadEtInHB = ibooker.book1D("CaloHadEtInHB", "CaloHadEtInHB", 200, 0, 2000);  // 5GeV
+    mCaloHadEtInHE = ibooker.book1D("CaloHadEtInHE", "CaloHadEtInHE", 100, 0, 500);   // 5GeV
+    mCaloHadEtInHO = ibooker.book1D("CaloHadEtInHO", "CaloHadEtInHO", 100, 0, 200);   // 5GeV
+    mCaloHadEtInHF = ibooker.book1D("CaloHadEtInHF", "CaloHadEtInHF", 100, 0, 200);   // 5GeV
+    mCaloSETInpHF = ibooker.book1D("CaloSETInpHF", "CaloSETInpHF", 100, 0, 500);
+    mCaloSETInmHF = ibooker.book1D("CaloSETInmHF", "CaloSETInmHF", 100, 0, 500);
+    mCaloEmEtInEE = ibooker.book1D("CaloEmEtInEE", "CaloEmEtInEE", 100, 0, 500);  // 5GeV
+    mCaloEmEtInEB = ibooker.book1D("CaloEmEtInEB", "CaloEmEtInEB", 100, 0, 500);  // 5GeV
+    mCaloEmEtInHF = ibooker.book1D("CaloEmEtInHF", "CaloEmEtInHF", 100, 0, 500);  // 5GeV
+  }
 
-    if (isPFMET ||  isMiniAODMET){
-      mPFphotonEtFraction = ibooker.book1D("photonEtFraction", "photonEtFraction", 100, 0, 1);
-      mPFneutralHadronEtFraction = ibooker.book1D("neutralHadronEtFraction", "neutralHadronEtFraction", 100, 0, 1);
-      mPFelectronEtFraction = ibooker.book1D("electronEtFraction", "electronEtFraction", 100, 0, 1);
-      mPFchargedHadronEtFraction = ibooker.book1D("chargedHadronEtFraction", "chargedHadronEtFraction", 100, 0, 1);
-      mPFHFHadronEtFraction = ibooker.book1D("HFHadronEtFraction", "HFHadronEtFraction", 100, 0, 1);
-      mPFmuonEtFraction = ibooker.book1D("muonEtFraction", "muonEtFraction", 100, 0, 1);
-      mPFHFEMEtFraction = ibooker.book1D("HFEMEtFraction", "HFEMEtFraction", 100, 0, 1);
-
-      if(!isMiniAODMET){
-	mPFphotonEt = ibooker.book1D("photonEt", "photonEt", 100, 0, 1000);
-	mPFneutralHadronEt = ibooker.book1D("neutralHadronEt", "neutralHadronEt", 100, 0, 1000);
-	mPFelectronEt = ibooker.book1D("electronEt", "electronEt", 100, 0, 1000);
-	mPFchargedHadronEt = ibooker.book1D("chargedHadronEt", "chargedHadronEt", 100, 0, 1000);
-	mPFmuonEt = ibooker.book1D("muonEt", "muonEt", 100, 0, 1000);
-	mPFHFHadronEt = ibooker.book1D("HFHadronEt", "HFHadronEt", 100, 0, 500);
-	mPFHFEMEt = ibooker.book1D("HFEMEt", "HFEMEt", 100, 0, 300);
-      }
+  if (isGenMET) {
+    mNeutralEMEtFraction = ibooker.book1D("GenNeutralEMEtFraction", "GenNeutralEMEtFraction", 120, 0.0, 1.2);
+    mNeutralHadEtFraction = ibooker.book1D("GenNeutralHadEtFraction", "GenNeutralHadEtFraction", 120, 0.0, 1.2);
+    mChargedEMEtFraction = ibooker.book1D("GenChargedEMEtFraction", "GenChargedEMEtFraction", 120, 0.0, 1.2);
+    mChargedHadEtFraction = ibooker.book1D("GenChargedHadEtFraction", "GenChargedHadEtFraction", 120, 0.0, 1.2);
+    mMuonEtFraction = ibooker.book1D("GenMuonEtFraction", "GenMuonEtFraction", 120, 0.0, 1.2);
+    mInvisibleEtFraction = ibooker.book1D("GenInvisibleEtFraction", "GenInvisibleEtFraction", 120, 0.0, 1.2);
+  }
 
+  if (isPFMET || isMiniAODMET) {
+    mPFphotonEtFraction = ibooker.book1D("photonEtFraction", "photonEtFraction", 100, 0, 1);
+    mPFneutralHadronEtFraction = ibooker.book1D("neutralHadronEtFraction", "neutralHadronEtFraction", 100, 0, 1);
+    mPFelectronEtFraction = ibooker.book1D("electronEtFraction", "electronEtFraction", 100, 0, 1);
+    mPFchargedHadronEtFraction = ibooker.book1D("chargedHadronEtFraction", "chargedHadronEtFraction", 100, 0, 1);
+    mPFHFHadronEtFraction = ibooker.book1D("HFHadronEtFraction", "HFHadronEtFraction", 100, 0, 1);
+    mPFmuonEtFraction = ibooker.book1D("muonEtFraction", "muonEtFraction", 100, 0, 1);
+    mPFHFEMEtFraction = ibooker.book1D("HFEMEtFraction", "HFEMEtFraction", 100, 0, 1);
+
+    if (!isMiniAODMET) {
+      mPFphotonEt = ibooker.book1D("photonEt", "photonEt", 100, 0, 1000);
+      mPFneutralHadronEt = ibooker.book1D("neutralHadronEt", "neutralHadronEt", 100, 0, 1000);
+      mPFelectronEt = ibooker.book1D("electronEt", "electronEt", 100, 0, 1000);
+      mPFchargedHadronEt = ibooker.book1D("chargedHadronEt", "chargedHadronEt", 100, 0, 1000);
+      mPFmuonEt = ibooker.book1D("muonEt", "muonEt", 100, 0, 1000);
+      mPFHFHadronEt = ibooker.book1D("HFHadronEt", "HFHadronEt", 100, 0, 500);
+      mPFHFEMEt = ibooker.book1D("HFEMEt", "HFEMEt", 100, 0, 300);
     }
+  }
 }
 
-
-void METTester::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{ //int counter(0);
+void METTester::analyze(const edm::Event &iEvent,
+                        const edm::EventSetup &iSetup) {  // int counter(0);
 
   edm::Handle<reco::VertexCollection> pvHandle;
   iEvent.getByToken(pvToken_, pvHandle);
-   if (! pvHandle.isValid())
-  {
+  if (!pvHandle.isValid()) {
     std::cout << __FUNCTION__ << ":" << __LINE__ << ":pvHandle handle not found!" << std::endl;
     assert(false);
   }
   const int nvtx = pvHandle->size();
   mNvertex->Fill(nvtx);
-  //Collections for all MET collections
+  // Collections for all MET collections
 
   edm::Handle<CaloMETCollection> caloMETs;
   edm::Handle<PFMETCollection> pfMETs;
   edm::Handle<GenMETCollection> genMETs;
   edm::Handle<pat::METCollection> patMET;
 
-  if (isCaloMET) iEvent.getByToken(caloMETsToken_, caloMETs);
-  if (isPFMET)   iEvent.getByToken(pfMETsToken_,   pfMETs);
-  if (isGenMET)  iEvent.getByToken(genMETsToken_,  genMETs);
-  if (isMiniAODMET)  iEvent.getByToken(patMETToken_,  patMET);
-  if ((isCaloMET) and !caloMETs.isValid()) return; 
-  if ((isPFMET)   and !pfMETs.isValid())   return;
-  if ((isGenMET)  and !genMETs.isValid())  return;
-  if ((isMiniAODMET)  and !patMET.isValid())  return;
+  if (isCaloMET)
+    iEvent.getByToken(caloMETsToken_, caloMETs);
+  if (isPFMET)
+    iEvent.getByToken(pfMETsToken_, pfMETs);
+  if (isGenMET)
+    iEvent.getByToken(genMETsToken_, genMETs);
+  if (isMiniAODMET)
+    iEvent.getByToken(patMETToken_, patMET);
+  if ((isCaloMET) and !caloMETs.isValid())
+    return;
+  if ((isPFMET) and !pfMETs.isValid())
+    return;
+  if ((isGenMET) and !genMETs.isValid())
+    return;
+  if ((isMiniAODMET) and !patMET.isValid())
+    return;
 
   reco::MET met;
-  if (isCaloMET) { met = caloMETs->front();}
-  if (isPFMET)   { met = pfMETs->front()  ;}
-  if (isGenMET)  { met = genMETs->front() ;}
-  if (isMiniAODMET)  { met = patMET->front() ;}
+  if (isCaloMET) {
+    met = caloMETs->front();
+  }
+  if (isPFMET) {
+    met = pfMETs->front();
+  }
+  if (isGenMET) {
+    met = genMETs->front();
+  }
+  if (isMiniAODMET) {
+    met = patMET->front();
+  }
 
   const double SumET = met.sumEt();
   const double METSig = met.mEtSig();
@@ -275,67 +294,77 @@ void METTester::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
   mMETPhi->Fill(METPhi);
   mSumET->Fill(SumET);
   mMETSig->Fill(METSig);
-  
-    
+
   // Get Generated MET for Resolution plots
-  const reco::GenMET *genMetTrue=nullptr;
-  bool isvalidgenmet=false;
+  const reco::GenMET *genMetTrue = nullptr;
+  bool isvalidgenmet = false;
 
-  if(!isMiniAODMET){
+  if (!isMiniAODMET) {
     edm::Handle<GenMETCollection> genTrue;
     iEvent.getByToken(genMETsTrueToken_, genTrue);
     if (genTrue.isValid()) {
-      isvalidgenmet=true;
+      isvalidgenmet = true;
       const GenMETCollection *genmetcol = genTrue.product();
       genMetTrue = &(genmetcol->front());
     }
-  }else{
-    genMetTrue=patMET->front().genMET();
-    isvalidgenmet=true;
+  } else {
+    genMetTrue = patMET->front().genMET();
+    isvalidgenmet = true;
   }
 
-  if(isvalidgenmet){
+  if (isvalidgenmet) {
     double genMET = genMetTrue->pt();
     double genMETPhi = genMetTrue->phi();
 
-    mMETDifference_GenMETTrue->Fill( MET - genMET );
-    mMETDeltaPhi_GenMETTrue->Fill( TMath::ACos( TMath::Cos( METPhi - genMETPhi ) ) );
-
-    if(!isGenMET){
-      //pfMET resolution in pfMET bins : Sam, Feb, 2012
-      if (MET > 0 && MET < 20) mMETDifference_GenMETTrue_MET0to20->Fill( MET - genMET );
-      else if (MET > 20 && MET < 40) mMETDifference_GenMETTrue_MET20to40->Fill( MET - genMET );
-      else if (MET > 40 && MET < 60) mMETDifference_GenMETTrue_MET40to60->Fill( MET - genMET );
-      else if (MET > 60 && MET < 80) mMETDifference_GenMETTrue_MET60to80->Fill( MET - genMET );
-      else if (MET > 80 && MET <100) mMETDifference_GenMETTrue_MET80to100->Fill( MET - genMET );
-      else if (MET >100 && MET <150) mMETDifference_GenMETTrue_MET100to150->Fill( MET - genMET );
-      else if (MET >150 && MET <200) mMETDifference_GenMETTrue_MET150to200->Fill( MET - genMET );
-      else if (MET >200 && MET <300) mMETDifference_GenMETTrue_MET200to300->Fill( MET - genMET );
-      else if (MET >300 && MET <400) mMETDifference_GenMETTrue_MET300to400->Fill( MET - genMET );
-      else if (MET >400 && MET <500) mMETDifference_GenMETTrue_MET400to500->Fill( MET - genMET );
-      else if (MET >500) mMETDifference_GenMETTrue_MET500->Fill( MET - genMET );
-      
+    mMETDifference_GenMETTrue->Fill(MET - genMET);
+    mMETDeltaPhi_GenMETTrue->Fill(TMath::ACos(TMath::Cos(METPhi - genMETPhi)));
+
+    if (!isGenMET) {
+      // pfMET resolution in pfMET bins : Sam, Feb, 2012
+      if (MET > 0 && MET < 20)
+        mMETDifference_GenMETTrue_MET0to20->Fill(MET - genMET);
+      else if (MET > 20 && MET < 40)
+        mMETDifference_GenMETTrue_MET20to40->Fill(MET - genMET);
+      else if (MET > 40 && MET < 60)
+        mMETDifference_GenMETTrue_MET40to60->Fill(MET - genMET);
+      else if (MET > 60 && MET < 80)
+        mMETDifference_GenMETTrue_MET60to80->Fill(MET - genMET);
+      else if (MET > 80 && MET < 100)
+        mMETDifference_GenMETTrue_MET80to100->Fill(MET - genMET);
+      else if (MET > 100 && MET < 150)
+        mMETDifference_GenMETTrue_MET100to150->Fill(MET - genMET);
+      else if (MET > 150 && MET < 200)
+        mMETDifference_GenMETTrue_MET150to200->Fill(MET - genMET);
+      else if (MET > 200 && MET < 300)
+        mMETDifference_GenMETTrue_MET200to300->Fill(MET - genMET);
+      else if (MET > 300 && MET < 400)
+        mMETDifference_GenMETTrue_MET300to400->Fill(MET - genMET);
+      else if (MET > 400 && MET < 500)
+        mMETDifference_GenMETTrue_MET400to500->Fill(MET - genMET);
+      else if (MET > 500)
+        mMETDifference_GenMETTrue_MET500->Fill(MET - genMET);
+
     } else {
       edm::LogInfo("OutputInfo") << " failed to retrieve data required by MET Task:  genMetTrue";
-    }    
+    }
   }
-  if(!isMiniAODMET){
+  if (!isMiniAODMET) {
     edm::Handle<GenMETCollection> genCalo;
     iEvent.getByToken(genMETsCaloToken_, genCalo);
     if (genCalo.isValid()) {
       const GenMETCollection *genmetcol = genCalo.product();
-      const GenMET  *genMetCalo = &(genmetcol->front());
+      const GenMET *genMetCalo = &(genmetcol->front());
       const double genMET = genMetCalo->pt();
       const double genMETPhi = genMetCalo->phi();
-      
-      mMETDifference_GenMETCalo->Fill( MET - genMET );
-      mMETDeltaPhi_GenMETCalo->Fill( TMath::ACos( TMath::Cos( METPhi - genMETPhi ) ) );
+
+      mMETDifference_GenMETCalo->Fill(MET - genMET);
+      mMETDeltaPhi_GenMETCalo->Fill(TMath::ACos(TMath::Cos(METPhi - genMETPhi)));
     } else {
       edm::LogInfo("OutputInfo") << " failed to retrieve data required by MET Task:  genMetCalo";
-    }    
+    }
   }
-  if ( isCaloMET) { 
-    const reco::CaloMET * calomet = &(caloMETs->front());
+  if (isCaloMET) {
+    const reco::CaloMET *calomet = &(caloMETs->front());
     // ==========================================================
     // Reconstructed MET Information
     const double caloMaxEtInEMTowers = calomet->maxEtInEmTowers();
@@ -365,30 +394,28 @@ void METTester::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
     mCaloEmEtInHF->Fill(caloEmEtInHF);
     mCaloSETInpHF->Fill(caloSETInpHF);
     mCaloSETInmHF->Fill(caloSETInmHF);
-  }  
-  if (isGenMET)
-  {
+  }
+  if (isGenMET) {
     const GenMET *genmet;
     // Get Generated MET
     genmet = &(genMETs->front());
 
-    const double NeutralEMEtFraction = genmet->NeutralEMEtFraction() ;
-    const double NeutralHadEtFraction = genmet->NeutralHadEtFraction() ;
-    const double ChargedEMEtFraction = genmet->ChargedEMEtFraction () ;
+    const double NeutralEMEtFraction = genmet->NeutralEMEtFraction();
+    const double NeutralHadEtFraction = genmet->NeutralHadEtFraction();
+    const double ChargedEMEtFraction = genmet->ChargedEMEtFraction();
     const double ChargedHadEtFraction = genmet->ChargedHadEtFraction();
-    const double MuonEtFraction = genmet->MuonEtFraction() ;
-    const double InvisibleEtFraction = genmet->InvisibleEtFraction() ;
-
-    mNeutralEMEtFraction->Fill( NeutralEMEtFraction );
-    mNeutralHadEtFraction->Fill( NeutralHadEtFraction );
-    mChargedEMEtFraction->Fill( ChargedEMEtFraction );
-    mChargedHadEtFraction->Fill( ChargedHadEtFraction );
-    mMuonEtFraction->Fill( MuonEtFraction );
-    mInvisibleEtFraction->Fill( InvisibleEtFraction );
-  } 
-  if(isPFMET)
-  {
-    const reco::PFMET  * pfmet = &(pfMETs->front());
+    const double MuonEtFraction = genmet->MuonEtFraction();
+    const double InvisibleEtFraction = genmet->InvisibleEtFraction();
+
+    mNeutralEMEtFraction->Fill(NeutralEMEtFraction);
+    mNeutralHadEtFraction->Fill(NeutralHadEtFraction);
+    mChargedEMEtFraction->Fill(ChargedEMEtFraction);
+    mChargedHadEtFraction->Fill(ChargedHadEtFraction);
+    mMuonEtFraction->Fill(MuonEtFraction);
+    mInvisibleEtFraction->Fill(InvisibleEtFraction);
+  }
+  if (isPFMET) {
+    const reco::PFMET *pfmet = &(pfMETs->front());
     mPFphotonEtFraction->Fill(pfmet->photonEtFraction());
     mPFphotonEt->Fill(pfmet->photonEt());
     mPFneutralHadronEtFraction->Fill(pfmet->neutralHadronEtFraction());
@@ -403,37 +430,33 @@ void METTester::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
     mPFHFHadronEt->Fill(pfmet->HFHadronEt());
     mPFHFEMEtFraction->Fill(pfmet->HFEMEtFraction());
     mPFHFEMEt->Fill(pfmet->HFEMEt());
-    // Reconstructed MET Information                                                                                                     
-
-  } 
-   if(isMiniAODMET){
+    // Reconstructed MET Information
+  }
+  if (isMiniAODMET) {
     const pat::MET *patmet = &(patMET->front());
-    mMETUnc_JetResUp               ->Fill(MET- patmet->shiftedPt(pat::MET::JetResUp)) ;
-    mMETUnc_JetResDown             ->Fill(MET- patmet->shiftedPt(pat::MET::JetResDown));
-    mMETUnc_JetEnUp                ->Fill(MET- patmet->shiftedPt(pat::MET::JetEnUp));
-    mMETUnc_JetEnDown              ->Fill(MET- patmet->shiftedPt(pat::MET::JetEnDown));
-    mMETUnc_MuonEnUp               ->Fill(MET- patmet->shiftedPt(pat::MET::MuonEnUp));
-    mMETUnc_MuonEnDown             ->Fill(MET- patmet->shiftedPt(pat::MET::MuonEnDown));
-    mMETUnc_ElectronEnUp           ->Fill(MET- patmet->shiftedPt(pat::MET::ElectronEnUp));
-    mMETUnc_ElectronEnDown         ->Fill(MET- patmet->shiftedPt(pat::MET::ElectronEnDown));
-    mMETUnc_TauEnUp                ->Fill(MET- patmet->shiftedPt(pat::MET::TauEnUp));
-    mMETUnc_TauEnDown              ->Fill(MET- patmet->shiftedPt(pat::MET::TauEnDown));
-    mMETUnc_UnclusteredEnUp        ->Fill(MET- patmet->shiftedPt(pat::MET::UnclusteredEnUp));
-    mMETUnc_UnclusteredEnDown      ->Fill(MET- patmet->shiftedPt(pat::MET::UnclusteredEnDown));
-    mMETUnc_PhotonEnUp             ->Fill(MET- patmet->shiftedPt(pat::MET::PhotonEnUp));
-    mMETUnc_PhotonEnDown           ->Fill(MET- patmet->shiftedPt(pat::MET::PhotonEnDown));
-    
-    
-    if(patmet->isPFMET()){
+    mMETUnc_JetResUp->Fill(MET - patmet->shiftedPt(pat::MET::JetResUp));
+    mMETUnc_JetResDown->Fill(MET - patmet->shiftedPt(pat::MET::JetResDown));
+    mMETUnc_JetEnUp->Fill(MET - patmet->shiftedPt(pat::MET::JetEnUp));
+    mMETUnc_JetEnDown->Fill(MET - patmet->shiftedPt(pat::MET::JetEnDown));
+    mMETUnc_MuonEnUp->Fill(MET - patmet->shiftedPt(pat::MET::MuonEnUp));
+    mMETUnc_MuonEnDown->Fill(MET - patmet->shiftedPt(pat::MET::MuonEnDown));
+    mMETUnc_ElectronEnUp->Fill(MET - patmet->shiftedPt(pat::MET::ElectronEnUp));
+    mMETUnc_ElectronEnDown->Fill(MET - patmet->shiftedPt(pat::MET::ElectronEnDown));
+    mMETUnc_TauEnUp->Fill(MET - patmet->shiftedPt(pat::MET::TauEnUp));
+    mMETUnc_TauEnDown->Fill(MET - patmet->shiftedPt(pat::MET::TauEnDown));
+    mMETUnc_UnclusteredEnUp->Fill(MET - patmet->shiftedPt(pat::MET::UnclusteredEnUp));
+    mMETUnc_UnclusteredEnDown->Fill(MET - patmet->shiftedPt(pat::MET::UnclusteredEnDown));
+    mMETUnc_PhotonEnUp->Fill(MET - patmet->shiftedPt(pat::MET::PhotonEnUp));
+    mMETUnc_PhotonEnDown->Fill(MET - patmet->shiftedPt(pat::MET::PhotonEnDown));
+
+    if (patmet->isPFMET()) {
       mPFphotonEtFraction->Fill(patmet->NeutralEMFraction());
       mPFneutralHadronEtFraction->Fill(patmet->NeutralHadEtFraction());
       mPFelectronEtFraction->Fill(patmet->ChargedEMEtFraction());
       mPFchargedHadronEtFraction->Fill(patmet->ChargedHadEtFraction());
       mPFmuonEtFraction->Fill(patmet->MuonEtFraction());
-      mPFHFHadronEtFraction->Fill(patmet->Type6EtFraction());//HFHadrons
-      mPFHFEMEtFraction->Fill(patmet->Type7EtFraction());//HFEMEt  
+      mPFHFHadronEtFraction->Fill(patmet->Type6EtFraction());  // HFHadrons
+      mPFHFEMEtFraction->Fill(patmet->Type7EtFraction());      // HFEMEt
     }
-  }  
+  }
 }
-
-
diff --git a/Validation/RecoMET/plugins/METTester.h b/Validation/RecoMET/plugins/METTester.h
index e0a1255243713..6c5b83b560aa1 100644
--- a/Validation/RecoMET/plugins/METTester.h
+++ b/Validation/RecoMET/plugins/METTester.h
@@ -3,187 +3,176 @@
 
 // author: Mike Schmitt (The University of Florida)
 // date: 8/24/2006
-// modification: Bobby Scurlock 
+// modification: Bobby Scurlock
 // date: 03.11.2006
-// note: added RMS(METx) vs SumET capability 
+// note: added RMS(METx) vs SumET capability
 // modification: Rick Cavanaugh
-// date: 05.11.2006 
-// note: added configuration parameters 
+// date: 05.11.2006
+// note: added configuration parameters
 // modification: Mike Schmitt
 // date: 02.28.2007
 // note: code rewrite
 
-// Rewritten by Viola Sordini, Matthias Artur Weber, Robert Schoefbeck Nov./Dez. 2013
-
+// Rewritten by Viola Sordini, Matthias Artur Weber, Robert Schoefbeck Nov./Dez.
+// 2013
 
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Common/interface/Handle.h"
-#include "DataFormats/METReco/interface/MET.h"
-#include "DataFormats/METReco/interface/METCollection.h"
+#include "DataFormats/Common/interface/ValueMap.h"
+#include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
 #include "DataFormats/METReco/interface/CaloMET.h"
 #include "DataFormats/METReco/interface/CaloMETCollection.h"
 #include "DataFormats/METReco/interface/GenMET.h"
 #include "DataFormats/METReco/interface/GenMETCollection.h"
+#include "DataFormats/METReco/interface/MET.h"
+#include "DataFormats/METReco/interface/METCollection.h"
+#include "DataFormats/METReco/interface/METFwd.h"
 #include "DataFormats/METReco/interface/PFMET.h"
 #include "DataFormats/METReco/interface/PFMETCollection.h"
 #include "DataFormats/MuonReco/interface/Muon.h"
 #include "DataFormats/MuonReco/interface/MuonFwd.h"
 #include "DataFormats/MuonReco/interface/MuonMETCorrectionData.h"
-#include "DataFormats/EgammaCandidates/interface/GsfElectron.h"
-#include "DataFormats/METReco/interface/MET.h"
-#include "DataFormats/METReco/interface/METFwd.h"
+#include "DataFormats/PatCandidates/interface/MET.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "FWCore/Utilities/interface/InputTag.h"
-#include "FWCore/Utilities/interface/EDGetToken.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DataFormats/Common/interface/ValueMap.h"
-#include <DQMServices/Core/interface/DQMEDAnalyzer.h>
-#include "DataFormats/PatCandidates/interface/MET.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 #include "TMath.h"
+#include <DQMServices/Core/interface/DQMEDAnalyzer.h>
 
-
-//class METTester: public edm::EDAnalyzer {
-class METTester: public DQMEDAnalyzer {
+// class METTester: public edm::EDAnalyzer {
+class METTester : public DQMEDAnalyzer {
 public:
+  explicit METTester(const edm::ParameterSet &);
 
-  explicit METTester(const edm::ParameterSet&);
-
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
 
-
- private:
-
-  std::map<std::string, MonitorElement*> me;
+private:
+  std::map<std::string, MonitorElement *> me;
 
   // Inputs from Configuration File
 
   edm::InputTag mInputCollection_;
   edm::InputTag inputMETLabel_;
   std::string METType_;
- 
+
   edm::InputTag inputCaloMETLabel_;
 
-  //Tokens
-  edm::EDGetTokenT<std::vector<reco::Vertex> > pvToken_;
+  // Tokens
+  edm::EDGetTokenT<std::vector<reco::Vertex>> pvToken_;
   edm::EDGetTokenT<reco::CaloMETCollection> caloMETsToken_;
   edm::EDGetTokenT<reco::PFMETCollection> pfMETsToken_;
-  //edm::EDGetTokenT<reco::METCollection> tcMETsToken_;
+  // edm::EDGetTokenT<reco::METCollection> tcMETsToken_;
   edm::EDGetTokenT<reco::GenMETCollection> genMETsToken_;
   edm::EDGetTokenT<reco::GenMETCollection> genMETsTrueToken_;
   edm::EDGetTokenT<reco::GenMETCollection> genMETsCaloToken_;
   edm::EDGetTokenT<pat::METCollection> patMETToken_;
 
+  // Events variables
+  MonitorElement *mNvertex;
+
+  // Common variables
+  MonitorElement *mMEx;
+  MonitorElement *mMEy;
+  MonitorElement *mMETSig;
+  MonitorElement *mMET;
+  MonitorElement *mMETFine;
+  MonitorElement *mMET_Nvtx;
+  MonitorElement *mMETPhi;
+  MonitorElement *mSumET;
+  MonitorElement *mMETDifference_GenMETTrue;
+  MonitorElement *mMETDeltaPhi_GenMETTrue;
+  MonitorElement *mMETDifference_GenMETCalo;
+  MonitorElement *mMETDeltaPhi_GenMETCalo;
 
- // Events variables
-  MonitorElement* mNvertex;
-
- // Common variables
-  MonitorElement* mMEx;
-  MonitorElement* mMEy;
-  MonitorElement* mMETSig;
-  MonitorElement* mMET;
-  MonitorElement* mMETFine;
-  MonitorElement* mMET_Nvtx;
-  MonitorElement* mMETPhi;
-  MonitorElement* mSumET;
-  MonitorElement* mMETDifference_GenMETTrue;
-  MonitorElement* mMETDeltaPhi_GenMETTrue;
-  MonitorElement* mMETDifference_GenMETCalo;
-  MonitorElement* mMETDeltaPhi_GenMETCalo;
-  
   // MET Uncertainity Variables
-  MonitorElement* mMETUnc_JetResUp;
-  MonitorElement* mMETUnc_JetResDown;
-  MonitorElement* mMETUnc_JetEnUp;
-  MonitorElement* mMETUnc_JetEnDown;
-  MonitorElement* mMETUnc_MuonEnUp;
-  MonitorElement* mMETUnc_MuonEnDown;
-  MonitorElement* mMETUnc_ElectronEnUp;
-  MonitorElement* mMETUnc_ElectronEnDown;
-  MonitorElement* mMETUnc_TauEnUp;
-  MonitorElement* mMETUnc_TauEnDown;
-  MonitorElement* mMETUnc_UnclusteredEnUp;
-  MonitorElement* mMETUnc_UnclusteredEnDown;
-  MonitorElement* mMETUnc_PhotonEnUp;
-  MonitorElement* mMETUnc_PhotonEnDown;
-  
-    
-  //CaloMET variables
-
-  MonitorElement* mCaloMaxEtInEmTowers;
-  MonitorElement* mCaloMaxEtInHadTowers;
-  MonitorElement* mCaloEtFractionHadronic;
-  MonitorElement* mCaloEmEtFraction;
-  MonitorElement* mCaloHadEtInHB;
-  MonitorElement* mCaloHadEtInHO;
-  MonitorElement* mCaloHadEtInHE;
-  MonitorElement* mCaloHadEtInHF;
-  MonitorElement* mCaloHadEtInEB;
-  MonitorElement* mCaloHadEtInEE;
-  MonitorElement* mCaloEmEtInHF;
-  MonitorElement* mCaloSETInpHF;
-  MonitorElement* mCaloSETInmHF;
-  MonitorElement* mCaloEmEtInEE;
-  MonitorElement* mCaloEmEtInEB;
-
-  //GenMET variables
-  MonitorElement* mNeutralEMEtFraction;
-  MonitorElement* mNeutralHadEtFraction;
-  MonitorElement* mChargedEMEtFraction;
-  MonitorElement* mChargedHadEtFraction;
-  MonitorElement* mMuonEtFraction; 
-  MonitorElement* mInvisibleEtFraction;
-
-  //MET variables
-
-  //PFMET variables
-  MonitorElement* mPFphotonEtFraction;
-  MonitorElement* mPFphotonEt;
-  MonitorElement* mPFneutralHadronEtFraction;
-  MonitorElement* mPFneutralHadronEt;
-  MonitorElement* mPFelectronEtFraction;
-  MonitorElement* mPFelectronEt;
-  MonitorElement* mPFchargedHadronEtFraction;
-  MonitorElement* mPFchargedHadronEt;
-  MonitorElement* mPFmuonEtFraction;
-  MonitorElement* mPFmuonEt;
-  MonitorElement* mPFHFHadronEtFraction;
-  MonitorElement* mPFHFHadronEt;
-  MonitorElement* mPFHFEMEtFraction;
-  MonitorElement* mPFHFEMEt;
-
-  MonitorElement* mMETDifference_GenMETTrue_MET0to20;
-  MonitorElement* mMETDifference_GenMETTrue_MET20to40;
-  MonitorElement* mMETDifference_GenMETTrue_MET40to60;
-  MonitorElement* mMETDifference_GenMETTrue_MET60to80;
-  MonitorElement* mMETDifference_GenMETTrue_MET80to100;
-  MonitorElement* mMETDifference_GenMETTrue_MET100to150;
-  MonitorElement* mMETDifference_GenMETTrue_MET150to200;
-  MonitorElement* mMETDifference_GenMETTrue_MET200to300;
-  MonitorElement* mMETDifference_GenMETTrue_MET300to400;
-  MonitorElement* mMETDifference_GenMETTrue_MET400to500;
-  MonitorElement* mMETDifference_GenMETTrue_MET500;
-  //moved into postprocessor
-  //MonitorElement* mMETDifference_GenMETTrue_METResolution;
-  
+  MonitorElement *mMETUnc_JetResUp;
+  MonitorElement *mMETUnc_JetResDown;
+  MonitorElement *mMETUnc_JetEnUp;
+  MonitorElement *mMETUnc_JetEnDown;
+  MonitorElement *mMETUnc_MuonEnUp;
+  MonitorElement *mMETUnc_MuonEnDown;
+  MonitorElement *mMETUnc_ElectronEnUp;
+  MonitorElement *mMETUnc_ElectronEnDown;
+  MonitorElement *mMETUnc_TauEnUp;
+  MonitorElement *mMETUnc_TauEnDown;
+  MonitorElement *mMETUnc_UnclusteredEnUp;
+  MonitorElement *mMETUnc_UnclusteredEnDown;
+  MonitorElement *mMETUnc_PhotonEnUp;
+  MonitorElement *mMETUnc_PhotonEnDown;
+
+  // CaloMET variables
+
+  MonitorElement *mCaloMaxEtInEmTowers;
+  MonitorElement *mCaloMaxEtInHadTowers;
+  MonitorElement *mCaloEtFractionHadronic;
+  MonitorElement *mCaloEmEtFraction;
+  MonitorElement *mCaloHadEtInHB;
+  MonitorElement *mCaloHadEtInHO;
+  MonitorElement *mCaloHadEtInHE;
+  MonitorElement *mCaloHadEtInHF;
+  MonitorElement *mCaloHadEtInEB;
+  MonitorElement *mCaloHadEtInEE;
+  MonitorElement *mCaloEmEtInHF;
+  MonitorElement *mCaloSETInpHF;
+  MonitorElement *mCaloSETInmHF;
+  MonitorElement *mCaloEmEtInEE;
+  MonitorElement *mCaloEmEtInEB;
+
+  // GenMET variables
+  MonitorElement *mNeutralEMEtFraction;
+  MonitorElement *mNeutralHadEtFraction;
+  MonitorElement *mChargedEMEtFraction;
+  MonitorElement *mChargedHadEtFraction;
+  MonitorElement *mMuonEtFraction;
+  MonitorElement *mInvisibleEtFraction;
+
+  // MET variables
+
+  // PFMET variables
+  MonitorElement *mPFphotonEtFraction;
+  MonitorElement *mPFphotonEt;
+  MonitorElement *mPFneutralHadronEtFraction;
+  MonitorElement *mPFneutralHadronEt;
+  MonitorElement *mPFelectronEtFraction;
+  MonitorElement *mPFelectronEt;
+  MonitorElement *mPFchargedHadronEtFraction;
+  MonitorElement *mPFchargedHadronEt;
+  MonitorElement *mPFmuonEtFraction;
+  MonitorElement *mPFmuonEt;
+  MonitorElement *mPFHFHadronEtFraction;
+  MonitorElement *mPFHFHadronEt;
+  MonitorElement *mPFHFEMEtFraction;
+  MonitorElement *mPFHFEMEt;
+
+  MonitorElement *mMETDifference_GenMETTrue_MET0to20;
+  MonitorElement *mMETDifference_GenMETTrue_MET20to40;
+  MonitorElement *mMETDifference_GenMETTrue_MET40to60;
+  MonitorElement *mMETDifference_GenMETTrue_MET60to80;
+  MonitorElement *mMETDifference_GenMETTrue_MET80to100;
+  MonitorElement *mMETDifference_GenMETTrue_MET100to150;
+  MonitorElement *mMETDifference_GenMETTrue_MET150to200;
+  MonitorElement *mMETDifference_GenMETTrue_MET200to300;
+  MonitorElement *mMETDifference_GenMETTrue_MET300to400;
+  MonitorElement *mMETDifference_GenMETTrue_MET400to500;
+  MonitorElement *mMETDifference_GenMETTrue_MET500;
+  // moved into postprocessor
+  // MonitorElement* mMETDifference_GenMETTrue_METResolution;
 
   bool isCaloMET;
-//  bool isCorMET;
-//  bool isTcMET;
+  //  bool isCorMET;
+  //  bool isTcMET;
   bool isPFMET;
   bool isGenMET;
   bool isMiniAODMET;
-
 };
 
-#endif // METTESTER_H
-
-
+#endif  // METTESTER_H
diff --git a/Validation/RecoMET/plugins/METTesterPostProcessor.cc b/Validation/RecoMET/plugins/METTesterPostProcessor.cc
index befe521630b2d..164b950e6256e 100644
--- a/Validation/RecoMET/plugins/METTesterPostProcessor.cc
+++ b/Validation/RecoMET/plugins/METTesterPostProcessor.cc
@@ -2,77 +2,70 @@
 //
 // Package:    Validation/RecoMET
 // Class:      METTesterPostProcessor
-// 
+//
 // Original Author:  "Matthias Weber"
 //         Created:  Sun Feb 22 14:35:25 CET 2015
 //
 
-#include "Validation/RecoMET/plugins/METTesterPostProcessor.h"
 #include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "FWCore/Framework/interface/Run.h"
+#include "Validation/RecoMET/plugins/METTesterPostProcessor.h"
 
 // Some switches
 //
 // constructors and destructor
 //
-METTesterPostProcessor::METTesterPostProcessor(const edm::ParameterSet& iConfig)
-{
-}
-
-
-METTesterPostProcessor::~METTesterPostProcessor()
-{ 
-}
+METTesterPostProcessor::METTesterPostProcessor(const edm::ParameterSet &iConfig) {}
 
+METTesterPostProcessor::~METTesterPostProcessor() {}
 
 // ------------ method called right after a run ends ------------
-void 
-METTesterPostProcessor::dqmEndJob(DQMStore::IBooker& ibook_, DQMStore::IGetter& iget_)
-{
+void METTesterPostProcessor::dqmEndJob(DQMStore::IBooker &ibook_, DQMStore::IGetter &iget_) {
   std::vector<std::string> subDirVec;
-  std::string RunDir="JetMET/METValidation/";
+  std::string RunDir = "JetMET/METValidation/";
   iget_.setCurrentFolder(RunDir);
-  met_dirs=iget_.getSubdirs();
-  //bin definition for resolution plot -> last bin contains overflow too, but for plotting purposes show up to 1 TeV only
+  met_dirs = iget_.getSubdirs();
+  // bin definition for resolution plot -> last bin contains overflow too, but
+  // for plotting purposes show up to 1 TeV only
   int nBins = 11;
-  float bins[] = {0.,20.,40.,60.,80.,100.,150.,200.,300.,400.,500.,1000};
-  //loop over met subdirectories
-  for (int i=0; i<int(met_dirs.size()); i++) {
-    ibook_.setCurrentFolder(met_dirs[i]);  
-    mMETDifference_GenMETTrue_METResolution = ibook_.book1D("METResolution_GenMETTrue_InMETBins","METResolution_GenMETTrue_InMETBins",nBins, bins); 
-    FillMETRes(met_dirs[i],iget_);
+  float bins[] = {0., 20., 40., 60., 80., 100., 150., 200., 300., 400., 500., 1000};
+  // loop over met subdirectories
+  for (int i = 0; i < int(met_dirs.size()); i++) {
+    ibook_.setCurrentFolder(met_dirs[i]);
+    mMETDifference_GenMETTrue_METResolution =
+        ibook_.book1D("METResolution_GenMETTrue_InMETBins", "METResolution_GenMETTrue_InMETBins", nBins, bins);
+    FillMETRes(met_dirs[i], iget_);
   }
 }
 
+void METTesterPostProcessor::FillMETRes(std::string metdir, DQMStore::IGetter &iget) {
+  mMETDifference_GenMETTrue_MET0to20 = nullptr;
+  mMETDifference_GenMETTrue_MET20to40 = nullptr;
+  mMETDifference_GenMETTrue_MET40to60 = nullptr;
+  mMETDifference_GenMETTrue_MET60to80 = nullptr;
+  mMETDifference_GenMETTrue_MET80to100 = nullptr;
+  mMETDifference_GenMETTrue_MET100to150 = nullptr;
+  mMETDifference_GenMETTrue_MET150to200 = nullptr;
+  mMETDifference_GenMETTrue_MET200to300 = nullptr;
+  mMETDifference_GenMETTrue_MET300to400 = nullptr;
+  mMETDifference_GenMETTrue_MET400to500 = nullptr;
+  mMETDifference_GenMETTrue_MET500 = nullptr;
 
-void METTesterPostProcessor::FillMETRes(std::string metdir, DQMStore::IGetter & iget)
-{
-
-  mMETDifference_GenMETTrue_MET0to20=nullptr;
-  mMETDifference_GenMETTrue_MET20to40=nullptr;
-  mMETDifference_GenMETTrue_MET40to60=nullptr;
-  mMETDifference_GenMETTrue_MET60to80=nullptr;
-  mMETDifference_GenMETTrue_MET80to100=nullptr;
-  mMETDifference_GenMETTrue_MET100to150=nullptr;
-  mMETDifference_GenMETTrue_MET150to200=nullptr;
-  mMETDifference_GenMETTrue_MET200to300=nullptr;
-  mMETDifference_GenMETTrue_MET300to400=nullptr;
-  mMETDifference_GenMETTrue_MET400to500=nullptr;
-  mMETDifference_GenMETTrue_MET500=nullptr;
-
-  mMETDifference_GenMETTrue_MET0to20 = iget.get(metdir+"/METResolution_GenMETTrue_MET0to20");
-  mMETDifference_GenMETTrue_MET20to40 = iget.get(metdir+"/METResolution_GenMETTrue_MET20to40");
-  mMETDifference_GenMETTrue_MET40to60 = iget.get(metdir+"/METResolution_GenMETTrue_MET40to60");
-  mMETDifference_GenMETTrue_MET60to80 = iget.get(metdir+"/METResolution_GenMETTrue_MET60to80");
-  mMETDifference_GenMETTrue_MET80to100 = iget.get(metdir+"/METResolution_GenMETTrue_MET80to100");
-  mMETDifference_GenMETTrue_MET100to150 = iget.get(metdir+"/METResolution_GenMETTrue_MET100to150");
-  mMETDifference_GenMETTrue_MET150to200 = iget.get(metdir+"/METResolution_GenMETTrue_MET150to200");
-  mMETDifference_GenMETTrue_MET200to300 = iget.get(metdir+"/METResolution_GenMETTrue_MET200to300");
-  mMETDifference_GenMETTrue_MET300to400 = iget.get(metdir+"/METResolution_GenMETTrue_MET300to400");
-  mMETDifference_GenMETTrue_MET400to500 = iget.get(metdir+"/METResolution_GenMETTrue_MET400to500"); 
-  mMETDifference_GenMETTrue_MET500 = iget.get(metdir+"/METResolution_GenMETTrue_MET500"); 
-  if(mMETDifference_GenMETTrue_MET0to20 && mMETDifference_GenMETTrue_MET0to20->getRootObject()){//check one object, if existing, then the remaining ME's exist too
-    //for genmet none of these ME's are filled
+  mMETDifference_GenMETTrue_MET0to20 = iget.get(metdir + "/METResolution_GenMETTrue_MET0to20");
+  mMETDifference_GenMETTrue_MET20to40 = iget.get(metdir + "/METResolution_GenMETTrue_MET20to40");
+  mMETDifference_GenMETTrue_MET40to60 = iget.get(metdir + "/METResolution_GenMETTrue_MET40to60");
+  mMETDifference_GenMETTrue_MET60to80 = iget.get(metdir + "/METResolution_GenMETTrue_MET60to80");
+  mMETDifference_GenMETTrue_MET80to100 = iget.get(metdir + "/METResolution_GenMETTrue_MET80to100");
+  mMETDifference_GenMETTrue_MET100to150 = iget.get(metdir + "/METResolution_GenMETTrue_MET100to150");
+  mMETDifference_GenMETTrue_MET150to200 = iget.get(metdir + "/METResolution_GenMETTrue_MET150to200");
+  mMETDifference_GenMETTrue_MET200to300 = iget.get(metdir + "/METResolution_GenMETTrue_MET200to300");
+  mMETDifference_GenMETTrue_MET300to400 = iget.get(metdir + "/METResolution_GenMETTrue_MET300to400");
+  mMETDifference_GenMETTrue_MET400to500 = iget.get(metdir + "/METResolution_GenMETTrue_MET400to500");
+  mMETDifference_GenMETTrue_MET500 = iget.get(metdir + "/METResolution_GenMETTrue_MET500");
+  if (mMETDifference_GenMETTrue_MET0to20 &&
+      mMETDifference_GenMETTrue_MET0to20->getRootObject()) {  // check one object, if existing, then the
+                                                              // remaining ME's exist too
+    // for genmet none of these ME's are filled
     mMETDifference_GenMETTrue_METResolution->setBinContent(1, mMETDifference_GenMETTrue_MET0to20->getMean());
     mMETDifference_GenMETTrue_METResolution->setBinContent(2, mMETDifference_GenMETTrue_MET20to40->getMean());
     mMETDifference_GenMETTrue_METResolution->setBinContent(3, mMETDifference_GenMETTrue_MET40to60->getMean());
@@ -83,9 +76,10 @@ void METTesterPostProcessor::FillMETRes(std::string metdir, DQMStore::IGetter &
     mMETDifference_GenMETTrue_METResolution->setBinContent(8, mMETDifference_GenMETTrue_MET200to300->getMean());
     mMETDifference_GenMETTrue_METResolution->setBinContent(9, mMETDifference_GenMETTrue_MET300to400->getMean());
     mMETDifference_GenMETTrue_METResolution->setBinContent(10, mMETDifference_GenMETTrue_MET400to500->getMean());
-    mMETDifference_GenMETTrue_METResolution->setBinContent(11, mMETDifference_GenMETTrue_MET500->getMean()); 
+    mMETDifference_GenMETTrue_METResolution->setBinContent(11, mMETDifference_GenMETTrue_MET500->getMean());
 
-    //the error computation should be done in a postProcessor in the harvesting step otherwise the histograms will be just summed
+    // the error computation should be done in a postProcessor in the harvesting
+    // step otherwise the histograms will be just summed
     mMETDifference_GenMETTrue_METResolution->setBinError(1, mMETDifference_GenMETTrue_MET0to20->getRMS());
     mMETDifference_GenMETTrue_METResolution->setBinError(2, mMETDifference_GenMETTrue_MET20to40->getRMS());
     mMETDifference_GenMETTrue_METResolution->setBinError(3, mMETDifference_GenMETTrue_MET40to60->getRMS());
diff --git a/Validation/RecoMET/plugins/METTesterPostProcessor.h b/Validation/RecoMET/plugins/METTesterPostProcessor.h
index 12131a464c76f..e09607d1074f2 100644
--- a/Validation/RecoMET/plugins/METTesterPostProcessor.h
+++ b/Validation/RecoMET/plugins/METTesterPostProcessor.h
@@ -4,49 +4,49 @@
 // author: Matthias Weber, Feb 2015
 
 // system include files
-#include <memory>
-#include <cstdio>
 #include <cmath>
+#include <cstdio>
+#include <memory>
 #include <sstream>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 //
 // class decleration
 //
 
 class METTesterPostProcessor : public DQMEDHarvester {
-   public:
-      explicit METTesterPostProcessor(const edm::ParameterSet&);
-      ~METTesterPostProcessor() override;
-
-   private:
-      void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override ;
-      std::vector<std::string> met_dirs;
-
-      void FillMETRes(std::string metdir,DQMStore::IGetter &);
-      MonitorElement* mMETDifference_GenMETTrue_MET0to20;
-      MonitorElement* mMETDifference_GenMETTrue_MET20to40;
-      MonitorElement* mMETDifference_GenMETTrue_MET40to60;
-      MonitorElement* mMETDifference_GenMETTrue_MET60to80;
-      MonitorElement* mMETDifference_GenMETTrue_MET80to100;
-      MonitorElement* mMETDifference_GenMETTrue_MET100to150;
-      MonitorElement* mMETDifference_GenMETTrue_MET150to200;
-      MonitorElement* mMETDifference_GenMETTrue_MET200to300;
-      MonitorElement* mMETDifference_GenMETTrue_MET300to400;
-      MonitorElement* mMETDifference_GenMETTrue_MET400to500;
-      MonitorElement* mMETDifference_GenMETTrue_MET500;
-      MonitorElement* mMETDifference_GenMETTrue_METResolution; 
+public:
+  explicit METTesterPostProcessor(const edm::ParameterSet &);
+  ~METTesterPostProcessor() override;
+
+private:
+  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
+  std::vector<std::string> met_dirs;
+
+  void FillMETRes(std::string metdir, DQMStore::IGetter &);
+  MonitorElement *mMETDifference_GenMETTrue_MET0to20;
+  MonitorElement *mMETDifference_GenMETTrue_MET20to40;
+  MonitorElement *mMETDifference_GenMETTrue_MET40to60;
+  MonitorElement *mMETDifference_GenMETTrue_MET60to80;
+  MonitorElement *mMETDifference_GenMETTrue_MET80to100;
+  MonitorElement *mMETDifference_GenMETTrue_MET100to150;
+  MonitorElement *mMETDifference_GenMETTrue_MET150to200;
+  MonitorElement *mMETDifference_GenMETTrue_MET200to300;
+  MonitorElement *mMETDifference_GenMETTrue_MET300to400;
+  MonitorElement *mMETDifference_GenMETTrue_MET400to500;
+  MonitorElement *mMETDifference_GenMETTrue_MET500;
+  MonitorElement *mMETDifference_GenMETTrue_METResolution;
 };
 
 #endif
diff --git a/Validation/RecoMET/plugins/METTesterPostProcessorHarvesting.cc b/Validation/RecoMET/plugins/METTesterPostProcessorHarvesting.cc
index 26bb839389c4a..572610da1dc3f 100644
--- a/Validation/RecoMET/plugins/METTesterPostProcessorHarvesting.cc
+++ b/Validation/RecoMET/plugins/METTesterPostProcessorHarvesting.cc
@@ -2,68 +2,64 @@
 //
 // Package:    Validation/RecoMET
 // Class:      METTesterPostProcessorHarvesting
-// 
+//
 // Original Author:  "Matthias Weber"
 //         Created:  Sun Feb 22 14:35:25 CET 2015
 //
 
-#include "Validation/RecoMET/plugins/METTesterPostProcessorHarvesting.h"
 #include "FWCore/Framework/interface/LuminosityBlock.h"
 #include "FWCore/Framework/interface/Run.h"
+#include "Validation/RecoMET/plugins/METTesterPostProcessorHarvesting.h"
 
 // Some switches
 //
 // constructors and destructor
 //
-METTesterPostProcessorHarvesting::METTesterPostProcessorHarvesting(const edm::ParameterSet& iConfig)
-{
-  inputMETLabelRECO_=iConfig.getParameter<edm::InputTag>("METTypeRECO");
-  inputMETLabelMiniAOD_=iConfig.getParameter<edm::InputTag>("METTypeMiniAOD");
-}
-
-
-METTesterPostProcessorHarvesting::~METTesterPostProcessorHarvesting()
-{ 
+METTesterPostProcessorHarvesting::METTesterPostProcessorHarvesting(const edm::ParameterSet &iConfig) {
+  inputMETLabelRECO_ = iConfig.getParameter<edm::InputTag>("METTypeRECO");
+  inputMETLabelMiniAOD_ = iConfig.getParameter<edm::InputTag>("METTypeMiniAOD");
 }
 
+METTesterPostProcessorHarvesting::~METTesterPostProcessorHarvesting() {}
 
 // ------------ method called right after a run ends ------------
-void 
-METTesterPostProcessorHarvesting::dqmEndJob(DQMStore::IBooker& ibook_, DQMStore::IGetter& iget_)
-{
+void METTesterPostProcessorHarvesting::dqmEndJob(DQMStore::IBooker &ibook_, DQMStore::IGetter &iget_) {
   std::vector<std::string> subDirVec;
-  std::string RunDir="JetMET/METValidation/";
+  std::string RunDir = "JetMET/METValidation/";
   iget_.setCurrentFolder(RunDir);
-  met_dirs=iget_.getSubdirs();
-  bool found_reco_dir=false;
-  bool found_miniaod_dir=false;
-  //loop over met subdirectories
-  for (int i=0; i<int(met_dirs.size()); i++) { 
-    if(met_dirs[i]==(RunDir+inputMETLabelRECO_.label())){
-      found_reco_dir=true;
+  met_dirs = iget_.getSubdirs();
+  bool found_reco_dir = false;
+  bool found_miniaod_dir = false;
+  // loop over met subdirectories
+  for (int i = 0; i < int(met_dirs.size()); i++) {
+    if (met_dirs[i] == (RunDir + inputMETLabelRECO_.label())) {
+      found_reco_dir = true;
     }
-    if(met_dirs[i]==(RunDir+inputMETLabelMiniAOD_.label())){
-      found_miniaod_dir=true;
+    if (met_dirs[i] == (RunDir + inputMETLabelMiniAOD_.label())) {
+      found_miniaod_dir = true;
     }
   }
-  if(found_miniaod_dir && found_reco_dir){
-    std::string rundir_reco=RunDir+inputMETLabelRECO_.label();
-    std::string rundir_miniaod=RunDir+inputMETLabelMiniAOD_.label();
-    MonitorElement* mMET_Reco=iget_.get(rundir_reco+"/"+"MET");
-    MonitorElement* mMETPhi_Reco=iget_.get(rundir_reco+"/"+"METPhi");
-    MonitorElement* mSumET_Reco=iget_.get(rundir_reco+"/"+"SumET");
-    MonitorElement* mMETDifference_GenMETTrue_Reco=iget_.get(rundir_reco+"/"+"METDifference_GenMETTrue");
-    MonitorElement* mMETDeltaPhi_GenMETTrue_Reco=iget_.get(rundir_reco+"/"+"METDeltaPhi_GenMETTrue"); 
-    MonitorElement* mPFPhotonEtFraction_Reco=iget_.get(rundir_reco+"/"+"photonEtFraction"); 
-    MonitorElement* mPFNeutralHadronEtFraction_Reco=iget_.get(rundir_reco+"/"+"neutralHadronEtFraction"); 
-    MonitorElement* mPFChargedHadronEtFraction_Reco=iget_.get(rundir_reco+"/"+"chargedHadronEtFraction"); 
-    MonitorElement* mPFHFHadronEtFraction_Reco=iget_.get(rundir_reco+"/"+"HFHadronEtFraction"); 
-    MonitorElement* mPFHFEMEtFraction_Reco=iget_.get(rundir_reco+"/"+"HFEMEtFraction"); 
-    MonitorElement* mMETDifference_GenMETTrue_MET20to40_Reco=iget_.get(rundir_reco+"/"+"METResolution_GenMETTrue_MET20to40");
-    MonitorElement* mMETDifference_GenMETTrue_MET100to150_Reco=iget_.get(rundir_reco+"/"+"METResolution_GenMETTrue_MET100to150");
-    MonitorElement* mMETDifference_GenMETTrue_MET300to400_Reco=iget_.get(rundir_reco+"/"+"METResolution_GenMETTrue_MET300to400");
+  if (found_miniaod_dir && found_reco_dir) {
+    std::string rundir_reco = RunDir + inputMETLabelRECO_.label();
+    std::string rundir_miniaod = RunDir + inputMETLabelMiniAOD_.label();
+    MonitorElement *mMET_Reco = iget_.get(rundir_reco + "/" + "MET");
+    MonitorElement *mMETPhi_Reco = iget_.get(rundir_reco + "/" + "METPhi");
+    MonitorElement *mSumET_Reco = iget_.get(rundir_reco + "/" + "SumET");
+    MonitorElement *mMETDifference_GenMETTrue_Reco = iget_.get(rundir_reco + "/" + "METDifference_GenMETTrue");
+    MonitorElement *mMETDeltaPhi_GenMETTrue_Reco = iget_.get(rundir_reco + "/" + "METDeltaPhi_GenMETTrue");
+    MonitorElement *mPFPhotonEtFraction_Reco = iget_.get(rundir_reco + "/" + "photonEtFraction");
+    MonitorElement *mPFNeutralHadronEtFraction_Reco = iget_.get(rundir_reco + "/" + "neutralHadronEtFraction");
+    MonitorElement *mPFChargedHadronEtFraction_Reco = iget_.get(rundir_reco + "/" + "chargedHadronEtFraction");
+    MonitorElement *mPFHFHadronEtFraction_Reco = iget_.get(rundir_reco + "/" + "HFHadronEtFraction");
+    MonitorElement *mPFHFEMEtFraction_Reco = iget_.get(rundir_reco + "/" + "HFEMEtFraction");
+    MonitorElement *mMETDifference_GenMETTrue_MET20to40_Reco =
+        iget_.get(rundir_reco + "/" + "METResolution_GenMETTrue_MET20to40");
+    MonitorElement *mMETDifference_GenMETTrue_MET100to150_Reco =
+        iget_.get(rundir_reco + "/" + "METResolution_GenMETTrue_MET100to150");
+    MonitorElement *mMETDifference_GenMETTrue_MET300to400_Reco =
+        iget_.get(rundir_reco + "/" + "METResolution_GenMETTrue_MET300to400");
 
-    std::vector<MonitorElement*>ME_Reco;
+    std::vector<MonitorElement *> ME_Reco;
     ME_Reco.push_back(mMET_Reco);
     ME_Reco.push_back(mMETPhi_Reco);
     ME_Reco.push_back(mSumET_Reco);
@@ -78,22 +74,24 @@ METTesterPostProcessorHarvesting::dqmEndJob(DQMStore::IBooker& ibook_, DQMStore:
     ME_Reco.push_back(mMETDifference_GenMETTrue_MET100to150_Reco);
     ME_Reco.push_back(mMETDifference_GenMETTrue_MET300to400_Reco);
 
+    MonitorElement *mMET_MiniAOD = iget_.get(rundir_miniaod + "/" + "MET");
+    MonitorElement *mMETPhi_MiniAOD = iget_.get(rundir_miniaod + "/" + "METPhi");
+    MonitorElement *mSumET_MiniAOD = iget_.get(rundir_miniaod + "/" + "SumET");
+    MonitorElement *mMETDifference_GenMETTrue_MiniAOD = iget_.get(rundir_miniaod + "/" + "METDifference_GenMETTrue");
+    MonitorElement *mMETDeltaPhi_GenMETTrue_MiniAOD = iget_.get(rundir_miniaod + "/" + "METDeltaPhi_GenMETTrue");
+    MonitorElement *mPFPhotonEtFraction_MiniAOD = iget_.get(rundir_miniaod + "/" + "photonEtFraction");
+    MonitorElement *mPFNeutralHadronEtFraction_MiniAOD = iget_.get(rundir_miniaod + "/" + "neutralHadronEtFraction");
+    MonitorElement *mPFChargedHadronEtFraction_MiniAOD = iget_.get(rundir_miniaod + "/" + "chargedHadronEtFraction");
+    MonitorElement *mPFHFHadronEtFraction_MiniAOD = iget_.get(rundir_miniaod + "/" + "HFHadronEtFraction");
+    MonitorElement *mPFHFEMEtFraction_MiniAOD = iget_.get(rundir_miniaod + "/" + "HFEMEtFraction");
+    MonitorElement *mMETDifference_GenMETTrue_MET20to40_MiniAOD =
+        iget_.get(rundir_miniaod + "/" + "METResolution_GenMETTrue_MET20to40");
+    MonitorElement *mMETDifference_GenMETTrue_MET100to150_MiniAOD =
+        iget_.get(rundir_miniaod + "/" + "METResolution_GenMETTrue_MET100to150");
+    MonitorElement *mMETDifference_GenMETTrue_MET300to400_MiniAOD =
+        iget_.get(rundir_miniaod + "/" + "METResolution_GenMETTrue_MET300to400");
 
-    MonitorElement* mMET_MiniAOD=iget_.get(rundir_miniaod+"/"+"MET");
-    MonitorElement* mMETPhi_MiniAOD=iget_.get(rundir_miniaod+"/"+"METPhi");
-    MonitorElement* mSumET_MiniAOD=iget_.get(rundir_miniaod+"/"+"SumET");
-    MonitorElement* mMETDifference_GenMETTrue_MiniAOD=iget_.get(rundir_miniaod+"/"+"METDifference_GenMETTrue");
-    MonitorElement* mMETDeltaPhi_GenMETTrue_MiniAOD=iget_.get(rundir_miniaod+"/"+"METDeltaPhi_GenMETTrue"); 
-    MonitorElement* mPFPhotonEtFraction_MiniAOD=iget_.get(rundir_miniaod+"/"+"photonEtFraction"); 
-    MonitorElement* mPFNeutralHadronEtFraction_MiniAOD=iget_.get(rundir_miniaod+"/"+"neutralHadronEtFraction"); 
-    MonitorElement* mPFChargedHadronEtFraction_MiniAOD=iget_.get(rundir_miniaod+"/"+"chargedHadronEtFraction"); 
-    MonitorElement* mPFHFHadronEtFraction_MiniAOD=iget_.get(rundir_miniaod+"/"+"HFHadronEtFraction"); 
-    MonitorElement* mPFHFEMEtFraction_MiniAOD=iget_.get(rundir_miniaod+"/"+"HFEMEtFraction"); 
-    MonitorElement* mMETDifference_GenMETTrue_MET20to40_MiniAOD=iget_.get(rundir_miniaod+"/"+"METResolution_GenMETTrue_MET20to40");
-    MonitorElement* mMETDifference_GenMETTrue_MET100to150_MiniAOD=iget_.get(rundir_miniaod+"/"+"METResolution_GenMETTrue_MET100to150");
-    MonitorElement* mMETDifference_GenMETTrue_MET300to400_MiniAOD=iget_.get(rundir_miniaod+"/"+"METResolution_GenMETTrue_MET300to400");
-
-    std::vector<MonitorElement*>ME_MiniAOD;
+    std::vector<MonitorElement *> ME_MiniAOD;
     ME_MiniAOD.push_back(mMET_MiniAOD);
     ME_MiniAOD.push_back(mMETPhi_MiniAOD);
     ME_MiniAOD.push_back(mSumET_MiniAOD);
@@ -108,22 +106,35 @@ METTesterPostProcessorHarvesting::dqmEndJob(DQMStore::IBooker& ibook_, DQMStore:
     ME_MiniAOD.push_back(mMETDifference_GenMETTrue_MET100to150_MiniAOD);
     ME_MiniAOD.push_back(mMETDifference_GenMETTrue_MET300to400_MiniAOD);
 
-    ibook_.setCurrentFolder(RunDir+"MiniAOD_over_RECO");
-    mMET_MiniAOD_over_Reco=ibook_.book1D("MET_MiniAOD_over_RECO",(TH1F*)mMET_Reco->getRootObject());
-    mMETPhi_MiniAOD_over_Reco=ibook_.book1D("METPhi_MiniAOD_over_RECO",(TH1F*)mMETPhi_Reco->getRootObject());
-    mSumET_MiniAOD_over_Reco=ibook_.book1D("SumET_MiniAOD_over_RECO",(TH1F*)mSumET_Reco->getRootObject());
-    mMETDifference_GenMETTrue_MiniAOD_over_Reco=ibook_.book1D("METDifference_GenMETTrue_MiniAOD_over_RECO",(TH1F*)mMETDifference_GenMETTrue_Reco->getRootObject());
-    mMETDeltaPhi_GenMETTrue_MiniAOD_over_Reco=ibook_.book1D("METDeltaPhi_GenMETTrue_MiniAOD_over_RECO",(TH1F*)mMETDeltaPhi_GenMETTrue_Reco->getRootObject());
-    mPFPhotonEtFraction_MiniAOD_over_Reco=ibook_.book1D("photonEtFraction_MiniAOD_over_RECO",(TH1F*)mPFPhotonEtFraction_Reco->getRootObject());
-    mPFNeutralHadronEtFraction_MiniAOD_over_Reco=ibook_.book1D("neutralHadronEtFraction_MiniAOD_over_RECO",(TH1F*)mPFNeutralHadronEtFraction_Reco->getRootObject());
-    mPFChargedHadronEtFraction_MiniAOD_over_Reco=ibook_.book1D("chargedHadronEtFraction_MiniAOD_over_RECO",(TH1F*)mPFChargedHadronEtFraction_Reco->getRootObject());
-    mPFHFHadronEtFraction_MiniAOD_over_Reco=ibook_.book1D("HFHadronEtFraction_MiniAOD_over_RECO",(TH1F*)mPFHFHadronEtFraction_Reco->getRootObject());
-    mPFHFEMEtFraction_MiniAOD_over_Reco=ibook_.book1D("HFEMEtEtFraction_MiniAOD_over_RECO",(TH1F*)mPFHFEMEtFraction_Reco->getRootObject());
-    mMETDifference_GenMETTrue_MET20to40_MiniAOD_over_Reco=ibook_.book1D("METResolution_GenMETTrue_MET20to40_MiniAOD_over_RECO",(TH1F*)mMETDifference_GenMETTrue_MET20to40_Reco->getRootObject());
-    mMETDifference_GenMETTrue_MET100to150_MiniAOD_over_Reco=ibook_.book1D("METResolution_GenMETTrue_MET100to150_MiniAOD_over_RECO",(TH1F*)mMETDifference_GenMETTrue_MET100to150_Reco->getRootObject());
-    mMETDifference_GenMETTrue_MET300to400_MiniAOD_over_Reco=ibook_.book1D("METResolution_GenMETTrue_MET300to400_MiniAOD_over_RECO",(TH1F*)mMETDifference_GenMETTrue_MET300to400_Reco->getRootObject());
+    ibook_.setCurrentFolder(RunDir + "MiniAOD_over_RECO");
+    mMET_MiniAOD_over_Reco = ibook_.book1D("MET_MiniAOD_over_RECO", (TH1F *)mMET_Reco->getRootObject());
+    mMETPhi_MiniAOD_over_Reco = ibook_.book1D("METPhi_MiniAOD_over_RECO", (TH1F *)mMETPhi_Reco->getRootObject());
+    mSumET_MiniAOD_over_Reco = ibook_.book1D("SumET_MiniAOD_over_RECO", (TH1F *)mSumET_Reco->getRootObject());
+    mMETDifference_GenMETTrue_MiniAOD_over_Reco = ibook_.book1D(
+        "METDifference_GenMETTrue_MiniAOD_over_RECO", (TH1F *)mMETDifference_GenMETTrue_Reco->getRootObject());
+    mMETDeltaPhi_GenMETTrue_MiniAOD_over_Reco = ibook_.book1D("METDeltaPhi_GenMETTrue_MiniAOD_over_RECO",
+                                                              (TH1F *)mMETDeltaPhi_GenMETTrue_Reco->getRootObject());
+    mPFPhotonEtFraction_MiniAOD_over_Reco =
+        ibook_.book1D("photonEtFraction_MiniAOD_over_RECO", (TH1F *)mPFPhotonEtFraction_Reco->getRootObject());
+    mPFNeutralHadronEtFraction_MiniAOD_over_Reco = ibook_.book1D(
+        "neutralHadronEtFraction_MiniAOD_over_RECO", (TH1F *)mPFNeutralHadronEtFraction_Reco->getRootObject());
+    mPFChargedHadronEtFraction_MiniAOD_over_Reco = ibook_.book1D(
+        "chargedHadronEtFraction_MiniAOD_over_RECO", (TH1F *)mPFChargedHadronEtFraction_Reco->getRootObject());
+    mPFHFHadronEtFraction_MiniAOD_over_Reco =
+        ibook_.book1D("HFHadronEtFraction_MiniAOD_over_RECO", (TH1F *)mPFHFHadronEtFraction_Reco->getRootObject());
+    mPFHFEMEtFraction_MiniAOD_over_Reco =
+        ibook_.book1D("HFEMEtEtFraction_MiniAOD_over_RECO", (TH1F *)mPFHFEMEtFraction_Reco->getRootObject());
+    mMETDifference_GenMETTrue_MET20to40_MiniAOD_over_Reco =
+        ibook_.book1D("METResolution_GenMETTrue_MET20to40_MiniAOD_over_RECO",
+                      (TH1F *)mMETDifference_GenMETTrue_MET20to40_Reco->getRootObject());
+    mMETDifference_GenMETTrue_MET100to150_MiniAOD_over_Reco =
+        ibook_.book1D("METResolution_GenMETTrue_MET100to150_MiniAOD_over_RECO",
+                      (TH1F *)mMETDifference_GenMETTrue_MET100to150_Reco->getRootObject());
+    mMETDifference_GenMETTrue_MET300to400_MiniAOD_over_Reco =
+        ibook_.book1D("METResolution_GenMETTrue_MET300to400_MiniAOD_over_RECO",
+                      (TH1F *)mMETDifference_GenMETTrue_MET300to400_Reco->getRootObject());
 
-    std::vector<MonitorElement*>ME_MiniAOD_over_Reco;
+    std::vector<MonitorElement *> ME_MiniAOD_over_Reco;
     ME_MiniAOD_over_Reco.push_back(mMET_MiniAOD_over_Reco);
     ME_MiniAOD_over_Reco.push_back(mMETPhi_MiniAOD_over_Reco);
     ME_MiniAOD_over_Reco.push_back(mSumET_MiniAOD_over_Reco);
@@ -138,19 +149,22 @@ METTesterPostProcessorHarvesting::dqmEndJob(DQMStore::IBooker& ibook_, DQMStore:
     ME_MiniAOD_over_Reco.push_back(mMETDifference_GenMETTrue_MET100to150_MiniAOD_over_Reco);
     ME_MiniAOD_over_Reco.push_back(mMETDifference_GenMETTrue_MET300to400_MiniAOD_over_Reco);
 
-    for(unsigned int j=0;j<ME_MiniAOD_over_Reco.size();j++){
-      MonitorElement* monReco=ME_Reco[j];if(monReco && monReco->getRootObject()){
-	MonitorElement* monMiniAOD=ME_MiniAOD[j];if(monMiniAOD && monMiniAOD->getRootObject()){
-	  MonitorElement* monMiniAOD_over_RECO=ME_MiniAOD_over_Reco[j];if(monMiniAOD_over_RECO && monMiniAOD_over_RECO->getRootObject()){
-	    for(int i=0;i<=(monMiniAOD_over_RECO->getNbinsX()+1);i++){
-	      if(monReco->getBinContent(i)!=0){
-		monMiniAOD_over_RECO->setBinContent(i,monMiniAOD->getBinContent(i)/monReco->getBinContent(i));
-	      }else if (monMiniAOD->getBinContent(i)!=0){
-		monMiniAOD_over_RECO->setBinContent(i,-0.5);
-	      }
-	    }
-	  }
-	}
+    for (unsigned int j = 0; j < ME_MiniAOD_over_Reco.size(); j++) {
+      MonitorElement *monReco = ME_Reco[j];
+      if (monReco && monReco->getRootObject()) {
+        MonitorElement *monMiniAOD = ME_MiniAOD[j];
+        if (monMiniAOD && monMiniAOD->getRootObject()) {
+          MonitorElement *monMiniAOD_over_RECO = ME_MiniAOD_over_Reco[j];
+          if (monMiniAOD_over_RECO && monMiniAOD_over_RECO->getRootObject()) {
+            for (int i = 0; i <= (monMiniAOD_over_RECO->getNbinsX() + 1); i++) {
+              if (monReco->getBinContent(i) != 0) {
+                monMiniAOD_over_RECO->setBinContent(i, monMiniAOD->getBinContent(i) / monReco->getBinContent(i));
+              } else if (monMiniAOD->getBinContent(i) != 0) {
+                monMiniAOD_over_RECO->setBinContent(i, -0.5);
+              }
+            }
+          }
+        }
       }
     }
   }
diff --git a/Validation/RecoMET/plugins/METTesterPostProcessorHarvesting.h b/Validation/RecoMET/plugins/METTesterPostProcessorHarvesting.h
index ebecb895497c0..61d1cbf1a10f0 100644
--- a/Validation/RecoMET/plugins/METTesterPostProcessorHarvesting.h
+++ b/Validation/RecoMET/plugins/METTesterPostProcessorHarvesting.h
@@ -4,54 +4,53 @@
 // author: Matthias Weber, Feb 2015
 
 // system include files
-#include <memory>
-#include <cstdio>
 #include <cmath>
+#include <cstdio>
+#include <memory>
 #include <sstream>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "CommonTools/UtilAlgos/interface/TFileService.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 //
 // class decleration
 //
 
 class METTesterPostProcessorHarvesting : public DQMEDHarvester {
-   public:
-      explicit METTesterPostProcessorHarvesting(const edm::ParameterSet&);
-      ~METTesterPostProcessorHarvesting() override;
-
-   private:
-      void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override ;
-
-      edm::InputTag inputMETLabelRECO_;
-      edm::InputTag inputMETLabelMiniAOD_;
-
-      std::vector<std::string> met_dirs;
-
-      MonitorElement* mMET_MiniAOD_over_Reco;
-      MonitorElement* mMETPhi_MiniAOD_over_Reco;
-      MonitorElement* mSumET_MiniAOD_over_Reco;
-      MonitorElement* mPFPhotonEtFraction_MiniAOD_over_Reco;
-      MonitorElement* mPFNeutralHadronEtFraction_MiniAOD_over_Reco;
-      MonitorElement* mPFChargedHadronEtFraction_MiniAOD_over_Reco;
-      MonitorElement* mPFHFHadronEtFraction_MiniAOD_over_Reco;
-      MonitorElement* mPFHFEMEtFraction_MiniAOD_over_Reco;
-      MonitorElement* mMETDifference_GenMETTrue_MiniAOD_over_Reco;
-      MonitorElement* mMETDeltaPhi_GenMETTrue_MiniAOD_over_Reco;
-      MonitorElement* mMETDifference_GenMETTrue_MET20to40_MiniAOD_over_Reco;
-      MonitorElement* mMETDifference_GenMETTrue_MET100to150_MiniAOD_over_Reco;
-      MonitorElement* mMETDifference_GenMETTrue_MET300to400_MiniAOD_over_Reco;
-
+public:
+  explicit METTesterPostProcessorHarvesting(const edm::ParameterSet &);
+  ~METTesterPostProcessorHarvesting() override;
+
+private:
+  void dqmEndJob(DQMStore::IBooker &, DQMStore::IGetter &) override;
+
+  edm::InputTag inputMETLabelRECO_;
+  edm::InputTag inputMETLabelMiniAOD_;
+
+  std::vector<std::string> met_dirs;
+
+  MonitorElement *mMET_MiniAOD_over_Reco;
+  MonitorElement *mMETPhi_MiniAOD_over_Reco;
+  MonitorElement *mSumET_MiniAOD_over_Reco;
+  MonitorElement *mPFPhotonEtFraction_MiniAOD_over_Reco;
+  MonitorElement *mPFNeutralHadronEtFraction_MiniAOD_over_Reco;
+  MonitorElement *mPFChargedHadronEtFraction_MiniAOD_over_Reco;
+  MonitorElement *mPFHFHadronEtFraction_MiniAOD_over_Reco;
+  MonitorElement *mPFHFEMEtFraction_MiniAOD_over_Reco;
+  MonitorElement *mMETDifference_GenMETTrue_MiniAOD_over_Reco;
+  MonitorElement *mMETDeltaPhi_GenMETTrue_MiniAOD_over_Reco;
+  MonitorElement *mMETDifference_GenMETTrue_MET20to40_MiniAOD_over_Reco;
+  MonitorElement *mMETDifference_GenMETTrue_MET100to150_MiniAOD_over_Reco;
+  MonitorElement *mMETDifference_GenMETTrue_MET300to400_MiniAOD_over_Reco;
 };
 
 #endif
diff --git a/Validation/RecoMET/plugins/SealModule.cc b/Validation/RecoMET/plugins/SealModule.cc
index df29a49d4a155..a7bb11dba0eb2 100644
--- a/Validation/RecoMET/plugins/SealModule.cc
+++ b/Validation/RecoMET/plugins/SealModule.cc
@@ -1,11 +1,9 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "METTester.h"
 #include "METTesterPostProcessor.h"
 #include "METTesterPostProcessorHarvesting.h"
 
-DEFINE_FWK_MODULE (METTester);
-DEFINE_FWK_MODULE (METTesterPostProcessor);
-DEFINE_FWK_MODULE (METTesterPostProcessorHarvesting);
-
-
+DEFINE_FWK_MODULE(METTester);
+DEFINE_FWK_MODULE(METTesterPostProcessor);
+DEFINE_FWK_MODULE(METTesterPostProcessorHarvesting);
diff --git a/Validation/RecoParticleFlow/bin/HistoData.cpp b/Validation/RecoParticleFlow/bin/HistoData.cpp
index 83b1100923d1d..690508fa3198a 100644
--- a/Validation/RecoParticleFlow/bin/HistoData.cpp
+++ b/Validation/RecoParticleFlow/bin/HistoData.cpp
@@ -3,16 +3,15 @@
 #include <iostream>
 
 #include <TFile.h>
-#include <TLine.h>
-#include <TPave.h>
-#include <TLine.h>
 #include <TH1.h>
+#include <TLine.h>
 #include <TNamed.h>
- 
-using namespace std;
+#include <TPave.h>
 
-HistoData::HistoData(std::string Name, int Type, int Bin, string NewPath, TFile *NewFile, string RefPath, TFile *RefFile) {
+using namespace std;
 
+HistoData::HistoData(
+    std::string Name, int Type, int Bin, string NewPath, TFile *NewFile, string RefPath, TFile *RefFile) {
   name = Name;
   type = Type;
   bin = Bin;
@@ -21,11 +20,9 @@ HistoData::HistoData(std::string Name, int Type, int Bin, string NewPath, TFile
   refHisto = dynamic_cast<TH1 *>(RefFile->Get(RefPath.c_str()));
 
   initialize();
-
 }
 
-HistoData::HistoData(std::string Name, int Type, int Bin, TH1 *NewHisto, TH1 *RefHisto) { 
-  
+HistoData::HistoData(std::string Name, int Type, int Bin, TH1 *NewHisto, TH1 *RefHisto) {
   name = Name;
   type = Type;
   bin = Bin;
@@ -33,11 +30,9 @@ HistoData::HistoData(std::string Name, int Type, int Bin, TH1 *NewHisto, TH1 *Re
   refHisto = RefHisto;
 
   initialize();
-
 }
 
 void HistoData::initialize() {
-
   // scores/tests initialization
   lowScore = 10.0;
   highScore = 0.0;
@@ -47,8 +42,8 @@ void HistoData::initialize() {
   isEmpty = true;
 
   // for HTML display
-  //resultImage = "NoData_Results.gif";
-  //resultTarget = "NoData_Results.gif";
+  // resultImage = "NoData_Results.gif";
+  // resultTarget = "NoData_Results.gif";
   resultImage = "";
   resultTarget = "";
 
@@ -65,8 +60,8 @@ void HistoData::initialize() {
   // test result color conventions
   passColor = kGreen;
   failColor = kRed;
-  errorColor = 16; // kGray
-  
+  errorColor = 16;  // kGray
+
   // default color and style scheme
   lineUseFillColor = true;
   solidLineColor = kWhite;
@@ -75,40 +70,33 @@ void HistoData::initialize() {
   shadedLineColor = errorColor;
   shadedFillColor = errorColor;
   shadedFillStyle = 3001;
-  
-} 
+}
 
 void HistoData::setResult(bool Result) {
-
   // set the test result
   result = Result;
 
   // set the color scheme
   solidFillColor = result ? passColor : failColor;
   shadedFillColor = result ? passColor : failColor;
-
 }
 
 void HistoData::dump() {
-
   cout << "name      = " << name << endl
        << "type      = " << type << endl
        << "bin       = " << bin << endl
        << "ksScore   = " << ksScore << endl
        << "chi2Score = " << chi2Score << endl
        << "result    = " << (result ? "pass" : "fail") << endl;
-
 }
 
 void HistoData::drawResult(TH1 *Summary, bool Vertical, bool SetBinLabel) {
-
   // add label to the summary if desired
   if (SetBinLabel) {
-    Summary->GetXaxis()->SetBinLabel(bin,getRefHisto()->GetTitle());
-    //Summary->GetXaxis()->SetBinLabel(bin,name.c_str());
-  }
-  else 
-    Summary->GetXaxis()->SetBinLabel(bin,name.c_str());
+    Summary->GetXaxis()->SetBinLabel(bin, getRefHisto()->GetTitle());
+    // Summary->GetXaxis()->SetBinLabel(bin,name.c_str());
+  } else
+    Summary->GetXaxis()->SetBinLabel(bin, name.c_str());
 
   double minimum = Summary->GetMinimum();
   // determine where to draw the result (score axis)
@@ -123,31 +111,43 @@ void HistoData::drawResult(TH1 *Summary, bool Vertical, bool SetBinLabel) {
   double binCenter = Summary->GetBinCenter(bin);
   double binWidth = Summary->GetBinWidth(bin);
   double bin1 = binCenter - binWidth / 3;
-  double bin2 = binCenter + binWidth / 3; 
+  double bin2 = binCenter + binWidth / 3;
 
   // set coordinates of display based on plot alignment
   double solidX1, solidY1, solidX2, solidY2;
   double hatchedX1, hatchedY1, hatchedX2, hatchedY2;
   double axisX1, axisY1, axisX2, axisY2;
   if (Vertical) {
-    solidX1 = bin1; solidX2 = bin2;
-    solidY1 = score1; solidY2 = score2;
-    hatchedX1 = bin1; hatchedX2 = bin2;
-    hatchedY1 = score2; hatchedY2 = score3;
-    axisX1 = bin1; axisX2 = bin2;
-    axisY1 = minimum; axisY2 = minimum;
+    solidX1 = bin1;
+    solidX2 = bin2;
+    solidY1 = score1;
+    solidY2 = score2;
+    hatchedX1 = bin1;
+    hatchedX2 = bin2;
+    hatchedY1 = score2;
+    hatchedY2 = score3;
+    axisX1 = bin1;
+    axisX2 = bin2;
+    axisY1 = minimum;
+    axisY2 = minimum;
   } else {
-    solidX1 = score1; solidX2 = score2;
-    solidY1 = bin1; solidY2 = bin2;
-    hatchedX1 = score2; hatchedX2 = score3;
-    hatchedY1 = bin1; hatchedY2 = bin2;
-    axisX1 = minimum; axisX2 = minimum;
-    axisY1 = bin1; axisY2 = bin2;
+    solidX1 = score1;
+    solidX2 = score2;
+    solidY1 = bin1;
+    solidY2 = bin2;
+    hatchedX1 = score2;
+    hatchedX2 = score3;
+    hatchedY1 = bin1;
+    hatchedY2 = bin2;
+    axisX1 = minimum;
+    axisX2 = minimum;
+    axisY1 = bin1;
+    axisY2 = bin2;
   }
 
   // a solid bar is drawn from zero to the lowest score
   if (lowScore > minimum && lowScore != 10.) {
-    TPave *solidBar = new TPave(solidX1,solidY1,solidX2,solidY2,1,"");
+    TPave *solidBar = new TPave(solidX1, solidY1, solidX2, solidY2, 1, "");
     solidBar->SetBit(kCanDelete);
     solidBar->SetLineColor(lineUseFillColor ? solidFillColor : solidLineColor);
     solidBar->SetFillColor(solidFillColor);
@@ -157,7 +157,7 @@ void HistoData::drawResult(TH1 *Summary, bool Vertical, bool SetBinLabel) {
 
   // a hatched bar is drawn from the lowest score to the highest score
   if ((lowScore != highScore && highScore > minimum) || lowScore == 10.) {
-    TPave *hatchedBar = new TPave(hatchedX1,hatchedY1,hatchedX2,hatchedY2,1,"");
+    TPave *hatchedBar = new TPave(hatchedX1, hatchedY1, hatchedX2, hatchedY2, 1, "");
     hatchedBar->SetBit(kCanDelete);
     hatchedBar->SetLineColor(lineUseFillColor ? shadedFillColor : shadedLineColor);
     hatchedBar->SetFillColor(shadedFillColor);
@@ -166,18 +166,21 @@ void HistoData::drawResult(TH1 *Summary, bool Vertical, bool SetBinLabel) {
   }
 
   // paste a line over the base axis to fix border color artifacts
-  TLine *axisLine = new TLine(axisX1,axisY1,axisX2,axisY2);
-  if (Vertical) axisLine->SetLineColor(Summary->GetAxisColor("X"));
-  else axisLine->SetLineColor(Summary->GetAxisColor("Y"));
+  TLine *axisLine = new TLine(axisX1, axisY1, axisX2, axisY2);
+  if (Vertical)
+    axisLine->SetLineColor(Summary->GetAxisColor("X"));
+  else
+    axisLine->SetLineColor(Summary->GetAxisColor("Y"));
   axisLine->SetBit(kCanDelete);
   axisLine->Draw("SAME");
 
-  //paste a line before (in this proceeding that means after) Barrel and Endcap Plots
-  if ( name == "ERPt" || name == "BRPt" ) {
-    axisY1=axisY2=binCenter+binWidth/2;
-    axisX2=Summary->GetMaximum();
-    axisX1=Summary->GetMinimum()-200;
-    TLine *regionLine = new TLine(axisX1,axisY1,axisX2,axisY2);
+  // paste a line before (in this proceeding that means after) Barrel and Endcap
+  // Plots
+  if (name == "ERPt" || name == "BRPt") {
+    axisY1 = axisY2 = binCenter + binWidth / 2;
+    axisX2 = Summary->GetMaximum();
+    axisX1 = Summary->GetMinimum() - 200;
+    TLine *regionLine = new TLine(axisX1, axisY1, axisX2, axisY2);
     regionLine->SetLineColor(Summary->GetAxisColor("X"));
     regionLine->SetBit(kCanDelete);
     regionLine->SetLineWidth(3);
diff --git a/Validation/RecoParticleFlow/bin/PlotCompareUtility.cpp b/Validation/RecoParticleFlow/bin/PlotCompareUtility.cpp
index 748c761c4a4e2..28860d627adf9 100644
--- a/Validation/RecoParticleFlow/bin/PlotCompareUtility.cpp
+++ b/Validation/RecoParticleFlow/bin/PlotCompareUtility.cpp
@@ -1,30 +1,33 @@
 #include "include/PlotCompareUtility.h"
 
-#include "include/PlotTypes.h"
 #include "include/Plot1D.h"
 #include "include/Plot2D.h"
+#include "include/PlotTypes.h"
 #include "include/Style.h"
 
 #include <fstream>
 
 #include <TCanvas.h>
-#include <TStyle.h>
 #include <TFile.h>
+#include <TGaxis.h>
 #include <TH1F.h>
 #include <TH2F.h>
 #include <TLine.h>
 #include <TPave.h>
+#include <TStyle.h>
 #include <TText.h>
-#include <TGaxis.h>
 using namespace std;
 
-PlotCompareUtility::PlotCompareUtility(std::string Reference, std::string New, std::string NewBasePath,
-  std::string NewPrefix, std::string RefBasePath, std::string RefPrefix) {
-
+PlotCompareUtility::PlotCompareUtility(std::string Reference,
+                                       std::string New,
+                                       std::string NewBasePath,
+                                       std::string NewPrefix,
+                                       std::string RefBasePath,
+                                       std::string RefPrefix) {
   // open TFiles
   cout << refFile << " " << newFile << endl;
-  refFile = new TFile(Reference.c_str(),"READ");
-  newFile = new TFile(New.c_str(),"READ");
+  refFile = new TFile(Reference.c_str(), "READ");
+  newFile = new TFile(New.c_str(), "READ");
 
   // set the data path and prefix
   newBasePath = NewBasePath;
@@ -40,7 +43,7 @@ PlotCompareUtility::PlotCompareUtility(std::string Reference, std::string New, s
   summaryWidth = 700;
   summaryBarsThickness = 20;
   summaryTopMargin = 60;
-  summaryLeftMargin = 250;//former 180
+  summaryLeftMargin = 250;  // former 180
   summaryRightMargin = 60;
   summaryBottomMargin = 60;
 
@@ -66,19 +69,17 @@ PlotCompareUtility::PlotCompareUtility(std::string Reference, std::string New, s
   // use (near as possible) tdrstyle for plots
   static TStyle style = genStyle();
   style.cd();
-
 }
 
 PlotCompareUtility::~PlotCompareUtility() {
-
   // close TFiles
-  if (refFile != NULL) refFile->Close();
-  if (newFile != NULL) newFile->Close();
-
+  if (refFile != nullptr)
+    refFile->Close();
+  if (newFile != nullptr)
+    newFile->Close();
 }
 
 void PlotCompareUtility::dump() {
-
   cout << "RefFile     = " << refFile->GetName() << endl
        << "RefBasePath = " << refBasePath << endl
        << "RefPrefix   = " << refPrefix << endl
@@ -86,98 +87,95 @@ void PlotCompareUtility::dump() {
        << "NewBasePath = " << newBasePath << endl
        << "NewPrefix   = " << newPrefix << endl
        << "NumHistos   = " << histos.size() << endl;
-
 }
 
 bool PlotCompareUtility::compare(HistoData *HD) {
-
   bool retval = false;
   switch (HD->getType()) {
-    case Plot1D: retval = compare<Plot1D>(HD); break;
-    case Plot2D: retval = compare<Plot2D>(HD); break;
+    case Plot1D:
+      retval = compare<Plot1D>(HD);
+      break;
+    case Plot2D:
+      retval = compare<Plot2D>(HD);
+      break;
   }
 
   finalResult &= retval;
   return retval;
-
 }
 
 void PlotCompareUtility::makePlots(HistoData *HD) {
-
   switch (HD->getType()) {
-    case Plot1D: makePlots<Plot1D>(HD); break;
-    case Plot2D: makePlots<Plot2D>(HD); break;
+    case Plot1D:
+      makePlots<Plot1D>(HD);
+      break;
+    case Plot2D:
+      makePlots<Plot2D>(HD);
+      break;
   }
-
 }
 
 void PlotCompareUtility::makeHTML(HistoData *HD) {
-
   switch (HD->getType()) {
-    case Plot1D: makeHTML<Plot1D>(HD); break;
-    case Plot2D: makeHTML<Plot2D>(HD); break;
+    case Plot1D:
+      makeHTML<Plot1D>(HD);
+      break;
+    case Plot2D:
+      makeHTML<Plot2D>(HD);
+      break;
   }
-
 }
 
 HistoData *PlotCompareUtility::addHistoData(string NewName, string RefName, int Type) {
-
   // location of this HistoData within the PCU
-  static int bin = 0;   bin++;
+  static int bin = 0;
+  bin++;
 
   // location of histograms in files
   string newPath = newBasePath + "/" + newPrefix + "/" + NewName;
   string refPath = refBasePath + "/" + refPrefix + "/" + RefName;
-  cout << "NewPath     = " <<newPath  << endl;
-  cout << "RefPath     = " <<refPath  << endl;
- // store the HistoData information
-  HistoData hd(NewName,Type,bin,newPath,newFile,refPath,refFile);
-  histos.push_back(hd); 
-  //histos.insert(histos.begin(),hd);
+  cout << "NewPath     = " << newPath << endl;
+  cout << "RefPath     = " << refPath << endl;
+  // store the HistoData information
+  HistoData hd(NewName, Type, bin, newPath, newFile, refPath, refFile);
+  histos.push_back(hd);
+  // histos.insert(histos.begin(),hd);
   return &(*histos.rbegin());
-  
-
 }
 
-HistoData *PlotCompareUtility::addProjectionXData(HistoData *Parent, std::string Name, int Type, int Bin, TH1* NewHisto, TH1* RefHisto) {
-
+HistoData *PlotCompareUtility::addProjectionXData(
+    HistoData *Parent, std::string Name, int Type, int Bin, TH1 *NewHisto, TH1 *RefHisto) {
   // store the HistoData/projection information
-  HistoData hd(Name,Type,Bin,NewHisto,RefHisto);
+  HistoData hd(Name, Type, Bin, NewHisto, RefHisto);
   projectionsX[Parent].push_back(hd);
   return &(*projectionsX[Parent].rbegin());
-
 }
 
-HistoData *PlotCompareUtility::addProjectionYData(HistoData *Parent, std::string Name, int Type, int Bin, TH1* NewHisto, TH1* RefHisto) {
-
+HistoData *PlotCompareUtility::addProjectionYData(
+    HistoData *Parent, std::string Name, int Type, int Bin, TH1 *NewHisto, TH1 *RefHisto) {
   // store the HistoData/projection information
-  HistoData hd(Name,Type,Bin,NewHisto,RefHisto);
+  HistoData hd(Name, Type, Bin, NewHisto, RefHisto);
   projectionsY[Parent].push_back(hd);
   return &(*projectionsY[Parent].rbegin());
-
 }
 
-
 bool PlotCompareUtility::isValid() const {
- 
   string newPath = newBasePath + "/" + newPrefix;
   string refPath = refBasePath + "/" + refPrefix;
   // check the files and that the paths are valid
-  bool refValid = (refFile != NULL) && (refFile->Get(refPath.c_str()) != NULL);
-  bool newValid = (newFile != NULL) && (newFile->Get(newPath.c_str()) != NULL);
+  bool refValid = (refFile != nullptr) && (refFile->Get(refPath.c_str()) != nullptr);
+  bool newValid = (newFile != nullptr) && (newFile->Get(newPath.c_str()) != nullptr);
 
   return refValid && newValid;
-
 }
 
 void PlotCompareUtility::centerRebin(TH1 *H1, TH1 *H2) {
-
   // determine x axis range and binning requirements
-  float h1RMS =  H1->GetRMS();
-  float h2RMS =  H2->GetRMS();
+  float h1RMS = H1->GetRMS();
+  float h2RMS = H2->GetRMS();
   float rms = TMath::Max(h1RMS, h2RMS);
-  float h1Mean =  H1->GetMean();
-  float h2Mean =  H2->GetMean();
+  float h1Mean = H1->GetMean();
+  float h2Mean = H2->GetMean();
   float mean = 0.5 * (h1Mean + h2Mean);
   float nBins = H2->GetNbinsX();
   float minX = H2->GetXaxis()->GetXmin();
@@ -188,14 +186,14 @@ void PlotCompareUtility::centerRebin(TH1 *H1, TH1 *H2) {
   float newMaxX = 1;
 
   if (rms > 0) {
-    dNdX = 100. / ( 10 * rms);
+    dNdX = 100. / (10 * rms);
     newMinX = mean - 5 * rms;
     newMaxX = mean + 5 * rms;
   }
 
   // center the histograms onto a common range
-  H1->GetXaxis()->SetRangeUser(newMinX,newMaxX);
-  H2->GetXaxis()->SetRangeUser(newMinX,newMaxX);
+  H1->GetXaxis()->SetRangeUser(newMinX, newMaxX);
+  H2->GetXaxis()->SetRangeUser(newMinX, newMaxX);
 
   // rebin the histograms if appropriate
   if (dX * dNdX > 0) {
@@ -208,66 +206,59 @@ void PlotCompareUtility::centerRebin(TH1 *H1, TH1 *H2) {
   float maxY1 = H1->GetMaximum();
   float maxY2 = H2->GetMaximum();
   float newMinY = 1e-1;
-  float newMaxY = maxY1 > maxY2 ? maxY1 : maxY2; newMaxY *= 2;
-
-  // ensure that the peaks will be drawn when combined 
-  H1->GetYaxis()->SetRangeUser(newMinY,newMaxY);
-  H2->GetYaxis()->SetRangeUser(newMinY,newMaxY);
+  float newMaxY = maxY1 > maxY2 ? maxY1 : maxY2;
+  newMaxY *= 2;
 
+  // ensure that the peaks will be drawn when combined
+  H1->GetYaxis()->SetRangeUser(newMinY, newMaxY);
+  H2->GetYaxis()->SetRangeUser(newMinY, newMaxY);
 }
 
 void PlotCompareUtility::renormalize(TH1 *H1, TH1 *H2) {
-
   // normalize H2 to H1 (typically this would be hnew to href)
   H2->SetNormFactor(H1->GetEntries());
-
 }
 
 double PlotCompareUtility::getThreshold() const {
-
   double threshold;
 
   // the largest non-zero threshold
   if (ksThreshold > 0 && chi2Threshold > 0)
     threshold = ksThreshold < chi2Threshold ? ksThreshold : chi2Threshold;
-  else threshold = ksThreshold > 0 ? ksThreshold : chi2Threshold;
+  else
+    threshold = ksThreshold > 0 ? ksThreshold : chi2Threshold;
 
   return threshold;
-
 }
 
 void PlotCompareUtility::makeSummary(string Name) {
-
   // produce plot and html
   makeSummaryPlot(Name);
   makeSummaryHTML(Name);
-
 }
 
 void PlotCompareUtility::makeDefaultPlots() {
-
   // make a default plot for when there i nothing to display
-  TCanvas noDataCanvas("noDataCanvas","noDataCanvas",plotsWidth,plotsHeight);
+  TCanvas noDataCanvas("noDataCanvas", "noDataCanvas", plotsWidth, plotsHeight);
   noDataCanvas.SetFrameFillColor(10);
   noDataCanvas.Draw();
-  TText noData(0.5,0.5,"No Data");
+  TText noData(0.5, 0.5, "No Data");
   noData.Draw();
   noDataCanvas.Print("NoData_Results.gif");
-
 }
 
 void PlotCompareUtility::makeSummaryPlot(string Name) {
-
   // generate a reasonable height for the summary plot
   int numHistos = histos.size();
   summaryHeight = summaryBottomMargin + summaryTopMargin + int(float(numHistos * summaryBarsThickness) * 1.5);
 
-  // the canvas is rescaled during gif conversion, so add padding to Canvas dimensions
+  // the canvas is rescaled during gif conversion, so add padding to Canvas
+  // dimensions
   int summaryCanvasWidth = summaryWidth + 4;
   int summaryCanvasHeight = summaryHeight + 28;
 
   // create and setup summary canvas
-  TCanvas summaryCanvas("summaryCanvas","summaryCanvas",summaryCanvasWidth,summaryCanvasHeight);
+  TCanvas summaryCanvas("summaryCanvas", "summaryCanvas", summaryCanvasWidth, summaryCanvasHeight);
   summaryCanvas.SetFrameFillColor(10);
   summaryCanvas.SetLogx(1);
   summaryCanvas.SetGrid();
@@ -278,18 +269,18 @@ void PlotCompareUtility::makeSummaryPlot(string Name) {
   summaryCanvas.Draw();
 
   // create and setup the summary histogram
-  TH1F summary("summary","Compatibility with Reference Histograms",numHistos,1,numHistos+1);
-  summary.GetXaxis()->SetLabelSize(float(summaryLeftMargin) / (11 * summaryWidth)); //used to be 3*
+  TH1F summary("summary", "Compatibility with Reference Histograms", numHistos, 1, numHistos + 1);
+  summary.GetXaxis()->SetLabelSize(float(summaryLeftMargin) / (11 * summaryWidth));  // used to be 3*
   summary.GetYaxis()->SetLabelSize(summary.GetXaxis()->GetLabelSize());
   summary.GetYaxis()->SetTitle("Compatibility");
-  summary.SetStats(0);
-  summary.GetYaxis()->SetRangeUser(getThreshold()/10,2);
+  summary.SetStats(false);
+  summary.GetYaxis()->SetRangeUser(getThreshold() / 10, 2);
   summary.Draw("hbar0");
 
   // loop over hd's and draw result
-    vector<HistoData>::iterator hd;
+  vector<HistoData>::iterator hd;
   for (hd = histos.begin(); hd != histos.end(); hd++)
-    hd->drawResult(&summary,false,true);
+    hd->drawResult(&summary, false, true);
 
   // draw the pass/fail cutoff line
   TLine passLine(getThreshold(), 1, getThreshold(), numHistos + 1);
@@ -301,11 +292,9 @@ void PlotCompareUtility::makeSummaryPlot(string Name) {
   // create the summary image
   string gifName = Name + ".gif";
   summaryCanvas.Print(gifName.c_str());
-
 }
 
 void PlotCompareUtility::makeSummaryHTML(string Name) {
-
   // create HTML support code
   string gifName = Name + ".gif";
   string html = "index.html";
@@ -313,7 +302,8 @@ void PlotCompareUtility::makeSummaryHTML(string Name) {
 
   // print top portion of document
   fout << "<!DOCTYPE gif PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">" << endl
-       << "<html>" << endl << endl
+       << "<html>" << endl
+       << endl
        << "  <head>" << endl
        << "    <script type=\"text/javascript\">" << endl
        << "      function tn(target, image) {" << endl
@@ -321,19 +311,29 @@ void PlotCompareUtility::makeSummaryHTML(string Name) {
        << "        document.getElementById(\"thumb\").src = image" << endl
        << "      }" << endl
        << "    </script>" << endl
-       << "  </head>" << endl << endl
-       << "  <body>" << endl << endl
+       << "  </head>" << endl
+       << endl
+       << "  <body>" << endl
+       << endl
        << "    <style type=\"text/css\">" << endl
-       << "      #thumb_d {position: absolute; position: fixed; left: 5px; top: 80px; text-align: center; }" << endl
+       << "      #thumb_d {position: absolute; position: fixed; left: 5px; "
+          "top: 80px; text-align: center; }"
+       << endl
        << "      #main_d {position: relative; left: 175px; }" << endl
-       << "    </style>" << endl << endl
+       << "    </style>" << endl
+       << endl
        << "    <!-- added for IE compatibility (untested)" << endl
        << "    <script language=\"JScript\">" << endl
        << "      if (document.recalc && document.body.attachEvent) {" << endl
-       << "        theDiv.style.setExpression(\"top\", \"document.body.scrollTop + 150\"); " << endl
-       << "        document.body.onscroll = function() { document.recalc(true) }; " << endl 
+       << "        theDiv.style.setExpression(\"top\", "
+          "\"document.body.scrollTop + 150\"); "
+       << endl
+       << "        document.body.onscroll = function() { document.recalc(true) "
+          "}; "
+       << endl
        << "      }" << endl
-       << "    </script> -->" << endl << endl
+       << "    </script> -->" << endl
+       << endl
        << "    <div id=\"main_d\">" << endl
        << "      <img src=\"" << gifName << "\" usemap=\"#" << Name << "\" alt=\"\" style=\"border-style: none;\""
        << " height=" << summaryHeight << " width=" << summaryWidth << " border=0>" << endl
@@ -342,7 +342,6 @@ void PlotCompareUtility::makeSummaryHTML(string Name) {
   // loop over HistoData entries
   vector<HistoData>::iterator hd;
   for (hd = histos.begin(); hd != histos.end(); hd++) {
-
     // determine map coordinates for this bin (2 pixel offset due to borders?)
     int bin = hd->getBin();
     int x1 = summaryLeftMargin;
@@ -354,23 +353,26 @@ void PlotCompareUtility::makeSummaryHTML(string Name) {
 
     // add coordinates area to image map
     fout << "        <area shape=\"rect\" alt=\"\" coords=\"" << x1 << "," << y1 << "," << x2 << "," << y2
-         << "\" href=\"" << target  << "\" onMouseOver=\"tn('" << target << "','" << image << "')\">" << endl;
-
+         << "\" href=\"" << target << "\" onMouseOver=\"tn('" << target << "','" << image << "')\">" << endl;
   }
 
   // print bottom portion of document
   fout << "        <area shape=\"default\" nohref=\"nohref\" alt=\"\">" << endl
        << "      </map>" << endl
-       << "    </div>" << endl << endl
+       << "    </div>" << endl
+       << endl
        << "    <div id=\"thumb_d\">" << endl
-       << "      <a href=\"#\" id=\"thumblink\"><img src=\"NoData_Results.gif\" id=\"thumb\" width=200 height=150 border=0></a>" << endl
+       << "      <a href=\"#\" id=\"thumblink\"><img src=\"NoData_Results.gif\" "
+          "id=\"thumb\" width=200 height=150 border=0></a>"
+       << endl
        << "      <br><a href=\"log.txt\">Root Output</a>" << endl
        << "      <br><a href=\"err.txt\">Root Warnings</a>" << endl
-       << "    </div>" << endl << endl
-       << "  </body>" << endl << endl
+       << "    </div>" << endl
+       << endl
+       << "  </body>" << endl
+       << endl
        << "</html>" << endl;
 
   // close the file
   fout.close();
-
 }
diff --git a/Validation/RecoParticleFlow/bin/include/HistoData.h b/Validation/RecoParticleFlow/bin/include/HistoData.h
index bcb0d4338df17..ea1f8ed6641d9 100644
--- a/Validation/RecoParticleFlow/bin/include/HistoData.h
+++ b/Validation/RecoParticleFlow/bin/include/HistoData.h
@@ -1,22 +1,21 @@
 #ifndef HISTO_DATA__H
 #define HISTO_DATA__H
 
-#include <string>
-#include <cstring>
-#include <TH1.h>
 #include <TFile.h>
-
+#include <TH1.h>
+#include <cstring>
+#include <string>
 
 class HistoData {
 public:
-
-  HistoData(std::string Name, int PlotType, int Bin, std::string NewPath, TFile *NewFile, std::string RefPath, TFile *RefFile);
+  HistoData(
+      std::string Name, int PlotType, int Bin, std::string NewPath, TFile *NewFile, std::string RefPath, TFile *RefFile);
   HistoData(std::string Name, int PlotType, int Bin, TH1 *NewHisto, TH1 *RefHisto);
   virtual ~HistoData() {}
 
   // Get General Information
   std::string getName() const { return name; }
-  //PlotType getType() const { return type; }
+  // PlotType getType() const { return type; }
   int getType() const { return type; }
   int getBin() const { return bin; }
   TH1 *getNewHisto() const { return newHisto; }
@@ -54,7 +53,7 @@ class HistoData {
 
   // Set General Information
   void setName(std::string Name) { name = Name; }
-  //void setType(PlotType Type) { type = Type; }
+  // void setType(PlotType Type) { type = Type; }
   void setType(int PlotType) { type = PlotType; }
   void setBin(int Bin) { bin = Bin; }
   void setResultImage(std::string Image) { resultImage = Image; }
@@ -67,7 +66,10 @@ class HistoData {
   void setDoAllow2DRebinningY(bool Toggle) { doAllow2DRebinningY = Toggle; }
   void setDoProjectionsX(bool Toggle) { doProjectionsX = Toggle; }
   void setDoProjectionsY(bool Toggle) { doProjectionsY = Toggle; }
-  void setMaxProjections(int Num) { maxProjectionsX = Num; maxProjectionsY = Num; }
+  void setMaxProjections(int Num) {
+    maxProjectionsX = Num;
+    maxProjectionsY = Num;
+  }
   void setMaxProjectionsX(bool Num) { maxProjectionsX = Num; }
   void setMaxProjectionsY(bool Num) { maxProjectionsY = Num; }
 
@@ -76,7 +78,7 @@ class HistoData {
   void setChi2Score(float Score) { chi2Score = Score; }
   void setLowScore(float Score) { lowScore = Score; }
   void setHighScore(float Score) { highScore = Score; }
-  void setResult(bool Result); // also sets display colors
+  void setResult(bool Result);  // also sets display colors
   void setIsEmpty(bool Toggle) { isEmpty = Toggle; }
 
   // Set Visual Attributes
@@ -90,14 +92,16 @@ class HistoData {
 
   // Misc Functions
   void drawResult(TH1 *Summary, bool Vertical = true, bool SetLabels = false);
-  void clear(){ newHisto->Clear(); refHisto->Clear(); };
+  void clear() {
+    newHisto->Clear();
+    refHisto->Clear();
+  };
   inline void dump();
 
 private:
-
   // Misc. Data
   std::string name;
-  //PlotType type;
+  // PlotType type;
   int type;
   int bin;
   TH1 *newHisto;
@@ -131,7 +135,6 @@ class HistoData {
 
   // Implementation Function
   void initialize();
-
 };
 
-#endif // HISTO_DATA__H
+#endif  // HISTO_DATA__H
diff --git a/Validation/RecoParticleFlow/bin/include/Plot1D.h b/Validation/RecoParticleFlow/bin/include/Plot1D.h
index f38f2dd0253c7..90ba8b5e6bd04 100644
--- a/Validation/RecoParticleFlow/bin/include/Plot1D.h
+++ b/Validation/RecoParticleFlow/bin/include/Plot1D.h
@@ -4,62 +4,67 @@
 #include "PlotCompareUtility.h"
 #include "PlotTypes.h"
 
-#include <TString.h>
 #include <TCanvas.h>
-#include <TLegend.h>
 #include <TH1F.h>
+#include <TLegend.h>
+#include <TString.h>
 #include <TText.h>
 
-#include <iostream>
 #include <fstream>
+#include <iostream>
 #include <string>
 
-template < >
+template <>
 bool PlotCompareUtility::compare<Plot1D>(HistoData *HD) {
-
   // get the reference and comparison histograms
   TH1F *href = (TH1F *)HD->getRefHisto();
   TH1F *hnew = (TH1F *)HD->getNewHisto();
 
   // do not run comparisons if either histogram is empty/broken
-  if (hnew == NULL || href == NULL || hnew->GetEntries() <= 1 || href->GetEntries() <= 1) {
-    //std::cerr << HD->getName() << " error: unable to retrieve histogram (or no entries)\n";
-    HD->setIsEmpty(true); return false;
+  if (hnew == nullptr || href == nullptr || hnew->GetEntries() <= 1 || href->GetEntries() <= 1) {
+    // std::cerr << HD->getName() << " error: unable to retrieve histogram (or
+    // no entries)\n";
+    HD->setIsEmpty(true);
+    return false;
   }
 
   // rebin histograms and center on common range
-  if (HD->getDoAllow1DRebinning()) centerRebin(href,hnew);
+  if (HD->getDoAllow1DRebinning())
+    centerRebin(href, hnew);
 
   // run statistical comparisons
-  double ksScore = hnew->KolmogorovTest(href,"D");
-  double chi2Score = hnew->Chi2Test(href,"uup");
+  double ksScore = hnew->KolmogorovTest(href, "D");
+  double chi2Score = hnew->Chi2Test(href, "uup");
 
   // renormalize histograms for common display
-  renormalize(href,hnew);
+  renormalize(href, hnew);
 
   // set ks/chi2 and determine high/low scores
-  HD->setKSScore(ksScore); HD->setChi2Score(chi2Score);
+  HD->setKSScore(ksScore);
+  HD->setChi2Score(chi2Score);
   if (ksThreshold > 0 && chi2Threshold > 0) {
     HD->setLowScore(ksScore < chi2Score ? ksScore : chi2Score);
-    HD->setHighScore(ksScore > chi2Score ? ksScore : chi2Score); 
-  } 
-  else if (ksThreshold > 0) {  HD->setLowScore(ksScore); HD->setHighScore(ksScore); }
-  else if (chi2Threshold > 0) { HD->setLowScore(chi2Score); HD->setHighScore(chi2Score); }
-  else std::cerr << "error: no test performed? chi2Threshold and ksThreshold <= 0\n";
+    HD->setHighScore(ksScore > chi2Score ? ksScore : chi2Score);
+  } else if (ksThreshold > 0) {
+    HD->setLowScore(ksScore);
+    HD->setHighScore(ksScore);
+  } else if (chi2Threshold > 0) {
+    HD->setLowScore(chi2Score);
+    HD->setHighScore(chi2Score);
+  } else
+    std::cerr << "error: no test performed? chi2Threshold and ksThreshold <= 0\n";
 
   // check overall result
   bool passed = (ksScore >= ksThreshold && chi2Score >= chi2Threshold);
   HD->setResult(passed);
-//  if (!passed) std::cout << "NOTPASSED!!!!"; else std::cout << "YESPASSED!";
+  //  if (!passed) std::cout << "NOTPASSED!!!!"; else std::cout << "YESPASSED!";
   // returns true on test passed and false on test failed
   HD->setIsEmpty(false);
   return passed;
-
 }
 
-template < >
+template <>
 void PlotCompareUtility::makePlots<Plot1D>(HistoData *HD) {
-
   std::cerr << HD->getName() << "makePlots<Plot1D>\n";
 
   // do not make any new plot if empty
@@ -74,14 +79,14 @@ void PlotCompareUtility::makePlots<Plot1D>(HistoData *HD) {
   TH1F *hnew = (TH1F *)HD->getNewHisto();
 
   // set drawing options on the reference histogram
-  href->SetStats(0);
+  href->SetStats(false);
   href->SetLineWidth(2);
   href->SetLineColor(14);
   href->SetMarkerColor(14);
   href->SetFillColor(18);
 
   // set drawing options on the new histogram
-  hnew->SetStats(0);
+  hnew->SetStats(false);
   hnew->SetLineWidth(2);
   hnew->SetLineColor(HD->getShadedLineColor());
   hnew->SetFillStyle(HD->getShadedFillStyle());
@@ -89,15 +94,22 @@ void PlotCompareUtility::makePlots<Plot1D>(HistoData *HD) {
 
   // place the test results as the title
   TString title = HD->getName();
-  if (ksThreshold > 0) {title += " KS Score = "; title += HD->getKSScore();} 
-  if (chi2Threshold > 0) { title += " Chi^2 Score = "; title += HD->getChi2Score();} 
+  if (ksThreshold > 0) {
+    title += " KS Score = ";
+    title += HD->getKSScore();
+  }
+  if (chi2Threshold > 0) {
+    title += " Chi^2 Score = ";
+    title += HD->getChi2Score();
+  }
 
-  // the canvas is rescaled during gif conversion, so add padding to Canvas dimensions
+  // the canvas is rescaled during gif conversion, so add padding to Canvas
+  // dimensions
   int plotsCanvasWidth = plotsWidth + 4;
   int plotsCanvasHeight = plotsHeight + 28;
 
   // setup canvas for displaying the compared histograms
-  TCanvas hCanvas("hCanvas","hCanvas",plotsCanvasWidth,plotsCanvasHeight);
+  TCanvas hCanvas("hCanvas", "hCanvas", plotsCanvasWidth, plotsCanvasHeight);
   hCanvas.SetTopMargin(float(plotsTopMargin) / plotsHeight);
   hCanvas.SetLeftMargin(float(plotsLeftMargin) / plotsWidth);
   hCanvas.SetRightMargin(float(plotsRightMargin) / plotsWidth);
@@ -107,33 +119,34 @@ void PlotCompareUtility::makePlots<Plot1D>(HistoData *HD) {
   hCanvas.SetLogy(1);
   hCanvas.Draw();
 
-  TText canvasTitle(0.1,0.97,title.Data());
+  TText canvasTitle(0.1, 0.97, title.Data());
   canvasTitle.Draw("SAME");
 
   // draw the histograms
   href->Draw();
   hnew->Draw("SAME");
-  if (HD->getDoDrawErrorBars()) hnew->Draw("E1SAME");
+  if (HD->getDoDrawErrorBars())
+    hnew->Draw("E1SAME");
 
   // draw a legend
-  TLegend legend(0.15,0.01,0.3, 0.08);
-  legend.AddEntry(hnew,"New","lF");
-  legend.AddEntry(href,"Reference","lF");
+  TLegend legend(0.15, 0.01, 0.3, 0.08);
+  legend.AddEntry(hnew, "New", "lF");
+  legend.AddEntry(href, "Reference", "lF");
   legend.SetFillColor(kNone);
   legend.Draw("SAME");
 
   // create the plots overlay image
   std::string gifName = HD->getName() + "_Results.gif";
-  if (HD->getResultImage() == "") HD->setResultImage(gifName);
-  if (HD->getResultTarget() == "") HD->setResultTarget(gifName);
+  if (HD->getResultImage().empty())
+    HD->setResultImage(gifName);
+  if (HD->getResultTarget().empty())
+    HD->setResultTarget(gifName);
   std::cerr << "About to print" << gifName << "\n";
   hCanvas.Print(gifName.c_str());
-
 }
 
-template < >
+template <>
 void PlotCompareUtility::makeHTML<Plot1D>(HistoData *HD) {
-
   /* HTML is not presently required for 1D histograms -- do nothing
 
   // create HTML support code for this HistoData
@@ -144,13 +157,11 @@ void PlotCompareUtility::makeHTML<Plot1D>(HistoData *HD) {
 
   // simply link to the appropriate image overlay
   fout << "<html><body><img src=\"" << gifName << "\"></body></html>" << endl;
-  
+
   // close the file
   fout.close();
 
   */
-
 }
 
-
-#endif // PLOT_1D__H
+#endif  // PLOT_1D__H
diff --git a/Validation/RecoParticleFlow/bin/include/Plot2D.h b/Validation/RecoParticleFlow/bin/include/Plot2D.h
index bcb97e17e578d..40bb21e6968d0 100644
--- a/Validation/RecoParticleFlow/bin/include/Plot2D.h
+++ b/Validation/RecoParticleFlow/bin/include/Plot2D.h
@@ -1,53 +1,59 @@
 #ifndef PLOT_2D__H
 #define PLOT_2D__H
 
-#include "PlotCompareUtility.h"
 #include "Plot1D.h"
+#include "PlotCompareUtility.h"
 #include "PlotTypes.h"
 
-#include <TProfile.h>
+#include <TGaxis.h>
 #include <TH1F.h>
 #include <TH2F.h>
-#include <TGaxis.h>
 #include <TLine.h>
+#include <TProfile.h>
 
-#include <iostream>
+#include <cmath>
+#include <cstdio>
 #include <fstream>
+#include <iostream>
 #include <string>
-#include <math.h>
-#include <stdio.h>
 
-template < >
+template <>
 bool PlotCompareUtility::compare<Plot2D>(HistoData *HD) {
-
   // get the reference and comparison histograms
   TH2F *href2d = (TH2F *)HD->getRefHisto();
   TH2F *hnew2d = (TH2F *)HD->getNewHisto();
 
   // do not run comparisons if either histogram is empty/broken
-  if (hnew2d == NULL || href2d == NULL || hnew2d->GetEntries() <= 1 || href2d->GetEntries() <= 1) {
-    //std::cerr << HD->getName() << " error: unable to retrieve histogram (or no entries)\n";
-    HD->setIsEmpty(true); return false;
-  } 
+  if (hnew2d == nullptr || href2d == nullptr || hnew2d->GetEntries() <= 1 || href2d->GetEntries() <= 1) {
+    // std::cerr << HD->getName() << " error: unable to retrieve histogram (or
+    // no entries)\n";
+    HD->setIsEmpty(true);
+    return false;
+  }
 
   // prepare an overall result
   bool projectionsPassed = true;
 
   // loop over axes (projections on one or both may be requested)
   for (int axis = axisX; axis <= axisY; ++axis) {
-
-    // for X: verify projections requested and proper Y binning of href2d and hnew2d
-    if (axis == axisX && !HD->getDoProjectionsX()) continue;
+    // for X: verify projections requested and proper Y binning of href2d and
+    // hnew2d
+    if (axis == axisX && !HD->getDoProjectionsX())
+      continue;
     if (axis == axisX && href2d->GetNbinsY() != hnew2d->GetNbinsY()) {
       std::cerr << HD->getName() << " error: incorrect number of bins for X projection tests\n";
-      projectionsPassed = false; continue;
+      projectionsPassed = false;
+      continue;
     }
 
-    // for Y: verify projections requested and proper X binning of href2d and hnew2d
-    if (axis == axisY && !HD->getDoProjectionsY()) continue;
+    // for Y: verify projections requested and proper X binning of href2d and
+    // hnew2d
+    if (axis == axisY && !HD->getDoProjectionsY())
+      continue;
     if (axis == axisY && href2d->GetNbinsX() != hnew2d->GetNbinsX()) {
       std::cerr << HD->getName() << " error: incorrect number of bins for Y projection tests\n";
-      projectionsPassed = false; continue;
+      projectionsPassed = false;
+      continue;
     }
 
     // setup the rebinning variables
@@ -73,18 +79,22 @@ bool PlotCompareUtility::compare<Plot2D>(HistoData *HD) {
     }
 
     // loop over bins in histograms (go backwords to keep in order)
-    //for (int bin = nBins; bin >= 1; --bin) {
+    // for (int bin = nBins; bin >= 1; --bin) {
     for (int bin = 1; bin <= nBins; ++bin) {
-
       std::cout << "bin " << bin << " of " << nBins << std::endl;
       // create some unique identifiers for the histogram names
-      TString projName = HD->getName() + (axis == axisX ? "_px" : "_py"); projName += bin;
-      TString newProjName = "new_"; newProjName += projName;
-      TString refProjName = "ref_"; refProjName += projName;
+      TString projName = HD->getName() + (axis == axisX ? "_px" : "_py");
+      projName += bin;
+      TString newProjName = "new_";
+      newProjName += projName;
+      TString refProjName = "ref_";
+      refProjName += projName;
 
       // get the 1d projections for this bin out of the histogram
-      TH1D *hnew = (axis == axisX) ? hnew2d->ProjectionX(newProjName.Data(),bin,bin) : hnew2d->ProjectionY(newProjName.Data(),bin,bin);
-      TH1D *href = (axis == axisX) ? href2d->ProjectionX(refProjName.Data(),bin,bin) : href2d->ProjectionY(refProjName.Data(),bin,bin);
+      TH1D *hnew = (axis == axisX) ? hnew2d->ProjectionX(newProjName.Data(), bin, bin)
+                                   : hnew2d->ProjectionY(newProjName.Data(), bin, bin);
+      TH1D *href = (axis == axisX) ? href2d->ProjectionX(refProjName.Data(), bin, bin)
+                                   : href2d->ProjectionY(refProjName.Data(), bin, bin);
 
       // set histogram axis labels
       hnew->GetXaxis()->SetTitle((axis == axisX ? hnew2d->GetXaxis()->GetTitle() : hnew2d->GetYaxis()->GetTitle()));
@@ -95,29 +105,33 @@ bool PlotCompareUtility::compare<Plot2D>(HistoData *HD) {
       href->SetBit(kCanDelete);
 
       // create a new HistoData based on this projection
-      HistoData *proj = (axis == axisX) ? addProjectionXData(HD,projName.Data(),Plot1D,bin,hnew,href) \
-        : addProjectionYData(HD,projName.Data(),Plot1D,bin,hnew,href);
+      HistoData *proj = (axis == axisX) ? addProjectionXData(HD, projName.Data(), Plot1D, bin, hnew, href)
+                                        : addProjectionYData(HD, projName.Data(), Plot1D, bin, hnew, href);
 
       // ignore empty bins
-      //if (hnew->Integral() == 0 || href->Integral() == 0) continue;
-      if (hnew->GetEntries() <= 1 || href->GetEntries() <= 1||hnew->Integral() == 0 || href->Integral() == 0) continue;
-      
+      // if (hnew->Integral() == 0 || href->Integral() == 0) continue;
+      if (hnew->GetEntries() <= 1 || href->GetEntries() <= 1 || hnew->Integral() == 0 || href->Integral() == 0)
+        continue;
+
       // run this new HistoData through compare<Plot1D>
       projectionsPassed &= compare<Plot1D>(proj);
-           
-      // get the high and low scores from this comparison
-      float lowScore = proj->getLowScore(); float highScore = proj->getHighScore();
-      if (lowScore < HD->getLowScore()) HD->setLowScore(lowScore);
-      if (highScore > HD->getHighScore()) HD->setHighScore(highScore);
 
+      // get the high and low scores from this comparison
+      float lowScore = proj->getLowScore();
+      float highScore = proj->getHighScore();
+      if (lowScore < HD->getLowScore())
+        HD->setLowScore(lowScore);
+      if (highScore > HD->getHighScore())
+        HD->setHighScore(highScore);
     }
 
     // if 2d histograms were rebinned, delete the clone and re-get the original
     if (rebinned) {
-      delete href2d; href2d = (TH2F *)HD->getRefHisto();
-      delete hnew2d; hnew2d = (TH2F *)HD->getNewHisto();
+      delete href2d;
+      href2d = (TH2F *)HD->getRefHisto();
+      delete hnew2d;
+      hnew2d = (TH2F *)HD->getNewHisto();
     }
-
   }
 
   // check overall result
@@ -126,14 +140,12 @@ bool PlotCompareUtility::compare<Plot2D>(HistoData *HD) {
 
   // returns true on test passed and false on test failed
   return projectionsPassed;
-
 }
 
-template < >
+template <>
 void PlotCompareUtility::makePlots<Plot2D>(HistoData *HD) {
-
   // do not make any new plot if empty
-  if (HD->getIsEmpty()) { 
+  if (HD->getIsEmpty()) {
     HD->setResultImage("NoData_Results.gif");
     HD->setResultTarget("NoData_Results.gif");
     return;
@@ -141,15 +153,17 @@ void PlotCompareUtility::makePlots<Plot2D>(HistoData *HD) {
 
   // loop over the projections to make 1D plots
   std::vector<HistoData>::iterator hd;
-  for (hd = projectionsX[HD].begin(); hd != projectionsX[HD].end(); hd++) makePlots<Plot1D>(&(*hd));
-  for (hd = projectionsY[HD].begin(); hd != projectionsY[HD].end(); hd++) makePlots<Plot1D>(&(*hd));
+  for (hd = projectionsX[HD].begin(); hd != projectionsX[HD].end(); hd++)
+    makePlots<Plot1D>(&(*hd));
+  for (hd = projectionsY[HD].begin(); hd != projectionsY[HD].end(); hd++)
+    makePlots<Plot1D>(&(*hd));
 
   // make projection summaries
   for (int axis = axisX; axis <= axisY; ++axis) {
-
     // get the list of projections associated with this HistoData
     std::vector<HistoData> *proj = (axis == axisX) ? &projectionsX[HD] : &projectionsY[HD];
-    if (proj == NULL || proj->size() == 0) continue;
+    if (proj == nullptr || proj->empty())
+      continue;
 
     // get the 2d histograms
     TH2F *hnew2d = (TH2F *)HD->getNewHisto();
@@ -160,12 +174,14 @@ void PlotCompareUtility::makePlots<Plot2D>(HistoData *HD) {
     int bodyWidth = int(float(numHistos * projectionsBarsThickness) * 1.5);
     projectionsWidth = projectionsLeftMargin + projectionsRightMargin + bodyWidth;
 
-    // the canvas is rescaled during gif conversion, so add padding to Canvas dimensions
+    // the canvas is rescaled during gif conversion, so add padding to Canvas
+    // dimensions
     int projectionsCanvasWidth = projectionsWidth + 4;
     int projectionsCanvasHeight = projectionsHeight + 28;
 
     // create and setup projections canvas
-    TCanvas projectionsCanvas("projectionsCanvas","projectionsCanvas",projectionsCanvasWidth,projectionsCanvasHeight);
+    TCanvas projectionsCanvas(
+        "projectionsCanvas", "projectionsCanvas", projectionsCanvasWidth, projectionsCanvasHeight);
     projectionsCanvas.SetFrameFillColor(10);
     projectionsCanvas.SetLogy(1);
     projectionsCanvas.SetTopMargin(float(projectionsTopMargin) / projectionsHeight);
@@ -175,9 +191,10 @@ void PlotCompareUtility::makePlots<Plot2D>(HistoData *HD) {
     projectionsCanvas.Draw();
 
     // create and setup the summary histogram
-    TH1F projectionsSummary("projectionsSummary","Compatibility with Reference Histograms",numHistos,1,numHistos+1);
-    projectionsSummary.GetYaxis()->SetRangeUser(getThreshold()/10,2);
-    projectionsSummary.SetStats(0);
+    TH1F projectionsSummary(
+        "projectionsSummary", "Compatibility with Reference Histograms", numHistos, 1, numHistos + 1);
+    projectionsSummary.GetYaxis()->SetRangeUser(getThreshold() / 10, 2);
+    projectionsSummary.SetStats(false);
 
     // display histogram (take axis from original histogram)
     projectionsSummary.Draw("AH");
@@ -185,23 +202,25 @@ void PlotCompareUtility::makePlots<Plot2D>(HistoData *HD) {
     // draw X axis
     float xMin = hnew2d->GetXaxis()->GetXmin();
     float xMax = hnew2d->GetXaxis()->GetXmax();
-    int ticksNDiv = numHistos * 20 + bodyWidth / 50;//formerly *20
-    TGaxis *xAxis = new TGaxis(1,0,numHistos + 1,0,xMin,xMax,ticksNDiv,"");
-    if (axis == axisX) xAxis->SetTitle(hnew2d->GetYaxis()->GetTitle());
-    if (axis == axisY) xAxis->SetTitle(hnew2d->GetXaxis()->GetTitle());
+    int ticksNDiv = numHistos * 20 + bodyWidth / 50;  // formerly *20
+    TGaxis *xAxis = new TGaxis(1, 0, numHistos + 1, 0, xMin, xMax, ticksNDiv, "");
+    if (axis == axisX)
+      xAxis->SetTitle(hnew2d->GetYaxis()->GetTitle());
+    if (axis == axisY)
+      xAxis->SetTitle(hnew2d->GetXaxis()->GetTitle());
     xAxis->Draw();
 
     // draw Y axis
-    float yMin = getThreshold()/10;
+    float yMin = getThreshold() / 10;
     float yMax = 2;
-    TGaxis *yAxis = new TGaxis(1,yMin,1,yMax,yMin,yMax,510,"G");
+    TGaxis *yAxis = new TGaxis(1, yMin, 1, yMax, yMin, yMax, 510, "G");
     yAxis->SetTitle("Compatibility");
     yAxis->Draw();
 
     // loop over projections and draw result
     std::vector<HistoData>::iterator pd;
     for (pd = proj->begin(); pd != proj->end(); pd++)
-      pd->drawResult(&projectionsSummary,true,false);
+      pd->drawResult(&projectionsSummary, true, false);
 
     // draw the pass/fail cutoff line
     TLine passLine(1, getThreshold(), numHistos + 1, getThreshold());
@@ -226,7 +245,7 @@ void PlotCompareUtility::makePlots<Plot2D>(HistoData *HD) {
     hnew->SetBit(kCanDelete);
 
     // create a new HistoData based on this projection and plot it
-    HistoData allBins(projName,Plot1D,0,hnew,href);
+    HistoData allBins(projName, Plot1D, 0, hnew, href);
     allBins.setIsEmpty(false);
     allBins.setShadedFillColor(HD->getShadedFillColor());
     allBins.setShadedFillStyle(HD->getShadedFillStyle());
@@ -234,13 +253,14 @@ void PlotCompareUtility::makePlots<Plot2D>(HistoData *HD) {
     makePlots<Plot1D>(&allBins);
 
     // set the default image (axisY takes priority by default)
-    if (HD->getResultImage() == "" || axis == axisY) HD->setResultImage(projName + "_Results.gif");
+    if (HD->getResultImage().empty() || axis == axisY)
+      HD->setResultImage(projName + "_Results.gif");
 
     // set the default target (in case additional HTML code is/was not produced)
     std::string currentTarget = HD->getResultTarget();
     std::string xImgTarget = HD->getName() + "_px_Results.gif";
-    if (currentTarget == "" || (axis == axisY && currentTarget == xImgTarget)) HD->setResultTarget(projName + "_Results.gif");
-
+    if (currentTarget.empty() || (axis == axisY && currentTarget == xImgTarget))
+      HD->setResultTarget(projName + "_Results.gif");
   }
 
   /*
@@ -248,15 +268,16 @@ void PlotCompareUtility::makePlots<Plot2D>(HistoData *HD) {
   for (int axis = axisX; axis <= axisY; ++axis) {
 
     // make profile plots out of original 2D histograms
-    TProfile *pref = (axis == axisX) ? ((TH2F *)HD->getRefHisto())->ProfileY() : ((TH2F *)HD->getRefHisto())->ProfileX();
-    TProfile *pnew = (axis == axisX) ? ((TH2F *)HD->getNewHisto())->ProfileY() : ((TH2F *)HD->getNewHisto())->ProfileX();
+    TProfile *pref = (axis == axisX) ? ((TH2F *)HD->getRefHisto())->ProfileY() :
+  ((TH2F *)HD->getRefHisto())->ProfileX(); TProfile *pnew = (axis == axisX) ?
+  ((TH2F *)HD->getNewHisto())->ProfileY() : ((TH2F
+  *)HD->getNewHisto())->ProfileX();
 
     // renormalize results for display
-  	renormalize(pref,pnew);
+        renormalize(pref,pnew);
 
-    // do not allow Root to deallocate this memory after drawing (tries to free twice?)
-    pref->SetBit(kCanDelete);
-    pnew->SetBit(kCanDelete);
+    // do not allow Root to deallocate this memory after drawing (tries to free
+  twice?) pref->SetBit(kCanDelete); pnew->SetBit(kCanDelete);
 
     // set drawing options on the reference histogram
     pref->SetStats(0);
@@ -270,9 +291,9 @@ void PlotCompareUtility::makePlots<Plot2D>(HistoData *HD) {
     // place the test results as the title
     TString title = HD->getName();
 
-    // the canvas is rescaled during gif conversion, so add padding to Canvas dimensions
-    int plotsCanvasWidth = plotsWidth + 4;
-    int plotsCanvasHeight = plotsHeight + 28;
+    // the canvas is rescaled during gif conversion, so add padding to Canvas
+  dimensions int plotsCanvasWidth = plotsWidth + 4; int plotsCanvasHeight =
+  plotsHeight + 28;
 
     // setup canvas for displaying the compared histograms
     TCanvas hCanvas("hCanvas",title.Data(),plotsCanvasWidth,plotsCanvasHeight);
@@ -289,7 +310,7 @@ void PlotCompareUtility::makePlots<Plot2D>(HistoData *HD) {
     pref->Draw();
     pnew->Draw("SAME");
     if (HD->getDoDrawErrorBars()) pnew->Draw("E1SAME");
- 
+
     // draw a legend
     TLegend legend(0.15,0.01,0.3, 0.08);
     legend.AddEntry(pnew,"New","lF");
@@ -298,43 +319,45 @@ void PlotCompareUtility::makePlots<Plot2D>(HistoData *HD) {
     legend.Draw("SAME");
 
     // create the plots overlay image
-    std::string gifName = HD->getName() + (axis == axisX ? "_pfx.gif" : "_pfy.gif");
-    hCanvas.Print(gifName.c_str());
+    std::string gifName = HD->getName() + (axis == axisX ? "_pfx.gif" :
+  "_pfy.gif"); hCanvas.Print(gifName.c_str());
 
     // set the default image (axisY takes priority by default)
-    if (HD->getResultImage() == "" || axis == axisY) HD->setResultImage(gifName);
+    if (HD->getResultImage() == "" || axis == axisY)
+  HD->setResultImage(gifName);
 
     // set the default target (in case additional HTML code is/was not produced)
     std::string currentTarget = HD->getResultTarget();
     std::string xImgTarget = HD->getName() + "_pfx.gif";
-    if (currentTarget == "" || (axis == axisY && currentTarget == xImgTarget)) HD->setResultTarget(gifName);
+    if (currentTarget == "" || (axis == axisY && currentTarget == xImgTarget))
+  HD->setResultTarget(gifName);
 
   }
   */
-
-
 }
 
-template < >
+template <>
 void PlotCompareUtility::makeHTML<Plot2D>(HistoData *HD) {
-
   /* at present, makeHTML<Plot1D> does nothing, so don't waste the CPU cycles
   // loop over projections and produce HTML
   std::vector<HistoData>::iterator hd;
-  for (hd = projectionsX[HD].begin(); hd != projectionsX[HD].end(); hd++) makePlots<Plot1D>(&(*hd));
-  for (hd = projectionsY[HD].begin(); hd != projectionsY[HD].end(); hd++) makePlots<Plot1D>(&(*hd));
+  for (hd = projectionsX[HD].begin(); hd != projectionsX[HD].end(); hd++)
+  makePlots<Plot1D>(&(*hd)); for (hd = projectionsY[HD].begin(); hd !=
+  projectionsY[HD].end(); hd++) makePlots<Plot1D>(&(*hd));
   */
 
   // get the HistoData name for later reuse
   std::string Name = HD->getName();
 
   // loop over the axes to see if projections were produced
-  bool pfDone[2] = { false, false };
+  bool pfDone[2] = {false, false};
   for (int axis = axisX; axis <= axisY; axis++) {
-
     // get the list of projections associated with this HistoData
     std::vector<HistoData> *proj = (axis == axisX) ? &projectionsX[HD] : &projectionsY[HD];
-    if (proj == NULL || proj->size() == 0) continue; else pfDone[axis] = true;
+    if (proj == nullptr || proj->empty())
+      continue;
+    else
+      pfDone[axis] = true;
 
     // setup some names, etc. for insertion into the HTML
     std::string gifNameProjections = Name + (axis == axisX ? "_Results_px.gif" : "_Results_py.gif");
@@ -360,40 +383,53 @@ void PlotCompareUtility::makeHTML<Plot2D>(HistoData *HD) {
          << "<html>" << std::endl
          << "  <head>" << std::endl
          << "    <title>Compatibility of Projections for " << HD->getRefHisto()->GetTitle() << "</title>" << std::endl
-         << "    <script type='text/javascript'>" << std::endl << std::endl
+         << "    <script type='text/javascript'>" << std::endl
+         << std::endl
          << "      function tn(target,image,class) {" << std::endl
          << "        clear()" << std::endl
-	 << "        document.getElementById('thumb_div').setAttribute('class',class)" << std::endl
-         << "        document.getElementById('thumb_div').setAttribute('className',class)" << std::endl
+         << "        "
+            "document.getElementById('thumb_div').setAttribute('class',class)"
+         << std::endl
+         << "        "
+            "document.getElementById('thumb_div').setAttribute('className',"
+            "class)"
+         << std::endl
          << "        document.getElementById('thumb_link').href = target" << std::endl
          << "        document.getElementById('thumb_img').src = image" << std::endl
          << "        document.getElementById('thumb_img').width = '" << thumbWidth << "'" << std::endl
-         << "        document.getElementById('thumb_img').height = '" <<  thumbHeight << "'" << std::endl
+         << "        document.getElementById('thumb_img').height = '" << thumbHeight << "'" << std::endl
          << "        document.getElementById('thumb_img').border = '1'" << std::endl
-         << "      }" << std::endl << std::endl
+         << "      }" << std::endl
+         << std::endl
          << "      function clear() {" << std::endl
          << "        document.getElementById('thumb_link').href = '#'" << std::endl
          << "        document.getElementById('thumb_img').src = ''" << std::endl
          << "        document.getElementById('thumb_img').width = '0'" << std::endl
          << "        document.getElementById('thumb_img').height = '0'" << std::endl
          << "        document.getElementById('thumb_img').border = '0'" << std::endl
-         << "      }" << std::endl << std::endl
+         << "      }" << std::endl
+         << std::endl
          << "    </script>" << std::endl
          << "  </head>" << std::endl
-         << "  <body onClick=\"window.location.href='index.html'\">" << std::endl
-      //         << "<a href='index.html'>"
+         << "  <body onClick=\"window.location.href='index.html'\">"
+         << std::endl
+         //         << "<a href='index.html'>"
          << "    <style type='text/css'>" << std::endl
-	 << "      #thumb_div {}" << std::endl
-         << "      div.thumb_left {position: absolute; left: " << leftThumbPos << "px; top: " << thumbsLoc << "px;}" << std::endl
-         << "      div.thumb_right {position: absolute; left: " << rightThumbPos << "px; top: " << thumbsLoc << "px;}" << std::endl
-				 << "      #main_d {position: absolute; left: " << offset << "px;}" << std::endl
+         << "      #thumb_div {}" << std::endl
+         << "      div.thumb_left {position: absolute; left: " << leftThumbPos << "px; top: " << thumbsLoc << "px;}"
+         << std::endl
+         << "      div.thumb_right {position: absolute; left: " << rightThumbPos << "px; top: " << thumbsLoc << "px;}"
+         << std::endl
+         << "      #main_d {position: absolute; left: " << offset << "px;}" << std::endl
          << "      a:link {color: #000000}" << std::endl
          << "      a:visited {color: #000000}" << std::endl
          << "      a:hover {color: #000000}" << std::endl
          << "      a:active {color: #000000}" << std::endl
          << "    </style>" << std::endl
-         << "    <div id='main_d'>" << std::endl
-      // << " <p>" <<   HD->getRefHisto()->GetTitle() << "</p>"  //include the Title of the Plot as a title of the page
+         << "    <div id='main_d'>"
+         << std::endl
+         // << " <p>" <<   HD->getRefHisto()->GetTitle() << "</p>"  //include
+         // the Title of the Plot as a title of the page
          << "      <img src='" << gifNameProjections << "' usemap='#results' alt=''"
          << " height=" << projectionsHeight << " width=" << projectionsWidth << " border=0>" << std::endl
          << "      <map id='#results' name='results' onMouseOut=\"clear()\">" << std::endl;
@@ -401,7 +437,6 @@ void PlotCompareUtility::makeHTML<Plot2D>(HistoData *HD) {
     // loop over projections
     std::vector<HistoData>::iterator pd;
     for (pd = proj->begin(); pd != proj->end(); pd++) {
-
       // determine map coordinates for this bin (1 pixel offset due to borders?)
       int bin = pd->getBin();
       int x1 = projectionsLeftMargin + int(float(bin * 1.5 - 1.25) * projectionsBarsThickness);
@@ -414,30 +449,30 @@ void PlotCompareUtility::makeHTML<Plot2D>(HistoData *HD) {
       // add coordinates area to image map
       std::string tnClass = (bin - 1 >= float(proj->size()) / 2 ? "thumb_left" : "thumb_right");
       fout << "        <area shape='rect' alt='' coords='" << x1 << "," << y1 << "," << x2 << "," << y2 << "'"
-           << " href='" << target << "' onMouseOver=\"tn('" << target << "','" << image << "','" << tnClass
-           << "')\" "
+           << " href='" << target << "' onMouseOver=\"tn('" << target << "','" << image << "','" << tnClass << "')\" "
            << "onMouseDown=\"window.location.href='" << target << "'\">" << std::endl;
-
     }
 
-    fout << "        <area shape='default' nohref='nohref' onMouseDown='window.location.reload()' alt=''>" << std::endl
+    fout << "        <area shape='default' nohref='nohref' "
+            "onMouseDown='window.location.reload()' alt=''>"
+         << std::endl
          << "      </map>" << std::endl
          << "      <br><img src=\"" << gifNameAllProj << "\">" << std::endl
          << "    </div>" << std::endl
-         << "    <div id='thumb_div'><a href='#' id='thumb_link'><img src='' id='thumb_img' width=0 height=0 border=0></a></div>" << std::endl
-      //         << " </a>"
+         << "    <div id='thumb_div'><a href='#' id='thumb_link'><img src='' "
+            "id='thumb_img' width=0 height=0 border=0></a></div>"
+         << std::endl
+         //         << " </a>"
          << "  </body>" << std::endl
          << "</html>" << std::endl;
 
     // close the file
     HD->setResultTarget(htmlNameProfile);
     fout.close();
-
   }
 
   // if both profile dimensions were filled, we need an additional HTML document
   if (pfDone[axisX] && pfDone[axisY]) {
-  
     // create HTML support code for this HistoData
     std::string html = Name + "_Results_Profiles.html";
     std::ofstream fout(html.c_str());
@@ -458,9 +493,7 @@ void PlotCompareUtility::makeHTML<Plot2D>(HistoData *HD) {
     // close the file
     HD->setResultTarget(html);
     fout.close();
-
   }
-
 }
 
-#endif // PLOT_2D__H
+#endif  // PLOT_2D__H
diff --git a/Validation/RecoParticleFlow/bin/include/PlotCompareUtility.h b/Validation/RecoParticleFlow/bin/include/PlotCompareUtility.h
index 70b6a0eabc376..c5da1017bc04d 100644
--- a/Validation/RecoParticleFlow/bin/include/PlotCompareUtility.h
+++ b/Validation/RecoParticleFlow/bin/include/PlotCompareUtility.h
@@ -3,9 +3,9 @@
 
 #include "HistoData.h"
 
-#include <vector>
 #include <map>
 #include <string>
+#include <vector>
 
 #ifndef HTML1D
 #define HTML1D
@@ -16,11 +16,15 @@ class TH1;
 
 class PlotCompareUtility {
 public:
-
-  // BasePath = the path to data in the DQM root file (eg., "DQMData/METTask/ECAL/data")
-  // Prefix = the prefix common to all histograms in area (eg., "METTask_" or "")
-  PlotCompareUtility(std::string Reference, std::string New, std::string NewBasePath,
-    std::string NewPrefix = "", std::string RefBasePath = "", std::string RefPrefix = "");
+  // BasePath = the path to data in the DQM root file (eg.,
+  // "DQMData/METTask/ECAL/data") Prefix = the prefix common to all histograms
+  // in area (eg., "METTask_" or "")
+  PlotCompareUtility(std::string Reference,
+                     std::string New,
+                     std::string NewBasePath,
+                     std::string NewPrefix = "",
+                     std::string RefBasePath = "",
+                     std::string RefPrefix = "");
   virtual ~PlotCompareUtility();
 
   // Axis Conventions (For Specifying Profiles, Projections, etc.)
@@ -30,14 +34,15 @@ class PlotCompareUtility {
   std::vector<HistoData> *getHistos() { return &histos; }
   std::vector<HistoData> *getProjectionsX(HistoData *HD) { return &projectionsX[HD]; }
   std::vector<HistoData> *getProjectionsY(HistoData *HD) { return &projectionsY[HD]; }
-  int getNumHistos() const { return histos.size(); } 
-  //int getNumProjectionsX(HistoData *HD) const { return projectionsX[HD].size(); }
-  //int getNumProjectionsY(HistoData *HD) const { return projectionsY[HD].size(); }
+  int getNumHistos() const { return histos.size(); }
+  // int getNumProjectionsX(HistoData *HD) const { return
+  // projectionsX[HD].size(); } int getNumProjectionsY(HistoData *HD) const {
+  // return projectionsY[HD].size(); }
 
   // Getters for Statistical Comparisons
   double getKSThreshold() const { return ksThreshold; }
   double getChi2Threshold() const { return chi2Threshold; }
-  double getThreshold() const; // the lowest non-zero test threshold
+  double getThreshold() const;  // the lowest non-zero test threshold
   bool getFinalResult() const { return finalResult; }
 
   // Getters for Drawing Options
@@ -90,9 +95,11 @@ class PlotCompareUtility {
 
   // Add HistoData Objects for Comparison
   HistoData *addHistoData(std::string NewName, std::string RefName, int PlotType);
-  HistoData *addHistoData(std::string Name, int PlotType) { return addHistoData(Name,Name,PlotType); }
-  HistoData *addProjectionXData(HistoData *Parent, std::string Name, int PlotType, int Bin, TH1* NewHisto, TH1* RefHisto);
-  HistoData *addProjectionYData(HistoData *Parent, std::string Name, int PlotType, int Bin, TH1* NewHisto, TH1* RefHisto);
+  HistoData *addHistoData(std::string Name, int PlotType) { return addHistoData(Name, Name, PlotType); }
+  HistoData *addProjectionXData(
+      HistoData *Parent, std::string Name, int PlotType, int Bin, TH1 *NewHisto, TH1 *RefHisto);
+  HistoData *addProjectionYData(
+      HistoData *Parent, std::string Name, int PlotType, int Bin, TH1 *NewHisto, TH1 *RefHisto);
   void clearHistos() { histos.clear(); }
   void clearProjectionsX(HistoData *Parent) { projectionsX[Parent].clear(); }
   void clearProjectionsY(HistoData *Parent) { projectionsY[Parent].clear(); }
@@ -105,18 +112,17 @@ class PlotCompareUtility {
   void makeSummary(std::string Name);
   void makeSummaryPlot(std::string Name);
   void makeSummaryHTML(std::string Name);
-  //void makeProjectionsSummary();
-  //void makeProjectionsSummaryPlots();
-  //void makeProjectionsSummaryHTML();
+  // void makeProjectionsSummary();
+  // void makeProjectionsSummaryPlots();
+  // void makeProjectionsSummaryHTML();
   bool isValid() const;
   void dump();
 
 private:
-
   // data holders for histogram types
   std::vector<HistoData> histos;
-  std::map<HistoData *,std::vector<HistoData> > projectionsX;
-  std::map<HistoData *,std::vector<HistoData> > projectionsY;
+  std::map<HistoData *, std::vector<HistoData>> projectionsX;
+  std::map<HistoData *, std::vector<HistoData>> projectionsY;
 
   // file pointers and file organization
   TFile *refFile;
@@ -131,15 +137,18 @@ class PlotCompareUtility {
   double chi2Threshold;
 
   // private (implementation/helper) functions
-  template <int PlotType> bool compare(HistoData *);
-  template <int PlotType> void makePlots(HistoData *);
-  template <int PlotType> void makeHTML(HistoData *);
+  template <int PlotType>
+  bool compare(HistoData *);
+  template <int PlotType>
+  void makePlots(HistoData *);
+  template <int PlotType>
+  void makeHTML(HistoData *);
   void centerRebin(TH1 *, TH1 *);
   void renormalize(TH1 *, TH1 *);
 
   // summary settings
-  int summaryWidth; // user defined
-  int summaryHeight; // set by plotter
+  int summaryWidth;   // user defined
+  int summaryHeight;  // set by plotter
   int summaryBarsThickness;
   int summaryTopMargin;
   int summaryLeftMargin;
@@ -147,8 +156,8 @@ class PlotCompareUtility {
   int summaryBottomMargin;
 
   // 2d projections summary settings
-  int projectionsWidth; // set by plotter
-  int projectionsHeight; // user defined
+  int projectionsWidth;   // set by plotter
+  int projectionsHeight;  // user defined
   int projectionsBarsThickness;
   int projectionsTopMargin;
   int projectionsLeftMargin;
@@ -156,8 +165,8 @@ class PlotCompareUtility {
   int projectionsBottomMargin;
 
   // 1d distribution plots settings
-  int plotsWidth; // user defined
-  int plotsHeight; // user defined
+  int plotsWidth;   // user defined
+  int plotsHeight;  // user defined
   int plotsTopMargin;
   int plotsLeftMargin;
   int plotsRightMargin;
@@ -165,7 +174,6 @@ class PlotCompareUtility {
 
   // true if all run tests pass, false if any fail
   bool finalResult;
-
 };
 
-#endif // PLOT_COMPARE_UTILITY__H
+#endif  // PLOT_COMPARE_UTILITY__H
diff --git a/Validation/RecoParticleFlow/bin/include/PlotTypes.h b/Validation/RecoParticleFlow/bin/include/PlotTypes.h
index e34fb5c62ec89..375146d239c56 100644
--- a/Validation/RecoParticleFlow/bin/include/PlotTypes.h
+++ b/Validation/RecoParticleFlow/bin/include/PlotTypes.h
@@ -3,4 +3,4 @@
 
 enum PlotType { Plot1D, Plot2D };
 
-#endif // PLOT_TYPES__H
+#endif  // PLOT_TYPES__H
diff --git a/Validation/RecoParticleFlow/bin/include/Style.h b/Validation/RecoParticleFlow/bin/include/Style.h
index c42104a3fe6b2..1d030de16dd48 100644
--- a/Validation/RecoParticleFlow/bin/include/Style.h
+++ b/Validation/RecoParticleFlow/bin/include/Style.h
@@ -5,18 +5,17 @@
 
 // tdrGrid: Turns the grid lines on (true) or off (false)
 TStyle genStyle() {
+  TStyle myStyle("myStyle", "Style similar to P-TDR");
 
-  TStyle myStyle("myStyle","Style similar to P-TDR");
-
-// For the canvas:
+  // For the canvas:
   myStyle.SetCanvasBorderMode(0);
   myStyle.SetCanvasColor(kWhite);
-  myStyle.SetCanvasDefH(600); //Height of canvas
-  myStyle.SetCanvasDefW(600); //Width of canvas
-  myStyle.SetCanvasDefX(0);   //POsition on screen
+  myStyle.SetCanvasDefH(600);  // Height of canvas
+  myStyle.SetCanvasDefW(600);  // Width of canvas
+  myStyle.SetCanvasDefX(0);    // POsition on screen
   myStyle.SetCanvasDefY(0);
 
-// For the Pad:
+  // For the Pad:
   myStyle.SetPadBorderMode(0);
   // myStyle.SetPadBorderSize(Width_t size = 1);
   myStyle.SetPadColor(kWhite);
@@ -26,7 +25,7 @@ TStyle genStyle() {
   myStyle.SetGridStyle(3);
   myStyle.SetGridWidth(1);
 
-// For the frame:
+  // For the frame:
   myStyle.SetFrameBorderMode(0);
   myStyle.SetFrameBorderSize(1);
   myStyle.SetFrameFillColor(0);
@@ -35,7 +34,7 @@ TStyle genStyle() {
   myStyle.SetFrameLineStyle(1);
   myStyle.SetFrameLineWidth(1);
 
-// For the histo:
+  // For the histo:
   // myStyle.SetHistFillColor(1);
   // myStyle.SetHistFillStyle(0);
   myStyle.SetHistLineColor(1);
@@ -45,26 +44,26 @@ TStyle genStyle() {
   // myStyle.SetNumberContours(Int_t number = 20);
 
   myStyle.SetEndErrorSize(2);
-  //myStyle.SetErrorMarker(20);
+  // myStyle.SetErrorMarker(20);
   myStyle.SetErrorX(0.);
-  
+
   myStyle.SetMarkerStyle(20);
 
-//For the fit/function:
+  // For the fit/function:
   myStyle.SetOptFit(1);
   myStyle.SetFitFormat("5.4g");
   myStyle.SetFuncColor(1);
   myStyle.SetFuncStyle(0);
   myStyle.SetFuncWidth(0);
 
-//For the date:
+  // For the date:
   myStyle.SetOptDate(0);
   // myStyle.SetDateX(Float_t x = 0.01);
   // myStyle.SetDateY(Float_t y = 0.01);
 
-// For the statistics box:
+  // For the statistics box:
   myStyle.SetOptFile(1);
-  myStyle.SetOptStat("mre"); // To display the mean and RMS:   SetOptStat("mr");
+  myStyle.SetOptStat("mre");  // To display the mean and RMS:   SetOptStat("mr");
   myStyle.SetStatColor(kWhite);
   myStyle.SetStatFont(42);
   myStyle.SetStatFontSize(0.025);
@@ -77,13 +76,13 @@ TStyle genStyle() {
   // myStyle.SetStatX(Float_t x = 0);
   // myStyle.SetStatY(Float_t y = 0);
 
-// Margins:
-//  myStyle.SetPadTopMargin(0.05);
-//  myStyle.SetPadBottomMargin(0.13);
-//  myStyle.SetPadLeftMargin(0.16);
-//  myStyle.SetPadRightMargin(/*0.02*/0.1);
+  // Margins:
+  //  myStyle.SetPadTopMargin(0.05);
+  //  myStyle.SetPadBottomMargin(0.13);
+  //  myStyle.SetPadLeftMargin(0.16);
+  //  myStyle.SetPadRightMargin(/*0.02*/0.1);
 
-// For the Global title:
+  // For the Global title:
 
   myStyle.SetOptTitle(0);
   myStyle.SetTitleFont(42);
@@ -98,25 +97,25 @@ TStyle genStyle() {
   // myStyle.SetTitleStyle(Style_t style = 1001);
   // myStyle.SetTitleBorderSize(2);
 
-// For the axis titles:
+  // For the axis titles:
 
   myStyle.SetTitleColor(1, "XYZ");
   myStyle.SetTitleFont(42, "XYZ");
   myStyle.SetTitleSize(0.06, "XYZ");
   // myStyle.SetTitleXSize(Float_t size = 0.02); // Another way to set the size?
   // myStyle.SetTitleYSize(Float_t size = 0.02);
-//  myStyle.SetTitleXOffset(0.9);
-//  myStyle.SetTitleYOffset(1.25);
+  //  myStyle.SetTitleXOffset(0.9);
+  //  myStyle.SetTitleYOffset(1.25);
   // myStyle.SetTitleOffset(1.1, "Y"); // Another way to set the Offset
 
-// For the axis labels:
+  // For the axis labels:
 
   myStyle.SetLabelColor(1, "XYZ");
   myStyle.SetLabelFont(42, "XYZ");
-//  myStyle.SetLabelOffset(0.01, "XYZ");
-//  myStyle.SetLabelSize(0.03/*0.05*/, "XYZ");
+  //  myStyle.SetLabelOffset(0.01, "XYZ");
+  //  myStyle.SetLabelSize(0.03/*0.05*/, "XYZ");
 
-// For the axis:
+  // For the axis:
 
   myStyle.SetAxisColor(1, "XYZ");
   myStyle.SetStripDecimals(kTRUE);
@@ -125,13 +124,13 @@ TStyle genStyle() {
   myStyle.SetPadTickX(1);  // To get tick marks on the opposite side of the frame
   myStyle.SetPadTickY(1);
 
-// Change for log plots:
+  // Change for log plots:
   myStyle.SetOptLogx(0);
   myStyle.SetOptLogy(0);
   myStyle.SetOptLogz(0);
 
-// Postscript options:
-  myStyle.SetPaperSize(20.,20.);
+  // Postscript options:
+  myStyle.SetPaperSize(20., 20.);
   // myStyle.SetLineScalePS(Float_t scale = 3);
   // myStyle.SetLineStyleString(Int_t i, const char* text);
   // myStyle.SetHeaderPS(const char* header);
@@ -145,7 +144,6 @@ TStyle genStyle() {
   // myStyle.SetHistMinimumZero(kTRUE);
 
   return myStyle;
-
 }
 
-#endif // STYLE__H
+#endif  // STYLE__H
diff --git a/Validation/RecoParticleFlow/bin/plotCompare.cpp b/Validation/RecoParticleFlow/bin/plotCompare.cpp
index 70c2d047a418d..7a561e54f0365 100644
--- a/Validation/RecoParticleFlow/bin/plotCompare.cpp
+++ b/Validation/RecoParticleFlow/bin/plotCompare.cpp
@@ -1,48 +1,49 @@
 #include <iostream>
 #include <sstream>
 
-#include "include/PlotTypes.h"
-#include "include/PlotCompareUtility.h"
 #include "include/HistoData.h"
+#include "include/PlotCompareUtility.h"
+#include "include/PlotTypes.h"
 using namespace std;
 
-
 int main(int argc, char *argv[]) {
-
   std::string branchRef("DQMData/PFTask/Benchmarks");
-  std::string branchNew("DQMData/PFTask/Benchmarks"); 
+  std::string branchNew("DQMData/PFTask/Benchmarks");
 
   std::string branchRefPrefix("ParticleFlow/Gen");
-  std::string branchNewPrefix("ParticleFlow/Gen"); 
+  std::string branchNewPrefix("ParticleFlow/Gen");
 
   // make sure command line arguments were supplied
-  cout <<argc <<endl;
+  cout << argc << endl;
 
- if (argc == 5) {
+  if (argc == 5) {
     // initialize plot comparison tool with 2 arguments
-    branchRefPrefix= argv[3];
-    branchNewPrefix= argv[4];
+    branchRefPrefix = argv[3];
+    branchNewPrefix = argv[4];
+  }
+  if (argc == 3) {
+  };
+  if ((argc != 3) && (argc != 5))
+  // initialize plot comparison tool with 4 arguments
+  {
+    cerr << "Usage: " << argv[0]
+         << " [reference.root] [new-comparison.root} "
+            "[RefSubDirectory(default=ParticleFlow/Gen)] "
+            "[NewSubDirectory(default=ParticleFlow/Gen)]\n";
+    return 1;
   }
- if (argc == 3) {};
- if ((argc != 3) && (argc != 5))
-     // initialize plot comparison tool with 4 arguments
-    {
-      cerr << "Usage: " << argv[0] << " [reference.root] [new-comparison.root} [RefSubDirectory(default=ParticleFlow/Gen)] [NewSubDirectory(default=ParticleFlow/Gen)]\n"; return 1; 
-    }
-    
-     
-    
-PlotCompareUtility *pc = new PlotCompareUtility(argv[1],argv[2],branchNew.c_str(), branchNewPrefix,branchRef.c_str(),branchRefPrefix );
 
+  PlotCompareUtility *pc =
+      new PlotCompareUtility(argv[1], argv[2], branchNew, branchNewPrefix, branchRef, branchRefPrefix);
 
   // set thresholds for tests (set to zero or negative to ignore results)
-  //pc->setKSThreshold(1e-6);
-  //pc->setChi2Threshold(0);
+  // pc->setKSThreshold(1e-6);
+  // pc->setChi2Threshold(0);
   pc->setKSThreshold(1e-6);
   pc->setChi2Threshold(0);
 
   // add histogram information for comparison here --reverse order
-  //PFJetBenchmark
+  // PFJetBenchmark
   pc->addHistoData("ERneutvsPt", Plot2D)->setDoAllow2DRebinningY(true);
   pc->addHistoData("ERNEEvsPt", Plot2D)->setDoAllow2DRebinningY(true);
   pc->addHistoData("ERNHEvsPt", Plot2D)->setDoAllow2DRebinningY(true);
@@ -70,19 +71,19 @@ PlotCompareUtility *pc = new PlotCompareUtility(argv[1],argv[2],branchNew.c_str(
   pc->addHistoData("jetsPt", Plot1D);
   pc->addHistoData("jetsEta", Plot1D);
   pc->addHistoData("Njets", Plot1D);
- 
+
   // PFBenchmark Analyzer
-  pc->addHistoData("DeltaRvsEta",Plot2D)->setDoAllow2DRebinningY(true);
-  pc->addHistoData("DeltaPhivsEta",Plot2D);
-  pc->addHistoData("DeltaEtavsEta",Plot2D);
-  pc->addHistoData("DeltaEtvsEta",Plot2D)->setDoAllow2DRebinningY(true);
-  pc->addHistoData("DeltaRvsEt",Plot2D)->setDoAllow2DRebinningY(true);
-  pc->addHistoData("DeltaEtvsEt",Plot2D)->setDoAllow2DRebinningY(true);
-
-  pc->addHistoData("DeltaR",Plot1D);
-  pc->addHistoData("DeltaPhi",Plot1D);
-  pc->addHistoData("DeltaEta",Plot1D);
-  pc->addHistoData("DeltaEt",Plot1D);
+  pc->addHistoData("DeltaRvsEta", Plot2D)->setDoAllow2DRebinningY(true);
+  pc->addHistoData("DeltaPhivsEta", Plot2D);
+  pc->addHistoData("DeltaEtavsEta", Plot2D);
+  pc->addHistoData("DeltaEtvsEta", Plot2D)->setDoAllow2DRebinningY(true);
+  pc->addHistoData("DeltaRvsEt", Plot2D)->setDoAllow2DRebinningY(true);
+  pc->addHistoData("DeltaEtvsEt", Plot2D)->setDoAllow2DRebinningY(true);
+
+  pc->addHistoData("DeltaR", Plot1D);
+  pc->addHistoData("DeltaPhi", Plot1D);
+  pc->addHistoData("DeltaEta", Plot1D);
+  pc->addHistoData("DeltaEt", Plot1D);
 
   // ...
   // ...
@@ -105,8 +106,7 @@ PlotCompareUtility *pc = new PlotCompareUtility(argv[1],argv[2],branchNew.c_str(
     pc->compare(&(*hd));
     pc->makePlots(&(*hd));
     pc->makeHTML(&(*hd));
-    }
-
+  }
 
   // produce summary plots
   pc->makeDefaultPlots();
@@ -115,5 +115,4 @@ PlotCompareUtility *pc = new PlotCompareUtility(argv[1],argv[2],branchNew.c_str(
   // report integrated result from all studied HistoData
   cout << "Final Result: " << (pc->getFinalResult() ? "pass" : "fail") << endl;
   return 0;
-
 }
diff --git a/Validation/RecoParticleFlow/interface/Comparator.h b/Validation/RecoParticleFlow/interface/Comparator.h
index 10da2741305c5..1cdde94daf209 100644
--- a/Validation/RecoParticleFlow/interface/Comparator.h
+++ b/Validation/RecoParticleFlow/interface/Comparator.h
@@ -3,126 +3,101 @@
 
 #include <cmath>
 
-#include <TLegend.h>
+#include <TF1.h>
 #include <TFile.h>
 #include <TH1.h>
-#include <TF1.h>
+#include <TLegend.h>
 
 /* #include <string> */
 
 class Style;
 
 class Comparator {
-
 public:
+  enum Mode { NORMAL, SCALE, RATIO, GRAPH, EFF };
 
-  enum Mode {
-    NORMAL,
-    SCALE,
-    RATIO,
-    GRAPH,
-    EFF
-  };
-
-  Comparator() : rebin_(-1), xMin_(0), xMax_(0), resetAxis_(false), 
-		 s0_(nullptr), s1_(nullptr), legend_(0,0,1,1) {}
-
-  Comparator( const char* file0,
-	      const char* dir0,
-	      const char* file1,
-	      const char* dir1 ) : 
-    rebin_(-1), xMin_(0), xMax_(0), resetAxis_(false), 
-    s0_(nullptr), s1_(nullptr), legend_(0,0,1,1) {
-    
-    SetDirs( file0, dir0, file1, dir1);
+  Comparator() : rebin_(-1), xMin_(0), xMax_(0), resetAxis_(false), s0_(nullptr), s1_(nullptr), legend_(0, 0, 1, 1) {}
+
+  Comparator(const char *file0, const char *dir0, const char *file1, const char *dir1)
+      : rebin_(-1), xMin_(0), xMax_(0), resetAxis_(false), s0_(nullptr), s1_(nullptr), legend_(0, 0, 1, 1) {
+    SetDirs(file0, dir0, file1, dir1);
   }
-  
-  /// set the 2 files, and the directory within each file, in which the histograms will be compared
-  void SetDirs( const char* file0,
-		const char* dir0,
-		const char* file1,
-		const char* dir1  );
+
+  /// set the 2 files, and the directory within each file, in which the
+  /// histograms will be compared
+  void SetDirs(const char *file0, const char *dir0, const char *file1, const char *dir1);
 
   // set the rebinning factor and the range
-  void SetAxis( int rebin,
-		float xmin, 
-		float xmax) {
+  void SetAxis(int rebin, float xmin, float xmax) {
     rebin_ = rebin;
     xMin_ = xmin;
     xMax_ = xmax;
     resetAxis_ = true;
   }
-  
+
   // set the rebinning factor, unset the range
-  void SetAxis( int rebin ) {
+  void SetAxis(int rebin) {
     rebin_ = rebin;
     resetAxis_ = false;
   }
 
   // draws a Y projection of a slice along X
-  void DrawSlice( const char* key, 
-		  int binxmin, int binxmax, 
-		  Mode mode );
-
-  void DrawMeanSlice(const char* key, const int rebinFactor, Mode mode);
-  void DrawSigmaSlice(const char* key, const int rebinFactor, Mode mode);
-  void DrawGaussSigmaSlice(const char* key, const int rebinFactor, Mode mode);
-  void DrawGaussSigmaSlice(const char* key, const int rebinFactor, const int binxmin,
-			   const int binxmax, const bool cst_binning, Mode mode);
-  void DrawGaussSigmaOverMeanXSlice(const char* key, const int rebinFactor, const int binxmin,
-				    const int binxmax, const bool cst_binning, Mode mode);
-  void DrawGaussSigmaOverMeanSlice(const char* key, const char* key2, const int rebinFactor, Mode mode);
-
-  void Draw( const char* key, Mode mode);
-  
-  void Draw( const char* key0, const char* key1, Mode mode);
+  void DrawSlice(const char *key, int binxmin, int binxmax, Mode mode);
+
+  void DrawMeanSlice(const char *key, const int rebinFactor, Mode mode);
+  void DrawSigmaSlice(const char *key, const int rebinFactor, Mode mode);
+  void DrawGaussSigmaSlice(const char *key, const int rebinFactor, Mode mode);
+  void DrawGaussSigmaSlice(
+      const char *key, const int rebinFactor, const int binxmin, const int binxmax, const bool cst_binning, Mode mode);
+  void DrawGaussSigmaOverMeanXSlice(
+      const char *key, const int rebinFactor, const int binxmin, const int binxmax, const bool cst_binning, Mode mode);
+  void DrawGaussSigmaOverMeanSlice(const char *key, const char *key2, const int rebinFactor, Mode mode);
+
+  void Draw(const char *key, Mode mode);
+
+  void Draw(const char *key0, const char *key1, Mode mode);
 
   // return the two temporary 1d histograms, that have just
   // been plotted
-  TH1* h0() {return h0_;}
-  TH1* h1() {return h1_;}
+  TH1 *h0() { return h0_; }
+  TH1 *h1() { return h1_; }
+
+  TLegend &Legend() { return legend_; }
+  const TLegend &Legend() const { return legend_; }
 
-  TLegend& Legend() {return legend_;}
-  const TLegend& Legend() const {return legend_;}
-  
   // set the styles for further plots
-  void SetStyles( Style* s0, 
-		  Style* s1,
-		  const char* leg0,
-		  const char* leg1);
-   
-  TH1* Histo( const char* key, unsigned dirIndex);
+  void SetStyles(Style *s0, Style *s1, const char *leg0, const char *leg1);
 
-  TDirectory* dir0(){ return dir0_;}
-  TDirectory* dir1(){ return dir1_;}
+  TH1 *Histo(const char *key, unsigned dirIndex);
 
-private:
+  TDirectory *dir0() { return dir0_; }
+  TDirectory *dir1() { return dir1_; }
 
+private:
   // retrieve an histogram in one of the two directories
 
   // draw 2 1D histograms.
-  // the histograms can be normalized to the same number of entries, 
+  // the histograms can be normalized to the same number of entries,
   // or plotted as a ratio.
-  void Draw( TH1* h0, TH1* h1, Mode mode );
+  void Draw(TH1 *h0, TH1 *h1, Mode mode);
 
   int rebin_;
   float xMin_;
   float xMax_;
   bool resetAxis_;
 
-  TFile*      file0_;
-  TDirectory* dir0_;
-  TFile*      file1_;
-  TDirectory* dir1_;
-  
-  TH1* h0_;
-  TH1* h1_;
-  
-  Style* s0_;
-  Style* s1_;
-  
-  TLegend legend_;
+  TFile *file0_;
+  TDirectory *dir0_;
+  TFile *file1_;
+  TDirectory *dir1_;
+
+  TH1 *h0_;
+  TH1 *h1_;
 
+  Style *s0_;
+  Style *s1_;
+
+  TLegend legend_;
 };
 
 #endif
diff --git a/Validation/RecoParticleFlow/interface/NicePlot.h b/Validation/RecoParticleFlow/interface/NicePlot.h
index e1dcc849b5eb8..93255eb164977 100644
--- a/Validation/RecoParticleFlow/interface/NicePlot.h
+++ b/Validation/RecoParticleFlow/interface/NicePlot.h
@@ -4,12 +4,10 @@
 #include <TH1.h>
 #include <TPad.h>
 
-class Style : public TH1 {
-};
-
+class Style : public TH1 {};
 
 class Styles {
- public:
+public:
   Style *s1;
   Style *s2;
   Style *sg1;
@@ -21,13 +19,11 @@ class Styles {
 
   Styles();
 
+  static void FormatHisto(TH1 *h, const Style *s);
 
-  static void FormatHisto( TH1* h, const Style* s );
-  
-  static void FormatPad( TPad* pad, bool grid = true, bool logx = false, bool logy = false);
-  
-  static void SavePlot(const char* name, const char* dir);
-};
+  static void FormatPad(TPad *pad, bool grid = true, bool logx = false, bool logy = false);
 
+  static void SavePlot(const char *name, const char *dir);
+};
 
 #endif
diff --git a/Validation/RecoParticleFlow/interface/TH2Analyzer.h b/Validation/RecoParticleFlow/interface/TH2Analyzer.h
index d28d4e75a1861..0b0504a67fee9 100644
--- a/Validation/RecoParticleFlow/interface/TH2Analyzer.h
+++ b/Validation/RecoParticleFlow/interface/TH2Analyzer.h
@@ -9,74 +9,70 @@ class TH2;
 class TH1D;
 class TH2D;
 
-// EN FAIT NON ? 
+// EN FAIT NON ?
 // check why white window in colin's case
-// are you making copies of histograms without changing the name? 
+// are you making copies of histograms without changing the name?
 // names could be handled in the following way:
 // - give a name to each instance of TH2Analyzer in constructor
-// - all histograms of the corresponding TH2Analyzer are created with a name (key)
-// which starts with name_RMS
+// - all histograms of the corresponding TH2Analyzer are created with a name
+// (key) which starts with name_RMS
 
 class TH2Analyzer : public TObject {
-
- public:
-  TH2Analyzer( const TH2* h, int rebin=1) : 
-    hist2D_(h), 
-    rebinnedHist2D_(nullptr),
-    average_(nullptr),
-    RMS_(nullptr),
-    sigmaGauss_(nullptr),
-    meanXslice_(nullptr) {
+public:
+  TH2Analyzer(const TH2 *h, int rebin = 1)
+      : hist2D_(h),
+        rebinnedHist2D_(nullptr),
+        average_(nullptr),
+        RMS_(nullptr),
+        sigmaGauss_(nullptr),
+        meanXslice_(nullptr) {
     Eval(rebin);
   }
 
-  TH2Analyzer( const TH2* h, const int binxmin, const int binxmax,
-	       const int rebin, const bool cst_binning=true) : 
-    hist2D_(h), 
-    rebinnedHist2D_(nullptr),
-    average_(nullptr),
-    RMS_(nullptr),
-    sigmaGauss_(nullptr),
-    meanXslice_(nullptr) {
+  TH2Analyzer(const TH2 *h, const int binxmin, const int binxmax, const int rebin, const bool cst_binning = true)
+      : hist2D_(h),
+        rebinnedHist2D_(nullptr),
+        average_(nullptr),
+        RMS_(nullptr),
+        sigmaGauss_(nullptr),
+        meanXslice_(nullptr) {
     Eval(rebin, binxmin, binxmax, cst_binning);
-  } 
+  }
 
-  ~TH2Analyzer() override {Reset(); }
+  ~TH2Analyzer() override { Reset(); }
 
   void Reset();
 
-  void SetHisto( const TH2* h ) {hist2D_ = h;}
+  void SetHisto(const TH2 *h) { hist2D_ = h; }
 
   void Eval(const int rebinFactor);
-  void Eval(const int rebinFactor, const int binxmin, const int binxmax,
-	    const bool cst_binning);
-  
-  TH1D* Average() { return average_; }
-  TH1D* RMS() { return RMS_; }
-  TH1D* SigmaGauss() { return sigmaGauss_; }
-  TH1D* MeanX() { return meanXslice_; }
-
-  // add an histo for chi2 /  ndof 
+  void Eval(const int rebinFactor, const int binxmin, const int binxmax, const bool cst_binning);
+
+  TH1D *Average() { return average_; }
+  TH1D *RMS() { return RMS_; }
+  TH1D *SigmaGauss() { return sigmaGauss_; }
+  TH1D *MeanX() { return meanXslice_; }
+
+  // add an histo for chi2 /  ndof
   // add a function FitSlice(int i)
   // not now: work along Y
 
- private:
-
-  void ProcessSlices(  const TH2D* histo );
+private:
+  void ProcessSlices(const TH2D *histo);
 
   // no need for const, because i is copied
-  void ProcessSlice(const int i, TH1D* histo ) const;
+  void ProcessSlice(const int i, TH1D *histo) const;
 
-  const TH2* hist2D_;
-  TH2D*      rebinnedHist2D_;
-  TH1D*      average_;
-  TH1D*      RMS_;
-  TH1D*      sigmaGauss_;
-  TH1D*      meanXslice_;
+  const TH2 *hist2D_;
+  TH2D *rebinnedHist2D_;
+  TH1D *average_;
+  TH1D *RMS_;
+  TH1D *sigmaGauss_;
+  TH1D *meanXslice_;
 
-  //std::vector< TH1D* > parameters_; // if we are not fitting with a gauss function
+  // std::vector< TH1D* > parameters_; // if we are not fitting with a gauss
+  // function
   ClassDefOverride(TH2Analyzer, 1);
-
 };
 
-#endif 
+#endif
diff --git a/Validation/RecoParticleFlow/plugins/GenJetClosestMatchSelector.cc b/Validation/RecoParticleFlow/plugins/GenJetClosestMatchSelector.cc
index 6773fbcb49a43..82d8cc6f13a9c 100644
--- a/Validation/RecoParticleFlow/plugins/GenJetClosestMatchSelector.cc
+++ b/Validation/RecoParticleFlow/plugins/GenJetClosestMatchSelector.cc
@@ -1,5 +1,5 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 
 #include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
 #include "Validation/RecoParticleFlow/plugins/GenJetClosestMatchSelectorDefinition.h"
@@ -7,4 +7,3 @@
 typedef ObjectSelector<GenJetClosestMatchSelectorDefinition> GenJetClosestMatchSelector;
 
 DEFINE_FWK_MODULE(GenJetClosestMatchSelector);
-
diff --git a/Validation/RecoParticleFlow/plugins/GenJetClosestMatchSelectorDefinition.h b/Validation/RecoParticleFlow/plugins/GenJetClosestMatchSelectorDefinition.h
index 4ae99881b4d32..a28fa75fb055e 100644
--- a/Validation/RecoParticleFlow/plugins/GenJetClosestMatchSelectorDefinition.h
+++ b/Validation/RecoParticleFlow/plugins/GenJetClosestMatchSelectorDefinition.h
@@ -2,9 +2,9 @@
 #define PhysicsTools_PFCandProducer_GenJetClosestMatchSelectorDefinition
 
 #include "FWCore/Framework/interface/ConsumesCollector.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "DataFormats/JetReco/interface/GenJet.h"
 
@@ -13,87 +13,73 @@
 #include <iostream>
 
 struct GenJetClosestMatchSelectorDefinition {
-
-
   typedef reco::GenJetCollection collection;
-  typedef edm::Handle< collection > HandleToCollection;
-  typedef std::vector< reco::GenJet *> container;
+  typedef edm::Handle<collection> HandleToCollection;
+  typedef std::vector<reco::GenJet *> container;
   typedef container::const_iterator const_iterator;
 
-  GenJetClosestMatchSelectorDefinition ( const edm::ParameterSet & cfg, edm::ConsumesCollector && iC ) {
-
-    matchTo_ = iC.consumes< edm::View<reco::Candidate> >(cfg.getParameter< edm::InputTag >( "MatchTo" ));
+  GenJetClosestMatchSelectorDefinition(const edm::ParameterSet &cfg, edm::ConsumesCollector &&iC) {
+    matchTo_ = iC.consumes<edm::View<reco::Candidate>>(cfg.getParameter<edm::InputTag>("MatchTo"));
   }
 
   const_iterator begin() const { return selected_.begin(); }
 
   const_iterator end() const { return selected_.end(); }
 
-  void select( const HandleToCollection & hc,
-	       const edm::Event & e,
-	       const edm::EventSetup& s)
-  {
-
+  void select(const HandleToCollection &hc, const edm::Event &e, const edm::EventSetup &s) {
     selected_.clear();
 
-    edm::Handle< edm::View<reco::Candidate> > matchCandidates;
-    e.getByToken( matchTo_, matchCandidates);
+    edm::Handle<edm::View<reco::Candidate>> matchCandidates;
+    e.getByToken(matchTo_, matchCandidates);
 
+    unsigned key = 0;
 
-    unsigned key=0;
-
-    //    std::cout<<"number of candidates "<<matchCandidates->size()<<std::endl;
+    //    std::cout<<"number of candidates
+    //    "<<matchCandidates->size()<<std::endl;
 
     typedef edm::View<reco::Candidate>::const_iterator IC;
-    for( IC ic = matchCandidates->begin();
-	 ic!= matchCandidates->end(); ++ic ) {
-
+    for (IC ic = matchCandidates->begin(); ic != matchCandidates->end(); ++ic) {
       double eta2 = ic->eta();
       double phi2 = ic->phi();
 
       //      std::cout<<"cand "<<eta2<<" "<<phi2<<std::endl;
 
-
       // look for the closest gen jet
       double deltaR2Min = 9999;
       collection::const_iterator closest = hc->end();
-      for( collection::const_iterator genjet = hc->begin();
-	   genjet != hc->end();
-	   ++genjet, ++key) {
-
-	reco::GenJetRef genJetRef(hc, key);
-
-	// is it matched?
+      for (collection::const_iterator genjet = hc->begin(); genjet != hc->end(); ++genjet, ++key) {
+        reco::GenJetRef genJetRef(hc, key);
 
-	double eta1 = genjet->eta();
-	double phi1 = genjet->phi();
+        // is it matched?
 
+        double eta1 = genjet->eta();
+        double phi1 = genjet->phi();
 
-	double deltaR2 = reco::deltaR2(eta1, phi1, eta2, phi2);
+        double deltaR2 = reco::deltaR2(eta1, phi1, eta2, phi2);
 
-	// std::cout<<"  genjet "<<eta1<<" "<<phi1<<" "<<deltaR2<<std::endl;
+        // std::cout<<"  genjet "<<eta1<<" "<<phi1<<" "<<deltaR2<<std::endl;
 
-	// cut should be a parameter
-	if( deltaR2<deltaR2Min ) {
-	  deltaR2Min = deltaR2;
-	  closest = genjet;
-	}
+        // cut should be a parameter
+        if (deltaR2 < deltaR2Min) {
+          deltaR2Min = deltaR2;
+          closest = genjet;
+        }
       }
 
-      if(deltaR2Min<0.01 ) {
-	// std::cout<<deltaR2Min<<std::endl;
-	selected_.push_back( new reco::GenJet(*closest) );
+      if (deltaR2Min < 0.01) {
+        // std::cout<<deltaR2Min<<std::endl;
+        selected_.push_back(new reco::GenJet(*closest));
       }
-    } // end collection iteration
+    }  // end collection iteration
 
     // std::cout<<selected_.size()<<std::endl;
-  } // end select()
+  }  // end select()
 
   size_t size() const { return selected_.size(); }
 
 private:
   container selected_;
-  edm::EDGetTokenT<edm::View<reco::Candidate> >  matchTo_;
+  edm::EDGetTokenT<edm::View<reco::Candidate>> matchTo_;
 };
 
 #endif
diff --git a/Validation/RecoParticleFlow/plugins/GenericBenchmarkAnalyzer.cc b/Validation/RecoParticleFlow/plugins/GenericBenchmarkAnalyzer.cc
index c995328ebb73f..6f78542a42797 100644
--- a/Validation/RecoParticleFlow/plugins/GenericBenchmarkAnalyzer.cc
+++ b/Validation/RecoParticleFlow/plugins/GenericBenchmarkAnalyzer.cc
@@ -8,106 +8,97 @@
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-
-#include "DataFormats/Candidate/interface/CandidateFwd.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
+#include "DataFormats/Candidate/interface/CandidateFwd.h"
 
 #include "DQMServices/Core/interface/DQMStore.h"
 
-#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
 #include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
+#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
 
-#include <vector>
-#include <ostream>
-#include <fstream>
-#include <iostream>
 #include <algorithm>
 #include <cmath>
+#include <fstream>
+#include <iostream>
 #include <memory>
+#include <ostream>
+#include <vector>
 
 using namespace reco;
 using namespace edm;
 using namespace std;
 
-GenericBenchmarkAnalyzer::GenericBenchmarkAnalyzer(const edm::ParameterSet& iConfig)
-{
-
-  inputTruthLabel_             = iConfig.getParameter<edm::InputTag>("InputTruthLabel");
-  inputRecoLabel_              = iConfig.getParameter<edm::InputTag>("InputRecoLabel");
-  outputFile_                  = iConfig.getUntrackedParameter<std::string>("OutputFile");
-  benchmarkLabel_              = iConfig.getParameter<std::string>("BenchmarkLabel"); 
-  startFromGen_                = iConfig.getParameter<bool>("StartFromGen");
-  plotAgainstRecoQuantities_   = iConfig.getParameter<bool>("PlotAgainstRecoQuantities");
-  onlyTwoJets_                 = iConfig.getParameter<bool>("OnlyTwoJets");
-  recPt_cut                    = iConfig.getParameter<double>("recPt");
-  minEta_cut                   = iConfig.getParameter<double>("minEta");
-  maxEta_cut                   = iConfig.getParameter<double>("maxEta");
-  deltaR_cut                   = iConfig.getParameter<double>("deltaRMax");
-
-  minDeltaEt_                   = iConfig.getParameter<double>("minDeltaEt");
-  maxDeltaEt_                   = iConfig.getParameter<double>("maxDeltaEt");
-  minDeltaPhi_                  = iConfig.getParameter<double>("minDeltaPhi");
-  maxDeltaPhi_                  = iConfig.getParameter<double>("maxDeltaPhi");
-  doMetPlots_                   = iConfig.getParameter<bool>("doMetPlots");
+GenericBenchmarkAnalyzer::GenericBenchmarkAnalyzer(const edm::ParameterSet &iConfig) {
+  inputTruthLabel_ = iConfig.getParameter<edm::InputTag>("InputTruthLabel");
+  inputRecoLabel_ = iConfig.getParameter<edm::InputTag>("InputRecoLabel");
+  outputFile_ = iConfig.getUntrackedParameter<std::string>("OutputFile");
+  benchmarkLabel_ = iConfig.getParameter<std::string>("BenchmarkLabel");
+  startFromGen_ = iConfig.getParameter<bool>("StartFromGen");
+  plotAgainstRecoQuantities_ = iConfig.getParameter<bool>("PlotAgainstRecoQuantities");
+  onlyTwoJets_ = iConfig.getParameter<bool>("OnlyTwoJets");
+  recPt_cut = iConfig.getParameter<double>("recPt");
+  minEta_cut = iConfig.getParameter<double>("minEta");
+  maxEta_cut = iConfig.getParameter<double>("maxEta");
+  deltaR_cut = iConfig.getParameter<double>("deltaRMax");
+
+  minDeltaEt_ = iConfig.getParameter<double>("minDeltaEt");
+  maxDeltaEt_ = iConfig.getParameter<double>("maxDeltaEt");
+  minDeltaPhi_ = iConfig.getParameter<double>("minDeltaPhi");
+  maxDeltaPhi_ = iConfig.getParameter<double>("maxDeltaPhi");
+  doMetPlots_ = iConfig.getParameter<bool>("doMetPlots");
 
   if (!outputFile_.empty())
-    edm::LogInfo("OutputInfo") << " ParticleFLow Task histograms will be saved to '" << outputFile_.c_str()<< "'";
-  else edm::LogInfo("OutputInfo") << " ParticleFlow Task histograms will NOT be saved";
-
-  myTruth_ = consumes< edm::View<reco::Candidate> >(inputTruthLabel_);
-  myReco_ = consumes< edm::View<reco::Candidate> >(inputRecoLabel_);
+    edm::LogInfo("OutputInfo") << " ParticleFLow Task histograms will be saved to '" << outputFile_.c_str() << "'";
+  else
+    edm::LogInfo("OutputInfo") << " ParticleFlow Task histograms will NOT be saved";
 
+  myTruth_ = consumes<edm::View<reco::Candidate>>(inputTruthLabel_);
+  myReco_ = consumes<edm::View<reco::Candidate>>(inputRecoLabel_);
 }
 
-GenericBenchmarkAnalyzer::~GenericBenchmarkAnalyzer() { }
-
-void 
-GenericBenchmarkAnalyzer::beginJob()
-{
+GenericBenchmarkAnalyzer::~GenericBenchmarkAnalyzer() {}
 
+void GenericBenchmarkAnalyzer::beginJob() {
   // get ahold of back-end interface
   dbe_ = edm::Service<DQMStore>().operator->();
-  
+
   if (dbe_) {
-    //dbe_->setVerbose(1);
-    //string path = "PFTask/Benchmarks/" + benchmarkLabel_ + "/";
-    std::string path = "ParticleFlow/" + benchmarkLabel_ + "/" ;
-    if (plotAgainstRecoQuantities_) path += "Reco"; else path += "Gen";
+    // dbe_->setVerbose(1);
+    // string path = "PFTask/Benchmarks/" + benchmarkLabel_ + "/";
+    std::string path = "ParticleFlow/" + benchmarkLabel_ + "/";
+    if (plotAgainstRecoQuantities_)
+      path += "Reco";
+    else
+      path += "Gen";
     dbe_->setCurrentFolder(path);
     setup(dbe_, plotAgainstRecoQuantities_, minDeltaEt_, maxDeltaEt_, minDeltaPhi_, maxDeltaPhi_, doMetPlots_);
-
   }
-
 }
 
-void 
-GenericBenchmarkAnalyzer::analyze(const edm::Event& iEvent, 
-				  const edm::EventSetup& iSetup)
-{
-  
+void GenericBenchmarkAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   // Typedefs to use views
-  typedef edm::View<reco::Candidate> candidateCollection ;
-  typedef edm::View<reco::Candidate> candidateCollection ;
-  
+  typedef edm::View<reco::Candidate> candidateCollection;
+  typedef edm::View<reco::Candidate> candidateCollection;
+
   const candidateCollection *truth_candidates;
   const candidateCollection *reco_candidates;
- 
+
   // ==========================================================
   // Retrieve!
   // ==========================================================
 
-  { 
+  {
     // Get Truth Candidates (GenCandidates, GenJets, etc.)
     Handle<candidateCollection> truth_hnd;
-    bool isGen = iEvent.getByToken(myTruth_, truth_hnd);   
+    bool isGen = iEvent.getByToken(myTruth_, truth_hnd);
 
-    if ( !isGen ) { 
+    if (!isGen) {
       std::cout << "Warning : no Gen jets in input !" << std::endl;
       return;
     }
@@ -117,38 +108,40 @@ GenericBenchmarkAnalyzer::analyze(const edm::Event& iEvent,
     // Get Reco Candidates (PFlow, CaloJet, etc.)
     Handle<candidateCollection> reco_hnd;
     bool isReco = iEvent.getByToken(myReco_, reco_hnd);
-    if ( !isReco ) { 
+    if (!isReco) {
       std::cout << "Warning : no Reco jets in input !" << std::endl;
-      return; 
+      return;
     }
     reco_candidates = reco_hnd.product();
 
     // no longer needed with template-ized Benchmark
-    //const PFCandidateCollection *pf_candidates = reco_hnd.product();
-    //static CandidateCollection reco_storage = algo_->makeCandidateCollection(pf_candidates);
-    //reco_candidates = &reco_storage;
-
+    // const PFCandidateCollection *pf_candidates = reco_hnd.product();
+    // static CandidateCollection reco_storage =
+    // algo_->makeCandidateCollection(pf_candidates); reco_candidates =
+    // &reco_storage;
   }
   if (!truth_candidates || !reco_candidates) {
-
     edm::LogInfo("OutputInfo") << " failed to retrieve data required by ParticleFlow Task";
     edm::LogInfo("OutputInfo") << " ParticleFlow Task cannot continue...!";
     return;
-
   }
 
   // ==========================================================
   // Analyze!
   // ==========================================================
 
-  fill(reco_candidates,truth_candidates,
-      startFromGen_, plotAgainstRecoQuantities_, 
-      onlyTwoJets_, recPt_cut,  minEta_cut, maxEta_cut, deltaR_cut);
+  fill(reco_candidates,
+       truth_candidates,
+       startFromGen_,
+       plotAgainstRecoQuantities_,
+       onlyTwoJets_,
+       recPt_cut,
+       minEta_cut,
+       maxEta_cut,
+       deltaR_cut);
 }
 
-void GenericBenchmarkAnalyzer::endJob() 
-{
-
+void GenericBenchmarkAnalyzer::endJob() {
   // Store the DAQ Histograms
   if (!outputFile_.empty())
     dbe_->save(outputFile_);
diff --git a/Validation/RecoParticleFlow/plugins/GenericBenchmarkAnalyzer.h b/Validation/RecoParticleFlow/plugins/GenericBenchmarkAnalyzer.h
index 008e18f36a59b..28ae401758efa 100644
--- a/Validation/RecoParticleFlow/plugins/GenericBenchmarkAnalyzer.h
+++ b/Validation/RecoParticleFlow/plugins/GenericBenchmarkAnalyzer.h
@@ -5,31 +5,29 @@
 // date: 11/7/2007
 // extension: Leo Neuhaus & Joanna Weng 09.2008
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
-#include "RecoParticleFlow/Benchmark/interface/GenericBenchmark.h"
-#include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Utilities/interface/EDGetToken.h"
+#include "FWCore/Utilities/interface/InputTag.h"
+#include "RecoParticleFlow/Benchmark/interface/GenericBenchmark.h"
 
 #include <map>
 
-class GenericBenchmarkAnalyzer: public edm::EDAnalyzer, public GenericBenchmark {
+class GenericBenchmarkAnalyzer : public edm::EDAnalyzer, public GenericBenchmark {
 public:
-
-  explicit GenericBenchmarkAnalyzer(const edm::ParameterSet&);
+  explicit GenericBenchmarkAnalyzer(const edm::ParameterSet &);
   ~GenericBenchmarkAnalyzer() override;
 
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void beginJob() override ;
-  void endJob() override ;
-
- private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void beginJob() override;
+  void endJob() override;
 
+private:
   // Inputs from Configuration File
   std::string outputFile_;
-  edm::EDGetTokenT< edm::View<reco::Candidate> > myTruth_;
-  edm::EDGetTokenT< edm::View<reco::Candidate> > myReco_;
+  edm::EDGetTokenT<edm::View<reco::Candidate>> myTruth_;
+  edm::EDGetTokenT<edm::View<reco::Candidate>> myReco_;
   edm::InputTag inputTruthLabel_;
   edm::InputTag inputRecoLabel_;
   std::string benchmarkLabel_;
@@ -47,4 +45,4 @@ class GenericBenchmarkAnalyzer: public edm::EDAnalyzer, public GenericBenchmark
   bool doMetPlots_;
 };
 
-#endif // GENERICBENCHMARKANALYZER_H
+#endif  // GENERICBENCHMARKANALYZER_H
diff --git a/Validation/RecoParticleFlow/plugins/PFFilter.cc b/Validation/RecoParticleFlow/plugins/PFFilter.cc
index 2a9f27b5e0bed..b2aba7c50d217 100644
--- a/Validation/RecoParticleFlow/plugins/PFFilter.cc
+++ b/Validation/RecoParticleFlow/plugins/PFFilter.cc
@@ -1,57 +1,50 @@
 #include "Validation/RecoParticleFlow/plugins/PFFilter.h"
 
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "DataFormats/Candidate/interface/Candidate.h"
+#include "DataFormats/Candidate/interface/CandidateFwd.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "DataFormats/Candidate/interface/Candidate.h"
-#include "DataFormats/Candidate/interface/CandidateFwd.h"
 
-PFFilter::PFFilter(const edm::ParameterSet& iConfig)
-{
-  collections_= iConfig.getParameter< std::vector<std::string> >("Collections");
-  variables_= iConfig.getParameter< std::vector<std::string> >("Variables");
-  min_ = iConfig.getParameter< std::vector<double> >("Mins");
-  max_ = iConfig.getParameter< std::vector<double> >("Maxs");
-  doMin_ = iConfig.getParameter< std::vector<int> >("DoMin");
-  doMax_ = iConfig.getParameter< std::vector<int> >("DoMax");
+PFFilter::PFFilter(const edm::ParameterSet &iConfig) {
+  collections_ = iConfig.getParameter<std::vector<std::string>>("Collections");
+  variables_ = iConfig.getParameter<std::vector<std::string>>("Variables");
+  min_ = iConfig.getParameter<std::vector<double>>("Mins");
+  max_ = iConfig.getParameter<std::vector<double>>("Maxs");
+  doMin_ = iConfig.getParameter<std::vector<int>>("DoMin");
+  doMax_ = iConfig.getParameter<std::vector<int>>("DoMax");
 }
 
 PFFilter::~PFFilter() {}
 
-bool PFFilter::checkInput()
-{
-  if (collections_.size()!=min_.size())
-  {
+bool PFFilter::checkInput() {
+  if (collections_.size() != min_.size()) {
     std::cout << "Error: in PFFilter: collections_.size()!=min_.size()" << std::endl;
     std::cout << "collections_.size() = " << collections_.size() << std::endl;
     std::cout << "min_.size() = " << min_.size() << std::endl;
     return false;
   }
-  if (collections_.size()!=max_.size())
-  {
+  if (collections_.size() != max_.size()) {
     std::cout << "Error: in PFFilter: collections_.size()!=max_.size()" << std::endl;
     std::cout << "collections_.size() = " << collections_.size() << std::endl;
     std::cout << "max_.size() = " << max_.size() << std::endl;
     return false;
   }
-  if (collections_.size()!=doMin_.size())
-  {
+  if (collections_.size() != doMin_.size()) {
     std::cout << "Error: in PFFilter: collections_.size()!=min_.size()" << std::endl;
     std::cout << "collections_.size() = " << collections_.size() << std::endl;
     std::cout << "doMin_.size() = " << doMin_.size() << std::endl;
     return false;
   }
-  if (collections_.size()!=doMax_.size())
-  {
+  if (collections_.size() != doMax_.size()) {
     std::cout << "Error: in PFFilter: collections_.size()!=min_.size()" << std::endl;
     std::cout << "collections_.size() = " << collections_.size() << std::endl;
     std::cout << "doMax_.size() = " << doMax_.size() << std::endl;
     return false;
   }
-  if (collections_.size()!=variables_.size())
-  {
+  if (collections_.size() != variables_.size()) {
     std::cout << "Error: in PFFilter: collections_.size()!=variables_.size()" << std::endl;
     std::cout << "collections_.size() = " << collections_.size() << std::endl;
     std::cout << "variables_.size() = " << variables_.size() << std::endl;
@@ -60,165 +53,163 @@ bool PFFilter::checkInput()
   return true;
 }
 
-void PFFilter::beginJob()
-{
-  //std::cout << "FL: beginJob" << std::endl;
+void PFFilter::beginJob() {
+  // std::cout << "FL: beginJob" << std::endl;
 }
 
-bool PFFilter::filter(edm::Event& iEvent, 
-		    const edm::EventSetup& iSetup)
-{
-  //std::cout << "FL: filter" << std::endl;
-  //std::cout << "FL: Mins = " << min_ << std::endl;
+bool PFFilter::filter(edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  // std::cout << "FL: filter" << std::endl;
+  // std::cout << "FL: Mins = " << min_ << std::endl;
 
-  if (!checkInput()) return true; // no filtering !
+  if (!checkInput())
+    return true;  // no filtering !
 
-  bool skip=false;
+  bool skip = false;
 
-  for (unsigned int varc=0;varc<collections_.size();++varc)
-  {
-    //std::cout << "FL: var[" << varc << "] = " << collections_[varc] << std::endl;
-    //std::cout << "FL: var[0] = " << collections_[0] << std::endl;
+  for (unsigned int varc = 0; varc < collections_.size(); ++varc) {
+    // std::cout << "FL: var[" << varc << "] = " << collections_[varc] <<
+    // std::endl; std::cout << "FL: var[0] = " << collections_[0] << std::endl;
 
     // if the collection is collection1-collection2:
-    const unsigned int minuspos=collections_[varc].find("-");
-    if (minuspos<collections_[varc].size())
-    {
+    const unsigned int minuspos = collections_[varc].find("-");
+    if (minuspos < collections_[varc].size()) {
       std::string collection1;
-      collection1.assign(collections_[varc],0,minuspos);
-      //std::cout << "collection1 = " << collection1 << std::endl;
+      collection1.assign(collections_[varc], 0, minuspos);
+      // std::cout << "collection1 = " << collection1 << std::endl;
       std::string collection2;
-      collection2.assign(collections_[varc],minuspos+1,collections_[varc].size());
-      //std::cout << "collection2 = " << collection2 << std::endl;
+      collection2.assign(collections_[varc], minuspos + 1, collections_[varc].size());
+      // std::cout << "collection2 = " << collection2 << std::endl;
 
       const edm::View<reco::Candidate> *var1;
-      edm::Handle< edm::View<reco::Candidate> > var1_hnd;
+      edm::Handle<edm::View<reco::Candidate>> var1_hnd;
       bool isVar1 = iEvent.getByLabel(collection1, var1_hnd);
-      if ( !isVar1 ) { 
-	std::cout << "Warning : no " << collection1 << " in input !" << std::endl;
-	return false;
+      if (!isVar1) {
+        std::cout << "Warning : no " << collection1 << " in input !" << std::endl;
+        return false;
       }
       var1 = var1_hnd.product();
       const reco::Candidate *var10 = &(*var1)[0];
-      //std::cout << "FL: var10.pt = " << var10->et() << std::endl;
+      // std::cout << "FL: var10.pt = " << var10->et() << std::endl;
       double coll_var1;
-      if (variables_[varc]=="et") coll_var1=var10->et();
-      else if (variables_[varc]=="phi") coll_var1=var10->phi();
-      else if (variables_[varc]=="eta") coll_var1=var10->eta();
-      else
-      {
-	std::cout << "Error: PFFilter: variable unknown: " << variables_[varc] << std::endl;
-	return true;
+      if (variables_[varc] == "et")
+        coll_var1 = var10->et();
+      else if (variables_[varc] == "phi")
+        coll_var1 = var10->phi();
+      else if (variables_[varc] == "eta")
+        coll_var1 = var10->eta();
+      else {
+        std::cout << "Error: PFFilter: variable unknown: " << variables_[varc] << std::endl;
+        return true;
       }
-      //std::cout << "FL: coll_var1[" << variables_[varc] << "] = " << coll_var1 << std::endl;
+      // std::cout << "FL: coll_var1[" << variables_[varc] << "] = " <<
+      // coll_var1 << std::endl;
 
       const edm::View<reco::Candidate> *var2;
-      edm::Handle< edm::View<reco::Candidate> > var2_hnd;
+      edm::Handle<edm::View<reco::Candidate>> var2_hnd;
       bool isVar2 = iEvent.getByLabel(collection2, var2_hnd);
-      if ( !isVar2 ) { 
-	std::cout << "Warning : no " << collection2 << " in input !" << std::endl;
-	return false;
+      if (!isVar2) {
+        std::cout << "Warning : no " << collection2 << " in input !" << std::endl;
+        return false;
       }
       var2 = var2_hnd.product();
       const reco::Candidate *var20 = &(*var2)[0];
-      //std::cout << "FL: var20.pt = " << var20->et() << std::endl;
+      // std::cout << "FL: var20.pt = " << var20->et() << std::endl;
       double coll_var2;
-      if (variables_[varc]=="et") coll_var2=var20->et();
-      else if (variables_[varc]=="phi") coll_var2=var20->phi();
-      else if (variables_[varc]=="eta") coll_var2=var20->eta();
-      else
-      {
-	std::cout << "Error: PFFilter: variable unknown: " << variables_[varc] << std::endl;
-	return true;
+      if (variables_[varc] == "et")
+        coll_var2 = var20->et();
+      else if (variables_[varc] == "phi")
+        coll_var2 = var20->phi();
+      else if (variables_[varc] == "eta")
+        coll_var2 = var20->eta();
+      else {
+        std::cout << "Error: PFFilter: variable unknown: " << variables_[varc] << std::endl;
+        return true;
       }
-      //std::cout << "FL: coll_var2[" << variables_[varc] << "] = " << coll_var2 << std::endl;
-      //std::cout << "FL: max_[varc] = " << max_[varc] << std::endl;
-      //std::cout << "FL: min_[varc] = " << min_[varc] << std::endl;
+      // std::cout << "FL: coll_var2[" << variables_[varc] << "] = " <<
+      // coll_var2 << std::endl; std::cout << "FL: max_[varc] = " << max_[varc]
+      // << std::endl; std::cout << "FL: min_[varc] = " << min_[varc] <<
+      // std::endl;
 
       // Delta computation
-      double delta=coll_var1-coll_var2;
-      if (variables_[varc]=="phi")
-      {
-	if (coll_var1 > M_PI) coll_var1 -= ceil((coll_var1 - M_PI) / (2 * M_PI)) * 2 * M_PI;
-	if (coll_var1 <= - M_PI) coll_var1 += ceil((coll_var1 + M_PI) / (-2. * M_PI)) * 2. * M_PI;
-	if (coll_var2 > M_PI) coll_var2 -= ceil((coll_var2 - M_PI) / (2 * M_PI)) * 2 * M_PI;
-	if (coll_var2 <= - M_PI) coll_var2 += ceil((coll_var2 + M_PI) / (-2. * M_PI)) * 2 * M_PI;
-
-	double deltaphi=-999.0;
-	if (fabs(coll_var1 - coll_var2)<M_PI)
-	{
-	  deltaphi=(coll_var1-coll_var2);
-	}
-	else
-	{
-	  if ((coll_var1-coll_var2)>0.0)
-	  {
-	    deltaphi=(2*M_PI - fabs(coll_var1 - coll_var2));
-	  }
-	  else
-	  {
-	    deltaphi=-(2*M_PI - fabs(coll_var1 - coll_var2));
-	  }
-	}
-	delta=deltaphi;
+      double delta = coll_var1 - coll_var2;
+      if (variables_[varc] == "phi") {
+        if (coll_var1 > M_PI)
+          coll_var1 -= ceil((coll_var1 - M_PI) / (2 * M_PI)) * 2 * M_PI;
+        if (coll_var1 <= -M_PI)
+          coll_var1 += ceil((coll_var1 + M_PI) / (-2. * M_PI)) * 2. * M_PI;
+        if (coll_var2 > M_PI)
+          coll_var2 -= ceil((coll_var2 - M_PI) / (2 * M_PI)) * 2 * M_PI;
+        if (coll_var2 <= -M_PI)
+          coll_var2 += ceil((coll_var2 + M_PI) / (-2. * M_PI)) * 2 * M_PI;
+
+        double deltaphi = -999.0;
+        if (fabs(coll_var1 - coll_var2) < M_PI) {
+          deltaphi = (coll_var1 - coll_var2);
+        } else {
+          if ((coll_var1 - coll_var2) > 0.0) {
+            deltaphi = (2 * M_PI - fabs(coll_var1 - coll_var2));
+          } else {
+            deltaphi = -(2 * M_PI - fabs(coll_var1 - coll_var2));
+          }
+        }
+        delta = deltaphi;
       }
 
       // cuts
-      if (doMin_[varc] && doMax_[varc] && max_[varc]<min_[varc])
-      {
-	if (delta>max_[varc] && delta<min_[varc]) skip=true;
-      }
-      else
-      {
-	if (doMin_[varc] && delta<min_[varc]) skip=true;
-	if (doMax_[varc] && delta>max_[varc]) skip=true;
+      if (doMin_[varc] && doMax_[varc] && max_[varc] < min_[varc]) {
+        if (delta > max_[varc] && delta < min_[varc])
+          skip = true;
+      } else {
+        if (doMin_[varc] && delta < min_[varc])
+          skip = true;
+        if (doMax_[varc] && delta > max_[varc])
+          skip = true;
       }
-      //std::cout << "skip = " << skip << std::endl;
-    }
-    else
-    {
+      // std::cout << "skip = " << skip << std::endl;
+    } else {
       // get the variable:
       const edm::View<reco::Candidate> *var0;
-      edm::Handle< edm::View<reco::Candidate> > var0_hnd;
+      edm::Handle<edm::View<reco::Candidate>> var0_hnd;
       bool isVar0 = iEvent.getByLabel(collections_[varc], var0_hnd);
-      if ( !isVar0 ) { 
-	std::cout << "Warning : no " << collections_[varc] << " in input !" << std::endl;
-	return false;
+      if (!isVar0) {
+        std::cout << "Warning : no " << collections_[varc] << " in input !" << std::endl;
+        return false;
       }
       var0 = var0_hnd.product();
       const reco::Candidate *var00 = &(*var0)[0];
-      //std::cout << "FL: var00.pt = " << var00->et() << std::endl;
+      // std::cout << "FL: var00.pt = " << var00->et() << std::endl;
       double coll_var;
-      if (variables_[varc]=="et") coll_var=var00->et();
-      else if (variables_[varc]=="phi") coll_var=var00->phi();
-      else if (variables_[varc]=="eta") coll_var=var00->eta();
-      else
-      {
-	std::cout << "Error: PFFilter: variable unknown: " << variables_[varc] << std::endl;
-	return true;
+      if (variables_[varc] == "et")
+        coll_var = var00->et();
+      else if (variables_[varc] == "phi")
+        coll_var = var00->phi();
+      else if (variables_[varc] == "eta")
+        coll_var = var00->eta();
+      else {
+        std::cout << "Error: PFFilter: variable unknown: " << variables_[varc] << std::endl;
+        return true;
       }
-      //std::cout << "FL: coll_var[" << variables_[varc] << "] = " << coll_var << std::endl;
-      //std::cout << "FL: max_[varc] = " << max_[varc] << std::endl;
-      //std::cout << "FL: min_[varc] = " << min_[varc] << std::endl;
+      // std::cout << "FL: coll_var[" << variables_[varc] << "] = " << coll_var
+      // << std::endl; std::cout << "FL: max_[varc] = " << max_[varc] <<
+      // std::endl; std::cout << "FL: min_[varc] = " << min_[varc] << std::endl;
 
       // cuts
-      if (doMin_[varc] && doMax_[varc] && max_[varc]<min_[varc])
-      {
-	if (coll_var>max_[varc] && coll_var<min_[varc]) skip=true;
-      }
-      else
-      {
-	if (doMin_[varc] && coll_var<min_[varc]) skip=true;
-	if (doMax_[varc] && coll_var>max_[varc]) skip=true;
+      if (doMin_[varc] && doMax_[varc] && max_[varc] < min_[varc]) {
+        if (coll_var > max_[varc] && coll_var < min_[varc])
+          skip = true;
+      } else {
+        if (doMin_[varc] && coll_var < min_[varc])
+          skip = true;
+        if (doMax_[varc] && coll_var > max_[varc])
+          skip = true;
       }
-      //std::cout << "skip = " << skip << std::endl;
+      // std::cout << "skip = " << skip << std::endl;
     }
   }
-  //std::cout << "final skip = " << skip << std::endl;
+  // std::cout << "final skip = " << skip << std::endl;
   return !skip;
 }
 
-void PFFilter::endJob()
-{
-  //std::cout << "FL: endJob" << std::endl;
+void PFFilter::endJob() {
+  // std::cout << "FL: endJob" << std::endl;
 }
diff --git a/Validation/RecoParticleFlow/plugins/PFFilter.h b/Validation/RecoParticleFlow/plugins/PFFilter.h
index 95ea24a20970a..c5e229418d04e 100644
--- a/Validation/RecoParticleFlow/plugins/PFFilter.h
+++ b/Validation/RecoParticleFlow/plugins/PFFilter.h
@@ -4,22 +4,21 @@
 // author: Florent Lacroix (UIC)
 // date: 07/14/2009
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDFilter.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-class PFFilter: public edm::EDFilter{
- public:
-
-  explicit PFFilter(const edm::ParameterSet&);
+class PFFilter : public edm::EDFilter {
+public:
+  explicit PFFilter(const edm::ParameterSet &);
   ~PFFilter() override;
 
-  bool filter(edm::Event&, const edm::EventSetup&) override;
+  bool filter(edm::Event &, const edm::EventSetup &) override;
   void beginJob() override;
   void endJob() override;
   bool checkInput();
 
- private:
+private:
   std::vector<std::string> collections_;
   std::vector<std::string> variables_;
   std::vector<double> min_;
@@ -28,4 +27,4 @@ class PFFilter: public edm::EDFilter{
   std::vector<int> doMax_;
 };
 
-#endif // PFFILTER_H
+#endif  // PFFILTER_H
diff --git a/Validation/RecoParticleFlow/plugins/PFJetBenchmarkAnalyzer.cc b/Validation/RecoParticleFlow/plugins/PFJetBenchmarkAnalyzer.cc
index 5719bd40361cc..f67e8a163df43 100644
--- a/Validation/RecoParticleFlow/plugins/PFJetBenchmarkAnalyzer.cc
+++ b/Validation/RecoParticleFlow/plugins/PFJetBenchmarkAnalyzer.cc
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 //
-// Package:    
-// Class:   PFJetBenchmarkAnalyzer.cc    
-// 
+// Package:
+// Class:   PFJetBenchmarkAnalyzer.cc
+//
 /**\class PFJetBenchmarkAnalyzer PFJetBenchmarkAnalyzer.cc
 
  Description: <one line class summary>
@@ -17,30 +17,29 @@
 // Extensions by Joanna Weng
 //
 
-
 // system include files
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/JetReco/interface/Jet.h"
-#include "DataFormats/JetReco/interface/CaloJetCollection.h"
-#include "DataFormats/JetReco/interface/BasicJetCollection.h"
-#include "DataFormats/JetReco/interface/PFJet.h"
-#include "DataFormats/JetReco/interface/GenJet.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
 #include "DataFormats/Candidate/interface/CandidateFwd.h"
-#include "RecoParticleFlow/Benchmark/interface/PFJetBenchmark.h"
-#include "FWCore/ServiceRegistry/interface/Service.h" 
+#include "DataFormats/JetReco/interface/BasicJetCollection.h"
+#include "DataFormats/JetReco/interface/CaloJetCollection.h"
+#include "DataFormats/JetReco/interface/GenJet.h"
+#include "DataFormats/JetReco/interface/Jet.h"
+#include "DataFormats/JetReco/interface/PFJet.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
+#include "RecoParticleFlow/Benchmark/interface/PFJetBenchmark.h"
 using namespace edm;
 using namespace reco;
 using namespace std;
@@ -48,35 +47,32 @@ using namespace std;
 //
 // class decleration
 
- 
 class PFJetBenchmarkAnalyzer : public edm::EDAnalyzer {
 public:
-  explicit PFJetBenchmarkAnalyzer(const edm::ParameterSet&);
+  explicit PFJetBenchmarkAnalyzer(const edm::ParameterSet &);
   ~PFJetBenchmarkAnalyzer() override;
 
-
 private:
-  void beginJob() override ;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void endJob() override ;
+  void beginJob() override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
   // ----------member data ---------------------------
   edm::EDGetTokenT<reco::GenJetCollection> sGenJetAlgo_tok_;
   edm::EDGetTokenT<reco::PFJetCollection> sJetAlgo_tok_;
-  
 };
 /// PFJet Benchmark
 
-//neuhaus - comment
+// neuhaus - comment
 PFJetBenchmark PFJetBenchmark_;
 string outjetfilename;
 bool pfjBenchmarkDebug;
 bool plotAgainstReco;
 bool onlyTwoJets;
-double deltaRMax=0.1;
+double deltaRMax = 0.1;
 string benchmarkLabel_;
 double recPt;
 double maxEta;
-DQMStore * dbe_;
+DQMStore *dbe_;
 //
 // constants, enums and typedefs
 //
@@ -88,85 +84,67 @@ DQMStore * dbe_;
 //
 // constructors and destructor
 //
-PFJetBenchmarkAnalyzer::PFJetBenchmarkAnalyzer(const edm::ParameterSet& iConfig)
+PFJetBenchmarkAnalyzer::PFJetBenchmarkAnalyzer(const edm::ParameterSet &iConfig)
 
 {
-  //now do what ever initialization is needed
-  sGenJetAlgo_tok_ = consumes<reco::GenJetCollection> (iConfig.getParameter<edm::InputTag>("InputTruthLabel") );
-  sJetAlgo_tok_ = consumes<reco::PFJetCollection> (iConfig.getParameter<edm::InputTag>("InputRecoLabel") );
+  // now do what ever initialization is needed
+  sGenJetAlgo_tok_ = consumes<reco::GenJetCollection>(iConfig.getParameter<edm::InputTag>("InputTruthLabel"));
+  sJetAlgo_tok_ = consumes<reco::PFJetCollection>(iConfig.getParameter<edm::InputTag>("InputRecoLabel"));
   outjetfilename = iConfig.getUntrackedParameter<string>("OutputFile");
   pfjBenchmarkDebug = iConfig.getParameter<bool>("pfjBenchmarkDebug");
   plotAgainstReco = iConfig.getParameter<bool>("PlotAgainstRecoQuantities");
   onlyTwoJets = iConfig.getParameter<bool>("OnlyTwoJets");
-  deltaRMax = iConfig.getParameter<double>("deltaRMax");	  
-  benchmarkLabel_  = iConfig.getParameter<string>("BenchmarkLabel"); 
-  recPt  = iConfig.getParameter<double>("recPt"); 
-  maxEta = iConfig.getParameter<double>("maxEta"); 
-  
+  deltaRMax = iConfig.getParameter<double>("deltaRMax");
+  benchmarkLabel_ = iConfig.getParameter<string>("BenchmarkLabel");
+  recPt = iConfig.getParameter<double>("recPt");
+  maxEta = iConfig.getParameter<double>("maxEta");
+
   dbe_ = edm::Service<DQMStore>().operator->();
 
   PFJetBenchmark_.setup(
-			outjetfilename, 
-			pfjBenchmarkDebug,
-			plotAgainstReco,
-			onlyTwoJets,
-			deltaRMax,
-			benchmarkLabel_, 
-			recPt, 
-			maxEta, 
-			dbe_);
+      outjetfilename, pfjBenchmarkDebug, plotAgainstReco, onlyTwoJets, deltaRMax, benchmarkLabel_, recPt, maxEta, dbe_);
 }
 
-
-PFJetBenchmarkAnalyzer::~PFJetBenchmarkAnalyzer()
-{
+PFJetBenchmarkAnalyzer::~PFJetBenchmarkAnalyzer() {
   // do anything here that needs to be done at desctruction time
   // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-PFJetBenchmarkAnalyzer::analyze(const edm::Event& iEvent, 
-				const edm::EventSetup& iSetup)
-{
- // get gen jet collection
+void PFJetBenchmarkAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  // get gen jet collection
   Handle<GenJetCollection> genjets;
   bool isGen = iEvent.getByToken(sGenJetAlgo_tok_, genjets);
-  if (!isGen) { 
+  if (!isGen) {
     std::cout << "Warning : no Gen jets in input !" << std::endl;
     return;
   }
 
   // get rec PFJet collection
   Handle<PFJetCollection> pfjets;
-  bool isReco = iEvent.getByToken(sJetAlgo_tok_, pfjets);   
-  if (!isReco) { 
+  bool isReco = iEvent.getByToken(sJetAlgo_tok_, pfjets);
+  if (!isReco) {
     std::cout << "Warning : no PF jets in input !" << std::endl;
     return;
   }
-  // Analyse (no "z" in "analyse" : we are in Europe, dammit!) 
+  // Analyse (no "z" in "analyse" : we are in Europe, dammit!)
   PFJetBenchmark_.process(*pfjets, *genjets);
 }
 
+// ------------ method called once each job just before starting event loop
+// ------------
+void PFJetBenchmarkAnalyzer::beginJob() {}
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-PFJetBenchmarkAnalyzer::beginJob()
-{
-
-}
-
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-PFJetBenchmarkAnalyzer::endJob() {
-//  PFJetBenchmark_.save();
+// ------------ method called once each job just after ending the event loop
+// ------------
+void PFJetBenchmarkAnalyzer::endJob() {
+  //  PFJetBenchmark_.save();
   PFJetBenchmark_.write();
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(PFJetBenchmarkAnalyzer);
diff --git a/Validation/RecoParticleFlow/plugins/PFJetFilter.cc b/Validation/RecoParticleFlow/plugins/PFJetFilter.cc
index 1785ffdf0fab8..ece43bbd923c7 100644
--- a/Validation/RecoParticleFlow/plugins/PFJetFilter.cc
+++ b/Validation/RecoParticleFlow/plugins/PFJetFilter.cc
@@ -1,203 +1,190 @@
-#include "Validation/RecoParticleFlow/plugins/PFJetFilter.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
+#include "Validation/RecoParticleFlow/plugins/PFJetFilter.h"
 
-#include "FWCore/Framework/interface/Event.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "DataFormats/Candidate/interface/CandidateFwd.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
+#include "DataFormats/Candidate/interface/CandidateFwd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/JetReco/interface/PFJet.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 
 using namespace reco;
 using namespace edm;
 using namespace std;
 
-PFJetFilter::PFJetFilter(const edm::ParameterSet& iConfig)
-{
-  inputTruthLabel_             = consumes<edm::View<reco::Candidate> >(iConfig.getParameter<edm::InputTag>("InputTruthLabel") );
-  inputRecoLabel_              = consumes<edm::View<reco::Candidate> >(iConfig.getParameter<edm::InputTag>("InputRecoLabel") );
+PFJetFilter::PFJetFilter(const edm::ParameterSet &iConfig) {
+  inputTruthLabel_ = consumes<edm::View<reco::Candidate>>(iConfig.getParameter<edm::InputTag>("InputTruthLabel"));
+  inputRecoLabel_ = consumes<edm::View<reco::Candidate>>(iConfig.getParameter<edm::InputTag>("InputRecoLabel"));
 
-  recPt_cut                    = iConfig.getParameter<double>("recPt");
-  genPt_cut                    = iConfig.getParameter<double>("genPt");
+  recPt_cut = iConfig.getParameter<double>("recPt");
+  genPt_cut = iConfig.getParameter<double>("genPt");
 
-  eta_min                      = iConfig.getParameter<double>("minEta");
-  eta_max                      = iConfig.getParameter<double>("maxEta");
+  eta_min = iConfig.getParameter<double>("minEta");
+  eta_max = iConfig.getParameter<double>("maxEta");
 
-  deltaR_min                   = iConfig.getParameter<double>("deltaRMin");
-  deltaR_max                   = iConfig.getParameter<double>("deltaRMax");
+  deltaR_min = iConfig.getParameter<double>("deltaRMin");
+  deltaR_max = iConfig.getParameter<double>("deltaRMax");
 
-  deltaEt_min                  = iConfig.getParameter<double>("minDeltaEt");
-  deltaEt_max                  = iConfig.getParameter<double>("maxDeltaEt");
+  deltaEt_min = iConfig.getParameter<double>("minDeltaEt");
+  deltaEt_max = iConfig.getParameter<double>("maxDeltaEt");
 
-  verbose                      = iConfig.getParameter<bool>("verbose");
+  verbose = iConfig.getParameter<bool>("verbose");
 
   entry = 0;
 }
 
-PFJetFilter::~PFJetFilter()
-{}
-
+PFJetFilter::~PFJetFilter() {}
 
-void 
-PFJetFilter::beginJob() {}
+void PFJetFilter::beginJob() {}
 
-void 
-PFJetFilter::endJob() {}
+void PFJetFilter::endJob() {}
 
-bool 
-PFJetFilter::filter(edm::Event& iEvent, const edm::EventSetup& iESetup)
-{
+bool PFJetFilter::filter(edm::Event &iEvent, const edm::EventSetup &iESetup) {
+  // Typedefs to use views
+  typedef edm::View<reco::Candidate> candidateCollection;
+  typedef edm::View<reco::Candidate> candidateCollection;
 
-// Typedefs to use views
-  typedef edm::View<reco::Candidate> candidateCollection ;
-  typedef edm::View<reco::Candidate> candidateCollection ;
-  
   const candidateCollection *truth_candidates;
   const candidateCollection *reco_candidates;
- 
+
   // ==========================================================
   // Retrieve!
   // ==========================================================
 
- // Get Truth Candidates (GenCandidates, GenJets, etc.)
-    Handle<candidateCollection> truth_hnd;
-    bool isGen = iEvent.getByToken(inputTruthLabel_, truth_hnd);
-    if ( !isGen ) { 
-      std::cout << "Warning : no Gen jets in input !" << std::endl;
-      return false;
-    }
-
-    truth_candidates = truth_hnd.product();
-
-   // Get Reco Candidates (PFlow, CaloJet, etc.)
-    Handle<candidateCollection> reco_hnd;
-    bool isReco = iEvent.getByToken(inputRecoLabel_, reco_hnd);
-    if ( !isReco ) { 
-      std::cout << "Warning : no Reco jets in input !" << std::endl;
-      return false; 
-    }
-    reco_candidates = reco_hnd.product();
-    if (!truth_candidates || !reco_candidates) return false;
-
-    
-    bool pass = false;
-    
-    for (unsigned int i = 0; i < reco_candidates->size(); i++) {
-      
-      const reco::Candidate *particle = &(*reco_candidates)[i];
-      
-      // This protection is meant at not being used !
-      assert( particle!=nullptr ); 
-
-      double rec_pt = particle->pt();
-      double rec_eta = particle->eta();
-      double rec_phi = particle->phi();
-
-      // skip PFjets with pt < recPt_cut GeV
-      if (rec_pt < recPt_cut ) continue;
-
-      // skip PFjets with eta > maxEta_cut or eta < minEta_cut
-      if ( fabs(rec_eta) > eta_max ) continue;
-      if ( fabs(rec_eta) < eta_min ) continue;
-
-      bool Barrel = false;
-      bool Endcap = false;
-      if (std::abs(rec_eta) < 1.4 ) Barrel = true;
-      if (std::abs (rec_eta) > 1.4 && std::abs (rec_eta) < 2.6 ) Endcap = true;
-
-      // Keep only jets in the barrel or the endcaps, within the tracker acceptance
-      if ( !Barrel && !Endcap ) continue;
-
-      // Find the closets recJet
-      double deltaRmin = 999.;
-      double ptmin = 0.;
-      for (unsigned int j = 0; j < reco_candidates->size(); j++) {
-      
-	if ( i == j ) continue;
-	const reco::Candidate *other = &(*reco_candidates)[j];
-	double deltaR = algo_->deltaR(particle, other);
-	if ( deltaR < deltaRmin && 
-	     other->pt() > 0.25*particle->pt() && 
-	     other->pt() > recPt_cut ) { 
-	  deltaRmin = deltaR;
-	  ptmin = other->pt();
-	} 
-	if ( deltaRmin < deltaR_min ) break;  
-      }
-      if ( deltaRmin < deltaR_min ) continue;  
-      
-
-      // Find the closest genJet.
-      const reco::Candidate *gen_particle = 
-	algo_->matchByDeltaR(particle,
-			     truth_candidates);
-
-      // Check there is a genJet associated to the recoJet
-      if(gen_particle==nullptr) continue; 
-
-      // check deltaR is small enough
-      double deltaR = algo_->deltaR(particle, gen_particle);
-      if ( deltaR > deltaR_max ) continue;
-
-      // double true_E = gen_particle->p();
-      double true_pt = gen_particle->pt();
-      double true_eta = gen_particle->eta();
-      double true_phi = gen_particle->phi();
-
-      // skip PFjets with pt < genPt_cut GeV
-      if (true_pt < genPt_cut ) continue;
-      
-      // Find the pT residual
-      double resPt = (rec_pt -true_pt)/true_pt;
-      double sigma = resolution(true_pt,Barrel);
-      double avera = response(true_pt,Barrel);
-      double nSig  = (resPt-avera)/sigma;
-
-      if ( nSig > deltaEt_max || nSig < deltaEt_min ) { 
-	/* */
-	if ( verbose ) 
-	  std::cout << "Entry " << entry 
-		    << " resPt = " << resPt 
-		    << " sigma/avera/nSig = " << sigma << "/" << avera <<"/" << nSig
-		    << " pT (T/R) " << true_pt << "/" << rec_pt 
-		    << " Eta (T/R) " << true_eta << "/" << rec_eta 
-		    << " Phi (T/R) " << true_phi << "/" << rec_phi 
-		    << " deltaRMin/ptmin " << deltaRmin << "/" << ptmin  
-		    << std::endl;
-	/* */
-	pass = true;
+  // Get Truth Candidates (GenCandidates, GenJets, etc.)
+  Handle<candidateCollection> truth_hnd;
+  bool isGen = iEvent.getByToken(inputTruthLabel_, truth_hnd);
+  if (!isGen) {
+    std::cout << "Warning : no Gen jets in input !" << std::endl;
+    return false;
+  }
+
+  truth_candidates = truth_hnd.product();
+
+  // Get Reco Candidates (PFlow, CaloJet, etc.)
+  Handle<candidateCollection> reco_hnd;
+  bool isReco = iEvent.getByToken(inputRecoLabel_, reco_hnd);
+  if (!isReco) {
+    std::cout << "Warning : no Reco jets in input !" << std::endl;
+    return false;
+  }
+  reco_candidates = reco_hnd.product();
+  if (!truth_candidates || !reco_candidates)
+    return false;
+
+  bool pass = false;
+
+  for (unsigned int i = 0; i < reco_candidates->size(); i++) {
+    const reco::Candidate *particle = &(*reco_candidates)[i];
+
+    // This protection is meant at not being used !
+    assert(particle != nullptr);
+
+    double rec_pt = particle->pt();
+    double rec_eta = particle->eta();
+    double rec_phi = particle->phi();
+
+    // skip PFjets with pt < recPt_cut GeV
+    if (rec_pt < recPt_cut)
+      continue;
+
+    // skip PFjets with eta > maxEta_cut or eta < minEta_cut
+    if (fabs(rec_eta) > eta_max)
+      continue;
+    if (fabs(rec_eta) < eta_min)
+      continue;
+
+    bool Barrel = false;
+    bool Endcap = false;
+    if (std::abs(rec_eta) < 1.4)
+      Barrel = true;
+    if (std::abs(rec_eta) > 1.4 && std::abs(rec_eta) < 2.6)
+      Endcap = true;
+
+    // Keep only jets in the barrel or the endcaps, within the tracker
+    // acceptance
+    if (!Barrel && !Endcap)
+      continue;
+
+    // Find the closets recJet
+    double deltaRmin = 999.;
+    double ptmin = 0.;
+    for (unsigned int j = 0; j < reco_candidates->size(); j++) {
+      if (i == j)
+        continue;
+      const reco::Candidate *other = &(*reco_candidates)[j];
+      double deltaR = algo_->deltaR(particle, other);
+      if (deltaR < deltaRmin && other->pt() > 0.25 * particle->pt() && other->pt() > recPt_cut) {
+        deltaRmin = deltaR;
+        ptmin = other->pt();
       }
-      
-      if ( pass ) break;
-
+      if (deltaRmin < deltaR_min)
+        break;
+    }
+    if (deltaRmin < deltaR_min)
+      continue;
+
+    // Find the closest genJet.
+    const reco::Candidate *gen_particle = algo_->matchByDeltaR(particle, truth_candidates);
+
+    // Check there is a genJet associated to the recoJet
+    if (gen_particle == nullptr)
+      continue;
+
+    // check deltaR is small enough
+    double deltaR = algo_->deltaR(particle, gen_particle);
+    if (deltaR > deltaR_max)
+      continue;
+
+    // double true_E = gen_particle->p();
+    double true_pt = gen_particle->pt();
+    double true_eta = gen_particle->eta();
+    double true_phi = gen_particle->phi();
+
+    // skip PFjets with pt < genPt_cut GeV
+    if (true_pt < genPt_cut)
+      continue;
+
+    // Find the pT residual
+    double resPt = (rec_pt - true_pt) / true_pt;
+    double sigma = resolution(true_pt, Barrel);
+    double avera = response(true_pt, Barrel);
+    double nSig = (resPt - avera) / sigma;
+
+    if (nSig > deltaEt_max || nSig < deltaEt_min) {
+      /* */
+      if (verbose)
+        std::cout << "Entry " << entry << " resPt = " << resPt << " sigma/avera/nSig = " << sigma << "/" << avera << "/"
+                  << nSig << " pT (T/R) " << true_pt << "/" << rec_pt << " Eta (T/R) " << true_eta << "/" << rec_eta
+                  << " Phi (T/R) " << true_phi << "/" << rec_phi << " deltaRMin/ptmin " << deltaRmin << "/" << ptmin
+                  << std::endl;
+      /* */
+      pass = true;
     }
 
-    entry++;
-    return pass;
+    if (pass)
+      break;
+  }
 
+  entry++;
+  return pass;
 }
 
-double 
-PFJetFilter::resolution(double pt, bool barrel) {
-
-  double p0 = barrel ?  1.19200e-02 :  8.45341e-03;
-  double p1 = barrel ?  1.06138e+00 :  7.96855e-01;
+double PFJetFilter::resolution(double pt, bool barrel) {
+  double p0 = barrel ? 1.19200e-02 : 8.45341e-03;
+  double p1 = barrel ? 1.06138e+00 : 7.96855e-01;
   double p2 = barrel ? -2.05929e+00 : -3.12076e-01;
 
-  double resp = p0 + p1/sqrt(pt) + p2/pt;
+  double resp = p0 + p1 / sqrt(pt) + p2 / pt;
   return resp;
-
 }
 
-double 
-PFJetFilter::response(double pt, bool barrel) {
-
-  double p0 = barrel ?  1.09906E-1 :  6.91939E+1;
+double PFJetFilter::response(double pt, bool barrel) {
+  double p0 = barrel ? 1.09906E-1 : 6.91939E+1;
   double p1 = barrel ? -1.61443E-1 : -6.92733E+1;
-  double p2 = barrel ?  3.45489E+3 :  1.58207E+6;
+  double p2 = barrel ? 3.45489E+3 : 1.58207E+6;
 
-  double resp = p0 + p1 * std::exp(-pt/p2);
+  double resp = p0 + p1 * std::exp(-pt / p2);
   return resp;
-
 }
diff --git a/Validation/RecoParticleFlow/plugins/PFJetFilter.h b/Validation/RecoParticleFlow/plugins/PFJetFilter.h
index 7cb050b3f19a3..2691c16fc6818 100644
--- a/Validation/RecoParticleFlow/plugins/PFJetFilter.h
+++ b/Validation/RecoParticleFlow/plugins/PFJetFilter.h
@@ -1,25 +1,23 @@
 #ifndef PFJETFILTER_H
 #define PFJETFILTER_H
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Utilities/interface/InputTag.h"
+#include "DataFormats/Candidate/interface/Candidate.h"
 #include "FWCore/Framework/interface/EDFilter.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 #include "RecoParticleFlow/Benchmark/interface/PFBenchmarkAlgo.h"
-#include "DataFormats/Candidate/interface/Candidate.h"
 
-class PFJetFilter: public edm::EDFilter {
- public:
-
-  explicit PFJetFilter(const edm::ParameterSet&);
+class PFJetFilter : public edm::EDFilter {
+public:
+  explicit PFJetFilter(const edm::ParameterSet &);
   ~PFJetFilter() override;
 
- private:
-
-  void beginJob() override ;
-  bool filter(edm::Event&, const edm::EventSetup&) override;
+private:
+  void beginJob() override;
+  bool filter(edm::Event &, const edm::EventSetup &) override;
   void endJob() override;
 
   double resolution(double, bool);
@@ -33,15 +31,13 @@ class PFJetFilter: public edm::EDFilter {
   double deltaR_max;
   double eta_min;
   double eta_max;
-  edm::EDGetTokenT< edm::View<reco::Candidate> > inputTruthLabel_;
-  edm::EDGetTokenT< edm::View<reco::Candidate> > inputRecoLabel_;
+  edm::EDGetTokenT<edm::View<reco::Candidate>> inputTruthLabel_;
+  edm::EDGetTokenT<edm::View<reco::Candidate>> inputRecoLabel_;
 
   unsigned int entry;
   bool verbose;
-  
-  PFBenchmarkAlgo *algo_;
 
+  PFBenchmarkAlgo *algo_;
 };
 
-
-#endif //PFJETBENCHMARKFILTER_H
+#endif  // PFJETBENCHMARKFILTER_H
diff --git a/Validation/RecoParticleFlow/plugins/PFMETBenchmarkAnalyzer.cc b/Validation/RecoParticleFlow/plugins/PFMETBenchmarkAnalyzer.cc
index cfb95c1e2222d..e9e0f46d9d15a 100644
--- a/Validation/RecoParticleFlow/plugins/PFMETBenchmarkAnalyzer.cc
+++ b/Validation/RecoParticleFlow/plugins/PFMETBenchmarkAnalyzer.cc
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 //
-// Package:    
-// Class:   PFMETBenchmarkAnalyzer.cc    
-// 
+// Package:
+// Class:   PFMETBenchmarkAnalyzer.cc
+//
 /**\class PFMETBenchmarkAnalyzer PFMETBenchmarkAnalyzer.cc
 
  Description: <one line class summary>
@@ -17,32 +17,31 @@
 // Extensions by Joanna Weng
 //
 
-
 // system include files
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/METReco/interface/MET.h"
-#include "DataFormats/METReco/interface/CaloMETCollection.h"
-#include "DataFormats/METReco/interface/CaloMET.h"
-#include "DataFormats/METReco/interface/PFMET.h"
-#include "DataFormats/METReco/interface/GenMET.h"
-#include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
-#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
 #include "DataFormats/Candidate/interface/CandidateFwd.h"
-#include "RecoParticleFlow/Benchmark/interface/PFMETBenchmark.h"
-#include "FWCore/ServiceRegistry/interface/Service.h" 
+#include "DataFormats/HepMCCandidate/interface/GenParticle.h"
+#include "DataFormats/HepMCCandidate/interface/GenParticleFwd.h"
+#include "DataFormats/METReco/interface/CaloMET.h"
+#include "DataFormats/METReco/interface/CaloMETCollection.h"
+#include "DataFormats/METReco/interface/GenMET.h"
+#include "DataFormats/METReco/interface/MET.h"
+#include "DataFormats/METReco/interface/PFMET.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/InputTag.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
+#include "RecoParticleFlow/Benchmark/interface/PFMETBenchmark.h"
 using namespace edm;
 using namespace reco;
 using namespace std;
@@ -50,33 +49,30 @@ using namespace std;
 //
 // class decleration
 
- 
 class PFMETBenchmarkAnalyzer : public edm::EDAnalyzer {
 public:
-  explicit PFMETBenchmarkAnalyzer(const edm::ParameterSet&);
+  explicit PFMETBenchmarkAnalyzer(const edm::ParameterSet &);
   ~PFMETBenchmarkAnalyzer() override;
 
-
 private:
-  void beginJob() override ;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void endJob() override ;
+  void beginJob() override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
   // ----------member data ---------------------------
   edm::EDGetTokenT<reco::GenParticleCollection> sInputTruthLabel_tok_;
   edm::EDGetTokenT<reco::PFMETCollection> sInputRecoLabel_tok_;
   edm::EDGetTokenT<reco::CaloMETCollection> sInputCaloLabel_tok_;
   edm::EDGetTokenT<reco::METCollection> sInputTCLabel_tok_;
-  
 };
 /// PFJet Benchmark
 
-//neuhaus - comment
+// neuhaus - comment
 PFMETBenchmark PFMETBenchmark_;
 string OutputFileName;
 bool pfmBenchmarkDebug;
 bool xplotAgainstReco;
 string xbenchmarkLabel_;
-DQMStore * xdbe_;
+DQMStore *xdbe_;
 //
 // constants, enums and typedefs
 //
@@ -88,10 +84,10 @@ DQMStore * xdbe_;
 //
 // constructors and destructor
 //
-PFMETBenchmarkAnalyzer::PFMETBenchmarkAnalyzer(const edm::ParameterSet& iConfig)
+PFMETBenchmarkAnalyzer::PFMETBenchmarkAnalyzer(const edm::ParameterSet &iConfig)
 
 {
-  //now do what ever initialization is needed
+  // now do what ever initialization is needed
   sInputTruthLabel_tok_ = consumes<reco::GenParticleCollection>(iConfig.getParameter<InputTag>("InputTruthLabel"));
   sInputRecoLabel_tok_ = consumes<reco::PFMETCollection>(iConfig.getParameter<InputTag>("InputRecoLabel"));
   sInputCaloLabel_tok_ = consumes<reco::CaloMETCollection>(iConfig.getParameter<InputTag>("InputCaloLabel"));
@@ -99,83 +95,69 @@ PFMETBenchmarkAnalyzer::PFMETBenchmarkAnalyzer(const edm::ParameterSet& iConfig)
   OutputFileName = iConfig.getUntrackedParameter<string>("OutputFile");
   pfmBenchmarkDebug = iConfig.getParameter<bool>("pfjBenchmarkDebug");
   xplotAgainstReco = iConfig.getParameter<bool>("PlotAgainstRecoQuantities");
-  xbenchmarkLabel_  = iConfig.getParameter<string>("BenchmarkLabel"); 
+  xbenchmarkLabel_ = iConfig.getParameter<string>("BenchmarkLabel");
   xdbe_ = edm::Service<DQMStore>().operator->();
 
-  PFMETBenchmark_.setup(
-			OutputFileName, 
-			pfmBenchmarkDebug,
-			xplotAgainstReco,
-			xbenchmarkLabel_, 
-			xdbe_);
+  PFMETBenchmark_.setup(OutputFileName, pfmBenchmarkDebug, xplotAgainstReco, xbenchmarkLabel_, xdbe_);
 }
 
-
-PFMETBenchmarkAnalyzer::~PFMETBenchmarkAnalyzer()
-{
+PFMETBenchmarkAnalyzer::~PFMETBenchmarkAnalyzer() {
   // do anything here that needs to be done at desctruction time
   // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-PFMETBenchmarkAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
- // get gen jet collection
+void PFMETBenchmarkAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  // get gen jet collection
   Handle<GenParticleCollection> genparticles;
   bool isGen = iEvent.getByToken(sInputTruthLabel_tok_, genparticles);
-  if (!isGen) { 
+  if (!isGen) {
     std::cout << "Warning : no Gen Particles in input !" << std::endl;
     return;
   }
 
   // get rec PFMet collection
   Handle<PFMETCollection> pfmets;
-  bool isReco = iEvent.getByToken(sInputRecoLabel_tok_, pfmets);   
-  if (!isReco) { 
+  bool isReco = iEvent.getByToken(sInputRecoLabel_tok_, pfmets);
+  if (!isReco) {
     std::cout << "Warning : no PF MET in input !" << std::endl;
     return;
   }
 
   // get rec TCMet collection
   Handle<METCollection> tcmets;
-  bool isTC = iEvent.getByToken(sInputTCLabel_tok_, tcmets);   
-  if (!isTC) { 
+  bool isTC = iEvent.getByToken(sInputTCLabel_tok_, tcmets);
+  if (!isTC) {
     std::cout << "Warning : no TC MET in input !" << std::endl;
     return;
   }
 
   Handle<CaloMETCollection> calomets;
-  bool isCalo = iEvent.getByToken(sInputCaloLabel_tok_, calomets);   
-  if (!isCalo) { 
+  bool isCalo = iEvent.getByToken(sInputCaloLabel_tok_, calomets);
+  if (!isCalo) {
     std::cout << "Warning : no Calo MET in input !" << std::endl;
     return;
   }
 
-  // Analyse (no "z" in "analyse" : we are in Europe, dammit!) 
+  // Analyse (no "z" in "analyse" : we are in Europe, dammit!)
   PFMETBenchmark_.process(*pfmets, *genparticles, *calomets, *tcmets);
 }
 
+// ------------ method called once each job just before starting event loop
+// ------------
+void PFMETBenchmarkAnalyzer::beginJob() {}
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-PFMETBenchmarkAnalyzer::beginJob()
-{
-
-}
-
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-PFMETBenchmarkAnalyzer::endJob() {
-//  PFMETBenchmark_.save();
+// ------------ method called once each job just after ending the event loop
+// ------------
+void PFMETBenchmarkAnalyzer::endJob() {
+  //  PFMETBenchmark_.save();
   PFMETBenchmark_.analyse();
   PFMETBenchmark_.write();
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(PFMETBenchmarkAnalyzer);
diff --git a/Validation/RecoParticleFlow/plugins/PFMETFilter.cc b/Validation/RecoParticleFlow/plugins/PFMETFilter.cc
index d2cf9fc6cd48c..ff3e2dd335eb4 100644
--- a/Validation/RecoParticleFlow/plugins/PFMETFilter.cc
+++ b/Validation/RecoParticleFlow/plugins/PFMETFilter.cc
@@ -1,22 +1,21 @@
 #include "Validation/RecoParticleFlow/plugins/PFMETFilter.h"
 
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/Utilities/interface/InputTag.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
 #include "DataFormats/Candidate/interface/CandidateFwd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/METReco/interface/MET.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/InputTag.h"
 
-PFMETFilter::PFMETFilter(const edm::ParameterSet& iConfig)
-{
-  collections_= iConfig.getParameter< std::vector<std::string> >("Collections");
-  variables_= iConfig.getParameter< std::vector<std::string> >("Variables");
-  min_ = iConfig.getParameter< std::vector<double> >("Mins");
-  max_ = iConfig.getParameter< std::vector<double> >("Maxs");
-  doMin_ = iConfig.getParameter< std::vector<int> >("DoMin");
-  doMax_ = iConfig.getParameter< std::vector<int> >("DoMax");
+PFMETFilter::PFMETFilter(const edm::ParameterSet &iConfig) {
+  collections_ = iConfig.getParameter<std::vector<std::string>>("Collections");
+  variables_ = iConfig.getParameter<std::vector<std::string>>("Variables");
+  min_ = iConfig.getParameter<std::vector<double>>("Mins");
+  max_ = iConfig.getParameter<std::vector<double>>("Maxs");
+  doMin_ = iConfig.getParameter<std::vector<int>>("DoMin");
+  doMax_ = iConfig.getParameter<std::vector<int>>("DoMax");
   TrueMET_ = iConfig.getParameter<std::string>("TrueMET");
   DeltaMEXsigma_ = iConfig.getParameter<double>("DeltaMEXsigma");
   sigma_a_ = iConfig.getParameter<double>("sigma_a");
@@ -27,38 +26,32 @@ PFMETFilter::PFMETFilter(const edm::ParameterSet& iConfig)
 
 PFMETFilter::~PFMETFilter() {}
 
-bool PFMETFilter::checkInput()
-{
-  if (collections_.size()!=min_.size())
-  {
+bool PFMETFilter::checkInput() {
+  if (collections_.size() != min_.size()) {
     std::cout << "Error: in PFMETFilter: collections_.size()!=min_.size()" << std::endl;
     std::cout << "collections_.size() = " << collections_.size() << std::endl;
     std::cout << "min_.size() = " << min_.size() << std::endl;
     return false;
   }
-  if (collections_.size()!=max_.size())
-  {
+  if (collections_.size() != max_.size()) {
     std::cout << "Error: in PFMETFilter: collections_.size()!=max_.size()" << std::endl;
     std::cout << "collections_.size() = " << collections_.size() << std::endl;
     std::cout << "max_.size() = " << max_.size() << std::endl;
     return false;
   }
-  if (collections_.size()!=doMin_.size())
-  {
+  if (collections_.size() != doMin_.size()) {
     std::cout << "Error: in PFMETFilter: collections_.size()!=min_.size()" << std::endl;
     std::cout << "collections_.size() = " << collections_.size() << std::endl;
     std::cout << "doMin_.size() = " << doMin_.size() << std::endl;
     return false;
   }
-  if (collections_.size()!=doMax_.size())
-  {
+  if (collections_.size() != doMax_.size()) {
     std::cout << "Error: in PFMETFilter: collections_.size()!=min_.size()" << std::endl;
     std::cout << "collections_.size() = " << collections_.size() << std::endl;
     std::cout << "doMax_.size() = " << doMax_.size() << std::endl;
     return false;
   }
-  if (collections_.size()!=variables_.size())
-  {
+  if (collections_.size() != variables_.size()) {
     std::cout << "Error: in PFMETFilter: collections_.size()!=variables_.size()" << std::endl;
     std::cout << "collections_.size() = " << collections_.size() << std::endl;
     std::cout << "variables_.size() = " << variables_.size() << std::endl;
@@ -67,219 +60,209 @@ bool PFMETFilter::checkInput()
   return true;
 }
 
-void PFMETFilter::beginJob()
-{
-  //std::cout << "FL: beginJob" << std::endl;
+void PFMETFilter::beginJob() {
+  // std::cout << "FL: beginJob" << std::endl;
 }
 
-bool PFMETFilter::filter(edm::Event& iEvent, 
-		    const edm::EventSetup& iSetup)
-{
-  //std::cout << "FL: filter" << std::endl;
-  //std::cout << "FL: Mins = " << min_ << std::endl;
+bool PFMETFilter::filter(edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  // std::cout << "FL: filter" << std::endl;
+  // std::cout << "FL: Mins = " << min_ << std::endl;
 
-  if (!checkInput()) return true; // no filtering !
+  if (!checkInput())
+    return true;  // no filtering !
 
-  bool skip=false;
+  bool skip = false;
 
-  for (unsigned int varc=0;varc<collections_.size();++varc)
-  {
-    //std::cout << "FL: var[" << varc << "] = " << collections_[varc] << std::endl;
-    //std::cout << "FL: var[0] = " << collections_[0] << std::endl;
+  for (unsigned int varc = 0; varc < collections_.size(); ++varc) {
+    // std::cout << "FL: var[" << varc << "] = " << collections_[varc] <<
+    // std::endl; std::cout << "FL: var[0] = " << collections_[0] << std::endl;
 
     // if the collection is collection1-collection2:
-    const unsigned int minuspos=collections_[varc].find("-");
-    if (minuspos<collections_[varc].size())
-    {
+    const unsigned int minuspos = collections_[varc].find("-");
+    if (minuspos < collections_[varc].size()) {
       std::string collection1;
-      collection1.assign(collections_[varc],0,minuspos);
-      //std::cout << "collection1 = " << collection1 << std::endl;
+      collection1.assign(collections_[varc], 0, minuspos);
+      // std::cout << "collection1 = " << collection1 << std::endl;
       std::string collection2;
-      collection2.assign(collections_[varc],minuspos+1,collections_[varc].size());
-      //std::cout << "collection2 = " << collection2 << std::endl;
+      collection2.assign(collections_[varc], minuspos + 1, collections_[varc].size());
+      // std::cout << "collection2 = " << collection2 << std::endl;
 
       const edm::View<reco::Candidate> *var1;
-      edm::Handle< edm::View<reco::Candidate> > var1_hnd;
+      edm::Handle<edm::View<reco::Candidate>> var1_hnd;
       bool isVar1 = iEvent.getByLabel(collection1, var1_hnd);
-      if ( !isVar1 ) { 
-	std::cout << "Warning : no " << collection1 << " in input !" << std::endl;
-	return false;
+      if (!isVar1) {
+        std::cout << "Warning : no " << collection1 << " in input !" << std::endl;
+        return false;
       }
       var1 = var1_hnd.product();
       const reco::Candidate *var10 = &(*var1)[0];
-      //std::cout << "FL: var10.pt = " << var10->et() << std::endl;
+      // std::cout << "FL: var10.pt = " << var10->et() << std::endl;
       double coll_var1;
-      if (variables_[varc]=="et") coll_var1=var10->et();
-      else if (variables_[varc]=="phi") coll_var1=var10->phi();
-      else if (variables_[varc]=="eta") coll_var1=var10->eta();
-      else
-      {
-	std::cout << "Error: PFMETFilter: variable unknown: " << variables_[varc] << std::endl;
-	return true;
+      if (variables_[varc] == "et")
+        coll_var1 = var10->et();
+      else if (variables_[varc] == "phi")
+        coll_var1 = var10->phi();
+      else if (variables_[varc] == "eta")
+        coll_var1 = var10->eta();
+      else {
+        std::cout << "Error: PFMETFilter: variable unknown: " << variables_[varc] << std::endl;
+        return true;
       }
-      //std::cout << "FL: coll_var1[" << variables_[varc] << "] = " << coll_var1 << std::endl;
+      // std::cout << "FL: coll_var1[" << variables_[varc] << "] = " <<
+      // coll_var1 << std::endl;
 
       const edm::View<reco::Candidate> *var2;
-      edm::Handle< edm::View<reco::Candidate> > var2_hnd;
+      edm::Handle<edm::View<reco::Candidate>> var2_hnd;
       bool isVar2 = iEvent.getByLabel(collection2, var2_hnd);
-      if ( !isVar2 ) { 
-	std::cout << "Warning : no " << collection2 << " in input !" << std::endl;
-	return false;
+      if (!isVar2) {
+        std::cout << "Warning : no " << collection2 << " in input !" << std::endl;
+        return false;
       }
       var2 = var2_hnd.product();
       const reco::Candidate *var20 = &(*var2)[0];
-      //std::cout << "FL: var20.pt = " << var20->et() << std::endl;
+      // std::cout << "FL: var20.pt = " << var20->et() << std::endl;
       double coll_var2;
-      if (variables_[varc]=="et") coll_var2=var20->et();
-      else if (variables_[varc]=="phi") coll_var2=var20->phi();
-      else if (variables_[varc]=="eta") coll_var2=var20->eta();
-      else
-      {
-	std::cout << "Error: PFMETFilter: variable unknown: " << variables_[varc] << std::endl;
-	return true;
+      if (variables_[varc] == "et")
+        coll_var2 = var20->et();
+      else if (variables_[varc] == "phi")
+        coll_var2 = var20->phi();
+      else if (variables_[varc] == "eta")
+        coll_var2 = var20->eta();
+      else {
+        std::cout << "Error: PFMETFilter: variable unknown: " << variables_[varc] << std::endl;
+        return true;
       }
-      //std::cout << "FL: coll_var2[" << variables_[varc] << "] = " << coll_var2 << std::endl;
-      //std::cout << "FL: max_[varc] = " << max_[varc] << std::endl;
-      //std::cout << "FL: min_[varc] = " << min_[varc] << std::endl;
+      // std::cout << "FL: coll_var2[" << variables_[varc] << "] = " <<
+      // coll_var2 << std::endl; std::cout << "FL: max_[varc] = " << max_[varc]
+      // << std::endl; std::cout << "FL: min_[varc] = " << min_[varc] <<
+      // std::endl;
 
       // Delta computation
-      double delta=coll_var1-coll_var2;
-      if (variables_[varc]=="phi")
-      {
-	if (coll_var1 > M_PI) coll_var1 -= ceil((coll_var1 - M_PI) / (2 * M_PI)) * 2 * M_PI;
-	if (coll_var1 <= - M_PI) coll_var1 += ceil((coll_var1 + M_PI) / (-2. * M_PI)) * 2. * M_PI;
-	if (coll_var2 > M_PI) coll_var2 -= ceil((coll_var2 - M_PI) / (2 * M_PI)) * 2 * M_PI;
-	if (coll_var2 <= - M_PI) coll_var2 += ceil((coll_var2 + M_PI) / (-2. * M_PI)) * 2 * M_PI;
+      double delta = coll_var1 - coll_var2;
+      if (variables_[varc] == "phi") {
+        if (coll_var1 > M_PI)
+          coll_var1 -= ceil((coll_var1 - M_PI) / (2 * M_PI)) * 2 * M_PI;
+        if (coll_var1 <= -M_PI)
+          coll_var1 += ceil((coll_var1 + M_PI) / (-2. * M_PI)) * 2. * M_PI;
+        if (coll_var2 > M_PI)
+          coll_var2 -= ceil((coll_var2 - M_PI) / (2 * M_PI)) * 2 * M_PI;
+        if (coll_var2 <= -M_PI)
+          coll_var2 += ceil((coll_var2 + M_PI) / (-2. * M_PI)) * 2 * M_PI;
 
-	double deltaphi=-999.0;
-	if (fabs(coll_var1 - coll_var2)<M_PI)
-	{
-	  deltaphi=(coll_var1-coll_var2);
-	}
-	else
-	{
-	  if ((coll_var1-coll_var2)>0.0)
-	  {
-	    deltaphi=(2*M_PI - fabs(coll_var1 - coll_var2));
-	  }
-	  else
-	  {
-	    deltaphi=-(2*M_PI - fabs(coll_var1 - coll_var2));
-	  }
-	}
-	delta=deltaphi;
+        double deltaphi = -999.0;
+        if (fabs(coll_var1 - coll_var2) < M_PI) {
+          deltaphi = (coll_var1 - coll_var2);
+        } else {
+          if ((coll_var1 - coll_var2) > 0.0) {
+            deltaphi = (2 * M_PI - fabs(coll_var1 - coll_var2));
+          } else {
+            deltaphi = -(2 * M_PI - fabs(coll_var1 - coll_var2));
+          }
+        }
+        delta = deltaphi;
       }
 
       // cuts
-      if (doMin_[varc] && doMax_[varc] && max_[varc]<min_[varc])
-      {
-	if (delta>max_[varc] && delta<min_[varc]) skip=true;
+      if (doMin_[varc] && doMax_[varc] && max_[varc] < min_[varc]) {
+        if (delta > max_[varc] && delta < min_[varc])
+          skip = true;
+      } else {
+        if (doMin_[varc] && delta < min_[varc])
+          skip = true;
+        if (doMax_[varc] && delta > max_[varc])
+          skip = true;
       }
-      else
-      {
-	if (doMin_[varc] && delta<min_[varc]) skip=true;
-	if (doMax_[varc] && delta>max_[varc]) skip=true;
-      }
-      //std::cout << "skip = " << skip << std::endl;
-    }
-    else
-    {
+      // std::cout << "skip = " << skip << std::endl;
+    } else {
       // get the variable:
       const edm::View<reco::Candidate> *var0;
-      edm::Handle< edm::View<reco::Candidate> > var0_hnd;
+      edm::Handle<edm::View<reco::Candidate>> var0_hnd;
       bool isVar0 = iEvent.getByLabel(collections_[varc], var0_hnd);
-      if ( !isVar0 ) { 
-	std::cout << "Warning : no " << collections_[varc] << " in input !" << std::endl;
-	return false;
+      if (!isVar0) {
+        std::cout << "Warning : no " << collections_[varc] << " in input !" << std::endl;
+        return false;
       }
       var0 = var0_hnd.product();
       const reco::Candidate *var00 = &(*var0)[0];
-      //std::cout << "FL: var00.pt = " << var00->et() << std::endl;
+      // std::cout << "FL: var00.pt = " << var00->et() << std::endl;
       double coll_var;
-      if (variables_[varc]=="et") coll_var=var00->et();
-      else if (variables_[varc]=="phi") coll_var=var00->phi();
-      else if (variables_[varc]=="eta") coll_var=var00->eta();
-      else if (variables_[varc]=="DeltaMEXcut")
-      {
+      if (variables_[varc] == "et")
+        coll_var = var00->et();
+      else if (variables_[varc] == "phi")
+        coll_var = var00->phi();
+      else if (variables_[varc] == "eta")
+        coll_var = var00->eta();
+      else if (variables_[varc] == "DeltaMEXcut") {
+        const edm::View<reco::Candidate> *truevar0;
+        edm::Handle<edm::View<reco::Candidate>> truevar0_hnd;
+        bool istrueVar0 = iEvent.getByLabel(TrueMET_, truevar0_hnd);
+        if (!istrueVar0) {
+          std::cout << "Warning : no " << TrueMET_ << " in input !" << std::endl;
+          return false;
+        }
+        truevar0 = truevar0_hnd.product();
+        const reco::Candidate *truevar00 = &(*truevar0)[0];
 
-	const edm::View<reco::Candidate> *truevar0;
-	edm::Handle< edm::View<reco::Candidate> > truevar0_hnd;
-	bool istrueVar0 = iEvent.getByLabel(TrueMET_, truevar0_hnd);
-	if ( !istrueVar0 ) { 
-	  std::cout << "Warning : no " << TrueMET_ << " in input !" << std::endl;
-	  return false;
-	}
-	truevar0 = truevar0_hnd.product();
-	const reco::Candidate *truevar00 = &(*truevar0)[0];
-
-	const double DeltaMEX=var00->px()-truevar00->px();
-	const double DeltaMEY=var00->py()-truevar00->py();
-	const double cutvalc=sqrt(DeltaMEX*DeltaMEX+DeltaMEY*DeltaMEY);
-	const reco::MET* met=static_cast<const reco::MET*>(truevar00);
-	const double SETc=met->sumEt();
-	//std::cout << "FL: SETc = " << SETc << std::endl;
-	const double sigmac=sigma_a_+sigma_b_*sqrt(SETc)+sigma_c_*SETc;
-	if (cutvalc>DeltaMEXsigma_*sigmac)
-	{
-	  if (verbose_)
-	  {
-	    std::cout << "DeltaMET = " << var00->et()-truevar00->et() << std::endl;
-	    std::cout << "trueSET = " << SETc << std::endl;
-	    std::cout << "pfMET = " << var00->et() << std::endl;
-	    std::cout << "trueMET = " << truevar00->et() << std::endl;
-	    std::cout << "DeltaMEX = " << DeltaMEX << std::endl;
-	    std::cout << "DeltaMEY = " << DeltaMEY << std::endl;
-	    std::cout << "cutvalc = " << cutvalc << std::endl;
-	    std::cout << "sigmac = " << sigmac << std::endl;
-	    std::cout << "cutvalc/sigmac = " << cutvalc/sigmac << std::endl;
-	  }
-	  return true;
-	}
-	else
-	{
-	  if (verbose_ && (var00->et()-truevar00->et())>300.0)
-	  {
-	    std::cout << "EVENT NOT KEPT:" << std::endl;
-	    std::cout << "DeltaMET = " << var00->et()-truevar00->et() << std::endl;
-	    std::cout << "SETc = " << SETc << std::endl;
-	    std::cout << "pfMET = " << var00->et() << std::endl;
-	    std::cout << "trueMET = " << truevar00->et() << std::endl;
-	    std::cout << "DeltaMEX = " << DeltaMEX << std::endl;
-	    std::cout << "DeltaMEY = " << DeltaMEY << std::endl;
-	    std::cout << "cutvalc = " << cutvalc << std::endl;
-	    std::cout << "sigmac = " << sigmac << std::endl;
-	    std::cout << "cutvalc/sigmac = " << cutvalc/sigmac << std::endl;
-	  }
-	  return false;
-	}
-      }
-      else
-      {
-	std::cout << "Error: PFMETFilter: variable unknown: " << variables_[varc] << std::endl;
-	return true;
+        const double DeltaMEX = var00->px() - truevar00->px();
+        const double DeltaMEY = var00->py() - truevar00->py();
+        const double cutvalc = sqrt(DeltaMEX * DeltaMEX + DeltaMEY * DeltaMEY);
+        const reco::MET *met = static_cast<const reco::MET *>(truevar00);
+        const double SETc = met->sumEt();
+        // std::cout << "FL: SETc = " << SETc << std::endl;
+        const double sigmac = sigma_a_ + sigma_b_ * sqrt(SETc) + sigma_c_ * SETc;
+        if (cutvalc > DeltaMEXsigma_ * sigmac) {
+          if (verbose_) {
+            std::cout << "DeltaMET = " << var00->et() - truevar00->et() << std::endl;
+            std::cout << "trueSET = " << SETc << std::endl;
+            std::cout << "pfMET = " << var00->et() << std::endl;
+            std::cout << "trueMET = " << truevar00->et() << std::endl;
+            std::cout << "DeltaMEX = " << DeltaMEX << std::endl;
+            std::cout << "DeltaMEY = " << DeltaMEY << std::endl;
+            std::cout << "cutvalc = " << cutvalc << std::endl;
+            std::cout << "sigmac = " << sigmac << std::endl;
+            std::cout << "cutvalc/sigmac = " << cutvalc / sigmac << std::endl;
+          }
+          return true;
+        } else {
+          if (verbose_ && (var00->et() - truevar00->et()) > 300.0) {
+            std::cout << "EVENT NOT KEPT:" << std::endl;
+            std::cout << "DeltaMET = " << var00->et() - truevar00->et() << std::endl;
+            std::cout << "SETc = " << SETc << std::endl;
+            std::cout << "pfMET = " << var00->et() << std::endl;
+            std::cout << "trueMET = " << truevar00->et() << std::endl;
+            std::cout << "DeltaMEX = " << DeltaMEX << std::endl;
+            std::cout << "DeltaMEY = " << DeltaMEY << std::endl;
+            std::cout << "cutvalc = " << cutvalc << std::endl;
+            std::cout << "sigmac = " << sigmac << std::endl;
+            std::cout << "cutvalc/sigmac = " << cutvalc / sigmac << std::endl;
+          }
+          return false;
+        }
+      } else {
+        std::cout << "Error: PFMETFilter: variable unknown: " << variables_[varc] << std::endl;
+        return true;
       }
-      //std::cout << "FL: coll_var[" << variables_[varc] << "] = " << coll_var << std::endl;
-      //std::cout << "FL: max_[varc] = " << max_[varc] << std::endl;
-      //std::cout << "FL: min_[varc] = " << min_[varc] << std::endl;
+      // std::cout << "FL: coll_var[" << variables_[varc] << "] = " << coll_var
+      // << std::endl; std::cout << "FL: max_[varc] = " << max_[varc] <<
+      // std::endl; std::cout << "FL: min_[varc] = " << min_[varc] << std::endl;
 
       // cuts
-      if (doMin_[varc] && doMax_[varc] && max_[varc]<min_[varc])
-      {
-	if (coll_var>max_[varc] && coll_var<min_[varc]) skip=true;
-      }
-      else
-      {
-	if (doMin_[varc] && coll_var<min_[varc]) skip=true;
-	if (doMax_[varc] && coll_var>max_[varc]) skip=true;
+      if (doMin_[varc] && doMax_[varc] && max_[varc] < min_[varc]) {
+        if (coll_var > max_[varc] && coll_var < min_[varc])
+          skip = true;
+      } else {
+        if (doMin_[varc] && coll_var < min_[varc])
+          skip = true;
+        if (doMax_[varc] && coll_var > max_[varc])
+          skip = true;
       }
-      //std::cout << "skip = " << skip << std::endl;
+      // std::cout << "skip = " << skip << std::endl;
     }
   }
-  //std::cout << "final skip = " << skip << std::endl;
+  // std::cout << "final skip = " << skip << std::endl;
   return !skip;
 }
 
-void PFMETFilter::endJob()
-{
-  //std::cout << "FL: endJob" << std::endl;
+void PFMETFilter::endJob() {
+  // std::cout << "FL: endJob" << std::endl;
 }
diff --git a/Validation/RecoParticleFlow/plugins/PFMETFilter.h b/Validation/RecoParticleFlow/plugins/PFMETFilter.h
index a9264995718a5..cd33035cd6d05 100644
--- a/Validation/RecoParticleFlow/plugins/PFMETFilter.h
+++ b/Validation/RecoParticleFlow/plugins/PFMETFilter.h
@@ -4,22 +4,21 @@
 // author: Florent Lacroix (UIC)
 // date: 07/14/2009
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDFilter.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-class PFMETFilter: public edm::EDFilter{
- public:
-
-  explicit PFMETFilter(const edm::ParameterSet&);
+class PFMETFilter : public edm::EDFilter {
+public:
+  explicit PFMETFilter(const edm::ParameterSet &);
   ~PFMETFilter() override;
 
-  bool filter(edm::Event&, const edm::EventSetup&) override;
+  bool filter(edm::Event &, const edm::EventSetup &) override;
   void beginJob() override;
   void endJob() override;
   bool checkInput();
 
- private:
+private:
   std::vector<std::string> collections_;
   std::vector<std::string> variables_;
   std::vector<double> min_;
@@ -37,4 +36,4 @@ class PFMETFilter: public edm::EDFilter{
   bool verbose_;
 };
 
-#endif // PFMETFILTER_H
+#endif  // PFMETFILTER_H
diff --git a/Validation/RecoParticleFlow/plugins/PFTauElecRejectionBenchMarkAnalyzer.cc b/Validation/RecoParticleFlow/plugins/PFTauElecRejectionBenchMarkAnalyzer.cc
index c00a746395770..72080ffe8c04b 100644
--- a/Validation/RecoParticleFlow/plugins/PFTauElecRejectionBenchMarkAnalyzer.cc
+++ b/Validation/RecoParticleFlow/plugins/PFTauElecRejectionBenchMarkAnalyzer.cc
@@ -2,19 +2,18 @@
 #include <memory>
 
 // user include files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/ServiceRegistry/interface/Service.h" 
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
 #include "RecoParticleFlow/Benchmark/interface/PFTauElecRejectionBenchmark.h"
 
-
 using namespace edm;
 using namespace reco;
 using namespace std;
@@ -22,21 +21,19 @@ using namespace std;
 //
 // class declaration
 
- 
 class PFTauElecRejectionBenchmarkAnalyzer : public edm::EDAnalyzer {
 public:
-  explicit PFTauElecRejectionBenchmarkAnalyzer(const edm::ParameterSet&);
+  explicit PFTauElecRejectionBenchmarkAnalyzer(const edm::ParameterSet &);
   ~PFTauElecRejectionBenchmarkAnalyzer() override;
 
-
 private:
-  void beginJob() override ;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void endJob() override ;  
+  void beginJob() override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void endJob() override;
   // ----------member data ---------------------------
 
   string outputfile;
-  DQMStore * db;
+  DQMStore *db;
   string benchmarkLabel;
   double maxDeltaR;
   double minMCPt;
@@ -44,12 +41,12 @@ class PFTauElecRejectionBenchmarkAnalyzer : public edm::EDAnalyzer {
   double minRecoPt;
   double maxRecoAbsEta;
   bool applyEcalCrackCut;
-  string  sGenMatchObjectLabel;
+  string sGenMatchObjectLabel;
 
-  edm::EDGetTokenT<edm::HepMCProduct> sGenParticleSource_tok_; 
-  edm::EDGetTokenT<reco::PFTauCollection> pfTauProducer_tok_; 
-  edm::EDGetTokenT<reco::PFTauDiscriminator> pfTauDiscriminatorByIsolationProducer_tok_; 
-  edm::EDGetTokenT<reco::PFTauDiscriminator> pfTauDiscriminatorAgainstElectronProducer_tok_; 
+  edm::EDGetTokenT<edm::HepMCProduct> sGenParticleSource_tok_;
+  edm::EDGetTokenT<reco::PFTauCollection> pfTauProducer_tok_;
+  edm::EDGetTokenT<reco::PFTauDiscriminator> pfTauDiscriminatorByIsolationProducer_tok_;
+  edm::EDGetTokenT<reco::PFTauDiscriminator> pfTauDiscriminatorAgainstElectronProducer_tok_;
 
   PFTauElecRejectionBenchmark PFTauElecRejectionBenchmark_;
 };
@@ -66,93 +63,78 @@ class PFTauElecRejectionBenchmarkAnalyzer : public edm::EDAnalyzer {
 //
 // constructors and destructor
 //
-PFTauElecRejectionBenchmarkAnalyzer::PFTauElecRejectionBenchmarkAnalyzer(const edm::ParameterSet& iConfig)
+PFTauElecRejectionBenchmarkAnalyzer::PFTauElecRejectionBenchmarkAnalyzer(const edm::ParameterSet &iConfig)
 
 {
-  //now do what ever initialization is needed
+  // now do what ever initialization is needed
   outputfile = iConfig.getUntrackedParameter<string>("OutputFile");
   benchmarkLabel = iConfig.getParameter<string>("BenchmarkLabel");
   sGenParticleSource_tok_ = consumes<edm::HepMCProduct>(iConfig.getParameter<InputTag>("InputTruthLabel"));
-  maxDeltaR = iConfig.getParameter<double>("maxDeltaR");	  
-  minMCPt  = iConfig.getParameter<double>("minMCPt"); 
-  maxMCAbsEta = iConfig.getParameter<double>("maxMCAbsEta"); 
-  minRecoPt  = iConfig.getParameter<double>("minRecoPt"); 
-  maxRecoAbsEta = iConfig.getParameter<double>("maxRecoAbsEta"); 
+  maxDeltaR = iConfig.getParameter<double>("maxDeltaR");
+  minMCPt = iConfig.getParameter<double>("minMCPt");
+  maxMCAbsEta = iConfig.getParameter<double>("maxMCAbsEta");
+  minRecoPt = iConfig.getParameter<double>("minRecoPt");
+  maxRecoAbsEta = iConfig.getParameter<double>("maxRecoAbsEta");
   pfTauProducer_tok_ = consumes<reco::PFTauCollection>(iConfig.getParameter<InputTag>("PFTauProducer"));
-  pfTauDiscriminatorByIsolationProducer_tok_ = consumes<reco::PFTauDiscriminator>
-    (iConfig.getParameter<InputTag>("PFTauDiscriminatorByIsolationProducer"));
-  pfTauDiscriminatorAgainstElectronProducer_tok_ = consumes<reco::PFTauDiscriminator>
-    (iConfig.getParameter<InputTag>("PFTauDiscriminatorAgainstElectronProducer") );
+  pfTauDiscriminatorByIsolationProducer_tok_ =
+      consumes<reco::PFTauDiscriminator>(iConfig.getParameter<InputTag>("PFTauDiscriminatorByIsolationProducer"));
+  pfTauDiscriminatorAgainstElectronProducer_tok_ =
+      consumes<reco::PFTauDiscriminator>(iConfig.getParameter<InputTag>("PFTauDiscriminatorAgainstElectronProducer"));
   sGenMatchObjectLabel = iConfig.getParameter<string>("GenMatchObjectLabel");
   applyEcalCrackCut = iConfig.getParameter<bool>("ApplyEcalCrackCut");
 
-
   db = edm::Service<DQMStore>().operator->();
-  
-
-  PFTauElecRejectionBenchmark_.setup(
-			outputfile,
-			benchmarkLabel,
-			maxDeltaR,
-			minRecoPt, 
-			maxRecoAbsEta,
-			minMCPt, 
-			maxMCAbsEta,
-			sGenMatchObjectLabel,
-			applyEcalCrackCut,
-			db);
-}
 
+  PFTauElecRejectionBenchmark_.setup(outputfile,
+                                     benchmarkLabel,
+                                     maxDeltaR,
+                                     minRecoPt,
+                                     maxRecoAbsEta,
+                                     minMCPt,
+                                     maxMCAbsEta,
+                                     sGenMatchObjectLabel,
+                                     applyEcalCrackCut,
+                                     db);
+}
 
-PFTauElecRejectionBenchmarkAnalyzer::~PFTauElecRejectionBenchmarkAnalyzer()
-{
+PFTauElecRejectionBenchmarkAnalyzer::~PFTauElecRejectionBenchmarkAnalyzer() {
   // do anything here that needs to be done at desctruction time
   // (e.g. close files, deallocate resources etc.)
 }
 
-
 //
 // member functions
 //
 
 // ------------ method called to for each event  ------------
-void
-PFTauElecRejectionBenchmarkAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-
+void PFTauElecRejectionBenchmarkAnalyzer::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   // get gen products
   Handle<HepMCProduct> mcevt;
   iEvent.getByToken(sGenParticleSource_tok_, mcevt);
 
   // get pftau collection
   Handle<PFTauCollection> thePFTau;
-  iEvent.getByToken(pfTauProducer_tok_,thePFTau);
-  
+  iEvent.getByToken(pfTauProducer_tok_, thePFTau);
+
   // get iso discriminator association vector
   Handle<PFTauDiscriminator> thePFTauDiscriminatorByIsolation;
-  iEvent.getByToken(pfTauDiscriminatorByIsolationProducer_tok_,thePFTauDiscriminatorByIsolation);
+  iEvent.getByToken(pfTauDiscriminatorByIsolationProducer_tok_, thePFTauDiscriminatorByIsolation);
 
   // get anti-elec discriminator association vector
   Handle<PFTauDiscriminator> thePFTauDiscriminatorAgainstElectron;
-  iEvent.getByToken(pfTauDiscriminatorAgainstElectronProducer_tok_,thePFTauDiscriminatorAgainstElectron);
+  iEvent.getByToken(pfTauDiscriminatorAgainstElectronProducer_tok_, thePFTauDiscriminatorAgainstElectron);
 
-  PFTauElecRejectionBenchmark_.process(mcevt, thePFTau, thePFTauDiscriminatorByIsolation, 
-				       thePFTauDiscriminatorAgainstElectron);
+  PFTauElecRejectionBenchmark_.process(
+      mcevt, thePFTau, thePFTauDiscriminatorByIsolation, thePFTauDiscriminatorAgainstElectron);
 }
 
+// ------------ method called once each job just before starting event loop
+// ------------
+void PFTauElecRejectionBenchmarkAnalyzer::beginJob() {}
 
-// ------------ method called once each job just before starting event loop  ------------
-void 
-PFTauElecRejectionBenchmarkAnalyzer::beginJob()
-{
-}
-
-// ------------ method called once each job just after ending the event loop  ------------
-void 
-PFTauElecRejectionBenchmarkAnalyzer::endJob() {
-  PFTauElecRejectionBenchmark_.write();
-}
+// ------------ method called once each job just after ending the event loop
+// ------------
+void PFTauElecRejectionBenchmarkAnalyzer::endJob() { PFTauElecRejectionBenchmark_.write(); }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(PFTauElecRejectionBenchmarkAnalyzer);
-
diff --git a/Validation/RecoParticleFlow/plugins/PFTester.cc b/Validation/RecoParticleFlow/plugins/PFTester.cc
index cf1dc08f36d91..009f7dc15e4a9 100644
--- a/Validation/RecoParticleFlow/plugins/PFTester.cc
+++ b/Validation/RecoParticleFlow/plugins/PFTester.cc
@@ -6,96 +6,83 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
 
 //#include "DataFormats/HepMCCandidate/interface/GenParticleCollection.h"
 #include "DataFormats/HepMCCandidate/interface/GenParticle.h"
-#include "DataFormats/METReco/interface/GenMET.h"
-#include "DataFormats/METReco/interface/GenMETCollection.h"
 #include "DataFormats/METReco/interface/CaloMET.h"
 #include "DataFormats/METReco/interface/CaloMETCollection.h"
+#include "DataFormats/METReco/interface/GenMET.h"
+#include "DataFormats/METReco/interface/GenMETCollection.h"
 //#include "DataFormats/TrackReco/interface/Track.h"
+#include "DataFormats/Common/interface/RefToBase.h"
+#include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
+#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
 #include "DataFormats/ParticleFlowReco/interface/PFBlock.h"
 #include "DataFormats/ParticleFlowReco/interface/PFBlockElement.h"
 #include "DataFormats/ParticleFlowReco/interface/PFRecTrack.h"
-#include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
-#include "DataFormats/ParticleFlowCandidate/interface/PFCandidateFwd.h"
-#include "DataFormats/Common/interface/RefToBase.h"
 
-#include <vector>
-#include <ostream>
-#include <fstream>
-#include <iostream>
 #include <algorithm>
 #include <cmath>
+#include <fstream>
+#include <iostream>
 #include <memory>
+#include <ostream>
+#include <vector>
 
 using namespace edm;
 using namespace std;
 using namespace reco;
 
-
-PFTester::PFTester(const edm::ParameterSet& iConfig)
-{
-
-  inputPFlowLabel_tok_         = consumes<reco::PFCandidateCollection> (iConfig.getParameter<std::string>("InputPFlowLabel") );
-  outputFile_                  = iConfig.getUntrackedParameter<std::string>("OutputFile");
+PFTester::PFTester(const edm::ParameterSet &iConfig) {
+  inputPFlowLabel_tok_ = consumes<reco::PFCandidateCollection>(iConfig.getParameter<std::string>("InputPFlowLabel"));
+  outputFile_ = iConfig.getUntrackedParameter<std::string>("OutputFile");
 
   if (!outputFile_.empty())
     edm::LogInfo("OutputInfo") << " ParticleFLow Task histograms will be saved to '" << outputFile_.c_str() << "'";
-  else edm::LogInfo("OutputInfo") << " ParticleFlow Task histograms will NOT be saved";
-
+  else
+    edm::LogInfo("OutputInfo") << " ParticleFlow Task histograms will NOT be saved";
 }
 
-PFTester::~PFTester() { }
-
-void 
-PFTester::beginJob()
-{
+PFTester::~PFTester() {}
 
+void PFTester::beginJob() {
   // get ahold of back-end interface
   dbe_ = edm::Service<DQMStore>().operator->();
-  
-  if (dbe_) {
 
+  if (dbe_) {
     dbe_->setCurrentFolder("PFTask/PFCandidates");
 
-    me["CandidateEt"] = dbe_->book1D("CandidateEt","CandidateEt",1000,0,1000);
-    me["CandidateEta"] = dbe_->book1D("CandidateEta","CandidateEta",200,-5,5);
-    me["CandidatePhi"] = dbe_->book1D("CandidatePhi","CandidatePhi",200,-M_PI,M_PI);
-    me["CandidateCharge"] = dbe_->book1D("CandidateCharge","CandidateCharge",5,-2,2);
-    me["PFCandidateType"] = dbe_->book1D("PFCandidateType","PFCandidateType",10,0,10);
+    me["CandidateEt"] = dbe_->book1D("CandidateEt", "CandidateEt", 1000, 0, 1000);
+    me["CandidateEta"] = dbe_->book1D("CandidateEta", "CandidateEta", 200, -5, 5);
+    me["CandidatePhi"] = dbe_->book1D("CandidatePhi", "CandidatePhi", 200, -M_PI, M_PI);
+    me["CandidateCharge"] = dbe_->book1D("CandidateCharge", "CandidateCharge", 5, -2, 2);
+    me["PFCandidateType"] = dbe_->book1D("PFCandidateType", "PFCandidateType", 10, 0, 10);
 
     dbe_->setCurrentFolder("PFTask/PFBlocks");
 
-    me["NumElements"] = dbe_->book1D("NumElements","NumElements",25,0,25);
-    me["NumTrackElements"] = dbe_->book1D("NumTrackElements","NumTrackElements",5,0,5);
-    me["NumPS1Elements"] = dbe_->book1D("NumPS1Elements","NumPS1Elements",5,0,5);
-    me["NumPS2Elements"] = dbe_->book1D("NumPS2Elements","NumPS2Elements",5,0,5);
-    me["NumECALElements"] = dbe_->book1D("NumECALElements","NumECALElements",5,0,5);
-    me["NumHCALElements"] = dbe_->book1D("NumHCALElements","NumHCALElements",5,0,5);
-    me["NumMuonElements"] = dbe_->book1D("NumMuonElements","NumMuonElements",5,0,5);
+    me["NumElements"] = dbe_->book1D("NumElements", "NumElements", 25, 0, 25);
+    me["NumTrackElements"] = dbe_->book1D("NumTrackElements", "NumTrackElements", 5, 0, 5);
+    me["NumPS1Elements"] = dbe_->book1D("NumPS1Elements", "NumPS1Elements", 5, 0, 5);
+    me["NumPS2Elements"] = dbe_->book1D("NumPS2Elements", "NumPS2Elements", 5, 0, 5);
+    me["NumECALElements"] = dbe_->book1D("NumECALElements", "NumECALElements", 5, 0, 5);
+    me["NumHCALElements"] = dbe_->book1D("NumHCALElements", "NumHCALElements", 5, 0, 5);
+    me["NumMuonElements"] = dbe_->book1D("NumMuonElements", "NumMuonElements", 5, 0, 5);
 
     dbe_->setCurrentFolder("PFTask/PFTracks");
 
-    me["TrackCharge"] = dbe_->book1D("TrackCharge","TrackCharge",5,-2,2);
-    me["TrackNumPoints"] = dbe_->book1D("TrackNumPoints","TrackNumPoints",100,0,100);
-    me["TrackNumMeasurements"] = dbe_->book1D("TrackNumMeasurements","TrackNumMeasurements",100,0,100);
-    me["TrackImpactParameter"] = dbe_->book1D("TrackImpactParameter","TrackImpactParameter",1000,0,1);
+    me["TrackCharge"] = dbe_->book1D("TrackCharge", "TrackCharge", 5, -2, 2);
+    me["TrackNumPoints"] = dbe_->book1D("TrackNumPoints", "TrackNumPoints", 100, 0, 100);
+    me["TrackNumMeasurements"] = dbe_->book1D("TrackNumMeasurements", "TrackNumMeasurements", 100, 0, 100);
+    me["TrackImpactParameter"] = dbe_->book1D("TrackImpactParameter", "TrackImpactParameter", 1000, 0, 1);
 
     dbe_->setCurrentFolder("PFTask/PFClusters");
-
   }
-
 }
 
-void 
-PFTester::analyze(const edm::Event& iEvent, 
-		  const edm::EventSetup& iSetup)
-{
-  
+void PFTester::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   // Data to Retrieve from the Event
   const PFCandidateCollection *pflow_candidates;
 
@@ -103,21 +90,17 @@ PFTester::analyze(const edm::Event& iEvent,
   // Retrieve!
   // ==========================================================
 
-  { 
-
+  {
     // Get Particle Flow Candidates
     Handle<PFCandidateCollection> pflow_hnd;
     iEvent.getByToken(inputPFlowLabel_tok_, pflow_hnd);
     pflow_candidates = pflow_hnd.product();
-
   }
 
   if (!pflow_candidates) {
-
     edm::LogInfo("OutputInfo") << " failed to retrieve data required by ParticleFlow Task";
     edm::LogInfo("OutputInfo") << " ParticleFlow Task cannot continue...!";
     return;
-
   }
 
   // ==========================================================
@@ -127,7 +110,6 @@ PFTester::analyze(const edm::Event& iEvent,
   // Loop Over Particle Flow Candidates
   PFCandidateCollection::const_iterator pf;
   for (pf = pflow_candidates->begin(); pf != pflow_candidates->end(); pf++) {
-
     const PFCandidate *particle = &(*pf);
 
     // Fill Histograms for Candidate Methods
@@ -139,10 +121,10 @@ PFTester::analyze(const edm::Event& iEvent,
 
     // Fill Histograms for PFCandidate Specific Methods
     me["PFCandidateType"]->Fill(particle->particleId());
-    // particle->elementsInBlocks(); 
-    
-   // Get the PFBlock and Elements
-   // JW: Returns vector of blocks now ,TO BE FIXED ----
+    // particle->elementsInBlocks();
+
+    // Get the PFBlock and Elements
+    // JW: Returns vector of blocks now ,TO BE FIXED ----
     /*PFBlock block = *(particle->block());
     OwnVector<PFBlockElement> elements = block.elements();
     int numElements = elements.size();
@@ -196,7 +178,7 @@ PFTester::analyze(const edm::Event& iEvent,
       // Element is a Muon Track
       else if (element_type == PFBlockElement::MUON) {
         numMuonElements++;
-      } 
+      }
       // Fill the Respective Elements Sizes
       me["NumElements"]->Fill(numElements);
       me["NumTrackElements"]->Fill(numTrackElements);
@@ -206,16 +188,11 @@ PFTester::analyze(const edm::Event& iEvent,
       me["NumHCALElements"]->Fill(numHCALElements);
       me["NumMuonElements"]->Fill(numMuonElements);
     } ----------------------------------------------  */
-
   }
-
 }
 
-void PFTester::endJob() 
-{
-
+void PFTester::endJob() {
   // Store the DAQ Histograms
   if (!outputFile_.empty() && dbe_)
     dbe_->save(outputFile_);
-
 }
diff --git a/Validation/RecoParticleFlow/plugins/PFTester.h b/Validation/RecoParticleFlow/plugins/PFTester.h
index f69a254a44c06..0daa66340c968 100644
--- a/Validation/RecoParticleFlow/plugins/PFTester.h
+++ b/Validation/RecoParticleFlow/plugins/PFTester.h
@@ -9,33 +9,30 @@
 #include "DQMServices/Core/interface/DQMStore.h"
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "DataFormats/ParticleFlowCandidate/interface/PFCandidate.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 
-#include <string>
 #include <map>
+#include <string>
 
-class PFTester: public edm::EDAnalyzer {
+class PFTester : public edm::EDAnalyzer {
 public:
-
-  explicit PFTester(const edm::ParameterSet&);
+  explicit PFTester(const edm::ParameterSet &);
   ~PFTester() override;
 
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
-  void beginJob() override ;
-  void endJob() override ;
-
- private:
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
+  void beginJob() override;
+  void endJob() override;
 
+private:
   // DAQ Tools
-  DQMStore* dbe_;
-  std::map<std::string, MonitorElement*> me;
+  DQMStore *dbe_;
+  std::map<std::string, MonitorElement *> me;
 
   // Inputs from Configuration File
   std::string outputFile_;
-  edm::EDGetTokenT<reco::PFCandidateCollection> inputPFlowLabel_tok_ ;
-
+  edm::EDGetTokenT<reco::PFCandidateCollection> inputPFlowLabel_tok_;
 };
 
-#endif // PFTESTER_H
+#endif  // PFTESTER_H
diff --git a/Validation/RecoParticleFlow/plugins/SealModule.cc b/Validation/RecoParticleFlow/plugins/SealModule.cc
index 419c9a329563f..f8a8b4fa95344 100644
--- a/Validation/RecoParticleFlow/plugins/SealModule.cc
+++ b/Validation/RecoParticleFlow/plugins/SealModule.cc
@@ -1,13 +1,11 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "Validation/RecoParticleFlow/plugins/PFTester.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "Validation/RecoParticleFlow/plugins/GenericBenchmarkAnalyzer.h"
-#include "Validation/RecoParticleFlow/plugins/PFMETFilter.h"
 #include "Validation/RecoParticleFlow/plugins/PFJetFilter.h"
+#include "Validation/RecoParticleFlow/plugins/PFMETFilter.h"
+#include "Validation/RecoParticleFlow/plugins/PFTester.h"
 
-
-
-DEFINE_FWK_MODULE (PFTester) ;
-DEFINE_FWK_MODULE (GenericBenchmarkAnalyzer) ;
-DEFINE_FWK_MODULE (PFJetFilter) ;
-DEFINE_FWK_MODULE (PFMETFilter) ;
+DEFINE_FWK_MODULE(PFTester);
+DEFINE_FWK_MODULE(GenericBenchmarkAnalyzer);
+DEFINE_FWK_MODULE(PFJetFilter);
+DEFINE_FWK_MODULE(PFMETFilter);
diff --git a/Validation/RecoParticleFlow/src/Comparator.cc b/Validation/RecoParticleFlow/src/Comparator.cc
index 3ead1c8b5639b..6acfdbba1c279 100644
--- a/Validation/RecoParticleFlow/src/Comparator.cc
+++ b/Validation/RecoParticleFlow/src/Comparator.cc
@@ -1,399 +1,404 @@
 #include <TFile.h>
 #include <TH1.h>
 #include <TH2.h>
-#include <TStyle.h>
 #include <TPaveStats.h>
+#include <TStyle.h>
 
-
-#include <sstream>
-#include <cstdlib>
 #include <cassert>
+#include <cstdlib>
+#include <sstream>
 
 #include "Validation/RecoParticleFlow/interface/Comparator.h"
-#include "Validation/RecoParticleFlow/interface/TH2Analyzer.h"
 #include "Validation/RecoParticleFlow/interface/NicePlot.h"
+#include "Validation/RecoParticleFlow/interface/TH2Analyzer.h"
 
-using namespace std; 
-
-void Comparator::SetDirs( const char* file0,
-			  const char* dir0,
-			  const char* file1,
-			  const char* dir1  ) {
-  
-  file0_ = new TFile( file0 );
-  if( file0_->IsZombie() ) exit(1);
-  dir0_ = file0_->GetDirectory( dir0 );
-  if(! dir0_ ) exit(1);
-  
-  file1_ = new TFile( file1 );
-  if( file1_->IsZombie() ) exit(1);
-  dir1_ = file1_->GetDirectory( dir1 );
-  if(! dir1_ ) exit(1);
+using namespace std;
+
+void Comparator::SetDirs(const char *file0, const char *dir0, const char *file1, const char *dir1) {
+  file0_ = new TFile(file0);
+  if (file0_->IsZombie())
+    exit(1);
+  dir0_ = file0_->GetDirectory(dir0);
+  if (!dir0_)
+    exit(1);
+
+  file1_ = new TFile(file1);
+  if (file1_->IsZombie())
+    exit(1);
+  dir1_ = file1_->GetDirectory(dir1);
+  if (!dir1_)
+    exit(1);
 }
 
-
-void Comparator::SetStyles( Style* s0, 
-		  Style* s1,
-		  const char* leg0,
-		  const char* leg1) {
-  s0_ = s0; 
+void Comparator::SetStyles(Style *s0, Style *s1, const char *leg0, const char *leg1) {
+  s0_ = s0;
   s1_ = s1;
-  
+
   legend_.Clear();
-  legend_.AddEntry( s0_, leg0, "mlf");
-  legend_.AddEntry( s1_, leg1, "mlf");
+  legend_.AddEntry(s0_, leg0, "mlf");
+  legend_.AddEntry(s1_, leg1, "mlf");
 }
-  
-void Comparator::DrawSlice( const char* key, 
-			    int binxmin, int binxmax, 
-			    Mode mode ) {
-    
+
+void Comparator::DrawSlice(const char *key, int binxmin, int binxmax, Mode mode) {
   static int num = 0;
-    
+
   ostringstream out0;
-  out0<<"h0_2d_"<<num;
+  out0 << "h0_2d_" << num;
   ostringstream out1;
-  out1<<"h1_2d_"<<num;
+  out1 << "h1_2d_" << num;
   num++;
 
   string name0 = out0.str();
   string name1 = out1.str();
-      
 
-  TH1* h0 = Histo( key, 0);
-  TH1* h1 = Histo( key, 1);
+  TH1 *h0 = Histo(key, 0);
+  TH1 *h1 = Histo(key, 1);
 
-  TH2* h0_2d = dynamic_cast< TH2* >(h0);
-  TH2* h1_2d = dynamic_cast< TH2* >(h1);
-    
-  if(h0_2d->GetNbinsY() == 1 || 
-     h1_2d->GetNbinsY() == 1 ) {
-    cerr<<key<<" is not 2D"<<endl;
+  TH2 *h0_2d = dynamic_cast<TH2 *>(h0);
+  TH2 *h1_2d = dynamic_cast<TH2 *>(h1);
+
+  if (h0_2d->GetNbinsY() == 1 || h1_2d->GetNbinsY() == 1) {
+    cerr << key << " is not 2D" << endl;
     return;
   }
-    
-  TH1::AddDirectory( false );
-
-  TH1D* h0_slice = h0_2d->ProjectionY(name0.c_str(),
-				      binxmin, binxmax, "");
-  TH1D* h1_slice = h1_2d->ProjectionY(name1.c_str(),
-				      binxmin, binxmax, "");
-  TH1::AddDirectory( true );
-  Draw( h0_slice, h1_slice, mode);        
+
+  TH1::AddDirectory(false);
+
+  TH1D *h0_slice = h0_2d->ProjectionY(name0.c_str(), binxmin, binxmax, "");
+  TH1D *h1_slice = h1_2d->ProjectionY(name1.c_str(), binxmin, binxmax, "");
+  TH1::AddDirectory(true);
+  Draw(h0_slice, h1_slice, mode);
 }
 
-void Comparator::DrawMeanSlice(const char* key, const int rebinFactor, Mode mode)
-{
-  TDirectory* dir = dir1_;
+void Comparator::DrawMeanSlice(const char *key, const int rebinFactor, Mode mode) {
+  TDirectory *dir = dir1_;
   dir->cd();
-  TH2D *h2 = (TH2D*) dir->Get(key);
-  TH2Analyzer TH2Ana(h2,rebinFactor);
-  TH1D* ha=TH2Ana.Average();
+  TH2D *h2 = (TH2D *)dir->Get(key);
+  TH2Analyzer TH2Ana(h2, rebinFactor);
+  TH1D *ha = TH2Ana.Average();
 
   dir = dir0_;
   dir->cd();
-  TH2D *h2b = (TH2D*) dir->Get(key);
-  TH2Analyzer TH2Anab(h2b,rebinFactor);
-  TH1D* hb=TH2Anab.Average();
+  TH2D *h2b = (TH2D *)dir->Get(key);
+  TH2Analyzer TH2Anab(h2b, rebinFactor);
+  TH1D *hb = TH2Anab.Average();
 
-  Draw(hb,ha,mode);
+  Draw(hb, ha, mode);
 }
 
-void Comparator::DrawSigmaSlice(const char* key, const int rebinFactor, Mode mode)
-{
-  TDirectory* dir = dir1_;
+void Comparator::DrawSigmaSlice(const char *key, const int rebinFactor, Mode mode) {
+  TDirectory *dir = dir1_;
   dir->cd();
-  TH2D *h2 = (TH2D*) dir->Get(key);
-  TH2Analyzer TH2Ana(h2,rebinFactor);
-  TH1D* ha=TH2Ana.RMS();
+  TH2D *h2 = (TH2D *)dir->Get(key);
+  TH2Analyzer TH2Ana(h2, rebinFactor);
+  TH1D *ha = TH2Ana.RMS();
 
   dir = dir0_;
   dir->cd();
-  TH2D *h2b = (TH2D*) dir->Get(key);
-  TH2Analyzer TH2Anab(h2b,rebinFactor);
-  TH1D* hb=TH2Anab.RMS();
+  TH2D *h2b = (TH2D *)dir->Get(key);
+  TH2Analyzer TH2Anab(h2b, rebinFactor);
+  TH1D *hb = TH2Anab.RMS();
 
-  Draw(hb,ha,mode);
+  Draw(hb, ha, mode);
 }
 
-void Comparator::DrawGaussSigmaSlice(const char* key, const int rebinFactor, Mode mode)
-{
-  TDirectory* dir = dir1_;
+void Comparator::DrawGaussSigmaSlice(const char *key, const int rebinFactor, Mode mode) {
+  TDirectory *dir = dir1_;
   dir->cd();
-  TH2D *h2 = (TH2D*) dir->Get(key);
-  TH2Analyzer TH2Ana(h2,rebinFactor);
-  TH1D* ha=TH2Ana.SigmaGauss();
+  TH2D *h2 = (TH2D *)dir->Get(key);
+  TH2Analyzer TH2Ana(h2, rebinFactor);
+  TH1D *ha = TH2Ana.SigmaGauss();
 
   dir = dir0_;
   dir->cd();
-  TH2D *h2b = (TH2D*) dir->Get(key);
-  TH2Analyzer TH2Anab(h2b,rebinFactor);
-  TH1D* hb=TH2Anab.SigmaGauss();
+  TH2D *h2b = (TH2D *)dir->Get(key);
+  TH2Analyzer TH2Anab(h2b, rebinFactor);
+  TH1D *hb = TH2Anab.SigmaGauss();
 
-  Draw(hb,ha,mode);
+  Draw(hb, ha, mode);
 }
 
-Double_t fitFunction_f(Double_t *x, Double_t *par)
-{
-  const Double_t value=sqrt(par[0]*par[0]+par[1]*par[1]*(x[0]-par[3])+par[2]*par[2]*(x[0]-par[3])*(x[0]-par[3]))/x[0];
+Double_t fitFunction_f(Double_t *x, Double_t *par) {
+  const Double_t value =
+      sqrt(par[0] * par[0] + par[1] * par[1] * (x[0] - par[3]) + par[2] * par[2] * (x[0] - par[3]) * (x[0] - par[3])) /
+      x[0];
   return value;
 }
 
-void Comparator::DrawGaussSigmaSlice(const char* key, const int rebinFactor, const int binxmin,
-				     const int binxmax, const bool cst_binning, Mode mode)
-{
-  TDirectory* dir = dir1_;
+void Comparator::DrawGaussSigmaSlice(
+    const char *key, const int rebinFactor, const int binxmin, const int binxmax, const bool cst_binning, Mode mode) {
+  TDirectory *dir = dir1_;
   dir->cd();
-  TH2D *h2 = (TH2D*) dir->Get(key);
+  TH2D *h2 = (TH2D *)dir->Get(key);
   TH2Analyzer TH2Ana(h2, binxmin, binxmax, rebinFactor, cst_binning);
-  TH1D* hrms=TH2Ana.RMS();
-  TF1 *fitfcndgssrms3 = new TF1("fitfcndgssrms3",fitFunction_f,hrms->GetXaxis()->GetBinLowEdge(1),hrms->GetXaxis()->GetBinUpEdge(hrms->GetNbinsX()),4);
+  TH1D *hrms = TH2Ana.RMS();
+  TF1 *fitfcndgssrms3 = new TF1("fitfcndgssrms3",
+                                fitFunction_f,
+                                hrms->GetXaxis()->GetBinLowEdge(1),
+                                hrms->GetXaxis()->GetBinUpEdge(hrms->GetNbinsX()),
+                                4);
   fitfcndgssrms3->SetNpx(500);
   fitfcndgssrms3->SetLineWidth(3);
   fitfcndgssrms3->SetLineStyle(2);
   fitfcndgssrms3->SetLineColor(4);
-  hrms->Fit(fitfcndgssrms3,"0R");
-
-  TH1D* ha=TH2Ana.SigmaGauss();
-  TF1 *fitfcndgsse3 = new TF1("fitfcndgsse3",fitFunction_f,hrms->GetXaxis()->GetBinLowEdge(1),hrms->GetXaxis()->GetBinUpEdge(hrms->GetNbinsX()),4);
+  hrms->Fit(fitfcndgssrms3, "0R");
+
+  TH1D *ha = TH2Ana.SigmaGauss();
+  TF1 *fitfcndgsse3 = new TF1("fitfcndgsse3",
+                              fitFunction_f,
+                              hrms->GetXaxis()->GetBinLowEdge(1),
+                              hrms->GetXaxis()->GetBinUpEdge(hrms->GetNbinsX()),
+                              4);
   fitfcndgsse3->SetNpx(500);
   fitfcndgsse3->SetLineWidth(3);
   fitfcndgsse3->SetLineStyle(1);
   fitfcndgsse3->SetLineColor(4);
-  ha->Fit(fitfcndgsse3,"0R");
+  ha->Fit(fitfcndgsse3, "0R");
 
   dir = dir0_;
   dir->cd();
-  TH2D *h2b = (TH2D*) dir->Get(key);
+  TH2D *h2b = (TH2D *)dir->Get(key);
   TH2Analyzer TH2Anab(h2b, binxmin, binxmax, rebinFactor, cst_binning);
-  TH1D* hrmsb=TH2Anab.RMS();
-  TF1 *fitfcndgssrmsb3 = new TF1("fitfcndgssrmsb3",fitFunction_f,hrms->GetXaxis()->GetBinLowEdge(1),hrms->GetXaxis()->GetBinUpEdge(hrms->GetNbinsX()),4);
+  TH1D *hrmsb = TH2Anab.RMS();
+  TF1 *fitfcndgssrmsb3 = new TF1("fitfcndgssrmsb3",
+                                 fitFunction_f,
+                                 hrms->GetXaxis()->GetBinLowEdge(1),
+                                 hrms->GetXaxis()->GetBinUpEdge(hrms->GetNbinsX()),
+                                 4);
   fitfcndgssrmsb3->SetNpx(500);
   fitfcndgssrmsb3->SetLineWidth(3);
   fitfcndgssrmsb3->SetLineStyle(2);
   fitfcndgssrmsb3->SetLineColor(2);
-  hrmsb->Fit(fitfcndgssrmsb3,"0R");
-
-  TH1D* hb=TH2Anab.SigmaGauss();
-  TF1 *fitfcndgsseb3 = new TF1("fitfcndgsseb3",fitFunction_f,hrms->GetXaxis()->GetBinLowEdge(1),hrms->GetXaxis()->GetBinUpEdge(hrms->GetNbinsX()),4);
+  hrmsb->Fit(fitfcndgssrmsb3, "0R");
+
+  TH1D *hb = TH2Anab.SigmaGauss();
+  TF1 *fitfcndgsseb3 = new TF1("fitfcndgsseb3",
+                               fitFunction_f,
+                               hrms->GetXaxis()->GetBinLowEdge(1),
+                               hrms->GetXaxis()->GetBinUpEdge(hrms->GetNbinsX()),
+                               4);
   fitfcndgsseb3->SetNpx(500);
   fitfcndgsseb3->SetLineWidth(3);
   fitfcndgsseb3->SetLineStyle(1);
   fitfcndgsseb3->SetLineColor(2);
-  hb->Fit(fitfcndgsseb3,"0R");
+  hb->Fit(fitfcndgsseb3, "0R");
 
-  Draw(hb,ha,mode);
-  //Draw(hrms,ha,mode);
-  //Draw(ha,ha,mode);
+  Draw(hb, ha, mode);
+  // Draw(hrms,ha,mode);
+  // Draw(ha,ha,mode);
   fitfcndgssrms3->Draw("same");
   fitfcndgsse3->Draw("same");
   fitfcndgssrmsb3->Draw("same");
   fitfcndgsseb3->Draw("same");
 }
 
-void Comparator::DrawGaussSigmaOverMeanXSlice(const char* key, const int rebinFactor, const int binxmin,
-				     const int binxmax, const bool cst_binning, Mode mode)
-{
-
-  TDirectory* dir = dir1_;
+void Comparator::DrawGaussSigmaOverMeanXSlice(
+    const char *key, const int rebinFactor, const int binxmin, const int binxmax, const bool cst_binning, Mode mode) {
+  TDirectory *dir = dir1_;
   dir->cd();
-  TH2D *h2 = (TH2D*) dir->Get(key);
+  TH2D *h2 = (TH2D *)dir->Get(key);
   TH2Analyzer TH2Ana(h2, binxmin, binxmax, rebinFactor, cst_binning);
-  TH1D* hrms=TH2Ana.RMS();
+  TH1D *hrms = TH2Ana.RMS();
 
-  TH1D* meanXslice = TH2Ana.MeanX();
-  //for( int i=1; i<=meanXslice->GetNbinsX(); ++i) {
+  TH1D *meanXslice = TH2Ana.MeanX();
+  // for( int i=1; i<=meanXslice->GetNbinsX(); ++i) {
   //  std::cout << "meanXslice->GetBinContent(" << i << ") = "
   //	      << meanXslice->GetBinContent(i) << std::endl;
   //  std::cout << "meanXslice->GetBinError(" << i << ") = "
   //	      << meanXslice->GetBinError(i) << std::endl;
   //}
-  //Draw(meanXslice,meanXslice,mode);
+  // Draw(meanXslice,meanXslice,mode);
   hrms->Divide(meanXslice);
 
-  TF1 *fitXfcndgssrms3 = new TF1("fitXfcndgssrms3",fitFunction_f,hrms->GetXaxis()->GetBinLowEdge(1),hrms->GetXaxis()->GetBinUpEdge(hrms->GetNbinsX()),4);
+  TF1 *fitXfcndgssrms3 = new TF1("fitXfcndgssrms3",
+                                 fitFunction_f,
+                                 hrms->GetXaxis()->GetBinLowEdge(1),
+                                 hrms->GetXaxis()->GetBinUpEdge(hrms->GetNbinsX()),
+                                 4);
   fitXfcndgssrms3->SetNpx(500);
   fitXfcndgssrms3->SetLineWidth(3);
   fitXfcndgssrms3->SetLineStyle(2);
   fitXfcndgssrms3->SetLineColor(4);
-  hrms->Fit(fitXfcndgssrms3,"0R");
+  hrms->Fit(fitXfcndgssrms3, "0R");
 
-  TH1D* ha=TH2Ana.SigmaGauss();
+  TH1D *ha = TH2Ana.SigmaGauss();
   ha->Divide(meanXslice);
-  TF1 *fitXfcndgsse3 = new TF1("fitXfcndgsse3",fitFunction_f,ha->GetXaxis()->GetBinLowEdge(1),ha->GetXaxis()->GetBinUpEdge(ha->GetNbinsX()),4);
+  TF1 *fitXfcndgsse3 = new TF1("fitXfcndgsse3",
+                               fitFunction_f,
+                               ha->GetXaxis()->GetBinLowEdge(1),
+                               ha->GetXaxis()->GetBinUpEdge(ha->GetNbinsX()),
+                               4);
   fitXfcndgsse3->SetNpx(500);
   fitXfcndgsse3->SetLineWidth(3);
   fitXfcndgsse3->SetLineStyle(1);
   fitXfcndgsse3->SetLineColor(4);
-  ha->Fit(fitXfcndgsse3,"0R");
+  ha->Fit(fitXfcndgsse3, "0R");
 
   dir = dir0_;
   dir->cd();
-  TH2D *h2b = (TH2D*) dir->Get(key);
+  TH2D *h2b = (TH2D *)dir->Get(key);
   TH2Analyzer TH2Anab(h2b, binxmin, binxmax, rebinFactor, cst_binning);
-  TH1D* hrmsb=TH2Anab.RMS();
+  TH1D *hrmsb = TH2Anab.RMS();
   hrmsb->Divide(meanXslice);
-  TF1 *fitXfcndgssrmsb3 = new TF1("fitXfcndgssrmsb3",fitFunction_f,hrmsb->GetXaxis()->GetBinLowEdge(1),hrmsb->GetXaxis()->GetBinUpEdge(hrmsb->GetNbinsX()),4);
+  TF1 *fitXfcndgssrmsb3 = new TF1("fitXfcndgssrmsb3",
+                                  fitFunction_f,
+                                  hrmsb->GetXaxis()->GetBinLowEdge(1),
+                                  hrmsb->GetXaxis()->GetBinUpEdge(hrmsb->GetNbinsX()),
+                                  4);
   fitXfcndgssrmsb3->SetNpx(500);
   fitXfcndgssrmsb3->SetLineWidth(3);
   fitXfcndgssrmsb3->SetLineStyle(2);
   fitXfcndgssrmsb3->SetLineColor(2);
-  hrmsb->Fit(fitXfcndgssrmsb3,"0R");
+  hrmsb->Fit(fitXfcndgssrmsb3, "0R");
 
-  TH1D* hb=TH2Anab.SigmaGauss();
+  TH1D *hb = TH2Anab.SigmaGauss();
   hb->Divide(meanXslice);
-  TF1 *fitXfcndgsseb3 = new TF1("fitXfcndgsseb3",fitFunction_f,hb->GetXaxis()->GetBinLowEdge(1),hb->GetXaxis()->GetBinUpEdge(hb->GetNbinsX()),4);
+  TF1 *fitXfcndgsseb3 = new TF1("fitXfcndgsseb3",
+                                fitFunction_f,
+                                hb->GetXaxis()->GetBinLowEdge(1),
+                                hb->GetXaxis()->GetBinUpEdge(hb->GetNbinsX()),
+                                4);
   fitXfcndgsseb3->SetNpx(500);
   fitXfcndgsseb3->SetLineWidth(3);
   fitXfcndgsseb3->SetLineStyle(1);
   fitXfcndgsseb3->SetLineColor(2);
-  hb->Fit(fitXfcndgsseb3,"0R");
+  hb->Fit(fitXfcndgsseb3, "0R");
 
-  Draw(hb,ha,mode);
-  //Draw(hrms,ha,mode);
-  //Draw(ha,ha,mode);
+  Draw(hb, ha, mode);
+  // Draw(hrms,ha,mode);
+  // Draw(ha,ha,mode);
   fitXfcndgssrms3->Draw("same");
   fitXfcndgsse3->Draw("same");
   fitXfcndgssrmsb3->Draw("same");
   fitXfcndgsseb3->Draw("same");
 }
 
-void Comparator::DrawGaussSigmaOverMeanSlice(const char* key, const char* key2,
-					     const int rebinFactor, Mode mode)
-{
-  TDirectory* dir = dir1_;
+void Comparator::DrawGaussSigmaOverMeanSlice(const char *key, const char *key2, const int rebinFactor, Mode mode) {
+  TDirectory *dir = dir1_;
   dir->cd();
 
-  TH2D *h2_b = (TH2D*) dir->Get(key2);
+  TH2D *h2_b = (TH2D *)dir->Get(key2);
   TH2Analyzer TH2Ana_b(h2_b, rebinFactor);
-  TH1D* meanslice=TH2Ana_b.Average();
+  TH1D *meanslice = TH2Ana_b.Average();
 
-  TH2D *h2 = (TH2D*) dir->Get(key);
+  TH2D *h2 = (TH2D *)dir->Get(key);
   TH2Analyzer TH2Ana(h2, rebinFactor);
 
-  TH1D* ha=TH2Ana.SigmaGauss();
+  TH1D *ha = TH2Ana.SigmaGauss();
   ha->Divide(meanslice);
 
   dir = dir0_;
   dir->cd();
-  TH2D *h2b = (TH2D*) dir->Get(key);
+  TH2D *h2b = (TH2D *)dir->Get(key);
   TH2Analyzer TH2Anab(h2b, rebinFactor);
 
-  TH2D *h2b_b = (TH2D*) dir->Get(key2);
+  TH2D *h2b_b = (TH2D *)dir->Get(key2);
   TH2Analyzer TH2Anab_b(h2b_b, rebinFactor);
-  TH1D* meansliceb=TH2Anab_b.Average();
+  TH1D *meansliceb = TH2Anab_b.Average();
 
-  TH1D* hb=TH2Anab.SigmaGauss();
+  TH1D *hb = TH2Anab.SigmaGauss();
   hb->Divide(meansliceb);
 
-  Draw(hb,ha,mode);
-  //Draw(meansliceb,meanslice,mode);
+  Draw(hb, ha, mode);
+  // Draw(meansliceb,meanslice,mode);
 }
 
-void Comparator::Draw( const char* key, Mode mode) {
+void Comparator::Draw(const char *key, Mode mode) {
+  TH1::AddDirectory(false);
+  TH1 *h0 = Histo(key, 0);
+  TH1 *h1 = (TH1 *)Histo(key, 1)->Clone("h1");
 
-  TH1::AddDirectory( false );
-  TH1* h0 = Histo( key, 0);
-  TH1* h1 = (TH1*) Histo( key, 1)->Clone("h1");
-
-  TH1::AddDirectory( true );
-  Draw( h0, h1, mode);    
+  TH1::AddDirectory(true);
+  Draw(h0, h1, mode);
 }
 
-  
-void Comparator::Draw( const char* key0, const char* key1, Mode mode) {
-  TH1* h0=nullptr;
-  TH1* h1=nullptr;
-  if(mode!=EFF)
-    {
-      h0 = Histo( key0, 0);
-      h1 = Histo( key1, 1);
-    } 
-  else
-    {
-      h0 = Histo( key0, 0);
-      TH1 * h0b = Histo( key1, 0);
-      h1 = Histo( key0, 1);
-      TH1 * h1b = Histo( key1, 1);
-      if(rebin_>1) {
-	h0->Rebin( rebin_);
-	h1->Rebin( rebin_);
-	h0b->Rebin( rebin_);
-	h1b->Rebin( rebin_);
-      }
-      if(resetAxis_) {
-	h0->GetXaxis()->SetRangeUser( xMin_, xMax_);
-	h1->GetXaxis()->SetRangeUser( xMin_, xMax_);
-	h0b->GetXaxis()->SetRangeUser( xMin_, xMax_);
-	h1b->GetXaxis()->SetRangeUser( xMin_, xMax_);
-      }      
-
-      h0b->Sumw2();
-      h0->Sumw2();
-      h0->Divide(h0,h0b,1.,1.,"B");
-      h1b->Sumw2();
-      h1->Sumw2();
-      h1->Divide(h1,h1b,1.,1.,"B");
+void Comparator::Draw(const char *key0, const char *key1, Mode mode) {
+  TH1 *h0 = nullptr;
+  TH1 *h1 = nullptr;
+  if (mode != EFF) {
+    h0 = Histo(key0, 0);
+    h1 = Histo(key1, 1);
+  } else {
+    h0 = Histo(key0, 0);
+    TH1 *h0b = Histo(key1, 0);
+    h1 = Histo(key0, 1);
+    TH1 *h1b = Histo(key1, 1);
+    if (rebin_ > 1) {
+      h0->Rebin(rebin_);
+      h1->Rebin(rebin_);
+      h0b->Rebin(rebin_);
+      h1b->Rebin(rebin_);
+    }
+    if (resetAxis_) {
+      h0->GetXaxis()->SetRangeUser(xMin_, xMax_);
+      h1->GetXaxis()->SetRangeUser(xMin_, xMax_);
+      h0b->GetXaxis()->SetRangeUser(xMin_, xMax_);
+      h1b->GetXaxis()->SetRangeUser(xMin_, xMax_);
     }
-  Draw( h0, h1, mode);
+
+    h0b->Sumw2();
+    h0->Sumw2();
+    h0->Divide(h0, h0b, 1., 1., "B");
+    h1b->Sumw2();
+    h1->Sumw2();
+    h1->Divide(h1, h1b, 1., 1., "B");
+  }
+  Draw(h0, h1, mode);
 }
 
-TH1* Comparator::Histo( const char* key, unsigned dirIndex) {
-  if(dirIndex>1U) { // dirIndex >= 0, since dirIndex is unsigned
-    cerr<<"bad dir index: "<<dirIndex<<endl;
+TH1 *Comparator::Histo(const char *key, unsigned dirIndex) {
+  if (dirIndex > 1U) {  // dirIndex >= 0, since dirIndex is unsigned
+    cerr << "bad dir index: " << dirIndex << endl;
     return nullptr;
   }
-  TDirectory* dir = nullptr;
-  if(dirIndex == 0) dir = dir0_;
-  if(dirIndex == 1) dir = dir1_;
-  assert( dir );
-  
+  TDirectory *dir = nullptr;
+  if (dirIndex == 0)
+    dir = dir0_;
+  if (dirIndex == 1)
+    dir = dir1_;
+  assert(dir);
+
   dir->cd();
 
-  TH1* h = (TH1*) dir->Get(key);
-  if(!h)  
-    cerr<<"no key "<<key<<" in directory "<<dir->GetName()<<endl;
+  TH1 *h = (TH1 *)dir->Get(key);
+  if (!h)
+    cerr << "no key " << key << " in directory " << dir->GetName() << endl;
   return h;
 }
 
-
-void Comparator::Draw( TH1* h0, TH1* h1, Mode mode ) {
-  if( !(h0 && h1) ) { 
-    cerr<<"invalid histo"<<endl;
+void Comparator::Draw(TH1 *h0, TH1 *h1, Mode mode) {
+  if (!(h0 && h1)) {
+    cerr << "invalid histo" << endl;
     return;
   }
-    
-  TH1::AddDirectory( false );
-  h0_ = (TH1*) h0->Clone( "h0_");
-  h1_ = (TH1*) h1->Clone( "h1_");
-  TH1::AddDirectory( true );
-    
+
+  TH1::AddDirectory(false);
+  h0_ = (TH1 *)h0->Clone("h0_");
+  h1_ = (TH1 *)h1->Clone("h1_");
+  TH1::AddDirectory(true);
+
   // unsetting the title, since the title of projections
   // is still the title of the 2d histo
   // and this is better anyway
   h0_->SetTitle("");
-  h1_->SetTitle("");    
+  h1_->SetTitle("");
 
-  //h0_->SetStats(1);
-  //h1_->SetStats(1);
+  // h0_->SetStats(1);
+  // h1_->SetStats(1);
 
-  if(mode!=EFF)
-    {
-      if(rebin_>1) {
-	h0_->Rebin( rebin_);
-	h1_->Rebin( rebin_);
-      }
-      if(resetAxis_) {
-	h0_->GetXaxis()->SetRangeUser( xMin_, xMax_);
-	h1_->GetXaxis()->SetRangeUser( xMin_, xMax_);
-      }
+  if (mode != EFF) {
+    if (rebin_ > 1) {
+      h0_->Rebin(rebin_);
+      h1_->Rebin(rebin_);
     }
+    if (resetAxis_) {
+      h0_->GetXaxis()->SetRangeUser(xMin_, xMax_);
+      h1_->GetXaxis()->SetRangeUser(xMin_, xMax_);
+    }
+  }
 
-  if (mode!=GRAPH)
-  {
-
-    TPaveStats *ptstats = new TPaveStats(0.7385057,0.720339,
-  				       0.9396552,0.8792373,"brNDC");
+  if (mode != GRAPH) {
+    TPaveStats *ptstats = new TPaveStats(0.7385057, 0.720339, 0.9396552, 0.8792373, "brNDC");
     ptstats->SetName("stats");
     ptstats->SetBorderSize(1);
     ptstats->SetLineColor(2);
@@ -405,14 +410,13 @@ void Comparator::Draw( TH1* h0, TH1* h1, Mode mode ) {
     ptstats->Draw();
     h0_->GetListOfFunctions()->Add(ptstats);
     ptstats->SetParent(h0_->GetListOfFunctions());
-  
-    //std::cout << "FL: h0_->GetMean() = " << h0_->GetMean() << std::endl;
-    //std::cout << "FL: h0_->GetRMS() = " << h0_->GetRMS() << std::endl;
-    //std::cout << "FL: h1_->GetMean() = " << h1_->GetMean() << std::endl;
-    //std::cout << "FL: h1_->GetRMS() = " << h1_->GetRMS() << std::endl;
-    //std::cout << "FL: test2" << std::endl;
-    TPaveStats *ptstats2 = new TPaveStats(0.7399425,0.529661,
-  					0.941092,0.6885593,"brNDC");
+
+    // std::cout << "FL: h0_->GetMean() = " << h0_->GetMean() << std::endl;
+    // std::cout << "FL: h0_->GetRMS() = " << h0_->GetRMS() << std::endl;
+    // std::cout << "FL: h1_->GetMean() = " << h1_->GetMean() << std::endl;
+    // std::cout << "FL: h1_->GetRMS() = " << h1_->GetRMS() << std::endl;
+    // std::cout << "FL: test2" << std::endl;
+    TPaveStats *ptstats2 = new TPaveStats(0.7399425, 0.529661, 0.941092, 0.6885593, "brNDC");
     ptstats2->SetName("stats");
     ptstats2->SetBorderSize(1);
     ptstats2->SetLineColor(4);
@@ -421,108 +425,106 @@ void Comparator::Draw( TH1* h0, TH1* h1, Mode mode ) {
     ptstats2->SetTextColor(4);
     TText *text = ptstats2->AddText("h1_");
     text->SetTextSize(0.03654661);
-  
+
     std::ostringstream oss3;
     oss3 << h1_->GetEntries();
-    const std::string txt_entries="Entries = "+oss3.str();
+    const std::string txt_entries = "Entries = " + oss3.str();
     text = ptstats2->AddText(txt_entries.c_str());
     std::ostringstream oss;
     oss << h1_->GetMean();
-    const std::string txt_mean="Mean  = "+oss.str();
+    const std::string txt_mean = "Mean  = " + oss.str();
     text = ptstats2->AddText(txt_mean.c_str());
     std::ostringstream oss2;
     oss2 << h1_->GetRMS();
-    const std::string txt_rms="RMS  = "+oss2.str();
+    const std::string txt_rms = "RMS  = " + oss2.str();
     text = ptstats2->AddText(txt_rms.c_str());
     ptstats2->SetOptStat(1111);
     ptstats2->SetOptFit(0);
     ptstats2->Draw();
     h1_->GetListOfFunctions()->Add(ptstats2);
     ptstats2->SetParent(h1_->GetListOfFunctions());
-  }
-  else
-  {
-    TPaveStats *ptstats = new TPaveStats(0.0,0.0,
-					 0.0,0.0,"brNDC");
+  } else {
+    TPaveStats *ptstats = new TPaveStats(0.0, 0.0, 0.0, 0.0, "brNDC");
     ptstats->Draw();
     h0_->GetListOfFunctions()->Add(ptstats);
     ptstats->SetParent(h0_->GetListOfFunctions());
   }
 
-  float min=-999.;
-  float max=+999.;
-  switch(mode) {
-  case SCALE:
-    h1_->Scale( h0_->GetEntries()/h1_->GetEntries() );
-  case NORMAL:
-    if(s0_)
-      Styles::FormatHisto( h0_ , s0_);
-    if(s1_)
-      Styles::FormatHisto( h1_ , s1_);
-      
-    if( h1_->GetMaximum()>h0_->GetMaximum()) {
-      h0_->SetMaximum( h1_->GetMaximum()*1.15 );
-    }
+  float min = -999.;
+  float max = +999.;
+  switch (mode) {
+    case SCALE:
+      h1_->Scale(h0_->GetEntries() / h1_->GetEntries());
+    case NORMAL:
+      if (s0_)
+        Styles::FormatHisto(h0_, s0_);
+      if (s1_)
+        Styles::FormatHisto(h1_, s1_);
+
+      if (h1_->GetMaximum() > h0_->GetMaximum()) {
+        h0_->SetMaximum(h1_->GetMaximum() * 1.15);
+      }
 
-    h0_->Draw();
-    h1_->Draw("same");
-
-    break;
-  case EFF:
-    if(s0_)
-      Styles::FormatHisto( h0_ , s0_);
-    if(s1_)
-      Styles::FormatHisto( h1_ , s1_);
-
-    // rather arbitrary but useful
-    max= h0_->GetMaximum();
-    if ( h1_->GetMaximum() > max )
-      max = h1_->GetMaximum();
-    if(max > 0.8) max = 1;
-    
-    max *= 1.1 ;
-
-    min= h0_->GetMinimum();
-    if ( h1_->GetMinimum() < min )
-      min = h1_->GetMinimum();
-    if(min > 0.2) min = 0.;
-
-    min *= 0.8 ;
-    h0_->SetMaximum( max );
-    h0_->SetMinimum( min );
-
-    h0_->Draw("E");
-    h1_->Draw("Esame");
-    break;
-  case GRAPH:
-    if(s0_)
-      Styles::FormatHisto( h0_ , s0_);
-    if(s1_)
-      Styles::FormatHisto( h1_ , s1_);
-      
-    if( h1_->GetMaximum()>h0_->GetMaximum()) {
-      h0_->SetMaximum( h1_->GetMaximum()*1.15 );
-    }
-    if( h1_->GetMinimum()<h0_->GetMinimum()) {
-      h0_->SetMinimum( h1_->GetMinimum()*1.15 );
-    }
-    h0_->SetMarkerStyle(21);
-    h0_->SetMarkerColor(2);
-    h1_->SetMarkerStyle(21);
-    h1_->SetMarkerColor(4);
-
-    h0_->Draw("E1");
-    h1_->Draw("E1same");
-    break;
-  case RATIO:
-    h0_->Sumw2();
-    h1_->Sumw2();
-    h0_->Divide( h1_ );
-    if(s0_)
-      Styles::FormatHisto( h0_ , s0_);
-    h0_->Draw();
-  default:
-    break;
+      h0_->Draw();
+      h1_->Draw("same");
+
+      break;
+    case EFF:
+      if (s0_)
+        Styles::FormatHisto(h0_, s0_);
+      if (s1_)
+        Styles::FormatHisto(h1_, s1_);
+
+      // rather arbitrary but useful
+      max = h0_->GetMaximum();
+      if (h1_->GetMaximum() > max)
+        max = h1_->GetMaximum();
+      if (max > 0.8)
+        max = 1;
+
+      max *= 1.1;
+
+      min = h0_->GetMinimum();
+      if (h1_->GetMinimum() < min)
+        min = h1_->GetMinimum();
+      if (min > 0.2)
+        min = 0.;
+
+      min *= 0.8;
+      h0_->SetMaximum(max);
+      h0_->SetMinimum(min);
+
+      h0_->Draw("E");
+      h1_->Draw("Esame");
+      break;
+    case GRAPH:
+      if (s0_)
+        Styles::FormatHisto(h0_, s0_);
+      if (s1_)
+        Styles::FormatHisto(h1_, s1_);
+
+      if (h1_->GetMaximum() > h0_->GetMaximum()) {
+        h0_->SetMaximum(h1_->GetMaximum() * 1.15);
+      }
+      if (h1_->GetMinimum() < h0_->GetMinimum()) {
+        h0_->SetMinimum(h1_->GetMinimum() * 1.15);
+      }
+      h0_->SetMarkerStyle(21);
+      h0_->SetMarkerColor(2);
+      h1_->SetMarkerStyle(21);
+      h1_->SetMarkerColor(4);
+
+      h0_->Draw("E1");
+      h1_->Draw("E1same");
+      break;
+    case RATIO:
+      h0_->Sumw2();
+      h1_->Sumw2();
+      h0_->Divide(h1_);
+      if (s0_)
+        Styles::FormatHisto(h0_, s0_);
+      h0_->Draw();
+    default:
+      break;
   }
 }
-
diff --git a/Validation/RecoParticleFlow/src/NicePlot.cc b/Validation/RecoParticleFlow/src/NicePlot.cc
index a555bb6097783..b912a9ab4608c 100644
--- a/Validation/RecoParticleFlow/src/NicePlot.cc
+++ b/Validation/RecoParticleFlow/src/NicePlot.cc
@@ -4,58 +4,54 @@
 #include <TStyle.h>
 #include <string>
 
-
-using namespace std; 
-
+using namespace std;
 
 Styles::Styles() {
-
   gROOT->SetStyle("Plain");
   gStyle->SetPalette(1);
   gStyle->SetHistMinimumZero(kTRUE);
 
-  s1 = new Style(); 
+  s1 = new Style();
 
-  s1->SetLineWidth(2);   
-  s1->SetLineColor(1);   
+  s1->SetLineWidth(2);
+  s1->SetLineColor(1);
 
-  s2 = new Style(); 
+  s2 = new Style();
 
-  s2->SetLineWidth(2);   
-  s2->SetLineColor(4);   
+  s2->SetLineWidth(2);
+  s2->SetLineColor(4);
 
   sg1 = new Style();
 
   sg1->SetMarkerColor(4);
   sg1->SetLineColor(4);
-  sg1->SetLineWidth(2);  
+  sg1->SetLineWidth(2);
   sg1->SetMarkerStyle(21);
 
-  sback =  new Style();
-  sback->SetFillStyle(1001);  
-  sback->SetFillColor(5);  
- 
+  sback = new Style();
+  sback->SetFillStyle(1001);
+  sback->SetFillColor(5);
+
   spred = new Style();
-  spred->SetLineColor(2); 
-  spred->SetLineWidth(2);  
-  spred->SetFillStyle(1001); 
-  spred->SetFillColor(kRed-8); 
+  spred->SetLineColor(2);
+  spred->SetLineWidth(2);
+  spred->SetFillStyle(1001);
+  spred->SetFillColor(kRed - 8);
 
   spblue = new Style();
-  spblue->SetLineColor(4); 
+  spblue->SetLineColor(4);
   spblue->SetLineWidth(2);
 
   sgr1 = new Style();
   sgr1->SetLineWidth(1);
   sgr1->SetLineColor(1);
 
-  sgr2 = new Style(); 
+  sgr2 = new Style();
   sgr2->SetLineWidth(1);
   sgr2->SetLineColor(1);
-
 }
 
-void Styles::FormatHisto( TH1* h, const Style* s ) {
+void Styles::FormatHisto(TH1 *h, const Style *s) {
   //  h->SetStats(0);
   h->SetTitle("CMS Preliminary");
 
@@ -65,20 +61,20 @@ void Styles::FormatHisto( TH1* h, const Style* s ) {
   h->GetYaxis()->SetLabelSize(0.045);
   h->GetXaxis()->SetLabelSize(0.045);
 
-  h->SetLineWidth( s->GetLineWidth() );
-  h->SetLineColor( s->GetLineColor() );
-  h->SetFillStyle( s->GetFillStyle() );
-  h->SetFillColor( s->GetFillColor() );
+  h->SetLineWidth(s->GetLineWidth());
+  h->SetLineColor(s->GetLineColor());
+  h->SetFillStyle(s->GetFillStyle());
+  h->SetFillColor(s->GetFillColor());
 }
 
-void Styles::FormatPad( TPad* pad, bool grid, bool logx, bool logy) {
-  
-  
+void Styles::FormatPad(TPad *pad, bool grid, bool logx, bool logy) {
   pad->SetGridx(grid);
   pad->SetGridy(grid);
 
-  if (logx) pad->SetLogx();
-  if (logy) pad->SetLogy();
+  if (logx)
+    pad->SetLogx();
+  if (logy)
+    pad->SetLogy();
 
   pad->SetBottomMargin(0.14);
   pad->SetLeftMargin(0.15);
@@ -87,18 +83,16 @@ void Styles::FormatPad( TPad* pad, bool grid, bool logx, bool logy) {
   pad->Update();
 }
 
-
-void Styles::SavePlot(const char* name, const char* dir) {
+void Styles::SavePlot(const char *name, const char *dir) {
   string eps = dir;
   eps += "/";
   eps += name;
   eps += ".eps";
-  gPad->SaveAs( eps.c_str() );
+  gPad->SaveAs(eps.c_str());
 
   string png = dir;
   png += "/";
   png += name;
   png += ".png";
-  gPad->SaveAs( png.c_str() );
-
+  gPad->SaveAs(png.c_str());
 }
diff --git a/Validation/RecoParticleFlow/src/TH2Analyzer.cc b/Validation/RecoParticleFlow/src/TH2Analyzer.cc
index f9fd4802bcb55..a6930d2bdb572 100644
--- a/Validation/RecoParticleFlow/src/TH2Analyzer.cc
+++ b/Validation/RecoParticleFlow/src/TH2Analyzer.cc
@@ -1,288 +1,295 @@
 #include "Validation/RecoParticleFlow/interface/TH2Analyzer.h"
 
-#include "TH2D.h"
-#include "TH1D.h"
 #include "TF1.h"
+#include "TH1D.h"
+#include "TH2D.h"
 #include "TPad.h"
 
-#include <string>
+#include <algorithm>
 #include <iostream>
 #include <sstream>
-#include <algorithm>
+#include <string>
+
+using namespace std;
 
-using namespace std; 
+// remove?
+void TH2Analyzer::Eval(int rebinFactor) {
+  // std::cout << "Eval!" << std::endl;
 
-// remove? 
-void TH2Analyzer::Eval( int rebinFactor ) {
-  //std::cout << "Eval!" << std::endl;
-  
   Reset();
 
   const string bname = hist2D_->GetName();
   const string rebinName = bname + "_rebin";
-  rebinnedHist2D_ = (TH2D*) hist2D_ -> Clone( rebinName.c_str() );
-  rebinnedHist2D_->RebinX( rebinFactor );
-
-  const string averageName = bname + "_average";  
-  average_ = new TH1D( averageName.c_str(),"arithmetic average", 
-		       rebinnedHist2D_->GetNbinsX(),
-		       rebinnedHist2D_->GetXaxis()->GetXmin(),
-		       rebinnedHist2D_->GetXaxis()->GetXmax() );
-  
-  const string rmsName = bname + "_RMS";  
-  RMS_ = new TH1D( rmsName.c_str(), "RMS",
-		   rebinnedHist2D_->GetNbinsX(),
-		   rebinnedHist2D_->GetXaxis()->GetXmin(),
-		   rebinnedHist2D_->GetXaxis()->GetXmax() );
-
-  const string sigmaGaussName = bname + "_sigmaGauss"; 
-  sigmaGauss_ = new TH1D(sigmaGaussName.c_str(), "sigmaGauss",
-			 rebinnedHist2D_->GetNbinsX(),
-			 rebinnedHist2D_->GetXaxis()->GetXmin(),
-			 rebinnedHist2D_->GetXaxis()->GetXmax() );
-
-  const string meanXName = bname + "_meanX"; 
-  meanXslice_ = new TH1D(meanXName.c_str(), "meanX",
-			 rebinnedHist2D_->GetNbinsX(),
-			 rebinnedHist2D_->GetXaxis()->GetXmin(),
-			 rebinnedHist2D_->GetXaxis()->GetXmax() );
-
-  ProcessSlices( rebinnedHist2D_ );
+  rebinnedHist2D_ = (TH2D *)hist2D_->Clone(rebinName.c_str());
+  rebinnedHist2D_->RebinX(rebinFactor);
+
+  const string averageName = bname + "_average";
+  average_ = new TH1D(averageName.c_str(),
+                      "arithmetic average",
+                      rebinnedHist2D_->GetNbinsX(),
+                      rebinnedHist2D_->GetXaxis()->GetXmin(),
+                      rebinnedHist2D_->GetXaxis()->GetXmax());
+
+  const string rmsName = bname + "_RMS";
+  RMS_ = new TH1D(rmsName.c_str(),
+                  "RMS",
+                  rebinnedHist2D_->GetNbinsX(),
+                  rebinnedHist2D_->GetXaxis()->GetXmin(),
+                  rebinnedHist2D_->GetXaxis()->GetXmax());
+
+  const string sigmaGaussName = bname + "_sigmaGauss";
+  sigmaGauss_ = new TH1D(sigmaGaussName.c_str(),
+                         "sigmaGauss",
+                         rebinnedHist2D_->GetNbinsX(),
+                         rebinnedHist2D_->GetXaxis()->GetXmin(),
+                         rebinnedHist2D_->GetXaxis()->GetXmax());
+
+  const string meanXName = bname + "_meanX";
+  meanXslice_ = new TH1D(meanXName.c_str(),
+                         "meanX",
+                         rebinnedHist2D_->GetNbinsX(),
+                         rebinnedHist2D_->GetXaxis()->GetXmin(),
+                         rebinnedHist2D_->GetXaxis()->GetXmax());
+
+  ProcessSlices(rebinnedHist2D_);
 }
 
 void TH2Analyzer::Reset() {
-  if ( rebinnedHist2D_ ) delete rebinnedHist2D_;
-  if ( average_ ) delete average_;
-  if ( RMS_ ) delete RMS_;
-  if ( sigmaGauss_ ) delete sigmaGauss_;
-  if ( meanXslice_ ) delete meanXslice_;
+  if (rebinnedHist2D_)
+    delete rebinnedHist2D_;
+  if (average_)
+    delete average_;
+  if (RMS_)
+    delete RMS_;
+  if (sigmaGauss_)
+    delete sigmaGauss_;
+  if (meanXslice_)
+    delete meanXslice_;
 
-  //for( unsigned i=0; i<parameters_.size(); ++i) {
+  // for( unsigned i=0; i<parameters_.size(); ++i) {
   //  delete parameters_[i];
   //}
-  
-  //parameters_.clear();
+
+  // parameters_.clear();
 }
 
-void TH2Analyzer::Eval(const int rebinFactor, const int binxmin,
-		       const int binxmax, const bool cst_binning)
-{
+void TH2Analyzer::Eval(const int rebinFactor, const int binxmin, const int binxmax, const bool cst_binning) {
   Reset();
   const string bname = hist2D_->GetName();
   const string rebinName = bname + "_rebin";
 
-  if (binxmax>hist2D_->GetNbinsX())
-    {
-      std::cout << "Error: TH2Analyzer.cc: binxmax>hist2D_->GetNbinsX()" << std::endl;
-      return;
+  if (binxmax > hist2D_->GetNbinsX()) {
+    std::cout << "Error: TH2Analyzer.cc: binxmax>hist2D_->GetNbinsX()" << std::endl;
+    return;
+  }
+
+  if (cst_binning) {
+    // std::cout << "hist2D_->GetXaxis()->GetBinLowEdge(" << binxmin << ") = "
+    // << hist2D_->GetXaxis()->GetBinLowEdge(binxmin) << std::endl; std::cout <<
+    // "hist2D_->GetXaxis()->GetBinUpEdge(" << binxmax << ") = " <<
+    // hist2D_->GetXaxis()->GetBinUpEdge(binxmax) << std::endl; std::cout <<
+    // "hist2D_->GetNbinsY() = " << hist2D_->GetNbinsY() << std::endl; std::cout
+    // << "hist2D_->GetYaxis()->GetXmin() = " << hist2D_->GetYaxis()->GetXmin()
+    // << std::endl; std::cout << "hist2D_->GetYaxis()->GetXmax() = " <<
+    // hist2D_->GetYaxis()->GetXmax() << std::endl;
+    rebinnedHist2D_ = new TH2D(rebinName.c_str(),
+                               "rebinned histo",
+                               binxmax - binxmin + 1,
+                               hist2D_->GetXaxis()->GetBinLowEdge(binxmin),
+                               hist2D_->GetXaxis()->GetBinUpEdge(binxmax),
+                               hist2D_->GetNbinsY(),
+                               hist2D_->GetYaxis()->GetXmin(),
+                               hist2D_->GetYaxis()->GetXmax());
+    for (int binyc = 1; binyc < hist2D_->GetNbinsY() + 1; ++binyc) {
+      for (int binxc = binxmin; binxc < binxmax + 1; ++binxc) {
+        // std::cout << "hist2D_->GetBinContent(" << binxc << "," << binyc << ")
+        // = " << hist2D_->GetBinContent(binxc,binyc) << std::endl; std::cout <<
+        // "hist2D_->GetBinError(" << binxc << "," << binyc << ") = " <<
+        // hist2D_->GetBinError(binxc,binyc) << std::endl; std::cout <<
+        // "binxc-binxmin+1 = " << binxc-binxmin+1 << std::endl;
+        rebinnedHist2D_->SetBinContent(binxc - binxmin + 1, binyc, hist2D_->GetBinContent(binxc, binyc));
+        rebinnedHist2D_->SetBinError(binxc - binxmin + 1, binyc, hist2D_->GetBinError(binxc, binyc));
+      }
     }
+    rebinnedHist2D_->RebinX(rebinFactor);
+
+    const string averageName = bname + "_average";
+    average_ = new TH1D(averageName.c_str(),
+                        "arithmetic average",
+                        rebinnedHist2D_->GetNbinsX(),
+                        rebinnedHist2D_->GetXaxis()->GetXmin(),
+                        rebinnedHist2D_->GetXaxis()->GetXmax());
+
+    const string rmsName = bname + "_RMS";
+    RMS_ = new TH1D(rmsName.c_str(),
+                    "RMS",
+                    rebinnedHist2D_->GetNbinsX(),
+                    rebinnedHist2D_->GetXaxis()->GetXmin(),
+                    rebinnedHist2D_->GetXaxis()->GetXmax());
+
+    const string sigmaGaussName = bname + "_sigmaGauss";
+    sigmaGauss_ = new TH1D(sigmaGaussName.c_str(),
+                           "sigmaGauss",
+                           rebinnedHist2D_->GetNbinsX(),
+                           rebinnedHist2D_->GetXaxis()->GetXmin(),
+                           rebinnedHist2D_->GetXaxis()->GetXmax());
+
+    const string meanXName = bname + "_meanX";
+    meanXslice_ = new TH1D(meanXName.c_str(),
+                           "meanX",
+                           rebinnedHist2D_->GetNbinsX(),
+                           rebinnedHist2D_->GetXaxis()->GetXmin(),
+                           rebinnedHist2D_->GetXaxis()->GetXmax());
+  } else {
+    // binning is not constant, but made to obtain almost the same number of
+    // events in each bin
 
-  if (cst_binning)
-    {
-      //std::cout << "hist2D_->GetXaxis()->GetBinLowEdge(" << binxmin << ") = " << hist2D_->GetXaxis()->GetBinLowEdge(binxmin) << std::endl;
-      //std::cout << "hist2D_->GetXaxis()->GetBinUpEdge(" << binxmax << ") = " << hist2D_->GetXaxis()->GetBinUpEdge(binxmax) << std::endl;
-      //std::cout << "hist2D_->GetNbinsY() = " << hist2D_->GetNbinsY() << std::endl;
-      //std::cout << "hist2D_->GetYaxis()->GetXmin() = " << hist2D_->GetYaxis()->GetXmin() << std::endl;
-      //std::cout << "hist2D_->GetYaxis()->GetXmax() = " << hist2D_->GetYaxis()->GetXmax() << std::endl;
-      rebinnedHist2D_ = new TH2D(rebinName.c_str(),"rebinned histo",
-				 binxmax-binxmin+1,
-				 hist2D_->GetXaxis()->GetBinLowEdge(binxmin),
-				 hist2D_->GetXaxis()->GetBinUpEdge(binxmax),
-				 hist2D_->GetNbinsY(),
-				 hist2D_->GetYaxis()->GetXmin(),
-				 hist2D_->GetYaxis()->GetXmax() );
-      for (int binyc=1;binyc<hist2D_->GetNbinsY()+1;++binyc)
-	{
-	  for (int binxc=binxmin;binxc<binxmax+1;++binxc)
-	    {
-	      //std::cout << "hist2D_->GetBinContent(" << binxc << "," << binyc << ") = " << hist2D_->GetBinContent(binxc,binyc) << std::endl;
-	      //std::cout << "hist2D_->GetBinError(" << binxc << "," << binyc << ") = " << hist2D_->GetBinError(binxc,binyc) << std::endl;
-	      //std::cout << "binxc-binxmin+1 = " << binxc-binxmin+1 << std::endl;
-	      rebinnedHist2D_->SetBinContent(binxc-binxmin+1,binyc,hist2D_->GetBinContent(binxc,binyc));
-	      rebinnedHist2D_->SetBinError(binxc-binxmin+1,binyc,hist2D_->GetBinError(binxc,binyc));
-	    }
-	}
-      rebinnedHist2D_->RebinX( rebinFactor );
-  
-      const string averageName = bname + "_average";  
-      average_ = new TH1D( averageName.c_str(),"arithmetic average", 
-			   rebinnedHist2D_->GetNbinsX(),
-			   rebinnedHist2D_->GetXaxis()->GetXmin(),
-			   rebinnedHist2D_->GetXaxis()->GetXmax() );
-    
-      const string rmsName = bname + "_RMS";  
-      RMS_ = new TH1D( rmsName.c_str(), "RMS",
-		       rebinnedHist2D_->GetNbinsX(),
-		       rebinnedHist2D_->GetXaxis()->GetXmin(),
-		       rebinnedHist2D_->GetXaxis()->GetXmax() );
-  
-      const string sigmaGaussName = bname + "_sigmaGauss"; 
-      sigmaGauss_ = new TH1D(sigmaGaussName.c_str(), "sigmaGauss",
-			     rebinnedHist2D_->GetNbinsX(),
-			     rebinnedHist2D_->GetXaxis()->GetXmin(),
-			     rebinnedHist2D_->GetXaxis()->GetXmax() );
-  
-      const string meanXName = bname + "_meanX"; 
-      meanXslice_ = new TH1D(meanXName.c_str(), "meanX",
-			     rebinnedHist2D_->GetNbinsX(),
-			     rebinnedHist2D_->GetXaxis()->GetXmin(),
-			     rebinnedHist2D_->GetXaxis()->GetXmax() );
+    // std::cout << "binxmax-binxmin+1 = " << binxmax-binxmin+1 << std::endl;
+    // std::cout << "rebinFactor = " << rebinFactor << std::endl;
+    // std::cout << "(binxmax-binxmin+1)/rebinFactor = " <<
+    // (binxmax-binxmin+1)/rebinFactor << std::endl; std::cout <<
+    // "((binxmax-binxmin+1)%rebinFactor) = " <<
+    // ((binxmax-binxmin+1)%rebinFactor) << std::endl; std::cout <<
+    // "abs((binxmax-binxmin+1)/rebinFactor) = " <<
+    // std::abs((binxmax-binxmin+1)/rebinFactor) << std::endl;
+
+    unsigned int nbin = 0;
+    if (((binxmax - binxmin + 1) % rebinFactor) != 0.0) {
+      nbin = std::abs((binxmax - binxmin + 1) / rebinFactor) + 1;
+    } else
+      nbin = (binxmax - binxmin + 1) / rebinFactor;
+
+    double *xlow = new double[nbin + 1];
+    int *binlow = new int[nbin + 1];
+
+    TH1D *h0_slice1 = hist2D_->ProjectionY("h0_slice1", binxmin, binxmax, "");
+    const unsigned int totalNumberOfEvents = static_cast<unsigned int>(h0_slice1->GetEntries());
+    // std::cout << "totalNumberOfEvents = " << totalNumberOfEvents <<
+    // std::endl;
+    delete h0_slice1;
+
+    unsigned int neventsc = 0;
+    unsigned int binXmaxc = binxmin + 1;
+    xlow[0] = hist2D_->GetXaxis()->GetBinLowEdge(binxmin);
+    binlow[0] = binxmin;
+    for (unsigned int binc = 1; binc < nbin; ++binc) {
+      while (neventsc < binc * totalNumberOfEvents / nbin) {
+        TH1D *h0_slice1c = hist2D_->ProjectionY("h0_slice1", binxmin, binXmaxc, "");
+        neventsc = static_cast<unsigned int>(h0_slice1c->GetEntries());
+        //        //std::cout << "FL : neventsc = " << neventsc << std::endl;
+        //        //std::cout << "FL : binXmaxc = " << binXmaxc << std::endl;
+        ++binXmaxc;
+        delete h0_slice1c;
+      }
+      // std::cout << "binXmaxc-1 = " << binXmaxc-1 << std::endl;
+      binlow[binc] = binXmaxc - 1;
+      xlow[binc] = hist2D_->GetXaxis()->GetBinLowEdge(binXmaxc - 1);
     }
-  else
-    {
-      // binning is not constant, but made to obtain almost the same number of events in each bin
-
-      //std::cout << "binxmax-binxmin+1 = " << binxmax-binxmin+1 << std::endl;
-      //std::cout << "rebinFactor = " << rebinFactor << std::endl;
-      //std::cout << "(binxmax-binxmin+1)/rebinFactor = " << (binxmax-binxmin+1)/rebinFactor << std::endl;
-      //std::cout << "((binxmax-binxmin+1)%rebinFactor) = " << ((binxmax-binxmin+1)%rebinFactor) << std::endl;
-      //std::cout << "abs((binxmax-binxmin+1)/rebinFactor) = " << std::abs((binxmax-binxmin+1)/rebinFactor) << std::endl;
-
-      unsigned int nbin=0;
-      if (((binxmax-binxmin+1)%rebinFactor)!=0.0)
-	{
-	  nbin=std::abs((binxmax-binxmin+1)/rebinFactor)+1;
-	}
-      else nbin=(binxmax-binxmin+1)/rebinFactor;
-
-      double *xlow = new double[nbin+1];
-      int *binlow = new int[nbin+1];
-
-      TH1D* h0_slice1 = hist2D_->ProjectionY("h0_slice1", binxmin, binxmax, "");
-      const unsigned int totalNumberOfEvents=static_cast<unsigned int>(h0_slice1->GetEntries());
-      //std::cout << "totalNumberOfEvents = " << totalNumberOfEvents << std::endl;
-      delete h0_slice1;
-
-      unsigned int neventsc=0;
-      unsigned int binXmaxc=binxmin+1;
-      xlow[0]=hist2D_->GetXaxis()->GetBinLowEdge(binxmin);
-      binlow[0]=binxmin;
-      for (unsigned int binc=1;binc<nbin;++binc)
-	{
-	  while (neventsc<binc*totalNumberOfEvents/nbin)
-	    {
-	      TH1D* h0_slice1c = hist2D_->ProjectionY("h0_slice1",binxmin, binXmaxc, "");
-	      neventsc=static_cast<unsigned int>(h0_slice1c->GetEntries());
-	      //        //std::cout << "FL : neventsc = " << neventsc << std::endl;
-	      //        //std::cout << "FL : binXmaxc = " << binXmaxc << std::endl;
-	      ++binXmaxc;
-	      delete h0_slice1c;
-	    }
-	  //std::cout << "binXmaxc-1 = " << binXmaxc-1 << std::endl;
-	  binlow[binc]=binXmaxc-1;
-	  xlow[binc]=hist2D_->GetXaxis()->GetBinLowEdge(binXmaxc-1);
-	}
-      xlow[nbin]=hist2D_->GetXaxis()->GetBinUpEdge(binxmax);
-      binlow[nbin]=binxmax;
-
-      //for (unsigned int binc=0;binc<nbin+1;++binc)
-      //{
-      //  std::cout << "xlow[" << binc << "] = " << xlow[binc] << std::endl;
-      //}
-
-      rebinnedHist2D_ = new TH2D(rebinName.c_str(),"rebinned histo",
-				 nbin, xlow, hist2D_->GetNbinsY(),
-				 hist2D_->GetYaxis()->GetXmin(),
-				 hist2D_->GetYaxis()->GetXmax() );
-      for (int binyc=1;binyc<hist2D_->GetNbinsY()+1;++binyc)
-	{
-	  for (unsigned int binxc=1;binxc<nbin+1;++binxc)
-	    {
-	      double sum=0.0;
-	      for (int binxh2c=binlow[binxc-1];binxh2c<binlow[binxc];++binxh2c)
-		{
-		  sum+=hist2D_->GetBinContent(binxh2c,binyc);
-		}
-	      rebinnedHist2D_->SetBinContent(binxc,binyc,sum);
-	    }
-	}
-  
-      const string averageName = bname + "_average";  
-      average_ = new TH1D( averageName.c_str(),"arithmetic average", nbin, xlow);
-    
-      const string rmsName = bname + "_RMS";  
-      RMS_ = new TH1D( rmsName.c_str(), "RMS", nbin, xlow);
-  
-      const string sigmaGaussName = bname + "_sigmaGauss"; 
-      sigmaGauss_ = new TH1D(sigmaGaussName.c_str(), "sigmaGauss", nbin, xlow);
-  
-      const string meanXName = bname + "_meanX"; 
-      meanXslice_ = new TH1D(meanXName.c_str(), "meanX", nbin, xlow);
-      delete [] xlow;
-      delete [] binlow;
+    xlow[nbin] = hist2D_->GetXaxis()->GetBinUpEdge(binxmax);
+    binlow[nbin] = binxmax;
+
+    // for (unsigned int binc=0;binc<nbin+1;++binc)
+    //{
+    //  std::cout << "xlow[" << binc << "] = " << xlow[binc] << std::endl;
+    //}
+
+    rebinnedHist2D_ = new TH2D(rebinName.c_str(),
+                               "rebinned histo",
+                               nbin,
+                               xlow,
+                               hist2D_->GetNbinsY(),
+                               hist2D_->GetYaxis()->GetXmin(),
+                               hist2D_->GetYaxis()->GetXmax());
+    for (int binyc = 1; binyc < hist2D_->GetNbinsY() + 1; ++binyc) {
+      for (unsigned int binxc = 1; binxc < nbin + 1; ++binxc) {
+        double sum = 0.0;
+        for (int binxh2c = binlow[binxc - 1]; binxh2c < binlow[binxc]; ++binxh2c) {
+          sum += hist2D_->GetBinContent(binxh2c, binyc);
+        }
+        rebinnedHist2D_->SetBinContent(binxc, binyc, sum);
+      }
     }
-  ProcessSlices( rebinnedHist2D_ );
+
+    const string averageName = bname + "_average";
+    average_ = new TH1D(averageName.c_str(), "arithmetic average", nbin, xlow);
+
+    const string rmsName = bname + "_RMS";
+    RMS_ = new TH1D(rmsName.c_str(), "RMS", nbin, xlow);
+
+    const string sigmaGaussName = bname + "_sigmaGauss";
+    sigmaGauss_ = new TH1D(sigmaGaussName.c_str(), "sigmaGauss", nbin, xlow);
+
+    const string meanXName = bname + "_meanX";
+    meanXslice_ = new TH1D(meanXName.c_str(), "meanX", nbin, xlow);
+    delete[] xlow;
+    delete[] binlow;
+  }
+  ProcessSlices(rebinnedHist2D_);
 }
 
-void TH2Analyzer::ProcessSlices( const TH2D* histo) {
-  
-  //std::cout << "ProcessSlices!" << std::endl;
+void TH2Analyzer::ProcessSlices(const TH2D *histo) {
+  // std::cout << "ProcessSlices!" << std::endl;
 
   TH1::AddDirectory(false);
 
-  for( int i=1; i<=histo->GetNbinsX(); ++i) {
-    TH1D* proj =  histo->ProjectionY("toto", i, i);
+  for (int i = 1; i <= histo->GetNbinsX(); ++i) {
+    TH1D *proj = histo->ProjectionY("toto", i, i);
     const double mean = proj->GetMean();
     const double rms = proj->GetRMS();
-    //std::cout << "mean = " << mean << std::endl;
-    //std::cout << "rms = " << rms << std::endl;
-    average_->SetBinContent( i, mean);
-    average_->SetBinError( i, proj->GetMeanError());
+    // std::cout << "mean = " << mean << std::endl;
+    // std::cout << "rms = " << rms << std::endl;
+    average_->SetBinContent(i, mean);
+    average_->SetBinError(i, proj->GetMeanError());
     RMS_->SetBinContent(i, rms);
     RMS_->SetBinError(i, proj->GetRMSError());
 
-    const double error=(histo->GetXaxis()->GetBinUpEdge(i)-histo->GetXaxis()->GetBinLowEdge(i))/2.0;
-    //std::cout << "error = " << error << std::endl;
-    meanXslice_->SetBinContent(i, histo->GetXaxis()->GetBinLowEdge(i)+error);
+    const double error = (histo->GetXaxis()->GetBinUpEdge(i) - histo->GetXaxis()->GetBinLowEdge(i)) / 2.0;
+    // std::cout << "error = " << error << std::endl;
+    meanXslice_->SetBinContent(i, histo->GetXaxis()->GetBinLowEdge(i) + error);
     meanXslice_->SetBinError(i, error);
-    //std::cout << "histo->GetXaxis()->GetBinLowEdge(" << i << ") = "
+    // std::cout << "histo->GetXaxis()->GetBinLowEdge(" << i << ") = "
     //          << histo->GetXaxis()->GetBinLowEdge(i) << std::endl;
-    //std::cout << "meanXslice_->GetBinError(" << i << ") = "
+    // std::cout << "meanXslice_->GetBinError(" << i << ") = "
     //	      << meanXslice_->GetBinError(i) << std::endl;
-    ProcessSlice(i, proj );
+    ProcessSlice(i, proj);
     delete proj;
   }
 
   TH1::AddDirectory(true);
-} 
+}
 
+void TH2Analyzer::ProcessSlice(const int i, TH1D *proj) const {
+  // const double mean = proj->GetMean();
+  const double rms = proj->GetRMS();
+  // std::cout << "FL: mean = " << mean << std::endl;
+  // std::cout << "FL: rms = " << rms << std::endl;
 
-void TH2Analyzer::ProcessSlice(const int i, TH1D* proj ) const {
+  if (rms != 0.0) {
+    const double fitmin = proj->GetMean() - proj->GetRMS();
+    const double fitmax = proj->GetMean() + proj->GetRMS();
 
-  //const double mean = proj->GetMean();
-  const double rms = proj->GetRMS();
-  //std::cout << "FL: mean = " << mean << std::endl;
-  //std::cout << "FL: rms = " << rms << std::endl;
-
-  if (rms!=0.0)
-    {
-      const double fitmin=proj->GetMean()-proj->GetRMS();
-      const double fitmax=proj->GetMean()+proj->GetRMS();
-  
-      //std::cout << "i = " << i << std::endl;
-      //std::cout << "fitmin = " << fitmin << std::endl;
-      //std::cout << "fitmax = " << fitmax << std::endl;
-  
-      //proj->Draw();
-      TF1* f1= new TF1("f1", "gaus", fitmin, fitmax);
-      f1->SetParameters(proj->GetRMS(),proj->GetMean(),proj->GetBinContent(proj->GetMaximumBin()));
-      proj->Fit(f1,"R", "", proj->GetXaxis()->GetXmin(), proj->GetXaxis()->GetXmax());
-  
-      //std::ostringstream oss;
-      //oss << i;
-      //const std::string plotfitname="Plots/fitbin_"+oss.str()+".eps";
-      //gPad->SaveAs( plotfitname.c_str() );
-      //std::cout << "param1 = " << f1->GetParameter(1) << std::endl;
-      //std::cout << "param2 = " << f1->GetParameter(2) << std::endl;
-      //std::cout << "paramError2 = " << f1->GetParError(2) << std::endl;
-  
-      sigmaGauss_->SetBinContent(i, f1->GetParameter(2));
-      sigmaGauss_->SetBinError(i, f1->GetParError(2));
-      delete f1;
-    }
-  else
-    {
-      sigmaGauss_->SetBinContent(i, 0.0);
-      sigmaGauss_->SetBinError(i, 0.0);
-    }
+    // std::cout << "i = " << i << std::endl;
+    // std::cout << "fitmin = " << fitmin << std::endl;
+    // std::cout << "fitmax = " << fitmax << std::endl;
+
+    // proj->Draw();
+    TF1 *f1 = new TF1("f1", "gaus", fitmin, fitmax);
+    f1->SetParameters(proj->GetRMS(), proj->GetMean(), proj->GetBinContent(proj->GetMaximumBin()));
+    proj->Fit(f1, "R", "", proj->GetXaxis()->GetXmin(), proj->GetXaxis()->GetXmax());
+
+    // std::ostringstream oss;
+    // oss << i;
+    // const std::string plotfitname="Plots/fitbin_"+oss.str()+".eps";
+    // gPad->SaveAs( plotfitname.c_str() );
+    // std::cout << "param1 = " << f1->GetParameter(1) << std::endl;
+    // std::cout << "param2 = " << f1->GetParameter(2) << std::endl;
+    // std::cout << "paramError2 = " << f1->GetParError(2) << std::endl;
+
+    sigmaGauss_->SetBinContent(i, f1->GetParameter(2));
+    sigmaGauss_->SetBinError(i, f1->GetParError(2));
+    delete f1;
+  } else {
+    sigmaGauss_->SetBinContent(i, 0.0);
+    sigmaGauss_->SetBinError(i, 0.0);
+  }
 }
diff --git a/Validation/RecoParticleFlow/src/classes.h b/Validation/RecoParticleFlow/src/classes.h
index ca4baf433d8a0..0f036561997bb 100644
--- a/Validation/RecoParticleFlow/src/classes.h
+++ b/Validation/RecoParticleFlow/src/classes.h
@@ -1,3 +1,3 @@
-#include "Validation/RecoParticleFlow/interface/TH2Analyzer.h"
-#include "Validation/RecoParticleFlow/interface/NicePlot.h"
 #include "Validation/RecoParticleFlow/interface/Comparator.h"
+#include "Validation/RecoParticleFlow/interface/NicePlot.h"
+#include "Validation/RecoParticleFlow/interface/TH2Analyzer.h"
diff --git a/Validation/RecoPixelVertexing/test/PixelTrackVal.cc b/Validation/RecoPixelVertexing/test/PixelTrackVal.cc
index 4a8ef0c935182..019363028deb5 100644
--- a/Validation/RecoPixelVertexing/test/PixelTrackVal.cc
+++ b/Validation/RecoPixelVertexing/test/PixelTrackVal.cc
@@ -1,44 +1,46 @@
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "FWCore/Utilities/interface/isFinite.h"
 
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/TrackReco/interface/Track.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
 
-#include "SimDataFormats/Vertex/interface/SimVertex.h"
-#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
-#include "SimDataFormats/Track/interface/SimTrack.h"
-#include "SimDataFormats/Track/interface/SimTrackContainer.h"
+#include "DataFormats/Math/interface/deltaR.h"
 #include "HepMC/GenEvent.h"
 #include "HepMC/GenVertex.h"
-#include "DataFormats/Math/interface/deltaR.h"
-
+#include "SimDataFormats/Track/interface/SimTrack.h"
+#include "SimDataFormats/Track/interface/SimTrackContainer.h"
+#include "SimDataFormats/Vertex/interface/SimVertex.h"
+#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
-#include <iostream>
-#include <vector>
-#include <cmath>
-#include <TH1.h>
 #include "TFile.h"
 #include "TObjArray.h"
+#include <TH1.h>
+#include <cmath>
+#include <iostream>
+#include <vector>
 
-template <class T> T sqr( T t) {return t*t;}
-
+template <class T>
+T sqr(T t) {
+  return t * t;
+}
 
 class PixelTrackVal : public edm::EDAnalyzer {
 public:
-  explicit PixelTrackVal(const edm::ParameterSet& conf);
-  ~PixelTrackVal();
-  virtual void beginJob();
-  virtual void analyze(const edm::Event& ev, const edm::EventSetup& es);
-  virtual void endJob();
+  explicit PixelTrackVal(const edm::ParameterSet &conf);
+  ~PixelTrackVal() override;
+  void beginJob() override;
+  void analyze(const edm::Event &ev, const edm::EventSetup &es) override;
+  void endJob() override;
+
 private:
   int verbose_;
   std::string file_;
@@ -48,168 +50,165 @@ class PixelTrackVal : public edm::EDAnalyzer {
   edm::EDGetTokenT<edm::SimVertexContainer> simVertexContainerToken_;
 };
 
-PixelTrackVal::PixelTrackVal(const edm::ParameterSet& conf)
-  : verbose_( conf.getUntrackedParameter<unsigned int>( "Verbosity", 0 ) ) // How noisy?
-  , file_( conf.getUntrackedParameter<std::string>( "HistoFile", "pixelTrackHistos.root" ) )
-  , hList(0)
-  , trackCollectionToken_( consumes<reco::TrackCollection>( edm::InputTag( conf.getParameter<std::string>( "TrackCollection" ) ) ) )
-  , simTrackContainerToken_( consumes<edm::SimTrackContainer>( conf.getParameter<edm::InputTag>( "simG4" ) ) )
-  , simVertexContainerToken_( consumes<edm::SimVertexContainer>( conf.getParameter<edm::InputTag>( "simG4" ) ) )
-{
-  edm::LogInfo("PixelTrackVal")<<" CTOR";
+PixelTrackVal::PixelTrackVal(const edm::ParameterSet &conf)
+    : verbose_(conf.getUntrackedParameter<unsigned int>("Verbosity",
+                                                        0))  // How noisy?
+      ,
+      file_(conf.getUntrackedParameter<std::string>("HistoFile", "pixelTrackHistos.root")),
+      hList(0),
+      trackCollectionToken_(
+          consumes<reco::TrackCollection>(edm::InputTag(conf.getParameter<std::string>("TrackCollection")))),
+      simTrackContainerToken_(consumes<edm::SimTrackContainer>(conf.getParameter<edm::InputTag>("simG4"))),
+      simVertexContainerToken_(consumes<edm::SimVertexContainer>(conf.getParameter<edm::InputTag>("simG4"))) {
+  edm::LogInfo("PixelTrackVal") << " CTOR";
 }
 
-PixelTrackVal::~PixelTrackVal()
-{
-  edm::LogInfo("PixelTrackVal")<<" DTOR";
-}
+PixelTrackVal::~PixelTrackVal() { edm::LogInfo("PixelTrackVal") << " DTOR"; }
 
 void PixelTrackVal::beginJob() {
-  hList.Add( new TH1F("h_Pt","h_Pt",31, -2., 1.2) );
-  hList.Add( new TH1F("h_dR","h_dR",30,0.,0.06) );
-  hList.Add( new TH1F("h_TIP","h_TIP",100,-0.1,0.1) );
-  hList.Add( new TH1F("h_VtxZ","h_VtxZ",100,-0.1,0.1) );
-  hList.Add( new TH1F("h_VtxZ_Pull","h_VtxZ_Pull",80,0.,8) );
-  hList.Add( new TH1F("h_Nan","Illegal values for x,y,z,xx,xy,xz,yy,yz,zz",9,0.5,9.5) );
+  hList.Add(new TH1F("h_Pt", "h_Pt", 31, -2., 1.2));
+  hList.Add(new TH1F("h_dR", "h_dR", 30, 0., 0.06));
+  hList.Add(new TH1F("h_TIP", "h_TIP", 100, -0.1, 0.1));
+  hList.Add(new TH1F("h_VtxZ", "h_VtxZ", 100, -0.1, 0.1));
+  hList.Add(new TH1F("h_VtxZ_Pull", "h_VtxZ_Pull", 80, 0., 8));
+  hList.Add(new TH1F("h_Nan", "Illegal values for x,y,z,xx,xy,xz,yy,yz,zz", 9, 0.5, 9.5));
   hList.SetOwner();
 }
 
-void PixelTrackVal::analyze(
-    const edm::Event& ev, const edm::EventSetup& es)
-{
-
-  std::cout <<"*** PixelTrackVal, analyze event: " << ev.id() << std::endl;
-
+void PixelTrackVal::analyze(const edm::Event &ev, const edm::EventSetup &es) {
+  std::cout << "*** PixelTrackVal, analyze event: " << ev.id() << std::endl;
 
-
-//------------------------ simulated tracks
+  //------------------------ simulated tracks
   edm::Handle<reco::TrackCollection> trackCollection;
-  ev.getByToken(trackCollectionToken_, trackCollection );
+  ev.getByToken(trackCollectionToken_, trackCollection);
   const reco::TrackCollection tracks = *(trackCollection.product());
 
   typedef reco::TrackCollection::const_iterator IT;
 
   if (verbose_ > 0) {
-//    std::cout << *(trackCollection.provenance()) << std::endl;
-    std::cout << "Reconstructed "<< tracks.size() << " tracks" << std::endl;
+    //    std::cout << *(trackCollection.provenance()) << std::endl;
+    std::cout << "Reconstructed " << tracks.size() << " tracks" << std::endl;
   }
 
-  for (unsigned int idx=0; idx<tracks.size(); idx++) {
+  for (unsigned int idx = 0; idx < tracks.size(); idx++) {
+    const reco::Track *it = &tracks[idx];
+    TH1 *h = static_cast<TH1 *>(hList.FindObject("h_Nan"));
+    h->Fill(1., edm::isNotFinite(it->momentum().x()) * 1.);
+    h->Fill(2., edm::isNotFinite(it->momentum().y()) * 1.);
+    h->Fill(3., edm::isNotFinite(it->momentum().z()) * 1.);
 
-    const reco::Track * it= &tracks[idx];
-    TH1* h = static_cast<TH1*>(hList.FindObject("h_Nan"));
-    h->Fill(1.,edm::isNotFinite(it->momentum().x())*1.);
-    h->Fill(2.,edm::isNotFinite(it->momentum().y())*1.);
-    h->Fill(3.,edm::isNotFinite(it->momentum().z())*1.);
-    
     bool problem = false;
     int index = 3;
     for (int i = 0; i != 3; i++) {
       for (int j = i; j != 3; j++) {
-	  index++;
-	  static_cast<TH1*>(hList.FindObject("h_Nan"))->Fill(
-            index*1., edm::isNotFinite(it->covariance(i, j))*1.);
-	  if (edm::isNotFinite(it->covariance(i, j))) problem = true;
-	  // in addition, diagonal element must be positive
-	  if (j == i && it->covariance(i, j) < 0) {
-	    static_cast<TH1*>(hList.FindObject("h_Nan"))->Fill(index*1., 1.);
-	    problem = true;
-	  }
+        index++;
+        static_cast<TH1 *>(hList.FindObject("h_Nan"))->Fill(index * 1., edm::isNotFinite(it->covariance(i, j)) * 1.);
+        if (edm::isNotFinite(it->covariance(i, j)))
+          problem = true;
+        // in addition, diagonal element must be positive
+        if (j == i && it->covariance(i, j) < 0) {
+          static_cast<TH1 *>(hList.FindObject("h_Nan"))->Fill(index * 1., 1.);
+          problem = true;
+        }
       }
     }
-    if (problem) std::cout <<" *** PROBLEM **" << std::endl;
+    if (problem)
+      std::cout << " *** PROBLEM **" << std::endl;
 
     if (verbose_ > 0) {
-      std::cout << "\tmomentum: " << tracks[idx].momentum()
-		<< "\tPT: " << tracks[idx].pt()
-		<< std::endl;
-      std::cout << "\tvertex: " << tracks[idx].vertex()
-		<< "\tTIP: "<< tracks[idx].d0() << " +- " << tracks[idx].d0Error()
-		<< "\tZ0: " << tracks[idx].dz() << " +- " << tracks[idx].dzError()
-		<< std::endl;
+      std::cout << "\tmomentum: " << tracks[idx].momentum() << "\tPT: " << tracks[idx].pt() << std::endl;
+      std::cout << "\tvertex: " << tracks[idx].vertex() << "\tTIP: " << tracks[idx].d0() << " +- "
+                << tracks[idx].d0Error() << "\tZ0: " << tracks[idx].dz() << " +- " << tracks[idx].dzError()
+                << std::endl;
       std::cout << "\tcharge: " << tracks[idx].charge() << std::endl;
     }
   }
 
-//------------------------ simulated vertices and tracks
-   
-   edm::Handle<edm::SimVertexContainer> simVtcs;
-   ev.getByToken( simVertexContainerToken_, simVtcs );
+  //------------------------ simulated vertices and tracks
+
+  edm::Handle<edm::SimVertexContainer> simVtcs;
+  ev.getByToken(simVertexContainerToken_, simVtcs);
 
-//   std::cout << "SimVertex " << simVtcs->size() << std::endl;
-//   for(edm::SimVertexContainer::const_iterator v=simVtcs->begin();
-//       v!=simVtcs->end(); ++v){
-//     std::cout << "simvtx " << std::setw(10) << std::setprecision(3)
-//         << v->position().x() << " " << v->position().y() << " " << v->position().z() << " "
-//         << v->parentIndex() << " " << v->noParent() << " " << std::endl; }
+  //   std::cout << "SimVertex " << simVtcs->size() << std::endl;
+  //   for(edm::SimVertexContainer::const_iterator v=simVtcs->begin();
+  //       v!=simVtcs->end(); ++v){
+  //     std::cout << "simvtx " << std::setw(10) << std::setprecision(3)
+  //         << v->position().x() << " " << v->position().y() << " " <<
+  //         v->position().z() << " "
+  //         << v->parentIndex() << " " << v->noParent() << " " << std::endl; }
 
-   edm::Handle<edm::SimTrackContainer> simTrks;
-   ev.getByToken( simTrackContainerToken_, simTrks );
-   std::cout << "simtrks " << simTrks->size() << std::endl;
+  edm::Handle<edm::SimTrackContainer> simTrks;
+  ev.getByToken(simTrackContainerToken_, simTrks);
+  std::cout << "simtrks " << simTrks->size() << std::endl;
 
-//-------------- association
+  //-------------- association
   // matching cuts from Marcin
-  float detaMax=0.012;
-  float dRMax=0.025;
+  float detaMax = 0.012;
+  float dRMax = 0.025;
   typedef edm::SimTrackContainer::const_iterator IP;
-  for (IP p=simTrks->begin(); p != simTrks->end(); p++) {
-    if ( (*p).noVertex() ) continue;
-    if ( (*p).type() == -99) continue;
-    if ( (*p).vertIndex() != 0) continue;
-
-    math::XYZVector mom_gen( (*p).momentum().x(), (*p).momentum().y(), (*p).momentum().z());
+  for (IP p = simTrks->begin(); p != simTrks->end(); p++) {
+    if ((*p).noVertex())
+      continue;
+    if ((*p).type() == -99)
+      continue;
+    if ((*p).vertIndex() != 0)
+      continue;
+
+    math::XYZVector mom_gen((*p).momentum().x(), (*p).momentum().y(), (*p).momentum().z());
     float phi_gen = (*p).momentum().phi();
-//    float pt_gen = (*p).momentum().Pt();
+    //    float pt_gen = (*p).momentum().Pt();
     float pt_gen = sqrt((*p).momentum().x() * (*p).momentum().x() + (*p).momentum().y() * (*p).momentum().y());
     float eta_gen = (*p).momentum().eta();
     math::XYZTLorentzVectorD vtx((*simVtcs)[p->vertIndex()].position().x(),
                                  (*simVtcs)[p->vertIndex()].position().y(),
                                  (*simVtcs)[p->vertIndex()].position().z(),
                                  (*simVtcs)[p->vertIndex()].position().e());
-    float z_gen  = vtx.z();
+    float z_gen = vtx.z();
 
-//     cout << "\tmomentum: " <<  (*p).momentum()
-//          <<" vtx: "<<(*p).vertIndex()<<" type: "<<(*p).type()
-//          << endl;
+    //     cout << "\tmomentum: " <<  (*p).momentum()
+    //          <<" vtx: "<<(*p).vertIndex()<<" type: "<<(*p).type()
+    //          << endl;
 
     typedef reco::TrackCollection::const_iterator IT;
-    for (IT it=tracks.begin(); it!=tracks.end(); it++) {
+    for (IT it = tracks.begin(); it != tracks.end(); it++) {
       math::XYZVector mom_rec = (*it).momentum();
       float phi_rec = (*it).momentum().phi();
       float pt_rec = (*it).pt();
-      float z_rec  = (*it).vertex().z();
+      float z_rec = (*it).vertex().z();
       float eta_rec = (*it).momentum().eta();
-//    float chi2   = (*it).chi2();
+      //    float chi2   = (*it).chi2();
       float dphi = phi_gen - phi_rec;
-      while (dphi > M_PI) dphi -=2*M_PI;
-      while (dphi < -M_PI) dphi +=2*M_PI;
-      float deta = eta_gen-eta_rec;
-      float dz = z_gen-z_rec;
-      double dR = deltaR( mom_gen, mom_rec);
+      while (dphi > M_PI)
+        dphi -= 2 * M_PI;
+      while (dphi < -M_PI)
+        dphi += 2 * M_PI;
+      float deta = eta_gen - eta_rec;
+      float dz = z_gen - z_rec;
+      double dR = deltaR(mom_gen, mom_rec);
       //
       // matched track
       //
-      if (fabs(deta) < 0.3 && fabs(dphi) < 0.3) 
-        static_cast<TH1*>(hList.FindObject("h_dR"))->Fill( dR);
+      if (fabs(deta) < 0.3 && fabs(dphi) < 0.3)
+        static_cast<TH1 *>(hList.FindObject("h_dR"))->Fill(dR);
       if (fabs(deta) < detaMax && dR < dRMax) {
-        static_cast<TH1*>(hList.FindObject("h_Pt"))->Fill((pt_gen - pt_rec)/pt_gen);
-        static_cast<TH1*>(hList.FindObject("h_TIP"))->Fill( it->d0() );
-        static_cast<TH1*>(hList.FindObject("h_VtxZ"))->Fill( dz );
-        static_cast<TH1*>(hList.FindObject("h_VtxZ_Pull"))->Fill( fabs( dz/it->dzError()) );
+        static_cast<TH1 *>(hList.FindObject("h_Pt"))->Fill((pt_gen - pt_rec) / pt_gen);
+        static_cast<TH1 *>(hList.FindObject("h_TIP"))->Fill(it->d0());
+        static_cast<TH1 *>(hList.FindObject("h_VtxZ"))->Fill(dz);
+        static_cast<TH1 *>(hList.FindObject("h_VtxZ_Pull"))->Fill(fabs(dz / it->dzError()));
       }
     }
-  } 
+  }
 }
 
-void PixelTrackVal::endJob() 
-{
+void PixelTrackVal::endJob() {
   // Make my little tree
-  TFile f(file_.c_str(),"RECREATE");
+  TFile f(file_.c_str(), "RECREATE");
   hList.Write();
   f.Close();
 }
 
-//float PixelTrackVal::deltaRR(const  math::XYZVector & m1, const  math::XYZVector & m2) const
+// float PixelTrackVal::deltaRR(const  math::XYZVector & m1, const
+// math::XYZVector & m2) const
 //{
 //  float dphi = m1.phi()-m2.phi();
 //  while (dphi > 2*M_PI) dphi-=2*M_PI;
@@ -219,5 +218,4 @@ void PixelTrackVal::endJob()
 //  return dr;
 //}
 
-
 DEFINE_FWK_MODULE(PixelTrackVal);
diff --git a/Validation/RecoPixelVertexing/test/PixelVertexVal.cc b/Validation/RecoPixelVertexing/test/PixelVertexVal.cc
index 081d6861173a2..88bcd0640d907 100644
--- a/Validation/RecoPixelVertexing/test/PixelVertexVal.cc
+++ b/Validation/RecoPixelVertexing/test/PixelVertexVal.cc
@@ -1,155 +1,153 @@
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/ServiceRegistry/interface/Service.h"
 
-#include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/TrackReco/interface/Track.h"
-#include "DataFormats/VertexReco/interface/VertexFwd.h"
+#include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/VertexReco/interface/Vertex.h"
+#include "DataFormats/VertexReco/interface/VertexFwd.h"
 
-
-#include "SimDataFormats/Vertex/interface/SimVertex.h"
-#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
-#include "SimDataFormats/Track/interface/SimTrack.h"
-#include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "HepMC/GenEvent.h"
 #include "HepMC/GenVertex.h"
+#include "SimDataFormats/Track/interface/SimTrack.h"
+#include "SimDataFormats/Track/interface/SimTrackContainer.h"
+#include "SimDataFormats/Vertex/interface/SimVertex.h"
+#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
-
-#include <iostream>
-#include <vector>
+#include "TDirectory.h"
+#include "TFile.h"
+#include "TTree.h"
+#include <TH1.h>
 #include <cmath>
+#include <iostream>
 #include <map>
-#include <TH1.h>
-#include "TTree.h"
-#include "TFile.h"
-#include "TDirectory.h"
+#include <vector>
 
 using namespace std;
 
 class PixelVertexVal : public edm::EDAnalyzer {
 public:
-  explicit PixelVertexVal(const edm::ParameterSet& conf);
-  ~PixelVertexVal();
-  virtual void beginJob();
-  virtual void analyze(const edm::Event& ev, const edm::EventSetup& es);
-  virtual void endJob();
+  explicit PixelVertexVal(const edm::ParameterSet &conf);
+  ~PixelVertexVal() override;
+  void beginJob() override;
+  void analyze(const edm::Event &ev, const edm::EventSetup &es) override;
+  void endJob() override;
+
 private:
-  edm::ParameterSet conf_; 
+  edm::ParameterSet conf_;
   int verbose_;
   std::string file_;
-  std::map<std::string, TH1*> h;
+  std::map<std::string, TH1 *> h;
   edm::EDGetTokenT<reco::TrackCollection> trackCollectionToken_;
   edm::EDGetTokenT<reco::VertexCollection> vertexCollectionToken_;
   edm::EDGetTokenT<edm::SimVertexContainer> simVertexContainerToken_;
 };
 
-PixelVertexVal::PixelVertexVal(const edm::ParameterSet& conf)
-  : verbose_( conf.getUntrackedParameter<unsigned int>( "Verbosity", 0 ) ) // How noisy?
-  , file_( conf.getUntrackedParameter<std::string>( "HistoFile","pixelVertexHistos.root" ) )
-  , h()
-  , trackCollectionToken_( consumes<reco::TrackCollection>( edm::InputTag( conf.getParameter<std::string>( "TrackCollection" ) ) ) )
-  , vertexCollectionToken_( consumes<reco::VertexCollection>( edm::InputTag( conf.getParameter<std::string>( "VertexCollection" ) ) ) )
-  , simVertexContainerToken_( consumes<edm::SimVertexContainer>( conf.getParameter<edm::InputTag>( "simG4" ) ) )
-{
-  edm::LogInfo("PixelVertexVal")<<" CTOR";
+PixelVertexVal::PixelVertexVal(const edm::ParameterSet &conf)
+    : verbose_(conf.getUntrackedParameter<unsigned int>("Verbosity",
+                                                        0))  // How noisy?
+      ,
+      file_(conf.getUntrackedParameter<std::string>("HistoFile", "pixelVertexHistos.root")),
+      h(),
+      trackCollectionToken_(
+          consumes<reco::TrackCollection>(edm::InputTag(conf.getParameter<std::string>("TrackCollection")))),
+      vertexCollectionToken_(
+          consumes<reco::VertexCollection>(edm::InputTag(conf.getParameter<std::string>("VertexCollection")))),
+      simVertexContainerToken_(consumes<edm::SimVertexContainer>(conf.getParameter<edm::InputTag>("simG4"))) {
+  edm::LogInfo("PixelVertexVal") << " CTOR";
 }
 
-PixelVertexVal::~PixelVertexVal()
-{
-  edm::LogInfo("PixelVertexVal")<<" DTOR";
-}
+PixelVertexVal::~PixelVertexVal() { edm::LogInfo("PixelVertexVal") << " DTOR"; }
 
 void PixelVertexVal::beginJob() {
   // validation histos
-  h["h_Nbvtx"]= new TH1F("h_nbvtx","nb vertices in event",16,0.,16.);
-  h["h_Nbtrks"]= new TH1F("h_Nbtrks","nb tracks in PV",100,0.,100.);
-  h["h_ResZ"]= new TH1F("resz","residual z",100,-0.1,0.1);
-  h["h_PullZ"]= new TH1F("pullz","pull z",100,-25.,25.);
-  h["h_TrkRes"]= new TH1F("h_TrkRes","h_TrkRes",100,-0.2,0.2);
-  h["h_Eff"]= new TH1F("h_Etff","h_Etff",10,-1.,9.);
-
+  h["h_Nbvtx"] = new TH1F("h_nbvtx", "nb vertices in event", 16, 0., 16.);
+  h["h_Nbtrks"] = new TH1F("h_Nbtrks", "nb tracks in PV", 100, 0., 100.);
+  h["h_ResZ"] = new TH1F("resz", "residual z", 100, -0.1, 0.1);
+  h["h_PullZ"] = new TH1F("pullz", "pull z", 100, -25., 25.);
+  h["h_TrkRes"] = new TH1F("h_TrkRes", "h_TrkRes", 100, -0.2, 0.2);
+  h["h_Eff"] = new TH1F("h_Etff", "h_Etff", 10, -1., 9.);
 }
 
-void PixelVertexVal::analyze(
-    const edm::Event& ev, const edm::EventSetup& es)
-{
-  if (verbose_ > 0) cout <<"------------------------------------------------"<<endl;
-  cout <<"*** PixelVertexVal, analyze event: " << ev.id() << endl;
+void PixelVertexVal::analyze(const edm::Event &ev, const edm::EventSetup &es) {
+  if (verbose_ > 0)
+    cout << "------------------------------------------------" << endl;
+  cout << "*** PixelVertexVal, analyze event: " << ev.id() << endl;
   edm::Handle<reco::TrackCollection> trackCollection;
-  ev.getByToken( trackCollectionToken_, trackCollection );
+  ev.getByToken(trackCollectionToken_, trackCollection);
   const reco::TrackCollection tracks = *(trackCollection.product());
 
   reco::TrackRefVector trks;
 
-//  if (verbose_ > 0) {
-//    std::cout << *(trackCollection.provenance()) << std::endl;
-//    cout << "Reconstructed "<< tracks.size() << " tracks" << std::endl;
-//  }
+  //  if (verbose_ > 0) {
+  //    std::cout << *(trackCollection.provenance()) << std::endl;
+  //    cout << "Reconstructed "<< tracks.size() << " tracks" << std::endl;
+  //  }
 
   edm::Handle<reco::VertexCollection> vertexCollection;
-  ev.getByToken( vertexCollectionToken_, vertexCollection );
+  ev.getByToken(vertexCollectionToken_, vertexCollection);
   const reco::VertexCollection vertexes = *(vertexCollection.product());
   if (verbose_ > 0) {
-//    std::cout << *(vertexCollection.provenance()) << std::endl;
-    cout << "Reconstructed "<< vertexes.size() << " vertexes" << std::endl;
+    //    std::cout << *(vertexCollection.provenance()) << std::endl;
+    cout << "Reconstructed " << vertexes.size() << " vertexes" << std::endl;
   }
 
   edm::Handle<edm::SimVertexContainer> simVtcs;
-  ev.getByToken( simVertexContainerToken_, simVtcs );
+  ev.getByToken(simVertexContainerToken_, simVtcs);
   if (verbose_ > 0) {
-    cout << "simulated vertices: "<< simVtcs->size() << std::endl;
+    cout << "simulated vertices: " << simVtcs->size() << std::endl;
   }
 
-  bool hasPV = (simVtcs->size() > 0 );
-  if (!hasPV) cout << "Event without PV!, skip"<<endl;
+  bool hasPV = (!simVtcs->empty());
+  if (!hasPV)
+    cout << "Event without PV!, skip" << endl;
   float z_PV = hasPV ? (*simVtcs)[0].position().z() : 0.;
 
   int nVertices = vertexes.size();
-  h["h_Nbvtx"]->Fill(nVertices); 
-  if(nVertices >0) h["h_Nbtrks"]->Fill(vertexes[0].tracksSize());
-
+  h["h_Nbvtx"]->Fill(nVertices);
+  if (nVertices > 0)
+    h["h_Nbtrks"]->Fill(vertexes[0].tracksSize());
 
   int ivtx_matched = -1;
   float min_dist = 0.1;
   for (int idx = 0; idx < nVertices; idx++) {
-    float dz = vertexes[idx].position().z() - z_PV; 
-    if ( fabs(dz) < min_dist ) {
-      ivtx_matched = idx; 
+    float dz = vertexes[idx].position().z() - z_PV;
+    if (fabs(dz) < min_dist) {
+      ivtx_matched = idx;
       min_dist = fabs(dz);
     }
   }
-  h["h_Eff"]->Fill(ivtx_matched+0.00001);
-
-  if (ivtx_matched==0) {
-    const reco::Vertex & pv = vertexes[ivtx_matched];
-    float dz =  pv.position().z() - z_PV;
-    h["h_ResZ"]->Fill( dz ); 
-    h["h_PullZ"]->Fill( dz/pv.zError() );
-
-    for (reco::Vertex::trackRef_iterator it=pv.tracks_begin(); it != pv.tracks_end(); it++) {
-//    for (reco::Vertex::track_iterator it=pv.tracks_begin(); it != pv.tracks_end(); it++) {
-//    for (reco::TrackRefVector::iterator it=pv.tracks_begin(); it != pv.tracks_end(); it++) {
-      //h["h_TrkRes"]->Fill((*it)->dz());
+  h["h_Eff"]->Fill(ivtx_matched + 0.00001);
+
+  if (ivtx_matched == 0) {
+    const reco::Vertex &pv = vertexes[ivtx_matched];
+    float dz = pv.position().z() - z_PV;
+    h["h_ResZ"]->Fill(dz);
+    h["h_PullZ"]->Fill(dz / pv.zError());
+
+    for (reco::Vertex::trackRef_iterator it = pv.tracks_begin(); it != pv.tracks_end(); it++) {
+      //    for (reco::Vertex::track_iterator it=pv.tracks_begin(); it !=
+      //    pv.tracks_end(); it++) { for (reco::TrackRefVector::iterator
+      //    it=pv.tracks_begin(); it != pv.tracks_end(); it++) {
+      // h["h_TrkRes"]->Fill((*it)->dz());
       h["h_TrkRes"]->Fill((*it)->vertex().z() - pv.position().z());
     }
   }
-
 }
 
 void PixelVertexVal::endJob() {
-  TFile rootFile(file_.c_str(),"RECREATE");
-  for (std::map<std::string, TH1*>::const_iterator ih= h.begin(); ih != h.end(); ++ih) {
-    TH1 * histo = (*ih).second;
+  TFile rootFile(file_.c_str(), "RECREATE");
+  for (std::map<std::string, TH1 *>::const_iterator ih = h.begin(); ih != h.end(); ++ih) {
+    TH1 *histo = (*ih).second;
     histo->Write();
-    delete histo; 
+    delete histo;
   }
   rootFile.Close();
   h.clear();
diff --git a/Validation/SiOuterTrackerV/interface/OuterTrackerMCHarvester.h b/Validation/SiOuterTrackerV/interface/OuterTrackerMCHarvester.h
index af309b1d67667..c2fb428ac0e2c 100644
--- a/Validation/SiOuterTrackerV/interface/OuterTrackerMCHarvester.h
+++ b/Validation/SiOuterTrackerV/interface/OuterTrackerMCHarvester.h
@@ -1,24 +1,24 @@
 #ifndef OuterTrackerMCHarvester_H
 #define OuterTrackerMCHarvester_H
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "DQMServices/Core/interface/DQMEDHarvester.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 class OuterTrackerMCHarvester : public DQMEDHarvester {
-		public:
-			explicit OuterTrackerMCHarvester(const edm::ParameterSet&);
-			~OuterTrackerMCHarvester() override;
-			void dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) override;
+public:
+  explicit OuterTrackerMCHarvester(const edm::ParameterSet &);
+  ~OuterTrackerMCHarvester() override;
+  void dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) override;
 
-		private:
-			// ----------member data ---------------------------
-			 DQMStore *dbe;
-	};
+private:
+  // ----------member data ---------------------------
+  DQMStore *dbe;
+};
 
 #endif
diff --git a/Validation/SiOuterTrackerV/interface/OuterTrackerMonitorTrackingParticles.h b/Validation/SiOuterTrackerV/interface/OuterTrackerMonitorTrackingParticles.h
index 3c603089d1949..225621e2c0d1b 100644
--- a/Validation/SiOuterTrackerV/interface/OuterTrackerMonitorTrackingParticles.h
+++ b/Validation/SiOuterTrackerV/interface/OuterTrackerMonitorTrackingParticles.h
@@ -1,141 +1,143 @@
 #ifndef SiOuterTrackerV_OuterTrackerMonitorTrackingParticles_h
 #define SiOuterTrackerV_OuterTrackerMonitorTrackingParticles_h
 
-#include <vector>
-#include <memory>
-#include <string>
-#include "FWCore/Utilities/interface/EDGetToken.h"
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/Framework/interface/ESHandle.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
+#include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/Common/interface/DetSetVectorNew.h"
 #include "DataFormats/L1TrackTrigger/interface/TTTypes.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/Framework/interface/Event.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
-#include "SimTracker/TrackTriggerAssociation/interface/TTTrackAssociationMap.h"
-#include "SimTracker/TrackTriggerAssociation/interface/TTStubAssociationMap.h"
 #include "SimTracker/TrackTriggerAssociation/interface/TTClusterAssociationMap.h"
-#include "DataFormats/Common/interface/DetSetVector.h"
-
+#include "SimTracker/TrackTriggerAssociation/interface/TTStubAssociationMap.h"
+#include "SimTracker/TrackTriggerAssociation/interface/TTTrackAssociationMap.h"
+#include <memory>
+#include <string>
+#include <vector>
 
 class DQMStore;
 
 class OuterTrackerMonitorTrackingParticles : public DQMEDAnalyzer {
-
 public:
-  explicit OuterTrackerMonitorTrackingParticles(const edm::ParameterSet&);
+  explicit OuterTrackerMonitorTrackingParticles(const edm::ParameterSet &);
   ~OuterTrackerMonitorTrackingParticles() override;
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
   void bookHistograms(DQMStore::IBooker &, edm::Run const &, edm::EventSetup const &) override;
   int Layer(const float R_, const float Z_) const;
 
-
   // Tracking particle distributions
-  MonitorElement* trackParts_Eta = nullptr;
-  MonitorElement* trackParts_Phi = nullptr;
-  MonitorElement* trackParts_Pt = nullptr;
+  MonitorElement *trackParts_Eta = nullptr;
+  MonitorElement *trackParts_Phi = nullptr;
+  MonitorElement *trackParts_Pt = nullptr;
 
   // Plots for correctly matched tracks
-  MonitorElement* Track_MatchedChi2 = nullptr; //Chi2 for only tracks correctly matched to truth level
-  MonitorElement* Track_MatchedChi2Red = nullptr; //Chi2/dof for only tracks correctly matched to truth level
+  MonitorElement *Track_MatchedChi2 = nullptr;     // Chi2 for only tracks correctly matched to truth level
+  MonitorElement *Track_MatchedChi2Red = nullptr;  // Chi2/dof for only tracks correctly matched to truth level
 
   // pT and eta for efficiency plots
-  MonitorElement* tp_pt = nullptr;  // denominator
-  MonitorElement* tp_pt_zoom = nullptr;  // denominator
-  MonitorElement* tp_eta = nullptr; // denominator
-  MonitorElement* tp_d0 = nullptr; // denominator
-  MonitorElement* tp_VtxR = nullptr; // denominator (also known as vxy)
-  MonitorElement* tp_VtxZ = nullptr; // denominator
-  MonitorElement* match_tp_pt = nullptr; // numerator
-  MonitorElement* match_tp_pt_zoom = nullptr; // numerator
-  MonitorElement* match_tp_eta = nullptr; // numerator
-  MonitorElement* match_tp_d0 = nullptr; // numerator
-  MonitorElement* match_tp_VtxR = nullptr; // numerator (also known as vxy)
-  MonitorElement* match_tp_VtxZ = nullptr; // numerator
+  MonitorElement *tp_pt = nullptr;             // denominator
+  MonitorElement *tp_pt_zoom = nullptr;        // denominator
+  MonitorElement *tp_eta = nullptr;            // denominator
+  MonitorElement *tp_d0 = nullptr;             // denominator
+  MonitorElement *tp_VtxR = nullptr;           // denominator (also known as vxy)
+  MonitorElement *tp_VtxZ = nullptr;           // denominator
+  MonitorElement *match_tp_pt = nullptr;       // numerator
+  MonitorElement *match_tp_pt_zoom = nullptr;  // numerator
+  MonitorElement *match_tp_eta = nullptr;      // numerator
+  MonitorElement *match_tp_d0 = nullptr;       // numerator
+  MonitorElement *match_tp_VtxR = nullptr;     // numerator (also known as vxy)
+  MonitorElement *match_tp_VtxZ = nullptr;     // numerator
 
   // 1D intermediate resolution plots (pT and eta)
-  MonitorElement* res_eta = nullptr; // for all eta and pT
-  MonitorElement* res_pt = nullptr; // for all eta and pT
-  MonitorElement* res_ptRel = nullptr; // for all eta and pT (delta(pT)/pT)
-  MonitorElement* respt_eta0to0p7_pt2to3 = nullptr;
-  MonitorElement* respt_eta0p7to1_pt2to3 = nullptr;
-  MonitorElement* respt_eta1to1p2_pt2to3 = nullptr;
-  MonitorElement* respt_eta1p2to1p6_pt2to3 = nullptr;
-  MonitorElement* respt_eta1p6to2_pt2to3 = nullptr;
-  MonitorElement* respt_eta2to2p4_pt2to3 = nullptr;
-  MonitorElement* respt_eta0to0p7_pt3to8 = nullptr;
-  MonitorElement* respt_eta0p7to1_pt3to8 = nullptr;
-  MonitorElement* respt_eta1to1p2_pt3to8 = nullptr;
-  MonitorElement* respt_eta1p2to1p6_pt3to8 = nullptr;
-  MonitorElement* respt_eta1p6to2_pt3to8 = nullptr;
-  MonitorElement* respt_eta2to2p4_pt3to8 = nullptr;
-  MonitorElement* respt_eta0to0p7_pt8toInf = nullptr;
-  MonitorElement* respt_eta0p7to1_pt8toInf = nullptr;
-  MonitorElement* respt_eta1to1p2_pt8toInf = nullptr;
-  MonitorElement* respt_eta1p2to1p6_pt8toInf = nullptr;
-  MonitorElement* respt_eta1p6to2_pt8toInf = nullptr;
-  MonitorElement* respt_eta2to2p4_pt8toInf = nullptr;
-  MonitorElement* reseta_eta0to0p7 = nullptr;
-  MonitorElement* reseta_eta0p7to1 = nullptr;
-  MonitorElement* reseta_eta1to1p2 = nullptr;
-  MonitorElement* reseta_eta1p2to1p6 = nullptr;
-  MonitorElement* reseta_eta1p6to2 = nullptr;
-  MonitorElement* reseta_eta2to2p4 = nullptr;
-  MonitorElement* resphi_eta0to0p7 = nullptr;
-  MonitorElement* resphi_eta0p7to1 = nullptr;
-  MonitorElement* resphi_eta1to1p2 = nullptr;
-  MonitorElement* resphi_eta1p2to1p6 = nullptr;
-  MonitorElement* resphi_eta1p6to2 = nullptr;
-  MonitorElement* resphi_eta2to2p4 = nullptr;
-  MonitorElement* resVtxZ_eta0to0p7 = nullptr;
-  MonitorElement* resVtxZ_eta0p7to1 = nullptr;
-  MonitorElement* resVtxZ_eta1to1p2 = nullptr;
-  MonitorElement* resVtxZ_eta1p2to1p6 = nullptr;
-  MonitorElement* resVtxZ_eta1p6to2 = nullptr;
-  MonitorElement* resVtxZ_eta2to2p4 = nullptr;
+  MonitorElement *res_eta = nullptr;    // for all eta and pT
+  MonitorElement *res_pt = nullptr;     // for all eta and pT
+  MonitorElement *res_ptRel = nullptr;  // for all eta and pT (delta(pT)/pT)
+  MonitorElement *respt_eta0to0p7_pt2to3 = nullptr;
+  MonitorElement *respt_eta0p7to1_pt2to3 = nullptr;
+  MonitorElement *respt_eta1to1p2_pt2to3 = nullptr;
+  MonitorElement *respt_eta1p2to1p6_pt2to3 = nullptr;
+  MonitorElement *respt_eta1p6to2_pt2to3 = nullptr;
+  MonitorElement *respt_eta2to2p4_pt2to3 = nullptr;
+  MonitorElement *respt_eta0to0p7_pt3to8 = nullptr;
+  MonitorElement *respt_eta0p7to1_pt3to8 = nullptr;
+  MonitorElement *respt_eta1to1p2_pt3to8 = nullptr;
+  MonitorElement *respt_eta1p2to1p6_pt3to8 = nullptr;
+  MonitorElement *respt_eta1p6to2_pt3to8 = nullptr;
+  MonitorElement *respt_eta2to2p4_pt3to8 = nullptr;
+  MonitorElement *respt_eta0to0p7_pt8toInf = nullptr;
+  MonitorElement *respt_eta0p7to1_pt8toInf = nullptr;
+  MonitorElement *respt_eta1to1p2_pt8toInf = nullptr;
+  MonitorElement *respt_eta1p2to1p6_pt8toInf = nullptr;
+  MonitorElement *respt_eta1p6to2_pt8toInf = nullptr;
+  MonitorElement *respt_eta2to2p4_pt8toInf = nullptr;
+  MonitorElement *reseta_eta0to0p7 = nullptr;
+  MonitorElement *reseta_eta0p7to1 = nullptr;
+  MonitorElement *reseta_eta1to1p2 = nullptr;
+  MonitorElement *reseta_eta1p2to1p6 = nullptr;
+  MonitorElement *reseta_eta1p6to2 = nullptr;
+  MonitorElement *reseta_eta2to2p4 = nullptr;
+  MonitorElement *resphi_eta0to0p7 = nullptr;
+  MonitorElement *resphi_eta0p7to1 = nullptr;
+  MonitorElement *resphi_eta1to1p2 = nullptr;
+  MonitorElement *resphi_eta1p2to1p6 = nullptr;
+  MonitorElement *resphi_eta1p6to2 = nullptr;
+  MonitorElement *resphi_eta2to2p4 = nullptr;
+  MonitorElement *resVtxZ_eta0to0p7 = nullptr;
+  MonitorElement *resVtxZ_eta0p7to1 = nullptr;
+  MonitorElement *resVtxZ_eta1to1p2 = nullptr;
+  MonitorElement *resVtxZ_eta1p2to1p6 = nullptr;
+  MonitorElement *resVtxZ_eta1p6to2 = nullptr;
+  MonitorElement *resVtxZ_eta2to2p4 = nullptr;
 
   // For d0
-  MonitorElement* resd0_eta0to0p7 = nullptr;
-  MonitorElement* resd0_eta0p7to1 = nullptr;
-  MonitorElement* resd0_eta1to1p2 = nullptr;
-  MonitorElement* resd0_eta1p2to1p6 = nullptr;
-  MonitorElement* resd0_eta1p6to2 = nullptr;
-  MonitorElement* resd0_eta2to2p4 = nullptr;
-
- private:
-   edm::ParameterSet conf_;
-   edm::EDGetTokenT< std::vector <TrackingParticle> > trackingParticleToken_;
-   edm::EDGetTokenT< edmNew::DetSetVector < TTStub < Ref_Phase2TrackerDigi_ > > > ttStubToken_;
-   edm::EDGetTokenT<std::vector< TTTrack< Ref_Phase2TrackerDigi_ > > >  ttTrackToken_;
-   edm::EDGetTokenT< TTClusterAssociationMap< Ref_Phase2TrackerDigi_ > > ttClusterMCTruthToken_;//MC truth association map for clusters
-   edm::EDGetTokenT< TTStubAssociationMap < Ref_Phase2TrackerDigi_ > > ttStubMCTruthToken_; //MC truth association map for stubs
-   edm::EDGetTokenT< TTTrackAssociationMap< Ref_Phase2TrackerDigi_ > > ttTrackMCTruthToken_;//MC truth association map for tracks
-   int L1Tk_nPar;
-   int L1Tk_minNStub;
-   double L1Tk_maxChi2;
-   double L1Tk_maxChi2dof;
-   int TP_minNStub;
-   double TP_minPt;
-   double TP_maxPt;
-   double TP_maxEta;
-   double TP_maxVtxZ;
-   int TP_select_eventid;
-   std::string topFolderName_;
+  MonitorElement *resd0_eta0to0p7 = nullptr;
+  MonitorElement *resd0_eta0p7to1 = nullptr;
+  MonitorElement *resd0_eta1to1p2 = nullptr;
+  MonitorElement *resd0_eta1p2to1p6 = nullptr;
+  MonitorElement *resd0_eta1p6to2 = nullptr;
+  MonitorElement *resd0_eta2to2p4 = nullptr;
 
-   // The following adds a variable that is the number of layers hit for each tracking particle
-   struct TpStruct{
-     int TpId;
-     std::vector<bool> layer;
-     int Nlayers(){ //Counts how many layers are set to "true" for their hit status
-       int layers=0;
-       for(unsigned l=0; l<layer.size(); ++l) if(layer[l]) ++layers;
-       return layers;
-     }
-   };
+private:
+  edm::ParameterSet conf_;
+  edm::EDGetTokenT<std::vector<TrackingParticle>> trackingParticleToken_;
+  edm::EDGetTokenT<edmNew::DetSetVector<TTStub<Ref_Phase2TrackerDigi_>>> ttStubToken_;
+  edm::EDGetTokenT<std::vector<TTTrack<Ref_Phase2TrackerDigi_>>> ttTrackToken_;
+  edm::EDGetTokenT<TTClusterAssociationMap<Ref_Phase2TrackerDigi_>>
+      ttClusterMCTruthToken_;  // MC truth association map for clusters
+  edm::EDGetTokenT<TTStubAssociationMap<Ref_Phase2TrackerDigi_>>
+      ttStubMCTruthToken_;  // MC truth association map for stubs
+  edm::EDGetTokenT<TTTrackAssociationMap<Ref_Phase2TrackerDigi_>>
+      ttTrackMCTruthToken_;  // MC truth association map for tracks
+  int L1Tk_nPar;
+  int L1Tk_minNStub;
+  double L1Tk_maxChi2;
+  double L1Tk_maxChi2dof;
+  int TP_minNStub;
+  double TP_minPt;
+  double TP_maxPt;
+  double TP_maxEta;
+  double TP_maxVtxZ;
+  int TP_select_eventid;
+  std::string topFolderName_;
 
+  // The following adds a variable that is the number of layers hit for each
+  // tracking particle
+  struct TpStruct {
+    int TpId;
+    std::vector<bool> layer;
+    int Nlayers() {  // Counts how many layers are set to "true" for their hit status
+      int layers = 0;
+      for (unsigned l = 0; l < layer.size(); ++l)
+        if (layer[l])
+          ++layers;
+      return layers;
+    }
+  };
 };
 #endif
diff --git a/Validation/SiOuterTrackerV/plugins/OuterTrackerMonitorTrackingParticles.cc b/Validation/SiOuterTrackerV/plugins/OuterTrackerMonitorTrackingParticles.cc
index fb21c918f9167..3bbea9cb21353 100644
--- a/Validation/SiOuterTrackerV/plugins/OuterTrackerMonitorTrackingParticles.cc
+++ b/Validation/SiOuterTrackerV/plugins/OuterTrackerMonitorTrackingParticles.cc
@@ -1,20 +1,17 @@
 // Package:    SiOuterTrackerV
 // Class:      SiOuterTrackerV
 
-
 // Original Author:  Emily MacDonald
 //
 
 // system include files
+#include <fstream>
+#include <iostream>
 #include <memory>
-#include <vector>
 #include <numeric>
-#include <iostream>
-#include <fstream>
+#include <vector>
 
 // user include files
-#include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/Common/interface/DetSetVectorNew.h"
 #include "DataFormats/Common/interface/Ptr.h"
@@ -26,43 +23,48 @@
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "SimDataFormats/TrackingAnalysis/interface/TrackingParticle.h"
+#include "SimTracker/TrackTriggerAssociation/interface/TTClusterAssociationMap.h"
 #include "SimTracker/TrackTriggerAssociation/interface/TTStubAssociationMap.h"
 #include "SimTracker/TrackTriggerAssociation/interface/TTTrackAssociationMap.h"
-#include "SimTracker/TrackTriggerAssociation/interface/TTClusterAssociationMap.h"
 #include "Validation/SiOuterTrackerV/interface/OuterTrackerMonitorTrackingParticles.h"
 
-
 //
 // constructors and destructor
 //
-OuterTrackerMonitorTrackingParticles::OuterTrackerMonitorTrackingParticles(const edm::ParameterSet& iConfig)
-: conf_(iConfig)
-{
+OuterTrackerMonitorTrackingParticles::OuterTrackerMonitorTrackingParticles(const edm::ParameterSet &iConfig)
+    : conf_(iConfig) {
   topFolderName_ = conf_.getParameter<std::string>("TopFolderName");
-  trackingParticleToken_ = consumes< std::vector < TrackingParticle > >(conf_.getParameter<edm::InputTag>("trackingParticleToken"));
-  ttStubMCTruthToken_ = consumes < TTStubAssociationMap < Ref_Phase2TrackerDigi_ > > (conf_.getParameter<edm::InputTag>("MCTruthStubInputTag"));
-  ttClusterMCTruthToken_ = consumes< TTClusterAssociationMap< Ref_Phase2TrackerDigi_ > >(conf_.getParameter<edm::InputTag>("MCTruthClusterInputTag"));
-  ttTrackMCTruthToken_ = consumes< TTTrackAssociationMap< Ref_Phase2TrackerDigi_ > > (conf_.getParameter<edm::InputTag>("MCTruthTrackInputTag"));
-  ttStubToken_ = consumes < edmNew::DetSetVector < TTStub < Ref_Phase2TrackerDigi_ > > > (conf_.getParameter<edm::InputTag>("StubInputTag"));
-  ttTrackToken_ = consumes< std::vector< TTTrack< Ref_Phase2TrackerDigi_ > > > (conf_.getParameter<edm::InputTag>("TTTracksTag"));
-  L1Tk_nPar        = conf_.getParameter< int >("L1Tk_nPar"); //4 or 5(d0) track parameters
-  L1Tk_minNStub    = conf_.getParameter< int >("L1Tk_minNStub"); //min number of stubs in the track
-  L1Tk_maxChi2     = conf_.getParameter< double >("L1Tk_maxChi2"); //maximum chi2 of the track
-  L1Tk_maxChi2dof  = conf_.getParameter< double >("L1Tk_maxChi2dof"); //maximum chi2/dof of the track
-  TP_minNStub      = conf_.getParameter< int >("TP_minNStub"); //min number of stubs in the tracking particle to consider matching
-  TP_minPt         = conf_.getParameter< double >("TP_minPt"); //min pT to consider matching
-  TP_maxPt         = conf_.getParameter< double >("TP_maxPt"); //max pT to consider matching
-  TP_maxEta        = conf_.getParameter< double >("TP_maxEta"); //max eta to consider matching
-  TP_maxVtxZ         = conf_.getParameter< double >("TP_maxVtxZ"); //max vertZ (or z0) to consider matching
-  TP_select_eventid= conf_.getParameter< int >("TP_select_eventid");} //PI or not
-
-OuterTrackerMonitorTrackingParticles::~OuterTrackerMonitorTrackingParticles()
-{
+  trackingParticleToken_ =
+      consumes<std::vector<TrackingParticle>>(conf_.getParameter<edm::InputTag>("trackingParticleToken"));
+  ttStubMCTruthToken_ =
+      consumes<TTStubAssociationMap<Ref_Phase2TrackerDigi_>>(conf_.getParameter<edm::InputTag>("MCTruthStubInputTag"));
+  ttClusterMCTruthToken_ = consumes<TTClusterAssociationMap<Ref_Phase2TrackerDigi_>>(
+      conf_.getParameter<edm::InputTag>("MCTruthClusterInputTag"));
+  ttTrackMCTruthToken_ = consumes<TTTrackAssociationMap<Ref_Phase2TrackerDigi_>>(
+      conf_.getParameter<edm::InputTag>("MCTruthTrackInputTag"));
+  ttStubToken_ =
+      consumes<edmNew::DetSetVector<TTStub<Ref_Phase2TrackerDigi_>>>(conf_.getParameter<edm::InputTag>("StubInputTag"));
+  ttTrackToken_ =
+      consumes<std::vector<TTTrack<Ref_Phase2TrackerDigi_>>>(conf_.getParameter<edm::InputTag>("TTTracksTag"));
+  L1Tk_nPar = conf_.getParameter<int>("L1Tk_nPar");                 // 4 or 5(d0) track parameters
+  L1Tk_minNStub = conf_.getParameter<int>("L1Tk_minNStub");         // min number of stubs in the track
+  L1Tk_maxChi2 = conf_.getParameter<double>("L1Tk_maxChi2");        // maximum chi2 of the track
+  L1Tk_maxChi2dof = conf_.getParameter<double>("L1Tk_maxChi2dof");  // maximum chi2/dof of the track
+  TP_minNStub = conf_.getParameter<int>("TP_minNStub");             // min number of stubs in the tracking particle to
+                                                                    // consider matching
+  TP_minPt = conf_.getParameter<double>("TP_minPt");                // min pT to consider matching
+  TP_maxPt = conf_.getParameter<double>("TP_maxPt");                // max pT to consider matching
+  TP_maxEta = conf_.getParameter<double>("TP_maxEta");              // max eta to consider matching
+  TP_maxVtxZ = conf_.getParameter<double>("TP_maxVtxZ");            // max vertZ (or z0) to consider matching
+  TP_select_eventid = conf_.getParameter<int>("TP_select_eventid");
+}  // PI or not
+
+OuterTrackerMonitorTrackingParticles::~OuterTrackerMonitorTrackingParticles() {
   // do anything here that needs to be done at desctruction time
   // (e.g. close files, deallocate resources etc.)
 }
@@ -70,34 +72,33 @@ OuterTrackerMonitorTrackingParticles::~OuterTrackerMonitorTrackingParticles()
 // member functions
 
 // ------------ method called for each event  ------------
-void OuterTrackerMonitorTrackingParticles::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup)
-{
-  typename edmNew::DetSetVector< TTStub< Ref_Phase2TrackerDigi_ > >::const_iterator inputIter;
-  typename edmNew::DetSet< TTStub< Ref_Phase2TrackerDigi_ > >::const_iterator contentIter;
+void OuterTrackerMonitorTrackingParticles::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  typename edmNew::DetSetVector<TTStub<Ref_Phase2TrackerDigi_>>::const_iterator inputIter;
+  typename edmNew::DetSet<TTStub<Ref_Phase2TrackerDigi_>>::const_iterator contentIter;
   typedef std::vector<TrackingParticle> TrackingParticleCollection;
 
   // Tracking Particles
-  edm::Handle< std::vector < TrackingParticle > > trackingParticleHandle;
+  edm::Handle<std::vector<TrackingParticle>> trackingParticleHandle;
   iEvent.getByToken(trackingParticleToken_, trackingParticleHandle);
 
   // L1 Primaries
-  edm::Handle< edmNew::DetSetVector< TTStub< Ref_Phase2TrackerDigi_ > > > TTStubHandle;
+  edm::Handle<edmNew::DetSetVector<TTStub<Ref_Phase2TrackerDigi_>>> TTStubHandle;
   iEvent.getByToken(ttStubToken_, TTStubHandle);
-  edm::Handle< std::vector< TTTrack< Ref_Phase2TrackerDigi_ > > > TTTrackHandle;
+  edm::Handle<std::vector<TTTrack<Ref_Phase2TrackerDigi_>>> TTTrackHandle;
   iEvent.getByToken(ttTrackToken_, TTTrackHandle);
 
   // Truth Association Maps
-  edm::Handle< TTTrackAssociationMap< Ref_Phase2TrackerDigi_ > > MCTruthTTTrackHandle;
+  edm::Handle<TTTrackAssociationMap<Ref_Phase2TrackerDigi_>> MCTruthTTTrackHandle;
   iEvent.getByToken(ttTrackMCTruthToken_, MCTruthTTTrackHandle);
-  edm::Handle< TTClusterAssociationMap< Ref_Phase2TrackerDigi_ > > MCTruthTTClusterHandle;
+  edm::Handle<TTClusterAssociationMap<Ref_Phase2TrackerDigi_>> MCTruthTTClusterHandle;
   iEvent.getByToken(ttClusterMCTruthToken_, MCTruthTTClusterHandle);
-  edm::Handle< TTStubAssociationMap< Ref_Phase2TrackerDigi_ > > MCTruthTTStubHandle;
+  edm::Handle<TTStubAssociationMap<Ref_Phase2TrackerDigi_>> MCTruthTTStubHandle;
   iEvent.getByToken(ttStubMCTruthToken_, MCTruthTTStubHandle);
 
   // Geometries
-  edm::ESHandle< TrackerGeometry > tGeometryHandle;
-  const TrackerGeometry* theTrackerGeometry;
-  iSetup.get< TrackerDigiGeometryRecord >().get(tGeometryHandle);
+  edm::ESHandle<TrackerGeometry> tGeometryHandle;
+  const TrackerGeometry *theTrackerGeometry;
+  iSetup.get<TrackerDigiGeometryRecord>().get(tGeometryHandle);
   theTrackerGeometry = tGeometryHandle.product();
 
   // Stub info
@@ -107,29 +108,34 @@ void OuterTrackerMonitorTrackingParticles::analyze(const edm::Event& iEvent, con
   std::vector<float> TTStubs_r;
   std::vector<float> TTStubs_eta;
   std::vector<float> TTStubs_phi;
-  std::vector<int>   TTStubs_tpId; //Relates the stub to its tracking particle
+  std::vector<int> TTStubs_tpId;  // Relates the stub to its tracking particle
 
-  // Tracking particle distribution, to be used for 1D distribution plots with pT>2, abs(eta)<2.4, and num layers hit >=4
-  // These are slightly different quantitites than those used in the track matching!! They have different cuts
+  // Tracking particle distribution, to be used for 1D distribution plots with
+  // pT>2, abs(eta)<2.4, and num layers hit >=4 These are slightly different
+  // quantitites than those used in the track matching!! They have different
+  // cuts
   std::vector<float> v_tp_pt;
   std::vector<float> v_tp_eta;
   std::vector<float> v_tp_phi;
-  std::vector<float> v_tp_nLayers; //Calculated as the number of layers hit
+  std::vector<float> v_tp_nLayers;  // Calculated as the number of layers hit
 
   // Add protection
-  if ( !TTStubHandle.isValid() ) return;
+  if (!TTStubHandle.isValid())
+    return;
 
   // Loop through stubs to determine a link to each stub's tracking particle
-  for (inputIter = TTStubHandle->begin(); inputIter != TTStubHandle->end();++inputIter){
-    for (contentIter = inputIter->begin(); contentIter != inputIter->end(); ++contentIter){
-      edm::Ref< edmNew::DetSetVector< TTStub< Ref_Phase2TrackerDigi_ > >, TTStub< Ref_Phase2TrackerDigi_ > > tempStubRef = edmNew::makeRefTo(TTStubHandle, contentIter);    /// Positions, directions
+  for (inputIter = TTStubHandle->begin(); inputIter != TTStubHandle->end(); ++inputIter) {
+    for (contentIter = inputIter->begin(); contentIter != inputIter->end(); ++contentIter) {
+      edm::Ref<edmNew::DetSetVector<TTStub<Ref_Phase2TrackerDigi_>>, TTStub<Ref_Phase2TrackerDigi_>> tempStubRef =
+          edmNew::makeRefTo(TTStubHandle, contentIter);  /// Positions, directions
 
       DetId detIdStub = theTrackerGeometry->idToDet((tempStubRef->getClusterRef(0))->getDetId())->geographicalId();
-      const MeasurementPoint& mp = (tempStubRef->getClusterRef(0))->findAverageLocalCoordinates();
-      const GeomDet* theGeomDet = theTrackerGeometry->idToDet(detIdStub);
+      const MeasurementPoint &mp = (tempStubRef->getClusterRef(0))->findAverageLocalCoordinates();
+      const GeomDet *theGeomDet = theTrackerGeometry->idToDet(detIdStub);
       Global3DPoint posStub = theGeomDet->surface().toGlobal(theGeomDet->topology().localPosition(mp));
 
-      edm::Ref< edmNew::DetSetVector< TTStub< Ref_Phase2TrackerDigi_  > >, TTStub< Ref_Phase2TrackerDigi_  > > tempStubPtr = edmNew::makeRefTo(TTStubHandle, contentIter);
+      edm::Ref<edmNew::DetSetVector<TTStub<Ref_Phase2TrackerDigi_>>, TTStub<Ref_Phase2TrackerDigi_>> tempStubPtr =
+          edmNew::makeRefTo(TTStubHandle, contentIter);
 
       float stubs_x = posStub.x();
       float stubs_y = posStub.y();
@@ -149,11 +155,11 @@ void OuterTrackerMonitorTrackingParticles::analyze(const edm::Event& iEvent, con
 
       // Retrieve MC association
       bool genuineStub = false;
-      if ( MCTruthTTStubHandle.isValid() ) {
+      if (MCTruthTTStubHandle.isValid()) {
         genuineStub = MCTruthTTStubHandle->isGenuine(tempStubPtr);
       }
       if (genuineStub) {
-        edm::Ptr< TrackingParticle > tpPtr = MCTruthTTStubHandle->findTrackingParticlePtr(tempStubPtr);
+        edm::Ptr<TrackingParticle> tpPtr = MCTruthTTStubHandle->findTrackingParticlePtr(tempStubPtr);
         if (tpPtr.isNonnull()) {
           float x = tpPtr->vertex().x();
           float y = tpPtr->vertex().y();
@@ -164,78 +170,95 @@ void OuterTrackerMonitorTrackingParticles::analyze(const edm::Event& iEvent, con
           int idx = -1;
           int counter = 0;
           // Determine to which tracking particle the stub is associated
-          for (auto it: *trackingParticleHandle){ // Loop over TPs
+          for (auto it : *trackingParticleHandle) {  // Loop over TPs
             counter++;
             float allowedRes = 0.001;
-            if (std::fabs(it.vx()-x)>allowedRes) continue;
-            if (std::fabs(it.vy()-y)>allowedRes) continue;
-            if (std::fabs(it.vz()-z)>allowedRes) continue;
-            if (std::fabs(it.px()-px)>allowedRes) continue;
-            if (std::fabs(it.py()-py)>allowedRes) continue;
-            if (std::fabs(it.pz()-pz)>allowedRes) continue;
-
-            idx=counter;
+            if (std::fabs(it.vx() - x) > allowedRes)
+              continue;
+            if (std::fabs(it.vy() - y) > allowedRes)
+              continue;
+            if (std::fabs(it.vz() - z) > allowedRes)
+              continue;
+            if (std::fabs(it.px() - px) > allowedRes)
+              continue;
+            if (std::fabs(it.py() - py) > allowedRes)
+              continue;
+            if (std::fabs(it.pz() - pz) > allowedRes)
+              continue;
+
+            idx = counter;
           }
-          TTStubs_tpId.back() = idx; // Set the tpId: a link between the stub and its tracking particle
+          TTStubs_tpId.back() = idx;  // Set the tpId: a link between the stub
+                                      // and its tracking particle
         }
       }
-    } // End content iterator
-  } // End input iterator
+    }  // End content iterator
+  }    // End input iterator
 
   // Effectively, a loop through all tracking particles through their stubs
-  // For each tracking particle, will determine whether the layer has a stub (true) or not (false)
+  // For each tracking particle, will determine whether the layer has a stub
+  // (true) or not (false)
   std::vector<TpStruct> TPStructs;
-  for (unsigned j=0;j<TTStubs_tpId.size();j++){ // Loop over all stubs
+  for (unsigned j = 0; j < TTStubs_tpId.size(); j++) {  // Loop over all stubs
     const int ID = TTStubs_tpId[j];
-    if(ID<0) continue;
+    if (ID < 0)
+      continue;
     int pos = -1;
-    int p = 0; // Counter
-    for(auto thisStruct: TPStructs){ // make sure you only assign one tracking particle to one TpStruct
-      if(ID == thisStruct.TpId) {
-        pos = p; break;
+    int p = 0;                           // Counter
+    for (auto thisStruct : TPStructs) {  // make sure you only assign one
+                                         // tracking particle to one TpStruct
+      if (ID == thisStruct.TpId) {
+        pos = p;
+        break;
       }
       p++;
     }
 
-    if (pos<0) { // if you have not yet looped through this tracking particle...
+    if (pos < 0) {  // if you have not yet looped through this tracking particle...
       TpStruct thisTPStruct;
       thisTPStruct.TpId = ID;
       int totalLayers = 11;
-      std::vector<bool> layerElement(totalLayers,false); //set each layer's "hit" status to false
-      thisTPStruct.layer=layerElement;
+      std::vector<bool> layerElement(totalLayers, false);  // set each layer's "hit" status to false
+      thisTPStruct.layer = layerElement;
       TPStructs.push_back(thisTPStruct);
-      pos=TPStructs.size()-1;
+      pos = TPStructs.size() - 1;
     }
-    int l=Layer( TTStubs_r[j],TTStubs_z[j] ); // Send through function Layer, which determines which layer the stub is in
-    if (l>=0) TPStructs[pos].layer[l] = true; // Set the layer that is "hit" to true
-  } // End loop over stubs
+    int l = Layer(TTStubs_r[j],
+                  TTStubs_z[j]);  // Send through function Layer, which
+                                  // determines which layer the stub is in
+    if (l >= 0)
+      TPStructs[pos].layer[l] = true;  // Set the layer that is "hit" to true
+  }                                    // End loop over stubs
 
   // Fill the tracking particle quantities
-  //std::vector< TrackingParticle >::const_iterator iterTP1;
-  for (auto iterTP1: *trackingParticleHandle) {
+  // std::vector< TrackingParticle >::const_iterator iterTP1;
+  for (auto iterTP1 : *trackingParticleHandle) {
     v_tp_pt.push_back(iterTP1.pt());
     v_tp_eta.push_back(iterTP1.eta());
     v_tp_phi.push_back(iterTP1.phi());
-    v_tp_nLayers.push_back(-1);   // Set to dummy values first
+    v_tp_nLayers.push_back(-1);  // Set to dummy values first
   }
 
   // Fill nLayers variable for tracking particles
-  // Loop through tracking particles in special container (TPStructs), add up the number of layers set "true" as an integer value
-  for (auto thisStruct: TPStructs){
+  // Loop through tracking particles in special container (TPStructs), add up
+  // the number of layers set "true" as an integer value
+  for (auto thisStruct : TPStructs) {
     int id = thisStruct.TpId;
-    v_tp_nLayers.at(id-1) = thisStruct.Nlayers();
+    v_tp_nLayers.at(id - 1) = thisStruct.Nlayers();
   }
-  // Includes all tracking particles, different cuts than those used in the efficiency
-  for (unsigned j=0;j<v_tp_eta.size();j++) { //Over all TPs
+  // Includes all tracking particles, different cuts than those used in the
+  // efficiency
+  for (unsigned j = 0; j < v_tp_eta.size(); j++) {  // Over all TPs
     double trkParts_eta = v_tp_eta[j];
-    double trkParts_pt  = v_tp_pt[j];
+    double trkParts_pt = v_tp_pt[j];
     double trkParts_phi = v_tp_phi[j];
-    double trkParts_nLayers = v_tp_nLayers[j]; // the number of layers hit for each tracking particle
+    double trkParts_nLayers = v_tp_nLayers[j];  // the number of layers hit for each tracking particle
 
-    // Fill the 1D distribution plots for tracking particles, to monitor change in stub definition
-    if (std::fabs(trkParts_eta)<2.4 && trkParts_pt>2 && trkParts_nLayers>=4) {
+    // Fill the 1D distribution plots for tracking particles, to monitor change
+    // in stub definition
+    if (std::fabs(trkParts_eta) < 2.4 && trkParts_pt > 2 && trkParts_nLayers >= 4) {
       // Fill 1D distributions
-      trackParts_Pt ->Fill(trkParts_pt);
+      trackParts_Pt->Fill(trkParts_pt);
       trackParts_Eta->Fill(trkParts_eta);
       trackParts_Phi->Fill(trkParts_phi);
     }
@@ -261,85 +284,102 @@ void OuterTrackerMonitorTrackingParticles::analyze(const edm::Event& iEvent, con
   std::vector<int> matchTrk_nStub;
 
   // Add protection
-  if ( !TTTrackHandle.isValid() ) return;
+  if (!TTTrackHandle.isValid())
+    return;
 
   // Loop over tracking particles
   int this_tp = 0;
-  //std::vector< TrackingParticle >::const_iterator iterTP;
-  for (auto iterTP: *trackingParticleHandle) {
-    edm::Ptr< TrackingParticle > tp_ptr(trackingParticleHandle, this_tp);
+  // std::vector< TrackingParticle >::const_iterator iterTP;
+  for (auto iterTP : *trackingParticleHandle) {
+    edm::Ptr<TrackingParticle> tp_ptr(trackingParticleHandle, this_tp);
     this_tp++;
 
     int tmp_eventid = iterTP.eventId().event();
-    float tmp_tp_pt  = iterTP.pt();
+    float tmp_tp_pt = iterTP.pt();
     float tmp_tp_phi = iterTP.phi();
     float tmp_tp_eta = iterTP.eta();
-    float tmp_tp_vz  = iterTP.vz();
-    float tmp_tp_vx  = iterTP.vx();
-    float tmp_tp_vy  = iterTP.vy();
+    float tmp_tp_vz = iterTP.vz();
+    float tmp_tp_vx = iterTP.vx();
+    float tmp_tp_vy = iterTP.vy();
     float tmp_tp_charge = tp_ptr->charge();
     int tmp_tp_pdgid = iterTP.pdgId();
 
     // ----------------------------------------------------------------------------------------------
-    // calculate d0 and VtxZ propagated back to the IP, pass if greater than max VtxZ
-    float tmp_tp_t = tan(2.0*atan(1.0)-2.0*atan(exp(-tmp_tp_eta)));
+    // calculate d0 and VtxZ propagated back to the IP, pass if greater than max
+    // VtxZ
+    float tmp_tp_t = tan(2.0 * atan(1.0) - 2.0 * atan(exp(-tmp_tp_eta)));
     float delx = -tmp_tp_vx;
     float dely = -tmp_tp_vy;
-    float K = 0.01*0.5696 / tmp_tp_pt * tmp_tp_charge; // curvature correction
-    float A = 1./(2. * K);
-    float tmp_tp_x0p = delx - A*sin(tmp_tp_phi);
-    float tmp_tp_y0p = dely + A*cos(tmp_tp_phi);
-    float tmp_tp_rp = sqrt(tmp_tp_x0p*tmp_tp_x0p + tmp_tp_y0p*tmp_tp_y0p);
-    static double pi = 4.0*atan(1.0);
-    float delphi = tmp_tp_phi-atan2(-K*tmp_tp_x0p,K*tmp_tp_y0p);
-    if (delphi<-pi) delphi+=2.0*pi;
-    if (delphi>pi) delphi-=2.0*pi;
-
-    float tmp_tp_VtxZ = tmp_tp_vz+tmp_tp_t*delphi/(2.0*K);
-    float VtxR = sqrt(tmp_tp_vx*tmp_tp_vx + tmp_tp_vy*tmp_tp_vy);
+    float K = 0.01 * 0.5696 / tmp_tp_pt * tmp_tp_charge;  // curvature correction
+    float A = 1. / (2. * K);
+    float tmp_tp_x0p = delx - A * sin(tmp_tp_phi);
+    float tmp_tp_y0p = dely + A * cos(tmp_tp_phi);
+    float tmp_tp_rp = sqrt(tmp_tp_x0p * tmp_tp_x0p + tmp_tp_y0p * tmp_tp_y0p);
+    static double pi = 4.0 * atan(1.0);
+    float delphi = tmp_tp_phi - atan2(-K * tmp_tp_x0p, K * tmp_tp_y0p);
+    if (delphi < -pi)
+      delphi += 2.0 * pi;
+    if (delphi > pi)
+      delphi -= 2.0 * pi;
+
+    float tmp_tp_VtxZ = tmp_tp_vz + tmp_tp_t * delphi / (2.0 * K);
+    float VtxR = sqrt(tmp_tp_vx * tmp_tp_vx + tmp_tp_vy * tmp_tp_vy);
     float tmp_tp_VtxR = VtxR;
-    float tmp_tp_d0 = tmp_tp_charge*tmp_tp_rp - (1. / (2. * K));
+    float tmp_tp_d0 = tmp_tp_charge * tmp_tp_rp - (1. / (2. * K));
 
-    //simpler formula for d0, in cases where the charge is zero: https://github.com/cms-sw/cmssw/blob/master/DataFormats/TrackReco/interface/TrackBase.h
-    float other_d0 = -tmp_tp_vx*sin(tmp_tp_phi)+tmp_tp_vy*cos(tmp_tp_phi);
-    tmp_tp_d0 = tmp_tp_d0*(-1); //fix d0 sign
-    if (K==0){
+    // simpler formula for d0, in cases where the charge is zero:
+    // https://github.com/cms-sw/cmssw/blob/master/DataFormats/TrackReco/interface/TrackBase.h
+    float other_d0 = -tmp_tp_vx * sin(tmp_tp_phi) + tmp_tp_vy * cos(tmp_tp_phi);
+    tmp_tp_d0 = tmp_tp_d0 * (-1);  // fix d0 sign
+    if (K == 0) {
       tmp_tp_d0 = other_d0;
       tmp_tp_VtxZ = tmp_tp_vz;
     }
     int nStubTP = -1;
-    if ( MCTruthTTStubHandle.isValid() ) {
-      std::vector< edm::Ref< edmNew::DetSetVector< TTStub< Ref_Phase2TrackerDigi_ > >, TTStub< Ref_Phase2TrackerDigi_ > > > theStubRefs = MCTruthTTStubHandle->findTTStubRefs(tp_ptr);
-      nStubTP = (int) theStubRefs.size();
+    if (MCTruthTTStubHandle.isValid()) {
+      std::vector<edm::Ref<edmNew::DetSetVector<TTStub<Ref_Phase2TrackerDigi_>>, TTStub<Ref_Phase2TrackerDigi_>>>
+          theStubRefs = MCTruthTTStubHandle->findTTStubRefs(tp_ptr);
+      nStubTP = (int)theStubRefs.size();
     }
 
     // ----------------------------------------------------------------------------------------------
     // look for L1 tracks matched to the tracking particle
-    if (tmp_eventid > 0) continue; //only care about tracking particles from the primary interaction
-    if (std::fabs(tmp_tp_eta) > TP_maxEta) continue;
-    if (std::fabs(tmp_tp_VtxZ) > TP_maxVtxZ) continue;
+    if (tmp_eventid > 0)
+      continue;  // only care about tracking particles from the primary
+                 // interaction
+    if (std::fabs(tmp_tp_eta) > TP_maxEta)
+      continue;
+    if (std::fabs(tmp_tp_VtxZ) > TP_maxVtxZ)
+      continue;
 
     // ----------------------------------------------------------------------------------------------
     // only consider TPs with >= X stubs (configurable option)
-    if ( MCTruthTTClusterHandle.isValid() ) {
-      if (MCTruthTTClusterHandle->findTTClusterRefs(tp_ptr).empty()) continue;
+    if (MCTruthTTClusterHandle.isValid()) {
+      if (MCTruthTTClusterHandle->findTTClusterRefs(tp_ptr).empty())
+        continue;
     }
 
     // To make efficiency plots where the denominator has NO stub cuts
     if (VtxR < 1.0) {
-      tp_pt->Fill(tmp_tp_pt); // pT efficiency has no cut on pT, but includes VtxR cut
-      if(tmp_tp_pt>0 && tmp_tp_pt<=10)tp_pt_zoom->Fill(tmp_tp_pt); // pT efficiency has no cut on pT, but includes VtxR cut
+      tp_pt->Fill(tmp_tp_pt);  // pT efficiency has no cut on pT, but includes VtxR cut
+      if (tmp_tp_pt > 0 && tmp_tp_pt <= 10)
+        tp_pt_zoom->Fill(tmp_tp_pt);  // pT efficiency has no cut on pT, but includes VtxR cut
     }
-    if (tmp_tp_pt < TP_minPt) continue;
-    tp_VtxR->Fill(tmp_tp_VtxR); // VtxR efficiency has no cut on VtxR
-    if (VtxR > 1.0) continue;
+    if (tmp_tp_pt < TP_minPt)
+      continue;
+    tp_VtxR->Fill(tmp_tp_VtxR);  // VtxR efficiency has no cut on VtxR
+    if (VtxR > 1.0)
+      continue;
     tp_eta->Fill(tmp_tp_eta);
     tp_d0->Fill(tmp_tp_d0);
     tp_VtxZ->Fill(tmp_tp_VtxZ);
 
-    if (nStubTP < TP_minNStub) continue;
-    if ( !MCTruthTTTrackHandle.isValid() ) continue;
-    std::vector< edm::Ptr< TTTrack< Ref_Phase2TrackerDigi_ > > > matchedTracks = MCTruthTTTrackHandle->findTTTrackPtrs(tp_ptr);
+    if (nStubTP < TP_minNStub)
+      continue;
+    if (!MCTruthTTTrackHandle.isValid())
+      continue;
+    std::vector<edm::Ptr<TTTrack<Ref_Phase2TrackerDigi_>>> matchedTracks =
+        MCTruthTTTrackHandle->findTTTrackPtrs(tp_ptr);
 
     int nMatch = 0;
     int i_track = -1;
@@ -347,32 +387,37 @@ void OuterTrackerMonitorTrackingParticles::analyze(const edm::Event& iEvent, con
 
     // ----------------------------------------------------------------------------------------------
     // loop over matched L1 tracks
-    // here, "match" means tracks that can be associated to a TrackingParticle with at least one hit of at least one of its clusters
+    // here, "match" means tracks that can be associated to a TrackingParticle
+    // with at least one hit of at least one of its clusters
     // https://twiki.cern.ch/twiki/bin/viewauth/CMS/SLHCTrackerTriggerSWTools#MC_truth_for_TTTrack
     int trkCounter = 0;
-    for (auto thisTrack: matchedTracks) {
+    for (auto thisTrack : matchedTracks) {
       bool tmp_trk_genuine = false;
-      if (MCTruthTTTrackHandle->isGenuine(thisTrack)) tmp_trk_genuine = true;
-      if (!tmp_trk_genuine) continue;
+      if (MCTruthTTTrackHandle->isGenuine(thisTrack))
+        tmp_trk_genuine = true;
+      if (!tmp_trk_genuine)
+        continue;
       // ----------------------------------------------------------------------------------------------
-      // further require L1 track to be (loosely) genuine, that there is only one TP matched to the track
+      // further require L1 track to be (loosely) genuine, that there is only
+      // one TP matched to the track
       // + have >= L1Tk_minNStub stubs for it to be a valid match
       int tmp_trk_nstub = thisTrack->getStubRefs().size();
-      if (tmp_trk_nstub < L1Tk_minNStub) continue;
-      float dmatch_pt  = 999;
+      if (tmp_trk_nstub < L1Tk_minNStub)
+        continue;
+      float dmatch_pt = 999;
       float dmatch_eta = 999;
       float dmatch_phi = 999;
       int match_id = 999;
 
-      edm::Ptr< TrackingParticle > my_tp = MCTruthTTTrackHandle->findTrackingParticlePtr(thisTrack);
-      dmatch_pt  = std::fabs(my_tp->p4().pt() - tmp_tp_pt);
+      edm::Ptr<TrackingParticle> my_tp = MCTruthTTTrackHandle->findTrackingParticlePtr(thisTrack);
+      dmatch_pt = std::fabs(my_tp->p4().pt() - tmp_tp_pt);
       dmatch_eta = std::fabs(my_tp->p4().eta() - tmp_tp_eta);
       dmatch_phi = std::fabs(my_tp->p4().phi() - tmp_tp_phi);
       match_id = my_tp->pdgId();
-      float tmp_trk_chi2dof = (thisTrack->getChi2(L1Tk_nPar)) / (2*tmp_trk_nstub - L1Tk_nPar);
+      float tmp_trk_chi2dof = (thisTrack->getChi2(L1Tk_nPar)) / (2 * tmp_trk_nstub - L1Tk_nPar);
 
       // ensure that track is uniquely matched to the TP we are looking at!
-      if (dmatch_pt<0.1 && dmatch_eta<0.1 && dmatch_phi<0.1 && tmp_tp_pdgid==match_id) {
+      if (dmatch_pt < 0.1 && dmatch_eta < 0.1 && dmatch_phi < 0.1 && tmp_tp_pdgid == match_id) {
         nMatch++;
         if (i_track < 0 || tmp_trk_chi2dof < i_chi2dof) {
           i_track = trkCounter;
@@ -380,35 +425,35 @@ void OuterTrackerMonitorTrackingParticles::analyze(const edm::Event& iEvent, con
         }
       }
       trkCounter++;
-    } // end loop over matched L1 tracks
+    }  // end loop over matched L1 tracks
     // ----------------------------------------------------------------------------------------------
 
     // Get information on the matched tracks
-    float tmp_matchtrk_pt   = -999;
-    float tmp_matchtrk_eta  = -999;
-    float tmp_matchtrk_phi  = -999;
-    float tmp_matchtrk_VtxZ  = -999;
+    float tmp_matchtrk_pt = -999;
+    float tmp_matchtrk_eta = -999;
+    float tmp_matchtrk_phi = -999;
+    float tmp_matchtrk_VtxZ = -999;
     float tmp_matchtrk_chi2 = -999;
     float tmp_matchtrk_chi2R = -999;
-    int tmp_matchTrk_nStub  = -999;
-    float tmp_matchtrk_d0  = -999;
+    int tmp_matchTrk_nStub = -999;
+    float tmp_matchtrk_d0 = -999;
 
     if (nMatch > 0) {
-      tmp_matchtrk_pt    = matchedTracks[i_track]->getMomentum(L1Tk_nPar).perp();
-      tmp_matchtrk_eta   = matchedTracks[i_track]->getMomentum(L1Tk_nPar).eta();
-      tmp_matchtrk_phi   = matchedTracks[i_track]->getMomentum(L1Tk_nPar).phi();
-      tmp_matchtrk_VtxZ    = matchedTracks[i_track]->getPOCA(L1Tk_nPar).z();
-      tmp_matchtrk_chi2  = matchedTracks[i_track]->getChi2(L1Tk_nPar);
+      tmp_matchtrk_pt = matchedTracks[i_track]->getMomentum(L1Tk_nPar).perp();
+      tmp_matchtrk_eta = matchedTracks[i_track]->getMomentum(L1Tk_nPar).eta();
+      tmp_matchtrk_phi = matchedTracks[i_track]->getMomentum(L1Tk_nPar).phi();
+      tmp_matchtrk_VtxZ = matchedTracks[i_track]->getPOCA(L1Tk_nPar).z();
+      tmp_matchtrk_chi2 = matchedTracks[i_track]->getChi2(L1Tk_nPar);
       tmp_matchtrk_chi2R = matchedTracks[i_track]->getChi2Red(L1Tk_nPar);
-      tmp_matchTrk_nStub = (int) matchedTracks[i_track]->getStubRefs().size();
+      tmp_matchTrk_nStub = (int)matchedTracks[i_track]->getStubRefs().size();
 
       Track_MatchedChi2->Fill(tmp_matchtrk_chi2);
       Track_MatchedChi2Red->Fill(tmp_matchtrk_chi2R);
 
-      //for d0
+      // for d0
       float tmp_matchtrk_x0 = matchedTracks[i_track]->getPOCA(L1Tk_nPar).x();
       float tmp_matchtrk_y0 = matchedTracks[i_track]->getPOCA(L1Tk_nPar).y();
-      tmp_matchtrk_d0 = -tmp_matchtrk_x0*sin(tmp_matchtrk_phi) + tmp_matchtrk_y0*cos(tmp_matchtrk_phi);
+      tmp_matchtrk_d0 = -tmp_matchtrk_x0 * sin(tmp_matchtrk_phi) + tmp_matchtrk_y0 * cos(tmp_matchtrk_phi);
     }
 
     trkParts_pt.push_back(tmp_tp_pt);
@@ -423,57 +468,69 @@ void OuterTrackerMonitorTrackingParticles::analyze(const edm::Event& iEvent, con
     trkParts_nStub.push_back(nStubTP);
     trkParts_eventId.push_back(tmp_eventid);
 
-    matchTrk_pt .push_back(tmp_matchtrk_pt);
+    matchTrk_pt.push_back(tmp_matchtrk_pt);
     matchTrk_eta.push_back(tmp_matchtrk_eta);
     matchTrk_phi.push_back(tmp_matchtrk_phi);
-    matchTrk_VtxZ .push_back(tmp_matchtrk_VtxZ);
-    matchTrk_d0 .push_back(tmp_matchtrk_d0);
+    matchTrk_VtxZ.push_back(tmp_matchtrk_VtxZ);
+    matchTrk_d0.push_back(tmp_matchtrk_d0);
 
-    matchTrk_chi2 .push_back(tmp_matchtrk_chi2);
+    matchTrk_chi2.push_back(tmp_matchtrk_chi2);
     matchTrk_nStub.push_back(tmp_matchTrk_nStub);
-  } // End loop over tracking particles
+  }  // End loop over tracking particles
 
-  for (unsigned j=0;j<trkParts_eta.size();j++) { //Over all TPs
-    float eta =  trkParts_eta[j];
+  for (unsigned j = 0; j < trkParts_eta.size(); j++) {  // Over all TPs
+    float eta = trkParts_eta[j];
     float pt = trkParts_pt[j];
     float VtxR = trkParts_VtxR[j];
     float d0 = trkParts_d0[j];
     float VtxZ = trkParts_VtxZ[j];
     float eventId = trkParts_eventId[j];
 
-    // cut on event ID (eventid=0 means the TP is from the primary interaction, so *not* selecting only eventid=0 means including stuff from pileup)
-    if (TP_select_eventid == 0 && eventId != 0) continue;
-    if (VtxR > 1) continue;
-    if (pt < 2) continue;
-    if (pt > TP_maxPt) continue;
-    if (std::fabs(eta) > TP_maxEta) continue;
-    if (trkParts_nMatch[j] < 1) continue; // was the tracking particle matched to a L1 track?
-    if (matchTrk_nStub[j] < L1Tk_minNStub) continue;     // use only tracks with min X stubs
+    // cut on event ID (eventid=0 means the TP is from the primary interaction,
+    // so *not* selecting only eventid=0 means including stuff from pileup)
+    if (TP_select_eventid == 0 && eventId != 0)
+      continue;
+    if (VtxR > 1)
+      continue;
+    if (pt < 2)
+      continue;
+    if (pt > TP_maxPt)
+      continue;
+    if (std::fabs(eta) > TP_maxEta)
+      continue;
+    if (trkParts_nMatch[j] < 1)
+      continue;  // was the tracking particle matched to a L1 track?
+    if (matchTrk_nStub[j] < L1Tk_minNStub)
+      continue;  // use only tracks with min X stubs
 
     // for matched track, retain info on chi2 and chi2/dof
     float chi2 = matchTrk_chi2[j];
-    int ndof = 2*matchTrk_nStub[j]-4;
-    float chi2dof = (float)chi2/ndof;
+    int ndof = 2 * matchTrk_nStub[j] - 4;
+    float chi2dof = (float)chi2 / ndof;
 
-    if (chi2 > L1Tk_maxChi2) continue;     // cut on chi2
-    if (chi2dof > L1Tk_maxChi2dof) continue;
+    if (chi2 > L1Tk_maxChi2)
+      continue;  // cut on chi2
+    if (chi2dof > L1Tk_maxChi2dof)
+      continue;
 
     // fill matched track histograms (if passes all criteria)
     match_tp_pt->Fill(pt);
-    if(pt>0 && pt<=10)match_tp_pt_zoom->Fill(pt);
+    if (pt > 0 && pt <= 10)
+      match_tp_pt_zoom->Fill(pt);
     match_tp_eta->Fill(eta);
     match_tp_d0->Fill(d0);
     match_tp_VtxR->Fill(VtxR);
     match_tp_VtxZ->Fill(VtxZ);
 
-    if (pt < TP_minPt) continue;  //only consider TPs with pt > TP_minPt
+    if (pt < TP_minPt)
+      continue;  // only consider TPs with pt > TP_minPt
     // fill total resolution histograms
-    res_pt->Fill(matchTrk_pt[j]  - trkParts_pt[j]);
-    res_ptRel->Fill((matchTrk_pt[j] - trkParts_pt[j])/trkParts_pt[j]);
+    res_pt->Fill(matchTrk_pt[j] - trkParts_pt[j]);
+    res_ptRel->Fill((matchTrk_pt[j] - trkParts_pt[j]) / trkParts_pt[j]);
     res_eta->Fill(matchTrk_eta[j] - trkParts_eta[j]);
 
     // Eta and pT histograms for resolution
-    float pt_res = (matchTrk_pt[j] - trkParts_pt[j])/trkParts_pt[j];
+    float pt_res = (matchTrk_pt[j] - trkParts_pt[j]) / trkParts_pt[j];
     float eta_res = matchTrk_eta[j] - trkParts_eta[j];
     float phi_res = matchTrk_phi[j] - trkParts_phi[j];
     float VtxZ_res = matchTrk_VtxZ[j] - trkParts_VtxZ[j];
@@ -484,63 +541,76 @@ void OuterTrackerMonitorTrackingParticles::analyze(const edm::Event& iEvent, con
 
     // Fill resolution plots for different abs(eta) bins:
     // (0, 0.7), (0.7, 1.0), (1.0, 1.2), (1.2, 1.6), (1.6, 2.0), (2.0, 2.4)
-    if (std::fabs(tP_eta) >= 0  && std::fabs(tP_eta) < 0.7){
+    if (std::fabs(tP_eta) >= 0 && std::fabs(tP_eta) < 0.7) {
       reseta_eta0to0p7->Fill(eta_res);
       resphi_eta0to0p7->Fill(phi_res);
       resVtxZ_eta0to0p7->Fill(VtxZ_res);
       resd0_eta0to0p7->Fill(d0_res);
-      if (tP_pt >= 2  && tP_pt < 3) respt_eta0to0p7_pt2to3->Fill(pt_res);
-      else if (tP_pt >= 3  && tP_pt < 8) respt_eta0to0p7_pt3to8->Fill(pt_res);
-      else if (tP_pt >= 8) respt_eta0to0p7_pt8toInf->Fill(pt_res);
-    }
-    else if (std::fabs(tP_eta) >= 0.7 && std::fabs(tP_eta) < 1.0){
+      if (tP_pt >= 2 && tP_pt < 3)
+        respt_eta0to0p7_pt2to3->Fill(pt_res);
+      else if (tP_pt >= 3 && tP_pt < 8)
+        respt_eta0to0p7_pt3to8->Fill(pt_res);
+      else if (tP_pt >= 8)
+        respt_eta0to0p7_pt8toInf->Fill(pt_res);
+    } else if (std::fabs(tP_eta) >= 0.7 && std::fabs(tP_eta) < 1.0) {
       reseta_eta0p7to1->Fill(eta_res);
       resphi_eta0p7to1->Fill(phi_res);
       resVtxZ_eta0p7to1->Fill(VtxZ_res);
       resd0_eta0p7to1->Fill(d0_res);
-      if (tP_pt >= 2  && tP_pt < 3) respt_eta0p7to1_pt2to3->Fill(pt_res);
-      else if (tP_pt >= 3  && tP_pt < 8) respt_eta0p7to1_pt3to8->Fill(pt_res);
-      else if (tP_pt >= 8) respt_eta0p7to1_pt8toInf->Fill(pt_res);
-    }
-    else if (std::fabs(tP_eta) >= 1.0 && std::fabs(tP_eta) < 1.2){
+      if (tP_pt >= 2 && tP_pt < 3)
+        respt_eta0p7to1_pt2to3->Fill(pt_res);
+      else if (tP_pt >= 3 && tP_pt < 8)
+        respt_eta0p7to1_pt3to8->Fill(pt_res);
+      else if (tP_pt >= 8)
+        respt_eta0p7to1_pt8toInf->Fill(pt_res);
+    } else if (std::fabs(tP_eta) >= 1.0 && std::fabs(tP_eta) < 1.2) {
       reseta_eta1to1p2->Fill(eta_res);
       resphi_eta1to1p2->Fill(phi_res);
       resVtxZ_eta1to1p2->Fill(VtxZ_res);
       resd0_eta1to1p2->Fill(d0_res);
-      if (tP_pt >= 2  && tP_pt < 3) respt_eta1to1p2_pt2to3->Fill(pt_res);
-      else if (tP_pt >= 3  && tP_pt < 8) respt_eta1to1p2_pt3to8->Fill(pt_res);
-      else if (tP_pt >= 8) respt_eta1to1p2_pt8toInf->Fill(pt_res);
-    }
-    else if (std::fabs(tP_eta) >= 1.2 && std::fabs(tP_eta) < 1.6){
+      if (tP_pt >= 2 && tP_pt < 3)
+        respt_eta1to1p2_pt2to3->Fill(pt_res);
+      else if (tP_pt >= 3 && tP_pt < 8)
+        respt_eta1to1p2_pt3to8->Fill(pt_res);
+      else if (tP_pt >= 8)
+        respt_eta1to1p2_pt8toInf->Fill(pt_res);
+    } else if (std::fabs(tP_eta) >= 1.2 && std::fabs(tP_eta) < 1.6) {
       reseta_eta1p2to1p6->Fill(eta_res);
       resphi_eta1p2to1p6->Fill(phi_res);
       resVtxZ_eta1p2to1p6->Fill(VtxZ_res);
       resd0_eta1p2to1p6->Fill(d0_res);
-      if (tP_pt >= 2  && tP_pt < 3) respt_eta1p2to1p6_pt2to3->Fill(pt_res);
-      else if (tP_pt >= 3  && tP_pt < 8) respt_eta1p2to1p6_pt3to8->Fill(pt_res);
-      else if (tP_pt >= 8) respt_eta1p2to1p6_pt8toInf->Fill(pt_res);
-    }
-    else if (std::fabs(tP_eta) >= 1.6 && std::fabs(tP_eta) < 2.0){
+      if (tP_pt >= 2 && tP_pt < 3)
+        respt_eta1p2to1p6_pt2to3->Fill(pt_res);
+      else if (tP_pt >= 3 && tP_pt < 8)
+        respt_eta1p2to1p6_pt3to8->Fill(pt_res);
+      else if (tP_pt >= 8)
+        respt_eta1p2to1p6_pt8toInf->Fill(pt_res);
+    } else if (std::fabs(tP_eta) >= 1.6 && std::fabs(tP_eta) < 2.0) {
       reseta_eta1p6to2->Fill(eta_res);
       resphi_eta1p6to2->Fill(phi_res);
       resVtxZ_eta1p6to2->Fill(VtxZ_res);
       resd0_eta1p6to2->Fill(d0_res);
-      if (tP_pt >= 2  && tP_pt < 3) respt_eta1p6to2_pt2to3->Fill(pt_res);
-      else if (tP_pt >= 3  && tP_pt < 8) respt_eta1p6to2_pt3to8->Fill(pt_res);
-      else if (tP_pt >= 8) respt_eta1p6to2_pt8toInf->Fill(pt_res);
-    }
-    else if (std::fabs(tP_eta) >= 2.0 && std::fabs(tP_eta) <= 2.4){
+      if (tP_pt >= 2 && tP_pt < 3)
+        respt_eta1p6to2_pt2to3->Fill(pt_res);
+      else if (tP_pt >= 3 && tP_pt < 8)
+        respt_eta1p6to2_pt3to8->Fill(pt_res);
+      else if (tP_pt >= 8)
+        respt_eta1p6to2_pt8toInf->Fill(pt_res);
+    } else if (std::fabs(tP_eta) >= 2.0 && std::fabs(tP_eta) <= 2.4) {
       reseta_eta2to2p4->Fill(eta_res);
       resphi_eta2to2p4->Fill(phi_res);
       resVtxZ_eta2to2p4->Fill(VtxZ_res);
       resd0_eta2to2p4->Fill(d0_res);
-      if (tP_pt >= 2  && tP_pt < 3) respt_eta2to2p4_pt2to3->Fill(pt_res);
-      else if (tP_pt >= 3  && tP_pt < 8) respt_eta2to2p4_pt3to8->Fill(pt_res);
-      else if (tP_pt >= 8) respt_eta2to2p4_pt8toInf->Fill(pt_res);
+      if (tP_pt >= 2 && tP_pt < 3)
+        respt_eta2to2p4_pt2to3->Fill(pt_res);
+      else if (tP_pt >= 3 && tP_pt < 8)
+        respt_eta2to2p4_pt3to8->Fill(pt_res);
+      else if (tP_pt >= 8)
+        respt_eta2to2p4_pt8toInf->Fill(pt_res);
     }
   }
 
-  //Clear all vectors
+  // Clear all vectors
   TTStubs_x.clear();
   TTStubs_y.clear();
   TTStubs_z.clear();
@@ -569,625 +639,690 @@ void OuterTrackerMonitorTrackingParticles::analyze(const edm::Event& iEvent, con
   matchTrk_VtxZ.clear();
   matchTrk_chi2.clear();
   matchTrk_nStub.clear();
-} // end of method
+}  // end of method
 
-// ------------ method called once each job just before starting event loop  ------------
-void OuterTrackerMonitorTrackingParticles::bookHistograms(DQMStore::IBooker &iBooker, edm::Run const & run, edm::EventSetup const & es) {
+// ------------ method called once each job just before starting event loop
+// ------------
+void OuterTrackerMonitorTrackingParticles::bookHistograms(DQMStore::IBooker &iBooker,
+                                                          edm::Run const &run,
+                                                          edm::EventSetup const &es) {
   // Histogram setup and definitions
   std::string HistoName;
-  iBooker.setCurrentFolder(topFolderName_+"/trackParticles");
+  iBooker.setCurrentFolder(topFolderName_ + "/trackParticles");
 
   // 1D: pT
-  edm::ParameterSet psTrackParts_Pt =  conf_.getParameter<edm::ParameterSet>("TH1TrackParts_Pt");
+  edm::ParameterSet psTrackParts_Pt = conf_.getParameter<edm::ParameterSet>("TH1TrackParts_Pt");
   HistoName = "trackParts_Pt";
-  trackParts_Pt = iBooker.book1D(HistoName, HistoName,
-      psTrackParts_Pt.getParameter<int32_t>("Nbinsx"),
-      psTrackParts_Pt.getParameter<double>("xmin"),
-      psTrackParts_Pt.getParameter<double>("xmax"));
+  trackParts_Pt = iBooker.book1D(HistoName,
+                                 HistoName,
+                                 psTrackParts_Pt.getParameter<int32_t>("Nbinsx"),
+                                 psTrackParts_Pt.getParameter<double>("xmin"),
+                                 psTrackParts_Pt.getParameter<double>("xmax"));
   trackParts_Pt->setAxisTitle("p_{T} [GeV]", 1);
   trackParts_Pt->setAxisTitle("# tracking particles", 2);
 
   // 1D: eta
-  edm::ParameterSet psTrackParts_Eta =  conf_.getParameter<edm::ParameterSet>("TH1TrackParts_Eta");
+  edm::ParameterSet psTrackParts_Eta = conf_.getParameter<edm::ParameterSet>("TH1TrackParts_Eta");
   HistoName = "trackParts_Eta";
-  trackParts_Eta = iBooker.book1D(HistoName, HistoName,
-      psTrackParts_Eta.getParameter<int32_t>("Nbinsx"),
-      psTrackParts_Eta.getParameter<double>("xmin"),
-      psTrackParts_Eta.getParameter<double>("xmax"));
+  trackParts_Eta = iBooker.book1D(HistoName,
+                                  HistoName,
+                                  psTrackParts_Eta.getParameter<int32_t>("Nbinsx"),
+                                  psTrackParts_Eta.getParameter<double>("xmin"),
+                                  psTrackParts_Eta.getParameter<double>("xmax"));
   trackParts_Eta->setAxisTitle("#eta", 1);
   trackParts_Eta->setAxisTitle("# tracking particles", 2);
 
-    // 1D: phi
-  edm::ParameterSet psTrackParts_Phi =  conf_.getParameter<edm::ParameterSet>("TH1TrackParts_Phi");
+  // 1D: phi
+  edm::ParameterSet psTrackParts_Phi = conf_.getParameter<edm::ParameterSet>("TH1TrackParts_Phi");
   HistoName = "trackParts_Phi";
-  trackParts_Phi = iBooker.book1D(HistoName, HistoName,
-      psTrackParts_Phi.getParameter<int32_t>("Nbinsx"),
-      psTrackParts_Phi.getParameter<double>("xmin"),
-      psTrackParts_Phi.getParameter<double>("xmax"));
+  trackParts_Phi = iBooker.book1D(HistoName,
+                                  HistoName,
+                                  psTrackParts_Phi.getParameter<int32_t>("Nbinsx"),
+                                  psTrackParts_Phi.getParameter<double>("xmin"),
+                                  psTrackParts_Phi.getParameter<double>("xmax"));
   trackParts_Phi->setAxisTitle("#phi", 1);
   trackParts_Phi->setAxisTitle("# tracking particles", 2);
 
   // For tracks correctly matched to truth-level track
-  iBooker.setCurrentFolder(topFolderName_+"/Tracks");
-  //chi2
-  edm::ParameterSet psTrack_Chi2 =  conf_.getParameter<edm::ParameterSet>("TH1_Track_Chi2");
+  iBooker.setCurrentFolder(topFolderName_ + "/Tracks");
+  // chi2
+  edm::ParameterSet psTrack_Chi2 = conf_.getParameter<edm::ParameterSet>("TH1_Track_Chi2");
   HistoName = "Track_MatchedChi2";
-  Track_MatchedChi2 = iBooker.book1D(HistoName, HistoName,
-      psTrack_Chi2.getParameter<int32_t>("Nbinsx"),
-      psTrack_Chi2.getParameter<double>("xmin"),
-      psTrack_Chi2.getParameter<double>("xmax"));
+  Track_MatchedChi2 = iBooker.book1D(HistoName,
+                                     HistoName,
+                                     psTrack_Chi2.getParameter<int32_t>("Nbinsx"),
+                                     psTrack_Chi2.getParameter<double>("xmin"),
+                                     psTrack_Chi2.getParameter<double>("xmax"));
   Track_MatchedChi2->setAxisTitle("L1 Track #chi^{2}", 1);
   Track_MatchedChi2->setAxisTitle("# Correctly Matched L1 Tracks", 2);
 
-  //chi2Red
-  edm::ParameterSet psTrack_Chi2Red =  conf_.getParameter<edm::ParameterSet>("TH1_Track_Chi2R");
+  // chi2Red
+  edm::ParameterSet psTrack_Chi2Red = conf_.getParameter<edm::ParameterSet>("TH1_Track_Chi2R");
   HistoName = "Track_MatchedChi2Red";
-  Track_MatchedChi2Red = iBooker.book1D(HistoName, HistoName,
-      psTrack_Chi2Red.getParameter<int32_t>("Nbinsx"),
-      psTrack_Chi2Red.getParameter<double>("xmin"),
-      psTrack_Chi2Red.getParameter<double>("xmax"));
+  Track_MatchedChi2Red = iBooker.book1D(HistoName,
+                                        HistoName,
+                                        psTrack_Chi2Red.getParameter<int32_t>("Nbinsx"),
+                                        psTrack_Chi2Red.getParameter<double>("xmin"),
+                                        psTrack_Chi2Red.getParameter<double>("xmax"));
   Track_MatchedChi2Red->setAxisTitle("L1 Track #chi^{2}/ndf", 1);
   Track_MatchedChi2Red->setAxisTitle("# Correctly Matched L1 Tracks", 2);
 
   // 1D plots for efficiency
-  iBooker.setCurrentFolder(topFolderName_+"/Tracks/Efficiency");
-  //pT
-  edm::ParameterSet psEffic_pt =  conf_.getParameter<edm::ParameterSet>("TH1Effic_pt");
+  iBooker.setCurrentFolder(topFolderName_ + "/Tracks/Efficiency");
+  // pT
+  edm::ParameterSet psEffic_pt = conf_.getParameter<edm::ParameterSet>("TH1Effic_pt");
   HistoName = "tp_pt";
-  tp_pt = iBooker.book1D(HistoName, HistoName,
-      psEffic_pt.getParameter<int32_t>("Nbinsx"),
-      psEffic_pt.getParameter<double>("xmin"),
-      psEffic_pt.getParameter<double>("xmax"));
+  tp_pt = iBooker.book1D(HistoName,
+                         HistoName,
+                         psEffic_pt.getParameter<int32_t>("Nbinsx"),
+                         psEffic_pt.getParameter<double>("xmin"),
+                         psEffic_pt.getParameter<double>("xmax"));
   tp_pt->setAxisTitle("p_{T} [GeV]", 1);
   tp_pt->setAxisTitle("# tracking particles", 2);
 
-  //Matched TP's pT
+  // Matched TP's pT
   HistoName = "match_tp_pt";
-  match_tp_pt = iBooker.book1D(HistoName, HistoName,
-      psEffic_pt.getParameter<int32_t>("Nbinsx"),
-      psEffic_pt.getParameter<double>("xmin"),
-      psEffic_pt.getParameter<double>("xmax"));
+  match_tp_pt = iBooker.book1D(HistoName,
+                               HistoName,
+                               psEffic_pt.getParameter<int32_t>("Nbinsx"),
+                               psEffic_pt.getParameter<double>("xmin"),
+                               psEffic_pt.getParameter<double>("xmax"));
   match_tp_pt->setAxisTitle("p_{T} [GeV]", 1);
   match_tp_pt->setAxisTitle("# matched tracking particles", 2);
 
-  //pT zoom (0-10 GeV)
-  edm::ParameterSet psEffic_pt_zoom =  conf_.getParameter<edm::ParameterSet>("TH1Effic_pt_zoom");
+  // pT zoom (0-10 GeV)
+  edm::ParameterSet psEffic_pt_zoom = conf_.getParameter<edm::ParameterSet>("TH1Effic_pt_zoom");
   HistoName = "tp_pt_zoom";
-  tp_pt_zoom = iBooker.book1D(HistoName, HistoName,
-      psEffic_pt_zoom.getParameter<int32_t>("Nbinsx"),
-      psEffic_pt_zoom.getParameter<double>("xmin"),
-      psEffic_pt_zoom.getParameter<double>("xmax"));
+  tp_pt_zoom = iBooker.book1D(HistoName,
+                              HistoName,
+                              psEffic_pt_zoom.getParameter<int32_t>("Nbinsx"),
+                              psEffic_pt_zoom.getParameter<double>("xmin"),
+                              psEffic_pt_zoom.getParameter<double>("xmax"));
   tp_pt_zoom->setAxisTitle("p_{T} [GeV]", 1);
   tp_pt_zoom->setAxisTitle("# tracking particles", 2);
 
-  //Matched pT zoom (0-10 GeV)
+  // Matched pT zoom (0-10 GeV)
   HistoName = "match_tp_pt_zoom";
-  match_tp_pt_zoom = iBooker.book1D(HistoName, HistoName,
-      psEffic_pt_zoom.getParameter<int32_t>("Nbinsx"),
-      psEffic_pt_zoom.getParameter<double>("xmin"),
-      psEffic_pt_zoom.getParameter<double>("xmax"));
+  match_tp_pt_zoom = iBooker.book1D(HistoName,
+                                    HistoName,
+                                    psEffic_pt_zoom.getParameter<int32_t>("Nbinsx"),
+                                    psEffic_pt_zoom.getParameter<double>("xmin"),
+                                    psEffic_pt_zoom.getParameter<double>("xmax"));
   match_tp_pt_zoom->setAxisTitle("p_{T} [GeV]", 1);
   match_tp_pt_zoom->setAxisTitle("# matched tracking particles", 2);
 
-  //eta
-  edm::ParameterSet psEffic_eta =  conf_.getParameter<edm::ParameterSet>("TH1Effic_eta");
+  // eta
+  edm::ParameterSet psEffic_eta = conf_.getParameter<edm::ParameterSet>("TH1Effic_eta");
   HistoName = "tp_eta";
-  tp_eta = iBooker.book1D(HistoName, HistoName,
-      psEffic_eta.getParameter<int32_t>("Nbinsx"),
-      psEffic_eta.getParameter<double>("xmin"),
-      psEffic_eta.getParameter<double>("xmax"));
+  tp_eta = iBooker.book1D(HistoName,
+                          HistoName,
+                          psEffic_eta.getParameter<int32_t>("Nbinsx"),
+                          psEffic_eta.getParameter<double>("xmin"),
+                          psEffic_eta.getParameter<double>("xmax"));
   tp_eta->setAxisTitle("#eta", 1);
   tp_eta->setAxisTitle("# tracking particles", 2);
 
-  //Matched eta
+  // Matched eta
   HistoName = "match_tp_eta";
-  match_tp_eta = iBooker.book1D(HistoName, HistoName,
-      psEffic_eta.getParameter<int32_t>("Nbinsx"),
-      psEffic_eta.getParameter<double>("xmin"),
-      psEffic_eta.getParameter<double>("xmax"));
+  match_tp_eta = iBooker.book1D(HistoName,
+                                HistoName,
+                                psEffic_eta.getParameter<int32_t>("Nbinsx"),
+                                psEffic_eta.getParameter<double>("xmin"),
+                                psEffic_eta.getParameter<double>("xmax"));
   match_tp_eta->setAxisTitle("#eta", 1);
   match_tp_eta->setAxisTitle("# matched tracking particles", 2);
 
-  //d0
-  edm::ParameterSet psEffic_d0 =  conf_.getParameter<edm::ParameterSet>("TH1Effic_d0");
+  // d0
+  edm::ParameterSet psEffic_d0 = conf_.getParameter<edm::ParameterSet>("TH1Effic_d0");
   HistoName = "tp_d0";
-  tp_d0 = iBooker.book1D(HistoName, HistoName,
-      psEffic_d0.getParameter<int32_t>("Nbinsx"),
-      psEffic_d0.getParameter<double>("xmin"),
-      psEffic_d0.getParameter<double>("xmax"));
+  tp_d0 = iBooker.book1D(HistoName,
+                         HistoName,
+                         psEffic_d0.getParameter<int32_t>("Nbinsx"),
+                         psEffic_d0.getParameter<double>("xmin"),
+                         psEffic_d0.getParameter<double>("xmax"));
   tp_d0->setAxisTitle("d_{0} [cm]", 1);
   tp_d0->setAxisTitle("# tracking particles", 2);
 
-  //Matched d0
+  // Matched d0
   HistoName = "match_tp_d0";
-  match_tp_d0 = iBooker.book1D(HistoName, HistoName,
-      psEffic_d0.getParameter<int32_t>("Nbinsx"),
-      psEffic_d0.getParameter<double>("xmin"),
-      psEffic_d0.getParameter<double>("xmax"));
+  match_tp_d0 = iBooker.book1D(HistoName,
+                               HistoName,
+                               psEffic_d0.getParameter<int32_t>("Nbinsx"),
+                               psEffic_d0.getParameter<double>("xmin"),
+                               psEffic_d0.getParameter<double>("xmax"));
   match_tp_d0->setAxisTitle("d_{0} [cm]", 1);
   match_tp_d0->setAxisTitle("# matched tracking particles", 2);
 
-  //VtxR (also known as vxy)
-  edm::ParameterSet psEffic_VtxR =  conf_.getParameter<edm::ParameterSet>("TH1Effic_VtxR");
+  // VtxR (also known as vxy)
+  edm::ParameterSet psEffic_VtxR = conf_.getParameter<edm::ParameterSet>("TH1Effic_VtxR");
   HistoName = "tp_VtxR";
-  tp_VtxR = iBooker.book1D(HistoName, HistoName,
-      psEffic_VtxR.getParameter<int32_t>("Nbinsx"),
-      psEffic_VtxR.getParameter<double>("xmin"),
-      psEffic_VtxR.getParameter<double>("xmax"));
+  tp_VtxR = iBooker.book1D(HistoName,
+                           HistoName,
+                           psEffic_VtxR.getParameter<int32_t>("Nbinsx"),
+                           psEffic_VtxR.getParameter<double>("xmin"),
+                           psEffic_VtxR.getParameter<double>("xmax"));
   tp_VtxR->setAxisTitle("d_{xy} [cm]", 1);
   tp_VtxR->setAxisTitle("# tracking particles", 2);
 
-  //Matched VtxR
+  // Matched VtxR
   HistoName = "match_tp_VtxR";
-  match_tp_VtxR = iBooker.book1D(HistoName, HistoName,
-      psEffic_VtxR.getParameter<int32_t>("Nbinsx"),
-      psEffic_VtxR.getParameter<double>("xmin"),
-      psEffic_VtxR.getParameter<double>("xmax"));
+  match_tp_VtxR = iBooker.book1D(HistoName,
+                                 HistoName,
+                                 psEffic_VtxR.getParameter<int32_t>("Nbinsx"),
+                                 psEffic_VtxR.getParameter<double>("xmin"),
+                                 psEffic_VtxR.getParameter<double>("xmax"));
   match_tp_VtxR->setAxisTitle("d_{xy} [cm]", 1);
   match_tp_VtxR->setAxisTitle("# matched tracking particles", 2);
 
-  //VtxZ
-  edm::ParameterSet psEffic_VtxZ =  conf_.getParameter<edm::ParameterSet>("TH1Effic_VtxZ");
+  // VtxZ
+  edm::ParameterSet psEffic_VtxZ = conf_.getParameter<edm::ParameterSet>("TH1Effic_VtxZ");
   HistoName = "tp_VtxZ";
-  tp_VtxZ = iBooker.book1D(HistoName, HistoName,
-      psEffic_VtxZ.getParameter<int32_t>("Nbinsx"),
-      psEffic_VtxZ.getParameter<double>("xmin"),
-      psEffic_VtxZ.getParameter<double>("xmax"));
+  tp_VtxZ = iBooker.book1D(HistoName,
+                           HistoName,
+                           psEffic_VtxZ.getParameter<int32_t>("Nbinsx"),
+                           psEffic_VtxZ.getParameter<double>("xmin"),
+                           psEffic_VtxZ.getParameter<double>("xmax"));
   tp_VtxZ->setAxisTitle("z_{0} [cm]", 1);
   tp_VtxZ->setAxisTitle("# tracking particles", 2);
 
-  //Matched d0
+  // Matched d0
   HistoName = "match_tp_VtxZ";
-  match_tp_VtxZ = iBooker.book1D(HistoName, HistoName,
-      psEffic_VtxZ.getParameter<int32_t>("Nbinsx"),
-      psEffic_VtxZ.getParameter<double>("xmin"),
-      psEffic_VtxZ.getParameter<double>("xmax"));
+  match_tp_VtxZ = iBooker.book1D(HistoName,
+                                 HistoName,
+                                 psEffic_VtxZ.getParameter<int32_t>("Nbinsx"),
+                                 psEffic_VtxZ.getParameter<double>("xmin"),
+                                 psEffic_VtxZ.getParameter<double>("xmax"));
   match_tp_VtxZ->setAxisTitle("z_{0} [cm]", 1);
   match_tp_VtxZ->setAxisTitle("# matched tracking particles", 2);
 
-  //1D plots for resolution
-  iBooker.setCurrentFolder(topFolderName_+"/Tracks/Resolution");
-  //full pT
-  edm::ParameterSet psRes_pt =  conf_.getParameter<edm::ParameterSet>("TH1Res_pt");
+  // 1D plots for resolution
+  iBooker.setCurrentFolder(topFolderName_ + "/Tracks/Resolution");
+  // full pT
+  edm::ParameterSet psRes_pt = conf_.getParameter<edm::ParameterSet>("TH1Res_pt");
   HistoName = "res_pt";
-  res_pt = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  res_pt = iBooker.book1D(HistoName,
+                          HistoName,
+                          psRes_pt.getParameter<int32_t>("Nbinsx"),
+                          psRes_pt.getParameter<double>("xmin"),
+                          psRes_pt.getParameter<double>("xmax"));
   res_pt->setAxisTitle("p_{T} [GeV]", 1);
   res_pt->setAxisTitle("# tracking particles", 2);
 
-  //Full eta
-  edm::ParameterSet psRes_eta =  conf_.getParameter<edm::ParameterSet>("TH1Res_eta");
+  // Full eta
+  edm::ParameterSet psRes_eta = conf_.getParameter<edm::ParameterSet>("TH1Res_eta");
   HistoName = "res_eta";
-  res_eta = iBooker.book1D(HistoName, HistoName,
-      psRes_eta.getParameter<int32_t>("Nbinsx"),
-      psRes_eta.getParameter<double>("xmin"),
-      psRes_eta.getParameter<double>("xmax"));
+  res_eta = iBooker.book1D(HistoName,
+                           HistoName,
+                           psRes_eta.getParameter<int32_t>("Nbinsx"),
+                           psRes_eta.getParameter<double>("xmin"),
+                           psRes_eta.getParameter<double>("xmax"));
   res_eta->setAxisTitle("#eta", 1);
   res_eta->setAxisTitle("# tracking particles", 2);
 
-  //Relative pT
-  edm::ParameterSet psRes_ptRel =  conf_.getParameter<edm::ParameterSet>("TH1Res_ptRel");
+  // Relative pT
+  edm::ParameterSet psRes_ptRel = conf_.getParameter<edm::ParameterSet>("TH1Res_ptRel");
   HistoName = "res_ptRel";
-  res_ptRel = iBooker.book1D(HistoName, HistoName,
-      psRes_ptRel.getParameter<int32_t>("Nbinsx"),
-      psRes_ptRel.getParameter<double>("xmin"),
-      psRes_ptRel.getParameter<double>("xmax"));
+  res_ptRel = iBooker.book1D(HistoName,
+                             HistoName,
+                             psRes_ptRel.getParameter<int32_t>("Nbinsx"),
+                             psRes_ptRel.getParameter<double>("xmin"),
+                             psRes_ptRel.getParameter<double>("xmax"));
   res_ptRel->setAxisTitle("Relative p_{T} [GeV]", 1);
   res_ptRel->setAxisTitle("# tracking particles", 2);
 
-  //Eta parts (for resolution)
-  //Eta 1 (0 to 0.7)
+  // Eta parts (for resolution)
+  // Eta 1 (0 to 0.7)
   HistoName = "reseta_eta0to0p7";
-  reseta_eta0to0p7 = iBooker.book1D(HistoName, HistoName,
-      psRes_eta.getParameter<int32_t>("Nbinsx"),
-      psRes_eta.getParameter<double>("xmin"),
-      psRes_eta.getParameter<double>("xmax"));
+  reseta_eta0to0p7 = iBooker.book1D(HistoName,
+                                    HistoName,
+                                    psRes_eta.getParameter<int32_t>("Nbinsx"),
+                                    psRes_eta.getParameter<double>("xmin"),
+                                    psRes_eta.getParameter<double>("xmax"));
   reseta_eta0to0p7->setAxisTitle("#eta_{trk} - #eta_{tp}", 1);
   reseta_eta0to0p7->setAxisTitle("# tracking particles", 2);
 
-  //Eta 2 (0.7 to 1.0)
+  // Eta 2 (0.7 to 1.0)
   HistoName = "reseta_eta0p7to1";
-  reseta_eta0p7to1 = iBooker.book1D(HistoName, HistoName,
-      psRes_eta.getParameter<int32_t>("Nbinsx"),
-      psRes_eta.getParameter<double>("xmin"),
-      psRes_eta.getParameter<double>("xmax"));
+  reseta_eta0p7to1 = iBooker.book1D(HistoName,
+                                    HistoName,
+                                    psRes_eta.getParameter<int32_t>("Nbinsx"),
+                                    psRes_eta.getParameter<double>("xmin"),
+                                    psRes_eta.getParameter<double>("xmax"));
   reseta_eta0p7to1->setAxisTitle("#eta_{trk} - #eta_{tp}", 1);
   reseta_eta0p7to1->setAxisTitle("# tracking particles", 2);
 
-  //Eta 3 (1.0 to 1.2)
+  // Eta 3 (1.0 to 1.2)
   HistoName = "reseta_eta1to1p2";
-  reseta_eta1to1p2 = iBooker.book1D(HistoName, HistoName,
-      psRes_eta.getParameter<int32_t>("Nbinsx"),
-      psRes_eta.getParameter<double>("xmin"),
-      psRes_eta.getParameter<double>("xmax"));
+  reseta_eta1to1p2 = iBooker.book1D(HistoName,
+                                    HistoName,
+                                    psRes_eta.getParameter<int32_t>("Nbinsx"),
+                                    psRes_eta.getParameter<double>("xmin"),
+                                    psRes_eta.getParameter<double>("xmax"));
   reseta_eta1to1p2->setAxisTitle("#eta_{trk} - #eta_{tp}", 1);
   reseta_eta1to1p2->setAxisTitle("# tracking particles", 2);
 
-  //Eta 4 (1.2 to 1.6)
+  // Eta 4 (1.2 to 1.6)
   HistoName = "reseta_eta1p2to1p6";
-  reseta_eta1p2to1p6 = iBooker.book1D(HistoName, HistoName,
-      psRes_eta.getParameter<int32_t>("Nbinsx"),
-      psRes_eta.getParameter<double>("xmin"),
-      psRes_eta.getParameter<double>("xmax"));
+  reseta_eta1p2to1p6 = iBooker.book1D(HistoName,
+                                      HistoName,
+                                      psRes_eta.getParameter<int32_t>("Nbinsx"),
+                                      psRes_eta.getParameter<double>("xmin"),
+                                      psRes_eta.getParameter<double>("xmax"));
   reseta_eta1p2to1p6->setAxisTitle("#eta_{trk} - #eta_{tp}", 1);
   reseta_eta1p2to1p6->setAxisTitle("# tracking particles", 2);
 
-  //Eta 5 (1.6 to 2.0)
+  // Eta 5 (1.6 to 2.0)
   HistoName = "reseta_eta1p6to2";
-  reseta_eta1p6to2 = iBooker.book1D(HistoName, HistoName,
-      psRes_eta.getParameter<int32_t>("Nbinsx"),
-      psRes_eta.getParameter<double>("xmin"),
-      psRes_eta.getParameter<double>("xmax"));
+  reseta_eta1p6to2 = iBooker.book1D(HistoName,
+                                    HistoName,
+                                    psRes_eta.getParameter<int32_t>("Nbinsx"),
+                                    psRes_eta.getParameter<double>("xmin"),
+                                    psRes_eta.getParameter<double>("xmax"));
   reseta_eta1p6to2->setAxisTitle("#eta_{trk} - #eta_{tp}", 1);
   reseta_eta1p6to2->setAxisTitle("# tracking particles", 2);
 
-  //Eta 6 (2.0 to 2.4)
+  // Eta 6 (2.0 to 2.4)
   HistoName = "reseta_eta2to2p4";
-  reseta_eta2to2p4 = iBooker.book1D(HistoName, HistoName,
-      psRes_eta.getParameter<int32_t>("Nbinsx"),
-      psRes_eta.getParameter<double>("xmin"),
-      psRes_eta.getParameter<double>("xmax"));
+  reseta_eta2to2p4 = iBooker.book1D(HistoName,
+                                    HistoName,
+                                    psRes_eta.getParameter<int32_t>("Nbinsx"),
+                                    psRes_eta.getParameter<double>("xmin"),
+                                    psRes_eta.getParameter<double>("xmax"));
   reseta_eta2to2p4->setAxisTitle("#eta_{trk} - #eta_{tp}", 1);
   reseta_eta2to2p4->setAxisTitle("# tracking particles", 2);
 
-  //pT parts for resolution (pT res vs eta)
-  //pT a (2 to 3 GeV)
-  //Eta 1 (0 to 0.7)
+  // pT parts for resolution (pT res vs eta)
+  // pT a (2 to 3 GeV)
+  // Eta 1 (0 to 0.7)
   HistoName = "respt_eta0to0p7_pt2to3";
-  respt_eta0to0p7_pt2to3 = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  respt_eta0to0p7_pt2to3 = iBooker.book1D(HistoName,
+                                          HistoName,
+                                          psRes_pt.getParameter<int32_t>("Nbinsx"),
+                                          psRes_pt.getParameter<double>("xmin"),
+                                          psRes_pt.getParameter<double>("xmax"));
   respt_eta0to0p7_pt2to3->setAxisTitle("(p_{T}(trk) - p_{T}(tp))/p_{T}(tp)", 1);
   respt_eta0to0p7_pt2to3->setAxisTitle("# tracking particles", 2);
 
-  //Eta 2 (0.7 to 1.0)
+  // Eta 2 (0.7 to 1.0)
   HistoName = "respt_eta0p7to1_pt2to3";
-  respt_eta0p7to1_pt2to3 = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  respt_eta0p7to1_pt2to3 = iBooker.book1D(HistoName,
+                                          HistoName,
+                                          psRes_pt.getParameter<int32_t>("Nbinsx"),
+                                          psRes_pt.getParameter<double>("xmin"),
+                                          psRes_pt.getParameter<double>("xmax"));
   respt_eta0p7to1_pt2to3->setAxisTitle("(p_{T}(trk) - p_{T}(tp))/p_{T}(tp)", 1);
   respt_eta0p7to1_pt2to3->setAxisTitle("# tracking particles", 2);
 
-  //Eta 3 (1.0 to 1.2)
+  // Eta 3 (1.0 to 1.2)
   HistoName = "respt_eta1to1p2_pt2to3";
-  respt_eta1to1p2_pt2to3 = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  respt_eta1to1p2_pt2to3 = iBooker.book1D(HistoName,
+                                          HistoName,
+                                          psRes_pt.getParameter<int32_t>("Nbinsx"),
+                                          psRes_pt.getParameter<double>("xmin"),
+                                          psRes_pt.getParameter<double>("xmax"));
   respt_eta1to1p2_pt2to3->setAxisTitle("(p_{T}(trk) - p_{T}(tp))/p_{T}(tp)", 1);
   respt_eta1to1p2_pt2to3->setAxisTitle("# tracking particles", 2);
 
-  //Eta 4 (1.2 to 1.6)
+  // Eta 4 (1.2 to 1.6)
   HistoName = "respt_eta1p2to1p6_pt2to3";
-  respt_eta1p2to1p6_pt2to3 = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  respt_eta1p2to1p6_pt2to3 = iBooker.book1D(HistoName,
+                                            HistoName,
+                                            psRes_pt.getParameter<int32_t>("Nbinsx"),
+                                            psRes_pt.getParameter<double>("xmin"),
+                                            psRes_pt.getParameter<double>("xmax"));
   respt_eta1p2to1p6_pt2to3->setAxisTitle("(p_{T}(trk) - p_{T}(tp))/p_{T}(tp)", 1);
   respt_eta1p2to1p6_pt2to3->setAxisTitle("# tracking particles", 2);
 
-  //Eta 5 (1.6 to 2.0)
+  // Eta 5 (1.6 to 2.0)
   HistoName = "respt_eta1p6to2_pt2to3";
-  respt_eta1p6to2_pt2to3 = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  respt_eta1p6to2_pt2to3 = iBooker.book1D(HistoName,
+                                          HistoName,
+                                          psRes_pt.getParameter<int32_t>("Nbinsx"),
+                                          psRes_pt.getParameter<double>("xmin"),
+                                          psRes_pt.getParameter<double>("xmax"));
   respt_eta1p6to2_pt2to3->setAxisTitle("(p_{T}(trk) - p_{T}(tp))/p_{T}(tp)", 1);
   respt_eta1p6to2_pt2to3->setAxisTitle("# tracking particles", 2);
 
-  //Eta 6 (2.0 to 2.4)
+  // Eta 6 (2.0 to 2.4)
   HistoName = "respt_eta2to2p4_pt2to3";
-  respt_eta2to2p4_pt2to3 = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  respt_eta2to2p4_pt2to3 = iBooker.book1D(HistoName,
+                                          HistoName,
+                                          psRes_pt.getParameter<int32_t>("Nbinsx"),
+                                          psRes_pt.getParameter<double>("xmin"),
+                                          psRes_pt.getParameter<double>("xmax"));
   respt_eta2to2p4_pt2to3->setAxisTitle("(p_{T}(trk) - p_{T}(tp))/p_{T}(tp)", 1);
   respt_eta2to2p4_pt2to3->setAxisTitle("# tracking particles", 2);
 
-  //pT b (3 to 8 GeV)
-  //Eta 1 (0 to 0.7)
+  // pT b (3 to 8 GeV)
+  // Eta 1 (0 to 0.7)
   HistoName = "respt_eta0to0p7_pt3to8";
-  respt_eta0to0p7_pt3to8 = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  respt_eta0to0p7_pt3to8 = iBooker.book1D(HistoName,
+                                          HistoName,
+                                          psRes_pt.getParameter<int32_t>("Nbinsx"),
+                                          psRes_pt.getParameter<double>("xmin"),
+                                          psRes_pt.getParameter<double>("xmax"));
   respt_eta0to0p7_pt3to8->setAxisTitle("(p_{T}(trk) - p_{T}(tp))/p_{T}(tp)", 1);
   respt_eta0to0p7_pt3to8->setAxisTitle("# tracking particles", 2);
 
-  //Eta 2 (0.7 to 1.0)
+  // Eta 2 (0.7 to 1.0)
   HistoName = "respt_eta0p7to1_pt3to8";
-  respt_eta0p7to1_pt3to8 = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  respt_eta0p7to1_pt3to8 = iBooker.book1D(HistoName,
+                                          HistoName,
+                                          psRes_pt.getParameter<int32_t>("Nbinsx"),
+                                          psRes_pt.getParameter<double>("xmin"),
+                                          psRes_pt.getParameter<double>("xmax"));
   respt_eta0p7to1_pt3to8->setAxisTitle("(p_{T}(trk) - p_{T}(tp))/p_{T}(tp)", 1);
   respt_eta0p7to1_pt3to8->setAxisTitle("# tracking particles", 2);
 
-  //Eta 3 (1.0 to 1.2)
+  // Eta 3 (1.0 to 1.2)
   HistoName = "respt_eta1to1p2_pt3to8";
-  respt_eta1to1p2_pt3to8 = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  respt_eta1to1p2_pt3to8 = iBooker.book1D(HistoName,
+                                          HistoName,
+                                          psRes_pt.getParameter<int32_t>("Nbinsx"),
+                                          psRes_pt.getParameter<double>("xmin"),
+                                          psRes_pt.getParameter<double>("xmax"));
   respt_eta1to1p2_pt3to8->setAxisTitle("(p_{T}(trk) - p_{T}(tp))/p_{T}(tp)", 1);
   respt_eta1to1p2_pt3to8->setAxisTitle("# tracking particles", 2);
 
-  //Eta 4 (1.2 to 1.6)
+  // Eta 4 (1.2 to 1.6)
   HistoName = "respt_eta1p2to1p6_pt3to8";
-  respt_eta1p2to1p6_pt3to8 = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  respt_eta1p2to1p6_pt3to8 = iBooker.book1D(HistoName,
+                                            HistoName,
+                                            psRes_pt.getParameter<int32_t>("Nbinsx"),
+                                            psRes_pt.getParameter<double>("xmin"),
+                                            psRes_pt.getParameter<double>("xmax"));
   respt_eta1p2to1p6_pt3to8->setAxisTitle("(p_{T}(trk) - p_{T}(tp))/p_{T}(tp)", 1);
   respt_eta1p2to1p6_pt3to8->setAxisTitle("# tracking particles", 2);
 
-  //Eta 5 (1.6 to 2.0)
+  // Eta 5 (1.6 to 2.0)
   HistoName = "respt_eta1p6to2_pt3to8";
-  respt_eta1p6to2_pt3to8 = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  respt_eta1p6to2_pt3to8 = iBooker.book1D(HistoName,
+                                          HistoName,
+                                          psRes_pt.getParameter<int32_t>("Nbinsx"),
+                                          psRes_pt.getParameter<double>("xmin"),
+                                          psRes_pt.getParameter<double>("xmax"));
   respt_eta1p6to2_pt3to8->setAxisTitle("(p_{T}(trk) - p_{T}(tp))/p_{T}(tp)", 1);
   respt_eta1p6to2_pt3to8->setAxisTitle("# tracking particles", 2);
 
-  //Eta 6 (2.0 to 2.4)
+  // Eta 6 (2.0 to 2.4)
   HistoName = "respt_eta2to2p4_pt3to8";
-  respt_eta2to2p4_pt3to8 = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  respt_eta2to2p4_pt3to8 = iBooker.book1D(HistoName,
+                                          HistoName,
+                                          psRes_pt.getParameter<int32_t>("Nbinsx"),
+                                          psRes_pt.getParameter<double>("xmin"),
+                                          psRes_pt.getParameter<double>("xmax"));
   respt_eta2to2p4_pt3to8->setAxisTitle("(p_{T}(trk) - p_{T}(tp))/p_{T}(tp)", 1);
   respt_eta2to2p4_pt3to8->setAxisTitle("# tracking particles", 2);
 
-  //pT c (>8 GeV)
-  //Eta 1 (0 to 0.7)
+  // pT c (>8 GeV)
+  // Eta 1 (0 to 0.7)
   HistoName = "respt_eta0to0p7_pt8toInf";
-  respt_eta0to0p7_pt8toInf = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  respt_eta0to0p7_pt8toInf = iBooker.book1D(HistoName,
+                                            HistoName,
+                                            psRes_pt.getParameter<int32_t>("Nbinsx"),
+                                            psRes_pt.getParameter<double>("xmin"),
+                                            psRes_pt.getParameter<double>("xmax"));
   respt_eta0to0p7_pt8toInf->setAxisTitle("(p_{T}(trk) - p_{T}(tp))/p_{T}(tp)", 1);
   respt_eta0to0p7_pt8toInf->setAxisTitle("# tracking particles", 2);
 
-  //Eta 2 (0.7 to 1.0)
+  // Eta 2 (0.7 to 1.0)
   HistoName = "respt_eta0p7to1_pt8toInf";
-  respt_eta0p7to1_pt8toInf = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  respt_eta0p7to1_pt8toInf = iBooker.book1D(HistoName,
+                                            HistoName,
+                                            psRes_pt.getParameter<int32_t>("Nbinsx"),
+                                            psRes_pt.getParameter<double>("xmin"),
+                                            psRes_pt.getParameter<double>("xmax"));
   respt_eta0p7to1_pt8toInf->setAxisTitle("(p_{T}(trk) - p_{T}(tp))/p_{T}(tp)", 1);
   respt_eta0p7to1_pt8toInf->setAxisTitle("# tracking particles", 2);
 
-  //Eta 3 (1.0 to 1.2)
+  // Eta 3 (1.0 to 1.2)
   HistoName = "respt_eta1to1p2_pt8toInf";
-  respt_eta1to1p2_pt8toInf = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  respt_eta1to1p2_pt8toInf = iBooker.book1D(HistoName,
+                                            HistoName,
+                                            psRes_pt.getParameter<int32_t>("Nbinsx"),
+                                            psRes_pt.getParameter<double>("xmin"),
+                                            psRes_pt.getParameter<double>("xmax"));
   respt_eta1to1p2_pt8toInf->setAxisTitle("(p_{T}(trk) - p_{T}(tp))/p_{T}(tp)", 1);
   respt_eta1to1p2_pt8toInf->setAxisTitle("# tracking particles", 2);
 
-  //Eta 4 (1.2 to 1.6)
+  // Eta 4 (1.2 to 1.6)
   HistoName = "respt_eta1p2to1p6_pt8toInf";
-  respt_eta1p2to1p6_pt8toInf = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  respt_eta1p2to1p6_pt8toInf = iBooker.book1D(HistoName,
+                                              HistoName,
+                                              psRes_pt.getParameter<int32_t>("Nbinsx"),
+                                              psRes_pt.getParameter<double>("xmin"),
+                                              psRes_pt.getParameter<double>("xmax"));
   respt_eta1p2to1p6_pt8toInf->setAxisTitle("(p_{T}(trk) - p_{T}(tp))/p_{T}(tp)", 1);
   respt_eta1p2to1p6_pt8toInf->setAxisTitle("# tracking particles", 2);
 
-  //Eta 5 (1.6 to 2.0)
+  // Eta 5 (1.6 to 2.0)
   HistoName = "respt_eta1p6to2_pt8toInf";
-  respt_eta1p6to2_pt8toInf = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  respt_eta1p6to2_pt8toInf = iBooker.book1D(HistoName,
+                                            HistoName,
+                                            psRes_pt.getParameter<int32_t>("Nbinsx"),
+                                            psRes_pt.getParameter<double>("xmin"),
+                                            psRes_pt.getParameter<double>("xmax"));
   respt_eta1p6to2_pt8toInf->setAxisTitle("(p_{T}(trk) - p_{T}(tp))/p_{T}(tp)", 1);
   respt_eta1p6to2_pt8toInf->setAxisTitle("# tracking particles", 2);
 
-  //Eta 6 (2.0 to 2.4)
+  // Eta 6 (2.0 to 2.4)
   HistoName = "respt_eta2to2p4_pt8toInf";
-  respt_eta2to2p4_pt8toInf = iBooker.book1D(HistoName, HistoName,
-      psRes_pt.getParameter<int32_t>("Nbinsx"),
-      psRes_pt.getParameter<double>("xmin"),
-      psRes_pt.getParameter<double>("xmax"));
+  respt_eta2to2p4_pt8toInf = iBooker.book1D(HistoName,
+                                            HistoName,
+                                            psRes_pt.getParameter<int32_t>("Nbinsx"),
+                                            psRes_pt.getParameter<double>("xmin"),
+                                            psRes_pt.getParameter<double>("xmax"));
   respt_eta2to2p4_pt8toInf->setAxisTitle("(p_{T}(trk) - p_{T}(tp))/p_{T}(tp)", 1);
   respt_eta2to2p4_pt8toInf->setAxisTitle("# tracking particles", 2);
 
-
-  //Phi parts (for resolution)
-  //Eta 1 (0 to 0.7)
-  edm::ParameterSet psRes_phi =  conf_.getParameter<edm::ParameterSet>("TH1Res_phi");
+  // Phi parts (for resolution)
+  // Eta 1 (0 to 0.7)
+  edm::ParameterSet psRes_phi = conf_.getParameter<edm::ParameterSet>("TH1Res_phi");
   HistoName = "resphi_eta0to0p7";
-  resphi_eta0to0p7 = iBooker.book1D(HistoName, HistoName,
-      psRes_phi.getParameter<int32_t>("Nbinsx"),
-      psRes_phi.getParameter<double>("xmin"),
-      psRes_phi.getParameter<double>("xmax"));
+  resphi_eta0to0p7 = iBooker.book1D(HistoName,
+                                    HistoName,
+                                    psRes_phi.getParameter<int32_t>("Nbinsx"),
+                                    psRes_phi.getParameter<double>("xmin"),
+                                    psRes_phi.getParameter<double>("xmax"));
   resphi_eta0to0p7->setAxisTitle("#phi_{trk} - #phi_{tp}", 1);
   resphi_eta0to0p7->setAxisTitle("# tracking particles", 2);
 
-  //Eta 2 (0.7 to 1.0)
+  // Eta 2 (0.7 to 1.0)
   HistoName = "resphi_eta0p7to1";
-  resphi_eta0p7to1 = iBooker.book1D(HistoName, HistoName,
-      psRes_phi.getParameter<int32_t>("Nbinsx"),
-      psRes_phi.getParameter<double>("xmin"),
-      psRes_phi.getParameter<double>("xmax"));
+  resphi_eta0p7to1 = iBooker.book1D(HistoName,
+                                    HistoName,
+                                    psRes_phi.getParameter<int32_t>("Nbinsx"),
+                                    psRes_phi.getParameter<double>("xmin"),
+                                    psRes_phi.getParameter<double>("xmax"));
   resphi_eta0p7to1->setAxisTitle("#phi_{trk} - #phi_{tp}", 1);
   resphi_eta0p7to1->setAxisTitle("# tracking particles", 2);
 
-  //Eta 3 (1.0 to 1.2)
+  // Eta 3 (1.0 to 1.2)
   HistoName = "resphi_eta1to1p2";
-  resphi_eta1to1p2 = iBooker.book1D(HistoName, HistoName,
-      psRes_phi.getParameter<int32_t>("Nbinsx"),
-      psRes_phi.getParameter<double>("xmin"),
-      psRes_phi.getParameter<double>("xmax"));
+  resphi_eta1to1p2 = iBooker.book1D(HistoName,
+                                    HistoName,
+                                    psRes_phi.getParameter<int32_t>("Nbinsx"),
+                                    psRes_phi.getParameter<double>("xmin"),
+                                    psRes_phi.getParameter<double>("xmax"));
   resphi_eta1to1p2->setAxisTitle("#phi_{trk} - #phi_{tp}", 1);
   resphi_eta1to1p2->setAxisTitle("# tracking particles", 2);
 
-  //Eta 4 (1.2 to 1.6)
+  // Eta 4 (1.2 to 1.6)
   HistoName = "resphi_eta1p2to1p6";
-  resphi_eta1p2to1p6 = iBooker.book1D(HistoName, HistoName,
-      psRes_phi.getParameter<int32_t>("Nbinsx"),
-      psRes_phi.getParameter<double>("xmin"),
-      psRes_phi.getParameter<double>("xmax"));
+  resphi_eta1p2to1p6 = iBooker.book1D(HistoName,
+                                      HistoName,
+                                      psRes_phi.getParameter<int32_t>("Nbinsx"),
+                                      psRes_phi.getParameter<double>("xmin"),
+                                      psRes_phi.getParameter<double>("xmax"));
   resphi_eta1p2to1p6->setAxisTitle("#phi_{trk} - #phi_{tp}", 1);
   resphi_eta1p2to1p6->setAxisTitle("# tracking particles", 2);
 
-  //Eta 5 (1.6 to 2.0)
+  // Eta 5 (1.6 to 2.0)
   HistoName = "resphi_eta1p6to2";
-  resphi_eta1p6to2 = iBooker.book1D(HistoName, HistoName,
-      psRes_phi.getParameter<int32_t>("Nbinsx"),
-      psRes_phi.getParameter<double>("xmin"),
-      psRes_phi.getParameter<double>("xmax"));
+  resphi_eta1p6to2 = iBooker.book1D(HistoName,
+                                    HistoName,
+                                    psRes_phi.getParameter<int32_t>("Nbinsx"),
+                                    psRes_phi.getParameter<double>("xmin"),
+                                    psRes_phi.getParameter<double>("xmax"));
   resphi_eta1p6to2->setAxisTitle("#phi_{trk} - #phi_{tp}", 1);
   resphi_eta1p6to2->setAxisTitle("# tracking particles", 2);
 
-  //Eta 6 (2.0 to 2.4)
+  // Eta 6 (2.0 to 2.4)
   HistoName = "resphi_eta2to2p4";
-  resphi_eta2to2p4 = iBooker.book1D(HistoName, HistoName,
-      psRes_phi.getParameter<int32_t>("Nbinsx"),
-      psRes_phi.getParameter<double>("xmin"),
-      psRes_phi.getParameter<double>("xmax"));
+  resphi_eta2to2p4 = iBooker.book1D(HistoName,
+                                    HistoName,
+                                    psRes_phi.getParameter<int32_t>("Nbinsx"),
+                                    psRes_phi.getParameter<double>("xmin"),
+                                    psRes_phi.getParameter<double>("xmax"));
   resphi_eta2to2p4->setAxisTitle("#phi_{trk} - #phi_{tp}", 1);
   resphi_eta2to2p4->setAxisTitle("# tracking particles", 2);
 
-  //VtxZ parts (for resolution)
-  //Eta 1 (0 to 0.7)
-  edm::ParameterSet psRes_VtxZ =  conf_.getParameter<edm::ParameterSet>("TH1Res_VtxZ");
+  // VtxZ parts (for resolution)
+  // Eta 1 (0 to 0.7)
+  edm::ParameterSet psRes_VtxZ = conf_.getParameter<edm::ParameterSet>("TH1Res_VtxZ");
   HistoName = "resVtxZ_eta0to0p7";
-  resVtxZ_eta0to0p7 = iBooker.book1D(HistoName, HistoName,
-      psRes_VtxZ.getParameter<int32_t>("Nbinsx"),
-      psRes_VtxZ.getParameter<double>("xmin"),
-      psRes_VtxZ.getParameter<double>("xmax"));
+  resVtxZ_eta0to0p7 = iBooker.book1D(HistoName,
+                                     HistoName,
+                                     psRes_VtxZ.getParameter<int32_t>("Nbinsx"),
+                                     psRes_VtxZ.getParameter<double>("xmin"),
+                                     psRes_VtxZ.getParameter<double>("xmax"));
   resVtxZ_eta0to0p7->setAxisTitle("VtxZ_{trk} - VtxZ_{tp} [cm]", 1);
   resVtxZ_eta0to0p7->setAxisTitle("# tracking particles", 2);
 
-  //Eta 2 (0.7 to 1.0)
+  // Eta 2 (0.7 to 1.0)
   HistoName = "resVtxZ_eta0p7to1";
-  resVtxZ_eta0p7to1 = iBooker.book1D(HistoName, HistoName,
-      psRes_VtxZ.getParameter<int32_t>("Nbinsx"),
-      psRes_VtxZ.getParameter<double>("xmin"),
-      psRes_VtxZ.getParameter<double>("xmax"));
+  resVtxZ_eta0p7to1 = iBooker.book1D(HistoName,
+                                     HistoName,
+                                     psRes_VtxZ.getParameter<int32_t>("Nbinsx"),
+                                     psRes_VtxZ.getParameter<double>("xmin"),
+                                     psRes_VtxZ.getParameter<double>("xmax"));
   resVtxZ_eta0p7to1->setAxisTitle("VtxZ_{trk} - VtxZ_{tp} [cm]", 1);
   resVtxZ_eta0p7to1->setAxisTitle("# tracking particles", 2);
 
-  //Eta 3 (1.0 to 1.2)
+  // Eta 3 (1.0 to 1.2)
   HistoName = "resVtxZ_eta1to1p2";
-  resVtxZ_eta1to1p2 = iBooker.book1D(HistoName, HistoName,
-      psRes_VtxZ.getParameter<int32_t>("Nbinsx"),
-      psRes_VtxZ.getParameter<double>("xmin"),
-      psRes_VtxZ.getParameter<double>("xmax"));
+  resVtxZ_eta1to1p2 = iBooker.book1D(HistoName,
+                                     HistoName,
+                                     psRes_VtxZ.getParameter<int32_t>("Nbinsx"),
+                                     psRes_VtxZ.getParameter<double>("xmin"),
+                                     psRes_VtxZ.getParameter<double>("xmax"));
   resVtxZ_eta1to1p2->setAxisTitle("VtxZ_{trk} - VtxZ_{tp} [cm]", 1);
   resVtxZ_eta1to1p2->setAxisTitle("# tracking particles", 2);
 
-  //Eta 4 (1.2 to 1.6)
+  // Eta 4 (1.2 to 1.6)
   HistoName = "resVtxZ_eta1p2to1p6";
-  resVtxZ_eta1p2to1p6 = iBooker.book1D(HistoName, HistoName,
-      psRes_VtxZ.getParameter<int32_t>("Nbinsx"),
-      psRes_VtxZ.getParameter<double>("xmin"),
-      psRes_VtxZ.getParameter<double>("xmax"));
+  resVtxZ_eta1p2to1p6 = iBooker.book1D(HistoName,
+                                       HistoName,
+                                       psRes_VtxZ.getParameter<int32_t>("Nbinsx"),
+                                       psRes_VtxZ.getParameter<double>("xmin"),
+                                       psRes_VtxZ.getParameter<double>("xmax"));
   resVtxZ_eta1p2to1p6->setAxisTitle("VtxZ_{trk} - VtxZ_{tp} [cm]", 1);
   resVtxZ_eta1p2to1p6->setAxisTitle("# tracking particles", 2);
 
-  //Eta 5 (1.6 to 2.0)
+  // Eta 5 (1.6 to 2.0)
   HistoName = "resVtxZ_eta1p6to2";
-  resVtxZ_eta1p6to2 = iBooker.book1D(HistoName, HistoName,
-      psRes_VtxZ.getParameter<int32_t>("Nbinsx"),
-      psRes_VtxZ.getParameter<double>("xmin"),
-      psRes_VtxZ.getParameter<double>("xmax"));
+  resVtxZ_eta1p6to2 = iBooker.book1D(HistoName,
+                                     HistoName,
+                                     psRes_VtxZ.getParameter<int32_t>("Nbinsx"),
+                                     psRes_VtxZ.getParameter<double>("xmin"),
+                                     psRes_VtxZ.getParameter<double>("xmax"));
   resVtxZ_eta1p6to2->setAxisTitle("VtxZ_{trk} - VtxZ_{tp} [cm]", 1);
   resVtxZ_eta1p6to2->setAxisTitle("# tracking particles", 2);
 
-  //Eta 6 (2.0 to 2.4)
+  // Eta 6 (2.0 to 2.4)
   HistoName = "resVtxZ_eta2to2p4";
-  resVtxZ_eta2to2p4 = iBooker.book1D(HistoName, HistoName,
-      psRes_VtxZ.getParameter<int32_t>("Nbinsx"),
-      psRes_VtxZ.getParameter<double>("xmin"),
-      psRes_VtxZ.getParameter<double>("xmax"));
+  resVtxZ_eta2to2p4 = iBooker.book1D(HistoName,
+                                     HistoName,
+                                     psRes_VtxZ.getParameter<int32_t>("Nbinsx"),
+                                     psRes_VtxZ.getParameter<double>("xmin"),
+                                     psRes_VtxZ.getParameter<double>("xmax"));
   resVtxZ_eta2to2p4->setAxisTitle("VtxZ_{trk} - VtxZ_{tp} [cm]", 1);
   resVtxZ_eta2to2p4->setAxisTitle("# tracking particles", 2);
 
-  //d0 parts (for resolution)
-  //Eta 1 (0 to 0.7)
-  edm::ParameterSet psRes_d0 =  conf_.getParameter<edm::ParameterSet>("TH1Res_d0");
+  // d0 parts (for resolution)
+  // Eta 1 (0 to 0.7)
+  edm::ParameterSet psRes_d0 = conf_.getParameter<edm::ParameterSet>("TH1Res_d0");
   HistoName = "resd0_eta0to0p7";
-  resd0_eta0to0p7 = iBooker.book1D(HistoName, HistoName,
-      psRes_d0.getParameter<int32_t>("Nbinsx"),
-      psRes_d0.getParameter<double>("xmin"),
-      psRes_d0.getParameter<double>("xmax"));
+  resd0_eta0to0p7 = iBooker.book1D(HistoName,
+                                   HistoName,
+                                   psRes_d0.getParameter<int32_t>("Nbinsx"),
+                                   psRes_d0.getParameter<double>("xmin"),
+                                   psRes_d0.getParameter<double>("xmax"));
   resd0_eta0to0p7->setAxisTitle("d0_{trk} - d0_{tp} [cm]", 1);
   resd0_eta0to0p7->setAxisTitle("# tracking particles", 2);
 
-  //Eta 2 (0.7 to 1.0)
+  // Eta 2 (0.7 to 1.0)
   HistoName = "resd0_eta0p7to1";
-  resd0_eta0p7to1 = iBooker.book1D(HistoName, HistoName,
-      psRes_d0.getParameter<int32_t>("Nbinsx"),
-      psRes_d0.getParameter<double>("xmin"),
-      psRes_d0.getParameter<double>("xmax"));
+  resd0_eta0p7to1 = iBooker.book1D(HistoName,
+                                   HistoName,
+                                   psRes_d0.getParameter<int32_t>("Nbinsx"),
+                                   psRes_d0.getParameter<double>("xmin"),
+                                   psRes_d0.getParameter<double>("xmax"));
   resd0_eta0p7to1->setAxisTitle("d0_{trk} - d0_{tp} [cm]", 1);
   resd0_eta0p7to1->setAxisTitle("# tracking particles", 2);
 
-  //Eta 3 (1.0 to 1.2)
+  // Eta 3 (1.0 to 1.2)
   HistoName = "resd0_eta1to1p2";
-  resd0_eta1to1p2 = iBooker.book1D(HistoName, HistoName,
-      psRes_d0.getParameter<int32_t>("Nbinsx"),
-      psRes_d0.getParameter<double>("xmin"),
-      psRes_d0.getParameter<double>("xmax"));
+  resd0_eta1to1p2 = iBooker.book1D(HistoName,
+                                   HistoName,
+                                   psRes_d0.getParameter<int32_t>("Nbinsx"),
+                                   psRes_d0.getParameter<double>("xmin"),
+                                   psRes_d0.getParameter<double>("xmax"));
   resd0_eta1to1p2->setAxisTitle("d0_{trk} - d0_{tp} [cm]", 1);
   resd0_eta1to1p2->setAxisTitle("# tracking particles", 2);
 
-  //Eta 4 (1.2 to 1.6)
+  // Eta 4 (1.2 to 1.6)
   HistoName = "resd0_eta1p2to1p6";
-  resd0_eta1p2to1p6 = iBooker.book1D(HistoName, HistoName,
-      psRes_d0.getParameter<int32_t>("Nbinsx"),
-      psRes_d0.getParameter<double>("xmin"),
-      psRes_d0.getParameter<double>("xmax"));
+  resd0_eta1p2to1p6 = iBooker.book1D(HistoName,
+                                     HistoName,
+                                     psRes_d0.getParameter<int32_t>("Nbinsx"),
+                                     psRes_d0.getParameter<double>("xmin"),
+                                     psRes_d0.getParameter<double>("xmax"));
   resd0_eta1p2to1p6->setAxisTitle("d0_{trk} - d0_{tp} [cm]", 1);
   resd0_eta1p2to1p6->setAxisTitle("# tracking particles", 2);
 
-  //Eta 5 (1.6 to 2.0)
+  // Eta 5 (1.6 to 2.0)
   HistoName = "resd0_eta1p6to2";
-  resd0_eta1p6to2 = iBooker.book1D(HistoName, HistoName,
-      psRes_d0.getParameter<int32_t>("Nbinsx"),
-      psRes_d0.getParameter<double>("xmin"),
-      psRes_d0.getParameter<double>("xmax"));
+  resd0_eta1p6to2 = iBooker.book1D(HistoName,
+                                   HistoName,
+                                   psRes_d0.getParameter<int32_t>("Nbinsx"),
+                                   psRes_d0.getParameter<double>("xmin"),
+                                   psRes_d0.getParameter<double>("xmax"));
   resd0_eta1p6to2->setAxisTitle("d0_{trk} - d0_{tp} [cm]", 1);
   resd0_eta1p6to2->setAxisTitle("# tracking particles", 2);
 
-  //Eta 6 (2.0 to 2.4)
+  // Eta 6 (2.0 to 2.4)
   HistoName = "resd0_eta2to2p4";
-  resd0_eta2to2p4 = iBooker.book1D(HistoName, HistoName,
-      psRes_d0.getParameter<int32_t>("Nbinsx"),
-      psRes_d0.getParameter<double>("xmin"),
-      psRes_d0.getParameter<double>("xmax"));
+  resd0_eta2to2p4 = iBooker.book1D(HistoName,
+                                   HistoName,
+                                   psRes_d0.getParameter<int32_t>("Nbinsx"),
+                                   psRes_d0.getParameter<double>("xmin"),
+                                   psRes_d0.getParameter<double>("xmax"));
   resd0_eta2to2p4->setAxisTitle("d0_{trk} - d0_{tp} [cm]", 1);
   resd0_eta2to2p4->setAxisTitle("# tracking particles", 2);
 
-} //end of method
+}  // end of method
 
-//Function to determine which layer of the detector the stub is in
+// Function to determine which layer of the detector the stub is in
 int OuterTrackerMonitorTrackingParticles::Layer(const float R_, const float Z_) const {
-  const int sectionNum = 6; //6 layers, 5 discs (per EC) + 1 "disc" for barrel
-  const float Rmin[sectionNum]={20.,33.,48.,65.,82.,105.};
-  const float Rmax[sectionNum]={30.,40.,58.,75.,91.,120.};
-  const float zMin[sectionNum]={0.,125.,145.,165.,200.,240.};
-  int layer=-1;
-  for (int i=5;i>=0;--i){
-    if(std::fabs(Z_)>=zMin[i]){
-      layer=5+i;
+  const int sectionNum = 6;  // 6 layers, 5 discs (per EC) + 1 "disc" for barrel
+  const float Rmin[sectionNum] = {20., 33., 48., 65., 82., 105.};
+  const float Rmax[sectionNum] = {30., 40., 58., 75., 91., 120.};
+  const float zMin[sectionNum] = {0., 125., 145., 165., 200., 240.};
+  int layer = -1;
+  for (int i = 5; i >= 0; --i) {
+    if (std::fabs(Z_) >= zMin[i]) {
+      layer = 5 + i;
       break;
     }
   }
-  if(layer==5) for(unsigned i=0; i<unsigned(sectionNum); ++i){
-    if(R_>Rmin[i] && R_<Rmax[i]){
-      layer=i;
-      break;
+  if (layer == 5)
+    for (unsigned i = 0; i < unsigned(sectionNum); ++i) {
+      if (R_ > Rmin[i] && R_ < Rmax[i]) {
+        layer = i;
+        break;
+      }
     }
-  }
   return layer;
 }
 
diff --git a/Validation/SiOuterTrackerV/src/OuterTrackerMCHarvester.cc b/Validation/SiOuterTrackerV/src/OuterTrackerMCHarvester.cc
index bd61c2fe2d118..a37a1b74e2bca 100644
--- a/Validation/SiOuterTrackerV/src/OuterTrackerMCHarvester.cc
+++ b/Validation/SiOuterTrackerV/src/OuterTrackerMCHarvester.cc
@@ -1,655 +1,714 @@
 #include "Validation/SiOuterTrackerV/interface/OuterTrackerMCHarvester.h"
 
-OuterTrackerMCHarvester::OuterTrackerMCHarvester(const edm::ParameterSet& iConfig)
-{
-}
-
-OuterTrackerMCHarvester::~OuterTrackerMCHarvester()
-{
-}
-
-// ------------ method called once each job just after ending the event loop  ------------
-void OuterTrackerMCHarvester::dqmEndJob(DQMStore::IBooker & ibooker, DQMStore::IGetter & igetter) {
-	using namespace edm;
-
-	// Global variables
-	TF1* fit = new TF1("fit", "gaus", -0.01,0.01);
-	TF1* fit2 = new TF1("fit2", "gaus", -0.1,0.1);
-	TF1* fit3 = new TF1("fit3", "gaus", -1,1);
-
-	std::vector<double> sigma_pt1;
-	std::vector<double> error_pt1;
-	std::vector<double> sigma_pt2;
-	std::vector<double> error_pt2;
-	std::vector<double> sigma_pt3;
-	std::vector<double> error_pt3;
-	std::vector<double> sigma_eta;
-	std::vector<double> error_eta;
-	std::vector<double> sigma_phi;
-	std::vector<double> error_phi;
-	std::vector<double> sigma_VtxZ;
-	std::vector<double> error_VtxZ;
-	std::vector<double> sigma_d0;
-	std::vector<double> error_d0;
-
-	float eta_bins[]={0.0,0.7,1.0,1.2,1.6,2.0,2.4};
-	int eta_binnum = 6;
-
-	dbe = nullptr;
-	dbe = edm::Service<DQMStore>().operator->();
-
-	if (dbe) {
-		// Find all monitor elements for histograms
-		MonitorElement *meN_eta = dbe->get("SiOuterTrackerV/Tracks/Efficiency/match_tp_eta");
-		MonitorElement *meD_eta = dbe->get("SiOuterTrackerV/Tracks/Efficiency/tp_eta");
-		MonitorElement *meN_pt = dbe->get("SiOuterTrackerV/Tracks/Efficiency/match_tp_pt");
-		MonitorElement *meD_pt = dbe->get("SiOuterTrackerV/Tracks/Efficiency/tp_pt");
-		MonitorElement *meN_pt_zoom = dbe->get("SiOuterTrackerV/Tracks/Efficiency/match_tp_pt_zoom");
-		MonitorElement *meD_pt_zoom = dbe->get("SiOuterTrackerV/Tracks/Efficiency/tp_pt_zoom");
-		MonitorElement *meN_d0 = dbe->get("SiOuterTrackerV/Tracks/Efficiency/match_tp_d0");
-		MonitorElement *meD_d0 = dbe->get("SiOuterTrackerV/Tracks/Efficiency/tp_d0");
-		MonitorElement *meN_VtxR = dbe->get("SiOuterTrackerV/Tracks/Efficiency/match_tp_VtxR");
-		MonitorElement *meD_VtxR = dbe->get("SiOuterTrackerV/Tracks/Efficiency/tp_VtxR");
-		MonitorElement *meN_VtxZ = dbe->get("SiOuterTrackerV/Tracks/Efficiency/match_tp_VtxZ");
-		MonitorElement *meD_VtxZ = dbe->get("SiOuterTrackerV/Tracks/Efficiency/tp_VtxZ");
-
-		MonitorElement *merespt_eta0to0p7_pt2to3 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta0to0p7_pt2to3");
-		MonitorElement *merespt_eta0p7to1_pt2to3 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta0p7to1_pt2to3");
-		MonitorElement *merespt_eta1to1p2_pt2to3 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta1to1p2_pt2to3");
-		MonitorElement *merespt_eta1p2to1p6_pt2to3 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta1p2to1p6_pt2to3");
-		MonitorElement *merespt_eta1p6to2_pt2to3 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta1p6to2_pt2to3");
-		MonitorElement *merespt_eta2to2p4_pt2to3 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta2to2p4_pt2to3");
-		MonitorElement *merespt_eta0to0p7_pt3to8 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta0to0p7_pt3to8");
-		MonitorElement *merespt_eta0p7to1_pt3to8 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta0p7to1_pt3to8");
-		MonitorElement *merespt_eta1to1p2_pt3to8 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta1to1p2_pt3to8");
-		MonitorElement *merespt_eta1p2to1p6_pt3to8 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta1p2to1p6_pt3to8");
-		MonitorElement *merespt_eta1p6to2_pt3to8 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta1p6to2_pt3to8");
-		MonitorElement *merespt_eta2to2p4_pt3to8 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta2to2p4_pt3to8");
-		MonitorElement *merespt_eta0to0p7_pt8toInf = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta0to0p7_pt8toInf");
-		MonitorElement *merespt_eta0p7to1_pt8toInf = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta0p7to1_pt8toInf");
-		MonitorElement *merespt_eta1to1p2_pt8toInf = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta1to1p2_pt8toInf");
-		MonitorElement *merespt_eta1p2to1p6_pt8toInf = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta1p2to1p6_pt8toInf");
-		MonitorElement *merespt_eta1p6to2_pt8toInf = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta1p6to2_pt8toInf");
-		MonitorElement *merespt_eta2to2p4_pt8toInf = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta2to2p4_pt8toInf");
-
-		MonitorElement *mereseta_eta0to0p7 = dbe->get("SiOuterTrackerV/Tracks/Resolution/reseta_eta0to0p7");
-		MonitorElement *mereseta_eta0p7to1 = dbe->get("SiOuterTrackerV/Tracks/Resolution/reseta_eta0p7to1");
-		MonitorElement *mereseta_eta1to1p2 = dbe->get("SiOuterTrackerV/Tracks/Resolution/reseta_eta1to1p2");
-		MonitorElement *mereseta_eta1p2to1p6 = dbe->get("SiOuterTrackerV/Tracks/Resolution/reseta_eta1p2to1p6");
-		MonitorElement *mereseta_eta1p6to2 = dbe->get("SiOuterTrackerV/Tracks/Resolution/reseta_eta1p6to2");
-		MonitorElement *mereseta_eta2to2p4 = dbe->get("SiOuterTrackerV/Tracks/Resolution/reseta_eta2to2p4");
-
-		MonitorElement *meresphi_eta0to0p7 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resphi_eta0to0p7");
-		MonitorElement *meresphi_eta0p7to1 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resphi_eta0p7to1");
-		MonitorElement *meresphi_eta1to1p2 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resphi_eta1to1p2");
-		MonitorElement *meresphi_eta1p2to1p6 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resphi_eta1p2to1p6");
-		MonitorElement *meresphi_eta1p6to2 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resphi_eta1p6to2");
-		MonitorElement *meresphi_eta2to2p4 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resphi_eta2to2p4");
-
-		MonitorElement *meresVtxZ_eta0to0p7 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resVtxZ_eta0to0p7");
-		MonitorElement *meresVtxZ_eta0p7to1 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resVtxZ_eta0p7to1");
-		MonitorElement *meresVtxZ_eta1to1p2 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resVtxZ_eta1to1p2");
-		MonitorElement *meresVtxZ_eta1p2to1p6 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resVtxZ_eta1p2to1p6");
-		MonitorElement *meresVtxZ_eta1p6to2 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resVtxZ_eta1p6to2");
-		MonitorElement *meresVtxZ_eta2to2p4 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resVtxZ_eta2to2p4");
-
-		MonitorElement *meresd0_eta0to0p7 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resd0_eta0to0p7");
-		MonitorElement *meresd0_eta0p7to1 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resd0_eta0p7to1");
-		MonitorElement *meresd0_eta1to1p2 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resd0_eta1to1p2");
-		MonitorElement *meresd0_eta1p2to1p6 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resd0_eta1p2to1p6");
-		MonitorElement *meresd0_eta1p6to2 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resd0_eta1p6to2");
-		MonitorElement *meresd0_eta2to2p4 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resd0_eta2to2p4");
-
-		if (meN_eta && meD_eta) {
-			// Get the numerator and denominator histograms
-			TH1F *numerator = meN_eta->getTH1F();
-			TH1F *denominator = meD_eta->getTH1F();
-			numerator->Sumw2();
-			denominator->Sumw2();
-
-			// Set the current directory
-			dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalEfficiency");
-
-			// Book the new histogram to contain the results
-			MonitorElement *me_effic_eta =
-			ibooker.book1D("EtaEfficiency","#eta efficiency",
-			numerator->GetNbinsX(),
-			numerator->GetXaxis()->GetXmin(),
-			numerator->GetXaxis()->GetXmax());
-
-			// Calculate the efficiency
-			me_effic_eta->getTH1F()->Divide(numerator, denominator, 1., 1., "B");
-			me_effic_eta->getTH1F()->GetXaxis()->SetTitle("tracking particle #eta");
-			me_effic_eta->getTH1F()->GetYaxis()->SetTitle("Efficiency");
-			me_effic_eta->getTH1F()->SetMaximum(1.0);
-			me_effic_eta->getTH1F()->SetMinimum(0.0);
-			me_effic_eta->getTH1F()->SetStats(false);
-		} //if ME found
-		else {edm::LogWarning("DataNotFound") << "Monitor elements for eta efficiency cannot be found!\n";}
-
-		if (meN_pt && meD_pt) {
-			// Get the numerator and denominator histograms
-			TH1F *numerator2 = meN_pt->getTH1F();
-			numerator2->Sumw2();
-			TH1F *denominator2 = meD_pt->getTH1F();
-			denominator2->Sumw2();
-
-			// Set the current directory
-			dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalEfficiency");
-
-			// Book the new histogram to contain the results
-			MonitorElement *me_effic_pt =
-			ibooker.book1D("PtEfficiency","p_{T} efficiency",
-			numerator2->GetNbinsX(),
-			numerator2->GetXaxis()->GetXmin(),
-			numerator2->GetXaxis()->GetXmax());
-
-			// Calculate the efficiency
-			me_effic_pt->getTH1F()->Divide(numerator2, denominator2, 1., 1., "B");
-			me_effic_pt->getTH1F()->GetXaxis()->SetTitle("Tracking particle p_{T} [GeV]");
-			me_effic_pt->getTH1F()->GetYaxis()->SetTitle("Efficiency");
-			me_effic_pt->getTH1F()->SetMaximum(1.0);
-			me_effic_pt->getTH1F()->SetMinimum(0.0);
-			me_effic_pt->getTH1F()->SetStats(false);
-		} //if ME found
-		else {edm::LogWarning("DataNotFound") << "Monitor elements for pT efficiency cannot be found!\n";}
-
-		if (meN_pt_zoom && meD_pt_zoom) {
-			// Get the numerator and denominator histograms
-			TH1F *numerator2_zoom = meN_pt_zoom->getTH1F();
-			numerator2_zoom->Sumw2();
-			TH1F *denominator2_zoom = meD_pt_zoom->getTH1F();
-			denominator2_zoom->Sumw2();
-
-			// Set the current directory
-			dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalEfficiency");
-
-			// Book the new histogram to contain the results
-			MonitorElement *me_effic_pt_zoom =
-			ibooker.book1D("PtEfficiency_zoom","p_{T} efficiency",
-			numerator2_zoom->GetNbinsX(),
-			numerator2_zoom->GetXaxis()->GetXmin(),
-			numerator2_zoom->GetXaxis()->GetXmax());
-
-			// Calculate the efficiency
-			me_effic_pt_zoom->getTH1F()->Divide(numerator2_zoom, denominator2_zoom, 1., 1., "B");
-			me_effic_pt_zoom->getTH1F()->GetXaxis()->SetTitle("Tracking particle p_{T} [GeV]");
-			me_effic_pt_zoom->getTH1F()->GetYaxis()->SetTitle("Efficiency");
-			me_effic_pt_zoom->getTH1F()->SetMaximum(1.0);
-			me_effic_pt_zoom->getTH1F()->SetMinimum(0.0);
-			me_effic_pt_zoom->getTH1F()->SetStats(false);
-		} //if ME found
-		else {edm::LogWarning("DataNotFound") << "Monitor elements for zoom pT efficiency cannot be found!\n";}
-
-		if (meN_d0 && meD_d0) {
-			// Get the numerator and denominator histograms
-			TH1F *numerator5 = meN_d0->getTH1F();
-			numerator5->Sumw2();
-			TH1F *denominator5 = meD_d0->getTH1F();
-			denominator5->Sumw2();
-
-			// Set the current directory
-			dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalEfficiency");
-
-			// Book the new histogram to contain the results
-			MonitorElement *me_effic_d0 =
-			ibooker.book1D("d0Efficiency","d_{0} efficiency",
-			numerator5->GetNbinsX(),
-			numerator5->GetXaxis()->GetXmin(),
-			numerator5->GetXaxis()->GetXmax());
-
-			// Calculate the efficiency
-			me_effic_d0->getTH1F()->Divide(numerator5, denominator5, 1., 1., "B");
-			me_effic_d0->getTH1F()->GetXaxis()->SetTitle("Tracking particle d_{0} [cm]");
-			me_effic_d0->getTH1F()->GetYaxis()->SetTitle("Efficiency");
-			me_effic_d0->getTH1F()->SetMaximum(1.0);
-			me_effic_d0->getTH1F()->SetMinimum(0.0);
-			me_effic_d0->getTH1F()->SetStats(false);
-		} //if ME found
-		else {edm::LogWarning("DataNotFound") << "Monitor elements for d0 efficiency cannot be found!\n";}
-
-		if (meN_VtxR && meD_VtxR) {
-			// Get the numerator and denominator histograms
-			TH1F *numerator6 = meN_VtxR->getTH1F();
-			numerator6->Sumw2();
-			TH1F *denominator6 = meD_VtxR->getTH1F();
-			denominator6->Sumw2();
-
-			// Set the current directory
-			dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalEfficiency");
-
-			// Book the new histogram to contain the results
-			MonitorElement *me_effic_VtxR =
-			ibooker.book1D("VtxREfficiency","Vtx R efficiency",
-			numerator6->GetNbinsX(),
-			numerator6->GetXaxis()->GetXmin(),
-			numerator6->GetXaxis()->GetXmax());
-
-			// Calculate the efficiency
-			me_effic_VtxR->getTH1F()->Divide(numerator6, denominator6, 1., 1., "B");
-			me_effic_VtxR->getTH1F()->GetXaxis()->SetTitle("Tracking particle VtxR [cm]");
-			me_effic_VtxR->getTH1F()->GetYaxis()->SetTitle("Efficiency");
-			me_effic_VtxR->getTH1F()->SetMaximum(1.0);
-			me_effic_VtxR->getTH1F()->SetMinimum(0.0);
-			me_effic_VtxR->getTH1F()->SetStats(false);
-		} //if ME found
-		else {edm::LogWarning("DataNotFound") << "Monitor elements for VtxR efficiency cannot be found!\n";}
-
-		if (meN_VtxZ && meD_VtxZ) {
-			// Get the numerator and denominator histograms
-			TH1F *numerator7 = meN_VtxZ->getTH1F();
-			numerator7->Sumw2();
-			TH1F *denominator7 = meD_VtxZ->getTH1F();
-			denominator7->Sumw2();
-
-			// Set the current directory
-			dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalEfficiency");
-
-			// Book the new histogram to contain the results
-			MonitorElement *me_effic_VtxZ =
-			ibooker.book1D("VtxZEfficiency","Vtx Z efficiency",
-			numerator7->GetNbinsX(),
-			numerator7->GetXaxis()->GetXmin(),
-			numerator7->GetXaxis()->GetXmax());
-
-			// Calculate the efficiency
-			me_effic_VtxZ->getTH1F()->Divide(numerator7, denominator7, 1., 1., "B");
-			me_effic_VtxZ->getTH1F()->GetXaxis()->SetTitle("Tracking particle VtxZ [cm]");
-			me_effic_VtxZ->getTH1F()->GetYaxis()->SetTitle("Efficiency");
-			me_effic_VtxZ->getTH1F()->SetMaximum(1.0);
-			me_effic_VtxZ->getTH1F()->SetMinimum(0.0);
-			me_effic_VtxZ->getTH1F()->SetStats(false);
-		} //if ME found
-		else {edm::LogWarning("DataNotFound") << "Monitor elements for VtxZ efficiency cannot be found!\n";}
-
-		if (merespt_eta0to0p7_pt2to3 && merespt_eta0p7to1_pt2to3 && merespt_eta1to1p2_pt2to3
-			&& merespt_eta1p2to1p6_pt2to3 && merespt_eta1p6to2_pt2to3 && merespt_eta2to2p4_pt2to3) {
-			// Set the current directoy
-			dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalResolution");
-
-			// Grab the histograms
-			TH1F *resPt1a = merespt_eta0to0p7_pt2to3->getTH1F();
-			TH1F *resPt2a = merespt_eta0p7to1_pt2to3->getTH1F();
-			TH1F *resPt3a = merespt_eta1to1p2_pt2to3->getTH1F();
-			TH1F *resPt4a = merespt_eta1p2to1p6_pt2to3->getTH1F();
-			TH1F *resPt5a = merespt_eta1p6to2_pt2to3->getTH1F();
-			TH1F *resPt6a = merespt_eta2to2p4_pt2to3->getTH1F();
-
-			// Book the new histogram to contain the results
-			MonitorElement *me_res_pt1 = ibooker.book1D("pTResVsEta_2-3","p_{T} resolution vs |#eta|, for p_{T}: 2-3 GeV",eta_binnum,eta_bins);
-			TH1F *resPt1 = me_res_pt1->getTH1F();
-			resPt1->GetXaxis()->SetTitle("tracking particle |#eta|");
-			resPt1->GetYaxis()->SetTitle("#sigma(#Deltap_{T}/p_{T})");
-			resPt1->SetMinimum(0.0);
-			resPt1->SetStats(false);
-
-			int testNumEntries1 = resPt1a->GetEntries();
-			if (testNumEntries1>0) {
-				// Fit the histograms with a gaussian curve - take sigma and the error from the fit
-				resPt1a->Fit(fit2,"R"); resPt2a->Fit(fit2,"R"); resPt3a->Fit(fit2,"R");
-				resPt4a->Fit(fit2,"R"); resPt5a->Fit(fit2,"R"); resPt6a->Fit(fit2,"R");
-				sigma_pt1.push_back(resPt1a->GetFunction("fit2")->GetParameter(2));
-				sigma_pt1.push_back(resPt2a->GetFunction("fit2")->GetParameter(2));
-				sigma_pt1.push_back(resPt3a->GetFunction("fit2")->GetParameter(2));
-				sigma_pt1.push_back(resPt4a->GetFunction("fit2")->GetParameter(2));
-				sigma_pt1.push_back(resPt5a->GetFunction("fit2")->GetParameter(2));
-				sigma_pt1.push_back(resPt6a->GetFunction("fit2")->GetParameter(2));
-				error_pt1.push_back(resPt1a->GetFunction("fit2")->GetParError(2));
-				error_pt1.push_back(resPt2a->GetFunction("fit2")->GetParError(2));
-				error_pt1.push_back(resPt3a->GetFunction("fit2")->GetParError(2));
-				error_pt1.push_back(resPt4a->GetFunction("fit2")->GetParError(2));
-				error_pt1.push_back(resPt5a->GetFunction("fit2")->GetParError(2));
-				error_pt1.push_back(resPt6a->GetFunction("fit2")->GetParError(2));
-
-				// Fill the new histogram to create resolution plot
-				for(int i=0;i<6;i++) {
-					resPt1->SetBinContent(i+1,sigma_pt1[i]);
-					resPt1->SetBinError(i+1,error_pt1[i]);
-				}
-			}
-			else {
-				edm::LogWarning("DataNotFound")<<"L1 tracks not found for pT resolution (2-3)!\n";
-				for(int i=0;i<6;i++) {
-					resPt1->SetBinContent(i+1,-1);
-					resPt1->SetBinError(i+1,-1);
-				}
-			}
-		} //if ME found
-		else {edm::LogWarning("DataNotFound")<<"Monitor elements for pT resolution (2-3) cannot be found!\n";}
-
-		if (merespt_eta0to0p7_pt3to8 && merespt_eta0p7to1_pt3to8 && merespt_eta1to1p2_pt3to8
-			&& merespt_eta1p2to1p6_pt3to8 && merespt_eta1p6to2_pt3to8 && merespt_eta2to2p4_pt3to8) {
-			// Set the current directoy
-			dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalResolution");
-
-			// Grab the histograms
-			TH1F *resPt1b = merespt_eta0to0p7_pt3to8->getTH1F();
-			TH1F *resPt2b = merespt_eta0p7to1_pt3to8->getTH1F();
-			TH1F *resPt3b = merespt_eta1to1p2_pt3to8->getTH1F();
-			TH1F *resPt4b = merespt_eta1p2to1p6_pt3to8->getTH1F();
-			TH1F *resPt5b = merespt_eta1p6to2_pt3to8->getTH1F();
-			TH1F *resPt6b = merespt_eta2to2p4_pt3to8->getTH1F();
-
-			// Book the new histogram to contain the results
-			MonitorElement *me_res_pt2 = ibooker.book1D("pTResVsEta_3-8","p_{T} resolution vs |#eta|, for p_{T}: 3-8 GeV",eta_binnum,eta_bins);
-			TH1F *resPt2 = me_res_pt2->getTH1F();
-			resPt2->GetXaxis()->SetTitle("tracking particle |#eta|");
-			resPt2->GetYaxis()->SetTitle("#sigma(#Deltap_{T}/p_{T})");
-			resPt2->SetMinimum(0.0);
-			resPt2->SetStats(false);
-
-			int testNumEntries2 = resPt1b->GetEntries();
-			if (testNumEntries2>0) {
-				// Fit the histograms with a gaussian curve - take sigma and the error from the fit
-				resPt1b->Fit(fit2,"R"); resPt2b->Fit(fit2,"R"); resPt3b->Fit(fit2,"R");
-				resPt4b->Fit(fit2,"R"); resPt5b->Fit(fit2,"R"); resPt6b->Fit(fit2,"R");
-				sigma_pt2.push_back(resPt1b->GetFunction("fit2")->GetParameter(2));
-				sigma_pt2.push_back(resPt2b->GetFunction("fit2")->GetParameter(2));
-				sigma_pt2.push_back(resPt3b->GetFunction("fit2")->GetParameter(2));
-				sigma_pt2.push_back(resPt4b->GetFunction("fit2")->GetParameter(2));
-				sigma_pt2.push_back(resPt5b->GetFunction("fit2")->GetParameter(2));
-				sigma_pt2.push_back(resPt6b->GetFunction("fit2")->GetParameter(2));
-				error_pt2.push_back(resPt1b->GetFunction("fit2")->GetParError(2));
-				error_pt2.push_back(resPt2b->GetFunction("fit2")->GetParError(2));
-				error_pt2.push_back(resPt3b->GetFunction("fit2")->GetParError(2));
-				error_pt2.push_back(resPt4b->GetFunction("fit2")->GetParError(2));
-				error_pt2.push_back(resPt5b->GetFunction("fit2")->GetParError(2));
-				error_pt2.push_back(resPt6b->GetFunction("fit2")->GetParError(2));
-
-				// Fill the new histogram to create resolution plot
-				for(int i=0;i<6;i++) {
-					resPt2->SetBinContent(i+1,sigma_pt2[i]);
-					resPt2->SetBinError(i+1,error_pt2[i]);
-				}
-			}
-			else {
-				edm::LogWarning("DataNotFound")<<"L1 tracks not found for pT resolution (3-8)!\n";
-				for(int i=0;i<6;i++) {
-					resPt2->SetBinContent(i+1,-1);
-					resPt2->SetBinError(i+1,-1);
-				}
-			}
-		} //if ME found
-		else {edm::LogWarning("DataNotFound")<<"Monitor elements for pT resolution (3-8) cannot be found!\n";}
-
-		if (merespt_eta0to0p7_pt8toInf && merespt_eta0p7to1_pt8toInf && merespt_eta1to1p2_pt8toInf
-			&& merespt_eta1p2to1p6_pt8toInf && merespt_eta1p6to2_pt8toInf && merespt_eta2to2p4_pt8toInf) {
-			// Set the current directoy
-			dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalResolution");
-
-			// Grab the histograms
-			TH1F *resPt1c = merespt_eta0to0p7_pt8toInf->getTH1F();
-			TH1F *resPt2c = merespt_eta0p7to1_pt8toInf->getTH1F();
-			TH1F *resPt3c = merespt_eta1to1p2_pt8toInf->getTH1F();
-			TH1F *resPt4c = merespt_eta1p2to1p6_pt8toInf->getTH1F();
-			TH1F *resPt5c = merespt_eta1p6to2_pt8toInf->getTH1F();
-			TH1F *resPt6c = merespt_eta2to2p4_pt8toInf->getTH1F();
-
-			// Book the new histogram to contain the results
-			MonitorElement *me_res_pt3 = ibooker.book1D("pTResVsEta_8-inf","p_{T} resolution vs |#eta|, for p_{T}: >8 GeV",eta_binnum,eta_bins);
-			TH1F *resPt3 = me_res_pt3->getTH1F();
-			resPt3->GetXaxis()->SetTitle("tracking particle |#eta|");
-			resPt3->GetYaxis()->SetTitle("#sigma(#Deltap_{T}/p_{T})");
-			resPt3->SetMinimum(0.0);
-			resPt3->SetStats(false);
-
-			int testNumEntries3 = resPt1c->GetEntries();
-			if (testNumEntries3>0) {
-				// Fit the histograms with a gaussian curve - take sigma and the error from the fit
-				resPt1c->Fit(fit2,"R"); resPt2c->Fit(fit2,"R"); resPt3c->Fit(fit2,"R");
-				resPt4c->Fit(fit2,"R"); resPt5c->Fit(fit2,"R"); resPt6c->Fit(fit2,"R");
-				sigma_pt3.push_back(resPt1c->GetFunction("fit2")->GetParameter(2));
-				sigma_pt3.push_back(resPt2c->GetFunction("fit2")->GetParameter(2));
-				sigma_pt3.push_back(resPt3c->GetFunction("fit2")->GetParameter(2));
-				sigma_pt3.push_back(resPt4c->GetFunction("fit2")->GetParameter(2));
-				sigma_pt3.push_back(resPt5c->GetFunction("fit2")->GetParameter(2));
-				sigma_pt3.push_back(resPt6c->GetFunction("fit2")->GetParameter(2));
-				error_pt3.push_back(resPt1c->GetFunction("fit2")->GetParError(2));
-				error_pt3.push_back(resPt2c->GetFunction("fit2")->GetParError(2));
-				error_pt3.push_back(resPt3c->GetFunction("fit2")->GetParError(2));
-				error_pt3.push_back(resPt4c->GetFunction("fit2")->GetParError(2));
-				error_pt3.push_back(resPt5c->GetFunction("fit2")->GetParError(2));
-				error_pt3.push_back(resPt6c->GetFunction("fit2")->GetParError(2));
-
-				// Fill the new histogram to create resolution plot
-				for(int i=0;i<6;i++) {
-					resPt3->SetBinContent(i+1,sigma_pt3[i]);
-					resPt3->SetBinError(i+1,error_pt3[i]);
-				}
-			}
-			else {
-				edm::LogWarning("DataNotFound")<<"L1 tracks not found for pT resolution (8-inf)!\n";
-				for(int i=0;i<6;i++) {
-					resPt3->SetBinContent(i+1,-1);
-					resPt3->SetBinError(i+1,-1);
-				}
-			}
-		} //if ME found
-		else {edm::LogWarning("DataNotFound")<<"Monitor elements for pT resolution (8-inf) cannot be found!\n";}
-
-
-		if (mereseta_eta0to0p7 && mereseta_eta0p7to1 && mereseta_eta1to1p2 && mereseta_eta1p2to1p6 && mereseta_eta1p6to2 && mereseta_eta2to2p4) {
-			// Set the current directoy
-			dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalResolution");
-
-			// Grab the histograms
-			TH1F *resEta1 = mereseta_eta0to0p7->getTH1F();
-			TH1F *resEta2 = mereseta_eta0p7to1->getTH1F();
-			TH1F *resEta3 = mereseta_eta1to1p2->getTH1F();
-			TH1F *resEta4 = mereseta_eta1p2to1p6->getTH1F();
-			TH1F *resEta5 = mereseta_eta1p6to2->getTH1F();
-			TH1F *resEta6 = mereseta_eta2to2p4->getTH1F();
-
-			// Book the new histogram to contain the results
-			MonitorElement *me_res_eta = ibooker.book1D("EtaResolution","#eta resolution vs |#eta|",eta_binnum,eta_bins);
-			TH1F *resEta = me_res_eta->getTH1F();
-			resEta->GetXaxis()->SetTitle("tracking particle |#eta|");
-			resEta->GetYaxis()->SetTitle("#sigma(#Delta#eta)");
-			resEta->SetMinimum(0.0);
-			resEta->SetStats(false);
-
-			int testNumEntries4 = resEta1->GetEntries();
-			if (testNumEntries4>0) {
-
-				// Fit the histograms with a gaussian curve - take sigma and the error from the fit
-				resEta1->Fit(fit,"R"); resEta2->Fit(fit,"R"); resEta3->Fit(fit,"R");
-				resEta4->Fit(fit,"R"); resEta5->Fit(fit,"R"); resEta6->Fit(fit,"R");
-				sigma_eta.push_back(resEta1->GetFunction("fit")->GetParameter(2));
-				sigma_eta.push_back(resEta2->GetFunction("fit")->GetParameter(2));
-				sigma_eta.push_back(resEta3->GetFunction("fit")->GetParameter(2));
-				sigma_eta.push_back(resEta4->GetFunction("fit")->GetParameter(2));
-				sigma_eta.push_back(resEta5->GetFunction("fit")->GetParameter(2));
-				sigma_eta.push_back(resEta6->GetFunction("fit")->GetParameter(2));
-				error_eta.push_back(resEta1->GetFunction("fit")->GetParError(2));
-				error_eta.push_back(resEta2->GetFunction("fit")->GetParError(2));
-				error_eta.push_back(resEta3->GetFunction("fit")->GetParError(2));
-				error_eta.push_back(resEta4->GetFunction("fit")->GetParError(2));
-				error_eta.push_back(resEta5->GetFunction("fit")->GetParError(2));
-				error_eta.push_back(resEta6->GetFunction("fit")->GetParError(2));
-
-				// Fill the new histogram to create resolution plot
-				for(int i=0;i<6;i++) {
-					resEta->SetBinContent(i+1,sigma_eta[i]);
-					resEta->SetBinError(i+1,error_eta[i]);
-				}
-			}
-			else {
-				edm::LogWarning("DataNotFound")<<"L1 tracks not found for eta resolution!\n";
-				for(int i=0;i<6;i++) {
-					resEta->SetBinContent(i+1,-1);
-					resEta->SetBinError(i+1,-1);
-				}
-			}
-		} //if ME found
-		else {edm::LogWarning("DataNotFound")<<"Monitor elements for eta resolution cannot be found!\n";}
-
-		if (meresphi_eta0to0p7 && meresphi_eta0p7to1 && meresphi_eta1to1p2 && meresphi_eta1p2to1p6 && meresphi_eta1p6to2 && meresphi_eta2to2p4) {
-			// Set the current directoy
-			dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalResolution");
-
-			// Grab the histograms
-			TH1F *resPhi1 = meresphi_eta0to0p7->getTH1F();
-			TH1F *resPhi2 = meresphi_eta0p7to1->getTH1F();
-			TH1F *resPhi3 = meresphi_eta1to1p2->getTH1F();
-			TH1F *resPhi4 = meresphi_eta1p2to1p6->getTH1F();
-			TH1F *resPhi5 = meresphi_eta1p6to2->getTH1F();
-			TH1F *resPhi6 = meresphi_eta2to2p4->getTH1F();
-
-			// Book the new histogram to contain the results
-			MonitorElement *me_res_phi = ibooker.book1D("PhiResolution","#phi resolution vs |#eta|",eta_binnum,eta_bins);
-			TH1F *resPhi = me_res_phi->getTH1F();
-			resPhi->GetXaxis()->SetTitle("tracking particle |#eta|");
-			resPhi->GetYaxis()->SetTitle("#sigma(#Delta#phi)");
-			resPhi->SetMinimum(0.0);
-			resPhi->SetStats(false);
-
-			int testNumEntries5 = resPhi1->GetEntries();
-			if (testNumEntries5>0) {
-				// Fit the histograms with a gaussian curve - take sigma and the error from the fit
-				resPhi1->Fit(fit,"R"); resPhi2->Fit(fit,"R"); resPhi3->Fit(fit,"R");
-				resPhi4->Fit(fit,"R"); resPhi5->Fit(fit,"R"); resPhi6->Fit(fit,"R");
-				sigma_phi.push_back(resPhi1->GetFunction("fit")->GetParameter(2));
-				sigma_phi.push_back(resPhi2->GetFunction("fit")->GetParameter(2));
-				sigma_phi.push_back(resPhi3->GetFunction("fit")->GetParameter(2));
-				sigma_phi.push_back(resPhi4->GetFunction("fit")->GetParameter(2));
-				sigma_phi.push_back(resPhi5->GetFunction("fit")->GetParameter(2));
-				sigma_phi.push_back(resPhi6->GetFunction("fit")->GetParameter(2));
-				error_phi.push_back(resPhi1->GetFunction("fit")->GetParError(2));
-				error_phi.push_back(resPhi2->GetFunction("fit")->GetParError(2));
-				error_phi.push_back(resPhi3->GetFunction("fit")->GetParError(2));
-				error_phi.push_back(resPhi4->GetFunction("fit")->GetParError(2));
-				error_phi.push_back(resPhi5->GetFunction("fit")->GetParError(2));
-				error_phi.push_back(resPhi6->GetFunction("fit")->GetParError(2));
-
-				// Fill the new histogram to create resolution plot
-				for(int i=0;i<6;i++) {
-					resPhi->SetBinContent(i+1,sigma_phi[i]);
-					resPhi->SetBinError(i+1,error_phi[i]);
-				}
-			}
-			else {
-				edm::LogWarning("DataNotFound")<<"L1 tracks not found for phi resolution!\n";
-				for(int i=0;i<6;i++) {
-					resPhi->SetBinContent(i+1,-1);
-					resPhi->SetBinError(i+1,-1);
-				}
-			}
-		} //if ME found
-		else {edm::LogWarning("DataNotFound")<<"Monitor elements for phi resolution cannot be found!\n";}
-
-		if (meresVtxZ_eta0to0p7 && meresVtxZ_eta0p7to1 && meresVtxZ_eta1to1p2 && meresVtxZ_eta1p2to1p6 && meresVtxZ_eta1p6to2 && meresVtxZ_eta2to2p4) {
-			// Set the current directoy
-			dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalResolution");
-
-			// Grab the histograms
-			TH1F *resVtxZ_1 = meresVtxZ_eta0to0p7->getTH1F();
-			TH1F *resVtxZ_2 = meresVtxZ_eta0p7to1->getTH1F();
-			TH1F *resVtxZ_3 = meresVtxZ_eta1to1p2->getTH1F();
-			TH1F *resVtxZ_4 = meresVtxZ_eta1p2to1p6->getTH1F();
-			TH1F *resVtxZ_5 = meresVtxZ_eta1p6to2->getTH1F();
-			TH1F *resVtxZ_6 = meresVtxZ_eta2to2p4->getTH1F();
-
-			// Book the new histogram to contain the results
-			MonitorElement *me_res_VtxZ = ibooker.book1D("VtxZResolution","VtxZ resolution vs |#eta|",eta_binnum,eta_bins);
-			TH1F *resVtxZ = me_res_VtxZ->getTH1F();
-			resVtxZ->GetXaxis()->SetTitle("tracking particle |#eta|");
-			resVtxZ->GetYaxis()->SetTitle("#sigma(#DeltaVtxZ) [cm]");
-			resVtxZ->SetMinimum(0.0);
-			resVtxZ->SetStats(false);
-
-			int testNumEntries6 = resVtxZ_1->GetEntries();
-			if (testNumEntries6>0) {
-				// Fit the histograms with a gaussian curve - take sigma and the error from the fit
-				resVtxZ_1->Fit(fit3,"R"); resVtxZ_2->Fit(fit3,"R"); resVtxZ_3->Fit(fit3,"R");
-				resVtxZ_4->Fit(fit3,"R"); resVtxZ_5->Fit(fit3,"R"); resVtxZ_6->Fit(fit3,"R");
-				sigma_VtxZ.push_back(resVtxZ_1->GetFunction("fit3")->GetParameter(2));
-				sigma_VtxZ.push_back(resVtxZ_2->GetFunction("fit3")->GetParameter(2));
-				sigma_VtxZ.push_back(resVtxZ_3->GetFunction("fit3")->GetParameter(2));
-				sigma_VtxZ.push_back(resVtxZ_4->GetFunction("fit3")->GetParameter(2));
-				sigma_VtxZ.push_back(resVtxZ_5->GetFunction("fit3")->GetParameter(2));
-				sigma_VtxZ.push_back(resVtxZ_6->GetFunction("fit3")->GetParameter(2));
-				error_VtxZ.push_back(resVtxZ_1->GetFunction("fit3")->GetParError(2));
-				error_VtxZ.push_back(resVtxZ_2->GetFunction("fit3")->GetParError(2));
-				error_VtxZ.push_back(resVtxZ_3->GetFunction("fit3")->GetParError(2));
-				error_VtxZ.push_back(resVtxZ_4->GetFunction("fit3")->GetParError(2));
-				error_VtxZ.push_back(resVtxZ_5->GetFunction("fit3")->GetParError(2));
-				error_VtxZ.push_back(resVtxZ_6->GetFunction("fit3")->GetParError(2));
-
-				// Fill the new histogram to create resolution plot
-				for(int i=0;i<6;i++) {
-					resVtxZ->SetBinContent(i+1,sigma_VtxZ[i]);
-					resVtxZ->SetBinError(i+1,error_VtxZ[i]);
-				}
-			}
-			else {
-				edm::LogWarning("DataNotFound")<<"L1 tracks not found for VtxZ resolution!\n";
-				for(int i=0;i<6;i++) {
-					resVtxZ->SetBinContent(i+1,-1);
-					resVtxZ->SetBinError(i+1,-1);
-				}
-			}
-		} //if ME found
-		else {edm::LogWarning("DataNotFound")<<"Monitor elements for VtxZ resolution cannot be found!\n";}
-
-		if (meresd0_eta0to0p7 && meresd0_eta0p7to1 && meresd0_eta1to1p2 && meresd0_eta1p2to1p6 && meresd0_eta1p6to2 && meresd0_eta2to2p4) {
-			// Set the current directoy
-			dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalResolution");
-
-			// Grab the histograms
-			TH1F *resd0_1 = meresd0_eta0to0p7->getTH1F();
-			TH1F *resd0_2 = meresd0_eta0p7to1->getTH1F();
-			TH1F *resd0_3 = meresd0_eta1to1p2->getTH1F();
-			TH1F *resd0_4 = meresd0_eta1p2to1p6->getTH1F();
-			TH1F *resd0_5 = meresd0_eta1p6to2->getTH1F();
-			TH1F *resd0_6 = meresd0_eta2to2p4->getTH1F();
-
-			// Book the new histogram to contain the results
-			MonitorElement *me_res_d0 = ibooker.book1D("d0Resolution","d_{0} resolution vs |#eta|",eta_binnum,eta_bins);
-			TH1F *resd0 = me_res_d0->getTH1F();
-			resd0->GetXaxis()->SetTitle("tracking particle |#eta|");
-			resd0->GetYaxis()->SetTitle("#sigma(#Deltad_{0}) [cm]");
-			resd0->SetMinimum(0.0);
-			resd0->SetStats(false);
-
-			int testNumEntries7 = resd0_1->GetEntries();
-			if (testNumEntries7>0) {
-				// Fit the histograms with a gaussian curve - take sigma and the error from the fit
-				resd0_1->Fit(fit,"R"); resd0_2->Fit(fit,"R"); resd0_3->Fit(fit,"R");
-				resd0_4->Fit(fit,"R"); resd0_5->Fit(fit,"R"); resd0_6->Fit(fit,"R");
-				sigma_d0.push_back(resd0_1->GetFunction("fit")->GetParameter(2));
-				sigma_d0.push_back(resd0_2->GetFunction("fit")->GetParameter(2));
-				sigma_d0.push_back(resd0_3->GetFunction("fit")->GetParameter(2));
-				sigma_d0.push_back(resd0_4->GetFunction("fit")->GetParameter(2));
-				sigma_d0.push_back(resd0_5->GetFunction("fit")->GetParameter(2));
-				sigma_d0.push_back(resd0_6->GetFunction("fit")->GetParameter(2));
-				error_d0.push_back(resd0_1->GetFunction("fit")->GetParError(2));
-				error_d0.push_back(resd0_2->GetFunction("fit")->GetParError(2));
-				error_d0.push_back(resd0_3->GetFunction("fit")->GetParError(2));
-				error_d0.push_back(resd0_4->GetFunction("fit")->GetParError(2));
-				error_d0.push_back(resd0_5->GetFunction("fit")->GetParError(2));
-				error_d0.push_back(resd0_6->GetFunction("fit")->GetParError(2));
-
-				// Fill the new histogram to create resolution plot
-				for(int i=0;i<6;i++) {
-					resd0->SetBinContent(i+1,sigma_d0[i]);
-					resd0->SetBinError(i+1,error_d0[i]);
-				}
-			}
-			else {
-				edm::LogWarning("DataNotFound")<<"L1 tracks not found for d0 resolution!\n";
-				for(int i=0;i<6;i++) {
-					resd0->SetBinContent(i+1,-1);
-					resd0->SetBinError(i+1,-1);
-				}
-			}
-		} //if ME found
-		else {edm::LogWarning("DataNotFound")<<"Monitor elements for d0 resolution cannot be found!\n";}
-
-	} //if dbe found
-	else {edm::LogWarning("DataNotFound")<<"Cannot find valid DQM back end \n";}
-	delete fit;
-	delete fit2;
-	delete fit3;
-} //end dqmEndJob
+OuterTrackerMCHarvester::OuterTrackerMCHarvester(const edm::ParameterSet &iConfig) {}
+
+OuterTrackerMCHarvester::~OuterTrackerMCHarvester() {}
+
+// ------------ method called once each job just after ending the event loop
+// ------------
+void OuterTrackerMCHarvester::dqmEndJob(DQMStore::IBooker &ibooker, DQMStore::IGetter &igetter) {
+  using namespace edm;
+
+  // Global variables
+  TF1 *fit = new TF1("fit", "gaus", -0.01, 0.01);
+  TF1 *fit2 = new TF1("fit2", "gaus", -0.1, 0.1);
+  TF1 *fit3 = new TF1("fit3", "gaus", -1, 1);
+
+  std::vector<double> sigma_pt1;
+  std::vector<double> error_pt1;
+  std::vector<double> sigma_pt2;
+  std::vector<double> error_pt2;
+  std::vector<double> sigma_pt3;
+  std::vector<double> error_pt3;
+  std::vector<double> sigma_eta;
+  std::vector<double> error_eta;
+  std::vector<double> sigma_phi;
+  std::vector<double> error_phi;
+  std::vector<double> sigma_VtxZ;
+  std::vector<double> error_VtxZ;
+  std::vector<double> sigma_d0;
+  std::vector<double> error_d0;
+
+  float eta_bins[] = {0.0, 0.7, 1.0, 1.2, 1.6, 2.0, 2.4};
+  int eta_binnum = 6;
+
+  dbe = nullptr;
+  dbe = edm::Service<DQMStore>().operator->();
+
+  if (dbe) {
+    // Find all monitor elements for histograms
+    MonitorElement *meN_eta = dbe->get("SiOuterTrackerV/Tracks/Efficiency/match_tp_eta");
+    MonitorElement *meD_eta = dbe->get("SiOuterTrackerV/Tracks/Efficiency/tp_eta");
+    MonitorElement *meN_pt = dbe->get("SiOuterTrackerV/Tracks/Efficiency/match_tp_pt");
+    MonitorElement *meD_pt = dbe->get("SiOuterTrackerV/Tracks/Efficiency/tp_pt");
+    MonitorElement *meN_pt_zoom = dbe->get("SiOuterTrackerV/Tracks/Efficiency/match_tp_pt_zoom");
+    MonitorElement *meD_pt_zoom = dbe->get("SiOuterTrackerV/Tracks/Efficiency/tp_pt_zoom");
+    MonitorElement *meN_d0 = dbe->get("SiOuterTrackerV/Tracks/Efficiency/match_tp_d0");
+    MonitorElement *meD_d0 = dbe->get("SiOuterTrackerV/Tracks/Efficiency/tp_d0");
+    MonitorElement *meN_VtxR = dbe->get("SiOuterTrackerV/Tracks/Efficiency/match_tp_VtxR");
+    MonitorElement *meD_VtxR = dbe->get("SiOuterTrackerV/Tracks/Efficiency/tp_VtxR");
+    MonitorElement *meN_VtxZ = dbe->get("SiOuterTrackerV/Tracks/Efficiency/match_tp_VtxZ");
+    MonitorElement *meD_VtxZ = dbe->get("SiOuterTrackerV/Tracks/Efficiency/tp_VtxZ");
+
+    MonitorElement *merespt_eta0to0p7_pt2to3 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta0to0p7_pt2to3");
+    MonitorElement *merespt_eta0p7to1_pt2to3 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta0p7to1_pt2to3");
+    MonitorElement *merespt_eta1to1p2_pt2to3 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta1to1p2_pt2to3");
+    MonitorElement *merespt_eta1p2to1p6_pt2to3 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta1p2to1p6_pt2to3");
+    MonitorElement *merespt_eta1p6to2_pt2to3 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta1p6to2_pt2to3");
+    MonitorElement *merespt_eta2to2p4_pt2to3 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta2to2p4_pt2to3");
+    MonitorElement *merespt_eta0to0p7_pt3to8 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta0to0p7_pt3to8");
+    MonitorElement *merespt_eta0p7to1_pt3to8 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta0p7to1_pt3to8");
+    MonitorElement *merespt_eta1to1p2_pt3to8 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta1to1p2_pt3to8");
+    MonitorElement *merespt_eta1p2to1p6_pt3to8 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta1p2to1p6_pt3to8");
+    MonitorElement *merespt_eta1p6to2_pt3to8 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta1p6to2_pt3to8");
+    MonitorElement *merespt_eta2to2p4_pt3to8 = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta2to2p4_pt3to8");
+    MonitorElement *merespt_eta0to0p7_pt8toInf = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta0to0p7_pt8toInf");
+    MonitorElement *merespt_eta0p7to1_pt8toInf = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta0p7to1_pt8toInf");
+    MonitorElement *merespt_eta1to1p2_pt8toInf = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta1to1p2_pt8toInf");
+    MonitorElement *merespt_eta1p2to1p6_pt8toInf =
+        dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta1p2to1p6_pt8toInf");
+    MonitorElement *merespt_eta1p6to2_pt8toInf = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta1p6to2_pt8toInf");
+    MonitorElement *merespt_eta2to2p4_pt8toInf = dbe->get("SiOuterTrackerV/Tracks/Resolution/respt_eta2to2p4_pt8toInf");
+
+    MonitorElement *mereseta_eta0to0p7 = dbe->get("SiOuterTrackerV/Tracks/Resolution/reseta_eta0to0p7");
+    MonitorElement *mereseta_eta0p7to1 = dbe->get("SiOuterTrackerV/Tracks/Resolution/reseta_eta0p7to1");
+    MonitorElement *mereseta_eta1to1p2 = dbe->get("SiOuterTrackerV/Tracks/Resolution/reseta_eta1to1p2");
+    MonitorElement *mereseta_eta1p2to1p6 = dbe->get("SiOuterTrackerV/Tracks/Resolution/reseta_eta1p2to1p6");
+    MonitorElement *mereseta_eta1p6to2 = dbe->get("SiOuterTrackerV/Tracks/Resolution/reseta_eta1p6to2");
+    MonitorElement *mereseta_eta2to2p4 = dbe->get("SiOuterTrackerV/Tracks/Resolution/reseta_eta2to2p4");
+
+    MonitorElement *meresphi_eta0to0p7 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resphi_eta0to0p7");
+    MonitorElement *meresphi_eta0p7to1 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resphi_eta0p7to1");
+    MonitorElement *meresphi_eta1to1p2 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resphi_eta1to1p2");
+    MonitorElement *meresphi_eta1p2to1p6 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resphi_eta1p2to1p6");
+    MonitorElement *meresphi_eta1p6to2 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resphi_eta1p6to2");
+    MonitorElement *meresphi_eta2to2p4 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resphi_eta2to2p4");
+
+    MonitorElement *meresVtxZ_eta0to0p7 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resVtxZ_eta0to0p7");
+    MonitorElement *meresVtxZ_eta0p7to1 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resVtxZ_eta0p7to1");
+    MonitorElement *meresVtxZ_eta1to1p2 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resVtxZ_eta1to1p2");
+    MonitorElement *meresVtxZ_eta1p2to1p6 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resVtxZ_eta1p2to1p6");
+    MonitorElement *meresVtxZ_eta1p6to2 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resVtxZ_eta1p6to2");
+    MonitorElement *meresVtxZ_eta2to2p4 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resVtxZ_eta2to2p4");
+
+    MonitorElement *meresd0_eta0to0p7 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resd0_eta0to0p7");
+    MonitorElement *meresd0_eta0p7to1 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resd0_eta0p7to1");
+    MonitorElement *meresd0_eta1to1p2 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resd0_eta1to1p2");
+    MonitorElement *meresd0_eta1p2to1p6 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resd0_eta1p2to1p6");
+    MonitorElement *meresd0_eta1p6to2 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resd0_eta1p6to2");
+    MonitorElement *meresd0_eta2to2p4 = dbe->get("SiOuterTrackerV/Tracks/Resolution/resd0_eta2to2p4");
+
+    if (meN_eta && meD_eta) {
+      // Get the numerator and denominator histograms
+      TH1F *numerator = meN_eta->getTH1F();
+      TH1F *denominator = meD_eta->getTH1F();
+      numerator->Sumw2();
+      denominator->Sumw2();
+
+      // Set the current directory
+      dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalEfficiency");
+
+      // Book the new histogram to contain the results
+      MonitorElement *me_effic_eta = ibooker.book1D("EtaEfficiency",
+                                                    "#eta efficiency",
+                                                    numerator->GetNbinsX(),
+                                                    numerator->GetXaxis()->GetXmin(),
+                                                    numerator->GetXaxis()->GetXmax());
+
+      // Calculate the efficiency
+      me_effic_eta->getTH1F()->Divide(numerator, denominator, 1., 1., "B");
+      me_effic_eta->getTH1F()->GetXaxis()->SetTitle("tracking particle #eta");
+      me_effic_eta->getTH1F()->GetYaxis()->SetTitle("Efficiency");
+      me_effic_eta->getTH1F()->SetMaximum(1.0);
+      me_effic_eta->getTH1F()->SetMinimum(0.0);
+      me_effic_eta->getTH1F()->SetStats(false);
+    }  // if ME found
+    else {
+      edm::LogWarning("DataNotFound") << "Monitor elements for eta efficiency cannot be found!\n";
+    }
+
+    if (meN_pt && meD_pt) {
+      // Get the numerator and denominator histograms
+      TH1F *numerator2 = meN_pt->getTH1F();
+      numerator2->Sumw2();
+      TH1F *denominator2 = meD_pt->getTH1F();
+      denominator2->Sumw2();
+
+      // Set the current directory
+      dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalEfficiency");
+
+      // Book the new histogram to contain the results
+      MonitorElement *me_effic_pt = ibooker.book1D("PtEfficiency",
+                                                   "p_{T} efficiency",
+                                                   numerator2->GetNbinsX(),
+                                                   numerator2->GetXaxis()->GetXmin(),
+                                                   numerator2->GetXaxis()->GetXmax());
+
+      // Calculate the efficiency
+      me_effic_pt->getTH1F()->Divide(numerator2, denominator2, 1., 1., "B");
+      me_effic_pt->getTH1F()->GetXaxis()->SetTitle("Tracking particle p_{T} [GeV]");
+      me_effic_pt->getTH1F()->GetYaxis()->SetTitle("Efficiency");
+      me_effic_pt->getTH1F()->SetMaximum(1.0);
+      me_effic_pt->getTH1F()->SetMinimum(0.0);
+      me_effic_pt->getTH1F()->SetStats(false);
+    }  // if ME found
+    else {
+      edm::LogWarning("DataNotFound") << "Monitor elements for pT efficiency cannot be found!\n";
+    }
+
+    if (meN_pt_zoom && meD_pt_zoom) {
+      // Get the numerator and denominator histograms
+      TH1F *numerator2_zoom = meN_pt_zoom->getTH1F();
+      numerator2_zoom->Sumw2();
+      TH1F *denominator2_zoom = meD_pt_zoom->getTH1F();
+      denominator2_zoom->Sumw2();
+
+      // Set the current directory
+      dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalEfficiency");
+
+      // Book the new histogram to contain the results
+      MonitorElement *me_effic_pt_zoom = ibooker.book1D("PtEfficiency_zoom",
+                                                        "p_{T} efficiency",
+                                                        numerator2_zoom->GetNbinsX(),
+                                                        numerator2_zoom->GetXaxis()->GetXmin(),
+                                                        numerator2_zoom->GetXaxis()->GetXmax());
+
+      // Calculate the efficiency
+      me_effic_pt_zoom->getTH1F()->Divide(numerator2_zoom, denominator2_zoom, 1., 1., "B");
+      me_effic_pt_zoom->getTH1F()->GetXaxis()->SetTitle("Tracking particle p_{T} [GeV]");
+      me_effic_pt_zoom->getTH1F()->GetYaxis()->SetTitle("Efficiency");
+      me_effic_pt_zoom->getTH1F()->SetMaximum(1.0);
+      me_effic_pt_zoom->getTH1F()->SetMinimum(0.0);
+      me_effic_pt_zoom->getTH1F()->SetStats(false);
+    }  // if ME found
+    else {
+      edm::LogWarning("DataNotFound") << "Monitor elements for zoom pT efficiency cannot be found!\n";
+    }
+
+    if (meN_d0 && meD_d0) {
+      // Get the numerator and denominator histograms
+      TH1F *numerator5 = meN_d0->getTH1F();
+      numerator5->Sumw2();
+      TH1F *denominator5 = meD_d0->getTH1F();
+      denominator5->Sumw2();
+
+      // Set the current directory
+      dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalEfficiency");
+
+      // Book the new histogram to contain the results
+      MonitorElement *me_effic_d0 = ibooker.book1D("d0Efficiency",
+                                                   "d_{0} efficiency",
+                                                   numerator5->GetNbinsX(),
+                                                   numerator5->GetXaxis()->GetXmin(),
+                                                   numerator5->GetXaxis()->GetXmax());
+
+      // Calculate the efficiency
+      me_effic_d0->getTH1F()->Divide(numerator5, denominator5, 1., 1., "B");
+      me_effic_d0->getTH1F()->GetXaxis()->SetTitle("Tracking particle d_{0} [cm]");
+      me_effic_d0->getTH1F()->GetYaxis()->SetTitle("Efficiency");
+      me_effic_d0->getTH1F()->SetMaximum(1.0);
+      me_effic_d0->getTH1F()->SetMinimum(0.0);
+      me_effic_d0->getTH1F()->SetStats(false);
+    }  // if ME found
+    else {
+      edm::LogWarning("DataNotFound") << "Monitor elements for d0 efficiency cannot be found!\n";
+    }
+
+    if (meN_VtxR && meD_VtxR) {
+      // Get the numerator and denominator histograms
+      TH1F *numerator6 = meN_VtxR->getTH1F();
+      numerator6->Sumw2();
+      TH1F *denominator6 = meD_VtxR->getTH1F();
+      denominator6->Sumw2();
+
+      // Set the current directory
+      dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalEfficiency");
+
+      // Book the new histogram to contain the results
+      MonitorElement *me_effic_VtxR = ibooker.book1D("VtxREfficiency",
+                                                     "Vtx R efficiency",
+                                                     numerator6->GetNbinsX(),
+                                                     numerator6->GetXaxis()->GetXmin(),
+                                                     numerator6->GetXaxis()->GetXmax());
+
+      // Calculate the efficiency
+      me_effic_VtxR->getTH1F()->Divide(numerator6, denominator6, 1., 1., "B");
+      me_effic_VtxR->getTH1F()->GetXaxis()->SetTitle("Tracking particle VtxR [cm]");
+      me_effic_VtxR->getTH1F()->GetYaxis()->SetTitle("Efficiency");
+      me_effic_VtxR->getTH1F()->SetMaximum(1.0);
+      me_effic_VtxR->getTH1F()->SetMinimum(0.0);
+      me_effic_VtxR->getTH1F()->SetStats(false);
+    }  // if ME found
+    else {
+      edm::LogWarning("DataNotFound") << "Monitor elements for VtxR efficiency cannot be found!\n";
+    }
+
+    if (meN_VtxZ && meD_VtxZ) {
+      // Get the numerator and denominator histograms
+      TH1F *numerator7 = meN_VtxZ->getTH1F();
+      numerator7->Sumw2();
+      TH1F *denominator7 = meD_VtxZ->getTH1F();
+      denominator7->Sumw2();
+
+      // Set the current directory
+      dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalEfficiency");
+
+      // Book the new histogram to contain the results
+      MonitorElement *me_effic_VtxZ = ibooker.book1D("VtxZEfficiency",
+                                                     "Vtx Z efficiency",
+                                                     numerator7->GetNbinsX(),
+                                                     numerator7->GetXaxis()->GetXmin(),
+                                                     numerator7->GetXaxis()->GetXmax());
+
+      // Calculate the efficiency
+      me_effic_VtxZ->getTH1F()->Divide(numerator7, denominator7, 1., 1., "B");
+      me_effic_VtxZ->getTH1F()->GetXaxis()->SetTitle("Tracking particle VtxZ [cm]");
+      me_effic_VtxZ->getTH1F()->GetYaxis()->SetTitle("Efficiency");
+      me_effic_VtxZ->getTH1F()->SetMaximum(1.0);
+      me_effic_VtxZ->getTH1F()->SetMinimum(0.0);
+      me_effic_VtxZ->getTH1F()->SetStats(false);
+    }  // if ME found
+    else {
+      edm::LogWarning("DataNotFound") << "Monitor elements for VtxZ efficiency cannot be found!\n";
+    }
+
+    if (merespt_eta0to0p7_pt2to3 && merespt_eta0p7to1_pt2to3 && merespt_eta1to1p2_pt2to3 &&
+        merespt_eta1p2to1p6_pt2to3 && merespt_eta1p6to2_pt2to3 && merespt_eta2to2p4_pt2to3) {
+      // Set the current directoy
+      dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalResolution");
+
+      // Grab the histograms
+      TH1F *resPt1a = merespt_eta0to0p7_pt2to3->getTH1F();
+      TH1F *resPt2a = merespt_eta0p7to1_pt2to3->getTH1F();
+      TH1F *resPt3a = merespt_eta1to1p2_pt2to3->getTH1F();
+      TH1F *resPt4a = merespt_eta1p2to1p6_pt2to3->getTH1F();
+      TH1F *resPt5a = merespt_eta1p6to2_pt2to3->getTH1F();
+      TH1F *resPt6a = merespt_eta2to2p4_pt2to3->getTH1F();
+
+      // Book the new histogram to contain the results
+      MonitorElement *me_res_pt1 =
+          ibooker.book1D("pTResVsEta_2-3", "p_{T} resolution vs |#eta|, for p_{T}: 2-3 GeV", eta_binnum, eta_bins);
+      TH1F *resPt1 = me_res_pt1->getTH1F();
+      resPt1->GetXaxis()->SetTitle("tracking particle |#eta|");
+      resPt1->GetYaxis()->SetTitle("#sigma(#Deltap_{T}/p_{T})");
+      resPt1->SetMinimum(0.0);
+      resPt1->SetStats(false);
+
+      int testNumEntries1 = resPt1a->GetEntries();
+      if (testNumEntries1 > 0) {
+        // Fit the histograms with a gaussian curve - take sigma and the error
+        // from the fit
+        resPt1a->Fit(fit2, "R");
+        resPt2a->Fit(fit2, "R");
+        resPt3a->Fit(fit2, "R");
+        resPt4a->Fit(fit2, "R");
+        resPt5a->Fit(fit2, "R");
+        resPt6a->Fit(fit2, "R");
+        sigma_pt1.push_back(resPt1a->GetFunction("fit2")->GetParameter(2));
+        sigma_pt1.push_back(resPt2a->GetFunction("fit2")->GetParameter(2));
+        sigma_pt1.push_back(resPt3a->GetFunction("fit2")->GetParameter(2));
+        sigma_pt1.push_back(resPt4a->GetFunction("fit2")->GetParameter(2));
+        sigma_pt1.push_back(resPt5a->GetFunction("fit2")->GetParameter(2));
+        sigma_pt1.push_back(resPt6a->GetFunction("fit2")->GetParameter(2));
+        error_pt1.push_back(resPt1a->GetFunction("fit2")->GetParError(2));
+        error_pt1.push_back(resPt2a->GetFunction("fit2")->GetParError(2));
+        error_pt1.push_back(resPt3a->GetFunction("fit2")->GetParError(2));
+        error_pt1.push_back(resPt4a->GetFunction("fit2")->GetParError(2));
+        error_pt1.push_back(resPt5a->GetFunction("fit2")->GetParError(2));
+        error_pt1.push_back(resPt6a->GetFunction("fit2")->GetParError(2));
+
+        // Fill the new histogram to create resolution plot
+        for (int i = 0; i < 6; i++) {
+          resPt1->SetBinContent(i + 1, sigma_pt1[i]);
+          resPt1->SetBinError(i + 1, error_pt1[i]);
+        }
+      } else {
+        edm::LogWarning("DataNotFound") << "L1 tracks not found for pT resolution (2-3)!\n";
+        for (int i = 0; i < 6; i++) {
+          resPt1->SetBinContent(i + 1, -1);
+          resPt1->SetBinError(i + 1, -1);
+        }
+      }
+    }  // if ME found
+    else {
+      edm::LogWarning("DataNotFound") << "Monitor elements for pT resolution (2-3) cannot be found!\n";
+    }
+
+    if (merespt_eta0to0p7_pt3to8 && merespt_eta0p7to1_pt3to8 && merespt_eta1to1p2_pt3to8 &&
+        merespt_eta1p2to1p6_pt3to8 && merespt_eta1p6to2_pt3to8 && merespt_eta2to2p4_pt3to8) {
+      // Set the current directoy
+      dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalResolution");
+
+      // Grab the histograms
+      TH1F *resPt1b = merespt_eta0to0p7_pt3to8->getTH1F();
+      TH1F *resPt2b = merespt_eta0p7to1_pt3to8->getTH1F();
+      TH1F *resPt3b = merespt_eta1to1p2_pt3to8->getTH1F();
+      TH1F *resPt4b = merespt_eta1p2to1p6_pt3to8->getTH1F();
+      TH1F *resPt5b = merespt_eta1p6to2_pt3to8->getTH1F();
+      TH1F *resPt6b = merespt_eta2to2p4_pt3to8->getTH1F();
+
+      // Book the new histogram to contain the results
+      MonitorElement *me_res_pt2 =
+          ibooker.book1D("pTResVsEta_3-8", "p_{T} resolution vs |#eta|, for p_{T}: 3-8 GeV", eta_binnum, eta_bins);
+      TH1F *resPt2 = me_res_pt2->getTH1F();
+      resPt2->GetXaxis()->SetTitle("tracking particle |#eta|");
+      resPt2->GetYaxis()->SetTitle("#sigma(#Deltap_{T}/p_{T})");
+      resPt2->SetMinimum(0.0);
+      resPt2->SetStats(false);
+
+      int testNumEntries2 = resPt1b->GetEntries();
+      if (testNumEntries2 > 0) {
+        // Fit the histograms with a gaussian curve - take sigma and the error
+        // from the fit
+        resPt1b->Fit(fit2, "R");
+        resPt2b->Fit(fit2, "R");
+        resPt3b->Fit(fit2, "R");
+        resPt4b->Fit(fit2, "R");
+        resPt5b->Fit(fit2, "R");
+        resPt6b->Fit(fit2, "R");
+        sigma_pt2.push_back(resPt1b->GetFunction("fit2")->GetParameter(2));
+        sigma_pt2.push_back(resPt2b->GetFunction("fit2")->GetParameter(2));
+        sigma_pt2.push_back(resPt3b->GetFunction("fit2")->GetParameter(2));
+        sigma_pt2.push_back(resPt4b->GetFunction("fit2")->GetParameter(2));
+        sigma_pt2.push_back(resPt5b->GetFunction("fit2")->GetParameter(2));
+        sigma_pt2.push_back(resPt6b->GetFunction("fit2")->GetParameter(2));
+        error_pt2.push_back(resPt1b->GetFunction("fit2")->GetParError(2));
+        error_pt2.push_back(resPt2b->GetFunction("fit2")->GetParError(2));
+        error_pt2.push_back(resPt3b->GetFunction("fit2")->GetParError(2));
+        error_pt2.push_back(resPt4b->GetFunction("fit2")->GetParError(2));
+        error_pt2.push_back(resPt5b->GetFunction("fit2")->GetParError(2));
+        error_pt2.push_back(resPt6b->GetFunction("fit2")->GetParError(2));
+
+        // Fill the new histogram to create resolution plot
+        for (int i = 0; i < 6; i++) {
+          resPt2->SetBinContent(i + 1, sigma_pt2[i]);
+          resPt2->SetBinError(i + 1, error_pt2[i]);
+        }
+      } else {
+        edm::LogWarning("DataNotFound") << "L1 tracks not found for pT resolution (3-8)!\n";
+        for (int i = 0; i < 6; i++) {
+          resPt2->SetBinContent(i + 1, -1);
+          resPt2->SetBinError(i + 1, -1);
+        }
+      }
+    }  // if ME found
+    else {
+      edm::LogWarning("DataNotFound") << "Monitor elements for pT resolution (3-8) cannot be found!\n";
+    }
+
+    if (merespt_eta0to0p7_pt8toInf && merespt_eta0p7to1_pt8toInf && merespt_eta1to1p2_pt8toInf &&
+        merespt_eta1p2to1p6_pt8toInf && merespt_eta1p6to2_pt8toInf && merespt_eta2to2p4_pt8toInf) {
+      // Set the current directoy
+      dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalResolution");
+
+      // Grab the histograms
+      TH1F *resPt1c = merespt_eta0to0p7_pt8toInf->getTH1F();
+      TH1F *resPt2c = merespt_eta0p7to1_pt8toInf->getTH1F();
+      TH1F *resPt3c = merespt_eta1to1p2_pt8toInf->getTH1F();
+      TH1F *resPt4c = merespt_eta1p2to1p6_pt8toInf->getTH1F();
+      TH1F *resPt5c = merespt_eta1p6to2_pt8toInf->getTH1F();
+      TH1F *resPt6c = merespt_eta2to2p4_pt8toInf->getTH1F();
+
+      // Book the new histogram to contain the results
+      MonitorElement *me_res_pt3 =
+          ibooker.book1D("pTResVsEta_8-inf", "p_{T} resolution vs |#eta|, for p_{T}: >8 GeV", eta_binnum, eta_bins);
+      TH1F *resPt3 = me_res_pt3->getTH1F();
+      resPt3->GetXaxis()->SetTitle("tracking particle |#eta|");
+      resPt3->GetYaxis()->SetTitle("#sigma(#Deltap_{T}/p_{T})");
+      resPt3->SetMinimum(0.0);
+      resPt3->SetStats(false);
+
+      int testNumEntries3 = resPt1c->GetEntries();
+      if (testNumEntries3 > 0) {
+        // Fit the histograms with a gaussian curve - take sigma and the error
+        // from the fit
+        resPt1c->Fit(fit2, "R");
+        resPt2c->Fit(fit2, "R");
+        resPt3c->Fit(fit2, "R");
+        resPt4c->Fit(fit2, "R");
+        resPt5c->Fit(fit2, "R");
+        resPt6c->Fit(fit2, "R");
+        sigma_pt3.push_back(resPt1c->GetFunction("fit2")->GetParameter(2));
+        sigma_pt3.push_back(resPt2c->GetFunction("fit2")->GetParameter(2));
+        sigma_pt3.push_back(resPt3c->GetFunction("fit2")->GetParameter(2));
+        sigma_pt3.push_back(resPt4c->GetFunction("fit2")->GetParameter(2));
+        sigma_pt3.push_back(resPt5c->GetFunction("fit2")->GetParameter(2));
+        sigma_pt3.push_back(resPt6c->GetFunction("fit2")->GetParameter(2));
+        error_pt3.push_back(resPt1c->GetFunction("fit2")->GetParError(2));
+        error_pt3.push_back(resPt2c->GetFunction("fit2")->GetParError(2));
+        error_pt3.push_back(resPt3c->GetFunction("fit2")->GetParError(2));
+        error_pt3.push_back(resPt4c->GetFunction("fit2")->GetParError(2));
+        error_pt3.push_back(resPt5c->GetFunction("fit2")->GetParError(2));
+        error_pt3.push_back(resPt6c->GetFunction("fit2")->GetParError(2));
+
+        // Fill the new histogram to create resolution plot
+        for (int i = 0; i < 6; i++) {
+          resPt3->SetBinContent(i + 1, sigma_pt3[i]);
+          resPt3->SetBinError(i + 1, error_pt3[i]);
+        }
+      } else {
+        edm::LogWarning("DataNotFound") << "L1 tracks not found for pT resolution (8-inf)!\n";
+        for (int i = 0; i < 6; i++) {
+          resPt3->SetBinContent(i + 1, -1);
+          resPt3->SetBinError(i + 1, -1);
+        }
+      }
+    }  // if ME found
+    else {
+      edm::LogWarning("DataNotFound") << "Monitor elements for pT resolution (8-inf) cannot be found!\n";
+    }
+
+    if (mereseta_eta0to0p7 && mereseta_eta0p7to1 && mereseta_eta1to1p2 && mereseta_eta1p2to1p6 && mereseta_eta1p6to2 &&
+        mereseta_eta2to2p4) {
+      // Set the current directoy
+      dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalResolution");
+
+      // Grab the histograms
+      TH1F *resEta1 = mereseta_eta0to0p7->getTH1F();
+      TH1F *resEta2 = mereseta_eta0p7to1->getTH1F();
+      TH1F *resEta3 = mereseta_eta1to1p2->getTH1F();
+      TH1F *resEta4 = mereseta_eta1p2to1p6->getTH1F();
+      TH1F *resEta5 = mereseta_eta1p6to2->getTH1F();
+      TH1F *resEta6 = mereseta_eta2to2p4->getTH1F();
+
+      // Book the new histogram to contain the results
+      MonitorElement *me_res_eta = ibooker.book1D("EtaResolution", "#eta resolution vs |#eta|", eta_binnum, eta_bins);
+      TH1F *resEta = me_res_eta->getTH1F();
+      resEta->GetXaxis()->SetTitle("tracking particle |#eta|");
+      resEta->GetYaxis()->SetTitle("#sigma(#Delta#eta)");
+      resEta->SetMinimum(0.0);
+      resEta->SetStats(false);
+
+      int testNumEntries4 = resEta1->GetEntries();
+      if (testNumEntries4 > 0) {
+        // Fit the histograms with a gaussian curve - take sigma and the error
+        // from the fit
+        resEta1->Fit(fit, "R");
+        resEta2->Fit(fit, "R");
+        resEta3->Fit(fit, "R");
+        resEta4->Fit(fit, "R");
+        resEta5->Fit(fit, "R");
+        resEta6->Fit(fit, "R");
+        sigma_eta.push_back(resEta1->GetFunction("fit")->GetParameter(2));
+        sigma_eta.push_back(resEta2->GetFunction("fit")->GetParameter(2));
+        sigma_eta.push_back(resEta3->GetFunction("fit")->GetParameter(2));
+        sigma_eta.push_back(resEta4->GetFunction("fit")->GetParameter(2));
+        sigma_eta.push_back(resEta5->GetFunction("fit")->GetParameter(2));
+        sigma_eta.push_back(resEta6->GetFunction("fit")->GetParameter(2));
+        error_eta.push_back(resEta1->GetFunction("fit")->GetParError(2));
+        error_eta.push_back(resEta2->GetFunction("fit")->GetParError(2));
+        error_eta.push_back(resEta3->GetFunction("fit")->GetParError(2));
+        error_eta.push_back(resEta4->GetFunction("fit")->GetParError(2));
+        error_eta.push_back(resEta5->GetFunction("fit")->GetParError(2));
+        error_eta.push_back(resEta6->GetFunction("fit")->GetParError(2));
+
+        // Fill the new histogram to create resolution plot
+        for (int i = 0; i < 6; i++) {
+          resEta->SetBinContent(i + 1, sigma_eta[i]);
+          resEta->SetBinError(i + 1, error_eta[i]);
+        }
+      } else {
+        edm::LogWarning("DataNotFound") << "L1 tracks not found for eta resolution!\n";
+        for (int i = 0; i < 6; i++) {
+          resEta->SetBinContent(i + 1, -1);
+          resEta->SetBinError(i + 1, -1);
+        }
+      }
+    }  // if ME found
+    else {
+      edm::LogWarning("DataNotFound") << "Monitor elements for eta resolution cannot be found!\n";
+    }
+
+    if (meresphi_eta0to0p7 && meresphi_eta0p7to1 && meresphi_eta1to1p2 && meresphi_eta1p2to1p6 && meresphi_eta1p6to2 &&
+        meresphi_eta2to2p4) {
+      // Set the current directoy
+      dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalResolution");
+
+      // Grab the histograms
+      TH1F *resPhi1 = meresphi_eta0to0p7->getTH1F();
+      TH1F *resPhi2 = meresphi_eta0p7to1->getTH1F();
+      TH1F *resPhi3 = meresphi_eta1to1p2->getTH1F();
+      TH1F *resPhi4 = meresphi_eta1p2to1p6->getTH1F();
+      TH1F *resPhi5 = meresphi_eta1p6to2->getTH1F();
+      TH1F *resPhi6 = meresphi_eta2to2p4->getTH1F();
+
+      // Book the new histogram to contain the results
+      MonitorElement *me_res_phi = ibooker.book1D("PhiResolution", "#phi resolution vs |#eta|", eta_binnum, eta_bins);
+      TH1F *resPhi = me_res_phi->getTH1F();
+      resPhi->GetXaxis()->SetTitle("tracking particle |#eta|");
+      resPhi->GetYaxis()->SetTitle("#sigma(#Delta#phi)");
+      resPhi->SetMinimum(0.0);
+      resPhi->SetStats(false);
+
+      int testNumEntries5 = resPhi1->GetEntries();
+      if (testNumEntries5 > 0) {
+        // Fit the histograms with a gaussian curve - take sigma and the error
+        // from the fit
+        resPhi1->Fit(fit, "R");
+        resPhi2->Fit(fit, "R");
+        resPhi3->Fit(fit, "R");
+        resPhi4->Fit(fit, "R");
+        resPhi5->Fit(fit, "R");
+        resPhi6->Fit(fit, "R");
+        sigma_phi.push_back(resPhi1->GetFunction("fit")->GetParameter(2));
+        sigma_phi.push_back(resPhi2->GetFunction("fit")->GetParameter(2));
+        sigma_phi.push_back(resPhi3->GetFunction("fit")->GetParameter(2));
+        sigma_phi.push_back(resPhi4->GetFunction("fit")->GetParameter(2));
+        sigma_phi.push_back(resPhi5->GetFunction("fit")->GetParameter(2));
+        sigma_phi.push_back(resPhi6->GetFunction("fit")->GetParameter(2));
+        error_phi.push_back(resPhi1->GetFunction("fit")->GetParError(2));
+        error_phi.push_back(resPhi2->GetFunction("fit")->GetParError(2));
+        error_phi.push_back(resPhi3->GetFunction("fit")->GetParError(2));
+        error_phi.push_back(resPhi4->GetFunction("fit")->GetParError(2));
+        error_phi.push_back(resPhi5->GetFunction("fit")->GetParError(2));
+        error_phi.push_back(resPhi6->GetFunction("fit")->GetParError(2));
+
+        // Fill the new histogram to create resolution plot
+        for (int i = 0; i < 6; i++) {
+          resPhi->SetBinContent(i + 1, sigma_phi[i]);
+          resPhi->SetBinError(i + 1, error_phi[i]);
+        }
+      } else {
+        edm::LogWarning("DataNotFound") << "L1 tracks not found for phi resolution!\n";
+        for (int i = 0; i < 6; i++) {
+          resPhi->SetBinContent(i + 1, -1);
+          resPhi->SetBinError(i + 1, -1);
+        }
+      }
+    }  // if ME found
+    else {
+      edm::LogWarning("DataNotFound") << "Monitor elements for phi resolution cannot be found!\n";
+    }
+
+    if (meresVtxZ_eta0to0p7 && meresVtxZ_eta0p7to1 && meresVtxZ_eta1to1p2 && meresVtxZ_eta1p2to1p6 &&
+        meresVtxZ_eta1p6to2 && meresVtxZ_eta2to2p4) {
+      // Set the current directoy
+      dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalResolution");
+
+      // Grab the histograms
+      TH1F *resVtxZ_1 = meresVtxZ_eta0to0p7->getTH1F();
+      TH1F *resVtxZ_2 = meresVtxZ_eta0p7to1->getTH1F();
+      TH1F *resVtxZ_3 = meresVtxZ_eta1to1p2->getTH1F();
+      TH1F *resVtxZ_4 = meresVtxZ_eta1p2to1p6->getTH1F();
+      TH1F *resVtxZ_5 = meresVtxZ_eta1p6to2->getTH1F();
+      TH1F *resVtxZ_6 = meresVtxZ_eta2to2p4->getTH1F();
+
+      // Book the new histogram to contain the results
+      MonitorElement *me_res_VtxZ = ibooker.book1D("VtxZResolution", "VtxZ resolution vs |#eta|", eta_binnum, eta_bins);
+      TH1F *resVtxZ = me_res_VtxZ->getTH1F();
+      resVtxZ->GetXaxis()->SetTitle("tracking particle |#eta|");
+      resVtxZ->GetYaxis()->SetTitle("#sigma(#DeltaVtxZ) [cm]");
+      resVtxZ->SetMinimum(0.0);
+      resVtxZ->SetStats(false);
+
+      int testNumEntries6 = resVtxZ_1->GetEntries();
+      if (testNumEntries6 > 0) {
+        // Fit the histograms with a gaussian curve - take sigma and the error
+        // from the fit
+        resVtxZ_1->Fit(fit3, "R");
+        resVtxZ_2->Fit(fit3, "R");
+        resVtxZ_3->Fit(fit3, "R");
+        resVtxZ_4->Fit(fit3, "R");
+        resVtxZ_5->Fit(fit3, "R");
+        resVtxZ_6->Fit(fit3, "R");
+        sigma_VtxZ.push_back(resVtxZ_1->GetFunction("fit3")->GetParameter(2));
+        sigma_VtxZ.push_back(resVtxZ_2->GetFunction("fit3")->GetParameter(2));
+        sigma_VtxZ.push_back(resVtxZ_3->GetFunction("fit3")->GetParameter(2));
+        sigma_VtxZ.push_back(resVtxZ_4->GetFunction("fit3")->GetParameter(2));
+        sigma_VtxZ.push_back(resVtxZ_5->GetFunction("fit3")->GetParameter(2));
+        sigma_VtxZ.push_back(resVtxZ_6->GetFunction("fit3")->GetParameter(2));
+        error_VtxZ.push_back(resVtxZ_1->GetFunction("fit3")->GetParError(2));
+        error_VtxZ.push_back(resVtxZ_2->GetFunction("fit3")->GetParError(2));
+        error_VtxZ.push_back(resVtxZ_3->GetFunction("fit3")->GetParError(2));
+        error_VtxZ.push_back(resVtxZ_4->GetFunction("fit3")->GetParError(2));
+        error_VtxZ.push_back(resVtxZ_5->GetFunction("fit3")->GetParError(2));
+        error_VtxZ.push_back(resVtxZ_6->GetFunction("fit3")->GetParError(2));
+
+        // Fill the new histogram to create resolution plot
+        for (int i = 0; i < 6; i++) {
+          resVtxZ->SetBinContent(i + 1, sigma_VtxZ[i]);
+          resVtxZ->SetBinError(i + 1, error_VtxZ[i]);
+        }
+      } else {
+        edm::LogWarning("DataNotFound") << "L1 tracks not found for VtxZ resolution!\n";
+        for (int i = 0; i < 6; i++) {
+          resVtxZ->SetBinContent(i + 1, -1);
+          resVtxZ->SetBinError(i + 1, -1);
+        }
+      }
+    }  // if ME found
+    else {
+      edm::LogWarning("DataNotFound") << "Monitor elements for VtxZ resolution cannot be found!\n";
+    }
+
+    if (meresd0_eta0to0p7 && meresd0_eta0p7to1 && meresd0_eta1to1p2 && meresd0_eta1p2to1p6 && meresd0_eta1p6to2 &&
+        meresd0_eta2to2p4) {
+      // Set the current directoy
+      dbe->setCurrentFolder("SiOuterTrackerV/Tracks/FinalResolution");
+
+      // Grab the histograms
+      TH1F *resd0_1 = meresd0_eta0to0p7->getTH1F();
+      TH1F *resd0_2 = meresd0_eta0p7to1->getTH1F();
+      TH1F *resd0_3 = meresd0_eta1to1p2->getTH1F();
+      TH1F *resd0_4 = meresd0_eta1p2to1p6->getTH1F();
+      TH1F *resd0_5 = meresd0_eta1p6to2->getTH1F();
+      TH1F *resd0_6 = meresd0_eta2to2p4->getTH1F();
+
+      // Book the new histogram to contain the results
+      MonitorElement *me_res_d0 = ibooker.book1D("d0Resolution", "d_{0} resolution vs |#eta|", eta_binnum, eta_bins);
+      TH1F *resd0 = me_res_d0->getTH1F();
+      resd0->GetXaxis()->SetTitle("tracking particle |#eta|");
+      resd0->GetYaxis()->SetTitle("#sigma(#Deltad_{0}) [cm]");
+      resd0->SetMinimum(0.0);
+      resd0->SetStats(false);
+
+      int testNumEntries7 = resd0_1->GetEntries();
+      if (testNumEntries7 > 0) {
+        // Fit the histograms with a gaussian curve - take sigma and the error
+        // from the fit
+        resd0_1->Fit(fit, "R");
+        resd0_2->Fit(fit, "R");
+        resd0_3->Fit(fit, "R");
+        resd0_4->Fit(fit, "R");
+        resd0_5->Fit(fit, "R");
+        resd0_6->Fit(fit, "R");
+        sigma_d0.push_back(resd0_1->GetFunction("fit")->GetParameter(2));
+        sigma_d0.push_back(resd0_2->GetFunction("fit")->GetParameter(2));
+        sigma_d0.push_back(resd0_3->GetFunction("fit")->GetParameter(2));
+        sigma_d0.push_back(resd0_4->GetFunction("fit")->GetParameter(2));
+        sigma_d0.push_back(resd0_5->GetFunction("fit")->GetParameter(2));
+        sigma_d0.push_back(resd0_6->GetFunction("fit")->GetParameter(2));
+        error_d0.push_back(resd0_1->GetFunction("fit")->GetParError(2));
+        error_d0.push_back(resd0_2->GetFunction("fit")->GetParError(2));
+        error_d0.push_back(resd0_3->GetFunction("fit")->GetParError(2));
+        error_d0.push_back(resd0_4->GetFunction("fit")->GetParError(2));
+        error_d0.push_back(resd0_5->GetFunction("fit")->GetParError(2));
+        error_d0.push_back(resd0_6->GetFunction("fit")->GetParError(2));
+
+        // Fill the new histogram to create resolution plot
+        for (int i = 0; i < 6; i++) {
+          resd0->SetBinContent(i + 1, sigma_d0[i]);
+          resd0->SetBinError(i + 1, error_d0[i]);
+        }
+      } else {
+        edm::LogWarning("DataNotFound") << "L1 tracks not found for d0 resolution!\n";
+        for (int i = 0; i < 6; i++) {
+          resd0->SetBinContent(i + 1, -1);
+          resd0->SetBinError(i + 1, -1);
+        }
+      }
+    }  // if ME found
+    else {
+      edm::LogWarning("DataNotFound") << "Monitor elements for d0 resolution cannot be found!\n";
+    }
+
+  }  // if dbe found
+  else {
+    edm::LogWarning("DataNotFound") << "Cannot find valid DQM back end \n";
+  }
+  delete fit;
+  delete fit2;
+  delete fit3;
+}  // end dqmEndJob
 
 DEFINE_FWK_MODULE(OuterTrackerMCHarvester);
diff --git a/Validation/SiPixelPhase1DigisV/interface/SiPixelPhase1DigisV.h b/Validation/SiPixelPhase1DigisV/interface/SiPixelPhase1DigisV.h
index fc9d579e44838..fba4627b2b78f 100644
--- a/Validation/SiPixelPhase1DigisV/interface/SiPixelPhase1DigisV.h
+++ b/Validation/SiPixelPhase1DigisV/interface/SiPixelPhase1DigisV.h
@@ -1,10 +1,10 @@
-#ifndef SiPixelPhase1DigisV_h // Can we use #pragma once?
+#ifndef SiPixelPhase1DigisV_h  // Can we use #pragma once?
 #define SiPixelPhase1DigisV_h
 // -*- C++ -*-
 //
 // Package:     SiPixelPhase1DigisV
 // Class  :     SiPixelPhase1DigisV
-// 
+//
 
 // Original Author: Marcel Schneider
 // Additional Authors: Alexander Morton - modifying code for validation use
@@ -17,38 +17,37 @@
 #include "DQM/SiPixelPhase1Common/interface/SiPixelPhase1Base.h"
 
 class SiPixelPhase1DigisV : public SiPixelPhase1Base {
-  // List of quantities to be plotted. 
+  // List of quantities to be plotted.
   enum {
-    ADC, // digi ADC readouts
-    NDIGIS, // number of digis per event and module
-    ROW, // number of digis per row
-    COLUMN, // number of digis per column
+    ADC,     // digi ADC readouts
+    NDIGIS,  // number of digis per event and module
+    ROW,     // number of digis per row
+    COLUMN,  // number of digis per column
 
-    MAX_HIST // a sentinel that gives the number of quantities (not a plot).
+    MAX_HIST  // a sentinel that gives the number of quantities (not a plot).
   };
-  public:
-  explicit SiPixelPhase1DigisV(const edm::ParameterSet& conf);
 
-  void analyze(const edm::Event&, const edm::EventSetup&) override ;
+public:
+  explicit SiPixelPhase1DigisV(const edm::ParameterSet &conf);
 
-  private:
-  edm::EDGetTokenT<edm::DetSetVector<PixelDigi>> srcToken_;
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
+private:
+  edm::EDGetTokenT<edm::DetSetVector<PixelDigi>> srcToken_;
 };
 
 class SiPixelPhase1DigisHarvesterV : public SiPixelPhase1Harvester {
   enum {
-    ADC, // digi ADC readouts
-    NDIGIS, // number of digis per event and module
-    ROW, // number of digis per row
-    COLUMN, // number of digis per column
+    ADC,     // digi ADC readouts
+    NDIGIS,  // number of digis per event and module
+    ROW,     // number of digis per row
+    COLUMN,  // number of digis per column
 
     MAX_HIST
   };
-  public:
-  explicit SiPixelPhase1DigisHarvesterV(const edm::ParameterSet& conf);
 
+public:
+  explicit SiPixelPhase1DigisHarvesterV(const edm::ParameterSet &conf);
 };
 
 #endif
-
diff --git a/Validation/SiPixelPhase1DigisV/src/SiPixelPhase1DigisHarvesterV.cc b/Validation/SiPixelPhase1DigisV/src/SiPixelPhase1DigisHarvesterV.cc
index 6f7b15eea0249..32cb46eb04933 100644
--- a/Validation/SiPixelPhase1DigisV/src/SiPixelPhase1DigisHarvesterV.cc
+++ b/Validation/SiPixelPhase1DigisV/src/SiPixelPhase1DigisHarvesterV.cc
@@ -7,12 +7,10 @@
 // Original Author: Marcel Schneider
 // Additional Authors: Alexander Morton - modifying code for validation use
 
-#include "Validation/SiPixelPhase1DigisV/interface/SiPixelPhase1DigisV.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "Validation/SiPixelPhase1DigisV/interface/SiPixelPhase1DigisV.h"
 
-SiPixelPhase1DigisHarvesterV::SiPixelPhase1DigisHarvesterV(const edm::ParameterSet& iConfig) :
-  SiPixelPhase1Harvester(iConfig) 
-{}
+SiPixelPhase1DigisHarvesterV::SiPixelPhase1DigisHarvesterV(const edm::ParameterSet &iConfig)
+    : SiPixelPhase1Harvester(iConfig) {}
 
 DEFINE_FWK_MODULE(SiPixelPhase1DigisHarvesterV);
-
diff --git a/Validation/SiPixelPhase1DigisV/src/SiPixelPhase1DigisV.cc b/Validation/SiPixelPhase1DigisV/src/SiPixelPhase1DigisV.cc
index 4d7fb4a5f617a..f8fd2279b57a0 100644
--- a/Validation/SiPixelPhase1DigisV/src/SiPixelPhase1DigisV.cc
+++ b/Validation/SiPixelPhase1DigisV/src/SiPixelPhase1DigisV.cc
@@ -13,36 +13,33 @@
 #include <iostream>
 
 // CMSSW stuff
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 // DQM Stuff
 #include "DQMServices/Core/interface/MonitorElement.h"
 
-SiPixelPhase1DigisV::SiPixelPhase1DigisV(const edm::ParameterSet& iConfig) :
-  SiPixelPhase1Base(iConfig)
-{
+SiPixelPhase1DigisV::SiPixelPhase1DigisV(const edm::ParameterSet &iConfig) : SiPixelPhase1Base(iConfig) {
   srcToken_ = consumes<edm::DetSetVector<PixelDigi>>(iConfig.getParameter<edm::InputTag>("src"));
-} 
-
-void SiPixelPhase1DigisV::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
+}
 
+void SiPixelPhase1DigisV::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   edm::Handle<edm::DetSetVector<PixelDigi>> input;
   iEvent.getByToken(srcToken_, input);
-  if (!input.isValid()) return; 
+  if (!input.isValid())
+    return;
 
   edm::DetSetVector<PixelDigi>::const_iterator it;
   for (it = input->begin(); it != input->end(); ++it) {
-    for(PixelDigi const& digi : *it) {
-      histo[ADC].fill((double) digi.adc(), DetId(it->detId()), &iEvent);
-      histo[NDIGIS    ].fill(DetId(it->detId()), &iEvent); // count
-      histo[ROW].fill((double) digi.row(), DetId(it->detId()), &iEvent);
-      histo[COLUMN].fill((double) digi.column(), DetId(it->detId()), &iEvent);
+    for (PixelDigi const &digi : *it) {
+      histo[ADC].fill((double)digi.adc(), DetId(it->detId()), &iEvent);
+      histo[NDIGIS].fill(DetId(it->detId()), &iEvent);  // count
+      histo[ROW].fill((double)digi.row(), DetId(it->detId()), &iEvent);
+      histo[COLUMN].fill((double)digi.column(), DetId(it->detId()), &iEvent);
     }
   }
-  histo[NDIGIS    ].executePerEventHarvesting(&iEvent);
+  histo[NDIGIS].executePerEventHarvesting(&iEvent);
 }
 
 DEFINE_FWK_MODULE(SiPixelPhase1DigisV);
-
diff --git a/Validation/SiPixelPhase1HitsV/interface/SiPixelPhase1HitsV.h b/Validation/SiPixelPhase1HitsV/interface/SiPixelPhase1HitsV.h
index c55251353179a..79b8194b06aa3 100644
--- a/Validation/SiPixelPhase1HitsV/interface/SiPixelPhase1HitsV.h
+++ b/Validation/SiPixelPhase1HitsV/interface/SiPixelPhase1HitsV.h
@@ -1,7 +1,7 @@
-#ifndef SiPixelPhase1HitsV_h 
-#define SiPixelPhase1HitsV_h 
+#ifndef SiPixelPhase1HitsV_h
+#define SiPixelPhase1HitsV_h
 // -*- C++ -*-
-// 
+//
 // Package:     SiPixelPhase1HitsV
 // Class  :     SiPixelPhase1HitsV
 //
@@ -11,8 +11,8 @@
 
 #include "DQM/SiPixelPhase1Common/interface/SiPixelPhase1Base.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
-#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
 #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
+#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
 
 namespace reco {
   class TrackToTrackingParticleAssociator;
@@ -33,21 +33,19 @@ class SiPixelPhase1HitsV : public SiPixelPhase1Base {
     EFFICIENCY_TRACK,
   };
 
-  public:
-  explicit SiPixelPhase1HitsV(const edm::ParameterSet& conf);
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+public:
+  explicit SiPixelPhase1HitsV(const edm::ParameterSet &conf);
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
-  private:
+private:
   edm::EDGetTokenT<edm::PSimHitContainer> pixelBarrelLowToken_;
   edm::EDGetTokenT<edm::PSimHitContainer> pixelBarrelHighToken_;
   edm::EDGetTokenT<edm::PSimHitContainer> pixelForwardLowToken_;
   edm::EDGetTokenT<edm::PSimHitContainer> pixelForwardHighToken_;
 
-  edm::EDGetTokenT< edm::View<reco::Track> > tracksToken_;
-  edm::EDGetTokenT< TrackingParticleCollection > tpToken_;
-  edm::EDGetTokenT< reco::TrackToTrackingParticleAssociator > trackAssociatorByHitsToken_;
-
+  edm::EDGetTokenT<edm::View<reco::Track>> tracksToken_;
+  edm::EDGetTokenT<TrackingParticleCollection> tpToken_;
+  edm::EDGetTokenT<reco::TrackToTrackingParticleAssociator> trackAssociatorByHitsToken_;
 };
 
 #endif
-
diff --git a/Validation/SiPixelPhase1HitsV/src/SiPixelPhase1HitsV.cc b/Validation/SiPixelPhase1HitsV/src/SiPixelPhase1HitsV.cc
index 646e703817323..450530500abc2 100644
--- a/Validation/SiPixelPhase1HitsV/src/SiPixelPhase1HitsV.cc
+++ b/Validation/SiPixelPhase1HitsV/src/SiPixelPhase1HitsV.cc
@@ -7,73 +7,76 @@
 // Original Author: Marcel Schneider
 // Additional Authors: Alexander Morton - modifying code for validation use
 
-#include "Validation/SiPixelPhase1HitsV/interface/SiPixelPhase1HitsV.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Utilities/interface/Exception.h"
+#include "Validation/SiPixelPhase1HitsV/interface/SiPixelPhase1HitsV.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-//class TrackAssociatorByHits; 
-
-SiPixelPhase1HitsV::SiPixelPhase1HitsV(const edm::ParameterSet& iConfig) :
-  SiPixelPhase1Base(iConfig),
-  pixelBarrelLowToken_ ( consumes<edm::PSimHitContainer>(iConfig.getParameter<edm::InputTag>("pixBarrelLowSrc")) ),
-  pixelBarrelHighToken_ ( consumes<edm::PSimHitContainer>(iConfig.getParameter<edm::InputTag>("pixBarrelHighSrc")) ),
-  pixelForwardLowToken_ ( consumes<edm::PSimHitContainer>(iConfig.getParameter<edm::InputTag>("pixForwardLowSrc")) ),
-  pixelForwardHighToken_ ( consumes<edm::PSimHitContainer>(iConfig.getParameter<edm::InputTag>("pixForwardHighSrc")) ),
+// class TrackAssociatorByHits;
 
-  tracksToken_ ( consumes< edm::View<reco::Track> >(iConfig.getParameter<edm::InputTag>("tracksTag")) ),
-  tpToken_ ( consumes< TrackingParticleCollection >(iConfig.getParameter<edm::InputTag>("tpTag")) ),
-  trackAssociatorByHitsToken_ ( consumes< reco::TrackToTrackingParticleAssociator >(iConfig.getParameter<edm::InputTag>("trackAssociatorByHitsTag")) )
-{}
+SiPixelPhase1HitsV::SiPixelPhase1HitsV(const edm::ParameterSet &iConfig)
+    : SiPixelPhase1Base(iConfig),
+      pixelBarrelLowToken_(consumes<edm::PSimHitContainer>(iConfig.getParameter<edm::InputTag>("pixBarrelLowSrc"))),
+      pixelBarrelHighToken_(consumes<edm::PSimHitContainer>(iConfig.getParameter<edm::InputTag>("pixBarrelHighSrc"))),
+      pixelForwardLowToken_(consumes<edm::PSimHitContainer>(iConfig.getParameter<edm::InputTag>("pixForwardLowSrc"))),
+      pixelForwardHighToken_(consumes<edm::PSimHitContainer>(iConfig.getParameter<edm::InputTag>("pixForwardHighSrc"))),
 
-void SiPixelPhase1HitsV::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
+      tracksToken_(consumes<edm::View<reco::Track>>(iConfig.getParameter<edm::InputTag>("tracksTag"))),
+      tpToken_(consumes<TrackingParticleCollection>(iConfig.getParameter<edm::InputTag>("tpTag"))),
+      trackAssociatorByHitsToken_(consumes<reco::TrackToTrackingParticleAssociator>(
+          iConfig.getParameter<edm::InputTag>("trackAssociatorByHitsTag"))) {}
 
+void SiPixelPhase1HitsV::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   edm::Handle<edm::PSimHitContainer> barrelLowInput;
   iEvent.getByToken(pixelBarrelLowToken_, barrelLowInput);
-  if (!barrelLowInput.isValid()) return;
+  if (!barrelLowInput.isValid())
+    return;
 
   edm::Handle<edm::PSimHitContainer> barrelHighInput;
   iEvent.getByToken(pixelBarrelHighToken_, barrelHighInput);
-  if (!barrelHighInput.isValid()) return;
+  if (!barrelHighInput.isValid())
+    return;
 
   edm::Handle<edm::PSimHitContainer> forwardLowInput;
   iEvent.getByToken(pixelForwardLowToken_, forwardLowInput);
-  if (!forwardLowInput.isValid()) return;
+  if (!forwardLowInput.isValid())
+    return;
 
   edm::Handle<edm::PSimHitContainer> forwardHighInput;
   iEvent.getByToken(pixelForwardHighToken_, forwardHighInput);
-  if (!forwardHighInput.isValid()) return;
+  if (!forwardHighInput.isValid())
+    return;
 
   edm::PSimHitContainer::const_iterator it;
 
   // Get geometry information
 
   edm::ESHandle<TrackerGeometry> tracker;
-  iSetup.get<TrackerDigiGeometryRecord>().get( tracker );
+  iSetup.get<TrackerDigiGeometryRecord>().get(tracker);
 
   // get low barrel info
   for (it = barrelLowInput->begin(); it != barrelLowInput->end(); ++it) {
     auto id = DetId(it->detUnitId());
-    const GeomDetUnit * det=(const GeomDetUnit*)tracker->idToDetUnit( id );
-    GlobalPoint gpos=det->toGlobal(it->localPosition());
+    const GeomDetUnit *det = (const GeomDetUnit *)tracker->idToDetUnit(id);
+    GlobalPoint gpos = det->toGlobal(it->localPosition());
 
     float tof = it->timeOfFlight();
     float globalR = gpos.mag();
 
     float energyLoss = it->energyLoss();
 
-    float entryExitX = ( it->entryPoint().x() - it->exitPoint().x() );
-    float entryExitY = ( it->entryPoint().y() - it->exitPoint().y() );
-    float entryExitZ = std::abs( it->entryPoint().z() - it->exitPoint().z() );
+    float entryExitX = (it->entryPoint().x() - it->exitPoint().x());
+    float entryExitY = (it->entryPoint().y() - it->exitPoint().y());
+    float entryExitZ = std::abs(it->entryPoint().z() - it->exitPoint().z());
 
     float localX = it->localPosition().x();
     float localY = it->localPosition().y();
@@ -87,25 +90,25 @@ void SiPixelPhase1HitsV::analyze(const edm::Event& iEvent, const edm::EventSetup
     histo[ENTRY_EXIT_Y].fill(entryExitY, id, &iEvent);
     histo[ENTRY_EXIT_Z].fill(entryExitZ, id, &iEvent);
     histo[LOCAL_X].fill(localX, id, &iEvent);
-    histo[LOCAL_Y].fill(localY,  id, &iEvent);
-    histo[LOCAL_Z].fill(localZ,  id, &iEvent);
-    histo[LOCAL_PHI].fill(localPhi,  id, &iEvent);
-    histo[LOCAL_ETA].fill(localEta,  id, &iEvent);
-  } 
+    histo[LOCAL_Y].fill(localY, id, &iEvent);
+    histo[LOCAL_Z].fill(localZ, id, &iEvent);
+    histo[LOCAL_PHI].fill(localPhi, id, &iEvent);
+    histo[LOCAL_ETA].fill(localEta, id, &iEvent);
+  }
   // get high barrel info
   for (it = barrelHighInput->begin(); it != barrelHighInput->end(); ++it) {
     auto id = DetId(it->detUnitId());
-    const GeomDetUnit * det=(const GeomDetUnit*)tracker->idToDetUnit( id );
-    GlobalPoint gpos=det->toGlobal(it->localPosition());
+    const GeomDetUnit *det = (const GeomDetUnit *)tracker->idToDetUnit(id);
+    GlobalPoint gpos = det->toGlobal(it->localPosition());
 
     float tof = it->timeOfFlight();
     float globalR = gpos.mag();
 
     float energyLoss = it->energyLoss();
 
-    float entryExitX = ( it->entryPoint().x() - it->exitPoint().x() );
-    float entryExitY = ( it->entryPoint().y() - it->exitPoint().y() );
-    float entryExitZ = std::abs( it->entryPoint().z() - it->exitPoint().z() );
+    float entryExitX = (it->entryPoint().x() - it->exitPoint().x());
+    float entryExitY = (it->entryPoint().y() - it->exitPoint().y());
+    float entryExitZ = std::abs(it->entryPoint().z() - it->exitPoint().z());
 
     float localX = it->localPosition().x();
     float localY = it->localPosition().y();
@@ -120,25 +123,25 @@ void SiPixelPhase1HitsV::analyze(const edm::Event& iEvent, const edm::EventSetup
     histo[ENTRY_EXIT_Z].fill(entryExitZ, id, &iEvent);
     histo[LOCAL_X].fill(localX, id, &iEvent);
     histo[LOCAL_Y].fill(localY, id, &iEvent);
-    histo[LOCAL_Z].fill(localZ,  id, &iEvent);
-    histo[LOCAL_PHI].fill(localPhi,  id, &iEvent);
-    histo[LOCAL_ETA].fill(localEta,  id, &iEvent);
+    histo[LOCAL_Z].fill(localZ, id, &iEvent);
+    histo[LOCAL_PHI].fill(localPhi, id, &iEvent);
+    histo[LOCAL_ETA].fill(localEta, id, &iEvent);
   }
 
   // get low forward info
   for (it = forwardLowInput->begin(); it != forwardLowInput->end(); ++it) {
     auto id = DetId(it->detUnitId());
-    const GeomDetUnit * det=(const GeomDetUnit*)tracker->idToDetUnit( id );
-    GlobalPoint gpos=det->toGlobal(it->localPosition());
+    const GeomDetUnit *det = (const GeomDetUnit *)tracker->idToDetUnit(id);
+    GlobalPoint gpos = det->toGlobal(it->localPosition());
 
     float tof = it->timeOfFlight();
     float globalR = gpos.mag();
 
     float energyLoss = it->energyLoss();
 
-    float entryExitX = ( it->entryPoint().x() - it->exitPoint().x() );
-    float entryExitY = ( it->entryPoint().y() - it->exitPoint().y() );
-    float entryExitZ = std::abs( it->entryPoint().z() - it->exitPoint().z() );
+    float entryExitX = (it->entryPoint().x() - it->exitPoint().x());
+    float entryExitY = (it->entryPoint().y() - it->exitPoint().y());
+    float entryExitZ = std::abs(it->entryPoint().z() - it->exitPoint().z());
 
     float localX = it->localPosition().x();
     float localY = it->localPosition().y();
@@ -153,25 +156,25 @@ void SiPixelPhase1HitsV::analyze(const edm::Event& iEvent, const edm::EventSetup
     histo[ENTRY_EXIT_Z].fill(entryExitZ, id, &iEvent);
     histo[LOCAL_X].fill(localX, id, &iEvent);
     histo[LOCAL_Y].fill(localY, id, &iEvent);
-    histo[LOCAL_Z].fill(localZ,  id, &iEvent);
-    histo[LOCAL_PHI].fill(localPhi,  id, &iEvent);
-    histo[LOCAL_ETA].fill(localEta,  id, &iEvent);
+    histo[LOCAL_Z].fill(localZ, id, &iEvent);
+    histo[LOCAL_PHI].fill(localPhi, id, &iEvent);
+    histo[LOCAL_ETA].fill(localEta, id, &iEvent);
   }
 
   // get high forward info
   for (it = forwardHighInput->begin(); it != forwardHighInput->end(); ++it) {
     auto id = DetId(it->detUnitId());
-    const GeomDetUnit * det=(const GeomDetUnit*)tracker->idToDetUnit( id );
-    GlobalPoint gpos=det->toGlobal(it->localPosition());
+    const GeomDetUnit *det = (const GeomDetUnit *)tracker->idToDetUnit(id);
+    GlobalPoint gpos = det->toGlobal(it->localPosition());
 
     float tof = it->timeOfFlight();
     float globalR = gpos.mag();
 
     float energyLoss = it->energyLoss();
 
-    float entryExitX = ( it->entryPoint().x() - it->exitPoint().x() );
-    float entryExitY = ( it->entryPoint().y() - it->exitPoint().y() );
-    float entryExitZ = std::abs( it->entryPoint().z() - it->exitPoint().z() );
+    float entryExitX = (it->entryPoint().x() - it->exitPoint().x());
+    float entryExitY = (it->entryPoint().y() - it->exitPoint().y());
+    float entryExitZ = std::abs(it->entryPoint().z() - it->exitPoint().z());
 
     float localX = it->localPosition().x();
     float localY = it->localPosition().y();
@@ -186,42 +189,39 @@ void SiPixelPhase1HitsV::analyze(const edm::Event& iEvent, const edm::EventSetup
     histo[ENTRY_EXIT_Z].fill(entryExitZ, id, &iEvent);
     histo[LOCAL_X].fill(localX, id, &iEvent);
     histo[LOCAL_Y].fill(localY, id, &iEvent);
-    histo[LOCAL_Z].fill(localZ,  id, &iEvent);
-    histo[LOCAL_PHI].fill(localPhi,  id, &iEvent);
-    histo[LOCAL_ETA].fill(localEta,  id, &iEvent);
+    histo[LOCAL_Z].fill(localZ, id, &iEvent);
+    histo[LOCAL_PHI].fill(localPhi, id, &iEvent);
+    histo[LOCAL_ETA].fill(localEta, id, &iEvent);
   }
 
-
   // Sim Hit efficiency info
-  edm::Handle< edm::View<reco::Track> > trackCollectionH;
+  edm::Handle<edm::View<reco::Track>> trackCollectionH;
   iEvent.getByToken(tracksToken_, trackCollectionH);
-  const edm::View<reco::Track>&  tC = *(trackCollectionH.product()); 
+  const edm::View<reco::Track> &tC = *(trackCollectionH.product());
 
   edm::Handle<TrackingParticleCollection> TPCollectionH;
-  iEvent.getByToken(tpToken_,TPCollectionH);
+  iEvent.getByToken(tpToken_, TPCollectionH);
 
   edm::Handle<reco::TrackToTrackingParticleAssociator> theHitsAssociator;
-  iEvent.getByToken(trackAssociatorByHitsToken_,theHitsAssociator);
-  if ( ! theHitsAssociator.isValid() ) {
-    throw cms::Exception ("NO VALID HIT ASSOCIATOR");
+  iEvent.getByToken(trackAssociatorByHitsToken_, theHitsAssociator);
+  if (!theHitsAssociator.isValid()) {
+    throw cms::Exception("NO VALID HIT ASSOCIATOR");
   }
   reco::TrackToTrackingParticleAssociator const *associatorByHits = theHitsAssociator.product();
 
-  if ( TPCollectionH.isValid() && trackCollectionH.isValid() ) {
-    reco::RecoToSimCollection const& p = associatorByHits->associateRecoToSim(trackCollectionH,TPCollectionH);
+  if (TPCollectionH.isValid() && trackCollectionH.isValid()) {
+    reco::RecoToSimCollection const &p = associatorByHits->associateRecoToSim(trackCollectionH, TPCollectionH);
 
-    for(edm::View<reco::Track>::size_type i=0; i<tC.size(); ++i) {
+    for (edm::View<reco::Track>::size_type i = 0; i < tC.size(); ++i) {
       edm::RefToBase<reco::Track> track(trackCollectionH, i);
-//      const reco::Track& t = *track;
-      auto id = DetId(track->innerDetId()); // histo manager requires a det ID, use innermost ID for ease
+      //      const reco::Track& t = *track;
+      auto id = DetId(track->innerDetId());  // histo manager requires a det ID,
+                                             // use innermost ID for ease
 
       auto iter = p.find(track);
-      histo[EFFICIENCY_TRACK].fill(iter != p.end()? 1: 0, id, &iEvent);
+      histo[EFFICIENCY_TRACK].fill(iter != p.end() ? 1 : 0, id, &iEvent);
     }
-
   }
-
 }
 
 DEFINE_FWK_MODULE(SiPixelPhase1HitsV);
-
diff --git a/Validation/SiPixelPhase1TrackClustersV/interface/SiPixelPhase1TrackClustersV.h b/Validation/SiPixelPhase1TrackClustersV/interface/SiPixelPhase1TrackClustersV.h
index 79fe67b4560ba..0e9ee5f6417d2 100644
--- a/Validation/SiPixelPhase1TrackClustersV/interface/SiPixelPhase1TrackClustersV.h
+++ b/Validation/SiPixelPhase1TrackClustersV/interface/SiPixelPhase1TrackClustersV.h
@@ -1,7 +1,7 @@
-#ifndef SiPixelPhase1TrackClustersV_h 
-#define SiPixelPhase1TrackClustersV_h 
+#ifndef SiPixelPhase1TrackClustersV_h
+#define SiPixelPhase1TrackClustersV_h
 // -*- C++ -*-
-// 
+//
 // Package:     SiPixelPhase1TrackClustersV
 // Class  :     SiPixelPhase1TrackClustersV
 //
@@ -20,14 +20,13 @@ class SiPixelPhase1TrackClustersV : public SiPixelPhase1Base {
     SIZE_Y,
   };
 
-  public:
-  explicit SiPixelPhase1TrackClustersV(const edm::ParameterSet& conf);
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+public:
+  explicit SiPixelPhase1TrackClustersV(const edm::ParameterSet &conf);
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
-  private:
-  edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster> > clustersToken_;
+private:
+  edm::EDGetTokenT<edmNew::DetSetVector<SiPixelCluster>> clustersToken_;
   edm::EDGetTokenT<reco::TrackCollection> tracksToken_;
 };
 
 #endif
-
diff --git a/Validation/SiPixelPhase1TrackClustersV/src/SiPixelPhase1TrackClustersV.cc b/Validation/SiPixelPhase1TrackClustersV/src/SiPixelPhase1TrackClustersV.cc
index f5a320a05a698..82e0a827c5e76 100644
--- a/Validation/SiPixelPhase1TrackClustersV/src/SiPixelPhase1TrackClustersV.cc
+++ b/Validation/SiPixelPhase1TrackClustersV/src/SiPixelPhase1TrackClustersV.cc
@@ -7,58 +7,53 @@
 // Original Author: Marcel Schneider
 // Additional Authors: Alexander Morton - modifying code for validation use
 
-#include "Validation/SiPixelPhase1TrackClustersV/interface/SiPixelPhase1TrackClustersV.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "Validation/SiPixelPhase1TrackClustersV/interface/SiPixelPhase1TrackClustersV.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
-#include "Geometry/CommonTopologies/interface/PixelTopology.h"
-#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
-#include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
+#include "DataFormats/GeometryVector/interface/LocalPoint.h"
+#include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
 #include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHit.h"
+#include "FWCore/Framework/interface/ESHandle.h"
+#include "Geometry/CommonTopologies/interface/PixelTopology.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+#include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "TrackingTools/TrackFitters/interface/TrajectoryStateCombiner.h"
 
-
-SiPixelPhase1TrackClustersV::SiPixelPhase1TrackClustersV(const edm::ParameterSet& iConfig) :
-  SiPixelPhase1Base(iConfig) 
-{
+SiPixelPhase1TrackClustersV::SiPixelPhase1TrackClustersV(const edm::ParameterSet &iConfig)
+    : SiPixelPhase1Base(iConfig) {
   clustersToken_ = consumes<edmNew::DetSetVector<SiPixelCluster>>(iConfig.getParameter<edm::InputTag>("clusters"));
   tracksToken_ = consumes<reco::TrackCollection>(iConfig.getParameter<edm::InputTag>("tracks"));
 }
 
-void SiPixelPhase1TrackClustersV::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
-
+void SiPixelPhase1TrackClustersV::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
   // get geometry
   edm::ESHandle<TrackerGeometry> tracker;
   iSetup.get<TrackerDigiGeometryRecord>().get(tracker);
   assert(tracker.isValid());
-  
-  //get the map
+
+  // get the map
   edm::Handle<reco::TrackCollection> tracks;
-  iEvent.getByToken( tracksToken_, tracks);
-  
+  iEvent.getByToken(tracksToken_, tracks);
+
   // get clusters
-  edm::Handle< edmNew::DetSetVector<SiPixelCluster> >  clusterColl;
-  iEvent.getByToken( clustersToken_, clusterColl );
+  edm::Handle<edmNew::DetSetVector<SiPixelCluster>> clusterColl;
+  iEvent.getByToken(clustersToken_, clusterColl);
 
   edmNew::DetSetVector<SiPixelCluster>::const_iterator it;
   for (it = clusterColl->begin(); it != clusterColl->end(); ++it) {
     auto id = DetId(it->detId());
-    
-    for(auto subit = it->begin(); subit != it->end(); ++subit) {
-      SiPixelCluster const& cluster = *subit;
 
-      histo[CHARGE].fill(double(cluster.charge() ), id, &iEvent);
-      histo[SIZE_X].fill(double(cluster.sizeX() ), id, &iEvent);
-      histo[SIZE_Y].fill(double(cluster.sizeY() ), id, &iEvent);
+    for (auto subit = it->begin(); subit != it->end(); ++subit) {
+      SiPixelCluster const &cluster = *subit;
+
+      histo[CHARGE].fill(double(cluster.charge()), id, &iEvent);
+      histo[SIZE_X].fill(double(cluster.sizeX()), id, &iEvent);
+      histo[SIZE_Y].fill(double(cluster.sizeY()), id, &iEvent);
     }
   }
-
 }
 
 DEFINE_FWK_MODULE(SiPixelPhase1TrackClustersV);
-
diff --git a/Validation/SiPixelPhase1TrackingParticleV/interface/SiPixelPhase1TrackingParticleV.h b/Validation/SiPixelPhase1TrackingParticleV/interface/SiPixelPhase1TrackingParticleV.h
index bd3da965a6656..d579e133ecd01 100644
--- a/Validation/SiPixelPhase1TrackingParticleV/interface/SiPixelPhase1TrackingParticleV.h
+++ b/Validation/SiPixelPhase1TrackingParticleV/interface/SiPixelPhase1TrackingParticleV.h
@@ -1,7 +1,7 @@
-#ifndef SiPixelPhase1TrackingParticleV_h 
-#define SiPixelPhase1TrackingParticleV_h 
+#ifndef SiPixelPhase1TrackingParticleV_h
+#define SiPixelPhase1TrackingParticleV_h
 // -*- C++ -*-
-// 
+//
 // Package:     SiPixelPhase1TrackingParticleV
 // Class  :     SiPixelPhase1TrackingParticleV
 //
@@ -11,8 +11,8 @@
 
 #include "DQM/SiPixelPhase1Common/interface/SiPixelPhase1Base.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
-#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
 #include "SimDataFormats/Associations/interface/TrackToTrackingParticleAssociator.h"
+#include "SimTracker/TrackerHitAssociation/interface/TrackerHitAssociator.h"
 
 namespace reco {
   class TrackToTrackingParticleAssociator;
@@ -35,14 +35,13 @@ class SiPixelPhase1TrackingParticleV : public SiPixelPhase1Base {
     LIP,
   };
 
-  public:
-  explicit SiPixelPhase1TrackingParticleV(const edm::ParameterSet& conf);
-  void analyze(const edm::Event&, const edm::EventSetup&) override;
+public:
+  explicit SiPixelPhase1TrackingParticleV(const edm::ParameterSet &conf);
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
-  private:
+private:
   edm::EDGetTokenT<TrackingParticleCollection> vec_TrackingParticle_Token_;
-  std::vector<edm::EDGetTokenT<std::vector<PSimHit> > > simHitTokens_;
+  std::vector<edm::EDGetTokenT<std::vector<PSimHit>>> simHitTokens_;
 };
 
 #endif
-
diff --git a/Validation/SiPixelPhase1TrackingParticleV/src/SiPixelPhase1TrackingParticleV.cc b/Validation/SiPixelPhase1TrackingParticleV/src/SiPixelPhase1TrackingParticleV.cc
index 7d613727bb2b5..4e27084ee2a10 100644
--- a/Validation/SiPixelPhase1TrackingParticleV/src/SiPixelPhase1TrackingParticleV.cc
+++ b/Validation/SiPixelPhase1TrackingParticleV/src/SiPixelPhase1TrackingParticleV.cc
@@ -7,94 +7,102 @@
 // Original Author: Marcel Schneider
 // Additional Authors: Alexander Morton - modifying code for validation use
 
-#include "Validation/SiPixelPhase1TrackingParticleV/interface/SiPixelPhase1TrackingParticleV.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "Validation/SiPixelPhase1TrackingParticleV/interface/SiPixelPhase1TrackingParticleV.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 
-#include "TrackingTools/TrackAssociator/interface/DetIdAssociator.h"
 #include "FWCore/Utilities/interface/isFinite.h"
+#include "TrackingTools/TrackAssociator/interface/DetIdAssociator.h"
 
 #include "SimDataFormats/TrackingHit/interface/PSimHit.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
 
-class TrackAssociatorByHits; 
+class TrackAssociatorByHits;
 
 namespace {
-  bool trackIdHitPairLess(const std::pair<unsigned int, const PSimHit*>& a, const std::pair<unsigned int, const PSimHit*>& b) {
+  bool trackIdHitPairLess(const std::pair<unsigned int, const PSimHit *> &a,
+                          const std::pair<unsigned int, const PSimHit *> &b) {
     return a.first < b.first;
   }
 
-  bool trackIdHitPairLessSort(const std::pair<unsigned int, const PSimHit*>& a, const std::pair<unsigned int, const PSimHit*>& b) {
-    if(a.first == b.first) {
-      const auto atof = edm::isFinite(a.second->timeOfFlight()) ? a.second->timeOfFlight() : std::numeric_limits<decltype(a.second->timeOfFlight())>::max();
-      const auto btof = edm::isFinite(b.second->timeOfFlight()) ? b.second->timeOfFlight() : std::numeric_limits<decltype(b.second->timeOfFlight())>::max();
+  bool trackIdHitPairLessSort(const std::pair<unsigned int, const PSimHit *> &a,
+                              const std::pair<unsigned int, const PSimHit *> &b) {
+    if (a.first == b.first) {
+      const auto atof = edm::isFinite(a.second->timeOfFlight())
+                            ? a.second->timeOfFlight()
+                            : std::numeric_limits<decltype(a.second->timeOfFlight())>::max();
+      const auto btof = edm::isFinite(b.second->timeOfFlight())
+                            ? b.second->timeOfFlight()
+                            : std::numeric_limits<decltype(b.second->timeOfFlight())>::max();
       return atof < btof;
     }
     return a.first < b.first;
   }
-}
+}  // namespace
 
-
-SiPixelPhase1TrackingParticleV::SiPixelPhase1TrackingParticleV(const edm::ParameterSet& iConfig) :
-  SiPixelPhase1Base(iConfig),
-  vec_TrackingParticle_Token_( consumes<TrackingParticleCollection>( iConfig.getParameter<edm::InputTag>( "src" ) ) )
-{
-  for(const auto& tag: iConfig.getParameter<std::vector<edm::InputTag>>("simHitToken")) {
+SiPixelPhase1TrackingParticleV::SiPixelPhase1TrackingParticleV(const edm::ParameterSet &iConfig)
+    : SiPixelPhase1Base(iConfig),
+      vec_TrackingParticle_Token_(consumes<TrackingParticleCollection>(iConfig.getParameter<edm::InputTag>("src"))) {
+  for (const auto &tag : iConfig.getParameter<std::vector<edm::InputTag>>("simHitToken")) {
     simHitTokens_.push_back(consumes<std::vector<PSimHit>>(tag));
   }
 }
 
-void SiPixelPhase1TrackingParticleV::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
-
-  edm::Handle<TrackingParticleCollection>  TruthTrackContainer;
-  iEvent.getByToken( vec_TrackingParticle_Token_, TruthTrackContainer );
-  const TrackingParticleCollection *tPC   = TruthTrackContainer.product();
+void SiPixelPhase1TrackingParticleV::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
+  edm::Handle<TrackingParticleCollection> TruthTrackContainer;
+  iEvent.getByToken(vec_TrackingParticle_Token_, TruthTrackContainer);
+  const TrackingParticleCollection *tPC = TruthTrackContainer.product();
   std::vector<std::pair<unsigned int, const PSimHit *>> trackIdToHitPtr;
 
   // A multimap linking SimTrack::trackId() to a pointer to PSimHit
   // Similar to TrackingTruthAccumulator
-  for(const auto& simHitToken: simHitTokens_) {
-    edm::Handle<std::vector<PSimHit> > hsimhits;
+  for (const auto &simHitToken : simHitTokens_) {
+    edm::Handle<std::vector<PSimHit>> hsimhits;
     iEvent.getByToken(simHitToken, hsimhits);
-    trackIdToHitPtr.reserve(trackIdToHitPtr.size()+hsimhits->size());
-    for(const auto& simHit: *hsimhits) {
+    trackIdToHitPtr.reserve(trackIdToHitPtr.size() + hsimhits->size());
+    for (const auto &simHit : *hsimhits) {
       trackIdToHitPtr.emplace_back(simHit.trackId(), &simHit);
     }
   }
   std::stable_sort(trackIdToHitPtr.begin(), trackIdToHitPtr.end(), trackIdHitPairLessSort);
 
-
   // Loop over TrackingParticle's
-  for (TrackingParticleCollection::const_iterator t = tPC -> begin(); t != tPC -> end(); ++t) {
-
+  for (TrackingParticleCollection::const_iterator t = tPC->begin(); t != tPC->end(); ++t) {
     // histo manager requires a det ID, use first tracker hit
 
     bool isBpixtrack = false, isFpixtrack = false;
     DetId id;
 
-    for(const SimTrack& simTrack: t->g4Tracks()) {
+    for (const SimTrack &simTrack : t->g4Tracks()) {
       // Logic is from TrackingTruthAccumulator
-      auto range = std::equal_range(trackIdToHitPtr.begin(), trackIdToHitPtr.end(), std::pair<unsigned int, const PSimHit *>(simTrack.trackId(), nullptr), trackIdHitPairLess);
-      if(range.first == range.second) continue;
+      auto range = std::equal_range(trackIdToHitPtr.begin(),
+                                    trackIdToHitPtr.end(),
+                                    std::pair<unsigned int, const PSimHit *>(simTrack.trackId(), nullptr),
+                                    trackIdHitPairLess);
+      if (range.first == range.second)
+        continue;
 
       auto iHitPtr = range.first;
-      for(; iHitPtr != range.second; ++iHitPtr) {
-        const PSimHit& simHit = *(iHitPtr->second);
-        if(simHit.eventId() != t->eventId())
+      for (; iHitPtr != range.second; ++iHitPtr) {
+        const PSimHit &simHit = *(iHitPtr->second);
+        if (simHit.eventId() != t->eventId())
           continue;
-        id = DetId( simHit.detUnitId() );
+        id = DetId(simHit.detUnitId());
 
         // check we are in pixel
         uint32_t subdetid = (id.subdetId());
-	if (subdetid == PixelSubdetector::PixelBarrel) isBpixtrack = true;
-	if (subdetid == PixelSubdetector::PixelEndcap) isFpixtrack = true;
-	if (subdetid != PixelSubdetector::PixelBarrel && subdetid != PixelSubdetector::PixelEndcap) continue;
+        if (subdetid == PixelSubdetector::PixelBarrel)
+          isBpixtrack = true;
+        if (subdetid == PixelSubdetector::PixelEndcap)
+          isFpixtrack = true;
+        if (subdetid != PixelSubdetector::PixelBarrel && subdetid != PixelSubdetector::PixelEndcap)
+          continue;
       }
     }
 
-    if ( isBpixtrack || isFpixtrack ) {
+    if (isBpixtrack || isFpixtrack) {
       histo[MASS].fill(t->mass(), id, &iEvent);
       histo[CHARGE].fill(t->charge(), id, &iEvent);
       histo[ID].fill(t->pdgId(), id, &iEvent);
@@ -113,4 +121,3 @@ void SiPixelPhase1TrackingParticleV::analyze(const edm::Event& iEvent, const edm
 }
 
 DEFINE_FWK_MODULE(SiPixelPhase1TrackingParticleV);
-
diff --git a/Validation/TrackerDigis/interface/SiPixelDigiValid.h b/Validation/TrackerDigis/interface/SiPixelDigiValid.h
index 49b3a98211d60..49e03e740ff84 100644
--- a/Validation/TrackerDigis/interface/SiPixelDigiValid.h
+++ b/Validation/TrackerDigis/interface/SiPixelDigiValid.h
@@ -1,276 +1,266 @@
 #ifndef SiPixelDigiValid_h
 #define SiPixelDigiValid_h
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/ESHandle.h"
-#include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "RecoTracker/Record/interface/TrackerRecoGeometryRecord.h"
 #include "RecoTracker/TkDetLayers/interface/GeometricSearchTracker.h"
 
 #include <string>
 
 namespace edm {
-  template< class T > class DetSetVector;
+  template <class T>
+  class DetSetVector;
 }
 class PixelDigi;
 class DQMStore;
 class MonitorElement;
 
-class  SiPixelDigiValid: public DQMEDAnalyzer {
-
- public:
-    
-    SiPixelDigiValid(const edm::ParameterSet& ps);
-    ~SiPixelDigiValid() override;
-
- protected:
-     void analyze(const edm::Event& e, const edm::EventSetup& c) override;
-     void bookHistograms(DQMStore::IBooker & ibooker,const edm::Run& run, const edm::EventSetup& es) override;
-     void endJob(void) override;
+class SiPixelDigiValid : public DQMEDAnalyzer {
+public:
+  SiPixelDigiValid(const edm::ParameterSet &ps);
+  ~SiPixelDigiValid() override;
 
- private:
+protected:
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
+  void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run &run, const edm::EventSetup &es) override;
+  void endJob(void) override;
 
+private:
   std::string outputFile_;
   bool runStandalone;
 
   //////Barrel Pixel
   /* 1st Layer */
-  MonitorElement* meAdcLayer1Ring1_;
-  MonitorElement* meAdcLayer1Ring2_;
-  MonitorElement* meAdcLayer1Ring3_;
-  MonitorElement* meAdcLayer1Ring4_;
-  MonitorElement* meAdcLayer1Ring5_;
-  MonitorElement* meAdcLayer1Ring6_;
-  MonitorElement* meAdcLayer1Ring7_;
-  MonitorElement* meAdcLayer1Ring8_;
-
-  MonitorElement* meRowLayer1Ring1_;
-  MonitorElement* meRowLayer1Ring2_;
-  MonitorElement* meRowLayer1Ring3_;
-  MonitorElement* meRowLayer1Ring4_;
-  MonitorElement* meRowLayer1Ring5_;
-  MonitorElement* meRowLayer1Ring6_;
-  MonitorElement* meRowLayer1Ring7_;
-  MonitorElement* meRowLayer1Ring8_;
-
-  MonitorElement* meColLayer1Ring1_;
-  MonitorElement* meColLayer1Ring2_;
-  MonitorElement* meColLayer1Ring3_;
-  MonitorElement* meColLayer1Ring4_;
-  MonitorElement* meColLayer1Ring5_;
-  MonitorElement* meColLayer1Ring6_;
-  MonitorElement* meColLayer1Ring7_;
-  MonitorElement* meColLayer1Ring8_;
-
-  MonitorElement* meDigiMultiLayer1Ring1_;
-  MonitorElement* meDigiMultiLayer1Ring2_;
-  MonitorElement* meDigiMultiLayer1Ring3_;
-  MonitorElement* meDigiMultiLayer1Ring4_;
-  MonitorElement* meDigiMultiLayer1Ring5_;
-  MonitorElement* meDigiMultiLayer1Ring6_;
-  MonitorElement* meDigiMultiLayer1Ring7_;
-  MonitorElement* meDigiMultiLayer1Ring8_;
-
+  MonitorElement *meAdcLayer1Ring1_;
+  MonitorElement *meAdcLayer1Ring2_;
+  MonitorElement *meAdcLayer1Ring3_;
+  MonitorElement *meAdcLayer1Ring4_;
+  MonitorElement *meAdcLayer1Ring5_;
+  MonitorElement *meAdcLayer1Ring6_;
+  MonitorElement *meAdcLayer1Ring7_;
+  MonitorElement *meAdcLayer1Ring8_;
+
+  MonitorElement *meRowLayer1Ring1_;
+  MonitorElement *meRowLayer1Ring2_;
+  MonitorElement *meRowLayer1Ring3_;
+  MonitorElement *meRowLayer1Ring4_;
+  MonitorElement *meRowLayer1Ring5_;
+  MonitorElement *meRowLayer1Ring6_;
+  MonitorElement *meRowLayer1Ring7_;
+  MonitorElement *meRowLayer1Ring8_;
+
+  MonitorElement *meColLayer1Ring1_;
+  MonitorElement *meColLayer1Ring2_;
+  MonitorElement *meColLayer1Ring3_;
+  MonitorElement *meColLayer1Ring4_;
+  MonitorElement *meColLayer1Ring5_;
+  MonitorElement *meColLayer1Ring6_;
+  MonitorElement *meColLayer1Ring7_;
+  MonitorElement *meColLayer1Ring8_;
+
+  MonitorElement *meDigiMultiLayer1Ring1_;
+  MonitorElement *meDigiMultiLayer1Ring2_;
+  MonitorElement *meDigiMultiLayer1Ring3_;
+  MonitorElement *meDigiMultiLayer1Ring4_;
+  MonitorElement *meDigiMultiLayer1Ring5_;
+  MonitorElement *meDigiMultiLayer1Ring6_;
+  MonitorElement *meDigiMultiLayer1Ring7_;
+  MonitorElement *meDigiMultiLayer1Ring8_;
 
   /* 2nd Layer */
-  MonitorElement* meAdcLayer2Ring1_;
-  MonitorElement* meAdcLayer2Ring2_;
-  MonitorElement* meAdcLayer2Ring3_;
-  MonitorElement* meAdcLayer2Ring4_;
-  MonitorElement* meAdcLayer2Ring5_;
-  MonitorElement* meAdcLayer2Ring6_;
-  MonitorElement* meAdcLayer2Ring7_;
-  MonitorElement* meAdcLayer2Ring8_;
-
-  MonitorElement* meRowLayer2Ring1_;
-  MonitorElement* meRowLayer2Ring2_;
-  MonitorElement* meRowLayer2Ring3_;
-  MonitorElement* meRowLayer2Ring4_;
-  MonitorElement* meRowLayer2Ring5_;
-  MonitorElement* meRowLayer2Ring6_;
-  MonitorElement* meRowLayer2Ring7_;
-  MonitorElement* meRowLayer2Ring8_;
-
-  MonitorElement* meColLayer2Ring1_;
-  MonitorElement* meColLayer2Ring2_;
-  MonitorElement* meColLayer2Ring3_;
-  MonitorElement* meColLayer2Ring4_;
-  MonitorElement* meColLayer2Ring5_;
-  MonitorElement* meColLayer2Ring6_;
-  MonitorElement* meColLayer2Ring7_;
-  MonitorElement* meColLayer2Ring8_;
-
-  MonitorElement* meDigiMultiLayer2Ring1_;
-  MonitorElement* meDigiMultiLayer2Ring2_;
-  MonitorElement* meDigiMultiLayer2Ring3_;
-  MonitorElement* meDigiMultiLayer2Ring4_;
-  MonitorElement* meDigiMultiLayer2Ring5_;
-  MonitorElement* meDigiMultiLayer2Ring6_;
-  MonitorElement* meDigiMultiLayer2Ring7_;
-  MonitorElement* meDigiMultiLayer2Ring8_;
-
+  MonitorElement *meAdcLayer2Ring1_;
+  MonitorElement *meAdcLayer2Ring2_;
+  MonitorElement *meAdcLayer2Ring3_;
+  MonitorElement *meAdcLayer2Ring4_;
+  MonitorElement *meAdcLayer2Ring5_;
+  MonitorElement *meAdcLayer2Ring6_;
+  MonitorElement *meAdcLayer2Ring7_;
+  MonitorElement *meAdcLayer2Ring8_;
+
+  MonitorElement *meRowLayer2Ring1_;
+  MonitorElement *meRowLayer2Ring2_;
+  MonitorElement *meRowLayer2Ring3_;
+  MonitorElement *meRowLayer2Ring4_;
+  MonitorElement *meRowLayer2Ring5_;
+  MonitorElement *meRowLayer2Ring6_;
+  MonitorElement *meRowLayer2Ring7_;
+  MonitorElement *meRowLayer2Ring8_;
+
+  MonitorElement *meColLayer2Ring1_;
+  MonitorElement *meColLayer2Ring2_;
+  MonitorElement *meColLayer2Ring3_;
+  MonitorElement *meColLayer2Ring4_;
+  MonitorElement *meColLayer2Ring5_;
+  MonitorElement *meColLayer2Ring6_;
+  MonitorElement *meColLayer2Ring7_;
+  MonitorElement *meColLayer2Ring8_;
+
+  MonitorElement *meDigiMultiLayer2Ring1_;
+  MonitorElement *meDigiMultiLayer2Ring2_;
+  MonitorElement *meDigiMultiLayer2Ring3_;
+  MonitorElement *meDigiMultiLayer2Ring4_;
+  MonitorElement *meDigiMultiLayer2Ring5_;
+  MonitorElement *meDigiMultiLayer2Ring6_;
+  MonitorElement *meDigiMultiLayer2Ring7_;
+  MonitorElement *meDigiMultiLayer2Ring8_;
 
   /* 3rd Layer */
 
-  MonitorElement* meAdcLayer3Ring1_;
-  MonitorElement* meAdcLayer3Ring2_;
-  MonitorElement* meAdcLayer3Ring3_;
-  MonitorElement* meAdcLayer3Ring4_;
-  MonitorElement* meAdcLayer3Ring5_;
-  MonitorElement* meAdcLayer3Ring6_;
-  MonitorElement* meAdcLayer3Ring7_;
-  MonitorElement* meAdcLayer3Ring8_;
-
-  MonitorElement* meRowLayer3Ring1_;
-  MonitorElement* meRowLayer3Ring2_;
-  MonitorElement* meRowLayer3Ring3_;
-  MonitorElement* meRowLayer3Ring4_;
-  MonitorElement* meRowLayer3Ring5_;
-  MonitorElement* meRowLayer3Ring6_;
-  MonitorElement* meRowLayer3Ring7_;
-  MonitorElement* meRowLayer3Ring8_;
-
-  MonitorElement* meColLayer3Ring1_;
-  MonitorElement* meColLayer3Ring2_;
-  MonitorElement* meColLayer3Ring3_;
-  MonitorElement* meColLayer3Ring4_;
-  MonitorElement* meColLayer3Ring5_;
-  MonitorElement* meColLayer3Ring6_;
-  MonitorElement* meColLayer3Ring7_;
-  MonitorElement* meColLayer3Ring8_;
-
-  MonitorElement* meDigiMultiLayer3Ring1_;
-  MonitorElement* meDigiMultiLayer3Ring2_;
-  MonitorElement* meDigiMultiLayer3Ring3_;
-  MonitorElement* meDigiMultiLayer3Ring4_;
-  MonitorElement* meDigiMultiLayer3Ring5_;
-  MonitorElement* meDigiMultiLayer3Ring6_;
-  MonitorElement* meDigiMultiLayer3Ring7_;
-  MonitorElement* meDigiMultiLayer3Ring8_;
- 
-  /*Number of digi versus ladder number */
-  MonitorElement* meDigiMultiLayer1Ladders_;
-  MonitorElement* meDigiMultiLayer2Ladders_;
-  MonitorElement* meDigiMultiLayer3Ladders_;
+  MonitorElement *meAdcLayer3Ring1_;
+  MonitorElement *meAdcLayer3Ring2_;
+  MonitorElement *meAdcLayer3Ring3_;
+  MonitorElement *meAdcLayer3Ring4_;
+  MonitorElement *meAdcLayer3Ring5_;
+  MonitorElement *meAdcLayer3Ring6_;
+  MonitorElement *meAdcLayer3Ring7_;
+  MonitorElement *meAdcLayer3Ring8_;
+
+  MonitorElement *meRowLayer3Ring1_;
+  MonitorElement *meRowLayer3Ring2_;
+  MonitorElement *meRowLayer3Ring3_;
+  MonitorElement *meRowLayer3Ring4_;
+  MonitorElement *meRowLayer3Ring5_;
+  MonitorElement *meRowLayer3Ring6_;
+  MonitorElement *meRowLayer3Ring7_;
+  MonitorElement *meRowLayer3Ring8_;
+
+  MonitorElement *meColLayer3Ring1_;
+  MonitorElement *meColLayer3Ring2_;
+  MonitorElement *meColLayer3Ring3_;
+  MonitorElement *meColLayer3Ring4_;
+  MonitorElement *meColLayer3Ring5_;
+  MonitorElement *meColLayer3Ring6_;
+  MonitorElement *meColLayer3Ring7_;
+  MonitorElement *meColLayer3Ring8_;
+
+  MonitorElement *meDigiMultiLayer3Ring1_;
+  MonitorElement *meDigiMultiLayer3Ring2_;
+  MonitorElement *meDigiMultiLayer3Ring3_;
+  MonitorElement *meDigiMultiLayer3Ring4_;
+  MonitorElement *meDigiMultiLayer3Ring5_;
+  MonitorElement *meDigiMultiLayer3Ring6_;
+  MonitorElement *meDigiMultiLayer3Ring7_;
+  MonitorElement *meDigiMultiLayer3Ring8_;
 
+  /*Number of digi versus ladder number */
+  MonitorElement *meDigiMultiLayer1Ladders_;
+  MonitorElement *meDigiMultiLayer2Ladders_;
+  MonitorElement *meDigiMultiLayer3Ladders_;
 
-///Forwar Pixel
+  /// Forwar Pixel
   /* 1st Disk in ZPlus Side */
-  MonitorElement*  meAdcZpDisk1Panel1Plaq1_;
-  MonitorElement*  meAdcZpDisk1Panel1Plaq2_;
-  MonitorElement*  meAdcZpDisk1Panel1Plaq3_;
-  MonitorElement*  meAdcZpDisk1Panel1Plaq4_;
-  MonitorElement*  meAdcZpDisk1Panel2Plaq1_;
-  MonitorElement*  meAdcZpDisk1Panel2Plaq2_;
-  MonitorElement*  meAdcZpDisk1Panel2Plaq3_;
-
-  MonitorElement*  meRowZpDisk1Panel1Plaq1_;
-  MonitorElement*  meRowZpDisk1Panel1Plaq2_;
-  MonitorElement*  meRowZpDisk1Panel1Plaq3_;
-  MonitorElement*  meRowZpDisk1Panel1Plaq4_;
-  MonitorElement*  meRowZpDisk1Panel2Plaq1_;
-  MonitorElement*  meRowZpDisk1Panel2Plaq2_;
-  MonitorElement*  meRowZpDisk1Panel2Plaq3_;
-
-  MonitorElement*  meColZpDisk1Panel1Plaq1_;
-  MonitorElement*  meColZpDisk1Panel1Plaq2_;
-  MonitorElement*  meColZpDisk1Panel1Plaq3_;
-  MonitorElement*  meColZpDisk1Panel1Plaq4_;
-  MonitorElement*  meColZpDisk1Panel2Plaq1_;
-  MonitorElement*  meColZpDisk1Panel2Plaq2_;
-  MonitorElement*  meColZpDisk1Panel2Plaq3_;
-  MonitorElement*  meNdigiZpDisk1PerPanel1_;
-  MonitorElement*  meNdigiZpDisk1PerPanel2_;
-  
+  MonitorElement *meAdcZpDisk1Panel1Plaq1_;
+  MonitorElement *meAdcZpDisk1Panel1Plaq2_;
+  MonitorElement *meAdcZpDisk1Panel1Plaq3_;
+  MonitorElement *meAdcZpDisk1Panel1Plaq4_;
+  MonitorElement *meAdcZpDisk1Panel2Plaq1_;
+  MonitorElement *meAdcZpDisk1Panel2Plaq2_;
+  MonitorElement *meAdcZpDisk1Panel2Plaq3_;
+
+  MonitorElement *meRowZpDisk1Panel1Plaq1_;
+  MonitorElement *meRowZpDisk1Panel1Plaq2_;
+  MonitorElement *meRowZpDisk1Panel1Plaq3_;
+  MonitorElement *meRowZpDisk1Panel1Plaq4_;
+  MonitorElement *meRowZpDisk1Panel2Plaq1_;
+  MonitorElement *meRowZpDisk1Panel2Plaq2_;
+  MonitorElement *meRowZpDisk1Panel2Plaq3_;
+
+  MonitorElement *meColZpDisk1Panel1Plaq1_;
+  MonitorElement *meColZpDisk1Panel1Plaq2_;
+  MonitorElement *meColZpDisk1Panel1Plaq3_;
+  MonitorElement *meColZpDisk1Panel1Plaq4_;
+  MonitorElement *meColZpDisk1Panel2Plaq1_;
+  MonitorElement *meColZpDisk1Panel2Plaq2_;
+  MonitorElement *meColZpDisk1Panel2Plaq3_;
+  MonitorElement *meNdigiZpDisk1PerPanel1_;
+  MonitorElement *meNdigiZpDisk1PerPanel2_;
 
   /* 2nd Disk in ZPlus Side */
-  MonitorElement*  meAdcZpDisk2Panel1Plaq1_;
-  MonitorElement*  meAdcZpDisk2Panel1Plaq2_;
-  MonitorElement*  meAdcZpDisk2Panel1Plaq3_;
-  MonitorElement*  meAdcZpDisk2Panel1Plaq4_;
-  MonitorElement*  meAdcZpDisk2Panel2Plaq1_;
-  MonitorElement*  meAdcZpDisk2Panel2Plaq2_;
-  MonitorElement*  meAdcZpDisk2Panel2Plaq3_;
-
-  MonitorElement*  meRowZpDisk2Panel1Plaq1_;
-  MonitorElement*  meRowZpDisk2Panel1Plaq2_;
-  MonitorElement*  meRowZpDisk2Panel1Plaq3_;
-  MonitorElement*  meRowZpDisk2Panel1Plaq4_;
-  MonitorElement*  meRowZpDisk2Panel2Plaq1_;
-  MonitorElement*  meRowZpDisk2Panel2Plaq2_;
-  MonitorElement*  meRowZpDisk2Panel2Plaq3_;
-
-  MonitorElement*  meColZpDisk2Panel1Plaq1_;
-  MonitorElement*  meColZpDisk2Panel1Plaq2_;
-  MonitorElement*  meColZpDisk2Panel1Plaq3_;
-  MonitorElement*  meColZpDisk2Panel1Plaq4_;
-  MonitorElement*  meColZpDisk2Panel2Plaq1_;
-  MonitorElement*  meColZpDisk2Panel2Plaq2_;
-  MonitorElement*  meColZpDisk2Panel2Plaq3_;
-  MonitorElement*  meNdigiZpDisk2PerPanel1_;
-  MonitorElement*  meNdigiZpDisk2PerPanel2_;
+  MonitorElement *meAdcZpDisk2Panel1Plaq1_;
+  MonitorElement *meAdcZpDisk2Panel1Plaq2_;
+  MonitorElement *meAdcZpDisk2Panel1Plaq3_;
+  MonitorElement *meAdcZpDisk2Panel1Plaq4_;
+  MonitorElement *meAdcZpDisk2Panel2Plaq1_;
+  MonitorElement *meAdcZpDisk2Panel2Plaq2_;
+  MonitorElement *meAdcZpDisk2Panel2Plaq3_;
+
+  MonitorElement *meRowZpDisk2Panel1Plaq1_;
+  MonitorElement *meRowZpDisk2Panel1Plaq2_;
+  MonitorElement *meRowZpDisk2Panel1Plaq3_;
+  MonitorElement *meRowZpDisk2Panel1Plaq4_;
+  MonitorElement *meRowZpDisk2Panel2Plaq1_;
+  MonitorElement *meRowZpDisk2Panel2Plaq2_;
+  MonitorElement *meRowZpDisk2Panel2Plaq3_;
+
+  MonitorElement *meColZpDisk2Panel1Plaq1_;
+  MonitorElement *meColZpDisk2Panel1Plaq2_;
+  MonitorElement *meColZpDisk2Panel1Plaq3_;
+  MonitorElement *meColZpDisk2Panel1Plaq4_;
+  MonitorElement *meColZpDisk2Panel2Plaq1_;
+  MonitorElement *meColZpDisk2Panel2Plaq2_;
+  MonitorElement *meColZpDisk2Panel2Plaq3_;
+  MonitorElement *meNdigiZpDisk2PerPanel1_;
+  MonitorElement *meNdigiZpDisk2PerPanel2_;
 
   /* 1st Disk in ZMinus Side */
-  MonitorElement*  meAdcZmDisk1Panel1Plaq1_;
-  MonitorElement*  meAdcZmDisk1Panel1Plaq2_;
-  MonitorElement*  meAdcZmDisk1Panel1Plaq3_;
-  MonitorElement*  meAdcZmDisk1Panel1Plaq4_;
-  MonitorElement*  meAdcZmDisk1Panel2Plaq1_;
-  MonitorElement*  meAdcZmDisk1Panel2Plaq2_;
-  MonitorElement*  meAdcZmDisk1Panel2Plaq3_;
-
-  MonitorElement*  meRowZmDisk1Panel1Plaq1_;
-  MonitorElement*  meRowZmDisk1Panel1Plaq2_;
-  MonitorElement*  meRowZmDisk1Panel1Plaq3_;
-  MonitorElement*  meRowZmDisk1Panel1Plaq4_;
-  MonitorElement*  meRowZmDisk1Panel2Plaq1_;
-  MonitorElement*  meRowZmDisk1Panel2Plaq2_;
-  MonitorElement*  meRowZmDisk1Panel2Plaq3_;
-
-  MonitorElement*  meColZmDisk1Panel1Plaq1_;
-  MonitorElement*  meColZmDisk1Panel1Plaq2_;
-  MonitorElement*  meColZmDisk1Panel1Plaq3_;
-  MonitorElement*  meColZmDisk1Panel1Plaq4_;
-  MonitorElement*  meColZmDisk1Panel2Plaq1_;
-  MonitorElement*  meColZmDisk1Panel2Plaq2_;
-  MonitorElement*  meColZmDisk1Panel2Plaq3_;
-  MonitorElement*  meNdigiZmDisk1PerPanel1_;
-  MonitorElement*  meNdigiZmDisk1PerPanel2_;
+  MonitorElement *meAdcZmDisk1Panel1Plaq1_;
+  MonitorElement *meAdcZmDisk1Panel1Plaq2_;
+  MonitorElement *meAdcZmDisk1Panel1Plaq3_;
+  MonitorElement *meAdcZmDisk1Panel1Plaq4_;
+  MonitorElement *meAdcZmDisk1Panel2Plaq1_;
+  MonitorElement *meAdcZmDisk1Panel2Plaq2_;
+  MonitorElement *meAdcZmDisk1Panel2Plaq3_;
+
+  MonitorElement *meRowZmDisk1Panel1Plaq1_;
+  MonitorElement *meRowZmDisk1Panel1Plaq2_;
+  MonitorElement *meRowZmDisk1Panel1Plaq3_;
+  MonitorElement *meRowZmDisk1Panel1Plaq4_;
+  MonitorElement *meRowZmDisk1Panel2Plaq1_;
+  MonitorElement *meRowZmDisk1Panel2Plaq2_;
+  MonitorElement *meRowZmDisk1Panel2Plaq3_;
+
+  MonitorElement *meColZmDisk1Panel1Plaq1_;
+  MonitorElement *meColZmDisk1Panel1Plaq2_;
+  MonitorElement *meColZmDisk1Panel1Plaq3_;
+  MonitorElement *meColZmDisk1Panel1Plaq4_;
+  MonitorElement *meColZmDisk1Panel2Plaq1_;
+  MonitorElement *meColZmDisk1Panel2Plaq2_;
+  MonitorElement *meColZmDisk1Panel2Plaq3_;
+  MonitorElement *meNdigiZmDisk1PerPanel1_;
+  MonitorElement *meNdigiZmDisk1PerPanel2_;
 
   /* 2nd Disk in ZMius Side */
-  MonitorElement*  meAdcZmDisk2Panel1Plaq1_;
-  MonitorElement*  meAdcZmDisk2Panel1Plaq2_;
-  MonitorElement*  meAdcZmDisk2Panel1Plaq3_;
-  MonitorElement*  meAdcZmDisk2Panel1Plaq4_;
-  MonitorElement*  meAdcZmDisk2Panel2Plaq1_;
-  MonitorElement*  meAdcZmDisk2Panel2Plaq2_;
-  MonitorElement*  meAdcZmDisk2Panel2Plaq3_;
-
-  MonitorElement*  meRowZmDisk2Panel1Plaq1_;
-  MonitorElement*  meRowZmDisk2Panel1Plaq2_;
-  MonitorElement*  meRowZmDisk2Panel1Plaq3_;
-  MonitorElement*  meRowZmDisk2Panel1Plaq4_;
-  MonitorElement*  meRowZmDisk2Panel2Plaq1_;
-  MonitorElement*  meRowZmDisk2Panel2Plaq2_;
-  MonitorElement*  meRowZmDisk2Panel2Plaq3_;
-
-  MonitorElement*  meColZmDisk2Panel1Plaq1_;
-  MonitorElement*  meColZmDisk2Panel1Plaq2_;
-  MonitorElement*  meColZmDisk2Panel1Plaq3_;
-  MonitorElement*  meColZmDisk2Panel1Plaq4_;
-  MonitorElement*  meColZmDisk2Panel2Plaq1_;
-  MonitorElement*  meColZmDisk2Panel2Plaq2_;
-  MonitorElement*  meColZmDisk2Panel2Plaq3_;
-  MonitorElement*  meNdigiZmDisk2PerPanel1_;
-  MonitorElement*  meNdigiZmDisk2PerPanel2_;
-   
- 
-  DQMStore* dbe_;
-  edm::EDGetTokenT< edm::DetSetVector<PixelDigi> > edmDetSetVector_PixelDigi_Token_;
+  MonitorElement *meAdcZmDisk2Panel1Plaq1_;
+  MonitorElement *meAdcZmDisk2Panel1Plaq2_;
+  MonitorElement *meAdcZmDisk2Panel1Plaq3_;
+  MonitorElement *meAdcZmDisk2Panel1Plaq4_;
+  MonitorElement *meAdcZmDisk2Panel2Plaq1_;
+  MonitorElement *meAdcZmDisk2Panel2Plaq2_;
+  MonitorElement *meAdcZmDisk2Panel2Plaq3_;
+
+  MonitorElement *meRowZmDisk2Panel1Plaq1_;
+  MonitorElement *meRowZmDisk2Panel1Plaq2_;
+  MonitorElement *meRowZmDisk2Panel1Plaq3_;
+  MonitorElement *meRowZmDisk2Panel1Plaq4_;
+  MonitorElement *meRowZmDisk2Panel2Plaq1_;
+  MonitorElement *meRowZmDisk2Panel2Plaq2_;
+  MonitorElement *meRowZmDisk2Panel2Plaq3_;
+
+  MonitorElement *meColZmDisk2Panel1Plaq1_;
+  MonitorElement *meColZmDisk2Panel1Plaq2_;
+  MonitorElement *meColZmDisk2Panel1Plaq3_;
+  MonitorElement *meColZmDisk2Panel1Plaq4_;
+  MonitorElement *meColZmDisk2Panel2Plaq1_;
+  MonitorElement *meColZmDisk2Panel2Plaq2_;
+  MonitorElement *meColZmDisk2Panel2Plaq3_;
+  MonitorElement *meNdigiZmDisk2PerPanel1_;
+  MonitorElement *meNdigiZmDisk2PerPanel2_;
+
+  DQMStore *dbe_;
+  edm::EDGetTokenT<edm::DetSetVector<PixelDigi>> edmDetSetVector_PixelDigi_Token_;
   edm::ESHandle<GeometricSearchTracker> tracker;
-
- 
 };
 #endif
-
diff --git a/Validation/TrackerDigis/interface/SiStripDigiValid.h b/Validation/TrackerDigis/interface/SiStripDigiValid.h
index 428c7e08aeebd..8931e2475670b 100644
--- a/Validation/TrackerDigis/interface/SiStripDigiValid.h
+++ b/Validation/TrackerDigis/interface/SiStripDigiValid.h
@@ -1,186 +1,177 @@
 #ifndef SiStripDigiValid_h
 #define SiStripDigiValid_h
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include <DQMServices/Core/interface/DQMEDAnalyzer.h>
 
 #include <string>
 
 namespace edm {
-  template<class T> class DetSetVector;
+  template <class T>
+  class DetSetVector;
 }
 class SiStripDigi;
 class DQMStore;
 class MonitorElement;
 
-class  SiStripDigiValid: public DQMEDAnalyzer {
-
- public:
-
-    SiStripDigiValid(const edm::ParameterSet& ps);
-    ~SiStripDigiValid() override;
-
- protected:
-     void analyze(const edm::Event& e, const edm::EventSetup& c) override;
-     void bookHistograms(DQMStore::IBooker & ibooker,const edm::Run& run, const edm::EventSetup& es) override;
-     void endJob(void) override;
-
- private:
-
- 
-    //TIB  ADC
-    MonitorElement* meAdcTIBLayer1Extzp_[3];
-    MonitorElement* meAdcTIBLayer2Extzp_[3];
-    MonitorElement* meAdcTIBLayer3Extzp_[3];
-    MonitorElement* meAdcTIBLayer4Extzp_[3];
-
-    MonitorElement* meStripTIBLayer1Extzp_[3];
-    MonitorElement* meStripTIBLayer2Extzp_[3];
-    MonitorElement* meStripTIBLayer3Extzp_[3];
-    MonitorElement* meStripTIBLayer4Extzp_[3];
-
-    MonitorElement* meAdcTIBLayer1Intzp_[3];
-    MonitorElement* meAdcTIBLayer2Intzp_[3];
-    MonitorElement* meAdcTIBLayer3Intzp_[3];
-    MonitorElement* meAdcTIBLayer4Intzp_[3];
-
-    MonitorElement* meStripTIBLayer1Intzp_[3];
-    MonitorElement* meStripTIBLayer2Intzp_[3];
-    MonitorElement* meStripTIBLayer3Intzp_[3];
-    MonitorElement* meStripTIBLayer4Intzp_[3];
-
-    MonitorElement* meAdcTIBLayer1Extzm_[3];
-    MonitorElement* meAdcTIBLayer2Extzm_[3];
-    MonitorElement* meAdcTIBLayer3Extzm_[3];
-    MonitorElement* meAdcTIBLayer4Extzm_[3];
-
-    MonitorElement* meStripTIBLayer1Extzm_[3];
-    MonitorElement* meStripTIBLayer2Extzm_[3];
-    MonitorElement* meStripTIBLayer3Extzm_[3];
-    MonitorElement* meStripTIBLayer4Extzm_[3];
-
-    MonitorElement* meAdcTIBLayer1Intzm_[3];
-    MonitorElement* meAdcTIBLayer2Intzm_[3];
-    MonitorElement* meAdcTIBLayer3Intzm_[3];
-    MonitorElement* meAdcTIBLayer4Intzm_[3];
-
-    MonitorElement* meStripTIBLayer1Intzm_[3];
-    MonitorElement* meStripTIBLayer2Intzm_[3];
-    MonitorElement* meStripTIBLayer3Intzm_[3];
-    MonitorElement* meStripTIBLayer4Intzm_[3];
-
-    //TOB ADC
-    MonitorElement* meAdcTOBLayer1zp_[6];
-    MonitorElement* meAdcTOBLayer2zp_[6];
-    MonitorElement* meAdcTOBLayer3zp_[6];
-    MonitorElement* meAdcTOBLayer4zp_[6];
-    MonitorElement* meAdcTOBLayer5zp_[6];
-    MonitorElement* meAdcTOBLayer6zp_[6]; 
-
-    MonitorElement* meAdcTOBLayer1zm_[6];
-    MonitorElement* meAdcTOBLayer2zm_[6];
-    MonitorElement* meAdcTOBLayer3zm_[6];
-    MonitorElement* meAdcTOBLayer4zm_[6];
-    MonitorElement* meAdcTOBLayer5zm_[6];
-    MonitorElement* meAdcTOBLayer6zm_[6];
-
-    //TOB Strip
-    MonitorElement* meStripTOBLayer1zp_[6];
-    MonitorElement* meStripTOBLayer2zp_[6];
-    MonitorElement* meStripTOBLayer3zp_[6];
-    MonitorElement* meStripTOBLayer4zp_[6];
-    MonitorElement* meStripTOBLayer5zp_[6];
-    MonitorElement* meStripTOBLayer6zp_[6];
-
-    MonitorElement* meStripTOBLayer1zm_[6];
-    MonitorElement* meStripTOBLayer2zm_[6];
-    MonitorElement* meStripTOBLayer3zm_[6];
-    MonitorElement* meStripTOBLayer4zm_[6];
-    MonitorElement* meStripTOBLayer5zm_[6];
-    MonitorElement* meStripTOBLayer6zm_[6];
-
-
-    //TID  ADC
-    MonitorElement* meAdcTIDWheel1zp_[3];
-    MonitorElement* meAdcTIDWheel2zp_[3];
-    MonitorElement* meAdcTIDWheel3zp_[3];
-
-    MonitorElement* meAdcTIDWheel1zm_[3];
-    MonitorElement* meAdcTIDWheel2zm_[3];
-    MonitorElement* meAdcTIDWheel3zm_[3];
-
-    //TID Strip
-    MonitorElement* meStripTIDWheel1zp_[3];
-    MonitorElement* meStripTIDWheel2zp_[3];
-    MonitorElement* meStripTIDWheel3zp_[3];
-
-    MonitorElement* meStripTIDWheel1zm_[3];
-    MonitorElement* meStripTIDWheel2zm_[3];
-    MonitorElement* meStripTIDWheel3zm_[3];
-
-    //TEC ADC
-    MonitorElement* meAdcTECWheel1zp_[7];
-    MonitorElement* meAdcTECWheel2zp_[7];
-    MonitorElement* meAdcTECWheel3zp_[7];
-    MonitorElement* meAdcTECWheel4zp_[6];
-    MonitorElement* meAdcTECWheel5zp_[6];
-    MonitorElement* meAdcTECWheel6zp_[6];
-    MonitorElement* meAdcTECWheel7zp_[5];
-    MonitorElement* meAdcTECWheel8zp_[5];
-    MonitorElement* meAdcTECWheel9zp_[4];
-
-    MonitorElement* meAdcTECWheel1zm_[7];
-    MonitorElement* meAdcTECWheel2zm_[7];
-    MonitorElement* meAdcTECWheel3zm_[7];
-    MonitorElement* meAdcTECWheel4zm_[6];
-    MonitorElement* meAdcTECWheel5zm_[6];
-    MonitorElement* meAdcTECWheel6zm_[6];
-    MonitorElement* meAdcTECWheel7zm_[5];
-    MonitorElement* meAdcTECWheel8zm_[5];
-    MonitorElement* meAdcTECWheel9zm_[4];
-
-    //TEC Strip
-    MonitorElement* meStripTECWheel1zp_[7];
-    MonitorElement* meStripTECWheel2zp_[7];
-    MonitorElement* meStripTECWheel3zp_[7];
-    MonitorElement* meStripTECWheel4zp_[6];
-    MonitorElement* meStripTECWheel5zp_[6];
-    MonitorElement* meStripTECWheel6zp_[6];
-    MonitorElement* meStripTECWheel7zp_[5];
-    MonitorElement* meStripTECWheel8zp_[5];
-    MonitorElement* meStripTECWheel9zp_[4];
-
-    MonitorElement* meStripTECWheel1zm_[7];
-    MonitorElement* meStripTECWheel2zm_[7];
-    MonitorElement* meStripTECWheel3zm_[7];
-    MonitorElement* meStripTECWheel4zm_[6];
-    MonitorElement* meStripTECWheel5zm_[6];
-    MonitorElement* meStripTECWheel6zm_[6];
-    MonitorElement* meStripTECWheel7zm_[5];
-    MonitorElement* meStripTECWheel8zm_[5];
-    MonitorElement* meStripTECWheel9zm_[4];
-
-    MonitorElement* meNDigiTIBLayerzm_[4];
-    MonitorElement* meNDigiTOBLayerzm_[6];
-    MonitorElement* meNDigiTIDWheelzm_[3];
-    MonitorElement* meNDigiTECWheelzm_[9];
-
-    MonitorElement* meNDigiTIBLayerzp_[4];
-    MonitorElement* meNDigiTOBLayerzp_[6];
-    MonitorElement* meNDigiTIDWheelzp_[3];
-    MonitorElement* meNDigiTECWheelzp_[9];
-
-
-    //Back-End Interface
-    DQMStore* dbe_;
-    bool runStandalone;
-    std::string outputFile_;
-    edm::EDGetTokenT< edm::DetSetVector<SiStripDigi> > edmDetSetVector_SiStripDigi_Token_;
+class SiStripDigiValid : public DQMEDAnalyzer {
+public:
+  SiStripDigiValid(const edm::ParameterSet &ps);
+  ~SiStripDigiValid() override;
+
+protected:
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
+  void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run &run, const edm::EventSetup &es) override;
+  void endJob(void) override;
+
+private:
+  // TIB  ADC
+  MonitorElement *meAdcTIBLayer1Extzp_[3];
+  MonitorElement *meAdcTIBLayer2Extzp_[3];
+  MonitorElement *meAdcTIBLayer3Extzp_[3];
+  MonitorElement *meAdcTIBLayer4Extzp_[3];
+
+  MonitorElement *meStripTIBLayer1Extzp_[3];
+  MonitorElement *meStripTIBLayer2Extzp_[3];
+  MonitorElement *meStripTIBLayer3Extzp_[3];
+  MonitorElement *meStripTIBLayer4Extzp_[3];
+
+  MonitorElement *meAdcTIBLayer1Intzp_[3];
+  MonitorElement *meAdcTIBLayer2Intzp_[3];
+  MonitorElement *meAdcTIBLayer3Intzp_[3];
+  MonitorElement *meAdcTIBLayer4Intzp_[3];
+
+  MonitorElement *meStripTIBLayer1Intzp_[3];
+  MonitorElement *meStripTIBLayer2Intzp_[3];
+  MonitorElement *meStripTIBLayer3Intzp_[3];
+  MonitorElement *meStripTIBLayer4Intzp_[3];
+
+  MonitorElement *meAdcTIBLayer1Extzm_[3];
+  MonitorElement *meAdcTIBLayer2Extzm_[3];
+  MonitorElement *meAdcTIBLayer3Extzm_[3];
+  MonitorElement *meAdcTIBLayer4Extzm_[3];
+
+  MonitorElement *meStripTIBLayer1Extzm_[3];
+  MonitorElement *meStripTIBLayer2Extzm_[3];
+  MonitorElement *meStripTIBLayer3Extzm_[3];
+  MonitorElement *meStripTIBLayer4Extzm_[3];
+
+  MonitorElement *meAdcTIBLayer1Intzm_[3];
+  MonitorElement *meAdcTIBLayer2Intzm_[3];
+  MonitorElement *meAdcTIBLayer3Intzm_[3];
+  MonitorElement *meAdcTIBLayer4Intzm_[3];
+
+  MonitorElement *meStripTIBLayer1Intzm_[3];
+  MonitorElement *meStripTIBLayer2Intzm_[3];
+  MonitorElement *meStripTIBLayer3Intzm_[3];
+  MonitorElement *meStripTIBLayer4Intzm_[3];
+
+  // TOB ADC
+  MonitorElement *meAdcTOBLayer1zp_[6];
+  MonitorElement *meAdcTOBLayer2zp_[6];
+  MonitorElement *meAdcTOBLayer3zp_[6];
+  MonitorElement *meAdcTOBLayer4zp_[6];
+  MonitorElement *meAdcTOBLayer5zp_[6];
+  MonitorElement *meAdcTOBLayer6zp_[6];
+
+  MonitorElement *meAdcTOBLayer1zm_[6];
+  MonitorElement *meAdcTOBLayer2zm_[6];
+  MonitorElement *meAdcTOBLayer3zm_[6];
+  MonitorElement *meAdcTOBLayer4zm_[6];
+  MonitorElement *meAdcTOBLayer5zm_[6];
+  MonitorElement *meAdcTOBLayer6zm_[6];
+
+  // TOB Strip
+  MonitorElement *meStripTOBLayer1zp_[6];
+  MonitorElement *meStripTOBLayer2zp_[6];
+  MonitorElement *meStripTOBLayer3zp_[6];
+  MonitorElement *meStripTOBLayer4zp_[6];
+  MonitorElement *meStripTOBLayer5zp_[6];
+  MonitorElement *meStripTOBLayer6zp_[6];
+
+  MonitorElement *meStripTOBLayer1zm_[6];
+  MonitorElement *meStripTOBLayer2zm_[6];
+  MonitorElement *meStripTOBLayer3zm_[6];
+  MonitorElement *meStripTOBLayer4zm_[6];
+  MonitorElement *meStripTOBLayer5zm_[6];
+  MonitorElement *meStripTOBLayer6zm_[6];
+
+  // TID  ADC
+  MonitorElement *meAdcTIDWheel1zp_[3];
+  MonitorElement *meAdcTIDWheel2zp_[3];
+  MonitorElement *meAdcTIDWheel3zp_[3];
+
+  MonitorElement *meAdcTIDWheel1zm_[3];
+  MonitorElement *meAdcTIDWheel2zm_[3];
+  MonitorElement *meAdcTIDWheel3zm_[3];
+
+  // TID Strip
+  MonitorElement *meStripTIDWheel1zp_[3];
+  MonitorElement *meStripTIDWheel2zp_[3];
+  MonitorElement *meStripTIDWheel3zp_[3];
+
+  MonitorElement *meStripTIDWheel1zm_[3];
+  MonitorElement *meStripTIDWheel2zm_[3];
+  MonitorElement *meStripTIDWheel3zm_[3];
+
+  // TEC ADC
+  MonitorElement *meAdcTECWheel1zp_[7];
+  MonitorElement *meAdcTECWheel2zp_[7];
+  MonitorElement *meAdcTECWheel3zp_[7];
+  MonitorElement *meAdcTECWheel4zp_[6];
+  MonitorElement *meAdcTECWheel5zp_[6];
+  MonitorElement *meAdcTECWheel6zp_[6];
+  MonitorElement *meAdcTECWheel7zp_[5];
+  MonitorElement *meAdcTECWheel8zp_[5];
+  MonitorElement *meAdcTECWheel9zp_[4];
+
+  MonitorElement *meAdcTECWheel1zm_[7];
+  MonitorElement *meAdcTECWheel2zm_[7];
+  MonitorElement *meAdcTECWheel3zm_[7];
+  MonitorElement *meAdcTECWheel4zm_[6];
+  MonitorElement *meAdcTECWheel5zm_[6];
+  MonitorElement *meAdcTECWheel6zm_[6];
+  MonitorElement *meAdcTECWheel7zm_[5];
+  MonitorElement *meAdcTECWheel8zm_[5];
+  MonitorElement *meAdcTECWheel9zm_[4];
+
+  // TEC Strip
+  MonitorElement *meStripTECWheel1zp_[7];
+  MonitorElement *meStripTECWheel2zp_[7];
+  MonitorElement *meStripTECWheel3zp_[7];
+  MonitorElement *meStripTECWheel4zp_[6];
+  MonitorElement *meStripTECWheel5zp_[6];
+  MonitorElement *meStripTECWheel6zp_[6];
+  MonitorElement *meStripTECWheel7zp_[5];
+  MonitorElement *meStripTECWheel8zp_[5];
+  MonitorElement *meStripTECWheel9zp_[4];
+
+  MonitorElement *meStripTECWheel1zm_[7];
+  MonitorElement *meStripTECWheel2zm_[7];
+  MonitorElement *meStripTECWheel3zm_[7];
+  MonitorElement *meStripTECWheel4zm_[6];
+  MonitorElement *meStripTECWheel5zm_[6];
+  MonitorElement *meStripTECWheel6zm_[6];
+  MonitorElement *meStripTECWheel7zm_[5];
+  MonitorElement *meStripTECWheel8zm_[5];
+  MonitorElement *meStripTECWheel9zm_[4];
+
+  MonitorElement *meNDigiTIBLayerzm_[4];
+  MonitorElement *meNDigiTOBLayerzm_[6];
+  MonitorElement *meNDigiTIDWheelzm_[3];
+  MonitorElement *meNDigiTECWheelzm_[9];
+
+  MonitorElement *meNDigiTIBLayerzp_[4];
+  MonitorElement *meNDigiTOBLayerzp_[6];
+  MonitorElement *meNDigiTIDWheelzp_[3];
+  MonitorElement *meNDigiTECWheelzp_[9];
+
+  // Back-End Interface
+  DQMStore *dbe_;
+  bool runStandalone;
+  std::string outputFile_;
+  edm::EDGetTokenT<edm::DetSetVector<SiStripDigi>> edmDetSetVector_SiStripDigi_Token_;
 };
 
-
-
-
 #endif
-
diff --git a/Validation/TrackerDigis/plugins/SealModule.cc b/Validation/TrackerDigis/plugins/SealModule.cc
index 6be3892857a43..4a16dfdbca586 100644
--- a/Validation/TrackerDigis/plugins/SealModule.cc
+++ b/Validation/TrackerDigis/plugins/SealModule.cc
@@ -1,9 +1,7 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "Validation/TrackerDigis/interface/SiPixelDigiValid.h"
 #include "Validation/TrackerDigis/interface/SiStripDigiValid.h"
 
-
 DEFINE_FWK_MODULE(SiPixelDigiValid);
 DEFINE_FWK_MODULE(SiStripDigiValid);
-
diff --git a/Validation/TrackerDigis/plugins/SiPixelDigiValid.cc b/Validation/TrackerDigis/plugins/SiPixelDigiValid.cc
index eaeea18e1169d..f50747b9629c6 100644
--- a/Validation/TrackerDigis/plugins/SiPixelDigiValid.cc
+++ b/Validation/TrackerDigis/plugins/SiPixelDigiValid.cc
@@ -1,287 +1,290 @@
-#include "Validation/TrackerDigis/interface/SiPixelDigiValid.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Common/interface/DetSetVector.h"
-#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "DataFormats/SiPixelDigi/interface/PixelDigi.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
-#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
-#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetType.h"
 #include "Geometry/TrackerGeometryBuilder/interface/PixelGeomDetUnit.h"
 #include "Geometry/TrackerGeometryBuilder/interface/RectangularPixelTopology.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/TrackerNumberingBuilder/interface/GeometricDet.h"
+#include "Validation/TrackerDigis/interface/SiPixelDigiValid.h"
 
-//using namespace std;
-//using namespace edm;
-
-SiPixelDigiValid::SiPixelDigiValid(const edm::ParameterSet& ps)
-  : outputFile_( ps.getUntrackedParameter<std::string>( "outputFile", "pixeldigihisto.root" ) )
-  , runStandalone ( ps.getParameter<bool>("runStandalone")  )  
-  , dbe_(nullptr)
-  , edmDetSetVector_PixelDigi_Token_( consumes< edm::DetSetVector<PixelDigi> >( ps.getParameter<edm::InputTag>( "src" ) ) ) {
- 
- 
-}
-
-SiPixelDigiValid::~SiPixelDigiValid(){
-}
-
-
-void SiPixelDigiValid::bookHistograms(DQMStore::IBooker & ibooker,const edm::Run& run, const edm::EventSetup& es){
-   dbe_ = edm::Service<DQMStore>().operator->();
-   es.get<TrackerRecoGeometryRecord>().get( tracker );
-
-
-   if ( dbe_ ) {
-     ibooker.setCurrentFolder("TrackerDigisV/TrackerDigis/Pixel");
-
-     meDigiMultiLayer1Ring1_ =  ibooker.book1D("digimulti_layer1ring1","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer1Ring2_ =  ibooker.book1D("digimulti_layer1ring2","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer1Ring3_ =  ibooker.book1D("digimulti_layer1ring3","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer1Ring4_ =  ibooker.book1D("digimulti_layer1ring4","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer1Ring5_ =  ibooker.book1D("digimulti_layer1ring5","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer1Ring6_ =  ibooker.book1D("digimulti_layer1ring6","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer1Ring7_ =  ibooker.book1D("digimulti_layer1ring7","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer1Ring8_ =  ibooker.book1D("digimulti_layer1ring8","Digi Multiplicity ",30, 0., 30.);
-
-     meDigiMultiLayer2Ring1_ =  ibooker.book1D("digimulti_layer2ring1","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer2Ring2_ =  ibooker.book1D("digimulti_layer2ring2","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer2Ring3_ =  ibooker.book1D("digimulti_layer2ring3","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer2Ring4_ =  ibooker.book1D("digimulti_layer2ring4","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer2Ring5_ =  ibooker.book1D("digimulti_layer2ring5","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer2Ring6_ =  ibooker.book1D("digimulti_layer2ring6","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer2Ring7_ =  ibooker.book1D("digimulti_layer2ring7","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer2Ring8_ =  ibooker.book1D("digimulti_layer2ring8","Digi Multiplicity ",30, 0., 30.);
-
-     meDigiMultiLayer3Ring1_ =  ibooker.book1D("digimulti_layer3ring1","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer3Ring2_ =  ibooker.book1D("digimulti_layer3ring2","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer3Ring3_ =  ibooker.book1D("digimulti_layer3ring3","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer3Ring4_ =  ibooker.book1D("digimulti_layer3ring4","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer3Ring5_ =  ibooker.book1D("digimulti_layer3ring5","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer3Ring6_ =  ibooker.book1D("digimulti_layer3ring6","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer3Ring7_ =  ibooker.book1D("digimulti_layer3ring7","Digi Multiplicity ",30, 0., 30.);
-     meDigiMultiLayer3Ring8_ =  ibooker.book1D("digimulti_layer3ring8","Digi Multiplicity ",30, 0., 30.);
-
-     /////Barrel 
-     meAdcLayer1Ring1_ = ibooker.book1D("adc_layer1ring1","Digi charge",50, 0., 300.);
-     meAdcLayer1Ring2_ = ibooker.book1D("adc_layer1ring2","Digi charge",50, 0., 300.);
-     meAdcLayer1Ring3_ = ibooker.book1D("adc_layer1ring3","Digi charge",50, 0., 300.);
-     meAdcLayer1Ring4_ = ibooker.book1D("adc_layer1ring4","Digi charge",50, 0., 300.);
-     meAdcLayer1Ring5_ = ibooker.book1D("adc_layer1ring5","Digi charge",50, 0., 300.);
-     meAdcLayer1Ring6_ = ibooker.book1D("adc_layer1ring6","Digi charge",50, 0., 300.);
-     meAdcLayer1Ring7_ = ibooker.book1D("adc_layer1ring7","Digi charge",50, 0., 300.);
-     meAdcLayer1Ring8_ = ibooker.book1D("adc_layer1ring8","Digi charge",50, 0., 300.);
-
-     meRowLayer1Ring1_ = ibooker.book1D("row_layer1ring1","Digi row",50, 0., 200.);
-     meRowLayer1Ring2_ = ibooker.book1D("row_layer1ring2","Digi row",50, 0., 200.);
-     meRowLayer1Ring3_ = ibooker.book1D("row_layer1ring3","Digi row",50, 0., 200.);
-     meRowLayer1Ring4_ = ibooker.book1D("row_layer1ring4","Digi row",50, 0., 200.);
-     meRowLayer1Ring5_ = ibooker.book1D("row_layer1ring5","Digi row",50, 0., 200.);
-     meRowLayer1Ring6_ = ibooker.book1D("row_layer1ring6","Digi row",50, 0., 200.);
-     meRowLayer1Ring7_ = ibooker.book1D("row_layer1ring7","Digi row",50, 0., 200.);
-     meRowLayer1Ring8_ = ibooker.book1D("row_layer1ring8","Digi row",50, 0., 200.);
-
-     meColLayer1Ring1_ = ibooker.book1D("col_layer1ring1","Digi column",50, 0., 500.);
-     meColLayer1Ring2_ = ibooker.book1D("col_layer1ring2","Digi column",50, 0., 500.);
-     meColLayer1Ring3_ = ibooker.book1D("col_layer1ring3","Digi column",50, 0., 500.);
-     meColLayer1Ring4_ = ibooker.book1D("col_layer1ring4","Digi column",50, 0., 500.);
-     meColLayer1Ring5_ = ibooker.book1D("col_layer1ring5","Digi column",50, 0., 500.);
-     meColLayer1Ring6_ = ibooker.book1D("col_layer1ring6","Digi column",50, 0., 500.);
-     meColLayer1Ring7_ = ibooker.book1D("col_layer1ring7","Digi column",50, 0., 500.);
-     meColLayer1Ring8_ = ibooker.book1D("col_layer1ring8","Digi column",50, 0., 500.);
-
-
-     meAdcLayer2Ring1_ = ibooker.book1D("adc_layer2ring1","Digi charge",50, 0., 300.);
-     meAdcLayer2Ring2_ = ibooker.book1D("adc_layer2ring2","Digi charge",50, 0., 300.);
-     meAdcLayer2Ring3_ = ibooker.book1D("adc_layer2ring3","Digi charge",50, 0., 300.);
-     meAdcLayer2Ring4_ = ibooker.book1D("adc_layer2ring4","Digi charge",50, 0., 300.);
-     meAdcLayer2Ring5_ = ibooker.book1D("adc_layer2ring5","Digi charge",50, 0., 300.);
-     meAdcLayer2Ring6_ = ibooker.book1D("adc_layer2ring6","Digi charge",50, 0., 300.);
-     meAdcLayer2Ring7_ = ibooker.book1D("adc_layer2ring7","Digi charge",50, 0., 300.);
-     meAdcLayer2Ring8_ = ibooker.book1D("adc_layer2ring8","Digi charge",50, 0., 300.);
-
-     meRowLayer2Ring1_ = ibooker.book1D("row_layer2ring1","Digi row",50, 0., 200.);
-     meRowLayer2Ring2_ = ibooker.book1D("row_layer2ring2","Digi row",50, 0., 200.);
-     meRowLayer2Ring3_ = ibooker.book1D("row_layer2ring3","Digi row",50, 0., 200.);
-     meRowLayer2Ring4_ = ibooker.book1D("row_layer2ring4","Digi row",50, 0., 200.);
-     meRowLayer2Ring5_ = ibooker.book1D("row_layer2ring5","Digi row",50, 0., 200.);
-     meRowLayer2Ring6_ = ibooker.book1D("row_layer2ring6","Digi row",50, 0., 200.);
-     meRowLayer2Ring7_ = ibooker.book1D("row_layer2ring7","Digi row",50, 0., 200.);
-     meRowLayer2Ring8_ = ibooker.book1D("row_layer2ring8","Digi row",50, 0., 200.);
-
-     meColLayer2Ring1_ = ibooker.book1D("col_layer2ring1","Digi column",50, 0., 500.);
-     meColLayer2Ring2_ = ibooker.book1D("col_layer2ring2","Digi column",50, 0., 500.);
-     meColLayer2Ring3_ = ibooker.book1D("col_layer2ring3","Digi column",50, 0., 500.);
-     meColLayer2Ring4_ = ibooker.book1D("col_layer2ring4","Digi column",50, 0., 500.);
-     meColLayer2Ring5_ = ibooker.book1D("col_layer2ring5","Digi column",50, 0., 500.);
-     meColLayer2Ring6_ = ibooker.book1D("col_layer2ring6","Digi column",50, 0., 500.);
-     meColLayer2Ring7_ = ibooker.book1D("col_layer2ring7","Digi column",50, 0., 500.);
-     meColLayer2Ring8_ = ibooker.book1D("col_layer2ring8","Digi column",50, 0., 500.);
-
-
-     meAdcLayer3Ring1_ = ibooker.book1D("adc_layer3ring1","Digi charge",50, 0., 300.);
-     meAdcLayer3Ring2_ = ibooker.book1D("adc_layer3ring2","Digi charge",50, 0., 300.);
-     meAdcLayer3Ring3_ = ibooker.book1D("adc_layer3ring3","Digi charge",50, 0., 300.);
-     meAdcLayer3Ring4_ = ibooker.book1D("adc_layer3ring4","Digi charge",50, 0., 300.);
-     meAdcLayer3Ring5_ = ibooker.book1D("adc_layer3ring5","Digi charge",50, 0., 300.);
-     meAdcLayer3Ring6_ = ibooker.book1D("adc_layer3ring6","Digi charge",50, 0., 300.);
-     meAdcLayer3Ring7_ = ibooker.book1D("adc_layer3ring7","Digi charge",50, 0., 300.);
-     meAdcLayer3Ring8_ = ibooker.book1D("adc_layer3ring8","Digi charge",50, 0., 300.);
-
-     meRowLayer3Ring1_ = ibooker.book1D("row_layer3ring1","Digi row",50, 0., 200.);
-     meRowLayer3Ring2_ = ibooker.book1D("row_layer3ring2","Digi row",50, 0., 200.);
-     meRowLayer3Ring3_ = ibooker.book1D("row_layer3ring3","Digi row",50, 0., 200.);
-     meRowLayer3Ring4_ = ibooker.book1D("row_layer3ring4","Digi row",50, 0., 200.);
-     meRowLayer3Ring5_ = ibooker.book1D("row_layer3ring5","Digi row",50, 0., 200.);
-     meRowLayer3Ring6_ = ibooker.book1D("row_layer3ring6","Digi row",50, 0., 200.);
-     meRowLayer3Ring7_ = ibooker.book1D("row_layer3ring7","Digi row",50, 0., 200.);
-     meRowLayer3Ring8_ = ibooker.book1D("row_layer3ring8","Digi row",50, 0., 200.);
-
-     meColLayer3Ring1_ = ibooker.book1D("col_layer3ring1","Digi column",50, 0., 500.);
-     meColLayer3Ring2_ = ibooker.book1D("col_layer3ring2","Digi column",50, 0., 500.);
-     meColLayer3Ring3_ = ibooker.book1D("col_layer3ring3","Digi column",50, 0., 500.);
-     meColLayer3Ring4_ = ibooker.book1D("col_layer3ring4","Digi column",50, 0., 500.);
-     meColLayer3Ring5_ = ibooker.book1D("col_layer3ring5","Digi column",50, 0., 500.);
-     meColLayer3Ring6_ = ibooker.book1D("col_layer3ring6","Digi column",50, 0., 500.);
-     meColLayer3Ring7_ = ibooker.book1D("col_layer3ring7","Digi column",50, 0., 500.);
-     meColLayer3Ring8_ = ibooker.book1D("col_layer3ring8","Digi column",50, 0., 500.);
-
-     meDigiMultiLayer1Ladders_  =ibooker.bookProfile("digi_layer1_ladders","Digi Num. per ladder",22,0.0,21.0, 100, 0.0, 100);
-     meDigiMultiLayer2Ladders_  =ibooker.bookProfile("digi_layer2_ladders","Digi Num. per ladder",34,0.0,32.0, 100, 0.0, 100);
-     meDigiMultiLayer3Ladders_  =ibooker.bookProfile("digi_layer3_ladders","Digi Num. per ladder",46,0.0,45.0, 100, 0.0, 100);
- 
-     //Forward Pixel
-     /* ZMinus Side 1st Disk */
-     meAdcZmDisk1Panel1Plaq1_ = ibooker.book1D("adc_zm_disk1_panel1_plaq1","Digi charge",50,0.,300.);
-     meAdcZmDisk1Panel1Plaq2_ = ibooker.book1D("adc_zm_disk1_panel1_plaq2","Digi charge",50,0.,300.);
-     meAdcZmDisk1Panel1Plaq3_ = ibooker.book1D("adc_zm_disk1_panel1_plaq3","Digi charge",50,0.,300.);
-     meAdcZmDisk1Panel1Plaq4_ = ibooker.book1D("adc_zm_disk1_panel1_plaq4","Digi charge",50,0.,300.);
-     meAdcZmDisk1Panel2Plaq1_ = ibooker.book1D("adc_zm_disk1_panel2_plaq1","Digi charge",50,0.,300.);
-     meAdcZmDisk1Panel2Plaq2_ = ibooker.book1D("adc_zm_disk1_panel2_plaq2","Digi charge",50,0.,300.);
-     meAdcZmDisk1Panel2Plaq3_ = ibooker.book1D("adc_zm_disk1_panel2_plaq3","Digi charge",50,0.,300.);
-
-     meRowZmDisk1Panel1Plaq1_ = ibooker.book1D("row_zm_disk1_panel1_plaq1","Digi row",50,0.,100.);
-     meRowZmDisk1Panel1Plaq2_ = ibooker.book1D("row_zm_disk1_panel1_plaq2","Digi row",50,0.,200.);
-     meRowZmDisk1Panel1Plaq3_ = ibooker.book1D("row_zm_disk1_panel1_plaq3","Digi row",50,0.,200.);
-     meRowZmDisk1Panel1Plaq4_ = ibooker.book1D("row_zm_disk1_panel1_plaq4","Digi row",50,0.,100.);
-     meRowZmDisk1Panel2Plaq1_ = ibooker.book1D("row_zm_disk1_panel2_plaq1","Digi row",50,0.,200.);
-     meRowZmDisk1Panel2Plaq2_ = ibooker.book1D("row_zm_disk1_panel2_plaq2","Digi row",50,0.,200.);
-     meRowZmDisk1Panel2Plaq3_ = ibooker.book1D("row_zm_disk1_panel2_plaq3","Digi row",50,0.,200.);
-
-     meColZmDisk1Panel1Plaq1_ = ibooker.book1D("col_zm_disk1_panel1_plaq1","Digi column",50,0.,150.);
-     meColZmDisk1Panel1Plaq2_ = ibooker.book1D("col_zm_disk1_panel1_plaq2","Digi column",50,0.,200.);
-     meColZmDisk1Panel1Plaq3_ = ibooker.book1D("col_zm_disk1_panel1_plaq3","Digi column",50,0.,250.);
-     meColZmDisk1Panel1Plaq4_ = ibooker.book1D("col_zm_disk1_panel1_plaq4","Digi column",50,0.,300.);
-     meColZmDisk1Panel2Plaq1_ = ibooker.book1D("col_zm_disk1_panel2_plaq1","Digi column",50,0.,200.);
-     meColZmDisk1Panel2Plaq2_ = ibooker.book1D("col_zm_disk1_panel2_plaq2","Digi column",50,0.,250.);
-     meColZmDisk1Panel2Plaq3_ = ibooker.book1D("col_zm_disk1_panel2_plaq3","Digi column",50,0.,300.);
-     meNdigiZmDisk1PerPanel1_ = ibooker.book1D("digi_zm_disk1_panel1","Digi Num. Panel1 Of 1st Disk In ZMinus Side ",30,0.,30.);
-     meNdigiZmDisk1PerPanel2_ = ibooker.book1D("digi_zm_disk1_panel2","Digi Num. Panel2 Of 1st Disk In ZMinus Side ",30,0.,30.);
-
-     /* ZMius Side 2nd disk */
-     meAdcZmDisk2Panel1Plaq1_ = ibooker.book1D("adc_zm_disk2_panel1_plaq1","Digi charge",50,0.,300.);
-     meAdcZmDisk2Panel1Plaq2_ = ibooker.book1D("adc_zm_disk2_panel1_plaq2","Digi charge",50,0.,300.);
-     meAdcZmDisk2Panel1Plaq3_ = ibooker.book1D("adc_zm_disk2_panel1_plaq3","Digi charge",50,0.,300.);
-     meAdcZmDisk2Panel1Plaq4_ = ibooker.book1D("adc_zm_disk2_panel1_plaq4","Digi charge",50,0.,300.);
-     meAdcZmDisk2Panel2Plaq1_ = ibooker.book1D("adc_zm_disk2_panel2_plaq1","Digi charge",50,0.,300.);
-     meAdcZmDisk2Panel2Plaq2_ = ibooker.book1D("adc_zm_disk2_panel2_plaq2","Digi charge",50,0.,300.);
-     meAdcZmDisk2Panel2Plaq3_ = ibooker.book1D("adc_zm_disk2_panel2_plaq3","Digi charge",50,0.,300.);
-
-     meRowZmDisk2Panel1Plaq1_ = ibooker.book1D("row_zm_disk2_panel1_plaq1","Digi row",50,0.,100.);
-     meRowZmDisk2Panel1Plaq2_ = ibooker.book1D("row_zm_disk2_panel1_plaq2","Digi row",50,0.,200.);
-     meRowZmDisk2Panel1Plaq3_ = ibooker.book1D("row_zm_disk2_panel1_plaq3","Digi row",50,0.,200.);
-     meRowZmDisk2Panel1Plaq4_ = ibooker.book1D("row_zm_disk2_panel1_plaq4","Digi row",50,0.,100.);
-     meRowZmDisk2Panel2Plaq1_ = ibooker.book1D("row_zm_disk2_panel2_plaq1","Digi row",50,0.,200.);
-     meRowZmDisk2Panel2Plaq2_ = ibooker.book1D("row_zm_disk2_panel2_plaq2","Digi row",50,0.,200.);
-     meRowZmDisk2Panel2Plaq3_ = ibooker.book1D("row_zm_disk2_panel2_plaq3","Digi row",50,0.,200.);
-
-     meColZmDisk2Panel1Plaq1_ = ibooker.book1D("col_zm_disk2_panel1_plaq1","Digi Column",50,0.,150.);
-     meColZmDisk2Panel1Plaq2_ = ibooker.book1D("col_zm_disk2_panel1_plaq2","Digi Column",50,0.,200.);
-     meColZmDisk2Panel1Plaq3_ = ibooker.book1D("col_zm_disk2_panel1_plaq3","Digi Column",50,0.,250.);
-     meColZmDisk2Panel1Plaq4_ = ibooker.book1D("col_zm_disk2_panel1_plaq4","Digi Column",50,0.,300.);
-     meColZmDisk2Panel2Plaq1_ = ibooker.book1D("col_zm_disk2_panel2_plaq1","Digi Column",50,0.,200.);
-     meColZmDisk2Panel2Plaq2_ = ibooker.book1D("col_zm_disk2_panel2_plaq2","Digi Column",50,0.,250.);
-     meColZmDisk2Panel2Plaq3_ = ibooker.book1D("col_zm_disk2_panel2_plaq3","Digi Column",50,0.,300.);
-     meNdigiZmDisk2PerPanel1_ = ibooker.book1D("digi_zm_disk2_panel1","Digi Num. Panel1 Of 2nd Disk In ZMinus Side ",30,0.,30.);
-     meNdigiZmDisk2PerPanel2_ = ibooker.book1D("digi_zm_disk2_panel2","Digi Num. Panel2 Of 2nd Disk In ZMinus Side ",30,0.,30.);
-
-
-     /* ZPlus Side 1st Disk */
-     meAdcZpDisk1Panel1Plaq1_ = ibooker.book1D("adc_zp_disk1_panel1_plaq1","Digi charge",50,0.,300.);
-     meAdcZpDisk1Panel1Plaq2_ = ibooker.book1D("adc_zp_disk1_panel1_plaq2","Digi charge",50,0.,300.);
-     meAdcZpDisk1Panel1Plaq3_ = ibooker.book1D("adc_zp_disk1_panel1_plaq3","Digi charge",50,0.,300.);
-     meAdcZpDisk1Panel1Plaq4_ = ibooker.book1D("adc_zp_disk1_panel1_plaq4","Digi charge",50,0.,300.);
-     meAdcZpDisk1Panel2Plaq1_ = ibooker.book1D("adc_zp_disk1_panel2_plaq1","Digi charge",50,0.,300.);
-     meAdcZpDisk1Panel2Plaq2_ = ibooker.book1D("adc_zp_disk1_panel2_plaq2","Digi charge",50,0.,300.);
-     meAdcZpDisk1Panel2Plaq3_ = ibooker.book1D("adc_zp_disk1_panel2_plaq3","Digi charge",50,0.,300.);
-
-     meRowZpDisk1Panel1Plaq1_ = ibooker.book1D("row_zp_disk1_panel1_plaq1","Digi row",50,0.,100.);
-     meRowZpDisk1Panel1Plaq2_ = ibooker.book1D("row_zp_disk1_panel1_plaq2","Digi row",50,0.,200.);
-     meRowZpDisk1Panel1Plaq3_ = ibooker.book1D("row_zp_disk1_panel1_plaq3","Digi row",50,0.,200.);
-     meRowZpDisk1Panel1Plaq4_ = ibooker.book1D("row_zp_disk1_panel1_plaq4","Digi row",50,0.,100.);
-     meRowZpDisk1Panel2Plaq1_ = ibooker.book1D("row_zp_disk1_panel2_plaq1","Digi row",50,0.,200.);
-     meRowZpDisk1Panel2Plaq2_ = ibooker.book1D("row_zp_disk1_panel2_plaq2","Digi row",50,0.,200.);
-     meRowZpDisk1Panel2Plaq3_ = ibooker.book1D("row_zp_disk1_panel2_plaq3","Digi row",50,0.,200.);
-
-     meColZpDisk1Panel1Plaq1_ = ibooker.book1D("col_zp_disk1_panel1_plaq1","Digi Column",50,0.,150.);
-     meColZpDisk1Panel1Plaq2_ = ibooker.book1D("col_zp_disk1_panel1_plaq2","Digi column",50,0.,200.);
-     meColZpDisk1Panel1Plaq3_ = ibooker.book1D("col_zp_disk1_panel1_plaq3","Digi column",50,0.,250.);
-     meColZpDisk1Panel1Plaq4_ = ibooker.book1D("col_zp_disk1_panel1_plaq4","Digi column",50,0.,300.);
-     meColZpDisk1Panel2Plaq1_ = ibooker.book1D("col_zp_disk1_panel2_plaq1","Digi column",50,0.,200.);
-     meColZpDisk1Panel2Plaq2_ = ibooker.book1D("col_zp_disk1_panel2_plaq2","Digi column",50,0.,250.);
-     meColZpDisk1Panel2Plaq3_ = ibooker.book1D("col_zp_disk1_panel2_plaq3","Digi column",50,0.,300.);
-     meNdigiZpDisk1PerPanel1_ = ibooker.book1D("digi_zp_disk1_panel1","Digi Num. Panel1 Of 1st Disk In ZPlus Side ",30,0.,30.);
-     meNdigiZpDisk1PerPanel2_ = ibooker.book1D("digi_zp_disk1_panel2","Digi Num. Panel2 Of 1st Disk In ZPlus Side ",30,0.,30.);
-
-
-     /* ZPlus Side 2nd disk */
-     meAdcZpDisk2Panel1Plaq1_ = ibooker.book1D("adc_zp_disk2_panel1_plaq1","Digi charge",50,0.,300.);
-     meAdcZpDisk2Panel1Plaq2_ = ibooker.book1D("adc_zp_disk2_panel1_plaq2","Digi charge",50,0.,300.);
-     meAdcZpDisk2Panel1Plaq3_ = ibooker.book1D("adc_zp_disk2_panel1_plaq3","Digi charge",50,0.,300.);
-     meAdcZpDisk2Panel1Plaq4_ = ibooker.book1D("adc_zp_disk2_panel1_plaq4","Digi charge",50,0.,300.);
-     meAdcZpDisk2Panel2Plaq1_ = ibooker.book1D("adc_zp_disk2_panel2_plaq1","Digi charge",50,0.,300.);
-     meAdcZpDisk2Panel2Plaq2_ = ibooker.book1D("adc_zp_disk2_panel2_plaq2","Digi charge",50,0.,300.);
-     meAdcZpDisk2Panel2Plaq3_ = ibooker.book1D("adc_zp_disk2_panel2_plaq3","Digi charge",50,0.,300.);
-
-     meRowZpDisk2Panel1Plaq1_ = ibooker.book1D("row_zp_disk2_panel1_plaq1","Digi row",10,0.,100.);
-     meRowZpDisk2Panel1Plaq2_ = ibooker.book1D("row_zp_disk2_panel1_plaq2","Digi row",10,0.,200.);
-     meRowZpDisk2Panel1Plaq3_ = ibooker.book1D("row_zp_disk2_panel1_plaq3","Digi row",10,0.,200.);
-     meRowZpDisk2Panel1Plaq4_ = ibooker.book1D("row_zp_disk2_panel1_plaq4","Digi row",10,0.,100.);
-     meRowZpDisk2Panel2Plaq1_ = ibooker.book1D("row_zp_disk2_panel2_plaq1","Digi row",10,0.,200.);
-     meRowZpDisk2Panel2Plaq2_ = ibooker.book1D("row_zp_disk2_panel2_plaq2","Digi row",10,0.,200.);
-     meRowZpDisk2Panel2Plaq3_ = ibooker.book1D("row_zp_disk2_panel2_plaq3","Digi row",10,0.,200.);
-
-     meColZpDisk2Panel1Plaq1_ = ibooker.book1D("col_zp_disk2_panel1_plaq1","Digi column",50,0.,150.);
-     meColZpDisk2Panel1Plaq2_ = ibooker.book1D("col_zp_disk2_panel1_plaq2","Digi column",50,0.,200.);
-     meColZpDisk2Panel1Plaq3_ = ibooker.book1D("col_zp_disk2_panel1_plaq3","Digi column",50,0.,250.);
-     meColZpDisk2Panel1Plaq4_ = ibooker.book1D("col_zp_disk2_panel1_plaq4","Digi column",50,0.,300.);
-     meColZpDisk2Panel2Plaq1_ = ibooker.book1D("col_zp_disk2_panel2_plaq1","Digi column",50,0.,200.);
-     meColZpDisk2Panel2Plaq2_ = ibooker.book1D("col_zp_disk2_panel2_plaq2","Digi column",50,0.,250.);
-     meColZpDisk2Panel2Plaq3_ = ibooker.book1D("col_zp_disk2_panel2_plaq3","Digi column",50,0.,300.);
-     meNdigiZpDisk2PerPanel1_ = ibooker.book1D("digi_zp_disk2_panel1","Digi Num. Panel1 Of 2nd Disk In ZPlus Side ",30,0.,30.);
-     meNdigiZpDisk2PerPanel2_ = ibooker.book1D("digi_zp_disk2_panel2","Digi Num. Panel2 Of 2nd Disk In ZPlus Side ",30,0.,30.);
-   }
+// using namespace std;
+// using namespace edm;
+
+SiPixelDigiValid::SiPixelDigiValid(const edm::ParameterSet &ps)
+    : outputFile_(ps.getUntrackedParameter<std::string>("outputFile", "pixeldigihisto.root")),
+      runStandalone(ps.getParameter<bool>("runStandalone")),
+      dbe_(nullptr),
+      edmDetSetVector_PixelDigi_Token_(consumes<edm::DetSetVector<PixelDigi>>(ps.getParameter<edm::InputTag>("src"))) {}
+
+SiPixelDigiValid::~SiPixelDigiValid() {}
+
+void SiPixelDigiValid::bookHistograms(DQMStore::IBooker &ibooker, const edm::Run &run, const edm::EventSetup &es) {
+  dbe_ = edm::Service<DQMStore>().operator->();
+  es.get<TrackerRecoGeometryRecord>().get(tracker);
+
+  if (dbe_) {
+    ibooker.setCurrentFolder("TrackerDigisV/TrackerDigis/Pixel");
+
+    meDigiMultiLayer1Ring1_ = ibooker.book1D("digimulti_layer1ring1", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer1Ring2_ = ibooker.book1D("digimulti_layer1ring2", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer1Ring3_ = ibooker.book1D("digimulti_layer1ring3", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer1Ring4_ = ibooker.book1D("digimulti_layer1ring4", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer1Ring5_ = ibooker.book1D("digimulti_layer1ring5", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer1Ring6_ = ibooker.book1D("digimulti_layer1ring6", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer1Ring7_ = ibooker.book1D("digimulti_layer1ring7", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer1Ring8_ = ibooker.book1D("digimulti_layer1ring8", "Digi Multiplicity ", 30, 0., 30.);
+
+    meDigiMultiLayer2Ring1_ = ibooker.book1D("digimulti_layer2ring1", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer2Ring2_ = ibooker.book1D("digimulti_layer2ring2", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer2Ring3_ = ibooker.book1D("digimulti_layer2ring3", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer2Ring4_ = ibooker.book1D("digimulti_layer2ring4", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer2Ring5_ = ibooker.book1D("digimulti_layer2ring5", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer2Ring6_ = ibooker.book1D("digimulti_layer2ring6", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer2Ring7_ = ibooker.book1D("digimulti_layer2ring7", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer2Ring8_ = ibooker.book1D("digimulti_layer2ring8", "Digi Multiplicity ", 30, 0., 30.);
+
+    meDigiMultiLayer3Ring1_ = ibooker.book1D("digimulti_layer3ring1", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer3Ring2_ = ibooker.book1D("digimulti_layer3ring2", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer3Ring3_ = ibooker.book1D("digimulti_layer3ring3", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer3Ring4_ = ibooker.book1D("digimulti_layer3ring4", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer3Ring5_ = ibooker.book1D("digimulti_layer3ring5", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer3Ring6_ = ibooker.book1D("digimulti_layer3ring6", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer3Ring7_ = ibooker.book1D("digimulti_layer3ring7", "Digi Multiplicity ", 30, 0., 30.);
+    meDigiMultiLayer3Ring8_ = ibooker.book1D("digimulti_layer3ring8", "Digi Multiplicity ", 30, 0., 30.);
+
+    /////Barrel
+    meAdcLayer1Ring1_ = ibooker.book1D("adc_layer1ring1", "Digi charge", 50, 0., 300.);
+    meAdcLayer1Ring2_ = ibooker.book1D("adc_layer1ring2", "Digi charge", 50, 0., 300.);
+    meAdcLayer1Ring3_ = ibooker.book1D("adc_layer1ring3", "Digi charge", 50, 0., 300.);
+    meAdcLayer1Ring4_ = ibooker.book1D("adc_layer1ring4", "Digi charge", 50, 0., 300.);
+    meAdcLayer1Ring5_ = ibooker.book1D("adc_layer1ring5", "Digi charge", 50, 0., 300.);
+    meAdcLayer1Ring6_ = ibooker.book1D("adc_layer1ring6", "Digi charge", 50, 0., 300.);
+    meAdcLayer1Ring7_ = ibooker.book1D("adc_layer1ring7", "Digi charge", 50, 0., 300.);
+    meAdcLayer1Ring8_ = ibooker.book1D("adc_layer1ring8", "Digi charge", 50, 0., 300.);
+
+    meRowLayer1Ring1_ = ibooker.book1D("row_layer1ring1", "Digi row", 50, 0., 200.);
+    meRowLayer1Ring2_ = ibooker.book1D("row_layer1ring2", "Digi row", 50, 0., 200.);
+    meRowLayer1Ring3_ = ibooker.book1D("row_layer1ring3", "Digi row", 50, 0., 200.);
+    meRowLayer1Ring4_ = ibooker.book1D("row_layer1ring4", "Digi row", 50, 0., 200.);
+    meRowLayer1Ring5_ = ibooker.book1D("row_layer1ring5", "Digi row", 50, 0., 200.);
+    meRowLayer1Ring6_ = ibooker.book1D("row_layer1ring6", "Digi row", 50, 0., 200.);
+    meRowLayer1Ring7_ = ibooker.book1D("row_layer1ring7", "Digi row", 50, 0., 200.);
+    meRowLayer1Ring8_ = ibooker.book1D("row_layer1ring8", "Digi row", 50, 0., 200.);
+
+    meColLayer1Ring1_ = ibooker.book1D("col_layer1ring1", "Digi column", 50, 0., 500.);
+    meColLayer1Ring2_ = ibooker.book1D("col_layer1ring2", "Digi column", 50, 0., 500.);
+    meColLayer1Ring3_ = ibooker.book1D("col_layer1ring3", "Digi column", 50, 0., 500.);
+    meColLayer1Ring4_ = ibooker.book1D("col_layer1ring4", "Digi column", 50, 0., 500.);
+    meColLayer1Ring5_ = ibooker.book1D("col_layer1ring5", "Digi column", 50, 0., 500.);
+    meColLayer1Ring6_ = ibooker.book1D("col_layer1ring6", "Digi column", 50, 0., 500.);
+    meColLayer1Ring7_ = ibooker.book1D("col_layer1ring7", "Digi column", 50, 0., 500.);
+    meColLayer1Ring8_ = ibooker.book1D("col_layer1ring8", "Digi column", 50, 0., 500.);
+
+    meAdcLayer2Ring1_ = ibooker.book1D("adc_layer2ring1", "Digi charge", 50, 0., 300.);
+    meAdcLayer2Ring2_ = ibooker.book1D("adc_layer2ring2", "Digi charge", 50, 0., 300.);
+    meAdcLayer2Ring3_ = ibooker.book1D("adc_layer2ring3", "Digi charge", 50, 0., 300.);
+    meAdcLayer2Ring4_ = ibooker.book1D("adc_layer2ring4", "Digi charge", 50, 0., 300.);
+    meAdcLayer2Ring5_ = ibooker.book1D("adc_layer2ring5", "Digi charge", 50, 0., 300.);
+    meAdcLayer2Ring6_ = ibooker.book1D("adc_layer2ring6", "Digi charge", 50, 0., 300.);
+    meAdcLayer2Ring7_ = ibooker.book1D("adc_layer2ring7", "Digi charge", 50, 0., 300.);
+    meAdcLayer2Ring8_ = ibooker.book1D("adc_layer2ring8", "Digi charge", 50, 0., 300.);
+
+    meRowLayer2Ring1_ = ibooker.book1D("row_layer2ring1", "Digi row", 50, 0., 200.);
+    meRowLayer2Ring2_ = ibooker.book1D("row_layer2ring2", "Digi row", 50, 0., 200.);
+    meRowLayer2Ring3_ = ibooker.book1D("row_layer2ring3", "Digi row", 50, 0., 200.);
+    meRowLayer2Ring4_ = ibooker.book1D("row_layer2ring4", "Digi row", 50, 0., 200.);
+    meRowLayer2Ring5_ = ibooker.book1D("row_layer2ring5", "Digi row", 50, 0., 200.);
+    meRowLayer2Ring6_ = ibooker.book1D("row_layer2ring6", "Digi row", 50, 0., 200.);
+    meRowLayer2Ring7_ = ibooker.book1D("row_layer2ring7", "Digi row", 50, 0., 200.);
+    meRowLayer2Ring8_ = ibooker.book1D("row_layer2ring8", "Digi row", 50, 0., 200.);
+
+    meColLayer2Ring1_ = ibooker.book1D("col_layer2ring1", "Digi column", 50, 0., 500.);
+    meColLayer2Ring2_ = ibooker.book1D("col_layer2ring2", "Digi column", 50, 0., 500.);
+    meColLayer2Ring3_ = ibooker.book1D("col_layer2ring3", "Digi column", 50, 0., 500.);
+    meColLayer2Ring4_ = ibooker.book1D("col_layer2ring4", "Digi column", 50, 0., 500.);
+    meColLayer2Ring5_ = ibooker.book1D("col_layer2ring5", "Digi column", 50, 0., 500.);
+    meColLayer2Ring6_ = ibooker.book1D("col_layer2ring6", "Digi column", 50, 0., 500.);
+    meColLayer2Ring7_ = ibooker.book1D("col_layer2ring7", "Digi column", 50, 0., 500.);
+    meColLayer2Ring8_ = ibooker.book1D("col_layer2ring8", "Digi column", 50, 0., 500.);
+
+    meAdcLayer3Ring1_ = ibooker.book1D("adc_layer3ring1", "Digi charge", 50, 0., 300.);
+    meAdcLayer3Ring2_ = ibooker.book1D("adc_layer3ring2", "Digi charge", 50, 0., 300.);
+    meAdcLayer3Ring3_ = ibooker.book1D("adc_layer3ring3", "Digi charge", 50, 0., 300.);
+    meAdcLayer3Ring4_ = ibooker.book1D("adc_layer3ring4", "Digi charge", 50, 0., 300.);
+    meAdcLayer3Ring5_ = ibooker.book1D("adc_layer3ring5", "Digi charge", 50, 0., 300.);
+    meAdcLayer3Ring6_ = ibooker.book1D("adc_layer3ring6", "Digi charge", 50, 0., 300.);
+    meAdcLayer3Ring7_ = ibooker.book1D("adc_layer3ring7", "Digi charge", 50, 0., 300.);
+    meAdcLayer3Ring8_ = ibooker.book1D("adc_layer3ring8", "Digi charge", 50, 0., 300.);
+
+    meRowLayer3Ring1_ = ibooker.book1D("row_layer3ring1", "Digi row", 50, 0., 200.);
+    meRowLayer3Ring2_ = ibooker.book1D("row_layer3ring2", "Digi row", 50, 0., 200.);
+    meRowLayer3Ring3_ = ibooker.book1D("row_layer3ring3", "Digi row", 50, 0., 200.);
+    meRowLayer3Ring4_ = ibooker.book1D("row_layer3ring4", "Digi row", 50, 0., 200.);
+    meRowLayer3Ring5_ = ibooker.book1D("row_layer3ring5", "Digi row", 50, 0., 200.);
+    meRowLayer3Ring6_ = ibooker.book1D("row_layer3ring6", "Digi row", 50, 0., 200.);
+    meRowLayer3Ring7_ = ibooker.book1D("row_layer3ring7", "Digi row", 50, 0., 200.);
+    meRowLayer3Ring8_ = ibooker.book1D("row_layer3ring8", "Digi row", 50, 0., 200.);
+
+    meColLayer3Ring1_ = ibooker.book1D("col_layer3ring1", "Digi column", 50, 0., 500.);
+    meColLayer3Ring2_ = ibooker.book1D("col_layer3ring2", "Digi column", 50, 0., 500.);
+    meColLayer3Ring3_ = ibooker.book1D("col_layer3ring3", "Digi column", 50, 0., 500.);
+    meColLayer3Ring4_ = ibooker.book1D("col_layer3ring4", "Digi column", 50, 0., 500.);
+    meColLayer3Ring5_ = ibooker.book1D("col_layer3ring5", "Digi column", 50, 0., 500.);
+    meColLayer3Ring6_ = ibooker.book1D("col_layer3ring6", "Digi column", 50, 0., 500.);
+    meColLayer3Ring7_ = ibooker.book1D("col_layer3ring7", "Digi column", 50, 0., 500.);
+    meColLayer3Ring8_ = ibooker.book1D("col_layer3ring8", "Digi column", 50, 0., 500.);
+
+    meDigiMultiLayer1Ladders_ =
+        ibooker.bookProfile("digi_layer1_ladders", "Digi Num. per ladder", 22, 0.0, 21.0, 100, 0.0, 100);
+    meDigiMultiLayer2Ladders_ =
+        ibooker.bookProfile("digi_layer2_ladders", "Digi Num. per ladder", 34, 0.0, 32.0, 100, 0.0, 100);
+    meDigiMultiLayer3Ladders_ =
+        ibooker.bookProfile("digi_layer3_ladders", "Digi Num. per ladder", 46, 0.0, 45.0, 100, 0.0, 100);
+
+    // Forward Pixel
+    /* ZMinus Side 1st Disk */
+    meAdcZmDisk1Panel1Plaq1_ = ibooker.book1D("adc_zm_disk1_panel1_plaq1", "Digi charge", 50, 0., 300.);
+    meAdcZmDisk1Panel1Plaq2_ = ibooker.book1D("adc_zm_disk1_panel1_plaq2", "Digi charge", 50, 0., 300.);
+    meAdcZmDisk1Panel1Plaq3_ = ibooker.book1D("adc_zm_disk1_panel1_plaq3", "Digi charge", 50, 0., 300.);
+    meAdcZmDisk1Panel1Plaq4_ = ibooker.book1D("adc_zm_disk1_panel1_plaq4", "Digi charge", 50, 0., 300.);
+    meAdcZmDisk1Panel2Plaq1_ = ibooker.book1D("adc_zm_disk1_panel2_plaq1", "Digi charge", 50, 0., 300.);
+    meAdcZmDisk1Panel2Plaq2_ = ibooker.book1D("adc_zm_disk1_panel2_plaq2", "Digi charge", 50, 0., 300.);
+    meAdcZmDisk1Panel2Plaq3_ = ibooker.book1D("adc_zm_disk1_panel2_plaq3", "Digi charge", 50, 0., 300.);
+
+    meRowZmDisk1Panel1Plaq1_ = ibooker.book1D("row_zm_disk1_panel1_plaq1", "Digi row", 50, 0., 100.);
+    meRowZmDisk1Panel1Plaq2_ = ibooker.book1D("row_zm_disk1_panel1_plaq2", "Digi row", 50, 0., 200.);
+    meRowZmDisk1Panel1Plaq3_ = ibooker.book1D("row_zm_disk1_panel1_plaq3", "Digi row", 50, 0., 200.);
+    meRowZmDisk1Panel1Plaq4_ = ibooker.book1D("row_zm_disk1_panel1_plaq4", "Digi row", 50, 0., 100.);
+    meRowZmDisk1Panel2Plaq1_ = ibooker.book1D("row_zm_disk1_panel2_plaq1", "Digi row", 50, 0., 200.);
+    meRowZmDisk1Panel2Plaq2_ = ibooker.book1D("row_zm_disk1_panel2_plaq2", "Digi row", 50, 0., 200.);
+    meRowZmDisk1Panel2Plaq3_ = ibooker.book1D("row_zm_disk1_panel2_plaq3", "Digi row", 50, 0., 200.);
+
+    meColZmDisk1Panel1Plaq1_ = ibooker.book1D("col_zm_disk1_panel1_plaq1", "Digi column", 50, 0., 150.);
+    meColZmDisk1Panel1Plaq2_ = ibooker.book1D("col_zm_disk1_panel1_plaq2", "Digi column", 50, 0., 200.);
+    meColZmDisk1Panel1Plaq3_ = ibooker.book1D("col_zm_disk1_panel1_plaq3", "Digi column", 50, 0., 250.);
+    meColZmDisk1Panel1Plaq4_ = ibooker.book1D("col_zm_disk1_panel1_plaq4", "Digi column", 50, 0., 300.);
+    meColZmDisk1Panel2Plaq1_ = ibooker.book1D("col_zm_disk1_panel2_plaq1", "Digi column", 50, 0., 200.);
+    meColZmDisk1Panel2Plaq2_ = ibooker.book1D("col_zm_disk1_panel2_plaq2", "Digi column", 50, 0., 250.);
+    meColZmDisk1Panel2Plaq3_ = ibooker.book1D("col_zm_disk1_panel2_plaq3", "Digi column", 50, 0., 300.);
+    meNdigiZmDisk1PerPanel1_ =
+        ibooker.book1D("digi_zm_disk1_panel1", "Digi Num. Panel1 Of 1st Disk In ZMinus Side ", 30, 0., 30.);
+    meNdigiZmDisk1PerPanel2_ =
+        ibooker.book1D("digi_zm_disk1_panel2", "Digi Num. Panel2 Of 1st Disk In ZMinus Side ", 30, 0., 30.);
+
+    /* ZMius Side 2nd disk */
+    meAdcZmDisk2Panel1Plaq1_ = ibooker.book1D("adc_zm_disk2_panel1_plaq1", "Digi charge", 50, 0., 300.);
+    meAdcZmDisk2Panel1Plaq2_ = ibooker.book1D("adc_zm_disk2_panel1_plaq2", "Digi charge", 50, 0., 300.);
+    meAdcZmDisk2Panel1Plaq3_ = ibooker.book1D("adc_zm_disk2_panel1_plaq3", "Digi charge", 50, 0., 300.);
+    meAdcZmDisk2Panel1Plaq4_ = ibooker.book1D("adc_zm_disk2_panel1_plaq4", "Digi charge", 50, 0., 300.);
+    meAdcZmDisk2Panel2Plaq1_ = ibooker.book1D("adc_zm_disk2_panel2_plaq1", "Digi charge", 50, 0., 300.);
+    meAdcZmDisk2Panel2Plaq2_ = ibooker.book1D("adc_zm_disk2_panel2_plaq2", "Digi charge", 50, 0., 300.);
+    meAdcZmDisk2Panel2Plaq3_ = ibooker.book1D("adc_zm_disk2_panel2_plaq3", "Digi charge", 50, 0., 300.);
+
+    meRowZmDisk2Panel1Plaq1_ = ibooker.book1D("row_zm_disk2_panel1_plaq1", "Digi row", 50, 0., 100.);
+    meRowZmDisk2Panel1Plaq2_ = ibooker.book1D("row_zm_disk2_panel1_plaq2", "Digi row", 50, 0., 200.);
+    meRowZmDisk2Panel1Plaq3_ = ibooker.book1D("row_zm_disk2_panel1_plaq3", "Digi row", 50, 0., 200.);
+    meRowZmDisk2Panel1Plaq4_ = ibooker.book1D("row_zm_disk2_panel1_plaq4", "Digi row", 50, 0., 100.);
+    meRowZmDisk2Panel2Plaq1_ = ibooker.book1D("row_zm_disk2_panel2_plaq1", "Digi row", 50, 0., 200.);
+    meRowZmDisk2Panel2Plaq2_ = ibooker.book1D("row_zm_disk2_panel2_plaq2", "Digi row", 50, 0., 200.);
+    meRowZmDisk2Panel2Plaq3_ = ibooker.book1D("row_zm_disk2_panel2_plaq3", "Digi row", 50, 0., 200.);
+
+    meColZmDisk2Panel1Plaq1_ = ibooker.book1D("col_zm_disk2_panel1_plaq1", "Digi Column", 50, 0., 150.);
+    meColZmDisk2Panel1Plaq2_ = ibooker.book1D("col_zm_disk2_panel1_plaq2", "Digi Column", 50, 0., 200.);
+    meColZmDisk2Panel1Plaq3_ = ibooker.book1D("col_zm_disk2_panel1_plaq3", "Digi Column", 50, 0., 250.);
+    meColZmDisk2Panel1Plaq4_ = ibooker.book1D("col_zm_disk2_panel1_plaq4", "Digi Column", 50, 0., 300.);
+    meColZmDisk2Panel2Plaq1_ = ibooker.book1D("col_zm_disk2_panel2_plaq1", "Digi Column", 50, 0., 200.);
+    meColZmDisk2Panel2Plaq2_ = ibooker.book1D("col_zm_disk2_panel2_plaq2", "Digi Column", 50, 0., 250.);
+    meColZmDisk2Panel2Plaq3_ = ibooker.book1D("col_zm_disk2_panel2_plaq3", "Digi Column", 50, 0., 300.);
+    meNdigiZmDisk2PerPanel1_ =
+        ibooker.book1D("digi_zm_disk2_panel1", "Digi Num. Panel1 Of 2nd Disk In ZMinus Side ", 30, 0., 30.);
+    meNdigiZmDisk2PerPanel2_ =
+        ibooker.book1D("digi_zm_disk2_panel2", "Digi Num. Panel2 Of 2nd Disk In ZMinus Side ", 30, 0., 30.);
+
+    /* ZPlus Side 1st Disk */
+    meAdcZpDisk1Panel1Plaq1_ = ibooker.book1D("adc_zp_disk1_panel1_plaq1", "Digi charge", 50, 0., 300.);
+    meAdcZpDisk1Panel1Plaq2_ = ibooker.book1D("adc_zp_disk1_panel1_plaq2", "Digi charge", 50, 0., 300.);
+    meAdcZpDisk1Panel1Plaq3_ = ibooker.book1D("adc_zp_disk1_panel1_plaq3", "Digi charge", 50, 0., 300.);
+    meAdcZpDisk1Panel1Plaq4_ = ibooker.book1D("adc_zp_disk1_panel1_plaq4", "Digi charge", 50, 0., 300.);
+    meAdcZpDisk1Panel2Plaq1_ = ibooker.book1D("adc_zp_disk1_panel2_plaq1", "Digi charge", 50, 0., 300.);
+    meAdcZpDisk1Panel2Plaq2_ = ibooker.book1D("adc_zp_disk1_panel2_plaq2", "Digi charge", 50, 0., 300.);
+    meAdcZpDisk1Panel2Plaq3_ = ibooker.book1D("adc_zp_disk1_panel2_plaq3", "Digi charge", 50, 0., 300.);
+
+    meRowZpDisk1Panel1Plaq1_ = ibooker.book1D("row_zp_disk1_panel1_plaq1", "Digi row", 50, 0., 100.);
+    meRowZpDisk1Panel1Plaq2_ = ibooker.book1D("row_zp_disk1_panel1_plaq2", "Digi row", 50, 0., 200.);
+    meRowZpDisk1Panel1Plaq3_ = ibooker.book1D("row_zp_disk1_panel1_plaq3", "Digi row", 50, 0., 200.);
+    meRowZpDisk1Panel1Plaq4_ = ibooker.book1D("row_zp_disk1_panel1_plaq4", "Digi row", 50, 0., 100.);
+    meRowZpDisk1Panel2Plaq1_ = ibooker.book1D("row_zp_disk1_panel2_plaq1", "Digi row", 50, 0., 200.);
+    meRowZpDisk1Panel2Plaq2_ = ibooker.book1D("row_zp_disk1_panel2_plaq2", "Digi row", 50, 0., 200.);
+    meRowZpDisk1Panel2Plaq3_ = ibooker.book1D("row_zp_disk1_panel2_plaq3", "Digi row", 50, 0., 200.);
+
+    meColZpDisk1Panel1Plaq1_ = ibooker.book1D("col_zp_disk1_panel1_plaq1", "Digi Column", 50, 0., 150.);
+    meColZpDisk1Panel1Plaq2_ = ibooker.book1D("col_zp_disk1_panel1_plaq2", "Digi column", 50, 0., 200.);
+    meColZpDisk1Panel1Plaq3_ = ibooker.book1D("col_zp_disk1_panel1_plaq3", "Digi column", 50, 0., 250.);
+    meColZpDisk1Panel1Plaq4_ = ibooker.book1D("col_zp_disk1_panel1_plaq4", "Digi column", 50, 0., 300.);
+    meColZpDisk1Panel2Plaq1_ = ibooker.book1D("col_zp_disk1_panel2_plaq1", "Digi column", 50, 0., 200.);
+    meColZpDisk1Panel2Plaq2_ = ibooker.book1D("col_zp_disk1_panel2_plaq2", "Digi column", 50, 0., 250.);
+    meColZpDisk1Panel2Plaq3_ = ibooker.book1D("col_zp_disk1_panel2_plaq3", "Digi column", 50, 0., 300.);
+    meNdigiZpDisk1PerPanel1_ =
+        ibooker.book1D("digi_zp_disk1_panel1", "Digi Num. Panel1 Of 1st Disk In ZPlus Side ", 30, 0., 30.);
+    meNdigiZpDisk1PerPanel2_ =
+        ibooker.book1D("digi_zp_disk1_panel2", "Digi Num. Panel2 Of 1st Disk In ZPlus Side ", 30, 0., 30.);
+
+    /* ZPlus Side 2nd disk */
+    meAdcZpDisk2Panel1Plaq1_ = ibooker.book1D("adc_zp_disk2_panel1_plaq1", "Digi charge", 50, 0., 300.);
+    meAdcZpDisk2Panel1Plaq2_ = ibooker.book1D("adc_zp_disk2_panel1_plaq2", "Digi charge", 50, 0., 300.);
+    meAdcZpDisk2Panel1Plaq3_ = ibooker.book1D("adc_zp_disk2_panel1_plaq3", "Digi charge", 50, 0., 300.);
+    meAdcZpDisk2Panel1Plaq4_ = ibooker.book1D("adc_zp_disk2_panel1_plaq4", "Digi charge", 50, 0., 300.);
+    meAdcZpDisk2Panel2Plaq1_ = ibooker.book1D("adc_zp_disk2_panel2_plaq1", "Digi charge", 50, 0., 300.);
+    meAdcZpDisk2Panel2Plaq2_ = ibooker.book1D("adc_zp_disk2_panel2_plaq2", "Digi charge", 50, 0., 300.);
+    meAdcZpDisk2Panel2Plaq3_ = ibooker.book1D("adc_zp_disk2_panel2_plaq3", "Digi charge", 50, 0., 300.);
+
+    meRowZpDisk2Panel1Plaq1_ = ibooker.book1D("row_zp_disk2_panel1_plaq1", "Digi row", 10, 0., 100.);
+    meRowZpDisk2Panel1Plaq2_ = ibooker.book1D("row_zp_disk2_panel1_plaq2", "Digi row", 10, 0., 200.);
+    meRowZpDisk2Panel1Plaq3_ = ibooker.book1D("row_zp_disk2_panel1_plaq3", "Digi row", 10, 0., 200.);
+    meRowZpDisk2Panel1Plaq4_ = ibooker.book1D("row_zp_disk2_panel1_plaq4", "Digi row", 10, 0., 100.);
+    meRowZpDisk2Panel2Plaq1_ = ibooker.book1D("row_zp_disk2_panel2_plaq1", "Digi row", 10, 0., 200.);
+    meRowZpDisk2Panel2Plaq2_ = ibooker.book1D("row_zp_disk2_panel2_plaq2", "Digi row", 10, 0., 200.);
+    meRowZpDisk2Panel2Plaq3_ = ibooker.book1D("row_zp_disk2_panel2_plaq3", "Digi row", 10, 0., 200.);
+
+    meColZpDisk2Panel1Plaq1_ = ibooker.book1D("col_zp_disk2_panel1_plaq1", "Digi column", 50, 0., 150.);
+    meColZpDisk2Panel1Plaq2_ = ibooker.book1D("col_zp_disk2_panel1_plaq2", "Digi column", 50, 0., 200.);
+    meColZpDisk2Panel1Plaq3_ = ibooker.book1D("col_zp_disk2_panel1_plaq3", "Digi column", 50, 0., 250.);
+    meColZpDisk2Panel1Plaq4_ = ibooker.book1D("col_zp_disk2_panel1_plaq4", "Digi column", 50, 0., 300.);
+    meColZpDisk2Panel2Plaq1_ = ibooker.book1D("col_zp_disk2_panel2_plaq1", "Digi column", 50, 0., 200.);
+    meColZpDisk2Panel2Plaq2_ = ibooker.book1D("col_zp_disk2_panel2_plaq2", "Digi column", 50, 0., 250.);
+    meColZpDisk2Panel2Plaq3_ = ibooker.book1D("col_zp_disk2_panel2_plaq3", "Digi column", 50, 0., 300.);
+    meNdigiZpDisk2PerPanel1_ =
+        ibooker.book1D("digi_zp_disk2_panel1", "Digi Num. Panel1 Of 2nd Disk In ZPlus Side ", 30, 0., 30.);
+    meNdigiZpDisk2PerPanel2_ =
+        ibooker.book1D("digi_zp_disk2_panel2", "Digi Num. Panel2 Of 2nd Disk In ZPlus Side ", 30, 0., 30.);
+  }
 }
 
 void SiPixelDigiValid::endJob() {
-  //Save histos in a file only in standalone mode
-  if ( runStandalone && !outputFile_.empty() && dbe_ ){dbe_->save(outputFile_);}
+  // Save histos in a file only in standalone mode
+  if (runStandalone && !outputFile_.empty() && dbe_) {
+    dbe_->save(outputFile_);
+  }
 }
 
-void SiPixelDigiValid::analyze(const edm::Event& e, const edm::EventSetup& c){
-  //Retrieve tracker topology from geometry
+void SiPixelDigiValid::analyze(const edm::Event &e, const edm::EventSetup &c) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   c.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
+  const TrackerTopology *const tTopo = tTopoHandle.product();
   // Number of blades and ladders.
   // TODO: other Geometry-Dependent quantities, e.g. num layers.
   int nblades = tracker->posPixelForwardLayers()[0]->components().size();
@@ -289,462 +292,456 @@ void SiPixelDigiValid::analyze(const edm::Event& e, const edm::EventSetup& c){
   int nladders2 = tracker->pixelBarrelLayers()[1]->components().size();
   int nladders3 = tracker->pixelBarrelLayers()[2]->components().size();
 
-
- int ndigiperRingLayer1[8];
- int ndigiperRingLayer2[8];
- int ndigiperRingLayer3[8];
- for(int i = 0; i< 8; i++ ) {
+  int ndigiperRingLayer1[8];
+  int ndigiperRingLayer2[8];
+  int ndigiperRingLayer3[8];
+  for (int i = 0; i < 8; i++) {
     ndigiperRingLayer1[i] = 0;
     ndigiperRingLayer2[i] = 0;
     ndigiperRingLayer3[i] = 0;
- }
-
-int ndigiZpDisk1PerPanel1[nblades];
-int ndigiZpDisk1PerPanel2[nblades];
-int ndigiZpDisk2PerPanel1[nblades];
-int ndigiZpDisk2PerPanel2[nblades];
-int ndigiZmDisk1PerPanel1[nblades];
-int ndigiZmDisk1PerPanel2[nblades];
-int ndigiZmDisk2PerPanel1[nblades];
-int ndigiZmDisk2PerPanel2[nblades];
-
-for ( int i =0 ; i< nblades; i++) {
-   ndigiZpDisk1PerPanel1[i] = 0;
-   ndigiZpDisk1PerPanel2[i] = 0;
-   ndigiZpDisk2PerPanel1[i] = 0;
-   ndigiZpDisk2PerPanel2[i] = 0;
-   ndigiZmDisk1PerPanel1[i] = 0;
-   ndigiZmDisk1PerPanel2[i] = 0;
-   ndigiZmDisk2PerPanel1[i] = 0;
-   ndigiZmDisk2PerPanel2[i] = 0;
-}
+  }
+
+  int ndigiZpDisk1PerPanel1[nblades];
+  int ndigiZpDisk1PerPanel2[nblades];
+  int ndigiZpDisk2PerPanel1[nblades];
+  int ndigiZpDisk2PerPanel2[nblades];
+  int ndigiZmDisk1PerPanel1[nblades];
+  int ndigiZmDisk1PerPanel2[nblades];
+  int ndigiZmDisk2PerPanel1[nblades];
+  int ndigiZmDisk2PerPanel2[nblades];
+
+  for (int i = 0; i < nblades; i++) {
+    ndigiZpDisk1PerPanel1[i] = 0;
+    ndigiZpDisk1PerPanel2[i] = 0;
+    ndigiZpDisk2PerPanel1[i] = 0;
+    ndigiZpDisk2PerPanel2[i] = 0;
+    ndigiZmDisk1PerPanel1[i] = 0;
+    ndigiZmDisk1PerPanel2[i] = 0;
+    ndigiZmDisk2PerPanel1[i] = 0;
+    ndigiZmDisk2PerPanel2[i] = 0;
+  }
+
+  int ndigilayer1ladders[nladders1];
+  int ndigilayer2ladders[nladders2];
+  int ndigilayer3ladders[nladders3];
+
+  for (int i = 0; i < nladders1; i++) {
+    ndigilayer1ladders[i] = 0;
+  }
+
+  for (int i = 0; i < nladders2; i++) {
+    ndigilayer2ladders[i] = 0;
+  }
+
+  for (int i = 0; i < nladders3; i++) {
+    ndigilayer3ladders[i] = 0;
+  }
+
+  // LogInfo("EventInfo") << " Run = " << e.id().run() << " Event = " <<
+  // e.id().event();
+
+  edm::ESHandle<TrackerGeometry> tracker;
+  c.get<TrackerDigiGeometryRecord>().get(tracker);
+
+  // string digiProducer = "siPixelDigis";
+  edm::Handle<edm::DetSetVector<PixelDigi>> pixelDigis;
+  e.getByToken(edmDetSetVector_PixelDigi_Token_, pixelDigis);
+
+  edm::DetSetVector<PixelDigi>::const_iterator DSViter = pixelDigis->begin();
+  for (; DSViter != pixelDigis->end(); DSViter++) {
+    unsigned int id = DSViter->id;
+    DetId detId(id);
+    edm::DetSet<PixelDigi>::const_iterator begin = DSViter->data.begin();
+    edm::DetSet<PixelDigi>::const_iterator end = DSViter->data.end();
+    edm::DetSet<PixelDigi>::const_iterator iter;
+
+    if (detId.subdetId() == PixelSubdetector::PixelBarrel) {
+      unsigned int layer = tTopo->pxbLayer(id);    // Layer:1,2,3.
+      unsigned int ladder = tTopo->pxbLadder(id);  // Ladeer: 1-20, 32, 44.
+      unsigned int zindex = tTopo->pxbModule(id);  // Z-index: 1-8.
+      // LogInfo("SiPixelDigiValid")<<"Barrel:: Layer="<<layer<<"
+      // Ladder="<<ladder<<" zindex="<<zindex;
+      for (iter = begin; iter != end; iter++) {
+        if (layer == 1) {
+          ++ndigilayer1ladders[ladder - 1];
+          ++ndigiperRingLayer1[zindex - 1];
+          if (zindex == 1) {
+            meAdcLayer1Ring1_->Fill((*iter).adc());
+            meRowLayer1Ring1_->Fill((*iter).row());
+            meColLayer1Ring1_->Fill((*iter).column());
+          }
+          if (zindex == 2) {
+            meAdcLayer1Ring2_->Fill((*iter).adc());
+            meRowLayer1Ring2_->Fill((*iter).row());
+            meColLayer1Ring2_->Fill((*iter).column());
+          }
 
-int ndigilayer1ladders[nladders1];
-int ndigilayer2ladders[nladders2];
-int ndigilayer3ladders[nladders3];
+          if (zindex == 3) {
+            meAdcLayer1Ring3_->Fill((*iter).adc());
+            meRowLayer1Ring3_->Fill((*iter).row());
+            meColLayer1Ring3_->Fill((*iter).column());
+          }
 
-for ( int i =0 ; i< nladders1; i++) {
-   ndigilayer1ladders[i]= 0;
-}
+          if (zindex == 4) {
+            meAdcLayer1Ring4_->Fill((*iter).adc());
+            meRowLayer1Ring4_->Fill((*iter).row());
+            meColLayer1Ring4_->Fill((*iter).column());
+          }
 
-for ( int i =0 ; i< nladders2; i++) {
-   ndigilayer2ladders[i] = 0;
-}
+          if (zindex == 5) {
+            meAdcLayer1Ring5_->Fill((*iter).adc());
+            meRowLayer1Ring5_->Fill((*iter).row());
+            meColLayer1Ring5_->Fill((*iter).column());
+          }
 
-for ( int i =0 ; i< nladders3; i++) {
-   ndigilayer3ladders[i] = 0;
-}
+          if (zindex == 6) {
+            meAdcLayer1Ring6_->Fill((*iter).adc());
+            meRowLayer1Ring6_->Fill((*iter).row());
+            meColLayer1Ring6_->Fill((*iter).column());
+          }
 
- //LogInfo("EventInfo") << " Run = " << e.id().run() << " Event = " << e.id().event();
-
- edm::ESHandle<TrackerGeometry> tracker;
- c.get<TrackerDigiGeometryRecord>().get( tracker );     
-
- //string digiProducer = "siPixelDigis";
- edm::Handle<edm::DetSetVector<PixelDigi> > pixelDigis;
- e.getByToken( edmDetSetVector_PixelDigi_Token_, pixelDigis );
-
- edm::DetSetVector<PixelDigi>::const_iterator DSViter = pixelDigis->begin();
- for( ; DSViter != pixelDigis->end(); DSViter++) {
-          unsigned int id = DSViter->id;
-          DetId  detId(id);
-          edm::DetSet<PixelDigi>::const_iterator  begin = DSViter->data.begin();
-          edm::DetSet<PixelDigi>::const_iterator  end   = DSViter->data.end();
-          edm::DetSet<PixelDigi>::const_iterator  iter;          
-
-          if(detId.subdetId()==PixelSubdetector::PixelBarrel ) {
-             
-             unsigned int layer  = tTopo->pxbLayer(id);   // Layer:1,2,3.
-             unsigned int ladder = tTopo->pxbLadder(id);  // Ladeer: 1-20, 32, 44. 
-             unsigned int zindex = tTopo->pxbModule(id);  // Z-index: 1-8.
-             //LogInfo("SiPixelDigiValid")<<"Barrel:: Layer="<<layer<<" Ladder="<<ladder<<" zindex="<<zindex;
-             for ( iter = begin ; iter != end; iter++ ) {
-                if( layer == 1 ) {
-                     ++ndigilayer1ladders[ladder-1];
-                     ++ndigiperRingLayer1[zindex-1];
-                     if (zindex == 1) { 
-                          meAdcLayer1Ring1_->Fill((*iter).adc());
-                          meRowLayer1Ring1_->Fill((*iter).row());
-                          meColLayer1Ring1_->Fill((*iter).column());
-                     }
-                     if (zindex == 2) {
-                          meAdcLayer1Ring2_->Fill((*iter).adc());
-                          meRowLayer1Ring2_->Fill((*iter).row());
-                          meColLayer1Ring2_->Fill((*iter).column());
-                     }
-
-                     if (zindex == 3) {
-                          meAdcLayer1Ring3_->Fill((*iter).adc());
-                          meRowLayer1Ring3_->Fill((*iter).row());
-                          meColLayer1Ring3_->Fill((*iter).column());
-                     }
-
-                     if (zindex == 4)  {
-                         meAdcLayer1Ring4_->Fill((*iter).adc());
-                         meRowLayer1Ring4_->Fill((*iter).row());
-                         meColLayer1Ring4_->Fill((*iter).column());
-                     }
-
-                     if (zindex == 5)  {
-                         meAdcLayer1Ring5_->Fill((*iter).adc());
-                         meRowLayer1Ring5_->Fill((*iter).row());
-                         meColLayer1Ring5_->Fill((*iter).column());
-                     }
-
-                     if (zindex == 6)  {
-                         meAdcLayer1Ring6_->Fill((*iter).adc());
-                         meRowLayer1Ring6_->Fill((*iter).row());
-                         meColLayer1Ring6_->Fill((*iter).column());
-                     }
-
-                     if (zindex == 7)  {
-                         meAdcLayer1Ring7_->Fill((*iter).adc());
-                         meRowLayer1Ring7_->Fill((*iter).row());
-                         meColLayer1Ring7_->Fill((*iter).column());
-                     }
-                     if (zindex == 8)  {
-                         meAdcLayer1Ring8_->Fill((*iter).adc());
-                         meRowLayer1Ring8_->Fill((*iter).row());
-                         meColLayer1Ring8_->Fill((*iter).column());
-                     }
-
-                } 
-                if( layer == 2 ) {
-                    ++ndigilayer2ladders[ladder-1];
-                    ++ndigiperRingLayer2[zindex-1];
-                    if (zindex == 1) {
-                          meAdcLayer2Ring1_->Fill((*iter).adc());
-                          meRowLayer2Ring1_->Fill((*iter).row());
-                          meColLayer2Ring1_->Fill((*iter).column());
-                     }
-                     if (zindex == 2) {
-                          meAdcLayer2Ring2_->Fill((*iter).adc());
-                          meRowLayer2Ring2_->Fill((*iter).row());
-                          meColLayer2Ring2_->Fill((*iter).column());
-                     }
-
-                     if (zindex == 3) {
-                          meAdcLayer2Ring3_->Fill((*iter).adc());
-                          meRowLayer2Ring3_->Fill((*iter).row());
-                          meColLayer2Ring3_->Fill((*iter).column());
-                     }
-
-                     if (zindex == 4)  {
-                         meAdcLayer2Ring4_->Fill((*iter).adc());
-                         meRowLayer2Ring4_->Fill((*iter).row());
-                         meColLayer2Ring4_->Fill((*iter).column());
-                     }
-
-                     if (zindex == 5)  {
-                         meAdcLayer2Ring5_->Fill((*iter).adc());
-                         meRowLayer2Ring5_->Fill((*iter).row());
-                         meColLayer2Ring5_->Fill((*iter).column());
-                     }
-
-                     if (zindex == 6)  {
-                         meAdcLayer2Ring6_->Fill((*iter).adc());
-                         meRowLayer2Ring6_->Fill((*iter).row());
-                         meColLayer2Ring6_->Fill((*iter).column());
-                     }
-
-                     if (zindex == 7)  {
-                         meAdcLayer2Ring7_->Fill((*iter).adc());
-                         meRowLayer2Ring7_->Fill((*iter).row());
-                         meColLayer2Ring7_->Fill((*iter).column());
-                     }
-                     if (zindex == 8)  {
-                         meAdcLayer2Ring8_->Fill((*iter).adc());
-                         meRowLayer2Ring8_->Fill((*iter).row());
-                         meColLayer2Ring8_->Fill((*iter).column());
-                     }
-
-                }
-                if( layer == 3 ) {
-                    ++ndigilayer3ladders[ladder-1];
-                    ++ndigiperRingLayer3[zindex-1];
-                    if (zindex == 1) {
-                          meAdcLayer3Ring1_->Fill((*iter).adc());
-                          meRowLayer3Ring1_->Fill((*iter).row());
-                          meColLayer3Ring1_->Fill((*iter).column());
-                     }
-                     if (zindex == 2) {
-                          meAdcLayer3Ring2_->Fill((*iter).adc());
-                          meRowLayer3Ring2_->Fill((*iter).row());
-                          meColLayer3Ring2_->Fill((*iter).column());
-                     }
-
-                     if (zindex == 3) {
-                          meAdcLayer3Ring3_->Fill((*iter).adc());
-                          meRowLayer3Ring3_->Fill((*iter).row());
-                          meColLayer3Ring3_->Fill((*iter).column());
-                     }
-
-                     if (zindex == 4)  {
-                         meAdcLayer3Ring4_->Fill((*iter).adc());
-                         meRowLayer3Ring4_->Fill((*iter).row());
-                         meColLayer3Ring4_->Fill((*iter).column());
-                     }
-
-                     if (zindex == 5)  {
-                         meAdcLayer3Ring5_->Fill((*iter).adc());
-                         meRowLayer3Ring5_->Fill((*iter).row());
-                         meColLayer3Ring5_->Fill((*iter).column());
-                     }
-
-                     if (zindex == 6)  {
-                         meAdcLayer3Ring6_->Fill((*iter).adc());
-                         meRowLayer3Ring6_->Fill((*iter).row());
-                         meColLayer3Ring6_->Fill((*iter).column());
-                     }
-
-                     if (zindex == 7)  {
-                         meAdcLayer3Ring7_->Fill((*iter).adc());
-                         meRowLayer3Ring7_->Fill((*iter).row());
-                         meColLayer3Ring7_->Fill((*iter).column());
-                     }
-                     if (zindex == 8)  {
-                         meAdcLayer3Ring8_->Fill((*iter).adc());
-                         meRowLayer3Ring8_->Fill((*iter).row());
-                         meColLayer3Ring8_->Fill((*iter).column());
-                     }
-                }
- 
-             }   
-           
-          }
- 
-         if(detId.subdetId()==PixelSubdetector::PixelEndcap ){ //Endcap
-           
-           unsigned int side  = tTopo->pxfSide(id);
-           unsigned int disk  = tTopo->pxfDisk(id);
-           unsigned int blade = tTopo->pxfBlade(id);
-           unsigned int panel = tTopo->pxfPanel(id);
-           unsigned int mod   = tTopo->pxfModule(id);
-           //LogInfo("SiPixelDigiValid")<<"EndcaP="<<side<<" Disk="<<disk<<" Blade="<<blade<<" Panel="<<panel<<" Module="<<mod;
-           for ( iter = begin ; iter != end; iter++ ) {
-             if(side == 1 && disk == 1 && panel ==1 ){
-                     if ( mod == 1 ) {
-                         meAdcZmDisk1Panel1Plaq1_->Fill((*iter).adc());
-                         meRowZmDisk1Panel1Plaq1_->Fill((*iter).row());
-                         meColZmDisk1Panel1Plaq1_->Fill((*iter).column());
-                     }else if( mod == 2 ) {
-                         meAdcZmDisk1Panel1Plaq2_->Fill((*iter).adc());
-                         meRowZmDisk1Panel1Plaq2_->Fill((*iter).row());
-                         meColZmDisk1Panel1Plaq2_->Fill((*iter).column());
-                     }else if( mod == 3 ) {
-                         meAdcZmDisk1Panel1Plaq3_->Fill((*iter).adc());
-                         meRowZmDisk1Panel1Plaq3_->Fill((*iter).row());
-                         meColZmDisk1Panel1Plaq3_->Fill((*iter).column());
-                     }else if( mod == 4 ) {
-                         meAdcZmDisk1Panel1Plaq4_->Fill((*iter).adc());
-                         meRowZmDisk1Panel1Plaq4_->Fill((*iter).row());
-                         meColZmDisk1Panel1Plaq4_->Fill((*iter).column());
-                     }else {
-                         //LogError("SiPixelDigiValid")<<" The number of module is Wrong";
-                     } 
-                     ++ndigiZmDisk1PerPanel1[blade-1];                
-             }
-
-             if(side == 1 && disk == 1 && panel ==2 ){
-                     if ( mod == 1 ) {
-                         meAdcZmDisk1Panel2Plaq1_->Fill((*iter).adc());
-                         meRowZmDisk1Panel2Plaq1_->Fill((*iter).row());
-                         meColZmDisk1Panel2Plaq1_->Fill((*iter).column());
-                     }else if( mod == 2 ) {
-                         meAdcZmDisk1Panel2Plaq2_->Fill((*iter).adc());
-                         meRowZmDisk1Panel2Plaq2_->Fill((*iter).row());
-                         meColZmDisk1Panel2Plaq2_->Fill((*iter).column());
-                     }else if( mod == 3 ) {
-                         meAdcZmDisk1Panel2Plaq3_->Fill((*iter).adc());
-                         meRowZmDisk1Panel2Plaq3_->Fill((*iter).row());
-                         meColZmDisk1Panel2Plaq3_->Fill((*iter).column());
-                     }else {
-                         //LogError("SiPixelDigiValid")<<" The number of module is Wrong";
-                     }
-                     ++ndigiZmDisk1PerPanel2[blade-1];
-             }
-
-            if(side == 1 && disk == 2 && panel ==1 ){
-                     if ( mod == 1 ) {
-                         meAdcZmDisk2Panel1Plaq1_->Fill((*iter).adc());
-                         meRowZmDisk2Panel1Plaq1_->Fill((*iter).row());
-                         meColZmDisk2Panel1Plaq1_->Fill((*iter).column());
-                     }else if( mod == 2 ) {
-                         meAdcZmDisk2Panel1Plaq2_->Fill((*iter).adc());
-                         meRowZmDisk2Panel1Plaq2_->Fill((*iter).row());
-                         meColZmDisk2Panel1Plaq2_->Fill((*iter).column());
-                     }else if( mod == 3 ) {
-                         meAdcZmDisk2Panel1Plaq3_->Fill((*iter).adc());
-                         meRowZmDisk2Panel1Plaq3_->Fill((*iter).row());
-                         meColZmDisk2Panel1Plaq3_->Fill((*iter).column());
-                     }else if( mod == 4 ) {
-                         meAdcZmDisk2Panel1Plaq4_->Fill((*iter).adc());
-                         meRowZmDisk2Panel1Plaq4_->Fill((*iter).row());
-                         meColZmDisk2Panel1Plaq4_->Fill((*iter).column());
-                     }else {
-                        // LogError("SiPixelDigiValid")<<" The number of module is Wrong";
-                     }
-                     ++ndigiZmDisk2PerPanel1[blade-1];
-             }
-
-             if(side == 1 && disk == 2 && panel ==2 ){
-                     if ( mod == 1 ) {
-                         meAdcZmDisk2Panel2Plaq1_->Fill((*iter).adc());
-                         meRowZmDisk2Panel2Plaq1_->Fill((*iter).row());
-                         meColZmDisk2Panel2Plaq1_->Fill((*iter).column());
-                     }else if( mod == 2 ) {
-                         meAdcZmDisk2Panel2Plaq2_->Fill((*iter).adc());
-                         meRowZmDisk2Panel2Plaq2_->Fill((*iter).row());
-                         meColZmDisk2Panel2Plaq2_->Fill((*iter).column());
-                     }else if( mod == 3 ) {
-                         meAdcZmDisk2Panel2Plaq3_->Fill((*iter).adc());
-                         meRowZmDisk2Panel2Plaq3_->Fill((*iter).row());
-                         meColZmDisk2Panel2Plaq3_->Fill((*iter).column());
-                     }else {
-                         //LogError("SiPixelDigiValid")<<" The number of module is Wrong";
-                     }
-                     ++ndigiZmDisk2PerPanel2[blade-1];
-             }
-
-
-            if(side == 2 && disk == 1 && panel ==1 ){
-                     if ( mod == 1 ) {
-                         meAdcZpDisk1Panel1Plaq1_->Fill((*iter).adc());
-                         meRowZpDisk1Panel1Plaq1_->Fill((*iter).row());
-                         meColZpDisk1Panel1Plaq1_->Fill((*iter).column());
-                     }else if( mod == 2 ) {
-                         meAdcZpDisk1Panel1Plaq2_->Fill((*iter).adc());
-                         meRowZpDisk1Panel1Plaq2_->Fill((*iter).row());
-                         meColZpDisk1Panel1Plaq2_->Fill((*iter).column());
-                     }else if( mod == 3 ) {
-                         meAdcZpDisk1Panel1Plaq3_->Fill((*iter).adc());
-                         meRowZpDisk1Panel1Plaq3_->Fill((*iter).row());
-                         meColZpDisk1Panel1Plaq3_->Fill((*iter).column());
-                     }else if( mod == 4 ) {
-                         meAdcZpDisk1Panel1Plaq4_->Fill((*iter).adc());
-                         meRowZpDisk1Panel1Plaq4_->Fill((*iter).row());
-                         meColZpDisk1Panel1Plaq4_->Fill((*iter).column());
-                     }else {
-                         //LogError("SiPixelDigiValid")<<" The number of module is Wrong";
-                     }
-                     ++ndigiZpDisk1PerPanel1[blade-1];
-             }
-
-             if(side == 2 && disk == 1 && panel ==2 ){
-                     if ( mod == 1 ) {
-                         meAdcZpDisk1Panel2Plaq1_->Fill((*iter).adc());
-                         meRowZpDisk1Panel2Plaq1_->Fill((*iter).row());
-                         meColZpDisk1Panel2Plaq1_->Fill((*iter).column());
-                     }else if( mod == 2 ) {
-                         meAdcZpDisk1Panel2Plaq2_->Fill((*iter).adc());
-                         meRowZpDisk1Panel2Plaq2_->Fill((*iter).row());
-                         meColZpDisk1Panel2Plaq2_->Fill((*iter).column());
-                     }else if( mod == 3 ) {
-                         meAdcZpDisk1Panel2Plaq3_->Fill((*iter).adc());
-                         meRowZpDisk1Panel2Plaq3_->Fill((*iter).row());
-                         meColZpDisk1Panel2Plaq3_->Fill((*iter).column());
-                     }else {
-                         //LogError("SiPixelDigiValid")<<" The number of module is Wrong";
-                     }
-                     ++ndigiZpDisk1PerPanel2[blade-1];
-             }
-
-            if(side == 2 && disk == 2 && panel ==1 ){
-                     if ( mod == 1 ) {
-                         meAdcZpDisk2Panel1Plaq1_->Fill((*iter).adc());
-                         meRowZpDisk2Panel1Plaq1_->Fill((*iter).row());
-                         meColZpDisk2Panel1Plaq1_->Fill((*iter).column());
-                     }else if( mod == 2 ) {
-                         meAdcZpDisk2Panel1Plaq2_->Fill((*iter).adc());
-                         meRowZpDisk2Panel1Plaq2_->Fill((*iter).row());
-                         meColZpDisk2Panel1Plaq2_->Fill((*iter).column());
-                     }else if( mod == 3 ) {
-                         meAdcZpDisk2Panel1Plaq3_->Fill((*iter).adc());
-                         meRowZpDisk2Panel1Plaq3_->Fill((*iter).row());
-                         meColZpDisk2Panel1Plaq3_->Fill((*iter).column());
-                     }else if( mod == 4 ) {
-                         meAdcZpDisk2Panel1Plaq4_->Fill((*iter).adc());
-                         meRowZpDisk2Panel1Plaq4_->Fill((*iter).row());
-                         meColZpDisk2Panel1Plaq4_->Fill((*iter).column());
-                     }else {
-                         //LogError("SiPixelDigiValid")<<" The number of module is Wrong";
-                     }
-                     ++ndigiZpDisk2PerPanel1[blade-1];
-
-              }
-
-             if(side == 2 && disk == 2 && panel ==2 ){
-                     if ( mod == 1 ) {
-                         meAdcZpDisk2Panel2Plaq1_->Fill((*iter).adc());
-                         meRowZpDisk2Panel2Plaq1_->Fill((*iter).row());
-                         meColZpDisk2Panel2Plaq1_->Fill((*iter).column());
-                     }else if( mod == 2 ) {
-                         meAdcZpDisk2Panel2Plaq2_->Fill((*iter).adc());
-                         meRowZpDisk2Panel2Plaq2_->Fill((*iter).row());
-                         meColZpDisk2Panel2Plaq2_->Fill((*iter).column());
-                     }else if( mod == 3 ) {
-                         meAdcZpDisk2Panel2Plaq3_->Fill((*iter).adc());
-                         meRowZpDisk2Panel2Plaq3_->Fill((*iter).row());
-                         meColZpDisk2Panel2Plaq3_->Fill((*iter).column());
-                     }else {
-                         //LogError("SiPixelDigiValid")<<" The number of module is Wrong";
-                     }
-                     ++ndigiZpDisk2PerPanel2[blade-1];
-              }
-           } //iterating the digi 
-
-          }//Endcap 
-
-    } // end for loop
-    
-    meDigiMultiLayer1Ring1_->Fill(ndigiperRingLayer1[0]);
-    meDigiMultiLayer1Ring2_->Fill(ndigiperRingLayer1[1]);
-    meDigiMultiLayer1Ring3_->Fill(ndigiperRingLayer1[2]);
-    meDigiMultiLayer1Ring4_->Fill(ndigiperRingLayer1[3]);
-    meDigiMultiLayer1Ring5_->Fill(ndigiperRingLayer1[4]);
-    meDigiMultiLayer1Ring6_->Fill(ndigiperRingLayer1[5]);
-    meDigiMultiLayer1Ring7_->Fill(ndigiperRingLayer1[6]);
-    meDigiMultiLayer1Ring8_->Fill(ndigiperRingLayer1[7]);
-
-    meDigiMultiLayer2Ring1_->Fill(ndigiperRingLayer2[0]);
-    meDigiMultiLayer2Ring2_->Fill(ndigiperRingLayer2[1]);
-    meDigiMultiLayer2Ring3_->Fill(ndigiperRingLayer2[2]);
-    meDigiMultiLayer2Ring4_->Fill(ndigiperRingLayer2[3]);
-    meDigiMultiLayer2Ring5_->Fill(ndigiperRingLayer2[4]);
-    meDigiMultiLayer2Ring6_->Fill(ndigiperRingLayer2[5]);
-    meDigiMultiLayer2Ring7_->Fill(ndigiperRingLayer2[6]);
-    meDigiMultiLayer2Ring8_->Fill(ndigiperRingLayer2[7]);
-
-    meDigiMultiLayer3Ring1_->Fill(ndigiperRingLayer3[0]);
-    meDigiMultiLayer3Ring2_->Fill(ndigiperRingLayer3[1]);
-    meDigiMultiLayer3Ring3_->Fill(ndigiperRingLayer3[2]);
-    meDigiMultiLayer3Ring4_->Fill(ndigiperRingLayer3[3]);
-    meDigiMultiLayer3Ring5_->Fill(ndigiperRingLayer3[4]);
-    meDigiMultiLayer3Ring6_->Fill(ndigiperRingLayer3[5]);
-    meDigiMultiLayer3Ring7_->Fill(ndigiperRingLayer3[6]);
-    meDigiMultiLayer3Ring8_->Fill(ndigiperRingLayer3[7]);
-
-    for(int i =0; i< nblades; i++) {
-         meNdigiZmDisk1PerPanel1_->Fill(ndigiZmDisk1PerPanel1[i]);
-         meNdigiZmDisk1PerPanel2_->Fill(ndigiZmDisk1PerPanel2[i]);
-         meNdigiZmDisk2PerPanel1_->Fill(ndigiZmDisk2PerPanel1[i]);
-         meNdigiZmDisk2PerPanel2_->Fill(ndigiZmDisk2PerPanel2[i]);
-         meNdigiZpDisk1PerPanel1_->Fill(ndigiZpDisk1PerPanel1[i]);
-         meNdigiZpDisk1PerPanel2_->Fill(ndigiZpDisk1PerPanel2[i]);
-         meNdigiZpDisk2PerPanel1_->Fill(ndigiZpDisk2PerPanel1[i]);
-         meNdigiZpDisk2PerPanel2_->Fill(ndigiZpDisk2PerPanel2[i]);
-    } 
-    
-   for (int i =0; i< nladders1; i++) {
-       meDigiMultiLayer1Ladders_->Fill(i+1,ndigilayer1ladders[i]);
-   }
-
-   for (int i =0; i< nladders2; i++) {
-       meDigiMultiLayer2Ladders_->Fill(i+1,ndigilayer2ladders[i]);
-   }
-
-   for (int i =0; i< nladders3; i++) {
-       meDigiMultiLayer3Ladders_->Fill(i+1,ndigilayer3ladders[i]);
-   }
+          if (zindex == 7) {
+            meAdcLayer1Ring7_->Fill((*iter).adc());
+            meRowLayer1Ring7_->Fill((*iter).row());
+            meColLayer1Ring7_->Fill((*iter).column());
+          }
+          if (zindex == 8) {
+            meAdcLayer1Ring8_->Fill((*iter).adc());
+            meRowLayer1Ring8_->Fill((*iter).row());
+            meColLayer1Ring8_->Fill((*iter).column());
+          }
+        }
+        if (layer == 2) {
+          ++ndigilayer2ladders[ladder - 1];
+          ++ndigiperRingLayer2[zindex - 1];
+          if (zindex == 1) {
+            meAdcLayer2Ring1_->Fill((*iter).adc());
+            meRowLayer2Ring1_->Fill((*iter).row());
+            meColLayer2Ring1_->Fill((*iter).column());
+          }
+          if (zindex == 2) {
+            meAdcLayer2Ring2_->Fill((*iter).adc());
+            meRowLayer2Ring2_->Fill((*iter).row());
+            meColLayer2Ring2_->Fill((*iter).column());
+          }
+
+          if (zindex == 3) {
+            meAdcLayer2Ring3_->Fill((*iter).adc());
+            meRowLayer2Ring3_->Fill((*iter).row());
+            meColLayer2Ring3_->Fill((*iter).column());
+          }
+
+          if (zindex == 4) {
+            meAdcLayer2Ring4_->Fill((*iter).adc());
+            meRowLayer2Ring4_->Fill((*iter).row());
+            meColLayer2Ring4_->Fill((*iter).column());
+          }
+
+          if (zindex == 5) {
+            meAdcLayer2Ring5_->Fill((*iter).adc());
+            meRowLayer2Ring5_->Fill((*iter).row());
+            meColLayer2Ring5_->Fill((*iter).column());
+          }
+
+          if (zindex == 6) {
+            meAdcLayer2Ring6_->Fill((*iter).adc());
+            meRowLayer2Ring6_->Fill((*iter).row());
+            meColLayer2Ring6_->Fill((*iter).column());
+          }
 
+          if (zindex == 7) {
+            meAdcLayer2Ring7_->Fill((*iter).adc());
+            meRowLayer2Ring7_->Fill((*iter).row());
+            meColLayer2Ring7_->Fill((*iter).column());
+          }
+          if (zindex == 8) {
+            meAdcLayer2Ring8_->Fill((*iter).adc());
+            meRowLayer2Ring8_->Fill((*iter).row());
+            meColLayer2Ring8_->Fill((*iter).column());
+          }
+        }
+        if (layer == 3) {
+          ++ndigilayer3ladders[ladder - 1];
+          ++ndigiperRingLayer3[zindex - 1];
+          if (zindex == 1) {
+            meAdcLayer3Ring1_->Fill((*iter).adc());
+            meRowLayer3Ring1_->Fill((*iter).row());
+            meColLayer3Ring1_->Fill((*iter).column());
+          }
+          if (zindex == 2) {
+            meAdcLayer3Ring2_->Fill((*iter).adc());
+            meRowLayer3Ring2_->Fill((*iter).row());
+            meColLayer3Ring2_->Fill((*iter).column());
+          }
+
+          if (zindex == 3) {
+            meAdcLayer3Ring3_->Fill((*iter).adc());
+            meRowLayer3Ring3_->Fill((*iter).row());
+            meColLayer3Ring3_->Fill((*iter).column());
+          }
+
+          if (zindex == 4) {
+            meAdcLayer3Ring4_->Fill((*iter).adc());
+            meRowLayer3Ring4_->Fill((*iter).row());
+            meColLayer3Ring4_->Fill((*iter).column());
+          }
+
+          if (zindex == 5) {
+            meAdcLayer3Ring5_->Fill((*iter).adc());
+            meRowLayer3Ring5_->Fill((*iter).row());
+            meColLayer3Ring5_->Fill((*iter).column());
+          }
+
+          if (zindex == 6) {
+            meAdcLayer3Ring6_->Fill((*iter).adc());
+            meRowLayer3Ring6_->Fill((*iter).row());
+            meColLayer3Ring6_->Fill((*iter).column());
+          }
+
+          if (zindex == 7) {
+            meAdcLayer3Ring7_->Fill((*iter).adc());
+            meRowLayer3Ring7_->Fill((*iter).row());
+            meColLayer3Ring7_->Fill((*iter).column());
+          }
+          if (zindex == 8) {
+            meAdcLayer3Ring8_->Fill((*iter).adc());
+            meRowLayer3Ring8_->Fill((*iter).row());
+            meColLayer3Ring8_->Fill((*iter).column());
+          }
+        }
+      }
+    }
+
+    if (detId.subdetId() == PixelSubdetector::PixelEndcap) {  // Endcap
+
+      unsigned int side = tTopo->pxfSide(id);
+      unsigned int disk = tTopo->pxfDisk(id);
+      unsigned int blade = tTopo->pxfBlade(id);
+      unsigned int panel = tTopo->pxfPanel(id);
+      unsigned int mod = tTopo->pxfModule(id);
+      // LogInfo("SiPixelDigiValid")<<"EndcaP="<<side<<" Disk="<<disk<<"
+      // Blade="<<blade<<" Panel="<<panel<<" Module="<<mod;
+      for (iter = begin; iter != end; iter++) {
+        if (side == 1 && disk == 1 && panel == 1) {
+          if (mod == 1) {
+            meAdcZmDisk1Panel1Plaq1_->Fill((*iter).adc());
+            meRowZmDisk1Panel1Plaq1_->Fill((*iter).row());
+            meColZmDisk1Panel1Plaq1_->Fill((*iter).column());
+          } else if (mod == 2) {
+            meAdcZmDisk1Panel1Plaq2_->Fill((*iter).adc());
+            meRowZmDisk1Panel1Plaq2_->Fill((*iter).row());
+            meColZmDisk1Panel1Plaq2_->Fill((*iter).column());
+          } else if (mod == 3) {
+            meAdcZmDisk1Panel1Plaq3_->Fill((*iter).adc());
+            meRowZmDisk1Panel1Plaq3_->Fill((*iter).row());
+            meColZmDisk1Panel1Plaq3_->Fill((*iter).column());
+          } else if (mod == 4) {
+            meAdcZmDisk1Panel1Plaq4_->Fill((*iter).adc());
+            meRowZmDisk1Panel1Plaq4_->Fill((*iter).row());
+            meColZmDisk1Panel1Plaq4_->Fill((*iter).column());
+          } else {
+            // LogError("SiPixelDigiValid")<<" The number of module is Wrong";
+          }
+          ++ndigiZmDisk1PerPanel1[blade - 1];
+        }
+
+        if (side == 1 && disk == 1 && panel == 2) {
+          if (mod == 1) {
+            meAdcZmDisk1Panel2Plaq1_->Fill((*iter).adc());
+            meRowZmDisk1Panel2Plaq1_->Fill((*iter).row());
+            meColZmDisk1Panel2Plaq1_->Fill((*iter).column());
+          } else if (mod == 2) {
+            meAdcZmDisk1Panel2Plaq2_->Fill((*iter).adc());
+            meRowZmDisk1Panel2Plaq2_->Fill((*iter).row());
+            meColZmDisk1Panel2Plaq2_->Fill((*iter).column());
+          } else if (mod == 3) {
+            meAdcZmDisk1Panel2Plaq3_->Fill((*iter).adc());
+            meRowZmDisk1Panel2Plaq3_->Fill((*iter).row());
+            meColZmDisk1Panel2Plaq3_->Fill((*iter).column());
+          } else {
+            // LogError("SiPixelDigiValid")<<" The number of module is Wrong";
+          }
+          ++ndigiZmDisk1PerPanel2[blade - 1];
+        }
+
+        if (side == 1 && disk == 2 && panel == 1) {
+          if (mod == 1) {
+            meAdcZmDisk2Panel1Plaq1_->Fill((*iter).adc());
+            meRowZmDisk2Panel1Plaq1_->Fill((*iter).row());
+            meColZmDisk2Panel1Plaq1_->Fill((*iter).column());
+          } else if (mod == 2) {
+            meAdcZmDisk2Panel1Plaq2_->Fill((*iter).adc());
+            meRowZmDisk2Panel1Plaq2_->Fill((*iter).row());
+            meColZmDisk2Panel1Plaq2_->Fill((*iter).column());
+          } else if (mod == 3) {
+            meAdcZmDisk2Panel1Plaq3_->Fill((*iter).adc());
+            meRowZmDisk2Panel1Plaq3_->Fill((*iter).row());
+            meColZmDisk2Panel1Plaq3_->Fill((*iter).column());
+          } else if (mod == 4) {
+            meAdcZmDisk2Panel1Plaq4_->Fill((*iter).adc());
+            meRowZmDisk2Panel1Plaq4_->Fill((*iter).row());
+            meColZmDisk2Panel1Plaq4_->Fill((*iter).column());
+          } else {
+            // LogError("SiPixelDigiValid")<<" The number of module is Wrong";
+          }
+          ++ndigiZmDisk2PerPanel1[blade - 1];
+        }
+
+        if (side == 1 && disk == 2 && panel == 2) {
+          if (mod == 1) {
+            meAdcZmDisk2Panel2Plaq1_->Fill((*iter).adc());
+            meRowZmDisk2Panel2Plaq1_->Fill((*iter).row());
+            meColZmDisk2Panel2Plaq1_->Fill((*iter).column());
+          } else if (mod == 2) {
+            meAdcZmDisk2Panel2Plaq2_->Fill((*iter).adc());
+            meRowZmDisk2Panel2Plaq2_->Fill((*iter).row());
+            meColZmDisk2Panel2Plaq2_->Fill((*iter).column());
+          } else if (mod == 3) {
+            meAdcZmDisk2Panel2Plaq3_->Fill((*iter).adc());
+            meRowZmDisk2Panel2Plaq3_->Fill((*iter).row());
+            meColZmDisk2Panel2Plaq3_->Fill((*iter).column());
+          } else {
+            // LogError("SiPixelDigiValid")<<" The number of module is Wrong";
+          }
+          ++ndigiZmDisk2PerPanel2[blade - 1];
+        }
+
+        if (side == 2 && disk == 1 && panel == 1) {
+          if (mod == 1) {
+            meAdcZpDisk1Panel1Plaq1_->Fill((*iter).adc());
+            meRowZpDisk1Panel1Plaq1_->Fill((*iter).row());
+            meColZpDisk1Panel1Plaq1_->Fill((*iter).column());
+          } else if (mod == 2) {
+            meAdcZpDisk1Panel1Plaq2_->Fill((*iter).adc());
+            meRowZpDisk1Panel1Plaq2_->Fill((*iter).row());
+            meColZpDisk1Panel1Plaq2_->Fill((*iter).column());
+          } else if (mod == 3) {
+            meAdcZpDisk1Panel1Plaq3_->Fill((*iter).adc());
+            meRowZpDisk1Panel1Plaq3_->Fill((*iter).row());
+            meColZpDisk1Panel1Plaq3_->Fill((*iter).column());
+          } else if (mod == 4) {
+            meAdcZpDisk1Panel1Plaq4_->Fill((*iter).adc());
+            meRowZpDisk1Panel1Plaq4_->Fill((*iter).row());
+            meColZpDisk1Panel1Plaq4_->Fill((*iter).column());
+          } else {
+            // LogError("SiPixelDigiValid")<<" The number of module is Wrong";
+          }
+          ++ndigiZpDisk1PerPanel1[blade - 1];
+        }
+
+        if (side == 2 && disk == 1 && panel == 2) {
+          if (mod == 1) {
+            meAdcZpDisk1Panel2Plaq1_->Fill((*iter).adc());
+            meRowZpDisk1Panel2Plaq1_->Fill((*iter).row());
+            meColZpDisk1Panel2Plaq1_->Fill((*iter).column());
+          } else if (mod == 2) {
+            meAdcZpDisk1Panel2Plaq2_->Fill((*iter).adc());
+            meRowZpDisk1Panel2Plaq2_->Fill((*iter).row());
+            meColZpDisk1Panel2Plaq2_->Fill((*iter).column());
+          } else if (mod == 3) {
+            meAdcZpDisk1Panel2Plaq3_->Fill((*iter).adc());
+            meRowZpDisk1Panel2Plaq3_->Fill((*iter).row());
+            meColZpDisk1Panel2Plaq3_->Fill((*iter).column());
+          } else {
+            // LogError("SiPixelDigiValid")<<" The number of module is Wrong";
+          }
+          ++ndigiZpDisk1PerPanel2[blade - 1];
+        }
+
+        if (side == 2 && disk == 2 && panel == 1) {
+          if (mod == 1) {
+            meAdcZpDisk2Panel1Plaq1_->Fill((*iter).adc());
+            meRowZpDisk2Panel1Plaq1_->Fill((*iter).row());
+            meColZpDisk2Panel1Plaq1_->Fill((*iter).column());
+          } else if (mod == 2) {
+            meAdcZpDisk2Panel1Plaq2_->Fill((*iter).adc());
+            meRowZpDisk2Panel1Plaq2_->Fill((*iter).row());
+            meColZpDisk2Panel1Plaq2_->Fill((*iter).column());
+          } else if (mod == 3) {
+            meAdcZpDisk2Panel1Plaq3_->Fill((*iter).adc());
+            meRowZpDisk2Panel1Plaq3_->Fill((*iter).row());
+            meColZpDisk2Panel1Plaq3_->Fill((*iter).column());
+          } else if (mod == 4) {
+            meAdcZpDisk2Panel1Plaq4_->Fill((*iter).adc());
+            meRowZpDisk2Panel1Plaq4_->Fill((*iter).row());
+            meColZpDisk2Panel1Plaq4_->Fill((*iter).column());
+          } else {
+            // LogError("SiPixelDigiValid")<<" The number of module is Wrong";
+          }
+          ++ndigiZpDisk2PerPanel1[blade - 1];
+        }
+
+        if (side == 2 && disk == 2 && panel == 2) {
+          if (mod == 1) {
+            meAdcZpDisk2Panel2Plaq1_->Fill((*iter).adc());
+            meRowZpDisk2Panel2Plaq1_->Fill((*iter).row());
+            meColZpDisk2Panel2Plaq1_->Fill((*iter).column());
+          } else if (mod == 2) {
+            meAdcZpDisk2Panel2Plaq2_->Fill((*iter).adc());
+            meRowZpDisk2Panel2Plaq2_->Fill((*iter).row());
+            meColZpDisk2Panel2Plaq2_->Fill((*iter).column());
+          } else if (mod == 3) {
+            meAdcZpDisk2Panel2Plaq3_->Fill((*iter).adc());
+            meRowZpDisk2Panel2Plaq3_->Fill((*iter).row());
+            meColZpDisk2Panel2Plaq3_->Fill((*iter).column());
+          } else {
+            // LogError("SiPixelDigiValid")<<" The number of module is Wrong";
+          }
+          ++ndigiZpDisk2PerPanel2[blade - 1];
+        }
+      }  // iterating the digi
+
+    }  // Endcap
+
+  }  // end for loop
+
+  meDigiMultiLayer1Ring1_->Fill(ndigiperRingLayer1[0]);
+  meDigiMultiLayer1Ring2_->Fill(ndigiperRingLayer1[1]);
+  meDigiMultiLayer1Ring3_->Fill(ndigiperRingLayer1[2]);
+  meDigiMultiLayer1Ring4_->Fill(ndigiperRingLayer1[3]);
+  meDigiMultiLayer1Ring5_->Fill(ndigiperRingLayer1[4]);
+  meDigiMultiLayer1Ring6_->Fill(ndigiperRingLayer1[5]);
+  meDigiMultiLayer1Ring7_->Fill(ndigiperRingLayer1[6]);
+  meDigiMultiLayer1Ring8_->Fill(ndigiperRingLayer1[7]);
+
+  meDigiMultiLayer2Ring1_->Fill(ndigiperRingLayer2[0]);
+  meDigiMultiLayer2Ring2_->Fill(ndigiperRingLayer2[1]);
+  meDigiMultiLayer2Ring3_->Fill(ndigiperRingLayer2[2]);
+  meDigiMultiLayer2Ring4_->Fill(ndigiperRingLayer2[3]);
+  meDigiMultiLayer2Ring5_->Fill(ndigiperRingLayer2[4]);
+  meDigiMultiLayer2Ring6_->Fill(ndigiperRingLayer2[5]);
+  meDigiMultiLayer2Ring7_->Fill(ndigiperRingLayer2[6]);
+  meDigiMultiLayer2Ring8_->Fill(ndigiperRingLayer2[7]);
+
+  meDigiMultiLayer3Ring1_->Fill(ndigiperRingLayer3[0]);
+  meDigiMultiLayer3Ring2_->Fill(ndigiperRingLayer3[1]);
+  meDigiMultiLayer3Ring3_->Fill(ndigiperRingLayer3[2]);
+  meDigiMultiLayer3Ring4_->Fill(ndigiperRingLayer3[3]);
+  meDigiMultiLayer3Ring5_->Fill(ndigiperRingLayer3[4]);
+  meDigiMultiLayer3Ring6_->Fill(ndigiperRingLayer3[5]);
+  meDigiMultiLayer3Ring7_->Fill(ndigiperRingLayer3[6]);
+  meDigiMultiLayer3Ring8_->Fill(ndigiperRingLayer3[7]);
+
+  for (int i = 0; i < nblades; i++) {
+    meNdigiZmDisk1PerPanel1_->Fill(ndigiZmDisk1PerPanel1[i]);
+    meNdigiZmDisk1PerPanel2_->Fill(ndigiZmDisk1PerPanel2[i]);
+    meNdigiZmDisk2PerPanel1_->Fill(ndigiZmDisk2PerPanel1[i]);
+    meNdigiZmDisk2PerPanel2_->Fill(ndigiZmDisk2PerPanel2[i]);
+    meNdigiZpDisk1PerPanel1_->Fill(ndigiZpDisk1PerPanel1[i]);
+    meNdigiZpDisk1PerPanel2_->Fill(ndigiZpDisk1PerPanel2[i]);
+    meNdigiZpDisk2PerPanel1_->Fill(ndigiZpDisk2PerPanel1[i]);
+    meNdigiZpDisk2PerPanel2_->Fill(ndigiZpDisk2PerPanel2[i]);
+  }
+
+  for (int i = 0; i < nladders1; i++) {
+    meDigiMultiLayer1Ladders_->Fill(i + 1, ndigilayer1ladders[i]);
+  }
+
+  for (int i = 0; i < nladders2; i++) {
+    meDigiMultiLayer2Ladders_->Fill(i + 1, ndigilayer2ladders[i]);
+  }
+
+  for (int i = 0; i < nladders3; i++) {
+    meDigiMultiLayer3Ladders_->Fill(i + 1, ndigilayer3ladders[i]);
+  }
 }
diff --git a/Validation/TrackerDigis/plugins/SiStripDigiValid.cc b/Validation/TrackerDigis/plugins/SiStripDigiValid.cc
index 0b402844a05aa..193ab5df75504 100644
--- a/Validation/TrackerDigis/plugins/SiStripDigiValid.cc
+++ b/Validation/TrackerDigis/plugins/SiStripDigiValid.cc
@@ -1,823 +1,1535 @@
-#include "Validation/TrackerDigis/interface/SiStripDigiValid.h"
+#include "DQMServices/Core/interface/DQMStore.h"
+#include "DQMServices/Core/interface/MonitorElement.h"
 #include "DataFormats/Common/interface/DetSetVector.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 #include "DataFormats/GeometryVector/interface/LocalPoint.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/SiStripDigi/interface/SiStripDigi.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "DQMServices/Core/interface/DQMStore.h"
-#include "DQMServices/Core/interface/MonitorElement.h"
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
-#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/CommonTopologies/interface/RectangularStripTopology.h"
 #include "Geometry/CommonTopologies/interface/TrapezoidalStripTopology.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/TrackerGeometryBuilder/interface/StripGeomDetUnit.h"
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "Validation/TrackerDigis/interface/SiStripDigiValid.h"
 
-SiStripDigiValid::SiStripDigiValid(const edm::ParameterSet& ps)
-  : dbe_(nullptr)
-  , runStandalone ( ps.getParameter<bool>("runStandalone")  )  
-  , outputFile_( ps.getUntrackedParameter<std::string>( "outputFile", "stripdigihisto.root" ) )
-  , edmDetSetVector_SiStripDigi_Token_( consumes< edm::DetSetVector<SiStripDigi> >( ps.getParameter<edm::InputTag>( "src" ) ) ) {
+SiStripDigiValid::SiStripDigiValid(const edm::ParameterSet &ps)
+    : dbe_(nullptr),
+      runStandalone(ps.getParameter<bool>("runStandalone")),
+      outputFile_(ps.getUntrackedParameter<std::string>("outputFile", "stripdigihisto.root")),
+      edmDetSetVector_SiStripDigi_Token_(
+          consumes<edm::DetSetVector<SiStripDigi>>(ps.getParameter<edm::InputTag>("src"))) {}
 
-}
+SiStripDigiValid::~SiStripDigiValid() {}
 
-SiStripDigiValid::~SiStripDigiValid(){
-}
+void SiStripDigiValid::bookHistograms(DQMStore::IBooker &ibooker, const edm::Run &run, const edm::EventSetup &es) {
+  dbe_ = edm::Service<DQMStore>().operator->();
 
+  if (dbe_) {
+    ibooker.setCurrentFolder("TrackerDigisV/TrackerDigis/Strip");
 
+    for (int i = 0; i < 3; i++) {
+      Char_t histo[200];
+      // Z Plus Side
+      sprintf(histo, "adc_tib_layer1_extmodule%d_zp", i + 1);
+      meAdcTIBLayer1Extzp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tib_layer1_intmodule%d_zp", i + 1);
+      meAdcTIBLayer1Intzp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tib_layer2_extmodule%d_zp", i + 1);
+      meAdcTIBLayer2Extzp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tib_layer2_intmodule%d_zp", i + 1);
+      meAdcTIBLayer2Intzp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tib_layer3_extmodule%d_zp", i + 1);
+      meAdcTIBLayer3Extzp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tib_layer3_intmodule%d_zp", i + 1);
+      meAdcTIBLayer3Intzp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tib_layer4_extmodule%d_zp", i + 1);
+      meAdcTIBLayer4Extzp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tib_layer4_intmodule%d_zp", i + 1);
+      meAdcTIBLayer4Intzp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "strip_tib_layer1_extmodule%d_zp", i + 1);
+      meStripTIBLayer1Extzp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tib_layer1_intmodule%d_zp", i + 1);
+      meStripTIBLayer1Intzp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tib_layer2_extmodule%d_zp", i + 1);
+      meStripTIBLayer2Extzp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tib_layer2_intmodule%d_zp", i + 1);
+      meStripTIBLayer2Intzp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tib_layer3_extmodule%d_zp", i + 1);
+      meStripTIBLayer3Extzp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tib_layer3_intmodule%d_zp", i + 1);
+      meStripTIBLayer3Intzp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tib_layer4_extmodule%d_zp", i + 1);
+      meStripTIBLayer4Extzp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tib_layer4_intmodule%d_zp", i + 1);
+      meStripTIBLayer4Intzp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      //  Z Minus Side
+      sprintf(histo, "adc_tib_layer1_extmodule%d_zm", i + 1);
+      meAdcTIBLayer1Extzm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tib_layer1_intmodule%d_zm", i + 1);
+      meAdcTIBLayer1Intzm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tib_layer2_extmodule%d_zm", i + 1);
+      meAdcTIBLayer2Extzm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tib_layer2_intmodule%d_zm", i + 1);
+      meAdcTIBLayer2Intzm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tib_layer3_extmodule%d_zm", i + 1);
+      meAdcTIBLayer3Extzm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tib_layer3_intmodule%d_zm", i + 1);
+      meAdcTIBLayer3Intzm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tib_layer4_extmodule%d_zm", i + 1);
+      meAdcTIBLayer4Extzm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tib_layer4_intmodule%d_zm", i + 1);
+      meAdcTIBLayer4Intzm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "strip_tib_layer1_extmodule%d_zm", i + 1);
+      meStripTIBLayer1Extzm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tib_layer1_intmodule%d_zm", i + 1);
+      meStripTIBLayer1Intzm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tib_layer2_extmodule%d_zm", i + 1);
+      meStripTIBLayer2Extzm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tib_layer2_intmodule%d_zm", i + 1);
+      meStripTIBLayer2Intzm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tib_layer3_extmodule%d_zm", i + 1);
+      meStripTIBLayer3Extzm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tib_layer3_intmodule%d_zm", i + 1);
+      meStripTIBLayer3Intzm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tib_layer4_extmodule%d_zm", i + 1);
+      meStripTIBLayer4Extzm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tib_layer4_intmodule%d_zm", i + 1);
+      meStripTIBLayer4Intzm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+    }
 
-void SiStripDigiValid::bookHistograms(DQMStore::IBooker & ibooker,const edm::Run& run, const edm::EventSetup& es){
-  dbe_ = edm::Service<DQMStore>().operator->();
+    for (int i = 0; i < 6; i++) {
+      Char_t histo[200];
+      // Z Plus Side
+      sprintf(histo, "adc_tob_layer1_module%d_zp", i + 1);
+      meAdcTOBLayer1zp_[i] = ibooker.book1D(histo, "Digis ADC", 10, 0., 300.);
+      sprintf(histo, "strip_tob_layer1_module%d_zp", i + 1);
+      meStripTOBLayer1zp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "adc_tob_layer2_module%d_zp", i + 1);
+      meAdcTOBLayer2zp_[i] = ibooker.book1D(histo, "Digis ADC", 10, 0., 300.);
+      sprintf(histo, "strip_tob_layer2_module%d_zp", i + 1);
+      meStripTOBLayer2zp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "adc_tob_layer3_module%d_zp", i + 1);
+      meAdcTOBLayer3zp_[i] = ibooker.book1D(histo, "Digis ADC", 10, 0., 300.);
+      sprintf(histo, "strip_tob_layer3_module%d_zp", i + 1);
+      meStripTOBLayer3zp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "adc_tob_layer4_module%d_zp", i + 1);
+      meAdcTOBLayer4zp_[i] = ibooker.book1D(histo, "Digis ADC", 10, 0., 300.);
+      sprintf(histo, "strip_tob_layer4_module%d_zp", i + 1);
+      meStripTOBLayer4zp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "adc_tob_layer5_module%d_zp", i + 1);
+      meAdcTOBLayer5zp_[i] = ibooker.book1D(histo, "Digis ADC", 10, 0., 300.);
+      sprintf(histo, "strip_tob_layer5_module%d_zp", i + 1);
+      meStripTOBLayer5zp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "adc_tob_layer6_module%d_zp", i + 1);
+      meAdcTOBLayer6zp_[i] = ibooker.book1D(histo, "Digis ADC", 10, 0., 300.);
+      sprintf(histo, "strip_tob_layer6_module%d_zp", i + 1);
+      meStripTOBLayer6zp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      // Z Minus Side
+      sprintf(histo, "adc_tob_layer1_module%d_zm", i + 1);
+      meAdcTOBLayer1zm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "strip_tob_layer1_module%d_zm", i + 1);
+      meStripTOBLayer1zm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "adc_tob_layer2_module%d_zm", i + 1);
+      meAdcTOBLayer2zm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "strip_tob_layer2_module%d_zm", i + 1);
+      meStripTOBLayer2zm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "adc_tob_layer3_module%d_zm", i + 1);
+      meAdcTOBLayer3zm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "strip_tob_layer3_module%d_zm", i + 1);
+      meStripTOBLayer3zm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "adc_tob_layer4_module%d_zm", i + 1);
+      meAdcTOBLayer4zm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "strip_tob_layer4_module%d_zm", i + 1);
+      meStripTOBLayer4zm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "adc_tob_layer5_module%d_zm", i + 1);
+      meAdcTOBLayer5zm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "strip_tob_layer5_module%d_zm", i + 1);
+      meStripTOBLayer5zm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "adc_tob_layer6_module%d_zm", i + 1);
+      meAdcTOBLayer6zm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "strip_tob_layer6_module%d_zm", i + 1);
+      meStripTOBLayer6zm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+    }
 
-   if ( dbe_ ) {
-     ibooker.setCurrentFolder("TrackerDigisV/TrackerDigis/Strip");
-
-     for(int i = 0 ;i<3 ; i++) {
-       Char_t histo[200];
-       // Z Plus Side
-       sprintf(histo,"adc_tib_layer1_extmodule%d_zp",i+1);
-       meAdcTIBLayer1Extzp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tib_layer1_intmodule%d_zp",i+1);
-       meAdcTIBLayer1Intzp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tib_layer2_extmodule%d_zp",i+1);
-       meAdcTIBLayer2Extzp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tib_layer2_intmodule%d_zp",i+1);
-       meAdcTIBLayer2Intzp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tib_layer3_extmodule%d_zp",i+1);
-       meAdcTIBLayer3Extzp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tib_layer3_intmodule%d_zp",i+1);
-       meAdcTIBLayer3Intzp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tib_layer4_extmodule%d_zp",i+1);
-       meAdcTIBLayer4Extzp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tib_layer4_intmodule%d_zp",i+1);
-       meAdcTIBLayer4Intzp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"strip_tib_layer1_extmodule%d_zp",i+1);
-       meStripTIBLayer1Extzp_[i] =  ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tib_layer1_intmodule%d_zp",i+1);
-       meStripTIBLayer1Intzp_[i] =  ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tib_layer2_extmodule%d_zp",i+1);
-       meStripTIBLayer2Extzp_[i] =  ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tib_layer2_intmodule%d_zp",i+1);
-       meStripTIBLayer2Intzp_[i] =  ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tib_layer3_extmodule%d_zp",i+1);
-       meStripTIBLayer3Extzp_[i] =  ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tib_layer3_intmodule%d_zp",i+1);
-       meStripTIBLayer3Intzp_[i] =  ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tib_layer4_extmodule%d_zp",i+1);
-       meStripTIBLayer4Extzp_[i] =  ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tib_layer4_intmodule%d_zp",i+1);
-       meStripTIBLayer4Intzp_[i] =  ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       //  Z Minus Side
-       sprintf(histo,"adc_tib_layer1_extmodule%d_zm",i+1);
-       meAdcTIBLayer1Extzm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tib_layer1_intmodule%d_zm",i+1);
-       meAdcTIBLayer1Intzm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tib_layer2_extmodule%d_zm",i+1);
-       meAdcTIBLayer2Extzm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tib_layer2_intmodule%d_zm",i+1);
-       meAdcTIBLayer2Intzm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tib_layer3_extmodule%d_zm",i+1);
-       meAdcTIBLayer3Extzm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tib_layer3_intmodule%d_zm",i+1);
-       meAdcTIBLayer3Intzm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tib_layer4_extmodule%d_zm",i+1);
-       meAdcTIBLayer4Extzm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tib_layer4_intmodule%d_zm",i+1);
-       meAdcTIBLayer4Intzm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"strip_tib_layer1_extmodule%d_zm",i+1);
-       meStripTIBLayer1Extzm_[i] =  ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tib_layer1_intmodule%d_zm",i+1);
-       meStripTIBLayer1Intzm_[i] =  ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tib_layer2_extmodule%d_zm",i+1);
-       meStripTIBLayer2Extzm_[i] =  ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tib_layer2_intmodule%d_zm",i+1);
-       meStripTIBLayer2Intzm_[i] =  ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tib_layer3_extmodule%d_zm",i+1);
-       meStripTIBLayer3Extzm_[i] =  ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tib_layer3_intmodule%d_zm",i+1);
-       meStripTIBLayer3Intzm_[i] =  ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tib_layer4_extmodule%d_zm",i+1);
-       meStripTIBLayer4Extzm_[i] =  ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tib_layer4_intmodule%d_zm",i+1);
-       meStripTIBLayer4Intzm_[i] =  ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-   }
-
-     for(int i = 0 ;i<6 ; i++) {
-       Char_t histo[200];
-       // Z Plus Side
-       sprintf(histo,"adc_tob_layer1_module%d_zp",i+1);
-       meAdcTOBLayer1zp_[i] = ibooker.book1D(histo,"Digis ADC",10,0.,300.);
-       sprintf(histo,"strip_tob_layer1_module%d_zp",i+1);
-       meStripTOBLayer1zp_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"adc_tob_layer2_module%d_zp",i+1);
-       meAdcTOBLayer2zp_[i] = ibooker.book1D(histo,"Digis ADC",10,0.,300.);
-       sprintf(histo,"strip_tob_layer2_module%d_zp",i+1);
-       meStripTOBLayer2zp_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"adc_tob_layer3_module%d_zp",i+1);
-       meAdcTOBLayer3zp_[i] = ibooker.book1D(histo,"Digis ADC",10,0.,300.);
-       sprintf(histo,"strip_tob_layer3_module%d_zp",i+1);
-       meStripTOBLayer3zp_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"adc_tob_layer4_module%d_zp",i+1);
-       meAdcTOBLayer4zp_[i] = ibooker.book1D(histo,"Digis ADC",10,0.,300.);
-       sprintf(histo,"strip_tob_layer4_module%d_zp",i+1);
-       meStripTOBLayer4zp_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"adc_tob_layer5_module%d_zp",i+1);
-       meAdcTOBLayer5zp_[i] = ibooker.book1D(histo,"Digis ADC",10,0.,300.);
-       sprintf(histo,"strip_tob_layer5_module%d_zp",i+1);
-       meStripTOBLayer5zp_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"adc_tob_layer6_module%d_zp",i+1);
-       meAdcTOBLayer6zp_[i] = ibooker.book1D(histo,"Digis ADC",10,0.,300.);
-       sprintf(histo,"strip_tob_layer6_module%d_zp",i+1);
-       meStripTOBLayer6zp_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       // Z Minus Side
-       sprintf(histo,"adc_tob_layer1_module%d_zm",i+1);
-       meAdcTOBLayer1zm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"strip_tob_layer1_module%d_zm",i+1);
-       meStripTOBLayer1zm_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"adc_tob_layer2_module%d_zm",i+1);
-       meAdcTOBLayer2zm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"strip_tob_layer2_module%d_zm",i+1);
-       meStripTOBLayer2zm_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"adc_tob_layer3_module%d_zm",i+1);
-       meAdcTOBLayer3zm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"strip_tob_layer3_module%d_zm",i+1);
-       meStripTOBLayer3zm_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"adc_tob_layer4_module%d_zm",i+1);
-       meAdcTOBLayer4zm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"strip_tob_layer4_module%d_zm",i+1);
-       meStripTOBLayer4zm_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"adc_tob_layer5_module%d_zm",i+1);
-       meAdcTOBLayer5zm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"strip_tob_layer5_module%d_zm",i+1);
-       meStripTOBLayer5zm_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"adc_tob_layer6_module%d_zm",i+1);
-       meAdcTOBLayer6zm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"strip_tob_layer6_module%d_zm",i+1);
-       meStripTOBLayer6zm_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-     }
- 
-     for(int i = 0 ;i<3 ; i++) {
-       Char_t histo[200];
-       // Z Plus Side
-       sprintf(histo,"adc_tid_wheel1_ring%d_zp",i+1);
-       meAdcTIDWheel1zp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tid_wheel2_ring%d_zp",i+1);
-       meAdcTIDWheel2zp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tid_wheel3_ring%d_zp",i+1);
-       meAdcTIDWheel3zp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"strip_tid_wheel1_ring%d_zp",i+1);
-       meStripTIDWheel1zp_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.); 
-       sprintf(histo,"strip_tid_wheel2_ring%d_zp",i+1);
-       meStripTIDWheel2zp_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tid_wheel3_ring%d_zp",i+1);
-       meStripTIDWheel3zp_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       // Z minus Side
-       sprintf(histo,"adc_tid_wheel1_ring%d_zm",i+1);
-       meAdcTIDWheel1zm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tid_wheel2_ring%d_zm",i+1);
-       meAdcTIDWheel2zm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tid_wheel3_ring%d_zm",i+1);
-       meAdcTIDWheel3zm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"strip_tid_wheel1_ring%d_zm",i+1);
-       meStripTIDWheel1zm_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tid_wheel2_ring%d_zm",i+1);
-       meStripTIDWheel2zm_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tid_wheel3_ring%d_zm",i+1);
-       meStripTIDWheel3zm_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-     }
-     
-     for(int i = 0 ;i<7 ; i++) {
-       Char_t histo[200];
-       // Z Plus Side
-       sprintf(histo,"adc_tec_wheel1_ring%d_zp",i+1);
-       meAdcTECWheel1zp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tec_wheel2_ring%d_zp",i+1);
-       meAdcTECWheel2zp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tec_wheel3_ring%d_zp",i+1);
-       meAdcTECWheel3zp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"strip_tec_wheel1_ring%d_zp",i+1);
-       meStripTECWheel1zp_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tec_wheel2_ring%d_zp",i+1);
-       meStripTECWheel2zp_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tec_wheel3_ring%d_zp",i+1);
-       meStripTECWheel3zp_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-
-       // Z Minus Side
-       sprintf(histo,"adc_tec_wheel1_ring%d_zm",i+1);
-       meAdcTECWheel1zm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tec_wheel2_ring%d_zm",i+1);
-       meAdcTECWheel2zm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tec_wheel3_ring%d_zm",i+1);
-       meAdcTECWheel3zm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"strip_tec_wheel1_ring%d_zm",i+1);
-       meStripTECWheel1zm_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tec_wheel2_ring%d_zm",i+1);
-       meStripTECWheel2zm_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tec_wheel3_ring%d_zm",i+1);
-       meStripTECWheel3zm_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-     }
-
-     for(int i = 0 ;i<6 ; i++) {
-       Char_t histo[200];
-       // Z Plus Side
-       sprintf(histo,"adc_tec_wheel4_ring%d_zp",i+1);
-       meAdcTECWheel4zp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tec_wheel5_ring%d_zp",i+1);
-       meAdcTECWheel5zp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tec_wheel6_ring%d_zp",i+1);
-       meAdcTECWheel6zp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"strip_tec_wheel4_ring%d_zp",i+1);
-       meStripTECWheel4zp_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tec_wheel5_ring%d_zp",i+1);
-       meStripTECWheel5zp_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tec_wheel6_ring%d_zp",i+1);
-       meStripTECWheel6zp_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-
-       // Z Minus Side
-       sprintf(histo,"adc_tec_wheel4_ring%d_zm",i+1);
-       meAdcTECWheel4zm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tec_wheel5_ring%d_zm",i+1);
-       meAdcTECWheel5zm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tec_wheel6_ring%d_zm",i+1);
-       meAdcTECWheel6zm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"strip_tec_wheel4_ring%d_zm",i+1);
-       meStripTECWheel4zm_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tec_wheel5_ring%d_zm",i+1);
-       meStripTECWheel5zm_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tec_wheel6_ring%d_zm",i+1);
-       meStripTECWheel6zm_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-     }
-
-     for(int i = 0 ;i<5 ; i++) {
-       Char_t histo[200];
-       // Z Plus Side
-       sprintf(histo,"adc_tec_wheel7_ring%d_zp",i+1);
-       meAdcTECWheel7zp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tec_wheel8_ring%d_zp",i+1);
-       meAdcTECWheel8zp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"strip_tec_wheel7_ring%d_zp",i+1);
-       meStripTECWheel7zp_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tec_wheel8_ring%d_zp",i+1);
-       meStripTECWheel8zp_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-
-       // Z Minus Side
-       sprintf(histo,"adc_tec_wheel7_ring%d_zm",i+1);
-       meAdcTECWheel7zm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"adc_tec_wheel8_ring%d_zm",i+1);
-       meAdcTECWheel8zm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"strip_tec_wheel7_ring%d_zm",i+1);
-       meStripTECWheel7zm_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-       sprintf(histo,"strip_tec_wheel8_ring%d_zm",i+1);
-       meStripTECWheel8zm_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-     }
-
-     for(int i = 0 ;i<4 ; i++) {
-       Char_t histo[200];
-       // Z Plus Side
-       sprintf(histo,"adc_tec_wheel9_ring%d_zp",i+1);
-       meAdcTECWheel9zp_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"strip_tec_wheel9_ring%d_zp",i+1);
-       meStripTECWheel9zp_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-
-       // Z Minus Side
-       sprintf(histo,"adc_tec_wheel9_ring%d_zm",i+1);
-       meAdcTECWheel9zm_[i] = ibooker.book1D(histo,"Digis ADC",50,0.,300.);
-       sprintf(histo,"strip_tec_wheel9_ring%d_zm",i+1);
-       meStripTECWheel9zm_[i] = ibooker.book1D(histo,"Digis Strip Num.",200,0.,800.);
-     }
-
-     for(int i = 0 ;i<4 ; i++) {
-       Char_t histo[200];
-       sprintf(histo,"ndigi_tib_layer_%d_zm",i+1);
-       meNDigiTIBLayerzm_[i] = ibooker.book1D(histo, "Digi Multiplicity",100,0.,500.);
-       sprintf(histo,"ndigi_tib_layer_%d_zp",i+1); 
-       meNDigiTIBLayerzp_[i] = ibooker.book1D(histo, "Digi Multiplicity",100,0.,500.);
-     }
-
-     for(int i = 0 ;i<6 ; i++) {
-       Char_t histo[200];
-       sprintf(histo,"ndigi_tob_layer_%d_zm",i+1);
-       meNDigiTOBLayerzm_[i] = ibooker.book1D(histo, "Digi Multiplicity",100,0.,500.);
-       sprintf(histo,"ndigi_tob_layer_%d_zp",i+1);
-       meNDigiTOBLayerzp_[i] = ibooker.book1D(histo, "Digi Multiplicity",100,0.,500.);
-     }
-
-     for(int i = 0 ;i<3 ; i++) {
-       Char_t histo[200];
-       sprintf(histo,"ndigi_tid_wheel_%d_zm",i+1);
-       meNDigiTIDWheelzm_[i] = ibooker.book1D(histo, "Digi Multiplicity",100,0.,500.);
-       sprintf(histo,"ndigi_tid_wheel_%d_zp",i+1);
-       meNDigiTIDWheelzp_[i] = ibooker.book1D(histo, "Digi Multiplicity",100,0.,500.);
-     }
-
-     for(int i = 0 ;i<9 ; i++) {
-       Char_t histo[200];
-       sprintf(histo,"ndigi_tec_wheel_%d_zm",i+1);
-       meNDigiTECWheelzm_[i] = ibooker.book1D(histo, "Digi Multiplicity",100,0.,500.);
-       sprintf(histo,"ndigi_tec_wheel_%d_zp",i+1);
-       meNDigiTECWheelzp_[i] = ibooker.book1D(histo, "Digi Multiplicity",100,0.,500.);
-     }
-   }
-}
+    for (int i = 0; i < 3; i++) {
+      Char_t histo[200];
+      // Z Plus Side
+      sprintf(histo, "adc_tid_wheel1_ring%d_zp", i + 1);
+      meAdcTIDWheel1zp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tid_wheel2_ring%d_zp", i + 1);
+      meAdcTIDWheel2zp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tid_wheel3_ring%d_zp", i + 1);
+      meAdcTIDWheel3zp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "strip_tid_wheel1_ring%d_zp", i + 1);
+      meStripTIDWheel1zp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tid_wheel2_ring%d_zp", i + 1);
+      meStripTIDWheel2zp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tid_wheel3_ring%d_zp", i + 1);
+      meStripTIDWheel3zp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      // Z minus Side
+      sprintf(histo, "adc_tid_wheel1_ring%d_zm", i + 1);
+      meAdcTIDWheel1zm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tid_wheel2_ring%d_zm", i + 1);
+      meAdcTIDWheel2zm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tid_wheel3_ring%d_zm", i + 1);
+      meAdcTIDWheel3zm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "strip_tid_wheel1_ring%d_zm", i + 1);
+      meStripTIDWheel1zm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tid_wheel2_ring%d_zm", i + 1);
+      meStripTIDWheel2zm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tid_wheel3_ring%d_zm", i + 1);
+      meStripTIDWheel3zm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+    }
 
-void SiStripDigiValid::endJob() {
-  if ( runStandalone && !outputFile_.empty() && dbe_ ){ dbe_->save(outputFile_);}
+    for (int i = 0; i < 7; i++) {
+      Char_t histo[200];
+      // Z Plus Side
+      sprintf(histo, "adc_tec_wheel1_ring%d_zp", i + 1);
+      meAdcTECWheel1zp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tec_wheel2_ring%d_zp", i + 1);
+      meAdcTECWheel2zp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tec_wheel3_ring%d_zp", i + 1);
+      meAdcTECWheel3zp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "strip_tec_wheel1_ring%d_zp", i + 1);
+      meStripTECWheel1zp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tec_wheel2_ring%d_zp", i + 1);
+      meStripTECWheel2zp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tec_wheel3_ring%d_zp", i + 1);
+      meStripTECWheel3zp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+
+      // Z Minus Side
+      sprintf(histo, "adc_tec_wheel1_ring%d_zm", i + 1);
+      meAdcTECWheel1zm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tec_wheel2_ring%d_zm", i + 1);
+      meAdcTECWheel2zm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tec_wheel3_ring%d_zm", i + 1);
+      meAdcTECWheel3zm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "strip_tec_wheel1_ring%d_zm", i + 1);
+      meStripTECWheel1zm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tec_wheel2_ring%d_zm", i + 1);
+      meStripTECWheel2zm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tec_wheel3_ring%d_zm", i + 1);
+      meStripTECWheel3zm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+    }
 
+    for (int i = 0; i < 6; i++) {
+      Char_t histo[200];
+      // Z Plus Side
+      sprintf(histo, "adc_tec_wheel4_ring%d_zp", i + 1);
+      meAdcTECWheel4zp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tec_wheel5_ring%d_zp", i + 1);
+      meAdcTECWheel5zp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tec_wheel6_ring%d_zp", i + 1);
+      meAdcTECWheel6zp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "strip_tec_wheel4_ring%d_zp", i + 1);
+      meStripTECWheel4zp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tec_wheel5_ring%d_zp", i + 1);
+      meStripTECWheel5zp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tec_wheel6_ring%d_zp", i + 1);
+      meStripTECWheel6zp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+
+      // Z Minus Side
+      sprintf(histo, "adc_tec_wheel4_ring%d_zm", i + 1);
+      meAdcTECWheel4zm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tec_wheel5_ring%d_zm", i + 1);
+      meAdcTECWheel5zm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tec_wheel6_ring%d_zm", i + 1);
+      meAdcTECWheel6zm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "strip_tec_wheel4_ring%d_zm", i + 1);
+      meStripTECWheel4zm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tec_wheel5_ring%d_zm", i + 1);
+      meStripTECWheel5zm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tec_wheel6_ring%d_zm", i + 1);
+      meStripTECWheel6zm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+    }
+
+    for (int i = 0; i < 5; i++) {
+      Char_t histo[200];
+      // Z Plus Side
+      sprintf(histo, "adc_tec_wheel7_ring%d_zp", i + 1);
+      meAdcTECWheel7zp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tec_wheel8_ring%d_zp", i + 1);
+      meAdcTECWheel8zp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "strip_tec_wheel7_ring%d_zp", i + 1);
+      meStripTECWheel7zp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tec_wheel8_ring%d_zp", i + 1);
+      meStripTECWheel8zp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+
+      // Z Minus Side
+      sprintf(histo, "adc_tec_wheel7_ring%d_zm", i + 1);
+      meAdcTECWheel7zm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "adc_tec_wheel8_ring%d_zm", i + 1);
+      meAdcTECWheel8zm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "strip_tec_wheel7_ring%d_zm", i + 1);
+      meStripTECWheel7zm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+      sprintf(histo, "strip_tec_wheel8_ring%d_zm", i + 1);
+      meStripTECWheel8zm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+    }
+
+    for (int i = 0; i < 4; i++) {
+      Char_t histo[200];
+      // Z Plus Side
+      sprintf(histo, "adc_tec_wheel9_ring%d_zp", i + 1);
+      meAdcTECWheel9zp_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "strip_tec_wheel9_ring%d_zp", i + 1);
+      meStripTECWheel9zp_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+
+      // Z Minus Side
+      sprintf(histo, "adc_tec_wheel9_ring%d_zm", i + 1);
+      meAdcTECWheel9zm_[i] = ibooker.book1D(histo, "Digis ADC", 50, 0., 300.);
+      sprintf(histo, "strip_tec_wheel9_ring%d_zm", i + 1);
+      meStripTECWheel9zm_[i] = ibooker.book1D(histo, "Digis Strip Num.", 200, 0., 800.);
+    }
+
+    for (int i = 0; i < 4; i++) {
+      Char_t histo[200];
+      sprintf(histo, "ndigi_tib_layer_%d_zm", i + 1);
+      meNDigiTIBLayerzm_[i] = ibooker.book1D(histo, "Digi Multiplicity", 100, 0., 500.);
+      sprintf(histo, "ndigi_tib_layer_%d_zp", i + 1);
+      meNDigiTIBLayerzp_[i] = ibooker.book1D(histo, "Digi Multiplicity", 100, 0., 500.);
+    }
+
+    for (int i = 0; i < 6; i++) {
+      Char_t histo[200];
+      sprintf(histo, "ndigi_tob_layer_%d_zm", i + 1);
+      meNDigiTOBLayerzm_[i] = ibooker.book1D(histo, "Digi Multiplicity", 100, 0., 500.);
+      sprintf(histo, "ndigi_tob_layer_%d_zp", i + 1);
+      meNDigiTOBLayerzp_[i] = ibooker.book1D(histo, "Digi Multiplicity", 100, 0., 500.);
+    }
+
+    for (int i = 0; i < 3; i++) {
+      Char_t histo[200];
+      sprintf(histo, "ndigi_tid_wheel_%d_zm", i + 1);
+      meNDigiTIDWheelzm_[i] = ibooker.book1D(histo, "Digi Multiplicity", 100, 0., 500.);
+      sprintf(histo, "ndigi_tid_wheel_%d_zp", i + 1);
+      meNDigiTIDWheelzp_[i] = ibooker.book1D(histo, "Digi Multiplicity", 100, 0., 500.);
+    }
+
+    for (int i = 0; i < 9; i++) {
+      Char_t histo[200];
+      sprintf(histo, "ndigi_tec_wheel_%d_zm", i + 1);
+      meNDigiTECWheelzm_[i] = ibooker.book1D(histo, "Digi Multiplicity", 100, 0., 500.);
+      sprintf(histo, "ndigi_tec_wheel_%d_zp", i + 1);
+      meNDigiTECWheelzp_[i] = ibooker.book1D(histo, "Digi Multiplicity", 100, 0., 500.);
+    }
+  }
 }
 
+void SiStripDigiValid::endJob() {
+  if (runStandalone && !outputFile_.empty() && dbe_) {
+    dbe_->save(outputFile_);
+  }
+}
 
-void SiStripDigiValid::analyze(const edm::Event& e, const edm::EventSetup& c){
-  //Retrieve tracker topology from geometry
+void SiStripDigiValid::analyze(const edm::Event &e, const edm::EventSetup &c) {
+  // Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHandle;
   c.get<TrackerTopologyRcd>().get(tTopoHandle);
-  const TrackerTopology* const tTopo = tTopoHandle.product();
-
+  const TrackerTopology *const tTopo = tTopoHandle.product();
 
+  int ndigilayertibzp[4];
+  int ndigilayertibzm[4];
 
- int ndigilayertibzp[4];
- int ndigilayertibzm[4];
- 
- for( int i = 0; i< 4; i++ ) {
+  for (int i = 0; i < 4; i++) {
     ndigilayertibzp[i] = 0;
     ndigilayertibzm[i] = 0;
- }
+  }
 
- int ndigilayertobzp[6];
- int ndigilayertobzm[6];
+  int ndigilayertobzp[6];
+  int ndigilayertobzm[6];
 
- for( int i = 0; i< 6; i++ ) {
+  for (int i = 0; i < 6; i++) {
     ndigilayertobzp[i] = 0;
     ndigilayertobzm[i] = 0;
- }
-
- int ndigiwheeltidzp[3];
- int ndigiwheeltidzm[3];
-
- for( int i = 0; i< 3; i++ ) {
-   ndigiwheeltidzp[i] = 0;
-   ndigiwheeltidzm[i] = 0;
- }
-
- int ndigiwheelteczp[9];
- int ndigiwheelteczm[9];
-
- for( int i = 0; i< 9; i++ ) {
-   ndigiwheelteczp[i] = 0;
-   ndigiwheelteczm[i] = 0;
- }
-
-
-
- //LogInfo("EventInfo") << " Run = " << e.id().run() << " Event = " << e.id().event();
- edm::ESHandle<TrackerGeometry> tracker;
- c.get<TrackerDigiGeometryRecord>().get( tracker );
-
- std::string digiProducer = "siStripDigis";
- edm::Handle<edm::DetSetVector<SiStripDigi> > stripDigis;
- e.getByToken( edmDetSetVector_SiStripDigi_Token_, stripDigis );
- edm::DetSetVector<SiStripDigi>::const_iterator DSViter = stripDigis->begin();
- for( ; DSViter != stripDigis->end(); DSViter++) {
-         unsigned int id = DSViter->id;
-         DetId  detId(id);
-         edm::DetSet<SiStripDigi>::const_iterator  begin = DSViter->data.begin();
-         edm::DetSet<SiStripDigi>::const_iterator  end   = DSViter->data.end();
-         edm::DetSet<SiStripDigi>::const_iterator  iter;
-
-        if(detId.subdetId()==StripSubdetector::TIB){
-             
-             for ( iter = begin ; iter != end; iter++ ) { // loop digis
-               if( tTopo->tibStringInfo(id)[0] == 1) {
-                 ++ndigilayertibzm[tTopo->tibLayer(id)-1];
-                 if( tTopo->tibLayer(id) == 1 ) { 
-                    if ( tTopo->tibStringInfo(id)[1] == 1 ) {
-                       if( tTopo->tibModule(id) == 1 ) { meAdcTIBLayer1Intzm_[0] -> Fill((*iter).adc()); meStripTIBLayer1Intzm_[0] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 2 ) { meAdcTIBLayer1Intzm_[1] -> Fill((*iter).adc()); meStripTIBLayer1Intzm_[1] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 3 ) { meAdcTIBLayer1Intzm_[2] -> Fill((*iter).adc()); meStripTIBLayer1Intzm_[2] ->Fill((*iter).strip()); }
-                    }else {
-                       if( tTopo->tibModule(id) == 1 ) { meAdcTIBLayer1Extzm_[0] -> Fill((*iter).adc()); meStripTIBLayer1Extzm_[0] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 2 ) { meAdcTIBLayer1Extzm_[1] -> Fill((*iter).adc()); meStripTIBLayer1Extzm_[1] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 3 ) { meAdcTIBLayer1Extzm_[2] -> Fill((*iter).adc()); meStripTIBLayer1Extzm_[2] ->Fill((*iter).strip()); }
-                   } 
-                 }
-                 if( tTopo->tibLayer(id) == 2 ) {
-                    if ( tTopo->tibStringInfo(id)[1] == 1 ) {
-                       if( tTopo->tibModule(id) == 1 ) { meAdcTIBLayer2Intzm_[0] -> Fill((*iter).adc()); meStripTIBLayer2Intzm_[0] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 2 ) { meAdcTIBLayer2Intzm_[1] -> Fill((*iter).adc()); meStripTIBLayer2Intzm_[1] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 3 ) { meAdcTIBLayer2Intzm_[2] -> Fill((*iter).adc()); meStripTIBLayer2Intzm_[2] ->Fill((*iter).strip()); }
-                    }else {
-                       if( tTopo->tibModule(id) == 1 ) { meAdcTIBLayer2Extzm_[0] -> Fill((*iter).adc()); meStripTIBLayer2Extzm_[0] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 2 ) { meAdcTIBLayer2Extzm_[1] -> Fill((*iter).adc()); meStripTIBLayer2Extzm_[1] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 3 ) { meAdcTIBLayer2Extzm_[2] -> Fill((*iter).adc()); meStripTIBLayer2Extzm_[2] ->Fill((*iter).strip()); }
-                   }
-                 }
-                 if( tTopo->tibLayer(id) == 3 ) {
-                    if ( tTopo->tibStringInfo(id)[1] == 1 ) {
-                       if( tTopo->tibModule(id) == 1 ) { meAdcTIBLayer3Intzm_[0] -> Fill((*iter).adc()); meStripTIBLayer3Intzm_[0] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 2 ) { meAdcTIBLayer3Intzm_[1] -> Fill((*iter).adc()); meStripTIBLayer3Intzm_[1] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 3 ) { meAdcTIBLayer3Intzm_[2] -> Fill((*iter).adc()); meStripTIBLayer3Intzm_[2] ->Fill((*iter).strip()); }
-                    }else {
-                       if( tTopo->tibModule(id) == 1 ) { meAdcTIBLayer3Extzm_[0] -> Fill((*iter).adc()); meStripTIBLayer3Extzm_[0] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 2 ) { meAdcTIBLayer3Extzm_[1] -> Fill((*iter).adc()); meStripTIBLayer3Extzm_[1] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 3 ) { meAdcTIBLayer3Extzm_[2] -> Fill((*iter).adc()); meStripTIBLayer3Extzm_[2] ->Fill((*iter).strip()); }
-                   }
-                 }
-                 if( tTopo->tibLayer(id) == 4 ) {
-                    if ( tTopo->tibStringInfo(id)[1] == 1 ) {
-                       if( tTopo->tibModule(id) == 1 ) { meAdcTIBLayer4Intzm_[0] -> Fill((*iter).adc()); meStripTIBLayer4Intzm_[0] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 2 ) { meAdcTIBLayer4Intzm_[1] -> Fill((*iter).adc()); meStripTIBLayer4Intzm_[1] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 3 ) { meAdcTIBLayer4Intzm_[2] -> Fill((*iter).adc()); meStripTIBLayer4Intzm_[2] ->Fill((*iter).strip()); }
-                    }else {
-                       if( tTopo->tibModule(id) == 1 ) { meAdcTIBLayer4Extzm_[0] -> Fill((*iter).adc()); meStripTIBLayer4Extzm_[0] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 2 ) { meAdcTIBLayer4Extzm_[1] -> Fill((*iter).adc()); meStripTIBLayer4Extzm_[1] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 3 ) { meAdcTIBLayer4Extzm_[2] -> Fill((*iter).adc()); meStripTIBLayer4Extzm_[2] ->Fill((*iter).strip()); }
-                   }
-                 }
-               }else {
-                 ++ndigilayertibzp[tTopo->tibLayer(id)-1];
-                 if( tTopo->tibLayer(id) == 1 ) {
-                    if ( tTopo->tibStringInfo(id)[1] == 1 ) {
-                       if( tTopo->tibModule(id) == 1 ) { meAdcTIBLayer1Intzp_[0] -> Fill((*iter).adc()); meStripTIBLayer1Intzp_[0] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 2 ) { meAdcTIBLayer1Intzp_[1] -> Fill((*iter).adc()); meStripTIBLayer1Intzp_[1] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 3 ) { meAdcTIBLayer1Intzp_[2] -> Fill((*iter).adc()); meStripTIBLayer1Intzp_[2] ->Fill((*iter).strip()); }
-                    }else {
-                       if( tTopo->tibModule(id) == 1 ) { meAdcTIBLayer1Extzp_[0] -> Fill((*iter).adc()); meStripTIBLayer1Extzp_[0] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 2 ) { meAdcTIBLayer1Extzp_[1] -> Fill((*iter).adc()); meStripTIBLayer1Extzp_[1] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 3 ) { meAdcTIBLayer1Extzp_[2] -> Fill((*iter).adc()); meStripTIBLayer1Extzp_[2] ->Fill((*iter).strip()); }
-                   } 
-                 }
-                 if( tTopo->tibLayer(id) == 2 ) {
-                    if ( tTopo->tibStringInfo(id)[1] == 1 ) {
-                       if( tTopo->tibModule(id) == 1 ) { meAdcTIBLayer2Intzp_[0] -> Fill((*iter).adc()); meStripTIBLayer2Intzp_[0] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 2 ) { meAdcTIBLayer2Intzp_[1] -> Fill((*iter).adc()); meStripTIBLayer2Intzp_[1] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 3 ) { meAdcTIBLayer2Intzp_[2] -> Fill((*iter).adc()); meStripTIBLayer2Intzp_[2] ->Fill((*iter).strip()); }
-                    }else {
-                       if( tTopo->tibModule(id) == 1 ) { meAdcTIBLayer2Extzp_[0] -> Fill((*iter).adc()); meStripTIBLayer2Extzp_[0] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 2 ) { meAdcTIBLayer2Extzp_[1] -> Fill((*iter).adc()); meStripTIBLayer2Extzp_[1] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 3 ) { meAdcTIBLayer2Extzp_[2] -> Fill((*iter).adc()); meStripTIBLayer2Extzp_[2] ->Fill((*iter).strip()); }
-                   }
-                 }
-                 if( tTopo->tibLayer(id) == 3 ) {
-                    if ( tTopo->tibStringInfo(id)[1] == 1 ) {
-                       if( tTopo->tibModule(id) == 1 ) { meAdcTIBLayer3Intzp_[0] -> Fill((*iter).adc()); meStripTIBLayer3Intzp_[0] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 2 ) { meAdcTIBLayer3Intzp_[1] -> Fill((*iter).adc()); meStripTIBLayer3Intzp_[1] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 3 ) { meAdcTIBLayer3Intzp_[2] -> Fill((*iter).adc()); meStripTIBLayer3Intzp_[2] ->Fill((*iter).strip()); }
-                    }else {
-                       if( tTopo->tibModule(id) == 1 ) { meAdcTIBLayer3Extzp_[0] -> Fill((*iter).adc()); meStripTIBLayer3Extzp_[0] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 2 ) { meAdcTIBLayer3Extzp_[1] -> Fill((*iter).adc()); meStripTIBLayer3Extzp_[1] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 3 ) { meAdcTIBLayer3Extzp_[2] -> Fill((*iter).adc()); meStripTIBLayer3Extzp_[2] ->Fill((*iter).strip()); }
-                   }
-                 }
-                 if( tTopo->tibLayer(id) == 4 ) {
-                    if ( tTopo->tibStringInfo(id)[1] == 1) {
-                       if( tTopo->tibModule(id) == 1 ) { meAdcTIBLayer4Intzp_[0] -> Fill((*iter).adc()); meStripTIBLayer4Intzp_[0] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 2 ) { meAdcTIBLayer4Intzp_[1] -> Fill((*iter).adc()); meStripTIBLayer4Intzp_[1] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 3 ) { meAdcTIBLayer4Intzp_[2] -> Fill((*iter).adc()); meStripTIBLayer4Intzp_[2] ->Fill((*iter).strip()); }
-                    }else {
-                       if( tTopo->tibModule(id) == 1 ) { meAdcTIBLayer4Extzp_[0] -> Fill((*iter).adc()); meStripTIBLayer4Extzp_[0] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 2 ) { meAdcTIBLayer4Extzp_[1] -> Fill((*iter).adc()); meStripTIBLayer4Extzp_[1] ->Fill((*iter).strip()); }
-                       if( tTopo->tibModule(id) == 3 ) { meAdcTIBLayer4Extzp_[2] -> Fill((*iter).adc()); meStripTIBLayer4Extzp_[2] ->Fill((*iter).strip()); }
-                   }
-                 }
-
-              }
-            } 
-        } 
-        if(detId.subdetId()==StripSubdetector::TOB){
-              
-             for ( iter = begin ; iter != end; iter++ ) { // loop digis
-               if( tTopo->tobRodInfo(id)[0] == 1) {
-                 ++ndigilayertobzm[tTopo->tobLayer(id)-1];  
-                 if( tTopo->tobLayer(id) == 1 ) { 
-                     if ( tTopo->tobModule(id) == 1 ) { meAdcTOBLayer1zm_[0] -> Fill((*iter).adc()); meStripTOBLayer1zm_[0] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 2 ) { meAdcTOBLayer1zm_[1] -> Fill((*iter).adc()); meStripTOBLayer1zm_[1] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 3 ) { meAdcTOBLayer1zm_[2] -> Fill((*iter).adc()); meStripTOBLayer1zm_[2] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 4 ) { meAdcTOBLayer1zm_[3] -> Fill((*iter).adc()); meStripTOBLayer1zm_[3] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 5 ) { meAdcTOBLayer1zm_[4] -> Fill((*iter).adc()); meStripTOBLayer1zm_[4] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 6 ) { meAdcTOBLayer1zm_[5] -> Fill((*iter).adc()); meStripTOBLayer1zm_[5] ->Fill((*iter).strip()); }
-                 }
-                 if( tTopo->tobLayer(id) == 2 ) {
-                     if ( tTopo->tobModule(id) == 1 ) { meAdcTOBLayer2zm_[0] -> Fill((*iter).adc()); meStripTOBLayer2zm_[0] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 2 ) { meAdcTOBLayer2zm_[1] -> Fill((*iter).adc()); meStripTOBLayer2zm_[1] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 3 ) { meAdcTOBLayer2zm_[2] -> Fill((*iter).adc()); meStripTOBLayer2zm_[2] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 4 ) { meAdcTOBLayer2zm_[3] -> Fill((*iter).adc()); meStripTOBLayer2zm_[3] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 5 ) { meAdcTOBLayer2zm_[4] -> Fill((*iter).adc()); meStripTOBLayer2zm_[4] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 6 ) { meAdcTOBLayer2zm_[5] -> Fill((*iter).adc()); meStripTOBLayer2zm_[5] ->Fill((*iter).strip()); }
-                 }
-                 if( tTopo->tobLayer(id) == 3 ) {
-                     if ( tTopo->tobModule(id) == 1 ) { meAdcTOBLayer3zm_[0] -> Fill((*iter).adc()); meStripTOBLayer3zm_[0] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 2 ) { meAdcTOBLayer3zm_[1] -> Fill((*iter).adc()); meStripTOBLayer3zm_[1] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 3 ) { meAdcTOBLayer3zm_[2] -> Fill((*iter).adc()); meStripTOBLayer3zm_[2] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 4 ) { meAdcTOBLayer3zm_[3] -> Fill((*iter).adc()); meStripTOBLayer3zm_[3] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 5 ) { meAdcTOBLayer3zm_[4] -> Fill((*iter).adc()); meStripTOBLayer3zm_[4] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 6 ) { meAdcTOBLayer3zm_[5] -> Fill((*iter).adc()); meStripTOBLayer3zm_[5] ->Fill((*iter).strip()); }
-                 }
-                 if( tTopo->tobLayer(id) == 4 ) {
-                     if ( tTopo->tobModule(id) == 1 ) { meAdcTOBLayer4zm_[0] -> Fill((*iter).adc()); meStripTOBLayer4zm_[0] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 2 ) { meAdcTOBLayer4zm_[1] -> Fill((*iter).adc()); meStripTOBLayer4zm_[1] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 3 ) { meAdcTOBLayer4zm_[2] -> Fill((*iter).adc()); meStripTOBLayer4zm_[2] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 4 ) { meAdcTOBLayer4zm_[3] -> Fill((*iter).adc()); meStripTOBLayer4zm_[3] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 5 ) { meAdcTOBLayer4zm_[4] -> Fill((*iter).adc()); meStripTOBLayer4zm_[4] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 6 ) { meAdcTOBLayer4zm_[5] -> Fill((*iter).adc()); meStripTOBLayer4zm_[5] ->Fill((*iter).strip()); }
-                 }
-                 if( tTopo->tobLayer(id) == 5 ) {
-                     if ( tTopo->tobModule(id) == 1 ) { meAdcTOBLayer5zm_[0] -> Fill((*iter).adc()); meStripTOBLayer5zm_[0] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 2 ) { meAdcTOBLayer5zm_[1] -> Fill((*iter).adc()); meStripTOBLayer5zm_[1] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 3 ) { meAdcTOBLayer5zm_[2] -> Fill((*iter).adc()); meStripTOBLayer5zm_[2] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 4 ) { meAdcTOBLayer5zm_[3] -> Fill((*iter).adc()); meStripTOBLayer5zm_[3] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 5 ) { meAdcTOBLayer5zm_[4] -> Fill((*iter).adc()); meStripTOBLayer5zm_[4] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 6 ) { meAdcTOBLayer5zm_[5] -> Fill((*iter).adc()); meStripTOBLayer5zm_[5] ->Fill((*iter).strip()); }
-                 }
-                 if( tTopo->tobLayer(id) == 6 ) {
-                     if ( tTopo->tobModule(id) == 1 ) { meAdcTOBLayer6zm_[0] -> Fill((*iter).adc()); meStripTOBLayer6zm_[0] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 2 ) { meAdcTOBLayer6zm_[1] -> Fill((*iter).adc()); meStripTOBLayer6zm_[1] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 3 ) { meAdcTOBLayer6zm_[2] -> Fill((*iter).adc()); meStripTOBLayer6zm_[2] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 4 ) { meAdcTOBLayer6zm_[3] -> Fill((*iter).adc()); meStripTOBLayer6zm_[3] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 5 ) { meAdcTOBLayer6zm_[4] -> Fill((*iter).adc()); meStripTOBLayer6zm_[4] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 6 ) { meAdcTOBLayer6zm_[5] -> Fill((*iter).adc()); meStripTOBLayer6zm_[5] ->Fill((*iter).strip()); }
-                 }
-
-               }else {
-                 ++ndigilayertobzp[tTopo->tobLayer(id)-1];
-                 if( tTopo->tobLayer(id) == 1 ) {
-                     if ( tTopo->tobModule(id) == 1 ) { meAdcTOBLayer1zp_[0] -> Fill((*iter).adc()); meStripTOBLayer1zp_[0] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 2 ) { meAdcTOBLayer1zp_[1] -> Fill((*iter).adc()); meStripTOBLayer1zp_[1] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 3 ) { meAdcTOBLayer1zp_[2] -> Fill((*iter).adc()); meStripTOBLayer1zp_[2] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 4 ) { meAdcTOBLayer1zp_[3] -> Fill((*iter).adc()); meStripTOBLayer1zp_[3] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 5 ) { meAdcTOBLayer1zp_[4] -> Fill((*iter).adc()); meStripTOBLayer1zp_[4] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 6 ) { meAdcTOBLayer1zp_[5] -> Fill((*iter).adc()); meStripTOBLayer1zp_[5] ->Fill((*iter).strip()); }
-                 }
-                 if( tTopo->tobLayer(id) == 2 ) {
-                     if ( tTopo->tobModule(id) == 1 ) { meAdcTOBLayer2zp_[0] -> Fill((*iter).adc()); meStripTOBLayer2zp_[0] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 2 ) { meAdcTOBLayer2zp_[1] -> Fill((*iter).adc()); meStripTOBLayer2zp_[1] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 3 ) { meAdcTOBLayer2zp_[2] -> Fill((*iter).adc()); meStripTOBLayer2zp_[2] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 4 ) { meAdcTOBLayer2zp_[3] -> Fill((*iter).adc()); meStripTOBLayer2zp_[3] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 5 ) { meAdcTOBLayer2zp_[4] -> Fill((*iter).adc()); meStripTOBLayer2zp_[4] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 6 ) { meAdcTOBLayer2zp_[5] -> Fill((*iter).adc()); meStripTOBLayer2zp_[5] ->Fill((*iter).strip()); }
-                 }
-                 if( tTopo->tobLayer(id) == 3 ) {
-                     if ( tTopo->tobModule(id) == 1 ) { meAdcTOBLayer3zp_[0] -> Fill((*iter).adc()); meStripTOBLayer3zp_[0] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 2 ) { meAdcTOBLayer3zp_[1] -> Fill((*iter).adc()); meStripTOBLayer3zp_[1] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 3 ) { meAdcTOBLayer3zp_[2] -> Fill((*iter).adc()); meStripTOBLayer3zp_[2] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 4 ) { meAdcTOBLayer3zp_[3] -> Fill((*iter).adc()); meStripTOBLayer3zp_[3] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 5 ) { meAdcTOBLayer3zp_[4] -> Fill((*iter).adc()); meStripTOBLayer3zp_[4] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 6 ) { meAdcTOBLayer3zp_[5] -> Fill((*iter).adc()); meStripTOBLayer3zp_[5] ->Fill((*iter).strip()); }
-                 }
-                 if( tTopo->tobLayer(id) == 4 ) {
-                     if ( tTopo->tobModule(id) == 1 ) { meAdcTOBLayer4zp_[0] -> Fill((*iter).adc()); meStripTOBLayer4zp_[0] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 2 ) { meAdcTOBLayer4zp_[1] -> Fill((*iter).adc()); meStripTOBLayer4zp_[1] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 3 ) { meAdcTOBLayer4zp_[2] -> Fill((*iter).adc()); meStripTOBLayer4zp_[2] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 4 ) { meAdcTOBLayer4zp_[3] -> Fill((*iter).adc()); meStripTOBLayer4zp_[3] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 5 ) { meAdcTOBLayer4zp_[4] -> Fill((*iter).adc()); meStripTOBLayer4zp_[4] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 6 ) { meAdcTOBLayer4zp_[5] -> Fill((*iter).adc()); meStripTOBLayer4zp_[5] ->Fill((*iter).strip()); }
-                 }
-                 if( tTopo->tobLayer(id) == 5 ) {
-                     if ( tTopo->tobModule(id) == 1 ) { meAdcTOBLayer5zp_[0] -> Fill((*iter).adc()); meStripTOBLayer5zp_[0] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 2 ) { meAdcTOBLayer5zp_[1] -> Fill((*iter).adc()); meStripTOBLayer5zp_[1] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 3 ) { meAdcTOBLayer5zp_[2] -> Fill((*iter).adc()); meStripTOBLayer5zp_[2] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 4 ) { meAdcTOBLayer5zp_[3] -> Fill((*iter).adc()); meStripTOBLayer5zp_[3] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 5 ) { meAdcTOBLayer5zp_[4] -> Fill((*iter).adc()); meStripTOBLayer5zp_[4] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 6 ) { meAdcTOBLayer5zp_[5] -> Fill((*iter).adc()); meStripTOBLayer5zp_[5] ->Fill((*iter).strip()); }
-                 }
-                 if( tTopo->tobLayer(id) == 6 ) {
-                     if ( tTopo->tobModule(id) == 1 ) { meAdcTOBLayer6zp_[0] -> Fill((*iter).adc()); meStripTOBLayer6zp_[0] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 2 ) { meAdcTOBLayer6zp_[1] -> Fill((*iter).adc()); meStripTOBLayer6zp_[1] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 3 ) { meAdcTOBLayer6zp_[2] -> Fill((*iter).adc()); meStripTOBLayer6zp_[2] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 4 ) { meAdcTOBLayer6zp_[3] -> Fill((*iter).adc()); meStripTOBLayer6zp_[3] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 5 ) { meAdcTOBLayer6zp_[4] -> Fill((*iter).adc()); meStripTOBLayer6zp_[4] ->Fill((*iter).strip()); }
-                     if ( tTopo->tobModule(id) == 6 ) { meAdcTOBLayer6zp_[5] -> Fill((*iter).adc()); meStripTOBLayer6zp_[5] ->Fill((*iter).strip()); }
-                 }
-
-
-               }
-             }
+  }
+
+  int ndigiwheeltidzp[3];
+  int ndigiwheeltidzm[3];
+
+  for (int i = 0; i < 3; i++) {
+    ndigiwheeltidzp[i] = 0;
+    ndigiwheeltidzm[i] = 0;
+  }
+
+  int ndigiwheelteczp[9];
+  int ndigiwheelteczm[9];
+
+  for (int i = 0; i < 9; i++) {
+    ndigiwheelteczp[i] = 0;
+    ndigiwheelteczm[i] = 0;
+  }
+
+  // LogInfo("EventInfo") << " Run = " << e.id().run() << " Event = " <<
+  // e.id().event();
+  edm::ESHandle<TrackerGeometry> tracker;
+  c.get<TrackerDigiGeometryRecord>().get(tracker);
+
+  std::string digiProducer = "siStripDigis";
+  edm::Handle<edm::DetSetVector<SiStripDigi>> stripDigis;
+  e.getByToken(edmDetSetVector_SiStripDigi_Token_, stripDigis);
+  edm::DetSetVector<SiStripDigi>::const_iterator DSViter = stripDigis->begin();
+  for (; DSViter != stripDigis->end(); DSViter++) {
+    unsigned int id = DSViter->id;
+    DetId detId(id);
+    edm::DetSet<SiStripDigi>::const_iterator begin = DSViter->data.begin();
+    edm::DetSet<SiStripDigi>::const_iterator end = DSViter->data.end();
+    edm::DetSet<SiStripDigi>::const_iterator iter;
+
+    if (detId.subdetId() == StripSubdetector::TIB) {
+      for (iter = begin; iter != end; iter++) {  // loop digis
+        if (tTopo->tibStringInfo(id)[0] == 1) {
+          ++ndigilayertibzm[tTopo->tibLayer(id) - 1];
+          if (tTopo->tibLayer(id) == 1) {
+            if (tTopo->tibStringInfo(id)[1] == 1) {
+              if (tTopo->tibModule(id) == 1) {
+                meAdcTIBLayer1Intzm_[0]->Fill((*iter).adc());
+                meStripTIBLayer1Intzm_[0]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 2) {
+                meAdcTIBLayer1Intzm_[1]->Fill((*iter).adc());
+                meStripTIBLayer1Intzm_[1]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 3) {
+                meAdcTIBLayer1Intzm_[2]->Fill((*iter).adc());
+                meStripTIBLayer1Intzm_[2]->Fill((*iter).strip());
+              }
+            } else {
+              if (tTopo->tibModule(id) == 1) {
+                meAdcTIBLayer1Extzm_[0]->Fill((*iter).adc());
+                meStripTIBLayer1Extzm_[0]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 2) {
+                meAdcTIBLayer1Extzm_[1]->Fill((*iter).adc());
+                meStripTIBLayer1Extzm_[1]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 3) {
+                meAdcTIBLayer1Extzm_[2]->Fill((*iter).adc());
+                meStripTIBLayer1Extzm_[2]->Fill((*iter).strip());
+              }
+            }
+          }
+          if (tTopo->tibLayer(id) == 2) {
+            if (tTopo->tibStringInfo(id)[1] == 1) {
+              if (tTopo->tibModule(id) == 1) {
+                meAdcTIBLayer2Intzm_[0]->Fill((*iter).adc());
+                meStripTIBLayer2Intzm_[0]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 2) {
+                meAdcTIBLayer2Intzm_[1]->Fill((*iter).adc());
+                meStripTIBLayer2Intzm_[1]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 3) {
+                meAdcTIBLayer2Intzm_[2]->Fill((*iter).adc());
+                meStripTIBLayer2Intzm_[2]->Fill((*iter).strip());
+              }
+            } else {
+              if (tTopo->tibModule(id) == 1) {
+                meAdcTIBLayer2Extzm_[0]->Fill((*iter).adc());
+                meStripTIBLayer2Extzm_[0]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 2) {
+                meAdcTIBLayer2Extzm_[1]->Fill((*iter).adc());
+                meStripTIBLayer2Extzm_[1]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 3) {
+                meAdcTIBLayer2Extzm_[2]->Fill((*iter).adc());
+                meStripTIBLayer2Extzm_[2]->Fill((*iter).strip());
+              }
+            }
+          }
+          if (tTopo->tibLayer(id) == 3) {
+            if (tTopo->tibStringInfo(id)[1] == 1) {
+              if (tTopo->tibModule(id) == 1) {
+                meAdcTIBLayer3Intzm_[0]->Fill((*iter).adc());
+                meStripTIBLayer3Intzm_[0]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 2) {
+                meAdcTIBLayer3Intzm_[1]->Fill((*iter).adc());
+                meStripTIBLayer3Intzm_[1]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 3) {
+                meAdcTIBLayer3Intzm_[2]->Fill((*iter).adc());
+                meStripTIBLayer3Intzm_[2]->Fill((*iter).strip());
+              }
+            } else {
+              if (tTopo->tibModule(id) == 1) {
+                meAdcTIBLayer3Extzm_[0]->Fill((*iter).adc());
+                meStripTIBLayer3Extzm_[0]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 2) {
+                meAdcTIBLayer3Extzm_[1]->Fill((*iter).adc());
+                meStripTIBLayer3Extzm_[1]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 3) {
+                meAdcTIBLayer3Extzm_[2]->Fill((*iter).adc());
+                meStripTIBLayer3Extzm_[2]->Fill((*iter).strip());
+              }
+            }
+          }
+          if (tTopo->tibLayer(id) == 4) {
+            if (tTopo->tibStringInfo(id)[1] == 1) {
+              if (tTopo->tibModule(id) == 1) {
+                meAdcTIBLayer4Intzm_[0]->Fill((*iter).adc());
+                meStripTIBLayer4Intzm_[0]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 2) {
+                meAdcTIBLayer4Intzm_[1]->Fill((*iter).adc());
+                meStripTIBLayer4Intzm_[1]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 3) {
+                meAdcTIBLayer4Intzm_[2]->Fill((*iter).adc());
+                meStripTIBLayer4Intzm_[2]->Fill((*iter).strip());
+              }
+            } else {
+              if (tTopo->tibModule(id) == 1) {
+                meAdcTIBLayer4Extzm_[0]->Fill((*iter).adc());
+                meStripTIBLayer4Extzm_[0]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 2) {
+                meAdcTIBLayer4Extzm_[1]->Fill((*iter).adc());
+                meStripTIBLayer4Extzm_[1]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 3) {
+                meAdcTIBLayer4Extzm_[2]->Fill((*iter).adc());
+                meStripTIBLayer4Extzm_[2]->Fill((*iter).strip());
+              }
+            }
+          }
+        } else {
+          ++ndigilayertibzp[tTopo->tibLayer(id) - 1];
+          if (tTopo->tibLayer(id) == 1) {
+            if (tTopo->tibStringInfo(id)[1] == 1) {
+              if (tTopo->tibModule(id) == 1) {
+                meAdcTIBLayer1Intzp_[0]->Fill((*iter).adc());
+                meStripTIBLayer1Intzp_[0]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 2) {
+                meAdcTIBLayer1Intzp_[1]->Fill((*iter).adc());
+                meStripTIBLayer1Intzp_[1]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 3) {
+                meAdcTIBLayer1Intzp_[2]->Fill((*iter).adc());
+                meStripTIBLayer1Intzp_[2]->Fill((*iter).strip());
+              }
+            } else {
+              if (tTopo->tibModule(id) == 1) {
+                meAdcTIBLayer1Extzp_[0]->Fill((*iter).adc());
+                meStripTIBLayer1Extzp_[0]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 2) {
+                meAdcTIBLayer1Extzp_[1]->Fill((*iter).adc());
+                meStripTIBLayer1Extzp_[1]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 3) {
+                meAdcTIBLayer1Extzp_[2]->Fill((*iter).adc());
+                meStripTIBLayer1Extzp_[2]->Fill((*iter).strip());
+              }
+            }
+          }
+          if (tTopo->tibLayer(id) == 2) {
+            if (tTopo->tibStringInfo(id)[1] == 1) {
+              if (tTopo->tibModule(id) == 1) {
+                meAdcTIBLayer2Intzp_[0]->Fill((*iter).adc());
+                meStripTIBLayer2Intzp_[0]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 2) {
+                meAdcTIBLayer2Intzp_[1]->Fill((*iter).adc());
+                meStripTIBLayer2Intzp_[1]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 3) {
+                meAdcTIBLayer2Intzp_[2]->Fill((*iter).adc());
+                meStripTIBLayer2Intzp_[2]->Fill((*iter).strip());
+              }
+            } else {
+              if (tTopo->tibModule(id) == 1) {
+                meAdcTIBLayer2Extzp_[0]->Fill((*iter).adc());
+                meStripTIBLayer2Extzp_[0]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 2) {
+                meAdcTIBLayer2Extzp_[1]->Fill((*iter).adc());
+                meStripTIBLayer2Extzp_[1]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 3) {
+                meAdcTIBLayer2Extzp_[2]->Fill((*iter).adc());
+                meStripTIBLayer2Extzp_[2]->Fill((*iter).strip());
+              }
+            }
+          }
+          if (tTopo->tibLayer(id) == 3) {
+            if (tTopo->tibStringInfo(id)[1] == 1) {
+              if (tTopo->tibModule(id) == 1) {
+                meAdcTIBLayer3Intzp_[0]->Fill((*iter).adc());
+                meStripTIBLayer3Intzp_[0]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 2) {
+                meAdcTIBLayer3Intzp_[1]->Fill((*iter).adc());
+                meStripTIBLayer3Intzp_[1]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 3) {
+                meAdcTIBLayer3Intzp_[2]->Fill((*iter).adc());
+                meStripTIBLayer3Intzp_[2]->Fill((*iter).strip());
+              }
+            } else {
+              if (tTopo->tibModule(id) == 1) {
+                meAdcTIBLayer3Extzp_[0]->Fill((*iter).adc());
+                meStripTIBLayer3Extzp_[0]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 2) {
+                meAdcTIBLayer3Extzp_[1]->Fill((*iter).adc());
+                meStripTIBLayer3Extzp_[1]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 3) {
+                meAdcTIBLayer3Extzp_[2]->Fill((*iter).adc());
+                meStripTIBLayer3Extzp_[2]->Fill((*iter).strip());
+              }
+            }
+          }
+          if (tTopo->tibLayer(id) == 4) {
+            if (tTopo->tibStringInfo(id)[1] == 1) {
+              if (tTopo->tibModule(id) == 1) {
+                meAdcTIBLayer4Intzp_[0]->Fill((*iter).adc());
+                meStripTIBLayer4Intzp_[0]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 2) {
+                meAdcTIBLayer4Intzp_[1]->Fill((*iter).adc());
+                meStripTIBLayer4Intzp_[1]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 3) {
+                meAdcTIBLayer4Intzp_[2]->Fill((*iter).adc());
+                meStripTIBLayer4Intzp_[2]->Fill((*iter).strip());
+              }
+            } else {
+              if (tTopo->tibModule(id) == 1) {
+                meAdcTIBLayer4Extzp_[0]->Fill((*iter).adc());
+                meStripTIBLayer4Extzp_[0]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 2) {
+                meAdcTIBLayer4Extzp_[1]->Fill((*iter).adc());
+                meStripTIBLayer4Extzp_[1]->Fill((*iter).strip());
+              }
+              if (tTopo->tibModule(id) == 3) {
+                meAdcTIBLayer4Extzp_[2]->Fill((*iter).adc());
+                meStripTIBLayer4Extzp_[2]->Fill((*iter).strip());
+              }
+            }
+          }
         }
-   
-        if (detId.subdetId()==StripSubdetector::TID) {
-              
-            for ( iter = begin ; iter != end; iter++ ) {
-              if( tTopo->tidSide(id) == 1){
-                 ++ndigiwheeltidzm[tTopo->tidWheel(id)-1];
-                if( tTopo->tidWheel(id) == 1 ) {
-                   if(tTopo->tidRing(id)== 1) { meAdcTIDWheel1zm_[0] -> Fill((*iter).adc()); meStripTIDWheel1zm_[0] ->Fill((*iter).strip());}
-                   if(tTopo->tidRing(id)== 2) { meAdcTIDWheel1zm_[1] -> Fill((*iter).adc()); meStripTIDWheel1zm_[1] ->Fill((*iter).strip());}
-                   if(tTopo->tidRing(id)== 3) { meAdcTIDWheel1zm_[2] -> Fill((*iter).adc()); meStripTIDWheel1zm_[2] ->Fill((*iter).strip());}
-                }
-                if( tTopo->tidWheel(id) == 2 ) {
-                   if(tTopo->tidRing(id)== 1) { meAdcTIDWheel2zm_[0] -> Fill((*iter).adc()); meStripTIDWheel2zm_[0] ->Fill((*iter).strip());}
-                   if(tTopo->tidRing(id)== 2) { meAdcTIDWheel2zm_[1] -> Fill((*iter).adc()); meStripTIDWheel2zm_[1] ->Fill((*iter).strip());}
-                   if(tTopo->tidRing(id)== 3) { meAdcTIDWheel2zm_[2] -> Fill((*iter).adc()); meStripTIDWheel2zm_[2] ->Fill((*iter).strip());}
-                }
-                if( tTopo->tidWheel(id) == 3 ) {
-                   if(tTopo->tidRing(id)== 1) { meAdcTIDWheel3zm_[0] -> Fill((*iter).adc()); meStripTIDWheel3zm_[0] ->Fill((*iter).strip());}
-                   if(tTopo->tidRing(id)== 2) { meAdcTIDWheel3zm_[1] -> Fill((*iter).adc()); meStripTIDWheel3zm_[1] ->Fill((*iter).strip());}
-                   if(tTopo->tidRing(id)== 3) { meAdcTIDWheel3zm_[2] -> Fill((*iter).adc()); meStripTIDWheel3zm_[2] ->Fill((*iter).strip());}
-                }
-
-              }else{
-                ++ndigiwheeltidzp[tTopo->tidWheel(id)-1];
-                if( tTopo->tidWheel(id) == 1 ) { 
-                   if(tTopo->tidRing(id)== 1) { meAdcTIDWheel1zp_[0] -> Fill((*iter).adc()); meStripTIDWheel1zp_[0] ->Fill((*iter).strip());}
-                   if(tTopo->tidRing(id)== 2) { meAdcTIDWheel1zp_[1] -> Fill((*iter).adc()); meStripTIDWheel1zp_[1] ->Fill((*iter).strip());}
-                   if(tTopo->tidRing(id)== 3) { meAdcTIDWheel1zp_[2] -> Fill((*iter).adc()); meStripTIDWheel1zp_[2] ->Fill((*iter).strip());}
-                }  
-                if( tTopo->tidWheel(id) == 2 ) {
-                   if(tTopo->tidRing(id)== 1) { meAdcTIDWheel2zp_[0] -> Fill((*iter).adc()); meStripTIDWheel2zp_[0] ->Fill((*iter).strip());}
-                   if(tTopo->tidRing(id)== 2) { meAdcTIDWheel2zp_[1] -> Fill((*iter).adc()); meStripTIDWheel2zp_[1] ->Fill((*iter).strip());}
-                   if(tTopo->tidRing(id)== 3) { meAdcTIDWheel2zp_[2] -> Fill((*iter).adc()); meStripTIDWheel2zp_[2] ->Fill((*iter).strip());}
-                }
-                if( tTopo->tidWheel(id) == 3 ) {
-                   if(tTopo->tidRing(id)== 1) { meAdcTIDWheel3zp_[0] -> Fill((*iter).adc()); meStripTIDWheel3zp_[0] ->Fill((*iter).strip());}
-                   if(tTopo->tidRing(id)== 2) { meAdcTIDWheel3zp_[1] -> Fill((*iter).adc()); meStripTIDWheel3zp_[1] ->Fill((*iter).strip());}
-                   if(tTopo->tidRing(id)== 3) { meAdcTIDWheel3zp_[2] -> Fill((*iter).adc()); meStripTIDWheel3zp_[2] ->Fill((*iter).strip());}
-                }
-    
-              } 
-            }
-       }
-        if (detId.subdetId()==StripSubdetector::TEC) {
-            
-            for ( iter = begin ; iter != end; iter++ ) {
-              if(tTopo->tecSide(id) == 1) {
-                ++ndigiwheelteczm[tTopo->tecWheel(id)-1];
-                if( tTopo->tecWheel(id) == 1 ) {
-                   if ( tTopo->tecRing(id) == 1 ) { meAdcTECWheel1zm_[0] -> Fill((*iter).adc()); meStripTECWheel1zm_[0] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 2 ) { meAdcTECWheel1zm_[1] -> Fill((*iter).adc()); meStripTECWheel1zm_[1] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 3 ) { meAdcTECWheel1zm_[2] -> Fill((*iter).adc()); meStripTECWheel1zm_[2] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 4 ) { meAdcTECWheel1zm_[3] -> Fill((*iter).adc()); meStripTECWheel1zm_[3] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 5 ) { meAdcTECWheel1zm_[4] -> Fill((*iter).adc()); meStripTECWheel1zm_[4] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 6 ) { meAdcTECWheel1zm_[5] -> Fill((*iter).adc()); meStripTECWheel1zm_[5] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 7 ) { meAdcTECWheel1zm_[6] -> Fill((*iter).adc()); meStripTECWheel1zm_[6] ->Fill((*iter).strip()); }
-                }
-                if( tTopo->tecWheel(id) == 2 ) {
-                   if ( tTopo->tecRing(id) == 1 ) { meAdcTECWheel2zm_[0] -> Fill((*iter).adc()); meStripTECWheel2zm_[0] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 2 ) { meAdcTECWheel2zm_[1] -> Fill((*iter).adc()); meStripTECWheel2zm_[1] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 3 ) { meAdcTECWheel2zm_[2] -> Fill((*iter).adc()); meStripTECWheel2zm_[2] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 4 ) { meAdcTECWheel2zm_[3] -> Fill((*iter).adc()); meStripTECWheel2zm_[3] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 5 ) { meAdcTECWheel2zm_[4] -> Fill((*iter).adc()); meStripTECWheel2zm_[4] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 6 ) { meAdcTECWheel2zm_[5] -> Fill((*iter).adc()); meStripTECWheel2zm_[5] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 7 ) { meAdcTECWheel2zm_[6] -> Fill((*iter).adc()); meStripTECWheel2zm_[6] ->Fill((*iter).strip()); }
-                }
-                if( tTopo->tecWheel(id) == 3 ) {
-                   if ( tTopo->tecRing(id) == 1 ) { meAdcTECWheel3zm_[0] -> Fill((*iter).adc()); meStripTECWheel3zm_[0] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 2 ) { meAdcTECWheel3zm_[1] -> Fill((*iter).adc()); meStripTECWheel3zm_[1] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 3 ) { meAdcTECWheel3zm_[2] -> Fill((*iter).adc()); meStripTECWheel3zm_[2] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 4 ) { meAdcTECWheel3zm_[3] -> Fill((*iter).adc()); meStripTECWheel3zm_[3] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 5 ) { meAdcTECWheel3zm_[4] -> Fill((*iter).adc()); meStripTECWheel3zm_[4] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 6 ) { meAdcTECWheel3zm_[5] -> Fill((*iter).adc()); meStripTECWheel3zm_[5] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 7 ) { meAdcTECWheel3zm_[6] -> Fill((*iter).adc()); meStripTECWheel3zm_[6] ->Fill((*iter).strip()); }
-                }
-                if( tTopo->tecWheel(id) == 4 ) {
-                   if ( tTopo->tecRing(id) == 2 ) { meAdcTECWheel4zm_[0] -> Fill((*iter).adc()); meStripTECWheel4zm_[0] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 3 ) { meAdcTECWheel4zm_[1] -> Fill((*iter).adc()); meStripTECWheel4zm_[1] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 4 ) { meAdcTECWheel4zm_[2] -> Fill((*iter).adc()); meStripTECWheel4zm_[2] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 5 ) { meAdcTECWheel4zm_[3] -> Fill((*iter).adc()); meStripTECWheel4zm_[3] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 6 ) { meAdcTECWheel4zm_[4] -> Fill((*iter).adc()); meStripTECWheel4zm_[4] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 7 ) { meAdcTECWheel4zm_[5] -> Fill((*iter).adc()); meStripTECWheel4zm_[5] ->Fill((*iter).strip()); }
-                }
-                if( tTopo->tecWheel(id) == 5 ) {
-                   if ( tTopo->tecRing(id) == 2 ) { meAdcTECWheel5zm_[0] -> Fill((*iter).adc()); meStripTECWheel5zm_[0] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 3 ) { meAdcTECWheel5zm_[1] -> Fill((*iter).adc()); meStripTECWheel5zm_[1] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 4 ) { meAdcTECWheel5zm_[2] -> Fill((*iter).adc()); meStripTECWheel5zm_[2] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 5 ) { meAdcTECWheel5zm_[3] -> Fill((*iter).adc()); meStripTECWheel5zm_[3] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 6 ) { meAdcTECWheel5zm_[4] -> Fill((*iter).adc()); meStripTECWheel5zm_[4] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 7 ) { meAdcTECWheel5zm_[5] -> Fill((*iter).adc()); meStripTECWheel5zm_[5] ->Fill((*iter).strip()); }
-                }
-                if( tTopo->tecWheel(id) == 6 ) {
-                   if ( tTopo->tecRing(id) == 2 ) { meAdcTECWheel6zm_[0] -> Fill((*iter).adc()); meStripTECWheel6zm_[0] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 3 ) { meAdcTECWheel6zm_[1] -> Fill((*iter).adc()); meStripTECWheel6zm_[1] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 4 ) { meAdcTECWheel6zm_[2] -> Fill((*iter).adc()); meStripTECWheel6zm_[2] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 5 ) { meAdcTECWheel6zm_[3] -> Fill((*iter).adc()); meStripTECWheel6zm_[3] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 6 ) { meAdcTECWheel6zm_[4] -> Fill((*iter).adc()); meStripTECWheel6zm_[4] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 7 ) { meAdcTECWheel6zm_[5] -> Fill((*iter).adc()); meStripTECWheel6zm_[5] ->Fill((*iter).strip()); }
-                }
-                if( tTopo->tecWheel(id) == 7 ) {
-                   if ( tTopo->tecRing(id) == 3 ) { meAdcTECWheel7zm_[0] -> Fill((*iter).adc()); meStripTECWheel7zm_[0] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 4 ) { meAdcTECWheel7zm_[1] -> Fill((*iter).adc()); meStripTECWheel7zm_[1] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 5 ) { meAdcTECWheel7zm_[2] -> Fill((*iter).adc()); meStripTECWheel7zm_[2] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 6 ) { meAdcTECWheel7zm_[3] -> Fill((*iter).adc()); meStripTECWheel7zm_[3] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 7 ) { meAdcTECWheel7zm_[4] -> Fill((*iter).adc()); meStripTECWheel7zm_[4] ->Fill((*iter).strip()); }
-                }
-                if( tTopo->tecWheel(id) == 8 ) {
-                   if ( tTopo->tecRing(id) == 3 ) { meAdcTECWheel8zm_[0] -> Fill((*iter).adc()); meStripTECWheel8zm_[0] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 4 ) { meAdcTECWheel8zm_[1] -> Fill((*iter).adc()); meStripTECWheel8zm_[1] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 5 ) { meAdcTECWheel8zm_[2] -> Fill((*iter).adc()); meStripTECWheel8zm_[2] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 6 ) { meAdcTECWheel8zm_[3] -> Fill((*iter).adc()); meStripTECWheel8zm_[3] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 7 ) { meAdcTECWheel8zm_[4] -> Fill((*iter).adc()); meStripTECWheel8zm_[4] ->Fill((*iter).strip()); }
-                }
-                if( tTopo->tecWheel(id) == 9 ) {
-                   if ( tTopo->tecRing(id) == 4 ) { meAdcTECWheel9zm_[0] -> Fill((*iter).adc()); meStripTECWheel9zm_[0] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 5 ) { meAdcTECWheel9zm_[1] -> Fill((*iter).adc()); meStripTECWheel9zm_[1] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 6 ) { meAdcTECWheel9zm_[2] -> Fill((*iter).adc()); meStripTECWheel9zm_[2] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 7 ) { meAdcTECWheel9zm_[3] -> Fill((*iter).adc()); meStripTECWheel9zm_[3] ->Fill((*iter).strip()); }
-                }
-              }else {
-                ++ndigiwheelteczp[tTopo->tecWheel(id)-1];
-                if( tTopo->tecWheel(id) == 1 ) {
-                   if ( tTopo->tecRing(id) == 1 ) { meAdcTECWheel1zp_[0] -> Fill((*iter).adc()); meStripTECWheel1zp_[0] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 2 ) { meAdcTECWheel1zp_[1] -> Fill((*iter).adc()); meStripTECWheel1zp_[1] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 3 ) { meAdcTECWheel1zp_[2] -> Fill((*iter).adc()); meStripTECWheel1zp_[2] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 4 ) { meAdcTECWheel1zp_[3] -> Fill((*iter).adc()); meStripTECWheel1zp_[3] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 5 ) { meAdcTECWheel1zp_[4] -> Fill((*iter).adc()); meStripTECWheel1zp_[4] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 6 ) { meAdcTECWheel1zp_[5] -> Fill((*iter).adc()); meStripTECWheel1zp_[5] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 7 ) { meAdcTECWheel1zp_[6] -> Fill((*iter).adc()); meStripTECWheel1zp_[6] ->Fill((*iter).strip()); }
-                }
-                if( tTopo->tecWheel(id) == 2 ) {
-                   if ( tTopo->tecRing(id) == 1 ) { meAdcTECWheel2zp_[0] -> Fill((*iter).adc()); meStripTECWheel2zp_[0] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 2 ) { meAdcTECWheel2zp_[1] -> Fill((*iter).adc()); meStripTECWheel2zp_[1] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 3 ) { meAdcTECWheel2zp_[2] -> Fill((*iter).adc()); meStripTECWheel2zp_[2] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 4 ) { meAdcTECWheel2zp_[3] -> Fill((*iter).adc()); meStripTECWheel2zp_[3] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 5 ) { meAdcTECWheel2zp_[4] -> Fill((*iter).adc()); meStripTECWheel2zp_[4] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 6 ) { meAdcTECWheel2zp_[5] -> Fill((*iter).adc()); meStripTECWheel2zp_[5] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 7 ) { meAdcTECWheel2zp_[6] -> Fill((*iter).adc()); meStripTECWheel2zp_[6] ->Fill((*iter).strip()); }
-                }
-                if( tTopo->tecWheel(id) == 3 ) {
-                   if ( tTopo->tecRing(id) == 1 ) { meAdcTECWheel3zp_[0] -> Fill((*iter).adc()); meStripTECWheel3zp_[0] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 2 ) { meAdcTECWheel3zp_[1] -> Fill((*iter).adc()); meStripTECWheel3zp_[1] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 3 ) { meAdcTECWheel3zp_[2] -> Fill((*iter).adc()); meStripTECWheel3zp_[2] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 4 ) { meAdcTECWheel3zp_[3] -> Fill((*iter).adc()); meStripTECWheel3zp_[3] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 5 ) { meAdcTECWheel3zp_[4] -> Fill((*iter).adc()); meStripTECWheel3zp_[4] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 6 ) { meAdcTECWheel3zp_[5] -> Fill((*iter).adc()); meStripTECWheel3zp_[5] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 7 ) { meAdcTECWheel3zp_[6] -> Fill((*iter).adc()); meStripTECWheel3zp_[6] ->Fill((*iter).strip()); }
-                }
-                if( tTopo->tecWheel(id) == 4 ) {
-                   if ( tTopo->tecRing(id) == 2 ) { meAdcTECWheel4zp_[0] -> Fill((*iter).adc()); meStripTECWheel4zp_[0] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 3 ) { meAdcTECWheel4zp_[1] -> Fill((*iter).adc()); meStripTECWheel4zp_[1] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 4 ) { meAdcTECWheel4zp_[2] -> Fill((*iter).adc()); meStripTECWheel4zp_[2] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 5 ) { meAdcTECWheel4zp_[3] -> Fill((*iter).adc()); meStripTECWheel4zp_[3] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 6 ) { meAdcTECWheel4zp_[4] -> Fill((*iter).adc()); meStripTECWheel4zp_[4] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 7 ) { meAdcTECWheel4zp_[5] -> Fill((*iter).adc()); meStripTECWheel4zp_[5] ->Fill((*iter).strip()); }
-                }
-                if( tTopo->tecWheel(id) == 5 ) {
-                   if ( tTopo->tecRing(id) == 2 ) { meAdcTECWheel5zp_[0] -> Fill((*iter).adc()); meStripTECWheel5zp_[0] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 3 ) { meAdcTECWheel5zp_[1] -> Fill((*iter).adc()); meStripTECWheel5zp_[1] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 4 ) { meAdcTECWheel5zp_[2] -> Fill((*iter).adc()); meStripTECWheel5zp_[2] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 5 ) { meAdcTECWheel5zp_[3] -> Fill((*iter).adc()); meStripTECWheel5zp_[3] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 6 ) { meAdcTECWheel5zp_[4] -> Fill((*iter).adc()); meStripTECWheel5zp_[4] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 7 ) { meAdcTECWheel5zp_[5] -> Fill((*iter).adc()); meStripTECWheel5zp_[5] ->Fill((*iter).strip()); }
-                }
-                if( tTopo->tecWheel(id) == 6 ) {
-                   if ( tTopo->tecRing(id) == 2 ) { meAdcTECWheel6zp_[0] -> Fill((*iter).adc()); meStripTECWheel6zp_[0] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 3 ) { meAdcTECWheel6zp_[1] -> Fill((*iter).adc()); meStripTECWheel6zp_[1] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 4 ) { meAdcTECWheel6zp_[2] -> Fill((*iter).adc()); meStripTECWheel6zp_[2] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 5 ) { meAdcTECWheel6zp_[3] -> Fill((*iter).adc()); meStripTECWheel6zp_[3] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 6 ) { meAdcTECWheel6zp_[4] -> Fill((*iter).adc()); meStripTECWheel6zp_[4] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 7 ) { meAdcTECWheel6zp_[5] -> Fill((*iter).adc()); meStripTECWheel6zp_[5] ->Fill((*iter).strip()); }
-                }
-                if( tTopo->tecWheel(id) == 7 ) {
-                   if ( tTopo->tecRing(id) == 3 ) { meAdcTECWheel7zp_[0] -> Fill((*iter).adc()); meStripTECWheel7zp_[0] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 4 ) { meAdcTECWheel7zp_[1] -> Fill((*iter).adc()); meStripTECWheel7zp_[1] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 5 ) { meAdcTECWheel7zp_[2] -> Fill((*iter).adc()); meStripTECWheel7zp_[2] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 6 ) { meAdcTECWheel7zp_[3] -> Fill((*iter).adc()); meStripTECWheel7zp_[3] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 7 ) { meAdcTECWheel7zp_[4] -> Fill((*iter).adc()); meStripTECWheel7zp_[4] ->Fill((*iter).strip()); }
-                }
-                if( tTopo->tecWheel(id) == 8 ) {
-                   if ( tTopo->tecRing(id) == 3 ) { meAdcTECWheel8zp_[0] -> Fill((*iter).adc()); meStripTECWheel8zp_[0] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 4 ) { meAdcTECWheel8zp_[1] -> Fill((*iter).adc()); meStripTECWheel8zp_[1] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 5 ) { meAdcTECWheel8zp_[2] -> Fill((*iter).adc()); meStripTECWheel8zp_[2] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 6 ) { meAdcTECWheel8zp_[3] -> Fill((*iter).adc()); meStripTECWheel8zp_[3] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 7 ) { meAdcTECWheel8zp_[4] -> Fill((*iter).adc()); meStripTECWheel8zp_[4] ->Fill((*iter).strip()); }
-                }
-                if( tTopo->tecWheel(id) == 9 ) {
-                   if ( tTopo->tecRing(id) == 4 ) { meAdcTECWheel9zp_[0] -> Fill((*iter).adc()); meStripTECWheel9zp_[0] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 5 ) { meAdcTECWheel9zp_[1] -> Fill((*iter).adc()); meStripTECWheel9zp_[1] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 6 ) { meAdcTECWheel9zp_[2] -> Fill((*iter).adc()); meStripTECWheel9zp_[2] ->Fill((*iter).strip()); }
-                   if ( tTopo->tecRing(id) == 7 ) { meAdcTECWheel9zp_[3] -> Fill((*iter).adc()); meStripTECWheel9zp_[3] ->Fill((*iter).strip()); }
-                }
-             }
-           }
-       }
-
- }
-  
-  for ( int i =0; i< 4; i++ ) {
-     meNDigiTIBLayerzm_[i]->Fill(ndigilayertibzm[i]);
-     meNDigiTIBLayerzp_[i]->Fill(ndigilayertibzp[i]);
- }
- 
- for ( int i =0; i< 6; i++ ) {
-     meNDigiTOBLayerzm_[i]->Fill(ndigilayertobzm[i]);
-     meNDigiTOBLayerzp_[i]->Fill(ndigilayertobzp[i]);
- }
-
-for ( int i =0; i< 3; i++ ) {
-     meNDigiTIDWheelzm_[i]->Fill(ndigiwheeltidzm[i]);
-     meNDigiTIDWheelzp_[i]->Fill(ndigiwheeltidzp[i]);
- }
-
-for ( int i =0; i< 9; i++ ) {
-     meNDigiTECWheelzm_[i]->Fill(ndigiwheelteczm[i]);
-     meNDigiTECWheelzp_[i]->Fill(ndigiwheelteczp[i]);
- }
-
- 
+      }
+    }
+    if (detId.subdetId() == StripSubdetector::TOB) {
+      for (iter = begin; iter != end; iter++) {  // loop digis
+        if (tTopo->tobRodInfo(id)[0] == 1) {
+          ++ndigilayertobzm[tTopo->tobLayer(id) - 1];
+          if (tTopo->tobLayer(id) == 1) {
+            if (tTopo->tobModule(id) == 1) {
+              meAdcTOBLayer1zm_[0]->Fill((*iter).adc());
+              meStripTOBLayer1zm_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 2) {
+              meAdcTOBLayer1zm_[1]->Fill((*iter).adc());
+              meStripTOBLayer1zm_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 3) {
+              meAdcTOBLayer1zm_[2]->Fill((*iter).adc());
+              meStripTOBLayer1zm_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 4) {
+              meAdcTOBLayer1zm_[3]->Fill((*iter).adc());
+              meStripTOBLayer1zm_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 5) {
+              meAdcTOBLayer1zm_[4]->Fill((*iter).adc());
+              meStripTOBLayer1zm_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 6) {
+              meAdcTOBLayer1zm_[5]->Fill((*iter).adc());
+              meStripTOBLayer1zm_[5]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tobLayer(id) == 2) {
+            if (tTopo->tobModule(id) == 1) {
+              meAdcTOBLayer2zm_[0]->Fill((*iter).adc());
+              meStripTOBLayer2zm_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 2) {
+              meAdcTOBLayer2zm_[1]->Fill((*iter).adc());
+              meStripTOBLayer2zm_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 3) {
+              meAdcTOBLayer2zm_[2]->Fill((*iter).adc());
+              meStripTOBLayer2zm_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 4) {
+              meAdcTOBLayer2zm_[3]->Fill((*iter).adc());
+              meStripTOBLayer2zm_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 5) {
+              meAdcTOBLayer2zm_[4]->Fill((*iter).adc());
+              meStripTOBLayer2zm_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 6) {
+              meAdcTOBLayer2zm_[5]->Fill((*iter).adc());
+              meStripTOBLayer2zm_[5]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tobLayer(id) == 3) {
+            if (tTopo->tobModule(id) == 1) {
+              meAdcTOBLayer3zm_[0]->Fill((*iter).adc());
+              meStripTOBLayer3zm_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 2) {
+              meAdcTOBLayer3zm_[1]->Fill((*iter).adc());
+              meStripTOBLayer3zm_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 3) {
+              meAdcTOBLayer3zm_[2]->Fill((*iter).adc());
+              meStripTOBLayer3zm_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 4) {
+              meAdcTOBLayer3zm_[3]->Fill((*iter).adc());
+              meStripTOBLayer3zm_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 5) {
+              meAdcTOBLayer3zm_[4]->Fill((*iter).adc());
+              meStripTOBLayer3zm_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 6) {
+              meAdcTOBLayer3zm_[5]->Fill((*iter).adc());
+              meStripTOBLayer3zm_[5]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tobLayer(id) == 4) {
+            if (tTopo->tobModule(id) == 1) {
+              meAdcTOBLayer4zm_[0]->Fill((*iter).adc());
+              meStripTOBLayer4zm_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 2) {
+              meAdcTOBLayer4zm_[1]->Fill((*iter).adc());
+              meStripTOBLayer4zm_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 3) {
+              meAdcTOBLayer4zm_[2]->Fill((*iter).adc());
+              meStripTOBLayer4zm_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 4) {
+              meAdcTOBLayer4zm_[3]->Fill((*iter).adc());
+              meStripTOBLayer4zm_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 5) {
+              meAdcTOBLayer4zm_[4]->Fill((*iter).adc());
+              meStripTOBLayer4zm_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 6) {
+              meAdcTOBLayer4zm_[5]->Fill((*iter).adc());
+              meStripTOBLayer4zm_[5]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tobLayer(id) == 5) {
+            if (tTopo->tobModule(id) == 1) {
+              meAdcTOBLayer5zm_[0]->Fill((*iter).adc());
+              meStripTOBLayer5zm_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 2) {
+              meAdcTOBLayer5zm_[1]->Fill((*iter).adc());
+              meStripTOBLayer5zm_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 3) {
+              meAdcTOBLayer5zm_[2]->Fill((*iter).adc());
+              meStripTOBLayer5zm_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 4) {
+              meAdcTOBLayer5zm_[3]->Fill((*iter).adc());
+              meStripTOBLayer5zm_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 5) {
+              meAdcTOBLayer5zm_[4]->Fill((*iter).adc());
+              meStripTOBLayer5zm_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 6) {
+              meAdcTOBLayer5zm_[5]->Fill((*iter).adc());
+              meStripTOBLayer5zm_[5]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tobLayer(id) == 6) {
+            if (tTopo->tobModule(id) == 1) {
+              meAdcTOBLayer6zm_[0]->Fill((*iter).adc());
+              meStripTOBLayer6zm_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 2) {
+              meAdcTOBLayer6zm_[1]->Fill((*iter).adc());
+              meStripTOBLayer6zm_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 3) {
+              meAdcTOBLayer6zm_[2]->Fill((*iter).adc());
+              meStripTOBLayer6zm_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 4) {
+              meAdcTOBLayer6zm_[3]->Fill((*iter).adc());
+              meStripTOBLayer6zm_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 5) {
+              meAdcTOBLayer6zm_[4]->Fill((*iter).adc());
+              meStripTOBLayer6zm_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 6) {
+              meAdcTOBLayer6zm_[5]->Fill((*iter).adc());
+              meStripTOBLayer6zm_[5]->Fill((*iter).strip());
+            }
+          }
 
-}
+        } else {
+          ++ndigilayertobzp[tTopo->tobLayer(id) - 1];
+          if (tTopo->tobLayer(id) == 1) {
+            if (tTopo->tobModule(id) == 1) {
+              meAdcTOBLayer1zp_[0]->Fill((*iter).adc());
+              meStripTOBLayer1zp_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 2) {
+              meAdcTOBLayer1zp_[1]->Fill((*iter).adc());
+              meStripTOBLayer1zp_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 3) {
+              meAdcTOBLayer1zp_[2]->Fill((*iter).adc());
+              meStripTOBLayer1zp_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 4) {
+              meAdcTOBLayer1zp_[3]->Fill((*iter).adc());
+              meStripTOBLayer1zp_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 5) {
+              meAdcTOBLayer1zp_[4]->Fill((*iter).adc());
+              meStripTOBLayer1zp_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 6) {
+              meAdcTOBLayer1zp_[5]->Fill((*iter).adc());
+              meStripTOBLayer1zp_[5]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tobLayer(id) == 2) {
+            if (tTopo->tobModule(id) == 1) {
+              meAdcTOBLayer2zp_[0]->Fill((*iter).adc());
+              meStripTOBLayer2zp_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 2) {
+              meAdcTOBLayer2zp_[1]->Fill((*iter).adc());
+              meStripTOBLayer2zp_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 3) {
+              meAdcTOBLayer2zp_[2]->Fill((*iter).adc());
+              meStripTOBLayer2zp_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 4) {
+              meAdcTOBLayer2zp_[3]->Fill((*iter).adc());
+              meStripTOBLayer2zp_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 5) {
+              meAdcTOBLayer2zp_[4]->Fill((*iter).adc());
+              meStripTOBLayer2zp_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 6) {
+              meAdcTOBLayer2zp_[5]->Fill((*iter).adc());
+              meStripTOBLayer2zp_[5]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tobLayer(id) == 3) {
+            if (tTopo->tobModule(id) == 1) {
+              meAdcTOBLayer3zp_[0]->Fill((*iter).adc());
+              meStripTOBLayer3zp_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 2) {
+              meAdcTOBLayer3zp_[1]->Fill((*iter).adc());
+              meStripTOBLayer3zp_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 3) {
+              meAdcTOBLayer3zp_[2]->Fill((*iter).adc());
+              meStripTOBLayer3zp_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 4) {
+              meAdcTOBLayer3zp_[3]->Fill((*iter).adc());
+              meStripTOBLayer3zp_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 5) {
+              meAdcTOBLayer3zp_[4]->Fill((*iter).adc());
+              meStripTOBLayer3zp_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 6) {
+              meAdcTOBLayer3zp_[5]->Fill((*iter).adc());
+              meStripTOBLayer3zp_[5]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tobLayer(id) == 4) {
+            if (tTopo->tobModule(id) == 1) {
+              meAdcTOBLayer4zp_[0]->Fill((*iter).adc());
+              meStripTOBLayer4zp_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 2) {
+              meAdcTOBLayer4zp_[1]->Fill((*iter).adc());
+              meStripTOBLayer4zp_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 3) {
+              meAdcTOBLayer4zp_[2]->Fill((*iter).adc());
+              meStripTOBLayer4zp_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 4) {
+              meAdcTOBLayer4zp_[3]->Fill((*iter).adc());
+              meStripTOBLayer4zp_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 5) {
+              meAdcTOBLayer4zp_[4]->Fill((*iter).adc());
+              meStripTOBLayer4zp_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 6) {
+              meAdcTOBLayer4zp_[5]->Fill((*iter).adc());
+              meStripTOBLayer4zp_[5]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tobLayer(id) == 5) {
+            if (tTopo->tobModule(id) == 1) {
+              meAdcTOBLayer5zp_[0]->Fill((*iter).adc());
+              meStripTOBLayer5zp_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 2) {
+              meAdcTOBLayer5zp_[1]->Fill((*iter).adc());
+              meStripTOBLayer5zp_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 3) {
+              meAdcTOBLayer5zp_[2]->Fill((*iter).adc());
+              meStripTOBLayer5zp_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 4) {
+              meAdcTOBLayer5zp_[3]->Fill((*iter).adc());
+              meStripTOBLayer5zp_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 5) {
+              meAdcTOBLayer5zp_[4]->Fill((*iter).adc());
+              meStripTOBLayer5zp_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 6) {
+              meAdcTOBLayer5zp_[5]->Fill((*iter).adc());
+              meStripTOBLayer5zp_[5]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tobLayer(id) == 6) {
+            if (tTopo->tobModule(id) == 1) {
+              meAdcTOBLayer6zp_[0]->Fill((*iter).adc());
+              meStripTOBLayer6zp_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 2) {
+              meAdcTOBLayer6zp_[1]->Fill((*iter).adc());
+              meStripTOBLayer6zp_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 3) {
+              meAdcTOBLayer6zp_[2]->Fill((*iter).adc());
+              meStripTOBLayer6zp_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 4) {
+              meAdcTOBLayer6zp_[3]->Fill((*iter).adc());
+              meStripTOBLayer6zp_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 5) {
+              meAdcTOBLayer6zp_[4]->Fill((*iter).adc());
+              meStripTOBLayer6zp_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tobModule(id) == 6) {
+              meAdcTOBLayer6zp_[5]->Fill((*iter).adc());
+              meStripTOBLayer6zp_[5]->Fill((*iter).strip());
+            }
+          }
+        }
+      }
+    }
+
+    if (detId.subdetId() == StripSubdetector::TID) {
+      for (iter = begin; iter != end; iter++) {
+        if (tTopo->tidSide(id) == 1) {
+          ++ndigiwheeltidzm[tTopo->tidWheel(id) - 1];
+          if (tTopo->tidWheel(id) == 1) {
+            if (tTopo->tidRing(id) == 1) {
+              meAdcTIDWheel1zm_[0]->Fill((*iter).adc());
+              meStripTIDWheel1zm_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tidRing(id) == 2) {
+              meAdcTIDWheel1zm_[1]->Fill((*iter).adc());
+              meStripTIDWheel1zm_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tidRing(id) == 3) {
+              meAdcTIDWheel1zm_[2]->Fill((*iter).adc());
+              meStripTIDWheel1zm_[2]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tidWheel(id) == 2) {
+            if (tTopo->tidRing(id) == 1) {
+              meAdcTIDWheel2zm_[0]->Fill((*iter).adc());
+              meStripTIDWheel2zm_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tidRing(id) == 2) {
+              meAdcTIDWheel2zm_[1]->Fill((*iter).adc());
+              meStripTIDWheel2zm_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tidRing(id) == 3) {
+              meAdcTIDWheel2zm_[2]->Fill((*iter).adc());
+              meStripTIDWheel2zm_[2]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tidWheel(id) == 3) {
+            if (tTopo->tidRing(id) == 1) {
+              meAdcTIDWheel3zm_[0]->Fill((*iter).adc());
+              meStripTIDWheel3zm_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tidRing(id) == 2) {
+              meAdcTIDWheel3zm_[1]->Fill((*iter).adc());
+              meStripTIDWheel3zm_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tidRing(id) == 3) {
+              meAdcTIDWheel3zm_[2]->Fill((*iter).adc());
+              meStripTIDWheel3zm_[2]->Fill((*iter).strip());
+            }
+          }
+
+        } else {
+          ++ndigiwheeltidzp[tTopo->tidWheel(id) - 1];
+          if (tTopo->tidWheel(id) == 1) {
+            if (tTopo->tidRing(id) == 1) {
+              meAdcTIDWheel1zp_[0]->Fill((*iter).adc());
+              meStripTIDWheel1zp_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tidRing(id) == 2) {
+              meAdcTIDWheel1zp_[1]->Fill((*iter).adc());
+              meStripTIDWheel1zp_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tidRing(id) == 3) {
+              meAdcTIDWheel1zp_[2]->Fill((*iter).adc());
+              meStripTIDWheel1zp_[2]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tidWheel(id) == 2) {
+            if (tTopo->tidRing(id) == 1) {
+              meAdcTIDWheel2zp_[0]->Fill((*iter).adc());
+              meStripTIDWheel2zp_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tidRing(id) == 2) {
+              meAdcTIDWheel2zp_[1]->Fill((*iter).adc());
+              meStripTIDWheel2zp_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tidRing(id) == 3) {
+              meAdcTIDWheel2zp_[2]->Fill((*iter).adc());
+              meStripTIDWheel2zp_[2]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tidWheel(id) == 3) {
+            if (tTopo->tidRing(id) == 1) {
+              meAdcTIDWheel3zp_[0]->Fill((*iter).adc());
+              meStripTIDWheel3zp_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tidRing(id) == 2) {
+              meAdcTIDWheel3zp_[1]->Fill((*iter).adc());
+              meStripTIDWheel3zp_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tidRing(id) == 3) {
+              meAdcTIDWheel3zp_[2]->Fill((*iter).adc());
+              meStripTIDWheel3zp_[2]->Fill((*iter).strip());
+            }
+          }
+        }
+      }
+    }
+    if (detId.subdetId() == StripSubdetector::TEC) {
+      for (iter = begin; iter != end; iter++) {
+        if (tTopo->tecSide(id) == 1) {
+          ++ndigiwheelteczm[tTopo->tecWheel(id) - 1];
+          if (tTopo->tecWheel(id) == 1) {
+            if (tTopo->tecRing(id) == 1) {
+              meAdcTECWheel1zm_[0]->Fill((*iter).adc());
+              meStripTECWheel1zm_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 2) {
+              meAdcTECWheel1zm_[1]->Fill((*iter).adc());
+              meStripTECWheel1zm_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 3) {
+              meAdcTECWheel1zm_[2]->Fill((*iter).adc());
+              meStripTECWheel1zm_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 4) {
+              meAdcTECWheel1zm_[3]->Fill((*iter).adc());
+              meStripTECWheel1zm_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 5) {
+              meAdcTECWheel1zm_[4]->Fill((*iter).adc());
+              meStripTECWheel1zm_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 6) {
+              meAdcTECWheel1zm_[5]->Fill((*iter).adc());
+              meStripTECWheel1zm_[5]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 7) {
+              meAdcTECWheel1zm_[6]->Fill((*iter).adc());
+              meStripTECWheel1zm_[6]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tecWheel(id) == 2) {
+            if (tTopo->tecRing(id) == 1) {
+              meAdcTECWheel2zm_[0]->Fill((*iter).adc());
+              meStripTECWheel2zm_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 2) {
+              meAdcTECWheel2zm_[1]->Fill((*iter).adc());
+              meStripTECWheel2zm_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 3) {
+              meAdcTECWheel2zm_[2]->Fill((*iter).adc());
+              meStripTECWheel2zm_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 4) {
+              meAdcTECWheel2zm_[3]->Fill((*iter).adc());
+              meStripTECWheel2zm_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 5) {
+              meAdcTECWheel2zm_[4]->Fill((*iter).adc());
+              meStripTECWheel2zm_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 6) {
+              meAdcTECWheel2zm_[5]->Fill((*iter).adc());
+              meStripTECWheel2zm_[5]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 7) {
+              meAdcTECWheel2zm_[6]->Fill((*iter).adc());
+              meStripTECWheel2zm_[6]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tecWheel(id) == 3) {
+            if (tTopo->tecRing(id) == 1) {
+              meAdcTECWheel3zm_[0]->Fill((*iter).adc());
+              meStripTECWheel3zm_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 2) {
+              meAdcTECWheel3zm_[1]->Fill((*iter).adc());
+              meStripTECWheel3zm_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 3) {
+              meAdcTECWheel3zm_[2]->Fill((*iter).adc());
+              meStripTECWheel3zm_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 4) {
+              meAdcTECWheel3zm_[3]->Fill((*iter).adc());
+              meStripTECWheel3zm_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 5) {
+              meAdcTECWheel3zm_[4]->Fill((*iter).adc());
+              meStripTECWheel3zm_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 6) {
+              meAdcTECWheel3zm_[5]->Fill((*iter).adc());
+              meStripTECWheel3zm_[5]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 7) {
+              meAdcTECWheel3zm_[6]->Fill((*iter).adc());
+              meStripTECWheel3zm_[6]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tecWheel(id) == 4) {
+            if (tTopo->tecRing(id) == 2) {
+              meAdcTECWheel4zm_[0]->Fill((*iter).adc());
+              meStripTECWheel4zm_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 3) {
+              meAdcTECWheel4zm_[1]->Fill((*iter).adc());
+              meStripTECWheel4zm_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 4) {
+              meAdcTECWheel4zm_[2]->Fill((*iter).adc());
+              meStripTECWheel4zm_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 5) {
+              meAdcTECWheel4zm_[3]->Fill((*iter).adc());
+              meStripTECWheel4zm_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 6) {
+              meAdcTECWheel4zm_[4]->Fill((*iter).adc());
+              meStripTECWheel4zm_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 7) {
+              meAdcTECWheel4zm_[5]->Fill((*iter).adc());
+              meStripTECWheel4zm_[5]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tecWheel(id) == 5) {
+            if (tTopo->tecRing(id) == 2) {
+              meAdcTECWheel5zm_[0]->Fill((*iter).adc());
+              meStripTECWheel5zm_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 3) {
+              meAdcTECWheel5zm_[1]->Fill((*iter).adc());
+              meStripTECWheel5zm_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 4) {
+              meAdcTECWheel5zm_[2]->Fill((*iter).adc());
+              meStripTECWheel5zm_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 5) {
+              meAdcTECWheel5zm_[3]->Fill((*iter).adc());
+              meStripTECWheel5zm_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 6) {
+              meAdcTECWheel5zm_[4]->Fill((*iter).adc());
+              meStripTECWheel5zm_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 7) {
+              meAdcTECWheel5zm_[5]->Fill((*iter).adc());
+              meStripTECWheel5zm_[5]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tecWheel(id) == 6) {
+            if (tTopo->tecRing(id) == 2) {
+              meAdcTECWheel6zm_[0]->Fill((*iter).adc());
+              meStripTECWheel6zm_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 3) {
+              meAdcTECWheel6zm_[1]->Fill((*iter).adc());
+              meStripTECWheel6zm_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 4) {
+              meAdcTECWheel6zm_[2]->Fill((*iter).adc());
+              meStripTECWheel6zm_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 5) {
+              meAdcTECWheel6zm_[3]->Fill((*iter).adc());
+              meStripTECWheel6zm_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 6) {
+              meAdcTECWheel6zm_[4]->Fill((*iter).adc());
+              meStripTECWheel6zm_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 7) {
+              meAdcTECWheel6zm_[5]->Fill((*iter).adc());
+              meStripTECWheel6zm_[5]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tecWheel(id) == 7) {
+            if (tTopo->tecRing(id) == 3) {
+              meAdcTECWheel7zm_[0]->Fill((*iter).adc());
+              meStripTECWheel7zm_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 4) {
+              meAdcTECWheel7zm_[1]->Fill((*iter).adc());
+              meStripTECWheel7zm_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 5) {
+              meAdcTECWheel7zm_[2]->Fill((*iter).adc());
+              meStripTECWheel7zm_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 6) {
+              meAdcTECWheel7zm_[3]->Fill((*iter).adc());
+              meStripTECWheel7zm_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 7) {
+              meAdcTECWheel7zm_[4]->Fill((*iter).adc());
+              meStripTECWheel7zm_[4]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tecWheel(id) == 8) {
+            if (tTopo->tecRing(id) == 3) {
+              meAdcTECWheel8zm_[0]->Fill((*iter).adc());
+              meStripTECWheel8zm_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 4) {
+              meAdcTECWheel8zm_[1]->Fill((*iter).adc());
+              meStripTECWheel8zm_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 5) {
+              meAdcTECWheel8zm_[2]->Fill((*iter).adc());
+              meStripTECWheel8zm_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 6) {
+              meAdcTECWheel8zm_[3]->Fill((*iter).adc());
+              meStripTECWheel8zm_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 7) {
+              meAdcTECWheel8zm_[4]->Fill((*iter).adc());
+              meStripTECWheel8zm_[4]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tecWheel(id) == 9) {
+            if (tTopo->tecRing(id) == 4) {
+              meAdcTECWheel9zm_[0]->Fill((*iter).adc());
+              meStripTECWheel9zm_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 5) {
+              meAdcTECWheel9zm_[1]->Fill((*iter).adc());
+              meStripTECWheel9zm_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 6) {
+              meAdcTECWheel9zm_[2]->Fill((*iter).adc());
+              meStripTECWheel9zm_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 7) {
+              meAdcTECWheel9zm_[3]->Fill((*iter).adc());
+              meStripTECWheel9zm_[3]->Fill((*iter).strip());
+            }
+          }
+        } else {
+          ++ndigiwheelteczp[tTopo->tecWheel(id) - 1];
+          if (tTopo->tecWheel(id) == 1) {
+            if (tTopo->tecRing(id) == 1) {
+              meAdcTECWheel1zp_[0]->Fill((*iter).adc());
+              meStripTECWheel1zp_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 2) {
+              meAdcTECWheel1zp_[1]->Fill((*iter).adc());
+              meStripTECWheel1zp_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 3) {
+              meAdcTECWheel1zp_[2]->Fill((*iter).adc());
+              meStripTECWheel1zp_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 4) {
+              meAdcTECWheel1zp_[3]->Fill((*iter).adc());
+              meStripTECWheel1zp_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 5) {
+              meAdcTECWheel1zp_[4]->Fill((*iter).adc());
+              meStripTECWheel1zp_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 6) {
+              meAdcTECWheel1zp_[5]->Fill((*iter).adc());
+              meStripTECWheel1zp_[5]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 7) {
+              meAdcTECWheel1zp_[6]->Fill((*iter).adc());
+              meStripTECWheel1zp_[6]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tecWheel(id) == 2) {
+            if (tTopo->tecRing(id) == 1) {
+              meAdcTECWheel2zp_[0]->Fill((*iter).adc());
+              meStripTECWheel2zp_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 2) {
+              meAdcTECWheel2zp_[1]->Fill((*iter).adc());
+              meStripTECWheel2zp_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 3) {
+              meAdcTECWheel2zp_[2]->Fill((*iter).adc());
+              meStripTECWheel2zp_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 4) {
+              meAdcTECWheel2zp_[3]->Fill((*iter).adc());
+              meStripTECWheel2zp_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 5) {
+              meAdcTECWheel2zp_[4]->Fill((*iter).adc());
+              meStripTECWheel2zp_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 6) {
+              meAdcTECWheel2zp_[5]->Fill((*iter).adc());
+              meStripTECWheel2zp_[5]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 7) {
+              meAdcTECWheel2zp_[6]->Fill((*iter).adc());
+              meStripTECWheel2zp_[6]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tecWheel(id) == 3) {
+            if (tTopo->tecRing(id) == 1) {
+              meAdcTECWheel3zp_[0]->Fill((*iter).adc());
+              meStripTECWheel3zp_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 2) {
+              meAdcTECWheel3zp_[1]->Fill((*iter).adc());
+              meStripTECWheel3zp_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 3) {
+              meAdcTECWheel3zp_[2]->Fill((*iter).adc());
+              meStripTECWheel3zp_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 4) {
+              meAdcTECWheel3zp_[3]->Fill((*iter).adc());
+              meStripTECWheel3zp_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 5) {
+              meAdcTECWheel3zp_[4]->Fill((*iter).adc());
+              meStripTECWheel3zp_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 6) {
+              meAdcTECWheel3zp_[5]->Fill((*iter).adc());
+              meStripTECWheel3zp_[5]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 7) {
+              meAdcTECWheel3zp_[6]->Fill((*iter).adc());
+              meStripTECWheel3zp_[6]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tecWheel(id) == 4) {
+            if (tTopo->tecRing(id) == 2) {
+              meAdcTECWheel4zp_[0]->Fill((*iter).adc());
+              meStripTECWheel4zp_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 3) {
+              meAdcTECWheel4zp_[1]->Fill((*iter).adc());
+              meStripTECWheel4zp_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 4) {
+              meAdcTECWheel4zp_[2]->Fill((*iter).adc());
+              meStripTECWheel4zp_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 5) {
+              meAdcTECWheel4zp_[3]->Fill((*iter).adc());
+              meStripTECWheel4zp_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 6) {
+              meAdcTECWheel4zp_[4]->Fill((*iter).adc());
+              meStripTECWheel4zp_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 7) {
+              meAdcTECWheel4zp_[5]->Fill((*iter).adc());
+              meStripTECWheel4zp_[5]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tecWheel(id) == 5) {
+            if (tTopo->tecRing(id) == 2) {
+              meAdcTECWheel5zp_[0]->Fill((*iter).adc());
+              meStripTECWheel5zp_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 3) {
+              meAdcTECWheel5zp_[1]->Fill((*iter).adc());
+              meStripTECWheel5zp_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 4) {
+              meAdcTECWheel5zp_[2]->Fill((*iter).adc());
+              meStripTECWheel5zp_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 5) {
+              meAdcTECWheel5zp_[3]->Fill((*iter).adc());
+              meStripTECWheel5zp_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 6) {
+              meAdcTECWheel5zp_[4]->Fill((*iter).adc());
+              meStripTECWheel5zp_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 7) {
+              meAdcTECWheel5zp_[5]->Fill((*iter).adc());
+              meStripTECWheel5zp_[5]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tecWheel(id) == 6) {
+            if (tTopo->tecRing(id) == 2) {
+              meAdcTECWheel6zp_[0]->Fill((*iter).adc());
+              meStripTECWheel6zp_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 3) {
+              meAdcTECWheel6zp_[1]->Fill((*iter).adc());
+              meStripTECWheel6zp_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 4) {
+              meAdcTECWheel6zp_[2]->Fill((*iter).adc());
+              meStripTECWheel6zp_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 5) {
+              meAdcTECWheel6zp_[3]->Fill((*iter).adc());
+              meStripTECWheel6zp_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 6) {
+              meAdcTECWheel6zp_[4]->Fill((*iter).adc());
+              meStripTECWheel6zp_[4]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 7) {
+              meAdcTECWheel6zp_[5]->Fill((*iter).adc());
+              meStripTECWheel6zp_[5]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tecWheel(id) == 7) {
+            if (tTopo->tecRing(id) == 3) {
+              meAdcTECWheel7zp_[0]->Fill((*iter).adc());
+              meStripTECWheel7zp_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 4) {
+              meAdcTECWheel7zp_[1]->Fill((*iter).adc());
+              meStripTECWheel7zp_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 5) {
+              meAdcTECWheel7zp_[2]->Fill((*iter).adc());
+              meStripTECWheel7zp_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 6) {
+              meAdcTECWheel7zp_[3]->Fill((*iter).adc());
+              meStripTECWheel7zp_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 7) {
+              meAdcTECWheel7zp_[4]->Fill((*iter).adc());
+              meStripTECWheel7zp_[4]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tecWheel(id) == 8) {
+            if (tTopo->tecRing(id) == 3) {
+              meAdcTECWheel8zp_[0]->Fill((*iter).adc());
+              meStripTECWheel8zp_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 4) {
+              meAdcTECWheel8zp_[1]->Fill((*iter).adc());
+              meStripTECWheel8zp_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 5) {
+              meAdcTECWheel8zp_[2]->Fill((*iter).adc());
+              meStripTECWheel8zp_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 6) {
+              meAdcTECWheel8zp_[3]->Fill((*iter).adc());
+              meStripTECWheel8zp_[3]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 7) {
+              meAdcTECWheel8zp_[4]->Fill((*iter).adc());
+              meStripTECWheel8zp_[4]->Fill((*iter).strip());
+            }
+          }
+          if (tTopo->tecWheel(id) == 9) {
+            if (tTopo->tecRing(id) == 4) {
+              meAdcTECWheel9zp_[0]->Fill((*iter).adc());
+              meStripTECWheel9zp_[0]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 5) {
+              meAdcTECWheel9zp_[1]->Fill((*iter).adc());
+              meStripTECWheel9zp_[1]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 6) {
+              meAdcTECWheel9zp_[2]->Fill((*iter).adc());
+              meStripTECWheel9zp_[2]->Fill((*iter).strip());
+            }
+            if (tTopo->tecRing(id) == 7) {
+              meAdcTECWheel9zp_[3]->Fill((*iter).adc());
+              meStripTECWheel9zp_[3]->Fill((*iter).strip());
+            }
+          }
+        }
+      }
+    }
+  }
 
+  for (int i = 0; i < 4; i++) {
+    meNDigiTIBLayerzm_[i]->Fill(ndigilayertibzm[i]);
+    meNDigiTIBLayerzp_[i]->Fill(ndigilayertibzp[i]);
+  }
+
+  for (int i = 0; i < 6; i++) {
+    meNDigiTOBLayerzm_[i]->Fill(ndigilayertobzm[i]);
+    meNDigiTOBLayerzp_[i]->Fill(ndigilayertobzp[i]);
+  }
+
+  for (int i = 0; i < 3; i++) {
+    meNDigiTIDWheelzm_[i]->Fill(ndigiwheeltidzm[i]);
+    meNDigiTIDWheelzp_[i]->Fill(ndigiwheeltidzp[i]);
+  }
+
+  for (int i = 0; i < 9; i++) {
+    meNDigiTECWheelzm_[i]->Fill(ndigiwheelteczm[i]);
+    meNDigiTECWheelzp_[i]->Fill(ndigiwheelteczp[i]);
+  }
+}
diff --git a/Validation/TrackerHits/interface/TrackerHitAnalyzer.h b/Validation/TrackerHits/interface/TrackerHitAnalyzer.h
index 457f2b6ce1544..4d2a3dc8332ec 100644
--- a/Validation/TrackerHits/interface/TrackerHitAnalyzer.h
+++ b/Validation/TrackerHits/interface/TrackerHitAnalyzer.h
@@ -6,10 +6,10 @@
  *
  * \author F. Cossutti
  *
-*/
+ */
 // framework & common header files
-#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include <DQMServices/Core/interface/DQMEDAnalyzer.h>
 
@@ -21,99 +21,92 @@
 class DQMStore;
 class MonitorElement;
 
-class TrackerHitAnalyzer: public DQMEDAnalyzer {
-  
+class TrackerHitAnalyzer : public DQMEDAnalyzer {
 public:
+  /// Constructor
+  TrackerHitAnalyzer(const edm::ParameterSet &ps);
 
-/// Constructor
-TrackerHitAnalyzer(const edm::ParameterSet& ps);
-
-/// Destructor
-~TrackerHitAnalyzer() override;
+  /// Destructor
+  ~TrackerHitAnalyzer() override;
 
 protected:
+  void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run &run, const edm::EventSetup &es) override;
 
- void bookHistograms(DQMStore::IBooker & ibooker,const edm::Run& run, const edm::EventSetup& es) override;
-
-/// Analyze
-void analyze(const edm::Event& e, const edm::EventSetup& c) override;
+  /// Analyze
+  void analyze(const edm::Event &e, const edm::EventSetup &c) override;
 
+  // EndJob
+  void endJob() override;
 
-
-// EndJob
-void endJob() override;
-
-//void BookTestHistos(Char_t sname, int nbin, float *xmin, float *xmax);
+  // void BookTestHistos(Char_t sname, int nbin, float *xmin, float *xmax);
 
 private:
-
- bool verbose_;
-
- edm::EDGetTokenT<edm::PSimHitContainer> edmPSimHitContainer_pxlBrlLow_Token_, edmPSimHitContainer_pxlBrlHigh_Token_;
- edm::EDGetTokenT<edm::PSimHitContainer> edmPSimHitContainer_pxlFwdLow_Token_, edmPSimHitContainer_pxlFwdHigh_Token_;
- edm::EDGetTokenT<edm::PSimHitContainer> edmPSimHitContainer_siTIBLow_Token_, edmPSimHitContainer_siTIBHigh_Token_;
- edm::EDGetTokenT<edm::PSimHitContainer> edmPSimHitContainer_siTOBLow_Token_, edmPSimHitContainer_siTOBHigh_Token_;
- edm::EDGetTokenT<edm::PSimHitContainer> edmPSimHitContainer_siTIDLow_Token_, edmPSimHitContainer_siTIDHigh_Token_;
- edm::EDGetTokenT<edm::PSimHitContainer> edmPSimHitContainer_siTECLow_Token_, edmPSimHitContainer_siTECHigh_Token_;
- edm::EDGetTokenT<edm::SimTrackContainer> edmSimTrackContainerToken_;
-
- DQMStore* fDBE;
- edm::ParameterSet conf_;
-
- MonitorElement* htofeta;
- MonitorElement* htofphi;
- MonitorElement* htofr;
- MonitorElement* htofz;
- MonitorElement* htofeta_profile;
- MonitorElement* htofphi_profile;
- MonitorElement* htofr_profile;
- MonitorElement* htofz_profile;
- MonitorElement* h1e[12];
- MonitorElement* h2e[12];
- MonitorElement* h3e[12];
- MonitorElement* h4e[12];
- MonitorElement* h5e[12];
- MonitorElement* h6e[12];
- 
- MonitorElement* h1ex[12];
- MonitorElement* h2ex[12];
- MonitorElement* h3ex[12];
- MonitorElement* h4ex[12];
- MonitorElement* h5ex[12];
- MonitorElement* h6ex[12];
- 
- MonitorElement* h1ey[12];
- MonitorElement* h2ey[12];
- MonitorElement* h3ey[12];
- MonitorElement* h4ey[12];
- MonitorElement* h5ey[12];
- MonitorElement* h6ey[12];
- 
- MonitorElement* h1ez[12];
- MonitorElement* h2ez[12];
- MonitorElement* h3ez[12];
- MonitorElement* h4ez[12];
- MonitorElement* h5ez[12];
- MonitorElement* h6ez[12];
-
- MonitorElement* h1lx[12];
- MonitorElement* h2lx[12];
- MonitorElement* h3lx[12];
- MonitorElement* h4lx[12];
- MonitorElement* h5lx[12];
- MonitorElement* h6lx[12];
- 
- MonitorElement* h1ly[12];
- MonitorElement* h2ly[12];
- MonitorElement* h3ly[12];
- MonitorElement* h4ly[12];
- MonitorElement* h5ly[12];
- MonitorElement* h6ly[12];
-
- bool runStandalone;
- std::string fOutputFile;
- bool pixelOutput;
-
+  bool verbose_;
+
+  edm::EDGetTokenT<edm::PSimHitContainer> edmPSimHitContainer_pxlBrlLow_Token_, edmPSimHitContainer_pxlBrlHigh_Token_;
+  edm::EDGetTokenT<edm::PSimHitContainer> edmPSimHitContainer_pxlFwdLow_Token_, edmPSimHitContainer_pxlFwdHigh_Token_;
+  edm::EDGetTokenT<edm::PSimHitContainer> edmPSimHitContainer_siTIBLow_Token_, edmPSimHitContainer_siTIBHigh_Token_;
+  edm::EDGetTokenT<edm::PSimHitContainer> edmPSimHitContainer_siTOBLow_Token_, edmPSimHitContainer_siTOBHigh_Token_;
+  edm::EDGetTokenT<edm::PSimHitContainer> edmPSimHitContainer_siTIDLow_Token_, edmPSimHitContainer_siTIDHigh_Token_;
+  edm::EDGetTokenT<edm::PSimHitContainer> edmPSimHitContainer_siTECLow_Token_, edmPSimHitContainer_siTECHigh_Token_;
+  edm::EDGetTokenT<edm::SimTrackContainer> edmSimTrackContainerToken_;
+
+  DQMStore *fDBE;
+  edm::ParameterSet conf_;
+
+  MonitorElement *htofeta;
+  MonitorElement *htofphi;
+  MonitorElement *htofr;
+  MonitorElement *htofz;
+  MonitorElement *htofeta_profile;
+  MonitorElement *htofphi_profile;
+  MonitorElement *htofr_profile;
+  MonitorElement *htofz_profile;
+  MonitorElement *h1e[12];
+  MonitorElement *h2e[12];
+  MonitorElement *h3e[12];
+  MonitorElement *h4e[12];
+  MonitorElement *h5e[12];
+  MonitorElement *h6e[12];
+
+  MonitorElement *h1ex[12];
+  MonitorElement *h2ex[12];
+  MonitorElement *h3ex[12];
+  MonitorElement *h4ex[12];
+  MonitorElement *h5ex[12];
+  MonitorElement *h6ex[12];
+
+  MonitorElement *h1ey[12];
+  MonitorElement *h2ey[12];
+  MonitorElement *h3ey[12];
+  MonitorElement *h4ey[12];
+  MonitorElement *h5ey[12];
+  MonitorElement *h6ey[12];
+
+  MonitorElement *h1ez[12];
+  MonitorElement *h2ez[12];
+  MonitorElement *h3ez[12];
+  MonitorElement *h4ez[12];
+  MonitorElement *h5ez[12];
+  MonitorElement *h6ez[12];
+
+  MonitorElement *h1lx[12];
+  MonitorElement *h2lx[12];
+  MonitorElement *h3lx[12];
+  MonitorElement *h4lx[12];
+  MonitorElement *h5lx[12];
+  MonitorElement *h6lx[12];
+
+  MonitorElement *h1ly[12];
+  MonitorElement *h2ly[12];
+  MonitorElement *h3ly[12];
+  MonitorElement *h4ly[12];
+  MonitorElement *h5ly[12];
+  MonitorElement *h6ly[12];
+
+  bool runStandalone;
+  std::string fOutputFile;
+  bool pixelOutput;
 };
 
 #endif
diff --git a/Validation/TrackerHits/interface/TrackerHitProducer.h b/Validation/TrackerHits/interface/TrackerHitProducer.h
index e163feed3ea85..18b63edb04240 100644
--- a/Validation/TrackerHits/interface/TrackerHitProducer.h
+++ b/Validation/TrackerHits/interface/TrackerHitProducer.h
@@ -7,8 +7,8 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
-#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
+#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
 
 #include <string>
 #include <vector>
@@ -18,32 +18,27 @@ namespace edm {
 }
 class PTrackerSimHit;
 
-class TrackerHitProducer : public edm::EDProducer
-{
-  
- public:
-
+class TrackerHitProducer : public edm::EDProducer {
+public:
   typedef std::vector<float> FloatVector;
   typedef std::vector<int> IntegerVector;
 
-  explicit TrackerHitProducer(const edm::ParameterSet&);
+  explicit TrackerHitProducer(const edm::ParameterSet &);
   ~TrackerHitProducer() override;
   void beginJob() override;
-  void endJob() override;  
-  void produce(edm::Event&, const edm::EventSetup&) override;
-  
- private:
+  void endJob() override;
+  void produce(edm::Event &, const edm::EventSetup &) override;
 
+private:
   // production related methods
-  void fillG4MC(edm::Event&);
-  void storeG4MC(PTrackerSimHit&);
-  void fillTrk(edm::Event&, const edm::EventSetup&);
-  void storeTrk(PTrackerSimHit&);
+  void fillG4MC(edm::Event &);
+  void storeG4MC(PTrackerSimHit &);
+  void fillTrk(edm::Event &, const edm::EventSetup &);
+  void storeTrk(PTrackerSimHit &);
 
   void clear();
 
- private:
-
+private:
   //  parameter information
   bool getAllProvenances;
   bool printProvenanceInfo;
@@ -66,47 +61,44 @@ class TrackerHitProducer : public edm::EDProducer
   edm::EDGetTokenT<edm::PSimHitContainer> edmPSimHitContainer_siTIDLow_Token_, edmPSimHitContainer_siTIDHigh_Token_;
   edm::EDGetTokenT<edm::PSimHitContainer> edmPSimHitContainer_siTECLow_Token_, edmPSimHitContainer_siTECHigh_Token_;
 
-
   // G4MC info
-  FloatVector G4VtxX; 
-  FloatVector G4VtxY; 
-  FloatVector G4VtxZ; 
-  FloatVector G4TrkPt; 
+  FloatVector G4VtxX;
+  FloatVector G4VtxY;
+  FloatVector G4VtxZ;
+  FloatVector G4TrkPt;
   FloatVector G4TrkE;
   FloatVector G4TrkEta;
   FloatVector G4TrkPhi;
 
-
   // Tracker info
 
   // Hit info
   IntegerVector HitsSysID;
   FloatVector HitsDuID;
-  FloatVector HitsTkID; 
-  FloatVector HitsProT; 
-  FloatVector HitsParT; 
+  FloatVector HitsTkID;
+  FloatVector HitsProT;
+  FloatVector HitsParT;
   FloatVector HitsP;
-  FloatVector HitsLpX; 
-  FloatVector HitsLpY; 
-  FloatVector HitsLpZ; 
-  FloatVector HitsLdX; 
-  FloatVector HitsLdY; 
-  FloatVector HitsLdZ; 
-  FloatVector HitsLdTheta; 
+  FloatVector HitsLpX;
+  FloatVector HitsLpY;
+  FloatVector HitsLpZ;
+  FloatVector HitsLdX;
+  FloatVector HitsLdY;
+  FloatVector HitsLdZ;
+  FloatVector HitsLdTheta;
   FloatVector HitsLdPhi;
-  FloatVector HitsExPx; 
-  FloatVector HitsExPy; 
+  FloatVector HitsExPx;
+  FloatVector HitsExPy;
   FloatVector HitsExPz;
-  FloatVector HitsEnPx; 
-  FloatVector HitsEnPy; 
+  FloatVector HitsEnPx;
+  FloatVector HitsEnPy;
   FloatVector HitsEnPz;
-  FloatVector HitsEloss; 
+  FloatVector HitsEloss;
   FloatVector HitsToF;
-  
+
   std::string fName;
   std::string label;
 
-}; // end class declaration
-  
+};  // end class declaration
 
 #endif
diff --git a/Validation/TrackerHits/src/TrackerHitAnalyzer.cc b/Validation/TrackerHits/src/TrackerHitAnalyzer.cc
index 6fe9a38d3fd04..1b7d04cc3cb78 100644
--- a/Validation/TrackerHits/src/TrackerHitAnalyzer.cc
+++ b/Validation/TrackerHits/src/TrackerHitAnalyzer.cc
@@ -1,8 +1,8 @@
 #include "Validation/TrackerHits/interface/TrackerHitAnalyzer.h"
 
+#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
@@ -14,339 +14,354 @@
 #include "DQMServices/Core/interface/MonitorElement.h"
 
 // tracker info
-#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
-#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h"
+#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "Geometry/CommonDetUnit/interface/GeomDet.h"
+#include "Geometry/CommonDetUnit/interface/TrackingGeometry.h"
+#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 
 // data in edm::event
-#include "SimDataFormats/ValidationFormats/interface/PValidationFormats.h"
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
+#include "SimDataFormats/ValidationFormats/interface/PValidationFormats.h"
 //#include "SimDataFormats/Vertex/interface/SimVertexContainer.h"
+#include "DataFormats/Math/interface/LorentzVector.h"
 #include "SimDataFormats/EncodedEventId/interface/EncodedEventId.h"
 #include "SimDataFormats/Vertex/interface/SimVertex.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
 
 // helper files
-#include <CLHEP/Vector/LorentzVector.h>
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <CLHEP/Vector/LorentzVector.h>
 
+#include <cstdlib>
 #include <map>
 #include <memory>
-#include <cstdlib>
 #include <vector>
 
-TrackerHitAnalyzer::TrackerHitAnalyzer(const edm::ParameterSet& ps)
-  : verbose_( ps.getUntrackedParameter<bool>( "Verbosity",false ) )
-  , edmPSimHitContainer_pxlBrlLow_Token_( consumes<edm::PSimHitContainer>( ps.getParameter<edm::InputTag>( "PxlBrlLowSrc" ) ) )
-  , edmPSimHitContainer_pxlBrlHigh_Token_( consumes<edm::PSimHitContainer>( ps.getParameter<edm::InputTag>( "PxlBrlHighSrc" ) ) )
-  , edmPSimHitContainer_pxlFwdLow_Token_( consumes<edm::PSimHitContainer>( ps.getParameter<edm::InputTag>( "PxlFwdLowSrc" ) ) )
-  , edmPSimHitContainer_pxlFwdHigh_Token_( consumes<edm::PSimHitContainer>( ps.getParameter<edm::InputTag>( "PxlFwdHighSrc" ) ) )
-  , edmPSimHitContainer_siTIBLow_Token_( consumes<edm::PSimHitContainer>( ps.getParameter<edm::InputTag>( "SiTIBLowSrc" ) ) )
-  , edmPSimHitContainer_siTIBHigh_Token_( consumes<edm::PSimHitContainer>( ps.getParameter<edm::InputTag>( "SiTIBHighSrc" ) ) )
-  , edmPSimHitContainer_siTOBLow_Token_( consumes<edm::PSimHitContainer>( ps.getParameter<edm::InputTag>( "SiTOBLowSrc" ) ) )
-  , edmPSimHitContainer_siTOBHigh_Token_( consumes<edm::PSimHitContainer>( ps.getParameter<edm::InputTag>( "SiTOBHighSrc" ) ) )
-  , edmPSimHitContainer_siTIDLow_Token_( consumes<edm::PSimHitContainer>( ps.getParameter<edm::InputTag>( "SiTIDLowSrc" ) ) )
-  , edmPSimHitContainer_siTIDHigh_Token_( consumes<edm::PSimHitContainer>( ps.getParameter<edm::InputTag>( "SiTIDHighSrc" ) ) )
-  , edmPSimHitContainer_siTECLow_Token_( consumes<edm::PSimHitContainer>( ps.getParameter<edm::InputTag>( "SiTECLowSrc" ) ) )
-  , edmPSimHitContainer_siTECHigh_Token_( consumes<edm::PSimHitContainer>( ps.getParameter<edm::InputTag>( "SiTECHighSrc" ) ) )
-  , edmSimTrackContainerToken_( consumes<edm::SimTrackContainer>( ps.getParameter<edm::InputTag>( "G4TrkSrc" ) ) )
-  , fDBE( nullptr )
-  , conf_(ps)
-  , runStandalone ( ps.getParameter<bool>("runStandalone")  ) 
-  , fOutputFile( ps.getUntrackedParameter<std::string>( "outputFile", "TrackerHitHisto.root" ) ) 
-  , pixelOutput ( ps.getParameter<bool>("pixelOutput") ) {
-}
-
-void TrackerHitAnalyzer::bookHistograms(DQMStore::IBooker & ibooker,const edm::Run& run, const edm::EventSetup& es){
-////// booking histograms
+TrackerHitAnalyzer::TrackerHitAnalyzer(const edm::ParameterSet &ps)
+    : verbose_(ps.getUntrackedParameter<bool>("Verbosity", false)),
+      edmPSimHitContainer_pxlBrlLow_Token_(
+          consumes<edm::PSimHitContainer>(ps.getParameter<edm::InputTag>("PxlBrlLowSrc"))),
+      edmPSimHitContainer_pxlBrlHigh_Token_(
+          consumes<edm::PSimHitContainer>(ps.getParameter<edm::InputTag>("PxlBrlHighSrc"))),
+      edmPSimHitContainer_pxlFwdLow_Token_(
+          consumes<edm::PSimHitContainer>(ps.getParameter<edm::InputTag>("PxlFwdLowSrc"))),
+      edmPSimHitContainer_pxlFwdHigh_Token_(
+          consumes<edm::PSimHitContainer>(ps.getParameter<edm::InputTag>("PxlFwdHighSrc"))),
+      edmPSimHitContainer_siTIBLow_Token_(
+          consumes<edm::PSimHitContainer>(ps.getParameter<edm::InputTag>("SiTIBLowSrc"))),
+      edmPSimHitContainer_siTIBHigh_Token_(
+          consumes<edm::PSimHitContainer>(ps.getParameter<edm::InputTag>("SiTIBHighSrc"))),
+      edmPSimHitContainer_siTOBLow_Token_(
+          consumes<edm::PSimHitContainer>(ps.getParameter<edm::InputTag>("SiTOBLowSrc"))),
+      edmPSimHitContainer_siTOBHigh_Token_(
+          consumes<edm::PSimHitContainer>(ps.getParameter<edm::InputTag>("SiTOBHighSrc"))),
+      edmPSimHitContainer_siTIDLow_Token_(
+          consumes<edm::PSimHitContainer>(ps.getParameter<edm::InputTag>("SiTIDLowSrc"))),
+      edmPSimHitContainer_siTIDHigh_Token_(
+          consumes<edm::PSimHitContainer>(ps.getParameter<edm::InputTag>("SiTIDHighSrc"))),
+      edmPSimHitContainer_siTECLow_Token_(
+          consumes<edm::PSimHitContainer>(ps.getParameter<edm::InputTag>("SiTECLowSrc"))),
+      edmPSimHitContainer_siTECHigh_Token_(
+          consumes<edm::PSimHitContainer>(ps.getParameter<edm::InputTag>("SiTECHighSrc"))),
+      edmSimTrackContainerToken_(consumes<edm::SimTrackContainer>(ps.getParameter<edm::InputTag>("G4TrkSrc"))),
+      fDBE(nullptr),
+      conf_(ps),
+      runStandalone(ps.getParameter<bool>("runStandalone")),
+      fOutputFile(ps.getUntrackedParameter<std::string>("outputFile", "TrackerHitHisto.root")),
+      pixelOutput(ps.getParameter<bool>("pixelOutput")) {}
+
+void TrackerHitAnalyzer::bookHistograms(DQMStore::IBooker &ibooker, const edm::Run &run, const edm::EventSetup &es) {
+  ////// booking histograms
   fDBE = edm::Service<DQMStore>().operator->();
-   	
-  Char_t  hname1[50], htitle1[80];
-  Char_t  hname2[50], htitle2[80];
-  Char_t  hname3[50], htitle3[80];
-  Char_t  hname4[50], htitle4[80];
-  Char_t  hname5[50], htitle5[80];
-  Char_t  hname6[50], htitle6[80];
-   
-  if ( fDBE ) {
-     if ( verbose_ ) {
-       fDBE->setVerbose(1);
-     } else {
-       fDBE->setVerbose(0);
-     }
+
+  Char_t hname1[50], htitle1[80];
+  Char_t hname2[50], htitle2[80];
+  Char_t hname3[50], htitle3[80];
+  Char_t hname4[50], htitle4[80];
+  Char_t hname5[50], htitle5[80];
+  Char_t hname6[50], htitle6[80];
+
+  if (fDBE) {
+    if (verbose_) {
+      fDBE->setVerbose(1);
+    } else {
+      fDBE->setVerbose(0);
+    }
   }
-        																
-  if ( fDBE) {
-    if ( verbose_ ) fDBE->showDirStructure();
-  } 
-
-  if ( fDBE != nullptr ) {
-//   fDBE->setCurrentFolder("TrackerHitsV/TrackerHitTask");
-     
-     // is there any way to record CPU Info ???
-     // if so, it can be done once - via beginJob() 
- int nbin = 5000;   
+
+  if (fDBE) {
+    if (verbose_)
+      fDBE->showDirStructure();
+  }
+
+  if (fDBE != nullptr) {
+    //   fDBE->setCurrentFolder("TrackerHitsV/TrackerHitTask");
+
+    // is there any way to record CPU Info ???
+    // if so, it can be done once - via beginJob()
+    int nbin = 5000;
 
     ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/");
-    htofeta  = ibooker.book2D ("tof_eta", "Time of flight vs eta", nbin , -3.0 , 3.0,200,-100,100);
-    htofphi  = ibooker.book2D("tof_phi", "Time of flight vs phi", nbin,-180,180,200,-100,100);
-    htofr  = ibooker.book2D("tof_r", "Time of flight vs r", nbin , 0 , 300, 200, -100,100);
-    htofz  = ibooker.book2D("tof_z", "Time of flight vs z", nbin , -280 , 280, 200, -100,100);
-
-
- const float E2NEL = 1.; 
- 
- const char *Region[] = {"005","051","115","152","225","253",
-                       "-050","-105","-151","-215","-252","-325"};  
-  nbin = 200;   
-      
-// Energy loss histograms
-   for(int i=0; i<12; i++) {
-  
-    sprintf (htitle1,"Energy loss in TIB %s", Region[i]);
-    sprintf (htitle2,"Energy loss in TOB %s", Region[i]);
-    sprintf (htitle3,"Energy loss in TID %s", Region[i]);
-    sprintf (htitle4,"Energy loss in TEC %s", Region[i]);
-    if ( pixelOutput ) sprintf (htitle5,"Energy loss in BPIX %s", Region[i]);
-    if ( pixelOutput ) sprintf (htitle6,"Energy loss in FPIX %s", Region[i]);
-    
-    sprintf (hname1,"Eloss_TIB_%i",i+1);
-    sprintf (hname2,"Eloss_TOB_%i",i+1);
-    sprintf (hname3,"Eloss_TID_%i",i+1);
-    sprintf (hname4,"Eloss_TEC_%i",i+1);
-    if ( pixelOutput ) sprintf (hname5,"Eloss_BPIX_%i",i+1);
-    if ( pixelOutput ) sprintf (hname6,"Eloss_FPIX_%i",i+1);
-   
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIBHit");
-    h1e[i]  = ibooker.book1D (hname1, htitle1, nbin , 0.0 , 0.001*E2NEL);
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TOBHit");
-    h2e[i]  = ibooker.book1D (hname2, htitle2, nbin , 0.0 , 0.001*E2NEL);
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIDHit");
-    h3e[i]  = ibooker.book1D (hname3, htitle3, nbin , 0.0 , 0.001*E2NEL);
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TECHit");
-    h4e[i]  = ibooker.book1D (hname4, htitle4, nbin , 0.0 , 0.001*E2NEL);
-    if ( pixelOutput ) {
-      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/BPIXHit");
-      h5e[i]  = ibooker.book1D (hname5, htitle5, nbin , 0.0 , 0.001*E2NEL);
-      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/FPIXHit");
-      h6e[i]  = ibooker.book1D (hname6, htitle6, nbin , 0.0 , 0.001*E2NEL);
+    htofeta = ibooker.book2D("tof_eta", "Time of flight vs eta", nbin, -3.0, 3.0, 200, -100, 100);
+    htofphi = ibooker.book2D("tof_phi", "Time of flight vs phi", nbin, -180, 180, 200, -100, 100);
+    htofr = ibooker.book2D("tof_r", "Time of flight vs r", nbin, 0, 300, 200, -100, 100);
+    htofz = ibooker.book2D("tof_z", "Time of flight vs z", nbin, -280, 280, 200, -100, 100);
+
+    const float E2NEL = 1.;
+
+    const char *Region[] = {"005", "051", "115", "152", "225", "253", "-050", "-105", "-151", "-215", "-252", "-325"};
+    nbin = 200;
+
+    // Energy loss histograms
+    for (int i = 0; i < 12; i++) {
+      sprintf(htitle1, "Energy loss in TIB %s", Region[i]);
+      sprintf(htitle2, "Energy loss in TOB %s", Region[i]);
+      sprintf(htitle3, "Energy loss in TID %s", Region[i]);
+      sprintf(htitle4, "Energy loss in TEC %s", Region[i]);
+      if (pixelOutput)
+        sprintf(htitle5, "Energy loss in BPIX %s", Region[i]);
+      if (pixelOutput)
+        sprintf(htitle6, "Energy loss in FPIX %s", Region[i]);
+
+      sprintf(hname1, "Eloss_TIB_%i", i + 1);
+      sprintf(hname2, "Eloss_TOB_%i", i + 1);
+      sprintf(hname3, "Eloss_TID_%i", i + 1);
+      sprintf(hname4, "Eloss_TEC_%i", i + 1);
+      if (pixelOutput)
+        sprintf(hname5, "Eloss_BPIX_%i", i + 1);
+      if (pixelOutput)
+        sprintf(hname6, "Eloss_FPIX_%i", i + 1);
+
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIBHit");
+      h1e[i] = ibooker.book1D(hname1, htitle1, nbin, 0.0, 0.001 * E2NEL);
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TOBHit");
+      h2e[i] = ibooker.book1D(hname2, htitle2, nbin, 0.0, 0.001 * E2NEL);
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIDHit");
+      h3e[i] = ibooker.book1D(hname3, htitle3, nbin, 0.0, 0.001 * E2NEL);
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TECHit");
+      h4e[i] = ibooker.book1D(hname4, htitle4, nbin, 0.0, 0.001 * E2NEL);
+      if (pixelOutput) {
+        ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/BPIXHit");
+        h5e[i] = ibooker.book1D(hname5, htitle5, nbin, 0.0, 0.001 * E2NEL);
+        ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/FPIXHit");
+        h6e[i] = ibooker.book1D(hname6, htitle6, nbin, 0.0, 0.001 * E2NEL);
+      }
     }
 
-   }
-
-// limits
-const float high[] = {0.03, 0.03, 0.02, 0.03, 0.03, 0.03};
-const float low[] = {-0.03, -0.03, -0.02, -0.03, -0.03, -0.03};
-   
-   for(int i=0; i<12; i++) {
-  
-    sprintf (htitle1,"Entryx-Exitx in TIB %s", Region[i]);
-    sprintf (htitle2,"Entryx-Exitx in TOB %s", Region[i]);
-    sprintf (htitle3,"Entryx-Exitx in TID %s", Region[i]);
-    sprintf (htitle4,"Entryx-Exitx in TEC %s", Region[i]);
-    if ( pixelOutput ) sprintf (htitle5,"Entryx-Exitx in BPIX %s", Region[i]);
-    if ( pixelOutput ) sprintf (htitle6,"Entryx-Exitx in FPIX %s", Region[i]);
-    
-    sprintf (hname1,"Entryx-Exitx_TIB_%i",i+1);
-    sprintf (hname2,"Entryx-Exitx_TOB_%i",i+1);
-    sprintf (hname3,"Entryx-Exitx_TID_%i",i+1);
-    sprintf (hname4,"Entryx-Exitx_TEC_%i",i+1);
-    if ( pixelOutput ) sprintf (hname5,"Entryx-Exitx_BPIX_%i",i+1);
-    if ( pixelOutput ) sprintf (hname6,"Entryx-Exitx_FPIX_%i",i+1);
-   
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIBHit");
-    h1ex[i]  = ibooker.book1D (hname1, htitle1, nbin , low[0] , high[0]);
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TOBHit");
-    h2ex[i]  = ibooker.book1D (hname2, htitle2, nbin , low[1] , high[1]);
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIDHit");
-    h3ex[i]  = ibooker.book1D (hname3, htitle3, nbin , low[2] , high[2]);
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TECHit");
-    h4ex[i]  = ibooker.book1D (hname4, htitle4, nbin , low[3] , high[3]);
-    if ( pixelOutput ) {
-      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/BPIXHit");
-      h5ex[i]  = ibooker.book1D (hname5, htitle5, nbin , low[4] , high[4]);
-      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/FPIXHit");
-      h6ex[i]  = ibooker.book1D (hname6, htitle6, nbin , low[5] , high[5]);
+    // limits
+    const float high[] = {0.03, 0.03, 0.02, 0.03, 0.03, 0.03};
+    const float low[] = {-0.03, -0.03, -0.02, -0.03, -0.03, -0.03};
+
+    for (int i = 0; i < 12; i++) {
+      sprintf(htitle1, "Entryx-Exitx in TIB %s", Region[i]);
+      sprintf(htitle2, "Entryx-Exitx in TOB %s", Region[i]);
+      sprintf(htitle3, "Entryx-Exitx in TID %s", Region[i]);
+      sprintf(htitle4, "Entryx-Exitx in TEC %s", Region[i]);
+      if (pixelOutput)
+        sprintf(htitle5, "Entryx-Exitx in BPIX %s", Region[i]);
+      if (pixelOutput)
+        sprintf(htitle6, "Entryx-Exitx in FPIX %s", Region[i]);
+
+      sprintf(hname1, "Entryx-Exitx_TIB_%i", i + 1);
+      sprintf(hname2, "Entryx-Exitx_TOB_%i", i + 1);
+      sprintf(hname3, "Entryx-Exitx_TID_%i", i + 1);
+      sprintf(hname4, "Entryx-Exitx_TEC_%i", i + 1);
+      if (pixelOutput)
+        sprintf(hname5, "Entryx-Exitx_BPIX_%i", i + 1);
+      if (pixelOutput)
+        sprintf(hname6, "Entryx-Exitx_FPIX_%i", i + 1);
+
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIBHit");
+      h1ex[i] = ibooker.book1D(hname1, htitle1, nbin, low[0], high[0]);
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TOBHit");
+      h2ex[i] = ibooker.book1D(hname2, htitle2, nbin, low[1], high[1]);
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIDHit");
+      h3ex[i] = ibooker.book1D(hname3, htitle3, nbin, low[2], high[2]);
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TECHit");
+      h4ex[i] = ibooker.book1D(hname4, htitle4, nbin, low[3], high[3]);
+      if (pixelOutput) {
+        ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/BPIXHit");
+        h5ex[i] = ibooker.book1D(hname5, htitle5, nbin, low[4], high[4]);
+        ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/FPIXHit");
+        h6ex[i] = ibooker.book1D(hname6, htitle6, nbin, low[5], high[5]);
+      }
     }
-   
-   }
-
-const float high0[] = {0.05, 0.06, 0.03, 0.03, 0.03, 0.03};
-const float low0[] = {-0.05, -0.06, -0.03, -0.03, -0.03, -0.03};
-
-   for(int i=0; i<12; i++) {
-  
-    sprintf (htitle1,"Entryy-Exity in TIB %s", Region[i]);
-    sprintf (htitle2,"Entryy-Exity in TOB %s", Region[i]);
-    sprintf (htitle3,"Entryy-Exity in TID %s", Region[i]);
-    sprintf (htitle4,"Entryy-Exity in TEC %s", Region[i]);
-    if ( pixelOutput ) sprintf (htitle5,"Entryy-Exity in BPIX %s", Region[i]);
-    if ( pixelOutput ) sprintf (htitle6,"Entryy-Exity in FPIX %s", Region[i]);
-    
-    sprintf (hname1,"Entryy-Exity_TIB_%i",i+1);
-    sprintf (hname2,"Entryy-Exity_TOB_%i",i+1);
-    sprintf (hname3,"Entryy-Exity_TID_%i",i+1);
-    sprintf (hname4,"Entryy-Exity_TEC_%i",i+1);
-    if ( pixelOutput ) sprintf (hname5,"Entryy-Exity_BPIX_%i",i+1);
-    if ( pixelOutput ) sprintf (hname6,"Entryy-Exity_FPIX_%i",i+1);
-   
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIBHit");
-    h1ey[i]  = ibooker.book1D (hname1, htitle1, nbin , low0[0] , high0[0]);
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TOBHit");
-    h2ey[i]  = ibooker.book1D (hname2, htitle2, nbin , low0[1] , high0[1]);
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIDHit");
-    h3ey[i]  = ibooker.book1D (hname3, htitle3, nbin , low0[2] , high0[2]);
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TECHit");
-    h4ey[i]  = ibooker.book1D (hname4, htitle4, nbin , low0[3] , high0[3]);
-    if ( pixelOutput ) {
-      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/BPIXHit");
-      h5ey[i]  = ibooker.book1D (hname5, htitle5, nbin , low0[4] , high0[4]);
-      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/FPIXHit");
-      h6ey[i]  = ibooker.book1D (hname6, htitle6, nbin , low0[5] , high0[5]);
+
+    const float high0[] = {0.05, 0.06, 0.03, 0.03, 0.03, 0.03};
+    const float low0[] = {-0.05, -0.06, -0.03, -0.03, -0.03, -0.03};
+
+    for (int i = 0; i < 12; i++) {
+      sprintf(htitle1, "Entryy-Exity in TIB %s", Region[i]);
+      sprintf(htitle2, "Entryy-Exity in TOB %s", Region[i]);
+      sprintf(htitle3, "Entryy-Exity in TID %s", Region[i]);
+      sprintf(htitle4, "Entryy-Exity in TEC %s", Region[i]);
+      if (pixelOutput)
+        sprintf(htitle5, "Entryy-Exity in BPIX %s", Region[i]);
+      if (pixelOutput)
+        sprintf(htitle6, "Entryy-Exity in FPIX %s", Region[i]);
+
+      sprintf(hname1, "Entryy-Exity_TIB_%i", i + 1);
+      sprintf(hname2, "Entryy-Exity_TOB_%i", i + 1);
+      sprintf(hname3, "Entryy-Exity_TID_%i", i + 1);
+      sprintf(hname4, "Entryy-Exity_TEC_%i", i + 1);
+      if (pixelOutput)
+        sprintf(hname5, "Entryy-Exity_BPIX_%i", i + 1);
+      if (pixelOutput)
+        sprintf(hname6, "Entryy-Exity_FPIX_%i", i + 1);
+
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIBHit");
+      h1ey[i] = ibooker.book1D(hname1, htitle1, nbin, low0[0], high0[0]);
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TOBHit");
+      h2ey[i] = ibooker.book1D(hname2, htitle2, nbin, low0[1], high0[1]);
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIDHit");
+      h3ey[i] = ibooker.book1D(hname3, htitle3, nbin, low0[2], high0[2]);
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TECHit");
+      h4ey[i] = ibooker.book1D(hname4, htitle4, nbin, low0[3], high0[3]);
+      if (pixelOutput) {
+        ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/BPIXHit");
+        h5ey[i] = ibooker.book1D(hname5, htitle5, nbin, low0[4], high0[4]);
+        ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/FPIXHit");
+        h6ey[i] = ibooker.book1D(hname6, htitle6, nbin, low0[5], high0[5]);
+      }
     }
-   
-   }
-
-const float high1[] = {0.05, 0.06, 0.05, 0.06, 0.05, 0.05};
-const float low1[]  = {0.,0.,0.,0.,0.,0.};
-
-  for(int i=0; i<12; i++) {
-  
-    sprintf (htitle1,"abs(Entryz-Exitz) in TIB %s", Region[i]);
-    sprintf (htitle2,"abs(Entryz-Exitz) in TOB %s", Region[i]);
-    sprintf (htitle3,"abs(Entryz-Exitz) in TID %s", Region[i]);
-    sprintf (htitle4,"abs(Entryz-Exitz) in TEC %s", Region[i]);
-    if ( pixelOutput ) sprintf (htitle5,"abs(Entryz-Exitz) in BPIX %s", Region[i]);
-    if ( pixelOutput ) sprintf (htitle6,"abs(Entryz-Exitz) in FPIX %s", Region[i]);
-    
-    sprintf (hname1,"Entryz-Exitz_TIB_%i",i+1);
-    sprintf (hname2,"Entryz-Exitz_TOB_%i",i+1);
-    sprintf (hname3,"Entryz-Exitz_TID_%i",i+1);
-    sprintf (hname4,"Entryz-Exitz_TEC_%i",i+1);
-    if ( pixelOutput ) sprintf (hname5,"Entryz-Exitz_BPIX_%i",i+1);
-    if ( pixelOutput ) sprintf (hname6,"Entryz-Exitz_FPIX_%i",i+1);
-   
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIBHit");
-    h1ez[i]  = ibooker.book1D (hname1, htitle1, nbin , low1[0] , high1[0]);
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TOBHit");
-    h2ez[i]  = ibooker.book1D (hname2, htitle2, nbin , low1[1] , high1[1]);
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIDHit");
-    h3ez[i]  = ibooker.book1D (hname3, htitle3, nbin , low1[2] , high1[2]);
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TECHit");
-    h4ez[i]  = ibooker.book1D (hname4, htitle4, nbin , low1[3] , high1[3]);
-    if ( pixelOutput ) {
-      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/BPIXHit");
-      h5ez[i]  = ibooker.book1D (hname5, htitle5, nbin , low1[4] , high1[4]);
-      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/FPIXHit");
-      h6ez[i]  = ibooker.book1D (hname6, htitle6, nbin , low1[5] , high1[5]);
+
+    const float high1[] = {0.05, 0.06, 0.05, 0.06, 0.05, 0.05};
+    const float low1[] = {0., 0., 0., 0., 0., 0.};
+
+    for (int i = 0; i < 12; i++) {
+      sprintf(htitle1, "abs(Entryz-Exitz) in TIB %s", Region[i]);
+      sprintf(htitle2, "abs(Entryz-Exitz) in TOB %s", Region[i]);
+      sprintf(htitle3, "abs(Entryz-Exitz) in TID %s", Region[i]);
+      sprintf(htitle4, "abs(Entryz-Exitz) in TEC %s", Region[i]);
+      if (pixelOutput)
+        sprintf(htitle5, "abs(Entryz-Exitz) in BPIX %s", Region[i]);
+      if (pixelOutput)
+        sprintf(htitle6, "abs(Entryz-Exitz) in FPIX %s", Region[i]);
+
+      sprintf(hname1, "Entryz-Exitz_TIB_%i", i + 1);
+      sprintf(hname2, "Entryz-Exitz_TOB_%i", i + 1);
+      sprintf(hname3, "Entryz-Exitz_TID_%i", i + 1);
+      sprintf(hname4, "Entryz-Exitz_TEC_%i", i + 1);
+      if (pixelOutput)
+        sprintf(hname5, "Entryz-Exitz_BPIX_%i", i + 1);
+      if (pixelOutput)
+        sprintf(hname6, "Entryz-Exitz_FPIX_%i", i + 1);
+
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIBHit");
+      h1ez[i] = ibooker.book1D(hname1, htitle1, nbin, low1[0], high1[0]);
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TOBHit");
+      h2ez[i] = ibooker.book1D(hname2, htitle2, nbin, low1[1], high1[1]);
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIDHit");
+      h3ez[i] = ibooker.book1D(hname3, htitle3, nbin, low1[2], high1[2]);
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TECHit");
+      h4ez[i] = ibooker.book1D(hname4, htitle4, nbin, low1[3], high1[3]);
+      if (pixelOutput) {
+        ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/BPIXHit");
+        h5ez[i] = ibooker.book1D(hname5, htitle5, nbin, low1[4], high1[4]);
+        ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/FPIXHit");
+        h6ez[i] = ibooker.book1D(hname6, htitle6, nbin, low1[5], high1[5]);
+      }
     }
-   
-   }
-
-
-const float high2[] = {3.2, 5.0, 5.5, 6.2, 0.85, 0.5};   
-const float low2[] = {-3.2, -5.0, -5.5, -6.2, -0.85, -0.5};   
-
-   for(int i=0; i<12; i++) {
-  
-    sprintf (htitle1,"Localx in TIB %s", Region[i]);
-    sprintf (htitle2,"Localx in TOB %s", Region[i]);
-    sprintf (htitle3,"Localx in TID %s", Region[i]);
-    sprintf (htitle4,"Localx in TEC %s", Region[i]);
-    if ( pixelOutput ) sprintf (htitle5,"Localx in BPIX %s", Region[i]);
-    if ( pixelOutput ) sprintf (htitle6,"Localx in FPIX %s", Region[i]);
-    
-    sprintf (hname1,"Localx_TIB_%i",i+1);
-    sprintf (hname2,"Localx_TOB_%i",i+1);
-    sprintf (hname3,"Localx_TID_%i",i+1);
-    sprintf (hname4,"Localx_TEC_%i",i+1);
-    if ( pixelOutput ) sprintf (hname5,"Localx_BPIX_%i",i+1);
-    if ( pixelOutput ) sprintf (hname6,"Localx_FPIX_%i",i+1);
-   
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIBHit");
-    h1lx[i]  = ibooker.book1D (hname1, htitle1, nbin , low2[0] , high2[0]);
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TOBHit");
-    h2lx[i]  = ibooker.book1D (hname2, htitle2, nbin , low2[1] , high2[1]);
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIDHit");
-    h3lx[i]  = ibooker.book1D (hname3, htitle3, nbin , low2[2] , high2[2]);
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TECHit");
-    h4lx[i]  = ibooker.book1D (hname4, htitle4, nbin , low2[3] , high2[3]);
-    if ( pixelOutput ) {
-      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/BPIXHit");
-      h5lx[i]  = ibooker.book1D (hname5, htitle5, nbin , low2[4] , high2[4]);
-      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/FPIXHit");
-      h6lx[i]  = ibooker.book1D (hname6, htitle6, nbin , low2[5] , high2[5]);
+
+    const float high2[] = {3.2, 5.0, 5.5, 6.2, 0.85, 0.5};
+    const float low2[] = {-3.2, -5.0, -5.5, -6.2, -0.85, -0.5};
+
+    for (int i = 0; i < 12; i++) {
+      sprintf(htitle1, "Localx in TIB %s", Region[i]);
+      sprintf(htitle2, "Localx in TOB %s", Region[i]);
+      sprintf(htitle3, "Localx in TID %s", Region[i]);
+      sprintf(htitle4, "Localx in TEC %s", Region[i]);
+      if (pixelOutput)
+        sprintf(htitle5, "Localx in BPIX %s", Region[i]);
+      if (pixelOutput)
+        sprintf(htitle6, "Localx in FPIX %s", Region[i]);
+
+      sprintf(hname1, "Localx_TIB_%i", i + 1);
+      sprintf(hname2, "Localx_TOB_%i", i + 1);
+      sprintf(hname3, "Localx_TID_%i", i + 1);
+      sprintf(hname4, "Localx_TEC_%i", i + 1);
+      if (pixelOutput)
+        sprintf(hname5, "Localx_BPIX_%i", i + 1);
+      if (pixelOutput)
+        sprintf(hname6, "Localx_FPIX_%i", i + 1);
+
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIBHit");
+      h1lx[i] = ibooker.book1D(hname1, htitle1, nbin, low2[0], high2[0]);
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TOBHit");
+      h2lx[i] = ibooker.book1D(hname2, htitle2, nbin, low2[1], high2[1]);
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIDHit");
+      h3lx[i] = ibooker.book1D(hname3, htitle3, nbin, low2[2], high2[2]);
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TECHit");
+      h4lx[i] = ibooker.book1D(hname4, htitle4, nbin, low2[3], high2[3]);
+      if (pixelOutput) {
+        ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/BPIXHit");
+        h5lx[i] = ibooker.book1D(hname5, htitle5, nbin, low2[4], high2[4]);
+        ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/FPIXHit");
+        h6lx[i] = ibooker.book1D(hname6, htitle6, nbin, low2[5], high2[5]);
+      }
     }
-   
-   }
-
-
-const float high3[] = {6.0, 10., 5.6, 10.5, 3.4, 0.52};
-const float low3[] = {-6.0, -10., -5.6, -10.5, -3.4, -0.52};
-
-   for(int i=0; i<12; i++) {
-  
-    sprintf (htitle1,"Localy in TIB %s", Region[i]);
-    sprintf (htitle2,"Localy in TOB %s", Region[i]);
-    sprintf (htitle3,"Localy in TID %s", Region[i]);
-    sprintf (htitle4,"Localy in TEC %s", Region[i]);
-    if ( pixelOutput ) sprintf (htitle5,"Localy in BPIX %s", Region[i]);
-    if ( pixelOutput ) sprintf (htitle6,"Localy in FPIX %s", Region[i]);
-    
-    sprintf (hname1,"Localy_TIB_%i",i+1);
-    sprintf (hname2,"Localy_TOB_%i",i+1);
-    sprintf (hname3,"Localy_TID_%i",i+1);
-    sprintf (hname4,"Localy_TEC_%i",i+1);
-    if ( pixelOutput ) sprintf (hname5,"Localy_BPIX_%i",i+1);
-    if ( pixelOutput ) sprintf (hname6,"Localy_FPIX_%i",i+1);
-   
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIBHit");
-    h1ly[i]  = ibooker.book1D (hname1, htitle1, nbin , low3[0] , high3[0]);
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TOBHit");
-    h2ly[i]  = ibooker.book1D (hname2, htitle2, nbin , low3[1] , high3[1]);
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIDHit");
-    h3ly[i]  = ibooker.book1D (hname3, htitle3, nbin , low3[2] , high3[2]);
-    ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TECHit");
-    h4ly[i]  = ibooker.book1D (hname4, htitle4, nbin , low3[3] , high3[3]);
-    if ( pixelOutput ) {
-      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/BPIXHit");
-      h5ly[i]  = ibooker.book1D (hname5, htitle5, nbin , low3[4] , high3[4]);
-      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/FPIXHit");
-      h6ly[i]  = ibooker.book1D (hname6, htitle6, nbin , low3[5] , high3[5]);
+
+    const float high3[] = {6.0, 10., 5.6, 10.5, 3.4, 0.52};
+    const float low3[] = {-6.0, -10., -5.6, -10.5, -3.4, -0.52};
+
+    for (int i = 0; i < 12; i++) {
+      sprintf(htitle1, "Localy in TIB %s", Region[i]);
+      sprintf(htitle2, "Localy in TOB %s", Region[i]);
+      sprintf(htitle3, "Localy in TID %s", Region[i]);
+      sprintf(htitle4, "Localy in TEC %s", Region[i]);
+      if (pixelOutput)
+        sprintf(htitle5, "Localy in BPIX %s", Region[i]);
+      if (pixelOutput)
+        sprintf(htitle6, "Localy in FPIX %s", Region[i]);
+
+      sprintf(hname1, "Localy_TIB_%i", i + 1);
+      sprintf(hname2, "Localy_TOB_%i", i + 1);
+      sprintf(hname3, "Localy_TID_%i", i + 1);
+      sprintf(hname4, "Localy_TEC_%i", i + 1);
+      if (pixelOutput)
+        sprintf(hname5, "Localy_BPIX_%i", i + 1);
+      if (pixelOutput)
+        sprintf(hname6, "Localy_FPIX_%i", i + 1);
+
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIBHit");
+      h1ly[i] = ibooker.book1D(hname1, htitle1, nbin, low3[0], high3[0]);
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TOBHit");
+      h2ly[i] = ibooker.book1D(hname2, htitle2, nbin, low3[1], high3[1]);
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TIDHit");
+      h3ly[i] = ibooker.book1D(hname3, htitle3, nbin, low3[2], high3[2]);
+      ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/TECHit");
+      h4ly[i] = ibooker.book1D(hname4, htitle4, nbin, low3[3], high3[3]);
+      if (pixelOutput) {
+        ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/BPIXHit");
+        h5ly[i] = ibooker.book1D(hname5, htitle5, nbin, low3[4], high3[4]);
+        ibooker.setCurrentFolder("TrackerHitsV/TrackerHit/FPIXHit");
+        h6ly[i] = ibooker.book1D(hname6, htitle6, nbin, low3[5], high3[5]);
+      }
     }
-   
-   }
-   
   }
 }
 
-TrackerHitAnalyzer::~TrackerHitAnalyzer()
-{
-   // don't try to delete any pointers - they're handled by DQM machinery
+TrackerHitAnalyzer::~TrackerHitAnalyzer() {
+  // don't try to delete any pointers - they're handled by DQM machinery
 }
 
+void TrackerHitAnalyzer::endJob() {
+  // According to the previous code some profile plots were created here
+  // However, these profile plots are not in the final root file
+  // For now we comment out these plots (since they are not created in any case)
+  // Then, if needed we will consider moving the booking of the profileplots to
+  // the bookHistograms function and here we will do the profile
 
-
-void TrackerHitAnalyzer::endJob(){
-  //According to the previous code some profile plots were created here
-  //However, these profile plots are not in the final root file
-  //For now we comment out these plots (since they are not created in any case)
-  //Then, if needed we will consider moving the booking of the profileplots to the bookHistograms function 
-  //and here we will do the profile
-
-  //Save root file only in standalone mode
-  if ( runStandalone && !fOutputFile.empty() && fDBE ){ fDBE->save(fOutputFile);}
+  // Save root file only in standalone mode
+  if (runStandalone && !fOutputFile.empty() && fDBE) {
+    fDBE->save(fOutputFile);
+  }
 }
 
-
-void TrackerHitAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& c)
-{
-
+void TrackerHitAnalyzer::analyze(const edm::Event &e, const edm::EventSetup &c) {
   edm::LogInfo("EventInfo") << " Run = " << e.id().run() << " Event = " << e.id().event();
-   
+
   // iterator to access containers
   edm::PSimHitContainer::const_iterator itHit;
   /////////////////////////////////
@@ -354,18 +369,16 @@ void TrackerHitAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& c)
   ////////////////////////////////
   // extract low container
   edm::Handle<edm::PSimHitContainer> PxlBrlLowContainer;
-  e.getByToken( edmPSimHitContainer_pxlBrlLow_Token_, PxlBrlLowContainer );
+  e.getByToken(edmPSimHitContainer_pxlBrlLow_Token_, PxlBrlLowContainer);
   if (!PxlBrlLowContainer.isValid()) {
-    edm::LogError("TrackerHitAnalyzer::analyze")
-      << "Unable to find TrackerHitsPixelBarrelLowTof in event!";
+    edm::LogError("TrackerHitAnalyzer::analyze") << "Unable to find TrackerHitsPixelBarrelLowTof in event!";
     return;
-  }  
+  }
   // extract high container
   edm::Handle<edm::PSimHitContainer> PxlBrlHighContainer;
-  e.getByToken( edmPSimHitContainer_pxlBrlHigh_Token_, PxlBrlHighContainer );
+  e.getByToken(edmPSimHitContainer_pxlBrlHigh_Token_, PxlBrlHighContainer);
   if (!PxlBrlHighContainer.isValid()) {
-    edm::LogError("TrackerHitAnalyzer::analyze")
-      << "Unable to find TrackerHitsPixelBarrelHighTof in event!";
+    edm::LogError("TrackerHitAnalyzer::analyze") << "Unable to find TrackerHitsPixelBarrelHighTof in event!";
     return;
   }
   /////////////////////////////////
@@ -373,18 +386,16 @@ void TrackerHitAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& c)
   ////////////////////////////////
   // extract low container
   edm::Handle<edm::PSimHitContainer> PxlFwdLowContainer;
-  e.getByToken( edmPSimHitContainer_pxlFwdLow_Token_, PxlFwdLowContainer );
+  e.getByToken(edmPSimHitContainer_pxlFwdLow_Token_, PxlFwdLowContainer);
   if (!PxlFwdLowContainer.isValid()) {
-    edm::LogError("TrackerHitAnalyzer::analyze")
-      << "Unable to find TrackerHitsPixelEndcapLowTof in event!";
+    edm::LogError("TrackerHitAnalyzer::analyze") << "Unable to find TrackerHitsPixelEndcapLowTof in event!";
     return;
   }
   // extract high container
   edm::Handle<edm::PSimHitContainer> PxlFwdHighContainer;
-  e.getByToken( edmPSimHitContainer_pxlFwdHigh_Token_, PxlFwdHighContainer );
+  e.getByToken(edmPSimHitContainer_pxlFwdHigh_Token_, PxlFwdHighContainer);
   if (!PxlFwdHighContainer.isValid()) {
-    edm::LogError("TrackerHitAnalyzer::analyze")
-      << "Unable to find TrackerHitsPixelEndcapHighTof in event!";
+    edm::LogError("TrackerHitAnalyzer::analyze") << "Unable to find TrackerHitsPixelEndcapHighTof in event!";
     return;
   }
   ///////////////////////////////////
@@ -392,19 +403,17 @@ void TrackerHitAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& c)
   //////////////////////////////////
   // extract TIB low container
   edm::Handle<edm::PSimHitContainer> SiTIBLowContainer;
-  e.getByToken( edmPSimHitContainer_siTIBLow_Token_, SiTIBLowContainer );
+  e.getByToken(edmPSimHitContainer_siTIBLow_Token_, SiTIBLowContainer);
   if (!SiTIBLowContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::analyze")
-      << "Unable to find TrackerHitsTIBLowTof in event!";
+    edm::LogError("TrackerHitProducer::analyze") << "Unable to find TrackerHitsTIBLowTof in event!";
     return;
   }
   //////////////////////////////////
   // extract TIB high container
   edm::Handle<edm::PSimHitContainer> SiTIBHighContainer;
-  e.getByToken( edmPSimHitContainer_siTIBHigh_Token_, SiTIBHighContainer );
+  e.getByToken(edmPSimHitContainer_siTIBHigh_Token_, SiTIBHighContainer);
   if (!SiTIBHighContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::analyze")
-      << "Unable to find TrackerHitsTIBHighTof in event!";
+    edm::LogError("TrackerHitProducer::analyze") << "Unable to find TrackerHitsTIBHighTof in event!";
     return;
   }
   ///////////////////////////////////
@@ -412,40 +421,36 @@ void TrackerHitAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& c)
   //////////////////////////////////
   // extract TOB low container
   edm::Handle<edm::PSimHitContainer> SiTOBLowContainer;
-  e.getByToken( edmPSimHitContainer_siTOBLow_Token_, SiTOBLowContainer );
+  e.getByToken(edmPSimHitContainer_siTOBLow_Token_, SiTOBLowContainer);
   if (!SiTOBLowContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::analyze")
-      << "Unable to find TrackerHitsTOBLowTof in event!";
+    edm::LogError("TrackerHitProducer::analyze") << "Unable to find TrackerHitsTOBLowTof in event!";
     return;
   }
   //////////////////////////////////
   // extract TOB high container
   edm::Handle<edm::PSimHitContainer> SiTOBHighContainer;
-  e.getByToken( edmPSimHitContainer_siTOBHigh_Token_, SiTOBHighContainer );
+  e.getByToken(edmPSimHitContainer_siTOBHigh_Token_, SiTOBHighContainer);
   if (!SiTOBHighContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::analyze")
-      << "Unable to find TrackerHitsTOBHighTof in event!";
+    edm::LogError("TrackerHitProducer::analyze") << "Unable to find TrackerHitsTOBHighTof in event!";
     return;
   }
-  
+
   ///////////////////////////////////
   // get Silicon TID information
   //////////////////////////////////
   // extract TID low container
   edm::Handle<edm::PSimHitContainer> SiTIDLowContainer;
-  e.getByToken( edmPSimHitContainer_siTIDLow_Token_, SiTIDLowContainer );
+  e.getByToken(edmPSimHitContainer_siTIDLow_Token_, SiTIDLowContainer);
   if (!SiTIDLowContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::analyze")
-      << "Unable to find TrackerHitsTIDLowTof in event!";
+    edm::LogError("TrackerHitProducer::analyze") << "Unable to find TrackerHitsTIDLowTof in event!";
     return;
   }
   //////////////////////////////////
   // extract TID high container
   edm::Handle<edm::PSimHitContainer> SiTIDHighContainer;
-  e.getByToken( edmPSimHitContainer_siTIDHigh_Token_, SiTIDHighContainer );
+  e.getByToken(edmPSimHitContainer_siTIDHigh_Token_, SiTIDHighContainer);
   if (!SiTIDHighContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::analyze")
-      << "Unable to find TrackerHitsTIDHighTof in event!";
+    edm::LogError("TrackerHitProducer::analyze") << "Unable to find TrackerHitsTIDHighTof in event!";
     return;
   }
   ///////////////////////////////////
@@ -453,150 +458,150 @@ void TrackerHitAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& c)
   //////////////////////////////////
   // extract TEC low container
   edm::Handle<edm::PSimHitContainer> SiTECLowContainer;
-  e.getByToken( edmPSimHitContainer_siTECLow_Token_, SiTECLowContainer );
+  e.getByToken(edmPSimHitContainer_siTECLow_Token_, SiTECLowContainer);
   if (!SiTECLowContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::analyze")
-      << "Unable to find TrackerHitsTECLowTof in event!";
+    edm::LogError("TrackerHitProducer::analyze") << "Unable to find TrackerHitsTECLowTof in event!";
     return;
   }
   //////////////////////////////////
   // extract TEC high container
   edm::Handle<edm::PSimHitContainer> SiTECHighContainer;
-  e.getByToken( edmPSimHitContainer_siTECHigh_Token_, SiTECHighContainer );
+  e.getByToken(edmPSimHitContainer_siTECHigh_Token_, SiTECHighContainer);
   if (!SiTECHighContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::analyze")
-      << "Unable to find TrackerHitsTECHighTof in event!";
+    edm::LogError("TrackerHitProducer::analyze") << "Unable to find TrackerHitsTECHighTof in event!";
     return;
   }
-  
+
   ///////////////////////////
   // get G4Track information
   ///////////////////////////
-  
+
   edm::Handle<edm::SimTrackContainer> G4TrkContainer;
-  e.getByToken( edmSimTrackContainerToken_, G4TrkContainer );
+  e.getByToken(edmSimTrackContainerToken_, G4TrkContainer);
   if (!G4TrkContainer.isValid()) {
-    edm::LogError("TrackerHitAnalyzer::analyze")
-      << "Unable to find SimTrack in event!";
+    edm::LogError("TrackerHitAnalyzer::analyze") << "Unable to find SimTrack in event!";
     return;
   }
 
   // Get geometry information
 
   edm::ESHandle<TrackerGeometry> tracker;
-  c.get<TrackerDigiGeometryRecord>().get( tracker );
-
+  c.get<TrackerDigiGeometryRecord>().get(tracker);
 
-  
   int ir = -100;
   edm::SimTrackContainer::const_iterator itTrk;
-  for (itTrk = G4TrkContainer->begin(); itTrk != G4TrkContainer->end(); 
-       ++itTrk) {
-
-//    std::cout << "itTrk = "<< itTrk << std::endl;
-    double eta =0, p =0;
-    const CLHEP::HepLorentzVector& G4Trk = CLHEP::HepLorentzVector(itTrk->momentum().x(),
-                                                     itTrk->momentum().y(),
-                                                     itTrk->momentum().z(),
-                                                     itTrk->momentum().e());  
-    p =sqrt(G4Trk[0]*G4Trk[0]+G4Trk[1]*G4Trk[1]+G4Trk[2]*G4Trk[2]);
-      if ( p == 0) 
-          edm::LogError("TrackerHitAnalyzer::analyze") 
-          << "TrackerTest::INFO: Primary has p = 0 ";
-      else {
-          double costheta  = G4Trk[2]/p;
-          double theta = acos(TMath::Min(TMath::Max(costheta, -1.),1.));
-          eta = -log(tan(theta/2));          
-          
-          if (eta>0.0 && eta<=0.5) ir = 0;
-          if (eta>0.5 && eta<=1.0) ir = 1;
-          if (eta>1.0 && eta<=1.5) ir = 2;
-          if (eta>1.5 && eta<=2.0) ir = 3;
-          if (eta>2.0 && eta<=2.5) ir = 4;
-          if (eta>2.5) ir = 5;
-	  
-          if (eta>-0.5 && eta<= 0.0) ir = 6;
-          if (eta>-1.0 && eta<=-0.5) ir = 7;
-          if (eta>-1.5 && eta<=-1.0) ir = 8;
-          if (eta>-2.0 && eta<=-1.5) ir = 9;
-          if (eta>-2.5 && eta<=-2.0) ir = 10;
-          if (eta<=-2.5) ir = 11;
-//          edm::LogInfo("EventInfo") << " eta = " << eta << " ir = " << ir;
-//	  std::cout << " " << std::endl;
-//          std::cout << "eta " << eta << " ir = " << ir << std::endl;                  
-//	  std::cout << " " << std::endl;
-      }
-  }	  
+  for (itTrk = G4TrkContainer->begin(); itTrk != G4TrkContainer->end(); ++itTrk) {
+    //    std::cout << "itTrk = "<< itTrk << std::endl;
+    double eta = 0, p = 0;
+    const CLHEP::HepLorentzVector &G4Trk = CLHEP::HepLorentzVector(
+        itTrk->momentum().x(), itTrk->momentum().y(), itTrk->momentum().z(), itTrk->momentum().e());
+    p = sqrt(G4Trk[0] * G4Trk[0] + G4Trk[1] * G4Trk[1] + G4Trk[2] * G4Trk[2]);
+    if (p == 0)
+      edm::LogError("TrackerHitAnalyzer::analyze") << "TrackerTest::INFO: Primary has p = 0 ";
+    else {
+      double costheta = G4Trk[2] / p;
+      double theta = acos(TMath::Min(TMath::Max(costheta, -1.), 1.));
+      eta = -log(tan(theta / 2));
+
+      if (eta > 0.0 && eta <= 0.5)
+        ir = 0;
+      if (eta > 0.5 && eta <= 1.0)
+        ir = 1;
+      if (eta > 1.0 && eta <= 1.5)
+        ir = 2;
+      if (eta > 1.5 && eta <= 2.0)
+        ir = 3;
+      if (eta > 2.0 && eta <= 2.5)
+        ir = 4;
+      if (eta > 2.5)
+        ir = 5;
+
+      if (eta > -0.5 && eta <= 0.0)
+        ir = 6;
+      if (eta > -1.0 && eta <= -0.5)
+        ir = 7;
+      if (eta > -1.5 && eta <= -1.0)
+        ir = 8;
+      if (eta > -2.0 && eta <= -1.5)
+        ir = 9;
+      if (eta > -2.5 && eta <= -2.0)
+        ir = 10;
+      if (eta <= -2.5)
+        ir = 11;
+      //          edm::LogInfo("EventInfo") << " eta = " << eta << " ir = " <<
+      //          ir;
+      //	  std::cout << " " << std::endl;
+      //          std::cout << "eta " << eta << " ir = " << ir << std::endl;
+      //	  std::cout << " " << std::endl;
+    }
+  }
   ///////////////////////////////
   // get Pixel information
   ///////////////////////////////
   // If Phase 1, do not run - will run in new Phase 1 module
- 
-  if ( pixelOutput ) {
+
+  if (pixelOutput) {
     for (itHit = PxlBrlLowContainer->begin(); itHit != PxlBrlLowContainer->end(); ++itHit) {
-      DetId detid=DetId(itHit->detUnitId());
-      const GeomDetUnit * det=(const GeomDetUnit*)tracker->idToDetUnit( detid );
-      GlobalPoint gpos=det->toGlobal(itHit->localPosition());
+      DetId detid = DetId(itHit->detUnitId());
+      const GeomDetUnit *det = (const GeomDetUnit *)tracker->idToDetUnit(detid);
+      GlobalPoint gpos = det->toGlobal(itHit->localPosition());
       htofeta->Fill(gpos.eta(), itHit->timeOfFlight());
       htofphi->Fill(gpos.phi().degrees(), itHit->timeOfFlight());
       htofr->Fill(gpos.mag(), itHit->timeOfFlight());
       htofz->Fill(gpos.z(), itHit->timeOfFlight());
 
       h5e[ir]->Fill(itHit->energyLoss());
-      h5ex[ir]->Fill(itHit->entryPoint().x()-itHit->exitPoint().x());
-      h5ey[ir]->Fill(itHit->entryPoint().y()-itHit->exitPoint().y());
-      h5ez[ir]->Fill(std::fabs(itHit->entryPoint().z()-itHit->exitPoint().z()));
+      h5ex[ir]->Fill(itHit->entryPoint().x() - itHit->exitPoint().x());
+      h5ey[ir]->Fill(itHit->entryPoint().y() - itHit->exitPoint().y());
+      h5ez[ir]->Fill(std::fabs(itHit->entryPoint().z() - itHit->exitPoint().z()));
       h5lx[ir]->Fill(itHit->localPosition().x());
       h5ly[ir]->Fill(itHit->localPosition().y());
     }
     for (itHit = PxlBrlHighContainer->begin(); itHit != PxlBrlHighContainer->end(); ++itHit) {
-      DetId detid=DetId(itHit->detUnitId());
-      const GeomDetUnit * det=(const GeomDetUnit*)tracker->idToDetUnit( detid );
-      GlobalPoint gpos=det->toGlobal(itHit->localPosition());
+      DetId detid = DetId(itHit->detUnitId());
+      const GeomDetUnit *det = (const GeomDetUnit *)tracker->idToDetUnit(detid);
+      GlobalPoint gpos = det->toGlobal(itHit->localPosition());
       htofeta->Fill(gpos.eta(), itHit->timeOfFlight());
       htofphi->Fill(gpos.phi().degrees(), itHit->timeOfFlight());
       htofr->Fill(gpos.mag(), itHit->timeOfFlight());
       htofz->Fill(gpos.z(), itHit->timeOfFlight());
 
-
       h5e[ir]->Fill(itHit->energyLoss());
-      h5ex[ir]->Fill(itHit->entryPoint().x()-itHit->exitPoint().x());
-      h5ey[ir]->Fill(itHit->entryPoint().y()-itHit->exitPoint().y());
-      h5ez[ir]->Fill(std::fabs(itHit->entryPoint().z()-itHit->exitPoint().z()));
+      h5ex[ir]->Fill(itHit->entryPoint().x() - itHit->exitPoint().x());
+      h5ey[ir]->Fill(itHit->entryPoint().y() - itHit->exitPoint().y());
+      h5ez[ir]->Fill(std::fabs(itHit->entryPoint().z() - itHit->exitPoint().z()));
       h5lx[ir]->Fill(itHit->localPosition().x());
       h5ly[ir]->Fill(itHit->localPosition().y());
     }
     for (itHit = PxlFwdLowContainer->begin(); itHit != PxlFwdLowContainer->end(); ++itHit) {
-      DetId detid=DetId(itHit->detUnitId());
-      const GeomDetUnit * det=(const GeomDetUnit*)tracker->idToDetUnit( detid );
-      GlobalPoint gpos=det->toGlobal(itHit->localPosition());
+      DetId detid = DetId(itHit->detUnitId());
+      const GeomDetUnit *det = (const GeomDetUnit *)tracker->idToDetUnit(detid);
+      GlobalPoint gpos = det->toGlobal(itHit->localPosition());
       htofeta->Fill(gpos.eta(), itHit->timeOfFlight());
       htofphi->Fill(gpos.phi().degrees(), itHit->timeOfFlight());
       htofr->Fill(gpos.mag(), itHit->timeOfFlight());
       htofz->Fill(gpos.z(), itHit->timeOfFlight());
 
-
       h6e[ir]->Fill(itHit->energyLoss());
-      h6ex[ir]->Fill(itHit->entryPoint().x()-itHit->exitPoint().x());
-      h6ey[ir]->Fill(itHit->entryPoint().y()-itHit->exitPoint().y());
-      h6ez[ir]->Fill(std::fabs(itHit->entryPoint().z()-itHit->exitPoint().z()));
+      h6ex[ir]->Fill(itHit->entryPoint().x() - itHit->exitPoint().x());
+      h6ey[ir]->Fill(itHit->entryPoint().y() - itHit->exitPoint().y());
+      h6ez[ir]->Fill(std::fabs(itHit->entryPoint().z() - itHit->exitPoint().z()));
       h6lx[ir]->Fill(itHit->localPosition().x());
       h6ly[ir]->Fill(itHit->localPosition().y());
-    }  
+    }
     for (itHit = PxlFwdHighContainer->begin(); itHit != PxlFwdHighContainer->end(); ++itHit) {
-      DetId detid=DetId(itHit->detUnitId());
-      const GeomDetUnit * det=(const GeomDetUnit*)tracker->idToDetUnit( detid );
-      GlobalPoint gpos=det->toGlobal(itHit->localPosition());
+      DetId detid = DetId(itHit->detUnitId());
+      const GeomDetUnit *det = (const GeomDetUnit *)tracker->idToDetUnit(detid);
+      GlobalPoint gpos = det->toGlobal(itHit->localPosition());
       htofeta->Fill(gpos.eta(), itHit->timeOfFlight());
       htofphi->Fill(gpos.phi().degrees(), itHit->timeOfFlight());
       htofr->Fill(gpos.mag(), itHit->timeOfFlight());
       htofz->Fill(gpos.z(), itHit->timeOfFlight());
 
-
       h6e[ir]->Fill(itHit->energyLoss());
-      h6ex[ir]->Fill(itHit->entryPoint().x()-itHit->exitPoint().x());
-      h6ey[ir]->Fill(itHit->entryPoint().y()-itHit->exitPoint().y());
-      h6ez[ir]->Fill(std::fabs(itHit->entryPoint().z()-itHit->exitPoint().z()));
+      h6ex[ir]->Fill(itHit->entryPoint().x() - itHit->exitPoint().x());
+      h6ey[ir]->Fill(itHit->entryPoint().y() - itHit->exitPoint().y());
+      h6ez[ir]->Fill(std::fabs(itHit->entryPoint().z() - itHit->exitPoint().z()));
       h6lx[ir]->Fill(itHit->localPosition().x());
       h6ly[ir]->Fill(itHit->localPosition().y());
     }
@@ -605,150 +610,144 @@ void TrackerHitAnalyzer::analyze(const edm::Event& e, const edm::EventSetup& c)
   // get TIB information
   ///////////////////////////////
   for (itHit = SiTIBLowContainer->begin(); itHit != SiTIBLowContainer->end(); ++itHit) {
-    DetId detid=DetId(itHit->detUnitId());
-    const GeomDetUnit * det=(const GeomDetUnit*)tracker->idToDetUnit( detid );
-    GlobalPoint gpos=det->toGlobal(itHit->localPosition());
+    DetId detid = DetId(itHit->detUnitId());
+    const GeomDetUnit *det = (const GeomDetUnit *)tracker->idToDetUnit(detid);
+    GlobalPoint gpos = det->toGlobal(itHit->localPosition());
     htofeta->Fill(gpos.eta(), itHit->timeOfFlight());
     htofphi->Fill(gpos.phi().degrees(), itHit->timeOfFlight());
     htofr->Fill(gpos.mag(), itHit->timeOfFlight());
     htofz->Fill(gpos.z(), itHit->timeOfFlight());
 
-
-   h1e[ir]->Fill(itHit->energyLoss());
-   h1ex[ir]->Fill(itHit->entryPoint().x()-itHit->exitPoint().x());
-   h1ey[ir]->Fill(itHit->entryPoint().y()-itHit->exitPoint().y());
-   h1ez[ir]->Fill(std::fabs(itHit->entryPoint().z()-itHit->exitPoint().z()));
-   h1lx[ir]->Fill(itHit->localPosition().x());
-   h1ly[ir]->Fill(itHit->localPosition().y());
+    h1e[ir]->Fill(itHit->energyLoss());
+    h1ex[ir]->Fill(itHit->entryPoint().x() - itHit->exitPoint().x());
+    h1ey[ir]->Fill(itHit->entryPoint().y() - itHit->exitPoint().y());
+    h1ez[ir]->Fill(std::fabs(itHit->entryPoint().z() - itHit->exitPoint().z()));
+    h1lx[ir]->Fill(itHit->localPosition().x());
+    h1ly[ir]->Fill(itHit->localPosition().y());
   }
   for (itHit = SiTIBHighContainer->begin(); itHit != SiTIBHighContainer->end(); ++itHit) {
-    DetId detid=DetId(itHit->detUnitId());
-    const GeomDetUnit * det=(const GeomDetUnit*)tracker->idToDetUnit( detid );
-    GlobalPoint gpos=det->toGlobal(itHit->localPosition());
+    DetId detid = DetId(itHit->detUnitId());
+    const GeomDetUnit *det = (const GeomDetUnit *)tracker->idToDetUnit(detid);
+    GlobalPoint gpos = det->toGlobal(itHit->localPosition());
     htofeta->Fill(gpos.eta(), itHit->timeOfFlight());
     htofphi->Fill(gpos.phi().degrees(), itHit->timeOfFlight());
     htofr->Fill(gpos.mag(), itHit->timeOfFlight());
     htofz->Fill(gpos.z(), itHit->timeOfFlight());
 
-
-   h1e[ir]->Fill(itHit->energyLoss());
-   h1ex[ir]->Fill(itHit->entryPoint().x()-itHit->exitPoint().x());
-   h1ey[ir]->Fill(itHit->entryPoint().y()-itHit->exitPoint().y());
-   h1ez[ir]->Fill(std::fabs(itHit->entryPoint().z()-itHit->exitPoint().z()));
-   h1lx[ir]->Fill(itHit->localPosition().x());
-   h1ly[ir]->Fill(itHit->localPosition().y());
+    h1e[ir]->Fill(itHit->energyLoss());
+    h1ex[ir]->Fill(itHit->entryPoint().x() - itHit->exitPoint().x());
+    h1ey[ir]->Fill(itHit->entryPoint().y() - itHit->exitPoint().y());
+    h1ez[ir]->Fill(std::fabs(itHit->entryPoint().z() - itHit->exitPoint().z()));
+    h1lx[ir]->Fill(itHit->localPosition().x());
+    h1ly[ir]->Fill(itHit->localPosition().y());
   }
   ///////////////////////////////
   // get TOB information
   ///////////////////////////////
   for (itHit = SiTOBLowContainer->begin(); itHit != SiTOBLowContainer->end(); ++itHit) {
-    DetId detid=DetId(itHit->detUnitId());
-    const GeomDetUnit * det=(const GeomDetUnit*)tracker->idToDetUnit( detid );
-    GlobalPoint gpos=det->toGlobal(itHit->localPosition());
+    DetId detid = DetId(itHit->detUnitId());
+    const GeomDetUnit *det = (const GeomDetUnit *)tracker->idToDetUnit(detid);
+    GlobalPoint gpos = det->toGlobal(itHit->localPosition());
     htofeta->Fill(gpos.eta(), itHit->timeOfFlight());
     htofphi->Fill(gpos.phi().degrees(), itHit->timeOfFlight());
     htofr->Fill(gpos.mag(), itHit->timeOfFlight());
     htofz->Fill(gpos.z(), itHit->timeOfFlight());
 
-
-   h2e[ir]->Fill(itHit->energyLoss());
-   h2ex[ir]->Fill(itHit->entryPoint().x()-itHit->exitPoint().x());
-   h2ey[ir]->Fill(itHit->entryPoint().y()-itHit->exitPoint().y());
-   h2ez[ir]->Fill(std::fabs(itHit->entryPoint().z()-itHit->exitPoint().z()));
-   h2lx[ir]->Fill(itHit->localPosition().x());
-   h2ly[ir]->Fill(itHit->localPosition().y());
-  }  
+    h2e[ir]->Fill(itHit->energyLoss());
+    h2ex[ir]->Fill(itHit->entryPoint().x() - itHit->exitPoint().x());
+    h2ey[ir]->Fill(itHit->entryPoint().y() - itHit->exitPoint().y());
+    h2ez[ir]->Fill(std::fabs(itHit->entryPoint().z() - itHit->exitPoint().z()));
+    h2lx[ir]->Fill(itHit->localPosition().x());
+    h2ly[ir]->Fill(itHit->localPosition().y());
+  }
   for (itHit = SiTOBHighContainer->begin(); itHit != SiTOBHighContainer->end(); ++itHit) {
-    DetId detid=DetId(itHit->detUnitId());
-    const GeomDetUnit * det=(const GeomDetUnit*)tracker->idToDetUnit( detid );
-    GlobalPoint gpos=det->toGlobal(itHit->localPosition());
+    DetId detid = DetId(itHit->detUnitId());
+    const GeomDetUnit *det = (const GeomDetUnit *)tracker->idToDetUnit(detid);
+    GlobalPoint gpos = det->toGlobal(itHit->localPosition());
     htofeta->Fill(gpos.eta(), itHit->timeOfFlight());
     htofphi->Fill(gpos.phi().degrees(), itHit->timeOfFlight());
     htofr->Fill(gpos.mag(), itHit->timeOfFlight());
     htofz->Fill(gpos.z(), itHit->timeOfFlight());
 
-   h2e[ir]->Fill(itHit->energyLoss());
-   h2ex[ir]->Fill(itHit->entryPoint().x()-itHit->exitPoint().x());
-   h2ey[ir]->Fill(itHit->entryPoint().y()-itHit->exitPoint().y());
-   h2ez[ir]->Fill(std::fabs(itHit->entryPoint().z()-itHit->exitPoint().z()));
-   h2lx[ir]->Fill(itHit->localPosition().x());
-   h2ly[ir]->Fill(itHit->localPosition().y());
+    h2e[ir]->Fill(itHit->energyLoss());
+    h2ex[ir]->Fill(itHit->entryPoint().x() - itHit->exitPoint().x());
+    h2ey[ir]->Fill(itHit->entryPoint().y() - itHit->exitPoint().y());
+    h2ez[ir]->Fill(std::fabs(itHit->entryPoint().z() - itHit->exitPoint().z()));
+    h2lx[ir]->Fill(itHit->localPosition().x());
+    h2ly[ir]->Fill(itHit->localPosition().y());
   }
   ///////////////////////////////
   // get TID information
   ///////////////////////////////
   for (itHit = SiTIDLowContainer->begin(); itHit != SiTIDLowContainer->end(); ++itHit) {
-    DetId detid=DetId(itHit->detUnitId());
-    const GeomDetUnit * det=(const GeomDetUnit*)tracker->idToDetUnit( detid );
-    GlobalPoint gpos=det->toGlobal(itHit->localPosition());
+    DetId detid = DetId(itHit->detUnitId());
+    const GeomDetUnit *det = (const GeomDetUnit *)tracker->idToDetUnit(detid);
+    GlobalPoint gpos = det->toGlobal(itHit->localPosition());
     htofeta->Fill(gpos.eta(), itHit->timeOfFlight());
     htofphi->Fill(gpos.phi().degrees(), itHit->timeOfFlight());
     htofr->Fill(gpos.mag(), itHit->timeOfFlight());
     htofz->Fill(gpos.z(), itHit->timeOfFlight());
 
-   h3e[ir]->Fill(itHit->energyLoss());
-   h3ex[ir]->Fill(itHit->entryPoint().x()-itHit->exitPoint().x());
-   h3ey[ir]->Fill(itHit->entryPoint().y()-itHit->exitPoint().y());
-   h3ez[ir]->Fill(std::fabs(itHit->entryPoint().z()-itHit->exitPoint().z()));
-   h3lx[ir]->Fill(itHit->localPosition().x());
-   h3ly[ir]->Fill(itHit->localPosition().y());
-  }  
+    h3e[ir]->Fill(itHit->energyLoss());
+    h3ex[ir]->Fill(itHit->entryPoint().x() - itHit->exitPoint().x());
+    h3ey[ir]->Fill(itHit->entryPoint().y() - itHit->exitPoint().y());
+    h3ez[ir]->Fill(std::fabs(itHit->entryPoint().z() - itHit->exitPoint().z()));
+    h3lx[ir]->Fill(itHit->localPosition().x());
+    h3ly[ir]->Fill(itHit->localPosition().y());
+  }
   for (itHit = SiTIDHighContainer->begin(); itHit != SiTIDHighContainer->end(); ++itHit) {
-    DetId detid=DetId(itHit->detUnitId());
-    const GeomDetUnit * det=(const GeomDetUnit*)tracker->idToDetUnit( detid );
-    GlobalPoint gpos=det->toGlobal(itHit->localPosition());
+    DetId detid = DetId(itHit->detUnitId());
+    const GeomDetUnit *det = (const GeomDetUnit *)tracker->idToDetUnit(detid);
+    GlobalPoint gpos = det->toGlobal(itHit->localPosition());
     htofeta->Fill(gpos.eta(), itHit->timeOfFlight());
     htofphi->Fill(gpos.phi().degrees(), itHit->timeOfFlight());
     htofr->Fill(gpos.mag(), itHit->timeOfFlight());
     htofz->Fill(gpos.z(), itHit->timeOfFlight());
 
-   h3e[ir]->Fill(itHit->energyLoss());
-   h3ex[ir]->Fill(itHit->entryPoint().x()-itHit->exitPoint().x());
-   h3ey[ir]->Fill(itHit->entryPoint().y()-itHit->exitPoint().y());
-   h3ez[ir]->Fill(std::fabs(itHit->entryPoint().z()-itHit->exitPoint().z()));
-   h3lx[ir]->Fill(itHit->localPosition().x());
-   h3ly[ir]->Fill(itHit->localPosition().y());
+    h3e[ir]->Fill(itHit->energyLoss());
+    h3ex[ir]->Fill(itHit->entryPoint().x() - itHit->exitPoint().x());
+    h3ey[ir]->Fill(itHit->entryPoint().y() - itHit->exitPoint().y());
+    h3ez[ir]->Fill(std::fabs(itHit->entryPoint().z() - itHit->exitPoint().z()));
+    h3lx[ir]->Fill(itHit->localPosition().x());
+    h3ly[ir]->Fill(itHit->localPosition().y());
   }
   ///////////////////////////////
   // get TEC information
   ///////////////////////////////
   for (itHit = SiTECLowContainer->begin(); itHit != SiTECLowContainer->end(); ++itHit) {
-    DetId detid=DetId(itHit->detUnitId());
-    const GeomDetUnit * det=(const GeomDetUnit*)tracker->idToDetUnit( detid );
-    GlobalPoint gpos=det->toGlobal(itHit->localPosition());
+    DetId detid = DetId(itHit->detUnitId());
+    const GeomDetUnit *det = (const GeomDetUnit *)tracker->idToDetUnit(detid);
+    GlobalPoint gpos = det->toGlobal(itHit->localPosition());
     htofeta->Fill(gpos.eta(), itHit->timeOfFlight());
     htofphi->Fill(gpos.phi().degrees(), itHit->timeOfFlight());
     htofr->Fill(gpos.mag(), itHit->timeOfFlight());
     htofz->Fill(gpos.z(), itHit->timeOfFlight());
 
-   h4e[ir]->Fill(itHit->energyLoss());
-   h4ex[ir]->Fill(itHit->entryPoint().x()-itHit->exitPoint().x());
-   h4ey[ir]->Fill(itHit->entryPoint().y()-itHit->exitPoint().y());
-   h4ez[ir]->Fill(std::fabs(itHit->entryPoint().z()-itHit->exitPoint().z()));
-   h4lx[ir]->Fill(itHit->localPosition().x());
-   h4ly[ir]->Fill(itHit->localPosition().y());
-  }  
+    h4e[ir]->Fill(itHit->energyLoss());
+    h4ex[ir]->Fill(itHit->entryPoint().x() - itHit->exitPoint().x());
+    h4ey[ir]->Fill(itHit->entryPoint().y() - itHit->exitPoint().y());
+    h4ez[ir]->Fill(std::fabs(itHit->entryPoint().z() - itHit->exitPoint().z()));
+    h4lx[ir]->Fill(itHit->localPosition().x());
+    h4ly[ir]->Fill(itHit->localPosition().y());
+  }
   for (itHit = SiTECHighContainer->begin(); itHit != SiTECHighContainer->end(); ++itHit) {
-    DetId detid=DetId(itHit->detUnitId());
-    const GeomDetUnit * det=(const GeomDetUnit*)tracker->idToDetUnit( detid );
-    GlobalPoint gpos=det->toGlobal(itHit->localPosition());
+    DetId detid = DetId(itHit->detUnitId());
+    const GeomDetUnit *det = (const GeomDetUnit *)tracker->idToDetUnit(detid);
+    GlobalPoint gpos = det->toGlobal(itHit->localPosition());
     htofeta->Fill(gpos.eta(), itHit->timeOfFlight());
     htofphi->Fill(gpos.phi().degrees(), itHit->timeOfFlight());
     htofr->Fill(gpos.mag(), itHit->timeOfFlight());
     htofz->Fill(gpos.z(), itHit->timeOfFlight());
 
-   h4e[ir]->Fill(itHit->energyLoss());
-   h4ex[ir]->Fill(itHit->entryPoint().x()-itHit->exitPoint().x());
-   h4ey[ir]->Fill(itHit->entryPoint().y()-itHit->exitPoint().y());
-   h4ez[ir]->Fill(std::fabs(itHit->entryPoint().z()-itHit->exitPoint().z()));
-   h4lx[ir]->Fill(itHit->localPosition().x());
-   h4ly[ir]->Fill(itHit->localPosition().y());
+    h4e[ir]->Fill(itHit->energyLoss());
+    h4ex[ir]->Fill(itHit->entryPoint().x() - itHit->exitPoint().x());
+    h4ey[ir]->Fill(itHit->entryPoint().y() - itHit->exitPoint().y());
+    h4ez[ir]->Fill(std::fabs(itHit->entryPoint().z() - itHit->exitPoint().z()));
+    h4lx[ir]->Fill(itHit->localPosition().x());
+    h4ly[ir]->Fill(itHit->localPosition().y());
   }
-  
-      
-   return ;
-   
+
+  return;
 }
 
 DEFINE_FWK_MODULE(TrackerHitAnalyzer);
-
diff --git a/Validation/TrackerHits/src/TrackerHitProducer.cc b/Validation/TrackerHits/src/TrackerHitProducer.cc
index 9cd12079de16a..c8c04f5c76ee9 100644
--- a/Validation/TrackerHits/src/TrackerHitProducer.cc
+++ b/Validation/TrackerHits/src/TrackerHitProducer.cc
@@ -18,50 +18,61 @@
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
 
 // data in edm::event
-#include "SimDataFormats/ValidationFormats/interface/PValidationFormats.h"
+#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
 #include "SimDataFormats/GeneratorProducts/interface/HepMCProduct.h"
 #include "SimDataFormats/TrackingHit/interface/PSimHitContainer.h"
-#include "SimDataFormats/CaloHit/interface/PCaloHitContainer.h"
+#include "SimDataFormats/ValidationFormats/interface/PValidationFormats.h"
 
 // helper files
-#include <CLHEP/Vector/LorentzVector.h>
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
+#include <CLHEP/Vector/LorentzVector.h>
 
 #include "TString.h"
 
 #include <cmath>
-#include <memory>
 #include <cstdlib>
+#include <memory>
 
-TrackerHitProducer::TrackerHitProducer(const edm::ParameterSet& iPSet)
-  : getAllProvenances( iPSet.getParameter<edm::ParameterSet>( "ProvenanceLookup" ).getUntrackedParameter<bool>( "GetAllProvenances", false ) )
-  , printProvenanceInfo( iPSet.getParameter<edm::ParameterSet>( "ProvenanceLookup" ).getUntrackedParameter<bool>( "PrintProvenanceInfo", false ) )
-  , verbosity( iPSet.getUntrackedParameter<int>( "Verbosity", 0 ) )
-  , count( 0 )
-  , nRawGenPart( 0 )
-  , config_( iPSet )
-  , edmHepMCProductToken_( consumes<edm::HepMCProduct>( edm::InputTag( iPSet.getUntrackedParameter<std::string>( "HepMCProductLabel", "source" )
-                                                                     , iPSet.getUntrackedParameter<std::string>( "HepMCInputInstance", "" )
-								       )
-							)
-			   )
-  , edmSimVertexContainerToken_( consumes<edm::SimVertexContainer>( iPSet.getParameter<edm::InputTag>("G4VtxSrc") ) )
-  , edmSimTrackContainerToken_( consumes<edm::SimTrackContainer>( iPSet.getParameter<edm::InputTag>( "G4TrkSrc" ) ) )
-  , edmPSimHitContainer_pxlBrlLow_Token_( consumes<edm::PSimHitContainer>( iPSet.getParameter<edm::InputTag>( "PxlBrlLowSrc" ) ) )
-  , edmPSimHitContainer_pxlBrlHigh_Token_( consumes<edm::PSimHitContainer>( iPSet.getParameter<edm::InputTag>( "PxlBrlHighSrc" ) ) )
-  , edmPSimHitContainer_pxlFwdLow_Token_( consumes<edm::PSimHitContainer>( iPSet.getParameter<edm::InputTag>( "PxlFwdLowSrc" ) ) )
-  , edmPSimHitContainer_pxlFwdHigh_Token_( consumes<edm::PSimHitContainer>( iPSet.getParameter<edm::InputTag>( "PxlFwdHighSrc" ) ) )
-  , edmPSimHitContainer_siTIBLow_Token_( consumes<edm::PSimHitContainer>( iPSet.getParameter<edm::InputTag>( "SiTIBLowSrc" ) ) )
-  , edmPSimHitContainer_siTIBHigh_Token_( consumes<edm::PSimHitContainer>( iPSet.getParameter<edm::InputTag>( "SiTIBHighSrc" ) ) )
-  , edmPSimHitContainer_siTOBLow_Token_( consumes<edm::PSimHitContainer>( iPSet.getParameter<edm::InputTag>( "SiTOBLowSrc" ) ) )
-  , edmPSimHitContainer_siTOBHigh_Token_( consumes<edm::PSimHitContainer>( iPSet.getParameter<edm::InputTag>( "SiTOBHighSrc" ) ) )
-  , edmPSimHitContainer_siTIDLow_Token_( consumes<edm::PSimHitContainer>( iPSet.getParameter<edm::InputTag>( "SiTIDLowSrc" ) ) )
-  , edmPSimHitContainer_siTIDHigh_Token_( consumes<edm::PSimHitContainer>( iPSet.getParameter<edm::InputTag>( "SiTIDHighSrc" ) ) )
-  , edmPSimHitContainer_siTECLow_Token_( consumes<edm::PSimHitContainer>( iPSet.getParameter<edm::InputTag>( "SiTECLowSrc" ) ) )
-  , edmPSimHitContainer_siTECHigh_Token_( consumes<edm::PSimHitContainer>( iPSet.getParameter<edm::InputTag>( "SiTECHighSrc" ) ) )
-  , fName( iPSet.getUntrackedParameter<std::string>( "Name", "" ) )
-  , label( iPSet.getParameter<std::string>( "Label" ) )
-{
+TrackerHitProducer::TrackerHitProducer(const edm::ParameterSet &iPSet)
+    : getAllProvenances(iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup")
+                            .getUntrackedParameter<bool>("GetAllProvenances", false)),
+      printProvenanceInfo(iPSet.getParameter<edm::ParameterSet>("ProvenanceLookup")
+                              .getUntrackedParameter<bool>("PrintProvenanceInfo", false)),
+      verbosity(iPSet.getUntrackedParameter<int>("Verbosity", 0)),
+      count(0),
+      nRawGenPart(0),
+      config_(iPSet),
+      edmHepMCProductToken_(consumes<edm::HepMCProduct>(
+          edm::InputTag(iPSet.getUntrackedParameter<std::string>("HepMCProductLabel", "source"),
+                        iPSet.getUntrackedParameter<std::string>("HepMCInputInstance", "")))),
+      edmSimVertexContainerToken_(consumes<edm::SimVertexContainer>(iPSet.getParameter<edm::InputTag>("G4VtxSrc"))),
+      edmSimTrackContainerToken_(consumes<edm::SimTrackContainer>(iPSet.getParameter<edm::InputTag>("G4TrkSrc"))),
+      edmPSimHitContainer_pxlBrlLow_Token_(
+          consumes<edm::PSimHitContainer>(iPSet.getParameter<edm::InputTag>("PxlBrlLowSrc"))),
+      edmPSimHitContainer_pxlBrlHigh_Token_(
+          consumes<edm::PSimHitContainer>(iPSet.getParameter<edm::InputTag>("PxlBrlHighSrc"))),
+      edmPSimHitContainer_pxlFwdLow_Token_(
+          consumes<edm::PSimHitContainer>(iPSet.getParameter<edm::InputTag>("PxlFwdLowSrc"))),
+      edmPSimHitContainer_pxlFwdHigh_Token_(
+          consumes<edm::PSimHitContainer>(iPSet.getParameter<edm::InputTag>("PxlFwdHighSrc"))),
+      edmPSimHitContainer_siTIBLow_Token_(
+          consumes<edm::PSimHitContainer>(iPSet.getParameter<edm::InputTag>("SiTIBLowSrc"))),
+      edmPSimHitContainer_siTIBHigh_Token_(
+          consumes<edm::PSimHitContainer>(iPSet.getParameter<edm::InputTag>("SiTIBHighSrc"))),
+      edmPSimHitContainer_siTOBLow_Token_(
+          consumes<edm::PSimHitContainer>(iPSet.getParameter<edm::InputTag>("SiTOBLowSrc"))),
+      edmPSimHitContainer_siTOBHigh_Token_(
+          consumes<edm::PSimHitContainer>(iPSet.getParameter<edm::InputTag>("SiTOBHighSrc"))),
+      edmPSimHitContainer_siTIDLow_Token_(
+          consumes<edm::PSimHitContainer>(iPSet.getParameter<edm::InputTag>("SiTIDLowSrc"))),
+      edmPSimHitContainer_siTIDHigh_Token_(
+          consumes<edm::PSimHitContainer>(iPSet.getParameter<edm::InputTag>("SiTIDHighSrc"))),
+      edmPSimHitContainer_siTECLow_Token_(
+          consumes<edm::PSimHitContainer>(iPSet.getParameter<edm::InputTag>("SiTECLowSrc"))),
+      edmPSimHitContainer_siTECHigh_Token_(
+          consumes<edm::PSimHitContainer>(iPSet.getParameter<edm::InputTag>("SiTECHighSrc"))),
+      fName(iPSet.getUntrackedParameter<std::string>("Name", "")),
+      label(iPSet.getParameter<std::string>("Label")) {
   // use value of first digit to determine default output level (inclusive)
   // 0 is none, 1 is basic, 2 is fill output, 3 is gather output
   verbosity %= 10;
@@ -71,65 +82,58 @@ TrackerHitProducer::TrackerHitProducer(const edm::ParameterSet& iPSet)
 
   // print out Parameter Set information being used
   if (verbosity > 0) {
-    edm::LogInfo ("TrackerHitProducer::TrackerHitProducer") 
-      << "\n===============================\n"
-      << "Initialized as EDProducer with parameter values:\n"
-      << "    Name      =" << fName << "\n"
-      << "    Verbosity =" << verbosity << "\n"
-      << "    Label     =" << label << "\n"
-      << "    GetProv   =" << getAllProvenances << "\n"
-      << "    PrintProv =" << printProvenanceInfo << "\n"
-      << "    PxlBrlLowSrc  = " << iPSet.getParameter<edm::InputTag>("PxlBrlLowSrc").label() 
-      << ":" << iPSet.getParameter<edm::InputTag>("PxlBrlLowSrc").instance() << "\n"
-      << "    PxlBrlHighSrc = " << iPSet.getParameter<edm::InputTag>("PxlBrlHighSrc").label() 
-      << ":" << iPSet.getParameter<edm::InputTag>("PxlBrlHighSrc").instance() << "\n"
-      << "    PxlFwdLowSrc  = " << iPSet.getParameter<edm::InputTag>("PxlFwdLowSrc").label() 
-      << ":" << iPSet.getParameter<edm::InputTag>("PxlFwdLowSrc").instance() << "\n"
-      << "    PxlFwdHighSrc = " << iPSet.getParameter<edm::InputTag>("PxlFwdHighSrc").label() 
-      << ":" << iPSet.getParameter<edm::InputTag>("PxlFwdHighSrc").instance() << "\n"
-      << "    SiTIBLowSrc   = " << iPSet.getParameter<edm::InputTag>("SiTIBLowSrc").label() 
-      << ":" << iPSet.getParameter<edm::InputTag>("SiTIBLowSrc").instance() << "\n"
-      << "    SiTIBHighSrc  = " << iPSet.getParameter<edm::InputTag>("SiTIBHighSrc").label() 
-      << ":" << iPSet.getParameter<edm::InputTag>("SiTIBHighSrc").instance() << "\n"
-      << "    SiTOBLowSrc   = " << iPSet.getParameter<edm::InputTag>("SiTOBLowSrc").label() 
-      << ":" << iPSet.getParameter<edm::InputTag>("SiTOBLowSrc").instance() << "\n"
-      << "    SiTOBHighSrc  = " << iPSet.getParameter<edm::InputTag>("SiTOBHighSrc").label() 
-      << ":" << iPSet.getParameter<edm::InputTag>("SiTOBHighSrc").instance() << "\n"
-      << "    SiTIDLowSrc   = " << iPSet.getParameter<edm::InputTag>("SiTIDLowSrc").label() 
-      << ":" << iPSet.getParameter<edm::InputTag>("SiTIDLowSrc").instance() << "\n"
-      << "    SiTIDHighSrc  = " << iPSet.getParameter<edm::InputTag>("SiTIDHighSrc").label() 
-      << ":" << iPSet.getParameter<edm::InputTag>("SiTIDHighSrc").instance() << "\n"
-      << "    SiTECLowSrc   = " << iPSet.getParameter<edm::InputTag>("SiTECLowSrc").label() 
-      << ":" << iPSet.getParameter<edm::InputTag>("SiTECLowSrc").instance() << "\n"
-      << "    SiTECHighSrc  = " << iPSet.getParameter<edm::InputTag>("SiTECHighSrc").label() 
-      << ":" << iPSet.getParameter<edm::InputTag>("SiTECHighSrc").instance() << "\n"
-      << "===============================\n";  }
+    edm::LogInfo("TrackerHitProducer::TrackerHitProducer")
+        << "\n===============================\n"
+        << "Initialized as EDProducer with parameter values:\n"
+        << "    Name      =" << fName << "\n"
+        << "    Verbosity =" << verbosity << "\n"
+        << "    Label     =" << label << "\n"
+        << "    GetProv   =" << getAllProvenances << "\n"
+        << "    PrintProv =" << printProvenanceInfo << "\n"
+        << "    PxlBrlLowSrc  = " << iPSet.getParameter<edm::InputTag>("PxlBrlLowSrc").label() << ":"
+        << iPSet.getParameter<edm::InputTag>("PxlBrlLowSrc").instance() << "\n"
+        << "    PxlBrlHighSrc = " << iPSet.getParameter<edm::InputTag>("PxlBrlHighSrc").label() << ":"
+        << iPSet.getParameter<edm::InputTag>("PxlBrlHighSrc").instance() << "\n"
+        << "    PxlFwdLowSrc  = " << iPSet.getParameter<edm::InputTag>("PxlFwdLowSrc").label() << ":"
+        << iPSet.getParameter<edm::InputTag>("PxlFwdLowSrc").instance() << "\n"
+        << "    PxlFwdHighSrc = " << iPSet.getParameter<edm::InputTag>("PxlFwdHighSrc").label() << ":"
+        << iPSet.getParameter<edm::InputTag>("PxlFwdHighSrc").instance() << "\n"
+        << "    SiTIBLowSrc   = " << iPSet.getParameter<edm::InputTag>("SiTIBLowSrc").label() << ":"
+        << iPSet.getParameter<edm::InputTag>("SiTIBLowSrc").instance() << "\n"
+        << "    SiTIBHighSrc  = " << iPSet.getParameter<edm::InputTag>("SiTIBHighSrc").label() << ":"
+        << iPSet.getParameter<edm::InputTag>("SiTIBHighSrc").instance() << "\n"
+        << "    SiTOBLowSrc   = " << iPSet.getParameter<edm::InputTag>("SiTOBLowSrc").label() << ":"
+        << iPSet.getParameter<edm::InputTag>("SiTOBLowSrc").instance() << "\n"
+        << "    SiTOBHighSrc  = " << iPSet.getParameter<edm::InputTag>("SiTOBHighSrc").label() << ":"
+        << iPSet.getParameter<edm::InputTag>("SiTOBHighSrc").instance() << "\n"
+        << "    SiTIDLowSrc   = " << iPSet.getParameter<edm::InputTag>("SiTIDLowSrc").label() << ":"
+        << iPSet.getParameter<edm::InputTag>("SiTIDLowSrc").instance() << "\n"
+        << "    SiTIDHighSrc  = " << iPSet.getParameter<edm::InputTag>("SiTIDHighSrc").label() << ":"
+        << iPSet.getParameter<edm::InputTag>("SiTIDHighSrc").instance() << "\n"
+        << "    SiTECLowSrc   = " << iPSet.getParameter<edm::InputTag>("SiTECLowSrc").label() << ":"
+        << iPSet.getParameter<edm::InputTag>("SiTECLowSrc").instance() << "\n"
+        << "    SiTECHighSrc  = " << iPSet.getParameter<edm::InputTag>("SiTECHighSrc").label() << ":"
+        << iPSet.getParameter<edm::InputTag>("SiTECHighSrc").instance() << "\n"
+        << "===============================\n";
+  }
 }
 
-TrackerHitProducer::~TrackerHitProducer() 
-{
-}
+TrackerHitProducer::~TrackerHitProducer() {}
 
-void TrackerHitProducer::beginJob()
-{
+void TrackerHitProducer::beginJob() {
   if (verbosity > 0)
-    edm::LogInfo ("TrackerHitProducer::beginJob") 
-      << "Starting the job...";
+    edm::LogInfo("TrackerHitProducer::beginJob") << "Starting the job...";
   clear();
   return;
 }
 
-void TrackerHitProducer::endJob()
-{
+void TrackerHitProducer::endJob() {
   if (verbosity > 0)
-    edm::LogInfo ("TrackerHitProducer::endJob") 
-      << "Terminating having processed" << count << "events.";
+    edm::LogInfo("TrackerHitProducer::endJob") << "Terminating having processed" << count << "events.";
   return;
 }
 
-void TrackerHitProducer::produce(edm::Event& iEvent, 
-                   const edm::EventSetup& iSetup)
-{
+void TrackerHitProducer::produce(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   // keep track of number of events processed
   ++count;
 
@@ -138,12 +142,12 @@ void TrackerHitProducer::produce(edm::Event& iEvent,
   edm::EventNumber_t nevt = iEvent.id().event();
 
   // get event setup information
-  //edm::ESHandle<edm::SetupData> pSetup;
-  //iSetup.get<edm::SetupRecord>().get(pSetup);
+  // edm::ESHandle<edm::SetupData> pSetup;
+  // iSetup.get<edm::SetupRecord>().get(pSetup);
 
   if (verbosity > 0) {
-    edm::LogInfo ("TrackerHitProducer::produce")
-      << "Processing run" << nrun << "," << "event " << nevt;
+    edm::LogInfo("TrackerHitProducer::produce") << "Processing run" << nrun << ","
+                                                << "event " << nevt;
   }
 
   // clear event holders
@@ -151,31 +155,29 @@ void TrackerHitProducer::produce(edm::Event& iEvent,
 
   // look at information available in the event
   if (getAllProvenances) {
-
-    std::vector<const edm::StableProvenance*> AllProv;
+    std::vector<const edm::StableProvenance *> AllProv;
     iEvent.getAllStableProvenance(AllProv);
 
     if (verbosity > 0)
-      edm::LogInfo ("TrackerHitProducer::produce")
-    << "Number of Provenances =" << AllProv.size();
+      edm::LogInfo("TrackerHitProducer::produce") << "Number of Provenances =" << AllProv.size();
 
     if (printProvenanceInfo && (verbosity > 0)) {
       TString eventout("\nProvenance info:\n");
-      
+
       for (unsigned int i = 0; i < AllProv.size(); ++i) {
-    eventout += "\n       ******************************";
-    eventout += "\n       Module       : ";
-    eventout += AllProv[i]->moduleLabel();
-    eventout += "\n       ProductID process index: ";
-    eventout += AllProv[i]->productID().processIndex();
-    eventout += "\n       ProductID product index: ";
-    eventout += AllProv[i]->productID().productIndex();
-    eventout += "\n       ClassName    : ";
-    eventout += AllProv[i]->className();
-    eventout += "\n       InstanceName : ";
-    eventout += AllProv[i]->productInstanceName();
-    eventout += "\n       BranchName   : ";
-    eventout += AllProv[i]->branchName();
+        eventout += "\n       ******************************";
+        eventout += "\n       Module       : ";
+        eventout += AllProv[i]->moduleLabel();
+        eventout += "\n       ProductID process index: ";
+        eventout += AllProv[i]->productID().processIndex();
+        eventout += "\n       ProductID product index: ";
+        eventout += AllProv[i]->productID().productIndex();
+        eventout += "\n       ClassName    : ";
+        eventout += AllProv[i]->className();
+        eventout += "\n       InstanceName : ";
+        eventout += AllProv[i]->productInstanceName();
+        eventout += "\n       BranchName   : ";
+        eventout += AllProv[i]->branchName();
       }
       eventout += "       ******************************\n";
       edm::LogInfo("TrackerHitProducer::produce") << eventout;
@@ -183,21 +185,19 @@ void TrackerHitProducer::produce(edm::Event& iEvent,
   }
 
   // call fill functions
-  //gather G4MC information from event
+  // gather G4MC information from event
   fillG4MC(iEvent);
   // gather Tracker information from event
-  fillTrk(iEvent,iSetup);
+  fillTrk(iEvent, iSetup);
 
   if (verbosity > 0)
-    edm::LogInfo ("TrackerHitProducer::produce")
-      << "Done gathering data from event.";
+    edm::LogInfo("TrackerHitProducer::produce") << "Done gathering data from event.";
 
   // produce object to put into event
   std::unique_ptr<PTrackerSimHit> pOut(new PTrackerSimHit);
 
   if (verbosity > 2)
-    edm::LogInfo ("TrackerHitProducer::produce")
-      << "Saving event contents:";
+    edm::LogInfo("TrackerHitProducer::produce") << "Saving event contents:";
 
   // call store functions
   // store G4MC information in product
@@ -206,15 +206,13 @@ void TrackerHitProducer::produce(edm::Event& iEvent,
   storeTrk(*pOut);
 
   // store information in event
-  iEvent.put(std::move(pOut),label);
+  iEvent.put(std::move(pOut), label);
 
   return;
 }
 
 //==================fill and store functions================================
-void TrackerHitProducer::fillG4MC(edm::Event& iEvent)
-{
- 
+void TrackerHitProducer::fillG4MC(edm::Event &iEvent) {
   TString eventout;
   if (verbosity > 0)
     eventout = "\nGathering info:";
@@ -223,95 +221,85 @@ void TrackerHitProducer::fillG4MC(edm::Event& iEvent)
   // get MC information
   /////////////////////
   edm::Handle<edm::HepMCProduct> HepMCEvt_;
-  iEvent.getByToken( edmHepMCProductToken_, HepMCEvt_ );
+  iEvent.getByToken(edmHepMCProductToken_, HepMCEvt_);
   if (!HepMCEvt_.isValid()) {
-    edm::LogError("TrackerHitProducer::fillG4MC")
-      << "Unable to find HepMCProduct in event!";
+    edm::LogError("TrackerHitProducer::fillG4MC") << "Unable to find HepMCProduct in event!";
     return;
   }
-  const HepMC::GenEvent* MCEvt = HepMCEvt_->GetEvent();
+  const HepMC::GenEvent *MCEvt = HepMCEvt_->GetEvent();
   nRawGenPart = MCEvt->particles_size();
 
   if (verbosity > 1) {
     eventout += "\n          Number of Raw Particles collected:         ";
     eventout += nRawGenPart;
-  }  
+  }
 
   ////////////////////////////
   // get G4Vertex information
   ////////////////////////////
   edm::Handle<edm::SimVertexContainer> G4VtxContainer;
-  iEvent.getByToken( edmSimVertexContainerToken_, G4VtxContainer );
+  iEvent.getByToken(edmSimVertexContainerToken_, G4VtxContainer);
   if (!G4VtxContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::fillG4MC")
-      << "Unable to find SimVertex in event!";
+    edm::LogError("TrackerHitProducer::fillG4MC") << "Unable to find SimVertex in event!";
     return;
   }
   int i = 0;
   edm::SimVertexContainer::const_iterator itVtx;
-  for (itVtx = G4VtxContainer->begin(); itVtx != G4VtxContainer->end(); 
-       ++itVtx) {
-    
+  for (itVtx = G4VtxContainer->begin(); itVtx != G4VtxContainer->end(); ++itVtx) {
     ++i;
 
-    const CLHEP::HepLorentzVector& G4Vtx = CLHEP::HepLorentzVector(itVtx->position().x(),
-                                                     itVtx->position().y(),
-                                                     itVtx->position().z(),  
-                                                     itVtx->position().e());
-    G4VtxX.push_back(G4Vtx[0]/micrometer); //cm from code -> micrometer *10000
-    G4VtxY.push_back(G4Vtx[1]/micrometer); //cm from code -> micrometer *10000
-    G4VtxZ.push_back(G4Vtx[2]/millimeter); //cm from code -> millimeter *10
+    const CLHEP::HepLorentzVector &G4Vtx = CLHEP::HepLorentzVector(
+        itVtx->position().x(), itVtx->position().y(), itVtx->position().z(), itVtx->position().e());
+    G4VtxX.push_back(G4Vtx[0] / micrometer);  // cm from code -> micrometer
+                                              // *10000
+    G4VtxY.push_back(G4Vtx[1] / micrometer);  // cm from code -> micrometer
+                                              // *10000
+    G4VtxZ.push_back(G4Vtx[2] / millimeter);  // cm from code -> millimeter *10
   }
 
   if (verbosity > 1) {
     eventout += "\n          Number of G4Vertices collected:            ";
     eventout += i;
-  }  
+  }
 
   ///////////////////////////
   // get G4Track information
   ///////////////////////////
   edm::Handle<edm::SimTrackContainer> G4TrkContainer;
-  iEvent.getByToken( edmSimTrackContainerToken_, G4TrkContainer );
+  iEvent.getByToken(edmSimTrackContainerToken_, G4TrkContainer);
   if (!G4TrkContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::fillG4MC")
-      << "Unable to find SimTrack in event!";
+    edm::LogError("TrackerHitProducer::fillG4MC") << "Unable to find SimTrack in event!";
     return;
   }
   i = 0;
   edm::SimTrackContainer::const_iterator itTrk;
-  for (itTrk = G4TrkContainer->begin(); itTrk != G4TrkContainer->end(); 
-       ++itTrk) {
-
+  for (itTrk = G4TrkContainer->begin(); itTrk != G4TrkContainer->end(); ++itTrk) {
     ++i;
 
-    double etaInit =0, phiInit =0, pInit =0;
-    const CLHEP::HepLorentzVector& G4Trk = CLHEP::HepLorentzVector(itTrk->momentum().x(),
-                                                     itTrk->momentum().y(),
-                                                     itTrk->momentum().z(),
-                                                     itTrk->momentum().e());
-    pInit =sqrt(G4Trk[0]*G4Trk[0]+G4Trk[1]*G4Trk[1]+G4Trk[2]*G4Trk[2]);
-      if ( pInit == 0) 
-          edm::LogError("TrackerHitProducer::fillG4MC") 
-          << "TrackerTest::INFO: Primary has p = 0 ";
-      else {
-          double costheta  = G4Trk[2]/pInit;
-              double theta = acos(TMath::Min(TMath::Max(costheta, -1.),1.));
-          etaInit = -log(tan(theta/2));
-          
-          if ( G4Trk[0] != 0 || G4Trk[1] != 0) 
-              phiInit = atan2(G4Trk[1],G4Trk[0]);
-      }
-    G4TrkPt.push_back(sqrt(G4Trk[0]*G4Trk[0]+G4Trk[1]*G4Trk[1])); //GeV
-    G4TrkE.push_back(G4Trk[3]);                                   //GeV
-    G4TrkEta.push_back(etaInit);                                   
-    G4TrkPhi.push_back(phiInit);                                   
-  } 
+    double etaInit = 0, phiInit = 0, pInit = 0;
+    const CLHEP::HepLorentzVector &G4Trk = CLHEP::HepLorentzVector(
+        itTrk->momentum().x(), itTrk->momentum().y(), itTrk->momentum().z(), itTrk->momentum().e());
+    pInit = sqrt(G4Trk[0] * G4Trk[0] + G4Trk[1] * G4Trk[1] + G4Trk[2] * G4Trk[2]);
+    if (pInit == 0)
+      edm::LogError("TrackerHitProducer::fillG4MC") << "TrackerTest::INFO: Primary has p = 0 ";
+    else {
+      double costheta = G4Trk[2] / pInit;
+      double theta = acos(TMath::Min(TMath::Max(costheta, -1.), 1.));
+      etaInit = -log(tan(theta / 2));
+
+      if (G4Trk[0] != 0 || G4Trk[1] != 0)
+        phiInit = atan2(G4Trk[1], G4Trk[0]);
+    }
+    G4TrkPt.push_back(sqrt(G4Trk[0] * G4Trk[0] + G4Trk[1] * G4Trk[1]));  // GeV
+    G4TrkE.push_back(G4Trk[3]);                                          // GeV
+    G4TrkEta.push_back(etaInit);
+    G4TrkPhi.push_back(phiInit);
+  }
 
   if (verbosity > 1) {
     eventout += "\n          Number of G4Tracks collected:              ";
     eventout += i;
-  }  
+  }
 
   if (verbosity > 0)
     edm::LogInfo("TrackerHitProducer::fillG4MC") << eventout;
@@ -319,9 +307,7 @@ void TrackerHitProducer::fillG4MC(edm::Event& iEvent)
   return;
 }
 
-void TrackerHitProducer::storeG4MC(PTrackerSimHit& product)
-{
-
+void TrackerHitProducer::storeG4MC(PTrackerSimHit &product) {
   if (verbosity > 2) {
     TString eventout("\nnRawGenPart        = ");
     eventout += nRawGenPart;
@@ -334,7 +320,7 @@ void TrackerHitProducer::storeG4MC(PTrackerSimHit& product)
       eventout += G4VtxY[i];
       eventout += ", ";
       eventout += G4VtxZ[i];
-      eventout += ")";      
+      eventout += ")";
     }
     eventout += "\n       nG4Trk             = ";
     eventout += G4TrkPt.size();
@@ -348,9 +334,9 @@ void TrackerHitProducer::storeG4MC(PTrackerSimHit& product)
       eventout += ")";
       eventout += G4TrkPhi[i];
       eventout += ")";
-    }    
+    }
     edm::LogInfo("TrackerHitProducer::storeG4MC") << eventout;
-  } // end verbose output
+  }  // end verbose output
 
   product.putRawGenPart(nRawGenPart);
   product.putG4Vtx(G4VtxX, G4VtxY, G4VtxZ);
@@ -359,648 +345,617 @@ void TrackerHitProducer::storeG4MC(PTrackerSimHit& product)
   return;
 }
 
-void TrackerHitProducer::fillTrk(edm::Event& iEvent, 
-                const edm::EventSetup& iSetup)
-{
+void TrackerHitProducer::fillTrk(edm::Event &iEvent, const edm::EventSetup &iSetup) {
   TString eventout;
   int sysID = 0;
   if (verbosity > 0)
-    eventout = "\nGathering info:";  
-//////////////////    
+    eventout = "\nGathering info:";
+  //////////////////
   // iterator to access containers
   edm::PSimHitContainer::const_iterator itHit;
-//  edm::PSimHitContainer theHits;
+  //  edm::PSimHitContainer theHits;
 
   ///////////////////////////////
   // get Pixel Barrel information
   ///////////////////////////////
-  
+
   // extract low container
   edm::Handle<edm::PSimHitContainer> PxlBrlLowContainer;
-  iEvent.getByToken( edmPSimHitContainer_pxlBrlLow_Token_, PxlBrlLowContainer );
+  iEvent.getByToken(edmPSimHitContainer_pxlBrlLow_Token_, PxlBrlLowContainer);
   if (!PxlBrlLowContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::fillTrk")
-      << "Unable to find TrackerHitsPixelBarrelLowTof in event!";
+    edm::LogError("TrackerHitProducer::fillTrk") << "Unable to find TrackerHitsPixelBarrelLowTof in event!";
     return;
   }
-    
+
   // place both containers into new container
-//  theHits.insert(theHits.end(),PxlBrlLowContainer->begin(),
-//             PxlBrlLowContainer->end());
-               
-  sysID = 100;   // TrackerHitsPixelBarrelLowTof
-  int j = 0;               
+  //  theHits.insert(theHits.end(),PxlBrlLowContainer->begin(),
+  //             PxlBrlLowContainer->end());
+
+  sysID = 100;  // TrackerHitsPixelBarrelLowTof
+  int j = 0;
   for (itHit = PxlBrlLowContainer->begin(); itHit != PxlBrlLowContainer->end(); ++itHit) {
-//  for (itHit = theHits.begin(); itHit != theHits.end(); ++itHit) {
-
-      // gather necessary information
-      ++j;
-      HitsSysID.push_back(sysID);
-      HitsDuID.push_back(itHit->detUnitId());
-      HitsTkID.push_back(itHit->trackId());
-      HitsProT.push_back(itHit->processType());
-      HitsParT.push_back(itHit->particleType());
-      HitsP.push_back(itHit->pabs());
-      
-      HitsLpX.push_back(itHit->localPosition().x());
-      HitsLpY.push_back(itHit->localPosition().y());
-      HitsLpZ.push_back(itHit->localPosition().z());
-
-      HitsLdX.push_back(itHit->localDirection().x());
-      HitsLdY.push_back(itHit->localDirection().y());
-      HitsLdZ.push_back(itHit->localDirection().z());
-      HitsLdTheta.push_back(itHit->localDirection().theta());
-      HitsLdPhi.push_back(itHit->localDirection().phi());
-
-      HitsExPx.push_back(itHit->exitPoint().x());
-      HitsExPy.push_back(itHit->exitPoint().y());
-      HitsExPz.push_back(itHit->exitPoint().z());
-
-      HitsEnPx.push_back(itHit->entryPoint().x());
-      HitsEnPy.push_back(itHit->entryPoint().y());
-      HitsEnPz.push_back(itHit->entryPoint().z());
-
-      HitsEloss.push_back(itHit->energyLoss());
-      HitsToF.push_back(itHit->tof());
-      
-  } // end loop through PxlBrl Hits
+    //  for (itHit = theHits.begin(); itHit != theHits.end(); ++itHit) {
+
+    // gather necessary information
+    ++j;
+    HitsSysID.push_back(sysID);
+    HitsDuID.push_back(itHit->detUnitId());
+    HitsTkID.push_back(itHit->trackId());
+    HitsProT.push_back(itHit->processType());
+    HitsParT.push_back(itHit->particleType());
+    HitsP.push_back(itHit->pabs());
+
+    HitsLpX.push_back(itHit->localPosition().x());
+    HitsLpY.push_back(itHit->localPosition().y());
+    HitsLpZ.push_back(itHit->localPosition().z());
+
+    HitsLdX.push_back(itHit->localDirection().x());
+    HitsLdY.push_back(itHit->localDirection().y());
+    HitsLdZ.push_back(itHit->localDirection().z());
+    HitsLdTheta.push_back(itHit->localDirection().theta());
+    HitsLdPhi.push_back(itHit->localDirection().phi());
+
+    HitsExPx.push_back(itHit->exitPoint().x());
+    HitsExPy.push_back(itHit->exitPoint().y());
+    HitsExPz.push_back(itHit->exitPoint().z());
+
+    HitsEnPx.push_back(itHit->entryPoint().x());
+    HitsEnPy.push_back(itHit->entryPoint().y());
+    HitsEnPz.push_back(itHit->entryPoint().z());
+
+    HitsEloss.push_back(itHit->energyLoss());
+    HitsToF.push_back(itHit->tof());
+
+  }  // end loop through PxlBrl Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of Pixel Barrel Low TOF Hits collected:     ";
     eventout += j;
-  }  
-  
-//  theHits.clear();
-    
+  }
+
+  //  theHits.clear();
+
   // extract high container
   edm::Handle<edm::PSimHitContainer> PxlBrlHighContainer;
-  iEvent.getByToken( edmPSimHitContainer_pxlBrlHigh_Token_, PxlBrlHighContainer );
+  iEvent.getByToken(edmPSimHitContainer_pxlBrlHigh_Token_, PxlBrlHighContainer);
   if (!PxlBrlHighContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::fillTrk")
-      << "Unable to find TrackerHitsPixelBarrelHighTof in event!";
+    edm::LogError("TrackerHitProducer::fillTrk") << "Unable to find TrackerHitsPixelBarrelHighTof in event!";
     return;
   }
-  
-  
-  sysID = 200;   // TrackerHitsPixelBarrelHighTof
-  j = 0;               
-  for (itHit = PxlBrlHighContainer->begin(); itHit != PxlBrlHighContainer->end(); ++itHit) {
 
-      // gather necessary information
-      ++j;
-      HitsSysID.push_back(sysID);
-      HitsDuID.push_back(itHit->detUnitId());
-      HitsTkID.push_back(itHit->trackId());
-      HitsProT.push_back(itHit->processType());
-      HitsParT.push_back(itHit->particleType());
-      HitsP.push_back(itHit->pabs());
-      
-      HitsLpX.push_back(itHit->localPosition().x());
-      HitsLpY.push_back(itHit->localPosition().y());
-      HitsLpZ.push_back(itHit->localPosition().z());
-
-      HitsLdX.push_back(itHit->localDirection().x());
-      HitsLdY.push_back(itHit->localDirection().y());
-      HitsLdZ.push_back(itHit->localDirection().z());
-      HitsLdTheta.push_back(itHit->localDirection().theta());
-      HitsLdPhi.push_back(itHit->localDirection().phi());
-
-      HitsExPx.push_back(itHit->exitPoint().x());
-      HitsExPy.push_back(itHit->exitPoint().y());
-      HitsExPz.push_back(itHit->exitPoint().z());
-
-      HitsEnPx.push_back(itHit->entryPoint().x());
-      HitsEnPy.push_back(itHit->entryPoint().y());
-      HitsEnPz.push_back(itHit->entryPoint().z());
-
-      HitsEloss.push_back(itHit->energyLoss());
-      HitsToF.push_back(itHit->tof());
-      
-  } // end loop through PxlBrl Hits
+  sysID = 200;  // TrackerHitsPixelBarrelHighTof
+  j = 0;
+  for (itHit = PxlBrlHighContainer->begin(); itHit != PxlBrlHighContainer->end(); ++itHit) {
+    // gather necessary information
+    ++j;
+    HitsSysID.push_back(sysID);
+    HitsDuID.push_back(itHit->detUnitId());
+    HitsTkID.push_back(itHit->trackId());
+    HitsProT.push_back(itHit->processType());
+    HitsParT.push_back(itHit->particleType());
+    HitsP.push_back(itHit->pabs());
+
+    HitsLpX.push_back(itHit->localPosition().x());
+    HitsLpY.push_back(itHit->localPosition().y());
+    HitsLpZ.push_back(itHit->localPosition().z());
+
+    HitsLdX.push_back(itHit->localDirection().x());
+    HitsLdY.push_back(itHit->localDirection().y());
+    HitsLdZ.push_back(itHit->localDirection().z());
+    HitsLdTheta.push_back(itHit->localDirection().theta());
+    HitsLdPhi.push_back(itHit->localDirection().phi());
+
+    HitsExPx.push_back(itHit->exitPoint().x());
+    HitsExPy.push_back(itHit->exitPoint().y());
+    HitsExPz.push_back(itHit->exitPoint().z());
+
+    HitsEnPx.push_back(itHit->entryPoint().x());
+    HitsEnPy.push_back(itHit->entryPoint().y());
+    HitsEnPz.push_back(itHit->entryPoint().z());
+
+    HitsEloss.push_back(itHit->energyLoss());
+    HitsToF.push_back(itHit->tof());
+
+  }  // end loop through PxlBrl Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of Pixel Barrel High TOF Hits collected:     ";
     eventout += j;
-  }  
+  }
 
-  
   /////////////////////////////////
   // get Pixel Forward information
   ////////////////////////////////
   // extract low container
   edm::Handle<edm::PSimHitContainer> PxlFwdLowContainer;
-  iEvent.getByToken( edmPSimHitContainer_pxlFwdLow_Token_, PxlFwdLowContainer );
+  iEvent.getByToken(edmPSimHitContainer_pxlFwdLow_Token_, PxlFwdLowContainer);
   if (!PxlFwdLowContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::fillTrk")
-      << "Unable to find TrackerHitsPixelEndcapLowTof in event!";
+    edm::LogError("TrackerHitProducer::fillTrk") << "Unable to find TrackerHitsPixelEndcapLowTof in event!";
     return;
   }
-  
-  sysID = 300;   // TrackerHitsPixelEndcapLowTof
-  j = 0;               
-  for (itHit = PxlFwdLowContainer->begin(); itHit != PxlFwdLowContainer->end(); ++itHit) {
 
-      // gather necessary information
-      ++j;
-      HitsSysID.push_back(sysID);
-      HitsDuID.push_back(itHit->detUnitId());
-      HitsTkID.push_back(itHit->trackId());
-      HitsProT.push_back(itHit->processType());
-      HitsParT.push_back(itHit->particleType());
-      HitsP.push_back(itHit->pabs());
-      
-      HitsLpX.push_back(itHit->localPosition().x());
-      HitsLpY.push_back(itHit->localPosition().y());
-      HitsLpZ.push_back(itHit->localPosition().z());
-
-      HitsLdX.push_back(itHit->localDirection().x());
-      HitsLdY.push_back(itHit->localDirection().y());
-      HitsLdZ.push_back(itHit->localDirection().z());
-      HitsLdTheta.push_back(itHit->localDirection().theta());
-      HitsLdPhi.push_back(itHit->localDirection().phi());
-
-      HitsExPx.push_back(itHit->exitPoint().x());
-      HitsExPy.push_back(itHit->exitPoint().y());
-      HitsExPz.push_back(itHit->exitPoint().z());
-
-      HitsEnPx.push_back(itHit->entryPoint().x());
-      HitsEnPy.push_back(itHit->entryPoint().y());
-      HitsEnPz.push_back(itHit->entryPoint().z());
-
-      HitsEloss.push_back(itHit->energyLoss());
-      HitsToF.push_back(itHit->tof());
-      
-  } // end loop through PxlFwd Hits
+  sysID = 300;  // TrackerHitsPixelEndcapLowTof
+  j = 0;
+  for (itHit = PxlFwdLowContainer->begin(); itHit != PxlFwdLowContainer->end(); ++itHit) {
+    // gather necessary information
+    ++j;
+    HitsSysID.push_back(sysID);
+    HitsDuID.push_back(itHit->detUnitId());
+    HitsTkID.push_back(itHit->trackId());
+    HitsProT.push_back(itHit->processType());
+    HitsParT.push_back(itHit->particleType());
+    HitsP.push_back(itHit->pabs());
+
+    HitsLpX.push_back(itHit->localPosition().x());
+    HitsLpY.push_back(itHit->localPosition().y());
+    HitsLpZ.push_back(itHit->localPosition().z());
+
+    HitsLdX.push_back(itHit->localDirection().x());
+    HitsLdY.push_back(itHit->localDirection().y());
+    HitsLdZ.push_back(itHit->localDirection().z());
+    HitsLdTheta.push_back(itHit->localDirection().theta());
+    HitsLdPhi.push_back(itHit->localDirection().phi());
+
+    HitsExPx.push_back(itHit->exitPoint().x());
+    HitsExPy.push_back(itHit->exitPoint().y());
+    HitsExPz.push_back(itHit->exitPoint().z());
+
+    HitsEnPx.push_back(itHit->entryPoint().x());
+    HitsEnPy.push_back(itHit->entryPoint().y());
+    HitsEnPz.push_back(itHit->entryPoint().z());
+
+    HitsEloss.push_back(itHit->energyLoss());
+    HitsToF.push_back(itHit->tof());
+
+  }  // end loop through PxlFwd Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of Pixel Forward Low TOF Hits collected:     ";
     eventout += j;
-  }  
-  
-  
+  }
+
   // extract high container
   edm::Handle<edm::PSimHitContainer> PxlFwdHighContainer;
-  iEvent.getByToken( edmPSimHitContainer_pxlFwdHigh_Token_, PxlFwdHighContainer );
+  iEvent.getByToken(edmPSimHitContainer_pxlFwdHigh_Token_, PxlFwdHighContainer);
   if (!PxlFwdHighContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::fillTrk")
-      << "Unable to find TrackerHitsPixelEndcapHighTof in event!";
+    edm::LogError("TrackerHitProducer::fillTrk") << "Unable to find TrackerHitsPixelEndcapHighTof in event!";
     return;
   }
-  
-  sysID = 400;   // TrackerHitsPixelEndcapHighTof
-  j = 0;               
-  for (itHit = PxlFwdHighContainer->begin(); itHit != PxlFwdHighContainer->end(); ++itHit) {
 
-      // gather necessary information
-      ++j;
-      HitsSysID.push_back(sysID);
-      HitsDuID.push_back(itHit->detUnitId());
-      HitsTkID.push_back(itHit->trackId());
-      HitsProT.push_back(itHit->processType());
-      HitsParT.push_back(itHit->particleType());
-      HitsP.push_back(itHit->pabs());
-      
-      HitsLpX.push_back(itHit->localPosition().x());
-      HitsLpY.push_back(itHit->localPosition().y());
-      HitsLpZ.push_back(itHit->localPosition().z());
-
-      HitsLdX.push_back(itHit->localDirection().x());
-      HitsLdY.push_back(itHit->localDirection().y());
-      HitsLdZ.push_back(itHit->localDirection().z());
-      HitsLdTheta.push_back(itHit->localDirection().theta());
-      HitsLdPhi.push_back(itHit->localDirection().phi());
-
-      HitsExPx.push_back(itHit->exitPoint().x());
-      HitsExPy.push_back(itHit->exitPoint().y());
-      HitsExPz.push_back(itHit->exitPoint().z());
-
-      HitsEnPx.push_back(itHit->entryPoint().x());
-      HitsEnPy.push_back(itHit->entryPoint().y());
-      HitsEnPz.push_back(itHit->entryPoint().z());
-
-      HitsEloss.push_back(itHit->energyLoss());
-      HitsToF.push_back(itHit->tof());
-      
-  } // end loop through PxlFwd Hits
+  sysID = 400;  // TrackerHitsPixelEndcapHighTof
+  j = 0;
+  for (itHit = PxlFwdHighContainer->begin(); itHit != PxlFwdHighContainer->end(); ++itHit) {
+    // gather necessary information
+    ++j;
+    HitsSysID.push_back(sysID);
+    HitsDuID.push_back(itHit->detUnitId());
+    HitsTkID.push_back(itHit->trackId());
+    HitsProT.push_back(itHit->processType());
+    HitsParT.push_back(itHit->particleType());
+    HitsP.push_back(itHit->pabs());
+
+    HitsLpX.push_back(itHit->localPosition().x());
+    HitsLpY.push_back(itHit->localPosition().y());
+    HitsLpZ.push_back(itHit->localPosition().z());
+
+    HitsLdX.push_back(itHit->localDirection().x());
+    HitsLdY.push_back(itHit->localDirection().y());
+    HitsLdZ.push_back(itHit->localDirection().z());
+    HitsLdTheta.push_back(itHit->localDirection().theta());
+    HitsLdPhi.push_back(itHit->localDirection().phi());
+
+    HitsExPx.push_back(itHit->exitPoint().x());
+    HitsExPy.push_back(itHit->exitPoint().y());
+    HitsExPz.push_back(itHit->exitPoint().z());
+
+    HitsEnPx.push_back(itHit->entryPoint().x());
+    HitsEnPy.push_back(itHit->entryPoint().y());
+    HitsEnPz.push_back(itHit->entryPoint().z());
+
+    HitsEloss.push_back(itHit->energyLoss());
+    HitsToF.push_back(itHit->tof());
+
+  }  // end loop through PxlFwd Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of Pixel Forward High TOF Hits collected:     ";
     eventout += j;
-  }  
-          
- 
+  }
+
   ///////////////////////////////////
   // get Silicon TIB information
   //////////////////////////////////
   // extract TIB low container
   edm::Handle<edm::PSimHitContainer> SiTIBLowContainer;
-  iEvent.getByToken( edmPSimHitContainer_siTIBLow_Token_, SiTIBLowContainer );
+  iEvent.getByToken(edmPSimHitContainer_siTIBLow_Token_, SiTIBLowContainer);
   if (!SiTIBLowContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::fillTrk")
-      << "Unable to find TrackerHitsTIBLowTof in event!";
+    edm::LogError("TrackerHitProducer::fillTrk") << "Unable to find TrackerHitsTIBLowTof in event!";
     return;
   }
-  
-  sysID = 10;   // TrackerHitsTIBLowTof
-  j = 0;               
-  for (itHit = SiTIBLowContainer->begin(); itHit != SiTIBLowContainer->end(); ++itHit) {
 
-      // gather necessary information
-      ++j;
-      HitsSysID.push_back(sysID);
-      HitsDuID.push_back(itHit->detUnitId());
-      HitsTkID.push_back(itHit->trackId());
-      HitsProT.push_back(itHit->processType());
-      HitsParT.push_back(itHit->particleType());
-      HitsP.push_back(itHit->pabs());
-      
-      HitsLpX.push_back(itHit->localPosition().x());
-      HitsLpY.push_back(itHit->localPosition().y());
-      HitsLpZ.push_back(itHit->localPosition().z());
-
-      HitsLdX.push_back(itHit->localDirection().x());
-      HitsLdY.push_back(itHit->localDirection().y());
-      HitsLdZ.push_back(itHit->localDirection().z());
-      HitsLdTheta.push_back(itHit->localDirection().theta());
-      HitsLdPhi.push_back(itHit->localDirection().phi());
-
-      HitsExPx.push_back(itHit->exitPoint().x());
-      HitsExPy.push_back(itHit->exitPoint().y());
-      HitsExPz.push_back(itHit->exitPoint().z());
-
-      HitsEnPx.push_back(itHit->entryPoint().x());
-      HitsEnPy.push_back(itHit->entryPoint().y());
-      HitsEnPz.push_back(itHit->entryPoint().z());
-
-      HitsEloss.push_back(itHit->energyLoss());
-      HitsToF.push_back(itHit->tof());
-      
-  } // end loop through PxlFwd Hits
+  sysID = 10;  // TrackerHitsTIBLowTof
+  j = 0;
+  for (itHit = SiTIBLowContainer->begin(); itHit != SiTIBLowContainer->end(); ++itHit) {
+    // gather necessary information
+    ++j;
+    HitsSysID.push_back(sysID);
+    HitsDuID.push_back(itHit->detUnitId());
+    HitsTkID.push_back(itHit->trackId());
+    HitsProT.push_back(itHit->processType());
+    HitsParT.push_back(itHit->particleType());
+    HitsP.push_back(itHit->pabs());
+
+    HitsLpX.push_back(itHit->localPosition().x());
+    HitsLpY.push_back(itHit->localPosition().y());
+    HitsLpZ.push_back(itHit->localPosition().z());
+
+    HitsLdX.push_back(itHit->localDirection().x());
+    HitsLdY.push_back(itHit->localDirection().y());
+    HitsLdZ.push_back(itHit->localDirection().z());
+    HitsLdTheta.push_back(itHit->localDirection().theta());
+    HitsLdPhi.push_back(itHit->localDirection().phi());
+
+    HitsExPx.push_back(itHit->exitPoint().x());
+    HitsExPy.push_back(itHit->exitPoint().y());
+    HitsExPz.push_back(itHit->exitPoint().z());
+
+    HitsEnPx.push_back(itHit->entryPoint().x());
+    HitsEnPy.push_back(itHit->entryPoint().y());
+    HitsEnPz.push_back(itHit->entryPoint().z());
+
+    HitsEloss.push_back(itHit->energyLoss());
+    HitsToF.push_back(itHit->tof());
+
+  }  // end loop through PxlFwd Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of TIB low TOF Hits collected:     ";
     eventout += j;
-  }  
-                 
-  
+  }
+
   // extract TIB high container
   edm::Handle<edm::PSimHitContainer> SiTIBHighContainer;
-  iEvent.getByToken( edmPSimHitContainer_siTIBHigh_Token_, SiTIBHighContainer );
+  iEvent.getByToken(edmPSimHitContainer_siTIBHigh_Token_, SiTIBHighContainer);
   if (!SiTIBHighContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::fillTrk")
-      << "Unable to find TrackerHitsTIBHighTof in event!";
+    edm::LogError("TrackerHitProducer::fillTrk") << "Unable to find TrackerHitsTIBHighTof in event!";
     return;
   }
 
-  sysID = 20;   // TrackerHitsTIBHighTof
-  j = 0;               
+  sysID = 20;  // TrackerHitsTIBHighTof
+  j = 0;
   for (itHit = SiTIBHighContainer->begin(); itHit != SiTIBHighContainer->end(); ++itHit) {
-
-      // gather necessary information
-      ++j;
-      HitsSysID.push_back(sysID);
-      HitsDuID.push_back(itHit->detUnitId());
-      HitsTkID.push_back(itHit->trackId());
-      HitsProT.push_back(itHit->processType());
-      HitsParT.push_back(itHit->particleType());
-      HitsP.push_back(itHit->pabs());
-      
-      HitsLpX.push_back(itHit->localPosition().x());
-      HitsLpY.push_back(itHit->localPosition().y());
-      HitsLpZ.push_back(itHit->localPosition().z());
-
-      HitsLdX.push_back(itHit->localDirection().x());
-      HitsLdY.push_back(itHit->localDirection().y());
-      HitsLdZ.push_back(itHit->localDirection().z());
-      HitsLdTheta.push_back(itHit->localDirection().theta());
-      HitsLdPhi.push_back(itHit->localDirection().phi());
-
-      HitsExPx.push_back(itHit->exitPoint().x());
-      HitsExPy.push_back(itHit->exitPoint().y());
-      HitsExPz.push_back(itHit->exitPoint().z());
-
-      HitsEnPx.push_back(itHit->entryPoint().x());
-      HitsEnPy.push_back(itHit->entryPoint().y());
-      HitsEnPz.push_back(itHit->entryPoint().z());
-
-      HitsEloss.push_back(itHit->energyLoss());
-      HitsToF.push_back(itHit->tof());
-      
-  } // end loop through PxlFwd Hits
+    // gather necessary information
+    ++j;
+    HitsSysID.push_back(sysID);
+    HitsDuID.push_back(itHit->detUnitId());
+    HitsTkID.push_back(itHit->trackId());
+    HitsProT.push_back(itHit->processType());
+    HitsParT.push_back(itHit->particleType());
+    HitsP.push_back(itHit->pabs());
+
+    HitsLpX.push_back(itHit->localPosition().x());
+    HitsLpY.push_back(itHit->localPosition().y());
+    HitsLpZ.push_back(itHit->localPosition().z());
+
+    HitsLdX.push_back(itHit->localDirection().x());
+    HitsLdY.push_back(itHit->localDirection().y());
+    HitsLdZ.push_back(itHit->localDirection().z());
+    HitsLdTheta.push_back(itHit->localDirection().theta());
+    HitsLdPhi.push_back(itHit->localDirection().phi());
+
+    HitsExPx.push_back(itHit->exitPoint().x());
+    HitsExPy.push_back(itHit->exitPoint().y());
+    HitsExPz.push_back(itHit->exitPoint().z());
+
+    HitsEnPx.push_back(itHit->entryPoint().x());
+    HitsEnPy.push_back(itHit->entryPoint().y());
+    HitsEnPz.push_back(itHit->entryPoint().z());
+
+    HitsEloss.push_back(itHit->energyLoss());
+    HitsToF.push_back(itHit->tof());
+
+  }  // end loop through PxlFwd Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of TIB high TOF Hits collected:     ";
     eventout += j;
-  }  
-  
+  }
+
   ///////////////////////////////////
   // get Silicon TOB information
   //////////////////////////////////
   // extract TOB low container
   edm::Handle<edm::PSimHitContainer> SiTOBLowContainer;
-  iEvent.getByToken( edmPSimHitContainer_siTOBLow_Token_, SiTOBLowContainer );
+  iEvent.getByToken(edmPSimHitContainer_siTOBLow_Token_, SiTOBLowContainer);
   if (!SiTOBLowContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::fillTrk")
-      << "Unable to find TrackerHitsTOBLowTof in event!";
+    edm::LogError("TrackerHitProducer::fillTrk") << "Unable to find TrackerHitsTOBLowTof in event!";
     return;
   }
-  
-  sysID = 30;   // TrackerHitsTOBLowTof
-  j = 0;               
-  for (itHit = SiTOBLowContainer->begin(); itHit != SiTOBLowContainer->end(); ++itHit) {
 
-      // gather necessary information
-      ++j;
-      HitsSysID.push_back(sysID);
-      HitsDuID.push_back(itHit->detUnitId());
-      HitsTkID.push_back(itHit->trackId());
-      HitsProT.push_back(itHit->processType());
-      HitsParT.push_back(itHit->particleType());
-      HitsP.push_back(itHit->pabs());
-      
-      HitsLpX.push_back(itHit->localPosition().x());
-      HitsLpY.push_back(itHit->localPosition().y());
-      HitsLpZ.push_back(itHit->localPosition().z());
-
-      HitsLdX.push_back(itHit->localDirection().x());
-      HitsLdY.push_back(itHit->localDirection().y());
-      HitsLdZ.push_back(itHit->localDirection().z());
-      HitsLdTheta.push_back(itHit->localDirection().theta());
-      HitsLdPhi.push_back(itHit->localDirection().phi());
-
-      HitsExPx.push_back(itHit->exitPoint().x());
-      HitsExPy.push_back(itHit->exitPoint().y());
-      HitsExPz.push_back(itHit->exitPoint().z());
-
-      HitsEnPx.push_back(itHit->entryPoint().x());
-      HitsEnPy.push_back(itHit->entryPoint().y());
-      HitsEnPz.push_back(itHit->entryPoint().z());
-
-      HitsEloss.push_back(itHit->energyLoss());
-      HitsToF.push_back(itHit->tof());
-      
-  } // end loop through PxlFwd Hits
+  sysID = 30;  // TrackerHitsTOBLowTof
+  j = 0;
+  for (itHit = SiTOBLowContainer->begin(); itHit != SiTOBLowContainer->end(); ++itHit) {
+    // gather necessary information
+    ++j;
+    HitsSysID.push_back(sysID);
+    HitsDuID.push_back(itHit->detUnitId());
+    HitsTkID.push_back(itHit->trackId());
+    HitsProT.push_back(itHit->processType());
+    HitsParT.push_back(itHit->particleType());
+    HitsP.push_back(itHit->pabs());
+
+    HitsLpX.push_back(itHit->localPosition().x());
+    HitsLpY.push_back(itHit->localPosition().y());
+    HitsLpZ.push_back(itHit->localPosition().z());
+
+    HitsLdX.push_back(itHit->localDirection().x());
+    HitsLdY.push_back(itHit->localDirection().y());
+    HitsLdZ.push_back(itHit->localDirection().z());
+    HitsLdTheta.push_back(itHit->localDirection().theta());
+    HitsLdPhi.push_back(itHit->localDirection().phi());
+
+    HitsExPx.push_back(itHit->exitPoint().x());
+    HitsExPy.push_back(itHit->exitPoint().y());
+    HitsExPz.push_back(itHit->exitPoint().z());
+
+    HitsEnPx.push_back(itHit->entryPoint().x());
+    HitsEnPy.push_back(itHit->entryPoint().y());
+    HitsEnPz.push_back(itHit->entryPoint().z());
+
+    HitsEloss.push_back(itHit->energyLoss());
+    HitsToF.push_back(itHit->tof());
+
+  }  // end loop through PxlFwd Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of TOB low TOF Hits collected:     ";
     eventout += j;
-  }  
-    
+  }
+
   // extract TOB high container
   edm::Handle<edm::PSimHitContainer> SiTOBHighContainer;
-  iEvent.getByToken( edmPSimHitContainer_siTOBHigh_Token_, SiTOBHighContainer );
+  iEvent.getByToken(edmPSimHitContainer_siTOBHigh_Token_, SiTOBHighContainer);
   if (!SiTOBHighContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::fillTrk")
-      << "Unable to find TrackerHitsTOBHighTof in event!";
+    edm::LogError("TrackerHitProducer::fillTrk") << "Unable to find TrackerHitsTOBHighTof in event!";
     return;
   }
-  
-  sysID = 40;   // TrackerHitsTOBHighTof
-  j = 0;               
-  for (itHit = SiTOBHighContainer->begin(); itHit != SiTOBHighContainer->end(); ++itHit) {
 
-      // gather necessary information
-      ++j;
-      HitsSysID.push_back(sysID);
-      HitsDuID.push_back(itHit->detUnitId());
-      HitsTkID.push_back(itHit->trackId());
-      HitsProT.push_back(itHit->processType());
-      HitsParT.push_back(itHit->particleType());
-      HitsP.push_back(itHit->pabs());
-      
-      HitsLpX.push_back(itHit->localPosition().x());
-      HitsLpY.push_back(itHit->localPosition().y());
-      HitsLpZ.push_back(itHit->localPosition().z());
-
-      HitsLdX.push_back(itHit->localDirection().x());
-      HitsLdY.push_back(itHit->localDirection().y());
-      HitsLdZ.push_back(itHit->localDirection().z());
-      HitsLdTheta.push_back(itHit->localDirection().theta());
-      HitsLdPhi.push_back(itHit->localDirection().phi());
-
-      HitsExPx.push_back(itHit->exitPoint().x());
-      HitsExPy.push_back(itHit->exitPoint().y());
-      HitsExPz.push_back(itHit->exitPoint().z());
-
-      HitsEnPx.push_back(itHit->entryPoint().x());
-      HitsEnPy.push_back(itHit->entryPoint().y());
-      HitsEnPz.push_back(itHit->entryPoint().z());
-
-      HitsEloss.push_back(itHit->energyLoss());
-      HitsToF.push_back(itHit->tof());
-      
-  } // end loop through SiTOB Hits
+  sysID = 40;  // TrackerHitsTOBHighTof
+  j = 0;
+  for (itHit = SiTOBHighContainer->begin(); itHit != SiTOBHighContainer->end(); ++itHit) {
+    // gather necessary information
+    ++j;
+    HitsSysID.push_back(sysID);
+    HitsDuID.push_back(itHit->detUnitId());
+    HitsTkID.push_back(itHit->trackId());
+    HitsProT.push_back(itHit->processType());
+    HitsParT.push_back(itHit->particleType());
+    HitsP.push_back(itHit->pabs());
+
+    HitsLpX.push_back(itHit->localPosition().x());
+    HitsLpY.push_back(itHit->localPosition().y());
+    HitsLpZ.push_back(itHit->localPosition().z());
+
+    HitsLdX.push_back(itHit->localDirection().x());
+    HitsLdY.push_back(itHit->localDirection().y());
+    HitsLdZ.push_back(itHit->localDirection().z());
+    HitsLdTheta.push_back(itHit->localDirection().theta());
+    HitsLdPhi.push_back(itHit->localDirection().phi());
+
+    HitsExPx.push_back(itHit->exitPoint().x());
+    HitsExPy.push_back(itHit->exitPoint().y());
+    HitsExPz.push_back(itHit->exitPoint().z());
+
+    HitsEnPx.push_back(itHit->entryPoint().x());
+    HitsEnPy.push_back(itHit->entryPoint().y());
+    HitsEnPz.push_back(itHit->entryPoint().z());
+
+    HitsEloss.push_back(itHit->energyLoss());
+    HitsToF.push_back(itHit->tof());
+
+  }  // end loop through SiTOB Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of TOB high TOF Hits collected:     ";
     eventout += j;
-  }  
-  
+  }
+
   ///////////////////////////////////
   // get Silicon TID information
   ///////////////////////////////////
   // extract TID low container
   edm::Handle<edm::PSimHitContainer> SiTIDLowContainer;
-  iEvent.getByToken( edmPSimHitContainer_siTIDLow_Token_, SiTIDLowContainer );
+  iEvent.getByToken(edmPSimHitContainer_siTIDLow_Token_, SiTIDLowContainer);
   if (!SiTIDLowContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::fillTrk")
-      << "Unable to find TrackerHitsTIDLowTof in event!";
+    edm::LogError("TrackerHitProducer::fillTrk") << "Unable to find TrackerHitsTIDLowTof in event!";
     return;
   }
-  
-  sysID = 50;   // TrackerHitsTIDLowTof
-  j = 0;               
-  for (itHit = SiTIDLowContainer->begin(); itHit != SiTIDLowContainer->end(); ++itHit) {
 
-      // gather necessary information
-      ++j;
-      HitsSysID.push_back(sysID);
-      HitsDuID.push_back(itHit->detUnitId());
-      HitsTkID.push_back(itHit->trackId());
-      HitsProT.push_back(itHit->processType());
-      HitsParT.push_back(itHit->particleType());
-      HitsP.push_back(itHit->pabs());
-      
-      HitsLpX.push_back(itHit->localPosition().x());
-      HitsLpY.push_back(itHit->localPosition().y());
-      HitsLpZ.push_back(itHit->localPosition().z());
-
-      HitsLdX.push_back(itHit->localDirection().x());
-      HitsLdY.push_back(itHit->localDirection().y());
-      HitsLdZ.push_back(itHit->localDirection().z());
-      HitsLdTheta.push_back(itHit->localDirection().theta());
-      HitsLdPhi.push_back(itHit->localDirection().phi());
-
-      HitsExPx.push_back(itHit->exitPoint().x());
-      HitsExPy.push_back(itHit->exitPoint().y());
-      HitsExPz.push_back(itHit->exitPoint().z());
-
-      HitsEnPx.push_back(itHit->entryPoint().x());
-      HitsEnPy.push_back(itHit->entryPoint().y());
-      HitsEnPz.push_back(itHit->entryPoint().z());
-
-      HitsEloss.push_back(itHit->energyLoss());
-      HitsToF.push_back(itHit->tof());
-      
-  } // end loop through SiTID Hits
+  sysID = 50;  // TrackerHitsTIDLowTof
+  j = 0;
+  for (itHit = SiTIDLowContainer->begin(); itHit != SiTIDLowContainer->end(); ++itHit) {
+    // gather necessary information
+    ++j;
+    HitsSysID.push_back(sysID);
+    HitsDuID.push_back(itHit->detUnitId());
+    HitsTkID.push_back(itHit->trackId());
+    HitsProT.push_back(itHit->processType());
+    HitsParT.push_back(itHit->particleType());
+    HitsP.push_back(itHit->pabs());
+
+    HitsLpX.push_back(itHit->localPosition().x());
+    HitsLpY.push_back(itHit->localPosition().y());
+    HitsLpZ.push_back(itHit->localPosition().z());
+
+    HitsLdX.push_back(itHit->localDirection().x());
+    HitsLdY.push_back(itHit->localDirection().y());
+    HitsLdZ.push_back(itHit->localDirection().z());
+    HitsLdTheta.push_back(itHit->localDirection().theta());
+    HitsLdPhi.push_back(itHit->localDirection().phi());
+
+    HitsExPx.push_back(itHit->exitPoint().x());
+    HitsExPy.push_back(itHit->exitPoint().y());
+    HitsExPz.push_back(itHit->exitPoint().z());
+
+    HitsEnPx.push_back(itHit->entryPoint().x());
+    HitsEnPy.push_back(itHit->entryPoint().y());
+    HitsEnPz.push_back(itHit->entryPoint().z());
+
+    HitsEloss.push_back(itHit->energyLoss());
+    HitsToF.push_back(itHit->tof());
+
+  }  // end loop through SiTID Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of TID low TOF Hits collected:     ";
     eventout += j;
-  }  
-      
+  }
+
   // extract TID high container
   edm::Handle<edm::PSimHitContainer> SiTIDHighContainer;
-  iEvent.getByToken( edmPSimHitContainer_siTIDHigh_Token_, SiTIDHighContainer );
+  iEvent.getByToken(edmPSimHitContainer_siTIDHigh_Token_, SiTIDHighContainer);
   if (!SiTIDHighContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::fillTrk")
-      << "Unable to find TrackerHitsTIDHighTof in event!";
+    edm::LogError("TrackerHitProducer::fillTrk") << "Unable to find TrackerHitsTIDHighTof in event!";
     return;
   }
-  
-  sysID = 60;   // TrackerHitsTIDHighTof
-  j = 0;               
-  for (itHit = SiTIDHighContainer->begin(); itHit != SiTIDHighContainer->end(); ++itHit) {
 
-      // gather necessary information
-      ++j;
-      HitsSysID.push_back(sysID);
-      HitsDuID.push_back(itHit->detUnitId());
-      HitsTkID.push_back(itHit->trackId());
-      HitsProT.push_back(itHit->processType());
-      HitsParT.push_back(itHit->particleType());
-      HitsP.push_back(itHit->pabs());
-      
-      HitsLpX.push_back(itHit->localPosition().x());
-      HitsLpY.push_back(itHit->localPosition().y());
-      HitsLpZ.push_back(itHit->localPosition().z());
-
-      HitsLdX.push_back(itHit->localDirection().x());
-      HitsLdY.push_back(itHit->localDirection().y());
-      HitsLdZ.push_back(itHit->localDirection().z());
-      HitsLdTheta.push_back(itHit->localDirection().theta());
-      HitsLdPhi.push_back(itHit->localDirection().phi());
-
-      HitsExPx.push_back(itHit->exitPoint().x());
-      HitsExPy.push_back(itHit->exitPoint().y());
-      HitsExPz.push_back(itHit->exitPoint().z());
-
-      HitsEnPx.push_back(itHit->entryPoint().x());
-      HitsEnPy.push_back(itHit->entryPoint().y());
-      HitsEnPz.push_back(itHit->entryPoint().z());
-
-      HitsEloss.push_back(itHit->energyLoss());
-      HitsToF.push_back(itHit->tof());
-      
-  } // end loop through SiTID Hits
+  sysID = 60;  // TrackerHitsTIDHighTof
+  j = 0;
+  for (itHit = SiTIDHighContainer->begin(); itHit != SiTIDHighContainer->end(); ++itHit) {
+    // gather necessary information
+    ++j;
+    HitsSysID.push_back(sysID);
+    HitsDuID.push_back(itHit->detUnitId());
+    HitsTkID.push_back(itHit->trackId());
+    HitsProT.push_back(itHit->processType());
+    HitsParT.push_back(itHit->particleType());
+    HitsP.push_back(itHit->pabs());
+
+    HitsLpX.push_back(itHit->localPosition().x());
+    HitsLpY.push_back(itHit->localPosition().y());
+    HitsLpZ.push_back(itHit->localPosition().z());
+
+    HitsLdX.push_back(itHit->localDirection().x());
+    HitsLdY.push_back(itHit->localDirection().y());
+    HitsLdZ.push_back(itHit->localDirection().z());
+    HitsLdTheta.push_back(itHit->localDirection().theta());
+    HitsLdPhi.push_back(itHit->localDirection().phi());
+
+    HitsExPx.push_back(itHit->exitPoint().x());
+    HitsExPy.push_back(itHit->exitPoint().y());
+    HitsExPz.push_back(itHit->exitPoint().z());
+
+    HitsEnPx.push_back(itHit->entryPoint().x());
+    HitsEnPy.push_back(itHit->entryPoint().y());
+    HitsEnPz.push_back(itHit->entryPoint().z());
+
+    HitsEloss.push_back(itHit->energyLoss());
+    HitsToF.push_back(itHit->tof());
+
+  }  // end loop through SiTID Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of TID high TOF Hits collected:     ";
     eventout += j;
-  }  
-  
+  }
+
   ///////////////////////////////////
   // get Silicon TEC information
-  /////////////////////////////////// 
+  ///////////////////////////////////
   // extract TEC low container
   edm::Handle<edm::PSimHitContainer> SiTECLowContainer;
-  iEvent.getByToken( edmPSimHitContainer_siTECLow_Token_, SiTECLowContainer );
+  iEvent.getByToken(edmPSimHitContainer_siTECLow_Token_, SiTECLowContainer);
   if (!SiTECLowContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::fillTrk")
-      << "Unable to find TrackerHitsTECLowTof in event!";
+    edm::LogError("TrackerHitProducer::fillTrk") << "Unable to find TrackerHitsTECLowTof in event!";
     return;
   }
-  
-  sysID = 70;   // TrackerHitsTECLowTof
-  j = 0;               
-  for (itHit = SiTECLowContainer->begin(); itHit != SiTECLowContainer->end(); ++itHit) {
 
-      // gather necessary information
-      ++j;
-      HitsSysID.push_back(sysID);
-      HitsDuID.push_back(itHit->detUnitId());
-      HitsTkID.push_back(itHit->trackId());
-      HitsProT.push_back(itHit->processType());
-      HitsParT.push_back(itHit->particleType());
-      HitsP.push_back(itHit->pabs());
-      
-      HitsLpX.push_back(itHit->localPosition().x());
-      HitsLpY.push_back(itHit->localPosition().y());
-      HitsLpZ.push_back(itHit->localPosition().z());
-
-      HitsLdX.push_back(itHit->localDirection().x());
-      HitsLdY.push_back(itHit->localDirection().y());
-      HitsLdZ.push_back(itHit->localDirection().z());
-      HitsLdTheta.push_back(itHit->localDirection().theta());
-      HitsLdPhi.push_back(itHit->localDirection().phi());
-
-      HitsExPx.push_back(itHit->exitPoint().x());
-      HitsExPy.push_back(itHit->exitPoint().y());
-      HitsExPz.push_back(itHit->exitPoint().z());
-
-      HitsEnPx.push_back(itHit->entryPoint().x());
-      HitsEnPy.push_back(itHit->entryPoint().y());
-      HitsEnPz.push_back(itHit->entryPoint().z());
-
-      HitsEloss.push_back(itHit->energyLoss());
-      HitsToF.push_back(itHit->tof());
-      
-  } // end loop through SiTEC Hits
+  sysID = 70;  // TrackerHitsTECLowTof
+  j = 0;
+  for (itHit = SiTECLowContainer->begin(); itHit != SiTECLowContainer->end(); ++itHit) {
+    // gather necessary information
+    ++j;
+    HitsSysID.push_back(sysID);
+    HitsDuID.push_back(itHit->detUnitId());
+    HitsTkID.push_back(itHit->trackId());
+    HitsProT.push_back(itHit->processType());
+    HitsParT.push_back(itHit->particleType());
+    HitsP.push_back(itHit->pabs());
+
+    HitsLpX.push_back(itHit->localPosition().x());
+    HitsLpY.push_back(itHit->localPosition().y());
+    HitsLpZ.push_back(itHit->localPosition().z());
+
+    HitsLdX.push_back(itHit->localDirection().x());
+    HitsLdY.push_back(itHit->localDirection().y());
+    HitsLdZ.push_back(itHit->localDirection().z());
+    HitsLdTheta.push_back(itHit->localDirection().theta());
+    HitsLdPhi.push_back(itHit->localDirection().phi());
+
+    HitsExPx.push_back(itHit->exitPoint().x());
+    HitsExPy.push_back(itHit->exitPoint().y());
+    HitsExPz.push_back(itHit->exitPoint().z());
+
+    HitsEnPx.push_back(itHit->entryPoint().x());
+    HitsEnPy.push_back(itHit->entryPoint().y());
+    HitsEnPz.push_back(itHit->entryPoint().z());
+
+    HitsEloss.push_back(itHit->energyLoss());
+    HitsToF.push_back(itHit->tof());
+
+  }  // end loop through SiTEC Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of TEC low TOF Hits collected:     ";
     eventout += j;
-  }  
-      
-  
+  }
+
   // extract TEC high container
   edm::Handle<edm::PSimHitContainer> SiTECHighContainer;
-  iEvent.getByToken( edmPSimHitContainer_siTECHigh_Token_, SiTECHighContainer );
+  iEvent.getByToken(edmPSimHitContainer_siTECHigh_Token_, SiTECHighContainer);
   if (!SiTECHighContainer.isValid()) {
-    edm::LogError("TrackerHitProducer::fillTrk")
-      << "Unable to find TrackerHitsTECHighTof in event!";
+    edm::LogError("TrackerHitProducer::fillTrk") << "Unable to find TrackerHitsTECHighTof in event!";
     return;
   }
-  sysID = 80;   // TrackerHitsTECHighTof
-  j = 0;               
+  sysID = 80;  // TrackerHitsTECHighTof
+  j = 0;
   for (itHit = SiTECHighContainer->begin(); itHit != SiTECHighContainer->end(); ++itHit) {
-
-      // gather necessary information
-      ++j;
-      HitsSysID.push_back(sysID);
-      HitsDuID.push_back(itHit->detUnitId());
-      HitsTkID.push_back(itHit->trackId());
-      HitsProT.push_back(itHit->processType());
-      HitsParT.push_back(itHit->particleType());
-      HitsP.push_back(itHit->pabs());
-      
-      HitsLpX.push_back(itHit->localPosition().x());
-      HitsLpY.push_back(itHit->localPosition().y());
-      HitsLpZ.push_back(itHit->localPosition().z());
-
-      HitsLdX.push_back(itHit->localDirection().x());
-      HitsLdY.push_back(itHit->localDirection().y());
-      HitsLdZ.push_back(itHit->localDirection().z());
-      HitsLdTheta.push_back(itHit->localDirection().theta());
-      HitsLdPhi.push_back(itHit->localDirection().phi());
-
-      HitsExPx.push_back(itHit->exitPoint().x());
-      HitsExPy.push_back(itHit->exitPoint().y());
-      HitsExPz.push_back(itHit->exitPoint().z());
-
-      HitsEnPx.push_back(itHit->entryPoint().x());
-      HitsEnPy.push_back(itHit->entryPoint().y());
-      HitsEnPz.push_back(itHit->entryPoint().z());
-
-      HitsEloss.push_back(itHit->energyLoss());
-      HitsToF.push_back(itHit->tof());
-      
-  } // end loop through SiTEC Hits
+    // gather necessary information
+    ++j;
+    HitsSysID.push_back(sysID);
+    HitsDuID.push_back(itHit->detUnitId());
+    HitsTkID.push_back(itHit->trackId());
+    HitsProT.push_back(itHit->processType());
+    HitsParT.push_back(itHit->particleType());
+    HitsP.push_back(itHit->pabs());
+
+    HitsLpX.push_back(itHit->localPosition().x());
+    HitsLpY.push_back(itHit->localPosition().y());
+    HitsLpZ.push_back(itHit->localPosition().z());
+
+    HitsLdX.push_back(itHit->localDirection().x());
+    HitsLdY.push_back(itHit->localDirection().y());
+    HitsLdZ.push_back(itHit->localDirection().z());
+    HitsLdTheta.push_back(itHit->localDirection().theta());
+    HitsLdPhi.push_back(itHit->localDirection().phi());
+
+    HitsExPx.push_back(itHit->exitPoint().x());
+    HitsExPy.push_back(itHit->exitPoint().y());
+    HitsExPz.push_back(itHit->exitPoint().z());
+
+    HitsEnPx.push_back(itHit->entryPoint().x());
+    HitsEnPy.push_back(itHit->entryPoint().y());
+    HitsEnPz.push_back(itHit->entryPoint().z());
+
+    HitsEloss.push_back(itHit->energyLoss());
+    HitsToF.push_back(itHit->tof());
+
+  }  // end loop through SiTEC Hits
 
   if (verbosity > 1) {
     eventout += "\n          Number of TEC high TOF Hits collected:     ";
     eventout += j;
-  }  
+  }
 
   if (verbosity > 0)
     edm::LogInfo("TrackerHitProducer::fillTrk") << eventout;
@@ -1008,81 +963,93 @@ void TrackerHitProducer::fillTrk(edm::Event& iEvent,
   return;
 }
 
-void TrackerHitProducer::storeTrk(PTrackerSimHit& product)
-{
+void TrackerHitProducer::storeTrk(PTrackerSimHit &product) {
+  /*
+    if (verbosity > 2) {
+      TString eventout("\nnPxlBrlHits        = ");
+      eventout += PxlBrlToF.size();
+      for (unsigned int i = 0; i < PxlBrlToF.size(); ++i) {
+        eventout += "\n          (tof,r,phi,eta) = (";
+        eventout += PxlBrlToF[i];
+        eventout += ", ";
+        eventout += PxlBrlR[i];
+        eventout += ", ";
+        eventout += PxlBrlPhi[i];
+        eventout += ", ";
+        eventout += PxlBrlEta[i];
+        eventout += ")";
+      } // end PxlBrl output
+      eventout += "\n       nPxlFwdHits        = ";
+      eventout += PxlFwdToF.size();
+      for (unsigned int i = 0; i < PxlFwdToF.size(); ++i) {
+        eventout += "\n          (tof,z,phi,eta) = (";
+        eventout += PxlFwdToF[i];
+        eventout += ", ";
+        eventout += PxlFwdZ[i];
+        eventout += ", ";
+        eventout += PxlFwdPhi[i];
+        eventout += ", ";
+        eventout += PxlFwdEta[i];
+        eventout += ")";
+      } // end PxlFwd output
+      eventout += "\n       nSiBrlHits         = ";
+      eventout += SiBrlToF.size();
+      for (unsigned int i = 0; i < SiBrlToF.size(); ++i) {
+        eventout += "\n          (tof,r,phi,eta) = (";
+        eventout += SiBrlToF[i];
+        eventout += ", ";
+        eventout += SiBrlR[i];
+        eventout += ", ";
+        eventout += SiBrlPhi[i];
+        eventout += ", ";
+        eventout += SiBrlEta[i];
+        eventout += ")";
+      } // end SiBrl output
+      eventout += "\n       nSiFwdHits         = ";
+      eventout += SiFwdToF.size();
+      for (unsigned int i = 0; i < SiFwdToF.size(); ++i) {
+        eventout += "\n          (tof,z,phi,eta) = (";
+        eventout += SiFwdToF[i];
+        eventout += ", ";
+        eventout += SiFwdZ[i];
+        eventout += ", ";
+        eventout += SiFwdPhi[i];
+        eventout += ", ";
+        eventout += SiFwdEta[i];
+        eventout += ")";
+      } // end SiFwd output
+      edm::LogInfo("TrackerHitProducer::storeTrk") << eventout;
+    } // end verbose output
+  */
+  product.putHits(HitsSysID,
+                  HitsDuID,
+                  HitsTkID,
+                  HitsProT,
+                  HitsParT,
+                  HitsP,
+                  HitsLpX,
+                  HitsLpY,
+                  HitsLpZ,
+                  HitsLdX,
+                  HitsLdY,
+                  HitsLdZ,
+                  HitsLdTheta,
+                  HitsLdPhi,
+                  HitsExPx,
+                  HitsExPy,
+                  HitsExPz,
+                  HitsEnPx,
+                  HitsEnPy,
+                  HitsEnPz,
+                  HitsEloss,
+                  HitsToF);
 
-/*
-  if (verbosity > 2) {
-    TString eventout("\nnPxlBrlHits        = ");
-    eventout += PxlBrlToF.size();
-    for (unsigned int i = 0; i < PxlBrlToF.size(); ++i) {
-      eventout += "\n          (tof,r,phi,eta) = (";
-      eventout += PxlBrlToF[i];
-      eventout += ", ";
-      eventout += PxlBrlR[i];
-      eventout += ", ";
-      eventout += PxlBrlPhi[i];
-      eventout += ", ";
-      eventout += PxlBrlEta[i];
-      eventout += ")";      
-    } // end PxlBrl output
-    eventout += "\n       nPxlFwdHits        = ";
-    eventout += PxlFwdToF.size();
-    for (unsigned int i = 0; i < PxlFwdToF.size(); ++i) {
-      eventout += "\n          (tof,z,phi,eta) = (";
-      eventout += PxlFwdToF[i];
-      eventout += ", ";
-      eventout += PxlFwdZ[i];
-      eventout += ", ";
-      eventout += PxlFwdPhi[i];
-      eventout += ", ";
-      eventout += PxlFwdEta[i];
-      eventout += ")";      
-    } // end PxlFwd output
-    eventout += "\n       nSiBrlHits         = ";
-    eventout += SiBrlToF.size();
-    for (unsigned int i = 0; i < SiBrlToF.size(); ++i) {
-      eventout += "\n          (tof,r,phi,eta) = (";
-      eventout += SiBrlToF[i];
-      eventout += ", ";
-      eventout += SiBrlR[i];
-      eventout += ", ";
-      eventout += SiBrlPhi[i];
-      eventout += ", ";
-      eventout += SiBrlEta[i];
-      eventout += ")";      
-    } // end SiBrl output
-    eventout += "\n       nSiFwdHits         = ";
-    eventout += SiFwdToF.size();
-    for (unsigned int i = 0; i < SiFwdToF.size(); ++i) {
-      eventout += "\n          (tof,z,phi,eta) = (";
-      eventout += SiFwdToF[i];
-      eventout += ", ";
-      eventout += SiFwdZ[i];
-      eventout += ", ";
-      eventout += SiFwdPhi[i];
-      eventout += ", ";
-      eventout += SiFwdEta[i];
-      eventout += ")";      
-    } // end SiFwd output
-    edm::LogInfo("TrackerHitProducer::storeTrk") << eventout;
-  } // end verbose output
-*/
-  product.putHits(HitsSysID, HitsDuID, HitsTkID, HitsProT, HitsParT, HitsP,
-                  HitsLpX, HitsLpY, HitsLpZ, 
-          HitsLdX, HitsLdY, HitsLdZ, HitsLdTheta, HitsLdPhi,
-          HitsExPx, HitsExPy, HitsExPz,
-          HitsEnPx, HitsEnPy, HitsEnPz,
-          HitsEloss, HitsToF);
-  
   return;
 }
 
-void TrackerHitProducer::clear()
-{
+void TrackerHitProducer::clear() {
   if (verbosity > 0)
-    edm::LogInfo("GlobalValProducer::clear")
-      << "Clearing event holders"; 
+    edm::LogInfo("GlobalValProducer::clear") << "Clearing event holders";
 
   // reset G4MC info
   nRawGenPart = 0;
@@ -1096,29 +1063,29 @@ void TrackerHitProducer::clear()
   // reset tracker info
   HitsSysID.clear();
   HitsDuID.clear();
-  HitsTkID.clear(); 
-  HitsProT.clear(); 
-  HitsParT.clear(); 
+  HitsTkID.clear();
+  HitsProT.clear();
+  HitsParT.clear();
   HitsP.clear();
-  HitsLpX.clear(); 
-  HitsLpY.clear(); 
-  HitsLpZ.clear(); 
-  HitsLdX.clear(); 
-  HitsLdY.clear(); 
-  HitsLdZ.clear(); 
-  HitsLdTheta.clear(); 
+  HitsLpX.clear();
+  HitsLpY.clear();
+  HitsLpZ.clear();
+  HitsLdX.clear();
+  HitsLdY.clear();
+  HitsLdZ.clear();
+  HitsLdTheta.clear();
   HitsLdPhi.clear();
-  HitsExPx.clear(); 
-  HitsExPy.clear(); 
+  HitsExPx.clear();
+  HitsExPy.clear();
   HitsExPz.clear();
-  HitsEnPx.clear(); 
-  HitsEnPy.clear(); 
+  HitsEnPx.clear();
+  HitsEnPy.clear();
   HitsEnPz.clear();
-  HitsEloss.clear(); 
+  HitsEloss.clear();
   HitsToF.clear();
 
   return;
 }
 
-//define this as a plug-in
+// define this as a plug-in
 DEFINE_FWK_MODULE(TrackerHitProducer);
diff --git a/Validation/TrackerRecHits/test/RecHitsValid_cfg.py b/Validation/TrackerRecHits/test/RecHitsValid_cfg.py
index 4368e120f8065..7fcf5dedd21d1 100644
--- a/Validation/TrackerRecHits/test/RecHitsValid_cfg.py
+++ b/Validation/TrackerRecHits/test/RecHitsValid_cfg.py
@@ -8,9 +8,10 @@
 
 import FWCore.ParameterSet.Config as cms
 
-from Configuration.StandardSequences.Eras import eras
-# process = cms.Process("RecHitsValid", eras.Run2_2016)
-process = cms.Process("RecHitsValid", eras.Run2_2017)
+# from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
+# process = cms.Process("RecHitsValid", Run2_2016)
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+process = cms.Process("RecHitsValid", Run2_2017)
 
 process.load('Configuration/StandardSequences/FrontierConditions_GlobalTag_cff')
 from Configuration.AlCa.GlobalTag import GlobalTag
diff --git a/Validation/TrackerRecHits/test/stripClusterMCanalysis_cfg.py b/Validation/TrackerRecHits/test/stripClusterMCanalysis_cfg.py
index b895d18806cb0..9a884e08b1aee 100644
--- a/Validation/TrackerRecHits/test/stripClusterMCanalysis_cfg.py
+++ b/Validation/TrackerRecHits/test/stripClusterMCanalysis_cfg.py
@@ -19,9 +19,9 @@
 '/store/relval/CMSSW_9_0_0_pre2/RelValQCD_Pt_3000_3500_13/GEN-SIM-DIGI-RAW-HLTDEBUG/90X_mcRun2_asymptotic_v0-v1/10000/DC4B89FA-62C2-E611-BEA8-0025905A6060.root',
 '/store/relval/CMSSW_9_0_0_pre2/RelValQCD_Pt_3000_3500_13/GEN-SIM-DIGI-RAW-HLTDEBUG/90X_mcRun2_asymptotic_v0-v1/10000/EEB73D90-3BC2-E611-B0A4-0025905A60FE.root' ] );
 
-from Configuration.StandardSequences.Eras import eras
 
-process = cms.Process('makeNtuples',eras.Run2_2016)
+from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
+process = cms.Process('makeNtuples',Run2_2016)
 
 # import of standard configurations
 process.load('Configuration.StandardSequences.Services_cff')
diff --git a/Validation/TrackingMCTruth/interface/TrackingTruthValid.h b/Validation/TrackingMCTruth/interface/TrackingTruthValid.h
old mode 100755
new mode 100644
index 4ba7c22a98327..0ae818cd7f315
--- a/Validation/TrackingMCTruth/interface/TrackingTruthValid.h
+++ b/Validation/TrackingMCTruth/interface/TrackingTruthValid.h
@@ -1,9 +1,9 @@
 #ifndef TrackingTruthValid_h
 #define TrackingTruthValid_h
 
-#include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "DQMServices/Core/interface/DQMEDAnalyzer.h"
+#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include <string>
@@ -12,38 +12,38 @@ class DQMStore;
 class MonitorElement;
 class TrackingParticle;
 
-class TrackingTruthValid  : public  DQMEDAnalyzer {
- public:
+class TrackingTruthValid : public DQMEDAnalyzer {
+public:
   typedef std::vector<TrackingParticle> TrackingParticleCollection;
-  //Constructor
-  explicit TrackingTruthValid(const edm::ParameterSet& conf) ;
-  //Destructor
-  ~TrackingTruthValid() override{} ;
-  
-  void analyze(const edm::Event&, const edm::EventSetup& ) override;
+  // Constructor
+  explicit TrackingTruthValid(const edm::ParameterSet &conf);
+  // Destructor
+  ~TrackingTruthValid() override{};
+
+  void analyze(const edm::Event &, const edm::EventSetup &) override;
 
-  void bookHistograms(DQMStore::IBooker & ibooker,const edm::Run& run, const edm::EventSetup& es) override;
-  void endJob() override; 
+  void bookHistograms(DQMStore::IBooker &ibooker, const edm::Run &run, const edm::EventSetup &es) override;
+  void endJob() override;
 
- private:
+private:
   bool runStandalone;
   std::string outputFile;
-  
-  DQMStore* dbe_;
-  MonitorElement* meTPMass;
-  MonitorElement* meTPCharge; 
-  MonitorElement* meTPId;
-  MonitorElement* meTPProc;
-  MonitorElement* meTPAllHits;
-  MonitorElement* meTPMatchedHits;
-  MonitorElement* meTPPt;
-  MonitorElement* meTPEta;
-  MonitorElement* meTPPhi;
-  MonitorElement* meTPVtxX;
-  MonitorElement* meTPVtxY;
-  MonitorElement* meTPVtxZ; 
-  MonitorElement* meTPtip;
-  MonitorElement* meTPlip;
+
+  DQMStore *dbe_;
+  MonitorElement *meTPMass;
+  MonitorElement *meTPCharge;
+  MonitorElement *meTPId;
+  MonitorElement *meTPProc;
+  MonitorElement *meTPAllHits;
+  MonitorElement *meTPMatchedHits;
+  MonitorElement *meTPPt;
+  MonitorElement *meTPEta;
+  MonitorElement *meTPPhi;
+  MonitorElement *meTPVtxX;
+  MonitorElement *meTPVtxY;
+  MonitorElement *meTPVtxZ;
+  MonitorElement *meTPtip;
+  MonitorElement *meTPlip;
 
   edm::EDGetTokenT<TrackingParticleCollection> vec_TrackingParticle_Token_;
 };
diff --git a/Validation/TrackingMCTruth/plugins/SealModule.cc b/Validation/TrackingMCTruth/plugins/SealModule.cc
old mode 100755
new mode 100644
index bfd9e3dc033c7..07db93e9cf79f
--- a/Validation/TrackingMCTruth/plugins/SealModule.cc
+++ b/Validation/TrackingMCTruth/plugins/SealModule.cc
@@ -1,6 +1,5 @@
-#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "Validation/TrackingMCTruth/interface/TrackingTruthValid.h"
 
-
 DEFINE_FWK_MODULE(TrackingTruthValid);
diff --git a/Validation/TrackingMCTruth/plugins/TrackingTruthValid.cc b/Validation/TrackingMCTruth/plugins/TrackingTruthValid.cc
index 1be12064412ec..e9d0e763f8dec 100644
--- a/Validation/TrackingMCTruth/plugins/TrackingTruthValid.cc
+++ b/Validation/TrackingMCTruth/plugins/TrackingTruthValid.cc
@@ -5,7 +5,6 @@
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
@@ -20,97 +19,100 @@
 
 #include <cmath>
 
-typedef edm::RefVector< std::vector<TrackingParticle> > TrackingParticleContainer;
-
-typedef TrackingParticleRefVector::iterator               tp_iterator;
-typedef TrackingParticle::g4t_iterator                   g4t_iterator;
-typedef TrackingParticle::genp_iterator                 genp_iterator;
-typedef TrackingVertex::genv_iterator                   genv_iterator;
-typedef TrackingVertex::g4v_iterator                     g4v_iterator;
+typedef edm::RefVector<std::vector<TrackingParticle>> TrackingParticleContainer;
 
+typedef TrackingParticleRefVector::iterator tp_iterator;
+typedef TrackingParticle::g4t_iterator g4t_iterator;
+typedef TrackingParticle::genp_iterator genp_iterator;
+typedef TrackingVertex::genv_iterator genv_iterator;
+typedef TrackingVertex::g4v_iterator g4v_iterator;
 
-TrackingTruthValid::TrackingTruthValid(const edm::ParameterSet& conf)
-  : runStandalone( conf.getParameter<bool>("runStandalone") )
-  , outputFile( conf.getParameter<std::string>( "outputFile" ) )
-  , dbe_( nullptr )
-  , vec_TrackingParticle_Token_( consumes<TrackingParticleCollection>( conf.getParameter<edm::InputTag>( "src" ) ) ) {}
+TrackingTruthValid::TrackingTruthValid(const edm::ParameterSet &conf)
+    : runStandalone(conf.getParameter<bool>("runStandalone")),
+      outputFile(conf.getParameter<std::string>("outputFile")),
+      dbe_(nullptr),
+      vec_TrackingParticle_Token_(consumes<TrackingParticleCollection>(conf.getParameter<edm::InputTag>("src"))) {}
 
-void TrackingTruthValid::bookHistograms(DQMStore::IBooker & ibooker,const edm::Run& run, const edm::EventSetup& es){
-  dbe_  = edm::Service<DQMStore>().operator->();
+void TrackingTruthValid::bookHistograms(DQMStore::IBooker &ibooker, const edm::Run &run, const edm::EventSetup &es) {
+  dbe_ = edm::Service<DQMStore>().operator->();
   ibooker.setCurrentFolder("Tracking/TrackingMCTruth/TrackingParticle");
-  
 
-  meTPMass = ibooker.book1D("TPMass","Tracking Particle Mass",100, -1,+5.);
-  meTPCharge = ibooker.book1D("TPCharge","Tracking Particle Charge",10, -5, 5);
-  meTPId = ibooker.book1D("TPId","Tracking Particle Id",500, -5000, 5000);
-  meTPProc = ibooker.book1D("TPProc","Tracking Particle Proc",20, -0.5, 19.5);
+  meTPMass = ibooker.book1D("TPMass", "Tracking Particle Mass", 100, -1, +5.);
+  meTPCharge = ibooker.book1D("TPCharge", "Tracking Particle Charge", 10, -5, 5);
+  meTPId = ibooker.book1D("TPId", "Tracking Particle Id", 500, -5000, 5000);
+  meTPProc = ibooker.book1D("TPProc", "Tracking Particle Proc", 20, -0.5, 19.5);
   meTPAllHits = ibooker.book1D("TPAllHits", "Tracking Particle All Hits", 200, -0.5, 199.5);
   meTPMatchedHits = ibooker.book1D("TPMatchedHits", "Tracking Particle Matched Hits", 100, -0.5, 99.5);
-  meTPPt = ibooker.book1D("TPPt", "Tracking Particle Pt",100, 0, 100.);
-  meTPEta = ibooker.book1D("TPEta", "Tracking Particle Eta",100, -7., 7.);
-  meTPPhi = ibooker.book1D("TPPhi", "Tracking Particle Phi",100, -4., 4);
-  meTPVtxX = ibooker.book1D("TPVtxX", "Tracking Particle VtxX",100, -100, 100.);
-  meTPVtxY = ibooker.book1D("TPVtxY", "Tracking Particle VtxY",100, -100, 100.);
-  meTPVtxZ = ibooker.book1D("TPVtxZ", "Tracking Particle VtxZ",100, -100, 100.);
-  meTPtip = ibooker.book1D("TPtip", "Tracking Particle tip",100, 0, 1000.);
-  meTPlip = ibooker.book1D("TPlip", "Tracking Particle lip",100, 0, 100.);
-  
-  
+  meTPPt = ibooker.book1D("TPPt", "Tracking Particle Pt", 100, 0, 100.);
+  meTPEta = ibooker.book1D("TPEta", "Tracking Particle Eta", 100, -7., 7.);
+  meTPPhi = ibooker.book1D("TPPhi", "Tracking Particle Phi", 100, -4., 4);
+  meTPVtxX = ibooker.book1D("TPVtxX", "Tracking Particle VtxX", 100, -100, 100.);
+  meTPVtxY = ibooker.book1D("TPVtxY", "Tracking Particle VtxY", 100, -100, 100.);
+  meTPVtxZ = ibooker.book1D("TPVtxZ", "Tracking Particle VtxZ", 100, -100, 100.);
+  meTPtip = ibooker.book1D("TPtip", "Tracking Particle tip", 100, 0, 1000.);
+  meTPlip = ibooker.book1D("TPlip", "Tracking Particle lip", 100, 0, 100.);
+
   // Prepare Axes Labels for Processes
-  meTPProc->setBinLabel( 1,"Undefined");            // value =  0
-  meTPProc->setBinLabel( 2,"Unknown");              // value =  1
-  meTPProc->setBinLabel( 3,"Primary");              // value =  2
-  meTPProc->setBinLabel( 4,"Hadronic");             // value =  3   
-  meTPProc->setBinLabel( 5,"Decay");                // value =  4 
-  meTPProc->setBinLabel( 6,"Compton");              // value =  5
-  meTPProc->setBinLabel( 7,"Annihilation");         // value =  6
-  meTPProc->setBinLabel( 8,"EIoni");                // value =  7
-  meTPProc->setBinLabel( 9,"HIoni");                // value =  8
-  meTPProc->setBinLabel(10,"MuIoni");               // value =  9
-  meTPProc->setBinLabel(11,"Photon");               // value = 10
-  meTPProc->setBinLabel(12,"MuPairProd");           // value = 11
-  meTPProc->setBinLabel(13,"Conversions");          // value = 12
-  meTPProc->setBinLabel(14,"EBrem");                // value = 13
-  meTPProc->setBinLabel(15,"SynchrotronRadiation"); // value = 14
-  meTPProc->setBinLabel(16,"MuBrem");               // value = 15
-  meTPProc->setBinLabel(17,"MuNucl");               // value = 16
-  meTPProc->setBinLabel(18,"");
-  meTPProc->setBinLabel(19,"");
-  meTPProc->setBinLabel(20,"");
+  meTPProc->setBinLabel(1, "Undefined");              // value =  0
+  meTPProc->setBinLabel(2, "Unknown");                // value =  1
+  meTPProc->setBinLabel(3, "Primary");                // value =  2
+  meTPProc->setBinLabel(4, "Hadronic");               // value =  3
+  meTPProc->setBinLabel(5, "Decay");                  // value =  4
+  meTPProc->setBinLabel(6, "Compton");                // value =  5
+  meTPProc->setBinLabel(7, "Annihilation");           // value =  6
+  meTPProc->setBinLabel(8, "EIoni");                  // value =  7
+  meTPProc->setBinLabel(9, "HIoni");                  // value =  8
+  meTPProc->setBinLabel(10, "MuIoni");                // value =  9
+  meTPProc->setBinLabel(11, "Photon");                // value = 10
+  meTPProc->setBinLabel(12, "MuPairProd");            // value = 11
+  meTPProc->setBinLabel(13, "Conversions");           // value = 12
+  meTPProc->setBinLabel(14, "EBrem");                 // value = 13
+  meTPProc->setBinLabel(15, "SynchrotronRadiation");  // value = 14
+  meTPProc->setBinLabel(16, "MuBrem");                // value = 15
+  meTPProc->setBinLabel(17, "MuNucl");                // value = 16
+  meTPProc->setBinLabel(18, "");
+  meTPProc->setBinLabel(19, "");
+  meTPProc->setBinLabel(20, "");
 }
 
-void TrackingTruthValid::analyze(const edm::Event& event, const edm::EventSetup& c){
-
-  edm::Handle<TrackingParticleCollection>  TruthTrackContainer ;
+void TrackingTruthValid::analyze(const edm::Event &event, const edm::EventSetup &c) {
+  edm::Handle<TrackingParticleCollection> TruthTrackContainer;
   //  edm::Handle<TrackingVertexCollection>    TruthVertexContainer;
 
-  event.getByToken( vec_TrackingParticle_Token_, TruthTrackContainer );
-  
-  const TrackingParticleCollection *tPC   = TruthTrackContainer.product();
+  event.getByToken(vec_TrackingParticle_Token_, TruthTrackContainer);
+
+  const TrackingParticleCollection *tPC = TruthTrackContainer.product();
 
   // Loop over TrackingParticle's
-  for (TrackingParticleCollection::const_iterator t = tPC -> begin(); t != tPC -> end(); ++t) {
-    //if(t -> trackerPSimHit().size() ==0) cout << " Track with 0 SimHit " << endl;
+  for (TrackingParticleCollection::const_iterator t = tPC->begin(); t != tPC->end(); ++t) {
+    // if(t -> trackerPSimHit().size() ==0) cout << " Track with 0 SimHit " <<
+    // endl;
 
     meTPMass->Fill(t->mass());
-    meTPCharge->Fill(t->charge() );
+    meTPCharge->Fill(t->charge());
     meTPId->Fill(t->pdgId());
     meTPPt->Fill(sqrt(t->momentum().perp2()));
     meTPEta->Fill(t->momentum().eta());
     meTPPhi->Fill(t->momentum().Phi());
-    //#warning "This file has been modified just to get it to compile without any regard as to whether it still functions as intended"
-    //#ifdef REMOVED_JUST_TO_GET_IT_TO_COMPILE__THIS_CODE_NEEDS_TO_BE_CHECKED
-    //    std::vector<PSimHit> trackerPSimHit( t->trackPSimHit(DetId::Tracker) );
+    //#warning "This file has been modified just to get it to compile without
+    // any regard as to whether it still functions as intended" #ifdef
+    // REMOVED_JUST_TO_GET_IT_TO_COMPILE__THIS_CODE_NEEDS_TO_BE_CHECKED
+    //    std::vector<PSimHit> trackerPSimHit( t->trackPSimHit(DetId::Tracker)
+    //    );
     //#endif
     meTPAllHits->Fill(t->numberOfTrackerHits());
-    //get the process of the first hit
-    //#warning "This file has been modified just to get it to compile without any regard as to whether it still functions as intended"
-    //#ifdef REMOVED_JUST_TO_GET_IT_TO_COMPILE__THIS_CODE_NEEDS_TO_BE_CHECKED
-    //    if(trackerPSimHit.size() !=0) meTPProc->Fill( trackerPSimHit.front().processType());
+    // get the process of the first hit
+    //#warning "This file has been modified just to get it to compile without
+    // any regard as to whether it still functions as intended" #ifdef
+    // REMOVED_JUST_TO_GET_IT_TO_COMPILE__THIS_CODE_NEEDS_TO_BE_CHECKED
+    //    if(trackerPSimHit.size() !=0) meTPProc->Fill(
+    //    trackerPSimHit.front().processType());
     //#endif
-    
-    // there is no more the PSimHits collection !!! how to deal w/ the processType ?
-    //    if(t->numberOfTrackerHits() !=0) meTPProc->Fill( trackerPSimHit.front().processType());
+
+    // there is no more the PSimHits collection !!! how to deal w/ the
+    // processType ?
+    //    if(t->numberOfTrackerHits() !=0) meTPProc->Fill(
+    //    trackerPSimHit.front().processType());
 
     meTPMatchedHits->Fill(t->numberOfTrackerLayers());
     meTPVtxX->Fill(t->vx());
@@ -119,19 +121,22 @@ void TrackingTruthValid::analyze(const edm::Event& event, const edm::EventSetup&
     meTPtip->Fill(sqrt(t->vertex().perp2()));
     meTPlip->Fill(t->vz());
 
-      /*
-   // Compare momenta from sources
-    cout << "T.P.   Track mass, Momentum, q , ID, & Event # "
-          << t -> mass()  << " " 
-          << t -> p4()    << " " << t -> charge() << " "
-          << t -> pdgId() << " "
-          << t -> eventId().bunchCrossing() << "." << t -> eventId().event() << endl;
-
-    if(t->mass() < 0) cout << "======= WARNING, this particle has negative mass: " << t->mass()  
-			   << " and pdgId: " << t->pdgId() << endl;
-    if(t->pdgId() == 0) cout << "======= WARNING, this particle has pdgId = 0: "     << t->pdgId() << endl;
-    cout << " Hits for this track: " << t -> trackerPSimHit().size() << endl;
-    */
+    /*
+ // Compare momenta from sources
+  cout << "T.P.   Track mass, Momentum, q , ID, & Event # "
+        << t -> mass()  << " "
+        << t -> p4()    << " " << t -> charge() << " "
+        << t -> pdgId() << " "
+        << t -> eventId().bunchCrossing() << "." << t -> eventId().event() <<
+ endl;
+
+  if(t->mass() < 0) cout << "======= WARNING, this particle has negative mass: "
+ << t->mass()
+                         << " and pdgId: " << t->pdgId() << endl;
+  if(t->pdgId() == 0) cout << "======= WARNING, this particle has pdgId = 0: "
+ << t->pdgId() << endl; cout << " Hits for this track: " << t ->
+ trackerPSimHit().size() << endl;
+  */
 
     /*
       std::cout << std::endl << "### Tracking Particle ###" << std::endl;
@@ -141,47 +146,50 @@ void TrackingTruthValid::analyze(const edm::Event& event, const edm::EventSetup&
       std::cout << (*t) << std::endl;
     */
   }  // End loop over TrackingParticle
-  
+
   // Loop over TrackingVertex's
-  /*  
+  /*
   cout << "Dumping sample vertex info" << endl;
-  for (TrackingVertexCollection::const_iterator v = tVC -> begin(); v != tVC -> end(); ++v) {
-    cout << " Vertex Position & Event #" << v -> position() << " " << v -> eventId().bunchCrossing() << "." << v -> eventId().event() << endl;
-    cout << "  Associated with " << v -> daughterTracks().size() << " tracks" << endl;
+  for (TrackingVertexCollection::const_iterator v = tVC -> begin(); v != tVC ->
+  end(); ++v) { cout << " Vertex Position & Event #" << v -> position() << " "
+  << v -> eventId().bunchCrossing() << "." << v -> eventId().event() << endl;
+    cout << "  Associated with " << v -> daughterTracks().size() << " tracks" <<
+  endl;
     // Get Geant and HepMC positions
-    for (genv_iterator genV = v -> genVertices_begin(); genV != v -> genVertices_end(); ++genV) {
-      cout << "  HepMC vertex position " << (*(*genV)).position() << endl;
+    for (genv_iterator genV = v -> genVertices_begin(); genV != v ->
+  genVertices_end(); ++genV) { cout << "  HepMC vertex position " <<
+  (*(*genV)).position() << endl;
     }
-    for (g4v_iterator g4V = v -> g4Vertices_begin(); g4V != v -> g4Vertices_end(); ++g4V) {
-      cout << "  Geant vertex position " << (*g4V).position() << endl;
+    for (g4v_iterator g4V = v -> g4Vertices_begin(); g4V != v ->
+  g4Vertices_end(); ++g4V) { cout << "  Geant vertex position " <<
+  (*g4V).position() << endl;
       // Probably empty all the time, currently
     }
 
     // Loop over daughter track(s)
-    for (tp_iterator iTP = v -> daughterTracks_begin(); iTP != v -> daughterTracks_end(); ++iTP) {
-      cout << "  Daughter starts:      " << (*(*iTP)).vertex();
-      for (g4t_iterator g4T  = (*(*iTP)).g4Track_begin(); g4T != (*(*iTP)).g4Track_end(); ++g4T) {
-        cout << " p " << g4T->momentum();
+    for (tp_iterator iTP = v -> daughterTracks_begin(); iTP != v ->
+  daughterTracks_end(); ++iTP) { cout << "  Daughter starts:      " <<
+  (*(*iTP)).vertex(); for (g4t_iterator g4T  = (*(*iTP)).g4Track_begin(); g4T !=
+  (*(*iTP)).g4Track_end(); ++g4T) { cout << " p " << g4T->momentum();
       }
       cout << endl;
     }
 
     // Loop over source track(s) (can be multiple since vertices are collapsed)
-    for (tp_iterator iTP = v -> sourceTracks_begin(); iTP != v -> sourceTracks_end(); ++iTP) {
-      cout << "  Source   starts: " << (*(*iTP)).vertex();
-      for (g4t_iterator g4T  = (*iTP)->g4Track_begin(); g4T != (*iTP)->g4Track_end(); ++g4T) {
-        cout << ", p " <<  g4T ->momentum();
+    for (tp_iterator iTP = v -> sourceTracks_begin(); iTP != v ->
+  sourceTracks_end(); ++iTP) { cout << "  Source   starts: " <<
+  (*(*iTP)).vertex(); for (g4t_iterator g4T  = (*iTP)->g4Track_begin(); g4T !=
+  (*iTP)->g4Track_end(); ++g4T) { cout << ", p " <<  g4T ->momentum();
       }
       cout << endl;
     }
   }  // End loop over TrackingVertex
   */
-
-
 }
 
-void TrackingTruthValid::endJob(){ 
-  //Only in standalone mode save local root file 
-  if (runStandalone &&  !outputFile.empty() && dbe_ ){dbe_->save(outputFile);}
-
-} 
+void TrackingTruthValid::endJob() {
+  // Only in standalone mode save local root file
+  if (runStandalone && !outputFile.empty() && dbe_) {
+    dbe_->save(outputFile);
+  }
+}